From mclasen at fedoraproject.org  Sat Aug  1 00:09:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 00:09:53 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel-about.patch, NONE,
	1.1 gnome-panel.spec, 1.361, 1.362 panel-icons.patch, 1.1, 1.2
Message-ID: <20090801000953.4EDD511C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel.spec panel-icons.patch 
Added Files:
	gnome-panel-about.patch 
Log Message:
Reduce excessive 'about'-ing in the System menu


gnome-panel-about.patch:
 panel-menu-items.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnome-panel-about.patch ---
diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about	2009-07-31 18:29:02.635601324 -0400
+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-31 18:30:18.129605780 -0400
@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
 		add_menu_separator (menu);
 
 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
-	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+	if (panel_has_desktop_file ("about-this-computer.desktop"))
+		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
 
 	if (parent->priv->append_lock_logout)
 		panel_menu_items_append_lock_logout (menu);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -p -r1.361 -r1.362
--- gnome-panel.spec	27 Jul 2009 14:01:58 -0000	1.361
+++ gnome-panel.spec	1 Aug 2009 00:09:52 -0000	1.362
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.27.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -91,12 +91,8 @@ BuildRequires: libtool
 
 Patch0: gnome-panel-2.23.4-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch4: gnome-panel-2.25.3-search.patch
-# Drop this patch for now, it should have AT LEAST been moved
-# to an upstream bugzilla by now
-#Patch6: gnome-panel-2.16.0-compiz-support.patch
-Patch7: gnome-panel-2.21.92-about-this-computer.patch
+Patch2: gnome-panel-2.25.3-search.patch
+Patch3: gnome-panel-about.patch
 
 # the next three patches belong together
 # http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -162,10 +158,8 @@ Panel Applets using the libpanel-applet 
 
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p1 -b .about-fedora
-%patch4 -p0 -b .search
-##%patch6 -p0 -b .compiz-support
-%patch7 -p1 -b .about-this-computer
+%patch2 -p0 -b .search
+%patch3 -p1 -b .about
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
@@ -378,6 +372,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-5
+- Reduce the excessive 'about'-ing in the System menu
+
 * Mon Jul 27 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-4
 - Drop unneeded direct deps
 

panel-icons.patch:
 menu.c             |    2 +-
 panel-menu-items.c |   34 +++++++++++++++++++++++-----------
 panel-recent.c     |    2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

Index: panel-icons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/panel-icons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- panel-icons.patch	22 Jul 2009 21:32:55 -0000	1.1
+++ panel-icons.patch	1 Aug 2009 00:09:52 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons gnome-panel-2.27.4/gnome-panel/menu.c
 --- gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/menu.c	2009-07-22 16:36:34.928388257 -0400
++++ gnome-panel-2.27.4/gnome-panel/menu.c	2009-07-31 18:31:52.836622831 -0400
 @@ -1389,7 +1389,7 @@ create_submenu_entry (GtkWidget         
  {
  	GtkWidget *menuitem;
@@ -11,8 +11,8 @@ diff -up gnome-panel-2.27.4/gnome-panel/
  					panel_menu_icon_get_size (),
  					NULL, NULL,
 diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons	2009-07-22 16:36:34.768127904 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-22 16:39:57.329131999 -0400
+--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons	2009-07-31 18:31:52.737846416 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-31 18:34:05.243598174 -0400
 @@ -1,4 +1,5 @@
 -/*
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
@@ -95,16 +95,12 @@ diff -up gnome-panel-2.27.4/gnome-panel/
          }
  
  
-@@ -1158,11 +1170,11 @@ panel_desktop_menu_item_append_menu (Gtk
+@@ -1158,9 +1170,9 @@ panel_desktop_menu_item_append_menu (Gtk
  	if (add_separator)
  		add_menu_separator (menu);
  
 -	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
--	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
--	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
 +	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
-+	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
-+	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL, FALSE);
  	if (panel_has_desktop_file ("about-this-computer.desktop"))
 -		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
 +		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL, FALSE);
@@ -113,7 +109,7 @@ diff -up gnome-panel-2.27.4/gnome-panel/
  		panel_menu_items_append_lock_logout (menu);
 diff -up gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-recent.c
 --- gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-07-22 16:36:34.933388684 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-07-31 18:31:52.839621328 -0400
 @@ -188,7 +188,7 @@ panel_recent_append_documents_menu (GtkW
  	GtkWidget      *menu_item;
  	int             size;



From rrankin at fedoraproject.org  Sat Aug  1 00:13:30 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sat,  1 Aug 2009 00:13:30 +0000 (UTC)
Subject: rpms/gtk+extra/devel gtk+extra-2.1.1-item.patch, NONE,
	1.1 gtk+extra.spec, 1.14, 1.15
Message-ID: <20090801001330.AF81611C00CE@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gtk+extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29577

Modified Files:
	gtk+extra.spec 
Added Files:
	gtk+extra-2.1.1-item.patch 
Log Message:
Add patch to allow compile against gtk2-2.17.5


gtk+extra-2.1.1-item.patch:
 gtkitementry.c |   46 ++++++++++++++++++++++++++--------------------
 gtkitementry.h |    2 ++
 2 files changed, 28 insertions(+), 20 deletions(-)

--- NEW FILE gtk+extra-2.1.1-item.patch ---
diff --git a/gtkextra/gtkitementry.c b/gtkextra/gtkitementry.c
index 0c5426b..6a42880 100644
--- a/gtkextra/gtkitementry.c
+++ b/gtkextra/gtkitementry.c
@@ -251,6 +251,8 @@ gtk_item_entry_init (GtkItemEntry *entry)
 {
   entry->justification = GTK_JUSTIFY_LEFT;
   entry->text_max_size = 0;
+  entry->item_text_size = 0;
+  entry->item_n_bytes = 0;
   GTK_ENTRY(entry)->has_frame = FALSE;
 
   g_object_unref(G_OBJECT(GTK_ENTRY(entry)->im_context));
@@ -680,6 +682,7 @@ gtk_entry_real_insert_text (GtkEditable *editable,
   gint index;
   gint n_chars;
 
+  GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
   GtkEntry *entry = GTK_ENTRY (editable);
 
   if (new_text_length < 0)
@@ -693,23 +696,23 @@ gtk_entry_real_insert_text (GtkEditable *editable,
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
 
-  if (new_text_length + entry->n_bytes + 1 > entry->text_size)
+  if (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
     {
-      while (new_text_length + entry->n_bytes + 1 > entry->text_size)
+      while (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
 	{
-	  if (entry->text_size == 0)
-	    entry->text_size = MIN_SIZE;
+	  if (ientry->item_text_size == 0)
+	    ientry->item_text_size = MIN_SIZE;
 	  else
 	    {
-	      if (2 * (guint)entry->text_size < MAX_SIZE &&
-		  2 * (guint)entry->text_size > entry->text_size)
-		entry->text_size *= 2;
+	      if (2 * (guint)ientry->item_text_size < MAX_SIZE &&
+		  2 * (guint)ientry->item_text_size > ientry->item_text_size)
+		ientry->item_text_size *= 2;
 	      else
 		{
-		  entry->text_size = MAX_SIZE;
-		  if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
+		  ientry->item_text_size = MAX_SIZE;
+		  if (new_text_length > (gint)ientry->item_text_size - (gint)ientry->item_n_bytes - 1)
 		    {
-		      new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
+		      new_text_length = (gint)ientry->item_text_size - (gint)ientry->item_n_bytes - 1;
 		      new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
 		      n_chars = g_utf8_strlen (new_text, new_text_length);
 		    }
@@ -718,19 +721,19 @@ gtk_entry_real_insert_text (GtkEditable *editable,
 	    }
 	}
 
-      entry->text = g_realloc (entry->text, entry->text_size);
+      entry->text = g_realloc (entry->text, ientry->item_text_size);
     }
 
   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
 
-  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
+  g_memmove (entry->text + index + new_text_length, entry->text + index, ientry->item_n_bytes - index);
   memcpy (entry->text + index, new_text, new_text_length);
 
-  entry->n_bytes += new_text_length;
+  ientry->item_n_bytes += new_text_length;
   entry->text_length += n_chars;
 
   /* NUL terminate for safety and convenience */
-  entry->text[entry->n_bytes] = '\0';
+  entry->text[ientry->item_n_bytes] = '\0';
   
   if (entry->current_pos > *position)
     entry->current_pos += n_chars;
@@ -752,6 +755,7 @@ gtk_entry_real_delete_text (GtkEditable *editable,
 			    gint         end_pos)
 {
   GtkEntry *entry = GTK_ENTRY (editable);
+  GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
 
   if (start_pos < 0)
     start_pos = 0;
@@ -763,9 +767,9 @@ gtk_entry_real_delete_text (GtkEditable *editable,
       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
 
-      g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
+      g_memmove (entry->text + start_index, entry->text + end_index, ientry->item_n_bytes + 1 - end_index);
       entry->text_length -= (end_pos - start_pos);
-      entry->n_bytes -= (end_index - start_index);
+      ientry->item_n_bytes -= (end_index - start_index);
       
       if (entry->current_pos > start_pos)
 	entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
@@ -1026,9 +1030,10 @@ static gboolean
 gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
                                GtkEntry     *entry)
 {
+  GtkItemEntry *ientry = GTK_ITEM_ENTRY (entry);
   gtk_im_context_set_surrounding (context,
                                   entry->text,
-                                  entry->n_bytes,
+                                  ientry->item_n_bytes,
                                   g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
 
   return TRUE;
@@ -1205,6 +1210,7 @@ static PangoLayout *
 gtk_entry_create_layout (GtkEntry *entry,
 			 gboolean  include_preedit)
 {
+  GtkItemEntry *ientry = GTK_ITEM_ENTRY (entry);
   PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (entry), NULL);
   PangoAttrList *tmp_attrs = pango_attr_list_new ();
   
@@ -1229,7 +1235,7 @@ gtk_entry_create_layout (GtkEntry *entry,
       
       if (entry->visible)
         {
-          g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+          g_string_prepend_len (tmp_string, entry->text, ientry->item_n_bytes);
           g_string_insert (tmp_string, cursor_index, preedit_string);
         }
       else
@@ -1238,7 +1244,7 @@ gtk_entry_create_layout (GtkEntry *entry,
           gint preedit_len_chars;
           gunichar invisible_char;
           
-          ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+          ch_len = g_utf8_strlen (entry->text, ientry->item_n_bytes);
           preedit_len_chars = g_utf8_strlen (preedit_string, -1);
           ch_len += preedit_len_chars;
 
@@ -1272,7 +1278,7 @@ gtk_entry_create_layout (GtkEntry *entry,
     {
       if (entry->visible)
         {
-          pango_layout_set_text (layout, entry->text, entry->n_bytes);
+          pango_layout_set_text (layout, entry->text, ientry->item_n_bytes);
         }
       else
         {
diff --git a/gtkextra/gtkitementry.h b/gtkextra/gtkitementry.h
index 839c2a8..f058c76 100644
--- a/gtkextra/gtkitementry.h
+++ b/gtkextra/gtkitementry.h
@@ -43,6 +43,8 @@ struct _GtkItemEntry
   GtkEntry parent;
 
   gint text_max_size;
+  gint16 item_text_size;
+  gint16 item_n_bytes;
 
   GtkJustification justification;
 };


Index: gtk+extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/devel/gtk+extra.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gtk+extra.spec	25 Jul 2009 01:39:57 -0000	1.14
+++ gtk+extra.spec	1 Aug 2009 00:13:30 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		gtk+extra
 Version:	2.1.1
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une biblioth?que de widgets gtk+
 
@@ -10,7 +10,8 @@ URL:		http://gtkextra.sourceforge.net/
 Source:		http://dl.sf.net/scigraphica/gtk+extra-%{version}.tar.gz
 Patch:		%{name}-%{version}.g_free.diff
 Patch1:		%{name}-%{version}-deleterow.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2:		%{name}-%{version}-item.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
 
@@ -26,8 +27,8 @@ GtkSheet, GtkPlot et GtkIconList
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une biblioth?que de widgets gtk+
 Group:		Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       gtk2-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	gtk2-devel
 
 %description devel
 The %{name}-devel package includes the static libraries, header files,
@@ -47,6 +48,7 @@ qui utilisent les widgets gtk+extra.
 
 %patch -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 01 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-12
+- Patch to compile with gtk2-2.17.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nbecker at fedoraproject.org  Sat Aug  1 00:15:31 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat,  1 Aug 2009 00:15:31 +0000 (UTC)
Subject: rpms/filelight/devel .cvsignore, 1.2, 1.3 filelight.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <20090801001531.272C111C00CE@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore filelight.spec sources 
Log Message:
Updates for kde4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:07:14 -0000	1.2
+++ .cvsignore	1 Aug 2009 00:15:30 -0000	1.3
@@ -1 +1 @@
-filelight-1.0.tar.bz2
+filelight-1.9-rc2.tgz


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- filelight.spec	31 Jul 2009 23:27:50 -0000	1.10
+++ filelight.spec	1 Aug 2009 00:15:30 -0000	1.11
@@ -2,17 +2,18 @@
 
 Summary: Graphical disk usage statistics
 Name: filelight
-Version: 1.9rc2
-Release: 16%{?dist}
+Version: 1.9
+Release: 2.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
-Source: http://www.methylblue.com/filelight/packages/filelight-%{version}.tgz
-Patch0: filelight.desktop.patch
+%define upstreamversion %{version}-rc2
+Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
+#Patch0: filelight.desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel bkebase4-devel desktop-file-utils
+BuildRequires: kdelibs-devel kdebase-devel desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -23,13 +24,16 @@ with each segment's size being proportio
 directories having child segments.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -b .orig
+%setup -q -n %{name}-%{upstreamversion}
+pushd misc
+sed -i -e 's/MimeType/#MimeType/' filelight_part.desktop
+popd
 
 %build
-source "/etc/profile.d/qt.sh"
-%configure --disable-rpath  #--with-pic
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+%{cmake_kde4}
+
+make %{?_smp_mflags} VERBOSE=1
+
 
 %install
 %{__rm} -rf %{buildroot}
@@ -37,10 +41,15 @@ source "/etc/profile.d/qt.sh"
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
-  --add-category="X-Fedora" --vendor=""               \
+  --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
+  --vendor=""               \
   --delete-original					\
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/filelight.desktop
+  ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
+
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/filelight_part.desktop
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -63,16 +72,20 @@ fi
 #%doc %{_docdir}/HTML/en/filelight/
 %config(noreplace) %{_datadir}/config/filelightrc
 %{_bindir}/filelight
-%{_datadir}/applications/kde/filelight.desktop
-%{_datadir}/apps/filelight/
-%{_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{_datadir}/icons/hicolor/*/apps/filelight.png
-%{_datadir}/services/filelight_part.desktop
-%{_libdir}/kde3/libfilelight.la
-%{_libdir}/kde3/libfilelight.so
+%{_kde4_datadir}/applications/kde4/filelight.desktop
+%{_kde4_libdir}/kde4/filelightpart.so
+%{_kde4_datadir}/kde4/apps/filelightpart/
+%{_kde4_appsdir}/filelight
+%{_kde4_iconsdir}/hicolor/*/*/filelight.png
+%{_kde4_iconsdir}/hicolor/*/*/view_filelight.png
+%{_kde4_datadir}/kde4/services/filelight*.desktop
+##%{_kde4_iconsdir}/locolor/*/*/filelight.png
 
 
 %changelog
+* Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-2.rc2
+- Updates for kde4
+
 * Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9rc2-16
 - Update to 1.9rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2006 20:07:14 -0000	1.2
+++ sources	1 Aug 2009 00:15:30 -0000	1.3
@@ -1 +1 @@
-aa885e53e09f40e7fdd371395140b957  filelight-1.0.tar.bz2
+bf1a0459997fdd9e2f3cbe6b2b8c0210  filelight-1.9-rc2.tgz



From roma at fedoraproject.org  Sat Aug  1 00:35:28 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Sat,  1 Aug 2009 00:35:28 +0000 (UTC)
Subject: rpms/php-getid3/devel ampache.patch, NONE, 1.1 import.log, NONE,
	1.1 php-getid3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801003528.97BD011C00CE@cvs1.fedora.phx.redhat.com>

Author: roma

Update of /cvs/pkgs/rpms/php-getid3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ampache.patch import.log php-getid3.spec 
Log Message:
Initial version for F12.


ampache.patch:
 module.audio.mp3.php  |    2 ++
 module.audio.xiph.php |    5 ++++-
 module.tag.id3v2.php  |    7 ++++---
 write.id3v2.php       |    5 ++---
 4 files changed, 12 insertions(+), 7 deletions(-)

--- NEW FILE ampache.patch ---
diff -Naur getid3/module.audio.mp3.php getid3-new/module.audio.mp3.php
--- getid3/module.audio.mp3.php	2006-11-16 23:57:56.000000000 -0200
+++ getid3-new/module.audio.mp3.php	2009-07-31 20:32:00.000000000 -0300
@@ -1076,6 +1076,8 @@
         fseek($fd, $avdata_offset, SEEK_SET);
         
         $sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdata_offset);
+	// If sync < 1 then resort to default of 128 * 1024
+	if ($sync_seek_buffer_size < 1) { $sync_seek_buffer_size = 128 * 1024; }
         $header = fread($fd, $sync_seek_buffer_size);
         $sync_seek_buffer_size = strlen($header);
         $synch_seek_offset = 0;
diff -Naur getid3/module.audio.xiph.php getid3-new/module.audio.xiph.php
--- getid3/module.audio.xiph.php	2006-12-03 22:12:42.000000000 -0200
+++ getid3-new/module.audio.xiph.php	2009-07-31 20:42:10.000000000 -0300
@@ -849,6 +849,8 @@
 
 
     public static function OggPageSegmentLength($ogg_info_array, $segment_number=1) {
+
+        if (!is_array($ogg_info_array['segment_table'])) { $ogg_info_array['segment_table'] = array(); }
         
         for ($i = 0; $i < $segment_number; $i++) {
             $segment_length = 0;
@@ -859,6 +861,7 @@
                 }
             }
         }
+        $segment_length = !$segment_length ? '1' : $segment_length;
         return $segment_length;
     }
 
@@ -949,4 +952,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
diff -Naur getid3/module.tag.id3v2.php getid3-new/module.tag.id3v2.php
--- getid3/module.tag.id3v2.php	2009-03-08 11:30:10.000000000 -0300
+++ getid3-new/module.tag.id3v2.php	2009-07-31 20:38:37.000000000 -0300
@@ -1928,8 +1928,8 @@
             $return_array['genre'][] = $genre_string;
 
         } else {
-
-            while (strpos($genre_string, '(') !== false) {
+            //MODIFIED per #466 Bernhard Weyrauch fix endless loop if no ) 
+            while (strpos($genre_string, '(') !== false AND (strpos($genre_string, ')') !== false)) {
 
                 $start_pos = strpos($genre_string, '(');
                 $end_pos   = strpos($genre_string, ')');
@@ -3155,6 +3155,7 @@
             'TPE3' => 'conductor',
             'TPE4' => 'remixer',
             'TPUB' => 'publisher',
+	    'TPOS' => 'disk',
             'TRC'  => 'isrc',
             'TRCK' => 'track',
             'TRK'  => 'track',
@@ -3280,4 +3281,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
diff -Naur getid3/write.id3v2.php getid3-new/write.id3v2.php
--- getid3/write.id3v2.php	2006-12-26 00:44:22.000000000 -0200
+++ getid3-new/write.id3v2.php	2009-07-31 20:32:00.000000000 -0300
@@ -374,9 +374,8 @@
         }
 
         // rewrite file - no tag present or new tag longer than old tag
-        else
-
-            if (!$fp_source = @fopen($this->filename, 'rb')) {
+        else {
+        	if (!$fp_source = @fopen($this->filename, 'rb')) {
                 throw new getid3_exception('Could not open '.$this->filename.' mode "rb"');
             }
             fseek($fp_source, $engine->info['avdataoffset'], SEEK_SET);


--- NEW FILE import.log ---
php-getid3-2_0_0b5-2_fc10:HEAD:php-getid3-2.0.0b5-2.fc10.src.rpm:1249086896


--- NEW FILE php-getid3.spec ---
Name:      php-getid3
Version:   2.0.0b5
Release:   2%{?dist}
License:   GPLv2
Summary:   The PHP media file parser
Group:     Development/Libraries
URL:       http://getid3.sourceforge.net/
Source0:   http://downloads.sourceforge.net/getid3/getid3-%{version}.zip
Patch0:    ampache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  php >= 5.0.0
BuildArch: noarch

%description
getID3() is a PHP script that extracts useful information 
(such as ID3 tags, bitrate, playtime, etc.) from MP3s & 
other multimedia file formats (Ogg, WMA, WMV, ASF, WAV, AVI, 
AAC, VQF, FLAC, MusePack, Real, QuickTime, Monkey's Audio, MIDI and more).

%prep
%setup -q -c
%patch0 -p0 -b .ampache
for i in ./*.txt demos/*.php; do
      iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
      touch -r "$i" "${i}_"
      mv "${i}_" "$i"
done
sed -i 's/\r//' demos/index.php
sed -i 's/\r//' demos/demo.mysql.structure.sql

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_datadir}/php
cp -a getid3 %{buildroot}%{_datadir}/php/

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc *.txt demos
%{_datadir}/php/getid3

%changelog

* Fri Jul 31 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0.0b5-2
- Updated ampache patch.

* Thu Jun 04 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0.0b5-1
- Updated to 2.0.0b5
- Patched with ampache fixes.

* Thu Jun 04 2009 Paulo Roma <roma at lcg.ufrj.br> 1.7.9-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-getid3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Jun 2009 04:51:24 -0000	1.1
+++ .cvsignore	1 Aug 2009 00:35:28 -0000	1.2
@@ -0,0 +1 @@
+getid3-2.0.0b5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-getid3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Jun 2009 04:51:24 -0000	1.1
+++ sources	1 Aug 2009 00:35:28 -0000	1.2
@@ -0,0 +1 @@
+d2b24ccb4bd4a5c135517bd0ae3b2dd3  getid3-2.0.0b5.zip



From krh at fedoraproject.org  Sat Aug  1 01:04:45 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Sat,  1 Aug 2009 01:04:45 +0000 (UTC)
Subject: rpms/compiz/devel compiz-pageflip.patch, NONE, 1.1 compiz.spec,
	1.173, 1.174
Message-ID: <20090801010445.96EEC11C00CE@cvs1.fedora.phx.redhat.com>

Author: krh

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

Modified Files:
	compiz.spec 
Added Files:
	compiz-pageflip.patch 
Log Message:
* Fri Jul 31 2009 Kristian H?gsberg <krh at redhat.com> - 0.8.2-8
- Add patch to add option to always use glXSwapBuffers.


compiz-pageflip.patch:
 include/compiz-core.h |    2 ++
 src/display.c         |    9 +++++++--
 src/main.c            |   14 +++++++++++++-
 src/screen.c          |    3 +++
 4 files changed, 25 insertions(+), 3 deletions(-)

--- NEW FILE compiz-pageflip.patch ---
diff -up compiz-0.8.2/include/compiz-core.h.flip compiz-0.8.2/include/compiz-core.h
--- compiz-0.8.2/include/compiz-core.h.flip	2009-07-31 13:00:46.120940112 -0400
+++ compiz-0.8.2/include/compiz-core.h	2009-07-31 13:00:57.625815409 -0400
@@ -219,6 +219,8 @@ extern Bool       useCow;
 extern Bool       noDetection;
 extern Bool	  useDesktopHints;
 extern Bool       onlyCurrentScreen;
+extern Bool       noWait;
+extern Bool       alwaysSwap;
 
 extern char	**initialPlugins;
 extern int 	nInitialPlugins;
diff -up compiz-0.8.2/src/display.c.flip compiz-0.8.2/src/display.c
--- compiz-0.8.2/src/display.c.flip	2009-07-31 13:00:46.121940240 -0400
+++ compiz-0.8.2/src/display.c	2009-07-31 13:00:57.627815245 -0400
@@ -1488,6 +1488,9 @@ eventLoop (void)
 						      s->idle ? s->redrawTime :
 						      timeDiff);
 
+			if (alwaysSwap == TRUE)
+			    damageScreen (s);
+
 			/* substract top most overlay window region */
 			if (s->overlayWindowCount)
 			{
@@ -1547,9 +1550,11 @@ eventLoop (void)
 			targetScreen = NULL;
 			targetOutput = &s->outputDev[0];
 
-			waitForVideoSync (s);
+			if (!noWait)
+			    waitForVideoSync (s);
 
-			if (mask & COMP_SCREEN_DAMAGE_ALL_MASK)
+			if ((mask & COMP_SCREEN_DAMAGE_ALL_MASK) ||
+			    (alwaysSwap == TRUE))
 			{
 			    glXSwapBuffers (d->display, s->output);
 			}
diff -up compiz-0.8.2/src/main.c.flip compiz-0.8.2/src/main.c
--- compiz-0.8.2/src/main.c.flip	2009-07-31 13:00:46.122940228 -0400
+++ compiz-0.8.2/src/main.c	2009-07-31 13:00:57.628820890 -0400
@@ -67,6 +67,8 @@ Bool noDetection = FALSE;
 Bool useDesktopHints = FALSE;
 Bool onlyCurrentScreen = FALSE;
 static Bool debugOutput = FALSE;
+Bool noWait = FALSE;
+Bool alwaysSwap = FALSE;
 
 #ifdef USE_COW
 Bool useCow = TRUE;
@@ -89,7 +91,9 @@ usage (void)
 	    "[--replace]\n       "
 	    "[--sm-disable] "
 	    "[--sm-client-id ID] "
-	    "[--only-current-screen]\n      "
+	    "[--only-current-screen] "
+ 	    "[--no-wait]\n       "
+ 	    "[--always-swap] "
 
 #ifdef USE_COW
 	    " [--use-root-window] "
@@ -376,6 +380,14 @@ main (int argc, char **argv)
 	    if (i + 1 < argc)
 		backgroundImage = argv[++i];
 	}
+	else if (!strcmp (argv[i], "--no-wait"))
+	{
+	    noWait = TRUE;
+	}
+	else if (!strcmp (argv[i], "--always-swap"))
+	{
+	    alwaysSwap = TRUE;
+	}
 	else if (*argv[i] == '-')
 	{
 	    compLogMessage ("core", CompLogLevelWarn,
diff -up compiz-0.8.2/src/screen.c.flip compiz-0.8.2/src/screen.c
--- compiz-0.8.2/src/screen.c.flip	2009-02-15 14:26:28.000000000 -0500
+++ compiz-0.8.2/src/screen.c	2009-07-31 13:00:57.631815337 -0400
@@ -2422,6 +2422,9 @@ void
 damageScreenRegion (CompScreen *screen,
 		    Region     region)
 {
+    if (alwaysSwap)
+	damageScreen (screen);
+
     if (screen->damageMask & COMP_SCREEN_DAMAGE_ALL_MASK)
 	return;
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- compiz.spec	24 Jul 2009 19:21:31 -0000	1.173
+++ compiz.spec	1 Aug 2009 01:04:45 -0000	1.174
@@ -14,7 +14,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,7 @@ Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
 Patch107: compiz-0.8.2-wall.patch
+Patch108: compiz-pageflip.patch
 #Patch110: scale-key.patch
 # update translations in desktop-effects
 Patch115: desktop-effects-linguas.patch
@@ -146,6 +147,7 @@ popd
 
 %patch123 -p1 -b .initial-plugins
 %patch125 -p1 -b .gnome-terminal
+%patch108 -p1 -b .pageflip
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -359,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 31 2009 Kristian H?gsberg <krh at redhat.com> - 0.8.2-8
+- Add patch to add option to always use glXSwapBuffers.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Sat Aug  1 01:14:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 01:14:49 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.223,1.224
Message-ID: <20090801011449.94A0B11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
fix a typo



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- gnome-games.spec	31 Jul 2009 15:07:08 -0000	1.223
+++ gnome-games.spec	1 Aug 2009 01:14:49 -0000	1.224
@@ -46,7 +46,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.27.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -117,7 +117,7 @@ in a variety of styles and genres for th
 %package extra
 Group: Amusements/Games
 Summary: More games for the GNOME desktop
-Requires: %{name} = %{epoch}%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description extra
 The gnome-games-extra package contains additional small "five-minute" games
@@ -493,6 +493,9 @@ fi
 
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-4
+- Fix a typo (#515033)
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-3
 - Split off a subset of games to include on the live cd
 



From mclasen at fedoraproject.org  Sat Aug  1 01:21:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 01:21:54 +0000 (UTC)
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.196,1.197
Message-ID: <20090801012154.76AE111C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
Fix a typo



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- gnome-utils.spec	30 Jul 2009 04:54:38 -0000	1.196
+++ gnome-utils.spec	1 Aug 2009 01:21:54 -0000	1.197
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.27.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -70,7 +70,7 @@ needed to develop programs using the lib
 %package -n gnome-system-log
 Summary: A log file viewer for the GNOME desktop
 Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description -n gnome-system-log
 The gnome-system-log package contains an application that lets you
@@ -303,6 +303,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.2-5
+- Fix a typo
+
 * Thu Jul 30 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.2-4
 - Split off a gnome-system-log subpackage
 - Move gnome-dictionary to a better place in the menus



From mclasen at fedoraproject.org  Sat Aug  1 01:57:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 01:57:39 +0000 (UTC)
Subject: rpms/ModemManager/devel udev-rule-typo.patch, NONE,
	1.1 ModemManager.spec, 1.2, 1.3
Message-ID: <20090801015739.A5CCC11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	ModemManager.spec 
Added Files:
	udev-rule-typo.patch 
Log Message:
Fix a typo


udev-rule-typo.patch:
 77-mm-zte-port-types.rules |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE udev-rule-typo.patch ---
diff -up ModemManager-0.2/plugins/77-mm-zte-port-types.rules.udev-rule-typo ModemManager-0.2/plugins/77-mm-zte-port-types.rules
--- ModemManager-0.2/plugins/77-mm-zte-port-types.rules.udev-rule-typo	2009-07-31 21:53:07.145389914 -0400
+++ ModemManager-0.2/plugins/77-mm-zte-port-types.rules	2009-07-31 21:54:00.196600678 -0400
@@ -1,12 +1,12 @@
 # do not edit this file, it will be overwritten on update
 
-ACTION!="add|change", GOTO="nm_zte_port_types_end"
-SUBSYSTEM!="tty", GOTO="nm_zte_port_types_end"
+ACTION!="add|change", GOTO="mm_zte_port_types_end"
+SUBSYSTEM!="tty", GOTO="mm_zte_port_types_end"
 
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="19d2", GOTO="nm_zte_port_types_vendorcheck"
-GOTO="nm_zte_port_types_end"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="19d2", GOTO="mm_zte_port_types_vendorcheck"
+GOTO="mm_zte_port_types_end"
 
-LABEL="nm_zte_port_types_vendorcheck"
+LABEL="mm_zte_port_types_vendorcheck"
 SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}"
 
 ATTRS{idProduct}=="0001", ENV{.MM_USBIFNUM}=="00", ENV{ID_MM_ZTE_PORT_TYPE_MODEM}="1"


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ModemManager.spec	24 Jul 2009 15:39:00 -0000	1.2
+++ ModemManager.spec	1 Aug 2009 01:57:39 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 0.2
-Release: 2.%{snapshot}%{?dist}
+Release: 3.%{snapshot}%{?dist}
 #
 # Source from git://anongit.freedesktop.org/ModemManager/ModemManager
 # tarball built with:
@@ -20,12 +20,16 @@ BuildRequires: glib2-devel
 BuildRequires: dbus-glib-devel >= 0.75
 BuildRequires: libgudev-devel >= 143
 
+# fix a typo in udev rules
+Patch0: udev-rule-typo.patch
+
 %description
 The ModemManager service provides a consistent API to operate many different
 modems, including mobile broadband (3G) devices.
 
 %prep
 %setup -q
+%patch0 -p1 -b .udev-rule-typo
 
 %build
 %configure \
@@ -62,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com>
+- Fix a typo in one of the udev rules files
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2.20090707
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Sat Aug  1 02:37:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 02:37:17 +0000 (UTC)
Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.47,1.48
Message-ID: <20090801023717.3EEB411C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	ConsoleKit.spec 
Log Message:
Fix a memleak



Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ConsoleKit.spec	31 Jul 2009 15:01:15 -0000	1.47
+++ ConsoleKit.spec	1 Aug 2009 02:37:16 -0000	1.48
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -25,6 +25,9 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
+# fix a small memleak
+Patch0: small-fixes.patch
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -79,6 +82,7 @@ This package contains developer document
 
 %prep
 %setup -q
+%patch0 -p1 -b .small-fixes
 
 autoreconf -f -i
 
@@ -166,6 +170,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 0.3.1-2
+- Fix a small memory leak
+
 * Fri Jul 31 2009 Ray Strode <rstrode at redhat.com> 0.3.1-1
 - Update to 0.3.1
 



From mclasen at fedoraproject.org  Sat Aug  1 02:40:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 02:40:41 +0000 (UTC)
Subject: rpms/ConsoleKit/devel small-fixes.patch,NONE,1.1
Message-ID: <20090801024041.E28D811C04D5@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Added Files:
	small-fixes.patch 
Log Message:
add patch


small-fixes.patch:
 ck-manager.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE small-fixes.patch ---
diff -up ConsoleKit-0.3.1/src/ck-manager.c.small-fixes ConsoleKit-0.3.1/src/ck-manager.c
--- ConsoleKit-0.3.1/src/ck-manager.c.small-fixes	2009-07-31 22:32:32.382848777 -0400
+++ ConsoleKit-0.3.1/src/ck-manager.c	2009-07-31 22:34:55.159597733 -0400
@@ -810,12 +810,9 @@ check_polkit_permissions (CkManager     
                           AuthorizedCallback     callback)
 {
         const char    *sender;
-        GError        *error;
         PolkitSubject *subject;
         AuthorizedCallbackData *data;
 
-        error = NULL;
-
         g_debug ("constructing polkit data");
 
         /* Check that caller is privileged */
@@ -837,6 +834,7 @@ check_polkit_permissions (CkManager     
                                               NULL,
                                               (GAsyncReadyCallback)auth_ready_callback,
                                               data);
+        g_object_unref (subject);
 }
 
 static void
@@ -873,14 +871,12 @@ get_polkit_permissions (CkManager   *man
 {
         const char    *sender;
         PolkitSubject *subject;
-        GError *error;
 
         g_debug ("get permissions for action %s", action);
 
         sender = dbus_g_method_get_sender (context);
         subject = polkit_system_bus_name_new (sender);
 
-        error = NULL;
         polkit_authority_check_authorization (manager->priv->pol_ctx,
                                               subject,
                                               action,
@@ -890,7 +886,6 @@ get_polkit_permissions (CkManager   *man
                                               (GAsyncReadyCallback) ready_cb,
                                               context);
         g_object_unref (subject);
-
 }
 #endif
 



From cweyl at fedoraproject.org  Sat Aug  1 03:00:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  1 Aug 2009 03:00:23 +0000 (UTC)
Subject: rpms/perl-DBIx-Class/F-11 perl-DBIx-Class.spec, 1.8, 1.9 sources,
	1.3, 1.4
Message-ID: <20090801030023.76E2011C04D5@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27106

Modified Files:
	perl-DBIx-Class.spec sources 
Log Message:
* Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08108-1
- auto-update to 0.08108 (by cpan-spec-update 0.01)



Index: perl-DBIx-Class.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/F-11/perl-DBIx-Class.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-DBIx-Class.spec	22 Mar 2009 18:02:31 -0000	1.8
+++ perl-DBIx-Class.spec	1 Aug 2009 03:00:20 -0000	1.9
@@ -1,50 +1,44 @@
-%define _default_patch_fuzz 2 
-
 Name:           perl-DBIx-Class
-Version:        0.08012
-Release:        3%{?dist}
+Version:        0.08108
+Release:        1%{?dist}
 Summary:        Extensible and flexible object <-> relational mapper
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DBIx-Class/
-Source0:        http://www.cpan.org/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-## patches...
-# make tests skip a little more verbosely
-Patch3:         verbose.patch
-
 # core
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(ExtUtils::MakeMaker) 
-BuildRequires:  perl(Scalar::Util) 
-BuildRequires:  perl(Storable) 
-BuildRequires:  perl(Test::Builder) >= 0.32
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Storable)
+BuildRequires:  perl(Test::Builder) >= 0.33
 BuildRequires:  perl(Test::Deep)
 
+# Required by inc/Module/AutoInstall
+BuildRequires:  perl(CPAN)
+
 ## Dependencies
-BuildRequires:  perl(Carp::Clan) 
-BuildRequires:  perl(Class::Accessor::Grouped) >= 0.08002
+BuildRequires:  perl(Carp::Clan) >= 6
+BuildRequires:  perl(Class::Accessor::Grouped) >= 0.08003
 BuildRequires:  perl(Class::C3) >= 0.2
-BuildRequires:  perl(Class::C3::Componentised) 
+BuildRequires:  perl(Class::C3::Componentised) >= 1.0005
 # for CDBI-compat bits...
 BuildRequires:  perl(Class::Data::Inheritable)
-BuildRequires:  perl(Class::Inspector) 
-BuildRequires:  perl(Class::Trigger) 
+BuildRequires:  perl(Class::Inspector) >= 1.24
+BuildRequires:  perl(Class::Trigger)
 BuildRequires:  perl(Data::Page) >= 2
-# see BZ#245699 -- requires patched version, not CPAN
-BuildRequires:  perl(DBD::SQLite) >= 1.13
-BuildRequires:  perl(DBI) >= 1.4
-BuildRequires:  perl(DBIx::ContextualFetch) 
-BuildRequires:  perl(JSON::Any) >= 1.17 
+BuildRequires:  perl(DBD::SQLite) >= 1.25
+BuildRequires:  perl(DBI) >= 1.605
+BuildRequires:  perl(DBIx::ContextualFetch)
+BuildRequires:  perl(JSON::Any) >= 1.18
 BuildRequires:  perl(List::Util) >= 1.19
-BuildRequires:  perl(Module::Find)
+BuildRequires:  perl(Module::Find) >= 0.06
 BuildRequires:  perl(Scope::Guard) >= 0.03
-BuildRequires:  perl(SQL::Abstract) >= 1.24
-# darn RPM version compares...
-#BuildRequires:  perl(SQL::Abstract::Limit) >= 0.13
+BuildRequires:  perl(SQL::Abstract) >= 1.56
 BuildRequires:  perl(SQL::Abstract::Limit) >= 0.13
 BuildRequires:  perl(Test::Exception)
 # optional tests
@@ -57,16 +51,55 @@ BuildRequires:  perl(SQL::Translator)
 BuildRequires:  perl(DateTime)
 BuildRequires:  perl(DateTime::Format::Oracle)
 BuildRequires:  perl(DBIx::ContextualFetch)
+# optional tests as of 0.08102
+BuildRequires:  perl(Clone)
+BuildRequires:  perl(Time::Piece)
+BuildRequires:  perl(Time::Piece::MySQL)
+# .. the following are also needed as a requires for replicated dbd support
+BuildRequires:  perl(MooseX::AttributeHelpers) >= 0.12
+BuildRequires:  perl(Class::MOP) >= 0.63
+BuildRequires:  perl(Moose) >= 0.54
+BuildRequires:  perl(Moose::Util::TypeConstraints) >= 0.54
+
+BuildRequires:  perl(Test::More) >= 0.82
+BuildRequires:  perl(MRO::Compat) >= 0.09
+BuildRequires:  perl(Test::Warn) >= 0.11
+BuildRequires:  perl(Sub::Name) >= 0.04
+BuildRequires:  perl(Path::Class) >= 0.16
 
+# these are hidden from PAUSE, yet picked up by us
+Provides:       perl(DBIx::Class::ClassResolver::PassThrough) = 0
+Provides:       perl(DBIx::Class::CDBICompat::Relationship) = 0
+Provides:       perl(DBIx::Class::Storage::DBI::Replicated::Types) = 0
 
 # not picked up...
-Requires:       perl(Class::Accessor::Grouped) >= 0.05002
-Requires:       perl(Class::C3::Componentised)
-Requires:       perl(SQL::Abstract) >= 1.2
+Requires:       perl(Class::Accessor::Grouped) >= 0.08003
+Requires:       perl(Class::C3::Componentised) >= 1.0005
+Requires:       perl(SQL::Abstract) >= 1.56
+
+### auto-added reqs!
+Requires:  perl(Carp::Clan) >= 6
+Requires:  perl(Class::Inspector) >= 1.24
+Requires:  perl(DBD::SQLite) >= 1.25
+Requires:  perl(DBI) >= 1.605
+Requires:  perl(Data::Page) >= 2
+Requires:  perl(JSON::Any) >= 1.18
+Requires:  perl(List::Util)
+Requires:  perl(MRO::Compat) >= 0.09
+Requires:  perl(Module::Find) >= 0.06
+Requires:  perl(Path::Class) >= 0.16
+Requires:  perl(SQL::Abstract::Limit) >= 0.13
+Requires:  perl(Scalar::Util)
+Requires:  perl(Scope::Guard) >= 0.03
+Requires:  perl(Storable)
+Requires:  perl(Sub::Name) >= 0.04
+
+# don't "provide" rpm-metadata for things we shouldn't
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%_docdir' | %{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__grep} -v '%_docdir' | %{__deploop R} | %{__sed} -e '/perl(DBD::Pg)/d; /perl(DBD::Oracle)/d'"
 
-# not picked up automagically (yet)... 
-Provides:       perl(DBIx::Class::ClassResolver::PassThrough) = 0
-Provides:       perl(DBIx::Class::Storage::TxnScopeGuard)     = 0
 
 %description
 This is an SQL to OO mapper with an object API inspired by Class::DBI
@@ -81,39 +114,16 @@ DISTINCT, GROUP BY and HAVING support.
 %prep
 %setup -q -n DBIx-Class-%{version}
 
-# tell us why we're skipping, eh?
-%patch3
-
 find t/ -type f -exec perl -pi -e 's|\r||; s|^#!perl|#!/usr/bin/perl|' {} +
 find .  -type f -exec chmod -c -x {} +
 find t/ -type f -name '*.orig' -exec rm -v {} +
 
 # utf8 issues
-BAD='README ./lib/DBIx/Class/Storage/DBI/Replication.pm ./lib/DBIx/Class.pm'
-for i in $BAD ; do 
+for i in `find . -type f` ; do
     iconv -f iso8859-1 -t UTF-8 $i > foo
-    mv foo $i 
+    mv foo $i
 done
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` 
-EOF
-
-%define __perl_provides %{_builddir}/DBIx-Class-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` |\
-    sed -e '/perl(DBD::Pg)/d' 
-EOF
-
-%define __perl_requires %{_builddir}/DBIx-Class-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -123,13 +133,17 @@ rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} + 
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
 
 %check
 # note this test suite is noisy!
+export DBICTEST_THREAD_STRESS=1
+export DBICTEST_FORK_STRESS=1
+export DBICTEST_STORAGE_STRESS=1
+export DATA_DUMPER_TEST=1
 make test
 
 %clean
@@ -137,13 +151,79 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README t/
+%doc Changes README examples/ t/
 %{perl_vendorlib}/*
 %{_bindir}/*
 %{_mandir}/man[13]/*
 
 
 %changelog
+* Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08108-1
+- auto-update to 0.08108 (by cpan-spec-update 0.01)
+
+* Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.08107-3
+- Add BR: perl(CPAN) to fix rebuild-breakdown.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08107-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08107-1
+- auto-update to 0.08107 (by cpan-spec-update 0.01)
+- altered br on perl(DBD::SQLite) (1.13 => 1.25)
+- altered br on perl(SQL::Abstract) (1.55 => 1.56)
+- added a new req on perl(Carp::Clan) (version 6)
+- altered req on perl(Class::Accessor::Grouped) (0.05002 => 0.08003)
+- altered req on perl(Class::C3::Componentised) (0 => 1.0005)
+- added a new req on perl(Class::Inspector) (version 1.24)
+- added a new req on perl(DBD::SQLite) (version 1.25)
+- added a new req on perl(DBI) (version 1.605)
+- added a new req on perl(Data::Page) (version 2)
+- added a new req on perl(JSON::Any) (version 1.18)
+- added a new req on perl(List::Util) (version 0)
+- added a new req on perl(MRO::Compat) (version 0.09)
+- added a new req on perl(Module::Find) (version 0.06)
+- added a new req on perl(Path::Class) (version 0.16)
+- altered req on perl(SQL::Abstract) (1.2 => 1.56)
+- added a new req on perl(SQL::Abstract::Limit) (version 0.13)
+- added a new req on perl(Scalar::Util) (version 0)
+- added a new req on perl(Scope::Guard) (version 0.03)
+- added a new req on perl(Storable) (version 0)
+- added a new req on perl(Sub::Name) (version 0.04)
+- ** manual updates follow
+- force a provides on perl(DBIx::Class::Storage::DBI::Replicated::Types)
+- rejigger filtering to a cleaner variant
+- drop remaining patch artifacts
+
+* Fri May 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08103-1
+- auto-update to 0.08103 (by cpan-spec-update 0.01)
+- altered br on perl(Class::Inspector) (0 => 1.24)
+- altered br on perl(Carp::Clan) (0 => 6)
+- altered br on perl(JSON::Any) (1.17 => 1.18)
+- altered br on perl(Module::Find) (0 => 0.06)
+- altered br on perl(DBI) (1.4 => 1.605)
+- altered br on perl(SQL::Abstract) (1.51 => 1.55)
+- added a new br on perl(Test::More) (version 0.82)
+- altered br on perl(Path::Class) (0 => 0.16)
+
+* Sun May 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08102-3
+- we should also provide perl(DBIx::Class::CDBICompat::Relationship) (and do
+  now so provide)
+
+* Sun May 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08102-2
+- additional BR's for optional tests
+
+* Sun May 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08102-1
+- drop verbose.patch: largely supersceded
+- auto-update to 0.08102 (by cpan-spec-update 0.01)
+- added a new br on perl(MRO::Compat) (version 0.09)
+- added a new br on perl(Test::Warn) (version 0.11)
+- altered br on perl(SQL::Abstract) (1.24 => 1.51)
+- added a new br on perl(Sub::Name) (version 0.04)
+- altered br on perl(Test::Builder) (0.32 => 0.33)
+- altered br on perl(Class::C3::Componentised) (0 => 1.0005)
+- altered br on perl(Class::Accessor::Grouped) (0.08002 => 0.08003)
+- added a new br on perl(Path::Class) (version 0)
+
 * Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.08012-3
 - Added missing build requirement perl(Test::Deep) for make tests
 - Re-diffed make tests patch for more verbosity when skipping tests
@@ -155,7 +235,7 @@ rm -rf %{buildroot}
 - update to 0.08012
 
 * Thu Oct 16 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08010-9
-- stop filtering perl(DBD::Multi) 
+- stop filtering perl(DBD::Multi)
 
 * Sun Oct 05 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08010-8
 - filter all prov/req from anything under _docdir


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Feb 2009 07:03:24 -0000	1.3
+++ sources	1 Aug 2009 03:00:21 -0000	1.4
@@ -1 +1 @@
-8d8c526f812d6213a04c6644d52a44b1  DBIx-Class-0.08012.tar.gz
+ed377d6968192fcf874ee5b92d212382  DBIx-Class-0.08108.tar.gz



From mclasen at fedoraproject.org  Sat Aug  1 03:09:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 03:09:48 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.224,1.225
Message-ID: <20090801030948.9F50C11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
Drop unneeded python deps



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- gnome-games.spec	1 Aug 2009 01:14:49 -0000	1.224
+++ gnome-games.spec	1 Aug 2009 03:09:48 -0000	1.225
@@ -46,7 +46,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.27.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -67,14 +67,7 @@ Requires(preun): GConf2
 
 Requires: GConf2
 Requires: pygtk2
-Requires: gnome-python2-desktop >= %{gnome_python_desktop}
-Requires: gnome-python2-gnomeprint
-Requires: pygtk2-libglade
 Requires: gnome-python2-gconf
-Requires: gnome-python2-canvas
-Requires: pygtkglext
-Requires: PyOpenGL
-Requires: gnuchess
 Requires: hicolor-icon-theme
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -118,6 +111,9 @@ in a variety of styles and genres for th
 Group: Amusements/Games
 Summary: More games for the GNOME desktop
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: pygtkglext
+Requires: PyOpenGL
+Requires: gnuchess
 
 %description extra
 The gnome-games-extra package contains additional small "five-minute" games
@@ -493,6 +489,9 @@ fi
 
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-5
+- Drop unneded python deps
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-4
 - Fix a typo (#515033)
 



From alexlan at fedoraproject.org  Sat Aug  1 03:13:26 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sat,  1 Aug 2009 03:13:26 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-includes.patch, NONE, 
	1.1 .cvsignore, 1.14, 1.15 octave-forge.spec, 1.70, 1.71 sources,
	1.14, 1.15
Message-ID: <20090801031326.6236811C00CE@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30112

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-20090607-includes.patch 
Log Message:
* 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


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>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/.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	1 Aug 2009 03:13:25 -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/devel/octave-forge.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- octave-forge.spec	25 Jul 2009 20:33:55 -0000	1.70
+++ octave-forge.spec	1 Aug 2009 03:13:26 -0000	1.71
@@ -1,8 +1,8 @@
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
 
 Name:           octave-forge
-Version:        20080831
-Release:        10%{?dist}
+Version:        20090607
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,82 +17,101 @@ 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:         %{name}-image-1.0.8-build.patch
+Patch0:		octave-forge-20090607-includes.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
+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.0
+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
+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
+Provides: octave-spanish = 1.0.1
+Provides: octave-pt_br = 1.0.8
 
 
 %description
@@ -118,6 +137,7 @@ rm extra/windows-*.tar.gz
 # 5. exclude database stuff--it should be in its own package
 rm main/database-*.tar.gz
 
+
 #Unpack everything
 for pkg in main extra language
 do
@@ -207,6 +227,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/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	1 Aug 2009 03:13:26 -0000	1.15
@@ -1 +1 @@
-5df8ff572c9b990e404ba94a6724c898  octave-forge-bundle-20080831.patched.tar.gz
+ae1c9fd282e66e6e1bee2535963e6d6e  octave-forge-bundle-20090607.patched.tar.gz



From mclasen at fedoraproject.org  Sat Aug  1 03:26:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 03:26:21 +0000 (UTC)
Subject: rpms/clutter/devel clutter.spec,1.30,1.31
Message-ID: <20090801032621.5164E11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	clutter.spec 
Log Message:
Drop a -devel dep that causes live cd bloat



Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- clutter.spec	29 Jul 2009 10:05:37 -0000	1.30
+++ clutter.spec	1 Aug 2009 03:26:21 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           clutter
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:       gobject-introspection
 # FIXME to remove when all the bits have been merged into their
 # libraries
-Requires:       gir-repository-devel
+Requires:       gir-repository
 
 BuildRequires:  glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel
 BuildRequires:  libXdamage-devel gettext gtk-doc
@@ -97,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 1.0.0-2
+- Drop the gir-repository-devel dep, which pulls a bunch of -devel
+  onto the live cd
+
 * Wed Jul 29 2009 Bastien Nocera <bnocera at redhat.com> 1.0.0-1
 - Update to 1.0.0
 



From mclasen at fedoraproject.org  Sat Aug  1 03:29:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  1 Aug 2009 03:29:08 +0000 (UTC)
Subject: rpms/clutter/devel clutter.spec,1.31,1.32
Message-ID: <20090801032908.86C1D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	clutter.spec 
Log Message:
Drop excessive deps



Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- clutter.spec	1 Aug 2009 03:26:21 -0000	1.31
+++ clutter.spec	1 Aug 2009 03:29:08 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           clutter
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
@@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 1.0.0-2
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 1.0.0-3
 - Drop the gir-repository-devel dep, which pulls a bunch of -devel
   onto the live cd
 



From kyle at fedoraproject.org  Sat Aug  1 03:45:36 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat,  1 Aug 2009 03:45:36 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc5.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1105, 1.1106 kernel.spec, 1.1679, 1.1680 sources, 1.1063,
	1.1064 upstream, 1.977, 1.978 patch-2.6.31-rc4-git6.bz2.sign,
	1.1, NONE patch-2.6.31-rc4.bz2.sign, 1.1, NONE
Message-ID: <20090801034536.B92AE11C00CE@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc5.bz2.sign 
Removed Files:
	patch-2.6.31-rc4-git6.bz2.sign patch-2.6.31-rc4.bz2.sign 
Log Message:
* Fri Jul 31 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.117.rc5
- Linux 2.6.31-rc5



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

iD8DBQBKc5FayGugalF9Dw4RAhV0AJwOz4HlfA1WCi74lPIuro8pDNPrzgCgh/ag
vf8aBky58al8AnVRvhpNaIs=
=vgyD
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1105
retrieving revision 1.1106
diff -u -p -r1.1105 -r1.1106
--- .cvsignore	31 Jul 2009 01:00:04 -0000	1.1105
+++ .cvsignore	1 Aug 2009 03:45:35 -0000	1.1106
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc4.bz2
-patch-2.6.31-rc4-git6.bz2
+patch-2.6.31-rc5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1679
retrieving revision 1.1680
diff -u -p -r1.1679 -r1.1680
--- kernel.spec	31 Jul 2009 02:37:11 -0000	1.1679
+++ kernel.spec	1 Aug 2009 03:45:36 -0000	1.1680
@@ -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 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -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
@@ -1937,6 +1937,9 @@ fi
 # and build.
 
 %changelog
+* Fri Jul 31 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.117.rc5
+- Linux 2.6.31-rc5
+
 * Fri Jul 31 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-dell-laptop-rfkill-fix.patch: Fix up Dell rfkill
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1063
retrieving revision 1.1064
diff -u -p -r1.1063 -r1.1064
--- sources	31 Jul 2009 01:00:05 -0000	1.1063
+++ sources	1 Aug 2009 03:45:36 -0000	1.1064
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-879f514ce009b9a7535b743f71cd3c02  patch-2.6.31-rc4.bz2
-600168a562b18faa4bdc2f6ba934d57c  patch-2.6.31-rc4-git6.bz2
+09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -p -r1.977 -r1.978
--- upstream	31 Jul 2009 01:00:05 -0000	1.977
+++ upstream	1 Aug 2009 03:45:36 -0000	1.978
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc4.bz2
-patch-2.6.31-rc4-git6.bz2
+patch-2.6.31-rc5.bz2


--- patch-2.6.31-rc4-git6.bz2.sign DELETED ---


--- patch-2.6.31-rc4.bz2.sign DELETED ---



From ctyler at fedoraproject.org  Sat Aug  1 03:59:36 2009
From: ctyler at fedoraproject.org (Chris Tyler)
Date: Sat,  1 Aug 2009 03:59:36 +0000 (UTC)
Subject: rpms/WebShell/devel README.fedora, NONE,
	1.1 WebShell-0.9.6-default-paths.p0, NONE, 1.1 WebShell.spec,
	NONE, 1.1 background.jpg, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801035936.BF0F511C00CE@cvs1.fedora.phx.redhat.com>

Author: ctyler

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora WebShell-0.9.6-default-paths.p0 WebShell.spec 
	background.jpg import.log 
Log Message:
* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-3
- Replaced background image due to potential license issues
- Added README.fedora with setup and usage info
- Disabled post scriptlet per reviewer recommendation

* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-2
- Changed envars to macros for consistancy
- Added Requires: openssl for make_certificate.sh

* Fri Jul 10 2009 Chris Tyler <chris at tylers.info> - 0.9.6-1
- Initial RPM release




--- NEW FILE README.fedora ---
To use WebShell with Fedora, as root:
- generate a certificate:
	cd /usr/share/WebShell
	./make_certificate.sh
- run /usr/bin/webshell

Then, on the client system, connect to http://hostname:8022/

Notes:

- This package contains a replacement background.jpg due to concerns over
the copyright/license status of the original image.

- If you do not want to run this as root, copy the key to a non-root account
and use that account to run /usr/bin/webshell.

--
Chris Tyler (ctyler) 2009-07-22



--- NEW FILE WebShell-0.9.6-default-paths.p0 ---
--- webshell.py.original	2009-07-10 10:50:44.000000000 -0400
+++ webshell.py	2009-07-10 10:37:32.000000000 -0400
@@ -1361,10 +1361,10 @@
 		help = "set daemon user id")
 	parser.add_option("--ssl-disable", action = "store_false", dest = "ssl_enabled", default = 1,
 		help = "disable SSL, set listen interface to localhost")
-	parser.add_option("--ssl-cert", dest = "ssl_cert", default = "webshell.pem",
-		help = "set SSL certificate file (default: webshell.pem)")
- 	parser.add_option("--www-dir", dest = "www_dir", default = "www",
-		help = "set WebShell www path (default: www)")
+	parser.add_option("--ssl-cert", dest = "ssl_cert", default = "/usr/share/WebShell/webshell.pem",
+		help = "set SSL certificate file (default: /usr/share/WebShell/webshell.pem)")
+ 	parser.add_option("--www-dir", dest = "www_dir", default = "/usr/share/WebShell/www",
+		help = "set WebShell www path (default: /usr/share/WebShell/www)")
 	(o, a) = parser.parse_args()
 	if o.version:
 		print 'WebShell ' + version


--- NEW FILE WebShell.spec ---
Name:           WebShell
Version:        0.9.6
Release:        3%{?dist}
Summary:        SSL server for web-based SSH access from browsers and mobile devices

Group:          Applications/Internet
License:        GPLv2
URL:            http://www-personal.umich.edu/~mressl/webshell/index.html
Source0:        http://web-shell.googlecode.com/files/WebShell-0.9.6.zip
Source1:        README.fedora
Source2:        background.jpg
Patch0:         WebShell-0.9.6-default-paths.p0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       pyOpenSSL
Requires:       openssh-clients
Requires:       openssl

%description
WebShell is a standalone web server and browser application that provide
encrypted shell access through any web browser (https://host:8022). WebShell
includes a touch keyboard for use on mobile devices with a touch screen.


%prep
%setup -q
cp %{SOURCE1} .
%patch0


%build


%install
rm -rf %{buildroot}
install -d          %{buildroot}%{_datadir}/%{name}/www
install -p  -m 0755 make_certificate.sh %{buildroot}%{_datadir}/%{name}
install -p  -m 0644 make_certificate.cfg %{buildroot}%{_datadir}/%{name}
install -p  -m 0644 www/* %{buildroot}%{_datadir}/%{name}/www
install -pD -m 0755 webshell.py %{buildroot}%{_bindir}/webshell
cp -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/www


%clean
rm -rf %{buildroot}


#
# Disabled for package release 3
# We'll let the user do this -- instructions in README.fedora
#
#%%post
#cd %{_datadir}/%{name}
#./make_certificate.sh



%files
%defattr(-,root,root,-)
%doc README.txt README.fedora
%{_datadir}/%{name}
%{_bindir}/*


%changelog
* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-3
- Replaced background image due to potential license issues
- Added README.fedora with setup and usage info
- Disabled post scriptlet per reviewer recommendation

* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-2
- Changed envars to macros for consistancy
- Added Requires: openssl for make_certificate.sh

* Fri Jul 10 2009 Chris Tyler <chris at tylers.info> - 0.9.6-1
- Initial RPM release



--- NEW FILE import.log ---
WebShell-0_9_6-3_fc10:HEAD:WebShell-0.9.6-3.fc10.src.rpm:1249099154


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebShell/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jul 2009 16:38:29 -0000	1.1
+++ .cvsignore	1 Aug 2009 03:59:35 -0000	1.2
@@ -0,0 +1 @@
+WebShell-0.9.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebShell/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jul 2009 16:38:29 -0000	1.1
+++ sources	1 Aug 2009 03:59:36 -0000	1.2
@@ -0,0 +1 @@
+5efa06473bef8dfb2049a15d99b76d8e  WebShell-0.9.6.zip



From alexlan at fedoraproject.org  Sat Aug  1 04:06:55 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sat,  1 Aug 2009 04:06:55 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-ann-swig-build.patch, 
	NONE, 1.1 octave-forge.spec, 1.71, 1.72
Message-ID: <20090801040655.D9F0211C004A@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28238

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-ann-swig-build.patch 
Log Message:
* Sat Aug  1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-2
- Add patch from SVN (r6006) which has SWIG fixes for ann module.


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)
 {


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- octave-forge.spec	1 Aug 2009 03:13:26 -0000	1.71
+++ octave-forge.spec	1 Aug 2009 04:06:55 -0000	1.72
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -19,6 +19,7 @@ URL:            http://octave.sourceforg
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
 #Patch0:         %{name}-image-1.0.8-build.patch
 Patch0:		octave-forge-20090607-includes.patch
+Patch1:		octave-forge-20090607-ann-swig-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -152,8 +153,9 @@ do
    cd ..
 done
 
-#apply patch to build image-1.0.8 (bug #477577)
+#apply patches
 %patch0 -p0
+%patch1 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -227,6 +229,9 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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



From alexlan at fedoraproject.org  Sat Aug  1 05:19:24 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sat,  1 Aug 2009 05:19:24 +0000 (UTC)
Subject: rpms/GMT/devel GMT.spec,1.10,1.11
Message-ID: <20090801051924.9086611C004A@cvs1.fedora.phx.redhat.com>

Author: alexlan

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

Modified Files:
	GMT.spec 
Log Message:
* Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 4.5.0-4
- Rebuild against Octave 3.2.2



Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/GMT.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- GMT.spec	27 Jul 2009 14:36:49 -0000	1.10
+++ GMT.spec	1 Aug 2009 05:19:23 -0000	1.11
@@ -8,7 +8,7 @@
 
 Name:           GMT
 Version:        4.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Generic Mapping Tools
 
 Group:          Applications/Engineering
@@ -235,6 +235,9 @@ 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
 



From dwayne at fedoraproject.org  Sat Aug  1 06:08:39 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Sat,  1 Aug 2009 06:08:39 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 virtaal.spec, 1.10, 1.11
Message-ID: <20090801060839.E47F411C004A@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
- Update to 0.4.0 rc2:
  - More improvements to the RTL interface of Virtaal
  - Bugfixes relating to undo and editing XLIFF inline elements 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Jul 2009 19:18:22 -0000	1.8
+++ .cvsignore	1 Aug 2009 06:08:37 -0000	1.9
@@ -1,3 +1,4 @@
 virtaal-0.3.1.tar.bz2
 virtaal-0.4.0-beta1.tar.bz2
 virtaal-0.4.0-rc1.tar.bz2
+virtaal-0.4.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Jul 2009 19:18:22 -0000	1.8
+++ sources	1 Aug 2009 06:08:38 -0000	1.9
@@ -1,3 +1,4 @@
 eef03a4afa2f8a1e17f94a807268b7e3  virtaal-0.3.1.tar.bz2
 30ce41da361ef9efab109eea8efebf64  virtaal-0.4.0-beta1.tar.bz2
 a4b889b28f905803351e89356baf83d0  virtaal-0.4.0-rc1.tar.bz2
+92f4615361f7574d62a58ef0a5085d5c  virtaal-0.4.0-rc2.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- virtaal.spec	24 Jul 2009 19:18:22 -0000	1.10
+++ virtaal.spec	1 Aug 2009 06:08:38 -0000	1.11
@@ -2,14 +2,14 @@
 
 Name:           virtaal
 Version:        0.4.0
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc2%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
 #Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
-Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-beta1/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-rc2/%{name}-%{version}-rc2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
@@ -54,7 +54,7 @@ converters allow translators to edit: Op
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
 
@@ -142,6 +142,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
+- Update to 0.4.0 rc2:
+  - More improvements to the RTL interface of Virtaal
+  - Bugfixes relating to undo and editing XLIFF inline elements 
+
 * Fri Jul 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.2.rc1
 - Update to 0.4.0 rc1:
 



From ankursinha at fedoraproject.org  Sat Aug  1 06:21:13 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sat,  1 Aug 2009 06:21:13 +0000 (UTC)
Subject: rpms/Panini/devel Panini.desktop, NONE, 1.1 Panini.png, NONE,
	1.1 Panini.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090801062113.18E7711C004A@cvs1.fedora.phx.redhat.com>

Author: ankursinha

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

Modified Files:
	.cvsignore sources 
Added Files:
	Panini.desktop Panini.png Panini.spec import.log 
Log Message:
* Sat Aug 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-3
- initial CVS commit




--- NEW FILE Panini.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Panini
GenericName=Panini
Comment=perspective views from panoramic/wide angle pictures.
Exec=Panini
Icon=Panini
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE Panini.spec ---
Name:		Panini	
Version:	0.71.103
Release:	3%{?dist}
Summary:	A tool for creating perspective views from panoramic and wide angle images

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://sourceforge.net/projects/pvqt/
Source0:	http://downloads.sourceforge.net/pvqt/%{name}-%{version}-src.zip
Source1:	%{name}.desktop
Source2:	%{name}.png
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	qt4-devel >= 4.4.2, desktop-file-utils

%description
Panini can load most common photo and panoramic formats from image files such
as those created with hugin or QuickTimeVR (QTVR .mov) files.  Like all pano
viewers, it then shows a linear perspective view that can be panned and zoomed.
But Panini can also display a range of wide angle perspectives via the
stereographic and "Pannini" vedutismo families of projections, and shift,
rotate, and stretch the image like a software view camera.

%prep
%setup -q -n %{name}-%{version}-src
qmake-qt4 panini.pro

for txt in *.txt ; do
	sed 's/\r//' $txt > $txt.new
	touch -r $txt $txt.new
	mv $txt.new $txt
done

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m 755 -p %{name} %{buildroot}%{_bindir}

desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps

%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null ||:

%files
%defattr(-,root,root,-)
%doc panini-build.txt panini-usage.txt GPLversion3.txt panini-0.71-release.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/*.png
%{_datadir}/applications/*

%changelog
* Fri Jul 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-3
- used png for icon
* Thu Jul 23 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-2
- Corrected License tag
- used icon from source
* Fri Jul 17 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-1
- initial rpm build with new source with clearified License.
* Wed Jul 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.102-1
- Initial RPM build


--- NEW FILE import.log ---
Panini-0_71_103-3_fc11:HEAD:Panini-0.71.103-3.fc11.src.rpm:1249107562


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Panini/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jul 2009 15:13:34 -0000	1.1
+++ .cvsignore	1 Aug 2009 06:21:12 -0000	1.2
@@ -0,0 +1 @@
+Panini-0.71.103-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Panini/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 15:13:34 -0000	1.1
+++ sources	1 Aug 2009 06:21:12 -0000	1.2
@@ -0,0 +1 @@
+2814428b6361f5b6a8037898e0aab52a  Panini-0.71.103-src.zip



From ankursinha at fedoraproject.org  Sat Aug  1 06:26:20 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sat,  1 Aug 2009 06:26:20 +0000 (UTC)
Subject: rpms/Panini/F-10 Panini.desktop, NONE, 1.1 Panini.png, NONE,
	1.1 Panini.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090801062621.031CA11C004A@cvs1.fedora.phx.redhat.com>

Author: ankursinha

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

Modified Files:
	.cvsignore sources 
Added Files:
	Panini.desktop Panini.png Panini.spec import.log 
Log Message:
* Sat Aug 1 2009 Ankur Sinha <ankursinha AT fedoraprojet DOT org> - 0.71.103-3
- Initial cvs commit to branch



--- NEW FILE Panini.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Panini
GenericName=Panini
Comment=perspective views from panoramic/wide angle pictures.
Exec=Panini
Icon=Panini
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE Panini.spec ---
Name:		Panini	
Version:	0.71.103
Release:	3%{?dist}
Summary:	A tool for creating perspective views from panoramic and wide angle images

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://sourceforge.net/projects/pvqt/
Source0:	http://downloads.sourceforge.net/pvqt/%{name}-%{version}-src.zip
Source1:	%{name}.desktop
Source2:	%{name}.png
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	qt4-devel >= 4.4.2, desktop-file-utils

%description
Panini can load most common photo and panoramic formats from image files such
as those created with hugin or QuickTimeVR (QTVR .mov) files.  Like all pano
viewers, it then shows a linear perspective view that can be panned and zoomed.
But Panini can also display a range of wide angle perspectives via the
stereographic and "Pannini" vedutismo families of projections, and shift,
rotate, and stretch the image like a software view camera.

%prep
%setup -q -n %{name}-%{version}-src
qmake-qt4 panini.pro

for txt in *.txt ; do
	sed 's/\r//' $txt > $txt.new
	touch -r $txt $txt.new
	mv $txt.new $txt
done

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m 755 -p %{name} %{buildroot}%{_bindir}

desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps

%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null ||:

%files
%defattr(-,root,root,-)
%doc panini-build.txt panini-usage.txt GPLversion3.txt panini-0.71-release.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/*.png
%{_datadir}/applications/*

%changelog
* Fri Jul 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-3
- used png for icon
* Thu Jul 23 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-2
- Corrected License tag
- used icon from source
* Fri Jul 17 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-1
- initial rpm build with new source with clearified License.
* Wed Jul 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.102-1
- Initial RPM build


--- NEW FILE import.log ---
Panini-0_71_103-3_fc11:F-10:Panini-0.71.103-3.fc11.src.rpm:1249107898


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Panini/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jul 2009 15:13:34 -0000	1.1
+++ .cvsignore	1 Aug 2009 06:26:20 -0000	1.2
@@ -0,0 +1 @@
+Panini-0.71.103-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Panini/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 15:13:34 -0000	1.1
+++ sources	1 Aug 2009 06:26:20 -0000	1.2
@@ -0,0 +1 @@
+2814428b6361f5b6a8037898e0aab52a  Panini-0.71.103-src.zip



From ankursinha at fedoraproject.org  Sat Aug  1 06:30:08 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sat,  1 Aug 2009 06:30:08 +0000 (UTC)
Subject: rpms/Panini/F-11 Panini.desktop, NONE, 1.1 Panini.png, NONE,
	1.1 Panini.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090801063008.B927211C04D5@cvs1.fedora.phx.redhat.com>

Author: ankursinha

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

Modified Files:
	.cvsignore sources 
Added Files:
	Panini.desktop Panini.png Panini.spec import.log 
Log Message:
* Sat Aug 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-3
- initial CVS commit



--- NEW FILE Panini.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Panini
GenericName=Panini
Comment=perspective views from panoramic/wide angle pictures.
Exec=Panini
Icon=Panini
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE Panini.spec ---
Name:		Panini	
Version:	0.71.103
Release:	3%{?dist}
Summary:	A tool for creating perspective views from panoramic and wide angle images

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://sourceforge.net/projects/pvqt/
Source0:	http://downloads.sourceforge.net/pvqt/%{name}-%{version}-src.zip
Source1:	%{name}.desktop
Source2:	%{name}.png
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	qt4-devel >= 4.4.2, desktop-file-utils

%description
Panini can load most common photo and panoramic formats from image files such
as those created with hugin or QuickTimeVR (QTVR .mov) files.  Like all pano
viewers, it then shows a linear perspective view that can be panned and zoomed.
But Panini can also display a range of wide angle perspectives via the
stereographic and "Pannini" vedutismo families of projections, and shift,
rotate, and stretch the image like a software view camera.

%prep
%setup -q -n %{name}-%{version}-src
qmake-qt4 panini.pro

for txt in *.txt ; do
	sed 's/\r//' $txt > $txt.new
	touch -r $txt $txt.new
	mv $txt.new $txt
done

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m 755 -p %{name} %{buildroot}%{_bindir}

desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps

%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null ||:

%files
%defattr(-,root,root,-)
%doc panini-build.txt panini-usage.txt GPLversion3.txt panini-0.71-release.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/*.png
%{_datadir}/applications/*

%changelog
* Fri Jul 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-3
- used png for icon
* Thu Jul 23 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-2
- Corrected License tag
- used icon from source
* Fri Jul 17 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.103-1
- initial rpm build with new source with clearified License.
* Wed Jul 8 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.71.102-1
- Initial RPM build


--- NEW FILE import.log ---
Panini-0_71_103-3_fc11:F-11:Panini-0.71.103-3.fc11.src.rpm:1249108105


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Panini/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jul 2009 15:13:34 -0000	1.1
+++ .cvsignore	1 Aug 2009 06:30:06 -0000	1.2
@@ -0,0 +1 @@
+Panini-0.71.103-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Panini/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 15:13:34 -0000	1.1
+++ sources	1 Aug 2009 06:30:08 -0000	1.2
@@ -0,0 +1 @@
+2814428b6361f5b6a8037898e0aab52a  Panini-0.71.103-src.zip



From cweyl at fedoraproject.org  Sat Aug  1 06:37:21 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  1 Aug 2009 06:37:21 +0000 (UTC)
Subject: rpms/perl-HTML-FormFu-Model-DBIC/devel .cvsignore, 1.2,
	1.3 perl-HTML-FormFu-Model-DBIC.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090801063721.4006711C004A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3775

Modified Files:
	.cvsignore perl-HTML-FormFu-Model-DBIC.spec sources 
Log Message:
* Sat Aug 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05002-1
- auto-update to 0.05002 (by cpan-spec-update 0.01)
- altered br on perl(DBIx::Class) (0.08002 => 0.08106)
- added a new br on perl(DateTime::Format::SQLite) (version 0)
- altered br on perl(HTML::FormFu) (0.03007 => 0.05000)
- added a new br on perl(List::MoreUtils) (version 0)
- added a new req on perl(DBD::SQLite) (version 0)
- altered req on perl(DBIx::Class) (0 => 0.08106)
- added a new req on perl(HTML::FormFu) (version 0.05000)
- added a new req on perl(List::MoreUtils) (version 0)
- added a new req on perl(Task::Weaken) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 02:09:14 -0000	1.2
+++ .cvsignore	1 Aug 2009 06:37:20 -0000	1.3
@@ -1 +1 @@
-HTML-FormFu-Model-DBIC-0.03007.tar.gz
+HTML-FormFu-Model-DBIC-0.05002.tar.gz


Index: perl-HTML-FormFu-Model-DBIC.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel/perl-HTML-FormFu-Model-DBIC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-FormFu-Model-DBIC.spec	26 Jul 2009 06:24:57 -0000	1.2
+++ perl-HTML-FormFu-Model-DBIC.spec	1 Aug 2009 06:37:20 -0000	1.3
@@ -1,28 +1,33 @@
-Name:       perl-HTML-FormFu-Model-DBIC 
-Version:    0.03007 
-Release:    2%{?dist}
+Name:       perl-HTML-FormFu-Model-DBIC
+Version:    0.05002
+Release:    1%{?dist}
 # lib/HTML/FormFu/Model/DBIC.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Integrate HTML::FormFu with DBIx::Class 
-Source:     http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-Model-DBIC-%{version}.tar.gz 
+Summary:    Integrate HTML::FormFu with DBIx::Class
+Source:     http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-Model-DBIC-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/HTML-FormFu-Model-DBIC
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires: perl(DateTime::Format::MySQL)
+BuildRequires: perl(DateTime::Format::SQLite)
 BuildRequires: perl(DBD::SQLite)
-BuildRequires: perl(DBIx::Class) >= 0.08002
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(HTML::FormFu) >= 0.03007
+BuildRequires: perl(DBIx::Class) >= 0.08106
+BuildRequires: perl(HTML::FormFu) >= 0.05000
+BuildRequires: perl(List::MoreUtils)
 BuildRequires: perl(Task::Weaken)
 BuildRequires: perl(Test::MockObject)
 BuildRequires: perl(Test::More)
 
-# "use base"
 Requires:      perl(HTML::FormFu::Model)
-Requires:      perl(DBIx::Class)
+Requires:      perl(DBIx::Class) >= 0.08106
+Requires:      perl(DBD::SQLite)
+Requires:      perl(HTML::FormFu) >= 0.05000
+Requires:      perl(List::MoreUtils)
+Requires:      perl(Task::Weaken)
 
 %description
 Integrate your HTML::FormFu forms with a DBIx::Class model.
@@ -48,15 +53,27 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes 
+%doc Changes
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 01 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05002-1
+- auto-update to 0.05002 (by cpan-spec-update 0.01)
+- altered br on perl(DBIx::Class) (0.08002 => 0.08106)
+- added a new br on perl(DateTime::Format::SQLite) (version 0)
+- altered br on perl(HTML::FormFu) (0.03007 => 0.05000)
+- added a new br on perl(List::MoreUtils) (version 0)
+- added a new req on perl(DBD::SQLite) (version 0)
+- altered req on perl(DBIx::Class) (0 => 0.08106)
+- added a new req on perl(HTML::FormFu) (version 0.05000)
+- added a new req on perl(List::MoreUtils) (version 0)
+- added a new req on perl(Task::Weaken) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03007-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -66,4 +83,3 @@ rm -rf %{buildroot} 
 * Fri Feb 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03007-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-FormFu-Model-DBIC/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 02:09:15 -0000	1.2
+++ sources	1 Aug 2009 06:37:20 -0000	1.3
@@ -1 +1 @@
-caca3a81477206d8233ed39b46b4d8ce  HTML-FormFu-Model-DBIC-0.03007.tar.gz
+aba55f669530e02b421632da95c03f6b  HTML-FormFu-Model-DBIC-0.05002.tar.gz



From dwayne at fedoraproject.org  Sat Aug  1 07:55:09 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Sat,  1 Aug 2009 07:55:09 +0000 (UTC)
Subject: rpms/virtaal/F-11 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 virtaal.spec, 1.9, 1.10
Message-ID: <20090801075509.E326811C004A@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
- Update to 0.4.0 rc2:
  - More improvements to the RTL interface of Virtaal
  - Bugfixes relating to undo and editing XLIFF inline elements 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Jul 2009 19:23:43 -0000	1.8
+++ .cvsignore	1 Aug 2009 07:55:08 -0000	1.9
@@ -1,3 +1,4 @@
 virtaal-0.3.1.tar.bz2
 virtaal-0.4.0-beta1.tar.bz2
 virtaal-0.4.0-rc1.tar.bz2
+virtaal-0.4.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Jul 2009 19:23:43 -0000	1.8
+++ sources	1 Aug 2009 07:55:08 -0000	1.9
@@ -1,3 +1,4 @@
 eef03a4afa2f8a1e17f94a807268b7e3  virtaal-0.3.1.tar.bz2
 30ce41da361ef9efab109eea8efebf64  virtaal-0.4.0-beta1.tar.bz2
 a4b889b28f905803351e89356baf83d0  virtaal-0.4.0-rc1.tar.bz2
+92f4615361f7574d62a58ef0a5085d5c  virtaal-0.4.0-rc2.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/virtaal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- virtaal.spec	24 Jul 2009 19:23:43 -0000	1.9
+++ virtaal.spec	1 Aug 2009 07:55:08 -0000	1.10
@@ -2,14 +2,14 @@
 
 Name:           virtaal
 Version:        0.4.0
-Release:        0.2.rc1%{?dist}
+Release:        0.3.rc2%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
 #Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
-Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-beta1/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-rc2/%{name}-%{version}-rc2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
@@ -54,7 +54,7 @@ converters allow translators to edit: Op
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
 
@@ -141,6 +141,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
+- Update to 0.4.0 rc2:
+  - More improvements to the RTL interface of Virtaal
+  - Bugfixes relating to undo and editing XLIFF inline elements 
+
 * Fri Jul 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.2.rc1
 - Update to 0.4.0 rc1:
 



From mschwendt at fedoraproject.org  Sat Aug  1 08:56:48 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  1 Aug 2009 08:56:48 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.11,1.12
Message-ID: <20090801085648.3C16F11C004A@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17809

Modified Files:
	WhatsNew.py 
Log Message:
Inherit external release repos, if defined in oldpackagedirs map, when (re-)initialising whatsnew db.


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WhatsNew.py	6 Nov 2008 12:20:32 -0000	1.11
+++ WhatsNew.py	1 Aug 2009 08:56:46 -0000	1.12
@@ -75,18 +75,19 @@
             rpmfiles.remove(f)
 
 
-def rebuild(dist,srcdir):
+def rebuild(dist,srcdirs):
     """initialise the pickle files"""
     ts = rpmUtils.transaction.initReadOnlyTransaction()
 
     rpmfiles = []
-    for root, dirs, files in os.walk(srcdir):
-        srpms = []
-        srpms.extend(fnmatch.filter(files,'*.src.rpm'))
-        srpms.extend(fnmatch.filter(files,'*.nosrc.rpm'))
-        for f in srpms:
-            srcfile = os.path.join(root,f)
-            rpmfiles.append(srcfile)
+    for srcdir in srcdirs:
+        for root, dirs, files in os.walk(srcdir):
+            srpms = []
+            srpms.extend(fnmatch.filter(files,'*.src.rpm'))
+            srpms.extend(fnmatch.filter(files,'*.nosrc.rpm'))
+            for f in srpms:
+                srcfile = os.path.join(root,f)
+                rpmfiles.append(srcfile)
 
     stripold(rpmfiles)
     for srcfile in rpmfiles:
@@ -255,9 +256,24 @@
     names = {}
     clogdiffs = {}
     for dist in cfg.alldists:
-        srcdir = Utils.srpm_repodir( cfg, dist )
-        print '[WhatsNew] Rebuilding from', srcdir
-        rebuild(dist,srcdir)
+        srcdirs = [Utils.srpm_repodir( cfg, dist )]
+
+        # Consider the oldpackagedirs map to inherit src.rpms from
+        # any external release repos.
+        # It is assumed that 
+        if hasattr(cfg,'oldpackagedirs'):
+            dirs = cfg.oldpackagedirs.get(dist,None)
+            if not dirs or not isinstance(dirs,list):
+                dirs = []
+            for dir in dirs:
+                srcdir = dir.replace('$arch','source/SRPMS')
+                if os.path.exists( srcdir ):
+                    srcdirs.append( srcdir )
+                else:
+                    print 'WARNING:', srcdir, 'does not exist!'
+
+        print '[WhatsNew] Rebuilding from', srcdirs
+        rebuild(dist,srcdirs)
     save(cfg.rundir)
 
 



From mschwendt at fedoraproject.org  Sat Aug  1 09:12:10 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  1 Aug 2009 09:12:10 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.12,1.13
Message-ID: <20090801091210.F21B711C004A@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23015

Modified Files:
	WhatsNew.py 
Log Message:
complete the truncated comment


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WhatsNew.py	1 Aug 2009 08:56:46 -0000	1.12
+++ WhatsNew.py	1 Aug 2009 09:12:10 -0000	1.13
@@ -260,7 +260,8 @@
 
         # Consider the oldpackagedirs map to inherit src.rpms from
         # any external release repos.
-        # It is assumed that 
+        # It is assumed that the 'source/SRPMS' folder is found at
+        # the same directory level than the $arch folders.
         if hasattr(cfg,'oldpackagedirs'):
             dirs = cfg.oldpackagedirs.get(dist,None)
             if not dirs or not isinstance(dirs,list):



From ensc at fedoraproject.org  Sat Aug  1 09:43:20 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat,  1 Aug 2009 09:43:20 +0000 (UTC)
Subject: rpms/clamav/F-11 README.fedora,1.3,1.4
Message-ID: <20090801094320.21BAD11C004A@cvs1.fedora.phx.redhat.com>

Author: ensc

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

Modified Files:
	README.fedora 
Log Message:
fixed inconsistencies
added EXAMPLE section for milter setup



Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/README.fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.fedora	8 Mar 2009 14:49:39 -0000	1.3
+++ README.fedora	1 Aug 2009 09:43:19 -0000	1.4
@@ -29,10 +29,10 @@ A clamav-milter setup consists of the fo
   --> you should know how to install this...
 
   When communicating across unix sockets with the clamav-milter, it is
-  suggested to use the /var/run/clamav-milter/clamav.sock path.  You
-  have to add something like
+  suggested to use the /var/run/clamav-milter/clamav-milter.socket
+  path.  You have to add something like
 
-    INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl
+    INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl
 
   to your sendmail.mc.
 
@@ -40,3 +40,79 @@ A clamav-milter setup consists of the fo
 
 It is suggested that components communicate through TCP sockets as
 this eases setup.  Please add corresponding packet filter rules!
+
+
+EXAMPLE
+=======
+
+For clamav-milter, a possible setup might be created by
+
+A)  On the MTA  (assumed hostname 'host-mta')
+
+  1. Add to sendmail.mc
+
+    | INPUT_MAIL_FILTER(`clamav', `S=inet:6666 at host-milter, F=, T=S:4m;R:4m')dnl
+
+  2. Rebuild sendmail.cf
+
+
+B)  On the clamav-milter host (assumed hostname 'host-milter')
+
+  1. Install clamav-milter + clamav-milter-upstart packages
+
+  2. Set in /etc/mail/clamav-milter.conf
+
+    | MilterSocket	inet:6666
+    | ClamdSocket	tcp:host-scanner:6665
+
+     and all the other options which are required on your system
+
+  3. Edit /etc/event.d/clamav-milter and uncomment the both
+
+    | start on starting\ local
+    | start on starting local
+
+     lines. Restart your system or execute
+
+    | initctl emit starting local
+
+  4. Add something like
+
+    | iptables -N IN-cmilt
+    | iptables -A IN-cmilt -s host-mta -j ACCEPT
+    | iptables -A IN-cmilt -j DROP
+
+    | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt
+
+     to your firewall setup
+
+C)  On the clamav-scanner host (assumed hostname 'host-scanner')
+
+  1. Install clamav-scanner + clamav-scanner-upstart packages
+
+  2. Add to /etc/clamd.d/scan.conf
+
+    | TCPSocket 6665
+    | TCPAddr   host-scanner
+
+     comment out possible 'LocalSocket' lines and set all the other
+     options which are required on your system
+
+  3. Edit /etc/event.d/clamav-scanner and uncomment the both
+
+    | start on starting\ local
+    | start on starting local
+
+     lines. Restart your system or execute
+
+    | initctl emit starting local
+
+  4. Add something like
+
+    | iptables -N IN-cscan
+    | iptables -A IN-cscan -s host-milter -j ACCEPT
+    | iptables -A IN-cscan -j DROP
+
+    | iptables -A INPUT -p tcp --dport 6665 -j IN-csan
+
+     to your firewall setup



From ensc at fedoraproject.org  Sat Aug  1 09:44:43 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat,  1 Aug 2009 09:44:43 +0000 (UTC)
Subject: rpms/clamav/devel README.fedora,1.3,1.4
Message-ID: <20090801094443.1CE0111C004A@cvs1.fedora.phx.redhat.com>

Author: ensc

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

Modified Files:
	README.fedora 
Log Message:
fixed inconsistencies
added EXAMPLE section for milter setup



Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/README.fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.fedora	8 Mar 2009 14:49:39 -0000	1.3
+++ README.fedora	1 Aug 2009 09:44:42 -0000	1.4
@@ -29,10 +29,10 @@ A clamav-milter setup consists of the fo
   --> you should know how to install this...
 
   When communicating across unix sockets with the clamav-milter, it is
-  suggested to use the /var/run/clamav-milter/clamav.sock path.  You
-  have to add something like
+  suggested to use the /var/run/clamav-milter/clamav-milter.socket
+  path.  You have to add something like
 
-    INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl
+    INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl
 
   to your sendmail.mc.
 
@@ -40,3 +40,79 @@ A clamav-milter setup consists of the fo
 
 It is suggested that components communicate through TCP sockets as
 this eases setup.  Please add corresponding packet filter rules!
+
+
+EXAMPLE
+=======
+
+For clamav-milter, a possible setup might be created by
+
+A)  On the MTA  (assumed hostname 'host-mta')
+
+  1. Add to sendmail.mc
+
+    | INPUT_MAIL_FILTER(`clamav', `S=inet:6666 at host-milter, F=, T=S:4m;R:4m')dnl
+
+  2. Rebuild sendmail.cf
+
+
+B)  On the clamav-milter host (assumed hostname 'host-milter')
+
+  1. Install clamav-milter + clamav-milter-upstart packages
+
+  2. Set in /etc/mail/clamav-milter.conf
+
+    | MilterSocket	inet:6666
+    | ClamdSocket	tcp:host-scanner:6665
+
+     and all the other options which are required on your system
+
+  3. Edit /etc/event.d/clamav-milter and uncomment the both
+
+    | start on starting\ local
+    | start on starting local
+
+     lines. Restart your system or execute
+
+    | initctl emit starting local
+
+  4. Add something like
+
+    | iptables -N IN-cmilt
+    | iptables -A IN-cmilt -s host-mta -j ACCEPT
+    | iptables -A IN-cmilt -j DROP
+
+    | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt
+
+     to your firewall setup
+
+C)  On the clamav-scanner host (assumed hostname 'host-scanner')
+
+  1. Install clamav-scanner + clamav-scanner-upstart packages
+
+  2. Add to /etc/clamd.d/scan.conf
+
+    | TCPSocket 6665
+    | TCPAddr   host-scanner
+
+     comment out possible 'LocalSocket' lines and set all the other
+     options which are required on your system
+
+  3. Edit /etc/event.d/clamav-scanner and uncomment the both
+
+    | start on starting\ local
+    | start on starting local
+
+     lines. Restart your system or execute
+
+    | initctl emit starting local
+
+  4. Add something like
+
+    | iptables -N IN-cscan
+    | iptables -A IN-cscan -s host-milter -j ACCEPT
+    | iptables -A IN-cscan -j DROP
+
+    | iptables -A INPUT -p tcp --dport 6665 -j IN-csan
+
+     to your firewall setup



From jussilehtola at fedoraproject.org  Sat Aug  1 09:57:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat,  1 Aug 2009 09:57:39 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.79,1.80
Message-ID: <20090801095739.8E88811C004A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	plplot.spec 
Log Message:
Bump spec to rebuild against updated Octave.


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- plplot.spec	26 Jul 2009 18:58:17 -0000	1.79
+++ plplot.spec	1 Aug 2009 09:57:39 -0000	1.80
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -597,6 +597,9 @@ fi
 
 
 %changelog
+* 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
 



From pingou at fedoraproject.org  Sat Aug  1 10:13:36 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 10:13:36 +0000 (UTC)
Subject: rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/devel dead.package, NONE, 
	1.1
Message-ID: <20090801101336.4242611C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11485

Added Files:
	dead.package 
Log Message:
Retire the package


--- NEW FILE dead.package ---
This package is not longer maintained by upstream



From pkgdb at fedoraproject.org  Sat Aug  1 10:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 10:13:31 +0000
Subject: [pkgdb] fityk: wojdyr has requested watchbugzilla
Message-ID: <20090801101332.1EDED10F889@bastion2.fedora.phx.redhat.com>

wojdyr has requested the watchbugzilla acl on fityk (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Aug  1 10:13:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 10:13:41 +0000
Subject: [pkgdb] fityk: wojdyr has requested approveacls
Message-ID: <20090801101341.F010310F89C@bastion2.fedora.phx.redhat.com>

wojdyr has requested the approveacls acl on fityk (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Aug  1 10:13:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 10:13:47 +0000
Subject: [pkgdb] fityk: wojdyr has requested watchcommits
Message-ID: <20090801101347.2128310F8A1@bastion2.fedora.phx.redhat.com>

wojdyr has requested the watchcommits acl on fityk (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Aug  1 10:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 10:13:44 +0000
Subject: [pkgdb] fityk: wojdyr has requested commit
Message-ID: <20090801101344.BFD1E10F89E@bastion2.fedora.phx.redhat.com>

wojdyr has requested the commit acl on fityk (Fedora devel)

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



From pingou at fedoraproject.org  Sat Aug  1 10:14:57 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 10:14:57 +0000 (UTC)
Subject: rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/devel Makefile, 1.1,
	NONE R-BSgenome.Dmelanogaster.FlyBase.r51.spec, 1.4,
	NONE sources, 1.2, NONE
Message-ID: <20090801101457.67CF311C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12032

Removed Files:
	Makefile R-BSgenome.Dmelanogaster.FlyBase.r51.spec sources 
Log Message:
Remove files


--- Makefile DELETED ---


--- R-BSgenome.Dmelanogaster.FlyBase.r51.spec DELETED ---


--- sources DELETED ---



From pingou at fedoraproject.org  Sat Aug  1 10:17:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 10:17:12 +0000 (UTC)
Subject: rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/F-11 dead.package, NONE, 
	1.1 Makefile, 1.1,
	NONE R-BSgenome.Dmelanogaster.FlyBase.r51.spec, 1.3,
	NONE sources, 1.2, NONE
Message-ID: <20090801101712.BAC4511C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12780

Added Files:
	dead.package 
Removed Files:
	Makefile R-BSgenome.Dmelanogaster.FlyBase.r51.spec sources 
Log Message:
Retired package


--- NEW FILE dead.package ---
This package is not longer maintained by upstream


--- Makefile DELETED ---


--- R-BSgenome.Dmelanogaster.FlyBase.r51.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Sat Aug  1 10:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 10:18:59 +0000
Subject: [pkgdb] fityk: wojdyr has requested watchcommits
Message-ID: <20090801101859.2619910F897@bastion2.fedora.phx.redhat.com>

wojdyr has requested the watchcommits acl on fityk (Fedora 11)

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



From pkgdb at fedoraproject.org  Sat Aug  1 10:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 10:19:00 +0000
Subject: [pkgdb] fityk: wojdyr has requested commit
Message-ID: <20090801101900.A06C510F89C@bastion2.fedora.phx.redhat.com>

wojdyr has requested the commit acl on fityk (Fedora 11)

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



From pingou at fedoraproject.org  Sat Aug  1 10:19:45 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 10:19:45 +0000 (UTC)
Subject: rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/F-10 dead.package, NONE, 
	1.1 Makefile, 1.1,
	NONE R-BSgenome.Dmelanogaster.FlyBase.r51.spec, 1.2,
	NONE sources, 1.2, NONE
Message-ID: <20090801101945.95C9211C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-BSgenome.Dmelanogaster.FlyBase.r51/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13534

Added Files:
	dead.package 
Removed Files:
	Makefile R-BSgenome.Dmelanogaster.FlyBase.r51.spec sources 
Log Message:
Retired package


--- NEW FILE dead.package ---
This package is not longer maintained by upstream


--- Makefile DELETED ---


--- R-BSgenome.Dmelanogaster.FlyBase.r51.spec DELETED ---


--- sources DELETED ---



From dodji at fedoraproject.org  Sat Aug  1 11:09:40 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat,  1 Aug 2009 11:09:40 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore, 1.18, 1.19 nemiver.spec, 1.28,
	1.29 sources, 1.18, 1.19
Message-ID: <20090801110940.5425B11C004A@cvs1.fedora.phx.redhat.com>

Author: dodji

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

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
* Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
- Update to new upstream release (0.7.1)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	2 Jul 2009 14:49:11 -0000	1.18
+++ .cvsignore	1 Aug 2009 11:09:40 -0000	1.19
@@ -1,2 +1,3 @@
 nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
+nemiver-0.7.1.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nemiver.spec	25 Jul 2009 15:56:30 -0000	1.28
+++ nemiver.spec	1 Aug 2009 11:09:40 -0000	1.29
@@ -1,6 +1,11 @@
 Name:		nemiver
+<<<<<<< nemiver.spec
+Version:	0.7.1
+Release:	1%{?dist}
+=======
 Version:	0.7.0
 Release:	3%{?dist}
+>>>>>>> 1.28
 Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers
@@ -143,6 +148,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
+- Update to new upstream release (0.7.1)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -178,7 +186,7 @@ scrollkeeper-update -q ||:
 - Rebuild against ghex 2.2.4. This should fix #571099
 - Patch Nemiver to make it compile with gcc 4.3.3
 
-* Sat Jan 17 2009 Denis Leroy <denis at poolshark.org> - 0.6.4-1
+* Sat Jan 17 2009 Denis Leroy <denis at poolshark.com> - 0.6.4-1
 - Update to upstream 0.6.4
 - Now build against gtksourceviewmm 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	2 Jul 2009 14:21:26 -0000	1.18
+++ sources	1 Aug 2009 11:09:40 -0000	1.19
@@ -1,2 +1,3 @@
 eeb0f56cf70d26746f79486bd5437ac7  nemiver-0.6.7.tar.bz2
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
+9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2



From dodji at fedoraproject.org  Sat Aug  1 11:10:35 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat,  1 Aug 2009 11:10:35 +0000 (UTC)
Subject: rpms/nemiver/devel nemiver.spec,1.29,1.30
Message-ID: <20090801111035.96BF511C04D5@cvs1.fedora.phx.redhat.com>

Author: dodji

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

Modified Files:
	nemiver.spec 
Log Message:
Properly resolve conflict



Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nemiver.spec	1 Aug 2009 11:09:40 -0000	1.29
+++ nemiver.spec	1 Aug 2009 11:10:34 -0000	1.30
@@ -1,11 +1,6 @@
 Name:		nemiver
-<<<<<<< nemiver.spec
 Version:	0.7.1
 Release:	1%{?dist}
-=======
-Version:	0.7.0
-Release:	3%{?dist}
->>>>>>> 1.28
 Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers



From dodji at fedoraproject.org  Sat Aug  1 11:13:30 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat,  1 Aug 2009 11:13:30 +0000 (UTC)
Subject: rpms/nemiver/F-11 .cvsignore, 1.18, 1.19 nemiver.spec, 1.26,
	1.27 sources, 1.18, 1.19
Message-ID: <20090801111330.D9FC611C004A@cvs1.fedora.phx.redhat.com>

Author: dodji

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

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
* Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
- Update to new upstream release (0.7.1)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	2 Jul 2009 14:45:08 -0000	1.18
+++ .cvsignore	1 Aug 2009 11:13:30 -0000	1.19
@@ -1,2 +1,3 @@
 nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
+nemiver-0.7.1.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/nemiver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nemiver.spec	2 Jul 2009 14:45:08 -0000	1.26
+++ nemiver.spec	1 Aug 2009 11:13:30 -0000	1.27
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.0
+Version:	0.7.1
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -143,6 +143,9 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
+- Update to new upstream release (0.7.1)
+
 * Thu Jul 02 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.0-1
 - Update to new upstream release (0.7.0)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	2 Jul 2009 14:45:08 -0000	1.18
+++ sources	1 Aug 2009 11:13:30 -0000	1.19
@@ -1,2 +1,3 @@
 eeb0f56cf70d26746f79486bd5437ac7  nemiver-0.6.7.tar.bz2
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
+9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2



From dodji at fedoraproject.org  Sat Aug  1 11:15:20 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sat,  1 Aug 2009 11:15:20 +0000 (UTC)
Subject: rpms/nemiver/F-10 .cvsignore, 1.16, 1.17 nemiver.spec, 1.26,
	1.27 sources, 1.16, 1.17
Message-ID: <20090801111520.296DF11C04D3@cvs1.fedora.phx.redhat.com>

Author: dodji

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

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
* Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
- Update to new upstream release (0.7.1)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Jul 2009 14:46:56 -0000	1.16
+++ .cvsignore	1 Aug 2009 11:15:19 -0000	1.17
@@ -1,2 +1,3 @@
 nemiver-0.6.7.tar.bz2
 nemiver-0.7.0.tar.bz2
+nemiver-0.7.1.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nemiver.spec	2 Jul 2009 15:55:38 -0000	1.26
+++ nemiver.spec	1 Aug 2009 11:15:19 -0000	1.27
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.7.0
+Version:	0.7.1
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -156,6 +156,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Sat Aug 01 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.1-1
+- Update to new upstream release (0.7.1)
+
 * Thu Jul 02 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.0-1
 - Update to new upstream release (0.7.0)
 - Do not use the system libtool as it's now older than the one shiped


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Jul 2009 14:46:56 -0000	1.16
+++ sources	1 Aug 2009 11:15:19 -0000	1.17
@@ -1,2 +1,3 @@
 eeb0f56cf70d26746f79486bd5437ac7  nemiver-0.6.7.tar.bz2
 b9606d7cde107c1a49dcb4053fb22546  nemiver-0.7.0.tar.bz2
+9e8dbf1a1ffdd510752857847bdc3283  nemiver-0.7.1.tar.bz2



From hno at fedoraproject.org  Sat Aug  1 11:17:38 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat,  1 Aug 2009 11:17:38 +0000 (UTC)
Subject: rpms/squid/devel squid.spec-3.1,NONE,1.1 squid31.spec,1.1,NONE
Message-ID: <20090801111738.DA1D311C004A@cvs1.fedora.phx.redhat.com>

Author: hno

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

Added Files:
	squid.spec-3.1 
Removed Files:
	squid31.spec 
Log Message:
Rename squid31.spec to squid.spec-3.1 to avoid build system confusion

apparently the build sys looks for the first spec file, and definition
of first is very locale specific, making squid.spec and squid31.spec sort
differently depending on the locale..



--- NEW FILE squid.spec-3.1 ---
## % define _use_internal_dependency_generator 0
%define __perl_requires %{SOURCE98}
## % define __find_requires %{SOURCE99}

# TODO:
# - Still several patches to rebase. Is all really needed? Some should
#   be possible to override with buildtime variables
# - Error pages have changed. Squid now to language negotiation
# - Should helpers be split in their own packages? Starting to have a fair
#   bit of dependencies there

Name:     squid
Version:  3.1.0.9
Release:  1%{?dist}
Summary:  The Squid proxy caching server
Epoch:    7
License:  GPLv2+
Group:    System Environment/Daemons
URL:      http://www.squid-cache.org
Source:   http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2
Source1:  http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
Source2:  squid.init
Source3:  squid.logrotate
Source4:  squid.sysconfig
Source5:  squid.pam
Source6:  squid.nm
Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh

# Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch

# External patches

# Local patches
# Applying upstream patches first makes it less likely that local patches
# will break upstream ones.
Patch201: squid-3.1.0.9-config.patch
Patch202: squid-3.1.0.9-location.patch
Patch203: squid-3.0.STABLE1-build.patch
Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.0.STABLE15-smb-path.patch
Patch208: squid-3.0.STABLE7-from_manpg.patch

Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0
Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service /sbin/chkconfig
Requires(postun): /sbin/service
BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
Obsoletes: squid-novm

%description
Squid is a high-performance proxy caching server for Web clients,
supporting FTP, gopher, and HTTP data objects. Unlike traditional
caching software, Squid handles all requests in a single,
non-blocking, I/O-driven process. Squid keeps meta data and especially
hot objects cached in RAM, caches DNS lookups, supports non-blocking
DNS lookups, and implements negative caching of failed requests.

Squid consists of a main server program squid, a Domain Name System
lookup program (dnsserver), a program for retrieving FTP data
(ftpget), and some management and client tools.

%prep
%setup -q

%patch201 -p1 -b .config
%patch202 -p1 -b .location
%patch203 -p1 -b .build
%patch204 -p1 -b .perlpath
%patch205 -p1 -b .smb-path
%patch208 -p1 -b .from_manpg

%build
export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
%configure \
   --exec_prefix=/usr \
   --bindir=%{_sbindir} \
   --libexecdir=%{_libdir}/squid \
   --localstatedir=/var \
   --datadir=%{_datadir} \
   --sysconfdir=/etc/squid \
   --disable-dependency-tracking \
   --enable-arp-acl \
   --enable-auth="basic,digest,ntlm,negotiate" \
   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
   --enable-negotiate-auth-helpers="squid_kerb_auth" \
   --enable-cache-digests \
   --enable-cachemgr-hostname=localhost \
   --enable-delay-pools \
   --enable-digest-auth-helpers="password,ldap,eDirectory" \
   --enable-epoll \
   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
   --enable-icap-client \
   --enable-ident-lookups \
   %ifnarch ppc64 ia64 x86_64 s390x
   --with-large-files \
   %endif
   --enable-linux-netfilter \
   --enable-ntlm-auth-helpers="SMB,fakeauth" \
   --enable-referer-log \
   --enable-removal-policies="heap,lru" \
   --enable-snmp \
   --enable-ssl \
   --enable-storeio="aufs,diskd,null,ufs" \
   --enable-useragent-log \
   --enable-wccpv2 \
   --with-aio \
   --with-default-user="squid" \
   --with-filedescriptors=16384 \
   --with-dl \
   --with-openssl=/usr/kerberos \
   --with-pthreads

# following options are no longer supported
#   --with-winbind-auth-challenge \
#   --enable-follow-x-forwarded-for \
#   --enable-fd-config \
#   --with-maxfd=16384 \
#   --enable-underscores \

export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
make %{?_smp_mflags}

mkdir faq
cp %{SOURCE1} faq
cd faq
sgml2html FAQ.sgml

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall  \
        sysconfdir=$RPM_BUILD_ROOT/etc/squid \
        localstatedir=$RPM_BUILD_ROOT/var \
        bindir=$RPM_BUILD_ROOT/%{_sbindir} \
        libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
echo "
#
# This is /etc/httpd/conf.d/squid.conf
#

ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi

# Only allow access from localhost by default
<Location /Squid/cgi-bin/cachemgr.cgi>
 order allow,deny
 allow from localhost.localdomain
 # Add additional allowed hosts as needed
 # allow from .example.com
</Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp


ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons

mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/20-squid
mkdir -p $RPM_BUILD_ROOT/var/log/squid
mkdir -p $RPM_BUILD_ROOT/var/spool/squid
chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
mv -f ChangeLog.tmp ChangeLog

# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
rm -f $RPM_BUILD_ROOT/squid.httpd.tmp

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc faq/*\.html README ChangeLog QUICKSTART
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl

%attr(755,root,root) %dir /etc/squid
%attr(755,root,root) %dir %{_libdir}/squid
%attr(750,squid,squid) %dir /var/log/squid
%attr(750,squid,squid) %dir /var/spool/squid
%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
%attr(4750,root,squid) %{_libdir}/squid/pam_auth

%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
%config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
%config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
%config(noreplace) /etc/squid/mime.conf
%config(noreplace) /etc/sysconfig/squid
%config(noreplace) /etc/squid/msntauth.conf
%config(noreplace) /etc/squid/mib.txt
# These are not noreplace because they are just sample config files
%config /etc/squid/msntauth.conf.default
%config /etc/squid/squid.conf.default
%config /etc/squid/mime.conf.default
%config /etc/squid/cachemgr.conf.default
%config(noreplace) /etc/pam.d/squid
%config(noreplace) /etc/logrotate.d/squid

%config(noreplace) /etc/squid/errors
%dir %{_datadir}/squid
%attr(-,root,root) %{_datadir}/squid/errors
%attr(-,root,root) /etc/squid/icons
%attr(755,root,root) /etc/rc.d/init.d/squid
%attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
%{_datadir}/squid/icons
%{_sbindir}/squid
%{_sbindir}/squidclient
%{_mandir}/man8/*
%{_libdir}/squid/*

%pre
if ! getent group squid >/dev/null 2>&1; then
  /usr/sbin/groupadd -g 23 squid
fi

if ! getent passwd squid >/dev/null 2>&1 ; then
  /usr/sbin/useradd -g 23 -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1 || exit 1 
fi

for i in /var/log/squid /var/spool/squid ; do
        if [ -d $i ] ; then
                for adir in `find $i -maxdepth 0 \! -user squid`; do
                        chown -R squid:squid $adir
                done
        fi
done

exit 0

%post
/sbin/chkconfig --add squid
if [ $1 = 0 ]; then
 case "$LANG" in
  bg*)
     DIR=Bulgarian
     ;;
  ca*)
     DIR=Catalan
     ;;
  cs*)
     DIR=Czech
     ;;
  da*)
     DIR=Danish
     ;;
  nl*)
     DIR=Dutch
     ;;
  en*)
     DIR=English
     ;;
  ea*)
     DIR=Estonian
     ;;
  fi*)
     DIR=Finnish
     ;;
  fr*)
     DIR=French
     ;;
  de*)
     DIR=German
     ;;
  he*)
     DIR=Hebrew
     ;;
  hu*)
     DIR=Hungarian
     ;;
  it*)
     DIR=Italian
     ;;
  ja*)
     DIR=Japanese
     ;;
  kr*)
     DIR=Korean
     ;;
  pl*)
     DIR=Polish
     ;;
  pt*)
     DIR=Portuguese
     ;;
  ro*)
     DIR=Romanian
     ;;
  ru*)
     DIR=Russian-koi8-r
     ;;
  sr*)
     DIR=Serbian
     ;;
  sk*)
     DIR=Slovak
     ;;
  es*)
     DIR=Spanish
     ;;
  sv*)
     DIR=Swedish
     ;;
  zh_TW*)
     DIR=Traditional_Chinese
     ;;
  zh_CN*)
     DIR=Simplify_Chinese
     ;;
  tr*)
     DIR=Turkish
     ;;
  greek)
     DIR=Greek
     ;;
  *)
     DIR=English
     ;;
 esac
 ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
fi

%preun
if [ $1 = 0 ] ; then
        service squid stop >/dev/null 2>&1
        rm -f /var/log/squid/*
        /sbin/chkconfig --del squid
fi

%postun
if [ "$1" -ge "1" ] ; then
        service squid condrestart >/dev/null 2>&1
fi

%triggerin -- samba-common
/usr/sbin/usermod -a -G wbpriv squid >/dev/null 2>&1 || \
    chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :

%changelog
* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 3.0.STABLE16-2
- fixed patch parameter of bXXX patches

* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE16-1
- Upgrade to 3.0.STABLE16

* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE15-2
- Bug #453304 - Squid requires restart after Network Manager connection setup

* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE15-1
- Upgrade to 3.0.STABLE15

* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
- fixed ambiguous condition in the init script (exit 4)

* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
- Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"

* Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1
- Upgrade to 3.0.STABLE14

* Fri Mar 06 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE13-2
- backported logfile.cc syslog parameters patch from 3.1 (b9443.patch)
- GCC-4.4 workaround in src/wccp2.cc

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:3.0.STABLE13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Feb 5 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 7:3.0.STABLE13-1
- upgrade to latest upstream

* Tue Jan 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE12-1
- upgrade to latest upstream

* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE10-4
- rebuild with new openssl

* Fri Dec 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-3
- actually include the upstream bugfixes in the build

* Fri Dec 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-2
- upstream bugfixes for cache corruption and access.log response size errors

* Fri Oct 24 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-1
- upgrade to latest upstream

* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-2
- disable coss support, not officially supported in 3.0

* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-1
- update to latest upstream

* Thu Oct 09 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE7-4
- change logrotate to move instead of copytruncate

* Wed Oct 08 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-3
- fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10

* Thu Aug 14 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
- used ncsa_auth.8 from man-pages. there will be this file removed due to conflict
- fix #458593 noisy initscript
- fix #463129 init script tests wrong conf file
- fix #450352 - build.patch patches only generated files

* Wed Jul 02 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
- update to latest upstream
- fix #453214

* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-2
- fix bad allocation

* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
- upgrade to latest upstream
- fix bad allocation

* Fri May 09 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-2
- fix configure detection of netfilter kernel headers (#435499),
  patch by aoliva at redhat.com
- add support for negotiate authentication (#445337)

* Fri May 02 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-1
- upgrade to latest upstream

* Tue Apr 08 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE4-1
- upgrade to latest upstream

* Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE2-2
- add %%{optflags} to make
- remove warnings about unused return values

* Tue Mar 13 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE2-1
- upgrade to latest upstream 3.0.STABLE2
- check config file before starting (#428998)
- whitespace unification of init script
- some minor path changes in the QUICKSTART file
- configure with the --with-filedescriptors=16384 option

* Tue Feb 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE1-3
- change the cache_effective_group default back to none

* Mon Feb 11 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE1-2
- rebuild for 4.3

* Wed Jan 23 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE1-1
- upgrade to latest upstream 3.0.STABLE1

* Tue Dec 04 2007 Martin Bacovsky <mbacovsk at redhat.com> - 2.6.STABLE17-1
- upgrade to latest upstream 2.6.STABLE17

* Wed Oct 31 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-3
- arp-acl was enabled

* Tue Sep 25 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-2
- our fd_config patch was replaced by upstream's version 
- Source1 (FAQ.sgml) points to local source (upstream's moved to wiki)

* Fri Sep 14 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE16

* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 7:2.6.STABLE14-2
- Rebuild for selinux ppc32 issue.

* Thu Jul 19 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE14-1
- update to latest upstream 2.6.STABLE14
- resolves: #247064: Initscript Review

* Tue Mar 27 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE12-1
- update to latest upstream 2.6.STABLE12
- Resolves: #233913: squid: unowned directory

* Mon Feb 19 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-2
- Resolves: #226431: Merge Review: squid

* Mon Jan 29 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-1
- update to the latest upstream

* Sun Jan 14 2007 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE7-1
- update to the latest upstream

* Tue Dec 12 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE6-1
- update to the latest upstream

* Mon Nov  6 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE5-1
- update to the latest upstream

* Tue Oct 26 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-4
- added fix for #205568 - marked cachemgr.conf as world readable

* Tue Oct 25 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-3
- added fix for #183869 - squid can abort when getting status
- added upstream fixes:
    * Bug #1796: Assertion error HttpHeader.c:914: "str"
    * Bug #1779: Delay pools fairness, correction to first patch
    * Bug #1802: Crash on exit in certain conditions where cache.log is not writeable
    * Bug #1779: Delay pools fairness when multiple connections compete for bandwidth
    * Clarify the select/poll/kqueue/epoll configure --enable/disable options
- reworked fd patch for STABLE4

* Tue Oct 17 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-2
- upstream fixes:
  * Accept 00:00-24:00 as a valid time specification (upstream BZ #1794)
  * aioDone() could be called twice
  * Squid reconfiguration (upstream BZ #1800)

* Mon Oct 2 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-1
- new upstream
- fixes from upstream bugzilla, items #1782,#1780,#1785,#1719,#1784,#1776

* Tue Sep 5 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE3-2
- added upstream patches for ACL

* Mon Aug 21 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE3-1
- the latest stable upstream

* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 7:2.6.STABLE2-3
- added some requirements for pre/post install scripts

* Fri Aug 04 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE2-2
- added patch for #198253 - squid: don't chgrp another pkg's
  files/directory

* Mon Jul 31 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE2-1
- the latest stable upstream
- reworked fd config patch

* Wed Jul 25 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-3
- the latest CVS upstream snapshot

* Wed Jul 19 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-2
- the latest CVS snapshot

* Mon Jul 18 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-1
- new upstream + the latest CVS snapshot from 2006/07/18
- updated fd config patch
- enabled epoll
- fixed release format (#197405)
- enabled WCCPv2 support (#198642)

* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE14-2.1
- rebuild

* Tue Jun 8 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-2
- fix for squid BZ#1511 - assertion failed: HttpReply.c:105: "rep"

* Tue May 30 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-1
- update to new upstream

* Sun May 28 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE13-5
- fixed libbind patch (#193298)

* Wed May 3  2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE13-4
- added extra group check (#190544)

* Wed Mar 29 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE13-3
- improved pre script (#187217) - added group switch

* Thu Mar 23 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE13-2
- removed "--with-large-files" on 64bit arches

* Mon Mar 13 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE13-1
- update to new upstream

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE12-5.1
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE12-5
- new upstream patches

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE12-4.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Wed Dec 28 2005  Martin Stransky <stransky at redhat.com> 7:2.5.STABLE12-4
- added follow-xff patch (#176055)
- samba path fix (#176659)

* Mon Dec 19 2005  Martin Stransky <stransky at redhat.com> 7:2.5.STABLE12-3
- fd-config.patch clean-up
- SMB_BadFetch patch from upstream

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Mon Nov 28 2005  Martin Stransky <stransky at redhat.com> 7:2.5.STABLE12-2
- rewriten patch squid-2.5.STABLE10-64bit.patch, it works with
  "--with-large-files" option now
- fix for #72896 - squid does not support > 1024 file descriptors,
  new "--enable-fd-config" option for it.

* Wed Nov 9 2005  Martin Stransky <stransky at redhat.com> 7:2.5.STABLE12-1
- update to STABLE12
- setenv patch

* Mon Oct 24 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-6
- fix for delay pool from upstream

* Thu Oct 20 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-5
- fix for #171213 - CVE-2005-3258 Squid crash due to malformed FTP response
- more fixes from upstream

* Fri Oct 14 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-4
- enabled support for large files (#167503)

* Thu Oct 13 2005 Tomas Mraz <tmraz at redhat.com> 7:2.5.STABLE11-3
- use include instead of pam_stack in pam config

* Thu Sep 29 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-2
- added patch for delay pools and some minor fixes

* Fri Sep 23 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-1
- update to STABLE11

* Mon Sep 5 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE10-4
- Three upstream patches for #167414
- Spanish and Greek messages
- patch for -D_FORTIFY_SOURCE=2 

* Tue Aug 30 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE10-3
- removed "--enable-truncate" option (#165948)
- added "--enable-cache-digests" option (#102134)
- added "--enable-ident-lookups" option (#161640)
- some clean up (#165949)

* Fri Jul 15 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE10-2
- pam_auth and ncsa_auth have setuid (#162660)

* Fri Jul 7 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE10-1
- new upstream version
- enabled fakeauth utility (#154020)
- enabled digest authentication scheme (#155882)
- all error pages marked as config (#127836)
- patch for 64bit statvfs interface (#153274)
- added httpd config file for cachemgr.cgi (#112725)

* Mon May 16 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE9-7
- Upgrade the upstream -dns_query patch from -4 to -5

* Wed May 11 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE9-6
- More upstream patches, including a fix for
  bz#157456 CAN-2005-1519 DNS lookups unreliable on untrusted networks

* Tue Apr 26 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE9-5
- more upstream patches, including a fix for
  CVE-1999-0710 cachemgr malicious use

* Fri Apr 22 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE9-4
- More upstream patches, including the fixed 2GB patch.
- include the -libbind patch, which prevents squid from using the optional
  -lbind library, even if it's installed.

* Tue Mar 15 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE9-2
- New upstream version, with 14 upstream patches.

* Wed Feb 16 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE8-2
- new upstream version with 4 upstream patches.
- Reorganize spec file to apply upstream patches first

* Tue Feb 1 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE7-4
- Include two more upstream patches for security vulns:
  bz#146783 Correct handling of oversized reply headers
  bz#146778 CAN-2005-0211 Buffer overflow in WCCP recvfrom() call

* Tue Jan 25 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE7-3
- Include more upstream patches, including two for security holes.

* Tue Jan 18 2005 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE7-2
- Add a triggerin on samba-common to make /var/cache/samba/winbindd_privileged
  accessable so that ntlm_auth will work.  It needs to be in this rpm,
  because the Samba RPM can't assume the squid user exists.
  Note that this will only work if the Samba RPM is recent enough to create
  that directory at install time instead of at winbindd startup time.
  That should be samba-common-3.0.0-15 or later.
  This fixes bugzilla #103726
- Clean up extra whitespace in this spec file.
- Add additional upstream patches. (Now 18 upstream patches).
- patch #112 closes CAN-2005-0096 and CAN-2005-0097, remote DOS security holes.
- patch #113 closes CAN-2005-0094, a remote buffer-overflow DOS security hole.
- patch #114 closes CAN-2005-0095, a remote DOS security hole.
- Remove the -nonbl (replaced by #104) and -close (replaced by #111) patches, since
  they're now fixed by upstream patches.

* Mon Oct 25 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE7-1
- new upstream version, with 3 upstream patches.
  Updated the -build and -config patches
- Include patch from Ulrich Drepper <frepper at redhat.com> to more
  intelligently close all file descriptors.

* Mon Oct 18 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE6-3
- include patch from Ulrich Drepper <drepper at redhat.com> to stop
  problems with O_NONBLOCK.  This closes #136049

* Tue Oct 12 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE6-2
- Include fix for CAN-2004-0918

* Tue Sep 28 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE6-1
- New upstream version, with 32 upstream patches.
  This closes #133970, #133931, #131728, #128143, #126726

- Change the permissions on /etc/squid/squid.conf to 640.  This closes
  bugzilla #125007

* Mon Jun 28 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5STABLE5-5
- Merge current upstream patches.
- Fix the -pipe patch to have the correct name of the winbind pipe.

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Apr 5 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE5-2
- Include the first 10 upstream patches
- Add a patch for the correct location of the winbindd pipe.  This closes
  bugzilla #107561
- Remove the change to ssl_support.c from squid-2.5.STABLE3-build patch
  This closes #117851
- Include /etc/pam.d/squid .  This closes #113404
- Include a patch to close #111254 (assignment in assert)
- Change squid.init to put output messages in /var/log/squid/squid.out
  This closes #104697
- Only useradd the squid user if it doesn't already exist, and error out
  if the useradd fails.  This closes #118718.

* Tue Mar 2 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE5-1
- New upstream version, obsoletes many patches.
- Fix --datadir passed to configure.  Configure automatically adds /squid
  so we shouldn't.
- Remove the problematic triggerpostun trigger, since is's broken, and FC2
  never shipped with that old version.
- add %%{?_smp_mflags} to make line.

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Feb 23 2004 Tim Waugh <twaugh at redhat.com>
- Use ':' instead of '.' as separator for chown.

* Fri Feb 20 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE4-3
- Clean up the spec file to work on 64-bit platforms (use %%{_libdir}
  instead of /usr/lib, etc)
- Make the release number in the changelog section agree with reality.
- use -fPIE rather than -fpie.  s390 fails with just -fpie

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 5 2004 Jay Fenlason <fenlason at redhat.com>
- Incorporate many upstream patches
- Include many spec file changes from D.Johnson <dj at www.uk.linux.org>

* Tue Sep 23 2003 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE4-1
- New upstream version.
- Fix the Source: line in this spec file to point to the correct URL.
- redo the -location patch to work with the new upstream version.

* Mon Jun 30 2003 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE3-0
- Spec file change to enable the nul storage module. bugzilla #74654
- Upgrade to 2.5STABLE3 with current official patches.
- Added --enable-auth="basic,ntlm": closes bugzilla #90145
- Added --with-winbind-auth-challenge: closes bugzilla #78691
- Added --enable-useragent-log and --enable-referer-log, closes
- bugzilla #91884
# - Changed configure line to enable pie
# (Disabled due to broken compilers on ia64 build machines)
#- Patched to increase the maximum number of file descriptors #72896
#- (disabled for now--needs more testing)

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Jan 15 2003 Bill Nottingham <notting at redhat.com> 7:2.5.STABLE1-1
- update to 2.5.STABLE1

* Wed Nov 27 2002 Tim Powers <timp at redhat.com> 7:2.4.STABLE7-5
- remove unpackaged files from the buildroot

* Tue Aug 27 2002 Nalin Dahyabhai <nalin at redhat.com> 2.4.STABLE7-4
- rebuild

* Wed Jul 31 2002 Karsten Hopp <karsten at redhat.de>
- don't raise an error if the config file is incomplete
  set defaults instead (#69322, #70065)

* Thu Jul 18 2002 Bill Nottingham <notting at redhat.com> 2.4.STABLE7-2
- don't strip binaries

* Mon Jul  8 2002 Bill Nottingham <notting at redhat.com>
- update to 2.4.STABLE7
- fix restart (#53761)

* Tue Jun 25 2002 Bill Nottingham <notting at redhat.com>
- add various upstream bugfix patches

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Fri Mar 22 2002 Bill Nottingham <notting at redhat.com>
- 2.4.STABLE6
- turn off carp

* Mon Feb 18 2002 Bill Nottingham <notting at redhat.com>
- 2.4.STABLE3 + patches
- turn off HTCP at request of maintainers
- leave SNMP enabled in the build, but disabled in the default config

* Fri Jan 25 2002 Tim Powers <timp at redhat.com>
- rebuild against new libssl

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon Jan 07 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- require linuxdoc-tools instead of sgml-tools

* Tue Sep 25 2001 Bill Nottingham <notting at redhat.com>
- update to 2.4.STABLE2

* Mon Sep 24 2001 Bill Nottingham <notting at redhat.com>
- add patch to fix FTP crash

* Mon Aug  6 2001 Bill Nottingham <notting at redhat.com>
- fix uninstall (#50411)

* Mon Jul 23 2001 Bill Nottingham <notting at redhat.com>
- add some buildprereqs (#49705)

* Sun Jul 22 2001 Bill Nottingham <notting at redhat.com>
- update FAQ

* Tue Jul 17 2001 Bill Nottingham <notting at redhat.com>
- own /etc/squid, /usr/lib/squid

* Tue Jun 12 2001 Nalin Dahyabhai <nalin at redhat.com>
- rebuild in new environment
- s/Copyright:/License:/

* Tue Apr 24 2001 Bill Nottingham <notting at redhat.com>
- update to 2.4.STABLE1 + patches
- enable some more configure options (#24981)
- oops, ship /etc/sysconfig/squid

* Fri Mar  2 2001 Nalin Dahyabhai <nalin at redhat.com>
- rebuild in new environment

* Tue Feb  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
- improve i18n
- make the initscript use the standard OK/FAILED

* Tue Jan 23 2001 Bill Nottingham <notting at redhat.com>
- change i18n mechanism

* Fri Jan 19 2001 Bill Nottingham <notting at redhat.com>
- fix path references in QUICKSTART (#15114)
- fix initscript translations (#24086)
- fix shutdown logic (#24234), patch from <jos at xos.nl>
- add /etc/sysconfig/squid for daemon options & shutdown timeouts
- three more bugfixes from the Squid people
- update FAQ.sgml
- build and ship auth modules (#23611)

* Thu Jan 11 2001 Bill Nottingham <notting at redhat.com>
- initscripts translations

* Mon Jan  8 2001 Bill Nottingham <notting at redhat.com>
- add patch to use mkstemp (greg at wirex.com)

* Fri Dec 01 2000 Bill Nottingham <notting at redhat.com>
- rebuild because of broken fileutils

* Sat Nov 11 2000 Bill Nottingham <notting at redhat.com>
- fix the acl matching cases (only need the second patch)

* Tue Nov  7 2000 Bill Nottingham <notting at redhat.com>
- add two patches to fix domain ACLs
- add 2 bugfix patches from the squid people

* Fri Jul 28 2000 Bill Nottingham <notting at redhat.com>
- clean up init script; fix condrestart
- update to STABLE4, more bugfixes
- update FAQ

* Tue Jul 18 2000 Nalin Dahyabhai <nalin at redhat.com>
- fix syntax error in init script
- finish adding condrestart support

* Fri Jul 14 2000 Bill Nottingham <notting at redhat.com>
- move initscript back

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Thu Jul  6 2000 Bill Nottingham <notting at redhat.com>
- prereq /etc/init.d
- add bugfix patch
- update FAQ

* Thu Jun 29 2000 Bill Nottingham <notting at redhat.com>
- fix init script

* Tue Jun 27 2000 Bill Nottingham <notting at redhat.com>
- don't prereq new initscripts

* Mon Jun 26 2000 Bill Nottingham <notting at redhat.com>
- initscript munging

* Sat Jun 10 2000 Bill Nottingham <notting at redhat.com>
- rebuild for exciting FHS stuff

* Wed May 31 2000 Bill Nottingham <notting at redhat.com>
- fix init script again (#11699)
- add --enable-delay-pools (#11695)
- update to STABLE3
- update FAQ

* Fri Apr 28 2000 Bill Nottingham <notting at redhat.com>
- fix init script (#11087)

* Fri Apr  7 2000 Bill Nottingham <notting at redhat.com>
- three more bugfix patches from the squid people
- buildprereq jade, sgmltools

* Sun Mar 26 2000 Florian La Roche <Florian.LaRoche at redhat.com>
- make %%pre more portable

* Thu Mar 16 2000 Bill Nottingham <notting at redhat.com>
- bugfix patches
- fix dependency on /usr/local/bin/perl

* Sat Mar  4 2000 Bill Nottingham <notting at redhat.com>
- 2.3.STABLE2

* Mon Feb 14 2000 Bill Nottingham <notting at redhat.com>
- Yet More Bugfix Patches

* Tue Feb  8 2000 Bill Nottingham <notting at redhat.com>
- add more bugfix patches
- --enable-heap-replacement

* Mon Jan 31 2000 Cristian Gafton <gafton at redhat.com>
- rebuild to fix dependencies

* Fri Jan 28 2000 Bill Nottingham <notting at redhat.com>
- grab some bugfix patches

* Mon Jan 10 2000 Bill Nottingham <notting at redhat.com>
- 2.3.STABLE1 (whee, another serial number)

* Tue Dec 21 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix compliance with ftp RFCs
  (http://www.wu-ftpd.org/broken-clients.html)
- Work around a bug in some versions of autoconf
- BuildPrereq sgml-tools - we're using sgml2html

* Mon Oct 18 1999 Bill Nottingham <notting at redhat.com>
- add a couple of bugfix patches

* Wed Oct 13 1999 Bill Nottingham <notting at redhat.com>
- update to 2.2.STABLE5.
- update FAQ, fix URLs.

* Sat Sep 11 1999 Cristian Gafton <gafton at redhat.com>
- transform restart in reload and add restart to the init script

* Tue Aug 31 1999 Bill Nottingham <notting at redhat.com>
- add squid user as user 23.

* Mon Aug 16 1999 Bill Nottingham <notting at redhat.com>
- initscript munging
- fix conflict between logrotate & squid -k (#4562)

* Wed Jul 28 1999 Bill Nottingham <notting at redhat.com>
- put cachemgr.cgi back in /usr/lib/squid

* Wed Jul 14 1999 Bill Nottingham <notting at redhat.com>
- add webdav bugfix patch (#4027)

* Mon Jul 12 1999 Bill Nottingham <notting at redhat.com>
- fix path to config in squid.init (confuses linuxconf)

* Wed Jul  7 1999 Bill Nottingham <notting at redhat.com>
- 2.2.STABLE4

* Wed Jun 9 1999 Dale Lovelace <dale at redhat.com>
- logrotate changes
- errors from find when /var/spool/squid or
- /var/log/squid didn't exist

* Thu May 20 1999 Bill Nottingham <notting at redhat.com>
- 2.2.STABLE3

* Thu Apr 22 1999 Bill Nottingham <notting at redhat.com>
- update to 2.2.STABLE.2

* Sun Apr 18 1999 Bill Nottingham <notting at redhat.com>
- update to 2.2.STABLE1

* Thu Apr 15 1999 Bill Nottingham <notting at redhat.com>
- don't need to run groupdel on remove
- fix useradd

* Mon Apr 12 1999 Bill Nottingham <notting at redhat.com>
- fix effective_user (bug #2124)

* Mon Apr  5 1999 Bill Nottingham <notting at redhat.com>
- strip binaries

* Thu Apr  1 1999 Bill Nottingham <notting at redhat.com>
- duh. adduser does require a user name.
- add a serial number

* Tue Mar 30 1999 Bill Nottingham <notting at redhat.com>
- add an adduser in %%pre, too

* Thu Mar 25 1999 Bill Nottingham <notting at redhat.com>
- oog. chkconfig must be in %%preun, not %%postun

* Wed Mar 24 1999 Bill Nottingham <notting at redhat.com>
- switch to using group squid
- turn off icmp (insecure)
- update to 2.2.DEVEL3
- build FAQ docs from source

* Tue Mar 23 1999 Bill Nottingham <notting at redhat.com>
- logrotate changes

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 4)

* Wed Feb 10 1999 Bill Nottingham <notting at redhat.com>
- update to 2.2.PRE2

* Wed Dec 30 1998 Bill Nottingham <notting at redhat.com>
- cache & log dirs shouldn't be world readable
- remove preun script (leave logs & cache @ uninstall)

* Tue Dec 29 1998 Bill Nottingham <notting at redhat.com>
- fix initscript to get cache_dir correct

* Fri Dec 18 1998 Bill Nottingham <notting at redhat.com>
- update to 2.1.PATCH2
- merge in some changes from RHCN version

* Sat Oct 10 1998 Cristian Gafton <gafton at redhat.com>
- strip binaries
- version 1.1.22

* Sun May 10 1998 Cristian Gafton <gafton at redhat.com>
- don't make packages conflict with each other...

* Sat May 02 1998 Cristian Gafton <gafton at redhat.com>
- added a proxy auth patch from Alex deVries <adevries at engsoc.carleton.ca>
- fixed initscripts

* Thu Apr 09 1998 Cristian Gafton <gafton at redhat.com>
- rebuilt for Manhattan

* Fri Mar 20 1998 Cristian Gafton <gafton at redhat.com>
- upgraded to 1.1.21/1.NOVM.21

* Mon Mar 02 1998 Cristian Gafton <gafton at redhat.com>
- updated the init script to use reconfigure option to restart squid instead
  of shutdown/restart (both safer and quicker)

* Sat Feb 07 1998 Cristian Gafton <gafton at redhat.com>
- upgraded to 1.1.20
- added the NOVM package and tryied to reduce the mess in the spec file

* Wed Jan 7 1998 Cristian Gafton <gafton at redhat.com>
- first build against glibc
- patched out the use of setresuid(), which is available only on kernels
  2.1.44 and later



--- squid31.spec DELETED ---



From hno at fedoraproject.org  Sat Aug  1 11:26:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat,  1 Aug 2009 11:26:45 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.45, 1.46 sources, 1.48,
	1.49 squid.spec, 1.131, 1.132
Message-ID: <20090801112645.F2D2C11C004A@cvs1.fedora.phx.redhat.com>

Author: hno

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

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	27 Jul 2009 19:18:49 -0000	1.45
+++ .cvsignore	1 Aug 2009 11:26:45 -0000	1.46
@@ -1 +1,4 @@
 squid-3.0.STABLE17.tar.bz2
+b9080.patch
+b9081.patch
+b9082.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	27 Jul 2009 19:18:49 -0000	1.48
+++ sources	1 Aug 2009 11:26:45 -0000	1.49
@@ -1 +1,4 @@
 68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
+b176387a9afcef85ef6467845c999f34  b9080.patch
+5948038b5629a9babd9f56ae1a25363e  b9081.patch
+345873eb1e301a6aa3e70ae8708d0c43  b9082.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- squid.spec	27 Jul 2009 19:17:22 -0000	1.131
+++ squid.spec	1 Aug 2009 11:26:45 -0000	1.132
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE17
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,6 +22,10 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
+
 
 # External patches
 
@@ -59,6 +63,9 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9080
+%patch002 -p0 -b .b9081
+%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -340,29 +347,32 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE17-1
+* Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
+- Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
+
+* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-2
 - Bug #514014, update to 3.0.STABLE17 fixing the denial of service issues
   mentioned in Squid security advisory SQUID-2009_2.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:3.0.STABLE16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 3.0.STABLE16-2
+* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 7:3.0.STABLE16-2
 - fixed patch parameter of bXXX patches
 
-* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE16-1
+* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE16-1
 - Upgrade to 3.0.STABLE16
 
-* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE15-2
+* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE15-2
 - Bug #453304 - Squid requires restart after Network Manager connection setup
 
-* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE15-1
+* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE15-1
 - Upgrade to 3.0.STABLE15
 
-* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE14-3
 - fixed ambiguous condition in the init script (exit 4)
 
-* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
 
 * Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1



From hedayat at fedoraproject.org  Sat Aug  1 11:28:37 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sat,  1 Aug 2009 11:28:37 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.16,1.17
Message-ID: <20090801112837.3046311C004A@cvs1.fedora.phx.redhat.com>

Author: hedayat

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

Modified Files:
	rcssserver3d.spec 
Log Message:
rebuilt against new rawhide tetex


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rcssserver3d.spec	27 Jul 2009 02:51:39 -0000	1.16
+++ rcssserver3d.spec	1 Aug 2009 11:28:36 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           rcssserver3d
 Version:        0.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
@@ -104,6 +104,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 01 2009 Hedayat Vatankhah <hedayat at grad.com> - 0.6.1-6
+- Rebuilt against rawhide tetex
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwmw2 at fedoraproject.org  Sat Aug  1 11:33:42 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat,  1 Aug 2009 11:33:42 +0000 (UTC)
Subject: rpms/kernel/devel config-powerpc-generic,1.48,1.49
Message-ID: <20090801113342.B084511C004A@cvs1.fedora.phx.redhat.com>

Author: dwmw2

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

Modified Files:
	config-powerpc-generic 
Log Message:
No amigaone support


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- config-powerpc-generic	10 Jul 2009 00:00:12 -0000	1.48
+++ config-powerpc-generic	1 Aug 2009 11:33:42 -0000	1.49
@@ -312,7 +312,7 @@ CONFIG_USB_FHCI_HCD=m
 
 # CONFIG_DRM_RADEON_KMS is not set
 
-CONFIG_AMIGAONE=y
+# CONFIG_AMIGAONE is not set
 
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 



From pkgdb at fedoraproject.org  Sat Aug  1 11:41:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 11:41:26 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801114126.3EF3610F87E@bastion2.fedora.phx.redhat.com>

jpye has set the watchcommits acl on fityk (Fedora 11) to Approved for wojdyr

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



From pkgdb at fedoraproject.org  Sat Aug  1 11:41:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 11:41:28 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801114128.5283B10F89A@bastion2.fedora.phx.redhat.com>

jpye has set the commit acl on fityk (Fedora 11) to Approved for wojdyr

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



From pkgdb at fedoraproject.org  Sat Aug  1 11:41:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 11:41:33 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801114134.161A110F89D@bastion2.fedora.phx.redhat.com>

jpye has set the watchbugzilla acl on fityk (Fedora 11) to Approved for wojdyr

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



From pkgdb at fedoraproject.org  Sat Aug  1 11:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 11:41:35 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801114136.127C610F8A1@bastion2.fedora.phx.redhat.com>

jpye has set the approveacls acl on fityk (Fedora 11) to Approved for wojdyr

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



From hno at fedoraproject.org  Sat Aug  1 11:42:35 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat,  1 Aug 2009 11:42:35 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.43, 1.44 sources, 1.46,
	1.47 squid.spec, 1.123, 1.124
Message-ID: <20090801114235.A749711C004A@cvs1.fedora.phx.redhat.com>

Author: hno

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

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	27 Jul 2009 19:47:31 -0000	1.43
+++ .cvsignore	1 Aug 2009 11:42:34 -0000	1.44
@@ -1 +1,4 @@
 squid-3.0.STABLE17.tar.bz2
+b9080.patch
+b9081.patch
+b9082.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	27 Jul 2009 19:47:31 -0000	1.46
+++ sources	1 Aug 2009 11:42:35 -0000	1.47
@@ -1 +1,4 @@
 68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
+b176387a9afcef85ef6467845c999f34  b9080.patch
+5948038b5629a9babd9f56ae1a25363e  b9081.patch
+345873eb1e301a6aa3e70ae8708d0c43  b9082.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- squid.spec	27 Jul 2009 19:47:31 -0000	1.123
+++ squid.spec	1 Aug 2009 11:42:35 -0000	1.124
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE17
-Release:  1%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,6 +22,10 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
+
 
 # External patches
 
@@ -59,6 +63,9 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9080
+%patch002 -p0 -b .b9081
+%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -340,26 +347,29 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE17-1
+* Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
+- Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
+
+* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-1
 - Bug #514014, update to 3.0.STABLE17 fixing the denial of service issues
   mentioned in Squid security advisory SQUID-2009_2.
 
-* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 3.0.STABLE16-2
+* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 7:3.0.STABLE16-2
 - fixed patch parameter of bXXX patches
 
-* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE16-1
+* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE16-1
 - Upgrade to 3.0.STABLE16
 
-* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE15-2
+* Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE15-2
 - Bug #453304 - Squid requires restart after Network Manager connection setup
 
-* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE15-1
+* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE15-1
 - Upgrade to 3.0.STABLE15
 
-* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE14-3
 - fixed ambiguous condition in the init script (exit 4)
 
-* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
+* Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
 
 * Sun Apr 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE14-1



From hno at fedoraproject.org  Sat Aug  1 11:44:28 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat,  1 Aug 2009 11:44:28 +0000 (UTC)
Subject: rpms/squid/F-10 squid.spec,1.118,1.119
Message-ID: <20090801114428.6F6BF11C004A@cvs1.fedora.phx.redhat.com>

Author: hno

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

Modified Files:
	squid.spec 
Log Message:
Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- squid.spec	27 Jul 2009 19:43:13 -0000	1.118
+++ squid.spec	1 Aug 2009 11:44:28 -0000	1.119
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE17
-Release:  1%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,6 +22,10 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
+
 
 # External patches
 
@@ -59,6 +63,9 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9080
+%patch002 -p0 -b .b9081
+%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -340,7 +347,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE17-1
+* Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
+- Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
+
+* Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-1
 - Bug #514014, update to 3.0.STABLE17 fixing the denial of service issues
   mentioned in Squid security advisory SQUID-2009_2.
 



From hno at fedoraproject.org  Sat Aug  1 11:45:08 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat,  1 Aug 2009 11:45:08 +0000 (UTC)
Subject: rpms/squid/F-10 .cvsignore,1.41,1.42 sources,1.45,1.46
Message-ID: <20090801114508.03E3D11C004A@cvs1.fedora.phx.redhat.com>

Author: hno

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

Modified Files:
	.cvsignore sources 
Log Message:
Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	27 Jul 2009 19:43:13 -0000	1.41
+++ .cvsignore	1 Aug 2009 11:45:07 -0000	1.42
@@ -1 +1,4 @@
 squid-3.0.STABLE17.tar.bz2
+b9080.patch
+b9081.patch
+b9082.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	27 Jul 2009 19:43:13 -0000	1.45
+++ sources	1 Aug 2009 11:45:07 -0000	1.46
@@ -1 +1,4 @@
 68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
+b176387a9afcef85ef6467845c999f34  b9080.patch
+5948038b5629a9babd9f56ae1a25363e  b9081.patch
+345873eb1e301a6aa3e70ae8708d0c43  b9082.patch



From gerd at fedoraproject.org  Sat Aug  1 12:11:47 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:11:47 +0000 (UTC)
Subject: rpms/parrot/F-10 import.log,1.3,1.4 parrot.spec,1.3,1.4
Message-ID: <20090801121147.B41C811C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-5
- install the files /usr/src/parrot/*



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	22 Jul 2009 17:25:32 -0000	1.3
+++ import.log	1 Aug 2009 12:11:47 -0000	1.4
@@ -1,3 +1,4 @@
 parrot-1_0_0-6_fc10:F-10:parrot-1.0.0-6.fc10.src.rpm:1241003119
 parrot-1_4_0-1_fc11:F-10:parrot-1.4.0-1.fc11.src.rpm:1248194576
 parrot-1_4_0-3_fc11:F-10:parrot-1.4.0-3.fc11.src.rpm:1248283108
+parrot-1_4_0-5_fc11:F-10:parrot-1.4.0-5.fc11.src.rpm:1249128224


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parrot.spec	22 Jul 2009 17:25:32 -0000	1.3
+++ parrot.spec	1 Aug 2009 12:11:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -227,17 +227,14 @@ done
 
 # These files *probably* aren't needed.
 rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src \
-    $RPM_BUILD_ROOT%{_usr}/src 
+    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-%ifnarch ppc ppc64
-%{?_without_fulltest: FULL=''}
-%{?!_without_tests: make ${FULL}test}
-%endif
+#%{?_without_fulltest: FULL=''}
+#%{?!_without_tests: make ${FULL}test}
 
 
 %clean
@@ -278,6 +275,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
+%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
@@ -288,6 +286,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+- install the files /usr/src/parrot/*
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
@@ -339,15 +343,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
 - updated to 0.8.0
 
-* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
-- install parrot_config (not parrot-config)
-
-* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
-- updated to 0.6.3
-
-* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
-- minor fixes; tested with Fedora 7, 8, and 9-beta
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 



From gerd at fedoraproject.org  Sat Aug  1 12:13:04 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:13:04 +0000 (UTC)
Subject: rpms/parrot/F-11 import.log,1.3,1.4 parrot.spec,1.3,1.4
Message-ID: <20090801121304.612EF11C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-5
- install the files /usr/src/parrot/*



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	22 Jul 2009 18:05:39 -0000	1.3
+++ import.log	1 Aug 2009 12:13:04 -0000	1.4
@@ -1,3 +1,4 @@
 parrot-1_0_0-6_fc10:F-11:parrot-1.0.0-6.fc10.src.rpm:1241003453
 parrot-1_4_0-1_fc11:F-11:parrot-1.4.0-1.fc11.src.rpm:1248194723
 parrot-1_4_0-3_fc11:F-11:parrot-1.4.0-3.fc11.src.rpm:1248285543
+parrot-1_4_0-5_fc11:F-11:parrot-1.4.0-5.fc11.src.rpm:1249128393


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parrot.spec	22 Jul 2009 18:05:39 -0000	1.3
+++ parrot.spec	1 Aug 2009 12:13:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -227,17 +227,14 @@ done
 
 # These files *probably* aren't needed.
 rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src \
-    $RPM_BUILD_ROOT%{_usr}/src 
+    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-%ifnarch ppc
-%{?_without_fulltest: FULL=''}
-%{?!_without_tests: make ${FULL}test}
-%endif
+#%{?_without_fulltest: FULL=''}
+#%{?!_without_tests: make ${FULL}test}
 
 
 %clean
@@ -278,6 +275,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
+%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
@@ -288,6 +286,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+- install the files /usr/src/parrot/*
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
@@ -339,15 +343,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
 - updated to 0.8.0
 
-* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
-- install parrot_config (not parrot-config)
-
-* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
-- updated to 0.6.3
-
-* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
-- minor fixes; tested with Fedora 7, 8, and 9-beta
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 



From gerd at fedoraproject.org  Sat Aug  1 12:14:09 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:14:09 +0000 (UTC)
Subject: rpms/parrot/devel import.log,1.7,1.8 parrot.spec,1.8,1.9
Message-ID: <20090801121409.C0FEB11C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-5
- install the files /usr/src/parrot/*



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	22 Jul 2009 18:27:58 -0000	1.7
+++ import.log	1 Aug 2009 12:14:09 -0000	1.8
@@ -5,3 +5,4 @@ parrot-1_3_0-1_39897svn_fc10:HEAD:parrot
 parrot-1_4_0-1_fc11:HEAD:parrot-1.4.0-1.fc11.src.rpm:1248194953
 parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.fc11.src.rpm:1248279950
 parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.fc11.src.rpm:1248286928
+parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128462


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- parrot.spec	25 Jul 2009 23:16:08 -0000	1.8
+++ parrot.spec	1 Aug 2009 12:14:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -227,17 +227,14 @@ done
 
 # These files *probably* aren't needed.
 rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src \
-    $RPM_BUILD_ROOT%{_usr}/src 
+    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-%ifnarch ppc
-%{?_without_fulltest: FULL=''}
-%{?!_without_tests: make ${FULL}test}
-%endif
+#%{?_without_fulltest: FULL=''}
+#%{?!_without_tests: make ${FULL}test}
 
 
 %clean
@@ -278,6 +275,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
+%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
@@ -288,6 +286,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+- install the files /usr/src/parrot/*
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -342,15 +343,6 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
 - updated to 0.8.0
 
-* Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
-- install parrot_config (not parrot-config)
-
-* Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
-- updated to 0.6.3
-
-* Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
-- minor fixes; tested with Fedora 7, 8, and 9-beta
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 



From gerd at fedoraproject.org  Sat Aug  1 12:18:13 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:18:13 +0000 (UTC)
Subject: rpms/parrot/devel import.log,1.8,1.9 parrot.spec,1.9,1.10
Message-ID: <20090801121813.9A59111C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-5
- install the files /usr/src/parrot/*



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	1 Aug 2009 12:14:09 -0000	1.8
+++ import.log	1 Aug 2009 12:18:12 -0000	1.9
@@ -6,3 +6,4 @@ parrot-1_4_0-1_fc11:HEAD:parrot-1.4.0-1.
 parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.fc11.src.rpm:1248279950
 parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.fc11.src.rpm:1248286928
 parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128462
+parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128687


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- parrot.spec	1 Aug 2009 12:14:09 -0000	1.9
+++ parrot.spec	1 Aug 2009 12:18:13 -0000	1.10
@@ -233,8 +233,8 @@ rm -rf $RPM_BUILD_ROOT%{_usr}/config \
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-#%{?_without_fulltest: FULL=''}
-#%{?!_without_tests: make ${FULL}test}
+%{?_without_fulltest: FULL=''}
+%{?!_without_tests: make ${FULL}test}
 
 
 %clean



From gerd at fedoraproject.org  Sat Aug  1 12:24:51 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:24:51 +0000 (UTC)
Subject: rpms/parrot/F-11 import.log,1.4,1.5 parrot.spec,1.4,1.5
Message-ID: <20090801122451.CAFE211C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-6



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	1 Aug 2009 12:13:04 -0000	1.4
+++ import.log	1 Aug 2009 12:24:51 -0000	1.5
@@ -2,3 +2,4 @@ parrot-1_0_0-6_fc10:F-11:parrot-1.0.0-6.
 parrot-1_4_0-1_fc11:F-11:parrot-1.4.0-1.fc11.src.rpm:1248194723
 parrot-1_4_0-3_fc11:F-11:parrot-1.4.0-3.fc11.src.rpm:1248285543
 parrot-1_4_0-5_fc11:F-11:parrot-1.4.0-5.fc11.src.rpm:1249128393
+parrot-1_4_0-6_fc11:F-11:parrot-1.4.0-6.fc11.src.rpm:1249129108


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- parrot.spec	1 Aug 2009 12:13:04 -0000	1.4
+++ parrot.spec	1 Aug 2009 12:24:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -233,8 +233,10 @@ rm -rf $RPM_BUILD_ROOT%{_usr}/config \
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-#%{?_without_fulltest: FULL=''}
-#%{?!_without_tests: make ${FULL}test}
+%ifnarch ppc
+%{?_without_fulltest: FULL=''}
+%{?!_without_tests: make ${FULL}test}
+%endif
 
 
 %clean



From gerd at fedoraproject.org  Sat Aug  1 12:25:53 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:25:53 +0000 (UTC)
Subject: rpms/parrot/devel import.log,1.9,1.10 parrot.spec,1.10,1.11
Message-ID: <20090801122553.ACBBB11C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-6



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	1 Aug 2009 12:18:12 -0000	1.9
+++ import.log	1 Aug 2009 12:25:53 -0000	1.10
@@ -7,3 +7,4 @@ parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.
 parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.fc11.src.rpm:1248286928
 parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128462
 parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128687
+parrot-1_4_0-6_fc11:HEAD:parrot-1.4.0-6.fc11.src.rpm:1249129173


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- parrot.spec	1 Aug 2009 12:18:13 -0000	1.10
+++ parrot.spec	1 Aug 2009 12:25:53 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -233,8 +233,10 @@ rm -rf $RPM_BUILD_ROOT%{_usr}/config \
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
+%ifnarch ppc
 %{?_without_fulltest: FULL=''}
 %{?!_without_tests: make ${FULL}test}
+%endif
 
 
 %clean



From gerd at fedoraproject.org  Sat Aug  1 12:26:47 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat,  1 Aug 2009 12:26:47 +0000 (UTC)
Subject: rpms/parrot/F-10 import.log,1.4,1.5 parrot.spec,1.4,1.5
Message-ID: <20090801122647.1932311C004A@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot.spec 
Log Message:
update to 1.4.0-6



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	1 Aug 2009 12:11:47 -0000	1.4
+++ import.log	1 Aug 2009 12:26:46 -0000	1.5
@@ -2,3 +2,4 @@ parrot-1_0_0-6_fc10:F-10:parrot-1.0.0-6.
 parrot-1_4_0-1_fc11:F-10:parrot-1.4.0-1.fc11.src.rpm:1248194576
 parrot-1_4_0-3_fc11:F-10:parrot-1.4.0-3.fc11.src.rpm:1248283108
 parrot-1_4_0-5_fc11:F-10:parrot-1.4.0-5.fc11.src.rpm:1249128224
+parrot-1_4_0-6_fc11:F-10:parrot-1.4.0-6.fc11.src.rpm:1249129235


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- parrot.spec	1 Aug 2009 12:11:47 -0000	1.4
+++ parrot.spec	1 Aug 2009 12:26:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -233,8 +233,10 @@ rm -rf $RPM_BUILD_ROOT%{_usr}/config \
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-#%{?_without_fulltest: FULL=''}
-#%{?!_without_tests: make ${FULL}test}
+%ifnarch ppc
+%{?_without_fulltest: FULL=''}
+%{?!_without_tests: make ${FULL}test}
+%endif
 
 
 %clean



From gemi at fedoraproject.org  Sat Aug  1 12:49:42 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  1 Aug 2009 12:49:42 +0000 (UTC)
Subject: rpms/gauche-gtk/devel Gauche-gtk-gtk217.patch, NONE,
	1.1 gauche-gtk.spec, 1.14, 1.15
Message-ID: <20090801124942.67B7911C004A@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	gauche-gtk.spec 
Added Files:
	Gauche-gtk-gtk217.patch 
Log Message:
fix for gtk 2.17

Gauche-gtk-gtk217.patch:
 gtkentry.stub |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE Gauche-gtk-gtk217.patch ---
diff -up Gauche-gtk-0.4.1/src/gtkentry.stub.gtk217 Gauche-gtk-0.4.1/src/gtkentry.stub
--- Gauche-gtk-0.4.1/src/gtkentry.stub.gtk217	2009-08-01 14:40:08.000000000 +0200
+++ Gauche-gtk-0.4.1/src/gtkentry.stub	2009-08-01 14:40:17.000000000 +0200
@@ -39,8 +39,6 @@
    (scroll-offset :type <int>)
    (ascent :type <int>)
    (descent :type <int>)
-   (text-size :type <uint16>)
-   (n-bytes :type <uint16>)
    (preedit-length :type <uint16>)
    (preedit-cursor :type <uint16>)
    (dnd-position :type <int>)


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gauche-gtk/devel/gauche-gtk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gauche-gtk.spec	24 Jul 2009 23:32:01 -0000	1.14
+++ gauche-gtk.spec	1 Aug 2009 12:49:42 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ Source:		http://download.sourceforge.net
 Patch0:		Gauche-gtk-gtk28.patch
 Patch1:         Gauche-gtk-inc.patch
 Patch2:         Gauche-gtk-pad.patch
+Patch3:         Gauche-gtk-gtk217.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}
 BuildRequires:	gtk2-devel
@@ -33,6 +34,7 @@ Gauche extension module to use GTK.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Gerard Milmeister <gemi at bluewin.ch> - 0.4.1-21
+- fix for gtk 2.17
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From drago01 at fedoraproject.org  Sat Aug  1 13:12:36 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat,  1 Aug 2009 13:12:36 +0000 (UTC)
Subject: rpms/compiz/devel compiz.spec,1.174,1.175
Message-ID: <20090801131236.2FB9311C004A@cvs1.fedora.phx.redhat.com>

Author: drago01

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

Modified Files:
	compiz.spec 
Log Message:
fix build


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- compiz.spec	1 Aug 2009 01:04:45 -0000	1.174
+++ compiz.spec	1 Aug 2009 13:12:35 -0000	1.175
@@ -14,7 +14,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,7 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  dbus-qt-devel
 BuildRequires:  fuse-devel
 BuildRequires:	cairo-devel
+BuildRequires:	libtool
 
 Source0:       http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
@@ -159,7 +160,9 @@ export CPPFLAGS
 LDFLAGS="$LDFLAGS -L%{_libdir}/kde4/devel"
 export LDFLAGS
 
+libtoolize
 aclocal
+autoconf
 automake
 %configure 					\
 	--enable-gconf 			\
@@ -361,6 +364,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 01 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-9
+- Fix build
+
 * Fri Jul 31 2009 Kristian H?gsberg <krh at redhat.com> - 0.8.2-8
 - Add patch to add option to always use glXSwapBuffers.
 



From pkgdb at fedoraproject.org  Sat Aug  1 13:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 13:18:45 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801131845.82A5010F87E@bastion2.fedora.phx.redhat.com>

jpye has set the watchbugzilla acl on fityk (Fedora devel) to Approved for wojdyr

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



From pkgdb at fedoraproject.org  Sat Aug  1 13:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 13:18:47 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801131847.389F710F89A@bastion2.fedora.phx.redhat.com>

jpye has set the watchcommits acl on fityk (Fedora devel) to Approved for wojdyr

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



From pkgdb at fedoraproject.org  Sat Aug  1 13:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 13:18:49 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801131848.EF8B310F89D@bastion2.fedora.phx.redhat.com>

jpye has set the commit acl on fityk (Fedora devel) to Approved for wojdyr

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



From pkgdb at fedoraproject.org  Sat Aug  1 13:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 13:18:50 +0000
Subject: [pkgdb] fityk had acl change status
Message-ID: <20090801131850.DFFE010F8A1@bastion2.fedora.phx.redhat.com>

jpye has set the approveacls acl on fityk (Fedora devel) to Approved for wojdyr

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



From dwmw2 at fedoraproject.org  Sat Aug  1 13:31:25 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat,  1 Aug 2009 13:31:25 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ppc-perfctr-oops-fix.patch, NONE,
	1.1 kernel.spec, 1.1680, 1.1681
Message-ID: <20090801133125.8186111C004A@cvs1.fedora.phx.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ppc-perfctr-oops-fix.patch 
Log Message:
Fix ppc32 boot failure


linux-2.6-ppc-perfctr-oops-fix.patch:
 mpc7450-pmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-perfctr-oops-fix.patch ---
diff --git a/arch/powerpc/kernel/mpc7450-pmu.c b/arch/powerpc/kernel/mpc7450-pmu.c
index 75ff47f..ea383c1 100644
--- a/arch/powerpc/kernel/mpc7450-pmu.c
+++ b/arch/powerpc/kernel/mpc7450-pmu.c
@@ -408,7 +408,8 @@ struct power_pmu mpc7450_pmu = {
 
 static int init_mpc7450_pmu(void)
 {
-	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
+	if (cur_cpu_spec->oprofile_cpu_type &&
+	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
 		return -ENODEV;
 
 	return register_power_pmu(&mpc7450_pmu);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1680
retrieving revision 1.1681
diff -u -p -r1.1680 -r1.1681
--- kernel.spec	1 Aug 2009 03:45:36 -0000	1.1680
+++ kernel.spec	1 Aug 2009 13:31:25 -0000	1.1681
@@ -608,6 +608,7 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
+Patch148: linux-2.6-ppc-perfctr-oops-fix.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1141,6 +1142,8 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
+# Fix oops in 7450 perfctr
+ApplyPatch linux-2.6-ppc-perfctr-oops-fix.patch
 
 #
 # SPARC64
@@ -1937,6 +1940,9 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 01 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.118.rc5
+- Fix boot failures on ppc32 (#514010, #505071)
+
 * Fri Jul 31 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.117.rc5
 - Linux 2.6.31-rc5
 



From dsd at fedoraproject.org  Sat Aug  1 13:57:13 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Sat,  1 Aug 2009 13:57:13 +0000 (UTC)
Subject: rpms/olpc-update/devel .cvsignore, 1.2, 1.3 olpc-update.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20090801135713.214B911C004A@cvs1.fedora.phx.redhat.com>

Author: dsd

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

Modified Files:
	.cvsignore olpc-update.spec sources 
Log Message:
bump to v2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 16:38:44 -0000	1.2
+++ .cvsignore	1 Aug 2009 13:57:12 -0000	1.3
@@ -1 +1 @@
-olpc-update-2.19.tar.bz2
+olpc-update-2.20.tar.bz2


Index: olpc-update.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/devel/olpc-update.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- olpc-update.spec	25 Jul 2009 20:40:13 -0000	1.2
+++ olpc-update.spec	1 Aug 2009 13:57:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		olpc-update
-Version:	2.19
-Release:	3%{?dist}
+Version:	2.20
+Release:	1%{?dist}
 Summary:	OLPC system update tools
 
 Group:		System Environment/Base
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Daniel Drake <dsd at laptop.org> - 2.20-1
+- version bump
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 16:38:44 -0000	1.2
+++ sources	1 Aug 2009 13:57:12 -0000	1.3
@@ -1 +1 @@
-06c5cc5166e6584b1898ebcee5f7983b  olpc-update-2.19.tar.bz2
+07983705af32075332021ed325b50720  olpc-update-2.20.tar.bz2



From dsd at fedoraproject.org  Sat Aug  1 13:58:26 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Sat,  1 Aug 2009 13:58:26 +0000 (UTC)
Subject: rpms/olpc-update/F-11 .cvsignore, 1.2, 1.3 olpc-update.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090801135826.D91AF11C004A@cvs1.fedora.phx.redhat.com>

Author: dsd

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

Modified Files:
	.cvsignore olpc-update.spec sources 
Log Message:
bump to v2.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 16:53:58 -0000	1.2
+++ .cvsignore	1 Aug 2009 13:58:26 -0000	1.3
@@ -1 +1 @@
-olpc-update-2.19.tar.bz2
+olpc-update-2.20.tar.bz2


Index: olpc-update.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/F-11/olpc-update.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- olpc-update.spec	17 Jul 2009 16:53:58 -0000	1.1
+++ olpc-update.spec	1 Aug 2009 13:58:26 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		olpc-update
-Version:	2.19
+Version:	2.20
 Release:	1%{?dist}
 Summary:	OLPC system update tools
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Daniel Drake <dsd at laptop.org> - 2.20-1
+- Version bump
+
 * Thu Jul 16 2009 Daniel Drake <dsd at laptop.org> - 2.19-1
 - Initial import
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-update/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 16:53:58 -0000	1.2
+++ sources	1 Aug 2009 13:58:26 -0000	1.3
@@ -1 +1 @@
-06c5cc5166e6584b1898ebcee5f7983b  olpc-update-2.19.tar.bz2
+07983705af32075332021ed325b50720  olpc-update-2.20.tar.bz2



From lucilanga at fedoraproject.org  Sat Aug  1 14:02:28 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat,  1 Aug 2009 14:02:28 +0000 (UTC)
Subject: rpms/memtester/devel .cvsignore, 1.3, 1.4 memtester.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090801140228.9778F11C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	.cvsignore memtester.spec sources 
Log Message:
* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Jul 2009 06:11:01 -0000	1.3
+++ .cvsignore	1 Aug 2009 14:02:28 -0000	1.4
@@ -1 +1 @@
-memtester-4.1.1.tar.gz
+memtester-4.1.2.tar.gz


Index: memtester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/devel/memtester.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- memtester.spec	26 Jul 2009 06:11:01 -0000	1.4
+++ memtester.spec	1 Aug 2009 14:02:28 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		memtester
-Version:	4.1.1
+Version:	4.1.2
 Release:	1%{?dist}
 Summary:	Utility to test for faulty memory subsystem
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
+- new upstream release
+
 * Sun Jul 26 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.1-1
 - misc cleanups
 - new upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Jul 2009 06:11:01 -0000	1.3
+++ sources	1 Aug 2009 14:02:28 -0000	1.4
@@ -1 +1 @@
-e78f5c9b4ad11af020ca0b0fd713cdef  memtester-4.1.1.tar.gz
+33c744ac434eb1f3d7e09c891f2979d6  memtester-4.1.2.tar.gz



From lucilanga at fedoraproject.org  Sat Aug  1 14:08:53 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat,  1 Aug 2009 14:08:53 +0000 (UTC)
Subject: rpms/memtester/F-11 memtester.spec,1.3,1.4
Message-ID: <20090801140853.AE03611C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	memtester.spec 
Log Message:
* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
- new upstream release


Index: memtester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-11/memtester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- memtester.spec	26 Jul 2009 06:16:39 -0000	1.3
+++ memtester.spec	1 Aug 2009 14:08:53 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		memtester
-Version:	4.1.1
+Version:	4.1.2
 Release:	1%{?dist}
 Summary:	Utility to test for faulty memory subsystem
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
+- new upstream release
+
 * Sun Jul 26 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.1-1
 - new upstream release
 



From lucilanga at fedoraproject.org  Sat Aug  1 14:10:05 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat,  1 Aug 2009 14:10:05 +0000 (UTC)
Subject: rpms/memtester/F-11 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090801141005.EC86411C04D5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	.cvsignore sources 
Log Message:
* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Jul 2009 06:16:38 -0000	1.3
+++ .cvsignore	1 Aug 2009 14:10:05 -0000	1.4
@@ -1 +1 @@
-memtester-4.1.1.tar.gz
+memtester-4.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Jul 2009 06:16:39 -0000	1.3
+++ sources	1 Aug 2009 14:10:05 -0000	1.4
@@ -1 +1 @@
-e78f5c9b4ad11af020ca0b0fd713cdef  memtester-4.1.1.tar.gz
+33c744ac434eb1f3d7e09c891f2979d6  memtester-4.1.2.tar.gz



From lucilanga at fedoraproject.org  Sat Aug  1 14:17:04 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat,  1 Aug 2009 14:17:04 +0000 (UTC)
Subject: rpms/memtester/F-10 .cvsignore, 1.3, 1.4 memtester.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090801141704.1377711C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	.cvsignore memtester.spec sources 
Log Message:
* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Jul 2009 06:18:51 -0000	1.3
+++ .cvsignore	1 Aug 2009 14:17:03 -0000	1.4
@@ -1 +1 @@
-memtester-4.1.1.tar.gz
+memtester-4.1.2.tar.gz


Index: memtester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-10/memtester.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- memtester.spec	26 Jul 2009 06:18:51 -0000	1.2
+++ memtester.spec	1 Aug 2009 14:17:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		memtester
-Version:	4.1.1
-Release:	1%{?dist}
+Version:	4.1.2
+Release:	0%{?dist}
 Summary:	Utility to test for faulty memory subsystem
 
 Group:		System Environment/Base


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Jul 2009 06:18:51 -0000	1.3
+++ sources	1 Aug 2009 14:17:03 -0000	1.4
@@ -1 +1 @@
-e78f5c9b4ad11af020ca0b0fd713cdef  memtester-4.1.1.tar.gz
+33c744ac434eb1f3d7e09c891f2979d6  memtester-4.1.2.tar.gz



From pbrobinson at fedoraproject.org  Sat Aug  1 14:21:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  1 Aug 2009 14:21:57 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.16,1.17
Message-ID: <20090801142157.A7BBD11C004A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	nbtk.spec 
Log Message:
- Rebuild


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nbtk.spec	30 Jul 2009 15:29:23 -0000	1.16
+++ nbtk.spec	1 Aug 2009 14:21:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        0.16.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -53,6 +53,7 @@ sed -i '/configure/d' autogen.sh
 ./autogen.sh
 
 %build
+autoreconf
 %configure --enable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
@@ -85,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/nbtk
 
 %changelog
+* Sat Aug  1 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-8
+- Rebuild
+
 * Thu Jul 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-7
 - Add another patch for clutter 1.0
 



From ctyler at fedoraproject.org  Sat Aug  1 14:28:02 2009
From: ctyler at fedoraproject.org (Chris Tyler)
Date: Sat,  1 Aug 2009 14:28:02 +0000 (UTC)
Subject: rpms/WebShell/F-11 README.fedora, NONE,
	1.1 WebShell-0.9.6-default-paths.p0, NONE, 1.1 WebShell.spec,
	NONE, 1.1 background.jpg, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801142802.9951E11C004A@cvs1.fedora.phx.redhat.com>

Author: ctyler

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora WebShell-0.9.6-default-paths.p0 WebShell.spec 
	background.jpg import.log 
Log Message:
 Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-3
- Replaced background image due to potential license issues
- Added README.fedora with setup and usage info
- Disabled post scriptlet per reviewer recommendation

* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-2
- Changed envars to macros for consistancy
- Added Requires: openssl for make_certificate.sh

* Fri Jul 10 2009 Chris Tyler <chris at tylers.info>
- 0.9.6-1 - Initial RPM release




--- NEW FILE README.fedora ---
To use WebShell with Fedora, as root:
- generate a certificate:
	cd /usr/share/WebShell
	./make_certificate.sh
- run /usr/bin/webshell

Then, on the client system, connect to http://hostname:8022/

Notes:

- This package contains a replacement background.jpg due to concerns over
the copyright/license status of the original image.

- If you do not want to run this as root, copy the key to a non-root account
and use that account to run /usr/bin/webshell.

--
Chris Tyler (ctyler) 2009-07-22



--- NEW FILE WebShell-0.9.6-default-paths.p0 ---
--- webshell.py.original	2009-07-10 10:50:44.000000000 -0400
+++ webshell.py	2009-07-10 10:37:32.000000000 -0400
@@ -1361,10 +1361,10 @@
 		help = "set daemon user id")
 	parser.add_option("--ssl-disable", action = "store_false", dest = "ssl_enabled", default = 1,
 		help = "disable SSL, set listen interface to localhost")
-	parser.add_option("--ssl-cert", dest = "ssl_cert", default = "webshell.pem",
-		help = "set SSL certificate file (default: webshell.pem)")
- 	parser.add_option("--www-dir", dest = "www_dir", default = "www",
-		help = "set WebShell www path (default: www)")
+	parser.add_option("--ssl-cert", dest = "ssl_cert", default = "/usr/share/WebShell/webshell.pem",
+		help = "set SSL certificate file (default: /usr/share/WebShell/webshell.pem)")
+ 	parser.add_option("--www-dir", dest = "www_dir", default = "/usr/share/WebShell/www",
+		help = "set WebShell www path (default: /usr/share/WebShell/www)")
 	(o, a) = parser.parse_args()
 	if o.version:
 		print 'WebShell ' + version


--- NEW FILE WebShell.spec ---
Name:           WebShell
Version:        0.9.6
Release:        3%{?dist}
Summary:        SSL server for web-based SSH access from browsers and mobile devices

Group:          Applications/Internet
License:        GPLv2
URL:            http://www-personal.umich.edu/~mressl/webshell/index.html
Source0:        http://web-shell.googlecode.com/files/WebShell-0.9.6.zip
Source1:        README.fedora
Source2:        background.jpg
Patch0:         WebShell-0.9.6-default-paths.p0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       pyOpenSSL
Requires:       openssh-clients
Requires:       openssl

%description
WebShell is a standalone web server and browser application that provide
encrypted shell access through any web browser (https://host:8022). WebShell
includes a touch keyboard for use on mobile devices with a touch screen.


%prep
%setup -q
cp %{SOURCE1} .
%patch0


%build


%install
rm -rf %{buildroot}
install -d          %{buildroot}%{_datadir}/%{name}/www
install -p  -m 0755 make_certificate.sh %{buildroot}%{_datadir}/%{name}
install -p  -m 0644 make_certificate.cfg %{buildroot}%{_datadir}/%{name}
install -p  -m 0644 www/* %{buildroot}%{_datadir}/%{name}/www
install -pD -m 0755 webshell.py %{buildroot}%{_bindir}/webshell
cp -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/www


%clean
rm -rf %{buildroot}


#
# Disabled for package release 3
# We'll let the user do this -- instructions in README.fedora
#
#%%post
#cd %{_datadir}/%{name}
#./make_certificate.sh



%files
%defattr(-,root,root,-)
%doc README.txt README.fedora
%{_datadir}/%{name}
%{_bindir}/*


%changelog
* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-3
- Replaced background image due to potential license issues
- Added README.fedora with setup and usage info
- Disabled post scriptlet per reviewer recommendation

* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-2
- Changed envars to macros for consistancy
- Added Requires: openssl for make_certificate.sh

* Fri Jul 10 2009 Chris Tyler <chris at tylers.info> - 0.9.6-1
- Initial RPM release



--- NEW FILE import.log ---
WebShell-0_9_6-3_fc10:F-11:WebShell-0.9.6-3.fc10.src.rpm:1249136844


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebShell/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jul 2009 16:38:29 -0000	1.1
+++ .cvsignore	1 Aug 2009 14:28:02 -0000	1.2
@@ -0,0 +1 @@
+WebShell-0.9.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebShell/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jul 2009 16:38:29 -0000	1.1
+++ sources	1 Aug 2009 14:28:02 -0000	1.2
@@ -0,0 +1 @@
+5efa06473bef8dfb2049a15d99b76d8e  WebShell-0.9.6.zip



From ctyler at fedoraproject.org  Sat Aug  1 14:34:47 2009
From: ctyler at fedoraproject.org (Chris Tyler)
Date: Sat,  1 Aug 2009 14:34:47 +0000 (UTC)
Subject: rpms/WebShell/F-10 README.fedora, NONE,
	1.1 WebShell-0.9.6-default-paths.p0, NONE, 1.1 WebShell.spec,
	NONE, 1.1 background.jpg, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801143447.7AD6111C004A@cvs1.fedora.phx.redhat.com>

Author: ctyler

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora WebShell-0.9.6-default-paths.p0 WebShell.spec 
	background.jpg import.log 
Log Message:
* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-3
- Replaced background image due to potential license issues
- Added README.fedora with setup and usage info
- Disabled post scriptlet per reviewer recommendation

* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-2
- Changed envars to macros for consistancy
- Added Requires: openssl for make_certificate.sh

* Fri Jul 10 2009 Chris Tyler <chris at tylers.info>
- 0.9.6-1 - Initial RPM release




--- NEW FILE README.fedora ---
To use WebShell with Fedora, as root:
- generate a certificate:
	cd /usr/share/WebShell
	./make_certificate.sh
- run /usr/bin/webshell

Then, on the client system, connect to http://hostname:8022/

Notes:

- This package contains a replacement background.jpg due to concerns over
the copyright/license status of the original image.

- If you do not want to run this as root, copy the key to a non-root account
and use that account to run /usr/bin/webshell.

--
Chris Tyler (ctyler) 2009-07-22



--- NEW FILE WebShell-0.9.6-default-paths.p0 ---
--- webshell.py.original	2009-07-10 10:50:44.000000000 -0400
+++ webshell.py	2009-07-10 10:37:32.000000000 -0400
@@ -1361,10 +1361,10 @@
 		help = "set daemon user id")
 	parser.add_option("--ssl-disable", action = "store_false", dest = "ssl_enabled", default = 1,
 		help = "disable SSL, set listen interface to localhost")
-	parser.add_option("--ssl-cert", dest = "ssl_cert", default = "webshell.pem",
-		help = "set SSL certificate file (default: webshell.pem)")
- 	parser.add_option("--www-dir", dest = "www_dir", default = "www",
-		help = "set WebShell www path (default: www)")
+	parser.add_option("--ssl-cert", dest = "ssl_cert", default = "/usr/share/WebShell/webshell.pem",
+		help = "set SSL certificate file (default: /usr/share/WebShell/webshell.pem)")
+ 	parser.add_option("--www-dir", dest = "www_dir", default = "/usr/share/WebShell/www",
+		help = "set WebShell www path (default: /usr/share/WebShell/www)")
 	(o, a) = parser.parse_args()
 	if o.version:
 		print 'WebShell ' + version


--- NEW FILE WebShell.spec ---
Name:           WebShell
Version:        0.9.6
Release:        3%{?dist}
Summary:        SSL server for web-based SSH access from browsers and mobile devices

Group:          Applications/Internet
License:        GPLv2
URL:            http://www-personal.umich.edu/~mressl/webshell/index.html
Source0:        http://web-shell.googlecode.com/files/WebShell-0.9.6.zip
Source1:        README.fedora
Source2:        background.jpg
Patch0:         WebShell-0.9.6-default-paths.p0
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       pyOpenSSL
Requires:       openssh-clients
Requires:       openssl

%description
WebShell is a standalone web server and browser application that provide
encrypted shell access through any web browser (https://host:8022). WebShell
includes a touch keyboard for use on mobile devices with a touch screen.


%prep
%setup -q
cp %{SOURCE1} .
%patch0


%build


%install
rm -rf %{buildroot}
install -d          %{buildroot}%{_datadir}/%{name}/www
install -p  -m 0755 make_certificate.sh %{buildroot}%{_datadir}/%{name}
install -p  -m 0644 make_certificate.cfg %{buildroot}%{_datadir}/%{name}
install -p  -m 0644 www/* %{buildroot}%{_datadir}/%{name}/www
install -pD -m 0755 webshell.py %{buildroot}%{_bindir}/webshell
cp -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/www


%clean
rm -rf %{buildroot}


#
# Disabled for package release 3
# We'll let the user do this -- instructions in README.fedora
#
#%%post
#cd %{_datadir}/%{name}
#./make_certificate.sh



%files
%defattr(-,root,root,-)
%doc README.txt README.fedora
%{_datadir}/%{name}
%{_bindir}/*


%changelog
* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-3
- Replaced background image due to potential license issues
- Added README.fedora with setup and usage info
- Disabled post scriptlet per reviewer recommendation

* Wed Jul 22 2009 Chris Tyler <chris at tylers.info> - 0.9.6-2
- Changed envars to macros for consistancy
- Added Requires: openssl for make_certificate.sh

* Fri Jul 10 2009 Chris Tyler <chris at tylers.info> - 0.9.6-1
- Initial RPM release



--- NEW FILE import.log ---
WebShell-0_9_6-3_fc10:F-10:WebShell-0.9.6-3.fc10.src.rpm:1249137342


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebShell/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Jul 2009 16:38:29 -0000	1.1
+++ .cvsignore	1 Aug 2009 14:34:47 -0000	1.2
@@ -0,0 +1 @@
+WebShell-0.9.6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebShell/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Jul 2009 16:38:29 -0000	1.1
+++ sources	1 Aug 2009 14:34:47 -0000	1.2
@@ -0,0 +1 @@
+5efa06473bef8dfb2049a15d99b76d8e  WebShell-0.9.6.zip



From lucilanga at fedoraproject.org  Sat Aug  1 15:14:20 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat,  1 Aug 2009 15:14:20 +0000 (UTC)
Subject: rpms/memtester/F-10 memtester.spec,1.3,1.4
Message-ID: <20090801151420.10FFA11C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	memtester.spec 
Log Message:
* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
- new upstream release


Index: memtester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtester/F-10/memtester.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- memtester.spec	1 Aug 2009 14:17:03 -0000	1.3
+++ memtester.spec	1 Aug 2009 15:14:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		memtester
 Version:	4.1.2
-Release:	0%{?dist}
+Release:	1%{?dist}
 Summary:	Utility to test for faulty memory subsystem
 
 Group:		System Environment/Base
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 01 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.2-1
+- new upstream release
+
 * Sun Jul 26 2009 Lucian Langa <cooly at gnome.eu.org> - 4.1.1-1
 - new upstream release
 



From pkgdb at fedoraproject.org  Sat Aug  1 15:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 15:59:49 +0000
Subject: [pkgdb] trac-tracnav-plugin was added for thm
Message-ID: <20090801155949.B3EA910F89A@bastion2.fedora.phx.redhat.com>

tibbs has added Package trac-tracnav-plugin with summary Navigation Bar for Trac
tibbs has approved Package trac-tracnav-plugin
tibbs has added a Fedora devel branch for trac-tracnav-plugin with an owner of thm
tibbs has approved trac-tracnav-plugin in Fedora devel
tibbs has approved Package trac-tracnav-plugin
tibbs has set commit to Approved for 107427 on trac-tracnav-plugin (Fedora devel)
tibbs has set checkout to Approved for 107427 on trac-tracnav-plugin (Fedora devel)
tibbs has set build to Approved for 107427 on trac-tracnav-plugin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tracnav-plugin



From pkgdb at fedoraproject.org  Sat Aug  1 15:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 15:59:50 +0000
Subject: [pkgdb] trac-tracnav-plugin summary updated by tibbs
Message-ID: <20090801155950.E0A6310F89D@bastion2.fedora.phx.redhat.com>

tibbs set package trac-tracnav-plugin summary to Navigation Bar for Trac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tracnav-plugin



From pkgdb at fedoraproject.org  Sat Aug  1 15:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 15:59:50 +0000
Subject: [pkgdb] trac-tracnav-plugin (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801155950.E51DB10F8A1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for trac-tracnav-plugin
tibbs has set commit to Approved for 107427 on trac-tracnav-plugin (Fedora 11)
tibbs has set checkout to Approved for 107427 on trac-tracnav-plugin (Fedora 11)
tibbs has set build to Approved for 107427 on trac-tracnav-plugin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tracnav-plugin



From pkgdb at fedoraproject.org  Sat Aug  1 15:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 15:59:50 +0000
Subject: [pkgdb] trac-tracnav-plugin (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801155950.F0A4510F8B4@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for trac-tracnav-plugin
tibbs has set commit to Approved for 107427 on trac-tracnav-plugin (Fedora 10)
tibbs has set checkout to Approved for 107427 on trac-tracnav-plugin (Fedora 10)
tibbs has set build to Approved for 107427 on trac-tracnav-plugin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tracnav-plugin



From pkgdb at fedoraproject.org  Sat Aug  1 15:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 15:59:50 +0000
Subject: [pkgdb] trac-tracnav-plugin (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801155951.0622B10F8B7@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for trac-tracnav-plugin
tibbs has set commit to Approved for 107427 on trac-tracnav-plugin (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on trac-tracnav-plugin (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on trac-tracnav-plugin (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tracnav-plugin



From tibbs at fedoraproject.org  Sat Aug  1 16:00:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 16:00:04 +0000 (UTC)
Subject: rpms/trac-tracnav-plugin Makefile,NONE,1.1
Message-ID: <20090801160004.4B4AC11C04D5@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/trac-tracnav-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsun3947/rpms/trac-tracnav-plugin

Added Files:
	Makefile 
Log Message:
Setup of module trac-tracnav-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module trac-tracnav-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 tibbs at fedoraproject.org  Sat Aug  1 15:59:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 15:59:57 +0000 (UTC)
Subject: rpms/trac-tracnav-plugin - New directory
Message-ID: <20090801155957.223E711C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/trac-tracnav-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsun3947/rpms/trac-tracnav-plugin

Log Message:
Directory /cvs/pkgs/rpms/trac-tracnav-plugin added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 15:59:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 15:59:57 +0000 (UTC)
Subject: rpms/trac-tracnav-plugin/devel - New directory
Message-ID: <20090801155957.4392E11C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/trac-tracnav-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsun3947/rpms/trac-tracnav-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/trac-tracnav-plugin/devel added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 16:00:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 16:00:04 +0000 (UTC)
Subject: rpms/trac-tracnav-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090801160004.A5C6011C04D5@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/trac-tracnav-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsun3947/rpms/trac-tracnav-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module trac-tracnav-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: trac-tracnav-plugin
# $Id: Makefile,v 1.1 2009/08/01 16:00:04 tibbs Exp $
NAME := trac-tracnav-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 wolfy at fedoraproject.org  Sat Aug  1 16:12:33 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Sat,  1 Aug 2009 16:12:33 +0000 (UTC)
Subject: rpms/mysqltuner/EL-4 .cvsignore, 1.2, 1.3 branch, 1.1,
	1.2 mysqltuner.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090801161233.122C211C004A@cvs1.fedora.phx.redhat.com>

Author: wolfy

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

Modified Files:
	.cvsignore branch mysqltuner.spec sources 
Log Message:
update to 1.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jun 2008 18:14:16 -0000	1.2
+++ .cvsignore	1 Aug 2009 16:12:32 -0000	1.3
@@ -1 +1 @@
-mysqltuner.pl.gz
+mysqltuner-1.0.0.pl


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- branch	22 Jun 2008 15:57:57 -0000	1.1
+++ branch	1 Aug 2009 16:12:32 -0000	1.2
@@ -1 +1 @@
-EL-4
+EL-5


Index: mysqltuner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/mysqltuner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mysqltuner.spec	30 Jul 2008 21:49:02 -0000	1.8
+++ mysqltuner.spec	1 Aug 2009 16:12:32 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           mysqltuner
-Version:        0.9.8
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        MySQL high performance tuning script
 
 Group:          Applications/Databases
 License:        GPLv3+
 URL:            http://mysqltuner.com/
-Source0:        http://mysqltuner.com/mysqltuner.pl.gz
+Source0:        http://mysqltuner.com/releases/mysqltuner-%{version}.pl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -14,17 +14,15 @@ Requires:       mysql
 Requires:       which
 
 %description
-MySQLTuner is a MySQL high performance tuning script written in perl
-that will provide you with a snapshot of a MySQL server's health.
-Based on the statistics gathered, specific recommendations will be
-provided that will increase a MySQL server's efficiency and
-performance.  The script gives you automated MySQL tuning that is on
-the level of what you would receive from a MySQL DBA.
+MySQLTuner is a script written in Perl that will assist you with your
+MySQL configuration and make recommendations for increased performance
+and stability.  Within seconds, it will display statistics about your
+MySQL installation and the areas where it can be improved.
 
 
 %prep
 %setup -q -c -T
-gzip -dc %{SOURCE0} | sed -e 's/\r\+//g' > mysqltuner.pl
+cp -p %{SOURCE0} ./mysqltuner.pl
 
 
 %build
@@ -45,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 29 2009 manuel wolfshant <wolfy at fedoraproject.org>  - 1.0.0-1
+- sync with rawhide (update to 1.0.0).
+
 * Wed Jul 30 2008 manuel wolfshant <wolfy at fedoraproject.org> - 0.9.8-2%{dist}
 - add %%dist to release tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysqltuner/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Jul 2008 00:31:07 -0000	1.3
+++ sources	1 Aug 2009 16:12:32 -0000	1.4
@@ -1 +1 @@
-960fff8a910ba86b1eef62e627670b1f  mysqltuner.pl.gz
+de535154b7fb28e437ba412434ea535e  mysqltuner-1.0.0.pl



From ovasik at fedoraproject.org  Sat Aug  1 16:12:42 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Sat,  1 Aug 2009 16:12:42 +0000 (UTC)
Subject: rpms/xmlto/devel xmlto.spec, 1.49, 1.50 xmlto-libpaper.patch, 1.1, 
	NONE xmlto-stringparam.patch, 1.1, NONE xmlto-xhtml1.patch, 1.1,
	NONE xmlto-xmllintoptions.patch, 1.3, NONE
Message-ID: <20090801161242.8C2F711C004A@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	xmlto.spec 
Removed Files:
	xmlto-libpaper.patch xmlto-stringparam.patch 
	xmlto-xhtml1.patch xmlto-xmllintoptions.patch 
Log Message:
make subpackages noarch, preserve timestamps - merge review (#226568)


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xmlto.spec	27 Jul 2009 08:13:24 -0000	1.49
+++ xmlto.spec	1 Aug 2009 16:12:42 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.22
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
@@ -35,6 +35,8 @@ Summary: A set of xmlto backends with Te
 Requires: passivetex >= 1.11
 # We require main package
 Requires: xmlto = %{version}-%{release}
+BuildArch: noarch
+
 
 %description tex
 This subpackage contains xmlto backend scripts which do require
@@ -48,6 +50,7 @@ Summary: A set of xmlto backends for xht
 Requires: xhtml2fo-style-xsl
 # We require main package
 Requires: xmlto = %{version}-%{release}
+BuildArch: noarch
 
 %description xhtml
 This subpackage contains xmlto backend scripts for processing
@@ -65,7 +68,7 @@ make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,10 +99,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 01 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.22-3
+- make subpackages noarch, preserve timestamps - merge
+  review (#226568)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Mar 25 2009 Ondrej Vasik <ovasik at redhat.com>
+* Wed Mar 25 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.22-1
 - New version 0.0.22
 - autodetection for tools/program paths, consolidated
   error code handling, build warnings cleanup


--- xmlto-libpaper.patch DELETED ---


--- xmlto-stringparam.patch DELETED ---


--- xmlto-xhtml1.patch DELETED ---


--- xmlto-xmllintoptions.patch DELETED ---



From cwickert at fedoraproject.org  Sat Aug  1 16:33:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  1 Aug 2009 16:33:22 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xfce4-power-manager.spec, 1.15, 1.16
Message-ID: <20090801163322.11C4511C004A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15128

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
- Update to 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Jul 2009 16:29:56 -0000	1.11
+++ .cvsignore	1 Aug 2009 16:33:21 -0000	1.12
@@ -1 +1 @@
-xfce4-power-manager-0.8.2.tar.bz2
+xfce4-power-manager-0.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Jul 2009 16:29:56 -0000	1.11
+++ sources	1 Aug 2009 16:33:21 -0000	1.12
@@ -1 +1 @@
-80423d341ad996d9cf7e4762d53a0715  xfce4-power-manager-0.8.2.tar.bz2
+0db6b6f5b13c8b0829c6a07b7dfdc980  xfce4-power-manager-0.8.3.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xfce4-power-manager.spec	30 Jul 2009 10:53:45 -0000	1.15
+++ xfce4-power-manager.spec	1 Aug 2009 16:33:21 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           xfce4-power-manager
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.8.2-dpmsconst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -17,6 +18,8 @@ BuildRequires:  libnotify-devel >= 0.4.1
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gettext intltool desktop-file-utils
 Requires:       xfce4-panel
+Requires:       xfce4-doc
+Requires:       hal
 
 %description
 Xfce Power Manager uses the information and facilities provided by HAL to 
@@ -27,7 +30,9 @@ preferences.
 
 %prep
 %setup -q
-
+%if 0%{?fedora} >= 12
+%patch0 -b .dpmsstr
+%endif
 
 %build
 %configure
@@ -79,8 +84,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
+- Update to 0.8.3
+
 * Thu Jul 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-3
-- BuildRequire xorg-x11-proto-devel for dpms features
+- Patch to include dpmsconst.h instead of dpms.h
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From cwickert at fedoraproject.org  Sat Aug  1 16:39:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  1 Aug 2009 16:39:01 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel
	xfce4-power-manager-0.8.2-dpmsconst.patch, NONE, 1.1
Message-ID: <20090801163901.110D911C004A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17600

Added Files:
	xfce4-power-manager-0.8.2-dpmsconst.patch 
Log Message:
add missing patch

xfce4-power-manager-0.8.2-dpmsconst.patch:
 xfpm-dpms.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-power-manager-0.8.2-dpmsconst.patch ---
--- src/xfpm-dpms.c.orig	2009-07-30 14:01:31.000000000 +0200
+++ src/xfpm-dpms.c	2009-07-30 14:05:26.000000000 +0200
@@ -32,7 +32,7 @@
 
 #include <X11/Xproto.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include <libxfce4util/libxfce4util.h>
 



From cwickert at fedoraproject.org  Sat Aug  1 17:08:26 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  1 Aug 2009 17:08:26 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11
	xfce4-power-manager-0.8.2-dpmsconst.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 sources, 1.9, 1.10 xfce4-power-manager.spec, 1.10, 1.11
Message-ID: <20090801170826.72E2311C004A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27597

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.2-dpmsconst.patch 
Log Message:
* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
- Update to 0.8.3


xfce4-power-manager-0.8.2-dpmsconst.patch:
 xfpm-dpms.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-power-manager-0.8.2-dpmsconst.patch ---
--- src/xfpm-dpms.c.orig	2009-07-30 14:01:31.000000000 +0200
+++ src/xfpm-dpms.c	2009-07-30 14:05:26.000000000 +0200
@@ -32,7 +32,7 @@
 
 #include <X11/Xproto.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include <libxfce4util/libxfce4util.h>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Jul 2009 16:56:55 -0000	1.9
+++ .cvsignore	1 Aug 2009 17:08:26 -0000	1.10
@@ -1 +1 @@
-xfce4-power-manager-0.8.2.tar.bz2
+xfce4-power-manager-0.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 Jul 2009 16:56:55 -0000	1.9
+++ sources	1 Aug 2009 17:08:26 -0000	1.10
@@ -1 +1 @@
-80423d341ad996d9cf7e4762d53a0715  xfce4-power-manager-0.8.2.tar.bz2
+0db6b6f5b13c8b0829c6a07b7dfdc980  xfce4-power-manager-0.8.3.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xfce4-power-manager.spec	9 Jul 2009 16:56:55 -0000	1.10
+++ xfce4-power-manager.spec	1 Aug 2009 17:08:26 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           xfce4-power-manager
-Version:        0.8.2
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.8.2-dpmsconst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfconf-devel >= 4.6.0
@@ -14,8 +15,11 @@ BuildRequires:  xfce4-panel-devel >= 4.6
 BuildRequires:  dbus-devel >= 0.60
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libnotify-devel >= 0.4.1
+BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gettext intltool desktop-file-utils
 Requires:       xfce4-panel
+Requires:       xfce4-doc
+Requires:       hal
 
 %description
 Xfce Power Manager uses the information and facilities provided by HAL to 
@@ -26,7 +30,9 @@ preferences.
 
 %prep
 %setup -q
-
+%if 0%{?fedora} >= 12
+%patch0 -b .dpmsstr
+%endif
 
 %build
 %configure
@@ -78,6 +84,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
+- Update to 0.8.3
+
+* Thu Jul 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-3
+- Patch to include dpmsconst.h instead of dpms.h
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-1
 - Update to 0.8.2
 



From mschwendt at fedoraproject.org  Sat Aug  1 17:35:51 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  1 Aug 2009 17:35:51 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.13,1.14
Message-ID: <20090801173551.A337E11C004A@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5675

Modified Files:
	WhatsNew.py 
Log Message:
it's still /os for repos - ugh


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WhatsNew.py	1 Aug 2009 09:12:10 -0000	1.13
+++ WhatsNew.py	1 Aug 2009 17:35:51 -0000	1.14
@@ -267,7 +267,10 @@
             if not dirs or not isinstance(dirs,list):
                 dirs = []
             for dir in dirs:
-                srcdir = dir.replace('$arch','source/SRPMS')
+                archpos = dir.rfind('$arch')
+                if archpos<0:
+                    continue
+                srcdir = dir[:archpos]+'source/SRPMS'
                 if os.path.exists( srcdir ):
                     srcdirs.append( srcdir )
                 else:



From ankursinha at fedoraproject.org  Sat Aug  1 17:46:45 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sat,  1 Aug 2009 17:46:45 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.259, 1.260 comps-f11.xml.in, 1.275,
	1.276 comps-f12.xml.in, 1.64, 1.65
Message-ID: <20090801174645.850DD11C00DB@cvs1.fedora.phx.redhat.com>

Author: ankursinha

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

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
Log Message:
* Sat Aug 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> 
- Added Panini to f10 f11 f12



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- comps-f10.xml.in	23 Jul 2009 12:48:43 -0000	1.259
+++ comps-f10.xml.in	1 Aug 2009 17:46:45 -0000	1.260
@@ -2305,6 +2305,7 @@
       <packagereq type="optional">netpbm-progs</packagereq>
       <packagereq type="optional">nip2</packagereq>
       <packagereq type="optional">optipng</packagereq>
+      <packagereq type="optional">Panini</packagereq>
       <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- comps-f11.xml.in	27 Jul 2009 15:45:18 -0000	1.275
+++ comps-f11.xml.in	1 Aug 2009 17:46:45 -0000	1.276
@@ -2666,6 +2666,7 @@
       <packagereq type="optional">netpbm-progs</packagereq>
       <packagereq type="optional">nip2</packagereq>
       <packagereq type="optional">optipng</packagereq>
+      <packagereq type="optional">Panini</packagereq>
       <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- comps-f12.xml.in	31 Jul 2009 17:54:26 -0000	1.64
+++ comps-f12.xml.in	1 Aug 2009 17:46:45 -0000	1.65
@@ -2794,6 +2794,7 @@
       <packagereq type="optional">netpbm-progs</packagereq>
       <packagereq type="optional">nip2</packagereq>
       <packagereq type="optional">optipng</packagereq>
+      <packagereq type="optional">Panini</packagereq>
       <packagereq type="optional">pstoedit</packagereq>
       <packagereq type="optional">pydot</packagereq>
       <packagereq type="optional">qiv</packagereq>



From than at fedoraproject.org  Sat Aug  1 18:02:56 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat,  1 Aug 2009 18:02:56 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.89,1.90
Message-ID: <20090801180256.589BF11C004A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16784

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.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kde-l10n.spec	30 Jul 2009 11:48:33 -0000	1.89
+++ kde-l10n.spec	1 Aug 2009 18:02:56 -0000	1.90
@@ -886,7 +886,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
 %lang(ar) %{_datadir}/locale/ar/entry.desktop
-%lang(ar) %{_datadir}/locale/ar/LC_SCRIPTS/kdelibs4/kdelibs4.js
+%lang(ar) %{_datadir}/locale/ar/LC_SCRIPTS/
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
 
 %if %{buildall}
@@ -1408,6 +1408,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/locale/sv/entry.desktop
+%lang(sv) %{_datadir}/locale/sv/LC_SCRIPTS/
 %lang(sv) %{_kde4_appsdir}/ktuberling/sounds/sv*
 %lang(sv) %{_kde4_appsdir}/khangman/sv.txt
 %lang(sv) %{_kde4_appsdir}/kvtml/sv



From mtasaka at fedoraproject.org  Sat Aug  1 18:21:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  1 Aug 2009 18:21:59 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.389, 1.390 jd.spec, 1.449, 1.450 sources,
	1.390, 1.391
Message-ID: <20090801182159.1D81411C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- .cvsignore	30 Jul 2009 18:10:22 -0000	1.389
+++ .cvsignore	1 Aug 2009 18:21:58 -0000	1.390
@@ -1 +1 @@
-jd-2.4.2-svn3000_trunk.tgz
+jd-2.4.2-svn3007_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- jd.spec	30 Jul 2009 18:10:22 -0000	1.449
+++ jd.spec	1 Aug 2009 18:21:58 -0000	1.450
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3000_trunk
+%define         strtag        svn3007_trunk
 %define         repoid        41293
 # 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 Jul 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3000
+* Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3007
 
 * 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/F-10/sources,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- sources	30 Jul 2009 18:10:23 -0000	1.390
+++ sources	1 Aug 2009 18:21:58 -0000	1.391
@@ -1 +1 @@
-f33bc571bad857ee1a286ee80b11f1a0  jd-2.4.2-svn3000_trunk.tgz
+9165b916e3b9ed22b037eeff56534d6d  jd-2.4.2-svn3007_trunk.tgz



From mtasaka at fedoraproject.org  Sat Aug  1 18:21:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  1 Aug 2009 18:21:59 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.383, 1.384 jd.spec, 1.445, 1.446 sources,
	1.384, 1.385
Message-ID: <20090801182159.6FB6611C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- .cvsignore	30 Jul 2009 18:10:23 -0000	1.383
+++ .cvsignore	1 Aug 2009 18:21:59 -0000	1.384
@@ -1 +1 @@
-jd-2.4.2-svn3000_trunk.tgz
+jd-2.4.2-svn3007_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -p -r1.445 -r1.446
--- jd.spec	30 Jul 2009 18:10:23 -0000	1.445
+++ jd.spec	1 Aug 2009 18:21:59 -0000	1.446
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3000_trunk
+%define         strtag        svn3007_trunk
 %define         repoid        41293
 # 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 Jul 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3000
+* Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3007
 
 * 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/F-11/sources,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- sources	30 Jul 2009 18:10:23 -0000	1.384
+++ sources	1 Aug 2009 18:21:59 -0000	1.385
@@ -1 +1 @@
-f33bc571bad857ee1a286ee80b11f1a0  jd-2.4.2-svn3000_trunk.tgz
+9165b916e3b9ed22b037eeff56534d6d  jd-2.4.2-svn3007_trunk.tgz



From mtasaka at fedoraproject.org  Sat Aug  1 18:21:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  1 Aug 2009 18:21:59 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.382, 1.383 jd.spec, 1.445, 1.446 sources,
	1.383, 1.384
Message-ID: <20090801182159.C4EC111C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- .cvsignore	30 Jul 2009 18:10:25 -0000	1.382
+++ .cvsignore	1 Aug 2009 18:21:59 -0000	1.383
@@ -1 +1 @@
-jd-2.4.2-svn3000_trunk.tgz
+jd-2.4.2-svn3007_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -p -r1.445 -r1.446
--- jd.spec	30 Jul 2009 18:10:25 -0000	1.445
+++ jd.spec	1 Aug 2009 18:21:59 -0000	1.446
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3000_trunk
+%define         strtag        svn3007_trunk
 %define         repoid        41293
 # 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 Jul 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3000
+* Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3007
 
 * 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.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- sources	30 Jul 2009 18:10:25 -0000	1.383
+++ sources	1 Aug 2009 18:21:59 -0000	1.384
@@ -1 +1 @@
-f33bc571bad857ee1a286ee80b11f1a0  jd-2.4.2-svn3000_trunk.tgz
+9165b916e3b9ed22b037eeff56534d6d  jd-2.4.2-svn3007_trunk.tgz



From pkgdb at fedoraproject.org  Sat Aug  1 18:51:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 18:51:19 +0000
Subject: [pkgdb] R-AnnotationDbi was added for pingou
Message-ID: <20090801185120.0636610F89A@bastion2.fedora.phx.redhat.com>

tibbs has added Package R-AnnotationDbi with summary Annotation Database Interface
tibbs has approved Package R-AnnotationDbi
tibbs has added a Fedora devel branch for R-AnnotationDbi with an owner of pingou
tibbs has approved R-AnnotationDbi in Fedora devel
tibbs has approved Package R-AnnotationDbi
tibbs has set commit to Approved for 107427 on R-AnnotationDbi (Fedora devel)
tibbs has set checkout to Approved for 107427 on R-AnnotationDbi (Fedora devel)
tibbs has set build to Approved for 107427 on R-AnnotationDbi (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Aug  1 18:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 18:51:21 +0000
Subject: [pkgdb] R-AnnotationDbi summary updated by tibbs
Message-ID: <20090801185121.6C22B10F89D@bastion2.fedora.phx.redhat.com>

tibbs set package R-AnnotationDbi summary to Annotation Database Interface

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



From pkgdb at fedoraproject.org  Sat Aug  1 18:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 18:51:21 +0000
Subject: [pkgdb] R-AnnotationDbi (Fedora, 11) updated by tibbs
Message-ID: <20090801185121.7237E10F8A1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for R-AnnotationDbi
tibbs has set commit to Approved for 107427 on R-AnnotationDbi (Fedora 11)
tibbs has set checkout to Approved for 107427 on R-AnnotationDbi (Fedora 11)
tibbs has set build to Approved for 107427 on R-AnnotationDbi (Fedora 11)

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



From tibbs at fedoraproject.org  Sat Aug  1 18:51:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 18:51:28 +0000 (UTC)
Subject: rpms/R-AnnotationDbi - New directory
Message-ID: <20090801185128.1E1DC11C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-AnnotationDbi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsAE2516/rpms/R-AnnotationDbi

Log Message:
Directory /cvs/pkgs/rpms/R-AnnotationDbi added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 18:51:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 18:51:28 +0000 (UTC)
Subject: rpms/R-AnnotationDbi/devel - New directory
Message-ID: <20090801185128.42CE611C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-AnnotationDbi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsAE2516/rpms/R-AnnotationDbi/devel

Log Message:
Directory /cvs/pkgs/rpms/R-AnnotationDbi/devel added to the repository




From pkgdb at fedoraproject.org  Sat Aug  1 18:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 18:51:21 +0000
Subject: [pkgdb] R-AnnotationDbi (Fedora, 11) updated by tibbs
Message-ID: <20090801185121.7CFBF10F8B4@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for R-AnnotationDbi
tibbs has set commit to Approved for 107427 on R-AnnotationDbi (Fedora 10)
tibbs has set checkout to Approved for 107427 on R-AnnotationDbi (Fedora 10)
tibbs has set build to Approved for 107427 on R-AnnotationDbi (Fedora 10)

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



From tibbs at fedoraproject.org  Sat Aug  1 18:51:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 18:51:34 +0000 (UTC)
Subject: rpms/R-AnnotationDbi Makefile,NONE,1.1
Message-ID: <20090801185134.078F411C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-AnnotationDbi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsAE2516/rpms/R-AnnotationDbi

Added Files:
	Makefile 
Log Message:
Setup of module R-AnnotationDbi


--- NEW FILE Makefile ---
# Top level Makefile for module R-AnnotationDbi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Sat Aug  1 18:51:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 18:51:34 +0000 (UTC)
Subject: rpms/R-AnnotationDbi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090801185134.6293911C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-AnnotationDbi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsAE2516/rpms/R-AnnotationDbi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-AnnotationDbi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-AnnotationDbi
# $Id: Makefile,v 1.1 2009/08/01 18:51:34 tibbs Exp $
NAME := R-AnnotationDbi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From jstanley at fedoraproject.org  Sat Aug  1 19:01:41 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sat,  1 Aug 2009 19:01:41 +0000 (UTC)
Subject: rpms/trac-customfieldadmin-plugin/F-10
	trac-customfieldadmin-plugin.spec, 1.1, 1.2
Message-ID: <20090801190141.6D4D411C0417@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6079

Modified Files:
	trac-customfieldadmin-plugin.spec 
Log Message:
Correct broken dep in F-10 branch



Index: trac-customfieldadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10/trac-customfieldadmin-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- trac-customfieldadmin-plugin.spec	8 Jul 2009 22:35:17 -0000	1.1
+++ trac-customfieldadmin-plugin.spec	1 Aug 2009 19:01:40 -0000	1.2
@@ -18,7 +18,7 @@ BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
 Requires:       trac >= 0.10
 # Only for 0.10
-Requires:       trac-webadmin-plugin
+Requires:       trac-webadmin
 
 %description
 A trac plugin to expose custom ticket fields via the admin web interface,
@@ -45,6 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Aug 01 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.3.svn5073
+- Correct broken dep (sorry this took so long....)
 
 * Sat Jul 04 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.2.svn5073
 - Correctly name package, correct SVN checkout instructions



From jstanley at fedoraproject.org  Sat Aug  1 19:02:31 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sat,  1 Aug 2009 19:02:31 +0000 (UTC)
Subject: rpms/trac-customfieldadmin-plugin/F-10
	trac-customfieldadmin-plugin.spec, 1.2, 1.3
Message-ID: <20090801190231.A3ED411C004A@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6522

Modified Files:
	trac-customfieldadmin-plugin.spec 
Log Message:
Correct release in specfile



Index: trac-customfieldadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10/trac-customfieldadmin-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- trac-customfieldadmin-plugin.spec	1 Aug 2009 19:01:40 -0000	1.2
+++ trac-customfieldadmin-plugin.spec	1 Aug 2009 19:02:31 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           trac-customfieldadmin-plugin
 Version:        0.1
-Release:        0.1.svn5073%{?dist}
+Release:        0.3.svn5073%{?dist}
 Summary:        Expose ticket custom fields via the web admin interface
 
 Group:          Applications/Internet



From peter at fedoraproject.org  Sat Aug  1 19:07:51 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  1 Aug 2009 19:07:51 +0000 (UTC)
Subject: rpms/bios_extract/devel bios_extract--ami_endian.diff, NONE,
	1.1 bios_extract--phoenix_and_lh5_endian.diff, NONE,
	1.1 bios_extract--recognition_of_more_bios_types.diff, NONE,
	1.1 bios_extract.spec, 1.2, 1.3 import.log, 1.1, 1.2
Message-ID: <20090801190751.ECC9A11C004A@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	bios_extract.spec import.log 
Added Files:
	bios_extract--ami_endian.diff 
	bios_extract--phoenix_and_lh5_endian.diff 
	bios_extract--recognition_of_more_bios_types.diff 
Log Message:
BigEndian fixes and more bios-types recognized now

bios_extract--ami_endian.diff:
 ami.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE bios_extract--ami_endian.diff ---
>From c07e897df4b1d64307550049d08ebcbbe258e593 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:55:17 +0400
Subject: [PATCH] Fix for endianness in AMI extraction routines.

Subj. Since I finally found AMI bios images among other ~ 2.5 Gbytes
of proprietary bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/ami.c b/ami.c
index 108ef1e..88a00d4 100644
--- a/ami.c
+++ b/ami.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -177,7 +178,7 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
     }
 
     /* now dump the individual modules */
-    Offset = (abc->BeginHi << 4) + abc->BeginLo;
+    Offset = (le16toh(abc->BeginHi) << 4) + le16toh(abc->BeginLo);
 
     for (i = 0; i < 0x80; i++) {
 	char filename[64], *ModuleName;
@@ -198,15 +199,15 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    sprintf(filename, "amibody_%02x.rom", part->PartID);
 
 	if (Compressed)
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, part->ROMSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, le32toh(part->ROMSize));
 	else
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, part->CSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, le16toh(part->CSize));
 
 	printf(" -> %s", filename);
 	if (part->PartID != 0x20)
 	    printf("  ");
 	if (Compressed)
-	    printf(" (%5d bytes)", part->ExpSize);
+	    printf(" (%5d bytes)", le32toh(part->ExpSize));
 	else
 	    printf("\t\t");
 
@@ -217,25 +218,25 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    printf("\n");
 
 	if (Compressed)
-	    BufferSize = part->ExpSize;
+	    BufferSize = le32toh(part->ExpSize);
 	else
-	    BufferSize = part->CSize;
+	    BufferSize = le16toh(part->CSize);
 
 	Buffer = MMapOutputFile(filename, BufferSize);
 	if (!Buffer)
 	    return FALSE;
 
 	if (Compressed)
-	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, part->ROMSize,
+	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, le32toh(part->ROMSize),
 		      Buffer, BufferSize);
 	else
 	    memcpy(Buffer, BIOSImage + (Offset - BIOSOffset) + 0x0C, BufferSize);
 
 	munmap(Buffer, BufferSize);
 
-	if ((part->PrePartHi == 0xFFFF) || (part->PrePartLo == 0xFFFF))
+	if ((le16toh(part->PrePartHi) == 0xFFFF) || (le16toh(part->PrePartLo) == 0xFFFF))
 	    break;
-	Offset = (part->PrePartHi << 4) + part->PrePartLo;
+	Offset = (le16toh(part->PrePartHi) << 4) + le16toh(part->PrePartLo);
     }
 
     return TRUE;

bios_extract--phoenix_and_lh5_endian.diff:
 lh5_extract.c |    9 +++++----
 phoenix.c     |   33 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE bios_extract--phoenix_and_lh5_endian.diff ---
>From 989a6c675212d459619a3a1e1c53dd6040e65867 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:37:56 +0400
Subject: [PATCH] New version of endian patch.

I removed #ifdefs completely, since they already exists in <endian.h>,
so we may simply (and safely) use htole[16,32]/le[16,32]toh. I also fixed
nasty typo in my prevoius patch - I should use le[16,32]to h rather than
htole[16,32]. However this renders to correct results,also, since both of
them are actually just #defines around bswap_[16,32].

Also, I found one phoenix BIOS image and therefore was able to fix extraction
from it on PowerPC. See patch.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/lh5_extract.c b/lh5_extract.c
index 60ecd48..b3e2d98 100644
--- a/lh5_extract.c
+++ b/lh5_extract.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <endian.h>
 
 #include "lh5_extract.h"
 
@@ -129,18 +130,18 @@ LH5HeaderParse(unsigned char *Buffer, int BufferSize,
         return 0;
     }
 
-    *packed_size = *(unsigned int *) (Buffer + 7);
-    *original_size = *(unsigned int *) (Buffer + 11);
+    *packed_size = le32toh(*(unsigned int *) (Buffer + 7));
+    *original_size = le32toh(*(unsigned int *) (Buffer + 11));
 
     name_length = Buffer[21];
     *name = strndup((char *) Buffer + 22, name_length);
 
-    *crc = *(unsigned short *) (Buffer + 22 + name_length);
+    *crc = le16toh(*(unsigned short *) (Buffer + 22 + name_length));
 
     offset = header_size + 2;
     /* Skip extended headers */
     while (1) {
-	unsigned short extend_size = *(unsigned short *) (Buffer + offset - 2);
+	unsigned short extend_size = le16toh(*(unsigned short *) (Buffer + offset - 2));
 
 	if (!extend_size)
 	    break;
diff --git a/phoenix.c b/phoenix.c
index 8ee241c..c2fe10a 100644
--- a/phoenix.c
+++ b/phoenix.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -108,10 +109,10 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
 	return 0;
     }
 
-    if ((Offset + Module->HeadLen + 4 + Module->Packed1) > BIOSLength) {
+    if ((Offset + Module->HeadLen + 4 + le32toh(Module->Packed1)) > BIOSLength) {
 	fprintf(stderr, "Error: Module overruns buffer at 0x%05X\n",
 		Offset);
-	return Module->Previous;
+	return le32toh(Module->Previous);
     }
 
     ModuleName = PhoenixModuleNameGet(Module->Type);
@@ -134,47 +135,47 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
     switch (Module->Compression) {
     case 5: /* LH5 */
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	Buffer = MMapOutputFile(filename, Module->ExpLen1);
+	Buffer = MMapOutputFile(filename, le32toh(Module->ExpLen1));
 	if (!Buffer)
 	    break;
 
 	LH5Decode(BIOSImage + Offset + Module->HeadLen + 4,
-		  Module->Packed1, Buffer, Module->ExpLen1);
+		  le32toh(Module->Packed1), Buffer, le32toh(Module->ExpLen1));
 
-	munmap(Buffer, Module->ExpLen1);
+	munmap(Buffer, le32toh(Module->ExpLen1));
 
 	break;
     /* case 3 */ /* LZSS */
     case 0: /* not compressed at all */
 	/* why do we not use the full header here? */
 	printf("0x%05X (%6d bytes)   ->   %s", Offset + Module->HeadLen,
-	       Module->Packed1, filename);
+	       le32toh(Module->Packed1), filename);
 
-	write(fd, BIOSImage + Offset + Module->HeadLen, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen, le32toh(Module->Packed1));
 	break;
     default:
 	fprintf(stderr, "Unsupported compression type for %s: %d\n",
 		filename, Module->Compression);
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	write(fd, BIOSImage + Offset + Module->HeadLen + 4, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen + 4, le32toh(Module->Packed1));
 	break;
     }
 
     close(fd);
     free(filename);
 
-    if (Module->Offset || Module->Segment) {
+    if (le16toh(Module->Offset) || le16toh(Module->Segment)) {
 	if (!Module->Compression)
 	    printf("\t\t");
-	printf("\t [0x%04X:0x%04X]\n", Module->Segment << 12, Module->Offset);
+	printf("\t [0x%04X:0x%04X]\n", le16toh(Module->Segment) << 12, le16toh(Module->Offset));
     } else
 	printf("\n");
 
-    return Module->Previous;
+    return le32toh(Module->Previous);
 }
 
 /*
@@ -195,11 +196,11 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 
     for (ID = (struct PhoenixID *) (BIOSImage + BCPSegmentOffset + 10);
 	 ((void *) ID < (void *) (BIOSImage + BIOSLength)) && ID->Name[0];
-	 ID = (struct PhoenixID *) (((unsigned char *) ID) + ID->Length)) {
+	 ID = (struct PhoenixID *) (((unsigned char *) ID) + le16toh(ID->Length))) {
 #if 0
 	printf("PhoenixID: Name %c%c%c%c%c%c, Flags 0x%04X, Length %d\n",
 	       ID->Name[0],  ID->Name[1], ID->Name[2],  ID->Name[3],
-	       ID->Name[4],  ID->Name[5], ID->Flags, ID->Length);
+	       ID->Name[4],  ID->Name[5], le16toh(ID->Flags), le16toh(ID->Length));
 #endif
 	if (!strncmp(ID->Name, "BCPSYS", 6))
 	    break;
@@ -224,7 +225,7 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	printf("Version \"%s\", created on %s at %s.\n", Version, Date, Time);
     }
 
-    Offset = *((uint32_t *) (((char *) ID) + 0x77));
+    Offset = le32toh(*((uint32_t *) (((char *) ID) + 0x77)));
     Offset &= (BIOSLength - 1);
     if (!Offset) {
 	fprintf(stderr, "Error: retrieved invalid Modules offset.\n");

bios_extract--recognition_of_more_bios_types.diff:
 bios_extract.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE bios_extract--recognition_of_more_bios_types.diff ---
>From 2fe1f3c5351ce7d757a0dd63607b67cdcbf235b3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 21:08:01 +0400
Subject: [PATCH] Identification of some more BIOS images.

Subj. Actually, I'm sure this is an ugly patch. The proper way will be
the addition of some special search procedures and some commandline
switches to force using of specific extraction routines ( -f ami, -f award).

Anyway, here is a working patch for decoding Asus bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/bios_extract.c b/bios_extract.c
index 7b81c72..104232a 100644
--- a/bios_extract.c
+++ b/bios_extract.c
@@ -89,6 +89,11 @@ static struct {
     {"Award BootBlock", "= Award Decompression Bios =", AwardExtract},
     {"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract},
     {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract},
+    /* custom modified BIOS from Asus - they replace "AMIBOOT " with their own
+     * BIOS ID text */
+    {"ROM", "AMIBIOSC", AMI95Extract},
+    /* some award modules - not sure this is a good solution */
+    {"Award", "Award", AwardExtract},
     {NULL, NULL, NULL},
 };
 


Index: bios_extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/devel/bios_extract.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bios_extract.spec	24 Jul 2009 18:04:42 -0000	1.2
+++ bios_extract.spec	1 Aug 2009 19:07:51 -0000	1.3
@@ -3,13 +3,19 @@
 
 Name:		bios_extract
 Version:	0
-Release:	0.3.%{git_commit_date}git%{?dist}
+Release:	0.4.%{git_commit_date}git%{?dist}
 Summary:	Tools to extract the different submodules of common legacy bioses
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://cgit.freedesktop.org/~libv/bios_extract
 Source0:	http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2
+# fix for extraction of Award and Phoenix bios-images on BigEndian platforms (patch sent upstream)
+Patch0:		bios_extract--ami_endian.diff
+# fix for extraction of AMI bios-images on BigEndian platforms (patch sent upstream)
+Patch1:		bios_extract--phoenix_and_lh5_endian.diff
+# recognized more bios images (ASUS for example) (patch sent upstream)
+Patch2:		bios_extract--recognition_of_more_bios_types.diff
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -19,6 +25,9 @@ Tools to extract the different submodule
 %prep
 %setup -q -n %{name}-%{git_commit}
 sed -i s/^CFLAGS.*$// Makefile
+%patch0 -p1 -b .big_endian
+%patch1 -p1 -b .ami_big_endian
+%patch2 -p1 -b .more_images
 
 
 %build
@@ -42,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.4.20090713git
+- Fixed work on BigEndian platforms
+- More bios-types recognized
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090713git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Jul 2009 16:51:04 -0000	1.1
+++ import.log	1 Aug 2009 19:07:51 -0000	1.2
@@ -1 +1,2 @@
 bios_extract-0-0_2_20090713git_fc11:HEAD:bios_extract-0-0.2.20090713git.fc11.src.rpm:1248367822
+bios_extract-0-0_4_20090713git_fc11:HEAD:bios_extract-0-0.4.20090713git.fc11.src.rpm:1249153598



From peter at fedoraproject.org  Sat Aug  1 19:09:39 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  1 Aug 2009 19:09:39 +0000 (UTC)
Subject: rpms/bios_extract/F-11 bios_extract--ami_endian.diff, NONE,
	1.1 bios_extract--phoenix_and_lh5_endian.diff, NONE,
	1.1 bios_extract--recognition_of_more_bios_types.diff, NONE,
	1.1 bios_extract.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090801190939.394B011C004A@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	bios_extract.spec import.log 
Added Files:
	bios_extract--ami_endian.diff 
	bios_extract--phoenix_and_lh5_endian.diff 
	bios_extract--recognition_of_more_bios_types.diff 
Log Message:
BigEndian fixes and more bios-types recognized now

bios_extract--ami_endian.diff:
 ami.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE bios_extract--ami_endian.diff ---
>From c07e897df4b1d64307550049d08ebcbbe258e593 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:55:17 +0400
Subject: [PATCH] Fix for endianness in AMI extraction routines.

Subj. Since I finally found AMI bios images among other ~ 2.5 Gbytes
of proprietary bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/ami.c b/ami.c
index 108ef1e..88a00d4 100644
--- a/ami.c
+++ b/ami.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -177,7 +178,7 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
     }
 
     /* now dump the individual modules */
-    Offset = (abc->BeginHi << 4) + abc->BeginLo;
+    Offset = (le16toh(abc->BeginHi) << 4) + le16toh(abc->BeginLo);
 
     for (i = 0; i < 0x80; i++) {
 	char filename[64], *ModuleName;
@@ -198,15 +199,15 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    sprintf(filename, "amibody_%02x.rom", part->PartID);
 
 	if (Compressed)
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, part->ROMSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, le32toh(part->ROMSize));
 	else
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, part->CSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, le16toh(part->CSize));
 
 	printf(" -> %s", filename);
 	if (part->PartID != 0x20)
 	    printf("  ");
 	if (Compressed)
-	    printf(" (%5d bytes)", part->ExpSize);
+	    printf(" (%5d bytes)", le32toh(part->ExpSize));
 	else
 	    printf("\t\t");
 
@@ -217,25 +218,25 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    printf("\n");
 
 	if (Compressed)
-	    BufferSize = part->ExpSize;
+	    BufferSize = le32toh(part->ExpSize);
 	else
-	    BufferSize = part->CSize;
+	    BufferSize = le16toh(part->CSize);
 
 	Buffer = MMapOutputFile(filename, BufferSize);
 	if (!Buffer)
 	    return FALSE;
 
 	if (Compressed)
-	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, part->ROMSize,
+	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, le32toh(part->ROMSize),
 		      Buffer, BufferSize);
 	else
 	    memcpy(Buffer, BIOSImage + (Offset - BIOSOffset) + 0x0C, BufferSize);
 
 	munmap(Buffer, BufferSize);
 
-	if ((part->PrePartHi == 0xFFFF) || (part->PrePartLo == 0xFFFF))
+	if ((le16toh(part->PrePartHi) == 0xFFFF) || (le16toh(part->PrePartLo) == 0xFFFF))
 	    break;
-	Offset = (part->PrePartHi << 4) + part->PrePartLo;
+	Offset = (le16toh(part->PrePartHi) << 4) + le16toh(part->PrePartLo);
     }
 
     return TRUE;

bios_extract--phoenix_and_lh5_endian.diff:
 lh5_extract.c |    9 +++++----
 phoenix.c     |   33 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE bios_extract--phoenix_and_lh5_endian.diff ---
>From 989a6c675212d459619a3a1e1c53dd6040e65867 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:37:56 +0400
Subject: [PATCH] New version of endian patch.

I removed #ifdefs completely, since they already exists in <endian.h>,
so we may simply (and safely) use htole[16,32]/le[16,32]toh. I also fixed
nasty typo in my prevoius patch - I should use le[16,32]to h rather than
htole[16,32]. However this renders to correct results,also, since both of
them are actually just #defines around bswap_[16,32].

Also, I found one phoenix BIOS image and therefore was able to fix extraction
from it on PowerPC. See patch.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/lh5_extract.c b/lh5_extract.c
index 60ecd48..b3e2d98 100644
--- a/lh5_extract.c
+++ b/lh5_extract.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <endian.h>
 
 #include "lh5_extract.h"
 
@@ -129,18 +130,18 @@ LH5HeaderParse(unsigned char *Buffer, int BufferSize,
         return 0;
     }
 
-    *packed_size = *(unsigned int *) (Buffer + 7);
-    *original_size = *(unsigned int *) (Buffer + 11);
+    *packed_size = le32toh(*(unsigned int *) (Buffer + 7));
+    *original_size = le32toh(*(unsigned int *) (Buffer + 11));
 
     name_length = Buffer[21];
     *name = strndup((char *) Buffer + 22, name_length);
 
-    *crc = *(unsigned short *) (Buffer + 22 + name_length);
+    *crc = le16toh(*(unsigned short *) (Buffer + 22 + name_length));
 
     offset = header_size + 2;
     /* Skip extended headers */
     while (1) {
-	unsigned short extend_size = *(unsigned short *) (Buffer + offset - 2);
+	unsigned short extend_size = le16toh(*(unsigned short *) (Buffer + offset - 2));
 
 	if (!extend_size)
 	    break;
diff --git a/phoenix.c b/phoenix.c
index 8ee241c..c2fe10a 100644
--- a/phoenix.c
+++ b/phoenix.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -108,10 +109,10 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
 	return 0;
     }
 
-    if ((Offset + Module->HeadLen + 4 + Module->Packed1) > BIOSLength) {
+    if ((Offset + Module->HeadLen + 4 + le32toh(Module->Packed1)) > BIOSLength) {
 	fprintf(stderr, "Error: Module overruns buffer at 0x%05X\n",
 		Offset);
-	return Module->Previous;
+	return le32toh(Module->Previous);
     }
 
     ModuleName = PhoenixModuleNameGet(Module->Type);
@@ -134,47 +135,47 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
     switch (Module->Compression) {
     case 5: /* LH5 */
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	Buffer = MMapOutputFile(filename, Module->ExpLen1);
+	Buffer = MMapOutputFile(filename, le32toh(Module->ExpLen1));
 	if (!Buffer)
 	    break;
 
 	LH5Decode(BIOSImage + Offset + Module->HeadLen + 4,
-		  Module->Packed1, Buffer, Module->ExpLen1);
+		  le32toh(Module->Packed1), Buffer, le32toh(Module->ExpLen1));
 
-	munmap(Buffer, Module->ExpLen1);
+	munmap(Buffer, le32toh(Module->ExpLen1));
 
 	break;
     /* case 3 */ /* LZSS */
     case 0: /* not compressed at all */
 	/* why do we not use the full header here? */
 	printf("0x%05X (%6d bytes)   ->   %s", Offset + Module->HeadLen,
-	       Module->Packed1, filename);
+	       le32toh(Module->Packed1), filename);
 
-	write(fd, BIOSImage + Offset + Module->HeadLen, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen, le32toh(Module->Packed1));
 	break;
     default:
 	fprintf(stderr, "Unsupported compression type for %s: %d\n",
 		filename, Module->Compression);
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	write(fd, BIOSImage + Offset + Module->HeadLen + 4, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen + 4, le32toh(Module->Packed1));
 	break;
     }
 
     close(fd);
     free(filename);
 
-    if (Module->Offset || Module->Segment) {
+    if (le16toh(Module->Offset) || le16toh(Module->Segment)) {
 	if (!Module->Compression)
 	    printf("\t\t");
-	printf("\t [0x%04X:0x%04X]\n", Module->Segment << 12, Module->Offset);
+	printf("\t [0x%04X:0x%04X]\n", le16toh(Module->Segment) << 12, le16toh(Module->Offset));
     } else
 	printf("\n");
 
-    return Module->Previous;
+    return le32toh(Module->Previous);
 }
 
 /*
@@ -195,11 +196,11 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 
     for (ID = (struct PhoenixID *) (BIOSImage + BCPSegmentOffset + 10);
 	 ((void *) ID < (void *) (BIOSImage + BIOSLength)) && ID->Name[0];
-	 ID = (struct PhoenixID *) (((unsigned char *) ID) + ID->Length)) {
+	 ID = (struct PhoenixID *) (((unsigned char *) ID) + le16toh(ID->Length))) {
 #if 0
 	printf("PhoenixID: Name %c%c%c%c%c%c, Flags 0x%04X, Length %d\n",
 	       ID->Name[0],  ID->Name[1], ID->Name[2],  ID->Name[3],
-	       ID->Name[4],  ID->Name[5], ID->Flags, ID->Length);
+	       ID->Name[4],  ID->Name[5], le16toh(ID->Flags), le16toh(ID->Length));
 #endif
 	if (!strncmp(ID->Name, "BCPSYS", 6))
 	    break;
@@ -224,7 +225,7 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	printf("Version \"%s\", created on %s at %s.\n", Version, Date, Time);
     }
 
-    Offset = *((uint32_t *) (((char *) ID) + 0x77));
+    Offset = le32toh(*((uint32_t *) (((char *) ID) + 0x77)));
     Offset &= (BIOSLength - 1);
     if (!Offset) {
 	fprintf(stderr, "Error: retrieved invalid Modules offset.\n");

bios_extract--recognition_of_more_bios_types.diff:
 bios_extract.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE bios_extract--recognition_of_more_bios_types.diff ---
>From 2fe1f3c5351ce7d757a0dd63607b67cdcbf235b3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 21:08:01 +0400
Subject: [PATCH] Identification of some more BIOS images.

Subj. Actually, I'm sure this is an ugly patch. The proper way will be
the addition of some special search procedures and some commandline
switches to force using of specific extraction routines ( -f ami, -f award).

Anyway, here is a working patch for decoding Asus bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/bios_extract.c b/bios_extract.c
index 7b81c72..104232a 100644
--- a/bios_extract.c
+++ b/bios_extract.c
@@ -89,6 +89,11 @@ static struct {
     {"Award BootBlock", "= Award Decompression Bios =", AwardExtract},
     {"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract},
     {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract},
+    /* custom modified BIOS from Asus - they replace "AMIBOOT " with their own
+     * BIOS ID text */
+    {"ROM", "AMIBIOSC", AMI95Extract},
+    /* some award modules - not sure this is a good solution */
+    {"Award", "Award", AwardExtract},
     {NULL, NULL, NULL},
 };
 


Index: bios_extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/F-11/bios_extract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bios_extract.spec	23 Jul 2009 16:55:09 -0000	1.1
+++ bios_extract.spec	1 Aug 2009 19:09:38 -0000	1.2
@@ -3,13 +3,19 @@
 
 Name:		bios_extract
 Version:	0
-Release:	0.2.%{git_commit_date}git%{?dist}
+Release:	0.4.%{git_commit_date}git%{?dist}
 Summary:	Tools to extract the different submodules of common legacy bioses
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://cgit.freedesktop.org/~libv/bios_extract
 Source0:	http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2
+# fix for extraction of Award and Phoenix bios-images on BigEndian platforms (patch sent upstream)
+Patch0:		bios_extract--ami_endian.diff
+# fix for extraction of AMI bios-images on BigEndian platforms (patch sent upstream)
+Patch1:		bios_extract--phoenix_and_lh5_endian.diff
+# recognized more bios images (ASUS for example) (patch sent upstream)
+Patch2:		bios_extract--recognition_of_more_bios_types.diff
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -19,6 +25,9 @@ Tools to extract the different submodule
 %prep
 %setup -q -n %{name}-%{git_commit}
 sed -i s/^CFLAGS.*$// Makefile
+%patch0 -p1 -b .big_endian
+%patch1 -p1 -b .ami_big_endian
+%patch2 -p1 -b .more_images
 
 
 %build
@@ -42,6 +51,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.4.20090713git
+- Fixed work on BigEndian platforms
+- More bios-types recognized
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090713git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.2.20090713git
 - Small changes, based on Yanko Kaneti's suggestions.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Jul 2009 16:55:09 -0000	1.1
+++ import.log	1 Aug 2009 19:09:38 -0000	1.2
@@ -1 +1,2 @@
 bios_extract-0-0_2_20090713git_fc11:F-11:bios_extract-0-0.2.20090713git.fc11.src.rpm:1248368082
+bios_extract-0-0_4_20090713git_fc11:F-11:bios_extract-0-0.4.20090713git.fc11.src.rpm:1249153718



From peter at fedoraproject.org  Sat Aug  1 19:10:50 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  1 Aug 2009 19:10:50 +0000 (UTC)
Subject: rpms/bios_extract/F-10 bios_extract--ami_endian.diff, NONE,
	1.1 bios_extract--phoenix_and_lh5_endian.diff, NONE,
	1.1 bios_extract--recognition_of_more_bios_types.diff, NONE,
	1.1 bios_extract.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090801191050.9E7D811C04D5@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	bios_extract.spec import.log 
Added Files:
	bios_extract--ami_endian.diff 
	bios_extract--phoenix_and_lh5_endian.diff 
	bios_extract--recognition_of_more_bios_types.diff 
Log Message:
BigEndian fixes and more bios-types recognized now

bios_extract--ami_endian.diff:
 ami.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE bios_extract--ami_endian.diff ---
>From c07e897df4b1d64307550049d08ebcbbe258e593 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:55:17 +0400
Subject: [PATCH] Fix for endianness in AMI extraction routines.

Subj. Since I finally found AMI bios images among other ~ 2.5 Gbytes
of proprietary bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/ami.c b/ami.c
index 108ef1e..88a00d4 100644
--- a/ami.c
+++ b/ami.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -177,7 +178,7 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
     }
 
     /* now dump the individual modules */
-    Offset = (abc->BeginHi << 4) + abc->BeginLo;
+    Offset = (le16toh(abc->BeginHi) << 4) + le16toh(abc->BeginLo);
 
     for (i = 0; i < 0x80; i++) {
 	char filename[64], *ModuleName;
@@ -198,15 +199,15 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    sprintf(filename, "amibody_%02x.rom", part->PartID);
 
 	if (Compressed)
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, part->ROMSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, le32toh(part->ROMSize));
 	else
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, part->CSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, le16toh(part->CSize));
 
 	printf(" -> %s", filename);
 	if (part->PartID != 0x20)
 	    printf("  ");
 	if (Compressed)
-	    printf(" (%5d bytes)", part->ExpSize);
+	    printf(" (%5d bytes)", le32toh(part->ExpSize));
 	else
 	    printf("\t\t");
 
@@ -217,25 +218,25 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    printf("\n");
 
 	if (Compressed)
-	    BufferSize = part->ExpSize;
+	    BufferSize = le32toh(part->ExpSize);
 	else
-	    BufferSize = part->CSize;
+	    BufferSize = le16toh(part->CSize);
 
 	Buffer = MMapOutputFile(filename, BufferSize);
 	if (!Buffer)
 	    return FALSE;
 
 	if (Compressed)
-	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, part->ROMSize,
+	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, le32toh(part->ROMSize),
 		      Buffer, BufferSize);
 	else
 	    memcpy(Buffer, BIOSImage + (Offset - BIOSOffset) + 0x0C, BufferSize);
 
 	munmap(Buffer, BufferSize);
 
-	if ((part->PrePartHi == 0xFFFF) || (part->PrePartLo == 0xFFFF))
+	if ((le16toh(part->PrePartHi) == 0xFFFF) || (le16toh(part->PrePartLo) == 0xFFFF))
 	    break;
-	Offset = (part->PrePartHi << 4) + part->PrePartLo;
+	Offset = (le16toh(part->PrePartHi) << 4) + le16toh(part->PrePartLo);
     }
 
     return TRUE;

bios_extract--phoenix_and_lh5_endian.diff:
 lh5_extract.c |    9 +++++----
 phoenix.c     |   33 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE bios_extract--phoenix_and_lh5_endian.diff ---
>From 989a6c675212d459619a3a1e1c53dd6040e65867 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:37:56 +0400
Subject: [PATCH] New version of endian patch.

I removed #ifdefs completely, since they already exists in <endian.h>,
so we may simply (and safely) use htole[16,32]/le[16,32]toh. I also fixed
nasty typo in my prevoius patch - I should use le[16,32]to h rather than
htole[16,32]. However this renders to correct results,also, since both of
them are actually just #defines around bswap_[16,32].

Also, I found one phoenix BIOS image and therefore was able to fix extraction
from it on PowerPC. See patch.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/lh5_extract.c b/lh5_extract.c
index 60ecd48..b3e2d98 100644
--- a/lh5_extract.c
+++ b/lh5_extract.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <endian.h>
 
 #include "lh5_extract.h"
 
@@ -129,18 +130,18 @@ LH5HeaderParse(unsigned char *Buffer, int BufferSize,
         return 0;
     }
 
-    *packed_size = *(unsigned int *) (Buffer + 7);
-    *original_size = *(unsigned int *) (Buffer + 11);
+    *packed_size = le32toh(*(unsigned int *) (Buffer + 7));
+    *original_size = le32toh(*(unsigned int *) (Buffer + 11));
 
     name_length = Buffer[21];
     *name = strndup((char *) Buffer + 22, name_length);
 
-    *crc = *(unsigned short *) (Buffer + 22 + name_length);
+    *crc = le16toh(*(unsigned short *) (Buffer + 22 + name_length));
 
     offset = header_size + 2;
     /* Skip extended headers */
     while (1) {
-	unsigned short extend_size = *(unsigned short *) (Buffer + offset - 2);
+	unsigned short extend_size = le16toh(*(unsigned short *) (Buffer + offset - 2));
 
 	if (!extend_size)
 	    break;
diff --git a/phoenix.c b/phoenix.c
index 8ee241c..c2fe10a 100644
--- a/phoenix.c
+++ b/phoenix.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -108,10 +109,10 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
 	return 0;
     }
 
-    if ((Offset + Module->HeadLen + 4 + Module->Packed1) > BIOSLength) {
+    if ((Offset + Module->HeadLen + 4 + le32toh(Module->Packed1)) > BIOSLength) {
 	fprintf(stderr, "Error: Module overruns buffer at 0x%05X\n",
 		Offset);
-	return Module->Previous;
+	return le32toh(Module->Previous);
     }
 
     ModuleName = PhoenixModuleNameGet(Module->Type);
@@ -134,47 +135,47 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
     switch (Module->Compression) {
     case 5: /* LH5 */
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	Buffer = MMapOutputFile(filename, Module->ExpLen1);
+	Buffer = MMapOutputFile(filename, le32toh(Module->ExpLen1));
 	if (!Buffer)
 	    break;
 
 	LH5Decode(BIOSImage + Offset + Module->HeadLen + 4,
-		  Module->Packed1, Buffer, Module->ExpLen1);
+		  le32toh(Module->Packed1), Buffer, le32toh(Module->ExpLen1));
 
-	munmap(Buffer, Module->ExpLen1);
+	munmap(Buffer, le32toh(Module->ExpLen1));
 
 	break;
     /* case 3 */ /* LZSS */
     case 0: /* not compressed at all */
 	/* why do we not use the full header here? */
 	printf("0x%05X (%6d bytes)   ->   %s", Offset + Module->HeadLen,
-	       Module->Packed1, filename);
+	       le32toh(Module->Packed1), filename);
 
-	write(fd, BIOSImage + Offset + Module->HeadLen, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen, le32toh(Module->Packed1));
 	break;
     default:
 	fprintf(stderr, "Unsupported compression type for %s: %d\n",
 		filename, Module->Compression);
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	write(fd, BIOSImage + Offset + Module->HeadLen + 4, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen + 4, le32toh(Module->Packed1));
 	break;
     }
 
     close(fd);
     free(filename);
 
-    if (Module->Offset || Module->Segment) {
+    if (le16toh(Module->Offset) || le16toh(Module->Segment)) {
 	if (!Module->Compression)
 	    printf("\t\t");
-	printf("\t [0x%04X:0x%04X]\n", Module->Segment << 12, Module->Offset);
+	printf("\t [0x%04X:0x%04X]\n", le16toh(Module->Segment) << 12, le16toh(Module->Offset));
     } else
 	printf("\n");
 
-    return Module->Previous;
+    return le32toh(Module->Previous);
 }
 
 /*
@@ -195,11 +196,11 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 
     for (ID = (struct PhoenixID *) (BIOSImage + BCPSegmentOffset + 10);
 	 ((void *) ID < (void *) (BIOSImage + BIOSLength)) && ID->Name[0];
-	 ID = (struct PhoenixID *) (((unsigned char *) ID) + ID->Length)) {
+	 ID = (struct PhoenixID *) (((unsigned char *) ID) + le16toh(ID->Length))) {
 #if 0
 	printf("PhoenixID: Name %c%c%c%c%c%c, Flags 0x%04X, Length %d\n",
 	       ID->Name[0],  ID->Name[1], ID->Name[2],  ID->Name[3],
-	       ID->Name[4],  ID->Name[5], ID->Flags, ID->Length);
+	       ID->Name[4],  ID->Name[5], le16toh(ID->Flags), le16toh(ID->Length));
 #endif
 	if (!strncmp(ID->Name, "BCPSYS", 6))
 	    break;
@@ -224,7 +225,7 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	printf("Version \"%s\", created on %s at %s.\n", Version, Date, Time);
     }
 
-    Offset = *((uint32_t *) (((char *) ID) + 0x77));
+    Offset = le32toh(*((uint32_t *) (((char *) ID) + 0x77)));
     Offset &= (BIOSLength - 1);
     if (!Offset) {
 	fprintf(stderr, "Error: retrieved invalid Modules offset.\n");

bios_extract--recognition_of_more_bios_types.diff:
 bios_extract.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE bios_extract--recognition_of_more_bios_types.diff ---
>From 2fe1f3c5351ce7d757a0dd63607b67cdcbf235b3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 21:08:01 +0400
Subject: [PATCH] Identification of some more BIOS images.

Subj. Actually, I'm sure this is an ugly patch. The proper way will be
the addition of some special search procedures and some commandline
switches to force using of specific extraction routines ( -f ami, -f award).

Anyway, here is a working patch for decoding Asus bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/bios_extract.c b/bios_extract.c
index 7b81c72..104232a 100644
--- a/bios_extract.c
+++ b/bios_extract.c
@@ -89,6 +89,11 @@ static struct {
     {"Award BootBlock", "= Award Decompression Bios =", AwardExtract},
     {"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract},
     {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract},
+    /* custom modified BIOS from Asus - they replace "AMIBOOT " with their own
+     * BIOS ID text */
+    {"ROM", "AMIBIOSC", AMI95Extract},
+    /* some award modules - not sure this is a good solution */
+    {"Award", "Award", AwardExtract},
     {NULL, NULL, NULL},
 };
 


Index: bios_extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/F-10/bios_extract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bios_extract.spec	23 Jul 2009 16:53:30 -0000	1.1
+++ bios_extract.spec	1 Aug 2009 19:10:50 -0000	1.2
@@ -3,13 +3,19 @@
 
 Name:		bios_extract
 Version:	0
-Release:	0.2.%{git_commit_date}git%{?dist}
+Release:	0.4.%{git_commit_date}git%{?dist}
 Summary:	Tools to extract the different submodules of common legacy bioses
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://cgit.freedesktop.org/~libv/bios_extract
 Source0:	http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2
+# fix for extraction of Award and Phoenix bios-images on BigEndian platforms (patch sent upstream)
+Patch0:		bios_extract--ami_endian.diff
+# fix for extraction of AMI bios-images on BigEndian platforms (patch sent upstream)
+Patch1:		bios_extract--phoenix_and_lh5_endian.diff
+# recognized more bios images (ASUS for example) (patch sent upstream)
+Patch2:		bios_extract--recognition_of_more_bios_types.diff
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -19,6 +25,9 @@ Tools to extract the different submodule
 %prep
 %setup -q -n %{name}-%{git_commit}
 sed -i s/^CFLAGS.*$// Makefile
+%patch0 -p1 -b .big_endian
+%patch1 -p1 -b .ami_big_endian
+%patch2 -p1 -b .more_images
 
 
 %build
@@ -42,6 +51,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.4.20090713git
+- Fixed work on BigEndian platforms
+- More bios-types recognized
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090713git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.2.20090713git
 - Small changes, based on Yanko Kaneti's suggestions.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Jul 2009 16:53:30 -0000	1.1
+++ import.log	1 Aug 2009 19:10:50 -0000	1.2
@@ -1 +1,2 @@
 bios_extract-0-0_2_20090713git_fc11:F-10:bios_extract-0-0.2.20090713git.fc11.src.rpm:1248367938
+bios_extract-0-0_4_20090713git_fc11:F-10:bios_extract-0-0.4.20090713git.fc11.src.rpm:1249153822



From peter at fedoraproject.org  Sat Aug  1 19:11:57 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  1 Aug 2009 19:11:57 +0000 (UTC)
Subject: rpms/bios_extract/EL-5 bios_extract--ami_endian.diff, NONE,
	1.1 bios_extract--phoenix_and_lh5_endian.diff, NONE,
	1.1 bios_extract--recognition_of_more_bios_types.diff, NONE,
	1.1 bios_extract.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090801191157.ACEEB11C004A@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	bios_extract.spec import.log 
Added Files:
	bios_extract--ami_endian.diff 
	bios_extract--phoenix_and_lh5_endian.diff 
	bios_extract--recognition_of_more_bios_types.diff 
Log Message:
BigEndian fixes and more bios-types recognized now

bios_extract--ami_endian.diff:
 ami.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE bios_extract--ami_endian.diff ---
>From c07e897df4b1d64307550049d08ebcbbe258e593 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:55:17 +0400
Subject: [PATCH] Fix for endianness in AMI extraction routines.

Subj. Since I finally found AMI bios images among other ~ 2.5 Gbytes
of proprietary bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/ami.c b/ami.c
index 108ef1e..88a00d4 100644
--- a/ami.c
+++ b/ami.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -177,7 +178,7 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
     }
 
     /* now dump the individual modules */
-    Offset = (abc->BeginHi << 4) + abc->BeginLo;
+    Offset = (le16toh(abc->BeginHi) << 4) + le16toh(abc->BeginLo);
 
     for (i = 0; i < 0x80; i++) {
 	char filename[64], *ModuleName;
@@ -198,15 +199,15 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    sprintf(filename, "amibody_%02x.rom", part->PartID);
 
 	if (Compressed)
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, part->ROMSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, le32toh(part->ROMSize));
 	else
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, part->CSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, le16toh(part->CSize));
 
 	printf(" -> %s", filename);
 	if (part->PartID != 0x20)
 	    printf("  ");
 	if (Compressed)
-	    printf(" (%5d bytes)", part->ExpSize);
+	    printf(" (%5d bytes)", le32toh(part->ExpSize));
 	else
 	    printf("\t\t");
 
@@ -217,25 +218,25 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    printf("\n");
 
 	if (Compressed)
-	    BufferSize = part->ExpSize;
+	    BufferSize = le32toh(part->ExpSize);
 	else
-	    BufferSize = part->CSize;
+	    BufferSize = le16toh(part->CSize);
 
 	Buffer = MMapOutputFile(filename, BufferSize);
 	if (!Buffer)
 	    return FALSE;
 
 	if (Compressed)
-	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, part->ROMSize,
+	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, le32toh(part->ROMSize),
 		      Buffer, BufferSize);
 	else
 	    memcpy(Buffer, BIOSImage + (Offset - BIOSOffset) + 0x0C, BufferSize);
 
 	munmap(Buffer, BufferSize);
 
-	if ((part->PrePartHi == 0xFFFF) || (part->PrePartLo == 0xFFFF))
+	if ((le16toh(part->PrePartHi) == 0xFFFF) || (le16toh(part->PrePartLo) == 0xFFFF))
 	    break;
-	Offset = (part->PrePartHi << 4) + part->PrePartLo;
+	Offset = (le16toh(part->PrePartHi) << 4) + le16toh(part->PrePartLo);
     }
 
     return TRUE;

bios_extract--phoenix_and_lh5_endian.diff:
 lh5_extract.c |    9 +++++----
 phoenix.c     |   33 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE bios_extract--phoenix_and_lh5_endian.diff ---
>From 989a6c675212d459619a3a1e1c53dd6040e65867 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:37:56 +0400
Subject: [PATCH] New version of endian patch.

I removed #ifdefs completely, since they already exists in <endian.h>,
so we may simply (and safely) use htole[16,32]/le[16,32]toh. I also fixed
nasty typo in my prevoius patch - I should use le[16,32]to h rather than
htole[16,32]. However this renders to correct results,also, since both of
them are actually just #defines around bswap_[16,32].

Also, I found one phoenix BIOS image and therefore was able to fix extraction
from it on PowerPC. See patch.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/lh5_extract.c b/lh5_extract.c
index 60ecd48..b3e2d98 100644
--- a/lh5_extract.c
+++ b/lh5_extract.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <endian.h>
 
 #include "lh5_extract.h"
 
@@ -129,18 +130,18 @@ LH5HeaderParse(unsigned char *Buffer, int BufferSize,
         return 0;
     }
 
-    *packed_size = *(unsigned int *) (Buffer + 7);
-    *original_size = *(unsigned int *) (Buffer + 11);
+    *packed_size = le32toh(*(unsigned int *) (Buffer + 7));
+    *original_size = le32toh(*(unsigned int *) (Buffer + 11));
 
     name_length = Buffer[21];
     *name = strndup((char *) Buffer + 22, name_length);
 
-    *crc = *(unsigned short *) (Buffer + 22 + name_length);
+    *crc = le16toh(*(unsigned short *) (Buffer + 22 + name_length));
 
     offset = header_size + 2;
     /* Skip extended headers */
     while (1) {
-	unsigned short extend_size = *(unsigned short *) (Buffer + offset - 2);
+	unsigned short extend_size = le16toh(*(unsigned short *) (Buffer + offset - 2));
 
 	if (!extend_size)
 	    break;
diff --git a/phoenix.c b/phoenix.c
index 8ee241c..c2fe10a 100644
--- a/phoenix.c
+++ b/phoenix.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -108,10 +109,10 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
 	return 0;
     }
 
-    if ((Offset + Module->HeadLen + 4 + Module->Packed1) > BIOSLength) {
+    if ((Offset + Module->HeadLen + 4 + le32toh(Module->Packed1)) > BIOSLength) {
 	fprintf(stderr, "Error: Module overruns buffer at 0x%05X\n",
 		Offset);
-	return Module->Previous;
+	return le32toh(Module->Previous);
     }
 
     ModuleName = PhoenixModuleNameGet(Module->Type);
@@ -134,47 +135,47 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
     switch (Module->Compression) {
     case 5: /* LH5 */
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	Buffer = MMapOutputFile(filename, Module->ExpLen1);
+	Buffer = MMapOutputFile(filename, le32toh(Module->ExpLen1));
 	if (!Buffer)
 	    break;
 
 	LH5Decode(BIOSImage + Offset + Module->HeadLen + 4,
-		  Module->Packed1, Buffer, Module->ExpLen1);
+		  le32toh(Module->Packed1), Buffer, le32toh(Module->ExpLen1));
 
-	munmap(Buffer, Module->ExpLen1);
+	munmap(Buffer, le32toh(Module->ExpLen1));
 
 	break;
     /* case 3 */ /* LZSS */
     case 0: /* not compressed at all */
 	/* why do we not use the full header here? */
 	printf("0x%05X (%6d bytes)   ->   %s", Offset + Module->HeadLen,
-	       Module->Packed1, filename);
+	       le32toh(Module->Packed1), filename);
 
-	write(fd, BIOSImage + Offset + Module->HeadLen, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen, le32toh(Module->Packed1));
 	break;
     default:
 	fprintf(stderr, "Unsupported compression type for %s: %d\n",
 		filename, Module->Compression);
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	write(fd, BIOSImage + Offset + Module->HeadLen + 4, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen + 4, le32toh(Module->Packed1));
 	break;
     }
 
     close(fd);
     free(filename);
 
-    if (Module->Offset || Module->Segment) {
+    if (le16toh(Module->Offset) || le16toh(Module->Segment)) {
 	if (!Module->Compression)
 	    printf("\t\t");
-	printf("\t [0x%04X:0x%04X]\n", Module->Segment << 12, Module->Offset);
+	printf("\t [0x%04X:0x%04X]\n", le16toh(Module->Segment) << 12, le16toh(Module->Offset));
     } else
 	printf("\n");
 
-    return Module->Previous;
+    return le32toh(Module->Previous);
 }
 
 /*
@@ -195,11 +196,11 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 
     for (ID = (struct PhoenixID *) (BIOSImage + BCPSegmentOffset + 10);
 	 ((void *) ID < (void *) (BIOSImage + BIOSLength)) && ID->Name[0];
-	 ID = (struct PhoenixID *) (((unsigned char *) ID) + ID->Length)) {
+	 ID = (struct PhoenixID *) (((unsigned char *) ID) + le16toh(ID->Length))) {
 #if 0
 	printf("PhoenixID: Name %c%c%c%c%c%c, Flags 0x%04X, Length %d\n",
 	       ID->Name[0],  ID->Name[1], ID->Name[2],  ID->Name[3],
-	       ID->Name[4],  ID->Name[5], ID->Flags, ID->Length);
+	       ID->Name[4],  ID->Name[5], le16toh(ID->Flags), le16toh(ID->Length));
 #endif
 	if (!strncmp(ID->Name, "BCPSYS", 6))
 	    break;
@@ -224,7 +225,7 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	printf("Version \"%s\", created on %s at %s.\n", Version, Date, Time);
     }
 
-    Offset = *((uint32_t *) (((char *) ID) + 0x77));
+    Offset = le32toh(*((uint32_t *) (((char *) ID) + 0x77)));
     Offset &= (BIOSLength - 1);
     if (!Offset) {
 	fprintf(stderr, "Error: retrieved invalid Modules offset.\n");

bios_extract--recognition_of_more_bios_types.diff:
 bios_extract.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE bios_extract--recognition_of_more_bios_types.diff ---
>From 2fe1f3c5351ce7d757a0dd63607b67cdcbf235b3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 21:08:01 +0400
Subject: [PATCH] Identification of some more BIOS images.

Subj. Actually, I'm sure this is an ugly patch. The proper way will be
the addition of some special search procedures and some commandline
switches to force using of specific extraction routines ( -f ami, -f award).

Anyway, here is a working patch for decoding Asus bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/bios_extract.c b/bios_extract.c
index 7b81c72..104232a 100644
--- a/bios_extract.c
+++ b/bios_extract.c
@@ -89,6 +89,11 @@ static struct {
     {"Award BootBlock", "= Award Decompression Bios =", AwardExtract},
     {"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract},
     {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract},
+    /* custom modified BIOS from Asus - they replace "AMIBOOT " with their own
+     * BIOS ID text */
+    {"ROM", "AMIBIOSC", AMI95Extract},
+    /* some award modules - not sure this is a good solution */
+    {"Award", "Award", AwardExtract},
     {NULL, NULL, NULL},
 };
 


Index: bios_extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/EL-5/bios_extract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bios_extract.spec	23 Jul 2009 17:02:03 -0000	1.1
+++ bios_extract.spec	1 Aug 2009 19:11:57 -0000	1.2
@@ -3,13 +3,19 @@
 
 Name:		bios_extract
 Version:	0
-Release:	0.2.%{git_commit_date}git%{?dist}
+Release:	0.4.%{git_commit_date}git%{?dist}
 Summary:	Tools to extract the different submodules of common legacy bioses
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://cgit.freedesktop.org/~libv/bios_extract
 Source0:	http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2
+# fix for extraction of Award and Phoenix bios-images on BigEndian platforms (patch sent upstream)
+Patch0:		bios_extract--ami_endian.diff
+# fix for extraction of AMI bios-images on BigEndian platforms (patch sent upstream)
+Patch1:		bios_extract--phoenix_and_lh5_endian.diff
+# recognized more bios images (ASUS for example) (patch sent upstream)
+Patch2:		bios_extract--recognition_of_more_bios_types.diff
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -19,6 +25,9 @@ Tools to extract the different submodule
 %prep
 %setup -q -n %{name}-%{git_commit}
 sed -i s/^CFLAGS.*$// Makefile
+%patch0 -p1 -b .big_endian
+%patch1 -p1 -b .ami_big_endian
+%patch2 -p1 -b .more_images
 
 
 %build
@@ -42,6 +51,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.4.20090713git
+- Fixed work on BigEndian platforms
+- More bios-types recognized
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090713git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.2.20090713git
 - Small changes, based on Yanko Kaneti's suggestions.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Jul 2009 17:02:04 -0000	1.1
+++ import.log	1 Aug 2009 19:11:57 -0000	1.2
@@ -1 +1,2 @@
 bios_extract-0-0_2_20090713git_fc11:EL-5:bios_extract-0-0.2.20090713git.fc11.src.rpm:1248368427
+bios_extract-0-0_4_20090713git_fc11:EL-5:bios_extract-0-0.4.20090713git.fc11.src.rpm:1249153895



From peter at fedoraproject.org  Sat Aug  1 19:13:03 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat,  1 Aug 2009 19:13:03 +0000 (UTC)
Subject: rpms/bios_extract/EL-4 bios_extract--ami_endian.diff, NONE,
	1.1 bios_extract--phoenix_and_lh5_endian.diff, NONE,
	1.1 bios_extract--recognition_of_more_bios_types.diff, NONE,
	1.1 bios_extract.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090801191303.738F211C004A@cvs1.fedora.phx.redhat.com>

Author: peter

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

Modified Files:
	bios_extract.spec import.log 
Added Files:
	bios_extract--ami_endian.diff 
	bios_extract--phoenix_and_lh5_endian.diff 
	bios_extract--recognition_of_more_bios_types.diff 
Log Message:
BigEndian fixes and more bios-types recognized now

bios_extract--ami_endian.diff:
 ami.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE bios_extract--ami_endian.diff ---
>From c07e897df4b1d64307550049d08ebcbbe258e593 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:55:17 +0400
Subject: [PATCH] Fix for endianness in AMI extraction routines.

Subj. Since I finally found AMI bios images among other ~ 2.5 Gbytes
of proprietary bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/ami.c b/ami.c
index 108ef1e..88a00d4 100644
--- a/ami.c
+++ b/ami.c
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -177,7 +178,7 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
     }
 
     /* now dump the individual modules */
-    Offset = (abc->BeginHi << 4) + abc->BeginLo;
+    Offset = (le16toh(abc->BeginHi) << 4) + le16toh(abc->BeginLo);
 
     for (i = 0; i < 0x80; i++) {
 	char filename[64], *ModuleName;
@@ -198,15 +199,15 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    sprintf(filename, "amibody_%02x.rom", part->PartID);
 
 	if (Compressed)
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, part->ROMSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x14, le32toh(part->ROMSize));
 	else
-	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, part->CSize);
+	    printf("0x%05X (%6d bytes)", Offset - BIOSOffset + 0x0C, le16toh(part->CSize));
 
 	printf(" -> %s", filename);
 	if (part->PartID != 0x20)
 	    printf("  ");
 	if (Compressed)
-	    printf(" (%5d bytes)", part->ExpSize);
+	    printf(" (%5d bytes)", le32toh(part->ExpSize));
 	else
 	    printf("\t\t");
 
@@ -217,25 +218,25 @@ AMI95Extract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	    printf("\n");
 
 	if (Compressed)
-	    BufferSize = part->ExpSize;
+	    BufferSize = le32toh(part->ExpSize);
 	else
-	    BufferSize = part->CSize;
+	    BufferSize = le16toh(part->CSize);
 
 	Buffer = MMapOutputFile(filename, BufferSize);
 	if (!Buffer)
 	    return FALSE;
 
 	if (Compressed)
-	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, part->ROMSize,
+	    LH5Decode(BIOSImage + (Offset - BIOSOffset) + 0x14, le32toh(part->ROMSize),
 		      Buffer, BufferSize);
 	else
 	    memcpy(Buffer, BIOSImage + (Offset - BIOSOffset) + 0x0C, BufferSize);
 
 	munmap(Buffer, BufferSize);
 
-	if ((part->PrePartHi == 0xFFFF) || (part->PrePartLo == 0xFFFF))
+	if ((le16toh(part->PrePartHi) == 0xFFFF) || (le16toh(part->PrePartLo) == 0xFFFF))
 	    break;
-	Offset = (part->PrePartHi << 4) + part->PrePartLo;
+	Offset = (le16toh(part->PrePartHi) << 4) + le16toh(part->PrePartLo);
     }
 
     return TRUE;

bios_extract--phoenix_and_lh5_endian.diff:
 lh5_extract.c |    9 +++++----
 phoenix.c     |   33 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE bios_extract--phoenix_and_lh5_endian.diff ---
>From 989a6c675212d459619a3a1e1c53dd6040e65867 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 20:37:56 +0400
Subject: [PATCH] New version of endian patch.

I removed #ifdefs completely, since they already exists in <endian.h>,
so we may simply (and safely) use htole[16,32]/le[16,32]toh. I also fixed
nasty typo in my prevoius patch - I should use le[16,32]to h rather than
htole[16,32]. However this renders to correct results,also, since both of
them are actually just #defines around bswap_[16,32].

Also, I found one phoenix BIOS image and therefore was able to fix extraction
from it on PowerPC. See patch.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/lh5_extract.c b/lh5_extract.c
index 60ecd48..b3e2d98 100644
--- a/lh5_extract.c
+++ b/lh5_extract.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <endian.h>
 
 #include "lh5_extract.h"
 
@@ -129,18 +130,18 @@ LH5HeaderParse(unsigned char *Buffer, int BufferSize,
         return 0;
     }
 
-    *packed_size = *(unsigned int *) (Buffer + 7);
-    *original_size = *(unsigned int *) (Buffer + 11);
+    *packed_size = le32toh(*(unsigned int *) (Buffer + 7));
+    *original_size = le32toh(*(unsigned int *) (Buffer + 11));
 
     name_length = Buffer[21];
     *name = strndup((char *) Buffer + 22, name_length);
 
-    *crc = *(unsigned short *) (Buffer + 22 + name_length);
+    *crc = le16toh(*(unsigned short *) (Buffer + 22 + name_length));
 
     offset = header_size + 2;
     /* Skip extended headers */
     while (1) {
-	unsigned short extend_size = *(unsigned short *) (Buffer + offset - 2);
+	unsigned short extend_size = le16toh(*(unsigned short *) (Buffer + offset - 2));
 
 	if (!extend_size)
 	    break;
diff --git a/phoenix.c b/phoenix.c
index 8ee241c..c2fe10a 100644
--- a/phoenix.c
+++ b/phoenix.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <endian.h>
 
 #include "bios_extract.h"
 #include "lh5_extract.h"
@@ -108,10 +109,10 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
 	return 0;
     }
 
-    if ((Offset + Module->HeadLen + 4 + Module->Packed1) > BIOSLength) {
+    if ((Offset + Module->HeadLen + 4 + le32toh(Module->Packed1)) > BIOSLength) {
 	fprintf(stderr, "Error: Module overruns buffer at 0x%05X\n",
 		Offset);
-	return Module->Previous;
+	return le32toh(Module->Previous);
     }
 
     ModuleName = PhoenixModuleNameGet(Module->Type);
@@ -134,47 +135,47 @@ PhoenixModule(unsigned char *BIOSImage, int BIOSLength, int Offset)
     switch (Module->Compression) {
     case 5: /* LH5 */
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	Buffer = MMapOutputFile(filename, Module->ExpLen1);
+	Buffer = MMapOutputFile(filename, le32toh(Module->ExpLen1));
 	if (!Buffer)
 	    break;
 
 	LH5Decode(BIOSImage + Offset + Module->HeadLen + 4,
-		  Module->Packed1, Buffer, Module->ExpLen1);
+		  le32toh(Module->Packed1), Buffer, le32toh(Module->ExpLen1));
 
-	munmap(Buffer, Module->ExpLen1);
+	munmap(Buffer, le32toh(Module->ExpLen1));
 
 	break;
     /* case 3 */ /* LZSS */
     case 0: /* not compressed at all */
 	/* why do we not use the full header here? */
 	printf("0x%05X (%6d bytes)   ->   %s", Offset + Module->HeadLen,
-	       Module->Packed1, filename);
+	       le32toh(Module->Packed1), filename);
 
-	write(fd, BIOSImage + Offset + Module->HeadLen, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen, le32toh(Module->Packed1));
 	break;
     default:
 	fprintf(stderr, "Unsupported compression type for %s: %d\n",
 		filename, Module->Compression);
 	printf("0x%05X (%6d bytes)   ->   %s\t(%d bytes)", Offset + Module->HeadLen + 4,
-	       Module->Packed1, filename, Module->ExpLen1);
+	       le32toh(Module->Packed1), filename, le32toh(Module->ExpLen1));
 
-	write(fd, BIOSImage + Offset + Module->HeadLen + 4, Module->Packed1);
+	write(fd, BIOSImage + Offset + Module->HeadLen + 4, le32toh(Module->Packed1));
 	break;
     }
 
     close(fd);
     free(filename);
 
-    if (Module->Offset || Module->Segment) {
+    if (le16toh(Module->Offset) || le16toh(Module->Segment)) {
 	if (!Module->Compression)
 	    printf("\t\t");
-	printf("\t [0x%04X:0x%04X]\n", Module->Segment << 12, Module->Offset);
+	printf("\t [0x%04X:0x%04X]\n", le16toh(Module->Segment) << 12, le16toh(Module->Offset));
     } else
 	printf("\n");
 
-    return Module->Previous;
+    return le32toh(Module->Previous);
 }
 
 /*
@@ -195,11 +196,11 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 
     for (ID = (struct PhoenixID *) (BIOSImage + BCPSegmentOffset + 10);
 	 ((void *) ID < (void *) (BIOSImage + BIOSLength)) && ID->Name[0];
-	 ID = (struct PhoenixID *) (((unsigned char *) ID) + ID->Length)) {
+	 ID = (struct PhoenixID *) (((unsigned char *) ID) + le16toh(ID->Length))) {
 #if 0
 	printf("PhoenixID: Name %c%c%c%c%c%c, Flags 0x%04X, Length %d\n",
 	       ID->Name[0],  ID->Name[1], ID->Name[2],  ID->Name[3],
-	       ID->Name[4],  ID->Name[5], ID->Flags, ID->Length);
+	       ID->Name[4],  ID->Name[5], le16toh(ID->Flags), le16toh(ID->Length));
 #endif
 	if (!strncmp(ID->Name, "BCPSYS", 6))
 	    break;
@@ -224,7 +225,7 @@ PhoenixExtract(unsigned char *BIOSImage, int BIOSLength, int BIOSOffset,
 	printf("Version \"%s\", created on %s at %s.\n", Version, Date, Time);
     }
 
-    Offset = *((uint32_t *) (((char *) ID) + 0x77));
+    Offset = le32toh(*((uint32_t *) (((char *) ID) + 0x77)));
     Offset &= (BIOSLength - 1);
     if (!Offset) {
 	fprintf(stderr, "Error: retrieved invalid Modules offset.\n");

bios_extract--recognition_of_more_bios_types.diff:
 bios_extract.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE bios_extract--recognition_of_more_bios_types.diff ---
>From 2fe1f3c5351ce7d757a0dd63607b67cdcbf235b3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 1 Aug 2009 21:08:01 +0400
Subject: [PATCH] Identification of some more BIOS images.

Subj. Actually, I'm sure this is an ugly patch. The proper way will be
the addition of some special search procedures and some commandline
switches to force using of specific extraction routines ( -f ami, -f award).

Anyway, here is a working patch for decoding Asus bioses.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

diff --git a/bios_extract.c b/bios_extract.c
index 7b81c72..104232a 100644
--- a/bios_extract.c
+++ b/bios_extract.c
@@ -89,6 +89,11 @@ static struct {
     {"Award BootBlock", "= Award Decompression Bios =", AwardExtract},
     {"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract},
     {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract},
+    /* custom modified BIOS from Asus - they replace "AMIBOOT " with their own
+     * BIOS ID text */
+    {"ROM", "AMIBIOSC", AMI95Extract},
+    /* some award modules - not sure this is a good solution */
+    {"Award", "Award", AwardExtract},
     {NULL, NULL, NULL},
 };
 


Index: bios_extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/EL-4/bios_extract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bios_extract.spec	23 Jul 2009 17:03:35 -0000	1.1
+++ bios_extract.spec	1 Aug 2009 19:13:03 -0000	1.2
@@ -3,13 +3,19 @@
 
 Name:		bios_extract
 Version:	0
-Release:	0.2.%{git_commit_date}git%{?dist}
+Release:	0.4.%{git_commit_date}git%{?dist}
 Summary:	Tools to extract the different submodules of common legacy bioses
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://cgit.freedesktop.org/~libv/bios_extract
 Source0:	http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2
+# fix for extraction of Award and Phoenix bios-images on BigEndian platforms (patch sent upstream)
+Patch0:		bios_extract--ami_endian.diff
+# fix for extraction of AMI bios-images on BigEndian platforms (patch sent upstream)
+Patch1:		bios_extract--phoenix_and_lh5_endian.diff
+# recognized more bios images (ASUS for example) (patch sent upstream)
+Patch2:		bios_extract--recognition_of_more_bios_types.diff
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -19,6 +25,9 @@ Tools to extract the different submodule
 %prep
 %setup -q -n %{name}-%{git_commit}
 sed -i s/^CFLAGS.*$// Makefile
+%patch0 -p1 -b .big_endian
+%patch1 -p1 -b .ami_big_endian
+%patch2 -p1 -b .more_images
 
 
 %build
@@ -42,6 +51,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  1 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.4.20090713git
+- Fixed work on BigEndian platforms
+- More bios-types recognized
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090713git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.2.20090713git
 - Small changes, based on Yanko Kaneti's suggestions.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Jul 2009 17:03:35 -0000	1.1
+++ import.log	1 Aug 2009 19:13:03 -0000	1.2
@@ -1 +1,2 @@
 bios_extract-0-0_2_20090713git_fc11:EL-4:bios_extract-0-0.2.20090713git.fc11.src.rpm:1248368568
+bios_extract-0-0_4_20090713git_fc11:EL-4:bios_extract-0-0.4.20090713git.fc11.src.rpm:1249153958



From pkgdb at fedoraproject.org  Sat Aug  1 20:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:04:28 +0000
Subject: [pkgdb] ripmime was added for itamarjp
Message-ID: <20090801200428.D185310F87E@bastion2.fedora.phx.redhat.com>

tibbs has added Package ripmime with summary Extract attachments out of a MIME encoded email packages
tibbs has approved Package ripmime
tibbs has added a Fedora devel branch for ripmime with an owner of itamarjp
tibbs has approved ripmime in Fedora devel
tibbs has approved Package ripmime
tibbs has set commit to Approved for 107427 on ripmime (Fedora devel)
tibbs has set checkout to Approved for 107427 on ripmime (Fedora devel)
tibbs has set build to Approved for 107427 on ripmime (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Aug  1 20:04:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:04:30 +0000
Subject: [pkgdb] ripmime summary updated by tibbs
Message-ID: <20090801200430.3FFF710F89A@bastion2.fedora.phx.redhat.com>

tibbs set package ripmime summary to Extract attachments out of a MIME encoded email packages

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



From pkgdb at fedoraproject.org  Sat Aug  1 20:04:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:04:30 +0000
Subject: [pkgdb] ripmime (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801200430.54EA210F89D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ripmime
tibbs has set commit to Approved for 107427 on ripmime (Fedora 11)
tibbs has set checkout to Approved for 107427 on ripmime (Fedora 11)
tibbs has set build to Approved for 107427 on ripmime (Fedora 11)

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



From pkgdb at fedoraproject.org  Sat Aug  1 20:04:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:04:30 +0000
Subject: [pkgdb] ripmime (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801200430.6117310F8A1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for ripmime
tibbs has set commit to Approved for 107427 on ripmime (Fedora 10)
tibbs has set checkout to Approved for 107427 on ripmime (Fedora 10)
tibbs has set build to Approved for 107427 on ripmime (Fedora 10)

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



From pkgdb at fedoraproject.org  Sat Aug  1 20:04:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:04:30 +0000
Subject: [pkgdb] ripmime (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801200430.6845C10F8B5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for ripmime
tibbs has set commit to Approved for 107427 on ripmime (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on ripmime (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on ripmime (Fedora EPEL 5)

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



From tibbs at fedoraproject.org  Sat Aug  1 20:04:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:04:38 +0000 (UTC)
Subject: rpms/ripmime - New directory
Message-ID: <20090801200438.1565711C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ripmime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvss30304/rpms/ripmime

Log Message:
Directory /cvs/pkgs/rpms/ripmime added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 20:04:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:04:38 +0000 (UTC)
Subject: rpms/ripmime/devel - New directory
Message-ID: <20090801200438.39E8911C043B@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ripmime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvss30304/rpms/ripmime/devel

Log Message:
Directory /cvs/pkgs/rpms/ripmime/devel added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 20:04:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:04:46 +0000 (UTC)
Subject: rpms/ripmime Makefile,NONE,1.1
Message-ID: <20090801200446.2364911C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ripmime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvss30304/rpms/ripmime

Added Files:
	Makefile 
Log Message:
Setup of module ripmime


--- NEW FILE Makefile ---
# Top level Makefile for module ripmime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Sat Aug  1 20:04:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:04:46 +0000 (UTC)
Subject: rpms/ripmime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090801200446.8540611C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ripmime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvss30304/rpms/ripmime/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ripmime
# $Id: Makefile,v 1.1 2009/08/01 20:04:46 tibbs Exp $
NAME := ripmime
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pingou at fedoraproject.org  Sat Aug  1 20:14:31 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 20:14:31 +0000 (UTC)
Subject: rpms/R-AnnotationDbi/devel R-AnnotationDbi.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801201431.A3DDB11C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-AnnotationDbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2251/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R-AnnotationDbi.spec import.log 
Log Message:
Original import



--- NEW FILE R-AnnotationDbi.spec ---
%global packname  AnnotationDbi
%global Rvers     2.9.0
%global bioc      2.4

Name:             R-%{packname}
Version:          1.6.1
Release:          1%{?dist}
Summary:          Annotation Database Interface

Group:            Applications/Engineering 
License:          Artistic 2.0 
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

# The suggested requirement are not added here based on:
# - the amount
# - they are mostly database (content)
# - circular dependancies (such as with hgu95av2)
Requires:         R >= %{Rvers} R-methods R-utils 
Requires:         R-Biobase R-DBI R-RSQLite
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods 
BuildRequires:    R-utils R-Biobase R-DBI R-RSQLite 

%description
Provides user interface and database connection code  for annotation 
data packages using SQLite data storage.

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

# noarch -> Architecture independent package
mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)

rm -rf %{buildroot}%{_datadir}/R/library/R.css

rm -f %{buildroot}%{_datadir}/R/library/AnnotationDbi/ProbePkg-template/data/.dummy.txt

%check
# Not performed, the list of metadata asked is too long and not mandatory
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%dir %{_datadir}/R/library/%{packname}
%doc %{_datadir}/R/library/%{packname}/latex
%doc %{_datadir}/R/library/%{packname}/doc
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/man
%doc %{_datadir}/R/library/%{packname}/NEWS
%doc %{_datadir}/R/library/%{packname}/TODO
%{_datadir}/R/library/%{packname}/CONTENTS
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/R-ex
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/AnnDbPkg-templates
%{_datadir}/R/library/%{packname}/ProbePkg-template
%{_datadir}/R/library/%{packname}/DBschemas
%{_datadir}/R/library/%{packname}/extdata
%{_datadir}/R/library/%{packname}/NOTES-Herve


%changelog
* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.6.1-1
- Update to 1.6.1

* Wed May 06 2009 pingou <pingou at pingoured.fr> 1.6.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-AnnotationDbi-1_6_1-1_fc11:HEAD:R-AnnotationDbi-1.6.1-1.fc11.src.rpm:1249157572


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-AnnotationDbi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 18:51:34 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:14:31 -0000	1.2
@@ -0,0 +1 @@
+AnnotationDbi_1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-AnnotationDbi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 18:51:34 -0000	1.1
+++ sources	1 Aug 2009 20:14:31 -0000	1.2
@@ -0,0 +1 @@
+70ab01fdb06dbe8e1eeac5b246990eb6  AnnotationDbi_1.6.1.tar.gz



From pingou at fedoraproject.org  Sat Aug  1 20:15:49 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 20:15:49 +0000 (UTC)
Subject: rpms/R-AnnotationDbi/F-11 R-AnnotationDbi.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801201549.48EB011C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-AnnotationDbi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2794/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	R-AnnotationDbi.spec import.log 
Log Message:
Original import



--- NEW FILE R-AnnotationDbi.spec ---
%global packname  AnnotationDbi
%global Rvers     2.9.0
%global bioc      2.4

Name:             R-%{packname}
Version:          1.6.1
Release:          1%{?dist}
Summary:          Annotation Database Interface

Group:            Applications/Engineering 
License:          Artistic 2.0 
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

# The suggested requirement are not added here based on:
# - the amount
# - they are mostly database (content)
# - circular dependancies (such as with hgu95av2)
Requires:         R >= %{Rvers} R-methods R-utils 
Requires:         R-Biobase R-DBI R-RSQLite
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods 
BuildRequires:    R-utils R-Biobase R-DBI R-RSQLite 

%description
Provides user interface and database connection code  for annotation 
data packages using SQLite data storage.

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

# noarch -> Architecture independent package
mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)

rm -rf %{buildroot}%{_datadir}/R/library/R.css

rm -f %{buildroot}%{_datadir}/R/library/AnnotationDbi/ProbePkg-template/data/.dummy.txt

%check
# Not performed, the list of metadata asked is too long and not mandatory
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%dir %{_datadir}/R/library/%{packname}
%doc %{_datadir}/R/library/%{packname}/latex
%doc %{_datadir}/R/library/%{packname}/doc
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/man
%doc %{_datadir}/R/library/%{packname}/NEWS
%doc %{_datadir}/R/library/%{packname}/TODO
%{_datadir}/R/library/%{packname}/CONTENTS
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/R-ex
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/AnnDbPkg-templates
%{_datadir}/R/library/%{packname}/ProbePkg-template
%{_datadir}/R/library/%{packname}/DBschemas
%{_datadir}/R/library/%{packname}/extdata
%{_datadir}/R/library/%{packname}/NOTES-Herve


%changelog
* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.6.1-1
- Update to 1.6.1

* Wed May 06 2009 pingou <pingou at pingoured.fr> 1.6.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-AnnotationDbi-1_6_1-1_fc11:F-11:R-AnnotationDbi-1.6.1-1.fc11.src.rpm:1249157661


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-AnnotationDbi/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 18:51:34 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:15:49 -0000	1.2
@@ -0,0 +1 @@
+AnnotationDbi_1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-AnnotationDbi/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 18:51:34 -0000	1.1
+++ sources	1 Aug 2009 20:15:49 -0000	1.2
@@ -0,0 +1 @@
+70ab01fdb06dbe8e1eeac5b246990eb6  AnnotationDbi_1.6.1.tar.gz



From pingou at fedoraproject.org  Sat Aug  1 20:16:46 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 20:16:46 +0000 (UTC)
Subject: rpms/R-AnnotationDbi/F-10 R-AnnotationDbi.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801201646.6721811C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-AnnotationDbi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3381/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	R-AnnotationDbi.spec import.log 
Log Message:
Original import



--- NEW FILE R-AnnotationDbi.spec ---
%global packname  AnnotationDbi
%global Rvers     2.9.0
%global bioc      2.4

Name:             R-%{packname}
Version:          1.6.1
Release:          1%{?dist}
Summary:          Annotation Database Interface

Group:            Applications/Engineering 
License:          Artistic 2.0 
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:        noarch

# The suggested requirement are not added here based on:
# - the amount
# - they are mostly database (content)
# - circular dependancies (such as with hgu95av2)
Requires:         R >= %{Rvers} R-methods R-utils 
Requires:         R-Biobase R-DBI R-RSQLite
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R >= %{Rvers} R-methods 
BuildRequires:    R-utils R-Biobase R-DBI R-RSQLite 

%description
Provides user interface and database connection code  for annotation 
data packages using SQLite data storage.

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

# noarch -> Architecture independent package
mkdir -p %{buildroot}%{_datadir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)

rm -rf %{buildroot}%{_datadir}/R/library/R.css

rm -f %{buildroot}%{_datadir}/R/library/AnnotationDbi/ProbePkg-template/data/.dummy.txt

%check
# Not performed, the list of metadata asked is too long and not mandatory
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
%dir %{_datadir}/R/library/%{packname}
%doc %{_datadir}/R/library/%{packname}/latex
%doc %{_datadir}/R/library/%{packname}/doc
%doc %{_datadir}/R/library/%{packname}/html
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/man
%doc %{_datadir}/R/library/%{packname}/NEWS
%doc %{_datadir}/R/library/%{packname}/TODO
%{_datadir}/R/library/%{packname}/CONTENTS
%{_datadir}/R/library/%{packname}/INDEX
%{_datadir}/R/library/%{packname}/NAMESPACE
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/R
%{_datadir}/R/library/%{packname}/R-ex
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/AnnDbPkg-templates
%{_datadir}/R/library/%{packname}/ProbePkg-template
%{_datadir}/R/library/%{packname}/DBschemas
%{_datadir}/R/library/%{packname}/extdata
%{_datadir}/R/library/%{packname}/NOTES-Herve


%changelog
* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.6.1-1
- Update to 1.6.1

* Wed May 06 2009 pingou <pingou at pingoured.fr> 1.6.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-AnnotationDbi-1_6_1-1_fc11:F-10:R-AnnotationDbi-1.6.1-1.fc11.src.rpm:1249157727


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-AnnotationDbi/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 18:51:34 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:16:46 -0000	1.2
@@ -0,0 +1 @@
+AnnotationDbi_1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-AnnotationDbi/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 18:51:34 -0000	1.1
+++ sources	1 Aug 2009 20:16:46 -0000	1.2
@@ -0,0 +1 @@
+70ab01fdb06dbe8e1eeac5b246990eb6  AnnotationDbi_1.6.1.tar.gz



From itamarjp at fedoraproject.org  Sat Aug  1 20:19:13 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat,  1 Aug 2009 20:19:13 +0000 (UTC)
Subject: rpms/ripmime/devel import.log, NONE, 1.1 ripmime.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801201913.F184911C004A@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ripmime.spec 
Log Message:
initial rpm version



--- NEW FILE import.log ---
ripmime-1_4_0_9-2_fc10:HEAD:ripmime-1.4.0.9-2.fc10.src.rpm:1249157794


--- NEW FILE ripmime.spec ---
Name:           ripmime
Version:        1.4.0.9
Release:        2%{?dist}
Summary:        Extract attachments out of a MIME encoded email packages

Group:          Applications/Internet
License:        BSD
URL:            http://www.pldaniels.com/ripmime/
Source0:        http://www.pldaniels.com/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
ripMIME extract attachments out of a MIME encoded email packages.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 0755 $RPM_BUILD_DIR/%{name}-%{version}/%{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 0644 $RPM_BUILD_DIR/%{name}-%{version}/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_mandir}/man1/*
%doc CHANGELOG CONTRIBUTORS INSTALL LICENSE TODO README

%changelog

* Fri Jan 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-2
- Include CFLAGS in build process

* Fri Dec 26 2008 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:04:46 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:19:13 -0000	1.2
@@ -0,0 +1 @@
+ripmime-1.4.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:04:46 -0000	1.1
+++ sources	1 Aug 2009 20:19:13 -0000	1.2
@@ -0,0 +1 @@
+25761b8a533bc935f75902724fb73244  ripmime-1.4.0.9.tar.gz



From itamarjp at fedoraproject.org  Sat Aug  1 20:22:09 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat,  1 Aug 2009 20:22:09 +0000 (UTC)
Subject: rpms/ripmime/F-11 import.log, NONE, 1.1 ripmime.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801202210.059EE11C004A@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ripmime.spec 
Log Message:
initial rpm version



--- NEW FILE import.log ---
ripmime-1_4_0_9-2_fc10:F-11:ripmime-1.4.0.9-2.fc10.src.rpm:1249158059


--- NEW FILE ripmime.spec ---
Name:           ripmime
Version:        1.4.0.9
Release:        2%{?dist}
Summary:        Extract attachments out of a MIME encoded email packages

Group:          Applications/Internet
License:        BSD
URL:            http://www.pldaniels.com/ripmime/
Source0:        http://www.pldaniels.com/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
ripMIME extract attachments out of a MIME encoded email packages.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 0755 $RPM_BUILD_DIR/%{name}-%{version}/%{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 0644 $RPM_BUILD_DIR/%{name}-%{version}/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_mandir}/man1/*
%doc CHANGELOG CONTRIBUTORS INSTALL LICENSE TODO README

%changelog

* Fri Jan 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-2
- Include CFLAGS in build process

* Fri Dec 26 2008 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:04:46 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:22:09 -0000	1.2
@@ -0,0 +1 @@
+ripmime-1.4.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:04:46 -0000	1.1
+++ sources	1 Aug 2009 20:22:09 -0000	1.2
@@ -0,0 +1 @@
+25761b8a533bc935f75902724fb73244  ripmime-1.4.0.9.tar.gz



From itamarjp at fedoraproject.org  Sat Aug  1 20:26:49 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat,  1 Aug 2009 20:26:49 +0000 (UTC)
Subject: rpms/ripmime/F-10 import.log, NONE, 1.1 ripmime.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801202649.3596911C004A@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ripmime.spec 
Log Message:
initial rpm version



--- NEW FILE import.log ---
ripmime-1_4_0_9-2_fc10:F-10:ripmime-1.4.0.9-2.fc10.src.rpm:1249158291


--- NEW FILE ripmime.spec ---
Name:           ripmime
Version:        1.4.0.9
Release:        2%{?dist}
Summary:        Extract attachments out of a MIME encoded email packages

Group:          Applications/Internet
License:        BSD
URL:            http://www.pldaniels.com/ripmime/
Source0:        http://www.pldaniels.com/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
ripMIME extract attachments out of a MIME encoded email packages.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 0755 $RPM_BUILD_DIR/%{name}-%{version}/%{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 0644 $RPM_BUILD_DIR/%{name}-%{version}/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_mandir}/man1/*
%doc CHANGELOG CONTRIBUTORS INSTALL LICENSE TODO README

%changelog

* Fri Jan 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-2
- Include CFLAGS in build process

* Fri Dec 26 2008 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:04:46 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:26:48 -0000	1.2
@@ -0,0 +1 @@
+ripmime-1.4.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:04:46 -0000	1.1
+++ sources	1 Aug 2009 20:26:49 -0000	1.2
@@ -0,0 +1 @@
+25761b8a533bc935f75902724fb73244  ripmime-1.4.0.9.tar.gz



From pkgdb at fedoraproject.org  Sat Aug  1 20:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:29:23 +0000
Subject: [pkgdb] perl-Flickr-API was added for ksyz
Message-ID: <20090801202924.4308A10F897@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-Flickr-API with summary Flickr API interface
tibbs has approved Package perl-Flickr-API
tibbs has added a Fedora devel branch for perl-Flickr-API with an owner of ksyz
tibbs has approved perl-Flickr-API in Fedora devel
tibbs has approved Package perl-Flickr-API
tibbs has set commit to Approved for 107427 on perl-Flickr-API (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-Flickr-API (Fedora devel)
tibbs has set build to Approved for 107427 on perl-Flickr-API (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-API



From pkgdb at fedoraproject.org  Sat Aug  1 20:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:29:25 +0000
Subject: [pkgdb] perl-Flickr-API summary updated by tibbs
Message-ID: <20090801202925.A164110F89C@bastion2.fedora.phx.redhat.com>

tibbs set package perl-Flickr-API summary to Flickr API interface

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-API



From pkgdb at fedoraproject.org  Sat Aug  1 20:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:29:25 +0000
Subject: [pkgdb] perl-Flickr-API (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801202925.F27C010F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-Flickr-API
tibbs has set commit to Approved for 107427 on perl-Flickr-API (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-Flickr-API (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-Flickr-API (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-API



From pkgdb at fedoraproject.org  Sat Aug  1 20:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 20:29:25 +0000
Subject: [pkgdb] perl-Flickr-API (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801202926.2A26610F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-Flickr-API
tibbs has set commit to Approved for 107427 on perl-Flickr-API (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-Flickr-API (Fedora 11)
tibbs has set build to Approved for 107427 on perl-Flickr-API (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-API



From tibbs at fedoraproject.org  Sat Aug  1 20:29:31 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:29:31 +0000 (UTC)
Subject: rpms/perl-Flickr-API - New directory
Message-ID: <20090801202931.145A311C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-API
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiZ8421/rpms/perl-Flickr-API

Log Message:
Directory /cvs/pkgs/rpms/perl-Flickr-API added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 20:29:31 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:29:31 +0000 (UTC)
Subject: rpms/perl-Flickr-API/devel - New directory
Message-ID: <20090801202931.3532A11C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-API/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiZ8421/rpms/perl-Flickr-API/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Flickr-API/devel added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 20:29:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:29:37 +0000 (UTC)
Subject: rpms/perl-Flickr-API Makefile,NONE,1.1
Message-ID: <20090801202937.0A42611C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-API
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiZ8421/rpms/perl-Flickr-API

Added Files:
	Makefile 
Log Message:
Setup of module perl-Flickr-API


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Flickr-API
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Sat Aug  1 20:29:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 20:29:37 +0000 (UTC)
Subject: rpms/perl-Flickr-API/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090801202937.3143711C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-API/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsiZ8421/rpms/perl-Flickr-API/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Flickr-API


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Flickr-API
# $Id: Makefile,v 1.1 2009/08/01 20:29:37 tibbs Exp $
NAME := perl-Flickr-API
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From itamarjp at fedoraproject.org  Sat Aug  1 20:31:32 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat,  1 Aug 2009 20:31:32 +0000 (UTC)
Subject: rpms/ripmime/EL-5 import.log, NONE, 1.1 ripmime.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090801203132.7A56811C004A@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ripmime.spec 
Log Message:
initial rpm version



--- NEW FILE import.log ---
ripmime-1_4_0_9-2_fc10:EL-5:ripmime-1.4.0.9-2.fc10.src.rpm:1249158454


--- NEW FILE ripmime.spec ---
Name:           ripmime
Version:        1.4.0.9
Release:        2%{?dist}
Summary:        Extract attachments out of a MIME encoded email packages

Group:          Applications/Internet
License:        BSD
URL:            http://www.pldaniels.com/ripmime/
Source0:        http://www.pldaniels.com/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
ripMIME extract attachments out of a MIME encoded email packages.

%prep
%setup -q

%build
make CFLAGS="%{optflags}" %{?_smp_mflags} 

%install
rm -rf $RPM_BUILD_ROOT

install -Dp -m 0755 $RPM_BUILD_DIR/%{name}-%{version}/%{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 0644 $RPM_BUILD_DIR/%{name}-%{version}/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_mandir}/man1/*
%doc CHANGELOG CONTRIBUTORS INSTALL LICENSE TODO README

%changelog

* Fri Jan 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-2
- Include CFLAGS in build process

* Fri Dec 26 2008 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.4.0.9-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:04:46 -0000	1.1
+++ .cvsignore	1 Aug 2009 20:31:32 -0000	1.2
@@ -0,0 +1 @@
+ripmime-1.4.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ripmime/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:04:46 -0000	1.1
+++ sources	1 Aug 2009 20:31:32 -0000	1.2
@@ -0,0 +1 @@
+25761b8a533bc935f75902724fb73244  ripmime-1.4.0.9.tar.gz



From pkgdb at fedoraproject.org  Sat Aug  1 21:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 21:18:28 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree was added for ksyz
Message-ID: <20090801211828.C818F10F897@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-XML-Parser-Lite-Tree with summary Lightweight XML tree builder
tibbs has approved Package perl-XML-Parser-Lite-Tree
tibbs has added a Fedora devel branch for perl-XML-Parser-Lite-Tree with an owner of ksyz
tibbs has approved perl-XML-Parser-Lite-Tree in Fedora devel
tibbs has approved Package perl-XML-Parser-Lite-Tree
tibbs has set commit to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora devel)
tibbs has set build to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Sat Aug  1 21:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 21:18:29 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree summary updated by tibbs
Message-ID: <20090801211829.C485010F89C@bastion2.fedora.phx.redhat.com>

tibbs set package perl-XML-Parser-Lite-Tree summary to Lightweight XML tree builder

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From pkgdb at fedoraproject.org  Sat Aug  1 21:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 21:18:29 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801211830.10AC310F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-XML-Parser-Lite-Tree
tibbs has set commit to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From tibbs at fedoraproject.org  Sat Aug  1 21:18:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 21:18:38 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree - New directory
Message-ID: <20090801211838.1BE1711C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK26293/rpms/perl-XML-Parser-Lite-Tree

Log Message:
Directory /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree added to the repository




From pkgdb at fedoraproject.org  Sat Aug  1 21:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 01 Aug 2009 21:18:29 +0000
Subject: [pkgdb] perl-XML-Parser-Lite-Tree (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090801211830.5843610F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-XML-Parser-Lite-Tree
tibbs has set commit to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora 11)
tibbs has set build to Approved for 107427 on perl-XML-Parser-Lite-Tree (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Parser-Lite-Tree



From tibbs at fedoraproject.org  Sat Aug  1 21:18:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 21:18:38 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/devel - New directory
Message-ID: <20090801211838.6392911C043B@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK26293/rpms/perl-XML-Parser-Lite-Tree/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel added to the repository




From tibbs at fedoraproject.org  Sat Aug  1 21:18:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 21:18:49 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree Makefile,NONE,1.1
Message-ID: <20090801211849.253A511C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK26293/rpms/perl-XML-Parser-Lite-Tree

Added Files:
	Makefile 
Log Message:
Setup of module perl-XML-Parser-Lite-Tree


--- NEW FILE Makefile ---
# Top level Makefile for module perl-XML-Parser-Lite-Tree
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Sat Aug  1 21:18:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  1 Aug 2009 21:18:49 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090801211849.8349711C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK26293/rpms/perl-XML-Parser-Lite-Tree/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-XML-Parser-Lite-Tree


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-XML-Parser-Lite-Tree
# $Id: Makefile,v 1.1 2009/08/01 21:18:49 tibbs Exp $
NAME := perl-XML-Parser-Lite-Tree
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pingou at fedoraproject.org  Sat Aug  1 21:22:45 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 21:22:45 +0000 (UTC)
Subject: rpms/R-maanova/devel .cvsignore, 1.4, 1.5 R-maanova.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090801212245.D21AC11C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27805

Modified Files:
	.cvsignore R-maanova.spec sources 
Log Message:
Update to 1.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 20:04:15 -0000	1.4
+++ .cvsignore	1 Aug 2009 21:22:45 -0000	1.5
@@ -1 +1 @@
-maanova_1.12.0.tar.gz
+maanova_1.14.0.tar.gz


Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/devel/R-maanova.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- R-maanova.spec	24 Jul 2009 16:13:02 -0000	1.6
+++ R-maanova.spec	1 Aug 2009 21:22:45 -0000	1.7
@@ -1,10 +1,10 @@
 %define packname  maanova
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.12.0 
-Release:          3%{?dist}
+Version:          1.14.0 
+Release:          1%{?dist}
 Summary:          Analysis of N-dye Micro Array using mixed model effect
 Summary(fr):      Analise de puce ? ADN ? N marqueurs par different mod?le
 
@@ -44,6 +44,10 @@ chmod -x %{packname}/src/*.c
 # therefore I am not sure this package will be updated
 %{__sed} -i -e 's/snow//'  %{packname}/DESCRIPTION
 %{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/abf1.tex
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/maanova.blg
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/camda.tex
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/maanova.bbl
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/intro.tex
 
 
 mkdir -p %{buildroot}%{_libdir}/R/library ; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
@@ -94,6 +98,9 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 
 
 %changelog
+* Sat Aug 01 2009 pingou <pingou at pingoured.fr> - 1.14.0-1
+- Update to 1.14.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:04:15 -0000	1.4
+++ sources	1 Aug 2009 21:22:45 -0000	1.5
@@ -1 +1 @@
-3cc961b9de21bb141313d686f906e7e0  maanova_1.12.0.tar.gz
+2dd72e3718ce196faa34b8989af1f40b  maanova_1.14.0.tar.gz



From pingou at fedoraproject.org  Sat Aug  1 21:23:30 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 21:23:30 +0000 (UTC)
Subject: rpms/R-maanova/F-10 R-maanova.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090801212330.60E4C11C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28051/F-10

Modified Files:
	R-maanova.spec sources 
Log Message:
Update to 1.14.0


Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-10/R-maanova.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-maanova.spec	27 Oct 2008 20:04:15 -0000	1.4
+++ R-maanova.spec	1 Aug 2009 21:23:30 -0000	1.5
@@ -1,9 +1,9 @@
 %define packname  maanova
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.12.0 
+Version:          1.14.0 
 Release:          1%{?dist}
 Summary:          Analysis of N-dye Micro Array using mixed model effect
 Summary(fr):      Analise de puce ? ADN ? N marqueurs par different mod?le
@@ -44,6 +44,10 @@ chmod -x %{packname}/src/*.c
 # therefore I am not sure this package will be updated
 %{__sed} -i -e 's/snow//'  %{packname}/DESCRIPTION
 %{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/abf1.tex
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/maanova.blg
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/camda.tex
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/maanova.bbl
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/intro.tex
 
 
 mkdir -p %{buildroot}%{_libdir}/R/library ; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
@@ -94,6 +98,15 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 
 
 %changelog
+* Sat Aug 01 2009 pingou <pingou at pingoured.fr> - 1.14.0-1
+- Update to 1.14.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Oct 27 2008 Pingou <pingoufc4 at yahoo.fr> 1.12.0-1
 - Update to 1.12.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:04:15 -0000	1.4
+++ sources	1 Aug 2009 21:23:30 -0000	1.5
@@ -1 +1 @@
-3cc961b9de21bb141313d686f906e7e0  maanova_1.12.0.tar.gz
+2dd72e3718ce196faa34b8989af1f40b  maanova_1.14.0.tar.gz



From pingou at fedoraproject.org  Sat Aug  1 21:23:30 2009
From: pingou at fedoraproject.org (pingou)
Date: Sat,  1 Aug 2009 21:23:30 +0000 (UTC)
Subject: rpms/R-maanova/F-11 R-maanova.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090801212330.8595E11C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-maanova/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28051/F-11

Modified Files:
	R-maanova.spec sources 
Log Message:
Update to 1.14.0


Index: R-maanova.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-11/R-maanova.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-maanova.spec	23 Feb 2009 23:03:48 -0000	1.5
+++ R-maanova.spec	1 Aug 2009 21:23:30 -0000	1.6
@@ -1,10 +1,10 @@
 %define packname  maanova
-%define bioc      2.3
-%define Rversion  2.8.0
+%define bioc      2.4
+%define Rversion  2.9.0
 
 Name:             R-%{packname}
-Version:          1.12.0 
-Release:          2%{?dist}
+Version:          1.14.0 
+Release:          1%{?dist}
 Summary:          Analysis of N-dye Micro Array using mixed model effect
 Summary(fr):      Analise de puce ? ADN ? N marqueurs par different mod?le
 
@@ -44,6 +44,10 @@ chmod -x %{packname}/src/*.c
 # therefore I am not sure this package will be updated
 %{__sed} -i -e 's/snow//'  %{packname}/DESCRIPTION
 %{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/abf1.tex
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/maanova.blg
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/camda.tex
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/maanova.bbl
+%{__sed} -i -e 's/\r$//'  %{packname}/inst/doc/intro.tex
 
 
 mkdir -p %{buildroot}%{_libdir}/R/library ; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
@@ -94,6 +98,12 @@ chmod -x %{buildroot}%{_libdir}/R/librar
 
 
 %changelog
+* Sat Aug 01 2009 pingou <pingou at pingoured.fr> - 1.14.0-1
+- Update to 1.14.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-maanova/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2008 20:04:15 -0000	1.4
+++ sources	1 Aug 2009 21:23:30 -0000	1.5
@@ -1 +1 @@
-3cc961b9de21bb141313d686f906e7e0  maanova_1.12.0.tar.gz
+2dd72e3718ce196faa34b8989af1f40b  maanova_1.14.0.tar.gz



From danken at fedoraproject.org  Sat Aug  1 21:36:02 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Sat,  1 Aug 2009 21:36:02 +0000 (UTC)
Subject: rpms/tex-fonts-hebrew/devel tex-fonts-hebrew.spec,1.7,1.8
Message-ID: <20090801213602.BDEC511C004A@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/tex-fonts-hebrew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31636

Modified Files:
	tex-fonts-hebrew.spec 
Log Message:
actually obsolete tetex-fonts-hebrew-0.1-11
Resolves: 514943



Index: tex-fonts-hebrew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tex-fonts-hebrew/devel/tex-fonts-hebrew.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tex-fonts-hebrew.spec	27 Jul 2009 05:50:50 -0000	1.7
+++ tex-fonts-hebrew.spec	1 Aug 2009 21:36:02 -0000	1.8
@@ -22,7 +22,7 @@ BuildRequires: culmus-miriam-clm-fonts
 BuildRequires: culmus-miriam-mono-clm-fonts
 BuildRequires: culmus-nachlieli-clm-fonts
 BuildRequires: culmus-yehuda-clm-fonts
-Obsoletes: tetex-fonts-hebrew < 0.1-11
+Obsoletes: tetex-fonts-hebrew <= 0.1-11
 Provides: tetex-fonts-hebrew = %{version}-%{release}
 Requires: texlive
 Requires: culmus-aharoni-clm-fonts



From danken at fedoraproject.org  Sat Aug  1 21:40:26 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Sat,  1 Aug 2009 21:40:26 +0000 (UTC)
Subject: rpms/tex-fonts-hebrew/F-11 tex-fonts-hebrew.spec,1.6,1.7
Message-ID: <20090801214026.3AC4A11C04D5@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/tex-fonts-hebrew/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv566

Modified Files:
	tex-fonts-hebrew.spec 
Log Message:
actually obsolete tetex-fonts-hebrew-0.1-11
Resolves: BZ#514943



Index: tex-fonts-hebrew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tex-fonts-hebrew/F-11/tex-fonts-hebrew.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tex-fonts-hebrew.spec	24 Jul 2009 09:32:54 -0000	1.6
+++ tex-fonts-hebrew.spec	1 Aug 2009 21:40:25 -0000	1.7
@@ -22,7 +22,7 @@ BuildRequires: culmus-miriam-clm-fonts
 BuildRequires: culmus-miriam-mono-clm-fonts
 BuildRequires: culmus-nachlieli-clm-fonts
 BuildRequires: culmus-yehuda-clm-fonts
-Obsoletes: tetex-fonts-hebrew < 0.1-11
+Obsoletes: tetex-fonts-hebrew <= 0.1-11
 Provides: tetex-fonts-hebrew = %{version}-%{release}
 Requires: texlive
 Requires: culmus-aharoni-clm-fonts
@@ -89,7 +89,7 @@ fi
 
 %changelog
 * Wed Jul 22 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 0.1-13
-- should obsolete tetex-fonts-hebrew-0.1-11. Bug #485639
+- should obsolete tetex-fonts-hebrew-0.1-11. Bug #485639 and #514943
 
 * Wed Jul 22 2009 Dan Kenigsberg <danken at cs.technion.ac.il> - 0.1-12
 - Rebuilt against existing David Type1 fonts. Bug #509697



From danken at fedoraproject.org  Sat Aug  1 21:45:09 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Sat,  1 Aug 2009 21:45:09 +0000 (UTC)
Subject: rpms/tex-fonts-hebrew/F-11 tex-fonts-hebrew.spec,1.7,1.8
Message-ID: <20090801214509.E932A11C004A@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/tex-fonts-hebrew/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2628

Modified Files:
	tex-fonts-hebrew.spec 
Log Message:
as usual, forgotten release number



Index: tex-fonts-hebrew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tex-fonts-hebrew/F-11/tex-fonts-hebrew.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tex-fonts-hebrew.spec	1 Aug 2009 21:40:25 -0000	1.7
+++ tex-fonts-hebrew.spec	1 Aug 2009 21:45:09 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Culmus Hebrew fonts support for LaTeX
 Name: tex-fonts-hebrew
 Version: 0.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 URL: http://culmus.sf.net
 # There is no real upstream for this package. It was based on Yotam Medini's
 # http://www.medini.org/hebrew/culmus2ltx-2003-02-28.tar.gz but is now



From rdieter at fedoraproject.org  Sat Aug  1 22:38:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 22:38:23 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.87,1.88
Message-ID: <20090801223823.A538D11C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
- %check: desktop-file-validate



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- kdeaccessibility.spec	29 Jul 2009 22:06:46 -0000	1.87
+++ kdeaccessibility.spec	1 Aug 2009 22:38:20 -0000	1.88
@@ -2,7 +2,7 @@ Summary:        K Desktop Environment - 
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -11,6 +11,7 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
 %ifnarch sparcv9 sparc64
@@ -24,13 +25,13 @@ BuildRequires: plasma-devel >= %{version
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: kdelibs4 >= %{version}
 # ktssd
 Requires: festival
 
 Obsoletes: kdeaccessibility-devel < 1:3.5.8
+Obsoletes: kdeaccessibility < 1:4.3.0-2
 
 #noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
@@ -42,6 +43,15 @@ Included with this package are:
 * kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
+# Yes, it's a bit silly to have this, esp since we don't have a -devel pkg,
+# but that's how multilib currently works. -- Rex
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q
@@ -61,29 +71,49 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# hack around HTML doc multilib conflicts
+for doxy_hack in kmousetool kmouth kttsd ; do
+pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
+bunzip2 index.cache.bz2
+sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
+bzip2 -9 index.cache
+done
+popd
+
+# unpackaged files
+rm -vf %{buildroot}%{_kde4_libdir}/libkttsd.so
+
+
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/mono &> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-    touch --no-create %{_kde4_iconsdir}/mono &> /dev/null
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
-    gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/mono &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -95,7 +125,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/kttsd/
 %{_kde4_appsdir}/color-schemes/*.colors
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/kmag/
@@ -104,13 +134,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_docdir}/HTML/en/kttsd/
 %{_kde4_iconsdir}/mono/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
-%{_mandir}/*/*.gz
+%{_mandir}/man1/*.1*
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkttsd.so.4*
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Sat Aug  1 22:44:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 22:44:27 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.88,1.89
Message-ID: <20090801224427.8AB5511C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeaccessibility.spec 
Log Message:
adjust -libs deps



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kdeaccessibility.spec	1 Aug 2009 22:38:20 -0000	1.88
+++ kdeaccessibility.spec	1 Aug 2009 22:44:27 -0000	1.89
@@ -25,8 +25,7 @@ BuildRequires: plasma-devel >= %{version
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: kdelibs4 >= %{version}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # ktssd
 Requires: festival
 
@@ -49,6 +48,7 @@ Included with this package are:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 



From rdieter at fedoraproject.org  Sat Aug  1 22:54:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 22:54:55 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.190,1.191
Message-ID: <20090801225455.9C3E511C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeutils.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
- %check: desktop-file-validate



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- kdeutils.spec	30 Jul 2009 10:16:27 -0000	1.190
+++ kdeutils.spec	1 Aug 2009 22:54:55 -0000	1.191
@@ -4,7 +4,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -22,7 +22,8 @@ Patch1:         kdeutils-4.2.85-pykde4.p
 
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
-BuildRequires:  kdelibs-experimental-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  kdelibs-experimental-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
@@ -32,10 +33,6 @@ BuildRequires:  python-devel python
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
-
 %if 0%{?printer_applet}
 %if 0%{?fedora} < 11
 # upgrade path so it doesn't get lost
@@ -49,8 +46,10 @@ Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 6:4.0.0
-Obsoletes: kdeutils-libs < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
+Obsoletes: kdeutils < 6:4.3.0-2
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Utilities for the K Desktop Environment.
@@ -69,6 +68,14 @@ Includes:
   * superkaramba
   * sweeper: clean unwanted traces the user leaves on the system
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 %package printer-applet
 Summary:  KDE printer applet
 Group:    Applications/System
@@ -111,12 +118,17 @@ rm -f %{buildroot}%{_kde4_libdir}/libkmi
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -126,7 +138,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -135,6 +146,10 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -169,7 +184,7 @@ fi
 %{_kde4_appsdir}/sweeper/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
@@ -178,11 +193,14 @@ fi
 %{_kde4_datadir}/autostart/irkick.desktop
 %{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_configdir}/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*.so
 %{_mandir}/man1/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
+
 %if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
@@ -193,6 +211,10 @@ fi
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Sat Aug  1 23:10:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 23:10:40 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.257,1.258
Message-ID: <20090801231040.2F0CA11C04D5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- move designer pluginsn to -devel, fixes
  Multilib conflicts for index.cache.bz2 (#515088)
- tighten -libs deps, using %{?_isa}
- %check: desktop-file-validate



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- kdebase-workspace.spec	29 Jul 2009 22:29:36 -0000	1.257
+++ kdebase-workspace.spec	1 Aug 2009 23:10:39 -0000	1.258
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-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
@@ -31,6 +31,9 @@ Patch15: kdebase-workspace-4.2.0-kio_sys
 
 # trunk
 
+# moving to non-multilib hack
+Obsoletes: kdebase-workspace < 4.3.0-2
+
 Obsoletes: PolicyKit-kde < %{version}-100 
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
@@ -58,6 +61,7 @@ Obsoletes: guidance-power-manager < 4.3
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
+BuildRequires: desktop-file-utils
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
 BuildRequires: gpsd-devel
@@ -79,7 +83,7 @@ BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 # would much rather these deps be elsewhere,
@@ -134,7 +138,7 @@ Summary:  Development files for %{name}
 Obsoletes: PolicyKit-kde-devel < 4.2.85
 Provides:  PolicyKit-kde-devel = %{version}-%{release}
 Provides: solid-bluetooth-devel = 4.3-0.1
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -256,6 +260,12 @@ ln -sf ../pics/users/%{default_face_icon
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -406,8 +416,6 @@ fi
 %{_kde4_libdir}/kde4/plasma_package*_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
 %{_kde4_libdir}/kde4/solid_*.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_libexecdir}/kcheckpass
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
@@ -440,6 +448,8 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
 %{_kde4_libdir}/cmake/KDE4Workspace-%{version}/
 %exclude %{_kde4_libdir}/libkdeinit*.so
@@ -447,7 +457,6 @@ fi
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %exclude %{_kde4_libdir}/libsystemsettingsview.so
 
-
 %files wallpapers
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/*
@@ -503,6 +512,12 @@ fi
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- move designer pluginsn to -devel, fixes
+  Multilib conflicts for index.cache.bz2 (#515088)
+- tighten -libs deps, using %%{?_isa}
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Sat Aug  1 23:18:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 23:18:00 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.191,1.192
Message-ID: <20090801231800.E4F9D11C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeutils.spec 
Log Message:
workaround irkick failure



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- kdeutils.spec	1 Aug 2009 22:54:55 -0000	1.191
+++ kdeutils.spec	1 Aug 2009 23:18:00 -0000	1.192
@@ -120,7 +120,11 @@ rm -f %{buildroot}%{_kde4_libdir}/libsup
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+# make an exception for irkick service-style .desktop, while we consult
+# upstream
+  if [ "`basename $f .desktop`" != "irkick" ]; then
   desktop-file-validate $f
+  fi
 done
 
 



From rdieter at fedoraproject.org  Sat Aug  1 23:44:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 23:44:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.258,1.259
Message-ID: <20090801234419.9174B11C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
doh, move plugins to -libs instead



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- kdebase-workspace.spec	1 Aug 2009 23:10:39 -0000	1.258
+++ kdebase-workspace.spec	1 Aug 2009 23:44:19 -0000	1.259
@@ -443,13 +443,13 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
 %{_kde4_libdir}/cmake/KDE4Workspace-%{version}/
 %exclude %{_kde4_libdir}/libkdeinit*.so
@@ -513,7 +513,7 @@ fi
 
 %changelog
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
-- move designer pluginsn to -devel, fixes
+- move designer plugins to -libs, fixes
   Multilib conflicts for index.cache.bz2 (#515088)
 - tighten -libs deps, using %%{?_isa}
 - %%check: desktop-file-validate



From rdieter at fedoraproject.org  Sat Aug  1 23:52:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  1 Aug 2009 23:52:26 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.195,1.196
Message-ID: <20090801235226.35AF411C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- move kalziumuiwidgets.so designer plugin to -libs
- tighten -libs deps using %?_isa
- %check: desktop-file-validate



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdeedu.spec	29 Jul 2009 22:51:49 -0000	1.195
+++ kdeedu.spec	1 Aug 2009 23:52:25 -0000	1.196
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -54,7 +54,7 @@ BuildRequires: xplanet
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
 %if 0%{?fedora} < 12
@@ -91,9 +91,9 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # libmarble
-Requires: %{name}-marble = %{version}-%{release}
+Requires: %{name}-marble%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -106,7 +106,7 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #Requires(hint): xplanet
 %description kstars
 %{summary}.
@@ -174,6 +174,12 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -291,7 +297,6 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
 %{_kde4_libdir}/libcompoundviewer.so.*
-%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -366,6 +371,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
 %{_kde4_libdir}/libscience.so.*
+# needed here for multilib'd runtime
+%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -450,6 +458,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- move kalziumuiwidgets.so designer plugin to -libs
+- tighten -libs deps using %%?_isa
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Sun Aug  2 00:24:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  2 Aug 2009 00:24:09 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.196,1.197
Message-ID: <20090802002409.757D811C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
fix conflict with oxygen-icons



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- kdeedu.spec	1 Aug 2009 23:52:25 -0000	1.196
+++ kdeedu.spec	2 Aug 2009 00:24:05 -0000	1.197
@@ -165,6 +165,8 @@ make install/fast DESTDIR=%{buildroot} -
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
+# oxygen-icon-theme conflict
+rm -fv %{buildroot%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
 
 # omit dustismo roman font
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
@@ -462,6 +464,7 @@ rm -rf %{buildroot}
 - move kalziumuiwidgets.so designer plugin to -libs
 - tighten -libs deps using %%?_isa
 - %%check: desktop-file-validate
+- fix conflict with oxygen-icons
 
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0



From rdieter at fedoraproject.org  Sun Aug  2 00:26:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  2 Aug 2009 00:26:56 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.197,1.198
Message-ID: <20090802002656.D171A11C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
typo



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- kdeedu.spec	2 Aug 2009 00:24:05 -0000	1.197
+++ kdeedu.spec	2 Aug 2009 00:26:56 -0000	1.198
@@ -166,7 +166,7 @@ make install/fast DESTDIR=%{buildroot} -
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
 # oxygen-icon-theme conflict
-rm -fv %{buildroot%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
 
 # omit dustismo roman font
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf



From smilner at fedoraproject.org  Sun Aug  2 00:35:27 2009
From: smilner at fedoraproject.org (smilner)
Date: Sun,  2 Aug 2009 00:35:27 +0000 (UTC)
Subject: rpms/Django/devel Django-ignore-pyo-bz-495046.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 Django.spec, 1.23, 1.24 sources, 1.12, 1.13
Message-ID: <20090802003527.54F0C11C004A@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	.cvsignore Django.spec sources 
Added Files:
	Django-ignore-pyo-bz-495046.patch 
Log Message:
Updates for Django-1.1.


Django-ignore-pyo-bz-495046.patch:
 base.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE Django-ignore-pyo-bz-495046.patch ---
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
@@ -398,7 +398,7 @@
             if subdir.startswith('.'):
                 del subdirs[i]
         for f in files:
-            if f.endswith('.pyc'):
+            if f.endswith('.pyc') or f.endswith('.pyo'):
                 continue
             path_old = os.path.join(d, f)
             path_new = os.path.join(top_dir, relative_dir, f.replace('%s_name' % app_or_project, name))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jul 2009 20:21:06 -0000	1.12
+++ .cvsignore	2 Aug 2009 00:35:26 -0000	1.13
@@ -1 +1,3 @@
-Django-1.0.3.tar.gz
+Django-1.1.tar.gz
+Django-ignore-pyo-bz-495046.patch
+simplejson-init.py


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- Django.spec	30 Jul 2009 03:24:04 -0000	1.23
+++ Django.spec	2 Aug 2009 00:35:26 -0000	1.24
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ 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
@@ -41,6 +42,7 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -56,7 +58,7 @@ cp -p %{SOURCE1} __init__.py
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 # Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
@@ -67,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
@@ -84,6 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
 %{python_sitelib}/django
 
+# Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
 %endif
@@ -97,12 +102,19 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/django-admin.pyc
 %exclude %{_bindir}/django-admin.pyo
 %endif
+# -----------------
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
 
 %changelog
+* Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-6
 - Attempted combined spec for F12/11/10 and EL5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jul 2009 20:21:06 -0000	1.12
+++ sources	2 Aug 2009 00:35:26 -0000	1.13
@@ -1 +1,3 @@
-3c5435b015d8cde602b17a5f0c9873dc  Django-1.0.3.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py



From hadess at fedoraproject.org  Sun Aug  2 00:44:13 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sun,  2 Aug 2009 00:44:13 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.41, 1.42 bluez.spec, 1.84,
	1.85 sources, 1.41, 1.42 0001-Add-rfkill-plugin.patch, 1.2, NONE
Message-ID: <20090802004413.4811111C004A@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore bluez.spec sources 
Removed Files:
	0001-Add-rfkill-plugin.patch 
Log Message:
* Sun Aug 02 2009 Bastien Nocera <bnocera at redhat.com> 4.47-1
- Update to 4.47



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	18 Jul 2009 23:44:21 -0000	1.41
+++ .cvsignore	2 Aug 2009 00:44:12 -0000	1.42
@@ -1 +1 @@
-bluez-4.46.tar.gz
+bluez-4.47.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- bluez.spec	29 Jul 2009 13:57:54 -0000	1.84
+++ bluez.spec	2 Aug 2009 00:44:12 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.46
-Release: 3%{?dist}
+Version: 4.47
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -24,8 +24,6 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
-# http://thread.gmane.org/gmane.linux.bluez.kernel/2981
-Patch6: 0001-Add-rfkill-plugin.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -132,7 +130,6 @@ This includes hidd, dund and pand.
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cable-pairing
-%patch6 -p1 -b .rfkill
 
 %build
 libtoolize -f -c
@@ -273,6 +270,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Sun Aug 02 2009 Bastien Nocera <bnocera at redhat.com> 4.47-1
+- Update to 4.47
+
 * Wed Jul 29 2009 Bastien Nocera <bnocera at redhat.com> 4.46-3
 - Add rfkill plugin to restore the state of the adapters
   after coming back from a blocked adapter


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	18 Jul 2009 23:44:21 -0000	1.41
+++ sources	2 Aug 2009 00:44:13 -0000	1.42
@@ -1 +1 @@
-ed24b291e9a724a37bc8e9d04adae413  bluez-4.46.tar.gz
+b54a199004b578ec5652014a5e62aeaa  bluez-4.47.tar.gz


--- 0001-Add-rfkill-plugin.patch DELETED ---



From transif at fedoraproject.org  Sun Aug  2 01:59:11 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun,  2 Aug 2009 01:59:11 +0000 (UTC)
Subject: comps/po ja.po,1.23,1.24
Message-ID: <20090802015912.27AB411C004A@cvs1.fedora.phx.redhat.com>

Author: transif

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

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


Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ja.po	29 Apr 2009 20:00:20 -0000	1.23
+++ ja.po	2 Aug 2009 01:59:09 -0000	1.24
@@ -7,13 +7,14 @@
 # Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007, 2008.
 # Hirofumi Saito <hi_saito at yk.rim.or.jp>, 2004, 2005.
 # Kiyoto Hashida <khashida at redhat.com>, 2008, 2009.
+# Hyu_gabaru Ryu_ichi <hyu_gabaru at yahoo.co.jp>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-04-01 15:16+1000\n"
-"Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
+"PO-Revision-Date: 2009-08-02 10:57+0900\n"
+"Last-Translator: Hyu_gabaru Ryu_ichi <hyu_gabaru at yahoo.co.jp>\n"
 "Language-Team: Japanese <jp at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1311,19 +1312,16 @@ msgid "Amazigh Support"
 msgstr "??????????"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "??????????"
+msgstr "??????????????"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "????????"
+msgstr "?????????"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "???????????"
+msgstr "?????????"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1334,9 +1332,8 @@ msgid "Electronic Lab"
 msgstr "???????"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "??????????"
+msgstr "??????????"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1351,47 +1348,40 @@ msgid "Friulian Support"
 msgstr "??????????"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "???????????"
+msgstr "????????????"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "??????????"
+msgstr "??????????????"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "??????????"
+msgstr "?????????"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "??????????"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "??????????"
+msgstr "?????????"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "?????????"
+msgstr "?????????????"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "????????????"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1410,14 +1400,12 @@ msgid "Online Help and Documentation"
 msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "??????????"
+msgstr "?????????????"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "???????????"
+msgstr "????????????"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1440,14 +1428,12 @@ msgstr ""
 "????"
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "?????????"
+msgstr "??????????"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "?????????"
+msgstr "??????????"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""



From rdieter at fedoraproject.org  Sun Aug  2 02:00:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  2 Aug 2009 02:00:58 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.228,1.229
Message-ID: <20090802020058.834F111C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdebindings.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- workaround pykdeuic4 upgrade brokenness (introduced in 4.2.98)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- kdebindings.spec	30 Jul 2009 15:46:51 -0000	1.228
+++ kdebindings.spec	2 Aug 2009 02:00:58 -0000	1.229
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -321,6 +321,11 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+%pre -n PyKDE4-devel
+if [ -d %{_bindir}/pykdeuic4 ]; then
+rm -rf %{_bindir}/pykdeuic4/
+fi
+
 
 %files
 %defattr(-,root,root,-)
@@ -502,6 +507,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- workaround pykdeuic4 upgrade brokenness (introduced in 4.2.98)
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 - more pykdeuic4 and related multilib love (kdebug#198162)



From mclasen at fedoraproject.org  Sun Aug  2 03:11:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 03:11:58 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.478,1.479
Message-ID: <20090802031158.70E1211C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gdm.spec 
Log Message:
drop unneded direct deps



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- gdm.spec	24 Jul 2009 18:44:17 -0000	1.478
+++ gdm.spec	2 Aug 2009 03:11:55 -0000	1.479
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.27.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -163,7 +163,12 @@ cp -f %{SOURCE9} gui/simple-greeter/plug
 	   --disable-scrollkeeper  \
 	   --with-console-kit      \
 	   --with-selinux
-make
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+make %{?_smp_mflags}
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -385,6 +390,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Sat Aug  1 2009 Matthias Clasen <mclasen at redhat.com> 1:2.27.4-4
+- Drop unneeded direct deps
+
 * Fri Jul 24 2009 Ray Strode <rstrode at redhat.com> 1:2.27.4-3
 - Fix delay during login
 



From jkratoch at fedoraproject.org  Sun Aug  2 03:18:57 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sun,  2 Aug 2009 03:18:57 +0000 (UTC)
Subject: rpms/gdb/F-11 gdb-python-gdbserver-tp-crash.patch, NONE,
	1.1 gdb.spec, 1.358, 1.359
Message-ID: <20090802031857.54FC411C004A@cvs1.fedora.phx.redhat.com>

Author: jkratoch

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-python-gdbserver-tp-crash.patch 
Log Message:
* Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-35
- Fix crash running gdbserver (incompatibility with python).


gdb-python-gdbserver-tp-crash.patch:
 frame.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE gdb-python-gdbserver-tp-crash.patch ---
commit f19ba6e3238e359f2c147d080f7364fd667d202d
Author: Jan Kratochvil <jkratoch at host1.dyn.jankratochvil.net>
Date:   Sat Aug 1 14:52:19 2009 +0200

    Fix crash with archer-tromey-python vs. FSF GDB HEAD.
    
    Crashing at least on gdb.server/server-run.exp .
    
    +  /* FIXME: Workaround archer-tromey-python crash in
    +     add_inferior_object->get_current_arch on FSF GDB update:
    +     is_thread_state would assertion check here as
    +     remote_start_remote->add_inferior_silent->observer_notify_new_inferior is
    +     before remote_start_remote->add_thread_silent.  */
    
    	* frame.c (has_stack_frames): Safely return 0 if INFERIOR_PTID
    	currently has no associated thread.

Running ../../../gdb/testsuite/gdb.mi/mi-file-transfer.exp ...
Executing on host: gcc ../../../gdb/testsuite/gdb.mi/basics.c  -g  -lm   -m32 -o /home/jkratoch/hammock/20090802Build-fedora11/fedora-11-x86_64/build/gdb-6.8.50.20090302/build-x86_64-redhat-linux-gnu/gdb/testsuite.unix.-m32/gdb.mi/basics    (timeout = 300)

~"../../gdb/thread.c:78: internal-error: inferior_thread: Assertion `tp' failed.\nA problem internal to GDB has been detected,\nfurther debugging may prove unreliable.\nQuit this debugging session? "

[ Backport for gdb-6.8.50.20090302.  ]

--- gdb-6.8.50.20090302/gdb/frame.c.orig	2009-08-02 05:15:28.000000000 +0200
+++ gdb-6.8.50.20090302/gdb/frame.c	2009-08-02 05:16:59.000000000 +0200
@@ -1086,6 +1086,14 @@ has_stack_frames (void)
   if (!target_has_registers || !target_has_stack || !target_has_memory)
     return 0;
 
+   /* FIXME: Workaround archer-tromey-python crash in
+      add_inferior_object->get_current_arch on FSF GDB update:
+      is_thread_state would assertion check here as
+      remote_start_remote->add_inferior_silent->observer_notify_new_inferior is
+      before remote_start_remote->add_thread_silent.  */
+   if (find_thread_ptid (inferior_ptid) == NULL)
+     return 0;
+ 
   /* If the current thread is executing, don't try to read from
      it.  */
   if (is_executing (inferior_ptid))


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -p -r1.358 -r1.359
--- gdb.spec	6 Jul 2009 21:02:31 -0000	1.358
+++ gdb.spec	2 Aug 2009 03:18:56 -0000	1.359
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 34%{?_with_upstream:.upstream}%{?dist}
+Release: 35%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -388,6 +388,9 @@ Patch370: gdb-varobj-revalidate-core.pat
 # Accelerate sorting blocks on reading a file (found on WebKit) (BZ 507267).
 Patch374: gdb-bz507267-block-sort-fast.patch
 
+# Fix crash running gdbserver (incompatibility with python).
+Patch376: gdb-python-gdbserver-tp-crash.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -587,6 +590,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch369 -p1
 %patch370 -p1
 %patch374 -p1
+%patch376 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -866,6 +870,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-35
+- Fix crash running gdbserver (incompatibility with python).
+
 * Mon Jul  6 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-34
 - testsuite: Fix multiple runs in parallel on a single host.
 - testsuite: Remove the rpmbuild option: --with parallel



From mclasen at fedoraproject.org  Sun Aug  2 04:38:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 04:38:31 +0000 (UTC)
Subject: rpms/cairo/devel cairo.spec,1.102,1.103
Message-ID: <20090802043832.01CFA11C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	cairo.spec 
Log Message:
Save some space



Index: cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- cairo.spec	24 Jul 2009 18:36:06 -0000	1.102
+++ cairo.spec	2 Aug 2009 04:38:30 -0000	1.103
@@ -5,7 +5,7 @@
 Summary:	A 2D graphics library
 Name:		cairo
 Version:	1.8.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:	LGPLv2 or MPLv1.1
@@ -80,17 +80,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BIBLIOGRAPHY BUGS ChangeLog COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 NEWS PORTING_GUIDE README
+%doc AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 NEWS README
 %{_libdir}/libcairo*.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc ChangeLog PORTING_GUIDE
 %{_includedir}/*
 %{_libdir}/libcairo*.so
 %{_libdir}/pkgconfig/*
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.8.8-3
+- Move ChangeLog to -devel to save space
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Sun Aug  2 04:42:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 04:42:21 +0000 (UTC)
Subject: rpms/clutter/devel clutter.spec,1.32,1.33
Message-ID: <20090802044221.3BA6311C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	clutter.spec 
Log Message:
Save some space



Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- clutter.spec	1 Aug 2009 03:29:08 -0000	1.32
+++ clutter.spec	2 Aug 2009 04:42:20 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           clutter
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
@@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS COPYING NEWS README
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so.0
 %{_libdir}/*.so.0.*
@@ -83,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
+%doc ChangeLog
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -97,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  1 2009 Matthias Clasen <mclasen at redhat.com> 1.0.0-4
+- Move ChangeLog to -devel to save some space
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 1.0.0-3
 - Drop the gir-repository-devel dep, which pulls a bunch of -devel
   onto the live cd



From mclasen at fedoraproject.org  Sun Aug  2 04:52:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 04:52:40 +0000 (UTC)
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.71,1.72
Message-ID: <20090802045240.9D63C11C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-pilot.spec 
Log Message:
Save some space



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- gnome-pilot.spec	28 Jul 2009 14:44:07 -0000	1.71
+++ gnome-pilot.spec	2 Aug 2009 04:52:40 -0000	1.72
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -138,7 +138,7 @@ scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
 %{_libdir}/*.so.*
@@ -162,11 +162,15 @@ scrollkeeper-update -q
 
 %files devel
 %defattr(-, root, root)
+%doc ChangeLog
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.17-5
+- Move ChangeLog to -devel to save some space
+
 * Tue Jul 28 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-4
 - Add patch for RH bug #512004 (missing icon in applet).
 



From mclasen at fedoraproject.org  Sun Aug  2 05:04:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 05:04:09 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.278,1.279
Message-ID: <20090802050409.D762E11C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	NetworkManager.spec 
Log Message:
Save some space



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- NetworkManager.spec	28 Jul 2009 16:07:28 -0000	1.278
+++ NetworkManager.spec	2 Aug 2009 05:04:09 -0000	1.279
@@ -15,7 +15,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.995
-Release: 0%{snapshot}%{?dist}
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -247,7 +247,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO docs/spec.html
+%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO 
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
@@ -278,6 +278,7 @@ fi
 
 %files devel
 %defattr(-,root,root,0755)
+%doc ChangeLog doc/spec.html
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/%{name}.h
 %{_includedir}/%{name}/NetworkManagerVPN.h
@@ -322,6 +323,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.7.995-1.git20090728
+- Move some big docs to -devel to save space
+
 * Tue Jul 28 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-0.git20090728
 - Update to upstream 'master' branch
 - Use modem-manager for better 3G modem support



From mclasen at fedoraproject.org  Sun Aug  2 05:35:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 05:35:11 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.279,1.280
Message-ID: <20090802053511.5AACD11C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	NetworkManager.spec 
Log Message:
Fix file list



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- NetworkManager.spec	2 Aug 2009 05:04:09 -0000	1.279
+++ NetworkManager.spec	2 Aug 2009 05:35:09 -0000	1.280
@@ -278,7 +278,7 @@ fi
 
 %files devel
 %defattr(-,root,root,0755)
-%doc ChangeLog doc/spec.html
+%doc ChangeLog docs/spec.html
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/%{name}.h
 %{_includedir}/%{name}/NetworkManagerVPN.h



From mclasen at fedoraproject.org  Sun Aug  2 05:39:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 05:39:50 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.391,1.392
Message-ID: <20090802053950.44A7C11C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Log Message:
Save some space



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- gtk2.spec	25 Jul 2009 04:11:11 -0000	1.391
+++ gtk2.spec	2 Aug 2009 05:39:49 -0000	1.392
@@ -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: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -182,6 +182,11 @@ echo 'int main (void) { return 0; }' > r
 gcc -Os relocation-tag.c -o relocation-tag
 %endif
 
+# truncate NEWS
+awk '/^Overview of Changes/ { seen+=1 }
+{ if (seen < 2) print }
+{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/gtk+/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # Deriving /etc/gtk-2.0/$host location
@@ -380,7 +385,10 @@ fi
 
 
 %changelog
-* Sat Jul 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.5-3
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-4
+- Save some space
+
+* Sat Jul 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-3
 - 2.17.6
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17.5-2



From mclasen at fedoraproject.org  Sun Aug  2 05:42:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 05:42:18 +0000 (UTC)
Subject: rpms/glib2/devel glib2.spec,1.213,1.214
Message-ID: <20090802054218.7CF7411C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
Save some space



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- glib2.spec	25 Jul 2009 00:19:54 -0000	1.213
+++ glib2.spec	2 Aug 2009 05:42:18 -0000	1.214
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.21.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -55,6 +55,12 @@ of version 2 of the GLib library.
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
 make %{?_smp_mflags}
 
+# truncate NEWS
+awk '/^Overview of Changes/ { seen+=1 }
+{ if (seen < 2) print }
+{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/glib/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.21.4-3
+- Save some space
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.21.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rishi at fedoraproject.org  Sun Aug  2 05:46:58 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  2 Aug 2009 05:46:58 +0000 (UTC)
Subject: rpms/libchamplain/F-11 .cvsignore, 1.4, 1.5 libchamplain.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090802054658.1A2D311C004A@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 13:22:59 -0000	1.4
+++ .cvsignore	2 Aug 2009 05:46:57 -0000	1.5
@@ -1 +1 @@
-libchamplain-0.3.3.tar.gz
+libchamplain-0.3.5.tar.gz


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-11/libchamplain.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libchamplain.spec	13 Jul 2009 05:17:17 -0000	1.5
+++ libchamplain.spec	2 Aug 2009 05:46:57 -0000	1.6
@@ -1,6 +1,6 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.3.3
+Version:	0.3.5
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -64,7 +64,8 @@ This package contains development files 
 %setup -q
 
 %build
-%configure --disable-static --enable-gtk --enable-gtk-doc
+%configure --disable-static --enable-gtk --enable-gtk-doc \
+  --enable-introspection=no
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -78,7 +79,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.3.so.1.0.0
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.2.0.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,8 +132,63 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %changelog
+* 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
+
+* 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
+
 * Sat Jul 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.3-1
 - Version bump to 0.3.3.
+  * Support for custom map sources and listing available map sources.
+  * Smooth movement to a new position. (GNOME Bugzilla #557641)
+  * Keep the center of the map in the center after a resize. (GNOME Bugzilla
+    #557642)
+  * Double click to zoom and center. (GNOME Bugzilla #557644)
+  * Added a way to know the maximum and minimum zoom level. (GNOME Bugzilla
+    #557965)
+  * Fixed unwanted wrap effect when panning at zoom level >= 8. (GNOME
+    Bugzilla #558020)
+  * Fixed center on and zooming in behavior. (GNOME Bugzilla #558026)
+  * Lack of user feedback during loading of tiles. (GNOME Bugzilla #559522)
+  * Added missing zoom level to OpenStreetMap Mapnik. (GNOME Bugzilla
+    #559446)
+  * Fixed wrong elastic effect affecting Emapthy's map view. (GNOME Bugzilla
+    #561700)
+  * Added disk cache management. (GNOME Bugzillla #568931)
+  * Host application should be able to limit the maximum and minimum zoom
+    levels. (GNOME Bugzilla #571702)
+  * Allow host applications to draw lines/routes on the map. (GNOME Bugzilla
+    #572377)
+  * Support proxies. (GNOME Bugzilla #573937)
+  * Provide a way to make visible a bunch of markers. (GNOME Bugzilla #574809)
+  * Do not allow negative zoom levels. (GNOME Bugzilla #575138)
+  * Fixed corrupted map when double-clicking at maximum level. (GNOME Bugzilla
+    #575139)
+  * Prevent ChamplainNetworkMapSource from crashing when setting "proxy-uri".
+    (GNOME Bugzilla #575902).
+  * Implemented advanced markers. (GNOME Bugzilla #576055)
+  * Various memory management fixes for ChamplainTile. (GNOME Bugzilla
+    #576159)
+  * Any go_to should stop a previous and not yet finished go_to. (GNOME
+    Bugzilla #576832)
+  * Prevent segmentation fault on 32 bit platforms. (GNOME Bugzilla #576698)
+  * Introduced a new signal called ChamplainView::animation-completed. (GNOME
+    Bugzilla #577169)
+  * Set decel-rate correctly. (GNOME Bugzilla #580785)
+  * champlain_network_map_source_fill_tile should be private. (GNOME Bugzilla
+    #582786)
+  * Fixed champlain_view_center_on. (GNOME Bugzilla #583502)
+  * Fixed "longitude" and "latitude" properties, which were reversed. (GNOME
+    Bugzilla #584365)
+  * Make the cache work the first time. (GNOME Bugzilla #584390)
+  * GNOME Goal: use accessor functions instead direct access. (GNOME Bugzilla
+    #585698)
 - Added 'BuildRequires: chrpath' for removing rpaths.
 
 * Wed Mar 18 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.9-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 13:22:59 -0000	1.4
+++ sources	2 Aug 2009 05:46:57 -0000	1.5
@@ -1 +1 @@
-06f30890b86bf9fc4791fe9a4cb110e1  libchamplain-0.3.3.tar.gz
+66e486db1c087633a3f0ce6de4bd320d  libchamplain-0.3.5.tar.gz



From rishi at fedoraproject.org  Sun Aug  2 05:48:25 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  2 Aug 2009 05:48:25 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.4, 1.5 libchamplain.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090802054825.E9FFB11C004A@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Jul 2009 05:18:53 -0000	1.4
+++ .cvsignore	2 Aug 2009 05:48:25 -0000	1.5
@@ -1 +1 @@
-libchamplain-0.3.3.tar.gz
+libchamplain-0.3.5.tar.gz


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libchamplain.spec	25 Jul 2009 05:26:19 -0000	1.5
+++ libchamplain.spec	2 Aug 2009 05:48:25 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.3.3
-Release:	2%{?dist}
+Version:	0.3.5
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
@@ -64,7 +64,8 @@ This package contains development files 
 %setup -q
 
 %build
-%configure --disable-static --enable-gtk --enable-gtk-doc
+%configure --disable-static --enable-gtk --enable-gtk-doc \
+  --enable-introspection=no
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -78,7 +79,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.3.so.1.0.0
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.2.0.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,11 +132,63 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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
+
+* 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
 
 * Sat Jul 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.3-1
 - Version bump to 0.3.3.
+  * Support for custom map sources and listing available map sources.
+  * Smooth movement to a new position. (GNOME Bugzilla #557641)
+  * Keep the center of the map in the center after a resize. (GNOME Bugzilla
+    #557642)
+  * Double click to zoom and center. (GNOME Bugzilla #557644)
+  * Added a way to know the maximum and minimum zoom level. (GNOME Bugzilla
+    #557965)
+  * Fixed unwanted wrap effect when panning at zoom level >= 8. (GNOME
+    Bugzilla #558020)
+  * Fixed center on and zooming in behavior. (GNOME Bugzilla #558026)
+  * Lack of user feedback during loading of tiles. (GNOME Bugzilla #559522)
+  * Added missing zoom level to OpenStreetMap Mapnik. (GNOME Bugzilla
+    #559446)
+  * Fixed wrong elastic effect affecting Emapthy's map view. (GNOME Bugzilla
+    #561700)
+  * Added disk cache management. (GNOME Bugzillla #568931)
+  * Host application should be able to limit the maximum and minimum zoom
+    levels. (GNOME Bugzilla #571702)
+  * Allow host applications to draw lines/routes on the map. (GNOME Bugzilla
+    #572377)
+  * Support proxies. (GNOME Bugzilla #573937)
+  * Provide a way to make visible a bunch of markers. (GNOME Bugzilla #574809)
+  * Do not allow negative zoom levels. (GNOME Bugzilla #575138)
+  * Fixed corrupted map when double-clicking at maximum level. (GNOME Bugzilla
+    #575139)
+  * Prevent ChamplainNetworkMapSource from crashing when setting "proxy-uri".
+    (GNOME Bugzilla #575902).
+  * Implemented advanced markers. (GNOME Bugzilla #576055)
+  * Various memory management fixes for ChamplainTile. (GNOME Bugzilla
+    #576159)
+  * Any go_to should stop a previous and not yet finished go_to. (GNOME
+    Bugzilla #576832)
+  * Prevent segmentation fault on 32 bit platforms. (GNOME Bugzilla #576698)
+  * Introduced a new signal called ChamplainView::animation-completed. (GNOME
+    Bugzilla #577169)
+  * Set decel-rate correctly. (GNOME Bugzilla #580785)
+  * champlain_network_map_source_fill_tile should be private. (GNOME Bugzilla
+    #582786)
+  * Fixed champlain_view_center_on. (GNOME Bugzilla #583502)
+  * Fixed "longitude" and "latitude" properties, which were reversed. (GNOME
+    Bugzilla #584365)
+  * Make the cache work the first time. (GNOME Bugzilla #584390)
+  * GNOME Goal: use accessor functions instead direct access. (GNOME Bugzilla
+    #585698)
 - Added 'BuildRequires: chrpath' for removing rpaths.
 
 * Wed Mar 18 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.2.9-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jul 2009 05:18:53 -0000	1.4
+++ sources	2 Aug 2009 05:48:25 -0000	1.5
@@ -1 +1 @@
-06f30890b86bf9fc4791fe9a4cb110e1  libchamplain-0.3.3.tar.gz
+66e486db1c087633a3f0ce6de4bd320d  libchamplain-0.3.5.tar.gz



From mclasen at fedoraproject.org  Sun Aug  2 06:06:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  2 Aug 2009 06:06:34 +0000 (UTC)
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.112,1.113
Message-ID: <20090802060634.4E32611C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2-engines.spec 
Log Message:
Drop explicit requires



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- gtk2-engines.spec	30 Jul 2009 00:27:26 -0000	1.112
+++ gtk2-engines.spec	2 Aug 2009 06:06:31 -0000	1.113
@@ -1,9 +1,7 @@
-%define gtk_version 2.12.0
-
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.18.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -12,9 +10,6 @@ Source:         http://download.gnome.or
 Conflicts:  	gnome-themes < 2.9.0
 Obsoletes:      gnome-theme-clearlooks <= 0.5
 
-Requires:       gtk2 >= %{gtk_version}
-# for /usr/lib/pkgconfig
-Requires:       pkgconfig
 BuildRequires:  gtk2-devel >= %{gtk_version}
 BuildRequires:  intltool
 BuildRequires:  gettext
@@ -81,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-4
+- Drop pkgconfig dep from the main package
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-3
 - Fix the build
 



From rhughes at fedoraproject.org  Sun Aug  2 08:11:56 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Sun,  2 Aug 2009 08:11:56 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel DeviceKit-power.spec,1.21,1.22
Message-ID: <20090802081156.C88AF11C004A@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	DeviceKit-power.spec 
Log Message:
* Sun Aug 02 2009 Richard Hughes <richard at hughsie.com> - 010-3
- Put the development include files in the devel packagem not the main package.
- Fixes #515104



Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- DeviceKit-power.spec	24 Jul 2009 15:07:34 -0000	1.21
+++ DeviceKit-power.spec	2 Aug 2009 08:11:54 -0000	1.22
@@ -9,7 +9,7 @@ Summary: Power Management Service
 Name: DeviceKit-power
 Version: 010
 #Release: 0.4.%{?alphatag}git%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/
@@ -85,8 +85,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/doc/%{name}-%{version}/README
 %doc %{_datadir}/doc/%{name}-%{version}/TODO
 %{_libdir}/libdevkit-power-gobject*.so.*
-%dir %{_includedir}/DeviceKit-power/devkit-power-gobject
-%{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 %{_sysconfdir}/dbus-1/system.d/*.conf
 /lib/udev/rules.d/*.rules
 %dir %{_localstatedir}/lib/DeviceKit-power
@@ -107,8 +105,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/devkit-power/*
 %{_libdir}/libdevkit-power-gobject*.so
 %{_libdir}/pkgconfig/*.pc
+%dir %{_includedir}/DeviceKit-power/devkit-power-gobject
+%{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Sun Aug 02 2009 Richard Hughes <richard at hughsie.com> - 010-3
+- Put the development include files in the devel packagem not the main package.
+- Fixes #515104
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 010-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jkratoch at fedoraproject.org  Sun Aug  2 08:15:20 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sun,  2 Aug 2009 08:15:20 +0000 (UTC)
Subject: rpms/gdb/F-11 gdb-python-gdbserver-tp-crash.patch, 1.1, 1.2 gdb.spec,
	1.359, 1.360
Message-ID: <20090802081520.DBB8611C004A@cvs1.fedora.phx.redhat.com>

Author: jkratoch

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

Modified Files:
	gdb-python-gdbserver-tp-crash.patch gdb.spec 
Log Message:
* Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-36
- Fix compilation error typo in the previous commit 6.8.50.20090302-35.


gdb-python-gdbserver-tp-crash.patch:
 frame.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: gdb-python-gdbserver-tp-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb-python-gdbserver-tp-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-python-gdbserver-tp-crash.patch	2 Aug 2009 03:18:56 -0000	1.1
+++ gdb-python-gdbserver-tp-crash.patch	2 Aug 2009 08:15:19 -0000	1.2
@@ -33,7 +33,7 @@ Executing on host: gcc ../../../gdb/test
 +      is_thread_state would assertion check here as
 +      remote_start_remote->add_inferior_silent->observer_notify_new_inferior is
 +      before remote_start_remote->add_thread_silent.  */
-+   if (find_thread_ptid (inferior_ptid) == NULL)
++   if (find_thread_pid (inferior_ptid) == NULL)
 +     return 0;
 + 
    /* If the current thread is executing, don't try to read from


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -p -r1.359 -r1.360
--- gdb.spec	2 Aug 2009 03:18:56 -0000	1.359
+++ gdb.spec	2 Aug 2009 08:15:19 -0000	1.360
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 35%{?_with_upstream:.upstream}%{?dist}
+Release: 36%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -870,6 +870,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-36
+- Fix compilation error typo in the previous commit 6.8.50.20090302-35.
+
 * Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-35
 - Fix crash running gdbserver (incompatibility with python).
 



From romal at fedoraproject.org  Sun Aug  2 10:03:33 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun,  2 Aug 2009 10:03:33 +0000 (UTC)
Subject: rpms/usb_modeswitch/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 usb_modeswitch.spec, 1.4, 1.5
Message-ID: <20090802100334.2A68E11C004A@cvs1.fedora.phx.redhat.com>

Author: romal

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 18:46:30 -0000	1.3
+++ .cvsignore	2 Aug 2009 10:03:31 -0000	1.4
@@ -1 +1 @@
-usb_modeswitch-0.9.6.tar.bz2
+usb_modeswitch.conf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 18:46:30 -0000	1.3
+++ sources	2 Aug 2009 10:03:31 -0000	1.4
@@ -1 +1 @@
-9f5b97b7b0113b0275c4953482f876c3  usb_modeswitch-0.9.6.tar.bz2
+afe56e4eba51417d7cfc1142c822a9ee  usb_modeswitch.conf


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/usb_modeswitch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- usb_modeswitch.spec	27 Jul 2009 06:38:59 -0000	1.4
+++ usb_modeswitch.spec	2 Aug 2009 10:03:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		usb_modeswitch
-Version:	0.9.6
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README*
 
 %changelog
+* Sun Aug 02 2009 Robert M. Albrecht <fedora at romal.de> 1.0.2-1
+* new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mbarnes at fedoraproject.org  Sun Aug  2 11:37:06 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun,  2 Aug 2009 11:37:06 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.63, 
	1.64
Message-ID: <20090802113706.A092B11C004A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6258

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Sun Aug 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.2-3.fc12
- Rebuild against newer libnautilus-burn.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnome-python2-desktop.spec	25 Jul 2009 00:45:01 -0000	1.63
+++ gnome-python2-desktop.spec	2 Aug 2009 11:37:05 -0000	1.64
@@ -29,7 +29,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.27.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -345,6 +345,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Aug 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.2-3.fc12
+- Rebuild against newer libnautilus-burn.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mbarnes at fedoraproject.org  Sun Aug  2 12:08:28 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun,  2 Aug 2009 12:08:28 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.64, 
	1.65
Message-ID: <20090802120828.21AAD11C004A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17228

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Sun Aug 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.2-3.fc12
- Disable nautilus-cd-burner bindings.  Package is dead.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-python2-desktop.spec	2 Aug 2009 11:37:05 -0000	1.64
+++ gnome-python2-desktop.spec	2 Aug 2009 12:08:27 -0000	1.65
@@ -67,10 +67,6 @@ BuildRequires: pygtk2-devel >= %{pygtk_v
 BuildRequires: python-devel
 BuildRequires: totem-pl-parser-devel >= %{totem_version}
 BuildRequires: autoconf, libtool
-%ifnarch s390 s390x
-BuildRequires: gnome-media-devel >= %{gnome_media_version}
-BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
-%endif
 
 %description
 The gnome-python-desktop package contains the source packages for additional 
@@ -179,18 +175,6 @@ Requires: libgtop2 >= %{libgtop_version}
 This module contains a wrapper that allows the use of libgtop via
 Python.
 
-%ifnarch s390 s390x
-%package -n gnome-python2-nautilus-cd-burner
-Summary: Python bindings for interacting with nautilus-cd-burner
-License: GPLv2+
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description -n gnome-python2-nautilus-cd-burner
-This module contains a wrapper that allows the use of nautilus-cd-burner
-via Python.
-%endif
-
 %package -n gnome-python2-metacity
 Summary: Python bindings for interacting with metacity
 License: GPLv2
@@ -316,14 +300,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtop.so
 
-%ifnarch s390 s390x
-%files -n gnome-python2-nautilus-cd-burner
-%defattr(-,root,root,-)
-%{python_sitearch}/gtk-2.0/nautilusburn.so
-%defattr(644,root,root,755)
-%doc ../gnome-python-desktop-%{version}/examples/nautilusburn/*
-%endif
-
 %files -n gnome-python2-metacity
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/metacity.so
@@ -346,7 +322,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Aug 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.2-3.fc12
-- Rebuild against newer libnautilus-burn.
+- Disable nautilus-cd-burner bindings.  Package is dead.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pkgdb at fedoraproject.org  Sun Aug  2 12:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:59:36 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested watchbugzilla
Message-ID: <20090802121122.8B1EE10F89E@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on gnome-applet-bubblemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:11:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:11:25 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested watchcommits
Message-ID: <20090802121125.53C9C10F8A9@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on gnome-applet-bubblemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:11:32 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested approveacls
Message-ID: <20090802121132.1CC7F10F8B5@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on gnome-applet-bubblemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:59:36 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested commit
Message-ID: <20090802121129.1066810F8B1@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on gnome-applet-bubblemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:59:36 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested watchbugzilla
Message-ID: <20090802121137.91D8210F8B6@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on gnome-applet-bubblemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:59:36 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested watchcommits
Message-ID: <20090802121140.232CA10F8B9@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on gnome-applet-bubblemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:11:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:11:41 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested commit
Message-ID: <20090802121141.EAC3410F8BC@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on gnome-applet-bubblemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From pkgdb at fedoraproject.org  Sun Aug  2 12:11:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:11:44 +0000
Subject: [pkgdb] gnome-applet-bubblemon: cwickert has requested approveacls
Message-ID: <20090802121144.56C3610F8BF@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on gnome-applet-bubblemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-bubblemon



From mbarnes at fedoraproject.org  Sun Aug  2 12:30:04 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun,  2 Aug 2009 12:30:04 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.65, 
	1.66
Message-ID: <20090802123004.C5BA611C04D1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25541

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
Removed one too many BRs...



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gnome-python2-desktop.spec	2 Aug 2009 12:08:27 -0000	1.65
+++ gnome-python2-desktop.spec	2 Aug 2009 12:30:04 -0000	1.66
@@ -12,7 +12,6 @@
 %define gtksourceview_version           1:1.8.5-2
 %define libwnck_version                 2.19.3
 %define libgtop_version                 2.13.0
-%define nautilus_cd_burner_version      2.15.3
 %define brasero_version                 0.9.0
 %define gnome_media_version             2.10.0
 %define gconf2_version                  2.10.0
@@ -67,6 +66,9 @@ BuildRequires: pygtk2-devel >= %{pygtk_v
 BuildRequires: python-devel
 BuildRequires: totem-pl-parser-devel >= %{totem_version}
 BuildRequires: autoconf, libtool
+%ifnarch s390 s390x
+BuildRequires: gnome-media-devel ?= %{gnome_media_version}
+%endif
 
 %description
 The gnome-python-desktop package contains the source packages for additional 



From mbarnes at fedoraproject.org  Sun Aug  2 12:30:47 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun,  2 Aug 2009 12:30:47 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.66, 
	1.67
Message-ID: <20090802123047.8025611C004A@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25933

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
Fix typo



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- gnome-python2-desktop.spec	2 Aug 2009 12:30:04 -0000	1.66
+++ gnome-python2-desktop.spec	2 Aug 2009 12:30:47 -0000	1.67
@@ -67,7 +67,7 @@ BuildRequires: python-devel
 BuildRequires: totem-pl-parser-devel >= %{totem_version}
 BuildRequires: autoconf, libtool
 %ifnarch s390 s390x
-BuildRequires: gnome-media-devel ?= %{gnome_media_version}
+BuildRequires: gnome-media-devel >= %{gnome_media_version}
 %endif
 
 %description



From rrankin at fedoraproject.org  Sun Aug  2 12:31:01 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  2 Aug 2009 12:31:01 +0000 (UTC)
Subject: rpms/gpsim/EL-5 gpsim.spec,1.15,1.16
Message-ID: <20090802123101.99FAB11C004A@cvs1.fedora.phx.redhat.com>

Author: rrankin

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

Modified Files:
	gpsim.spec 
Log Message:
Do all generation as aclocal in EL-5 diffent version from F-10



Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/gpsim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gpsim.spec	8 Jul 2009 21:14:31 -0000	1.15
+++ gpsim.spec	2 Aug 2009 12:31:01 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.23.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
@@ -8,10 +8,10 @@ Group:		Development/Debuggers
 License:	GPLv2+
 URL:		http://gpsim.sourceforge.net/gpsim.html
 Source:		http://downloads.sourceforge.net/gpsim/gpsim-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, %{_includedir}/popt.h
-BuildRequires:	autoconf
+BuildRequires:	autoconf libtool automake
 
 
 %description
@@ -50,6 +50,10 @@ mv ChangeLog ChangeLog.raw
 iconv -f ISO88592 -t UTF8  AUTHORS.raw -o  AUTHORS
 iconv -f ISO88592 -t UTF8  ChangeLog.raw -o ChangeLog
 rm -f AUTHORS.raw ChangeLog.raw 
+libtoolize --force
+aclocal
+autoheader
+automake --force-missing --add-missing
 autoconf
 
 %build
@@ -89,6 +93,9 @@ autoconf
 %{_includedir}/*
 
 %changelog
+* Sun Aug 02 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-6
+- fix EL-5 has different aclocal version
+
 * Tue Jul 07 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-5
 - work-around popt-devel isssue in build requires
 



From pkgdb at fedoraproject.org  Sun Aug  2 12:44:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:44:57 +0000
Subject: [pkgdb] python-utmp was added for tuju
Message-ID: <20090802124457.F34AE10F8A1@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-utmp with summary Python modules for umtp records
tibbs has approved Package python-utmp
tibbs has added a Fedora devel branch for python-utmp with an owner of tuju
tibbs has approved python-utmp in Fedora devel
tibbs has approved Package python-utmp
tibbs has set commit to Approved for 107427 on python-utmp (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-utmp (Fedora devel)
tibbs has set build to Approved for 107427 on python-utmp (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Aug  2 12:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:44:59 +0000
Subject: [pkgdb] python-utmp summary updated by tibbs
Message-ID: <20090802124459.E67FC10F8AC@bastion2.fedora.phx.redhat.com>

tibbs set package python-utmp summary to Python modules for umtp records

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



From pkgdb at fedoraproject.org  Sun Aug  2 12:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:44:59 +0000
Subject: [pkgdb] python-utmp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090802124459.F232910F8B2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for python-utmp
tibbs has set commit to Approved for 107427 on python-utmp (Fedora 11)
tibbs has set checkout to Approved for 107427 on python-utmp (Fedora 11)
tibbs has set build to Approved for 107427 on python-utmp (Fedora 11)

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



From pkgdb at fedoraproject.org  Sun Aug  2 12:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:44:59 +0000
Subject: [pkgdb] python-utmp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090802124500.01F6B10F8B5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for python-utmp
tibbs has set commit to Approved for 107427 on python-utmp (Fedora 10)
tibbs has set checkout to Approved for 107427 on python-utmp (Fedora 10)
tibbs has set build to Approved for 107427 on python-utmp (Fedora 10)

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



From tibbs at fedoraproject.org  Sun Aug  2 12:45:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 12:45:07 +0000 (UTC)
Subject: rpms/python-utmp/devel - New directory
Message-ID: <20090802124507.44AB311C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-utmp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH31158/rpms/python-utmp/devel

Log Message:
Directory /cvs/pkgs/rpms/python-utmp/devel added to the repository




From pkgdb at fedoraproject.org  Sun Aug  2 12:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:44:59 +0000
Subject: [pkgdb] python-utmp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090802124500.0FECD10F8B9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-utmp
tibbs has set commit to Approved for 107427 on python-utmp (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on python-utmp (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on python-utmp (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Aug  2 12:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 12:44:59 +0000
Subject: [pkgdb] python-utmp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090802124500.1EE4D10F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for python-utmp
tibbs has set commit to Approved for 107427 on python-utmp (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on python-utmp (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on python-utmp (Fedora EPEL 4)

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



From tibbs at fedoraproject.org  Sun Aug  2 12:45:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 12:45:07 +0000 (UTC)
Subject: rpms/python-utmp - New directory
Message-ID: <20090802124507.2603411C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-utmp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH31158/rpms/python-utmp

Log Message:
Directory /cvs/pkgs/rpms/python-utmp added to the repository




From tibbs at fedoraproject.org  Sun Aug  2 12:45:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 12:45:13 +0000 (UTC)
Subject: rpms/python-utmp Makefile,NONE,1.1
Message-ID: <20090802124513.6D88B11C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-utmp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH31158/rpms/python-utmp

Added Files:
	Makefile 
Log Message:
Setup of module python-utmp


--- NEW FILE Makefile ---
# Top level Makefile for module python-utmp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Sun Aug  2 12:45:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 12:45:13 +0000 (UTC)
Subject: rpms/python-utmp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090802124513.B37BD11C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-utmp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH31158/rpms/python-utmp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-utmp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-utmp
# $Id: Makefile,v 1.1 2009/08/02 12:45:13 tibbs Exp $
NAME := python-utmp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sun Aug  2 13:11:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  2 Aug 2009 13:11:48 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.192,1.193
Message-ID: <20090802131148.9A6EA11C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeutils.spec 
Log Message:
* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
- include epoch's in -libs-related Requires



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- kdeutils.spec	1 Aug 2009 23:18:00 -0000	1.192
+++ kdeutils.spec	2 Aug 2009 13:11:48 -0000	1.193
@@ -4,7 +4,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -49,7 +49,7 @@ Obsoletes: kdeutils-extras < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
 Obsoletes: kdeutils < 6:4.3.0-2
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description
 Utilities for the K Desktop Environment.
@@ -71,7 +71,7 @@ Includes:
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
@@ -215,11 +215,14 @@ fi
 
 
 %changelog
-* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-2
 - -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
 - %%check: desktop-file-validate
 
-* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 6:4.3.0-1
 - 4.3.0
 
 * Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1



From eseyman at fedoraproject.org  Sun Aug  2 13:16:05 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Sun,  2 Aug 2009 13:16:05 +0000 (UTC)
Subject: rpms/bugzilla/devel .cvsignore, 1.13, 1.14 bugzilla.spec, 1.28,
	1.29 sources, 1.13, 1.14
Message-ID: <20090802131605.9D99D11C004A@cvs1.fedora.phx.redhat.com>

Author: eseyman

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

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
Update to 3.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	31 Jul 2009 08:45:01 -0000	1.13
+++ .cvsignore	2 Aug 2009 13:16:05 -0000	1.14
@@ -1 +1 @@
-bugzilla-3.4.tar.gz
+bugzilla-3.4.1.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- bugzilla.spec	31 Jul 2009 08:45:01 -0000	1.28
+++ bugzilla.spec	2 Aug 2009 13:16:05 -0000	1.29
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.4
+Version: 3.4.1
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -95,7 +95,7 @@ cd %{bzinstallprefix}/bugzilla
 ./collectstats.pl
 EOM
 echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
-rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
+rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,UPGRADING,UPGRADING-pre-2.8}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
 cp %{SOURCE2} ./README.fedora
 mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
@@ -132,9 +132,6 @@ popd > /dev/null)
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
 %defattr(-,root,root,-)
 %doc README
-%doc QUICKSTART
-%doc UPGRADING
-%doc UPGRADING-pre-2.8
 %doc README.fedora
 %dir %{bzdatadir}
 %defattr(0750,root,apache,-)
@@ -156,7 +153,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
-* Wed Jul 29 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-1
+* Sun Aug 02 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.4.1-1
+- Update to 3.4.1, fixing a security leak
+
+* Wed Jul 29 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.4-1
 - Update to 3.4 (fixes #514315)
 - move makedocs.pl to its own package (fixes #509041)
 - move the extensions dir to /usr/share/ (fixes #450636)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	31 Jul 2009 08:45:01 -0000	1.13
+++ sources	2 Aug 2009 13:16:05 -0000	1.14
@@ -1 +1 @@
-15a681c445549d5913dfb54301ec58bb  bugzilla-3.4.tar.gz
+43e978463799a75e54c628d7e4c326b3  bugzilla-3.4.1.tar.gz



From rdieter at fedoraproject.org  Sun Aug  2 13:20:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  2 Aug 2009 13:20:54 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.89,1.90
Message-ID: <20090802132054.BD7E511C049D@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeaccessibility.spec 
Log Message:
* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
- include epoch's in -libs-related Requires



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kdeaccessibility.spec	1 Aug 2009 22:44:27 -0000	1.89
+++ kdeaccessibility.spec	2 Aug 2009 13:20:54 -0000	1.90
@@ -2,7 +2,7 @@ Summary:        K Desktop Environment - 
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -25,7 +25,7 @@ BuildRequires: plasma-devel >= %{version
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 # ktssd
 Requires: festival
 
@@ -47,7 +47,7 @@ Included with this package are:
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
@@ -143,11 +143,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
-* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-2
 - -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
 - %%check: desktop-file-validate
 
-* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 1:4.3.0-1
 - 4.3.0
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.98-2



From tomeu at fedoraproject.org  Sun Aug  2 13:27:28 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  2 Aug 2009 13:27:28 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.34, 1.35 sources, 1.38,
	1.39 sugar-toolkit.spec, 1.49, 1.50
Message-ID: <20090802132728.8D12E11C004A@cvs1.fedora.phx.redhat.com>

Author: tomeu

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

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	18 Jul 2009 14:01:51 -0000	1.34
+++ .cvsignore	2 Aug 2009 13:27:28 -0000	1.35
@@ -1 +1 @@
-sugar-toolkit-0.85.2.tar.bz2
+sugar-toolkit-0.85.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	18 Jul 2009 14:01:51 -0000	1.38
+++ sources	2 Aug 2009 13:27:28 -0000	1.39
@@ -1 +1 @@
-1fc0880d36a1678d2a526b93dfad5d4b  sugar-toolkit-0.85.2.tar.bz2
+fffae174aa4dad02ffd2e6a58567ae70  sugar-toolkit-0.85.3.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sugar-toolkit.spec	27 Jul 2009 05:05:27 -0000	1.49
+++ sugar-toolkit.spec	2 Aug 2009 13:27:28 -0000	1.50
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.85.2
-Release: 2%{?dist}
+Version: 0.85.3
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.85.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From till at fedoraproject.org  Sun Aug  2 13:30:15 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun,  2 Aug 2009 13:30:15 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.65,1.66
Message-ID: <20090802133015.35FAA11C04D1@cvs1.fedora.phx.redhat.com>

Author: till

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

Modified Files:
	comps-f12.xml.in 
Log Message:
add reconnaisance group for IT-security related reconnaisance tools



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- comps-f12.xml.in	1 Aug 2009 17:46:45 -0000	1.65
+++ comps-f12.xml.in	2 Aug 2009 13:30:12 -0000	1.66
@@ -4671,6 +4671,41 @@
     </packagelist>
   </group>
   <group>
+    <id>reconnaissance</id>
+    <_name>Reconnaissance tools</_name>
+    <_description>These tools can be used to perform IT security related reconnaissance.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+        <packagereq type="default">argus</packagereq>
+        <packagereq type="default">cgf</packagereq>
+        <packagereq type="default">dsniff</packagereq>
+        <packagereq type="default">etherape</packagereq>
+        <packagereq type="default">ettercap</packagereq>
+        <packagereq type="default">examiner</packagereq>
+        <packagereq type="default">firewalk</packagereq>
+        <packagereq type="default">halberd</packagereq>
+        <packagereq type="default">hping3</packagereq>
+        <packagereq type="default">hunt</packagereq>
+        <packagereq type="default">iptraf</packagereq>
+        <packagereq type="default">Lynis</packagereq>
+        <packagereq type="default">nbtscan</packagereq>
+        <packagereq type="default">nc6</packagereq>
+        <packagereq type="default">nc</packagereq>
+        <packagereq type="default">nessus</packagereq>
+        <packagereq type="default">nmap</packagereq>
+        <packagereq type="default">pcapdiff</packagereq>
+        <packagereq type="default">picviz</packagereq>
+        <packagereq type="default">scanssh</packagereq>
+        <packagereq type="default">socat</packagereq>
+        <packagereq type="default">tcpdump</packagereq>
+        <packagereq type="default">tcpxtract</packagereq>
+        <packagereq type="default">tiger</packagereq>
+        <packagereq type="default">wireshark</packagereq>
+        <packagereq type="default">xprobe2</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>romanian-support</id>
     <_name>Romanian Support</_name>
     <_description/>



From tomeu at fedoraproject.org  Sun Aug  2 13:30:21 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  2 Aug 2009 13:30:21 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.40, 1.41 sources, 1.42,
	1.43 sugar.spec, 1.65, 1.66
Message-ID: <20090802133021.41A2011C04D1@cvs1.fedora.phx.redhat.com>

Author: tomeu

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

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	18 Jul 2009 14:06:49 -0000	1.40
+++ .cvsignore	2 Aug 2009 13:30:21 -0000	1.41
@@ -1 +1 @@
-sugar-0.85.2.tar.bz2
+sugar-0.85.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	18 Jul 2009 14:06:49 -0000	1.42
+++ sources	2 Aug 2009 13:30:21 -0000	1.43
@@ -1 +1 @@
-12eaf1a2f02e8d03a5d3085c7ffea8b8  sugar-0.85.2.tar.bz2
+eda6c93cc9654676f284901ccbd86048  sugar-0.85.3.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sugar.spec	27 Jul 2009 04:58:32 -0000	1.65
+++ sugar.spec	2 Aug 2009 13:30:21 -0000	1.66
@@ -5,8 +5,8 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.85.2
-Release: 2%{?dist}
+Version: 0.85.3
+Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -140,6 +140,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.85.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From till at fedoraproject.org  Sun Aug  2 13:34:28 2009
From: till at fedoraproject.org (Till Maas)
Date: Sun,  2 Aug 2009 13:34:28 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.276,1.277
Message-ID: <20090802133428.B937A11C004A@cvs1.fedora.phx.redhat.com>

Author: till

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

Modified Files:
	comps-f11.xml.in 
Log Message:
add reconnaissance group for IT-security related reconnaissance tools



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- comps-f11.xml.in	1 Aug 2009 17:46:45 -0000	1.276
+++ comps-f11.xml.in	2 Aug 2009 13:34:28 -0000	1.277
@@ -4540,6 +4540,41 @@
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
+  <group>                                                         
+    <id>reconnaissance</id>                                       
+    <_name>Reconnaissance tools</_name>                           
+    <_description>These tools can be used to perform IT security related reconnaissance.</_description>
+    <default>false</default>                                                                           
+    <uservisible>false</uservisible>
+    <packagelist>
+        <packagereq type="default">argus</packagereq>
+        <packagereq type="default">cgf</packagereq>
+        <packagereq type="default">dsniff</packagereq>
+        <packagereq type="default">etherape</packagereq>
+        <packagereq type="default">ettercap</packagereq>
+        <packagereq type="default">examiner</packagereq>
+        <packagereq type="default">firewalk</packagereq>
+        <packagereq type="default">halberd</packagereq>
+        <packagereq type="default">hping3</packagereq>
+        <packagereq type="default">hunt</packagereq>
+        <packagereq type="default">iptraf</packagereq>
+        <packagereq type="default">Lynis</packagereq>
+        <packagereq type="default">nbtscan</packagereq>
+        <packagereq type="default">nc6</packagereq>
+        <packagereq type="default">nc</packagereq>
+        <packagereq type="default">nessus</packagereq>
+        <packagereq type="default">nmap</packagereq>
+        <packagereq type="default">pcapdiff</packagereq>
+        <packagereq type="default">picviz</packagereq>
+        <packagereq type="default">scanssh</packagereq>
+        <packagereq type="default">socat</packagereq>
+        <packagereq type="default">tcpdump</packagereq>
+        <packagereq type="default">tcpxtract</packagereq>
+        <packagereq type="default">tiger</packagereq>
+        <packagereq type="default">wireshark</packagereq>
+        <packagereq type="default">xprobe2</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>romanian-support</id>
     <_name>Romanian Support</_name>



From pkgdb at fedoraproject.org  Sun Aug  2 13:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:40:53 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested watchbugzilla
Message-ID: <20090802134053.D30AC10F8AD@bastion2.fedora.phx.redhat.com>

tomeu has requested the watchbugzilla acl on sugar-presence-service (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:40:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:40:58 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested approveacls
Message-ID: <20090802134059.0A4BF10F8B2@bastion2.fedora.phx.redhat.com>

tomeu has requested the approveacls acl on sugar-presence-service (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:41:00 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested commit
Message-ID: <20090802134100.1F61F10F8B8@bastion2.fedora.phx.redhat.com>

tomeu has requested the commit acl on sugar-presence-service (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:41:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:41:04 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested watchcommits
Message-ID: <20090802134104.9EAE110F8BD@bastion2.fedora.phx.redhat.com>

tomeu has requested the watchcommits acl on sugar-presence-service (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:41:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:41:28 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested watchbugzilla
Message-ID: <20090802134128.8823A10F8A2@bastion2.fedora.phx.redhat.com>

tomeu has requested the watchbugzilla acl on sugar-presence-service (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:41:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:41:29 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested watchcommits
Message-ID: <20090802134130.025EE10F8B4@bastion2.fedora.phx.redhat.com>

tomeu has requested the watchcommits acl on sugar-presence-service (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:41:30 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested commit
Message-ID: <20090802134130.E2AFB10F8BE@bastion2.fedora.phx.redhat.com>

tomeu has requested the commit acl on sugar-presence-service (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:41:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:41:33 +0000
Subject: [pkgdb] sugar-presence-service: tomeu has requested approveacls
Message-ID: <20090802134133.E5D2A10F8C3@bastion2.fedora.phx.redhat.com>

tomeu has requested the approveacls acl on sugar-presence-service (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:15 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134415.B35C110F8A1@bastion2.fedora.phx.redhat.com>

sdz has set the watchbugzilla acl on sugar-presence-service (Fedora devel) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:17 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134417.8374610F8B0@bastion2.fedora.phx.redhat.com>

sdz has set the watchcommits acl on sugar-presence-service (Fedora devel) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:20 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134420.702BB10F8B8@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar-presence-service (Fedora devel) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:23 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134423.7635E10F8BD@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar-presence-service (Fedora devel) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:33 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134434.0844C10F8BE@bastion2.fedora.phx.redhat.com>

sdz has set the watchbugzilla acl on sugar-presence-service (Fedora 10) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:35 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134435.406E710F8C1@bastion2.fedora.phx.redhat.com>

sdz has set the watchcommits acl on sugar-presence-service (Fedora 10) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:37 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134437.55EED10F8C5@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar-presence-service (Fedora 10) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:38 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134438.C607110F8CB@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar-presence-service (Fedora 10) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:45 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134445.2DAC810F8A9@bastion2.fedora.phx.redhat.com>

sdz has set the watchbugzilla acl on sugar-presence-service (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:45 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134445.E8B1510F8CF@bastion2.fedora.phx.redhat.com>

sdz has set the watchcommits acl on sugar-presence-service (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:47 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134448.0017710F8D4@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar-presence-service (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:48 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134449.19F2B10F8D8@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar-presence-service (Fedora 11) to Approved for erikos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:44:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:44:51 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134451.8CE2910F8B5@bastion2.fedora.phx.redhat.com>

sdz has set the watchbugzilla acl on sugar-presence-service (Fedora 11) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:45:04 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134504.C7B3510F8D9@bastion2.fedora.phx.redhat.com>

sdz has set the watchcommits acl on sugar-presence-service (Fedora 11) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:45:05 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134505.E9A0910F8DB@bastion2.fedora.phx.redhat.com>

sdz has set the commit acl on sugar-presence-service (Fedora 11) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From pkgdb at fedoraproject.org  Sun Aug  2 13:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 13:45:07 +0000
Subject: [pkgdb] sugar-presence-service had acl change status
Message-ID: <20090802134507.B726210F8E3@bastion2.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar-presence-service (Fedora 11) to Approved for tomeu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-presence-service



From tomeu at fedoraproject.org  Sun Aug  2 13:53:15 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  2 Aug 2009 13:53:15 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel .cvsignore, 1.13, 1.14 sources,
	1.13, 1.14 sugar-presence-service.spec, 1.20, 1.21
Message-ID: <20090802135315.D686211C004A@cvs1.fedora.phx.redhat.com>

Author: tomeu

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

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
* Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.1-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Mar 2009 08:20:04 -0000	1.13
+++ .cvsignore	2 Aug 2009 13:53:15 -0000	1.14
@@ -1 +1 @@
-sugar-presence-service-0.84.0.tar.bz2
+sugar-presence-service-0.85.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Mar 2009 08:20:04 -0000	1.13
+++ sources	2 Aug 2009 13:53:15 -0000	1.14
@@ -1 +1 @@
-bf292605b6c2d0ef3761a957acc8a95e  sugar-presence-service-0.84.0.tar.bz2
+aee749446558b88b8aef6b90d0985eb1  sugar-presence-service-0.85.1.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sugar-presence-service.spec	27 Jul 2009 05:04:03 -0000	1.20
+++ sugar-presence-service.spec	2 Aug 2009 13:53:15 -0000	1.21
@@ -1,6 +1,6 @@
 Name: sugar-presence-service
-Version: 0.84.0
-Release: 2%{?dist}
+Version: 0.85.1
+Release: 1%{?dist}
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.1-1
+- New upstream release.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.84.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From uwog at fedoraproject.org  Sun Aug  2 14:15:55 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sun,  2 Aug 2009 14:15:55 +0000 (UTC)
Subject: rpms/abiword/devel .cvsignore, 1.28, 1.29 abiword.spec, 1.89,
	1.90 sources, 1.28, 1.29 abiword-2.7.7-templates.patch, 1.1, NONE
Message-ID: <20090802141555.4B48311C004A@cvs1.fedora.phx.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.7.7-templates.patch 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	27 Jul 2009 14:45:58 -0000	1.28
+++ .cvsignore	2 Aug 2009 14:15:54 -0000	1.29
@@ -1,2 +1,2 @@
-abiword-2.7.7.tar.gz
-abiword-docs-2.7.7.tar.gz
+abiword-2.7.8.tar.gz
+abiword-docs-2.7.8.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- abiword.spec	27 Jul 2009 15:05:32 -0000	1.89
+++ abiword.spec	2 Aug 2009 14:15:54 -0000	1.90
@@ -1,13 +1,13 @@
 %define majorversion 2
 %define minorversion 7
-%define microversion 7
+%define microversion 8
 
 %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+
@@ -30,7 +30,6 @@ Patch0: abiword-2.6.0-windowshelppaths.p
 Patch1: abiword-2.7.6-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-Patch4: abiword-2.7.7-templates.patch
 %if %{olpc_build}
 Patch100: abiword-2.6.4-defaultfont.patch
 Patch101: abiword-2.6.4-draghandles.patch
@@ -85,7 +84,6 @@ Includes and definitions for developing 
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
 %endif
-%patch4 -p1 -b .templates
 %if %{olpc_build}
 %patch100 -p1 -b .defaultfont
 %patch101 -p1 -b .draghandles
@@ -181,6 +179,12 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sun Aug 02 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.8-1
+- New upstream version
+
+* Mon Jul 27 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.7-3
+- Rerun autogen.sh after changing the makefiles
+
 * Mon Jul 27 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.7-2
 - Add a patch to work around a templates makefile bug
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	27 Jul 2009 14:45:58 -0000	1.28
+++ sources	2 Aug 2009 14:15:54 -0000	1.29
@@ -1,2 +1,2 @@
-31acd0e4775925acd867842bb61a301f  abiword-2.7.7.tar.gz
-7ae7c45e74d9287010fb6b342393e43d  abiword-docs-2.7.7.tar.gz
+cf6df9b80015080c7b26cec10217917b  abiword-2.7.8.tar.gz
+a84537df3879bf09bf81d9e40dd3e5bd  abiword-docs-2.7.8.tar.gz


--- abiword-2.7.7-templates.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Aug  2 16:42:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  2 Aug 2009 16:42:54 +0000 (UTC)
Subject: rpms/rubygem-actionpack/devel .cvsignore, 1.8,
	1.9 rubygem-actionpack.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20090802164254.A4C0C11C02CB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16711/rubygem-actionpack/devel

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Log Message:
update to fix dependency breakage 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	16 Mar 2009 11:07:24 -0000	1.8
+++ .cvsignore	2 Aug 2009 16:42:54 -0000	1.9
@@ -1 +1 @@
-actionpack-2.3.2.gem
+actionpack-2.3.3.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/rubygem-actionpack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-actionpack.spec	27 Jul 2009 03:25:16 -0000	1.10
+++ rubygem-actionpack.spec	2 Aug 2009 16:42:54 -0000	1.11
@@ -6,8 +6,8 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.3.2
-Release: 2%{?dist}
+Version: 2.3.3
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -15,7 +15,12 @@ Source0: http://gems.rubyforge.org/gems/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
+Requires: rubygem(rack) >= 1.0.0
 BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(rack) >= 1.0.0
+BuildRequires(check): rubygem(mocha) >= 0.9.7
+BuildRequires(check): rubygem(activerecord) = %{version}
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -26,51 +31,74 @@ unit/integration testing that doesn't re
 
 
 %prep
-
-%build
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            -V \
             --force --rdoc %{SOURCE0}
 
 # Remove backup files
-find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+find ./%{geminstdir} -type f -name "*~" -delete
 
 # Delete zero-length files
-find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
 
 # Fix anything executable that does not have a shebang
-for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+for file in `find ./%{geminstdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
 done
 
 # Find files with a shebang that do not have executable permissions
-for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
 done
 
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}
+
+
 %clean
 rm -rf %{buildroot}
 
+%check
+pushd .%{geminstdir}
+
+# dependency loop
+mv test/controller/assert_select_test.rb \
+            test/controller/assert_select_test.rb.skip
+
+# ??? need checking
+: mv test/controller/caching_test.rb \
+            test/controller/caching_test.rb.skip
+
+# Still 6 tests fail, please someone investigate
+rake test --trace || :
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %doc %{geminstdir}/CHANGELOG
-%{geminstdir}/install.rb
+%doc %{geminstdir}/install.rb
 %{geminstdir}/lib
 %doc %{geminstdir}/MIT-LICENSE
 %{geminstdir}/Rakefile
 %doc %{geminstdir}/README
 %doc %{geminstdir}/RUNNING_UNIT_TESTS
-%{geminstdir}/test/
+%doc %{geminstdir}/test/
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-1
+- 2.3.3
+- Enable test (some tests fail, please someone investigate!!)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	16 Mar 2009 11:07:24 -0000	1.8
+++ sources	2 Aug 2009 16:42:54 -0000	1.9
@@ -1 +1 @@
-ba24f9f1d0272a76a885203f25d176b2  actionpack-2.3.2.gem
+7d60ee9499c04712ede6c747e5028390  actionpack-2.3.3.gem



From mtasaka at fedoraproject.org  Sun Aug  2 16:42:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  2 Aug 2009 16:42:54 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/devel .cvsignore, 1.8,
	1.9 rubygem-actionmailer.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20090802164254.A168511C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionmailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16711/rubygem-actionmailer/devel

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
update to fix dependency breakage 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	16 Mar 2009 10:58:22 -0000	1.8
+++ .cvsignore	2 Aug 2009 16:42:53 -0000	1.9
@@ -1 +1 @@
-actionmailer-2.3.2.gem
+actionmailer-2.3.3.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/devel/rubygem-actionmailer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-actionmailer.spec	27 Jul 2009 03:24:57 -0000	1.10
+++ rubygem-actionmailer.spec	2 Aug 2009 16:42:53 -0000	1.11
@@ -6,8 +6,8 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.3.2
-Release: 2%{?dist}
+Version: 2.3.3
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -16,6 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: rubygems
 Requires: rubygem(actionpack) = %{version}
 BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(actionpack) = %{version}
+BuildRequires(check): rubygem(mocha)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -24,31 +27,42 @@ Makes it trivial to test and deliver ema
 
 
 %prep
-
-%build
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            -V \
             --force --rdoc %{SOURCE0}
 
 # Remove backup files
-find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+find ./%{geminstdir} -type f -name "*~" -delete
 
 # Fix anything executable that does not have a shebang
-for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+for file in `find ./%{geminstdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
 done
 
 # Find files with a shebang that do not have executable permissions
-for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
 done
 
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+
 %clean
 rm -rf %{buildroot}
 
+%check
+export GEM_PATH=$(pwd)/%{gemdir}
+pushd .%{geminstdir}
+
+rake test --trace
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
@@ -65,6 +79,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-1
+- 2.3.3
+- Enable test
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	16 Mar 2009 10:58:22 -0000	1.8
+++ sources	2 Aug 2009 16:42:53 -0000	1.9
@@ -1 +1 @@
-422d6ec5d13c0c8a151e80b1024bd100  actionmailer-2.3.2.gem
+b8caa899e009e09d643e6105d977b165  actionmailer-2.3.3.gem



From mtasaka at fedoraproject.org  Sun Aug  2 16:45:25 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  2 Aug 2009 16:45:25 +0000 (UTC)
Subject: rpms/rubygem-actionpack/devel rubygem-actionpack.spec,1.11,1.12
Message-ID: <20090802164525.DC10811C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17301

Modified Files:
	rubygem-actionpack.spec 
Log Message:
Oops..


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionpack/devel/rubygem-actionpack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-actionpack.spec	2 Aug 2009 16:42:54 -0000	1.11
+++ rubygem-actionpack.spec	2 Aug 2009 16:45:25 -0000	1.12
@@ -72,7 +72,7 @@ mv test/controller/assert_select_test.rb
             test/controller/assert_select_test.rb.skip
 
 # ??? need checking
-: mv test/controller/caching_test.rb \
+mv test/controller/caching_test.rb \
             test/controller/caching_test.rb.skip
 
 # Still 6 tests fail, please someone investigate



From robert at fedoraproject.org  Sun Aug  2 16:53:11 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  2 Aug 2009 16:53:11 +0000 (UTC)
Subject: rpms/rubygem-mongrel_cluster/EL-5 mongrel_cluster.init, 1.1,
	1.2 rubygem-mongrel_cluster.spec, 1.1, 1.2
Message-ID: <20090802165311.BE41411C004A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-mongrel_cluster/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18966/EL-5

Modified Files:
	mongrel_cluster.init rubygem-mongrel_cluster.spec 
Log Message:
- Corrected a typo for output redirection in the initscript
- Removed the conditionalizing of ruby(abi) = version for EPEL



Index: mongrel_cluster.init
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/EL-5/mongrel_cluster.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mongrel_cluster.init	29 May 2009 19:14:40 -0000	1.1
+++ mongrel_cluster.init	2 Aug 2009 16:53:11 -0000	1.2
@@ -46,7 +46,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Starting $prog for $file: "
-	    $mongrel cluster::start -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::start -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -71,7 +71,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Stopping $prog for $file: "
-	    $mongrel cluster::stop -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::stop -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -116,7 +116,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Restarting $prog for $file: "
-	    $mongrel cluster::restart -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::restart -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo


Index: rubygem-mongrel_cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/EL-5/rubygem-mongrel_cluster.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-mongrel_cluster.spec	29 May 2009 19:14:40 -0000	1.1
+++ rubygem-mongrel_cluster.spec	2 Aug 2009 16:53:11 -0000	1.2
@@ -7,16 +7,13 @@
 Summary:           GemPlugin wrapper for the mongrel HTTP server
 Name:              rubygem-%{gemname}
 Version:           1.0.5
-Release:           2%{?dist}
+Release:           4%{?dist}
 License:           GPLv2 or Ruby
 Group:             System Environment/Daemons
 URL:               http://mongrel.rubyforge.org/wiki/MongrelCluster
 Source0:           http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Source1:           mongrel_cluster.init
-%if 0%{?rhel}%{?fedora} > 5
-Requires:          ruby(abi) = %{ruby_abiver}
-%endif
-Requires:          rubygems, rubygem(mongrel) >= 1.0.0
+Requires:          ruby(abi) = %{ruby_abiver}, rubygems, rubygem(mongrel) >= 1.0.0
 Requires(post):    /sbin/chkconfig
 Requires(preun):   /sbin/service, /sbin/chkconfig
 Requires(postun):  /sbin/service
@@ -87,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Aug 02 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-4
+- Corrected a typo for output redirection in the initscript
+- Removed the conditionalizing of ruby(abi) = version for EPEL
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 26 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-2
 - Added missing requirement to ruby(abi) = version (#501134 #c1)
 - Rewrote initscript to support single clusters and reload/subsys



From robert at fedoraproject.org  Sun Aug  2 16:53:11 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  2 Aug 2009 16:53:11 +0000 (UTC)
Subject: rpms/rubygem-mongrel_cluster/F-10 mongrel_cluster.init, 1.1,
	1.2 rubygem-mongrel_cluster.spec, 1.1, 1.2
Message-ID: <20090802165311.EA9F411C004A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-mongrel_cluster/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18966/F-10

Modified Files:
	mongrel_cluster.init rubygem-mongrel_cluster.spec 
Log Message:
- Corrected a typo for output redirection in the initscript
- Removed the conditionalizing of ruby(abi) = version for EPEL



Index: mongrel_cluster.init
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/F-10/mongrel_cluster.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mongrel_cluster.init	29 May 2009 19:14:41 -0000	1.1
+++ mongrel_cluster.init	2 Aug 2009 16:53:11 -0000	1.2
@@ -46,7 +46,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Starting $prog for $file: "
-	    $mongrel cluster::start -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::start -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -71,7 +71,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Stopping $prog for $file: "
-	    $mongrel cluster::stop -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::stop -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -116,7 +116,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Restarting $prog for $file: "
-	    $mongrel cluster::restart -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::restart -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo


Index: rubygem-mongrel_cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/F-10/rubygem-mongrel_cluster.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-mongrel_cluster.spec	29 May 2009 19:14:41 -0000	1.1
+++ rubygem-mongrel_cluster.spec	2 Aug 2009 16:53:11 -0000	1.2
@@ -7,16 +7,13 @@
 Summary:           GemPlugin wrapper for the mongrel HTTP server
 Name:              rubygem-%{gemname}
 Version:           1.0.5
-Release:           2%{?dist}
+Release:           4%{?dist}
 License:           GPLv2 or Ruby
 Group:             System Environment/Daemons
 URL:               http://mongrel.rubyforge.org/wiki/MongrelCluster
 Source0:           http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Source1:           mongrel_cluster.init
-%if 0%{?rhel}%{?fedora} > 5
-Requires:          ruby(abi) = %{ruby_abiver}
-%endif
-Requires:          rubygems, rubygem(mongrel) >= 1.0.0
+Requires:          ruby(abi) = %{ruby_abiver}, rubygems, rubygem(mongrel) >= 1.0.0
 Requires(post):    /sbin/chkconfig
 Requires(preun):   /sbin/service, /sbin/chkconfig
 Requires(postun):  /sbin/service
@@ -87,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Aug 02 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-4
+- Corrected a typo for output redirection in the initscript
+- Removed the conditionalizing of ruby(abi) = version for EPEL
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 26 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-2
 - Added missing requirement to ruby(abi) = version (#501134 #c1)
 - Rewrote initscript to support single clusters and reload/subsys



From robert at fedoraproject.org  Sun Aug  2 16:53:12 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  2 Aug 2009 16:53:12 +0000 (UTC)
Subject: rpms/rubygem-mongrel_cluster/devel mongrel_cluster.init, 1.1,
	1.2 rubygem-mongrel_cluster.spec, 1.2, 1.3
Message-ID: <20090802165312.62A5F11C004A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-mongrel_cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18966/devel

Modified Files:
	mongrel_cluster.init rubygem-mongrel_cluster.spec 
Log Message:
- Corrected a typo for output redirection in the initscript
- Removed the conditionalizing of ruby(abi) = version for EPEL



Index: mongrel_cluster.init
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/devel/mongrel_cluster.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mongrel_cluster.init	29 May 2009 19:14:42 -0000	1.1
+++ mongrel_cluster.init	2 Aug 2009 16:53:12 -0000	1.2
@@ -46,7 +46,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Starting $prog for $file: "
-	    $mongrel cluster::start -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::start -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -71,7 +71,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Stopping $prog for $file: "
-	    $mongrel cluster::stop -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::stop -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -116,7 +116,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Restarting $prog for $file: "
-	    $mongrel cluster::restart -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::restart -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo


Index: rubygem-mongrel_cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/devel/rubygem-mongrel_cluster.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-mongrel_cluster.spec	27 Jul 2009 03:33:29 -0000	1.2
+++ rubygem-mongrel_cluster.spec	2 Aug 2009 16:53:12 -0000	1.3
@@ -7,16 +7,13 @@
 Summary:           GemPlugin wrapper for the mongrel HTTP server
 Name:              rubygem-%{gemname}
 Version:           1.0.5
-Release:           3%{?dist}
+Release:           4%{?dist}
 License:           GPLv2 or Ruby
 Group:             System Environment/Daemons
 URL:               http://mongrel.rubyforge.org/wiki/MongrelCluster
 Source0:           http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Source1:           mongrel_cluster.init
-%if 0%{?rhel}%{?fedora} > 5
-Requires:          ruby(abi) = %{ruby_abiver}
-%endif
-Requires:          rubygems, rubygem(mongrel) >= 1.0.0
+Requires:          ruby(abi) = %{ruby_abiver}, rubygems, rubygem(mongrel) >= 1.0.0
 Requires(post):    /sbin/chkconfig
 Requires(preun):   /sbin/service, /sbin/chkconfig
 Requires(postun):  /sbin/service
@@ -87,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Aug 02 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-4
+- Corrected a typo for output redirection in the initscript
+- Removed the conditionalizing of ruby(abi) = version for EPEL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Sun Aug  2 16:53:12 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  2 Aug 2009 16:53:12 +0000 (UTC)
Subject: rpms/rubygem-mongrel_cluster/F-11 mongrel_cluster.init, 1.1,
	1.2 rubygem-mongrel_cluster.spec, 1.1, 1.2
Message-ID: <20090802165312.2F8EE11C004A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-mongrel_cluster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18966/F-11

Modified Files:
	mongrel_cluster.init rubygem-mongrel_cluster.spec 
Log Message:
- Corrected a typo for output redirection in the initscript
- Removed the conditionalizing of ruby(abi) = version for EPEL



Index: mongrel_cluster.init
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/F-11/mongrel_cluster.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mongrel_cluster.init	29 May 2009 19:14:41 -0000	1.1
+++ mongrel_cluster.init	2 Aug 2009 16:53:11 -0000	1.2
@@ -46,7 +46,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Starting $prog for $file: "
-	    $mongrel cluster::start -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::start -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -71,7 +71,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Stopping $prog for $file: "
-	    $mongrel cluster::stop -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::stop -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo
@@ -116,7 +116,7 @@ case "$1" in
 	  if [ -f $config ]; then
 	    file=`basename $config`
 	    echo -n $"Restarting $prog for $file: "
-	    $mongrel cluster::restart -C $config >> /dev/null 2&>1i
+	    $mongrel cluster::restart -C $config >> /dev/null 2>&1
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && echo_success || echo_failure
 	    echo


Index: rubygem-mongrel_cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mongrel_cluster/F-11/rubygem-mongrel_cluster.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-mongrel_cluster.spec	29 May 2009 19:14:41 -0000	1.1
+++ rubygem-mongrel_cluster.spec	2 Aug 2009 16:53:12 -0000	1.2
@@ -7,16 +7,13 @@
 Summary:           GemPlugin wrapper for the mongrel HTTP server
 Name:              rubygem-%{gemname}
 Version:           1.0.5
-Release:           2%{?dist}
+Release:           4%{?dist}
 License:           GPLv2 or Ruby
 Group:             System Environment/Daemons
 URL:               http://mongrel.rubyforge.org/wiki/MongrelCluster
 Source0:           http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 Source1:           mongrel_cluster.init
-%if 0%{?rhel}%{?fedora} > 5
-Requires:          ruby(abi) = %{ruby_abiver}
-%endif
-Requires:          rubygems, rubygem(mongrel) >= 1.0.0
+Requires:          ruby(abi) = %{ruby_abiver}, rubygems, rubygem(mongrel) >= 1.0.0
 Requires(post):    /sbin/chkconfig
 Requires(preun):   /sbin/service, /sbin/chkconfig
 Requires(postun):  /sbin/service
@@ -87,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Aug 02 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-4
+- Corrected a typo for output redirection in the initscript
+- Removed the conditionalizing of ruby(abi) = version for EPEL
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 26 2009 Robert Scheck <robert at fedoraproject.org> 1.0.5-2
 - Added missing requirement to ruby(abi) = version (#501134 #c1)
 - Rewrote initscript to support single clusters and reload/subsys



From pkgdb at fedoraproject.org  Sun Aug  2 16:55:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 16:55:18 +0000
Subject: [pkgdb] ruby-RMagick (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090802165518.4D45410F89E@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for ruby-RMagick
tibbs has set commit to Approved for 107427 on ruby-RMagick (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on ruby-RMagick (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on ruby-RMagick (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Aug  2 16:56:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 16:56:02 +0000
Subject: [pkgdb] ruby-RMagick (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090802165602.155F410F8A2@bastion2.fedora.phx.redhat.com>

tibbs changed owner of ruby-RMagick in Fedora EPEL 5 to robert

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



From robert at fedoraproject.org  Sun Aug  2 17:04:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  2 Aug 2009 17:04:29 +0000 (UTC)
Subject: rpms/ruby-RMagick/EL-5 .cvsignore, 1.21, 1.22 ruby-RMagick.spec,
	1.32, 1.33 sources, 1.21, 1.22
Message-ID: <20090802170429.E430311C004A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/ruby-RMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22093

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
Initial import of ruby-RMagick for EPEL 5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	27 Jun 2009 19:02:33 -0000	1.21
+++ .cvsignore	2 Aug 2009 17:04:29 -0000	1.22
@@ -1 +1 @@
-RMagick-2.10.0.tar.bz2
+RMagick-1.15.17.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/ruby-RMagick.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ruby-RMagick.spec	25 Jul 2009 07:17:53 -0000	1.32
+++ ruby-RMagick.spec	2 Aug 2009 17:04:29 -0000	1.33
@@ -1,50 +1,21 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %{!?ruby_sitearch:	%global ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
-%define		rubyabi		1.8
-
 %define		modname		RMagick
-%define		repoid		58959
-
-%define setIMver() \
-%if 0%{?fedora} == %1 \
-BuildRequires:	ImageMagick-devel = %2\
-Requires:		ImageMagick = %2\
-%endif \
-%{nil}
-
-%define		mainver		2.10.0
-%undefine		betaver		
-%define		fedorarel	2
-
+%define		repoid		47971
 
 Name:		ruby-%{modname}
-Version:	%{mainver}
-Release:	%{fedorarel}%{?betaver:.%betaver}%{?dist}
+Version:	1.15.17
+Release:	1%{?dist}
 Summary:	Graphics Processing for Ruby and Ruby on Rails
 Group:		Development/Languages
 
 License:	MIT
 URL:		http://rmagick.rubyforge.org/
-Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{modname}-%{mainver}%{?betaver:-%betaver}.tar.bz2
+Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{modname}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
-BuildRequires:	ruby(abi) = %{rubyabi}
-# libwmf <-> libwmf-lite split
-BuildRequires:	%{_bindir}/wmf2eps
-# For ImageMagick config/type.xml
-# And due to bug 500565 (i.e. test_Magick_version() in rmmain.c)
-BuildRequires:	ImageMagick-devel
-Requires:	ImageMagick
-
-%setIMver 12 6.5.3.7
-%setIMver 11 6.5.1.2
-%setIMver 10 6.4.0.10
-%setIMver  9 6.3.8.1
-
-Requires:	ruby(abi) = %{rubyabi}
+BuildRequires:	ruby, ruby-devel, ImageMagick-devel >= 6.0.0, libwmf
 Provides:	ruby(%{modname}) = %{version}-%{release}
 
 %description
@@ -55,141 +26,50 @@ ImageMagick and GraphicsMagick image pro
 Summary:	Documentation for %{name}
 Group:		Documentation
 
-%description	doc
+%description doc
 This package contains documentaton files for %{name}.
 
 %prep
 %setup -q -n %{modname}-%{version}
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export RUBYLIB=$(pwd)/ext/RMagick
-ruby setup.rb config \
-	--prefix=%{_prefix} \
-	--siteruby=%{ruby_sitelib} \
-	--siterubyverarch=%{ruby_sitearch} \
-	--doc-dir=$(pwd)/DOCDIR/HTML
-ruby setup.rb setup
+%configure --with-so-dir=%{ruby_sitearch} --with-site-ruby=%{ruby_sitelib} --disable-htmldoc
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__rm} -rf DOCDIR
-ruby setup.rb install \
-	--prefix=$RPM_BUILD_ROOT
-
-# Permission
-find $RPM_BUILD_ROOT -name \*.so | xargs %{__chmod} 0755
-
-# Fix up DOCDIR
-find DOCDIR -name .rmagick -or -name .examples | \
-	xargs %{__rm} -f
-
-%{__cp} -p ChangeLog DOCDIR/
-%{__sed} -e 's|ISO-8859-1|UTF-8|' README.html | \
-	iconv -f ISO-8859-1 -t UTF-8 > \
-	DOCDIR/README.html
-touch -r README.html DOCDIR/README.html
+rm -rf $RPM_BUILD_ROOT
+ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+
+# Correct wrong permissions
+chmod 755 $RPM_BUILD_ROOT%{ruby_sitearch}/%{modname}.so
+
+# Switch from non-UTF-8 to UTF-8
+sed -e 's at ISO-8859-1@UTF-8@' README.html | iconv -f iso-8859-1 -t utf-8 > README.html.iso
+touch -r README.html README.html.iso
+mv -f README.html.iso README.html
+
+# At the correct shebank to the example files
+for file in doc/ex/*.rb; do
+  sed -e 's@/\(usr/local\|home/software/ruby-1.6.8\)/bin/ruby@%{_bindir}/ruby at g' $file > $file.new
+  touch -r $file $file.new
+  mv -f $file.new $file
+done
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc DOCDIR/ChangeLog DOCDIR/README.html
-
+%doc ChangeLog README.html
 %{ruby_sitelib}/%{modname}.rb
 %{ruby_sitelib}/rvg/
-%{ruby_sitearch}/%{modname}2.so
+%{ruby_sitearch}/%{modname}.so
 
-%files	doc
+%files doc
 %defattr(-,root,root,-)
-%doc DOCDIR/HTML/*
+%doc doc/*
 
 %changelog
-* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-2
-- F-12: Mass rebuild
-
-* Sun Jun 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-1
-- 2.10.0
-
-* Wed Jun 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-3
-- F-12: Rebuild to create valid debuginfo rpm again (ref: bug 505774)
-
-* Tue Jun 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-2
-- F-12: Rebuild against new ImageMagick
-
-* Thu May 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-1
-- 2.9.2
-
-* Thu May 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.1-3
-- F-11: Rebuild against new ImageMagick
-- Make ImageMagick requirement very strict (bug 500565)
-
-* Mon Mar  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- F-11: Rebuild against new ImageMagick
-
-* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.1-2
-- %%global-ize "nested" macro
-
-* Thu Feb  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.1-1
-- 2.9.1
-
-* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
-- 2.9.0
-
-* Wed Dec 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-1
-- 2.8.0
-
-* Wed Nov 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.2-1
-- 2.7.2
-
-* Wed Nov  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.1-1
-- 2.7.1
-
-* Wed Oct  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.0-1
-- 2.7.0
-
-* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-1
-- 2.6.0
-
-* Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.2-1
-- 2.5.2
-
-* Sun Jun 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.1-1
-- 2.5.1
-
-* Thu Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
-- 2.5.0
-
-* Sun Jun  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-1
-- 2.4.0
-
-* Mon Apr 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-2
-- Rebuild against ImageMagick 6.4.0+ (F-10)
-- BR: libwmf (actually %%_bindir/wmf2eps) explicitly
-  ( related to bug 432651 )
-
-* Thu Apr  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1
-- 2.3.0
-
-* Mon Feb 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.2-1
-- 2.2.2
-
-* Sun Feb  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-1
-- 2.2.0
-
-* Fri Jan 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
-- 2.1.0
-
-* Fri Dec 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-3
-- 2.0.0
-- Workaround for ruby site bug related to static archive removal.
-
-* Sun Nov  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.beta5
-- 2.0.0 beta 5
-
-* Wed Oct  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.beta4
-- Spec file cleanup
-
-* Sat Sep 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.1.beta4
-- Initial packaging
+* Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.15.17-1
+- Upgrade to 1.15.17
+- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	27 Jun 2009 19:02:33 -0000	1.21
+++ sources	2 Aug 2009 17:04:29 -0000	1.22
@@ -1 +1 @@
-0f23af161c186a3ae316b759ea2c4f66  RMagick-2.10.0.tar.bz2
+138a9b92a80a1386b079bed7d7f7d878  RMagick-1.15.17.tar.bz2



From hubbitus at fedoraproject.org  Sun Aug  2 17:07:05 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  2 Aug 2009 17:07:05 +0000 (UTC)
Subject: rpms/js/devel js.spec,1.27,1.28
Message-ID: <20090802170705.253FE11C004A@cvs1.fedora.phx.redhat.com>

Author: hubbitus

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

Modified Files:
	js.spec 
Log Message:
By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc




Index: js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/js/devel/js.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- js.spec	25 Jul 2009 04:10:46 -0000	1.27
+++ js.spec	2 Aug 2009 17:07:04 -0000	1.28
@@ -1,29 +1,30 @@
 %define real_version 1.7.0
 
-Summary: JavaScript interpreter and libraries
-Name: js
-Version: 1.70
-Release: 7%{?dist}
+Summary:	JavaScript interpreter and libraries
+Name:	js
+Version:	1.70
+Release:	8%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
-License: GPLv2+ or LGPLv2+ or MPLv1.1
+License:	GPLv2+ or LGPLv2+ or MPLv1.1
 %else
-License: GPLv2+
+License:	GPLv2+
 %endif
-Group: Development/Languages
-URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
-Patch0: js-1.7.0-make.patch
-Patch1: js-shlib.patch
-Patch2: js-1.5-va_copy.patch
-Patch3: js-ldflags.patch
-Patch4: js-1.7.0-threadsafe.patch
-Patch5: js-1.60-ncurses.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: nspr-devel
-Buildrequires: readline-devel, ncurses-devel
-Provides: libjs = %{version}-%{release}
+Group:	Development/Languages
+URL:		http://www.mozilla.org/js/
+Source:	http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Patch0:	js-1.7.0-make.patch
+Patch1:	js-shlib.patch
+Patch2:	js-1.5-va_copy.patch
+Patch3:	js-ldflags.patch
+Patch4:	js-1.7.0-threadsafe.patch
+Patch5:	js-1.60-ncurses.patch
+Provides:	libjs = %{version}-%{release}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Buildrequires:	nspr-devel
+Buildrequires:	readline-devel, ncurses-devel
+
 
 %description
 JavaScript is the Netscape-developed object scripting language used in millions
@@ -63,42 +64,42 @@ includedir=%{_includedir}
 
 Name: libjs
 Description: JS library
-Requires:
+Requires: nspr
 Version: %{real_version}
 Libs: -L${libdir} -ljs
-Cflags: -I${includedir}
+Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}
 EOF
 
 
 %build
 export BUILD_OPT=1
 %{__make} %{?_smp_mflags} -C src -f Makefile.ref \
-    JS_THREADSAFE="1" \
-    XCFLAGS="%{optflags} -fPIC" \
-    BUILD_OPT="1" \
+	JS_THREADSAFE="1" \
+	XCFLAGS="%{optflags} -fPIC" \
+	BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-    JS_READLINE="1"
+	JS_READLINE="1"
 %endif
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_bindir} \
-             %{buildroot}%{_libdir}/pkgconfig \
-             %{buildroot}%{_includedir}
+	%{buildroot}%{_libdir}/pkgconfig \
+	%{buildroot}%{_includedir}
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
-    %{buildroot}%{_bindir}/
+	%{buildroot}%{_bindir}/
 %{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
 %{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
-    src/Linux_All_OPT.OBJ/jsautocfg.h \
-    %{buildroot}%{_includedir}/
+	src/Linux_All_OPT.OBJ/jsautocfg.h \
+	%{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
-    %{buildroot}%{_libdir}/pkgconfig/
+	%{buildroot}%{_libdir}/pkgconfig/
 
 
 %clean
@@ -128,6 +129,10 @@ export BUILD_OPT=1
 
 
 %changelog
+* Sun Aug 2 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.70-8
+- Reformat spec with tabs.
+- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Sun Aug  2 17:13:46 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  2 Aug 2009 17:13:46 +0000 (UTC)
Subject: rpms/ruby-RMagick/EL-5 ruby-RMagick.spec,1.33,1.34
Message-ID: <20090802171346.D9F9311C004A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/ruby-RMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24079

Modified Files:
	ruby-RMagick.spec 
Log Message:
- Added missing requirement to ruby(abi) = version (#514931 #c4)
- Added a fixed dependency for the ImageMagick version (#500565)



Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/ruby-RMagick.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ruby-RMagick.spec	2 Aug 2009 17:04:29 -0000	1.33
+++ ruby-RMagick.spec	2 Aug 2009 17:13:46 -0000	1.34
@@ -1,12 +1,13 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %{!?ruby_sitearch:	%global ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
+%{!?ruby_abiver:	%global ruby_abiver	%((echo "1.8"; ruby -rrbconfig -e "puts Config::CONFIG['ruby_version']" 2>/dev/null) | tail -1)}
 
 %define		modname		RMagick
 %define		repoid		47971
 
 Name:		ruby-%{modname}
 Version:	1.15.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Graphics Processing for Ruby and Ruby on Rails
 Group:		Development/Languages
 
@@ -15,7 +16,8 @@ URL:		http://rmagick.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{modname}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ruby, ruby-devel, ImageMagick-devel >= 6.0.0, libwmf
+Requires:	ruby(abi) = %{ruby_abiver}, ImageMagick = 6.2.8.0
+BuildRequires:	ruby, ruby-devel, ImageMagick-devel >= 6.0.0
 Provides:	ruby(%{modname}) = %{version}-%{release}
 
 %description
@@ -70,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 
 %changelog
+* Sun Aug 02 2009 Robert Scheck <robert at fedoraproject.org> 1.15.17-2
+- Added missing requirement to ruby(abi) = version (#514931 #c4)
+- Added a fixed dependency for the ImageMagick version (#500565)
+
 * Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.15.17-1
 - Upgrade to 1.15.17
 - Initial spec file for Fedora and Red Hat Enterprise Linux



From uwog at fedoraproject.org  Sun Aug  2 17:21:32 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sun,  2 Aug 2009 17:21:32 +0000 (UTC)
Subject: rpms/pyabiword/devel .cvsignore, 1.5, 1.6 pyabiword.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090802172132.F0D0111C004A@cvs1.fedora.phx.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore pyabiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Jul 2009 01:28:21 -0000	1.5
+++ .cvsignore	2 Aug 2009 17:21:32 -0000	1.6
@@ -1 +1 @@
-pyabiword-0.7.6.tar.gz
+pyabiword-0.7.8.tar.gz


Index: pyabiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/devel/pyabiword.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pyabiword.spec	26 Jul 2009 19:44:17 -0000	1.7
+++ pyabiword.spec	2 Aug 2009 17:21:32 -0000	1.8
@@ -1,14 +1,11 @@
 %{!?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.7.6
 
 Summary: Python bindings for libabiword
 Name: pyabiword
-Version: 0.7.6
-Release: 2%{?dist}
+Version: 0.7.8
+Release: 1%{?dist}
 Source0: pyabiword-%{version}.tar.gz
 URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz
 License: GPL+
@@ -65,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/pyabiword.defs
 
 %changelog
+* Sun Aug 02 2009 Marc Maurer <uwog at uwog.net> - 0.7.8-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Jul 2009 01:28:21 -0000	1.5
+++ sources	2 Aug 2009 17:21:32 -0000	1.6
@@ -1 +1 @@
-3df7f61d2d6587126e8504a12b249245  pyabiword-0.7.6.tar.gz
+bf51daf144f1b123a671c9baaa50b96c  pyabiword-0.7.8.tar.gz



From hubbitus at fedoraproject.org  Sun Aug  2 17:23:51 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  2 Aug 2009 17:23:51 +0000 (UTC)
Subject: rpms/js/F-10 js.spec,1.22,1.23
Message-ID: <20090802172351.B86F611C004A@cvs1.fedora.phx.redhat.com>

Author: hubbitus

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

Modified Files:
	js.spec 
Log Message:
By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc




Index: js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/js/F-10/js.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- js.spec	4 Jun 2008 16:16:26 -0000	1.22
+++ js.spec	2 Aug 2009 17:23:51 -0000	1.23
@@ -1,34 +1,36 @@
 %define real_version 1.7.0
 
-Summary: JavaScript interpreter and libraries
-Name: js
-Version: 1.70
-Release: 3%{?dist}
+Summary:	JavaScript interpreter and libraries
+Name:	js
+Version:	1.70
+Release:	8%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
-License: GPLv2+ or LGPLv2+ or MPLv1.1
+License:	GPLv2+ or LGPLv2+ or MPLv1.1
 %else
-License: GPLv2+
+License:	GPLv2+
 %endif
-Group: Development/Languages
-URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
-Patch0: js-1.7.0-make.patch
-Patch1: js-shlib.patch
-Patch2: js-1.5-va_copy.patch
-Patch3: js-ldflags.patch
-Patch4: js-1.7.0-threadsafe.patch
-Patch5: js-1.60-ncurses.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: nspr-devel
-Buildrequires: readline-devel, ncurses-devel
-Provides: libjs = %{version}-%{release}
+Group:	Development/Languages
+URL:		http://www.mozilla.org/js/
+Source:	http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Patch0:	js-1.7.0-make.patch
+Patch1:	js-shlib.patch
+Patch2:	js-1.5-va_copy.patch
+Patch3:	js-ldflags.patch
+Patch4:	js-1.7.0-threadsafe.patch
+Patch5:	js-1.60-ncurses.patch
+Provides:	libjs = %{version}-%{release}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Buildrequires:	nspr-devel
+Buildrequires:	readline-devel, ncurses-devel
+
 
 %description
-JavaScript is the Netscape-developed object scripting languages.
-This package has been created for purposes of Sablotron and is suitable
-for embedding in applications.
+JavaScript is the Netscape-developed object scripting language used in millions
+of web pages and server applications worldwide. Netscape's JavaScript is a
+superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
+with only mild differences from the published standard.
 
 
 %package devel
@@ -62,42 +64,42 @@ includedir=%{_includedir}
 
 Name: libjs
 Description: JS library
-Requires:
+Requires: nspr
 Version: %{real_version}
 Libs: -L${libdir} -ljs
-Cflags: -I${includedir}
+Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}
 EOF
 
 
 %build
 export BUILD_OPT=1
 %{__make} %{?_smp_mflags} -C src -f Makefile.ref \
-    JS_THREADSAFE="1" \
-    XCFLAGS="%{optflags} -fPIC" \
-    BUILD_OPT="1" \
+	JS_THREADSAFE="1" \
+	XCFLAGS="%{optflags} -fPIC" \
+	BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-    JS_READLINE="1"
+	JS_READLINE="1"
 %endif
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_bindir} \
-             %{buildroot}%{_libdir}/pkgconfig \
-             %{buildroot}%{_includedir}
+	%{buildroot}%{_libdir}/pkgconfig \
+	%{buildroot}%{_includedir}
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
-    %{buildroot}%{_bindir}/
+	%{buildroot}%{_bindir}/
 %{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
 %{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
-    src/Linux_All_OPT.OBJ/jsautocfg.h \
-    %{buildroot}%{_includedir}/
+	src/Linux_All_OPT.OBJ/jsautocfg.h \
+	%{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
-    %{buildroot}%{_libdir}/pkgconfig/
+	%{buildroot}%{_libdir}/pkgconfig/
 
 
 %clean
@@ -127,6 +129,22 @@ export BUILD_OPT=1
 
 
 %changelog
+* Sun Aug 2 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.70-8
+- Reformat spec with tabs.
+- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 29 2009 Dan Horak <dan[at]danny.cz> 1.70-6
+- update the va_copy patch for s390x
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.70-5
+- Update description (#487903).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jun  4 2008 Jon McCann <jmccann at redhat.com> - 1.70-3
 - Add two missing files (#449715)
 



From hubbitus at fedoraproject.org  Sun Aug  2 17:30:26 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  2 Aug 2009 17:30:26 +0000 (UTC)
Subject: rpms/js/F-11 js.spec,1.26,1.27
Message-ID: <20090802173026.B4B8F11C0381@cvs1.fedora.phx.redhat.com>

Author: hubbitus

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

Modified Files:
	js.spec 
Log Message:
-m


Index: js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/js/F-11/js.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- js.spec	29 May 2009 11:12:25 -0000	1.26
+++ js.spec	2 Aug 2009 17:30:26 -0000	1.27
@@ -1,29 +1,30 @@
 %define real_version 1.7.0
 
-Summary: JavaScript interpreter and libraries
-Name: js
-Version: 1.70
-Release: 6%{?dist}
+Summary:	JavaScript interpreter and libraries
+Name:	js
+Version:	1.70
+Release:	8%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
-License: GPLv2+ or LGPLv2+ or MPLv1.1
+License:	GPLv2+ or LGPLv2+ or MPLv1.1
 %else
-License: GPLv2+
+License:	GPLv2+
 %endif
-Group: Development/Languages
-URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
-Patch0: js-1.7.0-make.patch
-Patch1: js-shlib.patch
-Patch2: js-1.5-va_copy.patch
-Patch3: js-ldflags.patch
-Patch4: js-1.7.0-threadsafe.patch
-Patch5: js-1.60-ncurses.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: nspr-devel
-Buildrequires: readline-devel, ncurses-devel
-Provides: libjs = %{version}-%{release}
+Group:	Development/Languages
+URL:		http://www.mozilla.org/js/
+Source:	http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Patch0:	js-1.7.0-make.patch
+Patch1:	js-shlib.patch
+Patch2:	js-1.5-va_copy.patch
+Patch3:	js-ldflags.patch
+Patch4:	js-1.7.0-threadsafe.patch
+Patch5:	js-1.60-ncurses.patch
+Provides:	libjs = %{version}-%{release}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Buildrequires:	nspr-devel
+Buildrequires:	readline-devel, ncurses-devel
+
 
 %description
 JavaScript is the Netscape-developed object scripting language used in millions
@@ -63,42 +64,42 @@ includedir=%{_includedir}
 
 Name: libjs
 Description: JS library
-Requires:
+Requires: nspr
 Version: %{real_version}
 Libs: -L${libdir} -ljs
-Cflags: -I${includedir}
+Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}
 EOF
 
 
 %build
 export BUILD_OPT=1
 %{__make} %{?_smp_mflags} -C src -f Makefile.ref \
-    JS_THREADSAFE="1" \
-    XCFLAGS="%{optflags} -fPIC" \
-    BUILD_OPT="1" \
+	JS_THREADSAFE="1" \
+	XCFLAGS="%{optflags} -fPIC" \
+	BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-    JS_READLINE="1"
+	JS_READLINE="1"
 %endif
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_bindir} \
-             %{buildroot}%{_libdir}/pkgconfig \
-             %{buildroot}%{_includedir}
+	%{buildroot}%{_libdir}/pkgconfig \
+	%{buildroot}%{_includedir}
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
-    %{buildroot}%{_bindir}/
+	%{buildroot}%{_bindir}/
 %{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
 %{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
-    src/Linux_All_OPT.OBJ/jsautocfg.h \
-    %{buildroot}%{_includedir}/
+	src/Linux_All_OPT.OBJ/jsautocfg.h \
+	%{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
-    %{buildroot}%{_libdir}/pkgconfig/
+	%{buildroot}%{_libdir}/pkgconfig/
 
 
 %clean
@@ -128,6 +129,13 @@ export BUILD_OPT=1
 
 
 %changelog
+* Sun Aug 2 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.70-8
+- Reformat spec with tabs.
+- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 29 2009 Dan Horak <dan[at]danny.cz> 1.70-6
 - update the va_copy patch for s390x
 



From pkgdb at fedoraproject.org  Sun Aug  2 17:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 17:59:32 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested commit
Message-ID: <20090802175932.B4FC410F89F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-quick (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 17:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 17:59:50 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested watchbugzilla
Message-ID: <20090802175950.7A33B10F8AC@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-quick (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 17:59:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 17:59:46 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested watchcommits
Message-ID: <20090802175946.F3B5110F886@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-quick (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 17:59:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 17:59:52 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested approveacls
Message-ID: <20090802175952.A9C6210F8B0@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-quick (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:08 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested watchcommits
Message-ID: <20090802180008.D986C10F8AC@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-quick (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:07 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested watchbugzilla
Message-ID: <20090802180007.B52D910F8B5@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-quick (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:10 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested commit
Message-ID: <20090802180010.C6FBB10F8AF@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-quick (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:12 +0000
Subject: [pkgdb] ibus-table-quick: liangsuilong has requested approveacls
Message-ID: <20090802180012.9486410F8BA@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-quick (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:49 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested watchcommits
Message-ID: <20090802180049.E644410F8AC@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-cangjie (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:47 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested watchbugzilla
Message-ID: <20090802180047.7985210F8A2@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-cangjie (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:52 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested commit
Message-ID: <20090802180052.3156710F8B5@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-cangjie (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:54 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested approveacls
Message-ID: <20090802180055.020C110F8B1@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-cangjie (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:00:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:00:59 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested watchbugzilla
Message-ID: <20090802180059.A69C510F8B9@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-cangjie (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:02 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested watchcommits
Message-ID: <20090802180102.294C410F8BB@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-cangjie (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:04 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested commit
Message-ID: <20090802180104.9AACA10F8AC@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-cangjie (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:06 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested approveacls
Message-ID: <20090802180106.EDFF310F8A2@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-cangjie (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:12 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested watchbugzilla
Message-ID: <20090802180112.5A8E410F8C2@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-cangjie (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:15 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested watchcommits
Message-ID: <20090802180115.D083610F8AF@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-cangjie (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:18 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested commit
Message-ID: <20090802180118.9D1E510F8B0@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-cangjie (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Sun Aug  2 18:01:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 18:01:21 +0000
Subject: [pkgdb] ibus-table-cangjie: liangsuilong has requested approveacls
Message-ID: <20090802180121.4252A10F8C7@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-cangjie (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From hubbitus at fedoraproject.org  Sun Aug  2 18:18:02 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  2 Aug 2009 18:18:02 +0000 (UTC)
Subject: rpms/js/EL-5 js.spec,1.15,1.16
Message-ID: <20090802181802.8FD5211C004A@cvs1.fedora.phx.redhat.com>

Author: hubbitus

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

Modified Files:
	js.spec 
Log Message:
-m


Index: js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/js/EL-5/js.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- js.spec	27 Jan 2009 23:54:35 -0000	1.15
+++ js.spec	2 Aug 2009 18:18:02 -0000	1.16
@@ -1,34 +1,36 @@
 %define real_version 1.7.0
 
-Summary: JavaScript interpreter and libraries
-Name: js
-Version: 1.70
-Release: 3%{?dist}
+Summary:	JavaScript interpreter and libraries
+Name:	js
+Version:	1.70
+Release:	8%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
-License: GPLv2+ or LGPLv2+ or MPLv1.1
+License:	GPLv2+ or LGPLv2+ or MPLv1.1
 %else
-License: GPLv2+
+License:	GPLv2+
 %endif
-Group: Development/Languages
-URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
-Patch0: js-1.7.0-make.patch
-Patch1: js-shlib.patch
-Patch2: js-1.5-va_copy.patch
-Patch3: js-ldflags.patch
-Patch4: js-1.7.0-threadsafe.patch
-Patch5: js-1.60-ncurses.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: nspr-devel
-Buildrequires: readline-devel, ncurses-devel
-Provides: libjs = %{version}-%{release}
+Group:	Development/Languages
+URL:		http://www.mozilla.org/js/
+Source:	http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Patch0:	js-1.7.0-make.patch
+Patch1:	js-shlib.patch
+Patch2:	js-1.5-va_copy.patch
+Patch3:	js-ldflags.patch
+Patch4:	js-1.7.0-threadsafe.patch
+Patch5:	js-1.60-ncurses.patch
+Provides:	libjs = %{version}-%{release}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Buildrequires:	nspr-devel
+Buildrequires:	readline-devel, ncurses-devel
+
 
 %description
-JavaScript is the Netscape-developed object scripting languages.
-This package has been created for purposes of Sablotron and is suitable
-for embedding in applications.
+JavaScript is the Netscape-developed object scripting language used in millions
+of web pages and server applications worldwide. Netscape's JavaScript is a
+superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
+with only mild differences from the published standard.
 
 
 %package devel
@@ -62,42 +64,42 @@ includedir=%{_includedir}
 
 Name: libjs
 Description: JS library
-Requires:
+Requires: nspr
 Version: %{real_version}
 Libs: -L${libdir} -ljs
-Cflags: -I${includedir}
+Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}
 EOF
 
 
 %build
 export BUILD_OPT=1
 %{__make} %{?_smp_mflags} -C src -f Makefile.ref \
-    JS_THREADSAFE="1" \
-    XCFLAGS="%{optflags} -fPIC" \
-    BUILD_OPT="1" \
+	JS_THREADSAFE="1" \
+	XCFLAGS="%{optflags} -fPIC" \
+	BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-    JS_READLINE="1"
+	JS_READLINE="1"
 %endif
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_bindir} \
-             %{buildroot}%{_libdir}/pkgconfig \
-             %{buildroot}%{_includedir}
+	%{buildroot}%{_libdir}/pkgconfig \
+	%{buildroot}%{_includedir}
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
-    %{buildroot}%{_bindir}/
+	%{buildroot}%{_bindir}/
 %{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
-    %{buildroot}%{_libdir}/
+	%{buildroot}%{_libdir}/
 %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
 %{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
-    src/Linux_All_OPT.OBJ/jsautocfg.h \
-    %{buildroot}%{_includedir}/
+	src/Linux_All_OPT.OBJ/jsautocfg.h \
+	%{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
-    %{buildroot}%{_libdir}/pkgconfig/
+	%{buildroot}%{_libdir}/pkgconfig/
 
 
 %clean
@@ -127,6 +129,22 @@ export BUILD_OPT=1
 
 
 %changelog
+* Sun Aug 2 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.70-8
+- Reformat spec with tabs.
+- By report of Thomas Sondergaard (BZ#511162) Add -DXP_UNIX=1 -DJS_THREADSAFE=1 flags and nspr requires into libjs.pc
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.70-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 29 2009 Dan Horak <dan[at]danny.cz> 1.70-6
+- update the va_copy patch for s390x
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.70-5
+- Update description (#487903).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jun  4 2008 Jon McCann <jmccann at redhat.com> - 1.70-3
 - Add two missing files (#449715)
 



From mtasaka at fedoraproject.org  Sun Aug  2 18:25:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  2 Aug 2009 18:25:56 +0000 (UTC)
Subject: rpms/mfiler2/F-10 mfiler2.spec,1.19,1.20 sources,1.19,1.20
Message-ID: <20090802182556.08EB611C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	mfiler2.spec sources 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-5.Repack1
- 4.0.9b maintenance release



Index: mfiler2.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/F-10/mfiler2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mfiler2.spec	29 Aug 2008 01:58:53 -0000	1.19
+++ mfiler2.spec	2 Aug 2009 18:25:55 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:		mfiler2
 Version:	4.0.9b
-Release:	2%{?dist}
+Release:	5%{?dist}.Repack1
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -99,6 +99,15 @@ This package supports drag and drop usag
 
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-5.Repack1
+- 4.0.9b maintenance release
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-4
+- F-12: Mass rebuild
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-3
+- F-11: Mass rebuild
+
 * Fri Aug 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-2
 - Fuzz up
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	3 Mar 2008 11:39:04 -0000	1.19
+++ sources	2 Aug 2009 18:25:55 -0000	1.20
@@ -1 +1 @@
-15a9ac47fe011779f3075699e53b4211  mfiler2-4.0.9b.tgz
+e9ec5fff7b94f585f11ffd182d3d4f60  mfiler2-4.0.9b.tgz



From mtasaka at fedoraproject.org  Sun Aug  2 18:25:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  2 Aug 2009 18:25:56 +0000 (UTC)
Subject: rpms/mfiler2/F-11 mfiler2.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <20090802182556.2CDF511C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	mfiler2.spec sources 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-5.Repack1
- 4.0.9b maintenance release



Index: mfiler2.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/F-11/mfiler2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mfiler2.spec	24 Feb 2009 04:00:47 -0000	1.20
+++ mfiler2.spec	2 Aug 2009 18:25:56 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:		mfiler2
 Version:	4.0.9b
-Release:	3%{?dist}
+Release:	5%{?dist}.Repack1
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -99,6 +99,12 @@ This package supports drag and drop usag
 
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-5.Repack1
+- 4.0.9b maintenance release
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-4
+- F-12: Mass rebuild
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-3
 - F-11: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	3 Mar 2008 11:39:04 -0000	1.19
+++ sources	2 Aug 2009 18:25:56 -0000	1.20
@@ -1 +1 @@
-15a9ac47fe011779f3075699e53b4211  mfiler2-4.0.9b.tgz
+e9ec5fff7b94f585f11ffd182d3d4f60  mfiler2-4.0.9b.tgz



From mtasaka at fedoraproject.org  Sun Aug  2 18:25:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  2 Aug 2009 18:25:56 +0000 (UTC)
Subject: rpms/mfiler2/devel mfiler2.spec,1.21,1.22 sources,1.19,1.20
Message-ID: <20090802182556.62CE311C004A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	mfiler2.spec sources 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-5.Repack1
- 4.0.9b maintenance release



Index: mfiler2.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/devel/mfiler2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mfiler2.spec	24 Jul 2009 18:36:26 -0000	1.21
+++ mfiler2.spec	2 Aug 2009 18:25:56 -0000	1.22
@@ -6,7 +6,7 @@
 
 Name:		mfiler2
 Version:	4.0.9b
-Release:	4%{?dist}
+Release:	5%{?dist}.Repack1
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
@@ -99,6 +99,9 @@ This package supports drag and drop usag
 
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-5.Repack1
+- 4.0.9b maintenance release
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.9b-4
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	3 Mar 2008 11:39:04 -0000	1.19
+++ sources	2 Aug 2009 18:25:56 -0000	1.20
@@ -1 +1 @@
-15a9ac47fe011779f3075699e53b4211  mfiler2-4.0.9b.tgz
+e9ec5fff7b94f585f11ffd182d3d4f60  mfiler2-4.0.9b.tgz



From lucilanga at fedoraproject.org  Sun Aug  2 19:04:26 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  2 Aug 2009 19:04:26 +0000 (UTC)
Subject: rpms/gaupol/devel gaupol.spec,1.6,1.7
Message-ID: <20090802190426.5ECA111C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	gaupol.spec 
Log Message:
* Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-3
- do not remove required file (b.g.o #590537)


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/gaupol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gaupol.spec	24 Jul 2009 23:32:14 -0000	1.6
+++ gaupol.spec	2 Aug 2009 19:04:26 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
 Version:	0.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
@@ -41,8 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
 $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-#not entirely sure this is needed, keeping rpmlint happy
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/headers/microdvd
 
 
 
@@ -64,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-3
+- do not remove required file (b.g.o #590537)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Aug  2 19:10:56 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  2 Aug 2009 19:10:56 +0000 (UTC)
Subject: rpms/gaupol/F-11 gaupol.spec,1.5,1.6
Message-ID: <20090802191056.E5F6D11C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	gaupol.spec 
Log Message:
* Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-2
- do not remove required file (b.g.o #590537)


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-11/gaupol.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gaupol.spec	18 May 2009 17:44:05 -0000	1.5
+++ gaupol.spec	2 Aug 2009 19:10:56 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
@@ -41,8 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
 $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-#not entirely sure this is needed, keeping rpmlint happy
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/headers/microdvd
 
 
 
@@ -64,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-2
+- do not remove required file (b.g.o #590537)
+
 * Mon May 18 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-1
 - add python-chardet as requirement
 - new upstream release



From lucilanga at fedoraproject.org  Sun Aug  2 19:11:32 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun,  2 Aug 2009 19:11:32 +0000 (UTC)
Subject: rpms/gaupol/F-10 gaupol.spec,1.3,1.4
Message-ID: <20090802191132.85F3C11C004A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	gaupol.spec 
Log Message:
* Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-2
- do not remove required file (b.g.o #590537)


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-10/gaupol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gaupol.spec	18 May 2009 17:53:21 -0000	1.3
+++ gaupol.spec	2 Aug 2009 19:11:32 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
 Version:	0.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
@@ -41,8 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
 $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-#not entirely sure this is needed, keeping rpmlint happy
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/headers/microdvd
 
 
 
@@ -64,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-2
+- do not remove required file (b.g.o #590537)
+
 * Mon May 18 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-1
 - add python-chardet as a requirement
 - new upstream release



From ewan at fedoraproject.org  Sun Aug  2 19:22:14 2009
From: ewan at fedoraproject.org (Ewan Mac Mahon)
Date: Sun,  2 Aug 2009 19:22:14 +0000 (UTC)
Subject: rpms/gimp-resynthesizer/devel gimp-resynthesizer-makefile.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 gimp-resynthesizer.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090802192214.BA39611C004A@cvs1.fedora.phx.redhat.com>

Author: ewan

Update of /cvs/pkgs/rpms/gimp-resynthesizer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15614

Modified Files:
	.cvsignore gimp-resynthesizer.spec sources 
Added Files:
	gimp-resynthesizer-makefile.patch 
Log Message:
Bump to latest upstream version, add patch to stop makefile changes 
making the build ignore Fedora cflags.


gimp-resynthesizer-makefile.patch:
 Makefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gimp-resynthesizer-makefile.patch ---
--- Makefile	2008-03-10 06:52:45.000000000 +0000
+++ Makefile-new	2009-01-25 17:48:59.000000000 +0000
@@ -5,7 +5,8 @@
 GIMP_LDFLAGS=`$(GIMPTOOL) --libs`
 GIMP_CFLAGS=`$(GIMPTOOL) --cflags`
 
-CFLAGS=$(GIMP_CFLAGS) -O3 -fno-common -ffast-math -frename-registers -fomit-frame-pointer
+CFLAGS=-O3 -fno-common -ffast-math -frename-registers -fomit-frame-pointer
+MYCFLAGS=$(GIMP_CFLAGS) $(CFLAGS)
 
 LDFLAGS=$(GIMP_LDFLAGS) -lm
 
@@ -30,7 +31,7 @@
 	@echo
 
 resynth: resynth.cc
-	$(CC) $(CFLAGS) -o $@ resynth.cc $(LDFLAGS)
+	$(CC) $(MYCFLAGS) -o $@ resynth.cc $(LDFLAGS)
 
 clean:
 	-rm -f *~ *.o core resynth


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-resynthesizer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Oct 2007 22:43:12 -0000	1.2
+++ .cvsignore	2 Aug 2009 19:22:14 -0000	1.3
@@ -1 +1 @@
-resynthesizer-0.15.tar.gz
+resynthesizer-0.16.tar.gz


Index: gimp-resynthesizer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-resynthesizer/devel/gimp-resynthesizer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gimp-resynthesizer.spec	25 Jul 2009 00:11:22 -0000	1.4
+++ gimp-resynthesizer.spec	2 Aug 2009 19:22:14 -0000	1.5
@@ -3,8 +3,8 @@
 
 Summary: Gimp plug-in for texture synthesis
 Name: gimp-resynthesizer
-Version: 0.15
-Release: 5%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 Requires: gimp
@@ -12,6 +12,7 @@ BuildRequires: gimp, gimp-devel
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://logarithmic.net/pfh/resynthesizer
 Source: http://logarithmic.net/pfh-files/resynthesizer/resynthesizer-%{version}.tar.gz
+Patch: gimp-resynthesizer-makefile.patch
 
 %description
 Resynthesizer is a Gimp plug-in for texture synthesis. Given a sample of a 
@@ -23,6 +24,8 @@ texture, it can create more of that text
 %prep
 %setup -q -n resynthesizer-%{version}
 
+%patch
+
 %build
 %__make  %{?_smp_mflags} CFLAGS="%{optflags}"
 
@@ -45,6 +48,10 @@ texture, it can create more of that text
 %{gimpscriptdir}/smart-enlarge.scm
 
 %changelog
+* Sun Aug 02 2009 Ewan Mac Mahon <ewan at macmahon.me.uk> - 0.16-1
+- Bump to version 0.16
+- Patch makefile to allow Fedora CFLAGS to override defaults.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-resynthesizer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Oct 2007 22:43:12 -0000	1.2
+++ sources	2 Aug 2009 19:22:14 -0000	1.3
@@ -1 +1 @@
-701f7dd884d93a45227defd0a2abae53  resynthesizer-0.15.tar.gz
+097b3a21803fe02e47b8b8649af48144  resynthesizer-0.16.tar.gz



From pingou at fedoraproject.org  Sun Aug  2 19:39:31 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun,  2 Aug 2009 19:39:31 +0000 (UTC)
Subject: rpms/R2spec/devel .cvsignore, 1.4, 1.5 R2spec.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <20090802193931.78E1E11C004A@cvs1.fedora.phx.redhat.com>

Author: pingou

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

Modified Files:
	.cvsignore R2spec.spec sources 
Log Message:
New release 2.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Mar 2009 20:51:39 -0000	1.4
+++ .cvsignore	2 Aug 2009 19:39:31 -0000	1.5
@@ -1 +1 @@
-R2spec-2.5.2.tar.gz
+R2spec-2.5.3.tar.gz


Index: R2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/R2spec.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- R2spec.spec	24 Jul 2009 16:16:57 -0000	1.11
+++ R2spec.spec	2 Aug 2009 19:39:31 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           R2spec
-Version:        2.5.2
-Release:        3%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Python script to generate R spec file
 
 Group:          Development/Languages
@@ -44,6 +44,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 02 2009 Pingou <pingou-at-pingoured.fr> 2.5.3-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Mar 2009 20:51:40 -0000	1.4
+++ sources	2 Aug 2009 19:39:31 -0000	1.5
@@ -1 +1 @@
-1f8d25d17ed40a6dcfa1df80fff53549  R2spec-2.5.2.tar.gz
+736247155627d2a59095ba4d02d000fb  R2spec-2.5.3.tar.gz



From pingou at fedoraproject.org  Sun Aug  2 19:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun,  2 Aug 2009 19:40:12 +0000 (UTC)
Subject: rpms/R2spec/EL-4 R2spec.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090802194012.312B011C04D1@cvs1.fedora.phx.redhat.com>

Author: pingou

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

Modified Files:
	R2spec.spec sources 
Log Message:
New release 2.5.3


Index: R2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-4/R2spec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R2spec.spec	22 Mar 2009 20:59:41 -0000	1.5
+++ R2spec.spec	2 Aug 2009 19:40:12 -0000	1.6
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           R2spec
-Version:        2.5.2
-Release:        2%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Python script to generate R spec file
 
 Group:          Development/Languages
@@ -44,6 +44,12 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 02 2009 Pingou <pingou-at-pingoured.fr> 2.5.3-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 22 2009 Pingou <pingou-at-pingoured.fr> 2.5.2-2
 - Correct the source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Mar 2009 20:54:26 -0000	1.4
+++ sources	2 Aug 2009 19:40:12 -0000	1.5
@@ -1 +1 @@
-1f8d25d17ed40a6dcfa1df80fff53549  R2spec-2.5.2.tar.gz
+736247155627d2a59095ba4d02d000fb  R2spec-2.5.3.tar.gz



From pingou at fedoraproject.org  Sun Aug  2 19:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun,  2 Aug 2009 19:40:12 +0000 (UTC)
Subject: rpms/R2spec/F-10 R2spec.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <20090802194012.8DB8711C04D1@cvs1.fedora.phx.redhat.com>

Author: pingou

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

Modified Files:
	R2spec.spec sources 
Log Message:
New release 2.5.3


Index: R2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-10/R2spec.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R2spec.spec	22 Mar 2009 20:59:42 -0000	1.8
+++ R2spec.spec	2 Aug 2009 19:40:12 -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:           R2spec
-Version:        2.5.2
-Release:        2%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Python script to generate R spec file
 
 Group:          Development/Languages
@@ -44,6 +44,12 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 02 2009 Pingou <pingou-at-pingoured.fr> 2.5.3-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 22 2009 Pingou <pingou-at-pingoured.fr> 2.5.2-2
 - Correct the source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Mar 2009 20:54:27 -0000	1.4
+++ sources	2 Aug 2009 19:40:12 -0000	1.5
@@ -1 +1 @@
-1f8d25d17ed40a6dcfa1df80fff53549  R2spec-2.5.2.tar.gz
+736247155627d2a59095ba4d02d000fb  R2spec-2.5.3.tar.gz



From pingou at fedoraproject.org  Sun Aug  2 19:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun,  2 Aug 2009 19:40:12 +0000 (UTC)
Subject: rpms/R2spec/F-11 R2spec.spec,1.10,1.11 sources,1.4,1.5
Message-ID: <20090802194012.BD73811C04D1@cvs1.fedora.phx.redhat.com>

Author: pingou

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

Modified Files:
	R2spec.spec sources 
Log Message:
New release 2.5.3


Index: R2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-11/R2spec.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R2spec.spec	22 Mar 2009 20:59:42 -0000	1.10
+++ R2spec.spec	2 Aug 2009 19:40:12 -0000	1.11
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           R2spec
-Version:        2.5.2
-Release:        2%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Python script to generate R spec file
 
 Group:          Development/Languages
@@ -44,6 +44,12 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 02 2009 Pingou <pingou-at-pingoured.fr> 2.5.3-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 22 2009 Pingou <pingou-at-pingoured.fr> 2.5.2-2
 - Correct the source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Mar 2009 20:51:40 -0000	1.4
+++ sources	2 Aug 2009 19:40:12 -0000	1.5
@@ -1 +1 @@
-1f8d25d17ed40a6dcfa1df80fff53549  R2spec-2.5.2.tar.gz
+736247155627d2a59095ba4d02d000fb  R2spec-2.5.3.tar.gz



From pingou at fedoraproject.org  Sun Aug  2 19:40:12 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun,  2 Aug 2009 19:40:12 +0000 (UTC)
Subject: rpms/R2spec/EL-5 R2spec.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090802194012.624EE11C04D1@cvs1.fedora.phx.redhat.com>

Author: pingou

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

Modified Files:
	R2spec.spec sources 
Log Message:
New release 2.5.3


Index: R2spec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-5/R2spec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R2spec.spec	22 Mar 2009 20:59:42 -0000	1.5
+++ R2spec.spec	2 Aug 2009 19:40:12 -0000	1.6
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           R2spec
-Version:        2.5.2
-Release:        2%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Python script to generate R spec file
 
 Group:          Development/Languages
@@ -44,6 +44,12 @@ rm -rf %{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 02 2009 Pingou <pingou-at-pingoured.fr> 2.5.3-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 22 2009 Pingou <pingou-at-pingoured.fr> 2.5.2-2
 - Correct the source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R2spec/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Mar 2009 20:54:27 -0000	1.4
+++ sources	2 Aug 2009 19:40:12 -0000	1.5
@@ -1 +1 @@
-1f8d25d17ed40a6dcfa1df80fff53549  R2spec-2.5.2.tar.gz
+736247155627d2a59095ba4d02d000fb  R2spec-2.5.3.tar.gz



From jjh at fedoraproject.org  Sun Aug  2 21:02:00 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 21:02:00 +0000 (UTC)
Subject: rpms/ragel/devel ragel.spec,1.18,1.19
Message-ID: <20090802210200.D5B4211C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	ragel.spec 
Log Message:
update to 6.5


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ragel.spec	27 Jul 2009 02:45:17 -0000	1.18
+++ ragel.spec	2 Aug 2009 21:02:00 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           ragel   
-Version:        6.4
-Release:        4%{?dist}
+Version:        6.5
+Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5.1
+- Update to 6.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjh at fedoraproject.org  Sun Aug  2 21:06:23 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 21:06:23 +0000 (UTC)
Subject: rpms/ragel/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090802210623.C492311C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore sources 
Log Message:
updated sources to 6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Apr 2009 00:48:52 -0000	1.11
+++ .cvsignore	2 Aug 2009 21:06:23 -0000	1.12
@@ -1 +1 @@
-ragel-6.4.tar.gz
+ragel-6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Apr 2009 00:48:52 -0000	1.11
+++ sources	2 Aug 2009 21:06:23 -0000	1.12
@@ -1 +1 @@
-c0dc274083e9d825bfb48966810de046  ragel-6.4.tar.gz
+bb152087079ad7a545dcdc955b752301  ragel-6.5.tar.gz



From cwickert at fedoraproject.org  Sun Aug  2 21:36:36 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  2 Aug 2009 21:36:36 +0000 (UTC)
Subject: rpms/lxpanel/devel .cvsignore, 1.13, 1.14 lxpanel.spec, 1.23,
	1.24 sources, 1.13, 1.14 lxpanel-0.4.0-manpages.patch, 1.1,
	NONE lxpanel-0.4.1-cpu-history.patch, 1.1, NONE
Message-ID: <20090802213636.BFE5011C004A@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore lxpanel.spec sources 
Removed Files:
	lxpanel-0.4.0-manpages.patch lxpanel-0.4.1-cpu-history.patch 
Log Message:
* Sun Aug 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1
- Remove cpu-history.patch and manpages.patch, fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	5 May 2009 02:54:20 -0000	1.13
+++ .cvsignore	2 Aug 2009 21:36:36 -0000	1.14
@@ -1 +1 @@
-lxpanel-0.4.1.tar.gz
+lxpanel-0.5.1.tar.gz


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- lxpanel.spec	25 Jul 2009 03:57:01 -0000	1.23
+++ lxpanel.spec	2 Aug 2009 21:36:36 -0000	1.24
@@ -4,8 +4,8 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.4.1
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
 Group:          User Interface/Desktops
@@ -13,10 +13,7 @@ License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Patch1:         lxpanel-default.patch
-Patch2:         lxpanel-0.4.0-manpages.patch
 Patch3:         lxpanel-0.3.8.1-nm-connection-editor.patch
-# http://sourceforge.net/tracker/?func=detail&aid=2800828&group_id=180858&atid=894871
-Patch4:         lxpanel-0.4.1-cpu-history.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  docbook-utils
@@ -53,9 +50,8 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch1 -p1 -b .default
-%patch2 -p1 -b .manpage
 %patch3 -p1 -b .system-config-network
-%patch4 -p1 -b .history
+
 
 %build
 %configure
@@ -86,6 +82,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Sun Aug 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+- Remove cpu-history.patch and manpages.patch, fixed upstream
+
+- Thu Jul 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
 * Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-2
 - Patch to fix CPU usage monitor history
 - Make netstatus plugin prefer nm-connetction-editor over system-config-network


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 May 2009 02:54:21 -0000	1.13
+++ sources	2 Aug 2009 21:36:36 -0000	1.14
@@ -1 +1 @@
-cdc16f8126bc21c9a5f17f21433c1bf2  lxpanel-0.4.1.tar.gz
+c4792350c2211242a3d28d912ac79a89  lxpanel-0.5.1.tar.gz


--- lxpanel-0.4.0-manpages.patch DELETED ---


--- lxpanel-0.4.1-cpu-history.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Aug  2 21:55:02 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  2 Aug 2009 21:55:02 +0000 (UTC)
Subject: rpms/dinotrace/EL-5 dinotrace.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090802215502.EFF3211C004A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	dinotrace.spec import.log 
Log Message:
added emacs-verilog-mode for EL-5


--- NEW FILE dinotrace.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.2
%define emacs_lispdir  %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version  %{expand:%(pkg-config emacs --modversion)}
%define emacs_lispdir  %{expand:%(pkg-config emacs --variable sitepkglispdir)}
%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
%endif

Name:           dinotrace
Version:        9.4a
Release:        4%{?dist}
Summary:        Waveform viewer for electronics

URL:            http://www.veripool.org/wiki/dinotrace
Source0:        http://www.veripool.com/ftp/%{name}-%{version}.tgz

License:        GPLv3+
Group:          Applications/Engineering
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?fedora}
BuildRequires:  lesstif-devel
%else
BuildRequires:  openmotif-devel
%endif

BuildRequires:  desktop-file-utils

# menu entry compliance with Fedora Electronic Lab menu structure
Requires:       electronics-menu

# desktop entry icon
Requires:       gnome-icon-theme


%description
Dinotrace is a waveform viewer which understands Verilog Value
Change Dumps, ASCII, and other trace formats. It allows placing
cursors, highlighting signals, searching, printing, and other
capabilities superior to many commercial waveform viewers.

Dinotrace is optimized for rapid debugging. With VTRACE, a simulation
failure will automatically place cursors where errors occur, add
comments visible in the wave form viewer. Four mouse clicks and the
errors will be highlighted in the log files, and the values of signals
at the error will be seen in the source.


%package -n        emacs-%{name}
Summary:           Elisp source files for %{name} under GNU Emacs
Group:             Development/Libraries
BuildRequires:     emacs-el
BuildRequires:     emacs
Requires:          emacs(bin) >= %{emacs_version}
Requires:          %{name} = %{version}-%{release}
%if 0%{?rhel}
BuildRequires:     emacs-verilog-mode
Requires:          emacs-verilog-mode
%endif


%description -n emacs-%{name}
This package provides emacs support for %{name}


%prep
%setup -q

# spurious-executable-perm
chmod 0644 src/dt_util.c traces/tempest.bt.gz

## Causes data corruption : dinotrace -tempest traces/tempest.bt.gz
# file-not-utf8
#iconv -f iso8859-1 -t utf-8 traces/tempest.bt.gz > traces/tempest.conv
#mv -f traces/tempest.conv traces/tempest.bt.gz

# desktop file
cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=Waveform viewer
GenericName=Dinotrace
Comment=Dinotrace which can be used with emacs for advance design
Type=Application
Exec=dinotrace
Icon=utilities-system-monitor
Categories=Engineering;Electronics;
EOF


cat > %{name}.el.site-start << EOF
;; Dinotrace mode
(autoload 'dinotrace-update "dinotrace" "Update dinotrace annotations in this buffer" t)
(autoload 'dinotrace-mode   "dinotrace" "Toggle dinotrace annotations in this buffer" t)
;;(global-set-key "\C-x\C-aa" 'dinotrace-update)
;;(global-set-key "\C-x\C-ad" 'dinotrace-mode)
EOF


%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="%{_bindir}/install -p" install


# Install emacs mode
%{__install} -d %{buildroot}%{emacs_lispdir}
%{__install} -d %{buildroot}%{emacs_startdir}
pushd lisp/
    for file in dinotrace.el sim-log.el; do
        emacs -batch -f batch-byte-compile $file
        %{__install} -pm 0644 $file ${file}c %{buildroot}%{emacs_lispdir}/
    done
popd
%{__install} -pm 0644 %{name}.el.site-start %{buildroot}%{emacs_startdir}/%{name}-init.el


desktop-file-install --vendor "" \
    --dir %{buildroot}%{_datadir}/applications \
    %{name}.desktop

# FEL Package Validation check
# dinotrace traces/ascii.tra
# dinotrace traces/vcd.vcd


%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

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

%files
%defattr(-,root,root,-)
%doc Changes COPYING FAQ TODO dinotrace.txt
%doc traces/
%{_bindir}/%{name}
%{_infodir}/*
%{_datadir}/applications/%{name}.desktop

%files -n emacs-%{name}
%defattr(-,root,root,-)
%{emacs_lispdir}/%{name}.el*
%{emacs_lispdir}/sim-log.el*
%{emacs_startdir}/%{name}-init.el

%Changelog
* Sun Aug 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-4
- Fixing buildrequires for EL-5 branch

* Wed Jun 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-3
- fixed sub package requires

* Mon May 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-2
- dropped emacs support on EPEL - missing verilog-mode on emacs -21.4

* Mon Apr 06 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.4a-1
- new upstream release
- upstream applied patch dinotrace-emacs-el.patch and dinotrace-simlog.patch

* Fri Mar 06 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.3f-5
- package review comments : #478749c15

* Fri Mar 06 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.3f-4
- package review comments : #478749c4

* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.3f-3
- improved emacs support and added emacs as BR

* Sun Jan 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.3f-2
- fixed emacs support

* Thu Jun 26 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 9.3f-1
- Initial Package


--- NEW FILE import.log ---
dinotrace-9_4a-4_fc11:EL-5:dinotrace-9.4a-4.fc11.src.rpm:1249250007


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dinotrace/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 May 2009 22:38:27 -0000	1.1
+++ .cvsignore	2 Aug 2009 21:55:02 -0000	1.2
@@ -0,0 +1 @@
+dinotrace-9.4a.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dinotrace/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 May 2009 22:38:27 -0000	1.1
+++ sources	2 Aug 2009 21:55:02 -0000	1.2
@@ -0,0 +1 @@
+db0603bcc88f4cee10122fab48a6c621  dinotrace-9.4a.tgz



From rrankin at fedoraproject.org  Sun Aug  2 22:03:33 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  2 Aug 2009 22:03:33 +0000 (UTC)
Subject: rpms/gpsim/EL-5 gpsim.spec,1.16,1.17
Message-ID: <20090802220333.1E50711C004A@cvs1.fedora.phx.redhat.com>

Author: rrankin

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

Modified Files:
	gpsim.spec 
Log Message:
Add yacc to build requires



Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/gpsim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gpsim.spec	2 Aug 2009 12:31:01 -0000	1.16
+++ gpsim.spec	2 Aug 2009 22:03:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.23.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
@@ -11,7 +11,7 @@ Source:		http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, %{_includedir}/popt.h
-BuildRequires:	autoconf libtool automake
+BuildRequires:	autoconf libtool automake yacc
 
 
 %description
@@ -93,6 +93,9 @@ autoconf
 %{_includedir}/*
 
 %changelog
+* Mon Aug 03 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-7
+- Add yacc to build requires 
+
 * Sun Aug 02 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-6
 - fix EL-5 has different aclocal version
 



From chitlesh at fedoraproject.org  Sun Aug  2 22:10:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  2 Aug 2009 22:10:48 +0000 (UTC)
Subject: rpms/guile-gnome-platform/F-10
	guile-gnome-platform-2.16.1-infofix.patch, NONE,
	1.1 guile-gnome-platform-2.16.1-libdir.patch, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 guile-gnome-platform.spec, 1.3, 1.4 sources, 1.2,
	1.3 guile-gnome-allowed-options.patch, 1.1, NONE
Message-ID: <20090802221048.6156711C004A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/guile-gnome-platform/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9545/F-10

Modified Files:
	.cvsignore guile-gnome-platform.spec sources 
Added Files:
	guile-gnome-platform-2.16.1-infofix.patch 
	guile-gnome-platform-2.16.1-libdir.patch import.log 
Removed Files:
	guile-gnome-allowed-options.patch 
Log Message:
preparing gwave 2009 series

guile-gnome-platform-2.16.1-infofix.patch:
 atk/doc/guile-gnome-atk.texi                       |    2 +-
 corba/doc/guile-gnome-corba.texi                   |    2 +-
 gconf/doc/guile-gnome-gconf.texi                   |    2 +-
 glib/doc/glib/guile-gnome-glib.texi                |    2 +-
 glib/doc/gobject/guile-gnome-gobject.texi          |    2 +-
 gnome-vfs/doc/guile-gnome-gnome-vfs.texi           |    2 +-
 gtk/doc/gdk/guile-gnome-gdk.texi                   |    2 +-
 gtk/doc/gtk/guile-gnome-gtk.texi                   |    2 +-
 libglade/doc/guile-gnome-libglade.texi             |    2 +-
 libgnome/doc/guile-gnome-libgnome.texi             |    2 +-
 libgnomecanvas/doc/guile-gnome-libgnomecanvas.texi |    2 +-
 libgnomeui/doc/guile-gnome-libgnomeui.texi         |    2 +-
 pango/doc/pango/guile-gnome-pango.texi             |    2 +-
 pango/doc/pangocairo/guile-gnome-pangocairo.texi   |    2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE guile-gnome-platform-2.16.1-infofix.patch ---
--- guile-gnome-platform-2.16.1/libgnomeui/doc/guile-gnome-libgnomeui.texi.infofix	2008-06-12 06:28:28.000000000 -0400
+++ guile-gnome-platform-2.16.1/libgnomeui/doc/guile-gnome-libgnomeui.texi	2008-12-27 20:14:13.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Libgnomeui: (guile-gnome-libgnomeui.info).  A deprecated GNOME UI lib.
+* Guile-Libgnomeui: (guile-gnome-libgnomeui).  A deprecated GNOME UI lib.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/libglade/doc/guile-gnome-libglade.texi.infofix	2008-06-12 06:28:09.000000000 -0400
+++ guile-gnome-platform-2.16.1/libglade/doc/guile-gnome-libglade.texi	2008-12-27 20:14:13.000000000 -0500
@@ -27,7 +27,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Libglade: (guile-gnome-libglade.info).  Load GTK+ interfaces from XML.
+* Guile-Libglade: (guile-gnome-libglade).  Load GTK+ interfaces from XML.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/gtk/doc/gtk/guile-gnome-gtk.texi.infofix	2008-06-12 06:29:21.000000000 -0400
+++ guile-gnome-platform-2.16.1/gtk/doc/gtk/guile-gnome-gtk.texi	2008-12-27 20:14:13.000000000 -0500
@@ -50,7 +50,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Gtk: (guile-gnome-gtk.info).  The GIMP ToolKit.
+* Guile-Gtk: (guile-gnome-gtk).  The GIMP ToolKit.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/gtk/doc/gdk/guile-gnome-gdk.texi.infofix	2008-06-12 06:29:28.000000000 -0400
+++ guile-gnome-platform-2.16.1/gtk/doc/gdk/guile-gnome-gdk.texi	2008-12-27 20:14:13.000000000 -0500
@@ -72,7 +72,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Gdk: (guile-gnome-gdk.info).  The GIMP Drawing Kit.
+* Guile-Gdk: (guile-gnome-gdk).  The GIMP Drawing Kit.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/atk/doc/guile-gnome-atk.texi.infofix	2008-06-12 06:24:14.000000000 -0400
+++ guile-gnome-platform-2.16.1/atk/doc/guile-gnome-atk.texi	2008-12-27 20:14:13.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Atk: (guile-gnome-atk.info).  The Accessibility ToolKit.
+* Guile-Atk: (guile-gnome-atk).  The Accessibility ToolKit.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/libgnomecanvas/doc/guile-gnome-libgnomecanvas.texi.infofix	2008-06-12 06:28:20.000000000 -0400
+++ guile-gnome-platform-2.16.1/libgnomecanvas/doc/guile-gnome-libgnomecanvas.texi	2008-12-27 20:14:13.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Libgnomecanvas: (guile-gnome-libgnomecanvas.info).  Structured graphics.
+* Guile-Libgnomecanvas: (guile-gnome-libgnomecanvas).  Structured graphics.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/glib/doc/glib/guile-gnome-glib.texi.infofix	2008-06-12 06:30:10.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/doc/glib/guile-gnome-glib.texi	2008-12-27 20:14:13.000000000 -0500
@@ -50,7 +50,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-GLib: (guile-gnome-glib.info).  Functions from the GLib library.
+* Guile-GLib: (guile-gnome-glib).  Functions from the GLib library.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/glib/doc/gobject/guile-gnome-gobject.texi.infofix	2008-06-12 06:29:53.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/doc/gobject/guile-gnome-gobject.texi	2008-12-27 20:17:00.000000000 -0500
@@ -20,7 +20,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-GNOME: GObject: (guile-gnome-gobject.info).  The GLib object system in Scheme.
+* Guile-GObject: (guile-gnome-gobject).  The GLib object system in Scheme.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/gconf/doc/guile-gnome-gconf.texi.infofix	2008-06-12 06:27:46.000000000 -0400
+++ guile-gnome-platform-2.16.1/gconf/doc/guile-gnome-gconf.texi	2008-12-27 20:17:08.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-GConf: (guile-gnome-gconf.info).  GNOME's configuration system.
+* Guile-GConf: (guile-gnome-gconf).  GNOME's configuration system.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/pango/doc/pango/guile-gnome-pango.texi.infofix	2008-06-12 06:29:13.000000000 -0400
+++ guile-gnome-platform-2.16.1/pango/doc/pango/guile-gnome-pango.texi	2008-12-27 20:17:14.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Pango: (guile-gnome-pango.info).  Text layout and rendering.
+* Guile-Pango: (guile-gnome-pango).  Text layout and rendering.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/pango/doc/pangocairo/guile-gnome-pangocairo.texi.infofix	2008-06-12 06:29:08.000000000 -0400
+++ guile-gnome-platform-2.16.1/pango/doc/pangocairo/guile-gnome-pangocairo.texi	2008-12-27 20:17:23.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-PangoCairo: (guile-gnome-pangocairo.info).  Pango+Cairo.
+* Guile-PangoCairo: (guile-gnome-pangocairo).  Pango+Cairo.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/libgnome/doc/guile-gnome-libgnome.texi.infofix	2008-06-12 06:28:14.000000000 -0400
+++ guile-gnome-platform-2.16.1/libgnome/doc/guile-gnome-libgnome.texi	2008-12-27 20:17:29.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-Libgnome: (guile-gnome-libgnome.info).  A GNOME catchall library.
+* Guile-Libgnome: (guile-gnome-libgnome).  A GNOME catchall library.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/corba/doc/guile-gnome-corba.texi.infofix	2008-06-12 06:26:29.000000000 -0400
+++ guile-gnome-platform-2.16.1/corba/doc/guile-gnome-corba.texi	2008-12-27 20:17:37.000000000 -0500
@@ -20,7 +20,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-GNOME: CORBA: (guile-gnome-corba.info).  Remote objects with CORBA in Scheme.
+* Guile-CORBA: (guile-gnome-corba).  Remote objects with CORBA in Scheme.
 @end direntry
 
 @titlepage 
--- guile-gnome-platform-2.16.1/gnome-vfs/doc/guile-gnome-gnome-vfs.texi.infofix	2008-06-12 06:27:52.000000000 -0400
+++ guile-gnome-platform-2.16.1/gnome-vfs/doc/guile-gnome-gnome-vfs.texi	2008-12-27 20:17:44.000000000 -0500
@@ -23,7 +23,7 @@
 
 @dircategory The Algorithmic Language Scheme
 @direntry 
-* Guile-GNOME-VFS: (guile-gnome-gnome-vfs.info).  The GNOME virtual file system.
+* Guile-GNOME-VFS: (guile-gnome-gnome-vfs).  The GNOME virtual file system.
 @end direntry
 
 @titlepage 

guile-gnome-platform-2.16.1-libdir.patch:
 bin/guile-gnome.in          |   30 ++++++++----------------------
 gnome.scm.in                |   10 ++++------
 gnome/gobject/Makefile.in   |    2 +-
 gnome/gobject/config.scm.in |    5 ++++-
 4 files changed, 17 insertions(+), 30 deletions(-)

--- NEW FILE guile-gnome-platform-2.16.1-libdir.patch ---
--- guile-gnome-platform-2.16.1/glib/gnome.scm.in.libdir	2008-04-27 15:42:55.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/gnome.scm.in	2008-12-28 01:41:15.000000000 -0500
@@ -143,14 +143,12 @@
   (module-define! (resolve-module '(gnome)) 'gnome-version version)
 
   (let ((guile-gnome-dir "@guilegnomedir@")
-        (guile-gnome-lib-dir "@guilegnomelibdir@")
-        (libdir "@libdir@"))
+        (guile-gnome-lib-dir
+          (if (zero? (system "uname -i | grep 64 > /dev/null"))
+              "/usr/lib64/guile-gnome- at API_VERSION@"
+              "/usr/lib/guile-gnome- at API_VERSION@")))
 
     (add-to-load-path! guile-gnome-dir)
 
-    ;; Resolve (gnome gw ...) wrapper links to libguile-gnome-gobject.
-    (if (not (member libdir '("/usr/lib" "/usr/local/lib")))
-        (ld-library-path-prepend! libdir))
-  
     ;; Resolve (gnome gw ...) wrappers.
     (ld-library-path-prepend! guile-gnome-lib-dir))))
--- guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in.libdir	2007-05-20 12:40:30.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in	2008-12-28 01:46:51.000000000 -0500
@@ -15,39 +15,25 @@
 # interpreter is as follows, removing `# ' on each line:
 
 # #! /bin/sh
-# exec guile-gnome -s $0 "$@"
+# exec guile-gnome- at API_VERSION@ -s $0 "$@"
 # !#
 
 # This will allow the shell to find `guile-gnome' in the path.
 
-# Hack around guile-1.6's lack of /usr/local paths in its load-dir.
-# (Otherwise a user looking for g-wrap / guile-lib installed in
-# /usr/local will be unpleasantly surprised.)
-localpath=/usr/local/share/guile/site:/usr/local/share/guile/1.6:/usr/local/share/guile
-
 if test "x$GUILE_LOAD_PATH" = "x"; then
-  GUILE_LOAD_PATH="@guilegnomedir@":$localpath
+  GUILE_LOAD_PATH="@guilegnomedir@"
 else
-  # Because GUILE_LOAD_PATH is essentially a user customization, allow
-  # it to have precedence over $localpath.
-  GUILE_LOAD_PATH="@guilegnomedir@":$GUILE_LOAD_PATH:$localpath
-fi
-
-# Probably will always be necessary to resolve libguile-gnome-gobject
-# link.
-if test @libdir@ != /usr/lib -a @libdir@ != /usr/local/lib; then
-  if test "x$LD_LIBRARY_PATH" = "x"; then
-    LD_LIBRARY_PATH=@libdir@
-  else
-    LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
-  fi
+  GUILE_LOAD_PATH="@guilegnomedir@":$GUILE_LOAD_PATH
 fi
 
 # Can be removed after g-wrap is fixed.
+(uname -i | grep 64 > /dev/null) && LIBDIR=/usr/lib64 || LIBDIR=/usr/lib
+GUILE_LIBDIR=$LIBDIR/guile-gnome- at API_VERSION@
+
 if test "x$LD_LIBRARY_PATH" = "x"; then
-  LD_LIBRARY_PATH=@guilegnomelibdir@
+  LD_LIBRARY_PATH=$GUILE_LIBDIR
 else
-  LD_LIBRARY_PATH=@guilegnomelibdir@:$LD_LIBRARY_PATH
+  LD_LIBRARY_PATH=$GUILE_LIBDIR:$LD_LIBRARY_PATH
 fi
 
 export GUILE_LOAD_PATH LD_LIBRARY_PATH
--- guile-gnome-platform-2.16.1/glib/gnome/gobject/Makefile.in.libdir	2008-07-03 11:18:05.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/gnome/gobject/Makefile.in	2008-12-28 01:41:15.000000000 -0500
@@ -802,7 +802,7 @@
 
 install-data-local: Makefile config.scm.in
 	$(mkinstalldirs) $(DESTDIR)$(moduledir)
-	sed -e "s|@guilegnomegobjectlibpath\@|$(libdir)/libguile-gnome-gobject- at API_VERSION@|" \
+	sed -e "s|@API_VERSION\@|@API_VERSION@|" \
 	    $(srcdir)/config.scm.in > $(DESTDIR)$(moduledir)/config.scm
 	chmod 644 $(DESTDIR)$(moduledir)/config.scm
 
--- guile-gnome-platform-2.16.1/glib/gnome/gobject/config.scm.in.libdir	2007-05-20 12:40:30.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/gnome/gobject/config.scm.in	2008-12-28 01:41:15.000000000 -0500
@@ -27,4 +27,7 @@
 (define-module (gnome gobject config)
   :export     (*guile-gnome-gobject-lib-path*))
 
-(define *guile-gnome-gobject-lib-path* "@guilegnomegobjectlibpath@")
+(define *guile-gnome-gobject-lib-path*
+  (if (zero? (system "uname -i | grep 64 > /dev/null"))
+    "/usr/lib64/libguile-gnome-gobject- at API_VERSION@"
+    "/usr/lib/libguile-gnome-gobject- at API_VERSION@"))


--- NEW FILE import.log ---
guile-gnome-platform-2_16_1-3_fc11:F-10:guile-gnome-platform-2.16.1-3.fc11.src.rpm:1249250950


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Oct 2007 21:08:26 -0000	1.2
+++ .cvsignore	2 Aug 2009 22:10:47 -0000	1.3
@@ -1 +1 @@
-guile-gnome-platform-2.15.93.tar.gz
+guile-gnome-platform-2.16.1.tar.gz


Index: guile-gnome-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/F-10/guile-gnome-platform.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- guile-gnome-platform.spec	6 Sep 2008 14:13:09 -0000	1.3
+++ guile-gnome-platform.spec	2 Aug 2009 22:10:48 -0000	1.4
@@ -1,23 +1,28 @@
 Name:           guile-gnome-platform
-Version:        2.15.93
-Release:        8%{?dist}
+Version:        2.16.1
+Release:        3%{?dist}
 Summary:        Guile wrapper collection for the GNOME library stack
 
 Group:          Applications/System
-License:        GPLv2
+License:        GPLv2+
 URL:            http://www.gnu.org/software/guile-gnome/
 Source0:        http://ftp.gnu.org/pub/gnu/guile-gnome/%{name}/%{name}-%{version}.tar.gz
-Patch0:         guile-gnome-allowed-options.patch
+Patch0:         guile-gnome-platform-2.16.1-libdir.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=565837
+Patch1:         guile-gnome-platform-2.16.1-infofix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch:    ppc64
-
 BuildRequires:  guile-cairo-devel
-BuildRequires:  g-wrap-devel >= 1.8.9
+# README says >= 1.9.1 but not 1.9.2
+# but website says 1.9.8
+BuildRequires:  g-wrap-devel >= 1.9.8
 BuildRequires:  libgnomeui-devel, glibc
+# We are patching the .texi sources, fixing invalid directory entries
+# Until the .texi and .info files from upstream are fixed, BR on texinfo
+BuildRequires:  texinfo
 Requires:       guile
 
-Requires(post): /sbin/install-info
+Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
 %description
@@ -28,37 +33,23 @@ GtkSourceView, you will find in guile-gn
 environment for developing modern applications.
 
 
-%package	devel
-Summary:	Libraries and header files for %{name}
-Group:		Development/Libraries
+%package        devel
+Summary:        Libraries and header files for %{name}
+Group:          Development/Libraries
 
-Requires:	%{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       g-wrap-devel, guile-cairo-devel
 Requires:       ORBit2-devel, pkgconfig
 
-%description	devel
+%description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
-
-
 %prep
 %setup -q
-
-#Allowed options grom g-wrap-1.9.9
-%patch0 -p1 -b .allowed-options
-
-#Fix default paths
-sed -i "s|local/||" glib/bin/guile-gnome.in
-sed -i "s|share/guile|share/guile/site|" configure
-sed -i "s|>= 2.18||" configure
-
-sed -i "s|guile-gnome|guile-gnome-0|" defs/guile-gnome-defs.pc.in
-
-
-#Fix OPTFLAGS on gtk/gnome/gw build
-sed -i "s|CFLAGS = -g|CFLAGS = @CFLAGS@ -g|" gtk/gnome/gw/Makefile.in
+%patch0 -p1 -b .libdir
+%patch1 -p1 -b .infofix
 
 
 %build
@@ -70,7 +61,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"
 
 #Remove .la files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -78,6 +69,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec 
 #Remove deprecated file
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+#Multiarch timestamp fixes
+touch -r glib/bin/guile-gnome.in.libdir \
+      $RPM_BUILD_ROOT%{_bindir}/guile-gnome-2
+touch -r glib/gnome/gobject/config.scm.in.libdir \
+      $RPM_BUILD_ROOT%{_datadir}/guile-gnome-2/gnome/gobject/config.scm
+touch -r glib/gnome.scm.in.libdir \
+      $RPM_BUILD_ROOT%{_datadir}/guile/site/gnome-2.scm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,11 +84,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/guile-gnome-tutorial.info.gz %{_infodir}/dir || :
+for i in \
+    atk corba gconf gdk glib gnome-vfs gobject gtk \
+    libglade libgnome libgnomecanvas libgnomeui pango pangocairo;
+  do
+    /sbin/install-info \
+      %{_infodir}/guile-gnome-$i.info.gz %{_infodir}/dir || :
+done
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/guile-gnome-tutorial.info.gz %{_infodir}/dir || :
+   for i in \
+        atk corba gconf gdk glib gnome-vfs gobject gtk \
+        libglade libgnome libgnomecanvas libgnomeui pango pangocairo;
+      do
+        /sbin/install-info --delete \
+          %{_infodir}/guile-gnome-$i.info.gz %{_infodir}/dir || :
+   done
 fi
 
 %postun -p /sbin/ldconfig
@@ -97,31 +108,45 @@ fi
 
 
 %files
+# .so files needed to load libraries at runtime
+# so they are part of the main package rather than
+# the devel subpackage
+
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog NEWS
 %{_bindir}/*
-%{_libdir}/*.so.*
-%dir %{_libdir}/guile-gnome-0
+%{_libdir}/*.so*
+%dir %{_libdir}/guile-gnome-2
 %dir %{_libdir}/orbit-2.0
-%{_libdir}/guile-gnome-0/*.so.*
-%{_libdir}/orbit-2.0/*.so.*
-%{_datadir}/guile-gnome-0
-%{_datadir}/guile/site/gnome-0.scm
-%{_infodir}/*.info.gz
+%{_libdir}/guile-gnome-2/*.so*
+%{_libdir}/orbit-2.0/*.so*
+%{_datadir}/guile-gnome-2
+%{_datadir}/guile/site/gnome-2.scm
+%{_infodir}/*.info*.gz
 
 
-%files	devel
+%files  devel
 %defattr(-,root,root,-)
 %doc HACKING
-%{_libdir}/*.so
-%{_libdir}/guile-gnome-0/*.so
-%{_libdir}/orbit-2.0/*.so
+#%{_libdir}/*.so
+#%{_libdir}/guile-gnome-2/*.so
+#%{_libdir}/orbit-2.0/*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/guile-gnome-0
+%{_includedir}/guile-gnome-2
 
 
 
 %changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 28 2008 Michel Salim <salimma at fedoraproject.org> - 2.16.1-2
+- Multiarch fix: detect libdir at runtime for files in %%{_datadir}
+
+* Sat Dec 27 2008 Michel Salim <salimma at fedoraproject.org> - 2.16.1-1
+- Update to 2.16.1
+- Corrected license to GPLv2+
+
 * Sat Sep 06 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.15.93-8
 - Rebuild for rawhide.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Oct 2007 21:08:26 -0000	1.2
+++ sources	2 Aug 2009 22:10:48 -0000	1.3
@@ -1 +1 @@
-c74e081f8312cdbd4a5bc62e8239203c  guile-gnome-platform-2.15.93.tar.gz
+fde233c17863b7dfbe6937e4b5c00669  guile-gnome-platform-2.16.1.tar.gz


--- guile-gnome-allowed-options.patch DELETED ---



From rrankin at fedoraproject.org  Sun Aug  2 22:26:55 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  2 Aug 2009 22:26:55 +0000 (UTC)
Subject: rpms/gpsim/EL-5 gpsim.spec,1.17,1.18
Message-ID: <20090802222655.5027A11C004A@cvs1.fedora.phx.redhat.com>

Author: rrankin

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

Modified Files:
	gpsim.spec 
Log Message:
Package yacc should be byacc



Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/gpsim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gpsim.spec	2 Aug 2009 22:03:32 -0000	1.17
+++ gpsim.spec	2 Aug 2009 22:26:53 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.23.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
@@ -11,7 +11,7 @@ Source:		http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, %{_includedir}/popt.h
-BuildRequires:	autoconf libtool automake yacc
+BuildRequires:	autoconf libtool automake byacc
 
 
 %description
@@ -93,8 +93,8 @@ autoconf
 %{_includedir}/*
 
 %changelog
-* Mon Aug 03 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-7
-- Add yacc to build requires 
+* Mon Aug 03 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-8
+- Add byacc to build requires 
 
 * Sun Aug 02 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-6
 - fix EL-5 has different aclocal version



From jjh at fedoraproject.org  Sun Aug  2 22:30:13 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 22:30:13 +0000 (UTC)
Subject: rpms/ragel/devel ragel.spec, 1.19, 1.20 ragel-Makefile-install.patch,
	1.3, NONE
Message-ID: <20090802223013.5A6AA11C0381@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	ragel.spec 
Removed Files:
	ragel-Makefile-install.patch 
Log Message:
fix build process


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/devel/ragel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ragel.spec	2 Aug 2009 21:02:00 -0000	1.19
+++ ragel.spec	2 Aug 2009 22:30:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           ragel   
 Version:        6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  transfig, tetex-latex, gcc-objc
 Requires:       gawk
 
-Patch0:         ragel-Makefile-install.patch
+Patch0:         ragel-main.patch
 
 %description
 Ragel compiles finite state machines from regular languages into executable C,
@@ -29,21 +29,14 @@ done using inline operators that do not 
 
 %build
 # set the names of the other programming commandline programs
-%configure RUBY=ruby JAVAC=javac GMCS=gmcs 
+%configure --docdir=%{_docdir}/%{name}-%{version} RUBY=ruby JAVAC=javac GMCS=gmcs 
 
 make %{?_smp_mflags}
-pushd doc
-make %{?_smp_mflags}
-popd
 
 
 %install
 rm -rf %{buildroot}
-make prefix=%{buildroot}%{_prefix} install
-chmod a-x examples/*
-pushd doc
-make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} docdir=%{buildroot}%{_docdir}/%{name}-%{version} install
-popd
+make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -52,12 +45,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING ragel.vim
-%doc examples
 %doc doc/ragel-guide.pdf
 %{_bindir}/ragel
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5.2
+- fix build process 
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5.1
 - Update to 6.5
 


--- ragel-Makefile-install.patch DELETED ---



From bpepple at fedoraproject.org  Sun Aug  2 22:32:16 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun,  2 Aug 2009 22:32:16 +0000 (UTC)
Subject: rpms/libnice/devel .cvsignore, 1.6, 1.7 libnice.spec, 1.8,
	1.9 sources, 1.6, 1.7 libnice-0.0.8-sha1.patch, 1.1, NONE
Message-ID: <20090802223216.C4CCB11C004A@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore libnice.spec sources 
Removed Files:
	libnice-0.0.8-sha1.patch 
Log Message:
* Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
- Update to 0.0.9.
- Drop sha1 patch. Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jun 2009 00:04:40 -0000	1.6
+++ .cvsignore	2 Aug 2009 22:32:16 -0000	1.7
@@ -1 +1 @@
-libnice-0.0.8.tar.gz
+libnice-0.0.9.tar.gz


Index: libnice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/libnice.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libnice.spec	25 Jul 2009 06:12:43 -0000	1.8
+++ libnice.spec	2 Aug 2009 22:32:16 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           libnice
-Version:        0.0.8
-Release:        3%{?dist}
+Version:        0.0.9
+Release:        1%{?dist}
 Summary:        GLib ICE implementation
 
 Group:          System Environment/Libraries
 License:        LGPLv2 and MPLv1.1
 URL:            http://nice.freedesktop.org/wiki/
 Source0:        http://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Patch0:         libnice-0.0.8-sha1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	glib2-devel
@@ -40,7 +39,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -84,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
+- Update to 0.0.9.
+- Drop sha1 patch. Fixed upstream.
+
 * 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/libnice/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jun 2009 00:04:41 -0000	1.6
+++ sources	2 Aug 2009 22:32:16 -0000	1.7
@@ -1 +1 @@
-53ef2dea810d5b9e0cde5a55640a1f42  libnice-0.0.8.tar.gz
+19ac2565ee7487c1f32487b948110b19  libnice-0.0.9.tar.gz


--- libnice-0.0.8-sha1.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Aug  2 22:49:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  2 Aug 2009 22:49:32 +0000 (UTC)
Subject: rpms/xcircuit/devel .cvsignore, 1.5, 1.6 import.log, 1.1,
	1.2 sources, 
	1.5, 1.6 xcircuit.desktop, 1.4, 1.5 xcircuit.spec, 1.16, 1.17
Message-ID: <20090802224932.8E34911C004A@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources xcircuit.desktop xcircuit.spec 
Log Message:
3.6 series introduced


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Aug 2008 12:58:46 -0000	1.5
+++ .cvsignore	2 Aug 2009 22:49:30 -0000	1.6
@@ -1 +1 @@
-xcircuit-3.4.30.tgz
+xcircuit-3.6.161.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Aug 2008 12:58:46 -0000	1.1
+++ import.log	2 Aug 2009 22:49:30 -0000	1.2
@@ -1 +1,2 @@
 xcircuit-3_4_30-1_fc8:HEAD:xcircuit-3.4.30-1.fc8.src.rpm:1218805344
+xcircuit-3_6_161-1_fc11:HEAD:xcircuit-3.6.161-1.fc11.src.rpm:1249253223


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Aug 2008 12:58:46 -0000	1.5
+++ sources	2 Aug 2009 22:49:30 -0000	1.6
@@ -1 +1 @@
-adabfa8432ad4c95344d12a821902e81  xcircuit-3.4.30.tgz
+f91c149a918f77329480005bfaa1448f  xcircuit-3.6.161.tgz


Index: xcircuit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/devel/xcircuit.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xcircuit.desktop	24 Aug 2007 12:24:28 -0000	1.4
+++ xcircuit.desktop	2 Aug 2009 22:49:30 -0000	1.5
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=XCircuit Schematic
+Comment=ASIC Schematic Editor
 Exec=xcircuit
 Icon=xcircuit
 Type=Application
 Terminal=false
 GenericName=Xcircuit Schematic
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;


Index: xcircuit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/devel/xcircuit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xcircuit.spec	27 Jul 2009 07:40:54 -0000	1.16
+++ xcircuit.spec	2 Aug 2009 22:49:30 -0000	1.17
@@ -1,6 +1,6 @@
 Name:             xcircuit
-Version:          3.4.30
-Release:          3%{?dist}
+Version:          3.6.161
+Release:          1%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
 License:          GPLv2
@@ -16,10 +16,12 @@ BuildRoot:        %{_tmppath}/%{name}-%{
 
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
 BuildRequires:    ghostscript-devel, ngspice, libXpm-devel, zlib-devel
+BuildRequires:    chrpath
+
 Requires:         tk coreutils gtk2
 
 # Special FEL Gnome/KDE menu structure
-Requires: 		  electronics-menu
+Requires:         electronics-menu
 
 %description
 Xcircuit is a general-purpose drawing program and also a specific-purpose
@@ -41,17 +43,16 @@ cd %{name}-%{version}
 %{__autoconf}
 
 
-WISH=/usr/bin/wish
-export WISH
-
+export WISH=/usr/bin/wish
+export CFLAGS="$CFLAGS -g"
 
+#01/08/09 Without --enable-asg \ because it's broken
 %configure \
    --with-tcl=%{_libdir}      \
    --with-tk=%{_libdir}       \
    --with-tcllibs=%{_libdir}  \
    --with-tklibs=%{_libdir}
 
-
 %{__make} %{?_smp_mflags}
 
 
@@ -66,25 +67,25 @@ cd %{name}-%{version}
 %{__rm} -rf examples/win32
 
 # They stay
-#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.27/examples/python/.xcircuitrc
-#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.37/examples/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/python/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/.xcircuitrc
 
-chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.6/console.tcl
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
-sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.4/xcstartup.tcl
+sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.6/xcstartup.tcl
 sed -i '7 a\export TCLLIBPATH=%{_libdir}' %{buildroot}%{_bindir}/xcircuit
 
 
-desktop-file-install --vendor fedora           \
-    --add-category Engineering                 \
-    --add-category Electronics                 \
-    --remove-category Science                  \
+desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
+# removing rpath
+chrpath --delete %{buildroot}%{_libdir}/%{name}-3.6/xcircexec
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -92,16 +93,12 @@ desktop-file-install --vendor fedora    
 
 %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
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 
@@ -110,13 +107,16 @@ fi
 %doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
 %doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
-%{_prefix}/lib*/%{name}-3.4/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_prefix}/lib*/%{name}-3.6/
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 
-%changelog
+%Changelog
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.6.161-1
+- new upstream release 3.6.161
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chitlesh at fedoraproject.org  Sun Aug  2 23:00:11 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  2 Aug 2009 23:00:11 +0000 (UTC)
Subject: rpms/magic/devel .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 magic.desktop, 1.4, 1.5 magic.spec, 1.17, 1.18 sources, 1.10, 1.11
Message-ID: <20090802230011.5F84211C04D1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log magic.desktop magic.spec sources 
Log Message:
8.0 series introduced


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jan 2009 23:54:55 -0000	1.10
+++ .cvsignore	2 Aug 2009 23:00:09 -0000	1.11
@@ -1 +1 @@
-magic-7.5.169.tgz
+magic-8.0.51.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jan 2009 23:54:55 -0000	1.4
+++ import.log	2 Aug 2009 23:00:09 -0000	1.5
@@ -2,3 +2,4 @@ magic-7_5_146-1_fc8:HEAD:magic-7.5.146-1
 magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1.fc9.src.rpm:1220001384
 magic-7_5_168-1_fc10:HEAD:magic-7.5.168-1.fc10.src.rpm:1230565927
 magic-7_5_169-1_fc10:HEAD:magic-7.5.169-1.fc10.src.rpm:1231286025
+magic-8_0_51-1_fc11:HEAD:magic-8.0.51-1.fc11.src.rpm:1249253896


Index: magic.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- magic.desktop	24 Aug 2007 11:54:20 -0000	1.4
+++ magic.desktop	2 Aug 2009 23:00:09 -0000	1.5
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;
 Comment=VLSI layout tool
 Encoding=UTF-8
 Exec=magic


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- magic.spec	25 Jul 2009 11:38:28 -0000	1.17
+++ magic.spec	2 Aug 2009 23:00:10 -0000	1.18
@@ -1,6 +1,6 @@
 Name:             magic
-Version:          7.5.169
-Release:          3%{?dist}
+Version:          8.0.51
+Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
 License:          GPLv2
@@ -23,10 +23,7 @@ Requires:         tcsh
 Requires:         electronics-menu
 
 %description
-Magic is a venerable VLSI layout tool, written in the 1980's at
-Berkeley by John Ousterhout, now famous primarily for writing
-the scripting interpreter language Tcl. Due largely in part to
-its liberal Berkeley open-source license, magic has remained
+Magic is a venerable VLSI layout tool. Magic VLSI remains
 popular with universities and small companies.
 
 Magic is widely cited as being the easiest tool to use for
@@ -49,6 +46,7 @@ and some tutorials.
 # create a directory and expand tarball there.
 %setup -q -T -c %{name}-%{version} -a 0
 
+
 cd %{name}-%{version}
 %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
@@ -61,26 +59,29 @@ sed -i "s|package require -exact|package
 %patch1 -p0 -b .64bit
 %endif
 
+#*** ERROR: No build ID note found in /usr/lib/magic/tcl/magicexec
+#export LDDLFLAGS="$LDDLFLAGS --build-id"
+
+
 %build
 
-if [ -d %{_prefix}/lib64 ] ; then
-   SUF=64
-else
-   SUF=
-fi
+#if [ -d %{_prefix}/lib64 ] ; then
+#   SUF=64
+#else
+#   SUF=
+#fi
 
-WISH=%{_bindir}/wish
-export WISH
+export WISH=%{_bindir}/wish
 
 cd %{name}-%{version}
 
-%configure \
-   --with-tcl=%{_prefix}/lib$SUF     \
-   --with-tk=%{_prefix}/lib$SUF      \
-   --with-tcllibs=%{_prefix}/lib$SUF \
-   --with-tklibs=%{_prefix}/lib$SUF
+%configure --with-gnu-ld\
+   --with-tcl=%{_libdir}     \
+   --with-tk=%{_libdir}      \
+   --with-tcllibs=%{_libdir} \
+   --with-tklibs=%{_libdir}
 
-scripts/makedbh database/database.h.in database/database.h
+#scripts/makedbh database/database.h.in database/database.h
 
 %{__make} %{?_smp_mflags}
 
@@ -93,10 +94,7 @@ cd %{name}-%{version}
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
 
-desktop-file-install --vendor fedora            \
-    --add-category "Engineering"                \
-    --add-category "Electronics"                \
-    --remove-category  "Science"                \
+desktop-file-install --vendor ""                \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
@@ -139,7 +137,7 @@ update-desktop-database &> /dev/null || 
 %{_bindir}/ext2spice
 %{_libdir}/%{name}/
 %{_mandir}/man?/*
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %files doc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2009 23:54:55 -0000	1.10
+++ sources	2 Aug 2009 23:00:10 -0000	1.11
@@ -1 +1 @@
-7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz
+7a289a4d8ba6cc1b79774dcea7ac264e  magic-8.0.51.tgz



From jjh at fedoraproject.org  Sun Aug  2 23:01:51 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:01:51 +0000 (UTC)
Subject: rpms/ragel/F-11 .cvsignore, 1.11, 1.12 ragel.spec, 1.17,
	1.18 sources, 1.11, 1.12 ragel-Makefile-install.patch, 1.3, NONE
Message-ID: <20090802230151.5C3BE11C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore ragel.spec sources 
Removed Files:
	ragel-Makefile-install.patch 
Log Message:
update to 6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Apr 2009 00:48:52 -0000	1.11
+++ .cvsignore	2 Aug 2009 23:01:50 -0000	1.12
@@ -1 +1 @@
-ragel-6.4.tar.gz
+ragel-6.5.tar.gz


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-11/ragel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ragel.spec	14 Apr 2009 06:01:31 -0000	1.17
+++ ragel.spec	2 Aug 2009 23:01:51 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           ragel   
-Version:        6.4
-Release:        3%{?dist}
+Version:        6.5
+Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  transfig, tetex-latex, gcc-objc
 Requires:       gawk
 
-Patch0:         ragel-Makefile-install.patch
+Patch0:         ragel-main.patch
 
 %description
 Ragel compiles finite state machines from regular languages into executable C,
@@ -29,21 +29,14 @@ done using inline operators that do not 
 
 %build
 # set the names of the other programming commandline programs
-%configure RUBY=ruby JAVAC=javac GMCS=gmcs 
+%configure --docdir=%{_docdir}/%{name}-%{version} RUBY=ruby JAVAC=javac GMCS=gmcs 
 
 make %{?_smp_mflags}
-pushd doc
-make %{?_smp_mflags}
-popd
 
 
 %install
 rm -rf %{buildroot}
-make prefix=%{buildroot}%{_prefix} install
-chmod a-x examples/*
-pushd doc
-make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} docdir=%{buildroot}%{_docdir}/%{name}-%{version} install
-popd
+make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -52,12 +45,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING ragel.vim
-%doc examples
 %doc doc/ragel-guide.pdf
 %{_bindir}/ragel
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5.1
+- Update to 6.5
+
 * Tue Apr 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-3
 -  remove main.cpp patch for testing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Apr 2009 00:48:52 -0000	1.11
+++ sources	2 Aug 2009 23:01:51 -0000	1.12
@@ -1 +1 @@
-c0dc274083e9d825bfb48966810de046  ragel-6.4.tar.gz
+bb152087079ad7a545dcdc955b752301  ragel-6.5.tar.gz


--- ragel-Makefile-install.patch DELETED ---



From rrankin at fedoraproject.org  Sun Aug  2 23:03:21 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun,  2 Aug 2009 23:03:21 +0000 (UTC)
Subject: rpms/gpsim/EL-5 gpsim.spec,1.18,1.19
Message-ID: <20090802230321.8156511C004A@cvs1.fedora.phx.redhat.com>

Author: rrankin

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

Modified Files:
	gpsim.spec 
Log Message:
Require bison not byacc



Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/gpsim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gpsim.spec	2 Aug 2009 22:26:53 -0000	1.18
+++ gpsim.spec	2 Aug 2009 23:03:21 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.23.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
@@ -11,7 +11,7 @@ Source:		http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, %{_includedir}/popt.h
-BuildRequires:	autoconf libtool automake byacc
+BuildRequires:	autoconf libtool automake bison
 
 
 %description
@@ -93,8 +93,8 @@ autoconf
 %{_includedir}/*
 
 %changelog
-* Mon Aug 03 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-8
-- Add byacc to build requires 
+* Mon Aug 03 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-9
+- Add bison to build requires 
 
 * Sun Aug 02 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-6
 - fix EL-5 has different aclocal version



From jjh at fedoraproject.org  Sun Aug  2 23:11:40 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:11:40 +0000 (UTC)
Subject: rpms/ragel/F-10 .cvsignore, 1.11, 1.12 ragel.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20090802231140.6272011C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore ragel.spec sources 
Log Message:
update to 6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	14 Apr 2009 05:51:37 -0000	1.11
+++ .cvsignore	2 Aug 2009 23:11:39 -0000	1.12
@@ -1 +1 @@
-ragel-6.4.tar.gz
+ragel-6.5.tar.gz


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/ragel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ragel.spec	14 Apr 2009 05:51:37 -0000	1.14
+++ ragel.spec	2 Aug 2009 23:11:40 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           ragel   
-Version:        6.4
+Version:        6.5
 Release:        1%{?dist}
 Summary:        Finite state machine compiler
 
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  transfig, tetex-latex, gcc-objc
 Requires:       gawk
 
-Patch0:         ragel-Makefile-install.patch
+Patch0:         ragel-main.patch
 
 %description
 Ragel compiles finite state machines from regular languages into executable C,
@@ -29,21 +29,14 @@ done using inline operators that do not 
 
 %build
 # set the names of the other programming commandline programs
-%configure RUBY=ruby JAVAC=javac GMCS=gmcs 
+%configure --docdir=%{_docdir}/%{name}-%{version} RUBY=ruby JAVAC=javac GMCS=gmcs 
 
 make %{?_smp_mflags}
-pushd doc
-make %{?_smp_mflags}
-popd
 
 
 %install
 rm -rf %{buildroot}
-make prefix=%{buildroot}%{_prefix} install
-chmod a-x examples/*
-pushd doc
-make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} docdir=%{buildroot}%{_docdir}/%{name}-%{version} install
-popd
+make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -52,12 +45,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING ragel.vim
-%doc examples
 %doc doc/ragel-guide.pdf
 %{_bindir}/ragel
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5.1
+- Update to 6.5
+
 * Mon Apr 13 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 6.4-1
 -  Update to 6.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 Apr 2009 05:51:37 -0000	1.11
+++ sources	2 Aug 2009 23:11:40 -0000	1.12
@@ -1 +1 @@
-c0dc274083e9d825bfb48966810de046  ragel-6.4.tar.gz
+bb152087079ad7a545dcdc955b752301  ragel-6.5.tar.gz



From jjh at fedoraproject.org  Sun Aug  2 23:17:47 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:17:47 +0000 (UTC)
Subject: rpms/ragel/F-10 ragel-main.patch, NONE, 1.1 ragel.spec, 1.15,
	1.16 ragel-Makefile-install.patch, 1.3, NONE
Message-ID: <20090802231747.6DC9411C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	ragel.spec 
Added Files:
	ragel-main.patch 
Removed Files:
	ragel-Makefile-install.patch 
Log Message:
add missing ragel-mai  patch

ragel-main.patch:
 main.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ragel-main.patch ---
diff -up ./ragel/main.cpp.fedora ./ragel/main.cpp
--- ragel/main.cpp.fedora	2009-04-11 19:19:03.000000000 -0600
+++ ragel/main.cpp	2009-04-11 19:18:34.000000000 -0600
@@ -336,7 +336,7 @@ void processArgs( int argc, const char *
 				printStatistics = true;
 				break;
 			case '-': {
-				char *eq = strchr( pc.paramArg, '=' );
+				char *eq = strchr( (char *)pc.paramArg, '=' );
 
 				if ( eq != 0 )
 					*eq++ = 0;
@@ -507,7 +507,7 @@ char *makeIntermedTemplate( const char *
 {
 	char *result = 0;
 	const char *templ = "ragel-XXXXXX.xml";
-	char *lastSlash = strrchr( baseFileName, '/' );
+	char *lastSlash = strrchr( (char *)baseFileName, '/' );
 	if ( lastSlash == 0 ) {
 		result = new char[strlen(templ)+1];
 		strcpy( result, templ );


Index: ragel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ragel/F-10/ragel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ragel.spec	2 Aug 2009 23:11:40 -0000	1.15
+++ ragel.spec	2 Aug 2009 23:17:47 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           ragel   
 Version:        6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Finite state machine compiler
 
 Group:          Development/Tools
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5-2
+- add missing ragel-main patch
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 6.5.1
 - Update to 6.5
 


--- ragel-Makefile-install.patch DELETED ---



From jjh at fedoraproject.org  Sun Aug  2 23:20:21 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:20:21 +0000 (UTC)
Subject: rpms/haproxy/devel .cvsignore, 1.13, 1.14 haproxy.spec, 1.20,
	1.21 sources, 1.13, 1.14
Message-ID: <20090802232021.08A1311C049D@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 May 2009 21:35:41 -0000	1.13
+++ .cvsignore	2 Aug 2009 23:20:20 -0000	1.14
@@ -1 +1 @@
-haproxy-1.3.18.tar.gz
+haproxy-1.3.19.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- haproxy.spec	25 Jul 2009 02:01:50 -0000	1.20
+++ haproxy.spec	2 Aug 2009 23:20:20 -0000	1.21
@@ -5,8 +5,8 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.18
-Release:        2%{?dist}
+Version:        1.3.19
+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
+* 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 May 2009 21:35:41 -0000	1.13
+++ sources	2 Aug 2009 23:20:20 -0000	1.14
@@ -1 +1 @@
-f02639fe9fbb7ecbdf1010f4588714ac  haproxy-1.3.18.tar.gz
+24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz



From jjh at fedoraproject.org  Sun Aug  2 23:26:38 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:26:38 +0000 (UTC)
Subject: rpms/haproxy/F-11 .cvsignore, 1.13, 1.14 haproxy.spec, 1.19,
	1.20 sources, 1.13, 1.14
Message-ID: <20090802232638.1748D11C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 May 2009 21:49:53 -0000	1.13
+++ .cvsignore	2 Aug 2009 23:26:37 -0000	1.14
@@ -1 +1 @@
-haproxy-1.3.18.tar.gz
+haproxy-1.3.19.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- haproxy.spec	17 May 2009 21:49:53 -0000	1.19
+++ haproxy.spec	2 Aug 2009 23:26:37 -0000	1.20
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.18
+Version:        1.3.19
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
+- upate to 1.3.19
+
 * Sun May 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.18-1
 -  update to 1.3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 May 2009 21:49:53 -0000	1.13
+++ sources	2 Aug 2009 23:26:37 -0000	1.14
@@ -1 +1 @@
-f02639fe9fbb7ecbdf1010f4588714ac  haproxy-1.3.18.tar.gz
+24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz



From jjh at fedoraproject.org  Sun Aug  2 23:26:44 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:26:44 +0000 (UTC)
Subject: rpms/haproxy/F-10 .cvsignore, 1.13, 1.14 haproxy.spec, 1.16,
	1.17 sources, 1.13, 1.14
Message-ID: <20090802232644.1042911C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 May 2009 21:49:52 -0000	1.13
+++ .cvsignore	2 Aug 2009 23:26:43 -0000	1.14
@@ -1 +1 @@
-haproxy-1.3.18.tar.gz
+haproxy-1.3.19.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- haproxy.spec	17 May 2009 21:49:53 -0000	1.16
+++ haproxy.spec	2 Aug 2009 23:26:43 -0000	1.17
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.18
+Version:        1.3.19
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
+- update to 1.3.19
+
 * Sun May 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.18-1
 -  update to 1.3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 May 2009 21:49:53 -0000	1.13
+++ sources	2 Aug 2009 23:26:43 -0000	1.14
@@ -1 +1 @@
-f02639fe9fbb7ecbdf1010f4588714ac  haproxy-1.3.18.tar.gz
+24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz



From jjh at fedoraproject.org  Sun Aug  2 23:28:21 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:28:21 +0000 (UTC)
Subject: rpms/haproxy/EL-5 .cvsignore, 1.11, 1.12 haproxy.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <20090802232821.BB0B411C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 May 2009 21:49:52 -0000	1.11
+++ .cvsignore	2 Aug 2009 23:28:21 -0000	1.12
@@ -1 +1 @@
-haproxy-1.3.18.tar.gz
+haproxy-1.3.19.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- haproxy.spec	17 May 2009 21:49:52 -0000	1.15
+++ haproxy.spec	2 Aug 2009 23:28:21 -0000	1.16
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.18
+Version:        1.3.19
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -124,8 +124,11 @@ fi  
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
+- update to 1.3.19
+
 * Sun May 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.18-1
--  update to 13.18
+-  update to 1.3.18
 
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 1.3.17-1
 -  update to 1.3.17


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 May 2009 21:49:52 -0000	1.11
+++ sources	2 Aug 2009 23:28:21 -0000	1.12
@@ -1 +1 @@
-f02639fe9fbb7ecbdf1010f4588714ac  haproxy-1.3.18.tar.gz
+24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz



From pkgdb at fedoraproject.org  Sun Aug  2 23:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 23:31:50 +0000
Subject: [pkgdb] rakudo was added for gerd
Message-ID: <20090802233150.9085D10F89E@bastion2.fedora.phx.redhat.com>

tibbs has added Package rakudo with summary A Perl compiler for Parrot
tibbs has approved Package rakudo
tibbs has added a Fedora devel branch for rakudo with an owner of gerd
tibbs has approved rakudo in Fedora devel
tibbs has approved Package rakudo
tibbs has set commit to Approved for 107427 on rakudo (Fedora devel)
tibbs has set checkout to Approved for 107427 on rakudo (Fedora devel)
tibbs has set build to Approved for 107427 on rakudo (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Aug  2 23:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 23:31:51 +0000
Subject: [pkgdb] rakudo summary updated by tibbs
Message-ID: <20090802233151.A75DC10F8A2@bastion2.fedora.phx.redhat.com>

tibbs set package rakudo summary to A Perl compiler for Parrot

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



From pkgdb at fedoraproject.org  Sun Aug  2 23:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 23:31:51 +0000
Subject: [pkgdb] rakudo (Fedora, 11) updated by tibbs
Message-ID: <20090802233151.AEEB210F8AD@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on rakudo (Fedora devel) for gerd
tibbs approved watchcommits on rakudo (Fedora devel) for gerd

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



From pkgdb at fedoraproject.org  Sun Aug  2 23:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 02 Aug 2009 23:31:51 +0000
Subject: [pkgdb] rakudo (Fedora, 11) updated by tibbs
Message-ID: <20090802233151.B656E10F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for rakudo
tibbs has set commit to Approved for 107427 on rakudo (Fedora 11)
tibbs has set checkout to Approved for 107427 on rakudo (Fedora 11)
tibbs has set build to Approved for 107427 on rakudo (Fedora 11)
tibbs approved watchbugzilla on rakudo (Fedora 11) for gerd
tibbs approved watchcommits on rakudo (Fedora 11) for gerd

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



From tibbs at fedoraproject.org  Sun Aug  2 23:31:58 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 23:31:58 +0000 (UTC)
Subject: rpms/rakudo - New directory
Message-ID: <20090802233158.2B7BB11C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rakudo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsb22677/rpms/rakudo

Log Message:
Directory /cvs/pkgs/rpms/rakudo added to the repository




From tibbs at fedoraproject.org  Sun Aug  2 23:31:58 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 23:31:58 +0000 (UTC)
Subject: rpms/rakudo/devel - New directory
Message-ID: <20090802233158.51AC711C0381@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsb22677/rpms/rakudo/devel

Log Message:
Directory /cvs/pkgs/rpms/rakudo/devel added to the repository




From tibbs at fedoraproject.org  Sun Aug  2 23:32:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 23:32:04 +0000 (UTC)
Subject: rpms/rakudo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090802233204.469F511C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsb22677/rpms/rakudo/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rakudo
# $Id: Makefile,v 1.1 2009/08/02 23:32:04 tibbs Exp $
NAME := rakudo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sun Aug  2 23:32:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sun,  2 Aug 2009 23:32:04 +0000 (UTC)
Subject: rpms/rakudo Makefile,NONE,1.1
Message-ID: <20090802233204.0B25711C004A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rakudo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsb22677/rpms/rakudo

Added Files:
	Makefile 
Log Message:
Setup of module rakudo


--- NEW FILE Makefile ---
# Top level Makefile for module rakudo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From jjh at fedoraproject.org  Sun Aug  2 23:35:26 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:35:26 +0000 (UTC)
Subject: rpms/haproxy/EL-4 .cvsignore, 1.11, 1.12 haproxy.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20090802233526.48EC911C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 May 2009 21:49:51 -0000	1.11
+++ .cvsignore	2 Aug 2009 23:35:26 -0000	1.12
@@ -1 +1 @@
-haproxy-1.3.18.tar.gz
+haproxy-1.3.19.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- haproxy.spec	17 May 2009 21:49:51 -0000	1.14
+++ haproxy.spec	2 Aug 2009 23:35:26 -0000	1.15
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.18
+Version:        1.3.19
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -125,6 +125,9 @@ fi  
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
+- update to 1.3.19
+
 * Sun May 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.18-1
 -  update to 1.3.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 May 2009 21:49:51 -0000	1.11
+++ sources	2 Aug 2009 23:35:26 -0000	1.12
@@ -1 +1 @@
-f02639fe9fbb7ecbdf1010f4588714ac  haproxy-1.3.18.tar.gz
+24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz



From jjh at fedoraproject.org  Sun Aug  2 23:37:06 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun,  2 Aug 2009 23:37:06 +0000 (UTC)
Subject: rpms/haproxy/EL-4 haproxy.spec,1.15,1.16
Message-ID: <20090802233706.D040011C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	haproxy.spec 
Log Message:
rebuilt


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- haproxy.spec	2 Aug 2009 23:35:26 -0000	1.15
+++ haproxy.spec	2 Aug 2009 23:37:06 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.19
-Release:        1%{?dist}
+Release:        2%{?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 Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-2
+- rebuilt
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
 - update to 1.3.19
 



From nbecker at fedoraproject.org  Sun Aug  2 23:42:56 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun,  2 Aug 2009 23:42:56 +0000 (UTC)
Subject: rpms/filelight/devel filelight.ChangeLog.diff, NONE,
	1.1 filelight_part.desktop.diff, NONE, 1.1 filelight.spec, 1.11, 1.12
Message-ID: <20090802234256.1DD1B11C004A@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	filelight.spec 
Added Files:
	filelight.ChangeLog.diff filelight_part.desktop.diff 
Log Message:
Updates for 1.9-rc2


filelight.ChangeLog.diff:
 ChangeLog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE filelight.ChangeLog.diff ---
diff -u ChangeLog.orig ChangeLog
--- ChangeLog.orig	2009-08-02 19:22:12.000000000 -0400
+++ ChangeLog	2009-08-02 19:25:37.000000000 -0400
@@ -52,7 +52,7 @@
      Compile bug fixed for GCC < 3
      Fixed crash bug when scan had been stopped and then back then forward pressed
      Fixed another compile bug for systems that don't support large files (Debian apparently)
-     Internationalisation support thanks to patch from Andr? Somers
+     Internationalisation support thanks to patch from Andr?? Somers
      Made the tooltip translucent (NOT a gimmick, this feature is essential IMO)
      Started making debug messages use kdDebug so users can enable/disable the messages
      Implemented XML GUI

filelight_part.desktop.diff:
 filelight_part.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE filelight_part.desktop.diff ---
--- misc/filelight_part.desktop~	2009-08-02 19:06:43.000000000 -0400
+++ misc/filelight_part.desktop	2009-08-02 19:06:33.000000000 -0400
@@ -12,7 +12,6 @@
 Name[tr]=RadialMap G??r??nt??leme
 Name[uk]=???????????????? RadialMap
 Name[x-test]=xxRadialMap Viewxx
-MimeType=inode/directory;
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=filelightpart
 # X-KDE-PluginKeyword=filelightpart


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- filelight.spec	1 Aug 2009 00:15:30 -0000	1.11
+++ filelight.spec	2 Aug 2009 23:42:55 -0000	1.12
@@ -3,17 +3,19 @@
 Summary: Graphical disk usage statistics
 Name: filelight
 Version: 1.9
-Release: 2.rc2%{?dist}
+Release: 3.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
 %define upstreamversion %{version}-rc2
 Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
-#Patch0: filelight.desktop.patch
+Patch0: filelight_part.desktop.diff
+Patch1: filelight.ChangeLog.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs-devel kdebase-devel desktop-file-utils qimageblitz-devel
+BuildRequires: kdelibs-devel kdebase-devel
+BuildRequires: desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -25,25 +27,28 @@ directories having child segments.
 
 %prep
 %setup -q -n %{name}-%{upstreamversion}
-pushd misc
-sed -i -e 's/MimeType/#MimeType/' filelight_part.desktop
-popd
+%patch0 -p0
+%patch1 -p0
 
 %build
-%{cmake_kde4}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}  VERBOSE=1
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}"
+mkdir %{buildroot}
+%{__make} install DESTDIR="%{buildroot}" -C %{_target_platform}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  \
   --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
   --vendor=""               \
-  --delete-original					\
+  --delete-original                                     \
   ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
 
 desktop-file-install --vendor="" \
@@ -70,8 +75,8 @@ fi
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 #%doc %{_docdir}/HTML/en/filelight/
-%config(noreplace) %{_datadir}/config/filelightrc
-%{_bindir}/filelight
+%{_datadir}/config/filelightrc
+%{_kde4_bindir}/filelight
 %{_kde4_datadir}/applications/kde4/filelight.desktop
 %{_kde4_libdir}/kde4/filelightpart.so
 %{_kde4_datadir}/kde4/apps/filelightpart/
@@ -83,10 +88,15 @@ fi
 
 
 %changelog
+* Sun Aug  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-3.rc2
+- fix some rpmlint complaints:
+- Follow cmake_kde4 recipe
+  untabify
+  convert ChangeLog to utf8
+  don't mark filelightrc as config
+
 * Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-2.rc2
 - Updates for kde4
-
-* Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9rc2-16
 - Update to 1.9rc2
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16



From airlied at fedoraproject.org  Mon Aug  3 00:00:31 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  3 Aug 2009 00:00:31 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-vga-arbiter.patch, 1.2,
	1.3 libpciaccess.spec, 1.22, 1.23
Message-ID: <20090803000031.B369011C0381@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	libpciaccess-vga-arbiter.patch libpciaccess.spec 
Log Message:
* Mon Aug 03 2009 Dave Airlie <airlied at redhat.com> 0.10.6-4
- Add support for default vga arb device selection
- Update libpciaccess VGA arb code for newer kernel API


libpciaccess-vga-arbiter.patch:
 include/pciaccess.h      |   54 ++++++++
 src/Makefile.am          |    7 +
 src/common_interface.c   |   15 ++
 src/common_vgaarb.c      |  314 +++++++++++++++++++++++++++++++++++++++++++++++
 src/common_vgaarb_stub.c |   73 ++++++++++
 src/linux_sysfs.c        |   21 +++
 src/pciaccess_private.h  |    5 
 7 files changed, 489 insertions(+)

Index: libpciaccess-vga-arbiter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-vga-arbiter.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libpciaccess-vga-arbiter.patch	31 Jul 2009 01:31:29 -0000	1.2
+++ libpciaccess-vga-arbiter.patch	3 Aug 2009 00:00:31 -0000	1.3
@@ -1,12 +1,34 @@
-diff -up libpciaccess-0.10.6/include/pciaccess.h.da libpciaccess-0.10.6/include/pciaccess.h
---- libpciaccess-0.10.6/include/pciaccess.h.da	2009-07-31 11:29:24.000000000 +1000
-+++ libpciaccess-0.10.6/include/pciaccess.h	2009-07-31 11:29:36.000000000 +1000
-@@ -21,6 +21,31 @@
-  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  * DEALINGS IN THE SOFTWARE.
-  */
+diff -up libpciaccess-0.10.6/src/common_interface.c.da libpciaccess-0.10.6/src/common_interface.c
+--- libpciaccess-0.10.6/src/common_interface.c.da	2009-08-03 09:57:13.000000000 +1000
++++ libpciaccess-0.10.6/src/common_interface.c	2009-08-03 09:57:21.000000000 +1000
+@@ -124,6 +124,21 @@ pci_device_is_boot_vga( struct pci_devic
+ }
+ 
+ /**
++ * Probe a PCI device to determine if a kernel driver is attached.
++ * 
++ * \param dev Device to query
++ * \return
++ * Zero if no driver attached, 1 if attached kernel drviver
++ */
++int
++pci_device_has_kernel_driver( struct pci_device * dev )
++{
++	if (!pci_sys->methods->has_kernel_driver)
++		return 0;
++	return pci_sys->methods->has_kernel_driver( dev );
++}
++
++/**
+  * Probe a PCI device to learn information about the device.
+  * 
+  * Probes a PCI device to learn various information about the device.  Before
+diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb_stub.c
+--- /dev/null	2009-08-03 09:43:13.273251881 +1000
++++ libpciaccess-0.10.6/src/common_vgaarb_stub.c	2009-08-03 09:57:21.000000000 +1000
+@@ -0,0 +1,73 @@
 +/*
-+ * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
++ * Copyright (c) 2009 Tiago Vignatti
 + *
 + * Permission is hereby granted, free of charge, to any person
 + * obtaining a copy of this software and associated documentation
@@ -30,85 +52,100 @@ diff -up libpciaccess-0.10.6/include/pci
 + * OTHER DEALINGS IN THE SOFTWARE.
 + *
 + */
- 
- /**
-  * \file pciaccess.h
-@@ -50,6 +75,8 @@ struct pci_slot_match;
- extern "C" {
- #endif
- 
-+int pci_device_has_kernel_driver(struct pci_device *dev);
 +
- int pci_device_is_boot_vga(struct pci_device *dev);
- 
- int pci_device_read_rom(struct pci_device *dev, void *buffer);
-@@ -350,6 +377,11 @@ struct pci_device {
-      * the \c pci_device structure.
-      */
-     intptr_t user_data;
++#include <stdio.h>
++#include "pciaccess.h"
 +
-+    /**
-+      * Used by the VGA arbiter. Type of resource decoded by the device and
-+      * the file descriptor (/dev/vga_arbiter). */
-+    int vgaarb_rsrc;
- };
- 
- 
-@@ -449,4 +481,25 @@ struct pci_pcmcia_bridge_info {
- 
- };
- 
++int
++pci_device_vgaarb_init(struct pci_device *dev)
++{
++#ifdef DEBUG
++    fprintf(stderr, "%s: You're using VGA arbiter stub functions!\n",
++                                                            __FUNCTION__);
++#endif
++    return 0;
++}
 +
-+/**
-+ * VGA Arbiter definitions, functions and related.
-+ */
++void
++pci_device_vgaarb_fini(struct pci_device *dev)
++{
++}
 +
-+/* Legacy VGA regions */
-+#define VGA_ARB_RSRC_NONE       0x00
-+#define VGA_ARB_RSRC_LEGACY_IO  0x01
-+#define VGA_ARB_RSRC_LEGACY_MEM 0x02
-+/* Non-legacy access */
-+#define VGA_ARB_RSRC_NORMAL_IO  0x04
-+#define VGA_ARB_RSRC_NORMAL_MEM 0x08
++int
++pci_device_vgaarb_set_target(struct pci_device *dev)
++{
++    return 0;
++}
 +
-+int  pci_device_vgaarb_init         (void);
-+void pci_device_vgaarb_fini         (void);
-+int  pci_device_vgaarb_set_target   (struct pci_device *dev);
-+int  pci_device_vgaarb_decodes      (struct pci_device *dev, int new_vga_rsrc);
-+int  pci_device_vgaarb_lock         (struct pci_device *dev);
-+int  pci_device_vgaarb_trylock      (struct pci_device *dev);
-+int  pci_device_vgaarb_unlock       (struct pci_device *dev);
++int
++pci_device_vgaarb_decodes(struct pci_device *dev)
++{
++    return 0;
++}
 +
- #endif /* PCIACCESS_H */
-diff -up libpciaccess-0.10.6/src/common_interface.c.da libpciaccess-0.10.6/src/common_interface.c
---- libpciaccess-0.10.6/src/common_interface.c.da	2009-07-31 11:29:24.000000000 +1000
-+++ libpciaccess-0.10.6/src/common_interface.c	2009-07-31 11:29:36.000000000 +1000
-@@ -124,6 +124,21 @@ pci_device_is_boot_vga( struct pci_devic
- }
- 
- /**
-+ * Probe a PCI device to determine if a kernel driver is attached.
-+ * 
-+ * \param dev Device to query
-+ * \return
-+ * Zero if no driver attached, 1 if attached kernel drviver
-+ */
 +int
-+pci_device_has_kernel_driver( struct pci_device * dev )
++pci_device_vgaarb_lock(struct pci_device *dev)
 +{
-+	if (!pci_sys->methods->has_kernel_driver)
-+		return 0;
-+	return pci_sys->methods->has_kernel_driver( dev );
++    return 0;
 +}
 +
-+/**
-  * Probe a PCI device to learn information about the device.
-  * 
-  * Probes a PCI device to learn various information about the device.  Before
++int
++pci_device_vgaarb_trylock(struct pci_device *dev)
++{
++    return 0;
++}
++
++int
++pci_device_vgaarb_unlock(struct pci_device *dev)
++{
++    return 0;
++}
+diff -up libpciaccess-0.10.6/src/linux_sysfs.c.da libpciaccess-0.10.6/src/linux_sysfs.c
+--- libpciaccess-0.10.6/src/linux_sysfs.c.da	2009-08-03 09:57:13.000000000 +1000
++++ libpciaccess-0.10.6/src/linux_sysfs.c	2009-08-03 09:57:21.000000000 +1000
+@@ -78,6 +78,7 @@ static int pci_device_linux_sysfs_write(
+     pciaddr_t * bytes_written );
+ 
+ static int pci_device_linux_sysfs_boot_vga( struct pci_device * dev );
++static int pci_device_linux_sysfs_has_kernel_driver(struct pci_device *dev);
+ 
+ static const struct pci_system_methods linux_sysfs_methods = {
+     .destroy = pci_device_linux_sysfs_destroy,
+@@ -93,6 +94,7 @@ static const struct pci_system_methods l
+     .fill_capabilities = pci_fill_capabilities_generic,
+     .enable = pci_device_linux_sysfs_enable,
+     .boot_vga = pci_device_linux_sysfs_boot_vga,
++    .has_kernel_driver = pci_device_linux_sysfs_has_kernel_driver,
+ };
+ 
+ #define SYS_BUS_PCI "/sys/bus/pci/devices"
+@@ -761,3 +763,22 @@ out:
+     close(fd);
+     return ret;
+ }
++
++static int pci_device_linux_sysfs_has_kernel_driver(struct pci_device *dev)
++{
++    char name[256];
++    struct stat dummy;
++    int ret;
++
++    snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/driver",
++	      SYS_BUS_PCI,
++	      dev->domain,
++	      dev->bus,
++	      dev->dev,
++	      dev->func );
++    
++    ret = stat(name, &dummy);
++    if (ret < 0)
++	return 0;
++    return 1;
++}
 diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb.c
---- /dev/null	2009-07-28 15:36:51.159175345 +1000
-+++ libpciaccess-0.10.6/src/common_vgaarb.c	2009-07-31 11:29:36.000000000 +1000
-@@ -0,0 +1,245 @@
+--- /dev/null	2009-08-03 09:43:13.273251881 +1000
++++ libpciaccess-0.10.6/src/common_vgaarb.c	2009-08-03 09:57:21.000000000 +1000
+@@ -0,0 +1,314 @@
 +/*
 + * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
 + *               2009 Tiago Vignatti
@@ -149,13 +186,108 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +
 +#define BUFSIZE 64
 +
++static int
++parse_string_to_decodes_rsrc(char *input, int *vga_count, struct pci_slot_match *match)
++{
++    char *tok;
++    char *input_sp, *count_sp, *pci_sp;
++    char tmp[32];
++
++    tok = strtok_r(input,",",&input_sp);
++    if (!tok)
++	goto fail;
++
++    strncpy(tmp, input, 15);
++    tmp[15] = 0;
++
++    tok = strtok_r(tmp,":",&count_sp);
++    if (!tok)
++	goto fail;
++    tok = strtok_r(NULL, ":",&count_sp);
++    if (!tok)
++	goto fail;
++
++    *vga_count = strtoul(tok, NULL, 10);
++    if (*vga_count == LONG_MAX)
++	goto fail;
++
++#ifdef DEBUG
++    fprintf(stderr,"vga count is %d\n", *vga_count);
++#endif
++
++    tok = strtok_r(NULL, ",",&input_sp);
++    if (!tok)
++	goto fail;
++
++    if (match) {
++	strncpy(tmp, tok, 32);
++	tmp[31] = 0;
++	tok = strtok_r(tmp, ":", &pci_sp);
++    	if (!tok)
++ 	    goto fail;
++	tok = strtok_r(NULL, ":", &pci_sp);
++    	if (!tok)
++ 	    goto fail;
++	match->domain = strtoul(tok, NULL, 16);
++
++	tok = strtok_r(NULL, ":", &pci_sp);
++    	if (!tok)
++ 	    goto fail;
++	match->bus = strtoul(tok, NULL, 16);
++
++	tok = strtok_r(NULL, ".", &pci_sp);
++    	if (!tok)
++ 	    goto fail;
++	match->dev = strtoul(tok, NULL, 16);
++
++	tok = strtok_r(NULL, ".", &pci_sp);
++    	if (!tok)
++ 	    goto fail;
++	match->func = strtoul(tok, NULL, 16);
++    }
++
++    tok = strtok_r(NULL, ",",&input_sp);
++    if (!tok)
++	goto fail;
++    tok = strtok_r(tok, "=", &input_sp);
++    if (!tok)
++	goto fail;
++    tok = strtok_r(NULL, "=", &input_sp);
++    if (!tok)
++	goto fail;
++
++    if (!strncmp(tok, "io+mem", 6))
++    	return VGA_ARB_RSRC_LEGACY_IO | VGA_ARB_RSRC_LEGACY_MEM;
++    if (!strncmp(tok, "io", 2))
++    	return VGA_ARB_RSRC_LEGACY_IO;
++    if (!strncmp(tok, "mem", 3))
++    	return VGA_ARB_RSRC_LEGACY_MEM;
++fail:
++    return VGA_ARB_RSRC_NONE;
++}
++
 +int
 +pci_device_vgaarb_init(void)
 +{
++    struct pci_slot_match match;
++    char buf[BUFSIZE];
++    int ret, rsrc;
 +    if ((pci_sys->vgaarb_fd = open ("/dev/vga_arbiter", O_RDWR)) < 0) {
 +        return errno;
 +    }
 +
++    ret = read(pci_sys->vgaarb_fd, buf, BUFSIZE);
++    if (ret <= 0)
++	return -1;
++
++    memset(&match, 0xff, sizeof(match));
++    /* need to find the device to go back to and what it was decoding */
++    rsrc = parse_string_to_decodes_rsrc(buf, &pci_sys->vga_count, &match);
++    
++    pci_sys->vga_default_dev = pci_device_find_by_slot(match.domain, match.bus, match.dev, match.func);
++    
++    if (pci_sys->vga_default_dev)
++        pci_sys->vga_default_dev->vgaarb_rsrc = rsrc;
 +    return 0;
 +}
 +
@@ -211,53 +343,6 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +    return 0;
 +}
 +
-+static int
-+parse_string_to_decodes_rsrc(char *input, int *vga_count)
-+{
-+    char *tok;
-+    char count[16];
-+
-+    strncpy(count, input, 10);
-+    count[11] = 0;
-+
-+    tok = strtok(count,":");
-+    if (!tok)
-+	goto fail;
-+    tok = strtok(NULL, "");
-+    if (!tok)
-+	goto fail;
-+
-+    *vga_count = strtoul(tok, NULL, 10);
-+    if (*vga_count == LONG_MAX)
-+	goto fail;
-+
-+#ifdef DEBUG
-+    fprintf(stderr,"vga count is %d\n", *vga_count);
-+#endif
-+
-+    tok = strtok(input, ",");
-+    if (!tok)
-+	goto fail;
-+
-+    tok = strtok(NULL, ",");
-+    if (!tok)
-+	goto fail;
-+    tok = strtok(tok, "=");
-+    if (!tok)
-+	goto fail;
-+    tok = strtok(NULL, "=");
-+    if (!tok)
-+	goto fail;
-+
-+    if (!strncmp(tok, "io+mem", 6))
-+    	return VGA_ARB_RSRC_LEGACY_IO | VGA_ARB_RSRC_LEGACY_MEM;
-+    if (!strncmp(tok, "io", 2))
-+    	return VGA_ARB_RSRC_LEGACY_IO;
-+    if (!strncmp(tok, "mem", 3))
-+    	return VGA_ARB_RSRC_LEGACY_MEM;
-+fail:
-+    return VGA_ARB_RSRC_NONE;
-+}
 +
 +static const char *
 +rsrc_to_str(int iostate)
@@ -281,7 +366,12 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +    char buf[BUFSIZE];
 +    int ret;
 +
-+    len = snprintf(buf, BUFSIZE, "target PCI:%d:%d:%d.%d",
++    if (!dev)
++	dev = pci_sys->vga_default_dev;
++    if (!dev)
++	return -1;
++
++    len = snprintf(buf, BUFSIZE, "target PCI:%04x:%02x:%02x.%x",
 +                   dev->domain, dev->bus, dev->dev, dev->func);
 +
 +    ret = vgaarb_write(pci_sys->vgaarb_fd, buf, len);
@@ -292,17 +382,21 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +    if (ret <= 0)
 +	return -1;
 +
-+    dev->vgaarb_rsrc = parse_string_to_decodes_rsrc(buf, &pci_sys->vga_count);
++    dev->vgaarb_rsrc = parse_string_to_decodes_rsrc(buf, &pci_sys->vga_count, NULL);
++    pci_sys->vga_target = dev;
 +    return 0;
 +}
 +
 +int
-+pci_device_vgaarb_decodes(struct pci_device *dev, int new_vgaarb_rsrc)
++pci_device_vgaarb_decodes(int new_vgaarb_rsrc)
 +{
 +    int len;
 +    char buf[BUFSIZE];
 +    int ret;
++    struct pci_device *dev = pci_sys->vga_target;
 +
++    if (!dev)
++	return -1;
 +    if (dev->vgaarb_rsrc == new_vgaarb_rsrc)
 +	return 0;
 +
@@ -314,10 +408,14 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +}
 +
 +int
-+pci_device_vgaarb_lock(struct pci_device *dev)
++pci_device_vgaarb_lock(void)
 +{
 +    int len;
 +    char buf[BUFSIZE];
++    struct pci_device *dev = pci_sys->vga_target;
++
++    if (!dev)
++	return -1;
 +
 +    if (dev->vgaarb_rsrc == 0 || pci_sys->vga_count == 1)
 +        return 0;
@@ -328,10 +426,14 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +}
 +
 +int
-+pci_device_vgaarb_trylock(struct pci_device *dev)
++pci_device_vgaarb_trylock(void)
 +{
 +    int len;
 +    char buf[BUFSIZE];
++    struct pci_device *dev = pci_sys->vga_target;
++
++    if (!dev)
++	return -1;
 +
 +    if (dev->vgaarb_rsrc == 0 || pci_sys->vga_count == 1)
 +        return 0;
@@ -342,10 +444,14 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +}
 +
 +int
-+pci_device_vgaarb_unlock(struct pci_device *dev)
++pci_device_vgaarb_unlock(void)
 +{
 +    int len;
 +    char buf[BUFSIZE];
++    struct pci_device *dev = pci_sys->vga_target;
++
++    if (!dev)
++	return -1;
 +
 +    if (dev->vgaarb_rsrc == 0 || pci_sys->vga_count == 1)
 +        return 0;
@@ -354,128 +460,9 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +
 +    return vgaarb_write(pci_sys->vgaarb_fd, buf, len);
 +}
-diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb_stub.c
---- /dev/null	2009-07-28 15:36:51.159175345 +1000
-+++ libpciaccess-0.10.6/src/common_vgaarb_stub.c	2009-07-31 11:29:36.000000000 +1000
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2009 Tiago Vignatti
-+ *
-+ * Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use,
-+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following
-+ * conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include "pciaccess.h"
-+
-+int
-+pci_device_vgaarb_init(struct pci_device *dev)
-+{
-+#ifdef DEBUG
-+    fprintf(stderr, "%s: You're using VGA arbiter stub functions!\n",
-+                                                            __FUNCTION__);
-+#endif
-+    return 0;
-+}
-+
-+void
-+pci_device_vgaarb_fini(struct pci_device *dev)
-+{
-+}
-+
-+int
-+pci_device_vgaarb_set_target(struct pci_device *dev)
-+{
-+    return 0;
-+}
-+
-+int
-+pci_device_vgaarb_decodes(struct pci_device *dev)
-+{
-+    return 0;
-+}
-+
-+int
-+pci_device_vgaarb_lock(struct pci_device *dev)
-+{
-+    return 0;
-+}
-+
-+int
-+pci_device_vgaarb_trylock(struct pci_device *dev)
-+{
-+    return 0;
-+}
-+
-+int
-+pci_device_vgaarb_unlock(struct pci_device *dev)
-+{
-+    return 0;
-+}
-diff -up libpciaccess-0.10.6/src/linux_sysfs.c.da libpciaccess-0.10.6/src/linux_sysfs.c
---- libpciaccess-0.10.6/src/linux_sysfs.c.da	2009-07-31 11:29:24.000000000 +1000
-+++ libpciaccess-0.10.6/src/linux_sysfs.c	2009-07-31 11:29:36.000000000 +1000
-@@ -78,6 +78,7 @@ static int pci_device_linux_sysfs_write(
-     pciaddr_t * bytes_written );
- 
- static int pci_device_linux_sysfs_boot_vga( struct pci_device * dev );
-+static int pci_device_linux_sysfs_has_kernel_driver(struct pci_device *dev);
- 
- static const struct pci_system_methods linux_sysfs_methods = {
-     .destroy = pci_device_linux_sysfs_destroy,
-@@ -93,6 +94,7 @@ static const struct pci_system_methods l
-     .fill_capabilities = pci_fill_capabilities_generic,
-     .enable = pci_device_linux_sysfs_enable,
-     .boot_vga = pci_device_linux_sysfs_boot_vga,
-+    .has_kernel_driver = pci_device_linux_sysfs_has_kernel_driver,
- };
- 
- #define SYS_BUS_PCI "/sys/bus/pci/devices"
-@@ -761,3 +763,22 @@ out:
-     close(fd);
-     return ret;
- }
-+
-+static int pci_device_linux_sysfs_has_kernel_driver(struct pci_device *dev)
-+{
-+    char name[256];
-+    struct stat dummy;
-+    int ret;
-+
-+    snprintf( name, 255, "%s/%04x:%02x:%02x.%1u/driver",
-+	      SYS_BUS_PCI,
-+	      dev->domain,
-+	      dev->bus,
-+	      dev->dev,
-+	      dev->func );
-+    
-+    ret = stat(name, &dummy);
-+    if (ret < 0)
-+	return 0;
-+    return 1;
-+}
 diff -up libpciaccess-0.10.6/src/Makefile.am.da libpciaccess-0.10.6/src/Makefile.am
 --- libpciaccess-0.10.6/src/Makefile.am.da	2009-04-18 15:01:36.000000000 +1000
-+++ libpciaccess-0.10.6/src/Makefile.am	2009-07-31 11:29:36.000000000 +1000
++++ libpciaccess-0.10.6/src/Makefile.am	2009-08-03 09:57:21.000000000 +1000
 @@ -45,6 +45,12 @@ if SOLARIS
  OS_SUPPORT = solx_devfs.c pci_tools.h
  endif
@@ -498,8 +485,8 @@ diff -up libpciaccess-0.10.6/src/Makefil
  
  INCLUDES = -I$(top_srcdir)/include
 diff -up libpciaccess-0.10.6/src/pciaccess_private.h.da libpciaccess-0.10.6/src/pciaccess_private.h
---- libpciaccess-0.10.6/src/pciaccess_private.h.da	2009-07-31 11:29:24.000000000 +1000
-+++ libpciaccess-0.10.6/src/pciaccess_private.h	2009-07-31 11:29:36.000000000 +1000
+--- libpciaccess-0.10.6/src/pciaccess_private.h.da	2009-08-03 09:57:13.000000000 +1000
++++ libpciaccess-0.10.6/src/pciaccess_private.h	2009-08-03 09:57:21.000000000 +1000
 @@ -61,6 +61,7 @@ struct pci_system_methods {
      int (*fill_capabilities)( struct pci_device * dev );
      void (*enable)( struct pci_device *dev );
@@ -508,12 +495,97 @@ diff -up libpciaccess-0.10.6/src/pciacce
  };
  
  struct pci_device_mapping {
-@@ -131,6 +132,8 @@ struct pci_system {
+@@ -131,6 +132,10 @@ struct pci_system {
  #ifdef HAVE_MTRR
      int mtrr_fd;
  #endif
 +    int vgaarb_fd;
 +    int vga_count;
++    struct pci_device *vga_target;
++    struct pci_device *vga_default_dev;
  };
  
  extern struct pci_system * pci_sys;
+diff -up libpciaccess-0.10.6/include/pciaccess.h.da libpciaccess-0.10.6/include/pciaccess.h
+--- libpciaccess-0.10.6/include/pciaccess.h.da	2009-08-03 09:57:13.000000000 +1000
++++ libpciaccess-0.10.6/include/pciaccess.h	2009-08-03 09:57:21.000000000 +1000
+@@ -21,6 +21,31 @@
+  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  * DEALINGS IN THE SOFTWARE.
+  */
++/*
++ * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
++ *
++ * 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.
++ *
++ */
+ 
+ /**
+  * \file pciaccess.h
+@@ -50,6 +75,8 @@ struct pci_slot_match;
+ extern "C" {
+ #endif
+ 
++int pci_device_has_kernel_driver(struct pci_device *dev);
++
+ int pci_device_is_boot_vga(struct pci_device *dev);
+ 
+ int pci_device_read_rom(struct pci_device *dev, void *buffer);
+@@ -350,6 +377,11 @@ struct pci_device {
+      * the \c pci_device structure.
+      */
+     intptr_t user_data;
++
++    /**
++      * Used by the VGA arbiter. Type of resource decoded by the device and
++      * the file descriptor (/dev/vga_arbiter). */
++    int vgaarb_rsrc;
+ };
+ 
+ 
+@@ -449,4 +481,26 @@ struct pci_pcmcia_bridge_info {
+ 
+ };
+ 
++
++/**
++ * VGA Arbiter definitions, functions and related.
++ */
++
++/* Legacy VGA regions */
++#define VGA_ARB_RSRC_NONE       0x00
++#define VGA_ARB_RSRC_LEGACY_IO  0x01
++#define VGA_ARB_RSRC_LEGACY_MEM 0x02
++/* Non-legacy access */
++#define VGA_ARB_RSRC_NORMAL_IO  0x04
++#define VGA_ARB_RSRC_NORMAL_MEM 0x08
++
++int  pci_device_vgaarb_init         (void);
++void pci_device_vgaarb_fini         (void);
++int  pci_device_vgaarb_set_target   (struct pci_device *dev);
++/* use the targetted device */
++int  pci_device_vgaarb_decodes      (int new_vga_rsrc);
++int  pci_device_vgaarb_lock         (void);
++int  pci_device_vgaarb_trylock      (void);
++int  pci_device_vgaarb_unlock       (void);
++
+ #endif /* PCIACCESS_H */


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libpciaccess.spec	31 Jul 2009 03:23:53 -0000	1.22
+++ libpciaccess.spec	3 Aug 2009 00:00:31 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.10.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -74,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Mon Aug 03 2009 Dave Airlie <airlied at redhat.com> 0.10.6-4
+- Add support for default vga arb device selection
+- Update libpciaccess VGA arb code for newer kernel API
+
 * Fri Jul 31 2009 Dave Airlie <airlied at redhat.com> 0.10.6-3
 - enable autoreconf to rebuild configure properly
 



From mclasen at fedoraproject.org  Mon Aug  3 00:47:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 00:47:52 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.277,1.278
Message-ID: <20090803004752.8B7EB11C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus.spec 
Log Message:
Drop desktop-backgrounds-basic dep



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- nautilus.spec	25 Jul 2009 15:46:03 -0000	1.277
+++ nautilus.spec	3 Aug 2009 00:47:52 -0000	1.278
@@ -3,7 +3,6 @@
 %define gtk2_version 2.16.0
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
-%define desktop_backgrounds_version 2.0-4
 %define desktop_file_utils_version 0.7
 %define gnome_desktop_version 2.25.5
 %define redhat_menus_version 0.25
@@ -16,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.27.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -25,7 +24,6 @@ URL: 		http://projects.gnome.org/nautilu
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gamin
 Requires:       filesystem >= 2.1.1-1
-Requires:       desktop-backgrounds-basic >= %{desktop_backgrounds_version}
 Requires:       redhat-menus >= %{redhat_menus_version}
 Requires:       gvfs >= 1.0.3
 Requires:       gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -140,7 +138,7 @@ CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 
 export tagname=CC
 LANG=en_US make %{?_smp_mflags}
@@ -263,6 +261,10 @@ fi
 
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-3
+- Drop desktop-backgrounds-basic dep that we've carried for 9 years
+  without ever making use of it
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjh at fedoraproject.org  Mon Aug  3 01:04:00 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 01:04:00 +0000 (UTC)
Subject: rpms/nginx/devel .cvsignore, 1.22, 1.23 nginx-conf.patch, 1.3,
	1.4 nginx.spec, 1.35, 1.36 sources, 1.22, 1.23
Message-ID: <20090803010400.77F0B11C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore nginx-conf.patch nginx.spec sources 
Log Message:
update to 0.7.61


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	11 Apr 2009 22:59:28 -0000	1.22
+++ .cvsignore	3 Aug 2009 01:04:00 -0000	1.23
@@ -1 +1 @@
-nginx-0.6.36.tar.gz
+nginx-0.7.61.tar.gz

nginx-conf.patch:
 nginx.conf |  105 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 53 insertions(+), 52 deletions(-)

Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nginx-conf.patch	27 May 2008 04:28:23 -0000	1.3
+++ nginx-conf.patch	3 Aug 2009 01:04:00 -0000	1.4
@@ -1,12 +1,13 @@
---- conf/nginx.conf.orig	2008-05-11 21:19:44.000000000 -0600
-+++ conf/nginx.conf	2008-05-11 22:20:32.000000000 -0600
-@@ -1,28 +1,59 @@
+diff -up conf/nginx.conf.orig conf/nginx.conf
+--- conf/nginx.conf.orig	2009-04-06 07:43:46.000000000 -0600
++++ conf/nginx.conf	2009-08-02 18:32:19.000000000 -0600
+@@ -1,28 +1,58 @@
 +#######################################################################
 +#
 +# This is the main Nginx configuration file.  
 +#
 +# More information about the configuration options is available on 
-+#   * the English wiki - http://wiki.codemongers.com/Main
++#   * the English wiki - http://wiki.nginx.org/Main
 +#   * the Russian documentation - http://sysoev.ru/nginx/
 +#
 +#######################################################################
@@ -14,7 +15,7 @@
 +#----------------------------------------------------------------------
 +# Main Module - directives that cover basic functionality
 +#
-+#   http://wiki.codemongers.com/NginxMainModule
++#   http://wiki.nginx.org/NginxHttpMainModule
 +#
 +#----------------------------------------------------------------------
  
@@ -25,22 +26,21 @@
 -#error_log  logs/error.log;
 -#error_log  logs/error.log  notice;
 -#error_log  logs/error.log  info;
-+error_log         /var/log/nginx/error.log;
-+#error_log        /var/log/nginx/error.log  notice;
-+#error_log        /var/log/nginx/error.log  info;
++error_log  /var/log/nginx/error.log;
++#error_log  /var/log/nginx/error.log  notice;
++#error_log  /var/log/nginx/error.log  info;
++
++pid        /var/run/nginx.pid;
  
 -#pid        logs/nginx.pid;
-+pid               /var/run/nginx.pid;
- 
  
-+
 +#----------------------------------------------------------------------
 +# Events Module 
 +#
-+#   http://wiki.codemongers.com/NginxEventsModule
++#   http://wiki.nginx.org/NginxHttpEventsModule
 +#
 +#----------------------------------------------------------------------
-+
+ 
  events {
      worker_connections  1024;
  }
@@ -49,7 +49,7 @@
 +#----------------------------------------------------------------------
 +# HTTP Core Module
 +#
-+#   http://wiki.codemongers.com/NginxHttpCoreModule 
++#   http://wiki.nginx.org/NginxHttpCoreModule 
 +#
 +#----------------------------------------------------------------------
 +
@@ -58,11 +58,11 @@
 +    include       /etc/nginx/mime.types;
      default_type  application/octet-stream;
  
--    #log_format  main  '$remote_addr - $remote_user [$time_local] $request '
--    #                  '"$status" $body_bytes_sent "$http_referer" '
+-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+-    #                  '$status $body_bytes_sent "$http_referer" '
 -    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-+    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
-+                      '"$status" $body_bytes_sent "$http_referer" '
++    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
++                      '$status $body_bytes_sent "$http_referer" '
 +                      '"$http_user_agent" "$http_x_forwarded_for"';
  
 -    #access_log  logs/access.log  main;
@@ -70,7 +70,7 @@
  
      sendfile        on;
      #tcp_nopush     on;
-@@ -31,27 +62,36 @@
+@@ -31,27 +61,36 @@ http {
      keepalive_timeout  65;
  
      #gzip  on;
@@ -82,9 +82,8 @@
 +    # The default server
 +    #
      server {
--        listen       80;
+         listen       80;
 -        server_name  localhost;
-+        listen       80;
 +        server_name  _;
  
          #charset koi8-r;
@@ -112,7 +111,7 @@
          }
  
          # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -77,42 +117,4 @@
+@@ -77,42 +116,4 @@ http {
          #    deny  all;
          #}
      }


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nginx.spec	25 Jul 2009 19:19:42 -0000	1.35
+++ nginx.spec	3 Aug 2009 01:04:00 -0000	1.36
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.36
-Release:        3%{?dist}
+Version:        0.7.61
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -174,6 +174,9 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61-1
+- Update to new stable 0.7.61
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.36-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	11 Apr 2009 22:59:28 -0000	1.22
+++ sources	3 Aug 2009 01:04:00 -0000	1.23
@@ -1 +1 @@
-15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz
+6ebf89b9b00a3b82734e93c32da7df07  nginx-0.7.61.tar.gz



From rdieter at fedoraproject.org  Mon Aug  3 01:04:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 01:04:32 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.0-microblog_post.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.49, 1.50
Message-ID: <20090803010432.7361111C004A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8041

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.0-microblog_post.patch 
Log Message:
* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- fix to allow updating of status via microblog plasmoid 


kdeplasma-addons-4.3.0-microblog_post.patch:
 microblog.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdeplasma-addons-4.3.0-microblog_post.patch ---
diff -up kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp.microblog_post kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp
--- kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp.microblog_post	2009-07-08 09:51:15.000000000 -0500
+++ kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp	2009-08-02 20:01:43.134679555 -0500
@@ -751,6 +751,7 @@ void MicroBlog::updateStatus()
     KConfigGroup cg = m_service->operationDescription("update");
     cg.writeEntry("password", m_password);
     cg.writeEntry("status", status);
+    m_service->startOperationCall(cg);
     //m_statusUpdates.insert(m_service->startOperationCall(cg), status);
     connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(updateCompleted(Plasma::ServiceJob*)));
     connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(serviceFinished(Plasma::ServiceJob*)));


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- kdeplasma-addons.spec	30 Jul 2009 09:36:55 -0000	1.49
+++ kdeplasma-addons.spec	3 Aug 2009 01:04:32 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -14,6 +14,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # akonadi launch on first login
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
+## upstream patches
+# http://websvn.kde.org/?view=rev&revision=1004203
+Patch100: kdeplasma-addons-4.3.0-microblog_post.patch
+
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
 BuildRequires:  gettext
@@ -60,6 +64,8 @@ Additional plasmoids for KDE.
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
 
+%patch100 -p1 -b .microblog_post
+
 
 %build
 
@@ -139,6 +145,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- fix to allow updating of status via microblog plasmoid 
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:17 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010616.F420E10F886@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:17 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010617.4C62C10F8A1@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:21 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010621.C561D10F8AC@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:31 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010631.3543C10F886@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-cangjie (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:34 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010634.3F2DC10F8B1@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-cangjie (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:35 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010635.5646A10F8B5@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-cangjie (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:37 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010637.A593E10F8B9@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:44 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010644.4FAF710F89F@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-cangjie (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:40 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010640.432A310F8BC@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-cangjie (Fedora 11) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:45 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010645.6C44510F8A9@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-cangjie (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:46 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010646.84C1F10F8C1@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:06:48 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803010648.DD91810F8C4@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-cangjie (Fedora 10) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:09 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010709.BE99610F8B0@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-quick (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:11 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010711.0DB9F10F8B4@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-quick (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:12 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010712.C578810F8C7@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-quick (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:19 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010719.14AF210F8B9@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-quick (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:15 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010715.2B74910F8B7@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-quick (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:20 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010720.65B4810F8CC@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-quick (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:23 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010723.467D010F8CF@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-quick (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From pkgdb at fedoraproject.org  Mon Aug  3 01:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 01:07:24 +0000
Subject: [pkgdb] ibus-table-quick had acl change status
Message-ID: <20090803010724.73C1B10F8D1@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-quick (Fedora 11) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-quick



From bpepple at fedoraproject.org  Mon Aug  3 01:41:33 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon,  3 Aug 2009 01:41:33 +0000 (UTC)
Subject: rpms/telepathy-sofiasip/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 telepathy-sofiasip.spec, 1.7, 1.8
Message-ID: <20090803014133.9CD0A11C004A@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-sofiasip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15051

Modified Files:
	.cvsignore sources telepathy-sofiasip.spec 
Log Message:
* Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.17-1
- Update to 0.5.17.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Feb 2009 23:44:54 -0000	1.6
+++ .cvsignore	3 Aug 2009 01:41:33 -0000	1.7
@@ -1 +1 @@
-telepathy-sofiasip-0.5.15.tar.gz
+telepathy-sofiasip-0.5.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Feb 2009 23:44:54 -0000	1.6
+++ sources	3 Aug 2009 01:41:33 -0000	1.7
@@ -1 +1 @@
-cb953dec2c5374c3161a86b136e27ef5  telepathy-sofiasip-0.5.15.tar.gz
+ac2d6338781cf7a458b8b4150f9b81d8  telepathy-sofiasip-0.5.17.tar.gz


Index: telepathy-sofiasip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/telepathy-sofiasip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- telepathy-sofiasip.spec	27 Jul 2009 05:45:08 -0000	1.7
+++ telepathy-sofiasip.spec	3 Aug 2009 01:41:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           telepathy-sofiasip
-Version:        0.5.15
-Release:        3%{?dist}
+Version:        0.5.17
+Release:        1%{?dist}
 Summary:        SIP connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
-BuildRequires:  telepathy-glib-devel >= 0.7.17
+BuildRequires:  telepathy-glib-devel >= 0.7.27
 BuildRequires:  sofia-sip-glib-devel >= 1.12.10
 BuildRequires:  libxslt
 BuildRequires:  python
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.17-1
+- Update to 0.5.17.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Aug  3 01:45:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 01:45:31 +0000 (UTC)
Subject: rpms/gnome-backgrounds/devel gnome-backgrounds.spec,1.26,1.27
Message-ID: <20090803014531.8186811C004A@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-backgrounds.spec 
Log Message:
co-own /usr/share/backgrounds



Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gnome-backgrounds.spec	25 Jul 2009 00:35:08 -0000	1.26
+++ gnome-backgrounds.spec	3 Aug 2009 01:45:31 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
 Version: 2.24.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
@@ -11,9 +11,6 @@ BuildArch: noarch
 BuildRequires: intltool
 BuildRequires: gettext
 
-# for /usr/share/backgrounds
-Requires: desktop-backgrounds-basic
-
 Patch0: gnome-backgrounds-paths.patch
 
 %description
@@ -48,9 +45,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING NEWS README AUTHORS
 %{_datadir}/gnome-background-properties
+%dir %{_datadir}/backgrounds
 %{_datadir}/backgrounds/*
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-3
+- Co-own /usr/share/backgrounds instead of requiring desktop-backgrounds-basic
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From whot at fedoraproject.org  Mon Aug  3 01:51:36 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  3 Aug 2009 01:51:36 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-11 .cvsignore, 1.14, 1.15 sources,
	1.14, 1.15 xorg-x11-drv-synaptics.spec, 1.34,
	1.35 synaptics-1.1.2-auto-adjust-edges.patch, 1.1, NONE
Message-ID: <20090803015136.E469F11C004A@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17391

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Removed Files:
	synaptics-1.1.2-auto-adjust-edges.patch 
Log Message:
* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.3-1
- synaptics 1.1.3
- synaptics-1.1.2-auto-adjust-edges.patch: Drop.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Jul 2009 00:14:15 -0000	1.14
+++ .cvsignore	3 Aug 2009 01:51:36 -0000	1.15
@@ -1 +1 @@
-xf86-input-synaptics-1.1.2.tar.bz2
+xf86-input-synaptics-1.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	6 Jul 2009 00:14:15 -0000	1.14
+++ sources	3 Aug 2009 01:51:36 -0000	1.15
@@ -1 +1 @@
-c8fd6516f9636a3751e401e4b836e160  xf86-input-synaptics-1.1.2.tar.bz2
+fa002949c6b4cdd5a4f792e5dbb824f5  xf86-input-synaptics-1.1.3.tar.bz2


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-11/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-synaptics.spec	6 Jul 2009 00:38:24 -0000	1.34
+++ xorg-x11-drv-synaptics.spec	3 Aug 2009 01:51:36 -0000	1.35
@@ -6,8 +6,8 @@
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,9 +18,6 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
-# RH 502548, FDO 21001, should be in synaptics-1.1.3
-Patch01:        synaptics-1.1.2-auto-adjust-edges.patch
-
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -77,8 +74,6 @@ Features:
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
 
-%patch1 -p1 -b .auto-adjust-edges
-
 %build
 autoreconf -v --install --force || exit 1
 %configure --disable-static
@@ -126,6 +121,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.3-1
+- synaptics 1.1.3
+- synaptics-1.1.2-auto-adjust-edges.patch: Drop.
+
 * Mon Jul 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.2-2
 - synaptics-1.1.2-auto-adjust-edges.patch: auto-adjust the edges when the
   actual values go past min/max (#502548).


--- synaptics-1.1.2-auto-adjust-edges.patch DELETED ---



From jjh at fedoraproject.org  Mon Aug  3 02:00:17 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:00:17 +0000 (UTC)
Subject: rpms/nginx/F-11 .cvsignore, 1.22, 1.23 nginx-conf.patch, 1.3,
	1.4 nginx.init, 1.4, 1.5 nginx.spec, 1.33, 1.34 sources, 1.22, 1.23
Message-ID: <20090803020017.D6ABF11C0381@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore nginx-conf.patch nginx.init nginx.spec sources 
Log Message:
update to 0.7.61


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	11 Apr 2009 22:59:28 -0000	1.22
+++ .cvsignore	3 Aug 2009 02:00:17 -0000	1.23
@@ -1 +1 @@
-nginx-0.6.36.tar.gz
+nginx-0.7.61.tar.gz

nginx-conf.patch:
 nginx.conf |  105 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 53 insertions(+), 52 deletions(-)

Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/nginx-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nginx-conf.patch	27 May 2008 04:28:23 -0000	1.3
+++ nginx-conf.patch	3 Aug 2009 02:00:17 -0000	1.4
@@ -1,12 +1,13 @@
---- conf/nginx.conf.orig	2008-05-11 21:19:44.000000000 -0600
-+++ conf/nginx.conf	2008-05-11 22:20:32.000000000 -0600
-@@ -1,28 +1,59 @@
+diff -up conf/nginx.conf.orig conf/nginx.conf
+--- conf/nginx.conf.orig	2009-04-06 07:43:46.000000000 -0600
++++ conf/nginx.conf	2009-08-02 18:32:19.000000000 -0600
+@@ -1,28 +1,58 @@
 +#######################################################################
 +#
 +# This is the main Nginx configuration file.  
 +#
 +# More information about the configuration options is available on 
-+#   * the English wiki - http://wiki.codemongers.com/Main
++#   * the English wiki - http://wiki.nginx.org/Main
 +#   * the Russian documentation - http://sysoev.ru/nginx/
 +#
 +#######################################################################
@@ -14,7 +15,7 @@
 +#----------------------------------------------------------------------
 +# Main Module - directives that cover basic functionality
 +#
-+#   http://wiki.codemongers.com/NginxMainModule
++#   http://wiki.nginx.org/NginxHttpMainModule
 +#
 +#----------------------------------------------------------------------
  
@@ -25,22 +26,21 @@
 -#error_log  logs/error.log;
 -#error_log  logs/error.log  notice;
 -#error_log  logs/error.log  info;
-+error_log         /var/log/nginx/error.log;
-+#error_log        /var/log/nginx/error.log  notice;
-+#error_log        /var/log/nginx/error.log  info;
++error_log  /var/log/nginx/error.log;
++#error_log  /var/log/nginx/error.log  notice;
++#error_log  /var/log/nginx/error.log  info;
++
++pid        /var/run/nginx.pid;
  
 -#pid        logs/nginx.pid;
-+pid               /var/run/nginx.pid;
- 
  
-+
 +#----------------------------------------------------------------------
 +# Events Module 
 +#
-+#   http://wiki.codemongers.com/NginxEventsModule
++#   http://wiki.nginx.org/NginxHttpEventsModule
 +#
 +#----------------------------------------------------------------------
-+
+ 
  events {
      worker_connections  1024;
  }
@@ -49,7 +49,7 @@
 +#----------------------------------------------------------------------
 +# HTTP Core Module
 +#
-+#   http://wiki.codemongers.com/NginxHttpCoreModule 
++#   http://wiki.nginx.org/NginxHttpCoreModule 
 +#
 +#----------------------------------------------------------------------
 +
@@ -58,11 +58,11 @@
 +    include       /etc/nginx/mime.types;
      default_type  application/octet-stream;
  
--    #log_format  main  '$remote_addr - $remote_user [$time_local] $request '
--    #                  '"$status" $body_bytes_sent "$http_referer" '
+-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+-    #                  '$status $body_bytes_sent "$http_referer" '
 -    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-+    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
-+                      '"$status" $body_bytes_sent "$http_referer" '
++    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
++                      '$status $body_bytes_sent "$http_referer" '
 +                      '"$http_user_agent" "$http_x_forwarded_for"';
  
 -    #access_log  logs/access.log  main;
@@ -70,7 +70,7 @@
  
      sendfile        on;
      #tcp_nopush     on;
-@@ -31,27 +62,36 @@
+@@ -31,27 +61,36 @@ http {
      keepalive_timeout  65;
  
      #gzip  on;
@@ -82,9 +82,8 @@
 +    # The default server
 +    #
      server {
--        listen       80;
+         listen       80;
 -        server_name  localhost;
-+        listen       80;
 +        server_name  _;
  
          #charset koi8-r;
@@ -112,7 +111,7 @@
          }
  
          # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -77,42 +117,4 @@
+@@ -77,42 +116,4 @@ http {
          #    deny  all;
          #}
      }


Index: nginx.init
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/nginx.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nginx.init	27 May 2008 04:06:16 -0000	1.4
+++ nginx.init	3 Aug 2009 02:00:17 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# nginx - this script starts and stops the nginx daemin
+# nginx - this script starts and stops the nginx daemon
 #
-# chkconfig:   - 85 15 
+# chkconfig:   - 85 15
 # description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
 #               proxy and IMAP/POP3 proxy server
 # processname: nginx
@@ -41,7 +41,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $prog -QUIT
+    killproc $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
@@ -49,27 +49,26 @@ stop() {
 }
 
 restart() {
-    configtest || return $?
+    configtest_q || configtest || return 6
     stop
     start
 }
 
 reload() {
-    configtest || return $?
+    configtest_q || configtest || return 6
     echo -n $"Reloading $prog: "
     killproc $nginx -HUP
-    RETVAL=$?
     echo
 }
 
-force_reload() {
-    restart
-}
-
 configtest() {
   $nginx -t -c $NGINX_CONF_FILE
 }
 
+configtest_q() {
+    configtest >/dev/null 2>&1
+}
+
 rh_status() {
     status $prog
 }
@@ -78,6 +77,29 @@ rh_status_q() {
     rh_status >/dev/null 2>&1
 }
 
+# Upgrade the binary with no downtime.
+upgrade() {
+    local pidfile="/var/run/${prog}.pid"
+    local oldbin_pidfile="${pidfile}.oldbin"
+
+    configtest_q || configtest || return 6
+    echo -n $"Staring new master $prog: "
+    killproc $nginx -USR2
+    retval=$?
+    echo 
+    sleep 1
+    if [[ -f ${oldbin_pidfile} && -f ${pidfile} ]];  then
+        echo -n $"Graceful shutdown of old $prog: "
+        killproc -p ${oldbin_pidfile} -QUIT
+        retval=$?
+        echo 
+        return 0
+    else
+        echo $"Something bad happened, manual intervention required, maybe restart?"
+        return 1
+    fi
+}
+
 case "$1" in
     start)
         rh_status_q && exit 0
@@ -90,20 +112,22 @@ case "$1" in
     restart|configtest)
         $1
         ;;
+    force-reload|upgrade) 
+        rh_status_q || exit 7
+        upgrade
+        ;;
     reload)
         rh_status_q || exit 7
         $1
         ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
+    status|status_q)
+        rh_$1
         ;;
     condrestart|try-restart)
-        rh_status_q || exit 0
+        rh_status_q || exit 7
+        restart
 	    ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
+        echo $"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
         exit 2
 esac


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/nginx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- nginx.spec	11 Apr 2009 22:59:28 -0000	1.33
+++ nginx.spec	3 Aug 2009 02:00:17 -0000	1.34
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.36
+Version:        0.7.61
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -34,9 +34,7 @@ Source1:    %{name}.init
 Source2:    %{name}.logrotate
 Source3:    virtual.conf
 Source4:    ssl.conf
-Source5:    nginx-upstream-fair.tgz
-Source6:    upstream-fair.conf
-Source7:    %{name}.sysconfig
+Source5:    %{name}.sysconfig
 Source100:  index.html
 Source101:  poweredby.png
 Source102:  nginx-logo.png
@@ -55,15 +53,12 @@ Patch1:     nginx-conf.patch
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
 proxy server written by Igor Sysoev.  
 
-One third party module, nginx-upstream-fair, is added
-
 
 %prep
 %setup -q
 
 %patch0 -p0
 %patch1 -p0
-%{__tar} zxvf %{SOURCE5}
 
 %build
 # nginx does not utilize a standard configure script.  It has its own
@@ -96,13 +91,9 @@ export DESTDIR=%{buildroot}
     --with-http_perl_module \
     --with-mail \
     --with-mail_ssl_module \
-    --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
-    --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
+    --with-cc-opt="%{optflags} $(pcre-config --cflags)"
 make %{?_smp_mflags} 
 
-# rename the readme for nginx-upstream-fair so it doesn't conflict with the main
-# readme
-mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair
 
 %install
 rm -rf %{buildroot}
@@ -115,9 +106,9 @@ find %{buildroot} -type f -name '*.so' -
 chmod 0755 %{buildroot}%{_sbindir}/nginx
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
-%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{nginx_confdir}/conf.d
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
@@ -136,10 +127,14 @@ done
 rm -rf %{buildroot}
 
 %pre
-%{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+if [ $1 == 1 ]; then
+    %{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+fi
 
 %post
-/sbin/chkconfig --add %{name}
+if [ $1 == 1 ]; then
+    /sbin/chkconfig --add %{name}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -148,13 +143,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
-    /sbin/service %{name} condrestart > /dev/null 2>&1 || :
+if [ $1 == 2 ]; then
+    /sbin/service %{name} upgrade || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
+%doc LICENSE CHANGES README 
 %{nginx_datadir}/
 %{_sbindir}/%{name}
 %{_mandir}/man3/%{name}.3pm.gz
@@ -182,6 +177,10 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61 -
+- update to new stable 0.7.61
+- remove third party module
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
 -  update to 0.6.36
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	11 Apr 2009 22:59:28 -0000	1.22
+++ sources	3 Aug 2009 02:00:17 -0000	1.23
@@ -1 +1 @@
-15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz
+6ebf89b9b00a3b82734e93c32da7df07  nginx-0.7.61.tar.gz



From jjh at fedoraproject.org  Mon Aug  3 02:01:37 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:01:37 +0000 (UTC)
Subject: rpms/nginx/F-11 nginx-upstream-fair.tgz, 1.1,
	NONE upstream-fair.conf, 1.1, NONE
Message-ID: <20090803020137.1A4DB11C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Removed Files:
	nginx-upstream-fair.tgz upstream-fair.conf 
Log Message:
remove upstream-fair module


--- nginx-upstream-fair.tgz DELETED ---


--- upstream-fair.conf DELETED ---



From jjh at fedoraproject.org  Mon Aug  3 02:06:34 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:06:34 +0000 (UTC)
Subject: rpms/nginx/F-10 .cvsignore, 1.22, 1.23 nginx-conf.patch, 1.3,
	1.4 nginx.init, 1.4, 1.5 nginx.spec, 1.30, 1.31 sources, 1.22,
	1.23 nginx-upstream-fair.tgz, 1.1, NONE upstream-fair.conf, 1.1, NONE
Message-ID: <20090803020634.B3B1511C004A@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore nginx-conf.patch nginx.init nginx.spec sources 
Removed Files:
	nginx-upstream-fair.tgz upstream-fair.conf 
Log Message:
update to 0.7.61


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	11 Apr 2009 23:29:25 -0000	1.22
+++ .cvsignore	3 Aug 2009 02:06:34 -0000	1.23
@@ -1 +1 @@
-nginx-0.6.36.tar.gz
+nginx-0.7.61.tar.gz

nginx-conf.patch:
 nginx.conf |  105 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 53 insertions(+), 52 deletions(-)

Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nginx-conf.patch	27 May 2008 04:28:23 -0000	1.3
+++ nginx-conf.patch	3 Aug 2009 02:06:34 -0000	1.4
@@ -1,12 +1,13 @@
---- conf/nginx.conf.orig	2008-05-11 21:19:44.000000000 -0600
-+++ conf/nginx.conf	2008-05-11 22:20:32.000000000 -0600
-@@ -1,28 +1,59 @@
+diff -up conf/nginx.conf.orig conf/nginx.conf
+--- conf/nginx.conf.orig	2009-04-06 07:43:46.000000000 -0600
++++ conf/nginx.conf	2009-08-02 18:32:19.000000000 -0600
+@@ -1,28 +1,58 @@
 +#######################################################################
 +#
 +# This is the main Nginx configuration file.  
 +#
 +# More information about the configuration options is available on 
-+#   * the English wiki - http://wiki.codemongers.com/Main
++#   * the English wiki - http://wiki.nginx.org/Main
 +#   * the Russian documentation - http://sysoev.ru/nginx/
 +#
 +#######################################################################
@@ -14,7 +15,7 @@
 +#----------------------------------------------------------------------
 +# Main Module - directives that cover basic functionality
 +#
-+#   http://wiki.codemongers.com/NginxMainModule
++#   http://wiki.nginx.org/NginxHttpMainModule
 +#
 +#----------------------------------------------------------------------
  
@@ -25,22 +26,21 @@
 -#error_log  logs/error.log;
 -#error_log  logs/error.log  notice;
 -#error_log  logs/error.log  info;
-+error_log         /var/log/nginx/error.log;
-+#error_log        /var/log/nginx/error.log  notice;
-+#error_log        /var/log/nginx/error.log  info;
++error_log  /var/log/nginx/error.log;
++#error_log  /var/log/nginx/error.log  notice;
++#error_log  /var/log/nginx/error.log  info;
++
++pid        /var/run/nginx.pid;
  
 -#pid        logs/nginx.pid;
-+pid               /var/run/nginx.pid;
- 
  
-+
 +#----------------------------------------------------------------------
 +# Events Module 
 +#
-+#   http://wiki.codemongers.com/NginxEventsModule
++#   http://wiki.nginx.org/NginxHttpEventsModule
 +#
 +#----------------------------------------------------------------------
-+
+ 
  events {
      worker_connections  1024;
  }
@@ -49,7 +49,7 @@
 +#----------------------------------------------------------------------
 +# HTTP Core Module
 +#
-+#   http://wiki.codemongers.com/NginxHttpCoreModule 
++#   http://wiki.nginx.org/NginxHttpCoreModule 
 +#
 +#----------------------------------------------------------------------
 +
@@ -58,11 +58,11 @@
 +    include       /etc/nginx/mime.types;
      default_type  application/octet-stream;
  
--    #log_format  main  '$remote_addr - $remote_user [$time_local] $request '
--    #                  '"$status" $body_bytes_sent "$http_referer" '
+-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+-    #                  '$status $body_bytes_sent "$http_referer" '
 -    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-+    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
-+                      '"$status" $body_bytes_sent "$http_referer" '
++    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
++                      '$status $body_bytes_sent "$http_referer" '
 +                      '"$http_user_agent" "$http_x_forwarded_for"';
  
 -    #access_log  logs/access.log  main;
@@ -70,7 +70,7 @@
  
      sendfile        on;
      #tcp_nopush     on;
-@@ -31,27 +62,36 @@
+@@ -31,27 +61,36 @@ http {
      keepalive_timeout  65;
  
      #gzip  on;
@@ -82,9 +82,8 @@
 +    # The default server
 +    #
      server {
--        listen       80;
+         listen       80;
 -        server_name  localhost;
-+        listen       80;
 +        server_name  _;
  
          #charset koi8-r;
@@ -112,7 +111,7 @@
          }
  
          # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -77,42 +117,4 @@
+@@ -77,42 +116,4 @@ http {
          #    deny  all;
          #}
      }


Index: nginx.init
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nginx.init	27 May 2008 04:06:16 -0000	1.4
+++ nginx.init	3 Aug 2009 02:06:34 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# nginx - this script starts and stops the nginx daemin
+# nginx - this script starts and stops the nginx daemon
 #
-# chkconfig:   - 85 15 
+# chkconfig:   - 85 15
 # description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
 #               proxy and IMAP/POP3 proxy server
 # processname: nginx
@@ -41,7 +41,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $prog -QUIT
+    killproc $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
@@ -49,27 +49,26 @@ stop() {
 }
 
 restart() {
-    configtest || return $?
+    configtest_q || configtest || return 6
     stop
     start
 }
 
 reload() {
-    configtest || return $?
+    configtest_q || configtest || return 6
     echo -n $"Reloading $prog: "
     killproc $nginx -HUP
-    RETVAL=$?
     echo
 }
 
-force_reload() {
-    restart
-}
-
 configtest() {
   $nginx -t -c $NGINX_CONF_FILE
 }
 
+configtest_q() {
+    configtest >/dev/null 2>&1
+}
+
 rh_status() {
     status $prog
 }
@@ -78,6 +77,29 @@ rh_status_q() {
     rh_status >/dev/null 2>&1
 }
 
+# Upgrade the binary with no downtime.
+upgrade() {
+    local pidfile="/var/run/${prog}.pid"
+    local oldbin_pidfile="${pidfile}.oldbin"
+
+    configtest_q || configtest || return 6
+    echo -n $"Staring new master $prog: "
+    killproc $nginx -USR2
+    retval=$?
+    echo 
+    sleep 1
+    if [[ -f ${oldbin_pidfile} && -f ${pidfile} ]];  then
+        echo -n $"Graceful shutdown of old $prog: "
+        killproc -p ${oldbin_pidfile} -QUIT
+        retval=$?
+        echo 
+        return 0
+    else
+        echo $"Something bad happened, manual intervention required, maybe restart?"
+        return 1
+    fi
+}
+
 case "$1" in
     start)
         rh_status_q && exit 0
@@ -90,20 +112,22 @@ case "$1" in
     restart|configtest)
         $1
         ;;
+    force-reload|upgrade) 
+        rh_status_q || exit 7
+        upgrade
+        ;;
     reload)
         rh_status_q || exit 7
         $1
         ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
+    status|status_q)
+        rh_$1
         ;;
     condrestart|try-restart)
-        rh_status_q || exit 0
+        rh_status_q || exit 7
+        restart
 	    ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
+        echo $"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
         exit 2
 esac


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nginx.spec	11 Apr 2009 23:29:25 -0000	1.30
+++ nginx.spec	3 Aug 2009 02:06:34 -0000	1.31
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.36
+Version:        0.7.61
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -34,9 +34,7 @@ Source1:    %{name}.init
 Source2:    %{name}.logrotate
 Source3:    virtual.conf
 Source4:    ssl.conf
-Source5:    nginx-upstream-fair.tgz
-Source6:    upstream-fair.conf
-Source7:    %{name}.sysconfig
+Source5:    %{name}.sysconfig
 Source100:  index.html
 Source101:  poweredby.png
 Source102:  nginx-logo.png
@@ -55,15 +53,12 @@ Patch1:     nginx-conf.patch
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
 proxy server written by Igor Sysoev.  
 
-One third party module, nginx-upstream-fair, is added
-
 
 %prep
 %setup -q
 
 %patch0 -p0
 %patch1 -p0
-%{__tar} zxvf %{SOURCE5}
 
 %build
 # nginx does not utilize a standard configure script.  It has its own
@@ -96,13 +91,9 @@ export DESTDIR=%{buildroot}
     --with-http_perl_module \
     --with-mail \
     --with-mail_ssl_module \
-    --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
-    --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
+    --with-cc-opt="%{optflags} $(pcre-config --cflags)"
 make %{?_smp_mflags} 
 
-# rename the readme for nginx-upstream-fair so it doesn't conflict with the main
-# readme
-mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair
 
 %install
 rm -rf %{buildroot}
@@ -115,9 +106,9 @@ find %{buildroot} -type f -name '*.so' -
 chmod 0755 %{buildroot}%{_sbindir}/nginx
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
-%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{nginx_confdir}/conf.d
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
@@ -136,10 +127,14 @@ done
 rm -rf %{buildroot}
 
 %pre
-%{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+if [ $1 == 1 ]; then
+    %{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
+fi
 
 %post
-/sbin/chkconfig --add %{name}
+if [ $1 == 1 ]; then
+    /sbin/chkconfig --add %{name}
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -148,13 +143,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
-    /sbin/service %{name} condrestart > /dev/null 2>&1 || :
+if [ $1 == 2 ]; then
+    /sbin/service %{name} upgrade || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
+%doc LICENSE CHANGES README 
 %{nginx_datadir}/
 %{_sbindir}/%{name}
 %{_mandir}/man3/%{name}.3pm.gz
@@ -182,15 +177,25 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61-1
+- update to new stable 0.7.61
+- remove third party module
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
 -  update to 0.6.36
 
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.35-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
 - rebuild
 
 * Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-1
 - update to 0.6.35
 
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.34-2
+- rebuild with new openssl
+
 * Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.34-1
 - update to 0.6.34
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	11 Apr 2009 23:29:25 -0000	1.22
+++ sources	3 Aug 2009 02:06:34 -0000	1.23
@@ -1 +1 @@
-15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz
+6ebf89b9b00a3b82734e93c32da7df07  nginx-0.7.61.tar.gz


--- nginx-upstream-fair.tgz DELETED ---


--- upstream-fair.conf DELETED ---



From jjh at fedoraproject.org  Mon Aug  3 02:14:01 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:14:01 +0000 (UTC)
Subject: rpms/nginx/EL-5 .cvsignore, 1.16, 1.17 nginx.spec, 1.22,
	1.23 sources, 1.17, 1.18
Message-ID: <20090803021401.C3A2E11C008C@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.6.38


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	11 Apr 2009 23:29:23 -0000	1.16
+++ .cvsignore	3 Aug 2009 02:14:01 -0000	1.17
@@ -1 +1 @@
-nginx-0.6.36.tar.gz
+nginx-0.6.38.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nginx.spec	11 Apr 2009 23:29:24 -0000	1.22
+++ nginx.spec	3 Aug 2009 02:14:01 -0000	1.23
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.36
+Version:        0.6.38
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -180,6 +180,9 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-1
+- update to 0.6.38
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
 -  update to 0.6.36
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Apr 2009 23:29:24 -0000	1.17
+++ sources	3 Aug 2009 02:14:01 -0000	1.18
@@ -1 +1 @@
-15cce6102a2efcf4d4acde9bb71ea6d3  nginx-0.6.36.tar.gz
+58f35e44b695d1013add16ab45beb410  nginx-0.6.38.tar.gz



From tgl at fedoraproject.org  Mon Aug  3 02:23:58 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Mon,  3 Aug 2009 02:23:58 +0000 (UTC)
Subject: rpms/mysql/devel .cvsignore, 1.40, 1.41 mysql-plugin-bug.patch, 1.8,
	1.9 mysql.spec, 1.123, 1.124 sources, 1.40, 1.41
Message-ID: <20090803022358.A482C11C008C@cvs1.fedora.phx.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore mysql-plugin-bug.patch mysql.spec sources 
Log Message:
Update to MySQL 5.1.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	11 Jul 2009 03:43:11 -0000	1.40
+++ .cvsignore	3 Aug 2009 02:23:58 -0000	1.41
@@ -1 +1 @@
-mysql-5.1.36.tar.gz
+mysql-5.1.37.tar.gz

mysql-plugin-bug.patch:
 disabled.def |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mysql-plugin-bug.patch	11 Jul 2009 03:43:11 -0000	1.8
+++ mysql-plugin-bug.patch	3 Aug 2009 02:23:58 -0000	1.9
@@ -7,12 +7,13 @@ http://bugs.mysql.com/bug.php?id=42144
 For the moment, just disable this test.
 
 
-diff -Naur mysql-5.1.36.orig/mysql-test/t/disabled.def mysql-5.1.36/mysql-test/t/disabled.def
---- mysql-5.1.36.orig/mysql-test/t/disabled.def	2009-06-16 09:43:04.000000000 -0400
-+++ mysql-5.1.36/mysql-test/t/disabled.def	2009-07-10 22:00:42.000000000 -0400
-@@ -12,3 +12,5 @@
- kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
+diff -Naur mysql-5.1.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
+--- mysql-5.1.37.orig/mysql-test/t/disabled.def	2009-07-13 19:43:47.000000000 -0400
++++ mysql-5.1.37/mysql-test/t/disabled.def	2009-08-02 20:43:36.000000000 -0400
+@@ -13,4 +13,5 @@
  innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
+ init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
+-
 +#
 +plugin_load     : gives wrong answer on PPC64


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- mysql.spec	25 Jul 2009 15:29:59 -0000	1.123
+++ mysql.spec	3 Aug 2009 02:23:58 -0000	1.124
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.36
-Release: 2%{?dist}
+Version: 5.1.37
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -639,6 +639,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sun Aug  2 2009 Tom Lane <tgl at redhat.com> 5.1.37-1
+- Update to MySQL 5.1.37, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.36-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	11 Jul 2009 03:43:11 -0000	1.40
+++ sources	3 Aug 2009 02:23:58 -0000	1.41
@@ -1 +1 @@
-18e694c4ecbe851fe8e21e1668116c46  mysql-5.1.36.tar.gz
+cbdb8783b053019755ee9196f67ea04c  mysql-5.1.37.tar.gz



From jjh at fedoraproject.org  Mon Aug  3 02:29:26 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:29:26 +0000 (UTC)
Subject: rpms/nginx/EL-4 .cvsignore, 1.15, 1.16 nginx-conf.patch, 1.1,
	1.2 nginx.spec, 1.19, 1.20 sources, 1.15,
	1.16 nginx-auto-install.patch, 1.1,
	NONE nginx-auto-options.patch, 1.1, NONE
Message-ID: <20090803022926.77FF011C008C@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	.cvsignore nginx-conf.patch nginx.spec sources 
Removed Files:
	nginx-auto-install.patch nginx-auto-options.patch 
Log Message:
update to 0.6.38, 0.5.x is deprecated


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Jul 2008 15:54:24 -0000	1.15
+++ .cvsignore	3 Aug 2009 02:29:26 -0000	1.16
@@ -1 +1 @@
-nginx-0.5.37.tar.gz
+nginx-0.6.38.tar.gz

nginx-conf.patch:
 nginx.conf |   24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nginx-conf.patch	24 Mar 2007 18:31:48 -0000	1.1
+++ nginx-conf.patch	3 Aug 2009 02:29:26 -0000	1.2
@@ -1,5 +1,6 @@
---- conf/nginx.conf.orig	2007-03-22 22:44:23.000000000 -0600
-+++ conf/nginx.conf	2007-03-22 23:06:48.000000000 -0600
+diff -up conf/nginx.conf.orig conf/nginx.conf
+--- conf/nginx.conf.orig	2008-02-28 13:44:16.000000000 -0700
++++ conf/nginx.conf	2009-08-02 20:21:53.000000000 -0600
 @@ -1,12 +1,11 @@
 -
 -#user  nobody;
@@ -18,11 +19,11 @@
  
  
  events {
-@@ -15,14 +14,14 @@
+@@ -15,14 +14,14 @@ events {
  
  
  http {
--    include       conf/mime.types;
+-    include       mime.types;
 +    include       /etc/nginx/mime.types;
      default_type  application/octet-stream;
  
@@ -34,11 +35,11 @@
 +                      '"$http_user_agent" "$http_x_forwarded_for"';
  
 -    #access_log  logs/access.log  main;
-+    access_log  /var/log/nginx/access.log  main;
++    access_log  /var/log/nginx/logs/access.log  main;
  
      sendfile        on;
      #tcp_nopush     on;
-@@ -38,7 +37,7 @@
+@@ -38,7 +37,7 @@ http {
  
          #charset koi8-r;
  
@@ -47,7 +48,7 @@
  
          location / {
              root   html;
-@@ -113,5 +112,4 @@
+@@ -114,5 +113,4 @@ http {
      #        index  index.html index.htm;
      #    }
      #}


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nginx.spec	27 Jul 2008 15:54:24 -0000	1.19
+++ nginx.spec	3 Aug 2009 02:29:26 -0000	1.20
@@ -7,7 +7,7 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.37
+Version:        0.6.38
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -33,14 +33,9 @@ Source2:    %{name}.logrotate
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
 Patch0:     nginx-auto-cc-gcc.patch
 
-# nginx has its own configure/build scripts.  These patches allow nginx
-# to install into a buildroot.
-Patch1:     nginx-auto-install.patch
-Patch2:     nginx-auto-options.patch
-
 # configuration patch to match all the Fedora paths for logs, pid files
 # etc.
-Patch3:     nginx-conf.patch
+Patch1:     nginx-conf.patch
 
 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
@@ -51,8 +46,6 @@ proxy server written by Igor Sysoev.
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 
 %build
 # nginx does not utilize a standard configure script.  It has its own
@@ -157,6 +150,10 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-1
+- 0.5.x branch is no longer in support, updating to newest legacy stable 0.6.38
+- remove unneeded patches
+
 * Sun Jul 27 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.37-1
 update to 0.5.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	27 Jul 2008 15:54:24 -0000	1.15
+++ sources	3 Aug 2009 02:29:26 -0000	1.16
@@ -1 +1 @@
-055ebcdf71a00177b4ee1ac71fa6b82c  nginx-0.5.37.tar.gz
+58f35e44b695d1013add16ab45beb410  nginx-0.6.38.tar.gz


--- nginx-auto-install.patch DELETED ---


--- nginx-auto-options.patch DELETED ---



From tgl at fedoraproject.org  Mon Aug  3 02:29:36 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Mon,  3 Aug 2009 02:29:36 +0000 (UTC)
Subject: rpms/mysql/F-11 .cvsignore, 1.40, 1.41 mysql-plugin-bug.patch, 1.8, 
	1.9 mysql.spec, 1.121, 1.122 sources, 1.40, 1.41
Message-ID: <20090803022936.1372F11C008C@cvs1.fedora.phx.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore mysql-plugin-bug.patch mysql.spec sources 
Log Message:
Update to MySQL 5.1.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	11 Jul 2009 03:50:45 -0000	1.40
+++ .cvsignore	3 Aug 2009 02:29:35 -0000	1.41
@@ -1 +1 @@
-mysql-5.1.36.tar.gz
+mysql-5.1.37.tar.gz

mysql-plugin-bug.patch:
 disabled.def |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql-plugin-bug.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mysql-plugin-bug.patch	11 Jul 2009 03:50:45 -0000	1.8
+++ mysql-plugin-bug.patch	3 Aug 2009 02:29:35 -0000	1.9
@@ -7,12 +7,13 @@ http://bugs.mysql.com/bug.php?id=42144
 For the moment, just disable this test.
 
 
-diff -Naur mysql-5.1.36.orig/mysql-test/t/disabled.def mysql-5.1.36/mysql-test/t/disabled.def
---- mysql-5.1.36.orig/mysql-test/t/disabled.def	2009-06-16 09:43:04.000000000 -0400
-+++ mysql-5.1.36/mysql-test/t/disabled.def	2009-07-10 22:00:42.000000000 -0400
-@@ -12,3 +12,5 @@
- kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
+diff -Naur mysql-5.1.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
+--- mysql-5.1.37.orig/mysql-test/t/disabled.def	2009-07-13 19:43:47.000000000 -0400
++++ mysql-5.1.37/mysql-test/t/disabled.def	2009-08-02 20:43:36.000000000 -0400
+@@ -13,4 +13,5 @@
  innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
+ init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
+-
 +#
 +plugin_load     : gives wrong answer on PPC64


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/mysql.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- mysql.spec	11 Jul 2009 03:50:45 -0000	1.121
+++ mysql.spec	3 Aug 2009 02:29:35 -0000	1.122
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.36
+Version: 5.1.37
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -639,6 +639,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sun Aug  2 2009 Tom Lane <tgl at redhat.com> 5.1.37-1
+- Update to MySQL 5.1.37, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html
+
 * Fri Jul 10 2009 Tom Lane <tgl at redhat.com> 5.1.36-1
 - Update to MySQL 5.1.36, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	11 Jul 2009 03:50:45 -0000	1.40
+++ sources	3 Aug 2009 02:29:35 -0000	1.41
@@ -1 +1 @@
-18e694c4ecbe851fe8e21e1668116c46  mysql-5.1.36.tar.gz
+cbdb8783b053019755ee9196f67ea04c  mysql-5.1.37.tar.gz



From jjh at fedoraproject.org  Mon Aug  3 02:39:25 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:39:25 +0000 (UTC)
Subject: rpms/nginx/EL-4 nginx.spec,1.20,1.21
Message-ID: <20090803023925.1C7A011C008C@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	nginx.spec 
Log Message:
fix missing fastcgi_params files


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nginx.spec	3 Aug 2009 02:29:26 -0000	1.20
+++ nginx.spec	3 Aug 2009 02:39:24 -0000	1.21
@@ -140,6 +140,8 @@ fi
 %config(noreplace) %{nginx_confdir}/koi-utf
 %config(noreplace) %{nginx_confdir}/%{name}.conf
 %config(noreplace) %{nginx_confdir}/mime.types
+%config(noreplace) %{nginx_confdir}/fastcgi_params
+%config(noreplace) %{nginx_confdir}/fastcgi_params.default
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{perl_vendorarch}/auto/%{name}
 %{perl_vendorarch}/%{name}.pm



From jjh at fedoraproject.org  Mon Aug  3 02:40:06 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon,  3 Aug 2009 02:40:06 +0000 (UTC)
Subject: rpms/nginx/EL-4 nginx.spec,1.21,1.22
Message-ID: <20090803024006.B2B0D11C04D1@cvs1.fedora.phx.redhat.com>

Author: jjh

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

Modified Files:
	nginx.spec 
Log Message:
rebuild


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nginx.spec	3 Aug 2009 02:39:24 -0000	1.21
+++ nginx.spec	3 Aug 2009 02:40:06 -0000	1.22
@@ -8,7 +8,7 @@
 
 Name:           nginx
 Version:        0.6.38
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -152,6 +152,9 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-2
+- rebuilt
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-1
 - 0.5.x branch is no longer in support, updating to newest legacy stable 0.6.38
 - remove unneeded patches



From mclasen at fedoraproject.org  Mon Aug  3 03:30:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 03:30:02 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.362,1.363
Message-ID: <20090803033002.E56D111C049E@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Log Message:
Save some space



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -p -r1.362 -r1.363
--- gnome-panel.spec	1 Aug 2009 00:09:52 -0000	1.362
+++ gnome-panel.spec	3 Aug 2009 03:30:02 -0000	1.363
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.27.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -210,7 +210,14 @@ done
 # libtool doesn't make this easy, so we do it the hard way
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
-make
+make %{?_smp_mflags}
+
+
+# truncate NEWS
+awk '/^========/ { seen+=1 }
+{ if (seen < 3) print }
+{ if (seen == 3) { print "For older news, see http://git.gnome.org/cgit/gnome-panel/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -230,17 +237,6 @@ sed -e 's|/schemas/apps/workspace_switch
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
 
-# clean up help mess
-#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/workspace-switcher*.omf \
-#           $RPM_BUILD_ROOT/usr/share/omf/workspace-switcher
-#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/window-list*.omf \
-#           $RPM_BUILD_ROOT/usr/share/omf/window-list
-#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/fish*.omf \
-#           $RPM_BUILD_ROOT/usr/share/omf/fish
-#/bin/rmdir $RPM_BUILD_ROOT/usr/share/omf/gnome-panel
-
-sed -i -e "s/NoDisplay=True/NoDisplay=true/" $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
-
 desktop-file-install --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
@@ -372,6 +368,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-6
+- Save some space
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-5
 - Reduce the excessive 'about'-ing in the System menu
 



From mclasen at fedoraproject.org  Mon Aug  3 03:44:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 03:44:54 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.461,1.462
Message-ID: <20090803034454.4C92611C008C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12822

Modified Files:
	control-center.spec 
Log Message:
Drop unneeded direct deps



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- control-center.spec	30 Jul 2009 04:16:52 -0000	1.461
+++ control-center.spec	3 Aug 2009 03:44:54 -0000	1.462
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -206,6 +206,11 @@ sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' hel
 	--enable-aboutme \
 	--disable-update-mimedb \
 	CFLAGS="$RPM_OPT_FLAGS -Wno-error"
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -357,6 +362,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-4
+- Drop unneeded direct deps
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-3
 - Omit some 'tweaky' preferences
 



From tgl at fedoraproject.org  Mon Aug  3 03:53:18 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Mon,  3 Aug 2009 03:53:18 +0000 (UTC)
Subject: rpms/mysql/F-10 .cvsignore, 1.35, 1.36 mysql.spec, 1.113,
	1.114 sources, 1.35, 1.36 mysql-format-string.patch, 1.1, NONE
Message-ID: <20090803035318.C960811C008C@cvs1.fedora.phx.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore mysql.spec sources 
Removed Files:
	mysql-format-string.patch 
Log Message:
Update to mysql version 5.0.84


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	11 Jul 2009 19:11:11 -0000	1.35
+++ .cvsignore	3 Aug 2009 03:53:18 -0000	1.36
@@ -1 +1 @@
-mysql-5.0.83.tar.gz
+mysql-5.0.84.tar.gz


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/mysql.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- mysql.spec	16 Jul 2009 22:44:18 -0000	1.113
+++ mysql.spec	3 Aug 2009 03:53:18 -0000	1.114
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.83
-Release: 3%{?dist}
+Version: 5.0.84
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -34,7 +34,6 @@ Patch10: mysql-bdb-open.patch
 Patch13: mysql-no-dbug.patch
 Patch15: mysql-stack-guard.patch
 Patch17: mysql-bug-44348.patch
-Patch18: mysql-format-string.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -181,7 +180,6 @@ the MySQL sources.
 %patch13 -p1
 %patch15 -p1
 %patch17 -p1
-%patch18 -p1
 
 libtoolize --force
 aclocal
@@ -630,6 +628,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sun Aug  2 2009 Tom Lane <tgl at redhat.com> 5.0.84-1
+- Update to mysql version 5.0.84, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.0/en/news-5-0-84.html
+  Although not mentioned there, this release also fixes CVE-2009-2446
+
 * Thu Jul 16 2009 Tom Lane <tgl at redhat.com> 5.0.83-3
 - Add fix for CVE-2009-2446 (format string vulnerability in COM_CREATE_DB and
   COM_DROP_DB processing)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	11 Jul 2009 19:11:11 -0000	1.35
+++ sources	3 Aug 2009 03:53:18 -0000	1.36
@@ -1 +1 @@
-051392064a1e32cca5c23a593908b10e  mysql-5.0.83.tar.gz
+671348f1a5b078da9ca76f97e1fda325  mysql-5.0.84.tar.gz


--- mysql-format-string.patch DELETED ---



From lkundrak at fedoraproject.org  Mon Aug  3 04:34:31 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  3 Aug 2009 04:34:31 +0000 (UTC)
Subject: rpms/jam/devel jam-2.5-overflow.patch,NONE,1.1 jam.spec,1.9,1.10
Message-ID: <20090803043431.9A7D111C02C6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	jam.spec 
Added Files:
	jam-2.5-overflow.patch 
Log Message:
* Mon Aug  3 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.5-9
- Add the stack overflow fix patch


jam-2.5-overflow.patch:
 expand.c |   19 ++++++++++++++++++-
 jam.h    |    8 ++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE jam-2.5-overflow.patch ---
From: Lubomir Rintel <lkundrak at v3.sk>
Subject: [PATCH] Fix stack smashing in variable expansion

Apparently, Fedora's compiler flags were too long for jam's mind,
resulting in out-of-bounds write on stack. This patch increases length
of variable expansion buffer (and filename buffer, just in case) as
well as adds checks for buffer overflows in some places.

diff -up jam-2.5/expand.c.overflow jam-2.5/expand.c
--- jam-2.5/expand.c.overflow	2003-04-23 06:45:50.000000000 +0200
+++ jam-2.5/expand.c	2009-07-25 15:59:30.319767119 +0200
@@ -27,6 +27,7 @@
  * 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr()
  * 11/04/02 (seiwald) - const-ing for string literals
  * 12/30/02 (armstrong) - fix out-of-bounds access in var_expand()
+ * 25/07/09 (lkundrak at v3.sk) - fix stack overflows in var_expand()
  */
 
 # include "jam.h"
@@ -283,8 +284,14 @@ var_expand( 
 
 		    if( colon && edits.filemods )
 			var_edit_file( value->string, out, &edits );
-		    else
+		    else {
+			if( out + strlen( value->string ) > out_buf + sizeof( out_buf ) ) {
+			     fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n",
+				 sizeof( out_buf ), out, value->string );
+			     exit( 1 );
+			}
 			strcpy( out, value->string );
+		    }
 
 		    if( colon && ( edits.upshift || edits.downshift ) )
 			var_edit_shift( out, &edits );
@@ -298,6 +305,11 @@ var_expand( 
 		      ( list_next( value ) || list_next( vars ) ) )
 		    {
 			out += strlen( out );
+			if( out + strlen( edits.join.ptr ) > out_buf + sizeof( out_buf ) ) {
+			     fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n",
+				 sizeof( out_buf ), out, edits.join.ptr );
+			     exit( 1 );
+			}
 			strcpy( out, edits.join.ptr );
 			out += strlen( out );
 			continue;
@@ -320,6 +332,11 @@ var_expand( 
 
 		    for( rem = remainder; rem; rem = list_next( rem ) )
 		    {
+			if( out1 + strlen( rem->string ) > out_buf + sizeof( out_buf ) ) {
+			     fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n",
+				 sizeof( out_buf ), out, rem->string );
+			     exit( 1 );
+			}
 			strcpy( out1, rem->string );
 			l = list_new( l, out_buf, 0 );
 		    }
diff -up jam-2.5/jam.h.overflow jam-2.5/jam.h
--- jam-2.5/jam.h.overflow	2004-06-23 19:45:36.000000000 +0200
+++ jam-2.5/jam.h	2009-07-25 15:59:35.464767132 +0200
@@ -472,8 +472,12 @@
 
 /* You probably don't need to muck with these. */
 
-# define MAXSYM	1024	/* longest symbol in the environment */
-# define MAXJPATH 1024	/* longest filename */
+# define MAXSYM	65536	/* longest symbol in the environment */
+# ifdef PATH_MAX
+# define MAXJPATH PATH_MAX	/* longest filename */
+# else
+# define MAXJPATH 4096
+# endif
 
 # define MAXJOBS 64	/* silently enforce -j limit */
 # define MAXARGC 32	/* words in $(JAMSHELL) */


Index: jam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jam/devel/jam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- jam.spec	25 Jul 2009 03:52:56 -0000	1.9
+++ jam.spec	3 Aug 2009 04:34:30 -0000	1.10
@@ -1,11 +1,13 @@
 Name:		jam
 Version:	2.5
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	Copyright only
 Group:		Development/Tools
 Summary:	Program construction tool, similar to make
 URL:		http://public.perforce.com/public/jam/index.html
 Source0:	ftp://ftp.perforce.com/jam/%{name}-%{version}.tar
+# Submitted upstream by e-mail
+Patch0:         jam-2.5-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	byacc
 
@@ -19,6 +21,7 @@ targets and sources. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .overflows
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -39,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mkjambase
 
 %changelog
+* Mon Aug  3 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.5-9
+- Add the stack overflow fix patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Mon Aug  3 04:46:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  3 Aug 2009 04:46:20 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch,
	NONE, 1.1 kdebase-workspace.spec, 1.259, 1.260
Message-ID: <20090803044620.BBD6C11C02C6@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch 
Log Message:
* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)

kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch:
 battery.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp
--- kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp	2009-07-08 16:45:03.000000000 +0200
+++ kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp	2009-08-03 06:43:04.000000000 +0200
@@ -530,7 +530,11 @@
             QString state = battery_data.value()["State"].toString();
             m_remainingMSecs = battery_data.value()["Remaining msec"].toInt();
             //kDebug() << "time left:" << m_remainingMSecs;
-            if (state == "Discharging" && m_remainingMSecs > 0 && m_showRemainingTime) {
+            // Always show the remaining time in the popup (like KDE 4.2.x did).
+            // We don't just set m_showRemainingTime to true by default because
+            // that'd try to use the time also for the icon. That won't fit on
+            // small panels and wasn't the default in 4.2 either.
+            if (state == "Discharging" && m_remainingMSecs > 0) {
 
                 // FIXME: Somehow, m_extenderApplet is null here, so the label never becomes visible
                 if (m_extenderApplet) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- kdebase-workspace.spec	1 Aug 2009 23:44:19 -0000	1.259
+++ kdebase-workspace.spec	3 Aug 2009 04:46:19 -0000	1.260
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -25,6 +25,8 @@ Patch12: kdebase-workspace-4.2.95-defaul
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
+# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
 
 # upstream patches:
 # 4.3 branch
@@ -222,6 +224,7 @@ Requires: PyKDE4 >= %{version}
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
+%patch16 -p1 -b .showremainingtime
 
 # upstream patches
 
@@ -512,6 +515,9 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
+- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - move designer plugins to -libs, fixes
   Multilib conflicts for index.cache.bz2 (#515088)



From mclasen at fedoraproject.org  Mon Aug  3 04:47:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 04:47:38 +0000 (UTC)
Subject: rpms/gthumb/devel gthumb.spec,1.103,1.104
Message-ID: <20090803044738.D5B0811C02C6@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gthumb.spec 
Log Message:
Drop unneeded direct deps



Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gthumb.spec	25 Jul 2009 01:39:24 -0000	1.103
+++ gthumb.spec	3 Aug 2009 04:47:38 -0000	1.104
@@ -3,15 +3,13 @@
 %define glib2_version 2.4.0
 %define nautilus_version 2.2.0
 %define desktop_file_utils_version 0.9
-%define libgnomeprint_version 2.6.0
-%define libgnomeprintui_version 2.6.0
 %define gphoto_version 2.1.3
 %define gconf_version 2.14
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
@@ -23,8 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: nautilus >= %{nautilus_version}
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires: libexif-devel
 BuildRequires: libiptcdata-devel
 BuildRequires: libopenraw-gnome-devel
@@ -80,7 +76,12 @@ autoreconf -i -f
 %define gphoto_flags  %{nil}
 %endif
 %configure %{gphoto_flags}
-make
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -144,6 +145,9 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/gthumb.png
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-6
+- Drop unneeded direct deps
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Mon Aug  3 04:48:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 04:48:37 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-10 .cvsignore, 1.21, 1.22 ruby-RMagick.spec,
	1.26, 1.27 sources, 1.21, 1.22
Message-ID: <20090803044837.8345711C02C6@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-serv20112/F-10

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
- 2.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	27 Jun 2009 19:02:32 -0000	1.21
+++ .cvsignore	3 Aug 2009 04:48:37 -0000	1.22
@@ -1 +1 @@
-RMagick-2.10.0.tar.bz2
+RMagick-2.11.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/ruby-RMagick.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ruby-RMagick.spec	27 Jun 2009 19:02:32 -0000	1.26
+++ ruby-RMagick.spec	3 Aug 2009 04:48:37 -0000	1.27
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		58959
+%define		repoid		61208
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.10.0
+%define		mainver		2.11.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -106,6 +106,12 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
+- 2.11.0
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-2
+- F-12: Mass rebuild
+
 * Sun Jun 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-1
 - 2.10.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	27 Jun 2009 19:02:32 -0000	1.21
+++ sources	3 Aug 2009 04:48:37 -0000	1.22
@@ -1 +1 @@
-0f23af161c186a3ae316b759ea2c4f66  RMagick-2.10.0.tar.bz2
+944636435aeffb228540f4b27371762a  RMagick-2.11.0.tar.bz2



From mtasaka at fedoraproject.org  Mon Aug  3 04:48:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 04:48:38 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel .cvsignore, 1.21, 1.22 ruby-RMagick.spec,
	1.32, 1.33 sources, 1.21, 1.22
Message-ID: <20090803044838.2F1CE11C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20112/devel

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
- 2.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	27 Jun 2009 19:02:33 -0000	1.21
+++ .cvsignore	3 Aug 2009 04:48:37 -0000	1.22
@@ -1 +1 @@
-RMagick-2.10.0.tar.bz2
+RMagick-2.11.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ruby-RMagick.spec	25 Jul 2009 07:17:53 -0000	1.32
+++ ruby-RMagick.spec	3 Aug 2009 04:48:37 -0000	1.33
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		58959
+%define		repoid		61208
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,9 +13,9 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.10.0
+%define		mainver		2.11.0
 %undefine		betaver		
-%define		fedorarel	2
+%define		fedorarel	1
 
 
 Name:		ruby-%{modname}
@@ -106,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
+- 2.11.0
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-2
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	27 Jun 2009 19:02:33 -0000	1.21
+++ sources	3 Aug 2009 04:48:38 -0000	1.22
@@ -1 +1 @@
-0f23af161c186a3ae316b759ea2c4f66  RMagick-2.10.0.tar.bz2
+944636435aeffb228540f4b27371762a  RMagick-2.11.0.tar.bz2



From mtasaka at fedoraproject.org  Mon Aug  3 04:48:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 04:48:37 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-11 .cvsignore, 1.21, 1.22 ruby-RMagick.spec,
	1.29, 1.30 sources, 1.21, 1.22
Message-ID: <20090803044837.D1AED11C02C6@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-serv20112/F-11

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
- 2.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	27 Jun 2009 19:02:32 -0000	1.21
+++ .cvsignore	3 Aug 2009 04:48:37 -0000	1.22
@@ -1 +1 @@
-RMagick-2.10.0.tar.bz2
+RMagick-2.11.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/ruby-RMagick.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ruby-RMagick.spec	27 Jun 2009 19:02:32 -0000	1.29
+++ ruby-RMagick.spec	3 Aug 2009 04:48:37 -0000	1.30
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		58959
+%define		repoid		61208
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.10.0
+%define		mainver		2.11.0
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -106,6 +106,12 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
+- 2.11.0
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-2
+- F-12: Mass rebuild
+
 * Sun Jun 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-1
 - 2.10.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	27 Jun 2009 19:02:32 -0000	1.21
+++ sources	3 Aug 2009 04:48:37 -0000	1.22
@@ -1 +1 @@
-0f23af161c186a3ae316b759ea2c4f66  RMagick-2.10.0.tar.bz2
+944636435aeffb228540f4b27371762a  RMagick-2.11.0.tar.bz2



From dchen at fedoraproject.org  Mon Aug  3 04:53:39 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  3 Aug 2009 04:53:39 +0000 (UTC)
Subject: rpms/libchewing/devel import.log, 1.14,
	1.15 libchewing-0.3.2.phraseChoiceRearward.patch, 1.3,
	1.4 libchewing.spec, 1.37, 1.38
Message-ID: <20090803045339.D1D2611C02C6@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	import.log libchewing-0.3.2.phraseChoiceRearward.patch 
	libchewing.spec 
Log Message:
Fixed Bug 512108 issue 11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	31 Jul 2009 07:33:09 -0000	1.14
+++ import.log	3 Aug 2009 04:53:39 -0000	1.15
@@ -12,3 +12,4 @@ libchewing-0_3_2-10_fc11:HEAD:libchewing
 libchewing-0_3_2-11_fc11:HEAD:libchewing-0.3.2-11.fc11.src.rpm:1245996227
 libchewing-0_3_2-12_fc11:HEAD:libchewing-0.3.2-12.fc11.src.rpm:1246329909
 libchewing-0_3_2-14_fc11:HEAD:libchewing-0.3.2-14.fc11.src.rpm:1249025558
+libchewing-0_3_2-15_fc11:HEAD:libchewing-0.3.2-15.fc11.src.rpm:1249275193

libchewing-0.3.2.phraseChoiceRearward.patch:
 chewingio.c |  202 ++++++++++++++++++++++++++++++++++--------------------------
 choice.c    |  115 +++++++++++++++++++++-------------
 2 files changed, 188 insertions(+), 129 deletions(-)

Index: libchewing-0.3.2.phraseChoiceRearward.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing-0.3.2.phraseChoiceRearward.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libchewing-0.3.2.phraseChoiceRearward.patch	31 Jul 2009 07:33:09 -0000	1.3
+++ libchewing-0.3.2.phraseChoiceRearward.patch	3 Aug 2009 04:53:39 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up ./src/chewingio.c.phraseChoiceRearward ./src/chewingio.c
 --- ./src/chewingio.c.phraseChoiceRearward	2008-12-02 00:29:20.000000000 +1000
-+++ ./src/chewingio.c	2009-07-31 17:17:06.000000000 +1000
++++ ./src/chewingio.c	2009-08-03 14:46:41.000000000 +1000
 @@ -20,6 +20,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -9,7 +9,20 @@ diff -up ./src/chewingio.c.phraseChoiceR
  
  #include "chewing-utf8-util.h"
  #include "global.h"
-@@ -75,14 +76,14 @@ CHEWING_API int chewing_KBStr2Num( char 
+@@ -50,6 +51,12 @@ void (*TerminateServices[ TerminateServi
+ static int countTerminateService = 0;
+ static int bTerminateCompleted = 0;
+ 
++/**
++ * This has to be global, as user might mixed space and down
++ * key as selection starter.
++ */
++static int cursor_orig=-1;
++
+ char *kb_type_str[] = {
+ 	"KB_DEFAULT",
+ 	"KB_HSU",
+@@ -75,14 +82,14 @@ CHEWING_API int chewing_KBStr2Num( char 
  	return KB_DEFAULT;
  }
  
@@ -26,7 +39,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  #endif
  
  int addTerminateService( void (*callback)() )
-@@ -103,7 +104,7 @@ int addTerminateService( void (*callback
+@@ -103,7 +110,7 @@ int addTerminateService( void (*callback
  CHEWING_API ChewingContext *chewing_new()
  {
  	ChewingContext *ctx;
@@ -35,7 +48,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	ChewingData *internal_data = ALC( ChewingData, 1 );
  	ChewingOutput *internal_output = ALC( ChewingOutput, 1 );
  	ctx = ALC( ChewingContext, 1 );
-@@ -159,7 +160,7 @@ CHEWING_API int chewing_Init(
+@@ -159,7 +166,7 @@ CHEWING_API int chewing_Init(
  		dbg_path = FAILSAFE_OUTPUT;
  	        fp_g = fopen( dbg_path, "w+" );
  		if ( ! fp_g ) {
@@ -44,7 +57,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				"Failed to record debug message in file.\n"
  				"--> Output to stderr\n" );
  		}
-@@ -237,14 +238,14 @@ CHEWING_API void chewing_Terminate()
+@@ -237,14 +244,14 @@ CHEWING_API void chewing_Terminate()
  		if ( TerminateServices[ i ] ) {
  #ifdef ENABLE_DEBUG
  			/* Can't output to debug file because it's about to close */
@@ -61,7 +74,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	/* XXX: should check if the services are really completed. */
  	bTerminateCompleted = 1;
  	return;
-@@ -403,7 +404,7 @@ CHEWING_API void chewing_set_ChiEngMode(
+@@ -403,7 +410,7 @@ CHEWING_API void chewing_set_ChiEngMode(
  	ctx->data->bChiSym = ( mode == CHINESE_MODE ? 1 : 0 );
  }
  
@@ -70,7 +83,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  {
  	return ctx->data->bChiSym;
  }
-@@ -413,7 +414,7 @@ CHEWING_API void chewing_set_ShapeMode( 
+@@ -413,7 +420,7 @@ CHEWING_API void chewing_set_ShapeMode( 
  	ctx->data->bFullShape = (mode == FULLSHAPE_MODE ? 1 : 0);
  }
  
@@ -79,7 +92,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  {
  	return ctx->data->bFullShape;
  }
-@@ -435,7 +436,7 @@ static int DoSelect( ChewingData *pgdata
+@@ -435,7 +442,7 @@ static int DoSelect( ChewingData *pgdata
  			if ( pgdata->choiceInfo.isSymbol ) {
  				SymbolChoice( pgdata, num );
  			}
@@ -88,16 +101,35 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				/* change the select interval & selectStr & nSelect */
  				AddSelect( pgdata, num );
  				/* second, call choice module */
-@@ -489,7 +490,7 @@ CHEWING_API int chewing_handle_Space( Ch
+@@ -472,13 +479,13 @@ CHEWING_API int chewing_handle_Space( Ch
+ 	CheckAndResetRange( pgdata );
+ 
+ 	if ( pgdata->bSelect ) {
+-		if ( pgdata->choiceInfo.pageNo < ( pgdata->choiceInfo.nPage - 1 ) ) {
++	    if ( pgdata->choiceInfo.pageNo < ( pgdata->choiceInfo.nPage - 1 ) ) {
+ 			return chewing_handle_Right( ctx );
+ 		}
+ 	}
+ 
+ 	if ( ! ChewingIsEntering( pgdata ) ) {
+-		if ( pgdata->bFullShape ) {
++	    if ( pgdata->bFullShape ) {
+ 			rtn = FullShapeSymbolInput( ' ', pgdata );
+ 		}
+ 		else {
+@@ -489,9 +496,9 @@ CHEWING_API int chewing_handle_Space( Ch
  		pgdata->chiSymbolBufLen = 0;
  		pgdata->chiSymbolCursor = 0;
  		keystrokeRtn = KEYSTROKE_COMMIT;
 -	} 
 +	}
  	else if ( pgdata->bChiSym != CHINESE_MODE ) {
- 		/* see if buffer contains nothing */
+-		/* see if buffer contains nothing */
++	    /* see if buffer contains nothing */
  		if ( pgdata->chiSymbolBufLen == 0 ) {
-@@ -507,11 +508,11 @@ CHEWING_API int chewing_handle_Space( Ch
+ 			bQuickCommit = 1;
+ 		}
+@@ -507,11 +514,11 @@ CHEWING_API int chewing_handle_Space( Ch
  		if ( rtn == SYMBOL_KEY_ERROR ) {
  			keystrokeRtn = KEYSTROKE_IGNORE;
  			/*
@@ -111,7 +143,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		else {
  			keystrokeRtn = KEYSTROKE_ABSORB;
  		}
-@@ -524,9 +525,9 @@ CHEWING_API int chewing_handle_Space( Ch
+@@ -524,9 +531,9 @@ CHEWING_API int chewing_handle_Space( Ch
  		/* Quick commit */
  		else {
  			DEBUG_OUT(
@@ -123,7 +155,46 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgo->nCommitStr = 1;
  			pgdata->chiSymbolBufLen = 0;
  			pgdata->chiSymbolCursor = 0;
-@@ -643,7 +644,7 @@ CHEWING_API int chewing_handle_Enter( Ch
+@@ -534,10 +541,11 @@ CHEWING_API int chewing_handle_Space( Ch
+ 		}
+ 	}
+ 	else {
++
+ 		rtn = ZuinPhoInput( &( pgdata->zuinData ), ' ' );
+ 		switch ( rtn ) {
+ 			case ZUIN_ABSORB:
+-				keystrokeRtn = KEYSTROKE_ABSORB;
++			    keystrokeRtn = KEYSTROKE_ABSORB;
+ 				break;
+ 			case ZUIN_COMMIT:
+ 				AddChi( pgdata->zuinData.phone, pgdata );
+@@ -557,10 +565,21 @@ CHEWING_API int chewing_handle_Space( Ch
+ 					toSelect = 1;
+ 
+ 				if ( toSelect ) {
+-					if ( ! pgdata->bSelect )
+-						ChoiceFirstAvail( pgdata );
+-					else
+-						ChoiceNextAvail( pgdata );
++				    if( ! pgdata->bSelect ) {
++					cursor_orig=pgdata->chiSymbolCursor;
++					ChoiceFirstAvail( pgdata );
++				    }
++				    else {
++					if ( pgdata->config.bPhraseChoiceRearward ){
++					    int avail_willbe=(pgdata->availInfo.currentAvail>0)?
++						pgdata->availInfo.currentAvail-1: pgdata->availInfo.nAvail - 1;
++					    pgdata->chiSymbolCursor=cursor_orig - pgdata->availInfo.avail[avail_willbe].len;
++					    if (chewing_buffer_Len(ctx)>cursor_orig){
++						pgdata->chiSymbolCursor++;
++					    }
++					}
++					ChoiceNextAvail( pgdata );
++				    }
+ 				}
+ 				else if ( pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
+ 					/* Open Symbol Choice List */
+@@ -643,7 +662,7 @@ CHEWING_API int chewing_handle_Enter( Ch
  		keystrokeRtn = KEYSTROKE_COMMIT;
  		WriteChiSymbolToBuf( pgo->commitStr, nCommitStr, pgdata );
  		AutoLearnPhrase( pgdata );
@@ -132,7 +203,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		pgo->nCommitStr = nCommitStr;
  	}
  
-@@ -664,12 +665,12 @@ CHEWING_API int chewing_handle_Del( Chew
+@@ -664,12 +683,12 @@ CHEWING_API int chewing_handle_Del( Chew
  	}
  
  	if ( ! pgdata->bSelect ) {
@@ -149,7 +220,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				NONDECREASE_CURSOR );
  		}
  		CallPhrasing( pgdata );
-@@ -696,7 +697,7 @@ CHEWING_API int chewing_handle_Backspace
+@@ -696,7 +715,7 @@ CHEWING_API int chewing_handle_Backspace
  		}
  		else if ( pgdata->chiSymbolCursor > 0 ) {
  			ChewingKillChar(
@@ -158,7 +229,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				pgdata->chiSymbolCursor - 1,
  				DECREASE_CURSOR );
  		}
-@@ -735,11 +736,12 @@ CHEWING_API int chewing_handle_Up( Chewi
+@@ -735,7 +754,7 @@ CHEWING_API int chewing_handle_Up( Chewi
  
  CHEWING_API int chewing_handle_Down( ChewingContext *ctx )
  {
@@ -167,12 +238,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	ChewingOutput *pgo = ctx->output;
  	int toSelect = 0;
  	int keystrokeRtn = KEYSTROKE_ABSORB;
- 	int key_buf_cursor;
-+	static int cursor_orig=-1;
- 
- 	CheckAndResetRange( pgdata );
- 
-@@ -756,13 +758,22 @@ CHEWING_API int chewing_handle_Down( Che
+@@ -756,13 +775,22 @@ CHEWING_API int chewing_handle_Down( Che
  			toSelect = 1;
  
  	if ( toSelect ) {
@@ -197,7 +263,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	else if ( pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
  		/* Open Symbol Choice List */
  		if ( ! pgdata->choiceInfo.isSymbol )
-@@ -782,11 +793,11 @@ CHEWING_API int chewing_handle_ShiftLeft
+@@ -782,11 +810,11 @@ CHEWING_API int chewing_handle_ShiftLeft
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
@@ -212,7 +278,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->chiSymbolCursor > 0 &&
  			pgdata->PointEnd > -9 ) {
  			if ( pgdata->PointStart == -1 )
-@@ -797,7 +808,7 @@ CHEWING_API int chewing_handle_ShiftLeft
+@@ -797,7 +825,7 @@ CHEWING_API int chewing_handle_ShiftLeft
  				pgdata->PointEnd--;
  			}
  			if ( pgdata->PointEnd == 0 )
@@ -221,7 +287,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		}
  	}
  
-@@ -822,8 +833,8 @@ CHEWING_API int chewing_handle_Left( Che
+@@ -822,8 +850,8 @@ CHEWING_API int chewing_handle_Left( Che
  			pgdata->choiceInfo.pageNo = pgdata->choiceInfo.nPage - 1;
  	}
  	else {
@@ -232,7 +298,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->chiSymbolCursor > 0 ) {
  			CheckAndResetRange( pgdata );
  			pgdata->chiSymbolCursor--;
-@@ -842,13 +853,13 @@ CHEWING_API int chewing_handle_ShiftRigh
+@@ -842,13 +870,13 @@ CHEWING_API int chewing_handle_ShiftRigh
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
@@ -250,7 +316,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->PointEnd < 9 ) {
  			if ( pgdata->PointStart == -1 )
  				pgdata->PointStart = pgdata->chiSymbolCursor;
-@@ -858,7 +869,7 @@ CHEWING_API int chewing_handle_ShiftRigh
+@@ -858,7 +886,7 @@ CHEWING_API int chewing_handle_ShiftRigh
  			}
  			pgdata->chiSymbolCursor++;
  			if ( pgdata->PointEnd == 0 )
@@ -259,7 +325,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		}
  	}
  
-@@ -883,9 +894,9 @@ CHEWING_API int chewing_handle_Right( Ch
+@@ -883,9 +911,9 @@ CHEWING_API int chewing_handle_Right( Ch
  			pgdata->choiceInfo.pageNo = 0;
  	}
  	else {
@@ -272,7 +338,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			CheckAndResetRange( pgdata );
  			pgdata->chiSymbolCursor++;
  		}
-@@ -974,11 +985,11 @@ CHEWING_API int chewing_handle_Home( Che
+@@ -974,11 +1002,11 @@ CHEWING_API int chewing_handle_Home( Che
  
  	CheckAndResetRange( pgdata );
  
@@ -287,7 +353,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	}
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
-@@ -993,12 +1004,12 @@ CHEWING_API int chewing_handle_End( Chew
+@@ -993,12 +1021,12 @@ CHEWING_API int chewing_handle_End( Chew
  	CheckAndResetRange( pgdata );
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
@@ -305,7 +371,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	return 0;
  }
  
-@@ -1013,9 +1024,9 @@ CHEWING_API int chewing_handle_PageUp( C
+@@ -1013,9 +1041,9 @@ CHEWING_API int chewing_handle_PageUp( C
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
  	}
@@ -317,7 +383,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
  }
-@@ -1031,9 +1042,9 @@ CHEWING_API int chewing_handle_PageDown(
+@@ -1031,9 +1059,9 @@ CHEWING_API int chewing_handle_PageDown(
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
  	}
@@ -329,7 +395,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
  }
-@@ -1107,7 +1118,7 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1107,7 +1135,7 @@ CHEWING_API int chewing_handle_Default( 
  			DoSelect( pgdata, num );
  			goto End_keyproc;
  		}
@@ -338,7 +404,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		/* Otherwise, use 'j' and 'k' for paging in selection mode */
  		DEBUG_OUT(
  			"\t\tchecking paging key, got '%c'\n",
-@@ -1163,10 +1174,10 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1163,10 +1191,10 @@ CHEWING_API int chewing_handle_Default( 
  			rtn = ZuinPhoInput( &( pgdata->zuinData ), key );
  			DEBUG_OUT(
  				"\t\tChinese mode key, "
@@ -351,7 +417,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			if ( rtn == ZUIN_KEY_ERROR )
  				rtn = SpecialSymbolInput( key, pgdata );
  			switch ( rtn ) {
-@@ -1182,14 +1193,14 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1182,14 +1210,14 @@ CHEWING_API int chewing_handle_Default( 
  				case ZUIN_KEY_ERROR:
  				case ZUIN_IGNORE:
  					DEBUG_OUT(
@@ -369,7 +435,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  						key );
  
  					/* see if buffer contains nothing */
-@@ -1207,7 +1218,7 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1207,7 +1235,7 @@ CHEWING_API int chewing_handle_Default( 
  					if ( rtn == SYMBOL_KEY_ERROR ) {
  						keystrokeRtn = KEYSTROKE_IGNORE;
  						/*
@@ -378,7 +444,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  						 * then it's wrong to commit it.
  						 */
  						bQuickCommit = 0;
-@@ -1248,9 +1259,9 @@ End_keyproc:
+@@ -1248,9 +1276,9 @@ End_keyproc:
  	/* Quick commit */
  	else {
  		DEBUG_OUT(
@@ -390,7 +456,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		pgo->nCommitStr = 1;
  		pgdata->chiSymbolBufLen = 0;
  		pgdata->chiSymbolCursor = 0;
-@@ -1309,12 +1320,12 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1309,12 +1337,12 @@ CHEWING_API int chewing_handle_CtrlNum( 
  
  	cursor = PhoneSeqCursor( pgdata );
  	if ( ! pgdata->config.bAddPhraseForward ) {
@@ -408,7 +474,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				cursor + newPhraseLen - 1 ) ) {
  				/* Manually add phrase to the user phrase database. */
  				memcpy( addPhoneSeq,
-@@ -1328,10 +1339,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1328,10 +1356,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
  
  
  				phraseState = UserUpdatePhrase( addPhoneSeq, addWordSeq );
@@ -423,7 +489,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  					phraseState );
  
  				/* Clear the breakpoint between the New Phrase */
-@@ -1341,11 +1352,11 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1341,11 +1369,11 @@ CHEWING_API int chewing_handle_CtrlNum( 
  		}
  	}
  	else {
@@ -439,7 +505,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			                      cursor - newPhraseLen ) ) {
  				/* Manually add phrase to the user phrase database. */
  				memcpy( addPhoneSeq,
-@@ -1358,10 +1369,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1358,10 +1386,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
  				           newPhraseLen, 1);
  
  				phraseState = UserUpdatePhrase( addPhoneSeq, addWordSeq );
@@ -454,7 +520,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  					phraseState );
  
  				/* Clear the breakpoint between the New Phrase */
-@@ -1414,10 +1425,10 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1414,10 +1442,10 @@ CHEWING_API int chewing_handle_Numlock( 
  	ChewingOutput *pgo = ctx->output;
  	int rtn, QuickCommit = 0;
  	int keystrokeRtn = KEYSTROKE_ABSORB;
@@ -467,7 +533,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		 */
  		if ( pgdata->chiSymbolBufLen == 0 ) {
  			QuickCommit = 1;
-@@ -1428,7 +1439,7 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1428,7 +1456,7 @@ CHEWING_API int chewing_handle_Numlock( 
  			keystrokeRtn = KEYSTROKE_IGNORE ;
  		}
  		else if ( QuickCommit ) {
@@ -476,7 +542,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgo->nCommitStr = 1;
  			pgdata->chiSymbolBufLen = 0;
  			pgdata->chiSymbolCursor = 0;
-@@ -1443,7 +1454,7 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1443,7 +1471,7 @@ CHEWING_API int chewing_handle_Numlock( 
  	else {
  		/* Otherwise, if we are selecting words, we use numeric keys
  		 * as selkey
@@ -487,7 +553,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		if ( key > '0' && key < '9' )
 diff -up ./src/choice.c.phraseChoiceRearward ./src/choice.c
 --- ./src/choice.c.phraseChoiceRearward	2008-12-02 00:29:20.000000000 +1000
-+++ ./src/choice.c	2009-07-31 17:16:57.000000000 +1000
++++ ./src/choice.c	2009-08-03 14:35:28.000000000 +1000
 @@ -71,22 +71,44 @@ static void ChangeSelectIntervalAndBreak
  }
  


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libchewing.spec	31 Jul 2009 07:33:09 -0000	1.37
+++ libchewing.spec	3 Aug 2009 04:53:39 -0000	1.38
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -98,7 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
-* Tue Jul 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-14
+* Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
+- Fix [Bug 512108:issue 11] ibus-chewing crash the application
+  by move cursor_orig to chewingio.c global.
+
+* Thu Jul 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-14
 - Fix [Bug 512108] ibus-chewing crash the application
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-13



From dchen at fedoraproject.org  Mon Aug  3 05:04:44 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  3 Aug 2009 05:04:44 +0000 (UTC)
Subject: rpms/libchewing/F-11 import.log, 1.14,
	1.15 libchewing-0.3.2.phraseChoiceRearward.patch, 1.3,
	1.4 libchewing.spec, 1.36, 1.37
Message-ID: <20090803050444.D839811C02C6@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	import.log libchewing-0.3.2.phraseChoiceRearward.patch 
	libchewing.spec 
Log Message:
Fixed Bug 512108 issue 11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	31 Jul 2009 07:34:33 -0000	1.14
+++ import.log	3 Aug 2009 05:04:44 -0000	1.15
@@ -12,3 +12,4 @@ libchewing-0_3_2-10_fc11:F-11:libchewing
 libchewing-0_3_2-11_fc11:F-11:libchewing-0.3.2-11.fc11.src.rpm:1245996747
 libchewing-0_3_2-12_fc11:F-11:libchewing-0.3.2-12.fc11.src.rpm:1246330058
 libchewing-0_3_2-14_fc11:F-11:libchewing-0.3.2-14.fc11.src.rpm:1249025650
+libchewing-0_3_2-15_fc11:F-11:libchewing-0.3.2-15.fc11.src.rpm:1249275892

libchewing-0.3.2.phraseChoiceRearward.patch:
 chewingio.c |  202 ++++++++++++++++++++++++++++++++++--------------------------
 choice.c    |  115 +++++++++++++++++++++-------------
 2 files changed, 188 insertions(+), 129 deletions(-)

Index: libchewing-0.3.2.phraseChoiceRearward.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/libchewing-0.3.2.phraseChoiceRearward.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libchewing-0.3.2.phraseChoiceRearward.patch	31 Jul 2009 07:34:33 -0000	1.3
+++ libchewing-0.3.2.phraseChoiceRearward.patch	3 Aug 2009 05:04:44 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up ./src/chewingio.c.phraseChoiceRearward ./src/chewingio.c
 --- ./src/chewingio.c.phraseChoiceRearward	2008-12-02 00:29:20.000000000 +1000
-+++ ./src/chewingio.c	2009-07-31 17:17:06.000000000 +1000
++++ ./src/chewingio.c	2009-08-03 14:46:41.000000000 +1000
 @@ -20,6 +20,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -9,7 +9,20 @@ diff -up ./src/chewingio.c.phraseChoiceR
  
  #include "chewing-utf8-util.h"
  #include "global.h"
-@@ -75,14 +76,14 @@ CHEWING_API int chewing_KBStr2Num( char 
+@@ -50,6 +51,12 @@ void (*TerminateServices[ TerminateServi
+ static int countTerminateService = 0;
+ static int bTerminateCompleted = 0;
+ 
++/**
++ * This has to be global, as user might mixed space and down
++ * key as selection starter.
++ */
++static int cursor_orig=-1;
++
+ char *kb_type_str[] = {
+ 	"KB_DEFAULT",
+ 	"KB_HSU",
+@@ -75,14 +82,14 @@ CHEWING_API int chewing_KBStr2Num( char 
  	return KB_DEFAULT;
  }
  
@@ -26,7 +39,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  #endif
  
  int addTerminateService( void (*callback)() )
-@@ -103,7 +104,7 @@ int addTerminateService( void (*callback
+@@ -103,7 +110,7 @@ int addTerminateService( void (*callback
  CHEWING_API ChewingContext *chewing_new()
  {
  	ChewingContext *ctx;
@@ -35,7 +48,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	ChewingData *internal_data = ALC( ChewingData, 1 );
  	ChewingOutput *internal_output = ALC( ChewingOutput, 1 );
  	ctx = ALC( ChewingContext, 1 );
-@@ -159,7 +160,7 @@ CHEWING_API int chewing_Init(
+@@ -159,7 +166,7 @@ CHEWING_API int chewing_Init(
  		dbg_path = FAILSAFE_OUTPUT;
  	        fp_g = fopen( dbg_path, "w+" );
  		if ( ! fp_g ) {
@@ -44,7 +57,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				"Failed to record debug message in file.\n"
  				"--> Output to stderr\n" );
  		}
-@@ -237,14 +238,14 @@ CHEWING_API void chewing_Terminate()
+@@ -237,14 +244,14 @@ CHEWING_API void chewing_Terminate()
  		if ( TerminateServices[ i ] ) {
  #ifdef ENABLE_DEBUG
  			/* Can't output to debug file because it's about to close */
@@ -61,7 +74,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	/* XXX: should check if the services are really completed. */
  	bTerminateCompleted = 1;
  	return;
-@@ -403,7 +404,7 @@ CHEWING_API void chewing_set_ChiEngMode(
+@@ -403,7 +410,7 @@ CHEWING_API void chewing_set_ChiEngMode(
  	ctx->data->bChiSym = ( mode == CHINESE_MODE ? 1 : 0 );
  }
  
@@ -70,7 +83,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  {
  	return ctx->data->bChiSym;
  }
-@@ -413,7 +414,7 @@ CHEWING_API void chewing_set_ShapeMode( 
+@@ -413,7 +420,7 @@ CHEWING_API void chewing_set_ShapeMode( 
  	ctx->data->bFullShape = (mode == FULLSHAPE_MODE ? 1 : 0);
  }
  
@@ -79,7 +92,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  {
  	return ctx->data->bFullShape;
  }
-@@ -435,7 +436,7 @@ static int DoSelect( ChewingData *pgdata
+@@ -435,7 +442,7 @@ static int DoSelect( ChewingData *pgdata
  			if ( pgdata->choiceInfo.isSymbol ) {
  				SymbolChoice( pgdata, num );
  			}
@@ -88,16 +101,35 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				/* change the select interval & selectStr & nSelect */
  				AddSelect( pgdata, num );
  				/* second, call choice module */
-@@ -489,7 +490,7 @@ CHEWING_API int chewing_handle_Space( Ch
+@@ -472,13 +479,13 @@ CHEWING_API int chewing_handle_Space( Ch
+ 	CheckAndResetRange( pgdata );
+ 
+ 	if ( pgdata->bSelect ) {
+-		if ( pgdata->choiceInfo.pageNo < ( pgdata->choiceInfo.nPage - 1 ) ) {
++	    if ( pgdata->choiceInfo.pageNo < ( pgdata->choiceInfo.nPage - 1 ) ) {
+ 			return chewing_handle_Right( ctx );
+ 		}
+ 	}
+ 
+ 	if ( ! ChewingIsEntering( pgdata ) ) {
+-		if ( pgdata->bFullShape ) {
++	    if ( pgdata->bFullShape ) {
+ 			rtn = FullShapeSymbolInput( ' ', pgdata );
+ 		}
+ 		else {
+@@ -489,9 +496,9 @@ CHEWING_API int chewing_handle_Space( Ch
  		pgdata->chiSymbolBufLen = 0;
  		pgdata->chiSymbolCursor = 0;
  		keystrokeRtn = KEYSTROKE_COMMIT;
 -	} 
 +	}
  	else if ( pgdata->bChiSym != CHINESE_MODE ) {
- 		/* see if buffer contains nothing */
+-		/* see if buffer contains nothing */
++	    /* see if buffer contains nothing */
  		if ( pgdata->chiSymbolBufLen == 0 ) {
-@@ -507,11 +508,11 @@ CHEWING_API int chewing_handle_Space( Ch
+ 			bQuickCommit = 1;
+ 		}
+@@ -507,11 +514,11 @@ CHEWING_API int chewing_handle_Space( Ch
  		if ( rtn == SYMBOL_KEY_ERROR ) {
  			keystrokeRtn = KEYSTROKE_IGNORE;
  			/*
@@ -111,7 +143,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		else {
  			keystrokeRtn = KEYSTROKE_ABSORB;
  		}
-@@ -524,9 +525,9 @@ CHEWING_API int chewing_handle_Space( Ch
+@@ -524,9 +531,9 @@ CHEWING_API int chewing_handle_Space( Ch
  		/* Quick commit */
  		else {
  			DEBUG_OUT(
@@ -123,7 +155,46 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgo->nCommitStr = 1;
  			pgdata->chiSymbolBufLen = 0;
  			pgdata->chiSymbolCursor = 0;
-@@ -643,7 +644,7 @@ CHEWING_API int chewing_handle_Enter( Ch
+@@ -534,10 +541,11 @@ CHEWING_API int chewing_handle_Space( Ch
+ 		}
+ 	}
+ 	else {
++
+ 		rtn = ZuinPhoInput( &( pgdata->zuinData ), ' ' );
+ 		switch ( rtn ) {
+ 			case ZUIN_ABSORB:
+-				keystrokeRtn = KEYSTROKE_ABSORB;
++			    keystrokeRtn = KEYSTROKE_ABSORB;
+ 				break;
+ 			case ZUIN_COMMIT:
+ 				AddChi( pgdata->zuinData.phone, pgdata );
+@@ -557,10 +565,21 @@ CHEWING_API int chewing_handle_Space( Ch
+ 					toSelect = 1;
+ 
+ 				if ( toSelect ) {
+-					if ( ! pgdata->bSelect )
+-						ChoiceFirstAvail( pgdata );
+-					else
+-						ChoiceNextAvail( pgdata );
++				    if( ! pgdata->bSelect ) {
++					cursor_orig=pgdata->chiSymbolCursor;
++					ChoiceFirstAvail( pgdata );
++				    }
++				    else {
++					if ( pgdata->config.bPhraseChoiceRearward ){
++					    int avail_willbe=(pgdata->availInfo.currentAvail>0)?
++						pgdata->availInfo.currentAvail-1: pgdata->availInfo.nAvail - 1;
++					    pgdata->chiSymbolCursor=cursor_orig - pgdata->availInfo.avail[avail_willbe].len;
++					    if (chewing_buffer_Len(ctx)>cursor_orig){
++						pgdata->chiSymbolCursor++;
++					    }
++					}
++					ChoiceNextAvail( pgdata );
++				    }
+ 				}
+ 				else if ( pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
+ 					/* Open Symbol Choice List */
+@@ -643,7 +662,7 @@ CHEWING_API int chewing_handle_Enter( Ch
  		keystrokeRtn = KEYSTROKE_COMMIT;
  		WriteChiSymbolToBuf( pgo->commitStr, nCommitStr, pgdata );
  		AutoLearnPhrase( pgdata );
@@ -132,7 +203,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		pgo->nCommitStr = nCommitStr;
  	}
  
-@@ -664,12 +665,12 @@ CHEWING_API int chewing_handle_Del( Chew
+@@ -664,12 +683,12 @@ CHEWING_API int chewing_handle_Del( Chew
  	}
  
  	if ( ! pgdata->bSelect ) {
@@ -149,7 +220,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				NONDECREASE_CURSOR );
  		}
  		CallPhrasing( pgdata );
-@@ -696,7 +697,7 @@ CHEWING_API int chewing_handle_Backspace
+@@ -696,7 +715,7 @@ CHEWING_API int chewing_handle_Backspace
  		}
  		else if ( pgdata->chiSymbolCursor > 0 ) {
  			ChewingKillChar(
@@ -158,7 +229,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				pgdata->chiSymbolCursor - 1,
  				DECREASE_CURSOR );
  		}
-@@ -735,11 +736,12 @@ CHEWING_API int chewing_handle_Up( Chewi
+@@ -735,7 +754,7 @@ CHEWING_API int chewing_handle_Up( Chewi
  
  CHEWING_API int chewing_handle_Down( ChewingContext *ctx )
  {
@@ -167,12 +238,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	ChewingOutput *pgo = ctx->output;
  	int toSelect = 0;
  	int keystrokeRtn = KEYSTROKE_ABSORB;
- 	int key_buf_cursor;
-+	static int cursor_orig=-1;
- 
- 	CheckAndResetRange( pgdata );
- 
-@@ -756,13 +758,22 @@ CHEWING_API int chewing_handle_Down( Che
+@@ -756,13 +775,22 @@ CHEWING_API int chewing_handle_Down( Che
  			toSelect = 1;
  
  	if ( toSelect ) {
@@ -197,7 +263,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	else if ( pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
  		/* Open Symbol Choice List */
  		if ( ! pgdata->choiceInfo.isSymbol )
-@@ -782,11 +793,11 @@ CHEWING_API int chewing_handle_ShiftLeft
+@@ -782,11 +810,11 @@ CHEWING_API int chewing_handle_ShiftLeft
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
@@ -212,7 +278,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->chiSymbolCursor > 0 &&
  			pgdata->PointEnd > -9 ) {
  			if ( pgdata->PointStart == -1 )
-@@ -797,7 +808,7 @@ CHEWING_API int chewing_handle_ShiftLeft
+@@ -797,7 +825,7 @@ CHEWING_API int chewing_handle_ShiftLeft
  				pgdata->PointEnd--;
  			}
  			if ( pgdata->PointEnd == 0 )
@@ -221,7 +287,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		}
  	}
  
-@@ -822,8 +833,8 @@ CHEWING_API int chewing_handle_Left( Che
+@@ -822,8 +850,8 @@ CHEWING_API int chewing_handle_Left( Che
  			pgdata->choiceInfo.pageNo = pgdata->choiceInfo.nPage - 1;
  	}
  	else {
@@ -232,7 +298,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->chiSymbolCursor > 0 ) {
  			CheckAndResetRange( pgdata );
  			pgdata->chiSymbolCursor--;
-@@ -842,13 +853,13 @@ CHEWING_API int chewing_handle_ShiftRigh
+@@ -842,13 +870,13 @@ CHEWING_API int chewing_handle_ShiftRigh
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
@@ -250,7 +316,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->PointEnd < 9 ) {
  			if ( pgdata->PointStart == -1 )
  				pgdata->PointStart = pgdata->chiSymbolCursor;
-@@ -858,7 +869,7 @@ CHEWING_API int chewing_handle_ShiftRigh
+@@ -858,7 +886,7 @@ CHEWING_API int chewing_handle_ShiftRigh
  			}
  			pgdata->chiSymbolCursor++;
  			if ( pgdata->PointEnd == 0 )
@@ -259,7 +325,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		}
  	}
  
-@@ -883,9 +894,9 @@ CHEWING_API int chewing_handle_Right( Ch
+@@ -883,9 +911,9 @@ CHEWING_API int chewing_handle_Right( Ch
  			pgdata->choiceInfo.pageNo = 0;
  	}
  	else {
@@ -272,7 +338,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			CheckAndResetRange( pgdata );
  			pgdata->chiSymbolCursor++;
  		}
-@@ -974,11 +985,11 @@ CHEWING_API int chewing_handle_Home( Che
+@@ -974,11 +1002,11 @@ CHEWING_API int chewing_handle_Home( Che
  
  	CheckAndResetRange( pgdata );
  
@@ -287,7 +353,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	}
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
-@@ -993,12 +1004,12 @@ CHEWING_API int chewing_handle_End( Chew
+@@ -993,12 +1021,12 @@ CHEWING_API int chewing_handle_End( Chew
  	CheckAndResetRange( pgdata );
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
@@ -305,7 +371,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	return 0;
  }
  
-@@ -1013,9 +1024,9 @@ CHEWING_API int chewing_handle_PageUp( C
+@@ -1013,9 +1041,9 @@ CHEWING_API int chewing_handle_PageUp( C
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
  	}
@@ -317,7 +383,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
  }
-@@ -1031,9 +1042,9 @@ CHEWING_API int chewing_handle_PageDown(
+@@ -1031,9 +1059,9 @@ CHEWING_API int chewing_handle_PageDown(
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
  	}
@@ -329,7 +395,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
  }
-@@ -1107,7 +1118,7 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1107,7 +1135,7 @@ CHEWING_API int chewing_handle_Default( 
  			DoSelect( pgdata, num );
  			goto End_keyproc;
  		}
@@ -338,7 +404,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		/* Otherwise, use 'j' and 'k' for paging in selection mode */
  		DEBUG_OUT(
  			"\t\tchecking paging key, got '%c'\n",
-@@ -1163,10 +1174,10 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1163,10 +1191,10 @@ CHEWING_API int chewing_handle_Default( 
  			rtn = ZuinPhoInput( &( pgdata->zuinData ), key );
  			DEBUG_OUT(
  				"\t\tChinese mode key, "
@@ -351,7 +417,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			if ( rtn == ZUIN_KEY_ERROR )
  				rtn = SpecialSymbolInput( key, pgdata );
  			switch ( rtn ) {
-@@ -1182,14 +1193,14 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1182,14 +1210,14 @@ CHEWING_API int chewing_handle_Default( 
  				case ZUIN_KEY_ERROR:
  				case ZUIN_IGNORE:
  					DEBUG_OUT(
@@ -369,7 +435,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  						key );
  
  					/* see if buffer contains nothing */
-@@ -1207,7 +1218,7 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1207,7 +1235,7 @@ CHEWING_API int chewing_handle_Default( 
  					if ( rtn == SYMBOL_KEY_ERROR ) {
  						keystrokeRtn = KEYSTROKE_IGNORE;
  						/*
@@ -378,7 +444,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  						 * then it's wrong to commit it.
  						 */
  						bQuickCommit = 0;
-@@ -1248,9 +1259,9 @@ End_keyproc:
+@@ -1248,9 +1276,9 @@ End_keyproc:
  	/* Quick commit */
  	else {
  		DEBUG_OUT(
@@ -390,7 +456,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		pgo->nCommitStr = 1;
  		pgdata->chiSymbolBufLen = 0;
  		pgdata->chiSymbolCursor = 0;
-@@ -1309,12 +1320,12 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1309,12 +1337,12 @@ CHEWING_API int chewing_handle_CtrlNum( 
  
  	cursor = PhoneSeqCursor( pgdata );
  	if ( ! pgdata->config.bAddPhraseForward ) {
@@ -408,7 +474,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				cursor + newPhraseLen - 1 ) ) {
  				/* Manually add phrase to the user phrase database. */
  				memcpy( addPhoneSeq,
-@@ -1328,10 +1339,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1328,10 +1356,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
  
  
  				phraseState = UserUpdatePhrase( addPhoneSeq, addWordSeq );
@@ -423,7 +489,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  					phraseState );
  
  				/* Clear the breakpoint between the New Phrase */
-@@ -1341,11 +1352,11 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1341,11 +1369,11 @@ CHEWING_API int chewing_handle_CtrlNum( 
  		}
  	}
  	else {
@@ -439,7 +505,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			                      cursor - newPhraseLen ) ) {
  				/* Manually add phrase to the user phrase database. */
  				memcpy( addPhoneSeq,
-@@ -1358,10 +1369,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1358,10 +1386,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
  				           newPhraseLen, 1);
  
  				phraseState = UserUpdatePhrase( addPhoneSeq, addWordSeq );
@@ -454,7 +520,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  					phraseState );
  
  				/* Clear the breakpoint between the New Phrase */
-@@ -1414,10 +1425,10 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1414,10 +1442,10 @@ CHEWING_API int chewing_handle_Numlock( 
  	ChewingOutput *pgo = ctx->output;
  	int rtn, QuickCommit = 0;
  	int keystrokeRtn = KEYSTROKE_ABSORB;
@@ -467,7 +533,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		 */
  		if ( pgdata->chiSymbolBufLen == 0 ) {
  			QuickCommit = 1;
-@@ -1428,7 +1439,7 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1428,7 +1456,7 @@ CHEWING_API int chewing_handle_Numlock( 
  			keystrokeRtn = KEYSTROKE_IGNORE ;
  		}
  		else if ( QuickCommit ) {
@@ -476,7 +542,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgo->nCommitStr = 1;
  			pgdata->chiSymbolBufLen = 0;
  			pgdata->chiSymbolCursor = 0;
-@@ -1443,7 +1454,7 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1443,7 +1471,7 @@ CHEWING_API int chewing_handle_Numlock( 
  	else {
  		/* Otherwise, if we are selecting words, we use numeric keys
  		 * as selkey
@@ -487,7 +553,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		if ( key > '0' && key < '9' )
 diff -up ./src/choice.c.phraseChoiceRearward ./src/choice.c
 --- ./src/choice.c.phraseChoiceRearward	2008-12-02 00:29:20.000000000 +1000
-+++ ./src/choice.c	2009-07-31 17:16:57.000000000 +1000
++++ ./src/choice.c	2009-08-03 14:35:28.000000000 +1000
 @@ -71,22 +71,44 @@ static void ChangeSelectIntervalAndBreak
  }
  


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-11/libchewing.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libchewing.spec	31 Jul 2009 07:34:33 -0000	1.36
+++ libchewing.spec	3 Aug 2009 05:04:44 -0000	1.37
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -98,7 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
-* Tue Jul 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-14
+* Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
+- Fix [Bug 512108:issue 11] ibus-chewing crash the application
+  by move cursor_orig to chewingio.c global.
+
+* Thu Jul 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-14
 - Fix [Bug 512108] ibus-chewing crash the application
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-13



From dchen at fedoraproject.org  Mon Aug  3 05:06:49 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  3 Aug 2009 05:06:49 +0000 (UTC)
Subject: rpms/libchewing/F-10 import.log, 1.14,
	1.15 libchewing-0.3.2.phraseChoiceRearward.patch, 1.3,
	1.4 libchewing.spec, 1.34, 1.35
Message-ID: <20090803050649.ACBBA11C02C6@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	import.log libchewing-0.3.2.phraseChoiceRearward.patch 
	libchewing.spec 
Log Message:
Fixed Bug 512108 issue 11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	31 Jul 2009 07:35:18 -0000	1.14
+++ import.log	3 Aug 2009 05:06:49 -0000	1.15
@@ -12,3 +12,4 @@ libchewing-0_3_2-10_fc11:F-10:libchewing
 libchewing-0_3_2-11_fc11:F-10:libchewing-0.3.2-11.fc11.src.rpm:1245996821
 libchewing-0_3_2-12_fc11:F-10:libchewing-0.3.2-12.fc11.src.rpm:1246331199
 libchewing-0_3_2-14_fc11:F-10:libchewing-0.3.2-14.fc11.src.rpm:1249025696
+libchewing-0_3_2-15_fc11:F-10:libchewing-0.3.2-15.fc11.src.rpm:1249276018

libchewing-0.3.2.phraseChoiceRearward.patch:
 chewingio.c |  202 ++++++++++++++++++++++++++++++++++--------------------------
 choice.c    |  115 +++++++++++++++++++++-------------
 2 files changed, 188 insertions(+), 129 deletions(-)

Index: libchewing-0.3.2.phraseChoiceRearward.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing-0.3.2.phraseChoiceRearward.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libchewing-0.3.2.phraseChoiceRearward.patch	31 Jul 2009 07:35:18 -0000	1.3
+++ libchewing-0.3.2.phraseChoiceRearward.patch	3 Aug 2009 05:06:49 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up ./src/chewingio.c.phraseChoiceRearward ./src/chewingio.c
 --- ./src/chewingio.c.phraseChoiceRearward	2008-12-02 00:29:20.000000000 +1000
-+++ ./src/chewingio.c	2009-07-31 17:17:06.000000000 +1000
++++ ./src/chewingio.c	2009-08-03 14:46:41.000000000 +1000
 @@ -20,6 +20,7 @@
  #include <string.h>
  #include <ctype.h>
@@ -9,7 +9,20 @@ diff -up ./src/chewingio.c.phraseChoiceR
  
  #include "chewing-utf8-util.h"
  #include "global.h"
-@@ -75,14 +76,14 @@ CHEWING_API int chewing_KBStr2Num( char 
+@@ -50,6 +51,12 @@ void (*TerminateServices[ TerminateServi
+ static int countTerminateService = 0;
+ static int bTerminateCompleted = 0;
+ 
++/**
++ * This has to be global, as user might mixed space and down
++ * key as selection starter.
++ */
++static int cursor_orig=-1;
++
+ char *kb_type_str[] = {
+ 	"KB_DEFAULT",
+ 	"KB_HSU",
+@@ -75,14 +82,14 @@ CHEWING_API int chewing_KBStr2Num( char 
  	return KB_DEFAULT;
  }
  
@@ -26,7 +39,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  #endif
  
  int addTerminateService( void (*callback)() )
-@@ -103,7 +104,7 @@ int addTerminateService( void (*callback
+@@ -103,7 +110,7 @@ int addTerminateService( void (*callback
  CHEWING_API ChewingContext *chewing_new()
  {
  	ChewingContext *ctx;
@@ -35,7 +48,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	ChewingData *internal_data = ALC( ChewingData, 1 );
  	ChewingOutput *internal_output = ALC( ChewingOutput, 1 );
  	ctx = ALC( ChewingContext, 1 );
-@@ -159,7 +160,7 @@ CHEWING_API int chewing_Init(
+@@ -159,7 +166,7 @@ CHEWING_API int chewing_Init(
  		dbg_path = FAILSAFE_OUTPUT;
  	        fp_g = fopen( dbg_path, "w+" );
  		if ( ! fp_g ) {
@@ -44,7 +57,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				"Failed to record debug message in file.\n"
  				"--> Output to stderr\n" );
  		}
-@@ -237,14 +238,14 @@ CHEWING_API void chewing_Terminate()
+@@ -237,14 +244,14 @@ CHEWING_API void chewing_Terminate()
  		if ( TerminateServices[ i ] ) {
  #ifdef ENABLE_DEBUG
  			/* Can't output to debug file because it's about to close */
@@ -61,7 +74,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	/* XXX: should check if the services are really completed. */
  	bTerminateCompleted = 1;
  	return;
-@@ -403,7 +404,7 @@ CHEWING_API void chewing_set_ChiEngMode(
+@@ -403,7 +410,7 @@ CHEWING_API void chewing_set_ChiEngMode(
  	ctx->data->bChiSym = ( mode == CHINESE_MODE ? 1 : 0 );
  }
  
@@ -70,7 +83,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  {
  	return ctx->data->bChiSym;
  }
-@@ -413,7 +414,7 @@ CHEWING_API void chewing_set_ShapeMode( 
+@@ -413,7 +420,7 @@ CHEWING_API void chewing_set_ShapeMode( 
  	ctx->data->bFullShape = (mode == FULLSHAPE_MODE ? 1 : 0);
  }
  
@@ -79,7 +92,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  {
  	return ctx->data->bFullShape;
  }
-@@ -435,7 +436,7 @@ static int DoSelect( ChewingData *pgdata
+@@ -435,7 +442,7 @@ static int DoSelect( ChewingData *pgdata
  			if ( pgdata->choiceInfo.isSymbol ) {
  				SymbolChoice( pgdata, num );
  			}
@@ -88,16 +101,35 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				/* change the select interval & selectStr & nSelect */
  				AddSelect( pgdata, num );
  				/* second, call choice module */
-@@ -489,7 +490,7 @@ CHEWING_API int chewing_handle_Space( Ch
+@@ -472,13 +479,13 @@ CHEWING_API int chewing_handle_Space( Ch
+ 	CheckAndResetRange( pgdata );
+ 
+ 	if ( pgdata->bSelect ) {
+-		if ( pgdata->choiceInfo.pageNo < ( pgdata->choiceInfo.nPage - 1 ) ) {
++	    if ( pgdata->choiceInfo.pageNo < ( pgdata->choiceInfo.nPage - 1 ) ) {
+ 			return chewing_handle_Right( ctx );
+ 		}
+ 	}
+ 
+ 	if ( ! ChewingIsEntering( pgdata ) ) {
+-		if ( pgdata->bFullShape ) {
++	    if ( pgdata->bFullShape ) {
+ 			rtn = FullShapeSymbolInput( ' ', pgdata );
+ 		}
+ 		else {
+@@ -489,9 +496,9 @@ CHEWING_API int chewing_handle_Space( Ch
  		pgdata->chiSymbolBufLen = 0;
  		pgdata->chiSymbolCursor = 0;
  		keystrokeRtn = KEYSTROKE_COMMIT;
 -	} 
 +	}
  	else if ( pgdata->bChiSym != CHINESE_MODE ) {
- 		/* see if buffer contains nothing */
+-		/* see if buffer contains nothing */
++	    /* see if buffer contains nothing */
  		if ( pgdata->chiSymbolBufLen == 0 ) {
-@@ -507,11 +508,11 @@ CHEWING_API int chewing_handle_Space( Ch
+ 			bQuickCommit = 1;
+ 		}
+@@ -507,11 +514,11 @@ CHEWING_API int chewing_handle_Space( Ch
  		if ( rtn == SYMBOL_KEY_ERROR ) {
  			keystrokeRtn = KEYSTROKE_IGNORE;
  			/*
@@ -111,7 +143,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		else {
  			keystrokeRtn = KEYSTROKE_ABSORB;
  		}
-@@ -524,9 +525,9 @@ CHEWING_API int chewing_handle_Space( Ch
+@@ -524,9 +531,9 @@ CHEWING_API int chewing_handle_Space( Ch
  		/* Quick commit */
  		else {
  			DEBUG_OUT(
@@ -123,7 +155,46 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgo->nCommitStr = 1;
  			pgdata->chiSymbolBufLen = 0;
  			pgdata->chiSymbolCursor = 0;
-@@ -643,7 +644,7 @@ CHEWING_API int chewing_handle_Enter( Ch
+@@ -534,10 +541,11 @@ CHEWING_API int chewing_handle_Space( Ch
+ 		}
+ 	}
+ 	else {
++
+ 		rtn = ZuinPhoInput( &( pgdata->zuinData ), ' ' );
+ 		switch ( rtn ) {
+ 			case ZUIN_ABSORB:
+-				keystrokeRtn = KEYSTROKE_ABSORB;
++			    keystrokeRtn = KEYSTROKE_ABSORB;
+ 				break;
+ 			case ZUIN_COMMIT:
+ 				AddChi( pgdata->zuinData.phone, pgdata );
+@@ -557,10 +565,21 @@ CHEWING_API int chewing_handle_Space( Ch
+ 					toSelect = 1;
+ 
+ 				if ( toSelect ) {
+-					if ( ! pgdata->bSelect )
+-						ChoiceFirstAvail( pgdata );
+-					else
+-						ChoiceNextAvail( pgdata );
++				    if( ! pgdata->bSelect ) {
++					cursor_orig=pgdata->chiSymbolCursor;
++					ChoiceFirstAvail( pgdata );
++				    }
++				    else {
++					if ( pgdata->config.bPhraseChoiceRearward ){
++					    int avail_willbe=(pgdata->availInfo.currentAvail>0)?
++						pgdata->availInfo.currentAvail-1: pgdata->availInfo.nAvail - 1;
++					    pgdata->chiSymbolCursor=cursor_orig - pgdata->availInfo.avail[avail_willbe].len;
++					    if (chewing_buffer_Len(ctx)>cursor_orig){
++						pgdata->chiSymbolCursor++;
++					    }
++					}
++					ChoiceNextAvail( pgdata );
++				    }
+ 				}
+ 				else if ( pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
+ 					/* Open Symbol Choice List */
+@@ -643,7 +662,7 @@ CHEWING_API int chewing_handle_Enter( Ch
  		keystrokeRtn = KEYSTROKE_COMMIT;
  		WriteChiSymbolToBuf( pgo->commitStr, nCommitStr, pgdata );
  		AutoLearnPhrase( pgdata );
@@ -132,7 +203,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		pgo->nCommitStr = nCommitStr;
  	}
  
-@@ -664,12 +665,12 @@ CHEWING_API int chewing_handle_Del( Chew
+@@ -664,12 +683,12 @@ CHEWING_API int chewing_handle_Del( Chew
  	}
  
  	if ( ! pgdata->bSelect ) {
@@ -149,7 +220,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				NONDECREASE_CURSOR );
  		}
  		CallPhrasing( pgdata );
-@@ -696,7 +697,7 @@ CHEWING_API int chewing_handle_Backspace
+@@ -696,7 +715,7 @@ CHEWING_API int chewing_handle_Backspace
  		}
  		else if ( pgdata->chiSymbolCursor > 0 ) {
  			ChewingKillChar(
@@ -158,7 +229,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				pgdata->chiSymbolCursor - 1,
  				DECREASE_CURSOR );
  		}
-@@ -735,11 +736,12 @@ CHEWING_API int chewing_handle_Up( Chewi
+@@ -735,7 +754,7 @@ CHEWING_API int chewing_handle_Up( Chewi
  
  CHEWING_API int chewing_handle_Down( ChewingContext *ctx )
  {
@@ -167,12 +238,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	ChewingOutput *pgo = ctx->output;
  	int toSelect = 0;
  	int keystrokeRtn = KEYSTROKE_ABSORB;
- 	int key_buf_cursor;
-+	static int cursor_orig=-1;
- 
- 	CheckAndResetRange( pgdata );
- 
-@@ -756,13 +758,22 @@ CHEWING_API int chewing_handle_Down( Che
+@@ -756,13 +775,22 @@ CHEWING_API int chewing_handle_Down( Che
  			toSelect = 1;
  
  	if ( toSelect ) {
@@ -197,7 +263,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	else if ( pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
  		/* Open Symbol Choice List */
  		if ( ! pgdata->choiceInfo.isSymbol )
-@@ -782,11 +793,11 @@ CHEWING_API int chewing_handle_ShiftLeft
+@@ -782,11 +810,11 @@ CHEWING_API int chewing_handle_ShiftLeft
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
@@ -212,7 +278,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->chiSymbolCursor > 0 &&
  			pgdata->PointEnd > -9 ) {
  			if ( pgdata->PointStart == -1 )
-@@ -797,7 +808,7 @@ CHEWING_API int chewing_handle_ShiftLeft
+@@ -797,7 +825,7 @@ CHEWING_API int chewing_handle_ShiftLeft
  				pgdata->PointEnd--;
  			}
  			if ( pgdata->PointEnd == 0 )
@@ -221,7 +287,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		}
  	}
  
-@@ -822,8 +833,8 @@ CHEWING_API int chewing_handle_Left( Che
+@@ -822,8 +850,8 @@ CHEWING_API int chewing_handle_Left( Che
  			pgdata->choiceInfo.pageNo = pgdata->choiceInfo.nPage - 1;
  	}
  	else {
@@ -232,7 +298,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->chiSymbolCursor > 0 ) {
  			CheckAndResetRange( pgdata );
  			pgdata->chiSymbolCursor--;
-@@ -842,13 +853,13 @@ CHEWING_API int chewing_handle_ShiftRigh
+@@ -842,13 +870,13 @@ CHEWING_API int chewing_handle_ShiftRigh
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
@@ -250,7 +316,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgdata->PointEnd < 9 ) {
  			if ( pgdata->PointStart == -1 )
  				pgdata->PointStart = pgdata->chiSymbolCursor;
-@@ -858,7 +869,7 @@ CHEWING_API int chewing_handle_ShiftRigh
+@@ -858,7 +886,7 @@ CHEWING_API int chewing_handle_ShiftRigh
  			}
  			pgdata->chiSymbolCursor++;
  			if ( pgdata->PointEnd == 0 )
@@ -259,7 +325,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		}
  	}
  
-@@ -883,9 +894,9 @@ CHEWING_API int chewing_handle_Right( Ch
+@@ -883,9 +911,9 @@ CHEWING_API int chewing_handle_Right( Ch
  			pgdata->choiceInfo.pageNo = 0;
  	}
  	else {
@@ -272,7 +338,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			CheckAndResetRange( pgdata );
  			pgdata->chiSymbolCursor++;
  		}
-@@ -974,11 +985,11 @@ CHEWING_API int chewing_handle_Home( Che
+@@ -974,11 +1002,11 @@ CHEWING_API int chewing_handle_Home( Che
  
  	CheckAndResetRange( pgdata );
  
@@ -287,7 +353,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	}
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
-@@ -993,12 +1004,12 @@ CHEWING_API int chewing_handle_End( Chew
+@@ -993,12 +1021,12 @@ CHEWING_API int chewing_handle_End( Chew
  	CheckAndResetRange( pgdata );
  
  	if ( ! ChewingIsEntering( pgdata ) ) {
@@ -305,7 +371,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	return 0;
  }
  
-@@ -1013,9 +1024,9 @@ CHEWING_API int chewing_handle_PageUp( C
+@@ -1013,9 +1041,9 @@ CHEWING_API int chewing_handle_PageUp( C
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
  	}
@@ -317,7 +383,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
  }
-@@ -1031,9 +1042,9 @@ CHEWING_API int chewing_handle_PageDown(
+@@ -1031,9 +1059,9 @@ CHEWING_API int chewing_handle_PageDown(
  	if ( ! ChewingIsEntering( pgdata ) ) {
  		keystrokeRtn = KEYSTROKE_IGNORE;
  	}
@@ -329,7 +395,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
  	return 0;
  }
-@@ -1107,7 +1118,7 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1107,7 +1135,7 @@ CHEWING_API int chewing_handle_Default( 
  			DoSelect( pgdata, num );
  			goto End_keyproc;
  		}
@@ -338,7 +404,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		/* Otherwise, use 'j' and 'k' for paging in selection mode */
  		DEBUG_OUT(
  			"\t\tchecking paging key, got '%c'\n",
-@@ -1163,10 +1174,10 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1163,10 +1191,10 @@ CHEWING_API int chewing_handle_Default( 
  			rtn = ZuinPhoInput( &( pgdata->zuinData ), key );
  			DEBUG_OUT(
  				"\t\tChinese mode key, "
@@ -351,7 +417,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			if ( rtn == ZUIN_KEY_ERROR )
  				rtn = SpecialSymbolInput( key, pgdata );
  			switch ( rtn ) {
-@@ -1182,14 +1193,14 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1182,14 +1210,14 @@ CHEWING_API int chewing_handle_Default( 
  				case ZUIN_KEY_ERROR:
  				case ZUIN_IGNORE:
  					DEBUG_OUT(
@@ -369,7 +435,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  						key );
  
  					/* see if buffer contains nothing */
-@@ -1207,7 +1218,7 @@ CHEWING_API int chewing_handle_Default( 
+@@ -1207,7 +1235,7 @@ CHEWING_API int chewing_handle_Default( 
  					if ( rtn == SYMBOL_KEY_ERROR ) {
  						keystrokeRtn = KEYSTROKE_IGNORE;
  						/*
@@ -378,7 +444,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  						 * then it's wrong to commit it.
  						 */
  						bQuickCommit = 0;
-@@ -1248,9 +1259,9 @@ End_keyproc:
+@@ -1248,9 +1276,9 @@ End_keyproc:
  	/* Quick commit */
  	else {
  		DEBUG_OUT(
@@ -390,7 +456,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		pgo->nCommitStr = 1;
  		pgdata->chiSymbolBufLen = 0;
  		pgdata->chiSymbolCursor = 0;
-@@ -1309,12 +1320,12 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1309,12 +1337,12 @@ CHEWING_API int chewing_handle_CtrlNum( 
  
  	cursor = PhoneSeqCursor( pgdata );
  	if ( ! pgdata->config.bAddPhraseForward ) {
@@ -408,7 +474,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  				cursor + newPhraseLen - 1 ) ) {
  				/* Manually add phrase to the user phrase database. */
  				memcpy( addPhoneSeq,
-@@ -1328,10 +1339,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1328,10 +1356,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
  
  
  				phraseState = UserUpdatePhrase( addPhoneSeq, addWordSeq );
@@ -423,7 +489,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  					phraseState );
  
  				/* Clear the breakpoint between the New Phrase */
-@@ -1341,11 +1352,11 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1341,11 +1369,11 @@ CHEWING_API int chewing_handle_CtrlNum( 
  		}
  	}
  	else {
@@ -439,7 +505,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			                      cursor - newPhraseLen ) ) {
  				/* Manually add phrase to the user phrase database. */
  				memcpy( addPhoneSeq,
-@@ -1358,10 +1369,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
+@@ -1358,10 +1386,10 @@ CHEWING_API int chewing_handle_CtrlNum( 
  				           newPhraseLen, 1);
  
  				phraseState = UserUpdatePhrase( addPhoneSeq, addWordSeq );
@@ -454,7 +520,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  					phraseState );
  
  				/* Clear the breakpoint between the New Phrase */
-@@ -1414,10 +1425,10 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1414,10 +1442,10 @@ CHEWING_API int chewing_handle_Numlock( 
  	ChewingOutput *pgo = ctx->output;
  	int rtn, QuickCommit = 0;
  	int keystrokeRtn = KEYSTROKE_ABSORB;
@@ -467,7 +533,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		 */
  		if ( pgdata->chiSymbolBufLen == 0 ) {
  			QuickCommit = 1;
-@@ -1428,7 +1439,7 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1428,7 +1456,7 @@ CHEWING_API int chewing_handle_Numlock( 
  			keystrokeRtn = KEYSTROKE_IGNORE ;
  		}
  		else if ( QuickCommit ) {
@@ -476,7 +542,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  			pgo->nCommitStr = 1;
  			pgdata->chiSymbolBufLen = 0;
  			pgdata->chiSymbolCursor = 0;
-@@ -1443,7 +1454,7 @@ CHEWING_API int chewing_handle_Numlock( 
+@@ -1443,7 +1471,7 @@ CHEWING_API int chewing_handle_Numlock( 
  	else {
  		/* Otherwise, if we are selecting words, we use numeric keys
  		 * as selkey
@@ -487,7 +553,7 @@ diff -up ./src/chewingio.c.phraseChoiceR
  		if ( key > '0' && key < '9' )
 diff -up ./src/choice.c.phraseChoiceRearward ./src/choice.c
 --- ./src/choice.c.phraseChoiceRearward	2008-12-02 00:29:20.000000000 +1000
-+++ ./src/choice.c	2009-07-31 17:16:57.000000000 +1000
++++ ./src/choice.c	2009-08-03 14:35:28.000000000 +1000
 @@ -71,22 +71,44 @@ static void ChangeSelectIntervalAndBreak
  }
  


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libchewing.spec	31 Jul 2009 07:35:18 -0000	1.34
+++ libchewing.spec	3 Aug 2009 05:06:49 -0000	1.35
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -98,7 +98,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
-* Tue Jul 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-14
+* Mon Aug 03 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-15
+- Fix [Bug 512108:issue 11] ibus-chewing crash the application
+  by move cursor_orig to chewingio.c global.
+
+* Thu Jul 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-14
 - Fix [Bug 512108] ibus-chewing crash the application
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-13



From paragn at fedoraproject.org  Mon Aug  3 05:32:43 2009
From: paragn at fedoraproject.org (paragn)
Date: Mon,  3 Aug 2009 05:32:43 +0000 (UTC)
Subject: rpms/lklug-fonts/devel .cvsignore, 1.2, 1.3 lklug-fonts.spec, 1.7, 
	1.8 sources, 1.2, 1.3
Message-ID: <20090803053243.A62F411C02C6@cvs1.fedora.phx.redhat.com>

Author: paragn

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

Modified Files:
	.cvsignore lklug-fonts.spec sources 
Log Message:
* Mon Aug 03 2009 Parag <pnemade at redhat.com> - 0.6-1.20090803cvs
- update to cvs snapshot 20090803.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lklug-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Oct 2007 11:47:38 -0000	1.2
+++ .cvsignore	3 Aug 2009 05:32:43 -0000	1.3
@@ -1 +1 @@
-lklug-0.2.2.tar.gz
+lklug-20090803.tar.gz


Index: lklug-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lklug-fonts/devel/lklug-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lklug-fonts.spec	25 Jul 2009 11:10:50 -0000	1.7
+++ lklug-fonts.spec	3 Aug 2009 05:32:43 -0000	1.8
@@ -1,21 +1,28 @@
 %define fontname lklug
+%define cvsdate 20090803
 
 Name:           %{fontname}-fonts
 # Do not trust font metadata versionning unless you've checked upstream does
 # update versions on file changes. When in doubt use the timestamp of the most
 # recent file as version.
-Version:        0.2.2
-Release:        10%{?dist}
+Version:        0.6
+Release:        1.%{cvsdate}cvs%{?dist}
 Summary:        Fonts for Sinhala language
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            http://sinhala.sourceforge.net/
-Source:         lklug-%{version}.tar.gz
+# cvs snapshot created with following steps
+#cvs -z3 -d:pserver:anonymous at sinhala.cvs.sourceforge.net:/cvsroot/sinhala co -P sinhala/fonts
+#cd sinhala/fonts/
+#tar -czf lklug-%{cvsdate}.tar.gz convert.ff COPYING  CREDITS lklug.sfd Makefile README.fonts
+
+
+Source:         lklug-%{cvsdate}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-BuildRequires:  fontpackages-devel
+BuildRequires:  fontpackages-devel fontforge
 Requires:       fontpackages-filesystem
 
 %description
@@ -25,28 +32,29 @@ Haralambous and are in GPL. OTF tables a
 Ratnaweera and Harshani Devadithya.
 
 %prep
-%setup -q -n %{fontname}-%{version}
-
+%setup -q -c
 
 %build
-
+make
 
 %install
 rm -fr %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
-echo %{fontdir}
 
 %clean
 rm -fr %{buildroot}
 
 %_font_pkg *.ttf
-%doc license.txt COPYING
+%doc CREDITS COPYING README.fonts 
 %dir %{_fontdir}
 
 
 %changelog
+* Mon Aug 03 2009 Parag <pnemade at redhat.com> - 0.6-1.20090803cvs
+- update to cvs snapshot 20090803.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lklug-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Oct 2007 11:47:38 -0000	1.2
+++ sources	3 Aug 2009 05:32:43 -0000	1.3
@@ -1 +1 @@
-e49de1140705e0ee97d851165516192c  lklug-0.2.2.tar.gz
+b6e0daaf8cf41208fd2a7bc04fb23f84  lklug-20090803.tar.gz



From airlied at fedoraproject.org  Mon Aug  3 06:03:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  3 Aug 2009 06:03:09 +0000 (UTC)
Subject: rpms/kernel/devel drm-vga-arb.patch, 1.3, 1.4 kernel.spec, 1.1681, 
	1.1682 linux-2.6-vga-arb.patch, 1.4, 1.5
Message-ID: <20090803060310.0983511C02C6@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	drm-vga-arb.patch kernel.spec linux-2.6-vga-arb.patch 
Log Message:
* Mon Aug 03 2009 Dave Airlie <airlied at redhat.com>
- update VGA arb patches


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   |   23 +++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |    9 +++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   20 +++++++++++++++++++-
 include/drm/drmP.h                     |    4 +++-
 11 files changed, 120 insertions(+), 2 deletions(-)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drm-vga-arb.patch	29 Jul 2009 00:34:59 -0000	1.3
+++ drm-vga-arb.patch	3 Aug 2009 06:03:07 -0000	1.4
@@ -1,4 +1,4 @@
-From 7f8919f77fb703526f87b56d11e76cd46cc6da3f Mon Sep 17 00:00:00 2001
+From 189bef6a28e58cb31e5e3ebb88869cd0f0dcc7be Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Thu, 16 Jul 2009 14:33:58 +1000
 Subject: [PATCH] drm: add support to drm for VGA arbitration.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1681
retrieving revision 1.1682
diff -u -p -r1.1681 -r1.1682
--- kernel.spec	1 Aug 2009 13:31:25 -0000	1.1681
+++ kernel.spec	3 Aug 2009 06:03:08 -0000	1.1682
@@ -1940,6 +1940,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Dave Airlie <airlied at redhat.com>
+- update VGA arb patches
+
 * Sat Aug 01 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.118.rc5
 - Fix boot failures on ppc32 (#514010, #505071)
 

linux-2.6-vga-arb.patch:
 drivers/gpu/Makefile     |    2 
 drivers/gpu/vga/Kconfig  |   10 
 drivers/gpu/vga/Makefile |    1 
 drivers/gpu/vga/vgaarb.c | 1159 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 +
 drivers/video/Kconfig    |    2 
 include/linux/pci.h      |    2 
 include/linux/vgaarb.h   |  196 +++++++
 8 files changed, 1414 insertions(+), 2 deletions(-)

Index: linux-2.6-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vga-arb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-vga-arb.patch	29 Jul 2009 21:10:48 -0000	1.4
+++ linux-2.6-vga-arb.patch	3 Aug 2009 06:03:08 -0000	1.5
@@ -1,4 +1,4 @@
-From 61fc475f99444cf1ae1f417b55680f16ab510a00 Mon Sep 17 00:00:00 2001
+From 28a788c99a243050ab55e819e8e81c4ba019bb35 Mon Sep 17 00:00:00 2001
 From: Tiago Vignatti <tiago.vignatti at nokia.com>
 Date: Tue, 14 Jul 2009 15:57:29 +0300
 Subject: [PATCH] vga: implements VGA arbitration on Linux
@@ -11,18 +11,21 @@ on hw until first used. This worksaround
 X.org problem with older X servers which fail
 at detecting boot device if doesn't have the VGA
 bit enabled. Newer pciacccess + X server fix this.
+add default processing
+use hex for the target API to match the output API
+balance pci get/put
 
 Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
 ---
  drivers/gpu/Makefile     |    2 +-
  drivers/gpu/vga/Kconfig  |   10 +
  drivers/gpu/vga/Makefile |    1 +
- drivers/gpu/vga/vgaarb.c | 1150 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/gpu/vga/vgaarb.c | 1159 ++++++++++++++++++++++++++++++++++++++++++++++
  drivers/pci/pci.c        |   44 ++
  drivers/video/Kconfig    |    2 +
  include/linux/pci.h      |    2 +
  include/linux/vgaarb.h   |  195 ++++++++
- 8 files changed, 1405 insertions(+), 1 deletions(-)
+ 8 files changed, 1414 insertions(+), 1 deletions(-)
  create mode 100644 drivers/gpu/vga/Kconfig
  create mode 100644 drivers/gpu/vga/Makefile
  create mode 100644 drivers/gpu/vga/vgaarb.c
@@ -60,10 +63,10 @@ index 0000000..7cc8c1e
 +obj-$(CONFIG_VGA_ARB)  += vgaarb.o
 diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
 new file mode 100644
-index 0000000..3925e6c
+index 0000000..7383d00
 --- /dev/null
 +++ b/drivers/gpu/vga/vgaarb.c
-@@ -0,0 +1,1150 @@
+@@ -0,0 +1,1159 @@
 +/*
 + * vgaarb.c
 + *
@@ -195,9 +198,9 @@ index 0000000..3925e6c
 +   confused about the boot device not being VGA */
 +static void vga_check_first_use(void)
 +{
-+        /* we should inform all GPUs in the system that
-+         * VGA arb has occured and to try and disable resources
-+         * if they can */
++	/* we should inform all GPUs in the system that
++	 * VGA arb has occured and to try and disable resources
++	 * if they can */
 +	if (!vga_arbiter_used) {
 +		vga_arbiter_used = true;
 +		vga_arbiter_notify_clients();
@@ -289,7 +292,7 @@ index 0000000..3925e6c
 +			pci_bits |= PCI_COMMAND_MEMORY;
 +		if (lwants & (VGA_RSRC_LEGACY_IO|VGA_RSRC_NORMAL_IO))
 +			pci_bits |= PCI_COMMAND_IO;
-+		    
++
 +		pci_set_vga_state(conflict->pdev, false, pci_bits,
 +				  change_bridge);
 +		conflict->owns &= ~lwants;
@@ -507,7 +510,7 @@ index 0000000..3925e6c
 +
 +	/* By default, assume we decode everything */
 +	vgadev->decodes = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
-+		          VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
++			  VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
 +
 +	/* Mark that we "own" resources based on our enables, we will
 +	 * clear that below if the bridge isn't forwarding
@@ -551,7 +554,7 @@ index 0000000..3925e6c
 +		vga_iostate_to_str(vgadev->decodes),
 +		vga_iostate_to_str(vgadev->owns),
 +		vga_iostate_to_str(vgadev->locks));
-+	
++
 +	spin_unlock_irqrestore(&vga_lock, flags);
 +	return;
 +fail:
@@ -743,7 +746,8 @@ index 0000000..3925e6c
 +	int n;
 +	unsigned int slot, func;
 +
-+	n = sscanf(buf, "PCI:%d:%d:%d.%d", domain, bus, &slot, &func);
++
++	n = sscanf(buf, "PCI:%x:%x:%x.%x", domain, bus, &slot, &func);
 +	if (n != 4)
 +		return 0;
 +
@@ -795,7 +799,7 @@ index 0000000..3925e6c
 +
 +	/* Fill the buffer with infos */
 +	len = snprintf(lbuf, 1024,
-+		       "count:%d PCI:%s,decodes=%s,owns=%s,locks=%s (%d,%d)\n",
++		       "count:%d,PCI:%s,decodes=%s,owns=%s,locks=%s (%d,%d)\n",
 +		       vga_count, pci_name(pdev),
 +		       vga_iostate_to_str(vgadev->decodes),
 +		       vga_iostate_to_str(vgadev->owns),
@@ -906,7 +910,7 @@ index 0000000..3925e6c
 +
 +		pdev = priv->target;
 +		if (priv->target == NULL) {
-+				ret_val = -ENODEV;
++			ret_val = -ENODEV;
 +			goto done;
 +		}
 +		for (i = 0; i < MAX_USER_CARDS; i++) {
@@ -980,22 +984,28 @@ index 0000000..3925e6c
 +		curr_pos += 7;
 +		remaining -= 7;
 +		pr_devel("client 0x%X called 'target'\n", (int)priv);
-+		if (!vga_pci_str_to_vars(curr_pos, remaining,
-+					 &domain, &bus, &devfn)) {
-+			ret_val = -EPROTO;
-+			goto done;
-+		}
++		/* if target is default */
++		if (!strncmp(buf, "default", 7))
++			pdev = pci_dev_get(vga_default_device());
++		else {
++			if (!vga_pci_str_to_vars(curr_pos, remaining,
++						 &domain, &bus, &devfn)) {
++				ret_val = -EPROTO;
++				goto done;
++			}
 +
-+		pdev = pci_get_bus_and_slot(bus, devfn);
-+		if (!pdev) {
-+			pr_info("vgaarb: invalid PCI address!\n");
-+			ret_val = -ENODEV;
-+			goto done;
++			pdev = pci_get_bus_and_slot(bus, devfn);
++			if (!pdev) {
++				pr_info("vgaarb: invalid PCI address!\n");
++				ret_val = -ENODEV;
++				goto done;
++			}
 +		}
 +
 +		vgadev = vgadev_find(pdev);
 +		if (vgadev == NULL) {
 +			pr_info("vgaarb: this pci device is not a vga device\n");
++			pci_dev_put(pdev);
 +			ret_val = -ENODEV;
 +			goto done;
 +		}
@@ -1013,12 +1023,14 @@ index 0000000..3925e6c
 +		}
 +		if (i == MAX_USER_CARDS) {
 +			pr_err("vgaarb: maximum user cards number reached!\n");
++			pci_dev_put(pdev);
 +			/* XXX: which value to return? */
 +			ret_val =  -ENOMEM;
 +			goto done;
 +		}
 +
 +		ret_val = count;
++		pci_dev_put(pdev);
 +		goto done;
 +
 +



From airlied at fedoraproject.org  Mon Aug  3 06:05:24 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  3 Aug 2009 06:05:24 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-vga-arbiter.patch,1.3,1.4
Message-ID: <20090803060524.BF7BC11C02C6@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	libpciaccess-vga-arbiter.patch 
Log Message:
* Mon Aug 03 2009 Dave Airlie <airlied at redhat.com> 0.10.6-4
- Add support for default vga arb device selection
- Update libpciaccess VGA arb code for newer kernel API


libpciaccess-vga-arbiter.patch:
 include/pciaccess.h      |   56 ++++++++
 src/Makefile.am          |    7 +
 src/common_interface.c   |   15 ++
 src/common_vgaarb.c      |  323 +++++++++++++++++++++++++++++++++++++++++++++++
 src/common_vgaarb_stub.c |   73 ++++++++++
 src/linux_sysfs.c        |   21 +++
 src/pciaccess_private.h  |    5 
 7 files changed, 500 insertions(+)

Index: libpciaccess-vga-arbiter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-vga-arbiter.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libpciaccess-vga-arbiter.patch	3 Aug 2009 00:00:31 -0000	1.3
+++ libpciaccess-vga-arbiter.patch	3 Aug 2009 06:05:24 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up libpciaccess-0.10.6/src/common_interface.c.da libpciaccess-0.10.6/src/common_interface.c
---- libpciaccess-0.10.6/src/common_interface.c.da	2009-08-03 09:57:13.000000000 +1000
-+++ libpciaccess-0.10.6/src/common_interface.c	2009-08-03 09:57:21.000000000 +1000
+--- libpciaccess-0.10.6/src/common_interface.c.da	2009-08-03 15:54:43.000000000 +1000
++++ libpciaccess-0.10.6/src/common_interface.c	2009-08-03 15:54:54.000000000 +1000
 @@ -124,6 +124,21 @@ pci_device_is_boot_vga( struct pci_devic
  }
  
@@ -24,8 +24,8 @@ diff -up libpciaccess-0.10.6/src/common_
   * 
   * Probes a PCI device to learn various information about the device.  Before
 diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb_stub.c
---- /dev/null	2009-08-03 09:43:13.273251881 +1000
-+++ libpciaccess-0.10.6/src/common_vgaarb_stub.c	2009-08-03 09:57:21.000000000 +1000
+--- /dev/null	2009-08-03 15:36:43.267252950 +1000
++++ libpciaccess-0.10.6/src/common_vgaarb_stub.c	2009-08-03 15:54:54.000000000 +1000
 @@ -0,0 +1,73 @@
 +/*
 + * Copyright (c) 2009 Tiago Vignatti
@@ -101,8 +101,8 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +    return 0;
 +}
 diff -up libpciaccess-0.10.6/src/linux_sysfs.c.da libpciaccess-0.10.6/src/linux_sysfs.c
---- libpciaccess-0.10.6/src/linux_sysfs.c.da	2009-08-03 09:57:13.000000000 +1000
-+++ libpciaccess-0.10.6/src/linux_sysfs.c	2009-08-03 09:57:21.000000000 +1000
+--- libpciaccess-0.10.6/src/linux_sysfs.c.da	2009-08-03 15:54:43.000000000 +1000
++++ libpciaccess-0.10.6/src/linux_sysfs.c	2009-08-03 15:54:54.000000000 +1000
 @@ -78,6 +78,7 @@ static int pci_device_linux_sysfs_write(
      pciaddr_t * bytes_written );
  
@@ -143,9 +143,9 @@ diff -up libpciaccess-0.10.6/src/linux_s
 +    return 1;
 +}
 diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb.c
---- /dev/null	2009-08-03 09:43:13.273251881 +1000
-+++ libpciaccess-0.10.6/src/common_vgaarb.c	2009-08-03 09:57:21.000000000 +1000
-@@ -0,0 +1,314 @@
+--- /dev/null	2009-08-03 15:36:43.267252950 +1000
++++ libpciaccess-0.10.6/src/common_vgaarb.c	2009-08-03 15:54:54.000000000 +1000
+@@ -0,0 +1,323 @@
 +/*
 + * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
 + *               2009 Tiago Vignatti
@@ -460,9 +460,18 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +
 +    return vgaarb_write(pci_sys->vgaarb_fd, buf, len);
 +}
++
++int pci_device_vgaarb_get_info(struct pci_device *dev, int *vga_count, int *rsrc_decodes)
++{
++    *vga_count = pci_sys->vga_count;
++    if (!dev)
++	return 0;
++    *rsrc_decodes = dev->vgaarb_rsrc;
++    return 0;
++}
 diff -up libpciaccess-0.10.6/src/Makefile.am.da libpciaccess-0.10.6/src/Makefile.am
 --- libpciaccess-0.10.6/src/Makefile.am.da	2009-04-18 15:01:36.000000000 +1000
-+++ libpciaccess-0.10.6/src/Makefile.am	2009-08-03 09:57:21.000000000 +1000
++++ libpciaccess-0.10.6/src/Makefile.am	2009-08-03 15:54:54.000000000 +1000
 @@ -45,6 +45,12 @@ if SOLARIS
  OS_SUPPORT = solx_devfs.c pci_tools.h
  endif
@@ -485,8 +494,8 @@ diff -up libpciaccess-0.10.6/src/Makefil
  
  INCLUDES = -I$(top_srcdir)/include
 diff -up libpciaccess-0.10.6/src/pciaccess_private.h.da libpciaccess-0.10.6/src/pciaccess_private.h
---- libpciaccess-0.10.6/src/pciaccess_private.h.da	2009-08-03 09:57:13.000000000 +1000
-+++ libpciaccess-0.10.6/src/pciaccess_private.h	2009-08-03 09:57:21.000000000 +1000
+--- libpciaccess-0.10.6/src/pciaccess_private.h.da	2009-08-03 15:54:43.000000000 +1000
++++ libpciaccess-0.10.6/src/pciaccess_private.h	2009-08-03 15:54:54.000000000 +1000
 @@ -61,6 +61,7 @@ struct pci_system_methods {
      int (*fill_capabilities)( struct pci_device * dev );
      void (*enable)( struct pci_device *dev );
@@ -507,8 +516,8 @@ diff -up libpciaccess-0.10.6/src/pciacce
  
  extern struct pci_system * pci_sys;
 diff -up libpciaccess-0.10.6/include/pciaccess.h.da libpciaccess-0.10.6/include/pciaccess.h
---- libpciaccess-0.10.6/include/pciaccess.h.da	2009-08-03 09:57:13.000000000 +1000
-+++ libpciaccess-0.10.6/include/pciaccess.h	2009-08-03 09:57:21.000000000 +1000
+--- libpciaccess-0.10.6/include/pciaccess.h.da	2009-08-03 15:54:43.000000000 +1000
++++ libpciaccess-0.10.6/include/pciaccess.h	2009-08-03 15:54:54.000000000 +1000
 @@ -21,6 +21,31 @@
   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   * DEALINGS IN THE SOFTWARE.
@@ -562,7 +571,7 @@ diff -up libpciaccess-0.10.6/include/pci
  };
  
  
-@@ -449,4 +481,26 @@ struct pci_pcmcia_bridge_info {
+@@ -449,4 +481,28 @@ struct pci_pcmcia_bridge_info {
  
  };
  
@@ -587,5 +596,7 @@ diff -up libpciaccess-0.10.6/include/pci
 +int  pci_device_vgaarb_lock         (void);
 +int  pci_device_vgaarb_trylock      (void);
 +int  pci_device_vgaarb_unlock       (void);
++/* return the current device count + resource decodes for the device */
++int pci_device_vgaarb_get_info	    (struct pci_device *dev, int *vga_count, int *rsrc_decodes);
 +
  #endif /* PCIACCESS_H */



From whot at fedoraproject.org  Mon Aug  3 06:10:20 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  3 Aug 2009 06:10:20 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xorg-x11-apps.spec, 1.39, 1.40
Message-ID: <20090803061020.134F211C04D1@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-serv11894

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-4
- xinput 1.4.99.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 Jul 2009 20:44:58 -0000	1.15
+++ .cvsignore	3 Aug 2009 06:10:18 -0000	1.16
@@ -15,7 +15,7 @@ xwd-1.0.1.tar.bz2
 xwud-1.0.1.tar.bz2
 xconsole-1.0.3.tar.bz2
 xmessage-1.0.2.tar.bz2
-xinput-1.4.99.1.tar.bz2
+xinput-1.4.99.2.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.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	2 Jul 2009 20:44:58 -0000	1.15
+++ sources	3 Aug 2009 06:10:19 -0000	1.16
@@ -15,7 +15,7 @@ b41ed6b4bcfc9897366c27a94d2bf150  xload-
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
-4b255aafae9ddd59e10292f8bac5504e  xinput-1.4.99.1.tar.bz2
+66cb86beeb27c53f7de1bb39b918ec2f  xinput-1.4.99.2.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.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- xorg-x11-apps.spec	27 Jul 2009 08:21:41 -0000	1.39
+++ xorg-x11-apps.spec	3 Aug 2009 06:10:19 -0000	1.40
@@ -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: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -31,7 +31,7 @@ Source13: ftp://ftp.x.org/pub/individual
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.1.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.2.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
@@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-4
+- xinput 1.4.99.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Aug  3 06:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:10:46 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803061046.39CDF10F890@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Awaiting Review for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 06:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:10:48 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803061048.B964310F8A2@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 06:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:13:05 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803061305.E18E910F886@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Awaiting Review for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 06:13:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:13:08 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803061308.8707410F8A1@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 06:15:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:15:31 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803061531.BA92410F886@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Mon Aug  3 06:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:15:35 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090803061535.98B9010F8A1@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From rishi at fedoraproject.org  Mon Aug  3 06:17:43 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon,  3 Aug 2009 06:17:43 +0000 (UTC)
Subject: rpms/ldtp/devel .cvsignore, 1.2, 1.3 ldtp.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20090803061743.9690411C02C6@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore ldtp.spec sources 
Log Message:
* Mon Aug 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.6.0-1
- Version bump to 1.6.0. (Red Hat Bugzilla #512423)
  * New APIs for progress bar and layered pane.
  * New APIs for VMware Workstation automation.
  * New API called appundertest.
  * Improved performance, by reducing the number of window information lookup.
  * launchapp should honor delay parameter. (FreeDesktop Bugzilla #19813)
  * rightclick function should work. (GNOME Bugzilla #343890)
  * Expose components hierarchically. (GNOME Bugzilla #547572)
  * mouserightclick should be available for table objects. (GNOME Bugzilla
    #550978)
  * Fixed inability to click the window itself. (GNOME Bugzilla #553747)
  * ldtp.getapplist should not always throw an exception. (GNOME Bugzilla
    #566048)
  * Log all failures and take screenshot on each failure. (GNOME Bugzilla
    #567589).
  * getwindowlist (and others?) should handle UTF-8 well. (GNOME Bugzilla
    #574789)
  * ldtp.captureimage should not ignore coordinate arguments. (GNOME Bugzilla
    #574791)
  * New method called getrole to get the role of a component. (GNOME Bugzilla
    #575120).
- Enabled goptionparse and newroles.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldtp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Dec 2008 18:47:23 -0000	1.2
+++ .cvsignore	3 Aug 2009 06:17:41 -0000	1.3
@@ -1 +1 @@
-ldtp-1.3.0.tar.gz
+ldtp-1.6.0.tar.gz


Index: ldtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldtp/devel/ldtp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ldtp.spec	25 Jul 2009 05:03:13 -0000	1.4
+++ ldtp.spec	3 Aug 2009 06:17:41 -0000	1.5
@@ -2,12 +2,12 @@
 
 Summary:	Desktop testing framework
 Name:		ldtp
-Version:	1.3.0
-Release:	5%{?dist}
+Version:	1.6.0
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		User Interface/X
 URL:		http://ldtp.freedesktop.org/wiki/
-Source0:	http://download.freedesktop.org/ldtp/1.x/1.3.x/%{name}-%{version}.tar.gz
+Source0:	http://download.freedesktop.org/ldtp/1.x/1.6.x/%{name}-%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -32,14 +32,8 @@ record test-cases based on user-selectio
 %prep
 %setup -q
 
-# Suppress rpmlint error.
-sed --in-place --expression '1d' ./python/ldtplib/__init__.py
-sed --in-place --expression '1d' ./python/ldtplib/libldtpcodegen.py
-sed --in-place --expression '1d' ./python/ldtplib/ldtprecorder.py
-sed --in-place --expression '1d' ./python/ldtplib/ldtpcommon.py
-
 %build
-%configure
+%configure --enable-goptionparse --enable-newroles
 make %{?_smp_mflags}
 
 %install
@@ -75,11 +69,35 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/ldtplib/*.py*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.6.0-1
+- Version bump to 1.6.0. (Red Hat Bugzilla #512423)
+  * New APIs for progress bar and layered pane.
+  * New APIs for VMware Workstation automation.
+  * New API called appundertest.
+  * Improved performance, by reducing the number of window information lookup.
+  * launchapp should honor delay parameter. (FreeDesktop Bugzilla #19813)
+  * rightclick function should work. (GNOME Bugzilla #343890)
+  * Expose components hierarchically. (GNOME Bugzilla #547572)
+  * mouserightclick should be available for table objects. (GNOME Bugzilla
+    #550978)
+  * Fixed inability to click the window itself. (GNOME Bugzilla #553747)
+  * ldtp.getapplist should not always throw an exception. (GNOME Bugzilla
+    #566048)
+  * Log all failures and take screenshot on each failure. (GNOME Bugzilla
+    #567589).
+  * getwindowlist (and others?) should handle UTF-8 well. (GNOME Bugzilla
+    #574789)
+  * ldtp.captureimage should not ignore coordinate arguments. (GNOME Bugzilla
+    #574791)
+  * New method called getrole to get the role of a component. (GNOME Bugzilla
+    #575120).
+- Enabled goptionparse and newroles.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-5
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Feb 25 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Dec 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.3.0-3
 - Replaced 'Requires: python-statgrab' with 'Requires: pystatgrab'.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldtp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Dec 2008 18:47:23 -0000	1.2
+++ sources	3 Aug 2009 06:17:41 -0000	1.3
@@ -1 +1 @@
-4bccad65d5e39505a9a86bc1eace2c6d  ldtp-1.3.0.tar.gz
+484cbd0191e2d10bd8ac4c59634af078  ldtp-1.6.0.tar.gz



From rishi at fedoraproject.org  Mon Aug  3 06:21:56 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon,  3 Aug 2009 06:21:56 +0000 (UTC)
Subject: rpms/ldtp/F-11 .cvsignore, 1.2, 1.3 ldtp.spec, 1.3, 1.4 sources, 1.2,
	1.3
Message-ID: <20090803062156.821DA11C02C6@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore ldtp.spec sources 
Log Message:
* Mon Aug 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.6.0-1
- Version bump to 1.6.0. (Red Hat Bugzilla #512423)
  * New APIs for progress bar and layered pane.
  * New APIs for VMware Workstation automation.
  * New API called appundertest.
  * Improved performance, by reducing the number of window information lookup.
  * launchapp should honor delay parameter. (FreeDesktop Bugzilla #19813)
  * rightclick function should work. (GNOME Bugzilla #343890)
  * Expose components hierarchically. (GNOME Bugzilla #547572)
  * mouserightclick should be available for table objects. (GNOME Bugzilla
    #550978)
  * Fixed inability to click the window itself. (GNOME Bugzilla #553747)
  * ldtp.getapplist should not always throw an exception. (GNOME Bugzilla
    #566048)
  * Log all failures and take screenshot on each failure. (GNOME Bugzilla
    #567589).
  * getwindowlist (and others?) should handle UTF-8 well. (GNOME Bugzilla
    #574789)
  * ldtp.captureimage should not ignore coordinate arguments. (GNOME Bugzilla
    #574791)
  * New method called getrole to get the role of a component. (GNOME Bugzilla
    #575120).
- Enabled goptionparse and newroles.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldtp/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Dec 2008 18:47:23 -0000	1.2
+++ .cvsignore	3 Aug 2009 06:21:55 -0000	1.3
@@ -1 +1 @@
-ldtp-1.3.0.tar.gz
+ldtp-1.6.0.tar.gz


Index: ldtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldtp/F-11/ldtp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ldtp.spec	25 Feb 2009 12:51:58 -0000	1.3
+++ ldtp.spec	3 Aug 2009 06:21:56 -0000	1.4
@@ -2,12 +2,12 @@
 
 Summary:	Desktop testing framework
 Name:		ldtp
-Version:	1.3.0
-Release:	4%{?dist}
+Version:	1.6.0
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		User Interface/X
 URL:		http://ldtp.freedesktop.org/wiki/
-Source0:	http://download.freedesktop.org/ldtp/1.x/1.3.x/%{name}-%{version}.tar.gz
+Source0:	http://download.freedesktop.org/ldtp/1.x/1.6.x/%{name}-%{version}.tar.gz
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -32,14 +32,8 @@ record test-cases based on user-selectio
 %prep
 %setup -q
 
-# Suppress rpmlint error.
-sed --in-place --expression '1d' ./python/ldtplib/__init__.py
-sed --in-place --expression '1d' ./python/ldtplib/libldtpcodegen.py
-sed --in-place --expression '1d' ./python/ldtplib/ldtprecorder.py
-sed --in-place --expression '1d' ./python/ldtplib/ldtpcommon.py
-
 %build
-%configure
+%configure --enable-goptionparse --enable-newroles
 make %{?_smp_mflags}
 
 %install
@@ -75,8 +69,35 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/ldtplib/*.py*
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Aug 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.6.0-1
+- Version bump to 1.6.0. (Red Hat Bugzilla #512423)
+  * New APIs for progress bar and layered pane.
+  * New APIs for VMware Workstation automation.
+  * New API called appundertest.
+  * Improved performance, by reducing the number of window information lookup.
+  * launchapp should honor delay parameter. (FreeDesktop Bugzilla #19813)
+  * rightclick function should work. (GNOME Bugzilla #343890)
+  * Expose components hierarchically. (GNOME Bugzilla #547572)
+  * mouserightclick should be available for table objects. (GNOME Bugzilla
+    #550978)
+  * Fixed inability to click the window itself. (GNOME Bugzilla #553747)
+  * ldtp.getapplist should not always throw an exception. (GNOME Bugzilla
+    #566048)
+  * Log all failures and take screenshot on each failure. (GNOME Bugzilla
+    #567589).
+  * getwindowlist (and others?) should handle UTF-8 well. (GNOME Bugzilla
+    #574789)
+  * ldtp.captureimage should not ignore coordinate arguments. (GNOME Bugzilla
+    #574791)
+  * New method called getrole to get the role of a component. (GNOME Bugzilla
+    #575120).
+- Enabled goptionparse and newroles.
+
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-5
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Dec 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 1.3.0-3
 - Replaced 'Requires: python-statgrab' with 'Requires: pystatgrab'.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldtp/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Dec 2008 18:47:23 -0000	1.2
+++ sources	3 Aug 2009 06:21:56 -0000	1.3
@@ -1 +1 @@
-4bccad65d5e39505a9a86bc1eace2c6d  ldtp-1.3.0.tar.gz
+484cbd0191e2d10bd8ac4c59634af078  ldtp-1.6.0.tar.gz



From pkgdb at fedoraproject.org  Mon Aug  3 06:29:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:29:41 +0000
Subject: [pkgdb] gnome-applet-cpufire was added for cwickert
Message-ID: <20090803062942.22D5A10F89E@bastion2.fedora.phx.redhat.com>

tibbs has added Package gnome-applet-cpufire with summary GNOME panel applet showing the CPU load as a fire
tibbs has approved Package gnome-applet-cpufire
tibbs has added a Fedora devel branch for gnome-applet-cpufire with an owner of cwickert
tibbs has approved gnome-applet-cpufire in Fedora devel
tibbs has approved Package gnome-applet-cpufire
tibbs has set commit to Approved for 107427 on gnome-applet-cpufire (Fedora devel)
tibbs has set checkout to Approved for 107427 on gnome-applet-cpufire (Fedora devel)
tibbs has set build to Approved for 107427 on gnome-applet-cpufire (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-cpufire



From pkgdb at fedoraproject.org  Mon Aug  3 06:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:29:43 +0000
Subject: [pkgdb] gnome-applet-cpufire summary updated by tibbs
Message-ID: <20090803062943.85B6F10F8AD@bastion2.fedora.phx.redhat.com>

tibbs set package gnome-applet-cpufire summary to GNOME panel applet showing the CPU load as a fire

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-cpufire



From pkgdb at fedoraproject.org  Mon Aug  3 06:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:29:43 +0000
Subject: [pkgdb] gnome-applet-cpufire (Fedora, 11) updated by tibbs
Message-ID: <20090803062943.9307610F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for gnome-applet-cpufire
tibbs has set commit to Approved for 107427 on gnome-applet-cpufire (Fedora 11)
tibbs has set checkout to Approved for 107427 on gnome-applet-cpufire (Fedora 11)
tibbs has set build to Approved for 107427 on gnome-applet-cpufire (Fedora 11)
tibbs approved watchbugzilla on gnome-applet-cpufire (Fedora 11) for edwintb
tibbs approved watchcommits on gnome-applet-cpufire (Fedora 11) for edwintb
tibbs approved commit on gnome-applet-cpufire (Fedora 11) for edwintb
tibbs approved build on gnome-applet-cpufire (Fedora 11) for edwintb
tibbs approved approveacls on gnome-applet-cpufire (Fedora 11) for edwintb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-cpufire



From pkgdb at fedoraproject.org  Mon Aug  3 06:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:29:43 +0000
Subject: [pkgdb] gnome-applet-cpufire (Fedora, 11) updated by tibbs
Message-ID: <20090803062943.9FBE510F8B6@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on gnome-applet-cpufire (Fedora devel) for edwintb
tibbs approved watchcommits on gnome-applet-cpufire (Fedora devel) for edwintb
tibbs approved commit on gnome-applet-cpufire (Fedora devel) for edwintb
tibbs approved build on gnome-applet-cpufire (Fedora devel) for edwintb
tibbs approved approveacls on gnome-applet-cpufire (Fedora devel) for edwintb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-cpufire



From tibbs at fedoraproject.org  Mon Aug  3 06:29:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:29:51 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire - New directory
Message-ID: <20090803062951.33E7B11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-cpufire
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH18891/rpms/gnome-applet-cpufire

Log Message:
Directory /cvs/pkgs/rpms/gnome-applet-cpufire added to the repository




From pkgdb at fedoraproject.org  Mon Aug  3 06:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:29:43 +0000
Subject: [pkgdb] gnome-applet-cpufire (Fedora, 11) updated by tibbs
Message-ID: <20090803062943.AE51010F8BA@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for gnome-applet-cpufire
tibbs has set commit to Approved for 107427 on gnome-applet-cpufire (Fedora 10)
tibbs has set checkout to Approved for 107427 on gnome-applet-cpufire (Fedora 10)
tibbs has set build to Approved for 107427 on gnome-applet-cpufire (Fedora 10)
tibbs approved watchbugzilla on gnome-applet-cpufire (Fedora 10) for edwintb
tibbs approved watchcommits on gnome-applet-cpufire (Fedora 10) for edwintb
tibbs approved commit on gnome-applet-cpufire (Fedora 10) for edwintb
tibbs approved build on gnome-applet-cpufire (Fedora 10) for edwintb
tibbs approved approveacls on gnome-applet-cpufire (Fedora 10) for edwintb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-cpufire



From tibbs at fedoraproject.org  Mon Aug  3 06:29:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:29:51 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire/devel - New directory
Message-ID: <20090803062951.6069A11C0382@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-cpufire/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH18891/rpms/gnome-applet-cpufire/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-applet-cpufire/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 06:29:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:29:57 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire Makefile,NONE,1.1
Message-ID: <20090803062957.A1E6911C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-cpufire
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH18891/rpms/gnome-applet-cpufire

Added Files:
	Makefile 
Log Message:
Setup of module gnome-applet-cpufire


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-applet-cpufire
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug  3 06:29:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:29:57 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090803062957.F162211C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gnome-applet-cpufire/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsH18891/rpms/gnome-applet-cpufire/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-applet-cpufire


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-applet-cpufire
# $Id: Makefile,v 1.1 2009/08/03 06:29:57 tibbs Exp $
NAME := gnome-applet-cpufire
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Aug  3 06:30:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon,  3 Aug 2009 06:30:46 +0000 (UTC)
Subject: rpms/gsynaptics/devel gsynaptics-0.9.16-purge-shm.patch, NONE,
	1.1 gsynaptics.spec, 1.24, 1.25
Message-ID: <20090803063046.BAA8F11C0417@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	gsynaptics.spec 
Added Files:
	gsynaptics-0.9.16-purge-shm.patch 
Log Message:
* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.9.16-3
- gsynaptics-0.9.16-purge-shm.patch: purge SHM, the driver doesn't provide
  it anymore.


gsynaptics-0.9.16-purge-shm.patch:
 gsynaptics.c |  210 -----------------------------------------------------------
 1 file changed, 2 insertions(+), 208 deletions(-)

--- NEW FILE gsynaptics-0.9.16-purge-shm.patch ---
>From ecf7f19f8f7eb59a382b6eed679e8a7e923de2ee Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 3 Aug 2009 16:21:48 +1000
Subject: [PATCH] Purge SHM from gsynaptics.

The driver doesn't provide SHM anymore, we have to go through synclient.
---
 src/gsynaptics.c |  209 +-----------------------------------------------------
 1 files changed, 2 insertions(+), 207 deletions(-)

diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 1e294a2..64e62db 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -185,7 +185,7 @@ g_synaptics_is_available (GSynaptics *synaptics)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
 
-	return (priv->synclient || priv->synshm);
+	return (priv->synclient);
 }
 
 static gboolean
@@ -193,7 +193,7 @@ g_synaptics_is_valid (GSynaptics *synaptics)
 {
 	GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
 
-	return SYNSHM(synaptics) != NULL || priv->synclient; 
+	return priv->synclient;
 }
 
 gboolean
@@ -207,10 +207,6 @@ g_synaptics_is_enabled (GSynaptics *synaptics)
 	{
 		return !g_synaptics_get_value_from_synclient ("TouchpadOff");
 	}
-	else
-	{
-		return !SYNSHM(synaptics)->touchpad_off;
-	}
 }
 
 void
@@ -230,11 +226,6 @@ g_synaptics_is_tapping_enabled (GSynaptics *synaptics)
 		return (g_synaptics_get_value_from_synclient ("MaxTapTime") > 0 &&
 			g_synaptics_get_value_from_synclient ("TapButton1") > 0);
 	}
-	else
-	{
-		return SYNSHM(synaptics)->tap_time > 0 &&
-			SYNSHM(synaptics)->tap_action[F1_TAP] > 0; /* F1_TAP */
-	}
 }
 
 gint
@@ -248,10 +239,6 @@ g_synaptics_tap_time (GSynaptics *synaptics)
 	{
 		return (gint)g_synaptics_get_value_from_synclient ("MaxTapTime");
 	}
-	else
-	{
-		return SYNSHM(synaptics)->tap_time;
-	}
 }
 
 #if 0
@@ -269,7 +256,6 @@ g_synaptics_sensitivity (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		for (i = 0; i < 5; i++)
 		{
@@ -277,14 +263,6 @@ g_synaptics_sensitivity (GSynaptics *synaptics)
 				return i;
 		}
 	}
-	else
-	{
-		for (i = 0; i < 5; i++)
-		{
-			if (SYNSHM(synaptics)->finger_low >= finger_low[i])
-				return i;
-		}
-	}
 
 	return i - 1;
 }
@@ -297,16 +275,10 @@ g_synaptics_is_horizontal_scroll_enabled (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return FALSE;
 
-	if (priv->synclient)
 	{
 		return (g_synaptics_get_value_from_synclient("HorizEdgeScroll") ||
 		        g_synaptics_get_value_from_synclient("HorizTwoFingerScroll"));
 	}
-	else
-	{
-		return SYNSHM(synaptics)->scroll_edge_horiz ||
-                    SYNSHM(synaptics)->scroll_twofinger_horiz;
-	}
 }
 
 gint
@@ -316,14 +288,9 @@ g_synaptics_horizontal_scroll_delta (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint)g_synaptics_get_value_from_synclient ("HorizScrollDelta");
 	}
-	else
-	{
-		return SYNSHM(synaptics)->scroll_dist_horiz;
-	}
 }
 
 ScrollMethod
@@ -335,16 +302,10 @@ g_synaptics_get_scroll_method (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return ScrollingDisabled;
 
-	if (priv->synclient)
 	{
 		edge = g_synaptics_get_value_from_synclient ("VertEdgeScroll");
 		twofinger = g_synaptics_get_value_from_synclient ("VertTwoFingerScroll");
 	}
-	else
-	{
-		edge = SYNSHM(synaptics)->scroll_edge_vert;
-		twofinger = SYNSHM(synaptics)->scroll_twofinger_vert;
-	}
 
         if (edge)
             return EdgeScrolling;
@@ -362,14 +323,9 @@ g_synaptics_vertical_scroll_delta (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint)g_synaptics_get_value_from_synclient ("VertScrollDelta");
 	}
-	else
-	{
-		return SYNSHM(synaptics)->scroll_dist_vert;
-	}
 }
 
 gboolean
@@ -379,14 +335,9 @@ g_synaptics_is_edge_motion_enabled (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return FALSE;
 
-	if (priv->synclient)
 	{
 		return g_synaptics_get_value_from_synclient ("EdgeMotionUseAlways") ? TRUE : FALSE;
 	}
-	else
-	{
-		return SYNSHM(synaptics)->edge_motion_use_always;
-	}
 }
 
 gint
@@ -396,17 +347,12 @@ g_synaptics_accel_factor (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		// Note (by Eugene Sia): returning gdouble instead of gint with value * 1000 
 		// seems to cause a change in value when the value is returned to the calling function.
 		// Possible bug in the gdouble implementation?
 		return (gint) (g_synaptics_get_value_from_synclient ("AccelFactor") * 1000);
 	}
-	else
-	{
-		return (gint) (SYNSHM(synaptics)->accl * 1000);
-	}
 }
 
 gint
@@ -416,14 +362,9 @@ g_synaptics_min_speed (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint) (g_synaptics_get_value_from_synclient ("MinSpeed") * 1000);
 	}
-	else
-	{
-		return (gint) (SYNSHM(synaptics)->min_speed * 1000);
-	}
 }
 
 gint
@@ -433,14 +374,9 @@ g_synaptics_max_speed (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint) (g_synaptics_get_value_from_synclient ("MaxSpeed") * 1000);
 	}
-	else
-	{
-		return (gint) (SYNSHM(synaptics)->max_speed * 1000);
-	}
 }
 
 gboolean
@@ -450,14 +386,9 @@ g_synaptics_is_coasting_enabled (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return FALSE;
 
-	if (priv->synclient)
 	{
 		return g_synaptics_get_value_from_synclient ("CoastEnable") ? TRUE : FALSE;
 	}
-	else
-	{
-		return SYNSHM(synaptics)->coasting_speed > 0.1;
-	}
 }
 
 gboolean
@@ -467,14 +398,9 @@ g_synaptics_is_circular_scroll_enabled (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return FALSE;
 
-	if (priv->synclient)
 	{
 		return g_synaptics_get_value_from_synclient ("CircularScrolling") ? TRUE : FALSE;
 	}
-	else
-	{
-		return SYNSHM(synaptics)->circular_scrolling;
-	}
 }
 
 gint
@@ -484,14 +410,9 @@ g_synaptics_circular_scroll_delta (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint)(g_synaptics_get_value_from_synclient ("CircScrollDelta") * 1000);
 	}
-	else
-	{
-		return (gint)(SYNSHM(synaptics)->scroll_dist_circ * 1000);
-	}
 }
 
 ScrollTrigger
@@ -501,14 +422,9 @@ g_synaptics_circular_scroll_trigger (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return NoTrigger;
 
-	if (priv->synclient)
 	{
 		return (ScrollTrigger)g_synaptics_get_value_from_synclient ("CircScrollTrigger");
 	}
-	else
-	{
-		return (ScrollTrigger)SYNSHM(synaptics)->circular_trigger;
-	}
 }
 
 Button
@@ -518,14 +434,9 @@ g_synaptics_button_for_tap (GSynaptics *synaptics, TapEvent tap)
 	if (!g_synaptics_is_valid(synaptics))
 		return None;
 
-	if (priv->synclient)
 	{
 		return (Button)g_synaptics_get_value_from_synclient ("ButtonForTap");
 	}
-	else
-	{
-		return (Button)SYNSHM(synaptics)->tap_action[tap];
-	}
 }
 
 gboolean
@@ -535,14 +446,9 @@ g_synaptics_are_fast_taps_enabled (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return FALSE;
 
-	if (priv->synclient)
 	{
 		return (gboolean)g_synaptics_get_value_from_synclient ("FastTaps");
 	}
-	else
-	{
-		return SYNSHM(synaptics)->fast_taps;
-	}
 }
 
 gint
@@ -552,14 +458,9 @@ g_synaptics_abs_coord_x (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint)g_synaptics_get_value_from_synclient ("AbsCoordX");
 	}
-	else
-	{
-		return SYNSHM(synaptics)->x;
-	}
 }
 
 gint
@@ -569,14 +470,9 @@ g_synaptics_abs_coord_y (GSynaptics *synaptics)
 	if (!g_synaptics_is_valid(synaptics))
 		return 0;
 
-	if (priv->synclient)
 	{
 		return (gint)g_synaptics_get_value_from_synclient ("AbsCoordY");
 	}
-	else
-	{
-		return SYNSHM(synaptics)->y;
-	}
 }
 
 
@@ -587,7 +483,6 @@ g_synaptics_set_enabled (GSynaptics *synaptics, gint enable)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient TouchpadOff=%d",
@@ -595,10 +490,6 @@ g_synaptics_set_enabled (GSynaptics *synaptics, gint enable)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->touchpad_off = enable;
-	}
 }
 
 void
@@ -615,17 +506,12 @@ g_synaptics_set_tap_time (GSynaptics *synaptics, gint time)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient MaxTapTime=%d", time);
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->tap_time = time;
-	}
 }
 
 #if 0
@@ -649,7 +535,6 @@ g_synaptics_set_sensitivity (GSynaptics *synaptics, gint value)
   	if ( value < 0 || value > 4)
 		return;
 	
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient FingerLow=%d FingerHigh=%d",
@@ -657,23 +542,6 @@ g_synaptics_set_sensitivity (GSynaptics *synaptics, gint value)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-#if 0
-	if ( !SynConfig::treatAsALPS())
-	{
-#endif
-		SYNSHM(synaptics)->finger_low = finger_low[value];
-		SYNSHM(synaptics)->finger_high = finger_low[value] + 5;
-#if 0
-	}
-	else
-	{
-		SYNSHM(synaptics)->finger_low = finger_low[value] - 11;
-		SYNSHM(synaptics)->finger_high = finger_low[value] - 10;
-	}
-#endif
-	}
 }
 
 void
@@ -693,7 +561,6 @@ g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics, gint enabled)
 		 break;
 	}
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient HorizEdgeScroll=%d",
@@ -706,12 +573,6 @@ g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics, gint enabled)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->scroll_edge_horiz = edge && enabled;
-		SYNSHM(synaptics)->scroll_twofinger_horiz = twofinger &&
-		    enabled;
-	}
 }
 
 void
@@ -731,7 +592,6 @@ g_synaptics_set_scroll_method (GSynaptics *synaptics, ScrollMethod method)
 		break;
 	}
 
-	if (priv->synclient)
 	{
 		gchar *command;
 
@@ -745,11 +605,6 @@ g_synaptics_set_scroll_method (GSynaptics *synaptics, ScrollMethod method)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->scroll_edge_vert = edge;
-		SYNSHM(synaptics)->scroll_twofinger_vert = twofinger;
-	}
 
 		g_synaptics_set_horizontal_scroll_enabled(synaptics,
 		g_synaptics_is_horizontal_scroll_enabled(synaptics));
@@ -762,7 +617,6 @@ g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics, gint delta)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient HorizScrollDelta=%d",
@@ -770,10 +624,6 @@ g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics, gint delta)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->scroll_dist_horiz = delta;
-	}
 }
 
 void
@@ -783,7 +633,6 @@ g_synaptics_set_vertical_scroll_delta (GSynaptics *synaptics, gint delta)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient VertScrollDelta=%d",
@@ -791,10 +640,6 @@ g_synaptics_set_vertical_scroll_delta (GSynaptics *synaptics, gint delta)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->scroll_dist_vert = delta;
-	}
 }
 
 void
@@ -804,7 +649,6 @@ g_synaptics_set_accel_factor(GSynaptics *synaptics, gint value)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -813,10 +657,6 @@ g_synaptics_set_accel_factor(GSynaptics *synaptics, gint value)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->accl = ((double)value) / 1000;
-	}
 }
 
 void
@@ -826,7 +666,6 @@ g_synaptics_set_max_speed(GSynaptics *synaptics, gint value)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -835,10 +674,6 @@ g_synaptics_set_max_speed(GSynaptics *synaptics, gint value)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->max_speed = ((double)value) / 1000;
-	}
 }
 
 void
@@ -848,7 +683,6 @@ g_synaptics_set_min_speed(GSynaptics *synaptics, gint value)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -857,10 +691,6 @@ g_synaptics_set_min_speed(GSynaptics *synaptics, gint value)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->min_speed = ((double)value) / 1000;
-	}
 }
 
 void
@@ -870,7 +700,6 @@ g_synaptics_set_circular_scroll_enabled (GSynaptics *synaptics, gboolean enable)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient CircularScrolling=%d",
@@ -878,10 +707,6 @@ g_synaptics_set_circular_scroll_enabled (GSynaptics *synaptics, gboolean enable)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)-> circular_scrolling = enable;
-	}
 }
 
 void
@@ -891,7 +716,6 @@ g_synaptics_set_edge_motion_enabled (GSynaptics *synaptics, gboolean enable)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient EdgeMotionUseAlways=%d",
@@ -899,10 +723,6 @@ g_synaptics_set_edge_motion_enabled (GSynaptics *synaptics, gboolean enable)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->edge_motion_use_always = enable;
-	}
 }
 
 void
@@ -916,7 +736,6 @@ g_synaptics_set_coasting_enabled (GSynaptics *synaptics, gboolean enable)
 	if (!enable)
 		thresh = 0;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -926,10 +745,6 @@ g_synaptics_set_coasting_enabled (GSynaptics *synaptics, gboolean enable)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->coasting_speed = thresh;
-	}
 }
 
 void
@@ -939,7 +754,6 @@ g_synaptics_set_circular_scroll_delta (GSynaptics *synaptics, gint delta)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -948,10 +762,6 @@ g_synaptics_set_circular_scroll_delta (GSynaptics *synaptics, gint delta)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->scroll_dist_circ = ((double)delta) / 1000;
-	}
 }
 
 void
@@ -961,7 +771,6 @@ g_synaptics_set_circular_scroll_trigger (GSynaptics *synaptics, ScrollTrigger t)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient CircScrollTrigger=%d",
@@ -969,10 +778,6 @@ g_synaptics_set_circular_scroll_trigger (GSynaptics *synaptics, ScrollTrigger t)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->circular_trigger = t;
-	}
 }
 
 void
@@ -982,7 +787,6 @@ g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapEvent tap, Button butt
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 
-	if (priv->synclient)
 	{
 	    gchar *command;
 
@@ -1008,10 +812,6 @@ g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapEvent tap, Button butt
 	    g_spawn_command_line_async (command, NULL);
 	    g_free (command);
 	}
-	else
-	{
-	    SYNSHM(synaptics)->tap_action[tap] = button;
-	}
 }
 
 void
@@ -1021,7 +821,6 @@ g_synaptics_set_fast_taps (GSynaptics *synaptics, gboolean enable)
 	if (!g_synaptics_is_valid(synaptics))
 		return;
 	
-	if (priv->synclient)
 	{
 		gchar *command;
 		command = g_strdup_printf ("synclient FastTaps=%d",
@@ -1029,8 +828,4 @@ g_synaptics_set_fast_taps (GSynaptics *synaptics, gboolean enable)
 		g_spawn_command_line_async (command, NULL);
 		g_free (command);
 	}
-	else
-	{
-		SYNSHM(synaptics)->fast_taps = enable;
-	}
 }
-- 
1.6.3.rc1.2.g0164.dirty



Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gsynaptics.spec	25 Jul 2009 01:38:11 -0000	1.24
+++ gsynaptics.spec	3 Aug 2009 06:30:46 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           gsynaptics
 Version:        0.9.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -16,6 +16,7 @@ Patch7:         gsynaptics-0.9.14-driver
 Patch8:         gsynaptics-0.9.14-fix-scrolling-checkboxes.patch
 Patch9:         gsynaptics-0.9.14-scrollmethods.patch
 Patch10:        gsynaptics-0.9.14-tapping-gconf.patch
+Patch11:        gsynaptics-0.9.16-purge-shm.patch
 
 Source1:        %{name}-touchpad.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ install -p %{SOURCE1} data/touchpad.png
 %patch8 -p1 -b .scrl-chkbx-fix
 %patch9 -p1 -b .scrollmethods
 %patch10 -p1 -b .tapping-gconf
+%patch11 -p1 -b .purge-shm
 
 %build
 autoreconf -v --install --force || exit 1
@@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.9.16-3
+- gsynaptics-0.9.16-purge-shm.patch: purge SHM, the driver doesn't provide
+  it anymore.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Aug  3 06:30:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:30:59 +0000
Subject: [pkgdb] moblin-icon-theme was added for pbrobinson
Message-ID: <20090803063059.2AC5A10F8A2@bastion2.fedora.phx.redhat.com>

tibbs has added Package moblin-icon-theme with summary Moblin icon theme
tibbs has approved Package moblin-icon-theme
tibbs has added a Fedora devel branch for moblin-icon-theme with an owner of pbrobinson
tibbs has approved moblin-icon-theme in Fedora devel
tibbs has approved Package moblin-icon-theme
tibbs has set commit to Approved for 107427 on moblin-icon-theme (Fedora devel)
tibbs has set checkout to Approved for 107427 on moblin-icon-theme (Fedora devel)
tibbs has set build to Approved for 107427 on moblin-icon-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-icon-theme



From pkgdb at fedoraproject.org  Mon Aug  3 06:31:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:31:00 +0000
Subject: [pkgdb] moblin-icon-theme summary updated by tibbs
Message-ID: <20090803063100.C75AE10F8AD@bastion2.fedora.phx.redhat.com>

tibbs set package moblin-icon-theme summary to Moblin icon theme

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-icon-theme



From tibbs at fedoraproject.org  Mon Aug  3 06:31:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:08 +0000 (UTC)
Subject: rpms/moblin-icon-theme - New directory
Message-ID: <20090803063108.1887F11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-icon-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL19668/rpms/moblin-icon-theme

Log Message:
Directory /cvs/pkgs/rpms/moblin-icon-theme added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 06:31:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:08 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel - New directory
Message-ID: <20090803063108.498E011C0382@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL19668/rpms/moblin-icon-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-icon-theme/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 06:31:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:15 +0000 (UTC)
Subject: rpms/moblin-icon-theme Makefile,NONE,1.1
Message-ID: <20090803063115.3ED0D11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-icon-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL19668/rpms/moblin-icon-theme

Added Files:
	Makefile 
Log Message:
Setup of module moblin-icon-theme


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-icon-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug  3 06:31:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:31:00 +0000
Subject: [pkgdb] moblin-icon-theme (Fedora, 11) updated by tibbs
Message-ID: <20090803063100.E179A10F8AF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for moblin-icon-theme
tibbs has set commit to Approved for 107427 on moblin-icon-theme (Fedora 11)
tibbs has set checkout to Approved for 107427 on moblin-icon-theme (Fedora 11)
tibbs has set build to Approved for 107427 on moblin-icon-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-icon-theme



From tibbs at fedoraproject.org  Mon Aug  3 06:31:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:15 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090803063115.D5F9C11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL19668/rpms/moblin-icon-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-icon-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-icon-theme
# $Id: Makefile,v 1.1 2009/08/03 06:31:15 tibbs Exp $
NAME := moblin-icon-theme
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Aug  3 06:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:31:36 +0000
Subject: [pkgdb] rubygem-flexmock was added for mtasaka
Message-ID: <20090803063136.30F0910F89E@bastion2.fedora.phx.redhat.com>

tibbs has added Package rubygem-flexmock with summary Mock object library for ruby
tibbs has approved Package rubygem-flexmock
tibbs has added a Fedora devel branch for rubygem-flexmock with an owner of mtasaka
tibbs has approved rubygem-flexmock in Fedora devel
tibbs has approved Package rubygem-flexmock
tibbs has set commit to Approved for 107427 on rubygem-flexmock (Fedora devel)
tibbs has set checkout to Approved for 107427 on rubygem-flexmock (Fedora devel)
tibbs has set build to Approved for 107427 on rubygem-flexmock (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 06:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:31:36 +0000
Subject: [pkgdb] rubygem-flexmock summary updated by tibbs
Message-ID: <20090803063136.D662310F8A9@bastion2.fedora.phx.redhat.com>

tibbs set package rubygem-flexmock summary to Mock object library for ruby

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



From pkgdb at fedoraproject.org  Mon Aug  3 06:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:31:36 +0000
Subject: [pkgdb] rubygem-flexmock (Fedora, 10) updated by tibbs
Message-ID: <20090803063136.DFFD310F8AF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for rubygem-flexmock
tibbs has set commit to Approved for 107427 on rubygem-flexmock (Fedora 10)
tibbs has set checkout to Approved for 107427 on rubygem-flexmock (Fedora 10)
tibbs has set build to Approved for 107427 on rubygem-flexmock (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Aug  3 06:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 06:31:36 +0000
Subject: [pkgdb] rubygem-flexmock (Fedora, 10) updated by tibbs
Message-ID: <20090803063136.E9D7410F8B2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for rubygem-flexmock
tibbs has set commit to Approved for 107427 on rubygem-flexmock (Fedora 11)
tibbs has set checkout to Approved for 107427 on rubygem-flexmock (Fedora 11)
tibbs has set build to Approved for 107427 on rubygem-flexmock (Fedora 11)

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



From tibbs at fedoraproject.org  Mon Aug  3 06:31:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:43 +0000 (UTC)
Subject: rpms/rubygem-flexmock - New directory
Message-ID: <20090803063143.1CCFE11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-flexmock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsk19985/rpms/rubygem-flexmock

Log Message:
Directory /cvs/pkgs/rpms/rubygem-flexmock added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 06:31:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:43 +0000 (UTC)
Subject: rpms/rubygem-flexmock/devel - New directory
Message-ID: <20090803063143.465BA11C0417@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-flexmock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsk19985/rpms/rubygem-flexmock/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-flexmock/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 06:31:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:49 +0000 (UTC)
Subject: rpms/rubygem-flexmock Makefile,NONE,1.1
Message-ID: <20090803063149.909CB11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-flexmock
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsk19985/rpms/rubygem-flexmock

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-flexmock


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-flexmock
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug  3 06:31:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 06:31:49 +0000 (UTC)
Subject: rpms/rubygem-flexmock/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090803063149.EA0FC11C02C6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-flexmock/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsk19985/rpms/rubygem-flexmock/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-flexmock


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-flexmock
# $Id: Makefile,v 1.1 2009/08/03 06:31:49 tibbs Exp $
NAME := rubygem-flexmock
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From gerd at fedoraproject.org  Mon Aug  3 07:03:55 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Mon,  3 Aug 2009 07:03:55 +0000 (UTC)
Subject: rpms/rakudo/devel import.log, NONE, 1.1 rakudo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803070357.1A4E011C02C6@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rakudo.spec 
Log Message:
add initial package



--- NEW FILE import.log ---
rakudo-2009_07-3_fc11:HEAD:rakudo-2009.07-3.fc11.src.rpm:1249282522


--- NEW FILE rakudo.spec ---
%global year 2009
%global month 07
%global parrot_version 1.4.0

Name:           rakudo
Version:        %{year}.%{month}
Release:        3%{?dist}
Summary:        A Perl compiler on Parrot
License:        Artistic 2.0
Group:          Development/Languages
URL:            http://www.rakudo.org/

Source0:        http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{year}-%{month}.tar.gz
Source1:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{parrot_version}/parrot-%{parrot_version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  readline-devel
BuildRequires:  ncurses-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::Simple)
BuildRequires:  ctags
BuildRequires:  openssl-devel

%description
Rakudo Perl 6, or just Rakudo, is a Perl 6 compiler for the Parrot virtual
machine. Rakudo is an implementation of the Perl 6 specification that runs
on the Parrot VM.

%prep
%setup -q -n rakudo-%{year}-%{month} -a1
exit 0

%build
%ifarch %{ix86} x86_64
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
%else
# The PowerPC-architecture do not build with the '-maccumulate-outgoing-args'
# option.
    RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
%endif

cd parrot-%{parrot_version}
export LD_LIBRARY_PATH=$( pwd )/blib/lib

%{__perl} Configure.pl --parrot_is_shared \
  --disable-rpath \
  --optimize="$RPM_OPT_FLAGS" 
make
cd ..
%{__perl} Configure.pl --parrot-config=./parrot-1.4.0/parrot_config
make

%install
rm -rf $RPM_BUILD_ROOT
%{__install} -D --mode=755 perl6 $RPM_BUILD_ROOT/usr/bin/perl6

%check
make test
exit 0

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/perl6
%doc CREDITS LICENSE README

%changelog
* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 2009.07-3
- Fix versioning
- Provide full SourceURLs
- strip binary

* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 2009.07-2
- first .spec file created


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	2 Aug 2009 23:32:04 -0000	1.1
+++ .cvsignore	3 Aug 2009 07:03:43 -0000	1.2
@@ -0,0 +1,2 @@
+parrot-1.4.0.tar.gz
+rakudo-2009-07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Aug 2009 23:32:04 -0000	1.1
+++ sources	3 Aug 2009 07:03:51 -0000	1.2
@@ -0,0 +1,2 @@
+3f66816c0f2ba18bdd2cf7bedd59f045  parrot-1.4.0.tar.gz
+df841289a91a804a5bd2fe3125dfc06b  rakudo-2009-07.tar.gz



From cchance at fedoraproject.org  Mon Aug  3 07:14:31 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon,  3 Aug 2009 07:14:31 +0000 (UTC)
Subject: rpms/ibus-table/devel .cvsignore, 1.9, 1.10 ibus-table.spec, 1.20, 
	1.21 sources, 1.10, 1.11
Message-ID: <20090803071431.90E5811C02C6@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32736

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
updated to upstream 20090803


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Jul 2009 06:40:10 -0000	1.9
+++ .cvsignore	3 Aug 2009 07:14:29 -0000	1.10
@@ -1 +1 @@
-ibus-table-1.2.0.20090625.tar.gz
+ibus-table-1.2.0.20090803.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-table.spec	25 Jul 2009 03:03:33 -0000	1.20
+++ ibus-table.spec	3 Aug 2009 07:14:29 -0000	1.21
@@ -1,6 +1,6 @@
 Name:       ibus-table
-Version:    1.2.0.20090625
-Release:    3%{?dist}
+Version:    1.2.0.20090803
+Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -52,10 +52,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %dir %{_datadir}/%{name}/tables
 %dir %{_datadir}/%{name}/icons
 %dir %{_datadir}/%{name}/data
+%dir %{_datadir}/%{name}/setup
 %{_datadir}/ibus/component/table.xml
 %{_datadir}/pkgconfig/%{name}.pc
-%{_libexecdir}/ibus-engine-table
-%{_bindir}/%{name}-createdb
 %{_datadir}/%{name}/tables/template.txt
 %{_datadir}/%{name}/icons/%{name}.svg
 %{_datadir}/%{name}/icons/full-letter.svg
@@ -70,6 +69,11 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_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/factory.py
 %{_datadir}/%{name}/engine/factory.pyc
@@ -92,11 +96,13 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/engine/tabsqlitedb.py
 %{_datadir}/%{name}/engine/tabsqlitedb.pyc
 %{_datadir}/%{name}/engine/tabsqlitedb.pyo
-%{_datadir}/%{name}/icons/cb-mode.svg
-%{_datadir}/%{name}/icons/sc-mode.svg
-%{_datadir}/%{name}/icons/scb-mode.svg
-%{_datadir}/%{name}/icons/tc-mode.svg
-%{_datadir}/%{name}/icons/tcb-mode.svg
+%{_datadir}/%{name}/setup/main.py
+%{_datadir}/%{name}/setup/main.pyc
+%{_datadir}/%{name}/setup/main.pyo
+%{_datadir}/%{name}/setup/setup.glade
+%{_bindir}/%{name}-createdb
+%{_libexecdir}/ibus-engine-table
+%{_libexecdir}/ibus-setup-table
 
 %files additional
 %defattr(-,root,root,-)
@@ -106,6 +112,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Tue Aug 03 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090803-1.fc12
+- Updated to upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090625-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Jul 2009 06:40:10 -0000	1.10
+++ sources	3 Aug 2009 07:14:29 -0000	1.11
@@ -1 +1 @@
-283207bcc0e110a906e8784d71d49d37  ibus-table-1.2.0.20090625.tar.gz
+768e441557bab8197aa87efb71be0f8e  ibus-table-1.2.0.20090803.tar.gz



From adrian at fedoraproject.org  Mon Aug  3 07:34:40 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Mon,  3 Aug 2009 07:34:40 +0000 (UTC)
Subject: rpms/libmpd/devel libmpd.spec,1.13,1.14
Message-ID: <20090803073440.575FC11C02C6@cvs1.fedora.phx.redhat.com>

Author: adrian

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

Modified Files:
	libmpd.spec 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 0.18.0-3
- added versioned BR for glib2-devel >= 2.16 (#514565)



Index: libmpd.spec
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/libmpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libmpd.spec	25 Jul 2009 06:08:31 -0000	1.13
+++ libmpd.spec	3 Aug 2009 07:34:39 -0000	1.14
@@ -1,13 +1,13 @@
 Summary: Music Player Daemon Library
 Name: libmpd
 Version: 0.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
 Group: Applications/Multimedia
 Source: http://download.sarine.nl/download/Programs/gmpc/0.18.0/libmpd-0.18.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.16
 
 %package devel
 Summary: Header files for developing programs with libmpd
@@ -54,6 +54,9 @@ for developing program with libmpd.
 %{_includedir}/libmpd-1.0
 
 %changelog
+* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 0.18.0-3
+- added versioned BR for glib2-devel >= 2.16 (#514565)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Mon Aug  3 07:45:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 07:45:38 +0000 (UTC)
Subject: rpms/rubygem-flexmock/F-10 rubygem-flexmock.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803074538.5EE1B11C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-flexmock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-flexmock.spec 
Log Message:
Initial import


--- NEW FILE rubygem-flexmock.spec ---
%global	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global	rubyabi	1.8

%global	gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname	flexmock
%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}

Summary:	Mock object library for ruby
Name:		rubygem-%{gemname}
Version:	0.8.6
Release:	1%{?dist}
Group:		Development/Languages
License:	Copyright only
URL:		http://flexmock.rubyforge.org
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
BuildRequires(check):	rubygem(rake)
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Provides:	ruby(%{gemname}) = %{name}-%{version}
BuildArch:	noarch

%description
FlexMock is a simple, but flexible, mock object library for Ruby unit
testing.

%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

mkdir -p .%{gemdir}
gem install \
	--local \
	--install-dir .%{gemdir} \
	--force --rdoc -V \
	%{SOURCE0}

find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env at d'
find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

# Create symlinks
# Copied from rubygem-getetxt.spec
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

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}

%check
pushd .%{geminstdir}
rake test_all --trace

%files
%defattr(-,root,root,-)
%dir	%{geminstdir}
%doc	%{geminstdir}/[A-Z]*
%exclude	%{geminstdir}/Rakefile
%exclude	%{geminstdir}/install.rb
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/flexmock.blurb
%{geminstdir}/doc/
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb
%{ruby_sitelib}/%{gemname}/

%changelog
* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.6-1
- Switch to gem, repackage

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-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.7.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Nov 08 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-3
- Fix repoid 

* Wed Nov 07 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-2
- Spec cleanups in response to review
- Fix license
- strip out shebangs

* Sun Sep 09 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-1
- Initial vesion


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-flexmock/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:31:49 -0000	1.1
+++ .cvsignore	3 Aug 2009 07:45:36 -0000	1.2
@@ -0,0 +1 @@
+flexmock-0.8.6.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-flexmock/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:31:49 -0000	1.1
+++ sources	3 Aug 2009 07:45:37 -0000	1.2
@@ -0,0 +1 @@
+b087a648c5051e44e1d16fd886a7ce20  flexmock-0.8.6.gem



From mtasaka at fedoraproject.org  Mon Aug  3 07:45:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 07:45:39 +0000 (UTC)
Subject: rpms/rubygem-flexmock/F-11 rubygem-flexmock.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803074539.494CE11C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-flexmock/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-flexmock.spec 
Log Message:
Initial import


--- NEW FILE rubygem-flexmock.spec ---
%global	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global	rubyabi	1.8

%global	gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname	flexmock
%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}

Summary:	Mock object library for ruby
Name:		rubygem-%{gemname}
Version:	0.8.6
Release:	1%{?dist}
Group:		Development/Languages
License:	Copyright only
URL:		http://flexmock.rubyforge.org
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
BuildRequires(check):	rubygem(rake)
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Provides:	ruby(%{gemname}) = %{name}-%{version}
BuildArch:	noarch

%description
FlexMock is a simple, but flexible, mock object library for Ruby unit
testing.

%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

mkdir -p .%{gemdir}
gem install \
	--local \
	--install-dir .%{gemdir} \
	--force --rdoc -V \
	%{SOURCE0}

find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env at d'
find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

# Create symlinks
# Copied from rubygem-getetxt.spec
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

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}

%check
pushd .%{geminstdir}
rake test_all --trace

%files
%defattr(-,root,root,-)
%dir	%{geminstdir}
%doc	%{geminstdir}/[A-Z]*
%exclude	%{geminstdir}/Rakefile
%exclude	%{geminstdir}/install.rb
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/flexmock.blurb
%{geminstdir}/doc/
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb
%{ruby_sitelib}/%{gemname}/

%changelog
* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.6-1
- Switch to gem, repackage

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-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.7.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Nov 08 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-3
- Fix repoid 

* Wed Nov 07 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-2
- Spec cleanups in response to review
- Fix license
- strip out shebangs

* Sun Sep 09 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-1
- Initial vesion


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-flexmock/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:31:49 -0000	1.1
+++ .cvsignore	3 Aug 2009 07:45:38 -0000	1.2
@@ -0,0 +1 @@
+flexmock-0.8.6.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-flexmock/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:31:49 -0000	1.1
+++ sources	3 Aug 2009 07:45:38 -0000	1.2
@@ -0,0 +1 @@
+b087a648c5051e44e1d16fd886a7ce20  flexmock-0.8.6.gem



From mtasaka at fedoraproject.org  Mon Aug  3 07:45:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 07:45:39 +0000 (UTC)
Subject: rpms/rubygem-flexmock/devel rubygem-flexmock.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803074539.A653011C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-flexmock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-flexmock.spec 
Log Message:
Initial import


--- NEW FILE rubygem-flexmock.spec ---
%global	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global	rubyabi	1.8

%global	gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname	flexmock
%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}

Summary:	Mock object library for ruby
Name:		rubygem-%{gemname}
Version:	0.8.6
Release:	1%{?dist}
Group:		Development/Languages
License:	Copyright only
URL:		http://flexmock.rubyforge.org
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
BuildRequires(check):	rubygem(rake)
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Provides:	ruby(%{gemname}) = %{name}-%{version}
BuildArch:	noarch

%description
FlexMock is a simple, but flexible, mock object library for Ruby unit
testing.

%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

mkdir -p .%{gemdir}
gem install \
	--local \
	--install-dir .%{gemdir} \
	--force --rdoc -V \
	%{SOURCE0}

find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env at d'
find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/

# Create symlinks
# Copied from rubygem-getetxt.spec
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

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}

%check
pushd .%{geminstdir}
rake test_all --trace

%files
%defattr(-,root,root,-)
%dir	%{geminstdir}
%doc	%{geminstdir}/[A-Z]*
%exclude	%{geminstdir}/Rakefile
%exclude	%{geminstdir}/install.rb
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/flexmock.blurb
%{geminstdir}/doc/
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb
%{ruby_sitelib}/%{gemname}/

%changelog
* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.6-1
- Switch to gem, repackage

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-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.7.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Thu Nov 08 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-3
- Fix repoid 

* Wed Nov 07 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-2
- Spec cleanups in response to review
- Fix license
- strip out shebangs

* Sun Sep 09 2007 Paul Nasrat <pauln at truemesh.com> - 0.7.1-1
- Initial vesion


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-flexmock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:31:49 -0000	1.1
+++ .cvsignore	3 Aug 2009 07:45:39 -0000	1.2
@@ -0,0 +1 @@
+flexmock-0.8.6.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-flexmock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:31:49 -0000	1.1
+++ sources	3 Aug 2009 07:45:39 -0000	1.2
@@ -0,0 +1 @@
+b087a648c5051e44e1d16fd886a7ce20  flexmock-0.8.6.gem



From atkac at fedoraproject.org  Mon Aug  3 07:49:45 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  3 Aug 2009 07:49:45 +0000 (UTC)
Subject: rpms/swig/F-10 swig.spec,1.41,1.42
Message-ID: <20090803074945.ECDF411C02C6@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	swig.spec 
Log Message:
- fix perl requires/provides (#514983)



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/F-10/swig.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- swig.spec	28 Jul 2009 16:49:41 -0000	1.41
+++ swig.spec	3 Aug 2009 07:49:43 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.39
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -40,6 +40,22 @@ tool for building user interfaces.
 %patch1 -p1 -b .pylib
 %patch2 -p1 -b .arch
 
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
+EOF
+
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
+EOF
+
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
 %build
 ./autogen.sh
 %configure
@@ -66,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ccache-swig.1*
 
 %changelog
+* Mon Aug 03 2009 Adam Tkac <atkac redhat com> 1.3.39-2
+- fix perl requires/provides (#514983)
+
 * Tue Jul 28 2009 Adam Tkac <atkac redhat com> 1.3.39-1
 - update to 1.3.39 (#513744)
 



From mhlavink at fedoraproject.org  Mon Aug  3 08:21:24 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  3 Aug 2009 08:21:24 +0000 (UTC)
Subject: rpms/apcupsd/devel .cvsignore, 1.14, 1.15 apcupsd.spec, 1.33,
	1.34 sources, 1.14, 1.15
Message-ID: <20090803082125.1524111C02C6@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
updated to 3.14.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 May 2009 07:03:54 -0000	1.14
+++ .cvsignore	3 Aug 2009 08:21:23 -0000	1.15
@@ -1 +1 @@
-apcupsd-3.14.6.tar.gz
+apcupsd-3.14.7.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- apcupsd.spec	24 Jul 2009 16:57:18 -0000	1.33
+++ apcupsd.spec	3 Aug 2009 08:21:23 -0000	1.34
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.6
-Release:      2%{?dist}
+Version:      3.14.7
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.7-1
+- updated to 3.14.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 May 2009 07:03:54 -0000	1.14
+++ sources	3 Aug 2009 08:21:23 -0000	1.15
@@ -1 +1 @@
-7df2dbe325a6b1822763cbf6a9fa8263  apcupsd-3.14.6.tar.gz
+bb2f8e4fc6b2f5d7b3e236eb57b81640  apcupsd-3.14.7.tar.gz



From mhlavink at fedoraproject.org  Mon Aug  3 08:25:00 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  3 Aug 2009 08:25:00 +0000 (UTC)
Subject: rpms/apcupsd/F-11 .cvsignore, 1.13, 1.14 apcupsd.spec, 1.32,
	1.33 sources, 1.14, 1.15
Message-ID: <20090803082500.D836511C02C6@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
updated to 3.14.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Jan 2009 10:08:19 -0000	1.13
+++ .cvsignore	3 Aug 2009 08:25:00 -0000	1.14
@@ -1 +1 @@
-apcupsd-3.14.5.tar.gz
+apcupsd-3.14.7.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-11/apcupsd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- apcupsd.spec	18 May 2009 07:06:51 -0000	1.32
+++ apcupsd.spec	3 Aug 2009 08:25:00 -0000	1.33
@@ -1,5 +1,5 @@
 Name:         apcupsd
-Version:      3.14.6
+Version:      3.14.7
 Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Mon Aug 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.7-1
+- updated to 3.14.7
+
 * Mon May 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.6-1
 - update to 3.14.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 May 2009 07:06:51 -0000	1.14
+++ sources	3 Aug 2009 08:25:00 -0000	1.15
@@ -1 +1 @@
-7df2dbe325a6b1822763cbf6a9fa8263  apcupsd-3.14.6.tar.gz
+bb2f8e4fc6b2f5d7b3e236eb57b81640  apcupsd-3.14.7.tar.gz



From twaugh at fedoraproject.org  Mon Aug  3 08:25:34 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 08:25:34 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint.spec,1.52,1.53
Message-ID: <20090803082534.AE9B711C02C6@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	gutenprint.spec 
Log Message:
* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
- Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.



Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gutenprint.spec	31 Jul 2009 16:52:29 -0000	1.52
+++ gutenprint.spec	3 Aug 2009 08:25:34 -0000	1.53
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,13 +254,16 @@ exit 0
 %post foomatic
 /bin/rm -f /var/cache/foomatic/*
 if [ $1 -eq 2 ]; then
-  %{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+  %{_sbindir}/gutenprint-foomaticppdupdate %{version} >/dev/null 2>&1 || :
 fi
 
 %postun foomatic
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
+- Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.
+
 * Fri Jul 31 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-2
 - 5.2.4.  Re-enabled compiler optimization for ppc64.
 



From jwrdegoede at fedoraproject.org  Mon Aug  3 08:25:34 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  3 Aug 2009 08:25:34 +0000 (UTC)
Subject: rpms/stormbaancoureur/devel stormbaancoureur.spec,1.14,1.15
Message-ID: <20090803082534.55CB011C02C6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	stormbaancoureur.spec 
Log Message:
* Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-5
- Update URL's for upstream domainname change



Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/extras/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- stormbaancoureur.spec	27 Jul 2009 04:53:38 -0000	1.14
+++ stormbaancoureur.spec	3 Aug 2009 08:25:34 -0000	1.15
@@ -1,11 +1,11 @@
 Name:           stormbaancoureur
 Version:        2.1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://bram.creative4vision.nl/stormbaancoureur/
-Source0:        http://bram.creative4vision.nl/stormbaancoureur/download/%{name}-%{version}.tar.gz 
+URL:            http://www.stolk.org/stormbaancoureur/
+Source0:        http://www.stolk.org/stormbaancoureur/download/%{name}-%{version}.tar.gz 
 Source1:        %{name}.desktop
 Source2:        sturmbahnfahrer.png
 Patch0:         stormbaancoureur-1.5.3-no-static-ode.patch
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-5
+- Update URL's for upstream domainname change
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Aug  3 08:26:49 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  3 Aug 2009 08:26:49 +0000 (UTC)
Subject: rpms/apcupsd/F-10 .cvsignore, 1.13, 1.14 apcupsd.spec, 1.29,
	1.30 sources, 1.14, 1.15
Message-ID: <20090803082649.24D3411C02C6@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
updated to 3.14.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Jan 2009 10:14:04 -0000	1.13
+++ .cvsignore	3 Aug 2009 08:26:48 -0000	1.14
@@ -1 +1 @@
-apcupsd-3.14.5.tar.gz
+apcupsd-3.14.7.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/apcupsd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- apcupsd.spec	18 May 2009 07:23:16 -0000	1.29
+++ apcupsd.spec	3 Aug 2009 08:26:48 -0000	1.30
@@ -1,5 +1,5 @@
 Name:         apcupsd
-Version:      3.14.6
+Version:      3.14.7
 Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
@@ -171,6 +171,9 @@ fi
 
 
 %changelog
+* Mon Aug 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.7-1
+- update to 3.14.7
+
 * Mon May 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.6-1
 - update to 3.14.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	18 May 2009 07:23:16 -0000	1.14
+++ sources	3 Aug 2009 08:26:49 -0000	1.15
@@ -1 +1 @@
-7df2dbe325a6b1822763cbf6a9fa8263  apcupsd-3.14.6.tar.gz
+bb2f8e4fc6b2f5d7b3e236eb57b81640  apcupsd-3.14.7.tar.gz



From ovasik at fedoraproject.org  Mon Aug  3 08:43:53 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  3 Aug 2009 08:43:53 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.59,1.60
Message-ID: <20090803084353.C516611C02C6@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	filesystem.spec 
Log Message:
Do own /usr/share/man/<locale> directories (ghosted, missingok) - #220265


Index: filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- filesystem.spec	24 Jul 2009 22:45:29 -0000	1.59
+++ filesystem.spec	3 Aug 2009 08:43:51 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.25
-Release: 2%{?dist}
+Version: 2.4.26
+Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System Environment/Base
@@ -47,6 +47,7 @@ grep -v "^$" /usr/share/iso-codes/iso_63
         locale=$b
     fi
     echo "%lang(${locale})	/usr/share/locale/${locale}" >> $RPM_BUILD_DIR/filelist
+    echo "%lang(${locale}) %ghost %config(missingok) /usr/share/man/${locale}" >>$RPM_BUILD_DIR/filelist
 done
 cat %{SOURCE1} | grep -v "^#" | grep -v "^$" | while read loc ; do
     locale=$loc
@@ -67,13 +68,22 @@ cat %{SOURCE1} | grep -v "^#" | grep -v 
            /usr/share/iso-codes/iso_639.tab || continue
     fi
     echo "%lang(${locale})	/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/filelist
+    echo "%lang(${locale})  %ghost %config(missingok) /usr/share/man/${loc}" >> $RPM_BUILD_DIR/filelist
 done
 
 
-cat $RPM_BUILD_DIR/filelist | while read a b ; do
+cat $RPM_BUILD_DIR/filelist | grep "locale" | while read a b ; do
     mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
 done
 
+cat $RPM_BUILD_DIR/filelist | grep "/share/man" | while read a b c d; do
+    mkdir -p -m 755 %{buildroot}/$d
+done
+
+for i in `echo man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}`; do
+   echo "/usr/share/man/$i" >>$RPM_BUILD_DIR/filelist
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -119,7 +129,7 @@ rm -rf %{buildroot}
 /usr/share/idl
 /usr/share/info
 %dir /usr/share/locale
-/usr/share/man
+%dir /usr/share/man
 /usr/share/mime-info
 /usr/share/misc
 /usr/share/omf
@@ -150,6 +160,9 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Mon Aug 03 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.26-1
+- Do own /usr/share/man/<locale> directories (ghosted, missingok) - #220265
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dnovotny at fedoraproject.org  Mon Aug  3 08:48:09 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon,  3 Aug 2009 08:48:09 +0000 (UTC)
Subject: rpms/emacs/F-11 .cvsignore, 1.25, 1.26 emacs.spec, 1.126,
	1.127 sources, 1.27, 1.28
Message-ID: <20090803084809.6E6D211C0423@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

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

new upstream version 23.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	8 Nov 2008 08:11:23 -0000	1.25
+++ .cvsignore	3 Aug 2009 08:48:08 -0000	1.26
@@ -1 +1 @@
-emacs-22.3.tar.gz
+emacs-23.1.tar.gz


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- emacs.spec	2 Jul 2009 11:47:23 -0000	1.126
+++ emacs.spec	3 Aug 2009 08:48:09 -0000	1.127
@@ -3,8 +3,8 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
-Version: 22.3
-Release: 14%{?dist}
+Version: 23.1
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -22,25 +22,25 @@ Source13: focus-init.el
 Source14: po-mode.el
 Source15: po-mode-init.el
 Source18: default.el
-Source20: igrep.el
-Source21: igrep-init.el
 Patch0: glibc-open-macro.patch
 Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: rpm-spec-mode-utc.patch
-Patch4: emacsclient.patch
+#Patch4: emacsclient.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
+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: librsvg2-devel
+Requires: librsvg2
 %ifarch %{ix86}
 BuildRequires: setarch
 %endif
-Requires: xorg-x11-fonts-ISO8859-1-100dpi, xorg-x11-fonts-misc
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
+#Requires: xorg-x11-fonts-ISO8859-1-100dpi, xorg-x11-fonts-misc
+#Requires: xorg-x11-fonts-ISO8859-1-75dpi
 Requires: emacs-common = %{epoch}:%{version}-%{release}
-Requires: hicolor-icon-theme
+#Requires: hicolor-icon-theme
 Requires: hunspell, aspell
 # Desktop integration
 BuildRequires: desktop-file-utils
@@ -113,11 +113,11 @@ Emacs packages or see some elisp example
 %prep
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
-%patch4 -p1
+#%%patch4 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
-  cp %SOURCE7 %SOURCE9 %SOURCE10 %SOURCE14 %SOURCE20 .
+  cp %SOURCE7 %SOURCE9 %SOURCE10 %SOURCE14 .
   # rpm-spec-mode can use compilation-mode
   patch < %PATCH1
   # fix po-auto-replace-revision-date nil
@@ -132,6 +132,8 @@ cp %SOURCE1 etc/emacs.desktop
 # avoid trademark issues
 %if %{paranoid}
 rm -f lisp/play/tetris.el lisp/play/tetris.elc
+grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \
+    && mv lisp/Makefile.in.new lisp/Makefile.in
 %endif
 
 %if %{expurgate}
@@ -147,7 +149,8 @@ rm -f etc/sex.6 etc/condom.1 etc/celibac
 %build
 export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
 
-%configure --with-x-toolkit=gtk
+%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+    --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk
 
 %__make bootstrap
 %{setarch} %__make %{?_smp_mflags}
@@ -183,7 +186,7 @@ EOF
 %install
 rm -rf %{buildroot}
 
-%makeinstall
+make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
 
 # let alternatives manage the symlink
 rm %{buildroot}%{_bindir}/emacs
@@ -201,8 +204,8 @@ install -m 0755 src/emacs-%{version}.1 %
 chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
 mkdir -p %{buildroot}%{site_lisp}
-install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
-install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
+install -p -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
+install -p -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
 
 mv %{buildroot}%{_bindir}/{etags,etags.emacs}
 mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
@@ -210,37 +213,38 @@ mv %{buildroot}%{_mandir}/man1/{etags.1,
 mv %{buildroot}%{_bindir}/{ctags,gctags}
 
 # install site-lisp files
-install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
+install -p -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
 
 mkdir -p %{buildroot}%{site_lisp}/site-start.d
-install -m 0644 $RPM_SOURCE_DIR/*-init.el %{buildroot}%{site_lisp}/site-start.d
+install -p -m 0644 %SOURCE8 %SOURCE11 %SOURCE13 %SOURCE15 %{buildroot}%{site_lisp}/site-start.d
 
 # default initialization file
 mkdir -p %{buildroot}%{_sysconfdir}/skel
-install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
+install -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs
 
 # install pkgconfig file
 mkdir -p %{buildroot}/%{pkgconfig}
-install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
+install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
 # install rpm macro definition file
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-install -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
+install -p -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
 
 # after everything is installed, remove info dir
 rm -f %{buildroot}%{_infodir}/dir
 rm %{buildroot}%{_localstatedir}/games/emacs/*
 
 # install desktop file
+mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
                      %SOURCE1
 
 # put the icons where they belong
-for i in 16 24 32 48 ; do
-   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-   cp %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/emacs_${i}.png \
-      %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/emacs.png
-done
+#for i in 16 24 32 48 ; do
+#   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+#   cp %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/emacs_${i}.png \
+#      %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/emacs.png
+#done
 
 #
 # create file lists
@@ -310,14 +314,14 @@ alternatives --install %{_bindir}/emacs 
 
 %post common
 for f in %{info_files}; do
-  /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
+  /sbin/install-info %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
 done
 
 %preun common
 alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
 if [ "$1" = 0 ]; then
   for f in %{info_files}; do
-    /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
+    /sbin/install-info --delete %{_infodir}/$f %{_infodir}/dir 2> /dev/null || :
   done
 fi
 
@@ -333,6 +337,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{emacs_libexecdir}
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/icons/hicolor/*/apps/emacs.png
+%{_datadir}/icons/hicolor/*/apps/emacs22.png
+%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
+%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
 
 %files nox
 %defattr(-,root,root)
@@ -365,6 +372,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Aug 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-1
+- new upstream version 23.1
+
 * Thu Jul 02 2009 Daniel Novotny <dnovotny at redhat.com> 1:22.3-14
 - revoked default.el change (#508033)
 - added dependency: aspell (#443549)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	8 Nov 2008 08:11:23 -0000	1.27
+++ sources	3 Aug 2009 08:48:09 -0000	1.28
@@ -1 +1 @@
-aa8ba34f548cd78b35914ae5a7bb87eb  emacs-22.3.tar.gz
+a620d4452769d04ad8864d662f34f8dd  emacs-23.1.tar.gz



From twaugh at fedoraproject.org  Mon Aug  3 08:52:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 08:52:28 +0000 (UTC)
Subject: rpms/gutenprint/F-11 gutenprint.spec,1.52,1.53
Message-ID: <20090803085228.AF36F11C02C6@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	gutenprint.spec 
Log Message:
* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
- Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.



Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-11/gutenprint.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gutenprint.spec	31 Jul 2009 16:41:26 -0000	1.52
+++ gutenprint.spec	3 Aug 2009 08:52:28 -0000	1.53
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,13 +254,16 @@ exit 0
 %post foomatic
 /bin/rm -f /var/cache/foomatic/*
 if [ $1 -eq 2 ]; then
-  %{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+  %{_sbindir}/gutenprint-foomaticppdupdate %{version} >/dev/null 2>&1 || :
 fi
 
 %postun foomatic
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
+- Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.
+
 * Fri Jul 31 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-2
 - 5.2.4.  Re-enabled compiler optimization for ppc64.
 



From twaugh at fedoraproject.org  Mon Aug  3 08:53:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 08:53:17 +0000 (UTC)
Subject: rpms/gutenprint/F-10 gutenprint.spec,1.46,1.47
Message-ID: <20090803085317.6BCF711C02C6@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	gutenprint.spec 
Log Message:
* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-2
- Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.



Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gutenprint.spec	31 Jul 2009 17:19:40 -0000	1.46
+++ gutenprint.spec	3 Aug 2009 08:53:17 -0000	1.47
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,13 +254,16 @@ exit 0
 %post foomatic
 /bin/rm -f /var/cache/foomatic/*
 if [ $1 -eq 2 ]; then
-  %{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+  %{_sbindir}/gutenprint-foomaticppdupdate %{version} >/dev/null 2>&1 || :
 fi
 
 %postun foomatic
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-2
+- Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.
+
 * Fri Jul 31 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-1
 - 5.2.4.  Re-enabled compiler optimization for ppc64.
 



From ellert at fedoraproject.org  Mon Aug  3 09:20:29 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon,  3 Aug 2009 09:20:29 +0000 (UTC)
Subject: rpms/globus-xio/devel .cvsignore, 1.2, 1.3 globus-xio-bad-age.patch,
	1.1, 1.2 globus-xio.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090803092029.43E5811C049D@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7678/devel

Modified Files:
	.cvsignore globus-xio-bad-age.patch globus-xio.spec import.log 
	sources 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
- Update to upstream update release 2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Apr 2009 09:27:49 -0000	1.2
+++ .cvsignore	3 Aug 2009 09:20:27 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_xio-2.7.tar.gz
+globus_xio-2.8.tar.gz

globus-xio-bad-age.patch:
 pkg_data_src.gpt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: globus-xio-bad-age.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/globus-xio-bad-age.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-bad-age.patch	22 Apr 2009 09:27:50 -0000	1.1
+++ globus-xio-bad-age.patch	3 Aug 2009 09:20:27 -0000	1.2
@@ -5,8 +5,8 @@ diff -ur globus_xio-2.7.orig/pkgdata/pkg
  
  <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
  
--  <Aging_Version Age="5" Major="2" Minor="7" />
-+  <Aging_Version Age="2" Major="2" Minor="7" />
+-  <Aging_Version Age="5" Major="2" Minor="8" />
++  <Aging_Version Age="2" Major="2" Minor="8" />
    <Description >Globus XIO Framework</Description>
    <Functional_Group >Communication</Functional_Group>
    <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />


Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/globus-xio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-xio.spec	25 Jul 2009 07:44:44 -0000	1.4
+++ globus-xio.spec	3 Aug 2009 09:20:27 -0000	1.5
@@ -6,20 +6,14 @@
 
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
-Version:	2.7
-Release:	5%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
-#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
@@ -180,10 +174,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
 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
@@ -202,8 +192,6 @@ 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
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -211,9 +199,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
+- Update to upstream update release 2.8
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 17:54:03 -0000	1.3
+++ import.log	3 Aug 2009 09:20:27 -0000	1.4
@@ -1,3 +1,4 @@
 globus-xio-2_7-2_fc9:HEAD:globus-xio-2.7-2.fc9.src.rpm:1240392400
 globus-xio-2_7-3_fc9:HEAD:globus-xio-2.7-3.fc9.src.rpm:1240867509
 globus-xio-2_7-4_fc9:HEAD:globus-xio-2.7-4.fc9.src.rpm:1245088422
+globus-xio-2_8-1_fc11:HEAD:globus-xio-2.8-1.fc11.src.rpm:1249291163


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Apr 2009 09:27:50 -0000	1.2
+++ sources	3 Aug 2009 09:20:27 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz
+f7ab57f512f542c23a6425b2ede1050d  globus_xio-2.8.tar.gz



From ellert at fedoraproject.org  Mon Aug  3 09:21:30 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon,  3 Aug 2009 09:21:30 +0000 (UTC)
Subject: rpms/globus-xio/F-11 .cvsignore, 1.2, 1.3 globus-xio-bad-age.patch, 
	1.1, 1.2 globus-xio.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090803092130.1472611C02C6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8217/F-11

Modified Files:
	.cvsignore globus-xio-bad-age.patch globus-xio.spec import.log 
	sources 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
- Update to upstream update release 2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Apr 2009 09:35:35 -0000	1.2
+++ .cvsignore	3 Aug 2009 09:21:29 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_xio-2.7.tar.gz
+globus_xio-2.8.tar.gz

globus-xio-bad-age.patch:
 pkg_data_src.gpt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: globus-xio-bad-age.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/globus-xio-bad-age.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-bad-age.patch	22 Apr 2009 09:35:35 -0000	1.1
+++ globus-xio-bad-age.patch	3 Aug 2009 09:21:29 -0000	1.2
@@ -5,8 +5,8 @@ diff -ur globus_xio-2.7.orig/pkgdata/pkg
  
  <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
  
--  <Aging_Version Age="5" Major="2" Minor="7" />
-+  <Aging_Version Age="2" Major="2" Minor="7" />
+-  <Aging_Version Age="5" Major="2" Minor="8" />
++  <Aging_Version Age="2" Major="2" Minor="8" />
    <Description >Globus XIO Framework</Description>
    <Functional_Group >Communication</Functional_Group>
    <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />


Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/globus-xio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-xio.spec	25 Jul 2009 07:44:53 -0000	1.4
+++ globus-xio.spec	3 Aug 2009 09:21:29 -0000	1.5
@@ -6,20 +6,14 @@
 
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
-Version:	2.7
-Release:	5%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
-#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
@@ -180,10 +174,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
 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
@@ -202,8 +192,6 @@ 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
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -211,9 +199,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
+- Update to upstream update release 2.8
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 17:57:51 -0000	1.3
+++ import.log	3 Aug 2009 09:21:29 -0000	1.4
@@ -1,3 +1,4 @@
 globus-xio-2_7-2_fc9:F-11:globus-xio-2.7-2.fc9.src.rpm:1240392872
 globus-xio-2_7-3_fc9:F-11:globus-xio-2.7-3.fc9.src.rpm:1240867856
 globus-xio-2_7-4_fc9:F-11:globus-xio-2.7-4.fc9.src.rpm:1245088651
+globus-xio-2_8-1_fc11:F-11:globus-xio-2.8-1.fc11.src.rpm:1249291262


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Apr 2009 09:35:35 -0000	1.2
+++ sources	3 Aug 2009 09:21:29 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz
+f7ab57f512f542c23a6425b2ede1050d  globus_xio-2.8.tar.gz



From ellert at fedoraproject.org  Mon Aug  3 09:22:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon,  3 Aug 2009 09:22:27 +0000 (UTC)
Subject: rpms/globus-xio/F-10 .cvsignore, 1.2, 1.3 globus-xio-bad-age.patch, 
	1.1, 1.2 globus-xio.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090803092227.8334F11C02C6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8592/F-10

Modified Files:
	.cvsignore globus-xio-bad-age.patch globus-xio.spec import.log 
	sources 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
- Update to upstream update release 2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Apr 2009 09:32:56 -0000	1.2
+++ .cvsignore	3 Aug 2009 09:22:27 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_xio-2.7.tar.gz
+globus_xio-2.8.tar.gz

globus-xio-bad-age.patch:
 pkg_data_src.gpt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: globus-xio-bad-age.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/globus-xio-bad-age.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-bad-age.patch	22 Apr 2009 09:32:56 -0000	1.1
+++ globus-xio-bad-age.patch	3 Aug 2009 09:22:27 -0000	1.2
@@ -5,8 +5,8 @@ diff -ur globus_xio-2.7.orig/pkgdata/pkg
  
  <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
  
--  <Aging_Version Age="5" Major="2" Minor="7" />
-+  <Aging_Version Age="2" Major="2" Minor="7" />
+-  <Aging_Version Age="5" Major="2" Minor="8" />
++  <Aging_Version Age="2" Major="2" Minor="8" />
    <Description >Globus XIO Framework</Description>
    <Functional_Group >Communication</Functional_Group>
    <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />


Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/globus-xio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-xio.spec	25 Jul 2009 07:45:02 -0000	1.4
+++ globus-xio.spec	3 Aug 2009 09:22:27 -0000	1.5
@@ -6,20 +6,14 @@
 
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
-Version:	2.7
-Release:	5%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
-#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
@@ -180,10 +174,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
 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
@@ -202,8 +192,6 @@ 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
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -211,9 +199,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
+- Update to upstream update release 2.8
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 17:56:37 -0000	1.3
+++ import.log	3 Aug 2009 09:22:27 -0000	1.4
@@ -1,3 +1,4 @@
 globus-xio-2_7-2_fc9:F-10:globus-xio-2.7-2.fc9.src.rpm:1240392699
 globus-xio-2_7-3_fc9:F-10:globus-xio-2.7-3.fc9.src.rpm:1240867733
 globus-xio-2_7-4_fc9:F-10:globus-xio-2.7-4.fc9.src.rpm:1245088574
+globus-xio-2_8-1_fc11:F-10:globus-xio-2.8-1.fc11.src.rpm:1249291320


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Apr 2009 09:32:56 -0000	1.2
+++ sources	3 Aug 2009 09:22:27 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz
+f7ab57f512f542c23a6425b2ede1050d  globus_xio-2.8.tar.gz



From ellert at fedoraproject.org  Mon Aug  3 09:23:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon,  3 Aug 2009 09:23:59 +0000 (UTC)
Subject: rpms/globus-xio/EL-4 .cvsignore, 1.2, 1.3 globus-xio-bad-age.patch, 
	1.1, 1.2 globus-xio.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090803092359.E853B11C02C6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9080/EL-4

Modified Files:
	.cvsignore globus-xio-bad-age.patch globus-xio.spec import.log 
	sources 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
- Update to upstream update release 2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Apr 2009 09:39:05 -0000	1.2
+++ .cvsignore	3 Aug 2009 09:23:59 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_xio-2.7.tar.gz
+globus_xio-2.8.tar.gz

globus-xio-bad-age.patch:
 pkg_data_src.gpt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: globus-xio-bad-age.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/globus-xio-bad-age.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-bad-age.patch	22 Apr 2009 09:39:06 -0000	1.1
+++ globus-xio-bad-age.patch	3 Aug 2009 09:23:59 -0000	1.2
@@ -5,8 +5,8 @@ diff -ur globus_xio-2.7.orig/pkgdata/pkg
  
  <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
  
--  <Aging_Version Age="5" Major="2" Minor="7" />
-+  <Aging_Version Age="2" Major="2" Minor="7" />
+-  <Aging_Version Age="5" Major="2" Minor="8" />
++  <Aging_Version Age="2" Major="2" Minor="8" />
    <Description >Globus XIO Framework</Description>
    <Functional_Group >Communication</Functional_Group>
    <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />


Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/globus-xio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-xio.spec	25 Jul 2009 07:45:19 -0000	1.4
+++ globus-xio.spec	3 Aug 2009 09:23:59 -0000	1.5
@@ -6,20 +6,14 @@
 
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
-Version:	2.7
-Release:	5%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
-#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
@@ -180,10 +174,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
 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
@@ -202,8 +192,6 @@ 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
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -211,9 +199,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
+- Update to upstream update release 2.8
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 17:59:06 -0000	1.3
+++ import.log	3 Aug 2009 09:23:59 -0000	1.4
@@ -1,3 +1,4 @@
 globus-xio-2_7-2_fc9:EL-4:globus-xio-2.7-2.fc9.src.rpm:1240393052
 globus-xio-2_7-3_fc9:EL-4:globus-xio-2.7-3.fc9.src.rpm:1240867946
 globus-xio-2_7-4_fc9:EL-4:globus-xio-2.7-4.fc9.src.rpm:1245088726
+globus-xio-2_8-1_fc11:EL-4:globus-xio-2.8-1.fc11.src.rpm:1249291409


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Apr 2009 09:39:06 -0000	1.2
+++ sources	3 Aug 2009 09:23:59 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz
+f7ab57f512f542c23a6425b2ede1050d  globus_xio-2.8.tar.gz



From ellert at fedoraproject.org  Mon Aug  3 09:25:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon,  3 Aug 2009 09:25:15 +0000 (UTC)
Subject: rpms/globus-xio/EL-5 .cvsignore, 1.2, 1.3 globus-xio-bad-age.patch, 
	1.1, 1.2 globus-xio.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090803092515.A9F4C11C02C6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9540/EL-5

Modified Files:
	.cvsignore globus-xio-bad-age.patch globus-xio.spec import.log 
	sources 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
- Update to upstream update release 2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Apr 2009 09:41:53 -0000	1.2
+++ .cvsignore	3 Aug 2009 09:25:15 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_xio-2.7.tar.gz
+globus_xio-2.8.tar.gz

globus-xio-bad-age.patch:
 pkg_data_src.gpt.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: globus-xio-bad-age.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/globus-xio-bad-age.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-bad-age.patch	22 Apr 2009 09:41:53 -0000	1.1
+++ globus-xio-bad-age.patch	3 Aug 2009 09:25:15 -0000	1.2
@@ -5,8 +5,8 @@ diff -ur globus_xio-2.7.orig/pkgdata/pkg
  
  <gpt_package_metadata Format_Version="0.02" Name="globus_xio" >
  
--  <Aging_Version Age="5" Major="2" Minor="7" />
-+  <Aging_Version Age="2" Major="2" Minor="7" />
+-  <Aging_Version Age="5" Major="2" Minor="8" />
++  <Aging_Version Age="2" Major="2" Minor="8" />
    <Description >Globus XIO Framework</Description>
    <Functional_Group >Communication</Functional_Group>
    <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />


Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/globus-xio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-xio.spec	25 Jul 2009 07:45:10 -0000	1.4
+++ globus-xio.spec	3 Aug 2009 09:25:15 -0000	1.5
@@ -6,20 +6,14 @@
 
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
-Version:	2.7
-Release:	5%{?dist}
+Version:	2.8
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/xio/src globus_xio-2.7
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7
-#		tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
@@ -180,10 +174,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
 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
@@ -202,8 +192,6 @@ 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
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -211,9 +199,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
+- Update to upstream update release 2.8
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 18:00:26 -0000	1.3
+++ import.log	3 Aug 2009 09:25:15 -0000	1.4
@@ -1,3 +1,4 @@
 globus-xio-2_7-2_fc9:EL-5:globus-xio-2.7-2.fc9.src.rpm:1240393234
 globus-xio-2_7-3_fc9:EL-5:globus-xio-2.7-3.fc9.src.rpm:1240868029
 globus-xio-2_7-4_fc9:EL-5:globus-xio-2.7-4.fc9.src.rpm:1245088804
+globus-xio-2_8-1_fc11:EL-5:globus-xio-2.8-1.fc11.src.rpm:1249291483


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Apr 2009 09:41:53 -0000	1.2
+++ sources	3 Aug 2009 09:25:15 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-fd1405eac3f3314dfd8f23359d1413c8  globus_xio-2.7.tar.gz
+f7ab57f512f542c23a6425b2ede1050d  globus_xio-2.8.tar.gz



From than at fedoraproject.org  Mon Aug  3 09:29:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  3 Aug 2009 09:29:43 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.260,
	1.261 sources, 1.43, 1.44
Message-ID: <20090803092943.A2C2111C02C6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebase-workspace.spec sources 
Log Message:
respin



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- kdebase-workspace.spec	3 Aug 2009 04:46:19 -0000	1.260
+++ kdebase-workspace.spec	3 Aug 2009 09:29:42 -0000	1.261
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -515,6 +515,9 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-4
+- respin
+
 * Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
 - show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	31 Jul 2009 08:04:12 -0000	1.43
+++ sources	3 Aug 2009 09:29:43 -0000	1.44
@@ -1 +1 @@
-3d554558eb4187716172f60c8b97bd64  kdebase-workspace-4.3.0.tar.bz2
+d7c50d0adb60069c2bab8cc8902bfd59  kdebase-workspace-4.3.0.tar.bz2



From jwrdegoede at fedoraproject.org  Mon Aug  3 09:41:43 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  3 Aug 2009 09:41:43 +0000 (UTC)
Subject: rpms/lesstif/devel lesstif-0.95.2-motif-config.patch,NONE,1.1
Message-ID: <20090803094143.BE10C11C02C6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Added Files:
	lesstif-0.95.2-motif-config.patch 
Log Message:
* Tue Jul 28 2009 Hans de Goede <hdegoede at redhat.com> 0.95.2-1
- New upstream release 0.95.2


lesstif-0.95.2-motif-config.patch:
 motif-config.in |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE lesstif-0.95.2-motif-config.patch ---
diff -up lesstif-0.95.2/scripts/motif-config.in.motif-config lesstif-0.95.2/scripts/motif-config.in
--- lesstif-0.95.2/scripts/motif-config.in.motif-config	2005-01-14 20:36:00.000000000 +0100
+++ lesstif-0.95.2/scripts/motif-config.in	2009-07-28 11:39:51.000000000 +0200
@@ -2,14 +2,14 @@
 #
 # $Header: /cvsroot/lesstif/lesstif/scripts/motif-config.in,v 1.2 2005/01/14 19:36:00 dannybackx Exp $
 #
-L="@prefix@"
 XC="@X_CFLAGS@"
-XL="@X_LIBS@"
-XR="@XRENDER_LIBS@"
+X_PRE_LIBS="@X_PRE_LIBS@"
+X_EXTRA_LIBS="@X_EXTRA_LIBS@"
 V="@PACKAGE_NAME@ @PACKAGE_VERSION@"
 
-prefix=$L
-exec_prefix=$L
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+includedir="@includedir@"
 exec_prefix_set=no
 
 usage()
@@ -80,10 +80,10 @@ if test "$echo_exec_prefix" = "yes"; the
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo "-I$L/include $XC"
+      echo "-I$includedir $XC"
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo "-L$L/lib -L/usr/X11R6/lib -lXm -lXt $my_glib_libs $XR -lXext -lX11"
+      echo "-lXm -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} `freetype-config --libs`"
 fi      
 



From jwrdegoede at fedoraproject.org  Mon Aug  3 09:44:19 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  3 Aug 2009 09:44:19 +0000 (UTC)
Subject: rpms/lesstif/devel lesstif.spec,1.28,1.29
Message-ID: <20090803094419.6E9DE11C02C6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	lesstif.spec 
Log Message:
* Tue Jul 28 2009 Hans de Goede <hdegoede at redhat.com> 0.95.2-1
- New upstream release 0.95.2



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- lesstif.spec	28 Jul 2009 12:00:22 -0000	1.28
+++ lesstif.spec	3 Aug 2009 09:44:19 -0000	1.29
@@ -133,8 +133,6 @@ chmod a-x COPYING* doc/www.lesstif.org/B
 # the x libs and includes are empty in the default case, but we need to 
 # have a non empty include defined (for a substitution in mwm)
 
-#  --enable-production \
-#  --disable-debug \
 
 # --enable-production is needed in order to avoid 
 # http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4124
@@ -142,6 +140,8 @@ chmod a-x COPYING* doc/www.lesstif.org/B
   --enable-shared \
   --disable-static \
   --with-xdnd \
+  --enable-production \
+  --disable-debug \
   --x-includes=%{_includedir} \
   --x-libraries=%{_libdir}
 



From cwickert at fedoraproject.org  Mon Aug  3 10:00:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  3 Aug 2009 10:00:32 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire/devel gnome-applet-cpufire.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803100033.0735711C0417@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-cpufire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19954/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-cpufire.spec import.log 
Log Message:
Initial import of gnome-applet-cpufire. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=513797



--- NEW FILE gnome-applet-cpufire.spec ---
%global srcname cpufire_applet

Name:           gnome-applet-cpufire
Version:        1.6
Release:        2%{?dist}
Summary:        GNOME panel applet showing the CPU load as a fire

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://strongm.ath.cx/
Source0:        http://strongm.ath.cx/projects/cpufire/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-panel-devel >= 2.6, libgtop2-devel, libgnomeui-devel
BuildRequires:  gettext
BuildRequires:  intltool
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-doc-utils
BuildRequires:  scrollkeeper
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

Requires:       gnome-panel, gnome-system-monitor
Provides:       cpufire-applet = %{version}

%description
A CPU load monitor, that comes as a gnome panel applet. CPU load is displayed
as a beautiful fire, the higher the flames the higher the CPU load.

%prep
%setup -qn %{srcname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
%find_lang %{srcname}-1.0


%clean
rm -rf %{buildroot}


%post
scrollkeeper-update -q -o %{_datadir}/omf/cpufire || :


%postun
scrollkeeper-update -q || :


%files -f %{srcname}-1.0.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/cpufire_applet
%{_libdir}/bonobo/servers/GNOME_CPUFireApplet.server
%{_datadir}/gnome-2.0/ui/GNOME_CPUFireApplet.xml
%{_datadir}/cpufire-applet/
%doc %{_datadir}/gnome/help/cpufire/
%{_datadir}/omf/cpufire/


%changelog
* Sun Jul 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6-2
- Own %%{_datadir}/omf/cpufire/
- minor specfile clean ups from the review (#513797)

* Sun Jul 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6-1
- Update to 1.6, fixed a bug introduced in 1.5

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-1
- Update to 1.5

* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4-1
- Update to 1.4

* Thu May 03 2007 Christoph Wickert <wickerpms at arcor.de> - 1.3-1
- Upadte to 1.3

* Tue Jul 18 2006 Christoph Wickert <wickerpms at arcor.de> - 1.2-1
- Upadte to 1.2

* Mon Sep 19 2005 Christoph Wickert <wickerpms at arcor.de> - 1.1-1
- Initial package for Fedora Extras.


--- NEW FILE import.log ---
gnome-applet-cpufire-1_6-2_fc11:HEAD:gnome-applet-cpufire-1.6-2.fc11.src.rpm:1249293562


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:29:57 -0000	1.1
+++ .cvsignore	3 Aug 2009 10:00:31 -0000	1.2
@@ -0,0 +1 @@
+cpufire_applet-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:29:57 -0000	1.1
+++ sources	3 Aug 2009 10:00:31 -0000	1.2
@@ -0,0 +1 @@
+5837d2abf7eabd1e4985817efccf4bb4  cpufire_applet-1.6.tar.gz



From twaugh at fedoraproject.org  Mon Aug  3 10:05:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 10:05:45 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript.spec,1.190,1.191
Message-ID: <20090803100545.DFD3511C02C6@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	ghostscript.spec 
Log Message:
* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 8.64-12
- Converted spec file to UTF-8.



Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- ghostscript.spec	30 Jul 2009 13:49:52 -0000	1.190
+++ ghostscript.spec	3 Aug 2009 10:05:45 -0000	1.191
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and re
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -312,6 +312,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 8.64-12
+- 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 +1056,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
 



From mmahut at fedoraproject.org  Mon Aug  3 10:06:32 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Mon,  3 Aug 2009 10:06:32 +0000 (UTC)
Subject: rpms/astronomy-bookmarks/devel astronomy-bookmarks.spec, 1.3,
	1.4 default-bookmarks.html, 1.1, 1.2
Message-ID: <20090803100633.0749311C02C6@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/astronomy-bookmarks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21804

Modified Files:
	astronomy-bookmarks.spec default-bookmarks.html 
Log Message:
RHBZ#480513: typo in astronomy's bookmarks.html



Index: astronomy-bookmarks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-bookmarks/devel/astronomy-bookmarks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- astronomy-bookmarks.spec	24 Jul 2009 17:25:37 -0000	1.3
+++ astronomy-bookmarks.spec	3 Aug 2009 10:06:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           astronomy-bookmarks
 Version:        1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fedora astronomy bookmarks
 Group:          Applications/Internet
 License:        GFDL
@@ -31,6 +31,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/bookmarks/default-bookmarks.html
 
 %changelog
+* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 1-6
+- RHBZ#480513: typo in astronomy's bookmarks.html
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: default-bookmarks.html
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-bookmarks/devel/default-bookmarks.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- default-bookmarks.html	7 Mar 2008 10:52:21 -0000	1.1
+++ default-bookmarks.html	3 Aug 2009 10:06:32 -0000	1.2
@@ -30,7 +30,7 @@
         </DL><p>
         <DT><H3 ADD_DATE="1202665939" LAST_MODIFIED="1202665965" ID="rdf:#$O2JaF1">Discussions</H3>
         <DL><p>
-            <DT><A HREF="http://www.cloudynights.com/ubbthreads/ubbthreads.php" ADD_DATE="1202665965" LAST_VISIT="1202666073" LAST_MODIFIED="1202665977" LAST_CHARSET="ISO-8859-1" ID="rdf:#$P2JaF1">Couldy Night forum</A>
+            <DT><A HREF="http://www.cloudynights.com/ubbthreads/ubbthreads.php" ADD_DATE="1202665965" LAST_VISIT="1202666073" LAST_MODIFIED="1202665977" LAST_CHARSET="ISO-8859-1" ID="rdf:#$P2JaF1">Cloudy Nights forum</A>
         </DL><p>
         <DT><H3 ADD_DATE="1202665982" LAST_MODIFIED="1202666037" ID="rdf:#$Q2JaF1">Observation</H3>
         <DL><p>



From cwickert at fedoraproject.org  Mon Aug  3 10:09:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  3 Aug 2009 10:09:29 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire/devel gnome-applet-cpufire.spec,1.1,1.2
Message-ID: <20090803100929.C731F11C02C6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-cpufire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22620

Modified Files:
	gnome-applet-cpufire.spec 
Log Message:
final review fixes, add review URL


Index: gnome-applet-cpufire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/devel/gnome-applet-cpufire.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-applet-cpufire.spec	3 Aug 2009 10:00:31 -0000	1.1
+++ gnome-applet-cpufire.spec	3 Aug 2009 10:09:29 -0000	1.2
@@ -1,3 +1,5 @@
+# reviewed at https://bugzilla.redhat.com/show_bug.cgi?id=513797
+
 %global srcname cpufire_applet
 
 Name:           gnome-applet-cpufire
@@ -11,7 +13,8 @@ URL:            http://strongm.ath.cx/
 Source0:        http://strongm.ath.cx/projects/cpufire/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel >= 2.6, libgtop2-devel, libgnomeui-devel
+BuildRequires:  gnome-panel-devel >= 2.6
+BuildRequires:  libgtop2-devel
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  perl(XML::Parser)



From mmahut at fedoraproject.org  Mon Aug  3 10:14:54 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Mon,  3 Aug 2009 10:14:54 +0000 (UTC)
Subject: rpms/irssi/devel .cvsignore, 1.10, 1.11 irssi.spec, 1.40,
	1.41 sources, 1.10, 1.11 irssi-CVE-2009-1959.patch, 1.1, NONE
Message-ID: <20090803101454.498B211C02C6@cvs1.fedora.phx.redhat.com>

Author: mmahut

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

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	irssi-CVE-2009-1959.patch 
Log Message:
Upstream release 0.8.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 May 2009 19:47:41 -0000	1.10
+++ .cvsignore	3 Aug 2009 10:14:53 -0000	1.11
@@ -1 +1 @@
-irssi-0.8.13.tar.gz
+irssi-0.8.14.tar.gz


Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- irssi.spec	25 Jul 2009 03:37:44 -0000	1.40
+++ irssi.spec	3 Aug 2009 10:14:54 -0000	1.41
@@ -2,15 +2,14 @@
 
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
-Version:	0.8.13
-Release:	3%{?dist}
+Version:	0.8.14
+Release:	1%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://irssi.org/
 Source0:	http://irssi.org/files/irssi-%{version}.tar.gz
 Source1:	irssi-config.h
-Patch0:		irssi-CVE-2009-1959.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig glib2-devel perl-devel perl(ExtUtils::Embed)
@@ -36,7 +35,7 @@ being maintained.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+
 %build
 %configure --enable-ipv6 --with-textui	\
 	--with-proxy			\
@@ -85,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.14-1
+- Upstream release 0.8.14
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 May 2009 19:47:41 -0000	1.10
+++ sources	3 Aug 2009 10:14:54 -0000	1.11
@@ -1 +1 @@
-226f194576895ff3075c164523806d06  irssi-0.8.13.tar.gz
+7d9437f53209a61af4fe4c9c5528ffa7  irssi-0.8.14.tar.gz


--- irssi-CVE-2009-1959.patch DELETED ---



From mmahut at fedoraproject.org  Mon Aug  3 10:15:57 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Mon,  3 Aug 2009 10:15:57 +0000 (UTC)
Subject: rpms/astronomy-bookmarks/F-11 astronomy-bookmarks.spec, 1.2,
	1.3 default-bookmarks.html, 1.1, 1.2
Message-ID: <20090803101557.8F30711C02C6@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/astronomy-bookmarks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24444

Modified Files:
	astronomy-bookmarks.spec default-bookmarks.html 
Log Message:
RHBZ#480513: typo in astronomy's bookmarks.html



Index: astronomy-bookmarks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-bookmarks/F-11/astronomy-bookmarks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- astronomy-bookmarks.spec	24 Feb 2009 02:46:34 -0000	1.2
+++ astronomy-bookmarks.spec	3 Aug 2009 10:15:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           astronomy-bookmarks
 Version:        1
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Fedora astronomy bookmarks
 Group:          Applications/Internet
 License:        GFDL
@@ -31,6 +31,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/bookmarks/default-bookmarks.html
 
 %changelog
+* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 1-6
+- RHBZ#480513: typo in astronomy's bookmarks.html
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1-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-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: default-bookmarks.html
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-bookmarks/F-11/default-bookmarks.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- default-bookmarks.html	7 Mar 2008 10:52:21 -0000	1.1
+++ default-bookmarks.html	3 Aug 2009 10:15:57 -0000	1.2
@@ -30,7 +30,7 @@
         </DL><p>
         <DT><H3 ADD_DATE="1202665939" LAST_MODIFIED="1202665965" ID="rdf:#$O2JaF1">Discussions</H3>
         <DL><p>
-            <DT><A HREF="http://www.cloudynights.com/ubbthreads/ubbthreads.php" ADD_DATE="1202665965" LAST_VISIT="1202666073" LAST_MODIFIED="1202665977" LAST_CHARSET="ISO-8859-1" ID="rdf:#$P2JaF1">Couldy Night forum</A>
+            <DT><A HREF="http://www.cloudynights.com/ubbthreads/ubbthreads.php" ADD_DATE="1202665965" LAST_VISIT="1202666073" LAST_MODIFIED="1202665977" LAST_CHARSET="ISO-8859-1" ID="rdf:#$P2JaF1">Cloudy Nights forum</A>
         </DL><p>
         <DT><H3 ADD_DATE="1202665982" LAST_MODIFIED="1202666037" ID="rdf:#$Q2JaF1">Observation</H3>
         <DL><p>



From mmahut at fedoraproject.org  Mon Aug  3 10:16:41 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Mon,  3 Aug 2009 10:16:41 +0000 (UTC)
Subject: rpms/astronomy-bookmarks/F-11 astronomy-bookmarks.spec,1.3,1.4
Message-ID: <20090803101641.CCA7F11C02C6@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/astronomy-bookmarks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24613

Modified Files:
	astronomy-bookmarks.spec 
Log Message:
this spec is for F11



Index: astronomy-bookmarks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astronomy-bookmarks/F-11/astronomy-bookmarks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- astronomy-bookmarks.spec	3 Aug 2009 10:15:57 -0000	1.3
+++ astronomy-bookmarks.spec	3 Aug 2009 10:16:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           astronomy-bookmarks
 Version:        1
-Release:        6%{?dist}
+Release:        5%{?dist}
 Summary:        Fedora astronomy bookmarks
 Group:          Applications/Internet
 License:        GFDL
@@ -31,12 +31,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/bookmarks/default-bookmarks.html
 
 %changelog
-* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 1-6
+* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 1-5
 - RHBZ#480513: typo in astronomy's bookmarks.html
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1-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-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From than at fedoraproject.org  Mon Aug  3 10:21:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  3 Aug 2009 10:21:59 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.229, 1.230 sources, 1.68,
	1.69 kdebindings-4.3.0-kdebug#198632.patch, 1.1, NONE
Message-ID: <20090803102159.469FA11C02C6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec sources 
Removed Files:
	kdebindings-4.3.0-kdebug#198632.patch 
Log Message:
respin



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- kdebindings.spec	2 Aug 2009 02:00:58 -0000	1.229
+++ kdebindings.spec	3 Aug 2009 10:21:58 -0000	1.230
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -257,7 +257,6 @@ Falcon plugin for the Kross archtecture 
 %patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
-%patch100 -p1 -b .kdebug#198632
 
 
 %build
@@ -507,6 +506,9 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
+- respin
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - workaround pykdeuic4 upgrade brokenness (introduced in 4.2.98)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	29 Jul 2009 22:37:44 -0000	1.68
+++ sources	3 Aug 2009 10:21:58 -0000	1.69
@@ -1 +0,0 @@
-1b6cd0a20586eea0161e782be9c16326  kdebindings-4.3.0.tar.bz2


--- kdebindings-4.3.0-kdebug#198632.patch DELETED ---



From than at fedoraproject.org  Mon Aug  3 10:25:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  3 Aug 2009 10:25:30 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.230,1.231
Message-ID: <20090803102530.DB5FE11C02C6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec 
Log Message:
drop patch that is included in upstream



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- kdebindings.spec	3 Aug 2009 10:21:58 -0000	1.230
+++ kdebindings.spec	3 Aug 2009 10:25:30 -0000	1.231
@@ -50,7 +50,6 @@ Patch1:  kdebindings-4.2.85-old-PyQt4.pa
 Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
 
 ## upstream patches
-Patch100: kdebindings-4.3.0-kdebug#198632.patch
 
 
 BuildRequires:  akonadi-devel >= 1.1.0



From hadess at fedoraproject.org  Mon Aug  3 10:26:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  3 Aug 2009 10:26:35 +0000 (UTC)
Subject: rpms/bluez/F-11 bluetooth.init, 1.2, 1.3 bluez.spec, 1.66,
	1.67 bluetooth.conf, 1.1, NONE
Message-ID: <20090803102635.CB41411C02C6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	bluetooth.init bluez.spec 
Removed Files:
	bluetooth.conf 
Log Message:
* Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-2
- Let udev rules handle hid2hci (#514698)



Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluetooth.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bluetooth.init	12 Sep 2008 09:34:05 -0000	1.2
+++ bluetooth.init	3 Aug 2009 10:26:35 -0000	1.3
@@ -22,7 +22,6 @@ start()
 	daemon /usr/sbin/bluetoothd
 	RETVAL=$?
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/bluetoothd
-	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
 	touch /var/lock/subsys/bluetooth
 	echo ""
 	return $RETVAL
@@ -31,7 +30,6 @@ start()
 stop()
 {
 	echo -n "Stopping Bluetooth services:"
-	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
 	killproc bluetoothd
 	RETVAL=$?
 	rm -f /var/lock/subsys/bluetooth


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- bluez.spec	25 Jun 2009 16:55:17 -0000	1.66
+++ bluez.spec	3 Aug 2009 10:26:35 -0000	1.67
@@ -1,13 +1,12 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
-Source2: bluetooth.conf
-Source3: bluez-uinput.modules
+Source2: bluez-uinput.modules
 Patch1: bluez-utils-oui-usage.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=450081
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
@@ -124,7 +123,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la			
 	$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
 
 install -D -m0755 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bluetooth
-install -D -m0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bluetooth
 
 # Remove the cups backend from libdir, and install it in /usr/lib whatever the install
 if test -d ${RPM_BUILD_ROOT}/usr/lib64/cups ; then
@@ -132,12 +130,10 @@ if test -d ${RPM_BUILD_ROOT}/usr/lib64/c
 	rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups
 fi
 
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/udev/bluetooth-hid2hci.rules
-
 install -D -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
 install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial
 
-install -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
+install -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
 install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth
 
@@ -169,13 +165,14 @@ fi
 %{_mandir}/man8/*
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %{_libdir}/bluetooth/
 /lib/udev/bluetooth_serial
 %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
+%{_sysconfdir}/udev/bluetooth-hid2hci.rules
 /etc/rc.d/init.d/*
 %{_localstatedir}/lib/bluetooth
+%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
 %files libs
 %defattr(-, root, root)
@@ -203,6 +200,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-2
+- Let udev rules handle hid2hci (#514698)
+
 * Wed Jun 24 2009 Bastien Nocera <bnocera at redhat.com> 4.42-1
 - Update to 4.42
 


--- bluetooth.conf DELETED ---



From than at fedoraproject.org  Mon Aug  3 10:30:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  3 Aug 2009 10:30:04 +0000 (UTC)
Subject: rpms/kdebindings/devel sources,1.69,1.70
Message-ID: <20090803103004.61FA111C04D1@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	sources 
Log Message:
uploas file



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	3 Aug 2009 10:21:58 -0000	1.69
+++ sources	3 Aug 2009 10:30:04 -0000	1.70
@@ -0,0 +1 @@
+6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2



From twaugh at fedoraproject.org  Mon Aug  3 10:34:18 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 10:34:18 +0000 (UTC)
Subject: rpms/ghostscript/F-11 ghostscript.spec,1.191,1.192
Message-ID: <20090803103418.200C011C02C6@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	ghostscript.spec 
Log Message:
* 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.



Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-11/ghostscript.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- ghostscript.spec	30 Jul 2009 13:33:24 -0000	1.191
+++ ghostscript.spec	3 Aug 2009 10:34:17 -0000	1.192
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and re
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -279,7 +279,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 +293,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 +312,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* 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 +1057,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
 



From mmahut at fedoraproject.org  Mon Aug  3 10:34:58 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Mon,  3 Aug 2009 10:34:58 +0000 (UTC)
Subject: rpms/irssi/F-11 irssi.spec, 1.39, 1.40 sources, 1.10,
	1.11 irssi-0.8.12-multiarch.patch, 1.1,
	NONE irssi-CVE-2009-1959.patch, 1.1, NONE
Message-ID: <20090803103458.0F0EF11C02C6@cvs1.fedora.phx.redhat.com>

Author: mmahut

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

Modified Files:
	irssi.spec sources 
Removed Files:
	irssi-0.8.12-multiarch.patch irssi-CVE-2009-1959.patch 
Log Message:
* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.14-1
- Upstream release 0.8.14



Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/F-11/irssi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- irssi.spec	24 Jun 2009 05:48:59 -0000	1.39
+++ irssi.spec	3 Aug 2009 10:34:57 -0000	1.40
@@ -2,15 +2,14 @@
 
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
-Version:	0.8.13
-Release:	3%{?dist}
+Version:	0.8.14
+Release:	1%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://irssi.org/
 Source0:	http://irssi.org/files/irssi-%{version}.tar.gz
 Source1:	irssi-config.h
-Patch0:		irssi-CVE-2009-1959.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig glib2-devel perl-devel perl(ExtUtils::Embed)
@@ -36,7 +35,7 @@ being maintained.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+
 %build
 %configure --enable-ipv6 --with-textui	\
 	--with-proxy			\
@@ -53,19 +52,15 @@ cp -p %{SOURCE1} irssi-config.h
 rm -rf $RPM_BUILD_ROOT
 %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
 chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO
@@ -78,14 +73,15 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Irssi*
 %{perl_vendorarch}/auto/Irssi
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/irssi/
 
-
 %changelog
-* Tue Jun 23 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.8.13-3
+* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.14-1
+- Upstream release 0.8.14
+
+* Tue Jun 23 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.8.13-2
 - Resolve CVE-2009-1959
 
 * Fri May  1 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.13-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	23 Jun 2009 11:03:41 -0000	1.10
+++ sources	3 Aug 2009 10:34:57 -0000	1.11
@@ -1 +1 @@
-226f194576895ff3075c164523806d06  irssi-0.8.13.tar.gz
+7d9437f53209a61af4fe4c9c5528ffa7  irssi-0.8.14.tar.gz


--- irssi-0.8.12-multiarch.patch DELETED ---


--- irssi-CVE-2009-1959.patch DELETED ---



From pbrobinson at fedoraproject.org  Mon Aug  3 10:37:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 10:37:20 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel import.log, NONE,
	1.1 moblin-icon-theme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803103720.6F61111C02C6@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-serv30686/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-icon-theme.spec 
Log Message:
- Initial import



--- NEW FILE import.log ---
moblin-icon-theme-0_7-1_fc11:HEAD:moblin-icon-theme-0.7-1.fc11.src.rpm:1249295747


--- NEW FILE moblin-icon-theme.spec ---
Name:           moblin-icon-theme
Version:        0.7
Release:        1%{?dist}
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

%description
Moblin icon theme

%prep
%setup -q

%build

%install
rm -rf %{buildroot}

./create-icon-theme.sh moblin
mkdir -p %{buildroot}/%{_datadir}/icons/moblin
cp -p output/moblin/index.theme %{buildroot}/%{_datadir}/icons/moblin
cp -rp output/moblin/16x16 %{buildroot}/%{_datadir}/icons/moblin
cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/moblin
cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/moblin

#Remove Makefile.am files
find %{buildroot} -name 'Makefile.am' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/moblin &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
  touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
      %{_bindir}/gtk-update-icon-cache -f -t --quiet %{_datadir}/icons/moblin || :
  fi
fi

%posttrans
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_datadir}/icons/moblin

%changelog
* Sat Aug  1 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-1
- New upstream 0.7 release

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:31:15 -0000	1.1
+++ .cvsignore	3 Aug 2009 10:37:19 -0000	1.2
@@ -0,0 +1 @@
+moblin-icon-theme-0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:31:15 -0000	1.1
+++ sources	3 Aug 2009 10:37:20 -0000	1.2
@@ -0,0 +1 @@
+0af21d9b6933f2563e42db370bf04e7b  moblin-icon-theme-0.7.tar.bz2



From jnovy at fedoraproject.org  Mon Aug  3 10:38:05 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  3 Aug 2009 10:38:05 +0000 (UTC)
Subject: rpms/mc/devel .cvsignore, 1.38, 1.39 mc.spec, 1.144, 1.145 sources, 
	1.46, 1.47
Message-ID: <20090803103805.BA1B211C02C6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore mc.spec sources 
Log Message:
* Mon Aug  3 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.1.pre1
- update to 4.7.0-pre1 (fixes #513757)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	31 Jul 2009 18:40:03 -0000	1.38
+++ .cvsignore	3 Aug 2009 10:38:04 -0000	1.39
@@ -1 +1 @@
-mc-4.6.99-20090731git.tar.bz2
+mc-4.7.0-pre1.tar.bz2


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- mc.spec	31 Jul 2009 18:40:04 -0000	1.144
+++ mc.spec	3 Aug 2009 10:38:05 -0000	1.145
@@ -1,18 +1,15 @@
-%define alphatag 20090731git
-
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
-Version:	4.6.99
-Release:	0.%{alphatag}%{?dist}
+Version:	4.7.0
+Release:	0.1.pre1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-%{alphatag}.tar.bz2
+Source0:	mc-%{version}-pre1.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:	gettext cvs automake autoconf libtool
 Requires:	dev >= 3.3-3
 
 Patch1:		mc-ipv6.patch
@@ -27,13 +24,12 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q
+%setup -q -n mc-%{version}-pre1
 %patch1 -p1 -b .ipv6
 %patch2 -p1 -b .prompt
 %patch3 -p1 -b .exit
 
 %build
-./autogen.sh
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
 	     --enable-charset \
@@ -49,8 +45,6 @@ make install DESTDIR="$RPM_BUILD_ROOT"
 
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/mc/bin
-#mv $RPM_BUILD_ROOT%{_libexecdir}/mc/{mc.sh,mc.csh,mc-wrapper.sh,mc-wrapper.csh} $RPM_BUILD_ROOT%{_datadir}/mc/bin
 
 %find_lang %{name}
 
@@ -89,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Aug  3 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.1.pre1
+- update to 4.7.0-pre1 (fixes #513757)
+
 * Fri Jul 31 2009 Jindrich Novy <jnovy at redhat.com> 4.6.99-0.20090731git
 - update to latest GIT mc
 - forwardport prompt fix and exit patch, keep IPv6 patch and drop the others


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	31 Jul 2009 18:40:04 -0000	1.46
+++ sources	3 Aug 2009 10:38:05 -0000	1.47
@@ -1 +1 @@
-9f705ec40a2551121ddf0f517c13d96b  mc-4.6.99-20090731git.tar.bz2
+c69a27dd79e96317be9410137b2fc9d6  mc-4.7.0-pre1.tar.bz2



From twaugh at fedoraproject.org  Mon Aug  3 10:47:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 10:47:26 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript.spec,1.191,1.192
Message-ID: <20090803104726.476E811C02C6@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	ghostscript.spec 
Log Message:
* 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.



Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- ghostscript.spec	3 Aug 2009 10:05:45 -0000	1.191
+++ ghostscript.spec	3 Aug 2009 10:47:25 -0000	1.192
@@ -279,7 +279,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 +293,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
@@ -313,6 +313,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * 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



From eponyme at fedoraproject.org  Mon Aug  3 10:47:53 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 10:47:53 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.5, 1.6 cclive.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20090803104753.EDC2411C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jul 2009 23:06:47 -0000	1.5
+++ .cvsignore	3 Aug 2009 10:47:53 -0000	1.6
@@ -1 +1 @@
-cclive-0.4.5.tar.bz2
+cclive-0.4.6.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cclive.spec	24 Jul 2009 18:42:04 -0000	1.5
+++ cclive.spec	3 Aug 2009 10:47:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           cclive
-Version:        0.4.5
-Release:        2%{?dist}
+Version:        0.4.6
+Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
 Group:          Applications/Multimedia 
@@ -18,7 +18,6 @@ Googlevideo, Break, Liveleak, Sevenload,
 
 %prep
 %setup -q
-sed -i -e "25i\#include <stdlib.h>" src/opts.cpp
 
 %build
 %configure
@@ -42,9 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1
+- Update to 0.4.6
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1
 - Rebuild for 0.4.5
 * Mon Jun 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jul 2009 23:06:47 -0000	1.5
+++ sources	3 Aug 2009 10:47:53 -0000	1.6
@@ -1 +1 @@
-66d0327db5b041ddebbfaa1aed2a1aa5  cclive-0.4.5.tar.bz2
+d1cce0a433fc515f3682ba7ef4cbdc09  cclive-0.4.6.tar.bz2



From eponyme at fedoraproject.org  Mon Aug  3 10:49:45 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 10:49:45 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.5, 1.6 cclive.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090803104945.67D4F11C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jul 2009 23:09:15 -0000	1.5
+++ .cvsignore	3 Aug 2009 10:49:44 -0000	1.6
@@ -1 +1 @@
-cclive-0.4.5.tar.bz2
+cclive-0.4.6.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cclive.spec	11 Jul 2009 23:09:15 -0000	1.4
+++ cclive.spec	3 Aug 2009 10:49:45 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.5
+Version:        0.4.6
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -18,7 +18,6 @@ Googlevideo, Break, Liveleak, Sevenload,
 
 %prep
 %setup -q
-sed -i -e "25i\#include <stdlib.h>" src/opts.cpp
 
 %build
 %configure
@@ -42,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1
+- Update to 0.4.6
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1
 - Rebuild for 0.4.5
 * Mon Jun 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jul 2009 23:09:15 -0000	1.5
+++ sources	3 Aug 2009 10:49:45 -0000	1.6
@@ -1 +1 @@
-66d0327db5b041ddebbfaa1aed2a1aa5  cclive-0.4.5.tar.bz2
+d1cce0a433fc515f3682ba7ef4cbdc09  cclive-0.4.6.tar.bz2



From eponyme at fedoraproject.org  Mon Aug  3 10:50:57 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 10:50:57 +0000 (UTC)
Subject: rpms/cclive/F-10 .cvsignore, 1.5, 1.6 cclive.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090803105057.5D1BE11C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Jul 2009 23:10:32 -0000	1.5
+++ .cvsignore	3 Aug 2009 10:50:57 -0000	1.6
@@ -1 +1 @@
-cclive-0.4.5.tar.bz2
+cclive-0.4.6.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/cclive.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cclive.spec	11 Jul 2009 23:10:33 -0000	1.4
+++ cclive.spec	3 Aug 2009 10:50:57 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.5
+Version:        0.4.6
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -18,7 +18,6 @@ Googlevideo, Break, Liveleak, Sevenload,
 
 %prep
 %setup -q
-sed -i -e "25i\#include <stdlib.h>" src/opts.cpp
 
 %build
 %configure
@@ -42,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1
+- Update to 0.4.6
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.5-1
 - Rebuild for 0.4.5
 * Mon Jun 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Jul 2009 23:10:33 -0000	1.5
+++ sources	3 Aug 2009 10:50:57 -0000	1.6
@@ -1 +1 @@
-66d0327db5b041ddebbfaa1aed2a1aa5  cclive-0.4.5.tar.bz2
+d1cce0a433fc515f3682ba7ef4cbdc09  cclive-0.4.6.tar.bz2



From ivaxer at fedoraproject.org  Mon Aug  3 10:52:56 2009
From: ivaxer at fedoraproject.org (John A. Khvatov)
Date: Mon,  3 Aug 2009 10:52:56 +0000 (UTC)
Subject: rpms/glog/devel .cvsignore, 1.3, 1.4 glog.spec, 1.6, 1.7 import.log,
	1.4, 1.5 sources, 1.3, 1.4 glog-gcc4.4.patch, 1.1,
	NONE glog-r38.patch, 1.1, NONE
Message-ID: <20090803105256.403E611C02C6@cvs1.fedora.phx.redhat.com>

Author: ivaxer

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

Modified Files:
	.cvsignore glog.spec import.log sources 
Removed Files:
	glog-gcc4.4.patch glog-r38.patch 
Log Message:
update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Jan 2009 10:36:08 -0000	1.3
+++ .cvsignore	3 Aug 2009 10:52:55 -0000	1.4
@@ -1 +1 @@
-glog-0.2.tar.gz
+glog-0.3.0.tar.gz


Index: glog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/glog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- glog.spec	25 Jul 2009 00:24:08 -0000	1.6
+++ glog.spec	3 Aug 2009 10:52:56 -0000	1.7
@@ -1,14 +1,12 @@
 Name:           glog
-Version:        0.2
-Release:        6%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        A C++ application logging library
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.google.com/p/google-glog
 Source0:        http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         glog-r38.patch
-Patch1:         glog-gcc4.4.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  autoconf
@@ -32,8 +30,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
 
 %build
 autoconf
@@ -65,11 +61,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/designstyle.css doc/glog.html
 %{_libdir}/libglog.so
+%{_libdir}/pkgconfig/libglog.pc
 %dir %{_includedir}/glog
 %{_includedir}/glog/*
 
 
 %changelog
+* Mon Aug 03 2009 John A. Khvatov <ivaxer at fedoraproject.org> - 0.3.0-1
+- update to 0.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	26 Feb 2009 23:40:29 -0000	1.4
+++ import.log	3 Aug 2009 10:52:56 -0000	1.5
@@ -2,3 +2,4 @@ glog-0_1_2-6_fc10:HEAD:glog-0.1.2-6.fc10
 glog-0_2-2_fc10:HEAD:glog-0.2-2.fc10.src.rpm:1232879474
 glog-0_2-4_fc10:HEAD:glog-0.2-4.fc10.src.rpm:1235684646
 glog-0_2-5_fc10:HEAD:glog-0.2-5.fc10.src.rpm:1235691384
+glog-0_3_0-1_fc11:HEAD:glog-0.3.0-1.fc11.src.rpm:1249295950


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Jan 2009 10:36:09 -0000	1.3
+++ sources	3 Aug 2009 10:52:56 -0000	1.4
@@ -1 +1 @@
-c0fe88ea51ba4e2328580cffc4856ca5  glog-0.2.tar.gz
+968fe4bfbaddba315bf52de310dcadc5  glog-0.3.0.tar.gz


--- glog-gcc4.4.patch DELETED ---


--- glog-r38.patch DELETED ---



From cwickert at fedoraproject.org  Mon Aug  3 11:07:13 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  3 Aug 2009 11:07:13 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire/F-11 gnome-applet-cpufire.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803110714.0E9CE11C02C6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-cpufire/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7681/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-cpufire.spec 
Log Message:
initial version of gnome-applet-cpufire for this branch


--- NEW FILE gnome-applet-cpufire.spec ---
# reviewed at https://bugzilla.redhat.com/show_bug.cgi?id=513797

%global srcname cpufire_applet

Name:           gnome-applet-cpufire
Version:        1.6
Release:        2%{?dist}
Summary:        GNOME panel applet showing the CPU load as a fire

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://strongm.ath.cx/
Source0:        http://strongm.ath.cx/projects/cpufire/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-panel-devel >= 2.6
BuildRequires:  libgtop2-devel
BuildRequires:  gettext
BuildRequires:  intltool
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-doc-utils
BuildRequires:  scrollkeeper
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

Requires:       gnome-panel, gnome-system-monitor
Provides:       cpufire-applet = %{version}

%description
A CPU load monitor, that comes as a gnome panel applet. CPU load is displayed
as a beautiful fire, the higher the flames the higher the CPU load.

%prep
%setup -qn %{srcname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
%find_lang %{srcname}-1.0


%clean
rm -rf %{buildroot}


%post
scrollkeeper-update -q -o %{_datadir}/omf/cpufire || :


%postun
scrollkeeper-update -q || :


%files -f %{srcname}-1.0.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/cpufire_applet
%{_libdir}/bonobo/servers/GNOME_CPUFireApplet.server
%{_datadir}/gnome-2.0/ui/GNOME_CPUFireApplet.xml
%{_datadir}/cpufire-applet/
%doc %{_datadir}/gnome/help/cpufire/
%{_datadir}/omf/cpufire/


%changelog
* Sun Jul 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6-2
- Own %%{_datadir}/omf/cpufire/
- minor specfile clean ups from the review (#513797)

* Sun Jul 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6-1
- Update to 1.6, fixed a bug introduced in 1.5

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-1
- Update to 1.5

* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4-1
- Update to 1.4

* Thu May 03 2007 Christoph Wickert <wickerpms at arcor.de> - 1.3-1
- Upadte to 1.3

* Tue Jul 18 2006 Christoph Wickert <wickerpms at arcor.de> - 1.2-1
- Upadte to 1.2

* Mon Sep 19 2005 Christoph Wickert <wickerpms at arcor.de> - 1.1-1
- Initial package for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:29:57 -0000	1.1
+++ .cvsignore	3 Aug 2009 11:07:13 -0000	1.2
@@ -0,0 +1 @@
+cpufire_applet-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:29:57 -0000	1.1
+++ sources	3 Aug 2009 11:07:13 -0000	1.2
@@ -0,0 +1 @@
+5837d2abf7eabd1e4985817efccf4bb4  cpufire_applet-1.6.tar.gz



From cwickert at fedoraproject.org  Mon Aug  3 11:07:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  3 Aug 2009 11:07:14 +0000 (UTC)
Subject: rpms/gnome-applet-cpufire/F-10 gnome-applet-cpufire.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803110714.6981B11C02C6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-cpufire/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7681/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-applet-cpufire.spec 
Log Message:
initial version of gnome-applet-cpufire for this branch


--- NEW FILE gnome-applet-cpufire.spec ---
# reviewed at https://bugzilla.redhat.com/show_bug.cgi?id=513797

%global srcname cpufire_applet

Name:           gnome-applet-cpufire
Version:        1.6
Release:        2%{?dist}
Summary:        GNOME panel applet showing the CPU load as a fire

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://strongm.ath.cx/
Source0:        http://strongm.ath.cx/projects/cpufire/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gnome-panel-devel >= 2.6
BuildRequires:  libgtop2-devel
BuildRequires:  gettext
BuildRequires:  intltool
BuildRequires:  perl(XML::Parser)
BuildRequires:  gnome-doc-utils
BuildRequires:  scrollkeeper
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

Requires:       gnome-panel, gnome-system-monitor
Provides:       cpufire-applet = %{version}

%description
A CPU load monitor, that comes as a gnome panel applet. CPU load is displayed
as a beautiful fire, the higher the flames the higher the CPU load.

%prep
%setup -qn %{srcname}-%{version}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
%find_lang %{srcname}-1.0


%clean
rm -rf %{buildroot}


%post
scrollkeeper-update -q -o %{_datadir}/omf/cpufire || :


%postun
scrollkeeper-update -q || :


%files -f %{srcname}-1.0.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/cpufire_applet
%{_libdir}/bonobo/servers/GNOME_CPUFireApplet.server
%{_datadir}/gnome-2.0/ui/GNOME_CPUFireApplet.xml
%{_datadir}/cpufire-applet/
%doc %{_datadir}/gnome/help/cpufire/
%{_datadir}/omf/cpufire/


%changelog
* Sun Jul 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6-2
- Own %%{_datadir}/omf/cpufire/
- minor specfile clean ups from the review (#513797)

* Sun Jul 26 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6-1
- Update to 1.6, fixed a bug introduced in 1.5

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-1
- Update to 1.5

* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4-1
- Update to 1.4

* Thu May 03 2007 Christoph Wickert <wickerpms at arcor.de> - 1.3-1
- Upadte to 1.3

* Tue Jul 18 2006 Christoph Wickert <wickerpms at arcor.de> - 1.2-1
- Upadte to 1.2

* Mon Sep 19 2005 Christoph Wickert <wickerpms at arcor.de> - 1.1-1
- Initial package for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 06:29:57 -0000	1.1
+++ .cvsignore	3 Aug 2009 11:07:13 -0000	1.2
@@ -0,0 +1 @@
+cpufire_applet-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-cpufire/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 06:29:57 -0000	1.1
+++ sources	3 Aug 2009 11:07:14 -0000	1.2
@@ -0,0 +1 @@
+5837d2abf7eabd1e4985817efccf4bb4  cpufire_applet-1.6.tar.gz



From rakesh at fedoraproject.org  Mon Aug  3 11:09:17 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon,  3 Aug 2009 11:09:17 +0000 (UTC)
Subject: rpms/pdf2djvu/devel pdf2djvu.spec,1.5,1.6
Message-ID: <20090803110917.8145C11C02C6@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	pdf2djvu.spec 
Log Message:
Fixed the missing djvulibre require #500306


Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/pdf2djvu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pdf2djvu.spec	25 Jul 2009 23:24:00 -0000	1.5
+++ pdf2djvu.spec	3 Aug 2009 11:09:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pdf2djvu
 Version:        0.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  poppler-devel
 BuildRequires:  pstreams-devel
 BuildRequires:  fontconfig-devel
+Requires:       djvulibre
 
 %description
 pdf2djvu creates DjVu files from PDF files. It's able to extract:
@@ -41,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 03 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.5.0-5
+- Fixed the missing djvulibre require #500306
+
 * Sat Jul 25 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 rakesh at fedoraproject.org  Mon Aug  3 11:14:52 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon,  3 Aug 2009 11:14:52 +0000 (UTC)
Subject: rpms/pdf2djvu/F-11 pdf2djvu.spec,1.4,1.5
Message-ID: <20090803111452.AA1FF11C02C6@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	pdf2djvu.spec 
Log Message:
Fixed the missing djvulibre require #500306.



Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-11/pdf2djvu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pdf2djvu.spec	29 Apr 2009 01:22:26 -0000	1.4
+++ pdf2djvu.spec	3 Aug 2009 11:14:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pdf2djvu
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -15,6 +15,8 @@ BuildRequires:  poppler-devel
 BuildRequires:  pstreams-devel
 BuildRequires:  fontconfig-devel
 
+Requires:       djvulibre
+
 %description
 pdf2djvu creates DjVu files from PDF files. It's able to extract:
 graphics, text layer, hyperlinks, document outline (bookmarks) and
@@ -41,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.5.0-4
+- Fixed the missing djvulibre require #500306
+
 * Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.5.0-3
 - Fix FTBFS: added BR: djvulibre, fontconfig-devel.
 



From rakesh at fedoraproject.org  Mon Aug  3 11:16:42 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon,  3 Aug 2009 11:16:42 +0000 (UTC)
Subject: rpms/pdf2djvu/F-10 pdf2djvu.spec,1.2,1.3
Message-ID: <20090803111642.177DB11C02C6@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	pdf2djvu.spec 
Log Message:
Fixed the missing djvulibre require #500306


Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-10/pdf2djvu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pdf2djvu.spec	17 Jan 2009 04:43:22 -0000	1.2
+++ pdf2djvu.spec	3 Aug 2009 11:16:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pdf2djvu
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 03 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.5.0-2
+- Fixed the missing djvulibre require #500306
+
 * Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.5.0-1
 - Updated to 0.5.0
 



From rhughes at fedoraproject.org  Mon Aug  3 11:35:41 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 11:35:41 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.50, 1.51 PackageKit.spec, 1.109,
	1.110 sources, 1.51, 1.52
Message-ID: <20090803113541.443E411C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.1-1
- New upstream version, many bugfixes and performance fixes
- Fixes #491859, #513856, #510874, #513376, #472876, #514708 and #513557



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	27 Jul 2009 17:05:28 -0000	1.50
+++ .cvsignore	3 Aug 2009 11:35:40 -0000	1.51
@@ -1 +1 @@
-PackageKit-0.5.1-20090727.tar.gz
+PackageKit-0.5.1.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- PackageKit.spec	27 Jul 2009 17:05:28 -0000	1.109
+++ PackageKit.spec	3 Aug 2009 11:35:40 -0000	1.110
@@ -10,13 +10,13 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.1
-Release:   0.1.%{?alphatag}git%{?dist}
-#Release:   2%{?dist}
+#Release:   0.1.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://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.
@@ -59,6 +59,7 @@ BuildRequires: gstreamer-plugins-base-de
 BuildRequires: qt4-devel
 BuildRequires: cppunit-devel
 BuildRequires: pango-devel
+BuildRequires: pm-utils-devel
 BuildRequires: fontconfig-devel
 #BuildRequires: gtk-sharp2-devel
 #BuildRequires: mono-core
@@ -223,8 +224,8 @@ A simple helper that offers to install n
 using PackageKit.
 
 %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
 
@@ -418,6 +419,10 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.1-1
+- New upstream version, many bugfixes and performance fixes
+- Fixes #491859, #513856, #510874, #513376, #472876, #514708 and #513557
+
 * Mon Jul 27 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.1-0.1.20090727git
 - Update to a git snapshot from the 0.5.x series.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	27 Jul 2009 17:05:29 -0000	1.51
+++ sources	3 Aug 2009 11:35:41 -0000	1.52
@@ -1 +1 @@
-04055d452789d1026767466b8ff2813b  PackageKit-0.5.1-20090727.tar.gz
+8575a23e406fffa8d11ba2ad4b5d99f3  PackageKit-0.5.1.tar.gz



From kwizart at fedoraproject.org  Mon Aug  3 11:39:56 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  3 Aug 2009 11:39:56 +0000 (UTC)
Subject: rpms/filezilla/devel .cvsignore, 1.37, 1.38 sources, 1.41,
	1.42 filezilla.spec, 1.46, 1.47
Message-ID: <20090803113956.6A4FD11C02C6@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	.cvsignore sources filezilla.spec 
Log Message:
Update to 3.2.7-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	6 Jul 2009 19:27:28 -0000	1.37
+++ .cvsignore	3 Aug 2009 11:39:56 -0000	1.38
@@ -1 +1 @@
-FileZilla_3.2.6.1_src.tar.bz2
+FileZilla_3.2.7-rc1_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	6 Jul 2009 19:27:28 -0000	1.41
+++ sources	3 Aug 2009 11:39:56 -0000	1.42
@@ -1 +1 @@
-1b3e9974f112ff0ff18ce5a8187c20f4  FileZilla_3.2.6.1_src.tar.bz2
+dd65331810a127400fbc47c9feae4949  FileZilla_3.2.7-rc1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- filezilla.spec	24 Jul 2009 22:45:44 -0000	1.46
+++ filezilla.spec	3 Aug 2009 11:39:56 -0000	1.47
@@ -1,8 +1,8 @@
-#define fz_rc   rc1
+%define fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.6.1
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}.1
+Version:        3.2.7
+Release:        0.1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Mon Aug  3 2009 kwizart < kwizart at gmail.com > - 3.2.7-0.1_rc1
+- Update to 3.2.7-rc1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6.1-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Mon Aug  3 11:49:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  3 Aug 2009 11:49:06 +0000 (UTC)
Subject: rpms/siril/devel siril-0.8-c99.patch, NONE,
	1.1 siril-0.8-overflows.patch, NONE, 1.1 siril.spec, 1.6, 1.7
Message-ID: <20090803114906.A31A011C02C6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	siril.spec 
Added Files:
	siril-0.8-c99.patch siril-0.8-overflows.patch 
Log Message:
* Mon Aug 3 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-8
- Fix build
- Fix out of string bound writes (#494536)


siril-0.8-c99.patch:
 proto.h |    2 ++
 utils.c |    2 ++
 2 files changed, 4 insertions(+)

--- NEW FILE siril-0.8-c99.patch ---
C99 adds isblank() to <ctype.h>, don't attempt to add a prototype
in case it exists and is a macro.

Lubomir Rintel <lkundrak at v3.sk>

diff -up siril-0.8/src/proto.h.c99 siril-0.8/src/proto.h
--- siril-0.8/src/proto.h.c99	2009-08-03 13:38:06.000000000 +0200
+++ siril-0.8/src/proto.h	2009-08-03 13:38:26.000000000 +0200
@@ -116,7 +116,9 @@ int 	copyfits(fits *from, fits *to, unsi
 int 	seqpreprocess(void);
 int		preprocess(fits *brut);
 double 	timing(int fin, char *info);
+#ifndef isblank
 int		isblank (int c);
+#endif
 char	*isempty(char *name);
 int		writeinitfile(void);
 int		readinitfile(void);
diff -up siril-0.8/src/utils.c.c99 siril-0.8/src/utils.c
--- siril-0.8/src/utils.c.c99	2009-08-03 13:38:37.000000000 +0200
+++ siril-0.8/src/utils.c	2009-08-03 13:38:47.000000000 +0200
@@ -40,7 +40,9 @@ static const char keywords[1][32]= {"wor
 #define NOTOK (-1)
 #define WD (0)
 
+#ifndef isblank
 int isblank (int c);
+#endif
 char error_buffer[256];
 
 extern cominfo com;

siril-0.8-overflows.patch:
 siril.h |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE siril-0.8-overflows.patch ---
Limits in callbacks.c's strncpy()s are far bigger that
actual length of these strings, so FORTIFY_SOURCE would
always abort (as warned at build-time). Extend them

Lubomir Rintel <lkundrak at v3.sk>

diff -up siril-0.8/src/callbacks.c.overflows siril-0.8/src/callbacks.c
diff -up siril-0.8/src/siril.h.overflows siril-0.8/src/siril.h
--- siril-0.8/src/siril.h.overflows	2009-08-03 13:44:16.000000000 +0200
+++ siril-0.8/src/siril.h	2009-08-03 13:45:13.000000000 +0200
@@ -112,16 +112,16 @@ typedef struct sequ sequence;
 struct sequ {
 	gboolean active;
 	int fixed;
-	char name[256];
+	char name[MAXGENLENGTH];
 	char *names;
-	char darkname[256];
-	char darkprefix[16];
-	char flatname[256];
-	char flatprefix[16];
-	char offsetname[256];
-	char offsetprefix[16];
-	char selprefix[16];
-	char ppprefix[16];
+	char darkname[MAXGENLENGTH];
+	char darkprefix[MAXGENLENGTH];
+	char flatname[MAXGENLENGTH];
+	char flatprefix[MAXGENLENGTH];
+	char offsetname[MAXGENLENGTH];
+	char offsetprefix[MAXGENLENGTH];
+	char selprefix[MAXGENLENGTH];
+	char ppprefix[MAXGENLENGTH];
 	int selnum;
 	int number;
 	char fli;


Index: siril.spec
===================================================================
RCS file: /cvs/pkgs/rpms/siril/devel/siril.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- siril.spec	27 Jul 2009 04:23:03 -0000	1.6
+++ siril.spec	3 Aug 2009 11:49:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		siril
 Version:	0.8
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Siril is an astronomical image processing software for Linux
 
 License:	GPLv2+
@@ -8,6 +8,8 @@ Group:		Applications/Engineering
 URL:		http://sourceforge.net/projects/siril/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         siril-0.8-nobuf.patch
+Patch1:         siril-0.8-c99.patch
+Patch2:         siril-0.8-overflows.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel, fftw3-devel, cfitsio-devel, netpbm-devel
 Requires:	gtk+, fftw3, cfitsio
@@ -20,6 +22,8 @@ It's an astronomical image processing so
 %prep
 %setup -q
 %patch0 -p1 -b .nobuf
+%patch1 -p1 -b .c99
+%patch2 -p1 -b .overflows
 
 %build
 %configure
@@ -42,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/siril/pixmaps/siril_1.xpm
 
 %changelog
+* Mon Aug 3 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-8
+- Fix build
+- Fix out of string bound writes (#494536)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Mon Aug  3 11:49:58 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon,  3 Aug 2009 11:49:58 +0000 (UTC)
Subject: rpms/siril/devel siril.spec,1.7,1.8
Message-ID: <20090803114958.6E21F11C02C6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	siril.spec 
Log Message:
Increase revision in changelog correctly


Index: siril.spec
===================================================================
RCS file: /cvs/pkgs/rpms/siril/devel/siril.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- siril.spec	3 Aug 2009 11:49:06 -0000	1.7
+++ siril.spec	3 Aug 2009 11:49:58 -0000	1.8
@@ -46,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/siril/pixmaps/siril_1.xpm
 
 %changelog
-* Mon Aug 3 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-8
+* Mon Aug 3 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8-9
 - Fix build
 - Fix out of string bound writes (#494536)
 



From pkgdb at fedoraproject.org  Mon Aug  3 11:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 11:59:08 +0000
Subject: [pkgdb] ghc-uniplate: ynemoy has requested commit
Message-ID: <20090803115908.7995F10F89E@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc-uniplate (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 11:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 11:59:12 +0000
Subject: [pkgdb] ghc-uniplate: ynemoy has requested watchcommits
Message-ID: <20090803115912.476ED10F8A2@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on ghc-uniplate (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 11:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 11:59:14 +0000
Subject: [pkgdb] ghc-uniplate: ynemoy has requested watchbugzilla
Message-ID: <20090803115914.D91AB10F8AD@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on ghc-uniplate (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 11:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 11:59:15 +0000
Subject: [pkgdb] ghc-uniplate: ynemoy has requested approveacls
Message-ID: <20090803115915.3DC6310F8B1@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc-uniplate (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:01 +0000
Subject: [pkgdb] ghc-zlib: ynemoy has requested approveacls
Message-ID: <20090803120001.530D410F8AD@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc-zlib (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:03 +0000
Subject: [pkgdb] ghc-zlib: ynemoy has requested commit
Message-ID: <20090803120003.6006D10F8B7@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc-zlib (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:04 +0000
Subject: [pkgdb] ghc-zlib: ynemoy has requested watchcommits
Message-ID: <20090803120004.678C710F8BA@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on ghc-zlib (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:05 +0000
Subject: [pkgdb] ghc-zlib: ynemoy has requested watchbugzilla
Message-ID: <20090803120005.C327410F8C1@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on ghc-zlib (Fedora devel)

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



From kwizart at fedoraproject.org  Mon Aug  3 12:00:27 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  3 Aug 2009 12:00:27 +0000 (UTC)
Subject: rpms/perl-Test-Refcount/devel import.log, NONE,
	1.1 perl-Test-Refcount.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803120027.CF20811C0417@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Test-Refcount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23334/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Refcount.spec 
Log Message:
Initial import for devel



--- NEW FILE import.log ---
perl-Test-Refcount-0_05-2_fc11:HEAD:perl-Test-Refcount-0.05-2.fc11.src.rpm:1249300708


--- NEW FILE perl-Test-Refcount.spec ---
Name:           perl-Test-Refcount
Version:        0.05
Release:        2%{?dist}
Summary:        Assert reference counts on objects

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Test-Refcount/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Test-Refcount-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Devel::Refcount)
BuildRequires:  perl(Devel::FindRef)
BuildRequires:  perl(Test::Builder)
BuildRequires:  perl(Test::Builder::Tester)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Perl garbage collector uses simple reference counting during the normal
execution of a program. This means that cycles or unweakened references in
other parts of code can keep an object around for longer than intended. To
help avoid this problem, the reference count of a new object from its class
constructor ought to be 1. This way, the caller can know the object will be
properly DESTROYed when it drops all of its references to it.


%prep
%setup -q -n Test-Refcount-%{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 {} ';'

%{_fixperms} $RPM_BUILD_ROOT/*


%check
#Test fails rhbz#514942
make test || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Test
%{_mandir}/man3/Test*.3*


%changelog
* Fri Jul 31 2009 kwizart < kwizart at gmail.com > - 0.05-2
- Add missing BR
- Use %%{_fixperms}
- Fix %%files section
- Add comment about why it fails

* Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.05-1
- Initial spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:19:45 -0000	1.1
+++ .cvsignore	3 Aug 2009 12:00:27 -0000	1.2
@@ -0,0 +1 @@
+Test-Refcount-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:19:45 -0000	1.1
+++ sources	3 Aug 2009 12:00:27 -0000	1.2
@@ -0,0 +1 @@
+657b089713b1283218590119faf12432  Test-Refcount-0.05.tar.gz



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:28 +0000
Subject: [pkgdb] ghc-ghc-paths: ynemoy has requested approveacls
Message-ID: <20090803120028.1DAA310F8AD@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc-ghc-paths (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:29 +0000
Subject: [pkgdb] ghc-ghc-paths: ynemoy has requested commit
Message-ID: <20090803120029.2B18D10F8B5@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc-ghc-paths (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:30 +0000
Subject: [pkgdb] ghc-ghc-paths: ynemoy has requested watchcommits
Message-ID: <20090803120030.3361510F8CB@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on ghc-ghc-paths (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:31 +0000
Subject: [pkgdb] ghc-ghc-paths: ynemoy has requested watchbugzilla
Message-ID: <20090803120031.EAAB910F8CE@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on ghc-ghc-paths (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:53 +0000
Subject: [pkgdb] ghc-HTTP: ynemoy has requested approveacls
Message-ID: <20090803120053.9738710F8B2@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc-HTTP (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:54 +0000
Subject: [pkgdb] ghc-HTTP: ynemoy has requested commit
Message-ID: <20090803120054.C6F3010F8BA@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc-HTTP (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:54 +0000
Subject: [pkgdb] ghc-HTTP: ynemoy has requested watchcommits
Message-ID: <20090803120055.00F6910F8D1@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on ghc-HTTP (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:00:57 +0000
Subject: [pkgdb] ghc-HTTP: ynemoy has requested watchbugzilla
Message-ID: <20090803120057.2AE9010F8D2@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on ghc-HTTP (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 12:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:01:18 +0000
Subject: [pkgdb] ghc-haskell-src-exts: ynemoy has requested approveacls
Message-ID: <20090803120118.817DB10F8BE@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on ghc-haskell-src-exts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 12:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:01:19 +0000
Subject: [pkgdb] ghc-haskell-src-exts: ynemoy has requested commit
Message-ID: <20090803120119.B8F2B10F8C3@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on ghc-haskell-src-exts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 12:01:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:01:22 +0000
Subject: [pkgdb] ghc-haskell-src-exts: ynemoy has requested watchcommits
Message-ID: <20090803120122.1F84A10F8D4@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on ghc-haskell-src-exts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 12:01:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 12:01:23 +0000
Subject: [pkgdb] ghc-haskell-src-exts: ynemoy has requested watchbugzilla
Message-ID: <20090803120123.A97F310F8D7@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on ghc-haskell-src-exts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From kwizart at fedoraproject.org  Mon Aug  3 12:02:58 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  3 Aug 2009 12:02:58 +0000 (UTC)
Subject: rpms/perl-Test-Refcount/F-11 import.log, NONE,
	1.1 perl-Test-Refcount.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803120258.1DC1911C02C6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Test-Refcount/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24714/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Refcount.spec 
Log Message:
Initial import for f11



--- NEW FILE import.log ---
perl-Test-Refcount-0_05-2_fc11:F-11:perl-Test-Refcount-0.05-2.fc11.src.rpm:1249300857


--- NEW FILE perl-Test-Refcount.spec ---
Name:           perl-Test-Refcount
Version:        0.05
Release:        2%{?dist}
Summary:        Assert reference counts on objects

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Test-Refcount/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Test-Refcount-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Devel::Refcount)
BuildRequires:  perl(Devel::FindRef)
BuildRequires:  perl(Test::Builder)
BuildRequires:  perl(Test::Builder::Tester)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Perl garbage collector uses simple reference counting during the normal
execution of a program. This means that cycles or unweakened references in
other parts of code can keep an object around for longer than intended. To
help avoid this problem, the reference count of a new object from its class
constructor ought to be 1. This way, the caller can know the object will be
properly DESTROYed when it drops all of its references to it.


%prep
%setup -q -n Test-Refcount-%{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 {} ';'

%{_fixperms} $RPM_BUILD_ROOT/*


%check
#Test fails rhbz#514942
make test || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Test
%{_mandir}/man3/Test*.3*


%changelog
* Fri Jul 31 2009 kwizart < kwizart at gmail.com > - 0.05-2
- Add missing BR
- Use %%{_fixperms}
- Fix %%files section
- Add comment about why it fails

* Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.05-1
- Initial spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:19:45 -0000	1.1
+++ .cvsignore	3 Aug 2009 12:02:57 -0000	1.2
@@ -0,0 +1 @@
+Test-Refcount-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:19:45 -0000	1.1
+++ sources	3 Aug 2009 12:02:57 -0000	1.2
@@ -0,0 +1 @@
+657b089713b1283218590119faf12432  Test-Refcount-0.05.tar.gz



From xhorak at fedoraproject.org  Mon Aug  3 12:04:06 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon,  3 Aug 2009 12:04:06 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec, 1.141,
	1.142 thunderbird-makebug.patch, 1.1,
	NONE thunderbird-setjmp.patch, 1.1, NONE
Message-ID: <20090803120406.336C511C02C6@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	thunderbird.spec 
Removed Files:
	thunderbird-makebug.patch thunderbird-setjmp.patch 
Log Message:
Build with system hunspell


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- thunderbird.spec	31 Jul 2009 15:12:45 -0000	1.141
+++ thunderbird.spec	3 Aug 2009 12:04:06 -0000	1.142
@@ -11,7 +11,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.5.b3%{?dist}
+Release:        3.6.b3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -37,8 +37,6 @@ Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
 Patch3:         xulrunner-elif.patch
 Patch4:         thunderbird-pango.patch
-Patch5:         thunderbird-makebug.patch
-Patch6:         thunderbird-setjmp.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -95,8 +93,6 @@ Mozilla Thunderbird is a standalone mail
 %patch2 -p1 -b .shared-error
 #%patch3 -p0 -b .xulrunner-elif
 #%patch4 -p1 -b .pango-fix
-%patch5 -p1 -b .makebug
-%patch6 -p1 -b .setjmp
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -298,6 +294,9 @@ fi
 #===============================================================================
 
 %changelog
+* Mon Aug  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.6.beta3
+- Build with system hunspell
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-3.5.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- thunderbird-makebug.patch DELETED ---


--- thunderbird-setjmp.patch DELETED ---



From kwizart at fedoraproject.org  Mon Aug  3 12:06:36 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon,  3 Aug 2009 12:06:36 +0000 (UTC)
Subject: rpms/perl-Test-Refcount/F-10 import.log, NONE,
	1.1 perl-Test-Refcount.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803120636.E51BF11C02C6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Test-Refcount/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25514/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Refcount.spec 
Log Message:
Initial import for F10



--- NEW FILE import.log ---
perl-Test-Refcount-0_05-2_fc11:F-10:perl-Test-Refcount-0.05-2.fc11.src.rpm:1249301001


--- NEW FILE perl-Test-Refcount.spec ---
Name:           perl-Test-Refcount
Version:        0.05
Release:        2%{?dist}
Summary:        Assert reference counts on objects

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Test-Refcount/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Test-Refcount-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Devel::Refcount)
BuildRequires:  perl(Devel::FindRef)
BuildRequires:  perl(Test::Builder)
BuildRequires:  perl(Test::Builder::Tester)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Perl garbage collector uses simple reference counting during the normal
execution of a program. This means that cycles or unweakened references in
other parts of code can keep an object around for longer than intended. To
help avoid this problem, the reference count of a new object from its class
constructor ought to be 1. This way, the caller can know the object will be
properly DESTROYed when it drops all of its references to it.


%prep
%setup -q -n Test-Refcount-%{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 {} ';'

%{_fixperms} $RPM_BUILD_ROOT/*


%check
#Test fails rhbz#514942
make test || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Test
%{_mandir}/man3/Test*.3*


%changelog
* Fri Jul 31 2009 kwizart < kwizart at gmail.com > - 0.05-2
- Add missing BR
- Use %%{_fixperms}
- Fix %%files section
- Add comment about why it fails

* Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.05-1
- Initial spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:19:45 -0000	1.1
+++ .cvsignore	3 Aug 2009 12:06:36 -0000	1.2
@@ -0,0 +1 @@
+Test-Refcount-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Refcount/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:19:45 -0000	1.1
+++ sources	3 Aug 2009 12:06:36 -0000	1.2
@@ -0,0 +1 @@
+657b089713b1283218590119faf12432  Test-Refcount-0.05.tar.gz



From schwab at fedoraproject.org  Mon Aug  3 12:10:22 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon,  3 Aug 2009 12:10:22 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.278, 1.279 glibc-fedora.patch, 1.312,
	1.313 glibc.spec, 1.405, 1.406 import.log, 1.21, 1.22 sources,
	1.303, 1.304
Message-ID: <20090803121022.DADB111C04D1@cvs1.fedora.phx.redhat.com>

Author: schwab

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- .cvsignore	30 Jul 2009 13:39:12 -0000	1.278
+++ .cvsignore	3 Aug 2009 12:10:20 -0000	1.279
@@ -1,2 +1,2 @@
-glibc-2.10-229-g78c4ef4-fedora.tar.bz2
-glibc-2.10-229-g78c4ef4.tar.bz2
+glibc-2.10-249-g4a13776-fedora.tar.bz2
+glibc-2.10-249-g4a13776.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   35 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 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/powerpc32/____longjmp_chk.S    |    8 
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/powerpc/powerpc64/____longjmp_chk.S    |    8 
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 59 files changed, 787 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- glibc-fedora.patch	30 Jul 2009 13:39:12 -0000	1.312
+++ glibc-fedora.patch	3 Aug 2009 12:10:21 -0000	1.313
@@ -1,6 +1,6 @@
---- glibc-2.10-229-g78c4ef4/ChangeLog
-+++ glibc-2.10.90-11/ChangeLog
-@@ -196,6 +196,11 @@
+--- glibc-2.10-249-g4a13776/ChangeLog
++++ glibc-2.10.90-12/ChangeLog
+@@ -267,6 +267,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -461,6 +466,16 @@
+@@ -532,6 +537,16 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -29,7 +29,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -8859,6 +8874,13 @@
+@@ -8930,6 +8945,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -43,7 +43,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9154,6 +9176,10 @@
+@@ -9225,6 +9247,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -54,7 +54,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10411,6 +10437,15 @@
+@@ -10482,6 +10508,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -70,8 +70,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-229-g78c4ef4/ChangeLog.15
-+++ glibc-2.10.90-11/ChangeLog.15
+--- glibc-2.10-249-g4a13776/ChangeLog.15
++++ glibc-2.10.90-12/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -137,8 +137,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-229-g78c4ef4/ChangeLog.16
-+++ glibc-2.10.90-11/ChangeLog.16
+--- glibc-2.10-249-g4a13776/ChangeLog.16
++++ glibc-2.10.90-12/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -310,8 +310,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-229-g78c4ef4/Makeconfig
-+++ glibc-2.10.90-11/Makeconfig
+--- glibc-2.10-249-g4a13776/Makeconfig
++++ glibc-2.10.90-12/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -328,8 +328,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-229-g78c4ef4/csu/Makefile
-+++ glibc-2.10.90-11/csu/Makefile
+--- glibc-2.10-249-g4a13776/csu/Makefile
++++ glibc-2.10.90-12/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -340,8 +340,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-229-g78c4ef4/csu/elf-init.c
-+++ glibc-2.10.90-11/csu/elf-init.c
+--- glibc-2.10-249-g4a13776/csu/elf-init.c
++++ glibc-2.10.90-12/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;
@@ -366,8 +366,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-229-g78c4ef4/debug/tst-chk1.c
-+++ glibc-2.10.90-11/debug/tst-chk1.c
+--- glibc-2.10-249-g4a13776/debug/tst-chk1.c
++++ glibc-2.10.90-12/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -396,8 +396,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-229-g78c4ef4/elf/ldconfig.c
-+++ glibc-2.10.90-11/elf/ldconfig.c
+--- glibc-2.10-249-g4a13776/elf/ldconfig.c
++++ glibc-2.10.90-12/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -479,8 +479,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-229-g78c4ef4/elf/tst-stackguard1.c
-+++ glibc-2.10.90-11/elf/tst-stackguard1.c
+--- glibc-2.10-249-g4a13776/elf/tst-stackguard1.c
++++ glibc-2.10.90-12/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -505,16 +505,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-229-g78c4ef4/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-11/include/bits/stdlib-ldbl.h
+--- glibc-2.10-249-g4a13776/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-12/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-229-g78c4ef4/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-11/include/bits/wchar-ldbl.h
+--- glibc-2.10-249-g4a13776/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-12/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-229-g78c4ef4/include/features.h
-+++ glibc-2.10.90-11/include/features.h
+--- glibc-2.10-249-g4a13776/include/features.h
++++ glibc-2.10.90-12/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -531,8 +531,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-229-g78c4ef4/intl/locale.alias
-+++ glibc-2.10.90-11/intl/locale.alias
+--- glibc-2.10-249-g4a13776/intl/locale.alias
++++ glibc-2.10.90-12/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -542,8 +542,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-229-g78c4ef4/libio/stdio.h
-+++ glibc-2.10.90-11/libio/stdio.h
+--- glibc-2.10-249-g4a13776/libio/stdio.h
++++ glibc-2.10.90-12/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.  */
@@ -557,8 +557,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-229-g78c4ef4/locale/iso-4217.def
-+++ glibc-2.10.90-11/locale/iso-4217.def
+--- glibc-2.10-249-g4a13776/locale/iso-4217.def
++++ glibc-2.10.90-12/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -650,8 +650,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-229-g78c4ef4/locale/programs/locarchive.c
-+++ glibc-2.10.90-11/locale/programs/locarchive.c
+--- glibc-2.10-249-g4a13776/locale/programs/locarchive.c
++++ glibc-2.10.90-12/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,
@@ -683,8 +683,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-229-g78c4ef4/localedata/Makefile
-+++ glibc-2.10.90-11/localedata/Makefile
+--- glibc-2.10-249-g4a13776/localedata/Makefile
++++ glibc-2.10.90-12/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -693,8 +693,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-229-g78c4ef4/localedata/SUPPORTED
-+++ glibc-2.10.90-11/localedata/SUPPORTED
+--- glibc-2.10-249-g4a13776/localedata/SUPPORTED
++++ glibc-2.10.90-12/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -736,8 +736,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-229-g78c4ef4/localedata/locales/cy_GB
-+++ glibc-2.10.90-11/localedata/locales/cy_GB
+--- glibc-2.10-249-g4a13776/localedata/locales/cy_GB
++++ glibc-2.10.90-12/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>"
@@ -752,8 +752,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-229-g78c4ef4/localedata/locales/en_GB
-+++ glibc-2.10.90-11/localedata/locales/en_GB
+--- glibc-2.10-249-g4a13776/localedata/locales/en_GB
++++ glibc-2.10.90-12/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>"
@@ -765,8 +765,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-229-g78c4ef4/localedata/locales/no_NO
-+++ glibc-2.10.90-11/localedata/locales/no_NO
+--- glibc-2.10-249-g4a13776/localedata/locales/no_NO
++++ glibc-2.10.90-12/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -837,8 +837,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-229-g78c4ef4/localedata/locales/zh_TW
-+++ glibc-2.10.90-11/localedata/locales/zh_TW
+--- glibc-2.10-249-g4a13776/localedata/locales/zh_TW
++++ glibc-2.10.90-12/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -866,8 +866,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-229-g78c4ef4/malloc/mcheck.c
-+++ glibc-2.10.90-11/malloc/mcheck.c
+--- glibc-2.10-249-g4a13776/malloc/mcheck.c
++++ glibc-2.10.90-12/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -943,8 +943,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-229-g78c4ef4/manual/libc.texinfo
-+++ glibc-2.10.90-11/manual/libc.texinfo
+--- glibc-2.10-249-g4a13776/manual/libc.texinfo
++++ glibc-2.10.90-12/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -954,8 +954,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-229-g78c4ef4/misc/sys/cdefs.h
-+++ glibc-2.10.90-11/misc/sys/cdefs.h
+--- glibc-2.10-249-g4a13776/misc/sys/cdefs.h
++++ glibc-2.10.90-12/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)
@@ -999,17 +999,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-229-g78c4ef4/nis/nss
-+++ glibc-2.10.90-11/nis/nss
+--- glibc-2.10-249-g4a13776/nis/nss
++++ glibc-2.10.90-12/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-229-g78c4ef4/nptl/ChangeLog
-+++ glibc-2.10.90-11/nptl/ChangeLog
-@@ -3632,6 +3632,15 @@
+--- glibc-2.10-249-g4a13776/nptl/ChangeLog
++++ glibc-2.10.90-12/nptl/ChangeLog
+@@ -3636,6 +3636,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1025,7 +1025,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4368,6 +4377,11 @@
+@@ -4372,6 +4381,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1037,7 +1037,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6442,6 +6456,11 @@
+@@ -6446,6 +6460,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1049,8 +1049,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-229-g78c4ef4/nptl/Makefile
-+++ glibc-2.10.90-11/nptl/Makefile
+--- glibc-2.10-249-g4a13776/nptl/Makefile
++++ glibc-2.10.90-12/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1083,8 +1083,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-229-g78c4ef4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-11/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-249-g4a13776/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-12/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1093,8 +1093,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-229-g78c4ef4/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-11/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-249-g4a13776/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-12/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1102,8 +1102,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-229-g78c4ef4/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-11/nptl/tst-stackguard1.c
+--- glibc-2.10-249-g4a13776/nptl/tst-stackguard1.c
++++ glibc-2.10.90-12/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1128,8 +1128,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-229-g78c4ef4/nscd/nscd.conf
-+++ glibc-2.10.90-11/nscd/nscd.conf
+--- glibc-2.10-249-g4a13776/nscd/nscd.conf
++++ glibc-2.10.90-12/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1139,8 +1139,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-229-g78c4ef4/nscd/nscd.init
-+++ glibc-2.10.90-11/nscd/nscd.init
+--- glibc-2.10-249-g4a13776/nscd/nscd.init
++++ glibc-2.10.90-12/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1197,8 +1197,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-229-g78c4ef4/posix/Makefile
-+++ glibc-2.10.90-11/posix/Makefile
+--- glibc-2.10-249-g4a13776/posix/Makefile
++++ glibc-2.10.90-12/posix/Makefile
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1219,8 +1219,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-229-g78c4ef4/posix/getconf.speclist.h
-+++ glibc-2.10.90-11/posix/getconf.speclist.h
+--- glibc-2.10-249-g4a13776/posix/getconf.speclist.h
++++ glibc-2.10.90-12/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1261,8 +1261,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-229-g78c4ef4/streams/Makefile
-+++ glibc-2.10.90-11/streams/Makefile
+--- glibc-2.10-249-g4a13776/streams/Makefile
++++ glibc-2.10.90-12/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1272,8 +1272,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-229-g78c4ef4/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-11/sysdeps/generic/dl-cache.h
+--- glibc-2.10-249-g4a13776/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-12/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1289,8 +1289,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-229-g78c4ef4/sysdeps/i386/Makefile
-+++ glibc-2.10.90-11/sysdeps/i386/Makefile
+--- glibc-2.10-249-g4a13776/sysdeps/i386/Makefile
++++ glibc-2.10.90-12/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1315,8 +1315,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-229-g78c4ef4/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-11/sysdeps/ia64/Makefile
+--- glibc-2.10-249-g4a13776/sysdeps/ia64/Makefile
++++ glibc-2.10.90-12/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1328,8 +1328,8 @@
  endif
  endif
  
---- glibc-2.10-229-g78c4ef4/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-11/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-249-g4a13776/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-12/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1681,8 +1681,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-229-g78c4ef4/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-11/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-249-g4a13776/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-12/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1768,8 +1768,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-229-g78c4ef4/sysdeps/powerpc/powerpc32/____longjmp_chk.S
-+++ glibc-2.10.90-11/sysdeps/powerpc/powerpc32/____longjmp_chk.S
+--- glibc-2.10-249-g4a13776/sysdeps/powerpc/powerpc32/____longjmp_chk.S
++++ glibc-2.10.90-12/sysdeps/powerpc/powerpc32/____longjmp_chk.S
 @@ -49,8 +49,16 @@
  #define CHECK_SP(reg) \
  	cmplw	reg, r1;				\
@@ -1787,8 +1787,8 @@
  .Lok:
  
  #include <__longjmp-common.S>
---- glibc-2.10-229-g78c4ef4/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-11/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-249-g4a13776/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-12/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1797,8 +1797,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-229-g78c4ef4/sysdeps/powerpc/powerpc64/____longjmp_chk.S
-+++ glibc-2.10.90-11/sysdeps/powerpc/powerpc64/____longjmp_chk.S
+--- glibc-2.10-249-g4a13776/sysdeps/powerpc/powerpc64/____longjmp_chk.S
++++ glibc-2.10.90-12/sysdeps/powerpc/powerpc64/____longjmp_chk.S
 @@ -32,8 +32,16 @@
  #define CHECK_SP(reg) \
  	cmpld	reg, r1;				\
@@ -1816,8 +1816,8 @@
  .Lok:
  
  #include <__longjmp-common.S>
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/nice.c
-+++ glibc-2.10.90-11/sysdeps/unix/nice.c
+--- glibc-2.10-249-g4a13776/sysdeps/unix/nice.c
++++ glibc-2.10.90-12/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1832,8 +1832,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1849,8 +1849,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1898,8 +1898,8 @@
      }
    else
  #endif
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1942,8 +1942,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1962,8 +1962,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-12/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.
@@ -2024,8 +2024,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2058,29 +2058,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-12/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-229-g78c4ef4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-12/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-229-g78c4ef4/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-12/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-229-g78c4ef4/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2106,8 +2106,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2117,8 +2117,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2164,8 +2164,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-229-g78c4ef4/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-11/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-12/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-229-g78c4ef4/timezone/zic.c
-+++ glibc-2.10.90-11/timezone/zic.c
+--- glibc-2.10-249-g4a13776/timezone/zic.c
++++ glibc-2.10.90-12/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- glibc.spec	30 Jul 2009 13:39:12 -0000	1.405
+++ glibc.spec	3 Aug 2009 12:10:21 -0000	1.406
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-229-g78c4ef4
+%define glibcsrcdir glibc-2.10-249-g4a13776
 %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: 11
+Release: 12
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1037,6 +1037,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Aug  3 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-12
+- Update from master.
+  - fix fortify failure with longjmp from alternate stack (#512103)
+
 * Thu Jul 30 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-11
 - Update from master.
 - Don't package debuginfo files in glibc-devel.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- import.log	30 Jul 2009 13:39:12 -0000	1.21
+++ import.log	3 Aug 2009 12:10:21 -0000	1.22
@@ -19,3 +19,4 @@ glibc-2_10_90-7:HEAD:glibc-2.10.90-7.src
 glibc-2_10_90-9:HEAD:glibc-2.10.90-9.src.rpm:1248700754
 glibc-2_10_90-10:HEAD:glibc-2.10.90-10.src.rpm:1248773458
 glibc-2_10_90-11:HEAD:glibc-2.10.90-11.src.rpm:1248961080
+glibc-2_10_90-12:HEAD:glibc-2.10.90-12.src.rpm:1249300698


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- sources	30 Jul 2009 13:39:12 -0000	1.303
+++ sources	3 Aug 2009 12:10:21 -0000	1.304
@@ -1,2 +1,2 @@
-aa771912c40a639f35c00f8b513893eb  glibc-2.10-229-g78c4ef4-fedora.tar.bz2
-1ae22e300b699c8588f30fe53e5ba5a9  glibc-2.10-229-g78c4ef4.tar.bz2
+7cede3287354c69ce39cb51a5c93cd75  glibc-2.10-249-g4a13776-fedora.tar.bz2
+85ed0429bef20d29d0a7b17d33930f82  glibc-2.10-249-g4a13776.tar.bz2



From ruben at fedoraproject.org  Mon Aug  3 12:20:46 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon,  3 Aug 2009 12:20:46 +0000 (UTC)
Subject: rpms/pdns-recursor/devel .cvsignore, 1.7, 1.8 pdns-recursor.spec,
	1.12, 1.13 sources, 1.7, 1.8 pdns-recursor-boost.patch, 1.1,
	NONE pdns-recursor-fixsysconfdir.patch, 1.2,
	NONE pdns-recursor-gcc44.patch, 1.1, NONE
Message-ID: <20090803122046.B7DC511C02C6@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30086

Modified Files:
	.cvsignore pdns-recursor.spec sources 
Removed Files:
	pdns-recursor-boost.patch pdns-recursor-fixsysconfdir.patch 
	pdns-recursor-gcc44.patch 
Log Message:
* Mon Aug 03 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-1
- Upstream released new version
- Drop patches included upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Jul 2008 08:21:58 -0000	1.7
+++ .cvsignore	3 Aug 2009 12:20:46 -0000	1.8
@@ -1 +1 @@
-pdns-recursor-3.1.7.tar.bz2
+pdns-recursor-3.1.7.1.tar.bz2


Index: pdns-recursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/pdns-recursor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pdns-recursor.spec	25 Jul 2009 23:27:35 -0000	1.12
+++ pdns-recursor.spec	3 Aug 2009 12:20:46 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:		Modern, advanced and high performance recursing/non authoritative nameserver
 Name:			pdns-recursor
-Version:		3.1.7
-Release:		5%{?dist}
+Version:		3.1.7.1
+Release:		1%{?dist}
 Group:			System Environment/Daemons
 License:		GPLv2
 URL:			http://powerdns.com
@@ -9,10 +9,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 Source0:		http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Source1:		pdns-recursor.init	
 
-Patch0:			pdns-recursor-fixsysconfdir.patch
-Patch1:			pdns-recursor-fixmakefile.patch
-Patch2:			pdns-recursor-boost.patch
-Patch3:			pdns-recursor-gcc44.patch
+Patch0:			pdns-recursor-fixmakefile.patch
 
 Provides:		powerdns-recursor = %{version}-%{release}
 BuildRequires:		boost-devel, lua-devel
@@ -25,10 +22,7 @@ package if you need a dns cache for your
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixsysconfdir
-%patch1 -p1 -b .fixmakefile
-%patch2 -p1 -b .boost
-%patch3 -p1 -b .gcc44
+%patch0 -p1 -b .fixmakefile
 
 %build
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -80,6 +74,10 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-1
+- Upstream released new version
+- Drop patches included upstream
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Jul 2008 08:21:58 -0000	1.7
+++ sources	3 Aug 2009 12:20:46 -0000	1.8
@@ -1 +1 @@
-e7521055f949ba8e9e77fe27411be2ed  pdns-recursor-3.1.7.tar.bz2
+e8d6d6f1ec477741a2c9b3bb2e297e18  pdns-recursor-3.1.7.1.tar.bz2


--- pdns-recursor-boost.patch DELETED ---


--- pdns-recursor-fixsysconfdir.patch DELETED ---


--- pdns-recursor-gcc44.patch DELETED ---



From rhughes at fedoraproject.org  Mon Aug  3 12:23:02 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 12:23:02 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.64,
	1.65 gnome-power-manager.spec, 1.170, 1.171 sources, 1.65, 1.66
Message-ID: <20090803122302.DDC6C11C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30774

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-1
- Update to 2.27.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	30 Jul 2009 10:08:51 -0000	1.64
+++ .cvsignore	3 Aug 2009 12:23:02 -0000	1.65
@@ -1 +1 @@
-gnome-power-manager-2.27.3-20090730.tar.gz
+gnome-power-manager-2.27.5.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- gnome-power-manager.spec	30 Jul 2009 10:08:51 -0000	1.170
+++ gnome-power-manager.spec	3 Aug 2009 12:23:02 -0000	1.171
@@ -4,13 +4,13 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.27.3
-#Release: 2%{?dist}
-Release: 0.5.%{?alphatag}git%{?dist}
+Version: 2.27.5
+Release: 1%{?dist}
+#Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-#Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
-Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
+#Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
@@ -61,8 +61,8 @@ Requires: %{name} = %{version}-%{release
 Extra GNOME power management applications that are not normally needed.
 
 %prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure \
@@ -181,6 +181,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-1
+- Update to 2.27.5
+
 * Thu Jul 30 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.3-0.5.20090730git
 - Update to todays git snapshot.
 - Split the inhibit applet and gnome-power-statistics into an


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	30 Jul 2009 10:08:51 -0000	1.65
+++ sources	3 Aug 2009 12:23:02 -0000	1.66
@@ -1 +1 @@
-5e5e5c176d8909e7e6e7e603d9ff7cd3  gnome-power-manager-2.27.3-20090730.tar.gz
+59a935ed21dbeecd330f1549b37024df  gnome-power-manager-2.27.5.tar.gz



From nbecker at fedoraproject.org  Mon Aug  3 12:24:01 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon,  3 Aug 2009 12:24:01 +0000 (UTC)
Subject: rpms/filelight/F-11 .cvsignore, 1.2, 1.3 filelight.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <20090803122401.5818C11C02C6@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore filelight.spec sources 
Log Message:
update to 1.9rc2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:07:14 -0000	1.2
+++ .cvsignore	3 Aug 2009 12:24:01 -0000	1.3
@@ -1 +1 @@
-filelight-1.0.tar.bz2
+filelight-1.9-rc2.tgz


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-11/filelight.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- filelight.spec	24 Feb 2009 19:26:04 -0000	1.8
+++ filelight.spec	3 Aug 2009 12:24:01 -0000	1.9
@@ -2,17 +2,20 @@
 
 Summary: Graphical disk usage statistics
 Name: filelight
-Version: 1.0
-Release: 15%{?dist}
+Version: 1.9
+Release: 3.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
-Source: http://www.methylblue.com/filelight/packages/filelight-%{version}.tar.bz2
-Patch0: filelight.desktop.patch
+%define upstreamversion %{version}-rc2
+Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
+Patch0: filelight_part.desktop.diff
+Patch1: filelight.ChangeLog.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs3-devel >= 3.2 desktop-file-utils
+BuildRequires: kdelibs-devel kdebase-devel
+BuildRequires: desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -23,24 +26,35 @@ with each segment's size being proportio
 directories having child segments.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -b .orig
+%setup -q -n %{name}-%{upstreamversion}
+%patch0 -p0
+%patch1 -p0
 
 %build
-source "/etc/profile.d/qt.sh"
-%configure --disable-rpath  #--with-pic
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}  VERBOSE=1
+
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}"
+mkdir %{buildroot}
+%{__make} install DESTDIR="%{buildroot}" -C %{_target_platform}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
-  --add-category="X-Fedora" --vendor=""               \
-  --delete-original					\
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/filelight.desktop
+  --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
+  --vendor=""               \
+  --delete-original                                     \
+  ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
+
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/filelight_part.desktop
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -61,18 +75,33 @@ fi
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 #%doc %{_docdir}/HTML/en/filelight/
-%config(noreplace) %{_datadir}/config/filelightrc
-%{_bindir}/filelight
-%{_datadir}/applications/kde/filelight.desktop
-%{_datadir}/apps/filelight/
-%{_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{_datadir}/icons/hicolor/*/apps/filelight.png
-%{_datadir}/services/filelight_part.desktop
-%{_libdir}/kde3/libfilelight.la
-%{_libdir}/kde3/libfilelight.so
+%{_datadir}/config/filelightrc
+%{_kde4_bindir}/filelight
+%{_kde4_datadir}/applications/kde4/filelight.desktop
+%{_kde4_libdir}/kde4/filelightpart.so
+%{_kde4_datadir}/kde4/apps/filelightpart/
+%{_kde4_appsdir}/filelight
+%{_kde4_iconsdir}/hicolor/*/*/filelight.png
+%{_kde4_iconsdir}/hicolor/*/*/view_filelight.png
+%{_kde4_datadir}/kde4/services/filelight*.desktop
+##%{_kde4_iconsdir}/locolor/*/*/filelight.png
 
 
 %changelog
+* Sun Aug  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-3.rc2
+- fix some rpmlint complaints:
+- Follow cmake_kde4 recipe
+  untabify
+  convert ChangeLog to utf8
+  don't mark filelightrc as config
+
+* Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-2.rc2
+- Updates for kde4
+- Update to 1.9rc2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
 - use noreplace on config
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2006 20:07:14 -0000	1.2
+++ sources	3 Aug 2009 12:24:01 -0000	1.3
@@ -1 +1 @@
-aa885e53e09f40e7fdd371395140b957  filelight-1.0.tar.bz2
+bf1a0459997fdd9e2f3cbe6b2b8c0210  filelight-1.9-rc2.tgz



From nbecker at fedoraproject.org  Mon Aug  3 12:26:09 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon,  3 Aug 2009 12:26:09 +0000 (UTC)
Subject: rpms/filelight/F-10 .cvsignore, 1.2, 1.3 filelight.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20090803122609.0FF9511C02C6@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore filelight.spec sources 
Log Message:
update to 1.9rc2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:07:14 -0000	1.2
+++ .cvsignore	3 Aug 2009 12:26:08 -0000	1.3
@@ -1 +1 @@
-filelight-1.0.tar.bz2
+filelight-1.9-rc2.tgz


Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-10/filelight.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- filelight.spec	18 Jul 2008 16:03:13 -0000	1.6
+++ filelight.spec	3 Aug 2009 12:26:08 -0000	1.7
@@ -2,17 +2,20 @@
 
 Summary: Graphical disk usage statistics
 Name: filelight
-Version: 1.0
-Release: 13%{?dist}
+Version: 1.9
+Release: 3.rc2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.methylblue.com/filelight/
 
-Source: http://www.methylblue.com/filelight/packages/filelight-%{version}.tar.bz2
-Patch0: filelight.desktop.patch
+%define upstreamversion %{version}-rc2
+Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}.tgz
+Patch0: filelight_part.desktop.diff
+Patch1: filelight.ChangeLog.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs3-devel >= 3.2 desktop-file-utils
+BuildRequires: kdelibs-devel kdebase-devel
+BuildRequires: desktop-file-utils qimageblitz-devel
 Requires: hicolor-icon-theme
 
 %description
@@ -23,24 +26,35 @@ with each segment's size being proportio
 directories having child segments.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -b .orig
+%setup -q -n %{name}-%{upstreamversion}
+%patch0 -p0
+%patch1 -p0
 
 %build
-source "/etc/profile.d/qt.sh"
-%configure --disable-rpath  #--with-pic
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}  VERBOSE=1
+
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}"
+mkdir %{buildroot}
+%{__make} install DESTDIR="%{buildroot}" -C %{_target_platform}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
-  --add-category="X-Fedora" --vendor=""               \
-  --delete-original					\
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/filelight.desktop
+  --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
+  --vendor=""               \
+  --delete-original                                     \
+  ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
+
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/filelight_part.desktop
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -61,18 +75,39 @@ fi
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 #%doc %{_docdir}/HTML/en/filelight/
-%config %{_datadir}/config/filelightrc
-%{_bindir}/filelight
-%{_datadir}/applications/kde/filelight.desktop
-%{_datadir}/apps/filelight/
-%{_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{_datadir}/icons/hicolor/*/apps/filelight.png
-%{_datadir}/services/filelight_part.desktop
-%{_libdir}/kde3/libfilelight.la
-%{_libdir}/kde3/libfilelight.so
+%{_datadir}/config/filelightrc
+%{_kde4_bindir}/filelight
+%{_kde4_datadir}/applications/kde4/filelight.desktop
+%{_kde4_libdir}/kde4/filelightpart.so
+%{_kde4_datadir}/kde4/apps/filelightpart/
+%{_kde4_appsdir}/filelight
+%{_kde4_iconsdir}/hicolor/*/*/filelight.png
+%{_kde4_iconsdir}/hicolor/*/*/view_filelight.png
+%{_kde4_datadir}/kde4/services/filelight*.desktop
+##%{_kde4_iconsdir}/locolor/*/*/filelight.png
 
 
 %changelog
+* Sun Aug  2 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-3.rc2
+- fix some rpmlint complaints:
+- Follow cmake_kde4 recipe
+  untabify
+  convert ChangeLog to utf8
+  don't mark filelightrc as config
+
+* Fri Jul 31 2009 Neal Becker <ndbecker2 at gmail.com> - 1.9-2.rc2
+- Updates for kde4
+- Update to 1.9rc2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
+- use noreplace on config
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-13
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2006 20:07:14 -0000	1.2
+++ sources	3 Aug 2009 12:26:08 -0000	1.3
@@ -1 +1 @@
-aa885e53e09f40e7fdd371395140b957  filelight-1.0.tar.bz2
+bf1a0459997fdd9e2f3cbe6b2b8c0210  filelight-1.9-rc2.tgz



From nbecker at fedoraproject.org  Mon Aug  3 12:29:04 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon,  3 Aug 2009 12:29:04 +0000 (UTC)
Subject: rpms/filelight/F-11 filelight.ChangeLog.diff, NONE,
	1.1 filelight_part.desktop.diff, NONE, 1.1
Message-ID: <20090803122904.0AD6E11C02C6@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Added Files:
	filelight.ChangeLog.diff filelight_part.desktop.diff 
Log Message:
Add minor patches for rpmlint


filelight.ChangeLog.diff:
 ChangeLog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE filelight.ChangeLog.diff ---
diff -u ChangeLog.orig ChangeLog
--- ChangeLog.orig	2009-08-02 19:22:12.000000000 -0400
+++ ChangeLog	2009-08-02 19:25:37.000000000 -0400
@@ -52,7 +52,7 @@
      Compile bug fixed for GCC < 3
      Fixed crash bug when scan had been stopped and then back then forward pressed
      Fixed another compile bug for systems that don't support large files (Debian apparently)
-     Internationalisation support thanks to patch from Andr? Somers
+     Internationalisation support thanks to patch from Andr?? Somers
      Made the tooltip translucent (NOT a gimmick, this feature is essential IMO)
      Started making debug messages use kdDebug so users can enable/disable the messages
      Implemented XML GUI

filelight_part.desktop.diff:
 filelight_part.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE filelight_part.desktop.diff ---
--- misc/filelight_part.desktop~	2009-08-02 19:06:43.000000000 -0400
+++ misc/filelight_part.desktop	2009-08-02 19:06:33.000000000 -0400
@@ -12,7 +12,6 @@
 Name[tr]=RadialMap G??r??nt??leme
 Name[uk]=???????????????? RadialMap
 Name[x-test]=xxRadialMap Viewxx
-MimeType=inode/directory;
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=filelightpart
 # X-KDE-PluginKeyword=filelightpart



From nbecker at fedoraproject.org  Mon Aug  3 12:29:55 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Mon,  3 Aug 2009 12:29:55 +0000 (UTC)
Subject: rpms/filelight/F-10 filelight.ChangeLog.diff, NONE,
	1.1 filelight_part.desktop.diff, NONE, 1.1
Message-ID: <20090803122955.8EAF811C02C6@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Added Files:
	filelight.ChangeLog.diff filelight_part.desktop.diff 
Log Message:


filelight.ChangeLog.diff:
 ChangeLog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE filelight.ChangeLog.diff ---
diff -u ChangeLog.orig ChangeLog
--- ChangeLog.orig	2009-08-02 19:22:12.000000000 -0400
+++ ChangeLog	2009-08-02 19:25:37.000000000 -0400
@@ -52,7 +52,7 @@
      Compile bug fixed for GCC < 3
      Fixed crash bug when scan had been stopped and then back then forward pressed
      Fixed another compile bug for systems that don't support large files (Debian apparently)
-     Internationalisation support thanks to patch from Andr? Somers
+     Internationalisation support thanks to patch from Andr?? Somers
      Made the tooltip translucent (NOT a gimmick, this feature is essential IMO)
      Started making debug messages use kdDebug so users can enable/disable the messages
      Implemented XML GUI

filelight_part.desktop.diff:
 filelight_part.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE filelight_part.desktop.diff ---
--- misc/filelight_part.desktop~	2009-08-02 19:06:43.000000000 -0400
+++ misc/filelight_part.desktop	2009-08-02 19:06:33.000000000 -0400
@@ -12,7 +12,6 @@
 Name[tr]=RadialMap G??r??nt??leme
 Name[uk]=???????????????? RadialMap
 Name[x-test]=xxRadialMap Viewxx
-MimeType=inode/directory;
 ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=filelightpart
 # X-KDE-PluginKeyword=filelightpart



From rhughes at fedoraproject.org  Mon Aug  3 12:33:33 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 12:33:33 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.51,
	1.52 gnome-packagekit.spec, 1.93, 1.94 sources, 1.52, 1.53
Message-ID: <20090803123333.A532B11C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-1
- New upstream version
- Port all the code to using PolicyKit1 rather than PolicyKit
- Reduce the size displayed as the package is downloaded
- Scroll to the package being processed in the update list
- Fixes #510730, #510984, #510730, #497737 and #514879



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	27 Jul 2009 17:05:33 -0000	1.51
+++ .cvsignore	3 Aug 2009 12:33:33 -0000	1.52
@@ -1 +1 @@
-gnome-packagekit-2.27.4-20090727.tar.gz
+gnome-packagekit-2.27.5.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- gnome-packagekit.spec	27 Jul 2009 17:05:33 -0000	1.93
+++ gnome-packagekit.spec	3 Aug 2009 12:33:33 -0000	1.94
@@ -14,14 +14,14 @@
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.27.4
-Release:   0.1.%{?alphatag}git%{?dist}
-#Release:   2%{?dist}
+Version:   2.27.5
+#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.27/%{name}-%{version}.tar.gz
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}.tar.gz
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{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
@@ -117,19 +117,19 @@ done
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
 for f in $helpdir/C/figures/*.png; do
   b="$(basename $f)"
-  for d in $helpdir/*; do 
+  for d in $helpdir/*; do
     if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
       g="$d/figures/$b"
       if [ -f "$g" ]; then
         if cmp -s $f $g; then
           rm "$g"; ln -s "../../C/figures/$b" "$g"
-        fi  
-      fi 
-    fi 
+        fi
+      fi
+    fi
   done
 done
 
-%find_lang %name
+%find_lang %name --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -221,6 +221,13 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-1
+- New upstream version
+- Port all the code to using PolicyKit1 rather than PolicyKit
+- Reduce the size displayed as the package is downloaded
+- Scroll to the package being processed in the update list
+- Fixes #510730, #510984, #510730, #497737 and #514879
+
 * Mon Jul 27 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.4-0.1.20090727git
 - Update to latest git master snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	27 Jul 2009 17:05:33 -0000	1.52
+++ sources	3 Aug 2009 12:33:33 -0000	1.53
@@ -1 +1 @@
-052468a1acb3ba1601caeb16097323a2  gnome-packagekit-2.27.4-20090727.tar.gz
+06f0f9538918987210211ed239c41fee  gnome-packagekit-2.27.5.tar.gz



From gerd at fedoraproject.org  Mon Aug  3 12:42:58 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Mon,  3 Aug 2009 12:42:58 +0000 (UTC)
Subject: rpms/parrot/F-11 import.log, 1.5, 1.6 parrot-1.x.0.patch, 1.1,
	1.2 parrot.spec, 1.5, 1.6
Message-ID: <20090803124259.06C5F11C02C6@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot-1.x.0.patch parrot.spec 
Log Message:
make two more changes to build Rakudo from an installed parrot
- include the necessary module Parrot::Oplib::core
- change the place of header files to /usr/include/parrrot/<version>



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	1 Aug 2009 12:24:51 -0000	1.5
+++ import.log	3 Aug 2009 12:42:58 -0000	1.6
@@ -3,3 +3,4 @@ parrot-1_4_0-1_fc11:F-11:parrot-1.4.0-1.
 parrot-1_4_0-3_fc11:F-11:parrot-1.4.0-3.fc11.src.rpm:1248285543
 parrot-1_4_0-5_fc11:F-11:parrot-1.4.0-5.fc11.src.rpm:1249128393
 parrot-1_4_0-6_fc11:F-11:parrot-1.4.0-6.fc11.src.rpm:1249129108
+parrot-1_4_0-7_fc11:F-11:parrot-1.4.0-7.fc11.src.rpm:1249303263

parrot-1.x.0.patch:
 config/gen/makefiles/parrot_pc.in |    2 +-
 lib/Parrot/Install.pm             |   10 ++++++++++
 tools/dev/install_files.pl        |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: parrot-1.x.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot-1.x.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot-1.x.0.patch	21 Jul 2009 16:51:41 -0000	1.1
+++ parrot-1.x.0.patch	3 Aug 2009 12:42:58 -0000	1.2
@@ -1,14 +1,6 @@
---- tools/dev/install_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_files.pl	2009-06-02 16:12:00.000000000 +0200
-@@ -133,7 +133,6 @@
-         transform => sub {
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
-@@ -157,7 +156,7 @@
+--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
++++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
+@@ -163,7 +163,7 @@
              # libdir as it is typically done with automake installed packages.
              # If there is a use case to make this configurable we'll add a
              # seperate --pkgconfigdir option.
@@ -17,16 +9,14 @@
              return($filehash);
          },
      },
---- tools/dev/install_dev_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_dev_files.pl	2009-06-02 16:19:07.000000000 +0200
-@@ -124,7 +124,6 @@
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
+--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
++++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
+@@ -7,4 +7,4 @@
+ Description: virtual machine to execute bytecode for interpreted languages
+ Version: @VERSION@
+ Libs: -L${libdir} -lparrot @icu_shared@ @libs@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}@versiondir@
 --- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
 +++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
 @@ -220,6 +220,16 @@
@@ -46,13 +36,3 @@
              copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
              print "$dest\n";
          }
---- MANIFEST.generated	2009-07-14 23:49:14.000000000 +0200
-+++ MANIFEST.generated.new	2009-07-17 13:39:08.000000000 +0200
-@@ -241,5 +241,6 @@
- src/pmc/sub.dump                                  [devel]src
- src/pmc/undef.dump                                [devel]src
- src/string_private_cstring.h                      []
--tools/build/dynpmc.pl                             []
-+tools/build/dynoplibs.pl                          [devel]
-+tools/build/dynpmc.pl                             [devel]
- vtable.dump                                       [devel]src


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- parrot.spec	1 Aug 2009 12:24:51 -0000	1.5
+++ parrot.spec	3 Aug 2009 12:42:58 -0000	1.6
@@ -1,29 +1,25 @@
 Name:           parrot
 Version:        1.4.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
 
 Patch0:         parrot-1.x.0.patch
-# see for upstream:       https://trac.parrot.org/parrot/ticket/735
-# patched files:          tools/dev/install_files.pl
-#                         tools/dev/install_dev_files.pl
-# Changes the path for header files (to have no version subdirectory)
-# It is also responsible to have no subdirectory under pkgconfig.
+# patches file:           tools/dev/install_files.pl
+# It is responsible to have no subdirectory under pkgconfig.
+#
+# patches file:           config/gen/makefiles/parrot_pc.in
+# So "pkg-config parrot --cflags" works correct
 #
 # see for upstream:       https://trac.parrot.org/parrot/ticket/509
 # patched file:           lib/Parrot/Install.pm
 # is to have the symlink:    libparrot.so  ->  libparrot.so.%{version}
 # Without this %{_libdir}/libparrot.so would not be a symbolic link to
 # %{_libdir}/libparrot.so.%{version}  
-#
-# see for upstream:       https://trac.parrot.org/parrot/ticket/844
-# patched file:           MANIFEST.generated
-# Add two perl-srcipts that are need to build Rakudo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
@@ -94,15 +90,13 @@ Parrot Virtual Machine development files
 %setup -q
 %patch0 -p0
 
-%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
-    src/library.c
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
-    tools/dev/install_files.pl
+%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
 
 
 cat << \EOF > %{name}-prov
 #!/bin/sh
-%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
+%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' \
+                             -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
 EOF
 
 %global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
@@ -181,12 +175,6 @@ find %{RPM_PAR_LIB_DIR}tools -type f -na
 find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
     -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
     -exec chmod 755 {} \;
-# Set path to perl binary
-find %{RPM_PAR_LIB_DIR}tools/build -type f -name "dyn*.pl" \
-    -exec %{__sed} -i -e '1 s&# ex: set ro:&#!/usr/bin/perl&' {} \; 
-# This module is only needed for building and should not be installed (I think)
-# module "Parrot::OpLib::core"
-rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib
 
 # Remove doc-files with zero-length
 find docs/html -type f -size 0 -exec rm -f {} \;
@@ -250,10 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
 %doc RESPONSIBLE_PARTIES TODO LICENSE
-%exclude %{_bindir}/parrot_config
-%exclude %{_bindir}/parrot_debugger
-%exclude %{_bindir}/pbc_*
-%{_bindir}/*
+%{_bindir}/parrot
 %{_libdir}/parrot/
 %exclude %{_libdir}/parrot/%{version}/tools
 %exclude %{_libdir}/parrot/%{version}/VERSION
@@ -273,22 +258,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
 %{_includedir}/parrot
-%{_includedir}/pmc
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
-%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
 # Files for building languages
 %{_libdir}/parrot/%{version}/tools/*
 %{_libdir}/parrot/%{version}/VERSION
+%{_usr}/src/parrot/*
 
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-7
+- include the necessary module Parrot::Oplib::core
+- change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
@@ -297,14 +283,11 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
-* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
+* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
 - add a list of changes from Lubomir Rintel
-- add patch to remove rpath
 - add filtering Provides
 - change requires for docs-subpackage
 - enable test suite
-
-* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
 - change the group of the subpackage "-docs" to Documentation
 - put the main-documentation from the docs-package to the main package
 - LICENSE file added
@@ -322,8 +305,6 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
 - Removed wrong prefix from pkgconfig per Christoph Wickert
 - Changed i386 to ix86 per Christoph Wickert
-
-* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
 - Changed hard-coded path requirement to perl.
 
 
@@ -351,34 +332,20 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 
-* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
-- Update to 0.5.2.
-
-* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
-- Update to 0.5.1.
-
 * Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
 - Update to 0.4.9.
 - BuildRequires ncurses-devel.
 - For some reason now I need to force -lm too.
 - Remove some files/directories that shouldn't be included.
-
-* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
 - Override lib_dir and make various substitutions to try to fix multilib.
 - Remove rpath use from Makefile.
 - Fix a pod error in src/ops/experimental.ops.
 - Enable "make test" since t/doc/pod.t won't fail now.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
 - Force permissions on shared libraries so rpmbuild strips them.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
 - Fix URL, description, summary, etc.
 - Add post/postun.
 - Move parrot-config to the devel sub-package.
 - Force permissions on the doc directories.
-
-* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
 - Add -lcurses to get readline detection to work.
 - Add BuildRequires libicu-devel.
 



From jwrdegoede at fedoraproject.org  Mon Aug  3 12:43:19 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon,  3 Aug 2009 12:43:19 +0000 (UTC)
Subject: rpms/vegastrike/devel vegastrike-0.5.0-glext.patch, NONE,
	1.1 vegastrike.spec, 1.20, 1.21
Message-ID: <20090803124319.A239511C02C6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	vegastrike.spec 
Added Files:
	vegastrike-0.5.0-glext.patch 
Log Message:
* Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-12
- Fix building with latest OpenGL headers


vegastrike-0.5.0-glext.patch:
 gl_globals.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE vegastrike-0.5.0-glext.patch ---
diff -up vegastrike-source-0.5.0/src/gldrv/gl_globals.h.foo vegastrike-source-0.5.0/src/gldrv/gl_globals.h
--- vegastrike-source-0.5.0/src/gldrv/gl_globals.h.foo	2008-04-26 11:59:59.000000000 +0200
+++ vegastrike-source-0.5.0/src/gldrv/gl_globals.h	2009-08-03 13:30:27.000000000 +0200
@@ -89,6 +89,7 @@ struct GFXStats{
     #include <GL/glut.h>
 #include "gl_undefined_extensions.h"
 #undef __glext_h_
+#undef GL_VERSION_1_3
 
     #include <GL/glext.h>
 #endif


Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vegastrike.spec	27 Jul 2009 06:49:13 -0000	1.20
+++ vegastrike.spec	3 Aug 2009 12:43:19 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -19,6 +19,7 @@ Patch5:         vegastrike-0.4.3-openal.
 Patch6:         vegastrike-0.4.3-sys-python.patch
 Patch7:         vegastrike-0.5.0-boost-make_shared.patch
 Patch8:         vegastrike-0.5.0-gcc44.patch
+Patch9:         vegastrike-0.5.0-glext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
@@ -45,6 +46,7 @@ Yet danger lurks in the space beyond.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp
 mv README.tmp README
@@ -100,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-12
+- Fix building with latest OpenGL headers
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Aug  3 12:43:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 12:43:30 +0000 (UTC)
Subject: rpms/xapian-bindings/F-11 .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 xapian-bindings.spec, 1.19, 1.20
Message-ID: <20090803124330.38C9211C02C6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5094

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Apr 2009 21:45:35 -0000	1.8
+++ .cvsignore	3 Aug 2009 12:43:29 -0000	1.9
@@ -1 +1 @@
-xapian-bindings-1.0.11.tar.gz
+xapian-bindings-1.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Apr 2009 21:45:35 -0000	1.9
+++ sources	3 Aug 2009 12:43:29 -0000	1.10
@@ -1 +1 @@
-7297a1d09564fe31b768fe58eabd219d  xapian-bindings-1.0.11.tar.gz
+d6f86ccc3d1a534902e1cf8df1cb43f3  xapian-bindings-1.0.14.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/F-11/xapian-bindings.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xapian-bindings.spec	7 Apr 2009 15:07:24 -0000	1.19
+++ xapian-bindings.spec	3 Aug 2009 12:43:30 -0000	1.20
@@ -4,8 +4,8 @@
 
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
-Version: 1.0.11
-Release: 2%{?dist}
+Version: 1.0.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://www.xapian.org/
@@ -77,6 +77,18 @@ rm -rf %{buildroot}%{buildroot}/usr/shar
 
 
 %changelog
+* Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14.1
+- Update to 1.0.14
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun  5 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.13.1
+- Update to 1.0.13
+
+* Sun Apr 19 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.12.1
+- Update to 1.0.12
+
 * Tue Apr 07 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.11-2
 - Obsolete pyxapian
 



From pghmcfc at fedoraproject.org  Mon Aug  3 12:46:16 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  3 Aug 2009 12:46:16 +0000 (UTC)
Subject: rpms/proftpd/F-10 proftpd-1.3.2-parallel-build.patch, NONE,
	1.1 proftpd-1.3.2a-defines.patch, NONE,
	1.1 proftpd-1.3.2rc3-nostrip.patch, NONE, 1.1 proftpd.sysconfig,
	NONE, 1.1 .cvsignore, 1.12, 1.13 proftpd.conf, 1.9,
	1.10 proftpd.init, 1.6, 1.7 proftpd.spec, 1.44, 1.45 sources,
	1.12, 1.13 proftpd-1.3.1-find-umode_t.patch, 1.1, NONE
Message-ID: <20090803124616.BCADA11C02C6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

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

Modified Files:
	.cvsignore proftpd.conf proftpd.init proftpd.spec sources 
Added Files:
	proftpd-1.3.2-parallel-build.patch 
	proftpd-1.3.2a-defines.patch proftpd-1.3.2rc3-nostrip.patch 
	proftpd.sysconfig 
Removed Files:
	proftpd-1.3.1-find-umode_t.patch 
Log Message:
Sync with devel

proftpd-1.3.2-parallel-build.patch:
 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE proftpd-1.3.2-parallel-build.patch ---
diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
--- proftpd-1.3.2-orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2/Makefile.in	2009-02-16 14:28:43.000000000 +0100
@@ -54,13 +54,13 @@
 proftpd$(EXEEXT): lib src modules dirs locale
 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
 
-ftpcount$(EXEEXT): utils
+ftpcount$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
 
-ftpdctl$(EXEEXT): src
+ftpdctl$(EXEEXT): lib src
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
 
-ftpshut$(EXEEXT): utils
+ftpshut$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
 
 ftptop$(EXEEXT): lib utils

proftpd-1.3.2a-defines.patch:
 dirtree.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE proftpd-1.3.2a-defines.patch ---
http://bugs.proftpd.org/show_bug.cgi?id=3221

--- proftpd-1.3.2a/src/dirtree.c	2009-04-28 23:33:57.000000000 +0100
+++ proftpd-1.3.2a/src/dirtree.c	2009-07-06 12:06:51.000000000 +0100
@@ -575,6 +575,17 @@
     }
   }
 
+  if (defines_perm_list) {
+    char **defines = defines_perm_list->elts;
+    register unsigned int i = 0;
+
+    for (i = 0; i < defines_perm_list->nelts; i++) {
+      if (defines[i] &&
+          strcmp(defines[i], definition) == 0)
+        return TRUE;
+    }
+  }
+
   errno = ENOENT;
   return FALSE;
 }

proftpd-1.3.2rc3-nostrip.patch:
 Make.rules.in                 |    4 ++--
 contrib/mod_load/Makefile.in  |    2 +-
 contrib/mod_wrap2/Makefile.in |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE proftpd-1.3.2rc3-nostrip.patch ---
Removing @INSTALL_STRIP@ prevents stripping of debuginfo at %install time

Cleaning up top_srcdir prevents debuginfo package creation fails like this:
/usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character

--- proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:26.000000000 +0000
+++ proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:48.000000000 +0000
@@ -29,8 +29,8 @@
 INSTALL=@INSTALL@
 INSTALL_USER=@install_user@
 INSTALL_GROUP=@install_group@
-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_BIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_SBIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
 
 RM=rm -f
--- proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2009-01-08 20:37:26.000000000 +0000
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules
--- proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2009-07-03 17:00:41.000000000 +0100
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules


--- NEW FILE proftpd.sysconfig ---
# Set PROFTPD_OPTIONS to add command-line options for proftpd.
# See proftpd(8) for a comprehensive list of what can be used.
#
# The following "Defines" can be used with the default configuration file:
# -DANONYMOUS_FTP	: Enable anonymous FTP
# -DDYNAMIC_BAN_LISTS	: Enable dynamic ban lists (mod_ban)
# -DTLS			: Enable TLS (mod_tls)
#
# For example, for anonymous FTP and dynamic ban list support:
# PROFTPD_OPTIONS="-DANONYMOUS_FTP -DDYNAMIC_BAN_LISTS"
PROFTPD_OPTIONS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Apr 2009 21:57:30 -0000	1.12
+++ .cvsignore	3 Aug 2009 12:46:16 -0000	1.13
@@ -1 +1 @@
-proftpd-1.3.2.tar.bz2
+proftpd-1.3.2a.tar.bz2


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- proftpd.conf	2 Jan 2009 13:45:48 -0000	1.9
+++ proftpd.conf	3 Aug 2009 12:46:16 -0000	1.10
@@ -1,169 +1,239 @@
 # This is the ProFTPD configuration file
+#
+# See: http://www.proftpd.org/docs/directives/linked/by-name.html
+
+# Server Config - config used for anything outside a <VirtualHost> or <Global> context
+# See: http://www.proftpd.org/docs/howto/Vhost.html
 
 ServerName			"ProFTPD server"
 ServerIdent			on "FTP Server ready."
 ServerAdmin			root at localhost
-ServerType			standalone
-#ServerType			inetd
 DefaultServer			on
-AccessGrantMsg			"User %u logged in."
-#DisplayConnect			/etc/ftpissue
-#DisplayLogin			/etc/ftpmotd
-#DisplayGoAway			/etc/ftpgoaway
-DeferWelcome			off
 
-# Use this to excude users from the chroot
+# Cause every FTP user except adm to be chrooted into their home directory
 DefaultRoot			~ !adm
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd
 AuthOrder			mod_auth_pam.c* mod_auth_unix.c
+# If you use NIS/YP/LDAP you may need to disable PersistentPasswd
+#PersistentPasswd		off
 
-# Do not perform ident nor DNS lookups (hangs when the port is filtered)
-IdentLookups			off
+# Don't do reverse DNS lookups (hangs on DNS problems)
 UseReverseDNS			off
 
-# Port 21 is the standard FTP port.
-Port				21
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# Default to show dot files in directory listings
-ListOptions			"-a"
-
-# See Configuration.html for these (here are the default values)
-#MultilineRFC2228		off
-#RootLogin			off
-#LoginPasswordPrompt		on
-#MaxLoginAttempts		3
-#MaxClientsPerHost		none
-#AllowForeignAddress		off	# For FXP
-
-# Allow to resume not only the downloads but the uploads too
-AllowRetrieveRestart		on
-AllowStoreRestart		on
+# Set the user and group that the server runs as
+User				nobody
+Group				nobody
 
 # To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
+# to 20.  If you need to allow more than 20 concurrent connections
 # at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
+# in standalone mode; in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
 # (such as xinetd)
 MaxInstances			20
 
-# Set the user and group that the server normally runs at.
-User				nobody
-Group				nobody
-
 # Disable sendfile by default since it breaks displaying the download speeds in
 # ftptop and ftpwho
-UseSendfile			no
-
-# This is where we want to put the pid file
-ScoreboardFile			/var/run/proftpd.score
-
-# Normally, we want users to do a few things.
-<Global>
-  AllowOverwrite		yes
-  <Limit ALL SITE_CHMOD>
-    AllowAll
-  </Limit>
-</Global>
+UseSendfile			off
 
 # Define the log formats
 LogFormat			default	"%h %l %u %t \"%r\" %s %b"
 LogFormat			auth	"%v [%P] %h %t \"%r\" %s"
 
-# TLS
-# Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html
-#TLSEngine			on
-#TLSRequired			on
-#TLSRSACertificateFile		/etc/pki/tls/certs/proftpd.pem
-#TLSRSACertificateKeyFile	/etc/pki/tls/certs/proftpd.pem
-#TLSCipherSuite			ALL:!ADH:!DES
-#TLSOptions			NoCertRequest
-#TLSVerifyClient		off
-##TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
-#TLSLog				/var/log/proftpd/tls.log
-
-# SQL authentication Dynamic Shared Object (DSO) loading
-# See README.DSO and howto/DSO.html for more details.
-#<IfModule mod_dso.c>
-#  LoadModule mod_ban.c
-#  LoadModule mod_ifsession.c
-#  LoadModule mod_quotatab.c
-#  LoadModule mod_quotatab_file.c
-#  LoadModule mod_sql.c
-#  LoadModule mod_sql_mysql.c
-#  LoadModule mod_sql_postgres.c
-#</IfModule>
-
-# A basic anonymous configuration, with an upload directory.
-#<Anonymous ~ftp>
-#  User				ftp
-#  Group				ftp
-#  AccessGrantMsg		"Anonymous login ok, restrictions apply."
-#
-#  # We want clients to be able to login with "anonymous" as well as "ftp"
-#  UserAlias			anonymous ftp
-#
-#  # Limit the maximum number of anonymous logins
-#  MaxClients			10 "Sorry, max %m users -- try again later"
-#
-#  # Put the user into /pub right after login
-#  #DefaultChdir			/pub
-#
-#  # We want 'welcome.msg' displayed at login, '.message' displayed in
-#  # each newly chdired directory and tell users to read README* files. 
-#  DisplayLogin			/welcome.msg
-#  DisplayFirstChdir		.message
-#  DisplayReadme			README*
-#
-#  # Some more cosmetic and not vital stuff
-#  DirFakeUser			on ftp
-#  DirFakeGroup			on ftp
-#
-#  # Limit WRITE everywhere in the anonymous chroot
-#  <Limit WRITE SITE_CHMOD>
-#    DenyAll
-#  </Limit>
-#
-#  # An upload directory that allows storing files but not retrieving
-#  # or creating directories.
-#  <Directory uploads/*>
-#    AllowOverwrite		no
-#    <Limit READ>
-#      DenyAll
-#    </Limit>
-#
-#    <Limit STOR>
-#      AllowAll
-#    </Limit>
-#  </Directory>
-#
-#  # Don't write anonymous accesses to the system wtmp file (good idea!)
-#  WtmpLog			off
-#
-#  # Logging for the anonymous transfers
-#  ExtendedLog		/var/log/proftpd/access.log WRITE,READ default
-#  ExtendedLog		/var/log/proftpd/auth.log AUTH auth
-#
-#</Anonymous>
-
-# Configuration for mod_ban
-<IfModule mod_ban.c>
-  BanEngine on
-  BanLog /var/log/proftpd/ban.log
-  BanTable /var/run/proftpd/ban.tab
+# Dynamic Shared Object (DSO) loading
+# See README.DSO and howto/DSO.html for more details
+#
+# General database support (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql.c
+#
+# Mysql support (requires proftpd-mysql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_mysql.c
+#
+# Postgresql support (requires proftpd-postgresql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_postgres.c
+#
+# Quota support (http://www.proftpd.org/docs/contrib/mod_quotatab.html)
+#   LoadModule mod_quotatab.c
+#
+# File-specific "driver" for storing quota table information in files
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_file.html)
+#   LoadModule mod_quotatab_file.c
+#
+# SQL database "driver" for storing quota table information in SQL tables
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_sql.html)
+#   LoadModule mod_quotatab_sql.c
+#
+# LDAP support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/directives/linked/config_ref_mod_ldap.html)
+#   LoadModule mod_ldap.c
+#
+# LDAP quota support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_ldap.html)
+#   LoadModule mod_quotatab_ldap.c
+#
+# Support for authenticating users using the RADIUS protocol
+# (http://www.proftpd.org/docs/contrib/mod_radius.html)
+#   LoadModule mod_radius.c
+#
+# Retrieve quota limit table information from a RADIUS server
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_radius.html)
+#   LoadModule mod_quotatab_radius.c
+#
+# Administrative control actions for the ftpdctl program
+# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
+#   LoadModule mod_ctrls_admin.c
+#
+# Support for POSIX ACLs
+# (http://www.proftpd.org/docs/modules/mod_facl.html)
+#   LoadModule mod_facl.c
+#
+# Configure server availability based on system load
+# (http://www.proftpd.org/docs/contrib/mod_load.html)
+#   LoadModule mod_load.c
+#
+# Limit downloads to a multiple of upload volume (see README.ratio)
+#   LoadModule mod_ratio.c
+#
+# Rewrite FTP commands sent by clients on-the-fly,
+# using regular expression matching and substitution 
+# (http://www.proftpd.org/docs/contrib/mod_rewrite.html)
+#   LoadModule mod_rewrite.c
+#
+# Support for miscellaneous SITE commands such as SITE MKDIR, SITE SYMLINK,
+# and SITE UTIME (http://www.proftpd.org/docs/contrib/mod_site_misc.html)
+#   LoadModule mod_site_misc.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap.html)
+#   LoadModule mod_wrap.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, as well as SQL-based access rules, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap2.html)
+#   LoadModule mod_wrap2.c
+#
+# Support module for mod_wrap2 that handles access rules stored in specially
+# formatted files on disk
+# (http://www.proftpd.org/docs/contrib/mod_wrap2_file.html)
+#   LoadModule mod_wrap2_file.c
+#
+# Support module for mod_wrap2 that handles access rules stored in SQL
+# database tables (http://www.proftpd.org/docs/contrib/mod_wrap2_sql.html)
+#   LoadModule mod_wrap2_sql.c
+#
+# Provide a flexible way of specifying that certain configuration directives
+# only apply to certain sessions, based on credentials such as connection
+# class, user, or group membership
+# (http://www.proftpd.org/docs/contrib/mod_ifsession.html)
+#   LoadModule mod_ifsession.c
+
+# TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+<IfDefine TLS>
+  LoadModule			mod_tls.c
+  TLSEngine			on
+  TLSRequired			on
+  TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem
+  TLSRSACertificateKeyFile	@PKIDIR@/certs/proftpd.pem
+  TLSCipherSuite		ALL:!ADH:!DES
+  TLSOptions			NoCertRequest
+  TLSVerifyClient		off
+  #TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
+  TLSLog			/var/log/proftpd/tls.log
+</IfDefine>
+
+# Dynamic ban lists (http://www.proftpd.org/docs/contrib/mod_ban.html)
+# Enable this with PROFTPD_OPTIONS=-DDYNAMIC_BAN_LISTS in /etc/sysconfig/proftpd
+<IfDefine DYNAMIC_BAN_LISTS>
+  LoadModule			mod_ban.c
+  BanEngine			on
+  BanLog			/var/log/proftpd/ban.log
+  BanTable			/var/run/proftpd/ban.tab
 
   # If the same client reaches the MaxLoginAttempts limit 2 times
   # within 10 minutes, automatically add a ban for that client that
   # will expire after one hour.
-  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+  BanOnEvent			MaxLoginAttempts 2/00:10:00 01:00:00
 
   # Allow the FTP admin to manually add/remove bans
-  BanControlsACLs all allow user ftpadm
-</IfModule>
+  BanControlsACLs		all allow user ftpadm
+</IfDefine>
+
+# Global Config - config common to Server Config and all virtual hosts
+# See: http://www.proftpd.org/docs/howto/Vhost.html
+<Global>
+
+  # Umask 022 is a good standard umask to prevent new dirs and files
+  # from being group and world writable
+  Umask				022
+
+  # Don't do ident queries (hangs when the port is filtered)
+  IdentLookups			off
+
+  # Allow users to overwrite files and change permissions
+  AllowOverwrite		yes
+  <Limit ALL SITE_CHMOD>
+    AllowAll
+  </Limit>
+
+</Global>
+
+# A basic anonymous configuration, with an upload directory
+# Enable this with PROFTPD_OPTIONS=-DANONYMOUS_FTP in /etc/sysconfig/proftpd
+<IfDefine ANONYMOUS_FTP>
+  <Anonymous ~ftp>
+    User			ftp
+    Group			ftp
+    AccessGrantMsg		"Anonymous login ok, restrictions apply."
+
+    # We want clients to be able to login with "anonymous" as well as "ftp"
+    UserAlias			anonymous ftp
+
+    # Limit the maximum number of anonymous logins
+    MaxClients			10 "Sorry, max %m users -- try again later"
+
+    # Put the user into /pub right after login
+    #DefaultChdir		/pub
+
+    # We want 'welcome.msg' displayed at login, '.message' displayed in
+    # each newly chdired directory and tell users to read README* files. 
+    DisplayLogin		/welcome.msg
+    DisplayChdir		.message
+    DisplayReadme		README*
+
+    # Cosmetic option to make all files appear to be owned by user "ftp"
+    DirFakeUser			on ftp
+    DirFakeGroup		on ftp
+
+    # Limit WRITE everywhere in the anonymous chroot
+    <Limit WRITE SITE_CHMOD>
+      DenyAll
+    </Limit>
+
+    # An upload directory that allows storing files but not retrieving
+    # or creating directories.
+    <Directory uploads/*>
+      AllowOverwrite		no
+      <Limit READ>
+        DenyAll
+      </Limit>
+
+      <Limit STOR>
+        AllowAll
+      </Limit>
+    </Directory>
+
+    # Don't write anonymous accesses to the system wtmp file (good idea!)
+    WtmpLog			off
+
+    # Logging for the anonymous transfers
+    ExtendedLog			/var/log/proftpd/access.log WRITE,READ default
+    ExtendedLog			/var/log/proftpd/auth.log AUTH auth
+
+  </Anonymous>
+</IfDefine>
 


Index: proftpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- proftpd.init	19 Aug 2007 16:18:30 -0000	1.6
+++ proftpd.init	3 Aug 2009 12:46:16 -0000	1.7
@@ -33,10 +33,16 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+# Source ProFTPD configuration.
+PROFTPD_OPTIONS=""
+if [ -f /etc/sysconfig/proftpd ]; then
+	. /etc/sysconfig/proftpd
+fi
+
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
-[ -x /usr/sbin/proftpd ] || exit 0
+[ -x /usr/sbin/proftpd ] || exit 5
 
 RETVAL=0
 
@@ -44,7 +50,7 @@ prog="proftpd"
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon proftpd 2>/dev/null
+	daemon proftpd $PROFTPD_OPTIONS 2>/dev/null
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- proftpd.spec	9 Apr 2009 18:24:42 -0000	1.44
+++ proftpd.spec	3 Aug 2009 12:46:16 -0000	1.45
@@ -1,39 +1,42 @@
-#define prever rc3
-
-Summary: Flexible, stable and highly-configurable FTP server
-Name: proftpd
-Version: 1.3.2
-Release: 2%{?prever:.%{prever}}%{?dist}
-License: GPLv2+
-Group: System Environment/Daemons
-URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
-Source1: proftpd.conf
-Source2: proftpd.init
-Source3: proftpd-xinetd
-Source4: proftpd.logrotate
-Source5: proftpd-welcome.msg
-Source6: proftpd.pam
-Source7: proftpd-mod_quotatab_ldap.ldif
-Source8: proftpd-mod_quotatab_ldap.schema
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pam >= 0.59
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-BuildRequires: pam-devel, ncurses-devel, pkgconfig
-BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: zlib-devel
-# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-# We'll need to find a better way to do this once RHEL6 comes out
-BuildRequires: tcp_wrappers
-%if 0%{?fedora:1}
-BuildRequires: tcp_wrappers-devel
+# Use certs in %{_sysconfdir}/pki/tls/certs if available (FC4, RHEL5 onwards)
+%global use_pki %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo 1; else echo 0; fi)
+%if %{use_pki}
+%global pkidir %{_sysconfdir}/pki/tls
+%else
+%global pkidir %{_datadir}/ssl
 %endif
-BuildRequires: openldap-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-Provides: ftpserver
+
+#global prever rc3
+%global rpmrel 2
+
+Summary:		Flexible, stable and highly-configurable FTP server
+Name:			proftpd
+Version:		1.3.2a
+Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
+License:		GPLv2+
+Group:			System Environment/Daemons
+URL:			http://www.proftpd.org/
+Source0:		ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
+Source1:		proftpd.conf
+Source2:		proftpd.init
+Source3:		proftpd-xinetd
+Source4:		proftpd.logrotate
+Source5:		proftpd-welcome.msg
+Source6:		proftpd.pam
+Source7:		proftpd-mod_quotatab_ldap.ldif
+Source8:		proftpd-mod_quotatab_ldap.schema
+Source9:		proftpd.sysconfig
+Patch0:			proftpd-1.3.2rc3-nostrip.patch
+Patch1:			proftpd-1.3.2a-defines.patch
+Patch2:			proftpd-1.3.2-parallel-build.patch
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
+Requires(postun):	/sbin/service
+BuildRequires:		pam-devel, ncurses-devel, pkgconfig, gettext, zlib-devel
+BuildRequires:		openssl-devel, libacl-devel, libcap-devel, /usr/include/tcpd.h
+BuildRequires:		openldap-devel, mysql-devel, postgresql-devel
+Provides:		ftpserver
 
 %description
 ProFTPD is an enhanced FTP server with a focus toward simplicity, security,
@@ -47,27 +50,27 @@ needed scripts to have it run by xinetd 
 
 
 %package ldap
-Summary: Module to add LDAP support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add LDAP support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description ldap
 Module to add LDAP support to the ProFTPD FTP server.
 
 
 %package mysql
-Summary: Module to add MySQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add MySQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description mysql
 Module to add MySQL support to the ProFTPD FTP server.
 
 
 %package postgresql
-Summary: Module to add PostgreSQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add PostgreSQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description postgresql
 Module to add PostgreSQL support to the ProFTPD FTP server.
@@ -76,52 +79,94 @@ Module to add PostgreSQL support to the 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
+# 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
+
+# Avoid documentation name conflicts
+%{__mv} contrib/README contrib/README.contrib
+
+# Set up directory names in config file
+%{__sed} -e 's#@PKIDIR@#%{pkidir}#g' \
+	%{SOURCE1} > proftpd.conf
+
+# Avoid docfile dependencies
+%{__chmod} -x contrib/xferstats.holger-preiss
+
+# Copy in LDAP schema/LDIF
+%{__cp} -p %{SOURCE7} 70proftpd-quota.ldif
+%{__cp} -p %{SOURCE8} proftpd-quota.schema
+
+# PAM Configuration:
+# The "include" syntax used in our PAM configuration file was introduced in
+# PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older
+# distributions such as EL-4 (PAM 0.77) need to fall back to using the
+# now-deprecated pam_stack module. Since the pam-devel package doesn't
+# include a pkgconfig file from whice we could check the version number, we
+# instead check for the absence of the file /etc/pam.d/config-util, which is
+# present in all PAM packages from 0.80 onwards and acts as a useful
+# indicator of the need to fall back to pam_stack.
+%{__cp} -p %{SOURCE6} .
+[ ! -f /etc/pam.d/config-util ] && %{__sed} -i -e \
+	's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \
+	proftpd.pam
+
+# Fix character encoding in docs
+for f in ChangeLog; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf-8
+	%{__mv} -f ${f}.utf-8 ${f}
+done
 
 %build
-# Disable stripping in order to get useful debuginfo packages
-%{__perl} -pi -e 's|"-s"|""|g' configure
+
+# Modules to be built as DSO's (excluding mod_ifsession, always specified last)
+SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
+SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
+SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
-    --libexecdir="%{_libexecdir}/proftpd" \
-    --localstatedir="%{_var}/run" \
-    --enable-ctrls \
-    --enable-facl \
-    --enable-dso \
-    --enable-ipv6 \
-    --enable-shadow \
-    --enable-openssl \
-    --with-libraries="%{_libdir}/mysql" \
-    --with-includes="%{_includedir}/mysql" \
-    --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
-
-# It seems that with _smp_mflags -lsupp tries to get linked before being built
-# (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
-%{__make}
+	--libexecdir="%{_libexecdir}/proftpd" \
+	--localstatedir="%{_localstatedir}/run" \
+	--enable-ctrls \
+	--enable-dso \
+	--enable-facl \
+	--enable-ipv6 \
+	--enable-nls \
+	--enable-openssl \
+	--enable-shadow \
+	--with-libraries="%{_libdir}/mysql" \
+	--with-includes="%{_includedir}/mysql" \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
+
+%{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} \
-    rundir="%{_var}/run/proftpd" \
-    INSTALL_USER=`id -un` \
-    INSTALL_GROUP=`id -gn`
-%{__install} -D -p -m 0640 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -p -m 0755 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -p -m 0640 %{SOURCE3} \
-    %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -p -m 0644 %{SOURCE4} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE7} 70proftpd-quota.ldif
-%{__install} -D -p -m 0644 %{SOURCE8} proftpd-quota.schema
-%{__mkdir_p} %{buildroot}/var/ftp/uploads
-%{__mkdir_p} %{buildroot}/var/ftp/pub
-%{__mkdir_p} %{buildroot}/var/log/proftpd
-touch %{buildroot}%{_sysconfdir}/ftpusers
+	rundir="%{_localstatedir}/run/proftpd" \
+	INSTALL_USER=`%{__id} -un` \
+	INSTALL_GROUP=`%{__id} -gn`
+%{__install} -D -p -m 640 proftpd.conf	%{buildroot}%{_sysconfdir}/proftpd.conf
+%{__install} -D -p -m 644 proftpd.pam	%{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 755 %{SOURCE2}	%{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE3}	%{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
+%{__install} -D -p -m 644 %{SOURCE4}	%{buildroot}%{_sysconfdir}/logrotate.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE5}	%{buildroot}%{_localstatedir}/ftp/welcome.msg
+%{__install} -D -p -m 644 %{SOURCE9}	%{buildroot}%{_sysconfdir}/sysconfig/proftpd
+%{__mkdir_p} %{buildroot}%{_localstatedir}/{ftp/{pub,uploads},log/proftpd}
+/bin/touch %{buildroot}%{_sysconfdir}/ftpusers
+
+# Find translations
+%find_lang proftpd
 
 
 %clean
@@ -130,83 +175,160 @@ touch %{buildroot}%{_sysconfdir}/ftpuser
 
 %post
 if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add proftpd
-    IFS=":"; cat /etc/passwd | \
-    while { read username nu nu gid nu nu nu nu; }; do \
-        if [ $gid -lt 100 -a "$username" != "ftp" ]; then
-            echo $username >> %{_sysconfdir}/ftpusers
-        fi
-    done
+	/sbin/chkconfig --add proftpd
+	IFS=":"; %{__cat} /etc/passwd | \
+	while { read username nu nu gid nu nu nu nu; }; do \
+		if [ $gid -lt 100 -a "$username" != "ftp" ]; then
+			echo $username >> %{_sysconfdir}/ftpusers
+		fi
+	done
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service proftpd stop &>/dev/null || :
-    /sbin/chkconfig --del proftpd
-    /sbin/service xinetd reload &>/dev/null || :
-    if [ -d %{_var}/run/proftpd ]; then
-        rm -rf %{_var}/run/proftpd/*
-    fi
+	/sbin/service proftpd stop &>/dev/null || :
+	/sbin/chkconfig --del proftpd || :
+	/sbin/service xinetd reload &>/dev/null || :
+	/usr/bin/find %{_localstatedir}/run/proftpd -depth -mindepth 1 |
+		/usr/bin/xargs %{__rm} -rf &>/dev/null || :
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service proftpd condrestart &>/dev/null || :
+	/sbin/service proftpd condrestart &>/dev/null || :
 fi
 
 
-%files
+%files -f proftpd.lang
 %defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog NEWS README*
-%doc doc/* sample-configurations/
+%doc COPYING CREDITS ChangeLog NEWS README
+%doc README.DSO README.modules README.IPv6 README.PAM
+%doc README.capabilities README.classes README.controls README.facl
+%doc contrib/README.contrib contrib/README.ratio
+%doc doc/* sample-configurations/ contrib/xferstats.holger-preiss
+%dir %{_localstatedir}/ftp/
+%dir %{_localstatedir}/ftp/pub/
 %dir %{_localstatedir}/run/proftpd/
+%config(noreplace) %{_localstatedir}/ftp/welcome.msg
+%config(noreplace) %{_sysconfdir}/ftpusers
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
 %config(noreplace) %{_sysconfdir}/proftpd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/proftpd
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
-%config %{_sysconfdir}/ftpusers
-%config(noreplace) %{_sysconfdir}/pam.d/proftpd
-%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
-%{_mandir}/man?/*
-%{_bindir}/*
+%{_bindir}/ftpcount
+%{_bindir}/ftpdctl
+%{_bindir}/ftptop
+%{_bindir}/ftpwho
+%exclude %{_bindir}/prxs
+%{_sbindir}/ftpshut
+%{_sbindir}/in.proftpd
+%{_sbindir}/proftpd
+%{_mandir}/man1/ftpcount.1*
+%{_mandir}/man1/ftptop.1*
+%{_mandir}/man1/ftpwho.1*
+%{_mandir}/man5/xferlog.5*
+%{_mandir}/man8/ftpdctl.8*
+%{_mandir}/man8/ftpshut.8*
+%{_mandir}/man8/proftpd.8*
 %exclude %{_includedir}/proftpd/
 %exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
+%{_libexecdir}/proftpd/mod_load.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
+%{_libexecdir}/proftpd/mod_quotatab_radius.so
+%{_libexecdir}/proftpd/mod_quotatab_sql.so
+%{_libexecdir}/proftpd/mod_radius.so
+%{_libexecdir}/proftpd/mod_ratio.so
+%{_libexecdir}/proftpd/mod_rewrite.so
+%{_libexecdir}/proftpd/mod_site_misc.so
 %{_libexecdir}/proftpd/mod_sql.so
 %{_libexecdir}/proftpd/mod_wrap.so
+%{_libexecdir}/proftpd/mod_wrap2.so
+%{_libexecdir}/proftpd/mod_wrap2_file.so
+%{_libexecdir}/proftpd/mod_wrap2_sql.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
-%{_sbindir}/*
-%dir /var/ftp/
-%attr(331, ftp, ftp) %dir /var/ftp/uploads/
-%dir /var/ftp/pub/
-%config(noreplace) /var/ftp/welcome.msg
-%attr(750, root, root) %dir /var/log/proftpd/
+%attr(331, ftp, ftp) %dir %{_localstatedir}/ftp/uploads/
+%attr(750, root, root) %dir %{_localstatedir}/log/proftpd/
 
 %files ldap
 %defattr(-,root,root,-)
-%doc 70proftpd-quota.ldif proftpd-quota.schema
-%dir %{_libexecdir}/proftpd/
+%doc README.LDAP 70proftpd-quota.ldif proftpd-quota.schema
 %{_libexecdir}/proftpd/mod_ldap.so
 %{_libexecdir}/proftpd/mod_quotatab_ldap.so
 
 %files mysql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_mysql.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_postgres.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 
 %changelog
+* Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
+- Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
+
+* Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-1
+- Update to 1.3.2a
+- Add patch to reinstate support for -DPARAMETER (http://bugs.proftpd.org/3221)
+- Retain CAP_AUDIT_WRITE, needed for pam_loginuid (#506735, fixed upstream)
+- Remove ScoreboardFile directive from configuration file - default value
+  works better with SELinux (#498375)
+- Ship mod_quotatab_sql.so in the main package rather than the SQL backend
+  subpackages
+- New DSO modules:
+  - mod_ctrls_admin
+  - mod_facl
+  - mod_load
+  - mod_quotatab_radius
+  - mod_radius
+  - mod_ratio
+  - mod_rewrite
+  - mod_site_misc
+  - mod_wrap2
+  - mod_wrap2_file
+  - mod_wrap2_sql
+- Enable mod_lang/nls support for RFC 2640 (and buildreq gettext)
+- Add /etc/sysconfig/proftpd to set PROFTPD_OPTIONS and update initscript to
+  use this value so we can use a define to enable (e.g.) anonymous FTP support
+  rather than having a huge commented-out section in the config file
+- Rewrite config file to remove most settings that don't change upstream
+  defaults, and add brief descriptions for all available loadable modules
+- Move Umask and IdentLookups settings from server config to <Global> context
+  so that they apply to all servers, including virtual hosts (#509251)
+- Ensure mod_ifsession is always the last one specified, which makes sure that
+  mod_ifsession's changes are seen properly by other modules
+- Drop pam version requirement - all targets have sufficiently recent version
+- Drop redundant explicit dependency on pam
+- Subpackages don't need to own %%{_libexecdir}/proftpd directory
+- Drop redundant krb5-devel buildreq
+- Make SRPM back-compatible with EPEL-4 (TLS cert dirs, PAM config)
+- Don't include README files for non-Linux platforms
+- Recode ChangeLog as UTF-8
+- Don't ship the prxs tool for building custom DSO's since we don't ship the
+  headers either
+- Prevent stripping of binaries in a slightly more robust way
+- Fix release tag to be ready for future beta/rc versions
+- Define RPM macros in global scope
+- BuildRequire libcap-devel so that we use the system library rather than the
+  bundled one, and eliminate log messages like:
+  kernel: warning: `proftpd' uses 32-bit capabilities (legacy support in use)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2.1
+- Update the tcp_wrappers BR to be just /usr/include/tcpd.h instead.
+
 * Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
 - Fix tcp_wrappers-devel BR conditional.
 
@@ -219,7 +341,7 @@ fi
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Caol?n McNamara 1.3.2-0.3.rc3
-- rebuild for dependencies
+- Rebuild for dependencies
 
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Apr 2009 21:57:30 -0000	1.12
+++ sources	3 Aug 2009 12:46:16 -0000	1.13
@@ -1 +1 @@
-89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2
+ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2


--- proftpd-1.3.1-find-umode_t.patch DELETED ---



From steved at fedoraproject.org  Mon Aug  3 12:46:10 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  3 Aug 2009 12:46:10 +0000 (UTC)
Subject: rpms/kernel/devel pnfs-v2.6.31-rc5.patch, NONE,
	1.1.2.1 config-generic, 
	1.315, 1.315.2.1 kernel.spec, 1.1682, 1.1682.2.1
Message-ID: <20090803124610.410CE11C02C6@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
      Tag: kernel-2_6_31-pnfs_rc5
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_31-pnfs_rc5
	pnfs-v2.6.31-rc5.patch 
Log Message:
Updated to latest pNFS update (v2.6.31-rc5)


pnfs-v2.6.31-rc5.patch:
 Documentation/spnfs.txt             |  210 +++
 Makefile                            |    2 
 drivers/md/dm-ioctl.c               |   24 
 drivers/scsi/hosts.c                |    3 
 drivers/scsi/osd/osd_initiator.c    |   22 
 drivers/scsi/osd/osd_uld.c          |   53 
 fs/exofs/Kbuild                     |    1 
 fs/exofs/exofs.h                    |    3 
 fs/exofs/export.c                   |  237 ++++
 fs/exofs/super.c                    |    1 
 fs/exportfs/expfs.c                 |    7 
 fs/inode.c                          |    2 
 fs/nfs/Kconfig                      |   38 
 fs/nfs/Makefile                     |    7 
 fs/nfs/blocklayout/Makefile         |    6 
 fs/nfs/blocklayout/blocklayout.c    | 1202 ++++++++++++++++++++
 fs/nfs/blocklayout/blocklayout.h    |  265 ++++
 fs/nfs/blocklayout/blocklayoutdev.c |  735 ++++++++++++
 fs/nfs/blocklayout/blocklayoutdm.c  |  337 +++++
 fs/nfs/blocklayout/extents.c        |  945 ++++++++++++++++
 fs/nfs/callback.h                   |   36 
 fs/nfs/callback_proc.c              |  280 ++++
 fs/nfs/callback_xdr.c               |  155 ++
 fs/nfs/client.c                     |   25 
 fs/nfs/direct.c                     |  223 ++-
 fs/nfs/file.c                       |   50 
 fs/nfs/inode.c                      |   43 
 fs/nfs/internal.h                   |   32 
 fs/nfs/nfs3proc.c                   |    1 
 fs/nfs/nfs4_fs.h                    |   16 
 fs/nfs/nfs4filelayout.c             |  859 +++++++++++++++
 fs/nfs/nfs4filelayout.h             |  131 ++
 fs/nfs/nfs4filelayoutdev.c          |  886 +++++++++++++++
 fs/nfs/nfs4proc.c                   |  646 +++++++++++
 fs/nfs/nfs4renewd.c                 |    2 
 fs/nfs/nfs4state.c                  |   22 
 fs/nfs/nfs4xdr.c                    |  883 +++++++++++++++
 fs/nfs/objlayout/Kbuild             |   11 
 fs/nfs/objlayout/objio_osd.c        |  767 +++++++++++++
 fs/nfs/objlayout/objlayout.c        |  578 ++++++++++
 fs/nfs/objlayout/objlayout.h        |  207 +++
 fs/nfs/objlayout/panfs_shim.c       |  740 ++++++++++++
 fs/nfs/objlayout/panfs_shim.h       |  482 ++++++++
 fs/nfs/objlayout/pnfs_osd_xdr.c     |  344 ++++++
 fs/nfs/objlayout/pnfs_osd_xdr.h     |  412 +++++++
 fs/nfs/objlayout/pnfs_osd_xdr_enc.c |  239 ++++
 fs/nfs/pagelist.c                   |   13 
 fs/nfs/pnfs.c                       | 2061 ++++++++++++++++++++++++++++++++++++
 fs/nfs/pnfs.h                       |  361 ++++++
 fs/nfs/proc.c                       |    1 
 fs/nfs/read.c                       |  104 +
 fs/nfs/super.c                      |   66 +
 fs/nfs/write.c                      |  221 ++-
 fs/nfsd/Kconfig                     |   39 
 fs/nfsd/Makefile                    |    3 
 fs/nfsd/export.c                    |   87 +
 fs/nfsd/nfs4callback.c              |  587 ++++++++++
 fs/nfsd/nfs4filelayoutxdr.c         |  271 ++++
 fs/nfsd/nfs4pnfsds.c                |  620 ++++++++++
 fs/nfsd/nfs4proc.c                  |  650 ++++++++++-
 fs/nfsd/nfs4state.c                 | 2054 ++++++++++++++++++++++++++++++-----
 fs/nfsd/nfs4xdr.c                   |  680 +++++++++++
 fs/nfsd/nfsctl.c                    |   95 +
 fs/nfsd/nfsfh.c                     |   15 
 fs/nfsd/nfssvc.c                    |   30 
 fs/nfsd/pnfsd_lexp.c                |  226 +++
 fs/nfsd/spnfs_com.c                 |  504 ++++++++
 fs/nfsd/spnfs_ops.c                 |  788 +++++++++++++
 fs/nfsd/vfs.c                       |   64 +
 include/linux/exportfs.h            |   38 
 include/linux/fs.h                  |    2 
 include/linux/nfs4.h                |   56 
 include/linux/nfs4_pnfs.h           |  319 +++++
 include/linux/nfs_fs.h              |   29 
 include/linux/nfs_fs_sb.h           |   22 
 include/linux/nfs_iostat.h          |    3 
 include/linux/nfs_page.h            |   10 
 include/linux/nfs_xdr.h             |   50 
 include/linux/nfsd/debug.h          |    2 
 include/linux/nfsd/export.h         |    1 
 include/linux/nfsd/nfs4layoutxdr.h  |   98 +
 include/linux/nfsd/nfsd.h           |   20 
 include/linux/nfsd/nfsd4_pnfs.h     |  308 +++++
 include/linux/nfsd/nfsfh.h          |    1 
 include/linux/nfsd/pnfsd.h          |  110 +
 include/linux/nfsd/state.h          |  156 ++
 include/linux/nfsd/syscall.h        |    8 
 include/linux/nfsd/xdr4.h           |   47 
 include/linux/nfsd4_spnfs.h         |  329 +++++
 include/linux/panfs_shim_api.h      |   57 
 include/linux/pnfs_xdr.h            |  146 ++
 include/linux/sunrpc/clnt.h         |    1 
 include/linux/sunrpc/rpc_pipe_fs.h  |    4 
 include/linux/sunrpc/svc.h          |    2 
 include/linux/sunrpc/svc_xprt.h     |   37 
 include/linux/sunrpc/svcsock.h      |    1 
 include/linux/sunrpc/xprt.h         |    7 
 include/scsi/osd_initiator.h        |   53 
 net/sunrpc/backchannel_rqst.c       |    2 
 net/sunrpc/clnt.c                   |    1 
 net/sunrpc/rpc_pipe.c               |   40 
 net/sunrpc/sched.c                  |    7 
 net/sunrpc/sunrpc.h                 |   14 
 net/sunrpc/svcsock.c                |  251 +++-
 net/sunrpc/xdr.c                    |   14 
 net/sunrpc/xprt.c                   |   16 
 net/sunrpc/xprtsock.c               |  199 +++
 107 files changed, 23453 insertions(+), 718 deletions(-)

--- NEW FILE pnfs-v2.6.31-rc5.patch ---
diff --git a/Documentation/spnfs.txt b/Documentation/spnfs.txt
new file mode 100644
index 0000000..be5815d
--- /dev/null
+++ b/Documentation/spnfs.txt
@@ -0,0 +1,210 @@
+(c) 2007 Network Appliance Inc.
+
+spNFS
+-----
+
+An spNFS system consists of a Meta Data Server (MDS), a number of Client machines (C) and a number of Data Servers (DS).
+
+A file system is mounted by the clients from the MDS, and all file data
+is striped across the DSs.
+
+Identify the machines that will be filling each of these roles.
+
+The spnfs kernel will be installed on all machines: clients, the MDS and DSs.
+
+
+Building and installing the spNFS kernel
+----------------------------------------
+
+Get the spNFS kernel from:
+
+	git://linux-nfs.org/~dmuntz/spnfs.git
+
+add these options to your .config file
+
+	CONFIG_NETWORK_FILESYSTEMS=y
+	CONFIG_NFS_FS=y
+	CONFIG_NFSD=y
+	CONFIG_NFS_V4_1=y
+	CONFIG_NFSD_V4_1=y
+	CONFIG_PNFS=y
+	CONFIG_PNFSD=y
+	CONFIG_SPNFS=y
+
+By default, spNFS uses whole-file layouts.  Layout segments can be enabled
+by adding:
+
+	CONFIG_SPNFS_LAYOUTSEGMENTS=y
+
+to your .config file.
+
+Building and installation of kernel+modules is as usual.
+This kernel should be installed and booted on the client, MDS and DSs.
+
+
+Building nfs-utils
+------------------
+
+Get the nfs-utils package containing spnfsd from:
+
+	git://linux-nfs.org/~dmuntz/nfs-utils.git
+
+Follow the standard instructions for building nfs-utils.  We HIGHLY recommend
+NOT doing an install of the binaries generated by this build.  You will only
+need the spnfsd binary generated by this build, and the spnfsd.conf template.
+
+After building, the spnfsd daemon will be located in utils/spnfsd.  The spnfsd
+daemon will only be needed on the MDS.
+
+
+Installation
+------------
+
+The nfs-utils package contains a default spnfsd.conf file in
+utils/spnfsd/spnfsd.conf.  Copy this file to /etc/spnfsd.conf.
+
+By default, the DS-Mount-Directory is set to /spnfs (see spnfsd.conf).  Under
+this directory, mount points must be created for each DS to
+be used for pNFS data stripes.  These mount points are named by the ip address
+of the corresponding DS.  In the sample spnfsd.conf, there are two
+DSs defined (172.16.28.134 and 172.16.28.141).
+
+Following the sample spnfsd.conf,
+
+	mkdir /spnfs
+
+on the MDS (corresponding to DS-Mount-Directory).  Then
+
+	mkdir /spnfs/172.16.28.134
+	mkdir /spnfs/172.16.28.141
+
+to create the mount points for the DSs.
+
+On the DSs, chose a directory where data stripes will be created by the MDS.
+For the sample file, this directory is /pnfs, so on each DS execute:
+
+	mkdir /pnfs
+
+This directory is specified in the spnfsd.conf file by the DS*_ROOT option
+(where * is replaced by the DS number).  DS_ROOT is specified relative to
+the directory being exported by the DSs.  In our example, our DSs are exporting
+the root directory (/) and therefore our DS_ROOT is /pnfs.  On the DSs, we have
+the following entry in /etc/exports:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+N.B. If we had created a /exports directory and a /pnfs directory under
+/exports, and if we were exporting /exports, then DS_ROOT would still be /pnfs
+(not /exports/pnfs).
+
+It may be useful to add entries to /etc/fstab on the MDS to automatically
+mount the DS_ROOT file systems.  For this example, our MDS fstab would
+contain:
+
+	172.17.84.128:/pnfs /spnfs/172.17.84.128 nfs    defaults        1 2
+	172.17.84.122:/pnfs /spnfs/172.17.84.122 nfs    defaults        1 2
+
+The DS mounts must be performed manually or via fstab at this time (automatic
+mounting, directory creation, etc. are on the todo list).  To perform I/O
+through the MDS, the DS mounts MUST use NFSv3 at this time (this restriction
+will eventually be removed).
+
+
+On the MDS, choose a file system to use with spNFS and export it, e.g.:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+Make sure nfsd and all supporting processes are running on the MDS and DSs.
+
+
+Running
+-------
+
+If rpc_pipefs is not already mounted (if you're running idmapd it probably is),
+you may want to add the following line to /etc/fstab:
+
+	rpc_pipefs    /var/lib/nfs/rpc_pipefs rpc_pipefs defaults     0 0
+
+to automatically mount rpc_pipefs.
+
+With spnfsd.conf configured for your environment and the mounts mounted as
+described above, spnfsd can now be started.
+
+On the MDS, execute spnfsd:
+
+	spnfsd
+
+The executable is located in the directory where it was built, and
+may also have been installed elsewhere depending on how you built nfs-utils.
+It will run in the foreground by default, and in fact will do so despite
+any options suggesting the contrary (it's still a debugging build).
+
+On the client, make sure the nfslayoutdriver module is loaded:
+
+	modprobe nfslayoutdriver
+
+Then mount the file system from the MDS:
+
+	mount -t nfs4 mds:/ /mnt
+
+I/O through the MDS is now supported.  To use it, do not load the
+nfslayoutdriver on the client, and mount the MDS using NFSv4 or 4.1
+(NFSv2 and v3 are not yet supported).
+
+You may now use spNFS by performing file system activities in /mnt.
+If you create files in /mnt, you should see stripe files corresponding to
+new files being created on the DSs.  The current implementation names the
+stripe files based on the inode number of the file on the MDS.  For example,
+if you create a file foo in /mnt and do an 'ls -li /mnt/foo':
+
+	# ls -li foo
+	1233 -rw-r--r-- 1 root root 0 Nov 29 15:54 foo
+
+You should see stripe files on each under /pnfs (per the sample) named
+1233.  The file /pnfs/1233 on DS1 will contain the first <stripe size> bytes
+of data written to foo, DS2 will contain the next <stripe size> bytes, etc.
+Removing /mnt/foo will remove the corresponding stripe files on the DSs.
+Other file system operations should behave (mostly :-) as expected.
+
+
+Layout Segments
+---------------
+
+If the kernel is compiled to support layout segments, there will
+be two files created under /proc/fs/spnfs for controlling layout
+segment functionality.
+
+To enable layout segments, write a '1' to /proc/fs/spnfs/layoutseg, e.g.:
+
+	echo 1 > /proc/fs/spnfs/layoutseg
+
+Layout segments can be disabled (returning to whole-file layouts) by
+writing a '0' to /proc/fs/spnfs/layoutseg:
+
+	echo 0 > /proc/fs/spnfs/layoutseg
+
+When layout segments are enabled, the size of the layouts returned can
+be specified by writing a decimal number (ascii representation) to
+/proc/fs/spnfs/layoutsegsize:
+
+	echo 1024 > /proc/fs/spnfs/layoutsegsize
+
+The value'0' has a special meaning--it causes the server to return a
+layout that is exactly the size requested by the client:
[...27536 lines suppressed...]
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+	int len;
+	struct xdr_buf *xbufp = &req->rq_snd_buf;
+	struct rpc_xprt *xprt = req->rq_xprt;
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+	struct socket *sock = transport->sock;
+	unsigned long headoff;
+	unsigned long tailoff;
+
+	/*
+	 * Set up the rpc header and record marker stuff
+	 */
+	xs_encode_tcp_record_marker(xbufp);
+
+	tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+	headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+	len = svc_send_common(sock, xbufp,
+			      virt_to_page(xbufp->head[0].iov_base), headoff,
+			      xbufp->tail[0].iov_base, tailoff);
+
+	if (len != xbufp->len) {
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+		len = -EAGAIN;
+	}
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	xprt = req->rq_xprt->bc_xprt;
+	svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+	/*
+	 * Grab the mutex to serialize data as the connection is shared
+	 * with the fore channel
+	 */
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	if (len > 0)
+		len = 0;
+
+	return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -2192,6 +2317,22 @@ static struct rpc_xprt_ops xs_tcp_ops = {
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2323,14 +2464,46 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 	xprt->prot = IPPROTO_TCP;
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+	xprt->timeout = &xs_tcp_default_timeout;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_xprt) {
+		struct svc_sock *bc_sock;
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/* backchannel */
+		xprt_set_bound(xprt);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
+
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_xprt = args->bc_xprt;
+		bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+		bc_sock->sk_bc_xprt = xprt;
+		transport->sock = bc_sock->sk_sock;
+		transport->inet = bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		switch (addr->sa_family) {
+		case AF_INET:
+			xs_format_ipv4_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP);
+			break;
+		case AF_INET6:
+			xs_format_ipv6_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP6);
+			break;
+		default:
+			kfree(xprt);
+			return ERR_PTR(-EAFNOSUPPORT);
+		}
+
+		goto out;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2338,20 +2511,30 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		xs_format_ipv4_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
-		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+		xs_format_ipv6_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	default:
 		kfree(xprt);
 		return ERR_PTR(-EAFNOSUPPORT);
 	}
 
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+out:
 	dprintk("RPC:       set up transport to address %s\n",
 			xprt->address_strings[RPC_DISPLAY_ALL]);
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.315
retrieving revision 1.315.2.1
diff -u -p -r1.315 -r1.315.2.1
--- config-generic	31 Jul 2009 01:00:04 -0000	1.315
+++ config-generic	3 Aug 2009 12:46:09 -0000	1.315.2.1
@@ -3193,7 +3193,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -3201,6 +3201,14 @@ CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
 CONFIG_NFS_FSCACHE=y
+CONFIG_PNFS=y
+CONFIG_PNFSD=y
+CONFIG_PNFS_OBJLAYOUT=y
+CONFIG_PNFS_BLOCK=y
+CONFIG_PNFSD_LOCAL_EXPORT=y
+CONFIG_SPNFS=y
+CONFIG_PNFS_PANLAYOUT=y
+CONFIG_SPNFS_LAYOUTSEGMENTS=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1682
retrieving revision 1.1682.2.1
diff -u -p -r1.1682 -r1.1682.2.1
--- kernel.spec	3 Aug 2009 06:03:08 -0000	1.1682
+++ kernel.spec	3 Aug 2009 12:46:09 -0000	1.1682.2.1
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .pnfs_rc5
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -89,7 +89,7 @@ Summary: The Linux kernel
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  1}
 # tools/perf
 %define with_perftool  %{?_without_perftool:  0} %{?!_without_perftool:  1}
 # perf noarch subpkg
@@ -698,6 +698,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: pnfs-v2.6.31-rc5.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1169,6 +1170,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch pnfs-v2.6.31-rc5.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1940,6 +1942,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Steve Dickson
+- Updated to latest pNFS update (v2.6.31-rc5)
+
 * Mon Aug 03 2009 Dave Airlie <airlied at redhat.com>
 - update VGA arb patches
 



From pghmcfc at fedoraproject.org  Mon Aug  3 12:46:15 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  3 Aug 2009 12:46:15 +0000 (UTC)
Subject: rpms/proftpd/EL-4 proftpd-1.3.2-parallel-build.patch, NONE,
	1.1 proftpd-1.3.2a-defines.patch, NONE,
	1.1 proftpd-1.3.2rc3-nostrip.patch, NONE, 1.1 proftpd.sysconfig,
	NONE, 1.1 .cvsignore, 1.8, 1.9 proftpd.conf, 1.8,
	1.9 proftpd.init, 1.6, 1.7 proftpd.pam, 1.1, 1.2 proftpd.spec,
	1.12, 1.13 sources, 1.8, 1.9 proftpd-1.3.1-find-umode_t.patch,
	1.1, NONE
Message-ID: <20090803124615.F1EC211C02C6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

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

Modified Files:
	.cvsignore proftpd.conf proftpd.init proftpd.pam proftpd.spec 
	sources 
Added Files:
	proftpd-1.3.2-parallel-build.patch 
	proftpd-1.3.2a-defines.patch proftpd-1.3.2rc3-nostrip.patch 
	proftpd.sysconfig 
Removed Files:
	proftpd-1.3.1-find-umode_t.patch 
Log Message:
Sync with devel

proftpd-1.3.2-parallel-build.patch:
 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE proftpd-1.3.2-parallel-build.patch ---
diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
--- proftpd-1.3.2-orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2/Makefile.in	2009-02-16 14:28:43.000000000 +0100
@@ -54,13 +54,13 @@
 proftpd$(EXEEXT): lib src modules dirs locale
 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
 
-ftpcount$(EXEEXT): utils
+ftpcount$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
 
-ftpdctl$(EXEEXT): src
+ftpdctl$(EXEEXT): lib src
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
 
-ftpshut$(EXEEXT): utils
+ftpshut$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
 
 ftptop$(EXEEXT): lib utils

proftpd-1.3.2a-defines.patch:
 dirtree.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE proftpd-1.3.2a-defines.patch ---
http://bugs.proftpd.org/show_bug.cgi?id=3221

--- proftpd-1.3.2a/src/dirtree.c	2009-04-28 23:33:57.000000000 +0100
+++ proftpd-1.3.2a/src/dirtree.c	2009-07-06 12:06:51.000000000 +0100
@@ -575,6 +575,17 @@
     }
   }
 
+  if (defines_perm_list) {
+    char **defines = defines_perm_list->elts;
+    register unsigned int i = 0;
+
+    for (i = 0; i < defines_perm_list->nelts; i++) {
+      if (defines[i] &&
+          strcmp(defines[i], definition) == 0)
+        return TRUE;
+    }
+  }
+
   errno = ENOENT;
   return FALSE;
 }

proftpd-1.3.2rc3-nostrip.patch:
 Make.rules.in                 |    4 ++--
 contrib/mod_load/Makefile.in  |    2 +-
 contrib/mod_wrap2/Makefile.in |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE proftpd-1.3.2rc3-nostrip.patch ---
Removing @INSTALL_STRIP@ prevents stripping of debuginfo at %install time

Cleaning up top_srcdir prevents debuginfo package creation fails like this:
/usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character

--- proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:26.000000000 +0000
+++ proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:48.000000000 +0000
@@ -29,8 +29,8 @@
 INSTALL=@INSTALL@
 INSTALL_USER=@install_user@
 INSTALL_GROUP=@install_group@
-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_BIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_SBIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
 
 RM=rm -f
--- proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2009-01-08 20:37:26.000000000 +0000
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules
--- proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2009-07-03 17:00:41.000000000 +0100
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules


--- NEW FILE proftpd.sysconfig ---
# Set PROFTPD_OPTIONS to add command-line options for proftpd.
# See proftpd(8) for a comprehensive list of what can be used.
#
# The following "Defines" can be used with the default configuration file:
# -DANONYMOUS_FTP	: Enable anonymous FTP
# -DDYNAMIC_BAN_LISTS	: Enable dynamic ban lists (mod_ban)
# -DTLS			: Enable TLS (mod_tls)
#
# For example, for anonymous FTP and dynamic ban list support:
# PROFTPD_OPTIONS="-DANONYMOUS_FTP -DDYNAMIC_BAN_LISTS"
PROFTPD_OPTIONS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Apr 2009 22:06:20 -0000	1.8
+++ .cvsignore	3 Aug 2009 12:46:15 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.2.tar.bz2
+proftpd-1.3.2a.tar.bz2


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- proftpd.conf	2 Jan 2009 13:45:47 -0000	1.8
+++ proftpd.conf	3 Aug 2009 12:46:15 -0000	1.9
@@ -1,169 +1,239 @@
 # This is the ProFTPD configuration file
+#
+# See: http://www.proftpd.org/docs/directives/linked/by-name.html
+
+# Server Config - config used for anything outside a <VirtualHost> or <Global> context
+# See: http://www.proftpd.org/docs/howto/Vhost.html
 
 ServerName			"ProFTPD server"
 ServerIdent			on "FTP Server ready."
 ServerAdmin			root at localhost
-ServerType			standalone
-#ServerType			inetd
 DefaultServer			on
-AccessGrantMsg			"User %u logged in."
-#DisplayConnect			/etc/ftpissue
-#DisplayLogin			/etc/ftpmotd
-#DisplayGoAway			/etc/ftpgoaway
-DeferWelcome			off
 
-# Use this to excude users from the chroot
+# Cause every FTP user except adm to be chrooted into their home directory
 DefaultRoot			~ !adm
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd
 AuthOrder			mod_auth_pam.c* mod_auth_unix.c
+# If you use NIS/YP/LDAP you may need to disable PersistentPasswd
+#PersistentPasswd		off
 
-# Do not perform ident nor DNS lookups (hangs when the port is filtered)
-IdentLookups			off
+# Don't do reverse DNS lookups (hangs on DNS problems)
 UseReverseDNS			off
 
-# Port 21 is the standard FTP port.
-Port				21
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# Default to show dot files in directory listings
-ListOptions			"-a"
-
-# See Configuration.html for these (here are the default values)
-#MultilineRFC2228		off
-#RootLogin			off
-#LoginPasswordPrompt		on
-#MaxLoginAttempts		3
-#MaxClientsPerHost		none
-#AllowForeignAddress		off	# For FXP
-
-# Allow to resume not only the downloads but the uploads too
-AllowRetrieveRestart		on
-AllowStoreRestart		on
+# Set the user and group that the server runs as
+User				nobody
+Group				nobody
 
 # To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
+# to 20.  If you need to allow more than 20 concurrent connections
 # at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
+# in standalone mode; in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
 # (such as xinetd)
 MaxInstances			20
 
-# Set the user and group that the server normally runs at.
-User				nobody
-Group				nobody
-
 # Disable sendfile by default since it breaks displaying the download speeds in
 # ftptop and ftpwho
-UseSendfile			no
-
-# This is where we want to put the pid file
-ScoreboardFile			/var/run/proftpd.score
-
-# Normally, we want users to do a few things.
-<Global>
-  AllowOverwrite		yes
-  <Limit ALL SITE_CHMOD>
-    AllowAll
-  </Limit>
-</Global>
+UseSendfile			off
 
 # Define the log formats
 LogFormat			default	"%h %l %u %t \"%r\" %s %b"
 LogFormat			auth	"%v [%P] %h %t \"%r\" %s"
 
-# TLS
-# Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html
-#TLSEngine			on
-#TLSRequired			on
-#TLSRSACertificateFile		/etc/pki/tls/certs/proftpd.pem
-#TLSRSACertificateKeyFile	/etc/pki/tls/certs/proftpd.pem
-#TLSCipherSuite			ALL:!ADH:!DES
-#TLSOptions			NoCertRequest
-#TLSVerifyClient		off
-##TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
-#TLSLog				/var/log/proftpd/tls.log
-
-# SQL authentication Dynamic Shared Object (DSO) loading
-# See README.DSO and howto/DSO.html for more details.
-#<IfModule mod_dso.c>
-#  LoadModule mod_ban.c
-#  LoadModule mod_ifsession.c
-#  LoadModule mod_quotatab.c
-#  LoadModule mod_quotatab_file.c
-#  LoadModule mod_sql.c
-#  LoadModule mod_sql_mysql.c
-#  LoadModule mod_sql_postgres.c
-#</IfModule>
-
-# A basic anonymous configuration, with an upload directory.
-#<Anonymous ~ftp>
-#  User				ftp
-#  Group				ftp
-#  AccessGrantMsg		"Anonymous login ok, restrictions apply."
-#
-#  # We want clients to be able to login with "anonymous" as well as "ftp"
-#  UserAlias			anonymous ftp
-#
-#  # Limit the maximum number of anonymous logins
-#  MaxClients			10 "Sorry, max %m users -- try again later"
-#
-#  # Put the user into /pub right after login
-#  #DefaultChdir			/pub
-#
-#  # We want 'welcome.msg' displayed at login, '.message' displayed in
-#  # each newly chdired directory and tell users to read README* files. 
-#  DisplayLogin			/welcome.msg
-#  DisplayFirstChdir		.message
-#  DisplayReadme			README*
-#
-#  # Some more cosmetic and not vital stuff
-#  DirFakeUser			on ftp
-#  DirFakeGroup			on ftp
-#
-#  # Limit WRITE everywhere in the anonymous chroot
-#  <Limit WRITE SITE_CHMOD>
-#    DenyAll
-#  </Limit>
-#
-#  # An upload directory that allows storing files but not retrieving
-#  # or creating directories.
-#  <Directory uploads/*>
-#    AllowOverwrite		no
-#    <Limit READ>
-#      DenyAll
-#    </Limit>
-#
-#    <Limit STOR>
-#      AllowAll
-#    </Limit>
-#  </Directory>
-#
-#  # Don't write anonymous accesses to the system wtmp file (good idea!)
-#  WtmpLog			off
-#
-#  # Logging for the anonymous transfers
-#  ExtendedLog		/var/log/proftpd/access.log WRITE,READ default
-#  ExtendedLog		/var/log/proftpd/auth.log AUTH auth
-#
-#</Anonymous>
-
-# Configuration for mod_ban
-<IfModule mod_ban.c>
-  BanEngine on
-  BanLog /var/log/proftpd/ban.log
-  BanTable /var/run/proftpd/ban.tab
+# Dynamic Shared Object (DSO) loading
+# See README.DSO and howto/DSO.html for more details
+#
+# General database support (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql.c
+#
+# Mysql support (requires proftpd-mysql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_mysql.c
+#
+# Postgresql support (requires proftpd-postgresql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_postgres.c
+#
+# Quota support (http://www.proftpd.org/docs/contrib/mod_quotatab.html)
+#   LoadModule mod_quotatab.c
+#
+# File-specific "driver" for storing quota table information in files
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_file.html)
+#   LoadModule mod_quotatab_file.c
+#
+# SQL database "driver" for storing quota table information in SQL tables
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_sql.html)
+#   LoadModule mod_quotatab_sql.c
+#
+# LDAP support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/directives/linked/config_ref_mod_ldap.html)
+#   LoadModule mod_ldap.c
+#
+# LDAP quota support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_ldap.html)
+#   LoadModule mod_quotatab_ldap.c
+#
+# Support for authenticating users using the RADIUS protocol
+# (http://www.proftpd.org/docs/contrib/mod_radius.html)
+#   LoadModule mod_radius.c
+#
+# Retrieve quota limit table information from a RADIUS server
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_radius.html)
+#   LoadModule mod_quotatab_radius.c
+#
+# Administrative control actions for the ftpdctl program
+# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
+#   LoadModule mod_ctrls_admin.c
+#
+# Support for POSIX ACLs
+# (http://www.proftpd.org/docs/modules/mod_facl.html)
+#   LoadModule mod_facl.c
+#
+# Configure server availability based on system load
+# (http://www.proftpd.org/docs/contrib/mod_load.html)
+#   LoadModule mod_load.c
+#
+# Limit downloads to a multiple of upload volume (see README.ratio)
+#   LoadModule mod_ratio.c
+#
+# Rewrite FTP commands sent by clients on-the-fly,
+# using regular expression matching and substitution 
+# (http://www.proftpd.org/docs/contrib/mod_rewrite.html)
+#   LoadModule mod_rewrite.c
+#
+# Support for miscellaneous SITE commands such as SITE MKDIR, SITE SYMLINK,
+# and SITE UTIME (http://www.proftpd.org/docs/contrib/mod_site_misc.html)
+#   LoadModule mod_site_misc.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap.html)
+#   LoadModule mod_wrap.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, as well as SQL-based access rules, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap2.html)
+#   LoadModule mod_wrap2.c
+#
+# Support module for mod_wrap2 that handles access rules stored in specially
+# formatted files on disk
+# (http://www.proftpd.org/docs/contrib/mod_wrap2_file.html)
+#   LoadModule mod_wrap2_file.c
+#
+# Support module for mod_wrap2 that handles access rules stored in SQL
+# database tables (http://www.proftpd.org/docs/contrib/mod_wrap2_sql.html)
+#   LoadModule mod_wrap2_sql.c
+#
+# Provide a flexible way of specifying that certain configuration directives
+# only apply to certain sessions, based on credentials such as connection
+# class, user, or group membership
+# (http://www.proftpd.org/docs/contrib/mod_ifsession.html)
+#   LoadModule mod_ifsession.c
+
+# TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+<IfDefine TLS>
+  LoadModule			mod_tls.c
+  TLSEngine			on
+  TLSRequired			on
+  TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem
+  TLSRSACertificateKeyFile	@PKIDIR@/certs/proftpd.pem
+  TLSCipherSuite		ALL:!ADH:!DES
+  TLSOptions			NoCertRequest
+  TLSVerifyClient		off
+  #TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
+  TLSLog			/var/log/proftpd/tls.log
+</IfDefine>
+
+# Dynamic ban lists (http://www.proftpd.org/docs/contrib/mod_ban.html)
+# Enable this with PROFTPD_OPTIONS=-DDYNAMIC_BAN_LISTS in /etc/sysconfig/proftpd
+<IfDefine DYNAMIC_BAN_LISTS>
+  LoadModule			mod_ban.c
+  BanEngine			on
+  BanLog			/var/log/proftpd/ban.log
+  BanTable			/var/run/proftpd/ban.tab
 
   # If the same client reaches the MaxLoginAttempts limit 2 times
   # within 10 minutes, automatically add a ban for that client that
   # will expire after one hour.
-  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+  BanOnEvent			MaxLoginAttempts 2/00:10:00 01:00:00
 
   # Allow the FTP admin to manually add/remove bans
-  BanControlsACLs all allow user ftpadm
-</IfModule>
+  BanControlsACLs		all allow user ftpadm
+</IfDefine>
+
+# Global Config - config common to Server Config and all virtual hosts
+# See: http://www.proftpd.org/docs/howto/Vhost.html
+<Global>
+
+  # Umask 022 is a good standard umask to prevent new dirs and files
+  # from being group and world writable
+  Umask				022
+
+  # Don't do ident queries (hangs when the port is filtered)
+  IdentLookups			off
+
+  # Allow users to overwrite files and change permissions
+  AllowOverwrite		yes
+  <Limit ALL SITE_CHMOD>
+    AllowAll
+  </Limit>
+
+</Global>
+
+# A basic anonymous configuration, with an upload directory
+# Enable this with PROFTPD_OPTIONS=-DANONYMOUS_FTP in /etc/sysconfig/proftpd
+<IfDefine ANONYMOUS_FTP>
+  <Anonymous ~ftp>
+    User			ftp
+    Group			ftp
+    AccessGrantMsg		"Anonymous login ok, restrictions apply."
+
+    # We want clients to be able to login with "anonymous" as well as "ftp"
+    UserAlias			anonymous ftp
+
+    # Limit the maximum number of anonymous logins
+    MaxClients			10 "Sorry, max %m users -- try again later"
+
+    # Put the user into /pub right after login
+    #DefaultChdir		/pub
+
+    # We want 'welcome.msg' displayed at login, '.message' displayed in
+    # each newly chdired directory and tell users to read README* files. 
+    DisplayLogin		/welcome.msg
+    DisplayChdir		.message
+    DisplayReadme		README*
+
+    # Cosmetic option to make all files appear to be owned by user "ftp"
+    DirFakeUser			on ftp
+    DirFakeGroup		on ftp
+
+    # Limit WRITE everywhere in the anonymous chroot
+    <Limit WRITE SITE_CHMOD>
+      DenyAll
+    </Limit>
+
+    # An upload directory that allows storing files but not retrieving
+    # or creating directories.
+    <Directory uploads/*>
+      AllowOverwrite		no
+      <Limit READ>
+        DenyAll
+      </Limit>
+
+      <Limit STOR>
+        AllowAll
+      </Limit>
+    </Directory>
+
+    # Don't write anonymous accesses to the system wtmp file (good idea!)
+    WtmpLog			off
+
+    # Logging for the anonymous transfers
+    ExtendedLog			/var/log/proftpd/access.log WRITE,READ default
+    ExtendedLog			/var/log/proftpd/auth.log AUTH auth
+
+  </Anonymous>
+</IfDefine>
 


Index: proftpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- proftpd.init	3 Feb 2008 18:02:39 -0000	1.6
+++ proftpd.init	3 Aug 2009 12:46:15 -0000	1.7
@@ -33,10 +33,16 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+# Source ProFTPD configuration.
+PROFTPD_OPTIONS=""
+if [ -f /etc/sysconfig/proftpd ]; then
+	. /etc/sysconfig/proftpd
+fi
+
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
-[ -x /usr/sbin/proftpd ] || exit 0
+[ -x /usr/sbin/proftpd ] || exit 5
 
 RETVAL=0
 
@@ -44,7 +50,7 @@ prog="proftpd"
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon proftpd 2>/dev/null
+	daemon proftpd $PROFTPD_OPTIONS 2>/dev/null
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- proftpd.pam	1 Aug 2005 18:29:28 -0000	1.1
+++ proftpd.pam	3 Aug 2009 12:46:15 -0000	1.2
@@ -1,6 +1,9 @@
 #%PAM-1.0
+session    optional     pam_keyinit.so    force revoke
 auth       required	pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth       required	pam_stack.so service=system-auth
 auth       required	pam_shells.so
-account    required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
+auth       include      system-auth
+account    include      system-auth
+# Comment the following line if you are having PAM issues with chrooted users
+session    include      system-auth
+session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- proftpd.spec	6 Apr 2009 22:06:20 -0000	1.12
+++ proftpd.spec	3 Aug 2009 12:46:15 -0000	1.13
@@ -1,39 +1,42 @@
-#define prever rc3
-
-Summary: Flexible, stable and highly-configurable FTP server
-Name: proftpd
-Version: 1.3.2
-Release: 1%{?prever:.%{prever}}%{?dist}
-License: GPLv2+
-Group: System Environment/Daemons
-URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
-Source1: proftpd.conf
-Source2: proftpd.init
-Source3: proftpd-xinetd
-Source4: proftpd.logrotate
-Source5: proftpd-welcome.msg
-Source6: proftpd.pam
-Source7: proftpd-mod_quotatab_ldap.ldif
-Source8: proftpd-mod_quotatab_ldap.schema
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pam >= 0.59
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-BuildRequires: pam-devel, ncurses-devel, pkgconfig
-BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: zlib-devel
-# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-%if 0%{?rhel} <= 5
-BuildRequires: tcp_wrappers
+# Use certs in %{_sysconfdir}/pki/tls/certs if available (FC4, RHEL5 onwards)
+%global use_pki %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo 1; else echo 0; fi)
+%if %{use_pki}
+%global pkidir %{_sysconfdir}/pki/tls
 %else
-BuildRequires: tcp_wrappers-devel
+%global pkidir %{_datadir}/ssl
 %endif
-BuildRequires: openldap-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-Provides: ftpserver
+
+#global prever rc3
+%global rpmrel 2
+
+Summary:		Flexible, stable and highly-configurable FTP server
+Name:			proftpd
+Version:		1.3.2a
+Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
+License:		GPLv2+
+Group:			System Environment/Daemons
+URL:			http://www.proftpd.org/
+Source0:		ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
+Source1:		proftpd.conf
+Source2:		proftpd.init
+Source3:		proftpd-xinetd
+Source4:		proftpd.logrotate
+Source5:		proftpd-welcome.msg
+Source6:		proftpd.pam
+Source7:		proftpd-mod_quotatab_ldap.ldif
+Source8:		proftpd-mod_quotatab_ldap.schema
+Source9:		proftpd.sysconfig
+Patch0:			proftpd-1.3.2rc3-nostrip.patch
+Patch1:			proftpd-1.3.2a-defines.patch
+Patch2:			proftpd-1.3.2-parallel-build.patch
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
+Requires(postun):	/sbin/service
+BuildRequires:		pam-devel, ncurses-devel, pkgconfig, gettext, zlib-devel
+BuildRequires:		openssl-devel, libacl-devel, libcap-devel, /usr/include/tcpd.h
+BuildRequires:		openldap-devel, mysql-devel, postgresql-devel
+Provides:		ftpserver
 
 %description
 ProFTPD is an enhanced FTP server with a focus toward simplicity, security,
@@ -47,27 +50,27 @@ needed scripts to have it run by xinetd 
 
 
 %package ldap
-Summary: Module to add LDAP support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add LDAP support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description ldap
 Module to add LDAP support to the ProFTPD FTP server.
 
 
 %package mysql
-Summary: Module to add MySQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add MySQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description mysql
 Module to add MySQL support to the ProFTPD FTP server.
 
 
 %package postgresql
-Summary: Module to add PostgreSQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add PostgreSQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description postgresql
 Module to add PostgreSQL support to the ProFTPD FTP server.
@@ -76,52 +79,94 @@ Module to add PostgreSQL support to the 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
+# 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
+
+# Avoid documentation name conflicts
+%{__mv} contrib/README contrib/README.contrib
+
+# Set up directory names in config file
+%{__sed} -e 's#@PKIDIR@#%{pkidir}#g' \
+	%{SOURCE1} > proftpd.conf
+
+# Avoid docfile dependencies
+%{__chmod} -x contrib/xferstats.holger-preiss
+
+# Copy in LDAP schema/LDIF
+%{__cp} -p %{SOURCE7} 70proftpd-quota.ldif
+%{__cp} -p %{SOURCE8} proftpd-quota.schema
+
+# PAM Configuration:
+# The "include" syntax used in our PAM configuration file was introduced in
+# PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older
+# distributions such as EL-4 (PAM 0.77) need to fall back to using the
+# now-deprecated pam_stack module. Since the pam-devel package doesn't
+# include a pkgconfig file from whice we could check the version number, we
+# instead check for the absence of the file /etc/pam.d/config-util, which is
+# present in all PAM packages from 0.80 onwards and acts as a useful
+# indicator of the need to fall back to pam_stack.
+%{__cp} -p %{SOURCE6} .
+[ ! -f /etc/pam.d/config-util ] && %{__sed} -i -e \
+	's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \
+	proftpd.pam
+
+# Fix character encoding in docs
+for f in ChangeLog; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf-8
+	%{__mv} -f ${f}.utf-8 ${f}
+done
 
 %build
-# Disable stripping in order to get useful debuginfo packages
-%{__perl} -pi -e 's|"-s"|""|g' configure
+
+# Modules to be built as DSO's (excluding mod_ifsession, always specified last)
+SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
+SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
+SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
-    --libexecdir="%{_libexecdir}/proftpd" \
-    --localstatedir="%{_var}/run" \
-    --enable-ctrls \
-    --enable-facl \
-    --enable-dso \
-    --enable-ipv6 \
-    --enable-shadow \
-    --enable-openssl \
-    --with-libraries="%{_libdir}/mysql" \
-    --with-includes="%{_includedir}/mysql" \
-    --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
-
-# It seems that with _smp_mflags -lsupp tries to get linked before being built
-# (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
-%{__make}
+	--libexecdir="%{_libexecdir}/proftpd" \
+	--localstatedir="%{_localstatedir}/run" \
+	--enable-ctrls \
+	--enable-dso \
+	--enable-facl \
+	--enable-ipv6 \
+	--enable-nls \
+	--enable-openssl \
+	--enable-shadow \
+	--with-libraries="%{_libdir}/mysql" \
+	--with-includes="%{_includedir}/mysql" \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
+
+%{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} \
-    rundir="%{_var}/run/proftpd" \
-    INSTALL_USER=`id -un` \
-    INSTALL_GROUP=`id -gn`
-%{__install} -D -p -m 0640 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -p -m 0755 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -p -m 0640 %{SOURCE3} \
-    %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -p -m 0644 %{SOURCE4} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE7} 70proftpd-quota.ldif
-%{__install} -D -p -m 0644 %{SOURCE8} proftpd-quota.schema
-%{__mkdir_p} %{buildroot}/var/ftp/uploads
-%{__mkdir_p} %{buildroot}/var/ftp/pub
-%{__mkdir_p} %{buildroot}/var/log/proftpd
-touch %{buildroot}%{_sysconfdir}/ftpusers
+	rundir="%{_localstatedir}/run/proftpd" \
+	INSTALL_USER=`%{__id} -un` \
+	INSTALL_GROUP=`%{__id} -gn`
+%{__install} -D -p -m 640 proftpd.conf	%{buildroot}%{_sysconfdir}/proftpd.conf
+%{__install} -D -p -m 644 proftpd.pam	%{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 755 %{SOURCE2}	%{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE3}	%{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
+%{__install} -D -p -m 644 %{SOURCE4}	%{buildroot}%{_sysconfdir}/logrotate.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE5}	%{buildroot}%{_localstatedir}/ftp/welcome.msg
+%{__install} -D -p -m 644 %{SOURCE9}	%{buildroot}%{_sysconfdir}/sysconfig/proftpd
+%{__mkdir_p} %{buildroot}%{_localstatedir}/{ftp/{pub,uploads},log/proftpd}
+/bin/touch %{buildroot}%{_sysconfdir}/ftpusers
+
+# Find translations
+%find_lang proftpd
 
 
 %clean
@@ -130,83 +175,163 @@ touch %{buildroot}%{_sysconfdir}/ftpuser
 
 %post
 if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add proftpd
-    IFS=":"; cat /etc/passwd | \
-    while { read username nu nu gid nu nu nu nu; }; do \
-        if [ $gid -lt 100 -a "$username" != "ftp" ]; then
-            echo $username >> %{_sysconfdir}/ftpusers
-        fi
-    done
+	/sbin/chkconfig --add proftpd
+	IFS=":"; %{__cat} /etc/passwd | \
+	while { read username nu nu gid nu nu nu nu; }; do \
+		if [ $gid -lt 100 -a "$username" != "ftp" ]; then
+			echo $username >> %{_sysconfdir}/ftpusers
+		fi
+	done
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service proftpd stop &>/dev/null || :
-    /sbin/chkconfig --del proftpd
-    /sbin/service xinetd reload &>/dev/null || :
-    if [ -d %{_var}/run/proftpd ]; then
-        rm -rf %{_var}/run/proftpd/*
-    fi
+	/sbin/service proftpd stop &>/dev/null || :
+	/sbin/chkconfig --del proftpd || :
+	/sbin/service xinetd reload &>/dev/null || :
+	/usr/bin/find %{_localstatedir}/run/proftpd -depth -mindepth 1 |
+		/usr/bin/xargs %{__rm} -rf &>/dev/null || :
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service proftpd condrestart &>/dev/null || :
+	/sbin/service proftpd condrestart &>/dev/null || :
 fi
 
 
-%files
+%files -f proftpd.lang
 %defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog NEWS README*
-%doc doc/* sample-configurations/
+%doc COPYING CREDITS ChangeLog NEWS README
+%doc README.DSO README.modules README.IPv6 README.PAM
+%doc README.capabilities README.classes README.controls README.facl
+%doc contrib/README.contrib contrib/README.ratio
+%doc doc/* sample-configurations/ contrib/xferstats.holger-preiss
+%dir %{_localstatedir}/ftp/
+%dir %{_localstatedir}/ftp/pub/
 %dir %{_localstatedir}/run/proftpd/
+%config(noreplace) %{_localstatedir}/ftp/welcome.msg
+%config(noreplace) %{_sysconfdir}/ftpusers
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
 %config(noreplace) %{_sysconfdir}/proftpd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/proftpd
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
-%config %{_sysconfdir}/ftpusers
-%config(noreplace) %{_sysconfdir}/pam.d/proftpd
-%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
-%{_mandir}/man?/*
-%{_bindir}/*
+%{_bindir}/ftpcount
+%{_bindir}/ftpdctl
+%{_bindir}/ftptop
+%{_bindir}/ftpwho
+%exclude %{_bindir}/prxs
+%{_sbindir}/ftpshut
+%{_sbindir}/in.proftpd
+%{_sbindir}/proftpd
+%{_mandir}/man1/ftpcount.1*
+%{_mandir}/man1/ftptop.1*
+%{_mandir}/man1/ftpwho.1*
+%{_mandir}/man5/xferlog.5*
+%{_mandir}/man8/ftpdctl.8*
+%{_mandir}/man8/ftpshut.8*
+%{_mandir}/man8/proftpd.8*
 %exclude %{_includedir}/proftpd/
 %exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
+%{_libexecdir}/proftpd/mod_load.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
+%{_libexecdir}/proftpd/mod_quotatab_radius.so
+%{_libexecdir}/proftpd/mod_quotatab_sql.so
+%{_libexecdir}/proftpd/mod_radius.so
+%{_libexecdir}/proftpd/mod_ratio.so
+%{_libexecdir}/proftpd/mod_rewrite.so
+%{_libexecdir}/proftpd/mod_site_misc.so
 %{_libexecdir}/proftpd/mod_sql.so
 %{_libexecdir}/proftpd/mod_wrap.so
+%{_libexecdir}/proftpd/mod_wrap2.so
+%{_libexecdir}/proftpd/mod_wrap2_file.so
+%{_libexecdir}/proftpd/mod_wrap2_sql.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
-%{_sbindir}/*
-%dir /var/ftp/
-%attr(331, ftp, ftp) %dir /var/ftp/uploads/
-%dir /var/ftp/pub/
-%config(noreplace) /var/ftp/welcome.msg
-%attr(750, root, root) %dir /var/log/proftpd/
+%attr(331, ftp, ftp) %dir %{_localstatedir}/ftp/uploads/
+%attr(750, root, root) %dir %{_localstatedir}/log/proftpd/
 
 %files ldap
 %defattr(-,root,root,-)
-%doc 70proftpd-quota.ldif proftpd-quota.schema
-%dir %{_libexecdir}/proftpd/
+%doc README.LDAP 70proftpd-quota.ldif proftpd-quota.schema
 %{_libexecdir}/proftpd/mod_ldap.so
 %{_libexecdir}/proftpd/mod_quotatab_ldap.so
 
 %files mysql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_mysql.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_postgres.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 
 %changelog
+* Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
+- Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
+
+* Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-1
+- Update to 1.3.2a
+- Add patch to reinstate support for -DPARAMETER (http://bugs.proftpd.org/3221)
+- Retain CAP_AUDIT_WRITE, needed for pam_loginuid (#506735, fixed upstream)
+- Remove ScoreboardFile directive from configuration file - default value
+  works better with SELinux (#498375)
+- Ship mod_quotatab_sql.so in the main package rather than the SQL backend
+  subpackages
+- New DSO modules:
+  - mod_ctrls_admin
+  - mod_facl
+  - mod_load
+  - mod_quotatab_radius
+  - mod_radius
+  - mod_ratio
+  - mod_rewrite
+  - mod_site_misc
+  - mod_wrap2
+  - mod_wrap2_file
+  - mod_wrap2_sql
+- Enable mod_lang/nls support for RFC 2640 (and buildreq gettext)
+- Add /etc/sysconfig/proftpd to set PROFTPD_OPTIONS and update initscript to
+  use this value so we can use a define to enable (e.g.) anonymous FTP support
+  rather than having a huge commented-out section in the config file
+- Rewrite config file to remove most settings that don't change upstream
+  defaults, and add brief descriptions for all available loadable modules
+- Move Umask and IdentLookups settings from server config to <Global> context
+  so that they apply to all servers, including virtual hosts (#509251)
+- Ensure mod_ifsession is always the last one specified, which makes sure that
+  mod_ifsession's changes are seen properly by other modules
+- Drop pam version requirement - all targets have sufficiently recent version
+- Drop redundant explicit dependency on pam
+- Subpackages don't need to own %%{_libexecdir}/proftpd directory
+- Drop redundant krb5-devel buildreq
+- Make SRPM back-compatible with EPEL-4 (TLS cert dirs, PAM config)
+- Don't include README files for non-Linux platforms
+- Recode ChangeLog as UTF-8
+- Don't ship the prxs tool for building custom DSO's since we don't ship the
+  headers either
+- Prevent stripping of binaries in a slightly more robust way
+- Fix release tag to be ready for future beta/rc versions
+- Define RPM macros in global scope
+- BuildRequire libcap-devel so that we use the system library rather than the
+  bundled one, and eliminate log messages like:
+  kernel: warning: `proftpd' uses 32-bit capabilities (legacy support in use)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2.1
+- Update the tcp_wrappers BR to be just /usr/include/tcpd.h instead.
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
+- Fix tcp_wrappers-devel BR conditional.
+
 * Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
 - Update to 1.3.2.
 - Include mod_wrap (#479813).
@@ -216,7 +341,7 @@ fi
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Caol?n McNamara 1.3.2-0.3.rc3
-- rebuild for dependencies
+- Rebuild for dependencies
 
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Apr 2009 22:06:20 -0000	1.8
+++ sources	3 Aug 2009 12:46:15 -0000	1.9
@@ -1 +1 @@
-89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2
+ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2


--- proftpd-1.3.1-find-umode_t.patch DELETED ---



From pghmcfc at fedoraproject.org  Mon Aug  3 12:46:17 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  3 Aug 2009 12:46:17 +0000 (UTC)
Subject: rpms/proftpd/F-11 proftpd-1.3.2-parallel-build.patch, NONE,
	1.1 proftpd-1.3.2a-defines.patch, NONE,
	1.1 proftpd-1.3.2rc3-nostrip.patch, NONE, 1.1 proftpd.sysconfig,
	NONE, 1.1 .cvsignore, 1.13, 1.14 proftpd.conf, 1.9,
	1.10 proftpd.init, 1.6, 1.7 proftpd.spec, 1.47, 1.48 sources,
	1.13, 1.14 proftpd-1.3.1-find-umode_t.patch, 1.1, NONE
Message-ID: <20090803124617.126F811C0382@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

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

Modified Files:
	.cvsignore proftpd.conf proftpd.init proftpd.spec sources 
Added Files:
	proftpd-1.3.2-parallel-build.patch 
	proftpd-1.3.2a-defines.patch proftpd-1.3.2rc3-nostrip.patch 
	proftpd.sysconfig 
Removed Files:
	proftpd-1.3.1-find-umode_t.patch 
Log Message:
Sync with devel

proftpd-1.3.2-parallel-build.patch:
 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE proftpd-1.3.2-parallel-build.patch ---
diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
--- proftpd-1.3.2-orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2/Makefile.in	2009-02-16 14:28:43.000000000 +0100
@@ -54,13 +54,13 @@
 proftpd$(EXEEXT): lib src modules dirs locale
 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
 
-ftpcount$(EXEEXT): utils
+ftpcount$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
 
-ftpdctl$(EXEEXT): src
+ftpdctl$(EXEEXT): lib src
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
 
-ftpshut$(EXEEXT): utils
+ftpshut$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
 
 ftptop$(EXEEXT): lib utils

proftpd-1.3.2a-defines.patch:
 dirtree.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE proftpd-1.3.2a-defines.patch ---
http://bugs.proftpd.org/show_bug.cgi?id=3221

--- proftpd-1.3.2a/src/dirtree.c	2009-04-28 23:33:57.000000000 +0100
+++ proftpd-1.3.2a/src/dirtree.c	2009-07-06 12:06:51.000000000 +0100
@@ -575,6 +575,17 @@
     }
   }
 
+  if (defines_perm_list) {
+    char **defines = defines_perm_list->elts;
+    register unsigned int i = 0;
+
+    for (i = 0; i < defines_perm_list->nelts; i++) {
+      if (defines[i] &&
+          strcmp(defines[i], definition) == 0)
+        return TRUE;
+    }
+  }
+
   errno = ENOENT;
   return FALSE;
 }

proftpd-1.3.2rc3-nostrip.patch:
 Make.rules.in                 |    4 ++--
 contrib/mod_load/Makefile.in  |    2 +-
 contrib/mod_wrap2/Makefile.in |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE proftpd-1.3.2rc3-nostrip.patch ---
Removing @INSTALL_STRIP@ prevents stripping of debuginfo at %install time

Cleaning up top_srcdir prevents debuginfo package creation fails like this:
/usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character

--- proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:26.000000000 +0000
+++ proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:48.000000000 +0000
@@ -29,8 +29,8 @@
 INSTALL=@INSTALL@
 INSTALL_USER=@install_user@
 INSTALL_GROUP=@install_group@
-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_BIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_SBIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
 
 RM=rm -f
--- proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2009-01-08 20:37:26.000000000 +0000
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules
--- proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2009-07-03 17:00:41.000000000 +0100
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules


--- NEW FILE proftpd.sysconfig ---
# Set PROFTPD_OPTIONS to add command-line options for proftpd.
# See proftpd(8) for a comprehensive list of what can be used.
#
# The following "Defines" can be used with the default configuration file:
# -DANONYMOUS_FTP	: Enable anonymous FTP
# -DDYNAMIC_BAN_LISTS	: Enable dynamic ban lists (mod_ban)
# -DTLS			: Enable TLS (mod_tls)
#
# For example, for anonymous FTP and dynamic ban list support:
# PROFTPD_OPTIONS="-DANONYMOUS_FTP -DDYNAMIC_BAN_LISTS"
PROFTPD_OPTIONS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Apr 2009 21:47:16 -0000	1.13
+++ .cvsignore	3 Aug 2009 12:46:16 -0000	1.14
@@ -1 +1 @@
-proftpd-1.3.2.tar.bz2
+proftpd-1.3.2a.tar.bz2


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- proftpd.conf	2 Jan 2009 13:31:48 -0000	1.9
+++ proftpd.conf	3 Aug 2009 12:46:16 -0000	1.10
@@ -1,169 +1,239 @@
 # This is the ProFTPD configuration file
+#
+# See: http://www.proftpd.org/docs/directives/linked/by-name.html
+
+# Server Config - config used for anything outside a <VirtualHost> or <Global> context
+# See: http://www.proftpd.org/docs/howto/Vhost.html
 
 ServerName			"ProFTPD server"
 ServerIdent			on "FTP Server ready."
 ServerAdmin			root at localhost
-ServerType			standalone
-#ServerType			inetd
 DefaultServer			on
-AccessGrantMsg			"User %u logged in."
-#DisplayConnect			/etc/ftpissue
-#DisplayLogin			/etc/ftpmotd
-#DisplayGoAway			/etc/ftpgoaway
-DeferWelcome			off
 
-# Use this to excude users from the chroot
+# Cause every FTP user except adm to be chrooted into their home directory
 DefaultRoot			~ !adm
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd
 AuthOrder			mod_auth_pam.c* mod_auth_unix.c
+# If you use NIS/YP/LDAP you may need to disable PersistentPasswd
+#PersistentPasswd		off
 
-# Do not perform ident nor DNS lookups (hangs when the port is filtered)
-IdentLookups			off
+# Don't do reverse DNS lookups (hangs on DNS problems)
 UseReverseDNS			off
 
-# Port 21 is the standard FTP port.
-Port				21
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# Default to show dot files in directory listings
-ListOptions			"-a"
-
-# See Configuration.html for these (here are the default values)
-#MultilineRFC2228		off
-#RootLogin			off
-#LoginPasswordPrompt		on
-#MaxLoginAttempts		3
-#MaxClientsPerHost		none
-#AllowForeignAddress		off	# For FXP
-
-# Allow to resume not only the downloads but the uploads too
-AllowRetrieveRestart		on
-AllowStoreRestart		on
+# Set the user and group that the server runs as
+User				nobody
+Group				nobody
 
 # To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
+# to 20.  If you need to allow more than 20 concurrent connections
 # at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
+# in standalone mode; in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
 # (such as xinetd)
 MaxInstances			20
 
-# Set the user and group that the server normally runs at.
-User				nobody
-Group				nobody
-
 # Disable sendfile by default since it breaks displaying the download speeds in
 # ftptop and ftpwho
-UseSendfile			no
-
-# This is where we want to put the pid file
-ScoreboardFile			/var/run/proftpd.score
-
-# Normally, we want users to do a few things.
-<Global>
-  AllowOverwrite		yes
-  <Limit ALL SITE_CHMOD>
-    AllowAll
-  </Limit>
-</Global>
+UseSendfile			off
 
 # Define the log formats
 LogFormat			default	"%h %l %u %t \"%r\" %s %b"
 LogFormat			auth	"%v [%P] %h %t \"%r\" %s"
 
-# TLS
-# Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html
-#TLSEngine			on
-#TLSRequired			on
-#TLSRSACertificateFile		/etc/pki/tls/certs/proftpd.pem
-#TLSRSACertificateKeyFile	/etc/pki/tls/certs/proftpd.pem
-#TLSCipherSuite			ALL:!ADH:!DES
-#TLSOptions			NoCertRequest
-#TLSVerifyClient		off
-##TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
-#TLSLog				/var/log/proftpd/tls.log
-
-# SQL authentication Dynamic Shared Object (DSO) loading
-# See README.DSO and howto/DSO.html for more details.
-#<IfModule mod_dso.c>
-#  LoadModule mod_ban.c
-#  LoadModule mod_ifsession.c
-#  LoadModule mod_quotatab.c
-#  LoadModule mod_quotatab_file.c
-#  LoadModule mod_sql.c
-#  LoadModule mod_sql_mysql.c
-#  LoadModule mod_sql_postgres.c
-#</IfModule>
-
-# A basic anonymous configuration, with an upload directory.
-#<Anonymous ~ftp>
-#  User				ftp
-#  Group				ftp
-#  AccessGrantMsg		"Anonymous login ok, restrictions apply."
-#
-#  # We want clients to be able to login with "anonymous" as well as "ftp"
-#  UserAlias			anonymous ftp
-#
-#  # Limit the maximum number of anonymous logins
-#  MaxClients			10 "Sorry, max %m users -- try again later"
-#
-#  # Put the user into /pub right after login
-#  #DefaultChdir			/pub
-#
-#  # We want 'welcome.msg' displayed at login, '.message' displayed in
-#  # each newly chdired directory and tell users to read README* files. 
-#  DisplayLogin			/welcome.msg
-#  DisplayFirstChdir		.message
-#  DisplayReadme			README*
-#
-#  # Some more cosmetic and not vital stuff
-#  DirFakeUser			on ftp
-#  DirFakeGroup			on ftp
-#
-#  # Limit WRITE everywhere in the anonymous chroot
-#  <Limit WRITE SITE_CHMOD>
-#    DenyAll
-#  </Limit>
-#
-#  # An upload directory that allows storing files but not retrieving
-#  # or creating directories.
-#  <Directory uploads/*>
-#    AllowOverwrite		no
-#    <Limit READ>
-#      DenyAll
-#    </Limit>
-#
-#    <Limit STOR>
-#      AllowAll
-#    </Limit>
-#  </Directory>
-#
-#  # Don't write anonymous accesses to the system wtmp file (good idea!)
-#  WtmpLog			off
-#
-#  # Logging for the anonymous transfers
-#  ExtendedLog		/var/log/proftpd/access.log WRITE,READ default
-#  ExtendedLog		/var/log/proftpd/auth.log AUTH auth
-#
-#</Anonymous>
-
-# Configuration for mod_ban
-<IfModule mod_ban.c>
-  BanEngine on
-  BanLog /var/log/proftpd/ban.log
-  BanTable /var/run/proftpd/ban.tab
+# Dynamic Shared Object (DSO) loading
+# See README.DSO and howto/DSO.html for more details
+#
+# General database support (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql.c
+#
+# Mysql support (requires proftpd-mysql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_mysql.c
+#
+# Postgresql support (requires proftpd-postgresql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_postgres.c
+#
+# Quota support (http://www.proftpd.org/docs/contrib/mod_quotatab.html)
+#   LoadModule mod_quotatab.c
+#
+# File-specific "driver" for storing quota table information in files
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_file.html)
+#   LoadModule mod_quotatab_file.c
+#
+# SQL database "driver" for storing quota table information in SQL tables
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_sql.html)
+#   LoadModule mod_quotatab_sql.c
+#
+# LDAP support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/directives/linked/config_ref_mod_ldap.html)
+#   LoadModule mod_ldap.c
+#
+# LDAP quota support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_ldap.html)
+#   LoadModule mod_quotatab_ldap.c
+#
+# Support for authenticating users using the RADIUS protocol
+# (http://www.proftpd.org/docs/contrib/mod_radius.html)
+#   LoadModule mod_radius.c
+#
+# Retrieve quota limit table information from a RADIUS server
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_radius.html)
+#   LoadModule mod_quotatab_radius.c
+#
+# Administrative control actions for the ftpdctl program
+# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
+#   LoadModule mod_ctrls_admin.c
+#
+# Support for POSIX ACLs
+# (http://www.proftpd.org/docs/modules/mod_facl.html)
+#   LoadModule mod_facl.c
+#
+# Configure server availability based on system load
+# (http://www.proftpd.org/docs/contrib/mod_load.html)
+#   LoadModule mod_load.c
+#
+# Limit downloads to a multiple of upload volume (see README.ratio)
+#   LoadModule mod_ratio.c
+#
+# Rewrite FTP commands sent by clients on-the-fly,
+# using regular expression matching and substitution 
+# (http://www.proftpd.org/docs/contrib/mod_rewrite.html)
+#   LoadModule mod_rewrite.c
+#
+# Support for miscellaneous SITE commands such as SITE MKDIR, SITE SYMLINK,
+# and SITE UTIME (http://www.proftpd.org/docs/contrib/mod_site_misc.html)
+#   LoadModule mod_site_misc.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap.html)
+#   LoadModule mod_wrap.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, as well as SQL-based access rules, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap2.html)
+#   LoadModule mod_wrap2.c
+#
+# Support module for mod_wrap2 that handles access rules stored in specially
+# formatted files on disk
+# (http://www.proftpd.org/docs/contrib/mod_wrap2_file.html)
+#   LoadModule mod_wrap2_file.c
+#
+# Support module for mod_wrap2 that handles access rules stored in SQL
+# database tables (http://www.proftpd.org/docs/contrib/mod_wrap2_sql.html)
+#   LoadModule mod_wrap2_sql.c
+#
+# Provide a flexible way of specifying that certain configuration directives
+# only apply to certain sessions, based on credentials such as connection
+# class, user, or group membership
+# (http://www.proftpd.org/docs/contrib/mod_ifsession.html)
+#   LoadModule mod_ifsession.c
+
+# TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+<IfDefine TLS>
+  LoadModule			mod_tls.c
+  TLSEngine			on
+  TLSRequired			on
+  TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem
+  TLSRSACertificateKeyFile	@PKIDIR@/certs/proftpd.pem
+  TLSCipherSuite		ALL:!ADH:!DES
+  TLSOptions			NoCertRequest
+  TLSVerifyClient		off
+  #TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
+  TLSLog			/var/log/proftpd/tls.log
+</IfDefine>
+
+# Dynamic ban lists (http://www.proftpd.org/docs/contrib/mod_ban.html)
+# Enable this with PROFTPD_OPTIONS=-DDYNAMIC_BAN_LISTS in /etc/sysconfig/proftpd
+<IfDefine DYNAMIC_BAN_LISTS>
+  LoadModule			mod_ban.c
+  BanEngine			on
+  BanLog			/var/log/proftpd/ban.log
+  BanTable			/var/run/proftpd/ban.tab
 
   # If the same client reaches the MaxLoginAttempts limit 2 times
   # within 10 minutes, automatically add a ban for that client that
   # will expire after one hour.
-  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+  BanOnEvent			MaxLoginAttempts 2/00:10:00 01:00:00
 
   # Allow the FTP admin to manually add/remove bans
-  BanControlsACLs all allow user ftpadm
-</IfModule>
+  BanControlsACLs		all allow user ftpadm
+</IfDefine>
+
+# Global Config - config common to Server Config and all virtual hosts
+# See: http://www.proftpd.org/docs/howto/Vhost.html
+<Global>
+
+  # Umask 022 is a good standard umask to prevent new dirs and files
+  # from being group and world writable
+  Umask				022
+
+  # Don't do ident queries (hangs when the port is filtered)
+  IdentLookups			off
+
+  # Allow users to overwrite files and change permissions
+  AllowOverwrite		yes
+  <Limit ALL SITE_CHMOD>
+    AllowAll
+  </Limit>
+
+</Global>
+
+# A basic anonymous configuration, with an upload directory
+# Enable this with PROFTPD_OPTIONS=-DANONYMOUS_FTP in /etc/sysconfig/proftpd
+<IfDefine ANONYMOUS_FTP>
+  <Anonymous ~ftp>
+    User			ftp
+    Group			ftp
+    AccessGrantMsg		"Anonymous login ok, restrictions apply."
+
+    # We want clients to be able to login with "anonymous" as well as "ftp"
+    UserAlias			anonymous ftp
+
+    # Limit the maximum number of anonymous logins
+    MaxClients			10 "Sorry, max %m users -- try again later"
+
+    # Put the user into /pub right after login
+    #DefaultChdir		/pub
+
+    # We want 'welcome.msg' displayed at login, '.message' displayed in
+    # each newly chdired directory and tell users to read README* files. 
+    DisplayLogin		/welcome.msg
+    DisplayChdir		.message
+    DisplayReadme		README*
+
+    # Cosmetic option to make all files appear to be owned by user "ftp"
+    DirFakeUser			on ftp
+    DirFakeGroup		on ftp
+
+    # Limit WRITE everywhere in the anonymous chroot
+    <Limit WRITE SITE_CHMOD>
+      DenyAll
+    </Limit>
+
+    # An upload directory that allows storing files but not retrieving
+    # or creating directories.
+    <Directory uploads/*>
+      AllowOverwrite		no
+      <Limit READ>
+        DenyAll
+      </Limit>
+
+      <Limit STOR>
+        AllowAll
+      </Limit>
+    </Directory>
+
+    # Don't write anonymous accesses to the system wtmp file (good idea!)
+    WtmpLog			off
+
+    # Logging for the anonymous transfers
+    ExtendedLog			/var/log/proftpd/access.log WRITE,READ default
+    ExtendedLog			/var/log/proftpd/auth.log AUTH auth
+
+  </Anonymous>
+</IfDefine>
 


Index: proftpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- proftpd.init	19 Aug 2007 16:18:30 -0000	1.6
+++ proftpd.init	3 Aug 2009 12:46:16 -0000	1.7
@@ -33,10 +33,16 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+# Source ProFTPD configuration.
+PROFTPD_OPTIONS=""
+if [ -f /etc/sysconfig/proftpd ]; then
+	. /etc/sysconfig/proftpd
+fi
+
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
-[ -x /usr/sbin/proftpd ] || exit 0
+[ -x /usr/sbin/proftpd ] || exit 5
 
 RETVAL=0
 
@@ -44,7 +50,7 @@ prog="proftpd"
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon proftpd 2>/dev/null
+	daemon proftpd $PROFTPD_OPTIONS 2>/dev/null
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- proftpd.spec	14 Apr 2009 16:24:11 -0000	1.47
+++ proftpd.spec	3 Aug 2009 12:46:16 -0000	1.48
@@ -1,36 +1,42 @@
-#define prever rc3
-
-Summary: Flexible, stable and highly-configurable FTP server
-Name: proftpd
-Version: 1.3.2
-Release: 2.1%{?prever:.%{prever}}%{?dist}
-License: GPLv2+
-Group: System Environment/Daemons
-URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
-Source1: proftpd.conf
-Source2: proftpd.init
-Source3: proftpd-xinetd
-Source4: proftpd.logrotate
-Source5: proftpd-welcome.msg
-Source6: proftpd.pam
-Source7: proftpd-mod_quotatab_ldap.ldif
-Source8: proftpd-mod_quotatab_ldap.schema
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pam >= 0.59
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-BuildRequires: pam-devel, ncurses-devel, pkgconfig
-BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: zlib-devel
-# On RHEL (up to 5 included), the devel part was still in tcp_wrappers but in
-# all recent Fedoras it's in tcp_wrappers-devel
-BuildRequires: /usr/include/tcpd.h
-BuildRequires: openldap-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-Provides: ftpserver
+# Use certs in %{_sysconfdir}/pki/tls/certs if available (FC4, RHEL5 onwards)
+%global use_pki %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo 1; else echo 0; fi)
+%if %{use_pki}
+%global pkidir %{_sysconfdir}/pki/tls
+%else
+%global pkidir %{_datadir}/ssl
+%endif
+
+#global prever rc3
+%global rpmrel 2
+
+Summary:		Flexible, stable and highly-configurable FTP server
+Name:			proftpd
+Version:		1.3.2a
+Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
+License:		GPLv2+
+Group:			System Environment/Daemons
+URL:			http://www.proftpd.org/
+Source0:		ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
+Source1:		proftpd.conf
+Source2:		proftpd.init
+Source3:		proftpd-xinetd
+Source4:		proftpd.logrotate
+Source5:		proftpd-welcome.msg
+Source6:		proftpd.pam
+Source7:		proftpd-mod_quotatab_ldap.ldif
+Source8:		proftpd-mod_quotatab_ldap.schema
+Source9:		proftpd.sysconfig
+Patch0:			proftpd-1.3.2rc3-nostrip.patch
+Patch1:			proftpd-1.3.2a-defines.patch
+Patch2:			proftpd-1.3.2-parallel-build.patch
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
+Requires(postun):	/sbin/service
+BuildRequires:		pam-devel, ncurses-devel, pkgconfig, gettext, zlib-devel
+BuildRequires:		openssl-devel, libacl-devel, libcap-devel, /usr/include/tcpd.h
+BuildRequires:		openldap-devel, mysql-devel, postgresql-devel
+Provides:		ftpserver
 
 %description
 ProFTPD is an enhanced FTP server with a focus toward simplicity, security,
@@ -44,27 +50,27 @@ needed scripts to have it run by xinetd 
 
 
 %package ldap
-Summary: Module to add LDAP support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add LDAP support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description ldap
 Module to add LDAP support to the ProFTPD FTP server.
 
 
 %package mysql
-Summary: Module to add MySQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add MySQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description mysql
 Module to add MySQL support to the ProFTPD FTP server.
 
 
 %package postgresql
-Summary: Module to add PostgreSQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add PostgreSQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description postgresql
 Module to add PostgreSQL support to the ProFTPD FTP server.
@@ -73,52 +79,94 @@ Module to add PostgreSQL support to the 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
+# 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
+
+# Avoid documentation name conflicts
+%{__mv} contrib/README contrib/README.contrib
+
+# Set up directory names in config file
+%{__sed} -e 's#@PKIDIR@#%{pkidir}#g' \
+	%{SOURCE1} > proftpd.conf
+
+# Avoid docfile dependencies
+%{__chmod} -x contrib/xferstats.holger-preiss
+
+# Copy in LDAP schema/LDIF
+%{__cp} -p %{SOURCE7} 70proftpd-quota.ldif
+%{__cp} -p %{SOURCE8} proftpd-quota.schema
+
+# PAM Configuration:
+# The "include" syntax used in our PAM configuration file was introduced in
+# PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older
+# distributions such as EL-4 (PAM 0.77) need to fall back to using the
+# now-deprecated pam_stack module. Since the pam-devel package doesn't
+# include a pkgconfig file from whice we could check the version number, we
+# instead check for the absence of the file /etc/pam.d/config-util, which is
+# present in all PAM packages from 0.80 onwards and acts as a useful
+# indicator of the need to fall back to pam_stack.
+%{__cp} -p %{SOURCE6} .
+[ ! -f /etc/pam.d/config-util ] && %{__sed} -i -e \
+	's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \
+	proftpd.pam
+
+# Fix character encoding in docs
+for f in ChangeLog; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf-8
+	%{__mv} -f ${f}.utf-8 ${f}
+done
 
 %build
-# Disable stripping in order to get useful debuginfo packages
-%{__perl} -pi -e 's|"-s"|""|g' configure
+
+# Modules to be built as DSO's (excluding mod_ifsession, always specified last)
+SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
+SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
+SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
-    --libexecdir="%{_libexecdir}/proftpd" \
-    --localstatedir="%{_var}/run" \
-    --enable-ctrls \
-    --enable-facl \
-    --enable-dso \
-    --enable-ipv6 \
-    --enable-shadow \
-    --enable-openssl \
-    --with-libraries="%{_libdir}/mysql" \
-    --with-includes="%{_includedir}/mysql" \
-    --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
-
-# It seems that with _smp_mflags -lsupp tries to get linked before being built
-# (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
-%{__make}
+	--libexecdir="%{_libexecdir}/proftpd" \
+	--localstatedir="%{_localstatedir}/run" \
+	--enable-ctrls \
+	--enable-dso \
+	--enable-facl \
+	--enable-ipv6 \
+	--enable-nls \
+	--enable-openssl \
+	--enable-shadow \
+	--with-libraries="%{_libdir}/mysql" \
+	--with-includes="%{_includedir}/mysql" \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
+
+%{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} \
-    rundir="%{_var}/run/proftpd" \
-    INSTALL_USER=`id -un` \
-    INSTALL_GROUP=`id -gn`
-%{__install} -D -p -m 0640 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -p -m 0755 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -p -m 0640 %{SOURCE3} \
-    %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -p -m 0644 %{SOURCE4} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE7} 70proftpd-quota.ldif
-%{__install} -D -p -m 0644 %{SOURCE8} proftpd-quota.schema
-%{__mkdir_p} %{buildroot}/var/ftp/uploads
-%{__mkdir_p} %{buildroot}/var/ftp/pub
-%{__mkdir_p} %{buildroot}/var/log/proftpd
-touch %{buildroot}%{_sysconfdir}/ftpusers
+	rundir="%{_localstatedir}/run/proftpd" \
+	INSTALL_USER=`%{__id} -un` \
+	INSTALL_GROUP=`%{__id} -gn`
+%{__install} -D -p -m 640 proftpd.conf	%{buildroot}%{_sysconfdir}/proftpd.conf
+%{__install} -D -p -m 644 proftpd.pam	%{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 755 %{SOURCE2}	%{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE3}	%{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
+%{__install} -D -p -m 644 %{SOURCE4}	%{buildroot}%{_sysconfdir}/logrotate.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE5}	%{buildroot}%{_localstatedir}/ftp/welcome.msg
+%{__install} -D -p -m 644 %{SOURCE9}	%{buildroot}%{_sysconfdir}/sysconfig/proftpd
+%{__mkdir_p} %{buildroot}%{_localstatedir}/{ftp/{pub,uploads},log/proftpd}
+/bin/touch %{buildroot}%{_sysconfdir}/ftpusers
+
+# Find translations
+%find_lang proftpd
 
 
 %clean
@@ -127,83 +175,157 @@ touch %{buildroot}%{_sysconfdir}/ftpuser
 
 %post
 if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add proftpd
-    IFS=":"; cat /etc/passwd | \
-    while { read username nu nu gid nu nu nu nu; }; do \
-        if [ $gid -lt 100 -a "$username" != "ftp" ]; then
-            echo $username >> %{_sysconfdir}/ftpusers
-        fi
-    done
+	/sbin/chkconfig --add proftpd
+	IFS=":"; %{__cat} /etc/passwd | \
+	while { read username nu nu gid nu nu nu nu; }; do \
+		if [ $gid -lt 100 -a "$username" != "ftp" ]; then
+			echo $username >> %{_sysconfdir}/ftpusers
+		fi
+	done
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service proftpd stop &>/dev/null || :
-    /sbin/chkconfig --del proftpd
-    /sbin/service xinetd reload &>/dev/null || :
-    if [ -d %{_var}/run/proftpd ]; then
-        rm -rf %{_var}/run/proftpd/*
-    fi
+	/sbin/service proftpd stop &>/dev/null || :
+	/sbin/chkconfig --del proftpd || :
+	/sbin/service xinetd reload &>/dev/null || :
+	/usr/bin/find %{_localstatedir}/run/proftpd -depth -mindepth 1 |
+		/usr/bin/xargs %{__rm} -rf &>/dev/null || :
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service proftpd condrestart &>/dev/null || :
+	/sbin/service proftpd condrestart &>/dev/null || :
 fi
 
 
-%files
+%files -f proftpd.lang
 %defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog NEWS README*
-%doc doc/* sample-configurations/
+%doc COPYING CREDITS ChangeLog NEWS README
+%doc README.DSO README.modules README.IPv6 README.PAM
+%doc README.capabilities README.classes README.controls README.facl
+%doc contrib/README.contrib contrib/README.ratio
+%doc doc/* sample-configurations/ contrib/xferstats.holger-preiss
+%dir %{_localstatedir}/ftp/
+%dir %{_localstatedir}/ftp/pub/
 %dir %{_localstatedir}/run/proftpd/
+%config(noreplace) %{_localstatedir}/ftp/welcome.msg
+%config(noreplace) %{_sysconfdir}/ftpusers
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
 %config(noreplace) %{_sysconfdir}/proftpd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/proftpd
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
-%config %{_sysconfdir}/ftpusers
-%config(noreplace) %{_sysconfdir}/pam.d/proftpd
-%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
-%{_mandir}/man?/*
-%{_bindir}/*
+%{_bindir}/ftpcount
+%{_bindir}/ftpdctl
+%{_bindir}/ftptop
+%{_bindir}/ftpwho
+%exclude %{_bindir}/prxs
+%{_sbindir}/ftpshut
+%{_sbindir}/in.proftpd
+%{_sbindir}/proftpd
+%{_mandir}/man1/ftpcount.1*
+%{_mandir}/man1/ftptop.1*
+%{_mandir}/man1/ftpwho.1*
+%{_mandir}/man5/xferlog.5*
+%{_mandir}/man8/ftpdctl.8*
+%{_mandir}/man8/ftpshut.8*
+%{_mandir}/man8/proftpd.8*
 %exclude %{_includedir}/proftpd/
 %exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
+%{_libexecdir}/proftpd/mod_load.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
+%{_libexecdir}/proftpd/mod_quotatab_radius.so
+%{_libexecdir}/proftpd/mod_quotatab_sql.so
+%{_libexecdir}/proftpd/mod_radius.so
+%{_libexecdir}/proftpd/mod_ratio.so
+%{_libexecdir}/proftpd/mod_rewrite.so
+%{_libexecdir}/proftpd/mod_site_misc.so
 %{_libexecdir}/proftpd/mod_sql.so
 %{_libexecdir}/proftpd/mod_wrap.so
+%{_libexecdir}/proftpd/mod_wrap2.so
+%{_libexecdir}/proftpd/mod_wrap2_file.so
+%{_libexecdir}/proftpd/mod_wrap2_sql.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
-%{_sbindir}/*
-%dir /var/ftp/
-%attr(331, ftp, ftp) %dir /var/ftp/uploads/
-%dir /var/ftp/pub/
-%config(noreplace) /var/ftp/welcome.msg
-%attr(750, root, root) %dir /var/log/proftpd/
+%attr(331, ftp, ftp) %dir %{_localstatedir}/ftp/uploads/
+%attr(750, root, root) %dir %{_localstatedir}/log/proftpd/
 
 %files ldap
 %defattr(-,root,root,-)
-%doc 70proftpd-quota.ldif proftpd-quota.schema
-%dir %{_libexecdir}/proftpd/
+%doc README.LDAP 70proftpd-quota.ldif proftpd-quota.schema
 %{_libexecdir}/proftpd/mod_ldap.so
 %{_libexecdir}/proftpd/mod_quotatab_ldap.so
 
 %files mysql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_mysql.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_postgres.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 
 %changelog
+* Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
+- Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
+
+* Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-1
+- Update to 1.3.2a
+- Add patch to reinstate support for -DPARAMETER (http://bugs.proftpd.org/3221)
+- Retain CAP_AUDIT_WRITE, needed for pam_loginuid (#506735, fixed upstream)
+- Remove ScoreboardFile directive from configuration file - default value
+  works better with SELinux (#498375)
+- Ship mod_quotatab_sql.so in the main package rather than the SQL backend
+  subpackages
+- New DSO modules:
+  - mod_ctrls_admin
+  - mod_facl
+  - mod_load
+  - mod_quotatab_radius
+  - mod_radius
+  - mod_ratio
+  - mod_rewrite
+  - mod_site_misc
+  - mod_wrap2
+  - mod_wrap2_file
+  - mod_wrap2_sql
+- Enable mod_lang/nls support for RFC 2640 (and buildreq gettext)
+- Add /etc/sysconfig/proftpd to set PROFTPD_OPTIONS and update initscript to
+  use this value so we can use a define to enable (e.g.) anonymous FTP support
+  rather than having a huge commented-out section in the config file
+- Rewrite config file to remove most settings that don't change upstream
+  defaults, and add brief descriptions for all available loadable modules
+- Move Umask and IdentLookups settings from server config to <Global> context
+  so that they apply to all servers, including virtual hosts (#509251)
+- Ensure mod_ifsession is always the last one specified, which makes sure that
+  mod_ifsession's changes are seen properly by other modules
+- Drop pam version requirement - all targets have sufficiently recent version
+- Drop redundant explicit dependency on pam
+- Subpackages don't need to own %%{_libexecdir}/proftpd directory
+- Drop redundant krb5-devel buildreq
+- Make SRPM back-compatible with EPEL-4 (TLS cert dirs, PAM config)
+- Don't include README files for non-Linux platforms
+- Recode ChangeLog as UTF-8
+- Don't ship the prxs tool for building custom DSO's since we don't ship the
+  headers either
+- Prevent stripping of binaries in a slightly more robust way
+- Fix release tag to be ready for future beta/rc versions
+- Define RPM macros in global scope
+- BuildRequire libcap-devel so that we use the system library rather than the
+  bundled one, and eliminate log messages like:
+  kernel: warning: `proftpd' uses 32-bit capabilities (legacy support in use)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2.1
 - Update the tcp_wrappers BR to be just /usr/include/tcpd.h instead.
 
@@ -219,7 +341,7 @@ fi
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Caol?n McNamara 1.3.2-0.3.rc3
-- rebuild for dependencies
+- Rebuild for dependencies
 
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Apr 2009 21:47:16 -0000	1.13
+++ sources	3 Aug 2009 12:46:16 -0000	1.14
@@ -1 +1 @@
-89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2
+ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2


--- proftpd-1.3.1-find-umode_t.patch DELETED ---



From pghmcfc at fedoraproject.org  Mon Aug  3 12:46:16 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  3 Aug 2009 12:46:16 +0000 (UTC)
Subject: rpms/proftpd/EL-5 proftpd-1.3.2-parallel-build.patch, NONE,
	1.1 proftpd-1.3.2a-defines.patch, NONE,
	1.1 proftpd-1.3.2rc3-nostrip.patch, NONE, 1.1 proftpd.sysconfig,
	NONE, 1.1 .cvsignore, 1.11, 1.12 proftpd.conf, 1.9,
	1.10 proftpd.init, 1.6, 1.7 proftpd.pam, 1.1, 1.2 proftpd.spec,
	1.32, 1.33 sources, 1.11, 1.12 proftpd-1.3.1-find-umode_t.patch,
	1.1, NONE
Message-ID: <20090803124616.6D0F711C02C6@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

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

Modified Files:
	.cvsignore proftpd.conf proftpd.init proftpd.pam proftpd.spec 
	sources 
Added Files:
	proftpd-1.3.2-parallel-build.patch 
	proftpd-1.3.2a-defines.patch proftpd-1.3.2rc3-nostrip.patch 
	proftpd.sysconfig 
Removed Files:
	proftpd-1.3.1-find-umode_t.patch 
Log Message:
Sync with devel

proftpd-1.3.2-parallel-build.patch:
 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE proftpd-1.3.2-parallel-build.patch ---
diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
--- proftpd-1.3.2-orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2/Makefile.in	2009-02-16 14:28:43.000000000 +0100
@@ -54,13 +54,13 @@
 proftpd$(EXEEXT): lib src modules dirs locale
 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
 
-ftpcount$(EXEEXT): utils
+ftpcount$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
 
-ftpdctl$(EXEEXT): src
+ftpdctl$(EXEEXT): lib src
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
 
-ftpshut$(EXEEXT): utils
+ftpshut$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
 
 ftptop$(EXEEXT): lib utils

proftpd-1.3.2a-defines.patch:
 dirtree.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE proftpd-1.3.2a-defines.patch ---
http://bugs.proftpd.org/show_bug.cgi?id=3221

--- proftpd-1.3.2a/src/dirtree.c	2009-04-28 23:33:57.000000000 +0100
+++ proftpd-1.3.2a/src/dirtree.c	2009-07-06 12:06:51.000000000 +0100
@@ -575,6 +575,17 @@
     }
   }
 
+  if (defines_perm_list) {
+    char **defines = defines_perm_list->elts;
+    register unsigned int i = 0;
+
+    for (i = 0; i < defines_perm_list->nelts; i++) {
+      if (defines[i] &&
+          strcmp(defines[i], definition) == 0)
+        return TRUE;
+    }
+  }
+
   errno = ENOENT;
   return FALSE;
 }

proftpd-1.3.2rc3-nostrip.patch:
 Make.rules.in                 |    4 ++--
 contrib/mod_load/Makefile.in  |    2 +-
 contrib/mod_wrap2/Makefile.in |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE proftpd-1.3.2rc3-nostrip.patch ---
Removing @INSTALL_STRIP@ prevents stripping of debuginfo at %install time

Cleaning up top_srcdir prevents debuginfo package creation fails like this:
/usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character

--- proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:26.000000000 +0000
+++ proftpd-1.3.2rc3/Make.rules.in	2009-01-08 16:54:48.000000000 +0000
@@ -29,8 +29,8 @@
 INSTALL=@INSTALL@
 INSTALL_USER=@install_user@
 INSTALL_GROUP=@install_group@
-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_BIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_SBIN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
 
 RM=rm -f
--- proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_load/Makefile.in	2009-01-08 20:37:26.000000000 +0000
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules
--- proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2008-09-08 21:56:02.000000000 +0100
+++ proftpd-1.3.2rc3/contrib/mod_wrap2/Makefile.in	2009-07-03 17:00:41.000000000 +0100
@@ -1,5 +1,5 @@
 top_builddir=../..
-top_srcdir=../../
+top_srcdir=../..
 srcdir=@srcdir@
 
 include $(top_srcdir)/Make.rules


--- NEW FILE proftpd.sysconfig ---
# Set PROFTPD_OPTIONS to add command-line options for proftpd.
# See proftpd(8) for a comprehensive list of what can be used.
#
# The following "Defines" can be used with the default configuration file:
# -DANONYMOUS_FTP	: Enable anonymous FTP
# -DDYNAMIC_BAN_LISTS	: Enable dynamic ban lists (mod_ban)
# -DTLS			: Enable TLS (mod_tls)
#
# For example, for anonymous FTP and dynamic ban list support:
# PROFTPD_OPTIONS="-DANONYMOUS_FTP -DDYNAMIC_BAN_LISTS"
PROFTPD_OPTIONS=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Apr 2009 22:06:20 -0000	1.11
+++ .cvsignore	3 Aug 2009 12:46:15 -0000	1.12
@@ -1 +1 @@
-proftpd-1.3.2.tar.bz2
+proftpd-1.3.2a.tar.bz2


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- proftpd.conf	2 Jan 2009 13:45:48 -0000	1.9
+++ proftpd.conf	3 Aug 2009 12:46:16 -0000	1.10
@@ -1,169 +1,239 @@
 # This is the ProFTPD configuration file
+#
+# See: http://www.proftpd.org/docs/directives/linked/by-name.html
+
+# Server Config - config used for anything outside a <VirtualHost> or <Global> context
+# See: http://www.proftpd.org/docs/howto/Vhost.html
 
 ServerName			"ProFTPD server"
 ServerIdent			on "FTP Server ready."
 ServerAdmin			root at localhost
-ServerType			standalone
-#ServerType			inetd
 DefaultServer			on
-AccessGrantMsg			"User %u logged in."
-#DisplayConnect			/etc/ftpissue
-#DisplayLogin			/etc/ftpmotd
-#DisplayGoAway			/etc/ftpgoaway
-DeferWelcome			off
 
-# Use this to excude users from the chroot
+# Cause every FTP user except adm to be chrooted into their home directory
 DefaultRoot			~ !adm
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd
 AuthOrder			mod_auth_pam.c* mod_auth_unix.c
+# If you use NIS/YP/LDAP you may need to disable PersistentPasswd
+#PersistentPasswd		off
 
-# Do not perform ident nor DNS lookups (hangs when the port is filtered)
-IdentLookups			off
+# Don't do reverse DNS lookups (hangs on DNS problems)
 UseReverseDNS			off
 
-# Port 21 is the standard FTP port.
-Port				21
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# Default to show dot files in directory listings
-ListOptions			"-a"
-
-# See Configuration.html for these (here are the default values)
-#MultilineRFC2228		off
-#RootLogin			off
-#LoginPasswordPrompt		on
-#MaxLoginAttempts		3
-#MaxClientsPerHost		none
-#AllowForeignAddress		off	# For FXP
-
-# Allow to resume not only the downloads but the uploads too
-AllowRetrieveRestart		on
-AllowStoreRestart		on
+# Set the user and group that the server runs as
+User				nobody
+Group				nobody
 
 # To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
+# to 20.  If you need to allow more than 20 concurrent connections
 # at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
+# in standalone mode; in inetd mode you should use an inetd server
 # that allows you to limit maximum number of processes per service
 # (such as xinetd)
 MaxInstances			20
 
-# Set the user and group that the server normally runs at.
-User				nobody
-Group				nobody
-
 # Disable sendfile by default since it breaks displaying the download speeds in
 # ftptop and ftpwho
-UseSendfile			no
-
-# This is where we want to put the pid file
-ScoreboardFile			/var/run/proftpd.score
-
-# Normally, we want users to do a few things.
-<Global>
-  AllowOverwrite		yes
-  <Limit ALL SITE_CHMOD>
-    AllowAll
-  </Limit>
-</Global>
+UseSendfile			off
 
 # Define the log formats
 LogFormat			default	"%h %l %u %t \"%r\" %s %b"
 LogFormat			auth	"%v [%P] %h %t \"%r\" %s"
 
-# TLS
-# Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html
-#TLSEngine			on
-#TLSRequired			on
-#TLSRSACertificateFile		/etc/pki/tls/certs/proftpd.pem
-#TLSRSACertificateKeyFile	/etc/pki/tls/certs/proftpd.pem
-#TLSCipherSuite			ALL:!ADH:!DES
-#TLSOptions			NoCertRequest
-#TLSVerifyClient		off
-##TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
-#TLSLog				/var/log/proftpd/tls.log
-
-# SQL authentication Dynamic Shared Object (DSO) loading
-# See README.DSO and howto/DSO.html for more details.
-#<IfModule mod_dso.c>
-#  LoadModule mod_ban.c
-#  LoadModule mod_ifsession.c
-#  LoadModule mod_quotatab.c
-#  LoadModule mod_quotatab_file.c
-#  LoadModule mod_sql.c
-#  LoadModule mod_sql_mysql.c
-#  LoadModule mod_sql_postgres.c
-#</IfModule>
-
-# A basic anonymous configuration, with an upload directory.
-#<Anonymous ~ftp>
-#  User				ftp
-#  Group				ftp
-#  AccessGrantMsg		"Anonymous login ok, restrictions apply."
-#
-#  # We want clients to be able to login with "anonymous" as well as "ftp"
-#  UserAlias			anonymous ftp
-#
-#  # Limit the maximum number of anonymous logins
-#  MaxClients			10 "Sorry, max %m users -- try again later"
-#
-#  # Put the user into /pub right after login
-#  #DefaultChdir			/pub
-#
-#  # We want 'welcome.msg' displayed at login, '.message' displayed in
-#  # each newly chdired directory and tell users to read README* files. 
-#  DisplayLogin			/welcome.msg
-#  DisplayFirstChdir		.message
-#  DisplayReadme			README*
-#
-#  # Some more cosmetic and not vital stuff
-#  DirFakeUser			on ftp
-#  DirFakeGroup			on ftp
-#
-#  # Limit WRITE everywhere in the anonymous chroot
-#  <Limit WRITE SITE_CHMOD>
-#    DenyAll
-#  </Limit>
-#
-#  # An upload directory that allows storing files but not retrieving
-#  # or creating directories.
-#  <Directory uploads/*>
-#    AllowOverwrite		no
-#    <Limit READ>
-#      DenyAll
-#    </Limit>
-#
-#    <Limit STOR>
-#      AllowAll
-#    </Limit>
-#  </Directory>
-#
-#  # Don't write anonymous accesses to the system wtmp file (good idea!)
-#  WtmpLog			off
-#
-#  # Logging for the anonymous transfers
-#  ExtendedLog		/var/log/proftpd/access.log WRITE,READ default
-#  ExtendedLog		/var/log/proftpd/auth.log AUTH auth
-#
-#</Anonymous>
-
-# Configuration for mod_ban
-<IfModule mod_ban.c>
-  BanEngine on
-  BanLog /var/log/proftpd/ban.log
-  BanTable /var/run/proftpd/ban.tab
+# Dynamic Shared Object (DSO) loading
+# See README.DSO and howto/DSO.html for more details
+#
+# General database support (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql.c
+#
+# Mysql support (requires proftpd-mysql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_mysql.c
+#
+# Postgresql support (requires proftpd-postgresql package)
+# (http://www.proftpd.org/docs/contrib/mod_sql.html)
+#   LoadModule mod_sql_postgres.c
+#
+# Quota support (http://www.proftpd.org/docs/contrib/mod_quotatab.html)
+#   LoadModule mod_quotatab.c
+#
+# File-specific "driver" for storing quota table information in files
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_file.html)
+#   LoadModule mod_quotatab_file.c
+#
+# SQL database "driver" for storing quota table information in SQL tables
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_sql.html)
+#   LoadModule mod_quotatab_sql.c
+#
+# LDAP support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/directives/linked/config_ref_mod_ldap.html)
+#   LoadModule mod_ldap.c
+#
+# LDAP quota support (requires proftpd-ldap package)
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_ldap.html)
+#   LoadModule mod_quotatab_ldap.c
+#
+# Support for authenticating users using the RADIUS protocol
+# (http://www.proftpd.org/docs/contrib/mod_radius.html)
+#   LoadModule mod_radius.c
+#
+# Retrieve quota limit table information from a RADIUS server
+# (http://www.proftpd.org/docs/contrib/mod_quotatab_radius.html)
+#   LoadModule mod_quotatab_radius.c
+#
+# Administrative control actions for the ftpdctl program
+# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
+#   LoadModule mod_ctrls_admin.c
+#
+# Support for POSIX ACLs
+# (http://www.proftpd.org/docs/modules/mod_facl.html)
+#   LoadModule mod_facl.c
+#
+# Configure server availability based on system load
+# (http://www.proftpd.org/docs/contrib/mod_load.html)
+#   LoadModule mod_load.c
+#
+# Limit downloads to a multiple of upload volume (see README.ratio)
+#   LoadModule mod_ratio.c
+#
+# Rewrite FTP commands sent by clients on-the-fly,
+# using regular expression matching and substitution 
+# (http://www.proftpd.org/docs/contrib/mod_rewrite.html)
+#   LoadModule mod_rewrite.c
+#
+# Support for miscellaneous SITE commands such as SITE MKDIR, SITE SYMLINK,
+# and SITE UTIME (http://www.proftpd.org/docs/contrib/mod_site_misc.html)
+#   LoadModule mod_site_misc.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap.html)
+#   LoadModule mod_wrap.c
+#
+# Use the /etc/hosts.allow and /etc/hosts.deny files, or other allow/deny
+# files, as well as SQL-based access rules, for IP-based access control
+# (http://www.proftpd.org/docs/contrib/mod_wrap2.html)
+#   LoadModule mod_wrap2.c
+#
+# Support module for mod_wrap2 that handles access rules stored in specially
+# formatted files on disk
+# (http://www.proftpd.org/docs/contrib/mod_wrap2_file.html)
+#   LoadModule mod_wrap2_file.c
+#
+# Support module for mod_wrap2 that handles access rules stored in SQL
+# database tables (http://www.proftpd.org/docs/contrib/mod_wrap2_sql.html)
+#   LoadModule mod_wrap2_sql.c
+#
+# Provide a flexible way of specifying that certain configuration directives
+# only apply to certain sessions, based on credentials such as connection
+# class, user, or group membership
+# (http://www.proftpd.org/docs/contrib/mod_ifsession.html)
+#   LoadModule mod_ifsession.c
+
+# TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+<IfDefine TLS>
+  LoadModule			mod_tls.c
+  TLSEngine			on
+  TLSRequired			on
+  TLSRSACertificateFile		@PKIDIR@/certs/proftpd.pem
+  TLSRSACertificateKeyFile	@PKIDIR@/certs/proftpd.pem
+  TLSCipherSuite		ALL:!ADH:!DES
+  TLSOptions			NoCertRequest
+  TLSVerifyClient		off
+  #TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
+  TLSLog			/var/log/proftpd/tls.log
+</IfDefine>
+
+# Dynamic ban lists (http://www.proftpd.org/docs/contrib/mod_ban.html)
+# Enable this with PROFTPD_OPTIONS=-DDYNAMIC_BAN_LISTS in /etc/sysconfig/proftpd
+<IfDefine DYNAMIC_BAN_LISTS>
+  LoadModule			mod_ban.c
+  BanEngine			on
+  BanLog			/var/log/proftpd/ban.log
+  BanTable			/var/run/proftpd/ban.tab
 
   # If the same client reaches the MaxLoginAttempts limit 2 times
   # within 10 minutes, automatically add a ban for that client that
   # will expire after one hour.
-  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+  BanOnEvent			MaxLoginAttempts 2/00:10:00 01:00:00
 
   # Allow the FTP admin to manually add/remove bans
-  BanControlsACLs all allow user ftpadm
-</IfModule>
+  BanControlsACLs		all allow user ftpadm
+</IfDefine>
+
+# Global Config - config common to Server Config and all virtual hosts
+# See: http://www.proftpd.org/docs/howto/Vhost.html
+<Global>
+
+  # Umask 022 is a good standard umask to prevent new dirs and files
+  # from being group and world writable
+  Umask				022
+
+  # Don't do ident queries (hangs when the port is filtered)
+  IdentLookups			off
+
+  # Allow users to overwrite files and change permissions
+  AllowOverwrite		yes
+  <Limit ALL SITE_CHMOD>
+    AllowAll
+  </Limit>
+
+</Global>
+
+# A basic anonymous configuration, with an upload directory
+# Enable this with PROFTPD_OPTIONS=-DANONYMOUS_FTP in /etc/sysconfig/proftpd
+<IfDefine ANONYMOUS_FTP>
+  <Anonymous ~ftp>
+    User			ftp
+    Group			ftp
+    AccessGrantMsg		"Anonymous login ok, restrictions apply."
+
+    # We want clients to be able to login with "anonymous" as well as "ftp"
+    UserAlias			anonymous ftp
+
+    # Limit the maximum number of anonymous logins
+    MaxClients			10 "Sorry, max %m users -- try again later"
+
+    # Put the user into /pub right after login
+    #DefaultChdir		/pub
+
+    # We want 'welcome.msg' displayed at login, '.message' displayed in
+    # each newly chdired directory and tell users to read README* files. 
+    DisplayLogin		/welcome.msg
+    DisplayChdir		.message
+    DisplayReadme		README*
+
+    # Cosmetic option to make all files appear to be owned by user "ftp"
+    DirFakeUser			on ftp
+    DirFakeGroup		on ftp
+
+    # Limit WRITE everywhere in the anonymous chroot
+    <Limit WRITE SITE_CHMOD>
+      DenyAll
+    </Limit>
+
+    # An upload directory that allows storing files but not retrieving
+    # or creating directories.
+    <Directory uploads/*>
+      AllowOverwrite		no
+      <Limit READ>
+        DenyAll
+      </Limit>
+
+      <Limit STOR>
+        AllowAll
+      </Limit>
+    </Directory>
+
+    # Don't write anonymous accesses to the system wtmp file (good idea!)
+    WtmpLog			off
+
+    # Logging for the anonymous transfers
+    ExtendedLog			/var/log/proftpd/access.log WRITE,READ default
+    ExtendedLog			/var/log/proftpd/auth.log AUTH auth
+
+  </Anonymous>
+</IfDefine>
 


Index: proftpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- proftpd.init	3 Feb 2008 17:54:06 -0000	1.6
+++ proftpd.init	3 Aug 2009 12:46:16 -0000	1.7
@@ -33,10 +33,16 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+# Source ProFTPD configuration.
+PROFTPD_OPTIONS=""
+if [ -f /etc/sysconfig/proftpd ]; then
+	. /etc/sysconfig/proftpd
+fi
+
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
-[ -x /usr/sbin/proftpd ] || exit 0
+[ -x /usr/sbin/proftpd ] || exit 5
 
 RETVAL=0
 
@@ -44,7 +50,7 @@ prog="proftpd"
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon proftpd 2>/dev/null
+	daemon proftpd $PROFTPD_OPTIONS 2>/dev/null
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- proftpd.pam	1 Aug 2005 18:29:34 -0000	1.1
+++ proftpd.pam	3 Aug 2009 12:46:16 -0000	1.2
@@ -1,6 +1,9 @@
 #%PAM-1.0
+session    optional     pam_keyinit.so    force revoke
 auth       required	pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth       required	pam_stack.so service=system-auth
 auth       required	pam_shells.so
-account    required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
+auth       include      system-auth
+account    include      system-auth
+# Comment the following line if you are having PAM issues with chrooted users
+session    include      system-auth
+session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- proftpd.spec	6 Apr 2009 22:06:20 -0000	1.32
+++ proftpd.spec	3 Aug 2009 12:46:16 -0000	1.33
@@ -1,39 +1,42 @@
-#define prever rc3
-
-Summary: Flexible, stable and highly-configurable FTP server
-Name: proftpd
-Version: 1.3.2
-Release: 1%{?prever:.%{prever}}%{?dist}
-License: GPLv2+
-Group: System Environment/Daemons
-URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
-Source1: proftpd.conf
-Source2: proftpd.init
-Source3: proftpd-xinetd
-Source4: proftpd.logrotate
-Source5: proftpd-welcome.msg
-Source6: proftpd.pam
-Source7: proftpd-mod_quotatab_ldap.ldif
-Source8: proftpd-mod_quotatab_ldap.schema
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pam >= 0.59
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-BuildRequires: pam-devel, ncurses-devel, pkgconfig
-BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: zlib-devel
-# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
-%if 0%{?rhel} <= 5
-BuildRequires: tcp_wrappers
+# Use certs in %{_sysconfdir}/pki/tls/certs if available (FC4, RHEL5 onwards)
+%global use_pki %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo 1; else echo 0; fi)
+%if %{use_pki}
+%global pkidir %{_sysconfdir}/pki/tls
 %else
-BuildRequires: tcp_wrappers-devel
+%global pkidir %{_datadir}/ssl
 %endif
-BuildRequires: openldap-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-Provides: ftpserver
+
+#global prever rc3
+%global rpmrel 2
+
+Summary:		Flexible, stable and highly-configurable FTP server
+Name:			proftpd
+Version:		1.3.2a
+Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
+License:		GPLv2+
+Group:			System Environment/Daemons
+URL:			http://www.proftpd.org/
+Source0:		ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
+Source1:		proftpd.conf
+Source2:		proftpd.init
+Source3:		proftpd-xinetd
+Source4:		proftpd.logrotate
+Source5:		proftpd-welcome.msg
+Source6:		proftpd.pam
+Source7:		proftpd-mod_quotatab_ldap.ldif
+Source8:		proftpd-mod_quotatab_ldap.schema
+Source9:		proftpd.sysconfig
+Patch0:			proftpd-1.3.2rc3-nostrip.patch
+Patch1:			proftpd-1.3.2a-defines.patch
+Patch2:			proftpd-1.3.2-parallel-build.patch
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
+Requires(postun):	/sbin/service
+BuildRequires:		pam-devel, ncurses-devel, pkgconfig, gettext, zlib-devel
+BuildRequires:		openssl-devel, libacl-devel, libcap-devel, /usr/include/tcpd.h
+BuildRequires:		openldap-devel, mysql-devel, postgresql-devel
+Provides:		ftpserver
 
 %description
 ProFTPD is an enhanced FTP server with a focus toward simplicity, security,
@@ -47,27 +50,27 @@ needed scripts to have it run by xinetd 
 
 
 %package ldap
-Summary: Module to add LDAP support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add LDAP support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description ldap
 Module to add LDAP support to the ProFTPD FTP server.
 
 
 %package mysql
-Summary: Module to add MySQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add MySQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description mysql
 Module to add MySQL support to the ProFTPD FTP server.
 
 
 %package postgresql
-Summary: Module to add PostgreSQL support to the ProFTPD FTP server
-Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Summary:	Module to add PostgreSQL support to the ProFTPD FTP server
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description postgresql
 Module to add PostgreSQL support to the ProFTPD FTP server.
@@ -76,52 +79,94 @@ Module to add PostgreSQL support to the 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
+# 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
+
+# Avoid documentation name conflicts
+%{__mv} contrib/README contrib/README.contrib
+
+# Set up directory names in config file
+%{__sed} -e 's#@PKIDIR@#%{pkidir}#g' \
+	%{SOURCE1} > proftpd.conf
+
+# Avoid docfile dependencies
+%{__chmod} -x contrib/xferstats.holger-preiss
+
+# Copy in LDAP schema/LDIF
+%{__cp} -p %{SOURCE7} 70proftpd-quota.ldif
+%{__cp} -p %{SOURCE8} proftpd-quota.schema
+
+# PAM Configuration:
+# The "include" syntax used in our PAM configuration file was introduced in
+# PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older
+# distributions such as EL-4 (PAM 0.77) need to fall back to using the
+# now-deprecated pam_stack module. Since the pam-devel package doesn't
+# include a pkgconfig file from whice we could check the version number, we
+# instead check for the absence of the file /etc/pam.d/config-util, which is
+# present in all PAM packages from 0.80 onwards and acts as a useful
+# indicator of the need to fall back to pam_stack.
+%{__cp} -p %{SOURCE6} .
+[ ! -f /etc/pam.d/config-util ] && %{__sed} -i -e \
+	's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \
+	proftpd.pam
+
+# Fix character encoding in docs
+for f in ChangeLog; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf-8
+	%{__mv} -f ${f}.utf-8 ${f}
+done
 
 %build
-# Disable stripping in order to get useful debuginfo packages
-%{__perl} -pi -e 's|"-s"|""|g' configure
+
+# Modules to be built as DSO's (excluding mod_ifsession, always specified last)
+SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
+SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
+SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %configure \
-    --libexecdir="%{_libexecdir}/proftpd" \
-    --localstatedir="%{_var}/run" \
-    --enable-ctrls \
-    --enable-facl \
-    --enable-dso \
-    --enable-ipv6 \
-    --enable-shadow \
-    --enable-openssl \
-    --with-libraries="%{_libdir}/mysql" \
-    --with-includes="%{_includedir}/mysql" \
-    --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
-
-# It seems that with _smp_mflags -lsupp tries to get linked before being built
-# (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
-%{__make}
+	--libexecdir="%{_libexecdir}/proftpd" \
+	--localstatedir="%{_localstatedir}/run" \
+	--enable-ctrls \
+	--enable-dso \
+	--enable-facl \
+	--enable-ipv6 \
+	--enable-nls \
+	--enable-openssl \
+	--enable-shadow \
+	--with-libraries="%{_libdir}/mysql" \
+	--with-includes="%{_includedir}/mysql" \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
+
+%{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} \
-    rundir="%{_var}/run/proftpd" \
-    INSTALL_USER=`id -un` \
-    INSTALL_GROUP=`id -gn`
-%{__install} -D -p -m 0640 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -p -m 0755 %{SOURCE2} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -p -m 0640 %{SOURCE3} \
-    %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -p -m 0644 %{SOURCE4} \
-    %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
-%{__install} -D -p -m 0644 %{SOURCE7} 70proftpd-quota.ldif
-%{__install} -D -p -m 0644 %{SOURCE8} proftpd-quota.schema
-%{__mkdir_p} %{buildroot}/var/ftp/uploads
-%{__mkdir_p} %{buildroot}/var/ftp/pub
-%{__mkdir_p} %{buildroot}/var/log/proftpd
-touch %{buildroot}%{_sysconfdir}/ftpusers
+	rundir="%{_localstatedir}/run/proftpd" \
+	INSTALL_USER=`%{__id} -un` \
+	INSTALL_GROUP=`%{__id} -gn`
+%{__install} -D -p -m 640 proftpd.conf	%{buildroot}%{_sysconfdir}/proftpd.conf
+%{__install} -D -p -m 644 proftpd.pam	%{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 755 %{SOURCE2}	%{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE3}	%{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
+%{__install} -D -p -m 644 %{SOURCE4}	%{buildroot}%{_sysconfdir}/logrotate.d/proftpd
+%{__install} -D -p -m 644 %{SOURCE5}	%{buildroot}%{_localstatedir}/ftp/welcome.msg
+%{__install} -D -p -m 644 %{SOURCE9}	%{buildroot}%{_sysconfdir}/sysconfig/proftpd
+%{__mkdir_p} %{buildroot}%{_localstatedir}/{ftp/{pub,uploads},log/proftpd}
+/bin/touch %{buildroot}%{_sysconfdir}/ftpusers
+
+# Find translations
+%find_lang proftpd
 
 
 %clean
@@ -130,83 +175,163 @@ touch %{buildroot}%{_sysconfdir}/ftpuser
 
 %post
 if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add proftpd
-    IFS=":"; cat /etc/passwd | \
-    while { read username nu nu gid nu nu nu nu; }; do \
-        if [ $gid -lt 100 -a "$username" != "ftp" ]; then
-            echo $username >> %{_sysconfdir}/ftpusers
-        fi
-    done
+	/sbin/chkconfig --add proftpd
+	IFS=":"; %{__cat} /etc/passwd | \
+	while { read username nu nu gid nu nu nu nu; }; do \
+		if [ $gid -lt 100 -a "$username" != "ftp" ]; then
+			echo $username >> %{_sysconfdir}/ftpusers
+		fi
+	done
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service proftpd stop &>/dev/null || :
-    /sbin/chkconfig --del proftpd
-    /sbin/service xinetd reload &>/dev/null || :
-    if [ -d %{_var}/run/proftpd ]; then
-        rm -rf %{_var}/run/proftpd/*
-    fi
+	/sbin/service proftpd stop &>/dev/null || :
+	/sbin/chkconfig --del proftpd || :
+	/sbin/service xinetd reload &>/dev/null || :
+	/usr/bin/find %{_localstatedir}/run/proftpd -depth -mindepth 1 |
+		/usr/bin/xargs %{__rm} -rf &>/dev/null || :
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service proftpd condrestart &>/dev/null || :
+	/sbin/service proftpd condrestart &>/dev/null || :
 fi
 
 
-%files
+%files -f proftpd.lang
 %defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog NEWS README*
-%doc doc/* sample-configurations/
+%doc COPYING CREDITS ChangeLog NEWS README
+%doc README.DSO README.modules README.IPv6 README.PAM
+%doc README.capabilities README.classes README.controls README.facl
+%doc contrib/README.contrib contrib/README.ratio
+%doc doc/* sample-configurations/ contrib/xferstats.holger-preiss
+%dir %{_localstatedir}/ftp/
+%dir %{_localstatedir}/ftp/pub/
 %dir %{_localstatedir}/run/proftpd/
+%config(noreplace) %{_localstatedir}/ftp/welcome.msg
+%config(noreplace) %{_sysconfdir}/ftpusers
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
 %config(noreplace) %{_sysconfdir}/proftpd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/proftpd
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
-%config %{_sysconfdir}/ftpusers
-%config(noreplace) %{_sysconfdir}/pam.d/proftpd
-%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
-%{_mandir}/man?/*
-%{_bindir}/*
+%{_bindir}/ftpcount
+%{_bindir}/ftpdctl
+%{_bindir}/ftptop
+%{_bindir}/ftpwho
+%exclude %{_bindir}/prxs
+%{_sbindir}/ftpshut
+%{_sbindir}/in.proftpd
+%{_sbindir}/proftpd
+%{_mandir}/man1/ftpcount.1*
+%{_mandir}/man1/ftptop.1*
+%{_mandir}/man1/ftpwho.1*
+%{_mandir}/man5/xferlog.5*
+%{_mandir}/man8/ftpdctl.8*
+%{_mandir}/man8/ftpshut.8*
+%{_mandir}/man8/proftpd.8*
 %exclude %{_includedir}/proftpd/
 %exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_facl.so
 %{_libexecdir}/proftpd/mod_ifsession.so
+%{_libexecdir}/proftpd/mod_load.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
+%{_libexecdir}/proftpd/mod_quotatab_radius.so
+%{_libexecdir}/proftpd/mod_quotatab_sql.so
+%{_libexecdir}/proftpd/mod_radius.so
+%{_libexecdir}/proftpd/mod_ratio.so
+%{_libexecdir}/proftpd/mod_rewrite.so
+%{_libexecdir}/proftpd/mod_site_misc.so
 %{_libexecdir}/proftpd/mod_sql.so
 %{_libexecdir}/proftpd/mod_wrap.so
+%{_libexecdir}/proftpd/mod_wrap2.so
+%{_libexecdir}/proftpd/mod_wrap2_file.so
+%{_libexecdir}/proftpd/mod_wrap2_sql.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
-%{_sbindir}/*
-%dir /var/ftp/
-%attr(331, ftp, ftp) %dir /var/ftp/uploads/
-%dir /var/ftp/pub/
-%config(noreplace) /var/ftp/welcome.msg
-%attr(750, root, root) %dir /var/log/proftpd/
+%attr(331, ftp, ftp) %dir %{_localstatedir}/ftp/uploads/
+%attr(750, root, root) %dir %{_localstatedir}/log/proftpd/
 
 %files ldap
 %defattr(-,root,root,-)
-%doc 70proftpd-quota.ldif proftpd-quota.schema
-%dir %{_libexecdir}/proftpd/
+%doc README.LDAP 70proftpd-quota.ldif proftpd-quota.schema
 %{_libexecdir}/proftpd/mod_ldap.so
 %{_libexecdir}/proftpd/mod_quotatab_ldap.so
 
 %files mysql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_mysql.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_sql_postgres.so
-%{_libexecdir}/proftpd/mod_quotatab_sql.so
 
 
 %changelog
+* Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
+- Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
+
+* Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-1
+- Update to 1.3.2a
+- Add patch to reinstate support for -DPARAMETER (http://bugs.proftpd.org/3221)
+- Retain CAP_AUDIT_WRITE, needed for pam_loginuid (#506735, fixed upstream)
+- Remove ScoreboardFile directive from configuration file - default value
+  works better with SELinux (#498375)
+- Ship mod_quotatab_sql.so in the main package rather than the SQL backend
+  subpackages
+- New DSO modules:
+  - mod_ctrls_admin
+  - mod_facl
+  - mod_load
+  - mod_quotatab_radius
+  - mod_radius
+  - mod_ratio
+  - mod_rewrite
+  - mod_site_misc
+  - mod_wrap2
+  - mod_wrap2_file
+  - mod_wrap2_sql
+- Enable mod_lang/nls support for RFC 2640 (and buildreq gettext)
+- Add /etc/sysconfig/proftpd to set PROFTPD_OPTIONS and update initscript to
+  use this value so we can use a define to enable (e.g.) anonymous FTP support
+  rather than having a huge commented-out section in the config file
+- Rewrite config file to remove most settings that don't change upstream
+  defaults, and add brief descriptions for all available loadable modules
+- Move Umask and IdentLookups settings from server config to <Global> context
+  so that they apply to all servers, including virtual hosts (#509251)
+- Ensure mod_ifsession is always the last one specified, which makes sure that
+  mod_ifsession's changes are seen properly by other modules
+- Drop pam version requirement - all targets have sufficiently recent version
+- Drop redundant explicit dependency on pam
+- Subpackages don't need to own %%{_libexecdir}/proftpd directory
+- Drop redundant krb5-devel buildreq
+- Make SRPM back-compatible with EPEL-4 (TLS cert dirs, PAM config)
+- Don't include README files for non-Linux platforms
+- Recode ChangeLog as UTF-8
+- Don't ship the prxs tool for building custom DSO's since we don't ship the
+  headers either
+- Prevent stripping of binaries in a slightly more robust way
+- Fix release tag to be ready for future beta/rc versions
+- Define RPM macros in global scope
+- BuildRequire libcap-devel so that we use the system library rather than the
+  bundled one, and eliminate log messages like:
+  kernel: warning: `proftpd' uses 32-bit capabilities (legacy support in use)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2.1
+- Update the tcp_wrappers BR to be just /usr/include/tcpd.h instead.
+
+* Thu Apr  9 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-2
+- Fix tcp_wrappers-devel BR conditional.
+
 * Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
 - Update to 1.3.2.
 - Include mod_wrap (#479813).
@@ -216,7 +341,7 @@ fi
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Caol?n McNamara 1.3.2-0.3.rc3
-- rebuild for dependencies
+- Rebuild for dependencies
 
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Apr 2009 22:06:20 -0000	1.11
+++ sources	3 Aug 2009 12:46:16 -0000	1.12
@@ -1 +1 @@
-89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2
+ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2


--- proftpd-1.3.1-find-umode_t.patch DELETED ---



From tbzatek at fedoraproject.org  Mon Aug  3 13:08:17 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  3 Aug 2009 13:08:17 +0000 (UTC)
Subject: rpms/nautilus/F-11 nautilus-2.27.2-dark-text-on-dark-bg.patch, NONE,
	1.1 nautilus.spec, 1.272, 1.273
Message-ID: <20090803130817.37BA711C02C6@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.27.2-dark-text-on-dark-bg.patch 
Log Message:
* Mon Aug  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-2
- Fix incorrect text color in compact view (#505919)


nautilus-2.27.2-dark-text-on-dark-bg.patch:
 eel-background.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE nautilus-2.27.2-dark-text-on-dark-bg.patch ---
>From 7b86b78e2ff6a0f1b45ac8f8a9c30cf3d0c6ae96 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc at gnome.org>
Date: Thu, 28 May 2009 12:28:55 +0000
Subject: Emit APPEARANCE_CHANGED when setting the bg color

Emit the APPEARANCE_CHANGED signal when we're setting the color, as
we're ignoring the pending changes after the backgorund is realized, and
thus we're not getting color updates (#578136).
---
diff --git a/eel/eel-background.c b/eel/eel-background.c
index 3891bab..942e94c 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -563,6 +563,8 @@ eel_background_set_color (EelBackground *background,
 		background->details->color = g_strdup (color);
 		
 		set_image_properties (background);
+
+		g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
 	}
 }
 
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- nautilus.spec	19 May 2009 11:16:51 -0000	1.272
+++ nautilus.spec	3 Aug 2009 13:08:16 -0000	1.273
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -87,6 +87,10 @@ Patch10:        nautilus-gvfs-desktop-ke
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# With black background, filenames invisible after switching to compact view
+# https://bugzilla.redhat.com/show_bug.cgi?id=505919
+Patch18:	nautilus-2.27.2-dark-text-on-dark-bg.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -124,6 +128,7 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p1 -b .dark-text
 
 %build
 
@@ -261,6 +266,9 @@ fi
 
 
 %changelog
+* Mon Aug  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-2
+- Fix incorrect text color in compact view (#505919)
+
 * Tue May 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.3-1
 - Update to 2.26.3
 



From rdieter at fedoraproject.org  Mon Aug  3 13:15:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 13:15:12 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.50,1.51
Message-ID: <20090803131512.1D30311C02C6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13423

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
- -libs subpkg to sanitize multilib



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- kdeplasma-addons.spec	3 Aug 2009 01:04:32 -0000	1.50
+++ kdeplasma-addons.spec	3 Aug 2009 13:15:11 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -35,6 +35,11 @@ BuildRequires:  libXcomposite-devel libX
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+# when -libs was introduced
+Obsoletes: kdeplasma-addons < 4.3.0-3
+
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
 # extragear-plasma -> kdeplasmoids rename
@@ -50,14 +55,19 @@ Provides: kde-plasma-lancelot = %{versio
 Obsoletes: kde-plasma-weather < 1.0.0-100
 Provides: kde-plasma-weather = 1.0.0-100
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 Additional plasmoids for KDE.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
@@ -96,19 +106,21 @@ rm -f  %{buildroot}%{_kde4_appsdir}/cmak
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -133,6 +145,11 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
+
+%files libs
+%defattr(-,root,root,-)
 %{_kde4_libdir}/libconversion.so.*
 %{_kde4_libdir}/libocsclient.so.*
 %{_kde4_libdir}/liblancelot.so.*
@@ -140,11 +157,12 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libplasmacomicprovidercore.so.*
 %{_kde4_libdir}/libplasmaweather.so.*
 %{_kde4_libdir}/librtm.so.*
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- -libs subpkg to sanitize multilib
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - fix to allow updating of status via microblog plasmoid 
 



From eponyme at fedoraproject.org  Mon Aug  3 13:25:24 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 13:25:24 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.17, 1.18 clive.spec, 1.20,
	1.21 sources, 1.17, 1.18
Message-ID: <20090803132524.9A68A11C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	11 Jul 2009 23:14:08 -0000	1.17
+++ .cvsignore	3 Aug 2009 13:25:24 -0000	1.18
@@ -1 +1 @@
-clive-2.2.2.tar.bz2
+clive-2.2.4.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- clive.spec	24 Jul 2009 19:06:13 -0000	1.20
+++ clive.spec	3 Aug 2009 13:25:24 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           clive
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.2.4
+Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Base) perl(Class::Singleton) perl(Getopt::ArgvFile) perl(Digest::SHA) perl(WWW::Curl)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) 
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -42,12 +42,18 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{?!_with_network_tests: rm t/03break.t }
 %{?!_with_network_tests: rm t/04liveleak.t }
 %{?!_with_network_tests: rm t/05dailymotion.t }
+%{?!_with_network_tests: rm t/06golem.t }
 %{?!_with_network_tests: rm t/07cctv.t }
 %{?!_with_network_tests: rm t/08evisor.t }
 %{?!_with_network_tests: rm t/09google.t }
 %{?!_with_network_tests: rm t/10sevenload.t }
 %{?!_with_network_tests: rm t/11redtube.t }
 %{?!_with_network_tests: rm t/12vimeo.t }
+%{?!_with_network_tests: rm t/14spiegel.t }
+%{?!_with_network_tests: rm t/15ehrensenf.t }
+%{?!_with_network_tests: rm t/16clipfish.t }
+%{?!_with_network_tests: rm t/17funnyhub.t }
+%{?!_with_network_tests: rm t/18myubo.t }
 make test
 
 
@@ -64,9 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1
+- Update to 2.2.4
+- Add perl-Class-Singleton as an explicit require
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.2-1
 - Rebuild for 2.2.2
 - Now using Makefile.PL install type


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Jul 2009 23:14:09 -0000	1.17
+++ sources	3 Aug 2009 13:25:24 -0000	1.18
@@ -1 +1 @@
-58b3fd1a063549cc2676b1eeba98b84e  clive-2.2.2.tar.bz2
+30fa519d41432c492c9014358ac0b677  clive-2.2.4.tar.bz2



From jwilson at fedoraproject.org  Mon Aug  3 13:25:54 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon,  3 Aug 2009 13:25:54 +0000 (UTC)
Subject: rpms/kernel/devel hid-ignore-all-recent-imon-devices.patch, NONE,
	1.1 TODO, 1.65, 1.66 kernel.spec, 1.1682, 1.1683
Message-ID: <20090803132554.9AC2611C02C6@cvs1.fedora.phx.redhat.com>

Author: jwilson

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

Modified Files:
	TODO kernel.spec 
Added Files:
	hid-ignore-all-recent-imon-devices.patch 
Log Message:
* Mon Aug 03 2009 Jarod Wilson <jarod at redhat.com>
- make usbhid driver ignore all recent SoundGraph iMON devices, so the
  lirc_imon driver can grab them instead


hid-ignore-all-recent-imon-devices.patch:
 hid-core.c |   10 +++++-----
 hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

--- NEW FILE hid-ignore-all-recent-imon-devices.patch ---
[PATCH] hid: ignore all recent SoundGraph iMON devices

After some inspection of the Windows iMON driver, several additional
device IDs were added to the lirc_imon driver. At least a few of these
have been seen in the wild, and require manual quirking to keep the
usbhid driver from binding to them. Rather than list out every single
device, ignore the entire device ID range, 0x0034 - 0x0046. Some of
these may not advertise themselves as HID devices, but no harm done to
such devices anyway.

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 drivers/hid/hid-core.c |   10 +++++-----
 drivers/hid/hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5eb10c2..18bf803 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1623,11 +1623,6 @@ static const struct hid_device_id hid_ignore_list[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
@@ -1694,6 +1689,11 @@ static bool hid_ignore(struct hid_device *hdev)
 				hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)
 			return true;
 		break;
+	case USB_VENDOR_ID_SOUNDGRAPH:
+		if (hdev->product >= USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST &&
+		    hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST)
+			return true;
+		break;
 	}
 
 	if (hdev->type == HID_TYPE_USBMOUSE &&
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6301010..989a3ba 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -376,11 +376,8 @@
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
 
 #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST	0x0034
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST	0x0046
 
 #define USB_VENDOR_ID_SUN		0x0430
 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- TODO	16 Jul 2009 05:32:36 -0000	1.65
+++ TODO	3 Aug 2009 13:25:54 -0000	1.66
@@ -59,8 +59,11 @@
 * linux-2.6-execshield.patch
 	Not interesting to upstream.
 
-* linux-2.6.29-lirc.patch
 * linux-2.6-sysrq-c.patch
+* linux-2.6.31-lirc.patch
+* lirc_streamzap-buffer-rework.patch
+* hdpvr-ir-enable.patch
+* hid-ignore-all-recent-imon-devices.patch
 	jarod working on upstreaming
 
 * linux-2.6-silence-acpi-blacklist.patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1682
retrieving revision 1.1683
diff -u -p -r1.1682 -r1.1683
--- kernel.spec	3 Aug 2009 06:03:08 -0000	1.1682
+++ kernel.spec	3 Aug 2009 13:25:54 -0000	1.1683
@@ -661,6 +661,7 @@ Patch1000: linux-2.6-cpufreq-ppc-suspend
 Patch1515: linux-2.6.31-lirc.patch
 Patch1516: lirc_streamzap-buffer-rework.patch
 Patch1517: hdpvr-ir-enable.patch
+Patch1518: hid-ignore-all-recent-imon-devices.patch
 
 Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
@@ -1263,6 +1264,8 @@ ApplyPatch linux-2.6.31-lirc.patch
 ApplyPatch lirc_streamzap-buffer-rework.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
+# tell usbhid to ignore all imon devices (sent upstream 2009.07.31)
+ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Add kernel KSM support
 ApplyPatch linux-2.6-ksm.patch
@@ -1940,6 +1943,10 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Jarod Wilson <jarod at redhat.com>
+- make usbhid driver ignore all recent SoundGraph iMON devices, so the
+  lirc_imon driver can grab them instead
+
 * Mon Aug 03 2009 Dave Airlie <airlied at redhat.com>
 - update VGA arb patches
 



From eponyme at fedoraproject.org  Mon Aug  3 13:27:05 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 13:27:05 +0000 (UTC)
Subject: rpms/clive/F-11 .cvsignore, 1.17, 1.18 clive.spec, 1.19,
	1.20 sources, 1.17, 1.18
Message-ID: <20090803132705.CEC7A11C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	11 Jul 2009 23:15:56 -0000	1.17
+++ .cvsignore	3 Aug 2009 13:27:05 -0000	1.18
@@ -1 +1 @@
-clive-2.2.2.tar.bz2
+clive-2.2.4.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- clive.spec	11 Jul 2009 23:15:56 -0000	1.19
+++ clive.spec	3 Aug 2009 13:27:05 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.2
+Version:        2.2.4
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Base) perl(Class::Singleton) perl(Getopt::ArgvFile) perl(Digest::SHA) perl(WWW::Curl)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) 
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -42,12 +42,18 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{?!_with_network_tests: rm t/03break.t }
 %{?!_with_network_tests: rm t/04liveleak.t }
 %{?!_with_network_tests: rm t/05dailymotion.t }
+%{?!_with_network_tests: rm t/06golem.t }
 %{?!_with_network_tests: rm t/07cctv.t }
 %{?!_with_network_tests: rm t/08evisor.t }
 %{?!_with_network_tests: rm t/09google.t }
 %{?!_with_network_tests: rm t/10sevenload.t }
 %{?!_with_network_tests: rm t/11redtube.t }
 %{?!_with_network_tests: rm t/12vimeo.t }
+%{?!_with_network_tests: rm t/14spiegel.t }
+%{?!_with_network_tests: rm t/15ehrensenf.t }
+%{?!_with_network_tests: rm t/16clipfish.t }
+%{?!_with_network_tests: rm t/17funnyhub.t }
+%{?!_with_network_tests: rm t/18myubo.t }
 make test
 
 
@@ -64,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1
+- Update to 2.2.4
+- Add perl-Class-Singleton as an explicit require
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.2-1
 - Rebuild for 2.2.2
 - Now using Makefile.PL install type


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Jul 2009 23:15:56 -0000	1.17
+++ sources	3 Aug 2009 13:27:05 -0000	1.18
@@ -1 +1 @@
-58b3fd1a063549cc2676b1eeba98b84e  clive-2.2.2.tar.bz2
+30fa519d41432c492c9014358ac0b677  clive-2.2.4.tar.bz2



From eponyme at fedoraproject.org  Mon Aug  3 13:28:16 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 13:28:16 +0000 (UTC)
Subject: rpms/clive/F-10 .cvsignore, 1.17, 1.18 clive.spec, 1.17,
	1.18 sources, 1.17, 1.18
Message-ID: <20090803132816.7D06711C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	11 Jul 2009 23:17:46 -0000	1.17
+++ .cvsignore	3 Aug 2009 13:28:16 -0000	1.18
@@ -1 +1 @@
-clive-2.2.2.tar.bz2
+clive-2.2.4.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- clive.spec	11 Jul 2009 23:17:46 -0000	1.17
+++ clive.spec	3 Aug 2009 13:28:16 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.2
+Version:        2.2.4
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Base) perl(Class::Singleton) perl(Getopt::ArgvFile) perl(Digest::SHA) perl(WWW::Curl)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) 
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -42,12 +42,18 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{?!_with_network_tests: rm t/03break.t }
 %{?!_with_network_tests: rm t/04liveleak.t }
 %{?!_with_network_tests: rm t/05dailymotion.t }
+%{?!_with_network_tests: rm t/06golem.t }
 %{?!_with_network_tests: rm t/07cctv.t }
 %{?!_with_network_tests: rm t/08evisor.t }
 %{?!_with_network_tests: rm t/09google.t }
 %{?!_with_network_tests: rm t/10sevenload.t }
 %{?!_with_network_tests: rm t/11redtube.t }
 %{?!_with_network_tests: rm t/12vimeo.t }
+%{?!_with_network_tests: rm t/14spiegel.t }
+%{?!_with_network_tests: rm t/15ehrensenf.t }
+%{?!_with_network_tests: rm t/16clipfish.t }
+%{?!_with_network_tests: rm t/17funnyhub.t }
+%{?!_with_network_tests: rm t/18myubo.t }
 make test
 
 
@@ -64,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1
+- Update to 2.2.4
+- Add perl-Class-Singleton as an explicit require
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.2-1
 - Rebuild for 2.2.2
 - Now using Makefile.PL install type


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	11 Jul 2009 23:17:46 -0000	1.17
+++ sources	3 Aug 2009 13:28:16 -0000	1.18
@@ -1 +1 @@
-58b3fd1a063549cc2676b1eeba98b84e  clive-2.2.2.tar.bz2
+30fa519d41432c492c9014358ac0b677  clive-2.2.4.tar.bz2



From beekhof at fedoraproject.org  Mon Aug  3 13:36:31 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon,  3 Aug 2009 13:36:31 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.66,1.67
Message-ID: <20090803133631.C40F411C02C6@cvs1.fedora.phx.redhat.com>

Author: beekhof

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

Modified Files:
	comps-f12.xml.in 
Log Message:
Added Pacemaker to the f12 clustering group


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- comps-f12.xml.in	2 Aug 2009 13:30:12 -0000	1.66
+++ comps-f12.xml.in	3 Aug 2009 13:36:31 -0000	1.67
@@ -710,6 +710,7 @@
       <packagereq type="default">ricci</packagereq>
       <packagereq type="default">system-config-cluster</packagereq>
       <packagereq type="optional">heartbeat</packagereq>
+      <packagereq type="optional">pacemaker</packagereq>
     </packagelist>
   </group>
   <group>



From eponyme at fedoraproject.org  Mon Aug  3 13:38:24 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 13:38:24 +0000 (UTC)
Subject: rpms/abby/devel .cvsignore, 1.4, 1.5 abby.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090803133824.B75B211C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 23:20:53 -0000	1.4
+++ .cvsignore	3 Aug 2009 13:38:24 -0000	1.5
@@ -1 +1 @@
-abby-0.4.1.tar.bz2
+abby-0.4.2.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/abby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- abby.spec	24 Jul 2009 16:28:56 -0000	1.4
+++ abby.spec	3 Aug 2009 13:38:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           abby
-Version:        0.4.1
-Release:        2%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
 Group:          Applications/Multimedia 
@@ -29,9 +29,8 @@ echo "Type=Application" >> %{name}.deskt
 echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop
 
 
-
 %build
-qmake-qt4 "QT+=network xml"
+qmake-qt4
 make %{?_smp_mflags}
 
 
@@ -56,9 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1
+- Update to 0.4.2
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.1-1
 - Rebuild for 0.4.1
 * Mon Jun 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 23:20:53 -0000	1.4
+++ sources	3 Aug 2009 13:38:24 -0000	1.5
@@ -1 +1 @@
-d76eeeac6e674487bec30632c82590d2  abby-0.4.1.tar.bz2
+5ee4b1d085461a7fda7bba46c4fa677b  abby-0.4.2.tar.bz2



From eponyme at fedoraproject.org  Mon Aug  3 13:39:55 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 13:39:55 +0000 (UTC)
Subject: rpms/abby/F-11 .cvsignore, 1.4, 1.5 abby.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <20090803133955.4446611C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 23:23:08 -0000	1.4
+++ .cvsignore	3 Aug 2009 13:39:55 -0000	1.5
@@ -1 +1 @@
-abby-0.4.1.tar.bz2
+abby-0.4.2.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/abby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- abby.spec	11 Jul 2009 23:23:08 -0000	1.3
+++ abby.spec	3 Aug 2009 13:39:55 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -29,9 +29,8 @@ echo "Type=Application" >> %{name}.deskt
 echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop
 
 
-
 %build
-qmake-qt4 "QT+=network xml"
+qmake-qt4
 make %{?_smp_mflags}
 
 
@@ -56,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1
+- Update to 0.4.2
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.1-1
 - Rebuild for 0.4.1
 * Mon Jun 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 23:23:08 -0000	1.4
+++ sources	3 Aug 2009 13:39:55 -0000	1.5
@@ -1 +1 @@
-d76eeeac6e674487bec30632c82590d2  abby-0.4.1.tar.bz2
+5ee4b1d085461a7fda7bba46c4fa677b  abby-0.4.2.tar.bz2



From eponyme at fedoraproject.org  Mon Aug  3 13:40:59 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Mon,  3 Aug 2009 13:40:59 +0000 (UTC)
Subject: rpms/abby/F-10 .cvsignore, 1.4, 1.5 abby.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <20090803134059.8DBFB11C02C6@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Jul 2009 23:24:58 -0000	1.4
+++ .cvsignore	3 Aug 2009 13:40:59 -0000	1.5
@@ -1 +1 @@
-abby-0.4.1.tar.bz2
+abby-0.4.2.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/abby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- abby.spec	11 Jul 2009 23:24:58 -0000	1.3
+++ abby.spec	3 Aug 2009 13:40:59 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -29,9 +29,8 @@ echo "Type=Application" >> %{name}.deskt
 echo "Categories=Network;FileTransfer;Qt;" >> %{name}.desktop
 
 
-
 %build
-qmake-qt4 "QT+=network xml"
+qmake-qt4
 make %{?_smp_mflags}
 
 
@@ -56,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1
+- Update to 0.4.2
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sat Jul 11 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.1-1
 - Rebuild for 0.4.1
 * Mon Jun 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.3.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Jul 2009 23:24:58 -0000	1.4
+++ sources	3 Aug 2009 13:40:59 -0000	1.5
@@ -1 +1 @@
-d76eeeac6e674487bec30632c82590d2  abby-0.4.1.tar.bz2
+5ee4b1d085461a7fda7bba46c4fa677b  abby-0.4.2.tar.bz2



From rhughes at fedoraproject.org  Mon Aug  3 13:47:47 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 13:47:47 +0000 (UTC)
Subject: rpms/PackageKit/F-11 .cvsignore, 1.45, 1.46 PackageKit.spec, 1.109, 
	1.110 sources, 1.46,
	1.47 PackageKit-0.4.8-do-newest-unordered.patch, 1.1,
	NONE PackageKit-0.4.8-fix-get-restart-required-all-packages.patch,
	1.1, NONE PackageKit-0.4.8-fix-get-restart-required.patch, 1.1,
	NONE PackageKit-0.4.8-no-network-hardcode.patch, 1.1,
	NONE PackageKit-0.4.8-subclass-mime-types.patch, 1.1,
	NONE PackageKit-0.4.8-yum-float-version.patch, 1.1, NONE
Message-ID: <20090803134747.96FE711C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	.cvsignore PackageKit.spec sources 
Removed Files:
	PackageKit-0.4.8-do-newest-unordered.patch 
	PackageKit-0.4.8-fix-get-restart-required-all-packages.patch 
	PackageKit-0.4.8-fix-get-restart-required.patch 
	PackageKit-0.4.8-no-network-hardcode.patch 
	PackageKit-0.4.8-subclass-mime-types.patch 
	PackageKit-0.4.8-yum-float-version.patch 
Log Message:
* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.9-1
- New upstream version, many bugfixes and performance fixes
- Fixes #483164, #504377, #499590, #514708, #513376, #510874 and #472876



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	1 Jun 2009 10:19:07 -0000	1.45
+++ .cvsignore	3 Aug 2009 13:47:47 -0000	1.46
@@ -1 +1 @@
-PackageKit-0.4.8.tar.gz
+PackageKit-0.4.9.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- PackageKit.spec	6 Jul 2009 10:23:11 -0000	1.109
+++ PackageKit.spec	3 Aug 2009 13:47:47 -0000	1.110
@@ -8,9 +8,9 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.4.8
+Version:   0.4.9
 #Release:   0.3.%{?alphatag}git%{?dist}
-Release:   2%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -24,24 +24,6 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendo
 # Fedora specific: the yum backend doesn't do time estimation correctly
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
-# Upstream: cdec15bbbb433f9e47c75467bafd31711b10fc93
-Patch2:    PackageKit-0.4.8-do-newest-unordered.patch
-
-# Upstream: 205eba3727d1cad96baa42a4d38122bb997e520f
-Patch3:    PackageKit-0.4.8-fix-get-restart-required.patch
-
-# Upstream: a5fd8ab0411f918970d9abdf03ca83635ad58518
-Patch4:    PackageKit-0.4.8-fix-get-restart-required-all-packages.patch
-
-# Upstream: 64997e86e36e1c6964289eec657d1595c92cd534
-Patch5:    PackageKit-0.4.8-no-network-hardcode.patch
-
-# Upstream: fdfbd193e8c5e21bc381b805c5e06ee40000a495
-Patch6:    PackageKit-0.4.8-subclass-mime-types.patch
-
-# Upstream: d8089794c91c8c8429ca3e794465a322eea136d6
-Patch7:    PackageKit-0.4.8-yum-float-version.patch
-
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -235,12 +217,6 @@ using PackageKit.
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
-%patch2 -p1 -b .do-newest-unordered
-%patch3 -p1 -b .fix-get-restart-required
-%patch4 -p1 -b .fix-get-restart-required-all-packages
-%patch5 -p1 -b .no-network-hardcode
-%patch6 -p1 -b .subclass-mime-types
-%patch7 -p1 -b .yum-float-version
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
@@ -426,6 +402,10 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.9-1
+- New upstream version, many bugfixes and performance fixes
+- Fixes #483164, #504377, #499590, #514708, #513376, #510874 and #472876
+
 * Mon Jul 06 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.8-2
 - Pull in some patches from upstream PACKAGEKIT_0_4_X branch
  - Do newest filtering when the list isn't ordered


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	1 Jun 2009 10:19:08 -0000	1.46
+++ sources	3 Aug 2009 13:47:47 -0000	1.47
@@ -1 +1 @@
-955082ee50358b1cc3eddcb438b7fae4  PackageKit-0.4.8.tar.gz
+24e1e3ea58aff65ba2b31e05cbc2ce6b  PackageKit-0.4.9.tar.gz


--- PackageKit-0.4.8-do-newest-unordered.patch DELETED ---


--- PackageKit-0.4.8-fix-get-restart-required-all-packages.patch DELETED ---


--- PackageKit-0.4.8-fix-get-restart-required.patch DELETED ---


--- PackageKit-0.4.8-no-network-hardcode.patch DELETED ---


--- PackageKit-0.4.8-subclass-mime-types.patch DELETED ---


--- PackageKit-0.4.8-yum-float-version.patch DELETED ---



From steved at fedoraproject.org  Mon Aug  3 13:52:29 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  3 Aug 2009 13:52:29 +0000 (UTC)
Subject: rpms/kernel/devel nfs41-v2.6.31-rc5.patch, NONE,
	1.1.2.1 config-generic, 1.315, 1.315.4.1 kernel.spec, 1.1682,
	1.1682.4.1
Message-ID: <20090803135229.3610111C02C6@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc5
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_31-nfs41_rc5
	nfs41-v2.6.31-rc5.patch 
Log Message:
Update to latest NFS41 update (v2.6.31-rc5)


nfs41-v2.6.31-rc5.patch:
 fs/nfs/client.c                |   10 
 fs/nfs/nfs4proc.c              |   16 +
 fs/nfs/nfs4state.c             |    2 
 fs/nfsd/nfs4callback.c         |  216 ++++++++++++++++++-
 fs/nfsd/nfs4proc.c             |   35 ---
 fs/nfsd/nfs4state.c            |  462 ++++++++++++++++++-----------------------
 fs/nfsd/nfs4xdr.c              |   16 -
 fs/nfsd/nfssvc.c               |   30 +-
 include/linux/nfs4.h           |    2 
 include/linux/nfsd/nfsd.h      |    3 
 include/linux/nfsd/state.h     |   62 +++--
 include/linux/nfsd/xdr4.h      |   26 --
 include/linux/sunrpc/clnt.h    |    1 
 include/linux/sunrpc/svc.h     |    2 
 include/linux/sunrpc/svcsock.h |    1 
 include/linux/sunrpc/xprt.h    |    7 
 net/sunrpc/backchannel_rqst.c  |    2 
 net/sunrpc/clnt.c              |    1 
 net/sunrpc/sched.c             |    7 
 net/sunrpc/sunrpc.h            |   14 +
 net/sunrpc/svcsock.c           |  251 ++++++++++++++++------
 net/sunrpc/xprt.c              |   16 +
 net/sunrpc/xprtsock.c          |  199 ++++++++++++++++-
 23 files changed, 944 insertions(+), 437 deletions(-)

--- NEW FILE nfs41-v2.6.31-rc5.patch ---
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8d25ccb..e4dae5f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -149,6 +149,7 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
 	clp->cl_boot_time = CURRENT_TIME;
 	clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
 	clp->cl_minorversion = cl_init->minorversion;
+	clp->cl_lease_time = 0;
 #endif
 	cred = rpc_lookup_machine_cred();
 	if (!IS_ERR(cred))
@@ -535,16 +536,11 @@ void nfs_mark_client_ready(struct nfs_client *clp, int state)
 /*
  * With sessions, the client is not marked ready until after a
  * successful EXCHANGE_ID and CREATE_SESSION.
- *
- * Map errors cl_cons_state errors to EPROTONOSUPPORT to indicate
- * other versions of NFS can be tried.
  */
 int nfs4_check_client_ready(struct nfs_client *clp)
 {
-	if (!nfs4_has_session(clp))
-		return 0;
-	if (clp->cl_cons_state < NFS_CS_READY)
-		return -EPROTONOSUPPORT;
+	if (clp->cl_cons_state < 0)
+		return clp->cl_cons_state;
 	return 0;
 }
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6917311..282df2d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1449,13 +1449,21 @@ static int nfs4_recover_expired_lease(struct nfs_server *server)
 	for (;;) {
 		ret = nfs4_wait_clnt_recover(clp);
 		if (ret != 0)
-			return ret;
-		if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
-		    !test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state))
 			break;
+		/* Is lease recovery done? */
+		if (!test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state) &&
+		    !test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
+			break;
+		if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
+		    clp->cl_lease_time) {
+			/* fetch the lease reclaim error */
+			ret = (int)clp->cl_lease_time;
+			break;
+		}
 		nfs4_schedule_state_recovery(clp);
 	}
-	return 0;
+	dprintk("%s: error=%d\n", __func__, ret);
+	return ret;
 }
 
 /*
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 65ca8c1..b5c71dc 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1220,6 +1220,7 @@ static void nfs4_set_lease_expired(struct nfs_client *clp, int status)
 			return;
 		}
 	}
+	clp->cl_lease_time = status;
 	set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
 }
 
@@ -1231,6 +1232,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
 	for(;;) {
 		if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
 			/* We're going to have to re-establish a clientid */
+			clp->cl_lease_time = 0;
 			status = nfs4_reclaim_lease(clp);
 			if (status) {
 				nfs4_set_lease_expired(clp, status);
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 3fd23f7..6f1c046 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -43,6 +43,7 @@
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/svcsock.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/state.h>
 #include <linux/sunrpc/sched.h>
@@ -52,16 +53,19 @@
 
 #define NFSPROC4_CB_NULL 0
 #define NFSPROC4_CB_COMPOUND 1
+#define NFS4_STATEID_SIZE 16
 
 /* Index of predefined Linux callback client operations */
 
 enum {
-        NFSPROC4_CLNT_CB_NULL = 0,
+	NFSPROC4_CLNT_CB_NULL = 0,
 	NFSPROC4_CLNT_CB_RECALL,
+	NFSPROC4_CLNT_CB_SEQUENCE,
 };
 
 enum nfs_cb_opnum4 {
 	OP_CB_RECALL            = 4,
+	OP_CB_SEQUENCE          = 11,
 };
 
 #define NFS4_MAXTAGLEN		20
@@ -70,17 +74,29 @@ enum nfs_cb_opnum4 {
 #define NFS4_dec_cb_null_sz		0
 #define cb_compound_enc_hdr_sz		4
 #define cb_compound_dec_hdr_sz		(3 + (NFS4_MAXTAGLEN >> 2))
+#define sessionid_sz			(NFS4_MAX_SESSIONID_LEN >> 2)
+#define cb_sequence_enc_sz		(sessionid_sz + 4 +             \
+					1 /* no referring calls list yet */)
+#define cb_sequence_dec_sz		(op_dec_sz + sessionid_sz + 4)
+
 #define op_enc_sz			1
 #define op_dec_sz			2
 #define enc_nfs4_fh_sz			(1 + (NFS4_FHSIZE >> 2))
 #define enc_stateid_sz			(NFS4_STATEID_SIZE >> 2)
 #define NFS4_enc_cb_recall_sz		(cb_compound_enc_hdr_sz +       \
+					cb_sequence_enc_sz +            \
 					1 + enc_stateid_sz +            \
 					enc_nfs4_fh_sz)
 
 #define NFS4_dec_cb_recall_sz		(cb_compound_dec_hdr_sz  +      \
+					cb_sequence_dec_sz +            \
 					op_dec_sz)
 
+struct nfs4_rpc_args {
+	void				*args_op;
+	struct nfsd4_cb_sequence	args_seq;
+};
+
 /*
 * Generic encode routines from fs/nfs/nfs4xdr.c
 */
@@ -137,11 +153,13 @@ xdr_error:                                      \
 } while (0)
 
 struct nfs4_cb_compound_hdr {
-	int		status;
-	u32		ident;
+	/* args */
+	u32		ident;	/* minorversion 0 only */
 	u32		nops;
 	__be32		*nops_p;
 	u32		minorversion;
+	/* res */
+	int		status;
 	u32		taglen;
 	char		*tag;
 };
@@ -238,6 +256,27 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp,
 	hdr->nops++;
 }
 
+static void
+encode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *args,
+		   struct nfs4_cb_compound_hdr *hdr)
+{
+	__be32 *p;
+
+	if (hdr->minorversion == 0)
+		return;
+
+	RESERVE_SPACE(1 + NFS4_MAX_SESSIONID_LEN + 20);
+
+	WRITE32(OP_CB_SEQUENCE);
+	WRITEMEM(args->cbs_clp->cl_sessionid.data, NFS4_MAX_SESSIONID_LEN);
+	WRITE32(args->cbs_clp->cl_cb_seq_nr);
+	WRITE32(0);		/* slotid, always 0 */
+	WRITE32(0);		/* highest slotid always 0 */
+	WRITE32(0);		/* cachethis always 0 */
+	WRITE32(0); /* FIXME: support referring_call_lists */
+	hdr->nops++;
+}
+
 static int
 nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 {
@@ -249,15 +288,19 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 }
 
 static int
-nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_delegation *args)
+nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p,
+		struct nfs4_rpc_args *rpc_args)
 {
 	struct xdr_stream xdr;
+	struct nfs4_delegation *args = rpc_args->args_op;
 	struct nfs4_cb_compound_hdr hdr = {
[...1981 lines suppressed...]
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+	int len;
+	struct xdr_buf *xbufp = &req->rq_snd_buf;
+	struct rpc_xprt *xprt = req->rq_xprt;
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+	struct socket *sock = transport->sock;
+	unsigned long headoff;
+	unsigned long tailoff;
+
+	/*
+	 * Set up the rpc header and record marker stuff
+	 */
+	xs_encode_tcp_record_marker(xbufp);
+
+	tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+	headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+	len = svc_send_common(sock, xbufp,
+			      virt_to_page(xbufp->head[0].iov_base), headoff,
+			      xbufp->tail[0].iov_base, tailoff);
+
+	if (len != xbufp->len) {
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+		len = -EAGAIN;
+	}
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	xprt = req->rq_xprt->bc_xprt;
+	svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+	/*
+	 * Grab the mutex to serialize data as the connection is shared
+	 * with the fore channel
+	 */
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	if (len > 0)
+		len = 0;
+
+	return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -2192,6 +2317,22 @@ static struct rpc_xprt_ops xs_tcp_ops = {
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2323,14 +2464,46 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 	xprt->prot = IPPROTO_TCP;
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+	xprt->timeout = &xs_tcp_default_timeout;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_xprt) {
+		struct svc_sock *bc_sock;
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/* backchannel */
+		xprt_set_bound(xprt);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
+
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_xprt = args->bc_xprt;
+		bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+		bc_sock->sk_bc_xprt = xprt;
+		transport->sock = bc_sock->sk_sock;
+		transport->inet = bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		switch (addr->sa_family) {
+		case AF_INET:
+			xs_format_ipv4_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP);
+			break;
+		case AF_INET6:
+			xs_format_ipv6_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP6);
+			break;
+		default:
+			kfree(xprt);
+			return ERR_PTR(-EAFNOSUPPORT);
+		}
+
+		goto out;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2338,20 +2511,30 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		xs_format_ipv4_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
-		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+		xs_format_ipv6_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	default:
 		kfree(xprt);
 		return ERR_PTR(-EAFNOSUPPORT);
 	}
 
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+out:
 	dprintk("RPC:       set up transport to address %s\n",
 			xprt->address_strings[RPC_DISPLAY_ALL]);
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.315
retrieving revision 1.315.4.1
diff -u -p -r1.315 -r1.315.4.1
--- config-generic	31 Jul 2009 01:00:04 -0000	1.315
+++ config-generic	3 Aug 2009 13:52:28 -0000	1.315.4.1
@@ -3193,7 +3193,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1682
retrieving revision 1.1682.4.1
diff -u -p -r1.1682 -r1.1682.4.1
--- kernel.spec	3 Aug 2009 06:03:08 -0000	1.1682
+++ kernel.spec	3 Aug 2009 13:52:28 -0000	1.1682.4.1
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .nfs41_rc5
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -89,7 +89,7 @@ Summary: The Linux kernel
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  1}
 # tools/perf
 %define with_perftool  %{?_without_perftool:  0} %{?!_without_perftool:  1}
 # perf noarch subpkg
@@ -698,6 +698,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: nfs41-v2.6.31-rc5.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1169,6 +1170,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch nfs41-v2.6.31-rc5.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1940,6 +1942,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Steve Dickson <steved at redhat.com>
+- Update to latest NFS41 update (v2.6.31-rc5)
+
 * Mon Aug 03 2009 Dave Airlie <airlied at redhat.com>
 - update VGA arb patches
 



From mtasaka at fedoraproject.org  Mon Aug  3 13:52:46 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 13:52:46 +0000 (UTC)
Subject: rpms/ruby-flexmock/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE ruby-flexmock.spec, 1.3, NONE sources,
	1.2, NONE
Message-ID: <20090803135246.4048811C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-flexmock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22526

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile ruby-flexmock.spec sources 
Log Message:
Goodby, ruby-flexmock


--- NEW FILE dead.package ---
2009-08-03 Mamoru Tasaka <mtasaka at ioa.s-u-tokyo.ac.jp>

Switched to gem. Now ruby-flexmock binary rpm is created from
rubygem-flexmock srpm.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- ruby-flexmock.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Mon Aug  3 13:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 13:54:09 +0000
Subject: [pkgdb] ruby-flexmock ownership updated
Message-ID: <20090803135409.DE65510F8A2@bastion2.fedora.phx.redhat.com>

Package ruby-flexmock in Fedora devel was orphaned by mtasaka

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



From pvrabec at fedoraproject.org  Mon Aug  3 13:59:47 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  3 Aug 2009 13:59:47 +0000 (UTC)
Subject: rpms/openscap/devel .cvsignore, 1.4, 1.5 openscap.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090803135947.97D5411C02C6@cvs1.fedora.phx.redhat.com>

Author: pvrabec

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

Modified Files:
	.cvsignore openscap.spec sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Apr 2009 11:57:27 -0000	1.4
+++ .cvsignore	3 Aug 2009 13:59:47 -0000	1.5
@@ -1 +1 @@
-openscap-0.3.3.tar.gz
+openscap-0.5.1.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/openscap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openscap.spec	25 Jul 2009 20:52:09 -0000	1.4
+++ openscap.spec	3 Aug 2009 13:59:47 -0000	1.5
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.3.3
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -53,7 +53,7 @@ libraries can be used by perl.
 %setup -q
 
 %build
-%configure
+%configure --enable-probes --enable-probes-independent --enable-probes-unix --enable-probes-redhat
 make %{?_smp_mflags}
 
 %install
@@ -72,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
+%{_libexecdir}/*
 
 %files python
 %defattr(-,root,root,-)
@@ -90,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 03 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.1-1
+- upgrade
 
 * Thu Apr 30 2009 Peter Vrabec <pvrabec at redhat.com> 0.3.3-1
 - upgrade
@@ -110,3 +111,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Jan 15 2009 Tomas Heinrich <theinric at redhat.com> 0.1.1-1
 - Initial rpm
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Apr 2009 11:57:28 -0000	1.4
+++ sources	3 Aug 2009 13:59:47 -0000	1.5
@@ -1 +1 @@
-eb9278719d0668a2ae04146b1706e054  openscap-0.3.3.tar.gz
+5cd265229008e8c25468014fbc99b062  openscap-0.5.1.tar.gz



From atkac at fedoraproject.org  Mon Aug  3 13:50:41 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  3 Aug 2009 13:50:41 +0000 (UTC)
Subject: rpms/swig/F-10 swig.spec,1.42,1.43
Message-ID: <20090803135041.CC0B611C049D@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	swig.spec 
Log Message:
- improve fix for perl requires/provides (#514983)



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/F-10/swig.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- swig.spec	3 Aug 2009 07:49:43 -0000	1.42
+++ swig.spec	3 Aug 2009 13:50:41 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.39
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -41,16 +41,23 @@ tool for building user interfaces.
 %patch2 -p1 -b .arch
 
 cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
+#!/bin/bash
+%{__perl_provides} | sed \
+-e '/perl(Particle)/d' \
+-e '/perl(example::Vector)/d'
 EOF
 
 %define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-doc-%{version}\S+||'`
+#!/bin/bash
+%{__perl_requires} | sed \
+-e '/perl(ExtUtils::MakeMaker)/d' \
+-e '/perl(argv)/d' \
+-e '/perl(example)/d' \
+-e '/perl(it)/d' \
+-e '/perl(the)/d'
 EOF
 
 %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
@@ -82,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ccache-swig.1*
 
 %changelog
+* Mon Aug 03 2009 Adam Tkac <atkac redhat com> 1.3.39-3
+- improve fix for perl requires/provides (#514983)
+
 * Mon Aug 03 2009 Adam Tkac <atkac redhat com> 1.3.39-2
 - fix perl requires/provides (#514983)
 



From atkac at fedoraproject.org  Mon Aug  3 14:06:30 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  3 Aug 2009 14:06:30 +0000 (UTC)
Subject: rpms/swig/devel swig.spec,1.48,1.49
Message-ID: <20090803140630.282E411C02C6@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	swig.spec 
Log Message:
- rebuilt



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- swig.spec	27 Jul 2009 05:13:10 -0000	1.48
+++ swig.spec	3 Aug 2009 14:06:29 -0000	1.49
@@ -4,7 +4,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.39
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Doc Examples
 
 %changelog
+* Mon Aug 03 2009 Adam Tkac <atkac redhat com> 1.3.39-3
+- rebuilt
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.39-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Mon Aug  3 14:08:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  3 Aug 2009 14:08:48 +0000 (UTC)
Subject: rpms/bluez/F-11 bluez.spec,1.67,1.68
Message-ID: <20090803140848.B3C4511C02C6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	bluez.spec 
Log Message:
* Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-3
- Fix hid2hci rules location


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- bluez.spec	3 Aug 2009 10:26:35 -0000	1.67
+++ bluez.spec	3 Aug 2009 14:08:48 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -132,6 +132,7 @@ fi
 
 install -D -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
 install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial
+mv ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/bluetooth-hid2hci.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/
 
 install -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
@@ -169,7 +170,7 @@ fi
 %{_libdir}/bluetooth/
 /lib/udev/bluetooth_serial
 %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
-%{_sysconfdir}/udev/bluetooth-hid2hci.rules
+%{_sysconfdir}/udev/rules.d/bluetooth-hid2hci.rules
 /etc/rc.d/init.d/*
 %{_localstatedir}/lib/bluetooth
 %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
@@ -200,6 +201,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-3
+- Fix hid2hci rules location
+
 * Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-2
 - Let udev rules handle hid2hci (#514698)
 



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:30 +0000
Subject: [pkgdb] ghc-haskell-src-exts had acl change status
Message-ID: <20090803141331.2414210F8AD@bastion2.fedora.phx.redhat.com>

konradm has set the watchbugzilla acl on ghc-haskell-src-exts (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:31 +0000
Subject: [pkgdb] ghc-haskell-src-exts had acl change status
Message-ID: <20090803141331.627C710F8B1@bastion2.fedora.phx.redhat.com>

konradm has set the watchcommits acl on ghc-haskell-src-exts (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:32 +0000
Subject: [pkgdb] ghc-haskell-src-exts had acl change status
Message-ID: <20090803141332.C93D510F8B2@bastion2.fedora.phx.redhat.com>

konradm has set the commit acl on ghc-haskell-src-exts (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:33 +0000
Subject: [pkgdb] ghc-haskell-src-exts had acl change status
Message-ID: <20090803141333.2E61010F8B9@bastion2.fedora.phx.redhat.com>

konradm has set the approveacls acl on ghc-haskell-src-exts (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-haskell-src-exts



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:52 +0000
Subject: [pkgdb] ghc-uniplate had acl change status
Message-ID: <20090803141352.C1E3F10F886@bastion2.fedora.phx.redhat.com>

konradm has set the watchbugzilla acl on ghc-uniplate (Fedora devel) to Approved for ynemoy

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



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:53 +0000
Subject: [pkgdb] ghc-uniplate had acl change status
Message-ID: <20090803141353.86F1E10F8A9@bastion2.fedora.phx.redhat.com>

konradm has set the watchcommits acl on ghc-uniplate (Fedora devel) to Approved for ynemoy

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



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:53 +0000
Subject: [pkgdb] ghc-uniplate had acl change status
Message-ID: <20090803141354.0176610F8AF@bastion2.fedora.phx.redhat.com>

konradm has set the commit acl on ghc-uniplate (Fedora devel) to Approved for ynemoy

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



From pkgdb at fedoraproject.org  Mon Aug  3 14:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 14:13:54 +0000
Subject: [pkgdb] ghc-uniplate had acl change status
Message-ID: <20090803141354.C900E10F8BB@bastion2.fedora.phx.redhat.com>

konradm has set the approveacls acl on ghc-uniplate (Fedora devel) to Approved for ynemoy

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



From pvrabec at fedoraproject.org  Mon Aug  3 14:23:53 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  3 Aug 2009 14:23:53 +0000 (UTC)
Subject: rpms/openscap/devel openscap.spec,1.5,1.6
Message-ID: <20090803142353.2279611C02C6@cvs1.fedora.phx.redhat.com>

Author: pvrabec

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

Modified Files:
	openscap.spec 
Log Message:
add rpm-devel requirement



Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/openscap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openscap.spec	3 Aug 2009 13:59:47 -0000	1.5
+++ openscap.spec	3 Aug 2009 14:23:52 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           openscap
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -11,6 +11,7 @@ URL:            http://www.open-scap.org
 Source0:        http://open-scap.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  swig pcre-devel libxml2-devel
+BuildRequires:	rpm-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -91,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.1-2
+- add rpm-devel requirement
+
 * Mon Aug 03 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.1-1
 - upgrade
 



From ruben at fedoraproject.org  Mon Aug  3 14:27:50 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon,  3 Aug 2009 14:27:50 +0000 (UTC)
Subject: rpms/pdns-recursor/F-11 pdns-recursor.spec, 1.11,
	1.12 pdns-recursor-boost.patch, 1.1,
	NONE pdns-recursor-fixsysconfdir.patch, 1.2,
	NONE pdns-recursor-gcc44.patch, 1.1, NONE
Message-ID: <20090803142750.ACCC411C02C6@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31426

Modified Files:
	pdns-recursor.spec 
Removed Files:
	pdns-recursor-boost.patch pdns-recursor-fixsysconfdir.patch 
	pdns-recursor-gcc44.patch 
Log Message:
* Mon Aug 03 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-1
- Upstream released new version
- Drop patches included upstream



Index: pdns-recursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/F-11/pdns-recursor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pdns-recursor.spec	27 Feb 2009 15:44:06 -0000	1.11
+++ pdns-recursor.spec	3 Aug 2009 14:27:50 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:		Modern, advanced and high performance recursing/non authoritative nameserver
 Name:			pdns-recursor
-Version:		3.1.7
-Release:		4%{?dist}
+Version:		3.1.7.1
+Release:		1%{?dist}
 Group:			System Environment/Daemons
 License:		GPLv2
 URL:			http://powerdns.com
@@ -9,10 +9,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 Source0:		http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
 Source1:		pdns-recursor.init	
 
-Patch0:			pdns-recursor-fixsysconfdir.patch
-Patch1:			pdns-recursor-fixmakefile.patch
-Patch2:			pdns-recursor-boost.patch
-Patch3:			pdns-recursor-gcc44.patch
+Patch0:			pdns-recursor-fixmakefile.patch
 
 Provides:		powerdns-recursor = %{version}-%{release}
 BuildRequires:		boost-devel, lua-devel
@@ -25,10 +22,7 @@ package if you need a dns cache for your
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixsysconfdir
-%patch1 -p1 -b .fixmakefile
-%patch2 -p1 -b .boost
-%patch3 -p1 -b .gcc44
+%patch0 -p1 -b .fixmakefile
 
 %build
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -80,6 +74,10 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-1
+- Upstream released new version
+- Drop patches included upstream
+
 * Fri Feb 27 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7-4
 - Fix errors with newer Boost
 - Fix build with gcc4.4


--- pdns-recursor-boost.patch DELETED ---


--- pdns-recursor-fixsysconfdir.patch DELETED ---


--- pdns-recursor-gcc44.patch DELETED ---



From ruben at fedoraproject.org  Mon Aug  3 14:34:57 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon,  3 Aug 2009 14:34:57 +0000 (UTC)
Subject: rpms/pdns-recursor/F-11 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090803143457.D11EC11C02C6@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1144

Modified Files:
	.cvsignore sources 
Log Message:
Add the right source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Jul 2008 08:21:58 -0000	1.7
+++ .cvsignore	3 Aug 2009 14:34:57 -0000	1.8
@@ -1 +1 @@
-pdns-recursor-3.1.7.tar.bz2
+pdns-recursor-3.1.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Jul 2008 08:21:58 -0000	1.7
+++ sources	3 Aug 2009 14:34:57 -0000	1.8
@@ -1 +1 @@
-e7521055f949ba8e9e77fe27411be2ed  pdns-recursor-3.1.7.tar.bz2
+e8d6d6f1ec477741a2c9b3bb2e297e18  pdns-recursor-3.1.7.1.tar.bz2



From rhughes at fedoraproject.org  Mon Aug  3 14:37:20 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 14:37:20 +0000 (UTC)
Subject: rpms/hal/F-11 hal.spec,1.190,1.191
Message-ID: <20090803143720.A001F11C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	hal.spec 
Log Message:
* Mon Aug 03 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-28.20090226git
- Actually apply the patch from the last commit.
- Fixes #496820



Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-11/hal.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- hal.spec	29 Jul 2009 13:19:43 -0000	1.190
+++ hal.spec	3 Aug 2009 14:37:20 -0000	1.191
@@ -28,7 +28,7 @@ Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.12
 #Release: 14%{?dist}
-Release: 27.%{?alphatag}%{?dist}
+Release: 28.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.bz2
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
@@ -150,6 +150,7 @@ API docs for HAL.
 %patch7 -p1 -b .tablet-evdev
 %patch8 -p1 -b .fix-udev
 %patch9 -p1 -b .kvm-evdev
+%patch10 -p1 -b .ehea-devices
 
 %build
 %configure                                  \
@@ -301,6 +302,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-28.20090226git
+- Actually apply the patch from the last commit.
+- Fixes #496820
+
 * Wed Jul 29 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-27.20090226git
 - hal-0.5.12-fix-imebus-devices.patch: HAL was failing to recognize ehea
   ethernet adapters under /sys/bus/ibmebus.



From rhughes at fedoraproject.org  Mon Aug  3 14:44:37 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 14:44:37 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel
	DeviceKit-power-010-continue-to-poll-when-guessing.patch, NONE,
	1.1 DeviceKit-power.spec, 1.22, 1.23
Message-ID: <20090803144438.045A211C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	DeviceKit-power.spec 
Added Files:
	DeviceKit-power-010-continue-to-poll-when-guessing.patch 
Log Message:
* Mon Aug 03 2009 Richard Hughes <richard at hughsie.com> - 010-4
- Continue to poll when we guessed a status value, and only stop when the
  kernel says definitively that we are fully charged.


DeviceKit-power-010-continue-to-poll-when-guessing.patch:
 dkp-device-supply.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE DeviceKit-power-010-continue-to-poll-when-guessing.patch ---
commit 91c1718f6367f9855847611a62365a65d0557d59
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Aug 3 15:32:59 2009 +0100

    Only disable the polling if the kernel tells us we're fully charged, not if we guessed it

diff --git a/src/dkp-device-supply.c b/src/dkp-device-supply.c
index aed8bda..e6905bd 100644
--- a/src/dkp-device-supply.c
+++ b/src/dkp-device-supply.c
@@ -50,6 +50,7 @@ struct DkpDeviceSupplyPrivate
 	gdouble			 energy_old;
 	GTimeVal		 energy_old_timespec;
 	guint			 unknown_retries;
+	gboolean		 enable_poll;
 };
 
 static void	dkp_device_supply_class_init	(DkpDeviceSupplyClass	*klass);
@@ -468,6 +469,10 @@ dkp_device_supply_refresh_battery (DkpDeviceSupply *supply)
 		state = DKP_DEVICE_STATE_UNKNOWN;
 	}
 
+	/* only disable the polling if the kernel tells us we're fully charged,
+	   not if we've guessed the state to be fully charged */
+	supply->priv->enable_poll = (state != DKP_DEVICE_STATE_FULLY_CHARGED);
+
 	/* reset unknown counter */
 	if (state != DKP_DEVICE_STATE_UNKNOWN) {
 		egg_debug ("resetting unknown timeout after %i retries", supply->priv->unknown_retries);
@@ -672,8 +677,8 @@ dkp_device_supply_setup_poll (DkpDevice *device)
 
 	g_object_get (device, "state", &state, NULL);
 
-	/* if it's fully charged, don't poll at all */
-	if (state == DKP_DEVICE_STATE_FULLY_CHARGED)
+	/* don't setup the poll only if we're sure */
+	if (!supply->priv->enable_poll)
 		goto out;
 
 	/* if it's unknown, poll faster than we would normally */
@@ -743,6 +748,7 @@ dkp_device_supply_init (DkpDeviceSupply *supply)
 	supply->priv = DKP_DEVICE_SUPPLY_GET_PRIVATE (supply);
 	supply->priv->unknown_retries = 0;
 	supply->priv->poll_timer_id = 0;
+	supply->priv->enable_poll = TRUE;
 }
 
 /**


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- DeviceKit-power.spec	2 Aug 2009 08:11:54 -0000	1.22
+++ DeviceKit-power.spec	3 Aug 2009 14:44:36 -0000	1.23
@@ -9,7 +9,7 @@ Summary: Power Management Service
 Name: DeviceKit-power
 Version: 010
 #Release: 0.4.%{?alphatag}git%{?dist}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/
@@ -17,6 +17,9 @@ URL: http://cgit.freedesktop.org/DeviceK
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# upstream, 91c1718f6367f9855847611a62365a65d0557d59
+Patch1: DeviceKit-power-010-continue-to-poll-when-guessing.patch
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -51,6 +54,7 @@ Headers and libraries for DeviceKit-powe
 
 %prep
 %setup -q
+%patch1 -p1 -b .poll-when-guessing
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
@@ -109,8 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes <richard at hughsie.com> - 010-4
+- Continue to poll when we guessed a status value, and only stop when the
+  kernel says definitively that we are fully charged.
+
 * Sun Aug 02 2009 Richard Hughes <richard at hughsie.com> - 010-3
-- Put the development include files in the devel packagem not the main package.
+- Put the development include files in the devel package not the main package.
 - Fixes #515104
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 010-2



From rhughes at fedoraproject.org  Mon Aug  3 15:16:10 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 15:16:10 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.94,1.95
Message-ID: <20090803151610.29D5411C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	gnome-packagekit.spec 
Log Message:
* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-2
- Move the gpk-log and gpk-repo menu shortcuts to the gnome-packagekit-extra
  subpackage to reduce menu polution on the live cd.



Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gnome-packagekit.spec	3 Aug 2009 12:33:33 -0000	1.94
+++ gnome-packagekit.spec	3 Aug 2009 15:16:08 -0000	1.95
@@ -16,7 +16,7 @@ Summary:   Session applications to manag
 Name:      gnome-packagekit
 Version:   2.27.5
 #Release:   0.1.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -207,8 +207,6 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-install-file.desktop
 %{_datadir}/applications/gpk-prefs.desktop
 %{_datadir}/applications/gpk-install-catalog.desktop
-%{_datadir}/applications/gpk-log.desktop
-%{_datadir}/applications/gpk-repo.desktop
 %{_datadir}/applications/gpk-update-viewer.desktop
 
 %files extra
@@ -219,8 +217,14 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/gnome-packagekit/gpk-service-pack.ui
 %{_datadir}/gnome-packagekit/gpk-backend-status.ui
 %{_datadir}/applications/gpk-service-pack.desktop
+%{_datadir}/applications/gpk-repo.desktop
+%{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-2
+- Move the gpk-log and gpk-repo menu shortcuts to the gnome-packagekit-extra
+  subpackage to reduce menu polution on the live cd.
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-1
 - New upstream version
 - Port all the code to using PolicyKit1 rather than PolicyKit



From akurtakov at fedoraproject.org  Mon Aug  3 15:29:57 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon,  3 Aug 2009 15:29:57 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.ini, NONE,
	1.1 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.8,
	1.9 sources, 1.74, 1.75 eclipse.spec, 1.644, 1.645 .cvsignore,
	1.58, 1.59 eclipse-mv-Platform.sh, 1.4, 1.5
Message-ID: <20090803152957.144C411C02C6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch sources 
	eclipse.spec .cvsignore eclipse-mv-Platform.sh 
Added Files:
	eclipse.ini 
Log Message:
Swith to eclipse-build for building.


--- NEW FILE eclipse.ini ---
-startup
plugins/org.eclipse.equinox.launcher_1.0.200.v20090520.jar
--launcher.library
plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.200.v20090520
-showsplash
org.eclipse.platform
--launcher.XXMaxPermSize
256m
-vmargs
-Xms40m
-Xmx512m
-XX:MaxPermSize=128m
-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins

eclipse-add-ppc64-sparc64-s390-s390x-2.patch:
 feature.xml |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch	22 Apr 2009 08:18:29 -0000	1.8
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch	3 Aug 2009 15:29:56 -0000	1.9
@@ -1,7 +1,7 @@
 diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rcp/feature.xml
 --- ./features/org.eclipse.rcp/feature.xml.arches	2008-10-03 09:05:02.000000000 -0400
 +++ ./features/org.eclipse.rcp/feature.xml	2008-10-03 09:06:45.000000000 -0400
-@@ -229,6 +229,50 @@
+@@ -229,6 +229,20 @@
           unpack="false"/>
  
     <plugin
@@ -15,56 +15,10 @@ diff -up ./features/org.eclipse.rcp/feat
 +         fragment="true"
 +         unpack="false"/>
 +
-+   <plugin
-+         id="org.eclipse.swt.gtk.linux.sparc"
-+         os="linux"
-+         ws="gtk"
-+         arch="sparc"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
 +
-+   <plugin
-+         id="org.eclipse.swt.gtk.linux.sparc64"
-+         os="linux"
-+         ws="gtk"
-+         arch="sparc64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
 +
-+   <plugin
-+         id="org.eclipse.swt.gtk.linux.alpha"
-+         os="linux"
-+         ws="gtk"
-+         arch="alpha"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
 +
 +   <plugin
           id="org.eclipse.swt.gtk.solaris.sparc"
           os="solaris"
           ws="gtk"
-diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.orig	2009-04-17 16:05:51.000000000 +0200
-+++ ./features/org.eclipse.rcp.source/feature.xml	2009-04-17 16:07:57.000000000 +0200
-@@ -49,7 +49,11 @@
- 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3541a" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3541a" os="linux" arch="x86" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.5.0.HEAD" os="linux" arch="ia64" ws="gtk"  unpack="false"/>
--	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3541a" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.5.0.v3539" os="linux" arch="ppc64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.5.0.v3539" os="linux" arch="sparc" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.5.0.v3539" os="linux" arch="sparc64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.5.0.v3539" os="linux" arch="alpha" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3541a" os="qnx" arch="x86" ws="photon"  unpack="false"/>
- 	<plugin id="org.eclipse.rcp.source" version="3.4.0.v20080507"     unpack="false"/>
- 	<plugin id="org.eclipse.core.contenttype.source" version="3.4.0.v20090302"     unpack="false"/>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	20 May 2009 19:43:48 -0000	1.74
+++ sources	3 Aug 2009 15:29:56 -0000	1.75
@@ -2,3 +2,7 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 3e031f11b0de3f15b00233deec2b19f3  eclipse-3.4.2-testframework.tar.bz2
 1c3bb4e384cbc5f4e2b7275238a010f7  eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
+67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
+047b352b07b04f7f8e96afb81e69862c  eclipse-build-generatedScripts.tar.bz2
+5f22063a596f9b5aa6295d0df20d8c62  eclipse-build-R0_0_2_1.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -p -r1.644 -r1.645
--- eclipse.spec	24 Jul 2009 20:50:32 -0000	1.644
+++ eclipse.spec	3 Aug 2009 15:29:56 -0000	1.645
@@ -10,9 +10,10 @@ Epoch:  1
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
-%define swtver          3.5.0.v3541a
+%define swtver          3.5.0.v3550
 %define initialize      1
 
+
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
 %define eclipse_arch    x86
@@ -29,12 +30,14 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.9%{?dist}
+Release:        0.3.25%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        http://download.eclipse.org/eclipse/downloads/drops/I20090416-1053/eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+Source0:        eclipse-build-R0_0_2_1.tar.gz
+Source1:        eclipse-I20090611-1540-fetched-src.tar.bz2
 Source2:        %{name}.desktop
+Source3:        eclipse-build-generatedScripts.tar.bz2
 #Source3:        eclipse.in
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
@@ -71,8 +74,9 @@ Source28:       %{name}-mv-Platform.sh
 #   org.eclipse.ant.optional.junit
 # tar cjf %{name}-%{version}-testframework.tar.bz2 \
 #   %{name}-%{version}-testframework
-# (generated 2008-10-03)
-Source30:       %{name}-3.4.2-testframework.tar.bz2
+# (generated 2009-07-23)
+Source30:       %{name}-%{version}-testframework.tar.bz2
+Source31: eclipse.ini
 
 # Build swttools.jar before generation on 64-bit platforms.
 # Build SWT native libraries
@@ -135,8 +139,6 @@ Patch42:        %{name}-tests-libraryXml
 Patch43:		%{name}-osgi-classpath.patch
 Patch44:		%{name}-fix-javahome64.patch
 
-# TODO fix build.xml generation
-Patch46:        %{name}-platform_build.patch
 # TODO fix customBuildCallback
 Patch47:        %{name}-jdt_launch-customBuild.patch
 
@@ -148,10 +150,6 @@ Patch47:        %{name}-jdt_launch-custo
 # be replaced with the former when libxul.pc is fixed.
 # https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
 Patch48:        %{name}-swt-buildagainstxulrunner.patch
-# Work with changed interface in XULRunner 1.9.1
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=130611
-Patch49:        %{name}-swt-xulrunner191.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -176,6 +174,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
+BuildRequires:  xulrunner-devel-unstable
 
 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
@@ -293,13 +292,18 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -c
+%setup -q -n eclipse-build-R0_0_2_1
+cp %{SOURCE1} .
+cp %{SOURCE3} .
+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
 
-sed --in-place "s/java5.home/java.home/" build.xml
-sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
+#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
+#%patch4 -p0
+#%patch32 -p0
 
 # liblocalfile fixes
 sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -339,17 +343,6 @@ pushd plugins/org.eclipse.pde.build
 sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
 popd
 
-pushd features/org.eclipse.platform
-# FIXME:  fixed in 3.4.1
-# Move this file around due a bug in the metadata generator/parser that
-# can't work with the compiler exclude
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=238240
-cp -p gtk/eclipse.ini{,.orig}
-%patch29
-mv gtk/eclipse.ini{,.patched}
-mv gtk/eclipse.ini{.orig,}
-popd
-
 # TODO check whether it is needed
 #%patch36
 # TODO rebase
@@ -389,20 +382,14 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
-                                                      plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF \
-                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/META-INF/MANIFEST.MF \
-                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/build.xml \
-                                                      assemble.org.eclipse.sdk.linux.gtk.s390x.xml \
-						      features/org.eclipse.rcp/build.xml \
-						      features/org.eclipse.rcp.source/build.xml
-mv plugins/org.eclipse.swt.gtk.linux.s390.source_{3.5.0.HEAD,%{swtver}}
-mv plugins/org.eclipse.swt.gtk.linux.s390x.source_{3.5.0.HEAD,%{swtver}}
-mv plugins/org.eclipse.swt.gtk.linux.ia64.source_{3.5.0.HEAD,%{swtver}}
+                                                      plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF 
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
+%ifarch ppc64
 %patch24 -p1
 %patch28
-%patch30
+%endif
+#%patch30
 %patch31 -p1
 %patch38
 
@@ -416,22 +403,27 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\
   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
+  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
+  \*.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/%{_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
 
 %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
@@ -439,7 +431,7 @@ IFS='
 '
   # Fragments for these arches
   rm -rf plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
-  mv plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_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
@@ -450,7 +442,7 @@ IFS='
     done
   popd
   rm -rf plugins/org.eclipse.core.filesystem.linux.%{_arch}
-  mv plugins/org.eclipse.core.filesystem.linux.{ppc,%{_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
@@ -461,7 +453,7 @@ IFS='
     done
   popd
   rm -rf plugins/org.eclipse.swt.gtk.linux.%{_arch}
-  mv plugins/org.eclipse.swt.gtk.linux.{ppc,%{_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
@@ -472,19 +464,9 @@ IFS='
     done
   popd
   IFS=$OLDIFS
-
+  
 %endif
 
-# Don't build for non-linux,gtk,%%{_arch} targets
-pushd features
-for f in */build.xml; do
-    for platform in win32 macosx carbon cocoa hpux solaris aix qnx motif; do
-      sed -i "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
-      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Ivf\-]\+,//g" $f
-    done
-done
-popd
-
 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" " ")
@@ -502,9 +484,9 @@ done
 popd
 
 # Symlinks
-rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090308.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090308.jar
+#rm plugins/org.sat4j*
+#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
 
 ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -560,9 +542,9 @@ rm plugins/com.jcraft.jsch_*.jar
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
 
 # link to the icu4j stuff
-ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-rm plugins/com.ibm.icu_*.jar
-ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
+#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+#rm plugins/com.ibm.icu_*.jar
+#ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -609,11 +591,18 @@ ln -s %{_datadir}/eclipse/plugins/org.ap
    plugins/org.apache.jasper_$JASPERVERSION
 
 # link to servlet-api
-SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
-  sed 's/javax.servlet_//')
-rm plugins/javax.servlet_*
+SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.4 | \
+  sed 's/javax.servlet_2.4//')
+rm plugins/javax.servlet_2.4*
 ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
-  plugins/javax.servlet_$SERVLETAPIVERSION
+  plugins/javax.servlet_2.4$SERVLETAPIVERSION
+
+SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.5 | \
+  sed 's/javax.servlet_2.5//')
+rm plugins/javax.servlet_2.5*
+ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
+  plugins/javax.servlet_2.5$SERVLETAPIVERSION
+  
 #
 # link to jsp-api
 JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
@@ -626,8 +615,7 @@ ln -s %{_javadir}/tomcat5-jsp-2.0-api.ja
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
 rm plugins/org.eclipse.swt/extra_jars/exceptions.jar \
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
-   plugins/org.eclipse.osgi/osgi/osgi.core.jar \
-   plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
+   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.
@@ -664,7 +652,7 @@ tar jxf %{SOURCE20}
 tar jxf %{SOURCE30}
 # TODO regenerate testframework once 3.5 is out
 #pushd %{name}-%{version}-testframework
-pushd %{name}-3.4.2-testframework
+pushd %{name}-%{version}-testframework
 %patch41
 pushd org.eclipse.test
 %patch42
@@ -672,59 +660,32 @@ popd
 sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
 popd
 
-# TODO rediff patch if needed
 %patch43
 %patch44
-%patch46
 %patch47
 
-pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-%patch48 -p3
-popd
-pushd plugins/org.eclipse.swt
-# TODO remove when it appears in the official build
-#%patch49
-popd
+#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+#%patch48 -p3
+#popd
 
 sed -i -e 's|org.eclipse.ecf;bundle-version="1.2.0",|org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)",|' \
 	-e 's|org.eclipse.ecf.filetransfer;bundle-version="2.0.0",|org.eclipse.ecf.filetransfer;bundle-version="[3.0.0,4.0.0)",|' \
 	plugins/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
 
+popd
 
 %build
 ORIGCLASSPATH=$CLASSPATH
-
-# Bootstrapping:
-# 1. Build ecj with javac
-ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
-
-# 2. Use this ecj to rebuild itself
-export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
-ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml
-
-mkdir -p tmp/eclipse/plugins
-cp plugins/org.eclipse.ecf* tmp/eclipse/plugins
-cp plugins/org.apache.commons.codec* tmp/eclipse/plugins
-cp plugins/org.apache.commons.httpclient* tmp/eclipse/plugins
-# Build the rest of Eclipse
-export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
 export JAVA_HOME=%{java_home}
-ant \
-  -Dnobootstrap=true \
-  -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-  -Dlibsconfig=true \
-  -DJavaSE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \
-  -DcompilerArg="-encoding ISO-8859-1 -nowarn"
+./build.sh
 
 # Build the FileInitializer application
-SDK=$(cd eclipse && pwd)
+SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
 mkdir -p home
 homedir=$(cd home && pwd)
 LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-cp plugins/org.eclipse.ecf* $SDK/plugins
-cp plugins/org.apache.commons.codec* $SDK/plugins
-cp plugins/org.apache.commons.httpclient* $SDK/plugins
+pushd build/eclipse-I20090611-1540-fetched-src
 pushd equinox-incubator
 mkdir -p build
  
@@ -752,6 +713,7 @@ java -cp $SDK/plugins/org.eclipse.equino
 popd
 popd
 
+#
 # Build the ECF filetransfer plugins
 # TODO reenable with correct ecf
 #pushd org.eclipse.ecf
@@ -771,40 +733,40 @@ popd
 #popd
 
 # Build the test framework
-pushd %{name}-3.4.2-testframework
-mkdir -p build
+#pushd %{name}-%{version}-testframework
+#mkdir -p build
 
 # The qualifier is what is in upstream's release:
 # http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-test-framework-3.4.zip
-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.test                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -DforceContextQualifier=v20080507 \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-popd
+#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.test                   \
+#     -DsourceDirectory=$(pwd)                          \
+#     -DbaseLocation=$SDK \
+#     -DforceContextQualifier=v20080507 \
+#     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
+#     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
+#popd
 
 #TODO verify this is the correct place
-pushd %{name}-3.4.2-testframework
-unzip build/rpmBuild/org.eclipse.test.zip
-# These are already in the SDK
-rm eclipse/epl-v10.html eclipse/notice.html
-rm -rf eclipse/plugins/org.junit*
-rm build/rpmBuild/org.eclipse.test.zip
-zip -r build/rpmBuild/org.eclipse.test.zip eclipse
+#pushd %{name}-%{version}-testframework
+#unzip build/rpmBuild/org.eclipse.test.zip
+## These are already in the SDK
+#rm eclipse/epl-v10.html eclipse/notice.html
+#rm -rf eclipse/plugins/org.junit*
+#rm build/rpmBuild/org.eclipse.test.zip
+#zip -r build/rpmBuild/org.eclipse.test.zip eclipse
+#popd
 popd
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
-SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+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_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
 # Some directories we need
@@ -826,12 +788,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
 # Explode the resulting SDK tarball
-tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
-
-cp plugins/org.eclipse.ecf* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-cp plugins/org.apache.commons.codec* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-cp plugins/org.apache.commons.httpclient* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-
+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} \
@@ -841,14 +799,14 @@ cp plugins/org.apache.commons.httpclient
 #  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 # Test framework
-unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  %{name}-3.4.2-testframework/build/rpmBuild/org.eclipse.test.zip
-mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
+#unzip -d $RPM_BUILD_ROOT%{_libdir} \
+#  %{name}-%{version}-testframework/build/rpmBuild/org.eclipse.test.zip
+#mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
 # Install the file initializer app
-cp -p equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
+cp -p  build/eclipse-I20090611-1540-fetched-src/equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
   $sdkDir/plugins
 
 installDir=$sdkDir-Platform
@@ -911,59 +869,18 @@ for plugin in org.eclipse.jdt \
 done
 popd
 
-# Generate metadata for JDT
-java \
--cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-org.eclipse.core.launcher.Main \
--application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
--metadataRepository file:$jdtMetadata \
--artifactRepository file:$jdtMetadata \
--source $jdtDir \
--root "Eclipse JDT" \
--rootVersion %{version} \
--flavor tooling \
--append \
--artifactRepositoryName "Eclipse JDT" \
--metadataRepositoryName "Eclipse JDT"
-
-# SDK
-sdkMetadata=$sdkDir/metadata-SDK
-
-# Generate metadata for SDK
-java \
--cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-org.eclipse.core.launcher.Main \
--application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
--metadataRepository file:$sdkMetadata \
--artifactRepository file:$sdkMetadata \
--source $sdkDir \
--root "Eclipse SDK" \
--rootVersion %{version} \
--flavor tooling \
--publishArtifacts \
--append \
--artifactRepositoryName "Eclipse SDK" \
--metadataRepositoryName "Eclipse SDK"
-
-# Director config.ini
-mv $installDir/configuration/config.ini{,.bak}
-cp -p %{SOURCE22} $installDir/configuration/config.ini
-
 # Debugging?  Add -debug and -consolelog
 # Provision with director
 java \
--Declipse.p2.data.area=file://$provisionDir/p2 \
+-Declipse.p2.data.area=file:$provisionDir/p2 \
 -Declipse.p2.MD5Check=false \
 -cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
 org.eclipse.core.launcher.Main \
 -application \
-org.eclipse.equinox.p2.director.app.application \
+org.eclipse.equinox.p2.director \
 -debug -consolelog \
 -flavor tooling \
 -installIU "Eclipse Platform" \
--version %{version} \
 -p2.os linux \
 -p2.ws gtk \
 -p2.arch %{eclipse_arch} \
@@ -986,14 +903,11 @@ dropins=$provisionDir/dropins
 mkdir -p $dropins/jdt $dropins/sdk
 mv $jdtDir/features $dropins/jdt
 mv $jdtDir/plugins $dropins/jdt
-#mv $jdtMetadata/content.xml $dropins/jdt
-#mv $jdtMetadata/artifacts.xml $dropins/jdt
 
 mv $sdkDir/features $dropins/sdk
 mv $sdkDir/plugins $dropins/sdk
-#mv $sdkMetadata/content.xml $dropins/sdk
-#mv $sdkMetadata/artifacts.xml $dropins/sdk
 rm -rf $metadataDir $jdtDir $sdkDir $installDir
+
 mv $provisionDir $sdkDir
 
 # Fix paths in p2 data
@@ -1006,16 +920,17 @@ pushd $profileDir
   sed -i "s|$provisionDir|%{_libdir}/%{name}|g" \
     PlatformProfile.profile/*
   sed -i "s|$RPM_BUILD_ROOT||g" PlatformProfile.profile/*
+  sed -i "s|eclipse-Platform|eclipse|g" PlatformProfile.profile/*
 popd
 
+sed --in-place "s|SDKProfile|PlatformProfile|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+
 %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
 cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir
 %endif
 
-cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \
-  $sdkDir/eclipse.ini
-# We have /usr/share/eclipse/dropins in eclipse.ini
-sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
+
 
 # Add a compatibility symlink to startup.jar
 pushd $sdkDir
@@ -1027,11 +942,6 @@ popd
 rm -r $sdkDir/configuration/org.eclipse.update
 
 %if %{initialize}
-#Find better way to fix this
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1044,10 +954,12 @@ pushd $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins  $RPM_BUILD_ROOT/dropins
 mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
 libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
-java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
+java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \
      -cp $libdir_path/startup.jar \
      org.eclipse.core.launcher.Main \
      -debug -consolelog \
+     -metadataRepository file:$metadataDir \
+-artifactRepository file:$metadataDir \
      -application org.eclipse.equinox.initializer.configInitializer \
      -fileInitializer %{SOURCE19}
 popd
@@ -1066,7 +978,6 @@ popd
 # Remove the unnecessary configuration data
 rm -r $sdkDir/configuration/org.eclipse.core.runtime
 rm -r $sdkDir/configuration/org.eclipse.equinox.app
-#rm -r $sdkDir/configuration/.settings
 rm -rf $sdkDir/configuration/*.log
 dataDirs=$(find $sdkDir/configuration \
   -type d -name data)
@@ -1101,6 +1012,11 @@ done
 popd
 %endif
 
+cp -p %{SOURCE31} \
+  $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|" \
@@ -1126,7 +1042,7 @@ echo "path:%{_datadir}" > \
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
 
 # Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-I20090611-1540-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
@@ -1153,6 +1069,8 @@ install -p -D -m0755 %{SOURCE17} $RPM_BU
 sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
   $RPM_BUILD_ROOT%{_bindir}/efj
 
+rm -rf $installDir
+
 # A sanity check.
 desktop-file-validate %{SOURCE2}
 
@@ -1183,6 +1101,11 @@ for p in $(ls -d dropins/sdk/plugins/*);
 done
 popd
 
+sed --in-place "s|$RPM_BUILD_ROOT%{_libdir}/eclipse-Platform/p2/|%{_libdir}/eclipse/p2/|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s|file\\\:%{_libdir}/eclipse/p2/|@config.dir/../p2/|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+
 # Install the PDE Build wrapper script.
 install -p -D -m0755 %{SOURCE21} \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
@@ -1193,9 +1116,9 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVER
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090308.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090308.jar
+#rm plugins/org.sat4j*
+#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
 
 ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -1250,8 +1173,8 @@ rm plugins/com.jcraft.jsch_$JSCHVERSION
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
 
 # link to the icu4j stuff
-ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-rm plugins/com.ibm.icu_*.jar
+#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+#rm plugins/com.ibm.icu_*.jar
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -1376,7 +1299,7 @@ fi
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
-#%{_libdir}/%{name}/plugins/com.ibm.icu_*
+%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -1413,8 +1336,9 @@ fi
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/%{name}
 %config %{_libdir}/%{name}/eclipse.ini
-%{_libdir}/%{name}/.eclipseproduct
+#%{_libdir}/%{name}/.eclipseproduct
 %{_libdir}/%{name}/configuration/config.ini
+%{_libdir}/%{name}/about_files
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
@@ -1565,6 +1489,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Aug 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.25
+- Swith to eclipse-build for building.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.0-0.3.9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	20 May 2009 19:43:47 -0000	1.58
+++ .cvsignore	3 Aug 2009 15:29:56 -0000	1.59
@@ -8,3 +8,7 @@ eclipse-sourceBuild-srcIncluded-3.4.2.zi
 eclipse-3.4.2-testframework.tar.bz2
 eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
 eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+eclipse-I20090611-1540-fetched-src.tar.bz2
+eclipse-3.5.0-testframework.tar.bz2
+eclipse-build-generatedScripts.tar.bz2
+eclipse-build-R0_0_2_1.tar.gz


Index: eclipse-mv-Platform.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-mv-Platform.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-mv-Platform.sh	2 Apr 2009 08:12:57 -0000	1.4
+++ eclipse-mv-Platform.sh	3 Aug 2009 15:29:56 -0000	1.5
@@ -6,7 +6,6 @@ mkdir -p features plugins
 mv $baseDir/about* .
 mv $baseDir/configuration/ .
 mv $baseDir/eclipse{,.ini} .
-mv $baseDir/.eclipseproduct .
 mv $baseDir/epl-v10.html .
 mv $baseDir/notice.html .
 mv $baseDir/readme/ .
@@ -19,8 +18,6 @@ mv $baseDir/plugins/org.eclipse.team.cvs
 mv $baseDir/plugins/org.eclipse.team.cvs.ssh2_* plugins
 mv $baseDir/plugins/org.eclipse.team.cvs.ui_* plugins
 mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features
-mv $baseDir/features/org.fedoraproject* features
-mv $baseDir/plugins/org.fedoraproject* plugins
 mv $baseDir/plugins/*linux* plugins
 mv $baseDir/plugins/com.jcraft.jsch_* plugins
 mv $baseDir/plugins/org.eclipse.compare_* plugins



From xhorak at fedoraproject.org  Mon Aug  3 15:43:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon,  3 Aug 2009 15:43:10 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird.spec,1.33,1.34
Message-ID: <20090803154310.6740611C02C6@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	sunbird.spec 
Log Message:
Rebuild against new Thunderbird


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sunbird.spec	27 Jul 2009 05:07:11 -0000	1.33
+++ sunbird.spec	3 Aug 2009 15:43:09 -0000	1.34
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.7.20090513hg%{?dist}
+Release:        0.8.20090513hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -74,7 +74,7 @@ Group:          Applications/Productivit
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
 Requires:       thunderbird >= 3.0-2.3.b3pre
-Requires:       thunderbird < 3.0-2.3.b4
+Requires:       thunderbird < 3.0-3.6.b4
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -299,6 +299,9 @@ fi
 
 
 %changelog
+* Mon Aug  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.7.20090513hg
+- Rebuild against new Thunderbird
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.7.20090513hg
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Aug  3 15:51:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 15:51:45 +0000 (UTC)
Subject: rpms/control-center/devel save-as.patch, NONE,
	1.1 control-center.spec, 1.462, 1.463
Message-ID: <20090803155145.0439411C02C6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17340

Modified Files:
	control-center.spec 
Added Files:
	save-as.patch 
Log Message:
Fix a lost mnemonic


save-as.patch:
 appearance.ui |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE save-as.patch ---
diff -up gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.save_as gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui
--- gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.save_as	2009-08-03 11:41:07.595008046 -0400
+++ gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui	2009-08-03 11:41:27.273986675 -0400
@@ -740,6 +740,7 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
+                        <property name="use-underline">True</property>
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                       </object>


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- control-center.spec	3 Aug 2009 03:44:54 -0000	1.462
+++ control-center.spec	3 Aug 2009 15:51:44 -0000	1.463
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -60,6 +60,9 @@ Patch45: mnemonic.patch
 # http://mail.gnome.org/archives/gnomecc-list/2009-July/msg00015.html
 Patch46: no-tweaks.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=590349
+Patch47: save-as.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -181,6 +184,7 @@ utilities.
 %patch33 -p1 -b .notification-theme
 %patch43 -p1 -b .fix-appearance-capplet
 %patch46 -p1 -b .no-tweaks
+%patch47 -p1 -b .save-as
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -362,6 +366,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-5
+- Fix a lost mnemonic
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-4
 - Drop unneeded direct deps
 



From ajax at fedoraproject.org  Mon Aug  3 15:55:46 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 15:55:46 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.30-intel-watermark-fix.patch, NONE,
	1.1 kernel.spec, 1.1683, 1.1684
Message-ID: <20090803155546.9E7EE11C02C6@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.30-intel-watermark-fix.patch 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
- (Attempt to) fix watermark setup on Intel 9xx parts.


linux-2.6.30-intel-watermark-fix.patch:
 intel_display.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.30-intel-watermark-fix.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx	2009-08-03 11:45:19.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-03 11:50:19.000000000 -0400
@@ -1676,14 +1676,14 @@ static struct intel_watermark_params igd
 	IGD_FIFO_LINE_SIZE
 };
 static struct intel_watermark_params i945_wm_info = {
-	I915_FIFO_LINE_SIZE,
+	I945_FIFO_SIZE,
 	I915_MAX_WM,
 	1,
 	0,
 	IGD_FIFO_LINE_SIZE
 };
 static struct intel_watermark_params i915_wm_info = {
-	I945_FIFO_SIZE,
+	I915_FIFO_SIZE,
 	I915_MAX_WM,
 	1,
 	0,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1683
retrieving revision 1.1684
diff -u -p -r1.1683 -r1.1684
--- kernel.spec	3 Aug 2009 13:25:54 -0000	1.1683
+++ kernel.spec	3 Aug 2009 15:55:46 -0000	1.1684
@@ -674,6 +674,7 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1820: drm-intel-gen3-fb-hack.patch
 Patch1821: drm-page-flip.patch
 Patch1822: drm-intel-pm.patch
+Patch1823: linux-2.6.30-intel-watermark-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1283,6 +1284,7 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-page-flip.patch
 ApplyPatch drm-intel-pm.patch
+ApplyPatch linux-2.6.30-intel-watermark-fix.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -1943,6 +1945,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
+- (Attempt to) fix watermark setup on Intel 9xx parts.
+
 * Mon Aug 03 2009 Jarod Wilson <jarod at redhat.com>
 - make usbhid driver ignore all recent SoundGraph iMON devices, so the
   lirc_imon driver can grab them instead
@@ -2807,3 +2812,4 @@ fi
 # rpm-change-log-uses-utc: t
 # End:
 ###
+



From mclasen at fedoraproject.org  Mon Aug  3 16:08:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 16:08:45 +0000 (UTC)
Subject: rpms/poppler/devel .cvsignore, 1.39, 1.40 poppler.spec, 1.97,
	1.98 sources, 1.43, 1.44
Message-ID: <20090803160845.B08E911C02C6@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore poppler.spec sources 
Log Message:
0.11.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	24 Jun 2009 01:48:30 -0000	1.39
+++ .cvsignore	3 Aug 2009 16:08:45 -0000	1.40
@@ -1 +1 @@
-poppler-0.11.1.tar.gz
+poppler-0.11.2.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- poppler.spec	26 Jul 2009 19:11:10 -0000	1.97
+++ poppler.spec	3 Aug 2009 16:08:45 -0000	1.98
@@ -1,8 +1,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.11.1
-Release: 3%{?dist}
+Version: 0.11.2
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -206,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.11.2-1
+- Update to 0.11.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	24 Jun 2009 01:48:30 -0000	1.43
+++ sources	3 Aug 2009 16:08:45 -0000	1.44
@@ -1 +1 @@
-2c6aadf4c3c2d21da71239fa924db77d  poppler-0.11.1.tar.gz
+40dde7c6ff7ae4fe61752fdcef077e52  poppler-0.11.2.tar.gz



From mlichvar at fedoraproject.org  Mon Aug  3 16:15:14 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon,  3 Aug 2009 16:15:14 +0000 (UTC)
Subject: rpms/slang/devel .cvsignore, 1.14, 1.15 slang.spec, 1.55,
	1.56 sources, 1.14, 1.15
Message-ID: <20090803161514.E7AB211C02C6@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	.cvsignore slang.spec sources 
Log Message:
- update to 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 Sep 2008 13:59:40 -0000	1.14
+++ .cvsignore	3 Aug 2009 16:15:14 -0000	1.15
@@ -1 +1 @@
-slang-2.1.4.tar.bz2
+slang-2.2.0.tar.bz2


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- slang.spec	27 Jul 2009 04:26:06 -0000	1.55
+++ slang.spec	3 Aug 2009 16:15:14 -0000	1.56
@@ -1,17 +1,17 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.1.4
-Release: 4%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
-Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
+Source: ftp://space.mit.edu/pub/davis/slang/v2.2/%{name}-%{version}.tar.bz2
 # fix file permissions, library symlink, parallel build, remove RPATH
 Patch1: slang-2.1.4-makefile.patch
 # don't use internal glibc symbol
 Patch2: slang-nointerlibc2.patch
 URL: http://www.jedsoft.org/slang/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libpng-devel oniguruma-devel pcre-devel
+BuildRequires: libpng-devel oniguruma-devel pcre-devel zlib-devel
 
 %description
 S-Lang is an interpreted language and a programming library.  The
@@ -68,8 +68,8 @@ head -n -1800 < changes.txt > changes.tx
 %build
 %configure \
 	--includedir=%{_includedir}/slang \
-	--with-{pcre,onig,png}lib=%{_libdir} \
-	--with-{pcre,onig,png}inc=%{_includedir} \
+	--with-{pcre,onig,png,z}lib=%{_libdir} \
+	--with-{pcre,onig,png,z}inc=%{_includedir} \
 ;
 
 make %{?_smp_mflags} install_doc_dir=%{_docdir}/%{name}-%{version}
@@ -112,6 +112,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Aug 03 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.0-1
+- update to 2.2.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Sep 2008 13:59:40 -0000	1.14
+++ sources	3 Aug 2009 16:15:14 -0000	1.15
@@ -1 +1 @@
-1299d5d3317e2aa7e2d75c8ce889474c  slang-2.1.4.tar.bz2
+2593b390c6db81b840f6b48b0e768fa0  slang-2.2.0.tar.bz2



From rdieter at fedoraproject.org  Mon Aug  3 16:15:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 16:15:52 +0000 (UTC)
Subject: rpms/poppler-data/devel import.log, NONE, 1.1 poppler-data.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803161552.E963811C02C6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22756/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log poppler-data.spec 
Log Message:
import



--- NEW FILE import.log ---
poppler-data-0_2_1-1_fc11:HEAD:poppler-data-0.2.1-1.fc11.src.rpm:1249316128


--- NEW FILE poppler-data.spec ---

Summary: Encoding files 
Name: poppler-data
Version: 0.2.1
Release: 1%{?dist}
License: Redistributable, no modification permitted
Group: Development/Libraries
URL:     http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-data-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

## first version to not include bundled poppler-data
#Conflicts: poppler < 0.11.0-5

%description
This package consists of encoding files for poppler.  When installed,
the encoding files enables poppler to correctly render CJK and Cyrillic 
properly.


%prep
%setup -q

%build
# intentionally left blank

%install
rm -rf $RPM_BUILD_ROOT
make install  DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_datadir}/poppler/


%changelog
* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.1-1
- first try at separate poppler-data



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Jul 2009 22:58:43 -0000	1.1
+++ .cvsignore	3 Aug 2009 16:15:52 -0000	1.2
@@ -0,0 +1 @@
+poppler-data-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Jul 2009 22:58:43 -0000	1.1
+++ sources	3 Aug 2009 16:15:52 -0000	1.2
@@ -0,0 +1 @@
+bca78b8786746c7b48b324283992d658  poppler-data-0.2.1.tar.gz



From epienbro at fedoraproject.org  Mon Aug  3 16:16:25 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon,  3 Aug 2009 16:16:25 +0000 (UTC)
Subject: rpms/par2cmdline/devel par2-tbb-disable-concurrent-support.patch,
	NONE, 1.1 par2-tbb-fortify-source-fix.patch, NONE,
	1.1 par2-tbb-packed.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 par2cmdline.spec, 1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20090803161625.0AED111C02C6@cvs1.fedora.phx.redhat.com>

Author: epienbro

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

Modified Files:
	.cvsignore par2cmdline.spec sources 
Added Files:
	par2-tbb-disable-concurrent-support.patch 
	par2-tbb-fortify-source-fix.patch par2-tbb-packed.patch 
Log Message:
* Mon Aug  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.4.tbb.20090203-1
- Updated to the par2_tbb fork of par2cmdline (revision 20090203)
  This fork is maintained at http://www.chuchusoft.com/par2_tbb/
- This adds support for PAR2 verifications and repairs using multiple CPU cores
- As Intel Threading Building Blocks (TBB) only works on x86 hardware, fall
  back to the old behaviour on other platforms (like PPC/PPC64)


par2-tbb-disable-concurrent-support.patch:
 par2cmdline.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE par2-tbb-disable-concurrent-support.patch ---
--- par2cmdline.h.orig	2009-07-31 18:33:00.825819583 +0200
+++ par2cmdline.h	2009-07-31 18:33:24.414821405 +0200
@@ -428,6 +428,7 @@
 #include <vector>
 #include <map>
 #include <algorithm>
+#include <memory>

 #include <ctype.h>
 #include <iostream>
@@ -449,9 +449,12 @@
 #endif
 #define offsetof(TYPE, MEMBER) ((size_t) ((char*)(&((TYPE *)1)->MEMBER) - (char*)1))
 
+/*
+Intel-tbb isn't operational yet on PPC/PPC64
 #define WANT_CONCURRENT                     1
 #define WANT_CONCURRENT_PAR2_FILE_OPENING   1
 #define WANT_CONCURRENT_SOURCE_VERIFICATION 1
+*/
 
 #if WANT_CONCURRENT
   #include "tbb/task_scheduler_init.h"

par2-tbb-fortify-source-fix.patch:
 diskfile.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE par2-tbb-fortify-source-fix.patch ---
--- diskfile.cpp.orig	2009-07-31 17:42:14.904127403 +0200
+++ diskfile.cpp	2009-07-31 17:42:23.006819616 +0200
@@ -655,7 +655,7 @@
     return filename;
 
   // Get the current directory
-  char curdir[1000];
+  char curdir[PATH_MAX];
   if (0 == getcwd(curdir, sizeof(curdir)))
   {
     return filename;

par2-tbb-packed.patch:
 letype.h |  101 +--------------------------------------------------------------
 md5.h    |   44 +++++++++------------------
 2 files changed, 19 insertions(+), 126 deletions(-)

--- NEW FILE par2-tbb-packed.patch ---
diff -ur par2cmdline-0.4-orig/letype.h par2cmdline-0.4/letype.h
--- par2cmdline-0.4-orig/letype.h	2003-05-26 20:01:17.000000000 +0200
+++ par2cmdline-0.4/letype.h	2006-05-09 10:47:29.000000000 +0200
@@ -28,44 +28,15 @@
 
 #else
 
-class leu16
+struct leu16
 {
-public:
-  leu16(void);
-
-  leu16(const leu16 &other);
-  leu16& operator=(const leu16 &other);
-
-  leu16(const u16 &other);
   leu16& operator=(const u16 &other);
 
   operator u16(void) const;
 
-protected:
   u16 value;
 };
 
-inline leu16::leu16(void)
-{
-}
-
-inline leu16::leu16(const leu16 &other)
-: value(other.value)
-{
-}
-
-inline leu16& leu16::operator =(const leu16 &other)
-{
-  value = other.value;
-  return *this;
-}
-
-inline leu16::leu16(const u16 &other)
-{
-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
-}
-
 inline leu16& leu16::operator=(const u16 &other)
 {
   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
@@ -81,46 +52,15 @@
 }
 
 
-class leu32
+struct leu32
 {
-public:
-  leu32(void);
-
-  leu32(const leu32 &other);
-  leu32& operator=(const leu32 &other);
-
-  leu32(const u32 &other);
   leu32& operator=(const u32 &other);
 
   operator u32(void) const;
 
-protected:
   u32 value;
 };
 
-inline leu32::leu32(void)
-{
-}
-
-inline leu32::leu32(const leu32 &other)
-: value(other.value)
-{
-}
-
-inline leu32& leu32::operator =(const leu32 &other)
-{
-  value = other.value;
-  return *this;
-}
-
-inline leu32::leu32(const u32 &other)
-{
-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
-  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
-  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
-}
-
 inline leu32& leu32::operator=(const u32 &other)
 {
   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
@@ -140,50 +80,15 @@
 }
 
 
-class leu64
+struct leu64
 {
-public:
-  leu64(void);
-
-  leu64(const leu64 &other);
-  leu64& operator=(const leu64 &other);
-
-  leu64(const u64 &other);
   leu64& operator=(const u64 &other);
 
   operator u64(void) const;
 
-protected:
   u64 value;
 };
 
-inline leu64::leu64(void)
-{
-}
-
-inline leu64::leu64(const leu64 &other)
-: value(other.value)
-{
-}
-
-inline leu64& leu64::operator =(const leu64 &other)
-{
-  value = other.value;
-  return *this;
-}
-
-inline leu64::leu64(const u64 &other)
-{
-  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
-  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
-  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
-  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
-  ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff);
-  ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff);
-  ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff);
-  ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff);
-}
-
 inline leu64& leu64::operator=(const u64 &other)
 {
   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
diff -ur par2cmdline-0.4-orig/md5.h par2cmdline-0.4/md5.h
--- par2cmdline-0.4-orig/md5.h	2003-08-02 01:41:04.000000000 +0200
+++ par2cmdline-0.4/md5.h	2006-05-09 10:47:29.000000000 +0200
@@ -20,6 +20,13 @@
 #ifndef __MD5_H__
 #define __MD5_H__
 
+#ifdef WIN32
+#pragma pack(push, 1)
+#define PACKED
+#else
+#define PACKED __attribute__ ((packed))
+#endif
+
 // This file defines the MD5Hash and MD5Context objects which are used
 // to compute and manipulate the MD5 Hash values for a block of data.
 
@@ -35,15 +42,11 @@
 
 // MD5 Hash value
 
-class MD5Hash
+struct MD5Hash;
+ostream& operator<<(ostream &s, const MD5Hash &hash);
+ 
+struct MD5Hash
 {
-public:
-  // removed this to stop GCC warnings about using the 'pack' attribute on
-  // non-POD members in classes such as PACKET_HEADER:
-
-  // Constructor does not initialise the value
-  //MD5Hash(void) {};
-
   // Comparison operators
   bool operator==(const MD5Hash &other) const;
   bool operator!=(const MD5Hash &other) const;
@@ -57,16 +60,8 @@
   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
   string print(void) const;
 
-  // removed these to stop GCC warnings about using the 'pack' attribute on
-  // non-POD members in classes such as PACKET_HEADER:
-
-  // Copy and assignment
-  //MD5Hash(const MD5Hash &other);
-  //MD5Hash& operator=(const MD5Hash &other);
-
-public:
   u8 hash[16]; // 16 byte MD5 Hash value
-};
+} PACKED;
 
 // Intermediate computation state
 
@@ -150,16 +145,9 @@
   return !other.operator<(*this);
 }
 
-/*inline MD5Hash::MD5Hash(const MD5Hash &other)
-{
-  memcpy(&hash, &other.hash, sizeof(hash));
-}
-
-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other)
-{
-  memcpy(&hash, &other.hash, sizeof(hash));
-
-  return *this;
-}*/
+#ifdef WIN32
+#pragma pack(pop)
+#endif
+#undef PACKED
 
 #endif // __MD5_H__


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2006 06:59:19 -0000	1.2
+++ .cvsignore	3 Aug 2009 16:16:24 -0000	1.3
@@ -1 +1 @@
-par2cmdline-0.4.tar.gz
+par2cmdline-0.4-tbb-20090203.tar.gz


Index: par2cmdline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/par2cmdline.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- par2cmdline.spec	25 Jul 2009 23:14:44 -0000	1.10
+++ par2cmdline.spec	3 Aug 2009 16:16:24 -0000	1.11
@@ -1,17 +1,24 @@
-Summary:    PAR 2.0 compatible file verification and repair tool
-Name:       par2cmdline
-Version:    0.4
-Release:    16%{?dist}
-License:    GPLv2+
-Group:      Applications/Archiving
-Source:     http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz
-Patch0:     par2cmdline-reedsolomon.cpp.patch
-Patch1:     par2cmdline-packed.patch
-Patch2:     par2cmdline-Makefile.am.patch
-URL:        http://parchive.sourceforge.net/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:  parchive <= 1.1.4
-Provides:   parchive = 1.1.4.0.par2.%{version}
+%global revision 20090203
+
+Summary:        PAR 2.0 compatible file verification and repair tool
+Name:           par2cmdline
+Version:        0.4.tbb.%{revision}
+Release:        1%{?dist}
+License:        GPLv2+
+Group:          Applications/Archiving
+Source:         http://www.chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-%{revision}.tar.gz
+Patch1:         par2-tbb-packed.patch
+Patch3:         par2-tbb-fortify-source-fix.patch
+Patch4:         par2-tbb-disable-concurrent-support.patch
+URL:            http://parchive.sourceforge.net/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes:      parchive <= 1.1.4
+Provides:       parchive = 1.1.4.0.par2.%{version}
+
+%ifarch %{ix86} x86_64
+BuildRequires:  tbb-devel
+%endif
+
 
 %description
 par2cmdline is a program for creating and using PAR2 files to detect damage
@@ -20,38 +27,65 @@ published in binary newsgroups on Usenet
 capability concepts of RAID-like systems to the posting and recovery of
 multi-part archives.
 
+
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n par2cmdline-0.4-tbb-%{revision}
 %patch1 -p1
-%patch2 -p1
+%patch3 -p0
+
+# Intel threading blocks is only available on x86 hardware
+%ifnarch %{ix86} x86_64
+    # This patch strips out the TBB-specific code
+    %patch4 -p0
+    
+    # Don't link against TBB, but against the rt library (for aio_read/aio_write)
+    sed -i s/-ltbb/-lrt/ Makefile.in
+%endif
 
 # fix end-of-lines of several files
 sed -i 's/\r//' AUTHORS PORTING README ROADMAP
 
+
 %build
 %configure
 make %{_smp_mflags}
 chmod 644 ChangeLog galois.h par1repairer.cpp par2repairer.cpp par2repairersourcefile.cpp par2repairersourcefile.h
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 ln -sf par2 $RPM_BUILD_ROOT/%{_bindir}/par
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %check
+chmod +x test[1-6] pretest posttest
 make check-TESTS
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README 
-%{_bindir}/*
+%{_bindir}/par	
+%{_bindir}/par2	
+%{_bindir}/par2create	
+%{_bindir}/par2repair	
+%{_bindir}/par2verify
+
 
 %changelog
+* Mon Aug  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.4.tbb.20090203-1
+- Updated to the par2_tbb fork of par2cmdline (revision 20090203)
+  This fork is maintained at http://www.chuchusoft.com/par2_tbb/
+- This adds support for PAR2 verifications and repairs using multiple CPU cores
+- As Intel Threading Building Blocks (TBB) only works on x86 hardware, fall
+  back to the old behaviour on other platforms (like PPC/PPC64)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2006 06:59:19 -0000	1.2
+++ sources	3 Aug 2009 16:16:24 -0000	1.3
@@ -1 +1 @@
-1551b63e57e3c232254dc62073b723a9  par2cmdline-0.4.tar.gz
+f32c83c524f55171e8d639d6bfe9a7d8  par2cmdline-0.4-tbb-20090203.tar.gz



From mclasen at fedoraproject.org  Mon Aug  3 16:18:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 16:18:30 +0000 (UTC)
Subject: rpms/poppler/devel poppler.spec,1.98,1.99
Message-ID: <20090803161830.E69E311C02C6@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	poppler.spec 
Log Message:
fix file lists



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- poppler.spec	3 Aug 2009 16:08:45 -0000	1.98
+++ poppler.spec	3 Aug 2009 16:18:30 -0000	1.99
@@ -33,6 +33,8 @@ Summary: Libraries and headers for poppl
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: gtk-doc
+
 %description devel
 You should install the poppler-devel package if you would like to
 compile applications based on poppler.
@@ -41,6 +43,7 @@ compile applications based on poppler.
 Summary: Glib wrapper for poppler
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+
 %description glib
 %{summary}.
 
@@ -49,6 +52,7 @@ Summary: Development files for glib wrap
 Group: Development/Libraries
 Requires: %{name}-glib = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
+
 %description glib-devel
 %{summary}.
 
@@ -56,6 +60,7 @@ Requires: %{name}-devel = %{version}-%{r
 Summary: Qt3 wrapper for poppler
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+
 %description qt
 %{summary}.
 
@@ -65,6 +70,7 @@ Group:   Development/Libraries
 Requires: %{name}-qt = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: qt3-devel
+
 %description qt-devel
 %{summary}.
 
@@ -72,6 +78,7 @@ Requires: qt3-devel
 Summary: Qt4 wrapper for poppler
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+
 %description qt4
 %{summary}.
 
@@ -81,6 +88,7 @@ Group:   Development/Libraries
 Requires: %{name}-qt4 = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: qt4-devel
+
 %description qt4-devel
 %{summary}.
 
@@ -168,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/poppler-splash.pc
 %{_libdir}/libpoppler.so
 %{_includedir}/poppler/
+%{_datadir}/gtk-doc/html/poppler
 
 %files glib
 %defattr(-,root,root,-)



From rdieter at fedoraproject.org  Mon Aug  3 16:18:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 16:18:21 +0000 (UTC)
Subject: rpms/poppler-data/devel poppler-data.spec,1.1,1.2
Message-ID: <20090803161821.4453E11C02C6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23391

Modified Files:
	poppler-data.spec 
Log Message:
spec cosmetics



Index: poppler-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler-data/devel/poppler-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- poppler-data.spec	3 Aug 2009 16:15:52 -0000	1.1
+++ poppler-data.spec	3 Aug 2009 16:18:21 -0000	1.2
@@ -1,13 +1,13 @@
 
 Summary: Encoding files 
-Name: poppler-data
+Name:    poppler-data
 Version: 0.2.1
 Release: 1%{?dist}
 License: Redistributable, no modification permitted
-Group: Development/Libraries
+Group:   Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-data-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
 ## first version to not include bundled poppler-data
@@ -43,4 +43,3 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.1-1
 - first try at separate poppler-data
-



From gerd at fedoraproject.org  Mon Aug  3 16:21:33 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Mon,  3 Aug 2009 16:21:33 +0000 (UTC)
Subject: rpms/parrot/F-11 parrot.spec,1.6,1.7
Message-ID: <20090803162133.83AEA11C02C6@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	parrot.spec 
Log Message:
subpackage parrot-tools changed


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- parrot.spec	3 Aug 2009 12:42:58 -0000	1.6
+++ parrot.spec	3 Aug 2009 16:21:33 -0000	1.7
@@ -57,11 +57,13 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl(Pod::Simple)
 Requires:       perl(File::Which) >= 0.05
+Requires:       perl(Parrot::OpLib::core)
 # It is necessary to have installed the package "perl-Perl-Critic" to install
 # the parrot-tools
 Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
 Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
 Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}
+Provides:       perl(Parrot::OpLib::core) = %{version}
 
 
 %description
@@ -213,18 +215,13 @@ for file in docs/book/draft/ch05_pge.pod
 done
 %{__rm} -f timestamp
 
-# These files *probably* aren't needed.
-rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-%ifnarch ppc
-%{?_without_fulltest: FULL=''}
-%{?!_without_tests: make ${FULL}test}
-%endif
+#%{?_without_fulltest: FULL=''}
+#%{?!_without_tests: make ${FULL}test}
 
 
 %clean
@@ -270,7 +267,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/src/parrot/*
 
 
-
 %changelog
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-7
 - include the necessary module Parrot::Oplib::core
@@ -298,6 +294,7 @@ rm -rf $RPM_BUILD_ROOT
 - define RPM_PAR_LIB_DIR added
 - add subpackage "tools"
 - exclude tools directory from main-package
+- added make html
 
 * Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
 - add tools
@@ -307,7 +304,6 @@ rm -rf $RPM_BUILD_ROOT
 - Changed i386 to ix86 per Christoph Wickert
 - Changed hard-coded path requirement to perl.
 
-
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0
 
@@ -316,16 +312,9 @@ rm -rf $RPM_BUILD_ROOT
 - added parrot_utils to devel
 - fixed Source0 url
 
-* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
-- added make html
-- make reallyinstall => make install
-
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
-- updated to 0.8.0
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 



From epienbro at fedoraproject.org  Mon Aug  3 16:23:18 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Mon,  3 Aug 2009 16:23:18 +0000 (UTC)
Subject: rpms/par2cmdline/devel par2cmdline.spec,1.11,1.12
Message-ID: <20090803162318.3104811C02C6@cvs1.fedora.phx.redhat.com>

Author: epienbro

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

Modified Files:
	par2cmdline.spec 
Log Message:
RPM doesn't like indenting..



Index: par2cmdline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/par2cmdline/devel/par2cmdline.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- par2cmdline.spec	3 Aug 2009 16:16:24 -0000	1.11
+++ par2cmdline.spec	3 Aug 2009 16:23:17 -0000	1.12
@@ -35,11 +35,11 @@ multi-part archives.
 
 # Intel threading blocks is only available on x86 hardware
 %ifnarch %{ix86} x86_64
-    # This patch strips out the TBB-specific code
-    %patch4 -p0
-    
-    # Don't link against TBB, but against the rt library (for aio_read/aio_write)
-    sed -i s/-ltbb/-lrt/ Makefile.in
+# This patch strips out the TBB-specific code
+%patch4 -p0
+
+# Don't link against TBB, but against the rt library (for aio_read/aio_write)
+sed -i s/-ltbb/-lrt/ Makefile.in
 %endif
 
 # fix end-of-lines of several files



From gerd at fedoraproject.org  Mon Aug  3 16:25:04 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Mon,  3 Aug 2009 16:25:04 +0000 (UTC)
Subject: rpms/parrot/F-11 parrot.spec,1.7,1.8
Message-ID: <20090803162504.1655D11C02C6@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	parrot.spec 
Log Message:
fixed bug



Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- parrot.spec	3 Aug 2009 16:21:33 -0000	1.7
+++ parrot.spec	3 Aug 2009 16:25:03 -0000	1.8
@@ -220,8 +220,10 @@ done
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-#%{?_without_fulltest: FULL=''}
-#%{?!_without_tests: make ${FULL}test}
+%ifnarch ppc
+%{?_without_fulltest: FULL=''}
+%{?!_without_tests: make ${FULL}test}
+%endif
 
 
 %clean



From rhughes at fedoraproject.org  Mon Aug  3 16:26:20 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  3 Aug 2009 16:26:20 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-11 .cvsignore, 1.60,
	1.61 gnome-power-manager.spec, 1.159, 1.160 sources, 1.60, 1.61
Message-ID: <20090803162620.D0F1011C02C6@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25295

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-1
- Update to 2.26.4
- Fixes #514275, #512962 and #514249



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	6 Jul 2009 11:12:17 -0000	1.60
+++ .cvsignore	3 Aug 2009 16:26:20 -0000	1.61
@@ -1 +1 @@
-gnome-power-manager-2.26.3.tar.gz
+gnome-power-manager-2.26.4.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- gnome-power-manager.spec	6 Jul 2009 11:12:18 -0000	1.159
+++ gnome-power-manager.spec	3 Aug 2009 16:26:20 -0000	1.160
@@ -3,7 +3,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.26.3
+Version: 2.26.4
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -162,6 +162,10 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-1
+- Update to 2.26.4
+- Fixes #514275, #512962 and #514249
+
 * Mon Jul 06 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.3-1
 - Update to 2.26.3
 - Fixes #500024


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	6 Jul 2009 11:12:18 -0000	1.60
+++ sources	3 Aug 2009 16:26:20 -0000	1.61
@@ -1 +1 @@
-e6275d592988948c0afa74fa0e35958d  gnome-power-manager-2.26.3.tar.gz
+a75073df28306cb7d265ea1d5426057d  gnome-power-manager-2.26.4.tar.gz



From itamarjp at fedoraproject.org  Mon Aug  3 16:26:00 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon,  3 Aug 2009 16:26:00 +0000 (UTC)
Subject: rpms/pyclutter/devel .cvsignore, 1.9, 1.10 import.log, 1.2,
	1.3 pyclutter.spec, 1.18, 1.19 sources, 1.11, 1.12
Message-ID: <20090803162600.E203B11C02C6@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	.cvsignore import.log pyclutter.spec sources 
Log Message:
- new version 0.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Jan 2009 14:16:28 -0000	1.9
+++ .cvsignore	3 Aug 2009 16:26:00 -0000	1.10
@@ -1 +1 @@
-pyclutter-0.8.2.tar.bz2
+pyclutter-0.9.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 Jan 2009 14:16:28 -0000	1.2
+++ import.log	3 Aug 2009 16:26:00 -0000	1.3
@@ -1,2 +1,3 @@
 pyclutter-0_8_0-1_fc9:HEAD:pyclutter-0.8.0-1.fc9.src.rpm:1224277238
 pyclutter-0_8_2-1_fc10:HEAD:pyclutter-0.8.2-1.fc10.src.rpm:1232719812
+pyclutter-0_9_2-1_fc12:HEAD:pyclutter-0.9.2-1.fc12.src.rpm:1249316728


Index: pyclutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/pyclutter.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- pyclutter.spec	26 Jul 2009 19:46:27 -0000	1.18
+++ pyclutter.spec	3 Aug 2009 16:26:00 -0000	1.19
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyclutter
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        Python modules that allow you to use the Clutter toolkit
 
 Group:          Development/Languages
@@ -13,8 +13,8 @@ Source0:        http://www.clutter-proje
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildArch:      
-BuildRequires:  pygtk2-devel gtk2-devel clutter-devel clutter-gst-devel clutter-gtk-devel 
-BuildRequires:  clutter-cairo-devel gstreamer-python-devel
+BuildRequires:  pygtk2-devel gtk2-devel clutter-devel clutter-gst-devel clutter-gtk-devel
+BuildRequires:  gstreamer-python-devel
 
 %description
 This archive contains the Python modules that allow you to use the
@@ -47,20 +47,6 @@ Clutter toolkit in Python programs.
 
 This package provides the binding for clutter-gst
 
-%package cairo
-Summary:        Python modules that allow you to use the Clutter-CAIRO toolkit
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-Requires:       clutter-cairo
-Requires:       pygobject2
-Requires:       pycairo
-
-%description cairo
-This archive contains the Python modules that allow you to use the
-Clutter toolkit in Python programs.
-
-This package provides the binding for clutter-cairo
-
 %package devel
 Summary:        Pyclutter development environment
 Group:          Development/Libraries
@@ -111,20 +97,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitearch}/cluttergst
 
-%files cairo
-%defattr(-,root,root,-)
-%{python_sitearch}/cluttercairo
-
-
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/pyclutter-0.8.pc
+%{_libdir}/pkgconfig/pyclutter-0.9.pc
 %dir %{_includedir}/%{name}-1.0/
 %dir %{_includedir}/%{name}-1.0/%{name}/
 %{_includedir}/%{name}-1.0/%{name}/%{name}.h
 
 
 %changelog
+* Mon Aug 03 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.9.2-1
+- new version 0.9.2
+- remove cairo subpackage
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 Jan 2009 14:16:28 -0000	1.11
+++ sources	3 Aug 2009 16:26:00 -0000	1.12
@@ -1 +1 @@
-2a57049c23337a40e8d39e7d7375a66c  pyclutter-0.8.2.tar.bz2
+8019c0b94bbb347b87026a96cdeb9485  pyclutter-0.9.2.tar.bz2



From karsten at fedoraproject.org  Mon Aug  3 16:31:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon,  3 Aug 2009 16:31:43 +0000 (UTC)
Subject: rpms/vim/devel vim72-rh514717.patch,NONE,1.1 vim.spec,1.238,1.239
Message-ID: <20090803163143.AE29911C02C6@cvs1.fedora.phx.redhat.com>

Author: karsten

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

Modified Files:
	vim.spec 
Added Files:
	vim72-rh514717.patch 
Log Message:
- add fix for glibc fortify segfault (#514717, Adam Tkac)

vim72-rh514717.patch:
 eval.c    |    3 +--
 structs.h |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE vim72-rh514717.patch ---
diff -up vim72/src/eval.c.rh514717 vim72/src/eval.c
--- vim72/src/eval.c.rh514717	2009-08-03 16:15:42.882375154 +0200
+++ vim72/src/eval.c	2009-08-03 16:34:14.863381780 +0200
@@ -286,13 +286,12 @@ typedef struct
 #define VV_RO		2	/* read-only */
 #define VV_RO_SBX	4	/* read-only in the sandbox */
 
-#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
+#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}
 
 static struct vimvar
 {
     char	*vv_name;	/* name of variable, without v: */
     dictitem_T	vv_di;		/* value and name for key */
-    char	vv_filler[16];	/* space for LONGEST name below!!! */
     char	vv_flags;	/* VV_COMPAT, VV_RO, VV_RO_SBX */
 } vimvars[VV_LEN] =
 {
diff -up vim72/src/structs.h.rh514717 vim72/src/structs.h
--- vim72/src/structs.h.rh514717	2009-08-03 16:33:35.274870950 +0200
+++ vim72/src/structs.h	2009-08-03 16:33:48.607436706 +0200
@@ -1095,7 +1095,7 @@ struct dictitem_S
 {
     typval_T	di_tv;		/* type and value of the variable */
     char_u	di_flags;	/* flags (only used for variable) */
-    char_u	di_key[10];	/* key (actually longer!) */
+    char_u	di_key[18];	/* key */
 };
 
 typedef struct dictitem_S dictitem_T;


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- vim.spec	31 Jul 2009 22:39:18 -0000	1.238
+++ vim.spec	3 Aug 2009 16:31:43 -0000	1.239
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -322,6 +322,7 @@ Patch3008: vim-7.1-lib64.patch
 Patch3009: vim-7.0-warning.patch
 Patch3010: vim-7.0-syncolor.patch
 Patch3011: vim-7.0-specedit.patch
+Patch3012: vim72-rh514717.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -707,6 +708,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
 %patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
+%patch3012 -p1
 
 cp -f %{SOURCE15} runtime/syntax/forth.vim
 cp -f %{SOURCE16} runtime/plugin/netrwPlugin.vim
@@ -1148,6 +1150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Aug 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-2
+- add fix for glibc fortify segfault (#514717, Adam Tkac)
+
 * Sat Aug 01 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-1
 - add 97 upstream patches to get to patchlevel 245
 



From s4504kr at fedoraproject.org  Mon Aug  3 16:38:44 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  3 Aug 2009 16:38:44 +0000 (UTC)
Subject: rpms/blender/devel blender-2.49.config, 1.4, 1.5 blender-repack.sh, 
	1.2, 1.3 blender.spec, 1.121, 1.122
Message-ID: <20090803163844.040B011C02C6@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	blender-2.49.config blender-repack.sh blender.spec 
Log Message:
Rebuild for python-2.6.2


Index: blender-2.49.config
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-2.49.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- blender-2.49.config	19 Jun 2009 13:20:36 -0000	1.4
+++ blender-2.49.config	3 Aug 2009 16:38:43 -0000	1.5
@@ -50,9 +50,9 @@ BF_GETTEXT_LIB = 'gettextlib qhull'
 BF_GETTEXT_LIBPATH = '@LIB@'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include/'
-BF_FTGL_LIB = 'extern_ftgl'
+BF_FTGL = '/usr'
+BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
+BF_FTGL_LIB = ['ftgl', '@LIB@']
 
 WITH_BF_GAMEENGINE='true'
 


Index: blender-repack.sh
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-repack.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blender-repack.sh	19 Jun 2009 13:54:39 -0000	1.2
+++ blender-repack.sh	3 Aug 2009 16:38:43 -0000	1.3
@@ -24,7 +24,7 @@ pushd extern
 #Removed because of ip
   rm -rf ffmpeg libmp3lame x264 xvidcore
 #Removed because we can expect to use system one
-  rm -rf fftw glew libopenjpeg ode qhull make verse
+#  rm -rf fftw glew libopenjpeg ode qhull make verse
 #Will have to be removed later: bFTGL
 popd
 rm -rf scons


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- blender.spec	24 Jul 2009 18:09:52 -0000	1.121
+++ blender.spec	3 Aug 2009 16:38:43 -0000	1.122
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -80,8 +80,6 @@ Requires:	  dejavu-fonts
 Provides:	  blender-fonts = %{version}-%{release}
 Obsoletes:	  blender-fonts <= 2.48a-9
 
-
-
 %description
 Blender is the essential software solution you need for 3D, from modeling,
 animation, rendering and post-production to interactive creation and playback.
@@ -110,6 +108,20 @@ Blender Game Engine.
 %patch100 -p1
 %patch101 -p1
 
+# binreloc is not a part of fedora
+rm -rf extern/bFTGL
+rm -rf extern/ffmpeg
+rm -rf extern/fftw
+rm -rf extern/glew
+rm -rf extern/libmp3lame
+rm -rf extern/libopenjpeg
+rm -rf extern/libredcode
+rm -rf extern/ode
+rm -rf extern/x264
+rm -rf extern/xvidcore
+rm -rf extern/qhull
+rm -rf extern/make
+rm -rf extern/verse
 
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -233,6 +245,9 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
+- Rebuild for python-2.6.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Mon Aug  3 16:40:36 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon,  3 Aug 2009 16:40:36 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends.spec,1.130,1.131
Message-ID: <20090803164036.248FC11C04D1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28879

Modified Files:
	sane-backends.spec 
Log Message:
remove ExcludeArch: s390 s390x



Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- sane-backends.spec	27 Jul 2009 03:48:00 -0000	1.130
+++ sane-backends.spec	3 Aug 2009 16:40:35 -0000	1.131
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 5%{?dist}
+Release: 6%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -28,7 +28,6 @@ BuildRequires: gettext
 BuildRequires: gphoto2-devel
 Requires: pam >= 0.78-2
 Requires: hal >= 0.4.0
-ExcludeArch: s390 s390x
 
 %description
 Scanner Access Now Easy (SANE) is a universal scanner interface.  The
@@ -158,6 +157,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-6
+- remove ExcludeArch: s390 s390x
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tbzatek at fedoraproject.org  Mon Aug  3 16:45:34 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  3 Aug 2009 16:45:34 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.192,1.193
Message-ID: <20090803164534.F3F4611C02C6@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29794

Modified Files:
	gnome-vfs2.spec 
Log Message:
* Mon Aug  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-5
- Fake POT-Creation-Date to prevent multilib issues (#514990)



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- gnome-vfs2.spec	25 Jul 2009 00:50:48 -0000	1.192
+++ gnome-vfs2.spec	3 Aug 2009 16:45:34 -0000	1.193
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -144,6 +144,9 @@ cd po
 grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
+PO_FAKE_DATE="2009-08-03 18:00+0200"   # fake this to be equal in every build
+PO_FAKE_DATE_EXPR='\(.*POT-Creation-Date: *\)\(.*\)\(\\n.*\)'
+sed --in-place "s/${PO_FAKE_DATE_EXPR}/\1${PO_FAKE_DATE}\3/" %{po_package}.pot
 for p in *.po; do
   msgmerge $p %{po_package}.pot > $p.out
   msgfmt -o `basename $p .po`.gmo $p.out
@@ -239,6 +242,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Aug  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-5
+- Fake POT-Creation-Date to prevent multilib issues (#514990)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From davej at fedoraproject.org  Mon Aug  3 16:48:20 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon,  3 Aug 2009 16:48:20 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc5-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.1106, 1.1107 kernel.spec, 1.1684,
	1.1685 linux-2.6.30-hush-rom-warning.patch, 1.1, 1.2 sources,
	1.1064, 1.1065 upstream, 1.978, 1.979
Message-ID: <20090803164820.8F36A11C0423@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel.spec linux-2.6.30-hush-rom-warning.patch 
	sources upstream 
Added Files:
	patch-2.6.31-rc5-git2.bz2.sign 
Log Message:
2.6.31-rc5-git2


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

iD8DBQBKdtH3yGugalF9Dw4RAiRrAJ4m9MKGonQeza4+wneXco/Y+PAFNACglOJw
+v9P/35ozWH2eXaSqweS1nc=
=soQn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -p -r1.1106 -r1.1107
--- .cvsignore	1 Aug 2009 03:45:35 -0000	1.1106
+++ .cvsignore	3 Aug 2009 16:48:20 -0000	1.1107
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc5.bz2
+patch-2.6.31-rc5-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1684
retrieving revision 1.1685
diff -u -p -r1.1684 -r1.1685
--- kernel.spec	3 Aug 2009 15:55:46 -0000	1.1684
+++ kernel.spec	3 Aug 2009 16:48:20 -0000	1.1685
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -111,7 +111,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1945,6 +1945,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Dave Jones <davej at redhat.com> 2.6.31-0.122.rc5.git2
+- 2.6.31-rc5-git2
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
 - (Attempt to) fix watermark setup on Intel 9xx parts.
 

linux-2.6.30-hush-rom-warning.patch:
 setup-res.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6.30-hush-rom-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.30-hush-rom-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.30-hush-rom-warning.patch	27 Jul 2009 22:03:29 -0000	1.1
+++ linux-2.6.30-hush-rom-warning.patch	3 Aug 2009 16:48:20 -0000	1.2
@@ -1,11 +1,20 @@
 diff -up linux-2.6.30.noarch/drivers/pci/setup-res.c.jx linux-2.6.30.noarch/drivers/pci/setup-res.c
 --- linux-2.6.30.noarch/drivers/pci/setup-res.c.jx	2009-07-27 17:56:13.000000000 -0400
 +++ linux-2.6.30.noarch/drivers/pci/setup-res.c	2009-07-27 17:58:25.000000000 -0400
-@@ -109,7 +109,13 @@ int pci_claim_resource(struct pci_dev *d
+@@ -101,6 +101,7 @@ int pci_claim_resource(struct pci_dev *d
+ 	struct resource *res = &dev->resource[resource];
+ 	struct resource *root;
+ 	int err;
++	const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
+ 
+ 	root = pci_find_parent_resource(dev, res);
+ 
+@@ -108,8 +109,13 @@ int pci_claim_resource(struct pci_dev *d
  	if (root != NULL)
- 		err = insert_resource(root, res);
+ 		err = request_resource(root, res);
  
 -	if (err) {
+-		const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
 +	if (err && resource == 6) {
 +		dev_info(&dev->dev, "BAR %d: %s of %s %pR\n",
 +			resource,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1064
retrieving revision 1.1065
diff -u -p -r1.1064 -r1.1065
--- sources	1 Aug 2009 03:45:36 -0000	1.1064
+++ sources	3 Aug 2009 16:48:20 -0000	1.1065
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2
+5c7a3da1d852b5db22228947440a0da9  patch-2.6.31-rc5-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -p -r1.978 -r1.979
--- upstream	1 Aug 2009 03:45:36 -0000	1.978
+++ upstream	3 Aug 2009 16:48:20 -0000	1.979
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc5.bz2
+patch-2.6.31-rc5-git2.bz2



From nphilipp at fedoraproject.org  Mon Aug  3 16:49:09 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon,  3 Aug 2009 16:49:09 +0000 (UTC)
Subject: rpms/sane-frontends/devel sane-frontends.spec,1.29,1.30
Message-ID: <20090803164909.8614911C02C6@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-frontends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30562

Modified Files:
	sane-frontends.spec 
Log Message:
remove ExcludeArch: s390 s390x



Index: sane-frontends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sane-frontends.spec	31 Jul 2009 14:31:01 -0000	1.29
+++ sane-frontends.spec	3 Aug 2009 16:49:09 -0000	1.30
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Graphical frontend to SANE
 URL: http://www.sane-project.org
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -14,7 +14,6 @@ Requires:  sane-backends
 Buildroot: %{_tmppath}/%{name}-root
 Obsoletes: sane <= 0:1.0.9
 Provides: sane = %{?epoch:%{epoch}:}%{version}-%{release}
-ExcludeArch: s390 s390x
 
 %description
 This packages includes the scanadf and xcam programs.
@@ -46,6 +45,9 @@ rm -R $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> 1.0.14-9
+- remove ExcludeArch: s390 s390x
+
 * Fri Jul 31 2009 Nils Philippsen <nils at redhat.com> 1.0.14-8
 - replace badcode with array-out-of-bounds patch
 - fix compilation with sane-backends-1.0.20



From nphilipp at fedoraproject.org  Mon Aug  3 16:50:05 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon,  3 Aug 2009 16:50:05 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.74,1.75
Message-ID: <20090803165005.62DE411C049D@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Log Message:
remove ExcludeArch: s390 s390x



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- xsane.spec	31 Jul 2009 12:26:46 -0000	1.74
+++ xsane.spec	3 Aug 2009 16:50:05 -0000	1.75
@@ -5,7 +5,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.997
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -24,7 +24,6 @@ BuildRequires: sane-backends-devel >= 1.
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
-ExcludeArch: s390 s390x
 
 %description
 XSane is an X based interface for the SANE (Scanner Access Now Easy)
@@ -121,6 +120,9 @@ fi
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> 0.997-2
+- remove ExcludeArch: s390 s390x
+
 * Fri Jul 31 2009 Nils Philippsen <nils at redhat.com> 0.997-1
 - version 0.997
 - drop obsolete sane-backends-1.0.20 patch



From nb at fedoraproject.org  Mon Aug  3 16:59:27 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Mon,  3 Aug 2009 16:59:27 +0000 (UTC)
Subject: rpms/znc/EL-5 znc.spec,1.5,1.6
Message-ID: <20090803165927.BA1A911C02C6@cvs1.fedora.phx.redhat.com>

Author: nb

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

Modified Files:
	znc.spec 
Log Message:
Bump release to fix failed push



Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- znc.spec	23 Jul 2009 18:12:47 -0000	1.5
+++ znc.spec	3 Aug 2009 16:59:27 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.074
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
@@ -65,6 +65,8 @@ modules.
 %{_includedir}/znc/
 
 %changelog
+* Mon Aug 3 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-2
+- Bump release to fix failed push
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3



From pkgdb at fedoraproject.org  Mon Aug  3 17:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 17:07:07 +0000
Subject: [pkgdb] php-layers-menu had acl change status
Message-ID: <20090803170707.B480210F890@bastion2.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on php-layers-menu (Fedora devel) to Obsolete for david

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-layers-menu



From pkgdb at fedoraproject.org  Mon Aug  3 17:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 17:07:09 +0000
Subject: [pkgdb] php-layers-menu had acl change status
Message-ID: <20090803170709.EEF4010F8A9@bastion2.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on php-layers-menu (Fedora 10) to Obsolete for david

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-layers-menu



From pkgdb at fedoraproject.org  Mon Aug  3 17:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 17:07:16 +0000
Subject: [pkgdb] php-layers-menu had acl change status
Message-ID: <20090803170716.5E58D10F8B0@bastion2.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on php-layers-menu (Fedora 11) to Obsolete for david

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-layers-menu



From pkgdb at fedoraproject.org  Mon Aug  3 17:07:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 17:07:17 +0000
Subject: [pkgdb] php-layers-menu had acl change status
Message-ID: <20090803170717.2DB1A10F8B5@bastion2.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on php-layers-menu (Fedora EPEL 5) to Obsolete for david

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-layers-menu



From rdieter at fedoraproject.org  Mon Aug  3 17:23:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 17:23:58 +0000 (UTC)
Subject: rpms/lyx/devel lyx.spec,1.97,1.98
Message-ID: <20090803172358.C1CA711C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	lyx.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
- add lyx-*-fonts subpkgs (#452357, #514549)
- -common (noarch) subpkg
- trim %changelog



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- lyx.spec	25 Jul 2009 11:33:53 -0000	1.97
+++ lyx.spec	3 Aug 2009 17:23:58 -0000	1.98
@@ -2,12 +2,24 @@
 %if 0%{?fedora} > 3
 %define _with_aiksaurus --with-aiksaurus
 %endif
+
+## lyx-fonts
+%global fontname lyx
+%global common_desc \
+A collection of Math symbol fonts.
+%if 0%{?fedora} > 8
+%define fontpackages 1
+BuildRequires: fontpackages-devel
+%else
+## FIXME!!
+%endif
+
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -42,6 +54,18 @@ Obsoletes: %{name}-qt < 1.5.0 
 Provides:  %{name}-qt = %{version}-%{release}
 Obsoletes: %{name}-xforms < 1.5.0 
 
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
 Requires(post): texlive
@@ -55,7 +79,6 @@ Requires(post): tetex-fonts
 Requires(postun): tetex-fonts
 Requires: tetex-dvips tetex-latex
 %endif
-Requires: mathml-fonts
 Requires: ghostscript
 ## Soft dependencies
 %if 0%{?fedora} > 3 && 0%{?fedora} < 9
@@ -63,9 +86,9 @@ Requires: ghostscript
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
 Requires(hint): tetex-IEEEtran
+%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
-%endif
 Requires(hint): xdg-utils
 
 %description
@@ -85,6 +108,149 @@ to the backends (like LaTeX) that are sp
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
+%package common
+Summary:  Common files of %{name} 
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description common 
+{summary}.
+
+%package -n %{fontname}-fonts-compat
+Summary: Lyx/MathML fonts compatibility package
+License: Copyright only and GPL+
+Obsoletes: mathml-fonts < 1.0-50
+Provides:  mathml-fonts = 1.0-50
+Provides: %{fontname}-fonts = %{version}-%{release}
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-fonts-compat
+This package only exists to help transition mathml-fonts users to the new
+package split. It will be removed after one distribution release cycle, please
+do not reference it or depend on it in any way.
+
+%package -n %{fontname}-fonts-common
+Summary: Common files of %{fontname}-fonts
+# The actual license says "The author of these fonts, Basil K. Malyshev, has
+# kindly granted permission to use and modify these fonts."
+# One of the font files (wasy10) is separately licensed GPL+.
+License: Copyright only and GPL+
+%{?fontpackages:Requires: fontpackages-filesystem}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{name}-fonts-common
+This package consists of files used by other %{fontname}-fonts packages.
+
+%package -n %{fontname}-cmex10-fonts
+Summary: Cmex10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmex10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmex10 cmex10.ttf}
+
+%package -n %{fontname}-cmmi10-fonts
+Summary: Cmmi10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmmi10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmmi10 cmmi10.ttf}
+
+%package -n %{fontname}-cmr10-fonts
+Summary: Cmr10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmr10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmr10 cmr10.ttf}
+
+%package -n %{fontname}-cmsy10-fonts
+Summary: Cmsy10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmsy10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmsy10 cmsy10.ttf}
+
+%package -n %{fontname}-esint10-fonts
+Summary: Esint10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-esint10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n esint10 esint10.ttf}
+
+%package -n %{fontname}-eufm10-fonts
+Summary: Eufm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-eufm10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n eufm10 eufm10.ttf}
+
+%package -n %{fontname}-msam10-fonts
+Summary: Msam10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-msam10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n msam10 msam10.ttf}
+
+%package -n %{fontname}-msbm10-fonts
+Summary: Msbm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-msbm10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n msbm10 msbm10.ttf}
+
+%package -n %{fontname}-wasy10-fonts
+Summary: Wasy10 fonts
+License: GPL+
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-wasy10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n wasy10 wasy10.ttf}
 
 
 %prep
@@ -137,7 +303,9 @@ touch %{buildroot}%{_datadir}/lyx/lyxrc.
 touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
 touch %{buildroot}%{_datadir}/lyx/doc/LaTeXConfig.lyx
 
-# unpackaged files
+# fonts
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
 rm -rf %{buildroot}%{_datadir}/lyx/fonts
 
 %find_lang %{name}
@@ -147,10 +315,10 @@ rm -rf %{buildroot}%{_datadir}/lyx/fonts
 make check
 
 
-%post
+%post common
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
-%postun
+%postun common
 if [ $1 -eq 0 ] ; then
   texhash >& /dev/null 
   update-desktop-database -q &> /dev/null
@@ -158,7 +326,7 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%posttrans
+%posttrans common
 texhash >& /dev/null
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -166,12 +334,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing,
 ##   and besides, we use xdg-open now -- Rex
-%triggerin -- latex2html,wv
+%triggerin common -- latex2html,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
 
-%triggerun -- latex2html,wv
+%triggerun common -- latex2html,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -181,10 +349,13 @@ fi
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc ANNOUNCE lib/CREDITS NEWS README
+%doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
 %{_mandir}/man1/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -195,8 +366,21 @@ rm -rf %{buildroot}
 %ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
 %{_datadir}/texmf/tex/latex/lyx/
 
+%files -n %{fontname}-fonts-compat
+# boo!
+
+%files -n %{fontname}-fonts-common
+%defattr(0644,root,root,0755)
+%doc lib/fonts/BaKoMaFontLicense.txt
+%doc lib/fonts/ReadmeBaKoMa4LyX.txt
+
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
+- add lyx-*-fonts subpkgs (#452357, #514549)
+- -common (noarch) subpkg
+- trim %%changelog
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -398,151 +582,3 @@ rm -rf %{buildroot}
 * Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-2
 - 1.4.0(final)
 - drop boost bits
-
-* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
-- 1.4.0rc
-- drop boost patch (for now)
-
-* Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
-- 1.4.0pre6
-- --disable-stdlib-debug --disable-assertions --disable-concept-checks
-- don't use --without-included-boost (for now)
-
-* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
-- gcc41 patch
-- document boost/gcc41 patches
-- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
-
-* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
-- updated boost patch
-- drop -fexceptions from %%optflags
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
-- --without-included-boost
-- BR: boost-devel
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
-- 1.4.0pre5
-
-* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
-- 1.4.0pre4
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
-- 1.4.0pre3
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
-- cleanup/fix snarfing of intermediate frontend builds.
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
-- BR: libXpm-devel
-
-* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
-- 1.3.7
-- -qt/-xforms: frontend pkgs (#178116)
-
-* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
-- %%post/%%postun: update-desktop-database
-
-* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
-- leave out kde-redhat bits in Fedora Extras build
-- define/use safer (esp for x86_64) QTDIR bits
-
-* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-3
-- touchup helpers script
-- fix for (sometimes missing) PSres.upr
-
-* Mon Aug 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-2
-- use triggers to configure/unconfigure helper (ps/pdf/html) apps
-
-* Sat Jul 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-1
-- 1.3.6
-
-* Mon May 23 2005 Rex Dieter <rexdieter[At]users.sf.net> 1.3.5-4
-- qt_immodule patch (lyx bug #1830)
-- update -helpers patch to look-for/use evince (rh bug #143992)
-- drop (not-strictly-required) Req's on helper apps
-  htmlview, gsview (rh bug #143992)
-- %%configure: --with-aiksaurus
-- %%configure: --enable-optimization="$$RPM_OPT_FLAGS"
-- %%configure: --disable-dependency-tracking
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
-- BR: pspell-devel -> aspell-devel
-- BR: tetex-* (helper detection, fonts)
-- -helpers patch: find/use htmlview, gsview, kdvi, ggv, kghostview
-- .desktop: GenericName: WYSIWYM document processor
-
-* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.5-0.fdr.1
-- 1.3.5
-
-* Fri Apr 30 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.6
-- BR: libtool
-
-* Fri Apr 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.5
-- Group: Applications/Publishing
-- BR: desktop-file-utils
-- Requires(post,postun): tetex
-
-* Sat Apr 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.4
-- .desktop: separate file
-- .desktop: drop 'Utility' category, add 'Qt'
-- .desktop: Name: lyx -> LyX
-- .desktop: Comment: lyx 1.3.4 -> WYSIWYM document processor
-- convert icon xpm -> png
-
-* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.3
-- dynamically determine version for qt dependency.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.2
-- add a few (mostly superfluous) BuildRequires to make fedora.us's
-  buildsystem happy.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.1
-- Allow building/use for any qt >= 3.1
-
-* Thu Feb 19 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.0
-- 1.3.4
-- Categories=Office
-
-* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
-- support MimeType(s): application/x-lyx;text/x-lyx
-
-* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
-- let rpm auto-require qt.
-- remove (optional) xforms support.
-- Requires: latex-xft-fonts
-
-* Mon Oct 06 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.1
-- 1.3.3
-- update macros for Fedora Core.
-
-* Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.3.2-0.fdr.0
-- 1.3.2
-- fedora-ize.
-
-* Tue Mar 25 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.1-1.0
-- 1.3.1 release.
-
-* Fri Feb 21 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-1.0
-- yank kmenu
-
-* Fri Feb 07 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-0.0
-- 1.3.0
-



From twaugh at fedoraproject.org  Mon Aug  3 17:27:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 17:27:32 +0000 (UTC)
Subject: rpms/ghostscript/devel .cvsignore, 1.28,
	1.29 ghostscript-gs-executable.patch, 1.1,
	1.2 ghostscript-jbig2dec-nullderef.patch, 1.1,
	1.2 ghostscript.spec, 1.192, 1.193 sources, 1.32,
	1.33 ghostscript-CVE-2009-0196.patch, 1.1,
	NONE ghostscript-CVE-2009-0583, 0584.patch, 1.2,
	NONE ghostscript-CVE-2009-0792.patch, 1.1,
	NONE ghostscript-bitcmyk.patch, 1.1, NONE
Message-ID: <20090803172733.01B8711C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

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:
* 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+)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	4 Feb 2009 13:32:50 -0000	1.28
+++ .cvsignore	3 Aug 2009 17:27:32 -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.xz

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/devel/ghostscript-gs-executable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghostscript-gs-executable.patch	10 Jun 2009 17:04:49 -0000	1.1
+++ ghostscript-gs-executable.patch	3 Aug 2009 17:27:32 -0000	1.2
@@ -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/devel/ghostscript-jbig2dec-nullderef.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghostscript-jbig2dec-nullderef.patch	4 Jun 2009 12:49:21 -0000	1.1
+++ ghostscript-jbig2dec-nullderef.patch	3 Aug 2009 17:27:32 -0000	1.2
@@ -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/devel/ghostscript.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- ghostscript.spec	3 Aug 2009 10:47:25 -0000	1.192
+++ ghostscript.spec	3 Aug 2009 17:27:32 -0000	1.193
@@ -1,18 +1,18 @@
-%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: 12%{?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
+Source0: ghostscript-%{gs_ver}.tar.xz
 Source2: CIDFnmap
 Source4: cidfmap
 
@@ -23,14 +23,11 @@ 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: xz
 BuildRequires: libjpeg-devel, libXt-devel
 BuildRequires: zlib-devel, libpng-devel, unzip, gtk2-devel
 BuildRequires: glib2-devel, gnutls-devel
@@ -112,24 +109,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() {
@@ -312,6 +296,16 @@ 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	4 Feb 2009 13:32:50 -0000	1.32
+++ sources	3 Aug 2009 17:27:32 -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
+fec96a1fb44b73a01ba1adda55744784  ghostscript-8.70.tar.xz


--- 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 twaugh at fedoraproject.org  Mon Aug  3 17:39:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  3 Aug 2009 17:39:56 +0000 (UTC)
Subject: rpms/ghostscript/F-11 .cvsignore, 1.28,
	1.29 ghostscript-gs-executable.patch, 1.1,
	1.2 ghostscript-jbig2dec-nullderef.patch, 1.1,
	1.2 ghostscript.spec, 1.192, 1.193 sources, 1.32,
	1.33 ghostscript-CVE-2009-0196.patch, 1.1,
	NONE ghostscript-CVE-2009-0583, 0584.patch, 1.2,
	NONE ghostscript-CVE-2009-0792.patch, 1.1,
	NONE ghostscript-bitcmyk.patch, 1.1, NONE
Message-ID: <20090803173956.05B7411C00E9@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

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:
* 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+)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	4 Feb 2009 13:32:50 -0000	1.28
+++ .cvsignore	3 Aug 2009 17:39:55 -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.xz

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-11/ghostscript-gs-executable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghostscript-gs-executable.patch	10 Jun 2009 17:02:28 -0000	1.1
+++ ghostscript-gs-executable.patch	3 Aug 2009 17:39:55 -0000	1.2
@@ -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-11/ghostscript-jbig2dec-nullderef.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghostscript-jbig2dec-nullderef.patch	4 Jun 2009 12:50:10 -0000	1.1
+++ ghostscript-jbig2dec-nullderef.patch	3 Aug 2009 17:39:55 -0000	1.2
@@ -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-11/ghostscript.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- ghostscript.spec	3 Aug 2009 10:34:17 -0000	1.192
+++ ghostscript.spec	3 Aug 2009 17:39:55 -0000	1.193
@@ -1,18 +1,18 @@
-%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: 12%{?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
+Source0: ghostscript-%{gs_ver}.tar.xz
 Source2: CIDFnmap
 Source4: cidfmap
 
@@ -23,14 +23,11 @@ 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: xz
 BuildRequires: libjpeg-devel, libXt-devel
 BuildRequires: zlib-devel, libpng-devel, unzip, gtk2-devel
 BuildRequires: glib2-devel, gnutls-devel
@@ -112,24 +109,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() {
@@ -312,6 +296,16 @@ 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	4 Feb 2009 13:32:50 -0000	1.32
+++ sources	3 Aug 2009 17:39:55 -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
+fec96a1fb44b73a01ba1adda55744784  ghostscript-8.70.tar.xz


--- 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 s4504kr at fedoraproject.org  Mon Aug  3 17:49:47 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  3 Aug 2009 17:49:47 +0000 (UTC)
Subject: rpms/blender/devel blender-2.49.config, 1.5, 1.6 blender.spec, 1.122,
	1.123
Message-ID: <20090803174947.71D9E11C00E9@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	blender-2.49.config blender.spec 
Log Message:
Revoke of using system FTGL


Index: blender-2.49.config
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-2.49.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- blender-2.49.config	3 Aug 2009 16:38:43 -0000	1.5
+++ blender-2.49.config	3 Aug 2009 17:49:47 -0000	1.6
@@ -50,9 +50,9 @@ BF_GETTEXT_LIB = 'gettextlib qhull'
 BF_GETTEXT_LIBPATH = '@LIB@'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = '/usr'
-BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
-BF_FTGL_LIB = ['ftgl', '@LIB@']
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE='true'
 


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- blender.spec	3 Aug 2009 16:38:43 -0000	1.122
+++ blender.spec	3 Aug 2009 17:49:47 -0000	1.123
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49a
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -109,7 +109,6 @@ Blender Game Engine.
 %patch101 -p1
 
 # binreloc is not a part of fedora
-rm -rf extern/bFTGL
 rm -rf extern/ffmpeg
 rm -rf extern/fftw
 rm -rf extern/glew
@@ -245,6 +244,9 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-5
+- Revoke using of system FTGL library
+
 * Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
 - Rebuild for python-2.6.2
 



From wtogami at fedoraproject.org  Mon Aug  3 17:51:30 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon,  3 Aug 2009 17:51:30 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.8,1.9
Message-ID: <20090803175130.ABA8411C00E9@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	dracut.spec 
Log Message:
require which and file



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dracut.spec	26 Jul 2009 07:57:21 -0000	1.8
+++ dracut.spec	3 Aug 2009 17:51:30 -0000	1.9
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.7
-Release: 2%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -28,7 +28,7 @@ Requires: coreutils
 Requires: findutils
 Requires: binutils
 Requires: grep
-Requires: mktemp
+Requires: which
 Requires: mount
 Requires: bash
 Requires: /bin/sh 
@@ -39,6 +39,7 @@ Requires: e2fsprogs >= 1.38-12, libselin
 Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
 Requires: cryptsetup-luks
 Requires: bridge-utils
+Requires: file
 %ifnarch s390 s390x
 Requires: dmraid
 Requires: kbd
@@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Aug 03 2009 Warren Togami <wtogami at redhat.com> 0.7-3
+- require which and file
+
 * Sun Jul 26 2009 Harald Hoyer <harald at redhat.com> 0.7-1
 - build without /sbin/switch_root
 



From rdieter at fedoraproject.org  Mon Aug  3 18:01:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 18:01:46 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.0-microblog_post.patch, 1.1,
	1.2 kdeplasma-addons.spec, 1.51, 1.52
Message-ID: <20090803180146.BE7D611C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15754

Modified Files:
	kdeplasma-addons-4.3.0-microblog_post.patch 
	kdeplasma-addons.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- fix microblog post crasher (kdebug#202364)


kdeplasma-addons-4.3.0-microblog_post.patch:
 microblog.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: kdeplasma-addons-4.3.0-microblog_post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons-4.3.0-microblog_post.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdeplasma-addons-4.3.0-microblog_post.patch	3 Aug 2009 01:04:32 -0000	1.1
+++ kdeplasma-addons-4.3.0-microblog_post.patch	3 Aug 2009 18:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp.microblog_post kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp
 --- kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp.microblog_post	2009-07-08 09:51:15.000000000 -0500
-+++ kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp	2009-08-02 20:01:43.134679555 -0500
++++ kdeplasma-addons-4.3.0/applets/microblog/microblog.cpp	2009-08-03 12:49:21.944604204 -0500
 @@ -751,6 +751,7 @@ void MicroBlog::updateStatus()
      KConfigGroup cg = m_service->operationDescription("update");
      cg.writeEntry("password", m_password);
@@ -9,3 +9,25 @@ diff -up kdeplasma-addons-4.3.0/applets/
      //m_statusUpdates.insert(m_service->startOperationCall(cg), status);
      connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(updateCompleted(Plasma::ServiceJob*)));
      connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(serviceFinished(Plasma::ServiceJob*)));
+@@ -809,7 +810,9 @@ void MicroBlog::downloadHistory()
+     m_engine->connectSource(query, this, m_historyRefresh * 60 * 1000);
+     m_engine->connectSource("Error:" + query, this);
+ 
+-    delete m_service;
++    if ( m_service ) {
++         m_service->deleteLater();
++    }
+     m_service = m_engine->serviceForSource(m_curTimeline);
+     connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(serviceFinished(Plasma::ServiceJob*)));
+     KConfigGroup cg = m_service->operationDescription("auth");
+@@ -822,7 +825,9 @@ void MicroBlog::downloadHistory()
+     m_engine->connectSource(m_imageQuery, this);
+     m_engine->connectSource(profileQuery, this, m_historyRefresh * 60 * 1000);
+ 
+-    delete m_profileService;
++    if ( m_profileService ) {
++         m_profileService->deleteLater();
++    }
+     m_profileService = m_engine->serviceForSource(profileQuery);
+     connect(m_profileService, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(serviceFinished(Plasma::ServiceJob*)));
+     KConfigGroup profileConf = m_profileService->operationDescription("auth");


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- kdeplasma-addons.spec	3 Aug 2009 13:15:11 -0000	1.51
+++ kdeplasma-addons.spec	3 Aug 2009 18:01:46 -0000	1.52
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,6 +16,7 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # http://websvn.kde.org/?view=rev&revision=1004203
+# http://websvn.kde.org/?view=rev&revision=1006404
 Patch100: kdeplasma-addons-4.3.0-microblog_post.patch
 
 BuildRequires:  boost-devel
@@ -160,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- fix microblog post crasher (kdebug#202364)
+
 * Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
 - -libs subpkg to sanitize multilib
 



From zachcarter at fedoraproject.org  Mon Aug  3 18:13:14 2009
From: zachcarter at fedoraproject.org (Zach Carter)
Date: Mon,  3 Aug 2009 18:13:14 +0000 (UTC)
Subject: rpms/schroot/F-10 schroot.spec,1.1,1.2
Message-ID: <20090803181314.BE57B11C00E9@cvs1.fedora.phx.redhat.com>

Author: zachcarter

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

Modified Files:
	schroot.spec 
Log Message:
Add required /etc/schroot/chroot.d directory.



Index: schroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroot/F-10/schroot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- schroot.spec	30 Jul 2009 16:08:59 -0000	1.1
+++ schroot.spec	3 Aug 2009 18:13:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name: schroot
 Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Execute commands in a chroot environment
 Group: Development/Tools
 License: GPLv3+
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %{_bindir}/schroot
 %dir %{_sysconfdir}/schroot
+%dir %{_sysconfdir}/schroot/chroot.d
 %config(noreplace) %{_sysconfdir}/schroot/schroot.conf
 %config(noreplace) %{_sysconfdir}/schroot/mount-defaults
 %config(noreplace) %{_sysconfdir}/schroot/copyfiles-defaults
@@ -121,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dchroot.1.gz
 
 %changelog
+* Mon Aug  3 2009 Zach Carter <z.carter at f5.com> - 1.2.3-3
+- re-add /etc/schroot/chroot.d directory
+
+%changelog
 * Tue Jul 14 2009 Zach Carter <z.carter at f5.com> - 1.2.3-2
 - fix "file listed twice" warnings
 



From zachcarter at fedoraproject.org  Mon Aug  3 18:13:14 2009
From: zachcarter at fedoraproject.org (Zach Carter)
Date: Mon,  3 Aug 2009 18:13:14 +0000 (UTC)
Subject: rpms/schroot/F-11 schroot.spec,1.1,1.2
Message-ID: <20090803181314.D687911C0382@cvs1.fedora.phx.redhat.com>

Author: zachcarter

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

Modified Files:
	schroot.spec 
Log Message:
Add required /etc/schroot/chroot.d directory.



Index: schroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroot/F-11/schroot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- schroot.spec	30 Jul 2009 16:08:18 -0000	1.1
+++ schroot.spec	3 Aug 2009 18:13:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name: schroot
 Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Execute commands in a chroot environment
 Group: Development/Tools
 License: GPLv3+
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %{_bindir}/schroot
 %dir %{_sysconfdir}/schroot
+%dir %{_sysconfdir}/schroot/chroot.d
 %config(noreplace) %{_sysconfdir}/schroot/schroot.conf
 %config(noreplace) %{_sysconfdir}/schroot/mount-defaults
 %config(noreplace) %{_sysconfdir}/schroot/copyfiles-defaults
@@ -121,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dchroot.1.gz
 
 %changelog
+* Mon Aug  3 2009 Zach Carter <z.carter at f5.com> - 1.2.3-3
+- re-add /etc/schroot/chroot.d directory
+
+%changelog
 * Tue Jul 14 2009 Zach Carter <z.carter at f5.com> - 1.2.3-2
 - fix "file listed twice" warnings
 



From zachcarter at fedoraproject.org  Mon Aug  3 18:13:15 2009
From: zachcarter at fedoraproject.org (Zach Carter)
Date: Mon,  3 Aug 2009 18:13:15 +0000 (UTC)
Subject: rpms/schroot/devel schroot.spec,1.1,1.2
Message-ID: <20090803181315.0DC9511C00E9@cvs1.fedora.phx.redhat.com>

Author: zachcarter

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

Modified Files:
	schroot.spec 
Log Message:
Add required /etc/schroot/chroot.d directory.



Index: schroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroot/devel/schroot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- schroot.spec	30 Jul 2009 16:01:01 -0000	1.1
+++ schroot.spec	3 Aug 2009 18:13:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name: schroot
 Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Execute commands in a chroot environment
 Group: Development/Tools
 License: GPLv3+
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir %{_bindir}/schroot
 %dir %{_sysconfdir}/schroot
+%dir %{_sysconfdir}/schroot/chroot.d
 %config(noreplace) %{_sysconfdir}/schroot/schroot.conf
 %config(noreplace) %{_sysconfdir}/schroot/mount-defaults
 %config(noreplace) %{_sysconfdir}/schroot/copyfiles-defaults
@@ -121,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dchroot.1.gz
 
 %changelog
+* Mon Aug  3 2009 Zach Carter <z.carter at f5.com> - 1.2.3-3
+- re-add /etc/schroot/chroot.d directory
+
+%changelog
 * Tue Jul 14 2009 Zach Carter <z.carter at f5.com> - 1.2.3-2
 - fix "file listed twice" warnings
 



From lucilanga at fedoraproject.org  Mon Aug  3 18:16:00 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  3 Aug 2009 18:16:00 +0000 (UTC)
Subject: rpms/xwota/F-11 xwota-0.4-overflow.patch, NONE, 1.1 xwota.spec, 1.2,
	1.3
Message-ID: <20090803181600.146CF11C00E9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	xwota.spec 
Added Files:
	xwota-0.4-overflow.patch 
Log Message:
* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-7
- fix buffer overflow (#510918)

xwota-0.4-overflow.patch:
 stuff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xwota-0.4-overflow.patch ---
--- xwota-0.4/src/stuff.c	2006-07-28 19:00:10.000000000 +0300
+++ xwota-0.4-mod/src/stuff.c	2009-08-03 21:01:00.000000000 +0300
@@ -330,7 +330,7 @@
 	  GtkTreePath *path;
 	  GtkWidget *spot_list;
 	
-char eor[5];
+char eor[6];
 char *p_eor;	  
 gchar *call,*freq,*country,*state,*grid,*county,*lat,*longitude,*status,*comments,*program,*f1,*f2,*d_ate,*t_ime; 
 char datetime[50],latlong[50],status_comment[30],display_country[50];


Index: xwota.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xwota/F-11/xwota.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xwota.spec	26 Feb 2009 12:17:24 -0000	1.2
+++ xwota.spec	3 Aug 2009 18:15:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           xwota
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Who's On the Air Database interface
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@ URL:            http://people.fabaris.it
 Source0:        http://people.fabaris.it/iz0ete/%{name}/%{name}-%{version}.tar.gz
 Source1:        xwota.desktop
 Source2:        xwota.png
+Patch0:		xwota-0.4-overflow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig
@@ -32,6 +33,7 @@ http://www.wotadb.org.
 
 %prep
 %setup -q
+%patch0 -p1 -b .overflow
 
 
 %build
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-7
+- fix buffer overflow (#510918)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Mon Aug  3 18:23:32 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  3 Aug 2009 18:23:32 +0000 (UTC)
Subject: rpms/xwota/devel xwota-0.4-overflow.patch, NONE, 1.1 xwota.spec, 1.3,
	1.4
Message-ID: <20090803182332.2B00211C00E9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	xwota.spec 
Added Files:
	xwota-0.4-overflow.patch 
Log Message:
* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-8
- fix buffer overflow (#510918)

xwota-0.4-overflow.patch:
 stuff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xwota-0.4-overflow.patch ---
--- xwota-0.4/src/stuff.c	2006-07-28 19:00:10.000000000 +0300
+++ xwota-0.4-mod/src/stuff.c	2009-08-03 21:01:00.000000000 +0300
@@ -330,7 +330,7 @@
 	  GtkTreePath *path;
 	  GtkWidget *spot_list;
 	
-char eor[5];
+char eor[6];
 char *p_eor;	  
 gchar *call,*freq,*country,*state,*grid,*county,*lat,*longitude,*status,*comments,*program,*f1,*f2,*d_ate,*t_ime; 
 char datetime[50],latlong[50],status_comment[30],display_country[50];


Index: xwota.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xwota/devel/xwota.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xwota.spec	27 Jul 2009 08:48:52 -0000	1.3
+++ xwota.spec	3 Aug 2009 18:23:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xwota
 Version:        0.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Who's On the Air Database interface
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@ URL:            http://people.fabaris.it
 Source0:        http://people.fabaris.it/iz0ete/%{name}/%{name}-%{version}.tar.gz
 Source1:        xwota.desktop
 Source2:        xwota.png
+Patch0:		xwota-0.4-overflow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig
@@ -32,6 +33,7 @@ http://www.wotadb.org.
 
 %prep
 %setup -q
+%patch0 -p1 -b .overflow
 
 
 %build
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-8
+- fix buffer overflow (#510918)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Aug  3 18:23:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 18:23:54 +0000 (UTC)
Subject: rpms/libgail-gnome/devel libgail-gnome.spec,1.32,1.33
Message-ID: <20090803182354.BE73411C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	libgail-gnome.spec 
Log Message:
drop unneeded direct deps



Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libgail-gnome.spec	25 Jul 2009 05:39:26 -0000	1.32
+++ libgail-gnome.spec	3 Aug 2009 18:23:54 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
 Version: 1.20.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://developer.gnome.org/projects/gap
 Source0: http://download.gnome.org/sources/libgail-gnome/1.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
@@ -53,6 +53,10 @@ the GNOME portions of the GAIL libraries
 
 %configure
 
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
 make ##%{?_smp_mflags}
 
 %install
@@ -78,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 1.20.1-4
+- Drop unneeded direct deps
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Mon Aug  3 18:24:04 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:24:04 +0000 (UTC)
Subject: rpms/kernel/devel drm-intel-next.patch, 1.7, 1.8 drm-intel-pm.patch,
	1.3, 1.4 kernel.spec, 1.1685,
	1.1686 drm-intel-gen3-fb-hack.patch, 1.2,
	NONE linux-2.6.30-intel-watermark-fix.patch, 1.1, NONE
Message-ID: <20090803182404.AA8C611C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	drm-intel-pm.patch kernel.spec 
Added Files:
	drm-intel-next.patch 
Removed Files:
	drm-intel-gen3-fb-hack.patch 
	linux-2.6.30-intel-watermark-fix.patch 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
- Update intel drm from anholt's tree
- Rebase drm-intel-pm.patch to match
- Drop gen3 fb hack, merged
- Drop previous watermark setup change


drm-intel-next.patch:
 i915_drv.h         |    3 
 i915_gem_debugfs.c |    2 
 i915_irq.c         |  232 +++++++++++-----
 i915_reg.h         |   45 +++
 intel_bios.c       |   40 ++
 intel_bios.h       |   45 +++
 intel_crt.c        |   12 
 intel_display.c    |  759 +++++++++++++++++++++++++++++++++++------------------
 intel_dp.c         |  216 +++++++++++++--
 intel_drv.h        |    3 
 intel_hdmi.c       |   64 ----
 intel_lvds.c       |   12 
 intel_sdvo.c       |  254 ++++++++++++-----
 intel_tv.c         |   22 +
 14 files changed, 1202 insertions(+), 507 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.7 -r 1.8 drm-intel-next.patchIndex: drm-intel-next.patch
===================================================================
RCS file: drm-intel-next.patch
diff -N drm-intel-next.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-next.patch	3 Aug 2009 18:24:04 -0000	1.8
@@ -0,0 +1,2555 @@
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index d087528..5f3a259 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -219,6 +219,7 @@ typedef struct drm_i915_private {
+ 	unsigned int lvds_vbt:1;
+ 	unsigned int int_crt_support:1;
+ 	unsigned int lvds_use_ssc:1;
++	unsigned int edp_support:1;
+ 	int lvds_ssc_freq;
+ 
+ 	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
+@@ -229,6 +230,7 @@ typedef struct drm_i915_private {
+ 
+ 	spinlock_t error_lock;
+ 	struct drm_i915_error_state *first_error;
++	struct work_struct error_work;
+ 
+ 	/* Register state */
+ 	u8 saveLBB;
+@@ -888,6 +890,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+ 						      IS_I915GM(dev)))
+ #define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
+ #define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
++#define SUPPORTS_EDP(dev)		(IS_IGDNG_M(dev))
+ #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev))
+ /* dsparb controlled by hw only */
+ #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
+diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
+index 9a44bfc..cb3b974 100644
+--- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
++++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
+@@ -343,6 +343,8 @@ static int i915_error_state(struct seq_file *m, void *unused)
+ 
+ 	error = dev_priv->first_error;
+ 
++	seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
++		   error->time.tv_usec);
+ 	seq_printf(m, "EIR: 0x%08x\n", error->eir);
+ 	seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
+ 	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
+diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
+index 7ba23a6..f340b3f 100644
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -290,6 +290,35 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
+ 	return ret;
+ }
+ 
++/**
++ * i915_error_work_func - do process context error handling work
++ * @work: work struct
++ *
++ * Fire an error uevent so userspace can see that a hang or error
++ * was detected.
++ */
++static void i915_error_work_func(struct work_struct *work)
++{
++	drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
++						    error_work);
++	struct drm_device *dev = dev_priv->dev;
++	char *event_string = "ERROR=1";
++	char *envp[] = { event_string, NULL };
++
++	DRM_DEBUG("generating error event\n");
++
++	kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, envp);
++}
++
++/**
++ * i915_capture_error_state - capture an error record for later analysis
++ * @dev: drm device
++ *
++ * Should be called when an error is detected (either a hang or an error
++ * interrupt) to capture error state from the time of the error.  Fills
++ * out a structure which becomes available in debugfs for user level tools
++ * to pick up.
++ */
+ static void i915_capture_error_state(struct drm_device *dev)
+ {
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
+@@ -325,12 +354,137 @@ static void i915_capture_error_state(struct drm_device *dev)
+ 		error->acthd = I915_READ(ACTHD_I965);
+ 	}
+ 
++	do_gettimeofday(&error->time);
++
+ 	dev_priv->first_error = error;
+ 
+ out:
+ 	spin_unlock_irqrestore(&dev_priv->error_lock, flags);
+ }
+ 
++/**
++ * i915_handle_error - handle an error interrupt
++ * @dev: drm device
++ *
++ * Do some basic checking of regsiter state at error interrupt time and
++ * dump it to the syslog.  Also call i915_capture_error_state() to make
++ * sure we get a record and make it available in debugfs.  Fire a uevent
++ * so userspace knows something bad happened (should trigger collection
++ * of a ring dump etc.).
++ */
++static void i915_handle_error(struct drm_device *dev)
++{
++	struct drm_i915_private *dev_priv = dev->dev_private;
++	u32 eir = I915_READ(EIR);
++	u32 pipea_stats = I915_READ(PIPEASTAT);
++	u32 pipeb_stats = I915_READ(PIPEBSTAT);
++
++	i915_capture_error_state(dev);
++
++	printk(KERN_ERR "render error detected, EIR: 0x%08x\n",
++	       eir);
++
++	if (IS_G4X(dev)) {
++		if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
++			u32 ipeir = I915_READ(IPEIR_I965);
++
++			printk(KERN_ERR "  IPEIR: 0x%08x\n",
++			       I915_READ(IPEIR_I965));
++			printk(KERN_ERR "  IPEHR: 0x%08x\n",
++			       I915_READ(IPEHR_I965));
++			printk(KERN_ERR "  INSTDONE: 0x%08x\n",
++			       I915_READ(INSTDONE_I965));
++			printk(KERN_ERR "  INSTPS: 0x%08x\n",
++			       I915_READ(INSTPS));
++			printk(KERN_ERR "  INSTDONE1: 0x%08x\n",
++			       I915_READ(INSTDONE1));
++			printk(KERN_ERR "  ACTHD: 0x%08x\n",
++			       I915_READ(ACTHD_I965));
++			I915_WRITE(IPEIR_I965, ipeir);
++			(void)I915_READ(IPEIR_I965);
++		}
++		if (eir & GM45_ERROR_PAGE_TABLE) {
++			u32 pgtbl_err = I915_READ(PGTBL_ER);
++			printk(KERN_ERR "page table error\n");
++			printk(KERN_ERR "  PGTBL_ER: 0x%08x\n",
++			       pgtbl_err);
++			I915_WRITE(PGTBL_ER, pgtbl_err);
++			(void)I915_READ(PGTBL_ER);
++		}
++	}
++
++	if (IS_I9XX(dev)) {
++		if (eir & I915_ERROR_PAGE_TABLE) {
++			u32 pgtbl_err = I915_READ(PGTBL_ER);
++			printk(KERN_ERR "page table error\n");
++			printk(KERN_ERR "  PGTBL_ER: 0x%08x\n",
++			       pgtbl_err);
++			I915_WRITE(PGTBL_ER, pgtbl_err);
++			(void)I915_READ(PGTBL_ER);
++		}
++	}
++
++	if (eir & I915_ERROR_MEMORY_REFRESH) {
++		printk(KERN_ERR "memory refresh error\n");
++		printk(KERN_ERR "PIPEASTAT: 0x%08x\n",
++		       pipea_stats);
++		printk(KERN_ERR "PIPEBSTAT: 0x%08x\n",
++		       pipeb_stats);
++		/* pipestat has already been acked */
++	}
++	if (eir & I915_ERROR_INSTRUCTION) {
++		printk(KERN_ERR "instruction error\n");
++		printk(KERN_ERR "  INSTPM: 0x%08x\n",
++		       I915_READ(INSTPM));
++		if (!IS_I965G(dev)) {
++			u32 ipeir = I915_READ(IPEIR);
++
++			printk(KERN_ERR "  IPEIR: 0x%08x\n",
++			       I915_READ(IPEIR));
++			printk(KERN_ERR "  IPEHR: 0x%08x\n",
++			       I915_READ(IPEHR));
++			printk(KERN_ERR "  INSTDONE: 0x%08x\n",
++			       I915_READ(INSTDONE));
++			printk(KERN_ERR "  ACTHD: 0x%08x\n",
++			       I915_READ(ACTHD));
++			I915_WRITE(IPEIR, ipeir);
++			(void)I915_READ(IPEIR);
++		} else {
++			u32 ipeir = I915_READ(IPEIR_I965);
++
++			printk(KERN_ERR "  IPEIR: 0x%08x\n",
++			       I915_READ(IPEIR_I965));
++			printk(KERN_ERR "  IPEHR: 0x%08x\n",
++			       I915_READ(IPEHR_I965));
++			printk(KERN_ERR "  INSTDONE: 0x%08x\n",
++			       I915_READ(INSTDONE_I965));
++			printk(KERN_ERR "  INSTPS: 0x%08x\n",
++			       I915_READ(INSTPS));
++			printk(KERN_ERR "  INSTDONE1: 0x%08x\n",
++			       I915_READ(INSTDONE1));
[...2162 lines suppressed...]
++		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
++		encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
++		connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
++		sdvo_priv->is_tv = true;
++		intel_output->needs_tv_clock = true;
++	} else if (flags & SDVO_OUTPUT_RGB0) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
++		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
++		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
++	} else if (flags & SDVO_OUTPUT_RGB1) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
++		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
++		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
++	} else if (flags & SDVO_OUTPUT_LVDS0) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
++		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
++		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
++		sdvo_priv->is_lvds = true;
++	} else if (flags & SDVO_OUTPUT_LVDS1) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
++		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
++		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
++		sdvo_priv->is_lvds = true;
++	} else {
++
++		unsigned char bytes[2];
++
++		sdvo_priv->controlled_output = 0;
++		memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
++		DRM_DEBUG_KMS(I915_SDVO,
++				"%s: Unknown SDVO output type (0x%02x%02x)\n",
++				  SDVO_NAME(sdvo_priv),
++				  bytes[0], bytes[1]);
++		ret = false;
++	}
++
++	if (ret && registered)
++		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
++
++
++	return ret;
++
++}
++
+ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+ {
+ 	struct drm_connector *connector;
+ 	struct intel_output *intel_output;
+ 	struct intel_sdvo_priv *sdvo_priv;
+ 
+-	int connector_type;
+ 	u8 ch[0x40];
+ 	int i;
+-	int encoder_type;
+ 
+ 	intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL);
+ 	if (!intel_output) {
+@@ -1925,88 +2075,28 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+ 	intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo;
+ 
+ 	/* In defaut case sdvo lvds is false */
+-	sdvo_priv->is_lvds = false;
+ 	intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);
+ 
+-	if (sdvo_priv->caps.output_flags &
+-	    (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)) {
+-		if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0)
+-			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS0;
+-		else
+-			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS1;
+-
+-		encoder_type = DRM_MODE_ENCODER_TMDS;
+-		connector_type = DRM_MODE_CONNECTOR_DVID;
+-
+-		if (intel_sdvo_get_supp_encode(intel_output,
+-					       &sdvo_priv->encode) &&
+-		    intel_sdvo_get_digital_encoding_mode(intel_output) &&
+-		    sdvo_priv->is_hdmi) {
+-			/* enable hdmi encoding mode if supported */
+-			intel_sdvo_set_encode(intel_output, SDVO_ENCODE_HDMI);
+-			intel_sdvo_set_colorimetry(intel_output,
+-						   SDVO_COLORIMETRY_RGB256);
+-			connector_type = DRM_MODE_CONNECTOR_HDMIA;
+-		}
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_SVID0)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
+-		encoder_type = DRM_MODE_ENCODER_TVDAC;
+-		connector_type = DRM_MODE_CONNECTOR_SVIDEO;
+-		sdvo_priv->is_tv = true;
+-		intel_output->needs_tv_clock = true;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
+-		encoder_type = DRM_MODE_ENCODER_DAC;
+-		connector_type = DRM_MODE_CONNECTOR_VGA;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
+-		encoder_type = DRM_MODE_ENCODER_DAC;
+-		connector_type = DRM_MODE_CONNECTOR_VGA;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS0)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
+-		encoder_type = DRM_MODE_ENCODER_LVDS;
+-		connector_type = DRM_MODE_CONNECTOR_LVDS;
+-		sdvo_priv->is_lvds = true;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS1)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
+-		encoder_type = DRM_MODE_ENCODER_LVDS;
+-		connector_type = DRM_MODE_CONNECTOR_LVDS;
+-		sdvo_priv->is_lvds = true;
+-	}
+-	else
+-	{
+-		unsigned char bytes[2];
+-
+-		sdvo_priv->controlled_output = 0;
+-		memcpy (bytes, &sdvo_priv->caps.output_flags, 2);
+-		DRM_DEBUG_KMS(I915_SDVO,
+-				"%s: Unknown SDVO output type (0x%02x%02x)\n",
+-				  SDVO_NAME(sdvo_priv),
+-				  bytes[0], bytes[1]);
+-		encoder_type = DRM_MODE_ENCODER_NONE;
+-		connector_type = DRM_MODE_CONNECTOR_Unknown;
++	if (intel_sdvo_output_setup(intel_output,
++				    sdvo_priv->caps.output_flags) != true) {
++		DRM_DEBUG("SDVO output failed to setup on SDVO%c\n",
++			  output_device == SDVOB ? 'B' : 'C');
+ 		goto err_i2c;
+ 	}
+ 
++
+ 	connector = &intel_output->base;
+ 	drm_connector_init(dev, connector, &intel_sdvo_connector_funcs,
+-			   connector_type);
++			   connector->connector_type);
++
+ 	drm_connector_helper_add(connector, &intel_sdvo_connector_helper_funcs);
+ 	connector->interlace_allowed = 0;
+ 	connector->doublescan_allowed = 0;
+ 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
+ 
+-	drm_encoder_init(dev, &intel_output->enc, &intel_sdvo_enc_funcs, encoder_type);
++	drm_encoder_init(dev, &intel_output->enc,
++			&intel_sdvo_enc_funcs, intel_output->enc.encoder_type);
++
+ 	drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
+ 
+ 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
+diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
+index a43c98e..da4ab4d 100644
+--- a/drivers/gpu/drm/i915/intel_tv.c
++++ b/drivers/gpu/drm/i915/intel_tv.c
+@@ -1490,6 +1490,27 @@ static struct input_res {
+ 	{"1920x1080", 1920, 1080},
+ };
+ 
++/*
++ * Chose preferred mode  according to line number of TV format
++ */
++static void
++intel_tv_chose_preferred_modes(struct drm_connector *connector,
++			       struct drm_display_mode *mode_ptr)
++{
++	struct intel_output *intel_output = to_intel_output(connector);
++	const struct tv_mode *tv_mode = intel_tv_mode_find(intel_output);
++
++	if (tv_mode->nbr_end < 480 && mode_ptr->vdisplay == 480)
++		mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
++	else if (tv_mode->nbr_end > 480) {
++		if (tv_mode->progressive == true && tv_mode->nbr_end < 720) {
++			if (mode_ptr->vdisplay == 720)
++				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
++		} else if (mode_ptr->vdisplay == 1080)
++				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
++	}
++}
++
+ /**
+  * Stub get_modes function.
+  *
+@@ -1544,6 +1565,7 @@ intel_tv_get_modes(struct drm_connector *connector)
+ 		mode_ptr->clock = (int) tmp;
+ 
+ 		mode_ptr->type = DRM_MODE_TYPE_DRIVER;
++		intel_tv_chose_preferred_modes(connector, mode_ptr);
+ 		drm_mode_probed_add(connector, mode_ptr);
+ 		count++;
+ 	}

drm-intel-pm.patch:
 i915_drv.c      |   15 +
 i915_drv.h      |   14 +
 i915_gem.c      |    8 
 i915_reg.h      |   22 ++
 intel_display.c |  484 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 intel_drv.h     |    4 
 6 files changed, 512 insertions(+), 35 deletions(-)

Index: drm-intel-pm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-pm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drm-intel-pm.patch	30 Jul 2009 21:01:40 -0000	1.3
+++ drm-intel-pm.patch	3 Aug 2009 18:24:04 -0000	1.4
@@ -1,7 +1,7 @@
-diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_drv.c linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_drv.c	2009-07-30 21:32:05.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-07-30 21:29:34.000000000 +0100
-@@ -43,6 +43,21 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.jx	2009-08-03 14:00:43.000000000 -0400
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-08-03 14:01:07.000000000 -0400
+@@ -43,6 +43,21 @@ module_param_named(modeset, i915_modeset
  unsigned int i915_fbpercrtc = 0;
  module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
  
@@ -23,10 +23,10 @@ diff -ur linux-2.6.30.noarch.orig/driver
  static struct drm_driver driver;
  
  static struct pci_device_id pciidlist[] = {
-diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_drv.h linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_drv.h	2009-07-30 21:32:05.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-07-30 21:29:34.000000000 +0100
-@@ -436,6 +436,12 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.jx	2009-08-03 14:00:44.000000000 -0400
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-03 14:01:07.000000000 -0400
+@@ -438,6 +438,12 @@ typedef struct drm_i915_private {
  		struct drm_i915_gem_phys_object *phys_objs[I915_MAX_PHYS_OBJECT];
  	} mm;
  	struct sdvo_device_mapping sdvo_mappings[2];
@@ -39,7 +39,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  } drm_i915_private_t;
  
  /** driver private structure attached to each drm_gem_object */
-@@ -565,6 +571,11 @@
+@@ -567,6 +573,11 @@ enum intel_chip_family {
  extern struct drm_ioctl_desc i915_ioctls[];
  extern int i915_max_ioctl;
  extern unsigned int i915_fbpercrtc;
@@ -51,7 +51,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  
  extern int i915_master_create(struct drm_device *dev, struct drm_master *master);
  extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);
-@@ -893,6 +904,9 @@
+@@ -895,6 +906,9 @@ extern int i915_wait_ring(struct drm_dev
  /* dsparb controlled by hw only */
  #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
  
@@ -61,9 +61,9 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
  
  #endif
-diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_gem.c linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_gem.c	2009-07-30 21:32:05.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c	2009-07-30 21:29:34.000000000 +0100
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c.jx	2009-08-03 14:00:43.000000000 -0400
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c	2009-08-03 14:01:07.000000000 -0400
 @@ -29,6 +29,7 @@
  #include "drm.h"
  #include "i915_drm.h"
@@ -72,7 +72,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #include <linux/swap.h>
  #include <linux/pci.h>
  
-@@ -980,6 +981,7 @@
+@@ -980,6 +981,7 @@ i915_gem_set_domain_ioctl(struct drm_dev
  {
  	struct drm_i915_gem_set_domain *args = data;
  	struct drm_gem_object *obj;
@@ -80,7 +80,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	uint32_t read_domains = args->read_domains;
  	uint32_t write_domain = args->write_domain;
  	int ret;
-@@ -1003,8 +1005,12 @@
+@@ -1003,8 +1005,12 @@ i915_gem_set_domain_ioctl(struct drm_dev
  	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
  	if (obj == NULL)
  		return -EBADF;
@@ -93,7 +93,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #if WATCH_BUF
  	DRM_INFO("set_domain_ioctl %p(%zd), %08x %08x\n",
  		 obj, obj->size, read_domains, write_domain);
-@@ -2761,6 +2767,8 @@
+@@ -2761,6 +2767,8 @@ i915_gem_object_set_to_gpu_domain(struct
  	BUG_ON(obj->pending_read_domains & I915_GEM_DOMAIN_CPU);
  	BUG_ON(obj->pending_write_domain == I915_GEM_DOMAIN_CPU);
  
@@ -102,10 +102,10 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #if WATCH_BUF
  	DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
  		 __func__, obj,
-diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_reg.h linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
---- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/i915_reg.h	2009-07-30 21:32:05.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-07-30 21:29:34.000000000 +0100
-@@ -56,7 +56,7 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.jx	2009-08-03 14:00:44.000000000 -0400
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-03 14:01:07.000000000 -0400
+@@ -55,7 +55,7 @@
  /* PCI config space */
  
  #define HPLLCC	0xc0 /* 855 only */
@@ -114,7 +114,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define   GC_CLOCK_133_200		(0 << 0)
  #define   GC_CLOCK_100_200		(1 << 0)
  #define   GC_CLOCK_100_133		(2 << 0)
-@@ -66,6 +66,25 @@
+@@ -65,6 +65,25 @@
  #define   GC_DISPLAY_CLOCK_190_200_MHZ	(0 << 4)
  #define   GC_DISPLAY_CLOCK_333_MHZ	(4 << 4)
  #define   GC_DISPLAY_CLOCK_MASK		(7 << 4)
@@ -140,7 +140,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define LBB	0xf4
  
  /* VGA stuff */
-@@ -1570,6 +1589,7 @@
+@@ -1586,6 +1605,7 @@
  #define   PIPECONF_PROGRESSIVE	(0 << 21)
  #define   PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 << 21)
  #define   PIPECONF_INTERLACE_FIELD_0_ONLY		(7 << 21)
@@ -148,10 +148,10 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define PIPEASTAT		0x70024
  #define   PIPE_FIFO_UNDERRUN_STATUS		(1UL<<31)
  #define   PIPE_CRC_ERROR_ENABLE			(1UL<<29)
-diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_display.c linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_display.c	2009-07-30 21:32:05.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-07-30 21:29:34.000000000 +0100
-@@ -36,6 +36,7 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx	2009-08-03 14:00:44.000000000 -0400
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-03 14:11:56.000000000 -0400
+@@ -38,6 +38,7 @@
  
  bool intel_pipe_has_type (struct drm_crtc *crtc, int type);
  static void intel_update_watermarks(struct drm_device *dev);
@@ -159,7 +159,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  
  typedef struct {
      /* given values */
-@@ -65,6 +66,8 @@
+@@ -67,6 +68,8 @@ struct intel_limit {
      intel_p2_t	    p2;
      bool (* find_pll)(const intel_limit_t *, struct drm_crtc *,
  		      int, int, intel_clock_t *);
@@ -168,7 +168,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  #define I8XX_DOT_MIN		  25000
-@@ -190,7 +193,7 @@
+@@ -192,7 +195,7 @@ struct intel_limit {
  #define G4X_P2_SINGLE_CHANNEL_LVDS_LIMIT          0
  
  /*The parameter is for DUAL_CHANNEL_LVDS on G4x platform*/
@@ -177,7 +177,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  #define G4X_DOT_DUAL_CHANNEL_LVDS_MAX           224000
  #define G4X_N_DUAL_CHANNEL_LVDS_MIN             1
  #define G4X_N_DUAL_CHANNEL_LVDS_MAX             3
-@@ -259,6 +262,9 @@
+@@ -261,6 +264,9 @@ static bool
  intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
  		    int target, int refclk, intel_clock_t *best_clock);
  static bool
@@ -187,7 +187,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
  			int target, int refclk, intel_clock_t *best_clock);
  static bool
-@@ -281,6 +287,7 @@
+@@ -286,6 +292,7 @@ static const intel_limit_t intel_limits_
  	.p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
  		 .p2_slow = I8XX_P2_SLOW,	.p2_fast = I8XX_P2_FAST },
  	.find_pll = intel_find_best_PLL,
@@ -195,7 +195,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_i8xx_lvds = {
-@@ -295,6 +302,7 @@
+@@ -300,6 +307,7 @@ static const intel_limit_t intel_limits_
  	.p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
  		 .p2_slow = I8XX_P2_LVDS_SLOW,	.p2_fast = I8XX_P2_LVDS_FAST },
  	.find_pll = intel_find_best_PLL,
@@ -203,7 +203,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  	
  static const intel_limit_t intel_limits_i9xx_sdvo = {
-@@ -309,6 +317,7 @@
+@@ -314,6 +322,7 @@ static const intel_limit_t intel_limits_
  	.p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
  		 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,	.p2_fast = I9XX_P2_SDVO_DAC_FAST },
  	.find_pll = intel_find_best_PLL,
@@ -211,7 +211,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_i9xx_lvds = {
-@@ -326,6 +335,7 @@
+@@ -331,6 +340,7 @@ static const intel_limit_t intel_limits_
  	.p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
  		 .p2_slow = I9XX_P2_LVDS_SLOW,	.p2_fast = I9XX_P2_LVDS_FAST },
  	.find_pll = intel_find_best_PLL,
@@ -219,7 +219,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
      /* below parameter and function is for G4X Chipset Family*/
-@@ -343,6 +353,7 @@
+@@ -348,6 +358,7 @@ static const intel_limit_t intel_limits_
  		 .p2_fast = G4X_P2_SDVO_FAST
  	},
  	.find_pll = intel_g4x_find_best_PLL,
@@ -227,7 +227,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_g4x_hdmi = {
-@@ -359,6 +370,7 @@
+@@ -364,6 +375,7 @@ static const intel_limit_t intel_limits_
  		 .p2_fast = G4X_P2_HDMI_DAC_FAST
  	},
  	.find_pll = intel_g4x_find_best_PLL,
@@ -235,7 +235,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
-@@ -383,6 +395,7 @@
+@@ -388,6 +400,7 @@ static const intel_limit_t intel_limits_
  		 .p2_fast = G4X_P2_SINGLE_CHANNEL_LVDS_FAST
  	},
  	.find_pll = intel_g4x_find_best_PLL,
@@ -243,7 +243,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
-@@ -407,6 +420,7 @@
+@@ -412,6 +425,7 @@ static const intel_limit_t intel_limits_
  		 .p2_fast = G4X_P2_DUAL_CHANNEL_LVDS_FAST
  	},
  	.find_pll = intel_g4x_find_best_PLL,
@@ -251,7 +251,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_g4x_display_port = {
-@@ -444,6 +458,7 @@
+@@ -449,6 +463,7 @@ static const intel_limit_t intel_limits_
  	.p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
  		 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,	.p2_fast = I9XX_P2_SDVO_DAC_FAST },
  	.find_pll = intel_find_best_PLL,
@@ -259,7 +259,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_igd_lvds = {
-@@ -459,6 +474,7 @@
+@@ -464,6 +479,7 @@ static const intel_limit_t intel_limits_
  	.p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
  		 .p2_slow = I9XX_P2_LVDS_SLOW,	.p2_fast = I9XX_P2_LVDS_SLOW },
  	.find_pll = intel_find_best_PLL,
@@ -267,7 +267,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  static const intel_limit_t intel_limits_igdng_sdvo = {
-@@ -666,15 +682,16 @@
+@@ -688,15 +704,16 @@ intel_find_best_PLL(const intel_limit_t 
  
  	memset (best_clock, 0, sizeof (*best_clock));
  
@@ -293,7 +293,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  					int this_err;
  
  					intel_clock(dev, refclk, &clock);
-@@ -695,6 +712,46 @@
+@@ -717,6 +734,46 @@ intel_find_best_PLL(const intel_limit_t 
  	return (err != target);
  }
  
@@ -340,7 +340,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  static bool
  intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
  			int target, int refclk, intel_clock_t *best_clock)
-@@ -725,7 +782,7 @@
+@@ -747,7 +804,7 @@ intel_g4x_find_best_PLL(const intel_limi
  	max_n = limit->n.max;
  	/* based on hardware requriment prefer smaller n to precision */
  	for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
@@ -349,7 +349,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  		for (clock.m1 = limit->m1.max;
  		     clock.m1 >= limit->m1.min; clock.m1--) {
  			for (clock.m2 = limit->m2.max;
-@@ -735,8 +792,8 @@
+@@ -757,8 +814,8 @@ intel_g4x_find_best_PLL(const intel_limi
  					int this_err;
  
  					intel_clock(dev, refclk, &clock);
@@ -360,7 +360,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  					this_err = abs(clock.dot - target) ;
  					if (this_err < err_most) {
  						*best_clock = clock;
-@@ -778,15 +835,14 @@
+@@ -832,15 +889,14 @@ intel_igdng_find_best_PLL(const intel_li
  
  	memset(best_clock, 0, sizeof(*best_clock));
  	max_n = limit->n.max;
@@ -384,7 +384,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  					int this_err;
  
  					intel_clock(dev, refclk, &clock);
-@@ -975,6 +1031,7 @@
+@@ -1029,6 +1085,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  		intel_wait_for_vblank(dev);
  		i915_gem_object_unpin(intel_fb->obj);
  	}
@@ -392,9 +392,9 @@ diff -ur linux-2.6.30.noarch.orig/driver
  
  	if (!dev->primary->master)
  		return 0;
-@@ -1798,6 +1855,18 @@
- const static int latency_ns = 5000; /* default for non-igd platforms */
- 
+@@ -2036,6 +2093,18 @@ static int intel_get_fifo_size(struct dr
+ 	return size;
+ }
  
 +static void g4x_update_wm(struct drm_device *dev)
 +{
@@ -411,26 +411,26 @@ diff -ur linux-2.6.30.noarch.orig/driver
  static void i965_update_wm(struct drm_device *dev)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -1869,7 +1938,7 @@
+@@ -2087,7 +2156,7 @@ static void i9xx_update_wm(struct drm_de
  	cwm = 2;
  
- 	/* Calc sr entries for one pipe configs */
--	if (!planea_clock || !planeb_clock) {
-+	if (HAS_FW_BLC(dev) && (!planea_clock || !planeb_clock)) {
- 		sr_clock = planea_clock ? planea_clock : planeb_clock;
- 		line_time_us = (sr_hdisplay * 1000) / sr_clock;
- 		sr_entries = (((latency_ns / line_time_us) + 1) * pixel_size *
-@@ -1887,8 +1956,7 @@
- 
- 	I915_WRITE(FW_BLC, fwater_lo);
- 	I915_WRITE(FW_BLC2, fwater_hi);
--	if (IS_I9XX(dev))
--		I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0x3f));
-+	I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0x3f));
- }
+ 	/* Calc sr entries for one plane configs */
+-	if (sr_hdisplay && (!planea_clock || !planeb_clock)) {
++	if (HAS_FW_BLC(dev) && sr_hdisplay && (!planea_clock || !planeb_clock)) {
+ 		/* self-refresh has much higher latency */
+ 		const static int sr_latency_ns = 6000;
+ 
+@@ -2102,8 +2171,7 @@ static void i9xx_update_wm(struct drm_de
+ 		srwm = total_size - sr_entries;
+ 		if (srwm < 0)
+ 			srwm = 1;
+-		if (IS_I9XX(dev))
+-			I915_WRITE(FW_BLC_SELF, (srwm & 0x3f));
++		I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0x3f));
+ 	}
  
- static void i830_update_wm(struct drm_device *dev, int planea_clock,
-@@ -1951,9 +2019,6 @@
+ 	DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
+@@ -2177,9 +2245,6 @@ static void intel_update_watermarks(stru
  	unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
  	int enabled = 0, pixel_size = 0;
  
@@ -440,7 +440,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	/* Get the clock config from both planes */
  	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
  		intel_crtc = to_intel_crtc(crtc);
-@@ -1986,7 +2051,9 @@
+@@ -2212,7 +2277,9 @@ static void intel_update_watermarks(stru
  	else if (IS_IGD(dev))
  		igd_disable_cxsr(dev);
  
@@ -451,7 +451,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  		i965_update_wm(dev);
  	else if (IS_I9XX(dev) || IS_MOBILE(dev))
  		i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
-@@ -2020,9 +2087,9 @@
+@@ -2246,9 +2313,9 @@ static int intel_crtc_mode_set(struct dr
  	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
  	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
  	int refclk, num_outputs = 0;
@@ -462,9 +462,9 @@ diff -ur linux-2.6.30.noarch.orig/driver
 +	u32 dpll = 0, fp = 0, fp2 = 0, dspcntr, pipeconf;
 +	bool ok, has_reduced_clock = false, is_sdvo = false, is_dvo = false;
  	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;
- 	struct drm_connector *connector;
-@@ -2100,6 +2167,14 @@
+@@ -2331,6 +2398,14 @@ static int intel_crtc_mode_set(struct dr
  		return -EINVAL;
  	}
  
@@ -479,9 +479,9 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	/* SDVO TV has fixed PLL values depend on its clock range,
  	   this mirrors vbios setting. */
  	if (is_sdvo && is_tv) {
-@@ -2127,10 +2202,17 @@
- 				270000, /* lane clock */
- 				&m_n);
+@@ -2376,10 +2451,17 @@ static int intel_crtc_mode_set(struct dr
+ 				  link_bw, &m_n);
+ 	}
  
 -	if (IS_IGD(dev))
 +	if (IS_IGD(dev)) {
@@ -499,7 +499,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  
  	if (!IS_IGDNG(dev))
  		dpll = DPLL_VGA_MODE_DIS;
-@@ -2159,6 +2241,8 @@
+@@ -2408,6 +2490,8 @@ static int intel_crtc_mode_set(struct dr
  			/* also FPA1 */
  			if (IS_IGDNG(dev))
  				dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
@@ -508,29 +508,33 @@ diff -ur linux-2.6.30.noarch.orig/driver
  		}
  		switch (clock.p2) {
  		case 5:
-@@ -2301,6 +2385,21 @@
+@@ -2534,9 +2618,25 @@ static int intel_crtc_mode_set(struct dr
+ 	}
+ 	if (is_dp)
  		intel_dp_set_m_n(crtc, mode, adjusted_mode);
++	
  
- 	I915_WRITE(fp_reg, fp);
-+	if (has_reduced_clock && i915_powersave && i915_lvdsclock) {
-+		I915_WRITE(fp_reg + 4, fp2);
-+		intel_crtc->lowfreq_avail = true;
-+		if (HAS_PIPE_CXSR(dev)) {
-+			DRM_DEBUG("enabling CxSR downclocking\n");
-+			pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
-+		}
-+	} else {
-+		I915_WRITE(fp_reg + 4, fp);
-+		intel_crtc->lowfreq_avail = false;
-+		if (HAS_PIPE_CXSR(dev)) {
-+			DRM_DEBUG("disabling CxSR downclocking\n");
-+			pipeconf &= ~PIPECONF_CXSR_DOWNCLOCK;
+ 	if (!is_edp) {
+ 		I915_WRITE(fp_reg, fp);
++		if (has_reduced_clock && i915_powersave && i915_lvdsclock) {
++			I915_WRITE(fp_reg + 4, fp2);
++			intel_crtc->lowfreq_avail = true;
++			if (HAS_PIPE_CXSR(dev)) {
++				DRM_DEBUG("enabling CxSR downclocking\n");
++				pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
++			}
++		} else {
++			I915_WRITE(fp_reg + 4, fp);
++			intel_crtc->lowfreq_avail = false;
++			if (HAS_PIPE_CXSR(dev)) {
++				DRM_DEBUG("disabling CxSR downclocking\n");
++				pipeconf &= ~PIPECONF_CXSR_DOWNCLOCK;
++			}
 +		}
-+	}
- 	I915_WRITE(dpll_reg, dpll);
- 	I915_READ(dpll_reg);
- 	/* Wait for the clocks to stabilize. */
-@@ -2507,6 +2606,8 @@
+ 		I915_WRITE(dpll_reg, dpll);
+ 		I915_READ(dpll_reg);
+ 		/* Wait for the clocks to stabilize. */
+@@ -2748,6 +2848,8 @@ fail_locked:
  	return ret;
  }
  
@@ -539,7 +543,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
  {
  	struct drm_device *dev = crtc->dev;
-@@ -2516,6 +2617,12 @@
+@@ -2757,6 +2859,12 @@ static int intel_crtc_cursor_move(struct
  	uint32_t temp = 0;
  	uint32_t adder;
  
@@ -552,7 +556,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	if (x < 0) {
  		temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
  		x = -x;
-@@ -2813,6 +2920,286 @@
+@@ -3054,6 +3162,286 @@ struct drm_display_mode *intel_crtc_mode
  	return mode;
  }
  
@@ -839,7 +843,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  static void intel_crtc_destroy(struct drm_crtc *crtc)
  {
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-@@ -2869,6 +3256,10 @@
+@@ -3110,6 +3498,10 @@ static void intel_crtc_init(struct drm_d
  	intel_crtc->mode_set.crtc = &intel_crtc->base;
  	intel_crtc->mode_set.connectors = (struct drm_connector **)(intel_crtc + 1);
  	intel_crtc->mode_set.num_connectors = 0;
@@ -850,7 +854,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  
  	if (i915_fbpercrtc) {
  
-@@ -3143,6 +3534,7 @@
+@@ -3399,6 +3791,7 @@ static const struct drm_mode_config_func
  
  void intel_modeset_init(struct drm_device *dev)
  {
@@ -858,7 +862,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	int num_pipe;
  	int i;
  
-@@ -3174,15 +3566,38 @@
+@@ -3433,15 +3826,38 @@ void intel_modeset_init(struct drm_devic
  	DRM_DEBUG("%d display pipe%s available.\n",
  		  num_pipe, num_pipe > 1 ? "s" : "");
  
@@ -897,10 +901,10 @@ diff -ur linux-2.6.30.noarch.orig/driver
  	drm_mode_config_cleanup(dev);
  }
  
-diff -ur linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_drv.h linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch.orig/drivers/gpu/drm/i915/intel_drv.h	2009-07-30 21:32:05.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-07-30 21:29:34.000000000 +0100
-@@ -98,6 +98,9 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx	2009-08-03 14:00:44.000000000 -0400
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-03 14:01:07.000000000 -0400
+@@ -99,6 +99,9 @@ struct intel_crtc {
  	struct intel_framebuffer *fbdev_fb;
  	/* a mode_set for fbdev users on this crtc */
  	struct drm_mode_set mode_set;
@@ -910,7 +914,7 @@ diff -ur linux-2.6.30.noarch.orig/driver
  };
  
  #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)
-@@ -116,6 +119,7 @@
+@@ -117,6 +120,7 @@ extern void intel_hdmi_init(struct drm_d
  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);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1685
retrieving revision 1.1686
diff -u -p -r1.1685 -r1.1686
--- kernel.spec	3 Aug 2009 16:48:20 -0000	1.1685
+++ kernel.spec	3 Aug 2009 18:24:04 -0000	1.1686
@@ -671,10 +671,10 @@ Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
-Patch1820: drm-intel-gen3-fb-hack.patch
 Patch1821: drm-page-flip.patch
-Patch1822: drm-intel-pm.patch
-Patch1823: linux-2.6.30-intel-watermark-fix.patch
+# anholt's tree as of 2009-08-03
+Patch1824: drm-intel-next.patch
+Patch1825: drm-intel-pm.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1281,10 +1281,9 @@ ApplyPatch drm-nouveau.patch
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-page-flip.patch
+ApplyPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
-ApplyPatch linux-2.6.30-intel-watermark-fix.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -1945,6 +1944,12 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
+- Update intel drm from anholt's tree
+- Rebase drm-intel-pm.patch to match
+- Drop gen3 fb hack, merged
+- Drop previous watermark setup change
+
 * Mon Aug 03 2009 Dave Jones <davej at redhat.com> 2.6.31-0.122.rc5.git2
 - 2.6.31-rc5-git2
 


--- drm-intel-gen3-fb-hack.patch DELETED ---


--- linux-2.6.30-intel-watermark-fix.patch DELETED ---



From lucilanga at fedoraproject.org  Mon Aug  3 18:25:17 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  3 Aug 2009 18:25:17 +0000 (UTC)
Subject: rpms/xwota/F-10 xwota.spec,1.1,1.2
Message-ID: <20090803182517.AB42F11C00E9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Modified Files:
	xwota.spec 
Log Message:
* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-6
- fix buffer overflow (%510918)


Index: xwota.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xwota/F-10/xwota.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xwota.spec	12 Nov 2008 19:40:35 -0000	1.1
+++ xwota.spec	3 Aug 2009 18:25:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           xwota
 Version:        0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Who's On the Air Database interface
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@ URL:            http://people.fabaris.it
 Source0:        http://people.fabaris.it/iz0ete/%{name}/%{name}-%{version}.tar.gz
 Source1:        xwota.desktop
 Source2:        xwota.png
+Patch0:		xwota-0.4-overflow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig
@@ -32,6 +33,7 @@ http://www.wotadb.org.
 
 %prep
 %setup -q
+%patch0 -p1 -b .overflow
 
 
 %build
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-6
+- fix buffer overflow (%510918)
+
 * Fri Nov 07 2008 Lucian Langa <cooly at gnome.eu.org> - 0.4-5
 - license fix
 - desktop icon fix



From lucilanga at fedoraproject.org  Mon Aug  3 18:25:44 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon,  3 Aug 2009 18:25:44 +0000 (UTC)
Subject: rpms/xwota/F-10 xwota-0.4-overflow.patch,NONE,1.1
Message-ID: <20090803182544.A033B11C00E9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

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

Added Files:
	xwota-0.4-overflow.patch 
Log Message:
* Mon Aug 03 2009 Lucian Langa <cooly at gnome.eu.org> - 0.4-6
- fix buffer overflow (%510918)

xwota-0.4-overflow.patch:
 stuff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xwota-0.4-overflow.patch ---
--- xwota-0.4/src/stuff.c	2006-07-28 19:00:10.000000000 +0300
+++ xwota-0.4-mod/src/stuff.c	2009-08-03 21:01:00.000000000 +0300
@@ -330,7 +330,7 @@
 	  GtkTreePath *path;
 	  GtkWidget *spot_list;
 	
-char eor[5];
+char eor[6];
 char *p_eor;	  
 gchar *call,*freq,*country,*state,*grid,*county,*lat,*longitude,*status,*comments,*program,*f1,*f2,*d_ate,*t_ime; 
 char datetime[50],latlong[50],status_comment[30],display_country[50];



From wtogami at fedoraproject.org  Mon Aug  3 18:27:50 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon,  3 Aug 2009 18:27:50 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.9,1.10
Message-ID: <20090803182750.D059E11C00E9@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	dracut.spec 
Log Message:
require which, file, bzip2



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dracut.spec	3 Aug 2009 17:51:30 -0000	1.9
+++ dracut.spec	3 Aug 2009 18:27:50 -0000	1.10
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.7
-Release: 3%{?rdist}
+Release: 4%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -40,6 +40,7 @@ Requires: mdadm, elfutils-libelf, plymou
 Requires: cryptsetup-luks
 Requires: bridge-utils
 Requires: file
+Requires: bzip2
 %ifnarch s390 s390x
 Requires: dmraid
 Requires: kbd
@@ -143,8 +144,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
-* Mon Aug 03 2009 Warren Togami <wtogami at redhat.com> 0.7-3
-- require which and file
+* Mon Aug 03 2009 Warren Togami <wtogami at redhat.com> 0.7-4
+- require which, file, bzip2
 
 * Sun Jul 26 2009 Harald Hoyer <harald at redhat.com> 0.7-1
 - build without /sbin/switch_root



From hubbitus at fedoraproject.org  Mon Aug  3 18:29:00 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon,  3 Aug 2009 18:29:00 +0000 (UTC)
Subject: rpms/ImageMagick/devel .cvsignore, 1.27, 1.28 ImageMagick.spec, 1.92,
	1.93 sources, 1.27, 1.28
Message-ID: <20090803182900.BC46511C00E9@cvs1.fedora.phx.redhat.com>

Author: hubbitus

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

Modified Files:
	.cvsignore ImageMagick.spec sources 
Log Message:
- Update to version 6.5.4-7
- Use lzma-compressed source tarball as sugested by Ville Skytt? (BZ#515319)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	15 Jun 2009 12:51:53 -0000	1.27
+++ .cvsignore	3 Aug 2009 18:29:00 -0000	1.28
@@ -1 +1 @@
-ImageMagick-6.5.3-7.tar.bz2
+ImageMagick-6.5.4-7.tar.lzma


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- ImageMagick.spec	24 Jul 2009 15:33:34 -0000	1.92
+++ ImageMagick.spec	3 Aug 2009 18:29:00 -0000	1.93
@@ -1,14 +1,14 @@
-%define VER 6.5.3
+%define VER 6.5.4
 %define Patchlevel 7
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
 Url:            http://www.imagemagick.org/
-Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
+Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.lzma
 Patch1:         ImageMagick-6.4.0-multilib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -301,6 +301,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 3 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 6.5.4.7-3
+- Update to version 6.5.4-7
+- Use lzma-compressed source tarball as sugested by Ville Skytt? (BZ#515319)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5.3.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	15 Jun 2009 12:51:53 -0000	1.27
+++ sources	3 Aug 2009 18:29:00 -0000	1.28
@@ -1 +1 @@
-f6a94211c7bfefa25256a838d8d7145b  ImageMagick-6.5.3-7.tar.bz2
+e4ef341294a115e28e9a923e841f6d9d  ImageMagick-6.5.4-7.tar.lzma



From awjb at fedoraproject.org  Mon Aug  3 18:30:34 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon,  3 Aug 2009 18:30:34 +0000 (UTC)
Subject: rpms/synce-hal/devel synce-hal-sock.patch, NONE, 1.1 synce-hal.spec,
	1.7, 1.8
Message-ID: <20090803183034.62EB411C0417@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23425

Modified Files:
	synce-hal.spec 
Added Files:
	synce-hal-sock.patch 
Log Message:
- fix sock location


synce-hal-sock.patch:
 Makefile.am               |    3 ++-
 Makefile.in               |    4 +++-
 synce-connection-broker.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE synce-hal-sock.patch ---
diff -Nurp hal.orig/src/Makefile.am hal/src/Makefile.am
--- hal.orig/src/Makefile.am	2009-02-06 18:41:55.000000000 +0000
+++ hal/src/Makefile.am	2009-08-01 11:28:00.000000000 +0100
@@ -1,4 +1,5 @@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
 
 libexec_PROGRAMS = hal-dccm synce-serial-chat
 
diff -Nurp hal.orig/src/Makefile.in hal/src/Makefile.in
--- hal.orig/src/Makefile.in	2009-08-01 11:30:09.000000000 +0100
+++ hal/src/Makefile.in	2009-08-01 11:28:42.000000000 +0100
@@ -211,7 +211,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
+
 BUILT_SOURCES = synce-device-signals-marshal.h \
 		synce-device-signals-marshal.c \
 		synce-device-glue.h
diff -Nurp hal.orig/src/synce-connection-broker.c hal/src/synce-connection-broker.c
--- hal.orig/src/synce-connection-broker.c	2008-10-28 11:23:00.000000000 +0000
+++ hal/src/synce-connection-broker.c	2009-08-01 11:28:00.000000000 +0100
@@ -236,7 +236,7 @@ _synce_connection_broker_take_connection
   priv->conn = conn;
 
   rnd = g_rand_new ();
-  priv->filename = g_strdup_printf ("/tmp/synce-%08x%08x%08x%08x.sock",
+  priv->filename = g_strdup_printf ("%s/run/synce-%08x%08x%08x%08x.sock", LOCALSTATEDIR,
       g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd));
   g_rand_free (rnd);


Index: synce-hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-hal/devel/synce-hal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- synce-hal.spec	27 Jul 2009 05:16:24 -0000	1.7
+++ synce-hal.spec	3 Aug 2009 18:30:34 -0000	1.8
@@ -1,12 +1,14 @@
 Name:           synce-hal
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Connection framework and dccm-implementation
 
 Group:          Applications/Communications
 License:        GPLv2
 URL:            http://www.synce.org
 Source0:        http://downloads.sourceforge.net/synce/%{name}-%{version}.tar.gz
+# see #514768 create sockets in /var/run instead of /tmp
+Patch0:         synce-hal-sock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsynce-devel
@@ -26,6 +28,7 @@ for Windows Mobile devices that integrat
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-bluetooth-support --with-hal-addon-dir=%{_libexecdir}



From rdieter at fedoraproject.org  Mon Aug  3 18:33:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 18:33:05 +0000 (UTC)
Subject: rpms/wxMaxima/F-11 wxMaxima-0.8.2-ltr_layout.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.9, 1.10 wxMaxima.spec,
	1.27, 1.28 wxMaxima-0.7.6-ltr_layout.patch, 1.1, NONE
Message-ID: <20090803183305.A66BA11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Removed Files:
	wxMaxima-0.7.6-ltr_layout.patch 
Log Message:
* 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:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.8.2-ltr_layout.patch ---
diff -up wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.2/src/MathCtrl.cpp
--- wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout	2009-04-15 07:56:26.000000000 -0500
+++ wxMaxima-0.8.2/src/MathCtrl.cpp	2009-07-18 15:35:58.013133569 -0500
@@ -83,6 +83,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_saved = true;
   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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Nov 2008 16:53:32 -0000	1.10
+++ .cvsignore	3 Aug 2009 18:33:05 -0000	1.11
@@ -1 +1 @@
-wxMaxima-0.7.6.tar.gz
+wxMaxima-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Nov 2008 16:53:32 -0000	1.9
+++ sources	3 Aug 2009 18:33:05 -0000	1.10
@@ -1 +1 @@
-01c607778fa6b332144fcbeb902e6ede  wxMaxima-0.7.6.tar.gz
+d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/wxMaxima.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- wxMaxima.spec	18 Jul 2009 21:48:41 -0000	1.27
+++ wxMaxima.spec	3 Aug 2009 18:33:05 -0000	1.28
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.6
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,7 +12,7 @@ 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.7.6-ltr_layout.patch
+Patch1: wxMaxima-0.8.2-ltr_layout.patch
 
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
@@ -24,7 +24,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.13
+Requires: maxima >= 5.18
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -36,21 +36,12 @@ BuildRequires: sed
 A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
 
+
 %prep
 %setup -q
 
 %patch1 -p1 -b .ltr_layout
 
-## wxmaxima.desktop fixups
-# do (some) Categories munging here, some versions of desktop-file-install 
-# (*cough rhel4*) truncate Categories if --remove-category'd items is a
-# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
-sed -i \
-  -e "s|^Categories=.*|Categories=Utility;|" \
-  -e "s|^Icon=.*|Icon=wxmaxima|" \
-  -e "s|^Terminal=0|Terminal=false|" \
-  wxmaxima.desktop
-
 
 %build
 %configure \
@@ -73,12 +64,9 @@ desktop-file-install --vendor="" \
   wxmaxima.desktop 
 
 # app icon
-install -p -D -m644 wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
-convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
-install -p -D -m644 wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
-
-# Unpackaged files
-rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
+install -p -D -m644 data/wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+convert -resize 48x48 data/wxmaxima.png data/wxmaxima-48x48.png
+install -p -D -m644 data/wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
 
 %find_lang wxMaxima 
 
@@ -113,13 +101,21 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/wxmaxima.desktop
 
 
 %changelog
-* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-3
+- Requires: maxima >= 5.18
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-2
 - output window of wxMaxima is not visible in RtL locales (#455863)
-- optimize scriptlets
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-1
+- wxMaxima-0.8.2
+
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-1
+- wxMaxima-0.8.1
 
 * Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3 
 - ExclusiveArch: s/i386/%%ix86/


--- wxMaxima-0.7.6-ltr_layout.patch DELETED ---



From rdieter at fedoraproject.org  Mon Aug  3 18:33:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 18:33:37 +0000 (UTC)
Subject: rpms/wxMaxima/F-10 wxMaxima-0.8.2-ltr_layout.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.9, 1.10 wxMaxima.spec,
	1.23, 1.24 wxMaxima-0.7.2-old_gnuplot.patch, 1.1, NONE
Message-ID: <20090803183337.A85D811C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Removed Files:
	wxMaxima-0.7.2-old_gnuplot.patch 
Log Message:
* 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:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.8.2-ltr_layout.patch ---
diff -up wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.2/src/MathCtrl.cpp
--- wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout	2009-04-15 07:56:26.000000000 -0500
+++ wxMaxima-0.8.2/src/MathCtrl.cpp	2009-07-18 15:35:58.013133569 -0500
@@ -83,6 +83,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_saved = true;
   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-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Nov 2008 16:53:32 -0000	1.10
+++ .cvsignore	3 Aug 2009 18:33:37 -0000	1.11
@@ -1 +1 @@
-wxMaxima-0.7.6.tar.gz
+wxMaxima-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Nov 2008 16:53:32 -0000	1.9
+++ sources	3 Aug 2009 18:33:37 -0000	1.10
@@ -1 +1 @@
-01c607778fa6b332144fcbeb902e6ede  wxMaxima-0.7.6.tar.gz
+d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-10/wxMaxima.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- wxMaxima.spec	5 Nov 2008 16:53:32 -0000	1.23
+++ wxMaxima.spec	3 Aug 2009 18:33:37 -0000	1.24
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.6
-Release: 1%{?dist}
+Version: 0.8.2
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,20 +12,19 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.8.2-ltr_layout.patch
+
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: i386 x86_64 sparcv9
+ExclusiveArch: %{ix86} x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparcv9
+ExclusiveArch: %{ix86} x86_64 ppc sparcv9
 %endif
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.13
-
-# for gnuplot < 4.2
-Patch1: wxMaxima-0.7.2-old_gnuplot.patch
+Requires: maxima >= 5.18
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -37,24 +36,11 @@ BuildRequires: sed
 A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
 
+
 %prep
 %setup -q
 
-# for gnuplot < 4.0 (?)
-#patch1 -p1 -b .old_gnuplot
-
-## wxmaxima.desktop fixups
-# do (some) Categories munging here, some versions of desktop-file-install 
-# (*cough rhel4*) truncate Categories if --remove-category'd items is a
-# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
-sed -i \
-  -e "s|^Categories=.*|Categories=Utility;|" \
-  -e "s|^Icon=.*|Icon=wxmaxima|" \
-  -e "s|^Terminal=0|Terminal=false|" \
-  wxmaxima.desktop
-
-# app icon
-convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
+%patch1 -p1 -b .ltr_layout
 
 
 %build
@@ -78,26 +64,33 @@ desktop-file-install --vendor="" \
   wxmaxima.desktop 
 
 # app icon
-install -p -D -m644 wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
-install -p -D -m644 wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
+install -p -D -m644 data/wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+convert -resize 48x48 data/wxmaxima.png data/wxmaxima-48x48.png
+install -p -D -m644 data/wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
+
+%find_lang wxMaxima 
 
 # Unpackaged files
 rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
 
-%find_lang wxMaxima 
-
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f wxMaxima.lang
@@ -108,10 +101,28 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/wxmaxima.desktop
 
 
 %changelog
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-3
+- Requires: maxima >= 5.18
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-2
+- output window of wxMaxima is not visible in RtL locales (#455863)
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-1
+- wxMaxima-0.8.2
+
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-1
+- wxMaxima-0.8.1
+
+* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3 
+- ExclusiveArch: s/i386/%%ix86/
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Nov 05 2008 Rex Dieter <rdieter at fedoraproject.org> 0.7.6-1
 - wxMaxima-0.7.6
 


--- wxMaxima-0.7.2-old_gnuplot.patch DELETED ---



From slankes at fedoraproject.org  Mon Aug  3 18:37:39 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon,  3 Aug 2009 18:37:39 +0000 (UTC)
Subject: rpms/liblqr-1/devel .cvsignore, 1.2, 1.3 liblqr-1.spec, 1.4,
	1.5 sources, 1.2, 1.3 liblqr-1-0.1.0-pkgconfig.patch, 1.1, NONE
Message-ID: <20090803183739.3AA1B11C00E9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/liblqr-1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25395

Modified Files:
	.cvsignore liblqr-1.spec sources 
Removed Files:
	liblqr-1-0.1.0-pkgconfig.patch 
Log Message:
* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.4.1-1
- Update to latest upstream release
- Remove upstreamed patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblqr-1/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Mar 2008 15:54:02 -0000	1.2
+++ .cvsignore	3 Aug 2009 18:37:38 -0000	1.3
@@ -1 +1 @@
-liblqr-1-0.1.0-1.tar.gz
+liblqr-1-0.4.1.tar.bz2


Index: liblqr-1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liblqr-1/devel/liblqr-1.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- liblqr-1.spec	25 Jul 2009 06:02:55 -0000	1.4
+++ liblqr-1.spec	3 Aug 2009 18:37:39 -0000	1.5
@@ -1,14 +1,11 @@
-%define tarversion 1
-
 Name:           liblqr-1
-Version:        0.1.0
-Release:        8%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        LiquidRescale library
 Group:          System Environment/Libraries
 License:        GPLv3
 URL:            http://liquidrescale.wikidot.com/
-Source0:        http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}-%{tarversion}.tar.gz
-Patch0:		liblqr-1-0.1.0-pkgconfig.patch
+Source0:        http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  glib2-devel
 
@@ -32,10 +29,6 @@ needed to develop applications with libl
 %prep
 %setup -q
 
-# Patches
-
-%patch0 -p1 -b .pkgconfig
-
 %build
 export LDFLAGS="`pkg-config --libs glib-2.0` -lm"
 %configure
@@ -58,11 +51,10 @@ find $RPM_BUILD_ROOT -name \*.la -exec %
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-
 %files 
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING
-%{_libdir}/liblqr-1.so.0.0.0
+%{_libdir}/liblqr-1.so.0.3.1
 %{_libdir}/liblqr-1.so.0
 
 %files devel
@@ -73,42 +65,37 @@ find $RPM_BUILD_ROOT -name \*.la -exec %
 %{_libdir}/pkgconfig/lqr-1.pc
 
 
-
 %changelog
+* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.4.1-1
+- Update to latest upstream release
+- Remove upstreamed patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.1.0-6
-
 - Fix Patch0:/%%patch mismatch.
 
 * Fri Feb 29 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-5
-
 - Applied pkgconfig patch to remove unneeded directories.
 - Changed permissions of files to 0644.
 - Fixed minor typos.
 
 * Mon Feb 25 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-4
-
 - Cleaned SPEC file, again.
 
 * Wed Feb 20 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-3
-
 - Cleaned SPEC file.
 
 * Tue Feb 19 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-2
-
 - Fixed licensing issue.
 
 * Thu Jan 17 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-1
-
 - Update to latest upstream release.
 - Added glib BuildRequires.
 
 * Mon Dec 10 2007 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-0
-
 - Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblqr-1/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Mar 2008 15:54:02 -0000	1.2
+++ sources	3 Aug 2009 18:37:39 -0000	1.3
@@ -1 +1 @@
-6c8be281b11b9782e45fa7f401e05087  liblqr-1-0.1.0-1.tar.gz
+0e24ed3c9fcdcb111062640764d7b87a  liblqr-1-0.4.1.tar.bz2


--- liblqr-1-0.1.0-pkgconfig.patch DELETED ---



From s4504kr at fedoraproject.org  Mon Aug  3 18:38:52 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon,  3 Aug 2009 18:38:52 +0000 (UTC)
Subject: rpms/python-smbpasswd/devel python-smbpasswd.spec,1.10,1.11
Message-ID: <20090803183852.8A7AC11C00E9@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/python-smbpasswd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25747

Modified Files:
	python-smbpasswd.spec 
Log Message:
Rebuild for python-2.6.2


Index: python-smbpasswd.spec
===================================================================
RCS file: /cvs/extras/rpms/python-smbpasswd/devel/python-smbpasswd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-smbpasswd.spec	26 Jul 2009 23:07:45 -0000	1.10
+++ python-smbpasswd.spec	3 Aug 2009 18:38:52 -0000	1.11
@@ -4,7 +4,7 @@
 
 Name:           python-smbpasswd
 Version:        1.0.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Python SMB Password Hash Generator Module
 
 Group:          Development/Languages
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README.txt
 
 %changelog
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.1-12
+- Rebuild for python-2.6.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Mon Aug  3 18:41:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:41:08 +0000 (UTC)
Subject: rpms/libdmx/devel libdmx.spec,1.23,1.24
Message-ID: <20090803184108.137D611C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libdmx.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
- Un-Requires xorg-x11-filesystem



Index: libdmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libdmx.spec	25 Jul 2009 05:30:50 -0000	1.23
+++ libdmx.spec	3 Aug 2009 18:41:07 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: X.Org X11 DMX runtime library
 Name: libdmx
 Version: 1.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,7 +18,6 @@ The X.Org X11 DMX (Distributed Multihead
 %package devel
 Summary: X.Org X11 DMX development files
 Group: Development/Libraries
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
 Requires: pkgconfig
@@ -61,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
+- Un-Requires xorg-x11-filesystem
+
 * 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
 



From ajax at fedoraproject.org  Mon Aug  3 18:42:36 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:42:36 +0000 (UTC)
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.22,1.23
Message-ID: <20090803184236.5940B11C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 7.1-9
- Un-Requires xorg-x11-filesystem



Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xorg-x11-resutils.spec	27 Jul 2009 08:37:02 -0000	1.22
+++ xorg-x11-resutils.spec	3 Aug 2009 18:42:36 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -29,9 +29,6 @@ BuildRequires: libXaw-devel >= 1.0.2-6
 # what the best solution is yet, so I'm putting this here.
 BuildRequires: libXdmcp-devel
 
-# FIXME: check if still needed for X11R7
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-
 Provides: appres editres listres viewres
 
 # NOTE: appres, editres used to be in the XFree86/xorg-x11 package, whereas
@@ -88,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/viewres.1*
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 7.1-9
+- Un-Requires xorg-x11-filesystem
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Mon Aug  3 18:44:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:44:08 +0000 (UTC)
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.23,1.24
Message-ID: <20090803184408.48FDA11C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.2-12
- Un-Requires xorg-x11-filesystem



Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xorg-x11-xsm.spec	27 Jul 2009 08:39:46 -0000	1.23
+++ xorg-x11-xsm.spec	3 Aug 2009 18:44:08 -0000	1.24
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -32,9 +32,6 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: libXaw-devel libXext-devel libXt-devel libXpm-devel
 BuildRequires: rsh
 
-# NOTE: xorg-x11-filesystem >= 0.99.2-3 is required for OS upgrades from
-# monolithic X releases to modular X releases to work properly.
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 # rstart script invokes xauth, rsh
 Requires: xauth, rsh
 
@@ -125,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.2-12
+- Un-Requires xorg-x11-filesystem
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Aug  3 18:44:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  3 Aug 2009 18:44:40 +0000 (UTC)
Subject: rpms/wxMaxima/EL-5 wxMaxima-0.8.2-ltr_layout.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wxMaxima.spec, 1.12,
	1.13 wxMaxima-0.7.2-old_gnuplot.patch, 1.1, NONE
Message-ID: <20090803184440.97DA511C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Removed Files:
	wxMaxima-0.7.2-old_gnuplot.patch 
Log Message:
* 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:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.8.2-ltr_layout.patch ---
diff -up wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.2/src/MathCtrl.cpp
--- wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout	2009-04-15 07:56:26.000000000 -0500
+++ wxMaxima-0.8.2/src/MathCtrl.cpp	2009-07-18 15:35:58.013133569 -0500
@@ -83,6 +83,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_saved = true;
   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/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Nov 2008 17:44:36 -0000	1.8
+++ .cvsignore	3 Aug 2009 18:44:40 -0000	1.9
@@ -1 +1 @@
-wxMaxima-0.7.6.tar.gz
+wxMaxima-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Nov 2008 17:44:36 -0000	1.8
+++ sources	3 Aug 2009 18:44:40 -0000	1.9
@@ -1 +1 @@
-01c607778fa6b332144fcbeb902e6ede  wxMaxima-0.7.6.tar.gz
+d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/wxMaxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- wxMaxima.spec	5 Nov 2008 17:44:36 -0000	1.12
+++ wxMaxima.spec	3 Aug 2009 18:44:40 -0000	1.13
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.6
-Release: 1%{?dist}
+Version: 0.8.2
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,20 +12,19 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.8.2-ltr_layout.patch
+
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: i386 x86_64 sparcv9
+ExclusiveArch: %{ix86} x86_64 sparcv9
 %else
-ExclusiveArch: i386 x86_64 ppc sparcv9
+ExclusiveArch: %{ix86} x86_64 ppc sparcv9
 %endif
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.13
-
-# for gnuplot < 4.2
-Patch1: wxMaxima-0.7.2-old_gnuplot.patch
+Requires: maxima >= 5.18
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -37,24 +36,11 @@ BuildRequires: sed
 A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
 
+
 %prep
 %setup -q
 
-# for gnuplot < 4.0 (?)
-#patch1 -p1 -b .old_gnuplot
-
-## wxmaxima.desktop fixups
-# do (some) Categories munging here, some versions of desktop-file-install 
-# (*cough rhel4*) truncate Categories if --remove-category'd items is a
-# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
-sed -i \
-  -e "s|^Categories=.*|Categories=Utility;|" \
-  -e "s|^Icon=.*|Icon=wxmaxima|" \
-  -e "s|^Terminal=0|Terminal=false|" \
-  wxmaxima.desktop
-
-# app icon
-convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
+%patch1 -p1 -b .ltr_layout
 
 
 %build
@@ -78,26 +64,33 @@ desktop-file-install --vendor="" \
   wxmaxima.desktop 
 
 # app icon
-install -p -D -m644 wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
-install -p -D -m644 wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
+install -p -D -m644 data/wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+convert -resize 48x48 data/wxmaxima.png data/wxmaxima-48x48.png
+install -p -D -m644 data/wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
+
+%find_lang wxMaxima 
 
 # Unpackaged files
 rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
 
-%find_lang wxMaxima 
-
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f wxMaxima.lang
@@ -108,10 +101,28 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/wxmaxima.desktop
 
 
 %changelog
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-3
+- Requires: maxima >= 5.18
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-2
+- output window of wxMaxima is not visible in RtL locales (#455863)
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-1
+- wxMaxima-0.8.2
+
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-1
+- wxMaxima-0.8.1
+
+* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3 
+- ExclusiveArch: s/i386/%%ix86/
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Nov 05 2008 Rex Dieter <rdieter at fedoraproject.org> 0.7.6-1
 - wxMaxima-0.7.6
 


--- wxMaxima-0.7.2-old_gnuplot.patch DELETED ---



From ajax at fedoraproject.org  Mon Aug  3 18:44:57 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:44:57 +0000 (UTC)
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.49,1.50
Message-ID: <20090803184457.D99B111C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.1.6-14
- Un-Requires xorg-x11-filesystem



Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-xdm.spec	27 Jul 2009 08:38:32 -0000	1.49
+++ xorg-x11-xdm.spec	3 Aug 2009 18:44:57 -0000	1.50
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT
@@ -59,11 +59,6 @@ Provides: xdm
 Obsoletes: XFree86-xdm
 Obsoletes: xinitrc
 
-# NOTE: xorg-x11-filesystem is required by all packages that put files into
-# /usr/lib/X11 or /usr/include/X11 to ensure that on OS upgrades, they are
-# real directories, and not symbolic links.
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-
 # NOTE: Support for the new audit system was added to rawhide in FC3/pam-0.77-10,
 # requiring a change to xdm.pamd (bug #159332). Support for pam_stack.so was
 # removed from pam, and replaced by a new mechanism in pam-0.78 and later,
@@ -161,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.1.6-14
+- Un-Requires xorg-x11-filesystem
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.6-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Mon Aug  3 18:47:40 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:47:40 +0000 (UTC)
Subject: rpms/libXinerama/devel libXinerama.spec,1.22,1.23
Message-ID: <20090803184740.9D94E11C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libXinerama.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.3-6
- Un-require xorg-x11-filesystem



Index: libXinerama.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libXinerama.spec	25 Jul 2009 05:13:42 -0000	1.22
+++ libXinerama.spec	3 Aug 2009 18:47:40 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 1.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,7 +21,6 @@ X.Org X11 libXinerama runtime library
 %package devel
 Summary: X.Org X11 libXinerama development package
 Group: Development/Libraries
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
 
@@ -63,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.3-6
+- Un-require xorg-x11-filesystem
+
 * Fri Jul 24 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 ajax at fedoraproject.org  Mon Aug  3 18:50:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:50:34 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.457,1.458
Message-ID: <20090803185034.CE32F11C049D@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.6.99-23.20090724
- Un-Requires xorg-x11-filesystem



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- xorg-x11-server.spec	31 Jul 2009 17:56:40 -0000	1.457
+++ xorg-x11-server.spec	3 Aug 2009 18:50:34 -0000	1.458
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   22.%{gitdate}%{?dist}
+Release:   23.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -265,7 +265,6 @@ Obsoletes: xorg-x11-sdk xorg-x11-server-
 Requires: xorg-x11-util-macros
 Requires: xorg-x11-proto-devel
 Requires: pkgconfig pixman-devel libpciaccess-devel
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Provides: libxf86config-devel = %{version}-%{release}
 # Virtual provide for transition.  Delete me someday.
 Provides: xorg-x11-server-sdk = %{version}-%{release}
@@ -527,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.6.99-23.20090724
+- Un-Requires xorg-x11-filesystem
+
 * Wed Jul 29 2009 Kristian H?gsberg <krh at redhat.com> - 1.6.99-22.20090724
 - Add DRI2 page flipping feature.
 



From ajax at fedoraproject.org  Mon Aug  3 18:51:42 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 18:51:42 +0000 (UTC)
Subject: rpms/libSM/devel libSM.spec,1.28,1.29
Message-ID: <20090803185142.C301711C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libSM.spec 
Log Message:
e2fsprogs-devel -> libuuid-devel


Index: libSM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libSM.spec	25 Jul 2009 05:08:42 -0000	1.28
+++ libSM.spec	3 Aug 2009 18:51:42 -0000	1.29
@@ -13,8 +13,7 @@ BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libICE-devel
-# yes, really.  libuuid.
-BuildRequires: e2fsprogs-devel
+BuildRequires: libuuid-devel
 
 %description
 The X.Org X11 SM (Session Management) runtime library.



From mtasaka at fedoraproject.org  Mon Aug  3 19:02:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 19:02:23 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2-0.19.1-vte-depend.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 ruby-gnome2.spec, 1.43, 1.44 sources,
	1.7, 1.8 ruby-gnome2-0.19.0-gtk-missingheader.patch, 1.1,
	NONE ruby-gnome2-0.19.0-gtkmozembed.patch, 1.1,
	NONE ruby-gnome2-0.19.0-panel-applet.patch, 1.1, NONE
Message-ID: <20090803190223.7321811C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32306/devel

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	ruby-gnome2-0.19.1-vte-depend.patch 
Removed Files:
	ruby-gnome2-0.19.0-gtk-missingheader.patch 
	ruby-gnome2-0.19.0-gtkmozembed.patch 
	ruby-gnome2-0.19.0-panel-applet.patch 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
- Update to 0.19.1, drop all upstreamed patches
- Introduce many -devel subpackages containing pkgconfig file


ruby-gnome2-0.19.1-vte-depend.patch:
 depend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ruby-gnome2-0.19.1-vte-depend.patch ---
--- ruby-gnome2-all-0.19.1/vte/src/depend.bad	2009-08-03 03:44:58.000000000 +0900
+++ ruby-gnome2-all-0.19.1/vte/src/depend	2009-08-04 02:57:41.000000000 +0900
@@ -1,2 +1,2 @@
 install:
-	$(INSTALL_DATA) ../vte-ruby.pc $(libdir)/pkgconfig
+	$(INSTALL_DATA) ../vte-ruby.pc $(libdir)/pkgconfig || true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 19:04:32 -0000	1.7
+++ .cvsignore	3 Aug 2009 19:02:23 -0000	1.8
@@ -1 +1 @@
-ruby-gnome2-all-0.19.0.tar.gz
+ruby-gnome2-all-0.19.1.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- ruby-gnome2.spec	25 Jul 2009 19:47:38 -0000	1.43
+++ ruby-gnome2.spec	3 Aug 2009 19:02:23 -0000	1.44
@@ -4,7 +4,7 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
-%define         mainrel                4
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -12,7 +12,7 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.0
+Version:        0.19.1
 Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
@@ -23,12 +23,8 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# ruby-gnome2-Bugs-2815036
-Patch14:        ruby-gnome2-0.19.0-gtkmozembed.patch
-# ruby-gnome2-Bugs-2815036
-Patch15:        ruby-gnome2-0.19.0-panel-applet.patch
-# ruby-gnome2-Bugs-2814953
-Patch16:	ruby-gnome2-0.19.0-gtk-missingheader.patch
+# Will report upstream
+Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -41,7 +37,19 @@ Provides:       ruby(gnome2) =  %{versio
 
 
 %description
-This is a set of bindings for the GNOME-2.x libraries for use from Ruby.
+Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
+
+%package devel
+Summary:        Development libraries and header files for ruby-gnome2
+Group:          Development/Libraries
+
+Requires:       ruby(gnome2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnome2-devel) = %{version}-%{release}
+
+%description devel
+Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
+This package provides libraries and header files for ruby-gnome2
 
 %package -n ruby-atk
 Summary:        Ruby binding of ATK-1.0.x or later
@@ -64,6 +72,7 @@ Group:          Development/Libraries
 Requires:       ruby-devel ruby(atk) = %{version}-%{release} 
 Requires:       ruby(glib2-devel) = %{version}-%{release}
 Requires:       atk-devel
+Requires:       pkgconfig
 
 Provides:       ruby(atk-devel) = %{version}-%{release}
 
@@ -85,6 +94,18 @@ Provides:       ruby(bonobo2) = %{versio
 %description -n ruby-bonobo2
 Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
 
+%package -n ruby-bonobo2-devel
+Summary:        Development libraries and header files for ruby-bonobo2
+Group:          Development/Libraries
+
+Requires:       ruby(bonobo2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(bonobo2-devel) = %{version}-%{release}
+
+%description -n ruby-bonobo2-devel
+Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
+This package provides libraries and header files for ruby-bonobo2
+
 %package -n ruby-bonoboui2
 Summary:        Ruby binding of libbonoboui-2.x
 Group:          System Environment/Libraries
@@ -99,8 +120,20 @@ Provides:       ruby(bonoboui2) = %{vers
 %description -n ruby-bonoboui2
 Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
 
+%package -n ruby-bonoboui2-devel
+Summary:        Development libraries and header files for ruby-bonoboui2
+Group:          Development/Libraries
+
+Requires:       ruby(bonoboui2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(bonoboui2-devel) = %{version}-%{release}
+
+%description -n ruby-bonoboui2-devel
+Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
+This package provides libraries and header files for ruby-bonoboui2
+
 %package -n ruby-gconf2
-Summary:        Ruby binding of GConf-1.2.x
+Summary:        Ruby binding of GConf-2.x
 Group:          System Environment/Libraries
 
 BuildRequires:  ruby ruby-devel GConf2-devel
@@ -110,7 +143,19 @@ Requires:       ruby(abi) = 1.8 ruby(gli
 Provides:       ruby(gconf2) =  %{version}-%{release}
 
 %description -n ruby-gconf2
-Ruby/GConf2 is a Ruby binding of GConf-1.2.x.
+Ruby/GConf2 is a Ruby binding of GConf-2.x.
+
+%package -n ruby-gconf2-devel
+Summary:        Development libraries and header files for ruby-gconf2
+Group:          Development/Libraries
+
+Requires:       ruby(gconf2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gconf2-devel) = %{version}-%{release}
+
+%description -n ruby-gconf2-devel
+Ruby/GConf2 is a Ruby binding of GConf-2.x.
+This package provides libraries and header files for ruby-gconf2
 
 %package -n ruby-gdkpixbuf2
 Summary:        Ruby binding of GdkPixbuf-2.x
@@ -127,6 +172,18 @@ Provides:       ruby(gdkpixbuf2) =  %{ve
 %description -n ruby-gdkpixbuf2
 Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
 
+%package -n ruby-gdkpixbuf2-devel
+Summary:        Development libraries and header files for ruby-gdkpixbuf2
+Group:          Development/Libraries
+
+Requires:       ruby(gdkpixbuf2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gdkpixbuf2-devel) = %{version}-%{release}
+
+%description -n ruby-gdkpixbuf2-devel
+Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
+This package provides libraries and header files for ruby-gdkpixbuf2
+
 %package -n ruby-glib2
 Summary:        Ruby binding of GLib-2.x
 Group:          System Environment/Libraries
@@ -146,6 +203,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(glib2) =  %{version}-%{release}
 Requires:       ruby-devel glib2-devel
+Requires:       pkgconfig
 
 Provides:       ruby(glib2-devel) =  %{version}-%{release}
 
@@ -168,6 +226,18 @@ Provides:       ruby(gnomecanvas2) =  %{
 %description -n ruby-gnomecanvas2
 Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
 
+%package -n ruby-gnomecanvas2-devel
+Summary:        Development libraries and header files for ruby-gnomecanvas2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomecanvas2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomecanvas2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomecanvas2-devel
+Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
+This package provides libraries and header files for ruby-gnomecanvas2
+
 %package -n ruby-gnomeprint2
 Summary:        Ruby binding of libgnomeprint
 Group:          System Environment/Libraries
@@ -185,6 +255,18 @@ Provides:       ruby(gnomeprint2) =  %{v
 %description -n ruby-gnomeprint2
 Ruby/GnomePrint is a Ruby binding of libgnomeprint. 
 
+%package -n ruby-gnomeprint2-devel
+Summary:        Development libraries and header files for ruby-gnomeprint2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomeprint2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomeprint2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomeprint2-devel
+Ruby/GnomePrint is a Ruby binding of libgnomeprint.
+This package provides libraries and header files for ruby-gnomeprint2
+
 %package -n ruby-gnomeprintui2
 Summary:        Ruby binding of libgnomeprintui
 Group:          System Environment/Libraries
@@ -200,6 +282,18 @@ Provides:       ruby(gnomeprintui2) =  %
 %description -n ruby-gnomeprintui2
 Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
 
+%package -n ruby-gnomeprintui2-devel
+Summary:        Development libraries and header files for ruby-gnomeprintui2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomeprintui2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomeprintui2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomeprintui2-devel
+Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
+This package provides libraries and header files for ruby-gnomeprintui2
+
 %package -n ruby-gnomevfs
 Summary:        Ruby binding of GnomeVFS-2.0.x
 Group:          System Environment/Libraries
@@ -214,6 +308,18 @@ Provides:       ruby(gnomevfs) =  %{vers
 %description -n ruby-gnomevfs
 Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
 
+%package -n ruby-gnomevfs-devel
+Summary:        Development libraries and header files for ruby-gnomevfs
+Group:          Development/Libraries
+
+Requires:       ruby(gnomevfs) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomevfs-devel) = %{version}-%{release}
+
+%description -n ruby-gnomevfs-devel
+Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
+This package provides libraries and header files for ruby-gnomevfs
+
 %package -n ruby-goocanvas
 Summary:        Ruby binding of Goocanvas.
 Group:          System Environment/Libraries
@@ -228,6 +334,18 @@ Provides:       ruby(goocanvas) =  %{ver
 %description -n ruby-goocanvas
 Ruby/Goocanvas is a Ruby binding of Goocanvas
 
+%package -n ruby-goocanvas-devel
+Summary:        Development libraries and header files for ruby-goocanvas
+Group:          Development/Libraries
+
+Requires:       ruby(goocanvas) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(goocanvas-devel) = %{version}-%{release}
+
+%description -n ruby-goocanvas-devel
+Ruby/Goocanvas is a Ruby binding of Goocanvas
+This package provides libraries and header files for ruby-gnomecanvas
+
 %package -n ruby-gstreamer
 Summary:        Ruby binding of GStreamer
 Group:          System Environment/Libraries
@@ -243,6 +361,18 @@ Provides:       ruby(gstreamer) = %{vers
 %description -n ruby-gstreamer
 Ruby/GStreamer is a Ruby binding for GStreamer
 
+%package -n ruby-gstreamer-devel
+Summary:        Development libraries and header files for ruby-gstreamer
+Group:          Development/Libraries
+
+Requires:       ruby(gstreamer) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gstreamer-devel) = %{version}-%{release}
+
+%description -n ruby-gstreamer-devel
+Ruby/GStreamer is a Ruby binding for GStreamer
+This package provides libraries and header files for ruby-gstreamer
+
 %package -n ruby-gtk2
 Summary:        Ruby binding of GTK+-2.0.x
 Group:          System Environment/Libraries
@@ -267,6 +397,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(gtk2) =  %{version}-%{release}
 Requires:       gtk2-devel ruby-devel ruby(glib2-devel) = %{version}-%{release}
+Requires:       pkgconfig
 
 Provides:       ruby(gtk2-devel) = %{version}-%{release}
 
@@ -290,6 +421,18 @@ Provides:       ruby(gtkglext) = %{versi
 %description -n ruby-gtkglext
 Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
 
+%package -n ruby-gtkglext-devel
+Summary:        Development libraries and header files for ruby-gtkglext
+Group:          Development/Libraries
+
+Requires:       ruby(gtkglext) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkglext-devel) = %{version}-%{release}
+
+%description -n ruby-gtkglext-devel
+Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
+This package provides libraries and header files for ruby-gtkglext
+
 %package -n ruby-gtkhtml2
 Summary:        Ruby binding of GtkHtml2
 Group:          System Environment/Libraries
@@ -304,6 +447,18 @@ Provides:       ruby(gtkhtml2) = %{versi
 %description -n ruby-gtkhtml2
 Ruby/GtkHtml2 is a Ruby binding of GtkHtml2
 
+%package -n ruby-gtkhtml2-devel
+Summary:        Development libraries and header files for ruby-gtkhtml2
+Group:          Development/Libraries
+
+Requires:       ruby(gtkhtml2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkhtml2-devel) = %{version}-%{release}
+
+%description -n ruby-gtkhtml2-devel
+Ruby/GtkHtml2 is a Ruby binding of GtkHtml2
+This package provides libraries and header files for ruby-gtkhtml2
+
 %package -n ruby-gtkmozembed
 Summary:        Ruby binding of GtkMozEmbed
 Group:          System Environment/Libraries
@@ -323,6 +478,19 @@ Provides:       ruby(gtkmozembed) = %{ve
 Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a
 Mozilla Gecko renderer.
 
+%package -n ruby-gtkmozembed-devel
+Summary:        Development libraries and header files for ruby-gtkmozembed
+Group:          Development/Libraries
+
+Requires:       ruby(gtkmozembed) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkmozembed-devel) = %{version}-%{release}
+
+%description -n ruby-gtkmozembed-devel
+Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a
+Mozilla Gecko renderer.
+This package provides libraries and header files for ruby-gtkmozembed
+
 %package -n ruby-gtksourceview
 Summary:        Ruby binding of gtksourceview-1.0.x
 Group:          System Environment/Libraries
@@ -338,6 +506,18 @@ Provides:       ruby(gtksourceview) = %{
 %description -n ruby-gtksourceview
 Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
 
+%package -n ruby-gtksourceview-devel
+Summary:        Development libraries and header files for ruby-gtksourceview
+Group:          Development/Libraries
+
+Requires:       ruby(gtksourceview) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtksourceview-devel) = %{version}-%{release}
+
+%description -n ruby-gtksourceview-devel
+Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
+This package provides libraries and header files for ruby-gtksourceview
+
 %package -n ruby-gtksourceview2
 Summary:        Ruby binding of gtksourceview-2.x
 Group:          System Environment/Libraries
@@ -353,6 +533,18 @@ Provides:       ruby(gtksourceview2) = %
 %description -n ruby-gtksourceview2
 Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
 
+%package -n ruby-gtksourceview2-devel
+Summary:        Development libraries and header files for ruby-gtksourceview2
+Group:          Development/Libraries
+
+Requires:       ruby(gtksourceview2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtksourceview2-devel) = %{version}-%{release}
+
+%description -n ruby-gtksourceview2-devel
+Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
+This package provides libraries and header files for ruby-gtksourceview2
+
 %package -n ruby-libart2
 Summary:        Ruby binding of Libart_lgpl
 Group:          System Environment/Libraries
@@ -373,6 +565,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(libart2) = %{version}-%{release}
 Requires:       libart_lgpl-devel ruby-devel
+Requires:       pkgconfig
 
 Provides:       ruby(libart2-devel) = %{version}-%{release}
 
@@ -399,6 +592,18 @@ Ruby/Libglade2 is a Ruby bindings of Lib
 This provides a very simple interface to the libglade library,
 to load interfaces dynamically from a glade file.
 
+%package -n ruby-libglade2-devel
+Summary:        Development libraries and header files for ruby-libglade2
+Group:          Development/Libraries
+
+Requires:       ruby(libglade2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(libglade2-devel) = %{version}-%{release}
+
+%description -n ruby-libglade2-devel
+Ruby/Libglade2 is a Ruby bindings of Libglade2.
+This package provides libraries and header files for ruby-libglade2
+
 %package -n ruby-panelapplet2
 Summary:        Ruby binding of libpanel-applet-2.6.x
 Group:          System Environment/Libraries
@@ -417,6 +622,18 @@ Provides:       ruby(panelapplet2) = %{v
 %description -n ruby-panelapplet2
 Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
 
+%package -n ruby-panelapplet2-devel
+Summary:        Development libraries and header files for ruby-panelapplet2
+Group:          Development/Libraries
+
+Requires:       ruby(panelapplet2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(panelapplet2-devel) = %{version}-%{release}
+
+%description -n ruby-panelapplet2-devel
+Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
+This package provides libraries and header files for ruby-panelapplet2
+
 %package -n ruby-pango
 Summary:        Ruby binding of pango-1.x
 Group:          System Environment/Libraries
@@ -439,6 +656,7 @@ Group:          Development/Libraries
 Requires:       ruby(pango) = %{version}-%{release} 
 Requires:       pango-devel ruby-devel ruby(glib2-devel) = %{version}-%{release}
 Requires:       ruby-cairo-devel
+Requires:       pkgconfig
 
 Provides:       ruby(pango-devel) = %{version}-%{release}
 
@@ -466,6 +684,17 @@ Provides:       ruby(poppler) = %{versio
 %description -n ruby-poppler
 Ruby/Poppler is a Ruby binding of poppler-glib.
 
+%package -n ruby-poppler-devel
+Summary:        Development libraries and header files for ruby-poppler
+Group:          Development/Libraries
+
+Requires:       ruby(poppler) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(poppler-devel) = %{version}-%{release}
+
+%description -n ruby-poppler-devel
+Ruby/Poppler is a Ruby binding of poppler-glib.
+This package provides libraries and header files for ruby-poppler
 
 %package -n ruby-rsvg
 Summary:        Ruby binding of librsvg
@@ -484,6 +713,18 @@ Provides:       ruby(rsvg) = %{version}-
 %description -n ruby-rsvg
 Ruby/RSVG is a Ruby binding of librsvg.
 
+%package -n ruby-rsvg-devel
+Summary:        Development libraries and header files for ruby-rsvg
+Group:          Development/Libraries
+
+Requires:       ruby(rsvg) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(rsvg-devel) = %{version}-%{release}
+
+%description -n ruby-rsvg-devel
+Ruby/RSVG is a Ruby binding of librsvg.
+This package provides libraries and header files for ruby-rsvg
+
 %package -n ruby-vte
 Summary:        Ruby binding of VTE
 Group:          System Environment/Libraries
@@ -500,13 +741,23 @@ Provides:       ruby(vte) = %{version}-%
 %description -n ruby-vte
 Ruby/VTE is a Ruby binding of VTE.
 
+%package -n ruby-vte-devel
+Summary:        Development libraries and header files for ruby-vte
+Group:          Development/Libraries
+
+Requires:       ruby(vte) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(vte-devel) = %{version}-%{release}
+
+%description -n ruby-vte-devel
+Ruby/VTE is a Ruby binding of VTE.
+This package provides libraries and header files for ruby-vte
+
 
 %prep
 %setup -q -n %{name}-all-%{version}
 %patch0 -p1
-%patch14 -p1 -b .moz
-%patch15 -p1 -b .panel
-%patch16 -p1 -b .missing
+%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -527,6 +778,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Already fixed in rev 3682
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 %clean
@@ -539,6 +794,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gnome2.rb
 %{ruby_sitearch}/gnome2.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+
 %files -n ruby-atk
 %defattr(-,root,root,-)
 %doc atk/ChangeLog atk/COPYING.LIB atk/README
@@ -549,6 +808,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
+%{_libdir}/pkgconfig/atk-ruby.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -556,24 +816,40 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/bonobo2.rb
 %{ruby_sitearch}/bonobo2.so
 
+%files -n ruby-bonobo2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
 %doc bonoboui/ChangeLog bonoboui/COPYING.LIB bonoboui/README
 %{ruby_sitelib}/bonoboui2.rb
 %{ruby_sitearch}/bonoboui2.so
 
+%files -n ruby-bonoboui2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
 %doc gconf/ChangeLog gconf/COPYING.LIB gconf/README gconf/sample
 %{ruby_sitelib}/gconf2.rb
 %{ruby_sitearch}/gconf2.so
 
+%files -n ruby-gconf2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
 %doc gdkpixbuf/ChangeLog gdkpixbuf/COPYING.LIB gdkpixbuf/README gdkpixbuf/sample
 %{ruby_sitelib}/gdk_pixbuf2.rb
 %{ruby_sitearch}/gdk_pixbuf2.so
 
+%files -n ruby-gdkpixbuf2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+
 %files -n ruby-glib2
 %defattr(-,root,root,-)
 %doc glib/ChangeLog glib/COPYING.LIB glib/README glib/sample
@@ -590,6 +866,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
+%{_libdir}/pkgconfig/glib-2.0-ruby.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -597,36 +874,61 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gnomecanvas2.rb
 %{ruby_sitearch}/gnomecanvas2.so
 
+%files -n ruby-gnomecanvas2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
 %doc gnomeprint/ChangeLog gnomeprint/COPYING.LIB gnomeprint/README gnomeprint/sample
 %{ruby_sitelib}/gnomeprint2.rb
 %{ruby_sitearch}/gnomeprint2.so
 
+%files -n ruby-gnomeprint2-devel
+%defattr(-,root,root,-)
+%{ruby_sitearch}/rblibgnomeprintversion.h
+%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
 %doc gnomeprintui/ChangeLog gnomeprintui/COPYING.LIB gnomeprintui/README gnomeprintui/sample
 %{ruby_sitelib}/gnomeprintui2.rb
 %{ruby_sitearch}/gnomeprintui2.so
 
+%files -n ruby-gnomeprintui2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
 %doc gnomevfs/ChangeLog gnomevfs/COPYING.LIB gnomevfs/README
 %{ruby_sitelib}/gnomevfs.rb
 %{ruby_sitearch}/gnomevfs.so
 
+%files -n ruby-gnomevfs-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
 %doc goocanvas/ChangeLog goocanvas/README goocanvas/sample
 %{ruby_sitelib}/goocanvas.rb
 %{ruby_sitearch}/goocanvas.so
 
+%files -n ruby-goocanvas-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/goocanvas-ruby.pc
+
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
 %doc gstreamer/ChangeLog gstreamer/COPYING.LIB gstreamer/README
 %{ruby_sitelib}/gst.rb
 %{ruby_sitearch}/gst.so
 
+%files -n ruby-gstreamer-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
 %doc gtk/ChangeLog gtk/COPYING.LIB gtk/README gtk/sample
@@ -644,6 +946,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
+%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -651,30 +954,50 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gtkglext.rb
 %{ruby_sitearch}/gtkglext.so
 
+%files -n ruby-gtkglext-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
 %doc gtkhtml2/ChangeLog gtkhtml2/COPYING.LIB gtkhtml2/README gtkhtml2/sample
 %{ruby_sitelib}/gtkhtml2.rb
 %{ruby_sitearch}/gtkhtml2.so
 
+%files -n ruby-gtkhtml2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
 %doc gtkmozembed/ChangeLog gtkmozembed/COPYING.LIB gtkmozembed/README gtkmozembed/sample
 %{ruby_sitelib}/gtkmozembed.rb
 %{ruby_sitearch}/gtkmozembed.so
 
+%files -n ruby-gtkmozembed-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
 %doc gtksourceview/ChangeLog gtksourceview/COPYING.LIB gtksourceview/README gtksourceview/sample
 %{ruby_sitelib}/gtksourceview.rb
 %{ruby_sitearch}/gtksourceview.so
 
+%files -n ruby-gtksourceview-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
 %doc gtksourceview2/ChangeLog gtksourceview2/COPYING.LIB gtksourceview2/README gtksourceview2/sample
 %{ruby_sitelib}/gtksourceview2.rb
 %{ruby_sitearch}/gtksourceview2.so
 
+%files -n ruby-gtksourceview2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+
 %files -n ruby-libart2
 %defattr(-,root,root,-)
 %doc libart/ChangeLog libart/COPYING.LIB libart/README libart/sample
@@ -684,6 +1007,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
+%{_libdir}/pkgconfig/libart-2.0-ruby.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -693,12 +1017,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/libglade2.rb
 %{ruby_sitearch}/libglade2.so
 
+%files -n ruby-libglade2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
 %doc panel-applet/ChangeLog panel-applet/COPYING.LIB panel-applet/README panel-applet/sample
 %{ruby_sitelib}/panelapplet2.rb
 %{ruby_sitearch}/panelapplet2*.so
 
+%files -n ruby-panelapplet2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+
 %files -n ruby-pango
 %defattr(-,root,root,-)
 %doc pango/ChangeLog pango/COPYING.LIB pango/README pango/sample
@@ -709,6 +1041,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
+%{_libdir}/pkgconfig/pango-ruby.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -716,20 +1049,37 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/poppler.rb
 %{ruby_sitearch}/poppler.so
 
+%files -n ruby-poppler-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/poppler-ruby.pc
+
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
 %doc rsvg/ChangeLog rsvg/COPYING.LIB rsvg/README rsvg/sample
 %{ruby_sitelib}/rsvg2.rb
 %{ruby_sitearch}/rsvg2.so
 
+%files -n ruby-rsvg-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+
 %files -n ruby-vte
 %defattr(-,root,root,-)
 %doc vte/ChangeLog vte/COPYING.LIB vte/README vte/sample
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
+%if 0
+%files -n ruby-vte-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/vte-ruby.pc
+%endif
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
+- Update to 0.19.1, drop all upstreamed patches
+- Introduce many -devel subpackages containing pkgconfig file
+
 * Sun Jul 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.0-4
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 19:04:33 -0000	1.7
+++ sources	3 Aug 2009 19:02:23 -0000	1.8
@@ -1 +1 @@
-e293cf3e07f1d4e5da0020e45bea053e  ruby-gnome2-all-0.19.0.tar.gz
+d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz


--- ruby-gnome2-0.19.0-gtk-missingheader.patch DELETED ---


--- ruby-gnome2-0.19.0-gtkmozembed.patch DELETED ---


--- ruby-gnome2-0.19.0-panel-applet.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Aug  3 19:02:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 19:02:23 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2-0.19.1-vte-depend.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 ruby-gnome2.spec, 1.43, 1.44 sources,
	1.7, 1.8 ruby-gnome2-0.19.0-gtk-missingheader.patch, 1.1,
	NONE ruby-gnome2-0.19.0-gtkmozembed.patch, 1.1,
	NONE ruby-gnome2-0.19.0-panel-applet.patch, 1.1, NONE
Message-ID: <20090803190223.08B2411C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32306/F-11

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	ruby-gnome2-0.19.1-vte-depend.patch 
Removed Files:
	ruby-gnome2-0.19.0-gtk-missingheader.patch 
	ruby-gnome2-0.19.0-gtkmozembed.patch 
	ruby-gnome2-0.19.0-panel-applet.patch 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
- Update to 0.19.1, drop all upstreamed patches
- Introduce many -devel subpackages containing pkgconfig file


ruby-gnome2-0.19.1-vte-depend.patch:
 depend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ruby-gnome2-0.19.1-vte-depend.patch ---
--- ruby-gnome2-all-0.19.1/vte/src/depend.bad	2009-08-03 03:44:58.000000000 +0900
+++ ruby-gnome2-all-0.19.1/vte/src/depend	2009-08-04 02:57:41.000000000 +0900
@@ -1,2 +1,2 @@
 install:
-	$(INSTALL_DATA) ../vte-ruby.pc $(libdir)/pkgconfig
+	$(INSTALL_DATA) ../vte-ruby.pc $(libdir)/pkgconfig || true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 19:04:31 -0000	1.7
+++ .cvsignore	3 Aug 2009 19:02:22 -0000	1.8
@@ -1 +1 @@
-ruby-gnome2-all-0.19.0.tar.gz
+ruby-gnome2-all-0.19.1.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- ruby-gnome2.spec	17 Jul 2009 13:09:40 -0000	1.43
+++ ruby-gnome2.spec	3 Aug 2009 19:02:22 -0000	1.44
@@ -4,7 +4,7 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
-%define         mainrel                3
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -12,8 +12,8 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.0
-Release:        %{mainrel}%{?dist}.1
+Version:        0.19.1
+Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -23,12 +23,8 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# ruby-gnome2-Bugs-2815036
-Patch14:        ruby-gnome2-0.19.0-gtkmozembed.patch
-# ruby-gnome2-Bugs-2815036
-Patch15:        ruby-gnome2-0.19.0-panel-applet.patch
-# ruby-gnome2-Bugs-2814953
-Patch16:	ruby-gnome2-0.19.0-gtk-missingheader.patch
+# Will report upstream
+Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -41,7 +37,19 @@ Provides:       ruby(gnome2) =  %{versio
 
 
 %description
-This is a set of bindings for the GNOME-2.x libraries for use from Ruby.
+Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
+
+%package devel
+Summary:        Development libraries and header files for ruby-gnome2
+Group:          Development/Libraries
+
+Requires:       ruby(gnome2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnome2-devel) = %{version}-%{release}
+
+%description devel
+Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
+This package provides libraries and header files for ruby-gnome2
 
 %package -n ruby-atk
 Summary:        Ruby binding of ATK-1.0.x or later
@@ -64,6 +72,7 @@ Group:          Development/Libraries
 Requires:       ruby-devel ruby(atk) = %{version}-%{release} 
 Requires:       ruby(glib2-devel) = %{version}-%{release}
 Requires:       atk-devel
+Requires:       pkgconfig
 
 Provides:       ruby(atk-devel) = %{version}-%{release}
 
@@ -85,6 +94,18 @@ Provides:       ruby(bonobo2) = %{versio
 %description -n ruby-bonobo2
 Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
 
+%package -n ruby-bonobo2-devel
+Summary:        Development libraries and header files for ruby-bonobo2
+Group:          Development/Libraries
+
+Requires:       ruby(bonobo2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(bonobo2-devel) = %{version}-%{release}
+
+%description -n ruby-bonobo2-devel
+Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
+This package provides libraries and header files for ruby-bonobo2
+
 %package -n ruby-bonoboui2
 Summary:        Ruby binding of libbonoboui-2.x
 Group:          System Environment/Libraries
@@ -99,8 +120,20 @@ Provides:       ruby(bonoboui2) = %{vers
 %description -n ruby-bonoboui2
 Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
 
+%package -n ruby-bonoboui2-devel
+Summary:        Development libraries and header files for ruby-bonoboui2
+Group:          Development/Libraries
+
+Requires:       ruby(bonoboui2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(bonoboui2-devel) = %{version}-%{release}
+
+%description -n ruby-bonoboui2-devel
+Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
+This package provides libraries and header files for ruby-bonoboui2
+
 %package -n ruby-gconf2
-Summary:        Ruby binding of GConf-1.2.x
+Summary:        Ruby binding of GConf-2.x
 Group:          System Environment/Libraries
 
 BuildRequires:  ruby ruby-devel GConf2-devel
@@ -110,7 +143,19 @@ Requires:       ruby(abi) = 1.8 ruby(gli
 Provides:       ruby(gconf2) =  %{version}-%{release}
 
 %description -n ruby-gconf2
-Ruby/GConf2 is a Ruby binding of GConf-1.2.x.
+Ruby/GConf2 is a Ruby binding of GConf-2.x.
+
+%package -n ruby-gconf2-devel
+Summary:        Development libraries and header files for ruby-gconf2
+Group:          Development/Libraries
+
+Requires:       ruby(gconf2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gconf2-devel) = %{version}-%{release}
+
+%description -n ruby-gconf2-devel
+Ruby/GConf2 is a Ruby binding of GConf-2.x.
+This package provides libraries and header files for ruby-gconf2
 
 %package -n ruby-gdkpixbuf2
 Summary:        Ruby binding of GdkPixbuf-2.x
@@ -127,6 +172,18 @@ Provides:       ruby(gdkpixbuf2) =  %{ve
 %description -n ruby-gdkpixbuf2
 Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
 
+%package -n ruby-gdkpixbuf2-devel
+Summary:        Development libraries and header files for ruby-gdkpixbuf2
+Group:          Development/Libraries
+
+Requires:       ruby(gdkpixbuf2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gdkpixbuf2-devel) = %{version}-%{release}
+
+%description -n ruby-gdkpixbuf2-devel
+Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
+This package provides libraries and header files for ruby-gdkpixbuf2
+
 %package -n ruby-glib2
 Summary:        Ruby binding of GLib-2.x
 Group:          System Environment/Libraries
@@ -146,6 +203,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(glib2) =  %{version}-%{release}
 Requires:       ruby-devel glib2-devel
+Requires:       pkgconfig
 
 Provides:       ruby(glib2-devel) =  %{version}-%{release}
 
@@ -168,6 +226,18 @@ Provides:       ruby(gnomecanvas2) =  %{
 %description -n ruby-gnomecanvas2
 Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
 
+%package -n ruby-gnomecanvas2-devel
+Summary:        Development libraries and header files for ruby-gnomecanvas2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomecanvas2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomecanvas2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomecanvas2-devel
+Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
+This package provides libraries and header files for ruby-gnomecanvas2
+
 %package -n ruby-gnomeprint2
 Summary:        Ruby binding of libgnomeprint
 Group:          System Environment/Libraries
@@ -185,6 +255,18 @@ Provides:       ruby(gnomeprint2) =  %{v
 %description -n ruby-gnomeprint2
 Ruby/GnomePrint is a Ruby binding of libgnomeprint. 
 
+%package -n ruby-gnomeprint2-devel
+Summary:        Development libraries and header files for ruby-gnomeprint2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomeprint2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomeprint2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomeprint2-devel
+Ruby/GnomePrint is a Ruby binding of libgnomeprint.
+This package provides libraries and header files for ruby-gnomeprint2
+
 %package -n ruby-gnomeprintui2
 Summary:        Ruby binding of libgnomeprintui
 Group:          System Environment/Libraries
@@ -200,6 +282,18 @@ Provides:       ruby(gnomeprintui2) =  %
 %description -n ruby-gnomeprintui2
 Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
 
+%package -n ruby-gnomeprintui2-devel
+Summary:        Development libraries and header files for ruby-gnomeprintui2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomeprintui2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomeprintui2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomeprintui2-devel
+Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
+This package provides libraries and header files for ruby-gnomeprintui2
+
 %package -n ruby-gnomevfs
 Summary:        Ruby binding of GnomeVFS-2.0.x
 Group:          System Environment/Libraries
@@ -214,6 +308,18 @@ Provides:       ruby(gnomevfs) =  %{vers
 %description -n ruby-gnomevfs
 Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
 
+%package -n ruby-gnomevfs-devel
+Summary:        Development libraries and header files for ruby-gnomevfs
+Group:          Development/Libraries
+
+Requires:       ruby(gnomevfs) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomevfs-devel) = %{version}-%{release}
+
+%description -n ruby-gnomevfs-devel
+Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
+This package provides libraries and header files for ruby-gnomevfs
+
 %package -n ruby-goocanvas
 Summary:        Ruby binding of Goocanvas.
 Group:          System Environment/Libraries
@@ -228,6 +334,18 @@ Provides:       ruby(goocanvas) =  %{ver
 %description -n ruby-goocanvas
 Ruby/Goocanvas is a Ruby binding of Goocanvas
 
+%package -n ruby-goocanvas-devel
+Summary:        Development libraries and header files for ruby-goocanvas
+Group:          Development/Libraries
+
+Requires:       ruby(goocanvas) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(goocanvas-devel) = %{version}-%{release}
+
+%description -n ruby-goocanvas-devel
+Ruby/Goocanvas is a Ruby binding of Goocanvas
+This package provides libraries and header files for ruby-gnomecanvas
+
 %package -n ruby-gstreamer
 Summary:        Ruby binding of GStreamer
 Group:          System Environment/Libraries
@@ -243,6 +361,18 @@ Provides:       ruby(gstreamer) = %{vers
 %description -n ruby-gstreamer
 Ruby/GStreamer is a Ruby binding for GStreamer
 
+%package -n ruby-gstreamer-devel
+Summary:        Development libraries and header files for ruby-gstreamer
+Group:          Development/Libraries
+
+Requires:       ruby(gstreamer) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gstreamer-devel) = %{version}-%{release}
+
+%description -n ruby-gstreamer-devel
+Ruby/GStreamer is a Ruby binding for GStreamer
+This package provides libraries and header files for ruby-gstreamer
+
 %package -n ruby-gtk2
 Summary:        Ruby binding of GTK+-2.0.x
 Group:          System Environment/Libraries
@@ -267,6 +397,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(gtk2) =  %{version}-%{release}
 Requires:       gtk2-devel ruby-devel ruby(glib2-devel) = %{version}-%{release}
+Requires:       pkgconfig
 
 Provides:       ruby(gtk2-devel) = %{version}-%{release}
 
@@ -290,6 +421,18 @@ Provides:       ruby(gtkglext) = %{versi
 %description -n ruby-gtkglext
 Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
 
+%package -n ruby-gtkglext-devel
+Summary:        Development libraries and header files for ruby-gtkglext
+Group:          Development/Libraries
+
+Requires:       ruby(gtkglext) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkglext-devel) = %{version}-%{release}
+
+%description -n ruby-gtkglext-devel
+Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
+This package provides libraries and header files for ruby-gtkglext
+
 %package -n ruby-gtkhtml2
 Summary:        Ruby binding of GtkHtml2
 Group:          System Environment/Libraries
@@ -304,6 +447,18 @@ Provides:       ruby(gtkhtml2) = %{versi
 %description -n ruby-gtkhtml2
 Ruby/GtkHtml2 is a Ruby binding of GtkHtml2
 
+%package -n ruby-gtkhtml2-devel
+Summary:        Development libraries and header files for ruby-gtkhtml2
+Group:          Development/Libraries
+
+Requires:       ruby(gtkhtml2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkhtml2-devel) = %{version}-%{release}
+
+%description -n ruby-gtkhtml2-devel
+Ruby/GtkHtml2 is a Ruby binding of GtkHtml2
+This package provides libraries and header files for ruby-gtkhtml2
+
 %package -n ruby-gtkmozembed
 Summary:        Ruby binding of GtkMozEmbed
 Group:          System Environment/Libraries
@@ -323,6 +478,19 @@ Provides:       ruby(gtkmozembed) = %{ve
 Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a
 Mozilla Gecko renderer.
 
+%package -n ruby-gtkmozembed-devel
+Summary:        Development libraries and header files for ruby-gtkmozembed
+Group:          Development/Libraries
+
+Requires:       ruby(gtkmozembed) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkmozembed-devel) = %{version}-%{release}
+
+%description -n ruby-gtkmozembed-devel
+Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a
+Mozilla Gecko renderer.
+This package provides libraries and header files for ruby-gtkmozembed
+
 %package -n ruby-gtksourceview
 Summary:        Ruby binding of gtksourceview-1.0.x
 Group:          System Environment/Libraries
@@ -338,6 +506,18 @@ Provides:       ruby(gtksourceview) = %{
 %description -n ruby-gtksourceview
 Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
 
+%package -n ruby-gtksourceview-devel
+Summary:        Development libraries and header files for ruby-gtksourceview
+Group:          Development/Libraries
+
+Requires:       ruby(gtksourceview) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtksourceview-devel) = %{version}-%{release}
+
+%description -n ruby-gtksourceview-devel
+Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
+This package provides libraries and header files for ruby-gtksourceview
+
 %package -n ruby-gtksourceview2
 Summary:        Ruby binding of gtksourceview-2.x
 Group:          System Environment/Libraries
@@ -353,6 +533,18 @@ Provides:       ruby(gtksourceview2) = %
 %description -n ruby-gtksourceview2
 Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
 
+%package -n ruby-gtksourceview2-devel
+Summary:        Development libraries and header files for ruby-gtksourceview2
+Group:          Development/Libraries
+
+Requires:       ruby(gtksourceview2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtksourceview2-devel) = %{version}-%{release}
+
+%description -n ruby-gtksourceview2-devel
+Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
+This package provides libraries and header files for ruby-gtksourceview2
+
 %package -n ruby-libart2
 Summary:        Ruby binding of Libart_lgpl
 Group:          System Environment/Libraries
@@ -373,6 +565,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(libart2) = %{version}-%{release}
 Requires:       libart_lgpl-devel ruby-devel
+Requires:       pkgconfig
 
 Provides:       ruby(libart2-devel) = %{version}-%{release}
 
@@ -399,6 +592,18 @@ Ruby/Libglade2 is a Ruby bindings of Lib
 This provides a very simple interface to the libglade library,
 to load interfaces dynamically from a glade file.
 
+%package -n ruby-libglade2-devel
+Summary:        Development libraries and header files for ruby-libglade2
+Group:          Development/Libraries
+
+Requires:       ruby(libglade2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(libglade2-devel) = %{version}-%{release}
+
+%description -n ruby-libglade2-devel
+Ruby/Libglade2 is a Ruby bindings of Libglade2.
+This package provides libraries and header files for ruby-libglade2
+
 %package -n ruby-panelapplet2
 Summary:        Ruby binding of libpanel-applet-2.6.x
 Group:          System Environment/Libraries
@@ -417,6 +622,18 @@ Provides:       ruby(panelapplet2) = %{v
 %description -n ruby-panelapplet2
 Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
 
+%package -n ruby-panelapplet2-devel
+Summary:        Development libraries and header files for ruby-panelapplet2
+Group:          Development/Libraries
+
+Requires:       ruby(panelapplet2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(panelapplet2-devel) = %{version}-%{release}
+
+%description -n ruby-panelapplet2-devel
+Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
+This package provides libraries and header files for ruby-panelapplet2
+
 %package -n ruby-pango
 Summary:        Ruby binding of pango-1.x
 Group:          System Environment/Libraries
@@ -439,6 +656,7 @@ Group:          Development/Libraries
 Requires:       ruby(pango) = %{version}-%{release} 
 Requires:       pango-devel ruby-devel ruby(glib2-devel) = %{version}-%{release}
 Requires:       ruby-cairo-devel
+Requires:       pkgconfig
 
 Provides:       ruby(pango-devel) = %{version}-%{release}
 
@@ -466,6 +684,17 @@ Provides:       ruby(poppler) = %{versio
 %description -n ruby-poppler
 Ruby/Poppler is a Ruby binding of poppler-glib.
 
+%package -n ruby-poppler-devel
+Summary:        Development libraries and header files for ruby-poppler
+Group:          Development/Libraries
+
+Requires:       ruby(poppler) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(poppler-devel) = %{version}-%{release}
+
+%description -n ruby-poppler-devel
+Ruby/Poppler is a Ruby binding of poppler-glib.
+This package provides libraries and header files for ruby-poppler
 
 %package -n ruby-rsvg
 Summary:        Ruby binding of librsvg
@@ -484,6 +713,18 @@ Provides:       ruby(rsvg) = %{version}-
 %description -n ruby-rsvg
 Ruby/RSVG is a Ruby binding of librsvg.
 
+%package -n ruby-rsvg-devel
+Summary:        Development libraries and header files for ruby-rsvg
+Group:          Development/Libraries
+
+Requires:       ruby(rsvg) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(rsvg-devel) = %{version}-%{release}
+
+%description -n ruby-rsvg-devel
+Ruby/RSVG is a Ruby binding of librsvg.
+This package provides libraries and header files for ruby-rsvg
+
 %package -n ruby-vte
 Summary:        Ruby binding of VTE
 Group:          System Environment/Libraries
@@ -500,13 +741,23 @@ Provides:       ruby(vte) = %{version}-%
 %description -n ruby-vte
 Ruby/VTE is a Ruby binding of VTE.
 
+%package -n ruby-vte-devel
+Summary:        Development libraries and header files for ruby-vte
+Group:          Development/Libraries
+
+Requires:       ruby(vte) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(vte-devel) = %{version}-%{release}
+
+%description -n ruby-vte-devel
+Ruby/VTE is a Ruby binding of VTE.
+This package provides libraries and header files for ruby-vte
+
 
 %prep
 %setup -q -n %{name}-all-%{version}
 %patch0 -p1
-%patch14 -p1 -b .moz
-%patch15 -p1 -b .panel
-%patch16 -p1 -b .missing
+%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -527,6 +778,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Already fixed in rev 3682
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 %clean
@@ -539,6 +794,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gnome2.rb
 %{ruby_sitearch}/gnome2.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+
 %files -n ruby-atk
 %defattr(-,root,root,-)
 %doc atk/ChangeLog atk/COPYING.LIB atk/README
@@ -549,6 +808,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
+%{_libdir}/pkgconfig/atk-ruby.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -556,24 +816,40 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/bonobo2.rb
 %{ruby_sitearch}/bonobo2.so
 
+%files -n ruby-bonobo2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
 %doc bonoboui/ChangeLog bonoboui/COPYING.LIB bonoboui/README
 %{ruby_sitelib}/bonoboui2.rb
 %{ruby_sitearch}/bonoboui2.so
 
+%files -n ruby-bonoboui2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
 %doc gconf/ChangeLog gconf/COPYING.LIB gconf/README gconf/sample
 %{ruby_sitelib}/gconf2.rb
 %{ruby_sitearch}/gconf2.so
 
+%files -n ruby-gconf2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
 %doc gdkpixbuf/ChangeLog gdkpixbuf/COPYING.LIB gdkpixbuf/README gdkpixbuf/sample
 %{ruby_sitelib}/gdk_pixbuf2.rb
 %{ruby_sitearch}/gdk_pixbuf2.so
 
+%files -n ruby-gdkpixbuf2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+
 %files -n ruby-glib2
 %defattr(-,root,root,-)
 %doc glib/ChangeLog glib/COPYING.LIB glib/README glib/sample
@@ -590,6 +866,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
+%{_libdir}/pkgconfig/glib-2.0-ruby.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -597,36 +874,61 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gnomecanvas2.rb
 %{ruby_sitearch}/gnomecanvas2.so
 
+%files -n ruby-gnomecanvas2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
 %doc gnomeprint/ChangeLog gnomeprint/COPYING.LIB gnomeprint/README gnomeprint/sample
 %{ruby_sitelib}/gnomeprint2.rb
 %{ruby_sitearch}/gnomeprint2.so
 
+%files -n ruby-gnomeprint2-devel
+%defattr(-,root,root,-)
+%{ruby_sitearch}/rblibgnomeprintversion.h
+%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
 %doc gnomeprintui/ChangeLog gnomeprintui/COPYING.LIB gnomeprintui/README gnomeprintui/sample
 %{ruby_sitelib}/gnomeprintui2.rb
 %{ruby_sitearch}/gnomeprintui2.so
 
+%files -n ruby-gnomeprintui2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
 %doc gnomevfs/ChangeLog gnomevfs/COPYING.LIB gnomevfs/README
 %{ruby_sitelib}/gnomevfs.rb
 %{ruby_sitearch}/gnomevfs.so
 
+%files -n ruby-gnomevfs-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
 %doc goocanvas/ChangeLog goocanvas/README goocanvas/sample
 %{ruby_sitelib}/goocanvas.rb
 %{ruby_sitearch}/goocanvas.so
 
+%files -n ruby-goocanvas-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/goocanvas-ruby.pc
+
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
 %doc gstreamer/ChangeLog gstreamer/COPYING.LIB gstreamer/README
 %{ruby_sitelib}/gst.rb
 %{ruby_sitearch}/gst.so
 
+%files -n ruby-gstreamer-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
 %doc gtk/ChangeLog gtk/COPYING.LIB gtk/README gtk/sample
@@ -644,6 +946,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
+%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -651,30 +954,50 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gtkglext.rb
 %{ruby_sitearch}/gtkglext.so
 
+%files -n ruby-gtkglext-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
 %doc gtkhtml2/ChangeLog gtkhtml2/COPYING.LIB gtkhtml2/README gtkhtml2/sample
 %{ruby_sitelib}/gtkhtml2.rb
 %{ruby_sitearch}/gtkhtml2.so
 
+%files -n ruby-gtkhtml2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
 %doc gtkmozembed/ChangeLog gtkmozembed/COPYING.LIB gtkmozembed/README gtkmozembed/sample
 %{ruby_sitelib}/gtkmozembed.rb
 %{ruby_sitearch}/gtkmozembed.so
 
+%files -n ruby-gtkmozembed-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
 %doc gtksourceview/ChangeLog gtksourceview/COPYING.LIB gtksourceview/README gtksourceview/sample
 %{ruby_sitelib}/gtksourceview.rb
 %{ruby_sitearch}/gtksourceview.so
 
+%files -n ruby-gtksourceview-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
 %doc gtksourceview2/ChangeLog gtksourceview2/COPYING.LIB gtksourceview2/README gtksourceview2/sample
 %{ruby_sitelib}/gtksourceview2.rb
 %{ruby_sitearch}/gtksourceview2.so
 
+%files -n ruby-gtksourceview2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+
 %files -n ruby-libart2
 %defattr(-,root,root,-)
 %doc libart/ChangeLog libart/COPYING.LIB libart/README libart/sample
@@ -684,6 +1007,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
+%{_libdir}/pkgconfig/libart-2.0-ruby.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -693,12 +1017,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/libglade2.rb
 %{ruby_sitearch}/libglade2.so
 
+%files -n ruby-libglade2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
 %doc panel-applet/ChangeLog panel-applet/COPYING.LIB panel-applet/README panel-applet/sample
 %{ruby_sitelib}/panelapplet2.rb
 %{ruby_sitearch}/panelapplet2*.so
 
+%files -n ruby-panelapplet2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+
 %files -n ruby-pango
 %defattr(-,root,root,-)
 %doc pango/ChangeLog pango/COPYING.LIB pango/README pango/sample
@@ -709,6 +1041,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
+%{_libdir}/pkgconfig/pango-ruby.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -716,20 +1049,37 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/poppler.rb
 %{ruby_sitearch}/poppler.so
 
+%files -n ruby-poppler-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/poppler-ruby.pc
+
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
 %doc rsvg/ChangeLog rsvg/COPYING.LIB rsvg/README rsvg/sample
 %{ruby_sitelib}/rsvg2.rb
 %{ruby_sitearch}/rsvg2.so
 
+%files -n ruby-rsvg-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+
 %files -n ruby-vte
 %defattr(-,root,root,-)
 %doc vte/ChangeLog vte/COPYING.LIB vte/README vte/sample
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
+%if 0
+%files -n ruby-vte-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/vte-ruby.pc
+%endif
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
+- Update to 0.19.1, drop all upstreamed patches
+- Introduce many -devel subpackages containing pkgconfig file
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.19.0-3.1
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 19:04:32 -0000	1.7
+++ sources	3 Aug 2009 19:02:22 -0000	1.8
@@ -1 +1 @@
-e293cf3e07f1d4e5da0020e45bea053e  ruby-gnome2-all-0.19.0.tar.gz
+d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz


--- ruby-gnome2-0.19.0-gtk-missingheader.patch DELETED ---


--- ruby-gnome2-0.19.0-gtkmozembed.patch DELETED ---


--- ruby-gnome2-0.19.0-panel-applet.patch DELETED ---



From slankes at fedoraproject.org  Mon Aug  3 19:03:31 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon,  3 Aug 2009 19:03:31 +0000 (UTC)
Subject: rpms/gimp-lqr-plugin/devel .cvsignore, 1.2, 1.3 gimp-lqr-plugin.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090803190331.D2D8111C00E9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/gimp-lqr-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32615

Modified Files:
	.cvsignore gimp-lqr-plugin.spec sources 
Log Message:
* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Mar 2008 22:03:24 -0000	1.2
+++ .cvsignore	3 Aug 2009 19:03:31 -0000	1.3
@@ -1 +1 @@
-gimp-lqr-plugin-0.4.0-4.tar.gz
+gimp-lqr-plugin-0.6.1.tar.bz2


Index: gimp-lqr-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/devel/gimp-lqr-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gimp-lqr-plugin.spec	25 Jul 2009 00:11:07 -0000	1.3
+++ gimp-lqr-plugin.spec	3 Aug 2009 19:03:31 -0000	1.4
@@ -1,13 +1,11 @@
-%define codeversion 0.4.0
-%define tarversion 4
 Name:           gimp-lqr-plugin
-Version:        %{codeversion}.%{tarversion}
-Release:        4%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Content-aware resizing plug-in for the GIMP
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://liquidrescale.wikidot.com/
-Source0:        http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{codeversion}-%{tarversion}.tar.gz
+Source0:        http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.1.0
 Requires:       gimp >= 2.4
@@ -19,7 +17,7 @@ by Shai Avidan and Ariel Shamir, which c
 http://www.faculty.idc.ac.il/arik/imret.pdf
 
 %prep
-%setup -q -n gimp-lqr-plugin-%{codeversion}
+%setup -q -n gimp-lqr-plugin-%{version}
 
 %build
 %configure
@@ -41,19 +39,23 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README ChangeLog TODO COPYING AUTHORS NEWS
 %{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin
+%{_libdir}/gimp/2.0/plug-ins/plug_in_lqr_iter
+%{_datadir}/gimp/2.0/scripts/batch-gimp-lqr.scm
 %{_datadir}/gimp-lqr-plugin/
 
 
 
 
 %changelog
+* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-1
+- Update to latest upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Sun Mar 02 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.4.0.4-2
 - Fixed typos, buildrequires and requires.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Mar 2008 22:03:24 -0000	1.2
+++ sources	3 Aug 2009 19:03:31 -0000	1.3
@@ -1 +1 @@
-1d34e517cdbf8b2f358e0febea0467f5  gimp-lqr-plugin-0.4.0-4.tar.gz
+f5f15814904d7c812eca60cbb2fc6385  gimp-lqr-plugin-0.6.1.tar.bz2



From adrian at fedoraproject.org  Mon Aug  3 19:04:22 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Mon,  3 Aug 2009 19:04:22 +0000 (UTC)
Subject: rpms/wordpress/devel .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 wordpress.spec, 1.32, 1.33
Message-ID: <20090803190422.3BB5111C00E9@cvs1.fedora.phx.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	28 Jul 2009 08:38:31 -0000	1.25
+++ .cvsignore	3 Aug 2009 19:04:21 -0000	1.26
@@ -1 +1 @@
-wordpress-2.8.2.tar.gz
+wordpress-2.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	28 Jul 2009 08:38:31 -0000	1.25
+++ sources	3 Aug 2009 19:04:22 -0000	1.26
@@ -1 +1 @@
-8fde8c4aa3e4d86ce9ddca7cdc0769a2  wordpress-2.8.2.tar.gz
+0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- wordpress.spec	28 Jul 2009 08:38:31 -0000	1.32
+++ wordpress.spec	3 Aug 2009 19:04:22 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.2
+Version: 2.8.3
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
+- updated to 2.8.3 for security fixes
+
 * Tue Jul 28 2009 Adrian Reber <adrian at lisas.de> - 2.8.2-1
 - updated to 2.8.2 for security fixes - BZ 512900
 - fixed "wrong-script-end-of-line-encoding" of license.txt



From djuran at fedoraproject.org  Mon Aug  3 19:05:59 2009
From: djuran at fedoraproject.org (David Juran)
Date: Mon,  3 Aug 2009 19:05:59 +0000 (UTC)
Subject: rpms/azureus/devel azureus-4.2.0.4-java5.patch, NONE, 1.1 build.xml,
	NONE, 1.1 .cvsignore, 1.15, 1.16 azureus-4.0.0.4-boo-osx.diff,
	1.1, 1.2 azureus-4.0.0.4-boo-updating-w32.diff, 1.1,
	1.2 azureus-4.0.0.4-boo-windows.diff, 1.1,
	1.2 azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff, 1.1,
	1.2 azureus-SecureMessageServiceClientHelper-bcprov.patch, 1.1,
	1.2 azureus-remove-manifest-classpath.patch, 1.3,
	1.4 azureus.script, 1.22, 1.23 azureus.spec, 1.76, 1.77 sources,
	1.15, 1.16
Message-ID: <20090803190559.ACB5011C00E9@cvs1.fedora.phx.redhat.com>

Author: djuran

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

Modified Files:
	.cvsignore azureus-4.0.0.4-boo-osx.diff 
	azureus-4.0.0.4-boo-updating-w32.diff 
	azureus-4.0.0.4-boo-windows.diff 
	azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff 
	azureus-SecureMessageServiceClientHelper-bcprov.patch 
	azureus-remove-manifest-classpath.patch azureus.script 
	azureus.spec sources 
Added Files:
	azureus-4.2.0.4-java5.patch build.xml 
Log Message:
- Upgrade to 4.2.0.4
- Fix SWT dir on x86_64 (Bz 515228)
- fix rpmlint warnings



azureus-4.2.0.4-java5.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE azureus-4.2.0.4-java5.patch ---
diff -up azureus-4.2.0.4/build.xml.java5 azureus-4.2.0.4/build.xml
--- azureus-4.2.0.4/build.xml.java5	2009-07-31 21:46:45.000000000 +0300
+++ azureus-4.2.0.4/build.xml	2009-07-31 21:47:11.000000000 +0300
@@ -36,7 +36,7 @@ NOTE:  You may need to set the  ANT_OPTS
          <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
       </path>
    
-   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
+   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
          <classpath refid="libs.classpath" />
       </javac>
    </target>


--- NEW FILE build.xml ---
<?xml version="1.0"?>

<!--
	
NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compile this project successfully.

-->

	
<project default="jar" name="Azureus" basedir=".">

   <property name="root.dir" value="." />  <!-- REMINDER: this needs to be "." for public source -->
   <property name="libs.dir" value="build/libs" />
   <property name="dist.dir" value="dist" />
   
   <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc **/.classpath **/.project **/aereg.lib **/aereg.dll" />
   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
   <!-- <property name="dist.source.excludes" value="${generic.excludes} **/*.class" /> -->
   
   
   <target name="init" >
      <echo message="Building Azureus2.jar..." />

      <tstamp/>

      <!-- <condition property="libs.dir" value="build/libs">
         <not>  <isset property="libs.dir" />  </not>
      </condition> -->
       
      <mkdir dir="${root.dir}/${dist.dir}" />
   </target>

   
   <target name="compile" depends="init" >
      <path id="libs.classpath">
         <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
      </path>
   
   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
         <classpath refid="libs.classpath" />
      </javac>
   </target>


   <target name="jar" depends="compile" >
      <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
         <manifest>
            <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
         </manifest>
      </jar>
      
      <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="." excludes="${dist.source.excludes}" /> -->

   </target>


   <target name="clean" >
      <delete quiet="true" >
         <fileset dir="${root.dir}/com" includes="**/*.class"/>
         <fileset dir="${root.dir}/org" includes="**/*.class"/>
      </delete>
      
      <delete dir="${root.dir}/${dist.dir}" />
   </target>

</project>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	26 Feb 2009 20:20:32 -0000	1.15
+++ .cvsignore	3 Aug 2009 19:05:58 -0000	1.16
@@ -1 +1 @@
-Vuze_4.0.0.4_source.zip
+Vuze_4.2.0.4_source.zip

azureus-4.0.0.4-boo-osx.diff:
 org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java  |   19 --
 org/gudy/azureus2/ui/swt/osx/Start.java             |   74 ----------
 org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java |  135 --------------------
 3 files changed, 228 deletions(-)

Index: azureus-4.0.0.4-boo-osx.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-osx.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-boo-osx.diff	26 Feb 2009 20:20:32 -0000	1.1
+++ azureus-4.0.0.4-boo-osx.diff	3 Aug 2009 19:05:58 -0000	1.2
@@ -1,710 +1,3 @@
-diff -urN org/gudy/azureus2/ui/swt.orig/mainwindow/SWTThread.java org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
---- org/gudy/azureus2/ui/swt.orig/mainwindow/SWTThread.java	2008-09-26 10:53:14.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java	2008-12-19 23:51:10.000000000 -0800
-@@ -150,24 +150,6 @@
- 			}
- 		});
-     
--    if ( Constants.isOSX ){
--    	
--    		// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--    	
--    	 try{
--    	 	
--            Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--            
--            Constructor constructor = ehancerClass.getConstructor(new Class[]{});
--            
--            constructor.newInstance(new Object[] {});
--
--        } catch (Exception e) {
--        	
--            Debug.printStackTrace(e);
--        }
--    }
--    
-     if (app != null) {
- 			runner = new Thread(new AERunnable() {
- 				public void runSupport() {
-diff -urN org/gudy/azureus2/ui/swt.orig/osx/CarbonUIEnhancer.java org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
---- org/gudy/azureus2/ui/swt.orig/osx/CarbonUIEnhancer.java	2008-07-24 13:38:16.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java	1969-12-31 16:00:00.000000000 -0800
-@@ -1,674 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2003 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials  * are made available under the terms of the Common Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/cpl-v10.html
-- *  * Contributors:
-- *     IBM Corporation - initial API and implementation
-- * 		 Aelitis - Adaptation for Azureus
-- *******************************************************************************/
--package org.gudy.azureus2.ui.swt.osx;
--
--import java.io.IOException;
--import java.lang.reflect.Method;
--
--import org.eclipse.swt.SWT;
--import org.eclipse.swt.internal.Callback;
--import org.eclipse.swt.internal.carbon.AEDesc;
--import org.eclipse.swt.internal.carbon.CFRange;
--import org.eclipse.swt.internal.carbon.EventRecord;
--import org.eclipse.swt.internal.carbon.HICommand;
--import org.eclipse.swt.internal.carbon.OS;
--import org.eclipse.swt.widgets.Display;
--import org.eclipse.swt.widgets.Event;
--import org.eclipse.swt.widgets.Shell;
--import org.eclipse.swt.widgets.Widget;
--import org.gudy.azureus2.core3.config.COConfigurationManager;
--import org.gudy.azureus2.core3.internat.MessageText;
--import org.gudy.azureus2.core3.util.AERunnable;
--import org.gudy.azureus2.core3.util.Debug;
--import org.gudy.azureus2.platform.macosx.access.jnilib.OSXAccess;
--import org.gudy.azureus2.ui.swt.UIExitUtilsSWT;
--import org.gudy.azureus2.ui.swt.Utils;
--import org.gudy.azureus2.ui.swt.config.wizard.ConfigureWizard;
--import org.gudy.azureus2.ui.swt.help.AboutWindow;
--import org.gudy.azureus2.ui.swt.mainwindow.TorrentOpener;
--import org.gudy.azureus2.ui.swt.nat.NatTestWindow;
--import org.gudy.azureus2.ui.swt.speedtest.SpeedTestWizard;
--
--import com.aelitis.azureus.core.AzureusCoreFactory;
--import com.aelitis.azureus.ui.UIFunctions;
--import com.aelitis.azureus.ui.UIFunctionsManager;
--import com.apple.cocoa.application.NSApplication;
--
--//import com.apple.eawt.*; //Application and ApplicationAdapter
--
--public class CarbonUIEnhancer
--{
--	private static final int kHICommandPreferences = ('p' << 24) + ('r' << 16)
--			+ ('e' << 8) + 'f';
--
--	private static final int kHICommandAbout = ('a' << 24) + ('b' << 16)
--			+ ('o' << 8) + 'u';
--
--	private static final int kHICommandServices = ('s' << 24) + ('e' << 16)
--			+ ('r' << 8) + 'v';
--
--	private static final int kHICommandWizard = ('a' << 24) + ('z' << 16)
--			+ ('c' << 8) + 'n';
--
--	private static final int kHICommandNatTest = ('a' << 24) + ('z' << 16)
--			+ ('n' << 8) + 't';
--
--	private static final int kHICommandSpeedTest = ('a' << 24) + ('z' << 16)
--			+ ('s' << 8) + 't';
--
--	private static final int kHICommandRestart = ('a' << 24) + ('z' << 16)
--			+ ('r' << 8) + 's';
--
--	private static final int typeAEList = ('l' << 24) + ('i' << 16) + ('s' << 8)
--			+ 't';
--
--	private static final int kCoreEventClass = ('a' << 24) + ('e' << 16)
--			+ ('v' << 8) + 't';
--
--	private static final int kAEOpenDocuments = ('o' << 24) + ('d' << 16)
--			+ ('o' << 8) + 'c';
--
--	private static final int kAEReopenApplication = ('r' << 24) + ('a' << 16)
--			+ ('p' << 8) + 'p';
--
--	private static final int kAEOpenContents = ('o' << 24) + ('c' << 16)
--			+ ('o' << 8) + 'n';
--
--	private static final int kURLEventClass = ('G' << 24) + ('U' << 16)
--			+ ('R' << 8) + 'L';
--
--	private static final int typeText = ('T' << 24) + ('E' << 16) + ('X' << 8)
--			+ 'T';
--
--	private static final String RESOURCE_BUNDLE = "org.eclipse.ui.carbon.Messages"; //$NON-NLS-1$
--
--	private static String fgAboutActionName;
--
--	private static String fgWizardActionName;
--
--	private static String fgNatTestActionName;
--
--	private static String fgRestartActionName;
--
--	private static String fgSpeedTestActionName;
--
--	private static int memmove_type = 0;
--
--	/**
--	 * KN: Some of the menu items have been removed for the Vuze and Vuze Advanced UI's;
--	 * the classic UI still retains all its menu items as before.  Follow this flag in the code
--	 * to see which menu items are effected.
--	 */
--	private boolean isAZ3 = "az3".equalsIgnoreCase(COConfigurationManager.getStringParameter("ui"));
--
--	public static final int BOUNCE_SINGLE = NSApplication.UserAttentionRequestInformational;
--
--	public static final int BOUNCE_CONTINUOUS = NSApplication.UserAttentionRequestCritical;
--
--	public CarbonUIEnhancer() {
--		if (fgAboutActionName == null) {
--			fgAboutActionName = MessageText.getString("MainWindow.menu.help.about").replaceAll(
--					"&", "");
--		}
--
--		if (false == isAZ3) {
--			if (fgWizardActionName == null) {
--				fgWizardActionName = MessageText.getString(
--						"MainWindow.menu.file.configure").replaceAll("&", "");
--			}
--			if (fgNatTestActionName == null) {
--				fgNatTestActionName = MessageText.getString(
--						"MainWindow.menu.tools.nattest").replaceAll("&", "");
--			}
--
--			if (fgSpeedTestActionName == null) {
--				fgSpeedTestActionName = MessageText.getString(
--						"MainWindow.menu.tools.speedtest").replaceAll("&", "");
--			}
--		}
--
--		if (fgRestartActionName == null) {
--			fgRestartActionName = MessageText.getString(
--					"MainWindow.menu.file.restart").replaceAll("&", "");
--		}
--		earlyStartup();
--		registerTorrentFile();
--	}
--
--	public static void registerToolbarToggle(Shell shell) {
--		final Callback toolbarToggleCB = new Callback(target, "toolbarToggle", 3);
--		int toolbarToggle = toolbarToggleCB.getAddress();
--		if (toolbarToggle == 0) {
--			Debug.out("OSX: Could not find callback 'toolbarToggle'");
--			toolbarToggleCB.dispose();
--			return;
--		}
--
--		shell.getDisplay().disposeExec(new Runnable() {
--			public void run() {
--				toolbarToggleCB.dispose();
--			}
--		});
--
--		//	 add the button to the window trim
--		int windowHandle = OS.GetControlOwner(shell.handle);
--		OS.ChangeWindowAttributes(windowHandle, OS.kWindowToolbarButtonAttribute, 0);
--
--		int[] mask = new int[] {
--			OS.kEventClassWindow,
--			OS.kEventWindowToolbarSwitchMode
--		};
--		// register the handler with the OS
--		OS.InstallEventHandler(OS.GetApplicationEventTarget(), toolbarToggle,
--				mask.length / 2, mask, 0, null);
--	}
--
--	private void registerTorrentFile() {
--		int result;
--
--		Callback clickDockIconCallback = new Callback(target, "clickDockIcon", 3);
--		int clickDocIcon = clickDockIconCallback.getAddress();
--		if (clickDocIcon == 0) {
--			clickDockIconCallback.dispose();
--		} else {
--			result = OS.AEInstallEventHandler(kCoreEventClass, kAEReopenApplication,
--					clickDocIcon, 0, false);
--
--			if (result != OS.noErr) {
--				Debug.out("OSX: Could Install ReopenApplication Event Handler. Error: "
--						+ result);
--			}
--		}
--
--		Callback openContentsCallback = new Callback(target, "openContents", 3);
--		int openContents = openContentsCallback.getAddress();
--		if (openContents == 0) {
--			openContentsCallback.dispose();
--		} else {
--			result = OS.AEInstallEventHandler(kCoreEventClass, kAEOpenContents,
--					openContents, 0, false);
--
--			if (result != OS.noErr) {
--				Debug.out("OSX: Could Install OpenContents Event Handler. Error: "
--						+ result);
--			}
--		}
--
--		Callback openDocCallback = new Callback(target, "openDocProc", 3);
--		int openDocProc = openDocCallback.getAddress();
--		if (openDocProc == 0) {
--			Debug.out("OSX: Could not find Callback 'openDocProc'");
--			openDocCallback.dispose();
--			return;
--		}
--
--		result = OS.AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
--				openDocProc, 0, false);
--
--		if (result != OS.noErr) {
--			Debug.out("OSX: Could not Install OpenDocs Event Handler. Error: "
--					+ result);
--			return;
--		}
--
--		result = OS.AEInstallEventHandler(kURLEventClass, kURLEventClass,
--				openDocProc, 0, false);
--		if (result != OS.noErr) {
--			Debug.out("OSX: Could not Install URLEventClass Event Handler. Error: "
--					+ result);
--			return;
--		}
--
--		///
--
--		Callback quitAppCallback = new Callback(target, "quitAppProc", 3);
--		int quitAppProc = quitAppCallback.getAddress();
--		if (quitAppProc == 0) {
--			Debug.out("OSX: Could not find Callback 'quitApp'");
--			quitAppCallback.dispose();
--		} else {
--			result = OS.AEInstallEventHandler(kCoreEventClass, OS.kAEQuitApplication,
--					quitAppProc, 0, false);
--			if (result != OS.noErr) {
--				Debug.out("OSX: Could not install QuitApplication Event Handler. Error: "
--						+ result);
--			}
--		}
--
--		///
--
--		int appTarget = OS.GetApplicationEventTarget();
--		Callback appleEventCallback = new Callback(this, "appleEventProc", 3);
--		int appleEventProc = appleEventCallback.getAddress();
--		int[] mask3 = new int[] {
--			OS.kEventClassAppleEvent,
--			OS.kEventAppleEvent,
--			kURLEventClass,
--			kAEReopenApplication,
--			kAEOpenContents,
--		};
--		result = OS.InstallEventHandler(appTarget, appleEventProc,
--				mask3.length / 2, mask3, 0, null);
--		if (result != OS.noErr) {
--			Debug.out("OSX: Could Install Event Handler. Error: " + result);
--			return;
--		}
--	}
--
--	/* (non-Javadoc)
--	 * @see org.eclipse.ui.IStartup#earlyStartup()
--	 */
--	public void earlyStartup() {
--		final Display display = Display.getDefault();
--		display.syncExec(new AERunnable() {
--			public void runSupport() {
--				hookApplicationMenu(display);
--			}
--		});
--	}
--
--	/**
--	* See Apple Technical Q&A 1079 (http://developer.apple.com/qa/qa2001/qa1079.html)<br />
--	* Also http://developer.apple.com/documentation/Carbon/Reference/Menu_Manager/menu_mgr_ref/function_group_10.html
--	*/
--	public void hookApplicationMenu(final Display display) {
--		// Callback target
--		Object target = new Object() {
--			int commandProc(int nextHandler, int theEvent, int userData) {
--				if (OS.GetEventKind(theEvent) == OS.kEventProcessCommand) {
--					HICommand command = new HICommand();
--					OS.GetEventParameter(theEvent, OS.kEventParamDirectObject,
--							OS.typeHICommand, null, HICommand.sizeof, null, command);
--					switch (command.commandID) {
--						case kHICommandPreferences: {
--							UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--							if (uiFunctions != null) {
--								uiFunctions.openView(UIFunctions.VIEW_CONFIG, null);
--							}
--							return OS.noErr;
--						}
--						case kHICommandAbout:
--							AboutWindow.show(display);
--							return OS.noErr;
--						case kHICommandRestart: {
--							UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--							if (uiFunctions != null) {
--								uiFunctions.dispose(true, false);
--							}
--							return OS.noErr;
--						}
--						case kHICommandWizard:
--							new ConfigureWizard(AzureusCoreFactory.getSingleton(), false);
--							return OS.noErr;
--						case kHICommandNatTest:
--							new NatTestWindow();
--							return OS.noErr;
--						case kHICommandSpeedTest:
--							new SpeedTestWizard(AzureusCoreFactory.getSingleton(), display);
--							return OS.noErr;
--
--						case OS.kAEQuitApplication:
--							UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--							if (uiFunctions != null) {
--								uiFunctions.dispose(false, false);
--								return OS.noErr;
--							} else {
--								UIExitUtilsSWT.setSkipCloseCheck(true);
--							}
--						default:
--							break;
--					}
--				}
--				return OS.eventNotHandledErr;
--			}
--		};
--		final Callback commandCallback = new Callback(target, "commandProc", 3); //$NON-NLS-1$
--		int commandProc = commandCallback.getAddress();
--		if (commandProc == 0) {
--			commandCallback.dispose();
--			return; // give up
--		}
--
--		// Install event handler for commands
--		int[] mask = new int[] {
--			OS.kEventClassCommand,
--			OS.kEventProcessCommand
--		};
--		OS.InstallEventHandler(OS.GetApplicationEventTarget(), commandProc,
--				mask.length / 2, mask, 0, null);
--
--		// create About menu command
--		int[] outMenu = new int[1];
--		short[] outIndex = new short[1];
--		if (OS.GetIndMenuItemWithCommandID(0, kHICommandPreferences, 1, outMenu,
--				outIndex) == OS.noErr
--				&& outMenu[0] != 0) {
--			int menu = outMenu[0];
--
--			int l = fgAboutActionName.length();
--			char buffer[] = new char[l];
--			fgAboutActionName.getChars(0, l, buffer, 0);
--			int str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer,
--					l);
--			OS.InsertMenuItemTextWithCFString(menu, str, (short) 0, 0,
--					kHICommandAbout);
--			OS.CFRelease(str);
--			// add separator between About & Preferences
--			OS.InsertMenuItemTextWithCFString(menu, 0, (short) 1,
--					OS.kMenuItemAttrSeparator, 0);
--
--			// enable pref menu
--			OS.EnableMenuCommand(menu, kHICommandPreferences);
--			// disable services menu
--			OS.DisableMenuCommand(menu, kHICommandServices);
--
--			if (false == isAZ3) {
--				// wizard menu
--				l = fgWizardActionName.length();
--				buffer = new char[l];
--				fgWizardActionName.getChars(0, l, buffer, 0);
--				str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
--				OS.InsertMenuItemTextWithCFString(menu, str, (short) 3, 0,
--						kHICommandWizard);
--				OS.CFRelease(str);
--
--				// NAT test menu
--				l = fgNatTestActionName.length();
--				buffer = new char[l];
--				fgNatTestActionName.getChars(0, l, buffer, 0);
--				str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
--				OS.InsertMenuItemTextWithCFString(menu, str, (short) 4, 0,
--						kHICommandNatTest);
--				OS.CFRelease(str);
--
--				//SpeedTest
--				l = fgSpeedTestActionName.length();
--				buffer = new char[l];
--				fgSpeedTestActionName.getChars(0, l, buffer, 0);
--				str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
--				OS.InsertMenuItemTextWithCFString(menu, str, (short) 5, 0,
--						kHICommandSpeedTest);
--				OS.CFRelease(str);
--			}
--
--			OS.InsertMenuItemTextWithCFString(menu, 0, (short) 6,
--					OS.kMenuItemAttrSeparator, 0);
--
--			// restart menu
--			l = fgRestartActionName.length();
--			buffer = new char[l];
--			fgRestartActionName.getChars(0, l, buffer, 0);
--			str = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, buffer, l);
--			OS.InsertMenuItemTextWithCFString(menu, str, (short) 7, 0,
--					kHICommandRestart);
--			OS.CFRelease(str);
--
--			OS.InsertMenuItemTextWithCFString(menu, 0, (short) 8,
--					OS.kMenuItemAttrSeparator, 0);
--		}
--
--		// schedule disposal of callback object
--		display.disposeExec(new AERunnable() {
--			public void runSupport() {
--				commandCallback.dispose();
--				//               stopSidekick();
--			}
--		});
--	}
--
--	private static void stopSidekick() {
--		try {
--			Runtime.getRuntime().exec(new String[] {
--				"osascript",
--				"-e",
--				"tell application \"Azureus\" to quit"
--			});
--		} catch (IOException e) {
--			Debug.printStackTrace(e);
--		}
--	}
--
--	int appleEventProc(int nextHandler, int theEvent, int userData) {
--		int eventClass = OS.GetEventClass(theEvent);
--		//int eventKind = OS.GetEventKind(theEvent);
--
--		//System.out.println("appleEventProc " + OSXtoString(eventClass) + ";"
--		//		+ OS.GetEventKind(theEvent) + ";" + OSXtoString(theEvent) + ";"
--		//		+ OSXtoString(userData));
--
--		// Process teh odoc event
--		if (eventClass == OS.kEventClassAppleEvent) {
--			int[] aeEventID = new int[1];
--			if (OS.GetEventParameter(theEvent, OS.kEventParamAEEventID, OS.typeType,
--					null, 4, null, aeEventID) != OS.noErr) {
--				return OS.eventNotHandledErr;
--			}
--			//System.out.println("EventID = " + OSXtoString(aeEventID[0]));
--			if (aeEventID[0] != kAEOpenDocuments && aeEventID[0] != kURLEventClass
--					&& aeEventID[0] != kAEReopenApplication
--					&& aeEventID[0] != kAEOpenContents
--					&& aeEventID[0] != OS.kAEQuitApplication) {
--				return OS.eventNotHandledErr;
--			}
--
--			// Handle Event
--			EventRecord eventRecord = new EventRecord();
--			OS.ConvertEventRefToEventRecord(theEvent, eventRecord);
--			OS.AEProcessAppleEvent(eventRecord);
--
--			// Tell Mac we are handling this event
--			return OS.noErr;
--		}
--
--		return OS.eventNotHandledErr;
--	}
--
--	private static String OSXtoString(int i) {
--		char[] c = new char[4];
--		c[0] = (char) ((i >> 24) & 0xff);
--		c[1] = (char) ((i >> 16) & 0xff);
--		c[2] = (char) ((i >> 8) & 0xff);
--		c[3] = (char) (i & 0xff);
--		return new String(c);
--	}
--
--	private static void memmove(byte[] dest, int src, int size) {
--		switch (memmove_type) {
--			case 0:
--				try {
--					OSXAccess.memmove(dest, src, size);
--					memmove_type = 0;
--					return;
--				} catch (Throwable e) {
--				}
--				// FALL THROUGH
--
--			case 1:
--				try {
--					Class cMemMove = Class.forName("org.eclipse.swt.internal.carbon.OS");
--
--					Method method = cMemMove.getMethod("memmove", new Class[] {
--						byte[].class,
--						Integer.TYPE,
--						Integer.TYPE
--					});
--
--					method.invoke(null, new Object[] {
--						dest,
--						new Integer(src),
--						new Integer(size)
--					});
--					memmove_type = 1;
--					return;
--				} catch (Throwable e) {
--				}
--
--				// FALL THROUGH
--			case 2:
--				try {
--					Class cMemMove = Class.forName("org.eclipse.swt.internal.carbon.OS");
--
--					Method method = cMemMove.getMethod("memcpy", new Class[] {
--						byte[].class,
--						Integer.TYPE,
--						Integer.TYPE
--					});
--
--					method.invoke(null, new Object[] {
--						dest,
--						new Integer(src),
--						new Integer(size)
--					});
--
--					memmove_type = 2;
--					return;
--				} catch (Throwable e) {
--				}
--
--				// FALL THROUGH
--
--			default:
--				break;
--		}
--
--		memmove_type = 3;
--	}
--
--	final static Object target = new Object() {
--		int quitAppProc(int theAppleEvent, int reply, int handlerRefcon) {
--			UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--			if (uiFunctions != null) {
--				uiFunctions.dispose(false, false);
--			} else {
--				UIExitUtilsSWT.setSkipCloseCheck(true);
--				Display.getDefault().dispose();
--			}
--			return OS.noErr;
--		}
--
--		int openDocProc(int theAppleEvent, int reply, int handlerRefcon) {
--			AEDesc aeDesc = new AEDesc();
--			EventRecord eventRecord = new EventRecord();
--			OS.ConvertEventRefToEventRecord(theAppleEvent, eventRecord);
--			try {
--				int result = OSXAccess.AEGetParamDesc(theAppleEvent,
--						OS.kEventParamDirectObject, typeAEList, aeDesc);
--				if (result != OS.noErr) {
--					Debug.out("OSX: Could call AEGetParamDesc. Error: " + result);
--					return OS.noErr;
--				}
--			} catch (java.lang.UnsatisfiedLinkError e) {
--				Debug.out("OSX: AEGetParamDesc not available.  Can't open sent file");
--				return OS.noErr;
--			}
--
--			int[] count = new int[1];
--			OS.AECountItems(aeDesc, count);
--			//System.out.println("COUNT: " + count[0]);
--			if (count[0] > 0) {
--				String[] fileNames = new String[count[0]];
--				int maximumSize = 80; // size of FSRef
--				int dataPtr = OS.NewPtr(maximumSize);
--				int[] aeKeyword = new int[1];
--				int[] typeCode = new int[1];
--				int[] actualSize = new int[1];
--				for (int i = 0; i < count[0]; i++) {
--					if (OS.AEGetNthPtr(aeDesc, i + 1, OS.typeFSRef, aeKeyword, typeCode,
--							dataPtr, maximumSize, actualSize) == OS.noErr) {
--						byte[] fsRef = new byte[actualSize[0]];
--						memmove(fsRef, dataPtr, actualSize[0]);
--						int dirUrl = OS.CFURLCreateFromFSRef(OS.kCFAllocatorDefault, fsRef);
--						int dirString = OS.CFURLCopyFileSystemPath(dirUrl,
--								OS.kCFURLPOSIXPathStyle);
--						OS.CFRelease(dirUrl);
--						int length = OS.CFStringGetLength(dirString);
--						char[] buffer = new char[length];
--						CFRange range = new CFRange();
--						range.length = length;
--						OS.CFStringGetCharacters(dirString, range, buffer);
--						OS.CFRelease(dirString);
--						fileNames[i] = new String(buffer);
--					}
--
--					if (OS.AEGetNthPtr(aeDesc, i + 1, typeText, aeKeyword, typeCode,
--							dataPtr, maximumSize, actualSize) == OS.noErr) {
--						byte[] urlRef = new byte[actualSize[0]];
--						memmove(urlRef, dataPtr, actualSize[0]);
--						fileNames[i] = new String(urlRef);
--					}
--
--					//System.out.println(fileNames[i]);
--				}
--
--				TorrentOpener.openTorrents(fileNames);
--			}
--
--			return OS.noErr;
--		}
--
--		int clickDockIcon(int nextHandler, int theEvent, int userData) {
--			UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--			if (uiFunctions != null) {
--				uiFunctions.bringToFront();
--				return OS.noErr;
--			}
--			return OS.eventNotHandledErr;
--		}
--
--		int openContents(int nextHandler, int theEvent, int userData) {
--			Debug.out("openDocContents");
--			return OS.noErr;
--		}
--
--		int toolbarToggle(int nextHandler, int theEvent, int userData) {
--			int eventKind = OS.GetEventKind(theEvent);
--			if (eventKind != OS.kEventWindowToolbarSwitchMode) {
--				return OS.eventNotHandledErr;
--			}
--
--			int[] theWindow = new int[1];
--			OS.GetEventParameter(theEvent, OS.kEventParamDirectObject,
--					OS.typeWindowRef, null, 4, null, theWindow);
--
--			int[] theRoot = new int[1];
--			OS.GetRootControl(theWindow[0], theRoot);
--			final Widget widget = Display.getCurrent().findWidget(theRoot[0]);
--
--			if (!(widget instanceof Shell)) {
--				return OS.eventNotHandledErr;
--			}
--			final Shell shellAffected = (Shell) widget;
--
--			Utils.execSWTThread(new AERunnable() {
--				public void runSupport() {
--					int type;
--					Long l = (Long) shellAffected.getData("OSX.ToolBarToggle");
--					if (l == null || l.longValue() == 0) {
--						type = SWT.Collapse;
--					} else {
--						type = SWT.Expand;
--					}
--
--					Event event = new Event();
--					event.type = type;
--					event.display = widget.getDisplay();
--					event.widget = widget;
--					shellAffected.notifyListeners(type, event);
--
--					shellAffected.setData("OSX.ToolBarToggle", new Long(
--							type == SWT.Collapse ? 1 : 0));
--				}
--			});
--
--			return OS.noErr;
--		}
--	};
--
--}
-\ No newline at end of file
 diff -urN org/gudy/azureus2/ui/swt.orig/osx/Start.java org/gudy/azureus2/ui/swt/osx/Start.java
 --- org/gudy/azureus2/ui/swt.orig/osx/Start.java	2006-02-09 19:43:24.000000000 -0800
 +++ org/gudy/azureus2/ui/swt/osx/Start.java	1969-12-31 16:00:00.000000000 -0800
@@ -923,3 +216,34 @@ diff -urN org/gudy/azureus2/ui/swt.orig/
 -		return result;
 -	}
 -}
+diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+--- org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx	2009-04-16 20:46:42.000000000 +0300
++++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java	2009-07-31 19:35:41.000000000 +0300
+@@ -153,25 +153,6 @@ public class SWTThread {
+ 			}
+ 		});
+     
+-    if ( Constants.isOSX && SWT.getPlatform().equals("carbon") ){
+-    	
+-    		// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
+-    	
+-    	 try{
+-    	 	
+-            Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
+-            
+-            Constructor constructor = ehancerClass.getConstructor(new Class[]{});
+-            
+-            constructor.newInstance(new Object[] {});
+-
+-        } catch (Exception e) {
+-        	
+-            Debug.printStackTrace(e);
+-        }
+-    }
+-    
+-
+ 		if (app != null) {
+ 			app.runInSWTThread();
+ 			runner = new Thread(new AERunnable() {
+diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java
+diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java

azureus-4.0.0.4-boo-updating-w32.diff:
 AzureusRestarterImpl.java |  190 ----------------------------------------------
 1 file changed, 3 insertions(+), 187 deletions(-)

Index: azureus-4.0.0.4-boo-updating-w32.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-updating-w32.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-boo-updating-w32.diff	26 Feb 2009 20:20:32 -0000	1.1
+++ azureus-4.0.0.4-boo-updating-w32.diff	3 Aug 2009 19:05:58 -0000	1.2
@@ -1,7 +1,7 @@
-diff -urN com/aelitis/azureus/core/update.orig/impl/AzureusRestarterImpl.java com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
---- com/aelitis/azureus/core/update.orig/impl/AzureusRestarterImpl.java	2007-07-30 13:13:28.000000000 -0700
-+++ com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java	2008-12-20 00:09:42.000000000 -0800
-@@ -30,8 +30,8 @@
+diff -up azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32 azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java
+--- azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java.boo-updating-w32	2009-07-08 19:00:28.000000000 +0300
++++ azureus-4.2.0.4/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java	2009-07-31 20:20:12.000000000 +0300
+@@ -30,8 +30,8 @@ import org.gudy.azureus2.core3.util.*;
  import org.gudy.azureus2.platform.PlatformManager;
  import org.gudy.azureus2.platform.PlatformManagerFactory;
  import org.gudy.azureus2.platform.unix.ScriptAfterShutdown;
@@ -9,10 +9,10 @@ diff -urN com/aelitis/azureus/core/updat
 -import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
 +//import org.gudy.azureus2.platform.win32.access.AEWin32Access;
 +//import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
- import org.gudy.azureus2.update.UpdaterUtils;
- 
- import com.aelitis.azureus.core.AzureusCore;
-@@ -219,20 +219,6 @@
+ import org.gudy.azureus2.plugins.PluginInterface;
+ import org.gudy.azureus2.plugins.platform.PlatformManagerException;
+ import org.gudy.azureus2.pluginsimpl.local.PluginInitializer;
+@@ -218,20 +218,6 @@ AzureusRestarterImpl 
  		PrintWriter	log,
  		String		exec )
  	{
@@ -33,7 +33,7 @@ diff -urN com/aelitis/azureus/core/updat
  	}
  	
  
-@@ -304,131 +290,6 @@
+@@ -294,131 +280,6 @@ AzureusRestarterImpl 
        String backupJavaRunString,
        boolean update_only) 
    {
@@ -165,7 +165,7 @@ diff -urN com/aelitis/azureus/core/updat
  		return true;
  	}
    
-@@ -454,9 +315,6 @@
+@@ -444,9 +305,6 @@ AzureusRestarterImpl 
      	
      	restartAzureus_Unix(log,mainClass,properties,parameters);
        
@@ -175,7 +175,7 @@ diff -urN com/aelitis/azureus/core/updat
      }
    }
    
-@@ -468,35 +326,7 @@
+@@ -458,35 +316,7 @@ AzureusRestarterImpl 
      String[]  parameters,
      boolean	update_only) 
    {
@@ -212,7 +212,7 @@ diff -urN com/aelitis/azureus/core/updat
    
  
  	private boolean
-@@ -529,20 +359,6 @@
+@@ -519,20 +349,6 @@ AzureusRestarterImpl 
      String[]  properties,
      String[] parameters) 
    {

azureus-4.0.0.4-boo-windows.diff:
 platform/PlatformManagerFactory.java                                                             |   17 
 platform/PlatformManagerPluginDelegate.java                                                      |    7 
 platform/macosx/NativeInvocationBridge.java                                                      |   96 
 platform/macosx/PListEditor.java                                                                 |  281 -
 platform/macosx/access/jnilib/OSXAccess.c                                                        |  127 
 platform/macosx/access/jnilib/OSXAccess.java                                                     |   58 
 platform/macosx/access/jnilib/make.mak                                                           |   12 
 platform/win32/PlatformManagerUpdateChecker.java                                                 |  361 -
 platform/win32/access/AEWin32Access.java                                                         |  229 -
 platform/win32/access/AEWin32AccessException.java                                                |   40 
 platform/win32/access/AEWin32AccessListener.java                                                 |   35 
 platform/win32/access/AEWin32Manager.java                                                        |   41 
 platform/win32/access/impl/AEWin32AccessCallback.java                                            |   37 
 platform/win32/access/impl/AEWin32AccessExceptionImpl.java                                       |   44 
 platform/win32/access/impl/AEWin32AccessImpl.java                                                |  555 --
 platform/win32/access/impl/AEWin32AccessInterface.java                                           |  249 -
 platform/win32/access/impl/Debug/aereg.dll                                                       |binary
 platform/win32/access/impl/Debug/aereg.lib                                                       |binary
 platform/win32/access/impl/Release/aereg.dll                                                     |binary
 platform/win32/access/impl/Release/aereg.lib                                                     |binary
 platform/win32/access/impl/StdAfx.cpp                                                            |    8 
 platform/win32/access/impl/StdAfx.h                                                              |   24 
 platform/win32/access/impl/Test.java                                                             |  150 
 platform/win32/access/impl/aenet.cpp                                                             |  781 ---
 platform/win32/access/impl/aenet.h                                                               |  102 
 platform/win32/access/impl/aereg.cpp                                                             | 2115 ----------
 platform/win32/access/impl/aereg.dsp                                                             |  136 
 platform/win32/access/impl/aereg.dsw                                                             |   29 
 platform/win32/access/impl/aereg.h                                                               |   41 
 platform/win32/access/impl/generate_ini.bat                                                      |    1 
 platform/win32/access/impl/org_gudy_azureus2_platform_win32_access_impl_AEWin32AccessInterface.h |  164 
 update/CoreUpdateChecker.java                                                                    |   33 
 32 files changed, 24 insertions(+), 5749 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 azureus-4.0.0.4-boo-windows.diffIndex: azureus-4.0.0.4-boo-windows.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-windows.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-boo-windows.diff	26 Feb 2009 20:20:32 -0000	1.1
+++ azureus-4.0.0.4-boo-windows.diff	3 Aug 2009 19:05:58 -0000	1.2
@@ -1,355 +1,3 @@
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/cocoa/CocoaJavaBridge.java org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java
---- org/gudy/azureus2/platform.orig/macosx/access/cocoa/CocoaJavaBridge.java	2008-02-08 17:21:08.000000000 -0800
-+++ org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java	1969-12-31 16:00:00.000000000 -0800
-@@ -1,347 +0,0 @@
--package org.gudy.azureus2.platform.macosx.access.cocoa;
--
--/*
-- * Created on 27-Mar-2005
-- * Created by James Yeh
-- * Copyright (C) 2004-2005 Aelitis, All Rights Reserved.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 46,603.30 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- *
-- */
--
--import com.apple.cocoa.foundation.NSAppleEventDescriptor;
--import com.apple.cocoa.foundation.NSAppleScript;
--import com.apple.cocoa.foundation.NSAutoreleasePool;
--import com.apple.cocoa.foundation.NSMutableDictionary;
--import org.gudy.azureus2.core3.logging.*;
--import org.gudy.azureus2.core3.util.AEMonitor;
--import org.gudy.azureus2.core3.util.AERunnable;
--import org.gudy.azureus2.core3.util.AEThread;
--import org.gudy.azureus2.core3.util.Debug;
--import org.gudy.azureus2.platform.macosx.NativeInvocationBridge;
--
--import java.io.File;
--import java.text.MessageFormat;
--
--/**
-- * <p>Performs PlatformManager tasks using Cocoa-Java (FoundationKit only)</p>
-- * <p>For now, operations are performed using NSAppleScript, rather than using NSWorkspace.
-- * This is still significantly faster than calling the cmd-line osascript.</p>
-- * @version 2.1 Apr 2, 2005
-- */
--public final class CocoaJavaBridge extends NativeInvocationBridge
--{
--    /**
--     * The path the Cocoa-Java class files are located at
--     */
--    protected static final String CLASS_PATH = "/system/library/java";
--
--    private static final String REVEAL_SCRIPT_FORMAT = "tell application \"System Events\"\ntell application \"{0}\"\nactivate\nreveal (posix file \"{1}\" as alias)\nend tell\nend tell";
--
--    private static final String DEL_SCRIPT_FORMAT = "tell application \"Finder\" to move (posix file \"{0}\" as alias) to the trash";
--
--    /**
--     * Main NSAutoreleasePool
--     */
--    private int mainPool;
--
--    protected AEMonitor classMon = new AEMonitor("CocoaJavaBridge:C");
--    private AEMonitor scriptMon = new AEMonitor("CocoaJavaBridge:S");
--
--    protected boolean isDisposed = false;
--
--    protected RunnableDispatcher scriptDispatcher;
--
--    public CocoaJavaBridge()
--    {
--        try
--        {
--            classMon.enter();
--            mainPool = NSAutoreleasePool.push();
--
--            scriptDispatcher = new RunnableDispatcher();
--        }
--        finally
--        {
--            classMon.exit();
--        }
--    }
--
--    // interface implementation
--
--    /**
--     * {@inheritDoc}
--     */
--    protected boolean performRecoverableFileDelete(File path)
--    {
--        if(!path.exists())
--            return false;
--
--        NSAppleEventDescriptor result =  executeScriptWithAsync(DEL_SCRIPT_FORMAT, new Object[]{path.getAbsolutePath()});
--        return (result != null);
--    }
--
--    /**
--     * {@inheritDoc}
--     */
--	protected boolean showInFinder(File path, String fileBrowserApp) {
--		if (!path.exists())
--			return false;
--
--		NSAppleEventDescriptor result = null;
--		int pool = NSAutoreleasePool.push();
--		try {
--			result = executeScriptWithAsync(REVEAL_SCRIPT_FORMAT, new Object[] {
--				fileBrowserApp,
--				path.getAbsolutePath()
--			});
--		} finally {
--			NSAutoreleasePool.pop(pool);
--		}
--		return (result != null);
--	}
--
--    /**
--     * {@inheritDoc}
--     */
--    protected boolean isEnabled()
--    {
--        // simple check with classpath
--        return System.getProperty("java.class.path").toLowerCase().indexOf(CLASS_PATH) != -1;
--    }
--
--    // class utility methods
--
--    /**
--     * <p>Executes a new instance of NSAppleScript</p>
--     * <p>The method is wrapped in an autorelease pool and an AEMonitor. If there are
--     * no format parameters, MessageFormat is not used to parse the format string, and
--     * the format string will be treated as the source itself.</p>
--     * @see MessageFormat#format(String, Object...)
--     * @see NSAppleScript#execute(com.apple.cocoa.foundation.NSMutableDictionary)
--     */
--    protected final NSAppleEventDescriptor executeScript(String scriptFormat, Object[] params)
--    {
--        try
--        {
--            scriptMon.enter();
--
--            int pool = NSAutoreleasePool.push();
--            long start = System.currentTimeMillis();
--
--            String src;
--            if(params == null || params.length == 0)
--            {
--                src = scriptFormat;
--            }
--            else
--            {
--                src = MessageFormat.format(scriptFormat, params);
--            }
--
--            Debug.outNoStack("Executing: \n" + src);
--
--            NSAppleScript scp = new NSAppleScript(src);
--            NSAppleEventDescriptor result =  scp.execute(new NSMutableDictionary());
--
--            Debug.outNoStack(MessageFormat.format("Elapsed time: {0}ms\n", new Object[]{new Long(System.currentTimeMillis() - start)}));
--            NSAutoreleasePool.pop(pool);
--            return result;
--        }
--        finally
--        {
--            scriptMon.exit();
--        }
--    }
--
--    /**
--     * <p>Executes a new instance of NSAppleScript in a forked AEThread</p>
--     * <p>This method always returns a "true" event descriptor. Callbacks are currently unsupported
--     * , so in the event of an error, the logger is autuomatically notified.</p>
--     * <p>The thread's runSupport method is wrapped in an autorelease pool. If there are
--     * no format parameters, MessageFormat is not used to parse the format string, and
--     * the format string will be treated as the source itself.</p>
--     * @see org.gudy.azureus2.core3.util.AEThread#runSupport()
--     * @see MessageFormat#format(String, Object...)
--     * @see NSAppleScript#execute(com.apple.cocoa.foundation.NSMutableDictionary)
--     * @return NSAppleEventDescriptor.descriptorWithBoolean(true)
--     */
--    protected final NSAppleEventDescriptor executeScriptWithNewThread(final String scriptFormat, final Object[] params)
--    {
--        Thread worker = new AEThread("ScriptObject", true)
--        {
--            public void runSupport()
--            {
[...3579 lines suppressed...]
--    
--    public void
--    removeListener(
--    	PlatformManagerListener		listener )
--    {
--    	listeners.remove( listener );
--    }
--
--  /**
--   * Gets an ID to identify this computer to azureus.  Used when the computer
--   * has muliple user accounts and we need a way to not duplicate efforts
--   * (An example would be to skip downloading something another user on the
--   * computer has already downloaded)
--   * <p>
--   * The default for the ID is the AZID of the first user profile.
--	 * 
--	 * @return ID
--	 */
--	public String getAzComputerID() {
--		boolean needWrite = false;
--		String cid = null;
--		try {
--			cid = access.readStringValue(AEWin32Access.HKEY_LOCAL_MACHINE,
--					"SOFTWARE\\" + app_name, "CID");
--		} catch (Exception e) {
--		}
--
--		if (cid == null || cid.length() == 0) {
--			needWrite = true;
--			try {
--				File commonPath = new File(access.getCommonAppData(),app_name);
--				if (commonPath.isDirectory()) {
--					File fCID = new File(commonPath, "azCID.txt");
--					if (fCID.exists()) {
--						cid = FileUtil.readFileAsString(fCID, 255, "utf8");
--					}
--				}
--			} catch (Exception e) {
--			}
--		}
--
--		if (cid == null || cid.length() == 0) {
--			needWrite = true;
--			cid = COConfigurationManager.getStringParameter("ID");
--		}
--
--		if (cid == null || cid.length() == 0) {
--			needWrite = true;
--			cid = RandomUtils.generateRandomAlphanumerics(20);
--		}
--
--		if (needWrite) {
--			setAzComputerID(cid);
--		}
--		return cid;
--	}
--
--	/**
--	 * @param cid
--	 */
--	private void setAzComputerID(String cid) {
--		try {
--			access.writeStringValue(AEWin32Access.HKEY_LOCAL_MACHINE,
--					"SOFTWARE\\" + app_name, "CID", cid);
--		} catch (Exception e) {
--			Debug.out("Could not write CID: " + e.getMessage());
--		}
--
--		try {
--			String sCommonAppData = access.getCommonAppData();
--			if (sCommonAppData != null && sCommonAppData.length() > 0) {
--				File commonPath = new File(sCommonAppData);
--				if (commonPath.isDirectory()) {
--					commonPath = new File(commonPath, app_name);
--					FileUtil.mkdirs(commonPath);
--
--					File fCID = new File(commonPath, "azCID.txt");
--					FileUtil.writeBytesAsFile(fCID.getAbsolutePath(),
--							cid.getBytes("utf8"));
--				}
--			}
--		} catch (Exception e) {
--			e.printStackTrace();
--		}
--	}
--	
--	public static void main(String[] args) {
--		try {
--			PlatformManagerImpl impl = new PlatformManagerImpl();
--			System.out.println(impl.getAzComputerID());
--		} catch (PlatformManagerException e) {
--			// TODO Auto-generated catch block
 -			e.printStackTrace();
 -		}
--		
--	}
--
--	public void requestUserAttention(int type, Object data) throws PlatformManagerException {
--		throw new PlatformManagerException("Unsupported capability called on platform manager");
 -	}
 -}
 diff -urN org/gudy/azureus2/platform.orig/win32/PlatformManagerUpdateChecker.java org/gudy/azureus2/platform/win32/PlatformManagerUpdateChecker.java
@@ -8247,3 +5845,97 @@ diff -urN org/gudy/azureus2/platform.ori
 -		return( lines );
 -	}
 -}
+diff -up azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.foo azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- org/gudy/azureus2/platform/PlatformManagerFactory.java.foo	2009-05-13 20:50:56.000000000 +0300
++++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2009-07-30 22:05:47.000000000 +0300
+@@ -48,19 +48,9 @@ PlatformManagerFactory 
+ 			if ( platform_manager == null && !force_dummy ){
+ 										  
+ 				try{
+-					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
++				    
++				    platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
+ 						
+-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
+-						
+-					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
+-						
+-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
+-	                    
+-					}else if( getPlatformType() == PlatformManager.PT_UNIX ){
+-						
+-						platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
+-
+-					}
+ 				}catch( PlatformManagerException e ){
+ 					
+ 						// exception will already have been logged
+@@ -72,8 +62,9 @@ PlatformManagerFactory 
+ 			}
+ 			
+ 			if ( platform_manager == null ){
+-				
++			    if( getPlatformType() == PlatformManager.PT_UNIX ){
+ 				platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
++			    }
+ 			}
+ 			
+ 			return( platform_manager );
+diff -up azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.original azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- org/gudy/azureus2/update/CoreUpdateChecker.java.original	2009-07-31 22:04:53.000000000 +0300
++++ org/gudy/azureus2/update/CoreUpdateChecker.java	2009-07-31 22:13:46.000000000 +0300
+@@ -38,8 +38,8 @@ import org.gudy.azureus2.core3.logging.*
+ import org.gudy.azureus2.core3.config.*;
+ import org.gudy.azureus2.core3.html.*;
+ 
+-import org.gudy.azureus2.platform.win32.access.AEWin32Access;
+-import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
++//import org.gudy.azureus2.platform.win32.access.AEWin32Access;
++//import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
+ import org.gudy.azureus2.plugins.*;
+ import org.gudy.azureus2.plugins.logging.LoggerChannel;
+ import org.gudy.azureus2.plugins.update.*;
+@@ -949,27 +949,30 @@ CoreUpdateChecker
+ 		try{
+ 				// hack here to allow testing of osx on windows (parg) - should replace with
+ 				// Constants.isWindows etc
++
++		    //Shouldn't happen on Fedora
+ 			
+ 			if ( file.getName().endsWith( ".exe" )){
+ 				
+-				try{
+-					AEWin32Access accessor = AEWin32Manager.getAccessor(true);
++
++				// try{
++// 					AEWin32Access accessor = AEWin32Manager.getAccessor(true);
+ 					
+-					// accessor.createProcess( , false );
++// 					// accessor.createProcess( , false );
+ 					
+-					accessor.shellExecute( 
+-						null, 
+-						file.getAbsolutePath(), 
+-						null,
+-						SystemProperties.getApplicationPath(),
+-						AEWin32Access.SW_NORMAL );
++// 					accessor.shellExecute( 
++// 						null, 
++// 						file.getAbsolutePath(), 
++// 						null,
++// 						SystemProperties.getApplicationPath(),
++// 						AEWin32Access.SW_NORMAL );
+ 					
+-				}catch( Throwable e ){
++// 				}catch( Throwable e ){
+ 					
+-					Logger.log( new LogEvent( LogIDs.LOGGER, "AEWin32Access failed", e  ));
++// 					Logger.log( new LogEvent( LogIDs.LOGGER, "AEWin32Access failed", e  ));
+ 
+-					Runtime.getRuntime().exec( file.getAbsolutePath() );
+-				}
++// 					Runtime.getRuntime().exec( file.getAbsolutePath() );
++// 				}
+ 			}else{
+ 					// osx, need to unzip .app and launch
+ 				

azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff:
 PlatformManagerFactory.java |    4 ----
 1 file changed, 4 deletions(-)

Index: azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff	26 Feb 2009 20:20:32 -0000	1.1
+++ azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff	3 Aug 2009 19:05:58 -0000	1.2
@@ -1,11 +1,10 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig	2008-12-20 00:48:53.000000000 -0800
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2008-12-20 00:49:18.000000000 -0800
-@@ -50,14 +50,10 @@
- 					if( getPlatformType() == PlatformManager.PT_UNIX ){
+diff -up azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.silly-java-tricks-are-for-kids azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.silly-java-tricks-are-for-kids	2009-07-31 21:40:31.000000000 +0300
++++ azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java	2009-07-31 21:43:37.000000000 +0300
+@@ -51,10 +51,6 @@ PlatformManagerFactory 
+ 				    
+ 				    platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
  						
-             platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
- 
- 					}
 -				}catch( PlatformManagerException e ){
 -					
 -						// exception will already have been logged
@@ -13,5 +12,3 @@
  				}catch( Throwable e ){
  					
  					Debug.printStackTrace(e);
- 				}
- 			}

azureus-SecureMessageServiceClientHelper-bcprov.patch:
 SecureMessageServiceClientHelper.java |   19 -------------------
 1 file changed, 19 deletions(-)

Index: azureus-SecureMessageServiceClientHelper-bcprov.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-SecureMessageServiceClientHelper-bcprov.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- azureus-SecureMessageServiceClientHelper-bcprov.patch	30 Jul 2006 18:56:22 -0000	1.1
+++ azureus-SecureMessageServiceClientHelper-bcprov.patch	3 Aug 2009 19:05:59 -0000	1.2
@@ -1,14 +1,15 @@
---- com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.~1.4.~	2006-02-09 19:43:06.000000000 -0800
-+++ com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2006-07-08 11:05:19.000000000 -0700
-@@ -36,7 +36,6 @@
+diff -up azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.nobcprov azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
+--- azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.nobcprov	2009-02-19 19:54:38.000000000 +0200
++++ azureus-4.2.0.4/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2009-07-30 20:35:13.000000000 +0300
+@@ -36,7 +36,6 @@ import org.bouncycastle.crypto.CipherPar
  import org.bouncycastle.crypto.encodings.PKCS1Encoding;
  import org.bouncycastle.crypto.engines.RSAEngine;
  import org.bouncycastle.crypto.params.ParametersWithRandom;
 -import org.bouncycastle.jce.provider.RSAUtil;
  import org.gudy.azureus2.core3.util.Debug;
+ import org.gudy.azureus2.core3.util.RandomUtils;
  import org.gudy.azureus2.plugins.utils.StaticUtilities;
- 
-@@ -82,30 +81,12 @@
+@@ -83,30 +82,12 @@ SecureMessageServiceClientHelper
  				
  			byte[] secret_bytes = session_key.getEncoded();
  			
@@ -29,7 +30,7 @@
 -				
 -	            CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
 -	            
--	            param = new ParametersWithRandom(param, new SecureRandom());
+-	            param = new ParametersWithRandom(param, RandomUtils.SECURE_RANDOM);
 -	            
 -	            padded_eng.init( true, param );
 -				

azureus-remove-manifest-classpath.patch:
 build.xml |    1 -
 1 file changed, 1 deletion(-)

Index: azureus-remove-manifest-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-remove-manifest-classpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-remove-manifest-classpath.patch	29 Jan 2008 16:02:38 -0000	1.3
+++ azureus-remove-manifest-classpath.patch	3 Aug 2009 19:05:59 -0000	1.4
@@ -1,10 +1,11 @@
---- oldbuild.xml	2005-10-25 04:22:46.000000000 -0400
-+++ build.xml	2008-01-29 10:00:49.000000000 -0500
-@@ -39,7 +39,6 @@
-       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
-          <manifest>
-             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
--            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
-          </manifest>
-       </jar>
-       
+diff -up azureus-4.2.0.4/build.xml.remove-manifest-classpath azureus-4.2.0.4/build.xml
+--- azureus-4.2.0.4/build.xml.remove-manifest-classpath	2009-07-30 20:05:04.000000000 +0300
++++ azureus-4.2.0.4/build.xml	2009-07-30 20:17:48.000000000 +0300
+@@ -46,7 +46,6 @@ NOTE:  You may need to set the  ANT_OPTS
+       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
+          <manifest>
+             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
+-            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
+          </manifest>
+       </jar>
+       


Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.script,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- azureus.script	19 Mar 2009 03:11:48 -0000	1.22
+++ azureus.script	3 Aug 2009 19:05:59 -0000	1.23
@@ -27,4 +27,4 @@ case $(uname -i) in
                 SWT=/usr/lib/eclipse/swt.jar
                 ;;
 esac
-MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:/usr/lib/eclipse/plugins/:/usr/lib/eclipse/:/usr/lib/ CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
+MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:LIBDIR/eclipse/plugins/:LIBDIR/eclipse/:LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- azureus.spec	24 Jul 2009 17:44:57 -0000	1.76
+++ azureus.spec	3 Aug 2009 19:05:59 -0000	1.77
@@ -1,8 +1,8 @@
-%define         _newname Vuze
+%define		_newname Vuze
 
 Name:		azureus
-Version:	4.0.0.4
-Release:	4%{?dist}
+Version:	4.2.0.4
+Release:	1%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -13,57 +13,62 @@ Source0:	http://downloads.sourceforge.ne
 Source1:	azureus.script
 Source2:	Azureus.desktop
 Source3:	azureus.applications
+
+#retrieved from CVS
+Source4:	build.xml
 #Source4:	azureus-License.txt
 
 #Source5:	azplugins_2.1.6.jar
 #Source6:	bdcc_2.2.2.zip
 
-Patch0:		azureus-remove-win32-osx-platforms.patch
+#Patch0:		azureus-remove-win32-osx-platforms.patch
 Patch2:		azureus-cache-size.patch
 Patch3:		azureus-remove-manifest-classpath.patch
 Patch9:		azureus-no-shared-plugins.patch
-Patch12:	azureus-no-updates-PluginInitializer.patch
+#Patch12:	azureus-no-updates-PluginInitializer.patch
 #Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
 Patch14:	azureus-no-update-manager-AzureusCoreImpl.patch
 Patch15:	azureus-no-update-manager-CorePatchChecker.patch
-Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
-Patch18:	azureus-no-update-manager-PluginInstallerImpl.patch
-Patch19:	azureus-no-update-manager-PluginUpdatePlugin.patch
-Patch20:	azureus-no-update-manager-SWTUpdateChecker.patch
-Patch22:	azureus-no-update-manager-UpdateMonitor.patch
-Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
+#Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
+#Patch18:	azureus-no-update-manager-PluginInstallerImpl.patch
+#Patch19:	azureus-no-update-manager-PluginUpdatePlugin.patch
+#Patch20:	azureus-no-update-manager-SWTUpdateChecker.patch
+#Patch22:	azureus-no-update-manager-UpdateMonitor.patch
+#Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
 Patch27:	azureus-SecureMessageServiceClientHelper-bcprov.patch
 Patch28:	azureus-configuration.patch
-Patch31:	azureus-fix-menu-MainMenu.patch
+#Patch31:	azureus-fix-menu-MainMenu.patch
 
-Patch50:        azureus-4.0.0.4-boo-windows.diff
-Patch51:        azureus-4.0.0.4-boo-osx.diff
-Patch52:        azureus-4.0.0.4-screw-w32-tests.diff
-Patch53:        azureus-4.0.0.4-boo-updating-w32.diff
-Patch54:        azureus-4.0.0.4-screw-win32utils.diff
-Patch55:        azureus-4.0.0.4-oops-return.diff
-Patch56:        azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
-Patch57:        azureus-4.0.0.4-stupid-invalid-characters.diff
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires:  jakarta-commons-cli, log4j
-BuildRequires:  libgconf-java
-BuildRequires:  bouncycastle >= 1.33-3
-BuildRequires:  eclipse-swt >= 3.4.0
-BuildRequires:  junit
-Requires:       jakarta-commons-cli, log4j
+Patch50:	azureus-4.0.0.4-boo-windows.diff
+Patch51:	azureus-4.0.0.4-boo-osx.diff
+Patch52:	azureus-4.0.0.4-screw-w32-tests.diff
+Patch53:	azureus-4.0.0.4-boo-updating-w32.diff
+Patch54:	azureus-4.0.0.4-screw-win32utils.diff
+Patch55:	azureus-4.0.0.4-oops-return.diff
+Patch56:	azureus-4.0.0.4-silly-java-tricks-are-for-kids.diff
+Patch57:	azureus-4.0.0.4-stupid-invalid-characters.diff
+
+Patch58:	azureus-4.2.0.4-java5.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	ant, jpackage-utils >= 1.5, xml-commons-apis
+BuildRequires:	jakarta-commons-cli, log4j
+BuildRequires:	libgconf-java
+BuildRequires:	bouncycastle >= 1.33-3
+BuildRequires:	eclipse-swt >= 3.4.0
+BuildRequires:	junit
+Requires:	jakarta-commons-cli, log4j
 Requires:	xulrunner
-Requires:       eclipse-swt >= 3.4.0
-Requires:       libgconf-java
-Requires:       bouncycastle >= 1.33-3
-Requires:	  java >= 1:1.6.0
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
-BuildArch:      noarch
+Requires:	eclipse-swt >= 3.4.0
+Requires:	libgconf-java
+Requires:	 bouncycastle >= 1.33-3
+Requires:	 java >= 1:1.6.0
+BuildRequires:	 java-devel >= 1:1.6.0
+BuildRequires:	 desktop-file-utils
+Requires(post):	 desktop-file-utils
+Requires(postun):	desktop-file-utils
+BuildArch:	noarch
 
 
 %description 
@@ -73,9 +78,11 @@ advanced users.
 
 %prep
 %setup -q -c
+
+cp %{SOURCE4} .
 #%patch0 -p0
 %patch2 -p0
-%patch3 -p0
+%patch3 -p1 -b .remove-manifest-classpath
 %patch9 -p0
 #%patch12 -p0
 #%patch13 -p0
@@ -87,7 +94,7 @@ advanced users.
 #%patch20 -p0
 #%patch22 -p0
 #%patch23 -p0
-%patch27 -p0
+%patch27 -p1 -b .nobcprov
 %patch28 -p0
 #%patch31 -p0
 #rm com/aelitis/azureus/core/update -rf
@@ -96,14 +103,23 @@ advanced users.
 #find ./ -name win32 | xargs rm -r
 #find ./ -name Win32\* | xargs rm -r
 # Remove test code
-%patch50 -b .orig
-%patch51 -b .orig
+
+rm org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java
+rm org/gudy/azureus2/platform/macosx/PlatformManagerImpl.java
+rm org/gudy/azureus2/platform/win32/PlatformManagerImpl.java
+%patch50 -b .boo-windows
+
+rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
+%patch51 -b .boo-osx
 %patch52 -b .orig
-%patch53 -b .orig
+%patch53 -p1 -b .boo-updating-w32
 %patch54 -b .orig
 %patch55 -b .orig
-%patch56 -b .orig
+%patch56 -p1 -b .silly-java-tricks-are-for-kids
 %patch57 -b .orig -p1
+
+%patch58 -p1 -b .java5
+
 rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
 #sed -i -e \
 #  "s|sun.security.action.GetPropertyAction|gnu.java.security.action.GetPropertyAction|" \
@@ -151,7 +167,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadi
 install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 # TODO: fix launcher to be multilib-safe
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
-sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
+sed --in-place "s:LIBDIR:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
 
 #install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
 #install -pm 644 plugins/azplugins/azplugins_2.1.6.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_2.1.6.jar
@@ -171,9 +187,9 @@ install -m 644 org/gudy/azureus2/ui/icon
 install -m 644 org/gudy/azureus2/ui/icons/a64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/azureus.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora 			\
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
-	--add-category X-Fedora				\
+desktop-file-install --vendor fedora					\
+		     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+		     --add-category X-Fedora				\
 	%{SOURCE2}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
@@ -201,7 +217,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog.txt GPL.txt
+%doc ChangeLog.txt
 %{_datadir}/applications/*
 %{_datadir}/application-registry/*
 %{_datadir}/pixmaps/azureus.png
@@ -212,6 +228,11 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Wed Jul 29 2009 David Juran <david at juran.se> - 4.2.0.4-1
+- Upgrade to 4.2.0.4
+- Fix SWT dir on x86_64 (Bz 515228)
+- fix rpmlint warnings
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -499,7 +520,7 @@ an updated azureus-themed.patch to work 
 
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-9
 - Require libgcj with the latest fixes for running Azureus.
-- Be explicit about .png files in %files.
+- Be explicit about .png files in files-section.
 
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-8
 - Remove bouncycastle from build-classpath in startup script.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	26 Feb 2009 20:20:32 -0000	1.15
+++ sources	3 Aug 2009 19:05:59 -0000	1.16
@@ -1 +1 @@
-3f521ec1f74d5b1a78921db4174858a6  Vuze_4.0.0.4_source.zip
+5145354022b67cef3a26ac7f5bd1c4fb  Vuze_4.2.0.4_source.zip



From mtasaka at fedoraproject.org  Mon Aug  3 19:12:30 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 19:12:30 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2-0.19.1-vte-depend.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 ruby-gnome2.spec, 1.46, 1.47 sources,
	1.7, 1.8 ruby-gnome2-0.19.0-gtk-missingheader.patch, 1.1,
	NONE ruby-gnome2-0.19.0-gtkmozembed.patch, 1.1,
	NONE ruby-gnome2-0.19.0-panel-applet.patch, 1.1, NONE
Message-ID: <20090803191230.D6CF211C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3010

Modified Files:
	.cvsignore ruby-gnome2.spec sources 
Added Files:
	ruby-gnome2-0.19.1-vte-depend.patch 
Removed Files:
	ruby-gnome2-0.19.0-gtk-missingheader.patch 
	ruby-gnome2-0.19.0-gtkmozembed.patch 
	ruby-gnome2-0.19.0-panel-applet.patch 
Log Message:
* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
- Update to 0.19.1, drop all upstreamed patches
- Introduce many -devel subpackages containing pkgconfig file


ruby-gnome2-0.19.1-vte-depend.patch:
 depend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ruby-gnome2-0.19.1-vte-depend.patch ---
--- ruby-gnome2-all-0.19.1/vte/src/depend.bad	2009-08-03 03:44:58.000000000 +0900
+++ ruby-gnome2-all-0.19.1/vte/src/depend	2009-08-04 02:57:41.000000000 +0900
@@ -1,2 +1,2 @@
 install:
-	$(INSTALL_DATA) ../vte-ruby.pc $(libdir)/pkgconfig
+	$(INSTALL_DATA) ../vte-ruby.pc $(libdir)/pkgconfig || true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 19:32:42 -0000	1.7
+++ .cvsignore	3 Aug 2009 19:12:30 -0000	1.8
@@ -1 +1 @@
-ruby-gnome2-all-0.19.0.tar.gz
+ruby-gnome2-all-0.19.1.tar.gz


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ruby-gnome2.spec	21 Jul 2009 18:41:39 -0000	1.46
+++ ruby-gnome2.spec	3 Aug 2009 19:12:30 -0000	1.47
@@ -4,7 +4,7 @@
 %define         xulrunner_still_beta   1
 %define         betaver                rc1
 
-%define         mainrel                3
+%define         mainrel                1
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -12,8 +12,8 @@
 # - Mamoru Tasaka
 
 Name:           ruby-gnome2
-Version:        0.19.0
-Release:        %{mainrel}%{?dist}.1
+Version:        0.19.1
+Release:        %{mainrel}%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -23,12 +23,8 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# ruby-gnome2-Bugs-2815036
-Patch14:        ruby-gnome2-0.19.0-gtkmozembed.patch
-# ruby-gnome2-Bugs-2815036
-Patch15:        ruby-gnome2-0.19.0-panel-applet.patch
-# ruby-gnome2-Bugs-2814953
-Patch16:	ruby-gnome2-0.19.0-gtk-missingheader.patch
+# Will report upstream
+Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -41,7 +37,19 @@ Provides:       ruby(gnome2) =  %{versio
 
 
 %description
-This is a set of bindings for the GNOME-2.x libraries for use from Ruby.
+Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
+
+%package devel
+Summary:        Development libraries and header files for ruby-gnome2
+Group:          Development/Libraries
+
+Requires:       ruby(gnome2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnome2-devel) = %{version}-%{release}
+
+%description devel
+Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
+This package provides libraries and header files for ruby-gnome2
 
 %package -n ruby-atk
 Summary:        Ruby binding of ATK-1.0.x or later
@@ -64,6 +72,7 @@ Group:          Development/Libraries
 Requires:       ruby-devel ruby(atk) = %{version}-%{release} 
 Requires:       ruby(glib2-devel) = %{version}-%{release}
 Requires:       atk-devel
+Requires:       pkgconfig
 
 Provides:       ruby(atk-devel) = %{version}-%{release}
 
@@ -85,6 +94,18 @@ Provides:       ruby(bonobo2) = %{versio
 %description -n ruby-bonobo2
 Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
 
+%package -n ruby-bonobo2-devel
+Summary:        Development libraries and header files for ruby-bonobo2
+Group:          Development/Libraries
+
+Requires:       ruby(bonobo2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(bonobo2-devel) = %{version}-%{release}
+
+%description -n ruby-bonobo2-devel
+Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
+This package provides libraries and header files for ruby-bonobo2
+
 %package -n ruby-bonoboui2
 Summary:        Ruby binding of libbonoboui-2.x
 Group:          System Environment/Libraries
@@ -99,8 +120,20 @@ Provides:       ruby(bonoboui2) = %{vers
 %description -n ruby-bonoboui2
 Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
 
+%package -n ruby-bonoboui2-devel
+Summary:        Development libraries and header files for ruby-bonoboui2
+Group:          Development/Libraries
+
+Requires:       ruby(bonoboui2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(bonoboui2-devel) = %{version}-%{release}
+
+%description -n ruby-bonoboui2-devel
+Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
+This package provides libraries and header files for ruby-bonoboui2
+
 %package -n ruby-gconf2
-Summary:        Ruby binding of GConf-1.2.x
+Summary:        Ruby binding of GConf-2.x
 Group:          System Environment/Libraries
 
 BuildRequires:  ruby ruby-devel GConf2-devel
@@ -110,7 +143,19 @@ Requires:       ruby(abi) = 1.8 ruby(gli
 Provides:       ruby(gconf2) =  %{version}-%{release}
 
 %description -n ruby-gconf2
-Ruby/GConf2 is a Ruby binding of GConf-1.2.x.
+Ruby/GConf2 is a Ruby binding of GConf-2.x.
+
+%package -n ruby-gconf2-devel
+Summary:        Development libraries and header files for ruby-gconf2
+Group:          Development/Libraries
+
+Requires:       ruby(gconf2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gconf2-devel) = %{version}-%{release}
+
+%description -n ruby-gconf2-devel
+Ruby/GConf2 is a Ruby binding of GConf-2.x.
+This package provides libraries and header files for ruby-gconf2
 
 %package -n ruby-gdkpixbuf2
 Summary:        Ruby binding of GdkPixbuf-2.x
@@ -127,6 +172,18 @@ Provides:       ruby(gdkpixbuf2) =  %{ve
 %description -n ruby-gdkpixbuf2
 Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
 
+%package -n ruby-gdkpixbuf2-devel
+Summary:        Development libraries and header files for ruby-gdkpixbuf2
+Group:          Development/Libraries
+
+Requires:       ruby(gdkpixbuf2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gdkpixbuf2-devel) = %{version}-%{release}
+
+%description -n ruby-gdkpixbuf2-devel
+Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
+This package provides libraries and header files for ruby-gdkpixbuf2
+
 %package -n ruby-glib2
 Summary:        Ruby binding of GLib-2.x
 Group:          System Environment/Libraries
@@ -146,6 +203,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(glib2) =  %{version}-%{release}
 Requires:       ruby-devel glib2-devel
+Requires:       pkgconfig
 
 Provides:       ruby(glib2-devel) =  %{version}-%{release}
 
@@ -168,6 +226,18 @@ Provides:       ruby(gnomecanvas2) =  %{
 %description -n ruby-gnomecanvas2
 Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
 
+%package -n ruby-gnomecanvas2-devel
+Summary:        Development libraries and header files for ruby-gnomecanvas2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomecanvas2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomecanvas2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomecanvas2-devel
+Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
+This package provides libraries and header files for ruby-gnomecanvas2
+
 %package -n ruby-gnomeprint2
 Summary:        Ruby binding of libgnomeprint
 Group:          System Environment/Libraries
@@ -185,6 +255,18 @@ Provides:       ruby(gnomeprint2) =  %{v
 %description -n ruby-gnomeprint2
 Ruby/GnomePrint is a Ruby binding of libgnomeprint. 
 
+%package -n ruby-gnomeprint2-devel
+Summary:        Development libraries and header files for ruby-gnomeprint2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomeprint2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomeprint2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomeprint2-devel
+Ruby/GnomePrint is a Ruby binding of libgnomeprint.
+This package provides libraries and header files for ruby-gnomeprint2
+
 %package -n ruby-gnomeprintui2
 Summary:        Ruby binding of libgnomeprintui
 Group:          System Environment/Libraries
@@ -200,6 +282,18 @@ Provides:       ruby(gnomeprintui2) =  %
 %description -n ruby-gnomeprintui2
 Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
 
+%package -n ruby-gnomeprintui2-devel
+Summary:        Development libraries and header files for ruby-gnomeprintui2
+Group:          Development/Libraries
+
+Requires:       ruby(gnomeprintui2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomeprintui2-devel) = %{version}-%{release}
+
+%description -n ruby-gnomeprintui2-devel
+Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
+This package provides libraries and header files for ruby-gnomeprintui2
+
 %package -n ruby-gnomevfs
 Summary:        Ruby binding of GnomeVFS-2.0.x
 Group:          System Environment/Libraries
@@ -214,6 +308,18 @@ Provides:       ruby(gnomevfs) =  %{vers
 %description -n ruby-gnomevfs
 Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
 
+%package -n ruby-gnomevfs-devel
+Summary:        Development libraries and header files for ruby-gnomevfs
+Group:          Development/Libraries
+
+Requires:       ruby(gnomevfs) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gnomevfs-devel) = %{version}-%{release}
+
+%description -n ruby-gnomevfs-devel
+Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
+This package provides libraries and header files for ruby-gnomevfs
+
 %package -n ruby-goocanvas
 Summary:        Ruby binding of Goocanvas.
 Group:          System Environment/Libraries
@@ -228,6 +334,18 @@ Provides:       ruby(goocanvas) =  %{ver
 %description -n ruby-goocanvas
 Ruby/Goocanvas is a Ruby binding of Goocanvas
 
+%package -n ruby-goocanvas-devel
+Summary:        Development libraries and header files for ruby-goocanvas
+Group:          Development/Libraries
+
+Requires:       ruby(goocanvas) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(goocanvas-devel) = %{version}-%{release}
+
+%description -n ruby-goocanvas-devel
+Ruby/Goocanvas is a Ruby binding of Goocanvas
+This package provides libraries and header files for ruby-gnomecanvas
+
 %package -n ruby-gstreamer
 Summary:        Ruby binding of GStreamer
 Group:          System Environment/Libraries
@@ -243,6 +361,18 @@ Provides:       ruby(gstreamer) = %{vers
 %description -n ruby-gstreamer
 Ruby/GStreamer is a Ruby binding for GStreamer
 
+%package -n ruby-gstreamer-devel
+Summary:        Development libraries and header files for ruby-gstreamer
+Group:          Development/Libraries
+
+Requires:       ruby(gstreamer) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gstreamer-devel) = %{version}-%{release}
+
+%description -n ruby-gstreamer-devel
+Ruby/GStreamer is a Ruby binding for GStreamer
+This package provides libraries and header files for ruby-gstreamer
+
 %package -n ruby-gtk2
 Summary:        Ruby binding of GTK+-2.0.x
 Group:          System Environment/Libraries
@@ -267,6 +397,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(gtk2) =  %{version}-%{release}
 Requires:       gtk2-devel ruby-devel ruby(glib2-devel) = %{version}-%{release}
+Requires:       pkgconfig
 
 Provides:       ruby(gtk2-devel) = %{version}-%{release}
 
@@ -290,6 +421,18 @@ Provides:       ruby(gtkglext) = %{versi
 %description -n ruby-gtkglext
 Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
 
+%package -n ruby-gtkglext-devel
+Summary:        Development libraries and header files for ruby-gtkglext
+Group:          Development/Libraries
+
+Requires:       ruby(gtkglext) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkglext-devel) = %{version}-%{release}
+
+%description -n ruby-gtkglext-devel
+Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
+This package provides libraries and header files for ruby-gtkglext
+
 %package -n ruby-gtkhtml2
 Summary:        Ruby binding of GtkHtml2
 Group:          System Environment/Libraries
@@ -304,6 +447,18 @@ Provides:       ruby(gtkhtml2) = %{versi
 %description -n ruby-gtkhtml2
 Ruby/GtkHtml2 is a Ruby binding of GtkHtml2
 
+%package -n ruby-gtkhtml2-devel
+Summary:        Development libraries and header files for ruby-gtkhtml2
+Group:          Development/Libraries
+
+Requires:       ruby(gtkhtml2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkhtml2-devel) = %{version}-%{release}
+
+%description -n ruby-gtkhtml2-devel
+Ruby/GtkHtml2 is a Ruby binding of GtkHtml2
+This package provides libraries and header files for ruby-gtkhtml2
+
 %package -n ruby-gtkmozembed
 Summary:        Ruby binding of GtkMozEmbed
 Group:          System Environment/Libraries
@@ -323,6 +478,19 @@ Provides:       ruby(gtkmozembed) = %{ve
 Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a
 Mozilla Gecko renderer.
 
+%package -n ruby-gtkmozembed-devel
+Summary:        Development libraries and header files for ruby-gtkmozembed
+Group:          Development/Libraries
+
+Requires:       ruby(gtkmozembed) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtkmozembed-devel) = %{version}-%{release}
+
+%description -n ruby-gtkmozembed-devel
+Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a
+Mozilla Gecko renderer.
+This package provides libraries and header files for ruby-gtkmozembed
+
 %package -n ruby-gtksourceview
 Summary:        Ruby binding of gtksourceview-1.0.x
 Group:          System Environment/Libraries
@@ -338,6 +506,18 @@ Provides:       ruby(gtksourceview) = %{
 %description -n ruby-gtksourceview
 Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
 
+%package -n ruby-gtksourceview-devel
+Summary:        Development libraries and header files for ruby-gtksourceview
+Group:          Development/Libraries
+
+Requires:       ruby(gtksourceview) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtksourceview-devel) = %{version}-%{release}
+
+%description -n ruby-gtksourceview-devel
+Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
+This package provides libraries and header files for ruby-gtksourceview
+
 %package -n ruby-gtksourceview2
 Summary:        Ruby binding of gtksourceview-2.x
 Group:          System Environment/Libraries
@@ -353,6 +533,18 @@ Provides:       ruby(gtksourceview2) = %
 %description -n ruby-gtksourceview2
 Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
 
+%package -n ruby-gtksourceview2-devel
+Summary:        Development libraries and header files for ruby-gtksourceview2
+Group:          Development/Libraries
+
+Requires:       ruby(gtksourceview2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(gtksourceview2-devel) = %{version}-%{release}
+
+%description -n ruby-gtksourceview2-devel
+Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
+This package provides libraries and header files for ruby-gtksourceview2
+
 %package -n ruby-libart2
 Summary:        Ruby binding of Libart_lgpl
 Group:          System Environment/Libraries
@@ -373,6 +565,7 @@ Group:          Development/Libraries
 
 Requires:       ruby(libart2) = %{version}-%{release}
 Requires:       libart_lgpl-devel ruby-devel
+Requires:       pkgconfig
 
 Provides:       ruby(libart2-devel) = %{version}-%{release}
 
@@ -399,6 +592,18 @@ Ruby/Libglade2 is a Ruby bindings of Lib
 This provides a very simple interface to the libglade library,
 to load interfaces dynamically from a glade file.
 
+%package -n ruby-libglade2-devel
+Summary:        Development libraries and header files for ruby-libglade2
+Group:          Development/Libraries
+
+Requires:       ruby(libglade2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(libglade2-devel) = %{version}-%{release}
+
+%description -n ruby-libglade2-devel
+Ruby/Libglade2 is a Ruby bindings of Libglade2.
+This package provides libraries and header files for ruby-libglade2
+
 %package -n ruby-panelapplet2
 Summary:        Ruby binding of libpanel-applet-2.6.x
 Group:          System Environment/Libraries
@@ -417,6 +622,18 @@ Provides:       ruby(panelapplet2) = %{v
 %description -n ruby-panelapplet2
 Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
 
+%package -n ruby-panelapplet2-devel
+Summary:        Development libraries and header files for ruby-panelapplet2
+Group:          Development/Libraries
+
+Requires:       ruby(panelapplet2) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(panelapplet2-devel) = %{version}-%{release}
+
+%description -n ruby-panelapplet2-devel
+Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
+This package provides libraries and header files for ruby-panelapplet2
+
 %package -n ruby-pango
 Summary:        Ruby binding of pango-1.x
 Group:          System Environment/Libraries
@@ -439,6 +656,7 @@ Group:          Development/Libraries
 Requires:       ruby(pango) = %{version}-%{release} 
 Requires:       pango-devel ruby-devel ruby(glib2-devel) = %{version}-%{release}
 Requires:       ruby-cairo-devel
+Requires:       pkgconfig
 
 Provides:       ruby(pango-devel) = %{version}-%{release}
 
@@ -466,6 +684,17 @@ Provides:       ruby(poppler) = %{versio
 %description -n ruby-poppler
 Ruby/Poppler is a Ruby binding of poppler-glib.
 
+%package -n ruby-poppler-devel
+Summary:        Development libraries and header files for ruby-poppler
+Group:          Development/Libraries
+
+Requires:       ruby(poppler) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(poppler-devel) = %{version}-%{release}
+
+%description -n ruby-poppler-devel
+Ruby/Poppler is a Ruby binding of poppler-glib.
+This package provides libraries and header files for ruby-poppler
 
 %package -n ruby-rsvg
 Summary:        Ruby binding of librsvg
@@ -484,6 +713,18 @@ Provides:       ruby(rsvg) = %{version}-
 %description -n ruby-rsvg
 Ruby/RSVG is a Ruby binding of librsvg.
 
+%package -n ruby-rsvg-devel
+Summary:        Development libraries and header files for ruby-rsvg
+Group:          Development/Libraries
+
+Requires:       ruby(rsvg) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(rsvg-devel) = %{version}-%{release}
+
+%description -n ruby-rsvg-devel
+Ruby/RSVG is a Ruby binding of librsvg.
+This package provides libraries and header files for ruby-rsvg
+
 %package -n ruby-vte
 Summary:        Ruby binding of VTE
 Group:          System Environment/Libraries
@@ -500,13 +741,23 @@ Provides:       ruby(vte) = %{version}-%
 %description -n ruby-vte
 Ruby/VTE is a Ruby binding of VTE.
 
+%package -n ruby-vte-devel
+Summary:        Development libraries and header files for ruby-vte
+Group:          Development/Libraries
+
+Requires:       ruby(vte) = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       ruby(vte-devel) = %{version}-%{release}
+
+%description -n ruby-vte-devel
+Ruby/VTE is a Ruby binding of VTE.
+This package provides libraries and header files for ruby-vte
+
 
 %prep
 %setup -q -n %{name}-all-%{version}
 %patch0 -p1
-%patch14 -p1 -b .moz
-%patch15 -p1 -b .panel
-%patch16 -p1 -b .missing
+%patch1 -p1 -b .vtedepend
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -527,6 +778,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Already fixed in rev 3682
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 %clean
@@ -539,6 +794,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gnome2.rb
 %{ruby_sitearch}/gnome2.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnome-2.0-ruby.pc
+
 %files -n ruby-atk
 %defattr(-,root,root,-)
 %doc atk/ChangeLog atk/COPYING.LIB atk/README
@@ -549,6 +808,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbatk.h
 %{ruby_sitearch}/rbatkversion.h
+%{_libdir}/pkgconfig/atk-ruby.pc
 
 %files -n ruby-bonobo2
 %defattr(-,root,root,-)
@@ -556,24 +816,40 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/bonobo2.rb
 %{ruby_sitearch}/bonobo2.so
 
+%files -n ruby-bonobo2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libbonobo-2.0-ruby.pc
+
 %files -n ruby-bonoboui2
 %defattr(-,root,root,-)
 %doc bonoboui/ChangeLog bonoboui/COPYING.LIB bonoboui/README
 %{ruby_sitelib}/bonoboui2.rb
 %{ruby_sitearch}/bonoboui2.so
 
+%files -n ruby-bonoboui2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libbonoboui-2.0-ruby.pc
+
 %files -n ruby-gconf2
 %defattr(-,root,root,-)
 %doc gconf/ChangeLog gconf/COPYING.LIB gconf/README gconf/sample
 %{ruby_sitelib}/gconf2.rb
 %{ruby_sitearch}/gconf2.so
 
+%files -n ruby-gconf2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gconf-2.0-ruby.pc
+
 %files -n ruby-gdkpixbuf2
 %defattr(-,root,root,-)
 %doc gdkpixbuf/ChangeLog gdkpixbuf/COPYING.LIB gdkpixbuf/README gdkpixbuf/sample
 %{ruby_sitelib}/gdk_pixbuf2.rb
 %{ruby_sitearch}/gdk_pixbuf2.so
 
+%files -n ruby-gdkpixbuf2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gdk-pixbuf-2.0-ruby.pc
+
 %files -n ruby-glib2
 %defattr(-,root,root,-)
 %doc glib/ChangeLog glib/COPYING.LIB glib/README glib/sample
@@ -590,6 +866,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
 %{ruby_sitearch}/glib-enum-types.h
+%{_libdir}/pkgconfig/glib-2.0-ruby.pc
 
 %files -n ruby-gnomecanvas2
 %defattr(-,root,root,-)
@@ -597,36 +874,61 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gnomecanvas2.rb
 %{ruby_sitearch}/gnomecanvas2.so
 
+%files -n ruby-gnomecanvas2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnomecanvas-2.0-ruby.pc
+
 %files -n ruby-gnomeprint2
 %defattr(-,root,root,-)
 %doc gnomeprint/ChangeLog gnomeprint/COPYING.LIB gnomeprint/README gnomeprint/sample
 %{ruby_sitelib}/gnomeprint2.rb
 %{ruby_sitearch}/gnomeprint2.so
 
+%files -n ruby-gnomeprint2-devel
+%defattr(-,root,root,-)
+%{ruby_sitearch}/rblibgnomeprintversion.h
+%{_libdir}/pkgconfig/libgnomeprint-2.2-ruby.pc
+
 %files -n ruby-gnomeprintui2
 %defattr(-,root,root,-)
 %doc gnomeprintui/ChangeLog gnomeprintui/COPYING.LIB gnomeprintui/README gnomeprintui/sample
 %{ruby_sitelib}/gnomeprintui2.rb
 %{ruby_sitearch}/gnomeprintui2.so
 
+%files -n ruby-gnomeprintui2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgnomeprintui-2.2-ruby.pc
+
 %files -n ruby-gnomevfs
 %defattr(-,root,root,-)
 %doc gnomevfs/ChangeLog gnomevfs/COPYING.LIB gnomevfs/README
 %{ruby_sitelib}/gnomevfs.rb
 %{ruby_sitearch}/gnomevfs.so
 
+%files -n ruby-gnomevfs-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gnome-vfs-2.0-ruby.pc
+
 %files -n ruby-goocanvas
 %defattr(-,root,root,-)
 %doc goocanvas/ChangeLog goocanvas/README goocanvas/sample
 %{ruby_sitelib}/goocanvas.rb
 %{ruby_sitearch}/goocanvas.so
 
+%files -n ruby-goocanvas-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/goocanvas-ruby.pc
+
 %files -n ruby-gstreamer
 %defattr(-,root,root,-)
 %doc gstreamer/ChangeLog gstreamer/COPYING.LIB gstreamer/README
 %{ruby_sitelib}/gst.rb
 %{ruby_sitearch}/gst.so
 
+%files -n ruby-gstreamer-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gstreamer-0.10-ruby.pc
+
 %files -n ruby-gtk2
 %defattr(-,root,root,-)
 %doc gtk/ChangeLog gtk/COPYING.LIB gtk/README gtk/sample
@@ -644,6 +946,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/rbgtk.h
 %{ruby_sitearch}/rbgtkconversions.h
 %{ruby_sitearch}/rbgtkmacros.h
+%{_libdir}/pkgconfig/gtk+-2.0-ruby.pc
 
 %files -n ruby-gtkglext
 %defattr(-,root,root,-)
@@ -651,30 +954,50 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/gtkglext.rb
 %{ruby_sitearch}/gtkglext.so
 
+%files -n ruby-gtkglext-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtkglext-1.0-ruby.pc
+
 %files -n ruby-gtkhtml2
 %defattr(-,root,root,-)
 %doc gtkhtml2/ChangeLog gtkhtml2/COPYING.LIB gtkhtml2/README gtkhtml2/sample
 %{ruby_sitelib}/gtkhtml2.rb
 %{ruby_sitearch}/gtkhtml2.so
 
+%files -n ruby-gtkhtml2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgtkhtml-2.0-ruby.pc
+
 %files -n ruby-gtkmozembed
 %defattr(-,root,root,-)
 %doc gtkmozembed/ChangeLog gtkmozembed/COPYING.LIB gtkmozembed/README gtkmozembed/sample
 %{ruby_sitelib}/gtkmozembed.rb
 %{ruby_sitearch}/gtkmozembed.so
 
+%files -n ruby-gtkmozembed-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/mozilla-gtkmozembed-ruby.pc
+
 %files -n ruby-gtksourceview
 %defattr(-,root,root,-)
 %doc gtksourceview/ChangeLog gtksourceview/COPYING.LIB gtksourceview/README gtksourceview/sample
 %{ruby_sitelib}/gtksourceview.rb
 %{ruby_sitearch}/gtksourceview.so
 
+%files -n ruby-gtksourceview-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtksourceview-1.0-ruby.pc
+
 %files -n ruby-gtksourceview2
 %defattr(-,root,root,-)
 %doc gtksourceview2/ChangeLog gtksourceview2/COPYING.LIB gtksourceview2/README gtksourceview2/sample
 %{ruby_sitelib}/gtksourceview2.rb
 %{ruby_sitearch}/gtksourceview2.so
 
+%files -n ruby-gtksourceview2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gtksourceview-2.0-ruby.pc
+
 %files -n ruby-libart2
 %defattr(-,root,root,-)
 %doc libart/ChangeLog libart/COPYING.LIB libart/README libart/sample
@@ -684,6 +1007,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-libart2-devel
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbart.h
+%{_libdir}/pkgconfig/libart-2.0-ruby.pc
 
 %files -n ruby-libglade2
 %defattr(-,root,root,-)
@@ -693,12 +1017,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{ruby_sitelib}/libglade2.rb
 %{ruby_sitearch}/libglade2.so
 
+%files -n ruby-libglade2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libglade-2.0-ruby.pc
+
 %files -n ruby-panelapplet2
 %defattr(-,root,root,-)
 %doc panel-applet/ChangeLog panel-applet/COPYING.LIB panel-applet/README panel-applet/sample
 %{ruby_sitelib}/panelapplet2.rb
 %{ruby_sitearch}/panelapplet2*.so
 
+%files -n ruby-panelapplet2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libpanelapplet-2.0-ruby.pc
+
 %files -n ruby-pango
 %defattr(-,root,root,-)
 %doc pango/ChangeLog pango/COPYING.LIB pango/README pango/sample
@@ -709,6 +1041,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{ruby_sitearch}/rbpango.h
 %{ruby_sitearch}/rbpangoversion.h
+%{_libdir}/pkgconfig/pango-ruby.pc
 
 %files -n ruby-poppler
 %defattr(-,root,root,-)
@@ -716,20 +1049,37 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/poppler.rb
 %{ruby_sitearch}/poppler.so
 
+%files -n ruby-poppler-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/poppler-ruby.pc
+
 %files -n ruby-rsvg
 %defattr(-,root,root,-)
 %doc rsvg/ChangeLog rsvg/COPYING.LIB rsvg/README rsvg/sample
 %{ruby_sitelib}/rsvg2.rb
 %{ruby_sitearch}/rsvg2.so
 
+%files -n ruby-rsvg-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/librsvg-2.0-ruby.pc
+
 %files -n ruby-vte
 %defattr(-,root,root,-)
 %doc vte/ChangeLog vte/COPYING.LIB vte/README vte/sample
 %{ruby_sitelib}/vte.rb
 %{ruby_sitearch}/vte.so
 
+%if 0
+%files -n ruby-vte-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/vte-ruby.pc
+%endif
 
 %changelog
+* Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
+- Update to 0.19.1, drop all upstreamed patches
+- Introduce many -devel subpackages containing pkgconfig file
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.19.0-3.1
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 19:32:42 -0000	1.7
+++ sources	3 Aug 2009 19:12:30 -0000	1.8
@@ -1 +1 @@
-e293cf3e07f1d4e5da0020e45bea053e  ruby-gnome2-all-0.19.0.tar.gz
+d40a03e79ac2a6e6a786ed5a4851337d  ruby-gnome2-all-0.19.1.tar.gz


--- ruby-gnome2-0.19.0-gtk-missingheader.patch DELETED ---


--- ruby-gnome2-0.19.0-gtkmozembed.patch DELETED ---


--- ruby-gnome2-0.19.0-panel-applet.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Aug  3 19:33:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 19:33:15 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.44,1.45
Message-ID: <20090803193315.934CD11C00E9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8353

Modified Files:
	ruby-gnome2.spec 
Log Message:
Patch submitted to upstream


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ruby-gnome2.spec	3 Aug 2009 19:02:23 -0000	1.44
+++ ruby-gnome2.spec	3 Aug 2009 19:33:15 -0000	1.45
@@ -23,7 +23,7 @@ URL:            http://ruby-gnome2.sourc
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
 # Currently Fedora specific patch
 Patch0:         ruby-gnome2-0.17.0-rc1-script.patch
-# Will report upstream
+# ruby-gnome2-Bugs-2831660
 Patch1:         ruby-gnome2-0.19.1-vte-depend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From pbrobinson at fedoraproject.org  Mon Aug  3 19:50:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 19:50:57 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel moblin-icon-theme.spec,1.1,1.2
Message-ID: <20090803195058.0325111C00E8@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-serv13092

Modified Files:
	moblin-icon-theme.spec 
Log Message:
- Some more package optimisations


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-icon-theme.spec	3 Aug 2009 10:37:20 -0000	1.1
+++ moblin-icon-theme.spec	3 Aug 2009 19:50:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           moblin-icon-theme
 Version:        0.7
-Release:        1%{?dist}
+Release:        2
 Summary:        Moblin icon theme
 
 Group:          User Interface/Desktops
@@ -31,9 +31,28 @@ cp -rp output/moblin/16x16 %{buildroot}/
 cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/moblin
 cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/moblin
 
+# create an empty cache file so its removed when the package is
+touch %{buildroot}/%{_datadir}/icons/moblin/icon-theme.cache
+
 #Remove Makefile.am files
 find %{buildroot} -name 'Makefile.am' -exec rm -f {} ';'
 
+# create symlinks for missing stock icons
+cd %{buildroot}/%{_datadir}/icons/moblin
+for size in 16x16 24x24 48x48; do
+  (
+  cd $size
+  for context in *; do
+    if [ -d $context ]; then
+      (
+      cd $context
+      INU_DATA_DIR=%{_builddir}/%{name}-%{version} /usr/bin/icon-name-mapping -c $context
+      )
+    fi
+  done
+  )
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -41,16 +60,14 @@ rm -rf %{buildroot}
 touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
 
 %postun
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
-  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-      %{_bindir}/gtk-update-icon-cache -f -t --quiet %{_datadir}/icons/moblin || :
-  fi
+touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
 fi
 
 %posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin || :
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
 fi
 
 %files
@@ -59,6 +76,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-2
+- Some more package optimisations
+
 * Sat Aug  1 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-1
 - New upstream 0.7 release
 



From mtasaka at fedoraproject.org  Mon Aug  3 19:59:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  3 Aug 2009 19:59:17 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel ruby-RMagick.spec,1.33,1.34
Message-ID: <20090803195917.D6AD611C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15023

Modified Files:
	ruby-RMagick.spec 
Log Message:
* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-2
- F-12: Rebuid against new ImageMagick



Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ruby-RMagick.spec	3 Aug 2009 04:48:37 -0000	1.33
+++ ruby-RMagick.spec	3 Aug 2009 19:59:17 -0000	1.34
@@ -15,7 +15,7 @@ Requires:		ImageMagick = %2\
 
 %define		mainver		2.11.0
 %undefine		betaver		
-%define		fedorarel	1
+%define		fedorarel	2
 
 
 Name:		ruby-%{modname}
@@ -39,7 +39,7 @@ BuildRequires:	%{_bindir}/wmf2eps
 BuildRequires:	ImageMagick-devel
 Requires:	ImageMagick
 
-%setIMver 12 6.5.3.7
+%setIMver 12 6.5.4.7
 %setIMver 11 6.5.1.2
 %setIMver 10 6.4.0.10
 %setIMver  9 6.3.8.1
@@ -106,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-2
+- F-12: Rebuid against new ImageMagick
+
 * Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.0-1
 - 2.11.0
 



From leigh123linux at fedoraproject.org  Mon Aug  3 20:12:15 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Mon,  3 Aug 2009 20:12:15 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.9, 1.10 qbittorrent.spec, 1.23,
	1.24 sources, 1.9, 1.10
Message-ID: <20090803201215.75AA011C00E8@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Mon Aug 03 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.7.20090803svn
- update to svn 2417



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Jul 2009 18:27:58 -0000	1.9
+++ .cvsignore	3 Aug 2009 20:12:15 -0000	1.10
@@ -1 +1 @@
-qbittorrent-2409svn.tar.gz
+qbittorrent-2417svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- qbittorrent.spec	25 Jul 2009 18:27:58 -0000	1.23
+++ qbittorrent.spec	3 Aug 2009 20:12:15 -0000	1.24
@@ -1,9 +1,9 @@
-%define svn_rev 2409
+%define svn_rev 2417
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.0
-Release: 0.6.20090725svn%{?dist}
+Release: 0.7.20090803svn%{?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
+* Mon Aug 03 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.7.20090803svn
+- update to svn 2417
+
 * Sat Jul 25 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-0.6.20090725svn
 - update to svn 2409
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	25 Jul 2009 18:27:58 -0000	1.9
+++ sources	3 Aug 2009 20:12:15 -0000	1.10
@@ -1 +1 @@
-52634255c75a3af971cb1a3782a971b0  qbittorrent-2409svn.tar.gz
+eb3592a2fd89bb887c69d6acd6745839  qbittorrent-2417svn.tar.gz



From scop at fedoraproject.org  Mon Aug  3 20:36:46 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon,  3 Aug 2009 20:36:46 +0000 (UTC)
Subject: rpms/GraphicsMagick/devel .cvsignore, 1.9, 1.10 GraphicsMagick.spec,
	1.28, 1.29 sources, 1.9, 1.10
Message-ID: <20090803203647.0123211C00E8@cvs1.fedora.phx.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Log Message:
* Mon Aug  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.6-2
- Use lzma-compressed upstream source tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	29 Jul 2009 17:06:53 -0000	1.9
+++ .cvsignore	3 Aug 2009 20:36:46 -0000	1.10
@@ -1 +1 @@
-GraphicsMagick-1.3.6.tar.bz2
+GraphicsMagick-1.3.6.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- GraphicsMagick.spec	29 Jul 2009 17:44:59 -0000	1.28
+++ GraphicsMagick.spec	3 Aug 2009 20:36:46 -0000	1.29
@@ -2,10 +2,10 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -237,6 +237,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug  3 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.6-2
+- Use lzma-compressed upstream source tarball.
+
 * Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 1.3.6-1
 - GraphicsMagick-1.3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 Jul 2009 17:06:53 -0000	1.9
+++ sources	3 Aug 2009 20:36:46 -0000	1.10
@@ -1 +1 @@
-3df30799df3b567df98bab7f5b2cc68e  GraphicsMagick-1.3.6.tar.bz2
+b602509eecd926c157047407ea3fb4ad  GraphicsMagick-1.3.6.tar.lzma



From pkgdb at fedoraproject.org  Mon Aug  3 20:38:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 20:38:46 +0000
Subject: [pkgdb] qt-qsa ownership updated
Message-ID: <20090803203846.9369410F879@bastion2.fedora.phx.redhat.com>

Package qt-qsa in Fedora devel is now owned by chitlesh

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



From pkgdb at fedoraproject.org  Mon Aug  3 20:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 20:39:00 +0000
Subject: [pkgdb] qt-qsa ownership updated
Message-ID: <20090803203900.3134410F879@bastion2.fedora.phx.redhat.com>

Package qt-qsa in Fedora 10 is now owned by chitlesh

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



From pkgdb at fedoraproject.org  Mon Aug  3 20:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 20:39:00 +0000
Subject: [pkgdb] qt-qsa ownership updated
Message-ID: <20090803203900.EDA5D10F89E@bastion2.fedora.phx.redhat.com>

Package qt-qsa in Fedora 11 is now owned by chitlesh

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



From stransky at fedoraproject.org  Mon Aug  3 20:53:35 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  3 Aug 2009 20:53:35 +0000 (UTC)
Subject: rpms/xulrunner/devel .cvsignore, 1.69, 1.70 sources, 1.72,
	1.73 xulrunner.spec, 1.167, 1.168
Message-ID: <20090803205335.1BCF311C00E8@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	17 Jul 2009 19:01:03 -0000	1.69
+++ .cvsignore	3 Aug 2009 20:53:34 -0000	1.70
@@ -1 +1,2 @@
 xulrunner-1.9.1.1-source.tar.bz2
+xulrunner-1.9.1.2-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	17 Jul 2009 19:01:03 -0000	1.72
+++ sources	3 Aug 2009 20:53:34 -0000	1.73
@@ -1 +1 @@
-f2f68bc69f590eefc8fe98a0038087b1  xulrunner-1.9.1.1-source.tar.bz2
+0de7173e45df009f5a2620fcceb010fb  xulrunner-1.9.1.2-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- xulrunner.spec	27 Jul 2009 08:47:57 -0000	1.167
+++ xulrunner.spec	3 Aug 2009 20:53:34 -0000	1.168
@@ -12,8 +12,8 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.1
-Release:        2%{?dist}
+Version:        1.9.1.2
+Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -452,6 +452,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-1
+- Update to 1.9.1.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lmacken at fedoraproject.org  Mon Aug  3 21:00:21 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:00:21 +0000 (UTC)
Subject: rpms/python-sprox/devel import.log, NONE, 1.1 python-sprox.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803210022.0730F11C0417@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-sprox.spec 
Log Message:
Initial import of python-sprox in rawhide



--- NEW FILE import.log ---
python-sprox-0_6_1-1_fc10:HEAD:python-sprox-0.6.1-1.fc10.src.rpm:1249318617


--- NEW FILE python-sprox.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-sprox
Version:        0.6.1
Release:        1%{?dist}
Summary:        A package for creation of web widgets directly from database schema

Group:          Development/Languages
License:        MIT
URL:            http://sprox.org

Source0:        http://pypi.python.org/packages/source/s/sprox/sprox-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-tw-forms python-genshi python-sqlalchemy

Requires:       python-sqlalchemy >= 0.5
Requires:       python-tw-forms >= 0.9.2
Requires:       python-genshi >= 0.5

%description
Sprox is a widget generation library that has a slightly different take on the
problem of creating custom web content directly from database schemas. Sprox
provides an easy way to create forms for web content which are: automatically
generated, easy to customize, and validated. Sprox also has powerful tools to
help you display your content the way you want to with table and record
viewers. Sprox provides a way to fill your widgets, whether they are forms or
other content with customizable data.

%prep
%setup -q -n sprox-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -fr %{buildroot}%{python_sitelib}/tests

# python-tw-dojo needs to be packaged first...
#%check
#PYTHONPATH=$(pwd) nosetests

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/sprox*


%changelog
* Mon Jun 08 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-1
- Update to the latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:15:15 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:00:21 -0000	1.2
@@ -0,0 +1 @@
+sprox-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:15:15 -0000	1.1
+++ sources	3 Aug 2009 21:00:21 -0000	1.2
@@ -0,0 +1 @@
+1da7f4f809c4e729dfc9ae1bd723245a  sprox-0.6.1.tar.gz



From stransky at fedoraproject.org  Mon Aug  3 21:01:14 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  3 Aug 2009 21:01:14 +0000 (UTC)
Subject: rpms/xulrunner/F-10 .cvsignore, 1.71, 1.72 sources, 1.74,
	1.75 xulrunner.spec, 1.148, 1.149
Message-ID: <20090803210114.8DD7A11C00E8@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.0.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	21 Jul 2009 13:45:45 -0000	1.71
+++ .cvsignore	3 Aug 2009 21:01:14 -0000	1.72
@@ -1,2 +1,3 @@
 xulrunner-1.9.0.11-source.tar.bz2
 xulrunner-1.9.0.12-source.tar.bz2
+xulrunner-1.9.0.13-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	21 Jul 2009 13:45:45 -0000	1.74
+++ sources	3 Aug 2009 21:01:14 -0000	1.75
@@ -1 +1 @@
-0fe3631afc61afb5d77c843a49dc8320  xulrunner-1.9.0.12-source.tar.bz2
+eb2e69872ef6932de0ee98b102eb1d5b  xulrunner-1.9.0.13-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- xulrunner.spec	21 Jul 2009 13:45:45 -0000	1.148
+++ xulrunner.spec	3 Aug 2009 21:01:14 -0000	1.149
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.12
+Version:        1.9.0.13
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -423,6 +423,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug  3 2009 Martin Stransky <stransky at redhat.com> 1.9.0.13-1
+- Update to 1.9.0.13
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.12-1
 - Update to 1.9.0.12
 



From stransky at fedoraproject.org  Mon Aug  3 21:03:04 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  3 Aug 2009 21:03:04 +0000 (UTC)
Subject: rpms/xulrunner/F-11 sources,1.72,1.73 xulrunner.spec,1.164,1.165
Message-ID: <20090803210304.EAAD311C00E8@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	sources xulrunner.spec 
Log Message:
Update to 1.9.1.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	17 Jul 2009 06:52:24 -0000	1.72
+++ sources	3 Aug 2009 21:03:04 -0000	1.73
@@ -1 +1 @@
-f2f68bc69f590eefc8fe98a0038087b1  xulrunner-1.9.1.1-source.tar.bz2
+0de7173e45df009f5a2620fcceb010fb  xulrunner-1.9.1.2-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- xulrunner.spec	17 Jul 2009 06:52:24 -0000	1.164
+++ xulrunner.spec	3 Aug 2009 21:03:04 -0000	1.165
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.1
+Version:        1.9.1.2
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -452,6 +452,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> 1.9.1.1-2
+- Update to 1.9.1.2
+
 * Fri Jul 17 2009 Martin Stransky <stransky at redhat.com> 1.9.1.1-1
 - Update to 1.9.1.1
 



From lmacken at fedoraproject.org  Mon Aug  3 21:03:19 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:03:19 +0000 (UTC)
Subject: rpms/python-sprox/devel .cvsignore, 1.2, 1.3 python-sprox.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090803210319.7DADB11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore python-sprox.spec sources 
Log Message:
0.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Aug 2009 21:00:21 -0000	1.2
+++ .cvsignore	3 Aug 2009 21:03:19 -0000	1.3
@@ -1 +1 @@
-sprox-0.6.1.tar.gz
+sprox-0.6.3.tar.gz


Index: python-sprox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/devel/python-sprox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-sprox.spec	3 Aug 2009 21:00:21 -0000	1.1
+++ python-sprox.spec	3 Aug 2009 21:03:19 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-sprox
-Version:        0.6.1
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        A package for creation of web widgets directly from database schema
 
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 03 2009 Luke Macken <lmacken at redhat.com> - 0.6.3-1
+- 0.6.3
+
 * Mon Jun 08 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-1
 - Update to the latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Aug 2009 21:00:21 -0000	1.2
+++ sources	3 Aug 2009 21:03:19 -0000	1.3
@@ -1 +1 @@
-1da7f4f809c4e729dfc9ae1bd723245a  sprox-0.6.1.tar.gz
+db5ec9e7af73b527173b08e748cfd9f0  sprox-0.6.3.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:09:14 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:09:14 +0000 (UTC)
Subject: rpms/python-sprox/F-11 python-sprox.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803210914.2912411C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-sprox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2069

Modified Files:
	.cvsignore sources 
Added Files:
	python-sprox.spec 
Log Message:
Initial commit of python-sprox to F11


--- NEW FILE python-sprox.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-sprox
Version:        0.6.3
Release:        1%{?dist}
Summary:        A package for creation of web widgets directly from database schema

Group:          Development/Languages
License:        MIT
URL:            http://sprox.org

Source0:        http://pypi.python.org/packages/source/s/sprox/sprox-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-tw-forms python-genshi python-sqlalchemy

Requires:       python-sqlalchemy >= 0.5
Requires:       python-tw-forms >= 0.9.2
Requires:       python-genshi >= 0.5

%description
Sprox is a widget generation library that has a slightly different take on the
problem of creating custom web content directly from database schemas. Sprox
provides an easy way to create forms for web content which are: automatically
generated, easy to customize, and validated. Sprox also has powerful tools to
help you display your content the way you want to with table and record
viewers. Sprox provides a way to fill your widgets, whether they are forms or
other content with customizable data.

%prep
%setup -q -n sprox-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -fr %{buildroot}%{python_sitelib}/tests

# python-tw-dojo needs to be packaged first...
#%check
#PYTHONPATH=$(pwd) nosetests

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/sprox*


%changelog
* Mon Aug 03 2009 Luke Macken <lmacken at redhat.com> - 0.6.3-1
- 0.6.3

* Mon Jun 08 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-1
- Update to the latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:15:15 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:09:13 -0000	1.2
@@ -0,0 +1 @@
+sprox-0.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:15:15 -0000	1.1
+++ sources	3 Aug 2009 21:09:13 -0000	1.2
@@ -0,0 +1 @@
+db5ec9e7af73b527173b08e748cfd9f0  sprox-0.6.3.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:09:40 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:09:40 +0000 (UTC)
Subject: rpms/python-tgext-admin/devel import.log, NONE,
	1.1 python-tgext-admin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803210940.788EE11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2240/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-tgext-admin.spec 
Log Message:
Initial commit of python-tgext-admin for rawhide



--- NEW FILE import.log ---
python-tgext-admin-0_2_5-1_fc10:HEAD:python-tgext-admin-0.2.5-1.fc10.src.rpm:1249319152


--- NEW FILE python-tgext-admin.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tgext-admin
Version:        0.2.5
Release:        1%{?dist}
Summary:        Admin Controller add-on for basic TG identity model

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/tgext.admin/
Source0:        http://pypi.python.org/packages/source/t/tgext.admin/tgext.admin-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-devel
#BuildRequires:  python-tgext-crud python-nose TurboGears2
Requires:       python-tgext-crud

%description
Admin Controller add-on for basic TG identity model.


%prep
%setup -q -n tgext.admin-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__rm} -r %{buildroot}/%{python_sitelib}/tgext/admin/test


# Waiting for chameleon.genshi to be packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc license.txt README.txt
%{python_sitelib}/tgext.admin-%{version}-py%{pyver}*
%{python_sitelib}/tgext/admin/


%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.2.5-1
- 0.2.5

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-2
- Change %%define to %%global
- Don't package the test suite

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:13:38 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:09:40 -0000	1.2
@@ -0,0 +1 @@
+tgext.admin-0.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:13:38 -0000	1.1
+++ sources	3 Aug 2009 21:09:40 -0000	1.2
@@ -0,0 +1 @@
+e08a09209ab8314726cf9357e29eaf2d  tgext.admin-0.2.5.tar.gz



From notting at fedoraproject.org  Mon Aug  3 21:10:22 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon,  3 Aug 2009 21:10:22 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.165, 1.166 initscripts.spec,
	1.195, 1.196 sources, 1.184, 1.185
Message-ID: <20090803211022.43D0211C04D1@cvs1.fedora.phx.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.96-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- .cvsignore	4 Jun 2009 19:05:08 -0000	1.165
+++ .cvsignore	3 Aug 2009 21:10:21 -0000	1.166
@@ -1 +1 @@
-initscripts-8.95.tar.bz2
+initscripts-8.96.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- initscripts.spec	25 Jul 2009 03:23:44 -0000	1.195
+++ initscripts.spec	3 Aug 2009 21:10:21 -0000	1.196
@@ -2,18 +2,18 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.95
+Version: 8.96
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 2
+Release: 1
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: /sbin/sysctl, syslog
 Requires: /sbin/fuser, /bin/grep
-Requires: /sbin/pidof
+Requires: /sbin/pidof, /sbin/blkid
 Requires: module-init-tools
 Requires: util-linux >= 2.10s-11, mount >= 2.11l
 Requires: bash >= 3.0
@@ -87,11 +87,13 @@ 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/lib/udev/ccw_init \
+ $RPM_BUILD_ROOT/etc/event.d/console
 %else
 rm -f \
  $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \
- $RPM_BUILD_ROOT/etc/sysconfig/init.s390
+ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 \
+ $RPM_BUILD_ROOT/etc/event.d/tty[1-6]
 %endif
 
 %pre
@@ -237,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/NetworkManager/dispatcher.d
 /etc/NetworkManager/dispatcher.d/00-netreport
 /etc/NetworkManager/dispatcher.d/05-netfs
-%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d
+%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d
 /var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
@@ -249,8 +251,19 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.95-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug  3 2009 Bill Nottingham <notting at redhat.com> - 8.96-1
+- fix up upstart rules for s390(x). (#515222)
+- leave ChangeLog in the tarball only. (#515012)
+- disable netfilter on bridged interfaces. (#512206)
+- assorted shell-related cleanups to ipv6 and other code (<victor.lowther at gmail.com>)
+- use resolv.conf from dracut netboot before setting hostname. (#514801, <wtogami at redhat.com>)
+- ipcalc updates (<victor.lowther at gmail.com>)
+- only use ethtool for link checking; no more mii-tool
+- require /sbin/blkid directly, as it moves between packages (#508413)
+- redirect bash errors on 'unset' to /dev/null. (#482888)
+- fix dmraid partition naming (#501476, <hdegoede at redhat.com>)
+- don't quote upstart signals. (#501155)
+- translation updates: bn_IN, da, es, sk
 
 * Fri May  1 2009 Bill Nottingham <notting at redhat.com> - 8.95-1
 - don't kill runlevel events on subsequent entering of the same runlevel (#498514)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- sources	4 Jun 2009 19:05:08 -0000	1.184
+++ sources	3 Aug 2009 21:10:21 -0000	1.185
@@ -1 +1 @@
-b3c74ef959cf07dd6f9ba4fa878bd559  initscripts-8.95.tar.bz2
+569af6fd0a1a3988a9e60963eeacaaa2  initscripts-8.96.tar.bz2



From lmacken at fedoraproject.org  Mon Aug  3 21:17:34 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:17:34 +0000 (UTC)
Subject: rpms/python-tgext-admin/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090803211734.8D69B11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-admin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5156

Modified Files:
	.cvsignore sources 
Log Message:
Initial release of python-tgext-admin for F-11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:13:38 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:17:34 -0000	1.2
@@ -0,0 +1 @@
+tgext.admin-0.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:13:38 -0000	1.1
+++ sources	3 Aug 2009 21:17:34 -0000	1.2
@@ -0,0 +1 @@
+e08a09209ab8314726cf9357e29eaf2d  tgext.admin-0.2.5.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:17:48 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:17:48 +0000 (UTC)
Subject: rpms/python-tgext-admin/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090803211748.E29EA11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sources 
Log Message:
Initial release of python-tgext-admin for F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:13:38 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:17:48 -0000	1.2
@@ -0,0 +1 @@
+tgext.admin-0.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:13:38 -0000	1.1
+++ sources	3 Aug 2009 21:17:48 -0000	1.2
@@ -0,0 +1 @@
+e08a09209ab8314726cf9357e29eaf2d  tgext.admin-0.2.5.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:18:03 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:18:03 +0000 (UTC)
Subject: rpms/python-tgext-admin/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090803211803.1512011C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-admin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5465

Modified Files:
	.cvsignore sources 
Log Message:
Initial release of python-tgext-admin for EL-5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:13:38 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:18:02 -0000	1.2
@@ -0,0 +1 @@
+tgext.admin-0.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tgext-admin/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:13:38 -0000	1.1
+++ sources	3 Aug 2009 21:18:02 -0000	1.2
@@ -0,0 +1 @@
+e08a09209ab8314726cf9357e29eaf2d  tgext.admin-0.2.5.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:18:46 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:18:46 +0000 (UTC)
Subject: rpms/python-tgext-admin/F-11 python-tgext-admin.spec,NONE,1.1
Message-ID: <20090803211846.241E511C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-admin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5747

Added Files:
	python-tgext-admin.spec 
Log Message:
Initial release of python-tgext-admin for F-11


--- NEW FILE python-tgext-admin.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tgext-admin
Version:        0.2.5
Release:        1%{?dist}
Summary:        Admin Controller add-on for basic TG identity model

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/tgext.admin/
Source0:        http://pypi.python.org/packages/source/t/tgext.admin/tgext.admin-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-devel
#BuildRequires:  python-tgext-crud python-nose TurboGears2
Requires:       python-tgext-crud

%description
Admin Controller add-on for basic TG identity model.


%prep
%setup -q -n tgext.admin-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__rm} -r %{buildroot}/%{python_sitelib}/tgext/admin/test


# Waiting for chameleon.genshi to be packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc license.txt README.txt
%{python_sitelib}/tgext.admin-%{version}-py%{pyver}*
%{python_sitelib}/tgext/admin/


%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.2.5-1
- 0.2.5

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-2
- Change %%define to %%global
- Don't package the test suite

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
- Initial package



From lmacken at fedoraproject.org  Mon Aug  3 21:19:01 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:19:01 +0000 (UTC)
Subject: rpms/python-tgext-admin/F-10 python-tgext-admin.spec,NONE,1.1
Message-ID: <20090803211901.0499A11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Added Files:
	python-tgext-admin.spec 
Log Message:
Initial release of python-tgext-admin for F-10


--- NEW FILE python-tgext-admin.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tgext-admin
Version:        0.2.5
Release:        1%{?dist}
Summary:        Admin Controller add-on for basic TG identity model

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/tgext.admin/
Source0:        http://pypi.python.org/packages/source/t/tgext.admin/tgext.admin-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-devel
#BuildRequires:  python-tgext-crud python-nose TurboGears2
Requires:       python-tgext-crud

%description
Admin Controller add-on for basic TG identity model.


%prep
%setup -q -n tgext.admin-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__rm} -r %{buildroot}/%{python_sitelib}/tgext/admin/test


# Waiting for chameleon.genshi to be packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc license.txt README.txt
%{python_sitelib}/tgext.admin-%{version}-py%{pyver}*
%{python_sitelib}/tgext/admin/


%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.2.5-1
- 0.2.5

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-2
- Change %%define to %%global
- Don't package the test suite

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
- Initial package



From lmacken at fedoraproject.org  Mon Aug  3 21:19:15 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:19:15 +0000 (UTC)
Subject: rpms/python-tgext-admin/EL-5 python-tgext-admin.spec,NONE,1.1
Message-ID: <20090803211915.D429511C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tgext-admin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6054

Added Files:
	python-tgext-admin.spec 
Log Message:
Initial release of python-tgext-admin for EL-5


--- NEW FILE python-tgext-admin.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tgext-admin
Version:        0.2.5
Release:        1%{?dist}
Summary:        Admin Controller add-on for basic TG identity model

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/tgext.admin/
Source0:        http://pypi.python.org/packages/source/t/tgext.admin/tgext.admin-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-devel
#BuildRequires:  python-tgext-crud python-nose TurboGears2
Requires:       python-tgext-crud

%description
Admin Controller add-on for basic TG identity model.


%prep
%setup -q -n tgext.admin-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__rm} -r %{buildroot}/%{python_sitelib}/tgext/admin/test


# Waiting for chameleon.genshi to be packaged
#%check
#PYTHONPATH=$(pwd) nosetests


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc license.txt README.txt
%{python_sitelib}/tgext.admin-%{version}-py%{pyver}*
%{python_sitelib}/tgext/admin/


%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.2.5-1
- 0.2.5

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-2
- Change %%define to %%global
- Don't package the test suite

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
- Initial package



From lmacken at fedoraproject.org  Mon Aug  3 21:19:35 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:19:35 +0000 (UTC)
Subject: rpms/python-sprox/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090803211935.DA69511C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sources 
Log Message:
Initial commit of python-sprox on F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:15:15 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:19:35 -0000	1.2
@@ -0,0 +1 @@
+sprox-0.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:15:15 -0000	1.1
+++ sources	3 Aug 2009 21:19:35 -0000	1.2
@@ -0,0 +1 @@
+db5ec9e7af73b527173b08e748cfd9f0  sprox-0.6.3.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:19:52 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:19:52 +0000 (UTC)
Subject: rpms/python-sprox/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090803211952.8A17411C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-sprox/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6412

Modified Files:
	.cvsignore sources 
Log Message:
Initial commit of python-sprox on EL-5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jul 2009 21:15:15 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:19:52 -0000	1.2
@@ -0,0 +1 @@
+sprox-0.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sprox/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jul 2009 21:15:15 -0000	1.1
+++ sources	3 Aug 2009 21:19:52 -0000	1.2
@@ -0,0 +1 @@
+db5ec9e7af73b527173b08e748cfd9f0  sprox-0.6.3.tar.gz



From lmacken at fedoraproject.org  Mon Aug  3 21:22:57 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:22:57 +0000 (UTC)
Subject: rpms/python-sprox/F-10 python-sprox.spec,NONE,1.1
Message-ID: <20090803212257.04F3811C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Added Files:
	python-sprox.spec 
Log Message:
Initial commit of python-sprox on F-10


--- NEW FILE python-sprox.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-sprox
Version:        0.6.3
Release:        1%{?dist}
Summary:        A package for creation of web widgets directly from database schema

Group:          Development/Languages
License:        MIT
URL:            http://sprox.org

Source0:        http://pypi.python.org/packages/source/s/sprox/sprox-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-tw-forms python-genshi python-sqlalchemy0.5

Requires:       python-sqlalchemy0.5
Requires:       python-tw-forms >= 0.9.2
Requires:       python-genshi >= 0.5

%description
Sprox is a widget generation library that has a slightly different take on the
problem of creating custom web content directly from database schemas. Sprox
provides an easy way to create forms for web content which are: automatically
generated, easy to customize, and validated. Sprox also has powerful tools to
help you display your content the way you want to with table and record
viewers. Sprox provides a way to fill your widgets, whether they are forms or
other content with customizable data.

%prep
%setup -q -n sprox-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -fr %{buildroot}%{python_sitelib}/tests

# python-tw-dojo needs to be packaged first...
#%check
#PYTHONPATH=$(pwd) nosetests

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/sprox*


%changelog
* Mon Aug 03 2009 Luke Macken <lmacken at redhat.com> - 0.6.3-1
- 0.6.3

* Mon Jun 08 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-1
- Update to the latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- Initial package



From lmacken at fedoraproject.org  Mon Aug  3 21:23:19 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  3 Aug 2009 21:23:19 +0000 (UTC)
Subject: rpms/python-sprox/EL-5 python-sprox.spec,NONE,1.1
Message-ID: <20090803212319.997EC11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-sprox/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7428

Added Files:
	python-sprox.spec 
Log Message:
Initial commit of python-sprox on EL-5


--- NEW FILE python-sprox.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-sprox
Version:        0.6.3
Release:        1%{?dist}
Summary:        A package for creation of web widgets directly from database schema

Group:          Development/Languages
License:        MIT
URL:            http://sprox.org

Source0:        http://pypi.python.org/packages/source/s/sprox/sprox-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-tw-forms python-genshi python-sqlalchemy0.5

Requires:       python-sqlalchemy0.5
Requires:       python-tw-forms >= 0.9.2
Requires:       python-genshi >= 0.5

%description
Sprox is a widget generation library that has a slightly different take on the
problem of creating custom web content directly from database schemas. Sprox
provides an easy way to create forms for web content which are: automatically
generated, easy to customize, and validated. Sprox also has powerful tools to
help you display your content the way you want to with table and record
viewers. Sprox provides a way to fill your widgets, whether they are forms or
other content with customizable data.

%prep
%setup -q -n sprox-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -fr %{buildroot}%{python_sitelib}/tests

# python-tw-dojo needs to be packaged first...
#%check
#PYTHONPATH=$(pwd) nosetests

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc
%{python_sitelib}/sprox*


%changelog
* Mon Aug 03 2009 Luke Macken <lmacken at redhat.com> - 0.6.3-1
- 0.6.3

* Mon Jun 08 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-1
- Update to the latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- Initial package



From wtogami at fedoraproject.org  Mon Aug  3 21:24:10 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon,  3 Aug 2009 21:24:10 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.24, 1.25 ltsp.spec, 1.33, 1.34 sources,
	1.28, 1.29
Message-ID: <20090803212410.8AFE211C00E8@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
5.1.80



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	30 Apr 2009 22:12:13 -0000	1.24
+++ .cvsignore	3 Aug 2009 21:24:10 -0000	1.25
@@ -1 +1 @@
-ltsp-5.1.72.tar.bz2
+ltsp-5.1.80.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ltsp.spec	25 Jul 2009 11:22:48 -0000	1.33
+++ ltsp.spec	3 Aug 2009 21:24:10 -0000	1.34
@@ -1,8 +1,8 @@
 Name:           ltsp
-Version:        5.1.72
+Version:        5.1.80
 %define _datestamp .20090422.23
 #Release:        1%{_datestamp}%{?dist}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
 
@@ -412,6 +412,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 03 2009 Warren Togami <wtogami at redhat.com> - 5.1.80-1
+- 5.1.80
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.72-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	30 Apr 2009 22:12:13 -0000	1.28
+++ sources	3 Aug 2009 21:24:10 -0000	1.29
@@ -1 +1 @@
-170702a6a602e08152b6169c0bb21d58  ltsp-5.1.72.tar.bz2
+b9fd7f5d293561fde3932d0ca503fd7d  ltsp-5.1.80.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug  3 21:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:25:14 +0000
Subject: [pkgdb] vifir was added for fab
Message-ID: <20090803212515.D907610F886@bastion2.fedora.phx.redhat.com>

tibbs has added Package vifir with summary A viewer for electronic aviation charts
tibbs has approved Package vifir
tibbs has added a Fedora devel branch for vifir with an owner of fab
tibbs has approved vifir in Fedora devel
tibbs has approved Package vifir
tibbs has set commit to Approved for 107427 on vifir (Fedora devel)
tibbs has set checkout to Approved for 107427 on vifir (Fedora devel)
tibbs has set build to Approved for 107427 on vifir (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:25:16 +0000
Subject: [pkgdb] vifir summary updated by tibbs
Message-ID: <20090803212516.A632E10F8A1@bastion2.fedora.phx.redhat.com>

tibbs set package vifir summary to A viewer for electronic aviation charts

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:25:16 +0000
Subject: [pkgdb] vifir (Fedora, 11) updated by tibbs
Message-ID: <20090803212517.0336210F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for vifir
tibbs has set commit to Approved for 107427 on vifir (Fedora 11)
tibbs has set checkout to Approved for 107427 on vifir (Fedora 11)
tibbs has set build to Approved for 107427 on vifir (Fedora 11)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:25:16 +0000
Subject: [pkgdb] vifir (Fedora, 11) updated by tibbs
Message-ID: <20090803212517.5EBE810F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for vifir
tibbs has set commit to Approved for 107427 on vifir (Fedora 10)
tibbs has set checkout to Approved for 107427 on vifir (Fedora 10)
tibbs has set build to Approved for 107427 on vifir (Fedora 10)

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



From tibbs at fedoraproject.org  Mon Aug  3 21:25:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:25:22 +0000 (UTC)
Subject: rpms/vifir/devel - New directory
Message-ID: <20090803212522.5ED5D11C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vifir/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJR8308/rpms/vifir/devel

Log Message:
Directory /cvs/pkgs/rpms/vifir/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:25:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:25:22 +0000 (UTC)
Subject: rpms/vifir - New directory
Message-ID: <20090803212522.26D6311C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vifir
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJR8308/rpms/vifir

Log Message:
Directory /cvs/pkgs/rpms/vifir added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:25:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:25:28 +0000 (UTC)
Subject: rpms/vifir Makefile,NONE,1.1
Message-ID: <20090803212528.1B6B511C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vifir
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJR8308/rpms/vifir

Added Files:
	Makefile 
Log Message:
Setup of module vifir


--- NEW FILE Makefile ---
# Top level Makefile for module vifir
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug  3 21:25:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:25:28 +0000 (UTC)
Subject: rpms/vifir/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090803212528.5335511C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vifir/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJR8308/rpms/vifir/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vifir
# $Id: Makefile,v 1.1 2009/08/03 21:25:28 tibbs Exp $
NAME := vifir
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  3 21:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:26:12 +0000
Subject: [pkgdb] jana was added for pbrobinson
Message-ID: <20090803212612.9CB6310F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package jana with summary An interface library for time-related PIM
tibbs has approved Package jana
tibbs has added a Fedora devel branch for jana with an owner of pbrobinson
tibbs has approved jana in Fedora devel
tibbs has approved Package jana
tibbs has set commit to Approved for 107427 on jana (Fedora devel)
tibbs has set checkout to Approved for 107427 on jana (Fedora devel)
tibbs has set build to Approved for 107427 on jana (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:26:13 +0000
Subject: [pkgdb] jana summary updated by tibbs
Message-ID: <20090803212613.DD2EA10F8A1@bastion2.fedora.phx.redhat.com>

tibbs set package jana summary to An interface library for time-related PIM

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:26:13 +0000
Subject: [pkgdb] jana (Fedora, 10) updated by tibbs
Message-ID: <20090803212614.0E8F910F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for jana
tibbs has set commit to Approved for 107427 on jana (Fedora 10)
tibbs has set checkout to Approved for 107427 on jana (Fedora 10)
tibbs has set build to Approved for 107427 on jana (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:26:13 +0000
Subject: [pkgdb] jana (Fedora, 10) updated by tibbs
Message-ID: <20090803212614.5A69210F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for jana
tibbs has set commit to Approved for 107427 on jana (Fedora 11)
tibbs has set checkout to Approved for 107427 on jana (Fedora 11)
tibbs has set build to Approved for 107427 on jana (Fedora 11)

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



From tibbs at fedoraproject.org  Mon Aug  3 21:26:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:26:19 +0000 (UTC)
Subject: rpms/jana - New directory
Message-ID: <20090803212619.14D0211C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jana
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvshF8810/rpms/jana

Log Message:
Directory /cvs/pkgs/rpms/jana added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:26:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:26:19 +0000 (UTC)
Subject: rpms/jana/devel - New directory
Message-ID: <20090803212619.378DF11C0417@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jana/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvshF8810/rpms/jana/devel

Log Message:
Directory /cvs/pkgs/rpms/jana/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:26:25 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:26:25 +0000 (UTC)
Subject: rpms/jana/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090803212625.BA3BA11C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jana/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvshF8810/rpms/jana/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jana
# $Id: Makefile,v 1.1 2009/08/03 21:26:25 tibbs Exp $
NAME := jana
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Aug  3 21:26:25 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:26:25 +0000 (UTC)
Subject: rpms/jana Makefile,NONE,1.1
Message-ID: <20090803212625.9210611C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jana
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvshF8810/rpms/jana

Added Files:
	Makefile 
Log Message:
Setup of module jana


--- NEW FILE Makefile ---
# Top level Makefile for module jana
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:13 +0000
Subject: [pkgdb] sblim-indication_helper was added for praveenp
Message-ID: <20090803212913.839DF10F89E@bastion2.fedora.phx.redhat.com>

tibbs has added Package sblim-indication_helper with summary libraries for writing CMPI providers
tibbs has approved Package sblim-indication_helper
tibbs has added a Fedora devel branch for sblim-indication_helper with an owner of praveenp
tibbs has approved sblim-indication_helper in Fedora devel
tibbs has approved Package sblim-indication_helper
tibbs has set commit to Approved for 107427 on sblim-indication_helper (Fedora devel)
tibbs has set checkout to Approved for 107427 on sblim-indication_helper (Fedora devel)
tibbs has set build to Approved for 107427 on sblim-indication_helper (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:15 +0000
Subject: [pkgdb] sblim-indication_helper (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212916.9500C10F8A2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for sblim-indication_helper
tibbs has set commit to Approved for 107427 on sblim-indication_helper (Fedora 11)
tibbs has set checkout to Approved for 107427 on sblim-indication_helper (Fedora 11)
tibbs has set build to Approved for 107427 on sblim-indication_helper (Fedora 11)
tibbs approved watchbugzilla on sblim-indication_helper (Fedora 11) for mdomsch
tibbs approved watchcommits on sblim-indication_helper (Fedora 11) for mdomsch
tibbs approved watchbugzilla on sblim-indication_helper (Fedora 11) for srini
tibbs approved watchcommits on sblim-indication_helper (Fedora 11) for srini

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:15 +0000
Subject: [pkgdb] sblim-indication_helper summary updated by tibbs
Message-ID: <20090803212916.0637410F8A1@bastion2.fedora.phx.redhat.com>

tibbs set package sblim-indication_helper summary to libraries for writing CMPI providers

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:15 +0000
Subject: [pkgdb] sblim-indication_helper (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212917.5ED2610F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for sblim-indication_helper
tibbs has set commit to Approved for 107427 on sblim-indication_helper (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on sblim-indication_helper (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on sblim-indication_helper (Fedora EPEL 5)
tibbs approved watchbugzilla on sblim-indication_helper (Fedora EPEL 5) for mdomsch
tibbs approved watchcommits on sblim-indication_helper (Fedora EPEL 5) for mdomsch
tibbs approved watchbugzilla on sblim-indication_helper (Fedora EPEL 5) for srini
tibbs approved watchcommits on sblim-indication_helper (Fedora EPEL 5) for srini

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:15 +0000
Subject: [pkgdb] sblim-indication_helper (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212919.0504B10F8AF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for sblim-indication_helper
tibbs has set commit to Approved for 107427 on sblim-indication_helper (Fedora 10)
tibbs has set checkout to Approved for 107427 on sblim-indication_helper (Fedora 10)
tibbs has set build to Approved for 107427 on sblim-indication_helper (Fedora 10)
tibbs approved watchbugzilla on sblim-indication_helper (Fedora 10) for mdomsch
tibbs approved watchcommits on sblim-indication_helper (Fedora 10) for mdomsch
tibbs approved watchbugzilla on sblim-indication_helper (Fedora 10) for srini
tibbs approved watchcommits on sblim-indication_helper (Fedora 10) for srini

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:15 +0000
Subject: [pkgdb] sblim-indication_helper (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212917.E082E10F8B7@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for sblim-indication_helper
tibbs has set commit to Approved for 107427 on sblim-indication_helper (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on sblim-indication_helper (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on sblim-indication_helper (Fedora EPEL 4)
tibbs approved watchbugzilla on sblim-indication_helper (Fedora EPEL 4) for mdomsch
tibbs approved watchcommits on sblim-indication_helper (Fedora EPEL 4) for mdomsch
tibbs approved watchbugzilla on sblim-indication_helper (Fedora EPEL 4) for srini
tibbs approved watchcommits on sblim-indication_helper (Fedora EPEL 4) for srini

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



From tibbs at fedoraproject.org  Mon Aug  3 21:29:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:21 +0000 (UTC)
Subject: rpms/sblim-indication_helper - New directory
Message-ID: <20090803212921.1E8FF11C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-indication_helper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsXC9777/rpms/sblim-indication_helper

Log Message:
Directory /cvs/pkgs/rpms/sblim-indication_helper added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:29:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:21 +0000 (UTC)
Subject: rpms/sblim-indication_helper/devel - New directory
Message-ID: <20090803212921.417D211C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-indication_helper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsXC9777/rpms/sblim-indication_helper/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-indication_helper/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug  3 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:15 +0000
Subject: [pkgdb] sblim-indication_helper (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212919.6995810F8BA@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on sblim-indication_helper (Fedora devel) for mdomsch
tibbs approved watchcommits on sblim-indication_helper (Fedora devel) for mdomsch
tibbs approved watchbugzilla on sblim-indication_helper (Fedora devel) for srini
tibbs approved watchcommits on sblim-indication_helper (Fedora devel) for srini

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



From tibbs at fedoraproject.org  Mon Aug  3 21:29:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:27 +0000 (UTC)
Subject: rpms/sblim-indication_helper Makefile,NONE,1.1
Message-ID: <20090803212927.52B8911C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-indication_helper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsXC9777/rpms/sblim-indication_helper

Added Files:
	Makefile 
Log Message:
Setup of module sblim-indication_helper


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-indication_helper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug  3 21:29:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:27 +0000 (UTC)
Subject: rpms/sblim-indication_helper/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090803212927.8676811C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-indication_helper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsXC9777/rpms/sblim-indication_helper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-indication_helper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-indication_helper
# $Id: Makefile,v 1.1 2009/08/03 21:29:27 tibbs Exp $
NAME := sblim-indication_helper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  3 21:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:48 +0000
Subject: [pkgdb] perl-Flickr-Upload was added for ksyz
Message-ID: <20090803212948.7562A10F8A1@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-Flickr-Upload with summary Flickr upload tool
tibbs has approved Package perl-Flickr-Upload
tibbs has added a Fedora devel branch for perl-Flickr-Upload with an owner of ksyz
tibbs has approved perl-Flickr-Upload in Fedora devel
tibbs has approved Package perl-Flickr-Upload
tibbs has set commit to Approved for 107427 on perl-Flickr-Upload (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-Flickr-Upload (Fedora devel)
tibbs has set build to Approved for 107427 on perl-Flickr-Upload (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-Upload



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:49 +0000
Subject: [pkgdb] perl-Flickr-Upload summary updated by tibbs
Message-ID: <20090803212950.0BB5C10F8B4@bastion2.fedora.phx.redhat.com>

tibbs set package perl-Flickr-Upload summary to Flickr upload tool

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-Upload



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:49 +0000
Subject: [pkgdb] perl-Flickr-Upload (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212951.1B88F10F8C8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-Flickr-Upload
tibbs has set commit to Approved for 107427 on perl-Flickr-Upload (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-Flickr-Upload (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-Flickr-Upload (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-Upload



From pkgdb at fedoraproject.org  Mon Aug  3 21:29:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:29:49 +0000
Subject: [pkgdb] perl-Flickr-Upload (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090803212952.CB67010F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-Flickr-Upload
tibbs has set commit to Approved for 107427 on perl-Flickr-Upload (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-Flickr-Upload (Fedora 11)
tibbs has set build to Approved for 107427 on perl-Flickr-Upload (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Flickr-Upload



From tibbs at fedoraproject.org  Mon Aug  3 21:29:54 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:54 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/devel - New directory
Message-ID: <20090803212954.38B7111C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK10264/rpms/perl-Flickr-Upload/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Flickr-Upload/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:29:54 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:54 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload - New directory
Message-ID: <20090803212954.15CE311C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-Upload
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK10264/rpms/perl-Flickr-Upload

Log Message:
Directory /cvs/pkgs/rpms/perl-Flickr-Upload added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:29:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:29:59 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload Makefile,NONE,1.1
Message-ID: <20090803212959.DC65311C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-Upload
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK10264/rpms/perl-Flickr-Upload

Added Files:
	Makefile 
Log Message:
Setup of module perl-Flickr-Upload


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Flickr-Upload
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug  3 21:30:00 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:30:00 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090803213000.1D88611C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsK10264/rpms/perl-Flickr-Upload/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Flickr-Upload


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Flickr-Upload
# $Id: Makefile,v 1.1 2009/08/03 21:29:59 tibbs Exp $
NAME := perl-Flickr-Upload
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  3 21:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:32:34 +0000
Subject: [pkgdb] jemmy summary updated by tibbs
Message-ID: <20090803213236.5052E10F8D2@bastion2.fedora.phx.redhat.com>

tibbs set package jemmy summary to Java UI testing library

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:32:34 +0000
Subject: [pkgdb] jemmy (Fedora, 11) updated by tibbs
Message-ID: <20090803213237.E0F0210F8B7@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for jemmy
tibbs has set commit to Approved for 107427 on jemmy (Fedora 11)
tibbs has set checkout to Approved for 107427 on jemmy (Fedora 11)
tibbs has set build to Approved for 107427 on jemmy (Fedora 11)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:32:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:32:32 +0000
Subject: [pkgdb] jemmy was added for victorv
Message-ID: <20090803213234.E86B510F8A9@bastion2.fedora.phx.redhat.com>

tibbs has added Package jemmy with summary Java UI testing library
tibbs has approved Package jemmy
tibbs has added a Fedora devel branch for jemmy with an owner of victorv
tibbs has approved jemmy in Fedora devel
tibbs has approved Package jemmy
tibbs has set commit to Approved for 107427 on jemmy (Fedora devel)
tibbs has set checkout to Approved for 107427 on jemmy (Fedora devel)
tibbs has set build to Approved for 107427 on jemmy (Fedora devel)

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



From tibbs at fedoraproject.org  Mon Aug  3 21:32:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:32:39 +0000 (UTC)
Subject: rpms/jemmy/devel - New directory
Message-ID: <20090803213239.3725011C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jemmy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11110/rpms/jemmy/devel

Log Message:
Directory /cvs/pkgs/rpms/jemmy/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:32:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:32:45 +0000 (UTC)
Subject: rpms/jemmy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090803213245.835FC11C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jemmy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11110/rpms/jemmy/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jemmy
# $Id: Makefile,v 1.1 2009/08/03 21:32:45 tibbs Exp $
NAME := jemmy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Aug  3 21:32:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:32:39 +0000 (UTC)
Subject: rpms/jemmy - New directory
Message-ID: <20090803213239.164C511C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jemmy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11110/rpms/jemmy

Log Message:
Directory /cvs/pkgs/rpms/jemmy added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:32:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:32:45 +0000 (UTC)
Subject: rpms/jemmy Makefile,NONE,1.1
Message-ID: <20090803213245.439DD11C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/jemmy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11110/rpms/jemmy

Added Files:
	Makefile 
Log Message:
Setup of module jemmy


--- NEW FILE Makefile ---
# Top level Makefile for module jemmy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug  3 21:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:32:34 +0000
Subject: [pkgdb] jemmy (Fedora, 11) updated by tibbs
Message-ID: <20090803213239.463A910F8CE@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for jemmy
tibbs has set commit to Approved for 107427 on jemmy (Fedora 10)
tibbs has set checkout to Approved for 107427 on jemmy (Fedora 10)
tibbs has set build to Approved for 107427 on jemmy (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Aug  3 21:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:33:28 +0000
Subject: [pkgdb] moblin-sound-theme was added for pbrobinson
Message-ID: <20090803213328.65C1B10F8AC@bastion2.fedora.phx.redhat.com>

tibbs has added Package moblin-sound-theme with summary Moblin sound theme
tibbs has approved Package moblin-sound-theme
tibbs has added a Fedora devel branch for moblin-sound-theme with an owner of pbrobinson
tibbs has approved moblin-sound-theme in Fedora devel
tibbs has approved Package moblin-sound-theme
tibbs has set commit to Approved for 107427 on moblin-sound-theme (Fedora devel)
tibbs has set checkout to Approved for 107427 on moblin-sound-theme (Fedora devel)
tibbs has set build to Approved for 107427 on moblin-sound-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-sound-theme



From pkgdb at fedoraproject.org  Mon Aug  3 21:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:33:28 +0000
Subject: [pkgdb] moblin-sound-theme summary updated by tibbs
Message-ID: <20090803213329.D35BB10F8B0@bastion2.fedora.phx.redhat.com>

tibbs set package moblin-sound-theme summary to Moblin sound theme

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-sound-theme



From tibbs at fedoraproject.org  Mon Aug  3 21:33:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:33:35 +0000 (UTC)
Subject: rpms/moblin-sound-theme - New directory
Message-ID: <20090803213335.1548A11C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-sound-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT11511/rpms/moblin-sound-theme

Log Message:
Directory /cvs/pkgs/rpms/moblin-sound-theme added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 21:33:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:33:35 +0000 (UTC)
Subject: rpms/moblin-sound-theme/devel - New directory
Message-ID: <20090803213335.34AC011C0423@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-sound-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT11511/rpms/moblin-sound-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-sound-theme/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug  3 21:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 21:33:28 +0000
Subject: [pkgdb] moblin-sound-theme (Fedora, 11) updated by tibbs
Message-ID: <20090803213330.F375110F8B2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for moblin-sound-theme
tibbs has set commit to Approved for 107427 on moblin-sound-theme (Fedora 11)
tibbs has set checkout to Approved for 107427 on moblin-sound-theme (Fedora 11)
tibbs has set build to Approved for 107427 on moblin-sound-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-sound-theme



From tibbs at fedoraproject.org  Mon Aug  3 21:33:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:33:41 +0000 (UTC)
Subject: rpms/moblin-sound-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090803213341.54F5811C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-sound-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT11511/rpms/moblin-sound-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-sound-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-sound-theme
# $Id: Makefile,v 1.1 2009/08/03 21:33:41 tibbs Exp $
NAME := moblin-sound-theme
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tibbs at fedoraproject.org  Mon Aug  3 21:33:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 21:33:41 +0000 (UTC)
Subject: rpms/moblin-sound-theme Makefile,NONE,1.1
Message-ID: <20090803213341.21D5011C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-sound-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT11511/rpms/moblin-sound-theme

Added Files:
	Makefile 
Log Message:
Setup of module moblin-sound-theme


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-sound-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pbrobinson at fedoraproject.org  Mon Aug  3 21:44:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 21:44:02 +0000 (UTC)
Subject: rpms/jana/devel import.log, NONE, 1.1 jana.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090803214402.4ED7411C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jana.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
jana-0_4_5-0_2_20090622gitb416a41_fc11:HEAD:jana-0.4.5-0.2.20090622gitb416a41.fc11.src.rpm:1249335761


--- NEW FILE jana.spec ---
# Tarfile created using git
# git clone git://git.gnome.org/jana
# git archive --format=tar --prefix=jana-0.4.5/ %{git_version} | bzip2 > jana-0.4.5-20090622.tar.bz2

%define gitdate 20090622
%define git_version b416a41
%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
%define snapshot %{gitdate}git%{git_version}

Name:           jana
Version:        0.4.5
Release:        0.2.%{snapshot}%{?dist}
Summary:        An interface library for time-related PIM

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://git.gnome.org/cgit/jana/
Source0:        %{tarfile}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: evolution-data-server-devel
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: gtk-doc
BuildRequires: pkgconfig

# Require these because we're using a git snapshot
BuildRequires: libtool
BuildRequires: intltool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: gnome-common

%description
An interface library for time-related personal information management related
data.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

%build
./autogen.sh
%configure --disable-static --enable-gtk-doc 
make %{?_smp_mflags}

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

#Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libjana*.so.0.0.0
%{_libdir}/libjana*.so.0
%{_datadir}/jana

%files devel
%defattr(-,root,root,-)
%{_includedir}/jana
%{_libdir}/pkgconfig/libjana*pc
%{_libdir}/libjana.so
%{_libdir}/libjana-ecal.so
%{_libdir}/libjana-gtk.so
%{_datadir}/gtk-doc/html/libjana-ecal
%{_datadir}/gtk-doc/html/libjana-gtk
%{_datadir}/gtk-doc/html/libjana

%changelog
* Fri Jul  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.2.20090622gitb416a41
- Updates from package review

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.1.20090622gitb416a41
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jana/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:26:25 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:44:02 -0000	1.2
@@ -0,0 +1 @@
+jana-0.4.5-20090622.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jana/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:26:25 -0000	1.1
+++ sources	3 Aug 2009 21:44:02 -0000	1.2
@@ -0,0 +1 @@
+b2e09c7e733276b66ec9a05be8a0527e  jana-0.4.5-20090622.tar.bz2



From ajax at fedoraproject.org  Mon Aug  3 21:46:59 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  3 Aug 2009 21:46:59 +0000 (UTC)
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.32, 
	1.33
Message-ID: <20090803214659.A8E9D11C00E9@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.2.2-4
- Un-Requires xorg-x11-filesystem



Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- xorg-x11-xtrans-devel.spec	27 Jul 2009 08:39:59 -0000	1.32
+++ xorg-x11-xtrans-devel.spec	3 Aug 2009 21:46:59 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -19,8 +19,6 @@ Patch1: xtrans-1.0.3-avoid-gethostname.p
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-
 %description
 X.Org X11 developmental X transport library
 
@@ -59,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xtrans.pc
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.2.2-4
+- Un-Requires xorg-x11-filesystem
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From slankes at fedoraproject.org  Mon Aug  3 21:49:27 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon,  3 Aug 2009 21:49:27 +0000 (UTC)
Subject: rpms/gimp-lqr-plugin/devel gimp-lqr-plugin.spec,1.4,1.5
Message-ID: <20090803214927.361DB11C00E9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/gimp-lqr-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16233

Modified Files:
	gimp-lqr-plugin.spec 
Log Message:
* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-2
- Add BR on intltool
- Bump liblqr-1-devel BR to 0.3



Index: gimp-lqr-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/devel/gimp-lqr-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gimp-lqr-plugin.spec	3 Aug 2009 19:03:31 -0000	1.4
+++ gimp-lqr-plugin.spec	3 Aug 2009 21:49:26 -0000	1.5
@@ -1,13 +1,14 @@
 Name:           gimp-lqr-plugin
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Content-aware resizing plug-in for the GIMP
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://liquidrescale.wikidot.com/
 Source0:        http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-BuildRequires:  gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.1.0
+BuildRequires:  gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.3.0
+BuildRequires:  intltool
 Requires:       gimp >= 2.4
 
 %description
@@ -47,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-2
+- Add BR on intltool
+- Bump liblqr-1-devel BR to 0.3
+
 * Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-1
 - Update to latest upstream release
 



From pbrobinson at fedoraproject.org  Mon Aug  3 21:55:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 21:55:18 +0000 (UTC)
Subject: rpms/moblin-sound-theme/devel import.log, NONE,
	1.1 moblin-sound-theme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090803215518.5FB5011C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-sound-theme.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-sound-theme-0_3-1:HEAD:moblin-sound-theme-0.3-1.src.rpm:1249336272


--- NEW FILE moblin-sound-theme.spec ---
Name:           moblin-sound-theme
Version:        0.3
Release:        1
Summary:        Moblin sound 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

%description
Moblin sound theme

%prep
%setup -q

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}/%{_datadir}/sounds/moblin/stereo

install -pm 0644 index.theme %{buildroot}/%{_datadir}/sounds/moblin/
for file in stereo/{*.wav,*.ogg}; do
  install -pm 0644 $file %{buildroot}/%{_datadir}/sounds/moblin/stereo/
done

%clean
rm -rf %{buildroot}

%post
/bin/touch --no-create %{_datadir}/sounds/moblin %{_datadir}/sounds

%postun
/bin/touch --no-create %{_datadir}/sounds/moblin %{_datadir}/sounds

%files
%defattr(-,root,root,-)
%doc COPYING NEWS
%dir %{_datadir}/sounds/moblin
%dir %{_datadir}/sounds/moblin/stereo
%{_datadir}/sounds/moblin/index.theme
%{_datadir}/sounds/moblin/stereo/*.ogg
%{_datadir}/sounds/moblin/stereo/*.wav

%changelog
* Sun Aug  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-1
- New upstream 0.3 release

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-sound-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:33:41 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:55:17 -0000	1.2
@@ -0,0 +1 @@
+moblin-sound-theme-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-sound-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:33:41 -0000	1.1
+++ sources	3 Aug 2009 21:55:18 -0000	1.2
@@ -0,0 +1 @@
+9f8866cd02f9aa3a0eec659a8ea78e75  moblin-sound-theme-0.3.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug  3 21:58:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 21:58:23 +0000 (UTC)
Subject: rpms/jana/F-11 jana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090803215823.D7D5B11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

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


--- NEW FILE jana.spec ---
# Tarfile created using git
# git clone git://git.gnome.org/jana
# git archive --format=tar --prefix=jana-0.4.5/ %{git_version} | bzip2 > jana-0.4.5-20090622.tar.bz2

%define gitdate 20090622
%define git_version b416a41
%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
%define snapshot %{gitdate}git%{git_version}

Name:           jana
Version:        0.4.5
Release:        0.2.%{snapshot}%{?dist}
Summary:        An interface library for time-related PIM

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://git.gnome.org/cgit/jana/
Source0:        %{tarfile}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: evolution-data-server-devel
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: gtk-doc
BuildRequires: pkgconfig

# Require these because we're using a git snapshot
BuildRequires: libtool
BuildRequires: intltool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: gnome-common

%description
An interface library for time-related personal information management related
data.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

%build
./autogen.sh
%configure --disable-static --enable-gtk-doc 
make %{?_smp_mflags}

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

#Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libjana*.so.0.0.0
%{_libdir}/libjana*.so.0
%{_datadir}/jana

%files devel
%defattr(-,root,root,-)
%{_includedir}/jana
%{_libdir}/pkgconfig/libjana*pc
%{_libdir}/libjana.so
%{_libdir}/libjana-ecal.so
%{_libdir}/libjana-gtk.so
%{_datadir}/gtk-doc/html/libjana-ecal
%{_datadir}/gtk-doc/html/libjana-gtk
%{_datadir}/gtk-doc/html/libjana

%changelog
* Fri Jul  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.2.20090622gitb416a41
- Updates from package review

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.1.20090622gitb416a41
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jana/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:26:25 -0000	1.1
+++ .cvsignore	3 Aug 2009 21:58:23 -0000	1.2
@@ -0,0 +1 @@
+jana-0.4.5-20090622.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jana/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:26:25 -0000	1.1
+++ sources	3 Aug 2009 21:58:23 -0000	1.2
@@ -0,0 +1 @@
+b2e09c7e733276b66ec9a05be8a0527e  jana-0.4.5-20090622.tar.bz2



From stransky at fedoraproject.org  Mon Aug  3 21:58:42 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  3 Aug 2009 21:58:42 +0000 (UTC)
Subject: rpms/firefox/F-11 .cvsignore, 1.98, 1.99 firefox.spec, 1.334,
	1.335 sources, 1.111, 1.112
Message-ID: <20090803215842.9124D11C00E9@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Updated to 3.5.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	17 Jul 2009 07:55:44 -0000	1.98
+++ .cvsignore	3 Aug 2009 21:58:42 -0000	1.99
@@ -2,3 +2,5 @@ firefox-3.5-source.tar.bz2
 firefox-langpacks-3.5-20090630.tar.bz2
 firefox-3.5.1-source.tar.bz2
 firefox-langpacks-3.5.1-20090717.tar.bz2
+firefox-3.5.2-source.tar.bz2
+firefox-langpacks-3.5.2-20090803.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- firefox.spec	24 Jul 2009 10:42:27 -0000	1.334
+++ firefox.spec	3 Aug 2009 21:58:42 -0000	1.335
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.1
+%define xulrunner_version 1.9.1.2
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,8 +18,8 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.1
-Release:        3%{?dist}
+Version:        3.5.2
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -30,7 +30,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090717.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090803.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -340,6 +340,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-1
+- Updated to 3.5.2.
+
 * Fri Jul 24 2009 Jan Horak <jhorak at redhat.com> - 3.5.1-3
 - Adjust icons cache update according to template
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	17 Jul 2009 07:55:44 -0000	1.111
+++ sources	3 Aug 2009 21:58:42 -0000	1.112
@@ -1,2 +1,2 @@
-f2f68bc69f590eefc8fe98a0038087b1  firefox-3.5.1-source.tar.bz2
-fb69b2d36b0ea28a7493ac3ab419a0a3  firefox-langpacks-3.5.1-20090717.tar.bz2
+0de7173e45df009f5a2620fcceb010fb  firefox-3.5.2-source.tar.bz2
+3b78b4648ef24f52b4f092dc05f79956  firefox-langpacks-3.5.2-20090803.tar.bz2



From stransky at fedoraproject.org  Mon Aug  3 22:00:57 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  3 Aug 2009 22:00:57 +0000 (UTC)
Subject: rpms/firefox/F-11 firefox.spec,1.335,1.336
Message-ID: <20090803220057.BEE1911C00E9@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	firefox.spec 
Log Message:
Updated to 3.5.2.


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -p -r1.335 -r1.336
--- firefox.spec	3 Aug 2009 21:58:42 -0000	1.335
+++ firefox.spec	3 Aug 2009 22:00:57 -0000	1.336
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -340,7 +340,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-1
+* Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-2
 - Updated to 3.5.2.
 
 * Fri Jul 24 2009 Jan Horak <jhorak at redhat.com> - 3.5.1-3



From slankes at fedoraproject.org  Mon Aug  3 22:01:09 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon,  3 Aug 2009 22:01:09 +0000 (UTC)
Subject: rpms/liblqr-1/F-11 liblqr-1.spec, 1.3, 1.4 sources, 1.2,
	1.3 liblqr-1-0.1.0-pkgconfig.patch, 1.1, NONE
Message-ID: <20090803220109.3F7EA11C00E9@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/liblqr-1/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19584

Modified Files:
	liblqr-1.spec sources 
Removed Files:
	liblqr-1-0.1.0-pkgconfig.patch 
Log Message:
* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.4.1-1
- Update to latest upstream release
- Remove upstreamed patch



Index: liblqr-1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liblqr-1/F-11/liblqr-1.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- liblqr-1.spec	25 Feb 2009 16:06:59 -0000	1.3
+++ liblqr-1.spec	3 Aug 2009 22:01:09 -0000	1.4
@@ -1,14 +1,11 @@
-%define tarversion 1
-
 Name:           liblqr-1
-Version:        0.1.0
-Release:        7%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        LiquidRescale library
 Group:          System Environment/Libraries
 License:        GPLv3
 URL:            http://liquidrescale.wikidot.com/
-Source0:        http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}-%{tarversion}.tar.gz
-Patch0:		liblqr-1-0.1.0-pkgconfig.patch
+Source0:        http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  glib2-devel
 
@@ -32,10 +29,6 @@ needed to develop applications with libl
 %prep
 %setup -q
 
-# Patches
-
-%patch0 -p1 -b .pkgconfig
-
 %build
 export LDFLAGS="`pkg-config --libs glib-2.0` -lm"
 %configure
@@ -58,11 +51,10 @@ find $RPM_BUILD_ROOT -name \*.la -exec %
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-
 %files 
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING
-%{_libdir}/liblqr-1.so.0.0.0
+%{_libdir}/liblqr-1.so.0.3.1
 %{_libdir}/liblqr-1.so.0
 
 %files devel
@@ -73,39 +65,37 @@ find $RPM_BUILD_ROOT -name \*.la -exec %
 %{_libdir}/pkgconfig/lqr-1.pc
 
 
-
 %changelog
+* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.4.1-1
+- Update to latest upstream release
+- Remove upstreamed patch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.1.0-6
-
 - Fix Patch0:/%%patch mismatch.
 
 * Fri Feb 29 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-5
-
 - Applied pkgconfig patch to remove unneeded directories.
 - Changed permissions of files to 0644.
 - Fixed minor typos.
 
 * Mon Feb 25 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-4
-
 - Cleaned SPEC file, again.
 
 * Wed Feb 20 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-3
-
 - Cleaned SPEC file.
 
 * Tue Feb 19 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-2
-
 - Fixed licensing issue.
 
 * Thu Jan 17 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-1
-
 - Update to latest upstream release.
 - Added glib BuildRequires.
 
 * Mon Dec 10 2007 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.1.0-0
-
 - Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblqr-1/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Mar 2008 15:54:02 -0000	1.2
+++ sources	3 Aug 2009 22:01:09 -0000	1.3
@@ -1 +1 @@
-6c8be281b11b9782e45fa7f401e05087  liblqr-1-0.1.0-1.tar.gz
+0e24ed3c9fcdcb111062640764d7b87a  liblqr-1-0.4.1.tar.bz2


--- liblqr-1-0.1.0-pkgconfig.patch DELETED ---



From stransky at fedoraproject.org  Mon Aug  3 22:10:20 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  3 Aug 2009 22:10:20 +0000 (UTC)
Subject: rpms/firefox/F-10 .cvsignore, 1.102, 1.103 firefox.spec, 1.326,
	1.327 sources, 1.117, 1.118
Message-ID: <20090803221020.A08AE11C04D1@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.0.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	21 Jul 2009 15:04:27 -0000	1.102
+++ .cvsignore	3 Aug 2009 22:10:20 -0000	1.103
@@ -2,3 +2,5 @@ firefox-langpacks-3.0.11-20090611.tar.bz
 firefox-3.0.11-source.tar.bz2
 firefox-3.0.12-source.tar.bz2
 firefox-langpacks-3.0.12-20090708.tar.bz2
+firefox-3.0.13-source.tar.bz2
+firefox-langpacks-3.0.13-20090731.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- firefox.spec	21 Jul 2009 15:04:27 -0000	1.326
+++ firefox.spec	3 Aug 2009 22:10:20 -0000	1.327
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.12
+%define gecko_version 1.9.0.13
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.12
+Version:        3.0.13
 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}-20090708.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090731.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -322,6 +322,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Aug 4 2009 Martin Stransky <stransky at redhat.com> - 3.0.13-1
+- Update to 3.0.13
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 3.0.12-1
 - Update to 3.0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- sources	21 Jul 2009 17:11:03 -0000	1.117
+++ sources	3 Aug 2009 22:10:20 -0000	1.118
@@ -1,2 +1,2 @@
-8ea6545553ed1864fae41272d782ad8c  firefox-langpacks-3.0.12-20090708.tar.bz2
-51ee3e72001b15b6af8c0a1bdf8256d2  firefox-3.0.12-source.tar.bz2
+eb2e69872ef6932de0ee98b102eb1d5b  firefox-3.0.13-source.tar.bz2
+a83ef3e4f8807f19a04a18469ac1238a  firefox-langpacks-3.0.13-20090731.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug  3 22:21:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  3 Aug 2009 22:21:21 +0000 (UTC)
Subject: rpms/jana/F-10 jana.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090803222121.64BFD11C00E9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

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


--- NEW FILE jana.spec ---
# Tarfile created using git
# git clone git://git.gnome.org/jana
# git archive --format=tar --prefix=jana-0.4.5/ %{git_version} | bzip2 > jana-0.4.5-20090622.tar.bz2

%define gitdate 20090622
%define git_version b416a41
%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
%define snapshot %{gitdate}git%{git_version}

Name:           jana
Version:        0.4.5
Release:        0.2.%{snapshot}%{?dist}
Summary:        An interface library for time-related PIM

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://git.gnome.org/cgit/jana/
Source0:        %{tarfile}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: evolution-data-server-devel
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: gtk-doc
BuildRequires: pkgconfig

# Require these because we're using a git snapshot
BuildRequires: libtool
BuildRequires: intltool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: gnome-common

%description
An interface library for time-related personal information management related
data.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

%build
./autogen.sh
%configure --disable-static --enable-gtk-doc 
make %{?_smp_mflags}

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

#Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libjana*.so.0.0.0
%{_libdir}/libjana*.so.0
%{_datadir}/jana

%files devel
%defattr(-,root,root,-)
%{_includedir}/jana
%{_libdir}/pkgconfig/libjana*pc
%{_libdir}/libjana.so
%{_libdir}/libjana-ecal.so
%{_libdir}/libjana-gtk.so
%{_datadir}/gtk-doc/html/libjana-ecal
%{_datadir}/gtk-doc/html/libjana-gtk
%{_datadir}/gtk-doc/html/libjana

%changelog
* Fri Jul  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.2.20090622gitb416a41
- Updates from package review

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.1.20090622gitb416a41
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jana/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:26:25 -0000	1.1
+++ .cvsignore	3 Aug 2009 22:21:20 -0000	1.2
@@ -0,0 +1 @@
+jana-0.4.5-20090622.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jana/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:26:25 -0000	1.1
+++ sources	3 Aug 2009 22:21:20 -0000	1.2
@@ -0,0 +1 @@
+b2e09c7e733276b66ec9a05be8a0527e  jana-0.4.5-20090622.tar.bz2



From caillon at fedoraproject.org  Mon Aug  3 22:47:04 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 22:47:04 +0000 (UTC)
Subject: rpms/firefox/devel .cvsignore, 1.98, 1.99 firefox.spec, 1.333,
	1.334 sources, 1.111, 1.112
Message-ID: <20090803224704.DF77111C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Mon Aug  3 2009 Christopher Aillon <caillon at redhat.com> - 3.5.2-1
- Update to 3.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	17 Jul 2009 19:02:44 -0000	1.98
+++ .cvsignore	3 Aug 2009 22:47:02 -0000	1.99
@@ -1,2 +1,6 @@
+firefox-3.5-source.tar.bz2
+firefox-langpacks-3.5-20090630.tar.bz2
 firefox-3.5.1-source.tar.bz2
 firefox-langpacks-3.5.1-20090717.tar.bz2
+firefox-3.5.2-source.tar.bz2
+firefox-langpacks-3.5.2-20090803.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- firefox.spec	24 Jul 2009 10:44:55 -0000	1.333
+++ firefox.spec	3 Aug 2009 22:47:03 -0000	1.334
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.1
+%define xulrunner_version 1.9.1.2
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,8 +18,8 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.1
-Release:        3%{?dist}
+Version:        3.5.2
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -30,7 +30,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090717.tar.bz2
+Source2:        firefox-langpacks-%{version}-20090803.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -340,6 +340,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug  3 2009 Christopher Aillon <caillon at redhat.com> - 3.5.2-1
+- Update to 3.5.2
+
 * Fri Jul 24 2009 Jan Horak <jhorak at redhat.com> - 3.5.1-3
 - Adjust icons cache update according to template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	17 Jul 2009 19:02:44 -0000	1.111
+++ sources	3 Aug 2009 22:47:03 -0000	1.112
@@ -1,2 +1,2 @@
-f2f68bc69f590eefc8fe98a0038087b1  firefox-3.5.1-source.tar.bz2
-fb69b2d36b0ea28a7493ac3ab419a0a3  firefox-langpacks-3.5.1-20090717.tar.bz2
+0de7173e45df009f5a2620fcceb010fb  firefox-3.5.2-source.tar.bz2
+3b78b4648ef24f52b4f092dc05f79956  firefox-langpacks-3.5.2-20090803.tar.bz2



From mclasen at fedoraproject.org  Mon Aug  3 22:49:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 22:49:31 +0000 (UTC)
Subject: rpms/brasero/devel nautilus-segfault.patch, NONE, 1.1 brasero.spec, 
	1.56, 1.57
Message-ID: <20090803224932.0AB8911C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	brasero.spec 
Added Files:
	nautilus-segfault.patch 
Log Message:
Fix a nautilus segfault when burning


nautilus-segfault.patch:
 libbrasero-burn/brasero-track-data-cfg.c |  105 ++++++++++++++++++++++++-------
 libbrasero-utils/brasero-io.c            |    9 ++
 2 files changed, 90 insertions(+), 24 deletions(-)

--- NEW FILE nautilus-segfault.patch ---
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index 69d3505..3e91a26 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -1754,29 +1754,6 @@ brasero_track_data_clean_autorun (BraseroTrackDataCfg *track)
 }
 
 static void
-brasero_track_data_cfg_finalize (GObject *object)
-{
-	BraseroTrackDataCfgPrivate *priv;
-
-	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (object);
-
-	brasero_track_data_clean_autorun (BRASERO_TRACK_DATA_CFG (object));
-	brasero_track_data_cfg_clean_cache (BRASERO_TRACK_DATA_CFG (object));
-
-	if (priv->shown) {
-		g_slist_free (priv->shown);
-		priv->shown = NULL;
-	}
-
-	if (priv->tree) {
-		g_object_unref (priv->tree);
-		priv->tree = NULL;
-	}
-
-	G_OBJECT_CLASS (brasero_track_data_cfg_parent_class)->finalize (object);
-}
-
-static void
 brasero_track_data_cfg_iface_init (gpointer g_iface, gpointer data)
 {
 	GtkTreeModelIface *iface = g_iface;
@@ -3158,6 +3135,88 @@ brasero_track_data_cfg_init (BraseroTrackDataCfg *object)
 }
 
 static void
+brasero_track_data_cfg_finalize (GObject *object)
+{
+	BraseroTrackDataCfgPrivate *priv;
+
+	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (object);
+
+	brasero_track_data_clean_autorun (BRASERO_TRACK_DATA_CFG (object));
+	brasero_track_data_cfg_clean_cache (BRASERO_TRACK_DATA_CFG (object));
+
+	if (priv->shown) {
+		g_slist_free (priv->shown);
+		priv->shown = NULL;
+	}
+
+	if (priv->tree) {
+		/* This object could outlive us just for some time
+		 * so we better remove all signals.
+		 * When an image URI is detected it can happen
+		 * that we'll be destroyed. */
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_node_added,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_node_changed,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_node_removed,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_node_reordered,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_size_changed_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_session_available_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_session_loaded_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_project_loaded,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_activity_changed,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_deep_directory,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_2G_file,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_unreadable_uri_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_unknown_uri_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_recursive_uri_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_image_uri_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_virtual_sibling_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_name_collision_cb,
+		                                      object);
+		g_signal_handlers_disconnect_by_func (priv->tree,
+		                                      brasero_track_data_cfg_joliet_rename_cb,
+		                                      object);
+
+		g_object_unref (priv->tree);
+		priv->tree = NULL;
+	}
+
+	G_OBJECT_CLASS (brasero_track_data_cfg_parent_class)->finalize (object);
+}
+
+static void
 brasero_track_data_cfg_class_init (BraseroTrackDataCfgClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
diff --git a/libbrasero-utils/brasero-io.c b/libbrasero-utils/brasero-io.c
index cfeb4d5..bd12861 100644
--- a/libbrasero-utils/brasero-io.c
+++ b/libbrasero-utils/brasero-io.c
@@ -364,6 +364,11 @@ brasero_io_return_result_idle (gpointer callback_data)
 		g_mutex_unlock (priv->lock);
 
 		data = result->callback_data;
+
+		/* This is to make sure the object lives
+		 * as long as we need it. */
+		g_object_ref (base->object);
+
 		if (result->uri || result->info || result->error)
 			result->base->callback (base->object,
 						result->error,
@@ -371,12 +376,14 @@ brasero_io_return_result_idle (gpointer callback_data)
 						result->info,
 						data? data->callback_data:NULL);
 
-		/* Else this is just to call destroy () for callback data */
+		/* call destroy () for callback data */
 		brasero_io_unref_result_callback_data (data,
 						       base->object,
 						       base->destroy,
 						       FALSE);
 
+		g_object_unref (base->object);
+
 		brasero_io_job_result_free (result);
 
 		g_mutex_lock (priv->lock);



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- brasero.spec	28 Jul 2009 04:21:12 -0000	1.56
+++ brasero.spec	3 Aug 2009 22:49:31 -0000	1.57
@@ -1,7 +1,6 @@
-
 Name:      brasero
 Version:   2.27.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -9,6 +8,8 @@ URL:       http://www.gnome.org/projects
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:    nautilus-segfault.patch
+
 BuildRequires:  glib2-devel >= 2.15.6
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
@@ -86,6 +87,7 @@ developing brasero applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nautilus-segfault
 
 
 %build
@@ -203,6 +205,9 @@ fi
 
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
+- Fix a nautilus segfault when burning  
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From caillon at fedoraproject.org  Mon Aug  3 23:01:49 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:01:49 +0000 (UTC)
Subject: rpms/blam/F-11 blam.spec,1.30,1.31
Message-ID: <20090803230149.55AED11C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	blam.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-13
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-11/blam.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- blam.spec	17 Jul 2009 12:58:04 -0000	1.30
+++ blam.spec	3 Aug 2009 23:01:48 -0000	1.31
@@ -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.1
+%define	gecko_version		1.9.1.2
 
 Name:		blam
 Version:	1.8.5
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.8.5-13
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-12
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:02:02 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:02:02 +0000 (UTC)
Subject: rpms/chmsee/F-11 chmsee.spec,1.35,1.36
Message-ID: <20090803230202.A0E4011C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	chmsee.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-10
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- chmsee.spec	17 Jul 2009 12:59:07 -0000	1.35
+++ chmsee.spec	3 Aug 2009 23:02:02 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary(zh_CN):	CHM ??????, ?? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,11 +108,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-10
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-9
 - Rebuild against newer gecko
 
 * Tue Jul 14 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.1-8
-- revert to 1.0.1 as latest version crash on xulrunner-1.9.1.1
+- revert to 1.0.1 as latest version crash on xulrunner-1.9.1.2
 
 * Sun Jul 12 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.6-1
 - update to 1.0.6



From caillon at fedoraproject.org  Mon Aug  3 23:02:16 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:02:16 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse.spec,1.632,1.633
Message-ID: <20090803230216.5AD5911C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	eclipse.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1:3.4.2-14
- Rebuild against newer gecko



Index: eclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -p -r1.632 -r1.633
--- eclipse.spec	17 Jul 2009 13:00:13 -0000	1.632
+++ eclipse.spec	3 Aug 2009 23:02:15 -0000	1.633
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -155,7 +155,7 @@ Patch44:		%{name}-fix-javahome64.patch
 # be replaced with the former when libxul.pc is fixed.
 # https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
 Patch45:        %{name}-swt-buildagainstxulrunner.patch
-# Work with changed interface in XULRunner 1.9.1.1
+# Work with changed interface in XULRunner 1.9.1.2
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
 # https://bugs.eclipse.org/bugs/attachment.cgi?id=130611
 Patch46:        %{name}-swt-xulrunner191.patch
@@ -1491,6 +1491,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1:3.4.2-14
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-13
 - Rebuild against newer gecko
 
@@ -1513,7 +1516,7 @@ fi
 - Fix jdt owning dropins/jdt folder.
 
 * Thu Apr 2 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-7
-- Add patch from upstream to work with XULRunner 1.9.1.1.
+- Add patch from upstream to work with XULRunner 1.9.1.2.
 - Red Hat bugzilla #483832 (and its duplicates).
 
 * Mon Mar 30 2009 Dennis Gilmore <dennis at ausil.us> 1:3.4.2-6



From caillon at fedoraproject.org  Mon Aug  3 23:02:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:02:30 +0000 (UTC)
Subject: rpms/epiphany/F-11 epiphany.spec,1.232,1.233
Message-ID: <20090803230230.BE97211C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	epiphany.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.3-3
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-11/epiphany.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- epiphany.spec	17 Jul 2009 13:15:13 -0000	1.232
+++ epiphany.spec	3 Aug 2009 23:02:30 -0000	1.233
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.1.1
+%define gecko_ver 1.9.1.2
 %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: 2%{?dist}
+Release: 3%{?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
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.3-3
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-2
 - Rebuild against newer gecko
 
@@ -790,7 +793,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 
-* Sun Feb 22 2004 Jeremy Katz <katzj at redhat.com> 1.1.9.1.1
+* Sun Feb 22 2004 Jeremy Katz <katzj at redhat.com> 1.1.9.1.2
 - update to 1.1.9
 - reenable nautilus view
 



From caillon at fedoraproject.org  Mon Aug  3 23:02:44 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:02:44 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-11 epiphany-extensions.spec,1.62,1.63
Message-ID: <20090803230244.3E4F411C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2888

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-5
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/F-11/epiphany-extensions.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- epiphany-extensions.spec	17 Jul 2009 21:59:01 -0000	1.62
+++ epiphany-extensions.spec	3 Aug 2009 23:02:44 -0000	1.63
@@ -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.1
+%global gecko_version       1.9.1.2
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-5
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Christopher Aillon <caillon at redhat.com> - 2.26.1-4
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:03:11 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:03:11 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon.spec,1.64,1.65
Message-ID: <20090803230311.2EA8A11C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	galeon.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-13
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- galeon.spec	17 Jul 2009 13:01:30 -0000	1.64
+++ galeon.spec	3 Aug 2009 23:03:10 -0000	1.65
@@ -1,9 +1,9 @@
-%define gecko_ver 1.9.1.1
+%define gecko_ver 1.9.1.2
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	12%{?dist}
+Release:	13%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -125,6 +125,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.7-13
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-12
 - Rebuild against newer gecko
 
@@ -145,7 +148,7 @@ update-desktop-database > /dev/null 2>&1
 
 * Tue Jan  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.7-5
 - Apply modified patch for epiphany for building against xulrunner
-  1.9.1.1 from Christopher Aillon (#478666)
+  1.9.1.2 from Christopher Aillon (#478666)
 
 * Fri Dec 26 2008 Denis Leroy <denis at poolshark.org> - 2.0.7-4
 - Rebuild for newer gnome desktop library



From caillon at fedoraproject.org  Mon Aug  3 23:02:57 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:02:57 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss.spec,1.28,1.29
Message-ID: <20090803230257.B570711C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3016

Modified Files:
	evolution-rss.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-12
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- evolution-rss.spec	17 Jul 2009 13:00:56 -0000	1.28
+++ evolution-rss.spec	3 Aug 2009 23:02:57 -0000	1.29
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.2
-Release:	11%{?dist}
+Release:	12%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -83,6 +83,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-12
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.1.2-11
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:03:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:03:26 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-11 gnome-python2-extras.spec,1.52,1.53
Message-ID: <20090803230326.9AA9111C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-python2-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3296

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-6
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-python2-extras/F-11/gnome-python2-extras.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gnome-python2-extras.spec	17 Jul 2009 13:02:34 -0000	1.52
+++ gnome-python2-extras.spec	3 Aug 2009 23:03:26 -0000	1.53
@@ -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.1
+%define gecko_version 1.9.1.2
 %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: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.25.3-6
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-5
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:03:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:03:40 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-11 gnome-web-photo.spec,1.24,1.25
Message-ID: <20090803230340.F2AD411C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3433

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.7-5
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/F-11/gnome-web-photo.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gnome-web-photo.spec	17 Jul 2009 13:03:39 -0000	1.24
+++ gnome-web-photo.spec	3 Aug 2009 23:03:40 -0000	1.25
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.1
+%define gecko_version 1.9.1.2
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.7-5
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.7-4
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:03:59 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:03:59 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets.spec,1.16,1.17
Message-ID: <20090803230359.B82C711C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3601

Modified Files:
	google-gadgets.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.11.0-3
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/extras/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- google-gadgets.spec	17 Jul 2009 13:04:12 -0000	1.16
+++ google-gadgets.spec	3 Aug 2009 23:03:59 -0000	1.17
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.0
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -208,6 +208,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.11.0-3
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.11.0-2
 - Rebuild against newer gecko
 
@@ -215,7 +218,7 @@ update-desktop-database &> /dev/null || 
 - Update to 0.11.0
 
 * Sat May  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.6-0.1.20090430svn1449%{?dist}
-- Update to SVN checkout, for xulrunner 1.9.1.1 compatibility
+- Update to SVN checkout, for xulrunner 1.9.1.2 compatibility
 
 * Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
 - Rebuild against newer gecko



From caillon at fedoraproject.org  Mon Aug  3 23:04:12 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:04:12 +0000 (UTC)
Subject: rpms/hulahop/F-11 hulahop.spec,1.14,1.15
Message-ID: <20090803230412.7B5AD11C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	hulahop.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-7
- Rebuild against newer gecko



Index: hulahop.spec
===================================================================
RCS file: /cvs/extras/rpms/hulahop/F-11/hulahop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hulahop.spec	17 Jul 2009 13:05:13 -0000	1.14
+++ hulahop.spec	3 Aug 2009 23:04:12 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.4.9-7
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-6
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:04:25 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:04:25 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-11 java-1.6.0-openjdk.spec,1.124,1.125
Message-ID: <20090803230425.E4BAF11C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/java-1.6.0-openjdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3880

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-26.b16
- Rebuild against newer gecko



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/extras/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- java-1.6.0-openjdk.spec	17 Jul 2009 13:05:44 -0000	1.124
+++ java-1.6.0-openjdk.spec	3 Aug 2009 23:04:25 -0000	1.125
@@ -133,7 +133,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 25.%{openjdkver}%{?dist}
+Release: 26.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -962,6 +962,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-26.b16
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 1:1.6.0.0-25.b16
 - Rebuild against newer gecko
 
@@ -1499,7 +1502,7 @@ new icedtea source.
 - Added Requires: jpackage-utils.
 - Removed java-1.7.0-makefile.patch.
 - Updated patch list.
-- Resolves rhbz#41.9.1.1
+- Resolves rhbz#41.9.1.2
 - Resolves rhbz#399221
 - Resolves rhbz#318621
 



From caillon at fedoraproject.org  Mon Aug  3 23:04:39 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:04:39 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase.spec,1.84,1.85
Message-ID: <20090803230439.45F5311C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	kazehakase.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.4
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- kazehakase.spec	17 Jul 2009 13:06:16 -0000	1.84
+++ kazehakase.spec	3 Aug 2009 23:04:39 -0000	1.85
@@ -18,7 +18,7 @@
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1.1
+%define		Geckover	1.9.1.2
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -45,7 +45,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.3
+Release:	%{_release}%{?dist}.4
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -319,6 +319,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.4
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-11.svn3771_trunk.3
 - Rebuild against newer gecko
 
@@ -370,7 +373,7 @@ desktop-file-install \
 - Now WebKit >= rev 39421 is needed
 
 * Tue Dec 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- F-11: Rebuild against xulrunner 1.9.1.1
+- F-11: Rebuild against xulrunner 1.9.1.2
 
 * Fri Oct 31 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-1
 - 0.5.6



From caillon at fedoraproject.org  Mon Aug  3 23:04:53 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:04:53 +0000 (UTC)
Subject: rpms/Miro/F-11 Miro.spec,1.57,1.58
Message-ID: <20090803230453.9619711C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	Miro.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- Miro.spec	17 Jul 2009 13:07:18 -0000	1.57
+++ Miro.spec	3 Aug 2009 23:04:53 -0000	1.58
@@ -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.1
+%define gecko_ver 1.9.1.2
 
 Name:           Miro
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-2
 - Rebuild against newer gecko
 
@@ -142,7 +145,7 @@ update-desktop-database %{_datadir}/appl
 - rebuild with new openssl
 
 * Tue Dec 23 2008 Caol?n McNamara <caolanm at redhat.com> - 1.2.8-4
-- Rebuild against newer gecko 1.9.1.1
+- Rebuild against newer gecko 1.9.1.2
 
 * Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-3
 - Enable patch for new boost 1.37 for F-11+



From caillon at fedoraproject.org  Mon Aug  3 23:05:09 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:05:09 +0000 (UTC)
Subject: rpms/mozvoikko/F-11 mozvoikko.spec,1.12,1.13
Message-ID: <20090803230509.D135211C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	mozvoikko.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.6.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/extras/rpms/mozvoikko/F-11/mozvoikko.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mozvoikko.spec	17 Jul 2009 13:08:31 -0000	1.12
+++ mozvoikko.spec	3 Aug 2009 23:05:09 -0000	1.13
@@ -5,7 +5,7 @@
 # update this package to 1.0.
 
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.1
+%define gecko_ver 1.9.1.2
 # 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.5.rc1%{?dist}
+Release:        0.6.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
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.9.7-0.6.rc1
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.5.rc1
 - Rebuild against newer gecko
 
@@ -104,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
   - Some discussion about pkg-config and rpath in Launchpad #297169
 
 * Fri Dec 26 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-5
-- Rebuild against gecko 1.9.1.1
+- Rebuild against gecko 1.9.1.2
 - Bump Release so that it's at least as high as in F10 and F9
 
 * Mon Sep 29 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-3



From caillon at fedoraproject.org  Mon Aug  3 23:05:22 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:05:22 +0000 (UTC)
Subject: rpms/mugshot/F-11 mugshot.spec,1.45,1.46
Message-ID: <20090803230522.BD14111C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	mugshot.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-12
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/extras/rpms/mugshot/F-11/mugshot.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- mugshot.spec	17 Jul 2009 13:09:05 -0000	1.45
+++ mugshot.spec	3 Aug 2009 23:05:22 -0000	1.46
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1.2.2-12
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-11
 - Rebuild against newer gecko
 
@@ -377,7 +380,7 @@ fi
 * Wed Jul 19 2006 Colin Walters <walters at redhat.com> - 1.1.10-1
 - 1.1.10
 
-* Sat Jul 15 2006 Havoc Pennington <hp at redhat.com> - 1.1.9.1.1
+* Sat Jul 15 2006 Havoc Pennington <hp at redhat.com> - 1.1.9.1.2
 - 1.1.9
 
 * Thu Jul 13 2006 Havoc Pennington <hp at redhat.com> - 1.1.8-1



From caillon at fedoraproject.org  Mon Aug  3 23:05:37 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:05:37 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2.spec,1.44,1.45
Message-ID: <20090803230537.A6CA511C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/ruby-gnome2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4593

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-1.1
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-11/ruby-gnome2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ruby-gnome2.spec	3 Aug 2009 19:02:22 -0000	1.44
+++ ruby-gnome2.spec	3 Aug 2009 23:05:37 -0000	1.45
@@ -13,7 +13,7 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
-Release:        %{mainrel}%{?dist}
+Release:        %{mainrel}%{?dist}.1
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -1076,6 +1076,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.19.1-1.1
+- Rebuild against newer gecko
+
 * Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
 - Update to 0.19.1, drop all upstreamed patches
 - Introduce many -devel subpackages containing pkgconfig file



From caillon at fedoraproject.org  Mon Aug  3 23:05:52 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:05:52 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.5,1.6
Message-ID: <20090803230552.1BB1111C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4716

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.4
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-MozEmbed/F-11/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Gtk2-MozEmbed.spec	17 Jul 2009 13:10:20 -0000	1.5
+++ perl-Gtk2-MozEmbed.spec	3 Aug 2009 23:05:51 -0000	1.6
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.1
+%define gecko_version 1.9.1.2
 %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}.3
+Release:       %{specfilever}%{?dist}.4
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.08-6.4
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:06:04 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:06:04 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 seahorse-plugins.spec,1.29,1.30
Message-ID: <20090803230604.8DB9011C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4852

Modified Files:
	seahorse-plugins.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.2-4
- Rebuild against newer gecko



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/F-11/seahorse-plugins.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- seahorse-plugins.spec	17 Jul 2009 13:10:57 -0000	1.29
+++ seahorse-plugins.spec	3 Aug 2009 23:06:04 -0000	1.30
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.2-4
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.26.2-3
 - Rebuild against newer gecko
 



From caillon at fedoraproject.org  Mon Aug  3 23:06:16 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  3 Aug 2009 23:06:16 +0000 (UTC)
Subject: rpms/yelp/F-11 yelp.spec,1.159,1.160
Message-ID: <20090803230616.4670811C00E9@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	yelp.spec 
Log Message:
* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-6
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/extras/rpms/yelp/F-11/yelp.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- yelp.spec	17 Jul 2009 13:12:01 -0000	1.159
+++ yelp.spec	3 Aug 2009 23:06:15 -0000	1.160
@@ -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.1
+%define gecko_version 1.9.1.2
 
 %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: 5%{?dist}
+Release: 6%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.26/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -148,6 +148,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.26.0-6
+- Rebuild against newer gecko
+
 * Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-5
 - Rebuild against newer gecko
 



From mclasen at fedoraproject.org  Mon Aug  3 23:20:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  3 Aug 2009 23:20:25 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-menu-icons3.patch, NONE,
	1.1 nautilus_always_open_appicon.patch, NONE,
	1.1 nautilus_menu_icons_only2.patch, NONE, 1.1 nautilus.spec,
	1.278, 1.279
Message-ID: <20090803232025.CBCAC11C049D@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-menu-icons3.patch nautilus_always_open_appicon.patch 
	nautilus_menu_icons_only2.patch 
Log Message:
fix place menu items


nautilus-menu-icons3.patch:
 nautilus-spatial-window.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- NEW FILE nautilus-menu-icons3.patch ---
diff -up nautilus-2.27.4/src/nautilus-spatial-window.c.menu-icons3 nautilus-2.27.4/src/nautilus-spatial-window.c
--- nautilus-2.27.4/src/nautilus-spatial-window.c.menu-icons3	2009-08-03 18:59:28.015377172 -0400
+++ nautilus-2.27.4/src/nautilus-spatial-window.c	2009-08-03 19:08:19.623627208 -0400
@@ -683,6 +683,7 @@ location_button_clicked_callback (GtkWid
 
 		name = nautilus_file_get_display_name (file);
 		menu_item = gtk_image_menu_item_new_with_label (name);
+		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE);
 		g_free (name);
 
 		if (first_item == NULL) {
@@ -941,6 +942,14 @@ static const GtkActionEntry spatial_entr
                                  G_CALLBACK (action_search_callback) },
 };
 
+static const char* icon_entries[] = {
+	"/MenuBar/Other Menus/Places/Home",
+	"/MenuBar/Other Menus/Places/Go to Computer",
+	"/MenuBar/Other Menus/Places/Go to Templates",
+	"/MenuBar/Other Menus/Places/Go to Trash",
+	"/MenuBar/Other Menus/Places/Go to Network"
+};
+
 static void
 nautilus_spatial_window_init (NautilusSpatialWindow *window)
 {
@@ -951,6 +960,8 @@ nautilus_spatial_window_init (NautilusSp
 	GtkUIManager *ui_manager;
 	GtkTargetList *targets;
 	const char *ui;
+	int i;
+	GtkWidget *menuitem;
 
 	window->details = G_TYPE_INSTANCE_GET_PRIVATE (window,
 						       NAUTILUS_TYPE_SPATIAL_WINDOW,
@@ -1042,6 +1053,11 @@ nautilus_spatial_window_init (NautilusSp
 	
 	ui = nautilus_ui_string_get ("nautilus-spatial-window-ui.xml");
 	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
+
+	for (i = 0; i < G_N_ELEMENTS (icon_entries); i++) {
+		menuitem = gtk_ui_manager_get_widget (ui_manager, icon_entries[i]);
+		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+	}
 }
 
 static void

nautilus_always_open_appicon.patch:
 fm-directory-view.c |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

--- NEW FILE nautilus_always_open_appicon.patch ---
--- nautilus-2.27.4.orig/src/file-manager/fm-directory-view.c	2009-07-13 21:47:03.000000000 +0200
+++ nautilus-2.27.4/src/file-manager/fm-directory-view.c	2009-08-01 17:01:19.000000000 +0200
@@ -105,12 +105,14 @@
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER    		"/MenuBar/File/Open Placeholder/Scripts/Scripts Placeholder"
 #define FM_DIRECTORY_VIEW_MENU_PATH_EXTENSION_ACTIONS_PLACEHOLDER       "/MenuBar/Edit/Extension Actions"
 #define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER  		"/MenuBar/File/New Items Placeholder/New Documents/New Documents Placeholder"
+#define FM_DIRECTORY_VIEW_MENU_PATH_OPEN				"/MenuBar/File/Open Placeholder/Open"
 
 #define FM_DIRECTORY_VIEW_POPUP_PATH_SELECTION				"/selection"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_SUBMENU_PLACEHOLDER  	"/selection/Open Placeholder/Open With/Applications Placeholder"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_PLACEHOLDER    	"/selection/Open Placeholder/Applications Placeholder"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_PLACEHOLDER    		"/selection/Open Placeholder/Scripts/Scripts Placeholder"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_EXTENSION_ACTIONS			"/selection/Extension Actions"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_OPEN				"/selection/Open Placeholder/Open"
 
 #define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND				"/background"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER	"/background/Before Zoom Items/New Object Items/Scripts/Scripts Placeholder"
@@ -4258,8 +4260,10 @@
 	char *label;
 	char *action_name;
 	char *escaped_app;
+	char *path;
 	GtkAction *action;
 	GIcon *app_icon;
+	GtkWidget *menuitem;
 
 	launch_parameters = application_launch_parameters_new 
 		(application, files, view);
@@ -4307,6 +4311,16 @@
 			       GTK_UI_MANAGER_MENUITEM,
 			       FALSE);
 
+	path = g_strdup_printf("%s/%s", menu_placeholder, action_name);
+
+	menuitem = gtk_ui_manager_get_widget (
+			nautilus_window_info_get_ui_manager (view->details->window),
+			path);
+
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+
+	g_free (path);
+
 	gtk_ui_manager_add_ui (nautilus_window_info_get_ui_manager (view->details->window),
 			       view->details->open_with_merge_id,
 			       popup_placeholder,
@@ -4315,6 +4329,15 @@
 			       GTK_UI_MANAGER_MENUITEM,
 			       FALSE);
 
+	path = g_strdup_printf("%s/%s", popup_placeholder, action_name);
+
+	menuitem = gtk_ui_manager_get_widget (
+			nautilus_window_info_get_ui_manager (view->details->window),
+			path);
+
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+
+	g_free (path);
 	g_free (action_name);
 	g_free (label);
 	g_free (tip);
@@ -8339,6 +8362,7 @@
 	GtkAction *action;
 	GAppInfo *app;
 	GIcon *app_icon;
+	GtkWidget *menuitem;
 
 	selection = fm_directory_view_get_selection (view);
 	selection_count = g_list_length (selection);
@@ -8416,6 +8440,20 @@
 		      label_with_underscore ? label_with_underscore : _("_Open"),
 		      NULL);
 
+	menuitem = gtk_ui_manager_get_widget (
+			nautilus_window_info_get_ui_manager (view->details->window),
+			FM_DIRECTORY_VIEW_MENU_PATH_OPEN);
+
+	/* Only force displaying the icon if it is an application icon */
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
+
+	menuitem = gtk_ui_manager_get_widget (
+			nautilus_window_info_get_ui_manager (view->details->window),
+			FM_DIRECTORY_VIEW_POPUP_PATH_OPEN);
+
+	/* Only force displaying the icon if it is an application icon */
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
+
 	if (app_icon == NULL) {
 		app_icon = g_themed_icon_new (GTK_STOCK_OPEN);
 	}

nautilus_menu_icons_only2.patch:
 nautilus-navigation-window-menus.c |   21 +++++++++++++++++++++
 nautilus-window-menus.c            |   11 +++++++++++
 2 files changed, 32 insertions(+)

--- NEW FILE nautilus_menu_icons_only2.patch ---
Common subdirectories: nautilus-2.27.4.orig/src/file-manager and nautilus-2.27.4/src/file-manager
diff -u nautilus-2.27.4.orig/src/nautilus-navigation-window-menus.c nautilus-2.27.4/src/nautilus-navigation-window-menus.c
--- nautilus-2.27.4.orig/src/nautilus-navigation-window-menus.c	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-navigation-window-menus.c	2009-08-03 23:58:55.000000000 +0200
@@ -339,6 +339,15 @@
 	gtk_label_set_max_width_chars (label, MENU_ITEM_MAX_WIDTH_CHARS);
 }
 
+static const char* icon_entries[] = {
+	"/MenuBar/Other Menus/Go/Home",
+	"/MenuBar/Other Menus/Go/Computer",
+	"/MenuBar/Other Menus/Go/Go to Templates",
+	"/MenuBar/Other Menus/Go/Go to Trash",
+	"/MenuBar/Other Menus/Go/Go to Network",
+	"/MenuBar/Other Menus/Go/Go to Location"
+};
+
 /**
  * refresh_go_menu:
  * 
@@ -350,7 +359,10 @@
 {
 	GtkUIManager *ui_manager;
 	GList *node;
+	GtkWidget *menuitem;
 	int index;
+	const char *ui;
+	int i;
 	
 	g_assert (NAUTILUS_IS_NAVIGATION_WINDOW (window));
 
@@ -371,6 +383,15 @@
 					    window->details->go_menu_action_group,
 					    -1);
 	g_object_unref (window->details->go_menu_action_group);
+
+	for (i = 0; i < G_N_ELEMENTS (icon_entries); i++) {
+		menuitem = gtk_ui_manager_get_widget (
+				ui_manager,
+				icon_entries[i]);
+
+		gtk_image_menu_item_set_always_show_image (
+				GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+	}
 	
 	/* Add in a new set of history items. */
 	for (node = nautilus_get_history_list (), index = 0;
diff -u nautilus-2.27.4.orig/src/nautilus-window-menus.c nautilus-2.27.4/src/nautilus-window-menus.c
--- nautilus-2.27.4.orig/src/nautilus-window-menus.c	2009-06-24 16:00:12.000000000 +0200
+++ nautilus-2.27.4/src/nautilus-window-menus.c	2009-08-03 23:54:04.000000000 +0200
@@ -162,8 +162,10 @@
 	BookmarkHolder *bookmark_holder;
 	char action_name[128];
 	char *name;
+	char *path;
 	GdkPixbuf *pixbuf;
 	GtkAction *action;
+	GtkWidget *menuitem;
 
 	g_assert (NAUTILUS_IS_WINDOW (window));
 	g_assert (NAUTILUS_IS_BOOKMARK (bookmark));
@@ -203,7 +205,16 @@
 			       GTK_UI_MANAGER_MENUITEM,
 			       FALSE);
 
+	path = g_strdup_printf("%s/%s", parent_path, action_name);
+
+	menuitem = gtk_ui_manager_get_widget (
+			window->details->ui_manager,
+			path);
+
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+
 	g_object_unref (pixbuf);
+	g_free (path);
 	g_free (name);
 }
 


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- nautilus.spec	3 Aug 2009 00:47:52 -0000	1.278
+++ nautilus.spec	3 Aug 2009 23:20:23 -0000	1.279
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.27.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -85,6 +85,10 @@ Patch10:        nautilus-gvfs-desktop-ke
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=590647
+Patch18:	nautilus_always_open_appicon.patch
+Patch19:	nautilus_menu_icons_only2.patch
+Patch20:	nautilus-menu-icons3.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -122,6 +126,9 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p1 -b .always-open-appicon
+%patch19 -p1 -b .go-icons
+%patch20 -p1 -b .spatial-icons
 
 %build
 
@@ -261,6 +268,9 @@ fi
 
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-4
+- Show icons for bookmarks and similar in menus
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-3
 - Drop desktop-backgrounds-basic dep that we've carried for 9 years
   without ever making use of it



From pkgdb at fedoraproject.org  Mon Aug  3 23:49:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 23:49:08 +0000
Subject: [pkgdb] moblin-cursor-theme was added for pbrobinson
Message-ID: <20090803234908.B563C10F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package moblin-cursor-theme with summary Moblin X cursors theme
tibbs has approved Package moblin-cursor-theme
tibbs has added a Fedora devel branch for moblin-cursor-theme with an owner of pbrobinson
tibbs has approved moblin-cursor-theme in Fedora devel
tibbs has approved Package moblin-cursor-theme
tibbs has set commit to Approved for 107427 on moblin-cursor-theme (Fedora devel)
tibbs has set checkout to Approved for 107427 on moblin-cursor-theme (Fedora devel)
tibbs has set build to Approved for 107427 on moblin-cursor-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-cursor-theme



From pkgdb at fedoraproject.org  Mon Aug  3 23:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 23:49:09 +0000
Subject: [pkgdb] moblin-cursor-theme summary updated by tibbs
Message-ID: <20090803234909.A9F4D10F8A2@bastion2.fedora.phx.redhat.com>

tibbs set package moblin-cursor-theme summary to Moblin X cursors theme

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-cursor-theme



From tibbs at fedoraproject.org  Mon Aug  3 23:49:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 23:49:16 +0000 (UTC)
Subject: rpms/moblin-cursor-theme - New directory
Message-ID: <20090803234916.34A1011C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-cursor-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsu15559/rpms/moblin-cursor-theme

Log Message:
Directory /cvs/pkgs/rpms/moblin-cursor-theme added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 23:49:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 23:49:16 +0000 (UTC)
Subject: rpms/moblin-cursor-theme/devel - New directory
Message-ID: <20090803234916.72EE011C01EA@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-cursor-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsu15559/rpms/moblin-cursor-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-cursor-theme/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug  3 23:49:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 23:49:22 +0000 (UTC)
Subject: rpms/moblin-cursor-theme Makefile,NONE,1.1
Message-ID: <20090803234922.BD50111C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-cursor-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsu15559/rpms/moblin-cursor-theme

Added Files:
	Makefile 
Log Message:
Setup of module moblin-cursor-theme


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-cursor-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug  3 23:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 03 Aug 2009 23:49:09 +0000
Subject: [pkgdb] moblin-cursor-theme (Fedora, 11) updated by tibbs
Message-ID: <20090803234909.B518510F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for moblin-cursor-theme
tibbs has set commit to Approved for 107427 on moblin-cursor-theme (Fedora 11)
tibbs has set checkout to Approved for 107427 on moblin-cursor-theme (Fedora 11)
tibbs has set build to Approved for 107427 on moblin-cursor-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-cursor-theme



From tibbs at fedoraproject.org  Mon Aug  3 23:49:23 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon,  3 Aug 2009 23:49:23 +0000 (UTC)
Subject: rpms/moblin-cursor-theme/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090803234923.2CCDD11C00E9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/moblin-cursor-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsu15559/rpms/moblin-cursor-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-cursor-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-cursor-theme
# $Id: Makefile,v 1.1 2009/08/03 23:49:22 tibbs Exp $
NAME := moblin-cursor-theme
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Aug  4 00:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 00:05:17 +0000
Subject: [pkgdb] initscripts: mitr has given up watchcommits
Message-ID: <20090804000517.45EAE10F886@bastion2.fedora.phx.redhat.com>

mitr has given up the watchcommits acl on initscripts (Fedora devel)

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



From airlied at fedoraproject.org  Tue Aug  4 00:06:35 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 00:06:35 +0000 (UTC)
Subject: rpms/vbetool/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 vbetool.spec, 
	1.13, 1.14 pciaccess.patch, 1.1, NONE vgaarbpost.patch, 1.2, NONE
Message-ID: <20090804000635.1C4BF11C00E9@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources vbetool.spec 
Removed Files:
	pciaccess.patch vgaarbpost.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.0-1
- rebase to vbetool 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 May 2008 19:45:17 -0000	1.3
+++ .cvsignore	4 Aug 2009 00:06:34 -0000	1.4
@@ -1 +1 @@
-vbetool-1.1.tar.gz
+vbetool-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 May 2008 19:45:17 -0000	1.3
+++ sources	4 Aug 2009 00:06:34 -0000	1.4
@@ -1 +1 @@
-ffb03b118867a02296d7449019ad8846  vbetool-1.1.tar.gz
+8b148d9b54f8bc3a6dfe1be82e792b35  vbetool-1.2.0.tar.bz2


Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vbetool.spec	31 Jul 2009 03:57:44 -0000	1.13
+++ vbetool.spec	4 Aug 2009 00:06:34 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           vbetool
-Version:        1.1
-Release:        5.1%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.codon.org.uk/~mjg59/vbetool/
-Source0:        http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-%{version}.tar.gz
+Source0:        http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libpciaccess > 0.10.6-3
@@ -20,9 +20,6 @@ ExcludeArch:    ppc ppc64 %{sparc} s390 
 # vbetool is included in (some of) these pm-utils releases
 Conflicts:      pm-utils <= 0.99.3-11
 
-Patch0: pciaccess.patch
-Patch1: vgaarbpost.patch
-
 %description
 vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
 able to alter DPMS states, save/restore video card state and attempt to
@@ -31,8 +28,6 @@ initialize the video card from scratch.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .vga
 
 %build
 autoreconf -v --install
@@ -57,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.0-1
+- rebase to vbetool 1.2.0
+
 * Fri Jul 31 2009 Dave Airlie <airlied at redhat.com> 1.1-5.1
 - pciacccess.patch: post to use libpciaccess
 - vgaarbpost.patch: use vga arb to post secondaries


--- pciaccess.patch DELETED ---


--- vgaarbpost.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 00:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 00:31:50 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090804003150.D004510F890@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Tue Aug  4 00:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 00:31:53 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090804003154.0335E10F8A2@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From allisson at fedoraproject.org  Tue Aug  4 00:33:09 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  4 Aug 2009 00:33:09 +0000 (UTC)
Subject: rpms/eina/devel eina.spec,1.6,1.7 import.log,1.4,1.5
Message-ID: <20090804003309.E03C511C0499@cvs1.fedora.phx.redhat.com>

Author: allisson

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

Modified Files:
	eina.spec import.log 
Log Message:

Added libnotify-devel to BuildRequires.



Index: eina.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eina/devel/eina.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eina.spec	24 Jul 2009 21:57:10 -0000	1.6
+++ eina.spec	4 Aug 2009 00:33:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           eina
 Version:        0.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A classic player for a modern era
 
 Group:          Applications/Multimedia
@@ -17,6 +17,7 @@ BuildRequires:  unique-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  curl-devel
+BuildRequires:  libnotify-devel
       
 
 %description
@@ -102,6 +103,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Aug  3 2009 Allisson Azevedo <allisson at gmail.com> 0.8.0-4
+- Added libnotify-devel to BuildRequires.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/eina/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	3 Jul 2009 12:24:51 -0000	1.4
+++ import.log	4 Aug 2009 00:33:09 -0000	1.5
@@ -2,3 +2,4 @@ eina-0_7_3-4_fc10:HEAD:eina-0.7.3-4.fc10
 eina-0_7_3-6_fc10:HEAD:eina-0.7.3-6.fc10.src.rpm:1236733428
 eina-0_8_0-1_fc11:HEAD:eina-0.8.0-1.fc11.src.rpm:1246622800
 eina-0_8_0-2_fc11:HEAD:eina-0.8.0-2.fc11.src.rpm:1246623851
+eina-0_8_0-4_fc11:HEAD:eina-0.8.0-4.fc11.src.rpm:1249345933



From allisson at fedoraproject.org  Tue Aug  4 00:36:58 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  4 Aug 2009 00:36:58 +0000 (UTC)
Subject: rpms/eina/F-11 eina.spec,1.5,1.6 import.log,1.4,1.5
Message-ID: <20090804003658.30FAA11C00E9@cvs1.fedora.phx.redhat.com>

Author: allisson

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

Modified Files:
	eina.spec import.log 
Log Message:

Added libnotify-devel to BuildRequires.



Index: eina.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eina/F-11/eina.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eina.spec	3 Jul 2009 12:31:22 -0000	1.5
+++ eina.spec	4 Aug 2009 00:36:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eina
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A classic player for a modern era
 
 Group:          Applications/Multimedia
@@ -17,6 +17,7 @@ BuildRequires:  unique-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  curl-devel
+BuildRequires:  libnotify-devel
       
 
 %description
@@ -102,6 +103,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Aug  3 2009 Allisson Azevedo <allisson at gmail.com> 0.8.0-3
+- Added libnotify-devel to BuildRequires.
+
 * Fri Jul  3 2009 Allisson Azevedo <allisson at gmail.com> 0.8.0-2
 - Fix changelog date.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/eina/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	3 Jul 2009 12:31:22 -0000	1.4
+++ import.log	4 Aug 2009 00:36:57 -0000	1.5
@@ -2,3 +2,4 @@ eina-0_7_3-4_fc10:HEAD:eina-0.7.3-4.fc10
 eina-0_7_3-6_fc10:HEAD:eina-0.7.3-6.fc10.src.rpm:1236733428
 eina-0_8_0-1_fc11:F-11:eina-0.8.0-1.fc11.src.rpm:1246623186
 eina-0_8_0-2_fc11:F-11:eina-0.8.0-2.fc11.src.rpm:1246624231
+eina-0_8_0-3_fc11:F-11:eina-0.8.0-3.fc11.src.rpm:1249346138



From snirkel at fedoraproject.org  Tue Aug  4 00:38:28 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Tue,  4 Aug 2009 00:38:28 +0000 (UTC)
Subject: rpms/libmtp/devel .cvsignore, 1.23, 1.24 libmtp.spec, 1.34,
	1.35 sources, 1.23, 1.24 libmtp-0.2.6.1-simpler-rules.patch, 1.1, NONE
Message-ID: <20090804003828.A7D4911C00E9@cvs1.fedora.phx.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore libmtp.spec sources 
Removed Files:
	libmtp-0.2.6.1-simpler-rules.patch 
Log Message:
Update to libmtp 1.0.0, drop non-applicable patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	16 Mar 2009 23:57:22 -0000	1.23
+++ .cvsignore	4 Aug 2009 00:38:28 -0000	1.24
@@ -1 +1 @@
-libmtp-0.3.7.tar.gz
+libmtp-1.0.0.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libmtp.spec	25 Jul 2009 06:09:29 -0000	1.34
+++ libmtp.spec	4 Aug 2009 00:38:28 -0000	1.35
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.7
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -16,8 +16,6 @@ Requires:	hal
 BuildRequires:  libusb-devel
 BuildRequires:  doxygen
 
-Patch0: libmtp-0.2.6.1-simpler-rules.patch
-
 %description
 This package provides a software library for communicating with MTP
 (Media Transfer Protocol) media players, typically audio players, video
@@ -45,7 +43,6 @@ library for MTP media players.
 
 %prep
 %setup -q
-%patch0 -p1 -b .rules
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -59,6 +56,19 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmtp.la
+# Replace links with relative links
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-delfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-getfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-newfolder
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-sendfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-sendtr
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -sf mtp-connect mtp-delfile
+ln -sf mtp-connect mtp-getfile
+ln -sf mtp-connect mtp-newfolder
+ln -sf mtp-connect mtp-sendfile
+ln -sf mtp-connect mtp-sendtr
+popd
 # Install udev rules file.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules
@@ -92,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -106,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 4 2009 Linus Walleij <triad at df.lth.se> 1.0.0-1
+- New upstream release. Dependent packages need to be rebuilt against this.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	16 Mar 2009 23:57:23 -0000	1.23
+++ sources	4 Aug 2009 00:38:28 -0000	1.24
@@ -1 +1 @@
-897c3a84a8bdd78f003820ed5f7fa6cf  libmtp-0.3.7.tar.gz
+f105c534dd4f9b6cfdc0ebfb5681266d  libmtp-1.0.0.tar.gz


--- libmtp-0.2.6.1-simpler-rules.patch DELETED ---



From allisson at fedoraproject.org  Tue Aug  4 00:39:24 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue,  4 Aug 2009 00:39:24 +0000 (UTC)
Subject: rpms/eina/F-10 eina.spec,1.3,1.4 import.log,1.3,1.4
Message-ID: <20090804003924.024C611C00E9@cvs1.fedora.phx.redhat.com>

Author: allisson

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

Modified Files:
	eina.spec import.log 
Log Message:

Added libnotify-devel to BuildRequires.



Index: eina.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eina/F-10/eina.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eina.spec	3 Jul 2009 12:19:58 -0000	1.3
+++ eina.spec	4 Aug 2009 00:39:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           eina
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A classic player for a modern era
 
 Group:          Applications/Multimedia
@@ -17,7 +17,8 @@ BuildRequires:  unique-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  curl-devel
-      
+BuildRequires:  libnotify-devel
+
 
 %description
 Eina works like a common portable music player. Just plays what you want 
@@ -102,6 +103,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Aug  3 2009 Allisson Azevedo <allisson at gmail.com> 0.8.0-2
+- Added libnotify-devel to BuildRequires.
+
 * Fri Jul  3 2009 Allisson Azevedo <allisson at gmail.com> 0.8.0-1
 - Update to 0.8.0.
 - Added curl-devel BR.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/eina/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	3 Jul 2009 12:19:58 -0000	1.3
+++ import.log	4 Aug 2009 00:39:23 -0000	1.4
@@ -1,3 +1,4 @@
 eina-0_7_3-4_fc10:F-10:eina-0.7.3-4.fc10.src.rpm:1234143665
 eina-0_7_3-5_fc10:F-10:eina-0.7.3-5.fc10.src.rpm:1236733220
 eina-0_8_0-1_fc11:F-10:eina-0.8.0-1.fc11.src.rpm:1246623554
+eina-0_8_0-2_fc11:F-10:eina-0.8.0-2.fc11.src.rpm:1249346298



From pkgdb at fedoraproject.org  Tue Aug  4 00:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 00:48:15 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090804004815.753F210F886@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From pkgdb at fedoraproject.org  Tue Aug  4 00:48:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 00:48:18 +0000
Subject: [pkgdb] ibus-table-cangjie had acl change status
Message-ID: <20090804004818.F1D4110F8A1@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-cangjie (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table-cangjie



From rdieter at fedoraproject.org  Tue Aug  4 01:25:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 01:25:29 +0000 (UTC)
Subject: rpms/taglib-extras/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 taglib-extras.spec, 1.6, 1.7
Message-ID: <20090804012529.8C36E11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7669

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
- taglib-extras-0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Jul 2009 19:28:34 -0000	1.6
+++ .cvsignore	4 Aug 2009 01:25:29 -0000	1.7
@@ -1 +1 @@
-taglib-extras-0.1.5.tar.gz
+taglib-extras-0.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Jul 2009 19:28:34 -0000	1.6
+++ sources	4 Aug 2009 01:25:29 -0000	1.7
@@ -1 +1 @@
-9e4d30db2c09bb7de83ef5b2840f60e0  taglib-extras-0.1.5.tar.gz
+706a82fe4c25606f731faf4c14b5edb0  taglib-extras-0.1.6.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/devel/taglib-extras.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- taglib-extras.spec	24 Jul 2009 19:28:34 -0000	1.6
+++ taglib-extras.spec	4 Aug 2009 01:25:29 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
+- taglib-extras-0.1.6
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.5-1
 - taglib-extras-0.1.5
 



From rdieter at fedoraproject.org  Tue Aug  4 01:28:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 01:28:51 +0000 (UTC)
Subject: rpms/taglib-extras/F-11 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 taglib-extras.spec, 1.5, 1.6
Message-ID: <20090804012851.5988D11C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8626

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
- taglib-extras-0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Jul 2009 19:29:18 -0000	1.5
+++ .cvsignore	4 Aug 2009 01:28:50 -0000	1.6
@@ -1 +1 @@
-taglib-extras-0.1.5.tar.gz
+taglib-extras-0.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Jul 2009 19:29:18 -0000	1.5
+++ sources	4 Aug 2009 01:28:51 -0000	1.6
@@ -1 +1 @@
-9e4d30db2c09bb7de83ef5b2840f60e0  taglib-extras-0.1.5.tar.gz
+706a82fe4c25606f731faf4c14b5edb0  taglib-extras-0.1.6.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-11/taglib-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- taglib-extras.spec	24 Jul 2009 19:29:18 -0000	1.5
+++ taglib-extras.spec	4 Aug 2009 01:28:51 -0000	1.6
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
+- taglib-extras-0.1.6
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.5-1
 - taglib-extras-0.1.5
 



From rdieter at fedoraproject.org  Tue Aug  4 01:29:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 01:29:51 +0000 (UTC)
Subject: rpms/taglib-extras/F-10 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 taglib-extras.spec, 1.4, 1.5
Message-ID: <20090804012951.4C00511C00E9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/taglib-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8968

Modified Files:
	.cvsignore sources taglib-extras.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
- taglib-extras-0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Jul 2009 19:29:43 -0000	1.5
+++ .cvsignore	4 Aug 2009 01:29:50 -0000	1.6
@@ -1 +1 @@
-taglib-extras-0.1.5.tar.gz
+taglib-extras-0.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Jul 2009 19:29:43 -0000	1.5
+++ sources	4 Aug 2009 01:29:51 -0000	1.6
@@ -1 +1 @@
-9e4d30db2c09bb7de83ef5b2840f60e0  taglib-extras-0.1.5.tar.gz
+706a82fe4c25606f731faf4c14b5edb0  taglib-extras-0.1.6.tar.gz


Index: taglib-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-extras/F-10/taglib-extras.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- taglib-extras.spec	24 Jul 2009 19:29:43 -0000	1.4
+++ taglib-extras.spec	4 Aug 2009 01:29:51 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:        Taglib support for other formats 
 Name:           taglib-extras
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.6-1
+- taglib-extras-0.1.6
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.5-1
 - taglib-extras-0.1.5
 



From cchance at fedoraproject.org  Tue Aug  4 01:35:52 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  4 Aug 2009 01:35:52 +0000 (UTC)
Subject: rpms/ibus-table/devel .cvsignore, 1.10, 1.11 ibus-table.spec, 1.21, 
	1.22 sources, 1.11, 1.12
Message-ID: <20090804013552.7635011C00E9@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10443

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
removed unused daommit contents


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Aug 2009 07:14:29 -0000	1.10
+++ .cvsignore	4 Aug 2009 01:35:52 -0000	1.11
@@ -1 +1 @@
-ibus-table-1.2.0.20090803.tar.gz
+ibus-table-1.2.0.20090804.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ibus-table.spec	3 Aug 2009 07:14:29 -0000	1.21
+++ ibus-table.spec	4 Aug 2009 01:35:52 -0000	1.22
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    1.2.0.20090803
+Version:    1.2.0.20090804
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
@@ -112,6 +112,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Tue Aug 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090804-1.fc12
+- Cleaned up unused dcommit contents.
+
 * Tue Aug 03 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090803-1.fc12
 - Updated to upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Aug 2009 07:14:29 -0000	1.11
+++ sources	4 Aug 2009 01:35:52 -0000	1.12
@@ -1 +1 @@
-768e441557bab8197aa87efb71be0f8e  ibus-table-1.2.0.20090803.tar.gz
+86efc5aa421eeffe26b4dd5718387738  ibus-table-1.2.0.20090804.tar.gz



From gerd at fedoraproject.org  Tue Aug  4 01:46:02 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue,  4 Aug 2009 01:46:02 +0000 (UTC)
Subject: rpms/parrot/devel import.log, 1.10, 1.11 parrot-1.x.0.patch, 1.1,
	1.2 parrot.spec, 1.11, 1.12
Message-ID: <20090804014602.07AB811C00E9@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	import.log parrot-1.x.0.patch parrot.spec 
Log Message:
update to 1.4.0-8
the handling of module "Parrot::OpLib::core" is changed



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log	1 Aug 2009 12:25:53 -0000	1.10
+++ import.log	4 Aug 2009 01:46:01 -0000	1.11
@@ -8,3 +8,4 @@ parrot-1_4_0-3_fc11:HEAD:parrot-1.4.0-3.
 parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128462
 parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128687
 parrot-1_4_0-6_fc11:HEAD:parrot-1.4.0-6.fc11.src.rpm:1249129173
+parrot-1_4_0-8_fc11:HEAD:parrot-1.4.0-8.fc11.src.rpm:1249350002

parrot-1.x.0.patch:
 config/gen/makefiles/parrot_pc.in |    2 +-
 lib/Parrot/Install.pm             |   10 ++++++++++
 tools/dev/install_files.pl        |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: parrot-1.x.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot-1.x.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot-1.x.0.patch	21 Jul 2009 16:54:33 -0000	1.1
+++ parrot-1.x.0.patch	4 Aug 2009 01:46:01 -0000	1.2
@@ -1,14 +1,6 @@
---- tools/dev/install_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_files.pl	2009-06-02 16:12:00.000000000 +0200
-@@ -133,7 +133,6 @@
-         transform => sub {
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
-@@ -157,7 +156,7 @@
+--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
++++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
+@@ -163,7 +163,7 @@
              # libdir as it is typically done with automake installed packages.
              # If there is a use case to make this configurable we'll add a
              # seperate --pkgconfigdir option.
@@ -17,16 +9,14 @@
              return($filehash);
          },
      },
---- tools/dev/install_dev_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_dev_files.pl	2009-06-02 16:19:07.000000000 +0200
-@@ -124,7 +124,6 @@
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
+--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
++++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
+@@ -7,4 +7,4 @@
+ Description: virtual machine to execute bytecode for interpreted languages
+ Version: @VERSION@
+ Libs: -L${libdir} -lparrot @icu_shared@ @libs@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}@versiondir@
 --- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
 +++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
 @@ -220,6 +220,16 @@
@@ -46,13 +36,3 @@
              copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
              print "$dest\n";
          }
---- MANIFEST.generated	2009-07-14 23:49:14.000000000 +0200
-+++ MANIFEST.generated.new	2009-07-17 13:39:08.000000000 +0200
-@@ -241,5 +241,6 @@
- src/pmc/sub.dump                                  [devel]src
- src/pmc/undef.dump                                [devel]src
- src/string_private_cstring.h                      []
--tools/build/dynpmc.pl                             []
-+tools/build/dynoplibs.pl                          [devel]
-+tools/build/dynpmc.pl                             [devel]
- vtable.dump                                       [devel]src


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- parrot.spec	1 Aug 2009 12:25:53 -0000	1.11
+++ parrot.spec	4 Aug 2009 01:46:01 -0000	1.12
@@ -1,29 +1,25 @@
 Name:           parrot
 Version:        1.4.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
 
 Patch0:         parrot-1.x.0.patch
-# see for upstream:       https://trac.parrot.org/parrot/ticket/735
-# patched files:          tools/dev/install_files.pl
-#                         tools/dev/install_dev_files.pl
-# Changes the path for header files (to have no version subdirectory)
-# It is also responsible to have no subdirectory under pkgconfig.
+# patches file:           tools/dev/install_files.pl
+# It is responsible to have no subdirectory under pkgconfig.
+#
+# patches file:           config/gen/makefiles/parrot_pc.in
+# So "pkg-config parrot --cflags" works correct
 #
 # see for upstream:       https://trac.parrot.org/parrot/ticket/509
 # patched file:           lib/Parrot/Install.pm
 # is to have the symlink:    libparrot.so  ->  libparrot.so.%{version}
 # Without this %{_libdir}/libparrot.so would not be a symbolic link to
 # %{_libdir}/libparrot.so.%{version}  
-#
-# see for upstream:       https://trac.parrot.org/parrot/ticket/844
-# patched file:           MANIFEST.generated
-# Add two perl-srcipts that are need to build Rakudo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
@@ -61,11 +57,13 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl(Pod::Simple)
 Requires:       perl(File::Which) >= 0.05
+Requires:       perl(Parrot::OpLib::core)
 # It is necessary to have installed the package "perl-Perl-Critic" to install
 # the parrot-tools
 Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
 Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
 Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}
+Provides:       perl(Parrot::OpLib::core) = %{version}
 
 
 %description
@@ -94,15 +92,13 @@ Parrot Virtual Machine development files
 %setup -q
 %patch0 -p0
 
-%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
-    src/library.c
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
-    tools/dev/install_files.pl
+%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
 
 
 cat << \EOF > %{name}-prov
 #!/bin/sh
-%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
+%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' \
+                            -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
 EOF
 
 %global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
@@ -181,12 +177,6 @@ find %{RPM_PAR_LIB_DIR}tools -type f -na
 find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
     -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
     -exec chmod 755 {} \;
-# Set path to perl binary
-find %{RPM_PAR_LIB_DIR}tools/build -type f -name "dyn*.pl" \
-    -exec %{__sed} -i -e '1 s&# ex: set ro:&#!/usr/bin/perl&' {} \; 
-# This module is only needed for building and should not be installed (I think)
-# module "Parrot::OpLib::core"
-rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib
 
 # Remove doc-files with zero-length
 find docs/html -type f -size 0 -exec rm -f {} \;
@@ -225,9 +215,6 @@ for file in docs/book/draft/ch05_pge.pod
 done
 %{__rm} -f timestamp
 
-# These files *probably* aren't needed.
-rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
@@ -250,10 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
 %doc RESPONSIBLE_PARTIES TODO LICENSE
-%exclude %{_bindir}/parrot_config
-%exclude %{_bindir}/parrot_debugger
-%exclude %{_bindir}/pbc_*
-%{_bindir}/*
+%{_bindir}/parrot
 %{_libdir}/parrot/
 %exclude %{_libdir}/parrot/%{version}/tools
 %exclude %{_libdir}/parrot/%{version}/VERSION
@@ -273,22 +257,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
 %{_includedir}/parrot
-%{_includedir}/pmc
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
-%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
 # Files for building languages
 %{_libdir}/parrot/%{version}/tools/*
 %{_libdir}/parrot/%{version}/VERSION
-
+%{_usr}/src/parrot/*
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-8
+- include the necessary module Parrot::Oplib::core
+- change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
@@ -297,14 +281,11 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
-* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
+* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
 - add a list of changes from Lubomir Rintel
-- add patch to remove rpath
 - add filtering Provides
 - change requires for docs-subpackage
 - enable test suite
-
-* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
 - change the group of the subpackage "-docs" to Documentation
 - put the main-documentation from the docs-package to the main package
 - LICENSE file added
@@ -315,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT
 - define RPM_PAR_LIB_DIR added
 - add subpackage "tools"
 - exclude tools directory from main-package
+- added make html
 
 * Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
 - add tools
@@ -322,11 +304,8 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
 - Removed wrong prefix from pkgconfig per Christoph Wickert
 - Changed i386 to ix86 per Christoph Wickert
-
-* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
 - Changed hard-coded path requirement to perl.
 
-
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0
 
@@ -335,50 +314,29 @@ rm -rf $RPM_BUILD_ROOT
 - added parrot_utils to devel
 - fixed Source0 url
 
-* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
-- added make html
-- make reallyinstall => make install
-
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
-- updated to 0.8.0
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 
-* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
-- Update to 0.5.2.
-
-* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
-- Update to 0.5.1.
-
 * Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
 - Update to 0.4.9.
 - BuildRequires ncurses-devel.
 - For some reason now I need to force -lm too.
 - Remove some files/directories that shouldn't be included.
-
-* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
 - Override lib_dir and make various substitutions to try to fix multilib.
 - Remove rpath use from Makefile.
 - Fix a pod error in src/ops/experimental.ops.
 - Enable "make test" since t/doc/pod.t won't fail now.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
 - Force permissions on shared libraries so rpmbuild strips them.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
 - Fix URL, description, summary, etc.
 - Add post/postun.
 - Move parrot-config to the devel sub-package.
 - Force permissions on the doc directories.
-
-* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
 - Add -lcurses to get readline detection to work.
 - Add BuildRequires libicu-devel.
 



From airlied at fedoraproject.org  Tue Aug  4 01:47:33 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 01:47:33 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-vga-arb.patch, 1.5, 1.6 kernel.spec,
	1.1686, 1.1687
Message-ID: <20090804014733.0A33E11C00E9@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	linux-2.6-vga-arb.patch kernel.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com>
- update VGA arb patches again


linux-2.6-vga-arb.patch:
 drivers/gpu/Makefile     |    2 
 drivers/gpu/vga/Kconfig  |   10 
 drivers/gpu/vga/Makefile |    1 
 drivers/gpu/vga/vgaarb.c | 1195 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 +
 drivers/video/Kconfig    |    2 
 include/linux/pci.h      |    2 
 include/linux/vgaarb.h   |  196 +++++++
 8 files changed, 1450 insertions(+), 2 deletions(-)

Index: linux-2.6-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vga-arb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-vga-arb.patch	3 Aug 2009 06:03:08 -0000	1.5
+++ linux-2.6-vga-arb.patch	4 Aug 2009 01:47:32 -0000	1.6
@@ -1,11 +1,9 @@
-From 28a788c99a243050ab55e819e8e81c4ba019bb35 Mon Sep 17 00:00:00 2001
+From a00c47b3e783fe9ebb871071d2472387451d9225 Mon Sep 17 00:00:00 2001
 From: Tiago Vignatti <tiago.vignatti at nokia.com>
 Date: Tue, 14 Jul 2009 15:57:29 +0300
 Subject: [PATCH] vga: implements VGA arbitration on Linux
 
 changes since last patch:
-fixup unlock userspace api so it can't go < 0
-add exports for vga put/get/tryget
 fix up so the arb doesn't turn off vga decodes
 on hw until first used. This worksaround an
 X.org problem with older X servers which fail
@@ -14,18 +12,21 @@ bit enabled. Newer pciacccess + X server
 add default processing
 use hex for the target API to match the output API
 balance pci get/put
+use the decodes count for userspace to get card
+count also if a gpu disables decodes move it to
+the next card
 
 Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
 ---
  drivers/gpu/Makefile     |    2 +-
  drivers/gpu/vga/Kconfig  |   10 +
  drivers/gpu/vga/Makefile |    1 +
- drivers/gpu/vga/vgaarb.c | 1159 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/gpu/vga/vgaarb.c | 1195 ++++++++++++++++++++++++++++++++++++++++++++++
  drivers/pci/pci.c        |   44 ++
  drivers/video/Kconfig    |    2 +
  include/linux/pci.h      |    2 +
  include/linux/vgaarb.h   |  195 ++++++++
- 8 files changed, 1414 insertions(+), 1 deletions(-)
+ 8 files changed, 1450 insertions(+), 1 deletions(-)
  create mode 100644 drivers/gpu/vga/Kconfig
  create mode 100644 drivers/gpu/vga/Makefile
  create mode 100644 drivers/gpu/vga/vgaarb.c
@@ -63,10 +64,10 @@ index 0000000..7cc8c1e
 +obj-$(CONFIG_VGA_ARB)  += vgaarb.o
 diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
 new file mode 100644
-index 0000000..7383d00
+index 0000000..08ba44d
 --- /dev/null
 +++ b/drivers/gpu/vga/vgaarb.c
-@@ -0,0 +1,1159 @@
+@@ -0,0 +1,1195 @@
 +/*
 + * vgaarb.c
 + *
@@ -117,7 +118,7 @@ index 0000000..7383d00
 +};
 +
 +static LIST_HEAD(vga_list);
-+static int vga_count;
++static int vga_count, vga_decode_count;
 +static bool vga_arbiter_used;
 +static DEFINE_SPINLOCK(vga_lock);
 +static DECLARE_WAIT_QUEUE_HEAD(vga_wait_queue);
@@ -512,6 +513,8 @@ index 0000000..7383d00
 +	vgadev->decodes = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
 +			  VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
 +
++	/* by default mark it as decoding */
++	vga_decode_count++;
 +	/* Mark that we "own" resources based on our enables, we will
 +	 * clear that below if the bridge isn't forwarding
 +	 */
@@ -577,6 +580,9 @@ index 0000000..7383d00
 +		vga_default = NULL;
 +	}
 +
++	if (vgadev->decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
++		vga_decode_count--;
++
 +	/* Remove entry from list */
 +	list_del(&vgadev->list);
 +	vga_count--;
@@ -592,11 +598,49 @@ index 0000000..7383d00
 +	kfree(vgadev);
 +}
 +
++/* this is called with the lock */
++static inline void vga_update_device_decodes(struct vga_device *vgadev,
++					     int new_decodes)
++{
++	int old_decodes;
++	struct vga_device *new_vgadev, *conflict;
++
++	old_decodes = vgadev->decodes;
++	vgadev->decodes = new_decodes;
++
++	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s\n",
++		pci_name(vgadev->pdev),
++		vga_iostate_to_str(old_decodes),
++		vga_iostate_to_str(vgadev->decodes));
++
++	/* if we own the decodes we should move them along to
++	   another card */
++	if ((vgadev->owns & new_decodes) && (vga_count > 1)) {
++		vgadev->owns &= new_decodes;
++		list_for_each_entry(new_vgadev, &vga_list, list) {
++			if ((new_vgadev != vgadev) &&
++			    (new_vgadev->decodes & VGA_RSRC_LEGACY_MASK)) {
++				conflict = __vga_tryget(new_vgadev, VGA_RSRC_LEGACY_MASK);
++				if (!conflict)
++					__vga_put(new_vgadev, VGA_RSRC_LEGACY_MASK);
++				break;
++			}
++		}
++	}
++
++	/* change decodes counter */
++	if (old_decodes != new_decodes) {
++		if (new_decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
++			vga_decode_count++;
++		else
++			vga_decode_count--;
++	}
++}
++
 +void __vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes, bool userspace)
 +{
 +	struct vga_device *vgadev;
 +	unsigned long flags;
-+	int old_decodes;
 +
 +	decodes &= VGA_RSRC_LEGACY_MASK;
 +
@@ -609,14 +653,8 @@ index 0000000..7383d00
 +	if (userspace && vgadev->set_vga_decode)
 +		goto bail;
 +
-+	old_decodes = vgadev->decodes;
-+	vgadev->decodes = decodes;
-+	vgadev->owns &= decodes;
-+
-+	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s\n",
-+		pci_name(pdev),
-+		vga_iostate_to_str(old_decodes),
-+		vga_iostate_to_str(vgadev->decodes));
++	/* update the device decodes + counter */
++	vga_update_device_decodes(vgadev, decodes);
 +
 +	/* XXX if somebody is going from "doesn't decode" to "decodes" state
 +	 * here, additional care must be taken as we may have pending owner
@@ -799,8 +837,8 @@ index 0000000..7383d00
 +
 +	/* Fill the buffer with infos */
 +	len = snprintf(lbuf, 1024,
-+		       "count:%d,PCI:%s,decodes=%s,owns=%s,locks=%s (%d,%d)\n",
-+		       vga_count, pci_name(pdev),
++		       "count:%d,PCI:%s,decodes=%s,owns=%s,locks=%s(%d:%d)\n",
++		       vga_decode_count, pci_name(pdev),
 +		       vga_iostate_to_str(vgadev->decodes),
 +		       vga_iostate_to_str(vgadev->owns),
 +		       vga_iostate_to_str(vgadev->locks),
@@ -1160,8 +1198,7 @@ index 0000000..7383d00
 +			new_state = true;
 +		if (vgadev->set_vga_decode) {
 +			new_decodes = vgadev->set_vga_decode(vgadev->cookie, new_state);
-+			vgadev->decodes = new_decodes;
-+			vgadev->owns &= new_decodes;
++			vga_update_device_decodes(vgadev, new_decodes);
 +		}
 +	}
 +	spin_unlock_irqrestore(&vga_lock, flags);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1686
retrieving revision 1.1687
diff -u -p -r1.1686 -r1.1687
--- kernel.spec	3 Aug 2009 18:24:04 -0000	1.1686
+++ kernel.spec	4 Aug 2009 01:47:32 -0000	1.1687
@@ -1944,6 +1944,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com>
+- update VGA arb patches again
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
 - Update intel drm from anholt's tree
 - Rebase drm-intel-pm.patch to match



From airlied at fedoraproject.org  Tue Aug  4 01:49:43 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 01:49:43 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-vga-arbiter.patch,1.4,1.5
Message-ID: <20090804014943.B6D4511C00E9@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	libpciaccess-vga-arbiter.patch 
Log Message:
regen vga arb patch


libpciaccess-vga-arbiter.patch:
 include/pciaccess.h      |   56 ++++++++
 src/Makefile.am          |    7 +
 src/common_interface.c   |   15 ++
 src/common_vgaarb.c      |  323 +++++++++++++++++++++++++++++++++++++++++++++++
 src/common_vgaarb_stub.c |   73 ++++++++++
 src/linux_sysfs.c        |   21 +++
 src/pciaccess_private.h  |    5 
 7 files changed, 500 insertions(+)

Index: libpciaccess-vga-arbiter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-vga-arbiter.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libpciaccess-vga-arbiter.patch	3 Aug 2009 06:05:24 -0000	1.4
+++ libpciaccess-vga-arbiter.patch	4 Aug 2009 01:49:43 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up libpciaccess-0.10.6/src/common_interface.c.da libpciaccess-0.10.6/src/common_interface.c
---- libpciaccess-0.10.6/src/common_interface.c.da	2009-08-03 15:54:43.000000000 +1000
-+++ libpciaccess-0.10.6/src/common_interface.c	2009-08-03 15:54:54.000000000 +1000
+--- libpciaccess-0.10.6/src/common_interface.c.da	2009-08-04 11:48:05.000000000 +1000
++++ libpciaccess-0.10.6/src/common_interface.c	2009-08-04 11:48:12.000000000 +1000
 @@ -124,6 +124,21 @@ pci_device_is_boot_vga( struct pci_devic
  }
  
@@ -24,8 +24,8 @@ diff -up libpciaccess-0.10.6/src/common_
   * 
   * Probes a PCI device to learn various information about the device.  Before
 diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb_stub.c
---- /dev/null	2009-08-03 15:36:43.267252950 +1000
-+++ libpciaccess-0.10.6/src/common_vgaarb_stub.c	2009-08-03 15:54:54.000000000 +1000
+--- /dev/null	2009-08-04 11:11:12.269252600 +1000
++++ libpciaccess-0.10.6/src/common_vgaarb_stub.c	2009-08-04 11:48:12.000000000 +1000
 @@ -0,0 +1,73 @@
 +/*
 + * Copyright (c) 2009 Tiago Vignatti
@@ -101,8 +101,8 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +    return 0;
 +}
 diff -up libpciaccess-0.10.6/src/linux_sysfs.c.da libpciaccess-0.10.6/src/linux_sysfs.c
---- libpciaccess-0.10.6/src/linux_sysfs.c.da	2009-08-03 15:54:43.000000000 +1000
-+++ libpciaccess-0.10.6/src/linux_sysfs.c	2009-08-03 15:54:54.000000000 +1000
+--- libpciaccess-0.10.6/src/linux_sysfs.c.da	2009-08-04 11:48:05.000000000 +1000
++++ libpciaccess-0.10.6/src/linux_sysfs.c	2009-08-04 11:48:12.000000000 +1000
 @@ -78,6 +78,7 @@ static int pci_device_linux_sysfs_write(
      pciaddr_t * bytes_written );
  
@@ -143,8 +143,8 @@ diff -up libpciaccess-0.10.6/src/linux_s
 +    return 1;
 +}
 diff -up /dev/null libpciaccess-0.10.6/src/common_vgaarb.c
---- /dev/null	2009-08-03 15:36:43.267252950 +1000
-+++ libpciaccess-0.10.6/src/common_vgaarb.c	2009-08-03 15:54:54.000000000 +1000
+--- /dev/null	2009-08-04 11:11:12.269252600 +1000
++++ libpciaccess-0.10.6/src/common_vgaarb.c	2009-08-04 11:48:12.000000000 +1000
 @@ -0,0 +1,323 @@
 +/*
 + * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
@@ -471,7 +471,7 @@ diff -up /dev/null libpciaccess-0.10.6/s
 +}
 diff -up libpciaccess-0.10.6/src/Makefile.am.da libpciaccess-0.10.6/src/Makefile.am
 --- libpciaccess-0.10.6/src/Makefile.am.da	2009-04-18 15:01:36.000000000 +1000
-+++ libpciaccess-0.10.6/src/Makefile.am	2009-08-03 15:54:54.000000000 +1000
++++ libpciaccess-0.10.6/src/Makefile.am	2009-08-04 11:48:12.000000000 +1000
 @@ -45,6 +45,12 @@ if SOLARIS
  OS_SUPPORT = solx_devfs.c pci_tools.h
  endif
@@ -494,8 +494,8 @@ diff -up libpciaccess-0.10.6/src/Makefil
  
  INCLUDES = -I$(top_srcdir)/include
 diff -up libpciaccess-0.10.6/src/pciaccess_private.h.da libpciaccess-0.10.6/src/pciaccess_private.h
---- libpciaccess-0.10.6/src/pciaccess_private.h.da	2009-08-03 15:54:43.000000000 +1000
-+++ libpciaccess-0.10.6/src/pciaccess_private.h	2009-08-03 15:54:54.000000000 +1000
+--- libpciaccess-0.10.6/src/pciaccess_private.h.da	2009-08-04 11:48:05.000000000 +1000
++++ libpciaccess-0.10.6/src/pciaccess_private.h	2009-08-04 11:48:12.000000000 +1000
 @@ -61,6 +61,7 @@ struct pci_system_methods {
      int (*fill_capabilities)( struct pci_device * dev );
      void (*enable)( struct pci_device *dev );
@@ -516,8 +516,8 @@ diff -up libpciaccess-0.10.6/src/pciacce
  
  extern struct pci_system * pci_sys;
 diff -up libpciaccess-0.10.6/include/pciaccess.h.da libpciaccess-0.10.6/include/pciaccess.h
---- libpciaccess-0.10.6/include/pciaccess.h.da	2009-08-03 15:54:43.000000000 +1000
-+++ libpciaccess-0.10.6/include/pciaccess.h	2009-08-03 15:54:54.000000000 +1000
+--- libpciaccess-0.10.6/include/pciaccess.h.da	2009-08-04 11:48:05.000000000 +1000
++++ libpciaccess-0.10.6/include/pciaccess.h	2009-08-04 11:48:12.000000000 +1000
 @@ -21,6 +21,31 @@
   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   * DEALINGS IN THE SOFTWARE.



From mclasen at fedoraproject.org  Tue Aug  4 02:33:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 02:33:41 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.5, 1.6 libchamplain.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090804023341.BC60E11C00E9@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
0.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Aug 2009 05:48:25 -0000	1.5
+++ .cvsignore	4 Aug 2009 02:33:41 -0000	1.6
@@ -1 +1 @@
-libchamplain-0.3.5.tar.gz
+libchamplain-0.3.6.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libchamplain.spec	2 Aug 2009 05:48:25 -0000	1.6
+++ libchamplain.spec	4 Aug 2009 02:33:41 -0000	1.7
@@ -1,16 +1,16 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.3.5
+Version:	0.3.6
 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.3/%{name}-%{version}.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	chrpath
-BuildRequires:	clutter-cairo-devel
+BuildRequires:	clutter-devel
 BuildRequires:	clutter-gtk-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	sqlite-devel
@@ -79,7 +79,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.3.so.2.0.1
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.3.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %changelog
+* Mon Aug  3 2009 <atthias clasen <mclasen at redhat.com> - 0.3.6-1
+- Update to 0.3.6
+
 * 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Aug 2009 05:48:25 -0000	1.5
+++ sources	4 Aug 2009 02:33:41 -0000	1.6
@@ -1 +1 @@
-66e486db1c087633a3f0ce6de4bd320d  libchamplain-0.3.5.tar.gz
+238adac0a63591338116f59aba1c09aa  libchamplain-0.3.6.tar.bz2



From airlied at fedoraproject.org  Tue Aug  4 02:52:33 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 02:52:33 +0000 (UTC)
Subject: rpms/vbetool/devel vbetool.spec,1.14,1.15
Message-ID: <20090804025233.6F45A11C00E9@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	vbetool.spec 
Log Message:
update BR/reqs



Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- vbetool.spec	4 Aug 2009 00:06:34 -0000	1.14
+++ vbetool.spec	4 Aug 2009 02:52:33 -0000	1.15
@@ -9,9 +9,9 @@ URL:            http://www.codon.org.uk/
 Source0:        http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: libpciaccess > 0.10.6-3
+Requires: libpciaccess > 0.10.6-4 libx86
 BuildRequires:  zlib-devel libx86-devel
-BuildRequires:  libpciaccess-devel >= 0.10.6-3
+BuildRequires:  libpciaccess-devel >= 0.10.6-4 libx86-devel
 BuildRequires: autoconf automake libtool pkgconfig
 # does not build on ppc, ppc64 and sparc arches, see #285361 (RedHat Bugzilla)
 # on ppc sys/io.h is missing, on ppc64 there are more complaints



From gerd at fedoraproject.org  Tue Aug  4 02:56:16 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue,  4 Aug 2009 02:56:16 +0000 (UTC)
Subject: rpms/parrot/F-11 parrot.spec,1.8,1.9
Message-ID: <20090804025616.0CD7811C00E9@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	parrot.spec 
Log Message:
update to 1.4.0-8; handling of module "Parrot::OpLib::core" is changed


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- parrot.spec	3 Aug 2009 16:25:03 -0000	1.8
+++ parrot.spec	4 Aug 2009 02:56:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -98,7 +98,7 @@ Parrot Virtual Machine development files
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' \
-                             -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
+                            -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
 EOF
 
 %global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
@@ -270,7 +270,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-7
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-8
 - include the necessary module Parrot::Oplib::core
 - change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*



From airlied at fedoraproject.org  Tue Aug  4 03:12:11 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 03:12:11 +0000 (UTC)
Subject: rpms/libx86/devel libx86-add-pkgconfig.patch, NONE, 1.1 libx86.spec,
	1.6, 1.7
Message-ID: <20090804031211.EBF2711C00E9@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	libx86.spec 
Added Files:
	libx86-add-pkgconfig.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.1-6
- add pkgconfig support


libx86-add-pkgconfig.patch:
 Makefile  |   15 ++++++++++++---
 x86.pc.in |   11 ++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE libx86-add-pkgconfig.patch ---
>From fc4f25c4d16aaff7dcb5dd42cc20b292f4eb2218 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 4 Aug 2009 13:08:42 +1000
Subject: [PATCH] git add x86.pc

---
 Makefile  |   15 ++++++++++++---
 x86.pc.in |   10 ++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 x86.pc.in

diff --git a/Makefile b/Makefile
index 951b617..953a499 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 OBJECTS = x86-common.o
 CFLAGS ?= -O2 -Wall -DDEBUG -g
 LIBDIR ?= /usr/lib
+INCLUDEDIR ?= /usr/include
 
 ifeq ($(BACKEND),x86emu)
 	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
@@ -29,10 +30,18 @@ objclean:
 	rm -f *.o *~
 
 clean: objclean
-	rm -f *.so.1 *.a
+	rm -f *.so.1 *.a x86.pc
 
-install: libx86.so.1
+x86.pc:
+	sed -e's, at prefix@,/usr,' x86.pc.in > x86.pc
+	sed -e's, at exec_prefix@,/usr,' -i x86.pc
+	sed -e's, at libdir@,${LIBDIR},' -i x86.pc
+	sed -e's, at includedir@,${INCLUDEDIR},' -i x86.pc
+	sed -e's, at PACKAGE_VERSION@,1.1,' -i x86.pc
+
+install: libx86.so.1 x86.pc
 	install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1
 	install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a
+	install -D x86.pc $(DESTDIR)$(LIBDIR)/pkgconfig/x86.pc
 	ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so
-	install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h
+	install -p -m 0644 -D lrmi.h $(DESTDIR)$(INCLUDEDIR)/libx86.h
diff --git a/x86.pc.in b/x86.pc.in
new file mode 100644
index 0000000..711d90d
--- /dev/null
+++ b/x86.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: x86
+Description: Library providing x86 emulator access
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lx86
-- 
1.5.4.1



Index: libx86.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libx86/devel/libx86.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libx86.spec	25 Jul 2009 08:56:32 -0000	1.6
+++ libx86.spec	4 Aug 2009 03:12:11 -0000	1.7
@@ -1,6 +1,6 @@
-Name:           libx86          
-Version:        1.1    
-Release:        5%{?dist}
+Name:           libx86
+Version:        1.1
+Release:        6%{?dist}
 Summary:        Library for making real-mode x86 calls
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # and video routing
 ExcludeArch:    ppc ppc64
 
+Patch0: libx86-add-pkgconfig.patch
+
 %description
 A library to provide support for making real-mode x86 calls with an emulated
 x86 processor.
@@ -27,6 +29,7 @@ development of programs that will use li
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -54,8 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_includedir}/*.h
+%{_libdir}/pkgconfig/x86.pc
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.1-6
+- add pkgconfig support
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Tue Aug  4 03:22:55 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  4 Aug 2009 03:22:55 +0000 (UTC)
Subject: rpms/kasumi/devel .cvsignore, 1.10, 1.11 kasumi.spec, 1.32,
	1.33 sources, 1.9, 1.10
Message-ID: <20090804032255.D9BDC11C00E9@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore kasumi.spec sources 
Log Message:
* Mon Aug  3 2009 Akira TAGOH <tagoh at redhat.com> - 2.5-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Jan 2009 11:47:14 -0000	1.10
+++ .cvsignore	4 Aug 2009 03:22:55 -0000	1.11
@@ -10,3 +10,4 @@ kasumi-2.0.1.tar.gz
 kasumi-2.2.tar.gz
 kasumi-2.3.tar.gz
 kasumi-2.4.tar.gz
+kasumi-2.5.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- kasumi.spec	25 Jul 2009 04:18:28 -0000	1.32
+++ kasumi.spec	4 Aug 2009 03:22:55 -0000	1.33
@@ -1,12 +1,12 @@
 Name:    kasumi
-Version: 2.4
-Release: 3%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
-Source0: %{name}-%{version}.tar.gz
+Source0: http://osdn.dl.sourceforge.jp/kasumi/41436/%{name}-%{version}.tar.gz
 
 
 Summary: An anthy dictionary management tool.
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Akira TAGOH <tagoh at redhat.com> - 2.5-1
+- New upstream release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 Jan 2009 11:47:14 -0000	1.9
+++ sources	4 Aug 2009 03:22:55 -0000	1.10
@@ -1 +1,2 @@
 683f43fbf8ba3c92964a538c0d21afc7  kasumi-2.4.tar.gz
+f49d010cf1fa5672b4515502b961b8c8  kasumi-2.5.tar.gz



From pkgdb at fedoraproject.org  Tue Aug  4 03:34:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 03:34:18 +0000
Subject: [pkgdb] mydns (Fedora EPEL, 4) updated by tibbs
Message-ID: <20090804033418.C937210F88F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for mydns
tibbs has set commit to Approved for 107427 on mydns (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on mydns (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on mydns (Fedora EPEL 4)
tibbs changed owner of mydns in Fedora EPEL 4 to itamarjp

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



From pkgdb at fedoraproject.org  Tue Aug  4 03:34:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 03:34:18 +0000
Subject: [pkgdb] mydns (Fedora EPEL, 4) updated by tibbs
Message-ID: <20090804033419.DF6A310F8A2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for mydns
tibbs has set commit to Approved for 107427 on mydns (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on mydns (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on mydns (Fedora EPEL 5)
tibbs changed owner of mydns in Fedora EPEL 5 to itamarjp

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



From akurtakov at fedoraproject.org  Tue Aug  4 03:52:46 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  4 Aug 2009 03:52:46 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.645,1.646
Message-ID: <20090804035246.3E7BF11C00E9@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	eclipse.spec 
Log Message:
- eclipse/about_files are not installed on ppc for some reason.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -p -r1.645 -r1.646
--- eclipse.spec	3 Aug 2009 15:29:56 -0000	1.645
+++ eclipse.spec	4 Aug 2009 03:52:45 -0000	1.646
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.25%{?dist}
+Release:        0.3.26%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1338,7 +1338,9 @@ fi
 %config %{_libdir}/%{name}/eclipse.ini
 #%{_libdir}/%{name}/.eclipseproduct
 %{_libdir}/%{name}/configuration/config.ini
+%ifnarch ppc
 %{_libdir}/%{name}/about_files
+%endif
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
@@ -1489,6 +1491,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.26
+- eclipse/about_files are not installed on ppc for some reason.
+
 * Mon Aug 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.25
 - Swith to eclipse-build for building.
 



From itamarjp at fedoraproject.org  Tue Aug  4 04:01:55 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  4 Aug 2009 04:01:55 +0000 (UTC)
Subject: rpms/mydns/devel import.log,1.2,1.3 mydns.spec,1.4,1.5
Message-ID: <20090804040155.B2F0D11C00E9@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	import.log mydns.spec 
Log Message:
fix spec file for el (4-5)



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 May 2009 19:22:13 -0000	1.2
+++ import.log	4 Aug 2009 04:01:55 -0000	1.3
@@ -1,2 +1,3 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-1_fc11:HEAD:mydns-1.2.8.27-1.fc11.src.rpm:1243279298
+mydns-1_2_8_27-3_fc12:HEAD:mydns-1.2.8.27-3.fc12.src.rpm:1249358398


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/devel/mydns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mydns.spec	25 Jul 2009 15:29:13 -0000	1.4
+++ mydns.spec	4 Aug 2009 04:01:55 -0000	1.5
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -66,7 +66,7 @@ MyDNS compiled with PostGreSQL support
 
 
 #install doc about alternatives
-install -Dp -m 644 %{SOURCE1} .
+install -Dp -m 644 %{SOURCE1} ./HOWTO
 
 # Convert to utf-8
 for file in AUTHORS; do
@@ -246,6 +246,9 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
+- fix spec file for rhel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Tue Aug  4 04:04:10 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  4 Aug 2009 04:04:10 +0000 (UTC)
Subject: rpms/mydns/EL-5 import.log,1.2,1.3 mydns.spec,1.4,1.5
Message-ID: <20090804040410.4394911C00D5@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	import.log mydns.spec 
Log Message:
initial RPM import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 May 2009 19:22:13 -0000	1.2
+++ import.log	4 Aug 2009 04:04:09 -0000	1.3
@@ -1,2 +1,3 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-1_fc11:HEAD:mydns-1.2.8.27-1.fc11.src.rpm:1243279298
+mydns-1_2_8_27-3_fc12:EL-5:mydns-1.2.8.27-3.fc12.src.rpm:1249358556


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-5/mydns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mydns.spec	25 Jul 2009 15:29:13 -0000	1.4
+++ mydns.spec	4 Aug 2009 04:04:10 -0000	1.5
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -66,7 +66,7 @@ MyDNS compiled with PostGreSQL support
 
 
 #install doc about alternatives
-install -Dp -m 644 %{SOURCE1} .
+install -Dp -m 644 %{SOURCE1} ./HOWTO
 
 # Convert to utf-8
 for file in AUTHORS; do
@@ -246,6 +246,9 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
+- fix spec file for rhel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Tue Aug  4 04:05:43 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  4 Aug 2009 04:05:43 +0000 (UTC)
Subject: rpms/mydns/EL-4 import.log,1.2,1.3 mydns.spec,1.4,1.5
Message-ID: <20090804040543.6DA8D11C00D5@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	import.log mydns.spec 
Log Message:
initial rpm import



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 May 2009 19:22:13 -0000	1.2
+++ import.log	4 Aug 2009 04:05:43 -0000	1.3
@@ -1,2 +1,3 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-1_fc11:HEAD:mydns-1.2.8.27-1.fc11.src.rpm:1243279298
+mydns-1_2_8_27-3_fc12:EL-4:mydns-1.2.8.27-3.fc12.src.rpm:1249358676


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-4/mydns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mydns.spec	25 Jul 2009 15:29:13 -0000	1.4
+++ mydns.spec	4 Aug 2009 04:05:43 -0000	1.5
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -66,7 +66,7 @@ MyDNS compiled with PostGreSQL support
 
 
 #install doc about alternatives
-install -Dp -m 644 %{SOURCE1} .
+install -Dp -m 644 %{SOURCE1} ./HOWTO
 
 # Convert to utf-8
 for file in AUTHORS; do
@@ -246,6 +246,9 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
+- fix spec file for rhel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Aug  4 04:14:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 04:14:49 +0000 (UTC)
Subject: rpms/empathy/devel empathy.spec,1.65,1.66
Message-ID: <20090804041449.E5A0B11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	empathy.spec 
Log Message:
enable map and location features



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- empathy.spec	29 Jul 2009 18:57:18 -0000	1.65
+++ empathy.spec	4 Aug 2009 04:14:48 -0000	1.66
@@ -11,7 +11,7 @@
 
 Name:		empathy
 Version:	2.27.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -26,6 +26,8 @@ Source1:	%{name}-README.ConnectionManage
 ##  http://bugzilla.gnome.org/show_bug.cgi?id=577863
 Patch1:		%{name}-broken-pkgconfig.patch
 
+Patch2:		clutter.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -49,6 +51,8 @@ BuildRequires:	telepathy-mission-control
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= 0.4.4
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
+BuildRequires:  libchamplain-devel >= 0.3.6
+BuildRequires:  geoclue-devel >= 0.11 
 
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	telepathy-filesystem
@@ -125,6 +129,7 @@ bindings to the libempathy and libempath
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconfig
+%patch2 -p1 -b .clutter
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -133,7 +138,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
+%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes
 ## 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
@@ -232,6 +237,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
+- Enable map and location features
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From mclasen at fedoraproject.org  Tue Aug  4 04:14:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 04:14:54 +0000 (UTC)
Subject: rpms/vino/devel vino.spec,1.102,1.103
Message-ID: <20090804041454.5A49F11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	vino.spec 
Log Message:
enable telepathy



Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- vino.spec	28 Jul 2009 05:11:40 -0000	1.102
+++ vino.spec	4 Aug 2009 04:14:54 -0000	1.103
@@ -5,11 +5,12 @@
 %define libgnomeui_version 2.6.0
 %define libgcrypt_version 1.2.0
 %define libnotify_version 0.4.3
+%define telepathy_glib_version 0.7.31
 
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.27.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.27/%{name}-%{version}.tar.bz2
 
@@ -30,6 +31,7 @@ BuildRequires: GConf2-devel >= %{gconf2_
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libgcrypt-devel >= %{libgcrypt_version}
 BuildRequires: libnotify-devel >= %{libnotify_version}
+BuildRequires: telepathy-glib-devel >= %{telepathy_glib_version}
 BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel, avahi-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
@@ -60,7 +62,8 @@ autoreconf -i -f
   --disable-gnutls           	\
   --disable-http-server		\
   --enable-libnotify 		\
-  --enable-network-manager
+  --enable-network-manager	\
+  --enable-telepathy
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -126,6 +129,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
+- Enable telepathy
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From mclasen at fedoraproject.org  Tue Aug  4 04:19:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 04:19:30 +0000 (UTC)
Subject: rpms/empathy/devel clutter.patch,NONE,1.1
Message-ID: <20090804041930.9A80A11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Added Files:
	clutter.patch 
Log Message:
add patch


clutter.patch:
 configure              |   16 ++++++++--------
 configure.ac           |    2 +-
 src/empathy-map-view.c |    4 ++--
 src/empathy.c          |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE clutter.patch ---
diff -up empathy-2.27.5/configure.ac.clutter empathy-2.27.5/configure.ac
--- empathy-2.27.5/configure.ac.clutter	2009-07-29 07:36:07.000000000 -0400
+++ empathy-2.27.5/configure.ac	2009-08-03 23:00:02.414627609 -0400
@@ -259,7 +259,7 @@ if test "x$enable_map" != "xno"; then
    [
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
diff -up empathy-2.27.5/configure.clutter empathy-2.27.5/configure
--- empathy-2.27.5/configure.clutter	2009-07-29 07:37:16.000000000 -0400
+++ empathy-2.27.5/configure	2009-08-03 23:00:02.426622014 -0400
@@ -18518,12 +18518,12 @@ if test -n "$PKG_CONFIG"; then
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
       champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= \$CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED
    \"") >&5
   ($PKG_CONFIG --exists --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18531,7 +18531,7 @@ if test -n "$PKG_CONFIG"; then
   pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    " 2>/dev/null`
 else
   pkg_failed=yes
@@ -18548,12 +18548,12 @@ if test -n "$PKG_CONFIG"; then
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
       champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= \$CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED
    \"") >&5
   ($PKG_CONFIG --exists --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18561,7 +18561,7 @@ if test -n "$PKG_CONFIG"; then
   pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    " 2>/dev/null`
 else
   pkg_failed=yes
@@ -18584,13 +18584,13 @@ fi
 	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    "`
         else
 	        LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    "`
         fi
 	# Put the nasty error message in config.log where it belongs
diff -up empathy-2.27.5/src/empathy.c.clutter empathy-2.27.5/src/empathy.c
--- empathy-2.27.5/src/empathy.c.clutter	2009-08-03 23:15:04.865374891 -0400
+++ empathy-2.27.5/src/empathy.c	2009-08-03 23:14:03.385652105 -0400
@@ -32,7 +32,7 @@
 #include <gdk/gdkx.h>
 
 #if HAVE_LIBCHAMPLAIN
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #endif
 
 #include <libebook/e-book.h>
diff -up empathy-2.27.5/src/empathy-map-view.c.clutter empathy-2.27.5/src/empathy-map-view.c
--- empathy-2.27.5/src/empathy-map-view.c.clutter	2009-08-03 23:15:22.429671111 -0400
+++ empathy-2.27.5/src/empathy-map-view.c	2009-08-03 23:17:08.445626300 -0400
@@ -26,7 +26,7 @@
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-contact.h>
@@ -190,7 +190,7 @@ map_view_contacts_foreach (GtkTreeModel 
   if (avatar != NULL)
     {
       texture = clutter_texture_new ();
-      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
+      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar, NULL);
       champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
       g_object_unref (avatar);
     }



From pkgdb at fedoraproject.org  Tue Aug  4 04:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:19:37 +0000
Subject: [pkgdb] imp ownership updated
Message-ID: <20090804041937.6A56E10F88F@bastion2.fedora.phx.redhat.com>

Package imp in Fedora EPEL 5 is now owned by nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:19:45 +0000
Subject: [pkgdb] horde ownership updated
Message-ID: <20090804041945.D595A10F8A2@bastion2.fedora.phx.redhat.com>

Package horde in Fedora EPEL 5 is now owned by nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:19:56 +0000
Subject: [pkgdb] horde ownership updated
Message-ID: <20090804041956.5793710F882@bastion2.fedora.phx.redhat.com>

Package horde in Fedora 9 is now owned by nb

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



From itamarjp at fedoraproject.org  Tue Aug  4 04:23:52 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  4 Aug 2009 04:23:52 +0000 (UTC)
Subject: rpms/bugzilla/EL-5 bugzilla-EL5-perl-versions.patch, NONE,
	1.1 bugzilla-rw-paths.patch, 1.3, 1.4 bugzilla.spec, 1.15,
	1.16 import.log, 1.2, 1.3
Message-ID: <20090804042352.3BD2D11C00CE@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	bugzilla-rw-paths.patch bugzilla.spec import.log 
Added Files:
	bugzilla-EL5-perl-versions.patch 
Log Message:
- fix EL-5 perl dependencies bz#515158


bugzilla-EL5-perl-versions.patch:
 Constants.pm            |    2 +-
 Install/Requirements.pm |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE bugzilla-EL5-perl-versions.patch ---
diff -ruNp a/bugzilla-3.2.4/Bugzilla/Constants.pm b/bugzilla-3.2.4/Bugzilla/Constants.pm
--- a/bugzilla-3.2.4/Bugzilla/Constants.pm	2009-07-08 10:58:27.000000000 -0300
+++ b/bugzilla-3.2.4/Bugzilla/Constants.pm	2009-08-04 00:37:30.852896189 -0300
@@ -387,7 +387,7 @@ use constant DB_MODULE => {
                     # Disallow development versions
                     blacklist => ['_'],
                     # For UTF-8 support
-                    version => '4.00',
+                    version => '3.00',
                 },
                 name => 'MySQL'},
     'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
diff -ruNp a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm
--- a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm	2009-04-17 18:53:49.000000000 -0300
+++ b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm	2009-08-04 00:38:23.376893996 -0300
@@ -62,7 +62,7 @@ sub REQUIRED_MODULES {
         # Perl 5.10 requires CGI 3.33 due to a taint issue when
         # uploading attachments, see bug 416382.
         # Require CGI 3.21 for -httponly support, see bug 368502.
-        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.33' : '3.21'
+        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.15' : '3.15'
     },
     {
         package => 'TimeDate',
@@ -92,7 +92,7 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME',
         module  => 'Email::MIME',
-        version => '1.861'
+        version => '1.859'
     },
     {
         package => 'Email-MIME-Encodings',
@@ -103,7 +103,7 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME-Modifier',
         module  => 'Email::MIME::Modifier',
-        version => '1.442'
+        version => '1.441'
     },
     );
 

bugzilla-rw-paths.patch:
 Constants.pm |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: bugzilla-rw-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/bugzilla-rw-paths.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bugzilla-rw-paths.patch	4 Jul 2009 00:55:03 -0000	1.3
+++ bugzilla-rw-paths.patch	4 Aug 2009 04:23:51 -0000	1.4
@@ -1,6 +1,6 @@
---- bugzilla-3.2.2/Bugzilla/Constants.pm	2009-02-03 10:02:53.000000000 +0000
-+++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm	2009-02-18 17:59:52.000000000 +0000
-@@ -465,9 +465,9 @@
+--- bugzilla-3.4/Bugzilla/Constants.pm        2009-02-03 10:02:53.000000000 +0000
++++ bugzilla-3.4-rw/Bugzilla/Constants.pm     2009-02-18 17:59:52.000000000 +0000
+@@ -499,9 +499,9 @@ sub bz_locations {
          'cgi_path'    => $libpath,
          'templatedir' => "$libpath/template",
          'project'     => $project,
@@ -13,14 +13,12 @@
          'skinsdir'    => "$libpath/skins",
          # $webdotdir must be in the web server's tree somewhere. Even if you use a 
          # local dot, we output images to there. Also, if $webdotdir is 
-@@ -475,8 +475,8 @@
+@@ -509,7 +509,7 @@ sub bz_locations {
          # change showdependencygraph.cgi to set image_url to the correct 
          # location.
          # The script should really generate these graphs directly...
 -        'webdotdir'   => "$libpath/$datadir/webdot",
--        'extensionsdir' => "$libpath/extensions",
 +        'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
-+        'extensionsdir' => "/var/lib/bugzilla/extensions",
+         'extensionsdir' => "$libpath/extensions",
      };
  }
-


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/bugzilla.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- bugzilla.spec	8 Jul 2009 19:24:05 -0000	1.15
+++ bugzilla.spec	4 Aug 2009 04:23:51 -0000	1.16
@@ -6,12 +6,13 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 3.2.4
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-EL5-perl-versions.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -41,6 +42,7 @@ Contributed scripts and functions for Bu
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p2
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -143,6 +145,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-2
+- fix EL-5 perl dependencies bz#515158
+
 * Wed Jul 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-1
 - fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Jul 2009 19:24:05 -0000	1.2
+++ import.log	4 Aug 2009 04:23:51 -0000	1.3
@@ -1,2 +1,3 @@
 bugzilla-3_2_3-1_fc11:EL-5:bugzilla-3.2.3-1.fc11.src.rpm:1246668842
 bugzilla-3_2_4-1_fc11:EL-5:bugzilla-3.2.4-1.fc11.src.rpm:1247081015
+bugzilla-3_2_4-2_fc12:EL-5:bugzilla-3.2.4-2.fc12.src.rpm:1249359798



From mclasen at fedoraproject.org  Tue Aug  4 04:25:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 04:25:21 +0000 (UTC)
Subject: rpms/notification-daemon/devel notification-daemon.spec, 1.31,
	1.32 sexy.patch, 1.2, 1.3
Message-ID: <20090804042521.BEF1911C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11198

Modified Files:
	notification-daemon.spec sexy.patch 
Log Message:
make markup work again



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- notification-daemon.spec	25 Jul 2009 19:29:49 -0000	1.31
+++ notification-daemon.spec	4 Aug 2009 04:25:21 -0000	1.32
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -109,6 +109,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-7
+- Fix the libsexy patch to make markup work again
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sexy.patch:
 configure.ac                |    2 --
 src/themes/standard/theme.c |   17 ++++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

Index: sexy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/sexy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sexy.patch	21 Jul 2009 10:06:58 -0000	1.2
+++ sexy.patch	4 Aug 2009 04:25:21 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up notification-daemon-0.4.0/configure.ac.sexy notification-daemon-0.4.0/configure.ac
---- notification-daemon-0.4.0/configure.ac.sexy	2008-11-20 11:46:52.000000000 +0100
-+++ notification-daemon-0.4.0/configure.ac	2009-07-21 11:46:18.769094999 +0200
+--- notification-daemon-0.4.0/configure.ac.sexy	2008-11-20 05:46:52.000000000 -0500
++++ notification-daemon-0.4.0/configure.ac	2009-08-04 00:20:23.596393484 -0400
 @@ -75,14 +75,12 @@ AM_GLIB_GNU_GETTEXT
  
  REQ_GTK_VERSION=2.10.0
@@ -17,8 +17,8 @@ diff -up notification-daemon-0.4.0/confi
  	libwnck-1.0 \
  "
 diff -up notification-daemon-0.4.0/src/themes/standard/theme.c.sexy notification-daemon-0.4.0/src/themes/standard/theme.c
---- notification-daemon-0.4.0/src/themes/standard/theme.c.sexy	2008-11-20 10:38:01.000000000 +0100
-+++ notification-daemon-0.4.0/src/themes/standard/theme.c	2009-07-21 11:59:09.869092990 +0200
+--- notification-daemon-0.4.0/src/themes/standard/theme.c.sexy	2008-11-20 04:38:01.000000000 -0500
++++ notification-daemon-0.4.0/src/themes/standard/theme.c	2009-08-04 00:22:22.859636942 -0400
 @@ -1,7 +1,6 @@
  #include "config.h"
  
@@ -63,7 +63,7 @@ diff -up notification-daemon-0.4.0/src/t
  	g_free(str);
  
 -	sexy_url_label_set_markup(SEXY_URL_LABEL(windata->body_label), body);
-+	gtk_label_set_text(windata->body_label, body);
++	gtk_label_set_markup(windata->body_label, body);
  
  	if (body == NULL || *body == '\0')
  		gtk_widget_hide(windata->body_label);



From pkgdb at fedoraproject.org  Tue Aug  4 04:29:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:29:54 +0000
Subject: [pkgdb] turba ownership updated
Message-ID: <20090804042954.7605510F879@bastion2.fedora.phx.redhat.com>

Package turba in Fedora EPEL 5 is now owned by nb

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



From mclasen at fedoraproject.org  Tue Aug  4 04:29:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 04:29:59 +0000 (UTC)
Subject: rpms/empathy/devel empathy.spec,1.66,1.67
Message-ID: <20090804042959.951C511C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	empathy.spec 
Log Message:
fix BRs



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- empathy.spec	4 Aug 2009 04:14:48 -0000	1.66
+++ empathy.spec	4 Aug 2009 04:29:59 -0000	1.67
@@ -52,6 +52,7 @@ BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= 0.4.4
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
 BuildRequires:  libchamplain-devel >= 0.3.6
+BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11 
 
 Requires:	%{name}-libs = %{version}-%{release}



From pkgdb at fedoraproject.org  Tue Aug  4 04:30:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:30:12 +0000
Subject: [pkgdb] kronolith ownership updated
Message-ID: <20090804043012.74FB710F882@bastion2.fedora.phx.redhat.com>

Package kronolith in Fedora EPEL 5 is now owned by nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:30:35 +0000
Subject: [pkgdb] jeta ownership updated
Message-ID: <20090804043035.DC76A10F88F@bastion2.fedora.phx.redhat.com>

Package jeta in Fedora EPEL 5 is now owned by nb

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



From itamarjp at fedoraproject.org  Tue Aug  4 04:30:48 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  4 Aug 2009 04:30:48 +0000 (UTC)
Subject: rpms/bugzilla/devel bugzilla-EL5-perl-versions.patch, NONE,
	1.1 bugzilla.spec, 1.29, 1.30 import.log, 1.4, 1.5
Message-ID: <20090804043048.DE3BB11C00CE@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	bugzilla.spec import.log 
Added Files:
	bugzilla-EL5-perl-versions.patch 
Log Message:
- fix EL-5 perl dependencies bz#515158


bugzilla-EL5-perl-versions.patch:
 Constants.pm            |    2 +-
 Install/Requirements.pm |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bugzilla-EL5-perl-versions.patch ---
diff -ruNp a/bugzilla-3.4.1/Bugzilla/Constants.pm b/bugzilla-3.4.1/Bugzilla/Constants.pm
--- a/bugzilla-3.4.1/Bugzilla/Constants.pm	2009-08-01 11:28:41.000000000 -0300
+++ b/bugzilla-3.4.1/Bugzilla/Constants.pm	2009-08-04 01:26:18.761892048 -0300
@@ -400,7 +400,7 @@ use constant DB_MODULE => {
                     # Disallow development versions
                     blacklist => ['_'],
                     # For UTF-8 support
-                    version => '4.00',
+                    version => '3.00',
                 },
                 name => 'MySQL'},
     'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
diff -ruNp a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm
--- a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm	2009-07-24 15:58:46.000000000 -0300
+++ b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm	2009-08-04 01:27:02.852909164 -0300
@@ -118,7 +118,7 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME',
         module  => 'Email::MIME',
-        version => '1.861'
+        version => '1.859'
     },
     {
         package => 'Email-MIME-Encodings',
@@ -129,7 +129,7 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME-Modifier',
         module  => 'Email::MIME::Modifier',
-        version => '1.442'
+        version => '1.441'
     },
     {
         package => 'URI',


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- bugzilla.spec	2 Aug 2009 13:16:05 -0000	1.29
+++ bugzilla.spec	4 Aug 2009 04:30:48 -0000	1.30
@@ -6,12 +6,13 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 3.4.1
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-EL5-perl-versions.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -48,6 +49,7 @@ Contributed scripts and functions for Bu
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p2
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -153,6 +155,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.4.1-2
+- fix EL-5 perl dependencies bz#515158
+
 * Sun Aug 02 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.4.1-1
 - Update to 3.4.1, fixing a security leak
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	8 Jul 2009 19:18:50 -0000	1.4
+++ import.log	4 Aug 2009 04:30:48 -0000	1.5
@@ -2,3 +2,4 @@ bugzilla-3_0_8-1_fc11:HEAD:bugzilla-3.0.
 bugzilla-3_2_2-2_fc10:HEAD:bugzilla-3.2.2-2.fc10.src.rpm:1236265998
 bugzilla-3_2_3-1_fc11:HEAD:bugzilla-3.2.3-1.fc11.src.rpm:1239059931
 bugzilla-3_2_4-1_fc11:HEAD:bugzilla-3.2.4-1.fc11.src.rpm:1247080670
+bugzilla-3_4_1-2_fc12:HEAD:bugzilla-3.4.1-2.fc12.src.rpm:1249360212



From pkgdb at fedoraproject.org  Tue Aug  4 04:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:31:40 +0000
Subject: [pkgdb] otrs ownership updated
Message-ID: <20090804043140.95CE010F879@bastion2.fedora.phx.redhat.com>

Package otrs in Fedora EPEL 5 is now owned by nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:31:46 +0000
Subject: [pkgdb] otrs ownership updated
Message-ID: <20090804043146.C762410F8A0@bastion2.fedora.phx.redhat.com>

Package otrs in Fedora EPEL 4 is now owned by nb

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



From deji at fedoraproject.org  Tue Aug  4 04:31:56 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 04:31:56 +0000 (UTC)
Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.22,1.23
Message-ID: <20090804043156.12D8411C00CE@cvs1.fedora.phx.redhat.com>

Author: deji

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

Modified Files:
	nautilus-actions.spec 
Log Message:
* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 1.10.1-3
- Change e2fsprog-devel BR to libuuid-devel



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nautilus-actions.spec	25 Jul 2009 15:46:30 -0000	1.22
+++ nautilus-actions.spec	4 Aug 2009 04:31:55 -0000	1.23
@@ -1,14 +1,14 @@
 Summary:	Nautilus extension for customizing the context menu
 Name:		nautilus-actions
 Version:	1.10.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.grumz.net/node/8
 Source0:	ftp://pwi.dyndns.biz/tarballs/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libgnomeui-devel, libglade2-devel, nautilus-devel
-BuildRequires:	e2fsprogs-devel, gettext, perl(XML::Parser)
+BuildRequires:	libuuid-devel, gettext, perl(XML::Parser)
 BuildRequires:	desktop-file-utils intltool
 
 %description
@@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/fedora-nact.desktop
 
 %changelog
+* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 1.10.1-3
+- Change e2fsprog-devel BR to libuuid-devel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 04:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:32:33 +0000
Subject: [pkgdb] ingo ownership updated
Message-ID: <20090804043233.B4B4310F8A2@bastion2.fedora.phx.redhat.com>

Package ingo in Fedora EPEL 5 is now owned by nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:32:52 +0000
Subject: [pkgdb] ingo: nb has requested watchbugzilla
Message-ID: <20090804043252.A33EC10F88F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on ingo (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:32:54 +0000
Subject: [pkgdb] ingo: nb has requested watchcommits
Message-ID: <20090804043254.46BD610F8A9@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on ingo (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:33:17 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090804043317.E2CAD10F882@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora EPEL 5 is now owned by nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:33:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:33:22 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090804043322.6853010F8A9@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora EPEL 4 is now owned by nb

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



From itamarjp at fedoraproject.org  Tue Aug  4 04:33:53 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Tue,  4 Aug 2009 04:33:53 +0000 (UTC)
Subject: rpms/bugzilla/EL-4 bugzilla-EL5-perl-versions.patch, NONE,
	1.1 bugzilla-rw-paths.patch, 1.1, 1.2 bugzilla.spec, 1.13,
	1.14 import.log, 1.2, 1.3
Message-ID: <20090804043353.6931911C00CE@cvs1.fedora.phx.redhat.com>

Author: itamarjp

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

Modified Files:
	bugzilla-rw-paths.patch bugzilla.spec import.log 
Added Files:
	bugzilla-EL5-perl-versions.patch 
Log Message:
- fix EL-5 perl dependencies bz#515158


bugzilla-EL5-perl-versions.patch:
 Constants.pm            |    2 +-
 Install/Requirements.pm |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE bugzilla-EL5-perl-versions.patch ---
diff -ruNp a/bugzilla-3.2.4/Bugzilla/Constants.pm b/bugzilla-3.2.4/Bugzilla/Constants.pm
--- a/bugzilla-3.2.4/Bugzilla/Constants.pm	2009-07-08 10:58:27.000000000 -0300
+++ b/bugzilla-3.2.4/Bugzilla/Constants.pm	2009-08-04 00:37:30.852896189 -0300
@@ -387,7 +387,7 @@ use constant DB_MODULE => {
                     # Disallow development versions
                     blacklist => ['_'],
                     # For UTF-8 support
-                    version => '4.00',
+                    version => '3.00',
                 },
                 name => 'MySQL'},
     'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
diff -ruNp a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm
--- a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm	2009-04-17 18:53:49.000000000 -0300
+++ b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm	2009-08-04 00:38:23.376893996 -0300
@@ -62,7 +62,7 @@ sub REQUIRED_MODULES {
         # Perl 5.10 requires CGI 3.33 due to a taint issue when
         # uploading attachments, see bug 416382.
         # Require CGI 3.21 for -httponly support, see bug 368502.
-        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.33' : '3.21'
+        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.15' : '3.15'
     },
     {
         package => 'TimeDate',
@@ -92,7 +92,7 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME',
         module  => 'Email::MIME',
-        version => '1.861'
+        version => '1.859'
     },
     {
         package => 'Email-MIME-Encodings',
@@ -103,7 +103,7 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME-Modifier',
         module  => 'Email::MIME::Modifier',
-        version => '1.442'
+        version => '1.441'
     },
     );
 

bugzilla-rw-paths.patch:
 Constants.pm |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: bugzilla-rw-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-4/bugzilla-rw-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bugzilla-rw-paths.patch	4 Jul 2009 01:03:28 -0000	1.1
+++ bugzilla-rw-paths.patch	4 Aug 2009 04:33:53 -0000	1.2
@@ -1,6 +1,6 @@
---- bugzilla-3.2.2/Bugzilla/Constants.pm	2009-02-03 10:02:53.000000000 +0000
-+++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm	2009-02-18 17:59:52.000000000 +0000
-@@ -465,9 +465,9 @@
+--- bugzilla-3.4/Bugzilla/Constants.pm        2009-02-03 10:02:53.000000000 +0000
++++ bugzilla-3.4-rw/Bugzilla/Constants.pm     2009-02-18 17:59:52.000000000 +0000
+@@ -499,9 +499,9 @@ sub bz_locations {
          'cgi_path'    => $libpath,
          'templatedir' => "$libpath/template",
          'project'     => $project,
@@ -13,14 +13,12 @@
          'skinsdir'    => "$libpath/skins",
          # $webdotdir must be in the web server's tree somewhere. Even if you use a 
          # local dot, we output images to there. Also, if $webdotdir is 
-@@ -475,8 +475,8 @@
+@@ -509,7 +509,7 @@ sub bz_locations {
          # change showdependencygraph.cgi to set image_url to the correct 
          # location.
          # The script should really generate these graphs directly...
 -        'webdotdir'   => "$libpath/$datadir/webdot",
--        'extensionsdir' => "$libpath/extensions",
 +        'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
-+        'extensionsdir' => "/var/lib/bugzilla/extensions",
+         'extensionsdir' => "$libpath/extensions",
      };
  }
-


Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-4/bugzilla.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- bugzilla.spec	8 Jul 2009 19:26:00 -0000	1.13
+++ bugzilla.spec	4 Aug 2009 04:33:53 -0000	1.14
@@ -6,12 +6,13 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 3.2.4
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-EL5-perl-versions.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -41,6 +42,7 @@ Contributed scripts and functions for Bu
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p2
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -143,6 +145,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-2
+- fix EL-5 perl dependencies bz#515158
+
 * Wed Jul 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-1
 - fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Jul 2009 19:26:00 -0000	1.2
+++ import.log	4 Aug 2009 04:33:53 -0000	1.3
@@ -1,2 +1,3 @@
 bugzilla-3_2_3-1_fc11:EL-4:bugzilla-3.2.3-1.fc11.src.rpm:1246669340
 bugzilla-3_2_4-1_fc11:EL-4:bugzilla-3.2.4-1.fc11.src.rpm:1247081113
+bugzilla-3_2_4-2_fc12:EL-4:bugzilla-3.2.4-2.fc12.src.rpm:1249360380



From pkgdb at fedoraproject.org  Tue Aug  4 04:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:34:21 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090804043421.77E4910F882@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora EPEL 5 is now owned by fab

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



From cchance at fedoraproject.org  Tue Aug  4 04:34:29 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  4 Aug 2009 04:34:29 +0000 (UTC)
Subject: rpms/ibus-table/devel ibus-table.spec,1.22,1.23
Message-ID: <20090804043429.4A81011C00CE@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14595

Modified Files:
	ibus-table.spec 
Log Message:
Updated macro of spec file.


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ibus-table.spec	4 Aug 2009 01:35:52 -0000	1.22
+++ ibus-table.spec	4 Aug 2009 04:34:29 -0000	1.23
@@ -29,11 +29,11 @@ This package contains additional tables.
 
 %build
 %configure --disable-static --enable-additional
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
+%__rm -rf $RPM_BUILD_ROOT
+%__make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
 
 %find_lang %{name}
 



From pkgdb at fedoraproject.org  Tue Aug  4 04:34:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:34:25 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090804043425.9411F10F8A9@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora EPEL 4 is now owned by fab

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:37:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:37:44 +0000
Subject: [pkgdb] otrs: nb has requested watchbugzilla
Message-ID: <20090804043744.7C06310F8A0@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on otrs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:37:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:37:46 +0000
Subject: [pkgdb] otrs: nb has requested watchcommits
Message-ID: <20090804043746.B574E10F8AC@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on otrs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:37:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:37:51 +0000
Subject: [pkgdb] otrs: nb has requested approveacls
Message-ID: <20090804043751.BAC0910F8B6@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on otrs (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:37:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:37:49 +0000
Subject: [pkgdb] otrs: nb has requested commit
Message-ID: <20090804043749.44B0F10F8B1@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on otrs (Fedora devel)

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



From dcantrel at fedoraproject.org  Tue Aug  4 04:39:15 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  4 Aug 2009 04:39:15 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.25, 1.26 dhcpv6.spec, 1.102,
	1.103 sources, 1.25, 1.26
Message-ID: <20090804043915.C81A611C00CE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Mon Aug 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-1
- Upgraded to dhcpv6-2.0.0-alpha1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	3 Apr 2009 02:50:54 -0000	1.25
+++ .cvsignore	4 Aug 2009 04:39:15 -0000	1.26
@@ -1 +1 @@
-dhcpv6-1.2.0.tar.gz
+dhcpv6-2.0.0-alpha1.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- dhcpv6.spec	24 Jul 2009 20:14:02 -0000	1.102
+++ dhcpv6.spec	4 Aug 2009 04:39:15 -0000	1.103
@@ -1,14 +1,17 @@
 # libnl is used to communicate with the kernel via netlink
 %define libnlver 1.1
 
+# archive version number
+%define archivever 2.0.0-alpha1
+
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 2.0.0alpha1
+Release: 1%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
-Source0: http://fedorahosted.org/releases/d/h/%{name}/%{name}-%{version}.tar.gz
+Source0: http://fedorahosted.org/releases/d/h/%{name}/%{name}-%{archivever}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex
@@ -118,6 +121,9 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Mon Aug 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-1
+- Upgraded to dhcpv6-2.0.0-alpha1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	3 Apr 2009 02:50:55 -0000	1.25
+++ sources	4 Aug 2009 04:39:15 -0000	1.26
@@ -1 +1 @@
-d537416b33002f56912b7f27477d8d35  dhcpv6-1.2.0.tar.gz
+4784eebc29e872adfdb69ba6303adc36  dhcpv6-2.0.0-alpha1.tar.gz



From pkgdb at fedoraproject.org  Tue Aug  4 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:40:37 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090804044037.8E49F10F879@bastion2.fedora.phx.redhat.com>

romal has set the watchbugzilla acl on otrs (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:40:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:40:39 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090804044039.18A9610F8A2@bastion2.fedora.phx.redhat.com>

romal has set the watchcommits acl on otrs (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:40:40 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090804044040.5D1C510F8AF@bastion2.fedora.phx.redhat.com>

romal has set the commit acl on otrs (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:40:42 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090804044042.9ED3410F8B4@bastion2.fedora.phx.redhat.com>

romal has set the approveacls acl on otrs (Fedora devel) to Approved for nb

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



From mclasen at fedoraproject.org  Tue Aug  4 04:41:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 04:41:27 +0000 (UTC)
Subject: rpms/empathy/devel empathy.spec,1.67,1.68
Message-ID: <20090804044127.8157E11C00CE@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	empathy.spec 
Log Message:
fix BRs more



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- empathy.spec	4 Aug 2009 04:29:59 -0000	1.67
+++ empathy.spec	4 Aug 2009 04:41:27 -0000	1.68
@@ -51,7 +51,7 @@ BuildRequires:	telepathy-mission-control
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= 0.4.4
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
-BuildRequires:  libchamplain-devel >= 0.3.6
+BuildRequires:  libchamplain-gtk-devel >= 0.3.6
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11 
 



From whot at fedoraproject.org  Tue Aug  4 04:42:00 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  4 Aug 2009 04:42:00 +0000 (UTC)
Subject: rpms/libXi/devel .cvsignore, 1.17, 1.18 commitid, 1.3,
	1.4 libXi.spec, 1.36, 1.37 sources, 1.18, 1.19
Message-ID: <20090804044200.A986711C00CE@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore commitid libXi.spec sources 
Log Message:
* Tue Aug 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-9.20090804
- Update to today's git master



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	22 Jul 2009 21:53:26 -0000	1.17
+++ .cvsignore	4 Aug 2009 04:42:00 -0000	1.18
@@ -1 +1 @@
-libXi-20090723.tar.bz2
+libXi-20090804.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/commitid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- commitid	22 Jul 2009 21:53:26 -0000	1.3
+++ commitid	4 Aug 2009 04:42:00 -0000	1.4
@@ -1 +1 @@
-888f6c238de6f09cc5b079ae22c6f37496083007
+aa8272dd31b69f84d19dbe2c45889b806df8260e


Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libXi.spec	25 Jul 2009 05:13:26 -0000	1.36
+++ libXi.spec	4 Aug 2009 04:42:00 -0000	1.37
@@ -1,10 +1,10 @@
 %define tarball libXi
-%define gitdate 20090723
+%define gitdate 20090804
 
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.2.99
-Release: 8.%{gitdate}%{?dist}
+Release: 9.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-9.20090804
+- Update to today's git master
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.99-8.20090723
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	22 Jul 2009 21:53:26 -0000	1.18
+++ sources	4 Aug 2009 04:42:00 -0000	1.19
@@ -1 +1 @@
-08f869c2d551e61e67016d8e41c9e54f  libXi-20090723.tar.bz2
+e3c7fab893b4ff8d2e891fd99ab34886  libXi-20090804.tar.bz2



From deji at fedoraproject.org  Tue Aug  4 04:55:34 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 04:55:34 +0000 (UTC)
Subject: rpms/atlas/devel atlas.spec,1.24,1.25
Message-ID: <20090804045534.3593111C00CE@cvs1.fedora.phx.redhat.com>

Author: deji

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

Modified Files:
	atlas.spec 
Log Message:
* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-6
- Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813)
- Build for F12



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- atlas.spec	24 Jul 2009 17:29:20 -0000	1.24
+++ atlas.spec	4 Aug 2009 04:55:33 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -48,7 +48,7 @@ with ATLAS (Automatically Tuned Linear A
 # Because a set of ATLAS libraries is a ~5 MB package, separate packages
 # are created for SSE, SSE2, and SSE3 extensions to ix86.
 
-%ifarch i586
+%ifarch %{ix86}
 %define types sse sse2 sse3
 
 %package sse
@@ -141,7 +141,7 @@ for type in %{types}; do
 	fi
 	mkdir -p %{_arch}_${type}
 	pushd %{_arch}_${type}
-	../configure -b %{mode} -D c -DWALL -Fa alg '-Wa,--noexecstack -fPIC'\
+	../configure -b %{mode} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
 	--prefix=%{buildroot}%{_prefix}			\
 	--incdir=%{buildroot}%{_includedir}		\
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
@@ -186,7 +186,7 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
-%ifarch i586 && %if "%{?enable_native_atlas}" == "0"
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 cp -pr %{buildroot}%{_libdir}/atlas-sse2 %{buildroot}%{_libdir}/atlas
 echo "%{_libdir}/atlas"	>> %{buildroot}/etc/ld.so.conf.d/atlas-sse2.conf
 %endif
@@ -194,7 +194,7 @@ echo "%{_libdir}/atlas"	>> %{buildroot}/
 %clean
 rm -rf %{buildroot}
 
-%ifnarch i586 || %if "%{?enable_native_atlas}" == "1"
+%ifnarch %{ix86} || %if "%{?enable_native_atlas}" == "1"
 
 %post -p /sbin/ldconfig
 
@@ -281,6 +281,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-6
+- Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813)
+- Build for F12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:22 +0000
Subject: [pkgdb] horde: nb has requested watchbugzilla
Message-ID: <20090804045822.D76B410F882@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on horde (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:25 +0000
Subject: [pkgdb] horde: nb has requested watchcommits
Message-ID: <20090804045825.361B210F8A2@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on horde (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:27 +0000
Subject: [pkgdb] horde: nb has requested commit
Message-ID: <20090804045827.D404010F8AF@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on horde (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:44 +0000
Subject: [pkgdb] horde: nb has requested watchbugzilla
Message-ID: <20090804045844.C248E10F8A9@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on horde (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:46 +0000
Subject: [pkgdb] horde: nb has requested watchcommits
Message-ID: <20090804045847.1FD3F10F8A0@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on horde (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:49 +0000
Subject: [pkgdb] horde: nb has requested commit
Message-ID: <20090804045849.DBE3D10F8B1@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on horde (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:54 +0000
Subject: [pkgdb] horde: nb has requested watchbugzilla
Message-ID: <20090804045854.C7C8B10F8B5@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on horde (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:56 +0000
Subject: [pkgdb] horde: nb has requested watchcommits
Message-ID: <20090804045857.34AB610F879@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on horde (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:58:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:58:59 +0000
Subject: [pkgdb] horde: nb has requested commit
Message-ID: <20090804045859.390B210F8AC@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on horde (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:21 +0000
Subject: [pkgdb] imp: nb has requested watchbugzilla
Message-ID: <20090804045921.E7A6810F8B2@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imp (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:23 +0000
Subject: [pkgdb] imp: nb has requested watchcommits
Message-ID: <20090804045923.C553C10F8B5@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imp (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:26 +0000
Subject: [pkgdb] imp: nb has requested commit
Message-ID: <20090804045926.2C27410F8BB@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imp (Fedora devel)

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



From airlied at fedoraproject.org  Tue Aug  4 04:59:26 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 04:59:26 +0000 (UTC)
Subject: rpms/xorg-x11-drv-cirrus/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-drv-cirrus.spec, 1.32, 1.33
Message-ID: <20090804045926.B766D11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-cirrus.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.3.2-1
- cirrus 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 14:32:28 -0000	1.10
+++ .cvsignore	4 Aug 2009 04:59:26 -0000	1.11
@@ -1,2 +1 @@
-xf86-video-cirrus-1.3.0.tar.bz2
-xf86-video-cirrus-1.3.1.tar.bz2
+xf86-video-cirrus-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 14:32:28 -0000	1.10
+++ sources	4 Aug 2009 04:59:26 -0000	1.11
@@ -1 +1 @@
-8d1b013dc983670fbf5aadb5a8a13bd4  xf86-video-cirrus-1.3.1.tar.bz2
+8195d03ed0be0975c03441e66a9f53b3  xf86-video-cirrus-1.3.2.tar.bz2


Index: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- xorg-x11-drv-cirrus.spec	27 Jul 2009 08:24:20 -0000	1.32
+++ xorg-x11-drv-cirrus.spec	4 Aug 2009 04:59:26 -0000	1.33
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
-Version:   1.3.1
-Release:   2%{?dist}.1
+Version:   1.3.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.3.2-1
+- cirrus 1.3.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:40 +0000
Subject: [pkgdb] imp: nb has requested watchbugzilla
Message-ID: <20090804045940.6CAF510F882@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imp (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:42 +0000
Subject: [pkgdb] imp: nb has requested watchcommits
Message-ID: <20090804045942.8085210F8A9@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imp (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:44 +0000
Subject: [pkgdb] imp: nb has requested commit
Message-ID: <20090804045944.8381D10F8BC@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imp (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:47 +0000
Subject: [pkgdb] imp: nb has requested watchbugzilla
Message-ID: <20090804045947.ED01010F8C0@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imp (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:49 +0000
Subject: [pkgdb] imp: nb has requested watchcommits
Message-ID: <20090804045949.DA99A10F8C3@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imp (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 04:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 04:59:51 +0000
Subject: [pkgdb] imp: nb has requested commit
Message-ID: <20090804045951.A4B6010F8C6@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imp (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:05 +0000
Subject: [pkgdb] ingo: nb has requested commit
Message-ID: <20090804050006.0A02710F8B6@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on ingo (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:18 +0000
Subject: [pkgdb] ingo: nb has requested watchbugzilla
Message-ID: <20090804050018.5585910F882@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on ingo (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:20 +0000
Subject: [pkgdb] ingo: nb has requested watchcommits
Message-ID: <20090804050020.60E8B10F8BB@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on ingo (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:24 +0000
Subject: [pkgdb] ingo: nb has requested commit
Message-ID: <20090804050024.5AEB110F8BE@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on ingo (Fedora 10)

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



From airlied at fedoraproject.org  Tue Aug  4 05:00:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:00:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-apm/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-apm.spec, 1.27, 1.28 abi.patch, 1.1, NONE
Message-ID: <20090804050027.08C4011C0417@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-apm.spec 
Removed Files:
	abi.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.2-1
- rebase to new upstream releae 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-apm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Dec 2008 04:17:58 -0000	1.9
+++ .cvsignore	4 Aug 2009 05:00:26 -0000	1.10
@@ -1 +1 @@
-xf86-video-apm-1.2.1.tar.bz2
+xf86-video-apm-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-apm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Dec 2008 04:17:58 -0000	1.9
+++ sources	4 Aug 2009 05:00:26 -0000	1.10
@@ -1 +1 @@
-673c93df004bb857dc89ae9c78ccf907  xf86-video-apm-1.2.1.tar.bz2
+48441a19aaf015570b267f2a8e67d8ab  xf86-video-apm-1.2.2.tar.bz2


Index: xorg-x11-drv-apm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-apm/devel/xorg-x11-drv-apm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-drv-apm.spec	27 Jul 2009 08:23:04 -0000	1.27
+++ xorg-x11-drv-apm.spec	4 Aug 2009 05:00:26 -0000	1.28
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
-Version: 1.2.1
-Release: 4%{?dist}.1
+Version: 1.2.2
+Release: 1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   apm.xinf
 
-Patch0: abi.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -29,7 +27,6 @@ X.Org X11 apm video driver.
 %prep
 
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -57,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.2-1
+- rebase to new upstream releae 1.2.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- abi.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:28 +0000
Subject: [pkgdb] ingo: nb has requested watchbugzilla
Message-ID: <20090804050028.F343910F8C7@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on ingo (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:31 +0000
Subject: [pkgdb] ingo: nb has requested watchcommits
Message-ID: <20090804050031.9910110F8CD@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on ingo (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:33 +0000
Subject: [pkgdb] ingo: nb has requested commit
Message-ID: <20090804050033.745FD10F8D0@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on ingo (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:43 +0000
Subject: [pkgdb] jeta: nb has requested watchbugzilla
Message-ID: <20090804050043.B93F610F8BC@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on jeta (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:46 +0000
Subject: [pkgdb] jeta: nb has requested watchcommits
Message-ID: <20090804050046.2773110F8D2@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on jeta (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:00:49 +0000
Subject: [pkgdb] jeta: nb has requested commit
Message-ID: <20090804050049.2030010F8D3@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on jeta (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:00 +0000
Subject: [pkgdb] jeta: nb has requested watchbugzilla
Message-ID: <20090804050100.A269910F8C4@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on jeta (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:02 +0000
Subject: [pkgdb] jeta: nb has requested watchcommits
Message-ID: <20090804050103.0703A10F8C6@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on jeta (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:05 +0000
Subject: [pkgdb] jeta: nb has requested commit
Message-ID: <20090804050105.43BFA10F8D6@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on jeta (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:12 +0000
Subject: [pkgdb] jeta: nb has requested watchcommits
Message-ID: <20090804050112.25ADA10F8B5@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on jeta (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:10 +0000
Subject: [pkgdb] jeta: nb has requested watchbugzilla
Message-ID: <20090804050112.F243210F8D9@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on jeta (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:17 +0000
Subject: [pkgdb] jeta: nb has requested commit
Message-ID: <20090804050117.14E5D10F8DC@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on jeta (Fedora 11)

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



From airlied at fedoraproject.org  Tue Aug  4 05:01:43 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:01:43 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ast/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-drv-ast.spec, 1.17, 1.18 abi.patch, 1.1, NONE
Message-ID: <20090804050143.8FE2711C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ast.spec 
Removed Files:
	abi.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.89.9-1
- ast 0.89.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ast/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Dec 2008 04:26:11 -0000	1.4
+++ .cvsignore	4 Aug 2009 05:01:43 -0000	1.5
@@ -1 +1 @@
-xf86-video-ast-0.87.0.tar.bz2
+xf86-video-ast-0.89.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ast/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Dec 2008 04:26:12 -0000	1.4
+++ sources	4 Aug 2009 05:01:43 -0000	1.5
@@ -1 +1 @@
-149ff916433ba62cb0ebb8c71f6374f0  xf86-video-ast-0.87.0.tar.bz2
+619f6ff15db869be3800bb001d5b0468  xf86-video-ast-0.89.9.tar.bz2


Index: xorg-x11-drv-ast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ast/devel/xorg-x11-drv-ast.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xorg-x11-drv-ast.spec	27 Jul 2009 08:23:33 -0000	1.17
+++ xorg-x11-drv-ast.spec	4 Aug 2009 05:01:43 -0000	1.18
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ast video driver
 Name:      xorg-x11-drv-ast
-Version:   0.87.0
-Release:   4%{?dist}.1
+Version:   0.89.9
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ast.xinf
-Patch0:	abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -27,7 +26,6 @@ X.Org X11 ast video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static --disable-dri
@@ -54,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hwdata/videoaliases/ast.xinf
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.89.9-1
+- ast 0.89.9
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.87.0-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- abi.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:53 +0000
Subject: [pkgdb] kronolith: nb has requested watchbugzilla
Message-ID: <20090804050153.CDA0F10F8BE@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on kronolith (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:55 +0000
Subject: [pkgdb] kronolith: nb has requested watchcommits
Message-ID: <20090804050155.85E7710F8C8@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on kronolith (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:01:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:01:56 +0000
Subject: [pkgdb] kronolith: nb has requested commit
Message-ID: <20090804050156.D552110F8CD@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on kronolith (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:02 +0000
Subject: [pkgdb] kronolith: nb has requested watchbugzilla
Message-ID: <20090804050202.ED4CC10F8DE@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on kronolith (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:04 +0000
Subject: [pkgdb] kronolith: nb has requested watchcommits
Message-ID: <20090804050204.30A4E10F8E1@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on kronolith (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:05 +0000
Subject: [pkgdb] kronolith: nb has requested commit
Message-ID: <20090804050205.3B31810F8AF@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on kronolith (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:08 +0000
Subject: [pkgdb] kronolith: nb has requested watchbugzilla
Message-ID: <20090804050208.5B8F110F8BC@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on kronolith (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:10 +0000
Subject: [pkgdb] kronolith: nb has requested watchcommits
Message-ID: <20090804050210.5E8F710F8E4@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on kronolith (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:11 +0000
Subject: [pkgdb] kronolith: nb has requested commit
Message-ID: <20090804050212.01E2610F8E9@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on kronolith (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:24 +0000
Subject: [pkgdb] turba: nb has requested watchbugzilla
Message-ID: <20090804050224.7E6B510F8D1@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on turba (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:25 +0000
Subject: [pkgdb] turba: nb has requested watchcommits
Message-ID: <20090804050226.1123710F8D2@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on turba (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:27 +0000
Subject: [pkgdb] turba: nb has requested commit
Message-ID: <20090804050227.B0C1910F8EE@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on turba (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:32 +0000
Subject: [pkgdb] turba: nb has requested watchbugzilla
Message-ID: <20090804050233.2072310F8EF@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on turba (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:34 +0000
Subject: [pkgdb] turba: nb has requested watchcommits
Message-ID: <20090804050234.386CD10F8F2@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on turba (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:35 +0000
Subject: [pkgdb] turba: nb has requested commit
Message-ID: <20090804050235.5A60710F8F5@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on turba (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:39 +0000
Subject: [pkgdb] turba: nb has requested watchcommits
Message-ID: <20090804050239.653D710F8FD@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on turba (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:38 +0000
Subject: [pkgdb] turba: nb has requested watchbugzilla
Message-ID: <20090804050238.2F68C10F8F9@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on turba (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:02:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:02:40 +0000
Subject: [pkgdb] turba: nb has requested commit
Message-ID: <20090804050240.970C310F8D4@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on turba (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:09 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050309.8CAD910F8B6@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on horde (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:10 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050310.8F52010F8D7@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on horde (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:11 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050311.EB90E10F8D8@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on horde (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:27 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050327.CAE4210F8BB@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on horde (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:27 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050328.087BF10F8DB@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on horde (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:29 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050329.20E8010F903@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on horde (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:31 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050331.AD42B10F906@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on horde (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:32 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050332.22ADC10F909@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on horde (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:03:33 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804050333.4C6B610F90C@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on horde (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:08 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050408.C1F0010F8CA@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on imp (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:09 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050409.6FEC810F8CE@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on imp (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:10 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050410.22E5D10F8DE@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on imp (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:16 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050416.5104810F8E1@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on imp (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:16 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050416.8616910F90E@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on imp (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:17 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050417.B65E210F912@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on imp (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:19 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050420.040A210F915@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on imp (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:20 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050420.D605610F916@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on imp (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:22 +0000
Subject: [pkgdb] imp had acl change status
Message-ID: <20090804050422.3984C10F8B8@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on imp (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:36 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050436.64C2E10F8E5@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on kronolith (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:36 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050436.7184110F918@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on kronolith (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:37 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050437.8395510F91B@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on kronolith (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:43 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050443.AFF5810F91D@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on kronolith (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:43 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050443.188CB10F8EC@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on kronolith (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:44 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050444.D07C410F920@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on kronolith (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:47 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050447.22B8D10F924@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on kronolith (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:47 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050447.7E90510F927@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on kronolith (Fedora 11) to Approved for nb

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



From airlied at fedoraproject.org  Tue Aug  4 05:04:55 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:04:55 +0000 (UTC)
Subject: rpms/xorg-x11-drv-fbdev/devel .cvsignore, 1.11, 1.12 sources, 1.11, 
	1.12 xorg-x11-drv-fbdev.spec, 1.28,
	1.29 fbdev-0.4.0-Make-ISA-optional.patch, 1.1,
	NONE fbdev-0.4.0-Remove-useless-loader-symbol-lists.patch, 1.1, NONE
Message-ID: <20090804050455.DBC5911C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-fbdev.spec 
Removed Files:
	fbdev-0.4.0-Make-ISA-optional.patch 
	fbdev-0.4.0-Remove-useless-loader-symbol-lists.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.4.1-1
- fbdev 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fbdev/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 Mar 2008 01:20:05 -0000	1.11
+++ .cvsignore	4 Aug 2009 05:04:55 -0000	1.12
@@ -1 +1 @@
-xf86-video-fbdev-0.4.0.tar.bz2
+xf86-video-fbdev-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fbdev/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Mar 2008 01:20:05 -0000	1.11
+++ sources	4 Aug 2009 05:04:55 -0000	1.12
@@ -1 +1 @@
-6572b39fec77b8e6de1c858a93992924  xf86-video-fbdev-0.4.0.tar.bz2
+79ce1eb9f9d2ed56de70d8e06cb767d9  xf86-video-fbdev-0.4.1.tar.bz2


Index: xorg-x11-drv-fbdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fbdev/devel/xorg-x11-drv-fbdev.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-fbdev.spec	27 Jul 2009 08:25:16 -0000	1.28
+++ xorg-x11-drv-fbdev.spec	4 Aug 2009 05:04:55 -0000	1.29
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
-Version:   0.4.0
-Release:   6%{?dist}.1
+Version:   0.4.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,11 +17,6 @@ ExcludeArch: s390 s390x
 
 Patch1: fbdev-0.3.0-32fbbpp.patch
 Patch2: BGNoneRoot.patch
-# Taken from upstream. This patch is only here because it allows
-# fbdev-0.4.0-Remove-useless-loader-symbol-lists.patch to apply cleanly.
-Patch3: fbdev-0.4.0-Make-ISA-optional.patch
-# Taken from upstream
-Patch4: fbdev-0.4.0-Remove-useless-loader-symbol-lists.patch
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
 
@@ -36,8 +31,6 @@ X.Org X11 fbdev video driver.
 # code looks like it'll have the same effect.  XXX check with katzj.
 # %patch1 -p1 -b .fbbpp
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %configure --disable-static
@@ -61,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.4.1-1
+- fbdev 0.4.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-6.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- fbdev-0.4.0-Make-ISA-optional.patch DELETED ---


--- fbdev-0.4.0-Remove-useless-loader-symbol-lists.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 05:04:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:04:48 +0000
Subject: [pkgdb] kronolith had acl change status
Message-ID: <20090804050448.A23F210F92A@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on kronolith (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:04 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050504.4D18510F8C2@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on jeta (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:04 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050504.A799010F8D2@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on jeta (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:05 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050505.967C610F8EE@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on jeta (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:09 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050509.9ACBC10F92F@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on jeta (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:10 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050510.2E24510F932@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on jeta (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:11 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050511.45E7410F935@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on jeta (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:14 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050514.7DABD10F93B@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on jeta (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:14 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050514.8530410F93C@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on jeta (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:15 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050516.20F1410F8EF@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on jeta (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:19 +0000
Subject: [pkgdb] jeta had acl change status
Message-ID: <20090804050519.4BF6410F93F@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on jeta (Fedora 11) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:33 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050533.9C49210F8F3@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on turba (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:33 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050533.F217C10F940@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on turba (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:35 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050535.3EA3310F943@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on turba (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:39 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050539.7C7C610F946@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on turba (Fedora 10) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:39 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050539.84E7F10F947@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on turba (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:41 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050541.6C6E910F94A@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on turba (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:42 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050542.D7C8E10F94D@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on turba (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:45 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050545.7171F10F952@bastion2.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on turba (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:45 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050545.8CD4310F956@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on turba (Fedora 11) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:46 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050546.EC7E910F958@bastion2.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on turba (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:05:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:05:48 +0000
Subject: [pkgdb] turba had acl change status
Message-ID: <20090804050548.5A21A10F95B@bastion2.fedora.phx.redhat.com>

tibbs has set the commit acl on turba (Fedora 11) to Approved for nb

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



From airlied at fedoraproject.org  Tue Aug  4 05:07:02 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:07:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-glint/devel .cvsignore, 1.10, 1.11 sources, 1.10, 
	1.11 xorg-x11-drv-glint.spec, 1.25, 1.26
Message-ID: <20090804050702.8E7BD11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-glint.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
- glint 1.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 15:15:42 -0000	1.10
+++ .cvsignore	4 Aug 2009 05:07:02 -0000	1.11
@@ -1,2 +1 @@
-xf86-video-glint-1.2.2.tar.bz2
-xf86-video-glint-1.2.3.tar.bz2
+xf86-video-glint-1.2.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 15:15:42 -0000	1.10
+++ sources	4 Aug 2009 05:07:02 -0000	1.11
@@ -1 +1 @@
-639a327ad7d75f62cdf6ad28a37c934e  xf86-video-glint-1.2.3.tar.bz2
+960df34e129faa411e58c0d6b56d79a3  xf86-video-glint-1.2.4.tar.bz2


Index: xorg-x11-drv-glint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/devel/xorg-x11-drv-glint.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-glint.spec	27 Jul 2009 08:25:58 -0000	1.25
+++ xorg-x11-drv-glint.spec	4 Aug 2009 05:07:02 -0000	1.26
@@ -8,8 +8,8 @@
 
 Summary:   Xorg X11 glint video driver
 Name:      xorg-x11-drv-glint
-Version:   1.2.3
-Release:   2%{?dist}.1
+Version:   1.2.4
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/glint.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
+- glint 1.2.4
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:08:28 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:08:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i128/devel .cvsignore, 1.11, 1.12 sources, 1.11, 
	1.12 xorg-x11-drv-i128.spec, 1.24, 1.25
Message-ID: <20090804050828.AB4B011C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i128.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.3.3-1
- i128 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i128/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 15:20:17 -0000	1.11
+++ .cvsignore	4 Aug 2009 05:08:28 -0000	1.12
@@ -1,2 +1 @@
-xf86-video-i128-1.3.0.tar.bz2
-xf86-video-i128-1.3.2.tar.bz2
+xf86-video-i128-1.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i128/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 15:20:17 -0000	1.11
+++ sources	4 Aug 2009 05:08:28 -0000	1.12
@@ -1 +1 @@
-41a0ece4150033b4f392e3f10dca7b7a  xf86-video-i128-1.3.2.tar.bz2
+a597e8efeec6ab8bc6ba6d87fceb2dba  xf86-video-i128-1.3.3.tar.bz2


Index: xorg-x11-drv-i128.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i128/devel/xorg-x11-drv-i128.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-i128.spec	27 Jul 2009 08:26:25 -0000	1.24
+++ xorg-x11-drv-i128.spec	4 Aug 2009 05:08:28 -0000	1.25
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 i128 video driver
 Name:      xorg-x11-drv-i128
-Version:   1.3.2
-Release:   2%{?dist}.1
+Version:   1.3.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/i128.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.3.3-1
+- i128 1.3.3
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Tue Aug  4 05:10:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 05:10:10 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.383, 1.384 jd.spec, 1.446, 1.447 sources,
	1.384, 1.385
Message-ID: <20090804051010.DC09911C04D1@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3014



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- .cvsignore	1 Aug 2009 18:21:59 -0000	1.383
+++ .cvsignore	4 Aug 2009 05:10:10 -0000	1.384
@@ -1 +1 @@
-jd-2.4.2-svn3007_trunk.tgz
+jd-2.4.2-svn3014_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- jd.spec	1 Aug 2009 18:21:59 -0000	1.446
+++ jd.spec	4 Aug 2009 05:10:10 -0000	1.447
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3007_trunk
+%define         strtag        svn3014_trunk
 %define         repoid        41293
 # 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 Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3007
+* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3014
 
 * 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.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- sources	1 Aug 2009 18:21:59 -0000	1.384
+++ sources	4 Aug 2009 05:10:10 -0000	1.385
@@ -1 +1 @@
-9165b916e3b9ed22b037eeff56534d6d  jd-2.4.2-svn3007_trunk.tgz
+97da105284b8d30f3f9e5374eb42fb41  jd-2.4.2-svn3014_trunk.tgz



From airlied at fedoraproject.org  Tue Aug  4 05:09:56 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:09:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i740/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-i740.spec, 1.24, 1.25
Message-ID: <20090804050956.74E3911C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i740.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.3.2-1
- i740 1.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Jul 2009 15:23:25 -0000	1.9
+++ .cvsignore	4 Aug 2009 05:09:56 -0000	1.10
@@ -1,2 +1 @@
-xf86-video-i740-1.2.0.tar.bz2
-xf86-video-i740-1.3.1.tar.bz2
+xf86-video-i740-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Jul 2009 15:23:25 -0000	1.9
+++ sources	4 Aug 2009 05:09:56 -0000	1.10
@@ -1 +1 @@
-cab8e93321d63f16a473a889c0417cd9  xf86-video-i740-1.3.1.tar.bz2
+4ac1318788f62159965f15131c869e7a  xf86-video-i740-1.3.2.tar.bz2


Index: xorg-x11-drv-i740.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/xorg-x11-drv-i740.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-i740.spec	27 Jul 2009 08:26:41 -0000	1.24
+++ xorg-x11-drv-i740.spec	4 Aug 2009 05:09:56 -0000	1.25
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
-Version:   1.3.1
-Release:   2%{?dist}.1
+Version:   1.3.2
+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/i740.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.3.2-1
+- i740 1.3.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pravins at fedoraproject.org  Tue Aug  4 05:10:43 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Tue,  4 Aug 2009 05:10:43 +0000 (UTC)
Subject: rpms/lohit-fonts/devel .cvsignore, 1.10, 1.11 lohit-fonts.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <20090804051043.9241911C04D1@cvs1.fedora.phx.redhat.com>

Author: pravins

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

Modified Files:
	.cvsignore lohit-fonts.spec sources 
Log Message:
* Tue Aug 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-1
- Added Unicode 5.1 support in All Lohit fonts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Mar 2009 14:12:48 -0000	1.10
+++ .cvsignore	4 Aug 2009 05:10:43 -0000	1.11
@@ -1 +1,2 @@
 lohit-fonts-2.3.8.tar.gz
+lohit-fonts-2.4.0.tar.gz


Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- lohit-fonts.spec	25 Jul 2009 11:16:17 -0000	1.13
+++ lohit-fonts.spec	4 Aug 2009 05:10:43 -0000	1.14
@@ -7,8 +7,8 @@ Languages.
 
 
 Name:           %{fontname}-fonts
-Version:        2.3.8
-Release:        2%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Free Indian truetype/opentype fonts
 
 Group:          User Interface/X
@@ -267,6 +267,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-1
+- Added Unicode 5.1 support in All Lohit fonts 
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Mar 2009 14:12:48 -0000	1.10
+++ sources	4 Aug 2009 05:10:43 -0000	1.11
@@ -1 +1 @@
-f3b5c3cd8e370f1669d44cec3eab1f2b  lohit-fonts-2.3.8.tar.gz
+a729f805c323308ab2c728c8e6fa72c0  lohit-fonts-2.4.0.tar.gz



From airlied at fedoraproject.org  Tue Aug  4 05:13:53 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:13:53 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mach64/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xorg-x11-drv-mach64.spec, 1.6, 1.7
Message-ID: <20090804051353.E729211C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-mach64.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.8.2-1
- mach64 6.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mach64/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 19:37:23 -0000	1.3
+++ .cvsignore	4 Aug 2009 05:13:53 -0000	1.4
@@ -1 +1 @@
-xf86-video-mach64-6.8.1.tar.bz2
+xf86-video-mach64-6.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mach64/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 19:37:23 -0000	1.3
+++ sources	4 Aug 2009 05:13:53 -0000	1.4
@@ -1 +1 @@
-0856d9c8435cf4350b68fbd57ca6d4fc  xf86-video-mach64-6.8.1.tar.bz2
+6c0522b2b72a0a47c48d718443616651  xf86-video-mach64-6.8.2.tar.bz2


Index: xorg-x11-drv-mach64.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mach64/devel/xorg-x11-drv-mach64.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xorg-x11-drv-mach64.spec	27 Jul 2009 08:27:39 -0000	1.6
+++ xorg-x11-drv-mach64.spec	4 Aug 2009 05:13:53 -0000	1.7
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 mach64 video driver
 Name:	    xorg-x11-drv-mach64
-Version:    6.8.1
-Release:    2%{?dist}
+Version:    6.8.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/mach64.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.8.2-1
+- mach64 6.8.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:15:25 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:15:25 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mga/devel .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 xorg-x11-drv-mga.spec, 1.33, 1.34 abi.patch, 1.1, NONE
Message-ID: <20090804051525.D4C5A11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-mga.spec 
Removed Files:
	abi.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.4.11-1
- mga 1.4.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Feb 2009 07:59:42 -0000	1.12
+++ .cvsignore	4 Aug 2009 05:15:25 -0000	1.13
@@ -1 +1 @@
-xf86-video-mga-1.4.9.tar.bz2
+xf86-video-mga-1.4.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	23 Jun 2009 00:27:32 -0000	1.13
+++ sources	4 Aug 2009 05:15:25 -0000	1.14
@@ -1 +1 @@
-e2515e7476185a2d0482a3004a84cfd9  xf86-video-mga-1.4.10.tar.bz2
+9d1ca965cedb0856296b47442f3c739d  xf86-video-mga-1.4.11.tar.bz2


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/devel/xorg-x11-drv-mga.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-mga.spec	27 Jul 2009 08:27:53 -0000	1.33
+++ xorg-x11-drv-mga.spec	4 Aug 2009 05:15:25 -0000	1.34
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
-Version:   1.4.10
-Release:   3%{?dist}.1
+Version:   1.4.11
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -19,7 +19,6 @@ Source1:    mga.xinf
 
 Patch0: mga-1.4.5-no-hal-advertising.patch
 Patch1: mga-1.4.6.1-get-client-pointer.patch
-Patch2: abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -38,7 +37,6 @@ X.Org X11 mga video driver.
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .hal
 %patch1 -p1 -b .gcp
-%patch2 -p1 -b .abi
 
 %build
 autoreconf -v --install || exit 1
@@ -65,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.4.11-1
+- mga 1.4.11
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.10-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- abi.patch DELETED ---



From mnagy at fedoraproject.org  Tue Aug  4 05:15:49 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue,  4 Aug 2009 05:15:49 +0000 (UTC)
Subject: rpms/bind/devel bind-96-dyndb.patch,1.8,1.9 bind.spec,1.321,1.322
Message-ID: <20090804051549.E3EFE11C00CE@cvs1.fedora.phx.redhat.com>

Author: mnagy

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

Modified Files:
	bind-96-dyndb.patch bind.spec 
Log Message:
* Tue Aug 04 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-7.P1
- update the patch for dynamic loading of database backends


bind-96-dyndb.patch:
 b/lib/dns/dynamic_db.c             |  364 +++++++++++++++++++++++++++++++++++++
 b/lib/dns/include/dns/dynamic_db.h |   50 +++++
 bin/named/main.c                   |    3 
 bin/named/server.c                 |  102 ++++++++++
 lib/dns/Makefile.in                |   10 -
 lib/dns/include/dns/Makefile.in    |    2 
 lib/dns/include/dns/log.h          |    1 
 lib/dns/include/dns/types.h        |    1 
 lib/dns/log.c                      |    1 
 lib/isccfg/namedconf.c             |   36 +++
 10 files changed, 567 insertions(+), 3 deletions(-)

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bind-96-dyndb.patch	28 Apr 2009 17:14:02 -0000	1.8
+++ bind-96-dyndb.patch	4 Aug 2009 05:15:49 -0000	1.9
@@ -8,15 +8,15 @@
  #include <dns/name.h>
  #include <dns/result.h>
  #include <dns/view.h>
-@@ -778,6 +779,8 @@ cleanup(void) {
- 	dlz_drivers_clear();
- #endif
+@@ -760,6 +761,8 @@ setup(void) {
  
+ static void
+ cleanup(void) {
 +	dns_dynamic_db_cleanup(ISC_TRUE);
 +
- 	dns_name_destroy();
+ 	destroy_managers();
  
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+ 	ns_server_destroy(&ns_g_server);
 --- a/bin/named/server.c
 +++ b/bin/named/server.c
 @@ -57,6 +57,7 @@


Index: bind.spec
===================================================================
RCS file: /cvs/extras/rpms/bind/devel/bind.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- bind.spec	29 Jul 2009 13:18:38 -0000	1.321
+++ bind.spec	4 Aug 2009 05:15:49 -0000	1.322
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  6.%{PATCHVER}%{?dist}
+Release:  7.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -581,6 +581,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Aug 04 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-7.P1
+- update the patch for dynamic loading of database backends
+
 * Wed Jul 29 2009 Adam Tkac <atkac redhat com> 32:9.6.1-6.P1
 - 9.6.1-P1 release (CVE-2009-0696)
 - fix postun trigger (#513016, hopefully)



From airlied at fedoraproject.org  Tue Aug  4 05:17:05 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:17:05 +0000 (UTC)
Subject: rpms/xorg-x11-drv-r128/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xorg-x11-drv-r128.spec, 1.5, 1.6
Message-ID: <20090804051705.C838711C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-r128.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.8.1-1
- r128 6.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-r128/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2008 03:05:42 -0000	1.2
+++ .cvsignore	4 Aug 2009 05:17:05 -0000	1.3
@@ -1 +1 @@
-xf86-video-r128-6.8.0.tar.bz2
+xf86-video-r128-6.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-r128/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2008 03:05:42 -0000	1.2
+++ sources	4 Aug 2009 05:17:05 -0000	1.3
@@ -1 +1 @@
-007bec0c6b07d9d3aeca4da18e561efb  xf86-video-r128-6.8.0.tar.bz2
+2b90854a62a4d45d652062f582dc8d13  xf86-video-r128-6.8.1.tar.bz2


Index: xorg-x11-drv-r128.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-r128/devel/xorg-x11-drv-r128.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xorg-x11-drv-r128.spec	27 Jul 2009 08:29:48 -0000	1.5
+++ xorg-x11-drv-r128.spec	4 Aug 2009 05:17:05 -0000	1.6
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 r128 video driver
 Name:      xorg-x11-drv-r128
-Version:   6.8.0
-Release:   4%{?dist}.1
+Version:   6.8.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/r128.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.8.1-1
+- r128 6.8.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.8.0-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rishi at fedoraproject.org  Tue Aug  4 05:17:59 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  4 Aug 2009 05:17:59 +0000 (UTC)
Subject: rpms/libchamplain/F-11 libchamplain.spec,1.6,1.7
Message-ID: <20090804051759.903FD11C00CE@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	libchamplain.spec 
Log Message:
* Sun Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1
- Version bump to 0.3.5. (Red Hat Bugzilla #510945)
  * Soname bumped to 2.0.1.
  * 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



Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-11/libchamplain.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libchamplain.spec	2 Aug 2009 05:46:57 -0000	1.6
+++ libchamplain.spec	4 Aug 2009 05:17:59 -0000	1.7
@@ -132,8 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %changelog
-* Sat Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1
-- Version bump to 0.3.5.
+* Sun Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1
+- Version bump to 0.3.5. (Red Hat Bugzilla #510945)
+  * Soname bumped to 2.0.1.
   * 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



From airlied at fedoraproject.org  Tue Aug  4 05:18:15 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:18:15 +0000 (UTC)
Subject: rpms/xorg-x11-drv-s3/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xorg-x11-drv-s3.spec, 1.28, 1.29
Message-ID: <20090804051815.4383711C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-s3.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.6.3-1
- s3 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 15:36:03 -0000	1.11
+++ .cvsignore	4 Aug 2009 05:18:14 -0000	1.12
@@ -1,2 +1 @@
-xf86-video-s3-0.6.1.tar.bz2
-xf86-video-s3-0.6.2.tar.bz2
+xf86-video-s3-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 15:36:04 -0000	1.11
+++ sources	4 Aug 2009 05:18:15 -0000	1.12
@@ -1 +1 @@
-723f9fc2de66805c1984a37c6d41580e  xf86-video-s3-0.6.2.tar.bz2
+5eb06d88533fb327d067928faeb20860  xf86-video-s3-0.6.3.tar.bz2


Index: xorg-x11-drv-s3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3/devel/xorg-x11-drv-s3.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-s3.spec	27 Jul 2009 08:30:37 -0000	1.28
+++ xorg-x11-drv-s3.spec	4 Aug 2009 05:18:15 -0000	1.29
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
-Version:   0.6.2
-Release:   2%{?dist}
+Version:   0.6.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/s3.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.6.3-1
+- s3 0.6.3
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:19:24 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:19:24 +0000 (UTC)
Subject: rpms/xorg-x11-drv-s3virge/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-drv-s3virge.spec, 1.24, 1.25
Message-ID: <20090804051924.D7D4D11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-s3virge.spec 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 15:38:18 -0000	1.10
+++ .cvsignore	4 Aug 2009 05:19:24 -0000	1.11
@@ -1,2 +1 @@
-xf86-video-s3virge-1.10.2.tar.bz2
-xf86-video-s3virge-1.10.3.tar.bz2
+xf86-video-s3virge-1.10.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 15:38:18 -0000	1.10
+++ sources	4 Aug 2009 05:19:24 -0000	1.11
@@ -1 +1 @@
-e59625871ac71bc2555bd784b539ef88  xf86-video-s3virge-1.10.3.tar.bz2
+6517bbbf808c700502d51acdc44662f8  xf86-video-s3virge-1.10.4.tar.bz2


Index: xorg-x11-drv-s3virge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel/xorg-x11-drv-s3virge.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-s3virge.spec	27 Jul 2009 08:30:51 -0000	1.24
+++ xorg-x11-drv-s3virge.spec	4 Aug 2009 05:19:24 -0000	1.25
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
-Version:   1.10.3
-Release:   2%{?dist}.1
+Version:   1.10.4
+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/s3virge.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.10.4-1
+- s3virge 1.10.4
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.3-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:20:48 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:20:48 +0000 (UTC)
Subject: rpms/xorg-x11-drv-savage/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xorg-x11-drv-savage.spec, 1.31, 1.32
Message-ID: <20090804052048.2E22311C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-savage.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.3.1-1
- savage 2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Jul 2009 15:42:37 -0000	1.12
+++ .cvsignore	4 Aug 2009 05:20:48 -0000	1.13
@@ -1,2 +1 @@
-xf86-video-savage-2.2.0.tar.bz2
-xf86-video-savage-2.3.0.tar.bz2
+xf86-video-savage-2.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Jul 2009 15:42:37 -0000	1.12
+++ sources	4 Aug 2009 05:20:48 -0000	1.13
@@ -1 +1 @@
-fc21c0b76c9403fc2cdc7d924abaa461  xf86-video-savage-2.3.0.tar.bz2
+66c319f610e3699c3de0f3ef630abb32  xf86-video-savage-2.3.1.tar.bz2


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/devel/xorg-x11-drv-savage.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-drv-savage.spec	27 Jul 2009 08:31:12 -0000	1.31
+++ xorg-x11-drv-savage.spec	4 Aug 2009 05:20:48 -0000	1.32
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
-Version:   2.3.0
-Release:   2%{?dist}.1
+Version:   2.3.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.3.1-1
+- savage 2.3.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:23:32 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:23:32 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sis/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xorg-x11-drv-sis.spec, 1.33, 1.34 abi.patch, 1.2, NONE
Message-ID: <20090804052332.8634D11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-sis.spec 
Removed Files:
	abi.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.10.2-1
- sis 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sis/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 04:47:24 -0000	1.11
+++ .cvsignore	4 Aug 2009 05:23:32 -0000	1.12
@@ -1 +1 @@
-xf86-video-sis-0.10.1.tar.bz2
+xf86-video-sis-0.10.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sis/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Dec 2008 04:47:24 -0000	1.11
+++ sources	4 Aug 2009 05:23:32 -0000	1.12
@@ -1 +1 @@
-9f57c2f5ccbd8340db32da1c74083771  xf86-video-sis-0.10.1.tar.bz2
+f04baa307e49e9f0e5a5c3d2e89a5576  xf86-video-sis-0.10.2.tar.bz2


Index: xorg-x11-drv-sis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sis/devel/xorg-x11-drv-sis.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-sis.spec	27 Jul 2009 08:31:35 -0000	1.33
+++ xorg-x11-drv-sis.spec	4 Aug 2009 05:23:32 -0000	1.34
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
-Version:   0.10.1
-Release:   4%{?dist}.1
+Version:   0.10.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   sis.xinf
-Patch0: abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -29,7 +28,6 @@ X.Org X11 sis video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -57,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.10.2-1
+- sis 0.10.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.1-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- abi.patch DELETED ---



From airlied at fedoraproject.org  Tue Aug  4 05:24:45 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:24:45 +0000 (UTC)
Subject: rpms/xorg-x11-drv-sisusb/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-drv-sisusb.spec, 1.27, 1.28
Message-ID: <20090804052445.6D6B311C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-sisusb.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.9.3-1
- sisusb 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 15:47:47 -0000	1.10
+++ .cvsignore	4 Aug 2009 05:24:45 -0000	1.11
@@ -1,2 +1 @@
-xf86-video-sisusb-0.9.1.tar.bz2
-xf86-video-sisusb-0.9.2.tar.bz2
+xf86-video-sisusb-0.9.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 15:47:47 -0000	1.10
+++ sources	4 Aug 2009 05:24:45 -0000	1.11
@@ -1 +1 @@
-6d2581530bced93c85f81156f02044a4  xf86-video-sisusb-0.9.2.tar.bz2
+be59e9c2d9458cee0b5006549c14a95d  xf86-video-sisusb-0.9.3.tar.bz2


Index: xorg-x11-drv-sisusb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sisusb/devel/xorg-x11-drv-sisusb.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-drv-sisusb.spec	27 Jul 2009 08:31:47 -0000	1.27
+++ xorg-x11-drv-sisusb.spec	4 Aug 2009 05:24:45 -0000	1.28
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
-Version:   0.9.2
-Release:   2%{?dist}.1
+Version:   0.9.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/*.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 0.9.3-1
+- sisusb 0.9.3
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:25:57 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:25:57 +0000 (UTC)
Subject: rpms/xorg-x11-drv-tdfx/devel .cvsignore, 1.11, 1.12 sources, 1.11, 
	1.12 xorg-x11-drv-tdfx.spec, 1.29, 1.30
Message-ID: <20090804052557.0967211C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-tdfx.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.4.3-1
- tdfx 1.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-tdfx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 15:50:04 -0000	1.11
+++ .cvsignore	4 Aug 2009 05:25:56 -0000	1.12
@@ -1,2 +1 @@
-xf86-video-tdfx-1.4.1.tar.bz2
-xf86-video-tdfx-1.4.2.tar.bz2
+xf86-video-tdfx-1.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-tdfx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 15:50:04 -0000	1.11
+++ sources	4 Aug 2009 05:25:56 -0000	1.12
@@ -1 +1 @@
-abc1e272ab184edf3cd51daa1b91ddcf  xf86-video-tdfx-1.4.2.tar.bz2
+8161bbf2b100c21b609163f0010766b3  xf86-video-tdfx-1.4.3.tar.bz2


Index: xorg-x11-drv-tdfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-tdfx/devel/xorg-x11-drv-tdfx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xorg-x11-drv-tdfx.spec	27 Jul 2009 08:33:44 -0000	1.29
+++ xorg-x11-drv-tdfx.spec	4 Aug 2009 05:25:56 -0000	1.30
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
-Version:   1.4.2
-Release:   2%{?dist}.1
+Version:   1.4.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/tdfx.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.4.3-1
+- tdfx 1.4.3
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 05:28:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:28:09 +0000 (UTC)
Subject: rpms/xorg-x11-drv-vesa/devel .cvsignore, 1.15, 1.16 sources, 1.15, 
	1.16 xorg-x11-drv-vesa.spec, 1.40, 1.41 vesa-2.2.0-panelid.patch,
	1.1, NONE
Message-ID: <20090804052809.272EC11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-vesa.spec 
Removed Files:
	vesa-2.2.0-panelid.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.2.1-1
- vesa 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	17 Feb 2009 23:08:06 -0000	1.15
+++ .cvsignore	4 Aug 2009 05:28:08 -0000	1.16
@@ -1 +1 @@
-xf86-video-vesa-2.2.0.tar.bz2
+xf86-video-vesa-2.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	17 Feb 2009 23:08:06 -0000	1.15
+++ sources	4 Aug 2009 05:28:08 -0000	1.16
@@ -1 +1 @@
-9a86b683f73f3806f55d05cd804a6f4a  xf86-video-vesa-2.2.0.tar.bz2
+61a1dc9a22991bd04d0ff98f800775c1  xf86-video-vesa-2.2.1.tar.bz2


Index: xorg-x11-drv-vesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/devel/xorg-x11-drv-vesa.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xorg-x11-drv-vesa.spec	27 Jul 2009 08:34:43 -0000	1.40
+++ xorg-x11-drv-vesa.spec	4 Aug 2009 05:28:08 -0000	1.41
@@ -4,16 +4,14 @@
 
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
-Version:   2.2.0
-Release:   4%{?dist}.1
+Version:   2.2.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License: MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: vesa-2.2.0-panelid.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15
@@ -26,7 +24,6 @@ X.Org X11 vesa video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .panelid
 
 %build
 #autoreconf -v --install || exit 1
@@ -51,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.2.1-1
+- vesa 2.2.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- vesa-2.2.0-panelid.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 05:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:28:45 +0000
Subject: [pkgdb] clamav: nb has requested watchbugzilla
Message-ID: <20090804052845.21FE710F882@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on clamav (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:28:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:28:46 +0000
Subject: [pkgdb] clamav: nb has requested watchcommits
Message-ID: <20090804052846.D1DC510F8AC@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on clamav (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:28:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:28:48 +0000
Subject: [pkgdb] clamav: nb has requested commit
Message-ID: <20090804052848.B795F10F8B0@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on clamav (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:28:51 +0000
Subject: [pkgdb] clamav: nb has requested commit
Message-ID: <20090804052851.A380210F8B4@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on clamav (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 05:28:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:28:57 +0000
Subject: [pkgdb] clamav: nb has requested commit
Message-ID: <20090804052857.98CB310F8B5@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on clamav (Fedora EPEL 5)

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



From airlied at fedoraproject.org  Tue Aug  4 05:29:18 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:29:18 +0000 (UTC)
Subject: rpms/xorg-x11-drv-voodoo/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 xorg-x11-drv-voodoo.spec, 1.26, 1.27
Message-ID: <20090804052918.30CED11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-voodoo.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.3-1
- voodoo 1.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Jul 2009 15:56:14 -0000	1.13
+++ .cvsignore	4 Aug 2009 05:29:17 -0000	1.14
@@ -1,2 +1 @@
-xf86-video-voodoo-1.2.1.tar.bz2
-xf86-video-voodoo-1.2.2.tar.bz2
+xf86-video-voodoo-1.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Jul 2009 15:56:14 -0000	1.13
+++ sources	4 Aug 2009 05:29:17 -0000	1.14
@@ -1,2 +1 @@
-ed4ce3a5406ca7958865d39558259726  xf86-video-voodoo-1.2.1.tar.bz2
-b4340b6be49277970029938564a26051  xf86-video-voodoo-1.2.2.tar.bz2
+c164effcc839eca1fc1d43a42f4086db  xf86-video-voodoo-1.2.3.tar.bz2


Index: xorg-x11-drv-voodoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xorg-x11-drv-voodoo.spec	27 Jul 2009 08:35:41 -0000	1.26
+++ xorg-x11-drv-voodoo.spec	4 Aug 2009 05:29:18 -0000	1.27
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
-Version:   1.2.2
-Release:   2%{?dist}.1
+Version:   1.2.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.3-1
+- voodoo 1.2.3
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 05:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 05:29:05 +0000
Subject: [pkgdb] clamav: nb has requested commit
Message-ID: <20090804052905.CE87110F8B8@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on clamav (Fedora devel)

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



From airlied at fedoraproject.org  Tue Aug  4 05:30:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:30:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-neomagic/devel .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 xorg-x11-drv-neomagic.spec, 1.22, 1.23
Message-ID: <20090804053016.E287811C04D1@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-neomagic.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
- neomagic 1.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Jul 2009 15:27:19 -0000	1.10
+++ .cvsignore	4 Aug 2009 05:30:16 -0000	1.11
@@ -1,2 +1 @@
-xf86-video-neomagic-1.2.2.tar.bz2
-xf86-video-neomagic-1.2.3.tar.bz2
+xf86-video-neomagic-1.2.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 15:27:19 -0000	1.10
+++ sources	4 Aug 2009 05:30:16 -0000	1.11
@@ -1 +1 @@
-417e9958425ddb13eb137177da330f4d  xf86-video-neomagic-1.2.3.tar.bz2
+2d722ee9b9fe8da49109f280689c9c25  xf86-video-neomagic-1.2.4.tar.bz2


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.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xorg-x11-drv-neomagic.spec	27 Jul 2009 08:28:37 -0000	1.22
+++ xorg-x11-drv-neomagic.spec	4 Aug 2009 05:30:16 -0000	1.23
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
-Version:   1.2.3
-Release:   2%{?dist}.1
+Version:   1.2.4
+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/neomagic.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
+- neomagic 1.2.4
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jkratoch at fedoraproject.org  Tue Aug  4 05:37:31 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue,  4 Aug 2009 05:37:31 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.32,
	1.33 gdb-6.3-gcore-thread-20050204.patch, 1.5,
	1.6 gdb-6.3-gstack-20050411.patch, 1.5,
	1.6 gdb-6.3-ia64-gcore-page0-20050421.patch, 1.5,
	1.6 gdb-6.3-ia64-gcore-speedup-20050714.patch, 1.4,
	1.5 gdb-6.3-ia64-sigtramp-fp-20050926.patch, 1.6,
	1.7 gdb-6.3-large-core-20051206.patch, 1.8,
	1.9 gdb-6.3-pie-20050110.patch, 1.16,
	1.17 gdb-6.3-ppc64syscall-20040622.patch, 1.4,
	1.5 gdb-6.3-ppcdotsolib-20041022.patch, 1.2,
	1.3 gdb-6.3-readnever-20050907.patch, 1.6,
	1.7 gdb-6.3-test-pie-20050107.patch, 1.9,
	1.10 gdb-6.3-threaded-watchpoints2-20050225.patch, 1.8,
	1.9 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch,
	1.10, 1.11 gdb-6.5-bz203661-emit-relocs.patch, 1.2,
	1.3 gdb-6.5-bz216711-clone-is-outermost.patch, 1.3,
	1.4 gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch, 1.2,
	1.3 gdb-6.5-gcore-i386-on-amd64.patch, 1.6,
	1.7 gdb-6.6-buildid-locate-rpm.patch, 1.4,
	1.5 gdb-6.6-buildid-locate.patch, 1.22,
	1.23 gdb-6.6-multifork-debugreg.patch, 1.9,
	1.10 gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch, 1.5,
	1.6 gdb-6.7-testsuite-stable-results.patch, 1.6,
	1.7 gdb-6.8-attach-signalled-detach-stopped.patch, 1.4,
	1.5 gdb-6.8-bz254229-gcore-prpsinfo.patch, 1.2,
	1.3 gdb-6.8-bz436037-reg-no-longer-active.patch, 1.1,
	1.2 gdb-6.8-bz457187-largefile.patch, 1.1,
	1.2 gdb-6.8-bz466901-backtrace-full-prelinked.patch, 1.4,
	1.5 gdb-6.8-constant-watchpoints.patch, 1.5,
	1.6 gdb-6.8-fortran-tag-constant.patch, 1.5,
	1.6 gdb-6.8-inlining-addon.patch, 1.6, 1.7 gdb-archer.patch,
	1.18, 1.19 gdb.spec, 1.367, 1.368 sources, 1.31,
	1.32 gdb-6.3-dtorfix-20050121.patch, 1.6,
	NONE gdb-6.3-linespec-20041213.patch, 1.9,
	NONE gdb-6.3-removebp-20041130.patch, 1.1,
	NONE gdb-6.5-bz181390-memory-address-width.patch, 1.4,
	NONE gdb-6.6-step-thread-exit.patch, 1.4,
	NONE gdb-6.8-ctors-dtors-unique.patch, 1.1,
	NONE gdb-6.8-inlining.patch, 1.13,
	NONE gdb-6.8.50.20090302-upstream.patch, 1.3,
	NONE gdb-DW_OP_call_frame_cfa.patch, 1.1,
	NONE gdb-bz507267-block-sort-fast.patch, 1.1,
	NONE gdb-c_get_string-xfree.patch, 1.1,
	NONE gdb-charset-crash.patch, 1.1,
	NONE gdb-varobj-revalidate-core.patch, 1.1,
	NONE gdb-varobj-revalidate-prep.patch, 1.1, NONE
Message-ID: <20090804053731.34BEC11C00CE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

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

Modified Files:
	.cvsignore gdb-6.3-gcore-thread-20050204.patch 
	gdb-6.3-gstack-20050411.patch 
	gdb-6.3-ia64-gcore-page0-20050421.patch 
	gdb-6.3-ia64-gcore-speedup-20050714.patch 
	gdb-6.3-ia64-sigtramp-fp-20050926.patch 
	gdb-6.3-large-core-20051206.patch gdb-6.3-pie-20050110.patch 
	gdb-6.3-ppc64syscall-20040622.patch 
	gdb-6.3-ppcdotsolib-20041022.patch 
	gdb-6.3-readnever-20050907.patch 
	gdb-6.3-test-pie-20050107.patch 
	gdb-6.3-threaded-watchpoints2-20050225.patch 
	gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 
	gdb-6.5-bz203661-emit-relocs.patch 
	gdb-6.5-bz216711-clone-is-outermost.patch 
	gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch 
	gdb-6.5-gcore-i386-on-amd64.patch 
	gdb-6.6-buildid-locate-rpm.patch gdb-6.6-buildid-locate.patch 
	gdb-6.6-multifork-debugreg.patch 
	gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch 
	gdb-6.7-testsuite-stable-results.patch 
	gdb-6.8-attach-signalled-detach-stopped.patch 
	gdb-6.8-bz254229-gcore-prpsinfo.patch 
	gdb-6.8-bz436037-reg-no-longer-active.patch 
	gdb-6.8-bz457187-largefile.patch 
	gdb-6.8-bz466901-backtrace-full-prelinked.patch 
	gdb-6.8-constant-watchpoints.patch 
	gdb-6.8-fortran-tag-constant.patch 
	gdb-6.8-inlining-addon.patch gdb-archer.patch gdb.spec sources 
Removed Files:
	gdb-6.3-dtorfix-20050121.patch gdb-6.3-linespec-20041213.patch 
	gdb-6.3-removebp-20041130.patch 
	gdb-6.5-bz181390-memory-address-width.patch 
	gdb-6.6-step-thread-exit.patch 
	gdb-6.8-ctors-dtors-unique.patch gdb-6.8-inlining.patch 
	gdb-6.8.50.20090302-upstream.patch 
	gdb-DW_OP_call_frame_cfa.patch 
	gdb-bz507267-block-sort-fast.patch 
	gdb-c_get_string-xfree.patch gdb-charset-crash.patch 
	gdb-varobj-revalidate-core.patch 
	gdb-varobj-revalidate-prep.patch 
Log Message:
* Tue Aug  4 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090803-1
- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090803
- archer-jankratochvil-fedora12 commit: 0222cb1f4ddd1eda32965e464cb60b1e44e110b2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	2 Mar 2009 23:14:15 -0000	1.32
+++ .cvsignore	4 Aug 2009 05:37:27 -0000	1.33
@@ -1 +1 @@
-gdb-6.8.50.20090302.tar.bz2
+gdb-6.8.50.20090803.tar.bz2

gdb-6.3-gcore-thread-20050204.patch:
 linux-nat.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: gdb-6.3-gcore-thread-20050204.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gcore-thread-20050204.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.3-gcore-thread-20050204.patch	14 Dec 2008 14:05:14 -0000	1.5
+++ gdb-6.3-gcore-thread-20050204.patch	4 Aug 2009 05:37:27 -0000	1.6
@@ -3,13 +3,13 @@
         * linux-nat.c (linux_nat_xfer_memory): Don't use
         linux_proc_xfer_memory for ia64.
 
-Index: gdb-6.8.50.20081209/gdb/linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/linux-nat.c	2008-12-10 01:22:23.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/linux-nat.c	2008-12-10 01:25:26.000000000 +0100
-@@ -4123,10 +4123,15 @@ linux_xfer_partial (struct target_ops *o
-     return linux_nat_xfer_osdata (ops, object, annex, readbuf, writebuf,
-                                offset, len);
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-04 06:29:55.000000000 +0200
+@@ -4495,10 +4495,15 @@ linux_xfer_partial (struct target_ops *o
+ 	offset &= ((ULONGEST) 1 << addr_bit) - 1;
+     }
  
 +#ifndef NATIVE_XFER_UNWIND_TABLE
 +  /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory

gdb-6.3-gstack-20050411.patch:
 Makefile.in |   32 ++++++++++++++++++++++++++++++--
 gstack.sh   |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)

Index: gdb-6.3-gstack-20050411.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-gstack-20050411.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.3-gstack-20050411.patch	27 Apr 2009 15:22:01 -0000	1.5
+++ gdb-6.3-gstack-20050411.patch	4 Aug 2009 05:37:27 -0000	1.6
@@ -4,20 +4,20 @@
 	to install and uninstall.
 	* gstack.sh, gstack.1: New files.
 
-Index: gdb-6.8.50.20090226/gdb/Makefile.in
+Index: gdb-6.8.50.20090802/gdb/Makefile.in
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/Makefile.in	2009-02-26 22:09:59.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/Makefile.in	2009-02-26 22:10:22.000000000 +0100
-@@ -973,7 +973,7 @@ install: all install-only 
- 
- # The "install-only" target also installs the syscalls' XML files in
- # the system.
--install-only: $(CONFIG_INSTALL) xml-syscall-install
-+install-only: install-gstack $(CONFIG_INSTALL) xml-syscall-install
+--- gdb-6.8.50.20090802.orig/gdb/Makefile.in	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/Makefile.in	2009-08-03 11:09:49.000000000 +0200
+@@ -947,7 +947,7 @@ gdb.z:gdb.1
+ # time it takes for make to check that all is up to date.
+ # install-only is intended to address that need.
+ install: all install-only
+-install-only: $(CONFIG_INSTALL)
++install-only: install-gstack $(CONFIG_INSTALL)
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1005,9 +1005,26 @@ install-tui:
+@@ -979,9 +979,26 @@ install-tui:
  			$(DESTDIR)$(man1dir) ; \
  		$(INSTALL_DATA) $(srcdir)/gdb.1 \
  			$(DESTDIR)$(man1dir)/$$transformed_name.1
@@ -45,7 +45,7 @@ Index: gdb-6.8.50.20090226/gdb/Makefile.
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1029,6 +1046,17 @@ uninstall-tui:
+@@ -1003,6 +1020,17 @@ uninstall-tui:
  		fi ; \
  		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
  		      $(DESTDIR)$(man1dir)/$$transformed_name.1
@@ -63,10 +63,10 @@ Index: gdb-6.8.50.20090226/gdb/Makefile.
  
  # The C++ name parser can be built standalone for testing.
  test-cp-name-parser.o: cp-name-parser.c
-Index: gdb-6.8.50.20090226/gdb/gstack.sh
+Index: gdb-6.8.50.20090802/gdb/gstack.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090226/gdb/gstack.sh	2009-02-26 22:10:05.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/gstack.sh	2009-08-03 11:08:52.000000000 +0200
 @@ -0,0 +1,48 @@
 +#!/bin/sh
 +

gdb-6.3-ia64-gcore-page0-20050421.patch:
 gcore.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Index: gdb-6.3-ia64-gcore-page0-20050421.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-gcore-page0-20050421.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.3-ia64-gcore-page0-20050421.patch	14 Dec 2008 14:05:14 -0000	1.5
+++ gdb-6.3-ia64-gcore-page0-20050421.patch	4 Aug 2009 05:37:27 -0000	1.6
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20081128/gdb/gcore.c
+Index: gdb-6.8.50.20090802/gdb/gcore.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/gcore.c	2008-09-11 16:27:34.000000000 +0200
-+++ gdb-6.8.50.20081128/gdb/gcore.c	2008-12-01 16:39:04.000000000 +0100
-@@ -475,8 +475,14 @@ gcore_copy_callback (bfd *obfd, asection
+--- gdb-6.8.50.20090802.orig/gdb/gcore.c	2009-08-03 12:27:55.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/gcore.c	2009-08-03 12:28:56.000000000 +0200
+@@ -479,8 +479,14 @@ gcore_copy_callback (bfd *obfd, asection
        if (size > total_size)
  	size = total_size;
  
@@ -12,9 +12,9 @@ Index: gdb-6.8.50.20081128/gdb/gcore.c
        if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
 -			      memhunk, size) != 0)
 +			      memhunk, size) != 0
-+	  && (strcmp (gdbarch_bfd_arch_info (current_gdbarch)->arch_name,
++	  && (strcmp (gdbarch_bfd_arch_info (target_gdbarch)->arch_name,
 +		      "ia64")
 +	      || bfd_section_vma (obfd, osec) != 0))
  	{
- 	  warning (_("Memory read failed for corefile section, %s bytes at 0x%s."),
- 		   plongest (size), paddr (bfd_section_vma (obfd, osec)));
+ 	  warning (_("Memory read failed for corefile section, %s bytes at %s."),
+ 		   plongest (size),

gdb-6.3-ia64-gcore-speedup-20050714.patch:
 ia64-linux-nat.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 linux-nat.c      |   33 ++++++++++++++++++++++++++-----
 2 files changed, 86 insertions(+), 5 deletions(-)

Index: gdb-6.3-ia64-gcore-speedup-20050714.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-gcore-speedup-20050714.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.3-ia64-gcore-speedup-20050714.patch	2 Mar 2009 00:11:34 -0000	1.4
+++ gdb-6.3-ia64-gcore-speedup-20050714.patch	4 Aug 2009 05:37:27 -0000	1.5
@@ -7,13 +7,13 @@
 	(ia64_rse_skip_regs): Ditto.
 	(ia64_linux_check_stack_region): New function.
 	
-Index: gdb-6.8.50.20090226/gdb/linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/linux-nat.c	2009-02-27 07:51:44.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/linux-nat.c	2009-02-28 07:19:05.000000000 +0100
-@@ -4386,15 +4386,38 @@ linux_xfer_partial (struct target_ops *o
-     return linux_nat_xfer_osdata (ops, object, annex, readbuf, writebuf,
-                                offset, len);
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-04 06:29:55.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-04 06:30:53.000000000 +0200
+@@ -4495,15 +4495,38 @@ linux_xfer_partial (struct target_ops *o
+ 	offset &= ((ULONGEST) 1 << addr_bit) - 1;
+     }
  
 -#ifndef NATIVE_XFER_UNWIND_TABLE
 -  /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory
@@ -55,10 +55,10 @@ Index: gdb-6.8.50.20090226/gdb/linux-nat
  
    return super_xfer_partial (ops, object, annex, readbuf, writebuf,
  			     offset, len);
-Index: gdb-6.8.50.20090226/gdb/ia64-linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/ia64-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/ia64-linux-nat.c	2009-02-23 01:03:49.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/ia64-linux-nat.c	2009-02-28 07:18:10.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/ia64-linux-nat.c	2009-02-23 01:03:49.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/ia64-linux-nat.c	2009-08-04 06:30:53.000000000 +0200
 @@ -809,6 +809,64 @@ ia64_linux_xfer_partial (struct target_o
  
  void _initialize_ia64_linux_nat (void);

gdb-6.3-ia64-sigtramp-fp-20050926.patch:
 ia64-tdep.c       |   12 +++++++++---
 libunwind-frame.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 libunwind-frame.h |    3 +++
 3 files changed, 58 insertions(+), 5 deletions(-)

Index: gdb-6.3-ia64-sigtramp-fp-20050926.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-sigtramp-fp-20050926.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.3-ia64-sigtramp-fp-20050926.patch	14 Dec 2008 14:05:14 -0000	1.6
+++ gdb-6.3-ia64-sigtramp-fp-20050926.patch	4 Aug 2009 05:37:27 -0000	1.7
@@ -24,11 +24,11 @@
 
 	Fix a compilation error on a typo.
 
-Index: gdb-6.8.50.20081128/gdb/libunwind-frame.c
+Index: gdb-6.8.50.20090803/gdb/libunwind-frame.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/libunwind-frame.c	2008-05-06 20:37:46.000000000 +0200
-+++ gdb-6.8.50.20081128/gdb/libunwind-frame.c	2008-12-02 19:46:26.000000000 +0100
-@@ -61,6 +61,7 @@ static unw_word_t (*unw_find_dyn_list_p)
+--- gdb-6.8.50.20090803.orig/gdb/libunwind-frame.c	2009-01-03 06:57:52.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/libunwind-frame.c	2009-08-04 06:31:34.000000000 +0200
+@@ -62,6 +62,7 @@ static unw_word_t (*unw_find_dyn_list_p)
  struct libunwind_frame_cache
  {
    CORE_ADDR base;
@@ -36,7 +36,7 @@ Index: gdb-6.8.50.20081128/gdb/libunwind
    CORE_ADDR func_addr;
    unw_cursor_t cursor;
    unw_addr_space_t as;
-@@ -133,6 +134,7 @@ libunwind_frame_cache (struct frame_info
+@@ -134,6 +135,7 @@ libunwind_frame_cache (struct frame_info
    unw_accessors_t *acc;
    unw_addr_space_t as;
    unw_word_t fp;
@@ -44,7 +44,7 @@ Index: gdb-6.8.50.20081128/gdb/libunwind
    unw_regnum_t uw_sp_regnum;
    struct libunwind_frame_cache *cache;
    struct libunwind_descr *descr;
-@@ -174,14 +176,30 @@ libunwind_frame_cache (struct frame_info
+@@ -175,14 +177,30 @@ libunwind_frame_cache (struct frame_info
  				 : __LITTLE_ENDIAN);
  
    unw_init_remote_p (&cache->cursor, as, this_frame);
@@ -77,7 +77,7 @@ Index: gdb-6.8.50.20081128/gdb/libunwind
    ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &fp);
    if (ret < 0)
      {
-@@ -189,6 +207,7 @@ libunwind_frame_cache (struct frame_info
+@@ -190,6 +208,7 @@ libunwind_frame_cache (struct frame_info
        error (_("Can't get libunwind sp register."));
      }
  
@@ -85,7 +85,7 @@ Index: gdb-6.8.50.20081128/gdb/libunwind
    cache->base = (CORE_ADDR)fp;
    cache->as = as;
  
-@@ -376,6 +395,31 @@ libunwind_search_unwind_table (void *as,
+@@ -377,6 +396,31 @@ libunwind_search_unwind_table (void *as,
  				    di, pi, need_unwind_info, args);
  }
  
@@ -117,10 +117,10 @@ Index: gdb-6.8.50.20081128/gdb/libunwind
  /* Verify if we are in a sigtramp frame and we can use libunwind to unwind.  */
  int
  libunwind_sigtramp_frame_sniffer (const struct frame_unwind *self,
-Index: gdb-6.8.50.20081128/gdb/libunwind-frame.h
+Index: gdb-6.8.50.20090803/gdb/libunwind-frame.h
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/libunwind-frame.h	2008-05-06 20:37:46.000000000 +0200
-+++ gdb-6.8.50.20081128/gdb/libunwind-frame.h	2008-12-02 19:38:55.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/libunwind-frame.h	2009-01-03 06:57:52.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/libunwind-frame.h	2009-08-04 06:31:34.000000000 +0200
 @@ -52,6 +52,9 @@ void libunwind_frame_set_descr (struct g
  
  void libunwind_frame_this_id (struct frame_info *this_frame, void **this_cache,
@@ -131,11 +131,11 @@ Index: gdb-6.8.50.20081128/gdb/libunwind
  struct value *libunwind_frame_prev_register (struct frame_info *this_frame,
                                               void **this_cache, int regnum);
  void libunwind_frame_dealloc_cache (struct frame_info *self, void *cache);
-Index: gdb-6.8.50.20081128/gdb/ia64-tdep.c
+Index: gdb-6.8.50.20090803/gdb/ia64-tdep.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/ia64-tdep.c	2008-12-02 19:04:32.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/ia64-tdep.c	2008-12-02 21:09:46.000000000 +0100
-@@ -2964,7 +2964,7 @@ ia64_libunwind_sigtramp_frame_this_id (s
+--- gdb-6.8.50.20090803.orig/gdb/ia64-tdep.c	2009-08-04 06:30:45.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/ia64-tdep.c	2009-08-04 06:31:34.000000000 +0200
+@@ -3023,7 +3023,7 @@ ia64_libunwind_sigtramp_frame_this_id (s
    struct frame_id id;
    CORE_ADDR prev_ip;
  
@@ -144,9 +144,9 @@ Index: gdb-6.8.50.20081128/gdb/ia64-tdep
    if (frame_id_eq (id, null_frame_id))
      {
        (*this_id) = null_frame_id;
-@@ -2976,8 +2976,14 @@ ia64_libunwind_sigtramp_frame_this_id (s
+@@ -3035,8 +3035,14 @@ ia64_libunwind_sigtramp_frame_this_id (s
    get_frame_register (this_frame, IA64_BSP_REGNUM, buf);
-   bsp = extract_unsigned_integer (buf, 8);
+   bsp = extract_unsigned_integer (buf, 8, byte_order);
  
 -  /* For a sigtramp frame, we don't make the check for previous ip being 0.  */
 -  (*this_id) = frame_id_build_special (id.stack_addr, id.code_addr, bsp);

gdb-6.3-large-core-20051206.patch:
 dcache.c      |    4 ++--
 dcache.h      |    4 ++--
 exec.c        |    2 +-
 exec.h        |    2 +-
 linux-nat.c   |    2 +-
 remote-sim.c  |    7 +++++--
 remote.c      |   14 +++++++++++---
 symfile-mem.c |   10 +++++++++-
 target.c      |   18 +++++++++---------
 target.h      |   12 ++++++------
 10 files changed, 47 insertions(+), 28 deletions(-)

Index: gdb-6.3-large-core-20051206.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-large-core-20051206.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdb-6.3-large-core-20051206.patch	2 Mar 2009 00:11:34 -0000	1.8
+++ gdb-6.3-large-core-20051206.patch	4 Aug 2009 05:37:27 -0000	1.9
@@ -25,10 +25,10 @@
 
 	Port to GDB-6.7.
 
-Index: gdb-6.8.50.20090226/gdb/symfile-mem.c
+Index: gdb-6.8.50.20090803/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/symfile-mem.c	2009-02-21 17:14:49.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/symfile-mem.c	2009-02-28 07:22:09.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/symfile-mem.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile-mem.c	2009-08-03 16:03:17.000000000 +0200
 @@ -56,6 +56,14 @@
  #include "elf/common.h"
  
@@ -53,11 +53,11 @@ Index: gdb-6.8.50.20090226/gdb/symfile-m
    if (nbfd == NULL)
      error (_("Failed to read a valid object file image from memory."));
  
-Index: gdb-6.8.50.20090226/gdb/target.c
+Index: gdb-6.8.50.20090803/gdb/target.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/target.c	2009-02-27 00:04:32.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/target.c	2009-02-28 07:22:09.000000000 +0100
-@@ -57,7 +57,7 @@ static int nosymbol (char *, CORE_ADDR *
+--- gdb-6.8.50.20090803.orig/gdb/target.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/target.c	2009-08-03 16:03:17.000000000 +0200
+@@ -59,7 +59,7 @@ static int nosymbol (char *, CORE_ADDR *
  
  static void tcomplain (void) ATTR_NORETURN;
  
@@ -66,16 +66,16 @@ Index: gdb-6.8.50.20090226/gdb/target.c
  
  static int return_zero (void);
  
-@@ -286,7 +286,7 @@ target_create_inferior (char *exec_file,
+@@ -452,7 +452,7 @@ target_terminal_inferior (void)
+   (*current_target.to_terminal_inferior) ();
  }
  
- 
 -static int
 +static LONGEST
  nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write,
  	  struct target_ops *t)
  {
-@@ -507,7 +507,7 @@ update_current_target (void)
+@@ -670,7 +670,7 @@ update_current_target (void)
  	    (void (*) (struct regcache *))
  	    noprocess);
    de_fault (deprecated_xfer_memory,
@@ -84,25 +84,25 @@ Index: gdb-6.8.50.20090226/gdb/target.c
  	    nomemory);
    de_fault (to_files_info,
  	    (void (*) (struct target_ops *))
-@@ -1237,7 +1237,7 @@ target_xfer_partial (struct target_ops *
+@@ -1381,7 +1381,7 @@ target_xfer_partial (struct target_ops *
     it makes no progress, and then return how much was transferred). */
  
  int
 -target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
 +target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len)
  {
-   if (target_read (&current_target, TARGET_OBJECT_MEMORY, NULL,
- 		   myaddr, memaddr, len) == len)
-@@ -1247,7 +1247,7 @@ target_read_memory (CORE_ADDR memaddr, g
+   /* Dispatch to the topmost target, not the flattened current_target.
+      Memory accesses check target->to_has_(all_)memory, and the
+@@ -1394,7 +1394,7 @@ target_read_memory (CORE_ADDR memaddr, g
  }
  
  int
 -target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
 +target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, LONGEST len)
  {
-   if (target_write (&current_target, TARGET_OBJECT_MEMORY, NULL,
- 		    myaddr, memaddr, len) == len)
-@@ -2777,8 +2777,8 @@ debug_to_prepare_to_store (struct regcac
+   /* Dispatch to the topmost target, not the flattened current_target.
+      Memory accesses check target->to_has_(all_)memory, and the
+@@ -2861,8 +2861,8 @@ debug_to_prepare_to_store (struct regcac
    fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
  }
  
@@ -113,22 +113,22 @@ Index: gdb-6.8.50.20090226/gdb/target.c
  			      int write, struct mem_attrib *attrib,
  			      struct target_ops *target)
  {
-@@ -2788,8 +2788,8 @@ deprecated_debug_xfer_memory (CORE_ADDR 
+@@ -2872,8 +2872,8 @@ deprecated_debug_xfer_memory (CORE_ADDR 
  						attrib, target);
  
    fprintf_unfiltered (gdb_stdlog,
 -		      "target_xfer_memory (%s, xxx, %d, %s, xxx) = %d",
--		      paddress (memaddr), len, write ? "write" : "read",
+-		      paddress (target_gdbarch, memaddr), len,
 +		      "target_xfer_memory (%s, xxx, %ld, %s, xxx) = %d",
-+		      paddress (memaddr), (long) len, write ? "write" : "read",
-                       retval);
++		      paddress (target_gdbarch, memaddr), (long) len,
+ 		      write ? "write" : "read", retval);
  
    if (retval > 0)
-Index: gdb-6.8.50.20090226/gdb/target.h
+Index: gdb-6.8.50.20090803/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/target.h	2009-02-27 00:04:32.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/target.h	2009-02-28 07:22:09.000000000 +0100
-@@ -376,10 +376,10 @@ struct target_ops
+--- gdb-6.8.50.20090803.orig/gdb/target.h	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/target.h	2009-08-03 16:03:17.000000000 +0200
+@@ -363,10 +363,10 @@ struct target_ops
         NOTE: cagney/2004-10-01: This has been entirely superseeded by
         to_xfer_partial and inferior inheritance.  */
  
@@ -142,30 +142,24 @@ Index: gdb-6.8.50.20090226/gdb/target.h
 +				       struct target_ops *target);
  
      void (*to_files_info) (struct target_ops *);
-     int (*to_insert_breakpoint) (struct bp_target_info *);
-@@ -679,13 +679,14 @@ extern DCACHE *target_dcache;
+     int (*to_insert_breakpoint) (struct gdbarch *, struct bp_target_info *);
+@@ -675,10 +675,10 @@ extern DCACHE *target_dcache;
  
  extern int target_read_string (CORE_ADDR, char **, int, int *);
  
 -extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
-+extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
-+			       LONGEST len);
++extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len);
  
  extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
 -				int len);
 +				LONGEST len);
  
--extern int xfer_memory (CORE_ADDR, gdb_byte *, int, int,
--			struct mem_attrib *, struct target_ops *);
-+extern LONGEST xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int,
-+			    struct mem_attrib *, struct target_ops *);
- 
  /* Fetches the target's memory map.  If one is found it is sorted
     and returned, after some consistency checking.  Otherwise, NULL
-Index: gdb-6.8.50.20090226/gdb/dcache.c
+Index: gdb-6.8.50.20090803/gdb/dcache.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/dcache.c	2009-01-03 06:57:51.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/dcache.c	2009-02-28 07:22:09.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/dcache.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/dcache.c	2009-08-03 16:03:17.000000000 +0200
 @@ -524,9 +524,9 @@ dcache_free (DCACHE *dcache)
  
     This routine is indended to be called by remote_xfer_ functions. */
@@ -178,10 +172,10 @@ Index: gdb-6.8.50.20090226/gdb/dcache.c
  {
    int i;
    int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr);
-Index: gdb-6.8.50.20090226/gdb/dcache.h
+Index: gdb-6.8.50.20090803/gdb/dcache.h
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/dcache.h	2009-01-03 06:57:51.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/dcache.h	2009-02-28 07:22:09.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/dcache.h	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/dcache.h	2009-08-03 16:03:17.000000000 +0200
 @@ -35,7 +35,7 @@ void dcache_free (DCACHE *);
  
  /* Simple to call from <remote>_xfer_memory */
@@ -192,26 +186,24 @@ Index: gdb-6.8.50.20090226/gdb/dcache.h
 +			    LONGEST len, int should_write);
  
  #endif /* DCACHE_H */
-Index: gdb-6.8.50.20090226/gdb/exec.c
+Index: gdb-6.8.50.20090803/gdb/exec.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/exec.c	2009-02-22 20:35:47.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/exec.c	2009-02-28 07:22:09.000000000 +0100
-@@ -464,8 +464,8 @@ map_vmap (bfd *abfd, bfd *arch)
-    The same routine is used to handle both core and exec files;
-    we just tail-call it with more arguments to select between them.  */
+--- gdb-6.8.50.20090803.orig/gdb/exec.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/exec.c	2009-08-03 16:03:17.000000000 +0200
+@@ -560,7 +560,7 @@ map_vmap (bfd *abfd, bfd *arch)
+ }
+ 
  
 -int
--xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
 +LONGEST
-+xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write,
- 	     struct mem_attrib *attrib, struct target_ops *target)
- {
-   int res;
-Index: gdb-6.8.50.20090226/gdb/linux-nat.c
+ section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf,
+ 				   ULONGEST offset, LONGEST len,
+ 				   struct target_section *sections,
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/linux-nat.c	2009-02-28 07:22:02.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/linux-nat.c	2009-02-28 07:22:32.000000000 +0100
-@@ -4407,7 +4407,7 @@ linux_xfer_partial (struct target_ops *o
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-03 16:03:17.000000000 +0200
+@@ -4516,7 +4516,7 @@ linux_xfer_partial (struct target_ops *o
  #endif
        if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL)
  	{ /* This region contains ia64 rse registers, we have to re-read.  */
@@ -220,10 +212,10 @@ Index: gdb-6.8.50.20090226/gdb/linux-nat
  
  	  /* Re-read register stack area.  */
  	  xxfer = super_xfer_partial (ops, object, annex,
-Index: gdb-6.8.50.20090226/gdb/remote.c
+Index: gdb-6.8.50.20090803/gdb/remote.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/remote.c	2009-02-25 03:14:22.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/remote.c	2009-02-28 07:22:09.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/remote.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/remote.c	2009-08-03 16:03:17.000000000 +0200
 @@ -25,6 +25,7 @@
  #include "gdb_string.h"
  #include <ctype.h>
@@ -232,7 +224,7 @@ Index: gdb-6.8.50.20090226/gdb/remote.c
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
-@@ -5683,12 +5684,19 @@ handle_notification (char *buf, size_t l
+@@ -5785,12 +5786,19 @@ handle_notification (char *buf, size_t l
     if SHOULD_WRITE is nonzero.  Returns length of data written or
     read; 0 for error.  TARGET is unused.  */
  
@@ -254,7 +246,7 @@ Index: gdb-6.8.50.20090226/gdb/remote.c
  
    set_general_thread (inferior_ptid);
  
-@@ -5697,7 +5705,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
+@@ -5799,7 +5807,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
    else
      res = remote_read_bytes (mem_addr, buffer, mem_len);
  
@@ -263,11 +255,11 @@ Index: gdb-6.8.50.20090226/gdb/remote.c
  }
  
  /* Sends a packet with content determined by the printf format string
-Index: gdb-6.8.50.20090226/gdb/remote-sim.c
+Index: gdb-6.8.50.20090803/gdb/remote-sim.c
 ===================================================================
---- gdb-6.8.50.20090226.orig/gdb/remote-sim.c	2009-02-23 19:31:23.000000000 +0100
-+++ gdb-6.8.50.20090226/gdb/remote-sim.c	2009-02-28 07:22:09.000000000 +0100
-@@ -754,11 +754,14 @@ gdbsim_prepare_to_store (struct regcache
+--- gdb-6.8.50.20090803.orig/gdb/remote-sim.c	2009-08-03 16:03:00.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/remote-sim.c	2009-08-03 16:03:17.000000000 +0200
+@@ -752,11 +752,14 @@ gdbsim_prepare_to_store (struct regcache
  
     Returns the number of bytes transferred. */
  
@@ -284,33 +276,16 @@ Index: gdb-6.8.50.20090226/gdb/remote-si
    /* If no program is running yet, then ignore the simulator for
       memory.  Pass the request down to the next target, hopefully
       an exec file.  */
-@@ -774,22 +777,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m
-       printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x");
-       gdb_print_host_address (myaddr, gdb_stdout);
-       printf_filtered (", memaddr 0x%s, len %d, write %d\n",
--		       paddr_nz (memaddr), len, write);
-+		       paddr_nz (memaddr), xfer_len, write);
-       if (remote_debug && write)
--	dump_mem (myaddr, len);
-+	dump_mem (myaddr, xfer_len);
-     }
- 
-   if (write)
-     {
--      len = sim_write (gdbsim_desc, memaddr, myaddr, len);
-+      xfer_len = sim_write (gdbsim_desc, memaddr, myaddr, xfer_len);
-     }
-   else
-     {
--      len = sim_read (gdbsim_desc, memaddr, myaddr, len);
--      if (remote_debug && len > 0)
--	dump_mem (myaddr, len);
-+      xfer_len = sim_read (gdbsim_desc, memaddr, myaddr, xfer_len);
-+      if (remote_debug && xfer_len > 0)
-+	dump_mem (myaddr, xfer_len);
-     }
--  return len;
-+  return (LONGEST)xfer_len;
- }
- 
- static void
+Index: gdb-6.8.50.20090803/gdb/exec.h
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/exec.h	2009-06-12 20:38:36.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/exec.h	2009-08-03 16:03:57.000000000 +0200
+@@ -56,7 +56,7 @@ extern int resize_section_table (struct 
+ 
+    One, and only one, of readbuf or writebuf must be non-NULL.  */
+ 
+-extern int section_table_xfer_memory_partial (gdb_byte *, const gdb_byte *,
++extern LONGEST section_table_xfer_memory_partial (gdb_byte *, const gdb_byte *,
+ 					      ULONGEST, LONGEST,
+ 					      struct target_section *,
+ 					      struct target_section *,

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infrun.c      |    4 
 objfiles.c    |   14 +
 solib-svr4.c  |  474 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |  107 ++++++++++---
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 14 files changed, 629 insertions(+), 116 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gdb-6.3-pie-20050110.patch	15 Jun 2009 12:53:17 -0000	1.16
+++ gdb-6.3-pie-20050110.patch	4 Aug 2009 05:37:27 -0000	1.17
@@ -26,10 +26,10 @@
 
 	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
 
-Index: gdb-6.8.50.20090302/gdb/amd64-tdep.c
+Index: gdb-6.8.50.20090803/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/amd64-tdep.c	2009-05-10 21:36:29.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/amd64-tdep.c	2009-05-10 21:41:23.000000000 +0200
+--- gdb-6.8.50.20090803.orig/gdb/amd64-tdep.c	2009-08-03 21:39:38.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/amd64-tdep.c	2009-08-03 21:39:39.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -38,15 +38,17 @@ Index: gdb-6.8.50.20090302/gdb/amd64-tde
  
  #include "gdb_assert.h"
  
-@@ -1586,16 +1587,28 @@ amd64_analyze_stack_align (CORE_ADDR pc,
+@@ -1591,18 +1592,31 @@ amd64_analyze_stack_align (CORE_ADDR pc,
     Any function that doesn't start with this sequence will be assumed
     to have no prologue and thus no valid frame pointer in %rbp.  */
  
 -static CORE_ADDR
--amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
+-amd64_analyze_prologue (struct gdbarch *gdbarch,
+-			CORE_ADDR pc, CORE_ADDR current_pc,
 -			struct amd64_frame_cache *cache)
 +struct amd64_analyze_prologue_data
 +  {
++    struct gdbarch *gdbarch;
 +    CORE_ADDR pc, current_pc;
 +    struct amd64_frame_cache *cache;
 +    CORE_ADDR retval;
@@ -56,8 +58,10 @@ Index: gdb-6.8.50.20090302/gdb/amd64-tde
 +amd64_analyze_prologue_1 (void *data_pointer)
  {
 +  struct amd64_analyze_prologue_data *data = data_pointer;
++  struct gdbarch *gdbarch = data->gdbarch;
 +  CORE_ADDR pc = data->pc, current_pc = data->current_pc;
 +  struct amd64_frame_cache *cache = data->cache;
+   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
    static gdb_byte proto[3] = { 0x48, 0x89, 0xe5 }; /* movq %rsp, %rbp */
    gdb_byte buf[3];
    gdb_byte op;
@@ -71,7 +75,7 @@ Index: gdb-6.8.50.20090302/gdb/amd64-tde
  
    pc = amd64_analyze_stack_align (pc, current_pc, cache);
  
-@@ -1610,18 +1623,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO
+@@ -1617,18 +1631,59 @@ amd64_analyze_prologue (struct gdbarch *
  
        /* If that's all, return now.  */
        if (current_pc <= pc + 1)
@@ -107,7 +111,8 @@ Index: gdb-6.8.50.20090302/gdb/amd64-tde
 +   ->find_function_start_sal  */
 +
 +static CORE_ADDR
-+amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
++amd64_analyze_prologue (struct gdbarch *gdbarch,
++			CORE_ADDR pc, CORE_ADDR current_pc,
 +			struct amd64_frame_cache *cache)
 +{
 +  int status;
@@ -118,6 +123,7 @@ Index: gdb-6.8.50.20090302/gdb/amd64-tde
 +  saved_gdb_stderr = gdb_stderr;
 +  gdb_stderr = ui_file_new ();
 +
++  data.gdbarch = gdbarch;
 +  data.pc = pc;
 +  data.current_pc = current_pc;
 +  data.cache = cache;
@@ -132,11 +138,11 @@ Index: gdb-6.8.50.20090302/gdb/amd64-tde
    return pc;
  }
  
-Index: gdb-6.8.50.20090302/gdb/auxv.c
+Index: gdb-6.8.50.20090803/gdb/auxv.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/auxv.c	2009-05-10 21:36:27.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/auxv.c	2009-05-10 21:41:23.000000000 +0200
-@@ -81,7 +81,7 @@ procfs_xfer_auxv (struct target_ops *ops
+--- gdb-6.8.50.20090803.orig/gdb/auxv.c	2009-08-03 21:39:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/auxv.c	2009-08-03 21:39:39.000000000 +0200
+@@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
  default_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
@@ -145,7 +151,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
  {
    const int sizeof_auxv_field = gdbarch_ptr_bit (target_gdbarch)
  				/ TARGET_CHAR_BIT;
-@@ -108,7 +108,7 @@ default_auxv_parse (struct target_ops *o
+@@ -106,7 +106,7 @@ default_auxv_parse (struct target_ops *o
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  int
  target_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
@@ -154,7 +160,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
  {
    struct target_ops *t;
    for (t = ops; t != NULL; t = t->beneath)
-@@ -123,9 +123,10 @@ target_auxv_parse (struct target_ops *op
+@@ -121,9 +121,10 @@ target_auxv_parse (struct target_ops *op
     an error getting the information.  On success, return 1 after
     storing the entry's value field in *VALP.  */
  int
@@ -167,7 +173,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
    gdb_byte *data;
    LONGEST n = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL, &data);
    gdb_byte *ptr = data;
-@@ -135,10 +136,10 @@ target_auxv_search (struct target_ops *o
+@@ -133,10 +134,10 @@ target_auxv_search (struct target_ops *o
      return n;
  
    while (1)
@@ -180,7 +186,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
  	  {
  	    xfree (data);
  	    *valp = val;
-@@ -161,7 +162,8 @@ target_auxv_search (struct target_ops *o
+@@ -159,7 +160,8 @@ target_auxv_search (struct target_ops *o
  int
  fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
  {
@@ -190,7 +196,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
    gdb_byte *data;
    LONGEST len = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL,
  				   &data);
-@@ -171,13 +173,13 @@ fprint_target_auxv (struct ui_file *file
+@@ -169,13 +171,13 @@ fprint_target_auxv (struct ui_file *file
    if (len <= 0)
      return len;
  
@@ -206,7 +212,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
  	{
  #define TAG(tag, text, kind) \
  	case tag: name = #tag; description = text; flavor = kind; break
-@@ -233,7 +235,7 @@ fprint_target_auxv (struct ui_file *file
+@@ -231,7 +233,7 @@ fprint_target_auxv (struct ui_file *file
  	}
  
        fprintf_filtered (file, "%-4s %-20s %-30s ",
@@ -215,7 +221,7 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
        switch (flavor)
  	{
  	case dec:
-@@ -255,7 +257,7 @@ fprint_target_auxv (struct ui_file *file
+@@ -253,7 +255,7 @@ fprint_target_auxv (struct ui_file *file
  	  break;
  	}
        ++ents;
@@ -224,11 +230,11 @@ Index: gdb-6.8.50.20090302/gdb/auxv.c
  	break;
      }
  
-Index: gdb-6.8.50.20090302/gdb/auxv.h
+Index: gdb-6.8.50.20090803/gdb/auxv.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/auxv.h	2009-01-03 06:57:50.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/auxv.h	2009-05-10 21:41:23.000000000 +0200
-@@ -36,14 +36,14 @@ struct target_ops;		/* Forward declarati
+--- gdb-6.8.50.20090803.orig/gdb/auxv.h	2009-08-03 21:39:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/auxv.h	2009-08-03 21:39:39.000000000 +0200
+@@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
  			      gdb_byte **readptr, gdb_byte *endptr,
@@ -245,123 +251,24 @@ Index: gdb-6.8.50.20090302/gdb/auxv.h
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
-Index: gdb-6.8.50.20090302/gdb/breakpoint.c
+Index: gdb-6.8.50.20090803/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/breakpoint.c	2009-05-10 21:36:30.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/breakpoint.c	2009-05-10 21:41:23.000000000 +0200
-@@ -3920,7 +3920,8 @@ describe_other_breakpoints (CORE_ADDR pc
- 	      printf_filtered (" (thread %d)", b->thread);
- 	    printf_filtered ("%s%s ",
- 			     ((b->enable_state == bp_disabled || 
--			       b->enable_state == bp_call_disabled) 
-+			       b->enable_state == bp_call_disabled ||
-+			       b->enable_state == bp_startup_disabled)
- 			      ? " (disabled)"
- 			      : b->enable_state == bp_permanent 
- 			      ? " (permanent)"
-@@ -5009,6 +5010,61 @@ create_catchpoint (int tempflag, char *c
-   return b;
- }
- 
-+void
-+disable_breakpoints_at_startup (int silent)
-+{
-+  struct breakpoint *b;
-+  int disabled_startup_breaks = 0;
-+
-+  if (bfd_get_start_address (exec_bfd) != entry_point_address ())
-+    {
-+      ALL_BREAKPOINTS (b)
-+	{
-+	  if (((b->type == bp_breakpoint) ||
-+	       (b->type == bp_hardware_breakpoint)) &&
-+	      b->enable_state == bp_enabled &&
-+	      b->loc != NULL && !b->loc->duplicate)
-+	    {
-+	      b->enable_state = bp_startup_disabled;
-+	      if (!silent)
-+		{
-+		  if (!disabled_startup_breaks)
-+		    {
-+		      target_terminal_ours_for_output ();
-+		      warning ("Temporarily disabling breakpoints:");
-+		    }
-+		  disabled_startup_breaks = 1;
-+		  warning ("breakpoint #%d addr 0x%s", b->number, paddr_nz(b->loc->address));
-+		}
-+	    }
-+	}
-+    }
-+}
-+
-+/* Try to reenable any breakpoints after startup.  */
-+void
-+re_enable_breakpoints_at_startup (void)
-+{
-+  struct breakpoint *b;
-+
-+  if (bfd_get_start_address (exec_bfd) != entry_point_address ())
-+    {
-+      ALL_BREAKPOINTS (b)
-+	if (b->enable_state == bp_startup_disabled)
-+	  {
-+	    char buf[1];
-+
-+	    /* Do not reenable the breakpoint if the shared library
-+	       is still not mapped in.  */
-+	    if (target_read_memory (b->loc->address, buf, 1) == 0)
-+	      {
-+		/*printf ("enabling breakpoint at 0x%s\n", paddr_nz(b->loc->address));*/
-+		b->enable_state = bp_enabled;
-+	      }
-+	  }
-+    }
-+}
-+
- static void
- create_fork_vfork_event_catchpoint (int tempflag, char *cond_string,
-                                     struct breakpoint_ops *ops)
-Index: gdb-6.8.50.20090302/gdb/breakpoint.h
-===================================================================
---- gdb-6.8.50.20090302.orig/gdb/breakpoint.h	2009-05-10 21:36:27.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/breakpoint.h	2009-05-10 21:41:23.000000000 +0200
-@@ -127,6 +127,7 @@ enum enable_state
- 			   automatically enabled and reset when the call 
- 			   "lands" (either completes, or stops at another 
- 			   eventpoint). */
-+    bp_startup_disabled,
-     bp_permanent	/* There is a breakpoint instruction hard-wired into
- 			   the target's code.  Don't try to write another
- 			   breakpoint instruction on top of it, or restore
-@@ -847,6 +848,10 @@ extern void remove_thread_event_breakpoi
- 
- extern void disable_breakpoints_in_shlibs (void);
- 
-+extern void disable_breakpoints_at_startup (int silent);
-+
-+extern void re_enable_breakpoints_at_startup (void);
-+
- /* This function returns TRUE if ep is a catchpoint. */
- extern int ep_is_catchpoint (struct breakpoint *);
- 
-Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
-===================================================================
---- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-05-10 21:36:30.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-05-10 21:41:23.000000000 +0200
-@@ -1438,7 +1438,7 @@ dwarf2_build_psymtabs (struct objfile *o
-   else
-     dwarf2_per_objfile->loc_buffer = NULL;
+--- gdb-6.8.50.20090803.orig/gdb/dwarf2read.c	2009-08-03 21:39:39.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/dwarf2read.c	2009-08-03 21:39:39.000000000 +0200
+@@ -1659,7 +1659,7 @@ dwarf2_build_psymtabs (struct objfile *o
+   dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
+   dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
  
 -  if (mainline
 +  if ((mainline == 1)
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
-Index: gdb-6.8.50.20090302/gdb/elfread.c
+Index: gdb-6.8.50.20090803/gdb/elfread.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/elfread.c	2009-05-10 21:36:27.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/elfread.c	2009-05-10 21:41:23.000000000 +0200
-@@ -680,7 +680,7 @@ elf_symfile_read (struct objfile *objfil
+--- gdb-6.8.50.20090803.orig/gdb/elfread.c	2009-08-03 21:39:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/elfread.c	2009-08-03 21:39:39.000000000 +0200
+@@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
       functions do not all also re-initialize the psymbol table. */
@@ -370,29 +277,28 @@ Index: gdb-6.8.50.20090302/gdb/elfread.c
      {
        init_psymbol_list (objfile, 0);
        mainline = 0;
-Index: gdb-6.8.50.20090302/gdb/infrun.c
+Index: gdb-6.8.50.20090803/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infrun.c	2009-05-10 21:36:30.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/infrun.c	2009-05-10 21:41:23.000000000 +0200
-@@ -3354,6 +3354,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
+--- gdb-6.8.50.20090803.orig/gdb/infrun.c	2009-08-03 21:39:38.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/infrun.c	2009-08-04 06:04:25.000000000 +0200
+@@ -3531,6 +3531,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
  
 +	  /* For PIE executables, we dont really know where the
-+	     breakpoints are going to be until we start up the
-+	     inferior.  */
-+          re_enable_breakpoints_at_startup ();
++	     breakpoints are going to be until we start up the inferior.  */
++	  enable_breakpoints_after_startup ();
 +
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-Index: gdb-6.8.50.20090302/gdb/objfiles.c
+Index: gdb-6.8.50.20090803/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/objfiles.c	2009-05-10 21:36:42.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/objfiles.c	2009-05-10 21:41:36.000000000 +0200
+--- gdb-6.8.50.20090803.orig/gdb/objfiles.c	2009-08-03 21:39:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/objfiles.c	2009-08-03 21:39:39.000000000 +0200
 @@ -52,6 +52,9 @@
  #include "exec.h"
- #include "varobj.h"
+ #include "observer.h"
  
 +#include "auxv.h"
 +#include "elf/common.h"
@@ -400,30 +306,27 @@ Index: gdb-6.8.50.20090302/gdb/objfiles.
  /* Prototypes for local functions */
  
  static void objfile_alloc_data (struct objfile *objfile);
-@@ -272,7 +275,19 @@ init_entry_point_info (struct objfile *o
+@@ -279,9 +282,17 @@ init_entry_point_info (struct objfile *o
  CORE_ADDR
  entry_point_address (void)
  {
--  return symfile_objfile ? symfile_objfile->ei.entry_point : 0;
 +  int ret;
-+  CORE_ADDR entry_addr;
 +
+   struct gdbarch *gdbarch;
+   CORE_ADDR entry_point;
+ 
 +  /* Find the address of the entry point of the program from the
 +     auxv vector.  */
-+  ret = target_auxv_search (&current_target, AT_ENTRY, &entry_addr);
++  ret = target_auxv_search (&current_target, AT_ENTRY, &entry_point);
 +  if (ret == 1)
-+     return entry_addr;                                                                              
-+  /*if (ret == 0 || ret == -1)*/
-+  else
-+    {
-+      return symfile_objfile ? symfile_objfile->ei.entry_point : 0;
-+    }
- }
++     return entry_point;                                                                              
++
+   if (symfile_objfile == NULL)
+     return 0;
  
- /* Create the terminating entry of OBJFILE's minimal symbol table.
-@@ -445,6 +460,9 @@ free_objfile (struct objfile *objfile)
-   if (objfile == rt_common_objfile)
-     rt_common_objfile = NULL;
+@@ -475,6 +486,9 @@ free_objfile (struct objfile *objfile)
+   if (objfile == symfile_objfile)
+     symfile_objfile = NULL;
  
 +  if (objfile == symfile_objfile)
 +    symfile_objfile = NULL;
@@ -431,11 +334,11 @@ Index: gdb-6.8.50.20090302/gdb/objfiles.
    /* Before the symbol table code was redone to make it easier to
       selectively load and remove information particular to a specific
       linkage unit, gdb used to do these things whenever the monolithic
-Index: gdb-6.8.50.20090302/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090803/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/solib-svr4.c	2009-05-10 21:36:29.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/solib-svr4.c	2009-05-10 21:41:23.000000000 +0200
-@@ -45,6 +45,7 @@
+--- gdb-6.8.50.20090803.orig/gdb/solib-svr4.c	2009-08-03 21:39:38.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/solib-svr4.c	2009-08-03 21:41:49.000000000 +0200
+@@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
  #include "exceptions.h"
@@ -443,7 +346,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
  static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
  static int svr4_have_link_map_offsets (void);
-@@ -287,7 +288,9 @@ static CORE_ADDR main_lm_addr;
+@@ -359,7 +360,9 @@ solib_svr4_inferior_exit (int pid)
  
  /* Local function prototypes */
  
@@ -453,7 +356,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
  static CORE_ADDR bfd_lookup_symbol (bfd *, char *);
  
-@@ -521,10 +524,12 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -600,10 +603,12 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
    int arch_size, step, sect_size;
    long dyn_tag;
    CORE_ADDR dyn_ptr, dyn_addr;
@@ -466,9 +369,9 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
    if (abfd == NULL)
      return 0;
-@@ -532,19 +537,81 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -615,19 +620,81 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
    if (arch_size == -1)
-    return 0;
+     return 0;
  
 +  /* The auxv vector based relocatable files reading is limited to the main
 +     executable.  */
@@ -489,21 +392,21 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +
 +	  if (debug_solib)
 +	    fprintf_unfiltered (gdb_stdlog,
-+				"elf_locate_base: program entry address not found. Using bfd's 0x%s for %s\n",
-+				paddr_nz (entry_addr), exec_bfd->filename);
++				"elf_locate_base: program entry address not found. Using bfd's %s for %s\n",
++				paddress (target_gdbarch, entry_addr), exec_bfd->filename);
 +	}
 +      else
 +	{
 +	  if (debug_solib)
 +	    fprintf_unfiltered (gdb_stdlog,
-+				"elf_locate_base: found program entry address 0x%s for %s\n",
-+				paddr_nz (entry_addr), exec_bfd->filename);
++				"elf_locate_base: found program entry address %s for %s\n",
++				paddress (target_gdbarch, entry_addr), exec_bfd->filename);
 +	}
 +      reloc_addr = entry_addr - bfd_get_start_address (exec_bfd);
 +      if (debug_solib)
 +	fprintf_unfiltered (gdb_stdlog,
-+			    "elf_locate_base: expected relocation offset 0x%s for %s\n",
-+			    paddr_nz (reloc_addr), exec_bfd->filename);
++			    "elf_locate_base: expected relocation offset %s for %s\n",
++			    paddress (target_gdbarch, reloc_addr), exec_bfd->filename);
 +    }
 +
    /* Find the start address of the .dynamic section.  */
@@ -528,8 +431,8 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
    dyn_addr = bfd_section_vma (abfd, sect);
 +  if (debug_solib)
 +    fprintf_unfiltered (gdb_stdlog,
-+			"elf_locate_base: .dynamic addr 0x%s\n",
-+			paddr_nz (dyn_addr));
++			"elf_locate_base: .dynamic addr %s\n",
++			paddress (target_gdbarch, dyn_addr));
  
    /* Read in .dynamic from the BFD.  We will get the actual value
       from memory later.  */
@@ -550,7 +453,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
    /* Iterate over BUF and scan for DYNTAG.  If found, set PTR and return.  */
    step = (arch_size == 32) ? sizeof (Elf32_External_Dyn)
-@@ -565,26 +632,105 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -648,26 +715,105 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
  	dyn_tag = bfd_h_get_64 (abfd, (bfd_byte *) x_dynp_64->d_tag);
  	dyn_ptr = bfd_h_get_64 (abfd, (bfd_byte *) x_dynp_64->d_un.d_ptr);
        }
@@ -573,7 +476,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +		  fprintf_unfiltered (gdb_stdlog,
 +				      "elf_locate_base: tag at offset 0x%lx does not match,"
 +				      " dropping relocation offset %s\n",
-+				      (unsigned long) (buf - bufstart), paddr_nz (reloc_addr));
++				      (unsigned long) (buf - bufstart), paddress (target_gdbarch, reloc_addr));
 +		reloc_addr = 0;
 +	      }
 +	  }
@@ -583,7 +486,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +	      fprintf_unfiltered (gdb_stdlog,
 +				  "elf_locate_base: tag at offset 0x%lx is not readable,"
 +				  " dropping relocation offset %s\n",
-+				  (unsigned long) (buf - bufstart), paddr_nz (reloc_addr));
++				  (unsigned long) (buf - bufstart), paddress (target_gdbarch, reloc_addr));
 +	    reloc_addr = 0;
 +	  }
 +      }
@@ -623,14 +526,14 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +	      {
 +		if (debug_solib)
 +		  fprintf_unfiltered (gdb_stdlog,
-+				      "elf_locate_base: unrelocated ptr addr 0x%s\n",
-+				      paddr_nz (ptr_addr));
++				      "elf_locate_base: unrelocated ptr addr %s\n",
++				      paddress (target_gdbarch, ptr_addr));
 +		ptr_addr += reloc_addr;
 +		if (debug_solib) 
 +		  fprintf_unfiltered (gdb_stdlog, 
-+				      "elf_locate_base: relocated ptr addr 0x%s"
++				      "elf_locate_base: relocated ptr addr %s"
 +				      " (relocation offset %s) for %s\n",
-+				      paddr_nz (ptr_addr), paddr_nz (reloc_addr),
++				      paddress (target_gdbarch, ptr_addr), paddress (target_gdbarch, reloc_addr),
 +				      exec_bfd->filename);
 +	      }
 +	    got = target_read_memory (ptr_addr, ptr_buf, arch_size / 8);
@@ -639,9 +542,9 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +		ptr_addr -= reloc_addr;
 +		if (debug_solib) 
 +		  fprintf_unfiltered (gdb_stdlog, 
-+				      "elf_locate_base: unrelocated back to ptr addr 0x%s"
++				      "elf_locate_base: unrelocated back to ptr addr %s"
 +				      " as the memory was unreable for %s\n",
-+				      paddr_nz (ptr_addr), exec_bfd->filename);
++				      paddress (target_gdbarch, ptr_addr), exec_bfd->filename);
 +		got = target_read_memory (ptr_addr, ptr_buf, arch_size / 8);
 +	      }
 +
@@ -655,8 +558,8 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +		  {
 +		    if (debug_solib)
 +		      fprintf_unfiltered (gdb_stdlog,
-+					  "elf_locate_base: Tag entry has value 0x%s -- return now\n",
-+					  paddr_nz (dyn_ptr));
++					  "elf_locate_base: Tag entry has value %s -- return now\n",
++					  paddress (target_gdbarch, dyn_ptr));
 +		  }
 +	      }
 +	    else
@@ -675,33 +578,22 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
    }
  
    return 0;
-@@ -774,6 +920,10 @@ solib_svr4_r_map (void)
-   struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
-   struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
- 
-+  if (debug_solib)
-+    fprintf_unfiltered (gdb_stdlog, 
-+                        "solib_svr4_r_map: read at 0x%s\n",
-+                        paddr_nz (debug_base + lmo->r_map_offset));
-   return read_memory_typed_address (debug_base + lmo->r_map_offset, ptr_type);
- }
- 
-@@ -945,6 +1095,11 @@ svr4_current_sos (void)
-   struct so_list *head = 0;
-   struct so_list **link_ptr = &head;
+@@ -1040,6 +1186,11 @@ svr4_current_sos (void)
    CORE_ADDR ldsomap = 0;
+   struct inferior *inf;
+   struct svr4_info *info;
 +  const char *filename = exec_bfd ? exec_bfd->filename : "<none>";
 +
 +  if (debug_solib)
 +    fprintf_unfiltered (gdb_stdlog, 
 +                        "svr4_current_sos: exec_bfd %s\n", filename);
  
-   /* Always locate the debug struct, in case it has moved.  */
-   debug_base = 0;
-@@ -953,10 +1108,19 @@ svr4_current_sos (void)
+   if (ptid_equal (inferior_ptid, null_ptid))
+     return NULL;
+@@ -1054,7 +1205,13 @@ svr4_current_sos (void)
    /* If we can't find the dynamic linker's base structure, this
       must not be a dynamically linked executable.  Hmm.  */
-   if (! debug_base)
+   if (! info->debug_base)
 -    return svr4_default_sos ();
 +    {
 +      if (debug_solib)
@@ -713,19 +605,13 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
    /* Walk the inferior's link map list, and build our list of
       `struct so_list' nodes.  */
-+  if (debug_solib)
-+    fprintf_unfiltered (gdb_stdlog, 
-+			"svr4_current_sos: walk link map in %s\n", filename);
-   lm = solib_svr4_r_map ();
- 
-   while (lm)
-@@ -973,26 +1137,104 @@ svr4_current_sos (void)
+@@ -1074,26 +1231,104 @@ svr4_current_sos (void)
        new->lm_info->lm = xzalloc (lmo->link_map_size);
        make_cleanup (xfree, new->lm_info->lm);
  
 +      if (debug_solib)
 +        fprintf_unfiltered (gdb_stdlog, 
-+                            "svr4_current_sos: read lm at 0x%s\n", paddr_nz(lm));
++                            "svr4_current_sos: read lm at %s\n", paddress (target_gdbarch, lm));
        read_memory (lm, new->lm_info->lm, lmo->link_map_size);
  
        lm = LM_NEXT (new);
@@ -743,7 +629,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 -      if (IGNORE_FIRST_LINK_MAP_ENTRY (new) && ldsomap == 0)
 +      if (exec_bfd != NULL && IGNORE_FIRST_LINK_MAP_ENTRY (new) && ldsomap == 0)
  	{
--	  main_lm_addr = new->lm_info->lm_addr;
+-	  info->main_lm_addr = new->lm_info->lm_addr;
 -	  free_so (new);
 -	}
 +          /* It is the first link map entry, i.e. it is the main executable.  */
@@ -751,7 +637,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +	  if (bfd_get_start_address (exec_bfd) == entry_point_address ())
 +	    {
 +	      /* Non-pie case, main executable has not been relocated.  */
-+	      main_lm_addr = new->lm_info->lm_addr;
++	      info->main_lm_addr = new->lm_info->lm_addr;
 +	      free_so (new);
 +	    }
 +	  else
@@ -828,7 +714,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  	  target_read_string (LM_NAME (new), &buffer,
  			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
  	  if (errcode != 0)
-@@ -1000,47 +1242,60 @@ svr4_current_sos (void)
+@@ -1101,47 +1336,60 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
  	    {
@@ -922,7 +808,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  	}
  
        /* On Solaris, the dynamic linker is not in the normal list of
-@@ -1056,6 +1311,9 @@ svr4_current_sos (void)
+@@ -1157,6 +1405,9 @@ svr4_current_sos (void)
    if (head == NULL)
      return svr4_default_sos ();
  
@@ -932,7 +818,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
    return head;
  }
  
-@@ -1087,7 +1345,7 @@ svr4_fetch_objfile_link_map (struct objf
+@@ -1189,7 +1440,7 @@ svr4_fetch_objfile_link_map (struct objf
  /* On some systems, the only way to recognize the link map entry for
     the main executable file is by looking at its name.  Return
     non-zero iff SONAME matches one of the known main executable names.  */
@@ -941,7 +827,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  static int
  match_main (char *soname)
  {
-@@ -1101,6 +1359,7 @@ match_main (char *soname)
+@@ -1203,6 +1454,7 @@ match_main (char *soname)
  
    return (0);
  }
@@ -949,7 +835,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
  /* Return 1 if PC lies in the dynamic symbol resolution code of the
     SVR4 run time loader.  */
-@@ -1251,15 +1510,29 @@ enable_break (void)
+@@ -1354,15 +1606,29 @@ enable_break (struct svr4_info *info)
    /* Find the program interpreter; if not found, warn the user and drop
       into the old breakpoint at symbol code.  */
    interp_name = find_program_interpreter ();
@@ -979,7 +865,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
        sym_addr = 0;
  
-@@ -1276,6 +1549,9 @@ enable_break (void)
+@@ -1379,6 +1645,9 @@ enable_break (struct svr4_info *info)
          {
  	  tmp_bfd = solib_bfd_open (interp_name);
  	}
@@ -989,7 +875,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
        if (tmp_bfd == NULL)
  	goto bkpt_at_symbol;
  
-@@ -1329,16 +1605,16 @@ enable_break (void)
+@@ -1436,16 +1705,16 @@ enable_break (struct svr4_info *info)
        interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
        if (interp_sect)
  	{
@@ -1010,29 +896,25 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  	  interp_plt_sect_high =
  	    interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
  	}
-@@ -1373,7 +1649,11 @@ enable_break (void)
+@@ -1480,7 +1749,7 @@ enable_break (struct svr4_info *info)
  
        if (sym_addr != 0)
  	{
--	  create_solib_event_breakpoint (load_addr + sym_addr);
-+	  create_solib_event_breakpoint ((load_addr + sym_addr)
-+					 & load_addr_mask);
-+	  if (debug_solib)
-+	    fprintf_unfiltered (gdb_stdlog,
-+			       "enable_break: solib bp set\n");
+-	  create_solib_event_breakpoint (target_gdbarch, load_addr + sym_addr);
++	  create_solib_event_breakpoint (target_gdbarch, (load_addr + sym_addr) & load_addr_mask);
  	  xfree (interp_name);
  	  return 1;
  	}
-@@ -1639,6 +1919,8 @@ svr4_solib_create_inferior_hook (void)
+@@ -1753,6 +2022,8 @@ svr4_solib_create_inferior_hook (void)
    while (tp->stop_signal != TARGET_SIGNAL_TRAP);
    inf->stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
 +
-+   disable_breakpoints_at_startup (1);
++  disable_breakpoints_before_startup ();
  }
  
  static void
-@@ -1820,6 +2102,75 @@ svr4_lp64_fetch_link_map_offsets (void)
+@@ -1929,6 +2200,76 @@ svr4_lp64_fetch_link_map_offsets (void)
  
    return lmp;
  }
@@ -1040,16 +922,17 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +info_linkmap_command (char *cmd, int from_tty)
 +{
 +  CORE_ADDR lm;
++  struct svr4_info *info = get_svr4_info (PIDGET (inferior_ptid));
 +                                                                                
 +  /* Make sure we've looked up the inferior's dynamic linker's base
 +     structure.  */
-+  if (! debug_base)
++  if (! info->debug_base)
 +    {
-+      debug_base = locate_base ();
++      info->debug_base = locate_base (info);
 +                                                                                
 +      /* If we can't find the dynamic linker's base structure, this
 +         must not be a dynamically linked executable.  Hmm.  */
-+      if (! debug_base)
++      if (! info->debug_base)
 +        {
 +          if (debug_solib)
 +            fprintf_unfiltered (gdb_stdlog,
@@ -1061,7 +944,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +                                                                                
 +  /* Walk the inferior's link map list, and print the info.  */
 + 
-+  lm = solib_svr4_r_map ();
++  lm = solib_svr4_r_map (info);
 +  while (lm)
 +    {
 +      int errcode;
@@ -1084,7 +967,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +
 +      if (debug_solib)
 +        fprintf_unfiltered (gdb_stdlog,
-+                            "svr4_print_linkmap: read lm at 0x%s\n", paddr_nz(lm));
++                            "svr4_print_linkmap: read lm at %s\n", paddress (target_gdbarch, lm));
 +      read_memory (lm, new->lm_info->lm, lmo->link_map_size);
 +
 +      lm = LM_NEXT (new);
@@ -1100,7 +983,7 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
 +	  warning ("svr4_print_linkmap: Can't read pathname for load map: %s\n",
 +		   safe_strerror (errcode));
 +	}
-+      fprintf_filtered (gdb_stdout, "%-8s %-30s\n", paddr(load_addr), buffer);
++      fprintf_filtered (gdb_stdout, "%-8s %-30s\n", paddress (target_gdbarch, load_addr), buffer);
 +      do_cleanups (old_chain);
 +    }
 +}                                                                                
@@ -1108,18 +991,18 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  
  
  struct target_so_ops svr4_so_ops;
-@@ -1859,4 +2210,7 @@ _initialize_svr4_solib (void)
-   svr4_so_ops.in_dynsym_resolve_code = svr4_in_dynsym_resolve_code;
-   svr4_so_ops.lookup_lib_global_symbol = elf_lookup_lib_symbol;
+@@ -1969,4 +2310,7 @@ _initialize_svr4_solib (void)
    svr4_so_ops.same = svr4_same;
+ 
+   observer_attach_inferior_exit (solib_svr4_inferior_exit);
 +
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8.50.20090302/gdb/solib.c
+Index: gdb-6.8.50.20090803/gdb/solib.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/solib.c	2009-02-21 17:14:49.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/solib.c	2009-05-10 21:41:23.000000000 +0200
+--- gdb-6.8.50.20090803.orig/gdb/solib.c	2009-08-03 21:39:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/solib.c	2009-08-04 05:57:36.000000000 +0200
 @@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
@@ -1138,7 +1021,7 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
  /*
  
     GLOBAL FUNCTION
-@@ -426,10 +430,23 @@ free_so (struct so_list *so)
+@@ -428,10 +432,23 @@ free_so (struct so_list *so)
        
    if (so->abfd)
      {
@@ -1166,7 +1049,7 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
      }
  
    if (bfd_filename)
-@@ -460,15 +477,40 @@ symbol_add_stub (void *arg)
+@@ -458,15 +475,40 @@ symbol_add_stub (struct so_list *so, int
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
      {
@@ -1174,7 +1057,7 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
 +      /* Found an already loaded shared library.  */
 +      if (strcmp (so->objfile->name, so->so_name) == 0
 +	  && !so->main)
-+	return 1;
++	return;
 +      /* Found an already loaded main executable.  This could happen in
 +	 two circumstances.
 +	 First case: the main file has already been read in
@@ -1186,31 +1069,31 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
 +      if (strcmp (so->objfile->name, so->so_name) == 0
 +	  && so->main
 +	  && so->main_relocated)
- 	return 1;
+ 	return;
      }
  
    sap = build_section_addr_info_from_section_table (so->sections,
                                                      so->sections_end);
  
--  so->objfile = symbol_file_add_from_bfd (so->abfd, so->from_tty,
--					  sap, 0, OBJF_SHARED | OBJF_KEEPBFD);
+-  so->objfile = symbol_file_add_from_bfd (so->abfd, flags,
+-					  sap, OBJF_SHARED | OBJF_KEEPBFD);
 +  if (so->main)
 +    {
 +      if (debug_solib)
 +        fprintf_unfiltered (gdb_stdlog,
 +			    "symbol_add_stub: adding symbols for main\n");
-+      so->objfile = symbol_file_add_from_bfd (so->abfd, /*so->from_tty*/ 0,
-+					      sap, 1, OBJF_KEEPBFD);
++      so->objfile = symbol_file_add_from_bfd (so->abfd, (flags & ~SYMFILE_VERBOSE) | SYMFILE_MAINLINE,
++					      sap, OBJF_KEEPBFD);
 +      so->main_relocated = 1;
 +    }
 +  else
-+    so->objfile = symbol_file_add_from_bfd (so->abfd, so->from_tty,
-+					    sap, 0, OBJF_SHARED | OBJF_KEEPBFD);
++    so->objfile = symbol_file_add_from_bfd (so->abfd, flags,
++					    sap, OBJF_SHARED | OBJF_KEEPBFD);
 +
    free_section_addr_info (sap);
  
-   return (1);
-@@ -600,6 +642,10 @@ update_solib_list (int from_tty, struct 
+   return;
+@@ -606,6 +648,10 @@ update_solib_list (int from_tty, struct 
  	    }
  	  else
  	    {
@@ -1221,7 +1104,7 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
  	      if (! strcmp (gdb->so_original_name, i->so_original_name))
  		break;	      
  	    }
-@@ -654,28 +700,7 @@ update_solib_list (int from_tty, struct 
+@@ -660,18 +706,7 @@ update_solib_list (int from_tty, struct 
        /* Fill in the rest of each of the `struct so_list' nodes.  */
        for (i = inferior; i; i = i->next)
  	{
@@ -1232,26 +1115,16 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
 -			"Error while mapping shared library sections:\n",
 -			RETURN_MASK_ALL);
 -
--	  /* If requested, add the shared object's sections to the TARGET's
--	     section table.  Do this immediately after mapping the object so
--	     that later nodes in the list can query this object, as is needed
--	     in solib-osf.c.  */
--	  if (target)
--	    {
--	      int count = (i->sections_end - i->sections);
--	      if (count > 0)
--		{
--		  int space = target_resize_to_sections (target, count);
--		  memcpy (target->to_sections + space,
--			  i->sections,
--			  count * sizeof (i->sections[0]));
--		}
--	    }
-+   	  add_to_target_sections (from_tty, target, i);
+-	  /* Add the shared object's sections to the current set of
+-	     file section tables.  Do this immediately after mapping
+-	     the object so that later nodes in the list can query this
+-	     object, as is needed in solib-osf.c.  */
+-	  add_target_sections (i->sections, i->sections_end);
++	  add_to_target_sections (from_tty, target, i);
  
  	  /* Notify any observer that the shared object has been
               loaded now that we've added it to GDB's tables.  */
-@@ -771,6 +796,41 @@ solib_add (char *pattern, int from_tty, 
+@@ -781,6 +816,32 @@ solib_add (char *pattern, int from_tty, 
    }
  }
  
@@ -1267,33 +1140,24 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
 +
 +  /* Fill in the rest of the `struct so_list' node.  */
 +  catch_errors (solib_map_sections, solib,
-+		"Error while mapping shared library sections:\n",
-+		RETURN_MASK_ALL);
++	       "Error while mapping shared library sections:\n",
++	       RETURN_MASK_ALL);
 +
-+  /* If requested, add the shared object's sections to the TARGET's
-+     section table.  Do this immediately after mapping the object so
-+     that later nodes in the list can query this object, as is needed
-+     in solib-osf.c.  */
-+  if (target)
-+    {
-+      int count = (solib->sections_end - solib->sections);
-+      if (count > 0)
-+	{
-+	  int space = target_resize_to_sections (target, count);
-+          if (debug_solib)
-+             fprintf_unfiltered (gdb_stdlog,
-+                                 "add_to_target_sections: add %s to to_sections\n",
-+                                 solib->so_original_name);
-+	  memcpy (target->to_sections + space,
-+		  solib->sections,
-+		  count * sizeof (solib->sections[0]));
-+	}
-+    }
++  if (debug_solib)
++     fprintf_unfiltered (gdb_stdlog,
++			 "add_to_target_sections: add %s to to_sections\n",
++			 solib->so_original_name);
++
++  /* Add the shared object's sections to the current set of
++     file section tables.  Do this immediately after mapping
++     the object so that later nodes in the list can query this
++     object, as is needed in solib-osf.c.  */
++  add_target_sections (solib->sections, solib->sections_end);
 +}
  
  /*
  
-@@ -1089,4 +1149,12 @@ This takes precedence over the environme
+@@ -1134,4 +1195,12 @@ This takes precedence over the environme
  				     reload_shared_libraries,
  				     show_solib_search_path,
  				     &setlist, &showlist);
@@ -1306,10 +1170,10 @@ Index: gdb-6.8.50.20090302/gdb/solib.c
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8.50.20090302/gdb/solist.h
+Index: gdb-6.8.50.20090803/gdb/solist.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/solist.h	2009-02-04 09:42:11.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/solist.h	2009-05-10 21:41:23.000000000 +0200
+--- gdb-6.8.50.20090803.orig/gdb/solist.h	2009-08-03 21:39:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/solist.h	2009-08-03 21:39:39.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1317,10 +1181,10 @@ Index: gdb-6.8.50.20090302/gdb/solist.h
 +    char main;                  /* flag: is this the main executable? */
 +    char main_relocated;        /* flag: has it been relocated yet? */
      struct objfile *objfile;	/* objfile for loaded lib */
-     struct section_table *sections;
-     struct section_table *sections_end;
-@@ -149,4 +151,10 @@ struct symbol *solib_global_lookup (cons
- 				    const char *linkage_name,
+     struct target_section *sections;
+     struct target_section *sections_end;
+@@ -147,4 +149,10 @@ struct symbol *solib_global_lookup (cons
+ 				    const char *name,
  				    const domain_enum domain);
  
 +/* Add the list of sections in so_list to the target to_sections.  */
@@ -1330,24 +1194,24 @@ Index: gdb-6.8.50.20090302/gdb/solist.h
 +extern int debug_solib;
 +
  #endif
-Index: gdb-6.8.50.20090302/gdb/symfile-mem.c
+Index: gdb-6.8.50.20090803/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile-mem.c	2009-05-10 21:36:28.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/symfile-mem.c	2009-05-10 21:41:23.000000000 +0200
-@@ -116,7 +116,7 @@ symbol_file_add_from_memory (struct bfd 
+--- gdb-6.8.50.20090803.orig/gdb/symfile-mem.c	2009-08-03 21:39:38.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile-mem.c	2009-08-03 21:39:39.000000000 +0200
+@@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
+ 	++i;
        }
  
-   objf = symbol_file_add_from_bfd (nbfd, from_tty,
--                                   sai, 0, OBJF_SHARED);
-+                                   sai, 2, OBJF_SHARED);
+-  objf = symbol_file_add_from_bfd (nbfd, from_tty ? SYMFILE_VERBOSE : 0,
++  objf = symbol_file_add_from_bfd (nbfd, (from_tty ? SYMFILE_VERBOSE : 0) | SYMFILE_MAINLINE2_BOTH,
+                                    sai, OBJF_SHARED);
  
    /* This might change our ideas about frames already looked at.  */
-   reinit_frame_cache ();
-Index: gdb-6.8.50.20090302/gdb/symfile.c
+Index: gdb-6.8.50.20090803/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile.c	2009-05-10 21:37:51.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/symfile.c	2009-05-10 21:41:23.000000000 +0200
-@@ -47,6 +47,7 @@
+--- gdb-6.8.50.20090803.orig/gdb/symfile.c	2009-08-03 21:39:38.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile.c	2009-08-04 06:02:45.000000000 +0200
+@@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
  #include "block.h"
@@ -1355,16 +1219,16 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  #include "observer.h"
  #include "exec.h"
  #include "parser-defs.h"
-@@ -787,7 +788,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -785,7 +786,7 @@ syms_from_objfile (struct objfile *objfi
  
    /* Now either addrs or offsets is non-zero.  */
  
 -  if (mainline)
-+  if (mainline == 1)
++  if ((add_flags & SYMFILE_MAINLINE) && !(add_flags & SYMFILE_MAINLINE2_ONLY))
      {
        /* We will modify the main symbol table, make sure that all its users
           will be cleaned up if an error occurs during symbol reading.  */
-@@ -815,7 +816,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -813,7 +814,7 @@ syms_from_objfile (struct objfile *objfi
  
       We no longer warn if the lowest section is not a text segment (as
       happens for the PA64 port.  */
@@ -1373,20 +1237,30 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
      {
        asection *lower_sect;
        asection *sect;
-@@ -917,17 +918,21 @@ new_symfile_objfile (struct objfile *obj
+@@ -896,7 +897,7 @@ syms_from_objfile (struct objfile *objfi
+       init_objfile_sect_indices (objfile);
+     }
+ 
+-  (*objfile->sf->sym_read) (objfile, mainline);
++  (*objfile->sf->sym_read) (objfile, add_flags & SYMFILE_MAINLINE2_ONLY ? 2 : (add_flags & SYMFILE_MAINLINE ? 1 : 0));
+ 
+   /* Discard cleanups as symbol reading was successful.  */
+ 
+@@ -915,17 +916,22 @@ new_symfile_objfile (struct objfile *obj
    /* If this is the main symbol file we have to clean up all users of the
       old main symbol file. Otherwise it is sufficient to fixup all the
       breakpoints that may have been redefined by this symbol file.  */
--  if (mainline)
-+  if (mainline == 1)
+-  if (add_flags & SYMFILE_MAINLINE)
++  if (add_flags & SYMFILE_MAINLINE && !(add_flags & SYMFILE_MAINLINE2_ONLY))
      {
        /* OK, make it the "real" symbol file.  */
        symfile_objfile = objfile;
  
        clear_symtab_users ();
      }
--  else
-+  else if (mainline == 0)
+-  else if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0)
++  else if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0
++           && (add_flags & SYMFILE_MAINLINE2_BOTH) == 0)
      {
        breakpoint_re_set ();
      }
@@ -1396,28 +1270,27 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
 +    }
  
    /* We're done reading the symbol file; finish off complaints.  */
-   clear_complaints (&symfile_complaints, 0, verbo);
-@@ -982,7 +987,7 @@ symbol_file_add_with_addrs_or_offsets (b
+   clear_complaints (&symfile_complaints, 0, add_flags & SYMFILE_VERBOSE);
+@@ -982,7 +988,7 @@ symbol_file_add_with_addrs_or_offsets (b
    /* Give user a chance to burp if we'd be
       interactively wiping out any existing symbols.  */
  
--  if (mainline
-+  if (mainline == 1
+-  if ((add_flags & SYMFILE_MAINLINE)
++  if ((add_flags & SYMFILE_MAINLINE) && !(add_flags & SYMFILE_MAINLINE2_ONLY)
+       && (have_full_symbols () || have_partial_symbols ())
        && from_tty
        && (have_full_symbols () || have_partial_symbols ())
-       && !query (_("Load new symbol table from \"%s\"? "), name))
-@@ -1178,6 +1183,10 @@ symbol_file_clear (int from_tty)
+@@ -1183,6 +1189,9 @@ symbol_file_clear (int from_tty)
  		    symfile_objfile->name)
  	  : !query (_("Discard symbol table? "))))
      error (_("Not confirmed."));
 +#ifdef CLEAR_SOLIB
 +      CLEAR_SOLIB ();
 +#endif
-+
-     free_all_objfiles ();
  
-     /* solib descriptors may have handles to objfiles.  Since their
-@@ -3367,6 +3376,8 @@ reread_symbols (void)
+   free_all_objfiles ();
+ 
+@@ -3380,6 +3389,8 @@ reread_symbols (void)
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
@@ -1426,11 +1299,11 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-Index: gdb-6.8.50.20090302/gdb/target.h
+Index: gdb-6.8.50.20090803/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/target.h	2009-05-10 21:36:29.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/target.h	2009-05-10 21:41:23.000000000 +0200
-@@ -542,7 +542,7 @@ struct target_ops
+--- gdb-6.8.50.20090803.orig/gdb/target.h	2009-08-03 21:39:39.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/target.h	2009-08-03 21:39:39.000000000 +0200
+@@ -524,7 +524,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
      int (*to_auxv_parse) (struct target_ops *ops, gdb_byte **readptr,
@@ -1439,3 +1312,22 @@ Index: gdb-6.8.50.20090302/gdb/target.h
  
      /* Search SEARCH_SPACE_LEN bytes beginning at START_ADDR for the
         sequence of bytes in PATTERN with length PATTERN_LEN.
+Index: gdb-6.8.50.20090803/gdb/symfile.h
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/symfile.h	2009-08-03 21:39:38.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile.h	2009-08-03 21:39:39.000000000 +0200
+@@ -229,7 +229,13 @@ enum symfile_add_flags
+     SYMFILE_MAINLINE = 1 << 2,
+ 
+     /* Do not call breakpoint_re_set when adding this symbol file.  */
+-    SYMFILE_DEFER_BP_RESET = 1 << 3
++    SYMFILE_DEFER_BP_RESET = 1 << 3,
++
++    /* Red Hat PIE patch: Like SYMFILE_MAINLINE but for mainline == 2.
++       Former code was checking `if (mainline)' being satisfied both by
++       standard 1 and rare 2, simulate it here.  */
++    SYMFILE_MAINLINE2_ONLY = 1 << 4,
++    SYMFILE_MAINLINE2_BOTH = SYMFILE_MAINLINE2_ONLY | SYMFILE_MAINLINE
+   };
+ 
+ extern void syms_from_objfile (struct objfile *,

gdb-6.3-ppc64syscall-20040622.patch:
 rs6000-tdep.c |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

Index: gdb-6.3-ppc64syscall-20040622.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ppc64syscall-20040622.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.3-ppc64syscall-20040622.patch	14 Jul 2008 09:09:04 -0000	1.4
+++ gdb-6.3-ppc64syscall-20040622.patch	4 Aug 2009 05:37:27 -0000	1.5
@@ -6,11 +6,11 @@
 	use to skip over first half of a GNU/Linux syscall and update
 	"func_start".
 
-Index: gdb-6.8/gdb/rs6000-tdep.c
+Index: gdb-6.8.50.20090802/gdb/rs6000-tdep.c
 ===================================================================
---- gdb-6.8.orig/gdb/rs6000-tdep.c	2008-02-20 15:34:43.000000000 +0100
-+++ gdb-6.8/gdb/rs6000-tdep.c	2008-07-14 10:25:29.000000000 +0200
-@@ -124,6 +124,7 @@ static const char *powerpc_vector_abi_st
+--- gdb-6.8.50.20090802.orig/gdb/rs6000-tdep.c	2009-07-31 17:23:20.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/rs6000-tdep.c	2009-08-03 09:52:39.000000000 +0200
+@@ -126,6 +126,7 @@ static const char *powerpc_vector_abi_st
  
  struct rs6000_framedata
    {
@@ -18,7 +18,7 @@ Index: gdb-6.8/gdb/rs6000-tdep.c
      int offset;			/* total size of frame --- the distance
  				   by which we decrement sp to allocate
  				   the frame */
-@@ -1262,7 +1263,6 @@ static CORE_ADDR
+@@ -1488,7 +1489,6 @@ static CORE_ADDR
  skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
  	       struct rs6000_framedata *fdata)
  {
@@ -26,7 +26,7 @@ Index: gdb-6.8/gdb/rs6000-tdep.c
    CORE_ADDR last_prologue_pc = pc;
    CORE_ADDR li_found_pc = 0;
    gdb_byte buf[4];
-@@ -1280,11 +1280,13 @@ skip_prologue (struct gdbarch *gdbarch, 
+@@ -1506,12 +1506,14 @@ skip_prologue (struct gdbarch *gdbarch, 
    int minimal_toc_loaded = 0;
    int prev_insn_was_prologue_insn = 1;
    int num_skip_non_prologue_insns = 0;
@@ -34,15 +34,16 @@ Index: gdb-6.8/gdb/rs6000-tdep.c
    int r0_contains_arg = 0;
    const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
    struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
  
    memset (fdata, 0, sizeof (struct rs6000_framedata));
 +  fdata->func_start = pc;
    fdata->saved_gpr = -1;
    fdata->saved_fpr = -1;
    fdata->saved_vr = -1;
-@@ -1313,6 +1315,55 @@ skip_prologue (struct gdbarch *gdbarch, 
+@@ -1545,6 +1547,55 @@ skip_prologue (struct gdbarch *gdbarch, 
  	break;
-       op = extract_unsigned_integer (buf, 4);
+       op = extract_unsigned_integer (buf, 4, byte_order);
  
 +      /* A PPC64 GNU/Linux system call function is split into two
 +	 sub-functions: a non-threaded fast-path (__NAME_nocancel)
@@ -96,7 +97,7 @@ Index: gdb-6.8/gdb/rs6000-tdep.c
        if ((op & 0xfc1fffff) == 0x7c0802a6)
  	{			/* mflr Rx */
  	  /* Since shared library / PIC code, which needs to get its
-@@ -1486,9 +1537,9 @@ skip_prologue (struct gdbarch *gdbarch, 
+@@ -1726,9 +1777,9 @@ skip_prologue (struct gdbarch *gdbarch, 
  	     we have no line table information or the line info tells
  	     us that the subroutine call is not part of the line
  	     associated with the prologue.  */

gdb-6.3-ppcdotsolib-20041022.patch:
 solib-svr4.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Index: gdb-6.3-ppcdotsolib-20041022.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ppcdotsolib-20041022.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-6.3-ppcdotsolib-20041022.patch	1 Nov 2007 20:24:20 -0000	1.2
+++ gdb-6.3-ppcdotsolib-20041022.patch	4 Aug 2009 05:37:27 -0000	1.3
@@ -8,11 +8,11 @@
 
 	Port to GDB-6.7.
  	
-Index: gdb-6.7/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090802/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.7.orig/gdb/solib-svr4.c	2007-10-09 20:03:30.000000000 +0200
-+++ gdb-6.7/gdb/solib-svr4.c	2007-10-12 22:34:03.000000000 +0200
-@@ -1089,7 +1089,15 @@ enable_break (void)
+--- gdb-6.8.50.20090802.orig/gdb/solib-svr4.c	2009-08-03 10:03:36.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/solib-svr4.c	2009-08-03 10:51:15.000000000 +0200
+@@ -1431,7 +1431,15 @@ enable_break (struct svr4_info *info)
  	{
  	  sym_addr = bfd_lookup_symbol (tmp_bfd, *bkpt_namep);
  	  if (sym_addr != 0)
@@ -20,7 +20,7 @@ Index: gdb-6.7/gdb/solib-svr4.c
 +	    {
 +	      /* The symbol might be a descriptor, convert to into the
 +		 corresponding code address.  */
-+	      sym_addr = gdbarch_convert_from_func_ptr_addr (current_gdbarch,
++	      sym_addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch,
 +							     sym_addr,
 +							     tmp_bfd_target);
 +	      if (sym_addr != 0)

gdb-6.3-readnever-20050907.patch:
 doc/gdb.texinfo |    6 ++++++
 dwarf2read.c    |    4 +++-
 main.c          |    2 ++
 symfile.c       |    1 +
 top.h           |    1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

Index: gdb-6.3-readnever-20050907.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-readnever-20050907.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.3-readnever-20050907.patch	10 Jun 2009 13:05:56 -0000	1.6
+++ gdb-6.3-readnever-20050907.patch	4 Aug 2009 05:37:27 -0000	1.7
@@ -11,11 +11,11 @@
 
         * gdb.texinfo (File Options): Document --readnever.
 
-Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090802/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo	2009-05-09 20:00:02.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo	2009-05-09 20:00:06.000000000 +0200
-@@ -988,6 +988,12 @@ Read each symbol file's entire symbol ta
+--- gdb-6.8.50.20090802.orig/gdb/doc/gdb.texinfo	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/doc/gdb.texinfo	2009-08-03 12:29:58.000000000 +0200
+@@ -991,6 +991,12 @@ Read each symbol file's entire symbol ta
  the default, which is to read it incrementally as it is needed.
  This makes startup slower, but makes future operations faster.
  
@@ -28,11 +28,11 @@ Index: gdb-6.8.50.20090302/gdb/doc/gdb.t
  @end table
  
  @node Mode Options
-Index: gdb-6.8.50.20090302/gdb/main.c
+Index: gdb-6.8.50.20090802/gdb/main.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/main.c	2009-05-09 20:00:03.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/main.c	2009-05-09 20:00:06.000000000 +0200
-@@ -427,6 +427,7 @@ captured_main (void *data)
+--- gdb-6.8.50.20090802.orig/gdb/main.c	2009-08-03 12:29:03.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/main.c	2009-08-03 12:29:58.000000000 +0200
+@@ -382,6 +382,7 @@ captured_main (void *data)
        {"xdb", no_argument, &xdb_commands, 1},
        {"dbx", no_argument, &dbx_commands, 1},
        {"readnow", no_argument, &readnow_symbol_files, 1},
@@ -40,7 +40,7 @@ Index: gdb-6.8.50.20090302/gdb/main.c
        {"r", no_argument, &readnow_symbol_files, 1},
        {"quiet", no_argument, &quiet, 1},
        {"q", no_argument, &quiet, 1},
-@@ -1070,6 +1071,7 @@ Options:\n\n\
+@@ -1030,6 +1031,7 @@ Options:\n\n\
    fputs_unfiltered (_("\
    --quiet            Do not print version number on startup.\n\
    --readnow          Fully read symbol files on first access.\n\
@@ -48,11 +48,11 @@ Index: gdb-6.8.50.20090302/gdb/main.c
  "), stream);
    fputs_unfiltered (_("\
    --se=FILE          Use FILE as symbol file and executable file.\n\
-Index: gdb-6.8.50.20090302/gdb/symfile.c
+Index: gdb-6.8.50.20090802/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile.c	2009-05-09 20:00:03.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/symfile.c	2009-05-09 20:00:06.000000000 +0200
-@@ -77,6 +77,7 @@ static void clear_symtab_users_cleanup (
+--- gdb-6.8.50.20090802.orig/gdb/symfile.c	2009-08-03 12:28:14.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/symfile.c	2009-08-03 12:29:58.000000000 +0200
+@@ -78,6 +78,7 @@ static void clear_symtab_users_cleanup (
  
  /* Global variables owned by this file */
  int readnow_symbol_files;	/* Read full symbols immediately */
@@ -60,32 +60,32 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
  /* External variables and functions referenced. */
  
-Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090802/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-05-09 20:00:02.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-05-09 20:00:19.000000000 +0200
-@@ -50,6 +50,7 @@
- #include "c-lang.h"
+--- gdb-6.8.50.20090802.orig/gdb/dwarf2read.c	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/dwarf2read.c	2009-08-03 12:31:01.000000000 +0200
+@@ -52,6 +52,7 @@
+ #include "jv-lang.h"
  #include "typeprint.h"
- #include "block.h"
+ #include "vec.h"
 +#include "top.h"
  
  #include <fcntl.h>
  #include "gdb_string.h"
-@@ -1187,7 +1188,8 @@ dwarf2_has_info (struct objfile *objfile
-   dwarf_aranges_section = 0;
-   
-   bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, &update_sizes);
--  return (dwarf_info_section != NULL && dwarf_abbrev_section != NULL);
+@@ -1225,7 +1226,8 @@ dwarf2_has_info (struct objfile *objfile
+ 
+       bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, NULL);
+     }
+-  return (dwarf2_per_objfile->info.asection != NULL
 +  return !readnever_symbol_files
-+	 && dwarf_info_section != NULL && dwarf_abbrev_section != NULL;
++      && (dwarf2_per_objfile->info.asection != NULL
+ 	  && dwarf2_per_objfile->abbrev.asection != NULL);
  }
  
- /* When loading sections, we can either look for ".<name>", or for
-Index: gdb-6.8.50.20090302/gdb/top.h
+Index: gdb-6.8.50.20090802/gdb/top.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/top.h	2009-01-03 06:57:53.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/top.h	2009-05-09 20:00:06.000000000 +0200
+--- gdb-6.8.50.20090802.orig/gdb/top.h	2009-01-03 06:57:53.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/top.h	2009-08-03 12:29:58.000000000 +0200
 @@ -59,6 +59,7 @@ extern void set_prompt (char *);
  
  /* From random places.  */

gdb-6.3-test-pie-20050107.patch:
 configure            |    3 
 configure.ac         |    2 
 gdb.pie/Makefile.in  |   19 
 gdb.pie/attach.c     |   20 +
 gdb.pie/attach.exp   |  432 ++++++++++++++++++++++
 gdb.pie/attach2.c    |   24 +
 gdb.pie/break.c      |  146 +++++++
 gdb.pie/break.exp    |  977 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gdb.pie/break1.c     |   44 ++
 gdb.pie/corefile.exp |  243 ++++++++++++
 gdb.pie/coremaker.c  |  142 +++++++
 11 files changed, 2050 insertions(+), 2 deletions(-)

Index: gdb-6.3-test-pie-20050107.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-test-pie-20050107.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gdb-6.3-test-pie-20050107.patch	15 Jun 2009 12:53:17 -0000	1.9
+++ gdb-6.3-test-pie-20050107.patch	4 Aug 2009 05:37:28 -0000	1.10
@@ -1,40 +1,40 @@
-Index: gdb-6.8.50.20081128/gdb/testsuite/configure.ac
+Index: gdb-6.8.50.20090802/gdb/testsuite/configure.ac
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/testsuite/configure.ac	2008-12-09 17:02:39.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/testsuite/configure.ac	2008-12-09 17:02:55.000000000 +0100
-@@ -116,6 +116,6 @@ AC_OUTPUT([Makefile \
+--- gdb-6.8.50.20090802.orig/gdb/testsuite/configure.ac	2009-07-31 17:38:16.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/testsuite/configure.ac	2009-08-03 11:10:45.000000000 +0200
+@@ -144,6 +144,6 @@ AC_OUTPUT([Makefile \
    gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
    gdb.fortran/Makefile gdb.server/Makefile \
    gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile \
 -  gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile \
 +  gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.pie/Makefile \
-   gdb.python/Makefile \
+   gdb.python/Makefile gdb.reverse/Makefile \
    gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile])
-Index: gdb-6.8.50.20081128/gdb/testsuite/configure
+Index: gdb-6.8.50.20090802/gdb/testsuite/configure
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/testsuite/configure	2008-12-09 17:02:39.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/testsuite/configure	2008-12-09 17:02:55.000000000 +0100
-@@ -3131,7 +3131,7 @@ done
+--- gdb-6.8.50.20090802.orig/gdb/testsuite/configure	2009-07-31 17:38:16.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/testsuite/configure	2009-08-03 11:11:27.000000000 +0200
+@@ -3239,7 +3239,7 @@ done
  
  
  
--                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
-+                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.pie/Makefile gdb.python/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
+-                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
++                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.pie/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -3698,6 +3698,7 @@ do
+@@ -3813,6 +3813,7 @@ do
    "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;;
    "gdb.opt/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.opt/Makefile" ;;
    "gdb.pascal/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.pascal/Makefile" ;;
 +  "gdb.pie/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.pie/Makefile" ;;
    "gdb.python/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.python/Makefile" ;;
+   "gdb.reverse/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.reverse/Makefile" ;;
    "gdb.threads/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.threads/Makefile" ;;
-   "gdb.trace/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.trace/Makefile" ;;
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/attach.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/attach.c	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.c	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,20 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -56,10 +56,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +    }
 +  return 0;
 +}
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/attach2.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/attach2.c	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach2.c	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,24 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -85,10 +85,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +    }
 +  return (0);
 +}
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/break.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/break.c	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.c	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,146 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -236,10 +236,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +    }
 +  return 0;
 +}
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/break1.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break1.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/break1.c	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break1.c	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,44 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -285,10 +285,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +void marker3 (a, b) char *a, *b; {}	/* set breakpoint 18 here */
 +void marker4 (d) long d; {}		/* set breakpoint 13 here */
 +#endif
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/coremaker.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/coremaker.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/coremaker.c	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/coremaker.c	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,142 @@
 +/* Copyright 1992, 1993, 1994, 1995, 1996, 1999
 +   Free Software Foundation, Inc.
@@ -432,10 +432,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +  return 0;
 +}
 +
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/attach.exp
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/attach.exp	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/attach.exp	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,432 @@
 +#   Copyright 1997, 1999, 2002 Free Software Foundation, Inc.
 +
@@ -869,10 +869,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +do_call_attach_tests
 +
 +return 0
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/break.exp
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/break.exp	2008-12-09 17:24:34.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/break.exp	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,977 @@
 +#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2002, 2003, 2004
@@ -1851,10 +1851,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +    send_gdb "set args main\n"
 +    gdb_expect -re ".*$gdb_prompt $" {}
 +}
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/corefile.exp
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/corefile.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/corefile.exp	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/corefile.exp	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,243 @@
 +# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 +# Free Software Foundation, Inc.
@@ -2099,10 +2099,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(\\).*" "up in corefile.exp (reinit)"
 +
 +gdb_test "core" "No core file now."
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/Makefile.in
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.pie/Makefile.in	2008-12-09 17:02:55.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.pie/Makefile.in	2009-08-03 11:10:12.000000000 +0200
 @@ -0,0 +1,19 @@
 +VPATH = @srcdir@
 +srcdir = @srcdir@

gdb-6.3-threaded-watchpoints2-20050225.patch:
 watchthreads-threaded.c   |   66 ++++++++++++++++++++++
 watchthreads-threaded.exp |  133 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)

Index: gdb-6.3-threaded-watchpoints2-20050225.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-threaded-watchpoints2-20050225.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdb-6.3-threaded-watchpoints2-20050225.patch	28 Aug 2008 18:48:34 -0000	1.8
+++ gdb-6.3-threaded-watchpoints2-20050225.patch	4 Aug 2009 05:37:28 -0000	1.9
@@ -42,7 +42,7 @@ FIXME: The testcase does not expects mul
 Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-12 01:54:29.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads-threaded.c	2006-07-12 01:54:29.000000000 -0300
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -113,7 +113,7 @@ Index: gdb-6.5/gdb/testsuite/gdb.threads
 Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-12 01:54:29.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads-threaded.exp	2006-07-12 01:54:29.000000000 -0300
 @@ -0,0 +1,133 @@
 +# This testcase is part of GDB, the GNU debugger.
 +

gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch:
 gdbtypes.c                         |    3 +
 gdbtypes.h                         |    2 +
 parse.c                            |    6 ++-
 target.c                           |   42 ++++++++++++++++++++++-
 testsuite/gdb.dwarf2/dw2-errno.c   |   28 +++++++++++++++
 testsuite/gdb.dwarf2/dw2-errno.exp |   67 +++++++++++++++++++++++++++++++++++++
 6 files changed, 146 insertions(+), 2 deletions(-)

Index: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch	2 Mar 2009 23:14:15 -0000	1.10
+++ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch	4 Aug 2009 05:37:28 -0000	1.11
@@ -30,75 +30,55 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/d
   <81a2>     DW_AT_name        : (indirect string, offset: 0x280e): __errno_location
   <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
 
-Index: gdb-6.8.50.20090228/gdb/gdbtypes.c
+Index: gdb-6.8.50.20090802/gdb/gdbtypes.c
 ===================================================================
---- gdb-6.8.50.20090228.orig/gdb/gdbtypes.c	2009-03-02 01:01:15.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/gdbtypes.c	2009-03-02 01:01:53.000000000 +0100
-@@ -3633,6 +3633,8 @@ gdbtypes_post_init (struct gdbarch *gdba
-     init_type (TYPE_CODE_INT, 
- 	       gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,
- 	       0, "int", OBJFILE_INTERNAL);
-+  builtin_type->builtin_int_ptr =
-+    make_pointer_type (builtin_type->builtin_int, NULL);
-   builtin_type->builtin_unsigned_int =
-     init_type (TYPE_CODE_INT, 
- 	       gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT,
-@@ -3742,6 +3744,12 @@ gdbtypes_post_init (struct gdbarch *gdba
- 	       "<text variable, no debug info>", OBJFILE_INTERNAL);
-   TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol) =
-     builtin_type->builtin_int;
-+  builtin_type->nodebug_text_symbol_errno_location =
-+    init_type (TYPE_CODE_FUNC, 1, 0, 
-+	       "<text variable for __errno_location, no debug info>",
-+	       OBJFILE_INTERNAL);
-+  TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol_errno_location) =
-+    builtin_type->builtin_int_ptr;
-   builtin_type->nodebug_data_symbol =
-     init_type (TYPE_CODE_INT, 
- 	       gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0,
-Index: gdb-6.8.50.20090228/gdb/gdbtypes.h
-===================================================================
---- gdb-6.8.50.20090228.orig/gdb/gdbtypes.h	2009-03-02 01:01:15.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/gdbtypes.h	2009-03-02 01:01:53.000000000 +0100
-@@ -1053,6 +1053,7 @@ struct builtin_type
+--- gdb-6.8.50.20090802.orig/gdb/gdbtypes.c	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/gdbtypes.c	2009-08-03 15:42:51.000000000 +0200
+@@ -3769,6 +3769,9 @@ gdbtypes_post_init (struct gdbarch *gdba
+     = arch_type (gdbarch, TYPE_CODE_INTERNAL_FUNCTION, 0,
+ 		 "<internal function>");
  
-   /* Types used for symbols with no debug information.  */
-   struct type *nodebug_text_symbol;
++  builtin_type->nodebug_text_symbol_errno_location
++    = lookup_function_type (lookup_pointer_type (builtin_type->builtin_int));
++
+   return builtin_type;
+ }
+ 
+Index: gdb-6.8.50.20090802/gdb/gdbtypes.h
+===================================================================
+--- gdb-6.8.50.20090802.orig/gdb/gdbtypes.h	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/gdbtypes.h	2009-08-03 15:40:02.000000000 +0200
+@@ -1128,6 +1128,8 @@ struct builtin_type
+ 
+   /* This type is used to represent a GDB internal function.  */
+   struct type *internal_fn;
++
 +  struct type *nodebug_text_symbol_errno_location;
-   struct type *nodebug_data_symbol;
-   struct type *nodebug_unknown_symbol;
-   struct type *nodebug_tls_symbol;
-@@ -1065,6 +1066,7 @@ struct builtin_type
-   struct type *builtin_char;
-   struct type *builtin_short;
-   struct type *builtin_int;
-+  struct type *builtin_int_ptr;
-   struct type *builtin_long;
-   struct type *builtin_signed_char;
-   struct type *builtin_unsigned_char;
-Index: gdb-6.8.50.20090228/gdb/parse.c
-===================================================================
---- gdb-6.8.50.20090228.orig/gdb/parse.c	2009-03-02 01:01:15.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/parse.c	2009-03-02 01:01:53.000000000 +0100
-@@ -508,7 +508,12 @@ write_exp_msymbol (struct minimal_symbol
+ };
+ 
+ /* Return the type table for the specified architecture.  */
+Index: gdb-6.8.50.20090802/gdb/parse.c
+===================================================================
+--- gdb-6.8.50.20090802.orig/gdb/parse.c	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/parse.c	2009-08-03 15:41:54.000000000 +0200
+@@ -510,7 +510,11 @@ write_exp_msymbol (struct minimal_symbol
      case mst_text:
      case mst_file_text:
      case mst_solib_trampoline:
--      write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol);
+-      write_exp_elt_type (objfile_type (objfile)->nodebug_text_symbol);
 +      if (builtin_type (gdbarch)->nodebug_text_symbol_errno_location != NULL
 +          && strcmp (SYMBOL_LINKAGE_NAME (msymbol), "__errno_location") == 0)
-+	write_exp_elt_type (builtin_type (gdbarch)
-+					  ->nodebug_text_symbol_errno_location);
++	write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol_errno_location);
 +      else
-+	write_exp_elt_type (builtin_type (gdbarch)->nodebug_text_symbol);
++	write_exp_elt_type (objfile_type (objfile)->nodebug_text_symbol);
        break;
  
      case mst_data:
-Index: gdb-6.8.50.20090228/gdb/target.c
+Index: gdb-6.8.50.20090802/gdb/target.c
 ===================================================================
---- gdb-6.8.50.20090228.orig/gdb/target.c	2009-03-02 01:01:44.000000000 +0100
-+++ gdb-6.8.50.20090228/gdb/target.c	2009-03-02 01:01:53.000000000 +0100
-@@ -827,6 +827,25 @@ pop_all_targets (int quitting)
+--- gdb-6.8.50.20090802.orig/gdb/target.c	2009-08-03 12:38:47.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/target.c	2009-08-03 12:49:33.000000000 +0200
+@@ -933,6 +933,25 @@ pop_all_targets (int quitting)
    pop_all_targets_above (dummy_stratum, quitting);
  }
  
@@ -124,7 +104,7 @@ Index: gdb-6.8.50.20090228/gdb/target.c
  /* Using the objfile specified in OBJFILE, find the address for the
     current thread's thread-local storage with offset OFFSET.  */
  CORE_ADDR
-@@ -917,7 +936,28 @@ target_translate_tls_address (struct obj
+@@ -1023,7 +1042,28 @@ target_translate_tls_address (struct obj
    /* It wouldn't be wrong here to try a gdbarch method, too; finding
       TLS is an ABI-specific thing.  But we don't do that yet.  */
    else
@@ -154,10 +134,10 @@ Index: gdb-6.8.50.20090228/gdb/target.c
  
    return addr;
  }
-Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.c	2009-03-02 01:01:53.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.dwarf2/dw2-errno.c	2009-08-03 12:49:33.000000000 +0200
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -187,10 +167,10 @@ Index: gdb-6.8.50.20090228/gdb/testsuite
 +
 +  return 0;	/* breakpoint */
 +}
-Index: gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090228/gdb/testsuite/gdb.dwarf2/dw2-errno.exp	2009-03-02 01:01:53.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.dwarf2/dw2-errno.exp	2009-08-03 12:49:33.000000000 +0200
 @@ -0,0 +1,67 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +

gdb-6.5-bz203661-emit-relocs.patch:
 symfile.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: gdb-6.5-bz203661-emit-relocs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz203661-emit-relocs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-6.5-bz203661-emit-relocs.patch	24 Aug 2006 06:18:06 -0000	1.2
+++ gdb-6.5-bz203661-emit-relocs.patch	4 Aug 2009 05:37:28 -0000	1.3
@@ -1,8 +1,8 @@
-Index: gdb-6.5/gdb/symfile.c
+Index: gdb-6.8.50.20090802/gdb/symfile.c
 ===================================================================
---- gdb-6.5.orig/gdb/symfile.c	2006-08-24 02:56:02.000000000 -0300
-+++ gdb-6.5/gdb/symfile.c	2006-08-24 02:56:36.000000000 -0300
-@@ -3739,6 +3739,12 @@ symfile_dummy_outputs (bfd *abfd, asecti
+--- gdb-6.8.50.20090802.orig/gdb/symfile.c	2009-08-03 12:29:58.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/symfile.c	2009-08-03 12:40:58.000000000 +0200
+@@ -4012,6 +4012,12 @@ symfile_dummy_outputs (bfd *abfd, asecti
  bfd_byte *
  symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
  {
@@ -12,6 +12,6 @@ Index: gdb-6.5/gdb/symfile.c
 +  if ((abfd->flags & EXEC_P) != 0)
 +    return NULL;
 +
-   /* We're only interested in debugging sections with relocation
+   /* We're only interested in sections with relocation
       information.  */
    if ((sectp->flags & SEC_RELOC) == 0)

gdb-6.5-bz216711-clone-is-outermost.patch:
 amd64-linux-tdep.c                      |   76 ++++++++++++++++++++++++++++++++
 amd64-tdep.c                            |    5 ++
 i386-tdep.c                             |    3 +
 i386-tdep.h                             |    3 +
 testsuite/gdb.threads/bt-clone-stop.c   |   39 ++++++++++++++++
 testsuite/gdb.threads/bt-clone-stop.exp |   61 +++++++++++++++++++++++++
 6 files changed, 187 insertions(+)

Index: gdb-6.5-bz216711-clone-is-outermost.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz216711-clone-is-outermost.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdb-6.5-bz216711-clone-is-outermost.patch	14 Dec 2008 14:05:16 -0000	1.3
+++ gdb-6.5-bz216711-clone-is-outermost.patch	4 Aug 2009 05:37:28 -0000	1.4
@@ -23,11 +23,11 @@ instead.
 
 	Port to GDB-6.7.
 
-Index: gdb-6.8.50.20081128/gdb/amd64-linux-tdep.c
+Index: gdb-6.8.50.20090802/gdb/amd64-linux-tdep.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/amd64-linux-tdep.c	2008-12-08 10:56:17.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/amd64-linux-tdep.c	2008-12-08 21:11:08.000000000 +0100
-@@ -234,6 +234,80 @@ amd64_linux_register_reggroup_p (struct 
+--- gdb-6.8.50.20090802.orig/gdb/amd64-linux-tdep.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/amd64-linux-tdep.c	2009-08-03 15:50:08.000000000 +0200
+@@ -238,6 +238,80 @@ amd64_linux_register_reggroup_p (struct 
  
  /* Set the program counter for process PTID to PC.  */
  
@@ -108,7 +108,7 @@ Index: gdb-6.8.50.20081128/gdb/amd64-lin
  static void
  amd64_linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
  {
-@@ -272,6 +346,8 @@ amd64_linux_init_abi (struct gdbarch_inf
+@@ -276,6 +350,8 @@ amd64_linux_init_abi (struct gdbarch_inf
    tdep->sc_reg_offset = amd64_linux_sc_reg_offset;
    tdep->sc_num_regs = ARRAY_SIZE (amd64_linux_sc_reg_offset);
  
@@ -117,11 +117,11 @@ Index: gdb-6.8.50.20081128/gdb/amd64-lin
    /* GNU/Linux uses SVR4-style shared libraries.  */
    set_solib_svr4_fetch_link_map_offsets
      (gdbarch, svr4_lp64_fetch_link_map_offsets);
-Index: gdb-6.8.50.20081128/gdb/amd64-tdep.c
+Index: gdb-6.8.50.20090802/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/amd64-tdep.c	2008-12-08 10:56:17.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/amd64-tdep.c	2008-12-08 21:05:12.000000000 +0100
-@@ -1044,11 +1044,16 @@ amd64_frame_this_id (struct frame_info *
+--- gdb-6.8.50.20090802.orig/gdb/amd64-tdep.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/amd64-tdep.c	2009-08-03 15:50:08.000000000 +0200
+@@ -1736,11 +1736,16 @@ amd64_frame_this_id (struct frame_info *
  {
    struct amd64_frame_cache *cache =
      amd64_frame_cache (this_frame, this_cache);
@@ -138,11 +138,11 @@ Index: gdb-6.8.50.20081128/gdb/amd64-tde
    (*this_id) = frame_id_build (cache->base + 16, cache->pc);
  }
  
-Index: gdb-6.8.50.20081128/gdb/i386-tdep.c
+Index: gdb-6.8.50.20090802/gdb/i386-tdep.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/i386-tdep.c	2008-12-08 10:56:17.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/i386-tdep.c	2008-12-08 11:00:43.000000000 +0100
-@@ -2698,6 +2698,9 @@ i386_gdbarch_init (struct gdbarch_info i
+--- gdb-6.8.50.20090802.orig/gdb/i386-tdep.c	2009-07-12 19:46:21.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/i386-tdep.c	2009-08-03 15:50:08.000000000 +0200
+@@ -5307,6 +5307,9 @@ i386_gdbarch_init (struct gdbarch_info i
    tdep->sc_pc_offset = -1;
    tdep->sc_sp_offset = -1;
  
@@ -152,24 +152,24 @@ Index: gdb-6.8.50.20081128/gdb/i386-tdep
    /* The format used for `long double' on almost all i386 targets is
       the i387 extended floating-point format.  In fact, of all targets
       in the GCC 2.95 tree, only OSF/1 does it different, and insists
-Index: gdb-6.8.50.20081128/gdb/i386-tdep.h
+Index: gdb-6.8.50.20090802/gdb/i386-tdep.h
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/i386-tdep.h	2008-12-08 10:56:17.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/i386-tdep.h	2008-12-08 21:07:47.000000000 +0100
-@@ -106,6 +106,9 @@ struct gdbarch_tdep
-   /* ISA-specific data types.  */
-   struct type *i386_mmx_type;
-   struct type *i386_sse_type;
+--- gdb-6.8.50.20090802.orig/gdb/i386-tdep.h	2009-07-02 19:25:54.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/i386-tdep.h	2009-08-03 15:50:29.000000000 +0200
+@@ -115,6 +115,9 @@ struct gdbarch_tdep
+   int (*i386_intx80_record) (struct regcache *regcache);
+   /* Parse sysenter args.  */
+   int (*i386_sysenter_record) (struct regcache *regcache);
 +
 +  /* Detect OS dependent outermost frames; such as `clone'.  */
 +  int (*outermost_frame_p) (struct frame_info *this_frame);
  };
  
  /* Floating-point registers.  */
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.c
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.threads/bt-clone-stop.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.c	2008-12-08 11:00:43.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.threads/bt-clone-stop.c	2009-08-03 15:50:08.000000000 +0200
 @@ -0,0 +1,39 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -210,10 +210,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +	for (;;)
 +		pause();
 +}
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.exp
+Index: gdb-6.8.50.20090802/gdb/testsuite/gdb.threads/bt-clone-stop.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/bt-clone-stop.exp	2008-12-08 11:00:43.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/testsuite/gdb.threads/bt-clone-stop.exp	2009-08-03 15:50:08.000000000 +0200
 @@ -0,0 +1,61 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +

gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch:
 symtab.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch	14 Jul 2008 09:09:04 -0000	1.2
+++ gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch	4 Aug 2009 05:37:28 -0000	1.3
@@ -1,11 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 
 
-Index: gdb-6.8/gdb/symtab.c
+Index: gdb-6.8.50.20090803/gdb/symtab.c
 ===================================================================
---- gdb-6.8.orig/gdb/symtab.c	2008-02-05 23:17:40.000000000 +0100
-+++ gdb-6.8/gdb/symtab.c	2008-07-14 10:27:32.000000000 +0200
-@@ -2132,6 +2132,13 @@ find_pc_sect_line (CORE_ADDR pc, struct 
+--- gdb-6.8.50.20090803.orig/gdb/symtab.c	2009-08-03 16:09:36.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symtab.c	2009-08-03 16:13:13.000000000 +0200
+@@ -2261,6 +2261,13 @@ find_pc_sect_line (CORE_ADDR pc, struct 
  	  /* See above comment about why warning is commented out */
  	  /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_LINKAGE_NAME (msymbol)) */ ;
  	/* fall through */
@@ -14,7 +14,7 @@ Index: gdb-6.8/gdb/symtab.c
 +	   Avoid `find_pc_sect_line'<->`find_pc_line' infinite loop.
 +	   Red Hat Bug 218379.  */
 +	else if (SYMBOL_VALUE (mfunsym) == pc)
-+	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", SYMBOL_LINKAGE_NAME (msymbol), paddr (pc));
++	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", SYMBOL_LINKAGE_NAME (msymbol), paddress (target_gdbarch, pc));
 +	/* fall through */
  	else
  	  return find_pc_line (SYMBOL_VALUE_ADDRESS (mfunsym), 0);

gdb-6.5-gcore-i386-on-amd64.patch:
 amd64-linux-nat.c |  127 ++++++++++++++++++++++++++
 config.in         |    9 +
 configure         |  262 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac      |    5 +
 gcore.c           |    5 +
 gdb_procfs32.h    |  128 ++++++++++++++++++++++++++
 gdb_user32.h      |  108 ++++++++++++++++++++++
 linux-nat.c       |   27 ++++-
 linux-nat.h       |    9 +
 9 files changed, 674 insertions(+), 6 deletions(-)

Index: gdb-6.5-gcore-i386-on-amd64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-gcore-i386-on-amd64.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.5-gcore-i386-on-amd64.patch	14 Dec 2008 20:44:09 -0000	1.6
+++ gdb-6.5-gcore-i386-on-amd64.patch	4 Aug 2009 05:37:28 -0000	1.7
@@ -23,21 +23,21 @@
 
 	Port to GDB-6.8pre.
 
-Index: gdb-6.8.50.20081214/gdb/amd64-linux-nat.c
+Index: gdb-6.8.50.20090802/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/amd64-linux-nat.c	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/amd64-linux-nat.c	2008-12-14 21:24:19.000000000 +0100
-@@ -50,6 +50,9 @@
- #include "amd64-tdep.h"
+--- gdb-6.8.50.20090802.orig/gdb/amd64-linux-nat.c	2009-06-17 20:44:23.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/amd64-linux-nat.c	2009-08-03 15:49:33.000000000 +0200
+@@ -51,6 +51,9 @@
  #include "i386-linux-tdep.h"
  #include "amd64-nat.h"
+ #include "i386-nat.h"
 +#include "i387-tdep.h"
 +#include "elf-bfd.h"
 +#include "gdb_procfs32.h"
  
  /* Mapping between the general-purpose registers in GNU/Linux x86-64
     `struct user' format and GDB's register cache layout.  */
-@@ -84,6 +87,35 @@ static int amd64_linux_gregset64_reg_off
+@@ -85,6 +88,35 @@ static int amd64_linux_gregset64_reg_off
     GNU/Linux i386 registers are all 32-bit, but since we're
     little-endian we get away with that.  */
  
@@ -73,7 +73,7 @@ Index: gdb-6.8.50.20081214/gdb/amd64-lin
  /* From <sys/reg.h> on GNU/Linux i386.  */
  static int amd64_linux_gregset32_reg_offset[] =
  {
-@@ -102,6 +134,96 @@ static int amd64_linux_gregset32_reg_off
+@@ -103,6 +135,96 @@ static int amd64_linux_gregset32_reg_off
  };
  
  
@@ -84,7 +84,7 @@ Index: gdb-6.8.50.20081214/gdb/amd64-lin
 +amd64_linux_elfcore_write_prpsinfo (bfd *abfd, char *buf, int *bufsiz,
 +				    const char *fname, const char *psargs)
 +{
-+  if (gdbarch_ptr_bit(current_gdbarch) == 32)
++  if (gdbarch_ptr_bit (target_gdbarch) == 32)
 +    {
 +      int note_type;
 +      char *note_name = "CORE";
@@ -118,7 +118,7 @@ Index: gdb-6.8.50.20081214/gdb/amd64-lin
 +amd64_linux_elfcore_write_prstatus (bfd *abfd, char *buf, int *bufsiz,
 +			      long pid, int cursig, const void *gregs)
 +{
-+  if (gdbarch_ptr_bit(current_gdbarch) == 32)
++  if (gdbarch_ptr_bit (target_gdbarch) == 32)
 +    {
 +      char *note_name = "CORE";
 +      struct elf_prstatus32 prstat;
@@ -151,7 +151,7 @@ Index: gdb-6.8.50.20081214/gdb/amd64-lin
 +				   int *bufsiz, const void *fpregs, int size,
 +				   struct regcache *regcache)
 +{
-+  if (gdbarch_ptr_bit(current_gdbarch) == 32)
++  if (gdbarch_ptr_bit (target_gdbarch) == 32)
 +    {
 +      char *note_name = "CORE";
 +      elf_fpregset32_t fpregs32;
@@ -170,7 +170,7 @@ Index: gdb-6.8.50.20081214/gdb/amd64-lin
  /* Transfering the general-purpose registers between GDB, inferiors
     and core files.  */
  
-@@ -431,6 +553,11 @@ _initialize_amd64_linux_nat (void)
+@@ -682,6 +804,11 @@ _initialize_amd64_linux_nat (void)
    t->to_fetch_registers = amd64_linux_fetch_inferior_registers;
    t->to_store_registers = amd64_linux_store_inferior_registers;
  
@@ -182,11 +182,11 @@ Index: gdb-6.8.50.20081214/gdb/amd64-lin
    /* Register the target.  */
    linux_nat_add_target (t);
    linux_nat_set_new_thread (t, amd64_linux_new_thread);
-Index: gdb-6.8.50.20081214/gdb/config.in
+Index: gdb-6.8.50.20090802/gdb/config.in
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/config.in	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/config.in	2008-12-14 21:34:50.000000000 +0100
-@@ -136,6 +136,9 @@
+--- gdb-6.8.50.20090802.orig/gdb/config.in	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/config.in	2009-08-03 15:48:31.000000000 +0200
+@@ -146,6 +146,9 @@
  /* Define to 1 if you have the <elf_hp.h> header file. */
  #undef HAVE_ELF_HP_H
  
@@ -196,7 +196,7 @@ Index: gdb-6.8.50.20081214/gdb/config.in
  /* Define to 1 if your system has the etext variable. */
  #undef HAVE_ETEXT
  
-@@ -465,6 +468,9 @@
+@@ -487,6 +490,9 @@
  /* Define to 1 if you have the <sys/poll.h> header file. */
  #undef HAVE_SYS_POLL_H
  
@@ -206,7 +206,7 @@ Index: gdb-6.8.50.20081214/gdb/config.in
  /* Define to 1 if you have the <sys/procfs.h> header file. */
  #undef HAVE_SYS_PROCFS_H
  
-@@ -492,6 +498,9 @@
+@@ -514,6 +520,9 @@
  /* Define to 1 if you have the <sys/types.h> header file. */
  #undef HAVE_SYS_TYPES_H
  
@@ -216,11 +216,11 @@ Index: gdb-6.8.50.20081214/gdb/config.in
  /* Define to 1 if you have the <sys/user.h> header file. */
  #undef HAVE_SYS_USER_H
  
-Index: gdb-6.8.50.20081214/gdb/configure
+Index: gdb-6.8.50.20090802/gdb/configure
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/configure	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/configure	2008-12-14 21:33:30.000000000 +0100
-@@ -12026,6 +12026,268 @@ _ACEOF
+--- gdb-6.8.50.20090802.orig/gdb/configure	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/configure	2009-08-03 15:48:31.000000000 +0200
+@@ -12545,6 +12545,268 @@ _ACEOF
  
  fi
  
@@ -489,11 +489,11 @@ Index: gdb-6.8.50.20081214/gdb/configure
  # elf_hp.h is for HP/UX 64-bit shared library support.
  # FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h)
  # unconditionally, so what's the point in checking these?
-Index: gdb-6.8.50.20081214/gdb/configure.ac
+Index: gdb-6.8.50.20090802/gdb/configure.ac
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/configure.ac	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/configure.ac	2008-12-14 21:32:35.000000000 +0100
-@@ -686,6 +686,11 @@ AC_SUBST(PYTHON_CFLAGS)
+--- gdb-6.8.50.20090802.orig/gdb/configure.ac	2009-08-03 09:50:57.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/configure.ac	2009-08-03 15:48:31.000000000 +0200
+@@ -744,6 +744,11 @@ AC_SUBST(PYTHON_CFLAGS)
  AC_HEADER_DIRENT
  AC_HEADER_STAT
  AC_HEADER_STDC
@@ -505,11 +505,11 @@ Index: gdb-6.8.50.20081214/gdb/configure
  # elf_hp.h is for HP/UX 64-bit shared library support.
  # FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h)
  # unconditionally, so what's the point in checking these?
-Index: gdb-6.8.50.20081214/gdb/gcore.c
+Index: gdb-6.8.50.20090802/gdb/gcore.c
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/gcore.c	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/gcore.c	2008-12-14 21:17:10.000000000 +0100
-@@ -320,6 +320,11 @@ gcore_create_callback (CORE_ADDR vaddr, 
+--- gdb-6.8.50.20090802.orig/gdb/gcore.c	2009-08-03 12:28:56.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/gcore.c	2009-08-03 15:48:31.000000000 +0200
+@@ -324,6 +324,11 @@ gcore_create_callback (CORE_ADDR vaddr, 
    asection *osec;
    flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
  
@@ -521,10 +521,10 @@ Index: gdb-6.8.50.20081214/gdb/gcore.c
    /* If the memory segment has no permissions set, ignore it, otherwise
       when we later try to access it for read/write, we'll get an error
       or jam the kernel.  */
-Index: gdb-6.8.50.20081214/gdb/gdb_procfs32.h
+Index: gdb-6.8.50.20090802/gdb/gdb_procfs32.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081214/gdb/gdb_procfs32.h	2008-12-14 21:32:56.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/gdb_procfs32.h	2009-08-03 15:48:31.000000000 +0200
 @@ -0,0 +1,128 @@
 +#ifdef HAVE_SYS_PROCFS32_H
 +#include <sys/procfs32.h>
@@ -654,10 +654,10 @@ Index: gdb-6.8.50.20081214/gdb/gdb_procf
 +#endif	/* _SYS_PROCFS32_H */
 +
 +#endif /* HAVE_SYS_PROCFS32_H */
-Index: gdb-6.8.50.20081214/gdb/gdb_user32.h
+Index: gdb-6.8.50.20090802/gdb/gdb_user32.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081214/gdb/gdb_user32.h	2008-12-14 21:17:10.000000000 +0100
++++ gdb-6.8.50.20090802/gdb/gdb_user32.h	2009-08-03 15:48:31.000000000 +0200
 @@ -0,0 +1,108 @@
 +#ifdef HAVE_SYS_USER32_H
 +#include <sys/user32.h>
@@ -767,11 +767,11 @@ Index: gdb-6.8.50.20081214/gdb/gdb_user3
 +#endif	/* _SYS_USER32_H */
 +
 +#endif /* HAVE_SYS_USER32_H */
-Index: gdb-6.8.50.20081214/gdb/linux-nat.c
+Index: gdb-6.8.50.20090802/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/linux-nat.c	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/linux-nat.c	2008-12-14 21:24:20.000000000 +0100
-@@ -213,6 +213,21 @@ static LONGEST (*super_xfer_partial) (st
+--- gdb-6.8.50.20090802.orig/gdb/linux-nat.c	2009-08-03 12:31:26.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/linux-nat.c	2009-08-03 15:48:31.000000000 +0200
+@@ -219,6 +219,21 @@ static LONGEST (*super_xfer_partial) (st
  				      const gdb_byte *,
  				      ULONGEST, LONGEST);
  
@@ -793,7 +793,7 @@ Index: gdb-6.8.50.20081214/gdb/linux-nat
  static int debug_linux_nat;
  static void
  show_debug_linux_nat (struct ui_file *file, int from_tty,
-@@ -3473,7 +3488,7 @@ linux_nat_do_thread_registers (bfd *obfd
+@@ -3586,7 +3601,7 @@ linux_nat_do_thread_registers (bfd *obfd
    else
      fill_gregset (regcache, &gregs, -1);
  
@@ -802,7 +802,7 @@ Index: gdb-6.8.50.20081214/gdb/linux-nat
  					       note_data,
  					       note_size,
  					       lwp,
-@@ -3523,10 +3538,10 @@ linux_nat_do_thread_registers (bfd *obfd
+@@ -3636,10 +3651,10 @@ linux_nat_do_thread_registers (bfd *obfd
        else
  	fill_fpregset (regcache, &fpregs, -1);
  
@@ -815,7 +815,7 @@ Index: gdb-6.8.50.20081214/gdb/linux-nat
      }
  
    return note_data;
-@@ -3595,9 +3610,9 @@ linux_nat_make_corefile_notes (bfd *obfd
+@@ -3822,9 +3837,9 @@ linux_nat_make_corefile_notes (bfd *obfd
  		       psargs_end - string_end);
  	    }
  	}
@@ -828,11 +828,11 @@ Index: gdb-6.8.50.20081214/gdb/linux-nat
      }
  
    /* Dump information for threads.  */
-Index: gdb-6.8.50.20081214/gdb/linux-nat.h
+Index: gdb-6.8.50.20090802/gdb/linux-nat.h
 ===================================================================
---- gdb-6.8.50.20081214.orig/gdb/linux-nat.h	2008-12-14 21:17:01.000000000 +0100
-+++ gdb-6.8.50.20081214/gdb/linux-nat.h	2008-12-14 21:24:11.000000000 +0100
-@@ -134,3 +134,12 @@ void linux_nat_switch_fork (ptid_t new_p
+--- gdb-6.8.50.20090802.orig/gdb/linux-nat.h	2009-08-03 10:52:00.000000000 +0200
++++ gdb-6.8.50.20090802/gdb/linux-nat.h	2009-08-03 15:48:31.000000000 +0200
+@@ -144,3 +144,12 @@ void linux_nat_switch_fork (ptid_t new_p
  
  /* Return the saved siginfo associated with PTID.  */
  struct siginfo *linux_nat_get_siginfo (ptid_t ptid);

gdb-6.6-buildid-locate-rpm.patch:
 aclocal.m4                   |  156 +++++++++++
 config.in                    |    6 
 configure                    |  576 ++++++++++++++++++++++++++++++++++++++++++-
 configure.ac                 |  193 ++++++++++++++
 event-top.c                  |    5 
 symfile.c                    |  387 ++++++++++++++++++++++++++++
 symfile.h                    |    1 
 testsuite/lib/gdb.exp        |    2 
 testsuite/lib/mi-support.exp |    2 
 tui/tui-interp.c             |    3 
 10 files changed, 1320 insertions(+), 11 deletions(-)

Index: gdb-6.6-buildid-locate-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.6-buildid-locate-rpm.patch	12 Jun 2009 21:57:38 -0000	1.4
+++ gdb-6.6-buildid-locate-rpm.patch	4 Aug 2009 05:37:28 -0000	1.5
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090302/gdb/event-top.c
+Index: gdb-6.8.50.20090803/gdb/event-top.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/event-top.c	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/event-top.c	2009-03-07 17:25:06.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/event-top.c	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/event-top.c	2009-08-03 16:17:59.000000000 +0200
 @@ -33,6 +33,7 @@
  #include "cli/cli-script.h"     /* for reset_command_nest_depth */
  #include "main.h"
@@ -28,11 +28,11 @@ Index: gdb-6.8.50.20090302/gdb/event-top
    /* Each interpreter has its own rules on displaying the command
       prompt.  */
    if (!current_interp_display_prompt_p ())
-Index: gdb-6.8.50.20090302/gdb/symfile.c
+Index: gdb-6.8.50.20090803/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile.c	2009-03-07 17:22:21.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/symfile.c	2009-03-07 17:26:47.000000000 +0100
-@@ -55,6 +55,7 @@
+--- gdb-6.8.50.20090803.orig/gdb/symfile.c	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile.c	2009-08-03 16:17:59.000000000 +0200
+@@ -56,6 +56,7 @@
  #include "solib.h"
  #include "remote.h"
  #include "libbfd.h"
@@ -40,7 +40,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -63,6 +64,7 @@
+@@ -64,6 +65,7 @@
  #include <ctype.h>
  #include <time.h>
  #include <sys/time.h>
@@ -48,7 +48,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
  
  int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num);
-@@ -1684,8 +1686,352 @@ build_id_to_filename (struct build_id *b
+@@ -1692,8 +1694,352 @@ build_id_to_filename (struct build_id *b
    return retval;
  }
  
@@ -402,7 +402,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
     avoidance.  */
  
  struct missing_filepair
-@@ -1739,11 +2085,17 @@ missing_filepair_change (void)
+@@ -1747,11 +2093,17 @@ missing_filepair_change (void)
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -420,7 +420,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
    missing_filepair_change ();
  }
  
-@@ -1802,14 +2154,33 @@ debug_print_missing (const char *binary,
+@@ -1818,14 +2170,33 @@ debug_print_missing (const char *binary,
  
    *slot = missing_filepair;
  
@@ -461,11 +461,11 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  }
  
  static char *
-Index: gdb-6.8.50.20090302/gdb/symfile.h
+Index: gdb-6.8.50.20090803/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile.h	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/symfile.h	2009-03-07 17:25:06.000000000 +0100
-@@ -378,6 +378,7 @@ extern struct build_id *build_id_addr_ge
+--- gdb-6.8.50.20090803.orig/gdb/symfile.h	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile.h	2009-08-03 16:17:59.000000000 +0200
+@@ -394,6 +394,7 @@ extern struct build_id *build_id_addr_ge
  extern char *build_id_to_filename (struct build_id *build_id,
  				   char **link_return, int add_debug_suffix);
  extern void debug_print_missing (const char *binary, const char *debug);
@@ -473,11 +473,11 @@ Index: gdb-6.8.50.20090302/gdb/symfile.h
  
  /* From dwarf2read.c */
  
-Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp	2009-03-07 17:25:06.000000000 +0100
-@@ -1230,7 +1230,7 @@ proc default_gdb_start { } {
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/gdb.exp	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp	2009-08-03 16:17:59.000000000 +0200
+@@ -1248,7 +1248,7 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -486,8 +486,10 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
      send_gdb "set build-id-verbose 0\n"
      gdb_expect 10 {
  	-re "$gdb_prompt $" {
---- ./gdb/testsuite/lib/mi-support.exp	2009-03-22 16:37:58.000000000 +0100
-+++ ./gdb/testsuite/lib/mi-support.exp	2009-03-22 16:37:12.000000000 +0100
+Index: gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/mi-support.exp	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp	2009-08-03 16:17:59.000000000 +0200
 @@ -221,7 +221,7 @@ proc default_mi_gdb_start { args } {
  	    }
      	}
@@ -497,10 +499,10 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
      send_gdb "190-gdb-set build-id-verbose 0\n"
      gdb_expect 10 {
  	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
-Index: gdb-6.8.50.20090302/gdb/tui/tui-interp.c
+Index: gdb-6.8.50.20090803/gdb/tui/tui-interp.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/tui/tui-interp.c	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/tui/tui-interp.c	2009-03-07 17:25:06.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/tui/tui-interp.c	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/tui/tui-interp.c	2009-08-03 16:17:59.000000000 +0200
 @@ -30,6 +30,7 @@
  #include "tui/tui.h"
  #include "tui/tui-io.h"
@@ -518,10 +520,10 @@ Index: gdb-6.8.50.20090302/gdb/tui/tui-i
        /* Tell readline what the prompt to display is and what function
           it will need to call after a whole line is read. This also
           displays the first prompt.  */
-Index: gdb-6.8.50.20090302/gdb/aclocal.m4
+Index: gdb-6.8.50.20090803/gdb/aclocal.m4
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/aclocal.m4	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/aclocal.m4	2009-03-07 17:25:06.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/aclocal.m4	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/aclocal.m4	2009-08-03 16:19:22.000000000 +0200
 @@ -11,6 +11,162 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -685,47 +687,11 @@ Index: gdb-6.8.50.20090302/gdb/aclocal.m
  # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
-@@ -468,6 +624,27 @@ AC_DEFUN([AM_PROG_INSTALL_SH],
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
- # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
- # From Jim Meyering
- 
-@@ -868,7 +1045,4 @@ m4_include([gnulib/m4/onceonly_2_57.m4])
- m4_include([gnulib/m4/stdint.m4])
- m4_include([gnulib/m4/string_h.m4])
- m4_include([gnulib/m4/wchar.m4])
--m4_include([../config/extensions.m4])
--m4_include([../config/lead-dot.m4])
--m4_include([../config/proginstall.m4])
- m4_include([acinclude.m4])
-Index: gdb-6.8.50.20090302/gdb/config.in
+Index: gdb-6.8.50.20090803/gdb/config.in
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/config.in	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/config.in	2009-03-07 17:25:06.000000000 +0100
-@@ -38,6 +38,9 @@
+--- gdb-6.8.50.20090803.orig/gdb/config.in	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/config.in	2009-08-03 16:17:59.000000000 +0200
+@@ -39,6 +39,9 @@
  /* Define to BFD's default target vector. */
  #undef DEFAULT_BFD_VEC
  
@@ -735,7 +701,7 @@ Index: gdb-6.8.50.20090302/gdb/config.in
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
  #undef ENABLE_NLS
-@@ -211,6 +214,9 @@
+@@ -218,6 +221,9 @@
  /* Define if Python 2.6 is being used. */
  #undef HAVE_LIBPYTHON2_6
  
@@ -745,16 +711,16 @@ Index: gdb-6.8.50.20090302/gdb/config.in
  /* Define if libunwind library is being used. */
  #undef HAVE_LIBUNWIND
  
-Index: gdb-6.8.50.20090302/gdb/configure
+Index: gdb-6.8.50.20090803/gdb/configure
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/configure	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/configure	2009-03-07 17:25:06.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/configure	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/configure	2009-08-03 16:20:09.000000000 +0200
 @@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all doc test
  ac_subdirs_all="$ac_subdirs_all gdbtk"
  ac_subdirs_all="$ac_subdirs_all multi-ice"
  ac_subdirs_all="$ac_subdirs_all gdbserver"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_
 STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI
 ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE GDB_DATADIR_PATH pythondir subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG LIBICONV LIBICONV_INCLUDE LIBICONV_LIBDIR READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC
 _DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_
 STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI
 ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE GDB_DATADIR_PATH pythondir PKG_CONFIG ac_pt_PKG_CONFIG RPM_CFLAGS RPM_LIBS subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG LIBICONV LIBICONV_INCLUDE LIBICONV_LIBDIR READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP
  TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_
 STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI
 ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE DEBUGDIR GDB_DATADIR GDB_DATADIR_PATH pythondir subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE SYSTEM_GDBINIT WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR T
 CL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags GDB_NM_FILE datarootdir docdir htmldir pdfdir LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_
 STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SI
 ZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE DEBUGDIR GDB_DATADIR GDB_DATADIR_PATH pythondir PKG_CONFIG ac_pt_PKG_CONFIG RPM_CFLAGS RPM_LIBS subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE SYSTEM_GDBINIT WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_V
 ERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags GDB_NM_FILE datarootdir docdir htmldir pdfdir LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS'
  ac_subst_files='host_makefile_frag'
  ac_pwd=`pwd`
  
@@ -777,16 +743,16 @@ Index: gdb-6.8.50.20090302/gdb/configure
  
  #
  # Report the --help message.
-@@ -886,6 +898,8 @@ Optional Packages:
+@@ -895,6 +907,8 @@ Optional Packages:
                            [DATADIR/gdb]
    --with-pythondir        install Python data files in this path
                            [DATADIR/gdb/python]
 +  --with-rpm              query rpm database for missing debuginfos
 +                          [yes/no,], [def.], [auto=librpm.so]
-   --with-libunwind            Use libunwind frame unwinding support
-   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
-   --with-bugurl=URL       Direct users to URL to report a bug
-@@ -913,6 +927,9 @@ Some influential environment variables:
+   --with-libunwind        use libunwind frame unwinding support
+   --with-curses           use the curses library instead of the termcap
+                           library
+@@ -932,6 +946,9 @@ Some influential environment variables:
    CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
                headers in a nonstandard directory <include dir>
    CPP         C preprocessor
@@ -796,56 +762,7 @@ Index: gdb-6.8.50.20090302/gdb/configure
  
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-@@ -6556,7 +6573,6 @@ am__api_version="1.9"
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--# Reject install programs that cannot install multiple files.
- echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
-@@ -6590,18 +6606,8 @@ case $as_dir/ in
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
--	    rm -rf conftest.one conftest.two conftest.dir
--	    echo one > conftest.one
--	    echo two > conftest.two
--	    mkdir conftest.dir
--	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
--	      test -s conftest.one && test -s conftest.two &&
--	      test -s conftest.dir/conftest.one &&
--	      test -s conftest.dir/conftest.two
--	    then
--	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--	      break 3
--	    fi
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
- 	  fi
- 	fi
-       done
-@@ -6610,16 +6616,15 @@ case $as_dir/ in
- esac
- done
- 
--rm -rf conftest.one conftest.two conftest.dir
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
--    # As a last resort, use the slow shell script.  Don't cache a
--    # value for INSTALL within a source directory, because that will
-+    # As a last resort, use the slow shell script.  We don't cache a
-+    # path for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
--    # removed, or if the value is a relative name.
-+    # removed, or if the path is relative.
-     INSTALL=$ac_install_sh
-   fi
- fi
-@@ -7202,6 +7207,559 @@ _ACEOF
+@@ -7290,6 +7307,559 @@ _ACEOF
  fi
  
  
@@ -1405,57 +1322,8 @@ Index: gdb-6.8.50.20090302/gdb/configure
  
  
  
-@@ -8623,7 +9181,6 @@ done
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--# Reject install programs that cannot install multiple files.
- echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
-@@ -8657,18 +9214,8 @@ case $as_dir/ in
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
--	    rm -rf conftest.one conftest.two conftest.dir
--	    echo one > conftest.one
--	    echo two > conftest.two
--	    mkdir conftest.dir
--	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
--	      test -s conftest.one && test -s conftest.two &&
--	      test -s conftest.dir/conftest.one &&
--	      test -s conftest.dir/conftest.two
--	    then
--	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--	      break 3
--	    fi
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
- 	  fi
- 	fi
-       done
-@@ -8677,16 +9224,15 @@ case $as_dir/ in
- esac
- done
- 
--rm -rf conftest.one conftest.two conftest.dir
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
--    # As a last resort, use the slow shell script.  Don't cache a
--    # value for INSTALL within a source directory, because that will
-+    # As a last resort, use the slow shell script.  We don't cache a
-+    # path for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
--    # removed, or if the value is a relative name.
-+    # removed, or if the path is relative.
-     INSTALL=$ac_install_sh
-   fi
- fi
-@@ -22270,6 +22816,10 @@ s, at am__fastdepCC_TRUE@,$am__fastdepCC_TR
- s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+@@ -22513,6 +23083,10 @@ s, at DEBUGDIR@,$DEBUGDIR,;t t
+ s, at GDB_DATADIR@,$GDB_DATADIR,;t t
  s, at GDB_DATADIR_PATH@,$GDB_DATADIR_PATH,;t t
  s, at pythondir@,$pythondir,;t t
 +s, at PKG_CONFIG@,$PKG_CONFIG,;t t
@@ -1465,11 +1333,11 @@ Index: gdb-6.8.50.20090302/gdb/configure
  s, at subdirs@,$subdirs,;t t
  s, at TARGET_OBS@,$TARGET_OBS,;t t
  s, at PKGVERSION@,$PKGVERSION,;t t
-Index: gdb-6.8.50.20090302/gdb/configure.ac
+Index: gdb-6.8.50.20090803/gdb/configure.ac
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/configure.ac	2009-03-07 17:13:33.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/configure.ac	2009-03-07 17:25:06.000000000 +0100
-@@ -162,6 +162,199 @@ else
+--- gdb-6.8.50.20090803.orig/gdb/configure.ac	2009-08-03 16:17:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/configure.ac	2009-08-03 16:17:59.000000000 +0200
+@@ -153,6 +153,199 @@ else
  fi
  AC_SUBST(pythondir)
  

gdb-6.6-buildid-locate.patch:
 corelow.c                    |   61 ++++
 doc/gdb.texinfo              |   21 +
 solib-svr4.c                 |   30 +-
 symfile.c                    |  636 +++++++++++++++++++++++++++++++++++++++----
 symfile.h                    |    7 
 testsuite/lib/gdb.exp        |   10 
 testsuite/lib/mi-support.exp |   10 
 7 files changed, 724 insertions(+), 51 deletions(-)

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gdb-6.6-buildid-locate.patch	22 Jun 2009 11:19:51 -0000	1.22
+++ gdb-6.6-buildid-locate.patch	4 Aug 2009 05:37:28 -0000	1.23
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090302/gdb/corelow.c
+Index: gdb-6.8.50.20090803/gdb/corelow.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/corelow.c	2009-02-23 01:03:48.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/corelow.c	2009-03-07 17:04:57.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/corelow.c	2009-08-04 06:32:12.000000000 +0200
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -13,7 +13,7 @@ Index: gdb-6.8.50.20090302/gdb/corelow.c
  
  
  #ifndef O_LARGEFILE
-@@ -267,6 +271,50 @@ add_to_thread_list (bfd *abfd, asection 
+@@ -273,6 +277,50 @@ add_to_thread_list (bfd *abfd, asection 
      inferior_ptid = ptid;			 /* Yes, make it current */
  }
  
@@ -64,7 +64,7 @@ Index: gdb-6.8.50.20090302/gdb/corelow.c
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -363,6 +417,12 @@ core_open (char *filename, int from_tty)
+@@ -371,6 +419,12 @@ core_open (char *filename, int from_tty)
    push_target (&core_ops);
    discard_cleanups (old_chain);
  
@@ -77,7 +77,7 @@ Index: gdb-6.8.50.20090302/gdb/corelow.c
    add_inferior_silent (corelow_pid);
  
    /* Do this before acknowledging the inferior, so if
-@@ -751,4 +811,11 @@ _initialize_corelow (void)
+@@ -878,4 +932,11 @@ _initialize_corelow (void)
    init_core_ops ();
  
    add_target (&core_ops);
@@ -89,11 +89,11 @@ Index: gdb-6.8.50.20090302/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090803/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo	2009-03-07 17:04:56.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo	2009-03-07 17:04:57.000000000 +0100
-@@ -13294,6 +13294,27 @@ information files.
+--- gdb-6.8.50.20090803.orig/gdb/doc/gdb.texinfo	2009-08-04 06:31:59.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/doc/gdb.texinfo	2009-08-04 06:32:12.000000000 +0200
+@@ -13733,6 +13733,27 @@ information files.
  
  @end table
  
@@ -121,11 +121,11 @@ Index: gdb-6.8.50.20090302/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.50.20090302/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090803/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/solib-svr4.c	2009-03-07 17:04:52.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/solib-svr4.c	2009-03-07 17:04:57.000000000 +0100
-@@ -1000,9 +1000,33 @@ svr4_current_sos (void)
+--- gdb-6.8.50.20090803.orig/gdb/solib-svr4.c	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/solib-svr4.c	2009-08-04 06:32:12.000000000 +0200
+@@ -1101,9 +1101,33 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
  	    {
@@ -162,11 +162,11 @@ Index: gdb-6.8.50.20090302/gdb/solib-svr
  	    }
  	  xfree (buffer);
  
-Index: gdb-6.8.50.20090302/gdb/symfile.c
+Index: gdb-6.8.50.20090803/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile.c	2009-03-07 17:04:53.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/symfile.c	2009-03-07 17:22:21.000000000 +0100
-@@ -54,6 +54,7 @@
+--- gdb-6.8.50.20090803.orig/gdb/symfile.c	2009-08-04 06:31:58.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile.c	2009-08-04 06:32:12.000000000 +0200
+@@ -55,6 +55,7 @@
  #include "elf-bfd.h"
  #include "solib.h"
  #include "remote.h"
@@ -174,8 +174,8 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -1185,16 +1186,65 @@ symbol_file_clear (int from_tty)
-       printf_unfiltered (_("No symbol file now.\n"));
+@@ -1193,16 +1194,65 @@ symbol_file_clear (int from_tty)
+     printf_unfiltered (_("No symbol file now.\n"));
  }
  
 +/* Locate NT_GNU_BUILD_ID and return its matching debug filename.
@@ -242,7 +242,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  {
    struct build_id *retval;
  
-@@ -1210,6 +1260,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -1218,6 +1268,348 @@ build_id_bfd_get (bfd *abfd)
    return retval;
  }
  
@@ -591,7 +591,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value.  */
  
  static int
-@@ -1227,7 +1619,7 @@ build_id_verify (const char *filename, s
+@@ -1235,7 +1627,7 @@ build_id_verify (const char *filename, s
    if (abfd == NULL)
      return 0;
  
@@ -600,7 +600,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1246,8 +1638,9 @@ build_id_verify (const char *filename, s
+@@ -1254,8 +1646,9 @@ build_id_verify (const char *filename, s
    return retval;
  }
  
@@ -612,7 +612,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  {
    char *link, *s, *retval = NULL;
    gdb_byte *data = build_id->data;
-@@ -1255,7 +1648,9 @@ build_id_to_debug_filename (struct build
+@@ -1263,7 +1656,9 @@ build_id_to_debug_filename (struct build
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
    link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
@@ -623,7 +623,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
    s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
    if (size > 0)
      {
-@@ -1266,12 +1661,14 @@ build_id_to_debug_filename (struct build
+@@ -1274,12 +1669,14 @@ build_id_to_debug_filename (struct build
      *s++ = '/';
    while (size-- > 0)
      s += sprintf (s, "%02x", (unsigned) *data++);
@@ -640,7 +640,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1279,9 +1676,150 @@ build_id_to_debug_filename (struct build
+@@ -1287,9 +1684,150 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -791,7 +791,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1364,32 +1894,36 @@ static char *
+@@ -1372,32 +1910,36 @@ static char *
  find_separate_debug_file (struct objfile *objfile)
  {
    asection *sect;
@@ -836,7 +836,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1397,7 +1931,7 @@ find_separate_debug_file (struct objfile
+@@ -1405,7 +1947,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.  */
@@ -845,7 +845,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
    dir = xstrdup (objfile->name);
  
-@@ -1413,23 +1947,19 @@ find_separate_debug_file (struct objfile
+@@ -1421,23 +1963,19 @@ find_separate_debug_file (struct objfile
    gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
    dir[i+1] = '\0';
  
@@ -876,7 +876,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
    /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
    strcpy (debugfile, dir);
-@@ -1438,11 +1968,7 @@ find_separate_debug_file (struct objfile
+@@ -1446,11 +1984,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -889,7 +889,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
-@@ -1451,11 +1977,7 @@ find_separate_debug_file (struct objfile
+@@ -1459,11 +1993,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -902,7 +902,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  
    /* If the file is in the sysroot, try using its base path in the
       global debugfile directory.  */
-@@ -1470,20 +1992,18 @@ find_separate_debug_file (struct objfile
+@@ -1478,20 +2008,18 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, basename);
  
        if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -931,7 +931,7 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
  }
  
  
-@@ -4216,4 +4736,16 @@ Show printing of symbol loading messages
+@@ -4243,4 +4771,16 @@ Show printing of symbol loading messages
                             NULL,
                             NULL,
                             &setprintlist, &showprintlist);
@@ -948,11 +948,11 @@ Index: gdb-6.8.50.20090302/gdb/symfile.c
 +
 +  observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-6.8.50.20090302/gdb/symfile.h
+Index: gdb-6.8.50.20090803/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/symfile.h	2009-03-07 17:04:52.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/symfile.h	2009-03-07 17:13:33.000000000 +0100
-@@ -372,6 +372,13 @@ extern int symfile_map_offsets_to_segmen
+--- gdb-6.8.50.20090803.orig/gdb/symfile.h	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/symfile.h	2009-08-04 06:32:12.000000000 +0200
+@@ -388,6 +388,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);
  
@@ -966,11 +966,11 @@ Index: gdb-6.8.50.20090302/gdb/symfile.h
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
-Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp	2009-03-07 17:04:52.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp	2009-03-07 17:13:33.000000000 +0100
-@@ -1230,6 +1230,16 @@ proc default_gdb_start { } {
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/gdb.exp	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp	2009-08-04 06:32:12.000000000 +0200
+@@ -1248,6 +1248,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -987,8 +987,10 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
      return 0;
  }
  
---- ./gdb/testsuite/lib/mi-support.exp	2009-03-21 21:09:09.000000000 +0100
-+++ ./gdb/testsuite/lib/mi-support.exp	2009-03-22 16:37:58.000000000 +0100
+Index: gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/mi-support.exp	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp	2009-08-04 06:32:12.000000000 +0200
 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } {
  	    }
      	}

gdb-6.6-multifork-debugreg.patch:
 amd64-linux-nat.c                               |  113 ++++++++++++++-
 config/i386/nm-linux.h                          |   10 +
 config/i386/nm-linux64.h                        |   10 +
 doc/gdb.texinfo                                 |    8 +
 i386-linux-nat.c                                |  108 ++++++++++++++-
 i386-nat.c                                      |   12 +
 ia64-linux-nat.c                                |   64 ++++++++
 ppc-linux-nat.c                                 |   57 +++++++
 s390-nat.c                                      |   82 ++++++++++-
 target.h                                        |    4 
 testsuite/gdb.threads/watchpoint-fork-forkoff.c |  172 ++++++++++++++++++++++++
 testsuite/gdb.threads/watchpoint-fork-mt.c      |  154 +++++++++++++++++++++
 testsuite/gdb.threads/watchpoint-fork.c         |   56 +++++++
 testsuite/gdb.threads/watchpoint-fork.exp       |  140 +++++++++++++++++++
 14 files changed, 964 insertions(+), 26 deletions(-)

Index: gdb-6.6-multifork-debugreg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-multifork-debugreg.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gdb-6.6-multifork-debugreg.patch	11 Feb 2009 00:04:47 -0000	1.9
+++ gdb-6.6-multifork-debugreg.patch	4 Aug 2009 05:37:28 -0000	1.10
@@ -28,12 +28,12 @@ http://sourceware.org/ml/gdb-patches/200
 	* s390-nat.c (s390_fix_watch_points): Fix its compilation failure
 	- rename it to S390_FIX_WATCH_POINTS_LIST.
 
-Index: gdb-6.8.50.20090209/gdb/amd64-linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/amd64-linux-nat.c	2009-02-09 16:02:27.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/amd64-linux-nat.c	2009-02-09 16:03:30.000000000 +0100
-@@ -408,25 +408,43 @@ amd64_linux_dr_set (ptid_t ptid, int reg
- void
+--- gdb-6.8.50.20090803.orig/gdb/amd64-linux-nat.c	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/amd64-linux-nat.c	2009-08-04 07:17:58.000000000 +0200
+@@ -411,25 +411,43 @@ amd64_linux_dr_set (ptid_t ptid, int reg
+ static void
  amd64_linux_dr_set_control (unsigned long control)
  {
 -  struct lwp_info *lp;
@@ -58,7 +58,7 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
 +    }
  }
  
- void
+ static void
  amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr)
  {
 -  struct lwp_info *lp;
@@ -85,8 +85,8 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
 +    }
  }
  
- void
-@@ -451,6 +469,41 @@ amd64_linux_new_thread (ptid_t ptid)
+ static void
+@@ -454,6 +472,42 @@ amd64_linux_new_thread (ptid_t ptid)
  
    amd64_linux_dr_set (ptid, DR_CONTROL, amd64_linux_dr[DR_CONTROL]);
  }
@@ -108,7 +108,7 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
 +  /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions.  */
 +  amd64_linux_detach_breakpoints_pid = 0;
 +
-+  return i386_remove_watchpoint (addr, len, type);
++  return target_remove_watchpoint (addr, len, type);
 +}
 +
 +static void
@@ -116,6 +116,7 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
 +{
 +  struct cleanup *old_chain = save_inferior_ptid ();
 +  int i;
++  extern void i386_detach_breakpoints (int detached_pid);
 +
 +  amd64_linux_detach_breakpoints_pid = detached_pid;
 +  /* Depend on `!is_lwp (inferior_ptid)' for the I386_* macros.  */
@@ -128,7 +129,7 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
  
  
  /* This function is called by libthread_db as part of its handling of
-@@ -755,6 +808,42 @@ amd64_linux_siginfo_fixup (struct siginf
+@@ -767,6 +821,42 @@ amd64_linux_siginfo_fixup (struct siginf
      return 0;
  }
  
@@ -171,7 +172,7 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
  /* Provide a prototype to silence -Wmissing-prototypes.  */
  void _initialize_amd64_linux_nat (void);
  
-@@ -791,6 +880,9 @@ _initialize_amd64_linux_nat (void)
+@@ -809,6 +899,9 @@ _initialize_amd64_linux_nat (void)
    linux_elfcore_write_prstatus = amd64_linux_elfcore_write_prstatus;
    linux_elfcore_write_prfpreg = amd64_linux_elfcore_write_prfpreg;
  
@@ -181,24 +182,11 @@ Index: gdb-6.8.50.20090209/gdb/amd64-lin
    /* Register the target.  */
    linux_nat_add_target (t);
    linux_nat_set_new_thread (t, amd64_linux_new_thread);
-Index: gdb-6.8.50.20090209/gdb/config/i386/nm-i386.h
-===================================================================
---- gdb-6.8.50.20090209.orig/gdb/config/i386/nm-i386.h	2009-01-03 06:57:54.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/config/i386/nm-i386.h	2009-02-09 16:02:42.000000000 +0100
-@@ -120,6 +120,8 @@ extern int i386_stopped_by_watchpoint (v
- 
- #endif /* I386_WATCHPOINTS_IN_TARGET_VECTOR */
- 
-+extern void i386_detach_breakpoints (int detached_pid);
-+
- #endif /* I386_USE_GENERIC_WATCHPOINTS */
- 
- #endif /* NM_I386_H */
-Index: gdb-6.8.50.20090209/gdb/i386-linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/i386-linux-nat.c	2009-01-03 06:57:51.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/i386-linux-nat.c	2009-02-09 16:02:42.000000000 +0100
-@@ -634,21 +634,42 @@ i386_linux_dr_set_control (unsigned long
+--- gdb-6.8.50.20090803.orig/gdb/i386-linux-nat.c	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/i386-linux-nat.c	2009-08-04 07:26:43.000000000 +0200
+@@ -637,21 +637,42 @@ i386_linux_dr_set_control (unsigned long
    ptid_t ptid;
  
    i386_linux_dr[DR_CONTROL] = control;
@@ -220,7 +208,7 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
 +    }
  }
  
- void
+ static void
  i386_linux_dr_set_addr (int regnum, CORE_ADDR addr)
  {
 -  struct lwp_info *lp;
@@ -247,8 +235,8 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
 +    }
  }
  
- void
-@@ -673,6 +694,41 @@ i386_linux_new_thread (ptid_t ptid)
+ static void
+@@ -676,6 +697,42 @@ i386_linux_new_thread (ptid_t ptid)
  
    i386_linux_dr_set (ptid, DR_CONTROL, i386_linux_dr[DR_CONTROL]);
  }
@@ -270,7 +258,7 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
 +  /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions.  */
 +  i386_linux_detach_breakpoints_pid = 0;
 +
-+  return i386_remove_watchpoint (addr, len, type);
++  return target_remove_watchpoint (addr, len, type);
 +}
 +
 +static void
@@ -278,6 +266,7 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
 +{
 +  struct cleanup *old_chain = save_inferior_ptid ();
 +  int i;
++  extern void i386_detach_breakpoints (int detached_pid);
 +
 +  i386_linux_detach_breakpoints_pid = detached_pid;
 +  /* Depend on `!is_lwp (inferior_ptid)' for the I386_* macros.  */
@@ -290,7 +279,7 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
  
  
  /* Called by libthread_db.  Returns a pointer to the thread local
-@@ -812,6 +868,40 @@ i386_linux_child_post_startup_inferior (
+@@ -818,6 +875,40 @@ i386_linux_child_post_startup_inferior (
    super_post_startup_inferior (ptid);
  }
  
@@ -331,7 +320,7 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
  void
  _initialize_i386_linux_nat (void)
  {
-@@ -833,6 +923,9 @@ _initialize_i386_linux_nat (void)
+@@ -845,6 +936,9 @@ _initialize_i386_linux_nat (void)
    t->to_fetch_registers = i386_linux_fetch_inferior_registers;
    t->to_store_registers = i386_linux_store_inferior_registers;
  
@@ -341,11 +330,11 @@ Index: gdb-6.8.50.20090209/gdb/i386-linu
    /* Register the target.  */
    linux_nat_add_target (t);
    linux_nat_set_new_thread (t, i386_linux_new_thread);
-Index: gdb-6.8.50.20090209/gdb/i386-nat.c
+Index: gdb-6.8.50.20090803/gdb/i386-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/i386-nat.c	2009-01-03 06:57:51.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/i386-nat.c	2009-02-09 16:02:42.000000000 +0100
-@@ -546,6 +546,17 @@ i386_remove_watchpoint (CORE_ADDR addr, 
+--- gdb-6.8.50.20090803.orig/gdb/i386-nat.c	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/i386-nat.c	2009-08-04 07:17:58.000000000 +0200
+@@ -520,6 +520,18 @@ i386_remove_watchpoint (CORE_ADDR addr, 
    return retval;
  }
  
@@ -355,18 +344,19 @@ Index: gdb-6.8.50.20090209/gdb/i386-nat.
 +  int i;
 +
 +  /* Do not touch any DR_MIRROR or DR_CONTROL_MIRROR mirrors here.  */
-+  I386_DR_LOW_SET_CONTROL (0);
-+  ALL_DEBUG_REGISTERS(i)
-+    I386_DR_LOW_RESET_ADDR (i);
++  i386_dr_low.set_control (0);
++  if (i386_dr_low.reset_addr)
++    ALL_DEBUG_REGISTERS(i)
++      i386_dr_low.reset_addr (i);
 +}
 +
  /* Return non-zero if we can watch a memory region that starts at
     address ADDR and whose length is LEN bytes.  */
  
-Index: gdb-6.8.50.20090209/gdb/ia64-linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/ia64-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/ia64-linux-nat.c	2009-02-09 15:48:43.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/ia64-linux-nat.c	2009-02-09 16:02:42.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/ia64-linux-nat.c	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/ia64-linux-nat.c	2009-08-04 07:17:58.000000000 +0200
 @@ -583,6 +583,12 @@ ia64_linux_insert_watchpoint (CORE_ADDR 
    return 0;
  }
@@ -415,7 +405,7 @@ Index: gdb-6.8.50.20090209/gdb/ia64-linu
  ia64_linux_new_thread (ptid_t ptid)
  {
    int i, any;
-@@ -805,6 +832,40 @@ ia64_linux_xfer_partial (struct target_o
+@@ -807,6 +834,40 @@ ia64_linux_xfer_partial (struct target_o
  			     offset, len);
  }
  
@@ -456,7 +446,7 @@ Index: gdb-6.8.50.20090209/gdb/ia64-linu
  void _initialize_ia64_linux_nat (void);
  
  /*
-@@ -899,6 +960,9 @@ _initialize_ia64_linux_nat (void)
+@@ -901,6 +962,9 @@ _initialize_ia64_linux_nat (void)
    t->to_insert_watchpoint = ia64_linux_insert_watchpoint;
    t->to_remove_watchpoint = ia64_linux_remove_watchpoint;
  
@@ -466,11 +456,11 @@ Index: gdb-6.8.50.20090209/gdb/ia64-linu
    /* Register the target.  */
    linux_nat_add_target (t);
    linux_nat_set_new_thread (t, ia64_linux_new_thread);
-Index: gdb-6.8.50.20090209/gdb/ppc-linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/ppc-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/ppc-linux-nat.c	2009-01-03 06:57:52.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/ppc-linux-nat.c	2009-02-09 16:02:42.000000000 +0100
-@@ -1118,6 +1118,12 @@ ppc_linux_insert_watchpoint (CORE_ADDR a
+--- gdb-6.8.50.20090803.orig/gdb/ppc-linux-nat.c	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/ppc-linux-nat.c	2009-08-04 07:17:58.000000000 +0200
+@@ -1377,6 +1377,12 @@ ppc_linux_insert_watchpoint (CORE_ADDR a
    return 0;
  }
  
@@ -483,7 +473,7 @@ Index: gdb-6.8.50.20090209/gdb/ppc-linux
  static int
  ppc_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw)
  {
-@@ -1125,6 +1131,11 @@ ppc_linux_remove_watchpoint (CORE_ADDR a
+@@ -1384,6 +1390,11 @@ ppc_linux_remove_watchpoint (CORE_ADDR a
    ptid_t ptid;
    long dabr_value = 0;
  
@@ -495,7 +485,7 @@ Index: gdb-6.8.50.20090209/gdb/ppc-linux
    saved_dabr_value = 0;
    ALL_LWPS (lp, ptid)
      if (ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value) < 0)
-@@ -1138,6 +1149,15 @@ ppc_linux_new_thread (ptid_t ptid)
+@@ -1397,6 +1408,15 @@ ppc_linux_new_thread (ptid_t ptid)
    ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value);
  }
  
@@ -511,7 +501,7 @@ Index: gdb-6.8.50.20090209/gdb/ppc-linux
  static int
  ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
  {
-@@ -1318,6 +1338,40 @@ ppc_linux_read_description (struct targe
+@@ -1629,6 +1649,40 @@ ppc_linux_read_description (struct targe
    return isa205? tdesc_powerpc_isa205_32l : tdesc_powerpc_32l;
  }
  
@@ -552,9 +542,9 @@ Index: gdb-6.8.50.20090209/gdb/ppc-linux
  void _initialize_ppc_linux_nat (void);
  
  void
-@@ -1343,6 +1397,9 @@ _initialize_ppc_linux_nat (void)
- 
+@@ -1655,6 +1709,9 @@ _initialize_ppc_linux_nat (void)
    t->to_read_description = ppc_linux_read_description;
+   t->to_auxv_parse = ppc_linux_auxv_parse;
  
 +  ppc_linux_super_follow_fork = t->to_follow_fork;
 +  t->to_follow_fork = ppc_linux_follow_fork;
@@ -562,11 +552,11 @@ Index: gdb-6.8.50.20090209/gdb/ppc-linux
    /* Register the target.  */
    linux_nat_add_target (t);
    linux_nat_set_new_thread (t, ppc_linux_new_thread);
-Index: gdb-6.8.50.20090209/gdb/s390-nat.c
+Index: gdb-6.8.50.20090803/gdb/s390-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/s390-nat.c	2007-11-07 07:36:57.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/s390-nat.c	2009-02-09 16:02:42.000000000 +0100
-@@ -283,21 +283,15 @@ s390_stopped_by_watchpoint (void)
+--- gdb-6.8.50.20090803.orig/gdb/s390-nat.c	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/s390-nat.c	2009-08-04 07:17:58.000000000 +0200
+@@ -285,21 +285,15 @@ s390_stopped_by_watchpoint (void)
  }
  
  static void
@@ -590,7 +580,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
      {
        watch_lo_addr = min (watch_lo_addr, area->lo_addr);
        watch_hi_addr = max (watch_hi_addr, area->hi_addr);
-@@ -309,7 +303,7 @@ s390_fix_watch_points (ptid_t ptid)
+@@ -311,7 +305,7 @@ s390_fix_watch_points (ptid_t ptid)
    if (ptrace (PTRACE_PEEKUSR_AREA, tid, &parea) < 0)
      perror_with_name (_("Couldn't retrieve watchpoint status"));
  
@@ -599,7 +589,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
      {
        per_info.control_regs.bits.em_storage_alteration = 1;
        per_info.control_regs.bits.storage_alt_space_ctl = 1;
-@@ -326,6 +320,18 @@ s390_fix_watch_points (ptid_t ptid)
+@@ -328,6 +322,18 @@ s390_fix_watch_points (ptid_t ptid)
      perror_with_name (_("Couldn't modify watchpoint status"));
  }
  
@@ -618,7 +608,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
  static int
  s390_insert_watchpoint (CORE_ADDR addr, int len, int type)
  {
-@@ -347,6 +353,12 @@ s390_insert_watchpoint (CORE_ADDR addr, 
+@@ -349,6 +355,12 @@ s390_insert_watchpoint (CORE_ADDR addr, 
    return 0;
  }
  
@@ -631,7 +621,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
  static int
  s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
  {
-@@ -354,6 +366,11 @@ s390_remove_watchpoint (CORE_ADDR addr, 
+@@ -356,6 +368,11 @@ s390_remove_watchpoint (CORE_ADDR addr, 
    ptid_t ptid;
    struct watch_area *area, **parea;
  
@@ -643,7 +633,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
    for (parea = &watch_base; *parea; parea = &(*parea)->next)
      if ((*parea)->lo_addr == addr
  	&& (*parea)->hi_addr == addr + len - 1)
-@@ -361,8 +378,10 @@ s390_remove_watchpoint (CORE_ADDR addr, 
+@@ -363,8 +380,10 @@ s390_remove_watchpoint (CORE_ADDR addr, 
  
    if (!*parea)
      {
@@ -654,7 +644,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
        return -1;
      }
  
-@@ -375,6 +394,15 @@ s390_remove_watchpoint (CORE_ADDR addr, 
+@@ -377,6 +396,15 @@ s390_remove_watchpoint (CORE_ADDR addr, 
    return 0;
  }
  
@@ -670,7 +660,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
  static int
  s390_can_use_hw_breakpoint (int type, int cnt, int othertype)
  {
-@@ -387,6 +415,39 @@ s390_region_ok_for_hw_watchpoint (CORE_A
+@@ -389,6 +417,39 @@ s390_region_ok_for_hw_watchpoint (CORE_A
    return 1;
  }
  
@@ -710,7 +700,7 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
  
  void _initialize_s390_nat (void);
  
-@@ -410,6 +471,9 @@ _initialize_s390_nat (void)
+@@ -412,6 +473,9 @@ _initialize_s390_nat (void)
    t->to_insert_watchpoint = s390_insert_watchpoint;
    t->to_remove_watchpoint = s390_remove_watchpoint;
  
@@ -720,10 +710,10 @@ Index: gdb-6.8.50.20090209/gdb/s390-nat.
    /* Register the target.  */
    linux_nat_add_target (t);
    linux_nat_set_new_thread (t, s390_fix_watch_points);
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c	2009-02-09 16:02:42.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c	2009-08-04 07:17:58.000000000 +0200
 @@ -0,0 +1,172 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -897,10 +887,10 @@ Index: gdb-6.8.50.20090209/gdb/testsuite
 +#else
 +# error "!FOLLOW_PARENT && !FOLLOW_CHILD"
 +#endif
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c	2009-02-09 16:02:42.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c	2009-08-04 07:17:58.000000000 +0200
 @@ -0,0 +1,154 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -1056,10 +1046,10 @@ Index: gdb-6.8.50.20090209/gdb/testsuite
 +
 +  return 0;
 +}
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork.c	2009-02-09 16:02:42.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork.c	2009-08-04 07:17:58.000000000 +0200
 @@ -0,0 +1,56 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -1117,10 +1107,10 @@ Index: gdb-6.8.50.20090209/gdb/testsuite
 +
 +  return 0;
 +}
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/watchpoint-fork.exp	2009-02-09 16:02:42.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/watchpoint-fork.exp	2009-08-04 07:17:58.000000000 +0200
 @@ -0,0 +1,140 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -1262,11 +1252,11 @@ Index: gdb-6.8.50.20090209/gdb/testsuite
 +if {[istarget "*-*-linux*"]} {
 +    test child FOLLOW_CHILD
 +}
-Index: gdb-6.8.50.20090209/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090803/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/doc/gdb.texinfo	2009-02-09 16:02:35.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/doc/gdb.texinfo	2009-02-09 16:02:42.000000000 +0100
-@@ -3588,6 +3588,14 @@ confident that no other thread can becom
+--- gdb-6.8.50.20090803.orig/gdb/doc/gdb.texinfo	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/doc/gdb.texinfo	2009-08-04 07:17:58.000000000 +0200
+@@ -3625,6 +3625,14 @@ confident that no other thread can becom
  software watchpoints as usual.  However, @value{GDBN} may not notice
  when a non-current thread's activity changes the expression.  (Hardware
  watchpoints, in contrast, watch an expression in all threads.)
@@ -1281,15 +1271,14 @@ Index: gdb-6.8.50.20090209/gdb/doc/gdb.t
  @end quotation
  
  @xref{set remote hardware-watchpoint-limit}.
-Index: gdb-6.8.50.20090209/gdb/config/i386/nm-linux.h
+Index: gdb-6.8.50.20090803/gdb/config/i386/nm-linux.h
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/config/i386/nm-linux.h	2009-01-03 06:57:54.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/config/i386/nm-linux.h	2009-02-09 16:02:42.000000000 +0100
-@@ -46,6 +46,16 @@ extern void i386_linux_dr_reset_addr (in
- extern unsigned long i386_linux_dr_get_status (void);
- #define I386_DR_LOW_GET_STATUS() \
-   i386_linux_dr_get_status ()
-+
+--- gdb-6.8.50.20090803.orig/gdb/config/i386/nm-linux.h	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/config/i386/nm-linux.h	2009-08-04 07:17:58.000000000 +0200
+@@ -29,4 +29,14 @@
+ #define FILL_FPXREGSET
+ #endif
+ 
 +/* Remove a watchpoint that watched the memory region which starts at
 + *    address ADDR, whose length is LEN bytes, and for accesses of the
 + *       type TYPE.  Return 0 on success, -1 on failure.  */
@@ -1299,13 +1288,12 @@ Index: gdb-6.8.50.20090209/gdb/config/i3
 +   insertion/removal to support threads.  */
 +#define target_remove_watchpoint(addr, len, type) \
 +  i386_linux_remove_watchpoint (addr, len, type)
- 
- 
- #ifdef HAVE_PTRACE_GETFPXREGS
-Index: gdb-6.8.50.20090209/gdb/config/i386/nm-linux64.h
++
+ #endif /* nm-linux.h */
+Index: gdb-6.8.50.20090803/gdb/config/i386/nm-linux64.h
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/config/i386/nm-linux64.h	2009-01-03 06:57:54.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/config/i386/nm-linux64.h	2009-02-09 16:02:42.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/config/i386/nm-linux64.h	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/config/i386/nm-linux64.h	2009-08-04 07:17:58.000000000 +0200
 @@ -51,4 +51,14 @@ extern unsigned long amd64_linux_dr_get_
  #define I386_DR_LOW_GET_STATUS() \
    amd64_linux_dr_get_status ()
@@ -1321,12 +1309,15 @@ Index: gdb-6.8.50.20090209/gdb/config/i3
 +  amd64_linux_remove_watchpoint (addr, len, type)
 +
  #endif /* nm-linux64.h */
-Index: gdb-6.8.50.20090209/gdb/target.h
+Index: gdb-6.8.50.20090803/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/target.h	2009-02-09 15:49:25.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/target.h	2009-02-09 16:02:42.000000000 +0100
-@@ -1113,7 +1113,9 @@ extern char *normal_pid_to_str (ptid_t p
- #ifndef target_insert_watchpoint
+--- gdb-6.8.50.20090803.orig/gdb/target.h	2009-08-04 07:17:19.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/target.h	2009-08-04 07:35:13.000000000 +0200
+@@ -1114,11 +1114,15 @@ extern char *normal_pid_to_str (ptid_t p
+    for write, 1 for read, and 2 for read/write accesses.  Returns 0 for
+    success, non-zero for failure.  */
+ 
++#ifndef target_insert_watchpoint
  #define	target_insert_watchpoint(addr, len, type)	\
       (*current_target.to_insert_watchpoint) (addr, len, type)
 +#endif
@@ -1334,4 +1325,7 @@ Index: gdb-6.8.50.20090209/gdb/target.h
 +#ifndef target_remove_watchpoint
  #define	target_remove_watchpoint(addr, len, type)	\
       (*current_target.to_remove_watchpoint) (addr, len, type)
- #endif
++#endif
+ 
+ #define target_insert_hw_breakpoint(gdbarch, bp_tgt) \
+      (*current_target.to_insert_hw_breakpoint) (gdbarch, bp_tgt)

gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch:
 inferior.h  |   10 +++++++++-
 infrun.c    |   51 ++++++++++++++++++++++++++++++++-------------------
 linux-nat.c |    5 ++++-
 linux-nat.h |    4 ++--
 4 files changed, 47 insertions(+), 23 deletions(-)

Index: gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch	14 Dec 2008 14:05:16 -0000	1.5
+++ gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch	4 Aug 2009 05:37:28 -0000	1.6
@@ -21,11 +21,11 @@
 
 	Port to GDB-6.8pre.
 
-Index: gdb-6.8.50.20081209/gdb/inferior.h
+Index: gdb-6.8.50.20090803/gdb/inferior.h
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/inferior.h	2008-11-20 01:35:23.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/inferior.h	2008-12-10 01:22:23.000000000 +0100
-@@ -168,7 +168,15 @@ extern void reopen_exec_file (void);
+--- gdb-6.8.50.20090803.orig/gdb/inferior.h	2009-06-28 02:20:22.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/inferior.h	2009-08-03 17:19:56.000000000 +0200
+@@ -181,7 +181,15 @@ extern void reopen_exec_file (void);
  /* The `resume' routine should only be called in special circumstances.
     Normally, use `proceed', which handles a lot of bookkeeping.  */
  
@@ -42,20 +42,20 @@ Index: gdb-6.8.50.20081209/gdb/inferior.
  
  /* From misc files */
  
-Index: gdb-6.8.50.20081209/gdb/infrun.c
+Index: gdb-6.8.50.20090803/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/infrun.c	2008-12-02 20:20:23.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/infrun.c	2008-12-10 01:23:46.000000000 +0100
-@@ -73,7 +73,7 @@ static int follow_fork (void);
+--- gdb-6.8.50.20090803.orig/gdb/infrun.c	2009-07-31 01:01:27.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/infrun.c	2009-08-03 21:39:28.000000000 +0200
+@@ -74,7 +74,7 @@ static int follow_fork (void);
  static void set_schedlock_func (char *args, int from_tty,
  				struct cmd_list_element *c);
  
 -static int currently_stepping (struct thread_info *tp);
 +static enum resume_step currently_stepping (struct thread_info *tp);
  
- static int currently_stepping_callback (struct thread_info *tp, void *data);
- 
-@@ -961,7 +961,7 @@ set_schedlock_func (char *args, int from
+ static int currently_stepping_or_nexting_callback (struct thread_info *tp,
+ 						   void *data);
+@@ -1137,7 +1137,7 @@ maybe_software_singlestep (struct gdbarc
     STEP nonzero if we should step (zero to continue instead).
     SIG is the signal to give the inferior (zero for none).  */
  void
@@ -64,7 +64,7 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
  {
    int should_resume = 1;
    struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
-@@ -975,10 +975,12 @@ resume (int step, enum target_signal sig
+@@ -1149,10 +1149,12 @@ resume (int step, enum target_signal sig
    QUIT;
  
    if (debug_infrun)
@@ -81,7 +81,7 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
  
    /* Some targets (e.g. Solaris x86) have a kernel bug when stepping
       over an instruction that causes a page fault without triggering
-@@ -1127,9 +1129,10 @@ a command like `return' or `jump' to con
+@@ -1271,9 +1273,10 @@ a command like `return' or `jump' to con
  	     individually.  */
  	  resume_ptid = inferior_ptid;
  	}
@@ -94,16 +94,16 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
  	{
  	  /* User-settable 'scheduler' mode requires solo thread resume. */
  	  resume_ptid = inferior_ptid;
-@@ -1302,7 +1305,7 @@ proceed (CORE_ADDR addr, enum target_sig
-   struct gdbarch *gdbarch = get_regcache_arch (regcache);
+@@ -1474,7 +1477,7 @@ proceed (CORE_ADDR addr, enum target_sig
+   struct gdbarch *gdbarch;
    struct thread_info *tp;
-   CORE_ADDR pc = regcache_read_pc (regcache);
+   CORE_ADDR pc;
 -  int oneproc = 0;
 +  enum resume_step resume_step = RESUME_STEP_CONTINUE;
  
-   if (step > 0)
-     step_start_function = find_pc_function (pc);
-@@ -1322,13 +1325,13 @@ proceed (CORE_ADDR addr, enum target_sig
+   /* If we're stopped at a fork/vfork, follow the branch set by the
+      "set follow-fork-mode" command; otherwise, we'll just proceed
+@@ -1508,13 +1511,13 @@ proceed (CORE_ADDR addr, enum target_sig
  	   actually be executing the breakpoint insn anyway.
  	   We'll be (un-)executing the previous instruction.  */
  
@@ -119,7 +119,7 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
      }
    else
      {
-@@ -1359,13 +1362,13 @@ proceed (CORE_ADDR addr, enum target_sig
+@@ -1545,13 +1548,13 @@ proceed (CORE_ADDR addr, enum target_sig
  	 is required it returns TRUE and sets the current thread to
  	 the old thread. */
        if (prepare_to_proceed (step))
@@ -135,7 +135,7 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
      {
        tp->trap_expected = 1;
        /* If displaced stepping is enabled, we can step over the
-@@ -1451,8 +1454,13 @@ proceed (CORE_ADDR addr, enum target_sig
+@@ -1637,8 +1640,13 @@ proceed (CORE_ADDR addr, enum target_sig
    /* Reset to normal state.  */
    init_infwait_state ();
  
@@ -150,16 +150,21 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
  
    /* Wait for it to stop (if not standalone)
       and in any case decode why it stopped, and act accordingly.  */
-@@ -3690,10 +3698,16 @@ currently_stepping_callback (struct thre
-   return tp != data && currently_stepping_thread (tp);
- }
+@@ -4171,13 +4179,18 @@ infrun: not switching back to stepped th
+ 
+ /* Is thread TP in the middle of single-stepping?  */
  
 -static int
 +static enum resume_step
  currently_stepping (struct thread_info *tp)
  {
--  return currently_stepping_thread (tp) || bpstat_should_step ();
-+  if (currently_stepping_thread (tp))
+-  return ((tp->step_range_end && tp->step_resume_breakpoint == NULL)
+- 	  || tp->trap_expected
+- 	  || tp->stepping_through_solib_after_catch
+- 	  || bpstat_should_step ());
++  if ((tp->step_range_end && tp->step_resume_breakpoint == NULL)
++      || tp->trap_expected
++      || tp->stepping_through_solib_after_catch)
 +    return RESUME_STEP_USER;
 +
 +  if (bpstat_should_step ())
@@ -168,12 +173,12 @@ Index: gdb-6.8.50.20081209/gdb/infrun.c
 +  return RESUME_STEP_CONTINUE;
  }
  
- /* Inferior has stepped into a subroutine call with source code that
-Index: gdb-6.8.50.20081209/gdb/linux-nat.c
+ /* Returns true if any thread *but* the one passed in "data" is in the
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/linux-nat.c	2008-12-02 08:57:36.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/linux-nat.c	2008-12-10 01:22:23.000000000 +0100
-@@ -2343,7 +2343,10 @@ count_events_callback (struct lwp_info *
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-03 21:39:10.000000000 +0200
+@@ -2351,7 +2351,10 @@ count_events_callback (struct lwp_info *
  static int
  select_singlestep_lwp_callback (struct lwp_info *lp, void *data)
  {
@@ -185,10 +190,10 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
      return 1;
    else
      return 0;
-Index: gdb-6.8.50.20081209/gdb/linux-nat.h
+Index: gdb-6.8.50.20090803/gdb/linux-nat.h
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/linux-nat.h	2008-07-27 23:12:40.000000000 +0200
-+++ gdb-6.8.50.20081209/gdb/linux-nat.h	2008-12-10 01:22:23.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.h	2009-05-18 19:11:25.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.h	2009-08-03 21:39:09.000000000 +0200
 @@ -55,8 +55,8 @@ struct lwp_info
    /* If non-zero, a pending wait status.  */
    int status;

gdb-6.7-testsuite-stable-results.patch:
 ./gdb/testsuite/gdb.base/fileio.c       |   33 ++++++++++++++++++++++++++++++++
 ./gdb/testsuite/gdb.base/fileio.exp     |   10 ++++-----
 sources/gdb/testsuite/gdb.base/dump.exp |    4 ++-
 3 files changed, 41 insertions(+), 6 deletions(-)

Index: gdb-6.7-testsuite-stable-results.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.7-testsuite-stable-results.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.7-testsuite-stable-results.patch	11 Feb 2009 00:04:47 -0000	1.6
+++ gdb-6.7-testsuite-stable-results.patch	4 Aug 2009 05:37:28 -0000	1.7
@@ -116,93 +116,3 @@ frames-invalid can happen asynchronously
  	"array partial with expressions" 4 "intarray2\[3\]"
  
    gdb_test "print intarray2\[2\] == 0" " = 1" "element 2 not changed, == 4"
---- gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp-orig	2009-02-09 16:31:11.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp	2009-02-09 21:27:38.000000000 +0100
-@@ -286,7 +286,7 @@ if [target_info exists gdb,nosignals] {
- } else {
-     send_gdb "signal SIGUSR1\n"
-     gdb_expect {
--	-re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-+	-re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n(\r\n\032\032frames-invalid\r\n)*\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
- 	    { pass "send SIGUSR1" }
- 	-re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*${srcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
- 	    { setup_xfail "*-*-*" 1270
---- ./gdb/testsuite/gdb.base/auxv.exp	2009-02-11 00:54:54.000000000 +0100
-+++ ./gdb/testsuite/gdb.base/auxv.exp	2009-02-11 00:51:30.000000000 +0100
-@@ -78,8 +78,10 @@ proc fetch_auxv {test} {
- 
-     set auxv_lines {}
-     set bad -1
-+    # Former trailing `\[\r\n\]+' may eat just \r leaving \n in the buffer
-+    # corrupting the next matches.
-     if {[gdb_test_multiple "info auxv" $test {
--	-re "info auxv\[\r\n\]+" {
-+	-re "info auxv\r\n" {
- 	    exp_continue
- 	}
- 	-ex "The program has no auxiliary information now" {
-@@ -94,20 +96,20 @@ proc fetch_auxv {test} {
- 	    set bad 1
- 	    exp_continue
- 	}
--	-re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\[\r\n\]+" {
-+	-re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\r\n" {
- 	    lappend auxv_lines $expect_out(0,string)
- 	    exp_continue
- 	}
--	-re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\[\r\n\]+" {
-+	-re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\r\n" {
- 	    warning "Unrecognized tag value: $expect_out(0,string)"
- 	    set bad 1
- 	    lappend auxv_lines $expect_out(0,string)
- 	    exp_continue
- 	}
--	-re ".*$gdb_prompt $" {
-+	-re "$gdb_prompt $" {
- 	    incr bad
- 	}
--	-re "^\[^\r\n\]+\[\r\n\]+" {
-+	-re "^\[^\r\n\]+\r\n" {
- 	    if {!$bad} {
- 		warning "Unrecognized output: $expect_out(0,string)"
- 		set bad 1
---- ./gdb/testsuite/gdb.base/callfuncs.exp	2009-01-03 06:58:03.000000000 +0100
-+++ ./gdb/testsuite/gdb.base/callfuncs.exp	2009-02-11 00:51:42.000000000 +0100
-@@ -249,15 +249,17 @@ proc fetch_all_registers {test} {
- 
-     set all_registers_lines {}
-     set bad -1
-+    # Former trailing `\[\r\n\]+' may eat just \r leaving \n in the buffer
-+    # corrupting the next matches.
-     if {[gdb_test_multiple "info all-registers" $test {
--	-re "info all-registers\[\r\n\]+" {
-+	-re "info all-registers\r\n" {
- 	    exp_continue
- 	}
- 	-ex "The program has no registers now" {
- 	    set bad 1
- 	    exp_continue
- 	}
--	-re "^bspstore\[ \t\]+\[^\r\n\]+\[\r\n\]+" {
-+	-re "^bspstore\[ \t\]+\[^\r\n\]+\r\n" {
- 	    if [istarget "ia64-*-*"] {
- 		# Filter out bspstore which is specially tied to bsp,
- 		# giving spurious differences.
-@@ -266,14 +268,14 @@ proc fetch_all_registers {test} {
- 	    }
- 	    exp_continue
- 	}
--	-re "^\[^ \t\]+\[ \t\]+\[^\r\n\]+\[\r\n\]+" {
-+	-re "^\[^ \t\]+\[ \t\]+\[^\r\n\]+\r\n" {
- 	    lappend all_registers_lines $expect_out(0,string)
- 	    exp_continue
- 	}
--	-re ".*$gdb_prompt $" {
-+	-re "$gdb_prompt $" {
- 	    incr bad
- 	}
--	-re "^\[^\r\n\]+\[\r\n\]+" {
-+	-re "^\[^\r\n\]+\r\n" {
- 	    if {!$bad} {
- 		warning "Unrecognized output: $expect_out(0,string)"
- 		set bad 1

gdb-6.8-attach-signalled-detach-stopped.patch:
 linux-nat.c                              |   28 +++++++++++++-
 testsuite/gdb.threads/attach-stopped.exp |   60 ++++++++++++++++++++++++++++++-
 testsuite/gdb.threads/attachstop-mt.exp  |   17 +++++++-
 3 files changed, 100 insertions(+), 5 deletions(-)

Index: gdb-6.8-attach-signalled-detach-stopped.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-attach-signalled-detach-stopped.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.8-attach-signalled-detach-stopped.patch	11 Feb 2009 00:04:47 -0000	1.4
+++ gdb-6.8-attach-signalled-detach-stopped.patch	4 Aug 2009 05:37:28 -0000	1.5
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20090209/gdb/linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/linux-nat.c	2009-02-09 16:12:23.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/linux-nat.c	2009-02-09 16:15:30.000000000 +0100
-@@ -204,6 +204,9 @@ blocked.  */
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-03 17:24:03.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-03 17:27:23.000000000 +0200
+@@ -202,6 +202,9 @@ blocked.  */
  static struct target_ops *linux_ops;
  static struct target_ops linux_ops_saved;
  
@@ -12,10 +12,10 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
  /* The method to call, if any, when a new thread is attached.  */
  static void (*linux_nat_new_thread) (ptid_t);
  
-@@ -902,7 +905,14 @@ linux_child_follow_fork (struct target_o
- 	  fork_save_infrun_state (fp, 0);
+@@ -790,7 +793,14 @@ linux_child_follow_fork (struct target_o
+ 	  linux_parent_pid = parent_pid;
  	}
-       else
+       else if (detach_fork)
 -	target_detach (NULL, 0);
 +	{
 +	  /* We should check PID_WAS_STOPPED and detach it stopped accordingly.
@@ -27,8 +27,8 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
 +	}
  
        inferior_ptid = ptid_build (child_pid, child_pid, 0);
- 
-@@ -1229,6 +1239,7 @@ linux_nat_post_attach_wait (ptid_t ptid,
+       add_thread (inferior_ptid);
+@@ -1231,6 +1241,7 @@ linux_nat_post_attach_wait (ptid_t ptid,
        if (debug_linux_nat)
  	fprintf_unfiltered (gdb_stdlog,
  			    "LNPAW: Attaching to a stopped process\n");
@@ -36,7 +36,7 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
  
        /* The process is definitely stopped.  It is in a job control
  	 stop, unless the kernel predates the TASK_STOPPED /
-@@ -1561,6 +1572,9 @@ GPT: lwp %s had signal %s, but it is in 
+@@ -1512,6 +1523,9 @@ GPT: lwp %s had signal %s, but it is in 
  	*status = lp->status;
      }
  
@@ -46,7 +46,7 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
    return 0;
  }
  
-@@ -1671,6 +1685,8 @@ linux_nat_detach (struct target_ops *ops
+@@ -1621,6 +1635,8 @@ linux_nat_detach (struct target_ops *ops
      }
    else
      linux_ops->to_detach (ops, args, from_tty);
@@ -55,7 +55,7 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
  }
  
  /* Resume LP.  */
-@@ -1825,6 +1841,14 @@ linux_nat_resume (ptid_t ptid, int step_
+@@ -1774,6 +1790,14 @@ linux_nat_resume (struct target_ops *ops
       resume_callback.  */
    lp->stopped = 0;
  
@@ -67,10 +67,10 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
 +  if (!step && lp && pid_was_stopped == GET_PID (lp->ptid))
 +    pid_was_stopped = 0;
 +
-   if (resume_all)
-     iterate_over_lwps (resume_callback, NULL);
+   if (resume_many)
+     iterate_over_lwps (ptid, resume_callback, NULL);
  
-@@ -3316,6 +3340,8 @@ linux_nat_mourn_inferior (struct target_
+@@ -3322,6 +3346,8 @@ linux_nat_mourn_inferior (struct target_
         there are other viable forks to debug.  Delete the exiting
         one and context-switch to the first available.  */
      linux_fork_mourn_inferior ();
@@ -79,10 +79,10 @@ Index: gdb-6.8.50.20090209/gdb/linux-nat
  }
  
  /* Convert a native/host siginfo object, into/from the siginfo in the
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/attach-stopped.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/attach-stopped.exp
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2009-01-03 06:58:07.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/attach-stopped.exp	2009-02-09 16:12:41.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2009-01-03 06:58:07.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/attach-stopped.exp	2009-08-03 17:26:22.000000000 +0200
 @@ -62,7 +62,65 @@ proc corefunc { threadtype } {
      gdb_reinitialize_dir $srcdir/$subdir
      gdb_load ${binfile}
@@ -150,10 +150,10 @@ Index: gdb-6.8.50.20090209/gdb/testsuite
         
      set test "$threadtype: attach2 to stopped, after setting file"
      gdb_test_multiple "attach $testpid" "$test" {
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/attachstop-mt.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/attachstop-mt.exp
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.threads/attachstop-mt.exp	2009-01-03 06:58:07.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.threads/attachstop-mt.exp	2009-02-09 16:12:41.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.threads/attachstop-mt.exp	2009-01-03 06:58:07.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.threads/attachstop-mt.exp	2009-08-03 17:26:22.000000000 +0200
 @@ -176,12 +176,23 @@ gdb_test "bt" ".*sleep.*(func|main).*" "
  # Exit and detach the process.
  gdb_exit

gdb-6.8-bz254229-gcore-prpsinfo.patch:
 bfd/elf-bfd.h         |    2 
 bfd/elf.c             |   25 +++++--
 gdb/amd64-linux-nat.c |   15 +++-
 gdb/fbsd-nat.c        |    1 
 gdb/linux-nat.c       |  172 +++++++++++++++++++++++++++++++++++++++++++++++++-
 gdb/linux-nat.h       |    2 
 gdb/procfs.c          |    1 
 7 files changed, 203 insertions(+), 15 deletions(-)

Index: gdb-6.8-bz254229-gcore-prpsinfo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz254229-gcore-prpsinfo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-6.8-bz254229-gcore-prpsinfo.patch	14 Dec 2008 14:05:17 -0000	1.2
+++ gdb-6.8-bz254229-gcore-prpsinfo.patch	4 Aug 2009 05:37:28 -0000	1.3
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20081209/bfd/elf-bfd.h
+Index: gdb-6.8.50.20090803/bfd/elf-bfd.h
 ===================================================================
---- gdb-6.8.50.20081209.orig/bfd/elf-bfd.h	2008-12-03 15:50:57.000000000 +0100
-+++ gdb-6.8.50.20081209/bfd/elf-bfd.h	2008-12-10 01:35:08.000000000 +0100
-@@ -2154,7 +2154,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find
+--- gdb-6.8.50.20090803.orig/bfd/elf-bfd.h	2009-07-23 15:00:20.000000000 +0200
++++ gdb-6.8.50.20090803/bfd/elf-bfd.h	2009-08-03 17:21:25.000000000 +0200
+@@ -2115,7 +2115,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find
  extern char *elfcore_write_note
    (bfd *, char *, int *, const char *, int, const void *, int);
  extern char *elfcore_write_prpsinfo
@@ -11,11 +11,11 @@ Index: gdb-6.8.50.20081209/bfd/elf-bfd.h
  extern char *elfcore_write_prstatus
    (bfd *, char *, int *, long, int, const void *);
  extern char * elfcore_write_pstatus
-Index: gdb-6.8.50.20081209/bfd/elf.c
+Index: gdb-6.8.50.20090803/bfd/elf.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/bfd/elf.c	2008-12-03 15:50:57.000000000 +0100
-+++ gdb-6.8.50.20081209/bfd/elf.c	2008-12-10 01:35:08.000000000 +0100
-@@ -8345,6 +8345,7 @@ char *
+--- gdb-6.8.50.20090803.orig/bfd/elf.c	2009-07-23 15:00:20.000000000 +0200
++++ gdb-6.8.50.20090803/bfd/elf.c	2009-08-03 17:23:13.000000000 +0200
+@@ -8381,6 +8381,7 @@ char *
  elfcore_write_prpsinfo (bfd  *abfd,
  			char *buf,
  			int  *bufsiz,
@@ -23,7 +23,7 @@ Index: gdb-6.8.50.20081209/bfd/elf.c
  			const char *fname,
  			const char *psargs)
  {
-@@ -8371,9 +8372,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
+@@ -8407,9 +8408,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
        int note_type = NT_PRPSINFO;
  #endif
  
@@ -42,7 +42,7 @@ Index: gdb-6.8.50.20081209/bfd/elf.c
        return elfcore_write_note (abfd, buf, bufsiz,
  				 note_name, note_type, &data, sizeof (data));
      }
-@@ -8388,9 +8395,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
+@@ -8424,9 +8431,15 @@ elfcore_write_prpsinfo (bfd  *abfd,
        int note_type = NT_PRPSINFO;
  #endif
  
@@ -61,19 +61,19 @@ Index: gdb-6.8.50.20081209/bfd/elf.c
        return elfcore_write_note (abfd, buf, bufsiz,
  				 note_name, note_type, &data, sizeof (data));
      }
-Index: gdb-6.8.50.20081209/gdb/amd64-linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/amd64-linux-nat.c	2008-12-10 01:28:28.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/amd64-linux-nat.c	2008-12-10 01:35:08.000000000 +0100
-@@ -139,6 +139,7 @@ static int amd64_linux_gregset32_reg_off
+--- gdb-6.8.50.20090803.orig/gdb/amd64-linux-nat.c	2009-08-03 17:19:57.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/amd64-linux-nat.c	2009-08-03 17:21:25.000000000 +0200
+@@ -140,6 +140,7 @@ static int amd64_linux_gregset32_reg_off
  
  static char *
  amd64_linux_elfcore_write_prpsinfo (bfd *abfd, char *buf, int *bufsiz,
 +				    void *info,
  				    const char *fname, const char *psargs)
  {
-   if (gdbarch_ptr_bit(current_gdbarch) == 32)
-@@ -148,14 +149,20 @@ amd64_linux_elfcore_write_prpsinfo (bfd 
+   if (gdbarch_ptr_bit (target_gdbarch) == 32)
+@@ -149,14 +150,20 @@ amd64_linux_elfcore_write_prpsinfo (bfd 
        struct elf_prpsinfo32 data;
        note_type = NT_PRPSINFO;
  
@@ -98,11 +98,11 @@ Index: gdb-6.8.50.20081209/gdb/amd64-lin
  }
  
  static void
-Index: gdb-6.8.50.20081209/gdb/fbsd-nat.c
+Index: gdb-6.8.50.20090803/gdb/fbsd-nat.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/fbsd-nat.c	2008-10-28 16:22:12.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/fbsd-nat.c	2008-12-10 01:35:08.000000000 +0100
-@@ -210,6 +210,7 @@ fbsd_make_corefile_notes (bfd *obfd, int
+--- gdb-6.8.50.20090803.orig/gdb/fbsd-nat.c	2009-07-02 19:21:06.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/fbsd-nat.c	2009-08-03 17:21:25.000000000 +0200
+@@ -211,6 +211,7 @@ fbsd_make_corefile_notes (bfd *obfd, int
  	psargs = reconcat (psargs, psargs, " ", get_inferior_args (), NULL);
  
        note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
@@ -110,19 +110,19 @@ Index: gdb-6.8.50.20081209/gdb/fbsd-nat.
  					  fname, psargs);
      }
  
-Index: gdb-6.8.50.20081209/gdb/linux-nat.c
+Index: gdb-6.8.50.20090803/gdb/linux-nat.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/linux-nat.c	2008-12-10 01:28:14.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/linux-nat.c	2008-12-10 01:35:25.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <sys/types.h>
- #include "gdb_dirent.h"
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.c	2009-08-03 17:19:56.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.c	2009-08-03 17:24:03.000000000 +0200
+@@ -55,6 +55,7 @@
  #include "xml-support.h"
+ #include "terminal.h"
+ #include <sys/vfs.h>
 +#include "gdb_procfs32.h"	/* for struct elf_prpsinfo32 */
  
- #ifdef HAVE_PERSONALITY
- # include <sys/personality.h>
-@@ -216,7 +217,7 @@ static LONGEST (*super_xfer_partial) (st
+ #ifndef SPUFS_MAGIC
+ #define SPUFS_MAGIC 0x23c9b64e
+@@ -222,7 +223,7 @@ static LONGEST (*super_xfer_partial) (st
  /* This functions make elfcore note sections.
     They may get overriden by code adjusting data for multi-target builds.  */
  char *(*linux_elfcore_write_prpsinfo)
@@ -131,8 +131,8 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
  char *(*linux_elfcore_write_prstatus)
    (bfd *, char *, int *, long, int, const void *) = elfcore_write_prstatus;
  static char *
-@@ -3614,6 +3615,159 @@ linux_nat_corefile_thread_callback (stru
-   return 0;
+@@ -3840,6 +3841,159 @@ linux_spu_make_corefile_notes (bfd *obfd
+   return args.note_data;
  }
  
 +/* Should be always true for Linux */
@@ -242,7 +242,7 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
 +
 +#if ULONG_MAX > 0xffffffffU
 +  /* We skip this code on 32-bit gdb.  */
-+  if (gdbarch_ptr_bit (current_gdbarch) == 64)
++  if (gdbarch_ptr_bit (target_gdbarch) == 64)
 +    {
 +      struct elf_prpsinfo *info = xzalloc (sizeof (*info));
 +
@@ -263,7 +263,7 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
 +      return info;
 +    }
 +#endif
-+  if (gdbarch_ptr_bit (current_gdbarch) == 32)
++  if (gdbarch_ptr_bit (target_gdbarch) == 32)
 +    {
 +      struct elf_prpsinfo32 *info = xzalloc (sizeof (*info));
 +
@@ -291,7 +291,7 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
  /* Fills the "to_make_corefile_note" target vector.  Builds the note
     section for a corefile, and returns it in a malloc buffer.  */
  
-@@ -3633,8 +3787,14 @@ linux_nat_make_corefile_notes (bfd *obfd
+@@ -3860,8 +4014,14 @@ linux_nat_make_corefile_notes (bfd *obfd
  
    if (get_exec_file (0))
      {
@@ -306,7 +306,7 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
        if (get_inferior_args ())
  	{
  	  char *string_end;
-@@ -3650,9 +3810,15 @@ linux_nat_make_corefile_notes (bfd *obfd
+@@ -3877,9 +4037,15 @@ linux_nat_make_corefile_notes (bfd *obfd
  		       psargs_end - string_end);
  	    }
  	}
@@ -324,11 +324,11 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
      }
  
    /* Dump information for threads.  */
-Index: gdb-6.8.50.20081209/gdb/linux-nat.h
+Index: gdb-6.8.50.20090803/gdb/linux-nat.h
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/linux-nat.h	2008-12-10 01:27:33.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/linux-nat.h	2008-12-10 01:35:08.000000000 +0100
-@@ -138,7 +138,7 @@ struct siginfo *linux_nat_get_siginfo (p
+--- gdb-6.8.50.20090803.orig/gdb/linux-nat.h	2009-08-03 17:19:56.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/linux-nat.h	2009-08-03 17:21:25.000000000 +0200
+@@ -148,7 +148,7 @@ struct siginfo *linux_nat_get_siginfo (p
  /* These functions make elfcore note sections.
     They may get overriden by code adjusting data for multi-target builds.  */
  extern char *(*linux_elfcore_write_prpsinfo)
@@ -337,11 +337,11 @@ Index: gdb-6.8.50.20081209/gdb/linux-nat
  extern char *(*linux_elfcore_write_prstatus)
    (bfd *, char *, int *, long, int, const void *);
  extern char *(*linux_elfcore_write_prfpreg)
-Index: gdb-6.8.50.20081209/gdb/procfs.c
+Index: gdb-6.8.50.20090803/gdb/procfs.c
 ===================================================================
---- gdb-6.8.50.20081209.orig/gdb/procfs.c	2008-11-09 12:27:17.000000000 +0100
-+++ gdb-6.8.50.20081209/gdb/procfs.c	2008-12-10 01:35:08.000000000 +0100
-@@ -6181,6 +6181,7 @@ procfs_make_note_section (bfd *obfd, int
+--- gdb-6.8.50.20090803.orig/gdb/procfs.c	2009-08-01 02:02:04.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/procfs.c	2009-08-03 17:21:25.000000000 +0200
+@@ -6147,6 +6147,7 @@ procfs_make_note_section (bfd *obfd, int
    note_data = (char *) elfcore_write_prpsinfo (obfd,
  					       note_data,
  					       note_size,

gdb-6.8-bz436037-reg-no-longer-active.patch:
 valops.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Index: gdb-6.8-bz436037-reg-no-longer-active.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz436037-reg-no-longer-active.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-6.8-bz436037-reg-no-longer-active.patch	1 Aug 2008 06:36:43 -0000	1.1
+++ gdb-6.8-bz436037-reg-no-longer-active.patch	4 Aug 2009 05:37:28 -0000	1.2
@@ -1,8 +1,9 @@
-diff -d -urpN src.0/gdb/valops.c src.1/gdb/valops.c
---- src.0/gdb/valops.c	2008-07-27 04:00:03.000000000 +0200
-+++ src.1/gdb/valops.c	2008-07-31 15:17:42.000000000 +0200
-@@ -813,10 +813,18 @@ value_assign (struct value *toval, struc
- 	struct frame_info *frame;
+Index: gdb-6.8.50.20090803/gdb/valops.c
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/valops.c	2009-08-04 06:30:45.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/valops.c	2009-08-04 06:33:05.000000000 +0200
+@@ -926,10 +926,18 @@ value_assign (struct value *toval, struc
+ 	struct gdbarch *gdbarch;
  	int value_reg;
  
 -	/* Figure out which frame this is in currently.  */
@@ -21,4 +22,4 @@ diff -d -urpN src.0/gdb/valops.c src.1/g
 +	/* Probably never happens.  */
  	if (!frame)
  	  error (_("Value being assigned to is no longer active."));
- 	
+ 

gdb-6.8-bz457187-largefile.patch:
 config.in    |    6 
 configure    |  365 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |    1 
 3 files changed, 372 insertions(+)

Index: gdb-6.8-bz457187-largefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz457187-largefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-6.8-bz457187-largefile.patch	2 Mar 2009 23:14:15 -0000	1.1
+++ gdb-6.8-bz457187-largefile.patch	4 Aug 2009 05:37:28 -0000	1.2
@@ -5,9 +5,10 @@ gdb/
 	* config.in: Regenerate.
 	* configure: Regenerate.
 
-diff -up -rup gdb-orig/configure.ac gdb/configure.ac
---- ./gdb-orig/configure.ac	2009-03-02 23:39:01.000000000 +0100
-+++ ./gdb/configure.ac	2009-03-02 23:40:46.000000000 +0100
+Index: gdb-6.8.50.20090803/gdb/configure.ac
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/configure.ac	2009-08-04 06:32:39.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/configure.ac	2009-08-04 06:33:51.000000000 +0200
 @@ -30,6 +30,7 @@ AC_GNU_SOURCE
  AC_AIX
  AC_ISC_POSIX
@@ -16,10 +17,11 @@ diff -up -rup gdb-orig/configure.ac gdb/
  AM_PROG_CC_STDC
  
  AC_CONFIG_AUX_DIR(..)
-diff -up -rup gdb-orig/config.in gdb/config.in
---- ./gdb-orig/config.in	2009-03-02 23:39:01.000000000 +0100
-+++ ./gdb/config.in	2009-03-02 23:40:53.000000000 +0100
-@@ -725,6 +725,9 @@
+Index: gdb-6.8.50.20090803/gdb/config.in
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/config.in	2009-08-04 06:32:39.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/config.in	2009-08-04 06:33:51.000000000 +0200
+@@ -744,6 +744,9 @@
  # undef _ALL_SOURCE
  #endif
  
@@ -29,7 +31,7 @@ diff -up -rup gdb-orig/config.in gdb/con
  /* Enable GNU extensions on systems that have them.  */
  #ifndef _GNU_SOURCE
  # undef _GNU_SOURCE
-@@ -734,6 +737,9 @@
+@@ -753,6 +756,9 @@
     <sys/proc.h> problem on IRIX 5. */
  #undef _KMEMUSER
  
@@ -39,18 +41,19 @@ diff -up -rup gdb-orig/config.in gdb/con
  /* Define to 1 if on MINIX. */
  #undef _MINIX
  
-diff -up -rup gdb-orig/configure gdb/configure
---- ./gdb-orig/configure	2009-03-02 23:39:01.000000000 +0100
-+++ ./gdb/configure	2009-03-02 23:40:49.000000000 +0100
-@@ -862,6 +862,7 @@ Optional Features:
+Index: gdb-6.8.50.20090803/gdb/configure
+===================================================================
+--- gdb-6.8.50.20090803.orig/gdb/configure	2009-08-04 06:32:39.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/configure	2009-08-04 06:33:51.000000000 +0200
+@@ -874,6 +874,7 @@ Optional Features:
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-maintainer-mode  enable make rules and dependencies not useful
  			  (and sometimes confusing) to the casual installer
 +  --disable-largefile     omit support for large files
    --disable-dependency-tracking  speeds up one-time build
    --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-targets        alternative target configurations
-@@ -3313,6 +3314,370 @@ _ACEOF
+   --enable-targets=TARGETS
+@@ -3347,6 +3348,370 @@ _ACEOF
  
  
  

gdb-6.8-bz466901-backtrace-full-prelinked.patch:
 dwarf2loc.c                                       |    4 
 testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S |  328 ++++++++++++++++++++++
 testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c |   26 +
 testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp    |  102 ++++++
 4 files changed, 459 insertions(+), 1 deletion(-)

Index: gdb-6.8-bz466901-backtrace-full-prelinked.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-bz466901-backtrace-full-prelinked.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.8-bz466901-backtrace-full-prelinked.patch	11 Feb 2009 00:04:48 -0000	1.4
+++ gdb-6.8-bz466901-backtrace-full-prelinked.patch	4 Aug 2009 05:37:28 -0000	1.5
@@ -1,10 +1,10 @@
 Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 
-Index: gdb-6.8.50.20081128/gdb/dwarf2loc.c
+Index: gdb-6.8.50.20090803/gdb/dwarf2loc.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/dwarf2loc.c	2008-12-08 11:00:45.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/dwarf2loc.c	2008-12-08 18:02:49.000000000 +0100
-@@ -55,7 +55,9 @@ find_location_expression (struct dwarf2_
+--- gdb-6.8.50.20090803.orig/gdb/dwarf2loc.c	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/dwarf2loc.c	2009-08-04 06:33:35.000000000 +0200
+@@ -56,7 +56,9 @@ find_location_expression (struct dwarf2_
    CORE_ADDR low, high;
    gdb_byte *loc_ptr, *buf_end;
    int length;
@@ -13,12 +13,12 @@ Index: gdb-6.8.50.20081128/gdb/dwarf2loc
 +  struct objfile *objfile = objfile1->separate_debug_objfile
 +			    ? objfile1->separate_debug_objfile : objfile1;
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
+   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
    unsigned int addr_size = dwarf2_per_cu_addr_size (baton->per_cu);
-   CORE_ADDR base_mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1));
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp	2008-12-08 18:00:43.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked.exp	2009-08-04 06:33:35.000000000 +0200
 @@ -0,0 +1,102 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -122,10 +122,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +
 +# `abort' can get expressed as `*__GI_abort'.
 +gdb_test "bt full" "in \[^ \]*abort \\(.*in func \\(.*\r\n\[\t \]+i = -?\[0-9\].*in main \\(.*" "Backtrace after abort()"
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c	2008-12-08 18:00:43.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-main.c	2009-08-04 06:33:35.000000000 +0200
 @@ -0,0 +1,26 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -153,10 +153,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
 +  func ();
 +  return 0;
 +}
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S	2008-12-08 18:00:43.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.dwarf2/dw2-loclist-prelinked-func.S	2009-08-04 06:33:35.000000000 +0200
 @@ -0,0 +1,328 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

gdb-6.8-constant-watchpoints.patch:
 breakpoint.c                      |   33 ++++++++++++++++++++++--
 doc/gdb.texinfo                   |   12 ++++++++
 gdbtypes.h                        |   17 +++++++++++-
 testsuite/gdb.base/watchpoint.c   |    5 +++
 testsuite/gdb.base/watchpoint.exp |   52 ++++++++++++++++++++++++++++++++++++--
 5 files changed, 114 insertions(+), 5 deletions(-)

Index: gdb-6.8-constant-watchpoints.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-constant-watchpoints.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.8-constant-watchpoints.patch	11 Feb 2009 00:04:48 -0000	1.5
+++ gdb-6.8-constant-watchpoints.patch	4 Aug 2009 05:37:28 -0000	1.6
@@ -18,11 +18,11 @@
 	gdb.base/watchpoint.c (global_ptr_ptr): New variable.
 	(func4): New testing code for GLOBAL_PTR_PTR.
 
-Index: gdb-6.8.50.20090209/gdb/breakpoint.c
+Index: gdb-6.8.50.20090803/gdb/breakpoint.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/breakpoint.c	2009-02-09 15:39:01.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/breakpoint.c	2009-02-09 16:04:10.000000000 +0100
-@@ -769,7 +769,15 @@ is_hardware_watchpoint (struct breakpoin
+--- gdb-6.8.50.20090803.orig/gdb/breakpoint.c	2009-08-04 06:29:47.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/breakpoint.c	2009-08-04 06:32:50.000000000 +0200
+@@ -823,7 +823,15 @@ is_hardware_watchpoint (struct breakpoin
     If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the
     value chain.  The caller must free the values individually.  If
     VAL_CHAIN is NULL, all generated values will be left on the value
@@ -39,16 +39,16 @@ Index: gdb-6.8.50.20090209/gdb/breakpoin
  
  static void
  fetch_watchpoint_value (struct expression *exp, struct value **valp,
-@@ -5862,7 +5870,7 @@ watch_command_1 (char *arg, int accessfl
+@@ -6301,7 +6309,7 @@ watch_command_1 (char *arg, int accessfl
    struct symtab_and_line sal;
    struct expression *exp;
    struct block *exp_valid_block;
 -  struct value *val, *mark;
 +  struct value *val, *mark, *val_chain;
    struct frame_info *frame;
-   struct frame_info *prev_frame = NULL;
    char *exp_start = NULL;
-@@ -5954,6 +5962,27 @@ watch_command_1 (char *arg, int accessfl
+   char *exp_end = NULL;
+@@ -6392,6 +6400,27 @@ watch_command_1 (char *arg, int accessfl
    exp_valid_block = innermost_block;
    mark = value_mark ();
    fetch_watchpoint_value (exp, &val, NULL, NULL);
@@ -76,11 +76,11 @@ Index: gdb-6.8.50.20090209/gdb/breakpoin
    if (val != NULL)
      release_value (val);
  
-Index: gdb-6.8.50.20090209/gdb/gdbtypes.h
+Index: gdb-6.8.50.20090803/gdb/gdbtypes.h
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/gdbtypes.h	2009-02-09 15:51:57.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/gdbtypes.h	2009-02-09 16:04:10.000000000 +0100
-@@ -70,7 +70,22 @@ enum type_code
+--- gdb-6.8.50.20090803.orig/gdb/gdbtypes.h	2009-08-04 06:31:58.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/gdbtypes.h	2009-08-04 06:32:50.000000000 +0200
+@@ -71,7 +71,22 @@ enum type_code
      TYPE_CODE_UNION,		/* C union or Pascal variant part */
      TYPE_CODE_ENUM,		/* Enumeration type */
      TYPE_CODE_FLAGS,		/* Bit flags type */
@@ -104,11 +104,11 @@ Index: gdb-6.8.50.20090209/gdb/gdbtypes.
      TYPE_CODE_INT,		/* Integer type */
  
      /* Floating type.  This is *NOT* a complex type.  Beware, there are parts
-Index: gdb-6.8.50.20090209/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090803/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/doc/gdb.texinfo	2009-02-09 16:02:42.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/doc/gdb.texinfo	2009-02-09 16:04:10.000000000 +0100
-@@ -3480,6 +3480,18 @@ This command prints a list of watchpoint
+--- gdb-6.8.50.20090803.orig/gdb/doc/gdb.texinfo	2009-08-04 06:32:39.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/doc/gdb.texinfo	2009-08-04 06:32:50.000000000 +0200
+@@ -3517,6 +3517,18 @@ This command prints a list of watchpoint
  it is the same as @code{info break} (@pxref{Set Breaks}).
  @end table
  
@@ -127,10 +127,10 @@ Index: gdb-6.8.50.20090209/gdb/doc/gdb.t
  @value{GDBN} sets a @dfn{hardware watchpoint} if possible.  Hardware
  watchpoints execute very quickly, and the debugger reports a change in
  value at the exact instruction where the change occurs.  If @value{GDBN}
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.base/watchpoint.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.base/watchpoint.c
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.base/watchpoint.c	2008-03-03 14:24:12.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/watchpoint.c	2009-02-09 16:04:10.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.base/watchpoint.c	2008-03-03 14:24:12.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.base/watchpoint.c	2009-08-04 06:32:50.000000000 +0200
 @@ -40,6 +40,7 @@ struct foo struct1, struct2, *ptr1, *ptr
  int doread = 0;
  
@@ -150,10 +150,10 @@ Index: gdb-6.8.50.20090209/gdb/testsuite
  }
  
  int main ()
-Index: gdb-6.8.50.20090209/gdb/testsuite/gdb.base/watchpoint.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.base/watchpoint.exp
 ===================================================================
---- gdb-6.8.50.20090209.orig/gdb/testsuite/gdb.base/watchpoint.exp	2009-01-03 06:58:03.000000000 +0100
-+++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/watchpoint.exp	2009-02-09 16:05:03.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.base/watchpoint.exp	2009-01-03 06:58:03.000000000 +0100
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.base/watchpoint.exp	2009-08-04 06:32:50.000000000 +0200
 @@ -641,7 +641,21 @@ proc test_watchpoint_and_breakpoint {} {
  	}
      }

gdb-6.8-fortran-tag-constant.patch:
 dwarf2read.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Index: gdb-6.8-fortran-tag-constant.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-fortran-tag-constant.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdb-6.8-fortran-tag-constant.patch	10 Jun 2009 13:05:56 -0000	1.5
+++ gdb-6.8-fortran-tag-constant.patch	4 Aug 2009 05:37:28 -0000	1.6
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090803/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-05-09 20:04:27.000000000 +0200
-+++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-05-09 20:04:56.000000000 +0200
-@@ -2029,6 +2029,7 @@ scan_partial_symbols (struct partial_die
+--- gdb-6.8.50.20090803.orig/gdb/dwarf2read.c	2009-08-04 06:32:58.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/dwarf2read.c	2009-08-04 06:33:18.000000000 +0200
+@@ -2459,6 +2459,7 @@ scan_partial_symbols (struct partial_die
  	      add_partial_subprogram (pdi, lowpc, highpc, need_pc, cu);
  	      break;
  	    case DW_TAG_variable:
@@ -10,7 +10,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
  	    case DW_TAG_typedef:
  	    case DW_TAG_union_type:
  	      if (!pdi->is_declaration)
-@@ -2244,6 +2245,7 @@ add_partial_symbol (struct partial_die_i
+@@ -2654,6 +2655,7 @@ add_partial_symbol (struct partial_die_i
  	}
        break;
      case DW_TAG_variable:
@@ -18,7 +18,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
        if (pdi->is_external)
  	{
  	  /* Global Variable.
-@@ -4272,7 +4274,8 @@ dwarf2_add_field (struct field_info *fip
+@@ -4790,7 +4792,8 @@ dwarf2_add_field (struct field_info *fip
  	  fip->non_public_fields = 1;
  	}
      }
@@ -28,7 +28,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
      {
        /* C++ static member.  */
  
-@@ -4762,7 +4765,8 @@ read_structure_type (struct die_info *di
+@@ -5297,7 +5300,8 @@ read_structure_type (struct die_info *di
        while (child_die && child_die->tag)
  	{
  	  if (child_die->tag == DW_TAG_member
@@ -38,7 +38,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
  	    {
  	      /* NOTE: carlton/2002-11-05: A C++ static data member
  		 should be a DW_TAG_member that is a declaration, but
-@@ -4881,6 +4885,7 @@ process_structure_scope (struct die_info
+@@ -5416,6 +5420,7 @@ process_structure_scope (struct die_info
      {
        if (child_die->tag == DW_TAG_member
  	  || child_die->tag == DW_TAG_variable
@@ -46,15 +46,15 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
  	  || child_die->tag == DW_TAG_inheritance)
  	{
  	  /* Do nothing.  */
-@@ -6656,6 +6661,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
+@@ -6926,6 +6931,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
  	  && abbrev->tag != DW_TAG_subprogram
  	  && abbrev->tag != DW_TAG_lexical_block
  	  && abbrev->tag != DW_TAG_variable
 +	  && abbrev->tag != DW_TAG_constant
  	  && abbrev->tag != DW_TAG_namespace
- 	  && abbrev->tag != DW_TAG_module
  	  && abbrev->tag != DW_TAG_member)
-@@ -6764,6 +6770,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
+ 	{
+@@ -7033,6 +7039,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
        if (load_all
  	  || abbrev->tag == DW_TAG_subprogram
  	  || abbrev->tag == DW_TAG_variable
@@ -62,7 +62,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
  	  || abbrev->tag == DW_TAG_namespace
  	  || part_die->is_declaration)
  	{
-@@ -8549,6 +8556,11 @@ new_symbol (struct die_info *die, struct
+@@ -8840,6 +8847,11 @@ new_symbol (struct die_info *die, struct
  	  /* Do not add the symbol to any lists.  It will be found via
  	     BLOCK_FUNCTION from the blockvector.  */
  	  break;

gdb-6.8-inlining-addon.patch:
 breakpoint.c                        |   35 +++++++++++++---
 dwarf2read.c                        |    6 ++
 frame.c                             |    8 ++-
 gdbthread.h                         |    6 ++
 infcmd.c                            |   76 ++++++++++++++++++++++++++----------
 inline-frame.c                      |   34 +++++++++++++---
 inline-frame.h                      |    4 +
 target.c                            |    1 
 testsuite/gdb.opt/inline-bt.c       |   10 +++-
 testsuite/gdb.opt/inline-cmds.c     |   10 +++-
 testsuite/gdb.opt/inline-cmds.exp   |   28 ++++++-------
 testsuite/gdb.opt/inline-locals.c   |    9 +++-
 testsuite/gdb.opt/inline-locals.exp |    6 ++
 testsuite/gdb.opt/inline-markers.c  |    5 --
 14 files changed, 176 insertions(+), 62 deletions(-)

Index: gdb-6.8-inlining-addon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-inlining-addon.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.8-inlining-addon.patch	27 Mar 2009 08:52:15 -0000	1.6
+++ gdb-6.8-inlining-addon.patch	4 Aug 2009 05:37:28 -0000	1.7
@@ -5,10 +5,10 @@ causing: FAIL: gdb.base/unwindonsignal.e
 resume() -> target_resume() move of clear_inline_frame_state() is for:
 gdb.mi/mi-nsmoribund.exp
 
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-bt.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c	2009-03-25 22:34:02.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-bt.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-bt.c	2009-08-03 16:57:40.000000000 +0200
 @@ -13,10 +13,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -28,42 +28,10 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
  
  inline int func1(void)
  {
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.exp	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp	2009-03-25 22:34:02.000000000 +0100
-@@ -41,18 +41,19 @@ if { [skip_inline_frame_tests] } {
-     return
- }
- 
--set line1 [gdb_get_line_number "set breakpoint 1 here" ${fullsrcfile2}]
--gdb_breakpoint $srcfile2:$line1
-+set line1 [gdb_get_line_number "set breakpoint 1 here" ${srcfile}]
-+gdb_breakpoint $srcfile:$line1
- 
- gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (1)"
- gdb_test "backtrace" "#0  bar.*#1  .*main.*" "backtrace from bar (1)"
--gdb_test "info frame" ".*called by frame.*" "bar not inlined"
-+gdb_test "info frame" ".*inlined into frame.*" "bar inlined"
- 
--gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (2)"
--gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*main.*" \
--    "backtrace from bar (2)"
--gdb_test "up" "#1  .*func1.*" "up from bar (2)"
--gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (2)"
-+# gcc-4.3.1 omits the line number information for (2).
-+#gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (2)"
-+#gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*main.*" \
-+#    "backtrace from bar (2)"
-+#gdb_test "up" "#1  .*func1.*" "up from bar (2)"
-+#gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (2)"
- 
- gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (3)"
- gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*func2.*#3  .*main.*" \
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c
-===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c	2009-03-25 22:34:02.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-cmds.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.c	2009-08-03 16:57:40.000000000 +0200
 @@ -13,13 +13,19 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -86,49 +54,11 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
  inline int func1(void)
  {
    bar ();
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.exp
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-03-25 22:34:02.000000000 +0100
-@@ -45,28 +45,28 @@ if { [skip_inline_frame_tests] } {
- 
- # First, check that the things we expected to be inlined really were,
- # and those that shouldn't be weren't.
--set line1 [gdb_get_line_number "set breakpoint 1 here" ${fullsrcfile2}]
-+set line1 [gdb_get_line_number "set breakpoint 1 here" ${srcfile2}]
- gdb_breakpoint $srcfile2:$line1
--set line2 [gdb_get_line_number "set breakpoint 2 here" ${fullsrcfile2}]
-+set line2 [gdb_get_line_number "set breakpoint 2 here" ${srcfile2}]
- gdb_breakpoint $srcfile2:$line2
- 
--gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (1)"
-+gdb_test "continue" "set breakpoint 1 here.*" "continue to bar (1)"
- gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*main.*" \
-     "backtrace from bar (1)"
- gdb_test "up" "#1  .*func1.*" "up from bar (1)"
--gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (1)"
-+gdb_test "info frame" "inlined into frame.*" "func1 inlined (1)"
- 
--gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (2)"
-+gdb_test "continue" "set breakpoint 1 here.*" "continue to bar (2)"
- gdb_test "backtrace" "#0  bar.*#1  .*func1.*#2  .*func2.*#3  .*main.*" \
-     "backtrace from bar (2)"
- gdb_test "up" "#1  .*func1.*" "up from bar (2)"
--gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (2)"
-+gdb_test "info frame" "inlined into frame.*" "func1 inlined (2)"
- gdb_test "up" "#2  .*func2.*" "up from func1 (2)"
--gdb_test "info frame" ".*inlined into frame.*" "func2 inlined (2)"
-+gdb_test "info frame" "inlined into frame.*" "func2 inlined (2)"
- 
--gdb_test "continue" ".*set breakpoint 2 here.*" "continue to marker"
-+gdb_test "continue" "set breakpoint 2 here.*" "continue to marker"
- gdb_test "backtrace" "#0  marker.*#1  .*main.*" "backtrace from marker"
--gdb_test "info frame" ".*called by frame.*" "marker not inlined"
-+gdb_test "info frame" "\n called by frame.*" "marker not inlined"
- 
- # Next, check that we can next over inlined functions.  We should not end up
- # inside any of them.
-@@ -201,7 +201,7 @@ set line3 [gdb_get_line_number "set brea
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-cmds.exp	2009-08-03 16:57:40.000000000 +0200
+@@ -230,7 +230,7 @@ set line3 [gdb_get_line_number "set brea
  gdb_breakpoint $line3
  gdb_continue_to_breakpoint "consecutive func1"
  
@@ -137,7 +67,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
  set msg "next to second func1"
  gdb_test_multiple "next" $msg {
      -re ".*func1 .*second call.*$gdb_prompt $" {
-@@ -224,16 +224,16 @@ set line4 [gdb_get_line_number "set brea
+@@ -253,16 +253,16 @@ set line4 [gdb_get_line_number "set brea
  gdb_breakpoint $line4
  gdb_continue_to_breakpoint "func1 then func3"
  
@@ -158,7 +88,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
  gdb_test "finish" "func1 \\\(\\\);" "finish from marker to func1"
  
  gdb_test "step" "bar \\\(\\\);" "step into func1 for finish"
-@@ -268,12 +268,12 @@ gdb_test "step" "noinline \\\(\\\) at .*
+@@ -297,12 +297,12 @@ gdb_test "step" "noinline \\\(\\\) at .*
  gdb_test "bt" "#0  noinline.*#1  .*outer_inline1.*#2  .*outer_inline2.*#3  main.*" "backtrace at noinline from outer_inline1"
  gdb_test "step" "inlined_fn \\\(\\\) at .*" "enter inlined_fn from noinline"
  gdb_test "bt" "#0  inlined_fn.*#1  noinline.*#2  .*outer_inline1.*#3  .*outer_inline2.*#4  main.*" "backtrace at inlined_fn from noinline"
@@ -180,10 +110,10 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
 +gdb_test "info frame" "inlined into frame.*" "outer_inline2 inlined"
 +gdb_test "fini" "" "up from outer_inline2"
 +gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined"
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c	2009-03-25 22:34:02.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-locals.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.c	2009-08-03 16:57:40.000000000 +0200
 @@ -13,11 +13,16 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -203,21 +133,10 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
  
  inline int func1(int arg1)
  {
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.exp
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.exp	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp	2009-03-25 22:34:02.000000000 +0100
-@@ -43,8 +43,8 @@ if { [skip_inline_var_tests] } {
- 
- set no_frames [skip_inline_frame_tests]
- 
--set line1 [gdb_get_line_number "set breakpoint 1 here" ${fullsrcfile2}]
--gdb_breakpoint $srcfile2:$line1
-+set line1 [gdb_get_line_number "set breakpoint 1 here" ${srcfile}]
-+gdb_breakpoint $srcfile:$line1
- 
- gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (1)"
- 
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-locals.exp	2009-06-30 17:50:27.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-locals.exp	2009-08-03 16:57:40.000000000 +0200
 @@ -77,6 +77,9 @@ if { ! $no_frames } {
  
  # Make sure that locals on the stack are found.  This is an array to
@@ -236,11 +155,11 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
 +    setup_kfail *-*-* "gcc/debug.optimization"
 +}
  gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)"
-Index: gdb-6.8.50.20090302/gdb/frame.c
+Index: gdb-6.8.50.20090803/gdb/frame.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/frame.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/frame.c	2009-03-25 22:34:02.000000000 +0100
-@@ -269,7 +269,7 @@ fprint_frame (struct ui_file *file, stru
+--- gdb-6.8.50.20090803.orig/gdb/frame.c	2009-08-03 15:56:08.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/frame.c	2009-08-03 16:57:40.000000000 +0200
+@@ -276,7 +276,7 @@ fprint_frame (struct ui_file *file, stru
  static struct frame_info *
  skip_inlined_frames (struct frame_info *frame)
  {
@@ -249,7 +168,7 @@ Index: gdb-6.8.50.20090302/gdb/frame.c
      frame = get_prev_frame (frame);
  
    return frame;
-@@ -1670,6 +1670,7 @@ get_frame_address_in_block (struct frame
+@@ -1715,6 +1715,7 @@ get_frame_address_in_block (struct frame
  {
    /* A draft address.  */
    CORE_ADDR pc = get_frame_pc (this_frame);
@@ -257,7 +176,7 @@ Index: gdb-6.8.50.20090302/gdb/frame.c
  
    struct frame_info *next_frame = this_frame->next;
  
-@@ -1712,6 +1713,9 @@ get_frame_address_in_block (struct frame
+@@ -1757,6 +1758,9 @@ get_frame_address_in_block (struct frame
       while in an inlined function, then the code address of the
       "calling" normal function should not be adjusted either.  */
  
@@ -267,7 +186,7 @@ Index: gdb-6.8.50.20090302/gdb/frame.c
    while (get_frame_type (next_frame) == INLINE_FRAME)
      next_frame = next_frame->next;
  
-@@ -1743,7 +1747,7 @@ find_frame_sal (struct frame_info *frame
+@@ -1788,7 +1792,7 @@ find_frame_sal (struct frame_info *frame
  	sym = inline_skipped_symbol (inferior_ptid);
  
        init_sal (sal);
@@ -276,19 +195,19 @@ Index: gdb-6.8.50.20090302/gdb/frame.c
  	{
  	  sal->symtab = SYMBOL_SYMTAB (sym);
  	  sal->line = SYMBOL_LINE (sym);
-Index: gdb-6.8.50.20090302/gdb/breakpoint.c
+Index: gdb-6.8.50.20090803/gdb/breakpoint.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/breakpoint.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/breakpoint.c	2009-03-25 22:34:02.000000000 +0100
-@@ -57,6 +57,7 @@
- #include "top.h"
+--- gdb-6.8.50.20090803.orig/gdb/breakpoint.c	2009-08-03 16:56:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/breakpoint.c	2009-08-03 17:19:24.000000000 +0200
+@@ -60,6 +60,7 @@
  #include "wrapper.h"
  #include "valprint.h"
+ #include "parser-defs.h"
 +#include "inline-frame.h"
  
- #include "mi/mi-common.h"
- 
-@@ -2902,10 +2903,24 @@ bpstat_check_breakpoint_conditions (bpst
+ /* readline include files */
+ #include "readline/readline.h"
+@@ -3065,10 +3066,24 @@ bpstat_check_breakpoint_conditions (bpst
    const struct bp_location *bl = bs->breakpoint_at;
    struct breakpoint *b = bl->owner;
  
@@ -317,7 +236,7 @@ Index: gdb-6.8.50.20090302/gdb/breakpoin
      {
        int value_is_zero = 0;
        
-@@ -3044,6 +3059,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -3215,6 +3230,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  	    bs->print = 0;
  	  }
  	bs->commands = copy_command_lines (bs->commands);
@@ -330,7 +249,7 @@ Index: gdb-6.8.50.20090302/gdb/breakpoin
        }
  
      /* Print nothing for this entry if we dont stop or if we dont print.  */
-@@ -5169,9 +5190,9 @@ set_momentary_breakpoint (struct symtab_
+@@ -5164,9 +5185,9 @@ set_momentary_breakpoint (struct gdbarch
  {
    struct breakpoint *b;
  
@@ -341,13 +260,13 @@ Index: gdb-6.8.50.20090302/gdb/breakpoin
 +     shortcut the case of returning _from_ an inline frame we still may be
 +     returning from non-inlined frame _to_ an inlined frame.  */
  
-   b = set_raw_breakpoint (sal, type);
+   b = set_raw_breakpoint (gdbarch, sal, type);
    b->enable_state = bp_enabled;
-Index: gdb-6.8.50.20090302/gdb/inline-frame.c
+Index: gdb-6.8.50.20090803/gdb/inline-frame.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/inline-frame.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/inline-frame.c	2009-03-25 22:34:02.000000000 +0100
-@@ -183,6 +183,12 @@ inline_frame_sniffer (const struct frame
+--- gdb-6.8.50.20090803.orig/gdb/inline-frame.c	2009-06-28 02:20:22.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/inline-frame.c	2009-08-03 16:57:40.000000000 +0200
+@@ -195,6 +195,12 @@ inline_frame_sniffer (const struct frame
    if (frame_block == NULL)
      return 0;
  
@@ -360,7 +279,7 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
    /* Calculate DEPTH, the number of inlined functions at this
       location.  */
    depth = 0;
-@@ -192,6 +198,10 @@ inline_frame_sniffer (const struct frame
+@@ -204,6 +210,10 @@ inline_frame_sniffer (const struct frame
        if (block_inlined_p (cur_block))
  	depth++;
  
@@ -371,7 +290,7 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
        cur_block = BLOCK_SUPERBLOCK (cur_block);
      }
  
-@@ -275,7 +285,6 @@ skip_inline_frames (ptid_t ptid)
+@@ -287,7 +297,6 @@ skip_inline_frames (ptid_t ptid)
  {
    CORE_ADDR this_pc;
    struct block *frame_block, *cur_block;
@@ -379,7 +298,7 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
    int skip_count = 0;
    struct inline_state *state;
  
-@@ -296,10 +305,7 @@ skip_inline_frames (ptid_t ptid)
+@@ -308,10 +317,7 @@ skip_inline_frames (ptid_t ptid)
  		 of BLOCK_START.  */
  	      if (BLOCK_START (cur_block) == this_pc
  		  || block_starting_point_at (this_pc, cur_block))
@@ -391,7 +310,7 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
  	      else
  		break;
  	    }
-@@ -311,7 +317,6 @@ skip_inline_frames (ptid_t ptid)
+@@ -323,7 +329,6 @@ skip_inline_frames (ptid_t ptid)
    state = allocate_inline_frame_state (ptid);
    state->skipped_frames = skip_count;
    state->saved_pc = this_pc;
@@ -399,7 +318,7 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
  
    if (skip_count != 0)
      reinit_frame_cache ();
-@@ -329,6 +334,23 @@ step_into_inline_frame (ptid_t ptid)
+@@ -341,6 +346,23 @@ step_into_inline_frame (ptid_t ptid)
    reinit_frame_cache ();
  }
  
@@ -423,10 +342,10 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
  /* Return the number of hidden functions inlined into the current
     frame.  */
  
-Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c
+Index: gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-markers.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-markers.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c	2009-03-25 22:34:02.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/testsuite/gdb.opt/inline-markers.c	2009-06-28 02:20:24.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/testsuite/gdb.opt/inline-markers.c	2009-08-03 16:57:40.000000000 +0200
 @@ -15,11 +15,6 @@
  
  extern int x, y;
@@ -439,11 +358,11 @@ Index: gdb-6.8.50.20090302/gdb/testsuite
  void marker(void)
  {
    x += y; /* set breakpoint 2 here */
-Index: gdb-6.8.50.20090302/gdb/gdbthread.h
+Index: gdb-6.8.50.20090803/gdb/gdbthread.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/gdbthread.h	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/gdbthread.h	2009-03-25 22:34:02.000000000 +0100
-@@ -180,6 +180,12 @@ struct thread_info
+--- gdb-6.8.50.20090803.orig/gdb/gdbthread.h	2009-08-03 15:55:53.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/gdbthread.h	2009-08-03 16:57:40.000000000 +0200
+@@ -187,6 +187,12 @@ struct thread_info
  
    /* Private data used by the target vector implementation.  */
    struct private_thread_info *private;
@@ -456,11 +375,11 @@ Index: gdb-6.8.50.20090302/gdb/gdbthread
  };
  
  /* Create an empty thread list, or empty the existing one.  */
-Index: gdb-6.8.50.20090302/gdb/infcmd.c
+Index: gdb-6.8.50.20090803/gdb/infcmd.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infcmd.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/infcmd.c	2009-03-25 22:34:02.000000000 +0100
-@@ -1391,11 +1391,11 @@ finish_command_continuation (void *arg)
+--- gdb-6.8.50.20090803.orig/gdb/infcmd.c	2009-07-02 23:57:27.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/infcmd.c	2009-08-03 17:17:24.000000000 +0200
+@@ -1408,11 +1408,11 @@ finish_command_continuation (void *arg)
        struct type *value_type;
  
        value_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (a->function));
@@ -474,7 +393,7 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
  	print_return_value (SYMBOL_TYPE (a->function), value_type);
      }
  
-@@ -1499,6 +1499,16 @@ finish_forward (struct symbol *function,
+@@ -1514,6 +1514,16 @@ finish_forward (struct symbol *function,
  
    old_chain = make_cleanup_delete_breakpoint (breakpoint);
  
@@ -489,9 +408,9 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
 +    tp->current_pc_is_notcurrent = 1;
 +
    tp->proceed_to_finish = 1;    /* We want stop_registers, please...  */
-   make_cleanup_restore_integer (&suppress_stop_observer);
-   suppress_stop_observer = 1;
-@@ -1522,7 +1532,9 @@ finish_forward (struct symbol *function,
+   proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
+ 
+@@ -1535,7 +1545,9 @@ finish_forward (struct symbol *function,
  static void
  finish_command (char *arg, int from_tty)
  {
@@ -502,7 +421,7 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
    struct symbol *function;
  
    int async_exec = 0;
-@@ -1553,46 +1565,63 @@ finish_command (char *arg, int from_tty)
+@@ -1566,45 +1578,63 @@ finish_command (char *arg, int from_tty)
    if (!target_has_execution)
      error (_("The program is not running."));
  
@@ -523,16 +442,15 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
 -      == INLINE_FRAME)
 +  if (get_frame_type (current_frame) == INLINE_FRAME)
      {
-       struct thread_info *tp = inferior_thread ();
--
 -      /* Claim we are stepping in the calling frame.  An empty step
 -	 range means that we will stop once we aren't in a function
 -	 called by that frame.  We don't use the magic "1" value for
 -	 step_range_end, because then infrun will think this is nexti,
 -	 and not step over the rest of this inlined function call.  */
+       struct thread_info *tp = inferior_thread ();
        struct symtab_and_line empty_sal;
 -      init_sal (&empty_sal);
--      set_step_info (tp, frame, empty_sal);
+-      set_step_info (frame, empty_sal);
 -      tp->step_range_start = tp->step_range_end = get_frame_pc (frame);
 -      tp->step_over_calls = STEP_OVER_ALL;
 +      struct block *frame_block;
@@ -544,8 +462,8 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
  	  printf_filtered (_("Run till exit from "));
 -	  print_stack_frame (get_selected_frame (NULL), 1, LOCATION);
 +	  print_stack_frame (current_frame, 1, LOCATION);
- 	}
- 
++	}
++
 +      /* Even just a single stepi would get us out of the caller function PC
 +	 range.  */
 +
@@ -561,15 +479,15 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
 +	  tp->current_pc_is_notcurrent = 1;
 +	  normal_stop ();
 +	  return;
-+	}
-+
+ 	}
+ 
 +      /* Claim we are stepping in the calling frame.  An empty step
 +	 range means that we will stop once we aren't in a function
 +	 called by that frame.  We don't use the magic "1" value for
 +	 step_range_end, because then infrun will think this is nexti,
 +	 and not step over the rest of this inlined function call.  */
 +      init_sal (&empty_sal);
-+      set_step_info (tp, prev_frame, empty_sal);
++      set_step_info (prev_frame, empty_sal);
 +      tp->step_range_start = tp->step_range_end = get_frame_pc (prev_frame);
 +      tp->step_over_calls = STEP_OVER_ALL;
 +
@@ -584,7 +502,7 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
  
    /* Print info on the selected frame, including level number but not
       source.  */
-@@ -1606,10 +1635,14 @@ finish_command (char *arg, int from_tty)
+@@ -1618,10 +1648,14 @@ finish_command (char *arg, int from_tty)
        print_stack_frame (get_selected_frame (NULL), 1, LOCATION);
      }
  
@@ -600,41 +518,11 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
  }
  
  
-Index: gdb-6.8.50.20090302/gdb/infrun.c
+Index: gdb-6.8.50.20090803/gdb/target.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infrun.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/infrun.c	2009-03-25 22:34:02.000000000 +0100
-@@ -1152,8 +1152,6 @@ a command like `return' or `jump' to con
- 	    step = 0;
- 	}
- 
--      clear_inline_frame_state (resume_ptid);
--
-       if (debug_displaced
-           && use_displaced_stepping (gdbarch)
-           && tp->trap_expected)
-@@ -1205,6 +1203,8 @@ clear_proceed_status_thread (struct thre
- 
-   /* Discard any remaining commands or status from previous stop.  */
-   bpstat_clear (&tp->stop_bpstat);
-+
-+  tp->current_pc_is_notcurrent = 0;
- }
- 
- static int
-Index: gdb-6.8.50.20090302/gdb/target.c
-===================================================================
---- gdb-6.8.50.20090302.orig/gdb/target.c	2009-03-25 22:26:51.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/target.c	2009-03-25 22:34:02.000000000 +0100
-@@ -41,6 +41,7 @@
- #include "target-descriptions.h"
- #include "gdbthread.h"
- #include "solib.h"
-+#include "inline-frame.h"
- 
- static void target_info (char *, int);
- 
-@@ -1925,6 +1926,7 @@ target_resume (ptid_t ptid, int step, en
+--- gdb-6.8.50.20090803.orig/gdb/target.c	2009-08-03 16:04:15.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/target.c	2009-08-03 16:57:40.000000000 +0200
+@@ -2079,6 +2079,7 @@ target_resume (ptid_t ptid, int step, en
  {
    struct target_ops *t;
  
@@ -642,10 +530,10 @@ Index: gdb-6.8.50.20090302/gdb/target.c
    dcache_invalidate (target_dcache);
  
    for (t = current_target.beneath; t != NULL; t = t->beneath)
-Index: gdb-6.8.50.20090302/gdb/inline-frame.h
+Index: gdb-6.8.50.20090803/gdb/inline-frame.h
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/inline-frame.h	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/inline-frame.h	2009-03-25 22:34:02.000000000 +0100
+--- gdb-6.8.50.20090803.orig/gdb/inline-frame.h	2009-06-28 02:20:22.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/inline-frame.h	2009-08-03 16:57:40.000000000 +0200
 @@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt
  
  void step_into_inline_frame (ptid_t ptid);
@@ -657,41 +545,19 @@ Index: gdb-6.8.50.20090302/gdb/inline-fr
  /* Return the number of hidden functions inlined into the current
     frame.  */
  
-Index: gdb-6.8.50.20090302/gdb/infcall.c
+Index: gdb-6.8.50.20090803/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090302.orig/gdb/infcall.c	2009-03-25 22:33:02.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/infcall.c	2009-03-25 22:34:02.000000000 +0100
-@@ -898,8 +898,15 @@ The program being debugged exited while 
- 
- 	  if (unwind_on_signal_p)
- 	    {
--	      /* The user wants the context restored.  Calling error will
--	         run inf_status_cleanup, which does all the work.  */
-+	      /* The user wants the context restored. */
-+
-+	      /* We must get back to the frame we were before the
-+		 dummy call.  */
-+	      dummy_frame_pop (dummy_id);
-+
-+	      /* We also need to restore inferior status to that before the
-+		 dummy call.  */
-+	      restore_inferior_status (inf_status);
- 
- 	      /* FIXME: Insert a bunch of wrap_here; name can be very
- 		 long if it's a C++ name with arguments and stuff.  */
-Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
-===================================================================
---- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c	2009-03-25 22:33:44.000000000 +0100
-+++ gdb-6.8.50.20090302/gdb/dwarf2read.c	2009-03-25 22:34:11.000000000 +0100
-@@ -3471,6 +3471,7 @@ read_func_scope (struct die_info *die, s
-   unsigned die_children;
-   struct attribute *call_line, *call_file;
+--- gdb-6.8.50.20090803.orig/gdb/dwarf2read.c	2009-08-03 16:56:10.000000000 +0200
++++ gdb-6.8.50.20090803/gdb/dwarf2read.c	2009-08-03 16:57:40.000000000 +0200
+@@ -4107,6 +4107,7 @@ read_func_scope (struct die_info *die, s
+   struct block *block;
+   unsigned die_children = 0;
    int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
 +  struct type *type;
  
    if (inlined_func)
      {
-@@ -3513,7 +3514,10 @@ read_func_scope (struct die_info *die, s
+@@ -4148,7 +4149,10 @@ read_func_scope (struct die_info *die, s
    add_to_cu_func_list (name, lowpc, highpc, cu);
  
    new = push_context (0, lowpc);
@@ -703,11 +569,3 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2rea
  
    /* If there is a location expression for DW_AT_frame_base, record
       it.  */
-@@ -8751,6 +8755,7 @@ read_type_die (struct die_info *die, str
-       break;
-     case DW_TAG_subprogram:
-     case DW_TAG_subroutine_type:
-+    case DW_TAG_inlined_subroutine:
-       this_type = read_subroutine_type (die, cu);
-       break;
-     case DW_TAG_array_type:

gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 block.c                                                  |   23 
 block.h                                                  |    2 
 breakpoint.c                                             |  102 
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 ++
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  199 +
 cp-support.c                                             |   88 
 cp-support.h                                             |   54 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  471 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |   14 
 dwarf2-frame.c                                           |   28 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  356 ++-
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1621 ++++++++++-----
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  413 ---
 f-lang.h                                                 |   38 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 -
 findvar.c                                                |  126 -
 frame.c                                                  |   19 
 frame.h                                                  |    5 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  598 ++++-
 gdbtypes.h                                               |  140 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |   74 
 mi/mi-cmds.c                                             |    1 
 mi/mi-cmds.h                                             |    1 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   40 
 objfiles.h                                               |   23 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 ++++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 +
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 ++++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 +++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 +++
 python/python-symtab.c                                   |  322 ++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |  101 
 python/python.c                                          |  523 ++++
 python/python.h                                          |    6 
 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                                                |   51 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  314 +-
 symtab.h                                                 |   17 
 target.h                                                 |   22 
 testsuite/ChangeLog                                      |   97 
 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.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  117 +
 testsuite/gdb.cp/namespace.exp                           |   23 
 testsuite/gdb.cp/overload.exp                            |    8 
 testsuite/gdb.cp/ovldbreak.exp                           |   46 
 testsuite/gdb.cp/shadowing.cc                            |   45 
 testsuite/gdb.cp/shadowing.exp                           |   85 
 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                        |  158 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/string.exp                         |   72 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   25 
 testsuite/gdb.python/python-prettyprint.c                |   10 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   22 
 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                                                 |  256 ++
 valprint.c                                               |    3 
 value.c                                                  |  159 +
 value.h                                                  |   13 
 varobj.c                                                 |  454 +++-
 varobj.h                                                 |   13 
 xcoffread.c                                              |    1 
 216 files changed, 15933 insertions(+), 2429 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.18 -r 1.19 gdb-archer.patchIndex: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gdb-archer.patch	6 Jul 2009 14:59:10 -0000	1.18
+++ gdb-archer.patch	4 Aug 2009 05:37:28 -0000	1.19
@@ -2,3725 +2,25 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 17bfc0488f54aeeb7a9e20ef3caa7e31e8e985fb
+commit 0222cb1f4ddd1eda32965e464cb60b1e44e110b2
 
 branch `archer' - the merge of branches:
-archer-jankratochvil-merge-expr
-	archer-keiths-expr-cumulative
-		(archer-swagiaal-using-directive)
+archer-tromey-call-frame-cfa
+archer-tromey-delayed-symfile
+archer-tromey-dw-op-value
+archer-jankratochvil-vla
 archer-jankratochvil-misc
+archer-jankratochvil-expr-cumulative
+	archer-keiths-expr-cumulative
 archer-jankratochvil-python
-	archer-jankratochvil-type-refcount
 	archer-tromey-python
-archer-jankratochvil-vla
-	archer-jankratochvil-type-refcount
-archer-pmuldoon-exception-rewind-master
-archer-sergio-catch-syscall
-archer-tromey-charset
-archer-tromey-delayed-symfile
 
 
-diff --git a/bfd/po/es.po b/bfd/po/es.po
-index 9f2ec21..e4410d7 100644
---- a/bfd/po/es.po
-+++ b/bfd/po/es.po
-@@ -1,13 +1,14 @@
--# Mensajes en espa?ol para bfd 2.17.90.
--# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
--# Cristian Oth?n Mart?nez Vera <cfuga at itam.mx>, 2002, 2003, 2004, 2005, 2006, 2007
-+# Mensajes en espa?ol para bfd 2.18.90.
-+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+# This file is distributed under the same license as the binutils package.
-+# Cristian Oth?n Mart?nez Vera <cfuga at itam.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: bfd 2.17.90\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-08-06 16:21-0400\n"
--"PO-Revision-Date: 2007-09-08 08:57-0500\n"
-+"Project-Id-Version: bfd 2.18.90\n"
-+"Report-Msgid-Bugs-To: bug-binutils at gnu.org\n"
-+"POT-Creation-Date: 2008-09-09 15:56+0930\n"
-+"PO-Revision-Date: 2009-03-03 22:20-0600\n"
- "Last-Translator: Cristian Oth?n Mart?nez Vera <cfuga at itam.mx>\n"
- "Language-Team: Spanish <es at li.org>\n"
- "MIME-Version: 1.0\n"
-@@ -31,143 +32,143 @@ msgstr "%B: Tipo de reubicaci
- msgid "%B: Bad relocation record imported: %d"
- msgstr "%B: Registro de reubicaci?n importado err?neo: %d"
- 
--#: aoutx.h:1268 aoutx.h:1602
-+#: aoutx.h:1268 aoutx.h:1604
- #, c-format
- msgid "%s: can not represent section `%s' in a.out object file format"
- msgstr "%s: no se puede representar la secci?n `%s' en el fichero objeto de formato a.out"
- 
--#: aoutx.h:1568
-+#: aoutx.h:1570
- #, c-format
- msgid "%s: can not represent section for symbol `%s' in a.out object file format"
- msgstr "%s: no se puede representar la secci?n para el s?mbolo `%s' en el fichero objeto de formato a.out"
- 
--#: aoutx.h:1570
-+#: aoutx.h:1572
- msgid "*unknown*"
- msgstr "*desconocido*"
- 
--#: aoutx.h:3987 aoutx.h:4313
-+#: aoutx.h:3989 aoutx.h:4315
- msgid "%P: %B: unexpected relocation type\n"
- msgstr "%P: %B: tipo de reubicaci?n inesperado\n"
- 
--#: aoutx.h:5347
-+#: aoutx.h:5349
- #, c-format
- msgid "%s: relocatable link from %s to %s not supported"
- msgstr "%s: no se admite el enlace reubicable de %s a %s"
- 
--#: archive.c:1766
-+#: archive.c:2046
- msgid "Warning: writing archive was slow: rewriting timestamp\n"
- msgstr "Aviso: la escritura del fichero fue lenta: se reescribe la marca de tiempo\n"
- 
- # ?Uff! Si utiliz?ramos file=archivo, esta traducci?n ser?a imposible. cfuga
--#: archive.c:2029
-+#: archive.c:2309
- msgid "Reading archive file mod timestamp"
- msgstr "Se lee el archivo de la modificaci?n de marca de tiempo del fichero"
- 
--#: archive.c:2053
-+#: archive.c:2333
- msgid "Writing updated armap timestamp"
- msgstr "Se escribe la marca de tiempo actualizada de armap"
- 
--#: bfd.c:289
-+#: bfd.c:368
- msgid "No error"
- msgstr "No hay error"
- 
--#: bfd.c:290
-+#: bfd.c:369
- msgid "System call error"
- msgstr "Error en la llamada al sistema"
- 
--#: bfd.c:291
-+#: bfd.c:370
- msgid "Invalid bfd target"
- msgstr "Objetivo bfd inv?lido"
- 
--#: bfd.c:292
-+#: bfd.c:371
- msgid "File in wrong format"
- msgstr "Fichero en formato err?neo"
- 
--#: bfd.c:293
-+#: bfd.c:372
- msgid "Archive object file in wrong format"
- msgstr "Archivo de ficheros objeto en formato err?neo"
- 
--#: bfd.c:294
-+#: bfd.c:373
- msgid "Invalid operation"
- msgstr "Operaci?n inv?lida"
- 
--#: bfd.c:295
-+#: bfd.c:374
- msgid "Memory exhausted"
- msgstr "Memoria agotada"
- 
--#: bfd.c:296
-+#: bfd.c:375
- msgid "No symbols"
- msgstr "No hay s?mbolos"
- 
--#: bfd.c:297
-+#: bfd.c:376
- msgid "Archive has no index; run ranlib to add one"
- msgstr "El archivo no tiene ?ndice; ejecute ranlib para agregar uno"
- 
--#: bfd.c:298
-+#: bfd.c:377
- msgid "No more archived files"
- msgstr "No hay m?s ficheros archivados"
- 
--#: bfd.c:299
-+#: bfd.c:378
- msgid "Malformed archive"
- msgstr "Archivo malformado"
- 
--#: bfd.c:300
-+#: bfd.c:379
- msgid "File format not recognized"
- msgstr "No se reconoce el formato del fichero"
- 
--#: bfd.c:301
-+#: bfd.c:380
- msgid "File format is ambiguous"
- msgstr "El formato del fichero es ambiguo"
- 
--#: bfd.c:302
-+#: bfd.c:381
- msgid "Section has no contents"
- msgstr "La secci?n no tiene contenidos"
- 
--#: bfd.c:303
-+#: bfd.c:382
- msgid "Nonrepresentable section on output"
- msgstr "Secci?n no representable en la salida"
- 
--#: bfd.c:304
-+#: bfd.c:383
- msgid "Symbol needs debug section which does not exist"
- msgstr "Un s?mbolo requiere de una secci?n de depuraci?n, la cual no existe"
- 
--#: bfd.c:305
-+#: bfd.c:384
- msgid "Bad value"
- msgstr "Valor err?neo"
- 
--#: bfd.c:306
-+#: bfd.c:385
- msgid "File truncated"
- msgstr "Fichero truncado"
[...66509 lines suppressed...]
- 
- {"lhbrx",	X(31,790),	X_MASK,      COM,	PPCNONE,	{RT, RA0, RB}},
- 
--{"lfqx",	X(31,791),	X_MASK,      POWER2,	PPCNONE,	{FRT, RA, RB}},
- {"lfdpx",	X(31,791),	X_MASK,      POWER6,	POWER7,		{FRT, RA, RB}},
-+{"lfqx",	X(31,791),	X_MASK,      POWER2,	PPCNONE,	{FRT, RA, RB}},
- 
- {"sraw",	XRC(31,792,0),	X_MASK,      PPCCOM,	PPCNONE,	{RA, RS, RB}},
- {"sra",		XRC(31,792,0),	X_MASK,      PWRCOM,	PPCNONE,	{RA, RS, RB}},
-@@ -4602,8 +4602,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- 
- {"lbzcix",	X(31,853),	X_MASK,      POWER6,	PPCNONE,	{RT, RA0, RB}},
- 
-+{"eieio",	X(31,854),	0xffffffff,  PPC,	BOOKE,		{0}},
- {"mbar",	X(31,854),	X_MASK,      BOOKE,	PPCNONE,	{MO}},
--{"eieio",	X(31,854),	0xffffffff,  PPC,	PPCNONE,	{0}},
- 
- {"lfiwax",	X(31,855),	X_MASK,      POWER6,	PPCNONE,	{FRT, RA0, RB}},
- 
-@@ -4638,8 +4638,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- 
- {"sthbrx",	X(31,918),	X_MASK,      COM,	PPCNONE,	{RS, RA0, RB}},
- 
--{"stfqx",	X(31,919),	X_MASK,      POWER2,	PPCNONE,	{FRS, RA, RB}},
- {"stfdpx",	X(31,919),	X_MASK,      POWER6,	PPCNONE,	{FRS, RA, RB}},
-+{"stfqx",	X(31,919),	X_MASK,      POWER2,	PPCNONE,	{FRS, RA, RB}},
- 
- {"sraq",	XRC(31,920,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
- {"sraq.",	XRC(31,920,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, RB}},
-@@ -4687,10 +4687,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- 
- {"stxvd2x",	X(31,972),	XX1_MASK,    PPCVSX,	PPCNONE,	{XS6, RA, RB}},
- 
-+{"tlbld",	X(31,978),	XRTRA_MASK,  PPC,	PPC403|BOOKE,	{RB}},
- {"tlbwehi",	XTLB(31,978,0),	XTLB_MASK,   PPC403,	PPCNONE,	{RT, RA}},
- {"tlbwelo",	XTLB(31,978,1),	XTLB_MASK,   PPC403,	PPCNONE,	{RT, RA}},
- {"tlbwe",	X(31,978),	X_MASK,   PPC403|BOOKE,	PPCNONE,	{RSO, RAOPT, SHO}},
--{"tlbld",	X(31,978),	XRTRA_MASK,  PPC,	PPCNONE,	{RB}},
- 
- {"stbcix",	X(31,981),	X_MASK,      POWER6,	PPCNONE,	{RS, RA0, RB}},
- 
-@@ -4796,16 +4796,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- {"stfdu",	OP(55),		OP_MASK,     COM,	PPCNONE,	{FRS, D, RAS}},
- 
- {"lq",		OP(56),		OP_MASK,     POWER4,	PPCNONE,	{RTQ, DQ, RAQ}},
--
--{"lfq",		OP(56),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
--
- {"psq_l",	OP(56),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
--
--{"lfqu",	OP(57),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
--
--{"psq_lu",	OP(57),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
-+{"lfq",		OP(56),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
- 
- {"lfdp",	OP(57),		OP_MASK,     POWER6,	POWER7,		{FRT, D, RA0}},
-+{"psq_lu",	OP(57),		OP_MASK,     PPCPS,	PPCNONE,	{FRT,PSD,RA,PSW,PSQ}},
-+{"lfqu",	OP(57),		OP_MASK,     POWER2,	PPCNONE,	{FRT, D, RA0}},
- 
- {"ld",		DSO(58,0),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RA0}},
- {"ldu",		DSO(58,1),	DS_MASK,     PPC64,	PPCNONE,	{RT, DS, RAL}},
-@@ -4829,18 +4825,18 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- {"fsqrts",	A(59,22,0),    AFRAFRC_MASK, PPC,	PPCNONE,	{FRT, FRB}},
- {"fsqrts.",	A(59,22,1),    AFRAFRC_MASK, PPC,	PPCNONE,	{FRT, FRB}},
- 
--{"fres",	A(59,24,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
--{"fres.",	A(59,24,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
- {"fres",	A(59,24,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"fres",	A(59,24,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
- {"fres.",	A(59,24,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"fres.",	A(59,24,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
- 
- {"fmuls",	A(59,25,0),	AFRB_MASK,   PPC,	PPCNONE,	{FRT, FRA, FRC}},
- {"fmuls.",	A(59,25,1),	AFRB_MASK,   PPC,	PPCNONE,	{FRT, FRA, FRC}},
+diff --git a/gdb/varobj.h b/gdb/varobj.h
+index 7297243..aabd743 100644
+--- a/gdb/varobj.h
++++ b/gdb/varobj.h
+@@ -112,6 +112,12 @@ extern void varobj_set_frozen (struct varobj *var, int frozen);
  
--{"frsqrtes",	A(59,26,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
--{"frsqrtes.",	A(59,26,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
- {"frsqrtes",	A(59,26,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"frsqrtes",	A(59,26,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
- {"frsqrtes.",	A(59,26,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"frsqrtes.",	A(59,26,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
+ extern int varobj_get_frozen (struct varobj *var);
  
- {"fmsubs",	A(59,28,0),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
- {"fmsubs.",	A(59,28,1),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
-@@ -4921,10 +4917,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- {"fcfidus",	XRC(59,974,0),	XRA_MASK,    POWER7,	PPCNONE,	{FRT, FRB}},
- {"fcfidus.",	XRC(59,974,1),	XRA_MASK,    POWER7,	PPCNONE,	{FRT, FRB}},
++extern void varobj_get_child_range (struct varobj *var,
++				    VEC (varobj_p) *children,
++				    int *from, int *to);
++
++extern void varobj_set_child_range (struct varobj *var, int from, int to);
++
+ extern char *varobj_get_display_hint (struct varobj *var);
  
--{"stfq",	OP(60),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
--
--{"psq_st",	OP(60),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
--
- {"xxsldwi",	XX3(60,2),	XX3SHW_MASK, PPCVSX,	PPCNONE,	{XT6, XA6, XB6, SHW}},
- {"xxsel",	XX4(60,3),	XX4_MASK,    PPCVSX,	PPCNONE,	{XT6, XA6, XB6, XC6}},
- {"xxspltd",	XX3(60,10),	XX3DM_MASK,  PPCVSX,	PPCNONE,	{XT6, XA6, XB6S, DMEX}},
-@@ -5067,11 +5059,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- {"xvcvsxddp",	XX2(60,504),	XX2_MASK,    PPCVSX,	PPCNONE,	{XT6, XB6}},
- {"xvnegdp",	XX2(60,505),	XX2_MASK,    PPCVSX,	PPCNONE,	{XT6, XB6}},
+ extern int varobj_get_num_children (struct varobj *var);
+@@ -143,12 +149,13 @@ extern void all_root_varobjs (void (*func) (struct varobj *var, void *data),
+ extern VEC(varobj_update_result) *varobj_update (struct varobj **varp, 
+ 						 int explicit);
  
--{"psq_stu",	OP(61),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
+-extern void varobj_invalidate (void);
 -
--{"stfqu",	OP(61),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
-+{"psq_st",	OP(60),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
-+{"stfq",	OP(60),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
- 
- {"stfdp",	OP(61),		OP_MASK,     POWER6,	PPCNONE,	{FRT, D, RA0}},
-+{"psq_stu",	OP(61),		OP_MASK,     PPCPS,	PPCNONE,	{FRS,PSD,RA,PSW,PSQ}},
-+{"stfqu",	OP(61),		OP_MASK,     POWER2,	PPCNONE,	{FRS, D, RA}},
- 
- {"std",		DSO(62,0),	DS_MASK,     PPC64,	PPCNONE,	{RS, DS, RA0}},
- {"stdu",	DSO(62,1),	DS_MASK,     PPC64,	PPCNONE,	{RS, DS, RAS}},
-@@ -5122,20 +5115,20 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- {"fsel",	A(63,23,0),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
- {"fsel.",	A(63,23,1),	A_MASK,      PPC,	PPCNONE,	{FRT, FRA, FRC, FRB}},
- 
--{"fre",		A(63,24,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
--{"fre.",	A(63,24,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
- {"fre",		A(63,24,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"fre",		A(63,24,0),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
- {"fre.",	A(63,24,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"fre.",	A(63,24,1),   AFRALFRC_MASK, POWER5,	POWER7,		{FRT, FRB, A_L}},
- 
- {"fmul",	A(63,25,0),	AFRB_MASK,   PPCCOM,	PPCNONE,	{FRT, FRA, FRC}},
- {"fm",		A(63,25,0),	AFRB_MASK,   PWRCOM,	PPCNONE,	{FRT, FRA, FRC}},
- {"fmul.",	A(63,25,1),	AFRB_MASK,   PPCCOM,	PPCNONE,	{FRT, FRA, FRC}},
- {"fm.",		A(63,25,1),	AFRB_MASK,   PWRCOM,	PPCNONE,	{FRT, FRA, FRC}},
- 
--{"frsqrte",	A(63,26,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
--{"frsqrte.",	A(63,26,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
- {"frsqrte",	A(63,26,0),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"frsqrte",	A(63,26,0),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
- {"frsqrte.",	A(63,26,1),   AFRAFRC_MASK,  POWER7,	PPCNONE,	{FRT, FRB}},
-+{"frsqrte.",	A(63,26,1),   AFRALFRC_MASK, PPC,	POWER7,		{FRT, FRB, A_L}},
- 
- {"fmsub",	A(63,28,0),	A_MASK,      PPCCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
- {"fms",		A(63,28,0),	A_MASK,      PWRCOM,	PPCNONE,	{FRT, FRA, FRC, FRB}},
-@@ -5195,10 +5188,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- 
- {"dcmpoq",	X(63,130),	X_MASK,      POWER6,	PPCNONE,	{BF, FRA, FRB}},
- 
--{"mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
- {"mtfsfi",  XRC(63,134,0), XWRA_MASK|(3<<21)|(1<<11), POWER6, PPCNONE,	{BFF, U, W}},
--{"mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
-+{"mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
- {"mtfsfi.", XRC(63,134,1), XWRA_MASK|(3<<21)|(1<<11), POWER6, PPCNONE,	{BFF, U, W}},
-+{"mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, POWER6,	{BFF, U}},
+ extern int varobj_editable_p (struct varobj *var);
  
- {"fnabs",	XRC(63,136,0),	XRA_MASK,    COM,	PPCNONE,	{FRT, FRB}},
- {"fnabs.",	XRC(63,136,1),	XRA_MASK,    COM,	PPCNONE,	{FRT, FRB}},
-@@ -5254,10 +5247,10 @@ const struct powerpc_opcode powerpc_opcodes[] = {
- 
- {"dtstsfq",	X(63,674),	X_MASK,      POWER6,	PPCNONE,	{BF, FRA, FRB}},
+ extern int varobj_floating_p (struct varobj *var);
  
--{"mtfsf",	XFL(63,711,0),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
- {"mtfsf",	XFL(63,711,0),	XFL_MASK,    POWER6,	PPCNONE,	{FLM, FRB, XFL_L, W}},
--{"mtfsf.",	XFL(63,711,1),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
-+{"mtfsf",	XFL(63,711,0),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
- {"mtfsf.",	XFL(63,711,1),	XFL_MASK,    POWER6,	PPCNONE,	{FLM, FRB, XFL_L, W}},
-+{"mtfsf.",	XFL(63,711,1),	XFL_MASK,    COM,	POWER6,		{FLM, FRB}},
+-extern void varobj_set_visualizer (struct varobj *var, const char *visualizer);
++extern void 
++varobj_set_visualizer (struct varobj *var, const char *visualizer);
++
++extern void varobj_enable_pretty_printing (void);
  
- {"drdpq",	XRC(63,770,0),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRB}},
- {"drdpq.",	XRC(63,770,1),	X_MASK,      POWER6,	PPCNONE,	{FRT, FRB}},
+ #endif /* VAROBJ_H */
+diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
+index c56ab86..dacf913 100644
+--- a/gdb/xcoffread.c
++++ b/gdb/xcoffread.c
+@@ -3038,6 +3038,7 @@ static struct sym_fns xcoff_sym_fns =
+   xcoff_new_init,		/* sym_new_init: init anything gbl to entire symtab */
+   xcoff_symfile_init,		/* sym_init: read initial info, setup for sym_read() */
+   xcoff_initial_scan,		/* sym_read: read a symbol file into symtab */
++  NULL,				/* sym_read_psymbols */
+   xcoff_symfile_finish,		/* sym_finish: finished with file, cleanup */
+   xcoff_symfile_offsets,	/* sym_offsets: xlate offsets ext->int form */
+   default_symfile_segments,	/* sym_segments: Get segment information from


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -p -r1.367 -r1.368
--- gdb.spec	31 Jul 2009 08:40:04 -0000	1.367
+++ gdb.spec	4 Aug 2009 05:37:29 -0000	1.368
@@ -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.50.20090302
+Version: 6.8.50.20090803
 
 # 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: 42%{?_with_upstream:.upstream}%{?dist}
+Release: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -82,12 +82,6 @@ Patch112: gdb-6.6-scheduler_locking-step
 # Make upstream `set scheduler-locking step' as default.
 Patch260: gdb-6.6-scheduler_locking-step-is-default.patch
 
-# Fix to display base constructors from list and breakpoint commands
-Patch116: gdb-6.3-linespec-20041213.patch
-
-# Continue removing breakpoints even when failure occurs.
-Patch117: gdb-6.3-removebp-20041130.patch
-
 # Add a wrapper script to GDB that implements pstack using the
 # --readnever option.
 Patch118: gdb-6.3-gstack-20050411.patch
@@ -102,9 +96,8 @@ Patch125: gdb-6.3-test-self-20050110.pat
 # Fix for non-threaded watchpoints.
 Patch128: gdb-6.3-nonthreaded-wp-20050117.patch
 
-# Fix to support multiple destructors just like multiple constructors
+# Test support of multiple destructors just like multiple constructors
 Patch133: gdb-6.3-test-dtorfix-20050121.patch
-Patch134: gdb-6.3-dtorfix-20050121.patch
 
 # Fix to support executable moving
 Patch136: gdb-6.3-test-movedir-20050125.patch
@@ -116,7 +109,6 @@ Patch136: gdb-6.3-test-movedir-20050125.
 Patch140: gdb-6.3-gcore-thread-20050204.patch
 
 # Stop while intentionally stepping and the thread exit is met.
-Patch141: gdb-6.6-step-thread-exit.patch
 Patch259: gdb-6.3-step-thread-exit-20050211-test.patch
 
 # Prevent gdb from being pushed into background
@@ -193,9 +185,6 @@ Patch196: gdb-6.5-sharedlibrary-path.pat
 # FIXME: It could be autodetected.
 Patch199: gdb-6.5-bz190810-gdbserver-arch-advice.patch
 
-# Fix dereferencing registers for 32bit inferiors on 64bit hosts (BZ 181390).
-Patch200: gdb-6.5-bz181390-memory-address-width.patch
-
 # Fix `gcore' command for 32bit inferiors on 64bit hosts.
 Patch201: gdb-6.5-gcore-i386-on-amd64.patch
 
@@ -228,8 +217,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.20090302 snapshot fixups.
-Patch232: gdb-6.8.50.20090302-upstream.patch
+# Backported post gdb-6.8.50.20090803 snapshot fixups.
+#Patch232: gdb-6.8.50.20090803-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -340,7 +329,6 @@ Patch324: gdb-6.8-glibc-headers-compat.p
 Patch326: gdb-6.8-tui-singlebinary.patch
 
 # Support transparent debugging of inlined functions for an optimized code.
-Patch327: gdb-6.8-inlining.patch
 Patch350: gdb-6.8-inlining-addon.patch
 Patch328: gdb-6.8-inlining-by-name.patch
 
@@ -356,9 +344,6 @@ Patch331: gdb-6.8-quit-never-aborts.patc
 # Support DW_TAG_constant for Fortran in recent Fedora/RH GCCs.
 Patch332: gdb-6.8-fortran-tag-constant.patch
 
-# bare names of constructors and destructors should be unique for GDB-6.8+.
-Patch334: gdb-6.8-ctors-dtors-unique.patch
-
 # Fix attaching to stopped processes and/or pending signals.
 Patch337: gdb-6.8-attach-signalled-detach-stopped.patch
 
@@ -376,22 +361,6 @@ Patch349: gdb-archer.patch
 Patch352: gdb-6.8-bz457187-largefile.patch
 Patch360: gdb-6.8-bz457187-largefile-test.patch
 
-# Fix crash on pretty-printer reading uninitialized std::string (BZ 495781).
-Patch357: gdb-c_get_string-xfree.patch
-
-# Fix crash in the charset support.
-Patch359: gdb-charset-crash.patch
-
-# Fix crashes due to (missing) varobj revalidation, for VLA (for BZ 377541).
-Patch369: gdb-varobj-revalidate-prep.patch
-Patch370: gdb-varobj-revalidate-core.patch
-
-# Implement DW_OP_call_frame_cfa (for recent GCC).
-Patch373: gdb-DW_OP_call_frame_cfa.patch
-
-# Accelerate sorting blocks on reading a file (found on WebKit) (BZ 507267).
-Patch374: gdb-bz507267-block-sort-fast.patch
-
 # Fix compatibility of --with-system-readline and readline-6.0+.
 Patch375: gdb-readline-6.0.patch
 
@@ -481,7 +450,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-%patch232 -p1
+#patch232 -p1
 %patch349 -p1
 %patch1 -p1
 %patch3 -p1
@@ -491,17 +460,13 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch106 -p1
 %patch111 -p1
 %patch112 -p1
-%patch116 -p1
-%patch117 -p1
 %patch118 -p1
 %patch122 -p1
 %patch125 -p1
 %patch128 -p1
 %patch133 -p1
-%patch134 -p1
 %patch136 -p1
 %patch140 -p1
-%patch141 -p1
 %patch259 -p1
 %patch142 -p1
 %patch145 -p1
@@ -527,7 +492,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch195 -p1
 %patch196 -p1
 %patch199 -p1
-%patch200 -p1
 %patch201 -p1
 %patch208 -p1
 %patch209 -p1
@@ -578,25 +542,17 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch322 -p1
 %patch324 -p1
 %patch326 -p1
-%patch327 -p1
 %patch350 -p1
 %patch328 -p1
 %patch329 -p1
 %patch330 -p1
 %patch331 -p1
 %patch332 -p1
-%patch334 -p1
 %patch337 -p1
 %patch343 -p1
 %patch348 -p1
 %patch352 -p1
-%patch357 -p1
-%patch359 -p1
 %patch360 -p1
-%patch369 -p1
-%patch370 -p1
-%patch373 -p1
-%patch374 -p1
 %patch375 -p1
 %patch124 -p1
 
@@ -886,6 +842,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug  4 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090803-1
+- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090803
+- archer-jankratochvil-fedora12 commit: 0222cb1f4ddd1eda32965e464cb60b1e44e110b2
+
 * Fri Jul 31 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-42
 - Release bump only.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	2 Mar 2009 23:14:15 -0000	1.31
+++ sources	4 Aug 2009 05:37:29 -0000	1.32
@@ -1 +1 @@
-a8eae0d4ef955ebcecfc7511af31070a  gdb-6.8.50.20090302.tar.bz2
+f120526b72a3dfd29e9f06a562e34aa1  gdb-6.8.50.20090803.tar.bz2


--- gdb-6.3-dtorfix-20050121.patch DELETED ---


--- gdb-6.3-linespec-20041213.patch DELETED ---


--- gdb-6.3-removebp-20041130.patch DELETED ---


--- gdb-6.5-bz181390-memory-address-width.patch DELETED ---


--- gdb-6.6-step-thread-exit.patch DELETED ---


--- gdb-6.8-ctors-dtors-unique.patch DELETED ---


--- gdb-6.8-inlining.patch DELETED ---


--- gdb-6.8.50.20090302-upstream.patch DELETED ---


--- gdb-DW_OP_call_frame_cfa.patch DELETED ---


--- gdb-bz507267-block-sort-fast.patch DELETED ---


--- gdb-c_get_string-xfree.patch DELETED ---


--- gdb-charset-crash.patch DELETED ---


--- gdb-varobj-revalidate-core.patch DELETED ---


--- gdb-varobj-revalidate-prep.patch DELETED ---



From dcantrel at fedoraproject.org  Tue Aug  4 05:38:07 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  4 Aug 2009 05:38:07 +0000 (UTC)
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.103,1.104
Message-ID: <20090804053807.83C9311C00CE@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	dhcpv6.spec 
Log Message:
* Mon Aug 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-1
- Upgraded to dhcpv6-2.0.0-alpha1



Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- dhcpv6.spec	4 Aug 2009 04:39:15 -0000	1.103
+++ dhcpv6.spec	4 Aug 2009 05:38:07 -0000	1.104
@@ -49,7 +49,7 @@ Provides the client for the DHCPv6 proto
 configuration of IPv6 addresses and parameters.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{archivever}
 
 %build
 %configure



From airlied at fedoraproject.org  Tue Aug  4 05:43:44 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:43:44 +0000 (UTC)
Subject: rpms/xorg-x11-drv-vmware/devel .cvsignore, 1.12, 1.13 abi.patch, 1.1,
	1.2 sources, 1.12, 1.13 xorg-x11-drv-vmware.spec, 1.24, 1.25
Message-ID: <20090804054344.F3FD711C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore abi.patch sources xorg-x11-drv-vmware.spec 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 10.16.7-1
- vmware 10.16.7 + new abi patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Mar 2008 02:05:13 -0000	1.12
+++ .cvsignore	4 Aug 2009 05:43:44 -0000	1.13
@@ -1 +1 @@
-xf86-video-vmware-10.16.0.tar.bz2
+xf86-video-vmware-10.16.7.tar.bz2

abi.patch:
 vmware.c |    6 ++++++
 vmware.h |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

Index: abi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/abi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abi.patch	23 Jun 2009 00:46:35 -0000	1.1
+++ abi.patch	4 Aug 2009 05:43:44 -0000	1.2
@@ -1,78 +1,50 @@
-diff -up xf86-video-vmware-10.16.0/src/vmware.c.abi xf86-video-vmware-10.16.0/src/vmware.c
---- xf86-video-vmware-10.16.0/src/vmware.c.abi	2009-06-23 10:44:26.000000000 +1000
-+++ xf86-video-vmware-10.16.0/src/vmware.c	2009-06-23 10:44:46.000000000 +1000
-@@ -140,38 +140,6 @@ static PciChipsets VMWAREPciChipsets[] =
-     { -1,		       -1,		    RES_UNDEFINED }
+diff --git a/src/vmware.c b/src/vmware.c
+index 2d1eabd..879c206 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -18,7 +18,9 @@ char rcsId_vmware[] =
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
++#endif
+ 
+ #include "compiler.h"	/* inb/outb */
+ 
+@@ -109,11 +111,15 @@ static SymTabRec VMWAREChipsets[] = {
+     { -1,                  NULL }
+ };
+ 
++#ifndef XSERVER_LIBPCIACCESS
+ static resRange vmwareLegacyRes[] = {
+     { ResExcIoBlock, SVGA_LEGACY_BASE_PORT,
+       SVGA_LEGACY_BASE_PORT + SVGA_NUM_PORTS*sizeof(uint32)},
+     _VGA_EXCLUSIVE, _END
  };
++#else
++#define vmwareLegacyRes NULL
++#endif
+ 
+ #if XSERVER_LIBPCIACCESS
+ 
+diff --git a/src/vmware.h b/src/vmware.h
+index a3502dd..31560b5 100644
+--- a/src/vmware.h
++++ b/src/vmware.h
+@@ -19,12 +19,14 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
++
+ 
+ #include <X11/extensions/panoramiXproto.h>
+ 
+ #ifdef XSERVER_LIBPCIACCESS
+ #include <pciaccess.h>
++#else
++#include "xf86Resources.h"
+ #endif
  
--static const char *vgahwSymbols[] = {
--    "vgaHWGetHWRec",
--    "vgaHWGetIOBase",
--    "vgaHWGetIndex",
--    "vgaHWInit",
--    "vgaHWProtect",
--    "vgaHWRestore",
--    "vgaHWSave",
--    "vgaHWSaveScreen",
--    "vgaHWUnlock",
--    NULL
--};
--
--static const char *fbSymbols[] = {
--    "fbCreateDefColormap",
--    "fbPictureInit",
--    "fbScreenInit",
--    NULL
--};
--
--static const char *ramdacSymbols[] = {
--    "xf86CreateCursorInfoRec",
--    "xf86DestroyCursorInfoRec",
--    "xf86InitCursor",
--    NULL
--};
--
--static const char *shadowfbSymbols[] = {
--    "ShadowFBInit2",
--    NULL
--};
--
- #ifdef XFree86LOADER
- static XF86ModuleVersionInfo vmwareVersRec = {
-     "vmware",
-@@ -634,8 +602,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         return FALSE;
-     }
- 
--    xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
-     if (!vgaHWGetHWRec(pScrn)) {
-         return FALSE;
-     }
-@@ -971,15 +937,12 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         VMWAREFreeRec(pScrn);
-         return FALSE;
-     }
--    xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
--
-     /* Need ramdac for hwcursor */
-     if (pVMWARE->hwCursor) {
-         if (!xf86LoadSubModule(pScrn, "ramdac")) {
-             VMWAREFreeRec(pScrn);
-             return FALSE;
-         }
--        xf86LoaderReqSymLists(ramdacSymbols, NULL);
-     }
- 
-     /* Initialise VMWARE_CTRL extension. */
-@@ -1892,10 +1855,6 @@ vmwareSetup(pointer module, pointer opts
-     if (!setupDone) {
-         setupDone = TRUE;
-         xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
--
--        LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
--                          shadowfbSymbols, NULL);
--
-         return (pointer)1;
-     }
-     if (errmaj) {
+ #include "compiler.h"	        /* inb/outb */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Mar 2008 02:05:13 -0000	1.12
+++ sources	4 Aug 2009 05:43:44 -0000	1.13
@@ -1 +1 @@
-2768dd5c5c3867ac6fc390ae15dc85bd  xf86-video-vmware-10.16.0.tar.bz2
+5cddf28a23c21db6d7b8cdba7541391d  xf86-video-vmware-10.16.7.tar.bz2


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-vmware.spec	27 Jul 2009 08:35:11 -0000	1.24
+++ xorg-x11-drv-vmware.spec	4 Aug 2009 05:43:44 -0000	1.25
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
-Version:    10.16.0
-Release:    5%{?dist}.1
+Version:    10.16.7
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 10.16.7-1
+- vmware 10.16.7 + new abi patch
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.16.0-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Tue Aug  4 05:47:42 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 05:47:42 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.384, 1.385 jd.spec, 1.446, 1.447 sources,
	1.385, 1.386
Message-ID: <20090804054742.4739D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- .cvsignore	1 Aug 2009 18:21:59 -0000	1.384
+++ .cvsignore	4 Aug 2009 05:47:41 -0000	1.385
@@ -1 +1 @@
-jd-2.4.2-svn3007_trunk.tgz
+jd-2.4.2-svn3014_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- jd.spec	1 Aug 2009 18:21:59 -0000	1.446
+++ jd.spec	4 Aug 2009 05:47:41 -0000	1.447
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3007_trunk
+%define         strtag        svn3014_trunk
 %define         repoid        41293
 # 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 Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3007
+* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3014
 
 * 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/F-11/sources,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- sources	1 Aug 2009 18:21:59 -0000	1.385
+++ sources	4 Aug 2009 05:47:42 -0000	1.386
@@ -1 +1 @@
-9165b916e3b9ed22b037eeff56534d6d  jd-2.4.2-svn3007_trunk.tgz
+97da105284b8d30f3f9e5374eb42fb41  jd-2.4.2-svn3014_trunk.tgz



From mtasaka at fedoraproject.org  Tue Aug  4 05:47:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 05:47:41 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.390, 1.391 jd.spec, 1.450, 1.451 sources,
	1.391, 1.392
Message-ID: <20090804054741.EAFA511C00CE@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- .cvsignore	1 Aug 2009 18:21:58 -0000	1.390
+++ .cvsignore	4 Aug 2009 05:47:41 -0000	1.391
@@ -1 +1 @@
-jd-2.4.2-svn3007_trunk.tgz
+jd-2.4.2-svn3014_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -p -r1.450 -r1.451
--- jd.spec	1 Aug 2009 18:21:58 -0000	1.450
+++ jd.spec	4 Aug 2009 05:47:41 -0000	1.451
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3007_trunk
+%define         strtag        svn3014_trunk
 %define         repoid        41293
 # 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 Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3007
+* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3014
 
 * 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/F-10/sources,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- sources	1 Aug 2009 18:21:58 -0000	1.391
+++ sources	4 Aug 2009 05:47:41 -0000	1.392
@@ -1 +1 @@
-9165b916e3b9ed22b037eeff56534d6d  jd-2.4.2-svn3007_trunk.tgz
+97da105284b8d30f3f9e5374eb42fb41  jd-2.4.2-svn3014_trunk.tgz



From phuang at fedoraproject.org  Tue Aug  4 05:52:47 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue,  4 Aug 2009 05:52:47 +0000 (UTC)
Subject: rpms/ibus-anthy/devel .cvsignore, 1.16, 1.17 ibus-anthy.spec, 1.19, 
	1.20 sources, 1.16, 1.17
Message-ID: <20090804055247.D1D8511C00CE@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3900

Modified Files:
	.cvsignore ibus-anthy.spec sources 
Log Message:
Update to 1.2.0.29980804
Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Jun 2009 05:17:19 -0000	1.16
+++ .cvsignore	4 Aug 2009 05:52:47 -0000	1.17
@@ -1 +1 @@
-ibus-anthy-1.2.0.20090617.tar.gz
+ibus-anthy-1.2.0.20090804.tar.gz


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ibus-anthy.spec	25 Jul 2009 03:01:25 -0000	1.19
+++ ibus-anthy.spec	4 Aug 2009 05:52:47 -0000	1.20
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define require_ibus_version 1.2.0
 Name:       ibus-anthy
-Version:    1.2.0.20090617
-Release:    2%{?dist}
+Version:    1.2.0.20090804
+Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Tue Aug 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090804-1
+- Update to 1.2.0.20090804
+- Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	22 Jun 2009 05:17:19 -0000	1.16
+++ sources	4 Aug 2009 05:52:47 -0000	1.17
@@ -1 +1 @@
-45c36d284bb927f43b2cc86805bd4441  ibus-anthy-1.2.0.20090617.tar.gz
+00106d050cf8bb249504a87b7482e8f8  ibus-anthy-1.2.0.20090804.tar.gz



From alexlan at fedoraproject.org  Tue Aug  4 05:55:03 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue,  4 Aug 2009 05:55:03 +0000 (UTC)
Subject: rpms/Miro/devel Miro-2.5.2-fhs.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 Miro.spec, 1.58, 1.59 sources, 1.19,
	1.20 Miro-2.0.2-fhs.patch, 1.1,
	NONE Miro-2.0.3-disable-xine-hack.patch, 1.1, NONE
Message-ID: <20090804055503.92E9111C00CE@cvs1.fedora.phx.redhat.com>

Author: alexlan

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

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-2.5.2-fhs.patch 
Removed Files:
	Miro-2.0.2-fhs.patch Miro-2.0.3-disable-xine-hack.patch 
Log Message:
* Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary


Miro-2.5.2-fhs.patch:
 plat/renderers/xinerenderer.py |    4 ++--
 setup.py                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE Miro-2.5.2-fhs.patch ---
diff -up Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py
--- Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig	2009-08-04 01:32:18.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-08-04 01:36:20.000000000 -0400
@@ -247,8 +247,8 @@ class AudioRenderer(Renderer):
         Renderer.on_eos(self)
 
 def movie_data_program_info(movie_path, thumbnail_path):
-    if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
-        path = resources.path('../../../lib/miro/xine_extractor')
+    if os.path.exists(resources.path('/usr/libexec/xine_extractor')):
+        path = resources.path('/usr/libexec/xine_extractor')
         return ((path, movie_path, thumbnail_path), None)
     else:
         logging.error("xine_extractor cannot be found.")
diff -up Miro-2.5.2/platform/gtk-x11/setup.py.orig Miro-2.5.2/platform/gtk-x11/setup.py
--- Miro-2.5.2/platform/gtk-x11/setup.py.orig	2009-08-04 01:32:05.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/setup.py	2009-08-04 01:35:39.000000000 -0400
@@ -673,7 +673,7 @@ data_files += [
      [os.path.join(platform_dir, 'miro.1.gz')]),
     ('/usr/share/man/man1',
      [os.path.join(platform_dir, 'miro.real.1.gz')]),
-    ('/usr/lib/miro/',
+    ('/usr/libexec//',
      [os.path.join(platform_dir, 'xine/xine_extractor')]),
 ]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Jul 2009 21:20:37 -0000	1.19
+++ .cvsignore	4 Aug 2009 05:55:02 -0000	1.20
@@ -1 +1 @@
-Miro-2.0.5.tar.gz
+Miro-2.5.2.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Miro.spec	24 Jul 2009 15:38:26 -0000	1.58
+++ Miro.spec	4 Aug 2009 05:55:03 -0000	1.59
@@ -4,17 +4,16 @@
 %define gecko_ver 1.9.1.1
 
 Name:           Miro
-Version:        2.0.5
-Release:        3%{?dist}
+Version:        2.5.2
+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
-Patch0:         %{name}-2.0.2-fhs.patch
+Patch0:         %{name}-2.5.2-fhs.patch
 Patch1:         %{name}-2.0-videodir.patch
-Patch2:         %{name}-2.0.3-disable-xine-hack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel xine-lib-devel Pyrex 
@@ -48,7 +47,6 @@ releasing bug fixes on a regular basis.
 # (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 
 %build
@@ -95,6 +93,11 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
+- Update to latest upstream (2.5.2)
+- Drop xine hack patch, now upstream
+- Rebase remaining patches to 2.5.2 where necessary
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Jul 2009 21:20:37 -0000	1.19
+++ sources	4 Aug 2009 05:55:03 -0000	1.20
@@ -1 +1 @@
-bb589058844b441c8f0bd0b79532ca87  Miro-2.0.5.tar.gz
+e4e6a6979949c001ab06e813db7da06f  Miro-2.5.2.tar.gz


--- Miro-2.0.2-fhs.patch DELETED ---


--- Miro-2.0.3-disable-xine-hack.patch DELETED ---



From airlied at fedoraproject.org  Tue Aug  4 05:55:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:55:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.9.0-bgnr-enable.patch, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.180, 1.181 radeon-6.12.2-hax.patch,
	1.1, NONE radeon-6.12.2-rs690-hack.patch, 1.1,
	NONE radeon-6.12.2-stable-branch.patch, 1.1,
	NONE radeon-kms-compat.patch, 1.2,
	NONE radeon-modeset-fixes.patch, 1.3,
	NONE radeon-modeset-still-more-fixes.patch, 1.1,
	NONE radeon-modeset.patch, 1.47,
	NONE radeon-src-readback-cpu.patch, 1.1, NONE
Message-ID: <20090804055528.035CF11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	radeon-6.9.0-bgnr-enable.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-6.12.2-hax.patch radeon-6.12.2-rs690-hack.patch 
	radeon-6.12.2-stable-branch.patch radeon-kms-compat.patch 
	radeon-modeset-fixes.patch 
	radeon-modeset-still-more-fixes.patch radeon-modeset.patch 
	radeon-src-readback-cpu.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
- ati: rebase to git master - need to fixup a few patches later


radeon-6.9.0-bgnr-enable.patch:
 radeon_kms.c |    3 +++
 1 file changed, 3 insertions(+)

Index: radeon-6.9.0-bgnr-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-bgnr-enable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radeon-6.9.0-bgnr-enable.patch	29 Oct 2008 01:49:51 -0000	1.1
+++ radeon-6.9.0-bgnr-enable.patch	4 Aug 2009 05:55:26 -0000	1.2
@@ -1,14 +1,13 @@
-diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 46fa59a..317942b 100644
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -2762,6 +2762,9 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+diff -up xf86-video-ati-6.12.2/src/radeon_kms.c.da xf86-video-ati-6.12.2/src/radeon_kms.c
+--- xf86-video-ati-6.12.2/src/radeon_kms.c.da	2009-08-04 15:53:14.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_kms.c	2009-08-04 15:53:48.000000000 +1000
+@@ -331,6 +331,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn
+     if (pScrn->numEntities != 1) return FALSE;
+     if (!RADEONGetRec(pScrn)) return FALSE;
  
-     info->drm_mode_setting = radeon_kernel_mode_enabled(pScrn);
- 
-+    if (info->drm_mode_setting)
-+	pScrn->canDoBGNoneRoot = 1;
++    /* kms bg root enable */
++    pScrn->canDoBGNoneRoot = 1;
 +
+     info               = RADEONPTR(pScrn);
+     info->MMIO         = NULL;
      info->IsSecondary  = FALSE;
-     info->IsPrimary = FALSE;
- 


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- xorg-x11-drv-ati.spec	27 Jul 2009 08:23:53 -0000	1.180
+++ xorg-x11-drv-ati.spec	4 Aug 2009 05:55:27 -0000	1.181
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   20%{?dist}.1
+Release:   21%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,18 +15,10 @@ Source0:    http://www.x.org/pub/individ
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
-Patch0:	    radeon-6.12.2-stable-branch.patch
-Patch1:     radeon-modeset.patch
-Patch2:     radeon-modeset-fixes.patch
-Patch3:	    radeon-modeset-still-more-fixes.patch
+Patch0:     radeon-6.12.2-to-git.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
-Patch8:     radeon-src-readback-cpu.patch
-Patch9:     radeon-6.12.2-rs690-hack.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
-Patch11:    radeon-6.12.2-hax.patch
-Patch12:    radeon-kms-compat.patch
 Patch13:    fix-default-modes.patch
-Patch14:    radeon-powerpc-fix.patch
 
 ExcludeArch: s390 s390x
 
@@ -50,18 +42,10 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .stable
-%patch1 -p1 -b .modeset
-%patch2 -p1 -b .modeset-fixes
-%patch3 -p1 -b .modeset-still-more-fixes
+%patch0 -p1 -b .git
 %patch6 -p1 -b .bgnr
-%patch8 -p1 -b .srcrb
-%patch9 -p1 -b .rs690
 %patch10 -p1 -b .lvds
-%patch11 -p1 -b .fixups
-%patch12 -p1 -b .compat
 %patch13 -p1 -b .def
-%patch14 -p1 -b .ppcfix
 
 %build
 autoreconf -iv
@@ -95,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
+- ati: rebase to git master - need to fixup a few patches later
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.12.2-20.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- radeon-6.12.2-hax.patch DELETED ---


--- radeon-6.12.2-rs690-hack.patch DELETED ---


--- radeon-6.12.2-stable-branch.patch DELETED ---


--- radeon-kms-compat.patch DELETED ---


--- radeon-modeset-fixes.patch DELETED ---


--- radeon-modeset-still-more-fixes.patch DELETED ---


--- radeon-modeset.patch DELETED ---


--- radeon-src-readback-cpu.patch DELETED ---



From airlied at fedoraproject.org  Tue Aug  4 05:58:19 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 05:58:19 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel intel-abi-fix.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.18, 1.19
Message-ID: <20090804055819.76E3111C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-abi-fix.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.8.0-3
- add ABI fixes for RAC removal


intel-abi-fix.patch:
 ch7017/ch7017.c |    1 -
 ch7xxx/ch7xxx.c |    1 -
 i810_driver.c   |    9 ---------
 i810_hwmc.c     |    1 -
 i810_video.c    |    1 -
 i830_driver.c   |   11 -----------
 i830_i2c.c      |    2 --
 i830_video.c    |    1 -
 i915_hwmc.c     |    1 -
 ivch/ivch.c     |    1 -
 sil164/sil164.c |    1 -
 tfp410/tfp410.c |    1 -
 12 files changed, 31 deletions(-)

--- NEW FILE intel-abi-fix.patch ---
diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index 01e414f..6b27d05 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -34,7 +34,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c
index 13ba102..cad507d 100644
--- a/src/ch7xxx/ch7xxx.c
+++ b/src/ch7xxx/ch7xxx.c
@@ -34,7 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 4b8c459..f158f5d 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -55,8 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
@@ -549,10 +547,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
 
    pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index);
 
-   if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
-      return FALSE;
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-
    /* Set pScrn->monitor */
    pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -937,9 +931,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
 
    /*  We won't be using the VGA access after the probe */
    I810SetMMIOAccess(pI810);
-   xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
-   xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
-
    return TRUE;
 }
 
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c
index 12ffdd9..1c3ffc9 100644
--- a/src/i810_hwmc.c
+++ b/src/i810_hwmc.c
@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i810_video.c b/src/i810_video.c
index 9528bc7..c82fcc9 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 33079fe..f701231 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -51,8 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86Priv.h"
 #include "xf86cmap.h"
 #include "compiler.h"
@@ -1540,13 +1538,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
    if (!i830_open_drm_master(pScrn))
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to become DRM master.\n");
 
-
-   if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
-      PreInitCleanup(pScrn);
-      return FALSE;
-   }
-
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
    pScrn->monitor = pScrn->confScreen->monitor;
    pScrn->progClock = TRUE;
    pScrn->rgbBits = 8;
@@ -1632,8 +1623,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
 
        /*  We won't be using the VGA access after the probe. */
        I830SetMMIOAccess(pI830);
-       xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
-       xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
    }
 
    /* Load the dri2 module if requested. */
diff --git a/src/i830_i2c.c b/src/i830_i2c.c
index 8392d0a..4ba073d 100644
--- a/src/i830_i2c.c
+++ b/src/i830_i2c.c
@@ -31,8 +31,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
diff --git a/src/i830_video.c b/src/i830_video.c
index 92b6324..9fb0b56 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -56,7 +56,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 6712caa..7e0f145 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -32,7 +32,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c
index dffe334..79da11a 100644
--- a/src/ivch/ivch.c
+++ b/src/ivch/ivch.c
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c
index c90bed3..e43107a 100644
--- a/src/sil164/sil164.c
+++ b/src/sil164/sil164.c
@@ -35,7 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c
index 4d3bb8a..a8985f7 100644
--- a/src/tfp410/tfp410.c
+++ b/src/tfp410/tfp410.c
@@ -34,7 +34,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"


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.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xorg-x11-drv-intel.spec	27 Jul 2009 08:26:55 -0000	1.18
+++ xorg-x11-drv-intel.spec	4 Aug 2009 05:58:19 -0000	1.19
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@ Source4:    make-git-snapshot.sh
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
 Patch3: intel-2.8.0-build-fix.patch
+Patch4: intel-abi-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
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
 %patch3 -p1 -b .xext
+%patch4 -p1 -b .abi
 %patch20 -p1 -b .get-crtc
 %patch30 -p1 -b .names
 
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.8.0-3
+- add ABI fixes for RAC removal
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 06:05:31 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 06:05:31 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel nv-update-git.patch, NONE,
	1.1 nv-save-rom.patch, 1.2, 1.3 xorg-x11-drv-nv.spec, 1.89, 1.90
Message-ID: <20090804060531.2894A11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	nv-save-rom.patch xorg-x11-drv-nv.spec 
Added Files:
	nv-update-git.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.1.14-3
- update for new ABI


nv-update-git.patch:
 Makefile.am        |    2 +-
 configure.ac       |   10 ++++++++++
 src/g80_dac.c      |    5 +++++
 src/g80_driver.c   |   14 +++++++++++++-
 src/g80_sor.c      |    5 +++++
 src/nv_driver.c    |    4 ++++
 src/nv_include.h   |    6 ++++--
 src/nv_video.c     |    1 -
 src/riva_driver.c  |    5 ++++-
 src/riva_include.h |    5 ++++-
 src/riva_type.h    |    2 +-
 11 files changed, 51 insertions(+), 8 deletions(-)

--- NEW FILE nv-update-git.patch ---
diff --git a/Makefile.am b/Makefile.am
index cdce83e..0891338 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index e67a1ef..839512b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,11 @@ AC_INIT([xf86-video-nv],
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
+
+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -61,6 +66,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+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" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
@@ -129,6 +138,7 @@ AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
 	Makefile
diff --git a/src/g80_dac.c b/src/g80_dac.c
index 404f178..307e412 100644
--- a/src/g80_dac.c
+++ b/src/g80_dac.c
@@ -27,8 +27,13 @@
 
 #include <unistd.h>
 
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 #include <xf86_OSproc.h>
 
 #include "g80_type.h"
diff --git a/src/g80_driver.c b/src/g80_driver.c
index 5ecf895..13e417a 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -28,16 +28,24 @@
 
 #include <string.h>
 
+#include <xf86.h>
 #include <xf86_OSproc.h>
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include <xf86Resources.h>
-#include <xf86RandR12.h>
+#endif
 #include <mipointer.h>
 #include <mibstore.h>
 #include <micmap.h>
 #include <xf86cmap.h>
 #include <fb.h>
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
+#include <xf86RandR12.h>
 
 #include "nv_const.h"
 #include "g80_type.h"
@@ -224,8 +232,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     }
 
     /* Disable VGA access */
+#ifndef XSERVER_LIBPCIACCESS
     xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
     xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+#endif
 
     pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -309,11 +319,13 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MMIO registers mapped at %p\n",
                (void*)pNv->reg);
 
+#ifndef XSERVER_LIBPCIACCESS
     if(xf86RegisterResources(pEnt->index, NULL, ResExclusive)) {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found "
                    "resource conflicts\n");
         goto fail;
     }
+#endif
 
     pNv->architecture = pNv->reg[0] >> 20 & 0x1ff;
     tmp = pNv->reg[0x0010020C/4];
diff --git a/src/g80_sor.c b/src/g80_sor.c
index c1ef42d..185761f 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -25,8 +25,13 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 #include <X11/Xatom.h>
 
 #include "g80_type.h"
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 3a396e0..a7cf2dc 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1264,8 +1264,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 #endif
     }
    
+#ifndef XSERVER_LIBPCIACCESS
     xf86SetOperatingState(resVgaIo, pNv->pEnt->index, ResUnusedOpr);
     xf86SetOperatingState(resVgaMem, pNv->pEnt->index, ResDisableOpr);
+#endif
 
     /* Set pScrn->monitor */
     pScrn->monitor = pScrn->confScreen->monitor;
@@ -1642,6 +1644,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
 	       (unsigned long)pNv->IOAddress);
      
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pNv->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		"xf86RegisterResources() found resource conflicts\n");
@@ -1649,6 +1652,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 	NVFreeRec(pScrn);
 	return FALSE;
     }
+#endif
 
     switch (pNv->Chipset & 0x0ff0) {
     case 0x0100:   /* GeForce 256 */
diff --git a/src/nv_include.h b/src/nv_include.h
index b579b37..a0d5ad1 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -8,7 +8,11 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
 #include "compiler.h"
 
 /* Drivers for PCI hardware need this */
@@ -29,8 +33,6 @@
 
 #include "vbe.h"
 
-#include "xf86RAC.h"
-
 #include "nv_const.h"
 
 #include "dixstruct.h"
diff --git a/src/nv_video.c b/src/nv_video.c
index e11e0d0..6b13e5f 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -4,7 +4,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/riva_driver.c b/src/riva_driver.c
index 3540fe9..afe0972 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -396,8 +396,10 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
 #endif
     }
    
+#ifndef XSERVER_LIBPCIACCESS
     xf86SetOperatingState(resVgaIo, pRiva->pEnt->index, ResUnusedOpr);
     xf86SetOperatingState(resVgaMem, pRiva->pEnt->index, ResDisableOpr);
+#endif
 
     /* Set pScrn->monitor */
     pScrn->monitor = pScrn->confScreen->monitor;
@@ -633,6 +635,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
 	       (unsigned long)pRiva->IOAddress);
      
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pRiva->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		"xf86RegisterResources() found resource conflicts\n");
@@ -640,7 +643,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
 	RivaFreeRec(pScrn);
 	return FALSE;
     }
-
+#endif
     Riva3Setup(pScrn);
 
     /*
diff --git a/src/riva_include.h b/src/riva_include.h
index 6726fcc..04c35a6 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -6,7 +6,11 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
 #include "compiler.h"
 
 /* Drivers for PCI hardware need this */
@@ -27,7 +31,6 @@
 
 #include "vbe.h"
 
-#include "xf86RAC.h"
 
 #include "riva_const.h"
 
diff --git a/src/riva_type.h b/src/riva_type.h
index 5a1317f..456f813 100644
--- a/src/riva_type.h
+++ b/src/riva_type.h
@@ -56,8 +56,8 @@ typedef struct {
 #else
     pciVideoPtr         PciInfo;
     PCITAG              PciTag;
-#endif
     xf86AccessRec       Access;
+#endif
     int                 ChipRev;
     Bool                Primary;
     CARD32              IOAddress;

nv-save-rom.patch:
 g80_driver.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Index: nv-save-rom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-save-rom.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nv-save-rom.patch	7 Apr 2009 17:57:42 -0000	1.2
+++ nv-save-rom.patch	4 Aug 2009 06:05:29 -0000	1.3
@@ -1,18 +1,17 @@
-diff -up xf86-video-nv-2.1.13/src/g80_driver.c.save-rom xf86-video-nv-2.1.13/src/g80_driver.c
---- xf86-video-nv-2.1.13/src/g80_driver.c.save-rom	2008-10-27 17:54:04.000000000 -0400
-+++ xf86-video-nv-2.1.13/src/g80_driver.c	2009-04-07 13:50:34.000000000 -0400
-@@ -28,6 +28,10 @@
+diff -up xf86-video-nv-2.1.14/src/g80_driver.c.da xf86-video-nv-2.1.14/src/g80_driver.c
+--- xf86-video-nv-2.1.14/src/g80_driver.c.da	2009-08-04 16:03:45.000000000 +1000
++++ xf86-video-nv-2.1.14/src/g80_driver.c	2009-08-04 16:04:06.000000000 +1000
+@@ -27,6 +27,9 @@
+ #endif
  
  #include <string.h>
- 
 +#include <sys/types.h>
 +#include <sys/stat.h>
 +#include <fcntl.h>
-+
+ 
+ #include <xf86.h>
  #include <xf86_OSproc.h>
- #include <xf86Resources.h>
- #include <xf86RandR12.h>
-@@ -205,6 +209,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
+@@ -163,6 +166,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
      char *s;
      CARD32 tmp;
      memType BAR1sizeKB;
@@ -20,7 +19,7 @@ diff -up xf86-video-nv-2.1.13/src/g80_dr
  
      if(flags & PROBE_DETECT)
          return TRUE;
-@@ -429,6 +434,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
+@@ -390,6 +394,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
      else
          pNv->table1 -= 0x10000;
  
@@ -35,7 +34,7 @@ diff -up xf86-video-nv-2.1.13/src/g80_dr
      xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
      xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
  
-@@ -984,6 +997,8 @@ G80EnterVT(int scrnIndex, int flags)
+@@ -939,6 +951,8 @@ G80EnterVT(int scrnIndex, int flags)
      ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
      G80Ptr pNv = G80PTR(pScrn);
  


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.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- xorg-x11-drv-nv.spec	27 Jul 2009 08:29:07 -0000	1.89
+++ xorg-x11-drv-nv.spec	4 Aug 2009 06:05:29 -0000	1.90
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.14
-Release:   2%{?dist}.1
+Release:   3%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@ BuildRequires: libdrm-devel >= 2.3.0-7
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.6.0
 
+Patch3:     nv-update-git.patch
 Patch4:     nv-reserve-fbarea.patch
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
@@ -35,6 +36,7 @@ X.Org X11 nv video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch3 -p1 -b .git
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
@@ -67,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.1.14-3
+- update for new ABI
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.14-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Aug  4 06:10:31 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 06:10:31 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-vga-arb.patch, NONE,
	1.1 .cvsignore, 1.65, 1.66 commitid, 1.28,
	1.29 dri2-page-flip.patch, 1.1, 1.2 sources, 1.60,
	1.61 xorg-x11-server.spec, 1.458,
	1.459 xserver-1.5.0-bg-none-root.patch, 1.6,
	1.7 xserver-1.6.0-primary.patch, 1.3,
	NONE xserver-1.6.99-use-pci-access-boot.patch, 1.3, NONE
Message-ID: <20090804061031.791AD11C04D1@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore commitid dri2-page-flip.patch sources 
	xorg-x11-server.spec xserver-1.5.0-bg-none-root.patch 
Added Files:
	xserver-1.6.99-vga-arb.patch 
Removed Files:
	xserver-1.6.0-primary.patch 
	xserver-1.6.99-use-pci-access-boot.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.6.99-24.20090804
- update server snapshot + add VGA arbitration


xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1137 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1508 insertions(+), 11 deletions(-)

--- NEW FILE xserver-1.6.99-vga-arb.patch ---
>From 307264f4bc6c9431aea49be67a6b832ccafc7007 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 3 Aug 2009 14:09:32 +1000
Subject: [PATCH] X server: VGA arbitration.

This patch adds the VGA arb paths to the X server.

TODO:
test with lots more sigio mouse movement type stuff - RAC used to disable it
---
 configure.ac                           |    1 +
 hw/xfree86/common/Makefile.am          |    6 +-
 hw/xfree86/common/xf86Bus.c            |   15 +
 hw/xfree86/common/xf86DPMS.c           |    4 +-
 hw/xfree86/common/xf86Init.c           |   11 +-
 hw/xfree86/common/xf86PM.c             |    6 +-
 hw/xfree86/common/xf86VGAarbiter.c     | 1137 ++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 ++
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 ++++++++
 hw/xfree86/common/xf86str.h            |    4 +-
 hw/xfree86/dri/dri.c                   |    7 +
 hw/xfree86/dri2/dri2.c                 |    7 +
 hw/xfree86/int10/generic.c             |    2 +
 hw/xfree86/loader/sdksyms.sh           |    1 +
 include/xorg-config.h.in               |    3 +
 15 files changed, 1508 insertions(+), 10 deletions(-)
 create mode 100644 hw/xfree86/common/xf86VGAarbiter.c
 create mode 100644 hw/xfree86/common/xf86VGAarbiter.h
 create mode 100644 hw/xfree86/common/xf86VGAarbiterPriv.h

diff --git a/configure.ac b/configure.ac
index 1e3438e..a1219d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1388,6 +1388,7 @@ if test "x$XORG" = xyes; then
 	AC_CHECK_FUNCS([pci_system_init_dev_mem])
 	AC_CHECK_FUNCS([pci_device_enable])
 	AC_CHECK_FUNCS([pci_device_is_boot_vga])
+	AC_CHECK_FUNCS([pci_device_vgaarb_init])
 	LIBS=$SAVE_LIBS
 	CFLAGS=$SAVE_CFLAGS
 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index f3e201b..ad27210 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -35,7 +35,7 @@ AM_LDFLAGS = -r
 libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
                       xf86Cursor.c $(DGASOURCES) xf86DPMS.c \
                       xf86Events.c xf86Globals.c xf86AutoConfig.c \
-                      xf86Option.c xf86Init.c \
+                      xf86Option.c xf86Init.c xf86VGAarbiter.c \
                       xf86VidMode.c xf86fbman.c xf86cmap.c \
                       xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
                       xf86Mode.c xorgHelper.c \
@@ -52,7 +52,7 @@ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
               xf86PciInfo.h xf86Priv.h xf86Privstr.h \
               xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \
               $(XVSDKINCS) $(XF86VMODE_SDK) xorgVersion.h \
-              xf86sbusBus.h
+              xf86sbusBus.h xf86VGAarbiter.h
 
 DISTCLEANFILES = xf86Build.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -83,6 +83,8 @@ EXTRA_DIST = \
 	xorgVersion.h \
 	$(MODEDEFSOURCES) \
 	modeline2c.awk \
+	xf86VGAarbiter.h \
+	xf86VGAarbiterPriv.h \
         $(DISTKBDSOURCES)
 
 if LNXACPI
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 01716ed..bf6a6f8 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -48,6 +48,7 @@
 #define XF86_OS_PRIVS
 #define NEED_OS_RAC_PROTOS
 #include "xf86_OSproc.h"
+#include "xf86VGAarbiter.h"
 
 #include "Pci.h"
 
@@ -545,11 +546,25 @@ xf86PostPreInit(void)
 void
 xf86PostScreenInit(void)
 {
+    int i;
+    int vga_count;
     if (doFramebufferMode) {
 	SetSIGIOForState(OPERATING);
 	return;
     }
 
+    /*
+     * we need to wrap the arbiter if we have more than
+     * one VGA card - hotplug cries.
+     */
+#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
+    pci_device_vgaarb_get_info(NULL, &vga_count, NULL);
+    if (vga_count > 1 && xf86Screens) {
+	xf86Msg(X_INFO,"Number of VGA devices: %d: arbiter wrapping enabled\n", vga_count);
+        for (i = 0; i < xf86NumScreens; i++)
+	    xf86VGAarbiterWrapFunctions(xf86Screens[i]->pScreen);
+    }
+#endif
     DebugF("PostScreenInit  generation: %i\n",serverGeneration);
     xf86EnterServerState(OPERATING);
     
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index f78267d..22174c7 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -42,6 +42,7 @@
 #include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
 #endif
+#include "xf86VGAarbiter.h"
 
 
 #ifdef DPMSExtension
@@ -162,8 +163,9 @@ DPMSSet(ClientPtr client, int level)
     	pScrn = xf86Screens[i];
 	pDPMS = dixLookupPrivate(&screenInfo.screens[i]->devPrivates, DPMSKey);
 	if (pDPMS && pScrn->DPMSSet && pDPMS->Enabled && pScrn->vtSema) { 
-	    xf86EnableAccess(pScrn);
+	    xf86VGAarbiterLock(pScrn);
 	    pScrn->DPMSSet(pScrn, level, 0);
+	    xf86VGAarbiterUnlock(pScrn);
 	}
     }
     return Success;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 44eed4d..e84da4e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -78,6 +78,7 @@
 #include "picturestr.h"
 #endif
 
+#include "xf86VGAarbiter.h"
 #include "globals.h"
 
 #ifdef DPMSExtension
@@ -714,6 +715,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
       return;
     }
 
+    xf86VGAarbiterInit();
+
     /*
      * Match up the screens found by the probes against those specified
      * in the config file.  Remove the ones that won't be used.  Sort
@@ -794,10 +797,12 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
      */
 
     for (i = 0; i < xf86NumScreens; i++) {
-	xf86EnableAccess(xf86Screens[i]);
+	xf86VGAarbiterScrnInit(xf86Screens[i]);
+	xf86VGAarbiterLock(xf86Screens[i]);
 	if (xf86Screens[i]->PreInit &&
 	    xf86Screens[i]->PreInit(xf86Screens[i], 0))
 	    xf86Screens[i]->configured = TRUE;
+	xf86VGAarbiterUnlock(xf86Screens[i]);
     }
     for (i = 0; i < xf86NumScreens; i++)
 	if (!xf86Screens[i]->configured)
@@ -1010,7 +1015,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 #endif /* SCO325 */
 
   for (i = 0; i < xf86NumScreens; i++) {
-	xf86EnableAccess(xf86Screens[i]);
+	xf86VGAarbiterLock(xf86Screens[i]);
 	/*
 	 * Almost everything uses these defaults, and many of those that
 	 * don't, will wrap them.
@@ -1025,6 +1030,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 	xf86Screens[i]->DriverFunc = NULL;
 	xf86Screens[i]->pScreen = NULL;
 	scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);
+	xf86VGAarbiterUnlock(xf86Screens[i]);
       if (scr_index == i) {
 	/*
 	 * Hook in our ScrnInfoRec, and initialise some other pScreen
@@ -1222,7 +1228,6 @@ AbortDDX(void)
 	       * we might not have been wrapped yet. Therefore enable
 	       * screen explicitely.
 	       */
-	      xf86EnableAccess(xf86Screens[i]);
 	      (xf86Screens[i]->LeaveVT)(i, 0);
 	  }
   }
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index f6138c3..fa24813 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -100,7 +100,7 @@ resume(pmEvent event, Bool undo)
     xf86AccessEnter();
     xf86EnterServerState(SETUP);
     for (i = 0; i < xf86NumScreens; i++) {
-        xf86EnableAccess(xf86Screens[i]);
+     //   xf86EnableAccess(xf86Screens[i]);
 	if (xf86Screens[i]->PMEvent)
 	    xf86Screens[i]->PMEvent(i,event,undo);
 	else {
@@ -110,7 +110,7 @@ resume(pmEvent event, Bool undo)
     }
     xf86EnterServerState(OPERATING);
     for (i = 0; i < xf86NumScreens; i++) {
-        xf86EnableAccess(xf86Screens[i]);
+        //xf86EnableAccess(xf86Screens[i]);
 	if (xf86Screens[i]->EnableDisableFBAccess)
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
     }
@@ -165,7 +165,7 @@ DoApmEvent(pmEvent event, Bool undo)
 	    if (xf86Screens[i]->PMEvent) {
 		if (!setup) xf86EnterServerState(SETUP);
 		setup = 1;
-		xf86EnableAccess(xf86Screens[i]);
+//		xf86EnableAccess(xf86Screens[i]);
 		xf86Screens[i]->PMEvent(i,event,undo);
 	    }
 	}
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
new file mode 100644
index 0000000..33357a1
--- /dev/null
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -0,0 +1,1137 @@
+/*
+ * This code was stolen from RAC and adapted to control the legacy vga
+ * interface.
+ *
+ *
+ * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+ *
+ * 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.
+ *
+ */
+
+#define DEBUG
+#include "xf86VGAarbiter.h"
+#include "xf86VGAarbiterPriv.h"
+#include "pciaccess.h"
+
+#ifdef DEBUG
+#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
+#define DPRINT(x) ErrorF(x "\n");
+#else
+#define DPRINT_S(x,y)
+#define DPRINT(x)
+#endif
+
+#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
+
+static GCFuncs VGAarbiterGCFuncs = {
+    VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
+    VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,
+    VGAarbiterCopyClip
+};
+
+static GCOps VGAarbiterGCOps = {
+    VGAarbiterFillSpans, VGAarbiterSetSpans, VGAarbiterPutImage,
+    VGAarbiterCopyArea, VGAarbiterCopyPlane, VGAarbiterPolyPoint,
+    VGAarbiterPolylines, VGAarbiterPolySegment, VGAarbiterPolyRectangle,
+    VGAarbiterPolyArc, VGAarbiterFillPolygon, VGAarbiterPolyFillRect,
+    VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,
+    VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,
+    VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,
+    {NULL}      /* devPrivate */
+};
+
+static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
+    VGAarbiterSpriteRealizeCursor, VGAarbiterSpriteUnrealizeCursor,
+    VGAarbiterSpriteSetCursor, VGAarbiterSpriteMoveCursor,
+    VGAarbiterDeviceCursorInitialize, VGAarbiterDeviceCursorCleanup
+};
+
+static int VGAarbiterKeyIndex;
+static DevPrivateKey VGAarbiterScreenKey = &VGAarbiterKeyIndex;
+static int VGAarbiterGCIndex;
+static DevPrivateKey VGAarbiterGCKey = &VGAarbiterGCIndex;
+
+void
+xf86VGAarbiterInit(void)
+{
+    if (pci_device_vgaarb_init() != 0)
+        FatalError("VGA Arbiter: cannot open vga arbiter fd. Exiting\n");
+
+}
+
+void
+xf86VGAarbiterFini(void)
+{
+    pci_device_vgaarb_fini();
+}
+
+void
+xf86VGAarbiterLock(ScrnInfoPtr pScrn)
+{
+    pci_device_vgaarb_set_target(pScrn->vgaDev);
+    pci_device_vgaarb_lock();
+}
+
+void
+xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
+{
+    pci_device_vgaarb_unlock();
+}
+
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
+{
+    int vga_count;
+    unsigned int rsrc_decodes;
+    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+
+    pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);
+    if (vga_count > 1) {
+        if (rsrc_decodes) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+void
+xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)
+{
+    int bus, devi, func;
+    GDevPtr dev_tmp;
+    struct pci_device *dev;
+
+    dev_tmp = xf86GetDevFromEntity(pScrn->entityList[0],
+                                   pScrn->entityInstanceList[0]);
+    sscanf(dev_tmp->busID, "PCI:%d:%d:%d", &bus, &devi, &func);
+    ErrorF("registering PCI:%d:%d:%d with the VGA arbitration\n", bus, devi, func);
+
+    dev = pci_device_find_by_slot(0, bus, devi, func);
+    pScrn->vgaDev = dev;
+}
+
+void
+xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn)
+{
+    pci_device_vgaarb_decodes(VGA_ARB_RSRC_LEGACY_MEM | VGA_ARB_RSRC_LEGACY_IO);
+}
+
+Bool
+xf86VGAarbiterWrapFunctions(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn;
+    VGAarbiterScreenPtr pScreenPriv;
+    miPointerScreenPtr PointPriv;
+#ifdef RENDER
+    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
+#endif
+
+    pScrn = xf86Screens[pScreen->myNum];
+    PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
+
+    DPRINT_S("VGAarbiterWrapFunctions",pScreen->myNum);
+
+    if (!dixRequestPrivate(VGAarbiterGCKey, sizeof(VGAarbiterGCRec)))
+    	return FALSE;
+
+    if (!(pScreenPriv = xalloc(sizeof(VGAarbiterScreenRec))))
+    	return FALSE;
+
+    dixSetPrivate(&pScreen->devPrivates, VGAarbiterScreenKey, pScreenPriv);
+
+    WRAP_SCREEN(CloseScreen, VGAarbiterCloseScreen);
+    WRAP_SCREEN(SaveScreen, VGAarbiterSaveScreen);
+    WRAP_SCREEN(WakeupHandler, VGAarbiterWakeupHandler);
+    WRAP_SCREEN(BlockHandler, VGAarbiterBlockHandler);
+    WRAP_SCREEN(CreateGC, VGAarbiterCreateGC);
+    WRAP_SCREEN(GetImage, VGAarbiterGetImage);
+    WRAP_SCREEN(GetSpans, VGAarbiterGetSpans);
+    WRAP_SCREEN(SourceValidate, VGAarbiterSourceValidate);
+    WRAP_SCREEN(CopyWindow, VGAarbiterCopyWindow);
+    WRAP_SCREEN(ClearToBackground, VGAarbiterClearToBackground);
+    WRAP_SCREEN(CreatePixmap, VGAarbiterCreatePixmap);
+    WRAP_SCREEN(StoreColors, VGAarbiterStoreColors);
+    WRAP_SCREEN(DisplayCursor, VGAarbiterDisplayCursor);
+    WRAP_SCREEN(RealizeCursor, VGAarbiterRealizeCursor);
+    WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);
+    WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);
+    WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);
+#ifdef RENDER
+    WRAP_PICT(Composite,VGAarbiterComposite);
+    WRAP_PICT(Glyphs,VGAarbiterGlyphs);
+    WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);
+#endif
+    WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);
+    WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);
+    WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);
+    WRAP_SCREEN_INFO(LeaveVT, VGAarbiterLeaveVT);
+    WRAP_SCREEN_INFO(FreeScreen, VGAarbiterFreeScreen);
+    WRAP_SPRITE;
+    return TRUE;
+}
+
+/* Screen funcs */
+static Bool
+VGAarbiterCloseScreen (int i, ScreenPtr pScreen)
+{
+    Bool val;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, miPointerScreenKey);
+#ifdef RENDER
+    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
+#endif
+
+    DPRINT_S("VGAarbiterCloseScreen",pScreen->myNum);
+    UNWRAP_SCREEN(CreateGC);
+    UNWRAP_SCREEN(CloseScreen);
+    UNWRAP_SCREEN(GetImage);
+    UNWRAP_SCREEN(GetSpans);
+    UNWRAP_SCREEN(SourceValidate);
+    UNWRAP_SCREEN(CopyWindow);
+    UNWRAP_SCREEN(ClearToBackground);
+    UNWRAP_SCREEN(SaveScreen);
+    UNWRAP_SCREEN(StoreColors);
+    UNWRAP_SCREEN(DisplayCursor);
+    UNWRAP_SCREEN(RealizeCursor);
+    UNWRAP_SCREEN(UnrealizeCursor);
+    UNWRAP_SCREEN(RecolorCursor);
+    UNWRAP_SCREEN(SetCursorPosition);
+#ifdef RENDER
+    UNWRAP_PICT(Composite);
+    UNWRAP_PICT(Glyphs);
+    UNWRAP_PICT(CompositeRects);
+#endif
+    UNWRAP_SCREEN_INFO(AdjustFrame);
+    UNWRAP_SCREEN_INFO(SwitchMode);
+    UNWRAP_SCREEN_INFO(EnterVT);
+    UNWRAP_SCREEN_INFO(LeaveVT);
+    UNWRAP_SCREEN_INFO(FreeScreen);
+    UNWRAP_SPRITE;
+
+    xfree ((pointer) pScreenPriv);
+    xf86VGAarbiterLock(xf86Screens[i]);
+    val = (*pScreen->CloseScreen) (i, pScreen);
+    xf86VGAarbiterUnlock(xf86Screens[i]);
+    return val;
+}
+
+static void
+VGAarbiterBlockHandler(int i,
+                       pointer blockData, pointer pTimeout, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[i];
+    SCREEN_PROLOG(BlockHandler);
+    VGAGet();
+    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
+    VGAPut();
+    SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler);
+}
+
+static void
+VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[i];
+    SCREEN_PROLOG(WakeupHandler);
+    VGAGet();
+    pScreen->WakeupHandler(i, blockData, result, pReadmask);
+    VGAPut();
+    SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler);
+}
+
+static void
+VGAarbiterGetImage (
+    DrawablePtr pDrawable,
+    int sx, int sy, int w, int h,
+    unsigned int    format,
+    unsigned long   planemask,
+    char        *pdstLine
+    )
+{
+    ScreenPtr pScreen = pDrawable->pScreen;
+    DPRINT_S("VGAarbiterGetImage",pScreen->myNum);
+    SCREEN_PROLOG(GetImage);
+//    if (xf86Screens[pScreen->myNum]->vtSema) {
+    VGAGet();
+//    }
+    (*pScreen->GetImage) (pDrawable, sx, sy, w, h,
+              format, planemask, pdstLine);
+    VGAPut();
+    SCREEN_EPILOG (GetImage, VGAarbiterGetImage);
+}
+
+static void
+VGAarbiterGetSpans (
+    DrawablePtr pDrawable,
+    int     wMax,
+    DDXPointPtr ppt,
+    int     *pwidth,
+    int     nspans,
+    char    *pdstStart
+    )
+{
+    ScreenPtr       pScreen = pDrawable->pScreen;
+
+    DPRINT_S("VGAarbiterGetSpans",pScreen->myNum);
+    SCREEN_PROLOG (GetSpans);
+    VGAGet();
+    (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
+    VGAPut();
+    SCREEN_EPILOG (GetSpans, VGAarbiterGetSpans);
+}
+
+static void
+VGAarbiterSourceValidate (
+    DrawablePtr pDrawable,
+    int x, int y, int width, int height )
+{
+    ScreenPtr   pScreen = pDrawable->pScreen;
+    DPRINT_S("VGAarbiterSourceValidate",pScreen->myNum);
+    SCREEN_PROLOG (SourceValidate);
+    VGAGet();
+    if (pScreen->SourceValidate)
+    (*pScreen->SourceValidate) (pDrawable, x, y, width, height);
+    VGAPut();
+    SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);
+}
+
+static void
+VGAarbiterCopyWindow(
+    WindowPtr pWin,
+    DDXPointRec ptOldOrg,
+    RegionPtr prgnSrc )
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    DPRINT_S("VGAarbiterCopyWindow",pScreen->myNum);
+    SCREEN_PROLOG (CopyWindow);
+    VGAGet();
+    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+    VGAPut();
+    SCREEN_EPILOG (CopyWindow, VGAarbiterCopyWindow);
+}
+
+static void
+VGAarbiterClearToBackground (
+    WindowPtr pWin,
+    int x, int y,
+    int w, int h,
+    Bool generateExposures )
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    DPRINT_S("VGAarbiterClearToBackground",pScreen->myNum);
+    SCREEN_PROLOG ( ClearToBackground);
+    VGAGet();
+    (*pScreen->ClearToBackground) (pWin, x, y, w, h, generateExposures);
+    VGAPut();
+    SCREEN_EPILOG (ClearToBackground, VGAarbiterClearToBackground);
+}
+
+static PixmapPtr
+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
+{
+    PixmapPtr pPix;
+
+    DPRINT_S("VGAarbiterCreatePixmap",pScreen->myNum);
+    SCREEN_PROLOG ( CreatePixmap);
+    VGAGet();
+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);
+    VGAPut();
+    SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);
+
+    return pPix;
+}
+
+static Bool
+VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank)
+{
+    Bool val;
+
+    DPRINT_S("VGAarbiterSaveScreen",pScreen->myNum);
+    SCREEN_PROLOG (SaveScreen);
+    VGAGet();
+    val = (*pScreen->SaveScreen) (pScreen, unblank);
+    VGAPut();
+    SCREEN_EPILOG (SaveScreen, VGAarbiterSaveScreen);
+
+    return val;
+}
+
+static void
+VGAarbiterStoreColors (
+    ColormapPtr        pmap,
+    int                ndef,
+    xColorItem         *pdefs)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+
+    DPRINT_S("VGAarbiterStoreColors",pScreen->myNum);
+    SCREEN_PROLOG (StoreColors);
+    VGAGet();
+    (*pScreen->StoreColors) (pmap,ndef,pdefs);
+    VGAPut();
+    SCREEN_EPILOG ( StoreColors, VGAarbiterStoreColors);
+}
+
+static void
+VGAarbiterRecolorCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr pScreen,
+    CursorPtr pCurs,
+    Bool displayed
+    )
+{
+    DPRINT_S("VGAarbiterRecolorCursor",pScreen->myNum);
+    SCREEN_PROLOG (RecolorCursor);
+    VGAGet();
+    (*pScreen->RecolorCursor) (pDev, pScreen, pCurs, displayed);
+    VGAPut();
+    SCREEN_EPILOG ( RecolorCursor, VGAarbiterRecolorCursor);
+}
+
+static Bool
+VGAarbiterRealizeCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    DPRINT_S("VGAarbiterRealizeCursor",pScreen->myNum);
+    SCREEN_PROLOG (RealizeCursor);
+    VGAGet();
+    val = (*pScreen->RealizeCursor) (pDev, pScreen,pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( RealizeCursor, VGAarbiterRealizeCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterUnrealizeCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    DPRINT_S("VGAarbiterUnrealizeCursor",pScreen->myNum);
+    SCREEN_PROLOG (UnrealizeCursor);
+    VGAGet();
+    val = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( UnrealizeCursor, VGAarbiterUnrealizeCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterDisplayCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    DPRINT_S("VGAarbiterDisplayCursor",pScreen->myNum);
+    SCREEN_PROLOG (DisplayCursor);
+    VGAGet();
+    val = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( DisplayCursor, VGAarbiterDisplayCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterSetCursorPosition (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    int x, int y,
+    Bool generateEvent)
+{
+    Bool val;
+
+    DPRINT_S("VGAarbiterSetCursorPosition",pScreen->myNum);
+    SCREEN_PROLOG (SetCursorPosition);
+    VGAGet();
+    val = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);
+    VGAPut();
+    SCREEN_EPILOG ( SetCursorPosition, VGAarbiterSetCursorPosition);
+    return val;
+}
+
+static void
+VGAarbiterAdjustFrame(int index, int x, int y, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    DPRINT_S("VGAarbiterAdjustFrame",index);
+    VGAGet();
+    (*pScreenPriv->AdjustFrame)(index, x, y, flags);
+    VGAPut();
+}
+
+static Bool
+VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)
+{
+    Bool val;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    DPRINT_S("VGAarbiterSwitchMode",index);
+    VGAGet();
+    val = (*pScreenPriv->SwitchMode)(index, mode, flags);
+    VGAPut();
+    return val;
+}
+
+static Bool
+VGAarbiterEnterVT(int index, int flags)
+{
+    Bool val;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    DPRINT_S("VGAarbiterEnterVT",index);
+    VGAGet();
+    val = (*pScreenPriv->EnterVT)(index, flags);
+    VGAPut();
+    return val;
+}
+
+static void
+VGAarbiterLeaveVT(int index, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    DPRINT_S("VGAarbiterLeaveVT",index);
+
+    VGAGet();
+    (*pScreenPriv->LeaveVT)(index, flags);
+    VGAPut();
+}
+
+static void
+VGAarbiterFreeScreen(int index, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    DPRINT_S("VGAarbiterFreeScreen",index);
+
+    VGAGet();
+    (*pScreenPriv->FreeScreen)(index, flags);
+    VGAPut();
+}
+
+static Bool
+VGAarbiterCreateGC(GCPtr pGC)
+{
+    ScreenPtr    pScreen = pGC->pScreen;
+    VGAarbiterGCPtr pGCPriv = (VGAarbiterGCPtr)dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);
+    Bool         ret;
+
+    DPRINT_S("VGAarbiterCreateGC",pScreen->myNum);
+    SCREEN_PROLOG(CreateGC);
+    VGAGet();
+    ret = (*pScreen->CreateGC)(pGC);
+    VGAPut();
+    GC_WRAP(pGC);
+    SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);
+
+    return ret;
+}
+
+/* GC funcs */
+static void
+VGAarbiterValidateGC(
+   GCPtr         pGC,
+   unsigned long changes,
+   DrawablePtr   pDraw )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterValidateGC");
+    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterDestroyGC(GCPtr pGC)
+{
+    GC_UNWRAP (pGC);
+    DPRINT("VGAarbiterDestroyGC");
+    (*pGC->funcs->DestroyGC)(pGC);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterChangeGC (
+    GCPtr       pGC,
+    unsigned long   mask)
+{
+    GC_UNWRAP (pGC);
+    DPRINT("VGAarbiterChangeGC");
+    (*pGC->funcs->ChangeGC) (pGC, mask);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterCopyGC (
+    GCPtr       pGCSrc,
+    unsigned long   mask,
+    GCPtr       pGCDst)
+{
+    GC_UNWRAP (pGCDst);
+    DPRINT("VGAarbiterCopyGC");
+    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
+    GC_WRAP (pGCDst);
+}
+
+static void
+VGAarbiterChangeClip (
+    GCPtr   pGC,
+    int     type,
+    pointer pvalue,
+    int     nrects )
+{
+    GC_UNWRAP (pGC);
+    DPRINT("VGAarbiterChangeClip");
+    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
+{
+    GC_UNWRAP (pgcDst);
+    DPRINT("VGAarbiterCopyClip");
+    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);
+    GC_WRAP (pgcDst);
+}
+
+static void
+VGAarbiterDestroyClip(GCPtr pGC)
+{
+    GC_UNWRAP (pGC);
+    DPRINT("VGAarbiterDestroyClip");
+    (* pGC->funcs->DestroyClip)(pGC);
+    GC_WRAP (pGC);
+}
+
+/* GC Ops */
+static void
+VGAarbiterFillSpans(
+    DrawablePtr pDraw,
+    GC      *pGC,
+    int     nInit,
+    DDXPointPtr pptInit,
+    int *pwidthInit,
+    int fSorted )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterFillSpans");
+    VGAGet_GC();
+    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterSetSpans(
+    DrawablePtr     pDraw,
+    GCPtr       pGC,
+    char        *pcharsrc,
+    register DDXPointPtr ppt,
+    int         *pwidth,
+    int         nspans,
+    int         fSorted )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterSetSpans");
+    VGAGet_GC();
+    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPutImage(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     depth,
+    int x, int y, int w, int h,
+    int     leftPad,
+    int     format,
+    char    *pImage )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPutImage");
+    VGAGet_GC();
+    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h,
+              leftPad, format, pImage);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static RegionPtr
+VGAarbiterCopyArea(
+    DrawablePtr pSrc,
+    DrawablePtr pDst,
+    GC *pGC,
+    int srcx, int srcy,
+    int width, int height,
+    int dstx, int dsty )
+{
+    RegionPtr ret;
+
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterCopyArea");
+    VGAGet_GC();
+    ret = (*pGC->ops->CopyArea)(pSrc, pDst,
+                pGC, srcx, srcy, width, height, dstx, dsty);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static RegionPtr
+VGAarbiterCopyPlane(
+    DrawablePtr pSrc,
+    DrawablePtr pDst,
+    GCPtr pGC,
+    int srcx, int srcy,
+    int width, int height,
+    int dstx, int dsty,
+    unsigned long bitPlane )
+{
+    RegionPtr ret;
+
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterCopyPlane");
+    VGAGet_GC();
+    ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy,
+                 width, height, dstx, dsty, bitPlane);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static void
+VGAarbiterPolyPoint(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int mode,
+    int npt,
+    xPoint *pptInit )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyPoint");
+    VGAGet_GC();
+    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterPolylines(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     mode,
+    int     npt,
+    DDXPointPtr pptInit )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolylines");
+    VGAGet_GC();
+    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolySegment(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     nseg,
+    xSegment    *pSeg )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolySegment");
+    VGAGet_GC();
+    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyRectangle(
+    DrawablePtr  pDraw,
+    GCPtr        pGC,
+    int          nRectsInit,
+    xRectangle  *pRectsInit )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyRectangle");
+    VGAGet_GC();
+    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyArc(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     narcs,
+    xArc    *parcs )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyArc");
+    VGAGet_GC();
+    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterFillPolygon(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     shape,
+    int     mode,
+    int     count,
+    DDXPointPtr ptsIn )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterFillPolygon");
+    VGAGet_GC();
+    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyFillRect(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     nrectFill,
+    xRectangle  *prectInit)
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyFillRect");
+    VGAGet_GC();
+    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyFillArc(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     narcs,
+    xArc    *parcs )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyFillArc");
+    VGAGet_GC();
+    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static int
+VGAarbiterPolyText8(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    char    *chars )
+{
+    int ret;
+
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyText8");
+    VGAGet_GC();
+    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static int
+VGAarbiterPolyText16(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    unsigned short *chars )
+{
+    int ret;
+
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyText16");
+    VGAGet_GC();
+    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static void
+VGAarbiterImageText8(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    char    *chars )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterImageText8");
+    VGAGet_GC();
+    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterImageText16(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    unsigned short *chars )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterImageText16");
+    VGAGet_GC();
+    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterImageGlyphBlt(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int xInit, int yInit,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,
+    pointer pglyphBase )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterImageGlyphBlt");
+    VGAGet_GC();
+    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit,
+                   nglyph, ppci, pglyphBase);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyGlyphBlt(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int xInit, int yInit,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,
+    pointer pglyphBase )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPolyGlyphBlt");
+    VGAGet_GC();
+    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit,
+                  nglyph, ppci, pglyphBase);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPushPixels(
+    GCPtr   pGC,
+    PixmapPtr   pBitMap,
+    DrawablePtr pDraw,
+    int dx, int dy, int xOrg, int yOrg )
+{
+    GC_UNWRAP(pGC);
+    DPRINT("VGAarbiterPushPixels");
+    VGAGet_GC();
+    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+/* miSpriteFuncs */
+static Bool
+VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    DPRINT_S("VGAarbiterSpriteRealizeCursor",pScreen->myNum);
+    VGAGet();
+    val = PointPriv->spriteFuncs->RealizeCursor(pDev, pScreen, pCur);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static Bool
+VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    DPRINT_S("VGAarbiterSpriteUnrealizeCursor",pScreen->myNum);
+    VGAGet();
+    val = PointPriv->spriteFuncs->UnrealizeCursor(pDev, pScreen, pCur);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static void
+VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur, int x, int y)
+{
+    SPRITE_PROLOG;
+    DPRINT_S("VGAarbiterSpriteSetCursor",pScreen->myNum);
+    VGAGet();
+    PointPriv->spriteFuncs->SetCursor(pDev, pScreen, pCur, x, y);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static void
+VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    SPRITE_PROLOG;
+    DPRINT_S("VGAarbiterSpriteMoveCursor",pScreen->myNum);
+    VGAGet();
+    PointPriv->spriteFuncs->MoveCursor(pDev, pScreen, x, y);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static Bool
+VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    DPRINT_S("VGAarbiterDeviceCursorInitialize",pScreen->myNum);
+    VGAGet();
+    val = PointPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static void
+VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    SPRITE_PROLOG;
+    DPRINT_S("VGAarbiterDeviceCursorCleanup",pScreen->myNum);
+    VGAGet();
+    PointPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+#ifdef RENDER
+static void
+VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
+         PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,
+         INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,
+         CARD16 height)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(Composite);
+
+    VGAGet();
+    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst,
+              yDst, width, height);
+    VGAPut();
+    PICTURE_EPILOGUE(Composite, VGAarbiterComposite);
+}
+
+static void
+VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,
+      GlyphListPtr list, GlyphPtr *glyphs)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(Glyphs);
+
+    VGAGet();
+    (*ps->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+    VGAPut();
+    PICTURE_EPILOGUE (Glyphs, VGAarbiterGlyphs);
+}
+
+static void
+VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect,
+          xRectangle *rects)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(CompositeRects);
+
+    VGAGet();
+    (*ps->CompositeRects)(op, pDst, color, nRect, rects);
+    VGAPut();
+    PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);
+}
+#endif
+#else
+/* dummy functions */
+void xf86VGAarbiterInit(void) {}
+void xf86VGAarbiterFini(void) {}
+
+void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }
+void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}
+Bool xf86VGAarbiterWrapFunctions(ScreenPtr pScreen) { return FALSE; }
+
+#endif
diff --git a/hw/xfree86/common/xf86VGAarbiter.h b/hw/xfree86/common/xf86VGAarbiter.h
new file mode 100644
index 0000000..145d31c
--- /dev/null
+++ b/hw/xfree86/common/xf86VGAarbiter.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2009 Tiago Vignatti
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __XF86VGAARBITER_H
+#define __XF86VGAARBITER_H
+
+#include "screenint.h"
+#include "misc.h"
+#include "xf86.h"
+
+/* Functions */
+extern void xf86VGAarbiterInit(void);
+extern void xf86VGAarbiterFini(void);
+void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn);
+extern Bool xf86VGAarbiterWrapFunctions(ScreenPtr pScreen);
+extern void xf86VGAarbiterLock(ScrnInfoPtr pScrn);
+extern void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn);
+
+/* allow a driver to remove itself from arbiter - really should be
+ * done in the kernel though */
+extern _X_EXPORT void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn);
+/* DRI and arbiter are really not possible together,
+ * you really want to remove the card from arbitration if you can */
+extern _X_EXPORT Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen);
+
+#endif /* __XF86VGAARBITER_H */
diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h
new file mode 100644
index 0000000..40d4368
--- /dev/null
+++ b/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2009 Tiago Vignatti
+ *
+ * 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.
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include <X11/X.h>
+#include "colormapst.h"
+#include "scrnintstr.h"
+#include "screenint.h"
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "pixmap.h"
+#include "windowstr.h"
+#include "window.h"
+#include "xf86str.h"
+#include "mipointer.h"
+#include "mipointrst.h"
+#ifdef RENDER
+# include "picturestr.h"
+#endif
+
+
+#define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;}
+
+#define UNWRAP_SCREEN(x) pScreen->x = pScreenPriv->x
+
+#define SCREEN_PROLOG(x) pScreen->x = ((VGAarbiterScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, VGAarbiterScreenKey))->x
+
+#define SCREEN_EPILOG(x,y) pScreen->x = y;
+
+#define WRAP_PICT(x,y) if (ps) {pScreenPriv->x = ps->x;\
+    ps->x = y;}
+
+#define UNWRAP_PICT(x) if (ps) {ps->x = pScreenPriv->x;}
+
+#define PICTURE_PROLOGUE(field) ps->field = \
+    ((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
+    VGAarbiterScreenKey))->field
+
+#define PICTURE_EPILOGUE(field, wrap) ps->field = wrap
+
+#define WRAP_SCREEN_INFO(x,y) do {pScreenPriv->x = pScrn->x; pScrn->x = y;} while(0)
+
+#define UNWRAP_SCREEN_INFO(x) pScrn->x = pScreenPriv->x
+
+#define SPRITE_PROLOG miPointerScreenPtr PointPriv = \
+    (miPointerScreenPtr)dixLookupPrivate(&pScreen->devPrivates, \
+    miPointerScreenKey); VGAarbiterScreenPtr pScreenPriv = \
+    ((VGAarbiterScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
+    VGAarbiterScreenKey)); PointPriv->spriteFuncs = pScreenPriv->miSprite;
+
+#define SPRITE_EPILOG pScreenPriv->miSprite = PointPriv->spriteFuncs;\
+    PointPriv->spriteFuncs  = &VGAarbiterSpriteFuncs;
+
+#define WRAP_SPRITE do { pScreenPriv->miSprite = PointPriv->spriteFuncs;\
+    	PointPriv->spriteFuncs  = &VGAarbiterSpriteFuncs; 		\
+	} while (0)
+
+#define UNWRAP_SPRITE PointPriv->spriteFuncs = pScreenPriv->miSprite
+
+#define GC_WRAP(x) pGCPriv->wrapOps = (x)->ops;\
+    pGCPriv->wrapFuncs = (x)->funcs; (x)->ops = &VGAarbiterGCOps;\
+    (x)->funcs = &VGAarbiterGCFuncs;
+
+#define GC_UNWRAP(x) VGAarbiterGCPtr  pGCPriv = \
+    (VGAarbiterGCPtr)dixLookupPrivate(&(x)->devPrivates, VGAarbiterGCKey);\
+    (x)->ops = pGCPriv->wrapOps; (x)->funcs = pGCPriv->wrapFuncs;
+
+#define GC_SCREEN register ScrnInfoPtr pScrn = \
+    xf86Screens[pGC->pScreen->myNum]
+
+#define VGAGet(x)\
+    pci_device_vgaarb_set_target(xf86Screens[pScreen->myNum]->vgaDev); \
+    pci_device_vgaarb_lock();
+
+#define VGAGet_GC(x)\
+    pci_device_vgaarb_set_target(xf86Screens[pGC->pScreen->myNum]->vgaDev); \
+    pci_device_vgaarb_lock();
+
+#define VGAPut(x)\
+    pci_device_vgaarb_unlock();
+
+#define VGAPut_GC(x)\
+    pci_device_vgaarb_unlock();
+
+
+typedef struct _VGAarbiterScreen {
+    CreateGCProcPtr             CreateGC;
+    CloseScreenProcPtr          CloseScreen;
+    ScreenBlockHandlerProcPtr   BlockHandler;
+    ScreenWakeupHandlerProcPtr  WakeupHandler;
+    GetImageProcPtr             GetImage;
+    GetSpansProcPtr             GetSpans;
+    SourceValidateProcPtr       SourceValidate;
+    CopyWindowProcPtr           CopyWindow;
+    ClearToBackgroundProcPtr    ClearToBackground;
+    CreatePixmapProcPtr         CreatePixmap;
+    SaveScreenProcPtr           SaveScreen;
+    /* Colormap */
+    StoreColorsProcPtr          StoreColors;
+    /* Cursor */
+    DisplayCursorProcPtr        DisplayCursor;
+    RealizeCursorProcPtr        RealizeCursor;
+    UnrealizeCursorProcPtr      UnrealizeCursor;
+    RecolorCursorProcPtr        RecolorCursor;
+    SetCursorPositionProcPtr    SetCursorPosition;
+    void                        (*AdjustFrame)(int,int,int,int);
+    Bool                        (*SwitchMode)(int, DisplayModePtr,int);
+    Bool                        (*EnterVT)(int, int);
+    void                        (*LeaveVT)(int, int);
+    void                        (*FreeScreen)(int, int);
+    miPointerSpriteFuncPtr      miSprite;
+#ifdef RENDER
+    CompositeProcPtr            Composite;
+    GlyphsProcPtr               Glyphs;
+    CompositeRectsProcPtr       CompositeRects;
+#endif
+} VGAarbiterScreenRec, *VGAarbiterScreenPtr;
+
+typedef struct _VGAarbiterGC {
+    GCOps                       *wrapOps;
+    GCFuncs                     *wrapFuncs;
+} VGAarbiterGCRec, *VGAarbiterGCPtr;
+
+/* Screen funcs */
+static void VGAarbiterBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask);
+static void VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask);
+static Bool VGAarbiterCloseScreen (int i, ScreenPtr pScreen);
+static void VGAarbiterGetImage (DrawablePtr pDrawable, int sx, int sy, int w,
+    int h, unsigned int format, unsigned long planemask, char *pdstLine);
+static void VGAarbiterGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr
+    ppt, int *pwidth, int nspans, char  *pdstStart);
+static void VGAarbiterSourceValidate (DrawablePtr pDrawable, int x, int y,
+    int width, int height);
+static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
+    RegionPtr prgnSrc);
+static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,
+    int h, Bool generateExposures);
+static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,
+    int depth, unsigned int usage_hint);
+static Bool  VGAarbiterCreateGC(GCPtr pGC);
+static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);
+static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem
+    *pdefs);
+static void VGAarbiterRecolorCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
+    CursorPtr pCurs, Bool displayed);
+static Bool VGAarbiterRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
+    CursorPtr pCursor);
+static Bool VGAarbiterUnrealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
+    CursorPtr pCursor);
+static Bool VGAarbiterDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
+    CursorPtr pCursor);
+static Bool VGAarbiterSetCursorPosition (DeviceIntPtr pDev, ScreenPtr
+    pScreen, int x, int y, Bool generateEvent);
+static void VGAarbiterAdjustFrame(int index, int x, int y, int flags);
+static Bool VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags);
+static Bool VGAarbiterEnterVT(int index, int flags);
+static void VGAarbiterLeaveVT(int index, int flags);
+static void VGAarbiterFreeScreen(int index, int flags);
+
+/* GC funcs */
+static void VGAarbiterValidateGC(GCPtr pGC, unsigned long changes,
+    DrawablePtr pDraw);
+static void VGAarbiterChangeGC(GCPtr pGC, unsigned long mask);
+static void VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
+static void VGAarbiterDestroyGC(GCPtr pGC);
+static void VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue,
+    int nrects);
+static void VGAarbiterDestroyClip(GCPtr pGC);
+static void VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
+
+/* GC ops */
+static void VGAarbiterFillSpans( DrawablePtr pDraw, GC *pGC, int nInit,
+    DDXPointPtr pptInit, int *pwidthInit, int fSorted);
+static void VGAarbiterSetSpans(DrawablePtr pDraw, GCPtr pGC, char *pcharsrc,
+    register DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
+static void VGAarbiterPutImage(DrawablePtr pDraw, GCPtr pGC, int depth,
+    int x, int y, int w, int h, int leftPad, int format, char *pImage);
+static RegionPtr VGAarbiterCopyArea(DrawablePtr pSrc, DrawablePtr pDst,
+    GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty);
+static RegionPtr VGAarbiterCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
+    GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty,
+    unsigned long bitPlane);
+static void VGAarbiterPolyPoint(DrawablePtr pDraw, GCPtr pGC, int mode,
+    int npt, xPoint *pptInit);
+static void VGAarbiterPolylines(DrawablePtr pDraw, GCPtr pGC, int mode,
+    int npt, DDXPointPtr pptInit);
+static void VGAarbiterPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg,
+    xSegment *pSeg);
+static void VGAarbiterPolyRectangle(DrawablePtr pDraw, GCPtr pGC,
+    int nRectsInit, xRectangle *pRectsInit);
+static void VGAarbiterPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs,
+    xArc *parcs);
+static void VGAarbiterFillPolygon(DrawablePtr pDraw, GCPtr pGC, int shape,
+    int mode, int count, DDXPointPtr ptsIn);
+static void VGAarbiterPolyFillRect( DrawablePtr pDraw, GCPtr pGC,
+    int nrectFill, xRectangle *prectInit);
+static void VGAarbiterPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs,
+    xArc *parcs);
+static int VGAarbiterPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+    int count, char *chars);
+static int VGAarbiterPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+    int count, unsigned short *chars);
+static void VGAarbiterImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+    int count, char *chars);
+static void VGAarbiterImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+    int count, unsigned short *chars);
+static void VGAarbiterImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,
+    int yInit, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase);
+static void VGAarbiterPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,
+    int yInit, unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase);
+static void VGAarbiterPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr
+    pDraw, int dx, int dy, int xOrg, int yOrg);
+
+/* miSpriteFuncs */
+static Bool VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr
+    pScreen, CursorPtr pCur);
+static Bool VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr
+    pScreen, CursorPtr pCur);
+static void VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+    CursorPtr pCur, int x, int y);
+static void VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
+    int x, int y);
+static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
+static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
+
+
+#ifdef RENDER
+static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
+    PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
+    INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
+static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+    PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist, GlyphListPtr
+    list, GlyphPtr *glyphs);
+static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor
+    *color, int nRect, xRectangle *rects);
+#endif
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 9cb66eb..5c3ee44 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -517,7 +517,7 @@ typedef struct _confdrirec {
 
 /* These values should be adjusted when new fields are added to ScrnInfoRec */
 #define NUM_RESERVED_INTS		16
-#define NUM_RESERVED_POINTERS		15
+#define NUM_RESERVED_POINTERS		14
 #define NUM_RESERVED_FUNCS		11
 
 typedef pointer (*funcPointer)(void);
@@ -808,6 +808,8 @@ typedef struct _ScrnInfoRec {
     int			reservedInt[NUM_RESERVED_INTS];
 
     int *		entityInstanceList;
+    struct pci_device   *vgaDev;
+
     pointer		reservedPtr[NUM_RESERVED_POINTERS];
 
     /*
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 3af9878..d32b284 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -69,6 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "mipointer.h"
 #include "xf86_OSproc.h"
 #include "inputstr.h"
+#include "xf86VGAarbiter.h"
 
 #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
 
@@ -333,6 +334,12 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 	return FALSE;
     }
 
+    if (!xf86VGAarbiterAllowDRI(pScreen)) {
+        DRIDrvMsg(pScreen->myNum, X_WARNING,
+                  "Direct rendering is not supported when VGA arb is necessary for the device\n");
+	return FALSE;
+    }
+		
     /*
      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
      * anyway.
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 8795cd1..d15ced1 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -39,6 +39,7 @@
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "dri2.h"
+#include "xf86VGAarbiter.h"
 
 #include "xf86.h"
 
@@ -414,6 +415,12 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
     if (info->version < 3)
 	return FALSE;
 
+    if (!xf86VGAarbiterAllowDRI(pScreen)) {
+        xf86DrvMsg(pScreen->myNum, X_WARNING,
+                  "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");
+        return FALSE;
+    }
+
     ds = xalloc(sizeof *ds);
     if (!ds)
 	return FALSE;
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 9d39e99..655e535 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -224,11 +224,13 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
 	default:
 	    goto error1;
 	}
+#if 0
 	pInt->BIOSseg = V_BIOS >> 4;
 	pInt->num = 0xe6;
 	LockLegacyVGA(pInt, &vga);
 	xf86ExecX86int10(pInt);
 	UnlockLegacyVGA(pInt, &vga);
+#endif
     }
 #else
     if (!sysMem) {
diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 8bda8d7..1186547 100755
--- a/hw/xfree86/loader/sdksyms.sh
+++ b/hw/xfree86/loader/sdksyms.sh
@@ -121,6 +121,7 @@ cat > sdksyms.c << EOF
 #include "xf86fbman.h"
 #include "xf86str.h"
 #include "xf86Xinput.h"
+#include "xf86VGAarbiter.h"
 #include "xisb.h"
 #if XV
 # include "xf86xv.h"
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index ffb35f8..603ae13 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -124,6 +124,9 @@
 /* Have pci_enable_device */
 #undef HAVE_PCI_DEVICE_ENABLE
 
+/* Define to 1 if you have the `pci_device_vgaarb_init' function. */
+#undef HAVE_PCI_DEVICE_VGAARB_INIT
+
 /* Path to text files containing PCI IDs */
 #undef PCI_TXT_IDS_PATH
 
-- 
1.5.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	25 Jul 2009 04:48:06 -0000	1.65
+++ .cvsignore	4 Aug 2009 06:10:29 -0000	1.66
@@ -1 +1 @@
-xorg-server-20090724.tar.bz2
+xorg-server-20090804.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- commitid	25 Jul 2009 04:48:06 -0000	1.28
+++ commitid	4 Aug 2009 06:10:29 -0000	1.29
@@ -1 +1 @@
-7c6b5458de9bc7f6cd972a36b56888aaa3d201ee
+736f2d64725c6df8413e627bd40ce7ecb011acc7

dri2-page-flip.patch:
 glx/glxcontext.h          |    4 +
 glx/glxdri2.c             |   47 ++++++++++++++----
 glx/glxext.c              |    3 +
 glx/glxserver.h           |   18 +++----
 hw/xfree86/dri2/dri2.c    |  118 ++++++++++++++++++++++++++++++++++++++++++++--
 hw/xfree86/dri2/dri2.h    |   12 +++-
 hw/xfree86/dri2/dri2ext.c |   26 +++++++++-
 7 files changed, 200 insertions(+), 28 deletions(-)

Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/dri2-page-flip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dri2-page-flip.patch	31 Jul 2009 17:56:40 -0000	1.1
+++ dri2-page-flip.patch	4 Aug 2009 06:10:29 -0000	1.2
@@ -1,4 +1,4 @@
-From fb33e4a3cb43ff4b2ca4bdd9170d84569d3e9de0 Mon Sep 17 00:00:00 2001
+From 20edb1d61db80f5fedb4d3eea60c67d438502238 Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
 Date: Wed, 29 Jul 2009 08:26:14 -0400
 Subject: [PATCH] DRI2 Page Flipping
@@ -172,7 +172,7 @@ index 46c9382..3e62782 100644
  extern __GLXclientState *glxGetClient(ClientPtr pClient);
  
 diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 8795cd1..8f5e0c3 100644
+index d15ced1..7b9fb23 100644
 --- a/hw/xfree86/dri2/dri2.c
 +++ b/hw/xfree86/dri2/dri2.c
 @@ -38,6 +38,7 @@
@@ -181,9 +181,9 @@ index 8795cd1..8f5e0c3 100644
  #include "windowstr.h"
 +#include "dixstruct.h"
  #include "dri2.h"
+ #include "xf86VGAarbiter.h"
  
- #include "xf86.h"
-@@ -55,7 +56,8 @@ typedef struct _DRI2Drawable {
+@@ -56,7 +57,8 @@ typedef struct _DRI2Drawable {
      int			 height;
      DRI2BufferPtr	*buffers;
      int			 bufferCount;
@@ -193,7 +193,7 @@ index 8795cd1..8f5e0c3 100644
  } DRI2DrawableRec, *DRI2DrawablePtr;
  
  typedef struct _DRI2Screen {
-@@ -67,6 +69,7 @@ typedef struct _DRI2Screen {
+@@ -68,6 +70,7 @@ typedef struct _DRI2Screen {
      DRI2CreateBufferProcPtr	 CreateBuffer;
      DRI2DestroyBufferProcPtr	 DestroyBuffer;
      DRI2CopyRegionProcPtr	 CopyRegion;
@@ -201,7 +201,7 @@ index 8795cd1..8f5e0c3 100644
  
      HandleExposuresProcPtr       HandleExposures;
  } DRI2ScreenRec, *DRI2ScreenPtr;
-@@ -118,6 +121,8 @@ DRI2CreateDrawable(DrawablePtr pDraw)
+@@ -119,6 +122,8 @@ DRI2CreateDrawable(DrawablePtr pDraw)
      pPriv->height = pDraw->height;
      pPriv->buffers = NULL;
      pPriv->bufferCount = 0;
@@ -210,7 +210,7 @@ index 8795cd1..8f5e0c3 100644
  
      if (pDraw->type == DRAWABLE_WINDOW)
      {
-@@ -337,6 +342,106 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
+@@ -338,6 +343,106 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
      return Success;
  }
  
@@ -317,7 +317,7 @@ index 8795cd1..8f5e0c3 100644
  void
  DRI2DestroyDrawable(DrawablePtr pDraw)
  {
-@@ -362,7 +467,11 @@ DRI2DestroyDrawable(DrawablePtr pDraw)
+@@ -363,7 +468,11 @@ DRI2DestroyDrawable(DrawablePtr pDraw)
  	xfree(pPriv->buffers);
      }
  
@@ -330,16 +330,16 @@ index 8795cd1..8f5e0c3 100644
  
      if (pDraw->type == DRAWABLE_WINDOW)
      {
-@@ -414,7 +523,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
-     if (info->version < 3)
- 	return FALSE;
+@@ -421,7 +530,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
+         return FALSE;
+     }
  
 -    ds = xalloc(sizeof *ds);
 +    ds = xcalloc(1, sizeof *ds);
      if (!ds)
  	return FALSE;
  
-@@ -426,6 +535,9 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
+@@ -433,6 +542,9 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
      ds->DestroyBuffer  = info->DestroyBuffer;
      ds->CopyRegion     = info->CopyRegion;
  
@@ -456,5 +456,5 @@ index 029dce8..9f5f389 100644
  	return BadRequest;
      }
 -- 
-1.6.3.3
+1.6.0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	25 Jul 2009 04:48:06 -0000	1.60
+++ sources	4 Aug 2009 06:10:29 -0000	1.61
@@ -1 +1 @@
-537084e15ae293b3dbb3a6c160fc17a1  xorg-server-20090724.tar.bz2
+7588aa54124e59be6989a9f70d935d0a  xorg-server-20090804.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -p -r1.458 -r1.459
--- xorg-x11-server.spec	3 Aug 2009 18:50:34 -0000	1.458
+++ xorg-x11-server.spec	4 Aug 2009 06:10:30 -0000	1.459
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090724
+%define gitdate 20090804
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   23.%{gitdate}%{?dist}
+Release:   24.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -48,6 +48,9 @@ Source30: find-provides
 
 Patch10: xserver-1.6.99-linkmap.patch
 
+# airlied to upstream for 1.7
+Patch100: xserver-1.6.99-vga-arb.patch
+
 # OpenGL compositing manager feature/optimization patches.
 Patch103:  xserver-1.5.0-bg-none-root.patch
 Patch104:  dri2-page-flip.patch
@@ -71,15 +74,13 @@ Patch6011: xserver-1.6.0-less-acpi-broke
 # Make autoconfiguration chose nouveau driver for NVIDIA GPUs
 Patch6016: xserver-1.6.1-nouveau.patch
 
-Patch6022: xserver-1.6.0-primary.patch
-Patch6023: xserver-1.6.99-use-pci-access-boot.patch
-
 # ajax needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
 Patch6028: xserver-1.6.99-randr-error-debugging.patch
 Patch6029: xserver-1.6.1-proc-cmdline.patch
 Patch6030: xserver-1.6.99-right-of.patch
 
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -526,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.6.99-24.20090804
+- update server snapshot + add VGA arbitration
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.6.99-23.20090724
 - Un-Requires xorg-x11-filesystem
 

xserver-1.5.0-bg-none-root.patch:
 dix/globals.c                |    1 +
 dix/window.c                 |   12 +++++++-----
 hw/xfree86/common/xf86Init.c |   11 +++++++++++
 hw/xfree86/common/xf86str.h  |    5 ++++-
 include/opaque.h             |    1 +
 os/utils.c                   |    4 +++-
 6 files changed, 27 insertions(+), 7 deletions(-)

Index: xserver-1.5.0-bg-none-root.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-bg-none-root.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xserver-1.5.0-bg-none-root.patch	19 Jun 2009 07:03:33 -0000	1.6
+++ xserver-1.5.0-bg-none-root.patch	4 Aug 2009 06:10:30 -0000	1.7
@@ -1,6 +1,6 @@
-From 3b9461737f1a0711a2c5a8916628386c359d9203 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
-Date: Thu, 18 Jun 2009 13:38:58 +1000
+From b4e4b980663692a3af5787eeaf2d48eb6c0188ed Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <airlied at redhat.com>
+Date: Tue, 4 Aug 2009 14:45:58 +1000
 Subject: [PATCH] Add nr for background=none root
 
 ---
@@ -25,7 +25,7 @@ index c24a94f..907a5e8 100644
  int cursorScreenDevPriv[MAXSCREENS];
  
 diff --git a/dix/window.c b/dix/window.c
-index 99b594b..aefc282 100644
+index 32e26d9..0bf1d52 100644
 --- a/dix/window.c
 +++ b/dix/window.c
 @@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
@@ -59,7 +59,7 @@ index 99b594b..aefc282 100644
      MapWindow(pWin, serverClient);
  }
 diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index c4e5898..97bf48a 100644
+index e84da4e..2a0f47a 100644
 --- a/hw/xfree86/common/xf86Init.c
 +++ b/hw/xfree86/common/xf86Init.c
 @@ -77,6 +77,7 @@
@@ -68,9 +68,9 @@ index c4e5898..97bf48a 100644
  #endif
 +#include "xace.h"
  
+ #include "xf86VGAarbiter.h"
  #include "globals.h"
- 
-@@ -312,6 +313,7 @@ xf86CreateRootWindow(WindowPtr pWin)
+@@ -234,6 +235,7 @@ xf86CreateRootWindow(WindowPtr pWin)
    int ret = TRUE;
    int err = Success;
    ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -78,7 +78,7 @@ index c4e5898..97bf48a 100644
    RootWinPropPtr pProp;
    CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
        dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-@@ -363,6 +365,15 @@ xf86CreateRootWindow(WindowPtr pWin)
+@@ -285,6 +287,15 @@ xf86CreateRootWindow(WindowPtr pWin)
      }
    }
  
@@ -95,7 +95,7 @@ index c4e5898..97bf48a 100644
    return (ret);
  }
 diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 3b1346f..b82f168 100644
+index 5c3ee44..e3c7841 100644
 --- a/hw/xfree86/common/xf86str.h
 +++ b/hw/xfree86/common/xf86str.h
 @@ -516,7 +516,7 @@ typedef struct _confdrirec {
@@ -104,10 +104,10 @@ index 3b1346f..b82f168 100644
  /* These values should be adjusted when new fields are added to ScrnInfoRec */
 -#define NUM_RESERVED_INTS		16
 +#define NUM_RESERVED_INTS		15
- #define NUM_RESERVED_POINTERS		15
+ #define NUM_RESERVED_POINTERS		14
  #define NUM_RESERVED_FUNCS		11
  
-@@ -944,6 +944,9 @@ typedef struct _ScrnInfoRec {
+@@ -800,6 +800,9 @@ typedef struct _ScrnInfoRec {
      ClockRangesPtr	clockRanges;
      int			adjustFlags;
  
@@ -151,5 +151,5 @@ index 00abd63..7bfdf8b 100644
               if(++i < argc) {
                   long reqSizeArg = atol(argv[i]);
 -- 
-1.6.3.rc1.2.g0164.dirty
+1.6.0.6
 


--- xserver-1.6.0-primary.patch DELETED ---


--- xserver-1.6.99-use-pci-access-boot.patch DELETED ---



From alexlan at fedoraproject.org  Tue Aug  4 06:10:46 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue,  4 Aug 2009 06:10:46 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.59,1.60
Message-ID: <20090804061046.44D1C11C00CE@cvs1.fedora.phx.redhat.com>

Author: alexlan

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

Modified Files:
	Miro.spec 
Log Message:
Add new icons.



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- Miro.spec	4 Aug 2009 05:55:03 -0000	1.59
+++ Miro.spec	4 Aug 2009 06:10:45 -0000	1.60
@@ -81,6 +81,7 @@ update-desktop-database %{_datadir}/appl
 %{_libexecdir}/xine_extractor
 %exclude %{_datadir}/miro/resources/testdata
 %{_datadir}/miro
+%{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
 %{_mandir}/man1/*
@@ -97,6 +98,7 @@ update-desktop-database %{_datadir}/appl
 - Update to latest upstream (2.5.2)
 - Drop xine hack patch, now upstream
 - Rebase remaining patches to 2.5.2 where necessary
+- Include new icons in files list
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pnemade at fedoraproject.org  Tue Aug  4 06:22:11 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue,  4 Aug 2009 06:22:11 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.26, 1.27 iso-codes.spec, 1.35,
	1.36 sources, 1.27, 1.28
Message-ID: <20090804062211.726C111C00CE@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12901

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Tue Aug 04 2009 Parag Nemade <pnemade at redhat.com> - 3.10.1-1
- Update to 3.10.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	2 Jun 2009 10:44:20 -0000	1.26
+++ .cvsignore	4 Aug 2009 06:22:09 -0000	1.27
@@ -1 +1 @@
-iso-codes-3.10.tar.bz2
+iso-codes-3.10.1.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- iso-codes.spec	25 Jul 2009 03:39:33 -0000	1.35
+++ iso-codes.spec	4 Aug 2009 06:22:09 -0000	1.36
@@ -1,8 +1,8 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.10
-Release:	3%{?dist}
+Version:	3.10.1
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
 URL:	http://alioth.debian.org/projects/pkg-isocodes/
@@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Tue Aug 04 2009 Parag Nemade <pnemade at redhat.com> - 3.10.1-1
+- Update to 3.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	2 Jun 2009 10:44:20 -0000	1.27
+++ sources	4 Aug 2009 06:22:09 -0000	1.28
@@ -1 +1 @@
-5d541223730b7bba0020983cb6cc95be  iso-codes-3.10.tar.bz2
+1db1466d1ea63fe5fc349b7ba8b189fb  iso-codes-3.10.1.tar.bz2



From mnagy at fedoraproject.org  Tue Aug  4 06:23:02 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Tue,  4 Aug 2009 06:23:02 +0000 (UTC)
Subject: rpms/vsftpd/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 vsftpd-2.1.0-configuration.patch, 1.1,
	1.2 vsftpd-2.1.0-pam_hostname.patch, 1.1,
	1.2 vsftpd-2.1.0-trim.patch, 1.1, 1.2 vsftpd.spec, 1.93, 1.94
Message-ID: <20090804062302.3CCE111C00CE@cvs1.fedora.phx.redhat.com>

Author: mnagy

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

Modified Files:
	.cvsignore sources vsftpd-2.1.0-configuration.patch 
	vsftpd-2.1.0-pam_hostname.patch vsftpd-2.1.0-trim.patch 
	vsftpd.spec 
Log Message:
* Tue Aug 04 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-0.1.pre4
- update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	2 Jun 2009 09:06:55 -0000	1.19
+++ .cvsignore	4 Aug 2009 06:23:01 -0000	1.20
@@ -1 +1 @@
-vsftpd-2.1.2.tar.gz
+vsftpd-2.2.0pre4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	2 Jun 2009 09:06:55 -0000	1.19
+++ sources	4 Aug 2009 06:23:01 -0000	1.20
@@ -1 +1 @@
-6a8c8579d50adf0d0fc07226c03bfb52  vsftpd-2.1.2.tar.gz
+d628511be9092be8d167830d5c1d6889  vsftpd-2.2.0pre4.tar.gz

vsftpd-2.1.0-configuration.patch:
 EXAMPLE/INTERNET_SITE/README         |    6 +++---
 EXAMPLE/INTERNET_SITE_NOINETD/README |    4 ++--
 EXAMPLE/PER_IP_CONFIG/README         |    4 ++--
 EXAMPLE/VIRTUAL_USERS/README         |   14 +++++++-------
 FAQ                                  |    8 ++++----
 INSTALL                              |   10 +++++-----
 README                               |    5 +++++
 defs.h                               |    2 +-
 tunables.c                           |   10 +++++-----
 vsftpd.8                             |   10 +++++-----
 vsftpd.conf                          |   10 +++++++---
 vsftpd.conf.5                        |   22 +++++++++++-----------
 12 files changed, 57 insertions(+), 48 deletions(-)

Index: vsftpd-2.1.0-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vsftpd-2.1.0-configuration.patch	16 Jan 2009 17:23:12 -0000	1.1
+++ vsftpd-2.1.0-configuration.patch	4 Aug 2009 06:23:01 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up vsftpd-2.1.0/defs.h.configuration vsftpd-2.1.0/defs.h
---- vsftpd-2.1.0/defs.h.configuration	2009-01-08 18:01:13.000000000 +0100
-+++ vsftpd-2.1.0/defs.h	2009-01-08 18:01:23.000000000 +0100
+diff -up vsftpd-2.2.0/defs.h.configuration vsftpd-2.2.0/defs.h
+--- vsftpd-2.2.0/defs.h.configuration	2009-01-07 21:22:22.000000000 +0100
++++ vsftpd-2.2.0/defs.h	2009-08-04 07:37:01.000000000 +0200
 @@ -1,7 +1,7 @@
  #ifndef VSF_DEFS_H
  #define VSF_DEFS_H
@@ -10,9 +10,9 @@ diff -up vsftpd-2.1.0/defs.h.configurati
  
  #define VSFTP_COMMAND_FD        0
  
-diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README
---- vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration	2009-01-08 18:17:07.000000000 +0100
-+++ vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README	2009-01-08 18:15:07.000000000 +0100
+diff -up vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README
+--- vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration	2008-02-02 02:30:40.000000000 +0100
++++ vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README	2009-08-04 07:37:01.000000000 +0200
 @@ -17,7 +17,7 @@ even per-connect-IP configurability.
  
  To use this example config:
@@ -29,9 +29,9 @@ diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_S
 -vsftpd /etc/vsftpd.conf.site1 &
 +vsftpd /etc/vsftpd/vsftpd.conf.site1 &
  
-diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README.configuration vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README
---- vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README.configuration	2009-01-08 18:15:29.000000000 +0100
-+++ vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README	2009-01-08 18:16:13.000000000 +0100
+diff -up vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README.configuration vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README
+--- vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README.configuration	2008-02-02 02:30:40.000000000 +0100
++++ vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README	2009-08-04 07:37:01.000000000 +0200
 @@ -41,13 +41,13 @@ no_access               = 192.168.1.3
  As an example of how to ban certain sites from connecting, 192.168.1.3 will
  be denied access.
@@ -57,9 +57,9 @@ diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_S
  
  Let's example the contents of the file:
  
-diff -up vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README.configuration vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README
---- vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README.configuration	2009-01-08 18:19:14.000000000 +0100
-+++ vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README	2009-01-08 18:19:35.000000000 +0100
+diff -up vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README.configuration vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README
+--- vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README.configuration	2008-02-02 02:30:40.000000000 +0100
++++ vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README	2009-08-04 07:37:01.000000000 +0200
 @@ -20,12 +20,12 @@ directory: hosts.allow. It lives at /etc
  
  Let's have a look at the example:
@@ -75,9 +75,9 @@ diff -up vsftpd-2.1.0/EXAMPLE/PER_IP_CON
  applied ON TOP of the default vsftpd.conf.
  This is obviously very powerful. You might use this to apply different
  access restrictions for some IPs (e.g. the ability to upload).
-diff -up vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README.configuration vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README
---- vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README.configuration	2009-01-08 18:18:04.000000000 +0100
-+++ vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README	2009-01-08 18:18:53.000000000 +0100
+diff -up vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README.configuration vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README
+--- vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README.configuration	2008-02-02 02:30:40.000000000 +0100
++++ vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README	2009-08-04 07:37:01.000000000 +0200
 @@ -15,7 +15,7 @@ See example file "logins.txt" - this spe
  "fred" with password "bar".
  Whilst logged in as root, create the actual database file like this:
@@ -123,9 +123,9 @@ diff -up vsftpd-2.1.0/EXAMPLE/VIRTUAL_US
  
  
  Step 5) Start up vsftpd.
-diff -up vsftpd-2.1.0/FAQ.configuration vsftpd-2.1.0/FAQ
---- vsftpd-2.1.0/FAQ.configuration	2009-01-08 17:58:39.000000000 +0100
-+++ vsftpd-2.1.0/FAQ	2009-01-08 18:01:04.000000000 +0100
+diff -up vsftpd-2.2.0/FAQ.configuration vsftpd-2.2.0/FAQ
+--- vsftpd-2.2.0/FAQ.configuration	2009-02-18 23:33:04.000000000 +0100
++++ vsftpd-2.2.0/FAQ	2009-08-04 07:37:01.000000000 +0200
 @@ -34,7 +34,7 @@ needs this user to run bits of itself wi
  Q) Help! Local users cannot log in.
  A) There are various possible problems.
@@ -159,9 +159,9 @@ diff -up vsftpd-2.1.0/FAQ.configuration 
  has the effect of mapping every non-anonymous successful login to the local
  username specified in "guest_username". Then, use PAM and (e.g.) its pam_userdb
  module to provide authentication against an external (i.e. non-/etc/passwd)
-diff -up vsftpd-2.1.0/INSTALL.configuration vsftpd-2.1.0/INSTALL
---- vsftpd-2.1.0/INSTALL.configuration	2009-01-08 18:01:36.000000000 +0100
-+++ vsftpd-2.1.0/INSTALL	2009-01-08 18:03:30.000000000 +0100
+diff -up vsftpd-2.2.0/INSTALL.configuration vsftpd-2.2.0/INSTALL
+--- vsftpd-2.2.0/INSTALL.configuration	2008-02-02 02:30:39.000000000 +0100
++++ vsftpd-2.2.0/INSTALL	2009-08-04 07:37:01.000000000 +0200
 @@ -56,14 +56,14 @@ cp vsftpd.8 /usr/local/man/man8
  
  "make install" doesn't copy the sample config file. It is recommended you
@@ -194,9 +194,9 @@ diff -up vsftpd-2.1.0/INSTALL.configurat
  
  The default configuration allows neither local user logins nor anonymous
  uploads. You may wish to change these defaults.
-diff -up vsftpd-2.1.0/README.configuration vsftpd-2.1.0/README
---- vsftpd-2.1.0/README.configuration	2009-01-08 18:13:37.000000000 +0100
-+++ vsftpd-2.1.0/README	2009-01-08 18:14:21.000000000 +0100
+diff -up vsftpd-2.2.0/README.configuration vsftpd-2.2.0/README
+--- vsftpd-2.2.0/README.configuration	2009-07-07 22:23:22.000000000 +0200
++++ vsftpd-2.2.0/README	2009-08-04 07:37:01.000000000 +0200
 @@ -37,3 +37,8 @@ All configuration options are documented
  Various example configurations are discussed in the EXAMPLE directory.
  Frequently asked questions are tackled in the FAQ file.
@@ -206,10 +206,10 @@ diff -up vsftpd-2.1.0/README.configurati
 +The location of configuration files was changed to /etc/vsftpd/. If you want
 +to migrate your old conf files from /etc (files vsftpd.xxxx.rpmsave) use
 +/etc/vsfptd/vsftpd_conf_migrate.sh
-diff -up vsftpd-2.1.0/tunables.c.configuration vsftpd-2.1.0/tunables.c
---- vsftpd-2.1.0/tunables.c.configuration	2009-01-08 18:20:05.000000000 +0100
-+++ vsftpd-2.1.0/tunables.c	2009-01-08 18:22:13.000000000 +0100
-@@ -184,7 +184,7 @@ tunables_load_defaults()
+diff -up vsftpd-2.2.0/tunables.c.configuration vsftpd-2.2.0/tunables.c
+--- vsftpd-2.2.0/tunables.c.configuration	2009-07-15 22:08:27.000000000 +0200
++++ vsftpd-2.2.0/tunables.c	2009-08-04 07:37:01.000000000 +0200
+@@ -186,7 +186,7 @@ tunables_load_defaults()
    tunable_listen_ipv6 = 0;
    tunable_dual_log_enable = 0;
    tunable_syslog_enable = 0;
@@ -218,7 +218,7 @@ diff -up vsftpd-2.1.0/tunables.c.configu
    tunable_virtual_use_local_privs = 0;
    tunable_session_support = 0;
    tunable_download_enable = 1;
-@@ -250,11 +250,11 @@ tunables_load_defaults()
+@@ -254,11 +254,11 @@ tunables_load_defaults()
    install_str_setting(".message", &tunable_message_file);
    install_str_setting("nobody", &tunable_nopriv_user);
    install_str_setting(0, &tunable_ftpd_banner);
@@ -233,7 +233,7 @@ diff -up vsftpd-2.1.0/tunables.c.configu
    install_str_setting(0, &tunable_anon_root);
    install_str_setting(0, &tunable_local_root);
    install_str_setting(0, &tunable_banner_file);
-@@ -267,7 +267,7 @@ tunables_load_defaults()
+@@ -271,7 +271,7 @@ tunables_load_defaults()
    install_str_setting(0, &tunable_hide_file);
    install_str_setting(0, &tunable_deny_file);
    install_str_setting(0, &tunable_user_sub_token);
@@ -242,9 +242,9 @@ diff -up vsftpd-2.1.0/tunables.c.configu
                        &tunable_email_password_file);
    install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
                        &tunable_rsa_cert_file);
-diff -up vsftpd-2.1.0/vsftpd.8.configuration vsftpd-2.1.0/vsftpd.8
---- vsftpd-2.1.0/vsftpd.8.configuration	2009-01-08 18:03:47.000000000 +0100
-+++ vsftpd-2.1.0/vsftpd.8	2009-01-08 18:04:02.000000000 +0100
+diff -up vsftpd-2.2.0/vsftpd.8.configuration vsftpd-2.2.0/vsftpd.8
+--- vsftpd-2.2.0/vsftpd.8.configuration	2009-07-17 22:56:23.000000000 +0200
++++ vsftpd-2.2.0/vsftpd.8	2009-08-04 07:40:27.000000000 +0200
 @@ -21,7 +21,7 @@ itself will listen on the network. This 
  recommended. It is activated by setting
  .Pa listen=YES
@@ -254,17 +254,36 @@ diff -up vsftpd-2.1.0/vsftpd.8.configura
  Direct execution of the
  .Nm vsftpd
  binary will then launch the FTP service ready for immediate client connections.
-@@ -30,6 +30,6 @@ An optional
- .Op configuration file
- may be given on the command line. This file must be owned as root if running as
- root. The default configuration file is
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
+@@ -33,7 +33,7 @@ as root. Any command line option not sta
+ as a config file that will be loaded. Note that config files are loaded in the
+ strict order that they are encountered on the command line.
+ If no config files are specified, the default configuration file of
+-.Pa /etc/vsftpd.conf
++.Pa /etc/vsftpd/vsftpd.conf
+ will be loaded, after all other command line options are processed.
+ .Pp
+ Supported options are:
+@@ -47,14 +47,14 @@ their appearance on the command line, in
+ config files.
+ .El
+ .Sh EXAMPLES
+-vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah
++vsftpd -olisten=NO /etc/vsftpd/vsftpd.conf -oftpd_banner=blah
+ .Pp
+ That example overrides vsftpd's built-in default for the "listen" option to be
+-NO, but then loads /etc/vsftpd.conf which may override that setting. Finally,
++NO, but then loads /etc/vsftpd/vsftpd.conf which may override that setting. Finally,
+ the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd
+ setting and any identical setting that was in the config file.
+ .Sh FILES
+-.Pa /etc/vsftpd.conf
++.Pa /etc/vsftpd/vsftpd.conf
  .Sh SEE ALSO
  .Xr vsftpd.conf 5
-diff -up vsftpd-2.1.0/vsftpd.conf.5.configuration vsftpd-2.1.0/vsftpd.conf.5
---- vsftpd-2.1.0/vsftpd.conf.5.configuration	2009-01-08 18:04:53.000000000 +0100
-+++ vsftpd-2.1.0/vsftpd.conf.5	2009-01-08 18:29:33.000000000 +0100
+ .end
+diff -up vsftpd-2.2.0/vsftpd.conf.5.configuration vsftpd-2.2.0/vsftpd.conf.5
+--- vsftpd-2.2.0/vsftpd.conf.5.configuration	2009-07-17 22:57:04.000000000 +0200
++++ vsftpd-2.2.0/vsftpd.conf.5	2009-08-04 07:37:01.000000000 +0200
 @@ -4,7 +4,7 @@ vsftpd.conf \- config file for vsftpd
  .SH DESCRIPTION
  vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
@@ -301,7 +320,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  .BR banned_email_file
  setting.
  
-@@ -430,7 +430,7 @@ anonymous logins are prevented unless th
+@@ -433,7 +433,7 @@ anonymous logins are prevented unless th
  file specified by the
  .BR email_password_file
  setting. The file format is one password per line, no extra whitespace. The
@@ -310,7 +329,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  
  Default: NO
  .TP
-@@ -761,7 +761,7 @@ passwords which are not permitted. This 
+@@ -764,7 +764,7 @@ passwords which are not permitted. This 
  .BR deny_email_enable
  is enabled.
  
@@ -319,7 +338,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  .TP
  .B banner_file
  This option is the name of a file containing text to display when someone
-@@ -798,7 +798,7 @@ is enabled. If the option
+@@ -801,7 +801,7 @@ is enabled. If the option
  is enabled, then the list file becomes a list of users to NOT place in a
  chroot() jail.
  
@@ -328,7 +347,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  .TP
  .B cmds_allowed
  This options specifies a comma separated list of allowed FTP commands (post
-@@ -859,7 +859,7 @@ This option can be used to provide an al
+@@ -862,7 +862,7 @@ This option can be used to provide an al
  .BR secure_email_list_enable
  setting.
  
@@ -337,7 +356,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  .TP
  .B ftp_username
  This is the name of the user we use for handling anonymous FTP. The home
-@@ -982,10 +982,10 @@ the manual page, on a per-user basis. Us
+@@ -985,10 +985,10 @@ the manual page, on a per-user basis. Us
  with an example. If you set
  .BR user_config_dir
  to be
@@ -350,7 +369,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  for the duration of the session. The format of this file is as detailed in
  this manual page! PLEASE NOTE that not all settings are effective on a
  per-user basis. For example, many settings only prior to the user's session
-@@ -1021,7 +1021,7 @@ This option is the name of the file load
+@@ -1024,7 +1024,7 @@ This option is the name of the file load
  .BR userlist_enable
  option is active.
  
@@ -359,16 +378,16 @@ diff -up vsftpd-2.1.0/vsftpd.conf.5.conf
  .TP
  .B vsftpd_log_file
  This option is the name of the file to which we write the vsftpd style
-diff -up vsftpd-2.1.0/vsftpd.conf.configuration vsftpd-2.1.0/vsftpd.conf
---- vsftpd-2.1.0/vsftpd.conf.configuration	2009-01-08 17:54:33.000000000 +0100
-+++ vsftpd-2.1.0/vsftpd.conf	2009-01-08 18:20:55.000000000 +0100
+diff -up vsftpd-2.2.0/vsftpd.conf.configuration vsftpd-2.2.0/vsftpd.conf
+--- vsftpd-2.2.0/vsftpd.conf.configuration	2009-06-17 22:05:28.000000000 +0200
++++ vsftpd-2.2.0/vsftpd.conf	2009-08-04 07:53:13.000000000 +0200
 @@ -1,4 +1,4 @@
 -# Example config file /etc/vsftpd.conf
 +# Example config file /etc/vsftpd/vsftpd.conf
  #
  # The default compiled in settings are fairly paranoid. This sample file
  # loosens things up a bit, to make the ftp daemon more usable.
-@@ -87,14 +87,14 @@ connect_from_port_20=YES
+@@ -87,7 +87,7 @@ connect_from_port_20=YES
  # useful for combatting certain DoS attacks.
  #deny_email_enable=YES
  # (default follows)
@@ -377,7 +396,8 @@ diff -up vsftpd-2.1.0/vsftpd.conf.config
  #
  # You may specify an explicit list of local users to chroot() to their home
  # directory. If chroot_local_user is YES, then this list becomes a list of
- # users to NOT chroot().
+@@ -95,7 +95,7 @@ connect_from_port_20=YES
+ #chroot_local_user=YES
  #chroot_list_enable=YES
  # (default follows)
 -#chroot_list_file=/etc/vsftpd.chroot_list
@@ -385,7 +405,7 @@ diff -up vsftpd-2.1.0/vsftpd.conf.config
  #
  # You may activate the "-R" option to the builtin ls. This is disabled by
  # default to avoid remote users being able to cause excessive I/O on large
-@@ -111,3 +111,7 @@ listen=YES
+@@ -112,3 +112,7 @@ listen=YES
  # sockets, you must run two copies of vsftpd whith two configuration files.
  # Make sure, that one of the listen options is commented !!
  #listen_ipv6=YES

vsftpd-2.1.0-pam_hostname.patch:
 sysdeputil.c |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Index: vsftpd-2.1.0-pam_hostname.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-pam_hostname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vsftpd-2.1.0-pam_hostname.patch	16 Jan 2009 17:23:12 -0000	1.1
+++ vsftpd-2.1.0-pam_hostname.patch	4 Aug 2009 06:23:01 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up vsftpd-2.1.0/sysdeputil.c.pam_hostname vsftpd-2.1.0/sysdeputil.c
---- vsftpd-2.1.0/sysdeputil.c.pam_hostname	2008-12-17 22:40:56.000000000 +0100
-+++ vsftpd-2.1.0/sysdeputil.c	2009-01-15 15:38:14.000000000 +0100
+diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
+--- vsftpd-2.2.0/sysdeputil.c.pam_hostname	2009-07-14 06:03:31.000000000 +0200
++++ vsftpd-2.2.0/sysdeputil.c	2009-08-04 08:00:00.000000000 +0200
 @@ -16,6 +16,10 @@
  #include "tunables.h"
  #include "builddefs.h"
@@ -12,7 +12,7 @@ diff -up vsftpd-2.1.0/sysdeputil.c.pam_h
  /* For Linux, this adds nothing :-) */
  #include "port/porting_junk.h"
  
-@@ -296,6 +300,10 @@ vsf_sysdep_check_auth(const struct mystr
+@@ -316,6 +320,10 @@ vsf_sysdep_check_auth(struct mystr* p_us
                        const struct mystr* p_remote_host)
  {
    int retval;
@@ -20,10 +20,10 @@ diff -up vsftpd-2.1.0/sysdeputil.c.pam_h
 +  struct sockaddr_in sin;
 +  struct hostent *host;
 +#endif
+   const char* pam_user_name = 0;
    struct pam_conv the_conv =
    {
-     &pam_conv_func,
-@@ -314,7 +322,12 @@ vsf_sysdep_check_auth(const struct mystr
+@@ -335,7 +343,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
      return 0;
    }
  #ifdef PAM_RHOST
@@ -37,7 +37,7 @@ diff -up vsftpd-2.1.0/sysdeputil.c.pam_h
    if (retval != PAM_SUCCESS)
    {
      (void) pam_end(s_pamh, retval);
-@@ -516,7 +529,7 @@ vsf_sysdep_has_capabilities(void)
+@@ -547,7 +560,7 @@ vsf_sysdep_has_capabilities(void)
    }
    return s_runtime_has_caps;
  }
@@ -46,7 +46,7 @@ diff -up vsftpd-2.1.0/sysdeputil.c.pam_h
    #ifndef VSF_SYSDEP_HAVE_LIBCAP
  static int
  do_checkcap(void)
-@@ -1038,7 +1051,7 @@ vsf_sysutil_recv_fd(const int sock_fd)
+@@ -1069,7 +1082,7 @@ vsf_sysutil_recv_fd(const int sock_fd)
    msg.msg_flags = 0;
    /* In case something goes wrong, set the fd to -1 before the syscall */
    p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg));

vsftpd-2.1.0-trim.patch:
 parseconf.c |    2 +-
 str.c       |   12 ++++++++++++
 str.h       |    1 +
 sysutil.c   |   12 ++++++++++++
 sysutil.h   |    1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

Index: vsftpd-2.1.0-trim.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-trim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vsftpd-2.1.0-trim.patch	4 May 2009 14:09:07 -0000	1.1
+++ vsftpd-2.1.0-trim.patch	4 Aug 2009 06:23:01 -0000	1.2
@@ -1,18 +1,18 @@
-diff -up vsftpd-2.1.0/parseconf.c.trim vsftpd-2.1.0/parseconf.c
---- vsftpd-2.1.0/parseconf.c.trim	2009-03-24 15:50:47.000000000 +0100
-+++ vsftpd-2.1.0/parseconf.c	2009-03-24 15:51:10.000000000 +0100
-@@ -273,7 +273,7 @@ handle_config_setting(struct mystr* p_se
+diff -up vsftpd-2.2.0/parseconf.c.trim vsftpd-2.2.0/parseconf.c
+--- vsftpd-2.2.0/parseconf.c.trim	2009-08-04 08:01:10.000000000 +0200
++++ vsftpd-2.2.0/parseconf.c	2009-08-04 08:10:49.000000000 +0200
+@@ -275,7 +275,7 @@ vsf_parseconf_load_setting(const char* p
          }
          else
          {
--          *p_curr_setting = str_strdup(p_value_str);
-+          *p_curr_setting = str_strdup_trimmed(p_value_str);
+-          *p_curr_setting = str_strdup(&s_value_str);
++          *p_curr_setting = str_strdup_trimmed(&s_value_str);
          }
          return;
        }
-diff -up vsftpd-2.1.0/str.c.trim vsftpd-2.1.0/str.c
---- vsftpd-2.1.0/str.c.trim	2009-03-24 15:50:34.000000000 +0100
-+++ vsftpd-2.1.0/str.c	2009-03-24 15:54:07.000000000 +0100
+diff -up vsftpd-2.2.0/str.c.trim vsftpd-2.2.0/str.c
+--- vsftpd-2.2.0/str.c.trim	2009-08-04 08:01:10.000000000 +0200
++++ vsftpd-2.2.0/str.c	2009-08-04 08:01:10.000000000 +0200
 @@ -89,6 +89,18 @@ str_strdup(const struct mystr* p_str)
    return vsf_sysutil_strdup(str_getbuf(p_str));
  }
@@ -32,9 +32,9 @@ diff -up vsftpd-2.1.0/str.c.trim vsftpd-
  void
  str_alloc_alt_term(struct mystr* p_str, const char* p_src, char term)
  {
-diff -up vsftpd-2.1.0/str.h.trim vsftpd-2.1.0/str.h
---- vsftpd-2.1.0/str.h.trim	2009-03-24 15:50:31.000000000 +0100
-+++ vsftpd-2.1.0/str.h	2009-03-24 15:51:48.000000000 +0100
+diff -up vsftpd-2.2.0/str.h.trim vsftpd-2.2.0/str.h
+--- vsftpd-2.2.0/str.h.trim	2009-08-04 08:01:10.000000000 +0200
++++ vsftpd-2.2.0/str.h	2009-08-04 08:01:10.000000000 +0200
 @@ -31,6 +31,7 @@ void str_alloc_ulong(struct mystr* p_str
  void str_alloc_filesize_t(struct mystr* p_str, filesize_t the_filesize);
  void str_copy(struct mystr* p_dest, const struct mystr* p_src);
@@ -43,10 +43,10 @@ diff -up vsftpd-2.1.0/str.h.trim vsftpd-
  void str_empty(struct mystr* p_str);
  void str_free(struct mystr* p_str);
  void str_trunc(struct mystr* p_str, unsigned int trunc_len);
-diff -up vsftpd-2.1.0/sysutil.c.trim vsftpd-2.1.0/sysutil.c
---- vsftpd-2.1.0/sysutil.c.trim	2009-03-24 15:50:19.000000000 +0100
-+++ vsftpd-2.1.0/sysutil.c	2009-03-24 15:52:53.000000000 +0100
-@@ -1031,6 +1031,18 @@ vsf_sysutil_strdup(const char* p_str)
+diff -up vsftpd-2.2.0/sysutil.c.trim vsftpd-2.2.0/sysutil.c
+--- vsftpd-2.2.0/sysutil.c.trim	2009-07-16 05:32:21.000000000 +0200
++++ vsftpd-2.2.0/sysutil.c	2009-08-04 08:01:10.000000000 +0200
+@@ -1032,6 +1032,18 @@ vsf_sysutil_strdup(const char* p_str)
    return strdup(p_str);
  }
  
@@ -65,10 +65,10 @@ diff -up vsftpd-2.1.0/sysutil.c.trim vsf
  void
  vsf_sysutil_memclr(void* p_dest, unsigned int size)
  {
-diff -up vsftpd-2.1.0/sysutil.h.trim vsftpd-2.1.0/sysutil.h
---- vsftpd-2.1.0/sysutil.h.trim	2009-03-24 15:50:23.000000000 +0100
-+++ vsftpd-2.1.0/sysutil.h	2009-03-24 15:52:14.000000000 +0100
-@@ -184,6 +184,7 @@ int vsf_sysutil_wait_get_exitcode(
+diff -up vsftpd-2.2.0/sysutil.h.trim vsftpd-2.2.0/sysutil.h
+--- vsftpd-2.2.0/sysutil.h.trim	2009-07-16 05:31:53.000000000 +0200
++++ vsftpd-2.2.0/sysutil.h	2009-08-04 08:01:10.000000000 +0200
+@@ -186,6 +186,7 @@ int vsf_sysutil_wait_get_exitcode(
  /* Various string functions */
  unsigned int vsf_sysutil_strlen(const char* p_text);
  char* vsf_sysutil_strdup(const char* p_str);


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- vsftpd.spec	27 Jul 2009 06:59:10 -0000	1.93
+++ vsftpd.spec	4 Aug 2009 06:23:01 -0000	1.94
@@ -1,15 +1,15 @@
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
 Name: vsftpd
-Version: 2.1.2
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 0.1.pre4%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
 # OpenSSL link exception
 License: GPLv2 with exceptions
 URL: http://vsftpd.beasts.org/
-Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
+Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}pre4.tar.gz
 Source1: vsftpd.xinetd
 Source2: vsftpd.pam
 Source3: vsftpd.ftpusers
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Tue Aug 04 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-0.1.pre4
+- update to latest upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 06:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 06:43:27 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804064327.813D810F88F@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on horde (Fedora EPEL 5) to Approved for tibbs

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



From pkgdb at fedoraproject.org  Tue Aug  4 06:43:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 06:43:34 +0000
Subject: [pkgdb] horde had acl change status
Message-ID: <20090804064335.04CFD10F8A2@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on horde (Fedora 9) to Approved for tibbs

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



From bskeggs at fedoraproject.org  Tue Aug  4 06:46:49 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  4 Aug 2009 06:46:49 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.41, 1.42 kernel.spec, 1.1687,
	1.1688
Message-ID: <20090804064649.E961611C00CE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: more code share between nv50/<nv50 kms, bug fixes



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   30 
 drivers/gpu/drm/Makefile                    |    1 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5056 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  227 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  557 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  622 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  595 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   52 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   88 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  143 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  144 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  363 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1131 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   49 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   43 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     | 1027 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_fifo.c      |  683 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  751 
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1018 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  431 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  246 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  567 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  192 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  825 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  116 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1143 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_display.c      |  250 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  291 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  146 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  586 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  192 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_output.c       |  797 +
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv20_graph.c        |  958 +
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  222 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  811 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  153 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  284 
 drivers/gpu/drm/nouveau/nv50_display.c      |  849 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  264 
 drivers/gpu/drm/nouveau/nvreg.h             |  503 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/nouveau_drm.h                   |  214 
 75 files changed, 54253 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.41 -r 1.42 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- drm-nouveau.patch	31 Jul 2009 01:15:45 -0000	1.41
+++ drm-nouveau.patch	4 Aug 2009 06:46:46 -0000	1.42
@@ -105,7 +105,7 @@ index 6246e3f..436e2fe 100644
  		if (map->type == _DRM_REGISTERS)
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..67a9582
+index 0000000..a04127f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,27 @@
@@ -119,7 +119,7 @@ index 0000000..67a9582
 +             nouveau_sgdma.o nouveau_dma.o \
 +             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_fbcon.o \
++	     nouveau_display.o nouveau_connector.o nouveau_fbcon.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -127,7 +127,7 @@ index 0000000..67a9582
 +             nv04_graph.o nv10_graph.o nv20_graph.o \
 +             nv40_graph.o nv50_graph.o \
 +             nv04_instmem.o nv50_instmem.o \
-+             nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
++             nv50_crtc.o nv50_dac.o nv50_sor.o \
 +             nv50_cursor.o nv50_display.o nv50_fbcon.o \
 +             nv04_display.o nv04_output.o nv04_crtc.o nv04_cursor.o \
 +             nv04_fbcon.o
@@ -299,10 +299,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..668008b
+index 0000000..defc0c8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5052 @@
+@@ -0,0 +1,5056 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -4787,6 +4787,10 @@ index 0000000..668008b
 +	entry->type = conn & 0xf;
 +	entry->i2c_index = (conn >> 4) & 0xf;
 +	entry->heads = (conn >> 8) & 0xf;
++	if (bdcb->version >= 0x30)
++		entry->connector = (conn >> 12) & 0xf;
++	else
++		entry->connector = entry->i2c_index; /* sorta */
 +	entry->bus = (conn >> 16) & 0xf;
 +	entry->location = (conn >> 20) & 0x3;
 +	entry->or = (conn >> 24) & 0xf;
@@ -5357,10 +5361,10 @@ index 0000000..668008b
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..43edd76
+index 0000000..24fc305
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,227 @@
 +/*
 + * Copyright 2007-2008 Nouveau Project
 + *
@@ -5400,6 +5404,7 @@ index 0000000..43edd76
 +	uint8_t type;
 +	uint8_t i2c_index;
 +	uint8_t heads;
++	uint8_t connector;
 +	uint8_t bus;
 +	uint8_t location;
 +	uint8_t or;
@@ -5589,10 +5594,10 @@ index 0000000..43edd76
 +#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..6bd4337
+index 0000000..d59ffc4
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -0,0 +1,567 @@
+@@ -0,0 +1,557 @@
 +/*
 + * Copyright 2007 Dave Airlied
 + * All Rights Reserved.
@@ -5764,10 +5769,7 @@ index 0000000..6bd4337
 +void
 +nouveau_bo_unmap(struct nouveau_bo *nvbo)
 +{
-+	if (nvbo->kmap.virtual) {
-+		ttm_bo_kunmap(&nvbo->kmap);
-+		nvbo->kmap.virtual = NULL;
-+	}
++	ttm_bo_kunmap(&nvbo->kmap);
 +}
 +
 +static struct ttm_backend *
@@ -5882,12 +5884,10 @@ index 0000000..6bd4337
 + * TTM_PL_{VRAM,PRIV0,TT} directly.
 + */
 +static int
-+nouveau_bo_move_accel_cleanup(struct nouveau_bo *nvbo, bool evict, bool no_wait,
++nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
++			      struct nouveau_bo *nvbo, bool evict, bool no_wait,
 +			      struct ttm_mem_reg *new_mem)
 +{
-+	struct drm_nouveau_private *dev_priv = nouveau_bdev(nvbo->bo.bdev);
-+	struct nouveau_channel *chan =
-+		nvbo->channel ? nvbo->channel : dev_priv->channel;
 +	struct nouveau_fence *fence = NULL;
 +	int ret;
 +
@@ -5905,8 +5905,7 @@ index 0000000..6bd4337
 +nouveau_bo_mem_ctxdma(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
 +		      struct ttm_mem_reg *mem)
 +{
-+	if (unlikely(nvbo->no_vm)) {
-+		BUG_ON(chan != nouveau_bdev(nvbo->bo.bdev)->channel);
++	if (chan == nouveau_bdev(nvbo->bo.bdev)->channel) {
 +		if (mem->mem_type == TTM_PL_TT)
 +			return NvDmaGART;
 +		return NvDmaVRAM;
@@ -5929,7 +5928,7 @@ index 0000000..6bd4337
 +	int ret;
 +
 +	chan = nvbo->channel;
-+	if (!chan) {
++	if (!chan || nvbo->tile_flags || nvbo->no_vm) {
 +		chan = dev_priv->channel;
 +		if (!chan)
 +			return -EINVAL;
@@ -5937,7 +5936,7 @@ index 0000000..6bd4337
 +
 +	src_offset = old_mem->mm_node->start << PAGE_SHIFT;
 +	dst_offset = new_mem->mm_node->start << PAGE_SHIFT;
-+	if (likely(!nvbo->no_vm)) {
++	if (chan != dev_priv->channel) {
 +		if (old_mem->mem_type == TTM_PL_TT)
 +			src_offset += dev_priv->vm_gart_base;
 +		else
@@ -5999,7 +5998,7 @@ index 0000000..6bd4337
 +		dst_offset += (PAGE_SIZE * line_count);
 +	}
 +
-+	return nouveau_bo_move_accel_cleanup(nvbo, evict, no_wait, new_mem);
++	return nouveau_bo_move_accel_cleanup(chan, nvbo, evict, no_wait, new_mem);
 +}
 +
 +static int
@@ -6071,8 +6070,8 @@ index 0000000..6bd4337
 +nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
 +		bool no_wait, struct ttm_mem_reg *new_mem)
 +{
-+	struct nouveau_bo *nvbo = nouveau_bo(bo);
 +	struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
++	struct nouveau_bo *nvbo = nouveau_bo(bo);
 +	struct drm_device *dev = dev_priv->dev;
 +	struct ttm_mem_reg *old_mem = &bo->mem;
 +	int ret;
@@ -6100,10 +6099,6 @@ index 0000000..6bd4337
 +		return 0;
 +	}
 +
-+	if (dev_priv->card_type == NV_50 && (nvbo->tile_flags ||
-+	    (dev_priv->sfb_gem && dev_priv->sfb_gem->driver_private == nvbo)))
-+		return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-+
 +	if (new_mem->mem_type == TTM_PL_SYSTEM) {
 +		if (old_mem->mem_type == TTM_PL_SYSTEM)
 +			return ttm_bo_move_memcpy(bo, evict, no_wait, new_mem);
@@ -6788,12 +6783,613 @@ index 0000000..e2b78d2
 +
 +	return outclk;
 +}
+diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
+new file mode 100644
+index 0000000..5015f75
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
+@@ -0,0 +1,595 @@
++/*
++ * Copyright (C) 2008 Maarten Maathuis.
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
[...2335 lines suppressed...]
 +}
 +
-+static int nv50_crtc_set_dither(struct nouveau_crtc *crtc, bool update)
++static int nv50_crtc_set_dither(struct nouveau_crtc *crtc, bool on, bool update)
 +{
 +	struct drm_device *dev = crtc->base.dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -27928,7 +27584,7 @@ index 0000000..81c53c4
 +	}
 +
 +	BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, DITHER_CTRL), 1);
-+	if (crtc->use_dithering)
++	if (on)
 +		OUT_RING(evo, NV50_EVO_CRTC_DITHER_CTRL_ON);
 +	else
 +		OUT_RING(evo, NV50_EVO_CRTC_DITHER_CTRL_OFF);
@@ -27989,7 +27645,7 @@ index 0000000..81c53c4
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	if (!connector->digital)
++	if (connector->detected_encoder->dcb->type == OUTPUT_ANALOG)
 +		scaling_mode = DRM_MODE_SCALE_NON_GPU;
 +
 +	switch (scaling_mode) {
@@ -28415,7 +28071,6 @@ index 0000000..81c53c4
 +	}
 +
 +	*crtc->mode = *adjusted_mode;
-+	crtc->use_dithering = connector->use_dithering;
 +
 +	NV_DEBUG(dev, "index %d\n", crtc->index);
 +
@@ -28483,7 +28138,7 @@ index 0000000..81c53c4
 +	BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, SCALE_CENTER_OFFSET), 1);
 +	OUT_RING  (evo, NV50_EVO_CRTC_SCALE_CENTER_OFFSET_VAL(0, 0));
 +
-+	crtc->set_dither(crtc, false);
++	crtc->set_dither(crtc, connector->use_dithering, false);
 +	crtc->set_scale(crtc, connector->scaling_mode, false);
 +
 +	FIRE_RING (evo);
@@ -29020,10 +28675,10 @@ index 0000000..f07b92a
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
 new file mode 100644
-index 0000000..2ab1685
+index 0000000..ee3905d
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_display.c
-@@ -0,0 +1,844 @@
+@@ -0,0 +1,849 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -29508,19 +29163,21 @@ index 0000000..2ab1685
 +			continue;
 +		}
 +
-+		connector[entry->i2c_index] |= (1 << entry->type);
++		connector[entry->connector] |= (1 << entry->type);
 +	}
 +
-+	/* Look at which encoders are attached to each i2c bus to
-+	 * determine which connectors are present.
++	/* It appears that DCB 3.0+ VBIOS has a connector table, however,
++	 * I'm not 100% certain how to decode it correctly yet so just
++	 * look at what encoders are present on each connector index and
++	 * attempt to derive the connector type from that.
 +	 */
 +	for (i = 0 ; i < dcb->entries; i++) {
 +		struct dcb_entry *entry = &dcb->entry[i];
 +		uint16_t encoders;
 +		int type;
 +
-+		encoders = connector[entry->i2c_index];
-+		connector[entry->i2c_index] = 0;
++		encoders = connector[entry->connector];
++		connector[entry->connector] = 0;
 +
 +		/* already done? */
 +		if (!encoders)
@@ -29543,7 +29200,7 @@ index 0000000..2ab1685
 +		if (type == DRM_MODE_CONNECTOR_Unknown)
 +			continue;
 +
-+		nv50_connector_create(dev, entry->i2c_index, type);
++		nouveau_connector_create(dev, entry->i2c_index, type);
 +	}
 +
 +	ret = nv50_display_init(dev);
@@ -29678,14 +29335,17 @@ index 0000000..2ab1685
 +static void
 +nv50_display_vblank_handler(struct drm_device *dev, uint32_t intr)
 +{
++	intr &= NV50_PDISPLAY_INTR_1_VBLANK_CRTC;
++
 +	if (intr & NV50_PDISPLAY_INTR_1_VBLANK_CRTC_0)
 +		nv50_display_vblank_crtc_handler(dev, 0);
 +
 +	if (intr & NV50_PDISPLAY_INTR_1_VBLANK_CRTC_1)
 +		nv50_display_vblank_crtc_handler(dev, 1);
 +
-+	nv_wr32(dev, NV50_PDISPLAY_INTR_1,
-+		     intr & NV50_PDISPLAY_INTR_1_VBLANK_CRTC);
++	nv_wr32(dev, NV50_PDISPLAY_INTR_EN, nv_rd32(dev,
++		     NV50_PDISPLAY_INTR_EN) & ~intr);
++	nv_wr32(dev, NV50_PDISPLAY_INTR_1, intr);
 +}
 +
 +static void
@@ -30784,10 +30444,10 @@ index 0000000..071a2f3
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..91c36e8
+index 0000000..72db3cf
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,432 @@
+@@ -0,0 +1,437 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -30909,13 +30569,16 @@ index 0000000..91c36e8
 +		break;
 +	default:
 +		NV_ERROR(dev, "no ctxprog for chipset NV%02x\n", dev_priv->chipset);
-+		return -EINVAL;
++		dev_priv->engine.graph.accel_blocked = true;
++		break;
 +	}
 +
-+	nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-+	while (*voodoo != ~0) {
-+		nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, *voodoo);
-+		voodoo++;
++	if (voodoo) {
++		nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
++		while (*voodoo != ~0) {
++			nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, *voodoo);
++			voodoo++;
++		}
 +	}
 +
 +	nv_wr32(dev, 0x400320, 4);
@@ -31029,13 +30692,15 @@ index 0000000..91c36e8
 +
 +	dev_priv->engine.instmem.prepare_access(dev, true);
 +
-+	pos = 0;
-+	while (*ctxvals) {
-+		int cnt = *ctxvals++;
-+
-+		while (cnt--)
-+			nv_wo32(dev, ctx, pos++, *ctxvals);
-+		ctxvals++;
++	if (ctxvals) {
++		pos = 0;
++		while (*ctxvals) {
++			int cnt = *ctxvals++;
++
++			while (cnt--)
++				nv_wo32(dev, ctx, pos++, *ctxvals);
++			ctxvals++;
++		}
 +	}
 +
 +	nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12);
@@ -54063,10 +53728,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..c8f1fe9
+index 0000000..af66324
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,268 @@
+@@ -0,0 +1,264 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -54103,8 +53768,6 @@ index 0000000..c8f1fe9
 +#include "nouveau_crtc.h"
 +#include "nv50_display.h"
 +
-+extern int nouveau_duallink;
-+
 +static void
 +nv50_sor_disconnect(struct nouveau_encoder *encoder)
 +{
@@ -54325,8 +53988,6 @@ index 0000000..c8f1fe9
 +	encoder->dcb = entry;
 +	encoder->or = ffs(entry->or) - 1;
 +
-+	encoder->dual_link = nouveau_duallink;
-+
 +	drm_encoder_init(dev, &encoder->base, &nv50_sor_encoder_funcs, type);
 +	drm_encoder_helper_add(&encoder->base, &nv50_sor_helper_funcs);
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1687
retrieving revision 1.1688
diff -u -p -r1.1687 -r1.1688
--- kernel.spec	4 Aug 2009 01:47:32 -0000	1.1687
+++ kernel.spec	4 Aug 2009 06:46:47 -0000	1.1688
@@ -1944,6 +1944,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: more code share between nv50/<nv50 kms, bug fixes
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com>
 - update VGA arb patches again
 



From pravins at fedoraproject.org  Tue Aug  4 06:49:40 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Tue,  4 Aug 2009 06:49:40 +0000 (UTC)
Subject: rpms/lohit-fonts/devel lohit-fonts.spec,1.14,1.15
Message-ID: <20090804064940.6460711C00CE@cvs1.fedora.phx.redhat.com>

Author: pravins

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

Modified Files:
	lohit-fonts.spec 
Log Message:
* Tue Aug 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-2
- updated summary for Hindi font package bug 514443



Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- lohit-fonts.spec	4 Aug 2009 05:10:43 -0000	1.14
+++ lohit-fonts.spec	4 Aug 2009 06:49:40 -0000	1.15
@@ -8,7 +8,7 @@ Languages.
 
 Name:           %{fontname}-fonts
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Indian truetype/opentype fonts
 
 Group:          User Interface/X
@@ -71,7 +71,7 @@ This package provides a free Gujarati tr
 %_font_pkg -n gujarati lohit_gu.ttf
 
 %package -n %{fontname}-hindi-fonts
-Summary:        Free Gujarati font
+Summary:        Free Hindi font
 Group:          User Interface/X
 Requires:       %{name}-common = %{version}-%{release}
 Provides: lohit-fonts-hindi = %{version}-%{release}
@@ -267,6 +267,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-2
+- updated summary for Hindi font package bug 514443
+
 * Tue Aug 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-1
 - Added Unicode 5.1 support in All Lohit fonts 
 



From bskeggs at fedoraproject.org  Tue Aug  4 06:52:53 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue,  4 Aug 2009 06:52:53 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.37,
	1.38 nouveau-bicubic-2x.patch, 1.4,
	1.5 nouveau-multiple-xserver.patch, 1.6,
	1.7 nouveau-transition-hack.patch, 1.7, 1.8 sources, 1.38,
	1.39 xorg-x11-drv-nouveau.spec, 1.47, 1.48
Message-ID: <20090804065253.11FB811C00CE@cvs1.fedora.phx.redhat.com>

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-1.20090803git619103a
- upstream update, misc fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	28 Jul 2009 15:32:17 -0000	1.37
+++ .cvsignore	4 Aug 2009 06:52:52 -0000	1.38
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090728git4d20547.tar.bz2
+xf86-video-nouveau-0.0.15-20090803git619103a.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/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-bicubic-2x.patch	28 Jul 2009 16:04:07 -0000	1.4
+++ nouveau-bicubic-2x.patch	4 Aug 2009 06:52:52 -0000	1.5
@@ -1,4 +1,4 @@
-From d1aaf21efe356bc70d19a46cba3f22f951a4468e Mon Sep 17 00:00:00 2001
+From 9eed08a8ebccf41c5b65c66a15806fd755249106 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 3/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.3.3
+1.6.4
 

nouveau-multiple-xserver.patch:
 nv_driver.c |   92 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-multiple-xserver.patch	28 Jul 2009 15:32:18 -0000	1.6
+++ nouveau-multiple-xserver.patch	4 Aug 2009 06:52:52 -0000	1.7
@@ -1,14 +1,14 @@
-From 7c58a69d5f6d86d1170170e8154fa7bbe9226c2c Mon Sep 17 00:00:00 2001
+From e90a14ed87748789557583187d6bb3d96c6d117f 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
 
 ---
- src/nv_driver.c |   97 ++++++++++++++++++++++++++++++++++++++++---------------
- 1 files changed, 71 insertions(+), 26 deletions(-)
+ src/nv_driver.c |   91 ++++++++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 64 insertions(+), 27 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 838fc67..35233dc 100644
+index ad45d19..2ab42e1 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -19,7 +19,7 @@ index 838fc67..35233dc 100644
  
  #include "nv_include.h"
  
-@@ -377,14 +378,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -377,16 +378,24 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
   */
  
  /* Mandatory */
@@ -33,35 +33,35 @@ index 838fc67..35233dc 100644
  
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
  
-+	if (pNv->dev) {
-+		ret = ioctl(nouveau_device(pNv->dev)->fd,
-+			    DRM_IOCTL_SET_MASTER, NULL);
-+		if (ret) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+				   "Unable to set master\n");
-+		}
+-	if (!pNv->NoAccel)
++	ret = ioctl(nouveau_device(pNv->dev)->fd, DRM_IOCTL_SET_MASTER, NULL);
++	if (ret)
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to set master\n");
 +
++	if (!pNv->NoAccel) {
 +		NVMapMemGART(pScrn);
-+	}
-+
- 	if (!pNv->NoAccel)
  		NVAccelCommonInit(pScrn);
++	}
  
-@@ -436,6 +450,13 @@ NVLeaveVT(int scrnIndex, int flags)
+ 	if (!pNv->kms_enable) {
+ 		/* Save current state, VGA fonts etc */
+@@ -429,11 +438,15 @@ NVLeaveVT(int scrnIndex, int flags)
+ {
+ 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ 	NVPtr pNv = NVPTR(pScrn);
++	struct nouveau_device_priv *nvdev = nouveau_device(pNv->dev);
+ 
+ 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");
  
  	NVSync(pScrn);
  
-+	if (pNv->dev) {
-+		struct nouveau_device_priv *nvdev = nouveau_device(pNv->dev);
-+
-+		nouveau_bo_ref(NULL, &pNv->GART);
-+		ioctl(nvdev->fd, DRM_IOCTL_DROP_MASTER, NULL);
-+	}
++	nouveau_bo_ref(NULL, &pNv->GART);
++	ioctl(nvdev->fd, DRM_IOCTL_DROP_MASTER, NULL);
 +
  	if (!pNv->kms_enable) {
  		if (pNv->Architecture < NV_ARCH_50)
  			NVRestore(pScrn);
-@@ -1114,6 +1135,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1172,6 +1185,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  
  
  static Bool
@@ -114,8 +114,8 @@ index 838fc67..35233dc 100644
  NVMapMem(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
-@@ -1150,6 +1217,9 @@ NVMapMem(ScrnInfoPtr pScrn)
- 	nouveau_bo_unmap(pNv->scanout);
+@@ -1211,6 +1270,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+ 		goto skip_offscreen_gart;
  
  	if (!pNv->exa_driver_pixmaps) {
 +		if (NVMapMemSharedFB(pScrn))
@@ -124,7 +124,7 @@ index 838fc67..35233dc 100644
  		size = (pNv->VRAMPhysicalSize / 2) - size;
  
  		if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1166,6 +1236,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1227,6 +1289,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  			return FALSE;
  		}
  
@@ -132,7 +132,7 @@ index 838fc67..35233dc 100644
  		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
  			   "Allocated %dMiB VRAM for offscreen pixmaps\n",
  			   (uint32_t)(pNv->offscreen->size >> 20));
-@@ -1175,32 +1246,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1236,32 +1299,6 @@ NVMapMem(ScrnInfoPtr pScrn)
  		nouveau_bo_unmap(pNv->offscreen);
  	}
  
@@ -162,9 +162,9 @@ index 838fc67..35233dc 100644
 -			   (unsigned int)(pNv->GART->size >> 20));
 -	}
 -
+ skip_offscreen_gart:
  	/* We don't need to allocate cursors / lut here if we're using
  	 * kernel modesetting
- 	 **/
 -- 
-1.6.3.3
+1.6.4
 

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-transition-hack.patch	28 Jul 2009 16:04:07 -0000	1.7
+++ nouveau-transition-hack.patch	4 Aug 2009 06:52:52 -0000	1.8
@@ -1,17 +1,17 @@
-From bf1e465874dbd36b7de3493a69717b292353d648 Mon Sep 17 00:00:00 2001
+From e2d92e84979a51eaedb87ca9b8e44699f0166c7e Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
 
 ---
- src/drmmode_display.c |  149 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 147 insertions(+), 2 deletions(-)
+ src/drmmode_display.c |  171 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 169 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 21ed564..ae3c51d 100644
+index de1fa00..cbc97c8 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -172,6 +172,144 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -172,6 +172,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
  }
  
  static void
@@ -103,15 +103,25 @@ index 21ed564..ae3c51d 100644
 +
 +	BEGIN_RING(chan, eng2d, 0x02ac, 1);
 +	OUT_RING  (chan, 3);
-+	BEGIN_RING(chan, eng2d, 0x0200, 5);
-+	OUT_RING  (chan, depth_to_gpu(pScrn->depth));
-+	OUT_RING  (chan, 0);
-+	OUT_RING  (chan, 0x40);
-+	OUT_RING  (chan, 1);
-+	OUT_RING  (chan, 0);
-+	BEGIN_RING(chan, eng2d, 0x0218, 4);
-+	OUT_RING  (chan, pScrn->virtualX);
-+	OUT_RING  (chan, pScrn->virtualY);
++	if (dst->tile_flags) {
++		BEGIN_RING(chan, eng2d, 0x0200, 5);
++		OUT_RING  (chan, depth_to_gpu(pScrn->depth));
++		OUT_RING  (chan, 0);
++		OUT_RING  (chan, dst->tile_mode << 4);
++		OUT_RING  (chan, 1);
++		OUT_RING  (chan, 0);
++		BEGIN_RING(chan, eng2d, 0x0218, 4);
++		OUT_RING  (chan, pScrn->virtualX);
++		OUT_RING  (chan, pScrn->virtualY);
++	} else {
++		BEGIN_RING(chan, eng2d, 0x0200, 2);
++		OUT_RING  (chan, depth_to_gpu(pScrn->depth));
++		OUT_RING  (chan, 1);
++		BEGIN_RING(chan, eng2d, 0x0214, 5);
++		OUT_RING  (chan, pScrn->displayWidth * pScrn->bitsPerPixel / 8);
++		OUT_RING  (chan, pScrn->virtualX);
++		OUT_RING  (chan, pScrn->virtualY);
++	}
 +	OUT_RELOCh(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
 +	OUT_RELOCl(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
 +	BEGIN_RING(chan, eng2d, 0x0280, 4);
@@ -119,13 +129,25 @@ index 21ed564..ae3c51d 100644
 +	OUT_RING  (chan, 0);
 +	OUT_RING  (chan, pScrn->virtualX);
 +	OUT_RING  (chan, pScrn->virtualY);
-+	BEGIN_RING(chan, eng2d, 0x0230, 2);
-+	OUT_RING  (chan, depth_to_gpu(fb->depth));
-+	OUT_RING  (chan, 1);
-+	BEGIN_RING(chan, eng2d, 0x0244, 5);
-+	OUT_RING  (chan, fb->pitch);
-+	OUT_RING  (chan, fb->width);
-+	OUT_RING  (chan, fb->height);
++	if (src->tile_flags) {
++		BEGIN_RING(chan, eng2d, 0x0230, 5);
++		OUT_RING  (chan, depth_to_gpu(fb->depth));
++		OUT_RING  (chan, 0);
++		OUT_RING  (chan, src->tile_mode << 4);
++		OUT_RING  (chan, 1);
++		OUT_RING  (chan, 0);
++		BEGIN_RING(chan, eng2d, 0x0248, 4);
++		OUT_RING  (chan, fb->width);
++		OUT_RING  (chan, fb->height);
++	} else {
++		BEGIN_RING(chan, eng2d, 0x0230, 2);
++		OUT_RING  (chan, depth_to_gpu(fb->depth));
++		OUT_RING  (chan, 1);
++		BEGIN_RING(chan, eng2d, 0x0244, 5);
++		OUT_RING  (chan, fb->pitch);
++		OUT_RING  (chan, fb->width);
++		OUT_RING  (chan, fb->height);
++	}
 +	OUT_RELOCh(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
 +	OUT_RELOCl(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
 +	BEGIN_RING(chan, eng2d, 0x0110, 1);
@@ -156,7 +178,7 @@ index 21ed564..ae3c51d 100644
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -184,6 +322,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -184,6 +344,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	if (!src_id || !dst_id)
  		return;
  
@@ -171,7 +193,7 @@ index 21ed564..ae3c51d 100644
  	pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
  	if (!pspix)
  		return;
-@@ -285,8 +431,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -285,8 +453,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		x = 0;
  		y = 0;
  	} else
@@ -182,5 +204,5 @@ index 21ed564..ae3c51d 100644
  				drmmode_crtc->mode_crtc->buffer_id, x, y);
  	}
 -- 
-1.6.3.3
+1.6.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	28 Jul 2009 15:32:18 -0000	1.38
+++ sources	4 Aug 2009 06:52:52 -0000	1.39
@@ -1 +1 @@
-b37bfc0e2b040b16efaf9f00431d556a  xf86-video-nouveau-0.0.15-20090728git4d20547.tar.bz2
+edc867f0c964a749e7b535a6a26ad0f6  xf86-video-nouveau-0.0.15-20090803git619103a.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- xorg-x11-drv-nouveau.spec	28 Jul 2009 15:32:18 -0000	1.47
+++ xorg-x11-drv-nouveau.spec	4 Aug 2009 06:52:52 -0000	1.48
@@ -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 20090728
-%define git_version 4d20547
+%define gitdate 20090803
+%define git_version 619103a
 
 %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:   0.%{snapshot}%{?dist}
+Release:   1.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-1.20090803git619103a
+- upstream update, misc fixes
+
 * Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-0.20090728git4d20547
 - Update to latest upstream
 



From pnemade at fedoraproject.org  Tue Aug  4 06:52:56 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue,  4 Aug 2009 06:52:56 +0000 (UTC)
Subject: rpms/fontmatrix/devel .cvsignore, 1.7, 1.8 fontmatrix.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090804065256.5240311C00CE@cvs1.fedora.phx.redhat.com>

Author: pnemade

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

Modified Files:
	.cvsignore fontmatrix.spec sources 
Log Message:
* Tue Aug 04 2009 Parag <pnemade at redhat.com> - 0.6.99-1.r1072
- update to svn revision 1072




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Jul 2009 10:11:02 -0000	1.7
+++ .cvsignore	4 Aug 2009 06:52:55 -0000	1.8
@@ -1 +1 @@
-fontmatrix-0.6.0-Source.tar.gz
+fontmatrix-0.6.99-Source.tar.gz


Index: fontmatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/fontmatrix.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fontmatrix.spec	24 Jul 2009 22:59:39 -0000	1.18
+++ fontmatrix.spec	4 Aug 2009 06:52:56 -0000	1.19
@@ -1,9 +1,9 @@
-%define svnrev 1063
+%define svnrev 1072
 
 Name: fontmatrix
 Summary: A fonts manager
-Version: 0.6.0
-Release: 3.r%{svnrev}%{?dist}
+Version: 0.6.99
+Release: 1.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -42,6 +42,9 @@ ctest
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+#rpmlint complains Zero-length file
+rm -f $RPM_BUILD_ROOT%{_datadir}/fontmatrix/help/en/what_fonts_are.html
+
 desktop-file-install --vendor="fedora" --delete-original  \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -74,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Parag <pnemade at redhat.com> - 0.6.99-1.r1072
+- update to svn revision 1072
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-3.r1063
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Jul 2009 10:11:02 -0000	1.11
+++ sources	4 Aug 2009 06:52:56 -0000	1.12
@@ -1 +1 @@
-6a00c9448a50d3bab5acb4145f778f2d  fontmatrix-0.6.0-Source.tar.gz
+c6f772586bd3b988e42b4b4d55e053df  fontmatrix-0.6.99-Source.tar.gz



From mhlavink at fedoraproject.org  Tue Aug  4 06:59:31 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  4 Aug 2009 06:59:31 +0000 (UTC)
Subject: rpms/setuptool/F-11 .cvsignore, 1.19, 1.20 setuptool.spec, 1.35,
	1.36 sources, 1.25, 1.26
Message-ID: <20090804065931.3BFFC11C00CE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore setuptool.spec sources 
Log Message:
updated to 1.19.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Mar 2009 12:41:28 -0000	1.19
+++ .cvsignore	4 Aug 2009 06:59:30 -0000	1.20
@@ -1 +1 @@
-setuptool-1.19.5.tar.gz
+setuptool-1.19.6.tar.gz


Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-11/setuptool.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- setuptool.spec	9 Mar 2009 13:25:25 -0000	1.35
+++ setuptool.spec	4 Aug 2009 06:59:30 -0000	1.36
@@ -1,6 +1,6 @@
 Name: setuptool
-Version: 1.19.5
-Release: 2%{?dist}
+Version: 1.19.6
+Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
 Group: Applications/System
@@ -16,7 +16,7 @@ to access all of the text mode configura
 operating system distribution.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 %build
 ./autogen.sh
@@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Tue Aug 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.6-1
+- updated to 1.19.6
+- don't display *_IN locale in /dev/tty/X it does not work (#511193)
+
 * Mon Mar 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.5-2
 - fix buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	9 Mar 2009 12:41:28 -0000	1.25
+++ sources	4 Aug 2009 06:59:30 -0000	1.26
@@ -1 +1 @@
-4880d27fbb76e8cf723d220683b9957a  setuptool-1.19.5.tar.gz
+c346b838fd8960fff308b5a629fc3a27  setuptool-1.19.6.tar.gz



From jkratoch at fedoraproject.org  Tue Aug  4 07:03:45 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue,  4 Aug 2009 07:03:45 +0000 (UTC)
Subject: rpms/gdb/devel gdb.spec,1.368,1.369
Message-ID: <20090804070345.A863911C00CE@cvs1.fedora.phx.redhat.com>

Author: jkratoch

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

Modified Files:
	gdb.spec 
Log Message:
* Tue Aug  4 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090803-2
- Drop the bundled libstdc++ python - it should be packaged on its own now.



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- gdb.spec	4 Aug 2009 05:37:29 -0000	1.368
+++ gdb.spec	4 Aug 2009 07:03:44 -0000	1.369
@@ -14,7 +14,7 @@ Version: 6.8.50.20090803
 
 # 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
@@ -374,8 +374,6 @@ BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
-# Temporarily before it gets moved to libstdc++.rpm
-BuildRequires: libstdc++
 %endif	# 0%{!?_without_python:1}
 
 %if 0%{?_with_testsuite:1}
@@ -751,20 +749,6 @@ ln -sf gdb $RPM_BUILD_ROOT%{_prefix}/bin
 cmp $RPM_BUILD_ROOT%{_mandir}/*/gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 
-%if 0%{!?_without_python:1}
-# In the future:
-#%# A part of the libstdc++ rpm.
-#%rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
-# Temporarily now:
-for LIB in lib lib64;do
-  LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"
-  mkdir -p $LIBPATH
-  # basename is being run only for the native (non-biarch) file.
-  sed -e 's, at dir@,%{python_sitelib}/gdb,' <$RPM_BUILD_DIR/%{gdb_src}/gdb/python/lib/gdb/libstdcxx/v6/hook.in \
-      >$LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py
-done
-%endif	# 0%{!?_without_python:1}
-
 # Remove the files that are part of a gdb build but that are owned and
 # provided by other packages.
 # These are part of binutils
@@ -826,7 +810,6 @@ fi
 %if 0%{!?_without_python:1}
 %{python_sitelib}/gdb
 %endif	# 0%{!?_without_python:1}
-%{_datadir}/gdb
 %endif	# 0%{!?_with_upstream:1}
 %{_infodir}/annotate.info*
 %{_infodir}/gdb.info*
@@ -842,6 +825,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug  4 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090803-2
+- Drop the bundled libstdc++ python - it should be packaged on its own now.
+
 * Tue Aug  4 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090803-1
 - Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090803
 - archer-jankratochvil-fedora12 commit: 0222cb1f4ddd1eda32965e464cb60b1e44e110b2



From nb at fedoraproject.org  Tue Aug  4 07:04:15 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Tue,  4 Aug 2009 07:04:15 +0000 (UTC)
Subject: rpms/imp/devel .cvsignore, 1.6, 1.7 imp.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <20090804070415.ABBE411C00CE@cvs1.fedora.phx.redhat.com>

Author: nb

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

Modified Files:
	.cvsignore imp.spec sources 
Log Message:
Updating to 4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jun 2008 04:19:49 -0000	1.6
+++ .cvsignore	4 Aug 2009 07:04:15 -0000	1.7
@@ -1 +1 @@
-imp-h3-4.2.tar.gz
+imp-h3-4.3.4.tar.gz


Index: imp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imp/devel/imp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- imp.spec	25 Jul 2009 03:19:22 -0000	1.10
+++ imp.spec	4 Aug 2009 07:04:15 -0000	1.11
@@ -1,6 +1,6 @@
-Name: 		imp
-Version:	4.2
-Release:	3%{?dist}
+Name:		imp
+Version:	4.3.4
+Release:	1%{?dist}
 Summary:	The Internet Messaging Program: webmail access to IMAP/POP3 accounts
 
 Source0:	ftp://ftp.horde.org/pub/%{name}/tarballs/%{name}-h3-%{version}.tar.gz
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_datadir}/horde/%{name}
 
 %changelog
+* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 4.3.4-1
+- Upgrade to 4.3.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jun 2008 04:19:49 -0000	1.6
+++ sources	4 Aug 2009 07:04:15 -0000	1.7
@@ -1 +1 @@
-2ab4314b58bea1906a2f34acb3e09a2e  imp-h3-4.2.tar.gz
+a9811e74747b1e15d93753bc9639082b  imp-h3-4.3.4.tar.gz



From nb at fedoraproject.org  Tue Aug  4 07:06:00 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Tue,  4 Aug 2009 07:06:00 +0000 (UTC)
Subject: rpms/horde/devel .cvsignore, 1.7, 1.8 horde.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <20090804070600.EC90011C00CE@cvs1.fedora.phx.redhat.com>

Author: nb

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

Modified Files:
	.cvsignore horde.spec sources 
Log Message:
Update to 3.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/horde/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 Jun 2008 04:19:28 -0000	1.7
+++ .cvsignore	4 Aug 2009 07:06:00 -0000	1.8
@@ -1 +0,0 @@
-horde-3.2.1.tar.gz


Index: horde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/horde/devel/horde.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- horde.spec	25 Jul 2009 02:11:34 -0000	1.13
+++ horde.spec	4 Aug 2009 07:06:00 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		horde
-Version:	3.2.1
-Release:	4%{?dist}
-Summary:	The common Horde Framework for all Horde applications
+Version:	3.3.4
+Release:	1%{?dist}
+Summary:	The common framework for all Horde applications
 
 Source0:	ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
 Source1:	registry.php
@@ -166,10 +166,10 @@ cat <<_EOF_ >%{name}.conf
 Alias /%{name} %{_datadir}/%{name}
 
 <Directory %{_datadir}/%{name}>
-        # By default Horde does not implement an authentication method
-        # which can allow full access to your system open, please read
+	# By default Horde does not implement an authentication method
+	# which can allow full access to your system open, please read
 	# README.fedora for more information on how to setup horde 
-        # before commenting the following three lines.
+	# before commenting the following three lines.
 	Order Deny,Allow
 	Deny from all
 	Allow from 127.0.0.1
@@ -250,9 +250,13 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %files enhanced
+%defattr(-,root,root)
 %doc README.Fedora
 
 %changelog
+* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.4-1
+- Upgrade to 3.3.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/horde/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Jun 2008 04:19:28 -0000	1.7
+++ sources	4 Aug 2009 07:06:00 -0000	1.8
@@ -1 +0,0 @@
-61f483867548004e539b54d04973292b  horde-3.2.1.tar.gz



From snirkel at fedoraproject.org  Tue Aug  4 07:07:33 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Tue,  4 Aug 2009 07:07:33 +0000 (UTC)
Subject: rpms/gnomad2/devel gnomad2.spec,1.32,1.33
Message-ID: <20090804070733.0EEB911C00CE@cvs1.fedora.phx.redhat.com>

Author: snirkel

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

Modified Files:
	gnomad2.spec 
Log Message:
Bump to pick up new libmtp.



Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gnomad2.spec	25 Jul 2009 00:32:15 -0000	1.32
+++ gnomad2.spec	4 Aug 2009 07:07:32 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:		gnomad2
 Version:    	2.9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPLv2+
@@ -63,12 +63,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Tue Aug 4 2009 Linus Walleij <triad at df.lth.se> 2.9.4-4
+- Rebuild for new libmtp.
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Fri Jan 23 2009 Linus Walleij <triad at df.lth.se> 2.9.4-1
 - New upstream, fix Fedora bug 480366
 * Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1



From pbrobinson at fedoraproject.org  Tue Aug  4 07:08:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  4 Aug 2009 07:08:32 +0000 (UTC)
Subject: rpms/moblin-cursor-theme/devel import.log, NONE,
	1.1 moblin-cursor-theme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090804070832.DBB1711C00CE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-cursor-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25344/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-cursor-theme.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-cursor-theme-0_3-2:HEAD:moblin-cursor-theme-0.3-2.src.rpm:1249368598


--- NEW FILE moblin-cursor-theme.spec ---
Name:           moblin-cursor-theme
Version:        0.3
Release:        2
Summary:        Moblin X cursors 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

BuildRequires:  xorg-x11-apps

%description
Moblin X cursors theme.

%prep
%setup -q

%build
cd pngs
./make.sh

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}/%{_datadir}/icons/moblin  
cp -pr xcursors %{buildroot}/%{_datadir}/icons/moblin/cursors

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{_datadir}/icons/moblin/

%changelog
* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
- Updates from review request

* Sat Jul 25 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-1
- New upstream 0.3 release

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-cursor-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 23:49:22 -0000	1.1
+++ .cvsignore	4 Aug 2009 07:08:32 -0000	1.2
@@ -0,0 +1 @@
+moblin-cursor-theme-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-cursor-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 23:49:23 -0000	1.1
+++ sources	4 Aug 2009 07:08:32 -0000	1.2
@@ -0,0 +1 @@
+4e88ee79b4aafc08e4dc6defc3dadf7d  moblin-cursor-theme-0.3.tar.bz2



From rakesh at fedoraproject.org  Tue Aug  4 07:21:01 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue,  4 Aug 2009 07:21:01 +0000 (UTC)
Subject: rpms/pdf2djvu/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 pdf2djvu.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090804072101.57AF011C00CE@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	.cvsignore import.log pdf2djvu.spec sources 
Log Message:
Update to 5.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jan 2009 04:42:13 -0000	1.3
+++ .cvsignore	4 Aug 2009 07:20:59 -0000	1.4
@@ -1 +1 @@
-pdf2djvu_0.5.0.tar.gz
+pdf2djvu_0.5.11.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	17 Jan 2009 04:42:13 -0000	1.2
+++ import.log	4 Aug 2009 07:20:59 -0000	1.3
@@ -1,2 +1,3 @@
 pdf2djvu-0_4_13-3_fc10:HEAD:pdf2djvu-0.4.13-3.fc10.src.rpm:1226407417
 pdf2djvu-0_5_0-1_fc10:HEAD:pdf2djvu-0.5.0-1.fc10.src.rpm:1232124128
+pdf2djvu-0_5_11-1_fc11:HEAD:pdf2djvu-0.5.11-1.fc11.src.rpm:1249370695


Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/pdf2djvu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pdf2djvu.spec	3 Aug 2009 11:09:17 -0000	1.6
+++ pdf2djvu.spec	4 Aug 2009 07:20:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pdf2djvu
-Version:        0.5.0
-Release:        5%{?dist}
+Version:        0.5.11
+Release:        1%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -33,15 +33,22 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 install -p -m 644 -D {doc,%{buildroot}%{_mandir}/man1}/pdf2djvu.1
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_mandir}/man1/*
+%{_mandir}/pl/man1/*
+
 
 %changelog
+* Tue Aug 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.5.11-1
+- Updated to 0.5.11
+
 * Mon Aug 03 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.5.0-5
 - Fixed the missing djvulibre require #500306
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jan 2009 04:42:13 -0000	1.3
+++ sources	4 Aug 2009 07:20:59 -0000	1.4
@@ -1 +1 @@
-289bc52ad069fc51993ac6b71a58ebf8  pdf2djvu_0.5.0.tar.gz
+a9f99c1e755c9f3b5136de235c6851ff  pdf2djvu_0.5.11.tar.gz



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:39 +0000
Subject: [pkgdb] eggdrop: nb has requested watchbugzilla
Message-ID: <20090804072539.2A95F10F882@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on eggdrop (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:41 +0000
Subject: [pkgdb] eggdrop: nb has requested watchcommits
Message-ID: <20090804072541.6730B10F8A2@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on eggdrop (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:50 +0000
Subject: [pkgdb] eggdrop: nb has requested watchbugzilla
Message-ID: <20090804072550.F06C310F879@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on eggdrop (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:44 +0000
Subject: [pkgdb] eggdrop: nb has requested commit
Message-ID: <20090804072544.E3E3410F8AD@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on eggdrop (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:52 +0000
Subject: [pkgdb] eggdrop: nb has requested watchcommits
Message-ID: <20090804072552.C0E1210F8B2@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on eggdrop (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:55 +0000
Subject: [pkgdb] eggdrop: nb has requested commit
Message-ID: <20090804072554.F39EB10F8B6@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on eggdrop (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:25:59 +0000
Subject: [pkgdb] eggdrop: nb has requested watchbugzilla
Message-ID: <20090804072559.CAD2510F8B9@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on eggdrop (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:02 +0000
Subject: [pkgdb] eggdrop: nb has requested watchcommits
Message-ID: <20090804072602.3385210F8BD@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on eggdrop (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:04 +0000
Subject: [pkgdb] eggdrop: nb has requested commit
Message-ID: <20090804072604.604EF10F8A9@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on eggdrop (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:11 +0000
Subject: [pkgdb] eggdrop: nb has requested watchbugzilla
Message-ID: <20090804072611.1209C10F8C5@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on eggdrop (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:12 +0000
Subject: [pkgdb] eggdrop: nb has requested watchcommits
Message-ID: <20090804072612.D7AA710F8C7@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on eggdrop (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:15 +0000
Subject: [pkgdb] eggdrop: nb has requested commit
Message-ID: <20090804072615.5516B10F8AD@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on eggdrop (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:19 +0000
Subject: [pkgdb] eggdrop: nb has requested watchbugzilla
Message-ID: <20090804072619.19DF710F8C9@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on eggdrop (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:21 +0000
Subject: [pkgdb] eggdrop: nb has requested watchcommits
Message-ID: <20090804072621.22D2610F8CC@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on eggdrop (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:26:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:26:23 +0000
Subject: [pkgdb] eggdrop: nb has requested commit
Message-ID: <20090804072623.2C53010F8CF@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on eggdrop (Fedora 11)

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



From corsepiu at fedoraproject.org  Tue Aug  4 07:30:59 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue,  4 Aug 2009 07:30:59 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/devel perl-DateTimeX-Easy.spec,1.4,1.5
Message-ID: <20090804073059.0BC5B11C00CE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30579

Modified Files:
	perl-DateTimeX-Easy.spec 
Log Message:
* Tue Aug 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.087-3
- Fix mass rebuild breakdown: Add --skipdeps.
- Use Test::Most.



Index: perl-DateTimeX-Easy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel/perl-DateTimeX-Easy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DateTimeX-Easy.spec	26 Jul 2009 05:39:51 -0000	1.4
+++ perl-DateTimeX-Easy.spec	4 Aug 2009 07:30:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-DateTimeX-Easy
 Version:    0.087
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see lib/DateTimeX/Easy.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -19,7 +19,7 @@ BuildRequires: perl(DateTime::Format::Na
 BuildRequires: perl(DateTime::Format::ICal)
 BuildRequires: perl(DateTime::Format::DateManip)
 BuildRequires: perl(Scalar::Util)
-BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Most)
 
 # not picked up
 Provides:      perl(DateTimeX::Easy::DateParse)
@@ -33,12 +33,8 @@ timezone detection and selection).
 %prep
 %setup -q -n DateTimeX-Easy-%{version}
 
-# note -- we cannot package/use Test::Most as it requires newer levels of core
-# modules than are currently present in F-9+
-perl -pi -e 's/Most/More/g' t/*.t Makefile.PL
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
 make %{?_smp_mflags}
 
 %install
@@ -63,6 +59,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.087-3
+- Fix mass rebuild breakdown: Add --skipdeps.
+- Use Test::Most.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.087-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:23 +0000
Subject: [pkgdb] imapsync: nb has requested watchbugzilla
Message-ID: <20090804073923.C809210F88F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imapsync (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:25 +0000
Subject: [pkgdb] imapsync: nb has requested watchcommits
Message-ID: <20090804073925.72D5910F8A9@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imapsync (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:26 +0000
Subject: [pkgdb] imapsync: nb has requested commit
Message-ID: <20090804073926.A557210F8AF@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imapsync (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:29 +0000
Subject: [pkgdb] imapsync: nb has requested approveacls
Message-ID: <20090804073929.1F34910F8B2@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on imapsync (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:36 +0000
Subject: [pkgdb] imapsync: nb has requested watchbugzilla
Message-ID: <20090804073936.CDDAF10F8B4@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imapsync (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:38 +0000
Subject: [pkgdb] imapsync: nb has requested watchcommits
Message-ID: <20090804073938.8883510F8B7@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imapsync (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:40 +0000
Subject: [pkgdb] imapsync: nb has requested commit
Message-ID: <20090804073940.3F99F10F8BB@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imapsync (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:41 +0000
Subject: [pkgdb] imapsync: nb has requested approveacls
Message-ID: <20090804073941.DA33110F8BD@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on imapsync (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:47 +0000
Subject: [pkgdb] imapsync: nb has requested watchbugzilla
Message-ID: <20090804073947.D1B6C10F8A0@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imapsync (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:50 +0000
Subject: [pkgdb] imapsync: nb has requested watchcommits
Message-ID: <20090804073950.1FE8D10F8BE@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imapsync (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:51 +0000
Subject: [pkgdb] imapsync: nb has requested commit
Message-ID: <20090804073951.BBD7C10F8C1@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imapsync (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:53 +0000
Subject: [pkgdb] imapsync: nb has requested approveacls
Message-ID: <20090804073953.8701810F8C5@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on imapsync (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:57 +0000
Subject: [pkgdb] imapsync: nb has requested watchbugzilla
Message-ID: <20090804073957.52D1C10F8AF@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on imapsync (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:39:59 +0000
Subject: [pkgdb] imapsync: nb has requested watchcommits
Message-ID: <20090804073959.24B9710F8C7@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on imapsync (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:40:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:40:00 +0000
Subject: [pkgdb] imapsync: nb has requested commit
Message-ID: <20090804074000.A6E6010F8C9@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on imapsync (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:40:02 +0000
Subject: [pkgdb] imapsync: nb has requested approveacls
Message-ID: <20090804074002.E186A10F8CC@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on imapsync (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:49 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074349.BC0DF10F882@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on imapsync (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:49 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074349.ECBBE10F8A2@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on imapsync (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:51 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074351.A1A5E10F8B1@bastion2.fedora.phx.redhat.com>

mmahut has set the approveacls acl on imapsync (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:50 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074350.C7D1410F8AD@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on imapsync (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:56 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074356.25F1810F8B8@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on imapsync (Fedora EPEL 5) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:55 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074355.2699010F8B5@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on imapsync (Fedora EPEL 5) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:56 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074357.00EEA10F8BB@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on imapsync (Fedora EPEL 5) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:00 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074400.5B7D310F8BD@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on imapsync (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:43:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:43:57 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074358.02C4510F8C1@bastion2.fedora.phx.redhat.com>

mmahut has set the approveacls acl on imapsync (Fedora EPEL 5) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:00 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074400.F1E8E10F8C4@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on imapsync (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:01 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074401.CB6EC10F8C9@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on imapsync (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:02 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074402.D23BC10F8CC@bastion2.fedora.phx.redhat.com>

mmahut has set the approveacls acl on imapsync (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:04 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074404.E518B10F8CF@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on imapsync (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:06 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074406.2085810F8D2@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on imapsync (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:07 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074407.2014710F8D5@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on imapsync (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 07:44:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 07:44:08 +0000
Subject: [pkgdb] imapsync had acl change status
Message-ID: <20090804074409.071A310F8D8@bastion2.fedora.phx.redhat.com>

mmahut has set the approveacls acl on imapsync (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:22 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080422.362E510F882@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on eggdrop (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:24 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080424.758AC10F8A2@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on eggdrop (Fedora devel) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:29 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080429.1100B10F8AD@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on eggdrop (Fedora devel) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:35 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080435.3EC8B10F8B0@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on eggdrop (Fedora EPEL 4) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:37 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080437.9214F10F8B4@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on eggdrop (Fedora EPEL 4) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:40 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080440.19C1710F8B8@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on eggdrop (Fedora EPEL 4) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:44 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080444.CED0C10F8BB@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on eggdrop (Fedora EPEL 5) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:47 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080447.4E97310F8A0@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on eggdrop (Fedora EPEL 5) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:49 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080449.C3D7B10F8BC@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on eggdrop (Fedora EPEL 5) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:57 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080457.D627A10F8AC@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on eggdrop (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:04:59 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080459.D016710F8BD@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on eggdrop (Fedora 10) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:05:01 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080501.F01DF10F8C6@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on eggdrop (Fedora 10) to Obsolete for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:05:05 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080505.9E89E10F8CB@bastion2.fedora.phx.redhat.com>

robert has set the watchbugzilla acl on eggdrop (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:05:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:05:08 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080508.445E610F8B2@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on eggdrop (Fedora 11) to Approved for nb

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:05:10 +0000
Subject: [pkgdb] eggdrop had acl change status
Message-ID: <20090804080510.536C310F8CC@bastion2.fedora.phx.redhat.com>

robert has set the commit acl on eggdrop (Fedora 11) to Obsolete for nb

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



From chitlesh at fedoraproject.org  Tue Aug  4 08:19:41 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:19:41 +0000 (UTC)
Subject: rpms/perl-Verilog/F-10 .cvsignore, 1.7, 1.8 import.log, 1.6,
	1.7 perl-Verilog.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090804081941.1A93A11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10761/F-10

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 23:41:03 -0000	1.7
+++ .cvsignore	4 Aug 2009 08:19:40 -0000	1.8
@@ -1 +1 @@
-Verilog-Perl-3.211.tar.gz
+Verilog-Perl-3.212.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	17 Jun 2009 23:41:03 -0000	1.6
+++ import.log	4 Aug 2009 08:19:40 -0000	1.7
@@ -4,3 +4,4 @@ perl-Verilog-3_120-1_fc10:F-10:perl-Veri
 perl-Verilog-3_121-1_fc10:F-10:perl-Verilog-3.121-1.fc10.src.rpm:1239210143
 perl-Verilog-3_210-1_fc10:F-10:perl-Verilog-3.210-1.fc10.src.rpm:1242921582
 perl-Verilog-3_211-1_fc11:F-10:perl-Verilog-3.211-1.fc11.src.rpm:1245282026
+perl-Verilog-3_212-1_fc11:F-10:perl-Verilog-3.212-1.fc11.src.rpm:1249373844


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/perl-Verilog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Verilog.spec	17 Jun 2009 23:41:03 -0000	1.6
+++ perl-Verilog.spec	4 Aug 2009 08:19:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.211
+Version:       3.212
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -65,6 +65,9 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
+* Mon Jun 20 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.212-1
+- upstream v3.212
+
 * Thu Jun 18 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.211-1
 - upstream v3.211
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 23:41:03 -0000	1.7
+++ sources	4 Aug 2009 08:19:40 -0000	1.8
@@ -1 +1 @@
-c9a21ce35bc08441982ab43642adf72d  Verilog-Perl-3.211.tar.gz
+5682e42a4904d41206782128b174a7d1  Verilog-Perl-3.212.tar.gz



From xhorak at fedoraproject.org  Tue Aug  4 08:20:25 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:20:25 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.230,1.231
Message-ID: <20090804082025.8B86011C049D@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	epiphany.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-9
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- epiphany.spec	22 Jul 2009 07:57:33 -0000	1.230
+++ epiphany.spec	4 Aug 2009 08:20:25 -0000	1.231
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.12
+%define gecko_ver 1.9.0.13
 %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: 8%{?dist}
+Release: 9%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-9
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-8
 - Rebuild against newer gecko
 



From airlied at fedoraproject.org  Tue Aug  4 08:21:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 08:21:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.12.2-to-git.patch,NONE,1.1
Message-ID: <20090804082116.3947F11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Added Files:
	radeon-6.12.2-to-git.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
- ati: rebase to git master - need to fixup a few patches later


radeon-6.12.2-to-git.patch:
 Makefile.am                       |    2 
 README                            |   13 
 acinclude.m4                      |   77 
 configure.ac                      |   67 
 man/radeon.man                    |   24 
 shave-libtool.in                  |   69 
 shave.in                          |   79 
 src/Makefile.am                   |   15 
 src/ati_pciids_gen.h              |   15 
 src/atombios_crtc.c               |  445 ++
 src/atombios_output.c             |    5 
 src/drmmode_display.c             | 1044 +++++++
 src/drmmode_display.h             |   74 
 src/legacy_crtc.c                 |  125 
 src/legacy_output.c               |   11 
 src/pcidb/ati_pciids.csv          |   15 
 src/pcidb/parse_pci_ids.pl        |    2 
 src/r600_exa.c                    |  156 -
 src/r600_shader.c                 | 1060 ++++---
 src/r600_state.h                  |    6 
 src/r600_textured_videofuncs.c    |  169 -
 src/r6xx_accel.c                  |  128 
 src/radeon.h                      |  235 +
 src/radeon_accel.c                |  165 -
 src/radeon_accelfuncs.c           |    5 
 src/radeon_atombios.c             |  169 -
 src/radeon_atombios.h             |   13 
 src/radeon_bios.c                 |   69 
 src/radeon_chipinfo_gen.h         |   17 
 src/radeon_chipset_gen.h          |   15 
 src/radeon_commonfuncs.c          |  482 ++-
 src/radeon_crtc.c                 |  110 
 src/radeon_cursor.c               |   70 
 src/radeon_dri.c                  |   24 
 src/radeon_dri2.c                 |  334 ++
 src/radeon_dri2.h                 |   42 
 src/radeon_driver.c               |  591 ---
 src/radeon_drm.h                  |  131 
 src/radeon_dummy_bufmgr.h         |   62 
 src/radeon_exa.c                  |  142 
 src/radeon_exa_funcs.c            |  289 +
 src/radeon_exa_render.c           |  584 ++-
 src/radeon_kms.c                  |  874 +++++
 src/radeon_legacy_memory.c        |   22 
 src/radeon_macros.h               |   49 
 src/radeon_output.c               |  132 
 src/radeon_pci_chipset_gen.h      |   15 
 src/radeon_pci_device_match_gen.h |   15 
 src/radeon_pm.c                   |  886 +++++
 src/radeon_probe.c                |   82 
 src/radeon_probe.h                |   15 
 src/radeon_reg.h                  |  130 
 src/radeon_textured_video.c       |  565 ++-
 src/radeon_textured_videofuncs.c  | 5662 ++++++++++++++++++++++++--------------
 src/radeon_version.h              |    1 
 src/radeon_video.c                |   25 
 src/radeon_video.h                |   25 
 57 files changed, 11487 insertions(+), 4161 deletions(-)

--- NEW FILE radeon-6.12.2-to-git.patch ---
diff --git a/Makefile.am b/Makefile.am
index 87e90ba..e76bf11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/README b/README
index 99de20d..4b92a18 100644
--- a/README
+++ b/README
@@ -1,20 +1,25 @@
 xf86-video-ati - ATI Radeon video driver for the Xorg X server
 
-Please submit bugs & patches to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
 All questions regarding this software should be directed at the
 Xorg mailing list:
 
         http://lists.freedesktop.org/mailman/listinfo/xorg
 
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
 The master development code repository can be found at:
 
         git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati
 
         http://cgit.freedesktop.org/xorg/driver/xf86-video-ati
 
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
 For more information on the git code manager, see:
 
         http://wiki.x.org/wiki/GitPage
+
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000..0a3509e
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,77 @@
+dnl Make automake/libtool output more friendly to humans
+dnl  Damien Lespiau <damien.lespiau at gmail.com>
+dnl
+dnl SHAVE_INIT([shavedir],[default_mode])
+dnl
+dnl shavedir: the directory where the shave scripts are, it defaults to
+dnl           $(top_builddir)
+dnl default_mode: (enable|disable) default shave mode.  This parameter
+dnl               controls shave's behaviour when no option has been
+dnl               given to configure.  It defaults to disable.
+dnl
+dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
+dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrites CC and
+dnl   LIBTOOL, you don't want the configure tests to have these variables
+dnl   re-defined.
+dnl * This macro requires GNU make's -s option.
+
+AC_DEFUN([_SHAVE_ARG_ENABLE],
+[
+  AC_ARG_ENABLE([shave],
+    AS_HELP_STRING(
+      [--enable-shave],
+      [use shave to make the build pretty [[default=$1]]]),,
+      [enable_shave=$1]
+    )
+])
+
+AC_DEFUN([SHAVE_INIT],
+[
+  dnl you can tweak the default value of enable_shave
+  m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
+
+  if test x"$enable_shave" = xyes; then
+    dnl where can we find the shave scripts?
+    m4_if([$1],,
+      [shavedir="$ac_pwd"],
+      [shavedir="$ac_pwd/$1"])
+    AC_SUBST(shavedir)
+
+    dnl make is now quiet
+    AC_SUBST([MAKEFLAGS], [-s])
+    AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
+
+    dnl we need sed
+    AC_CHECK_PROG(SED,sed,sed,false)
+
+    dnl substitute libtool
+    SHAVE_SAVED_LIBTOOL=$LIBTOOL
+    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
+    AC_SUBST(LIBTOOL)
+
+    dnl substitute cc/cxx
+    SHAVE_SAVED_CC=$CC
+    SHAVE_SAVED_CXX=$CXX
+    SHAVE_SAVED_FC=$FC
+    SHAVE_SAVED_F77=$F77
+    SHAVE_SAVED_OBJC=$OBJC
+    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
+    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
+    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
+    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
+    OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
+    AC_SUBST(CC)
+    AC_SUBST(CXX)
+    AC_SUBST(FC)
+    AC_SUBST(F77)
+    AC_SUBST(OBJC)
+
+    V=@
+  else
+    V=1
+  fi
+  Q='$(V:1=)'
+  AC_SUBST(V)
+  AC_SUBST(Q)
+])
+
diff --git a/configure.ac b/configure.ac
index 709fb19..48375ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,18 +22,26 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ati],
-        6.12.2,
+        6.12.99,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
+
+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([dist-bzip2])
+AC_SYS_LARGEFILE
 
 AM_MAINTAINER_MODE
 
+AC_CONFIG_FILES([shave shave-libtool])
+
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -62,6 +70,12 @@ AC_ARG_ENABLE(exa,
               [EXA="$enableval"],
               [EXA=yes])
 
+AC_ARG_ENABLE(kms,
+              AC_HELP_STRING([--disable-kms],
+                             [Disable KMS support [[default=enabled]]]),
+              [DRM_MODE="$enableval"],
+              [DRM_MODE=yes])
+
 AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
                                           [Path to X server source tree]),
                            [ XSERVER_SOURCE="$withval" ],
@@ -76,6 +90,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+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" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
@@ -114,6 +132,24 @@ if test "$DRI" = yes; then
 	if test "$have_damage_h" = yes; then
 		AC_DEFINE(DAMAGE,1,[Use Damage extension])
 	fi
+
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS"
+	AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
+	if test "$DRM_MODE" = yes; then
+	   	AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include <stdint.h>
+#include <stdlib.h>])
+		if test "x$DRM_MODE" = xyes; then
+		   	PKG_CHECK_MODULES(LIBDRM_RADEON, [xorg-server >= 1.6 libdrm_radeon],
+			[LIBDRM_RADEON=yes], [LIBDRM_RADEON=no])
[...19762 lines suppressed...]
+
+	BEGIN_ACCEL(2);
+	OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX) << R300_SCISSOR_X_SHIFT) |
+					 ((dstY) << R300_SCISSOR_Y_SHIFT)));
+	OUT_ACCEL_REG(R300_SC_SCISSOR1, (((dstX + dstw - 1) << R300_SCISSOR_X_SHIFT) |
+					 ((dstY + dsth - 1) << R300_SCISSOR_Y_SHIFT)));
+	FINISH_ACCEL();
+
+#ifdef ACCEL_CP
+	BEGIN_RING(3 * vtx_count + 4);
+	OUT_RING(CP_PACKET3(R200_CP_PACKET3_3D_DRAW_IMMD_2,
+			    3 * vtx_count));
+	OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST |
+		 RADEON_CP_VC_CNTL_PRIM_WALK_RING |
+		 (3 << RADEON_CP_VC_CNTL_NUM_SHIFT));
+#else /* ACCEL_CP */
+	BEGIN_ACCEL(2 + vtx_count * 3);
+	OUT_ACCEL_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_TRIANGLE_LIST |
+					  RADEON_VF_PRIM_WALK_DATA |
+					  (3 << RADEON_VF_NUM_VERTICES_SHIFT)));
+#endif
+	if (pPriv->bicubic_enabled) {
+	    VTX_OUT_6((float)dstX,            (float)dstY,
+		      (float)srcX / pPriv->w, (float)srcY / pPriv->h,
+		      (float)srcX + 0.5,      (float)srcY + 0.5);
+	    VTX_OUT_6((float)dstX,            (float)(dstY + dstw + dsth),
+		      (float)srcX / pPriv->w, ((float)srcY + (float)srch * (((float)dstw / (float)dsth) + 1.0)) / pPriv->h,
+		      (float)srcX + 0.5,      (float)srcY + (float)srch * (((float)dstw / (float)dsth) + 1.0) + 0.5);
+	    VTX_OUT_6((float)(dstX + dstw + dsth),                       (float)dstY,
+		      ((float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0)) / pPriv->w,
+		      (float)srcY / pPriv->h,
+		      (float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0) + 0.5,
+		      (float)srcY + 0.5);
+	} else {
+	    /*
+	     * Render a big, scissored triangle. This means
+	     * increasing the triangle size and adjusting
+	     * texture coordinates.
+	     */
+	    VTX_OUT_4((float)dstX,            (float)dstY,
+		      (float)srcX / pPriv->w, (float)srcY / pPriv->h);
+	    VTX_OUT_4((float)dstX,                              (float)(dstY + dsth + dstw),
+		      (float)srcX / pPriv->w, ((float)srcY + (float)srch * (((float)dstw / (float)dsth) + 1.0)) / pPriv->h);
+	    VTX_OUT_4((float)(dstX + dstw + dsth),              (float)dstY,
+		      ((float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0)) / pPriv->w,
+		      (float)srcY / pPriv->h);
+	}
+
+	/* flushing is pipelined, free/finish is not */
+	OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D);
+
+#ifdef ACCEL_CP
+	ADVANCE_RING();
+#else
+	FINISH_ACCEL();
+#endif /* !ACCEL_CP */
+
+	pBox++;
+    }
+
+    BEGIN_ACCEL(3);
+    OUT_ACCEL_REG(R300_SC_CLIP_RULE, 0xAAAA);
+    OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
     OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_3D_IDLECLEAN);
     FINISH_ACCEL();
 
     DamageDamageRegion(pPriv->pDraw, &pPriv->clip);
 }
 
-#undef VTX_OUT
-#undef VTX_OUT_FILTER
+#undef VTX_OUT_4
+#undef VTX_OUT_6
 #undef FUNC_NAME
diff --git a/src/radeon_version.h b/src/radeon_version.h
index 5717ead..129046d 100644
--- a/src/radeon_version.h
+++ b/src/radeon_version.h
@@ -38,6 +38,7 @@
 #define RADEON_DRIVER_NAME   "radeon"
 #define R200_DRIVER_NAME     "r200"
 #define R300_DRIVER_NAME     "r300"
+#define R600_DRIVER_NAME     "r600"
 
 #define RADEON_VERSION_MAJOR PACKAGE_VERSION_MAJOR
 #define RADEON_VERSION_MINOR PACKAGE_VERSION_MINOR
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 6314eb1..f1fe72b 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
     memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
     adaptors = newAdaptors;
 
-    if (!IS_AVIVO_VARIANT) {
+    if (!IS_AVIVO_VARIANT && !info->kms_enabled) {
 	overlayAdaptor = RADEONSetupImageVideo(pScreen);
 	if (overlayAdaptor != NULL) {
 	    adaptors[num_adaptors++] = overlayAdaptor;
@@ -541,18 +541,6 @@ static XF86ImageRec Images[NUM_IMAGES] =
 
 #endif
 
-/* Reference color space transform data */
-typedef struct tagREF_TRANSFORM
-{
-    float   RefLuma;
-    float   RefRCb;
-    float   RefRCr;
-    float   RefGCb;
-    float   RefGCr;
-    float   RefBCb;
-    float   RefBCr;
-} REF_TRANSFORM;
-
 /* Parameters for ITU-R BT.601 and ITU-R BT.709 colour spaces */
 static REF_TRANSFORM trans[2] =
 {
@@ -560,7 +548,6 @@ static REF_TRANSFORM trans[2] =
     {1.1678, 0.0, 1.7980, -0.2139, -0.5345, 2.1186, 0.0}  /* BT.709 */
 };
 
-
 /* Gamma curve definition for preset gammas */
 typedef struct tagGAMMA_CURVE_R100
 {
@@ -1661,10 +1648,6 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
 
   if (pPriv->textured) {
       if (cleanup) {
-	  if (pPriv->bicubic_memory != NULL) {
-	      radeon_legacy_free_memory(pScrn, pPriv->bicubic_memory);
-	      pPriv->bicubic_memory = NULL;
-	  }
 	  if (pPriv->video_memory != NULL) {
 	      radeon_legacy_free_memory(pScrn, pPriv->video_memory);
 	      pPriv->video_memory = NULL;
@@ -1717,12 +1700,6 @@ RADEONSetPortAttribute(ScrnInfoPtr  pScrn,
 
     RADEON_SYNC(info, pScrn);
 
-#define RTFSaturation(a)   (1.0 + ((a)*1.0)/1000.0)
-#define RTFBrightness(a)   (((a)*1.0)/2000.0)
-#define RTFIntensity(a)   (((a)*1.0)/2000.0)
-#define RTFContrast(a)   (1.0 + ((a)*1.0)/1000.0)
-#define RTFHue(a)   (((a)*3.1416)/1000.0)
-
     if(attribute == xvAutopaintColorkey)
     {
 	pPriv->autopaint_colorkey = ClipValue (value, 0, 1);
diff --git a/src/radeon_video.h b/src/radeon_video.h
index 4498002..989942c 100644
--- a/src/radeon_video.h
+++ b/src/radeon_video.h
@@ -90,14 +90,10 @@ typedef struct {
    void         *video_memory;
    int           video_offset;
 
-   Bool          planar_hw;
-   Bool          planar_state;
    int           planeu_offset;
    int           planev_offset;
 
    /* bicubic filtering */
-   void         *bicubic_memory;
-   int           bicubic_offset;
    Bool          bicubic_enabled;
    uint32_t      bicubic_src_offset;
    int           bicubic_state;
@@ -120,9 +116,30 @@ typedef struct {
     int src_w, src_h, dst_w, dst_h;
     int w, h;
     int drw_x, drw_y;
+    int src_x, src_y;
     int vsync;
+
+    struct radeon_bo *src_bo;
 } RADEONPortPrivRec, *RADEONPortPrivPtr;
 
+/* Reference color space transform data */
+typedef struct tagREF_TRANSFORM
+{
+    float   RefLuma;
+    float   RefRCb;
+    float   RefRCr;
+    float   RefGCb;
+    float   RefGCr;
+    float   RefBCb;
+    float   RefBCr;
+} REF_TRANSFORM;
+
+#define RTFSaturation(a)   (1.0 + ((a)*1.0)/1000.0)
+#define RTFBrightness(a)   (((a)*1.0)/2000.0)
+#define RTFIntensity(a)   (((a)*1.0)/2000.0)
+#define RTFContrast(a)   (1.0 + ((a)*1.0)/1000.0)
+#define RTFHue(a)   (((a)*3.1416)/1000.0)
+
 xf86CrtcPtr
 radeon_xv_pick_best_crtc(ScrnInfoPtr pScrn,
 			 int x1, int x2, int y1, int y2);



From xhorak at fedoraproject.org  Tue Aug  4 08:21:40 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:21:40 +0000 (UTC)
Subject: rpms/blam/F-10 blam.spec,1.35,1.36
Message-ID: <20090804082140.8AE9A11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	blam.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-13
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-10/blam.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- blam.spec	21 Jul 2009 18:20:38 -0000	1.35
+++ blam.spec	4 Aug 2009 08:21:40 -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.0.12
+%define	gecko_version		1.9.0.13
 
 Name:		blam
 Version:	1.8.5
-Release:	12%{?dist}
+Release:	13%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-13
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-12
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Tue Aug  4 08:21:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:21:59 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested watchbugzilla
Message-ID: <20090804082159.E3FA010F88F@bastion2.fedora.phx.redhat.com>

fujiwara has requested the watchbugzilla acl on ibus-anthy (Fedora devel)

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



From jreznik at fedoraproject.org  Tue Aug  4 08:22:02 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  4 Aug 2009 08:22:02 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.9,
	1.10 kde-plasma-runcommand.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20090804082202.CEF7711C00CE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11467

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
- update to 1.4
- gettext BR removed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Jul 2009 10:21:45 -0000	1.9
+++ .cvsignore	4 Aug 2009 08:22:02 -0000	1.10
@@ -1 +1 @@
-91495-runcommand-1.3.tar.bz2
+91495-runcommand-1.4.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- kde-plasma-runcommand.spec	25 Jul 2009 04:23:39 -0000	1.12
+++ kde-plasma-runcommand.spec	4 Aug 2009 08:22:02 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -12,7 +12,6 @@ Source0:        http://www.kde-look.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
-BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -48,6 +47,10 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
+- update to 1.4
+- gettext BR removed
+
 * 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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Jul 2009 10:21:45 -0000	1.9
+++ sources	4 Aug 2009 08:22:02 -0000	1.10
@@ -1 +1 @@
-bc20897b51c779d62455e5899c6a360e  91495-runcommand-1.3.tar.bz2
+1f483eefe383d88ae646267c94417380  91495-runcommand-1.4.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug  4 08:22:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:22:02 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested watchcommits
Message-ID: <20090804082203.8C19910F8B1@bastion2.fedora.phx.redhat.com>

fujiwara has requested the watchcommits acl on ibus-anthy (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:23:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:23:27 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has given up watchbugzilla
Message-ID: <20090804082328.00EBA10F882@bastion2.fedora.phx.redhat.com>

fujiwara has given up the watchbugzilla acl on ibus-anthy (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 08:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 08:23:28 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has given up watchcommits
Message-ID: <20090804082329.0815910F8A9@bastion2.fedora.phx.redhat.com>

fujiwara has given up the watchcommits acl on ibus-anthy (Fedora devel)

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



From chitlesh at fedoraproject.org  Tue Aug  4 08:23:47 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:23:47 +0000 (UTC)
Subject: rpms/perl-Verilog/F-11 .cvsignore, 1.7, 1.8 import.log, 1.6,
	1.7 perl-Verilog.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090804082347.ED39E11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12644/F-11

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 23:42:25 -0000	1.7
+++ .cvsignore	4 Aug 2009 08:23:47 -0000	1.8
@@ -1 +1 @@
-Verilog-Perl-3.211.tar.gz
+Verilog-Perl-3.212.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	17 Jun 2009 23:42:25 -0000	1.6
+++ import.log	4 Aug 2009 08:23:47 -0000	1.7
@@ -4,3 +4,4 @@ perl-Verilog-3_120-1_fc10:HEAD:perl-Veri
 perl-Verilog-3_121-1_fc10:HEAD:perl-Verilog-3.121-1.fc10.src.rpm:1239210304
 perl-Verilog-3_210-1_fc10:F-11:perl-Verilog-3.210-1.fc10.src.rpm:1242921708
 perl-Verilog-3_211-1_fc11:F-11:perl-Verilog-3.211-1.fc11.src.rpm:1245282108
+perl-Verilog-3_212-1_fc11:F-11:perl-Verilog-3.212-1.fc11.src.rpm:1249373971


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-11/perl-Verilog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Verilog.spec	17 Jun 2009 23:42:25 -0000	1.9
+++ perl-Verilog.spec	4 Aug 2009 08:23:47 -0000	1.10
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.211
+Version:       3.212
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -65,6 +65,9 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
+* Mon Jun 20 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.212-1
+- upstream v3.212
+
 * Thu Jun 18 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.211-1
 - upstream v3.211
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 23:42:25 -0000	1.7
+++ sources	4 Aug 2009 08:23:47 -0000	1.8
@@ -1 +1 @@
-c9a21ce35bc08441982ab43642adf72d  Verilog-Perl-3.211.tar.gz
+5682e42a4904d41206782128b174a7d1  Verilog-Perl-3.212.tar.gz



From chitlesh at fedoraproject.org  Tue Aug  4 08:23:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:23:42 +0000 (UTC)
Subject: rpms/kicad/F-11 import.log, NONE, 1.1 kicad-ld.conf, NONE,
	1.1 .cvsignore, 1.5, 1.6 kicad.spec, 1.16, 1.17 sources, 1.5,
	1.6 kicad-2007.07.09.destdir.locale.rpmoptflags.diff, 1.1,
	NONE kicad.desktop, 1.4, NONE
Message-ID: <20090804082342.55D7811C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore kicad.spec sources 
Added Files:
	import.log kicad-ld.conf 
Removed Files:
	kicad-2007.07.09.destdir.locale.rpmoptflags.diff kicad.desktop 
Log Message:
2009.07.07 release


--- NEW FILE import.log ---
kicad-2009_07_07-3_rev1863_fc12:F-11:kicad-2009.07.07-3.rev1863.fc12.src.rpm:1249373989


--- NEW FILE kicad-ld.conf ---
/usr/lib/kicad


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Oct 2007 13:22:05 -0000	1.5
+++ .cvsignore	4 Aug 2009 08:23:41 -0000	1.6
@@ -1,2 +1,3 @@
-kicad-sources--2007-07-09.zip
-kicad-src-extras-2007-07-09.tar.bz2
+kicad-2009.07.07.tar.bz2
+kicad-doc-2009.07.07.tar.bz2
+kicad-library-2009.07.07.tar.bz2


Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-11/kicad.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kicad.spec	25 Feb 2009 11:17:57 -0000	1.16
+++ kicad.spec	4 Aug 2009 08:23:42 -0000	1.17
@@ -1,22 +1,30 @@
-Name: 		kicad
-Version:	2007.07.09
-Release:	5%{?dist}
-Summary: 	Electronic schematic diagrams and printed circuit board artwork
-Summary(fr): 	Saisie de sch?ma ?lectronique et trac? de circuit imprim?
-
-Group: 		Applications/Engineering
-License: 	GPLv2+
-Url: 		http://www.lis.inpg.fr/realise_au_lis/kicad/
-Source:		ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources--2007-07-09.zip
-Source1:	http://linuxelectronique.free.fr/download/kicad-src-extras-2007-07-09.tar.bz2
-Source2:	%{name}.desktop
-Patch0:		%{name}-%{version}.destdir.locale.rpmoptflags.diff
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           kicad
+Version:        2009.07.07
+Release:        3.rev1863%{?dist}
+Summary:        Electronic schematic diagrams and printed circuit board artwork
+Summary(fr):    Saisie de sch?ma ?lectronique et trac? de circuit imprim?
+
+Group:          Applications/Engineering
+License:        GPLv2+
+URL:            http://www.lis.inpg.fr/realise_au_lis/kicad/
+
+# Source files created from upstream's SVN repository
+Source:         kicad-%{version}.tar.bz2
+Source1:        kicad-doc-%{version}.tar.bz2
+Source2:        kicad-library-%{version}.tar.bz2
+Source3:	kicad-ld.conf
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  wxGTK-devel
+BuildRequires:  boost-devel
+BuildRequires:  cmake
 
-BuildRequires:	desktop-file-utils, wxGTK-devel
+Requires:       electronics-menu
 
 %description
-Kicad is an open source (GPL) software for the creation of electronic schematic
+Kicad is an EDA software to design electronic schematic
 diagrams and printed circuit board artwork up to 16 layers.
 Kicad is a set of four softwares and a project manager:
 - Eeschema: schematic entry
@@ -35,177 +43,210 @@ Kicad est un ensemble de quatres logicie
 - Cvpcb : s?lecteur d'empreintes pour les composants utilis?s dans le circuit
 - Kicad : gestionnaire de projet.
 
-%prep
-%setup -q -n kicad-dev -a 1
-%{__cp} -a kicad-src-extras-2007-07-09/* .
-%{__rm} -rf kicad-src-extras-2007-07-09
-
-# Convert MSDOS EOL to Unix EOL before applying patches
-
-for f in 3d-viewer/{3d_struct.h,3d_viewer.h} \
-eeschema/libcmp.h \
-include/{pcbstruct.h,wxstruct.h} \
-kicad/kicad.h \
-pcbnew/{autorout.h,class_cotation.h,class_equipot.h,class_mire.h,class_module.h,class_pcb_text.h,class_text_mod.h,class_track.h,track.cpp}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-%patch0 -p1
+%package        doc
+Summary:        Documentations for kicad
+Group:          Applications/Engineering
+License:        GPLv2+
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+
+%description    doc
+Documentations and tutorials for kicad in English
+
+
+%package        doc-de
+Summary:        Documentation for Kicad in German
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-de
+Documentation and tutorials for Kicad in German
+
+
+%package        doc-es
+Summary:        Documentation for Kicad in Spanish
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-es
+Documentation and tutorials for Kicad in Spanish
+
+
+%package        doc-fr
+Summary:        Documentation for Kicad in French
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-fr
+Documentation and tutorials for Kicad in French
+
+
+%package        doc-hu
+Summary:        Documentation for Kicad in Hungarian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-hu
+Documentation and tutorials for Kicad in Hungarian
+
+
+%package        doc-it
+Summary:        Documentation for Kicad in Italian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-it
+Documentation and tutorials for Kicad in Italian
+
+
+%package        doc-pt
+Summary:        Documentation for Kicad in Portuguese
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-pt
+Documentation and tutorials for Kicad in Portuguese
+
+
+%package        doc-ru
+Summary:        Documentation for Kicad in Russian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-ru
+Documentation and tutorials for Kicad in Russian
+
+
+%package        doc-zh_CN
+Summary:        Documentation for Kicad in Chinese
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
 
-%build
+%description    doc-zh_CN
+Documentation and tutorials for Kicad in Chinese
 
-# These files are not scripts
-for f in {copyright,gpl,licendoc,version}.txt
-do
-  %{__chmod} -x $f
-done
 
-# Convert MSDOS EOL to Unix EOL
-for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+%prep
+%setup -q -a 1 -a 2
 
-for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+#kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt
+iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt
 
-for f in help/en/{contents.hhc,kicad.hhp,cvpcb/cvpcb-en.html,eeschema/eeschema.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-for f in help/es/{contents.hhc,kicad.hhp,cvpcb/cvpcb-es.html,eeschema/eeschema-es.html,file_formats/file_formats-es.html,gerbview/gerbview.html,kicad/kicad-es.html,pcbnew/pcbnew-es.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+#multilibs
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
+%endif
 
-for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-for f in help/ru/{contents.hhc,kicad.hhp,eeschema/eeschema_ru.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+%build
 
-make -f makefile.gtk %{?_smp_mflags}
+#
+# Symbols libraries
+#
+pushd %{name}-library-%{version}/
+%cmake -DCMAKE_BUILD_TYPE=Release .
+%{__make} %{?_smp_mflags} VERBOSE=1
+popd
 
-%install
-%{__rm} -rf %{buildroot}
 
-install -d %{buildroot}%{_datadir}
-install -d %{buildroot}%{_datadir}/%{name}
+#
+# Core components
+#
+%cmake -DCMAKE_BUILD_TYPE=Release
+%{__make} %{?_smp_mflags} VERBOSE=1
 
-# install demos files
-install -d %{buildroot}%{_datadir}/%{name}/demos
-for dir in electric interf_u microwave pic_programmer pspice sonde_xilinx test_xil_95108 video
-do
-  install -d %{buildroot}%{_datadir}/%{name}/demos/${dir}
-  for f in demos/${dir}/*
-  do
-    install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-  done
-done
 
-# install help files
-install -d %{buildroot}%%{_docdir}
-install -d %{buildroot}%{_docdir}/%{name}/
-for dir in en es fr pt
-do
-  install -d %{buildroot}%{_docdir}/%{name}/${dir}
-  for subdir in cvpcb eeschema file_formats gerbview kicad pcbnew
-  do
-    install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
-    cd help
-    install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
-    install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
-    for f in ${dir}/${subdir}/*
-    do
-      install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
-    done
-    cd ..
-  done
-done
+%install
+%{__rm} -rf %{buildroot}
 
-# install ru help files
-install -d %{buildroot}%%{_docdir}
-install -d %{buildroot}%{_docdir}/%{name}/
-for dir in ru
-do
-  install -d %{buildroot}%{_docdir}/%{name}/${dir}
-  for subdir in eeschema pcbnew
-  do
-    install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
-    cd help
-    install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
-    install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
-    for f in ${dir}/${subdir}/*
-    do
-      install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
-    done
-    cd ..
-  done
-done
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-# install librairies
-install -d %{buildroot}%{_datadir}/%{name}/library
-for f in library/*
-do
-  install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-done
 
 # install localization
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/internat/
 install -d %{buildroot}%{_datadir}/locale
-cd locale
-for dir in de es fr hu it ko pl pt sl
+cd internat
+for dir in ca cs de es fr hu it ko nl pl pt ru sl sv zh_CN
 do
   install -d %{buildroot}%{_datadir}/locale/${dir}
   install -m 644 ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
 done
 cd ..
 
-# install modules
-install -d %{buildroot}%{_datadir}/%{name}/modules
-install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d
-for dir in conn_DBxx connectors conn_europe device dil discret divers pga pin_array smd support
-do
-  install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d/${dir}
-  for f in modules/packages3d/${dir}/*
-  do
-    install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-  done
-done
-for f in modules/*.*
-do
-  install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-done
 
+# install desktop
+desktop-file-install --vendor=fedora         \
+  --dir %{buildroot}%{_datadir}/applications \
+  --remove-category Development		     \
+  --delete-original                          \
+  %{buildroot}%{_datadir}/applications/kicad.desktop
+rm -f %{buildroot}%{_datadir}/applications/eeschema.desktop
+
+# Missing requires libraries
+%{__cp} -p ./3d-viewer/lib3d-viewer.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./bitmaps/libbitmaps.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./common/libcommon.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./polygon/kbool/src/libkbool.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./common/libpcbcommon.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./polygon/libpolygon.so %{buildroot}%{_libdir}/%{name}
+
+#
+# Symbols libraries
+#
+pushd %{name}-library-%{version}/
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
+popd
+
+# install ld.conf
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/ld.so.conf.d/kicad.conf
 
 # install template
 install -d %{buildroot}%{_datadir}/%{name}/template
 install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
 
-# install binaries
-install -d %{buildroot}%{_bindir}
-install -d %{buildroot}%{_libdir}/%{name}/plugins
-make -f makefile.gtk install DESTDIR=%{buildroot}
 
-# install desktop
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor=fedora \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE2}
+# Preparing for documentation pull-ups
+%{__rm} -f  %{name}-doc-%{version}/doc/help/CMakeLists.txt
+%{__rm} -f  %{name}-doc-%{version}/doc/help/makefile
+%{__rm} -f  %{name}-doc-%{version}/doc/tutorials/CMakeLists.txt
+
+%{__cp} -pr %{name}-doc-%{version}/doc/* %{buildroot}%{_docdir}/%{name}
+%{__cp} -pr AUTHORS.txt CHANGELOG* TODO.txt version.txt %{buildroot}%{_docdir}/%{name}
 
-# install icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -m 644 kicad_icon.png %{buildroot}%{_datadir}/pixmaps/kicad_icon.png
 
 %find_lang %{name}
 
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -214,6 +255,8 @@ then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+/sbin/ldconfig
+
 %postun
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -222,22 +265,96 @@ then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+/sbin/ldconfig
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt
-%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt
+%doc %{_docdir}/%{name}/help/en/kicad.pdf
 %{_bindir}/*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/plugins/
+%{_libdir}/%{name}
 %{_datadir}/%{name}/
-%{_docdir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/kicad_icon.png
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kicad-project.*
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mimelnk/application/x-%{name}-*.desktop
+%{_sysconfdir}/ld.so.conf.d/kicad.conf
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/help/
+%dir %{_docdir}/%{name}/tutorials
+%doc %{_docdir}/%{name}/*.txt
+%doc %{_docdir}/%{name}/scripts
+%doc %{_docdir}/%{name}/contrib
+%doc %{_docdir}/%{name}/help/en/docs_src/
+%doc %{_docdir}/%{name}/help/en/cvpcb.pdf
+%doc %{_docdir}/%{name}/help/en/eeschema.pdf
+%doc %{_docdir}/%{name}/help/en/gerbview.pdf
+%doc %{_docdir}/%{name}/help/en/pcbnew.pdf
+%doc %{_docdir}/%{name}/help/file_formats
+%doc %{_docdir}/%{name}/tutorials/en
+
+%files doc-de
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/de
+%doc %{_docdir}/%{name}/tutorials/de
+
+%files doc-es
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/es
+%doc %{_docdir}/%{name}/tutorials/es
+
+%files doc-fr
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/fr
+%doc %{_docdir}/%{name}/tutorials/fr
+
+%files doc-hu
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/tutorials/hu
+
+%files doc-it
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/it
+
+%files doc-pt
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/pt
+
+
+%files doc-ru
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/ru
+%doc %{_docdir}/%{name}/tutorials/ru
+
+%files doc-zh_CN
+%defattr(-,root,root,-)
+#%doc %{_docdir}/%{name}/help/zh_CN
+%doc %{_docdir}/%{name}/tutorials/zh_CN
+
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009.07.07-3.rev1863
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 08 2009 Jon Ciesla <limb at jcomserv.net> - 2009.07.07-2.rev1863
+- Dropped eeschema desktop file.
+- Moved English kicad.pdf to main rpm.
+- Added ls.so.conf file and ldconfig to post, postun to fix libs issue.
+- Dropped category Development from desktop file.
+
+* Tue Jul 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2009.07.07-1.rev1863
+- svn rev 1863
+- documentation splitted into multiple packages
+- libraries are now taken directly from SVN rather than from older releases
+- build changed to cmake based
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007.07.09-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Oct 2007 13:22:05 -0000	1.5
+++ sources	4 Aug 2009 08:23:42 -0000	1.6
@@ -1,2 +1,3 @@
-bf9aaf5a85851fe5250d6c53f4b4c6be  kicad-sources--2007-07-09.zip
-02389cd2983c834c8a4a5a1420513be8  kicad-src-extras-2007-07-09.tar.bz2
+b7df0a960ff269205038b99131bfdbc0  kicad-2009.07.07.tar.bz2
+396786f9595a8fe90479d764492a7726  kicad-doc-2009.07.07.tar.bz2
+43a40c3f52cd74632eb31540e95952a8  kicad-library-2009.07.07.tar.bz2


--- kicad-2007.07.09.destdir.locale.rpmoptflags.diff DELETED ---


--- kicad.desktop DELETED ---



From xhorak at fedoraproject.org  Tue Aug  4 08:25:07 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:25:07 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 evolution-rss.spec,1.28,1.29
Message-ID: <20090804082507.5D1D111C00CE@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-serv13222

Modified Files:
	evolution-rss.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.1.2-9
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- evolution-rss.spec	21 Jul 2009 18:25:10 -0000	1.28
+++ evolution-rss.spec	4 Aug 2009 08:25:07 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.2
-Release: 8%{?dist}
+Release: 9%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.1.2-9
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.1.2-8
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:26:20 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:26:20 +0000 (UTC)
Subject: rpms/galeon/F-10 galeon.spec,1.65,1.66
Message-ID: <20090804082620.51CF011C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	galeon.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-13
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-10/galeon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- galeon.spec	21 Jul 2009 18:26:34 -0000	1.65
+++ galeon.spec	4 Aug 2009 08:26:20 -0000	1.66
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	12%{?dist}
+Release:	13%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -123,6 +123,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-13
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-12
 - Rebuild against newer gecko
 



From chitlesh at fedoraproject.org  Tue Aug  4 08:26:20 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:26:20 +0000 (UTC)
Subject: rpms/perl-Verilog/devel .cvsignore, 1.7, 1.8 import.log, 1.6,
	1.7 perl-Verilog.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090804082620.E1C2811C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13808/devel

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 23:43:46 -0000	1.7
+++ .cvsignore	4 Aug 2009 08:26:20 -0000	1.8
@@ -1 +1 @@
-Verilog-Perl-3.211.tar.gz
+Verilog-Perl-3.212.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	17 Jun 2009 23:43:46 -0000	1.6
+++ import.log	4 Aug 2009 08:26:20 -0000	1.7
@@ -4,3 +4,4 @@ perl-Verilog-3_120-1_fc10:HEAD:perl-Veri
 perl-Verilog-3_121-1_fc10:HEAD:perl-Verilog-3.121-1.fc10.src.rpm:1239210304
 perl-Verilog-3_210-1_fc10:HEAD:perl-Verilog-3.210-1.fc10.src.rpm:1242921837
 perl-Verilog-3_211-1_fc11:HEAD:perl-Verilog-3.211-1.fc11.src.rpm:1245282191
+perl-Verilog-3_212-1_fc11:HEAD:perl-Verilog-3.212-1.fc11.src.rpm:1249374251


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Verilog.spec	26 Jul 2009 17:25:49 -0000	1.10
+++ perl-Verilog.spec	4 Aug 2009 08:26:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:          perl-Verilog
-Version:       3.211
-Release:       2%{?dist}
+Version:       3.212
+Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
 License:       LGPL+ or Artistic
@@ -65,8 +65,8 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.211-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Jun 20 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.212-1
+- upstream v3.212
 
 * Thu Jun 18 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.211-1
 - upstream v3.211


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 23:43:46 -0000	1.7
+++ sources	4 Aug 2009 08:26:20 -0000	1.8
@@ -1 +1 @@
-c9a21ce35bc08441982ab43642adf72d  Verilog-Perl-3.211.tar.gz
+5682e42a4904d41206782128b174a7d1  Verilog-Perl-3.212.tar.gz



From chitlesh at fedoraproject.org  Tue Aug  4 08:26:22 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:26:22 +0000 (UTC)
Subject: rpms/toped/F-10 .cvsignore, 1.6, 1.7 import.log, 1.3, 1.4 sources,
	1.6, 1.7 toped.spec, 1.13, 1.14
Message-ID: <20090804082622.BDCD211C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Nov 2008 17:01:50 -0000	1.6
+++ .cvsignore	4 Aug 2009 08:26:22 -0000	1.7
@@ -1 +1 @@
-toped-0.9.2.tar.bz2
+toped-0.9.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Nov 2008 17:46:42 -0000	1.3
+++ import.log	4 Aug 2009 08:26:22 -0000	1.4
@@ -1,3 +1,4 @@
 toped-0_9_0-2_fc9:HEAD:toped-0.9.0-2.fc9.src.rpm:1217148340
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Nov 2008 17:01:50 -0000	1.6
+++ sources	4 Aug 2009 08:26:22 -0000	1.7
@@ -1 +1 @@
-3e1b982099db4aa7e8e367259db22943  toped-0.9.2.tar.bz2
+58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/toped.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- toped.spec	10 Nov 2008 17:46:42 -0000	1.13
+++ toped.spec	4 Aug 2009 08:26:22 -0000	1.14
@@ -1,6 +1,7 @@
 Name:           toped
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.4
+Release:        1%{?dist} 
+#RELEASE_0.94_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -11,32 +12,35 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  wxGTK-devel
+BuildRequires:  glew-devel
+BuildRequires:  byacc
+BuildRequires:  libtool
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
 
 %description
-Toped is an open source cross-platform IC layout editor,
-based on openGL and wxWidgets.
+Toped is a layout editor with CIF and GDSII export capabilities.
 
 Toped is listed among Fedora Electronic Lab packages.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 # instead of exporting the variable $TPD_GLOBAL
 sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
 sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
 
+%{__make} -f Makefile.cvs
 %build
 
-%configure         \
-   --with-gtk      \
-   --with-opengl   \
-   --disable-rpath \
-   --enable-threads
+%configure
 
 # Remove rpath from libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -54,12 +58,12 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__rm} -f %{buildroot}%{_libdir}/libtpd*.{a,la}
 
-desktop-file-install --vendor fedora             \
-  --add-category "Electronics"                   \
-  --delete-original                              \
-  --remove-category "Science"                    \
-  --remove-category "Education"                  \
-  --dir %{buildroot}%{_datadir}/applications/    \
+desktop-file-install --vendor ""              \
+  --add-category "Electronics"                \
+  --delete-original                           \
+  --remove-category "Science"                 \
+  --remove-category "Education"               \
+  --dir %{buildroot}%{_datadir}/applications/ \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
@@ -76,9 +80,6 @@ desktop-file-install --vendor fedora    
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
 
-#spurious-executable-perm
-chmod 0644 COPYING
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -100,12 +101,23 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/%{name}
 %{_libdir}/libtpd*.so*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
 %Changelog
-* Mon Nov 10 2008 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.2-2
+* Tue Aug 04 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-1
+- 0.9.4 final release
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.2.rc1
+- Testing for upstream D-1 for 0.94 release - svn rev 1161
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.1.rc1
+- 0.9.4 release candidate 1
+
+* Tue Mar 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.2-4
+- bug fix for cif and gdsII import and export
+
 - disabling rpath
 - fixing rpmlint warning: unused-direct-shlib-dependencies
 - fixed multiple menu entries



From chitlesh at fedoraproject.org  Tue Aug  4 08:26:37 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:26:37 +0000 (UTC)
Subject: rpms/kicad/F-10 import.log, NONE, 1.1 kicad-ld.conf, NONE,
	1.1 .cvsignore, 1.5, 1.6 kicad.spec, 1.15, 1.16 sources, 1.5,
	1.6 kicad-2007.07.09.destdir.locale.rpmoptflags.diff, 1.1,
	NONE kicad.desktop, 1.4, NONE
Message-ID: <20090804082637.E2FB311C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore kicad.spec sources 
Added Files:
	import.log kicad-ld.conf 
Removed Files:
	kicad-2007.07.09.destdir.locale.rpmoptflags.diff kicad.desktop 
Log Message:
2009.07.07 release


--- NEW FILE import.log ---
kicad-2009_07_07-3_rev1863_fc12:F-10:kicad-2009.07.07-3.rev1863.fc12.src.rpm:1249374296


--- NEW FILE kicad-ld.conf ---
/usr/lib/kicad


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Oct 2007 13:22:05 -0000	1.5
+++ .cvsignore	4 Aug 2009 08:26:37 -0000	1.6
@@ -1,2 +1,3 @@
-kicad-sources--2007-07-09.zip
-kicad-src-extras-2007-07-09.tar.bz2
+kicad-2009.07.07.tar.bz2
+kicad-doc-2009.07.07.tar.bz2
+kicad-library-2009.07.07.tar.bz2


Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-10/kicad.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kicad.spec	28 Aug 2008 23:44:57 -0000	1.15
+++ kicad.spec	4 Aug 2009 08:26:37 -0000	1.16
@@ -1,22 +1,30 @@
-Name: 		kicad
-Version:	2007.07.09
-Release:	4%{?dist}
-Summary: 	Electronic schematic diagrams and printed circuit board artwork
-Summary(fr): 	Saisie de sch?ma ?lectronique et trac? de circuit imprim?
-
-Group: 		Applications/Engineering
-License: 	GPLv2+
-Url: 		http://www.lis.inpg.fr/realise_au_lis/kicad/
-Source:		ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources--2007-07-09.zip
-Source1:	http://linuxelectronique.free.fr/download/kicad-src-extras-2007-07-09.tar.bz2
-Source2:	%{name}.desktop
-Patch0:		%{name}-%{version}.destdir.locale.rpmoptflags.diff
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           kicad
+Version:        2009.07.07
+Release:        3.rev1863%{?dist}
+Summary:        Electronic schematic diagrams and printed circuit board artwork
+Summary(fr):    Saisie de sch?ma ?lectronique et trac? de circuit imprim?
+
+Group:          Applications/Engineering
+License:        GPLv2+
+URL:            http://www.lis.inpg.fr/realise_au_lis/kicad/
+
+# Source files created from upstream's SVN repository
+Source:         kicad-%{version}.tar.bz2
+Source1:        kicad-doc-%{version}.tar.bz2
+Source2:        kicad-library-%{version}.tar.bz2
+Source3:	kicad-ld.conf
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  wxGTK-devel
+BuildRequires:  boost-devel
+BuildRequires:  cmake
 
-BuildRequires:	desktop-file-utils, wxGTK-devel
+Requires:       electronics-menu
 
 %description
-Kicad is an open source (GPL) software for the creation of electronic schematic
+Kicad is an EDA software to design electronic schematic
 diagrams and printed circuit board artwork up to 16 layers.
 Kicad is a set of four softwares and a project manager:
 - Eeschema: schematic entry
@@ -35,177 +43,210 @@ Kicad est un ensemble de quatres logicie
 - Cvpcb : s?lecteur d'empreintes pour les composants utilis?s dans le circuit
 - Kicad : gestionnaire de projet.
 
-%prep
-%setup -q -n kicad-dev -a 1
-%{__cp} -a kicad-src-extras-2007-07-09/* .
-%{__rm} -rf kicad-src-extras-2007-07-09
-
-# Convert MSDOS EOL to Unix EOL before applying patches
-
-for f in 3d-viewer/{3d_struct.h,3d_viewer.h} \
-eeschema/libcmp.h \
-include/{pcbstruct.h,wxstruct.h} \
-kicad/kicad.h \
-pcbnew/{autorout.h,class_cotation.h,class_equipot.h,class_mire.h,class_module.h,class_pcb_text.h,class_text_mod.h,class_track.h,track.cpp}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-%patch0 -p1
+%package        doc
+Summary:        Documentations for kicad
+Group:          Applications/Engineering
+License:        GPLv2+
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+
+%description    doc
+Documentations and tutorials for kicad in English
+
+
+%package        doc-de
+Summary:        Documentation for Kicad in German
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-de
+Documentation and tutorials for Kicad in German
+
+
+%package        doc-es
+Summary:        Documentation for Kicad in Spanish
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-es
+Documentation and tutorials for Kicad in Spanish
+
+
+%package        doc-fr
+Summary:        Documentation for Kicad in French
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-fr
+Documentation and tutorials for Kicad in French
+
+
+%package        doc-hu
+Summary:        Documentation for Kicad in Hungarian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-hu
+Documentation and tutorials for Kicad in Hungarian
+
+
+%package        doc-it
+Summary:        Documentation for Kicad in Italian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-it
+Documentation and tutorials for Kicad in Italian
+
+
+%package        doc-pt
+Summary:        Documentation for Kicad in Portuguese
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-pt
+Documentation and tutorials for Kicad in Portuguese
+
+
+%package        doc-ru
+Summary:        Documentation for Kicad in Russian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-ru
+Documentation and tutorials for Kicad in Russian
+
+
+%package        doc-zh_CN
+Summary:        Documentation for Kicad in Chinese
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
 
-%build
+%description    doc-zh_CN
+Documentation and tutorials for Kicad in Chinese
 
-# These files are not scripts
-for f in {copyright,gpl,licendoc,version}.txt
-do
-  %{__chmod} -x $f
-done
 
-# Convert MSDOS EOL to Unix EOL
-for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+%prep
+%setup -q -a 1 -a 2
 
-for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+#kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt
+iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt
 
-for f in help/en/{contents.hhc,kicad.hhp,cvpcb/cvpcb-en.html,eeschema/eeschema.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-for f in help/es/{contents.hhc,kicad.hhp,cvpcb/cvpcb-es.html,eeschema/eeschema-es.html,file_formats/file_formats-es.html,gerbview/gerbview.html,kicad/kicad-es.html,pcbnew/pcbnew-es.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+#multilibs
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
+%endif
 
-for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-for f in help/ru/{contents.hhc,kicad.hhp,eeschema/eeschema_ru.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+%build
 
-make -f makefile.gtk %{?_smp_mflags}
+#
+# Symbols libraries
+#
+pushd %{name}-library-%{version}/
+%cmake -DCMAKE_BUILD_TYPE=Release .
+%{__make} %{?_smp_mflags} VERBOSE=1
+popd
 
-%install
-%{__rm} -rf %{buildroot}
 
-install -d %{buildroot}%{_datadir}
-install -d %{buildroot}%{_datadir}/%{name}
+#
+# Core components
+#
+%cmake -DCMAKE_BUILD_TYPE=Release
+%{__make} %{?_smp_mflags} VERBOSE=1
 
-# install demos files
-install -d %{buildroot}%{_datadir}/%{name}/demos
-for dir in electric interf_u microwave pic_programmer pspice sonde_xilinx test_xil_95108 video
-do
-  install -d %{buildroot}%{_datadir}/%{name}/demos/${dir}
-  for f in demos/${dir}/*
-  do
-    install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-  done
-done
 
-# install help files
-install -d %{buildroot}%%{_docdir}
-install -d %{buildroot}%{_docdir}/%{name}/
-for dir in en es fr pt
-do
-  install -d %{buildroot}%{_docdir}/%{name}/${dir}
-  for subdir in cvpcb eeschema file_formats gerbview kicad pcbnew
-  do
-    install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
-    cd help
-    install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
-    install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
-    for f in ${dir}/${subdir}/*
-    do
-      install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
-    done
-    cd ..
-  done
-done
+%install
+%{__rm} -rf %{buildroot}
 
-# install ru help files
-install -d %{buildroot}%%{_docdir}
-install -d %{buildroot}%{_docdir}/%{name}/
-for dir in ru
-do
-  install -d %{buildroot}%{_docdir}/%{name}/${dir}
-  for subdir in eeschema pcbnew
-  do
-    install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
-    cd help
-    install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
-    install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
-    for f in ${dir}/${subdir}/*
-    do
-      install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
-    done
-    cd ..
-  done
-done
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-# install librairies
-install -d %{buildroot}%{_datadir}/%{name}/library
-for f in library/*
-do
-  install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-done
 
 # install localization
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/internat/
 install -d %{buildroot}%{_datadir}/locale
-cd locale
-for dir in de es fr hu it ko pl pt sl
+cd internat
+for dir in ca cs de es fr hu it ko nl pl pt ru sl sv zh_CN
 do
   install -d %{buildroot}%{_datadir}/locale/${dir}
   install -m 644 ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
 done
 cd ..
 
-# install modules
-install -d %{buildroot}%{_datadir}/%{name}/modules
-install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d
-for dir in conn_DBxx connectors conn_europe device dil discret divers pga pin_array smd support
-do
-  install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d/${dir}
-  for f in modules/packages3d/${dir}/*
-  do
-    install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-  done
-done
-for f in modules/*.*
-do
-  install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-done
 
+# install desktop
+desktop-file-install --vendor=fedora         \
+  --dir %{buildroot}%{_datadir}/applications \
+  --remove-category Development		     \
+  --delete-original                          \
+  %{buildroot}%{_datadir}/applications/kicad.desktop
+rm -f %{buildroot}%{_datadir}/applications/eeschema.desktop
+
+# Missing requires libraries
+%{__cp} -p ./3d-viewer/lib3d-viewer.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./bitmaps/libbitmaps.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./common/libcommon.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./polygon/kbool/src/libkbool.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./common/libpcbcommon.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./polygon/libpolygon.so %{buildroot}%{_libdir}/%{name}
+
+#
+# Symbols libraries
+#
+pushd %{name}-library-%{version}/
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
+popd
+
+# install ld.conf
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/ld.so.conf.d/kicad.conf
 
 # install template
 install -d %{buildroot}%{_datadir}/%{name}/template
 install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
 
-# install binaries
-install -d %{buildroot}%{_bindir}
-install -d %{buildroot}%{_libdir}/%{name}/plugins
-make -f makefile.gtk install DESTDIR=%{buildroot}
 
-# install desktop
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor=fedora \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE2}
+# Preparing for documentation pull-ups
+%{__rm} -f  %{name}-doc-%{version}/doc/help/CMakeLists.txt
+%{__rm} -f  %{name}-doc-%{version}/doc/help/makefile
+%{__rm} -f  %{name}-doc-%{version}/doc/tutorials/CMakeLists.txt
+
+%{__cp} -pr %{name}-doc-%{version}/doc/* %{buildroot}%{_docdir}/%{name}
+%{__cp} -pr AUTHORS.txt CHANGELOG* TODO.txt version.txt %{buildroot}%{_docdir}/%{name}
 
-# install icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -m 644 kicad_icon.png %{buildroot}%{_datadir}/pixmaps/kicad_icon.png
 
 %find_lang %{name}
 
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -214,6 +255,8 @@ then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+/sbin/ldconfig
+
 %postun
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -222,22 +265,99 @@ then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+/sbin/ldconfig
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt
-%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt
+%doc %{_docdir}/%{name}/help/en/kicad.pdf
 %{_bindir}/*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/plugins/
+%{_libdir}/%{name}
 %{_datadir}/%{name}/
-%{_docdir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/kicad_icon.png
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kicad-project.*
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mimelnk/application/x-%{name}-*.desktop
+%{_sysconfdir}/ld.so.conf.d/kicad.conf
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/help/
+%dir %{_docdir}/%{name}/tutorials
+%doc %{_docdir}/%{name}/*.txt
+%doc %{_docdir}/%{name}/scripts
+%doc %{_docdir}/%{name}/contrib
+%doc %{_docdir}/%{name}/help/en/docs_src/
+%doc %{_docdir}/%{name}/help/en/cvpcb.pdf
+%doc %{_docdir}/%{name}/help/en/eeschema.pdf
+%doc %{_docdir}/%{name}/help/en/gerbview.pdf
+%doc %{_docdir}/%{name}/help/en/pcbnew.pdf
+%doc %{_docdir}/%{name}/help/file_formats
+%doc %{_docdir}/%{name}/tutorials/en
+
+%files doc-de
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/de
+%doc %{_docdir}/%{name}/tutorials/de
+
+%files doc-es
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/es
+%doc %{_docdir}/%{name}/tutorials/es
+
+%files doc-fr
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/fr
+%doc %{_docdir}/%{name}/tutorials/fr
+
+%files doc-hu
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/tutorials/hu
+
+%files doc-it
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/it
+
+%files doc-pt
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/pt
+
+
+%files doc-ru
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/ru
+%doc %{_docdir}/%{name}/tutorials/ru
+
+%files doc-zh_CN
+%defattr(-,root,root,-)
+#%doc %{_docdir}/%{name}/help/zh_CN
+%doc %{_docdir}/%{name}/tutorials/zh_CN
+
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009.07.07-3.rev1863
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 08 2009 Jon Ciesla <limb at jcomserv.net> - 2009.07.07-2.rev1863
+- Dropped eeschema desktop file.
+- Moved English kicad.pdf to main rpm.
+- Added ls.so.conf file and ldconfig to post, postun to fix libs issue.
+- Dropped category Development from desktop file.
+
+* Tue Jul 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2009.07.07-1.rev1863
+- svn rev 1863
+- documentation splitted into multiple packages
+- libraries are now taken directly from SVN rather than from older releases
+- build changed to cmake based
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007.07.09-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2007.07.09-4
 - First patch is Patch0 - should fix build in Rawhide.
 - Include %%_libdir/kicad directory.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Oct 2007 13:22:05 -0000	1.5
+++ sources	4 Aug 2009 08:26:37 -0000	1.6
@@ -1,2 +1,3 @@
-bf9aaf5a85851fe5250d6c53f4b4c6be  kicad-sources--2007-07-09.zip
-02389cd2983c834c8a4a5a1420513be8  kicad-src-extras-2007-07-09.tar.bz2
+b7df0a960ff269205038b99131bfdbc0  kicad-2009.07.07.tar.bz2
+396786f9595a8fe90479d764492a7726  kicad-doc-2009.07.07.tar.bz2
+43a40c3f52cd74632eb31540e95952a8  kicad-library-2009.07.07.tar.bz2


--- kicad-2007.07.09.destdir.locale.rpmoptflags.diff DELETED ---


--- kicad.desktop DELETED ---



From xhorak at fedoraproject.org  Tue Aug  4 08:27:19 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:27:19 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-10 gecko-sharp2.spec,1.36,1.37
Message-ID: <20090804082719.38A2511C00CE@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-serv14388

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.13-11
- Rebuild against newer gecko



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/F-10/gecko-sharp2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gecko-sharp2.spec	21 Jul 2009 18:28:44 -0000	1.36
+++ gecko-sharp2.spec	4 Aug 2009 08:27:18 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.13-11
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.13-10
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:27:59 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:27:59 +0000 (UTC)
Subject: rpms/firefox/F-10 sources,1.118,1.119
Message-ID: <20090804082759.C02E511C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	sources 
Log Message:
Fix build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	3 Aug 2009 22:10:20 -0000	1.118
+++ sources	4 Aug 2009 08:27:59 -0000	1.119
@@ -1,2 +1,2 @@
-eb2e69872ef6932de0ee98b102eb1d5b  firefox-3.0.13-source.tar.bz2
 a83ef3e4f8807f19a04a18469ac1238a  firefox-langpacks-3.0.13-20090731.tar.bz2
+040d01a1e22a1ec1b28188479df06007  firefox-3.0.13-source.tar.bz2



From chitlesh at fedoraproject.org  Tue Aug  4 08:28:35 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:28:35 +0000 (UTC)
Subject: rpms/toped/F-11 .cvsignore, 1.7, 1.8 import.log, 1.4, 1.5 sources,
	1.7, 1.8 toped.spec, 1.15, 1.16
Message-ID: <20090804082835.1031B11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Mar 2009 17:03:53 -0000	1.7
+++ .cvsignore	4 Aug 2009 08:28:34 -0000	1.8
@@ -1 +1 @@
-toped.tar.bz2
+toped-0.9.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	29 Mar 2009 17:03:53 -0000	1.4
+++ import.log	4 Aug 2009 08:28:34 -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:HEAD:toped-0.9.2-1.fc9.src.rpm:1226336637
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Mar 2009 17:03:53 -0000	1.7
+++ sources	4 Aug 2009 08:28:34 -0000	1.8
@@ -1 +1 @@
-596dce3196148d07e29ccaabb7941df3  toped.tar.bz2
+58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/toped.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- toped.spec	29 Mar 2009 17:03:53 -0000	1.15
+++ toped.spec	4 Aug 2009 08:28:34 -0000	1.16
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.2
-Release:        4%{?dist} 
-#RELEASE_0.92_CAND
+Version:        0.9.4
+Release:        1%{?dist} 
+#RELEASE_0.94_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -10,8 +10,7 @@ URL:            http://www.toped.org.uk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
-Source0:        %{name}.tar.bz2
+Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +20,7 @@ BuildRequires:  byacc
 BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
@@ -58,12 +58,12 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__rm} -f %{buildroot}%{_libdir}/libtpd*.{a,la}
 
-desktop-file-install --vendor fedora             \
-  --add-category "Electronics"                   \
-  --delete-original                              \
-  --remove-category "Science"                    \
-  --remove-category "Education"                  \
-  --dir %{buildroot}%{_datadir}/applications/    \
+desktop-file-install --vendor ""              \
+  --add-category "Electronics"                \
+  --delete-original                           \
+  --remove-category "Science"                 \
+  --remove-category "Education"               \
+  --dir %{buildroot}%{_datadir}/applications/ \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
@@ -80,9 +80,6 @@ desktop-file-install --vendor fedora    
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
 
-#spurious-executable-perm
-chmod 0644 COPYING
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -104,11 +101,20 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/%{name}
 %{_libdir}/libtpd*.so*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
 %Changelog
+* Tue Aug 04 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-1
+- 0.9.4 final release
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.2.rc1
+- Testing for upstream D-1 for 0.94 release - svn rev 1161
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.1.rc1
+- 0.9.4 release candidate 1
+
 * Tue Mar 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.2-4
 - bug fix for cif and gdsII import and export
 



From chitlesh at fedoraproject.org  Tue Aug  4 08:28:45 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:28:45 +0000 (UTC)
Subject: rpms/perl-Verilog/EL-5 .cvsignore, 1.6, 1.7 import.log, 1.5,
	1.6 perl-Verilog.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090804082845.EAAC811C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Jun 2009 23:46:06 -0000	1.6
+++ .cvsignore	4 Aug 2009 08:28:45 -0000	1.7
@@ -1 +1 @@
-Verilog-Perl-3.211.tar.gz
+Verilog-Perl-3.212.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	17 Jun 2009 23:46:06 -0000	1.5
+++ import.log	4 Aug 2009 08:28:45 -0000	1.6
@@ -3,3 +3,4 @@ perl-Verilog-3_120-1_fc10:EL-5:perl-Veri
 perl-Verilog-3_121-1_fc10:EL-5:perl-Verilog-3.121-1.fc10.src.rpm:1239210507
 perl-Verilog-3_210-1_fc10:EL-5:perl-Verilog-3.210-1.fc10.src.rpm:1242922045
 perl-Verilog-3_211-1_fc11:EL-5:perl-Verilog-3.211-1.fc11.src.rpm:1245282313
+perl-Verilog-3_212-1_fc11:EL-5:perl-Verilog-3.212-1.fc11.src.rpm:1249374405


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/perl-Verilog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Verilog.spec	17 Jun 2009 23:46:06 -0000	1.5
+++ perl-Verilog.spec	4 Aug 2009 08:28:45 -0000	1.6
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.211
+Version:       3.212
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -65,6 +65,9 @@ find %{buildroot} -depth -type d -exec r
 
 
 %changelog
+* Mon Jun 20 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.212-1
+- upstream v3.212
+
 * Thu Jun 18 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.211-1
 - upstream v3.211
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Jun 2009 23:46:06 -0000	1.6
+++ sources	4 Aug 2009 08:28:45 -0000	1.7
@@ -1 +1 @@
-c9a21ce35bc08441982ab43642adf72d  Verilog-Perl-3.211.tar.gz
+5682e42a4904d41206782128b174a7d1  Verilog-Perl-3.212.tar.gz



From gerd at fedoraproject.org  Tue Aug  4 08:29:17 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Tue,  4 Aug 2009 08:29:17 +0000 (UTC)
Subject: rpms/parrot/F-10 parrot-1.x.0.patch,1.1,1.2 parrot.spec,1.5,1.6
Message-ID: <20090804082917.22AD411C00CE@cvs1.fedora.phx.redhat.com>

Author: gerd

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

Modified Files:
	parrot-1.x.0.patch parrot.spec 
Log Message:
update to 1.4.0-8; changes the place of header-files and add the module "Parrot::OpLib::core"

parrot-1.x.0.patch:
 config/gen/makefiles/parrot_pc.in |    2 +-
 lib/Parrot/Install.pm             |   10 ++++++++++
 tools/dev/install_files.pl        |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: parrot-1.x.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot-1.x.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot-1.x.0.patch	21 Jul 2009 16:48:52 -0000	1.1
+++ parrot-1.x.0.patch	4 Aug 2009 08:29:16 -0000	1.2
@@ -1,14 +1,6 @@
---- tools/dev/install_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_files.pl	2009-06-02 16:12:00.000000000 +0200
-@@ -133,7 +133,6 @@
-         transform => sub {
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
-@@ -157,7 +156,7 @@
+--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
++++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
+@@ -163,7 +163,7 @@
              # libdir as it is typically done with automake installed packages.
              # If there is a use case to make this configurable we'll add a
              # seperate --pkgconfigdir option.
@@ -17,16 +9,14 @@
              return($filehash);
          },
      },
---- tools/dev/install_dev_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_dev_files.pl	2009-06-02 16:19:07.000000000 +0200
-@@ -124,7 +124,6 @@
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
+--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
++++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
+@@ -7,4 +7,4 @@
+ Description: virtual machine to execute bytecode for interpreted languages
+ Version: @VERSION@
+ Libs: -L${libdir} -lparrot @icu_shared@ @libs@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}@versiondir@
 --- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
 +++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
 @@ -220,6 +220,16 @@
@@ -46,13 +36,3 @@
              copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
              print "$dest\n";
          }
---- MANIFEST.generated	2009-07-14 23:49:14.000000000 +0200
-+++ MANIFEST.generated.new	2009-07-17 13:39:08.000000000 +0200
-@@ -241,5 +241,6 @@
- src/pmc/sub.dump                                  [devel]src
- src/pmc/undef.dump                                [devel]src
- src/string_private_cstring.h                      []
--tools/build/dynpmc.pl                             []
-+tools/build/dynoplibs.pl                          [devel]
-+tools/build/dynpmc.pl                             [devel]
- vtable.dump                                       [devel]src


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- parrot.spec	1 Aug 2009 12:26:46 -0000	1.5
+++ parrot.spec	4 Aug 2009 08:29:16 -0000	1.6
@@ -1,29 +1,25 @@
 Name:           parrot
 Version:        1.4.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
 
 Patch0:         parrot-1.x.0.patch
-# see for upstream:       https://trac.parrot.org/parrot/ticket/735
-# patched files:          tools/dev/install_files.pl
-#                         tools/dev/install_dev_files.pl
-# Changes the path for header files (to have no version subdirectory)
-# It is also responsible to have no subdirectory under pkgconfig.
+# patches file:           tools/dev/install_files.pl
+# It is responsible to have no subdirectory under pkgconfig.
+#
+# patches file:           config/gen/makefiles/parrot_pc.in
+# So "pkg-config parrot --cflags" works correct
 #
 # see for upstream:       https://trac.parrot.org/parrot/ticket/509
 # patched file:           lib/Parrot/Install.pm
 # is to have the symlink:    libparrot.so  ->  libparrot.so.%{version}
 # Without this %{_libdir}/libparrot.so would not be a symbolic link to
 # %{_libdir}/libparrot.so.%{version}  
-#
-# see for upstream:       https://trac.parrot.org/parrot/ticket/844
-# patched file:           MANIFEST.generated
-# Add two perl-srcipts that are need to build Rakudo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
@@ -61,11 +57,13 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl(Pod::Simple)
 Requires:       perl(File::Which) >= 0.05
+Requires:       perl(Parrot::OpLib::core)
 # It is necessary to have installed the package "perl-Perl-Critic" to install
 # the parrot-tools
 Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
 Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
 Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}
+Provides:       perl(Parrot::OpLib::core) = %{version}
 
 
 %description
@@ -94,15 +92,13 @@ Parrot Virtual Machine development files
 %setup -q
 %patch0 -p0
 
-%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
-    src/library.c
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
-    tools/dev/install_files.pl
+%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
 
 
 cat << \EOF > %{name}-prov
 #!/bin/sh
-%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
+%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' \
+                            -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
 EOF
 
 %global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
@@ -181,12 +177,6 @@ find %{RPM_PAR_LIB_DIR}tools -type f -na
 find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
     -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
     -exec chmod 755 {} \;
-# Set path to perl binary
-find %{RPM_PAR_LIB_DIR}tools/build -type f -name "dyn*.pl" \
-    -exec %{__sed} -i -e '1 s&# ex: set ro:&#!/usr/bin/perl&' {} \; 
-# This module is only needed for building and should not be installed (I think)
-# module "Parrot::OpLib::core"
-rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib
 
 # Remove doc-files with zero-length
 find docs/html -type f -size 0 -exec rm -f {} \;
@@ -225,9 +215,6 @@ for file in docs/book/draft/ch05_pge.pod
 done
 %{__rm} -f timestamp
 
-# These files *probably* aren't needed.
-rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
@@ -250,10 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
 %doc RESPONSIBLE_PARTIES TODO LICENSE
-%exclude %{_bindir}/parrot_config
-%exclude %{_bindir}/parrot_debugger
-%exclude %{_bindir}/pbc_*
-%{_bindir}/*
+%{_bindir}/parrot
 %{_libdir}/parrot/
 %exclude %{_libdir}/parrot/%{version}/tools
 %exclude %{_libdir}/parrot/%{version}/VERSION
@@ -273,22 +257,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
 %{_includedir}/parrot
-%{_includedir}/pmc
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
-%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
 # Files for building languages
 %{_libdir}/parrot/%{version}/tools/*
 %{_libdir}/parrot/%{version}/VERSION
-
+%{_usr}/src/parrot/*
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-8
+- include the necessary module Parrot::OpLib::core
+- change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
@@ -297,14 +281,11 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
-* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
+* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
 - add a list of changes from Lubomir Rintel
-- add patch to remove rpath
 - add filtering Provides
 - change requires for docs-subpackage
 - enable test suite
-
-* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
 - change the group of the subpackage "-docs" to Documentation
 - put the main-documentation from the docs-package to the main package
 - LICENSE file added
@@ -315,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT
 - define RPM_PAR_LIB_DIR added
 - add subpackage "tools"
 - exclude tools directory from main-package
+- added make html
 
 * Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
 - add tools
@@ -322,11 +304,8 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
 - Removed wrong prefix from pkgconfig per Christoph Wickert
 - Changed i386 to ix86 per Christoph Wickert
-
-* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
 - Changed hard-coded path requirement to perl.
 
-
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0
 
@@ -335,50 +314,29 @@ rm -rf $RPM_BUILD_ROOT
 - added parrot_utils to devel
 - fixed Source0 url
 
-* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
-- added make html
-- make reallyinstall => make install
-
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
-- updated to 0.8.0
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 
-* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
-- Update to 0.5.2.
-
-* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
-- Update to 0.5.1.
-
 * Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
 - Update to 0.4.9.
 - BuildRequires ncurses-devel.
 - For some reason now I need to force -lm too.
 - Remove some files/directories that shouldn't be included.
-
-* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
 - Override lib_dir and make various substitutions to try to fix multilib.
 - Remove rpath use from Makefile.
 - Fix a pod error in src/ops/experimental.ops.
 - Enable "make test" since t/doc/pod.t won't fail now.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
 - Force permissions on shared libraries so rpmbuild strips them.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
 - Fix URL, description, summary, etc.
 - Add post/postun.
 - Move parrot-config to the devel sub-package.
 - Force permissions on the doc directories.
-
-* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
 - Add -lcurses to get readline detection to work.
 - Add BuildRequires libicu-devel.
 



From xhorak at fedoraproject.org  Tue Aug  4 08:30:00 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:30:00 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.44,1.45
Message-ID: <20090804083000.1C46A11C00CE@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-serv15593

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-33
- 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.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnome-python2-extras.spec	21 Jul 2009 18:30:04 -0000	1.44
+++ gnome-python2-extras.spec	4 Aug 2009 08:29:59 -0000	1.45
@@ -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.12
+%define gecko_version 1.9.0.13
 %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: 32%{?dist}
+Release: 33%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-33
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-32
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:30:36 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:30:36 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-10 gnome-web-photo.spec,1.21,1.22
Message-ID: <20090804083036.6643611C0345@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-serv15849

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3-21
- 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.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-web-photo.spec	21 Jul 2009 18:31:18 -0000	1.21
+++ gnome-web-photo.spec	4 Aug 2009 08:30:36 -0000	1.22
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.0.12
+%define gecko_version 1.9.0.13
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3-21
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.3-20
 - Rebuild against newer gecko
 



From jreznik at fedoraproject.org  Tue Aug  4 08:30:43 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  4 Aug 2009 08:30:43 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-11 .cvsignore, 1.9,
	1.10 kde-plasma-runcommand.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20090804083043.AF9D111C0345@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15867

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
- update to 1.4
- gettext BR removed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Jul 2009 10:31:37 -0000	1.9
+++ .cvsignore	4 Aug 2009 08:30:43 -0000	1.10
@@ -1 +1 @@
-91495-runcommand-1.3.tar.bz2
+91495-runcommand-1.4.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/kde-plasma-runcommand.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kde-plasma-runcommand.spec	23 Jul 2009 10:31:37 -0000	1.11
+++ kde-plasma-runcommand.spec	4 Aug 2009 08:30:43 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -12,7 +12,6 @@ Source0:        http://www.kde-look.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
-BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -48,6 +47,10 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
+- update to 1.4
+- gettext BR removed
+
 * Thu Jul 23 2009 Jaroslav Reznik <jreznik at redhat.com> 1.3-1
 - update to 1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Jul 2009 10:31:37 -0000	1.9
+++ sources	4 Aug 2009 08:30:43 -0000	1.10
@@ -1 +1 @@
-bc20897b51c779d62455e5899c6a360e  91495-runcommand-1.3.tar.bz2
+1f483eefe383d88ae646267c94417380  91495-runcommand-1.4.tar.bz2



From xhorak at fedoraproject.org  Tue Aug  4 08:31:35 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:31:35 +0000 (UTC)
Subject: rpms/google-gadgets/F-10 google-gadgets.spec,1.15,1.16
Message-ID: <20090804083135.2ABF811C00CE@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-serv16390

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-9
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/google-gadgets.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- google-gadgets.spec	21 Jul 2009 18:32:53 -0000	1.15
+++ google-gadgets.spec	4 Aug 2009 08:31:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-9
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-8
 - Rebuild against newer gecko
 



From chitlesh at fedoraproject.org  Tue Aug  4 08:31:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:31:12 +0000 (UTC)
Subject: rpms/kicad/EL-5 import.log, NONE, 1.1 kicad-ld.conf, NONE,
	1.1 .cvsignore, 1.4, 1.5 kicad.spec, 1.8, 1.9 sources, 1.4,
	1.5 kicad-2006.08.28.destdir.diff, 1.1,
	NONE kicad-2006.08.28.rpm.opt.flags.diff, 1.1,
	NONE kicad-2007.01.15.destdir.diff, 1.1,
	NONE kicad-2007.01.15.rpm.opt.flags.diff, 1.1,
	NONE kicad.desktop, 1.2, NONE
Message-ID: <20090804083112.715BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore kicad.spec sources 
Added Files:
	import.log kicad-ld.conf 
Removed Files:
	kicad-2006.08.28.destdir.diff 
	kicad-2006.08.28.rpm.opt.flags.diff 
	kicad-2007.01.15.destdir.diff 
	kicad-2007.01.15.rpm.opt.flags.diff kicad.desktop 
Log Message:
2009.07.07 release


--- NEW FILE import.log ---
kicad-2009_07_07-3_rev1863_fc12:EL-5:kicad-2009.07.07-3.rev1863.fc12.src.rpm:1249374443


--- NEW FILE kicad-ld.conf ---
/usr/lib/kicad


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Feb 2007 13:25:10 -0000	1.4
+++ .cvsignore	4 Aug 2009 08:31:11 -0000	1.5
@@ -1,2 +1,3 @@
-kicad-sources-2007-01-15.zip
-kicad-src-extras-2007-01-15.tar.bz2
+kicad-2009.07.07.tar.bz2
+kicad-doc-2009.07.07.tar.bz2
+kicad-library-2009.07.07.tar.bz2


Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/EL-5/kicad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kicad.spec	14 Feb 2007 10:12:15 -0000	1.8
+++ kicad.spec	4 Aug 2009 08:31:12 -0000	1.9
@@ -1,24 +1,30 @@
-Name: 		kicad
-Version:	2007.01.15
-Release:	2%{?dist}
-Summary: 	Electronic schematic diagrams and printed circuit board artwork
-Summary(fr): 	Saisie de sch?ma ?lectronique et trac? de circuit imprim?
-
-Group: 		Applications/Engineering
-License: 	GPL
-Url: 		http://www.lis.inpg.fr/realise_au_lis/kicad/
-Source:		ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2007-01-15.zip
-Source1:	http://linuxelectronique.free.fr/download/kicad-src-extras-2007-01-15.tar.bz2
-Source2:	%{name}.desktop
-Patch:		%{name}-%{version}.destdir.diff
-Patch1:		%{name}-%{version}.rpm.opt.flags.diff
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           kicad
+Version:        2009.07.07
+Release:        3.rev1863%{?dist}
+Summary:        Electronic schematic diagrams and printed circuit board artwork
+Summary(fr):    Saisie de sch?ma ?lectronique et trac? de circuit imprim?
+
+Group:          Applications/Engineering
+License:        GPLv2+
+URL:            http://www.lis.inpg.fr/realise_au_lis/kicad/
+
+# Source files created from upstream's SVN repository
+Source:         kicad-%{version}.tar.bz2
+Source1:        kicad-doc-%{version}.tar.bz2
+Source2:        kicad-library-%{version}.tar.bz2
+Source3:	kicad-ld.conf
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  wxGTK-devel
+BuildRequires:  boost-devel
+BuildRequires:  cmake
 
-Requires:	wxGTK
-BuildRequires:	desktop-file-utils, wxGTK-devel
+Requires:       electronics-menu
 
 %description
-Kicad is an open source (GPL) software for the creation of electronic schematic
+Kicad is an EDA software to design electronic schematic
 diagrams and printed circuit board artwork up to 16 layers.
 Kicad is a set of four softwares and a project manager:
 - Eeschema: schematic entry
@@ -37,181 +43,210 @@ Kicad est un ensemble de quatres logicie
 - Cvpcb : s?lecteur d'empreintes pour les composants utilis?s dans le circuit
 - Kicad : gestionnaire de projet.
 
-%prep
-%setup -q -n kicad-dev -a 1
-%{__cp} -a kicad-src-extras-2007-01-15/* .
-%{__rm} -rf kicad-src-extras-2007-01-15
-
-# Convert MSDOS EOL to Unix EOL before applying patches
-
-for f in 3d-viewer/{3d_struct.h,3d_viewer.h} \
-eeschema/libcmp.h \
-include/{pcbstruct.h,wxstruct.h} \
-kicad/kicad.h \
-pcbnew/{autorout.h,class_cotation.h,class_equipot.h,class_mire.h,class_module.h,class_pcb_text.h,class_text_mod.h,class_track.h,track.cpp}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-%patch0 -p1
-%patch1 -p1
+%package        doc
+Summary:        Documentations for kicad
+Group:          Applications/Engineering
+License:        GPLv2+
+Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+
+%description    doc
+Documentations and tutorials for kicad in English
+
+
+%package        doc-de
+Summary:        Documentation for Kicad in German
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-de
+Documentation and tutorials for Kicad in German
+
+
+%package        doc-es
+Summary:        Documentation for Kicad in Spanish
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-es
+Documentation and tutorials for Kicad in Spanish
+
+
+%package        doc-fr
+Summary:        Documentation for Kicad in French
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-fr
+Documentation and tutorials for Kicad in French
+
+
+%package        doc-hu
+Summary:        Documentation for Kicad in Hungarian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-hu
+Documentation and tutorials for Kicad in Hungarian
+
+
+%package        doc-it
+Summary:        Documentation for Kicad in Italian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-it
+Documentation and tutorials for Kicad in Italian
+
+
+%package        doc-pt
+Summary:        Documentation for Kicad in Portuguese
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-pt
+Documentation and tutorials for Kicad in Portuguese
+
+
+%package        doc-ru
+Summary:        Documentation for Kicad in Russian
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
+
+%description    doc-ru
+Documentation and tutorials for Kicad in Russian
+
+
+%package        doc-zh_CN
+Summary:        Documentation for Kicad in Chinese
+Group:          Documentation
+Requires:       %{name}-doc = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:      noarch
+%endif
 
-%build
+%description    doc-zh_CN
+Documentation and tutorials for Kicad in Chinese
 
-# These files are not scripts
-for f in {copyright,gpl,licendoc,version}.txt
-do
-  %{__chmod} -x $f
-done
 
-# Convert MSDOS EOL to Unix EOL
-for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+%prep
+%setup -q -a 1 -a 2
 
-for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+#kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt
+iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt
 
-for f in help/en/{contents.hhc,kicad.hhp,cvpcb/cvpcb-en.html,eeschema/eeschema.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-for f in help/es/{contents.hhc,kicad.hhp,cvpcb/cvpcb-es.html,eeschema/eeschema-es.html,file_formats/file_formats-es.html,gerbview/gerbview.html,kicad/kicad-es.html,pcbnew/pcbnew-es.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+#multilibs
+%ifarch x86_64 sparc64 ppc64 amd64
+%{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
+%endif
 
-for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
 
-for f in help/ru/{contents.hhc,kicad.hhp,eeschema/eeschema_ru.html}
-do
-  %{__sed} -i -e 's/\r$//' $f
-done
+%build
 
-make -f makefile.gtk %{?_smp_mflags}
+#
+# Symbols libraries
+#
+pushd %{name}-library-%{version}/
+%cmake -DCMAKE_BUILD_TYPE=Release .
+%{__make} %{?_smp_mflags} VERBOSE=1
+popd
 
-%install
-%{__rm} -rf %{buildroot}
 
-install -d %{buildroot}%{_datadir}
-install -d %{buildroot}%{_datadir}/%{name}
+#
+# Core components
+#
+%cmake -DCMAKE_BUILD_TYPE=Release
+%{__make} %{?_smp_mflags} VERBOSE=1
 
-# install demos files
-install -d %{buildroot}%{_datadir}/%{name}/demos
-for dir in electric interf_u microwave pic_programmer pspice sonde_xilinx test_xil_95108 video
-do
-  install -d %{buildroot}%{_datadir}/%{name}/demos/${dir}
-  for f in demos/${dir}/*
-  do
-    install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-  done
-done
 
-# install help files
-install -d %{buildroot}%%{_docdir}
-install -d %{buildroot}%{_docdir}/%{name}/
-for dir in en es fr pt
-do
-  install -d %{buildroot}%{_docdir}/%{name}/${dir}
-  for subdir in cvpcb eeschema file_formats gerbview kicad pcbnew
-  do
-    install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
-    cd help
-    install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
-    install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
-    for f in ${dir}/${subdir}/*
-    do
-      install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
-    done
-    cd ..
-  done
-done
+%install
+%{__rm} -rf %{buildroot}
 
-# install ru help files
-install -d %{buildroot}%%{_docdir}
-install -d %{buildroot}%{_docdir}/%{name}/
-for dir in ru
-do
-  install -d %{buildroot}%{_docdir}/%{name}/${dir}
-  for subdir in eeschema pcbnew
-  do
-    install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
-    cd help
-    install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
-    install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
-    for f in ${dir}/${subdir}/*
-    do
-      install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
-    done
-    cd ..
-  done
-done
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-# install librairies
-install -d %{buildroot}%{_datadir}/%{name}/library
-for f in library/*
-do
-  install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-done
 
 # install localization
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/internat/
 install -d %{buildroot}%{_datadir}/locale
-cd locale
-for dir in de es fr hu it ko pl pt sl
+cd internat
+for dir in ca cs de es fr hu it ko nl pl pt ru sl sv zh_CN
 do
   install -d %{buildroot}%{_datadir}/locale/${dir}
   install -m 644 ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
 done
 cd ..
 
-# install modules
-install -d %{buildroot}%{_datadir}/%{name}/modules
-install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d
-for dir in conn_DBxx connectors conn_europe device dil discret divers pga pin_array smd support
-do
-  install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d/${dir}
-  for f in modules/packages3d/${dir}/*
-  do
-    install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-  done
-done
-for f in modules/*.*
-do
-  install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
-done
 
+# install desktop
+desktop-file-install --vendor=fedora         \
+  --dir %{buildroot}%{_datadir}/applications \
+  --remove-category Development		     \
+  --delete-original                          \
+  %{buildroot}%{_datadir}/applications/kicad.desktop
+rm -f %{buildroot}%{_datadir}/applications/eeschema.desktop
+
+# Missing requires libraries
+%{__cp} -p ./3d-viewer/lib3d-viewer.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./bitmaps/libbitmaps.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./common/libcommon.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./polygon/kbool/src/libkbool.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./common/libpcbcommon.so %{buildroot}%{_libdir}/%{name}
+%{__cp} -p ./polygon/libpolygon.so %{buildroot}%{_libdir}/%{name}
+
+#
+# Symbols libraries
+#
+pushd %{name}-library-%{version}/
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
+popd
+
+# install ld.conf
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/ld.so.conf.d/kicad.conf
 
 # install template
 install -d %{buildroot}%{_datadir}/%{name}/template
 install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
 
-# install binaries
-install -d %{buildroot}%{_bindir}
-install -d %{buildroot}%{_libdir}/%{name}/plugins
-make -f makefile.gtk install DESTDIR=%{buildroot}
 
-# install desktop
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora \
-  --dir %{buildroot}%{_datadir}/applications \
-  --add-category "Engineering" \
-  --add-category "Electronics" \
-  --add-category "X-Fedora" \
-  %{SOURCE2}
-
-# install icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -m 644 kicad_icon.png %{buildroot}%{_datadir}/pixmaps/kicad_icon.png
+# Preparing for documentation pull-ups
+%{__rm} -f  %{name}-doc-%{version}/doc/help/CMakeLists.txt
+%{__rm} -f  %{name}-doc-%{version}/doc/help/makefile
+%{__rm} -f  %{name}-doc-%{version}/doc/tutorials/CMakeLists.txt
+
+%{__cp} -pr %{name}-doc-%{version}/doc/* %{buildroot}%{_docdir}/%{name}
+%{__cp} -pr AUTHORS.txt CHANGELOG* TODO.txt version.txt %{buildroot}%{_docdir}/%{name}
+
 
 %find_lang %{name}
 
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -220,6 +255,8 @@ then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+/sbin/ldconfig
+
 %postun
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -228,22 +265,122 @@ then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+/sbin/ldconfig
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt
-%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt
+%doc %{_docdir}/%{name}/help/en/kicad.pdf
 %{_bindir}/*
-%{_libdir}/%{name}/
-%{_libdir}/%{name}/plugins/
+%{_libdir}/%{name}
 %{_datadir}/%{name}/
-%{_docdir}/%{name}/
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/kicad_icon.png
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kicad-project.*
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mimelnk/application/x-%{name}-*.desktop
+%{_sysconfdir}/ld.so.conf.d/kicad.conf
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/help/
+%dir %{_docdir}/%{name}/tutorials
+%doc %{_docdir}/%{name}/*.txt
+%doc %{_docdir}/%{name}/scripts
+%doc %{_docdir}/%{name}/contrib
+%doc %{_docdir}/%{name}/help/en/docs_src/
+%doc %{_docdir}/%{name}/help/en/cvpcb.pdf
+%doc %{_docdir}/%{name}/help/en/eeschema.pdf
+%doc %{_docdir}/%{name}/help/en/gerbview.pdf
+%doc %{_docdir}/%{name}/help/en/pcbnew.pdf
+%doc %{_docdir}/%{name}/help/file_formats
+%doc %{_docdir}/%{name}/tutorials/en
+
+%files doc-de
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/de
+%doc %{_docdir}/%{name}/tutorials/de
+
+%files doc-es
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/es
+%doc %{_docdir}/%{name}/tutorials/es
+
+%files doc-fr
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/fr
+%doc %{_docdir}/%{name}/tutorials/fr
+
+%files doc-hu
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/tutorials/hu
+
+%files doc-it
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/it
+
+%files doc-pt
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/pt
+
+
+%files doc-ru
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}/help/ru
+%doc %{_docdir}/%{name}/tutorials/ru
+
+%files doc-zh_CN
+%defattr(-,root,root,-)
+#%doc %{_docdir}/%{name}/help/zh_CN
+%doc %{_docdir}/%{name}/tutorials/zh_CN
+
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009.07.07-3.rev1863
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 08 2009 Jon Ciesla <limb at jcomserv.net> - 2009.07.07-2.rev1863
+- Dropped eeschema desktop file.
+- Moved English kicad.pdf to main rpm.
+- Added ls.so.conf file and ldconfig to post, postun to fix libs issue.
+- Dropped category Development from desktop file.
+
+* Tue Jul 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2009.07.07-1.rev1863
+- svn rev 1863
+- documentation splitted into multiple packages
+- libraries are now taken directly from SVN rather than from older releases
+- build changed to cmake based
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007.07.09-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2007.07.09-4
+- First patch is Patch0 - should fix build in Rawhide.
+- Include %%_libdir/kicad directory.
+- Drop explicit Requires wxGTK in favour of automatic SONAME dependencies.
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2007.07.09-3
+- Autorebuild for GCC 4.3
+
+* Mon Oct 15 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.07.09-2
+  - Update desktop file
+
+* Thu Oct 04 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.07.09-1
+  - New upstream version
+  - Merge previous patches
+  - Remove X-Fedora, Electronics and Engineering categories
+  - Update desktop file
+
+* Mon Aug 27 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.01.15-4
+  - License tag clarification
+
+* Thu Aug 23 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.01.15-3
+  - Rebuild
+
 * Wed Feb 14 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.01.15-2
   - Fix desktop entry. Fix #228598
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Feb 2007 13:25:10 -0000	1.4
+++ sources	4 Aug 2009 08:31:12 -0000	1.5
@@ -1,2 +1,3 @@
-61a0ba615b67af313d1214ed1a3d5a66  kicad-sources-2007-01-15.zip
-3263536df405f0d282a61d894feb6f05  kicad-src-extras-2007-01-15.tar.bz2
+b7df0a960ff269205038b99131bfdbc0  kicad-2009.07.07.tar.bz2
+396786f9595a8fe90479d764492a7726  kicad-doc-2009.07.07.tar.bz2
+43a40c3f52cd74632eb31540e95952a8  kicad-library-2009.07.07.tar.bz2


--- kicad-2006.08.28.destdir.diff DELETED ---


--- kicad-2006.08.28.rpm.opt.flags.diff DELETED ---


--- kicad-2007.01.15.destdir.diff DELETED ---


--- kicad-2007.01.15.rpm.opt.flags.diff DELETED ---


--- kicad.desktop DELETED ---



From xhorak at fedoraproject.org  Tue Aug  4 08:32:47 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:32:47 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.80,1.81
Message-ID: <20090804083247.34A4C11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	kazehakase.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.5
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- kazehakase.spec	21 Jul 2009 18:35:08 -0000	1.80
+++ kazehakase.spec	4 Aug 2009 08:32:47 -0000	1.81
@@ -40,7 +40,7 @@
 
 Name:		kazehakase
 Version:	0.5.6
-Release:	%{_release}%{?dist}.4
+Release:	%{_release}%{?dist}.5
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -303,6 +303,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.5
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.4
 - Rebuild against newer gecko
 



From chitlesh at fedoraproject.org  Tue Aug  4 08:33:01 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:33:01 +0000 (UTC)
Subject: rpms/toped/devel .cvsignore, 1.7, 1.8 import.log, 1.4, 1.5 sources, 
	1.7, 1.8 toped.spec, 1.16, 1.17
Message-ID: <20090804083301.E1CF111C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Mar 2009 17:03:53 -0000	1.7
+++ .cvsignore	4 Aug 2009 08:33:01 -0000	1.8
@@ -1 +1 @@
-toped.tar.bz2
+toped-0.9.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	29 Mar 2009 17:03:53 -0000	1.4
+++ import.log	4 Aug 2009 08:33:01 -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:HEAD:toped-0.9.2-1.fc9.src.rpm:1226336637
 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:HEAD:toped-0.9.4-1.fc11.src.rpm:1249374653


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Mar 2009 17:03:53 -0000	1.7
+++ sources	4 Aug 2009 08:33:01 -0000	1.8
@@ -1 +1 @@
-596dce3196148d07e29ccaabb7941df3  toped.tar.bz2
+58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/toped.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- toped.spec	27 Jul 2009 06:06:48 -0000	1.16
+++ toped.spec	4 Aug 2009 08:33:01 -0000	1.17
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.2
-Release:        5%{?dist} 
-#RELEASE_0.92_CAND
+Version:        0.9.4
+Release:        1%{?dist} 
+#RELEASE_0.94_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -10,8 +10,7 @@ URL:            http://www.toped.org.uk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
-Source0:        %{name}.tar.bz2
+Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +20,7 @@ BuildRequires:  byacc
 BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
@@ -58,12 +58,12 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__rm} -f %{buildroot}%{_libdir}/libtpd*.{a,la}
 
-desktop-file-install --vendor fedora             \
-  --add-category "Electronics"                   \
-  --delete-original                              \
-  --remove-category "Science"                    \
-  --remove-category "Education"                  \
-  --dir %{buildroot}%{_datadir}/applications/    \
+desktop-file-install --vendor ""              \
+  --add-category "Electronics"                \
+  --delete-original                           \
+  --remove-category "Science"                 \
+  --remove-category "Education"               \
+  --dir %{buildroot}%{_datadir}/applications/ \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
@@ -80,9 +80,6 @@ desktop-file-install --vendor fedora    
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
 
-#spurious-executable-perm
-chmod 0644 COPYING
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -104,11 +101,20 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/%{name}
 %{_libdir}/libtpd*.so*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
 %Changelog
+* Tue Aug 04 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-1
+- 0.9.4 final release
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.2.rc1
+- Testing for upstream D-1 for 0.94 release - svn rev 1161
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.1.rc1
+- 0.9.4 release candidate 1
+
 * Tue Mar 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.2-4
 - bug fix for cif and gdsII import and export
 



From xhorak at fedoraproject.org  Tue Aug  4 08:33:27 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:33:27 +0000 (UTC)
Subject: rpms/Miro/F-10 Miro.spec,1.56,1.57
Message-ID: <20090804083327.9682A11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	Miro.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-3
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- Miro.spec	21 Jul 2009 18:35:57 -0000	1.56
+++ Miro.spec	4 Aug 2009 08:33:27 -0000	1.57
@@ -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.12
+%define gecko_ver 1.9.0.13
 
 Name:           Miro
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-3
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-2
 - Rebuild against newer gecko
 



From chitlesh at fedoraproject.org  Tue Aug  4 08:34:06 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 08:34:06 +0000 (UTC)
Subject: rpms/toped/EL-5 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources,
	1.5, 1.6 toped.spec, 1.8, 1.9
Message-ID: <20090804083406.1915011C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Nov 2008 17:48:05 -0000	1.5
+++ .cvsignore	4 Aug 2009 08:34:05 -0000	1.6
@@ -1 +1 @@
-toped-0.9.2.tar.bz2
+toped-0.9.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Nov 2008 17:48:05 -0000	1.1
+++ import.log	4 Aug 2009 08:34:05 -0000	1.2
@@ -1 +1,2 @@
 toped-0_9_2-2_fc9:EL-5:toped-0.9.2-2.fc9.src.rpm:1226339147
+toped-0_9_4-1_fc11:EL-5:toped-0.9.4-1.fc11.src.rpm:1249374734


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Nov 2008 17:48:05 -0000	1.5
+++ sources	4 Aug 2009 08:34:05 -0000	1.6
@@ -1 +1 @@
-3e1b982099db4aa7e8e367259db22943  toped-0.9.2.tar.bz2
+58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/toped.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- toped.spec	10 Nov 2008 17:48:05 -0000	1.8
+++ toped.spec	4 Aug 2009 08:34:05 -0000	1.9
@@ -1,6 +1,7 @@
 Name:           toped
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.4
+Release:        1%{?dist} 
+#RELEASE_0.94_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -11,32 +12,35 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  wxGTK-devel
+BuildRequires:  glew-devel
+BuildRequires:  byacc
+BuildRequires:  libtool
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  plt-scheme
 
 Requires:       electronics-menu
 
 
 %description
-Toped is an open source cross-platform IC layout editor,
-based on openGL and wxWidgets.
+Toped is a layout editor with CIF and GDSII export capabilities.
 
 Toped is listed among Fedora Electronic Lab packages.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 # instead of exporting the variable $TPD_GLOBAL
 sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
 sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
 
+%{__make} -f Makefile.cvs
 %build
 
-%configure         \
-   --with-gtk      \
-   --with-opengl   \
-   --disable-rpath \
-   --enable-threads
+%configure
 
 # Remove rpath from libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -54,12 +58,12 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__rm} -f %{buildroot}%{_libdir}/libtpd*.{a,la}
 
-desktop-file-install --vendor fedora             \
-  --add-category "Electronics"                   \
-  --delete-original                              \
-  --remove-category "Science"                    \
-  --remove-category "Education"                  \
-  --dir %{buildroot}%{_datadir}/applications/    \
+desktop-file-install --vendor ""              \
+  --add-category "Electronics"                \
+  --delete-original                           \
+  --remove-category "Science"                 \
+  --remove-category "Education"               \
+  --dir %{buildroot}%{_datadir}/applications/ \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
@@ -76,9 +80,6 @@ desktop-file-install --vendor fedora    
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
 %{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
 
-#spurious-executable-perm
-chmod 0644 COPYING
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -100,12 +101,23 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/%{name}
 %{_libdir}/libtpd*.so*
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
 %Changelog
-* Mon Nov 10 2008 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.2-2
+* Tue Aug 04 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-1
+- 0.9.4 final release
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.2.rc1
+- Testing for upstream D-1 for 0.94 release - svn rev 1161
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.4-0.1.rc1
+- 0.9.4 release candidate 1
+
+* Tue Mar 10 2009 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.2-4
+- bug fix for cif and gdsII import and export
+
 - disabling rpath
 - fixing rpmlint warning: unused-direct-shlib-dependencies
 - fixed multiple menu entries



From xhorak at fedoraproject.org  Tue Aug  4 08:34:16 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:34:16 +0000 (UTC)
Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.13,1.14
Message-ID: <20090804083416.9262911C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-13
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-10/mozvoikko.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mozvoikko.spec	21 Jul 2009 18:36:52 -0000	1.13
+++ mozvoikko.spec	4 Aug 2009 08:34:16 -0000	1.14
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.12
+%define gecko_ver 1.9.0.13
 # 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:        12%{?dist}
+Release:        13%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-13
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-12
 - Rebuild against newer gecko
 



From jreznik at fedoraproject.org  Tue Aug  4 08:35:07 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  4 Aug 2009 08:35:07 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.7,
	1.8 kde-plasma-runcommand.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20090804083507.0B2D511C00CE@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19013

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
- update to 1.4
- gettext BR removed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Jul 2009 10:32:43 -0000	1.7
+++ .cvsignore	4 Aug 2009 08:35:06 -0000	1.8
@@ -1 +1 @@
-91495-runcommand-1.3.tar.bz2
+91495-runcommand-1.4.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kde-plasma-runcommand.spec	23 Jul 2009 10:32:43 -0000	1.8
+++ kde-plasma-runcommand.spec	4 Aug 2009 08:35:06 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -12,7 +12,6 @@ Source0:        http://www.kde-look.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
-BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -48,6 +47,10 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
+- update to 1.4
+- gettext BR removed
+
 * Thu Jul 23 2009 Jaroslav Reznik <jreznik at redhat.com> 1.3-1
 - update to 1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Jul 2009 10:32:44 -0000	1.8
+++ sources	4 Aug 2009 08:35:06 -0000	1.9
@@ -1 +1 @@
-bc20897b51c779d62455e5899c6a360e  91495-runcommand-1.3.tar.bz2
+1f483eefe383d88ae646267c94417380  91495-runcommand-1.4.tar.bz2



From xhorak at fedoraproject.org  Tue Aug  4 08:35:15 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:35:15 +0000 (UTC)
Subject: rpms/mugshot/F-10 mugshot.spec,1.50,1.51
Message-ID: <20090804083515.EE82F11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	mugshot.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-12
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-10/mugshot.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- mugshot.spec	21 Jul 2009 18:38:51 -0000	1.50
+++ mugshot.spec	4 Aug 2009 08:35:15 -0000	1.51
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-12
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:36:06 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:36:06 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.20,1.21
Message-ID: <20090804083606.0F96911C00CE@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-serv19419

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-12
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pcmanx-gtk2.spec	22 Jul 2009 08:08:03 -0000	1.20
+++ pcmanx-gtk2.spec	4 Aug 2009 08:36:05 -0000	1.21
@@ -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.12
+%define xulver 1.9.0.13
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   11%{?dist}
+Release:   12%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-12
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:37:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:37:11 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.47,1.48
Message-ID: <20090804083711.4EE2511C00CE@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-serv19803

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-1.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.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ruby-gnome2.spec	3 Aug 2009 19:12:30 -0000	1.47
+++ ruby-gnome2.spec	4 Aug 2009 08:37:11 -0000	1.48
@@ -13,7 +13,7 @@
 
 Name:           ruby-gnome2
 Version:        0.19.1
-Release:        %{mainrel}%{?dist}
+Release:        %{mainrel}%{?dist}.1
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -1076,6 +1076,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.19.1-1.1
+- Rebuild against newer gecko
+
 * Mon Aug  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.1-1
 - Update to 0.19.1, drop all upstreamed patches
 - Introduce many -devel subpackages containing pkgconfig file



From xhorak at fedoraproject.org  Tue Aug  4 08:37:55 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:37:55 +0000 (UTC)
Subject: rpms/yelp/F-10 yelp.spec,1.155,1.156
Message-ID: <20090804083755.125BE11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	yelp.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-12
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-10/yelp.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- yelp.spec	21 Jul 2009 18:43:53 -0000	1.155
+++ yelp.spec	4 Aug 2009 08:37:54 -0000	1.156
@@ -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.12
+%define gecko_version 1.9.0.13
 
 %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: 11%{?dist}
+Release: 12%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-12
+- Rebuild against newer gecko
+
 * Tue Jul 21 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:38:40 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:38:40 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.8,1.9
Message-ID: <20090804083840.1A3D611C00CE@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-serv20277

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.4
- 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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Gtk2-MozEmbed.spec	30 Jul 2009 09:43:40 -0000	1.8
+++ perl-Gtk2-MozEmbed.spec	4 Aug 2009 08:38:39 -0000	1.9
@@ -3,7 +3,7 @@
 %if 0%{?fedora} >= 11
 %define gecko_version 1.9.1
 %else
-%define gecko_version 1.9.0.12
+%define gecko_version 1.9.0.13
 %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}.3
+Release:       %{specfilever}%{?dist}.4
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.4
+- Rebuild against newer gecko
+
 * Thu Jul 30 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.3
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:45:28 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:45:28 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-11 pcmanx-gtk2.spec,1.13,1.14
Message-ID: <20090804084528.1A95811C00CE@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-serv21793

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-7
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-11/pcmanx-gtk2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pcmanx-gtk2.spec	23 Jul 2009 10:21:50 -0000	1.13
+++ pcmanx-gtk2.spec	4 Aug 2009 08:45:27 -0000	1.14
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.1.1
+%define xulver 1.9.1.2
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   6%{?dist}
+Release:   7%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-7
+- Rebuild against newer gecko
+
 * Thu Jul 23 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Aug  4 08:52:32 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:52:32 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.30,1.31
Message-ID: <20090804085232.3667B11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	blam.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- blam.spec	24 Jul 2009 18:09:36 -0000	1.30
+++ blam.spec	4 Aug 2009 08:52:31 -0000	1.31
@@ -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.1
+%define	gecko_version		1.9.1.2
 
 Name:		blam
 Version:	1.8.5
-Release:	13%{?dist}
+Release:	14%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
+- Rebuild against newer gecko
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Aug  4 08:54:23 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:54:23 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.12,1.13
Message-ID: <20090804085423.4AD0C11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.7.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mozvoikko.spec	25 Jul 2009 15:12:11 -0000	1.12
+++ mozvoikko.spec	4 Aug 2009 08:54:23 -0000	1.13
@@ -5,7 +5,7 @@
 # update this package to 1.0.
 
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.1
+%define gecko_ver 1.9.1.2
 # 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.6.rc1%{?dist}
+Release:        0.7.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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.7.rc1
+- Rebuild against newer gecko
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-0.6.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Tue Aug  4 08:54:57 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  4 Aug 2009 08:54:57 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.40,1.41
Message-ID: <20090804085457.7D8C211C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24239

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Jul 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-3
- Allow svirt_t to stream_connect to virtd_t


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |    8 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  287 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   21 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  123 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   22 
 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               |   41 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   38 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   41 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  113 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   42 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |    8 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   59 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  106 +
 policy/modules/services/virt.te                    |  263 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  536 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 policy/modules/system/application.if               |   20 
 policy/modules/system/application.te               |   11 
 policy/modules/system/authlogin.fc                 |    9 
 policy/modules/system/authlogin.if                 |  203 ++-
 policy/modules/system/authlogin.te                 |    9 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1299 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 290 files changed, 12858 insertions(+), 2598 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- policy-F12.patch	31 Jul 2009 19:05:34 -0000	1.40
+++ policy-F12.patch	4 Aug 2009 08:54:56 -0000	1.41
@@ -4272,7 +4272,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.26/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.fc	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.fc	2009-08-03 06:30:31.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)
@@ -4284,9 +4284,17 @@ diff -b -B --ignore-all-space --exclude-
  /dev/lircm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/logibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
+@@ -82,6 +84,7 @@
+ /dev/radio.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
+ /dev/random		-c	gen_context(system_u:object_r:random_device_t,s0)
+ /dev/raw1394.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
++/dev/rfkill		-c	gen_context(system_u:object_r:wireless_device_t,s0)
+ /dev/(misc/)?rtc[0-9]*	-c	gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.26/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-03 06:30:19.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -4428,7 +4436,32 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Read the lvm comtrol device.
-@@ -2268,6 +2395,25 @@
+@@ -2232,6 +2359,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Read and write the the wireless device.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_rw_wireless',`
++	gen_require(`
++		type device_t, wireless_device_t;
++	')
++
++	rw_chr_files_pattern($1, device_t, wireless_device_t)
++')
++
++########################################
++## <summary>
+ ##	Get the attributes of the null device nodes.
+ ## </summary>
+ ## <param name="domain">
+@@ -2268,6 +2413,25 @@
  
  ########################################
  ## <summary>
@@ -4456,7 +4489,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.26/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.te	2009-08-03 06:30:00.000000000 -0400
 @@ -84,6 +84,13 @@
  dev_node(kmsg_device_t)
  
@@ -4484,9 +4517,22 @@ diff -b -B --ignore-all-space --exclude-
  # Type for /dev/mapper/control
  #
  type lvm_control_t;
+@@ -224,6 +237,12 @@
+ type watchdog_device_t;
+ dev_node(watchdog_device_t)
+ 
++#
++# wireless control devices 
++#
++type wireless_device_t;
++dev_node(wireless_device_t)
++
+ type xen_device_t;
+ dev_node(xen_device_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.26/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/domain.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/domain.if	2009-08-03 08:04:07.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -8774,7 +8820,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.26/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/bluetooth.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/bluetooth.te	2009-08-03 06:30:22.000000000 -0400
 @@ -64,6 +64,7 @@
  allow bluetooth_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow bluetooth_t self:tcp_socket create_stream_socket_perms;
@@ -8783,6 +8829,25 @@ diff -b -B --ignore-all-space --exclude-
  
  read_files_pattern(bluetooth_t, bluetooth_conf_t, bluetooth_conf_t)
  
+@@ -111,6 +112,7 @@
+ dev_rw_generic_usb_dev(bluetooth_t)
+ dev_read_urand(bluetooth_t)
+ dev_rw_input_dev(bluetooth_t)
++dev_rw_wireless(bluetooth_t)
+ 
+ fs_getattr_all_fs(bluetooth_t)
+ fs_search_auto_mountpoints(bluetooth_t)
+@@ -154,6 +156,10 @@
+ 	')
+ 
+ 	optional_policy(`
++		networkmanager_dbus_chat(bluetooth_t)
++	')
++
++	optional_policy(`
+ 		pulseaudio_dbus_chat(bluetooth_t)
+ 	')
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.te serefpolicy-3.6.26/policy/modules/services/certmaster.te
 --- nsaserefpolicy/policy/modules/services/certmaster.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/certmaster.te	2009-07-30 15:33:08.000000000 -0400
@@ -11092,17 +11157,21 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.6.26/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/mysql.te	2009-07-30 15:33:09.000000000 -0400
-@@ -136,6 +136,8 @@
++++ serefpolicy-3.6.26/policy/modules/services/mysql.te	2009-08-03 08:06:57.000000000 -0400
+@@ -136,7 +136,12 @@
  
  domtrans_pattern(mysqld_safe_t, mysqld_exec_t, mysqld_t)
  
 +allow mysqld_safe_t mysqld_var_run_t:sock_file unlink;
 +
  allow mysqld_safe_t mysqld_log_t:file manage_file_perms;
++
++domain_getattr_all_domains(mysqld_safe_t)
++
  logging_log_filetrans(mysqld_safe_t, mysqld_log_t, file)
  
-@@ -152,7 +154,7 @@
+ kernel_read_system_state(mysqld_safe_t) 
+@@ -152,7 +157,7 @@
  
  miscfiles_read_localization(mysqld_safe_t) 
  
@@ -12408,7 +12477,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/PolicyKit(/.*)?			gen_context(system_u:object_r:policykit_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.6.26/policy/modules/services/policykit.if
 --- nsaserefpolicy/policy/modules/services/policykit.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/policykit.if	2009-08-03 06:44:10.000000000 -0400
 @@ -17,6 +17,8 @@
  		class dbus send_msg;
  	')
@@ -12418,7 +12487,15 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 policykit_t:dbus send_msg;
  	allow policykit_t $1:dbus send_msg;
  ')
-@@ -167,7 +169,7 @@
+@@ -41,7 +43,6 @@
+ 
+ ########################################
+ ## <summary>
+-##	Execute a policy_auth in the policy_auth domain, and
+ ##	allow the specified role the policy_auth domain,
+ ## </summary>
+ ## <param name="domain">
+@@ -167,7 +168,7 @@
  
  	domtrans_pattern($1, policykit_resolve_exec_t, policykit_resolve_t)
  
@@ -12427,7 +12504,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -206,4 +208,30 @@
+@@ -206,4 +207,47 @@
  
  	files_search_var_lib($1)
  	read_files_pattern($1, policykit_var_lib_t, policykit_var_lib_t)
@@ -12457,10 +12534,27 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_read_lib($2)
 +	policykit_read_reload($2)
 +	policykit_dbus_chat($2)
++')
++########################################
++## <summary>
++##	Send generic signal to policy_auth
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`policykit_signal_auth',`
++	gen_require(`
++		type policykit_auth_t;
++	')
++
++	allow $1 policykit_auth_t:process signal;
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.6.26/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-03 06:50:17.000000000 -0400
 @@ -38,9 +38,10 @@
  
  allow policykit_t self:capability { setgid setuid };
@@ -12500,7 +12594,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_auth local policy
-@@ -77,7 +89,8 @@
+@@ -77,12 +89,15 @@
  
  allow policykit_auth_t self:capability setgid;
  allow policykit_auth_t self:process getattr;
@@ -12510,27 +12604,37 @@ diff -b -B --ignore-all-space --exclude-
  allow policykit_auth_t self:unix_dgram_socket create_socket_perms;
  allow policykit_auth_t self:unix_stream_socket create_stream_socket_perms;
  
-@@ -104,6 +117,8 @@
++policykit_dbus_chat(policykit_auth_t)
++
+ can_exec(policykit_auth_t, policykit_auth_exec_t)
+-corecmd_search_bin(policykit_auth_t)
++corecmd_exec_bin(policykit_auth_t)
+ 
+ rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
+ 
+@@ -104,6 +119,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
 +	dbus_system_domain( policykit_auth_t, policykit_auth_exec_t)
-+
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -116,6 +131,10 @@
+@@ -116,6 +132,13 @@
  	hal_read_state(policykit_auth_t)
  ')
  
 +optional_policy(`
++	xserver_stream_connect(policykit_auth_t)
 +	xserver_xdm_append_log(policykit_auth_t)
++	xserver_read_xdm_pid(policykit_auth_t)
++	xserver_search_xdm_lib(policykit_auth_t)
 +')
 +
  ########################################
  #
  # polkit_grant local policy
-@@ -123,7 +142,8 @@
+@@ -123,7 +146,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -12540,7 +12644,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;
  
-@@ -153,9 +173,12 @@
+@@ -153,9 +177,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -12554,7 +12658,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -167,7 +190,8 @@
+@@ -167,7 +194,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -13686,8 +13790,16 @@ 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.26/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/ricci.te	2009-07-30 15:33:09.000000000 -0400
-@@ -440,6 +440,10 @@
++++ serefpolicy-3.6.26/policy/modules/services/ricci.te	2009-08-03 07:21:27.000000000 -0400
+@@ -264,6 +264,7 @@
+ allow ricci_modclusterd_t self:socket create_socket_perms;
+ 
+ allow ricci_modclusterd_t ricci_modcluster_t:unix_stream_socket connectto;
++allow ricci_modclusterd_t ricci_modcluster_t:fifo_file rw_file_perms;
+ 
+ # log files
+ allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
+@@ -440,6 +441,10 @@
  files_read_usr_files(ricci_modstorage_t)
  files_read_kernel_modules(ricci_modstorage_t)
  
@@ -16957,7 +17069,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.26/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/xserver.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/xserver.if	2009-08-03 06:49:41.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -17105,7 +17217,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -756,7 +757,26 @@
+@@ -756,7 +757,44 @@
  	')
  
  	files_search_pids($1)
@@ -17130,10 +17242,28 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	files_search_pids($1)
 +	manage_files_pattern($1, xdm_var_run_t, xdm_var_run_t)
++')
++
++########################################
++## <summary>
++##	Search XDM var lib dirs.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`xserver_search_xdm_lib',`
++	gen_require(`
++		type xdm_var_lib_t;
++	')
++
++	allow $1 xdm_var_lib_t:dir search_dir_perms;
  ')
  
  ########################################
-@@ -779,6 +799,50 @@
+@@ -779,6 +817,50 @@
  
  ########################################
  ## <summary>
@@ -17184,7 +17314,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -797,6 +861,24 @@
+@@ -797,6 +879,24 @@
  
  ########################################
  ## <summary>
@@ -17209,7 +17339,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().
-@@ -872,6 +954,27 @@
+@@ -872,6 +972,27 @@
  
  ########################################
  ## <summary>
@@ -17237,7 +17367,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write the X server
  ##	log files.
  ## </summary>
-@@ -1018,10 +1121,11 @@
+@@ -1018,10 +1139,11 @@
  #
  interface(`xserver_domtrans',`
  	gen_require(`
@@ -17250,7 +17380,7 @@ diff -b -B --ignore-all-space --exclude-
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1159,6 +1263,276 @@
+@@ -1159,6 +1281,276 @@
  
  ########################################
  ## <summary>
@@ -17527,7 +17657,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.
-@@ -1172,7 +1546,103 @@
+@@ -1172,7 +1564,103 @@
  interface(`xserver_unconfined',`
  	gen_require(`
  		attribute xserver_unconfined_type;
@@ -17564,7 +17694,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>
@@ -17589,7 +17719,7 @@ diff -b -B --ignore-all-space --exclude-
 +		class x_selection all_x_selection_perms;
 +		class x_event all_x_event_perms;
 +		class x_synthetic_event all_x_synthetic_event_perms;
- ')
++')
 +
 +	# Type attributes
 +	typeattribute $1 x_domain;
@@ -17633,7 +17763,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.26/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/xserver.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/xserver.te	2009-08-03 06:43:20.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -18060,7 +18190,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +650,29 @@
+@@ -542,6 +650,30 @@
  ')
  
  optional_policy(`
@@ -18068,6 +18198,7 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_domtrans_auth(xdm_t)
 +	policykit_read_lib(xdm_t)
 +	policykit_read_reload(xdm_t)
++	policykit_signal_auth(xdm_t)
 +')
 +
 +optional_policy(`
@@ -18090,7 +18221,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +681,9 @@
+@@ -550,8 +682,9 @@
  ')
  
  optional_policy(`
@@ -18102,7 +18233,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +692,6 @@
+@@ -560,7 +693,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -18110,7 +18241,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +702,10 @@
+@@ -571,6 +703,10 @@
  ')
  
  optional_policy(`
@@ -18121,7 +18252,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +722,9 @@
+@@ -587,10 +723,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -18133,7 +18264,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 +736,11 @@
+@@ -602,9 +737,11 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -18145,7 +18276,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +752,14 @@
+@@ -616,13 +753,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -18161,7 +18292,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 +772,19 @@
+@@ -635,9 +773,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -18181,7 +18312,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -680,9 +827,12 @@
+@@ -680,9 +828,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -18195,7 +18326,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +847,12 @@
+@@ -697,8 +848,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -18208,7 +18339,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +874,7 @@
+@@ -720,6 +875,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -18216,7 +18347,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -742,7 +897,7 @@
+@@ -742,7 +898,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -18225,7 +18356,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -774,12 +929,20 @@
+@@ -774,12 +930,20 @@
  ')
  
  optional_policy(`
@@ -18247,7 +18378,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -806,7 +969,7 @@
+@@ -806,7 +970,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -18256,7 +18387,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -827,9 +990,14 @@
+@@ -827,9 +991,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -18271,7 +18402,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)
-@@ -844,11 +1012,14 @@
+@@ -844,11 +1013,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -18287,7 +18418,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -881,6 +1052,8 @@
+@@ -881,6 +1053,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -18296,7 +18427,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -905,6 +1078,8 @@
+@@ -905,6 +1079,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 };
  
@@ -18305,7 +18436,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 };
-@@ -972,17 +1147,49 @@
+@@ -972,17 +1148,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -19738,7 +19869,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.26/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/libraries.fc	2009-07-30 16:27:55.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/libraries.fc	2009-08-03 07:56:50.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -19925,7 +20056,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -304,10 +294,91 @@
+@@ -304,10 +294,92 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -19958,6 +20089,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/nspluginwrapper/np.*\.so	-- gen_context(system_u:object_r:lib_t,s0)
 +
 +/usr/lib/oracle/.*/lib/libnnz.*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/oracle(64)?/.*/lib/libclntsh\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/opt/(.*/)?oracle/(.*/)?libnnz.*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libnnz11.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)



From mhlavink at fedoraproject.org  Tue Aug  4 08:55:28 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  4 Aug 2009 08:55:28 +0000 (UTC)
Subject: rpms/setuptool/devel .cvsignore, 1.19, 1.20 setuptool.spec, 1.36,
	1.37 sources, 1.25, 1.26
Message-ID: <20090804085528.03FC211C00CE@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore setuptool.spec sources 
Log Message:
updated to 1.19.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Mar 2009 12:41:28 -0000	1.19
+++ .cvsignore	4 Aug 2009 08:55:27 -0000	1.20
@@ -1 +1 @@
-setuptool-1.19.5.tar.gz
+setuptool-1.19.6.tar.gz


Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- setuptool.spec	27 Jul 2009 04:13:34 -0000	1.36
+++ setuptool.spec	4 Aug 2009 08:55:27 -0000	1.37
@@ -1,6 +1,6 @@
 Name: setuptool
-Version: 1.19.5
-Release: 3%{?dist}
+Version: 1.19.6
+Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
 Group: Applications/System
@@ -16,7 +16,7 @@ to access all of the text mode configura
 operating system distribution.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 %build
 ./autogen.sh
@@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Tue Aug 04 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.6-1
+- updated to 1.19.6
+- don't display *_IN locale in /dev/tty/X it does not work (#511193)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	9 Mar 2009 12:41:28 -0000	1.25
+++ sources	4 Aug 2009 08:55:27 -0000	1.26
@@ -1 +1 @@
-4880d27fbb76e8cf723d220683b9957a  setuptool-1.19.5.tar.gz
+c346b838fd8960fff308b5a629fc3a27  setuptool-1.19.6.tar.gz



From xhorak at fedoraproject.org  Tue Aug  4 08:59:07 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:59:07 +0000 (UTC)
Subject: rpms/firefox/F-10 mozilla-firstrun.patch, 1.3, 1.4 firefox.spec,
	1.327, 1.328 sources, 1.119, 1.120
Message-ID: <20090804085907.079F111C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	firefox.spec sources 
Added Files:
	mozilla-firstrun.patch 
Log Message:
Fix build

mozilla-firstrun.patch:
 jar.mn |    3 ---
 1 file changed, 3 deletions(-)

Index: mozilla-firstrun.patch
===================================================================
RCS file: mozilla-firstrun.patch
diff -N mozilla-firstrun.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mozilla-firstrun.patch	4 Aug 2009 08:59:06 -0000	1.4
@@ -0,0 +1,13 @@
+diff -up firefox-3.0.2/mozilla/browser/base/jar.mn.firstrun firefox-3.0.2/mozilla/browser/base/jar.mn
+--- mozilla/browser/base/jar.mn.firstrun	2008-04-12 23:26:19.000000000 +0200
++++ mozilla/browser/base/jar.mn	2008-09-18 22:41:31.000000000 +0200
+@@ -21,9 +21,6 @@ browser.jar:
+ *       content/browser/browser.js                    (content/browser.js)
+ *       content/browser/browser.xul                   (content/browser.xul)
+ *       content/browser/credits.xhtml                 (content/credits.xhtml)
+-*       content/browser/EULA.js                       (content/EULA.js)
+-*       content/browser/EULA.xhtml                    (content/EULA.xhtml)
+-*       content/browser/EULA.xul                      (content/EULA.xul)
+ *       content/browser/metaData.js                   (content/metaData.js)
+ *       content/browser/metaData.xul                  (content/metaData.xul)
+ *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- firefox.spec	3 Aug 2009 22:10:20 -0000	1.327
+++ firefox.spec	4 Aug 2009 08:59:06 -0000	1.328
@@ -45,7 +45,7 @@ Source100:      find-external-requires
 
 %if %{official_branding}
 # Required by Mozilla Corporation
-
+Patch10:       mozilla-firstrun.patch
 
 %else
 # Not yet approved by Mozillla Corporation
@@ -95,6 +95,7 @@ cd mozilla
 
 %if %{official_branding}
 # Required by Mozilla Corporation
+%patch10 -p1 -b .firstrun
 
 %else
 # Not yet approved by Mozilla Corporation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	4 Aug 2009 08:27:59 -0000	1.119
+++ sources	4 Aug 2009 08:59:06 -0000	1.120
@@ -1,2 +1,2 @@
 a83ef3e4f8807f19a04a18469ac1238a  firefox-langpacks-3.0.13-20090731.tar.bz2
-040d01a1e22a1ec1b28188479df06007  firefox-3.0.13-source.tar.bz2
+eb2e69872ef6932de0ee98b102eb1d5b  firefox-3.0.13-source.tar.bz2



From xhorak at fedoraproject.org  Tue Aug  4 08:59:15 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 08:59:15 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.25,1.26
Message-ID: <20090804085915.4D80411C00CE@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-serv25465

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.8-4
- 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.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gnome-web-photo.spec	25 Jul 2009 00:51:45 -0000	1.25
+++ gnome-web-photo.spec	4 Aug 2009 08:59:15 -0000	1.26
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.1
+%define gecko_version 1.9.1.2
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.8
-Release: 3%{?dist}
+Release: 4%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.8-4
+- Rebuild against newer gecko
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Aug  4 09:00:15 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 09:00:15 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed.spec,1.6,1.7
Message-ID: <20090804090015.4DE9911C0344@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-serv25827

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
- 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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Gtk2-MozEmbed.spec	26 Jul 2009 06:22:10 -0000	1.6
+++ perl-Gtk2-MozEmbed.spec	4 Aug 2009 09:00:14 -0000	1.7
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.1
+%define gecko_version 1.9.1.2
 %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}.4
+Release:       %{specfilever}%{?dist}.5
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
+- Rebuild against newer gecko
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-6.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Aug  4 09:00:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 09:00:58 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.56,
	1.57
Message-ID: <20090804090058.67EC611C00CE@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-serv26069

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-9
- 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.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gnome-python2-extras.spec	25 Jul 2009 00:45:17 -0000	1.56
+++ gnome-python2-extras.spec	4 Aug 2009 09:00:58 -0000	1.57
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.1.1
+%define gecko_version 1.9.1.2
 %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: 8%{?dist}
+Release: 9%{?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 Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-9
+- Rebuild against newer gecko
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Aug  4 09:01:54 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 09:01:54 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.60,1.61
Message-ID: <20090804090154.A8A1611C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	Miro.spec 
Log Message:
* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-2
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- Miro.spec	4 Aug 2009 06:10:45 -0000	1.60
+++ Miro.spec	4 Aug 2009 09:01:54 -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.1
+%define gecko_ver 1.9.1.2
 
 Name:           Miro
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-2
+- Rebuild against newer gecko
+
 * Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
 - Update to latest upstream (2.5.2)
 - Drop xine hack patch, now upstream



From dwalsh at fedoraproject.org  Tue Aug  4 09:06:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  4 Aug 2009 09:06:46 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.41,1.42
Message-ID: <20090804090646.933A911C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28058

Modified Files:
	policy-F12.patch 
Log Message:
* Fri Jul 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-3
- Allow svirt_t to stream_connect to virtd_t


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |    8 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  287 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   21 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  123 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   22 
 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               |   41 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   38 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   41 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  113 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   42 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |    8 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   59 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  106 +
 policy/modules/services/virt.te                    |  263 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  536 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 policy/modules/system/application.if               |   20 
 policy/modules/system/application.te               |   11 
 policy/modules/system/authlogin.fc                 |    9 
 policy/modules/system/authlogin.if                 |  203 ++-
 policy/modules/system/authlogin.te                 |    9 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1299 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 290 files changed, 12858 insertions(+), 2598 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- policy-F12.patch	4 Aug 2009 08:54:56 -0000	1.41
+++ policy-F12.patch	4 Aug 2009 09:06:45 -0000	1.42
@@ -16599,7 +16599,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.26/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-07-31 15:02:22.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-04 05:06:14.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -16849,7 +16849,7 @@ diff -b -B --ignore-all-space --exclude-
 +manage_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($1, svirt_var_run_t, svirt_var_run_t, virtd_t)
++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)
 +



From xhorak at fedoraproject.org  Tue Aug  4 09:09:55 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 09:09:55 +0000 (UTC)
Subject: rpms/monodevelop/devel monodevelop-2.spec,1.18,1.19
Message-ID: <20090804090955.81C7811C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

Modified Files:
	monodevelop-2.spec 
Log Message:
Rebuild against newer gecko


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- monodevelop-2.spec	25 Jul 2009 15:03:03 -0000	1.18
+++ monodevelop-2.spec	4 Aug 2009 09:09:54 -0000	1.19
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -159,6 +159,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Tue Aug  4 2009 Jan Horak <jhorak at redhat.com> - 2.0-5
+- Rebuild against newer gecko
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Tue Aug  4 09:15:23 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue,  4 Aug 2009 09:15:23 +0000 (UTC)
Subject: rpms/monodevelop/F-11 monodevelop-2.spec,1.17,1.18
Message-ID: <20090804091523.CF6DA11C00CE@cvs1.fedora.phx.redhat.com>

Author: xhorak

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

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.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- monodevelop-2.spec	30 Jun 2009 19:39:09 -0000	1.17
+++ monodevelop-2.spec	4 Aug 2009 09:15:21 -0000	1.18
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        3%{?dist}
+Release:        4%{?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 Aug  4 2009 Jan Horak <jhorak at redhat.com> - 2.0-4
+- Rebuild against newer gecko
+
 * Tue Jun 30 2009 Christopher Aillon <caillon at redhat.com> - 2.0-3
 - Rebuild against newer gecko
 



From harald at fedoraproject.org  Tue Aug  4 09:16:54 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  4 Aug 2009 09:16:54 +0000 (UTC)
Subject: rpms/udev/devel
	udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch, NONE,
	1.1 udev.spec, 1.288, 1.289
Message-ID: <20090804091654.4FC8411C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	udev.spec 
Added Files:
	udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch 
Log Message:
* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-4
- --enable-debug 
- add patch for timestamps in debugging output


udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch:
 libudev/libudev-util-private.c |    3 ++-
 udev/udevd.c                   |   13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri, 17 Jul 2009 11:24:37 +0000 (+0200)
Subject: udevd: add timestamp to --debug output
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=820fc48f249012c673eb38f63dd8b5ee039627d0

udevd: add timestamp to --debug output
---

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 5f5f4c1..f7daa94 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -249,6 +249,8 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 	int i;
 	int err = 0;
 
+	info(udev, "'%s' started\n", command);
+
 	/* build argv from command */
 	util_strscpy(arg, sizeof(arg), command);
 	i = 0;
@@ -273,7 +275,6 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 		argv[0] = arg;
 		argv[1] = NULL;
 	}
-	info(udev, "'%s'\n", command);
 
 	/* prepare pipes from child to parent */
 	if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
diff --git a/udev/udevd.c b/udev/udevd.c
index 2cdc18b..69d509c 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -31,6 +31,7 @@
 #include <time.h>
 #include <getopt.h>
 #include <dirent.h>
+#include <sys/time.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/signalfd.h>
@@ -53,8 +54,15 @@ static void log_fn(struct udev *udev, int priority,
 		   const char *format, va_list args)
 {
 	if (debug) {
-		fprintf(stderr, "[%d] %s: ", (int) getpid(), fn);
-		vfprintf(stderr, format, args);
+		char buf[1024];
+		struct timeval tv;
+		struct timezone tz;
+
+		vsnprintf(buf, sizeof(buf), format, args);
+		gettimeofday(&tv, &tz);
+		fprintf(stderr, "%llu.%06u [%u] %s: %s",
+			(unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+			(int) getpid(), fn, buf);
 	} else {
 		vsyslog(priority, format, args);
 	}
@@ -266,6 +274,7 @@ static void worker_new(struct event *event)
 			struct worker_message msg;
 			int err;
 
+			info(event->udev, "seq %llu running\n", udev_device_get_seqnum(dev));
 			udev_event = udev_event_new(dev);
 			if (udev_event == NULL)
 				_exit(3);


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- udev.spec	29 Jul 2009 12:06:44 -0000	1.288
+++ udev.spec	4 Aug 2009 09:16:53 -0000	1.289
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -15,6 +15,7 @@ Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 
 Patch1: udev.git-3bf768245b98479a14190e1e1d32ef5fae3ddf8a.patch
+Patch2: udev.git-820fc48f249012c673eb38f63dd8b5ee039627d0.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -98,6 +99,7 @@ glib-based applications using libudev fu
 %prep
 %setup -q  
 %patch1 -p1
+%patch2 -p1
 
 %build
 # get rid of rpath
@@ -106,7 +108,7 @@ libtoolize -f -c
 	   --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib} \
 	   --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \
 	   --with-rootlibdir=/%{_lib} --enable-introspection \
-	   --disable-rpath
+	   --disable-rpath --enable-debug
 
 make %{?_smp_mflags}
 
@@ -349,6 +351,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-4
+- --enable-debug 
+- add patch for timestamps in debugging output
+
 * Wed Jul 29 2009 Harald Hoyer <harald at redhat.com> 145-3
 - add patch from upstream git to fix bug #514086
 - add version to usbutils build requirement



From harald at fedoraproject.org  Tue Aug  4 09:26:46 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  4 Aug 2009 09:26:46 +0000 (UTC)
Subject: rpms/udev/F-11
	udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch, NONE,
	1.1 udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch,
	NONE, 1.1 start_udev, 1.83, 1.84 udev.spec, 1.275, 1.276
Message-ID: <20090804092646.962E811C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	start_udev udev.spec 
Added Files:
	udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch 
	udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch 
Log Message:
* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-5
- try to fix audio cdrom problems (bug #513495)


udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch:
 60-cdrom_id.rules |    6 ++++--
 cdrom_id.c        |    6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 16 Apr 2009 22:29:56 +0000 (+0200)
Subject: cdrom_id: add Xen cdrom support
X-Git-Tag: 142~43
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=55d8f5e208396589476583dad8f2a7f2db3e2ef5

cdrom_id: add Xen cdrom support
---

diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules
index 12fbf63..a3e8e3c 100644
--- a/extras/cdrom_id/60-cdrom_id.rules
+++ b/extras/cdrom_id/60-cdrom_id.rules
@@ -1,3 +1,5 @@
-# import optical drive properties
+# do not edit this file, it will be overwritten on update
 
-ACTION=="add|change", KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
+# import optical drive properties
+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \
+  KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]|xvd*", IMPORT{program}="cdrom_id --export $tempnode"
diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 7be0789..c578f12 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -567,10 +567,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* check drive */
-	if (cd_inquiry(udev, fd) < 0) {
-		rc = 2;
-		goto exit;
-	}
+	if (cd_inquiry(udev, fd) < 0)
+		goto print;
 
 	/* read drive and possibly current profile */
 	if (cd_profiles(udev, fd) < 0)

udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch:
 cdrom_id.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu, 23 Apr 2009 13:04:16 +0000 (+0200)
Subject: cdrom_id: skip media tests if CDROM_DRIVE_STATUS != CDS_DISC_OK
X-Git-Tag: 142~26
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5

cdrom_id: skip media tests if CDROM_DRIVE_STATUS != CDS_DISC_OK
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 371d6a2..0d873ae 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -197,6 +197,16 @@ static int cd_capability_compat(struct udev *udev, int fd)
 	return 0;
 }
 
+static int cd_media_compat(struct udev *udev, int fd)
+{
+	if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {
+		info(udev, "CDROM_DRIVE_STATUS != CDS_DISC_OK\n");
+		return -1;
+	}
+	cd_media = 1;
+	return 0;
+}
+
 static int cd_inquiry(struct udev *udev, int fd) {
 	struct scsi_cmd sc;
 	unsigned char inq[128];
@@ -569,7 +579,11 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	/* check drive */
+	/* check for media */
+	if (cd_media_compat(udev, fd) < 0)
+		goto print;
+
+	/* check if drive talks MMC */
 	if (cd_inquiry(udev, fd) < 0)
 		goto print;
 


Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/start_udev,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- start_udev	14 Jul 2009 10:06:45 -0000	1.83
+++ start_udev	4 Aug 2009 09:26:45 -0000	1.84
@@ -258,14 +258,14 @@ if [ -f "/sys/class/tty/console/uevent" 
 	if strstr "$cmdline" udevtrace; then
 		UDEV_OPTS="$UDEV_OPTS --debug-trace"
 	fi
+
 	if strstr "$cmdline" udevlog; then
 		UDEV_OPTS="$UDEV_OPTS --debug"
 		/sbin/udevd -d $UDEV_OPTS 2>$udev_root/.udev/udev.log
 	else
-		/sbin/udevd -d $UDEV_OPTS $UDEV_REDIR
+		/sbin/udevd -d $UDEV_OPTS 
 	fi
 
-
 	wait
 	ret=$[$ret + $?]
 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- udev.spec	14 Jul 2009 10:06:45 -0000	1.275
+++ udev.spec	4 Aug 2009 09:26:45 -0000	1.276
@@ -22,9 +22,11 @@ Patch0: udev.git-f907449eee.patch
 Patch1: udev.git-055e40edc647d8ccfc27c9cd3163ab5dbf63ed6c.patch
 Patch2: udev.git-0c37798916bc87d72f5f1399d9e050307901db84.patch
 Patch3: udev.git-b4fa1b67f86c9555cbb41c57774761730f6b8939.patch
-Patch4: udev.git-d3c8231e738dd286591c1becc2f327ed55ed89d1.patch
-Patch5: udev.git-f58a9099bb2b18f3f683615324a4382b95446305.patch
-Patch6: Prioritize-dmraid-formats-over-md-raid.patch
+Patch4: udev.git-55d8f5e208396589476583dad8f2a7f2db3e2ef5.patch
+Patch5: udev.git-d6f0b22d574c6a5e5f3430be3fc619d4b2f46cd5.patch
+Patch6: udev.git-d3c8231e738dd286591c1becc2f327ed55ed89d1.patch
+Patch7: udev.git-f58a9099bb2b18f3f683615324a4382b95446305.patch
+Patch8: Prioritize-dmraid-formats-over-md-raid.patch
 
 Patch102: udev-118-sysconf.patch
 
@@ -106,6 +108,8 @@ dynamic library, which provides access t
 %patch4 -p1 
 %patch5 -p1 
 %patch6 -p1 
+%patch7 -p1 
+%patch8 -p1 
 
 %patch102 -p1 -b .sysconf
 
@@ -408,6 +412,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-5
+- try to fix audio cdrom problems (bug #513495)
+
 * Tue Jul 14 2009 Harald Hoyer <harald at redhat.com> 141-5
 - add /dev/fuse to be created by start_udev
 - add "udevlog" kernel command line option to redirect the



From harald at fedoraproject.org  Tue Aug  4 09:27:17 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  4 Aug 2009 09:27:17 +0000 (UTC)
Subject: rpms/udev/F-11 udev.spec,1.276,1.277
Message-ID: <20090804092717.5CE8E11C00CE@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	udev.spec 
Log Message:
* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-6
- try to fix audio cdrom problems (bug #513495)



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-11/udev.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- udev.spec	4 Aug 2009 09:26:45 -0000	1.276
+++ udev.spec	4 Aug 2009 09:27:17 -0000	1.277
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 141
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -412,7 +412,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-5
+* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 141-6
 - try to fix audio cdrom problems (bug #513495)
 
 * Tue Jul 14 2009 Harald Hoyer <harald at redhat.com> 141-5



From mlichvar at fedoraproject.org  Tue Aug  4 09:28:10 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  4 Aug 2009 09:28:10 +0000 (UTC)
Subject: rpms/procmail/F-11 procmail-3.22-getline.patch, NONE,
	1.1 procmail.spec, 1.26, 1.27
Message-ID: <20090804092810.EE10C11C00CE@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	procmail.spec 
Added Files:
	procmail-3.22-getline.patch 
Log Message:
- rename getline to avoid conflict with glibc (#505977)
- add -Wno-comments to CFLAGS
- remove package name from summary


procmail-3.22-getline.patch:
 fields.c  |    6 +++---
 formail.c |    2 +-
 formisc.c |    2 +-
 formisc.h |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE procmail-3.22-getline.patch ---
diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
--- procmail-3.22/src/fields.c.getline	2001-09-11 06:57:08.000000000 +0200
+++ procmail-3.22/src/fields.c	2009-06-30 16:10:36.000000000 +0200
@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
 		    /* try and append one valid field to rdheader from stdin */
 int readhead P((void))
 { int idlen;
-  getline();
+  get_line();
   if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
      return 0;
   if(idlen==STRLEN(FROM)&&eqFrom_(buf))			/* it's a From_ line */
    { if(rdheader)
 	return 0;			       /* the From_ line was a fake! */
-     for(;buflast=='>';getline());	    /* gather continued >From_ lines */
+     for(;buflast=='>';get_line());	    /* gather continued >From_ lines */
    }
   else
-     for(;;getline())		      /* get the rest of the continued field */
+     for(;;get_line())		      /* get the rest of the continued field */
       { switch(buflast)			     /* will this line be continued? */
 	 { case ' ':case '\t':				  /* yep, it sure is */
 	      continue;
diff -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
--- procmail-3.22/src/formail.c.getline	2009-06-30 16:00:40.000000000 +0200
+++ procmail-3.22/src/formail.c	2009-06-30 16:10:49.000000000 +0200
@@ -819,7 +819,7 @@ splitit:       { if(!lnl)   /* did the p
       { if(split)		       /* gobble up the next start separator */
 	 { buffilled=0;
 #ifdef sMAILBOX_SEPARATOR
-	   getline();buffilled=0;		 /* but only if it's defined */
+	   get_line();buffilled=0;		 /* but only if it's defined */
 #endif
 	   if(buflast!=EOF)					   /* if any */
 	      goto splitit;
diff -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
--- procmail-3.22/src/formisc.c.getline	2001-06-29 04:20:45.000000000 +0200
+++ procmail-3.22/src/formisc.c	2009-06-30 16:12:20.000000000 +0200
@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* a
   buf[buffilled++]=c;
 }
 
-int getline P((void))			   /* read a newline-terminated line */
+int get_line P((void))			   /* read a newline-terminated line */
 { if(buflast==EOF)			 /* at the end of our Latin already? */
    { loadchar('\n');					  /* fake empty line */
      return EOF;					  /* spread the word */
diff -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
--- procmail-3.22/src/formisc.h.getline	1999-04-19 08:42:15.000000000 +0200
+++ procmail-3.22/src/formisc.h	2009-06-30 16:10:02.000000000 +0200
@@ -17,4 +17,4 @@ void
 char*
  skipwords P((char*start));
 int
- getline P((void));
+ get_line P((void));


Index: procmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procmail/F-11/procmail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- procmail.spec	27 Feb 2009 02:25:53 -0000	1.26
+++ procmail.spec	4 Aug 2009 09:28:10 -0000	1.27
@@ -1,7 +1,7 @@
-Summary: The procmail mail processing program
+Summary: Mail processing program
 Name: procmail
 Version: 3.22
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/Internet
 Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
@@ -12,6 +12,7 @@ Patch1: procmail-3.15.1-man.patch
 Patch2: procmail_3.22-8.debian.patch
 Patch4: procmail-3.22-truncate.patch
 Patch5: procmail-3.22-ipv6.patch
+Patch6: procmail-3.22-getline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -29,12 +30,13 @@ forward certain incoming mail automatica
 %patch2 -p1
 %patch4 -p1 -b .truncate
 %patch5 -p1 -b .ipv6
+%patch6 -p1 -b .getline
 
 find examples -type f | xargs chmod 644
 
 %build
 make RPM_OPT_FLAGS="$(getconf LFS_CFLAGS)" autoconf.h
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-comments $(getconf LFS_CFLAGS)"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -64,6 +66,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man[15]/*
 
 %changelog
+* Tue Jun 30 2009 Miroslav Lichvar <mlichvar at redhat.com> 3.22-24
+- rename getline to avoid conflict with glibc (#505977)
+- add -Wno-comments to CFLAGS
+- remove package name from summary
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.22-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From chitlesh at fedoraproject.org  Tue Aug  4 09:32:59 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 09:32:59 +0000 (UTC)
Subject: rpms/toped/devel import.log,1.5,1.6 toped.spec,1.17,1.18
Message-ID: <20090804093259.C9A4411C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	import.log toped.spec 
Log Message:
0.9.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Aug 2009 08:33:01 -0000	1.5
+++ import.log	4 Aug 2009 09:32:59 -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: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


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/toped.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- toped.spec	4 Aug 2009 08:33:01 -0000	1.17
+++ toped.spec	4 Aug 2009 09:32:59 -0000	1.18
@@ -31,13 +31,13 @@ Toped is a layout editor with CIF and GD
 Toped is listed among Fedora Electronic Lab packages.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 # instead of exporting the variable $TPD_GLOBAL
 sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
 sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
 
-%{__make} -f Makefile.cvs
+#%{__make} -f Makefile.cvs
 %build
 
 %configure



From tbzatek at fedoraproject.org  Tue Aug  4 09:33:53 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  4 Aug 2009 09:33:53 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel
	gnome-vfs-2.24.xx-cdda-handle-invalid-data.patch, NONE,
	1.1 gnome-vfs-2.24.xx-netware-mounts-as-non-local.patch, NONE,
	1.1 gnome-vfs-2.24.xx-smb-64k-length.patch, NONE,
	1.1 gnome-vfs-2.24.xx-uninitialized-struct.patch, NONE,
	1.1 gnome-vfs-2.24.xx-utf8-mounts.patch, NONE,
	1.1 gnome-vfs2.spec, 1.193, 1.194
Message-ID: <20090804093353.4420411C00CE@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1258

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.24.xx-cdda-handle-invalid-data.patch 
	gnome-vfs-2.24.xx-netware-mounts-as-non-local.patch 
	gnome-vfs-2.24.xx-smb-64k-length.patch 
	gnome-vfs-2.24.xx-uninitialized-struct.patch 
	gnome-vfs-2.24.xx-utf8-mounts.patch 
Log Message:
* Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-6
- Backport some upstream patches


gnome-vfs-2.24.xx-cdda-handle-invalid-data.patch:
 cdda-cddb.c |   37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

--- NEW FILE gnome-vfs-2.24.xx-cdda-handle-invalid-data.patch ---
>From 706b54502b1d3ccb179a4d8b91c585e152bbae81 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Mon, 25 May 2009 10:33:59 +0200
Subject: [PATCH 3/6] cdda: Handle invalid data (#582303)

Fix for CAN-2005-0706, handle negative values that may appear when
there is invalid input. Patch from openSUSE.

Note: cdda is disabled by default, so this doesn't affect all users.
---
 modules/cdda-cddb.c |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/modules/cdda-cddb.c b/modules/cdda-cddb.c
index ce83b52..0ec4e25 100644
--- a/modules/cdda-cddb.c
+++ b/modules/cdda-cddb.c
@@ -537,26 +537,30 @@ static void CDDBProcessLine(char *inbuffer,DiscData *data,
   else if(!g_ascii_strncasecmp(inbuffer,"TTITLE",6)) {
     track=atoi(strtok(inbuffer+6,"="));
     
-    if(track<numtracks)
+    if(track >= 0 && track<numtracks)
+    {
       len=strlen(data->data_track[track].track_name);
 
-    strncpy(data->data_track[track].track_name+len,
+      strncpy(data->data_track[track].track_name+len,
 	    ChopWhite(strtok(NULL,"")),256-len);
+    }
   }
   else if(!g_ascii_strncasecmp(inbuffer,"TARTIST",7)) {
     data->data_multi_artist=TRUE;
 
     track=atoi(strtok(inbuffer+7,"="));
     
-    if(track<numtracks)
+    if(track >= 0 && track<numtracks)
+    {
       len=strlen(data->data_track[track].track_artist);
 
-    st = strtok(NULL, "");
-    if(st == NULL)
-        return;    
-    
-    strncpy(data->data_track[track].track_artist+len,
+      st = strtok(NULL, "");
+      if(st == NULL)
+	  return;    
+      
+      strncpy(data->data_track[track].track_artist+len,
 	    ChopWhite(st),256-len);
+    }
   }
   else if(!g_ascii_strncasecmp(inbuffer,"EXTD",4)) {
     len=strlen(data->data_extended);
@@ -566,15 +570,17 @@ static void CDDBProcessLine(char *inbuffer,DiscData *data,
   else if(!g_ascii_strncasecmp(inbuffer,"EXTT",4)) {
     track=atoi(strtok(inbuffer+4,"="));
     
-    if(track<numtracks)
+    if(track >= 0 && track<numtracks)
+    {
       len=strlen(data->data_track[track].track_extended);
 
-    st = strtok(NULL, "");
-    if(st == NULL)
-        return;
-    
-    strncpy(data->data_track[track].track_extended+len,
-	    ChopWhite(st),4096-len);
+      st = strtok(NULL, "");
+      if(st == NULL)
+	return;
+
+      strncpy(data->data_track[track].track_extended+len,
+	  ChopWhite(st),4096-len);
+    }
   }
   else if(!g_ascii_strncasecmp(inbuffer,"PLAYORDER",5)) {
     len=strlen(data->data_playlist);
-- 
1.6.3.3


gnome-vfs-2.24.xx-netware-mounts-as-non-local.patch:
 file-method.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-vfs-2.24.xx-netware-mounts-as-non-local.patch ---
>From f732047ada92a99f1f0cd3ceb7b76499789990f8 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Mon, 25 May 2009 10:37:14 +0200
Subject: [PATCH 4/6] Mark netware mounts as non-local (#582304)

Filesystems of type "novfs" come from Novell Client for Linux, i.e.
they are remote Netware mounts.
---
 modules/file-method.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/modules/file-method.c b/modules/file-method.c
index b74535d..37e4853 100644
--- a/modules/file-method.c
+++ b/modules/file-method.c
@@ -1273,6 +1273,7 @@ do_is_local (GnomeVFSMethod *method,
 			    (strcmp (type, "afs") != 0) &&
 			    (strcmp (type, "autofs") != 0) &&
 			    (strcmp (type, "unknown") != 0) &&
+			    (strcmp (type, "novfs") != 0) &&
 			    (strcmp (type, "ncpfs") != 0));
 		G_UNLOCK (fstype);
 	} else {
-- 
1.6.3.3


gnome-vfs-2.24.xx-smb-64k-length.patch:
 smb-method.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gnome-vfs-2.24.xx-smb-64k-length.patch ---
>From bd5a83f1a6327cbb376ec4915f252f292b5bfb07 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Mon, 25 May 2009 10:41:34 +0200
Subject: [PATCH 5/6] Don't pass in lengths > 64k to smb (#582308)

There seem to be some limitation in smb that makes this not work.
---
 modules/smb-method.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/smb-method.c b/modules/smb-method.c
index 8042a61..42d6c78 100644
--- a/modules/smb-method.c
+++ b/modules/smb-method.c
@@ -1646,7 +1646,7 @@ do_read (GnomeVFSMethod *method,
 		
 		/* Important: perform_authentication leaves and re-enters the lock! */
 		while (perform_authentication (&actx) > 0) {
-			n = smb_context->read (smb_context, handle->file, buffer, num_bytes);
+			n = smb_context->read (smb_context, handle->file, buffer, MIN (USHRT_MAX, num_bytes));
 			actx.res = (n >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
 		}
 		
-- 
1.6.3.3


gnome-vfs-2.24.xx-uninitialized-struct.patch:
 sftp-method.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gnome-vfs-2.24.xx-uninitialized-struct.patch ---
>From ddccb959a78b44133716bf9f01c8faa2306c5408 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Thu, 16 Apr 2009 09:07:05 +0000
Subject: [PATCH 1/6] =?utf-8?q?Bug=20500307=20=E2=80=93=20uninitialized=20GnomeVFSFileInfo=20struct=20in=20do=5Fseek()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

2009-04-16  Alexander Larsson  <alexl at redhat.com>

	Bug 500307 ? uninitialized GnomeVFSFileInfo struct in do_seek()

	* modules/sftp-method.c:
	(do_seek):
	Initialize info to avoid crashes.
	Patch from Fabrice Bellet


svn path=/trunk/; revision=5551
---
 ChangeLog             |    9 +++++++++
 modules/sftp-method.c |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/modules/sftp-method.c b/modules/sftp-method.c
index 4a53af2..07f0e4e 100644
--- a/modules/sftp-method.c
+++ b/modules/sftp-method.c
@@ -2387,7 +2387,7 @@ do_seek (GnomeVFSMethod       *method,
 	 GnomeVFSContext      *context)
 {
 	SftpOpenHandle *handle;
-	GnomeVFSFileInfo file_info;
+	GnomeVFSFileInfo file_info = { 0, };
 	GnomeVFSResult res;
 
 	DEBUG (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s: Enter", G_STRFUNC));
-- 
1.6.3.3


gnome-vfs-2.24.xx-utf8-mounts.patch:
 gnome-vfs-volume-monitor-daemon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-vfs-2.24.xx-utf8-mounts.patch ---

 gnome-vfs-daemon reads /proc/mounts at startup and uses HAL via
 libhal_drive_from_device_file() in multiple places in gnome-vfs-hal-mounts.c

 Strings in DBUS must be valid UTF8. If the device path is not valid UTF8, 
 dbus_connection_send() will cause a disconnect of the caller and an exit.

 Threfore if the device path contains invalid utf8, gnome-vfs-daemon will fail
 to start. If that happens during a session, gnome-vfs-daemon will be restarted
 by any gnome application wich cause a lot of start/stop of gnome-vfs-daemon.

 The following patch simply ensures that we use valid utf8 for device path to
 avoid problems with hal/dbus.

 Olivier Fourdan <ofourdan at redhat.com>

 gnome-vfs-volume-monitor-daemon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -up gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c.utf8-mount gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
--- gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c.utf8-mount	2009-07-07 06:10:24.000000000 -0400
+++ gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2009-07-07 06:10:34.000000000 -0400
@@ -874,7 +874,7 @@ create_vol_from_mount (GnomeVFSVolumeMon
 	vol = g_object_new (GNOME_VFS_TYPE_VOLUME, NULL);
 
 	vol->priv->volume_type = GNOME_VFS_VOLUME_TYPE_MOUNTPOINT;
-	vol->priv->device_path = g_strdup (mount->device_path);
+	vol->priv->device_path = make_utf8 (mount->device_path);
 	vol->priv->unix_device = 0;  /* Caller must fill in.  */
 	vol->priv->activation_uri = gnome_vfs_get_uri_from_local_path (mount->mount_path);
 	vol->priv->filesystem_type = g_strdup (mount->filesystem_type);


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- gnome-vfs2.spec	3 Aug 2009 16:45:34 -0000	1.193
+++ gnome-vfs2.spec	4 Aug 2009 09:33:53 -0000	1.194
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -72,6 +72,18 @@ Patch6: gnome-vfs-2.15.91-mailto-command
 # https://bugzilla.redhat.com/show_bug.cgi?id=335241
 Patch300: gnome-vfs-2.20.0-ignore-certain-mountpoints.patch
 
+
+# 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
+Patch404: gnome-vfs-2.24.xx-utf8-mounts.patch
+
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -121,6 +133,12 @@ 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
 autoheader
 autoconf
@@ -242,6 +260,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-6
+- Backport some upstream patches
+
 * Mon Aug  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-5
 - Fake POT-Creation-Date to prevent multilib issues (#514990)
 



From mschwendt at fedoraproject.org  Tue Aug  4 09:34:15 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  4 Aug 2009 09:34:15 +0000 (UTC)
Subject: extras-repoclosure Mailer.py,NONE,1.1 rc-report.py,1.62,1.63
Message-ID: <20090804093415.A0E8511C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1429

Modified Files:
	rc-report.py 
Added Files:
	Mailer.py 
Log Message:
split off the smtplib usage into an external module that is smarter and tries to reconnect after unexpected server disconnects [with remote smtp servers]


--- NEW FILE Mailer.py ---
#!/usr/bin/python -t
# -*- coding: utf-8 -*-
# -*- mode: Python; indent-tabs-mode: nil; -*-

import smtplib
import time
import email.Charset
from email.MIMEText import MIMEText
from email.Header import Header
from email.Utils import formatdate
from email.Utils import make_msgid

class Mailer(smtplib.SMTP):

    def __init__(self, host='localhost', user=None, passwd=None, tls=False):
        self._host = host
        if user and len(user)>0:
            self._user = user
        else:
            self._user = user
        if passwd and len(passwd)>0:
            self._passwd = passwd
        else:
            self._passwd = passwd
        self._tls = tls
        self._ready = False

        self.maxmailsize = 0
        self.retries = 3
        self.waitsecs = 2

    def tryconnect(self):
        if self._host:
            smtplib.SMTP.__init__(self, self._host)
        else:
            smtplib.SMTP.__init__(self)
        #self.set_debuglevel(1)
        if ( self._tls ):
            self.ehlo()
            self.starttls()
            self.ehlo()
        if ( self._user and self._passwd ):
            self.login(self._user, self._passwd)
        self._ready = True

    def _printerror(self,tuple):
        (num,error) = tuple
        print error, '(%s)'%num

    def quit(self):
        if self._ready:
            smtplib.SMTP.quit(self)
    
    def sendmail( self, fromaddr, to, replyto, subject, body):
        if isinstance(to, basestring):
            to = [to]

        if self.maxmailsize:
            return self._mailsplit(fromaddr, to, replyto, subject, body)
        else:
            return self._mail(fromaddr, to, replyto, subject, body)

    def _mail(self, fromaddr, tolist, replytoaddr, subject, body):
        email.Charset.add_charset('utf-8', email.Charset.SHORTEST, None, None)
        msg = MIMEText(body, 'plain', 'utf-8')
        msg['Subject'] = Header(subject)
        msg['From'] = Header(fromaddr)
        if replytoaddr:
            msg['ReplyTo'] = Header(replytoaddr)
        msg['To'] = Header(','.join(tolist))
        msg['Date'] = formatdate()
        msg['Message-Id'] = make_msgid()

        for i in range(self.retries):
            try:
                if not self._ready:
                    self.tryconnect()
                rv = smtplib.SMTP.sendmail(self, fromaddr, tolist, msg.as_string(False))
                return rv
            except smtplib.SMTPServerDisconnected, e:
                print e
                self._ready = False
                time.sleep(self.waitsecs)

    def _mailsplit(self, fromaddr, toaddrs, replytoaddr, subject, body):
        # Split mail body at line positions to keep it below maxmailsize.
        parts = 0
        start = 0
        end = len(body)
        slices = []
        while ( start < end ):
            if ( (end-start) > self.maxmailsize ):
                nextstart = body.rfind( '\n', start, start+self.maxmailsize )
                if ( nextstart<0 or nextstart==start ):
                    print 'ERROR: cannot split mail body cleanly'
                    nextstart = end
            else:
                nextstart = end
            slices.append( (start, nextstart) )
            start = nextstart
            parts += 1

        curpart = 1
        for (start,end) in slices:
            if (parts>1):
                subjectmodified = ( '(%d/%d) %s' % (curpart, parts, subject) )
                time.sleep(1)
            else:
                subjectmodified = subject
            slicedbody = body[start:end]
            self._mail(fromaddr,toaddrs,replytoaddr,subjectmodified,slicedbody)
            curpart += 1



Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- rc-report.py	9 Jun 2009 12:16:43 -0000	1.62
+++ rc-report.py	4 Aug 2009 09:34:15 -0000	1.63
@@ -3,11 +3,11 @@
 
 import errno, os, sys, stat
 import re
-import smtplib
 import datetime, time
 import rpmUtils.miscutils
 from optparse import OptionParser
 import ConfigParser
+import Mailer, smtplib
 
 from PackageOwners import PackageOwners
 #from FakeOwners import FakeOwners as PackageOwners
@@ -108,29 +108,8 @@
 
 
 def mail(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
-    from email.Header import Header
-    from email.MIMEText import MIMEText
-    msg = MIMEText( body, 'plain' )
-    from email.Utils import make_msgid
-    msg['Message-Id'] = make_msgid()
-    msg['Subject'] = Header(subject)
-    msg['From'] = Header(fromaddr)
-    from email.Utils import formatdate
-    msg['Date'] = formatdate()
-    if len(replytoaddr):
-        msg['Reply-To'] = Header(replytoaddr)
-
-    if isinstance(toaddrs, basestring):
-        toaddrs = [toaddrs]
-    to = ''
-    for t in toaddrs:
-        if len(to):
-            to += ', '
-        to += t
-    msg['To'] = Header(to)
-
     try:
-        r = smtp.sendmail( fromaddr, toaddrs, msg.as_string(False) )
+        r = smtp.sendmail( fromaddr, toaddrs, replytoaddr, subject, body )
         for (name, errormsg) in r.iteritems():
             print name, ':', errormsg
     except smtplib.SMTPRecipientsRefused, obj:
@@ -141,36 +120,6 @@
         print 'ERROR: SMTPException'
 
 
-def mailsplit(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
-    # Split mail body at line positions to keep it below maxmailsize.
-    parts = 0
-    start = 0
-    end = len(body)
-    slices = []
-    while ( start < end ):
-        if ( (end-start) > Mail['maxsize'] ):
-            nextstart = body.rfind( '\n', start, start+Mail['maxsize'] )
-            if ( nextstart<0 or nextstart==start ):
-                print 'ERROR: cannot split mail body cleanly'
-                nextstart = end
-        else:
-            nextstart = end
-        slices.append( (start, nextstart) )
-        start = nextstart
-        parts += 1
-
-    curpart = 1
-    for (start,end) in slices:
-        if (parts>1):
-            subjectmodified = ( '(%d/%d) %s' % (curpart, parts, subject) )
-            time.sleep(1)
-        else:
-            subjectmodified = subject
-        slicedbody = body[start:end]
-        mail(smtp,fromaddr,toaddrs,replytoaddr,subjectmodified,slicedbody)
-        curpart += 1
-
-
 def loadConfigFile(filename):
     if not filename:
         return
@@ -418,17 +367,10 @@
 # Mail init.
 if domail:
     try:
-        srv = smtplib.SMTP( Mail['server'] )
-        #srv.set_debuglevel(1)
-        if (Mail['tls']):
-            srv.ehlo()
-            srv.starttls()
-            srv.ehlo()
-        if ( len(Mail['user']) and len(Mail['passwd']) ):
-            srv.login( Mail['user'], Mail['passwd'] )
+        srv = Mailer.Mailer( Mail['server'], Mail['user'], Mail['passwd'], Mail['tls'] )
+        srv.tryconnect()
     except smtplib.SMTPException, e:
-        print 'ERROR: mailserver login failed'
-        print e
+        print 'SMTPException:', e
         sys.exit(-1)
 
 # Mail reports to owners.
@@ -440,13 +382,15 @@
     mailtext += body
     if domail and ('owner' in opts.mail) and toaddr!='UNKNOWN OWNER':
         subject = Mail['subject'] + ' - %s' % datetime.date.today()
+        srv.maxmailsize = 0
         mail( srv, Mail['from'], toaddr, Mail['replyto'], subject, mailtext )
 
 # Mail summary to mailing-list.
 if domail and ('summary' in opts.mail):
     subject = Mail['subject'] + ' - %s' % datetime.date.today()
     toaddr = Mail['replyto']
-    mailsplit( srv, Mail['from'], toaddr, '', subject, summail )
+    srv.maxmailsize = Mail['maxsize']
+    mail( srv, Mail['from'], toaddr, '', subject, summail )
 
 if domail:
     srv.quit()



From mschwendt at fedoraproject.org  Tue Aug  4 09:37:21 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  4 Aug 2009 09:37:21 +0000 (UTC)
Subject: extras-repoclosure Mailer.py,1.1,1.2
Message-ID: <20090804093721.7745111C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2924

Modified Files:
	Mailer.py 
Log Message:
fix obvious cut'n'paste error


Index: Mailer.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/Mailer.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mailer.py	4 Aug 2009 09:34:15 -0000	1.1
+++ Mailer.py	4 Aug 2009 09:37:21 -0000	1.2
@@ -17,11 +17,11 @@
         if user and len(user)>0:
             self._user = user
         else:
-            self._user = user
+            self._user = None
         if passwd and len(passwd)>0:
             self._passwd = passwd
         else:
-            self._passwd = passwd
+            self._passwd = None
         self._tls = tls
         self._ready = False
 



From mgrepl at fedoraproject.org  Tue Aug  4 09:38:12 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue,  4 Aug 2009 09:38:12 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.37,
	1.38 selinux-policy.spec, 1.893, 1.894
Message-ID: <20090804093812.C28C311C00CE@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-serv3075

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow svirt_t to stream_connect to virtd_t



policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    4 
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/usermanage.te        |    1 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |    9 +
 modules/kernel/corenetwork.te.in   |    2 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |    8 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    6 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.te           |    2 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |    8 -
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   12 +
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    1 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   28 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   19 ++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  222 ++++++++++++++++-------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    6 
 modules/system/userdomain.if       |   23 +--
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 120 files changed, 1976 insertions(+), 633 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- policy-20090521.patch	31 Jul 2009 11:36:19 -0000	1.37
+++ policy-20090521.patch	4 Aug 2009 09:38:12 -0000	1.38
@@ -2027,7 +2027,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-08-04 11:10:09.000000000 +0200
 @@ -14,7 +14,7 @@
  files_pid_file(consolekit_var_run_t)
  
@@ -2045,6 +2045,13 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_list_inotifyfs(consolekit_t)
  
+@@ -124,3 +125,6 @@
+ 	fs_dontaudit_rw_cifs_files(consolekit_t)
+ ')
+ 
++optional_policy(`
++        udev_read_db(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
@@ -2101,7 +2108,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.12/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-07-07 09:04:11.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-02 22:01:31.000000000 +0200
 @@ -733,6 +733,8 @@
  files_read_etc_files(cups_pdf_t)
  files_read_usr_files(cups_pdf_t)
@@ -2698,8 +2705,8 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.6.12/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/mysql.te	2009-06-25 10:21:01.000000000 +0200
-@@ -136,10 +136,12 @@
++++ serefpolicy-3.6.12/policy/modules/services/mysql.te	2009-08-04 11:04:57.000000000 +0200
+@@ -136,10 +136,14 @@
  allow mysqld_safe_t self:capability { dac_override fowner chown };
  allow mysqld_safe_t self:fifo_file rw_fifo_file_perms;
   
@@ -2709,6 +2716,8 @@ diff -b -B --ignore-all-space --exclude-
  logging_log_filetrans(mysqld_safe_t, mysqld_log_t, file)
  
 -mysql_append_db_files(mysqld_safe_t)        
++domain_getattr_all_domains(mysqld_safe_t)
++
 +mysql_manage_db_files(mysqld_safe_t)        
  mysql_read_config(mysqld_safe_t)
  mysql_search_pid_files(mysqld_safe_t)
@@ -3748,7 +3757,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(uucpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-08-04 09:35:17.000000000 +0200
 @@ -22,6 +22,13 @@
  
  ## <desc>
@@ -3792,15 +3801,17 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	brctl_domtrans(virtd_t)
  ')
-@@ -307,6 +322,7 @@
+@@ -306,7 +321,9 @@
+ manage_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;
  manage_dirs_pattern(svirt_t, svirt_image_t, svirt_image_t)
  manage_files_pattern(svirt_t, svirt_image_t, svirt_image_t)
-@@ -316,16 +332,17 @@
+@@ -316,16 +333,17 @@
  dontaudit svirt_t virt_content_t:file write_file_perms;
  dontaudit svirt_t virt_content_t:dir write;
  
@@ -3821,7 +3832,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_udp_sendrecv_generic_if(svirt_t)
  corenet_udp_sendrecv_generic_node(svirt_t)
  corenet_udp_sendrecv_all_ports(svirt_t)
-@@ -353,10 +370,6 @@
+@@ -353,10 +371,6 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -p -r1.893 -r1.894
--- selinux-policy.spec	31 Jul 2009 11:36:19 -0000	1.893
+++ selinux-policy.spec	4 Aug 2009 09:38:12 -0000	1.894
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 72%{?dist}
+Release: 73%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 4 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-73
+- Allow svirt_t to stream_connect to virtd_t 
+
 * Fri Jul 31 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-72
 - Add postfix and dovecot fixes from dwalsh
 



From rakesh at fedoraproject.org  Tue Aug  4 09:51:23 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue,  4 Aug 2009 09:51:23 +0000 (UTC)
Subject: rpms/zile/F-11 .cvsignore, 1.7, 1.8 import.log, 1.3, 1.4 sources,
	1.7, 1.8 zile.spec, 1.12, 1.13
Message-ID: <20090804095123.A932811C00CE@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	.cvsignore import.log sources zile.spec 
Log Message:
Updated to 2.3.9 and removed missing info file issue.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Apr 2009 19:51:13 -0000	1.7
+++ .cvsignore	4 Aug 2009 09:51:22 -0000	1.8
@@ -1 +1 @@
-zile-2.3.6.tar.gz
+zile-2.3.9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Apr 2009 19:51:13 -0000	1.3
+++ import.log	4 Aug 2009 09:51:22 -0000	1.4
@@ -1,3 +1,4 @@
 zile-2_2_61-2_fc9:HEAD:zile-2.2.61-2.fc9.src.rpm:1218691536
 zile-2_3_0-1_fc10:HEAD:zile-2.3.0-1.fc10.src.rpm:1232045193
 zile-2_3_6-1_fc11:HEAD:zile-2.3.6-1.fc11.src.rpm:1239565544
+zile-2_3_9-1_fc11:F-11:zile-2.3.9-1.fc11.src.rpm:1249379716


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Apr 2009 19:51:13 -0000	1.7
+++ sources	4 Aug 2009 09:51:22 -0000	1.8
@@ -1 +1 @@
-5ca5a8810f857940ed0786ac20959651  zile-2.3.6.tar.gz
+51f2fb489b81d80f997644e872445370  zile-2.3.9.tar.gz


Index: zile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-11/zile.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- zile.spec	12 Apr 2009 19:51:13 -0000	1.12
+++ zile.spec	4 Aug 2009 09:51:22 -0000	1.13
@@ -1,15 +1,13 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.3.6
+Version: 2.3.9
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Editors
 URL: http://www.gnu.org/software/%{name}/
 Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: texinfo ncurses-devel help2man
-Requires(post): info
-Requires(preun): info
+BuildRequires: ncurses-devel help2man
 
 %description
 Zile is a small Emacs clone. Zile is a customizable, self-documenting
@@ -33,14 +31,6 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-%preun
-if [ $1 == 0 ] ; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -49,6 +39,9 @@ fi
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Aug 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.9-1
+- Updated to 2.3.9
+
 * Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.6-1
 - Updated to 2.3.6 (Check changelog for details)
 - Added help2man in BuildRequires and adjusted %%files



From mschwendt at fedoraproject.org  Tue Aug  4 09:52:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue,  4 Aug 2009 09:52:56 +0000 (UTC)
Subject: extras-repoclosure Mailer.py,1.2,1.3 rc-report.py,1.63,1.64
Message-ID: <20090804095256.3856D11C00CE@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6169

Modified Files:
	Mailer.py rc-report.py 
Log Message:
re-throw disconnect exception after max.retries


Index: Mailer.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/Mailer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mailer.py	4 Aug 2009 09:37:21 -0000	1.2
+++ Mailer.py	4 Aug 2009 09:52:55 -0000	1.3
@@ -80,7 +80,10 @@
             except smtplib.SMTPServerDisconnected, e:
                 print e
                 self._ready = False
-                time.sleep(self.waitsecs)
+                if i == (self.retries-1):
+                    raise
+                else:
+                    time.sleep(self.waitsecs)
 
     def _mailsplit(self, fromaddr, toaddrs, replytoaddr, subject, body):
         # Split mail body at line positions to keep it below maxmailsize.


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- rc-report.py	4 Aug 2009 09:34:15 -0000	1.63
+++ rc-report.py	4 Aug 2009 09:52:55 -0000	1.64
@@ -117,6 +117,7 @@
         for (addr, errormsg) in obj.recipients.iteritems():
             print addr, ':', errormsg
     except smtplib.SMTPException:
+        # todo: handle hard disconnect failures
         print 'ERROR: SMTPException'
 
 



From twaugh at fedoraproject.org  Tue Aug  4 09:54:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 09:54:59 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.211,1.212
Message-ID: <20090804095459.374B911C00CE@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
- Fix hpcups fax PPDs (bug #515356)



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- hplip.spec	28 Jul 2009 09:50:39 -0000	1.211
+++ hplip.spec	4 Aug 2009 09:54:58 -0000	1.212
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.6b
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -141,6 +141,13 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # (laundpad bug #405400).
 %patch15 -p1 -b .resolution-405400
 
+# Fix hpcups fax PPDs (bug #515356)
+pushd fax/ppd
+gunzip *hpcups*
+perl -pi -e 's/^(\*Product:.*\")(.*)\"/\1(\2)"/' *hpcups*
+gzip -n *hpcups*
+popd
+
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -348,6 +355,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
+- Fix hpcups fax PPDs (bug #515356)
+
 * Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-4
 - Fixed ui-optional patch for qt4 code path (bug #500473).
 - Fixed HWResolution for 'Normal' output from the hpcups driver



From than at fedoraproject.org  Tue Aug  4 09:57:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  4 Aug 2009 09:57:57 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.261,
	1.262 sources, 1.44, 1.45
Message-ID: <20090804095757.9693E11C00CE@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebase-workspace.spec sources 
Log Message:
respin



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- kdebase-workspace.spec	3 Aug 2009 09:29:42 -0000	1.261
+++ kdebase-workspace.spec	4 Aug 2009 09:57:57 -0000	1.262
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -515,6 +515,9 @@ fi
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
 * Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-4
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	3 Aug 2009 09:29:43 -0000	1.44
+++ sources	4 Aug 2009 09:57:57 -0000	1.45
@@ -1 +1 @@
-d7c50d0adb60069c2bab8cc8902bfd59  kdebase-workspace-4.3.0.tar.bz2
+e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2



From than at fedoraproject.org  Tue Aug  4 10:00:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  4 Aug 2009 10:00:11 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec, 1.132,
	1.133 sources, 1.37, 1.38
Message-ID: <20090804100011.0E51611C0417@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebase-runtime.spec sources 
Log Message:
respin



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- kdebase-runtime.spec	29 Jul 2009 22:21:07 -0000	1.132
+++ kdebase-runtime.spec	4 Aug 2009 10:00:10 -0000	1.133
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -215,6 +215,9 @@ fi
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- respin
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	29 Jul 2009 22:21:07 -0000	1.37
+++ sources	4 Aug 2009 10:00:10 -0000	1.38
@@ -1 +1 @@
-9681d074a26e2affe7c0a75db5139846  kdebase-runtime-4.3.0.tar.bz2
+e4ea5d567187f4ac952c67326c5afd94  kdebase-runtime-4.3.0.tar.bz2



From than at fedoraproject.org  Tue Aug  4 10:02:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  4 Aug 2009 10:02:07 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec, 1.52,
	1.53 sources, 
	1.18, 1.19 kdeplasma-addons-4.3.0-microblog_post.patch, 1.2, NONE
Message-ID: <20090804100207.BF5B711C00CE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8154

Modified Files:
	kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.0-microblog_post.patch 
Log Message:
respin



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- kdeplasma-addons.spec	3 Aug 2009 18:01:46 -0000	1.52
+++ kdeplasma-addons.spec	4 Aug 2009 10:02:07 -0000	1.53
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,9 +15,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-# http://websvn.kde.org/?view=rev&revision=1004203
-# http://websvn.kde.org/?view=rev&revision=1006404
-Patch100: kdeplasma-addons-4.3.0-microblog_post.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -75,8 +72,6 @@ Requires: kdelibs4%{?_isa} >= %{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
 
-%patch100 -p1 -b .microblog_post
-
 
 %build
 
@@ -161,6 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
 * Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - fix microblog post crasher (kdebug#202364)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	30 Jul 2009 09:36:55 -0000	1.18
+++ sources	4 Aug 2009 10:02:07 -0000	1.19
@@ -1 +1 @@
-abfbe2d32c444689b5bf4e5346b33c9e  kdeplasma-addons-4.3.0.tar.bz2
+74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2


--- kdeplasma-addons-4.3.0-microblog_post.patch DELETED ---



From twaugh at fedoraproject.org  Tue Aug  4 10:03:38 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 10:03:38 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.275, 
	1.276
Message-ID: <20090804100338.77B1111C00CE@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-serv8609

Modified Files:
	system-config-printer.spec 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-8
- Dropped foomatic dependency from libs package.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- system-config-printer.spec	31 Jul 2009 14:14:42 -0000	1.275
+++ system-config-printer.spec	4 Aug 2009 10:03:38 -0000	1.276
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -59,7 +59,6 @@ the user to configure a CUPS print serve
 Summary: Libraries and shared code for printer administration tool
 Group: System Environment/Base
 Requires: python
-Requires: foomatic
 Provides: pycups = %{pycups_version}
 Provides: pysmbc = %{pysmbc_version}
 
@@ -196,6 +195,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-8
+- Dropped foomatic dependency from libs package.
+
 * Fri Jul 31 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-7
 - Sync with 1.1.x.
 - Added patch for cupspk DevicesGet method call.



From twaugh at fedoraproject.org  Tue Aug  4 10:03:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 10:03:54 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.213,1.214
Message-ID: <20090804100354.3EC7911C00CE@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
- Fix hpcups fax PPDs (bug #515356)



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- hplip.spec	28 Jul 2009 09:48:14 -0000	1.213
+++ hplip.spec	4 Aug 2009 10:03:53 -0000	1.214
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.6b
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -141,6 +141,13 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # (laundpad bug #405400).
 %patch15 -p1 -b .resolution-405400
 
+# Fix hpcups fax PPDs (bug #515356)
+pushd fax/ppd
+gunzip *hpcups*
+perl -pi -e 's/^(\*Product:.*\")(.*)\"/\1(\2)"/' *hpcups*
+gzip -n *hpcups*
+popd
+
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -348,6 +355,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
+- Fix hpcups fax PPDs (bug #515356)
+
 * Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-4
 - Fixed ui-optional patch for qt4 code path (bug #500473).
 - Fixed HWResolution for 'Normal' output from the hpcups driver



From chitlesh at fedoraproject.org  Tue Aug  4 10:04:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 10:04:40 +0000 (UTC)
Subject: rpms/toped/F-10 toped.spec,1.14,1.15
Message-ID: <20090804100440.7A3EF11C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	toped.spec 
Log Message:



Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/toped.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- toped.spec	4 Aug 2009 08:26:22 -0000	1.14
+++ toped.spec	4 Aug 2009 10:04:40 -0000	1.15
@@ -31,13 +31,13 @@ Toped is a layout editor with CIF and GD
 Toped is listed among Fedora Electronic Lab packages.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 # instead of exporting the variable $TPD_GLOBAL
 sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
 sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
 
-%{__make} -f Makefile.cvs
+#%{__make} -f Makefile.cvs
 %build
 
 %configure



From chitlesh at fedoraproject.org  Tue Aug  4 10:04:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 10:04:40 +0000 (UTC)
Subject: rpms/toped/EL-5 toped.spec,1.9,1.10
Message-ID: <20090804100440.3963811C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	toped.spec 
Log Message:



Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/EL-5/toped.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- toped.spec	4 Aug 2009 08:34:05 -0000	1.9
+++ toped.spec	4 Aug 2009 10:04:40 -0000	1.10
@@ -31,13 +31,13 @@ Toped is a layout editor with CIF and GD
 Toped is listed among Fedora Electronic Lab packages.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 # instead of exporting the variable $TPD_GLOBAL
 sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
 sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
 
-%{__make} -f Makefile.cvs
+#%{__make} -f Makefile.cvs
 %build
 
 %configure



From chitlesh at fedoraproject.org  Tue Aug  4 10:04:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  4 Aug 2009 10:04:40 +0000 (UTC)
Subject: rpms/toped/F-11 toped.spec,1.16,1.17
Message-ID: <20090804100440.A9AA111C00CE@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	toped.spec 
Log Message:



Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/toped.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- toped.spec	4 Aug 2009 08:28:34 -0000	1.16
+++ toped.spec	4 Aug 2009 10:04:40 -0000	1.17
@@ -31,13 +31,13 @@ Toped is a layout editor with CIF and GD
 Toped is listed among Fedora Electronic Lab packages.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 # instead of exporting the variable $TPD_GLOBAL
 sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
 sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
 
-%{__make} -f Makefile.cvs
+#%{__make} -f Makefile.cvs
 %build
 
 %configure



From airlied at fedoraproject.org  Tue Aug  4 10:14:57 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue,  4 Aug 2009 10:14:57 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.459,
	1.460 xserver-1.6.99-vga-arb.patch, 1.1, 1.2
Message-ID: <20090804101457.DA65A11C00CE@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	xorg-x11-server.spec xserver-1.6.99-vga-arb.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.6.99-25.20090804
- fix VGA arb fatal error



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- xorg-x11-server.spec	4 Aug 2009 06:10:30 -0000	1.459
+++ xorg-x11-server.spec	4 Aug 2009 10:14:56 -0000	1.460
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   24.%{gitdate}%{?dist}
+Release:   25.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.6.99-25.20090804
+- fix VGA arb fatal error
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.6.99-24.20090804
 - update server snapshot + add VGA arbitration
 

xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1150 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1521 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.99-vga-arb.patch	4 Aug 2009 06:10:30 -0000	1.1
+++ xserver-1.6.99-vga-arb.patch	4 Aug 2009 10:14:56 -0000	1.2
@@ -1,4 +1,4 @@
-From 307264f4bc6c9431aea49be67a6b832ccafc7007 Mon Sep 17 00:00:00 2001
+From 3e94ca1eb90ded7910edbfa42a63bd832cfa405c Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Mon, 3 Aug 2009 14:09:32 +1000
 Subject: [PATCH] X server: VGA arbitration.
@@ -14,7 +14,7 @@ test with lots more sigio mouse movement
  hw/xfree86/common/xf86DPMS.c           |    4 +-
  hw/xfree86/common/xf86Init.c           |   11 +-
  hw/xfree86/common/xf86PM.c             |    6 +-
- hw/xfree86/common/xf86VGAarbiter.c     | 1137 ++++++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86VGAarbiter.c     | 1150 ++++++++++++++++++++++++++++++++
  hw/xfree86/common/xf86VGAarbiter.h     |   48 ++
  hw/xfree86/common/xf86VGAarbiterPriv.h |  266 ++++++++
  hw/xfree86/common/xf86str.h            |    4 +-
@@ -23,7 +23,7 @@ test with lots more sigio mouse movement
  hw/xfree86/int10/generic.c             |    2 +
  hw/xfree86/loader/sdksyms.sh           |    1 +
  include/xorg-config.h.in               |    3 +
- 15 files changed, 1508 insertions(+), 10 deletions(-)
+ 15 files changed, 1521 insertions(+), 10 deletions(-)
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.c
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.h
  create mode 100644 hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -225,10 +225,10 @@ index f6138c3..fa24813 100644
  	}
 diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
 new file mode 100644
-index 0000000..33357a1
+index 0000000..6a97b7c
 --- /dev/null
 +++ b/hw/xfree86/common/xf86VGAarbiter.c
-@@ -0,0 +1,1137 @@
+@@ -0,0 +1,1150 @@
 +/*
 + * This code was stolen from RAC and adapted to control the legacy vga
 + * interface.
@@ -302,12 +302,14 @@ index 0000000..33357a1
 +static int VGAarbiterGCIndex;
 +static DevPrivateKey VGAarbiterGCKey = &VGAarbiterGCIndex;
 +
++static int vga_no_arb = 0;
 +void
 +xf86VGAarbiterInit(void)
 +{
-+    if (pci_device_vgaarb_init() != 0)
-+        FatalError("VGA Arbiter: cannot open vga arbiter fd. Exiting\n");
-+
++    if (pci_device_vgaarb_init() != 0) {
++	vga_no_arb = 1;
++        Error("VGA Arbiter: cannot open vga arbiter fd. Exiting\n");
++    }
 +}
 +
 +void
@@ -332,9 +334,12 @@ index 0000000..33357a1
 +Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
 +{
 +    int vga_count;
-+    unsigned int rsrc_decodes;
++    int rsrc_decodes;
 +    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
 +
++    if (vga_no_arb)
++	return TRUE;
++
 +    pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);
 +    if (vga_count > 1) {
 +        if (rsrc_decodes) {
@@ -351,6 +356,9 @@ index 0000000..33357a1
 +    GDevPtr dev_tmp;
 +    struct pci_device *dev;
 +
++    if (vga_no_arb)
++	return;
++
 +    dev_tmp = xf86GetDevFromEntity(pScrn->entityList[0],
 +                                   pScrn->entityInstanceList[0]);
 +    sscanf(dev_tmp->busID, "PCI:%d:%d:%d", &bus, &devi, &func);
@@ -363,6 +371,8 @@ index 0000000..33357a1
 +void
 +xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn)
 +{
++    if (vga_no_arb)
++	return;
 +    pci_device_vgaarb_decodes(VGA_ARB_RSRC_LEGACY_MEM | VGA_ARB_RSRC_LEGACY_IO);
 +}
 +
@@ -376,6 +386,9 @@ index 0000000..33357a1
 +    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
 +#endif
 +
++    if (vga_no_arb)
++	return FALSE;
++
 +    pScrn = xf86Screens[pScreen->myNum];
 +    PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 +



From dwalsh at fedoraproject.org  Tue Aug  4 10:27:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  4 Aug 2009 10:27:53 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-11
	setroubleshoot-plugins-2.0.18-global_ssp.patch, 1.2,
	1.3 setroubleshoot-plugins.spec, 1.25, 1.26
Message-ID: <20090804102753.2C5D811C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15157

Modified Files:
	setroubleshoot-plugins-2.0.18-global_ssp.patch 
	setroubleshoot-plugins.spec 
Log Message:
* Tue Aug 4 2009  <dwalsh at redhat.com> - 2.0.18-4
- Try agian to remove stunnel_is_daemon plugin


setroubleshoot-plugins-2.0.18-global_ssp.patch:
 Makefile.am   |    1 -
 Makefile.in   |    1 -
 global_ssp.py |    5 +++--
 3 files changed, 3 insertions(+), 4 deletions(-)

Index: setroubleshoot-plugins-2.0.18-global_ssp.patch
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-11/setroubleshoot-plugins-2.0.18-global_ssp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setroubleshoot-plugins-2.0.18-global_ssp.patch	31 Jul 2009 10:35:01 -0000	1.2
+++ setroubleshoot-plugins-2.0.18-global_ssp.patch	4 Aug 2009 10:27:51 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up setroubleshoot-plugins-2.0.18/src/global_ssp.py~ setroubleshoot-plugins-2.0.18/src/global_ssp.py
---- setroubleshoot-plugins-2.0.18/src/global_ssp.py~	2009-07-19 07:09:13.000000000 -0400
-+++ setroubleshoot-plugins-2.0.18/src/global_ssp.py	2009-07-19 07:09:39.000000000 -0400
+diff -up setroubleshoot-plugins-2.0.18/src/global_ssp.py.global_ssp setroubleshoot-plugins-2.0.18/src/global_ssp.py
+--- setroubleshoot-plugins-2.0.18/src/global_ssp.py.global_ssp	2009-04-03 15:57:24.000000000 -0400
++++ setroubleshoot-plugins-2.0.18/src/global_ssp.py	2009-08-04 06:23:54.000000000 -0400
 @@ -35,8 +35,8 @@ class plugin(Plugin):
      are situations where all applications require the access (for example,
      when ProPolice/SSP stack smashing protection is used).  Allowing this
@@ -20,9 +20,9 @@ diff -up setroubleshoot-plugins-2.0.18/s
              return self.report(avc, None,
                                 self.summary, self.problem_description,
                                 self.fix_description, self.fix_cmd)
-diff -up setroubleshoot-plugins-2.0.18/src/Makefile.am~ setroubleshoot-plugins-2.0.18/src/Makefile.am
---- setroubleshoot-plugins-2.0.18/src/Makefile.am~	2009-04-03 15:57:24.000000000 -0400
-+++ setroubleshoot-plugins-2.0.18/src/Makefile.am	2009-07-31 06:31:13.000000000 -0400
+diff -up setroubleshoot-plugins-2.0.18/src/Makefile.am.global_ssp setroubleshoot-plugins-2.0.18/src/Makefile.am
+--- setroubleshoot-plugins-2.0.18/src/Makefile.am.global_ssp	2009-04-03 15:57:24.000000000 -0400
++++ setroubleshoot-plugins-2.0.18/src/Makefile.am	2009-08-04 06:23:54.000000000 -0400
 @@ -84,7 +84,6 @@ PLUGIN_FILES =				\
  	secure_mode_policyload.py	\
  	spamd_enable_home_dirs.py	\
@@ -31,3 +31,14 @@ diff -up setroubleshoot-plugins-2.0.18/s
  	swapfile.py			\
  	use_nfs_home_dirs.py		\
  	use_samba_home_dirs.py		\
+diff -up setroubleshoot-plugins-2.0.18/src/Makefile.in.global_ssp setroubleshoot-plugins-2.0.18/src/Makefile.in
+--- setroubleshoot-plugins-2.0.18/src/Makefile.in.global_ssp	2009-06-05 11:00:18.000000000 -0400
++++ setroubleshoot-plugins-2.0.18/src/Makefile.in	2009-08-04 06:24:14.000000000 -0400
+@@ -212,7 +212,6 @@ PLUGIN_FILES = \
+ 	filesystem_associate.py		\
+ 	ftpd_is_daemon.py		\
+ 	ftp_home_dir.py			\
+-	global_ssp.py			\
+ 	httpd_bad_labels.py		\
+ 	httpd_builtin_scripting.py	\
+ 	httpd_can_network_connect_db.py	\


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-11/setroubleshoot-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- setroubleshoot-plugins.spec	31 Jul 2009 10:35:02 -0000	1.25
+++ setroubleshoot-plugins.spec	4 Aug 2009 10:27:51 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
 Version: 2.0.18
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Aug 4 2009  <dwalsh at redhat.com> - 2.0.18-4
+- Try agian to remove stunnel_is_daemon plugin
+
 * Fri Jul 31 2009  <dwalsh at redhat.com> - 2.0.18-3
 - Remove stunnel_is_daemon plugin
 



From ynemoy at fedoraproject.org  Tue Aug  4 10:29:32 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Tue,  4 Aug 2009 10:29:32 +0000 (UTC)
Subject: rpms/ghc-uniplate/devel ghc-uniplate.spec,1.3,1.4
Message-ID: <20090804102932.BB96B11C00CE@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-uniplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15618

Modified Files:
	ghc-uniplate.spec 
Log Message:
rebuild against new ghc



Index: ghc-uniplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-uniplate/devel/ghc-uniplate.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-uniplate.spec	25 Jul 2009 00:05:29 -0000	1.3
+++ ghc-uniplate.spec	4 Aug 2009 10:29:32 -0000	1.4
@@ -8,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        1.2.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Uniform type generic traversals
 Group:          Development/Libraries
 License:        BSD
@@ -136,6 +136,9 @@ fi
 
 
 %changelog
+* Tue Aug  4 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.2.0.3-6
+- rebuild against new ghc
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Aug  4 10:29:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  4 Aug 2009 10:29:41 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.48,1.49
Message-ID: <20090804102941.6916011C00CE@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	vinagre.spec 
Log Message:
* Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
- Fix pkg-config requires



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- vinagre.spec	28 Jul 2009 18:49:36 -0000	1.48
+++ vinagre.spec	4 Aug 2009 10:29:41 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		vinagre
 Version:	2.27.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -39,7 +39,7 @@ GNOME keyring, and browse the network to
 Summary: Development files for vinagre
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkg-config
+Requires: pkgconfig
 
 %description devel
 Vinagre is a VNC client for the GNOME desktop.
@@ -157,6 +157,9 @@ fi
 
 
 %changelog
+* Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
+- Fix pkg-config requires
+
 * Tue Jul 28 2009 Matthisa Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 - Split off a -devel package



From ynemoy at fedoraproject.org  Tue Aug  4 10:38:06 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Tue,  4 Aug 2009 10:38:06 +0000 (UTC)
Subject: rpms/ghc-haskell-src-exts/devel ghc-haskell-src-exts.spec,1.8,1.9
Message-ID: <20090804103806.9B18D11C00CE@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17755

Modified Files:
	ghc-haskell-src-exts.spec 
Log Message:
rebuild against new cvs



Index: ghc-haskell-src-exts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/devel/ghc-haskell-src-exts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ghc-haskell-src-exts.spec	25 Jul 2009 00:04:39 -0000	1.8
+++ ghc-haskell-src-exts.spec	4 Aug 2009 10:38:05 -0000	1.9
@@ -8,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for Manipulating Haskell source
 Group:          Development/Libraries
 License:        BSD
@@ -149,6 +149,9 @@ fi
 
 
 %changelog
+* Tue Aug  4 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.0.1-3
+- rebuild against new ghc
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 10:52:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 10:52:57 +0000
Subject: [pkgdb] biniax (un)retirement
Message-ID: <20090804105257.BC4F510F879@bastion2.fedora.phx.redhat.com>

Package biniax in Fedora devel has been unretired by jwboyer and is now orphan.

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



From schwab at fedoraproject.org  Tue Aug  4 11:05:23 2009
From: schwab at fedoraproject.org (schwab)
Date: Tue,  4 Aug 2009 11:05:23 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.280, 1.281 glibc-fedora.patch, 1.314, 
	1.315 glibc.spec, 1.404, 1.405 import.log, 1.24, 1.25 sources,
	1.305, 1.306
Message-ID: <20090804110523.A782F11C00CE@cvs1.fedora.phx.redhat.com>

Author: schwab

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.1-4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- .cvsignore	31 Jul 2009 12:10:15 -0000	1.280
+++ .cvsignore	4 Aug 2009 11:05:20 -0000	1.281
@@ -1,2 +1,2 @@
-glibc-2.10.1-65-gc97164f-fedora.tar.bz2
-glibc-2.10.1-65-gc97164f.tar.bz2
+glibc-2.10.1-68-gc87c885-fedora.tar.bz2
+glibc-2.10.1-68-gc87c885.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   20 +
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |    8 
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 55 files changed, 750 insertions(+), 463 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- glibc-fedora.patch	31 Jul 2009 12:10:15 -0000	1.314
+++ glibc-fedora.patch	4 Aug 2009 11:05:20 -0000	1.315
@@ -1,6 +1,6 @@
---- glibc-2.10.1-65-gc97164f/ChangeLog
-+++ glibc-2.10.1-3/ChangeLog
-@@ -8044,6 +8044,13 @@
+--- glibc-2.10.1-68-gc87c885/ChangeLog
++++ glibc-2.10.1-4/ChangeLog
+@@ -8060,6 +8060,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -8339,6 +8346,10 @@
+@@ -8355,6 +8362,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -9596,6 +9607,15 @@
+@@ -9612,6 +9623,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10.1-65-gc97164f/ChangeLog.15
-+++ glibc-2.10.1-3/ChangeLog.15
+--- glibc-2.10.1-68-gc87c885/ChangeLog.15
++++ glibc-2.10.1-4/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10.1-65-gc97164f/ChangeLog.16
-+++ glibc-2.10.1-3/ChangeLog.16
+--- glibc-2.10.1-68-gc87c885/ChangeLog.16
++++ glibc-2.10.1-4/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10.1-65-gc97164f/csu/Makefile
-+++ glibc-2.10.1-3/csu/Makefile
+--- glibc-2.10.1-68-gc87c885/csu/Makefile
++++ glibc-2.10.1-4/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10.1-65-gc97164f/csu/elf-init.c
-+++ glibc-2.10.1-3/csu/elf-init.c
+--- glibc-2.10.1-68-gc87c885/csu/elf-init.c
++++ glibc-2.10.1-4/csu/elf-init.c
 @@ -49,6 +49,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;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10.1-65-gc97164f/debug/tst-chk1.c
-+++ glibc-2.10.1-3/debug/tst-chk1.c
+--- glibc-2.10.1-68-gc87c885/debug/tst-chk1.c
++++ glibc-2.10.1-4/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10.1-65-gc97164f/elf/ldconfig.c
-+++ glibc-2.10.1-3/elf/ldconfig.c
+--- glibc-2.10.1-68-gc87c885/elf/ldconfig.c
++++ glibc-2.10.1-4/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10.1-65-gc97164f/elf/tst-stackguard1.c
-+++ glibc-2.10.1-3/elf/tst-stackguard1.c
+--- glibc-2.10.1-68-gc87c885/elf/tst-stackguard1.c
++++ glibc-2.10.1-4/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,16 +458,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10.1-65-gc97164f/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.1-3/include/bits/stdlib-ldbl.h
+--- glibc-2.10.1-68-gc87c885/include/bits/stdlib-ldbl.h
++++ glibc-2.10.1-4/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10.1-65-gc97164f/include/bits/wchar-ldbl.h
-+++ glibc-2.10.1-3/include/bits/wchar-ldbl.h
+--- glibc-2.10.1-68-gc87c885/include/bits/wchar-ldbl.h
++++ glibc-2.10.1-4/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10.1-65-gc97164f/include/features.h
-+++ glibc-2.10.1-3/include/features.h
+--- glibc-2.10.1-68-gc87c885/include/features.h
++++ glibc-2.10.1-4/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -484,8 +484,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10.1-65-gc97164f/intl/locale.alias
-+++ glibc-2.10.1-3/intl/locale.alias
+--- glibc-2.10.1-68-gc87c885/intl/locale.alias
++++ glibc-2.10.1-4/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10.1-65-gc97164f/libio/stdio.h
-+++ glibc-2.10.1-3/libio/stdio.h
+--- glibc-2.10.1-68-gc87c885/libio/stdio.h
++++ glibc-2.10.1-4/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.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10.1-65-gc97164f/locale/iso-4217.def
-+++ glibc-2.10.1-3/locale/iso-4217.def
+--- glibc-2.10.1-68-gc87c885/locale/iso-4217.def
++++ glibc-2.10.1-4/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10.1-65-gc97164f/locale/programs/locarchive.c
-+++ glibc-2.10.1-3/locale/programs/locarchive.c
+--- glibc-2.10.1-68-gc87c885/locale/programs/locarchive.c
++++ glibc-2.10.1-4/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,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10.1-65-gc97164f/localedata/Makefile
-+++ glibc-2.10.1-3/localedata/Makefile
+--- glibc-2.10.1-68-gc87c885/localedata/Makefile
++++ glibc-2.10.1-4/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10.1-65-gc97164f/localedata/SUPPORTED
-+++ glibc-2.10.1-3/localedata/SUPPORTED
+--- glibc-2.10.1-68-gc87c885/localedata/SUPPORTED
++++ glibc-2.10.1-4/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10.1-65-gc97164f/localedata/locales/cy_GB
-+++ glibc-2.10.1-3/localedata/locales/cy_GB
+--- glibc-2.10.1-68-gc87c885/localedata/locales/cy_GB
++++ glibc-2.10.1-4/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>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10.1-65-gc97164f/localedata/locales/en_GB
-+++ glibc-2.10.1-3/localedata/locales/en_GB
+--- glibc-2.10.1-68-gc87c885/localedata/locales/en_GB
++++ glibc-2.10.1-4/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>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.10.1-65-gc97164f/localedata/locales/no_NO
-+++ glibc-2.10.1-3/localedata/locales/no_NO
+--- glibc-2.10.1-68-gc87c885/localedata/locales/no_NO
++++ glibc-2.10.1-4/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10.1-65-gc97164f/localedata/locales/zh_TW
-+++ glibc-2.10.1-3/localedata/locales/zh_TW
+--- glibc-2.10.1-68-gc87c885/localedata/locales/zh_TW
++++ glibc-2.10.1-4/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10.1-65-gc97164f/malloc/mcheck.c
-+++ glibc-2.10.1-3/malloc/mcheck.c
+--- glibc-2.10.1-68-gc87c885/malloc/mcheck.c
++++ glibc-2.10.1-4/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10.1-65-gc97164f/manual/libc.texinfo
-+++ glibc-2.10.1-3/manual/libc.texinfo
+--- glibc-2.10.1-68-gc87c885/manual/libc.texinfo
++++ glibc-2.10.1-4/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10.1-65-gc97164f/misc/sys/cdefs.h
-+++ glibc-2.10.1-3/misc/sys/cdefs.h
+--- glibc-2.10.1-68-gc87c885/misc/sys/cdefs.h
++++ glibc-2.10.1-4/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)
@@ -952,16 +952,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10.1-65-gc97164f/nis/nss
-+++ glibc-2.10.1-3/nis/nss
+--- glibc-2.10.1-68-gc87c885/nis/nss
++++ glibc-2.10.1-4/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.1-65-gc97164f/nptl/ChangeLog
-+++ glibc-2.10.1-3/nptl/ChangeLog
+--- glibc-2.10.1-68-gc87c885/nptl/ChangeLog
++++ glibc-2.10.1-4/nptl/ChangeLog
 @@ -3508,6 +3508,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10.1-65-gc97164f/nptl/Makefile
-+++ glibc-2.10.1-3/nptl/Makefile
+--- glibc-2.10.1-68-gc87c885/nptl/Makefile
++++ glibc-2.10.1-4/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10.1-65-gc97164f/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.1-3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10.1-68-gc87c885/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.1-4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1046,8 +1046,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10.1-65-gc97164f/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.1-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10.1-68-gc87c885/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.1-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1055,8 +1055,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10.1-65-gc97164f/nptl/tst-stackguard1.c
-+++ glibc-2.10.1-3/nptl/tst-stackguard1.c
+--- glibc-2.10.1-68-gc87c885/nptl/tst-stackguard1.c
++++ glibc-2.10.1-4/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1081,8 +1081,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10.1-65-gc97164f/nscd/nscd.conf
-+++ glibc-2.10.1-3/nscd/nscd.conf
+--- glibc-2.10.1-68-gc87c885/nscd/nscd.conf
++++ glibc-2.10.1-4/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10.1-65-gc97164f/nscd/nscd.init
-+++ glibc-2.10.1-3/nscd/nscd.init
+--- glibc-2.10.1-68-gc87c885/nscd/nscd.init
++++ glibc-2.10.1-4/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10.1-65-gc97164f/posix/Makefile
-+++ glibc-2.10.1-3/posix/Makefile
+--- glibc-2.10.1-68-gc87c885/posix/Makefile
++++ glibc-2.10.1-4/posix/Makefile
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1172,8 +1172,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10.1-65-gc97164f/posix/getconf.speclist.h
-+++ glibc-2.10.1-3/posix/getconf.speclist.h
+--- glibc-2.10.1-68-gc87c885/posix/getconf.speclist.h
++++ glibc-2.10.1-4/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1214,8 +1214,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10.1-65-gc97164f/streams/Makefile
-+++ glibc-2.10.1-3/streams/Makefile
+--- glibc-2.10.1-68-gc87c885/streams/Makefile
++++ glibc-2.10.1-4/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1225,8 +1225,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10.1-65-gc97164f/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.1-3/sysdeps/generic/dl-cache.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/generic/dl-cache.h
++++ glibc-2.10.1-4/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1242,8 +1242,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.10.1-65-gc97164f/sysdeps/i386/Makefile
-+++ glibc-2.10.1-3/sysdeps/i386/Makefile
+--- glibc-2.10.1-68-gc87c885/sysdeps/i386/Makefile
++++ glibc-2.10.1-4/sysdeps/i386/Makefile
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1259,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10.1-65-gc97164f/sysdeps/ia64/Makefile
-+++ glibc-2.10.1-3/sysdeps/ia64/Makefile
+--- glibc-2.10.1-68-gc87c885/sysdeps/ia64/Makefile
++++ glibc-2.10.1-4/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1272,8 +1272,8 @@
  endif
  endif
  
---- glibc-2.10.1-65-gc97164f/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.1-3/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10.1-68-gc87c885/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.1-4/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1625,8 +1625,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10.1-65-gc97164f/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.1-3/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10.1-68-gc87c885/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.1-4/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1712,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10.1-65-gc97164f/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.1-3/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10.1-68-gc87c885/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.1-4/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1722,8 +1722,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/nice.c
-+++ glibc-2.10.1-3/sysdeps/unix/nice.c
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/nice.c
++++ glibc-2.10.1-4/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1738,8 +1738,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1755,8 +1755,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1804,8 +1804,8 @@
      }
    else
  #endif
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1848,8 +1848,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1868,8 +1868,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.1-4/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.
@@ -1930,8 +1930,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -1964,29 +1964,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.1-4/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.1-65-gc97164f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.1-4/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.1-65-gc97164f/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.1-4/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.1-65-gc97164f/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2012,8 +2012,8 @@
  
  struct netlink_res
  {
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2023,8 +2023,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2070,8 +2070,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10.1-65-gc97164f/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.1-3/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- glibc.spec	31 Jul 2009 12:10:17 -0000	1.404
+++ glibc.spec	4 Aug 2009 11:05:21 -0000	1.405
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10.1-65-gc97164f
+%define glibcsrcdir glibc-2.10.1-68-gc87c885
 %define glibcversion 2.10.1
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 3
+Release: 4
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -622,7 +622,7 @@ grep -v '%{_prefix}/%{_lib}/lib.*\.a' < 
 
 grep '%{_prefix}/bin' < rpm.filelist >> common.filelist
 #grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist
-grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist
+#grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist
 grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist
 grep '%{_prefix}/share' < rpm.filelist | \
   grep -v '%{_prefix}/share/zoneinfo' >> common.filelist
@@ -970,6 +970,7 @@ rm -f *.filelist*
 %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive
 %dir %attr(755,root,root) /etc/default
 %verify(not md5 size mtime) %config(noreplace) /etc/default/nss
+%attr(4711,root,root) %{_prefix}/libexec/pt_chown
 %doc documentation/*
 
 %files -f devel.filelist devel
@@ -1015,6 +1016,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Aug  4 2009 Andreas Schwab <schwab at redhat.com> - 2.10.1-4
+- Reenable setuid on pt_chown.
+
 * Wed Jul 31 2009 Andreas Schwab <schwab at redhat.com> - 2.10.1-3
 - Update from release/2.10/master.
   - handle missing NSS modules (#513698)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- import.log	31 Jul 2009 12:10:17 -0000	1.24
+++ import.log	4 Aug 2009 11:05:21 -0000	1.25
@@ -22,3 +22,4 @@ glibc-2_10-1:F-11:glibc-2.10-1.src.rpm:1
 glibc-2_10-2:F-11:glibc-2.10-2.src.rpm:1241907762
 glibc-2_10_1-1:F-11:glibc-2.10.1-1.src.rpm:1241982035
 glibc-2_10_1-3:F-11:glibc-2.10.1-3.src.rpm:1249041173
+glibc-2_10_1-4:F-11:glibc-2.10.1-4.src.rpm:1249380620


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- sources	31 Jul 2009 12:10:17 -0000	1.305
+++ sources	4 Aug 2009 11:05:21 -0000	1.306
@@ -1,2 +1,2 @@
-8bdb1d7fc8fa4be2bd5117542042fd4c  glibc-2.10.1-65-gc97164f-fedora.tar.bz2
-ba8e5fbcc320129c6b42715e8f74d8a3  glibc-2.10.1-65-gc97164f.tar.bz2
+29d5ae58d197e43f113b1f0702edc5aa  glibc-2.10.1-68-gc87c885-fedora.tar.bz2
+d526906ac356f9eeb802da508cd0998f  glibc-2.10.1-68-gc87c885.tar.bz2



From atkac at fedoraproject.org  Tue Aug  4 11:15:40 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue,  4 Aug 2009 11:15:40 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc10-compat.patch, NONE, 1.1 tigervnc.spec,
	1.15, 1.16
Message-ID: <20090804111540.D734111C00CE@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-compat.patch 
Log Message:
- make Xvnc compilable


tigervnc10-compat.patch:
 Xext/dpms.c                         |    4 
 Xext/saver.c                        |    3 
 Xext/shape.c                        |    3 
 Xext/shm.c                          |    3 
 Xext/shmint.h                       |   29 +++++
 Xext/sync.c                         |    5 -
 Xext/syncsrv.h                      |  176 ++++++++++++++++++++++++++++++++++++
 Xext/xtest.c                        |    4 
 Xext/xvdisp.c                       |    3 
 dbe/dbestruct.h                     |   16 +++
 dix/main.c                          |    2 
 hw/xfree86/dixmods/extmod/modinit.h |   10 --
 mi/mieq.c                           |    2 
 mi/miinitext.c                      |    3 
 mi/miscrinit.c                      |    3 
 os/WaitFor.c                        |    3 
 16 files changed, 237 insertions(+), 32 deletions(-)

--- NEW FILE tigervnc10-compat.patch ---
diff -up tigervnc-0.0.91/unix/xserver/dbe/dbestruct.h.compat tigervnc-0.0.91/unix/xserver/dbe/dbestruct.h
--- tigervnc-0.0.91/unix/xserver/dbe/dbestruct.h.compat	2009-08-04 13:03:50.973394492 +0200
+++ tigervnc-0.0.91/unix/xserver/dbe/dbestruct.h	2009-08-04 13:04:34.469880005 +0200
@@ -37,10 +37,24 @@
 /* INCLUDES */
 
 #define NEED_DBE_PROTOCOL
-#include <X11/extensions/Xdbeproto.h>
+#include <X11/extensions/dbeproto.h>
 #include "windowstr.h"
 #include "privates.h"
 
+typedef struct
+{
+    VisualID    visual;    /* one visual ID that supports double-buffering */
+    int         depth;     /* depth of visual in bits                      */
+    int         perflevel; /* performance level of visual                  */
+}
+XdbeVisualInfo;
+
+typedef struct
+{
+    int                 count;          /* number of items in visual_depth   */
+    XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */
+}
+XdbeScreenVisualInfo;
 
 /* DEFINES */
 
diff -up tigervnc-0.0.91/unix/xserver/dix/main.c.compat tigervnc-0.0.91/unix/xserver/dix/main.c
--- tigervnc-0.0.91/unix/xserver/dix/main.c.compat	2009-08-04 12:44:48.695952134 +0200
+++ tigervnc-0.0.91/unix/xserver/dix/main.c	2009-08-04 12:44:54.805950929 +0200
@@ -112,7 +112,7 @@ Equipment Corporation.
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
 #endif
 
diff -up tigervnc-0.0.91/unix/xserver/hw/xfree86/dixmods/extmod/modinit.h.compat tigervnc-0.0.91/unix/xserver/hw/xfree86/dixmods/extmod/modinit.h
--- tigervnc-0.0.91/unix/xserver/hw/xfree86/dixmods/extmod/modinit.h.compat	2009-08-04 12:53:36.025952295 +0200
+++ tigervnc-0.0.91/unix/xserver/hw/xfree86/dixmods/extmod/modinit.h	2009-08-04 12:59:54.800369244 +0200
@@ -8,7 +8,7 @@
 #endif
 
 #define _SHAPE_SERVER_  /* don't want Xlib structures */
-#include <X11/extensions/shapestr.h>
+#include <X11/extensions/shapeproto.h>
 
 #ifdef MULTIBUFFER
 extern void MultibufferExtensionInit(INITARGS);
@@ -18,9 +18,7 @@ extern void MultibufferExtensionInit(INI
 
 #ifdef XTEST
 extern void XTestExtensionInit(INITARGS);
-#define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
+#include <X11/extensions/xtestproto.h>
 #endif
 
 #if 1
@@ -47,7 +45,7 @@ extern void XFree86DGARegister(INITARGS)
 
 #ifdef DPMSExtension
 extern void DPMSExtensionInit(INITARGS);
-#include <X11/extensions/dpmsstr.h>
+#include <X11/extensions/dpmsconst.h>
 #endif
 
 #ifdef XV
@@ -65,7 +63,7 @@ extern void ResExtensionInit(INITARGS);
 
 #ifdef SHM
 extern void ShmExtensionInit(INITARGS);
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
 extern void ShmRegisterFuncs(
     ScreenPtr pScreen,
     ShmFuncsPtr funcs);
diff -up tigervnc-0.0.91/unix/xserver/mi/mieq.c.compat tigervnc-0.0.91/unix/xserver/mi/mieq.c
--- tigervnc-0.0.91/unix/xserver/mi/mieq.c.compat	2009-08-04 12:48:58.849508634 +0200
+++ tigervnc-0.0.91/unix/xserver/mi/mieq.c	2009-08-04 12:49:05.904463326 +0200
@@ -56,7 +56,7 @@ in this Software without prior written a
 #ifdef DPMSExtension
 # include "dpmsproc.h"
 # define DPMS_SERVER
-# include <X11/extensions/dpms.h>
+# include <X11/extensions/dpmsconst.h>
 #endif
 
 #define QUEUE_SIZE  512
diff -up tigervnc-0.0.91/unix/xserver/mi/miinitext.c.compat tigervnc-0.0.91/unix/xserver/mi/miinitext.c
--- tigervnc-0.0.91/unix/xserver/mi/miinitext.c.compat	2009-08-04 13:05:09.055952024 +0200
+++ tigervnc-0.0.91/unix/xserver/mi/miinitext.c	2009-08-04 13:05:29.550796329 +0200
@@ -160,8 +160,7 @@ typedef void (*InitExtension)(INITARGS);
 #endif
 
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
 #endif
 #ifdef XTEST
 #define _XTEST_SERVER_
diff -up tigervnc-0.0.91/unix/xserver/mi/miscrinit.c.compat tigervnc-0.0.91/unix/xserver/mi/miscrinit.c
--- tigervnc-0.0.91/unix/xserver/mi/miscrinit.c.compat	2009-08-04 12:49:38.923574102 +0200
+++ tigervnc-0.0.91/unix/xserver/mi/miscrinit.c	2009-08-04 12:52:10.821079519 +0200
@@ -40,7 +40,8 @@ from The Open Group.
 #include "miline.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include "../Xext/shmint.h"
+#include <X11/extensions/shm.h>
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to
diff -up tigervnc-0.0.91/unix/xserver/os/WaitFor.c.compat tigervnc-0.0.91/unix/xserver/os/WaitFor.c
--- tigervnc-0.0.91/unix/xserver/os/WaitFor.c.compat	2009-08-04 13:02:13.945950767 +0200
+++ tigervnc-0.0.91/unix/xserver/os/WaitFor.c	2009-08-04 13:02:20.872260157 +0200
@@ -109,8 +109,7 @@ mffs(fd_mask mask)
 }
 
 #ifdef DPMSExtension
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 #endif
 
 struct _OsTimerRec {
diff -up tigervnc-0.0.91/unix/xserver/Xext/dpms.c.compat tigervnc-0.0.91/unix/xserver/Xext/dpms.c
--- tigervnc-0.0.91/unix/xserver/Xext/dpms.c.compat	2009-08-04 13:00:52.007897171 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/dpms.c	2009-08-04 13:01:55.390510562 +0200
@@ -44,9 +44,7 @@ Equipment Corporation.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
+#include <X11/extensions/dpmsproto.h>
 #include "dpmsproc.h"
 #include "modinit.h"
 
diff -up tigervnc-0.0.91/unix/xserver/Xext/saver.c.compat tigervnc-0.0.91/unix/xserver/Xext/saver.c
--- tigervnc-0.0.91/unix/xserver/Xext/saver.c.compat	2009-08-04 13:00:32.202830460 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/saver.c	2009-08-04 13:00:40.425950910 +0200
@@ -54,8 +54,7 @@ in this Software without prior written a
 #include "panoramiXsrv.h"
 #endif
 #ifdef DPMSExtension
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 #endif
 
 #include <stdio.h>
diff -up tigervnc-0.0.91/unix/xserver/Xext/shape.c.compat tigervnc-0.0.91/unix/xserver/Xext/shape.c
--- tigervnc-0.0.91/unix/xserver/Xext/shape.c.compat	2009-08-04 12:55:04.971289373 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/shape.c	2009-08-04 12:56:11.729403547 +0200
@@ -43,8 +43,7 @@ in this Software without prior written a
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#define _SHAPE_SERVER_	/* don't want Xlib structures */
-#include <X11/extensions/shapestr.h>
+#include <X11/extensions/shapeproto.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "modinit.h"
diff -up tigervnc-0.0.91/unix/xserver/Xext/shm.c.compat tigervnc-0.0.91/unix/xserver/Xext/shm.c
--- tigervnc-0.0.91/unix/xserver/Xext/shm.c.compat	2009-08-04 12:59:17.061957614 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/shm.c	2009-08-04 12:59:28.798390520 +0200
@@ -54,8 +54,7 @@ in this Software without prior written a
 #include "servermd.h"
 #include "shmint.h"
 #include "xace.h"
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
 #include <X11/Xfuncproto.h>
 
 /* Needed for Solaris cross-zone shared memory extension */
diff -up tigervnc-0.0.91/unix/xserver/Xext/shmint.h.compat tigervnc-0.0.91/unix/xserver/Xext/shmint.h
--- tigervnc-0.0.91/unix/xserver/Xext/shmint.h.compat	2009-08-04 12:46:20.728924373 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/shmint.h	2009-08-04 12:48:32.789367347 +0200
@@ -24,12 +24,39 @@
 #define _SHMINT_H_
 
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
 
 #include "screenint.h"
 #include "pixmap.h"
 #include "gc.h"
 
+#define XSHM_PUT_IMAGE_ARGS \
+    DrawablePtr		/* dst */, \
+    GCPtr		/* pGC */, \
+    int			/* depth */, \
+    unsigned int	/* format */, \
+    int			/* w */, \
+    int			/* h */, \
+    int			/* sx */, \
+    int			/* sy */, \
+    int			/* sw */, \
+    int			/* sh */, \
+    int			/* dx */, \
+    int			/* dy */, \
+    char *		/* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+    ScreenPtr	/* pScreen */, \
+    int		/* width */, \
+    int		/* height */, \
+    int		/* depth */, \
+    char *	/* addr */
+
+typedef struct _ShmFuncs {
+    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;
+
 void
 ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
 
diff -up tigervnc-0.0.91/unix/xserver/Xext/sync.c.compat tigervnc-0.0.91/unix/xserver/Xext/sync.c
--- tigervnc-0.0.91/unix/xserver/Xext/sync.c.compat	2009-08-04 12:56:54.327558255 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/sync.c	2009-08-04 12:57:28.765950708 +0200
@@ -67,9 +67,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#define _SYNC_SERVER
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncstr.h>
+#include <X11/extensions/syncproto.h>
+#include "syncsrv.h"
 
 #include <stdio.h>
 #if !defined(WIN32)
diff -up tigervnc-0.0.91/unix/xserver/Xext/syncsrv.h.compat tigervnc-0.0.91/unix/xserver/Xext/syncsrv.h
--- tigervnc-0.0.91/unix/xserver/Xext/syncsrv.h.compat	2009-08-04 12:58:20.254370035 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/syncsrv.h	2009-08-04 12:58:43.898331403 +0200
@@ -0,0 +1,176 @@
+/*
+
+Copyright 1991, 1993, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+/***********************************************************
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+******************************************************************/
+
+#ifndef _SYNCSRV_H_
+#define _SYNCSRV_H_
+
+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
+
+typedef struct _SyncCounter {
+    ClientPtr		client;	/* Owning client. 0 for system counters */
+    XSyncCounter	id;		/* resource ID */
+    CARD64		value;		/* counter value */
+    struct _SyncTriggerList *pTriglist;	/* list of triggers */
+    Bool		beingDestroyed; /* in process of going away */
+    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
+} SyncCounter;
+
+/*
+ * The System Counter interface
+ */
+
+typedef enum {
+    XSyncCounterNeverChanges,
+    XSyncCounterNeverIncreases,
+    XSyncCounterNeverDecreases,
+    XSyncCounterUnrestricted
+} SyncCounterType;
+
+typedef struct _SysCounterInfo {
+    char	*name;
+    CARD64	resolution;
+    CARD64	bracket_greater;
+    CARD64	bracket_less;
+    SyncCounterType counterType;  /* how can this counter change */
+    void        (*QueryValue)(
+			      pointer /*pCounter*/,
+			      CARD64 * /*freshvalue*/
+);
+    void	(*BracketValues)(
+				 pointer /*pCounter*/,
+				 CARD64 * /*lessthan*/,
+				 CARD64 * /*greaterthan*/
+);
+} SysCounterInfo;
+
+
+
+typedef struct _SyncTrigger {
+    SyncCounter *pCounter;
+    CARD64	wait_value;	/* wait value */
+    unsigned int value_type;     /* Absolute or Relative */
+    unsigned int test_type;	/* transition or Comparision type */
+    CARD64	test_value;	/* trigger event threshold value */
+    Bool	(*CheckTrigger)(
+				struct _SyncTrigger * /*pTrigger*/,
+				CARD64 /*newval*/
+				);
+    void	(*TriggerFired)(
+				struct _SyncTrigger * /*pTrigger*/
+				);
+    void	(*CounterDestroyed)(
+				struct _SyncTrigger * /*pTrigger*/
+				    );
+} SyncTrigger;
+
+typedef struct _SyncTriggerList {
+    SyncTrigger *pTrigger;
+    struct _SyncTriggerList *next;
+} SyncTriggerList;
+
+typedef struct _SyncAlarmClientList {
+    ClientPtr	client;
+    XID		delete_id;
+    struct _SyncAlarmClientList *next;
+} SyncAlarmClientList;
+
+typedef struct _SyncAlarm {
+    SyncTrigger trigger;
+    ClientPtr	client;
+    XSyncAlarm 	alarm_id;
+    CARD64	delta;
+    int		events;
+    int		state;
+    SyncAlarmClientList *pEventClients;
+} SyncAlarm;
+
+typedef struct {
+    ClientPtr	client;
+    CARD32 	delete_id;
+    int		num_waitconditions;
+} SyncAwaitHeader;
+
+typedef struct {
+    SyncTrigger trigger;
+    CARD64	event_threshold;
+    SyncAwaitHeader *pHeader;
+} SyncAwait;
+
+typedef union {
+    SyncAwaitHeader header;
+    SyncAwait	    await;
+} SyncAwaitUnion;
+
+
+extern pointer SyncCreateSystemCounter(
+    char *	/* name */,
+    CARD64  	/* inital_value */,
+    CARD64  	/* resolution */,
+    SyncCounterType /* change characterization */,
+    void        (* /*QueryValue*/ ) (
+        pointer /* pCounter */,
+        CARD64 * /* pValue_return */), /* XXX prototype */
+    void        (* /*BracketValues*/) (
+        pointer /* pCounter */, 
+        CARD64 * /* pbracket_less */,
+        CARD64 * /* pbracket_greater */)
+);
+
+extern void SyncChangeCounter(
+    SyncCounter *	/* pCounter*/,
+    CARD64  		/* new_value */
+);
+
+extern void SyncDestroySystemCounter(
+    pointer pCounter
+);
+extern void InitServertime(void);
+
+#endif /* _SYNCSRV_H_ */
diff -up tigervnc-0.0.91/unix/xserver/Xext/xtest.c.compat tigervnc-0.0.91/unix/xserver/Xext/xtest.c
--- tigervnc-0.0.91/unix/xserver/Xext/xtest.c.compat	2009-08-04 12:58:55.065952028 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/xtest.c	2009-08-04 12:59:06.039590190 +0200
@@ -43,9 +43,7 @@
 #include "dixevents.h"
 #include "sleepuntil.h"
 #include "mi.h"
-#define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
+#include <X11/extensions/xtestproto.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
diff -up tigervnc-0.0.91/unix/xserver/Xext/xvdisp.c.compat tigervnc-0.0.91/unix/xserver/Xext/xvdisp.c
--- tigervnc-0.0.91/unix/xserver/Xext/xvdisp.c.compat	2009-08-04 13:00:08.478343287 +0200
+++ tigervnc-0.0.91/unix/xserver/Xext/xvdisp.c	2009-08-04 13:00:19.228751587 +0200
@@ -42,8 +42,7 @@ SOFTWARE.
 #include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
 #endif
 
 #include "xvdisp.h"


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tigervnc.spec	27 Jul 2009 05:57:24 -0000	1.15
+++ tigervnc.spec	4 Aug 2009 11:15:40 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.91
-Release:	0.14%{?dist}.1
+Release:	0.15%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -40,6 +40,7 @@ Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
 Patch9:		tigervnc10-rh495457.patch
+Patch10:	tigervnc10-compat.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -103,6 +104,7 @@ popd
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
 %patch9 -p0 -b .rh495457
+%patch10 -p1 -b .compat
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -244,6 +246,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 04 2009 Adam Tkac <atkac redhat com> 0.0.91-0.15
+- make Xvnc compilable
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.91-0.14.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mgrepl at fedoraproject.org  Tue Aug  4 11:25:21 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue,  4 Aug 2009 11:25:21 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.38,1.39
Message-ID: <20090804112521.7062211C00CE@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-serv28143

Modified Files:
	policy-20090521.patch 
Log Message:
- Allow svirt_t to stream_connect to virtd_t



policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    4 
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/usermanage.te        |    1 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |    9 +
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |    8 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.te           |    3 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |    8 -
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    1 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   28 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   19 ++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    6 
 modules/system/userdomain.if       |   23 +--
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 120 files changed, 1978 insertions(+), 634 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- policy-20090521.patch	4 Aug 2009 09:38:12 -0000	1.38
+++ policy-20090521.patch	4 Aug 2009 11:25:19 -0000	1.39
@@ -1368,7 +1368,16 @@ 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.12/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/corenetwork.te.in	2009-07-31 09:37:03.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/kernel/corenetwork.te.in	2009-08-04 13:16:29.000000000 +0200
+@@ -116,7 +116,7 @@
+ 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)
+ network_port(innd, tcp,119,s0)
+-network_port(ipp, tcp,631,s0, udp,631,s0)
++network_port(ipp, tcp,631,s0, udp,631,s0, tcp,8611,s0, udp,8611,s0)
+ network_port(ipsecnat, tcp,4500,s0, udp,4500,s0)
+ network_port(ircd, tcp,6667,s0)
+ network_port(ipmi, udp,623,s0, udp,664,s0)
 @@ -134,7 +134,7 @@
  network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0)
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
@@ -2027,7 +2036,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-08-04 11:10:09.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-08-04 12:44:39.000000000 +0200
 @@ -14,7 +14,7 @@
  files_pid_file(consolekit_var_run_t)
  
@@ -2045,13 +2054,6 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_list_inotifyfs(consolekit_t)
  
-@@ -124,3 +125,6 @@
- 	fs_dontaudit_rw_cifs_files(consolekit_t)
- ')
- 
-+optional_policy(`
-+        udev_read_db(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
@@ -2108,7 +2110,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.12/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-02 22:01:31.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-04 13:01:36.000000000 +0200
 @@ -733,6 +733,8 @@
  files_read_etc_files(cups_pdf_t)
  files_read_usr_files(cups_pdf_t)
@@ -2118,6 +2120,14 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  auth_use_nsswitch(cups_pdf_t)
+@@ -746,6 +748,7 @@
+ 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 })
+ 
++userdom_user_home_dir_filetrans_pattern(cups_pdf_t, { file dir })
+ userdom_home_filetrans_user_home_dir(cups_pdf_t)
+ userdom_manage_user_home_content_dirs(cups_pdf_t)
+ userdom_manage_user_home_content_files(cups_pdf_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.6.12/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/dcc.te	2009-06-25 10:21:01.000000000 +0200
@@ -2548,7 +2558,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-07-17 09:56:19.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/hal.te	2009-08-04 12:43:13.000000000 +0200
 @@ -103,6 +103,7 @@
  kernel_rw_irq_sysctls(hald_t)
  kernel_rw_vm_sysctls(hald_t)
@@ -2573,7 +2583,16 @@ diff -b -B --ignore-all-space --exclude-
  	polkit_domtrans_auth(hald_t)
  	polkit_domtrans_resolve(hald_t)
  	polkit_read_lib(hald_t)
-@@ -381,6 +384,7 @@
+@@ -369,6 +372,8 @@
+ files_read_usr_files(hald_acl_t)
+ files_read_etc_files(hald_acl_t)
+ 
++fs_getattr_all_fs(hald_acl_t)  
++
+ storage_getattr_removable_dev(hald_acl_t)
+ storage_setattr_removable_dev(hald_acl_t)
+ storage_getattr_fixed_disk_dev(hald_acl_t)
+@@ -381,6 +386,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -2581,7 +2600,7 @@ diff -b -B --ignore-all-space --exclude-
  	polkit_domtrans_auth(hald_acl_t)
  	polkit_read_lib(hald_acl_t)
  	polkit_read_reload(hald_acl_t)
-@@ -470,6 +474,8 @@
+@@ -470,6 +476,8 @@
  #
  # Local hald dccm policy
  #
@@ -2590,7 +2609,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:capability { net_bind_service };
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
-@@ -480,6 +486,8 @@
+@@ -480,6 +488,8 @@
  allow hald_t hald_dccm_t:process signal;
  allow hald_dccm_t hald_t:unix_stream_socket connectto;
  
@@ -2599,7 +2618,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -508,4 +516,8 @@
+@@ -508,4 +518,8 @@
  
  miscfiles_read_localization(hald_dccm_t)
  
@@ -3974,7 +3993,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-07-13 11:37:53.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-08-04 12:46:42.000000000 +0200
 @@ -42,8 +42,7 @@
  #
  interface(`auth_login_pgm_domain',`
@@ -4014,7 +4033,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  ')
-@@ -238,6 +245,96 @@
+@@ -238,6 +245,97 @@
  
  ########################################
  ## <summary>
@@ -4086,6 +4105,7 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	manage_files_pattern($1, auth_cache_t,  auth_cache_t)
++	manage_dirs_pattern($1, auth_cache_t, auth_cache_t)
 +')
 +
 +#######################################
@@ -4111,7 +4131,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Run unix_chkpwd to check a password.
  ## </summary>
  ## <param name="domain">
-@@ -726,7 +823,7 @@
+@@ -726,7 +824,7 @@
  
  ########################################
  ## <summary>
@@ -4120,7 +4140,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1258,6 +1355,25 @@
+@@ -1258,6 +1356,25 @@
  
  ########################################
  ## <summary>
@@ -4146,7 +4166,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write to
  ##	login records files.
  ## </summary>
-@@ -1415,6 +1531,10 @@
+@@ -1415,6 +1532,10 @@
  	')
  
  	optional_policy(`
@@ -4157,7 +4177,7 @@ diff -b -B --ignore-all-space --exclude-
  		sssd_stream_connect($1)
  	')
  
-@@ -1456,99 +1576,3 @@
+@@ -1456,99 +1577,3 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')



From dwalsh at fedoraproject.org  Tue Aug  4 11:32:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  4 Aug 2009 11:32:06 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.42,
	1.43 selinux-policy.spec, 1.888, 1.889
Message-ID: <20090804113206.F30FB11C00CE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29523

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Aug 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-4
- Allow exim to getattr on mountpoints
- Fixes for pulseaudio


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |    8 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  287 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   21 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  123 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   22 
 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               |   41 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   41 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  113 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   42 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |    8 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   59 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  106 +
 policy/modules/services/virt.te                    |  263 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  536 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1299 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 291 files changed, 12864 insertions(+), 2599 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- policy-F12.patch	4 Aug 2009 09:06:45 -0000	1.42
+++ policy-F12.patch	4 Aug 2009 11:32:06 -0000	1.43
@@ -2986,6 +2986,35 @@ 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.26/policy/modules/apps/pulseaudio.te
+--- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-07-23 14:11:04.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/apps/pulseaudio.te	2009-08-04 05:32:34.000000000 -0400
+@@ -22,6 +22,7 @@
+ allow pulseaudio_t self:unix_dgram_socket { sendto create_socket_perms };
+ allow pulseaudio_t self:tcp_socket create_stream_socket_perms;
+ allow pulseaudio_t self:udp_socket create_socket_perms;
++allow pulseaudio_t self:netlink_kobject_uevent_socket create_socket_perms;
+ 
+ kernel_read_kernel_sysctls(pulseaudio_t)
+ 
+@@ -47,6 +48,7 @@
+ 
+ fs_rw_anon_inodefs_files(pulseaudio_t)
+ fs_getattr_tmpfs(pulseaudio_t)
++fs_list_inotifyfs(pulseaudio_t)
+ 
+ term_use_all_user_ttys(pulseaudio_t)
+ term_use_all_user_ptys(pulseaudio_t)
+@@ -85,8 +87,8 @@
+ ')
+ 
+ optional_policy(`
+-	xserver_read_xdm_pid(pulseaudio_t)
+ 	xserver_manage_xdm_tmp_files(pulseaudio_t)
+ 	xserver_read_xdm_lib_files(pulseaudio_t)
++	xserver_common_app(pulseaudio_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.6.26/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/apps/qemu.fc	2009-07-30 15:33:08.000000000 -0400
@@ -10644,7 +10673,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.26/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/hal.te	2009-07-31 06:43:31.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/hal.te	2009-08-04 05:57:57.000000000 -0400
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -10702,7 +10731,16 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -369,6 +384,7 @@
+@@ -357,6 +372,8 @@
+ files_read_usr_files(hald_acl_t)
+ files_read_etc_files(hald_acl_t)
+ 
++fs_getattr_all_fs(hald_acl_t)
++
+ storage_getattr_removable_dev(hald_acl_t)
+ storage_setattr_removable_dev(hald_acl_t)
+ storage_getattr_fixed_disk_dev(hald_acl_t)
+@@ -369,6 +386,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -10710,7 +10748,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +466,16 @@
+@@ -450,12 +468,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -10729,7 +10767,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +489,17 @@
+@@ -469,10 +491,17 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -10747,7 +10785,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +511,7 @@
+@@ -484,6 +513,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -10755,7 +10793,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +519,9 @@
+@@ -491,3 +521,9 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -13812,7 +13850,7 @@ diff -b -B --ignore-all-space --exclude-
  term_dontaudit_use_console(ricci_modstorage_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.6.26/policy/modules/services/rpcbind.if
 --- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/rpcbind.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/rpcbind.if	2009-08-04 06:47:08.000000000 -0400
 @@ -97,6 +97,26 @@
  
  ########################################
@@ -18584,7 +18622,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.26/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/authlogin.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/authlogin.if	2009-08-04 06:42:06.000000000 -0400
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -18729,7 +18767,15 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -305,19 +379,16 @@
+@@ -258,6 +332,7 @@
+ 		type auth_cache_t;
+ 	')
+ 
++	manage_dirs_pattern($1, auth_cache_t, auth_cache_t)
+ 	manage_files_pattern($1, auth_cache_t, auth_cache_t)
+ ')
+ 
+@@ -305,19 +380,16 @@
  	dev_read_rand($1)
  	dev_read_urand($1)
  
@@ -18743,18 +18789,18 @@ diff -b -B --ignore-all-space --exclude-
 -	sysnet_dns_name_resolve($1)
 -	sysnet_use_ldap($1)
 -
--	optional_policy(`
+ 	optional_policy(`
 -		kerberos_use($1)
 -	')
 -
- 	optional_policy(`
+-	optional_policy(`
 -		nis_use_ypbind($1)
 +		kerberos_read_keytab($1)
 +		kerberos_connect_524($1)
  	')
  
  	optional_policy(`
-@@ -328,6 +399,29 @@
+@@ -328,6 +400,29 @@
  	optional_policy(`
  		samba_stream_connect_winbind($1)
  	')
@@ -18784,7 +18830,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -352,6 +446,7 @@
+@@ -352,6 +447,7 @@
  
  	auth_domtrans_chk_passwd($1)
  	role $2 types chkpwd_t;
@@ -18792,7 +18838,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1129,6 +1224,32 @@
+@@ -1129,6 +1225,32 @@
  
  ########################################
  ## <summary>
@@ -18825,7 +18871,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Manage all files on the filesystem, except
  ##	the shadow passwords and listed exceptions.
  ## </summary>
-@@ -1254,6 +1375,25 @@
+@@ -1254,6 +1376,25 @@
  
  ########################################
  ## <summary>
@@ -18851,7 +18897,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write to
  ##	login records files.
  ## </summary>
-@@ -1395,6 +1535,14 @@
+@@ -1395,6 +1536,14 @@
  	')
  
  	optional_policy(`
@@ -18866,7 +18912,7 @@ diff -b -B --ignore-all-space --exclude-
  		nis_use_ypbind($1)
  	')
  
-@@ -1403,8 +1551,17 @@
+@@ -1403,8 +1552,17 @@
  	')
  
  	optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -p -r1.888 -r1.889
--- selinux-policy.spec	31 Jul 2009 19:05:34 -0000	1.888
+++ selinux-policy.spec	4 Aug 2009 11:32:06 -0000	1.889
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,10 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-4
+- Allow exim to getattr on mountpoints
+- Fixes for pulseaudio
+
 * Fri Jul 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-3
 - Allow svirt_t to stream_connect to virtd_t
 



From nphilipp at fedoraproject.org  Tue Aug  4 11:45:37 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  4 Aug 2009 11:45:37 +0000 (UTC)
Subject: rpms/sane-backends/F-11 sane-backends.spec,1.126,1.127
Message-ID: <20090804114537.C327D11C00CE@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384

Modified Files:
	sane-backends.spec 
Log Message:
remove ExcludeArch: s390 s390x



Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sane-backends.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- sane-backends.spec	23 Jun 2009 07:57:35 -0000	1.126
+++ sane-backends.spec	4 Aug 2009 11:45:36 -0000	1.127
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 4%{?dist}
+Release: 6%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -28,7 +28,6 @@ BuildRequires: gettext
 BuildRequires: gphoto2-devel
 Requires: pam >= 0.78-2
 Requires: hal >= 0.4.0
-ExcludeArch: s390 s390x
 
 %description
 Scanner Access Now Easy (SANE) is a universal scanner interface.  The
@@ -158,6 +157,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-6
+- remove ExcludeArch: s390 s390x
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-4
 - separate HAL information and policy files (#457645)
 



From nphilipp at fedoraproject.org  Tue Aug  4 11:46:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  4 Aug 2009 11:46:04 +0000 (UTC)
Subject: rpms/sane-frontends/F-11 sane-frontends.spec,1.28,1.29
Message-ID: <20090804114604.535DB11C00CE@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-frontends/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv577

Modified Files:
	sane-frontends.spec 
Log Message:
remove ExcludeArch: s390 s390x



Index: sane-frontends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-frontends/F-11/sane-frontends.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sane-frontends.spec	31 Jul 2009 14:32:08 -0000	1.28
+++ sane-frontends.spec	4 Aug 2009 11:46:04 -0000	1.29
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Graphical frontend to SANE
 URL: http://www.sane-project.org
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -14,7 +14,6 @@ Requires:  sane-backends
 Buildroot: %{_tmppath}/%{name}-root
 Obsoletes: sane <= 0:1.0.9
 Provides: sane = %{?epoch:%{epoch}:}%{version}-%{release}
-ExcludeArch: s390 s390x
 
 %description
 This packages includes the scanadf and xcam programs.
@@ -46,6 +45,9 @@ rm -R $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> 1.0.14-9
+- remove ExcludeArch: s390 s390x
+
 * Fri Jul 31 2009 Nils Philippsen <nils at redhat.com> 1.0.14-8
 - replace badcode with array-out-of-bounds patch
 - fix compilation with sane-backends-1.0.20



From nphilipp at fedoraproject.org  Tue Aug  4 11:46:40 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue,  4 Aug 2009 11:46:40 +0000 (UTC)
Subject: rpms/xsane/F-11 xsane.spec,1.70,1.71
Message-ID: <20090804114640.9C92711C00CE@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Log Message:
remove ExcludeArch: s390 s390x



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-11/xsane.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- xsane.spec	31 Jul 2009 12:45:31 -0000	1.70
+++ xsane.spec	4 Aug 2009 11:46:40 -0000	1.71
@@ -5,7 +5,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.997
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -24,7 +24,6 @@ BuildRequires: sane-backends-devel >= 1.
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
-ExcludeArch: s390 s390x
 
 %description
 XSane is an X based interface for the SANE (Scanner Access Now Easy)
@@ -121,6 +120,9 @@ fi
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> 0.997-2
+- remove ExcludeArch: s390 s390x
+
 * Fri Jul 31 2009 Nils Philippsen <nils at redhat.com> 0.997-1
 - version 0.997
 - drop obsolete sane-backends-1.0.20 patch



From msivak at fedoraproject.org  Tue Aug  4 11:57:43 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Tue,  4 Aug 2009 11:57:43 +0000 (UTC)
Subject: rpms/firstaidkit/devel .cvsignore, 1.7, 1.8 firstaidkit.spec, 1.27, 
	1.28 sources, 1.10, 1.11
Message-ID: <20090804115743.EFBE111C00CE@cvs1.fedora.phx.redhat.com>

Author: msivak

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

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Jul 2009 11:48:54 -0000	1.7
+++ .cvsignore	4 Aug 2009 11:57:43 -0000	1.8
@@ -1 +1 @@
-firstaidkit-0.2.3.tar.bz2
+firstaidkit-0.2.4.tar.bz2


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- firstaidkit.spec	24 Jul 2009 22:49:46 -0000	1.27
+++ firstaidkit.spec	4 Aug 2009 11:57:43 -0000	1.28
@@ -3,8 +3,8 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.3
-Release:        5%{?dist}
+Version:        0.2.4
+Release:        1%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
@@ -232,6 +232,9 @@ desktop-file-install --vendor="fedora" -
 #%{_libdir}/firstaidkit/plugins/rpm/*
 
 %changelog
+* Tue Aug 04 2009 Martin Sivak <msivak at redhat.com> - 0.2.4-1
+- Fix temp file generation in firstaidkit-qs
+
 * 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/extras/rpms/firstaidkit/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Jul 2009 13:11:15 -0000	1.10
+++ sources	4 Aug 2009 11:57:43 -0000	1.11
@@ -1 +1 @@
-f69324e6212e7f79bc799326a9f6300f  firstaidkit-0.2.3.tar.bz2
+d348cef84d521dfdeae49480391eb824  firstaidkit-0.2.4.tar.bz2



From vcrhonek at fedoraproject.org  Tue Aug  4 12:09:03 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue,  4 Aug 2009 12:09:03 +0000 (UTC)
Subject: rpms/texinfo/devel texinfo-4.13a-data_types.patch, NONE,
	1.1 texinfo.spec, 1.60, 1.61
Message-ID: <20090804120903.4F48D11C00CE@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

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

Modified Files:
	texinfo.spec 
Added Files:
	texinfo-4.13a-data_types.patch 
Log Message:
Fix data types

texinfo-4.13a-data_types.patch:
 window.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE texinfo-4.13a-data_types.patch ---
diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
--- texinfo-4.13/info/window.c_old	2009-08-04 13:46:15.000000000 +0200
+++ texinfo-4.13/info/window.c	2009-08-04 13:47:29.000000000 +0200
@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
       const char *carried_over_ptr;
       size_t carried_over_len, carried_over_count;
       const char *cur_ptr = mbi_cur_ptr (iter);
-      int cur_len = mb_len (mbi_cur (iter));
+      size_t cur_len = mb_len (mbi_cur (iter));
       int replen;
       int delim = 0;
       int rc;
@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
        mbi_advance (iter))
     {
       const char *cur_ptr = mbi_cur_ptr (iter);
-      int cur_len = mb_len (mbi_cur (iter));
+      size_t cur_len = mb_len (mbi_cur (iter));
 
       if (cur_len == 1)
 	{
@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
        mbi_advance (iter))
     {
       const char *cur_ptr = mbi_cur_ptr (iter);
-      int cur_len = mb_len (mbi_cur (iter));
-      int replen;
+      size_t cur_len = mb_len (mbi_cur (iter));
+      size_t replen;
 
       if (cur_ptr >= endp)
 	break;


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- texinfo.spec	27 Jul 2009 05:52:03 -0000	1.60
+++ texinfo.spec	4 Aug 2009 12:09:03 -0000	1.61
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -11,6 +11,7 @@ Source0: ftp://ftp.gnu.org/gnu/texinfo/t
 Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
+Patch1: texinfo-4.13a-data_types.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ for printing using TeX.
 %prep
 %setup -q -n %{name}-4.13
 %patch0 -p1 -b .zlib
+%patch1 -p1 -b .data_types
 
 %build
 %configure
@@ -144,6 +146,9 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Tue Aug  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-4
+- Fix data types
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.13a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From vcrhonek at fedoraproject.org  Tue Aug  4 12:25:54 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue,  4 Aug 2009 12:25:54 +0000 (UTC)
Subject: rpms/texinfo/F-11 texinfo-4.13a-data_types.patch, NONE,
	1.1 texinfo.spec, 1.59, 1.60
Message-ID: <20090804122554.A137811C00E4@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

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

Modified Files:
	texinfo.spec 
Added Files:
	texinfo-4.13a-data_types.patch 
Log Message:
Fix data types

texinfo-4.13a-data_types.patch:
 window.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE texinfo-4.13a-data_types.patch ---
diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
--- texinfo-4.13/info/window.c_old	2009-08-04 13:46:15.000000000 +0200
+++ texinfo-4.13/info/window.c	2009-08-04 13:47:29.000000000 +0200
@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
       const char *carried_over_ptr;
       size_t carried_over_len, carried_over_count;
       const char *cur_ptr = mbi_cur_ptr (iter);
-      int cur_len = mb_len (mbi_cur (iter));
+      size_t cur_len = mb_len (mbi_cur (iter));
       int replen;
       int delim = 0;
       int rc;
@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
        mbi_advance (iter))
     {
       const char *cur_ptr = mbi_cur_ptr (iter);
-      int cur_len = mb_len (mbi_cur (iter));
+      size_t cur_len = mb_len (mbi_cur (iter));
 
       if (cur_len == 1)
 	{
@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
        mbi_advance (iter))
     {
       const char *cur_ptr = mbi_cur_ptr (iter);
-      int cur_len = mb_len (mbi_cur (iter));
-      int replen;
+      size_t cur_len = mb_len (mbi_cur (iter));
+      size_t replen;
 
       if (cur_ptr >= endp)
 	break;


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-11/texinfo.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- texinfo.spec	25 Feb 2009 20:15:04 -0000	1.59
+++ texinfo.spec	4 Aug 2009 12:25:54 -0000	1.60
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -11,6 +11,7 @@ Source0: ftp://ftp.gnu.org/gnu/texinfo/t
 Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
+Patch1: texinfo-4.13a-data_types.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ for printing using TeX.
 %prep
 %setup -q -n %{name}-4.13
 %patch0 -p1 -b .zlib
+%patch1 -p1 -b .data_types
 
 %build
 %configure
@@ -144,6 +146,9 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Tue Aug  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-3
+- Fix data types
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.13a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twaugh at fedoraproject.org  Tue Aug  4 12:28:23 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 12:28:23 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec, 1.494, 1.495 cups-socket-snmp.patch, 1.1,
	NONE
Message-ID: <20090804122823.A0E3211C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Removed Files:
	cups-socket-snmp.patch 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
- Removed temporary snmp option from socket backend.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- cups.spec	29 Jul 2009 13:47:30 -0000	1.494
+++ cups.spec	4 Aug 2009 12:28:23 -0000	1.495
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.12%{?dist}
+Release: 0.%{pre}.13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -58,10 +58,9 @@ Patch31: cups-str3254.patch
 Patch32: cups-str3253.patch
 Patch33: cups-str3266.patch
 Patch34: cups-str3262.patch
-Patch35: cups-socket-snmp.patch
-Patch36: cups-cups-get-classes.patch
-Patch37: cups-str3272.patch
-Patch38: cups-avahi.patch
+Patch35: cups-cups-get-classes.patch
+Patch36: cups-str3272.patch
+Patch37: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -217,10 +216,9 @@ module. 
 %patch32 -p1 -b .str3253
 %patch33 -p1 -b .str3266
 %patch34 -p1 -b .str3262
-%patch35 -p1 -b .socket-snmp
-%patch36 -p1 -b .cups-get-classes
-%patch37 -p1 -b .str3272
-%patch38 -p1 -b .avahi
+%patch35 -p1 -b .cups-get-classes
+%patch36 -p1 -b .str3272
+%patch37 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -513,6 +511,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+- Removed temporary snmp option from socket backend.
+
 * Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
 - Fixed Avahi support in the dnssd backend (bug #513888).
 - Fixed incorrect arguments to sigaction() in dnssd backend (STR #3272).


--- cups-socket-snmp.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 12:30:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 12:30:55 +0000
Subject: [pkgdb] pgadmin3: devrim has given up watchbugzilla
Message-ID: <20090804123055.7CB6610F8A2@bastion2.fedora.phx.redhat.com>

devrim has given up the watchbugzilla acl on pgadmin3 (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 12:31:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 12:31:05 +0000
Subject: [pkgdb] pgadmin3 had acl change status
Message-ID: <20090804123105.DD0CD10F882@bastion2.fedora.phx.redhat.com>

devrim has set the watchbugzilla acl on pgadmin3 (Fedora devel) to Obsolete for ghenry

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



From pkgdb at fedoraproject.org  Tue Aug  4 12:31:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 12:31:08 +0000
Subject: [pkgdb] pgadmin3 had acl change status
Message-ID: <20090804123108.F354010F8AD@bastion2.fedora.phx.redhat.com>

devrim has set the watchcommits acl on pgadmin3 (Fedora devel) to Obsolete for ghenry

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



From pkgdb at fedoraproject.org  Tue Aug  4 12:31:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 12:31:10 +0000
Subject: [pkgdb] pgadmin3 had acl change status
Message-ID: <20090804123110.5503610F8AF@bastion2.fedora.phx.redhat.com>

devrim has set the commit acl on pgadmin3 (Fedora devel) to Obsolete for ghenry

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



From pkgdb at fedoraproject.org  Tue Aug  4 12:31:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 12:31:12 +0000
Subject: [pkgdb] pgadmin3 had acl change status
Message-ID: <20090804123112.43EE610F8B1@bastion2.fedora.phx.redhat.com>

devrim has set the approveacls acl on pgadmin3 (Fedora devel) to Obsolete for ghenry

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



From twaugh at fedoraproject.org  Tue Aug  4 12:32:18 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 12:32:18 +0000 (UTC)
Subject: rpms/cups/devel cups-str3277.patch,NONE,1.1 cups.spec,1.491,1.492
Message-ID: <20090804123218.767D011C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3277.patch 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
- Fixed duplex test pages (bug #514898, STR #3277).


cups-str3277.patch:
 bannertops.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3277.patch ---
diff -up cups-1.4rc1/filter/bannertops.c.str3277 cups-1.4rc1/filter/bannertops.c
--- cups-1.4rc1/filter/bannertops.c.str3277	2009-05-07 00:18:01.000000000 +0100
+++ cups-1.4rc1/filter/bannertops.c	2009-08-04 13:18:17.626076410 +0100
@@ -593,7 +593,7 @@ write_banner(banner_file_t *banner,	/* I
       printf("%.1f %.1f translate\n", PageLeft, PageBottom);
     else
       printf("%.1f %.1f translate\n", PageWidth - PageRight,
-             PageLength - PageRight);
+             PageLength - PageTop);
     puts("0 setgray");
 
     y = info_top;


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -p -r1.491 -r1.492
--- cups.spec	29 Jul 2009 13:48:33 -0000	1.491
+++ cups.spec	4 Aug 2009 12:32:18 -0000	1.492
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.12%{?dist}
+Release: 0.%{pre}.13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -61,6 +61,7 @@ Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
 Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
+Patch38: cups-str3277.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -219,6 +220,7 @@ module. 
 %patch35 -p1 -b .cups-get-classes
 %patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
+%patch38 -p1 -b .str3277
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -511,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+- Fixed duplex test pages (bug #514898, STR #3277).
+
 * Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
 - Fixed Avahi support in the dnssd backend (bug #513888).
 - Fixed incorrect arguments to sigaction() in dnssd backend (STR #3272).



From twaugh at fedoraproject.org  Tue Aug  4 12:33:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 12:33:00 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3277.patch,NONE,1.1 cups.spec,1.495,1.496
Message-ID: <20090804123300.5724911C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3277.patch 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
- Fixed duplex test pages (bug #514898, STR #3277).


cups-str3277.patch:
 bannertops.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3277.patch ---
diff -up cups-1.4rc1/filter/bannertops.c.str3277 cups-1.4rc1/filter/bannertops.c
--- cups-1.4rc1/filter/bannertops.c.str3277	2009-05-07 00:18:01.000000000 +0100
+++ cups-1.4rc1/filter/bannertops.c	2009-08-04 13:18:17.626076410 +0100
@@ -593,7 +593,7 @@ write_banner(banner_file_t *banner,	/* I
       printf("%.1f %.1f translate\n", PageLeft, PageBottom);
     else
       printf("%.1f %.1f translate\n", PageWidth - PageRight,
-             PageLength - PageRight);
+             PageLength - PageTop);
     puts("0 setgray");
 
     y = info_top;


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- cups.spec	4 Aug 2009 12:28:23 -0000	1.495
+++ cups.spec	4 Aug 2009 12:33:00 -0000	1.496
@@ -61,6 +61,7 @@ Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
 Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
+Patch38: cups-str3277.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -219,6 +220,7 @@ module. 
 %patch35 -p1 -b .cups-get-classes
 %patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
+%patch38 -p1 -b .str3277
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -512,6 +514,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+- Fixed duplex test pages (bug #514898, STR #3277).
 - Removed temporary snmp option from socket backend.
 
 * Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12



From akurtakov at fedoraproject.org  Tue Aug  4 12:48:10 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  4 Aug 2009 12:48:10 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.646,1.647
Message-ID: <20090804124810.CEC1011C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	eclipse.spec 
Log Message:
No need to copy eclipse.ini for secondary archs.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -p -r1.646 -r1.647
--- eclipse.spec	4 Aug 2009 03:52:45 -0000	1.646
+++ eclipse.spec	4 Aug 2009 12:48:10 -0000	1.647
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.26%{?dist}
+Release:        0.3.27%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -926,12 +926,6 @@ popd
 sed --in-place "s|SDKProfile|PlatformProfile|" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
-%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
-cp -p features/org.eclipse.platform/gtk/eclipse.ini $sdkDir
-%endif
-
-
-
 # Add a compatibility symlink to startup.jar
 pushd $sdkDir
 LAUNCHERNAME=$(ls plugins | grep equinox.launcher_)
@@ -1491,6 +1485,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.27
+- No need to copy eclipse.ini for secondary archs.
+
 * Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.26
 - eclipse/about_files are not installed on ppc for some reason.
 



From corsepiu at fedoraproject.org  Tue Aug  4 13:08:28 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue,  4 Aug 2009 13:08:28 +0000 (UTC)
Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec,1.12,1.13
Message-ID: <20090804130829.00EA711C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Gtk2-Notify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20002

Modified Files:
	perl-Gtk2-Notify.spec 
Log Message:
* Tue Aug 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.05-6
- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).



Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Notify/devel/perl-Gtk2-Notify.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Gtk2-Notify.spec	26 Jul 2009 06:22:30 -0000	1.12
+++ perl-Gtk2-Notify.spec	4 Aug 2009 13:08:28 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
 Version:        0.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to libnotify
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -15,8 +15,7 @@ BuildRequires:  libnotify-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 # cpan
-BuildRequires:  perl(ExtUtils::MakeMaker), libnotify-devel
-BuildRequires:  perl(Glib) >= 1.093, perl(Gtk2)
+BuildRequires:  perl(Glib) >= 1.093, perl(Gtk2), perl(Glib::MakeHelper)
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
 
 # for tests...
@@ -71,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 04 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.05-6
+- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Tue Aug  4 13:22:52 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue,  4 Aug 2009 13:22:52 +0000 (UTC)
Subject: rpms/pybackpack/devel pybackpack.spec,1.9,1.10
Message-ID: <20090804132252.6B09A11C00E4@cvs1.fedora.phx.redhat.com>

Author: maxamillion

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

Modified Files:
	pybackpack.spec 
Log Message:
gnome-python2-nautilus-cd-burner is a broken dependency, working with
upstream to resolve the dep, upstream suggested to simply not require for
now as it won't break anything, but simply won't support backup to cd





Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pybackpack.spec	26 Jul 2009 19:44:36 -0000	1.9
+++ pybackpack.spec	4 Aug 2009 13:22:52 -0000	1.10
@@ -14,7 +14,10 @@ BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 Requires: pygtk2 >= %{pygtk2_version}
-Requires: gnome-python2-nautilus-cd-burner
+#gnome-python2-nautilus-cd-burner is a broken dependency, working with
+#upstream to resolve the dep, upstream suggested to simply not require for
+#now as it won't break anything, but simply won't support backup to cd
+#Requires: gnome-python2-nautilus-cd-burner
 Requires: rdiff-backup >= 1.0
 BuildArch:      noarch
 



From maxamillion at fedoraproject.org  Tue Aug  4 13:29:20 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Tue,  4 Aug 2009 13:29:20 +0000 (UTC)
Subject: rpms/pybackpack/devel pybackpack.spec,1.10,1.11
Message-ID: <20090804132920.96BF411C00E4@cvs1.fedora.phx.redhat.com>

Author: maxamillion

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

Modified Files:
	pybackpack.spec 
Log Message:
added a changelog to my previous edit




Index: pybackpack.spec
===================================================================
RCS file: /cvs/extras/rpms/pybackpack/devel/pybackpack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pybackpack.spec	4 Aug 2009 13:22:52 -0000	1.10
+++ pybackpack.spec	4 Aug 2009 13:29:20 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: User oriented backup and restore application
 Name: pybackpack
 Version: 0.5.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/Archiving
 URL: http://andrewprice.me.uk/projects/pybackpack/
@@ -61,6 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 04 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.5.6-5
+- Removing gnome-python2-nautilus-cd-burner as a dependency
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Tue Aug  4 13:32:50 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  4 Aug 2009 13:32:50 +0000 (UTC)
Subject: rpms/sat4j/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 sat4j.spec, 
	1.10, 1.11 sat4j-fetch.sh, 1.2, 1.3
Message-ID: <20090804133250.CB17B11C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	sources .cvsignore sat4j.spec sat4j-fetch.sh 
Log Message:
Update to 2.1.0 final.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Apr 2009 09:50:36 -0000	1.4
+++ sources	4 Aug 2009 13:32:50 -0000	1.5
@@ -1 +1 @@
-2c4b4d3b7210d326a69fa830bc325ef7  sat4j-2.1.0.RC2.tar.bz2
+57af4240773eaef709ee9621fe30f64b  sat4j-2.1.0.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Apr 2009 09:50:36 -0000	1.4
+++ .cvsignore	4 Aug 2009 13:32:50 -0000	1.5
@@ -2,3 +2,4 @@ org.sat4j.core-src.zip
 org.sat4j.pb-src.zip
 sat4j-2.0.3.tar.bz2
 sat4j-2.1.0.RC2.tar.bz2
+sat4j-2.1.0.tar.bz2


Index: sat4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sat4j.spec	27 Jul 2009 03:48:49 -0000	1.10
+++ sat4j.spec	4 Aug 2009 13:32:50 -0000	1.11
@@ -1,22 +1,23 @@
 %define eclipse_base %{_libdir}/eclipse
 # We want the version to match that shipped in Eclipse's Orbit project
-%define qualifier 20090308
+%define qualifier 20090520
 
 Name:           sat4j
 Version:        2.1.0
-Release:        0.2.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        A library of SAT solvers written in Java
 
 Group:          Development/Libraries
 License:        EPL and LGPLv2
 URL:            http://www.sat4j.org/
 # Created by sh %{name}-fetch.sh
-Source0:        %{name}-%{version}.RC2.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-fetch.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1:1.6
 BuildRequires:  ant
+BuildRequires:  ecj
 Requires:       java >= 1:1.6
 Requires:       jpackage-utils
 
@@ -35,7 +36,7 @@ without worrying about the details.
 rm lib/commons-cli.jar
 
 %build
-ant -Drelease=%{version} -DBUILD_DATE=%{qualifier} p2 
+ant -Dbuild.compiler=modern -Drelease=%{version} -DBUILD_DATE=%{qualifier} p2 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -54,8 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/org.sat4j*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-0.2.rc2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 2.1.0-1
+- Update to 2.1.0 final.
 
 * Wed Apr 8 2009 Alexander Kurtakov <akurtako at redhat.com> 2.1.0-0.1.rc2
 - Update to 2.1.0.RC2.


Index: sat4j-fetch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j-fetch.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sat4j-fetch.sh	8 Apr 2009 09:50:36 -0000	1.2
+++ sat4j-fetch.sh	4 Aug 2009 13:32:50 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/sh
 name=sat4j
-tag=2_1_0_RC2
+tag=2_1_0_ECLIPSE
 version=2.1.0
 tar_name=$name-$version
 



From dnovotny at fedoraproject.org  Tue Aug  4 13:34:45 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue,  4 Aug 2009 13:34:45 +0000 (UTC)
Subject: rpms/amanda/devel amanda-2.6.0p2-insec.patch, NONE, 1.1 amanda.spec,
	1.62, 1.63
Message-ID: <20090804133445.2F88211C00E4@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	amanda.spec 
Added Files:
	amanda-2.6.0p2-insec.patch 
Log Message:

fix #512534


amanda-2.6.0p2-insec.patch:
 amstatus.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amanda-2.6.0p2-insec.patch ---
diff -up amanda-2.6.0p2/server-src/amstatus.pl.insec amanda-2.6.0p2/server-src/amstatus.pl
--- amanda-2.6.0p2/server-src/amstatus.pl.insec	2009-08-04 15:17:13.000000000 +0200
+++ amanda-2.6.0p2/server-src/amstatus.pl	2009-08-04 15:17:31.000000000 +0200
@@ -1,4 +1,4 @@
-#!@PERL@ -Tw
+#!@PERL@ -w
 #
 
 # Run perl.


Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- amanda.spec	24 Jul 2009 16:49:24 -0000	1.62
+++ amanda.spec	4 Aug 2009 13:34:44 -0000	1.63
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 11%{?dist}
+Release: 12%{?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
@@ -21,6 +21,7 @@ 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
+Patch7: amanda-2.6.0p2-insec.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -93,6 +94,7 @@ be used to develop amanda applications.
 %patch4 -p1 -b .lib
 %patch5 -p1 -b .pie
 %patch6 -p1 -b .builderr
+%patch7 -p1 -b .insec
 ./autogen
 
 %build
@@ -377,6 +379,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %{_libdir}/libamandad.so
 
 %changelog
+* Tue Aug 04 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-12
+-fix #512534 -  amstatus outputs "Insecure dependency in printf ..." 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0p2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Tue Aug  4 13:46:23 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  4 Aug 2009 13:46:23 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel fetch-mylyn.sh, 1.10,
	1.11 eclipse-mylyn.spec, 1.39, 1.40 .cvsignore, 1.9,
	1.10 eclipse-mylyn-addfedoracustomizations.patch, 1.8,
	1.9 sources, 1.12, 1.13
Message-ID: <20090804134623.3D49F11C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29268/devel

Modified Files:
	fetch-mylyn.sh eclipse-mylyn.spec .cvsignore 
	eclipse-mylyn-addfedoracustomizations.patch sources 
Log Message:
Update to 3.2.1.


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fetch-mylyn.sh	22 Apr 2009 14:47:05 -0000	1.10
+++ fetch-mylyn.sh	4 Aug 2009 13:46:22 -0000	1.11
@@ -15,6 +15,8 @@ org.eclipse.mylyn.context.core \
 org.eclipse.mylyn.context-feature \
 org.eclipse.mylyn.context.tests \
 org.eclipse.mylyn.context.ui \
+org.eclipse.mylyn.discovery.core \
+org.eclipse.mylyn.discovery.ui \
 org.eclipse.mylyn-feature \
 org.eclipse.mylyn.help.ui \
 org.eclipse.mylyn.ide.ant \
@@ -48,12 +50,12 @@ org.eclipse.mylyn.trac-feature \
 org.eclipse.mylyn.trac.tests \
 org.eclipse.mylyn.trac.ui \
 org.eclipse.mylyn.web.tasks-feature \
-org.eclipse.mylyn.web.ui \
 org.eclipse.mylyn.web.tasks \
 org.eclipse.mylyn.wikitext-feature \
 org.eclipse.mylyn.wikitext.confluence.core \
 org.eclipse.mylyn.wikitext.confluence.ui \
 org.eclipse.mylyn.wikitext.core \
+org.eclipse.mylyn.wikitext.help.ui \
 org.eclipse.mylyn.wikitext.mediawiki.core \
 org.eclipse.mylyn.wikitext.mediawiki.ui \
 org.eclipse.mylyn.wikitext.tasks.ui \
@@ -67,5 +69,5 @@ org.eclipse.mylyn.wikitext.twiki.ui \
 org.eclipse.mylyn.wikitext.ui \
 ; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
-export -r R_3_1_1 org.eclipse.mylyn/$f;
+export -r R_3_2_1 org.eclipse.mylyn/$f;
 done


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- eclipse-mylyn.spec	24 Jul 2009 20:55:18 -0000	1.39
+++ eclipse-mylyn.spec	4 Aug 2009 13:46:22 -0000	1.40
@@ -2,7 +2,7 @@
 %define install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 # http://download.eclipse.org/tools/mylyn/update/e3.4/
-%define qualifier           v20090411-0400-e3x
+%define qualifier           v20090722-0200-e3x
 
 # Prevent brp-java-repack-jars from being run.  Spaces in the paths of
 # the help content are broken by it.
@@ -10,15 +10,15 @@
 
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.1.1
-Release: 2%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # mkdir temp && cd temp
 # sh fetch-mylyn.sh
-# tar cjf org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2
+# 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
 Source1: fetch-mylyn.sh
 Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.3.zip
 
@@ -327,8 +327,8 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-1
+- Update to 3.2.1.
 
 * Wed Apr 22 2009 Andrew Overholt <overholt at redhat.com> 3.1.1-1
 - 3.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Apr 2009 14:47:05 -0000	1.9
+++ .cvsignore	4 Aug 2009 13:46:22 -0000	1.10
@@ -1,2 +1,3 @@
 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

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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- eclipse-mylyn-addfedoracustomizations.patch	22 Apr 2009 14:47:05 -0000	1.8
+++ eclipse-mylyn-addfedoracustomizations.patch	4 Aug 2009 13:46:22 -0000	1.9
@@ -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.1.1.qualifier"
+          version="3.2.1.qualifier"
           unpack="false"/>
  
 +   <plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Apr 2009 14:47:05 -0000	1.12
+++ sources	4 Aug 2009 13:46:22 -0000	1.13
@@ -1,2 +1,2 @@
 ccf62375bb3dfe3d0d3bab4323765c5f  fedoraeclipse-mylynbugzilla-0.0.3.zip
-7e0c93fff981d2488ee427a8b71364aa  org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2
+729610b5594f067112ca8d87539ea77b  org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2



From djuran at fedoraproject.org  Tue Aug  4 13:52:13 2009
From: djuran at fedoraproject.org (David Juran)
Date: Tue,  4 Aug 2009 13:52:13 +0000 (UTC)
Subject: rpms/azureus/devel azureus.script,1.23,1.24 azureus.spec,1.77,1.78
Message-ID: <20090804135213.64DDF11C00E4@cvs1.fedora.phx.redhat.com>

Author: djuran

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

Modified Files:
	azureus.script azureus.spec 
Log Message:
- Fix Bz 515228 properly



Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.script,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- azureus.script	3 Aug 2009 19:05:59 -0000	1.23
+++ azureus.script	4 Aug 2009 13:52:13 -0000	1.24
@@ -21,10 +21,12 @@ case $(uname -i) in
         *64)
                 eval $(grep '^GRE_PATH=' /etc/gre.d/gre64.conf)
                 SWT=/usr/lib64/eclipse/swt.jar
+		LIBDIR=/usr/lib64
                 ;;
         *)
                 eval $(grep '^GRE_PATH=' /etc/gre.d/gre.conf)
                 SWT=/usr/lib/eclipse/swt.jar
+		LIBDIR=/usr/lib
                 ;;
 esac
-MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:LIBDIR/eclipse/plugins/:LIBDIR/eclipse/:LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
+MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LIBDIR/eclipse/plugins/:$LIBDIR/eclipse/:$LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- azureus.spec	3 Aug 2009 19:05:59 -0000	1.77
+++ azureus.spec	4 Aug 2009 13:52:13 -0000	1.78
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	4.2.0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -167,7 +167,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadi
 install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 # TODO: fix launcher to be multilib-safe
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
-sed --in-place "s:LIBDIR:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
 
 #install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
 #install -pm 644 plugins/azplugins/azplugins_2.1.6.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_2.1.6.jar
@@ -228,6 +227,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Tue Aug  4 2009 David Juran <david at juran.se> - 4.2.0.4-2
+- Fix Bz 515228 properly
+
 * Wed Jul 29 2009 David Juran <david at juran.se> - 4.2.0.4-1
 - Upgrade to 4.2.0.4
 - Fix SWT dir on x86_64 (Bz 515228)



From lkundrak at fedoraproject.org  Tue Aug  4 13:50:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  4 Aug 2009 13:50:23 +0000 (UTC)
Subject: rpms/shortrpm/devel .cvsignore, 1.3, 1.4 shortrpm.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090804135023.92C6E11C034A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore shortrpm.spec sources 
Log Message:
* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-2
- New upstream release
- Fix operation with more recent rpm config



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Apr 2009 07:07:46 -0000	1.3
+++ .cvsignore	4 Aug 2009 13:50:23 -0000	1.4
@@ -1 +1 @@
-shortrpm-1.1.tar.gz
+shortrpm-1.2.tar.gz


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/shortrpm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shortrpm.spec	27 Jul 2009 04:17:16 -0000	1.3
+++ shortrpm.spec	4 Aug 2009 13:50:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           shortrpm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Short-circuit binary RPM package build
 
 Group:          Development/Tools
@@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-2
+- New upstream release
+- Fix operation with more recent rpm config
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Apr 2009 07:07:46 -0000	1.3
+++ sources	4 Aug 2009 13:50:23 -0000	1.4
@@ -1 +1 @@
-f6da9946e844dc0cd2e0146af100253f  shortrpm-1.1.tar.gz
+7b41352d1b6653c5f09dbdc2fef0b929  shortrpm-1.2.tar.gz



From markmc at fedoraproject.org  Tue Aug  4 14:36:21 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  4 Aug 2009 14:36:21 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-extboot-signrom.patch, NONE, 1.1 qemu.spec,
	1.116, 1.117
Message-ID: <20090804143621.9162811C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-extboot-signrom.patch 
Log Message:
* Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.3.rc1.rc0
- Fix extboot checksum (bug #514899)


qemu-fix-extboot-signrom.patch:
 signrom.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qemu-fix-extboot-signrom.patch ---
>From 6fb154d7d16b25d70615d33dc30927ded148dd32 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf at suse.de>
Date: Sat, 1 Aug 2009 11:48:31 +0200
Subject: [PATCH] Fix checksum writing in signboot.sh

The printf command takes an octal value after \, so we have to convert
our decimal representation to octal first and then write it.

This unbreaks extboot signing. Multiboot wasn't affected yet because
the checksum was < 8.

Spotted and first patch by Glauber Costa <glommer at redhat.com>.
Printf idea by Paolo Bonzini <bonzini at gnu.org>.

(cherry picked from commit d8b69b34761f7b3fb8f476712b631d1dd3f1b2a5)

Signed-off-by: Alexander Graf <agraf at suse.de>
CC: Glauber Costa <glommer at redhat.com>
CC: Paolo Bonzini <bonzini at gnu.org>
CC: Jan Ondrej <ondrejj at salstar.sk>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-extboot-signrom.patch
---
 pc-bios/optionrom/signrom.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pc-bios/optionrom/signrom.sh b/pc-bios/optionrom/signrom.sh
index 4322811..975b27d 100755
--- a/pc-bios/optionrom/signrom.sh
+++ b/pc-bios/optionrom/signrom.sh
@@ -39,7 +39,8 @@ done
 
 sum=$(( $sum % 256 ))
 sum=$(( 256 - $sum ))
+sum_octal=$( printf "%o" $sum )
 
 # and write the output file
 cp "$1" "$2"
-printf "\\$sum" | dd of="$2" bs=1 count=1 seek=$size conv=notrunc 2>/dev/null
+printf "\\$sum_octal" | dd of="$2" bs=1 count=1 seek=$size conv=notrunc 2>/dev/null
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- qemu.spec	31 Jul 2009 15:12:00 -0000	1.116
+++ qemu.spec	4 Aug 2009 14:36:21 -0000	1.117
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.2.%{kvmvertag}%{?dist}
+Release: 0.3.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -29,6 +29,9 @@ Patch03: qemu-fix-optionrom-install.patc
 # Add KSM support - see https://fedoraproject.org/wiki/Features/KSM
 Patch04: qemu-add-ksm-support.patch
 
+# Fix extboot checksum (bug #514899)
+Patch05: qemu-fix-extboot-signrom.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
@@ -213,6 +216,7 @@ such as kvmtrace and kvm_stat.
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
+%patch05 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -477,6 +481,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.3.rc1.rc0
+- Fix extboot checksum (bug #514899)
+
 * Fri Jul 31 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.2.rc1.rc0
 - Add KSM support
 - Require bochs-bios >= 2.3.8-0.8 for latest kvm bios updates



From hadess at fedoraproject.org  Tue Aug  4 14:42:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  4 Aug 2009 14:42:52 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.247,1.248
Message-ID: <20090804144252.6A9F511C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	totem.spec 
Log Message:
* Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-3
- Remove gnome-themes dependency, use gnome-icon-theme instead



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- totem.spec	27 Jul 2009 06:08:34 -0000	1.247
+++ totem.spec	4 Aug 2009 14:42:51 -0000	1.248
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -22,7 +22,7 @@ Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
 
 Requires: iso-codes
-Requires: gnome-themes
+Requires: gnome-icon-theme
 # For the opensubtitles plugin
 Requires: pyxdg
 # For all the Python plugins
@@ -376,6 +376,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-3
+- Remove gnome-themes dependency, use gnome-icon-theme instead
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mmahut at fedoraproject.org  Tue Aug  4 14:46:18 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue,  4 Aug 2009 14:46:18 +0000 (UTC)
Subject: rpms/irssi/EL-5 irssi.spec, 1.19, 1.20 sources, 1.8,
	1.9 irssi-0.8.10-dcc-unregister.patch, 1.1,
	NONE irssi-CVE-2009-1959.patch, 1.1, NONE
Message-ID: <20090804144618.6072611C00E4@cvs1.fedora.phx.redhat.com>

Author: mmahut

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

Modified Files:
	irssi.spec sources 
Removed Files:
	irssi-0.8.10-dcc-unregister.patch irssi-CVE-2009-1959.patch 
Log Message:
> * Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.14-1
> - Upstream release 0.8.14



Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/EL-5/irssi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- irssi.spec	24 Jun 2009 06:55:29 -0000	1.19
+++ irssi.spec	4 Aug 2009 14:46:18 -0000	1.20
@@ -2,15 +2,14 @@
 
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
-Version:	0.8.13
-Release:	2%{?dist}
+Version:	0.8.14
+Release:	1%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://irssi.org/
 Source0:	http://irssi.org/files/irssi-%{version}.tar.gz
 Source1:	irssi-config.h
-Patch0:		irssi-CVE-2009-1959.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig glib2-devel perl(ExtUtils::Embed)
@@ -36,7 +35,7 @@ being maintained.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+
 %build
 %configure --enable-ipv6 --with-textui	\
 	--with-proxy			\
@@ -85,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.14-1
+- Upstream release 0.8.14
+
 * Tue Jun 23 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.8.13-2
 - Resolve CVE-2009-1959
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Jun 2009 06:55:29 -0000	1.8
+++ sources	4 Aug 2009 14:46:18 -0000	1.9
@@ -1 +1 @@
-226f194576895ff3075c164523806d06  irssi-0.8.13.tar.gz
+7d9437f53209a61af4fe4c9c5528ffa7  irssi-0.8.14.tar.gz


--- irssi-0.8.10-dcc-unregister.patch DELETED ---


--- irssi-CVE-2009-1959.patch DELETED ---



From markmc at fedoraproject.org  Tue Aug  4 14:48:16 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  4 Aug 2009 14:48:16 +0000 (UTC)
Subject: rpms/qemu/devel qemu-add-ksm-support.patch, 1.1,
	1.2 qemu-bios-bigger-roms.patch, 1.9,
	1.10 qemu-fix-extboot-signrom.patch, 1.1,
	1.2 qemu-fix-linux-user-build-on-ppc.patch, 1.5,
	1.6 qemu-fix-optionrom-install.patch, 1.1, 1.2 qemu.spec, 1.117,
	1.118 sources, 1.19, 1.20
Message-ID: <20090804144816.7086811C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	qemu-add-ksm-support.patch qemu-bios-bigger-roms.patch 
	qemu-fix-extboot-signrom.patch 
	qemu-fix-linux-user-build-on-ppc.patch 
	qemu-fix-optionrom-install.patch qemu.spec sources 
Log Message:
* Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.4.rc1
- Update to qemu-kvm-0.11-rc1; no changes from rc1-rc0


qemu-add-ksm-support.patch:
 exec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: qemu-add-ksm-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-add-ksm-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-add-ksm-support.patch	31 Jul 2009 15:11:59 -0000	1.1
+++ qemu-add-ksm-support.patch	4 Aug 2009 14:48:15 -0000	1.2
@@ -1,4 +1,4 @@
-From 511a4f5ab30a36fdaa48fb0d146cfc3f123b4f0a Mon Sep 17 00:00:00 2001
+From 729b681039015c718e476b8f294480b179ed726d Mon Sep 17 00:00:00 2001
 From: Izik Eidus <ieidus at redhat.com>
 Date: Tue, 28 Jul 2009 19:14:26 +0300
 Subject: [PATCH] kvm userspace: ksm support

qemu-bios-bigger-roms.patch:
 rombios.c |   34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qemu-bios-bigger-roms.patch	30 Jul 2009 16:28:52 -0000	1.9
+++ qemu-bios-bigger-roms.patch	4 Aug 2009 14:48:15 -0000	1.10
@@ -1,4 +1,4 @@
-From ad6bfcfe0292ac09aac0de729343dabf91c16f93 Mon Sep 17 00:00:00 2001
+From 7f871498235ac7591bd4398a745735081290c1a2 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:31:41 +0100
 Subject: [PATCH] compute checksum for roms bigger than a segment

qemu-fix-extboot-signrom.patch:
 signrom.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: qemu-fix-extboot-signrom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-extboot-signrom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-extboot-signrom.patch	4 Aug 2009 14:36:21 -0000	1.1
+++ qemu-fix-extboot-signrom.patch	4 Aug 2009 14:48:15 -0000	1.2
@@ -1,4 +1,4 @@
-From 6fb154d7d16b25d70615d33dc30927ded148dd32 Mon Sep 17 00:00:00 2001
+From ee595f99ba7ff80b46a736a06f7e53998d926563 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf at suse.de>
 Date: Sat, 1 Aug 2009 11:48:31 +0200
 Subject: [PATCH] Fix checksum writing in signboot.sh

qemu-fix-linux-user-build-on-ppc.patch:
 elf.h                |    2 ++
 linux-user/elfload.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: qemu-fix-linux-user-build-on-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-linux-user-build-on-ppc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- qemu-fix-linux-user-build-on-ppc.patch	30 Jul 2009 16:28:52 -0000	1.5
+++ qemu-fix-linux-user-build-on-ppc.patch	4 Aug 2009 14:48:16 -0000	1.6
@@ -1,4 +1,4 @@
-From 6def4aea8b88f52de678ffca117ba70b1e6878c2 Mon Sep 17 00:00:00 2001
+From 1cdc8e879b1e2140cc48c1a76718c336f42b0a7d Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 29 Jun 2009 14:49:03 +0100
 Subject: [PATCH] Fix linux-user build on ppc

qemu-fix-optionrom-install.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qemu-fix-optionrom-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-optionrom-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-optionrom-install.patch	30 Jul 2009 16:28:52 -0000	1.1
+++ qemu-fix-optionrom-install.patch	4 Aug 2009 14:48:16 -0000	1.2
@@ -1,4 +1,4 @@
-From e941daafed39ae5db507af42da8a35b60a8be363 Mon Sep 17 00:00:00 2001
+From b3f4aa7dc9fcee229a0f6943f9fae1a02daf3497 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 30 Jul 2009 17:17:43 +0100
 Subject: [PATCH] Revert "Don't copy multiboot.bin into pc-bios after built"


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- qemu.spec	4 Aug 2009 14:36:21 -0000	1.117
+++ qemu.spec	4 Aug 2009 14:48:16 -0000	1.118
@@ -1,18 +1,17 @@
-%define kvmvertag  rc1.rc0
-%define kvmverfull kvm-0.11.0-rc1-rc0
+%define kvmvertag  rc1
+%define kvmverfull kvm-0.11.0-rc1
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.3.%{kvmvertag}%{?dist}
+Release: 0.4.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
 
-Source0: http://markmc.fedorapeople.org/kvm/qemu-%{kvmverfull}.tar.gz
-#Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
 Source1: qemu.init
 Source2: kvm.modules
 Source3: 80-kvm.rules
@@ -481,6 +480,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.4.rc1
+- Update to qemu-kvm-0.11-rc1; no changes from rc1-rc0
+
 * Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.3.rc1.rc0
 - Fix extboot checksum (bug #514899)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	30 Jul 2009 16:28:52 -0000	1.19
+++ sources	4 Aug 2009 14:48:16 -0000	1.20
@@ -1 +1 @@
-d5196f06c21f77c72977ef04c6cb0ae4  qemu-kvm-0.11.0-rc1-rc0.tar.gz
+bef21a81a3e81cfbaf92e9f2c4219575  qemu-kvm-0.11.0-rc1.tar.gz



From ajax at fedoraproject.org  Tue Aug  4 14:58:21 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 14:58:21 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.60,1.61
Message-ID: <20090804145821.3BFC211C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	filesystem.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.4.27-1
- Prov/Obs: xorg-x11-filesystem



Index: filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- filesystem.spec	3 Aug 2009 08:43:51 -0000	1.60
+++ filesystem.spec	4 Aug 2009 14:58:21 -0000	1.61
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.26
+Version: 2.4.27
 Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
@@ -11,6 +11,10 @@ Source1: https://fedorahosted.org/filesy
 Requires(Pre): setup >= 2.5.4-1
 BuildRequires: iso-codes
 
+# Can be removed after f14 or so
+Provides: xorg-x11-filesystem = 7.3-6
+Obsoletes: xorg-x11-filesystem < 7.3-6
+
 %description
 The filesystem package is one of the basic packages that is installed
 on a Linux system. Filesystem contains the basic directory layout
@@ -160,6 +164,9 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.4.27-1
+- Prov/Obs: xorg-x11-filesystem
+
 * Mon Aug 03 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.26-1
 - Do own /usr/share/man/<locale> directories (ghosted, missingok) - #220265
 



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:17 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested watchbugzilla
Message-ID: <20090804150317.8714D10F882@bastion2.fedora.phx.redhat.com>

skvidal has requested the watchbugzilla acl on python-urlgrabber (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:20 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested watchcommits
Message-ID: <20090804150320.B563510F8A9@bastion2.fedora.phx.redhat.com>

skvidal has requested the watchcommits acl on python-urlgrabber (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:23 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested commit
Message-ID: <20090804150323.D438010F8AD@bastion2.fedora.phx.redhat.com>

skvidal has requested the commit acl on python-urlgrabber (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:37 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested watchbugzilla
Message-ID: <20090804150337.39EAC10F882@bastion2.fedora.phx.redhat.com>

skvidal has requested the watchbugzilla acl on python-urlgrabber (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:37 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested watchcommits
Message-ID: <20090804150337.B5C0310F8B1@bastion2.fedora.phx.redhat.com>

skvidal has requested the watchcommits acl on python-urlgrabber (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:39 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested commit
Message-ID: <20090804150339.CD70810F8B4@bastion2.fedora.phx.redhat.com>

skvidal has requested the commit acl on python-urlgrabber (Fedora 11)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:43 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested watchcommits
Message-ID: <20090804150343.7149F10F8AF@bastion2.fedora.phx.redhat.com>

skvidal has requested the watchcommits acl on python-urlgrabber (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:44 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested commit
Message-ID: <20090804150344.2875010F8B7@bastion2.fedora.phx.redhat.com>

skvidal has requested the commit acl on python-urlgrabber (Fedora 10)

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:03:48 +0000
Subject: [pkgdb] python-urlgrabber: skvidal has requested watchbugzilla
Message-ID: <20090804150348.B820710F879@bastion2.fedora.phx.redhat.com>

skvidal has requested the watchbugzilla acl on python-urlgrabber (Fedora 10)

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



From ajax at fedoraproject.org  Tue Aug  4 15:07:54 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 15:07:54 +0000 (UTC)
Subject: rpms/xorg-x11-filesystem/devel dead.package,NONE,1.1
Message-ID: <20090804150754.E045E11C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Added Files:
	dead.package 
Log Message:
Upgrade-path package for modular X, no longer needed.



--- NEW FILE dead.package ---
Upgrade-path package for modular X, no longer needed.



From pkgdb at fedoraproject.org  Tue Aug  4 15:07:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:07:54 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150754.A5D0C10F8A0@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python-urlgrabber (Fedora devel) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:07:56 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150757.1353210F8AD@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python-urlgrabber (Fedora devel) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:07:58 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150758.F095810F8B4@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python-urlgrabber (Fedora devel) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:00 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150801.E32D610F879@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python-urlgrabber (Fedora devel) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:19 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150819.2F9F910F8A0@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python-urlgrabber (Fedora 10) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:20 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150820.A0FEE10F8BB@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python-urlgrabber (Fedora 10) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:22 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150822.9C8CB10F8BD@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python-urlgrabber (Fedora 10) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:24 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150824.71DFC10F8BF@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python-urlgrabber (Fedora 10) to Approved for skvidal

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



From deji at fedoraproject.org  Tue Aug  4 15:08:28 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 15:08:28 +0000 (UTC)
Subject: rpms/baobab/devel dead.package,NONE,1.1
Message-ID: <20090804150828.2BF0A11C00E4@cvs1.fedora.phx.redhat.com>

Author: deji

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

Added Files:
	dead.package 
Log Message:
Add dead.package for long obsoleted baobab



--- NEW FILE dead.package ---
Obsolete by gnome-utils



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:28 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150828.A569810F8C3@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python-urlgrabber (Fedora 11) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:28 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150829.269B610F8C5@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python-urlgrabber (Fedora 11) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:30 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150830.5F69010F8C6@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python-urlgrabber (Fedora 11) to Approved for skvidal

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



From pkgdb at fedoraproject.org  Tue Aug  4 15:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 15:08:31 +0000
Subject: [pkgdb] python-urlgrabber had acl change status
Message-ID: <20090804150831.D425010F8C8@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python-urlgrabber (Fedora 11) to Approved for skvidal

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



From deji at fedoraproject.org  Tue Aug  4 15:08:59 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 15:08:59 +0000 (UTC)
Subject: rpms/baobab/F-11 dead.package,NONE,1.1
Message-ID: <20090804150859.7049711C00E4@cvs1.fedora.phx.redhat.com>

Author: deji

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

Added Files:
	dead.package 
Log Message:
Add dead.package for long obsoleted baobab



--- NEW FILE dead.package ---
Obsolete by gnome-utils



From kyle at fedoraproject.org  Tue Aug  4 15:18:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  4 Aug 2009 15:18:24 +0000 (UTC)
Subject: rpms/kernel/devel
	alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch,
	NONE, 1.1 kernel.spec, 1.1688, 1.1689
Message-ID: <20090804151824.A40DA11C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch 
Log Message:
* Tue Aug 04 2009 Kyle McMartin <kyle at redhat.com>
- alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch: apply patch
  destined for 2.6.32, requested by Lennart.


alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch:
 pcm_native.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch ---
>From 7402d155b5ba6551241cdde9724c2c49dd6cc7ea Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun, 2 Aug 2009 17:41:28 +0200
Subject: [PATCH] Tell user that stream to be rewound is suspended

Return STRPIPE instead of EBADF when userspace attempts to rewind
of forward a stream that was suspended in meanwhile, so that it
can be recovered by snd_pcm_recover().

This was causing Pulseaudio to unload the ALSA sink module under a race
condition when it attempted to rewind the stream right after resume from
suspend, before writing to the stream which would cause it to revive the
stream otherwise. Tested to work with Pulseaudio patched to attempt to
snd_pcm_recover() upon receiving an error from snd_pcm_rewind().

Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 sound/core/pcm_native.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index ac2150e..d89c816 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2208,6 +2208,9 @@ static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *subst
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
@@ -2253,6 +2256,9 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
@@ -2299,6 +2305,9 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
@@ -2345,6 +2354,9 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
-- 
1.6.2.5



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1688
retrieving revision 1.1689
diff -u -p -r1.1688 -r1.1689
--- kernel.spec	4 Aug 2009 06:46:47 -0000	1.1688
+++ kernel.spec	4 Aug 2009 15:18:23 -0000	1.1689
@@ -646,6 +646,7 @@ Patch580: linux-2.6-sparc-selinux-mprote
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 Patch601: linux-2.6-alsa-improve-hda-powerdown.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
+Patch611: alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
@@ -1212,6 +1213,7 @@ ApplyPatch linux-2.6-defaults-aspm.patch
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
 ApplyPatch linux-2.6-alsa-improve-hda-powerdown.patch
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
+ApplyPatch alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 # Networking
 
@@ -1944,6 +1946,10 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 04 2009 Kyle McMartin <kyle at redhat.com>
+- alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch: apply patch
+  destined for 2.6.32, requested by Lennart.
+
 * Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: more code share between nv50/<nv50 kms, bug fixes
 



From rdieter at fedoraproject.org  Tue Aug  4 15:20:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 15:20:41 +0000 (UTC)
Subject: rpms/kde-filesystem/devel kde-filesystem.spec,1.41,1.42
Message-ID: <20090804152041.078D111C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14407

Modified Files:
	kde-filesystem.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4-29
- drop unused (and confusing) /etc/kde4/ crud



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- kde-filesystem.spec	25 Jul 2009 04:22:07 -0000	1.41
+++ kde-filesystem.spec	4 Aug 2009 15:20:40 -0000	1.42
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 28%{?dist}
+Release: 29%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -78,9 +78,9 @@ install -p -m644 -D %{SOURCE3} $RPM_BUIL
 
 ## KDE4
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/env \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/kdm \
       -p $RPM_BUILD_ROOT%{_kde4_includedir} \
       -p $RPM_BUILD_ROOT%{_kde4_libexecdir} \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
@@ -162,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 # KDE4
 %config /etc/rpm/macros.kde4
-%{_kde4_sysconfdir}/kde4/
+%{_kde4_sysconfdir}/kde/
 %{_kde4_libexecdir}/
 %{_kde4_includedir}/
 %{_kde4_datadir}/applications/kde4/
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4-29
+- drop unused (and confusing) /etc/kde4/ crud
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Tue Aug  4 15:23:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  4 Aug 2009 15:23:06 +0000 (UTC)
Subject: rpms/kiconedit/devel .cvsignore, 1.11, 1.12 kiconedit.spec, 1.20,
	1.21 sources, 1.12, 1.13
Message-ID: <20090804152306.27A4C11C00E4@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Jun 2009 13:30:03 -0000	1.11
+++ .cvsignore	4 Aug 2009 15:23:05 -0000	1.12
@@ -1 +1,2 @@
 kiconedit-4.2.4.tar.bz2
+kiconedit-4.3.0.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/kiconedit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kiconedit.spec	25 Jul 2009 04:36:24 -0000	1.20
+++ kiconedit.spec	4 Aug 2009 15:23:05 -0000	1.21
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.2.4
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        1%{?dist}
 Summary:        An icon editor
 
 Group:          Applications/Publishing
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Jun 2009 13:30:03 -0000	1.12
+++ sources	4 Aug 2009 15:23:05 -0000	1.13
@@ -1 +1 @@
-41ff4b12be1c9cef996804599b6c932f  kiconedit-4.2.4.tar.bz2
+b01877aa6da21b50f0550c43c6b86cfe  kiconedit-4.3.0.tar.bz2



From ajax at fedoraproject.org  Tue Aug  4 15:25:00 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 15:25:00 +0000 (UTC)
Subject: rpms/mcelog/devel mcelog.spec,1.26,1.27
Message-ID: <20090804152500.5D5FA11C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	mcelog.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 0.7-5
- Fix %install for new buildroot cleanout.



Index: mcelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mcelog.spec	25 Jul 2009 11:54:33 -0000	1.26
+++ mcelog.spec	4 Aug 2009 15:25:00 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
 Version:        0.7
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPLv2
@@ -27,6 +27,7 @@ make CFLAGS="$RPM_OPT_FLAGS -fpie -pie"
 %install
 mkdir -p %{buildroot}%{_mandir}/man{1,8}
 mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly
+mkdir -p %{buildroot}%{_sbindir}
 install mcelog %{buildroot}%{_sbindir}/mcelog
 install mcelog.cron %{buildroot}%{_sysconfdir}/cron.hourly/mcelog.cron
 cp mcelog.8 %{buildroot}%{_mandir}/man8
@@ -44,6 +45,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 0.7-5
+- Fix %%install for new buildroot cleanout.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Tue Aug  4 15:27:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 15:27:54 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic-epson-stylus-color-200.patch, NONE,
	1.1 foomatic.spec, 1.220, 1.221
Message-ID: <20090804152754.430E511C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-epson-stylus-color-200.patch 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
- Use stcolor driver for Epson Stylus Color 200 (bug #513676).


foomatic-epson-stylus-color-200.patch:
 driver/stcolor.xml                 |    3 +++
 printer/Epson-Stylus_Color_200.xml |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE foomatic-epson-stylus-color-200.patch ---
diff -up foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/driver/stcolor.xml
--- foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200	2009-07-02 08:49:20.000000000 +0100
+++ foomatic-db-20090702/db/source/driver/stcolor.xml	2009-08-04 16:08:19.378201381 +0100
@@ -22,6 +22,9 @@ better dithering. Try it.</en>
    <id>printer/Epson-Stylus_Color</id><!-- Epson Stylus Color -->
   </printer>
   <printer>
+   <id>printer/Epson-Stylus_Color_200</id><!-- Epson Stylus Color 200 -->
+  </printer>
+  <printer>
    <id>printer/Epson-Stylus_Color_300</id><!-- Epson Stylus Color 300 -->
    <comments>
     <en>Works with the "-dMicroweave" option.</en>
diff -up foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml
--- foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200	2009-07-02 08:49:23.000000000 +0100
+++ foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml	2009-08-04 16:08:19.382201394 +0100
@@ -19,7 +19,7 @@
   <autodetect></autodetect>
   <functionality>B</functionality>
   <!--not "unverified"-->
-  <driver>mj500c</driver>
+  <driver>stcolor</driver>
   <comments>
     <en>Imported from old Red Hat japanese printer database</en>
     </comments>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- foomatic.spec	29 Jul 2009 09:45:34 -0000	1.220
+++ foomatic.spec	4 Aug 2009 15:27:54 -0000	1.221
@@ -40,6 +40,7 @@ Patch102: foomatic-bad-utf8.patch
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 ## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)
+Patch301: foomatic-epson-stylus-color-200.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -101,6 +102,7 @@ pushd foomatic-db-hpijs-%{hpijsver}
 popd
 
 pushd foomatic-db-%{dbver_snap}
+%patch301 -p1 -b .epson-stylus-color-200
 
 cd db/source
 
@@ -245,7 +247,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
-* Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
+- 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).



From twaugh at fedoraproject.org  Tue Aug  4 15:27:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue,  4 Aug 2009 15:27:56 +0000 (UTC)
Subject: rpms/foomatic/F-11 foomatic-epson-stylus-color-200.patch, NONE,
	1.1 foomatic.spec, 1.219, 1.220
Message-ID: <20090804152756.6BB6711C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-epson-stylus-color-200.patch 
Log Message:
* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
- Use stcolor driver for Epson Stylus Color 200 (bug #513676).


foomatic-epson-stylus-color-200.patch:
 driver/stcolor.xml                 |    3 +++
 printer/Epson-Stylus_Color_200.xml |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE foomatic-epson-stylus-color-200.patch ---
diff -up foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/driver/stcolor.xml
--- foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200	2009-07-02 08:49:20.000000000 +0100
+++ foomatic-db-20090702/db/source/driver/stcolor.xml	2009-08-04 16:08:19.378201381 +0100
@@ -22,6 +22,9 @@ better dithering. Try it.</en>
    <id>printer/Epson-Stylus_Color</id><!-- Epson Stylus Color -->
   </printer>
   <printer>
+   <id>printer/Epson-Stylus_Color_200</id><!-- Epson Stylus Color 200 -->
+  </printer>
+  <printer>
    <id>printer/Epson-Stylus_Color_300</id><!-- Epson Stylus Color 300 -->
    <comments>
     <en>Works with the "-dMicroweave" option.</en>
diff -up foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml
--- foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200	2009-07-02 08:49:23.000000000 +0100
+++ foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml	2009-08-04 16:08:19.382201394 +0100
@@ -19,7 +19,7 @@
   <autodetect></autodetect>
   <functionality>B</functionality>
   <!--not "unverified"-->
-  <driver>mj500c</driver>
+  <driver>stcolor</driver>
   <comments>
     <en>Imported from old Red Hat japanese printer database</en>
     </comments>


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- foomatic.spec	29 Jul 2009 09:44:37 -0000	1.219
+++ foomatic.spec	4 Aug 2009 15:27:56 -0000	1.220
@@ -40,6 +40,7 @@ Patch102: foomatic-bad-utf8.patch
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 ## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)
+Patch301: foomatic-epson-stylus-color-200.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -101,6 +102,7 @@ pushd foomatic-db-hpijs-%{hpijsver}
 popd
 
 pushd foomatic-db-%{dbver_snap}
+%patch301 -p1 -b .epson-stylus-color-200
 
 cd db/source
 
@@ -245,13 +247,14 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
-* Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
+* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
+- 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).
 
-* Mon Jul 20 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-4
-- Rebuilt for new update.
+* 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



From deji at fedoraproject.org  Tue Aug  4 15:09:27 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 15:09:27 +0000 (UTC)
Subject: rpms/baobab/F-10 dead.package,NONE,1.1
Message-ID: <20090804150927.46C4711C00E4@cvs1.fedora.phx.redhat.com>

Author: deji

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

Added Files:
	dead.package 
Log Message:
Add dead.package for long obsoleted baobab



--- NEW FILE dead.package ---
Obsolete by gnome-utils



From ajax at fedoraproject.org  Tue Aug  4 15:33:18 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 15:33:18 +0000 (UTC)
Subject: rpms/cpuspeed/devel cpuspeed.spec,1.81,1.82
Message-ID: <20090804153318.571E711C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	cpuspeed.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.5-12
- Move buildroot dir creation to %install



Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- cpuspeed.spec	24 Jul 2009 19:36:04 -0000	1.81
+++ cpuspeed.spec	4 Aug 2009 15:33:17 -0000	1.82
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -42,15 +42,15 @@ cp %{SOURCE1} .
 %build
 rm -rf $RPM_BUILD_ROOT
 
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/g')
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-Wl,-z,relro,-z,now"
+
+%install
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
 
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/g')
-make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-Wl,-z,relro,-z,now"
-
-%install
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/cpuspeed
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/cpuspeed
@@ -81,6 +81,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.5-12
+- Move buildroot dir creation to %%install
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Tue Aug  4 15:09:00 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  4 Aug 2009 15:09:00 +0000 (UTC)
Subject: rpms/kcoloredit/devel .cvsignore, 1.11, 1.12 kcoloredit.spec, 1.17, 
	1.18 sources, 1.12, 1.13
Message-ID: <20090804150900.5799311C00E4@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Jun 2009 12:43:31 -0000	1.11
+++ .cvsignore	4 Aug 2009 15:09:00 -0000	1.12
@@ -1 +1,2 @@
 kcoloredit-2.0.0-kde4.2.4.tar.bz2
+kcoloredit-2.0.0-kde4.3.0.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/kcoloredit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kcoloredit.spec	25 Jul 2009 04:21:22 -0000	1.17
+++ kcoloredit.spec	4 Aug 2009 15:09:00 -0000	1.18
@@ -4,8 +4,8 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.2.4
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        1%{?dist}
 Summary:        A color palette Editor
 
 Group:          Applications/Publishing
@@ -84,6 +84,9 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Jun 2009 12:43:31 -0000	1.12
+++ sources	4 Aug 2009 15:09:00 -0000	1.13
@@ -1 +1 @@
-b9ca32c6ec24c935d94bc909861ae10f  kcoloredit-2.0.0-kde4.2.4.tar.bz2
+4d4c7809dd3275299ff31cdfb784ddab  kcoloredit-2.0.0-kde4.3.0.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 15:35:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 15:35:30 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/devel .cvsignore, 1.5,
	1.6 leonidas-kde-theme.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090804153530.D521011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/leonidas-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17418

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 11.0.2-1
- fixup theme metadata for KDE-4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 May 2009 13:51:44 -0000	1.5
+++ .cvsignore	4 Aug 2009 15:35:30 -0000	1.6
@@ -1 +1 @@
-leonidas-kde-theme-11.0.1.tar.bz2
+leonidas-kde-theme-11.0.2.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/leonidas-kde-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- leonidas-kde-theme.spec	25 Jul 2009 05:04:41 -0000	1.5
+++ leonidas-kde-theme.spec	4 Aug 2009 15:35:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		leonidas-kde-theme
-Version:	11.0.1
-Release:	2%{?dist}
+Version:	11.0.2
+Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
 Group:		User Interface/Desktops
@@ -206,6 +206,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 11.0.2-1
+- fixup theme metadata for KDE-4.3
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 May 2009 13:51:44 -0000	1.5
+++ sources	4 Aug 2009 15:35:30 -0000	1.6
@@ -1 +1 @@
-5c92ba5491804bc6436a63acca642dac  leonidas-kde-theme-11.0.1.tar.bz2
+89951f5493403c46e820f0a500758927  leonidas-kde-theme-11.0.2.tar.bz2



From markmc at fedoraproject.org  Tue Aug  4 15:35:43 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  4 Aug 2009 15:35:43 +0000 (UTC)
Subject: rpms/qemu/F-11 .cvsignore, 1.16, 1.17 01-tls-handshake-fix.patch,
	1.3, 
	1.4 02-vnc-monitor-info.patch, 1.3, 1.4 03-display-keymaps.patch,
	1.3, 1.4 04-vnc-struct.patch, 1.3, 1.4 05-vnc-tls-vencrypt.patch,
	1.3, 1.4 06-vnc-sasl.patch, 1.3,
	1.4 07-vnc-monitor-authinfo.patch, 1.3,
	1.4 08-vnc-acl-mgmt.patch, 1.3, 1.4 kvm-upstream-ppc.patch, 1.5,
	1.6 qemu.spec, 1.98, 1.99 sources, 1.16,
	1.17 qemu-fix-net-socket-list-init.patch, 1.2,
	NONE qemu-prevent-cdrom-media-eject-while-device-is-locked.patch,
	1.2, NONE
Message-ID: <20090804153543.84B9B11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	.cvsignore 01-tls-handshake-fix.patch 
	02-vnc-monitor-info.patch 03-display-keymaps.patch 
	04-vnc-struct.patch 05-vnc-tls-vencrypt.patch 
	06-vnc-sasl.patch 07-vnc-monitor-authinfo.patch 
	08-vnc-acl-mgmt.patch kvm-upstream-ppc.patch qemu.spec sources 
Removed Files:
	qemu-fix-net-socket-list-init.patch 
	qemu-prevent-cdrom-media-eject-while-device-is-locked.patch 
Log Message:
* Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-1
- Update to qemu-kvm-0.10.6; upstream ChangeLog:
   - merge qemu 0.10.6
      - fix -net socket,listen
      - live migration: don't send gratuitous packets all at once
      - serial: fix lost characters after sysrq
      - Delete io-handler before closing fd after migration
      - Fix qemu_aio_flush
      - i386: fix cpu reset
      - Prevent CD-ROM eject while device is locked
      - Fix migration after hot remove with eepro100
      - Don't start a VM after failed migration if stopped
      - Fix live migration under heavy IO load
      - Honor -S on incoming migration
      - Reset PS2 keyboard/mouse on reset
   - build and install extboot
- Drop upstreamed qemu-prevent-cdrom-media-eject-while-device-is-locked.patch
  and qemu-fix-net-socket-list-init.patch and



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	31 May 2009 14:42:32 -0000	1.16
+++ .cvsignore	4 Aug 2009 15:35:42 -0000	1.17
@@ -1 +1 @@
-qemu-kvm-0.10.5.tar.gz
+qemu-kvm-*.tar.gz

01-tls-handshake-fix.patch:
 vnc.c |    9 ---------
 1 file changed, 9 deletions(-)

Index: 01-tls-handshake-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/01-tls-handshake-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 01-tls-handshake-fix.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 01-tls-handshake-fix.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From b7f419eee93569ef0c31c868fa24108d31e66bff Mon Sep 17 00:00:00 2001
+From 6b55d3e74400c9f7e71739abd0dac362a5db1dc6 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:02 +0000
-Subject: [PATCH 01/18] Fix bug in TLS authentication ("Daniel P. Berrange")
+Subject: [PATCH] Fix bug in TLS authentication ("Daniel P. Berrange")
 
 This patch was previously posted here:
 
@@ -26,12 +26,13 @@ this patch.
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 01-tls-handshake-fix.patch
 ---
  vnc.c |    8 --------
  1 files changed, 0 insertions(+), 8 deletions(-)
 
 diff --git a/vnc.c b/vnc.c
-index 783df80..18a7ad9 100644
+index 1d8ebe7..d6a7225 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -2105,14 +2105,6 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len
@@ -50,5 +51,5 @@ index 783df80..18a7ad9 100644
      return 0;
  }
 -- 
-1.6.2.2
+1.6.2.5
 

02-vnc-monitor-info.patch:
 vnc.c |  140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 128 insertions(+), 12 deletions(-)

Index: 02-vnc-monitor-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/02-vnc-monitor-info.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 02-vnc-monitor-info.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 02-vnc-monitor-info.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From a3eb32f433a958afac931e04ce899d004744f5e0 Mon Sep 17 00:00:00 2001
+From b4b2ff2fbd7e6458fbfa8f2e6af7d1b668a06a1a Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:05 +0000
-Subject: [PATCH 02/18] Enhance 'info vnc' monitor output ("Daniel P. Berrange")
+Subject: [PATCH] Enhance 'info vnc' monitor output ("Daniel P. Berrange")
 
 The current 'info vnc' monitor output just displays the VNC server address
 as provided by the -vnc command line flag. This isn't particularly useful
@@ -42,12 +42,13 @@ important.
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 02-vnc-monitor-info.patch
 ---
  vnc.c |  139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
  1 files changed, 128 insertions(+), 11 deletions(-)
 
 diff --git a/vnc.c b/vnc.c
-index 18a7ad9..3e9417d 100644
+index d6a7225..d7d9b91 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -166,19 +166,136 @@ struct VncState
@@ -199,5 +200,5 @@ index 18a7ad9..3e9417d 100644
  }
  
 -- 
-1.6.2.2
+1.6.2.5
 

03-display-keymaps.patch:
 Makefile      |    9 +++++---
 curses.c      |    3 --
 curses_keys.h |    9 +++-----
 keymaps.c     |   45 ++++++++++++++++---------------------------
 keymaps.h     |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sdl.c         |    3 --
 sdl_keysym.h  |    7 ++----
 vnc.c         |    5 +---
 vnc_keysym.h  |    8 ++-----
 9 files changed, 97 insertions(+), 52 deletions(-)

Index: 03-display-keymaps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/03-display-keymaps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 03-display-keymaps.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 03-display-keymaps.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From 6fc44b90006f1bf4763088c4eacd1efec428759b Mon Sep 17 00:00:00 2001
+From 202790c357fcff7f1222f4e7777e0cf561b516d5 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:10 +0000
-Subject: [PATCH 03/18] Refactor keymap code to avoid duplication ("Daniel P. Berrange")
+Subject: [PATCH] Refactor keymap code to avoid duplication ("Daniel P. Berrange")
 
 Each of the graphical frontends #include a .c file, for keymap code
 resulting in duplicated definitions & duplicated compiled code. A
@@ -16,6 +16,7 @@ causing clashing definitions.
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 03-display-keymaps.patch
 ---
  Makefile      |    9 +++++--
  curses.c      |    3 +-
@@ -30,7 +31,7 @@ Signed-off-by: Mark McLoughlin <markmc at r
  create mode 100644 keymaps.h
 
 diff --git a/Makefile b/Makefile
-index 6739626..58585a3 100644
+index 92eb447..f74b7eb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -141,6 +141,7 @@ endif
@@ -286,7 +287,7 @@ index 0000000..17f6efd
 +
 +#endif /* __QEMU_KEYMAPS_H__ */
 diff --git a/sdl.c b/sdl.c
-index 74f084c..f0f9fc8 100644
+index 95efe8d..8b7a1fe 100644
 --- a/sdl.c
 +++ b/sdl.c
 @@ -109,7 +109,6 @@ static void sdl_resize(DisplayState *ds)
@@ -297,7 +298,7 @@ index 74f084c..f0f9fc8 100644
  
  static kbd_layout_t *kbd_layout = NULL;
  
-@@ -677,7 +676,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
+@@ -680,7 +679,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
          keyboard_layout = "en-us";
  #endif
      if(keyboard_layout) {
@@ -322,7 +323,7 @@ index c9087d7..c213ef8 100644
  /* ascii */
      { "space",                0x020},
 diff --git a/vnc.c b/vnc.c
-index 3e9417d..aafefd8 100644
+index d7d9b91..969d5b0 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -35,7 +35,6 @@
@@ -333,7 +334,7 @@ index 3e9417d..aafefd8 100644
  #include "d3des.h"
  
  #ifdef CONFIG_VNC_TLS
-@@ -2429,9 +2428,9 @@ void vnc_display_init(DisplayState *ds)
+@@ -2428,9 +2427,9 @@ void vnc_display_init(DisplayState *ds)
      vs->ds = ds;
  
      if (keyboard_layout)
@@ -361,5 +362,5 @@ index ce355d8..2d255c9 100644
  /* ascii */
      { "space",                0x020},
 -- 
-1.6.2.2
+1.6.2.5
 

04-vnc-struct.patch:
 vnc.c |  109 -----------------------------------------------
 vnc.h |  150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 148 insertions(+), 111 deletions(-)

Index: 04-vnc-struct.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/04-vnc-struct.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 04-vnc-struct.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 04-vnc-struct.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From c1b31361bfecd3f67e8766d8df2510c801f536f4 Mon Sep 17 00:00:00 2001
+From 35b87b5d1543c563c09361086519ebdc960d4934 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:13 +0000
-Subject: [PATCH 04/18] Move VNC structs into header file ("Daniel P. Berrange")
+Subject: [PATCH] Move VNC structs into header file ("Daniel P. Berrange")
 
 This patch moves the definitions of VncState and VncDisplay structs
 out into a vnc.h header file. This is to allow the code for TLS
@@ -12,13 +12,14 @@ and SASL auth mechanisms to be moved out
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 04-vnc-struct.patch
 ---
  vnc.c |  109 +----------------------------------------------
  vnc.h |  149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 148 insertions(+), 110 deletions(-)
 
 diff --git a/vnc.c b/vnc.c
-index aafefd8..a9b8d63 100644
+index 969d5b0..7fb31b6 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -3,6 +3,7 @@
@@ -322,5 +323,5 @@ index 6981606..eb33643 100644
 -#endif /* __VNCTIGHT_H */
 +#endif /* __QEMU_VNC_H */
 -- 
-1.6.2.2
+1.6.2.5
 

05-vnc-tls-vencrypt.patch:
 Makefile            |   11 
 vnc-auth-vencrypt.c |  167 ++++++++++++++
 vnc-auth-vencrypt.h |   33 ++
 vnc-tls.c           |  414 +++++++++++++++++++++++++++++++++++++
 vnc-tls.h           |   70 ++++++
 vnc.c               |  581 +++-------------------------------------------------
 vnc.h               |   77 ++++--
 7 files changed, 780 insertions(+), 573 deletions(-)

Index: 05-vnc-tls-vencrypt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/05-vnc-tls-vencrypt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 05-vnc-tls-vencrypt.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 05-vnc-tls-vencrypt.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From 9d5f4a68ddb05d823ef1fde787ac027715fe1f95 Mon Sep 17 00:00:00 2001
+From af17025ce83b924f666617294606ec5ad1a9e833 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:23 +0000
-Subject: [PATCH 05/18] Move TLS auth into separate file ("Daniel P. Berrange")
+Subject: [PATCH] Move TLS auth into separate file ("Daniel P. Berrange")
 
 This patch refactors the existing TLS code to make the main VNC code
 more managable. The code moves to two new files
@@ -33,6 +33,7 @@ gnutls_send/recv.
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 05-vnc-tls-vencrypt.patch
 ---
  Makefile            |   11 +-
  vnc-auth-vencrypt.c |  167 +++++++++++++++
@@ -48,7 +49,7 @@ Signed-off-by: Mark McLoughlin <markmc at r
  create mode 100644 vnc-tls.h
 
 diff --git a/Makefile b/Makefile
-index 58585a3..7a3cad5 100644
+index f74b7eb..680939f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -149,6 +149,9 @@ ifdef CONFIG_CURSES
@@ -788,7 +789,7 @@ index 0000000..cda95b9
 +#endif /* __QEMU_VNC_TLS_H__ */
 +
 diff --git a/vnc.c b/vnc.c
-index a9b8d63..f1c2d61 100644
+index 7fb31b6..f980d68 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -34,21 +34,6 @@
@@ -1476,7 +1477,7 @@ index a9b8d63..f1c2d61 100644
         } else if (vs->vd->auth == VNC_AUTH_VNC) {
              VNC_DEBUG("Tell client VNC auth\n");
              vnc_write_u32(vs, vs->vd->auth);
-@@ -2337,61 +1883,6 @@ void vnc_display_init(DisplayState *ds)
+@@ -2336,61 +1882,6 @@ void vnc_display_init(DisplayState *ds)
      register_displaychangelistener(ds, dcl);
  }
  
@@ -1538,7 +1539,7 @@ index a9b8d63..f1c2d61 100644
  
  void vnc_display_close(DisplayState *ds)
  {
-@@ -2411,7 +1902,7 @@ void vnc_display_close(DisplayState *ds)
+@@ -2410,7 +1901,7 @@ void vnc_display_close(DisplayState *ds)
      vs->auth = VNC_AUTH_INVALID;
  #ifdef CONFIG_VNC_TLS
      vs->subauth = VNC_AUTH_INVALID;
@@ -1547,7 +1548,7 @@ index a9b8d63..f1c2d61 100644
  #endif
  }
  
-@@ -2467,7 +1958,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2466,7 +1957,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
  	    char *start, *end;
  	    x509 = 1; /* Require x509 certificates */
  	    if (strncmp(options, "x509verify", 10) == 0)
@@ -1556,7 +1557,7 @@ index a9b8d63..f1c2d61 100644
  
  	    /* Now check for 'x509=/some/path' postfix
  	     * and use that to setup x509 certificate/key paths */
-@@ -2478,7 +1969,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2477,7 +1968,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
  		char *path = qemu_strndup(start + 1, len);
  
  		VNC_DEBUG("Trying certificate path '%s'\n", path);
@@ -1695,5 +1696,5 @@ index eb33643..d69b295 100644
 +
  #endif /* __QEMU_VNC_H */
 -- 
-1.6.2.2
+1.6.2.5
 

06-vnc-sasl.patch:
 Makefile            |    7 
 Makefile.target     |    5 
 configure           |   34 ++
 qemu-doc.texi       |   97 ++++++++
 qemu.sasl           |   34 ++
 vnc-auth-sasl.c     |  626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 vnc-auth-sasl.h     |   67 +++++
 vnc-auth-vencrypt.c |   12 
 vnc.c               |  249 ++++++++++++++++++--
 vnc.h               |   32 ++
 10 files changed, 1129 insertions(+), 34 deletions(-)

Index: 06-vnc-sasl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/06-vnc-sasl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 06-vnc-sasl.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 06-vnc-sasl.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From 95b704fb6b2a9a7f62bbbfd1b9fd2e23d1c428a5 Mon Sep 17 00:00:00 2001
+From 1b4f956f40315ecc756e34cdeb923424c7095684 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:28 +0000
-Subject: [PATCH 06/18] Add SASL authentication support ("Daniel P. Berrange")
+Subject: [PATCH] Add SASL authentication support ("Daniel P. Berrange")
 
 This patch adds the new SASL authentication protocol to the VNC server.
 
@@ -69,6 +69,7 @@ if found, unless --disable-vnc-sasl was 
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 06-vnc-sasl.patch
 ---
  Makefile            |    7 +-
  Makefile.target     |    5 +
@@ -86,7 +87,7 @@ Signed-off-by: Mark McLoughlin <markmc at r
  create mode 100644 vnc-auth-sasl.h
 
 diff --git a/Makefile b/Makefile
-index 7a3cad5..f5de0b6 100644
+index 680939f..13ae73d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -152,6 +152,9 @@ OBJS+=vnc.o d3des.o
@@ -1120,7 +1121,7 @@ index 1f113a7..9ed642c 100644
  
  static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len)
 diff --git a/vnc.c b/vnc.c
-index f1c2d61..33671fd 100644
+index f980d68..3c315d6 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -68,7 +68,8 @@ static char *addr_to_string(const char *format,
@@ -1433,7 +1434,7 @@ index f1c2d61..33671fd 100644
         default: /* Should not be possible, but just in case */
             VNC_DEBUG("Reject auth %d\n", vs->vd->auth);
             vnc_write_u8(vs, 1);
-@@ -1932,6 +2072,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -1931,6 +2071,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
  #ifdef CONFIG_VNC_TLS
      int tls = 0, x509 = 0;
  #endif
@@ -1444,7 +1445,7 @@ index f1c2d61..33671fd 100644
  
      if (!vnc_display)
          return -1;
-@@ -1951,6 +2095,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -1950,6 +2094,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
  	    reverse = 1;
  	} else if (strncmp(options, "to=", 3) == 0) {
              to_port = atoi(options+3) + 5900;
@@ -1455,7 +1456,7 @@ index f1c2d61..33671fd 100644
  #ifdef CONFIG_VNC_TLS
  	} else if (strncmp(options, "tls", 3) == 0) {
  	    tls = 1; /* Require TLS */
-@@ -1987,6 +2135,22 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -1986,6 +2134,22 @@ int vnc_display_open(DisplayState *ds, const char *display)
  	}
      }
  
@@ -1478,7 +1479,7 @@ index f1c2d61..33671fd 100644
      if (password) {
  #ifdef CONFIG_VNC_TLS
  	if (tls) {
-@@ -1999,13 +2163,34 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -1998,13 +2162,34 @@ int vnc_display_open(DisplayState *ds, const char *display)
  		vs->subauth = VNC_AUTH_VENCRYPT_TLSVNC;
  	    }
  	} else {
@@ -1515,7 +1516,7 @@ index f1c2d61..33671fd 100644
      } else {
  #ifdef CONFIG_VNC_TLS
  	if (tls) {
-@@ -2027,6 +2212,16 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2026,6 +2211,16 @@ int vnc_display_open(DisplayState *ds, const char *display)
  #endif
      }
  
@@ -1615,5 +1616,5 @@ index d69b295..ca39c23 100644
 +
  #endif /* __QEMU_VNC_H */
 -- 
-1.6.2.2
+1.6.2.5
 

07-vnc-monitor-authinfo.patch:
 vnc-tls.c |   17 +++++++++++++++++
 vnc-tls.h |    3 +++
 vnc.c     |   20 +++++++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)

Index: 07-vnc-monitor-authinfo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/07-vnc-monitor-authinfo.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 07-vnc-monitor-authinfo.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 07-vnc-monitor-authinfo.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From 9e9226fb865ada61b8b0a6c2c5526fdedfd4d608 Mon Sep 17 00:00:00 2001
+From e61c19737387273e305a2da5c9b28fe42e2eef67 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:32 +0000
-Subject: [PATCH 07/18] Include auth credentials in 'info vnc' ("Daniel P. Berrange")
+Subject: [PATCH] Include auth credentials in 'info vnc' ("Daniel P. Berrange")
 
 This patch extends the 'info vnc' monitor output to include information
 about the VNC client authentication credentials.
@@ -30,6 +30,7 @@ Auth can be stacked, so both username & 
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 07-vnc-monitor-authinfo.patch
 ---
  vnc-tls.c |   17 +++++++++++++++++
  vnc-tls.h |    3 +++
@@ -86,7 +87,7 @@ index cda95b9..fd0a2d9 100644
  
  int vnc_tls_client_setup(VncState *vs, int x509Creds);
 diff --git a/vnc.c b/vnc.c
-index 33671fd..da68842 100644
+index 3c315d6..9f0e16b 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -156,6 +156,21 @@ static void do_info_vnc_client(VncState *client)
@@ -130,5 +131,5 @@ index 33671fd..da68842 100644
             if (vs->minor >= 8) {
                 static const char err[] = "Authentication failed";
 -- 
-1.6.2.2
+1.6.2.5
 

08-vnc-acl-mgmt.patch:
 Makefile        |    6 +
 acl.c           |  185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 acl.h           |   74 ++++++++++++++++++++++
 configure       |   18 +++++
 monitor.c       |   96 +++++++++++++++++++++++++++++
 qemu-doc.texi   |   49 ++++++++++++++
 vnc-auth-sasl.c |   16 +++-
 vnc-auth-sasl.h |    7 ++
 vnc-tls.c       |   19 +++++
 vnc-tls.h       |    3 
 vnc.c           |   21 ++++++
 vnc.h           |    4 -
 12 files changed, 492 insertions(+), 6 deletions(-)

Index: 08-vnc-acl-mgmt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/08-vnc-acl-mgmt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 08-vnc-acl-mgmt.patch	24 Jun 2009 16:43:44 -0000	1.3
+++ 08-vnc-acl-mgmt.patch	4 Aug 2009 15:35:42 -0000	1.4
@@ -1,7 +1,7 @@
-From 5fd8471df80cfd1e868ea50125065536c8fe900c Mon Sep 17 00:00:00 2001
+From e71cbebb569fa3d9b285a03a72802609b43bd6e9 Mon Sep 17 00:00:00 2001
 From: aliguori <aliguori at c046a42c-6fe2-441c-8c8c-71466251a162>
 Date: Fri, 6 Mar 2009 20:27:37 +0000
-Subject: [PATCH 08/18] Support ACLs for controlling VNC access ("Daniel P. Berrange")
+Subject: [PATCH] Support ACLs for controlling VNC access ("Daniel P. Berrange")
 
 This patch introduces a generic internal API for access control lists
 to be used by network servers in QEMU. It adds support for checking
@@ -70,6 +70,7 @@ starting up
 Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
 Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: 08-vnc-acl-mgmt.patch
 ---
  Makefile        |    6 +-
  acl.c           |  185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -88,7 +89,7 @@ Signed-off-by: Mark McLoughlin <markmc at r
  create mode 100644 acl.h
 
 diff --git a/Makefile b/Makefile
-index f5de0b6..2af4c06 100644
+index 13ae73d..fa1afdc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -148,7 +148,7 @@ endif
@@ -736,7 +737,7 @@ index fd0a2d9..2b93633 100644
      /* Paths to x509 certs/keys */
      char *x509cacert;
 diff --git a/vnc.c b/vnc.c
-index da68842..44a7746 100644
+index 9f0e16b..f797878 100644
 --- a/vnc.c
 +++ b/vnc.c
 @@ -28,6 +28,7 @@
@@ -747,7 +748,7 @@ index da68842..44a7746 100644
  
  #define VNC_REFRESH_INTERVAL (1000 / 30)
  
-@@ -2091,6 +2092,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2090,6 +2091,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
      int sasl = 0;
      int saslErr;
  #endif
@@ -755,7 +756,7 @@ index da68842..44a7746 100644
  
      if (!vnc_display)
          return -1;
-@@ -2147,9 +2149,28 @@ int vnc_display_open(DisplayState *ds, const char *display)
+@@ -2146,9 +2148,28 @@ int vnc_display_open(DisplayState *ds, const char *display)
  		return -1;
  	    }
  #endif
@@ -799,5 +800,5 @@ index ca39c23..6a60f8d 100644
  
  struct VncState
 -- 
-1.6.2.2
+1.6.2.5
 

kvm-upstream-ppc.patch:
 hw/ppc440.c            |    1 +
 hw/ppc440_bamboo.c     |    1 +
 hw/ppce500_mpc8544ds.c |    1 +
 target-ppc/helper.c    |    2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

Index: kvm-upstream-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/kvm-upstream-ppc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kvm-upstream-ppc.patch	24 Jun 2009 16:43:44 -0000	1.5
+++ kvm-upstream-ppc.patch	4 Aug 2009 15:35:42 -0000	1.6
@@ -1,7 +1,7 @@
-From a103fc3415c6efcd04a73ca928482fc3467e9400 Mon Sep 17 00:00:00 2001
+From d842e3222f8ce614769d1cf8227bb3b8dbf209bc Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:22:57 +0100
-Subject: [PATCH 09/18] use KVM_UPSTREAM for ppc.
+Subject: [PATCH] use KVM_UPSTREAM for ppc.
 
 ppc should compile with upstream qemu code, so, put these
 defines in ppc specific code that references kvm functions.
@@ -12,6 +12,7 @@ and would break compilation.
 
 Signed-off-by: Glauber Costa <glommer at redhat.com>
 Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+Fedora-patch: kvm-upstream-ppc.patch
 ---
  hw/ppc440.c            |    1 +
  hw/ppc440_bamboo.c     |    1 +
@@ -68,5 +69,5 @@ index e02dcb0..027c8e7 100644
  
  //#define DEBUG_MMU
 -- 
-1.6.2.2
+1.6.2.5
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- qemu.spec	17 Jun 2009 12:02:48 -0000	1.98
+++ qemu.spec	4 Aug 2009 15:35:42 -0000	1.99
@@ -1,14 +1,14 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10.5
-Release: 3%{?dist}
+Version: 0.10.6
+Release: 1%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
 
-Source0: http://download.sourceforge.net/sourceforge/kvm/qemu-kvm-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-kvm-%{version}.tar.gz
 Source1: qemu.init
 Source2: kvm.modules
 
@@ -27,10 +27,8 @@ Patch11: qemu-roms-more-room.patch
 Patch12: qemu-roms-more-room-fix-vga-align.patch
 Patch13: qemu-bios-bigger-roms.patch
 Patch14: qemu-kvm-fix-kerneldir-includes.patch
-Patch15: qemu-fix-net-socket-list-init.patch
-Patch16: qemu-prevent-cdrom-media-eject-while-device-is-locked.patch
-Patch17: qemu-avoid-harmless-msr-warnings.patch
-Patch18: qemu-ppc-on-ppc.patch
+Patch15: qemu-avoid-harmless-msr-warnings.patch
+Patch16: qemu-ppc-on-ppc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -227,8 +225,6 @@ such as kvmtrace and kvm_stat.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
-%patch18 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -471,6 +467,25 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-1
+- Update to qemu-kvm-0.10.6; upstream ChangeLog:
+   - merge qemu 0.10.6
+      - fix -net socket,listen
+      - live migration: don't send gratuitous packets all at once
+      - serial: fix lost characters after sysrq
+      - Delete io-handler before closing fd after migration
+      - Fix qemu_aio_flush
+      - i386: fix cpu reset
+      - Prevent CD-ROM eject while device is locked
+      - Fix migration after hot remove with eepro100
+      - Don't start a VM after failed migration if stopped
+      - Fix live migration under heavy IO load
+      - Honor -S on incoming migration
+      - Reset PS2 keyboard/mouse on reset
+   - build and install extboot
+- Drop upstreamed qemu-prevent-cdrom-media-eject-while-device-is-locked.patch
+  and qemu-fix-net-socket-list-init.patch and
+
 * Wed Jun 17 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.5-3
 - ppc-on-ppc fix (#504273)
 - Fix -kernel regression (#506443)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	31 May 2009 14:42:34 -0000	1.16
+++ sources	4 Aug 2009 15:35:42 -0000	1.17
@@ -1 +1 @@
-e59ca20604ca8892d8f99b9fc5a159c1  qemu-kvm-0.10.5.tar.gz
+704101efb98a271763342ef5b187a3bd  qemu-kvm-0.10.6.tar.gz


--- qemu-fix-net-socket-list-init.patch DELETED ---


--- qemu-prevent-cdrom-media-eject-while-device-is-locked.patch DELETED ---



From than at fedoraproject.org  Tue Aug  4 15:37:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  4 Aug 2009 15:37:03 +0000 (UTC)
Subject: rpms/kgrab/devel .cvsignore, 1.9, 1.10 kgrab.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <20090804153703.DC6B211C00E4@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	10 Jun 2009 13:14:38 -0000	1.9
+++ .cvsignore	4 Aug 2009 15:37:03 -0000	1.10
@@ -1 +1,2 @@
 kgrab-0.1.1-kde4.2.4.tar.bz2
+kgrab-0.1.1-kde4.3.0.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/kgrab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kgrab.spec	25 Jul 2009 04:35:04 -0000	1.19
+++ kgrab.spec	4 Aug 2009 15:37:03 -0000	1.20
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.2.4
+%define kdeversion 4.3.0
 
 Name:           kgrab
 Version:        0.1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 0.1.1-18
+- 4.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Jun 2009 13:14:38 -0000	1.9
+++ sources	4 Aug 2009 15:37:03 -0000	1.10
@@ -1 +1 @@
-18a140e145451e077d9568100d583086  kgrab-0.1.1-kde4.2.4.tar.bz2
+199d59f03900236c0dbc771d617b49f6  kgrab-0.1.1-kde4.3.0.tar.bz2



From mtasaka at fedoraproject.org  Tue Aug  4 15:38:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 15:38:12 +0000 (UTC)
Subject: rpms/uget/F-10 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 uget.spec, 
	1.10, 1.11
Message-ID: <20090804153812.9F88111C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
- 1.4.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Jul 2009 16:54:40 -0000	1.9
+++ .cvsignore	4 Aug 2009 15:38:12 -0000	1.10
@@ -1 +1 @@
-uget-1.4.9.1.tar.gz
+uget-1.4.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Jul 2009 16:54:40 -0000	1.9
+++ sources	4 Aug 2009 15:38:12 -0000	1.10
@@ -1 +1 @@
-5a5b1d3a2a285b8e478ee9f3c7cedb7b  uget-1.4.9.1.tar.gz
+f2dbc5a9abb1b8253c92221013a33455  uget-1.4.9.2.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/uget.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- uget.spec	22 Jul 2009 16:54:40 -0000	1.10
+++ uget.spec	4 Aug 2009 15:38:12 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.1
+Version:	1.4.9.2
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -10,6 +10,7 @@ Source0:	http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gstreamer-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	intltool
 BuildRequires:	libcurl-devel
@@ -45,6 +46,8 @@ desktop-file-install \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gtk.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -62,7 +65,7 @@ exit 0
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 exit 0
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc	AUTHORS
 %doc	COPYING
@@ -72,8 +75,15 @@ exit 0
 
 %{_datadir}/applications/%{name}-gtk.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
+%{_datadir}/sounds/%{name}/
 
 %changelog
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
+- 1.4.9.2
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.1-2
+- F-12: Mass rebuild
+
 * Wed Jul 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.1-1
 - 1.4.9.1
 



From mtasaka at fedoraproject.org  Tue Aug  4 15:38:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 15:38:12 +0000 (UTC)
Subject: rpms/uget/F-11 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 uget.spec, 
	1.10, 1.11
Message-ID: <20090804153812.CA66E11C0344@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
- 1.4.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Jul 2009 16:54:41 -0000	1.9
+++ .cvsignore	4 Aug 2009 15:38:12 -0000	1.10
@@ -1 +1 @@
-uget-1.4.9.1.tar.gz
+uget-1.4.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Jul 2009 16:54:41 -0000	1.9
+++ sources	4 Aug 2009 15:38:12 -0000	1.10
@@ -1 +1 @@
-5a5b1d3a2a285b8e478ee9f3c7cedb7b  uget-1.4.9.1.tar.gz
+f2dbc5a9abb1b8253c92221013a33455  uget-1.4.9.2.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/uget.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- uget.spec	22 Jul 2009 16:54:41 -0000	1.10
+++ uget.spec	4 Aug 2009 15:38:12 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.1
+Version:	1.4.9.2
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -10,6 +10,7 @@ Source0:	http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gstreamer-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	intltool
 BuildRequires:	libcurl-devel
@@ -45,6 +46,8 @@ desktop-file-install \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gtk.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -62,7 +65,7 @@ exit 0
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 exit 0
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc	AUTHORS
 %doc	COPYING
@@ -72,8 +75,15 @@ exit 0
 
 %{_datadir}/applications/%{name}-gtk.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
+%{_datadir}/sounds/%{name}/
 
 %changelog
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
+- 1.4.9.2
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.1-2
+- F-12: Mass rebuild
+
 * Wed Jul 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.1-1
 - 1.4.9.1
 



From mtasaka at fedoraproject.org  Tue Aug  4 15:38:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 15:38:13 +0000 (UTC)
Subject: rpms/uget/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 uget.spec, 
	1.12, 1.13
Message-ID: <20090804153813.0DF3111C0345@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18164/devel

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
- 1.4.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Jul 2009 16:54:41 -0000	1.9
+++ .cvsignore	4 Aug 2009 15:38:12 -0000	1.10
@@ -1 +1 @@
-uget-1.4.9.1.tar.gz
+uget-1.4.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Jul 2009 16:54:41 -0000	1.9
+++ sources	4 Aug 2009 15:38:12 -0000	1.10
@@ -1 +1 @@
-5a5b1d3a2a285b8e478ee9f3c7cedb7b  uget-1.4.9.1.tar.gz
+f2dbc5a9abb1b8253c92221013a33455  uget-1.4.9.2.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/uget.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- uget.spec	24 Jul 2009 19:51:29 -0000	1.12
+++ uget.spec	4 Aug 2009 15:38:12 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		uget
-Version:	1.4.9.1
-Release:	2%{?dist}
+Version:	1.4.9.2
+Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
 Group:		Applications/Internet
@@ -10,6 +10,7 @@ Source0:	http://downloads.sourceforge.ne
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gstreamer-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	intltool
 BuildRequires:	libcurl-devel
@@ -45,6 +46,8 @@ desktop-file-install \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gtk.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -62,7 +65,7 @@ exit 0
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 exit 0
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc	AUTHORS
 %doc	COPYING
@@ -72,8 +75,12 @@ exit 0
 
 %{_datadir}/applications/%{name}-gtk.desktop
 %{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
+%{_datadir}/sounds/%{name}/
 
 %changelog
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.2-1
+- 1.4.9.2
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.1-2
 - F-12: Mass rebuild
 



From tbzatek at fedoraproject.org  Tue Aug  4 15:42:43 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  4 Aug 2009 15:42:43 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.3.4-output-stream-callback-arg.patch, NONE, 
	1.1 gvfs-1.3.4-smb-browse-fake-content-type.patch, NONE,
	1.1 gvfs.spec, 1.140, 1.141
Message-ID: <20090804154243.7C52811C00E4@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18918

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.4-output-stream-callback-arg.patch 
	gvfs-1.3.4-smb-browse-fake-content-type.patch 
Log Message:
* Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.3-2
- Fix gedit crashed with SEGV in strlen()
- Fix SMB protocol not handled when opening from a bookmark (#509832)


gvfs-1.3.4-output-stream-callback-arg.patch:
 gdaemonfileoutputstream.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gvfs-1.3.4-output-stream-callback-arg.patch ---
>From a3979cd918d366be7850ca558b3040b8d2d0322d Mon Sep 17 00:00:00 2001
From: Peter Waller <peter.waller at gmail.com>
Date: Tue, 04 Aug 2009 09:14:30 +0000
Subject: Bug 589915 - gedit crashed with SEGV in strlen()

FIx a crash introduced by commit c372064a where it was forgotten do
adapt the function signature of a callback
---
diff --git a/client/gdaemonfileoutputstream.c b/client/gdaemonfileoutputstream.c
index e47c2e8..c5263e1 100644
--- a/client/gdaemonfileoutputstream.c
+++ b/client/gdaemonfileoutputstream.c
@@ -1474,6 +1474,7 @@ async_close_done (GOutputStream *stream,
 		  gpointer op_data,
 		  GAsyncReadyCallback callback,
 		  gpointer user_data,
+                  GCancellable *cancellable,
 		  GError *io_error)
 {
   GDaemonFileOutputStream *file;
@@ -1481,7 +1482,6 @@ async_close_done (GOutputStream *stream,
   CloseOperation *op;
   gboolean result;
   GError *error;
-  GCancellable *cancellable = NULL; /* TODO: get cancellable */
 
   file = G_DAEMON_FILE_OUTPUT_STREAM (stream);
   
@@ -1544,7 +1544,7 @@ g_daemon_file_output_stream_close_async (GOutputStream     *stream,
 			   op, io_priority,
 			   (GAsyncReadyCallback)callback, data,
 			   cancellable,
-			   (AsyncIteratorDone)async_close_done);
+			   async_close_done);
 }
 
 static gboolean
--
cgit v0.8.2

gvfs-1.3.4-smb-browse-fake-content-type.patch:
 gvfsbackendsmbbrowse.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gvfs-1.3.4-smb-browse-fake-content-type.patch ---
>From fa09fd4e5dda701c8862ce2d7762698b907cf90f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 31 Jul 2009 16:58:54 +0200
Subject: [PATCH] smb-browse: fake content type to allow query default handler

Hardcode the "inode/directory" content-type
Fixes #573994
---
 daemon/gvfsbackendsmbbrowse.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c
index 6d0c07e..2eebdd2 100644
--- a/daemon/gvfsbackendsmbbrowse.c
+++ b/daemon/gvfsbackendsmbbrowse.c
@@ -1229,6 +1229,7 @@ get_file_info_from_entry (GVfsBackendSmbBrowse *backend, BrowseEntry *entry, GFi
   g_file_info_set_edit_name (info, entry->name_utf8);
   g_file_info_set_attribute_string (info, "smb::comment", entry->comment);
   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL, TRUE);
+  g_file_info_set_content_type (info, "inode/directory");
 
   icon = NULL;
   if (entry->smbc_type == SMBC_WORKGROUP)
@@ -1355,6 +1356,7 @@ try_query_info (GVfsBackend *backend,
       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
       g_file_info_set_name (info, "/");
       g_file_info_set_display_name (info, g_vfs_backend_get_display_name (backend));
+      g_file_info_set_content_type (info, "inode/directory");
       icon = g_vfs_backend_get_icon (backend);
       if (icon != NULL)
         g_file_info_set_icon (info, icon);
-- 
1.6.3.3



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- gvfs.spec	29 Jul 2009 18:39:22 -0000	1.140
+++ gvfs.spec	4 Aug 2009 15:42:43 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,6 +34,12 @@ BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch1: gvfs-archive-integration.patch
+# gedit crashed with SIGSEGV in strlen()
+# https://bugzilla.gnome.org/show_bug.cgi?id=589915
+Patch2: gvfs-1.3.4-output-stream-callback-arg.patch
+# smb url don't work in the run application dialog
+# http://bugzilla.gnome.org/show_bug.cgi?id=573994
+Patch3: gvfs-1.3.4-smb-browse-fake-content-type.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=497631 
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
@@ -122,6 +128,8 @@ media players (Media Transfer Protocol) 
 %prep
 %setup -q
 %patch1 -p1 -b .archive-integration
+%patch2 -p1 -b .gedit-segfault
+%patch3 -p1 -b .smb-fake-content-type
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 
@@ -270,6 +278,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.3-2
+- Fix gedit crashed with SEGV in strlen()
+- Fix SMB protocol not handled when opening from a bookmark (#509832)
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.3-1
 - Update to 1.3.3
 



From pknirsch at fedoraproject.org  Tue Aug  4 15:43:24 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Tue,  4 Aug 2009 15:43:24 +0000 (UTC)
Subject: rpms/tuned/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tuned.spec, 
	1.5, 1.6
Message-ID: <20090804154324.6833B11C00E4@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19088

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
- Feature update for Fedora 12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Jul 2009 15:27:49 -0000	1.5
+++ .cvsignore	4 Aug 2009 15:43:24 -0000	1.6
@@ -1 +1 @@
-tuned-0.1.6.tar.bz2
+tuned-0.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Jul 2009 15:27:50 -0000	1.5
+++ sources	4 Aug 2009 15:43:24 -0000	1.6
@@ -1 +1 @@
-e19139f31271496607e8c4f368b7b365  tuned-0.1.6.tar.bz2
+af4b7edaf24e0e9e0d7d44cf52c551c2  tuned-0.2.1.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tuned.spec	27 Jul 2009 06:21:59 -0000	1.5
+++ tuned.spec	4 Aug 2009 15:43:24 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.1.6
-Release: 2%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -18,6 +18,7 @@ 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.
@@ -52,43 +53,65 @@ rm -rf %{buildroot}
 
 %post
 /sbin/chkconfig --add tuned
+/sbin/chkconfig --add ktune
 
 %preun
 if [ $1 = 0 ] ; then
     /sbin/service tuned stop >/dev/null 2>&1
     /sbin/chkconfig --del tuned
+    /sbin/service ktune stop >/dev/null 2>&1
+    /sbin/chkconfig --del ktune
 fi
 
 %postun
 if [ "$1" -ge "1" ] ; then
     /sbin/service tuned condrestart >/dev/null 2>&1 || :
+    /sbin/service ktune condrestart >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt ktune/README.ktune
 %{_initddir}/tuned
 %config(noreplace) %{_sysconfdir}/tuned.conf
 %{_sbindir}/tuned
+%{_sbindir}/tuned-adm
+%{_sysconfdir}/tune-profiles
 %{_datadir}/tuned
 %{_mandir}/man5/*
 %{_mandir}/man8/*
+%attr(0755,root,root) %{_initddir}/ktune
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ktune
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysctl.ktune
+%dir %attr(0755,root,root) %{_sysconfdir}/ktune.d
 
 %files utils
 %defattr(-,root,root,-)
 %doc doc/README.utils
+%doc doc/README.scomes
+%{_sbindir}/varnetload
 %{_sbindir}/netdevstat
 %{_sbindir}/diskdevstat
 %{_sbindir}/scomes
-%{_sbindir}/varnetload
+
 
 %changelog
+* Tue Aug 04 2009 Phil Knirsch <pknirsch at redhat.com> - 0.2.1-1
+- Added first set of profiles
+- Added tuned-adm tool for profile switching
+- Fixed several issues with the tuned-adm tool
+
+* Mon Jul 27 2009 Thomas Woerner <twoerner at redhat.com> - 0.2.0-1
+- Integrated ktune-0.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Jul 13 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.1.6-1
-- on popular demand update to the latest release with brand new scomes
- and varnetload
+* Thu Jul 16 2009 Phil Knirsch <pknirsch at redhat.com> - 0.1.7-1
+- Added first version CPU tuning and monitoring plugins
+
+* Thu Jun 25 2009 Petr Lautrbach <plautrba at redhat.com> - 0.1.6-1
+- added scomes
 
 * Wed Mar 25 2009 Phil Knirsch <pknirsch at redhat.com> - 0.1.5-1
 - Updated documentation, thanks to Marcela Maslanova!



From tbzatek at fedoraproject.org  Tue Aug  4 15:48:09 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  4 Aug 2009 15:48:09 +0000 (UTC)
Subject: rpms/gvfs/F-11 gvfs-1.3.4-smb-browse-fake-content-type.patch, NONE, 
	1.1 gvfs.spec, 1.139, 1.140
Message-ID: <20090804154809.DFA3511C00E4@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20736

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.4-smb-browse-fake-content-type.patch 
Log Message:
* Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-9
- Fix SMB protocol not handled when opening from a bookmark (#509832)


gvfs-1.3.4-smb-browse-fake-content-type.patch:
 gvfsbackendsmbbrowse.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gvfs-1.3.4-smb-browse-fake-content-type.patch ---
>From fa09fd4e5dda701c8862ce2d7762698b907cf90f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 31 Jul 2009 16:58:54 +0200
Subject: [PATCH] smb-browse: fake content type to allow query default handler

Hardcode the "inode/directory" content-type
Fixes #573994
---
 daemon/gvfsbackendsmbbrowse.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c
index 6d0c07e..2eebdd2 100644
--- a/daemon/gvfsbackendsmbbrowse.c
+++ b/daemon/gvfsbackendsmbbrowse.c
@@ -1229,6 +1229,7 @@ get_file_info_from_entry (GVfsBackendSmbBrowse *backend, BrowseEntry *entry, GFi
   g_file_info_set_edit_name (info, entry->name_utf8);
   g_file_info_set_attribute_string (info, "smb::comment", entry->comment);
   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL, TRUE);
+  g_file_info_set_content_type (info, "inode/directory");
 
   icon = NULL;
   if (entry->smbc_type == SMBC_WORKGROUP)
@@ -1355,6 +1356,7 @@ try_query_info (GVfsBackend *backend,
       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
       g_file_info_set_name (info, "/");
       g_file_info_set_display_name (info, g_vfs_backend_get_display_name (backend));
+      g_file_info_set_content_type (info, "inode/directory");
       icon = g_vfs_backend_get_icon (backend);
       if (icon != NULL)
         g_file_info_set_icon (info, icon);
-- 
1.6.3.3



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- gvfs.spec	25 Jun 2009 12:39:20 -0000	1.139
+++ gvfs.spec	4 Aug 2009 15:48:09 -0000	1.140
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,6 +40,9 @@ Patch4: gvfs-1.2.3-cdda-allow-query-well
 # SFTP timeout too short
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
 Patch5: gvfs-1.2.3-sftp-40sec-timeout.patch
+# smb url don't work in the run application dialog 
+# http://bugzilla.gnome.org/show_bug.cgi?id=573994 
+Patch6: gvfs-1.3.4-smb-browse-fake-content-type.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -174,6 +177,7 @@ media players (Media Transfer Protocol) 
 %patch3 -p1 -b .dnssd-deadlock
 %patch4 -p1 -b .cdda-query
 %patch5 -p1 -b .sftp-timeout
+%patch6 -p1 -b .smb-fake-content-type
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -339,6 +343,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-9
+- Fix SMB protocol not handled when opening from a bookmark (#509832)
+
 * Thu Jun 25 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-8
 - Fix gphoto2 backend to work with Canon EOS 5D
 



From rdieter at fedoraproject.org  Tue Aug  4 15:51:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 15:51:12 +0000 (UTC)
Subject: rpms/solar-kde-theme/devel .cvsignore, 1.14,
	1.15 solar-kde-theme.spec, 1.25, 1.26 sources, 1.15, 1.16
Message-ID: <20090804155112.B29EE11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21223

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
- fixup theme metadata for KDE-4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Jan 2009 09:37:00 -0000	1.14
+++ .cvsignore	4 Aug 2009 15:51:12 -0000	1.15
@@ -1 +1 @@
-solar-kde-theme-0.1.17.tar.bz2
+solar-kde-theme-0.1.18.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- solar-kde-theme.spec	27 Jul 2009 04:34:10 -0000	1.25
+++ solar-kde-theme.spec	4 Aug 2009 15:51:12 -0000	1.26
@@ -1,13 +1,13 @@
 Name:		solar-kde-theme
-Version:	0.1.17
-Release:	6%{?dist}
+Version:	0.1.18
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
 License:	GPLv2 and CC-BY-SA
-URL:		https://fedoraproject.org/wiki/Artwork/F10Themes/Solar
 # We are upstream for this package
-Source0:	%{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/fedora-kde-artwork/
+Source0:        https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
@@ -146,6 +146,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
+- fixup theme metadata for KDE-4.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.17-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Jan 2009 09:37:01 -0000	1.15
+++ sources	4 Aug 2009 15:51:12 -0000	1.16
@@ -1 +1 @@
-e89238d581fd91bc103f4f6b98a62845  solar-kde-theme-0.1.17.tar.bz2
+8c9481561f97402b065a789eb0d375ea  solar-kde-theme-0.1.18.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 15:54:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 15:54:33 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.8,
	1.9 leonidas-kde-theme.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20090804155433.EE56A11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21722

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 11.0.2-1
- fixup theme metadata for KDE-4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 May 2009 13:38:58 -0000	1.8
+++ .cvsignore	4 Aug 2009 15:54:33 -0000	1.9
@@ -1 +1 @@
-leonidas-kde-theme-11.0.1.tar.bz2
+leonidas-kde-theme-11.0.2.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- leonidas-kde-theme.spec	12 May 2009 13:38:58 -0000	1.12
+++ leonidas-kde-theme.spec	4 Aug 2009 15:54:33 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		leonidas-kde-theme
-Version:	11.0.1
+Version:	11.0.2
 Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
@@ -206,6 +206,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 11.0.2-1
+- fixup theme metadata for KDE-4.3
+
+* 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
+
 * Tue May 12 2009 Jaroslav Reznik <jreznik at redhat.com> 11.0.1-1
 - reenable icon labels
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 May 2009 13:38:58 -0000	1.8
+++ sources	4 Aug 2009 15:54:33 -0000	1.9
@@ -1 +1 @@
-5c92ba5491804bc6436a63acca642dac  leonidas-kde-theme-11.0.1.tar.bz2
+89951f5493403c46e820f0a500758927  leonidas-kde-theme-11.0.2.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 15:55:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 15:55:38 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-11 .cvsignore, 1.14,
	1.15 solar-kde-theme.spec, 1.24, 1.25 sources, 1.15, 1.16
Message-ID: <20090804155538.9690011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/solar-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21920

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
- fixup theme metadata for KDE-4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Jan 2009 09:37:00 -0000	1.14
+++ .cvsignore	4 Aug 2009 15:55:38 -0000	1.15
@@ -1 +1 @@
-solar-kde-theme-0.1.17.tar.bz2
+solar-kde-theme-0.1.18.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/solar-kde-theme.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- solar-kde-theme.spec	13 Jul 2009 14:58:53 -0000	1.24
+++ solar-kde-theme.spec	4 Aug 2009 15:55:38 -0000	1.25
@@ -1,13 +1,13 @@
 Name:		solar-kde-theme
-Version:	0.1.17
-Release:	5%{?dist}
+Version:	0.1.18
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
 License:	GPLv2 and CC-BY-SA
-URL:		https://fedoraproject.org/wiki/Artwork/F10Themes/Solar
 # We are upstream for this package
-Source0:	%{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/fedora-kde-artwork/
+Source0:        https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
@@ -146,6 +146,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
+- fixup theme metadata for KDE-4.3
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.17-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 13 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.17-5
 - Link to F11 system logo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Jan 2009 09:37:01 -0000	1.15
+++ sources	4 Aug 2009 15:55:38 -0000	1.16
@@ -1 +1 @@
-e89238d581fd91bc103f4f6b98a62845  solar-kde-theme-0.1.17.tar.bz2
+8c9481561f97402b065a789eb0d375ea  solar-kde-theme-0.1.18.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 15:56:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 15:56:08 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-10 .cvsignore, 1.14,
	1.15 solar-kde-theme.spec, 1.23, 1.24 sources, 1.15, 1.16
Message-ID: <20090804155608.9809211C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/solar-kde-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22056

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
- fixup theme metadata for KDE-4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Jan 2009 09:23:52 -0000	1.14
+++ .cvsignore	4 Aug 2009 15:56:08 -0000	1.15
@@ -1 +1 @@
-solar-kde-theme-0.1.17.tar.bz2
+solar-kde-theme-0.1.18.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/solar-kde-theme.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- solar-kde-theme.spec	13 Feb 2009 10:07:18 -0000	1.23
+++ solar-kde-theme.spec	4 Aug 2009 15:56:08 -0000	1.24
@@ -1,19 +1,21 @@
 Name:		solar-kde-theme
-Version:	0.1.17
-Release:	3%{?dist}
+Version:	0.1.18
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
 License:	GPLv2 and CC-BY-SA
-URL:		https://fedoraproject.org/wiki/Artwork/F10Themes/Solar
 # We are upstream for this package
-Source0:	%{name}-%{version}.tar.bz2
+URL:            https://fedorahosted.org/fedora-kde-artwork/
+Source0:        https://fedorahosted.org/releases/f/e/fedora-kde-artwork/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
-Requires:	system-logos >= 10.0.0-2
+Requires:	system-logos
 Requires:	solar-backgrounds-common >= 0.91.0
+# for Leonidas system logo
+Requires:	leonidas-kde-theme
 
 
 %description
@@ -87,6 +89,9 @@ mkdir %{buildroot}%{_kde4_appsdir}/kspla
 ln -s ../../../../../../wallpapers/solar_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1920x1200/solar.png
 ln -s ../../../../../../wallpapers/solar_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/solar.png
 
+# we have to drag Leonidas ksplash theme directory for F11
+ln -s %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents/images
 cp -rp wallpapers/Solar/metadata.desktop %{buildroot}%{_kde4_datadir}/wallpapers/Solar
@@ -136,16 +141,29 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/wallpapers/solar.png
 %{_kde4_datadir}/wallpapers/solar_wide.png
 %{_kde4_datadir}/wallpapers/solar_high.png
-%{_kde4_datadir}/wallpapers/Solar/*
+%{_kde4_datadir}/wallpapers/Solar/
 %{_kde4_appsdir}/kdm/pics/users/default_solar.png
 
 
 %changelog
-* Fri Feb 13 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-3
-- revert EEE PC 701 fix
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
+- fixup theme metadata for KDE-4.3
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.17-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.17-5
+- Link to F11 system logo
+
+* Wed Apr 08 2009 Jesse Keating <jkeating at redhat.com> - 0.1.17-4
+- Drop the version requirement on system-logos, causes problems
+  with other logo packages.
+
+* Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.17-3
+- own %%_kde4_datadir/wallpapers/Solar
 
-* Fri Feb 13 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-2
-- KSplash wide solar for EEE PC 701 (800x480)
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Jan 06 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-1
 - screenshot resized to 200x150 px


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Jan 2009 09:23:52 -0000	1.15
+++ sources	4 Aug 2009 15:56:08 -0000	1.16
@@ -1 +1 @@
-e89238d581fd91bc103f4f6b98a62845  solar-kde-theme-0.1.17.tar.bz2
+8c9481561f97402b065a789eb0d375ea  solar-kde-theme-0.1.18.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug  4 16:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 16:04:15 +0000
Subject: [pkgdb] xorg-x11-filesystem ownership updated
Message-ID: <20090804160415.BF95110F88F@bastion2.fedora.phx.redhat.com>

Package xorg-x11-filesystem in Fedora devel is now owned by ajax

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-filesystem



From pkgdb at fedoraproject.org  Tue Aug  4 16:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 16:04:15 +0000
Subject: [pkgdb] xorg-x11-filesystem (un)retirement
Message-ID: <20090804160416.60C0710F8BE@bastion2.fedora.phx.redhat.com>

Package xorg-x11-filesystem in Fedora devel has been retired by toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-filesystem



From mclasen at fedoraproject.org  Tue Aug  4 16:23:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 16:23:45 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.218,1.219
Message-ID: <20090804162345.AFA9711C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27596

Modified Files:
	gnome-desktop.spec 
Log Message:
Drop leonidas backgrounds



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- gnome-desktop.spec	29 Jul 2009 03:58:46 -0000	1.218
+++ gnome-desktop.spec	4 Aug 2009 16:23:45 -0000	1.219
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.27.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -30,7 +30,8 @@ Obsoletes: gnome-core gnome-core-devel
 Provides: gnome-core
 
 # Make sure to update libgnome schema when changing this
-Requires: leonidas-backgrounds
+#Requires: constantine-backgrounds
+#Requires: constantine-backgrounds-extras
 
 BuildRequires: gnome-common
 BuildRequires: libxml2-devel >= %{libxml2_version}
@@ -122,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.6-1
+- Drop leonidas backgrounds in anticipation of constantine backgrounds
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From mbarnes at fedoraproject.org  Tue Aug  4 16:33:26 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  4 Aug 2009 16:33:26 +0000 (UTC)
Subject: rpms/evolution/F-11 evolution.spec,1.386,1.387
Message-ID: <20090804163326.4344C11C00E4@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29847

Modified Files:
	evolution.spec 
Log Message:

* Tue Aug 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.3-5.fc11
- Don't require gnome-pilot in the conduits subpackage.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-11/evolution.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- evolution.spec	31 Jul 2009 11:18:51 -0000	1.386
+++ evolution.spec	4 Aug 2009 16:33:25 -0000	1.387
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.26.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -188,7 +188,6 @@ This package contains user documentation
 Group: Applications/Communications
 Summary: gnome-pilot conduits for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: gnome-pilot >= %{gnome_pilot_version}
 
 %description conduits
 This package contains conduits for synchronizing PalmPilot<tm> or other
@@ -693,6 +692,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Aug 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.3-5.fc11
+- Don't require gnome-pilot in the conduits subpackage.
+
 * Fri Jul 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.26.3-4.fc11
 - Add some missing GConf schemas.
 



From pbrobinson at fedoraproject.org  Tue Aug  4 16:37:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  4 Aug 2009 16:37:36 +0000 (UTC)
Subject: rpms/clutter-imcontext/devel clutter-imcontext-clutter1.patch, 1.1, 
	1.2 clutter-imcontext.spec, 1.3, 1.4
Message-ID: <20090804163736.434BF11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-imcontext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30910

Modified Files:
	clutter-imcontext-clutter1.patch clutter-imcontext.spec 
Log Message:
- Add some more clutter 1.0 bits

clutter-imcontext-clutter1.patch:
 clutter-imcontext/clutter-imcontext.pc.in |    2 +-
 configure.ac                              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: clutter-imcontext-clutter1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-imcontext/devel/clutter-imcontext-clutter1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- clutter-imcontext-clutter1.patch	30 Jul 2009 10:49:14 -0000	1.1
+++ clutter-imcontext-clutter1.patch	4 Aug 2009 16:37:35 -0000	1.2
@@ -9,3 +9,14 @@
  
  AC_SUBST(CLUTTER_CFLAGS)
  AC_SUBST(CLUTTER_LIBS)
+--- clutter-imcontext-0.1.2/clutter-imcontext/clutter-imcontext.pc.in.orig	2009-08-04 17:31:23.000000000 +0100
++++ clutter-imcontext-0.1.2/clutter-imcontext/clutter-imcontext.pc.in	2009-08-04 17:31:37.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ Name: Clutter Input Method Context
+ Description: IMContext For Clutter
+-Requires: clutter-0.9 
++Requires: clutter-1.0 
+ Version: @VERSION@
+ Libs: -L${libdir} -lclutter-imcontext-${apiversion}
+ Cflags: -I${includedir}/clutter-imcontext-${apiversion}


Index: clutter-imcontext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-imcontext/devel/clutter-imcontext.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clutter-imcontext.spec	30 Jul 2009 10:49:15 -0000	1.3
+++ clutter-imcontext.spec	4 Aug 2009 16:37:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           clutter-imcontext
 Version:        0.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        IMContext Framework Library for Clutter
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-6
+- Add some more clutter 1.0 bits
+
 * Thu Jul 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-5
 - Add a patch for clutter 1.0
 



From sergiopr at fedoraproject.org  Tue Aug  4 16:52:42 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue,  4 Aug 2009 16:52:42 +0000 (UTC)
Subject: rpms/loki-lib/devel loki-lib.spec,1.6,1.7
Message-ID: <20090804165242.E405911C00E4@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/loki-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2337

Modified Files:
	loki-lib.spec 
Log Message:
* Mon Jul 27 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-1
- New upstream version



Index: loki-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/devel/loki-lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- loki-lib.spec	25 Jul 2009 11:16:32 -0000	1.6
+++ loki-lib.spec	4 Aug 2009 16:52:42 -0000	1.7
@@ -1,18 +1,14 @@
 %define upname loki
 %define majorversion 0
 Name: %{upname}-lib
-Version: 0.1.6
-Release: 8%{?dist}
+Version: 0.1.7
+Release: 1%{?dist}
 Summary: Loki C++ Library of design patterns and idioms
 
 Group: Development/Libraries
 License: MIT
 URL: http://sourceforge.net/projects/loki-lib
-Source0: http://prdownloads.sourceforge.net/loki-lib/%{upname}-%{version}.tar.gz
-Patch0: loki-makefile.patch
-Patch1: loki-makefile-test.patch
-Patch2: loki-makefile-test-parallel.patch
-Patch3: loki-gcc43.patch
+Source0: http://prdownloads.sourceforge.net/loki-lib/%{upname}-%{version}.tar.bz2
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/ldconfig
@@ -33,35 +29,32 @@ Headers and shared object symlinks for t
 %package doc
 Summary: The Loki C++ html docs
 Group: Documentation
+BuildArch: noarch
 %description doc
 HTML documentation files for the Loki C++ Library
 
 %prep
 %setup -n %{upname}-%{version} -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%{__chmod} -x doc/html/*
-%{__rm} doc/html/installdox
+chmod -x doc/html/*
+rm doc/html/installdox
+iconv -f ISO88591 -t utf8 CHANGES -o CHANGES
 
 %build
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}" LDLIBS="-lstdc++ -lc" build-shared
+make %{?_smp_mflags} CXXFLAGS="%{optflags}" LDLIBS="-lstdc++ -lc" build-shared
 (cd lib && ln -s lib%{upname}.so.%{version} lib%{upname}.so)
 (cd lib && ln -s lib%{upname}.so.%{version} lib%{upname}.so.%{majorversion})
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} %{?_smp_mflags} -C include prefix=%{buildroot}%{_usr} install
-%{__mkdir_p} %{buildroot}%{_libdir}
-%{__cp} -a lib/lib%{upname}.* %{buildroot}%{_libdir}
-
-# The testsuite does not work in x86_64
-#%check
-#%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}" -C test
+rm -rf %{buildroot}
+make %{?_smp_mflags} -C include prefix=%{buildroot}%{_usr} install
+mkdir -p %{buildroot}%{_libdir}
+cp -a lib/lib%{upname}.* %{buildroot}%{_libdir}
+
+%check
+make %{?_smp_mflags} CXXFLAGS="%{optflags}" -C test
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -83,6 +76,9 @@ HTML documentation files for the Loki C+
 %doc doc/html doc/flex doc/yasli
 
 %changelog
+* Mon Jul 27 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-1
+- New upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Tue Aug  4 16:52:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  4 Aug 2009 16:52:59 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-10 solar-kde-theme.spec,1.24,1.25
Message-ID: <20090804165259.C9A7311C00E4@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/solar-kde-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2395/F-10

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
- don't require Leonidas on F10


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/solar-kde-theme.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- solar-kde-theme.spec	4 Aug 2009 15:56:08 -0000	1.24
+++ solar-kde-theme.spec	4 Aug 2009 16:52:59 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.18
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -14,8 +14,10 @@ BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos
 Requires:	solar-backgrounds-common >= 0.91.0
+%if 0%{?fedora} > 10
 # for Leonidas system logo
 Requires:	leonidas-kde-theme
+%endif
 
 
 %description
@@ -89,8 +91,10 @@ mkdir %{buildroot}%{_kde4_appsdir}/kspla
 ln -s ../../../../../../wallpapers/solar_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1920x1200/solar.png
 ln -s ../../../../../../wallpapers/solar_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/solar.png
 
+%if 0%{?fedora} > 10
 # we have to drag Leonidas ksplash theme directory for F11
 ln -s %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+%endif
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents/images
@@ -146,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
+- don't require Leonidas on F10
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
 - fixup theme metadata for KDE-4.3
 



From kkofler at fedoraproject.org  Tue Aug  4 16:52:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  4 Aug 2009 16:52:59 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-11 solar-kde-theme.spec,1.25,1.26
Message-ID: <20090804165300.008C711C00E4@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/solar-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2395/F-11

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
- don't require Leonidas on F10


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/solar-kde-theme.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- solar-kde-theme.spec	4 Aug 2009 15:55:38 -0000	1.25
+++ solar-kde-theme.spec	4 Aug 2009 16:52:59 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.18
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -14,8 +14,10 @@ BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos
 Requires:	solar-backgrounds-common >= 0.91.0
+%if 0%{?fedora} > 10
 # for Leonidas system logo
 Requires:	leonidas-kde-theme
+%endif
 
 
 %description
@@ -89,8 +91,10 @@ mkdir %{buildroot}%{_kde4_appsdir}/kspla
 ln -s ../../../../../../wallpapers/solar_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1920x1200/solar.png
 ln -s ../../../../../../wallpapers/solar_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/solar.png
 
+%if 0%{?fedora} > 10
 # we have to drag Leonidas ksplash theme directory for F11
 ln -s %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+%endif
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents/images
@@ -146,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
+- don't require Leonidas on F10
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
 - fixup theme metadata for KDE-4.3
 



From kkofler at fedoraproject.org  Tue Aug  4 16:53:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  4 Aug 2009 16:53:00 +0000 (UTC)
Subject: rpms/solar-kde-theme/devel solar-kde-theme.spec,1.26,1.27
Message-ID: <20090804165300.2DADB11C00E4@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2395/devel

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
- don't require Leonidas on F10


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- solar-kde-theme.spec	4 Aug 2009 15:51:12 -0000	1.26
+++ solar-kde-theme.spec	4 Aug 2009 16:53:00 -0000	1.27
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.18
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -14,8 +14,10 @@ BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos
 Requires:	solar-backgrounds-common >= 0.91.0
+%if 0%{?fedora} > 10
 # for Leonidas system logo
 Requires:	leonidas-kde-theme
+%endif
 
 
 %description
@@ -89,8 +91,10 @@ mkdir %{buildroot}%{_kde4_appsdir}/kspla
 ln -s ../../../../../../wallpapers/solar_wide.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1920x1200/solar.png
 ln -s ../../../../../../wallpapers/solar_high.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/solar.png
 
+%if 0%{?fedora} > 10
 # we have to drag Leonidas ksplash theme directory for F11
 ln -s %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+%endif
 
 # KDE 4 wallpapers theme
 mkdir -p %{buildroot}%{_kde4_datadir}/wallpapers/Solar/contents/images
@@ -146,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
+- don't require Leonidas on F10
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1.18-1
 - fixup theme metadata for KDE-4.3
 



From mclasen at fedoraproject.org  Tue Aug  4 16:55:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 16:55:05 +0000 (UTC)
Subject: rpms/libgnome/devel default-background.patch, 1.5, 1.6 libgnome.spec,
	1.147, 1.148
Message-ID: <20090804165505.9791411C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2820

Modified Files:
	default-background.patch libgnome.spec 
Log Message:
drop leonidas backgrounds in anticipation of Constantine backgrounds


default-background.patch:
 desktop_gnome_background.schemas.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: default-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/default-background.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- default-background.patch	10 Mar 2009 17:31:48 -0000	1.5
+++ default-background.patch	4 Aug 2009 16:55:04 -0000	1.6
@@ -15,7 +15,7 @@ diff -up libgnome-2.20.0/schemas/desktop
          <owner>gnome</owner>
          <type>string</type>
 -	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>@datadir@/backgrounds/leonidas/leonidas.xml</default>
++	<default>@datadir@/backgrounds/abstrace/Waves.png</default>
          <locale name="C">
          <short>Picture Filename</short>
          <long>File to use for the background image</long>


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- libgnome.spec	25 Jul 2009 05:45:46 -0000	1.147
+++ libgnome.spec	4 Aug 2009 16:55:05 -0000	1.148
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.26.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.26/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -203,6 +203,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-6
+- Drop Leonidas backgrounds in anticipation of Constantine backgrounds
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Aug  4 17:06:13 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 17:06:13 +0000 (UTC)
Subject: rpms/xorg-x11-drv-geode/devel xorg-x11-drv-geode.spec,1.12,1.13
Message-ID: <20090804170613.0567511C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-geode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4961

Modified Files:
	xorg-x11-drv-geode.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.11.2-4
- Fix for new DPMS headers



Index: xorg-x11-drv-geode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/xorg-x11-drv-geode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xorg-x11-drv-geode.spec	27 Jul 2009 08:25:44 -0000	1.12
+++ xorg-x11-drv-geode.spec	4 Aug 2009 17:06:12 -0000	1.13
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-geode
 Version:   2.11.2
-Release:   3%{?dist}.1
+Release:   4%{?dist}
 URL:       http://www.x.org/wiki/AMDGeodeDriver
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
 License:   MIT
@@ -16,6 +16,7 @@ Obsoletes: xorg-x11-drv-amd <= 2.7.7.7
 
 Patch0: geode-inputstr.patch
 Patch1: abi.patch
+Patch2: geode-2.11.2-dpms.patch
 
 ExclusiveArch: %{ix86}
 
@@ -37,6 +38,7 @@ X.Org X11 AMD Geode video driver.
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .inputstr
 %patch1 -p1 -b .abi
+%patch2 -p1 -b .dpms
 
 %build
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
@@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.11.2-4
+- Fix for new DPMS headers
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11.2-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Aug  4 17:18:50 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 17:18:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.90,1.91
Message-ID: <20090804171850.A88A911C00E4@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-serv7771

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.1.14-4
- autoreconf so the dpms configurey gets picked up



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.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- xorg-x11-drv-nv.spec	4 Aug 2009 06:05:29 -0000	1.90
+++ xorg-x11-drv-nv.spec	4 Aug 2009 17:18:50 -0000	1.91
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.14
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -45,6 +45,7 @@ X.Org X11 nv video driver.
 %patch10 -p1 -b .nv6x
 
 %build
+autoreconf -v --install
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -69,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.1.14-4
+- autoreconf so the dpms configurey gets picked up
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.1.14-3
 - update for new ABI
 



From ajax at fedoraproject.org  Tue Aug  4 17:22:12 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 17:22:12 +0000 (UTC)
Subject: rpms/xorg-x11-drv-siliconmotion/devel smi-1.7.2-dpms.patch, NONE,
	1.1 xorg-x11-drv-siliconmotion.spec, 1.23, 1.24
Message-ID: <20090804172212.424EB11C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8491

Modified Files:
	xorg-x11-drv-siliconmotion.spec 
Added Files:
	smi-1.7.2-dpms.patch 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.7.2-3
- smi-1.7.2-dpms.patch: Fix for new DPMS headers.


smi-1.7.2-dpms.patch:
 smi_501.c    |    2 +-
 smi_driver.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE smi-1.7.2-dpms.patch ---
diff -up xf86-video-siliconmotion-1.7.2/src/smi_501.c.jx xf86-video-siliconmotion-1.7.2/src/smi_501.c
--- xf86-video-siliconmotion-1.7.2/src/smi_501.c.jx	2009-05-27 17:31:56.000000000 -0400
+++ xf86-video-siliconmotion-1.7.2/src/smi_501.c	2009-08-04 13:26:53.000000000 -0400
@@ -36,7 +36,7 @@ authorization from The XFree86 Project o
 #include "regsmi.h"
 
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 /* Want to see register dumps for now */
 #undef VERBLEV
diff -up xf86-video-siliconmotion-1.7.2/src/smi_driver.c.jx xf86-video-siliconmotion-1.7.2/src/smi_driver.c
--- xf86-video-siliconmotion-1.7.2/src/smi_driver.c.jx	2009-05-28 14:21:05.000000000 -0400
+++ xf86-video-siliconmotion-1.7.2/src/smi_driver.c	2009-08-04 13:26:58.000000000 -0400
@@ -44,7 +44,7 @@ authorization from The XFree86 Project o
 
 #include "globals.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 /*
  * Internals


Index: xorg-x11-drv-siliconmotion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel/xorg-x11-drv-siliconmotion.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xorg-x11-drv-siliconmotion.spec	27 Jul 2009 08:31:23 -0000	1.23
+++ xorg-x11-drv-siliconmotion.spec	4 Aug 2009 17:22:12 -0000	1.24
@@ -2,17 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 siliconmotion video driver
-Name:      xorg-x11-drv-siliconmotion
-Version: 1.7.2
-Release: 2%{?dist}.1
-URL:       http://www.x.org
-License: MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 siliconmotion video driver
+Name:       xorg-x11-drv-siliconmotion
+Version:    1.7.2
+Release:    3%{?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
-Source1:   siliconmotion.xinf
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:    siliconmotion.xinf
+
+Patch0:     smi-1.7.2-dpms.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +28,7 @@ X.Org X11 siliconmotion video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .dpms
 
 %build
 %configure --disable-static
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.7.2-3
+- smi-1.7.2-dpms.patch: Fix for new DPMS headers.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Aug  4 17:27:37 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  4 Aug 2009 17:27:37 +0000 (UTC)
Subject: rpms/xorg-x11-drv-trident/devel trident-1.3.2-dpms.patch, NONE,
	1.1 xorg-x11-drv-trident.spec, 1.28, 1.29
Message-ID: <20090804172737.13CB311C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-trident/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9926

Modified Files:
	xorg-x11-drv-trident.spec 
Added Files:
	trident-1.3.2-dpms.patch 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.3.2-3
- trident-1.3.2-dpms.patch: Fix for new DPMS headers


trident-1.3.2-dpms.patch:
 trident_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE trident-1.3.2-dpms.patch ---
diff -up xf86-video-trident-1.3.2/src/trident_driver.c.jx xf86-video-trident-1.3.2/src/trident_driver.c
--- xf86-video-trident-1.3.2/src/trident_driver.c.jx	2009-05-28 14:21:06.000000000 -0400
+++ xf86-video-trident-1.3.2/src/trident_driver.c	2009-08-04 13:32:48.000000000 -0400
@@ -63,7 +63,7 @@
 
 #include "globals.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "xf86xv.h"
 


Index: xorg-x11-drv-trident.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-trident.spec	27 Jul 2009 08:33:57 -0000	1.28
+++ xorg-x11-drv-trident.spec	4 Aug 2009 17:27:36 -0000	1.29
@@ -2,17 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 trident video driver
-Name:      xorg-x11-drv-trident
-Version:   1.3.2
-Release:   2%{?dist}.1
-URL:       http://www.x.org
-License: MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 trident video driver
+Name:       xorg-x11-drv-trident
+Version:    1.3.2
+Release:    3%{?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
-Source1:   trident.xinf
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:    trident.xinf
+
+Patch0:     trident-1.3.2-dpms.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +28,7 @@ X.Org X11 trident video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .dpms
 
 %build
 %configure --disable-static
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.3.2-3
+- trident-1.3.2-dpms.patch: Fix for new DPMS headers
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bretm at fedoraproject.org  Tue Aug  4 17:37:07 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Tue,  4 Aug 2009 17:37:07 +0000 (UTC)
Subject: rpms/wordpress-mu/devel wordpress-mu.spec,1.8,1.9
Message-ID: <20090804173707.0D37E11C00E4@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12341

Modified Files:
	wordpress-mu.spec 
Log Message:
reving to 2.8.2


Index: wordpress-mu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/devel/wordpress-mu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wordpress-mu.spec	27 Jul 2009 07:22:43 -0000	1.8
+++ wordpress-mu.spec	4 Aug 2009 17:37:06 -0000	1.9
@@ -1,8 +1,8 @@
 Summary: WordPress-MU multi-user blogging software
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
-Version: 2.7
-Release: 6%{?dist}
+Version: 2.8.2
+Release: 1%{?dist}
 Group: Applications/Publishing
 License: GPLv2
 Source0: %{name}-%{version}.tar.gz
@@ -88,6 +88,7 @@ rm -rf %{buildroot}
 %{_datadir}/wordpress-mu/wp-mail.php
 %{_datadir}/wordpress-mu/wp-pass.php
 %{_datadir}/wordpress-mu/wp-rdf.php
+%{_datadir}/wordpress-mu/wp-register.php
 %{_datadir}/wordpress-mu/wp-rss.php
 %{_datadir}/wordpress-mu/wp-rss2.php
 %{_datadir}/wordpress-mu/wp-settings.php
@@ -98,6 +99,9 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
+* Fri Jul 31 2009 Bret McMillan <bretm at redhat.com> - 2.8.2-1
+- Update to WordPress MU 2.8.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Aug  4 17:53:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 17:53:23 +0000 (UTC)
Subject: rpms/sip/F-10 .cvsignore, 1.27, 1.28 sip.spec, 1.56, 1.57 sources, 
	1.28, 1.29
Message-ID: <20090804175323.B442811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16564

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.2-1
- sip-4.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	27 Jun 2009 01:38:36 -0000	1.27
+++ .cvsignore	4 Aug 2009 17:53:23 -0000	1.28
@@ -1 +1 @@
-sip-4.8.1.tar.gz
+sip-4.8.2.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-10/sip.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sip.spec	27 Jun 2009 01:38:36 -0000	1.56
+++ sip.spec	4 Aug 2009 17:53:23 -0000	1.57
@@ -4,7 +4,7 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.8.1
+Version: 4.8.2
 Release: 1%{?dist}
 # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
 License: Python
@@ -74,6 +74,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.2-1
+- sip-4.8.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.1-1
 - sip-4.8.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	27 Jun 2009 01:38:36 -0000	1.28
+++ sources	4 Aug 2009 17:53:23 -0000	1.29
@@ -1 +1 @@
-859e5b103ba5a083e4f2021eb6d99b26  sip-4.8.1.tar.gz
+7ae60712aa6b4095a8cdab11b437f8f0  sip-4.8.2.tar.gz



From pkgdb at fedoraproject.org  Tue Aug  4 17:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 17:53:40 +0000
Subject: [pkgdb] biniax ownership updated
Message-ID: <20090804175340.4ECC010F879@bastion2.fedora.phx.redhat.com>

Package biniax in Fedora devel is now owned by cassmodiah

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/biniax



From rdieter at fedoraproject.org  Tue Aug  4 17:53:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 17:53:51 +0000 (UTC)
Subject: rpms/sip/F-11 .cvsignore, 1.27, 1.28 sip.spec, 1.58, 1.59 sources, 
	1.28, 1.29
Message-ID: <20090804175351.3108811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16743

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.2-1
- sip-4.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	27 Jun 2009 01:39:20 -0000	1.27
+++ .cvsignore	4 Aug 2009 17:53:50 -0000	1.28
@@ -1 +1 @@
-sip-4.8.1.tar.gz
+sip-4.8.2.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-11/sip.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sip.spec	27 Jun 2009 01:39:20 -0000	1.58
+++ sip.spec	4 Aug 2009 17:53:51 -0000	1.59
@@ -4,7 +4,7 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.8.1
+Version: 4.8.2
 Release: 1%{?dist}
 # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
 License: Python
@@ -74,6 +74,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.2-1
+- sip-4.8.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.1-1
 - sip-4.8.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	27 Jun 2009 01:39:20 -0000	1.28
+++ sources	4 Aug 2009 17:53:51 -0000	1.29
@@ -1 +1 @@
-859e5b103ba5a083e4f2021eb6d99b26  sip-4.8.1.tar.gz
+7ae60712aa6b4095a8cdab11b437f8f0  sip-4.8.2.tar.gz



From rdieter at fedoraproject.org  Tue Aug  4 18:10:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 18:10:54 +0000 (UTC)
Subject: rpms/strigi/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 strigi.spec, 1.43, 1.44
Message-ID: <20090804181054.B7B6811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20104

Modified Files:
	.cvsignore sources strigi.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.0-1
- strigi-0.7.0 (final)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	23 Jul 2009 13:37:16 -0000	1.17
+++ .cvsignore	4 Aug 2009 18:10:54 -0000	1.18
@@ -1 +1 @@
-strigi-0.7-RC1.tar.bz2
+strigi-0.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	23 Jul 2009 13:37:16 -0000	1.17
+++ sources	4 Aug 2009 18:10:54 -0000	1.18
@@ -1 +1 @@
-445cb77ee362b07db9d3f403d1edb1a7  strigi-0.7-RC1.tar.bz2
+6a6b939a70725d5c77bb69eca347889d  strigi-0.7.0.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- strigi.spec	27 Jul 2009 04:55:10 -0000	1.43
+++ strigi.spec	4 Aug 2009 18:10:54 -0000	1.44
@@ -1,13 +1,12 @@
 
-%define pre RC1
-
 Name:		strigi
-Version:	0.7
-Release:	0.2.%{pre}%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
-URL:		http://www.vandenoever.info/software/strigi
+#URL:           http://strigi.sf.net/
+URL:            http://www.vandenoever.info/software/strigi/
 Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}%{?pre:-%{pre}}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
@@ -115,6 +114,9 @@ rm -rf %{buildroot}
 %{_libdir}/strigi/strigi*.so
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.0-1
+- strigi-0.7.0 (final)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-0.2.RC1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Aug  4 18:12:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 18:12:40 +0000 (UTC)
Subject: rpms/strigi/F-11 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 strigi-daemon.desktop, 1.3, 1.4 strigi.spec, 1.40, 1.41
Message-ID: <20090804181241.028E111C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20457

Modified Files:
	.cvsignore sources strigi-daemon.desktop strigi.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.0-1
- strigi-0.7.0 (final)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	29 Jun 2009 21:05:43 -0000	1.16
+++ .cvsignore	4 Aug 2009 18:12:40 -0000	1.17
@@ -1 +1 @@
-strigi-0.6.5.tar.bz2
+strigi-0.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Jun 2009 21:05:43 -0000	1.16
+++ sources	4 Aug 2009 18:12:40 -0000	1.17
@@ -1 +1 @@
-7f265c331c02802e199b922e7b2a2292  strigi-0.6.5.tar.bz2
+6a6b939a70725d5c77bb69eca347889d  strigi-0.7.0.tar.bz2


Index: strigi-daemon.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-11/strigi-daemon.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- strigi-daemon.desktop	29 Jun 2009 21:05:43 -0000	1.3
+++ strigi-daemon.desktop	4 Aug 2009 18:12:40 -0000	1.4
@@ -9,5 +9,5 @@ Categories=
 X-KDE-autostart-after=panel
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
-#NoDisplay=true
 X-KDE-autostart-condition=nepomukserverrc:Service-nepomukstrigiservice:autostart:true
+Hidden=true


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-11/strigi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- strigi.spec	29 Jun 2009 22:29:14 -0000	1.40
+++ strigi.spec	4 Aug 2009 18:12:40 -0000	1.41
@@ -1,11 +1,13 @@
+
 Name:		strigi
-Version:	0.6.5
-Release:	2%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
-URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+#URL:           http://strigi.sf.net/
+URL:            http://www.vandenoever.info/software/strigi/
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}%{?pre:-%{pre}}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
@@ -18,7 +20,7 @@ BuildRequires:	cppunit-devel exiv2-devel
 BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
@@ -36,7 +38,7 @@ daemon can.
 %package	devel
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -50,7 +52,7 @@ Group:		Development/Libraries
 Strigi search engine libraries
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 %patch0 -p1 -b .multilib
 
 %build
@@ -75,9 +77,8 @@ desktop-file-install					\
 # Add an autostart desktop file for the strigi daemon
 install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
-
-#check
-#make -C %{_target_platform}/tests
+%check
+make -C %{_target_platform}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -104,11 +105,27 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_datadir}/strigi/
-%{_libdir}/lib*.so.*
-%{_libdir}/strigi/
-%exclude %{_libdir}/strigi/*.cmake
+%{_libdir}/libsearchclient.so.0*
+%{_libdir}/libstreamanalyzer.so.0*
+%{_libdir}/libstreams.so.0*
+%{_libdir}/libstrigihtmlgui.so.0*
+%{_libdir}/libstrigiqtdbusclient.so.0*
+%dir %{_libdir}/strigi/
+%{_libdir}/strigi/strigi*.so
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.0-1
+- strigi-0.7.0 (final)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-0.2.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.7-0.1.RC1
+- strigi-0.7-RC1
+- use %%_isa where appropriate
+- %%files: track lib sonames
+- strigi-daemon.desktop: +Hidden=true (ie, disable autostart by default)
+
 * Mon Jun 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 0.6.5-2
 - don't start strigi daemon unconditionally (#487322)
 



From rdieter at fedoraproject.org  Tue Aug  4 18:13:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 18:13:35 +0000 (UTC)
Subject: rpms/strigi/F-10 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 strigi-daemon.desktop, 1.3, 1.4 strigi.spec, 1.28, 1.29
Message-ID: <20090804181335.CC81711C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20678

Modified Files:
	.cvsignore sources strigi-daemon.desktop strigi.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.0-1
- strigi-0.7.0 (final)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	29 Jun 2009 21:05:42 -0000	1.13
+++ .cvsignore	4 Aug 2009 18:13:35 -0000	1.14
@@ -1 +1 @@
-strigi-0.6.5.tar.bz2
+strigi-0.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	29 Jun 2009 21:05:42 -0000	1.14
+++ sources	4 Aug 2009 18:13:35 -0000	1.15
@@ -1 +1 @@
-7f265c331c02802e199b922e7b2a2292  strigi-0.6.5.tar.bz2
+6a6b939a70725d5c77bb69eca347889d  strigi-0.7.0.tar.bz2


Index: strigi-daemon.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/strigi-daemon.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- strigi-daemon.desktop	29 Jun 2009 21:05:42 -0000	1.3
+++ strigi-daemon.desktop	4 Aug 2009 18:13:35 -0000	1.4
@@ -9,5 +9,5 @@ Categories=
 X-KDE-autostart-after=panel
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
-#NoDisplay=true
 X-KDE-autostart-condition=nepomukserverrc:Service-nepomukstrigiservice:autostart:true
+Hidden=true


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/strigi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- strigi.spec	29 Jun 2009 22:29:14 -0000	1.28
+++ strigi.spec	4 Aug 2009 18:13:35 -0000	1.29
@@ -1,11 +1,13 @@
+
 Name:		strigi
-Version:	0.6.5
-Release:	2%{?dist}
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
-URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+#URL:           http://strigi.sf.net/
+URL:            http://www.vandenoever.info/software/strigi/
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}%{?pre:-%{pre}}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
@@ -18,7 +20,7 @@ BuildRequires:	cppunit-devel exiv2-devel
 BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
@@ -36,7 +38,7 @@ daemon can.
 %package	devel
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -50,7 +52,7 @@ Group:		Development/Libraries
 Strigi search engine libraries
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 %patch0 -p1 -b .multilib
 
 %build
@@ -75,9 +77,8 @@ desktop-file-install					\
 # Add an autostart desktop file for the strigi daemon
 install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
-
-#check
-#make -C %{_target_platform}/tests
+%check
+make -C %{_target_platform}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -104,11 +105,27 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_datadir}/strigi/
-%{_libdir}/lib*.so.*
-%{_libdir}/strigi/
-%exclude %{_libdir}/strigi/*.cmake
+%{_libdir}/libsearchclient.so.0*
+%{_libdir}/libstreamanalyzer.so.0*
+%{_libdir}/libstreams.so.0*
+%{_libdir}/libstrigihtmlgui.so.0*
+%{_libdir}/libstrigiqtdbusclient.so.0*
+%dir %{_libdir}/strigi/
+%{_libdir}/strigi/strigi*.so
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.0-1
+- strigi-0.7.0 (final)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-0.2.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 Rex Dieter <rdieter at fedoraproject.org> 0.7-0.1.RC1
+- strigi-0.7-RC1
+- use %%_isa where appropriate
+- %%files: track lib sonames
+- strigi-daemon.desktop: +Hidden=true (ie, disable autostart by default)
+
 * Mon Jun 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 0.6.5-2
 - don't start strigi daemon unconditionally (#487322)
 



From wcohen at fedoraproject.org  Tue Aug  4 18:21:44 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Tue,  4 Aug 2009 18:21:44 +0000 (UTC)
Subject: rpms/oprofile/devel .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 oprofile.spec, 1.80, 1.81 oprofile-0.7-libs.patch, 1.5, 1.6
Message-ID: <20090804182144.B251A11C00E4@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22996

Modified Files:
	.cvsignore sources oprofile.spec oprofile-0.7-libs.patch 
Log Message:
Rebase on OProfile 0.9.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Jul 2008 19:45:30 -0000	1.14
+++ .cvsignore	4 Aug 2009 18:21:44 -0000	1.15
@@ -1 +1 @@
-oprofile-0.9.4.tar.gz
+oprofile-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Jul 2008 19:45:30 -0000	1.15
+++ sources	4 Aug 2009 18:21:44 -0000	1.16
@@ -1 +1 @@
-82b059379895cf125261d7d773465915  oprofile-0.9.4.tar.gz
+4b2ceca3fa013c95cc8d47c790807dc2  oprofile-0.9.5.tar.gz


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- oprofile.spec	25 Jul 2009 20:57:22 -0000	1.80
+++ oprofile.spec	4 Aug 2009 18:21:44 -0000	1.81
@@ -1,9 +1,7 @@
-%define DATE 20070717
-%define oprofile_version 0.9.4
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.4
-Release: 13%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -14,11 +12,7 @@ Requires(pre): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
-#Patch100: oprofile-gcc43.patch
-Patch101: oprofile-basename.patch
-Patch102: oprofile-iaperf.patch
-Patch103: oprofile-verbose.patch
-Patch104: oprofile-jvmpi-lgpl.patch
+#Patch104: oprofile-jvmpi-lgpl.patch
 
 URL: http://oprofile.sf.net
 
@@ -85,12 +79,8 @@ agent library.
 %patch10 -p1 -b .guess2
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-%patch83 -p1 -b .xen
-#%patch100 -p1 -b .gcc43
-%patch101 -p1 -b .basename
-%patch102 -p1 -b .iaperf
-%patch103 -p1 -b .verbose
-%patch104 -p1 -b .lgpl
+#%patch83 -p1 -b .xen
+#%patch104 -p1 -b .lgpl
 
 ./autogen.sh
 
@@ -133,9 +123,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-#the following is an ugly hack
-rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/oprofile
-rm -rf ${RPM_BUILD_ROOT}/usr/share/mangled-name
+# We want the manuals in the special doc dir, not the generic doc install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
+mkdir docs.installed
+mv $RPM_BUILD_ROOT%{_datadir}/doc/oprofile/* docs.installed/
 
 #hack to make header files available
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
@@ -172,7 +165,8 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc doc/oprofile.html
+%doc  docs.installed/*
+%doc COPYING
 
 %{_bindir}/ophelp
 %{_bindir}/opimport
@@ -213,9 +207,6 @@ exit 0
 %{_libdir}/liboputil++.a
 %{_libdir}/liboputil.a
 
-%doc doc/op-jit-devel.html
-%doc doc/opreport.xsd
-
 %files gui
 %defattr(-,root,root)
 
@@ -232,6 +223,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Mon Aug 3 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
+- Rebase on OProfile 0.9.5.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

oprofile-0.7-libs.patch:
 daemon/Makefile.am       |    4 ++--
 gui/Makefile.am          |    4 ++--
 libabi/Makefile.am       |   10 +++++-----
 libabi/tests/Makefile.am |    6 +++---
 libutil++/Makefile.am    |    4 ++--
 libutil/Makefile.am      |    4 ++--
 opjitconv/Makefile.am    |    2 +-
 pp/Makefile.am           |    4 ++--
 utils/Makefile.am        |    2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile-0.7-libs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- oprofile-0.7-libs.patch	18 Jul 2008 19:45:30 -0000	1.5
+++ oprofile-0.7-libs.patch	4 Aug 2009 18:21:44 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up oprofile-0.9.4rc1/daemon/Makefile.am.libs oprofile-0.9.4rc1/daemon/Makefile.am
---- oprofile-0.9.4rc1/daemon/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/daemon/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -43,9 +43,9 @@ bin_PROGRAMS = oprofiled
+diff -up oprofile-0.9.5/daemon/Makefile.am.libs oprofile-0.9.5/daemon/Makefile.am
+--- oprofile-0.9.5/daemon/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/daemon/Makefile.am	2009-08-04 14:01:40.000000000 -0400
+@@ -50,9 +50,9 @@ bin_PROGRAMS = oprofiled
  
  oprofiled_LDADD = \
  	liblegacy/liblegacy.a \
@@ -13,9 +13,9 @@ diff -up oprofile-0.9.4rc1/daemon/Makefi
 +	../libutil/liboputil.a
  
  oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -up oprofile-0.9.4rc1/gui/Makefile.am.libs oprofile-0.9.4rc1/gui/Makefile.am
---- oprofile-0.9.4rc1/gui/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/gui/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/gui/Makefile.am.libs oprofile-0.9.5/gui/Makefile.am
+--- oprofile-0.9.5/gui/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/gui/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start
  oprof_start_SOURCES = $(dist_sources)
  nodist_oprof_start_SOURCES = oprof_start.moc.cpp
@@ -28,9 +28,9 @@ diff -up oprofile-0.9.4rc1/gui/Makefile.
  	ui/liboprof_start.a \
  	@QT_LDFLAGS@ \
  	@QT_LIB@ \
-diff -up oprofile-0.9.4rc1/libabi/Makefile.am.libs oprofile-0.9.4rc1/libabi/Makefile.am
---- oprofile-0.9.4rc1/libabi/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/Makefile.am.libs oprofile-0.9.5/libabi/Makefile.am
+--- oprofile-0.9.5/libabi/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -10,15 +10,15 @@ AM_CPPFLAGS = \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -52,9 +52,9 @@ diff -up oprofile-0.9.4rc1/libabi/Makefi
 -	../libutil/libutil.a
 +	../libutil++/liboputil++.a \
 +	../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs oprofile-0.9.4rc1/libabi/tests/Makefile.am
---- oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/tests/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/tests/Makefile.am.libs oprofile-0.9.5/libabi/tests/Makefile.am
+--- oprofile-0.9.5/libabi/tests/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/tests/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -13,9 +13,9 @@ check_PROGRAMS = abi_test
  
  abi_test_SOURCES = abi_test.cpp
@@ -68,11 +68,11 @@ diff -up oprofile-0.9.4rc1/libabi/tests/
 -	../../libutil/libutil.a
 +	../../libutil++/liboputil++.a \
 +	../../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libutil/Makefile.am.libs oprofile-0.9.4rc1/libutil/Makefile.am
---- oprofile-0.9.4rc1/libutil/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -2,8 +2,8 @@ SUBDIRS = . tests
- 
+diff -up oprofile-0.9.5/libutil/Makefile.am.libs oprofile-0.9.5/libutil/Makefile.am
+--- oprofile-0.9.5/libutil/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil/Makefile.am	2009-08-04 14:05:32.000000000 -0400
+@@ -3,8 +3,8 @@ SUBDIRS = . tests
+ AM_CPPFLAGS=-I ${top_srcdir}/libop
  AM_CFLAGS = @OP_CFLAGS@
  
 -noinst_LIBRARIES = libutil.a
@@ -82,9 +82,9 @@ diff -up oprofile-0.9.4rc1/libutil/Makef
  	op_deviceio.c \
  	op_lockfile.c \
  	op_file.c \
-diff -up oprofile-0.9.4rc1/libutil++/Makefile.am.libs oprofile-0.9.4rc1/libutil++/Makefile.am
---- oprofile-0.9.4rc1/libutil++/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil++/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libutil++/Makefile.am.libs oprofile-0.9.5/libutil++/Makefile.am
+--- oprofile-0.9.5/libutil++/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil++/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,8 +7,8 @@ AM_CPPFLAGS= \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -96,9 +96,9 @@ diff -up oprofile-0.9.4rc1/libutil++/Mak
  	op_bfd.cpp \
  	op_bfd.h \
  	bfd_support.cpp \
-diff -up oprofile-0.9.4rc1/opjitconv/Makefile.am.libs oprofile-0.9.4rc1/opjitconv/Makefile.am
---- oprofile-0.9.4rc1/opjitconv/Makefile.am.libs	2008-06-01 13:42:53.000000000 -0400
-+++ oprofile-0.9.4rc1/opjitconv/Makefile.am	2008-06-01 13:43:04.000000000 -0400
+diff -up oprofile-0.9.5/opjitconv/Makefile.am.libs oprofile-0.9.5/opjitconv/Makefile.am
+--- oprofile-0.9.5/opjitconv/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/opjitconv/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv
  LIBS = @BFD_LIBS@
  
@@ -108,9 +108,9 @@ diff -up oprofile-0.9.4rc1/opjitconv/Mak
  
  opjitconv_LDADD = $(needed_libs)
  
-diff -up oprofile-0.9.4rc1/pp/Makefile.am.libs oprofile-0.9.4rc1/pp/Makefile.am
---- oprofile-0.9.4rc1/pp/Makefile.am.libs	2008-05-21 14:52:30.000000000 -0400
-+++ oprofile-0.9.4rc1/pp/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/pp/Makefile.am.libs oprofile-0.9.5/pp/Makefile.am
+--- oprofile-0.9.5/pp/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/pp/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -19,9 +19,9 @@ common_libs =  \
  	../libpp/libpp.a \
  	../libopt++/libopt++.a \
@@ -123,9 +123,9 @@ diff -up oprofile-0.9.4rc1/pp/Makefile.a
  	../libdb/libodb.a
  
  opreport_SOURCES = opreport.cpp \
-diff -up oprofile-0.9.4rc1/utils/Makefile.am.libs oprofile-0.9.4rc1/utils/Makefile.am
---- oprofile-0.9.4rc1/utils/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/utils/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/utils/Makefile.am.libs oprofile-0.9.5/utils/Makefile.am
+--- oprofile-0.9.5/utils/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/utils/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp
  dist_bin_SCRIPTS = opcontrol
  



From till at fedoraproject.org  Tue Aug  4 18:25:53 2009
From: till at fedoraproject.org (Till Maas)
Date: Tue,  4 Aug 2009 18:25:53 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.260, 1.261 comps-f11.xml.in, 1.277,
	1.278 comps-f12.xml.in, 1.67, 1.68
Message-ID: <20090804182553.E6BD311C00E4@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23960

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
Log Message:
package maintainers need make to use the CVS makefiles



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- comps-f10.xml.in	1 Aug 2009 17:46:45 -0000	1.260
+++ comps-f10.xml.in	4 Aug 2009 18:25:53 -0000	1.261
@@ -1365,6 +1365,7 @@
       <packagereq type="mandatory">git</packagereq>
       <packagereq type="mandatory">koji</packagereq>
       <packagereq type="mandatory">mercurial</packagereq>
+      <packagereq type="mandatory">make</packagereq>
       <packagereq type="mandatory">mock</packagereq>
       <packagereq type="mandatory">plague-client</packagereq>
       <packagereq type="mandatory">rpm-build</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- comps-f11.xml.in	2 Aug 2009 13:34:28 -0000	1.277
+++ comps-f11.xml.in	4 Aug 2009 18:25:53 -0000	1.278
@@ -1543,6 +1543,7 @@
       <packagereq type="mandatory">fedora-packager</packagereq>
       <packagereq type="mandatory">git</packagereq>
       <packagereq type="mandatory">koji</packagereq>
+      <packagereq type="mandatory">make</packagereq>
       <packagereq type="mandatory">mercurial</packagereq>
       <packagereq type="mandatory">mock</packagereq>
       <packagereq type="mandatory">plague-client</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- comps-f12.xml.in	3 Aug 2009 13:36:31 -0000	1.67
+++ comps-f12.xml.in	4 Aug 2009 18:25:53 -0000	1.68
@@ -1652,6 +1652,7 @@
       <packagereq type="mandatory">fedora-packager</packagereq>
       <packagereq type="mandatory">git</packagereq>
       <packagereq type="mandatory">koji</packagereq>
+      <packagereq type="mandatory">make</packagereq>
       <packagereq type="mandatory">mercurial</packagereq>
       <packagereq type="mandatory">mock</packagereq>
       <packagereq type="mandatory">plague-client</packagereq>



From mtasaka at fedoraproject.org  Tue Aug  4 18:29:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 18:29:53 +0000 (UTC)
Subject: rpms/cmigemo/devel cmigemo.spec,1.9,1.10
Message-ID: <20090804182953.2EFB111C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cmigemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24895/cmigemo/devel

Modified Files:
	cmigemo.spec 
Log Message:
Update skkdic for F12Alpha


Index: cmigemo.spec
===================================================================
RCS file: /cvs/extras/rpms/cmigemo/devel/cmigemo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cmigemo.spec	24 Jul 2009 16:35:06 -0000	1.9
+++ cmigemo.spec	4 Aug 2009 18:29:52 -0000	1.10
@@ -14,7 +14,7 @@
 
 Name:		cmigemo
 Version:	%{mainver}
-Release:	%{rel}%{?dist}.2
+Release:	%{rel}%{?dist}.3
 Summary:	C interface of Ruby/Migemo Japanese incremental search tool
 
 Group:		System Environment/Libraries
@@ -137,6 +137,9 @@ cd ..
 %{_libdir}/libmigemo.so
 
 %changelog
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-12: Rebuild for updated skkdic (for F12Alpha)
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-12: Mass rebuild
 



From mtasaka at fedoraproject.org  Tue Aug  4 18:29:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  4 Aug 2009 18:29:53 +0000 (UTC)
Subject: rpms/skkdic/devel create-skkdic-source.sh, NONE, 1.1 .cvsignore, 1.3,
	1.4 skkdic.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090804182953.61B3111C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/skkdic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24895/skkdic/devel

Modified Files:
	.cvsignore skkdic.spec sources 
Added Files:
	create-skkdic-source.sh 
Log Message:
Update skkdic for F12Alpha


--- NEW FILE create-skkdic-source.sh ---
#!/bin/sh

DATE=$(date '+%Y%m%d')
TIME=$(date '+%H%M')

mkdir -p skkdic-$DATE
cd skkdic-$DATE
wget -N -r -nH -np --cut-dirs=3 \
	-R 'index.html*' \
	-R '*.gz' -R '*.gz.md5' \
	http://openlab.ring.gr.jp/skk/skk/dic/
rm -rf robots.txt
cd .. && tar cvfj skkdic-${DATE}T${TIME}.tar.bz2 skkdic-$DATE



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skkdic/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 20:43:59 -0000	1.3
+++ .cvsignore	4 Aug 2009 18:29:53 -0000	1.4
@@ -1 +1 @@
-skkdic-20080904.tar.bz2
+skkdic-20090805T0306.tar.bz2


Index: skkdic.spec
===================================================================
RCS file: /cvs/extras/rpms/skkdic/devel/skkdic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- skkdic.spec	27 Jul 2009 04:25:04 -0000	1.6
+++ skkdic.spec	4 Aug 2009 18:29:53 -0000	1.7
@@ -1,20 +1,19 @@
-Summary: Dictionaries for SKK (Simple Kana-Kanji conversion program)
-Name: skkdic
-Version: 20080904
-Release: 3%{?dist}
-License: GPLv2+
-Group: System Environment/Libraries
-# Here's how to make the source:
-# mkdir -p skkdic-`date +%Y%m%d`
-# cd skkdic-`date +%Y%m%d`
-# wget -r -nH -np --cut-dirs=3 -R index.html* http://openlab.ring.gr.jp/skk/skk/dic/
-# rm -rf robots.txt
-# cd .. && tar cvfj skkdic-`date +%Y%m%d`.tar.bz2 skkdic-`date +%Y%m%d`
-Source0: skkdic-%{version}.tar.bz2
-Source200: README-skkdic.rh.ja
-URL: http://openlab.ring.gr.jp/skk/skk/dic/
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+%global	cvsDATE	20090805
+%global	cvsTIME	0306
+
+Summary:	Dictionaries for SKK (Simple Kana-Kanji conversion program)
+Name:		skkdic
+Version:	%{cvsDATE}
+Release:	1.T%{cvsTIME}%{?dist}
+License:	GPLv2+
+Group:		System Environment/Libraries
+# To create source tarball, use Source10
+Source0:	skkdic-%{cvsDATE}T%{cvsTIME}.tar.bz2
+Source10:	create-skkdic-source.sh
+Source200:	README-skkdic.rh.ja
+URL:		http://openlab.ring.gr.jp/skk/skk/dic/
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This package includes the SKK dictionaries, including the large dictionary
@@ -23,7 +22,7 @@ SKK-JISYO.L and pubdic+ dictionary.
 %prep
 %setup -q
 
-cp %SOURCE200 .
+cp -p %SOURCE200 .
 mv zipcode/README.ja zipcode/README-zipcode.ja 
 
 %build
@@ -32,20 +31,31 @@ mv zipcode/README.ja zipcode/README-zipc
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/skk
 
-for f in SKK-JISYO* zipcode/SKK-JISYO*; do \
-	install -m 644 $f $RPM_BUILD_ROOT%{_datadir}/skk; done
-%{__gzip} ChangeLog
+for f in SKK-JISYO* zipcode/SKK-JISYO*
+do
+	install -p -m 644 $f $RPM_BUILD_ROOT%{_datadir}/skk
+done
+gzip -9 ChangeLog
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog.gz READMEs/committers.txt edict_doc.txt zipcode/README-zipcode.ja README-skkdic.rh.ja
+%defattr(-,root,root,-)
+%doc	ChangeLog.gz
+%doc	README-skkdic.rh.ja
+%doc	READMEs/committers.txt
+%doc	edict_doc.txt
+%doc	zipcode/README-zipcode.ja
+
 %{_datadir}/skk/
 
 
 %changelog
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 20090805-1.T0306
+- Update for F12Alpha
+- A bit clean up for spec file
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080904-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skkdic/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2008 20:43:59 -0000	1.3
+++ sources	4 Aug 2009 18:29:53 -0000	1.4
@@ -1 +1 @@
-a5132e3ab05cdd7a7a6f770fc45a58dc  skkdic-20080904.tar.bz2
+7bd871b047f5818dc254e7b7d5647d01  skkdic-20090805T0306.tar.bz2



From hadess at fedoraproject.org  Tue Aug  4 18:37:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  4 Aug 2009 18:37:16 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.18,
	1.19 gnome-bluetooth.spec, 1.83, 1.84 sources, 1.19, 1.20
Message-ID: <20090804183716.CF79811C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26710

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-1
- Update to 2.27.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	21 Jul 2009 16:11:29 -0000	1.18
+++ .cvsignore	4 Aug 2009 18:37:16 -0000	1.19
@@ -1 +1 @@
-gnome-bluetooth-2.27.8.tar.bz2
+gnome-bluetooth-2.27.9.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- gnome-bluetooth.spec	25 Jul 2009 00:35:24 -0000	1.83
+++ gnome-bluetooth.spec	4 Aug 2009 18:37:16 -0000	1.84
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.27.8
-Release:	2%{?dist}
+Version:	2.27.9
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -185,6 +185,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-1
+- Update to 2.27.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	21 Jul 2009 16:11:29 -0000	1.19
+++ sources	4 Aug 2009 18:37:16 -0000	1.20
@@ -1 +1 @@
-c82f33830c279e36a71c896be99a8035  gnome-bluetooth-2.27.8.tar.bz2
+a4111b2578346b951d5c3fb2457c0f18  gnome-bluetooth-2.27.9.tar.bz2



From wtogami at fedoraproject.org  Tue Aug  4 18:42:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue,  4 Aug 2009 18:42:54 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.28, 1.29 pidgin.spec, 1.88,
	1.89 sources, 1.28, 1.29
Message-ID: <20090804184254.6147B11C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27846

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	27 Jul 2009 19:00:15 -0000	1.28
+++ .cvsignore	4 Aug 2009 18:42:53 -0000	1.29
@@ -1 +1 @@
-pidgin-2.6.0-devel-20090727.tar.bz2
+pidgin-2.6.0-devel-20090804.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- pidgin.spec	28 Jul 2009 01:58:20 -0000	1.88
+++ pidgin.spec	4 Aug 2009 18:42:54 -0000	1.89
@@ -82,8 +82,8 @@
 
 Name:		pidgin
 Version:	2.6.0
-%define snapshot 20090727
-Release:	0.8.%{snapshot}%{?dist}
+%define snapshot 20090804
+Release:	0.9.%{snapshot}%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -613,6 +613,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 04 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.9.20090804
+- new snapshot
+
 * Mon Jul 27 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.8.20090727
 - new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	27 Jul 2009 19:00:15 -0000	1.28
+++ sources	4 Aug 2009 18:42:54 -0000	1.29
@@ -1 +1 @@
-5252f0a5ff1f407ea74218fffae00149  pidgin-2.6.0-devel-20090727.tar.bz2
+64cef02befaa484076becdd24181c1a9  pidgin-2.6.0-devel-20090804.tar.bz2



From jkeating at fedoraproject.org  Tue Aug  4 18:44:17 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue,  4 Aug 2009 18:44:17 +0000 (UTC)
Subject: rpms/python-ctypes/EL-5 python-ctypes.spec,1.3,1.4
Message-ID: <20090804184417.289AA11C00E4@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/python-ctypes/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28180

Modified Files:
	python-ctypes.spec 
Log Message:
* Fri Jul 24 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.0.2-2
- add egg info



Index: python-ctypes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ctypes/EL-5/python-ctypes.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-ctypes.spec	21 Dec 2007 19:56:07 -0000	1.3
+++ python-ctypes.spec	4 Aug 2009 18:44:16 -0000	1.4
@@ -1,8 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
+%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Name:           python-ctypes
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced Foreign Function Interface for Python
 
 Group:          Development/Languages
@@ -12,6 +14,7 @@ Source0:        http://download.sourcefo
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
@@ -29,12 +32,12 @@ callback functions in pure Python.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Clean up temp and build for debuginfo
 %{__python} setup.py clean
 
@@ -54,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ctypes/*.py
 %{python_sitearch}/ctypes/*.pyc
 %{python_sitearch}/ctypes/*.pyo
+%{python_sitearch}/ctypes-%{version}-py%{pyver}.egg-info/
 %dir %{python_sitearch}/ctypes/macholib
 %{python_sitearch}/ctypes/macholib/*.py
 %{python_sitearch}/ctypes/macholib/*.pyc
@@ -61,8 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 #Don't package the test suite
 %exclude %{python_sitearch}/ctypes/test
 
-
 %changelog
+* Fri Jul 24 2009 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.0.2-2
+- add egg info
+
 * Sun Dec 16 2007 Jesse Keating <jkeating at redhat.com> - 1.0.2-1
 - Update to 1.0.2
 



From pkgdb at fedoraproject.org  Tue Aug  4 18:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 18:48:57 +0000
Subject: [pkgdb] baobab ownership updated
Message-ID: <20090804184857.776D310F879@bastion2.fedora.phx.redhat.com>

Package baobab in Fedora devel was orphaned by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/baobab



From pkgdb at fedoraproject.org  Tue Aug  4 18:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 18:48:57 +0000
Subject: [pkgdb] baobab (un)retirement
Message-ID: <20090804184857.8ED6710F88F@bastion2.fedora.phx.redhat.com>

Package baobab in Fedora devel has been retired by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/baobab



From limb at fedoraproject.org  Tue Aug  4 18:50:48 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  4 Aug 2009 18:50:48 +0000 (UTC)
Subject: rpms/vym/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vym.spec, 1.13,
	1.14
Message-ID: <20090804185048.5A03911C034A@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/vym/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29510

Modified Files:
	.cvsignore sources vym.spec 
Log Message:
New upstream via OpenSUSE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vym/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Dec 2008 15:08:37 -0000	1.5
+++ .cvsignore	4 Aug 2009 18:50:48 -0000	1.6
@@ -1 +1 @@
-vym-1.12.2.tar.bz2
+vym-1.12.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vym/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Dec 2008 15:08:37 -0000	1.5
+++ sources	4 Aug 2009 18:50:48 -0000	1.6
@@ -1 +1 @@
-ff2dc8f2dad9bda128753ed94aed302d  vym-1.12.2.tar.bz2
+770b937724d6c2096a05135a125411be  vym-1.12.4.tar.bz2


Index: vym.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vym/devel/vym.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vym.spec	27 Jul 2009 07:00:26 -0000	1.13
+++ vym.spec	4 Aug 2009 18:50:48 -0000	1.14
@@ -1,12 +1,15 @@
 Name:           vym
-Version:        1.12.2
-Release:        3%{?dist}
+Version:        1.12.4
+Release:        0%{?dist}
 Summary:        View your mind
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.insilmaril.de/vym/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# Currently obtained from OpenSUSE, SF releases to resume shortly
+# http://download.opensuse.org/repositories/home://insilmaril/openSUSE_11.1/src/
+# See also BZ 511290
 Source1:        %{name}.desktop
 Source2:        vym.xml
 
@@ -87,6 +90,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Aug 04 2009 Jon Ciesla <limb at jcomserv.net> - 1.12.4-0
+- Updated to new upstream version.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug  4 18:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 18:51:09 +0000
Subject: [pkgdb] libdockapp ownership updated
Message-ID: <20090804185110.3A43F10F882@bastion2.fedora.phx.redhat.com>

Package libdockapp in Fedora devel is now owned by awjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdockapp



From pkgdb at fedoraproject.org  Tue Aug  4 18:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 18:51:20 +0000
Subject: [pkgdb] libdockapp ownership updated
Message-ID: <20090804185120.5EB0E10F8A2@bastion2.fedora.phx.redhat.com>

Package libdockapp in Fedora 11 is now owned by awjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libdockapp



From till at fedoraproject.org  Tue Aug  4 18:55:01 2009
From: till at fedoraproject.org (Till Maas)
Date: Tue,  4 Aug 2009 18:55:01 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.278,1.279 comps-f12.xml.in,1.68,1.69
Message-ID: <20090804185501.4E4A211C00E4@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30785

Modified Files:
	comps-f11.xml.in comps-f12.xml.in 
Log Message:
- add it security category
- prefix reconnaissance group with it-security



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- comps-f11.xml.in	4 Aug 2009 18:25:53 -0000	1.278
+++ comps-f11.xml.in	4 Aug 2009 18:55:00 -0000	1.279
@@ -4542,11 +4542,11 @@
     </packagelist>
   </group>
   <group>                                                         
-    <id>reconnaissance</id>                                       
-    <_name>Reconnaissance tools</_name>                           
+    <id>it-security-reconnaissance</id>                                       
+    <_name>IT Security Reconnaissance Tools</_name>                           
     <_description>These tools can be used to perform IT security related reconnaissance.</_description>
     <default>false</default>                                                                           
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="default">argus</packagereq>
         <packagereq type="default">cgf</packagereq>
@@ -5966,6 +5966,14 @@
     </packagelist>
   </group>
   <category>
+    <id>it-security</id>
+    <_name>IT Security</_name>
+    <_description>These packages are useful for IT security related tasks.</_description>
+    <grouplist>
+      <groupid>it-security-reconnaissance</groupid>
+    </grouplist>
+  </category>
+  <category>
     <id>language-support</id>
     <_name>Languages</_name>
     <_description>These packages provide support for various locales including fonts and input methods.</_description>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- comps-f12.xml.in	4 Aug 2009 18:25:53 -0000	1.68
+++ comps-f12.xml.in	4 Aug 2009 18:55:01 -0000	1.69
@@ -4673,11 +4673,11 @@
     </packagelist>
   </group>
   <group>
-    <id>reconnaissance</id>
+    <id>it-security-reconnaissance</id>
     <_name>Reconnaissance tools</_name>
     <_description>These tools can be used to perform IT security related reconnaissance.</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="default">argus</packagereq>
         <packagereq type="default">cgf</packagereq>
@@ -6114,6 +6114,14 @@
     </packagelist>
   </group>
   <category>
+    <id>it-security</id>
+    <_name>IT Security</_name>
+    <_description>These packages are useful for IT security related tasks.</_description>
+    <grouplist>
+      <groupid>it-security-reconnaissance</groupid>
+    </grouplist>
+  </category>
+  <category>
     <id>language-support</id>
     <_name>Languages</_name>
     <_description>These packages provide support for various locales including fonts and input methods.</_description>



From mcpierce at fedoraproject.org  Tue Aug  4 18:58:51 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  4 Aug 2009 18:58:51 +0000 (UTC)
Subject: rpms/rubygem-cobbler/devel .cvsignore, 1.8, 1.9 rubygem-cobbler.spec,
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090804185851.1C8EC11C00E4@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31594

Modified Files:
	.cvsignore rubygem-cobbler.spec sources 
Log Message:
* Tue Aug  4 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.1-1
- Removed debugging code from production code.
- Removed unit testing code.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 May 2009 17:34:21 -0000	1.8
+++ .cvsignore	4 Aug 2009 18:58:50 -0000	1.9
@@ -1 +1 @@
-cobbler-1.6.0.gem
+cobbler-1.6.1.gem


Index: rubygem-cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/rubygem-cobbler.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-cobbler.spec	27 Jul 2009 03:27:01 -0000	1.9
+++ rubygem-cobbler.spec	4 Aug 2009 18:58:50 -0000	1.10
@@ -7,8 +7,8 @@
 
 Summary: 	An interface for interacting with a Cobbler server
 Name: 		rubygem-%{gemname}
-Version: 	1.6.0
-Release: 	2%{?dist}
+Version: 	1.6.1
+Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	LGPLv2+
 URL: 		http://cobbler.et.redhat.com/
@@ -32,8 +32,6 @@ Provides Ruby bindings to interact with 
 
 cd %{installroot}
 
-rake test
-
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
@@ -61,6 +59,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug  4 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.1-1
+- Removed debugging code from production code.
+- Removed unit testing code.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 May 2009 17:34:22 -0000	1.8
+++ sources	4 Aug 2009 18:58:50 -0000	1.9
@@ -1 +1 @@
-81f596fc916a0e4727e5c338de4d1a33  cobbler-1.6.0.gem
+41b346b12891a46c9f362dab62f9e9af  cobbler-1.6.1.gem



From limb at fedoraproject.org  Tue Aug  4 19:02:51 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  4 Aug 2009 19:02:51 +0000 (UTC)
Subject: rpms/vym/F-11 sources,1.5,1.6 vym.spec,1.12,1.13
Message-ID: <20090804190251.13A7511C00E4@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/vym/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32422

Modified Files:
	sources vym.spec 
Log Message:
New upstream, fixes OO.org export.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vym/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Dec 2008 15:08:37 -0000	1.5
+++ sources	4 Aug 2009 19:02:50 -0000	1.6
@@ -1 +1 @@
-ff2dc8f2dad9bda128753ed94aed302d  vym-1.12.2.tar.bz2
+770b937724d6c2096a05135a125411be  vym-1.12.4.tar.bz2


Index: vym.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vym/F-11/vym.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- vym.spec	26 Feb 2009 00:59:34 -0000	1.12
+++ vym.spec	4 Aug 2009 19:02:50 -0000	1.13
@@ -1,12 +1,15 @@
 Name:           vym
-Version:        1.12.2
-Release:        2%{?dist}
+Version:        1.12.4
+Release:        0%{?dist}
 Summary:        View your mind
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.insilmaril.de/vym/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# Currently obtained from OpenSUSE, SF releases to resume shortly
+# http://download.opensuse.org/repositories/home://insilmaril/openSUSE_11.1/src/
+# See also BZ 511290
 Source1:        %{name}.desktop
 Source2:        vym.xml
 
@@ -87,6 +90,12 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Aug 04 2009 Jon Ciesla <limb at jcomserv.net> - 1.12.4-0
+- Updated to new upstream version.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.2-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.12.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mcpierce at fedoraproject.org  Tue Aug  4 19:07:17 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  4 Aug 2009 19:07:17 +0000 (UTC)
Subject: rpms/rubygem-cobbler/F-10 .cvsignore, 1.7, 1.8 rubygem-cobbler.spec,
	1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090804190717.9881411C00E4@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv916

Modified Files:
	.cvsignore rubygem-cobbler.spec sources 
Log Message:
* Tue Aug  4 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.1-1
- Removed debugging code from production code.
- Removed unit tests.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 May 2009 18:54:45 -0000	1.7
+++ .cvsignore	4 Aug 2009 19:07:17 -0000	1.8
@@ -1 +1 @@
-cobbler-1.6.0.gem
+cobbler-1.6.1.gem


Index: rubygem-cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-10/rubygem-cobbler.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rubygem-cobbler.spec	7 May 2009 18:54:45 -0000	1.7
+++ rubygem-cobbler.spec	4 Aug 2009 19:07:17 -0000	1.8
@@ -7,7 +7,7 @@
 
 Summary: 	An interface for interacting with a Cobbler server
 Name: 		rubygem-%{gemname}
-Version: 	1.6.0
+Version: 	1.6.1
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	LGPLv2+
@@ -32,8 +32,6 @@ Provides Ruby bindings to interact with 
 
 cd %{installroot}
 
-rake test
-
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
@@ -60,6 +58,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug  4 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.1-1
+- Removed debugging code from production code.
+- Removed unit tests.
+
 * Thu May  7 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.0-1
 - Dropped support for pre-1.6 instances of Cobbler.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 May 2009 18:54:45 -0000	1.7
+++ sources	4 Aug 2009 19:07:17 -0000	1.8
@@ -1 +1 @@
-81f596fc916a0e4727e5c338de4d1a33  cobbler-1.6.0.gem
+41b346b12891a46c9f362dab62f9e9af  cobbler-1.6.1.gem



From limb at fedoraproject.org  Tue Aug  4 19:12:10 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  4 Aug 2009 19:12:10 +0000 (UTC)
Subject: rpms/vym/F-10 sources,1.5,1.6 vym.spec,1.11,1.12
Message-ID: <20090804191210.6DFF511C00E4@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/vym/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2043

Modified Files:
	sources vym.spec 
Log Message:
New upstream, fixes OO.org export.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vym/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Dec 2008 15:20:24 -0000	1.5
+++ sources	4 Aug 2009 19:12:10 -0000	1.6
@@ -1 +1 @@
-ff2dc8f2dad9bda128753ed94aed302d  vym-1.12.2.tar.bz2
+770b937724d6c2096a05135a125411be  vym-1.12.4.tar.bz2


Index: vym.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vym/F-10/vym.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- vym.spec	5 Dec 2008 15:20:24 -0000	1.11
+++ vym.spec	4 Aug 2009 19:12:10 -0000	1.12
@@ -1,12 +1,15 @@
 Name:           vym
-Version:        1.12.2
-Release:        1%{?dist}
+Version:        1.12.4
+Release:        0%{?dist}
 Summary:        View your mind
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.insilmaril.de/vym/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# Currently obtained from OpenSUSE, SF releases to resume shortly
+# http://download.opensuse.org/repositories/home://insilmaril/openSUSE_11.1/src/
+# See also BZ 511290
 Source1:        %{name}.desktop
 Source2:        vym.xml
 
@@ -87,6 +90,15 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Aug 04 2009 Jon Ciesla <limb at jcomserv.net> - 1.12.4-0
+- Updated to new upstream version.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.2-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.12.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Dec 05 2008 Jon Ciesla <limb at jcomserv.net> - 1.12.2-1
 - Updated to new upstream version.
 



From mcpierce at fedoraproject.org  Tue Aug  4 19:16:23 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  4 Aug 2009 19:16:23 +0000 (UTC)
Subject: rpms/rubygem-cobbler/F-11 .cvsignore, 1.7, 1.8 rubygem-cobbler.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090804191623.C8BE911C00E4@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-cobbler/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3009

Modified Files:
	.cvsignore rubygem-cobbler.spec sources 
Log Message:
* Tue Aug  4 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.1-1
- Removed debugging code from production code.
- Removed unit tests.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 May 2009 19:21:32 -0000	1.7
+++ .cvsignore	4 Aug 2009 19:16:23 -0000	1.8
@@ -1 +1 @@
-cobbler-1.6.0.gem
+cobbler-1.6.1.gem


Index: rubygem-cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-11/rubygem-cobbler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-cobbler.spec	7 May 2009 19:21:32 -0000	1.8
+++ rubygem-cobbler.spec	4 Aug 2009 19:16:23 -0000	1.9
@@ -7,7 +7,7 @@
 
 Summary: 	An interface for interacting with a Cobbler server
 Name: 		rubygem-%{gemname}
-Version: 	1.6.0
+Version: 	1.6.1
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	LGPLv2+
@@ -32,8 +32,6 @@ Provides Ruby bindings to interact with 
 
 cd %{installroot}
 
-rake test
-
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
@@ -60,6 +58,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug  4 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.1-1
+- Removed debugging code from production code.
+- Removed unit tests.
+
 * Thu May  7 2009 Darryl Pierce <dpierce at redhat.com> - 1.6.0-1
 - Dropped support for pre-1.6 instances of Cobbler.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cobbler/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 May 2009 19:21:32 -0000	1.7
+++ sources	4 Aug 2009 19:16:23 -0000	1.8
@@ -1 +1 @@
-81f596fc916a0e4727e5c338de4d1a33  cobbler-1.6.0.gem
+41b346b12891a46c9f362dab62f9e9af  cobbler-1.6.1.gem



From rdieter at fedoraproject.org  Tue Aug  4 19:31:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 19:31:54 +0000 (UTC)
Subject: rpms/PyQt4/F-10 PyQt-x11-gpl-4.5.1-pyuic_shebang.patch, NONE,
	1.1 PyQt-x11-gpl-4.5.2-QT_SHARED.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 PyQt4.spec, 1.19, 1.20 sources, 1.9,
	1.10 PyQt-x11-gpl-4.4.4-QT_SHARED.patch, 1.1, NONE
Message-ID: <20090804193154.CA95411C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7075

Modified Files:
	.cvsignore PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.5.1-pyuic_shebang.patch 
	PyQt-x11-gpl-4.5.2-QT_SHARED.patch 
Removed Files:
	PyQt-x11-gpl-4.4.4-QT_SHARED.patch 
Log Message:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
- PyQt4-4.5.4


PyQt-x11-gpl-4.5.1-pyuic_shebang.patch:
 pyuic.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE PyQt-x11-gpl-4.5.1-pyuic_shebang.patch ---
diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py
--- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang	2009-06-16 03:37:46.000000000 -0500
+++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py	2009-07-02 14:01:44.218147410 -0500
@@ -1,3 +1,5 @@
+#!/usr/bin/python -tt
+
 import sys
 import optparse
 

PyQt-x11-gpl-4.5.2-QT_SHARED.patch:
 configure.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE PyQt-x11-gpl-4.5.2-QT_SHARED.patch ---
diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py
--- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED	2009-07-16 08:34:48.419358104 -0500
+++ PyQt-x11-gpl-4.5.2/configure.py	2009-07-16 08:34:54.260358064 -0500
@@ -1679,11 +1679,11 @@ int main(int, char **)
 
     out << QLibraryInfo::licensee() << '\\n';
 
-#if defined(QT_SHARED) || defined(QT_DLL)
+//#if defined(QT_SHARED) || defined(QT_DLL)
     out << "shared\\n";
-#else
-    out << "\\n";
-#endif
+//#else
+//    out << "\\n";
+//#endif
 
     // Determine which features should be disabled.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	27 Jun 2009 02:56:09 -0000	1.9
+++ .cvsignore	4 Aug 2009 19:31:54 -0000	1.10
@@ -1 +1 @@
-PyQt-x11-gpl-4.5.1.tar.gz
+PyQt-x11-gpl-4.5.4.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/PyQt4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- PyQt4.spec	27 Jun 2009 02:56:10 -0000	1.19
+++ PyQt4.spec	4 Aug 2009 19:31:54 -0000	1.20
@@ -3,7 +3,7 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.5.1
+Version: 4.5.4
 Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
@@ -16,7 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
-Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
+Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
+Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -31,7 +32,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.1
+BuildRequires: sip-devel >= 4.8.2
 %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
@@ -60,9 +61,12 @@ of the Qt4 classes (e.g. KDE or your own
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
+%patch4 -p1 
 
+## permissions
 # mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
+chmod a+rx pyuic/uic/pyuic.py
 
 
 %build
@@ -84,7 +88,6 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
 # fix/remove rpaths
-
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
 
@@ -97,17 +100,12 @@ chrpath --delete %{buildroot}%{python_si
 chrpath --list   %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
 chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
 
-# non-executable script
-chmod 755 %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
-
-# missing shebang
-cp -a %{buildroot}%{_bindir}/pyuic4 %{buildroot}%{_bindir}/pyuic4.ORIG
-cat > %{buildroot}%{_bindir}/pyuic4 <<EOF
-#!/bin/sh
-
-EOF
-cat %{buildroot}%{_bindir}/pyuic4.ORIG >> %{buildroot}%{_bindir}/pyuic4
-rm -f %{buildroot}%{_bindir}/pyuic4.ORIG
+# HACK: fix multilb conflict, http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pyuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py \
+   %{buildroot}%{_bindir}/pyuic4
+ln -s %{_bindir}/pyuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
 
 %clean
@@ -121,6 +119,7 @@ rm -rf %{buildroot}
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
 %{python_sitearch}/PyQt4/
+%exclude %{python_sitearch}/PyQt4/uic/pyuic.py*
 # fixme?  -> sitearch?  -- Rex
 %{python_sitelib}/dbus/mainloop/qt.so
 %{_qt4_plugindir}/designer/*
@@ -129,12 +128,28 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc doc/*
 %doc examples/
-%{_bindir}/*
+%{_bindir}/pylupdate4
+%{_bindir}/pyrcc4
+%{_bindir}/pyuic4
+%{python_sitearch}/PyQt4/uic/pyuic.py*
 %{_datadir}/sip/PyQt4/
 %{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 
 %changelog
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
+- PyQt4-4.5.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-1
+- PyQt4-4.5.2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-2
+- fix build with qt-4.5.2
+- PyQt4-devel multilib conflict (#509415)
+
 * Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-1
 - PyQt-4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Jun 2009 02:56:10 -0000	1.9
+++ sources	4 Aug 2009 19:31:54 -0000	1.10
@@ -1 +1 @@
-80e877799ae8fb82f137c43fda18bff5  PyQt-x11-gpl-4.5.1.tar.gz
+b721266d14c450dd7045025e042819ec  PyQt-x11-gpl-4.5.4.tar.gz


--- PyQt-x11-gpl-4.4.4-QT_SHARED.patch DELETED ---



From rvinyard at fedoraproject.org  Tue Aug  4 19:32:09 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  4 Aug 2009 19:32:09 +0000 (UTC)
Subject: rpms/clipsmm/devel .cvsignore, 1.2, 1.3 clipsmm.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20090804193209.F038811C00E4@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/clipsmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7219

Modified Files:
	.cvsignore clipsmm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 04:57:20 -0000	1.2
+++ .cvsignore	4 Aug 2009 19:32:09 -0000	1.3
@@ -1 +1,2 @@
-clipsmm-0.0.7.tar.bz2
+clipsmm-0.1.0.tar.bz2
+clipsmm-0.1.0-doc.tar.bz2


Index: clipsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/devel/clipsmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- clipsmm.spec	24 Jul 2009 19:05:40 -0000	1.6
+++ clipsmm.spec	4 Aug 2009 19:32:09 -0000	1.7
@@ -1,44 +1,93 @@
-
-Summary:          Clipsmm is a C++ wrapper for the CLIPS C library
+%define clipsver 6.24
+Summary:          C++ interface to the CLIPS expert system C library
 Name:             clipsmm
-Version:          0.0.7
-Release:          6%{?dist}
-License:          GPLv2
+Version:          0.1.0
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://clipsmm.sourceforge.net
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/clipsmm/clipsmm-0.0.7.tar.bz2
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 boost-devel pkgconfig m4
+BuildRequires:    clips-devel >= %{clipsver} 
+BuildRequires:    glibmm24-devel >= 2.6.0 
+BuildRequires:    cppunit-devel >= 1.11 
+BuildRequires:    pkgconfig
+BuildRequires:    m4
 
 %description
 The clipsmm library provides a C++ interface to the CLIPS C library.
 
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
 %package          devel
-Summary:          Headers for developing programs that will use clipsmm
+Summary:          Headers for developing C++ applications with CLIPS
 Group:            Development/Libraries
-Requires:         clipsmm = %{version}-%{release}
-Requires:         clips-devel >= 6.24 glibmm24-devel >= 2.6.0 pkgconfig
+Requires:         %{name} = %{version}-%{release}
+Requires:         clips-devel >= %{clipsver} 
+Requires:         glibmm24-devel >= 2.6.0 
+Requires:         pkgconfig
 
 %description    devel
 This package contains the libraries and header files needed for
 developing clipsmm applications.
 
+clipsmm provides a C++ interface to the CLIPS C library.
+
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
+%package          doc
+Summary:          Documentation for the C++ clipsmm library
+Group:            Documentation
+Requires:         gtk-doc
+Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
+
+%description      doc
+This package contains developer's documentation for the clipsmm
+library. clipsmm provides C++ based bindings for the C based
+CLIPS library.
+
+The documentation can be viewed either through the devhelp
+documentation browser or through a web browser. 
+
+If using a web browser the documentation is installed in the gtk-doc
+hierarchy and can be found at /usr/share/gtk-doc/html/clipsmm-0.1
+
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-static=no
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
-
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-# Copy the docs into a different place in the dist hierarchy so they
-# install as /usr/share/doc/package-x.x.x-devel/reference
-%{__cp} -ar docs/reference .
+
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/ doc/clipsmm-0.1.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -49,18 +98,25 @@ find %{buildroot} -type f -name "*.la" -
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libclipsmm.so.*
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/clipsmm*.pc
-%{_includedir}/clipsmm-0.0/
-%doc ChangeLog reference
+%{_libdir}/libclipsmm.so
+%{_libdir}/pkgconfig/clipsmm-1.0.pc
+%{_includedir}/clipsmm-0.1/
+%doc ChangeLog
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/clipsmm-0.1/
 
 
 %changelog
+* Mon Jul 27 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-1
+- New release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Nov 2006 04:57:20 -0000	1.2
+++ sources	4 Aug 2009 19:32:09 -0000	1.3
@@ -1 +1,2 @@
-462cad31023799926ab67f78b628e719  clipsmm-0.0.7.tar.bz2
+2d30edfbb57f03f010243a7f07d494a6  clipsmm-0.1.0.tar.bz2
+781296b7b85a8da9f0bce5a5248fe48e  clipsmm-0.1.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Tue Aug  4 19:32:18 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  4 Aug 2009 19:32:18 +0000 (UTC)
Subject: rpms/clipsmm/F-11 .cvsignore, 1.2, 1.3 clipsmm.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090804193218.30DD011C00E4@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/clipsmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7272

Modified Files:
	.cvsignore clipsmm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 04:57:20 -0000	1.2
+++ .cvsignore	4 Aug 2009 19:32:17 -0000	1.3
@@ -1 +1,2 @@
-clipsmm-0.0.7.tar.bz2
+clipsmm-0.1.0.tar.bz2
+clipsmm-0.1.0-doc.tar.bz2


Index: clipsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-11/clipsmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- clipsmm.spec	24 Feb 2009 07:52:07 -0000	1.5
+++ clipsmm.spec	4 Aug 2009 19:32:18 -0000	1.6
@@ -1,44 +1,93 @@
-
-Summary:          Clipsmm is a C++ wrapper for the CLIPS C library
+%define clipsver 6.24
+Summary:          C++ interface to the CLIPS expert system C library
 Name:             clipsmm
-Version:          0.0.7
-Release:          5%{?dist}
-License:          GPLv2
+Version:          0.1.0
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://clipsmm.sourceforge.net
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/clipsmm/clipsmm-0.0.7.tar.bz2
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 boost-devel pkgconfig m4
+BuildRequires:    clips-devel >= %{clipsver} 
+BuildRequires:    glibmm24-devel >= 2.6.0 
+BuildRequires:    cppunit-devel >= 1.11 
+BuildRequires:    pkgconfig
+BuildRequires:    m4
 
 %description
 The clipsmm library provides a C++ interface to the CLIPS C library.
 
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
 %package          devel
-Summary:          Headers for developing programs that will use clipsmm
+Summary:          Headers for developing C++ applications with CLIPS
 Group:            Development/Libraries
-Requires:         clipsmm = %{version}-%{release}
-Requires:         clips-devel >= 6.24 glibmm24-devel >= 2.6.0 pkgconfig
+Requires:         %{name} = %{version}-%{release}
+Requires:         clips-devel >= %{clipsver} 
+Requires:         glibmm24-devel >= 2.6.0 
+Requires:         pkgconfig
 
 %description    devel
 This package contains the libraries and header files needed for
 developing clipsmm applications.
 
+clipsmm provides a C++ interface to the CLIPS C library.
+
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
+%package          doc
+Summary:          Documentation for the C++ clipsmm library
+Group:            Documentation
+Requires:         gtk-doc
+Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
+
+%description      doc
+This package contains developer's documentation for the clipsmm
+library. clipsmm provides C++ based bindings for the C based
+CLIPS library.
+
+The documentation can be viewed either through the devhelp
+documentation browser or through a web browser. 
+
+If using a web browser the documentation is installed in the gtk-doc
+hierarchy and can be found at /usr/share/gtk-doc/html/clipsmm-0.1
+
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-static=no
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
-
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-# Copy the docs into a different place in the dist hierarchy so they
-# install as /usr/share/doc/package-x.x.x-devel/reference
-%{__cp} -ar docs/reference .
+
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/ doc/clipsmm-0.1.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -49,18 +98,28 @@ find %{buildroot} -type f -name "*.la" -
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libclipsmm.so.*
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/clipsmm*.pc
-%{_includedir}/clipsmm-0.0/
-%doc ChangeLog reference
+%{_libdir}/libclipsmm.so
+%{_libdir}/pkgconfig/clipsmm-1.0.pc
+%{_includedir}/clipsmm-0.1/
+%doc ChangeLog
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/clipsmm-0.1/
 
 
 %changelog
+* Mon Jul 27 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-1
+- New release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.7-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.0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Nov 2006 04:57:20 -0000	1.2
+++ sources	4 Aug 2009 19:32:18 -0000	1.3
@@ -1 +1,2 @@
-462cad31023799926ab67f78b628e719  clipsmm-0.0.7.tar.bz2
+2d30edfbb57f03f010243a7f07d494a6  clipsmm-0.1.0.tar.bz2
+781296b7b85a8da9f0bce5a5248fe48e  clipsmm-0.1.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Tue Aug  4 19:32:26 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  4 Aug 2009 19:32:26 +0000 (UTC)
Subject: rpms/clipsmm/F-10 .cvsignore, 1.2, 1.3 clipsmm.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090804193226.8A0FA11C00E4@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/clipsmm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7328

Modified Files:
	.cvsignore clipsmm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 04:57:20 -0000	1.2
+++ .cvsignore	4 Aug 2009 19:32:26 -0000	1.3
@@ -1 +1,2 @@
-clipsmm-0.0.7.tar.bz2
+clipsmm-0.1.0.tar.bz2
+clipsmm-0.1.0-doc.tar.bz2


Index: clipsmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-10/clipsmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- clipsmm.spec	4 Mar 2008 04:19:53 -0000	1.4
+++ clipsmm.spec	4 Aug 2009 19:32:26 -0000	1.5
@@ -1,44 +1,93 @@
-
-Summary:          Clipsmm is a C++ wrapper for the CLIPS C library
+%define clipsver 6.24
+Summary:          C++ interface to the CLIPS expert system C library
 Name:             clipsmm
-Version:          0.0.7
-Release:          4%{?dist}
-License:          GPLv2
+Version:          0.1.0
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://clipsmm.sourceforge.net
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/clipsmm/clipsmm-0.0.7.tar.bz2
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 boost-devel pkgconfig m4
+BuildRequires:    clips-devel >= %{clipsver} 
+BuildRequires:    glibmm24-devel >= 2.6.0 
+BuildRequires:    cppunit-devel >= 1.11 
+BuildRequires:    pkgconfig
+BuildRequires:    m4
 
 %description
 The clipsmm library provides a C++ interface to the CLIPS C library.
 
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
 %package          devel
-Summary:          Headers for developing programs that will use clipsmm
+Summary:          Headers for developing C++ applications with CLIPS
 Group:            Development/Libraries
-Requires:         clipsmm = %{version}-%{release}
-Requires:         clips-devel >= 6.24 glibmm24-devel >= 2.6.0 pkgconfig
+Requires:         %{name} = %{version}-%{release}
+Requires:         clips-devel >= %{clipsver} 
+Requires:         glibmm24-devel >= 2.6.0 
+Requires:         pkgconfig
 
 %description    devel
 This package contains the libraries and header files needed for
 developing clipsmm applications.
 
+clipsmm provides a C++ interface to the CLIPS C library.
+
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
+%package          doc
+Summary:          Documentation for the C++ clipsmm library
+Group:            Documentation
+Requires:         gtk-doc
+Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
+
+%description      doc
+This package contains developer's documentation for the clipsmm
+library. clipsmm provides C++ based bindings for the C based
+CLIPS library.
+
+The documentation can be viewed either through the devhelp
+documentation browser or through a web browser. 
+
+If using a web browser the documentation is installed in the gtk-doc
+hierarchy and can be found at /usr/share/gtk-doc/html/clipsmm-0.1
+
+CLIPS (C Language Integrated Production System) is an expert system
+development tool which provides a complete environment for the
+construction of rule and/or object based expert systems.
+
+Created in 1985 by NASA at the Johnson Space Center, CLIPS is now
+widely used throughout the government, industry, and academia.
+
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-static=no
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
-
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-# Copy the docs into a different place in the dist hierarchy so they
-# install as /usr/share/doc/package-x.x.x-devel/reference
-%{__cp} -ar docs/reference .
+
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/clipsmm-0.1/ doc/clipsmm-0.1.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -49,18 +98,31 @@ find %{buildroot} -type f -name "*.la" -
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libclipsmm.so.*
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/clipsmm*.pc
-%{_includedir}/clipsmm-0.0/
-%doc ChangeLog reference
+%{_libdir}/libclipsmm.so
+%{_libdir}/pkgconfig/clipsmm-1.0.pc
+%{_includedir}/clipsmm-0.1/
+%doc ChangeLog
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/clipsmm-0.1/
 
 
 %changelog
+* Mon Jul 27 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-1
+- New release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.7-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.0.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.0.7-4
 - Bump release for make-tag error
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clipsmm/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Nov 2006 04:57:20 -0000	1.2
+++ sources	4 Aug 2009 19:32:26 -0000	1.3
@@ -1 +1,2 @@
-462cad31023799926ab67f78b628e719  clipsmm-0.0.7.tar.bz2
+2d30edfbb57f03f010243a7f07d494a6  clipsmm-0.1.0.tar.bz2
+781296b7b85a8da9f0bce5a5248fe48e  clipsmm-0.1.0-doc.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 19:32:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 19:32:57 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.85-kde149705.patch, NONE,
	1.1 kdelibs-4.2.85-libexecdir.patch, NONE,
	1.1 kdelibs-4.2.96-parallel_devel.patch, NONE, 1.1 .cvsignore,
	1.66, 1.67 kdelibs.spec, 1.432, 1.433 sources, 1.81,
	1.82 kdelibs-4.0.85-libexecdir.patch, 1.1,
	NONE kdelibs-4.1.82-kde149705.patch, 1.1,
	NONE kdelibs-4.1.96-AllowExternalPaths.patch, 1.1,
	NONE kdelibs-4.1.96-cmake.patch, 1.1,
	NONE kdelibs-4.1.96-parallel_devel.patch, 1.2,
	NONE kdelibs-4.2.3-fixPopupForPlasmaboard.patch, 1.1,
	NONE kdelibs-4.2.4-cve-2009-0945.patch, 1.1,
	NONE kdelibs-4.2.4-cve-2009-1690.patch, 1.1,
	NONE kdelibs-4.2.4-cve-2009-2537-select-length.patch, 1.1,
	NONE kdelibs-4.2.98-cve-2009-1687.patch, 1.1,
	NONE kdelibs-4.2.98-cve-2009-1698.patch, 1.1,
	NONE kdelibs-4.2.98-cve-2009-1725.patch, 1.1, NONE
Message-ID: <20090804193257.D74F111C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7630

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.2.85-kde149705.patch kdelibs-4.2.85-libexecdir.patch 
	kdelibs-4.2.96-parallel_devel.patch 
Removed Files:
	kdelibs-4.0.85-libexecdir.patch kdelibs-4.1.82-kde149705.patch 
	kdelibs-4.1.96-AllowExternalPaths.patch 
	kdelibs-4.1.96-cmake.patch kdelibs-4.1.96-parallel_devel.patch 
	kdelibs-4.2.3-fixPopupForPlasmaboard.patch 
	kdelibs-4.2.4-cve-2009-0945.patch 
	kdelibs-4.2.4-cve-2009-1690.patch 
	kdelibs-4.2.4-cve-2009-2537-select-length.patch 
	kdelibs-4.2.98-cve-2009-1687.patch 
	kdelibs-4.2.98-cve-2009-1698.patch 
	kdelibs-4.2.98-cve-2009-1725.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0


kdelibs-4.2.85-kde149705.patch:
 kdeui/icons/kicontheme.cpp       |    2 +-
 kdeui/kernel/kglobalsettings.cpp |    2 +-
 kutils/kdeglobals.kcfg           |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.2.85-kde149705.patch ---
diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705	2009-04-15 12:26:44.000000000 +0200
+++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp	2009-05-11 16:01:29.000000000 +0200
@@ -525,7 +525,7 @@ QString KIconTheme::current()
     }
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) {
         *_theme = defaultThemeName();
     }
diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705	2009-03-27 15:47:33.000000000 +0100
+++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp	2009-05-11 16:00:06.000000000 +0200
@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
     if (kde_overrideStyle.isEmpty()) {
         const QString &defaultStyle = KStyle::defaultStyle();
         const KConfigGroup pConfig(KGlobal::config(), "General");
-        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
         if (styleStr.isEmpty() ||
                 // check whether we already use the correct style to return then
diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705	2009-04-15 12:26:45.000000000 +0200
+++ kdelibs-4.2.85/kutils/kdeglobals.kcfg	2009-05-11 16:00:06.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-4.2.85-libexecdir.patch:
 kdecore/kernel/kstandarddirs.cpp      |    2 +-
 kdecore/kernel/kstandarddirs_unix.cpp |    2 +-
 kdecore/tests/kstandarddirstest.cpp   |    5 +++--
 kio/tests/krununittest.cpp            |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-4.2.85-libexecdir.patch ---
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir	2009-05-06 05:14:38.000000000 -0500
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp	2009-05-14 11:34:04.732889142 -0500
@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
         addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
         index+=2;
     }
-    addResourceType("exe", "lib", "kde4/libexec", true );
+    addResourceType("exe", 0, "libexec/kde4", true );
 
     addResourceDir("home", QDir::homePath(), false);
 
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir	2008-05-21 06:08:57.000000000 -0500
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
             if (strcmp("lib", type) == 0)
                 return QString::fromLatin1(LIB_INSTALL_DIR "/");
             if (strcmp("libexec", type) == 0)
-                return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
+                return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
             if (strcmp("locale", type) == 0)
                 return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
             break;
diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir	2009-02-27 06:31:32.000000000 -0600
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
 #define KIOSLAVE "bin/kioslave.exe"
 #else
 #define EXT ""
-#define KIOSLAVE "kde4/libexec/kioslave"
+#define KIOSLAVE "libexec/kde4/kioslave"
 #endif
+
     const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
     QVERIFY( !bin.isEmpty() );
     QVERIFY( bin.endsWith( KIOSLAVE ) );
@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
     // findExe with a result in libexec
     const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
     QVERIFY( !lnusertemp.isEmpty() );
-    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
+    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); 
 #endif
 
     // Check the "exe" resource too
diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir	2008-05-21 06:08:08.000000000 -0500
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
     if (kmailservice.isEmpty()) kmailservice = "kmailservice";
     if (!kdeinit.isEmpty()) {
         QVERIFY(!kmailservice.isEmpty());
-        QVERIFY(kmailservice.contains("kde4/libexec"));
+        QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
     }
 
     QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;

kdelibs-4.2.96-parallel_devel.patch:
 cmake/modules/FindKDE4Internal.cmake        |   36 ++++++++++++++--------------
 doc/api/doxygen-preprocess-kcfg.sh          |    4 +--
 kdecore/kconfig_compiler/CMakeLists.txt     |    6 ++--
 kdecore/kconfig_compiler/checkkcfg.pl       |    4 +--
 kdeui/tests/kconfig_compiler/CMakeLists.txt |    2 -
 kdewidgets/CMakeLists.txt                   |   12 ++++-----
 6 files changed, 33 insertions(+), 31 deletions(-)

--- NEW FILE kdelibs-4.2.96-parallel_devel.patch ---
diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-07-08 16:41:09.000000000 +0200
+++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake	2009-07-13 16:32:48.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -129,7 +129,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -383,23 +383,23 @@ if (_kdeBootStrapping)
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -497,7 +497,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -510,12 +511,12 @@ else (_kdeBootStrapping)
 
    # get the build CONFIGURATIONS which were exported in this file, and use just the first
    # of them to get the location of the installed executables
-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${_firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${_firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${_firstConfig})
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -782,7 +783,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH}
                               "${KDE4_LIB_INSTALL_DIR}" )
 
 # under Windows dlls may be also installed in bin/
@@ -1166,9 +1168,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(AUTOMOC4_EXECUTABLE)
@@ -1187,7 +1189,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
    endif (NOT KDE4_INSTALLED_VERSION_OK)
 
    if (NOT KDE4_KCFGC_EXECUTABLE)
-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
    endif (NOT KDE4_KCFGC_EXECUTABLE)
 
    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh	2009-07-13 16:26:04.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-07-13 16:26:04.000000000 +0200
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -8,13 +8,13 @@ add_subdirectory( example )
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp
@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
 
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
      COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
-     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
+     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
 
    set(kde3supportwidgets_PART_SRCS
       classpreviews.cpp


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	30 May 2009 13:41:42 -0000	1.66
+++ .cvsignore	4 Aug 2009 19:32:57 -0000	1.67
@@ -1 +1,2 @@
-kdelibs-4.2.4.tar.bz2
+kdelibs-4.2.98.tar.bz2
+kdelibs-4.3.0.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -p -r1.432 -r1.433
--- kdelibs.spec	26 Jul 2009 05:28:18 -0000	1.432
+++ kdelibs.spec	4 Aug 2009 19:32:57 -0000	1.433
@@ -1,6 +1,10 @@
+%define phonon_ver 4.3.1
+%define soprano_ver 2.3.0
+%define strigi_ver 0.7
+
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.4
-Release: 6%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -12,10 +16,8 @@ Provides:  kdelibs4 = %{version}-%{relea
 Name: kdelibs4
 %endif
 
-# LGPLv2: everything, except (see below)
-# BSD: kdoctools/
-# GFDL: kdoctools/customization ?
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
@@ -45,17 +47,17 @@ Requires: kdelibs-common
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon%{?_isa} >= 4.3.0
-Requires: soprano%{?_isa} >= 2.2
-Requires: strigi-libs%{?_isa} >= 0.6.3
+Requires: phonon%{?_isa} >= %{phonon_ver} 
+Requires: soprano%{?_isa} >= %{soprano_ver} 
+Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
 
 Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.96-parallel_devel.patch
+Patch0: kdelibs-4.2.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-4.1.82-kde149705.patch
+Patch2: kdelibs-4.2.85-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -74,32 +76,13 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglob
 Patch11: kdelibs-4.1.72-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.0.85-libexecdir.patch
+Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch22: kdelibs-4.1.96-cmake.patch
-
-# upstreamable
-Patch50: kdelibs-4.2.3-fixPopupForPlasmaboard.patch
 
 # upstream
-# 4.2 branch
-# fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
-Patch100: kdelibs-4.2.4-cve-2009-1690.patch
-# fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
-Patch101: kdelibs-4.2.4-cve-2009-0945.patch
-
 # 4.3 branch
-Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix CVE-2009-2537 - select length DoS
-Patch201: kdelibs-4.2.4-cve-2009-2537-select-length.patch
-# fix CVE-2009-1725 - crash, possible ACE in numeric character references
-Patch202: kdelibs-4.2.98-cve-2009-1725.patch
-# fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
-Patch203: kdelibs-4.2.98-cve-2009-1687.patch
-# fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
-Patch204: kdelibs-4.2.98-cve-2009-1698.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -135,10 +118,10 @@ BuildRequires: libxslt-devel libxml2-dev
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.3.0
+BuildRequires: phonon-devel >= %{phonon_ver} 
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.2
-BuildRequires: strigi-devel >= 0.6.3
+BuildRequires: soprano-devel >= %{soprano_ver} 
+BuildRequires: strigi-devel >= %{strigi_ver} 
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
@@ -170,6 +153,9 @@ This package includes the common files f
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+# stuff moved, help upgrade path
+Conflicts: kdebase-runtime < 4.2.90
+Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
@@ -223,27 +209,14 @@ format for easy browsing.
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
-%patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch22 -p1 -b .kdepimlibs-cmake
-
-%patch50 -p1 -b .fixPopupForPlasmaboard
 
 # upstream patches
-# 4.2
-%patch100 -p0 -b .cve-2009-1690
-%patch101 -p0 -b .cve-2009-0945
-
 # 4.3
-%patch200 -p1 -b .AllowExternalPaths
-%patch201 -p1 -b .cve-2009-2537-select-length
-%patch202 -p0 -b .cve-2009-1725
-%patch203 -p1 -b .cve-2009-1687
-%patch204 -p1 -b .cve-2009-1698
 
 
 %build
@@ -426,37 +399,54 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-6
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-4
+- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
+
+* Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.98-3
+- fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references
-- fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
-- fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
+- fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
 - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
-- fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
+- fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
 
-* Thu Jul 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.4-5
-- CVE-2009-2537 - select length DoS
-- correct fixPopupForPlasmaboard.patch
+* Fri Jul 24 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.98-2
+- respun tarball, to fix KIO HTTP redirects
+- fix phonon/strigi versions
 
-* Wed Jul 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-4
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- soprano_ver 2.3.0
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Wed Jul 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-4
 - fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)
 
-* Mon Jun 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.4-3
-- fixPopupForPlasmaboard.patch
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- plasma animation crasher (kdebug#198338)
 
-* Mon Jun  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- respun tarball
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
+- up min versions, phonon, strigi, soprano (#509511)
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 rc1
 
-* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
-- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-2
-- better fix for strcasestr detection
+* Tue May 12 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- KDE-4.3 beta1 (4.2.85)
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
+- -devel: Provides: kdelibs4-devel%%{?_isa} ...
 
 * Tue Apr 28 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-13
 - upstream patch to fix GCC4.4 crashes in kjs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	1 Jun 2009 11:51:51 -0000	1.81
+++ sources	4 Aug 2009 19:32:57 -0000	1.82
@@ -1 +1 @@
-9ed29086c33bc73256a7fa5268df560b  kdelibs-4.2.4.tar.bz2
+ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2


--- kdelibs-4.0.85-libexecdir.patch DELETED ---


--- kdelibs-4.1.82-kde149705.patch DELETED ---


--- kdelibs-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdelibs-4.1.96-cmake.patch DELETED ---


--- kdelibs-4.1.96-parallel_devel.patch DELETED ---


--- kdelibs-4.2.3-fixPopupForPlasmaboard.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-0945.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-1690.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-2537-select-length.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1687.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1698.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1725.patch DELETED ---



From kasal at fedoraproject.org  Tue Aug  4 19:44:08 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  4 Aug 2009 19:44:08 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel perl-Devel-FindRef.spec,1.2,1.3
Message-ID: <20090804194408.9E50C11C00E4@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10070

Modified Files:
	perl-Devel-FindRef.spec 
Log Message:
- back out the previous rebuild


Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Devel-FindRef.spec	31 Jul 2009 16:13:57 -0000	1.2
+++ perl-Devel-FindRef.spec	4 Aug 2009 19:44:08 -0000	1.3
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Devel*.3*
 
 %changelog
+* Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> 1.42-3
+- back out the previous rebuild
+
 * Fri Jul 31 2009 Stepan Kasal <skasal at redhat.com> 1.42-2
 - rebuild against perl build without -DDEBUGGING
 



From kasal at fedoraproject.org  Tue Aug  4 19:44:34 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  4 Aug 2009 19:44:34 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel perl-Devel-FindRef.spec,1.3,1.4
Message-ID: <20090804194434.3568C11C00E4@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10186

Modified Files:
	perl-Devel-FindRef.spec 
Log Message:
- back out the previous rebuild


Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Devel-FindRef.spec	4 Aug 2009 19:44:08 -0000	1.3
+++ perl-Devel-FindRef.spec	4 Aug 2009 19:44:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries



From oget at fedoraproject.org  Tue Aug  4 19:50:39 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue,  4 Aug 2009 19:50:39 +0000 (UTC)
Subject: rpms/multimedia-menus/devel import.log, NONE,
	1.1 multimedia-menus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090804195039.3074611C034A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11649/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log multimedia-menus.spec 
Log Message:
* Tue Aug 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2-1
- Version bump with fixes in category names

* Sat Jul 25 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-2
- Correct Source0
- Add dist tag

* Sat Jul 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-1
- Initial build



--- NEW FILE import.log ---
multimedia-menus-0_2-1_fc11:HEAD:multimedia-menus-0.2-1.fc11.src.rpm:1249415416


--- NEW FILE multimedia-menus.spec ---
Name:           multimedia-menus
Version:        0.2
Release:        1%{?dist}
Summary:        Categorization for the GNOME/KDE Audio&Video/Multimedia menu
Group:          User Interface/Desktops
# Licensing of individual parts is explained in licensing.txt file
License:        GPLv2+ and LGPLv2+ and GPL+ and LGPLv2 and LGPLv3+ and GPLv2 and MIT
URL:            http://oget.fedorapeople.org/multimedia-menus/
Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       redhat-menus hicolor-icon-theme

%description
Categorized submenus for the GNOME/KDE Audio&Video/Multimedia menu, for better
usuability and easy access of multimedia applications.


%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
install -p -m 644 multimedia-categories.menu \
  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
cp -a desktop-directories/ $RPM_BUILD_ROOT%{_datadir}/
cp -a icons/* $RPM_BUILD_ROOT%{_datadir}/icons/


%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 changelog.txt licensing.txt COPYING*
%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/multimedia-categories.menu
%{_datadir}/desktop-directories/multimedia-*.directory
%{_datadir}/icons/hicolor/*/apps/multimedia-*.png


%changelog
* Tue Aug 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2-1
- Version bump with fixes in category names

* Sat Jul 25 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-2
- Correct Source0
- Add dist tag

* Sat Jul 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Jul 2009 04:39:42 -0000	1.1
+++ .cvsignore	4 Aug 2009 19:50:38 -0000	1.2
@@ -0,0 +1 @@
+multimedia-menus-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Jul 2009 04:39:42 -0000	1.1
+++ sources	4 Aug 2009 19:50:38 -0000	1.2
@@ -0,0 +1 @@
+6a44ac53f4ef4071d06cc8c49dd6b5a7  multimedia-menus-0.2.tar.bz2



From oget at fedoraproject.org  Tue Aug  4 19:51:45 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue,  4 Aug 2009 19:51:45 +0000 (UTC)
Subject: rpms/multimedia-menus/F-11 import.log, NONE,
	1.1 multimedia-menus.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090804195145.6307611C00E4@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/multimedia-menus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12061/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log multimedia-menus.spec 
Log Message:
* Tue Aug 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2-1
- Version bump with fixes in category names

* Sat Jul 25 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-2
- Correct Source0
- Add dist tag

* Sat Jul 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-1
- Initial build



--- NEW FILE import.log ---
multimedia-menus-0_2-1_fc11:F-11:multimedia-menus-0.2-1.fc11.src.rpm:1249415485


--- NEW FILE multimedia-menus.spec ---
Name:           multimedia-menus
Version:        0.2
Release:        1%{?dist}
Summary:        Categorization for the GNOME/KDE Audio&Video/Multimedia menu
Group:          User Interface/Desktops
# Licensing of individual parts is explained in licensing.txt file
License:        GPLv2+ and LGPLv2+ and GPL+ and LGPLv2 and LGPLv3+ and GPLv2 and MIT
URL:            http://oget.fedorapeople.org/multimedia-menus/
Source0:        http://oget.fedorapeople.org/multimedia-menus/SOURCE/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       redhat-menus hicolor-icon-theme

%description
Categorized submenus for the GNOME/KDE Audio&Video/Multimedia menu, for better
usuability and easy access of multimedia applications.


%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
install -p -m 644 multimedia-categories.menu \
  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/
cp -a desktop-directories/ $RPM_BUILD_ROOT%{_datadir}/
cp -a icons/* $RPM_BUILD_ROOT%{_datadir}/icons/


%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 changelog.txt licensing.txt COPYING*
%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/multimedia-categories.menu
%{_datadir}/desktop-directories/multimedia-*.directory
%{_datadir}/icons/hicolor/*/apps/multimedia-*.png


%changelog
* Tue Aug 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.2-1
- Version bump with fixes in category names

* Sat Jul 25 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-2
- Correct Source0
- Add dist tag

* Sat Jul 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Jul 2009 04:39:42 -0000	1.1
+++ .cvsignore	4 Aug 2009 19:51:45 -0000	1.2
@@ -0,0 +1 @@
+multimedia-menus-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multimedia-menus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Jul 2009 04:39:42 -0000	1.1
+++ sources	4 Aug 2009 19:51:45 -0000	1.2
@@ -0,0 +1 @@
+6a44ac53f4ef4071d06cc8c49dd6b5a7  multimedia-menus-0.2.tar.bz2



From hno at fedoraproject.org  Tue Aug  4 19:56:19 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue,  4 Aug 2009 19:56:19 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.46, 1.47 sources, 1.49,
	1.50 squid.spec, 1.132, 1.133
Message-ID: <20090804195619.70F6A11C00E4@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13792

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	1 Aug 2009 11:26:45 -0000	1.46
+++ .cvsignore	4 Aug 2009 19:56:19 -0000	1.47
@@ -1,4 +1 @@
-squid-3.0.STABLE17.tar.bz2
-b9080.patch
-b9081.patch
-b9082.patch
+squid-3.0.STABLE18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	1 Aug 2009 11:26:45 -0000	1.49
+++ sources	4 Aug 2009 19:56:19 -0000	1.50
@@ -1,4 +1 @@
-68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
-b176387a9afcef85ef6467845c999f34  b9080.patch
-5948038b5629a9babd9f56ae1a25363e  b9081.patch
-345873eb1e301a6aa3e70ae8708d0c43  b9082.patch
+ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- squid.spec	1 Aug 2009 11:26:45 -0000	1.132
+++ squid.spec	4 Aug 2009 19:56:19 -0000	1.133
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE17
-Release:  3%{?dist}
+Version:  3.0.STABLE18
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,9 +22,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
 
 
 # External patches
@@ -63,9 +60,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .b9080
-%patch002 -p0 -b .b9081
-%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -347,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
+- Update to 3.0.STABLE18
+
 * Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
 - Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
 



From hno at fedoraproject.org  Tue Aug  4 19:58:16 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue,  4 Aug 2009 19:58:16 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.44, 1.45 sources, 1.47,
	1.48 squid.spec, 1.124, 1.125
Message-ID: <20090804195816.7092711C00E4@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14325

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	1 Aug 2009 11:42:34 -0000	1.44
+++ .cvsignore	4 Aug 2009 19:58:16 -0000	1.45
@@ -1,4 +1 @@
-squid-3.0.STABLE17.tar.bz2
-b9080.patch
-b9081.patch
-b9082.patch
+squid-3.0.STABLE18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	1 Aug 2009 11:42:35 -0000	1.47
+++ sources	4 Aug 2009 19:58:16 -0000	1.48
@@ -1,4 +1 @@
-68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
-b176387a9afcef85ef6467845c999f34  b9080.patch
-5948038b5629a9babd9f56ae1a25363e  b9081.patch
-345873eb1e301a6aa3e70ae8708d0c43  b9082.patch
+ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- squid.spec	1 Aug 2009 11:42:35 -0000	1.124
+++ squid.spec	4 Aug 2009 19:58:16 -0000	1.125
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE17
-Release:  3%{?dist}
+Version:  3.0.STABLE18
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,9 +22,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
 
 
 # External patches
@@ -63,9 +60,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .b9080
-%patch002 -p0 -b .b9081
-%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -347,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
+- Update to 3.0.STABLE18
+
 * Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
 - Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
 



From hno at fedoraproject.org  Tue Aug  4 19:59:26 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue,  4 Aug 2009 19:59:26 +0000 (UTC)
Subject: rpms/squid/F-10 .cvsignore, 1.42, 1.43 sources, 1.46,
	1.47 squid.spec, 1.119, 1.120
Message-ID: <20090804195926.78D1511C00E4@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	1 Aug 2009 11:45:07 -0000	1.42
+++ .cvsignore	4 Aug 2009 19:59:26 -0000	1.43
@@ -1,4 +1 @@
-squid-3.0.STABLE17.tar.bz2
-b9080.patch
-b9081.patch
-b9082.patch
+squid-3.0.STABLE18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	1 Aug 2009 11:45:07 -0000	1.46
+++ sources	4 Aug 2009 19:59:26 -0000	1.47
@@ -1,4 +1 @@
-68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
-b176387a9afcef85ef6467845c999f34  b9080.patch
-5948038b5629a9babd9f56ae1a25363e  b9081.patch
-345873eb1e301a6aa3e70ae8708d0c43  b9082.patch
+ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- squid.spec	1 Aug 2009 11:44:28 -0000	1.119
+++ squid.spec	4 Aug 2009 19:59:26 -0000	1.120
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE17
-Release:  3%{?dist}
+Version:  3.0.STABLE18
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,9 +22,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
 
 
 # External patches
@@ -63,9 +60,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .b9080
-%patch002 -p0 -b .b9081
-%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -347,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
+- Update to 3.0.STABLE18
+
 * Sat Aug 01 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE17-3
 - Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"
 



From dcbw at fedoraproject.org  Tue Aug  4 20:02:08 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Tue,  4 Aug 2009 20:02:08 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.105,
	1.106 NetworkManager.spec, 1.280, 1.281 sources, 1.144, 1.145
Message-ID: <20090804200208.75DC611C00E4@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15321

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Tue Aug  4 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-1.git20090804
- nm: IPv6 support for manual & router-advertisement modes




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	28 Jul 2009 15:35:11 -0000	1.105
+++ .cvsignore	4 Aug 2009 20:02:07 -0000	1.106
@@ -155,3 +155,5 @@ NetworkManager-0.7.1.git20090414.tar.bz2
 network-manager-applet-0.7.1.tar.bz2
 NetworkManager-0.7.995.git20090728.tar.bz2
 network-manager-applet-0.7.995.git20090728.tar.bz2
+NetworkManager-0.7.995.git20090804.tar.bz2
+network-manager-applet-0.7.995.git20090804.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- NetworkManager.spec	2 Aug 2009 05:35:09 -0000	1.280
+++ NetworkManager.spec	4 Aug 2009 20:02:07 -0000	1.281
@@ -8,8 +8,8 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090728
-%define applet_snapshot .git20090728
+%define snapshot .git20090804
+%define applet_snapshot .git20090804
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -323,6 +323,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Aug  4 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-1.git20090804
+- nm: IPv6 support for manual & router-advertisement modes
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 0.7.995-1.git20090728
 - Move some big docs to -devel to save space
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- sources	28 Jul 2009 15:35:12 -0000	1.144
+++ sources	4 Aug 2009 20:02:08 -0000	1.145
@@ -1,2 +1,2 @@
-e171cb1a36402cfa749efe54d72f8713  NetworkManager-0.7.995.git20090728.tar.bz2
-5b5496c43ad1b0a257010f38f2d0b6d4  network-manager-applet-0.7.995.git20090728.tar.bz2
+18140c0555929b27f1e382f9b006d267  NetworkManager-0.7.995.git20090804.tar.bz2
+40f582f9bad42e4f4d4b5e582626c0d7  network-manager-applet-0.7.995.git20090804.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 20:02:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 20:02:12 +0000 (UTC)
Subject: rpms/PyQt4/F-11 PyQt-x11-gpl-4.5.1-pyuic_shebang.patch, NONE,
	1.1 PyQt-x11-gpl-4.5.2-QT_SHARED.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 PyQt4.spec, 1.23, 1.24 sources, 1.9,
	1.10 PyQt-x11-gpl-4.4.4-QT_SHARED.patch, 1.1, NONE
Message-ID: <20090804200212.A4CA811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15393

Modified Files:
	.cvsignore PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.5.1-pyuic_shebang.patch 
	PyQt-x11-gpl-4.5.2-QT_SHARED.patch 
Removed Files:
	PyQt-x11-gpl-4.4.4-QT_SHARED.patch 
Log Message:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
- PyQt4-4.5.4


PyQt-x11-gpl-4.5.1-pyuic_shebang.patch:
 pyuic.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE PyQt-x11-gpl-4.5.1-pyuic_shebang.patch ---
diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py
--- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang	2009-06-16 03:37:46.000000000 -0500
+++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py	2009-07-02 14:01:44.218147410 -0500
@@ -1,3 +1,5 @@
+#!/usr/bin/python -tt
+
 import sys
 import optparse
 

PyQt-x11-gpl-4.5.2-QT_SHARED.patch:
 configure.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE PyQt-x11-gpl-4.5.2-QT_SHARED.patch ---
diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py
--- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED	2009-07-16 08:34:48.419358104 -0500
+++ PyQt-x11-gpl-4.5.2/configure.py	2009-07-16 08:34:54.260358064 -0500
@@ -1679,11 +1679,11 @@ int main(int, char **)
 
     out << QLibraryInfo::licensee() << '\\n';
 
-#if defined(QT_SHARED) || defined(QT_DLL)
+//#if defined(QT_SHARED) || defined(QT_DLL)
     out << "shared\\n";
-#else
-    out << "\\n";
-#endif
+//#else
+//    out << "\\n";
+//#endif
 
     // Determine which features should be disabled.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	27 Jun 2009 02:54:46 -0000	1.9
+++ .cvsignore	4 Aug 2009 20:02:12 -0000	1.10
@@ -1 +1 @@
-PyQt-x11-gpl-4.5.1.tar.gz
+PyQt-x11-gpl-4.5.4.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/PyQt4.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- PyQt4.spec	27 Jun 2009 02:54:46 -0000	1.23
+++ PyQt4.spec	4 Aug 2009 20:02:12 -0000	1.24
@@ -3,7 +3,7 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.5.1
+Version: 4.5.4
 Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
@@ -16,7 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
-Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
+Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
+Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -31,7 +32,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.1
+BuildRequires: sip-devel >= 4.8.2
 %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
@@ -60,9 +61,12 @@ of the Qt4 classes (e.g. KDE or your own
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
+%patch4 -p1 
 
+## permissions
 # mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
+chmod a+rx pyuic/uic/pyuic.py
 
 
 %build
@@ -84,7 +88,6 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
 # fix/remove rpaths
-
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
 
@@ -97,17 +100,12 @@ chrpath --delete %{buildroot}%{python_si
 chrpath --list   %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
 chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
 
-# non-executable script
-chmod 755 %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
-
-# missing shebang
-cp -a %{buildroot}%{_bindir}/pyuic4 %{buildroot}%{_bindir}/pyuic4.ORIG
-cat > %{buildroot}%{_bindir}/pyuic4 <<EOF
-#!/bin/sh
-
-EOF
-cat %{buildroot}%{_bindir}/pyuic4.ORIG >> %{buildroot}%{_bindir}/pyuic4
-rm -f %{buildroot}%{_bindir}/pyuic4.ORIG
+# HACK: fix multilb conflict, http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pyuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py \
+   %{buildroot}%{_bindir}/pyuic4
+ln -s %{_bindir}/pyuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
 
 %clean
@@ -121,6 +119,7 @@ rm -rf %{buildroot}
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
 %{python_sitearch}/PyQt4/
+%exclude %{python_sitearch}/PyQt4/uic/pyuic.py*
 # fixme?  -> sitearch?  -- Rex
 %{python_sitelib}/dbus/mainloop/qt.so
 %{_qt4_plugindir}/designer/*
@@ -129,12 +128,28 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc doc/*
 %doc examples/
-%{_bindir}/*
+%{_bindir}/pylupdate4
+%{_bindir}/pyrcc4
+%{_bindir}/pyuic4
+%{python_sitearch}/PyQt4/uic/pyuic.py*
 %{_datadir}/sip/PyQt4/
 %{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 
 %changelog
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
+- PyQt4-4.5.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-1
+- PyQt4-4.5.2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-2
+- fix build with qt-4.5.2
+- PyQt4-devel multilib conflict (#509415)
+
 * Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-1
 - PyQt-4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Jun 2009 02:54:46 -0000	1.9
+++ sources	4 Aug 2009 20:02:12 -0000	1.10
@@ -1 +1 @@
-80e877799ae8fb82f137c43fda18bff5  PyQt-x11-gpl-4.5.1.tar.gz
+b721266d14c450dd7045025e042819ec  PyQt-x11-gpl-4.5.4.tar.gz


--- PyQt-x11-gpl-4.4.4-QT_SHARED.patch DELETED ---



From rdieter at fedoraproject.org  Tue Aug  4 20:03:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 20:03:09 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.2.85-kde149705.patch, NONE,
	1.1 kdelibs-4.2.85-libexecdir.patch, NONE,
	1.1 kdelibs-4.2.96-parallel_devel.patch, NONE, 1.1 .cvsignore,
	1.73, 1.74 kdelibs.spec, 1.486, 1.487 sources, 1.90,
	1.91 kde4-QT_PLUGIN_PATH.csh, 1.1, NONE kde4-QT_PLUGIN_PATH.sh,
	1.1, NONE kdelibs-4.0.85-libexecdir.patch, 1.1,
	NONE kdelibs-4.1.82-kde149705.patch, 1.2,
	NONE kdelibs-4.1.96-AllowExternalPaths.patch, 1.1,
	NONE kdelibs-4.1.96-cmake.patch, 1.2,
	NONE kdelibs-4.1.96-parallel_devel.patch, 1.3,
	NONE kdelibs-4.2.3-fixPopupForPlasmaboard.patch, 1.1,
	NONE kdelibs-4.2.4-cve-2009-0945.patch, 1.1,
	NONE kdelibs-4.2.4-cve-2009-1690.patch, 1.1,
	NONE kdelibs-4.2.4-cve-2009-2537-select-length.patch, 1.1,
	NONE kdelibs-4.2.98-cve-2009-1687.patch, 1.1,
	NONE kdelibs-4.2.98-cve-2009-1698.patch, 1.1,
	NONE kdelibs-4.2.98-cve-2009-1725.patch, 1.1, NONE
Message-ID: <20090804200309.1ABD811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15717

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.2.85-kde149705.patch kdelibs-4.2.85-libexecdir.patch 
	kdelibs-4.2.96-parallel_devel.patch 
Removed Files:
	kde4-QT_PLUGIN_PATH.csh kde4-QT_PLUGIN_PATH.sh 
	kdelibs-4.0.85-libexecdir.patch kdelibs-4.1.82-kde149705.patch 
	kdelibs-4.1.96-AllowExternalPaths.patch 
	kdelibs-4.1.96-cmake.patch kdelibs-4.1.96-parallel_devel.patch 
	kdelibs-4.2.3-fixPopupForPlasmaboard.patch 
	kdelibs-4.2.4-cve-2009-0945.patch 
	kdelibs-4.2.4-cve-2009-1690.patch 
	kdelibs-4.2.4-cve-2009-2537-select-length.patch 
	kdelibs-4.2.98-cve-2009-1687.patch 
	kdelibs-4.2.98-cve-2009-1698.patch 
	kdelibs-4.2.98-cve-2009-1725.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0


kdelibs-4.2.85-kde149705.patch:
 kdeui/icons/kicontheme.cpp       |    2 +-
 kdeui/kernel/kglobalsettings.cpp |    2 +-
 kutils/kdeglobals.kcfg           |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.2.85-kde149705.patch ---
diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705	2009-04-15 12:26:44.000000000 +0200
+++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp	2009-05-11 16:01:29.000000000 +0200
@@ -525,7 +525,7 @@ QString KIconTheme::current()
     }
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) {
         *_theme = defaultThemeName();
     }
diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705	2009-03-27 15:47:33.000000000 +0100
+++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp	2009-05-11 16:00:06.000000000 +0200
@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
     if (kde_overrideStyle.isEmpty()) {
         const QString &defaultStyle = KStyle::defaultStyle();
         const KConfigGroup pConfig(KGlobal::config(), "General");
-        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
         if (styleStr.isEmpty() ||
                 // check whether we already use the correct style to return then
diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705	2009-04-15 12:26:45.000000000 +0200
+++ kdelibs-4.2.85/kutils/kdeglobals.kcfg	2009-05-11 16:00:06.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-4.2.85-libexecdir.patch:
 kdecore/kernel/kstandarddirs.cpp      |    2 +-
 kdecore/kernel/kstandarddirs_unix.cpp |    2 +-
 kdecore/tests/kstandarddirstest.cpp   |    5 +++--
 kio/tests/krununittest.cpp            |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-4.2.85-libexecdir.patch ---
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir	2009-05-06 05:14:38.000000000 -0500
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp	2009-05-14 11:34:04.732889142 -0500
@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
         addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
         index+=2;
     }
-    addResourceType("exe", "lib", "kde4/libexec", true );
+    addResourceType("exe", 0, "libexec/kde4", true );
 
     addResourceDir("home", QDir::homePath(), false);
 
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir	2008-05-21 06:08:57.000000000 -0500
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
             if (strcmp("lib", type) == 0)
                 return QString::fromLatin1(LIB_INSTALL_DIR "/");
             if (strcmp("libexec", type) == 0)
-                return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
+                return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
             if (strcmp("locale", type) == 0)
                 return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
             break;
diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir	2009-02-27 06:31:32.000000000 -0600
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
 #define KIOSLAVE "bin/kioslave.exe"
 #else
 #define EXT ""
-#define KIOSLAVE "kde4/libexec/kioslave"
+#define KIOSLAVE "libexec/kde4/kioslave"
 #endif
+
     const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
     QVERIFY( !bin.isEmpty() );
     QVERIFY( bin.endsWith( KIOSLAVE ) );
@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
     // findExe with a result in libexec
     const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
     QVERIFY( !lnusertemp.isEmpty() );
-    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
+    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); 
 #endif
 
     // Check the "exe" resource too
diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir	2008-05-21 06:08:08.000000000 -0500
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
     if (kmailservice.isEmpty()) kmailservice = "kmailservice";
     if (!kdeinit.isEmpty()) {
         QVERIFY(!kmailservice.isEmpty());
-        QVERIFY(kmailservice.contains("kde4/libexec"));
+        QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
     }
 
     QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;

kdelibs-4.2.96-parallel_devel.patch:
 cmake/modules/FindKDE4Internal.cmake        |   36 ++++++++++++++--------------
 doc/api/doxygen-preprocess-kcfg.sh          |    4 +--
 kdecore/kconfig_compiler/CMakeLists.txt     |    6 ++--
 kdecore/kconfig_compiler/checkkcfg.pl       |    4 +--
 kdeui/tests/kconfig_compiler/CMakeLists.txt |    2 -
 kdewidgets/CMakeLists.txt                   |   12 ++++-----
 6 files changed, 33 insertions(+), 31 deletions(-)

--- NEW FILE kdelibs-4.2.96-parallel_devel.patch ---
diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-07-08 16:41:09.000000000 +0200
+++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake	2009-07-13 16:32:48.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -129,7 +129,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -383,23 +383,23 @@ if (_kdeBootStrapping)
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -497,7 +497,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -510,12 +511,12 @@ else (_kdeBootStrapping)
 
    # get the build CONFIGURATIONS which were exported in this file, and use just the first
    # of them to get the location of the installed executables
-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${_firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${_firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${_firstConfig})
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -782,7 +783,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH}
                               "${KDE4_LIB_INSTALL_DIR}" )
 
 # under Windows dlls may be also installed in bin/
@@ -1166,9 +1168,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(AUTOMOC4_EXECUTABLE)
@@ -1187,7 +1189,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
    endif (NOT KDE4_INSTALLED_VERSION_OK)
 
    if (NOT KDE4_KCFGC_EXECUTABLE)
-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
    endif (NOT KDE4_KCFGC_EXECUTABLE)
 
    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh	2009-07-13 16:26:04.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-07-13 16:26:04.000000000 +0200
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -8,13 +8,13 @@ add_subdirectory( example )
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp
@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
 
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
      COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
-     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
+     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
 
    set(kde3supportwidgets_PART_SRCS
       classpreviews.cpp


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	30 May 2009 13:41:42 -0000	1.73
+++ .cvsignore	4 Aug 2009 20:03:07 -0000	1.74
@@ -1 +1,2 @@
-kdelibs-4.2.4.tar.bz2
+kdelibs-4.2.98.tar.bz2
+kdelibs-4.3.0.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -p -r1.486 -r1.487
--- kdelibs.spec	26 Jul 2009 04:20:01 -0000	1.486
+++ kdelibs.spec	4 Aug 2009 20:03:08 -0000	1.487
@@ -1,6 +1,10 @@
+%define phonon_ver 4.3.1
+%define soprano_ver 2.3.0
+%define strigi_ver 0.7
+
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.4
-Release: 6%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -12,10 +16,8 @@ Provides:  kdelibs4 = %{version}-%{relea
 Name: kdelibs4
 %endif
 
-# LGPLv2: everything, except (see below)
-# BSD: kdoctools/
-# GFDL: kdoctools/customization ?
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
@@ -45,17 +47,17 @@ Requires: kdelibs-common
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon%{?_isa} >= 4.3.0
-Requires: soprano%{?_isa} >= 2.2
-Requires: strigi-libs%{?_isa} >= 0.6.3
+Requires: phonon%{?_isa} >= %{phonon_ver} 
+Requires: soprano%{?_isa} >= %{soprano_ver} 
+Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
 
 Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.96-parallel_devel.patch
+Patch0: kdelibs-4.2.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-4.1.82-kde149705.patch
+Patch2: kdelibs-4.2.85-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -74,32 +76,13 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglob
 Patch11: kdelibs-4.1.72-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.0.85-libexecdir.patch
+Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch22: kdelibs-4.1.96-cmake.patch
-
-# upstreamable
-Patch50: kdelibs-4.2.3-fixPopupForPlasmaboard.patch
 
 # upstream
-# 4.2 branch
-# fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
-Patch100: kdelibs-4.2.4-cve-2009-1690.patch
-# fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
-Patch101: kdelibs-4.2.4-cve-2009-0945.patch
-
 # 4.3 branch
-Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix CVE-2009-2537 - select length DoS
-Patch201: kdelibs-4.2.4-cve-2009-2537-select-length.patch
-# fix CVE-2009-1725 - crash, possible ACE in numeric character references
-Patch202: kdelibs-4.2.98-cve-2009-1725.patch
-# fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
-Patch203: kdelibs-4.2.98-cve-2009-1687.patch
-# fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
-Patch204: kdelibs-4.2.98-cve-2009-1698.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -135,10 +118,10 @@ BuildRequires: libxslt-devel libxml2-dev
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.3.0
+BuildRequires: phonon-devel >= %{phonon_ver} 
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.2
-BuildRequires: strigi-devel >= 0.6.3
+BuildRequires: soprano-devel >= %{soprano_ver} 
+BuildRequires: strigi-devel >= %{strigi_ver} 
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
@@ -170,6 +153,9 @@ This package includes the common files f
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+# stuff moved, help upgrade path
+Conflicts: kdebase-runtime < 4.2.90
+Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
@@ -223,27 +209,14 @@ format for easy browsing.
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
-%patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch22 -p1 -b .kdepimlibs-cmake
-
-%patch50 -p1 -b .fixPopupForPlasmaboard
 
 # upstream patches
-# 4.2
-%patch100 -p0 -b .cve-2009-1690
-%patch101 -p0 -b .cve-2009-0945
-
 # 4.3
-%patch200 -p1 -b .AllowExternalPaths
-%patch201 -p1 -b .cve-2009-2537-select-length
-%patch202 -p0 -b .cve-2009-1725
-%patch203 -p1 -b .cve-2009-1687
-%patch204 -p1 -b .cve-2009-1698
 
 
 %build
@@ -426,37 +399,54 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-6
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-4
+- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
+
+* Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.98-3
+- fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references
-- fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
-- fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
+- fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
 - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
-- fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
+- fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
 
-* Thu Jul 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.4-5
-- CVE-2009-2537 - select length DoS
-- correct fixPopupForPlasmaboard.patch
+* Fri Jul 24 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.98-2
+- respun tarball, to fix KIO HTTP redirects
+- fix phonon/strigi versions
 
-* Wed Jul 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-4
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- soprano_ver 2.3.0
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Wed Jul 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-4
 - fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)
 
-* Mon Jun 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.4-3
-- fixPopupForPlasmaboard.patch
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- plasma animation crasher (kdebug#198338)
 
-* Mon Jun  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- respun tarball
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
+- up min versions, phonon, strigi, soprano (#509511)
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 rc1
 
-* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
-- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-2
-- better fix for strcasestr detection
+* Tue May 12 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- KDE-4.3 beta1 (4.2.85)
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
+- -devel: Provides: kdelibs4-devel%%{?_isa} ...
 
 * Tue Apr 28 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-13
 - upstream patch to fix GCC4.4 crashes in kjs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	1 Jun 2009 11:51:52 -0000	1.90
+++ sources	4 Aug 2009 20:03:08 -0000	1.91
@@ -1 +1 @@
-9ed29086c33bc73256a7fa5268df560b  kdelibs-4.2.4.tar.bz2
+ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2


--- kde4-QT_PLUGIN_PATH.csh DELETED ---


--- kde4-QT_PLUGIN_PATH.sh DELETED ---


--- kdelibs-4.0.85-libexecdir.patch DELETED ---


--- kdelibs-4.1.82-kde149705.patch DELETED ---


--- kdelibs-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdelibs-4.1.96-cmake.patch DELETED ---


--- kdelibs-4.1.96-parallel_devel.patch DELETED ---


--- kdelibs-4.2.3-fixPopupForPlasmaboard.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-0945.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-1690.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-2537-select-length.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1687.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1698.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1725.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug  4 20:20:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:20:32 +0000
Subject: [pkgdb] sugar-turtleart: fab has requested commit
Message-ID: <20090804202032.C620010F879@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-turtleart (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Tue Aug  4 20:20:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:20:36 +0000
Subject: [pkgdb] sugar-turtleart: fab has requested commit
Message-ID: <20090804202036.9F6CA10F8A0@bastion2.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-turtleart (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From kasal at fedoraproject.org  Tue Aug  4 20:24:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  4 Aug 2009 20:24:05 +0000 (UTC)
Subject: rpms/perl-Bit-Vector/devel .cvsignore, 1.5, 1.6 perl-Bit-Vector.spec,
	1.28, 1.29 sources, 1.6, 1.7
Message-ID: <20090804202405.AB52311C00E4@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-serv20748

Modified Files:
	.cvsignore perl-Bit-Vector.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 21:52:47 -0000	1.5
+++ .cvsignore	4 Aug 2009 20:24:05 -0000	1.6
@@ -1 +1 @@
-Bit-Vector-6.4.tar.gz
+Bit-Vector-6.6.tar.gz


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- perl-Bit-Vector.spec	26 Jul 2009 03:51:37 -0000	1.28
+++ perl-Bit-Vector.spec	4 Aug 2009 20:24:05 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           perl-Bit-Vector
-Version:        6.4
-Release:        10%{?dist}
+Version:        6.6
+Release:        1%{?dist}
 Summary:        Efficient bit vector, set of integers and "big int" math library
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/S/ST/STBEY/Bit-Vector-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl(Carp::Clan) >= 5.3
+BuildRequires:  perl(Carp::Clan) >= 5.4
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> - 6.6-1
+- new upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Apr 2005 21:52:47 -0000	1.6
+++ sources	4 Aug 2009 20:24:05 -0000	1.7
@@ -1 +1 @@
-681433ff4f0b4da95dc5c560b7f5cc31  Bit-Vector-6.4.tar.gz
+5d7adec95898d7ba23e7a2ce6ae80df7  Bit-Vector-6.6.tar.gz



From pkgdb at fedoraproject.org  Tue Aug  4 20:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:45 +0000
Subject: [pkgdb] znc-extra was added for nb
Message-ID: <20090804202645.531E210F882@bastion2.fedora.phx.redhat.com>

tibbs has added Package znc-extra with summary Extra modules for ZNC - an IRC bouncer
tibbs has approved Package znc-extra
tibbs has added a Fedora devel branch for znc-extra with an owner of nb
tibbs has approved znc-extra in Fedora devel
tibbs has approved Package znc-extra
tibbs has set commit to Approved for 107427 on znc-extra (Fedora devel)
tibbs has set checkout to Approved for 107427 on znc-extra (Fedora devel)
tibbs has set build to Approved for 107427 on znc-extra (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Tue Aug  4 20:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:46 +0000
Subject: [pkgdb] znc-extra summary updated by tibbs
Message-ID: <20090804202646.CBEA610F8A2@bastion2.fedora.phx.redhat.com>

tibbs set package znc-extra summary to Extra modules for ZNC - an IRC bouncer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Tue Aug  4 20:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:46 +0000
Subject: [pkgdb] znc-extra (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804202646.F21BD10F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for znc-extra
tibbs has set commit to Approved for 107427 on znc-extra (Fedora 11)
tibbs has set checkout to Approved for 107427 on znc-extra (Fedora 11)
tibbs has set build to Approved for 107427 on znc-extra (Fedora 11)
tibbs approved watchbugzilla on znc-extra (Fedora 11) for nb
tibbs approved watchcommits on znc-extra (Fedora 11) for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Tue Aug  4 20:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:46 +0000
Subject: [pkgdb] znc-extra (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804202647.3D4D810F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for znc-extra
tibbs has set commit to Approved for 107427 on znc-extra (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on znc-extra (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on znc-extra (Fedora EPEL 5)
tibbs approved watchbugzilla on znc-extra (Fedora EPEL 5) for nb
tibbs approved watchcommits on znc-extra (Fedora EPEL 5) for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Tue Aug  4 20:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:46 +0000
Subject: [pkgdb] znc-extra (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804202647.9087910F8B5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for znc-extra
tibbs has set commit to Approved for 107427 on znc-extra (Fedora 10)
tibbs has set checkout to Approved for 107427 on znc-extra (Fedora 10)
tibbs has set build to Approved for 107427 on znc-extra (Fedora 10)
tibbs approved watchbugzilla on znc-extra (Fedora 10) for nb
tibbs approved watchcommits on znc-extra (Fedora 10) for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Tue Aug  4 20:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:46 +0000
Subject: [pkgdb] znc-extra (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804202647.D6F1910F8B8@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on znc-extra (Fedora devel) for nb
tibbs approved watchcommits on znc-extra (Fedora devel) for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From tibbs at fedoraproject.org  Tue Aug  4 20:26:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:26:53 +0000 (UTC)
Subject: rpms/znc-extra - New directory
Message-ID: <20090804202653.2655111C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/znc-extra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsC21612/rpms/znc-extra

Log Message:
Directory /cvs/pkgs/rpms/znc-extra added to the repository




From pkgdb at fedoraproject.org  Tue Aug  4 20:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:26:46 +0000
Subject: [pkgdb] znc-extra (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804202648.3A6A210F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for znc-extra
tibbs has set commit to Approved for 107427 on znc-extra (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on znc-extra (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on znc-extra (Fedora EPEL 4)
tibbs approved watchbugzilla on znc-extra (Fedora EPEL 4) for nb
tibbs approved watchcommits on znc-extra (Fedora EPEL 4) for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From tibbs at fedoraproject.org  Tue Aug  4 20:26:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:26:53 +0000 (UTC)
Subject: rpms/znc-extra/devel - New directory
Message-ID: <20090804202653.438C711C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/znc-extra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsC21612/rpms/znc-extra/devel

Log Message:
Directory /cvs/pkgs/rpms/znc-extra/devel added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:26:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:26:59 +0000 (UTC)
Subject: rpms/znc-extra Makefile,NONE,1.1
Message-ID: <20090804202659.55A2411C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/znc-extra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsC21612/rpms/znc-extra

Added Files:
	Makefile 
Log Message:
Setup of module znc-extra


--- NEW FILE Makefile ---
# Top level Makefile for module znc-extra
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Aug  4 20:26:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:26:59 +0000 (UTC)
Subject: rpms/znc-extra/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090804202659.8603A11C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/znc-extra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsC21612/rpms/znc-extra/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module znc-extra


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: znc-extra
# $Id: Makefile,v 1.1 2009/08/04 20:26:59 tibbs Exp $
NAME := znc-extra
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  4 20:27:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:27:45 +0000
Subject: [pkgdb] znc (Fedora EPEL, 4) updated by tibbs
Message-ID: <20090804202746.3D8AE10F8B0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for znc
tibbs has set commit to Approved for 107427 on znc (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on znc (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on znc (Fedora EPEL 4)
tibbs changed owner of znc in Fedora EPEL 4 to nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Tue Aug  4 20:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:28:58 +0000
Subject: [pkgdb] mtkbabel was added for drindt
Message-ID: <20090804202859.0209310F8A2@bastion2.fedora.phx.redhat.com>

tibbs has added Package mtkbabel with summary Program to Operate the i-Blue 747 GPS Data Logger
tibbs has approved Package mtkbabel
tibbs has added a Fedora devel branch for mtkbabel with an owner of drindt
tibbs has approved mtkbabel in Fedora devel
tibbs has approved Package mtkbabel
tibbs has set commit to Approved for 107427 on mtkbabel (Fedora devel)
tibbs has set checkout to Approved for 107427 on mtkbabel (Fedora devel)
tibbs has set build to Approved for 107427 on mtkbabel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mtkbabel



From pkgdb at fedoraproject.org  Tue Aug  4 20:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:00 +0000
Subject: [pkgdb] mtkbabel summary updated by tibbs
Message-ID: <20090804202900.DB9E110F8AD@bastion2.fedora.phx.redhat.com>

tibbs set package mtkbabel summary to Program to Operate the i-Blue 747 GPS Data Logger

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mtkbabel



From pkgdb at fedoraproject.org  Tue Aug  4 20:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:00 +0000
Subject: [pkgdb] mtkbabel (Fedora, 11) updated by tibbs
Message-ID: <20090804202901.02C8510F8B2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for mtkbabel
tibbs has set commit to Approved for 107427 on mtkbabel (Fedora 11)
tibbs has set checkout to Approved for 107427 on mtkbabel (Fedora 11)
tibbs has set build to Approved for 107427 on mtkbabel (Fedora 11)
tibbs approved watchbugzilla on mtkbabel (Fedora 11) for peter
tibbs approved watchcommits on mtkbabel (Fedora 11) for peter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mtkbabel



From tibbs at fedoraproject.org  Tue Aug  4 20:29:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:12 +0000 (UTC)
Subject: rpms/mtkbabel Makefile,NONE,1.1
Message-ID: <20090804202912.C4FE511C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mtkbabel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM22481/rpms/mtkbabel

Added Files:
	Makefile 
Log Message:
Setup of module mtkbabel


--- NEW FILE Makefile ---
# Top level Makefile for module mtkbabel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Aug  4 20:29:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:12 +0000 (UTC)
Subject: rpms/mtkbabel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090804202912.F40E611C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mtkbabel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM22481/rpms/mtkbabel/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mtkbabel


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mtkbabel
# $Id: Makefile,v 1.1 2009/08/04 20:29:12 tibbs Exp $
NAME := mtkbabel
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  4 20:29:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:37 +0000
Subject: [pkgdb] php-PHPMailer was added for monnerat
Message-ID: <20090804202937.AA13610F8B1@bastion2.fedora.phx.redhat.com>

tibbs has added Package php-PHPMailer with summary PHP email transport class with a lot of features
tibbs has approved Package php-PHPMailer
tibbs has added a Fedora devel branch for php-PHPMailer with an owner of monnerat
tibbs has approved php-PHPMailer in Fedora devel
tibbs has approved Package php-PHPMailer
tibbs has set commit to Approved for 107427 on php-PHPMailer (Fedora devel)
tibbs has set checkout to Approved for 107427 on php-PHPMailer (Fedora devel)
tibbs has set build to Approved for 107427 on php-PHPMailer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From pkgdb at fedoraproject.org  Tue Aug  4 20:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:38 +0000
Subject: [pkgdb] php-PHPMailer summary updated by tibbs
Message-ID: <20090804202939.9F62810F8B2@bastion2.fedora.phx.redhat.com>

tibbs set package php-PHPMailer summary to PHP email transport class with a lot of features

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From pkgdb at fedoraproject.org  Tue Aug  4 20:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:38 +0000
Subject: [pkgdb] php-PHPMailer (Fedora, 11) updated by tibbs
Message-ID: <20090804202943.0CD5710F8C3@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for php-PHPMailer
tibbs has set commit to Approved for 107427 on php-PHPMailer (Fedora 11)
tibbs has set checkout to Approved for 107427 on php-PHPMailer (Fedora 11)
tibbs has set build to Approved for 107427 on php-PHPMailer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From tibbs at fedoraproject.org  Tue Aug  4 20:29:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:44 +0000 (UTC)
Subject: rpms/php-PHPMailer - New directory
Message-ID: <20090804202944.181A611C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-PHPMailer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN22814/rpms/php-PHPMailer

Log Message:
Directory /cvs/pkgs/rpms/php-PHPMailer added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:29:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:44 +0000 (UTC)
Subject: rpms/php-PHPMailer/devel - New directory
Message-ID: <20090804202944.3643A11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-PHPMailer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN22814/rpms/php-PHPMailer/devel

Log Message:
Directory /cvs/pkgs/rpms/php-PHPMailer/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug  4 20:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:38 +0000
Subject: [pkgdb] php-PHPMailer (Fedora, 11) updated by tibbs
Message-ID: <20090804202944.4253910F8CD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for php-PHPMailer
tibbs has set commit to Approved for 107427 on php-PHPMailer (Fedora 10)
tibbs has set checkout to Approved for 107427 on php-PHPMailer (Fedora 10)
tibbs has set build to Approved for 107427 on php-PHPMailer (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From tibbs at fedoraproject.org  Tue Aug  4 20:29:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:50 +0000 (UTC)
Subject: rpms/php-PHPMailer Makefile,NONE,1.1
Message-ID: <20090804202950.4541811C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-PHPMailer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN22814/rpms/php-PHPMailer

Added Files:
	Makefile 
Log Message:
Setup of module php-PHPMailer


--- NEW FILE Makefile ---
# Top level Makefile for module php-PHPMailer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Aug  4 20:29:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:50 +0000 (UTC)
Subject: rpms/php-PHPMailer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090804202950.75A1311C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-PHPMailer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN22814/rpms/php-PHPMailer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-PHPMailer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-PHPMailer
# $Id: Makefile,v 1.1 2009/08/04 20:29:50 tibbs Exp $
NAME := php-PHPMailer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  4 20:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:30:34 +0000
Subject: [pkgdb] gpxviewer was added for fab
Message-ID: <20090804203034.859B710F8B4@bastion2.fedora.phx.redhat.com>

tibbs has added Package gpxviewer with summary A simple gpx viewer
tibbs has approved Package gpxviewer
tibbs has added a Fedora devel branch for gpxviewer with an owner of fab
tibbs has approved gpxviewer in Fedora devel
tibbs has approved Package gpxviewer
tibbs has set commit to Approved for 107427 on gpxviewer (Fedora devel)
tibbs has set checkout to Approved for 107427 on gpxviewer (Fedora devel)
tibbs has set build to Approved for 107427 on gpxviewer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpxviewer



From pkgdb at fedoraproject.org  Tue Aug  4 20:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:30:38 +0000
Subject: [pkgdb] gpxviewer summary updated by tibbs
Message-ID: <20090804203040.0BBBB10F8B7@bastion2.fedora.phx.redhat.com>

tibbs set package gpxviewer summary to A simple gpx viewer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpxviewer



From tibbs at fedoraproject.org  Tue Aug  4 20:30:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:30:45 +0000 (UTC)
Subject: rpms/gpxviewer - New directory
Message-ID: <20090804203045.1732A11C0345@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpxviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY23283/rpms/gpxviewer

Log Message:
Directory /cvs/pkgs/rpms/gpxviewer added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:30:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:30:45 +0000 (UTC)
Subject: rpms/gpxviewer/devel - New directory
Message-ID: <20090804203045.3154E11C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpxviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY23283/rpms/gpxviewer/devel

Log Message:
Directory /cvs/pkgs/rpms/gpxviewer/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug  4 20:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:30:38 +0000
Subject: [pkgdb] gpxviewer (Fedora, 11) updated by tibbs
Message-ID: <20090804203040.EBEBA10F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for gpxviewer
tibbs has set commit to Approved for 107427 on gpxviewer (Fedora 11)
tibbs has set checkout to Approved for 107427 on gpxviewer (Fedora 11)
tibbs has set build to Approved for 107427 on gpxviewer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpxviewer



From tibbs at fedoraproject.org  Tue Aug  4 20:30:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:30:51 +0000 (UTC)
Subject: rpms/gpxviewer Makefile,NONE,1.1
Message-ID: <20090804203051.418BF11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpxviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY23283/rpms/gpxviewer

Added Files:
	Makefile 
Log Message:
Setup of module gpxviewer


--- NEW FILE Makefile ---
# Top level Makefile for module gpxviewer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Aug  4 20:30:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:30:51 +0000 (UTC)
Subject: rpms/gpxviewer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090804203051.7C5EB11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpxviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsY23283/rpms/gpxviewer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpxviewer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gpxviewer
# $Id: Makefile,v 1.1 2009/08/04 20:30:51 tibbs Exp $
NAME := gpxviewer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  4 20:31:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:31:26 +0000
Subject: [pkgdb] ccze was added for hubbitus
Message-ID: <20090804203129.826AE10F8C0@bastion2.fedora.phx.redhat.com>

tibbs has added Package ccze with summary A robust log colorizer
tibbs has approved Package ccze
tibbs has added a Fedora devel branch for ccze with an owner of hubbitus
tibbs has approved ccze in Fedora devel
tibbs has approved Package ccze
tibbs has set commit to Approved for 107427 on ccze (Fedora devel)
tibbs has set checkout to Approved for 107427 on ccze (Fedora devel)
tibbs has set build to Approved for 107427 on ccze (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccze



From pkgdb at fedoraproject.org  Tue Aug  4 20:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:31:27 +0000
Subject: [pkgdb] ccze summary updated by tibbs
Message-ID: <20090804203129.CD49210F8B9@bastion2.fedora.phx.redhat.com>

tibbs set package ccze summary to A robust log colorizer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccze



From tibbs at fedoraproject.org  Tue Aug  4 20:31:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:31:33 +0000 (UTC)
Subject: rpms/ccze - New directory
Message-ID: <20090804203133.1988111C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccze
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE23835/rpms/ccze

Log Message:
Directory /cvs/pkgs/rpms/ccze added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:31:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:31:33 +0000 (UTC)
Subject: rpms/ccze/devel - New directory
Message-ID: <20090804203133.41EAF11C0345@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccze/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE23835/rpms/ccze/devel

Log Message:
Directory /cvs/pkgs/rpms/ccze/devel added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:31:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:31:39 +0000 (UTC)
Subject: rpms/ccze Makefile,NONE,1.1
Message-ID: <20090804203139.0F4E711C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccze
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE23835/rpms/ccze

Added Files:
	Makefile 
Log Message:
Setup of module ccze


--- NEW FILE Makefile ---
# Top level Makefile for module ccze
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug  4 20:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:31:27 +0000
Subject: [pkgdb] ccze (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804203130.D6E2C10F8CC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for ccze
tibbs has set commit to Approved for 107427 on ccze (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on ccze (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on ccze (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccze



From tibbs at fedoraproject.org  Tue Aug  4 20:31:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:31:39 +0000 (UTC)
Subject: rpms/ccze/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090804203139.3961D11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccze/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE23835/rpms/ccze/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ccze


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ccze
# $Id: Makefile,v 1.1 2009/08/04 20:31:39 tibbs Exp $
NAME := ccze
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  4 20:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:31:27 +0000
Subject: [pkgdb] ccze (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804203135.AB9B510F8D9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for ccze
tibbs has set commit to Approved for 107427 on ccze (Fedora 10)
tibbs has set checkout to Approved for 107427 on ccze (Fedora 10)
tibbs has set build to Approved for 107427 on ccze (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccze



From pkgdb at fedoraproject.org  Tue Aug  4 20:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:31:27 +0000
Subject: [pkgdb] ccze (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804203133.7B47F10F879@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ccze
tibbs has set commit to Approved for 107427 on ccze (Fedora 11)
tibbs has set checkout to Approved for 107427 on ccze (Fedora 11)
tibbs has set build to Approved for 107427 on ccze (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccze



From pkgdb at fedoraproject.org  Tue Aug  4 20:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:00 +0000
Subject: [pkgdb] mtkbabel (Fedora, 11) updated by tibbs
Message-ID: <20090804202901.750A710F8B8@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on mtkbabel (Fedora devel) for peter
tibbs approved watchcommits on mtkbabel (Fedora devel) for peter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mtkbabel



From tibbs at fedoraproject.org  Tue Aug  4 20:29:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:07 +0000 (UTC)
Subject: rpms/mtkbabel - New directory
Message-ID: <20090804202907.21A8B11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mtkbabel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM22481/rpms/mtkbabel

Log Message:
Directory /cvs/pkgs/rpms/mtkbabel added to the repository




From pkgdb at fedoraproject.org  Tue Aug  4 20:32:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:32:00 +0000
Subject: [pkgdb] constantine-backgrounds summary updated by tibbs
Message-ID: <20090804203203.297BE10F8BD@bastion2.fedora.phx.redhat.com>

tibbs set package constantine-backgrounds summary to Constantine desktop backgrounds

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/constantine-backgrounds



From tibbs at fedoraproject.org  Tue Aug  4 20:32:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:06 +0000 (UTC)
Subject: rpms/constantine-backgrounds - New directory
Message-ID: <20090804203206.13C7511C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/constantine-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24199/rpms/constantine-backgrounds

Log Message:
Directory /cvs/pkgs/rpms/constantine-backgrounds added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:29:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:29:07 +0000 (UTC)
Subject: rpms/mtkbabel/devel - New directory
Message-ID: <20090804202907.3D99511C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mtkbabel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM22481/rpms/mtkbabel/devel

Log Message:
Directory /cvs/pkgs/rpms/mtkbabel/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug  4 20:31:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:31:59 +0000
Subject: [pkgdb] constantine-backgrounds was added for mso
Message-ID: <20090804203202.2885510F8E7@bastion2.fedora.phx.redhat.com>

tibbs has added Package constantine-backgrounds with summary Constantine desktop backgrounds
tibbs has approved Package constantine-backgrounds
tibbs has added a Fedora devel branch for constantine-backgrounds with an owner of mso
tibbs has approved constantine-backgrounds in Fedora devel
tibbs has approved Package constantine-backgrounds
tibbs has set commit to Approved for 107427 on constantine-backgrounds (Fedora devel)
tibbs has set checkout to Approved for 107427 on constantine-backgrounds (Fedora devel)
tibbs has set build to Approved for 107427 on constantine-backgrounds (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/constantine-backgrounds



From tibbs at fedoraproject.org  Tue Aug  4 20:32:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:12 +0000 (UTC)
Subject: rpms/constantine-backgrounds Makefile,NONE,1.1
Message-ID: <20090804203212.2D15A11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/constantine-backgrounds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24199/rpms/constantine-backgrounds

Added Files:
	Makefile 
Log Message:
Setup of module constantine-backgrounds


--- NEW FILE Makefile ---
# Top level Makefile for module constantine-backgrounds
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Aug  4 20:32:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:06 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel - New directory
Message-ID: <20090804203206.36BCF11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24199/rpms/constantine-backgrounds/devel

Log Message:
Directory /cvs/pkgs/rpms/constantine-backgrounds/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug  4 20:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:29:00 +0000
Subject: [pkgdb] mtkbabel (Fedora, 11) updated by tibbs
Message-ID: <20090804202901.32C3610F8B4@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for mtkbabel
tibbs has set commit to Approved for 107427 on mtkbabel (Fedora 10)
tibbs has set checkout to Approved for 107427 on mtkbabel (Fedora 10)
tibbs has set build to Approved for 107427 on mtkbabel (Fedora 10)
tibbs approved watchbugzilla on mtkbabel (Fedora 10) for peter
tibbs approved watchcommits on mtkbabel (Fedora 10) for peter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mtkbabel



From tibbs at fedoraproject.org  Tue Aug  4 20:32:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:12 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090804203212.6130F11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24199/rpms/constantine-backgrounds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module constantine-backgrounds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: constantine-backgrounds
# $Id: Makefile,v 1.1 2009/08/04 20:32:12 tibbs Exp $
NAME := constantine-backgrounds
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Aug  4 20:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:32:33 +0000
Subject: [pkgdb] python-tw-jquery was added for lmacken
Message-ID: <20090804203233.EC15210F8AF@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-tw-jquery with summary ToscaWidgets wrapping for jQuery
tibbs has approved Package python-tw-jquery
tibbs has added a Fedora devel branch for python-tw-jquery with an owner of lmacken
tibbs has approved python-tw-jquery in Fedora devel
tibbs has approved Package python-tw-jquery
tibbs has set commit to Approved for 107427 on python-tw-jquery (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-tw-jquery (Fedora devel)
tibbs has set build to Approved for 107427 on python-tw-jquery (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-tw-jquery



From pkgdb at fedoraproject.org  Tue Aug  4 20:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:32:34 +0000
Subject: [pkgdb] python-tw-jquery summary updated by tibbs
Message-ID: <20090804203235.076AD10F8BC@bastion2.fedora.phx.redhat.com>

tibbs set package python-tw-jquery summary to ToscaWidgets wrapping for jQuery

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-tw-jquery



From pkgdb at fedoraproject.org  Tue Aug  4 20:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:32:34 +0000
Subject: [pkgdb] python-tw-jquery (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804203235.82F5310F8C5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for python-tw-jquery
tibbs has set commit to Approved for 107427 on python-tw-jquery (Fedora 11)
tibbs has set checkout to Approved for 107427 on python-tw-jquery (Fedora 11)
tibbs has set build to Approved for 107427 on python-tw-jquery (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-tw-jquery



From pkgdb at fedoraproject.org  Tue Aug  4 20:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:32:34 +0000
Subject: [pkgdb] python-tw-jquery (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804203235.E201A10F8DD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-tw-jquery
tibbs has set commit to Approved for 107427 on python-tw-jquery (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on python-tw-jquery (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on python-tw-jquery (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-tw-jquery



From pkgdb at fedoraproject.org  Tue Aug  4 20:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:32:34 +0000
Subject: [pkgdb] python-tw-jquery (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090804203236.7F24610F8E2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for python-tw-jquery
tibbs has set commit to Approved for 107427 on python-tw-jquery (Fedora 10)
tibbs has set checkout to Approved for 107427 on python-tw-jquery (Fedora 10)
tibbs has set build to Approved for 107427 on python-tw-jquery (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-tw-jquery



From tibbs at fedoraproject.org  Tue Aug  4 20:32:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:41 +0000 (UTC)
Subject: rpms/python-tw-jquery - New directory
Message-ID: <20090804203241.1BBAB11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-tw-jquery
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24409/rpms/python-tw-jquery

Log Message:
Directory /cvs/pkgs/rpms/python-tw-jquery added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:32:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:41 +0000 (UTC)
Subject: rpms/python-tw-jquery/devel - New directory
Message-ID: <20090804203241.4473F11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-tw-jquery/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24409/rpms/python-tw-jquery/devel

Log Message:
Directory /cvs/pkgs/rpms/python-tw-jquery/devel added to the repository




From tibbs at fedoraproject.org  Tue Aug  4 20:32:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:46 +0000 (UTC)
Subject: rpms/python-tw-jquery Makefile,NONE,1.1
Message-ID: <20090804203246.B762411C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-tw-jquery
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24409/rpms/python-tw-jquery

Added Files:
	Makefile 
Log Message:
Setup of module python-tw-jquery


--- NEW FILE Makefile ---
# Top level Makefile for module python-tw-jquery
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Tue Aug  4 20:32:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Tue,  4 Aug 2009 20:32:46 +0000 (UTC)
Subject: rpms/python-tw-jquery/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090804203246.E982711C0345@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-tw-jquery/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc24409/rpms/python-tw-jquery/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tw-jquery


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-tw-jquery
# $Id: Makefile,v 1.1 2009/08/04 20:32:46 tibbs Exp $
NAME := python-tw-jquery
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Tue Aug  4 20:45:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  4 Aug 2009 20:45:44 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.69,1.70
Message-ID: <20090804204544.B3AC611C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28058

Modified Files:
	comps-f12.xml.in 
Log Message:
Move cheese from graphics to gnome-desktop



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- comps-f12.xml.in	4 Aug 2009 18:55:01 -0000	1.69
+++ comps-f12.xml.in	4 Aug 2009 20:45:44 -0000	1.70
@@ -2448,6 +2448,7 @@
       <packagereq type="default">at-spi</packagereq>
       <packagereq type="default">brasero-nautilus</packagereq>
       <packagereq type="default">bug-buddy</packagereq>
+      <packagereq type="default">cheese</packagereq>
       <packagereq type="default">compiz-gnome</packagereq>
       <packagereq type="default">dasher</packagereq>
       <packagereq type="default">eog</packagereq>
@@ -2750,7 +2751,6 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">cheese</packagereq>
       <packagereq type="default">f-spot</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gimp-data-extras</packagereq>



From till at fedoraproject.org  Tue Aug  4 20:48:55 2009
From: till at fedoraproject.org (Till Maas)
Date: Tue,  4 Aug 2009 20:48:55 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.70,1.71
Message-ID: <20090804204855.A270311C00E4@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28905

Modified Files:
	comps-f12.xml.in 
Log Message:
add more it-security groups



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- comps-f12.xml.in	4 Aug 2009 20:45:44 -0000	1.70
+++ comps-f12.xml.in	4 Aug 2009 20:48:53 -0000	1.71
@@ -4706,6 +4706,73 @@
         <packagereq type="default">wireshark</packagereq>
         <packagereq type="default">xprobe2</packagereq>
     </packagelist>
+</group>
+  <group>
+    <id>it-security-forensics</id>
+    <_name>Forensics tools</_name>
+    <_description>These tools can be used to perform IT security related forensics.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+        <packagereq type="default">chkrootkit</packagereq>
+        <packagereq type="default">Unhide</packagereq>
+        <packagereq type="default">clamav</packagereq>
+        <packagereq type="default">dc3dd</packagereq>
+        <packagereq type="default">dd_rescue</packagereq>
+        <packagereq type="default">sleuthkit</packagereq>
+        <packagereq type="default">gpart</packagereq>
+        <packagereq type="default">hexedit</packagereq>
+        <packagereq type="default">prelude</packagereq>
+        <packagereq type="default">testdisk</packagereq>
+        <packagereq type="default">foremost</packagereq>
+        <packagereq type="default">sectool</packagereq>
+        <packagereq type="default">rkhunter</packagereq>
+        <packagereq type="default">scanmem</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>it-security-wireless</id>
+    <_name>Wireless tools</_name>
+    <_description>These tools can be used to perform IT security related wireless auditing.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+        <packagereq type="default">aircrack-ng</packagereq>
+        <packagereq type="default">airsnort</packagereq>
+        <packagereq type="default">kismet</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>it-security-code-analysis</id>
+    <_name>Code analysis tools</_name>
+    <_description>These tools can be used to perform security related code analysis.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+        <packagereq type="default">pscan</packagereq>
+        <packagereq type="default">splint</packagereq>
+        <packagereq type="default">rats</packagereq>
+        <packagereq type="default">flawfinder</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>it-security-intrusion-detection</id>
+    <_name>Intrusion detection tools</_name>
+    <_description>These tools can be used to setup intrusion detection systems.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+        <packagereq type="default">aide</packagereq>
+        <packagereq type="default">prewikka</packagereq>
+        <packagereq type="default">prelude-manager</packagereq>
+        <packagereq type="default">prelude-notify</packagereq>
+        <packagereq type="default">snort</packagereq>
+        <packagereq type="default">tripwire</packagereq>
+        <packagereq type="default">labrea</packagereq>
+        <packagereq type="default">pads</packagereq>
+        <packagereq type="default">honeyd</packagereq>
+        <packagereq type="default">Nebula</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>romanian-support</id>
@@ -6118,7 +6185,11 @@
     <_name>IT Security</_name>
     <_description>These packages are useful for IT security related tasks.</_description>
     <grouplist>
+      <groupid>it-security-code-analysis</groupid>
+      <groupid>it-security-forensics</groupid>
+      <groupid>it-security-intrusion-detection</groupid>
       <groupid>it-security-reconnaissance</groupid>
+      <groupid>it-security-wireless</groupid>
     </grouplist>
   </category>
   <category>



From lmacken at fedoraproject.org  Tue Aug  4 20:53:57 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  4 Aug 2009 20:53:57 +0000 (UTC)
Subject: rpms/python-tw-jquery/devel import.log, NONE,
	1.1 python-tw-jquery.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090804205357.5D2F711C00E4@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-jquery/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30378/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-tw-jquery.spec 
Log Message:
Initial commit of python-tw-jquery



--- NEW FILE import.log ---
python-tw-jquery-0_9_5-1_fc10:HEAD:python-tw-jquery-0.9.5-1.fc10.src.rpm:1249404641


--- NEW FILE python-tw-jquery.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-tw-jquery
Version:        0.9.5
Release:        1%{?dist}
Summary:        ToscaWidgets wrapping for jQuery

Group:          Development/Languages
License:        MIT
URL:            http://toscawidgets.org
Source0:        http://pypi.python.org/packages/source/t/tw.jquery/tw.jquery-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
Requires:       python-toscawidgets >= 0.9.3
Requires:       python-tw-forms

%description
ToscaWidgets wrapping for jQuery

%prep
%setup -q -n tw.jquery-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*



%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.9.5-1
- Latest upstream release

* Thu Jun 18 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.5-1
- Latest upstream release, with various module cleanups

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.4-1
- Latest upstream release, which includes the license

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.3-1
- Latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.2-1
- Update to 0.9.4.2
- Require python-tw-forms

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9.1-0.1.dev20081021
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:32:46 -0000	1.1
+++ .cvsignore	4 Aug 2009 20:53:56 -0000	1.2
@@ -0,0 +1 @@
+tw.jquery-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:32:46 -0000	1.1
+++ sources	4 Aug 2009 20:53:56 -0000	1.2
@@ -0,0 +1 @@
+26a12f557d154465203ae920ae66f437  tw.jquery-0.9.5.tar.gz



From pkgdb at fedoraproject.org  Tue Aug  4 21:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 21:00:02 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090804210004.A440310F8BD@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-turtleart (Fedora 11) to Approved for fab

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Tue Aug  4 20:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 04 Aug 2009 20:59:56 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090804210000.B87AD10F8BC@bastion2.fedora.phx.redhat.com>

bkearney has set the commit acl on sugar-turtleart (Fedora devel) to Approved for fab

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From kasal at fedoraproject.org  Tue Aug  4 21:21:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  4 Aug 2009 21:21:51 +0000 (UTC)
Subject: rpms/perl-Date-Calc/devel .cvsignore, 1.4, 1.5 perl-Date-Calc.spec, 
	1.26, 1.27 sources, 1.4, 1.5
Message-ID: <20090804212151.55D1A11C00E4@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Date-Calc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5226

Modified Files:
	.cvsignore perl-Date-Calc.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Date-Calc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Apr 2005 21:52:33 -0000	1.4
+++ .cvsignore	4 Aug 2009 21:21:49 -0000	1.5
@@ -1 +1 @@
-Date-Calc-5.4.tar.gz
+Date-Calc-5.6.tar.gz


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- perl-Date-Calc.spec	26 Jul 2009 05:32:04 -0000	1.26
+++ perl-Date-Calc.spec	4 Aug 2009 21:21:49 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           perl-Date-Calc
-Version:        5.4
-Release:        8%{?dist}
+Version:        5.6
+Release:        1%{?dist}
 Summary:        A module for extended and efficient date calculations in Perl
 
 Group:          Development/Libraries
@@ -9,11 +9,11 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/S/ST/STBEY/Date-Calc-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl(Bit::Vector) >= 6.4
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  dos2unix
+BuildRequires:	perl(Carp::Clan) >= 5.3
+BuildRequires:  perl(Bit::Vector) >= 6.6
+Requires:       perl(Bit::Vector) >= 6.6
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(Bit::Vector) >= 6.4
 
 %description
 The library provides all sorts of date calculations based on the
@@ -56,8 +56,8 @@ for file in $RPM_BUILD_ROOT%{_mandir}/ma
   mv -f "${file}_" "$file"
 done
 
-dos2unix tools/compile.bat
-chmod 644 examples/*.{pl,cgi} tools/*.pl tools/*.sh
+rm tools/compile.bat
+chmod 644 examples/* tools/*
 
 
 %check
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> - 5.6-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Date-Calc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Apr 2005 21:52:33 -0000	1.4
+++ sources	4 Aug 2009 21:21:50 -0000	1.5
@@ -1 +1 @@
-7ae34972694127e8f1c9a2af1c24585b  Date-Calc-5.4.tar.gz
+93c011570dfe9175bd01d6a454ed61f2  Date-Calc-5.6.tar.gz



From lennart at fedoraproject.org  Tue Aug  4 22:15:25 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  4 Aug 2009 22:15:25 +0000 (UTC)
Subject: rpms/alsa-plugins/devel
	0002-pulse-get-rid-of-a-number-of-assert-s.patch, NONE,
	1.1 0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch,
	NONE, 1.1 0004-pulse-unify-destruction-of-snd_pulse_t.patch, NONE,
	1.1 0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch, 
	NONE,
	1.1 0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch, 
	NONE,
	1.1 0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch, 
	NONE, 1.1 0008-pulse-get-rid-of-redundant-state-variable.patch,
	NONE, 1.1 0009-pulse-unify-stream-context-state-checks.patch,
	NONE, 1.1 0010-pulse-rework-object-destruction-paths-a-bit.patch,
	NONE,
	1.1 0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch, 
	NONE, 1.1 alsa-plugins.spec, 1.25,
	1.26 0001-alsa-get-rid-of-a-number-of-assert-s.patch, 1.1,
	NONE 0001-alsa-plugins-pulse-Implement-pause.patch, 1.1,
	NONE 0002-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch,
	1.1, NONE 0003-pulse-unify-destruction-of-snd_pulse_t.patch, 1.1,
	NONE 0004-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch, 
	1.1, NONE
Message-ID: <20090804221526.211EC11C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18582

Modified Files:
	alsa-plugins.spec 
Added Files:
	0002-pulse-get-rid-of-a-number-of-assert-s.patch 
	0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch 
	0004-pulse-unify-destruction-of-snd_pulse_t.patch 
	0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch 
	0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch 
	0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch 
	0008-pulse-get-rid-of-redundant-state-variable.patch 
	0009-pulse-unify-stream-context-state-checks.patch 
	0010-pulse-rework-object-destruction-paths-a-bit.patch 
	0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch 
Removed Files:
	0001-alsa-get-rid-of-a-number-of-assert-s.patch 
	0001-alsa-plugins-pulse-Implement-pause.patch 
	0002-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch 
	0003-pulse-unify-destruction-of-snd_pulse_t.patch 
	0004-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch 
Log Message:
Add a couple of more clean up patches for the pulse plugin

0002-pulse-get-rid-of-a-number-of-assert-s.patch:
 ctl_pulse.c |   35 ++++++++++++++++++++------
 pcm_pulse.c |   79 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 pulse.c     |   35 ++++++++++++++++++--------
 3 files changed, 112 insertions(+), 37 deletions(-)

--- NEW FILE 0002-pulse-get-rid-of-a-number-of-assert-s.patch ---
>From be8799947bac41c50460111b0ac20ff8176b6b47 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 31 Jul 2009 15:25:44 +0200
Subject: [PATCH 02/11] pulse: get rid of a number of assert()s

Instead of hitting an assert when any of the plugin functions is called
in an invalid context we should return a clean error to make sure
programs are not unnecessarily aborted.

This should fix issues such as http://pulseaudio.org/ticket/595

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/ctl_pulse.c |   35 ++++++++++++++++++-----
 pulse/pcm_pulse.c |   79 +++++++++++++++++++++++++++++++++++++++++------------
 pulse/pulse.c     |   34 ++++++++++++++++-------
 3 files changed, 112 insertions(+), 36 deletions(-)

diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c
index c6cf9e2..2caa29b 100644
--- a/pulse/ctl_pulse.c
+++ b/pulse/ctl_pulse.c
@@ -125,8 +125,9 @@ static void event_cb(pa_context * c, pa_subscription_event_type_t t,
 	pa_operation *o;
 
 	assert(ctl);
-	assert(ctl->p);
-	assert(ctl->p->context);
+
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return;
 
 	o = pa_context_get_sink_info_by_name(ctl->p->context, ctl->sink,
 					     sink_info_cb, ctl);
@@ -148,8 +149,9 @@ static int pulse_update_volume(snd_ctl_pulse_t * ctl)
 	pa_operation *o;
 
 	assert(ctl);
-	assert(ctl->p);
-	assert(ctl->p->context);
+
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
 
 	o = pa_context_get_sink_info_by_name(ctl->p->context, ctl->sink,
 					     sink_info_cb, ctl);
@@ -203,6 +205,9 @@ static int pulse_elem_list(snd_ctl_ext_t * ext, unsigned int offset,
 
 	assert(ctl);
 
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
+
 	snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
@@ -260,7 +265,9 @@ static int pulse_get_attribute(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key,
 		return -EINVAL;
 
 	assert(ctl);
-	assert(ctl->p);
+
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
@@ -311,7 +318,9 @@ static int pulse_read_integer(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key,
 	pa_cvolume *vol = NULL;
 
 	assert(ctl);
-	assert(ctl->p);
+
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
@@ -361,7 +370,9 @@ static int pulse_write_integer(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key,
 	pa_cvolume *vol = NULL;
 
 	assert(ctl);
-	assert(ctl->p && ctl->p->context);
+
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
@@ -465,6 +476,9 @@ static void pulse_subscribe_events(snd_ctl_ext_t * ext, int subscribe)
 
 	assert(ctl);
 
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return;
+
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
 	ctl->subscribed = !!(subscribe & SND_CTL_EVENT_MASK_VALUE);
@@ -481,6 +495,9 @@ static int pulse_read_event(snd_ctl_ext_t * ext, snd_ctl_elem_id_t * id,
 
 	assert(ctl);
 
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
+
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
 	if (!ctl->updated || !ctl->subscribed)
@@ -526,7 +543,9 @@ static int pulse_ctl_poll_revents(snd_ctl_ext_t * ext, struct pollfd *pfd,
 	int err = 0;
 
 	assert(ctl);
-	assert(ctl->p);
+
+	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c
index c276839..24347f9 100644
--- a/pulse/pcm_pulse.c
+++ b/pulse/pcm_pulse.c
@@ -106,6 +106,9 @@ static int update_active(snd_pcm_pulse_t *pcm) {
 
 	assert(pcm);
 
+	if (!pcm->p)
+		return -EBADFD;
+
 	ret = check_active(pcm);
 	if (ret < 0)
 		return ret;
@@ -125,7 +128,9 @@ static int pulse_start(snd_pcm_ioplug_t * io)
 	int err = 0, err_o = 0, err_u = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
@@ -174,7 +179,9 @@ static int pulse_stop(snd_pcm_ioplug_t * io)
 	int err = 0, err_o = 0, err_u = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
@@ -224,7 +231,9 @@ static int pulse_drain(snd_pcm_ioplug_t * io)
 	int err = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
@@ -259,7 +268,9 @@ static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io)
 	snd_pcm_sframes_t ret = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	if (io->state == SND_PCM_STATE_XRUN)
 		return -EPIPE;
@@ -269,7 +280,10 @@ static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io)
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	assert(pcm->stream);
+	if (!pcm->stream) {
+		ret = -EBADFD;
+		goto finish;
+	}
 
 	ret = pulse_check_connection(pcm->p);
 	if (ret < 0)
@@ -305,11 +319,16 @@ static int pulse_delay(snd_pcm_ioplug_t * io, snd_pcm_sframes_t * delayp)
 	pa_usec_t lat = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	assert(pcm->stream);
+	if (!pcm->stream) {
+		err = -EBADFD;
+		goto finish;
+	}
 
 	for (;;) {
 		err = pulse_check_connection(pcm->p);
@@ -354,11 +373,16 @@ static snd_pcm_sframes_t pulse_write(snd_pcm_ioplug_t * io,
 	snd_pcm_sframes_t ret = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	assert(pcm->stream);
+	if (!pcm->stream) {
+		ret = -EBADFD;
+		goto finish;
+	}
 
 	ret = pulse_check_connection(pcm->p);
 	if (ret < 0)
@@ -409,11 +433,16 @@ static snd_pcm_sframes_t pulse_read(snd_pcm_ioplug_t * io,
 	snd_pcm_sframes_t ret = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	assert(pcm->stream);
+	if (!pcm->stream) {
+		ret = -EBADFD;
+		goto finish;
+	}
 
 	ret = pulse_check_connection(pcm->p);
 	if (ret < 0)
@@ -480,7 +509,9 @@ static void stream_request_cb(pa_stream * p, size_t length, void *userdata)
 	snd_pcm_pulse_t *pcm = userdata;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return;
 
 	update_active(pcm);
 }
@@ -490,7 +521,9 @@ static void stream_underrun_cb(pa_stream * p, void *userdata)
 	snd_pcm_pulse_t *pcm = userdata;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return;
 
 	pcm->underrun = 1;
 }
@@ -499,7 +532,9 @@ static void stream_latency_cb(pa_stream *p, void *userdata) {
 	snd_pcm_pulse_t *pcm = userdata;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return;
 
 	pa_threaded_mainloop_signal(pcm->p->mainloop, 0);
 }
@@ -512,7 +547,9 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io,
 	snd_pcm_pulse_t *pcm = io->private_data;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
@@ -541,7 +578,9 @@ static int pulse_prepare(snd_pcm_ioplug_t * io)
 	unsigned c, d;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
@@ -645,7 +684,9 @@ static int pulse_hw_params(snd_pcm_ioplug_t * io,
 	int err = 0;
 
 	assert(pcm);
-	assert(pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
@@ -745,7 +786,9 @@ static int pulse_pause(snd_pcm_ioplug_t * io, int enable)
 	int err = 0;
 
 	assert (pcm);
-	assert (pcm->p);
+
+	if (!pcm->p)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
diff --git a/pulse/pulse.c b/pulse/pulse.c
index 3940238..95d8dde 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -32,8 +32,9 @@ int pulse_check_connection(snd_pulse_t * p)
 	pa_context_state_t state;
 
 	assert(p);
-	assert(p->context);
-	assert(p->mainloop);
+
+	if (!p->context || !p->mainloop)
+		return -EBADFD;
 
 	state = pa_context_get_state(p->context);
 
@@ -77,8 +78,12 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o)
 {
 	assert(p);
 	assert(o);
-	assert(p->state == PULSE_STATE_READY);
-	assert(p->mainloop);
+
+	if (p->state != PULSE_STATE_READY)
+		return -EBADFD;
+
+	if (!p->mainloop)
+		return -EBADFD;
 
 	for (;;) {
 		int err;
@@ -103,8 +108,12 @@ int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream,
 
 	assert(p);
 	assert(stream);
-	assert(p->state == PULSE_STATE_READY);
-	assert(p->mainloop);
+
+	if (p->state != PULSE_STATE_READY)
+		return -EBADFD;
+
+	if (!p->mainloop)
+		return -EBADFD;
 
 	for (;;) {
 		int err;
@@ -197,7 +206,9 @@ snd_pulse_t *pulse_new(void)
 
 	p->context =
 	    pa_context_new(pa_threaded_mainloop_get_api(p->mainloop), buf);
-	assert(p->context);
+
+	if (!p->context)
+		goto fail;
 
 	pa_context_set_state_callback(p->context, context_state_cb, p);
 
@@ -246,9 +257,12 @@ int pulse_connect(snd_pulse_t * p, const char *server)
 	int err;
 
 	assert(p);
-	assert(p->context);
-	assert(p->mainloop);
-	assert(p->state == PULSE_STATE_INIT);
+
+	if (!p->context || !p->mainloop)
+		return -EBADFD;
+
+	if (p->state != PULSE_STATE_INIT)
+		return -EBADFD;
 
 	pa_threaded_mainloop_lock(p->mainloop);
 
-- 
1.6.4


0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch:
 pulse.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE 0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch ---
>From d2ea09f162f114480516a9d993d3d71bf357c835 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Fri, 31 Jul 2009 16:01:52 +0200
Subject: [PATCH 03/11] pulse: use PA_CONTEXT_IS_GOOD where applicable

PA_CONTEXT_IS_GOOD is a safer way to check whether a context is still
valid.

This patch also bumps the version requirement of libpulse to 0.9.11.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/pulse.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pulse/pulse.c b/pulse/pulse.c
index 95d8dde..dd17384 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -38,7 +38,7 @@ int pulse_check_connection(snd_pulse_t * p)
 
 	state = pa_context_get_state(p->context);
 
-	if (state != PA_CONTEXT_READY)
+	if (!PA_CONTEXT_IS_GOOD(state))
 		return -EIO;
 
 	return 0;
@@ -127,8 +127,7 @@ int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream,
 		if (state == target)
 			break;
 
-		if (state == PA_STREAM_FAILED ||
-		    state == PA_STREAM_TERMINATED)
+		if (!PA_STREAM_IS_GOOD(state))
 			return -EIO;
 
 		pa_threaded_mainloop_wait(p->mainloop);
-- 
1.6.4


0004-pulse-unify-destruction-of-snd_pulse_t.patch:
 pulse.c |   32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

--- NEW FILE 0004-pulse-unify-destruction-of-snd_pulse_t.patch ---
>From 422958fa4b8101af842220a67e77c8090ad34a8b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Fri, 31 Jul 2009 16:02:05 +0200
Subject: [PATCH 04/11] pulse: unify destruction of snd_pulse_t

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/pulse.c |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/pulse/pulse.c b/pulse/pulse.c
index dd17384..ae66b0c 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -217,36 +217,29 @@ snd_pulse_t *pulse_new(void)
 	return p;
 
 fail:
+	pulse_free(p);
+
+	return NULL;
+}
+
+void pulse_free(snd_pulse_t * p)
+{
 	if (p->mainloop)
 		pa_threaded_mainloop_stop(p->mainloop);
 
-	if (p->context)
+	if (p->context) {
+		pa_context_disconnect(p->context);
 		pa_context_unref(p->context);
+	}
 
 	if (p->mainloop)
 		pa_threaded_mainloop_free(p->mainloop);
 
-	if (p->main_fd >= 0)
-		close(p->main_fd);
-
 	if (p->thread_fd >= 0)
 		close(p->thread_fd);
 
-	free(p);
-
-	return NULL;
-}
-
-void pulse_free(snd_pulse_t * p)
-{
-	pa_threaded_mainloop_stop(p->mainloop);
-
-	pa_context_disconnect(p->context);
-	pa_context_unref(p->context);
-	pa_threaded_mainloop_free(p->mainloop);
-
-	close(p->thread_fd);
-	close(p->main_fd);
+	if (p->main_fd >= 0)
+		close(p->main_fd);
 
 	free(p);
 }
-- 
1.6.4


0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch:
 pulse.c |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE 0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch ---
>From 16f837ec71a254a6bff7d26faf55237c4df5749c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Fri, 31 Jul 2009 16:02:21 +0200
Subject: [PATCH 05/11] pulse: call pa_threaded_mainloop_wait() to handle spurious wakeups

pa_threaded_mainloop_wait() can wake up for no reason, according to the
specs of the underlying POSIX ptrhead_cond_wait() docs, so we need to
call it in a loop here which should be cleaner anyway.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/pulse.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pulse/pulse.c b/pulse/pulse.c
index ae66b0c..6f58a7e 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -262,10 +262,17 @@ int pulse_connect(snd_pulse_t * p, const char *server)
 	if (err < 0)
 		goto error;
 
-	pa_threaded_mainloop_wait(p->mainloop);
+	for (;;) {
+		pa_context_state_t state = pa_context_get_state(p->context);
 
-	if (pa_context_get_state(p->context) != PA_CONTEXT_READY)
-		goto error;
+		if (!PA_CONTEXT_IS_GOOD(state))
+			goto error;
+
+		if (state == PA_CONTEXT_READY)
+			break;
+
+		pa_threaded_mainloop_wait(p->mainloop);
+	}
 
 	pa_threaded_mainloop_unlock(p->mainloop);
 
-- 
1.6.4


0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch:
 conf_pulse.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE 0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch ---
>From 76d34749c05ba77614f648128ad7045681f547ae Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Tue, 4 Aug 2009 23:53:51 +0200
Subject: [PATCH 06/11] pulse: replace manual mainloop by pa_mainloop_iterate()

The pa_mainloop_prepare()/_poll()/_dispatch() can be simplified by
simply calling pa_mainloop_iterate() which does all this in one call.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/conf_pulse.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/pulse/conf_pulse.c b/pulse/conf_pulse.c
index 3f9e071..35dd383 100644
--- a/pulse/conf_pulse.c
+++ b/pulse/conf_pulse.c
@@ -61,15 +61,7 @@ conf_pulse_hook_load_if_running(snd_config_t * root, snd_config_t * config,
 		goto out;
 
 	do {
-		err = pa_mainloop_prepare(loop, -1);
-		if (err < 0)
-			goto out;
-
-		err = pa_mainloop_poll(loop);
-		if (err < 0)
-			goto out;
-
-		err = pa_mainloop_dispatch(loop);
+		err = pa_mainloop_iterate(loop, 1, NULL);
 		if (err < 0)
 			goto out;
 
-- 
1.6.4


0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch:
 pcm_pulse.c |  118 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 pulse.c     |   55 ---------------------------
 pulse.h     |    5 --
 3 files changed, 95 insertions(+), 83 deletions(-)

--- NEW FILE 0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch ---
>From f74878bc610bccc4656f8194f29176cf9c956de9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Tue, 4 Aug 2009 23:54:24 +0200
Subject: [PATCH 07/11] pulse: move a couple of PCM related functions from pulse.c to pcm_pulse.c

A number of functions in pulse.c are only relevant for the PCM handling,
so let's move them to pcm_pulse.c. This allows us to simplify their
argument lists a bit.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/pcm_pulse.c |  118 ++++++++++++++++++++++++++++++++++++++++++----------
 pulse/pulse.c     |   55 -------------------------
 pulse/pulse.h     |    4 --
 3 files changed, 95 insertions(+), 82 deletions(-)

diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c
index 24347f9..a625f55 100644
--- a/pulse/pcm_pulse.c
+++ b/pulse/pcm_pulse.c
@@ -49,6 +49,32 @@ typedef struct snd_pcm_pulse {
 	pa_buffer_attr buffer_attr;
 } snd_pcm_pulse_t;
 
+static int check_stream(snd_pcm_pulse_t *pcm)
+{
+	int err;
+	pa_stream_state_t state;
+
+	assert(pcm);
+
+	if (!pcm->p)
+		return -EBADFD;
+
+	err = pulse_check_connection(pcm->p);
+	if (err < 0)
+		return err;
+
+	if (!pcm->stream)
+		return -EBADFD;
+
+	state = pa_stream_get_state(pcm->stream);
+	if (!PA_STREAM_IS_GOOD(state))
+		return -EIO;
+
+	err = 0;
+
+	return err;
+}
+
 static int update_ptr(snd_pcm_pulse_t *pcm)
 {
 	size_t size;
@@ -118,9 +144,53 @@ static int update_active(snd_pcm_pulse_t *pcm) {
 	else
 		pulse_poll_deactivate(pcm->p);
 
+	return ret;
+}
+
+static int wait_stream_state(snd_pcm_pulse_t *pcm, pa_stream_state_t target)
+{
+	pa_stream_state_t state;
+
+	assert(pcm);
+
+	if (!pcm->p)
+		return -EBADFD;
+
+	for (;;) {
+		int err;
+
+		err = pulse_check_connection(pcm->p);
+		if (err < 0)
+			return err;
+
+		if (!pcm->stream)
+			return -EBADFD;
+
+		state = pa_stream_get_state(pcm->stream);
+		if (state == target)
+			break;
+
+		if (!PA_STREAM_IS_GOOD(state))
+			return -EIO;
+
+		pa_threaded_mainloop_wait(pcm->p->mainloop);
+	}
+
 	return 0;
 }
 
+static void stream_success_cb(pa_stream * p, int success, void *userdata)
+{
+	snd_pcm_pulse_t *pcm = userdata;
+
+	assert(pcm);
+
+	if (!pcm->p)
+		return;
+
+	pa_threaded_mainloop_signal(pcm->p->mainloop, 0);
+}
+
 static int pulse_start(snd_pcm_ioplug_t * io)
 {
 	snd_pcm_pulse_t *pcm = io->private_data;
@@ -138,18 +208,13 @@ static int pulse_start(snd_pcm_ioplug_t * io)
 	if (err < 0)
 		goto finish;
 
-	if (pcm->stream == NULL)
-		goto finish;
-
-	o = pa_stream_cork(pcm->stream, 0, pulse_stream_success_cb,
-			   pcm->p);
+	o = pa_stream_cork(pcm->stream, 0, stream_success_cb, pcm);
 	if (!o) {
 		err = -EIO;
 		goto finish;
 	}
 
-	u = pa_stream_trigger(pcm->stream, pulse_stream_success_cb,
-			      pcm->p);
+	u = pa_stream_trigger(pcm->stream, stream_success_cb, pcm);
 
 	pcm->underrun = 0;
 	err_o = pulse_wait_operation(pcm->p, o);
@@ -165,7 +230,6 @@ static int pulse_start(snd_pcm_ioplug_t * io)
 		goto finish;
 	}
 
-
 finish:
 	pa_threaded_mainloop_unlock(pcm->p->mainloop);
 
@@ -189,18 +253,13 @@ static int pulse_stop(snd_pcm_ioplug_t * io)
 	if (err < 0)
 		goto finish;
 
-	if (pcm->stream == NULL)
-		goto finish;
-
-	o = pa_stream_cork(pcm->stream, 1, pulse_stream_success_cb,
-			   pcm->p);
+	o = pa_stream_cork(pcm->stream, 1, stream_success_cb, pcm);
 	if (!o) {
 		err = -EIO;
 		goto finish;
 	}
 
-	u = pa_stream_flush(pcm->stream, pulse_stream_success_cb,
-			    pcm->p);
+	u = pa_stream_flush(pcm->stream, stream_success_cb, pcm);
 	if (!u) {
 		pa_operation_unref(o);
 		err = -EIO;
@@ -241,7 +300,7 @@ static int pulse_drain(snd_pcm_ioplug_t * io)
 	if (err < 0)
 		goto finish;
 
-	o = pa_stream_drain(pcm->stream, pulse_stream_success_cb, pcm->p);
+	o = pa_stream_drain(pcm->stream, stream_success_cb, pcm);
 	if (!o) {
 		err = -EIO;
 		goto finish;
@@ -504,6 +563,23 @@ finish:
 	return ret;
 }
 
+static void stream_state_cb(pa_stream * p, void *userdata)
+{
+	snd_pcm_pulse_t *pcm = userdata;
+	pa_stream_state_t state;
+
+	assert(pcm);
+
+	if (!pcm->p)
+		return;
+
+	state = pa_stream_get_state(p);
+	if (!PA_STREAM_IS_GOOD(state))
+		pulse_poll_activate(pcm->p);
+
+	pa_threaded_mainloop_signal(pcm->p->mainloop, 0);
+}
+
 static void stream_request_cb(pa_stream * p, size_t length, void *userdata)
 {
 	snd_pcm_pulse_t *pcm = userdata;
@@ -586,8 +662,7 @@ static int pulse_prepare(snd_pcm_ioplug_t * io)
 
 	if (pcm->stream) {
 		pa_stream_disconnect(pcm->stream);
-		pulse_wait_stream_state(pcm->p, pcm->stream,
-					PA_STREAM_TERMINATED);
+		wait_stream_state(pcm, PA_STREAM_TERMINATED);
 		pa_stream_unref(pcm->stream);
 		pcm->stream = NULL;
 	}
@@ -620,9 +695,7 @@ static int pulse_prepare(snd_pcm_ioplug_t * io)
 		goto finish;
 	}
 
-	pa_stream_set_state_callback(pcm->stream, pulse_stream_state_cb,
-				     pcm->p);
-
+	pa_stream_set_state_callback(pcm->stream, stream_state_cb, pcm);
 	pa_stream_set_latency_update_callback(pcm->stream, stream_latency_cb, pcm);
 
 	if (io->stream == SND_PCM_STREAM_PLAYBACK) {
@@ -659,8 +732,7 @@ static int pulse_prepare(snd_pcm_ioplug_t * io)
 		goto finish;
 	}
 
-	err =
-	    pulse_wait_stream_state(pcm->p, pcm->stream, PA_STREAM_READY);
+	err = wait_stream_state(pcm, PA_STREAM_READY);
 	if (err < 0) {
 		SNDERR("PulseAudio: Unable to create stream: %s\n", pa_strerror(pa_context_errno(pcm->p->context)));
 		pa_stream_unref(pcm->stream);
diff --git a/pulse/pulse.c b/pulse/pulse.c
index 6f58a7e..c313182 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -44,26 +44,6 @@ int pulse_check_connection(snd_pulse_t * p)
 	return 0;
 }
 
-void pulse_stream_state_cb(pa_stream * s, void *userdata)
-{
-	snd_pulse_t *p = userdata;
-
-	assert(s);
-	assert(p);
-
-	pa_threaded_mainloop_signal(p->mainloop, 0);
-}
-
-void pulse_stream_success_cb(pa_stream * s, int success, void *userdata)
-{
-	snd_pulse_t *p = userdata;
-
-	assert(s);
-	assert(p);
-
-	pa_threaded_mainloop_signal(p->mainloop, 0);
-}
-
 void pulse_context_success_cb(pa_context * c, int success, void *userdata)
 {
 	snd_pulse_t *p = userdata;
@@ -101,41 +81,6 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o)
 	return 0;
 }
 
-int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream,
-			    pa_stream_state_t target)
-{
-	pa_stream_state_t state;
-
-	assert(p);
-	assert(stream);
-
-	if (p->state != PULSE_STATE_READY)
-		return -EBADFD;
-
-	if (!p->mainloop)
-		return -EBADFD;
-
-	for (;;) {
-		int err;
-
-		err = pulse_check_connection(p);
-		if (err < 0)
-			return err;
-
-		state = pa_stream_get_state(stream);
-
-		if (state == target)
-			break;
-
-		if (!PA_STREAM_IS_GOOD(state))
-			return -EIO;
-
-		pa_threaded_mainloop_wait(p->mainloop);
-	}
-
-	return 0;
-}
-
 static void context_state_cb(pa_context * c, void *userdata)
 {
 	snd_pulse_t *p = userdata;
diff --git a/pulse/pulse.h b/pulse/pulse.h
index 7bf1a5b..51f9a11 100644
--- a/pulse/pulse.h
+++ b/pulse/pulse.h
@@ -41,13 +41,9 @@ typedef struct snd_pulse {
 
 int pulse_check_connection(snd_pulse_t * p);
 
-void pulse_stream_state_cb(pa_stream * s, void *userdata);
-void pulse_stream_success_cb(pa_stream * s, int success, void *userdata);
 void pulse_context_success_cb(pa_context * c, int success, void *userdata);
 
 int pulse_wait_operation(snd_pulse_t * p, pa_operation * o);
-int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream,
-			    pa_stream_state_t target);
 
 snd_pulse_t *pulse_new(void);
 void pulse_free(snd_pulse_t * p);
-- 
1.6.4


0008-pulse-get-rid-of-redundant-state-variable.patch:
 pulse.c |   14 +++-----------
 pulse.h |    7 -------
 2 files changed, 3 insertions(+), 18 deletions(-)

--- NEW FILE 0008-pulse-get-rid-of-redundant-state-variable.patch ---
>From c3acf0f4df121fef0014bd165fa86ccb1060d669 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Tue, 4 Aug 2009 23:54:42 +0200
Subject: [PATCH 08/11] pulse: get rid of redundant state variable

snd_pulse_t::state was mostly shadowing the state of
pa_context_get_state(snd_pulse_t::context), so get rid of it and use the
state of the context directly.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/pulse.c |   14 +++-----------
 pulse/pulse.h |    6 ------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/pulse/pulse.c b/pulse/pulse.c
index c313182..9c05171 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -59,12 +59,6 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o)
 	assert(p);
 	assert(o);
 
-	if (p->state != PULSE_STATE_READY)
-		return -EBADFD;
-
-	if (!p->mainloop)
-		return -EBADFD;
-
 	for (;;) {
 		int err;
 
@@ -124,8 +118,6 @@ snd_pulse_t *pulse_new(void)
 	if (!p)
 		return NULL;
 
-	p->state = PULSE_STATE_INIT;
-
 	if (pipe(fd)) {
 		free(p);
 		return NULL;
@@ -192,13 +184,15 @@ void pulse_free(snd_pulse_t * p)
 int pulse_connect(snd_pulse_t * p, const char *server)
 {
 	int err;
+	pa_context_state_t state;
 
 	assert(p);
 
 	if (!p->context || !p->mainloop)
 		return -EBADFD;
 
-	if (p->state != PULSE_STATE_INIT)
+	state = pa_context_get_state(p->context);
+	if (state != PA_CONTEXT_UNCONNECTED)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(p->mainloop);
@@ -221,8 +215,6 @@ int pulse_connect(snd_pulse_t * p, const char *server)
 
 	pa_threaded_mainloop_unlock(p->mainloop);
 
-	p->state = PULSE_STATE_READY;
-
 	return 0;
 
       error:
diff --git a/pulse/pulse.h b/pulse/pulse.h
index 51f9a11..e98124f 100644
--- a/pulse/pulse.h
+++ b/pulse/pulse.h
@@ -31,12 +31,6 @@ typedef struct snd_pulse {
 	pa_context *context;
 
 	int thread_fd, main_fd;
-
-	enum {
-		PULSE_STATE_INIT,
-		PULSE_STATE_READY,
-	} state;
-
 } snd_pulse_t;
 
 int pulse_check_connection(snd_pulse_t * p);
-- 
1.6.4


0009-pulse-unify-stream-context-state-checks.patch:
 ctl_pulse.c |   72 ++++++++++++++++++++++++++++++++++++-----------
 pcm_pulse.c |   91 ++++++++++++++++++++++++++----------------------------------
 2 files changed, 95 insertions(+), 68 deletions(-)

--- NEW FILE 0009-pulse-unify-stream-context-state-checks.patch ---
>From 59ccd2aca941b4653803f5415b4985ab35de0c35 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Tue, 4 Aug 2009 23:55:05 +0200
Subject: [PATCH 09/11] pulse: unify stream/context state checks

Unify (and simplify) the paths that check for the validity of a
stream/context: always call into check_stream()/pulse_check_connection()
when applicable instead of rolling our own checks each time. Also check
for validity of mainloop before locking it.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/ctl_pulse.c |   72 ++++++++++++++++++++++++++++++++----------
 pulse/pcm_pulse.c |   90 +++++++++++++++++++++++-----------------------------
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c
index 2caa29b..879f260 100644
--- a/pulse/ctl_pulse.c
+++ b/pulse/ctl_pulse.c
@@ -150,9 +150,13 @@ static int pulse_update_volume(snd_ctl_pulse_t * ctl)
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p)
 		return -EBADFD;
 
+	err = pulse_check_connection(ctl->p);
+	if (err < 0)
+		return err;
+
 	o = pa_context_get_sink_info_by_name(ctl->p->context, ctl->sink,
 					     sink_info_cb, ctl);
 	if (o) {
@@ -182,17 +186,27 @@ static int pulse_update_volume(snd_ctl_pulse_t * ctl)
 static int pulse_elem_count(snd_ctl_ext_t * ext)
 {
 	snd_ctl_pulse_t *ctl = ext->private_data;
-	int count = 0;
+	int count = 0, err;
 
 	assert(ctl);
 
+	if (!ctl->p || !ctl->p->mainloop)
+		return -EBADFD;
+
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
+	err = pulse_check_connection(ctl->p);
+	if (err < 0) {
+		count = err;
+		goto finish;
+	}
+
 	if (ctl->source)
 		count += 2;
 	if (ctl->sink)
 		count += 2;
 
+finish:
 	pa_threaded_mainloop_unlock(ctl->p->mainloop);
 
 	return count;
@@ -202,16 +216,21 @@ static int pulse_elem_list(snd_ctl_ext_t * ext, unsigned int offset,
 			   snd_ctl_elem_id_t * id)
 {
 	snd_ctl_pulse_t *ctl = ext->private_data;
+	int err;
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return -EBADFD;
 
 	snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
+	err = pulse_check_connection(ctl->p);
+	if (err < 0)
+		goto finish;
+
 	if (ctl->source) {
 		if (offset == 0)
 			snd_ctl_elem_id_set_name(id, SOURCE_VOL_NAME);
@@ -220,14 +239,19 @@ static int pulse_elem_list(snd_ctl_ext_t * ext, unsigned int offset,
 	} else
 		offset += 2;
 
+	err = 0;
+
+finish:
 	pa_threaded_mainloop_unlock(ctl->p->mainloop);
 
-	if (offset == 2)
-		snd_ctl_elem_id_set_name(id, SINK_VOL_NAME);
-	else if (offset == 3)
-		snd_ctl_elem_id_set_name(id, SINK_MUTE_NAME);
+	if (err >= 0) {
+		if (offset == 2)
+			snd_ctl_elem_id_set_name(id, SINK_VOL_NAME);
+		else if (offset == 3)
+			snd_ctl_elem_id_set_name(id, SINK_MUTE_NAME);
+	}
 
-	return 0;
+	return err;
 }
 
 static snd_ctl_ext_key_t pulse_find_elem(snd_ctl_ext_t * ext,
@@ -266,7 +290,7 @@ static int pulse_get_attribute(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key,
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
@@ -319,7 +343,7 @@ static int pulse_read_integer(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key,
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
@@ -371,7 +395,7 @@ static int pulse_write_integer(snd_ctl_ext_t * ext, snd_ctl_ext_key_t key,
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
@@ -476,7 +500,7 @@ static void pulse_subscribe_events(snd_ctl_ext_t * ext, int subscribe)
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
@@ -491,17 +515,23 @@ static int pulse_read_event(snd_ctl_ext_t * ext, snd_ctl_elem_id_t * id,
 {
 	snd_ctl_pulse_t *ctl = ext->private_data;
 	int offset;
-	int err = -EAGAIN;
+	int err;
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
-	if (!ctl->updated || !ctl->subscribed)
+	err = pulse_check_connection(ctl->p);
+	if (err < 0)
+		goto finish;
+
+	if (!ctl->updated || !ctl->subscribed) {
+		err = -EAGAIN;
 		goto finish;
+	}
 
 	if (ctl->source)
 		offset = 2;
@@ -540,20 +570,28 @@ static int pulse_ctl_poll_revents(snd_ctl_ext_t * ext, struct pollfd *pfd,
 				  unsigned short *revents)
 {
 	snd_ctl_pulse_t *ctl = ext->private_data;
-	int err = 0;
+	int err;
 
 	assert(ctl);
 
-	if (!ctl->p || !ctl->p->mainloop || !ctl->p->context)
+	if (!ctl->p || !ctl->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(ctl->p->mainloop);
 
+	err = pulse_check_connection(ctl->p);
+	if (err < 0)
+		goto finish;
+
 	if (ctl->updated)
 		*revents = POLLIN;
 	else
 		*revents = 0;
 
+	err = 0;
+
+finish:
+
 	pa_threaded_mainloop_unlock(ctl->p->mainloop);
 
 	return err;
diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c
index a625f55..98983f8 100644
--- a/pulse/pcm_pulse.c
+++ b/pulse/pcm_pulse.c
@@ -135,11 +135,15 @@ static int update_active(snd_pcm_pulse_t *pcm) {
 	if (!pcm->p)
 		return -EBADFD;
 
-	ret = check_active(pcm);
+	ret = check_stream(pcm);
 	if (ret < 0)
-		return ret;
+		goto finish;
+
+	ret = check_active(pcm);
 
-	if (ret > 0)
+finish:
+
+	if (ret != 0) /* On error signal the caller, too */
 		pulse_poll_activate(pcm->p);
 	else
 		pulse_poll_deactivate(pcm->p);
@@ -199,12 +203,12 @@ static int pulse_start(snd_pcm_ioplug_t * io)
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	err = pulse_check_connection(pcm->p);
+	err = check_stream(pcm);
 	if (err < 0)
 		goto finish;
 
@@ -244,12 +248,12 @@ static int pulse_stop(snd_pcm_ioplug_t * io)
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	err = pulse_check_connection(pcm->p);
+	err = check_stream(pcm);
 	if (err < 0)
 		goto finish;
 
@@ -291,12 +295,12 @@ static int pulse_drain(snd_pcm_ioplug_t * io)
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	err = pulse_check_connection(pcm->p);
+	err = check_stream(pcm);
 	if (err < 0)
 		goto finish;
 
@@ -328,7 +332,7 @@ static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io)
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	if (io->state == SND_PCM_STATE_XRUN)
@@ -339,12 +343,7 @@ static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io)
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	if (!pcm->stream) {
-		ret = -EBADFD;
-		goto finish;
-	}
-
-	ret = pulse_check_connection(pcm->p);
+	ret = check_stream(pcm);
 	if (ret < 0)
 		goto finish;
 
@@ -379,18 +378,13 @@ static int pulse_delay(snd_pcm_ioplug_t * io, snd_pcm_sframes_t * delayp)
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	if (!pcm->stream) {
-		err = -EBADFD;
-		goto finish;
-	}
-
 	for (;;) {
-		err = pulse_check_connection(pcm->p);
+		err = check_stream(pcm);
 		if (err < 0)
 			goto finish;
 
@@ -433,17 +427,12 @@ static snd_pcm_sframes_t pulse_write(snd_pcm_ioplug_t * io,
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	if (!pcm->stream) {
-		ret = -EBADFD;
-		goto finish;
-	}
-
-	ret = pulse_check_connection(pcm->p);
+	ret = check_stream(pcm);
 	if (ret < 0)
 		goto finish;
 
@@ -493,17 +482,12 @@ static snd_pcm_sframes_t pulse_read(snd_pcm_ioplug_t * io,
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	if (!pcm->stream) {
-		ret = -EBADFD;
-		goto finish;
-	}
-
-	ret = pulse_check_connection(pcm->p);
+	ret = check_stream(pcm);
 	if (ret < 0)
 		goto finish;
 
@@ -624,13 +608,16 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io,
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	err = check_active(pcm);
+	err = check_stream(pcm);
+	if (err < 0)
+		goto finish;
 
+	err = check_active(pcm);
 	if (err < 0)
 		goto finish;
 
@@ -655,7 +642,7 @@ static int pulse_prepare(snd_pcm_ioplug_t * io)
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
@@ -757,7 +744,7 @@ static int pulse_hw_params(snd_pcm_ioplug_t * io,
 
 	assert(pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
@@ -856,23 +843,26 @@ static int pulse_pause(snd_pcm_ioplug_t * io, int enable)
 {
 	snd_pcm_pulse_t *pcm = io->private_data;
 	int err = 0;
+	pa_operation *o;
 
 	assert (pcm);
 
-	if (!pcm->p)
+	if (!pcm->p || !pcm->p->mainloop)
 		return -EBADFD;
 
 	pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	if (pcm->stream) {
-		pa_operation *o;
-		o = pa_stream_cork(pcm->stream, enable, NULL, NULL);
-		if (o)
-			pa_operation_unref(o);
-		else
-			err = -EIO;
-	}
+	err = check_stream(pcm);
+	if (err < 0)
+		goto finish;
+
+	o = pa_stream_cork(pcm->stream, enable, NULL, NULL);
+	if (o)
+		pa_operation_unref(o);
+	else
+		err = -EIO;
 
+finish:
 	pa_threaded_mainloop_unlock(pcm->p->mainloop);
 
 	return err;
-- 
1.6.4


0010-pulse-rework-object-destruction-paths-a-bit.patch:
 ctl_pulse.c |    7 ++-----
 pcm_pulse.c |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

--- NEW FILE 0010-pulse-rework-object-destruction-paths-a-bit.patch ---
>From 50562a9d5d54270ab67f183013204d24cdbeff21 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Tue, 4 Aug 2009 23:55:28 +0200
Subject: [PATCH 10/11] pulse: rework object destruction paths a bit

Make sure we deal better with partially initialized structs.

Don't check for pointer state before calling free() since free() does
that anyway.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/ctl_pulse.c |    7 ++-----
 pulse/pcm_pulse.c |   19 ++++++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c
index 879f260..85863ed 100644
--- a/pulse/ctl_pulse.c
+++ b/pulse/ctl_pulse.c
@@ -606,11 +606,8 @@ static void pulse_close(snd_ctl_ext_t * ext)
 	if (ctl->p)
 		pulse_free(ctl->p);
 
-	if (ctl->source)
-		free(ctl->source);
-	if (ctl->sink)
-		free(ctl->sink);
-
+	free(ctl->source);
+	free(ctl->sink);
 	free(ctl);
 }
 
diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c
index 98983f8..02a837e 100644
--- a/pulse/pcm_pulse.c
+++ b/pulse/pcm_pulse.c
@@ -819,21 +819,22 @@ static int pulse_close(snd_pcm_ioplug_t * io)
 
 	assert(pcm);
 
-	pa_threaded_mainloop_lock(pcm->p->mainloop);
+	if (pcm->p && pcm->p->mainloop) {
 
-	if (pcm->stream) {
-		pa_stream_disconnect(pcm->stream);
-		pa_stream_unref(pcm->stream);
-	}
+		pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-	pa_threaded_mainloop_unlock(pcm->p->mainloop);
+		if (pcm->stream) {
+			pa_stream_disconnect(pcm->stream);
+			pa_stream_unref(pcm->stream);
+		}
+
+		pa_threaded_mainloop_unlock(pcm->p->mainloop);
+	}
 
 	if (pcm->p)
 		pulse_free(pcm->p);
 
-	if (pcm->device)
-		free(pcm->device);
-
+	free(pcm->device);
 	free(pcm);
 
 	return 0;
-- 
1.6.4


0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch:
 pulse.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE 0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch ---
>From 4c71fdd22dbfaf7b5fb7de62bbc9dd4002e788db Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Tue, 4 Aug 2009 23:56:00 +0200
Subject: [PATCH 11/11] pulse: immediately trigger EIO when connection is dropped

When the connection is dropped notify the application immediately
instead of waiting until the applications calls into us the next time.

This makes "aplay" handle connections shutdown similar to hardware
unplugs: an immediate EIO is thrown.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 pulse/pulse.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/pulse/pulse.c b/pulse/pulse.c
index 9c05171..f26363a 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -77,10 +77,17 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o)
 
 static void context_state_cb(pa_context * c, void *userdata)
 {
+	pa_context_state_t state;
 	snd_pulse_t *p = userdata;
 	assert(c);
 
-	switch (pa_context_get_state(c)) {
+	state = pa_context_get_state(c);
+
+	/* When we get disconnected, tell the process */
+	if (!PA_CONTEXT_IS_GOOD(state))
+		pulse_poll_activate(p);
+
+	switch (state) {
 	case PA_CONTEXT_READY:
 	case PA_CONTEXT_TERMINATED:
 	case PA_CONTEXT_FAILED:
-- 
1.6.4



Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- alsa-plugins.spec	31 Jul 2009 14:04:31 -0000	1.25
+++ alsa-plugins.spec	4 Aug 2009 22:15:24 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.20
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -16,11 +16,17 @@ Source6:        vdownmix.conf
 Source7:        pulse-default.conf
 Source8:        arcamav.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		0001-alsa-plugins-pulse-Implement-pause.patch
-Patch1:		0001-alsa-get-rid-of-a-number-of-assert-s.patch
-Patch2:		0002-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch
-Patch3:		0003-pulse-unify-destruction-of-snd_pulse_t.patch
-Patch4:		0004-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch
+Patch1:		0001-alsa-plugins-pulse-Implement-pause.patch
+Patch2:		0002-pulse-get-rid-of-a-number-of-assert-s.patch
+Patch3:		0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch
+Patch4:		0004-pulse-unify-destruction-of-snd_pulse_t.patch
+Patch5:		0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch
+Patch6:		0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch
+Patch7:		0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch
+Patch8:		0008-pulse-get-rid-of-redundant-state-variable.patch
+Patch9:		0009-pulse-unify-stream-context-state-checks.patch
+Patch10:	0010-pulse-rework-object-destruction-paths-a-bit.patch
+Patch11:	0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch
 
 BuildRequires:  alsa-lib-devel
 
@@ -128,11 +134,17 @@ pre-processing of a mono stream like den
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch0 -p1
 %patch1 -p1 
 %patch2 -p1 
 %patch3 -p1 
 %patch4 -p1 
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %configure --disable-static \
@@ -235,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 4 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-5
+- Add a couple of more clean up patches for the pulse plugin
+
 * Fri Jul 31 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-4
 - Add a couple of clean up patches for the pulse plugin
 


--- 0001-alsa-get-rid-of-a-number-of-assert-s.patch DELETED ---


--- 0001-alsa-plugins-pulse-Implement-pause.patch DELETED ---


--- 0002-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch DELETED ---


--- 0003-pulse-unify-destruction-of-snd_pulse_t.patch DELETED ---


--- 0004-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch DELETED ---



From lennart at fedoraproject.org  Tue Aug  4 22:16:06 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue,  4 Aug 2009 22:16:06 +0000 (UTC)
Subject: rpms/alsa-plugins/devel
	0001-alsa-plugins-pulse-Implement-pause.patch, 1.2, 1.3
Message-ID: <20090804221606.CA8FE11C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18789

Added Files:
	0001-alsa-plugins-pulse-Implement-pause.patch 
Log Message:
add missing 0001-alsa-plugins-pulse-Implement-pause.patch

0001-alsa-plugins-pulse-Implement-pause.patch:
 pcm_pulse.c |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

Index: 0001-alsa-plugins-pulse-Implement-pause.patch
===================================================================
RCS file: 0001-alsa-plugins-pulse-Implement-pause.patch
diff -N 0001-alsa-plugins-pulse-Implement-pause.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0001-alsa-plugins-pulse-Implement-pause.patch	4 Aug 2009 22:16:06 -0000	1.3
@@ -0,0 +1,59 @@
+From d9a839d51255c939f394f770b249c8a4a9600122 Mon Sep 17 00:00:00 2001
+From: Troy Moure <twmoure at szypr.net>
+Date: Thu, 18 Jun 2009 14:55:21 +0100
+Subject: [PATCH 01/11] alsa-plugins/pulse: Implement 'pause'.
+
+Just cork or uncork the stream to pause or unpause it.
+
+Signed-off-by: Troy Moure <twmoure at szypr.net>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ pulse/pcm_pulse.c |   25 +++++++++++++++++++++++++
+ 1 files changed, 25 insertions(+), 0 deletions(-)
+
+diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c
+index db8d1e1..c276839 100644
+--- a/pulse/pcm_pulse.c
++++ b/pulse/pcm_pulse.c
+@@ -739,6 +739,30 @@ static int pulse_close(snd_pcm_ioplug_t * io)
+ 	return 0;
+ }
+ 
++static int pulse_pause(snd_pcm_ioplug_t * io, int enable)
++{
++	snd_pcm_pulse_t *pcm = io->private_data;
++	int err = 0;
++
++	assert (pcm);
++	assert (pcm->p);
++
++	pa_threaded_mainloop_lock(pcm->p->mainloop);
++
++	if (pcm->stream) {
++		pa_operation *o;
++		o = pa_stream_cork(pcm->stream, enable, NULL, NULL);
++		if (o)
++			pa_operation_unref(o);
++		else
++			err = -EIO;
++	}
++
++	pa_threaded_mainloop_unlock(pcm->p->mainloop);
++
++	return err;
++}
++
+ static const snd_pcm_ioplug_callback_t pulse_playback_callback = {
+ 	.start = pulse_start,
+ 	.stop = pulse_stop,
+@@ -750,6 +774,7 @@ static const snd_pcm_ioplug_callback_t pulse_playback_callback = {
+ 	.prepare = pulse_prepare,
+ 	.hw_params = pulse_hw_params,
+ 	.close = pulse_close,
++	.pause = pulse_pause
+ };
+ 
+ 
+-- 
+1.6.4
+



From dcantrel at fedoraproject.org  Tue Aug  4 22:16:25 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  4 Aug 2009 22:16:25 +0000 (UTC)
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.104,1.105
Message-ID: <20090804221625.2301D11C00E4@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18870

Modified Files:
	dhcpv6.spec 
Log Message:
* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-2
- BuildRequires glib2-devel



Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- dhcpv6.spec	4 Aug 2009 05:38:07 -0000	1.104
+++ dhcpv6.spec	4 Aug 2009 22:16:24 -0000	1.105
@@ -7,7 +7,7 @@
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
 Version: 2.0.0alpha1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
@@ -21,6 +21,7 @@ BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: libnl-devel >= %{libnlver}
+BuildRequires: glib2-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig initscripts
 Requires(postun): initscripts
@@ -121,6 +122,9 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-2
+- BuildRequires glib2-devel
+
 * Mon Aug 03 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-1
 - Upgraded to dhcpv6-2.0.0-alpha1
 



From deji at fedoraproject.org  Tue Aug  4 22:28:34 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 22:28:34 +0000 (UTC)
Subject: rpms/atlas/devel atlas.spec,1.25,1.26
Message-ID: <20090804222834.C696211C00E4@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22124

Modified Files:
	atlas.spec 
Log Message:
* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-7
- Create a -header subpackage to avoid multilib conflicts (BZ#508565). 



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- atlas.spec	4 Aug 2009 04:55:33 -0000	1.25
+++ atlas.spec	4 Aug 2009 22:28:34 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -35,11 +35,20 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	%name-header = %version-%release
 
 %description devel
-This package contains the static libraries and headers for development
+This package contains the shared and static libraries for development
 with ATLAS (Automatically Tuned Linear Algebra Software).
 
+%package header
+Summary:	atlas header files
+Group:		Development/Libraries
+BuildArch:	noarch
+
+%description header
+This package contains the header files for for development with ATLAS.
+
 %define types base
 
 %if "%{?enable_native_atlas}" == "0"
@@ -67,11 +76,12 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
+Requires:	%name-header = %version-%release
 Obsoletes:	%{name}-3dnow-devel < 3.7
 Provides:	%{name}-3dnow-devel = %{version}-%{release}
 
 %description sse-devel
-This package contains headers and static versions of the ATLAS
+This package contains shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE(1) extensions to the ix86 architecture.
 
@@ -91,11 +101,12 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
+Requires:	%name-header = %version-%release
 Obsoletes:	%{name}-devel < 3.7
 Provides:	%{name}-devel = %{version}-%{release}
 
 %description sse2-devel
-This package contains headers and static versions of the ATLAS
+This package contains shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE2 extensions to the ix86 architecture.
 
@@ -112,9 +123,10 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
+Requires:	%name-header = %version-%release
 
 %description sse3-devel
-This package contains headers and static versions of the ATLAS
+This package contains shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the sse3 extensions to the ix86 architecture.
 
@@ -212,8 +224,6 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %else
 
@@ -241,8 +251,6 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse/*.so
 %{_libdir}/atlas-sse/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %files sse2
 %defattr(-,root,root,-)
@@ -260,8 +268,6 @@ rm -rf %{buildroot}
 %{_libdir}/atlas-sse2/*.a
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %files sse3
 %defattr(-,root,root,-)
@@ -275,12 +281,18 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse3/*.so
 %{_libdir}/atlas-sse3/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %endif
 
+%files header
+%defattr(-,root,root,-)
+%{_includedir}/atlas
+%{_includedir}/*.h
+
 %changelog
+* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-7
+- Create a -header subpackage to avoid multilib conflicts (BZ#508565). 
+
 * Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-6
 - Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813)
 - Build for F12



From deji at fedoraproject.org  Tue Aug  4 22:31:55 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  4 Aug 2009 22:31:55 +0000 (UTC)
Subject: rpms/atlas/F-11 atlas.spec,1.22,1.23
Message-ID: <20090804223155.7FCD711C00E4@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22889

Modified Files:
	atlas.spec 
Log Message:
* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-7
- Create a -header subpackage to avoid multilib conflicts (BZ#508565). 



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-11/atlas.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- atlas.spec	3 May 2009 13:02:01 -0000	1.22
+++ atlas.spec	4 Aug 2009 22:31:55 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -35,11 +35,20 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	%name-header = %version-%release
 
 %description devel
-This package contains the static libraries and headers for development
+This package contains the shared and static libraries for development
 with ATLAS (Automatically Tuned Linear Algebra Software).
 
+%package header
+Summary:	atlas header files
+Group:		Development/Libraries
+BuildArch:	noarch
+
+%description header
+This package contains the header files for for development with ATLAS.
+
 %define types base
 
 %if "%{?enable_native_atlas}" == "0"
@@ -48,7 +57,7 @@ with ATLAS (Automatically Tuned Linear A
 # Because a set of ATLAS libraries is a ~5 MB package, separate packages
 # are created for SSE, SSE2, and SSE3 extensions to ix86.
 
-%ifarch i586
+%ifarch %{ix86}
 %define types sse sse2 sse3
 
 %package sse
@@ -67,11 +76,12 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
+Requires:	%name-header = %version-%release
 Obsoletes:	%{name}-3dnow-devel < 3.7
 Provides:	%{name}-3dnow-devel = %{version}-%{release}
 
 %description sse-devel
-This package contains headers and static versions of the ATLAS
+This package contains shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE(1) extensions to the ix86 architecture.
 
@@ -91,11 +101,12 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
+Requires:	%name-header = %version-%release
 Obsoletes:	%{name}-devel < 3.7
 Provides:	%{name}-devel = %{version}-%{release}
 
 %description sse2-devel
-This package contains headers and static versions of the ATLAS
+This package contains shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE2 extensions to the ix86 architecture.
 
@@ -112,9 +123,10 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
+Requires:	%name-header = %version-%release
 
 %description sse3-devel
-This package contains headers and static versions of the ATLAS
+This package contains shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the sse3 extensions to the ix86 architecture.
 
@@ -141,7 +153,7 @@ for type in %{types}; do
 	fi
 	mkdir -p %{_arch}_${type}
 	pushd %{_arch}_${type}
-	../configure -b %{mode} -D c -DWALL -Fa alg '-Wa,--noexecstack -fPIC'\
+	../configure -b %{mode} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
 	--prefix=%{buildroot}%{_prefix}			\
 	--incdir=%{buildroot}%{_includedir}		\
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
@@ -186,7 +198,7 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
-%ifarch i586 && %if "%{?enable_native_atlas}" == "0"
+%ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 cp -pr %{buildroot}%{_libdir}/atlas-sse2 %{buildroot}%{_libdir}/atlas
 echo "%{_libdir}/atlas"	>> %{buildroot}/etc/ld.so.conf.d/atlas-sse2.conf
 %endif
@@ -194,7 +206,7 @@ echo "%{_libdir}/atlas"	>> %{buildroot}/
 %clean
 rm -rf %{buildroot}
 
-%ifnarch i586 || %if "%{?enable_native_atlas}" == "1"
+%ifnarch %{ix86} || %if "%{?enable_native_atlas}" == "1"
 
 %post -p /sbin/ldconfig
 
@@ -212,8 +224,6 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %else
 
@@ -241,8 +251,6 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse/*.so
 %{_libdir}/atlas-sse/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %files sse2
 %defattr(-,root,root,-)
@@ -260,8 +268,6 @@ rm -rf %{buildroot}
 %{_libdir}/atlas-sse2/*.a
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %files sse3
 %defattr(-,root,root,-)
@@ -275,12 +281,25 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse3/*.so
 %{_libdir}/atlas-sse3/*.a
-%{_includedir}/atlas
-%{_includedir}/*.h
 
 %endif
 
+%files header
+%defattr(-,root,root,-)
+%{_includedir}/atlas
+%{_includedir}/*.h
+
 %changelog
+* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-7
+- Create a -header subpackage to avoid multilib conflicts (BZ#508565). 
+
+* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-6
+- Add '-g' to build flag to allow proper genration of debuginfo subpackages (Fedora bug #509813)
+- Build for F12
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 02 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-4
 - Use the right -msse* option for the -sse* subpackages (Fedora bug #498715)
 



From mso at fedoraproject.org  Tue Aug  4 22:37:10 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Tue,  4 Aug 2009 22:37:10 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel constantine-backgrounds.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090804223710.6DC1211C00E4@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	constantine-backgrounds.spec import.log 
Log Message:


Import constantine-backgrounds package (rhbz #515531).




--- NEW FILE constantine-backgrounds.spec ---
Name:           constantine-backgrounds
Version:        11.90.1
Release:        1%{?dist}
Summary:        Constantine desktop backgrounds

Group:          Applications/Multimedia
License:        CC-BY-SA
URL:            https://fedoraproject.org/wiki/F12_Artwork
Source0:        https://fedorahosted.org/releases/f/e/fedora-design/%{name}-%{version}.tar.lzma
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
This package contains desktop backgrounds for the Constantine theme.

%package        extras
Summary:        Extra Constantine Backgrounds
Group:          Applications/Multimedia

%description    extras
This package contains aditional desktop backgrounds for the Constantine theme.


%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
# prepare the dir structure
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/default
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/default/standard
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/default/wide
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/extras
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/extras/standard
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/extras/wide
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties

# copy the images and xml files
cp -a $RPM_BUILD_DIR/%{name}-%{version}/default \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine
cp -a $RPM_BUILD_DIR/%{name}-%{version}/extras \
        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine
        
# copy metadata xml files
cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-constantine.xml \
        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-constantine-extras.xml \
        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING Credits
%dir %{_datadir}/backgrounds/constantine
%{_datadir}/backgrounds/constantine/default
%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml

%files extras
%defattr(-,root,root,-)
%doc COPYING Credits
%dir %{_datadir}/backgrounds/constantine
%{_datadir}/backgrounds/constantine/extras
%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine-extras.xml


%changelog
* Wed Aug 05 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.1-1
- Move Constantin Statue from extras to default per frequent requests

* Tue Aug 04 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.0-2
- We now have space on fedorahosted -> source tarball is available there

* Tue Aug 04 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.0-1
- Initial RPM packaging


--- NEW FILE import.log ---
constantine-backgrounds-11_90_1-1_fc11:HEAD:constantine-backgrounds-11.90.1-1.fc11.src.rpm:1249425377


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:32:12 -0000	1.1
+++ .cvsignore	4 Aug 2009 22:37:09 -0000	1.2
@@ -0,0 +1 @@
+constantine-backgrounds-11.90.1.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:32:12 -0000	1.1
+++ sources	4 Aug 2009 22:37:09 -0000	1.2
@@ -0,0 +1 @@
+10d80cda422b5754a84994a79ee35b62  constantine-backgrounds-11.90.1.tar.lzma



From whot at fedoraproject.org  Tue Aug  4 22:44:39 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  4 Aug 2009 22:44:39 +0000 (UTC)
Subject: rpms/libXi/devel .cvsignore, 1.18, 1.19 commitid, 1.4,
	1.5 libXi.spec, 1.37, 1.38 sources, 1.19, 1.20
Message-ID: <20090804224439.61B9B11C00E4@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25754

Modified Files:
	.cvsignore commitid libXi.spec sources 
Log Message:
* Wed Aug 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-10.20090805
- Update to today's git master
- Re-enable parallel builds, the man page makefile is fixed now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	4 Aug 2009 04:42:00 -0000	1.18
+++ .cvsignore	4 Aug 2009 22:44:38 -0000	1.19
@@ -1 +1 @@
-libXi-20090804.tar.bz2
+libXi-20090805.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/commitid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- commitid	4 Aug 2009 04:42:00 -0000	1.4
+++ commitid	4 Aug 2009 22:44:38 -0000	1.5
@@ -1 +1 @@
-aa8272dd31b69f84d19dbe2c45889b806df8260e
+bc3900ea706438005f8b5613de4d9fb6bd954f62


Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libXi.spec	4 Aug 2009 04:42:00 -0000	1.37
+++ libXi.spec	4 Aug 2009 22:44:38 -0000	1.38
@@ -1,10 +1,10 @@
 %define tarball libXi
-%define gitdate 20090804
+%define gitdate 20090805
 
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.2.99
-Release: 9.%{gitdate}%{?dist}
+Release: 10.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -51,8 +51,7 @@ autoreconf -v --install || exit 1
 	--disable-static
 %endif
 
-# FIXME: parallel builds disabled. Man page hate.
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-10.20090805
+- Update to today's git master
+- Re-enable parallel builds, the man page makefile is fixed now.
+
 * Tue Aug 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-9.20090804
 - Update to today's git master
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	4 Aug 2009 04:42:00 -0000	1.19
+++ sources	4 Aug 2009 22:44:38 -0000	1.20
@@ -1 +1 @@
-e3c7fab893b4ff8d2e891fd99ab34886  libXi-20090804.tar.bz2
+778252cf450025f852466c656f5ae87f  libXi-20090805.tar.bz2



From dcantrel at fedoraproject.org  Tue Aug  4 22:50:04 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  4 Aug 2009 22:50:04 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.34, 1.35 pyparted.spec, 1.64,
	1.65 sources, 1.39, 1.40
Message-ID: <20090804225004.ABF7211C0382@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27039

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.1.1-1
- Upgrade to pyparted-2.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	17 Jul 2009 00:55:14 -0000	1.34
+++ .cvsignore	4 Aug 2009 22:50:04 -0000	1.35
@@ -1 +1 @@
-pyparted-2.1.0.tar.gz
+pyparted-2.1.1.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- pyparted.spec	26 Jul 2009 19:56:50 -0000	1.64
+++ pyparted.spec	4 Aug 2009 22:50:04 -0000	1.65
@@ -2,8 +2,8 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.1.0
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     http://fedorahosted.org/pyparted
@@ -44,6 +44,9 @@ partition tables.
 %{python_sitearch}/parted
 
 %changelog
+* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.1.1-1
+- Upgrade to pyparted-2.1.1
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	17 Jul 2009 00:55:14 -0000	1.39
+++ sources	4 Aug 2009 22:50:04 -0000	1.40
@@ -1 +1 @@
-6f78f2f4d5b936bce915d6bfb6785c58  pyparted-2.1.0.tar.gz
+80b2afa23e0cc5d2e4c65718c06fe104  pyparted-2.1.1.tar.gz



From lkundrak at fedoraproject.org  Tue Aug  4 22:54:51 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  4 Aug 2009 22:54:51 +0000 (UTC)
Subject: rpms/crash/devel .cvsignore, 1.5, 1.6 crash.spec, 1.32, 1.33 sources,
	1.5, 1.6
Message-ID: <20090804225451.86CA611C00E4@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/crash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28211

Modified Files:
	.cvsignore crash.spec sources 
Log Message:
* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 4.0.8.11-1
- Update to later upstream release
- Fix abuse of Revision tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Jan 2006 19:34:09 -0000	1.5
+++ .cvsignore	4 Aug 2009 22:54:49 -0000	1.6
@@ -1,3 +1 @@
-crash-3.8.tar.gz
-crash-3.10.tar.gz
-crash-4.0.tar.gz
+crash-4.0-8.11.tar.gz


Index: crash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/crash.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- crash.spec	24 Jul 2009 19:37:52 -0000	1.32
+++ crash.spec	4 Aug 2009 22:54:50 -0000	1.33
@@ -1,20 +1,22 @@
+%global major_version 4.0
+%global minor_version 8.11
+
 #
 # crash core analysis suite
 #
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
-Version: 4.0
-Release: 9.7.2%{?dist}
+Version: %{major_version}.%{minor_version}
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Debuggers
-Source: %{name}-%{version}.tar.gz
+Source: http://people.redhat.com/anderson/crash-%{major_version}-%{minor_version}.tar.gz
 URL: http://people.redhat.com/anderson
 ExclusiveOS: Linux
 ExclusiveArch: %{ix86} ia64 x86_64 ppc64 s390 s390x
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires: ncurses-devel zlib-devel
 Requires: binutils
-Patch0: crash.patch-4.0-7.7
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -34,8 +36,7 @@ netdump, diskdump and kdump packages fro
 offered by Mission Critical Linux, or the LKCD kernel patch.
 
 %prep
-%setup -n %{name}-%{version} -q
-%patch0 -p1 -b crash.patch-4.0-7.7
+%setup -n %{name}-%{major_version}-%{minor_version} -q
 
 %build
 make RPMPKG="%{version}-%{release}"
@@ -64,6 +65,11 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 4.0.8.11-1
+- Update to later upstream release
+- Fix abuse of Revision tag
+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-9.7.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Jan 2006 19:34:13 -0000	1.5
+++ sources	4 Aug 2009 22:54:50 -0000	1.6
@@ -1 +1 @@
-9b5de0153fc2701a8ea93e02aebf0f23  crash-4.0.tar.gz
+a25175fcd6a87bb6eb7b654d2b6cf0bf  crash-4.0-8.11.tar.gz



From rdieter at fedoraproject.org  Tue Aug  4 22:57:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 22:57:47 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.96,1.97
Message-ID: <20090804225747.AB01811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29044

Modified Files:
	kdepimlibs.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- akonadi_version 1.2.0



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kdepimlibs.spec	30 Jul 2009 08:49:00 -0000	1.96
+++ kdepimlibs.spec	4 Aug 2009 22:57:47 -0000	1.97
@@ -8,11 +8,11 @@
 %endif
 
 %define akonadi_subpkg 1
-%define akonadi_version 1.1.95
+%define akonadi_version 1.2.0
 
 Name: kdepimlibs
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -213,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- akonadi_version 1.2.0
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Tue Aug  4 23:04:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 23:04:47 +0000 (UTC)
Subject: rpms/kdepimlibs/F-11 .cvsignore, 1.37, 1.38 kdepimlibs.spec, 1.89, 
	1.90 sources, 1.37, 1.38 kdepimlibs_4.2.patch, 1.1, NONE
Message-ID: <20090804230447.7ECD111C0344@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30991/F-11

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs_4.2.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	31 May 2009 14:03:55 -0000	1.37
+++ .cvsignore	4 Aug 2009 23:04:46 -0000	1.38
@@ -1 +1,5 @@
-kdepimlibs-4.2.4.tar.bz2
+kdepimlibs-4.2.90.tar.bz2
+kdepimlibs-4.2.95.tar.bz2
+kdepimlibs-4.2.96.tar.bz2
+kdepimlibs-4.2.98.tar.bz2
+kdepimlibs-4.3.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-11/kdepimlibs.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kdepimlibs.spec	26 Jun 2009 10:43:07 -0000	1.89
+++ kdepimlibs.spec	4 Aug 2009 23:04:46 -0000	1.90
@@ -1,9 +1,6 @@
-
 %if 0%{?fedora} > 8
-%ifnarch armv5tel sparcv9 sparc64
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
-%endif
 %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
@@ -11,28 +8,24 @@
 %endif
 
 %define akonadi_subpkg 1
-%define akonadi_version 1.1.1
+%define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.2.4
+Version: 4.3.0
 Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# 4.2 upstream patches
-# Patch100, GPGME 1.2.0 will break crypto in kdepim,
-# https://bugs.kde.org/show_bug.cgi?id=197458
-Patch100: kdepimlibs_4.2.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
 Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
-Requires: akonadi >= %{akonadi_version}
+Requires: akonadi%{?_isa} >= %{akonadi_version}
 %endif
 Requires: kdelibs4 >= %{version}
 
@@ -51,6 +44,9 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+# stuff moved kdepim -> kdepimlibs, help upgrade path
+Conflicts: kdepim < 6:4.2.90
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -78,7 +74,7 @@ Group: System Environment/Libraries
 # when pkg split occurrs, not sure if this is really needed, but... -- Rex
 #Obsoletes: kdepimlibs < 4.2.0-3
 Requires: %{name} = %{version}-%{release}
-Requires: akonadi >= %{akonadi_version}
+Requires: akonadi%{?_isa} >= %{akonadi_version}
 %description akonadi
 %{summary}.
 
@@ -98,8 +94,6 @@ format for easy browsing.
 %prep
 %setup -q -n kdepimlibs-%{version}
 
-#upstream patches
-%patch100 -p0 -b .kde#197458
 
 %build
 mkdir -p %{_target_platform}
@@ -188,7 +182,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kioslave/
-
+%{_kde4_appsdir}/libkholidays/
+%{_kde4_datadir}/mime/packages/kdepimlibs-mime.xml
 %if 0%{?akonadi_subpkg}
 %exclude %{_kde4_libdir}/libakonadi-*.so.*
 %files akonadi
@@ -218,17 +213,44 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.4-2
-- fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- akonadi_version 1.2.0
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-3
+- Conflicts: kdepim < 4.2.90
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- License: LGPLv2+
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- akonadi_version 1.1.95
+
+* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-2
+- respin
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 RC1
 
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Tue May 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-1.1
-- no -apidocs for arm, sparc bootstrap (no graphviz)
+* Sun May 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
+- (min) akonadi_version 1.1.85
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- 4.2.85
 
 * Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
 - fix libkcal devel symlink hack


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	31 May 2009 14:03:55 -0000	1.37
+++ sources	4 Aug 2009 23:04:47 -0000	1.38
@@ -1 +1 @@
-ee1d783140be0bb67652784f6fa93f70  kdepimlibs-4.2.4.tar.bz2
+313f1a9d353f82c2ffee517115404dd5  kdepimlibs-4.3.0.tar.bz2


--- kdepimlibs_4.2.patch DELETED ---



From rdieter at fedoraproject.org  Tue Aug  4 23:04:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 23:04:47 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 .cvsignore, 1.32, 1.33 kdepimlibs.spec, 1.69, 
	1.70 sources, 1.34, 1.35 kdepimlibs_4.2.patch, 1.1, NONE
Message-ID: <20090804230447.4CF6311C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30991/F-10

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs_4.2.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	31 May 2009 14:03:54 -0000	1.32
+++ .cvsignore	4 Aug 2009 23:04:43 -0000	1.33
@@ -1 +1,5 @@
-kdepimlibs-4.2.4.tar.bz2
+kdepimlibs-4.2.90.tar.bz2
+kdepimlibs-4.2.95.tar.bz2
+kdepimlibs-4.2.96.tar.bz2
+kdepimlibs-4.2.98.tar.bz2
+kdepimlibs-4.3.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- kdepimlibs.spec	26 Jun 2009 11:01:45 -0000	1.69
+++ kdepimlibs.spec	4 Aug 2009 23:04:45 -0000	1.70
@@ -1,9 +1,6 @@
-
 %if 0%{?fedora} > 8
-%ifnarch armv5tel sparcv9 sparc64
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
-%endif
 %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
@@ -11,28 +8,24 @@
 %endif
 
 %define akonadi_subpkg 1
-%define akonadi_version 1.1.1
+%define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.2.4
+Version: 4.3.0
 Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# 4.2 upstream patches
-# Patch100, GPGME 1.2.0 will break crypto in kdepim,
-# https://bugs.kde.org/show_bug.cgi?id=197458
-Patch100: kdepimlibs_4.2.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
 Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
-Requires: akonadi >= %{akonadi_version}
+Requires: akonadi%{?_isa} >= %{akonadi_version}
 %endif
 Requires: kdelibs4 >= %{version}
 
@@ -51,6 +44,9 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+# stuff moved kdepim -> kdepimlibs, help upgrade path
+Conflicts: kdepim < 6:4.2.90
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -78,7 +74,7 @@ Group: System Environment/Libraries
 # when pkg split occurrs, not sure if this is really needed, but... -- Rex
 #Obsoletes: kdepimlibs < 4.2.0-3
 Requires: %{name} = %{version}-%{release}
-Requires: akonadi >= %{akonadi_version}
+Requires: akonadi%{?_isa} >= %{akonadi_version}
 %description akonadi
 %{summary}.
 
@@ -98,8 +94,6 @@ format for easy browsing.
 %prep
 %setup -q -n kdepimlibs-%{version}
 
-#upstream patches
-%patch100 -p0 -b .kde#197458
 
 %build
 mkdir -p %{_target_platform}
@@ -188,7 +182,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kioslave/
-
+%{_kde4_appsdir}/libkholidays/
+%{_kde4_datadir}/mime/packages/kdepimlibs-mime.xml
 %if 0%{?akonadi_subpkg}
 %exclude %{_kde4_libdir}/libakonadi-*.so.*
 %files akonadi
@@ -218,17 +213,44 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.4-2
-- fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- akonadi_version 1.2.0
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-3
+- Conflicts: kdepim < 4.2.90
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- License: LGPLv2+
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- akonadi_version 1.1.95
+
+* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-2
+- respin
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 RC1
 
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Tue May 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-1.1
-- no -apidocs for arm, sparc bootstrap (no graphviz)
+* Sun May 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
+- (min) akonadi_version 1.1.85
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- 4.2.85
 
 * Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
 - fix libkcal devel symlink hack


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	31 May 2009 14:03:55 -0000	1.34
+++ sources	4 Aug 2009 23:04:45 -0000	1.35
@@ -1 +1 @@
-ee1d783140be0bb67652784f6fa93f70  kdepimlibs-4.2.4.tar.bz2
+313f1a9d353f82c2ffee517115404dd5  kdepimlibs-4.3.0.tar.bz2


--- kdepimlibs_4.2.patch DELETED ---



From rdieter at fedoraproject.org  Tue Aug  4 23:11:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 23:11:28 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090804231128.12CAC11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs-experimental/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32415

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 May 2009 00:02:14 -0000	1.1
+++ .cvsignore	4 Aug 2009 23:11:27 -0000	1.2
@@ -0,0 +1,5 @@
+kdelibs-experimental-4.2.90.tar.bz2
+kdelibs-experimental-4.2.95.tar.bz2
+kdelibs-experimental-4.2.96.tar.bz2
+kdelibs-experimental-4.2.98.tar.bz2
+kdelibs-experimental-4.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 May 2009 00:02:14 -0000	1.1
+++ sources	4 Aug 2009 23:11:27 -0000	1.2
@@ -0,0 +1 @@
+9b3ed689f4f357d4fc059cf9dd41e035  kdelibs-experimental-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Tue Aug  4 23:12:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 23:12:10 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-11 kdelibs-experimental.spec,NONE,1.1
Message-ID: <20090804231210.7F04011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs-experimental/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32715

Added Files:
	kdelibs-experimental.spec 
Log Message:
import



--- NEW FILE kdelibs-experimental.spec ---
Name:    kdelibs-experimental
Version: 4.3.0
Release: 1%{?dist}
Summary: KDE libraries with experimental or unstable api/abi

Group:   System Environment/Libraries
License: LGPLv2+
URL:     http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-experimental-%{version}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: kdelibs4-devel >= %{version}

Requires: dbus

%description
%{summary}.

%package devel
Group:    Development/Libraries
Summary:  Development files for %{name} 
Requires: %{name} = %{version}-%{release}
Requires: kdelibs4-devel
%description devel
%{summary}.



%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot} 
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{_kde4_libdir}/libknotificationitem-1.so.*
%{_datadir}/dbus-1/interfaces/org.kde.NotificationItem.xml
%{_datadir}/dbus-1/interfaces/org.kde.NotificationItemWatcher.xml

%files devel
%defattr(-,root,root,-)
%{_kde4_libdir}/libknotificationitem-1.so
%{_kde4_includedir}/knotificationitem-1/


%changelog
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
- 4.3rc3

* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
- 4.3rc2

* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
- 4.3rc1

* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
- KDE-4.3 beta2 (4.2.90)

* Thu May 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-1
- first try



From rdieter at fedoraproject.org  Tue Aug  4 23:12:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  4 Aug 2009 23:12:54 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-10 kdelibs-experimental.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090804231254.ACE0011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs-experimental/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv508

Modified Files:
	.cvsignore sources 
Added Files:
	kdelibs-experimental.spec 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0



--- NEW FILE kdelibs-experimental.spec ---
Name:    kdelibs-experimental
Version: 4.3.0
Release: 1%{?dist}
Summary: KDE libraries with experimental or unstable api/abi

Group:   System Environment/Libraries
License: LGPLv2+
URL:     http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-experimental-%{version}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: kdelibs4-devel >= %{version}

Requires: dbus

%description
%{summary}.

%package devel
Group:    Development/Libraries
Summary:  Development files for %{name} 
Requires: %{name} = %{version}-%{release}
Requires: kdelibs4-devel
%description devel
%{summary}.



%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot} 
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{_kde4_libdir}/libknotificationitem-1.so.*
%{_datadir}/dbus-1/interfaces/org.kde.NotificationItem.xml
%{_datadir}/dbus-1/interfaces/org.kde.NotificationItemWatcher.xml

%files devel
%defattr(-,root,root,-)
%{_kde4_libdir}/libknotificationitem-1.so
%{_kde4_includedir}/knotificationitem-1/


%changelog
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
- 4.3rc3

* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
- 4.3rc2

* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
- 4.3rc1

* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
- KDE-4.3 beta2 (4.2.90)

* Thu May 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-1
- first try


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 May 2009 00:02:14 -0000	1.1
+++ .cvsignore	4 Aug 2009 23:12:54 -0000	1.2
@@ -0,0 +1,5 @@
+kdelibs-experimental-4.2.90.tar.bz2
+kdelibs-experimental-4.2.95.tar.bz2
+kdelibs-experimental-4.2.96.tar.bz2
+kdelibs-experimental-4.2.98.tar.bz2
+kdelibs-experimental-4.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 May 2009 00:02:14 -0000	1.1
+++ sources	4 Aug 2009 23:12:54 -0000	1.2
@@ -0,0 +1 @@
+9b3ed689f4f357d4fc059cf9dd41e035  kdelibs-experimental-4.3.0.tar.bz2



From amdunn at fedoraproject.org  Tue Aug  4 23:13:56 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Tue,  4 Aug 2009 23:13:56 +0000 (UTC)
Subject: rpms/alt-ergo/devel alt-ergo.spec,1.6,1.7 import.log,1.3,1.4
Message-ID: <20090804231356.1BBB411C00E4@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/alt-ergo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv729/devel

Modified Files:
	alt-ergo.spec import.log 
Log Message:
* Tue Aug 04 2009 Alan Dunn <amdunn at gmail.com> 0.9-2
- Added ExcludeArch sparc64 due to no OCaml



Index: alt-ergo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/devel/alt-ergo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- alt-ergo.spec	24 Jul 2009 10:23:05 -0000	1.6
+++ alt-ergo.spec	4 Aug 2009 23:13:55 -0000	1.7
@@ -13,7 +13,7 @@
 
 Name:		alt-ergo
 Version:	0.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Alt-Ergo automatic theorem prover
 
 Group:		Applications/Engineering
@@ -26,8 +26,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	ocaml, ocaml-ocamlgraph-devel, prelink
 
-# Still no ocaml on s390(x)
-ExcludeArch: s390 s390x
+# Still no ocaml on s390(x) or sparc64
+ExcludeArch: s390 s390x sparc64
 
 %description
 
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 %doc README.alt-ergo COPYING CeCILL-C CHANGES
 
 %changelog
+* Tue Aug 04 2009 Alan Dunn <amdunn at gmail.com> 0.9-2
+- Added ExcludeArch sparc64 due to no OCaml
+
 * Fri Jul 24 2009 Alan Dunn <amdunn at gmail.com> 0.9-1
 - New upstream version
 - Removed code for check for Fedora version (8) that is EOL


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alt-ergo/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Jul 2009 10:23:05 -0000	1.3
+++ import.log	4 Aug 2009 23:13:55 -0000	1.4
@@ -1,3 +1,4 @@
 alt-ergo-0_8-3_fc9:HEAD:alt-ergo-0.8-3.fc9.src.rpm:1220665880
 alt-ergo-0_8-4_fc9:HEAD:alt-ergo-0.8-4.fc9.src.rpm:1230138275
 alt-ergo-0_9-1_fc10:HEAD:alt-ergo-0.9-1.fc10.src.rpm:1248430585
+alt-ergo-0_9-2_fc10:HEAD:alt-ergo-0.9-2.fc10.src.rpm:1249427238



From slankes at fedoraproject.org  Tue Aug  4 23:24:24 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue,  4 Aug 2009 23:24:24 +0000 (UTC)
Subject: rpms/gimp-lqr-plugin/F-11 .cvsignore, 1.2, 1.3 gimp-lqr-plugin.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090804232424.E576111C00E4@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/gimp-lqr-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2567

Modified Files:
	.cvsignore gimp-lqr-plugin.spec sources 
Log Message:
* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-2
- Add BR on intltool
- Bump liblqr-1-devel BR to 0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Mar 2008 22:03:24 -0000	1.2
+++ .cvsignore	4 Aug 2009 23:24:23 -0000	1.3
@@ -1 +1 @@
-gimp-lqr-plugin-0.4.0-4.tar.gz
+gimp-lqr-plugin-0.6.1.tar.bz2


Index: gimp-lqr-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-11/gimp-lqr-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gimp-lqr-plugin.spec	24 Feb 2009 21:36:59 -0000	1.2
+++ gimp-lqr-plugin.spec	4 Aug 2009 23:24:23 -0000	1.3
@@ -1,15 +1,14 @@
-%define codeversion 0.4.0
-%define tarversion 4
 Name:           gimp-lqr-plugin
-Version:        %{codeversion}.%{tarversion}
-Release:        3%{?dist}
+Version:        0.6.1
+Release:        2%{?dist}
 Summary:        Content-aware resizing plug-in for the GIMP
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://liquidrescale.wikidot.com/
-Source0:        http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{codeversion}-%{tarversion}.tar.gz
+Source0:        http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-BuildRequires:  gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.1.0
+BuildRequires:  gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.3.0
+BuildRequires:  intltool
 Requires:       gimp >= 2.4
 
 %description
@@ -19,7 +18,7 @@ by Shai Avidan and Ariel Shamir, which c
 http://www.faculty.idc.ac.il/arik/imret.pdf
 
 %prep
-%setup -q -n gimp-lqr-plugin-%{codeversion}
+%setup -q -n gimp-lqr-plugin-%{version}
 
 %build
 %configure
@@ -41,16 +40,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README ChangeLog TODO COPYING AUTHORS NEWS
 %{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin
+%{_libdir}/gimp/2.0/plug-ins/plug_in_lqr_iter
+%{_datadir}/gimp/2.0/scripts/batch-gimp-lqr.scm
 %{_datadir}/gimp-lqr-plugin/
 
 
 
 
 %changelog
+* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-2
+- Add BR on intltool
+- Bump liblqr-1-devel BR to 0.3
+
+* Mon Aug 03 2009 Sven Lankes <sven at lank.es> - 0.6.1-1
+- Update to latest upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-
 * Sun Mar 02 2008 Alexandru Ciobanu <alex at tvtransilvania.ro> - 0.4.0.4-2
 - Fixed typos, buildrequires and requires.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Mar 2008 22:03:24 -0000	1.2
+++ sources	4 Aug 2009 23:24:23 -0000	1.3
@@ -1 +1 @@
-1d34e517cdbf8b2f358e0febea0467f5  gimp-lqr-plugin-0.4.0-4.tar.gz
+f5f15814904d7c812eca60cbb2fc6385  gimp-lqr-plugin-0.6.1.tar.bz2



From lkundrak at fedoraproject.org  Tue Aug  4 23:50:57 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  4 Aug 2009 23:50:57 +0000 (UTC)
Subject: rpms/psmisc/devel psmisc-22.6-overflow2.patch, NONE, 1.1 psmisc.spec,
	1.55, 1.56
Message-ID: <20090804235058.0E5D811C00E4@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/psmisc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9190

Modified Files:
	psmisc.spec 
Added Files:
	psmisc-22.6-overflow2.patch 
Log Message:
* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 22.6-13
- Fix a buffer overflow


psmisc-22.6-overflow2.patch:
 pstree.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE psmisc-22.6-overflow2.patch ---
Fix an off-by overflow one that would trigger a FORTIFY_SOURCE abort.

Lubomir Rintel <lkundrak at v3.sk>

diff -up psmisc-22.6/src/pstree.c.overflow2 psmisc-22.6/src/pstree.c
--- psmisc-22.6/src/pstree.c.overflow2	2009-08-05 01:38:32.000000000 +0200
+++ psmisc-22.6/src/pstree.c	2009-08-05 01:45:09.000000000 +0200
@@ -641,10 +641,10 @@ read_proc (void)
 		   
 		   if ((taskdir=opendir(taskpath))!=0) {
 		      /* if we have this dir, we're on 2.6 */
-		      if (!(threadname = malloc(strlen(comm) + 3))) {
+		      if (!(threadname = malloc(COMM_LEN + 1))) {
 			 exit (2);
 		      }
-		      sprintf(threadname,"{%s}",comm);
+		      sprintf(threadname,"{%.*s}", COMM_LEN - 2, comm);
 		      while ((dt = readdir(taskdir)) != NULL) {
 			 if ((thread=atoi(dt->d_name)) !=0) {
 			    if (thread != pid) {


Index: psmisc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- psmisc.spec	26 Jul 2009 19:35:10 -0000	1.55
+++ psmisc.spec	4 Aug 2009 23:50:56 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 22.6
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Patch0: psmisc-22.6-types.patch
 Patch1: psmisc-22.6-pstree-overflow.patch
 #fix #497303
 Patch2: psmisc-22.6-fuser-remove-mountlist.patch
+Patch3: psmisc-22.6-overflow2.patch
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -33,6 +34,7 @@ of processes that are using specified fi
 %patch0 -p1 -b .types
 %patch1 -p1 -b .overflow
 %patch2 -p1 -b .mount
+%patch3 -p1 -b .overflow2
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 22.6-13
+- Fix a buffer overflow
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 22.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Aug  5 00:17:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:17:30 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime-4.2.85-knetattach.patch, 
	NONE, 1.1 kdebase-runtime-4.3.0-nepomuk-autostart.patch, NONE,
	1.1 .cvsignore, 1.33, 1.34 kdebase-runtime.spec, 1.114,
	1.115 sources, 1.33, 1.34 kdebase-runtime-4.1.1-knetattach.patch,
	1.1, NONE kdebase-runtime-4.2.3-kde#186340.patch, 1.1,
	NONE kdebase-runtime-4.2.5-nepomuk-autostart.patch, 1.1, NONE
Message-ID: <20090805001731.0B66B11C00E4@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-serv16410

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.2.85-knetattach.patch 
	kdebase-runtime-4.3.0-nepomuk-autostart.patch 
Removed Files:
	kdebase-runtime-4.1.1-knetattach.patch 
	kdebase-runtime-4.2.3-kde#186340.patch 
	kdebase-runtime-4.2.5-nepomuk-autostart.patch 
Log Message:
* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
- respin


kdebase-runtime-4.2.85-knetattach.patch:
 knetattach.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebase-runtime-4.2.85-knetattach.patch ---
diff -up kdebase-runtime-4.2.85/knetattach/knetattach.desktop.knetattach kdebase-runtime-4.2.85/knetattach/knetattach.desktop
--- kdebase-runtime-4.2.85/knetattach/knetattach.desktop.knetattach	2009-03-18 04:58:55.000000000 -0500
+++ kdebase-runtime-4.2.85/knetattach/knetattach.desktop	2009-05-14 13:45:54.980764940 -0500
@@ -102,4 +102,5 @@ Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Network;RemoteAccess;
+NoDisplay=true
 X-DocPath=knetattach/index.html

kdebase-runtime-4.3.0-nepomuk-autostart.patch:
 nepomukserver.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebase-runtime-4.3.0-nepomuk-autostart.patch ---
Index: nepomukserver.desktop
===================================================================
--- runtime/nepomuk/server/nepomukserver.desktop	(revision 989231)
+++ runtime/nepomuk/server/nepomukserver.desktop	(revision 989232)
@@ -2,6 +2,7 @@
 Type=Service
 Exec=nepomukserver
 X-KDE-StartupNotify=false
+X-KDE-autostart-condition=nepomukserverrc:Basic Settings:Start Nepomuk:true
 OnlyShowIn=KDE;
 X-KDE-autostart-phase=1
 Name=Nepomuk Server


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	30 May 2009 10:33:34 -0000	1.33
+++ .cvsignore	5 Aug 2009 00:17:29 -0000	1.34
@@ -1 +1,5 @@
-kdebase-runtime-4.2.4.tar.bz2
+kdebase-runtime-4.2.90.tar.bz2
+kdebase-runtime-4.2.95.tar.bz2
+kdebase-runtime-4.2.96.tar.bz2
+kdebase-runtime-4.2.98.tar.bz2
+kdebase-runtime-4.3.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- kdebase-runtime.spec	29 Jun 2009 19:31:58 -0000	1.114
+++ kdebase-runtime.spec	5 Aug 2009 00:17:29 -0000	1.115
@@ -1,125 +1,92 @@
-%if 0%{?fedora} < 9
-# # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%global kde3_desktop 1
-%else
-%define flags 1 
+%if 0%{?rhel} == 0
+%define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.2.4
+Version:       4.3.0
 Release:       2%{?dist}
 
-License:       GPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License:       LGPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
-Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-Patch4:        kdebase-runtime-4.2.5-nepomuk-autostart.patch
+Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
-# http://bugs.kde.org/186340
-Patch100: kdebase-runtime-4.2.3-kde#186340.patch
-
-#ifarch noarch
-## icons now provided by standalone oxygen-icon-theme
-#define icons 1
-#define icons_svg 1
-#else
-%define rest 1
-#endif
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-#?KHelpcenter requires htdig for building search indices
-Requires: htdig
-
-Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
+Obsoletes: kdebase4-runtime < %{version}-%{release}
 
-BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+#?KHelpcenter requires htdig for building search indices
+Requires: htdig
 
+BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
+BuildRequires: openslp-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel
-BuildRequires: xine-lib-devel
-# needed?
+BuildRequires: soprano-devel >= 2.3.0
+%if 0%{?rhel} == 0
+BuildRequires: xine-lib-devel libxcb-devel
+%endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
-BuildRequires: ImageMagick
 
 %description
 Core runtime for the K Desktop Environment 4.
-%if 0%{?kde3_desktop}
-This package does not include the KDE 4 versions of applications which are
-provided by KDE 3 because of file and configuration setting conflicts.
-%endif
+
 
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
-%package flags 
+
+%package flags
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description flags 
-%{summary}.
-
-%package -n oxygen-icon-theme
-Summary: Oxygen icon theme
-Group: User Interface/Desktops
-%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
-%description -n oxygen-icon-theme
+%description flags
 %{summary}.
 
-%package -n oxygen-icon-theme-scalable
-Summary: Oxygen icon theme, scalable(svg) icons
-Group: User Interface/Desktops
-Requires: oxygen-icon-theme = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
-%description -n oxygen-icon-theme-scalable
-%{summary}.
 
 %prep
 %setup -q -n kdebase-runtime-%{version}
@@ -130,203 +97,71 @@ BuildArch: noarch
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
 
-# upstream patches
-%patch100 -p1 -b .kde#186340
-
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # kdesu symlink
 ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
-%endif
-
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
-
-%if ! 0%{?rest}
-ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
-%endif
-%else
-rm -f %{buildroot}%{_kde4_iconsdir}/default.kde4
-rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen
-%endif
 
 # omit hicolor index.theme, use one from hicolor-icon-theme
 rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme
 
-%if 0%{?icons_svg}
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
-sed -e "s|^%{buildroot}||" svg.list > svg-include.list
-sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
-%else
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
-  xargs --no-run-if-empty rm -fv
-%endif
-
-%if 0%{?rest}
-%if 0%{?kde3_desktop}
-# remove files which conflict with KDE 3
-rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/khelpcenter.*
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.*
-rm -rf %{buildroot}%{_datadir}/emoticons
-rm -rf %{buildroot}%{_kde4_datadir}/locale
-rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
-rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -f %{buildroot}%{_kde4_configdir}/kshorturifilterrc
-rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
-rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
-# binaries: conflict with kdebase
-rm -f %{buildroot}%{_kde4_bindir}/drkonqi
-rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
-rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
-rm -f %{buildroot}%{_kde4_bindir}/kdeeject
-rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
-rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
-rm -f %{buildroot}%{_kde4_bindir}/kdesu
-rm -f %{buildroot}%{_kde4_bindir}/kdesud
-rm -f %{buildroot}%{_kde4_bindir}/kdialog
-rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
-rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
-rm -f %{buildroot}%{_kde4_bindir}/kfind
-rm -f %{buildroot}%{_kde4_bindir}/kfmclient
-rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
-rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
-rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
-rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
-rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
-rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
-rm -f %{buildroot}%{_kde4_bindir}/knetattach
-rm -f %{buildroot}%{_kde4_bindir}/konqueror
-rm -f %{buildroot}%{_kde4_bindir}/konsole
-rm -f %{buildroot}%{_kde4_bindir}/kprinter
-rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
-rm -f %{buildroot}%{_kde4_bindir}/kstart
-rm -f %{buildroot}%{_kde4_bindir}/ktrash
-rm -f %{buildroot}%{_kde4_bindir}/kwrite
-rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
-rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
-rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
-# binaries: conflict with kdelibs
-rm -f %{buildroot}%{_kde4_bindir}/kfile
-rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
-rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
-rm -f %{buildroot}%{_kde4_bindir}/kioexec
-rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
-# binaries: conflict with kdebase-extras
-rm -f %{buildroot}%{_kde4_bindir}/kappfinder
-# do not strictly conflict, but we removed the corresponding binaries:
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
-# we also removed the binaries for these:
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
-%else
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
 %{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
+
 # install this service for KDE 3 applications
 # NOTE: This is not a standard .desktop file, but an "almost standard" one
 #       installed into a KDE-3-specific directory, as usual for KDE 3 services,
 #       so we can't use desktop-file-install for it.
 install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
-%endif
 
 # FIXME: -devel type files, omit for now
-rm -vf  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
-
-%endif
+rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
+# file conflicts with kdepim
+rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
+      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
 
 %clean
 rm -rf %{buildroot}
 
 
-%if ! 0%{?kde3_desktop}
 %post
 touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
 
 %posttrans
-%if ! 0%{?kde3_desktop}
 gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
 update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then
-%if ! 0%{?kde3_desktop}
-touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
-update-desktop-database -q &> /dev/null ||:
+    touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+    update-desktop-database -q &> /dev/null ||:
+    update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%if 0%{?icons}
-%post -n oxygen-icon-theme
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans -n oxygen-icon-theme
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun -n oxygen-icon-theme
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
-
-%if 0%{?icons_svg}
-%post -n oxygen-icon-theme-scalable
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans -n oxygen-icon-theme-scalable
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun -n oxygen-icon-theme-scalable
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
 
-
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
@@ -339,7 +174,9 @@ fi
 %{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/mime/packages/network.xml
 %{_kde4_datadir}/sounds/*
+%{_kde4_iconsdir}/default.kde4
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
@@ -347,8 +184,7 @@ fi
 %{_kde4_libexecdir}/*
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
-
-%if ! 0%{?kde3_desktop}
+%{_mandir}/man8/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_sysconfdir}/xdg/menus/kde-information.menu
@@ -361,16 +197,15 @@ fi
 %{_kde4_datadir}/locale/l10n/
 %{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
-%endif
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libkwalletbackend.so.*
+%{_kde4_libdir}/libmolletnetwork.so.*
 # FIXME: move some of these to main pkg, e.g. kcm*.so, kded_*.so
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
-%endif
 
 %if 0%{?flags}
 %files flags
@@ -378,34 +213,50 @@ fi
 %{_kde4_datadir}/locale/l10n/*/flag.png
 %endif
 
-%if 0%{?icons}
-%files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
-%defattr(-,root,root,-)
-%{_kde4_iconsdir}/default.kde4
-%{_kde4_iconsdir}/oxygen/
 
-%if 0%{?icons_svg}
-%files -n oxygen-icon-theme-scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
-%endif
+%changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- respin
 
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-%changelog
-* Mon Jun 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- respin (soprano-2.3.0) 
+- License: LGPLv2+
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
+- drop unneeded BR: ImageMagick (#509241)
+
+* Mon Jun 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.95-2
 - don't start nepomuk server unconditionally (#487322)
 
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.85-3
+- Drop old Fedora < 8 conditionals
 
-* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- toolbar text under icons cut off (kde#186340)
+* Tue May 19 2009 Than Ngo <than at redhat.com> - 4.2.85-2
+- file conflicts with kdepim
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
-- fix persistent systray notifications
+- fix persistent systray notifications (#485796)
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
@@ -446,7 +297,7 @@ fi
 - respun tarball
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
-- Files not trashed to the correct location in Dolphin/Konqueror 
+- Files not trashed to the correct location in Dolphin/Konqueror
   (#481598, kdebug#178479)
 - omit --with-samba crud
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	30 May 2009 10:33:34 -0000	1.33
+++ sources	5 Aug 2009 00:17:29 -0000	1.34
@@ -1 +1 @@
-9b5067b3ff73498705b5575e9290dffb  kdebase-runtime-4.2.4.tar.bz2
+e4ea5d567187f4ac952c67326c5afd94  kdebase-runtime-4.3.0.tar.bz2


--- kdebase-runtime-4.1.1-knetattach.patch DELETED ---


--- kdebase-runtime-4.2.3-kde#186340.patch DELETED ---


--- kdebase-runtime-4.2.5-nepomuk-autostart.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 00:18:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:18:17 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.2.85-knetattach.patch, 
	NONE, 1.1 kdebase-runtime-4.3.0-nepomuk-autostart.patch, NONE,
	1.1 .cvsignore, 1.28, 1.29 kdebase-runtime.spec, 1.91,
	1.92 sources, 1.31, 1.32 kdebase-runtime-4.1.1-knetattach.patch,
	1.1, NONE kdebase-runtime-4.2.3-kde#186340.patch, 1.1,
	NONE kdebase-runtime-4.2.5-nepomuk-autostart.patch, 1.1, NONE
Message-ID: <20090805001817.81ECA11C0347@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-serv16769

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.2.85-knetattach.patch 
	kdebase-runtime-4.3.0-nepomuk-autostart.patch 
Removed Files:
	kdebase-runtime-4.1.1-knetattach.patch 
	kdebase-runtime-4.2.3-kde#186340.patch 
	kdebase-runtime-4.2.5-nepomuk-autostart.patch 
Log Message:
* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
- respin


kdebase-runtime-4.2.85-knetattach.patch:
 knetattach.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebase-runtime-4.2.85-knetattach.patch ---
diff -up kdebase-runtime-4.2.85/knetattach/knetattach.desktop.knetattach kdebase-runtime-4.2.85/knetattach/knetattach.desktop
--- kdebase-runtime-4.2.85/knetattach/knetattach.desktop.knetattach	2009-03-18 04:58:55.000000000 -0500
+++ kdebase-runtime-4.2.85/knetattach/knetattach.desktop	2009-05-14 13:45:54.980764940 -0500
@@ -102,4 +102,5 @@ Type=Application
 Terminal=false
 X-KDE-StartupNotify=true
 Categories=Qt;KDE;Network;RemoteAccess;
+NoDisplay=true
 X-DocPath=knetattach/index.html

kdebase-runtime-4.3.0-nepomuk-autostart.patch:
 nepomukserver.desktop |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebase-runtime-4.3.0-nepomuk-autostart.patch ---
Index: nepomukserver.desktop
===================================================================
--- runtime/nepomuk/server/nepomukserver.desktop	(revision 989231)
+++ runtime/nepomuk/server/nepomukserver.desktop	(revision 989232)
@@ -2,6 +2,7 @@
 Type=Service
 Exec=nepomukserver
 X-KDE-StartupNotify=false
+X-KDE-autostart-condition=nepomukserverrc:Basic Settings:Start Nepomuk:true
 OnlyShowIn=KDE;
 X-KDE-autostart-phase=1
 Name=Nepomuk Server


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	1 Jun 2009 17:25:46 -0000	1.28
+++ .cvsignore	5 Aug 2009 00:18:16 -0000	1.29
@@ -1 +1,5 @@
-kdebase-runtime-4.2.4.tar.bz2
+kdebase-runtime-4.2.90.tar.bz2
+kdebase-runtime-4.2.95.tar.bz2
+kdebase-runtime-4.2.96.tar.bz2
+kdebase-runtime-4.2.98.tar.bz2
+kdebase-runtime-4.3.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kdebase-runtime.spec	29 Jun 2009 19:31:58 -0000	1.91
+++ kdebase-runtime.spec	5 Aug 2009 00:18:17 -0000	1.92
@@ -1,125 +1,92 @@
-%if 0%{?fedora} < 9
-# # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%global kde3_desktop 1
-%else
-%define flags 1 
+%if 0%{?rhel} == 0
+%define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.2.4
+Version:       4.3.0
 Release:       2%{?dist}
 
-License:       GPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License:       LGPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
-Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-Patch4:        kdebase-runtime-4.2.5-nepomuk-autostart.patch
+Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
-# http://bugs.kde.org/186340
-Patch100: kdebase-runtime-4.2.3-kde#186340.patch
-
-#ifarch noarch
-## icons now provided by standalone oxygen-icon-theme
-#define icons 1
-#define icons_svg 1
-#else
-%define rest 1
-#endif
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-#?KHelpcenter requires htdig for building search indices
-Requires: htdig
-
-Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
+Obsoletes: kdebase4-runtime < %{version}-%{release}
 
-BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+#?KHelpcenter requires htdig for building search indices
+Requires: htdig
 
+BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
+BuildRequires: openslp-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel
-BuildRequires: xine-lib-devel
-# needed?
+BuildRequires: soprano-devel >= 2.3.0
+%if 0%{?rhel} == 0
+BuildRequires: xine-lib-devel libxcb-devel
+%endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
-BuildRequires: ImageMagick
 
 %description
 Core runtime for the K Desktop Environment 4.
-%if 0%{?kde3_desktop}
-This package does not include the KDE 4 versions of applications which are
-provided by KDE 3 because of file and configuration setting conflicts.
-%endif
+
 
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
-%package flags 
+
+%package flags
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description flags 
-%{summary}.
-
-%package -n oxygen-icon-theme
-Summary: Oxygen icon theme
-Group: User Interface/Desktops
-%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
-%description -n oxygen-icon-theme
+%description flags
 %{summary}.
 
-%package -n oxygen-icon-theme-scalable
-Summary: Oxygen icon theme, scalable(svg) icons
-Group: User Interface/Desktops
-Requires: oxygen-icon-theme = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
-%description -n oxygen-icon-theme-scalable
-%{summary}.
 
 %prep
 %setup -q -n kdebase-runtime-%{version}
@@ -130,203 +97,71 @@ BuildArch: noarch
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
 
-# upstream patches
-%patch100 -p1 -b .kde#186340
-
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # kdesu symlink
 ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
-%endif
-
-%if 0%{?icons}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
-
-%if ! 0%{?rest}
-ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
-%endif
-%else
-rm -f %{buildroot}%{_kde4_iconsdir}/default.kde4
-rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen
-%endif
 
 # omit hicolor index.theme, use one from hicolor-icon-theme
 rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme
 
-%if 0%{?icons_svg}
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
-sed -e "s|^%{buildroot}||" svg.list > svg-include.list
-sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
-%else
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
-  xargs --no-run-if-empty rm -fv
-%endif
-
-%if 0%{?rest}
-%if 0%{?kde3_desktop}
-# remove files which conflict with KDE 3
-rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/khelpcenter.*
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.*
-rm -rf %{buildroot}%{_datadir}/emoticons
-rm -rf %{buildroot}%{_kde4_datadir}/locale
-rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
-rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -f %{buildroot}%{_kde4_configdir}/kshorturifilterrc
-rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
-rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
-# binaries: conflict with kdebase
-rm -f %{buildroot}%{_kde4_bindir}/drkonqi
-rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
-rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
-rm -f %{buildroot}%{_kde4_bindir}/kdeeject
-rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
-rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
-rm -f %{buildroot}%{_kde4_bindir}/kdesu
-rm -f %{buildroot}%{_kde4_bindir}/kdesud
-rm -f %{buildroot}%{_kde4_bindir}/kdialog
-rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
-rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
-rm -f %{buildroot}%{_kde4_bindir}/kfind
-rm -f %{buildroot}%{_kde4_bindir}/kfmclient
-rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
-rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
-rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
-rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
-rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
-rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
-rm -f %{buildroot}%{_kde4_bindir}/knetattach
-rm -f %{buildroot}%{_kde4_bindir}/konqueror
-rm -f %{buildroot}%{_kde4_bindir}/konsole
-rm -f %{buildroot}%{_kde4_bindir}/kprinter
-rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
-rm -f %{buildroot}%{_kde4_bindir}/kstart
-rm -f %{buildroot}%{_kde4_bindir}/ktrash
-rm -f %{buildroot}%{_kde4_bindir}/kwrite
-rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
-rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
-rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
-# binaries: conflict with kdelibs
-rm -f %{buildroot}%{_kde4_bindir}/kfile
-rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
-rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
-rm -f %{buildroot}%{_kde4_bindir}/kioexec
-rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
-# binaries: conflict with kdebase-extras
-rm -f %{buildroot}%{_kde4_bindir}/kappfinder
-# do not strictly conflict, but we removed the corresponding binaries:
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
-# we also removed the binaries for these:
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
-%else
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
 %{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
+
 # install this service for KDE 3 applications
 # NOTE: This is not a standard .desktop file, but an "almost standard" one
 #       installed into a KDE-3-specific directory, as usual for KDE 3 services,
 #       so we can't use desktop-file-install for it.
 install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
-%endif
 
 # FIXME: -devel type files, omit for now
-rm -vf  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
-
-%endif
+rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
+# file conflicts with kdepim
+rm -f %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nco.* \
+      %{buildroot}%{_kde4_appsdir}/nepomuk/ontologies/nmo.*
 
 %clean
 rm -rf %{buildroot}
 
 
-%if ! 0%{?kde3_desktop}
 %post
 touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
 
 %posttrans
-%if ! 0%{?kde3_desktop}
 gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
 update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then
-%if ! 0%{?kde3_desktop}
-touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
-update-desktop-database -q &> /dev/null ||:
+    touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+    update-desktop-database -q &> /dev/null ||:
+    update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%if 0%{?icons}
-%post -n oxygen-icon-theme
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans -n oxygen-icon-theme
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun -n oxygen-icon-theme
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
-
-%if 0%{?icons_svg}
-%post -n oxygen-icon-theme-scalable
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans -n oxygen-icon-theme-scalable
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%postun -n oxygen-icon-theme-scalable
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
 
-
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
@@ -339,7 +174,9 @@ fi
 %{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/mime/packages/network.xml
 %{_kde4_datadir}/sounds/*
+%{_kde4_iconsdir}/default.kde4
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
@@ -347,8 +184,7 @@ fi
 %{_kde4_libexecdir}/*
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
-
-%if ! 0%{?kde3_desktop}
+%{_mandir}/man8/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_sysconfdir}/xdg/menus/kde-information.menu
@@ -361,16 +197,15 @@ fi
 %{_kde4_datadir}/locale/l10n/
 %{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
-%endif
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libkwalletbackend.so.*
+%{_kde4_libdir}/libmolletnetwork.so.*
 # FIXME: move some of these to main pkg, e.g. kcm*.so, kded_*.so
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
-%endif
 
 %if 0%{?flags}
 %files flags
@@ -378,34 +213,50 @@ fi
 %{_kde4_datadir}/locale/l10n/*/flag.png
 %endif
 
-%if 0%{?icons}
-%files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
-%defattr(-,root,root,-)
-%{_kde4_iconsdir}/default.kde4
-%{_kde4_iconsdir}/oxygen/
 
-%if 0%{?icons_svg}
-%files -n oxygen-icon-theme-scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
-%endif
+%changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- respin
 
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-%changelog
-* Mon Jun 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- respin (soprano-2.3.0) 
+- License: LGPLv2+
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
+- drop unneeded BR: ImageMagick (#509241)
+
+* Mon Jun 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.95-2
 - don't start nepomuk server unconditionally (#487322)
 
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.85-3
+- Drop old Fedora < 8 conditionals
 
-* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- toolbar text under icons cut off (kde#186340)
+* Tue May 19 2009 Than Ngo <than at redhat.com> - 4.2.85-2
+- file conflicts with kdepim
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
-- fix persistent systray notifications
+- fix persistent systray notifications (#485796)
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - -flags subpkg
@@ -446,7 +297,7 @@ fi
 - respun tarball
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
-- Files not trashed to the correct location in Dolphin/Konqueror 
+- Files not trashed to the correct location in Dolphin/Konqueror
   (#481598, kdebug#178479)
 - omit --with-samba crud
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	1 Jun 2009 17:25:46 -0000	1.31
+++ sources	5 Aug 2009 00:18:17 -0000	1.32
@@ -1 +1 @@
-9b5067b3ff73498705b5575e9290dffb  kdebase-runtime-4.2.4.tar.bz2
+e4ea5d567187f4ac952c67326c5afd94  kdebase-runtime-4.3.0.tar.bz2


--- kdebase-runtime-4.1.1-knetattach.patch DELETED ---


--- kdebase-runtime-4.2.3-kde#186340.patch DELETED ---


--- kdebase-runtime-4.2.5-nepomuk-autostart.patch DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 00:18:53 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 00:18:53 +0000 (UTC)
Subject: rpms/kernel/devel drm-r600-kms.patch, NONE, 1.1 drm-vga-arb.patch,
	1.4, 1.5 kernel.spec, 1.1689, 1.1690
Message-ID: <20090805001853.6EA7411C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16961

Modified Files:
	drm-vga-arb.patch kernel.spec 
Added Files:
	drm-r600-kms.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com>
- Add Jeromes initial r600 kms work.
- rebase arb patch


drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    2 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  137 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  338 ++++----
 b/drivers/gpu/drm/radeon/radeon_drv.h    |    1 
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  980 ++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 20 files changed, 3364 insertions(+), 495 deletions(-)

--- NEW FILE drm-r600-kms.patch ---
>From 6599b4a047d80cd7b8715b5ad74e0735e6d4b941 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse at redhat.com>
Date: Fri, 24 Jul 2009 19:42:23 +0200
Subject: [PATCH] radeon: add basic KMS support for r6xx & r7xx chipset.

This only provide a kms drm fb device for this hw and allow X
to run with no acceleration.
---
 drivers/gpu/drm/radeon/Makefile        |    2 +-
 drivers/gpu/drm/radeon/atombios_crtc.c |    1 +
 drivers/gpu/drm/radeon/avivod.h        |   60 ++
 drivers/gpu/drm/radeon/r100.c          |   69 ++
 drivers/gpu/drm/radeon/r300.c          |    2 +-
 drivers/gpu/drm/radeon/r300.h          |   36 -
 drivers/gpu/drm/radeon/r600.c          | 1243 ++++++++++++++++++++++++++++++--
 drivers/gpu/drm/radeon/r600d.h         |  349 +++++++++
 drivers/gpu/drm/radeon/radeon.h        |   51 ++-
 drivers/gpu/drm/radeon/radeon_asic.h   |  137 ++++-
 drivers/gpu/drm/radeon/radeon_clocks.c |   10 +-
 drivers/gpu/drm/radeon/radeon_device.c |  338 +++++----
 drivers/gpu/drm/radeon/radeon_drv.h    |    1 +
 drivers/gpu/drm/radeon/radeon_ring.c   |   63 +--
 drivers/gpu/drm/radeon/radeon_share.h  |   66 ++
 drivers/gpu/drm/radeon/radeon_ttm.c    |    6 +-
 drivers/gpu/drm/radeon/rs400.c         |    2 +-
 drivers/gpu/drm/radeon/rs780.c         |  102 ---
 drivers/gpu/drm/radeon/rv770.c         |  980 +++++++++++++++++++++++--
 drivers/gpu/drm/radeon/rv770d.h        |  340 +++++++++
 20 files changed, 3364 insertions(+), 494 deletions(-)
 create mode 100644 drivers/gpu/drm/radeon/avivod.h
 delete mode 100644 drivers/gpu/drm/radeon/r300.h
 create mode 100644 drivers/gpu/drm/radeon/r600d.h
 delete mode 100644 drivers/gpu/drm/radeon/rs780.c
 create mode 100644 drivers/gpu/drm/radeon/rv770d.h

diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 013d380..7384cad 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -13,7 +13,7 @@ radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
 	radeon_encoders.o radeon_display.o radeon_cursor.o radeon_i2c.o \
 	radeon_clocks.o radeon_fb.o radeon_gem.o radeon_ring.o radeon_irq_kms.o \
 	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \
-	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rs780.o rv770.o \
+	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o \
 	radeon_test.o
 
 radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 74d034f..629d7c8 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -370,6 +370,7 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 					pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 			radeon_encoder = to_radeon_encoder(encoder);
+			break;
 		}
 	}
 
diff --git a/drivers/gpu/drm/radeon/avivod.h b/drivers/gpu/drm/radeon/avivod.h
new file mode 100644
index 0000000..d4e6e6e
--- /dev/null
+++ b/drivers/gpu/drm/radeon/avivod.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009 Advanced Micro Devices, Inc.
+ * Copyright 2009 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef AVIVOD_H
+#define AVIVOD_H
+
+
+#define	D1CRTC_CONTROL					0x6080
+#define		CRTC_EN						(1 << 0)
+#define	D1CRTC_UPDATE_LOCK				0x60E8
+#define	D1GRPH_PRIMARY_SURFACE_ADDRESS			0x6110
+#define	D1GRPH_SECONDARY_SURFACE_ADDRESS		0x6118
+
+#define	D2CRTC_CONTROL					0x6880
+#define	D2CRTC_UPDATE_LOCK				0x68E8
+#define	D2GRPH_PRIMARY_SURFACE_ADDRESS			0x6910
+#define	D2GRPH_SECONDARY_SURFACE_ADDRESS		0x6918
+
+#define	D1VGA_CONTROL					0x0330
+#define		DVGA_CONTROL_MODE_ENABLE			(1 << 0)
+#define		DVGA_CONTROL_TIMING_SELECT			(1 << 8)
+#define		DVGA_CONTROL_SYNC_POLARITY_SELECT		(1 << 9)
+#define		DVGA_CONTROL_OVERSCAN_TIMING_SELECT		(1 << 10)
+#define		DVGA_CONTROL_OVERSCAN_COLOR_EN			(1 << 16)
+#define		DVGA_CONTROL_ROTATE				(1 << 24)
+#define D2VGA_CONTROL					0x0338
+
+#define	VGA_HDP_CONTROL					0x328
+#define		VGA_MEM_PAGE_SELECT_EN				(1 << 0)
+#define		VGA_MEMORY_DISABLE				(1 << 4)
+#define		VGA_RBBM_LOCK_DISABLE				(1 << 8)
+#define		VGA_SOFT_RESET					(1 << 16)
+#define	VGA_MEMORY_BASE_ADDRESS				0x0310
+#define	VGA_RENDER_CONTROL				0x0300
+#define		VGA_VSTATUS_CNTL_MASK				0x00030000
+
+#endif
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f1ba8ff..59ef4f9 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -644,6 +644,12 @@ int r100_cp_reset(struct radeon_device *rdev)
 	return -1;
 }
 
+void r100_cp_commit(struct radeon_device *rdev)
+{
+	WREG32(RADEON_CP_RB_WPTR, rdev->cp.wptr);
+	(void)RREG32(RADEON_CP_RB_WPTR);
+}
+
 
 /*
  * CS functions
@@ -2278,3 +2284,66 @@ void r100_bandwidth_update(struct radeon_device *rdev)
 			  (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL));
 	}
 }
+
+void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
+{
+	radeon_ring_write(rdev, PACKET0(RADEON_CP_IB_BASE, 1));
+	radeon_ring_write(rdev, ib->gpu_addr);
+	radeon_ring_write(rdev, ib->length_dw);
+}
+
+int r100_ib_test(struct radeon_device *rdev)
+{
+	struct radeon_ib *ib;
+	uint32_t scratch;
+	uint32_t tmp = 0;
+	unsigned i;
+	int r;
+
+	r = radeon_scratch_get(rdev, &scratch);
+	if (r) {
+		DRM_ERROR("radeon: failed to get scratch reg (%d).\n", r);
+		return r;
+	}
+	WREG32(scratch, 0xCAFEDEAD);
+	r = radeon_ib_get(rdev, &ib);
+	if (r) {
+		return r;
+	}
+	ib->ptr[0] = PACKET0(scratch, 0);
+	ib->ptr[1] = 0xDEADBEEF;
+	ib->ptr[2] = PACKET2(0);
+	ib->ptr[3] = PACKET2(0);
+	ib->ptr[4] = PACKET2(0);
+	ib->ptr[5] = PACKET2(0);
+	ib->ptr[6] = PACKET2(0);
+	ib->ptr[7] = PACKET2(0);
+	ib->length_dw = 8;
+	r = radeon_ib_schedule(rdev, ib);
+	if (r) {
+		radeon_scratch_free(rdev, scratch);
+		radeon_ib_free(rdev, &ib);
+		return r;
+	}
+	r = radeon_fence_wait(ib->fence, false);
+	if (r) {
+		return r;
+	}
+	for (i = 0; i < rdev->usec_timeout; i++) {
+		tmp = RREG32(scratch);
+		if (tmp == 0xDEADBEEF) {
+			break;
+		}
+		DRM_UDELAY(1);
+	}
[...4102 lines suppressed...]
+#define	MC_VM_AGP_TOP					0x2028
+#define	MC_VM_AGP_BOT					0x202C
+#define	MC_VM_AGP_BASE					0x2030
+#define	MC_VM_FB_LOCATION				0x2024
+#define	MC_VM_MB_L1_TLB0_CNTL				0x2234
+#define	MC_VM_MB_L1_TLB1_CNTL				0x2238
+#define	MC_VM_MB_L1_TLB2_CNTL				0x223C
+#define	MC_VM_MB_L1_TLB3_CNTL				0x2240
+#define		ENABLE_L1_TLB					(1 << 0)
+#define		ENABLE_L1_FRAGMENT_PROCESSING			(1 << 1)
+#define		SYSTEM_ACCESS_MODE_PA_ONLY			(0 << 3)
+#define		SYSTEM_ACCESS_MODE_USE_SYS_MAP			(1 << 3)
+#define		SYSTEM_ACCESS_MODE_IN_SYS			(2 << 3)
+#define		SYSTEM_ACCESS_MODE_NOT_IN_SYS			(3 << 3)
+#define		SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU	(0 << 5)
+#define		EFFECTIVE_L1_TLB_SIZE(x)			((x)<<15)
+#define		EFFECTIVE_L1_QUEUE_SIZE(x)			((x)<<18)
+#define	MC_VM_MD_L1_TLB0_CNTL				0x2654
+#define	MC_VM_MD_L1_TLB1_CNTL				0x2658
+#define	MC_VM_MD_L1_TLB2_CNTL				0x265C
+#define	MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR		0x203C
+#define	MC_VM_SYSTEM_APERTURE_HIGH_ADDR			0x2038
+#define	MC_VM_SYSTEM_APERTURE_LOW_ADDR			0x2034
+
+#define	PA_CL_ENHANCE					0x8A14
+#define		CLIP_VTX_REORDER_ENA				(1 << 0)
+#define		NUM_CLIP_SEQ(x)					((x) << 1)
+#define PA_SC_AA_CONFIG					0x28C04
+#define PA_SC_CLIPRECT_RULE				0x2820C
+#define	PA_SC_EDGERULE					0x28230
+#define	PA_SC_FIFO_SIZE					0x8BCC
+#define		SC_PRIM_FIFO_SIZE(x)				((x) << 0)
+#define		SC_HIZ_TILE_FIFO_SIZE(x)			((x) << 12)
+#define	PA_SC_FORCE_EOV_MAX_CNTS			0x8B24
+#define		FORCE_EOV_MAX_CLK_CNT(x)			((x)<<0)
+#define		FORCE_EOV_MAX_REZ_CNT(x)			((x)<<16)
+#define PA_SC_LINE_STIPPLE				0x28A0C
+#define	PA_SC_LINE_STIPPLE_STATE			0x8B10
+#define PA_SC_MODE_CNTL					0x28A4C
+#define	PA_SC_MULTI_CHIP_CNTL				0x8B20
+#define		SC_EARLYZ_TILE_FIFO_SIZE(x)			((x) << 20)
+
+#define	SCRATCH_REG0					0x8500
+#define	SCRATCH_REG1					0x8504
+#define	SCRATCH_REG2					0x8508
+#define	SCRATCH_REG3					0x850C
+#define	SCRATCH_REG4					0x8510
+#define	SCRATCH_REG5					0x8514
+#define	SCRATCH_REG6					0x8518
+#define	SCRATCH_REG7					0x851C
+#define	SCRATCH_UMSK					0x8540
+#define	SCRATCH_ADDR					0x8544
+
+#define	SMX_DC_CTL0					0xA020
+#define		USE_HASH_FUNCTION				(1 << 0)
+#define		CACHE_DEPTH(x)					((x) << 1)
+#define		FLUSH_ALL_ON_EVENT				(1 << 10)
+#define		STALL_ON_EVENT					(1 << 11)
+#define	SMX_EVENT_CTL					0xA02C
+#define		ES_FLUSH_CTL(x)					((x) << 0)
+#define		GS_FLUSH_CTL(x)					((x) << 3)
+#define		ACK_FLUSH_CTL(x)				((x) << 6)
+#define		SYNC_FLUSH_CTL					(1 << 8)
+
+#define	SPI_CONFIG_CNTL					0x9100
+#define		GPR_WRITE_PRIORITY(x)				((x) << 0)
+#define		DISABLE_INTERP_1				(1 << 5)
+#define	SPI_CONFIG_CNTL_1				0x913C
+#define		VTX_DONE_DELAY(x)				((x) << 0)
+#define		INTERP_ONE_PRIM_PER_ROW				(1 << 4)
+#define	SPI_INPUT_Z					0x286D8
+#define	SPI_PS_IN_CONTROL_0				0x286CC
+#define		NUM_INTERP(x)					((x)<<0)
+#define		POSITION_ENA					(1<<8)
+#define		POSITION_CENTROID				(1<<9)
+#define		POSITION_ADDR(x)				((x)<<10)
+#define		PARAM_GEN(x)					((x)<<15)
+#define		PARAM_GEN_ADDR(x)				((x)<<19)
+#define		BARYC_SAMPLE_CNTL(x)				((x)<<26)
+#define		PERSP_GRADIENT_ENA				(1<<28)
+#define		LINEAR_GRADIENT_ENA				(1<<29)
+#define		POSITION_SAMPLE					(1<<30)
+#define		BARYC_AT_SAMPLE_ENA				(1<<31)
+
+#define	SQ_CONFIG					0x8C00
+#define		VC_ENABLE					(1 << 0)
+#define		EXPORT_SRC_C					(1 << 1)
+#define		DX9_CONSTS					(1 << 2)
+#define		ALU_INST_PREFER_VECTOR				(1 << 3)
+#define		DX10_CLAMP					(1 << 4)
+#define		CLAUSE_SEQ_PRIO(x)				((x) << 8)
+#define		PS_PRIO(x)					((x) << 24)
+#define		VS_PRIO(x)					((x) << 26)
+#define		GS_PRIO(x)					((x) << 28)
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_0			0x8DB0
+#define		SIMDA_RING0(x)					((x)<<0)
+#define		SIMDA_RING1(x)					((x)<<8)
+#define		SIMDB_RING0(x)					((x)<<16)
+#define		SIMDB_RING1(x)					((x)<<24)
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_1			0x8DB4
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_2			0x8DB8
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_3			0x8DBC
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_4			0x8DC0
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_5			0x8DC4
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_6			0x8DC8
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_7			0x8DCC
+#define		ES_PRIO(x)					((x) << 30)
+#define	SQ_GPR_RESOURCE_MGMT_1				0x8C04
+#define		NUM_PS_GPRS(x)					((x) << 0)
+#define		NUM_VS_GPRS(x)					((x) << 16)
+#define		DYN_GPR_ENABLE					(1 << 27)
+#define		NUM_CLAUSE_TEMP_GPRS(x)				((x) << 28)
+#define	SQ_GPR_RESOURCE_MGMT_2				0x8C08
+#define		NUM_GS_GPRS(x)					((x) << 0)
+#define		NUM_ES_GPRS(x)					((x) << 16)
+#define	SQ_MS_FIFO_SIZES				0x8CF0
+#define		CACHE_FIFO_SIZE(x)				((x) << 0)
+#define		FETCH_FIFO_HIWATER(x)				((x) << 8)
+#define		DONE_FIFO_HIWATER(x)				((x) << 16)
+#define		ALU_UPDATE_FIFO_HIWATER(x)			((x) << 24)
+#define	SQ_STACK_RESOURCE_MGMT_1			0x8C10
+#define		NUM_PS_STACK_ENTRIES(x)				((x) << 0)
+#define		NUM_VS_STACK_ENTRIES(x)				((x) << 16)
+#define	SQ_STACK_RESOURCE_MGMT_2			0x8C14
+#define		NUM_GS_STACK_ENTRIES(x)				((x) << 0)
+#define		NUM_ES_STACK_ENTRIES(x)				((x) << 16)
+#define	SQ_THREAD_RESOURCE_MGMT				0x8C0C
+#define		NUM_PS_THREADS(x)				((x) << 0)
+#define		NUM_VS_THREADS(x)				((x) << 8)
+#define		NUM_GS_THREADS(x)				((x) << 16)
+#define		NUM_ES_THREADS(x)				((x) << 24)
+
+#define	SX_DEBUG_1					0x9058
+#define		ENABLE_NEW_SMX_ADDRESS				(1 << 16)
+#define	SX_EXPORT_BUFFER_SIZES				0x900C
+#define		COLOR_BUFFER_SIZE(x)				((x) << 0)
+#define		POSITION_BUFFER_SIZE(x)				((x) << 8)
+#define		SMX_BUFFER_SIZE(x)				((x) << 16)
+#define	SX_MISC						0x28350
+
+#define	TA_CNTL_AUX					0x9508
+#define		DISABLE_CUBE_WRAP				(1 << 0)
+#define		DISABLE_CUBE_ANISO				(1 << 1)
+#define		SYNC_GRADIENT					(1 << 24)
+#define		SYNC_WALKER					(1 << 25)
+#define		SYNC_ALIGNER					(1 << 26)
+#define		BILINEAR_PRECISION_6_BIT			(0 << 31)
+#define		BILINEAR_PRECISION_8_BIT			(1 << 31)
+
+#define	TCP_CNTL					0x9610
+
+#define	VGT_CACHE_INVALIDATION				0x88C4
+#define		CACHE_INVALIDATION(x)				((x)<<0)
+#define			VC_ONLY						0
+#define			TC_ONLY						1
+#define			VC_AND_TC					2
+#define		AUTO_INVLD_EN(x)				((x) << 6)
+#define			NO_AUTO						0
+#define			ES_AUTO						1
+#define			GS_AUTO						2
+#define			ES_AND_GS_AUTO					3
+#define	VGT_ES_PER_GS					0x88CC
+#define	VGT_GS_PER_ES					0x88C8
+#define	VGT_GS_PER_VS					0x88E8
+#define	VGT_GS_VERTEX_REUSE				0x88D4
+#define	VGT_NUM_INSTANCES				0x8974
+#define	VGT_OUT_DEALLOC_CNTL				0x28C5C
+#define		DEALLOC_DIST_MASK				0x0000007F
+#define	VGT_STRMOUT_EN					0x28AB0
+#define	VGT_VERTEX_REUSE_BLOCK_CNTL			0x28C58
+#define		VTX_REUSE_DEPTH_MASK				0x000000FF
+
+#define VM_CONTEXT0_CNTL				0x1410
+#define		ENABLE_CONTEXT					(1 << 0)
+#define		PAGE_TABLE_DEPTH(x)				(((x) & 3) << 1)
+#define		RANGE_PROTECTION_FAULT_ENABLE_DEFAULT		(1 << 4)
+#define	VM_CONTEXT0_PAGE_TABLE_BASE_ADDR		0x153C
+#define	VM_CONTEXT0_PAGE_TABLE_END_ADDR			0x157C
+#define	VM_CONTEXT0_PAGE_TABLE_START_ADDR		0x155C
+#define VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR	0x1518
+#define VM_L2_CNTL					0x1400
+#define		ENABLE_L2_CACHE					(1 << 0)
+#define		ENABLE_L2_FRAGMENT_PROCESSING			(1 << 1)
+#define		ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE		(1 << 9)
+#define		EFFECTIVE_L2_QUEUE_SIZE(x)			(((x) & 7) << 14)
+#define VM_L2_CNTL2					0x1404
+#define		INVALIDATE_ALL_L1_TLBS				(1 << 0)
+#define		INVALIDATE_L2_CACHE				(1 << 1)
+#define VM_L2_CNTL3					0x1408
+#define		BANK_SELECT(x)					((x) << 0)
+#define		CACHE_UPDATE_MODE(x)				((x) << 6)
+#define	VM_L2_STATUS					0x140C
+#define		L2_BUSY						(1 << 0)
+
+#define	WAIT_UNTIL					0x8040
+
+#endif
-- 
1.6.2.5


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   |   23 +++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |    9 +++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    3 +++
 11 files changed, 120 insertions(+)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drm-vga-arb.patch	3 Aug 2009 06:03:07 -0000	1.4
+++ drm-vga-arb.patch	5 Aug 2009 00:18:52 -0000	1.5
@@ -1,36 +1,7 @@
-From 189bef6a28e58cb31e5e3ebb88869cd0f0dcc7be Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Thu, 16 Jul 2009 14:33:58 +1000
-Subject: [PATCH] drm: add support to drm for VGA arbitration.
-
-This adds 3 things to the drm,
-
-for non-modesetting drivers, it adds an irq hook
-for the vga arb to disable/enable irqs around vga arb times.
-
-radeon/kms: adds support to disable VGA decoding on r100->r500 under KMS
-intel/kms: add support to disable VGA decoding on hopefully all Intel GPUs
-
-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   |   23 +++++++++++++++++++++++
- drivers/gpu/drm/i915/intel_drv.h       |    1 +
- drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
- drivers/gpu/drm/radeon/radeon.h        |    2 ++
- drivers/gpu/drm/radeon/radeon_asic.h   |    9 +++++++++
- drivers/gpu/drm/radeon/radeon_device.c |   20 +++++++++++++++++++-
- include/drm/drmP.h                     |    3 +++
- 11 files changed, 120 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index b4a3dbc..dffc73d 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
-@@ -37,6 +37,7 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-05 10:15:15.000000000 +1000
+@@ -38,6 +38,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
  
@@ -38,7 +9,7 @@ index b4a3dbc..dffc73d 100644
  /**
   * Get interrupt from bus id.
   *
-@@ -171,6 +172,26 @@ err:
+@@ -212,6 +213,26 @@ err:
  }
  EXPORT_SYMBOL(drm_vblank_init);
  
@@ -65,7 +36,7 @@ index b4a3dbc..dffc73d 100644
  /**
   * Install IRQ handler.
   *
-@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *dev)
+@@ -272,6 +293,9 @@ int drm_irq_install(struct drm_device *d
  		return ret;
  	}
  
@@ -75,7 +46,7 @@ index b4a3dbc..dffc73d 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)
+@@ -320,6 +344,9 @@ int drm_irq_uninstall(struct drm_device 
  
  	DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
@@ -85,10 +56,9 @@ index b4a3dbc..dffc73d 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 8c47831..f7e1342 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb	2009-08-05 07:03:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-05 10:15:15.000000000 +1000
 @@ -33,6 +33,7 @@
  #include "i915_drm.h"
  #include "i915_drv.h"
@@ -97,7 +67,7 @@ index 8c47831..f7e1342 100644
  #define I915_DRV	"i915_drv"
  
  /* Really want an OS-independent resettable timer.  Would like to have
-@@ -984,6 +985,19 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
+@@ -984,6 +985,19 @@ static int i915_probe_agp(struct drm_dev
  	return 0;
  }
  
@@ -117,7 +87,7 @@ index 8c47831..f7e1342 100644
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1029,6 +1043,11 @@ static int i915_load_modeset_init(struct drm_device *dev,
+@@ -1029,6 +1043,11 @@ static int i915_load_modeset_init(struct
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -129,7 +99,7 @@ index 8c47831..f7e1342 100644
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1278,6 +1297,7 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -1278,6 +1297,7 @@ int i915_driver_unload(struct drm_device
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -137,11 +107,10 @@ index 8c47831..f7e1342 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 d087528..61a54a1 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -747,6 +747,7 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-05 10:15:15.000000000 +1000
+@@ -760,6 +760,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);
@@ -149,10 +118,9 @@ index d087528..61a54a1 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 6c08584..3e3145e 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-05 10:15:15.000000000 +1000
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -161,11 +129,10 @@ index 6c08584..3e3145e 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 508838e..5440f3c 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -3188,3 +3188,26 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-05 10:15:15.000000000 +1000
+@@ -3871,3 +3871,26 @@ struct drm_encoder *intel_best_encoder(s
  
  	return &intel_output->enc;
  }
@@ -192,22 +159,20 @@ index 508838e..5440f3c 100644
 +	pci_write_config_word(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 004541c..a715f80 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -154,4 +154,5 @@ extern int intel_framebuffer_create(struct drm_device *dev,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-05 10:15:15.000000000 +1000
+@@ -161,4 +161,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 c550932..b091ba7 100644
---- a/drivers/gpu/drm/radeon/r100.c
-+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1256,6 +1256,20 @@ static void r100_vram_get_type(struct radeon_device *rdev)
- 	}
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb	2009-08-05 10:14:23.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-05 10:15:15.000000000 +1000
+@@ -1497,6 +1497,20 @@ void r100_vram_init_sizes(struct radeon_
+ 		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
 +void r100_vga_set_state(struct radeon_device *rdev, bool state)
@@ -227,31 +192,10 @@ index c550932..b091ba7 100644
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index d61f2fc..655f6af 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -499,6 +499,7 @@ struct radeon_asic {
- 	int (*init)(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);
-@@ -773,6 +774,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 e2e5673..59c505c 100644
---- a/drivers/gpu/drm/radeon/radeon_asic.h
-+++ b/drivers/gpu/drm/radeon/radeon_asic.h
-@@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-05 10:15:15.000000000 +1000
+@@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_devi
  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);
@@ -259,7 +203,7 @@ index e2e5673..59c505c 100644
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -76,6 +77,7 @@ static struct radeon_asic r100_asic = {
+@@ -84,6 +85,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -267,7 +211,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -132,6 +134,7 @@ static struct radeon_asic r300_asic = {
+@@ -147,6 +149,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -275,7 +219,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -169,6 +172,7 @@ static struct radeon_asic r420_asic = {
+@@ -190,6 +193,7 @@ static struct radeon_asic r420_asic = {
  	.init = &r300_init,
  	.errata = &r420_errata,
  	.vram_info = &r420_vram_info,
@@ -283,7 +227,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r420_mc_init,
  	.mc_fini = &r420_mc_fini,
-@@ -213,6 +217,7 @@ static struct radeon_asic rs400_asic = {
+@@ -240,6 +244,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -291,7 +235,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -258,6 +263,7 @@ static struct radeon_asic rs600_asic = {
+@@ -292,6 +297,7 @@ static struct radeon_asic rs600_asic = {
  	.init = &r300_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
@@ -299,7 +243,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -298,6 +304,7 @@ static struct radeon_asic rs690_asic = {
+@@ -337,6 +343,7 @@ static struct radeon_asic rs690_asic = {
  	.init = &r300_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
@@ -307,7 +251,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -343,6 +350,7 @@ static struct radeon_asic rv515_asic = {
+@@ -389,6 +396,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -315,7 +259,7 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -381,6 +389,7 @@ static struct radeon_asic r520_asic = {
+@@ -432,6 +440,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -323,10 +267,9 @@ index e2e5673..59c505c 100644
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index f97563d..d84e924 100644
---- a/drivers/gpu/drm/radeon/radeon_device.c
-+++ b/drivers/gpu/drm/radeon/radeon_device.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-05 10:15:29.000000000 +1000
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -335,7 +278,7 @@ index f97563d..d84e924 100644
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -440,7 +441,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
+@@ -475,7 +476,18 @@ void radeon_combios_fini(struct radeon_d
  int radeon_modeset_init(struct radeon_device *rdev);
  void radeon_modeset_fini(struct radeon_device *rdev);
  
@@ -354,33 +297,50 @@ index f97563d..d84e924 100644
  /*
   * Radeon device.
   */
-@@ -516,7 +528,12 @@ int radeon_device_init(struct radeon_device *rdev,
- 	/* Initialize surface registers */
- 	radeon_surface_init(rdev);
- 
--	/* TODO: disable VGA need to use VGA request */
-+	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
-+	ret = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-+	if (ret) {
-+		return -EINVAL;
-+	}
-+
- 	/* BIOS*/
- 	if (!radeon_get_bios(rdev)) {
- 		if (ASIC_IS_AVIVO(rdev))
-@@ -652,6 +669,7 @@ void radeon_device_fini(struct radeon_device *rdev)
- 	radeon_agp_fini(rdev);
+@@ -566,6 +578,12 @@ int radeon_device_init(struct radeon_dev
+ 		/* Initialize surface registers */
+ 		radeon_surface_init(rdev);
+ 
++		/* if we have > 1 VGA cards, then disable the radeon VGA resources */
++		ret = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
++		if (ret) {
++			return -EINVAL;
++		}
++
+ 		/* TODO: disable VGA need to use VGA request */
+ 		/* BIOS*/
+ 		if (!radeon_get_bios(rdev)) {
+@@ -700,6 +718,7 @@ void radeon_device_fini(struct radeon_de
+ 		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);
- 	if (rdev->is_atom_bios) {
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..95106c7 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -786,6 +786,9 @@ struct drm_driver {
+ 		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 -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-05 10:15:15.000000000 +1000
+@@ -579,6 +579,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);
+@@ -879,6 +880,7 @@ static inline void radeon_ring_write(str
+ #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 -up linux-2.6.30.noarch/include/drm/drmP.h.arb linux-2.6.30.noarch/include/drm/drmP.h
+--- linux-2.6.30.noarch/include/drm/drmP.h.arb	2009-08-05 10:14:24.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-05 10:15:15.000000000 +1000
+@@ -797,6 +797,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
  
@@ -390,6 +350,3 @@ index 45b67d9..95106c7 100644
  	/* Driver private ops for this object */
  	struct vm_operations_struct *gem_vm_ops;
  
--- 
-1.5.4.1
-


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1689
retrieving revision 1.1690
diff -u -p -r1.1689 -r1.1690
--- kernel.spec	4 Aug 2009 15:18:23 -0000	1.1689
+++ kernel.spec	5 Aug 2009 00:18:53 -0000	1.1690
@@ -676,6 +676,7 @@ Patch1821: drm-page-flip.patch
 # anholt's tree as of 2009-08-03
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
+Patch1826: drm-r600-kms.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1278,6 +1279,8 @@ ApplyPatch linux-2.6-ksm-kvm.patch
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch drm-r600-kms.patch
+
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
@@ -1946,6 +1949,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com>
+- Add Jeromes initial r600 kms work.
+- rebase arb patch
+
 * Tue Aug 04 2009 Kyle McMartin <kyle at redhat.com>
 - alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch: apply patch
   destined for 2.6.32, requested by Lennart.



From rdieter at fedoraproject.org  Wed Aug  5 00:19:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:19:28 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.1.96-AllowExternalPaths.patch, 1.1, NONE
Message-ID: <20090805001928.1ECEE11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17149

Removed Files:
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
Log Message:
old patch



--- kdebase-workspace-4.1.96-AllowExternalPaths.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 00:22:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:22:25 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.2.85-ck-shutdown.patch, NONE,
	1.1 kdebase-workspace-4.2.85-klipper-url.patch, NONE,
	1.1 kdebase-workspace-4.2.90-show_systemsettings.patch, NONE,
	1.1 kdebase-workspace-4.2.95-default-applets.patch, NONE,
	1.1 kdebase-workspace-4.2.95-plasma-konsole.patch, NONE,
	1.1 kdebase-workspace-4.2.95-rootprivs.patch, NONE,
	1.1 kdebase-workspace-4.2.96-redhat-startkde.patch, NONE,
	1.1 kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch, 
	NONE, 1.1 .cvsignore, 1.31, 1.32 kdebase-workspace.spec, 1.232,
	1.233 sources, 1.37,
	1.38 kdebase-workspace-4.0.3-timedate-kcm.patch, 1.1,
	NONE kdebase-workspace-4.0.72-ck-shutdown.patch, 1.1,
	NONE kdebase-workspace-4.0.72-klipper-url.patch, 1.3,
	NONE kdebase-workspace-4.1.2-rootprivs.patch, 1.1,
	NONE kdebase-workspace-4.1.96-AllowExternalPaths.patch, 1.1,
	NONE kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.2,
	NONE kdebase-workspace-4.2.0-default_applets.patch, 1.2,
	NONE kdebase-workspace-4.2.0-kde#180576.patch, 1.3,
	NONE kdebase-workspace-4.2.0-show-systemsettings.patch, 1.1,
	NONE kdebase-workspace-4.2.1-plasma-konsole.patch, 1.1,
	NONE kdebase-workspace-4.2.1-redhat-startkde.patch, 1.1,
	NONE kdebase-workspace-4.2.3-weather-dataengine-nm.patch, 1.1,
	NONE kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch, 1.1,
	NONE kdebase-workspace-4.3.0-desktopnumbers.patch, 1.1,
	NONE kdebase-workspace-4.3.0-device-notifier-luks.patch, 1.1, NONE
Message-ID: <20090805002225.A0EE611C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17957/F-11

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.2.85-ck-shutdown.patch 
	kdebase-workspace-4.2.85-klipper-url.patch 
	kdebase-workspace-4.2.90-show_systemsettings.patch 
	kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace-4.2.95-plasma-konsole.patch 
	kdebase-workspace-4.2.95-rootprivs.patch 
	kdebase-workspace-4.2.96-redhat-startkde.patch 
	kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch 
Removed Files:
	kdebase-workspace-4.0.3-timedate-kcm.patch 
	kdebase-workspace-4.0.72-ck-shutdown.patch 
	kdebase-workspace-4.0.72-klipper-url.patch 
	kdebase-workspace-4.1.2-rootprivs.patch 
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace-4.2.0-kde#180576.patch 
	kdebase-workspace-4.2.0-show-systemsettings.patch 
	kdebase-workspace-4.2.1-plasma-konsole.patch 
	kdebase-workspace-4.2.1-redhat-startkde.patch 
	kdebase-workspace-4.2.3-weather-dataengine-nm.patch 
	kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch 
	kdebase-workspace-4.3.0-desktopnumbers.patch 
	kdebase-workspace-4.3.0-device-notifier-luks.patch 
Log Message:
kde-4.3.0


kdebase-workspace-4.2.85-ck-shutdown.patch:
 kdisplaymanager.cpp |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

--- NEW FILE kdebase-workspace-4.2.85-ck-shutdown.patch ---
diff -up kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp.ck-shutdown kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp
--- kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp.ck-shutdown	2009-04-28 15:46:11.000000000 +0200
+++ kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp	2009-05-11 22:49:41.000000000 +0200
@@ -26,6 +26,7 @@
 #include <QtDBus/QtDBus>
 
 #include <QRegExp>
+#include <QLatin1String>
 
 #include <X11/Xauth.h>
 #include <X11/Xlib.h>
@@ -85,6 +86,7 @@ KDisplayManager::KDisplayManager() : d(n
 				strcpy( sa.sun_path, "/tmp/.gdm_socket" );
 				if (::connect( d->fd, (struct sockaddr *)&sa, sizeof(sa) )) {
 					::close( d->fd );
+					DMType = NoDM;
 					d->fd = -1;
 					break;
 				}
@@ -186,6 +188,21 @@ KDisplayManager::exec( const char *cmd, 
 bool
 KDisplayManager::canShutdown()
 {
+	if (DMType == NoDM) {
+		// No DM or newest GDM running, we'll try shutting down through ConsoleKit.
+		// Unfortunately, ConsoleKit won't tell us if we're allowed to do that
+		// (it also depends on whether there are other users logged in on the
+		// system), so we can only check if it's running at all.
+		QDBusConnection systemBus = QDBusConnection::systemBus();
+		if (!systemBus.isConnected())
+			return false;
+		QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+		                           QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+		                           QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+		                           systemBus );
+		return consoleKit.isValid();
+	}
+
 	if (DMType == OldKDM)
 		return strstr( ctl, ",maysd" ) != 0;
 
@@ -205,6 +222,21 @@ KDisplayManager::shutdown( KWorkSpace::S
 	if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
 		return;
 
+        if (DMType == NoDM) {
+               // No DM or newest GDM running, try shutting down through ConsoleKit.
+               QDBusConnection systemBus = QDBusConnection::systemBus();
+               if (!systemBus.isConnected())
+                       return;
+               QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+                                          QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+                                          QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+                                          systemBus );
+               if (consoleKit.isValid())
+                       consoleKit.call( QLatin1String( shutdownType == KWorkSpace::ShutdownTypeReboot ?
+                                                       "Restart" : "Stop" ) );
+               return;
+        }
+
 	bool cap_ask;
 	if (DMType == NewKDM) {
 		QByteArray re;

kdebase-workspace-4.2.85-klipper-url.patch:
 klipperrc.desktop |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.2.85-klipper-url.patch ---
diff -up kdebase-workspace-4.2.85/klipper/klipperrc.desktop.klipper-url kdebase-workspace-4.2.85/klipper/klipperrc.desktop
--- kdebase-workspace-4.2.85/klipper/klipperrc.desktop.klipper-url	2009-04-05 22:00:13.000000000 +0200
+++ kdebase-workspace-4.2.85/klipper/klipperrc.desktop	2009-05-11 22:56:51.000000000 +0200
@@ -409,7 +409,7 @@ Description[zh_TW]=?? &Konqueror ?
 Enabled=true
 
 [Action_1/Command_2]
-Commandline=ps x |grep -q '[m]ozilla' && "mozilla -remote openURL(%s, new-window)" || mozilla %s
+Commandline=ps x |grep -q '[m]ozilla' && mozilla -remote 'openURL(%s, new-window)' || mozilla %s
 Icon=mozilla
 Description=Open with &Mozilla
 Description[af]=Maak oop met Mozilla
@@ -581,7 +581,7 @@ Description[zh_TW]=?? &URL
 Enabled=true
 
 [Action_1/Command_4]
-Commandline=ps x |grep -q '[f]irefox' && "firefox -remote openURL(%s, new-window)" || firefox "%s"
+Commandline=ps x |grep -q '[f]irefox' && firefox -remote 'openURL(%s, new-window)' || firefox "%s"
 Icon=firefox
 Description=Open with &Firefox
 Description[af]=Maak oop met Firefox
@@ -1892,7 +1892,7 @@ Description[zh_TW]=?? &Konqueror ?
 Enabled=true
 
 [Action_6/Command_2]
-Commandline=mozilla -remote openURL(%s, new-window)
+Commandline=mozilla -remote 'openURL(%s, new-window)'
 Description=Open with &Mozilla
 Description[af]=Maak oop met Mozilla
 Description[ar]=???? ?????? &??????

kdebase-workspace-4.2.90-show_systemsettings.patch:
 plasma/applets/kickoff/core/applicationmodel.cpp |    1 -
 systemsettings/app/systemsettings.desktop        |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.2.90-show_systemsettings.patch ---
diff -up kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-05-14 12:26:34.000000000 -0500
+++ kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp	2009-06-03 20:53:41.000000000 -0500
@@ -111,7 +111,6 @@ public:
               displayOrder(NameAfterDescription),
               allowSeparators(_allowSeparators)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings	2009-04-30 13:02:27.000000000 -0500
+++ kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop	2009-06-03 20:53:41.000000000 -0500
@@ -157,3 +157,4 @@ Name[zh_TW]=????
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;

kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.2.95-default-applets.patch ---
diff -ur kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp	2009-07-03 01:07:27.000000000 +0200
@@ -259,15 +259,22 @@
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
+         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
+    }
+
+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+       loadDefaultApplet("networkmanagement", panel);
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);

kdebase-workspace-4.2.95-plasma-konsole.patch:
 desktop.cpp |   13 +++++++++++++
 desktop.h   |    2 ++
 2 files changed, 15 insertions(+)

--- NEW FILE kdebase-workspace-4.2.95-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp	2009-06-26 12:00:49.000000000 +0200
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <ktoolinvocation.h>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -65,6 +66,7 @@ DefaultDesktop::DefaultDesktop(QObject *
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
+      m_runKonsoleAction(0),
       dropping(false)
 {
     qRegisterMetaType<QImage>("QImage");
@@ -203,6 +205,11 @@ void DefaultDesktop::runCommand()
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -253,6 +260,10 @@ QList<QAction*> DefaultDesktop::contextu
             m_addPanelAction->setIcon(KIcon("list-add"));
         }
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         m_runCommandAction->setIcon(KIcon("system-run"));
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
@@ -272,6 +283,8 @@ QList<QAction*> DefaultDesktop::contextu
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole	2009-04-05 22:00:17.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h	2009-06-26 11:49:24.000000000 +0200
@@ -70,6 +70,7 @@ protected:
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -89,6 +90,7 @@ private:
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;

kdebase-workspace-4.2.95-rootprivs.patch:
 ModuleView.cpp |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

--- NEW FILE kdebase-workspace-4.2.95-rootprivs.patch ---
diff -ur kdebase-workspace-4.2.95/systemsettings/core/ModuleView.cpp kdebase-workspace-4.2.95-rootprivs/systemsettings/core/ModuleView.cpp
--- kdebase-workspace-4.2.95/systemsettings/core/ModuleView.cpp	2009-06-23 13:14:38.000000000 +0200
+++ kdebase-workspace-4.2.95-rootprivs/systemsettings/core/ModuleView.cpp	2009-06-29 19:39:01.000000000 +0200
@@ -39,6 +39,7 @@
 #include <KCModuleProxy>
 #include <KStandardGuiItem>
 #include <KDialogButtonBox>
+#include <KStandardDirs>
 
 #include "MenuItem.h"
 
@@ -124,6 +125,32 @@
       return;
     }
 
+    if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) {
+        QString kdesu = KStandardDirs::findExe( "kdesu" );
+        QString cmd = menuItem->service()->exec().trimmed();
+
+        /* Prepare the process to run the kcmshell */
+        if ( cmd.left(5) == "kdesu" )
+        {
+            cmd = cmd.remove(0,5).trimmed();
+
+            /* Remove all kdesu switches */
+            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
+                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
+        }
+
+        if ( cmd.left(9) == "kcmshell4" )
+            cmd = cmd.remove(0,9).trimmed();
+
+        QStringList args;
+        args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
+
+        kDebug() << "Starting root module: " << args;
+        QProcess::startDetached( kdesu, args );
+
+        return;
+    }
+
     QList<KCModuleInfo*> modules;
     if ( menuItem->children().empty() ) {
         modules << &menuItem->item();

kdebase-workspace-4.2.96-redhat-startkde.patch:
 startkde.cmake |   35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

--- NEW FILE kdebase-workspace-4.2.96-redhat-startkde.patch ---
diff -up kdebase-workspace-4.2.96/startkde.cmake.redhat-startkde kdebase-workspace-4.2.96/startkde.cmake
--- kdebase-workspace-4.2.96/startkde.cmake.redhat-startkde	2009-07-08 16:45:04.000000000 +0200
+++ kdebase-workspace-4.2.96/startkde.cmake	2009-07-16 15:28:12.000000000 +0200
@@ -22,36 +22,20 @@ if test $kcheckrunning_result -eq 0 ; th
 	exit 1
 elif test $kcheckrunning_result -eq 2 ; then
 	echo "\$DISPLAY is not set or cannot connect to the X server."
-        exit 1
+        exit 1 
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default.
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 unset DYLD_FORCE_FLAT_NAMESPACE
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -89,6 +73,13 @@ kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 returncode=$?
 if test $returncode -ne 0; then
@@ -209,8 +200,9 @@ fi
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done
@@ -423,7 +415,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch:
 battery.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp
--- kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp	2009-07-08 16:45:03.000000000 +0200
+++ kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp	2009-08-03 06:43:04.000000000 +0200
@@ -530,7 +530,11 @@
             QString state = battery_data.value()["State"].toString();
             m_remainingMSecs = battery_data.value()["Remaining msec"].toInt();
             //kDebug() << "time left:" << m_remainingMSecs;
-            if (state == "Discharging" && m_remainingMSecs > 0 && m_showRemainingTime) {
+            // Always show the remaining time in the popup (like KDE 4.2.x did).
+            // We don't just set m_showRemainingTime to true by default because
+            // that'd try to use the time also for the icon. That won't fit on
+            // small panels and wasn't the default in 4.2 either.
+            if (state == "Discharging" && m_remainingMSecs > 0) {
 
                 // FIXME: Somehow, m_extenderApplet is null here, so the label never becomes visible
                 if (m_extenderApplet) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	30 May 2009 10:58:08 -0000	1.31
+++ .cvsignore	5 Aug 2009 00:22:24 -0000	1.32
@@ -1 +1,5 @@
-kdebase-workspace-4.2.4.tar.bz2
+kdebase-workspace-4.2.90.tar.bz2
+kdebase-workspace-4.2.95.tar.bz2
+kdebase-workspace-4.2.96.tar.bz2
+kdebase-workspace-4.2.98.tar.bz2
+kdebase-workspace-4.3.0.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- kdebase-workspace.spec	9 Jul 2009 20:45:30 -0000	1.232
+++ kdebase-workspace.spec	5 Aug 2009 00:22:25 -0000	1.233
@@ -1,12 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%if 0%{?fedora} <= 9
-%define have_bluez3 1
-%endif
-
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.4
+Version: 4.3.0
 
 Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
@@ -15,42 +11,36 @@ Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch
-Patch2: kdebase-workspace-4.2.1-plasma-konsole.patch
-Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
-Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
-#?434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch5: kdebase-workspace-4.1.2-rootprivs.patch
-Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
+Patch1: kdebase-workspace-4.2.96-redhat-startkde.patch
+Patch2: kdebase-workspace-4.2.95-plasma-konsole.patch
+Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
+Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
 #?441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
-Patch8: kdebase-workspace-4.0.72-klipper-url.patch
+Patch8: kdebase-workspace-4.2.85-klipper-url.patch
+#?434824: KDE4 System Settings - No Method To Enter Administrative Mode
+Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.0-default_applets.patch
+Patch12: kdebase-workspace-4.2.95-default-applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
-# Fix kde#165726: klipper crashed when opening link with external application
-# It's already fixed in 4.3 as part of a larger commit, but the fix never got
-# backported to 4.2.
-Patch16: kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch
+# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
 
 # upstream patches:
+# 4.3 branch
+
 # trunk
-Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
-# solid-bluetooth, https://bugzilla.redhat.com/481801
-Patch101: solid-bluetoothTrunkTo42.diff
-# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
-# 0.3 requires BlueZ 4 and the patch above
-Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
-# from 4.3: http://bugs.kde.org/180576
-Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-#?4.3, https://bugs.kde.org/show_bug.cgi?id=184152
-Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# from 4.3: check for network avail. through Solid/NM in the weather dataengine
-Patch106: kdebase-workspace-4.2.3-weather-dataengine-nm.patch
-# 4.3: #510527 -  Encrypted USB drives don't show up in KDE device notifier
-Patch107: kdebase-workspace-4.3.0-device-notifier-luks.patch
+
+# moving to non-multilib hack
+Obsoletes: kdebase-workspace < 4.3.0-2
+
+Obsoletes: PolicyKit-kde < %{version}-100 
+Provides:  PolicyKit-kde = %{version}-100
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -70,11 +60,15 @@ Obsoletes: kpowersave < 0.7.3-10
 Obsoletes: guidance-power-manager < 4.3
 %endif
 
+BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
+BuildRequires: desktop-file-utils
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
+BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
@@ -83,14 +77,15 @@ BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-BuildRequires: qedje-devel
+BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 # would much rather these deps be elsewhere,
@@ -142,12 +137,10 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth-devel = 4.1.4-1
-%else
+Obsoletes: PolicyKit-kde-devel < 4.2.85
+Provides:  PolicyKit-kde-devel = %{version}-%{release}
 Provides: solid-bluetooth-devel = 4.3-0.1
-%endif
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -155,11 +148,7 @@ Requires: kdelibs4-devel
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth = 4.1.4-1
-%else
 Provides: solid-bluetooth = 4.3-0.1
-%endif
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -224,34 +213,20 @@ Requires: PyKDE4 >= %{version}
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
 %patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .show-systemsettings
+%patch3 -p1 -b .show_systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch4 -p1 -b .ck-shutdown
-pushd systemsettings
-%patch5 -p0 -b .rootprivs
-popd
-%patch6 -p0 -b .timedate-kcm
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
+%patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default_applets
+%patch12 -p1 -b .default-applets
 %patch13 -p1 -b .pykde4
-%patch14 -p1 -b .klipper-arora
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
-%patch16 -p1 -b .kde#165726
+%patch16 -p1 -b .showremainingtime
 
 # upstream patches
-%patch100 -p1 -b .AllowExternalPaths
-%if 0%{?have_bluez3}
-%patch102 -p1 -b .bluetooth-revert
-%else
-%patch101 -p0 -b .solid-bluetoothTrunkTo42
-%endif
-%patch103 -p1 -b .kde#180576
-%patch105 -p0 -b .desktopnumbers
-%patch106 -p1 -b .weather-dataengine-nm
-%patch107 -p0 -b .device-notifier-luks
 
 %build
 
@@ -288,6 +263,12 @@ ln -sf ../pics/users/%{default_face_icon
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -318,7 +299,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
 %{_kde4_bindir}/kaccess                           
 %{_kde4_bindir}/kapplymousetheme                  
 %{_kde4_bindir}/kblankscrn.kss                    
@@ -343,13 +323,15 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/plasma
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
-%{_kde4_bindir}/plasmapkg
 %{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/plasmawallpaperviewer
 %{_kde4_bindir}/safestartkde
 %{_kde4_bindir}/setscheduler
+%{_kde4_bindir}/solid-action-desktop-gen
 %{_kde4_bindir}/solid-bluetooth
 %{_kde4_bindir}/solid-network
 %{_kde4_bindir}/solid-powermanagement
@@ -361,6 +343,7 @@ fi
 %{_kde4_appsdir}/kaccess/
 %{_kde4_appsdir}/kcminput/
 %{_kde4_appsdir}/kcmkeys/
+%{_kde4_appsdir}/kcmsolidactions/
 %{_kde4_appsdir}/kconf_update/
 %{_kde4_appsdir}/kcontrol/
 %{_kde4_appsdir}/kdisplay/
@@ -378,15 +361,11 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
-%if 0%{?have_bluez3}
-%{_kde4_appsdir}/solidfakebluetoothbackend/
-%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 
 %{_kde4_configdir}/background.knsrc
 %{_kde4_configdir}/colorschemes.knsrc
-%{_kde4_configdir}/klipperrc
 %{_kde4_configdir}/ksplash.knsrc
 %{_kde4_configdir}/ksysguard.knsrc
 %{_kde4_configdir}/plasma-overlayrc
@@ -394,11 +373,13 @@ fi
 %{_kde4_configdir}/wallpaper.knsrc
 
 %{_kde4_datadir}/kde4/services/*
+%exclude %{_kde4_datadir}/kde4/services/kdm.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
 %{_kde4_datadir}/autostart/krunner.desktop
 %{_kde4_datadir}/autostart/plasma.desktop
+%{_kde4_datadir}/autostart/plasma-desktop.desktop
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
@@ -409,13 +390,17 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_libdir}/kde4/classic_mode.so
 %{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/icon_mode.so
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kcm_kdm.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -424,26 +409,30 @@ fi
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
-%{_kde4_libdir}/kde4/plasma_appletscript_*.so
-%{_kde4_libdir}/kde4/plasma_appletscriptengine_*.so
+%{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
 %{_kde4_libdir}/kde4/plasma_engine_*.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
+%{_kde4_libdir}/kde4/plasma-geolocation-ip.so
 %{_kde4_libdir}/kde4/plasma_package*_*.so
-%{_kde4_libdir}/kde4/plasma_runnerscript_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
 %{_kde4_libdir}/kde4/solid_*.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_libexecdir}/kcheckpass
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
-%{_kde4_libexecdir}/krunner_lock
+%{_kde4_libexecdir}/kscreenlocker
+%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
+%{_kde4_libdir}/libkickoff.so
+%{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
+%{_mandir}/man1/plasmaengineexplorer.1*
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
@@ -457,20 +446,19 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
-# CMake changes behaviour after cmake-2.6.2 
-%if "%{?_cmake_version}" > "2.6.2" 
-%{_kde4_libdir}/cmake/KDE4Workspace*
-%else
-%{_kde4_libdir}/KDE4Workspace*
-%endif
+%{_kde4_libdir}/cmake/KDE4Workspace-%{version}/
 %exclude %{_kde4_libdir}/libkdeinit*.so
+%exclude %{_kde4_libdir}/libkickoff.so
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%exclude %{_kde4_libdir}/libsystemsettingsview.so
 
 %files wallpapers
 %defattr(-,root,root,-)
@@ -492,6 +480,7 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -526,32 +515,85 @@ fi
 
 
 %changelog
-* Thu Jul  9 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-5
-- #510527 - Encrypted USB drives don't show up in KDE device notifier
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-4
+- respin
+
+* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
+- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- move designer plugins to -libs, fixes
+  Multilib conflicts for index.cache.bz2 (#515088)
+- tighten -libs deps, using %%{?_isa}
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Mon Jul 27 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.98-3
+- backport forgotten method impl in Solid from 4.3 branch, r1000715
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Wed Jul  1 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.4-4
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Mon Jul 06 2009 Than Ngo <than at redhat.com> - 4.2.95-7
+- plasma-desktop crashes when closing/opening windows (upstream patch)
+
+* Fri Jul 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-6
+- add kde-plasma-networkmanagement to the default panel if installed
+
+* Wed Jul 01 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.95-5
 - rebuild (google-gadgets)
 
-* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
-- fix Klipper crashes when destroying the popup (kde#165726)
+* Wed Jul 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-4
+- rebuild (libxklavier)
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
+- omit a few kdm bits from main pkg (#508647)
+
+* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-2
+- port and reapply rootprivs (#434824) patch (#508593)
+- fix internal version number (otherwise it mismatches with our file list)
 
-* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
-- make default_leonidas.png the default face icon on F11 (#503347)
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-3
+- startkde: make MALLOC_CHECK opt-in (default off)
 
-* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-6
+* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-2
+- bump Obsoletes: PolicyKit-kde
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-5
+- make default_leonidas.png the default face icon on F11
+
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-4
+- -devel:  exclude libkickoff.so, libsystemsettingsview.so
+- drop old cmake crud
+
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-3
 - omit/revert session-button patch (kde#194506,rh#502953)
+- drop unused knotificationitem-1 patch
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-5
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
 - upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
+- drop < F-10 crud, have_bluez3
 
-* Mon May 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.3-4
-- fix TAB completion in krunner
-
-* Thu May 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.3-3
-- check for network availability through Solid/NM in the weather dataengine
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- 4.2.85
+- Obsoletes/Provides: PolicyKit-kde(-devel)
 
 * Wed May 06 2009 Than Ngo <than at redhat.com> - 4.2.3-2
 - Requires: oxygen-icon-theme >= 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	30 May 2009 10:58:08 -0000	1.37
+++ sources	5 Aug 2009 00:22:25 -0000	1.38
@@ -1 +1 @@
-72f90e1a61d94a5f66c0b3ce39b7b279  kdebase-workspace-4.2.4.tar.bz2
+e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2


--- kdebase-workspace-4.0.3-timedate-kcm.patch DELETED ---


--- kdebase-workspace-4.0.72-ck-shutdown.patch DELETED ---


--- kdebase-workspace-4.0.72-klipper-url.patch DELETED ---


--- kdebase-workspace-4.1.2-rootprivs.patch DELETED ---


--- kdebase-workspace-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdebase-workspace-4.2.0-bluetooth-revert.patch DELETED ---


--- kdebase-workspace-4.2.0-default_applets.patch DELETED ---


--- kdebase-workspace-4.2.0-kde#180576.patch DELETED ---


--- kdebase-workspace-4.2.0-show-systemsettings.patch DELETED ---


--- kdebase-workspace-4.2.1-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.2.1-redhat-startkde.patch DELETED ---


--- kdebase-workspace-4.2.3-weather-dataengine-nm.patch DELETED ---


--- kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch DELETED ---


--- kdebase-workspace-4.3.0-desktopnumbers.patch DELETED ---


--- kdebase-workspace-4.3.0-device-notifier-luks.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 00:22:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:22:24 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.85-ck-shutdown.patch, NONE,
	1.1 kdebase-workspace-4.2.85-klipper-url.patch, NONE,
	1.1 kdebase-workspace-4.2.90-show_systemsettings.patch, NONE,
	1.1 kdebase-workspace-4.2.95-default-applets.patch, NONE,
	1.1 kdebase-workspace-4.2.95-plasma-konsole.patch, NONE,
	1.1 kdebase-workspace-4.2.95-rootprivs.patch, NONE,
	1.1 kdebase-workspace-4.2.96-redhat-startkde.patch, NONE,
	1.1 kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch, 
	NONE, 1.1 .cvsignore, 1.25, 1.26 kdebase-workspace.spec, 1.182,
	1.183 sources, 1.31,
	1.32 kdebase-workspace-4.0.3-timedate-kcm.patch, 1.1,
	NONE kdebase-workspace-4.0.72-ck-shutdown.patch, 1.1,
	NONE kdebase-workspace-4.0.72-klipper-url.patch, 1.1,
	NONE kdebase-workspace-4.1.2-rootprivs.patch, 1.1,
	NONE kdebase-workspace-4.1.96-AllowExternalPaths.patch, 1.1,
	NONE kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.2,
	NONE kdebase-workspace-4.2.0-default_applets.patch, 1.2,
	NONE kdebase-workspace-4.2.0-kde#180576.patch, 1.1,
	NONE kdebase-workspace-4.2.0-show-systemsettings.patch, 1.1,
	NONE kdebase-workspace-4.2.1-plasma-konsole.patch, 1.1,
	NONE kdebase-workspace-4.2.1-redhat-startkde.patch, 1.1,
	NONE kdebase-workspace-4.2.2-kde#187699.patch, 1.2,
	NONE kdebase-workspace-4.2.3-weather-dataengine-nm.patch, 1.1,
	NONE kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch, 1.1,
	NONE kdebase-workspace-4.3.0-desktopnumbers.patch, 1.1,
	NONE kdebase-workspace-4.3.0-device-notifier-luks.patch, 1.1, NONE
Message-ID: <20090805002224.20BFC11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17957/F-10

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.2.85-ck-shutdown.patch 
	kdebase-workspace-4.2.85-klipper-url.patch 
	kdebase-workspace-4.2.90-show_systemsettings.patch 
	kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace-4.2.95-plasma-konsole.patch 
	kdebase-workspace-4.2.95-rootprivs.patch 
	kdebase-workspace-4.2.96-redhat-startkde.patch 
	kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch 
Removed Files:
	kdebase-workspace-4.0.3-timedate-kcm.patch 
	kdebase-workspace-4.0.72-ck-shutdown.patch 
	kdebase-workspace-4.0.72-klipper-url.patch 
	kdebase-workspace-4.1.2-rootprivs.patch 
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace-4.2.0-kde#180576.patch 
	kdebase-workspace-4.2.0-show-systemsettings.patch 
	kdebase-workspace-4.2.1-plasma-konsole.patch 
	kdebase-workspace-4.2.1-redhat-startkde.patch 
	kdebase-workspace-4.2.2-kde#187699.patch 
	kdebase-workspace-4.2.3-weather-dataengine-nm.patch 
	kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch 
	kdebase-workspace-4.3.0-desktopnumbers.patch 
	kdebase-workspace-4.3.0-device-notifier-luks.patch 
Log Message:
kde-4.3.0


kdebase-workspace-4.2.85-ck-shutdown.patch:
 kdisplaymanager.cpp |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

--- NEW FILE kdebase-workspace-4.2.85-ck-shutdown.patch ---
diff -up kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp.ck-shutdown kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp
--- kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp.ck-shutdown	2009-04-28 15:46:11.000000000 +0200
+++ kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp	2009-05-11 22:49:41.000000000 +0200
@@ -26,6 +26,7 @@
 #include <QtDBus/QtDBus>
 
 #include <QRegExp>
+#include <QLatin1String>
 
 #include <X11/Xauth.h>
 #include <X11/Xlib.h>
@@ -85,6 +86,7 @@ KDisplayManager::KDisplayManager() : d(n
 				strcpy( sa.sun_path, "/tmp/.gdm_socket" );
 				if (::connect( d->fd, (struct sockaddr *)&sa, sizeof(sa) )) {
 					::close( d->fd );
+					DMType = NoDM;
 					d->fd = -1;
 					break;
 				}
@@ -186,6 +188,21 @@ KDisplayManager::exec( const char *cmd, 
 bool
 KDisplayManager::canShutdown()
 {
+	if (DMType == NoDM) {
+		// No DM or newest GDM running, we'll try shutting down through ConsoleKit.
+		// Unfortunately, ConsoleKit won't tell us if we're allowed to do that
+		// (it also depends on whether there are other users logged in on the
+		// system), so we can only check if it's running at all.
+		QDBusConnection systemBus = QDBusConnection::systemBus();
+		if (!systemBus.isConnected())
+			return false;
+		QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+		                           QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+		                           QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+		                           systemBus );
+		return consoleKit.isValid();
+	}
+
 	if (DMType == OldKDM)
 		return strstr( ctl, ",maysd" ) != 0;
 
@@ -205,6 +222,21 @@ KDisplayManager::shutdown( KWorkSpace::S
 	if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
 		return;
 
+        if (DMType == NoDM) {
+               // No DM or newest GDM running, try shutting down through ConsoleKit.
+               QDBusConnection systemBus = QDBusConnection::systemBus();
+               if (!systemBus.isConnected())
+                       return;
+               QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+                                          QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+                                          QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+                                          systemBus );
+               if (consoleKit.isValid())
+                       consoleKit.call( QLatin1String( shutdownType == KWorkSpace::ShutdownTypeReboot ?
+                                                       "Restart" : "Stop" ) );
+               return;
+        }
+
 	bool cap_ask;
 	if (DMType == NewKDM) {
 		QByteArray re;

kdebase-workspace-4.2.85-klipper-url.patch:
 klipperrc.desktop |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.2.85-klipper-url.patch ---
diff -up kdebase-workspace-4.2.85/klipper/klipperrc.desktop.klipper-url kdebase-workspace-4.2.85/klipper/klipperrc.desktop
--- kdebase-workspace-4.2.85/klipper/klipperrc.desktop.klipper-url	2009-04-05 22:00:13.000000000 +0200
+++ kdebase-workspace-4.2.85/klipper/klipperrc.desktop	2009-05-11 22:56:51.000000000 +0200
@@ -409,7 +409,7 @@ Description[zh_TW]=?? &Konqueror ?
 Enabled=true
 
 [Action_1/Command_2]
-Commandline=ps x |grep -q '[m]ozilla' && "mozilla -remote openURL(%s, new-window)" || mozilla %s
+Commandline=ps x |grep -q '[m]ozilla' && mozilla -remote 'openURL(%s, new-window)' || mozilla %s
 Icon=mozilla
 Description=Open with &Mozilla
 Description[af]=Maak oop met Mozilla
@@ -581,7 +581,7 @@ Description[zh_TW]=?? &URL
 Enabled=true
 
 [Action_1/Command_4]
-Commandline=ps x |grep -q '[f]irefox' && "firefox -remote openURL(%s, new-window)" || firefox "%s"
+Commandline=ps x |grep -q '[f]irefox' && firefox -remote 'openURL(%s, new-window)' || firefox "%s"
 Icon=firefox
 Description=Open with &Firefox
 Description[af]=Maak oop met Firefox
@@ -1892,7 +1892,7 @@ Description[zh_TW]=?? &Konqueror ?
 Enabled=true
 
 [Action_6/Command_2]
-Commandline=mozilla -remote openURL(%s, new-window)
+Commandline=mozilla -remote 'openURL(%s, new-window)'
 Description=Open with &Mozilla
 Description[af]=Maak oop met Mozilla
 Description[ar]=???? ?????? &??????

kdebase-workspace-4.2.90-show_systemsettings.patch:
 plasma/applets/kickoff/core/applicationmodel.cpp |    1 -
 systemsettings/app/systemsettings.desktop        |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.2.90-show_systemsettings.patch ---
diff -up kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-05-14 12:26:34.000000000 -0500
+++ kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp	2009-06-03 20:53:41.000000000 -0500
@@ -111,7 +111,6 @@ public:
               displayOrder(NameAfterDescription),
               allowSeparators(_allowSeparators)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings	2009-04-30 13:02:27.000000000 -0500
+++ kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop	2009-06-03 20:53:41.000000000 -0500
@@ -157,3 +157,4 @@ Name[zh_TW]=????
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;

kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.2.95-default-applets.patch ---
diff -ur kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp	2009-07-03 01:07:27.000000000 +0200
@@ -259,15 +259,22 @@
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
+         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
+    }
+
+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+       loadDefaultApplet("networkmanagement", panel);
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);

kdebase-workspace-4.2.95-plasma-konsole.patch:
 desktop.cpp |   13 +++++++++++++
 desktop.h   |    2 ++
 2 files changed, 15 insertions(+)

--- NEW FILE kdebase-workspace-4.2.95-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp	2009-06-26 12:00:49.000000000 +0200
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <ktoolinvocation.h>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -65,6 +66,7 @@ DefaultDesktop::DefaultDesktop(QObject *
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
+      m_runKonsoleAction(0),
       dropping(false)
 {
     qRegisterMetaType<QImage>("QImage");
@@ -203,6 +205,11 @@ void DefaultDesktop::runCommand()
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -253,6 +260,10 @@ QList<QAction*> DefaultDesktop::contextu
             m_addPanelAction->setIcon(KIcon("list-add"));
         }
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         m_runCommandAction->setIcon(KIcon("system-run"));
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
@@ -272,6 +283,8 @@ QList<QAction*> DefaultDesktop::contextu
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole	2009-04-05 22:00:17.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h	2009-06-26 11:49:24.000000000 +0200
@@ -70,6 +70,7 @@ protected:
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -89,6 +90,7 @@ private:
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;

kdebase-workspace-4.2.95-rootprivs.patch:
 ModuleView.cpp |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

--- NEW FILE kdebase-workspace-4.2.95-rootprivs.patch ---
diff -ur kdebase-workspace-4.2.95/systemsettings/core/ModuleView.cpp kdebase-workspace-4.2.95-rootprivs/systemsettings/core/ModuleView.cpp
--- kdebase-workspace-4.2.95/systemsettings/core/ModuleView.cpp	2009-06-23 13:14:38.000000000 +0200
+++ kdebase-workspace-4.2.95-rootprivs/systemsettings/core/ModuleView.cpp	2009-06-29 19:39:01.000000000 +0200
@@ -39,6 +39,7 @@
 #include <KCModuleProxy>
 #include <KStandardGuiItem>
 #include <KDialogButtonBox>
+#include <KStandardDirs>
 
 #include "MenuItem.h"
 
@@ -124,6 +125,32 @@
       return;
     }
 
+    if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) {
+        QString kdesu = KStandardDirs::findExe( "kdesu" );
+        QString cmd = menuItem->service()->exec().trimmed();
+
+        /* Prepare the process to run the kcmshell */
+        if ( cmd.left(5) == "kdesu" )
+        {
+            cmd = cmd.remove(0,5).trimmed();
+
+            /* Remove all kdesu switches */
+            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
+                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
+        }
+
+        if ( cmd.left(9) == "kcmshell4" )
+            cmd = cmd.remove(0,9).trimmed();
+
+        QStringList args;
+        args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
+
+        kDebug() << "Starting root module: " << args;
+        QProcess::startDetached( kdesu, args );
+
+        return;
+    }
+
     QList<KCModuleInfo*> modules;
     if ( menuItem->children().empty() ) {
         modules << &menuItem->item();

kdebase-workspace-4.2.96-redhat-startkde.patch:
 startkde.cmake |   35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

--- NEW FILE kdebase-workspace-4.2.96-redhat-startkde.patch ---
diff -up kdebase-workspace-4.2.96/startkde.cmake.redhat-startkde kdebase-workspace-4.2.96/startkde.cmake
--- kdebase-workspace-4.2.96/startkde.cmake.redhat-startkde	2009-07-08 16:45:04.000000000 +0200
+++ kdebase-workspace-4.2.96/startkde.cmake	2009-07-16 15:28:12.000000000 +0200
@@ -22,36 +22,20 @@ if test $kcheckrunning_result -eq 0 ; th
 	exit 1
 elif test $kcheckrunning_result -eq 2 ; then
 	echo "\$DISPLAY is not set or cannot connect to the X server."
-        exit 1
+        exit 1 
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default.
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 unset DYLD_FORCE_FLAT_NAMESPACE
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -89,6 +73,13 @@ kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 returncode=$?
 if test $returncode -ne 0; then
@@ -209,8 +200,9 @@ fi
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done
@@ -423,7 +415,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch:
 battery.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp
--- kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp	2009-07-08 16:45:03.000000000 +0200
+++ kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp	2009-08-03 06:43:04.000000000 +0200
@@ -530,7 +530,11 @@
             QString state = battery_data.value()["State"].toString();
             m_remainingMSecs = battery_data.value()["Remaining msec"].toInt();
             //kDebug() << "time left:" << m_remainingMSecs;
-            if (state == "Discharging" && m_remainingMSecs > 0 && m_showRemainingTime) {
+            // Always show the remaining time in the popup (like KDE 4.2.x did).
+            // We don't just set m_showRemainingTime to true by default because
+            // that'd try to use the time also for the icon. That won't fit on
+            // small panels and wasn't the default in 4.2 either.
+            if (state == "Discharging" && m_remainingMSecs > 0) {
 
                 // FIXME: Somehow, m_extenderApplet is null here, so the label never becomes visible
                 if (m_extenderApplet) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 May 2009 10:58:08 -0000	1.25
+++ .cvsignore	5 Aug 2009 00:22:21 -0000	1.26
@@ -1 +1,5 @@
-kdebase-workspace-4.2.4.tar.bz2
+kdebase-workspace-4.2.90.tar.bz2
+kdebase-workspace-4.2.95.tar.bz2
+kdebase-workspace-4.2.96.tar.bz2
+kdebase-workspace-4.2.98.tar.bz2
+kdebase-workspace-4.3.0.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- kdebase-workspace.spec	9 Jul 2009 20:45:30 -0000	1.182
+++ kdebase-workspace.spec	5 Aug 2009 00:22:23 -0000	1.183
@@ -1,12 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%if 0%{?fedora} <= 9
-%define have_bluez3 1
-%endif
-
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.4
+Version: 4.3.0
 
 Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
@@ -15,42 +11,36 @@ Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch
-Patch2: kdebase-workspace-4.2.1-plasma-konsole.patch
-Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
-Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
-#?434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch5: kdebase-workspace-4.1.2-rootprivs.patch
-Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
+Patch1: kdebase-workspace-4.2.96-redhat-startkde.patch
+Patch2: kdebase-workspace-4.2.95-plasma-konsole.patch
+Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
+Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
 #?441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
-Patch8: kdebase-workspace-4.0.72-klipper-url.patch
+Patch8: kdebase-workspace-4.2.85-klipper-url.patch
+#?434824: KDE4 System Settings - No Method To Enter Administrative Mode
+Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.0-default_applets.patch
+Patch12: kdebase-workspace-4.2.95-default-applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
-# Fix kde#165726: klipper crashed when opening link with external application
-# It's already fixed in 4.3 as part of a larger commit, but the fix never got
-# backported to 4.2.
-Patch16: kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch
+# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
 
 # upstream patches:
+# 4.3 branch
+
 # trunk
-Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
-# solid-bluetooth, https://bugzilla.redhat.com/481801
-Patch101: solid-bluetoothTrunkTo42.diff
-# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
-# 0.3 requires BlueZ 4 and the patch above
-Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
-# from 4.3: http://bugs.kde.org/180576
-Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-#?4.3, https://bugs.kde.org/show_bug.cgi?id=184152
-Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# from 4.3: check for network avail. through Solid/NM in the weather dataengine
-Patch106: kdebase-workspace-4.2.3-weather-dataengine-nm.patch
-# 4.3: #510527 -  Encrypted USB drives don't show up in KDE device notifier
-Patch107: kdebase-workspace-4.3.0-device-notifier-luks.patch
+
+# moving to non-multilib hack
+Obsoletes: kdebase-workspace < 4.3.0-2
+
+Obsoletes: PolicyKit-kde < %{version}-100 
+Provides:  PolicyKit-kde = %{version}-100
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -70,11 +60,15 @@ Obsoletes: kpowersave < 0.7.3-10
 Obsoletes: guidance-power-manager < 4.3
 %endif
 
+BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
+BuildRequires: desktop-file-utils
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
+BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
@@ -83,14 +77,15 @@ BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-BuildRequires: qedje-devel
+BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 # would much rather these deps be elsewhere,
@@ -142,12 +137,10 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth-devel = 4.1.4-1
-%else
+Obsoletes: PolicyKit-kde-devel < 4.2.85
+Provides:  PolicyKit-kde-devel = %{version}-%{release}
 Provides: solid-bluetooth-devel = 4.3-0.1
-%endif
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -155,11 +148,7 @@ Requires: kdelibs4-devel
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth = 4.1.4-1
-%else
 Provides: solid-bluetooth = 4.3-0.1
-%endif
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -224,34 +213,20 @@ Requires: PyKDE4 >= %{version}
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
 %patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .show-systemsettings
+%patch3 -p1 -b .show_systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch4 -p1 -b .ck-shutdown
-pushd systemsettings
-%patch5 -p0 -b .rootprivs
-popd
-%patch6 -p0 -b .timedate-kcm
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
+%patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default_applets
+%patch12 -p1 -b .default-applets
 %patch13 -p1 -b .pykde4
-%patch14 -p1 -b .klipper-arora
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
-%patch16 -p1 -b .kde#165726
+%patch16 -p1 -b .showremainingtime
 
 # upstream patches
-%patch100 -p1 -b .AllowExternalPaths
-%if 0%{?have_bluez3}
-%patch102 -p1 -b .bluetooth-revert
-%else
-%patch101 -p0 -b .solid-bluetoothTrunkTo42
-%endif
-%patch103 -p1 -b .kde#180576
-%patch105 -p0 -b .desktopnumbers
-%patch106 -p1 -b .weather-dataengine-nm
-%patch107 -p0 -b .device-notifier-luks
 
 %build
 
@@ -288,6 +263,12 @@ ln -sf ../pics/users/%{default_face_icon
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -318,7 +299,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
 %{_kde4_bindir}/kaccess                           
 %{_kde4_bindir}/kapplymousetheme                  
 %{_kde4_bindir}/kblankscrn.kss                    
@@ -343,13 +323,15 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/plasma
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
-%{_kde4_bindir}/plasmapkg
 %{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/plasmawallpaperviewer
 %{_kde4_bindir}/safestartkde
 %{_kde4_bindir}/setscheduler
+%{_kde4_bindir}/solid-action-desktop-gen
 %{_kde4_bindir}/solid-bluetooth
 %{_kde4_bindir}/solid-network
 %{_kde4_bindir}/solid-powermanagement
@@ -361,6 +343,7 @@ fi
 %{_kde4_appsdir}/kaccess/
 %{_kde4_appsdir}/kcminput/
 %{_kde4_appsdir}/kcmkeys/
+%{_kde4_appsdir}/kcmsolidactions/
 %{_kde4_appsdir}/kconf_update/
 %{_kde4_appsdir}/kcontrol/
 %{_kde4_appsdir}/kdisplay/
@@ -378,15 +361,11 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
-%if 0%{?have_bluez3}
-%{_kde4_appsdir}/solidfakebluetoothbackend/
-%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 
 %{_kde4_configdir}/background.knsrc
 %{_kde4_configdir}/colorschemes.knsrc
-%{_kde4_configdir}/klipperrc
 %{_kde4_configdir}/ksplash.knsrc
 %{_kde4_configdir}/ksysguard.knsrc
 %{_kde4_configdir}/plasma-overlayrc
@@ -394,11 +373,13 @@ fi
 %{_kde4_configdir}/wallpaper.knsrc
 
 %{_kde4_datadir}/kde4/services/*
+%exclude %{_kde4_datadir}/kde4/services/kdm.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
 %{_kde4_datadir}/autostart/krunner.desktop
 %{_kde4_datadir}/autostart/plasma.desktop
+%{_kde4_datadir}/autostart/plasma-desktop.desktop
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
@@ -409,13 +390,17 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_libdir}/kde4/classic_mode.so
 %{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/icon_mode.so
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kcm_kdm.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -424,26 +409,30 @@ fi
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
-%{_kde4_libdir}/kde4/plasma_appletscript_*.so
-%{_kde4_libdir}/kde4/plasma_appletscriptengine_*.so
+%{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
 %{_kde4_libdir}/kde4/plasma_engine_*.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
+%{_kde4_libdir}/kde4/plasma-geolocation-ip.so
 %{_kde4_libdir}/kde4/plasma_package*_*.so
-%{_kde4_libdir}/kde4/plasma_runnerscript_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
 %{_kde4_libdir}/kde4/solid_*.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_libexecdir}/kcheckpass
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
-%{_kde4_libexecdir}/krunner_lock
+%{_kde4_libexecdir}/kscreenlocker
+%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
+%{_kde4_libdir}/libkickoff.so
+%{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
+%{_mandir}/man1/plasmaengineexplorer.1*
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
@@ -457,20 +446,19 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
-# CMake changes behaviour after cmake-2.6.2 
-%if "%{?_cmake_version}" > "2.6.2" 
-%{_kde4_libdir}/cmake/KDE4Workspace*
-%else
-%{_kde4_libdir}/KDE4Workspace*
-%endif
+%{_kde4_libdir}/cmake/KDE4Workspace-%{version}/
 %exclude %{_kde4_libdir}/libkdeinit*.so
+%exclude %{_kde4_libdir}/libkickoff.so
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%exclude %{_kde4_libdir}/libsystemsettingsview.so
 
 %files wallpapers
 %defattr(-,root,root,-)
@@ -492,6 +480,7 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -526,32 +515,85 @@ fi
 
 
 %changelog
-* Thu Jul  9 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-5
-- #510527 - Encrypted USB drives don't show up in KDE device notifier
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-4
+- respin
+
+* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
+- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- move designer plugins to -libs, fixes
+  Multilib conflicts for index.cache.bz2 (#515088)
+- tighten -libs deps, using %%{?_isa}
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Mon Jul 27 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.98-3
+- backport forgotten method impl in Solid from 4.3 branch, r1000715
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Wed Jul  1 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.4-4
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Mon Jul 06 2009 Than Ngo <than at redhat.com> - 4.2.95-7
+- plasma-desktop crashes when closing/opening windows (upstream patch)
+
+* Fri Jul 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-6
+- add kde-plasma-networkmanagement to the default panel if installed
+
+* Wed Jul 01 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.95-5
 - rebuild (google-gadgets)
 
-* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
-- fix Klipper crashes when destroying the popup (kde#165726)
+* Wed Jul 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-4
+- rebuild (libxklavier)
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
+- omit a few kdm bits from main pkg (#508647)
+
+* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-2
+- port and reapply rootprivs (#434824) patch (#508593)
+- fix internal version number (otherwise it mismatches with our file list)
 
-* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
-- make default_leonidas.png the default face icon on F11 (#503347)
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-3
+- startkde: make MALLOC_CHECK opt-in (default off)
 
-* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-6
+* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-2
+- bump Obsoletes: PolicyKit-kde
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-5
+- make default_leonidas.png the default face icon on F11
+
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-4
+- -devel:  exclude libkickoff.so, libsystemsettingsview.so
+- drop old cmake crud
+
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-3
 - omit/revert session-button patch (kde#194506,rh#502953)
+- drop unused knotificationitem-1 patch
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-5
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
 - upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
+- drop < F-10 crud, have_bluez3
 
-* Mon May 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.3-4
-- fix TAB completion in krunner
-
-* Thu May 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.3-3
-- check for network availability through Solid/NM in the weather dataengine
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- 4.2.85
+- Obsoletes/Provides: PolicyKit-kde(-devel)
 
 * Wed May 06 2009 Than Ngo <than at redhat.com> - 4.2.3-2
 - Requires: oxygen-icon-theme >= 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	30 May 2009 10:58:08 -0000	1.31
+++ sources	5 Aug 2009 00:22:23 -0000	1.32
@@ -1 +1 @@
-72f90e1a61d94a5f66c0b3ce39b7b279  kdebase-workspace-4.2.4.tar.bz2
+e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2


--- kdebase-workspace-4.0.3-timedate-kcm.patch DELETED ---


--- kdebase-workspace-4.0.72-ck-shutdown.patch DELETED ---


--- kdebase-workspace-4.0.72-klipper-url.patch DELETED ---


--- kdebase-workspace-4.1.2-rootprivs.patch DELETED ---


--- kdebase-workspace-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdebase-workspace-4.2.0-bluetooth-revert.patch DELETED ---


--- kdebase-workspace-4.2.0-default_applets.patch DELETED ---


--- kdebase-workspace-4.2.0-kde#180576.patch DELETED ---


--- kdebase-workspace-4.2.0-show-systemsettings.patch DELETED ---


--- kdebase-workspace-4.2.1-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.2.1-redhat-startkde.patch DELETED ---


--- kdebase-workspace-4.2.2-kde#187699.patch DELETED ---


--- kdebase-workspace-4.2.3-weather-dataengine-nm.patch DELETED ---


--- kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch DELETED ---


--- kdebase-workspace-4.3.0-desktopnumbers.patch DELETED ---


--- kdebase-workspace-4.3.0-device-notifier-luks.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 00:24:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:24:32 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 .cvsignore, 1.57, 1.58 kdegraphics.spec, 1.194,
	1.195 sources, 1.66,
	1.67 kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch,
	1.1, NONE
Message-ID: <20090805002432.F1A7F11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18729

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	30 May 2009 13:24:41 -0000	1.57
+++ .cvsignore	5 Aug 2009 00:24:32 -0000	1.58
@@ -1 +1,5 @@
-kdegraphics-4.2.4.tar.bz2
+kdegraphics-4.2.90.tar.bz2
+kdegraphics-4.2.95.tar.bz2
+kdegraphics-4.2.96.tar.bz2
+kdegraphics-4.2.98.tar.bz2
+kdegraphics-4.3.0.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- kdegraphics.spec	2 Jun 2009 15:47:09 -0000	1.194
+++ kdegraphics.spec	5 Aug 2009 00:24:32 -0000	1.195
@@ -1,8 +1,3 @@
-%if 0%{?fedora} > 9
-%define obsolete_kde3_kipi 1
-%else
-%define omit_kde3_conflicts 1
-%endif
 
 %ifnarch s390 s390x
 %define gphoto 1
@@ -12,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -23,9 +18,6 @@ Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
-# work around Kolourpaint crash with Qt 4.5 (kde#183850)
-# patch from the upstream bug report
-Patch0:         kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -77,10 +69,8 @@ Graphics applications, including
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
-%endif
-Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdelibs4%{?isa} >= %{version}
 %description libs
 %{summary}.
 
@@ -92,10 +82,8 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 Provides:  kdegraphics4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: pkgconfig
-%if ! 0%{?omit_kde3_conflicts}
 Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
 Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1
-%endif
 %description devel
 %{summary}.
 
@@ -108,7 +96,6 @@ Summary: A kioslave for displaying WinHe
 
 %prep
 %setup -q -n kdegraphics-%{version}
-%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 
 %build
@@ -122,14 +109,8 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?omit_kde3_conflicts}
-# Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel
-rm -rf %{buildroot}%{_kde4_includedir}/lib{kexiv2,kdcraw,kipi}/
-rm -f  %{buildroot}%{_kde4_libdir}/lib{kexiv2,kdcraw,kipi}.so
-rm -f  %{buildroot}%{_libdir}/pkgconfig/lib{kexiv2,kdcraw,kipi}.pc
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -194,10 +175,12 @@ fi
 %{_kde4_iconsdir}/hicolor/*/actions/*
 %endif
 %{_kde4_libdir}/kde4/kcm_kgamma.so
+%{_kde4_libdir}/kde4/mobithumbnail.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
+%{_kde4_libdir}/kde4/rawthumbnail.so
 %{_kde4_libdir}/kde4/svgpart.so
-%{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
 %{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
@@ -224,14 +207,14 @@ fi
 %endif
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
+%{_kde4_libdir}/strigi/strigila_mobi.so
+
 
 %files devel
 %defattr(-,root,root,-)
-%if ! 0%{?omit_kde3_conflicts}
 %{_kde4_includedir}/libkdcraw/
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
-%endif
 %if 0%{?sane}
 %{_kde4_includedir}/libksane/
 %endif
@@ -248,19 +231,38 @@ fi
 
 
 %changelog
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
 
-* Thu May 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
-- libs: fix Requires: kdelibs4 dep
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
+* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-2
+- rebuild (poppler reduced libs)
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-3
 - fix non-gphoto/sane build, for s390 (#502827)
+- drop < F-10 conditionals
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- rebuild for new Poppler
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-5
 - kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
 
 * Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	30 May 2009 13:24:42 -0000	1.66
+++ sources	5 Aug 2009 00:24:32 -0000	1.67
@@ -1 +1 @@
-34d7cf506dea9ab4dc78e9901c96391e  kdegraphics-4.2.4.tar.bz2
+5d3838a2575a82777f00ced90332c41a  kdegraphics-4.3.0.tar.bz2


--- kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 00:25:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 00:25:01 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 .cvsignore, 1.62, 1.63 kdegraphics.spec, 1.204,
	1.205 sources, 1.67,
	1.68 kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch,
	1.1, NONE
Message-ID: <20090805002501.C204811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18930

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	30 May 2009 13:24:42 -0000	1.62
+++ .cvsignore	5 Aug 2009 00:25:01 -0000	1.63
@@ -1 +1,5 @@
-kdegraphics-4.2.4.tar.bz2
+kdegraphics-4.2.90.tar.bz2
+kdegraphics-4.2.95.tar.bz2
+kdegraphics-4.2.96.tar.bz2
+kdegraphics-4.2.98.tar.bz2
+kdegraphics-4.3.0.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- kdegraphics.spec	2 Jun 2009 15:47:09 -0000	1.204
+++ kdegraphics.spec	5 Aug 2009 00:25:01 -0000	1.205
@@ -1,8 +1,3 @@
-%if 0%{?fedora} > 9
-%define obsolete_kde3_kipi 1
-%else
-%define omit_kde3_conflicts 1
-%endif
 
 %ifnarch s390 s390x
 %define gphoto 1
@@ -12,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -23,9 +18,6 @@ Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
-# work around Kolourpaint crash with Qt 4.5 (kde#183850)
-# patch from the upstream bug report
-Patch0:         kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -77,10 +69,8 @@ Graphics applications, including
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
-%endif
-Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdelibs4%{?isa} >= %{version}
 %description libs
 %{summary}.
 
@@ -92,10 +82,8 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 Provides:  kdegraphics4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: pkgconfig
-%if ! 0%{?omit_kde3_conflicts}
 Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
 Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1
-%endif
 %description devel
 %{summary}.
 
@@ -108,7 +96,6 @@ Summary: A kioslave for displaying WinHe
 
 %prep
 %setup -q -n kdegraphics-%{version}
-%patch0 -p1 -b .kolourpaint-kde#183850-workaround
 
 
 %build
@@ -122,14 +109,8 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?omit_kde3_conflicts}
-# Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel
-rm -rf %{buildroot}%{_kde4_includedir}/lib{kexiv2,kdcraw,kipi}/
-rm -f  %{buildroot}%{_kde4_libdir}/lib{kexiv2,kdcraw,kipi}.so
-rm -f  %{buildroot}%{_libdir}/pkgconfig/lib{kexiv2,kdcraw,kipi}.pc
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -194,10 +175,12 @@ fi
 %{_kde4_iconsdir}/hicolor/*/actions/*
 %endif
 %{_kde4_libdir}/kde4/kcm_kgamma.so
+%{_kde4_libdir}/kde4/mobithumbnail.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
 %{_kde4_libdir}/kde4/okularpart.so
+%{_kde4_libdir}/kde4/rawthumbnail.so
 %{_kde4_libdir}/kde4/svgpart.so
-%{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
 %{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
@@ -224,14 +207,14 @@ fi
 %endif
 %{_kde4_libdir}/libokularcore.so.1*
 %{_kde4_libdir}/strigi/strigita_dvi.so
+%{_kde4_libdir}/strigi/strigila_mobi.so
+
 
 %files devel
 %defattr(-,root,root,-)
-%if ! 0%{?omit_kde3_conflicts}
 %{_kde4_includedir}/libkdcraw/
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
-%endif
 %if 0%{?sane}
 %{_kde4_includedir}/libksane/
 %endif
@@ -248,19 +231,38 @@ fi
 
 
 %changelog
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
 
-* Thu May 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
-- libs: fix Requires: kdelibs4 dep
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
+* Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-2
+- rebuild (poppler reduced libs)
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-3
 - fix non-gphoto/sane build, for s390 (#502827)
+- drop < F-10 conditionals
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- rebuild for new Poppler
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-5
 - kio_msits subpkg, help avoid kchmviewer conflicts (#484861)
 
 * Wed Apr 22 2009 Than Ngo <than at redhat.com> - 4.2.2-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	30 May 2009 13:24:42 -0000	1.67
+++ sources	5 Aug 2009 00:25:01 -0000	1.68
@@ -1 +1 @@
-34d7cf506dea9ab4dc78e9901c96391e  kdegraphics-4.2.4.tar.bz2
+5d3838a2575a82777f00ced90332c41a  kdegraphics-4.3.0.tar.bz2


--- kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 00:33:38 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 00:33:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-trident/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xorg-x11-drv-trident.spec, 1.29,
	1.30 trident-1.3.2-dpms.patch, 1.1, NONE
Message-ID: <20090805003338.A67AB11C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-trident/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21871

Modified Files:
	.cvsignore sources xorg-x11-drv-trident.spec 
Removed Files:
	trident-1.3.2-dpms.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.3.3-1
- trident 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-trident/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 15:52:26 -0000	1.11
+++ .cvsignore	5 Aug 2009 00:33:38 -0000	1.12
@@ -1,2 +1 @@
-xf86-video-trident-1.3.1.tar.bz2
-xf86-video-trident-1.3.2.tar.bz2
+xf86-video-trident-1.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-trident/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 15:52:26 -0000	1.11
+++ sources	5 Aug 2009 00:33:38 -0000	1.12
@@ -1 +1 @@
-26d77d8ec3887f20bef917d6429c761d  xf86-video-trident-1.3.2.tar.bz2
+47f3c5da1942017218355f178f02ef84  xf86-video-trident-1.3.3.tar.bz2


Index: xorg-x11-drv-trident.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xorg-x11-drv-trident.spec	4 Aug 2009 17:27:36 -0000	1.29
+++ xorg-x11-drv-trident.spec	5 Aug 2009 00:33:38 -0000	1.30
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 trident video driver
 Name:       xorg-x11-drv-trident
-Version:    1.3.2
-Release:    3%{?dist}
+Version:    1.3.3
+Release:    1%{?dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -14,8 +14,6 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    trident.xinf
 
-Patch0:     trident-1.3.2-dpms.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -28,7 +26,6 @@ X.Org X11 trident video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .dpms
 
 %build
 %configure --disable-static
@@ -56,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.3.3-1
+- trident 1.3.3
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.3.2-3
 - trident-1.3.2-dpms.patch: Fix for new DPMS headers
 


--- trident-1.3.2-dpms.patch DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 00:46:00 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 00:46:00 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc5-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1107, 1.1108 kernel.spec, 1.1690, 1.1691 sources, 1.1065,
	1.1066 upstream, 1.979,
	1.980 linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch, 1.1,
	NONE linux-2.6-x86-set_memory_wc-fixes.patch, 1.1,
	NONE patch-2.6.31-rc5-git2.bz2.sign, 1.1, NONE
Message-ID: <20090805004600.4A9FC11C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25024

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc5-git3.bz2.sign 
Removed Files:
	linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch 
	linux-2.6-x86-set_memory_wc-fixes.patch 
	patch-2.6.31-rc5-git2.bz2.sign 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.128.rc5.git3
- 2.6.31-rc5-git3
- drop cpufreq + set memory fixes



--- NEW FILE patch-2.6.31-rc5-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKeMweyGugalF9Dw4RAp18AJ9Ch7DQJA5GwevbuXDXattxayrJMACfSDOb
t3+OUGZ1dQ2Y8+z9QDVk2zM=
=HbQm
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1107
retrieving revision 1.1108
diff -u -p -r1.1107 -r1.1108
--- .cvsignore	3 Aug 2009 16:48:20 -0000	1.1107
+++ .cvsignore	5 Aug 2009 00:45:59 -0000	1.1108
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git2.bz2
+patch-2.6.31-rc5-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1690
retrieving revision 1.1691
diff -u -p -r1.1690 -r1.1691
--- kernel.spec	5 Aug 2009 00:18:53 -0000	1.1690
+++ kernel.spec	5 Aug 2009 00:45:59 -0000	1.1691
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -657,8 +657,6 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1000: linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch
-
 Patch1515: linux-2.6.31-lirc.patch
 Patch1516: lirc_streamzap-buffer-rework.patch
 Patch1517: hdpvr-ir-enable.patch
@@ -707,7 +705,6 @@ Patch3050: linux-2.6-nfsd4-proots.patch
 Patch11010: via-hwmon-temp-sensor.patch
 
 # patches headed upstream
-Patch12000: linux-2.6-x86-set_memory_wc-fixes.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 
 %endif
@@ -1129,7 +1126,6 @@ ApplyPatch sched-introduce-SCHED_RESET_O
 # Architecture patches
 # x86(-64)
 ApplyPatch via-hwmon-temp-sensor.patch
-ApplyPatch linux-2.6-x86-set_memory_wc-fixes.patch
 ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
 #
@@ -1260,8 +1256,6 @@ ApplyPatch linux-2.6-crash-driver.patch
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
-ApplyPatch linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.31-lirc.patch
 # should be a short-lived patch, hopefully fixing bz#508952 w/o breaking anything else...
@@ -1949,6 +1943,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.128.rc5.git3
+- 2.6.31-rc5-git3
+- drop cpufreq + set memory fixes
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com>
 - Add Jeromes initial r600 kms work.
 - rebase arb patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -p -r1.1065 -r1.1066
--- sources	3 Aug 2009 16:48:20 -0000	1.1065
+++ sources	5 Aug 2009 00:45:59 -0000	1.1066
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2
-5c7a3da1d852b5db22228947440a0da9  patch-2.6.31-rc5-git2.bz2
+6bc3320216b43bd8ce98e5f0565b485f  patch-2.6.31-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.979
retrieving revision 1.980
diff -u -p -r1.979 -r1.980
--- upstream	3 Aug 2009 16:48:20 -0000	1.979
+++ upstream	5 Aug 2009 00:46:00 -0000	1.980
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git2.bz2
+patch-2.6.31-rc5-git3.bz2


--- linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch DELETED ---


--- linux-2.6-x86-set_memory_wc-fixes.patch DELETED ---


--- patch-2.6.31-rc5-git2.bz2.sign DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 00:53:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 00:53:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-geode/devel .cvsignore, 1.5, 1.6 sources, 1.8,
	1.9 xorg-x11-drv-geode.spec, 1.13, 1.14 geode-inputstr.patch,
	1.1, NONE
Message-ID: <20090805005352.6F8F611C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-geode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27176

Modified Files:
	.cvsignore sources xorg-x11-drv-geode.spec 
Removed Files:
	geode-inputstr.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.11.3-1
- geode 2.11.3 
- add abi/api patches + autoreconf



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Feb 2009 21:23:50 -0000	1.5
+++ .cvsignore	5 Aug 2009 00:53:52 -0000	1.6
@@ -1 +1 @@
-xf86-video-geode-2.11.1.tar.bz2
+xf86-video-geode-2.11.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Jun 2009 00:17:24 -0000	1.8
+++ sources	5 Aug 2009 00:53:52 -0000	1.9
@@ -1 +1 @@
-4c652ecba772f705296b8e52d746857c  xf86-video-geode-2.11.2.tar.bz2
+de1d3fe56ae50168d56ea727c4455f2d  xf86-video-geode-2.11.3.tar.bz2


Index: xorg-x11-drv-geode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-geode/devel/xorg-x11-drv-geode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xorg-x11-drv-geode.spec	4 Aug 2009 17:06:12 -0000	1.13
+++ xorg-x11-drv-geode.spec	5 Aug 2009 00:53:52 -0000	1.14
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-geode
-Version:   2.11.2
-Release:   4%{?dist}
+Version:   2.11.3
+Release:   1%{?dist}
 URL:       http://www.x.org/wiki/AMDGeodeDriver
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
 License:   MIT
@@ -14,10 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Provides:  xorg-x11-drv-amd = %{version}-%{release}
 Obsoletes: xorg-x11-drv-amd <= 2.7.7.7
 
-Patch0: geode-inputstr.patch
-Patch1: abi.patch
-Patch2: geode-2.11.2-dpms.patch
-
+Patch0: geode-dpms-rac-api.patch
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -36,11 +33,10 @@ X.Org X11 AMD Geode video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .inputstr
-%patch1 -p1 -b .abi
-%patch2 -p1 -b .dpms
+%patch0 -p1 -b .abi
 
 %build
+autoreconf -v --install
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
 	     --enable-visibility
 make
@@ -67,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.11.3-1
+- geode 2.11.3 
+- add abi/api patches + autoreconf
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.11.2-4
 - Fix for new DPMS headers
 


--- geode-inputstr.patch DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 00:55:12 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 00:55:12 +0000 (UTC)
Subject: rpms/xorg-x11-drv-geode/devel geode-dpms-rac-api.patch,NONE,1.1
Message-ID: <20090805005512.1EDDD11C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-geode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27562

Added Files:
	geode-dpms-rac-api.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.11.3-1
- geode 2.11.3 
- add abi/api patches + autoreconf


geode-dpms-rac-api.patch:
 Makefile.am        |    2 +-
 configure.ac       |    9 +++++++++
 src/geode_dcon.c   |    1 -
 src/geode_driver.c |   15 +++++++++++----
 src/gx_driver.c    |    7 ++++++-
 src/gx_video.c     |    1 -
 src/lx_driver.c    |   10 ++++++----
 src/lx_video.c     |    1 -
 src/z4l.c          |    1 -
 9 files changed, 33 insertions(+), 14 deletions(-)

--- NEW FILE geode-dpms-rac-api.patch ---
diff --git a/Makefile.am b/Makefile.am
index adb32f8..0642345 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 057df0f..4f70f7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,10 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
@@ -83,6 +87,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+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" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
@@ -125,6 +133,7 @@ AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
 	Makefile
diff --git a/src/geode_dcon.c b/src/geode_dcon.c
index 11df94b..9982671 100644
--- a/src/geode_dcon.c
+++ b/src/geode_dcon.c
@@ -30,7 +30,6 @@
 /* Includes that are used by all drivers */
 #include <xf86.h>
 #include <xf86_OSproc.h>
-#include <xf86Resources.h>
 #include <compiler.h>
 
 #include "geode.h"
diff --git a/src/geode_driver.c b/src/geode_driver.c
index e56e7c4..13635da 100644
--- a/src/geode_driver.c
+++ b/src/geode_driver.c
@@ -42,7 +42,9 @@
 /* Includes that are used by all drivers */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
@@ -72,8 +74,13 @@
 #ifdef DPMSExtension
 #include "globals.h"
 #include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 #endif /* DPMSExtension */
 
 /* A few things all drivers should have */
@@ -471,11 +478,12 @@ AmdProbe(DriverPtr drv, int flags)
 		/* so take the first one */
 		for (i = 0; i < numUsed; i++) {
 		    /* Allocate a ScrnInfoRec  */
-		    ScrnInfoPtr pScrni = xf86AllocateScreen(drv, 0);
-
+		    ScrnInfoPtr pScrni = NULL;
 		    EntityInfoPtr pEnt = xf86GetEntityInfo(usedChips[i]);
 		    PciChipsets *p_id;
 
+		    pScrni = xf86ConfigPciEntity(pScrni, 0, usedChips[i],
+						 GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL);
 		    for (p_id = GeodePCIchipsets; p_id->numChipset != -1;
 			p_id++) {
 			if (pEnt->chipset == p_id->numChipset) {
@@ -512,8 +520,7 @@ AmdProbe(DriverPtr drv, int flags)
 		    drvr_setup(pScrni);
 
 		    foundScreen = TRUE;
-		    xf86ConfigActivePciEntity(pScrni, usedChips[i],
-			GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL);
+
 		}
 	    }
 	}
diff --git a/src/gx_driver.c b/src/gx_driver.c
index b713897..f526326 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -35,7 +35,9 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mipointer.h"
@@ -419,8 +421,10 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
 
     pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources)
 	return FALSE;
+#endif
 
     pGeode = pScrni->driverPrivate = xnfcalloc(sizeof(GeodeRec), 1);
 
@@ -704,12 +708,13 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 	}
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
 	    "Couldn't register the resources.\n");
 	return FALSE;
     }
-
+#endif
     return TRUE;
 }
 
diff --git a/src/gx_video.c b/src/gx_video.c
index 354e179..9041f5f 100644
--- a/src/gx_video.c
+++ b/src/gx_video.c
@@ -45,7 +45,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 107b354..08d1fdd 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -36,7 +36,9 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #include "xf86cmap.h"
@@ -289,10 +291,10 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
 
     pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
-
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources)
 	return FALSE;
-
+#endif
     if (flags & PROBE_DETECT) {
 	GeodeProbeDDC(pScrni, pEnt->index);
 	return TRUE;
@@ -570,13 +572,13 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	if (!xf86LoadSubModule(pScrni, "exa"))
 	    return FALSE;
     }
-
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
 	    "Couldn't register the resources.\n");
 	return FALSE;
     }
-
+#endif
     return TRUE;
 }
 
diff --git a/src/lx_video.c b/src/lx_video.c
index 01ccba7..702139e 100644
--- a/src/lx_video.c
+++ b/src/lx_video.c
@@ -38,7 +38,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/z4l.c b/src/z4l.c
index 4877b89..3935962 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -43,7 +43,6 @@
 #include "xf86.h"
 #include <X11/extensions/Xv.h>
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86xv.h"
 #include "fourcc.h"



From airlied at fedoraproject.org  Wed Aug  5 01:13:36 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 01:13:36 +0000 (UTC)
Subject: rpms/xorg-x11-drv-siliconmotion/devel .cvsignore, 1.11, 1.12 sources,
	1.11, 1.12 xorg-x11-drv-siliconmotion.spec, 1.24,
	1.25 smi-1.7.2-dpms.patch, 1.1, NONE
Message-ID: <20090805011336.3484911C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32193

Modified Files:
	.cvsignore sources xorg-x11-drv-siliconmotion.spec 
Removed Files:
	smi-1.7.2-dpms.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.7.3-1
- smi 1.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 15:45:45 -0000	1.11
+++ .cvsignore	5 Aug 2009 01:13:35 -0000	1.12
@@ -1,2 +1 @@
-xf86-video-siliconmotion-1.7.0.tar.bz2
-xf86-video-siliconmotion-1.7.2.tar.bz2
+xf86-video-siliconmotion-1.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 15:45:45 -0000	1.11
+++ sources	5 Aug 2009 01:13:35 -0000	1.12
@@ -1 +1 @@
-432791bfe9dde2d78ce7410b2cb420bb  xf86-video-siliconmotion-1.7.2.tar.bz2
+29fb322cd3adab52cc7f1ac86f9315bb  xf86-video-siliconmotion-1.7.3.tar.bz2


Index: xorg-x11-drv-siliconmotion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel/xorg-x11-drv-siliconmotion.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-siliconmotion.spec	4 Aug 2009 17:22:12 -0000	1.24
+++ xorg-x11-drv-siliconmotion.spec	5 Aug 2009 01:13:35 -0000	1.25
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 siliconmotion video driver
 Name:       xorg-x11-drv-siliconmotion
-Version:    1.7.2
-Release:    3%{?dist}
+Version:    1.7.3
+Release:    1%{?dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -14,8 +14,6 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    siliconmotion.xinf
 
-Patch0:     smi-1.7.2-dpms.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -28,7 +26,6 @@ X.Org X11 siliconmotion video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .dpms
 
 %build
 %configure --disable-static
@@ -56,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.7.3-1
+- smi 1.7.3
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.7.2-3
 - smi-1.7.2-dpms.patch: Fix for new DPMS headers.
 


--- smi-1.7.2-dpms.patch DELETED ---



From lennart at fedoraproject.org  Wed Aug  5 01:32:54 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  5 Aug 2009 01:32:54 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.13, 1.14 libcanberra.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <20090805013254.52CA211C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3995

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Jul 2009 01:02:15 -0000	1.13
+++ .cvsignore	5 Aug 2009 01:32:54 -0000	1.14
@@ -1 +1 @@
-libcanberra-0.14.tar.gz
+libcanberra-0.15.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libcanberra.spec	25 Jul 2009 05:23:47 -0000	1.30
+++ libcanberra.spec	5 Aug 2009 01:32:54 -0000	1.31
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.14
-Release: 3%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -74,7 +74,7 @@ fi
 %setup -q
 
 %build
-%configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
+%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
 make %{?_smp_mflags}
 
 %install
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.15-1
+- New version 0.15
+
 * Fri Jul 24 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/libcanberra/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	2 Jul 2009 01:18:57 -0000	1.15
+++ sources	5 Aug 2009 01:32:54 -0000	1.16
@@ -1 +1 @@
-b182ab134a911ba6c42ea2b727eda13e  libcanberra-0.14.tar.gz
+1f0a67c851693a45e0a48ae6142539cc  libcanberra-0.15.tar.gz



From lennart at fedoraproject.org  Wed Aug  5 01:34:12 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  5 Aug 2009 01:34:12 +0000 (UTC)
Subject: rpms/libcanberra/devel libcanberra.spec,1.31,1.32
Message-ID: <20090805013412.A58C511C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5015

Modified Files:
	libcanberra.spec 
Log Message:
new release


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libcanberra.spec	5 Aug 2009 01:32:54 -0000	1.31
+++ libcanberra.spec	5 Aug 2009 01:34:12 -0000	1.32
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.15-2
+- Fix mistag
+
 * Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.15-1
 - New version 0.15
 



From lennart at fedoraproject.org  Wed Aug  5 01:48:49 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  5 Aug 2009 01:48:49 +0000 (UTC)
Subject: rpms/rtkit/devel .cvsignore, 1.3, 1.4 rtkit.spec, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <20090805014849.E3EEA11C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/rtkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8019

Modified Files:
	.cvsignore rtkit.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtkit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2009 00:51:13 -0000	1.3
+++ .cvsignore	5 Aug 2009 01:48:49 -0000	1.4
@@ -1 +1 @@
-rtkit-0.3.tar.gz
+rtkit-0.4.tar.gz


Index: rtkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtkit/devel/rtkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rtkit.spec	27 Jul 2009 03:18:39 -0000	1.3
+++ rtkit.spec	5 Aug 2009 01:48:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:          rtkit
-Version:       0.3
-Release:       2%{?dist}
+Version:       0.4
+Release:       1%{?dist}
 Summary:       Realtime Policy and Watchdog Daemon
 Group:         System Environment/Base
 # The daemon itself is GPLv3+, the reference implementation for the client BSD
@@ -57,6 +57,9 @@ dbus-send --system --type=method_call --
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.RealtimeKit1.conf
 
 %changelog
+* Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> - 0.4-1
+- New release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtkit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2009 00:51:14 -0000	1.3
+++ sources	5 Aug 2009 01:48:49 -0000	1.4
@@ -1 +1 @@
-ec646dec2e6e095058c66cd9fdf5027c  rtkit-0.3.tar.gz
+8494a0ef3f8fa6be7cf3edf234fbe50a  rtkit-0.4.tar.gz



From lennart at fedoraproject.org  Wed Aug  5 02:07:49 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed,  5 Aug 2009 02:07:49 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.37, 1.38 pulseaudio.spec, 1.88, 
	1.89 sources, 1.39, 1.40
Message-ID: <20090805020749.27D2111C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12583

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	27 Jul 2009 23:55:46 -0000	1.37
+++ .cvsignore	5 Aug 2009 02:07:48 -0000	1.38
@@ -1 +1 @@
-pulseaudio-0.9.16-test3.tar.gz
+pulseaudio-0.9.16-test4.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- pulseaudio.spec	29 Jul 2009 14:28:33 -0000	1.88
+++ pulseaudio.spec	5 Aug 2009 02:07:48 -0000	1.89
@@ -1,10 +1,10 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        4.test3%{?dist}
+Release:        5.test4%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
-Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test3.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test4.tar.gz
 URL:            http://pulseaudio.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -186,7 +186,7 @@ Requires:       %{name}-libs = %{version
 This package contains command line utilities for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.16-test3
+%setup -q -T -b0 -n pulseaudio-0.9.16-test4
 
 %build
 %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access --disable-hal
@@ -411,6 +411,9 @@ exit 0
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-5.test4
+- New test release
+
 * Tue Jul 28 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-4.test3
 - New test release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	27 Jul 2009 23:55:47 -0000	1.39
+++ sources	5 Aug 2009 02:07:48 -0000	1.40
@@ -1 +1 @@
-c3ff23c2d0e18dd550c63f37c6174339  pulseaudio-0.9.16-test3.tar.gz
+6aff18f0840fb39fa35313f0f5e1f7bb  pulseaudio-0.9.16-test4.tar.gz



From mclasen at fedoraproject.org  Wed Aug  5 02:23:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 02:23:00 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.219,1.220
Message-ID: <20090805022300.A18A011C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15818

Modified Files:
	gnome-desktop.spec 
Log Message:
Require constantine-backgrounds



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- gnome-desktop.spec	4 Aug 2009 16:23:45 -0000	1.219
+++ gnome-desktop.spec	5 Aug 2009 02:23:00 -0000	1.220
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.27.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -30,8 +30,8 @@ Obsoletes: gnome-core gnome-core-devel
 Provides: gnome-core
 
 # Make sure to update libgnome schema when changing this
-#Requires: constantine-backgrounds
-#Requires: constantine-backgrounds-extras
+Requires: constantine-backgrounds
+Requires: constantine-backgrounds-extras
 
 BuildRequires: gnome-common
 BuildRequires: libxml2-devel >= %{libxml2_version}
@@ -123,7 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
-* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.6-1
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-3
+- Require constantine-backgrounds
+
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Drop leonidas backgrounds in anticipation of constantine backgrounds
 
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1



From mclasen at fedoraproject.org  Wed Aug  5 02:28:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 02:28:41 +0000 (UTC)
Subject: rpms/libgnome/devel default-background.patch, 1.6, 1.7 libgnome.spec,
	1.148, 1.149
Message-ID: <20090805022841.6519A11C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17142

Modified Files:
	default-background.patch libgnome.spec 
Log Message:
Default to constantine backgrounds


default-background.patch:
 desktop_gnome_background.schemas.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: default-background.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/default-background.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- default-background.patch	4 Aug 2009 16:55:04 -0000	1.6
+++ default-background.patch	5 Aug 2009 02:28:41 -0000	1.7
@@ -15,7 +15,7 @@ diff -up libgnome-2.20.0/schemas/desktop
          <owner>gnome</owner>
          <type>string</type>
 -	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>@datadir@/backgrounds/abstrace/Waves.png</default>
++	<default>@datadir@/backgrounds/constantine/default/constantine.xml</default>
          <locale name="C">
          <short>Picture Filename</short>
          <long>File to use for the background image</long>


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- libgnome.spec	4 Aug 2009 16:55:05 -0000	1.148
+++ libgnome.spec	5 Aug 2009 02:28:41 -0000	1.149
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.26.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.26/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -203,6 +203,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-7
+- Default to Constantine backgrounds
+
 * Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-6
 - Drop Leonidas backgrounds in anticipation of Constantine backgrounds
 



From rdieter at fedoraproject.org  Wed Aug  5 02:45:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:45:54 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings-4.2.85-old-PyQt4.patch, NONE,
	1.1 .cvsignore, 1.60, 1.61 kdebindings.spec, 1.201,
	1.202 sources, 1.65, 1.66 kdebindings-4.2.3-gcc44.patch, 1.1, NONE
Message-ID: <20090805024554.85AC811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21334

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.2.85-old-PyQt4.patch 
Removed Files:
	kdebindings-4.2.3-gcc44.patch 
Log Message:
* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
- respin


kdebindings-4.2.85-old-PyQt4.patch:
 backendcapabilities.sip |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.2.85-old-PyQt4.patch ---
--- python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:30	959021
+++ python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:26	959020
@@ -26,7 +26,7 @@
 {
 namespace BackendCapabilities
 {
-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject,NoQMetaObject/
 {
 
 signals:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	30 May 2009 16:18:25 -0000	1.60
+++ .cvsignore	5 Aug 2009 02:45:53 -0000	1.61
@@ -1,6 +1,5 @@
-kdebindings-4.2.4.tar.bz2
-qtscript-sharp.pc
-qttest-sharp.pc
-qtuitools-sharp.pc
-qtwebkit-sharp.pc
-qyoto.pc
+kdebindings-4.2.90.tar.bz2
+kdebindings-4.2.95.tar.bz2
+kdebindings-4.2.96.tar.bz2
+kdebindings-4.2.98.tar.bz2
+kdebindings-4.3.0.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdebindings.spec	27 Jun 2009 14:46:58 -0000	1.201
+++ kdebindings.spec	5 Aug 2009 02:45:54 -0000	1.202
@@ -9,13 +9,16 @@
 %endif
 %endif
 %define falcon 1
+# FIXME: temporarily disable on rawhide, until build failures fixed
+%if 0%{?fedora} < 12
 %define php 1
+%endif
 %define ruby 1
 %define smoke 1
 %define java 0
 
 %define pykde4_akonadi 1
-%define pyqt4_version 4.5
+%define pyqt4_version 4.5.2
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
@@ -28,28 +31,26 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.2.4
+Version: 4.3.0
 Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 Group: User Interface/Desktops
-License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qyoto/qyoto.pc
-Source2: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qttest/qttest-sharp.pc
-Source3: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtwebkit/qtwebkit-sharp.pc
-Source4: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtscript/qtscript-sharp.pc
-Source5: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtuitools/qtuitools-sharp.pc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
+# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
+Patch1:  kdebindings-4.2.85-old-PyQt4.patch
 # make the Python plugin factory work without python-devel
 Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
+
 ## upstream patches
-Patch100: kdebindings-4.2.3-gcc44.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -57,11 +58,14 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
+BuildRequires:  qimageblitz-devel
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
+BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
 BuildRequires:  mono-core
@@ -248,10 +252,11 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q
 %patch0
+%patch1 -p0 -b .old-PyQt4
 %patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
-%patch100 -p1 -b .gcc44
+
 
 %build
 mkdir -p %{_target_platform}
@@ -298,11 +303,12 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?csharp}
-mkdir -p %{buildroot}%{_datadir}/pkgconfig/
-install -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
-  %{buildroot}%{_datadir}/pkgconfig/
-%endif
+# HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pykdeuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
+   %{buildroot}%{_bindir}/pykdeuic4
+ln -s %{_bindir}/pykdeuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
 
 %clean
@@ -313,6 +319,11 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+%pre -n PyKDE4-devel
+if [ -d %{_bindir}/pykdeuic4 ]; then
+rm -rf %{_bindir}/pykdeuic4/
+fi
+
 
 %files
 %defattr(-,root,root,-)
@@ -335,8 +346,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %{python_sitearch}/PyKDE4/
+%{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
 %dir %{_kde4_appsdir}/pykde4/
-%{_kde4_appsdir}/pykde4/*.py*
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
@@ -348,6 +359,8 @@ rm -rf %{buildroot}
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
+%{_kde4_bindir}/pykdeuic4
+%{python_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
@@ -362,6 +375,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libnepomuk-sharp.so
 %{_kde4_libdir}/libplasma-sharp.so
 %{_kde4_libdir}/libsoprano-sharp.so
+%{_kde4_libdir}/libqimageblitz-sharp.so
+%{_kde4_libdir}/mono/2.0/qimageblitz.dll
 %{_kde4_libdir}/mono/2.0/akonadi.dll
 %{_kde4_libdir}/mono/2.0/kde-dotnet.dll
 %{_kde4_libdir}/mono/2.0/khtml-dll.dll
@@ -376,6 +391,7 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/mono/gac/nepomuk-dll/
 %{_kde4_libdir}/mono/gac/plasma-dll/
 %{_kde4_libdir}/mono/gac/soprano/
+%{_kde4_libdir}/mono/gac/qimageblitz/
 %{_kde4_appsdir}/plasma_scriptengine_kimono/
 %{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-applet.desktop
 %{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-dataengine.desktop
@@ -406,8 +422,7 @@ rm -rf %{buildroot}
 %{_bindir}/uics
 %{_includedir}/qyoto/
 %{_kde4_libdir}/libqyotoshared.so
-%{_datadir}/pkgconfig/qyoto.pc
-%{_datadir}/pkgconfig/qt*-sharp.pc
+%{_kde4_libdir}/pkgconfig/*
 %endif
 
 %if 0%{?ruby}
@@ -490,21 +505,59 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jun 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-3
-- rebuild (PyQt4-4.5)
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
+- respin
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- workaround pykdeuic4 upgrade brokenness (introduced in 4.2.98)
 
-* Mon Jun 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+- more pykdeuic4 and related multilib love (kdebug#198162)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3 
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-5
+- add correct check for php version
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-4
+- allow for build php-5.2.x
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-3
+- fix build issue with php-5.3.x
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- fix pykdeuic4-related install bits (kdebug#198162)
+- pyqt4_version 4.5.2
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Mon Jun 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.90-3
 - make the Python plugin factory work without python-devel
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-2
+- rework old-PyQt4 patch 
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- include more(all) csharp/qyoto .pc files snarfed from trunk/,
-  to match how everyone (except upstream) is shipping (#490555)
+* Thu May 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- respin against PyQt-4.5
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 20 2009 Than Ngo <than at redhat.com> - 4.2.85-1
+- 4.2.85 (4.3 beta1)
+- build fixes backported from trunk by Nicolas L?cureuil <neoclust at mandriva.org>
+- revert change which requires PyQt4 4.5 (Kevin Kofler)
+- fix build issue with gcc-4.4
 
 * Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
 - F11+: enable csharp on ppc64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	30 May 2009 16:18:25 -0000	1.65
+++ sources	5 Aug 2009 02:45:54 -0000	1.66
@@ -1,6 +1 @@
-db0e95addf2b2874434ae8505733cdcd  kdebindings-4.2.4.tar.bz2
-a14a96333fd23f83cff9667b27b1b48d  qtscript-sharp.pc
-42067564487eb74cc6dc18f17f3d3bf8  qttest-sharp.pc
-2c30555ef7fa31418c38e907eb564f05  qtuitools-sharp.pc
-549f3a8cbda880c5f7bc2715cdea0f30  qtwebkit-sharp.pc
-f8e69ce5f5098bd8ffb8dc92acfa4452  qyoto.pc
+6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2


--- kdebindings-4.2.3-gcc44.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 02:46:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:46:55 +0000 (UTC)
Subject: rpms/kdebindings/F-10 kdebindings-4.2.85-old-PyQt4.patch, NONE,
	1.1 .cvsignore, 1.56, 1.57 kdebindings.spec, 1.161,
	1.162 sources, 1.64, 1.65 kdebindings-4.2.3-gcc44.patch, 1.1, NONE
Message-ID: <20090805024655.7C3BC11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21649

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.2.85-old-PyQt4.patch 
Removed Files:
	kdebindings-4.2.3-gcc44.patch 
Log Message:
kde-4.3.0


kdebindings-4.2.85-old-PyQt4.patch:
 backendcapabilities.sip |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.2.85-old-PyQt4.patch ---
--- python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:30	959021
+++ python/pykde4/sip/phonon/backendcapabilities.sip	2009/04/25 13:15:26	959020
@@ -26,7 +26,7 @@
 {
 namespace BackendCapabilities
 {
-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject,NoQMetaObject/
 {
 
 signals:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	30 May 2009 16:18:24 -0000	1.56
+++ .cvsignore	5 Aug 2009 02:46:55 -0000	1.57
@@ -1,6 +1,5 @@
-kdebindings-4.2.4.tar.bz2
-qtscript-sharp.pc
-qttest-sharp.pc
-qtuitools-sharp.pc
-qtwebkit-sharp.pc
-qyoto.pc
+kdebindings-4.2.90.tar.bz2
+kdebindings-4.2.95.tar.bz2
+kdebindings-4.2.96.tar.bz2
+kdebindings-4.2.98.tar.bz2
+kdebindings-4.3.0.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- kdebindings.spec	27 Jun 2009 14:47:12 -0000	1.161
+++ kdebindings.spec	5 Aug 2009 02:46:55 -0000	1.162
@@ -9,13 +9,16 @@
 %endif
 %endif
 %define falcon 1
+# FIXME: temporarily disable on rawhide, until build failures fixed
+%if 0%{?fedora} < 12
 %define php 1
+%endif
 %define ruby 1
 %define smoke 1
 %define java 0
 
 %define pykde4_akonadi 1
-%define pyqt4_version 4.5
+%define pyqt4_version 4.5.2
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
@@ -28,28 +31,26 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.2.4
+Version: 4.3.0
 Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 Group: User Interface/Desktops
-License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qyoto/qyoto.pc
-Source2: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qttest/qttest-sharp.pc
-Source3: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtwebkit/qtwebkit-sharp.pc
-Source4: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtscript/qtscript-sharp.pc
-Source5: http://websvn.kde.org/*checkout*/trunk/KDE/kdebindings/csharp/qtuitools/qtuitools-sharp.pc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
+# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
+Patch1:  kdebindings-4.2.85-old-PyQt4.patch
 # make the Python plugin factory work without python-devel
 Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
+
 ## upstream patches
-Patch100: kdebindings-4.2.3-gcc44.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -57,11 +58,14 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
+BuildRequires:  qimageblitz-devel
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
+BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
 BuildRequires:  mono-core
@@ -248,10 +252,11 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q
 %patch0
+%patch1 -p0 -b .old-PyQt4
 %patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
-%patch100 -p1 -b .gcc44
+
 
 %build
 mkdir -p %{_target_platform}
@@ -298,11 +303,12 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?csharp}
-mkdir -p %{buildroot}%{_datadir}/pkgconfig/
-install -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
-  %{buildroot}%{_datadir}/pkgconfig/
-%endif
+# HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pykdeuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
+   %{buildroot}%{_bindir}/pykdeuic4
+ln -s %{_bindir}/pykdeuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
 
 %clean
@@ -313,6 +319,11 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+%pre -n PyKDE4-devel
+if [ -d %{_bindir}/pykdeuic4 ]; then
+rm -rf %{_bindir}/pykdeuic4/
+fi
+
 
 %files
 %defattr(-,root,root,-)
@@ -335,8 +346,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %{python_sitearch}/PyKDE4/
+%{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
 %dir %{_kde4_appsdir}/pykde4/
-%{_kde4_appsdir}/pykde4/*.py*
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
@@ -348,6 +359,8 @@ rm -rf %{buildroot}
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
+%{_kde4_bindir}/pykdeuic4
+%{python_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
@@ -362,6 +375,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libnepomuk-sharp.so
 %{_kde4_libdir}/libplasma-sharp.so
 %{_kde4_libdir}/libsoprano-sharp.so
+%{_kde4_libdir}/libqimageblitz-sharp.so
+%{_kde4_libdir}/mono/2.0/qimageblitz.dll
 %{_kde4_libdir}/mono/2.0/akonadi.dll
 %{_kde4_libdir}/mono/2.0/kde-dotnet.dll
 %{_kde4_libdir}/mono/2.0/khtml-dll.dll
@@ -376,6 +391,7 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/mono/gac/nepomuk-dll/
 %{_kde4_libdir}/mono/gac/plasma-dll/
 %{_kde4_libdir}/mono/gac/soprano/
+%{_kde4_libdir}/mono/gac/qimageblitz/
 %{_kde4_appsdir}/plasma_scriptengine_kimono/
 %{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-applet.desktop
 %{_kde4_datadir}/kde4/services/plasma-scriptengine-kimono-dataengine.desktop
@@ -406,8 +422,7 @@ rm -rf %{buildroot}
 %{_bindir}/uics
 %{_includedir}/qyoto/
 %{_kde4_libdir}/libqyotoshared.so
-%{_datadir}/pkgconfig/qyoto.pc
-%{_datadir}/pkgconfig/qt*-sharp.pc
+%{_kde4_libdir}/pkgconfig/*
 %endif
 
 %if 0%{?ruby}
@@ -490,21 +505,59 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jun 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-3
-- rebuild (PyQt4-4.5)
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
+- respin
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- workaround pykdeuic4 upgrade brokenness (introduced in 4.2.98)
 
-* Mon Jun 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+- more pykdeuic4 and related multilib love (kdebug#198162)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3 
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-5
+- add correct check for php version
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-4
+- allow for build php-5.2.x
+
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-3
+- fix build issue with php-5.3.x
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- fix pykdeuic4-related install bits (kdebug#198162)
+- pyqt4_version 4.5.2
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Mon Jun 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.90-3
 - make the Python plugin factory work without python-devel
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-2
+- rework old-PyQt4 patch 
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- include more(all) csharp/qyoto .pc files snarfed from trunk/,
-  to match how everyone (except upstream) is shipping (#490555)
+* Thu May 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- respin against PyQt-4.5
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 20 2009 Than Ngo <than at redhat.com> - 4.2.85-1
+- 4.2.85 (4.3 beta1)
+- build fixes backported from trunk by Nicolas L?cureuil <neoclust at mandriva.org>
+- revert change which requires PyQt4 4.5 (Kevin Kofler)
+- fix build issue with gcc-4.4
 
 * Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
 - F11+: enable csharp on ppc64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 May 2009 16:18:24 -0000	1.64
+++ sources	5 Aug 2009 02:46:55 -0000	1.65
@@ -1,6 +1 @@
-db0e95addf2b2874434ae8505733cdcd  kdebindings-4.2.4.tar.bz2
-a14a96333fd23f83cff9667b27b1b48d  qtscript-sharp.pc
-42067564487eb74cc6dc18f17f3d3bf8  qttest-sharp.pc
-2c30555ef7fa31418c38e907eb564f05  qtuitools-sharp.pc
-549f3a8cbda880c5f7bc2715cdea0f30  qtwebkit-sharp.pc
-f8e69ce5f5098bd8ffb8dc92acfa4452  qyoto.pc
+6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2


--- kdebindings-4.2.3-gcc44.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 02:49:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:49:19 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 kdeaccessibility.spec,1.67,1.68
Message-ID: <20090805024919.B1BDD11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22180/F-10

Modified Files:
	kdeaccessibility.spec 
Log Message:
kde-4.3.0



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kdeaccessibility.spec	29 May 2009 13:25:20 -0000	1.67
+++ kdeaccessibility.spec	5 Aug 2009 02:49:19 -0000	1.68
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.2.4
-Release:        1%{?dist}
+Version:        4.3.0
+Release:        3%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -11,6 +11,7 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
 %ifnarch sparcv9 sparc64
@@ -24,11 +25,12 @@ BuildRequires: plasma-devel >= %{version
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+# ktssd
+Requires: festival
 
-Obsoletes: kdeaccessibility-devel < 1:3.5.8 
+Obsoletes: kdeaccessibility-devel < 1:3.5.8
+Obsoletes: kdeaccessibility < 1:4.3.0-2
 
 #noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
@@ -40,13 +42,22 @@ Included with this package are:
 * kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
+# Yes, it's a bit silly to have this, esp since we don't have a -devel pkg,
+# but that's how multilib currently works. -- Rex
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -60,30 +71,49 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# hack around HTML doc multilib conflicts
+for doxy_hack in kmousetool kmouth kttsd ; do
+pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
+bunzip2 index.cache.bz2
+sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
+bzip2 -9 index.cache
+done
+popd
+
+# unpackaged files
+rm -vf %{buildroot}%{_kde4_libdir}/libkttsd.so
+
+
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/mono &> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-    touch --no-create %{_kde4_iconsdir}/mono &> /dev/null 
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null 
-    gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
-
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/mono &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -95,7 +125,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/kttsd/
 %{_kde4_appsdir}/color-schemes/*.colors
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/kmag/
@@ -104,18 +134,45 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_docdir}/HTML/en/kttsd/
 %{_kde4_iconsdir}/mono/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
-%{_mandir}/*/*.gz
+%{_mandir}/man1/*.1*
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkttsd.so.4*
 
 
 %changelog
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-2
+- -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 1:4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.2.90-1
+- KDE 4.3 beta 2
+
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- Requires: festival (for kttsd)
 
 * Mon Mar 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2



From rdieter at fedoraproject.org  Wed Aug  5 02:49:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:49:19 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-11 kdeaccessibility.spec,1.80,1.81
Message-ID: <20090805024919.D7DDD11C02BD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22180/F-11

Modified Files:
	kdeaccessibility.spec 
Log Message:
kde-4.3.0



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-11/kdeaccessibility.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- kdeaccessibility.spec	29 May 2009 13:25:20 -0000	1.80
+++ kdeaccessibility.spec	5 Aug 2009 02:49:19 -0000	1.81
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.2.4
-Release:        1%{?dist}
+Version:        4.3.0
+Release:        3%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -11,6 +11,7 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
 %ifnarch sparcv9 sparc64
@@ -24,11 +25,12 @@ BuildRequires: plasma-devel >= %{version
 #-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
 #-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+# ktssd
+Requires: festival
 
-Obsoletes: kdeaccessibility-devel < 1:3.5.8 
+Obsoletes: kdeaccessibility-devel < 1:3.5.8
+Obsoletes: kdeaccessibility < 1:4.3.0-2
 
 #noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
@@ -40,13 +42,22 @@ Included with this package are:
 * kmouth: program that allows people who have lost their voice
 * ktts: text to speech support
 
+# Yes, it's a bit silly to have this, esp since we don't have a -devel pkg,
+# but that's how multilib currently works. -- Rex
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -60,30 +71,49 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# hack around HTML doc multilib conflicts
+for doxy_hack in kmousetool kmouth kttsd ; do
+pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
+bunzip2 index.cache.bz2
+sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
+bzip2 -9 index.cache
+done
+popd
+
+# unpackaged files
+rm -vf %{buildroot}%{_kde4_libdir}/libkttsd.so
+
+
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/mono &> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-    touch --no-create %{_kde4_iconsdir}/mono &> /dev/null 
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null 
-    gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
-
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/mono &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/mono &> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -95,7 +125,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/kttsd/
 %{_kde4_appsdir}/color-schemes/*.colors
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/kmag/
@@ -104,18 +134,45 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_docdir}/HTML/en/kttsd/
 %{_kde4_iconsdir}/mono/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
-%{_mandir}/*/*.gz
+%{_mandir}/man1/*.1*
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkttsd.so.4*
 
 
 %changelog
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-2
+- -libs subpkg: Multilib conflicts for index.cache.bz2 (#515085)
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 1:4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.2.90-1
+- KDE 4.3 beta 2
+
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- Requires: festival (for kttsd)
 
 * Mon Mar 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2



From rdieter at fedoraproject.org  Wed Aug  5 02:51:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:51:02 +0000 (UTC)
Subject: rpms/kdebase/F-11 .cvsignore, 1.87, 1.88 kdebase.spec, 1.377,
	1.378 sources, 1.110,
	1.111 kdebase-4.2.2-konsole-flowcontrol.patch, 1.3, NONE
Message-ID: <20090805025103.045AE11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22749

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-11/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	29 May 2009 14:08:22 -0000	1.87
+++ .cvsignore	5 Aug 2009 02:51:02 -0000	1.88
@@ -1 +1,5 @@
-kdebase-4.2.4.tar.bz2
+kdebase-4.2.90.tar.bz2
+kdebase-4.2.95.tar.bz2
+kdebase-4.2.96.tar.bz2
+kdebase-4.2.98.tar.bz2
+kdebase-4.3.0.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- kdebase.spec	31 May 2009 21:22:11 -0000	1.377
+++ kdebase.spec	5 Aug 2009 02:51:02 -0000	1.378
@@ -1,54 +1,32 @@
-Summary: K Desktop Environment 4 - Core Files
-Version: 4.2.4
-Release: 2%{?dist}
-
-%if 0%{?fedora} > 8
 Name: kdebase
+Summary: K Desktop Environment 4 - Core Files
+Version: 4.3.0
+Release: 1%{?dist}
 Epoch: 6
 
-Obsoletes: kdebase4 < %{version}-%{release}
-Provides: kdebase4 = %{version}-%{release}
-
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-
-# make -libs subpkg
-%define libs 1
-
-%else
-Name: kdebase4
-%endif
-
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
-# upstream patches
-# backported from 4.3:
-Patch200: kdebase-4.2.2-konsole-flowcontrol.patch
-
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
+Provides:  dolphin = 1.0.2-1
+Provides:  kdebase4 = %{version}-%{release}
+Obsoletes: dolphin < 1.0.2-1
+Obsoletes: d3lphin
+Obsoletes: kdebase4 < %{version}-%{release}
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 
-Provides:      dolphin = 1.0.2-1
-Obsoletes:     dolphin < 1.0.2-1
-Obsoletes:     d3lphin
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -61,11 +39,10 @@ BuildRequires: gettext
 BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: pcre-devel
+BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-%if "%{name}" == "kdebase"
 BuildRequires: plasma-devel >= %{version}
-%endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
@@ -94,44 +71,41 @@ Requires: kdebase-runtime
 
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
-%if "%{name}" == "kdebase4"
-This package does not include the KDE 4 versions of applications which are
-provided by KDE 3 because of file and configuration setting conflicts.
-%endif
 
-%if 0%{?libs}
+
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
 %description libs
 %{summary}.
-%endif
+
+
 
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdebase4"
-Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
-%endif
+Obsoletes: kdebase4-devel < %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 %{summary}.
 
 
+
 %prep
 %setup -q -n kdebase-%{version}
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch200 -p1 -b .konsole-flowcontrol
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -145,91 +119,13 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if "%{name}" != "kdebase"
-# remove files which conflict with KDE 3
-# FIXME: remove the rm commands for stuff which isn't there to remove in the first place so we see what actually still conflicts
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
-rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
-rm -rf %{buildroot}%{_datadir}/emoticons
-rm -rf %{buildroot}%{_kde4_datadir}/locale
-rm -rf %{buildroot}%{_kde4_datadir}/autostart
-rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
-rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -rf %{buildroot}%{_kde4_datadir}/config
-rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
-rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
-rm -rf %{buildroot}%{_kde4_datadir}/templates
-# binaries: conflict with kdebase
-rm -f %{buildroot}%{_kde4_bindir}/drkonqi
-rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
-rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
-rm -f %{buildroot}%{_kde4_bindir}/kdeeject
-rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
-rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
-rm -f %{buildroot}%{_kde4_bindir}/kdesu
-rm -f %{buildroot}%{_kde4_bindir}/kdesud
-rm -f %{buildroot}%{_kde4_bindir}/kdialog
-rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
-rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
-rm -f %{buildroot}%{_kde4_bindir}/kfind
-rm -f %{buildroot}%{_kde4_bindir}/kfmclient
-rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
-rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
-rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
-rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
-rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
-rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
-rm -f %{buildroot}%{_kde4_bindir}/knetattach
-rm -f %{buildroot}%{_kde4_bindir}/konqueror
-rm -f %{buildroot}%{_kde4_bindir}/konsole
-rm -f %{buildroot}%{_kde4_bindir}/kprinter
-rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
-rm -f %{buildroot}%{_kde4_bindir}/kstart
-rm -f %{buildroot}%{_kde4_bindir}/ktrash
-rm -f %{buildroot}%{_kde4_bindir}/kwrite
-rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
-rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
-rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
-# binaries: conflict with kdelibs
-rm -f %{buildroot}%{_kde4_bindir}/kcmshell
-rm -f %{buildroot}%{_kde4_bindir}/kfile
-rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
-rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
-rm -f %{buildroot}%{_kde4_bindir}/kioexec
-rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
-# binaries: conflict with kdebase-extras
-rm -f %{buildroot}%{_kde4_bindir}/kappfinder
-# do not strictly conflict, but we removed the corresponding binaries:
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
-# we also removed the binaries for these:
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
-# and this doesn't work with KDE 3 konsole
-rm -f %{buildroot}%{_kde4_bindir}/konsoleprofile
-%endif
-
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
 for i in lib*.so
 do
   case "$i" in
-    libkdeinit4_*.so)
+    libkdeinit4_*.so|libkonsoleprivate.so)
       ;;
     *)
       linktarget=`readlink "$i"`
@@ -239,47 +135,38 @@ do
   esac
 done
 popd
-
-%if "%{name}" == "kdebase"
 # konquerorsu only show in KDE
 echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
-%endif
+
+
 
 %clean
 rm -rf %{buildroot}
 
 
+
 %post
 %{!?libs:/sbin/ldconfig}
-%if "%{name}" == "kdebase"
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %posttrans
-%if "%{name}" == "kdebase"
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 update-desktop-database -q &> /dev/null ||:
 
 %postun
 %{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-%if "%{name}" == "kdebase"
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+    touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+    gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+    update-desktop-database -q &> /dev/null ||:
 fi
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
-%endif
 
 
 %files
@@ -296,19 +183,16 @@ fi
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
-%if "%{name}" == "kdebase"
 %{_kde4_datadir}/autostart/*
 %{_kde4_configdir}/*
 %{_kde4_datadir}/templates/*
 %{_kde4_datadir}/templates/.source/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%endif
+%{_kde4_libdir}/libkonsoleprivate.so
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
@@ -318,14 +202,29 @@ fi
 
 
 %changelog
-* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
-- fix disabling konsole's flow control again (#496447, regression in 4.2.3-1)
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.2.85-2
+- Fedora 8 is EOL'ed, drop conditionals and cleanup the specfile
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Apr 21 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-3
 - #496447 -  fix disabling konsole's flow control


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-11/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sources	29 May 2009 14:08:22 -0000	1.110
+++ sources	5 Aug 2009 02:51:02 -0000	1.111
@@ -1 +1 @@
-848f76d9151b5b59be28af188a93a99a  kdebase-4.2.4.tar.bz2
+6de0b96b78504d8f5fcdee819d080fb1  kdebase-4.3.0.tar.bz2


--- kdebase-4.2.2-konsole-flowcontrol.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 02:51:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:51:48 +0000 (UTC)
Subject: rpms/kdebase/F-10 .cvsignore, 1.82, 1.83 kdebase.spec, 1.367,
	1.368 sources, 1.110,
	1.111 kdebase-4.2.2-konsole-flowcontrol.patch, 1.3, NONE
Message-ID: <20090805025148.3F31A11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23040

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	29 May 2009 14:08:21 -0000	1.82
+++ .cvsignore	5 Aug 2009 02:51:47 -0000	1.83
@@ -1 +1,5 @@
-kdebase-4.2.4.tar.bz2
+kdebase-4.2.90.tar.bz2
+kdebase-4.2.95.tar.bz2
+kdebase-4.2.96.tar.bz2
+kdebase-4.2.98.tar.bz2
+kdebase-4.3.0.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -p -r1.367 -r1.368
--- kdebase.spec	31 May 2009 21:22:10 -0000	1.367
+++ kdebase.spec	5 Aug 2009 02:51:48 -0000	1.368
@@ -1,54 +1,32 @@
-Summary: K Desktop Environment 4 - Core Files
-Version: 4.2.4
-Release: 2%{?dist}
-
-%if 0%{?fedora} > 8
 Name: kdebase
+Summary: K Desktop Environment 4 - Core Files
+Version: 4.3.0
+Release: 1%{?dist}
 Epoch: 6
 
-Obsoletes: kdebase4 < %{version}-%{release}
-Provides: kdebase4 = %{version}-%{release}
-
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-
-# make -libs subpkg
-%define libs 1
-
-%else
-Name: kdebase4
-%endif
-
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
-# upstream patches
-# backported from 4.3:
-Patch200: kdebase-4.2.2-konsole-flowcontrol.patch
-
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
+Provides:  dolphin = 1.0.2-1
+Provides:  kdebase4 = %{version}-%{release}
+Obsoletes: dolphin < 1.0.2-1
+Obsoletes: d3lphin
+Obsoletes: kdebase4 < %{version}-%{release}
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 
-Provides:      dolphin = 1.0.2-1
-Obsoletes:     dolphin < 1.0.2-1
-Obsoletes:     d3lphin
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -61,11 +39,10 @@ BuildRequires: gettext
 BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: pcre-devel
+BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-%if "%{name}" == "kdebase"
 BuildRequires: plasma-devel >= %{version}
-%endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
@@ -94,44 +71,41 @@ Requires: kdebase-runtime
 
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
-%if "%{name}" == "kdebase4"
-This package does not include the KDE 4 versions of applications which are
-provided by KDE 3 because of file and configuration setting conflicts.
-%endif
 
-%if 0%{?libs}
+
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
 %description libs
 %{summary}.
-%endif
+
+
 
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdebase4"
-Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
-%endif
+Obsoletes: kdebase4-devel < %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 %{summary}.
 
 
+
 %prep
 %setup -q -n kdebase-%{version}
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch200 -p1 -b .konsole-flowcontrol
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -145,91 +119,13 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if "%{name}" != "kdebase"
-# remove files which conflict with KDE 3
-# FIXME: remove the rm commands for stuff which isn't there to remove in the first place so we see what actually still conflicts
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
-rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
-rm -rf %{buildroot}%{_datadir}/emoticons
-rm -rf %{buildroot}%{_kde4_datadir}/locale
-rm -rf %{buildroot}%{_kde4_datadir}/autostart
-rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
-rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -rf %{buildroot}%{_kde4_datadir}/config
-rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
-rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
-rm -rf %{buildroot}%{_kde4_datadir}/templates
-# binaries: conflict with kdebase
-rm -f %{buildroot}%{_kde4_bindir}/drkonqi
-rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
-rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
-rm -f %{buildroot}%{_kde4_bindir}/kdeeject
-rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
-rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
-rm -f %{buildroot}%{_kde4_bindir}/kdesu
-rm -f %{buildroot}%{_kde4_bindir}/kdesud
-rm -f %{buildroot}%{_kde4_bindir}/kdialog
-rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
-rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
-rm -f %{buildroot}%{_kde4_bindir}/kfind
-rm -f %{buildroot}%{_kde4_bindir}/kfmclient
-rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
-rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
-rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
-rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
-rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
-rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
-rm -f %{buildroot}%{_kde4_bindir}/knetattach
-rm -f %{buildroot}%{_kde4_bindir}/konqueror
-rm -f %{buildroot}%{_kde4_bindir}/konsole
-rm -f %{buildroot}%{_kde4_bindir}/kprinter
-rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
-rm -f %{buildroot}%{_kde4_bindir}/kstart
-rm -f %{buildroot}%{_kde4_bindir}/ktrash
-rm -f %{buildroot}%{_kde4_bindir}/kwrite
-rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
-rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
-rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
-# binaries: conflict with kdelibs
-rm -f %{buildroot}%{_kde4_bindir}/kcmshell
-rm -f %{buildroot}%{_kde4_bindir}/kfile
-rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
-rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
-rm -f %{buildroot}%{_kde4_bindir}/kioexec
-rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
-# binaries: conflict with kdebase-extras
-rm -f %{buildroot}%{_kde4_bindir}/kappfinder
-# do not strictly conflict, but we removed the corresponding binaries:
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
-# we also removed the binaries for these:
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
-# and this doesn't work with KDE 3 konsole
-rm -f %{buildroot}%{_kde4_bindir}/konsoleprofile
-%endif
-
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
 for i in lib*.so
 do
   case "$i" in
-    libkdeinit4_*.so)
+    libkdeinit4_*.so|libkonsoleprivate.so)
       ;;
     *)
       linktarget=`readlink "$i"`
@@ -239,47 +135,38 @@ do
   esac
 done
 popd
-
-%if "%{name}" == "kdebase"
 # konquerorsu only show in KDE
 echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
-%endif
+
+
 
 %clean
 rm -rf %{buildroot}
 
 
+
 %post
 %{!?libs:/sbin/ldconfig}
-%if "%{name}" == "kdebase"
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %posttrans
-%if "%{name}" == "kdebase"
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 update-desktop-database -q &> /dev/null ||:
 
 %postun
 %{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-%if "%{name}" == "kdebase"
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+    touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+    gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+    update-desktop-database -q &> /dev/null ||:
 fi
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
-%endif
 
 
 %files
@@ -296,19 +183,16 @@ fi
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
-%if "%{name}" == "kdebase"
 %{_kde4_datadir}/autostart/*
 %{_kde4_configdir}/*
 %{_kde4_datadir}/templates/*
 %{_kde4_datadir}/templates/.source/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%endif
+%{_kde4_libdir}/libkonsoleprivate.so
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
@@ -318,14 +202,29 @@ fi
 
 
 %changelog
-* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
-- fix disabling konsole's flow control again (#496447, regression in 4.2.3-1)
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.2.85-2
+- Fedora 8 is EOL'ed, drop conditionals and cleanup the specfile
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Apr 21 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-3
 - #496447 -  fix disabling konsole's flow control


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sources	29 May 2009 14:08:22 -0000	1.110
+++ sources	5 Aug 2009 02:51:48 -0000	1.111
@@ -1 +1 @@
-848f76d9151b5b59be28af188a93a99a  kdebase-4.2.4.tar.bz2
+6de0b96b78504d8f5fcdee819d080fb1  kdebase-4.3.0.tar.bz2


--- kdebase-4.2.2-konsole-flowcontrol.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 02:53:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:53:20 +0000 (UTC)
Subject: rpms/kdeedu/F-10 .cvsignore, 1.62, 1.63 kdeedu.spec, 1.151,
	1.152 sources, 1.64, 1.65
Message-ID: <20090805025320.EE76211C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23439/F-10

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	30 May 2009 11:25:52 -0000	1.62
+++ .cvsignore	5 Aug 2009 02:53:20 -0000	1.63
@@ -1 +1,5 @@
-kdeedu-4.2.4.tar.bz2
+kdeedu-4.2.90.tar.bz2
+kdeedu-4.2.95.tar.bz2
+kdeedu-4.2.96.tar.bz2
+kdeedu-4.2.98.tar.bz2
+kdeedu-4.3.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdeedu.spec	30 May 2009 11:25:52 -0000	1.151
+++ kdeedu.spec	5 Aug 2009 02:53:20 -0000	1.152
@@ -1,28 +1,23 @@
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
-%if 0%{?fedora} > 8
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
 %define with_facile 1
 %endif
-%endif
-%if 0%{?fedora} == 8
-%ifarch alpha %{ix86} ia64 x86_64 ppc sparc sparcv9
-%define with_facile 1
-%endif
-%endif
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.2.4
-Release: 1%{?dist}
+Version: 4.3.0
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
+
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
+## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -32,8 +27,7 @@ BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
 BuildRequires: desktop-file-utils
-BuildRequires: eigen-devel
-BuildRequires: gmm-devel
+BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -51,7 +45,8 @@ BuildRequires: ocaml-facile-devel
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-BuildRequires: python-devel
+BuildRequires: xplanet
+
 
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -59,16 +54,18 @@ BuildRequires: python-devel
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
+%if 0%{?fedora} < 12
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+%endif
 # blinken
 Requires: sj-stevehand-fonts
 # khangman
 Requires: dustin-dustismo-roman-fonts
-Requires: dustin-domestic-manners-fonts 
+Requires: dustin-domestic-manners-fonts
 
 %description
 Educational/Edutainment applications:
@@ -94,9 +91,9 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # libmarble
-Requires: %{name}-marble = %{version}-%{release}
+Requires: %{name}-marble%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -109,24 +106,25 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+#Requires(hint): xplanet
 %description kstars
 %{summary}.
 
-%package marble 
+%package marble
 Summary: A World Atlas
 Group:   Amusements/Games
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't 
+# this should avoid conflict too, even though kdeedu-libs isn't
 # strictly required.
 #Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
 Provides:  marble = 1:0.7-%{release}
-%description marble 
+%description marble
 %{summary}.
 
 %package math
@@ -156,7 +154,7 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make -C %{_target_platform}
 
 
 %install
@@ -167,6 +165,8 @@ make install/fast DESTDIR=%{buildroot} -
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
+# oxygen-icon-theme conflict
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
 
 # omit dustismo roman font
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
@@ -176,6 +176,12 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -210,14 +216,14 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
-%post marble 
+%post marble
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans marble
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%postun marble 
+%postun marble
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -293,7 +299,6 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
 %{_kde4_libdir}/libcompoundviewer.so.*
-%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -321,13 +326,13 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
-%{_kde4_datadir}/config/kalzium.knsrc
-%{_kde4_datadir}/config/kanagram.knsrc
-%{_kde4_datadir}/config/khangman.knsrc
-%{_kde4_datadir}/config/klettres.knsrc
-%{_kde4_datadir}/config/kwordquiz.knsrc
-%{_kde4_datadir}/config/parley.knsrc
-%{_kde4_datadir}/config/step.knsrc
+%{_kde4_configdir}/kalzium.knsrc
+%{_kde4_configdir}/kanagram.knsrc
+%{_kde4_configdir}/khangman.knsrc
+%{_kde4_configdir}/klettres.knsrc
+%{_kde4_configdir}/kwordquiz.knsrc
+%{_kde4_configdir}/parley.knsrc
+%{_kde4_configdir}/step.knsrc
 
 %{_kde4_docdir}/HTML/en/blinken/
 %{_kde4_docdir}/HTML/en/kalzium/
@@ -368,6 +373,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
 %{_kde4_libdir}/libscience.so.*
+# needed here for multilib'd runtime
+%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -452,11 +460,47 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- move kalziumuiwidgets.so designer plugin to -libs
+- tighten -libs deps using %%?_isa
+- %%check: desktop-file-validate
+- fix conflict with oxygen-icons
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- rebuild against fixed libqalculate to purge cln dep
+
+* Mon Jul 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
+- rebuild for cln(libqalculate), see also rhbz#509840
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.85-4
+- Drop old Fedora < 8 conditionals
+
+* Sat May 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- Rebuild for new OCaml (3.11.1 rc0)
+
+* Mon May 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Drop BR gmm-devel, no longer needed (replaced by Eigen2)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Mar 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
@@ -496,7 +540,7 @@ rm -rf %{buildroot}
 - -marble: move geodatatest, drop Req: -libs
 
 * Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
-- move worldclock applet to -marble 
+- move worldclock applet to -marble
 
 * Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - Requires: dustin-dustismo-roman-fonts
@@ -540,7 +584,7 @@ rm -rf %{buildroot}
 - Rebuild for Python 2.6
 
 * Tue Dec 02 2008 Steven M. Parrish <smparrish at shallowcreek.net> 4.1.80-7
-- rebuild for gmm 3.1 
+- rebuild for gmm 3.1
 
 * Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
 - rebuild for Python 2.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 May 2009 11:25:52 -0000	1.64
+++ sources	5 Aug 2009 02:53:20 -0000	1.65
@@ -1 +1 @@
-007f3fd746e4a20dec255b8b5bae6023  kdeedu-4.2.4.tar.bz2
+4c309bcdc47274cea6f61206a42ef638  kdeedu-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 02:53:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:53:21 +0000 (UTC)
Subject: rpms/kdeedu/F-11 .cvsignore, 1.65, 1.66 kdeedu.spec, 1.178,
	1.179 sources, 1.66, 1.67
Message-ID: <20090805025321.33C6E11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23439/F-11

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	30 May 2009 11:25:54 -0000	1.65
+++ .cvsignore	5 Aug 2009 02:53:20 -0000	1.66
@@ -1 +1,5 @@
-kdeedu-4.2.4.tar.bz2
+kdeedu-4.2.90.tar.bz2
+kdeedu-4.2.95.tar.bz2
+kdeedu-4.2.96.tar.bz2
+kdeedu-4.2.98.tar.bz2
+kdeedu-4.3.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- kdeedu.spec	30 May 2009 11:25:54 -0000	1.178
+++ kdeedu.spec	5 Aug 2009 02:53:21 -0000	1.179
@@ -1,28 +1,23 @@
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
-%if 0%{?fedora} > 8
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
 %define with_facile 1
 %endif
-%endif
-%if 0%{?fedora} == 8
-%ifarch alpha %{ix86} ia64 x86_64 ppc sparc sparcv9
-%define with_facile 1
-%endif
-%endif
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.2.4
-Release: 1%{?dist}
+Version: 4.3.0
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
+
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
+## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -32,8 +27,7 @@ BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
 BuildRequires: desktop-file-utils
-BuildRequires: eigen-devel
-BuildRequires: gmm-devel
+BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -51,7 +45,8 @@ BuildRequires: ocaml-facile-devel
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-BuildRequires: python-devel
+BuildRequires: xplanet
+
 
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -59,16 +54,18 @@ BuildRequires: python-devel
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
+%if 0%{?fedora} < 12
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+%endif
 # blinken
 Requires: sj-stevehand-fonts
 # khangman
 Requires: dustin-dustismo-roman-fonts
-Requires: dustin-domestic-manners-fonts 
+Requires: dustin-domestic-manners-fonts
 
 %description
 Educational/Edutainment applications:
@@ -94,9 +91,9 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # libmarble
-Requires: %{name}-marble = %{version}-%{release}
+Requires: %{name}-marble%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -109,24 +106,25 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+#Requires(hint): xplanet
 %description kstars
 %{summary}.
 
-%package marble 
+%package marble
 Summary: A World Atlas
 Group:   Amusements/Games
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't 
+# this should avoid conflict too, even though kdeedu-libs isn't
 # strictly required.
 #Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
 Provides:  marble = 1:0.7-%{release}
-%description marble 
+%description marble
 %{summary}.
 
 %package math
@@ -156,7 +154,7 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make -C %{_target_platform}
 
 
 %install
@@ -167,6 +165,8 @@ make install/fast DESTDIR=%{buildroot} -
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
+# oxygen-icon-theme conflict
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
 
 # omit dustismo roman font
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
@@ -176,6 +176,12 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -210,14 +216,14 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
-%post marble 
+%post marble
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans marble
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%postun marble 
+%postun marble
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -293,7 +299,6 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
 %{_kde4_libdir}/libcompoundviewer.so.*
-%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -321,13 +326,13 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
-%{_kde4_datadir}/config/kalzium.knsrc
-%{_kde4_datadir}/config/kanagram.knsrc
-%{_kde4_datadir}/config/khangman.knsrc
-%{_kde4_datadir}/config/klettres.knsrc
-%{_kde4_datadir}/config/kwordquiz.knsrc
-%{_kde4_datadir}/config/parley.knsrc
-%{_kde4_datadir}/config/step.knsrc
+%{_kde4_configdir}/kalzium.knsrc
+%{_kde4_configdir}/kanagram.knsrc
+%{_kde4_configdir}/khangman.knsrc
+%{_kde4_configdir}/klettres.knsrc
+%{_kde4_configdir}/kwordquiz.knsrc
+%{_kde4_configdir}/parley.knsrc
+%{_kde4_configdir}/step.knsrc
 
 %{_kde4_docdir}/HTML/en/blinken/
 %{_kde4_docdir}/HTML/en/kalzium/
@@ -368,6 +373,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
 %{_kde4_libdir}/libscience.so.*
+# needed here for multilib'd runtime
+%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -452,11 +460,47 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- move kalziumuiwidgets.so designer plugin to -libs
+- tighten -libs deps using %%?_isa
+- %%check: desktop-file-validate
+- fix conflict with oxygen-icons
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- rebuild against fixed libqalculate to purge cln dep
+
+* Mon Jul 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
+- rebuild for cln(libqalculate), see also rhbz#509840
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.85-4
+- Drop old Fedora < 8 conditionals
+
+* Sat May 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- Rebuild for new OCaml (3.11.1 rc0)
+
+* Mon May 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Drop BR gmm-devel, no longer needed (replaced by Eigen2)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Mar 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
@@ -496,7 +540,7 @@ rm -rf %{buildroot}
 - -marble: move geodatatest, drop Req: -libs
 
 * Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
-- move worldclock applet to -marble 
+- move worldclock applet to -marble
 
 * Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - Requires: dustin-dustismo-roman-fonts
@@ -540,7 +584,7 @@ rm -rf %{buildroot}
 - Rebuild for Python 2.6
 
 * Tue Dec 02 2008 Steven M. Parrish <smparrish at shallowcreek.net> 4.1.80-7
-- rebuild for gmm 3.1 
+- rebuild for gmm 3.1
 
 * Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
 - rebuild for Python 2.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	30 May 2009 11:25:54 -0000	1.66
+++ sources	5 Aug 2009 02:53:21 -0000	1.67
@@ -1 +1 @@
-007f3fd746e4a20dec255b8b5bae6023  kdeedu-4.2.4.tar.bz2
+4c309bcdc47274cea6f61206a42ef638  kdeedu-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 02:55:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:55:25 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 kdeadmin-4.2.85-printing.patch, NONE,
	1.1 .cvsignore, 1.62, 1.63 kdeadmin.spec, 1.134, 1.135 sources,
	1.63, 1.64 kdeadmin-4.2.2-printing.patch, 1.4, NONE
Message-ID: <20090805025525.C3B3F11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24050/F-11

Modified Files:
	.cvsignore kdeadmin.spec sources 
Added Files:
	kdeadmin-4.2.85-printing.patch 
Removed Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
kde-4.3.0


kdeadmin-4.2.85-printing.patch:
 CMakeLists.txt               |   28 ++----------
 debug.py                     |   55 ++++++++++++++++++++++++
 smburi.py                    |   95 +++++++++++++++++++++++++++++++++++++++++++
 system-config-printer-kde.py |    3 -
 4 files changed, 156 insertions(+), 25 deletions(-)

--- NEW FILE kdeadmin-4.2.85-printing.patch ---
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/CMakeLists.txt kdeadmin-4.2.85-printing/system-config-printer-kde/CMakeLists.txt
--- kdeadmin-4.2.85/system-config-printer-kde/CMakeLists.txt	2009-04-28 15:47:13.000000000 +0200
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/CMakeLists.txt	2009-05-20 16:00:15.000000000 +0200
@@ -5,29 +5,9 @@
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-macro_optional_find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/pyqt/" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-macro_optional_find_package(PyKDE4)
-IF(NOT PYKDE4_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE4" "PyKDE4 was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE4_FOUND)
-
-macro_optional_find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-macro_optional_find_package(SystemConfigPrinter)
-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
-    macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
-    SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_SYSTEM_CONFIG_PRINTER)
     install( FILES
@@ -36,6 +16,8 @@
         system-config-printer-kde.py
         options.py
         optionwidgets.py
+        debug.py
+        smburi.py
         ipp-browse-dialog.ui
         smb-browse-dialog.ui
         DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/debug.py kdeadmin-4.2.85-printing/system-config-printer-kde/debug.py
--- kdeadmin-4.2.85/system-config-printer-kde/debug.py	1970-01-01 01:00:00.000000000 +0100
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/debug.py	2009-05-20 15:57:50.000000000 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+## Copyright (C) 2008 Red Hat, Inc.
+## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys
+import traceback
+
+_debug=False
+def debugprint (x):
+    if _debug:
+        try:
+            print >>sys.stderr, x
+        except:
+            pass
+
+def get_debugging ():
+    return _debug
+
+def set_debugging (d):
+    global _debug
+    _debug = d
+
+def fatalException (exitcode=1):
+    nonfatalException (type="fatal", end="Exiting")
+    sys.exit (exitcode)
+
+def nonfatalException (type="non-fatal", end="Continuing anyway.."):
+    d = get_debugging ()
+    set_debugging (True)
+    debugprint ("Caught %s exception.  Traceback:" % type)
+    (type, value, tb) = sys.exc_info ()
+    tblast = traceback.extract_tb (tb, limit=None)
+    if len (tblast):
+        tblast = tblast[:len (tblast) - 1]
+    extxt = traceback.format_exception_only (type, value)
+    for line in traceback.format_tb(tb):
+        debugprint (line.strip ())
+    debugprint (extxt[0].strip ())
+    debugprint (end)
+    set_debugging (d)
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/smburi.py kdeadmin-4.2.85-printing/system-config-printer-kde/smburi.py
--- kdeadmin-4.2.85/system-config-printer-kde/smburi.py	1970-01-01 01:00:00.000000000 +0100
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/smburi.py	2009-05-20 15:57:50.000000000 +0200
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+## system-config-printer
+
+## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import urllib
+
+class SMBURI:
+    def __init__ (self,
+                  uri=None,
+                  group='', host='', share='', user='', password=''):
+        if uri:
+            if group or host or share or user or password:
+                raise RuntimeError
+
+            if uri.startswith ("smb://"):
+                uri = uri[6:]
+
+            self.uri = uri
+        else:
+            self.uri = self._construct (group, host, share,
+                                        user=user, password=password)
+
+    def _construct (self, group, host, share, user='', password=''):
+        uri_password = ''
+        if password:
+            uri_password = ':' + urllib.quote (password)
+        if user:
+            uri_password += '@'
+        uri = "%s%s%s" % (urllib.quote (user),
+                          uri_password,
+                          urllib.quote (group))
+        if len (group) > 0:
+            uri += '/'
+        uri += urllib.quote (host)
+        if len (share) > 0:
+            uri += "/" + urllib.quote (share)
+        return uri
+
+    def get_uri (self):
+        return self.uri
+
+    def sanitize_uri (self):
+        group, host, share, user, password = self.separate ()
+        return self._construct (group, host, share)
+
+    def separate (self):
+        uri = self.get_uri ()
+        user = ''
+        password = ''
+        auth = uri.find ('@')
+        if auth != -1:
+            u = uri[:auth].find(':')
+            if u != -1:
+                user = uri[:u]
+                password = uri[u + 1:auth]
+            else:
+                user = uri[:auth]
+            uri = uri[auth + 1:]
+        sep = uri.count ('/')
+        group = ''
+        if sep == 2:
+            g = uri.find('/')
+            group = uri[:g]
+            uri = uri[g + 1:]
+        if sep < 1:
+            host = ''
+        else:
+            h = uri.find('/')
+            host = uri[:h]
+            uri = uri[h + 1:]
+            p = host.find(':')
+            if p != -1:
+                host = host[:p]
+        share = uri
+        return (urllib.unquote (group), urllib.unquote (host),
+                urllib.unquote (share),
+                urllib.unquote (user), urllib.unquote (password))
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/system-config-printer-kde.py kdeadmin-4.2.85-printing/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.85/system-config-printer-kde/system-config-printer-kde.py	2009-04-15 12:26:27.000000000 +0200
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/system-config-printer-kde.py	2009-05-20 16:05:17.000000000 +0200
@@ -34,7 +34,7 @@
 import sys, os, time, traceback, re, tempfile, httplib, thread
 
 #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
+SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
 if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
 
@@ -66,7 +66,6 @@
 cups.require ("1.9.27")
 
 # These come from system-config-printer
-import config
 import cupshelpers, options
 from optionwidgets import OptionWidget
 from smburi import SMBURI


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-11/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	29 May 2009 13:39:29 -0000	1.62
+++ .cvsignore	5 Aug 2009 02:55:25 -0000	1.63
@@ -1 +1,5 @@
-kdeadmin-4.2.4.tar.bz2
+kdeadmin-4.2.90.tar.bz2
+kdeadmin-4.2.95.tar.bz2
+kdeadmin-4.2.96.tar.bz2
+kdeadmin-4.2.98.tar.bz2
+kdeadmin-4.3.0.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kdeadmin.spec	29 May 2009 13:39:29 -0000	1.134
+++ kdeadmin.spec	5 Aug 2009 02:55:25 -0000	1.135
@@ -1,26 +1,39 @@
+%if 0%{?fedora}
+%define system_config_printer_kde 1
+%define include_kpackage 1
+%endif
+
 Name:           kdeadmin
+Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
-Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:         kdeadmin-4.2.2-printing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam
 Source2:        kuser.pamd
 
+# FIXME/TODO: upstream this -- Rex
+Patch0:         kdeadmin-4.2.85-printing.patch
+
+# upstream patches
+
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python
+BuildRequires:  python-devel
 
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
+%if ! 0%{?system_config_printer_kde}
+Obsoletes: system-config-printer-kde < %{epoch}:%{version}-%{release}
+%endif
+
 %description
 The %{name} package includes administrative tools including:
 * kcron: systemsettings module for the cron task scheduler
@@ -39,9 +52,9 @@ packages, uninstalling them and installi
 It is based upon the "Smart Package Manager".
 
 %package -n system-config-printer-kde
-Summary: A printer administration tool for KDE 
+Summary: A printer administration tool for KDE
 Group: System Environment/Base
-Requires: PyKDE4 >= %{version}
+Requires: PyKDE4
 Requires: system-config-printer-libs
 %description -n system-config-printer-kde
 A printer administration tool for KDE that allows the user to configure
@@ -52,6 +65,8 @@ a CUPS print server.
 %setup -q
 %patch0 -p1 -b .printing
 
+# upstream patches
+
 %build
 
 mkdir -p %{_target_platform}
@@ -87,6 +102,7 @@ touch --no-create %{_kde4_iconsdir}/hico
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
+%if 0%{?include_kpackage}
 %post kpackage
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
@@ -98,8 +114,7 @@ if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
-
-
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -112,18 +127,19 @@ fi
 %{_kde4_datadir}/applications/kde4/kuser.desktop
 %{_kde4_datadir}/applications/kde4/ksystemlog.desktop
 %{_kde4_datadir}/config.kcfg/kuser.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/kcm_cron.desktop
+%{_kde4_datadir}/kde4/services/kcm_knetworkconfmodule.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kcron/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/knetworkconf.*
-%{_kde4_iconsdir}/hicolor/*/*/ksystemlog.*
 %{_kde4_iconsdir}/hicolor/*/*/kuser.*
 %{_kde4_iconsdir}/hicolor/*/*/network*
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
+%if 0%{?include_kpackage}
 %files kpackage
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpackage
@@ -132,20 +148,52 @@ fi
 %{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
 %{_kde4_docdir}/HTML/en/kpackage/
 %{_kde4_iconsdir}/hicolor/*/*/kpackage*
+%endif
 
+%if 0%{?system_config_printer_kde}
 %files -n system-config-printer-kde
 %defattr(-,root,root,-)
-%{_kde4_bindir}/system-config-printer-kde
-%{_kde4_datadir}/applications/kde4/system-config-printer-kde.desktop
+%{_kde4_datadir}/kde4/services/system-config-printer-kde.desktop
 %{_kde4_appsdir}/system-config-printer-kde/
+%endif
 
 
 %changelog
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Tue Jul 28 2009 Than Ngo <than at redhat.com> - 4.2.98-5
+- don't include kpackage fo rhel
+
+* Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-4
+- don't include system_config_printer_kde for rhel
+
+* Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-3
+- fix knetworkconf backend to recognize fedora network settings
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.2.90-1
+- KDE 4.3 Beta 2
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- reenable sytem-config-printer-kde
+- rebase printing patch, drop hunks fixed upstream
+- BR python-devel instead of just python
+- fix file list, system-config-printer-kde is now a System Settings module
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - get rid of the dependency of system-config-printer
@@ -156,7 +204,7 @@ fi
 - fix #496646, system-config-printer-kde doesn't start
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
-- optimize scriptlets 
+- optimize scriptlets
 
 * Mon Mar 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-11/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	29 May 2009 13:39:29 -0000	1.63
+++ sources	5 Aug 2009 02:55:25 -0000	1.64
@@ -1 +1 @@
-d88c5a3819924f7f49f50365811a67c7  kdeadmin-4.2.4.tar.bz2
+4712ade616d3c3a987281d24326ee9af  kdeadmin-4.3.0.tar.bz2


--- kdeadmin-4.2.2-printing.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 02:55:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:55:25 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 kdeadmin-4.2.85-printing.patch, NONE,
	1.1 .cvsignore, 1.58, 1.59 kdeadmin.spec, 1.121, 1.122 sources,
	1.62, 1.63 kdeadmin-4.2.2-printing.patch, 1.1, NONE
Message-ID: <20090805025525.85ED611C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24050/F-10

Modified Files:
	.cvsignore kdeadmin.spec sources 
Added Files:
	kdeadmin-4.2.85-printing.patch 
Removed Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
kde-4.3.0


kdeadmin-4.2.85-printing.patch:
 CMakeLists.txt               |   28 ++----------
 debug.py                     |   55 ++++++++++++++++++++++++
 smburi.py                    |   95 +++++++++++++++++++++++++++++++++++++++++++
 system-config-printer-kde.py |    3 -
 4 files changed, 156 insertions(+), 25 deletions(-)

--- NEW FILE kdeadmin-4.2.85-printing.patch ---
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/CMakeLists.txt kdeadmin-4.2.85-printing/system-config-printer-kde/CMakeLists.txt
--- kdeadmin-4.2.85/system-config-printer-kde/CMakeLists.txt	2009-04-28 15:47:13.000000000 +0200
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/CMakeLists.txt	2009-05-20 16:00:15.000000000 +0200
@@ -5,29 +5,9 @@
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-macro_optional_find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/pyqt/" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-macro_optional_find_package(PyKDE4)
-IF(NOT PYKDE4_FOUND)
-    macro_log_feature(PYKDE_FOUND "PyKDE4" "PyKDE4 was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE4_FOUND)
-
-macro_optional_find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-macro_optional_find_package(SystemConfigPrinter)
-IF(NOT SYSTEMCONFIGPRINTER_FOUND)
-    macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
-ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
-    SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_SYSTEM_CONFIG_PRINTER)
     install( FILES
@@ -36,6 +16,8 @@
         system-config-printer-kde.py
         options.py
         optionwidgets.py
+        debug.py
+        smburi.py
         ipp-browse-dialog.ui
         smb-browse-dialog.ui
         DESTINATION ${DATA_INSTALL_DIR}/system-config-printer-kde )
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/debug.py kdeadmin-4.2.85-printing/system-config-printer-kde/debug.py
--- kdeadmin-4.2.85/system-config-printer-kde/debug.py	1970-01-01 01:00:00.000000000 +0100
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/debug.py	2009-05-20 15:57:50.000000000 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+## Copyright (C) 2008 Red Hat, Inc.
+## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys
+import traceback
+
+_debug=False
+def debugprint (x):
+    if _debug:
+        try:
+            print >>sys.stderr, x
+        except:
+            pass
+
+def get_debugging ():
+    return _debug
+
+def set_debugging (d):
+    global _debug
+    _debug = d
+
+def fatalException (exitcode=1):
+    nonfatalException (type="fatal", end="Exiting")
+    sys.exit (exitcode)
+
+def nonfatalException (type="non-fatal", end="Continuing anyway.."):
+    d = get_debugging ()
+    set_debugging (True)
+    debugprint ("Caught %s exception.  Traceback:" % type)
+    (type, value, tb) = sys.exc_info ()
+    tblast = traceback.extract_tb (tb, limit=None)
+    if len (tblast):
+        tblast = tblast[:len (tblast) - 1]
+    extxt = traceback.format_exception_only (type, value)
+    for line in traceback.format_tb(tb):
+        debugprint (line.strip ())
+    debugprint (extxt[0].strip ())
+    debugprint (end)
+    set_debugging (d)
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/smburi.py kdeadmin-4.2.85-printing/system-config-printer-kde/smburi.py
--- kdeadmin-4.2.85/system-config-printer-kde/smburi.py	1970-01-01 01:00:00.000000000 +0100
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/smburi.py	2009-05-20 15:57:50.000000000 +0200
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+## system-config-printer
+
+## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import urllib
+
+class SMBURI:
+    def __init__ (self,
+                  uri=None,
+                  group='', host='', share='', user='', password=''):
+        if uri:
+            if group or host or share or user or password:
+                raise RuntimeError
+
+            if uri.startswith ("smb://"):
+                uri = uri[6:]
+
+            self.uri = uri
+        else:
+            self.uri = self._construct (group, host, share,
+                                        user=user, password=password)
+
+    def _construct (self, group, host, share, user='', password=''):
+        uri_password = ''
+        if password:
+            uri_password = ':' + urllib.quote (password)
+        if user:
+            uri_password += '@'
+        uri = "%s%s%s" % (urllib.quote (user),
+                          uri_password,
+                          urllib.quote (group))
+        if len (group) > 0:
+            uri += '/'
+        uri += urllib.quote (host)
+        if len (share) > 0:
+            uri += "/" + urllib.quote (share)
+        return uri
+
+    def get_uri (self):
+        return self.uri
+
+    def sanitize_uri (self):
+        group, host, share, user, password = self.separate ()
+        return self._construct (group, host, share)
+
+    def separate (self):
+        uri = self.get_uri ()
+        user = ''
+        password = ''
+        auth = uri.find ('@')
+        if auth != -1:
+            u = uri[:auth].find(':')
+            if u != -1:
+                user = uri[:u]
+                password = uri[u + 1:auth]
+            else:
+                user = uri[:auth]
+            uri = uri[auth + 1:]
+        sep = uri.count ('/')
+        group = ''
+        if sep == 2:
+            g = uri.find('/')
+            group = uri[:g]
+            uri = uri[g + 1:]
+        if sep < 1:
+            host = ''
+        else:
+            h = uri.find('/')
+            host = uri[:h]
+            uri = uri[h + 1:]
+            p = host.find(':')
+            if p != -1:
+                host = host[:p]
+        share = uri
+        return (urllib.unquote (group), urllib.unquote (host),
+                urllib.unquote (share),
+                urllib.unquote (user), urllib.unquote (password))
diff -Nur kdeadmin-4.2.85/system-config-printer-kde/system-config-printer-kde.py kdeadmin-4.2.85-printing/system-config-printer-kde/system-config-printer-kde.py
--- kdeadmin-4.2.85/system-config-printer-kde/system-config-printer-kde.py	2009-04-15 12:26:27.000000000 +0200
+++ kdeadmin-4.2.85-printing/system-config-printer-kde/system-config-printer-kde.py	2009-05-20 16:05:17.000000000 +0200
@@ -34,7 +34,7 @@
 import sys, os, time, traceback, re, tempfile, httplib, thread
 
 #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
-SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
+SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/kde4/apps/system-config-printer-kde"
 if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
 
@@ -66,7 +66,6 @@
 cups.require ("1.9.27")
 
 # These come from system-config-printer
-import config
 import cupshelpers, options
 from optionwidgets import OptionWidget
 from smburi import SMBURI


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	29 May 2009 13:39:29 -0000	1.58
+++ .cvsignore	5 Aug 2009 02:55:24 -0000	1.59
@@ -1 +1,5 @@
-kdeadmin-4.2.4.tar.bz2
+kdeadmin-4.2.90.tar.bz2
+kdeadmin-4.2.95.tar.bz2
+kdeadmin-4.2.96.tar.bz2
+kdeadmin-4.2.98.tar.bz2
+kdeadmin-4.3.0.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- kdeadmin.spec	29 May 2009 13:39:29 -0000	1.121
+++ kdeadmin.spec	5 Aug 2009 02:55:25 -0000	1.122
@@ -1,26 +1,39 @@
+%if 0%{?fedora}
+%define system_config_printer_kde 1
+%define include_kpackage 1
+%endif
+
 Name:           kdeadmin
+Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
-Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:         kdeadmin-4.2.2-printing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam
 Source2:        kuser.pamd
 
+# FIXME/TODO: upstream this -- Rex
+Patch0:         kdeadmin-4.2.85-printing.patch
+
+# upstream patches
+
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python
+BuildRequires:  python-devel
 
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
+%if ! 0%{?system_config_printer_kde}
+Obsoletes: system-config-printer-kde < %{epoch}:%{version}-%{release}
+%endif
+
 %description
 The %{name} package includes administrative tools including:
 * kcron: systemsettings module for the cron task scheduler
@@ -39,9 +52,9 @@ packages, uninstalling them and installi
 It is based upon the "Smart Package Manager".
 
 %package -n system-config-printer-kde
-Summary: A printer administration tool for KDE 
+Summary: A printer administration tool for KDE
 Group: System Environment/Base
-Requires: PyKDE4 >= %{version}
+Requires: PyKDE4
 Requires: system-config-printer-libs
 %description -n system-config-printer-kde
 A printer administration tool for KDE that allows the user to configure
@@ -52,6 +65,8 @@ a CUPS print server.
 %setup -q
 %patch0 -p1 -b .printing
 
+# upstream patches
+
 %build
 
 mkdir -p %{_target_platform}
@@ -87,6 +102,7 @@ touch --no-create %{_kde4_iconsdir}/hico
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
+%if 0%{?include_kpackage}
 %post kpackage
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
@@ -98,8 +114,7 @@ if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
-
-
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -112,18 +127,19 @@ fi
 %{_kde4_datadir}/applications/kde4/kuser.desktop
 %{_kde4_datadir}/applications/kde4/ksystemlog.desktop
 %{_kde4_datadir}/config.kcfg/kuser.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/kcm_cron.desktop
+%{_kde4_datadir}/kde4/services/kcm_knetworkconfmodule.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kcron/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/knetworkconf.*
-%{_kde4_iconsdir}/hicolor/*/*/ksystemlog.*
 %{_kde4_iconsdir}/hicolor/*/*/kuser.*
 %{_kde4_iconsdir}/hicolor/*/*/network*
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
+%if 0%{?include_kpackage}
 %files kpackage
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpackage
@@ -132,20 +148,52 @@ fi
 %{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
 %{_kde4_docdir}/HTML/en/kpackage/
 %{_kde4_iconsdir}/hicolor/*/*/kpackage*
+%endif
 
+%if 0%{?system_config_printer_kde}
 %files -n system-config-printer-kde
 %defattr(-,root,root,-)
-%{_kde4_bindir}/system-config-printer-kde
-%{_kde4_datadir}/applications/kde4/system-config-printer-kde.desktop
+%{_kde4_datadir}/kde4/services/system-config-printer-kde.desktop
 %{_kde4_appsdir}/system-config-printer-kde/
+%endif
 
 
 %changelog
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Tue Jul 28 2009 Than Ngo <than at redhat.com> - 4.2.98-5
+- don't include kpackage fo rhel
+
+* Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-4
+- don't include system_config_printer_kde for rhel
+
+* Mon Jul 27 2009 Than Ngo <than at redhat.com> - 4.2.98-3
+- fix knetworkconf backend to recognize fedora network settings
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.2.90-1
+- KDE 4.3 Beta 2
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- reenable sytem-config-printer-kde
+- rebase printing patch, drop hunks fixed upstream
+- BR python-devel instead of just python
+- fix file list, system-config-printer-kde is now a System Settings module
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-4
 - get rid of the dependency of system-config-printer
@@ -156,7 +204,7 @@ fi
 - fix #496646, system-config-printer-kde doesn't start
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
-- optimize scriptlets 
+- optimize scriptlets
 
 * Mon Mar 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	29 May 2009 13:39:29 -0000	1.62
+++ sources	5 Aug 2009 02:55:25 -0000	1.63
@@ -1 +1 @@
-d88c5a3819924f7f49f50365811a67c7  kdeadmin-4.2.4.tar.bz2
+4712ade616d3c3a987281d24326ee9af  kdeadmin-4.3.0.tar.bz2


--- kdeadmin-4.2.2-printing.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 02:57:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:57:18 +0000 (UTC)
Subject: rpms/kdeartwork/F-11 .cvsignore, 1.60, 1.61 kdeartwork.spec, 1.107, 
	1.108 sources, 1.61, 1.62
Message-ID: <20090805025718.0533811C02BD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24618/F-11

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	29 May 2009 13:50:12 -0000	1.60
+++ .cvsignore	5 Aug 2009 02:57:17 -0000	1.61
@@ -1 +1,5 @@
-kdeartwork-4.2.4.tar.bz2
+kdeartwork-4.2.90.tar.bz2
+kdeartwork-4.2.95.tar.bz2
+kdeartwork-4.2.96.tar.bz2
+kdeartwork-4.2.98.tar.bz2
+kdeartwork-4.3.0.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-11/kdeartwork.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- kdeartwork.spec	29 May 2009 13:50:12 -0000	1.107
+++ kdeartwork.spec	5 Aug 2009 02:57:17 -0000	1.108
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
@@ -9,12 +9,6 @@ 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)
 
-# We currently don't ship crystalsvg from kdeartwork because the actions have
-# been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
-# and yet not yet useful for KDE 4.
-# TODO: Revisit this issue once the renaming is complete. -- Kevin
-#define include_crystalsvg 1
-
 BuildRequires:  eigen2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -27,35 +21,35 @@ Requires: %{name}-sounds = %{version}-%{
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
 
+%if ! 0%{?kdeclassic_icons}
+Obsoletes: kdeclassic-icon-theme < %{version}%{release}
+Obsoletes: kdeartwork-icons < 4.2.2-3
+%endif
+
 %description
 %{summary}, including additional styles, themes.
 
-%if 0%{?include_crystalsvg}
-%package -n crystalsvg-icon-theme
-Summary: The crystalsvg icon theme
+%package -n nuvola-icon-theme
+Summary: Nuvola icon theme
 Group: User Interface/Desktops
-Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
-Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description -n crystalsvg-icon-theme
-This package contains the crystalsvg icon theme.
-It was the standard theme in KDE3 and is needed for KDE3 applications.
-%endif
+%description -n nuvola-icon-theme
+%{summary}.
 
-%package -n kdeclassic-icon-theme 
-Summary: KDE classic icon theme 
+%package -n kdeclassic-icon-theme
+Summary: KDE classic icon theme
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons < 4.2.2-3
 Provides:  kdeartwork-icons = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description -n kdeclassic-icon-theme 
+%description -n kdeclassic-icon-theme
 %{summary}.
 
-%package screensavers 
+%package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
 Obsoletes: kdeartwork-extras < 4.2.2-3
@@ -63,7 +57,7 @@ Provides:  kdeartwork-extras = %{version
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
-%description screensavers 
+%description screensavers
 %{summary}.
 
 %package kxs
@@ -122,30 +116,31 @@ rm -rf %{buildroot}%{_kde4_iconsdir}/cry
 rm -rf %{buildroot}
 
 
-%post -n kdeclassic-icon-theme 
+%if 0%{?kdeclassic_icons}
+%post -n kdeclassic-icon-theme
 touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
 %posttrans -n kdeclassic-icon-theme
 gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
-%postun -n kdeclassic-icon-theme 
+%postun -n kdeclassic-icon-theme
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 fi
+%endif
 
-%if 0%{?include_crystalsvg}
-%post -n crystalsvg-icon-theme
-touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+%post -n nuvola-icon-theme
+touch --no-create %{_kde4_iconsdir}/nuvola &> /dev/null || :
 
-%posttrans -n crystalsvg-icon-theme
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+%posttrans -n nuvola-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/nuvola-icon-theme &> /dev/null || :
 
-%postun -n crystalsvg-icon-theme
+%postun -n nuvola-icon-theme
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/nuvola &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/nuvola &> /dev/null || :
+fi
 
 
 %files
@@ -158,22 +153,22 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
+%if 0%{?kdeclassic_icons}
+%files -n kdeclassic-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
+%{_kde4_iconsdir}/kdeclassic/
 %endif
 
-%files -n kdeclassic-icon-theme 
+%files -n nuvola-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_iconsdir}/nuvola/
 
 %files kxs
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
 
-%files screensavers 
+%files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
@@ -190,11 +185,23 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3.rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.90-1
+- KDE 4.3 Beta 2
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-11/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	29 May 2009 13:50:12 -0000	1.61
+++ sources	5 Aug 2009 02:57:17 -0000	1.62
@@ -1 +1 @@
-4b328ee82c0ee47cb21c5d6d6aa87409  kdeartwork-4.2.4.tar.bz2
+3e7872e841e87f716872086571028a37  kdeartwork-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 02:57:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 02:57:17 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 .cvsignore, 1.54, 1.55 kdeartwork.spec, 1.99, 
	1.100 sources, 1.59, 1.60
Message-ID: <20090805025717.C9FCD11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24618/F-10

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	29 May 2009 13:50:12 -0000	1.54
+++ .cvsignore	5 Aug 2009 02:57:17 -0000	1.55
@@ -1 +1,5 @@
-kdeartwork-4.2.4.tar.bz2
+kdeartwork-4.2.90.tar.bz2
+kdeartwork-4.2.95.tar.bz2
+kdeartwork-4.2.96.tar.bz2
+kdeartwork-4.2.98.tar.bz2
+kdeartwork-4.3.0.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- kdeartwork.spec	29 May 2009 13:50:12 -0000	1.99
+++ kdeartwork.spec	5 Aug 2009 02:57:17 -0000	1.100
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
@@ -9,12 +9,6 @@ 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)
 
-# We currently don't ship crystalsvg from kdeartwork because the actions have
-# been partially renamed to KDE 4 names, making the theme useless for KDE 3 apps
-# and yet not yet useful for KDE 4.
-# TODO: Revisit this issue once the renaming is complete. -- Kevin
-#define include_crystalsvg 1
-
 BuildRequires:  eigen2-devel
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -27,35 +21,35 @@ Requires: %{name}-sounds = %{version}-%{
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
 
+%if ! 0%{?kdeclassic_icons}
+Obsoletes: kdeclassic-icon-theme < %{version}%{release}
+Obsoletes: kdeartwork-icons < 4.2.2-3
+%endif
+
 %description
 %{summary}, including additional styles, themes.
 
-%if 0%{?include_crystalsvg}
-%package -n crystalsvg-icon-theme
-Summary: The crystalsvg icon theme
+%package -n nuvola-icon-theme
+Summary: Nuvola icon theme
 Group: User Interface/Desktops
-Obsoletes: kdeartwork-icons-crystalsvg < %{version}-%{release}
-Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description -n crystalsvg-icon-theme
-This package contains the crystalsvg icon theme.
-It was the standard theme in KDE3 and is needed for KDE3 applications.
-%endif
+%description -n nuvola-icon-theme
+%{summary}.
 
-%package -n kdeclassic-icon-theme 
-Summary: KDE classic icon theme 
+%package -n kdeclassic-icon-theme
+Summary: KDE classic icon theme
 Group: User Interface/Desktops
 Obsoletes: kdeartwork-icons < 4.2.2-3
 Provides:  kdeartwork-icons = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description -n kdeclassic-icon-theme 
+%description -n kdeclassic-icon-theme
 %{summary}.
 
-%package screensavers 
+%package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
 Obsoletes: kdeartwork-extras < 4.2.2-3
@@ -63,7 +57,7 @@ Provides:  kdeartwork-extras = %{version
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
 Requires:      xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
-%description screensavers 
+%description screensavers
 %{summary}.
 
 %package kxs
@@ -122,30 +116,31 @@ rm -rf %{buildroot}%{_kde4_iconsdir}/cry
 rm -rf %{buildroot}
 
 
-%post -n kdeclassic-icon-theme 
+%if 0%{?kdeclassic_icons}
+%post -n kdeclassic-icon-theme
 touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
 %posttrans -n kdeclassic-icon-theme
 gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 
-%postun -n kdeclassic-icon-theme 
+%postun -n kdeclassic-icon-theme
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
 fi
+%endif
 
-%if 0%{?include_crystalsvg}
-%post -n crystalsvg-icon-theme
-touch --no-create %{_kde4_iconsdir}/kdeclassic &> /dev/null || :
+%post -n nuvola-icon-theme
+touch --no-create %{_kde4_iconsdir}/nuvola &> /dev/null || :
 
-%posttrans -n crystalsvg-icon-theme
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+%posttrans -n nuvola-icon-theme
+gtk-update-icon-cache %{_kde4_iconsdir}/nuvola-icon-theme &> /dev/null || :
 
-%postun -n crystalsvg-icon-theme
+%postun -n nuvola-icon-theme
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-%endif
+touch --no-create %{_kde4_iconsdir}/nuvola &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/nuvola &> /dev/null || :
+fi
 
 
 %files
@@ -158,22 +153,22 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/styles/*.so
 
-%if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme
+%if 0%{?kdeclassic_icons}
+%files -n kdeclassic-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/crystalsvg/
+%{_kde4_iconsdir}/kdeclassic/
 %endif
 
-%files -n kdeclassic-icon-theme 
+%files -n nuvola-icon-theme
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/kdeclassic/
+%{_kde4_iconsdir}/nuvola/
 
 %files kxs
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
 
-%files screensavers 
+%files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
@@ -190,11 +185,23 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
-* Fri May 29 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Tue Jul 21 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3.rc2
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.90-1
+- KDE 4.3 Beta 2
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	29 May 2009 13:50:12 -0000	1.59
+++ sources	5 Aug 2009 02:57:17 -0000	1.60
@@ -1 +1 @@
-4b328ee82c0ee47cb21c5d6d6aa87409  kdeartwork-4.2.4.tar.bz2
+3e7872e841e87f716872086571028a37  kdeartwork-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 03:07:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 03:07:59 +0000 (UTC)
Subject: rpms/gtkmathview/devel gtkmathview.spec,1.14,1.15
Message-ID: <20090805030759.9C27011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gtkmathview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27700

Modified Files:
	gtkmathview.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-5
- add lyx-fonts/mathml-fonts dep



Index: gtkmathview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gtkmathview.spec	25 Jul 2009 01:45:39 -0000	1.14
+++ gtkmathview.spec	5 Aug 2009 03:07:59 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
 Version: 0.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Libraries
 License: LGPLv3+
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -19,6 +19,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0: gtkmathview-0.8.0-gcc43.patch
 Patch1: gtkmathview-0.8.0-includes.patch
 
+# these are currently f12+ only, but will propogate back to earlier
+# branches soonish -- Rex
+%if 0%{?fedora} > 11
+Requires: lyx-cmex10-fonts
+Requires: lyx-cmmi10-fonts
+Requires: lyx-cmr10-fonts
+Requires: lyx-cmsy10-fonts
+%else
+Requires: mathml-fonts
+%endif
+
 %description
 GtkMathView is a C++ rendering engine for MathML documents. 
 It provides an interactive view that can be used for browsing 
@@ -86,6 +97,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/ma
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-5
+- add lyx-fonts/mathml-fonts dep
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Aug  5 03:10:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 03:10:28 +0000 (UTC)
Subject: rpms/abiword/devel abiword.spec,1.90,1.91
Message-ID: <20090805031028.B0F8011C0427@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28291

Modified Files:
	abiword.spec 
Log Message:
* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.7.8-2
- drop Req: mathml-fonts (dep moved to gtkmathview)



Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- abiword.spec	2 Aug 2009 14:15:54 -0000	1.90
+++ abiword.spec	5 Aug 2009 03:10:28 -0000	1.91
@@ -45,7 +45,6 @@ BuildRequires: boost-devel, t1lib-devel
 %if %{olpc_build}
 BuildRequires: dbus-glib-devel >= 0.70
 %else
-Requires: mathml-fonts
 Requires: link-grammar >= 4.2.2
 BuildRequires: readline-devel
 BuildRequires: bzip2-devel
@@ -179,6 +178,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.7.8-2
+- drop Req: mathml-fonts (dep moved to gtkmathview)
+
 * Sun Aug 02 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.8-1
 - New upstream version
 



From rdieter at fedoraproject.org  Wed Aug  5 03:10:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 03:10:55 +0000 (UTC)
Subject: rpms/abiword/devel abiword.spec,1.91,1.92
Message-ID: <20090805031055.AC7AB11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28417

Modified Files:
	abiword.spec 
Log Message:
oops, Release++



Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- abiword.spec	5 Aug 2009 03:10:28 -0000	1.91
+++ abiword.spec	5 Aug 2009 03:10:55 -0000	1.92
@@ -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+



From rdieter at fedoraproject.org  Wed Aug  5 03:15:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 03:15:06 +0000 (UTC)
Subject: rpms/koffice/F-11 koffice.spec,1.106,1.107
Message-ID: <20090805031506.99F3811C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29308

Modified Files:
	koffice.spec 
Log Message:
Req: lyx-cmex10-fonts



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-11/koffice.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- koffice.spec	29 Jul 2009 14:28:18 -0000	1.106
+++ koffice.spec	5 Aug 2009 03:15:06 -0000	1.107
@@ -232,8 +232,11 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-# for cmex10
+%if 0%{?fedora} > 11
+Requires:       lyx-cmex10-fonts
+%else
 Requires:       mathml-fonts
+%endif
 %if 0%{?fedora} > 10
 Requires:       dejavu-lgc-sans-fonts
 %else



From corsepiu at fedoraproject.org  Wed Aug  5 03:15:33 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 03:15:33 +0000 (UTC)
Subject: rpms/perl-Gtk2-GladeXML/devel perl-Gtk2-GladeXML.spec,1.9,1.10
Message-ID: <20090805031533.E63CE11C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Gtk2-GladeXML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29460

Modified Files:
	perl-Gtk2-GladeXML.spec 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.007-4
- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).



Index: perl-Gtk2-GladeXML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-GladeXML/devel/perl-Gtk2-GladeXML.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gtk2-GladeXML.spec	26 Jul 2009 06:21:37 -0000	1.9
+++ perl-Gtk2-GladeXML.spec	5 Aug 2009 03:15:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-GladeXML
 Version:        1.007
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Create user interfaces directly from Glade XML files
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(ExtUtils::Depends) >= 0.300
 BuildRequires:  perl(ExtUtils::PkgConfig)
 BuildRequires:  perl(Glib)
+BuildRequires:  perl(Glib::MakeHelper)
 BuildRequires:  perl(Gtk2)
 
 %description
@@ -74,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.007-4
+- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.007-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From praveenp at fedoraproject.org  Wed Aug  5 03:34:06 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  5 Aug 2009 03:34:06 +0000 (UTC)
Subject: rpms/sblim-indication_helper/devel import.log, NONE,
	1.1 sblim-indication_helper-0.4.2_warnings.patch, NONE,
	1.1 sblim-indication_helper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805033407.0481811C00E4@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-indication_helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv777/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-indication_helper-0.4.2_warnings.patch 
	sblim-indication_helper.spec 
Log Message:
Package checked in for build



--- NEW FILE import.log ---
sblim-indication_helper-0_4_2-3_fc10:HEAD:sblim-indication_helper-0.4.2-3.fc10.src.rpm:1249443204

sblim-indication_helper-0.4.2_warnings.patch:
 ind_helper.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sblim-indication_helper-0.4.2_warnings.patch ---
Index: ind_helper.c
===================================================================
--- ind_helper.c.orig
+++ ind_helper.c
@@ -19,6 +19,7 @@
 #include <config.h>
 #include <cmpimacs.h>
 
+#include <stdint.h>
 #include <pthread.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -1287,7 +1288,7 @@
   pthread_detach (thread_id);
   IND_HLP_DEBUG ("_worker exited.");
 
-  pthread_exit ((void *) rc);
+  pthread_exit ((void *)(intptr_t) rc);
 }
 
 /**


--- NEW FILE sblim-indication_helper.spec ---
Name:		sblim-indication_helper
Version:	0.4.2
Release:	3%{?dist}
Summary:	Toolkit for CMPI indication providers

Group:		Development/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)
Patch0:		sblim-indication_helper-0.4.2_warnings.patch
BuildRequires:	sblim-cmpi-devel 

%description
This package contains a developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and, if it changes, a CMPI indication is set with the values of the
indication class properties (also set by the developer).

%Package	devel
Summary:	Toolkit for CMPI indication providers (Development Files)
Requires:	%{name} = %{version}-%{release} sblim-cmpi-devel glibc-devel
Group:		Development/Libraries


%description devel
This package contain developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and if they change an CMPI indication is set with the values of the
indication class properties (also set by the developer).

This package holds the development files for sblim-indication_helper.


%prep
%setup -q
%patch0


%build
%configure --disable-static --with-pic
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm %{buildroot}/%{_libdir}/libind_helper.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_libdir}/libind_helper.so.*



%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim
%{_libdir}/libind_helper.so
%doc COPYING


%changelog
* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> 0.4.2-3
- fixed the rpmlint message. Removed Requries for glibc-devel.
* Tue Jun 30 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-1
- Standardized the spec file and changed the build number to 1 
* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 0.4.2-134
- update for Fedora packaging guidelines
* Fri May 30 2008 npaxton at novell.com
- Change openwbem-devel dependency to sblim-cmpi-devel, to be
  cimom neutral
* Wed Feb 27 2008 crrodriguez at suse.de
- fix library-without-ldconfig* errors
- disable static libraries
* Wed Mar 01 2006 mrueckert at suse.de
- update to 0.4.2
  ind_helper.c, ind_helper.h:
  Bugs: 1203849 (side effect) made a lot of function arguments
  const in order to remove the cmpi-base warnings.
  added sblim-indication_helper-0.4.2_warnings.patch
  fixes a small warning regarding pointer size
* Wed Jan 25 2006 mls at suse.de
- created the package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 03:34:06 -0000	1.2
@@ -0,0 +1 @@
+sblim-indication_helper-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:29:27 -0000	1.1
+++ sources	5 Aug 2009 03:34:06 -0000	1.2
@@ -0,0 +1 @@
+10eaea3af8ab3d3b7463098d23bb5779  sblim-indication_helper-0.4.2.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug  5 03:34:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 03:34:16 +0000
Subject: [pkgdb] kernel: sa4sa has requested watchcommits
Message-ID: <20090805033417.3569D10F88F@bastion2.fedora.phx.redhat.com>

sa4sa has requested the watchcommits acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Aug  5 03:34:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 03:34:46 +0000
Subject: [pkgdb] kernel: sa4sa has requested watchbugzilla
Message-ID: <20090805033449.936C810F865@bastion2.fedora.phx.redhat.com>

sa4sa has requested the watchbugzilla acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Aug  5 03:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 03:34:51 +0000
Subject: [pkgdb] kernel: sa4sa has given up watchbugzilla
Message-ID: <20090805033451.F32A510F8AC@bastion2.fedora.phx.redhat.com>

sa4sa has given up the watchbugzilla acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Aug  5 03:34:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 03:34:55 +0000
Subject: [pkgdb] kernel: sa4sa has requested watchbugzilla
Message-ID: <20090805033455.5161810F8B5@bastion2.fedora.phx.redhat.com>

sa4sa has requested the watchbugzilla acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From praveenp at fedoraproject.org  Wed Aug  5 03:40:39 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  5 Aug 2009 03:40:39 +0000 (UTC)
Subject: rpms/sblim-indication_helper/F-11 import.log, NONE,
	1.1 sblim-indication_helper-0.4.2_warnings.patch, NONE,
	1.1 sblim-indication_helper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805034039.BBB8F11C00E4@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-indication_helper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3324/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-indication_helper-0.4.2_warnings.patch 
	sblim-indication_helper.spec 
Log Message:
package added to F-11 branch



--- NEW FILE import.log ---
sblim-indication_helper-0_4_2-3_fc10:F-11:sblim-indication_helper-0.4.2-3.fc10.src.rpm:1249443573

sblim-indication_helper-0.4.2_warnings.patch:
 ind_helper.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sblim-indication_helper-0.4.2_warnings.patch ---
Index: ind_helper.c
===================================================================
--- ind_helper.c.orig
+++ ind_helper.c
@@ -19,6 +19,7 @@
 #include <config.h>
 #include <cmpimacs.h>
 
+#include <stdint.h>
 #include <pthread.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -1287,7 +1288,7 @@
   pthread_detach (thread_id);
   IND_HLP_DEBUG ("_worker exited.");
 
-  pthread_exit ((void *) rc);
+  pthread_exit ((void *)(intptr_t) rc);
 }
 
 /**


--- NEW FILE sblim-indication_helper.spec ---
Name:		sblim-indication_helper
Version:	0.4.2
Release:	3%{?dist}
Summary:	Toolkit for CMPI indication providers

Group:		Development/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)
Patch0:		sblim-indication_helper-0.4.2_warnings.patch
BuildRequires:	sblim-cmpi-devel 

%description
This package contains a developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and, if it changes, a CMPI indication is set with the values of the
indication class properties (also set by the developer).

%Package	devel
Summary:	Toolkit for CMPI indication providers (Development Files)
Requires:	%{name} = %{version}-%{release} sblim-cmpi-devel glibc-devel
Group:		Development/Libraries


%description devel
This package contain developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and if they change an CMPI indication is set with the values of the
indication class properties (also set by the developer).

This package holds the development files for sblim-indication_helper.


%prep
%setup -q
%patch0


%build
%configure --disable-static --with-pic
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm %{buildroot}/%{_libdir}/libind_helper.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_libdir}/libind_helper.so.*



%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim
%{_libdir}/libind_helper.so
%doc COPYING


%changelog
* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> 0.4.2-3
- fixed the rpmlint message. Removed Requries for glibc-devel.
* Tue Jun 30 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-1
- Standardized the spec file and changed the build number to 1 
* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 0.4.2-134
- update for Fedora packaging guidelines
* Fri May 30 2008 npaxton at novell.com
- Change openwbem-devel dependency to sblim-cmpi-devel, to be
  cimom neutral
* Wed Feb 27 2008 crrodriguez at suse.de
- fix library-without-ldconfig* errors
- disable static libraries
* Wed Mar 01 2006 mrueckert at suse.de
- update to 0.4.2
  ind_helper.c, ind_helper.h:
  Bugs: 1203849 (side effect) made a lot of function arguments
  const in order to remove the cmpi-base warnings.
  added sblim-indication_helper-0.4.2_warnings.patch
  fixes a small warning regarding pointer size
* Wed Jan 25 2006 mls at suse.de
- created the package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 03:40:39 -0000	1.2
@@ -0,0 +1 @@
+sblim-indication_helper-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:29:27 -0000	1.1
+++ sources	5 Aug 2009 03:40:39 -0000	1.2
@@ -0,0 +1 @@
+10eaea3af8ab3d3b7463098d23bb5779  sblim-indication_helper-0.4.2.tar.bz2



From praveenp at fedoraproject.org  Wed Aug  5 03:41:38 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  5 Aug 2009 03:41:38 +0000 (UTC)
Subject: rpms/sblim-indication_helper/F-10 import.log, NONE,
	1.1 sblim-indication_helper-0.4.2_warnings.patch, NONE,
	1.1 sblim-indication_helper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805034138.8755B11C00E4@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-indication_helper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3925/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-indication_helper-0.4.2_warnings.patch 
	sblim-indication_helper.spec 
Log Message:
package added to F-10 branch



--- NEW FILE import.log ---
sblim-indication_helper-0_4_2-3_fc10:F-10:sblim-indication_helper-0.4.2-3.fc10.src.rpm:1249443685

sblim-indication_helper-0.4.2_warnings.patch:
 ind_helper.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sblim-indication_helper-0.4.2_warnings.patch ---
Index: ind_helper.c
===================================================================
--- ind_helper.c.orig
+++ ind_helper.c
@@ -19,6 +19,7 @@
 #include <config.h>
 #include <cmpimacs.h>
 
+#include <stdint.h>
 #include <pthread.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -1287,7 +1288,7 @@
   pthread_detach (thread_id);
   IND_HLP_DEBUG ("_worker exited.");
 
-  pthread_exit ((void *) rc);
+  pthread_exit ((void *)(intptr_t) rc);
 }
 
 /**


--- NEW FILE sblim-indication_helper.spec ---
Name:		sblim-indication_helper
Version:	0.4.2
Release:	3%{?dist}
Summary:	Toolkit for CMPI indication providers

Group:		Development/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)
Patch0:		sblim-indication_helper-0.4.2_warnings.patch
BuildRequires:	sblim-cmpi-devel 

%description
This package contains a developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and, if it changes, a CMPI indication is set with the values of the
indication class properties (also set by the developer).

%Package	devel
Summary:	Toolkit for CMPI indication providers (Development Files)
Requires:	%{name} = %{version}-%{release} sblim-cmpi-devel glibc-devel
Group:		Development/Libraries


%description devel
This package contain developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and if they change an CMPI indication is set with the values of the
indication class properties (also set by the developer).

This package holds the development files for sblim-indication_helper.


%prep
%setup -q
%patch0


%build
%configure --disable-static --with-pic
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm %{buildroot}/%{_libdir}/libind_helper.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_libdir}/libind_helper.so.*



%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim
%{_libdir}/libind_helper.so
%doc COPYING


%changelog
* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> 0.4.2-3
- fixed the rpmlint message. Removed Requries for glibc-devel.
* Tue Jun 30 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-1
- Standardized the spec file and changed the build number to 1 
* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 0.4.2-134
- update for Fedora packaging guidelines
* Fri May 30 2008 npaxton at novell.com
- Change openwbem-devel dependency to sblim-cmpi-devel, to be
  cimom neutral
* Wed Feb 27 2008 crrodriguez at suse.de
- fix library-without-ldconfig* errors
- disable static libraries
* Wed Mar 01 2006 mrueckert at suse.de
- update to 0.4.2
  ind_helper.c, ind_helper.h:
  Bugs: 1203849 (side effect) made a lot of function arguments
  const in order to remove the cmpi-base warnings.
  added sblim-indication_helper-0.4.2_warnings.patch
  fixes a small warning regarding pointer size
* Wed Jan 25 2006 mls at suse.de
- created the package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 03:41:38 -0000	1.2
@@ -0,0 +1 @@
+sblim-indication_helper-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:29:27 -0000	1.1
+++ sources	5 Aug 2009 03:41:38 -0000	1.2
@@ -0,0 +1 @@
+10eaea3af8ab3d3b7463098d23bb5779  sblim-indication_helper-0.4.2.tar.bz2



From praveenp at fedoraproject.org  Wed Aug  5 03:42:57 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  5 Aug 2009 03:42:57 +0000 (UTC)
Subject: rpms/sblim-indication_helper/EL-5 import.log, NONE,
	1.1 sblim-indication_helper-0.4.2_warnings.patch, NONE,
	1.1 sblim-indication_helper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805034257.A1EF811C00E4@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-indication_helper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4589/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-indication_helper-0.4.2_warnings.patch 
	sblim-indication_helper.spec 
Log Message:
package added to EL-5 branch



--- NEW FILE import.log ---
sblim-indication_helper-0_4_2-3_fc10:EL-5:sblim-indication_helper-0.4.2-3.fc10.src.rpm:1249443740

sblim-indication_helper-0.4.2_warnings.patch:
 ind_helper.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sblim-indication_helper-0.4.2_warnings.patch ---
Index: ind_helper.c
===================================================================
--- ind_helper.c.orig
+++ ind_helper.c
@@ -19,6 +19,7 @@
 #include <config.h>
 #include <cmpimacs.h>
 
+#include <stdint.h>
 #include <pthread.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -1287,7 +1288,7 @@
   pthread_detach (thread_id);
   IND_HLP_DEBUG ("_worker exited.");
 
-  pthread_exit ((void *) rc);
+  pthread_exit ((void *)(intptr_t) rc);
 }
 
 /**


--- NEW FILE sblim-indication_helper.spec ---
Name:		sblim-indication_helper
Version:	0.4.2
Release:	3%{?dist}
Summary:	Toolkit for CMPI indication providers

Group:		Development/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)
Patch0:		sblim-indication_helper-0.4.2_warnings.patch
BuildRequires:	sblim-cmpi-devel 

%description
This package contains a developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and, if it changes, a CMPI indication is set with the values of the
indication class properties (also set by the developer).

%Package	devel
Summary:	Toolkit for CMPI indication providers (Development Files)
Requires:	%{name} = %{version}-%{release} sblim-cmpi-devel glibc-devel
Group:		Development/Libraries


%description devel
This package contain developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and if they change an CMPI indication is set with the values of the
indication class properties (also set by the developer).

This package holds the development files for sblim-indication_helper.


%prep
%setup -q
%patch0


%build
%configure --disable-static --with-pic
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm %{buildroot}/%{_libdir}/libind_helper.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_libdir}/libind_helper.so.*



%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim
%{_libdir}/libind_helper.so
%doc COPYING


%changelog
* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> 0.4.2-3
- fixed the rpmlint message. Removed Requries for glibc-devel.
* Tue Jun 30 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-1
- Standardized the spec file and changed the build number to 1 
* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 0.4.2-134
- update for Fedora packaging guidelines
* Fri May 30 2008 npaxton at novell.com
- Change openwbem-devel dependency to sblim-cmpi-devel, to be
  cimom neutral
* Wed Feb 27 2008 crrodriguez at suse.de
- fix library-without-ldconfig* errors
- disable static libraries
* Wed Mar 01 2006 mrueckert at suse.de
- update to 0.4.2
  ind_helper.c, ind_helper.h:
  Bugs: 1203849 (side effect) made a lot of function arguments
  const in order to remove the cmpi-base warnings.
  added sblim-indication_helper-0.4.2_warnings.patch
  fixes a small warning regarding pointer size
* Wed Jan 25 2006 mls at suse.de
- created the package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 03:42:57 -0000	1.2
@@ -0,0 +1 @@
+sblim-indication_helper-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:29:27 -0000	1.1
+++ sources	5 Aug 2009 03:42:57 -0000	1.2
@@ -0,0 +1 @@
+10eaea3af8ab3d3b7463098d23bb5779  sblim-indication_helper-0.4.2.tar.bz2



From praveenp at fedoraproject.org  Wed Aug  5 03:43:54 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  5 Aug 2009 03:43:54 +0000 (UTC)
Subject: rpms/sblim-indication_helper/EL-4 import.log, NONE,
	1.1 sblim-indication_helper-0.4.2_warnings.patch, NONE,
	1.1 sblim-indication_helper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805034354.9B9EC11C00E4@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-indication_helper/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4989/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-indication_helper-0.4.2_warnings.patch 
	sblim-indication_helper.spec 
Log Message:
package added to El-4 branch



--- NEW FILE import.log ---
sblim-indication_helper-0_4_2-3_fc10:EL-4:sblim-indication_helper-0.4.2-3.fc10.src.rpm:1249443823

sblim-indication_helper-0.4.2_warnings.patch:
 ind_helper.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sblim-indication_helper-0.4.2_warnings.patch ---
Index: ind_helper.c
===================================================================
--- ind_helper.c.orig
+++ ind_helper.c
@@ -19,6 +19,7 @@
 #include <config.h>
 #include <cmpimacs.h>
 
+#include <stdint.h>
 #include <pthread.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -1287,7 +1288,7 @@
   pthread_detach (thread_id);
   IND_HLP_DEBUG ("_worker exited.");
 
-  pthread_exit ((void *) rc);
+  pthread_exit ((void *)(intptr_t) rc);
 }
 
 /**


--- NEW FILE sblim-indication_helper.spec ---
Name:		sblim-indication_helper
Version:	0.4.2
Release:	3%{?dist}
Summary:	Toolkit for CMPI indication providers

Group:		Development/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)
Patch0:		sblim-indication_helper-0.4.2_warnings.patch
BuildRequires:	sblim-cmpi-devel 

%description
This package contains a developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and, if it changes, a CMPI indication is set with the values of the
indication class properties (also set by the developer).

%Package	devel
Summary:	Toolkit for CMPI indication providers (Development Files)
Requires:	%{name} = %{version}-%{release} sblim-cmpi-devel glibc-devel
Group:		Development/Libraries


%description devel
This package contain developer library for helping out when writing
CMPI providers. This library polls the registered functions for data
and if they change an CMPI indication is set with the values of the
indication class properties (also set by the developer).

This package holds the development files for sblim-indication_helper.


%prep
%setup -q
%patch0


%build
%configure --disable-static --with-pic
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm %{buildroot}/%{_libdir}/libind_helper.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_libdir}/libind_helper.so.*



%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim
%{_libdir}/libind_helper.so
%doc COPYING


%changelog
* Fri Jul 31 2009 Praveen K Paladugu <praveen_paladugu at dell.com> 0.4.2-3
- fixed the rpmlint message. Removed Requries for glibc-devel.
* Tue Jun 30 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.4.2-1
- Standardized the spec file and changed the build number to 1 
* Thu Oct 23 2008 Matt Domsch <Matt_Domsch at dell.com> - 0.4.2-134
- update for Fedora packaging guidelines
* Fri May 30 2008 npaxton at novell.com
- Change openwbem-devel dependency to sblim-cmpi-devel, to be
  cimom neutral
* Wed Feb 27 2008 crrodriguez at suse.de
- fix library-without-ldconfig* errors
- disable static libraries
* Wed Mar 01 2006 mrueckert at suse.de
- update to 0.4.2
  ind_helper.c, ind_helper.h:
  Bugs: 1203849 (side effect) made a lot of function arguments
  const in order to remove the cmpi-base warnings.
  added sblim-indication_helper-0.4.2_warnings.patch
  fixes a small warning regarding pointer size
* Wed Jan 25 2006 mls at suse.de
- created the package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 03:43:54 -0000	1.2
@@ -0,0 +1 @@
+sblim-indication_helper-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-indication_helper/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:29:27 -0000	1.1
+++ sources	5 Aug 2009 03:43:54 -0000	1.2
@@ -0,0 +1 @@
+10eaea3af8ab3d3b7463098d23bb5779  sblim-indication_helper-0.4.2.tar.bz2



From jistone at fedoraproject.org  Wed Aug  5 03:44:50 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 03:44:50 +0000 (UTC)
Subject: rpms/systemtap/devel .cvsignore, 1.18, 1.19 sources, 1.31,
	1.32 systemtap.spec, 1.48, 1.49
Message-ID: <20090805034450.5689911C00E4@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5356

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	12 Jun 2009 00:34:05 -0000	1.18
+++ .cvsignore	5 Aug 2009 03:44:50 -0000	1.19
@@ -1 +1 @@
-systemtap-0.9.8.tar.gz
+systemtap-0.9.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Jun 2009 00:34:05 -0000	1.31
+++ sources	5 Aug 2009 03:44:50 -0000	1.32
@@ -1 +1 @@
-42128f0d5a92cc23b1565b829fed3b6f  systemtap-0.9.8.tar.gz
+cbbaff9833bc8ab58dea4f8c4dc9a77d  systemtap-0.9.9.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- systemtap.spec	27 Jul 2009 05:27:14 -0000	1.48
+++ systemtap.spec	5 Aug 2009 03:44:50 -0000	1.49
@@ -5,11 +5,11 @@
 %{!?with_bundled_elfutils: %define with_bundled_elfutils 0}
 %{!?elfutils_version: %define elfutils_version 0.127}
 %{!?pie_supported: %define pie_supported 1}
-%{!?with_grapher: %define with_grapher 0}
+%{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.8
-Release: 2%{?dist}
+Version: 0.9.9
+Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -57,6 +57,10 @@ BuildRequires: /usr/bin/latex /usr/bin/d
 BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 %endif
 
+%if %{with_grapher}
+BuildRequires: gtkmm24-devel >= 2.8
+%endif
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -80,7 +84,7 @@ Summary: Instrumentation System Testsuit
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -131,6 +135,19 @@ Requires: systemtap-runtime, initscripts
 %description initscript
 Initscript for Systemtap scripts.
 
+%if %{with_grapher}
+%package grapher
+Summary: Instrumentation System Grapher
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap-runtime
+
+%description grapher
+SystemTap grapher is a utility for real-time visualization of
+data from SystemTap instrumentation scripts.
+%endif
+
 %prep
 %setup -q %{?setup_elfutils}
 
@@ -265,10 +282,12 @@ exit 0
 %post
 # Remove any previously-built uprobes.ko materials
 (make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
 
 %preun
 # Ditto
 (make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
 
 %files
 %defattr(-,root,root)
@@ -354,10 +373,16 @@ exit 0
 %dir %{_localstatedir}/run/systemtap
 %doc initscript/README.initscript
 
+%if %{with_grapher}
+%files grapher
+%defattr(-,root,root)
+%{_bindir}/stapgraph
+%endif
+
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
+- Upstream release.
 
 * Thu Jun 11 2009 Josh Stone <jistone at redhat.com> - 0.9.8-1
 - Upstream release.



From jistone at fedoraproject.org  Wed Aug  5 03:45:08 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 03:45:08 +0000 (UTC)
Subject: rpms/systemtap/F-11 .cvsignore, 1.18, 1.19 sources, 1.31,
	1.32 systemtap.spec, 1.47, 1.48
Message-ID: <20090805034508.C002511C00E4@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5512

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	12 Jun 2009 00:35:21 -0000	1.18
+++ .cvsignore	5 Aug 2009 03:45:08 -0000	1.19
@@ -1 +1 @@
-systemtap-0.9.8.tar.gz
+systemtap-0.9.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Jun 2009 00:35:21 -0000	1.31
+++ sources	5 Aug 2009 03:45:08 -0000	1.32
@@ -1 +1 @@
-42128f0d5a92cc23b1565b829fed3b6f  systemtap-0.9.8.tar.gz
+cbbaff9833bc8ab58dea4f8c4dc9a77d  systemtap-0.9.9.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/systemtap.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- systemtap.spec	12 Jun 2009 00:35:21 -0000	1.47
+++ systemtap.spec	5 Aug 2009 03:45:08 -0000	1.48
@@ -5,10 +5,10 @@
 %{!?with_bundled_elfutils: %define with_bundled_elfutils 0}
 %{!?elfutils_version: %define elfutils_version 0.127}
 %{!?pie_supported: %define pie_supported 1}
-%{!?with_grapher: %define with_grapher 0}
+%{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -57,6 +57,10 @@ BuildRequires: /usr/bin/latex /usr/bin/d
 BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 %endif
 
+%if %{with_grapher}
+BuildRequires: gtkmm24-devel >= 2.8
+%endif
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -80,7 +84,7 @@ Summary: Instrumentation System Testsuit
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -131,6 +135,19 @@ Requires: systemtap-runtime, initscripts
 %description initscript
 Initscript for Systemtap scripts.
 
+%if %{with_grapher}
+%package grapher
+Summary: Instrumentation System Grapher
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap-runtime
+
+%description grapher
+SystemTap grapher is a utility for real-time visualization of
+data from SystemTap instrumentation scripts.
+%endif
+
 %prep
 %setup -q %{?setup_elfutils}
 
@@ -265,10 +282,12 @@ exit 0
 %post
 # Remove any previously-built uprobes.ko materials
 (make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
 
 %preun
 # Ditto
 (make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
 
 %files
 %defattr(-,root,root)
@@ -354,8 +373,17 @@ exit 0
 %dir %{_localstatedir}/run/systemtap
 %doc initscript/README.initscript
 
+%if %{with_grapher}
+%files grapher
+%defattr(-,root,root)
+%{_bindir}/stapgraph
+%endif
+
 
 %changelog
+* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
+- Upstream release.
+
 * Thu Jun 11 2009 Josh Stone <jistone at redhat.com> - 0.9.8-1
 - Upstream release.
 



From jistone at fedoraproject.org  Wed Aug  5 03:45:36 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 03:45:36 +0000 (UTC)
Subject: rpms/systemtap/F-10 .cvsignore, 1.17, 1.18 sources, 1.31,
	1.32 systemtap.spec, 1.45, 1.46
Message-ID: <20090805034536.C2B6211C00E4@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5697

Modified Files:
	.cvsignore sources systemtap.spec 
Log Message:
upstream release 0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	12 Jun 2009 00:35:23 -0000	1.17
+++ .cvsignore	5 Aug 2009 03:45:36 -0000	1.18
@@ -1 +1 @@
-systemtap-0.9.8.tar.gz
+systemtap-0.9.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Jun 2009 00:35:23 -0000	1.31
+++ sources	5 Aug 2009 03:45:36 -0000	1.32
@@ -1 +1 @@
-42128f0d5a92cc23b1565b829fed3b6f  systemtap-0.9.8.tar.gz
+cbbaff9833bc8ab58dea4f8c4dc9a77d  systemtap-0.9.9.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/systemtap.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- systemtap.spec	12 Jun 2009 00:35:23 -0000	1.45
+++ systemtap.spec	5 Aug 2009 03:45:36 -0000	1.46
@@ -5,10 +5,10 @@
 %{!?with_bundled_elfutils: %define with_bundled_elfutils 0}
 %{!?elfutils_version: %define elfutils_version 0.127}
 %{!?pie_supported: %define pie_supported 1}
-%{!?with_grapher: %define with_grapher 0}
+%{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -57,6 +57,10 @@ BuildRequires: /usr/bin/latex /usr/bin/d
 BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 %endif
 
+%if %{with_grapher}
+BuildRequires: gtkmm24-devel >= 2.8
+%endif
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -80,7 +84,7 @@ Summary: Instrumentation System Testsuit
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -131,6 +135,19 @@ Requires: systemtap-runtime, initscripts
 %description initscript
 Initscript for Systemtap scripts.
 
+%if %{with_grapher}
+%package grapher
+Summary: Instrumentation System Grapher
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap-runtime
+
+%description grapher
+SystemTap grapher is a utility for real-time visualization of
+data from SystemTap instrumentation scripts.
+%endif
+
 %prep
 %setup -q %{?setup_elfutils}
 
@@ -265,10 +282,12 @@ exit 0
 %post
 # Remove any previously-built uprobes.ko materials
 (make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
 
 %preun
 # Ditto
 (make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
 
 %files
 %defattr(-,root,root)
@@ -354,8 +373,17 @@ exit 0
 %dir %{_localstatedir}/run/systemtap
 %doc initscript/README.initscript
 
+%if %{with_grapher}
+%files grapher
+%defattr(-,root,root)
+%{_bindir}/stapgraph
+%endif
+
 
 %changelog
+* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
+- Upstream release.
+
 * Thu Jun 11 2009 Josh Stone <jistone at redhat.com> - 0.9.8-1
 - Upstream release.
 



From corsepiu at fedoraproject.org  Wed Aug  5 03:52:00 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 03:52:00 +0000 (UTC)
Subject: rpms/perl-Gtk2-Spell/devel perl-Gtk2-Spell.spec,1.7,1.8
Message-ID: <20090805035200.B5BBA11C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Gtk2-Spell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7080

Modified Files:
	perl-Gtk2-Spell.spec 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.03-11
- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).



Index: perl-Gtk2-Spell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-Spell/devel/perl-Gtk2-Spell.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Gtk2-Spell.spec	26 Jul 2009 06:22:58 -0000	1.7
+++ perl-Gtk2-Spell.spec	5 Aug 2009 03:52:00 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:           perl-Gtk2-Spell
 Version:        1.03
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Gtk2::Spell perl module
 
 Group:     Development/Libraries
@@ -11,6 +11,7 @@ Source0:   http://search.cpan.org/CPAN/a
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, perl(Gtk2), perl(Glib), perl(ExtUtils::Depends)
+BuildRequires:  perl(Glib::MakeHelper)
 BuildRequires:  perl(ExtUtils::PkgConfig), gtkspell-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -56,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.03-11
+- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Wed Aug  5 03:52:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 03:52:54 +0000 (UTC)
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.72,1.73
Message-ID: <20090805035254.50E6211C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-pilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7181

Modified Files:
	gnome-pilot.spec 
Log Message:
Drop from the menus



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- gnome-pilot.spec	2 Aug 2009 04:52:40 -0000	1.72
+++ gnome-pilot.spec	5 Aug 2009 03:52:54 -0000	1.73
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -87,6 +87,8 @@ export tagname=CC
 %makeinstall LIBTOOL=%{_bindir}/libtool
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+echo "NotShowIn=GNOME;" >> $RPM_BUILD_ROOT%{_datadir}/applications/gpilotd-control-applet.desktop
+
 desktop-file-install --vendor="" 			\
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications	\
         --remove-category=Application 			\
@@ -168,6 +170,11 @@ scrollkeeper-update -q
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.17-6
+- Don't show gnome-pilot in the menus. It is already available
+  from evolution, and this menuitem about 'PalmOS devices' is just
+  confusing in the age of the Palm Pre.
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.17-5
 - Move ChangeLog to -devel to save some space
 



From jistone at fedoraproject.org  Wed Aug  5 03:57:24 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 03:57:24 +0000 (UTC)
Subject: rpms/systemtap/devel sources,1.32,1.33
Message-ID: <20090805035724.E87FE11C00E4@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8407

Modified Files:
	sources 
Log Message:
fix bungled sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	5 Aug 2009 03:44:50 -0000	1.32
+++ sources	5 Aug 2009 03:57:24 -0000	1.33
@@ -1 +1 @@
-cbbaff9833bc8ab58dea4f8c4dc9a77d  systemtap-0.9.9.tar.gz
+4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz



From spot at fedoraproject.org  Wed Aug  5 03:59:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  5 Aug 2009 03:59:26 +0000 (UTC)
Subject: rpms/perl-Apache-Session-Wrapper/EL-5
	perl-Apache-Session-Wrapper.spec, 1.6, 1.7
Message-ID: <20090805035926.0D69211C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Apache-Session-Wrapper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9755

Modified Files:
	perl-Apache-Session-Wrapper.spec 
Log Message:
sync with rawhide


Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Apache-Session-Wrapper/EL-5/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Apache-Session-Wrapper.spec	17 Jan 2007 23:36:15 -0000	1.6
+++ perl-Apache-Session-Wrapper.spec	5 Aug 2009 03:59:25 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           perl-Apache-Session-Wrapper
 Version:        0.33
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Apache-Session-Wrapper
 Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Apache-Session-Wrapper-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.33-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-2
+- rebuild for new perl
+
 * Wed Jan 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-1
 - bump to 0.33
 



From airlied at fedoraproject.org  Wed Aug  5 03:59:58 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 03:59:58 +0000 (UTC)
Subject: rpms/vbetool/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 vbetool.spec, 1.15, 1.16
Message-ID: <20090805035958.ACCB011C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/vbetool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9938

Modified Files:
	.cvsignore sources vbetool.spec 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.2.1-1
- rebase to 1.2.1 and install the udev rules



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Aug 2009 00:06:34 -0000	1.4
+++ .cvsignore	5 Aug 2009 03:59:58 -0000	1.5
@@ -1 +1 @@
-vbetool-1.2.0.tar.bz2
+vbetool-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Aug 2009 00:06:34 -0000	1.4
+++ sources	5 Aug 2009 03:59:58 -0000	1.5
@@ -1 +1 @@
-8b148d9b54f8bc3a6dfe1be82e792b35  vbetool-1.2.0.tar.bz2
+6a94f1c69c348de65e14a4ad9acbf795  vbetool-1.2.1.tar.bz2


Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- vbetool.spec	4 Aug 2009 02:52:33 -0000	1.15
+++ vbetool.spec	5 Aug 2009 03:59:58 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           vbetool
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
@@ -38,7 +38,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+install -m 0644 -D udev-video-post-example.rules $RPM_BUILD_ROOT/etc/udev/rules.d/92-video-post.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,9 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_sbindir}/vbetool
 %{_mandir}/man1/vbetool.1.gz
-
+%{_sysconfdir}/udev/rules.d/92-video-post.rules
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.2.1-1
+- rebase to 1.2.1 and install the udev rules
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.0-1
 - rebase to vbetool 1.2.0
 



From jistone at fedoraproject.org  Wed Aug  5 04:00:44 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 04:00:44 +0000 (UTC)
Subject: rpms/systemtap/devel systemtap.spec,1.49,1.50
Message-ID: <20090805040044.49AB711C0346@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10188

Modified Files:
	systemtap.spec 
Log Message:
bump the spec for fixed sources


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- systemtap.spec	5 Aug 2009 03:44:50 -0000	1.49
+++ systemtap.spec	5 Aug 2009 04:00:44 -0000	1.50
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -381,6 +381,9 @@ exit 0
 
 
 %changelog
+* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
+- Rebuild with correct sources.
+
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
 - Upstream release.
 



From nb at fedoraproject.org  Wed Aug  5 04:02:36 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 04:02:36 +0000 (UTC)
Subject: rpms/znc-extra/devel import.log, NONE, 1.1 znc-extra.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805040236.DA90E11C02C6@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10867/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log znc-extra.spec 
Log Message:
Initial commit of znc-extra-0.074



--- NEW FILE import.log ---
znc-extra-0_074-1_fc11:HEAD:znc-extra-0.074-1.fc11.src.rpm:1249444949


--- NEW FILE znc-extra.spec ---
Summary:        Extra modules for ZNC IRC bouncer
Name:           znc-extra
Version:        0.074
Release:        1%{?dist}
License:        GPLv2 with exceptions
Group:          System Environment/Daemons
URL:            http://znc.sf.net/
Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz
Requires:       znc = %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  znc-devel = %{version}
BuildRequires:  openssl-devel >= 0.9.8

# The following line is necessary because this module
# is needed for Fedora, but not for EPEL.
%{?fedora:BuildRequires: perl-ExtUtils-Embed}

%description
Extra modules for ZNC IRC bouncer

%prep
%setup -q

%build
%configure
%__make %{?_smp_mflags}

%install
%__rm -Rf "%{buildroot}"
%__make install DESTDIR="%{buildroot}"
#mkdir "%{buildroot}/%{_datadir}/znc"
#%__mv "%{buildroot}/%{_datadir}/webadmin" "%{buildroot}/%{_datadir}/znc/"

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc AUTHORS LICENSE LICENSE.OpenSSL
%{_libdir}/znc/*
%{_datadir}/znc/webadmin/skins/*

%changelog
* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
- Update to 0.074 of znc-extra
- Restore normal Requires and BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
- Re-add openssl-devel BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
- Do not attempt to own directories owned by znc package
- Change version to match znc-extra upstream
- Explicitly require znc = 0.074

* Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
- Initial Fedora package based on 0.072 of upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:26:59 -0000	1.1
+++ .cvsignore	5 Aug 2009 04:02:36 -0000	1.2
@@ -0,0 +1 @@
+znc-extra-0.074.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:26:59 -0000	1.1
+++ sources	5 Aug 2009 04:02:36 -0000	1.2
@@ -0,0 +1 @@
+34c0f43318c8c4a2cfb3a962e1740255  znc-extra-0.074.tar.gz



From jistone at fedoraproject.org  Wed Aug  5 04:04:18 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 04:04:18 +0000 (UTC)
Subject: rpms/systemtap/F-11 sources,1.32,1.33 systemtap.spec,1.48,1.49
Message-ID: <20090805040418.A586211C0346@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30280

Modified Files:
	sources systemtap.spec 
Log Message:
fix bungled sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	5 Aug 2009 03:45:08 -0000	1.32
+++ sources	5 Aug 2009 04:04:18 -0000	1.33
@@ -1 +1 @@
-cbbaff9833bc8ab58dea4f8c4dc9a77d  systemtap-0.9.9.tar.gz
+4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/systemtap.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- systemtap.spec	5 Aug 2009 03:45:08 -0000	1.48
+++ systemtap.spec	5 Aug 2009 04:04:18 -0000	1.49
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -381,6 +381,9 @@ exit 0
 
 
 %changelog
+* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
+- Rebuild with correct sources.
+
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
 - Upstream release.
 



From jistone at fedoraproject.org  Wed Aug  5 04:05:41 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed,  5 Aug 2009 04:05:41 +0000 (UTC)
Subject: rpms/systemtap/F-10 sources,1.32,1.33 systemtap.spec,1.46,1.47
Message-ID: <20090805040541.A769811C0346@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26825

Modified Files:
	sources systemtap.spec 
Log Message:
fix bungled sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	5 Aug 2009 03:45:36 -0000	1.32
+++ sources	5 Aug 2009 04:05:41 -0000	1.33
@@ -1 +1 @@
-cbbaff9833bc8ab58dea4f8c4dc9a77d  systemtap-0.9.9.tar.gz
+4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/systemtap.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- systemtap.spec	5 Aug 2009 03:45:36 -0000	1.46
+++ systemtap.spec	5 Aug 2009 04:05:41 -0000	1.47
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -381,6 +381,9 @@ exit 0
 
 
 %changelog
+* Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
+- Rebuild with correct sources.
+
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-1
 - Upstream release.
 



From nb at fedoraproject.org  Wed Aug  5 04:07:15 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 04:07:15 +0000 (UTC)
Subject: rpms/znc-extra/F-10 znc-extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805040715.65D4B11C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31900

Modified Files:
	.cvsignore sources 
Added Files:
	znc-extra.spec 
Log Message:
Initial F-10 commit of znc-extra (0.074)



--- NEW FILE znc-extra.spec ---
Summary:        Extra modules for ZNC IRC bouncer
Name:           znc-extra
Version:        0.074
Release:        1%{?dist}
License:        GPLv2 with exceptions
Group:          System Environment/Daemons
URL:            http://znc.sf.net/
Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz
Requires:       znc = %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  znc-devel = %{version}
BuildRequires:  openssl-devel >= 0.9.8

# The following line is necessary because this module
# is needed for Fedora, but not for EPEL.
%{?fedora:BuildRequires: perl-ExtUtils-Embed}

%description
Extra modules for ZNC IRC bouncer

%prep
%setup -q

%build
%configure
%__make %{?_smp_mflags}

%install
%__rm -Rf "%{buildroot}"
%__make install DESTDIR="%{buildroot}"
#mkdir "%{buildroot}/%{_datadir}/znc"
#%__mv "%{buildroot}/%{_datadir}/webadmin" "%{buildroot}/%{_datadir}/znc/"

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc AUTHORS LICENSE LICENSE.OpenSSL
%{_libdir}/znc/*
%{_datadir}/znc/webadmin/skins/*

%changelog
* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
- Update to 0.074 of znc-extra
- Restore normal Requires and BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
- Re-add openssl-devel BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
- Do not attempt to own directories owned by znc package
- Change version to match znc-extra upstream
- Explicitly require znc = 0.074

* Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
- Initial Fedora package based on 0.072 of upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:26:59 -0000	1.1
+++ .cvsignore	5 Aug 2009 04:07:15 -0000	1.2
@@ -0,0 +1 @@
+znc-extra-0.074.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:26:59 -0000	1.1
+++ sources	5 Aug 2009 04:07:15 -0000	1.2
@@ -0,0 +1 @@
+34c0f43318c8c4a2cfb3a962e1740255  znc-extra-0.074.tar.gz



From nb at fedoraproject.org  Wed Aug  5 04:09:45 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 04:09:45 +0000 (UTC)
Subject: rpms/znc-extra/F-11 znc-extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805040945.B4D1011C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv889

Modified Files:
	.cvsignore sources 
Added Files:
	znc-extra.spec 
Log Message:
F-11 commit for znc-extra-0.074



--- NEW FILE znc-extra.spec ---
Summary:        Extra modules for ZNC IRC bouncer
Name:           znc-extra
Version:        0.074
Release:        1%{?dist}
License:        GPLv2 with exceptions
Group:          System Environment/Daemons
URL:            http://znc.sf.net/
Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz
Requires:       znc = %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  znc-devel = %{version}
BuildRequires:  openssl-devel >= 0.9.8

# The following line is necessary because this module
# is needed for Fedora, but not for EPEL.
%{?fedora:BuildRequires: perl-ExtUtils-Embed}

%description
Extra modules for ZNC IRC bouncer

%prep
%setup -q

%build
%configure
%__make %{?_smp_mflags}

%install
%__rm -Rf "%{buildroot}"
%__make install DESTDIR="%{buildroot}"
#mkdir "%{buildroot}/%{_datadir}/znc"
#%__mv "%{buildroot}/%{_datadir}/webadmin" "%{buildroot}/%{_datadir}/znc/"

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc AUTHORS LICENSE LICENSE.OpenSSL
%{_libdir}/znc/*
%{_datadir}/znc/webadmin/skins/*

%changelog
* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
- Update to 0.074 of znc-extra
- Restore normal Requires and BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
- Re-add openssl-devel BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
- Do not attempt to own directories owned by znc package
- Change version to match znc-extra upstream
- Explicitly require znc = 0.074

* Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
- Initial Fedora package based on 0.072 of upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:26:59 -0000	1.1
+++ .cvsignore	5 Aug 2009 04:09:45 -0000	1.2
@@ -0,0 +1 @@
+znc-extra-0.074.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:26:59 -0000	1.1
+++ sources	5 Aug 2009 04:09:45 -0000	1.2
@@ -0,0 +1 @@
+34c0f43318c8c4a2cfb3a962e1740255  znc-extra-0.074.tar.gz



From nb at fedoraproject.org  Wed Aug  5 04:10:47 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 04:10:47 +0000 (UTC)
Subject: rpms/znc-extra/EL-5 znc-extra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805041047.6360E11C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1197

Modified Files:
	.cvsignore sources 
Added Files:
	znc-extra.spec 
Log Message:
EL-5 commit for znc-extra-0.074



--- NEW FILE znc-extra.spec ---
Summary:        Extra modules for ZNC IRC bouncer
Name:           znc-extra
Version:        0.074
Release:        1%{?dist}
License:        GPLv2 with exceptions
Group:          System Environment/Daemons
URL:            http://znc.sf.net/
Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz
Requires:       znc = %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  znc-devel = %{version}
BuildRequires:  openssl-devel >= 0.9.8

# The following line is necessary because this module
# is needed for Fedora, but not for EPEL.
%{?fedora:BuildRequires: perl-ExtUtils-Embed}

%description
Extra modules for ZNC IRC bouncer

%prep
%setup -q

%build
%configure
%__make %{?_smp_mflags}

%install
%__rm -Rf "%{buildroot}"
%__make install DESTDIR="%{buildroot}"
#mkdir "%{buildroot}/%{_datadir}/znc"
#%__mv "%{buildroot}/%{_datadir}/webadmin" "%{buildroot}/%{_datadir}/znc/"

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc AUTHORS LICENSE LICENSE.OpenSSL
%{_libdir}/znc/*
%{_datadir}/znc/webadmin/skins/*

%changelog
* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
- Update to 0.074 of znc-extra
- Restore normal Requires and BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
- Re-add openssl-devel BuildRequires

* Sun Aug 2 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
- Do not attempt to own directories owned by znc package
- Change version to match znc-extra upstream
- Explicitly require znc = 0.074

* Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
- Initial Fedora package based on 0.072 of upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:26:59 -0000	1.1
+++ .cvsignore	5 Aug 2009 04:10:47 -0000	1.2
@@ -0,0 +1 @@
+znc-extra-0.074.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:26:59 -0000	1.1
+++ sources	5 Aug 2009 04:10:47 -0000	1.2
@@ -0,0 +1 @@
+34c0f43318c8c4a2cfb3a962e1740255  znc-extra-0.074.tar.gz



From dcantrel at fedoraproject.org  Wed Aug  5 04:11:02 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  5 Aug 2009 04:11:02 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhcp-4.1.0-lease-file-semicolons.patch, NONE,
	1.1 dhcp.spec, 1.258, 1.259
Message-ID: <20090805041102.D3E2111C008C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1306

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0-lease-file-semicolons.patch 
Log Message:
* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-24
- Correct lease file format written by dhclient (#514828)


dhcp-4.1.0-lease-file-semicolons.patch:
 dhclient.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE dhcp-4.1.0-lease-file-semicolons.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.semicolons dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.semicolons	2008-06-11 10:17:10.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-08-04 17:46:38.000000000 -1000
@@ -2780,7 +2780,7 @@ write_client6_lease(struct client_state 
 			if (addr->options != NULL)
 				write_options(client, addr->options, "      ");
 
-			stat = fprintf(leaseFile, "    }\n");
+			stat = fprintf(leaseFile, "    };\n");
 			if (stat <= 0)
 				return ISC_R_IOERROR;
 		}
@@ -2788,7 +2788,7 @@ write_client6_lease(struct client_state 
 		if (ia->options != NULL)
 			write_options(client, ia->options, "    ");
 
-		stat = fprintf(leaseFile, "  }\n");
+		stat = fprintf(leaseFile, "  };\n");
 		if (stat <= 0)
 			return ISC_R_IOERROR;
 	}
@@ -2802,7 +2802,7 @@ write_client6_lease(struct client_state 
 	if (lease->options != NULL)
 		write_options(client, lease->options, "  ");
 
-	stat = fprintf(leaseFile, "}\n");
+	stat = fprintf(leaseFile, "};\n");
 	if (stat <= 0)
 		return ISC_R_IOERROR;
 
@@ -2926,20 +2926,20 @@ int write_client_lease (client, lease, r
 
 	tval = print_time(lease->renewal);
 	if (tval == NULL ||
-	    fprintf(leaseFile, "  renew %s\n", tval) < 0)
+	    fprintf(leaseFile, "  renew %s;\n", tval) < 0)
 		errors++;
 
 	tval = print_time(lease->rebind);
 	if (tval == NULL ||
-	    fprintf(leaseFile, "  rebind %s\n", tval) < 0)
+	    fprintf(leaseFile, "  rebind %s;\n", tval) < 0)
 		errors++;
 
 	tval = print_time(lease->expiry);
 	if (tval == NULL ||
-	    fprintf(leaseFile, "  expire %s\n", tval) < 0)
+	    fprintf(leaseFile, "  expire %s;\n", tval) < 0)
 		errors++;
 
-	if (fprintf(leaseFile, "}\n") < 0)
+	if (fprintf(leaseFile, "};\n") < 0)
 		errors++;
 
 	if (fflush(leaseFile) != 0)


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- dhcp.spec	2 Jul 2009 21:34:57 -0000	1.258
+++ dhcp.spec	5 Aug 2009 04:11:02 -0000	1.259
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  23%{?dist}
+Release:  24%{?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.
@@ -47,6 +47,7 @@ Patch17:  %{name}-4.1.0-invalid-dhclient
 Patch18:  %{name}-4.1.0-missing-ipv6-not-fatal.patch
 Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
+Patch21:  %{name}-4.1.0-lease-file-semicolons.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -199,6 +200,9 @@ libdhcpctl and libomapi static libraries
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19867])
 %patch20 -p1
 
+# Add missing semicolons to lines in the client lease file (#514828)
+%patch21 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -444,6 +448,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-24
+- Correct lease file format written by dhclient (#514828)
+
 * Thu Jul 02 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-23
 - Correct problems when upgrading from a previous release and your
   dhcpd.conf file not being placed in /etc/dhcp (#506600)



From deji at fedoraproject.org  Wed Aug  5 04:12:47 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed,  5 Aug 2009 04:12:47 +0000 (UTC)
Subject: rpms/nautilus-actions/devel .cvsignore, 1.9,
	1.10 nautilus-actions.spec, 1.23, 1.24 sources, 1.9, 1.10
Message-ID: <20090805041247.BCC4111C008C@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/nautilus-actions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1804

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Log Message:
* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 1.11.2-1
- Update to 1.11.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	29 May 2009 12:39:56 -0000	1.9
+++ .cvsignore	5 Aug 2009 04:12:47 -0000	1.10
@@ -1 +1 @@
-nautilus-actions-1.10.1.tar.gz
+nautilus-actions-1.11.2.tar.bz2


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- nautilus-actions.spec	4 Aug 2009 04:31:55 -0000	1.23
+++ nautilus-actions.spec	5 Aug 2009 04:12:47 -0000	1.24
@@ -1,14 +1,14 @@
 Summary:	Nautilus extension for customizing the context menu
 Name:		nautilus-actions
-Version:	1.10.1
-Release:	3%{?dist}
+Version:	1.11.2
+Release:	1%{?dist}
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.grumz.net/node/8
-Source0:	ftp://pwi.dyndns.biz/tarballs/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://download.gnome.org/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libgnomeui-devel, libglade2-devel, nautilus-devel
-BuildRequires:	libuuid-devel, gettext, perl(XML::Parser)
+BuildRequires:	libuuid-devel, unique-devel, gettext, perl(XML::Parser)
 BuildRequires:	desktop-file-utils intltool
 
 %description
@@ -60,15 +60,18 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/nautilus-actions-config
-%{_bindir}/nautilus-actions-check-actions-change
-%{_bindir}/nautilus-actions-new-config
+%{_bindir}/nautilus-actions-config-tool
+%{_bindir}/nautilus-actions-new
+%{_bindir}/nautilus-actions-schemas
 %{_libdir}/nautilus/extensions-2.0/libnautilus-actions.so
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/nautilus-actions.*
 %{_datadir}/applications/fedora-nact.desktop
 
 %changelog
+* Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 1.11.2-1
+- Update to 1.11.2
+
 * Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 1.10.1-3
 - Change e2fsprog-devel BR to libuuid-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 May 2009 12:39:57 -0000	1.9
+++ sources	5 Aug 2009 04:12:47 -0000	1.10
@@ -1 +1 @@
-d4f5a8da9fe6e75f948117c28848f947  nautilus-actions-1.10.1.tar.gz
+bcb1d7a2e948eeb7afddf0d55a21f4d3  nautilus-actions-1.11.2.tar.bz2



From corsepiu at fedoraproject.org  Wed Aug  5 04:18:27 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 04:18:27 +0000 (UTC)
Subject: rpms/perl-Gtk2-TrayIcon/devel perl-Gtk2-TrayIcon.spec,1.9,1.10
Message-ID: <20090805041827.8729911C008C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Gtk2-TrayIcon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3074

Modified Files:
	perl-Gtk2-TrayIcon.spec 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-7
- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).



Index: perl-Gtk2-TrayIcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-TrayIcon/devel/perl-Gtk2-TrayIcon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gtk2-TrayIcon.spec	26 Jul 2009 06:23:13 -0000	1.9
+++ perl-Gtk2-TrayIcon.spec	5 Aug 2009 04:18:27 -0000	1.10
@@ -12,7 +12,7 @@
 
 Name:           perl-Gtk2-TrayIcon
 Version:        0.06
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl interface to the EggTrayIcon library 
 
 Group:          Development/Libraries
@@ -30,6 +30,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(ExtUtils::Depends)
 BuildRequires:  perl(ExtUtils::PkgConfig)
 BuildRequires:  perl(Gtk2) >= 1.00
+BuildRequires:  perl(Glib::MakeHelper)
 
 %description
 This module allows a Perl developer to embed an arbitrary widget in a System
@@ -73,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-7
+- Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Wed Aug  5 04:57:32 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  5 Aug 2009 04:57:32 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.384, 1.385 jd.spec, 1.447, 1.448 sources,
	1.385, 1.386
Message-ID: <20090805045732.4D3CA11C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12952

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3017



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- .cvsignore	4 Aug 2009 05:10:10 -0000	1.384
+++ .cvsignore	5 Aug 2009 04:57:30 -0000	1.385
@@ -1 +1 @@
-jd-2.4.2-svn3014_trunk.tgz
+jd-2.4.2-svn3017_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -p -r1.447 -r1.448
--- jd.spec	4 Aug 2009 05:10:10 -0000	1.447
+++ jd.spec	5 Aug 2009 04:57:30 -0000	1.448
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3014_trunk
+%define         strtag        svn3017_trunk
 %define         repoid        41293
 # 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
-* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3014
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3017
 
 * 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.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- sources	4 Aug 2009 05:10:10 -0000	1.385
+++ sources	5 Aug 2009 04:57:30 -0000	1.386
@@ -1 +1 @@
-97da105284b8d30f3f9e5374eb42fb41  jd-2.4.2-svn3014_trunk.tgz
+a13668a4a8ecd321f93e36808913fb73  jd-2.4.2-svn3017_trunk.tgz



From pnemade at fedoraproject.org  Wed Aug  5 05:02:10 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Wed,  5 Aug 2009 05:02:10 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.27, 1.28 iso-codes.spec, 1.36,
	1.37 sources, 1.28, 1.29
Message-ID: <20090805050210.1221811C008C@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14095

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Wed Aug 05 2009 Parag Nemade <pnemade at redhat.com> - 3.10.2-1
- Update to 3.10.2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	4 Aug 2009 06:22:09 -0000	1.27
+++ .cvsignore	5 Aug 2009 05:02:09 -0000	1.28
@@ -1 +1 @@
-iso-codes-3.10.1.tar.bz2
+iso-codes-3.10.2.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- iso-codes.spec	4 Aug 2009 06:22:09 -0000	1.36
+++ iso-codes.spec	5 Aug 2009 05:02:09 -0000	1.37
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.10.1
+Version:	3.10.2
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Wed Aug 05 2009 Parag Nemade <pnemade at redhat.com> - 3.10.2-1
+- Update to 3.10.2
+
 * Tue Aug 04 2009 Parag Nemade <pnemade at redhat.com> - 3.10.1-1
 - Update to 3.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	4 Aug 2009 06:22:09 -0000	1.28
+++ sources	5 Aug 2009 05:02:09 -0000	1.29
@@ -1 +1 @@
-1db1466d1ea63fe5fc349b7ba8b189fb  iso-codes-3.10.1.tar.bz2
+1cf0aa3d1afe4cdfe5aceff1c6a53cde  iso-codes-3.10.2.tar.bz2



From nb at fedoraproject.org  Wed Aug  5 05:10:30 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 05:10:30 +0000 (UTC)
Subject: rpms/imapsync/devel .cvsignore, 1.3, 1.4 imapsync.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090805051030.487CC11C0439@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757

Modified Files:
	.cvsignore imapsync.spec sources 
Log Message:
Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Aug 2008 17:16:19 -0000	1.3
+++ .cvsignore	5 Aug 2009 05:10:29 -0000	1.4
@@ -1 +1 @@
-imapsync-1.255.tgz
+imapsync-1.286.tgz


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/devel/imapsync.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- imapsync.spec	25 Jul 2009 03:18:00 -0000	1.8
+++ imapsync.spec	5 Aug 2009 05:10:30 -0000	1.9
@@ -1,13 +1,13 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
-Version: 1.255
-Release: 5%{?dist}
+Version: 1.286
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
 URL: http://freshmeat.net/projects/imapsync/
 Source: http://www.linux-france.org/prj/imapsync/dist/%{name}-%{version}.tgz
-Patch0: imapsync-1.255-authuser.patch
+#Patch0: imapsync-1.255-authuser.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -34,7 +34,7 @@ optionally be deleted after a successful
 
 %prep
 %setup -q
-%patch0 -p1 -b .authuser
+#%patch0 -p1 -b .authuser
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -58,11 +58,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc GPL ChangeLog CREDITS INSTALL TODO README FAQ BUG_IMAPClient_3.xx
+%doc GPL ChangeLog CREDITS INSTALL TODO README FAQ
 %{_bindir}/imapsync
 %attr(644, root, root) %{_mandir}/man1/imapsync.1*
 
 %ChangeLog
+* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 1.286-1
+- Upgrade to 1.286
+
 * Fri Aug  8 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.255-3
 - Attempt to patch around too new Mail::IMAPClient
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Aug 2008 17:16:19 -0000	1.4
+++ sources	5 Aug 2009 05:10:30 -0000	1.5
@@ -1 +1 @@
-509f2230ef1ed5fc192587f2b935f2e9  imapsync-1.255.tgz
+b60b1b280540dbe4f5787df32515c1af  imapsync-1.286.tgz



From nb at fedoraproject.org  Wed Aug  5 05:12:25 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 05:12:25 +0000 (UTC)
Subject: rpms/imapsync/F-10 .cvsignore, 1.3, 1.4 imapsync.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090805051225.3303511C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306

Modified Files:
	.cvsignore imapsync.spec sources 
Log Message:
Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Aug 2008 17:16:19 -0000	1.3
+++ .cvsignore	5 Aug 2009 05:12:24 -0000	1.4
@@ -1 +1 @@
-imapsync-1.255.tgz
+imapsync-1.286.tgz


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-10/imapsync.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- imapsync.spec	8 Aug 2008 09:01:41 -0000	1.6
+++ imapsync.spec	5 Aug 2009 05:12:24 -0000	1.7
@@ -1,13 +1,13 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
-Version: 1.255
-Release: 3%{?dist}
+Version: 1.286
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
 URL: http://freshmeat.net/projects/imapsync/
 Source: http://www.linux-france.org/prj/imapsync/dist/%{name}-%{version}.tgz
-Patch0: imapsync-1.255-authuser.patch
+#Patch0: imapsync-1.255-authuser.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -34,7 +34,7 @@ optionally be deleted after a successful
 
 %prep
 %setup -q
-%patch0 -p1 -b .authuser
+#%patch0 -p1 -b .authuser
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -58,11 +58,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc GPL ChangeLog CREDITS INSTALL TODO README FAQ BUG_IMAPClient_3.xx
+%doc GPL ChangeLog CREDITS INSTALL TODO README FAQ
 %{_bindir}/imapsync
 %attr(644, root, root) %{_mandir}/man1/imapsync.1*
 
 %ChangeLog
+* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 1.286-1
+- Upgrade to 1.286
+
 * Fri Aug  8 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.255-3
 - Attempt to patch around too new Mail::IMAPClient
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Aug 2008 17:16:19 -0000	1.4
+++ sources	5 Aug 2009 05:12:24 -0000	1.5
@@ -1 +1 @@
-509f2230ef1ed5fc192587f2b935f2e9  imapsync-1.255.tgz
+b60b1b280540dbe4f5787df32515c1af  imapsync-1.286.tgz



From nb at fedoraproject.org  Wed Aug  5 05:14:06 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 05:14:06 +0000 (UTC)
Subject: rpms/imapsync/F-11 .cvsignore, 1.3, 1.4 imapsync.spec, 1.7,
	1.8 sources, 1.4, 1.5 imapsync-1.255-authuser.patch, 1.1, NONE
Message-ID: <20090805051406.E27BA11C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17808

Modified Files:
	.cvsignore imapsync.spec sources 
Removed Files:
	imapsync-1.255-authuser.patch 
Log Message:
Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Aug 2008 17:16:19 -0000	1.3
+++ .cvsignore	5 Aug 2009 05:14:06 -0000	1.4
@@ -1 +1 @@
-imapsync-1.255.tgz
+imapsync-1.286.tgz


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-11/imapsync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- imapsync.spec	25 Feb 2009 07:03:55 -0000	1.7
+++ imapsync.spec	5 Aug 2009 05:14:06 -0000	1.8
@@ -1,13 +1,13 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
-Version: 1.255
-Release: 4%{?dist}
+Version: 1.286
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
 URL: http://freshmeat.net/projects/imapsync/
 Source: http://www.linux-france.org/prj/imapsync/dist/%{name}-%{version}.tgz
-Patch0: imapsync-1.255-authuser.patch
+#Patch0: imapsync-1.255-authuser.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -34,7 +34,7 @@ optionally be deleted after a successful
 
 %prep
 %setup -q
-%patch0 -p1 -b .authuser
+#%patch0 -p1 -b .authuser
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -58,11 +58,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc GPL ChangeLog CREDITS INSTALL TODO README FAQ BUG_IMAPClient_3.xx
+%doc GPL ChangeLog CREDITS INSTALL TODO README FAQ
 %{_bindir}/imapsync
 %attr(644, root, root) %{_mandir}/man1/imapsync.1*
 
 %ChangeLog
+* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 1.286-1
+- Upgrade to 1.286
+
 * Fri Aug  8 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.255-3
 - Attempt to patch around too new Mail::IMAPClient
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Aug 2008 17:16:19 -0000	1.4
+++ sources	5 Aug 2009 05:14:06 -0000	1.5
@@ -1 +1 @@
-509f2230ef1ed5fc192587f2b935f2e9  imapsync-1.255.tgz
+b60b1b280540dbe4f5787df32515c1af  imapsync-1.286.tgz


--- imapsync-1.255-authuser.patch DELETED ---



From nb at fedoraproject.org  Wed Aug  5 05:15:30 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 05:15:30 +0000 (UTC)
Subject: rpms/imapsync/EL-5 .cvsignore, 1.1, 1.2 imapsync.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090805051530.9C20C11C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18169

Modified Files:
	.cvsignore imapsync.spec sources 
Log Message:
Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Apr 2008 17:50:56 -0000	1.1
+++ .cvsignore	5 Aug 2009 05:15:30 -0000	1.2
@@ -0,0 +1 @@
+imapsync-1.286.tgz


Index: imapsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/EL-5/imapsync.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- imapsync.spec	10 Apr 2008 19:56:20 -0000	1.1
+++ imapsync.spec	5 Aug 2009 05:15:30 -0000	1.2
@@ -1,12 +1,13 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
-Version: 1.249
+Version: 1.286
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 
 URL: http://freshmeat.net/projects/imapsync/
 Source: http://www.linux-france.org/prj/imapsync/dist/%{name}-%{version}.tgz
+#Patch0: imapsync-1.255-authuser.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -14,6 +15,14 @@ BuildRequires: perl(Test::Simple)
 BuildRequires: perl(Mail::Box)
 BuildRequires: perl(Mail::IMAPClient)
 BuildRequires: perl(Date::Manip)
+Requires: perl(Date::Manip)
+Requires: perl(Term::ReadKey)
+Requires: perl(IO::Socket::SSL)
+Requires: perl(Test::Simple)
+Requires: perl(Mail::Box)
+Requires: perl(Mail::IMAPClient)
+Requires: perl(Date::Manip)
+
 
 %description
 imapsync is a tool for facilitating incremental recursive IMAP
@@ -25,6 +34,7 @@ optionally be deleted after a successful
 
 %prep
 %setup -q
+#%patch0 -p1 -b .authuser
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -53,5 +63,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644, root, root) %{_mandir}/man1/imapsync.1*
 
 %ChangeLog
+* Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 1.286-1
+- Upgrade to 1.286
+
+* Fri Aug  8 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.255-3
+- Attempt to patch around too new Mail::IMAPClient
+
+* Wed Aug  6 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.255-2
+- Upstream release
+
+* Tue May 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.252-2
+- Upstream release
+- Dependency fix (BZ#447800)
+
 * Thu Apr 10 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.249-1
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imapsync/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Apr 2008 19:56:20 -0000	1.2
+++ sources	5 Aug 2009 05:15:30 -0000	1.3
@@ -1 +1 @@
-5e0e4a65f2217101df6b90df3bc4d358  imapsync-1.249.tgz
+b60b1b280540dbe4f5787df32515c1af  imapsync-1.286.tgz



From nb at fedoraproject.org  Wed Aug  5 05:16:26 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 05:16:26 +0000 (UTC)
Subject: rpms/imapsync/F-10 imapsync-1.255-authuser.patch,1.1,NONE
Message-ID: <20090805051626.5946411C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18524

Removed Files:
	imapsync-1.255-authuser.patch 
Log Message:
Remove old patch that is no longer needed



--- imapsync-1.255-authuser.patch DELETED ---



From nb at fedoraproject.org  Wed Aug  5 05:17:03 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed,  5 Aug 2009 05:17:03 +0000 (UTC)
Subject: rpms/imapsync/devel imapsync-1.255-authuser.patch,1.1,NONE
Message-ID: <20090805051703.EDAEF11C008C@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/imapsync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18681

Removed Files:
	imapsync-1.255-authuser.patch 
Log Message:
Remove old patch that is no longer needed



--- imapsync-1.255-authuser.patch DELETED ---



From corsepiu at fedoraproject.org  Wed Aug  5 05:17:48 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 05:17:48 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-Schema-Loader/devel
	DBIx-Class-Schema-Loader-0.04006.diff, NONE,
	1.1 perl-DBIx-Class-Schema-Loader.spec, 1.6, 1.7
Message-ID: <20090805051748.4771D11C008C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-Class-Schema-Loader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18927

Modified Files:
	perl-DBIx-Class-Schema-Loader.spec 
Added Files:
	DBIx-Class-Schema-Loader-0.04006.diff 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04006-4
- Fix mass rebuild breakdown:
  Replace bundled Module-Install with Module-Install-0.91.
  Add --skipdeps.


DBIx-Class-Schema-Loader-0.04006.diff:
 AutoInstall.pm            |  341 ++++++++++++++++++++++++++++++++++++++++++----
 Install.pm                |    7 
 Install/Admin.pm          |  294 +++++++++++++++++++++++++++++++++++++++
 Install/Admin/Bundle.pm   |   73 +++++++++
 Install/Admin/Compiler.pm |   27 +++
 Install/Admin/Find.pm     |   77 ++++++++++
 Install/Admin/Include.pm  |  147 +++++++++++++++++++
 Install/Admin/Makefile.pm |   53 +++++++
 Install/Admin/Manifest.pm |  162 +++++++++++++++++++++
 Install/Admin/Metadata.pm |  185 ++++++++++++++++++++++++
 Install/Admin/ScanDeps.pm |   80 ++++++++++
 Install/Admin/WriteAll.pm |   20 ++
 Install/AutoInstall.pm    |    9 -
 Install/Base.pm           |  116 ++++++++++++---
 Install/Bundle.pm         |  195 ++++++++++++++++++++++++++
 Install/Can.pm            |   93 +++++++++++-
 Install/Compiler.pm       |  123 ++++++++++++++++
 Install/DSL.pm            |   91 ++++++++++++
 Install/Deprecated.pm     |  115 +++++++++++++++
 Install/External.pm       |  138 ++++++++++++++++++
 Install/Fetch.pm          |    9 -
 Install/Include.pm        |    9 -
 Install/Inline.pm         |   49 ++++++
 Install/MakeMaker.pm      |   49 ++++++
 Install/Makefile.pm       |  140 +++++++++++++++++-
 Install/Metadata.pm       |  105 +++++++++-----
 Install/PAR.pm            |  274 ++++++++++++++++++++++++++++++++++++
 Install/Philosophy.pod    |  187 +++++++++++++++++++++++++
 Install/Run.pm            |   15 ++
 Install/Scripts.pm        |   28 +++
 Install/Share.pm          |  125 ++++++++++++++++
 Install/Win32.pm          |    7 
 Install/With.pm           |  159 +++++++++++++++++++++
 Install/WriteAll.pm       |   19 +-
 34 files changed, 3395 insertions(+), 126 deletions(-)

--- NEW FILE DBIx-Class-Schema-Loader-0.04006.diff ---
diff -Naur DBIx-Class-Schema-Loader-0.04006.orig/inc/Module/AutoInstall.pm DBIx-Class-Schema-Loader-0.04006/inc/Module/AutoInstall.pm
--- DBIx-Class-Schema-Loader-0.04006.orig/inc/Module/AutoInstall.pm	2009-05-01 22:10:12.000000000 +0200
+++ DBIx-Class-Schema-Loader-0.04006/inc/Module/AutoInstall.pm	2009-05-27 18:46:13.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
 package Module::AutoInstall;
 
 use strict;
@@ -18,7 +17,9 @@
 
 # various lexical flags
 my ( @Missing, @Existing,  %DisabledTests, $UnderCPAN,     $HasCPANPLUS );
-my ( $Config,  $CheckOnly, $SkipInstall,   $AcceptDefault, $TestOnly );
+my (
+    $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+);
 my ( $PostambleActions, $PostambleUsed );
 
 # See if it's a testing or non-interactive session
@@ -73,6 +74,9 @@
         elsif ( $arg =~ /^--test(?:only)?$/ ) {
             $TestOnly = 1;
         }
+        elsif ( $arg =~ /^--all(?:deps)?$/ ) {
+            $AllDeps = 1;
+        }
     }
 }
 
@@ -115,7 +119,12 @@
         )[0]
     );
 
-    $UnderCPAN = _check_lock(1);    # check for $UnderCPAN
+    # We want to know if we're under CPAN early to avoid prompting, but
+    # if we aren't going to try and install anything anyway then skip the
+    # check entirely since we don't want to have to load (and configure)
+    # an old CPAN just for a cosmetic message
+
+    $UnderCPAN = _check_lock(1) unless $SkipInstall;
 
     while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
         my ( @required, @tests, @skiptests );
@@ -165,15 +174,24 @@
             }
 
             # XXX: check for conflicts and uninstalls(!) them.
-            if (
-                defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
+            my $cur = _load($mod);
+            if (_version_cmp ($cur, $arg) >= 0)
             {
                 print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
                 push @Existing, $mod => $arg;
                 $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
             }
             else {
-                print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+                if (not defined $cur)   # indeed missing
+                {
+                    print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+                }
+                else
+                {
+                    # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+                    print "too old. ($cur < $arg)\n";
+                }
+
                 push @required, $mod => $arg;
             }
         }
@@ -187,6 +205,7 @@
             and (
                 $CheckOnly
                 or ($mandatory and $UnderCPAN)
+                or $AllDeps
                 or _prompt(
                     qq{==> Auto-install the }
                       . ( @required / 2 )
@@ -235,21 +254,38 @@
     *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
 }
 
+sub _running_under {
+    my $thing = shift;
+    print <<"END_MESSAGE";
+*** Since we're running under ${thing}, I'll just let it take care
+    of the dependency's installation later.
+END_MESSAGE
+    return 1;
+}
+
 # Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
 # if we are, then we simply let it taking care of our dependencies
 sub _check_lock {
     return unless @Missing or @_;
 
+    my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
+
     if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
-        print <<'END_MESSAGE';
+        return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
+    }
 
-*** Since we're running under CPANPLUS, I'll just let it take care
-    of the dependency's installation later.
-END_MESSAGE
-        return 1;
+    require CPAN;
+
+    if ($CPAN::VERSION > '1.89') {
+        if ($cpan_env) {
+            return _running_under('CPAN');
+        }
+        return; # CPAN.pm new enough, don't need to check further
     }
 
-    _load_cpan();
+    # last ditch attempt, this -will- configure CPAN, very sorry
+
+    _load_cpan(1); # force initialize even though it's already loaded
 
     # Find the CPAN lock-file
     my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
@@ -285,7 +321,7 @@
     while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
 
         # grep out those already installed
-        if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
             push @installed, $pkg;
         }
         else {
@@ -324,7 +360,7 @@
 
     # see if we have successfully installed them
     while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
             push @installed, $pkg;
         }
         elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -379,7 +415,7 @@
         my $success;
         my $obj = $modtree->{$pkg};
 
-        if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
+        if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
             my $pathname = $pkg;
             $pathname =~ s/::/\\W/;
 
@@ -472,7 +508,7 @@
         my $obj     = CPAN::Shell->expand( Module => $pkg );
         my $success = 0;
 
-        if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
+        if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
             my $pathname = $pkg;
             $pathname =~ s/::/\\W/;
 
@@ -536,7 +572,7 @@
     my $ver   = shift;
 
     return
-      if defined( _version_check( _load($class), $ver ) );  # no need to upgrade
+      if _version_cmp( _load($class), $ver ) >= 0;  # no need to upgrade
 
     if (
         _prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -633,7 +669,7 @@
 
 # Load CPAN.pm and it's configuration
 sub _load_cpan {
-    return if $CPAN::VERSION;
+    return if $CPAN::VERSION and $CPAN::Config and not @_;
     require CPAN;
     if ( $CPAN::HandleConfig::VERSION ) {
         # Newer versions of CPAN have a HandleConfig module
@@ -645,9 +681,11 @@
 }
 
 # compare two versions, either use Sort::Versions or plain comparison
-sub _version_check {
+# return values same as <=>
+sub _version_cmp {
     my ( $cur, $min ) = @_;
-    return unless defined $cur;
+    return -1 unless defined $cur;  # if 0 keep comparing
+    return 1 unless $min;
 
     $cur =~ s/\s+$//;
 
@@ -658,16 +696,13 @@
             ) {
 
             # use version.pm if it is installed.
-            return (
-                ( version->new($cur) >= version->new($min) ) ? $cur : undef );
+            return version->new($cur) <=> version->new($min);
[...3605 lines suppressed...]
+
+
+#####################################################################
+# Testing and Configuration Contexts
+
+=pod
+
+=head2 interactive
+
+The C<interactive> function tests for an install that has a user present
+(or at least, one in which it is reasonable for us to present prompts
+and other similar types of things).
+
+Returns true if in an interactive environment, or false otherwise.
+
+=cut
+
+sub interactive {
+	# Treat things interactively ONLY based on input
+	!! (-t STDIN and ! automated_testing());
+}
+
+=pod
+
+=head2 automated_testing
+
+Are we currently running in an automated testing environment, such as
+CPAN Testers.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{AUTOMATED_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub automated_testing {
+	!! $ENV{AUTOMATED_TESTING};
+}
+
+=pod
+
+=head2 release_testing
+
+Are we currently running in an release testing environment. That is,
+are we in the process of running in a potential highly-intensive and
+high dependency bloat testing process prior to packaging a module for
+release.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{RELEASE_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub release_testing {
+	!! $ENV{RELEASE_TESTING};
+}
+
+sub author_context {
+	!! $Module::Install::AUTHOR;
+}
+
+
+
+
+
+#####################################################################
+# Operating System Convenience
+
+=pod
+
+=head2 win32
+
+The C<win32> function tests if the Makefile.PL is currently running in a
+native Microsoft Windows Perl, such as ActivePerl or Strawberry Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32'> yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub win32 {
+	!! ($^O eq 'MSWin32');
+}
+
+=pod
+
+=head2 winlike
+
+The C<winlike> function tests if the Makefile.PL is currently running
+in a Microsoft Windows Perl, under either cygwin or a native Win32 Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32' or $^O eq 'cygwin'>yourself, but may be
+improved in line with best practices at a later date.
+
+=cut
+
+sub winlike {
+	!! ($^O eq 'MSWin32' or $^O eq 'cygwin');
+}
+
+1;
+
+=pod
+
+=head1 SEE ALSO
+
+L<Module::Install>
+
+=head1 AUTHORS
+
+Adam Kennedy E<lt>adamk at cpan.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright 2007 - 2009 Adam Kennedy.
+
+This program is free software; you can redistribute
+it and/or modify it under the same terms as Perl itself.
+
+The full text of the license can be found in the
+LICENSE file included with this module.
+
+=cut
diff -Naur DBIx-Class-Schema-Loader-0.04006.orig/inc/Module/Install/WriteAll.pm DBIx-Class-Schema-Loader-0.04006/inc/Module/Install/WriteAll.pm
--- DBIx-Class-Schema-Loader-0.04006.orig/inc/Module/Install/WriteAll.pm	2009-05-01 22:10:12.000000000 +0200
+++ DBIx-Class-Schema-Loader-0.04006/inc/Module/Install/WriteAll.pm	2009-05-27 18:46:13.000000000 +0200
@@ -1,12 +1,11 @@
-#line 1
 package Module::Install::WriteAll;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
@@ -41,8 +40,18 @@
 
 	# The Makefile write process adds a couple of dependencies,
 	# so write the META.yml files after the Makefile.
-	$self->Meta->write        if $args{meta};
-	$self->Meta->write_mymeta if $self->mymeta;
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
 
 	return 1;
 }
diff -Naur DBIx-Class-Schema-Loader-0.04006.orig/inc/Module/Install.pm DBIx-Class-Schema-Loader-0.04006/inc/Module/Install.pm
--- DBIx-Class-Schema-Loader-0.04006.orig/inc/Module/Install.pm	2009-05-01 22:10:11.000000000 +0200
+++ DBIx-Class-Schema-Loader-0.04006/inc/Module/Install.pm	2009-05-27 18:46:13.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
 package Module::Install;
 
 # For any maintainers:
@@ -28,7 +27,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -353,7 +352,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
 	}
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
@@ -384,7 +383,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
 	}
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";


Index: perl-DBIx-Class-Schema-Loader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-Schema-Loader/devel/perl-DBIx-Class-Schema-Loader.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-DBIx-Class-Schema-Loader.spec	26 Jul 2009 05:24:03 -0000	1.6
+++ perl-DBIx-Class-Schema-Loader.spec	5 Aug 2009 05:17:48 -0000	1.7
@@ -1,11 +1,14 @@
 Name:           perl-DBIx-Class-Schema-Loader
 Version:        0.04006
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Dynamic definition of a DBIx::Class::Schema
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DBIx-Class-Schema-Loader/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-%{version}.tar.gz
+
+# Broken Module-Install, replace with Module-Install-0.91
+Patch0:         DBIx-Class-Schema-Loader-0.04006.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -18,6 +21,7 @@ BuildRequires: perl(File::Spec)
 BuildRequires: perl(Scalar::Util)
 BuildRequires: perl(Test::More) >= 0.47
 BuildRequires: perl(Text::Balanced)
+BuildRequires: perl(YAML::Tiny), perl(File::Remove)
 
 # cpan
 BuildRequires:  perl(Carp::Clan)
@@ -49,6 +53,7 @@ and setting up the columns, primary keys
 
 %prep
 %setup -q -n DBIx-Class-Schema-Loader-%{version}
+%patch0 -p1
 
 # make sure doc/tests don't generate provides
 # note we first filter out the bits in _docdir...
@@ -69,7 +74,7 @@ EOF
 chmod +x %{__perl_requires}
 
 %build
-echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
 make %{?_smp_mflags}
 
 %install
@@ -95,6 +100,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04006-4
+- Fix mass rebuild breakdown:
+  Replace bundled Module-Install with Module-Install-0.91.
+  Add --skipdeps.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04006-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Wed Aug  5 05:35:51 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 05:35:51 +0000 (UTC)
Subject: rpms/perl-Net-SSH2/devel perl-Net-SSH2.spec,1.9,1.10
Message-ID: <20090805053551.2CDF111C008C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Net-SSH2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23357

Modified Files:
	perl-Net-SSH2.spec 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.21-3
- Fix mass rebuild breakdown: Add BR: zlib-devel, openssl-devel.



Index: perl-Net-SSH2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Net-SSH2.spec	26 Jul 2009 13:46:51 -0000	1.9
+++ perl-Net-SSH2.spec	5 Aug 2009 05:35:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH2
 Version:        0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,6 +14,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # non-perl
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
 BuildRequires:  libssh2-devel >= 0.18
 
 # core
@@ -74,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.21-3
+- Fix mass rebuild breakdown: Add BR: zlib-devel, openssl-devel.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From davej at fedoraproject.org  Wed Aug  5 05:37:46 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  5 Aug 2009 05:37:46 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1691,
	1.1692 linux-2.6-pci-cacheline-sizing.patch, 1.1, 1.2
Message-ID: <20090805053746.61CA211C008C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23926

Modified Files:
	kernel.spec linux-2.6-pci-cacheline-sizing.patch 
Log Message:
Fix shift in pci cacheline size printk.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1691
retrieving revision 1.1692
diff -u -p -r1.1691 -r1.1692
--- kernel.spec	5 Aug 2009 00:45:59 -0000	1.1691
+++ kernel.spec	5 Aug 2009 05:37:45 -0000	1.1692
@@ -1943,6 +1943,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Dave Jones <davej at redhat.com>
+- Fix shift in pci cacheline size printk.
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.128.rc5.git3
 - 2.6.31-rc5-git3
 - drop cpufreq + set memory fixes

linux-2.6-pci-cacheline-sizing.patch:
 common.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Index: linux-2.6-pci-cacheline-sizing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-pci-cacheline-sizing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-pci-cacheline-sizing.patch	21 Jun 2009 22:22:50 -0000	1.1
+++ linux-2.6-pci-cacheline-sizing.patch	5 Aug 2009 05:37:46 -0000	1.2
@@ -30,7 +30,7 @@ index 2202b62..f371fe8 100644
 +	if (c->x86_clflush_size > 0) {
 +		pci_cache_line_size = c->x86_clflush_size >> 2;
 +		printk(KERN_DEBUG "PCI: pci_cache_line_size set to %d bytes\n",
-+			pci_cache_line_size >> 2);
++			pci_cache_line_size << 2);
 +	} else {
 +		pci_cache_line_size = 32 >> 2;
 +		printk(KERN_DEBUG "PCI: Unknown cacheline size. Setting to 32 bytes\n");



From cebbert at fedoraproject.org  Wed Aug  5 05:45:29 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  5 Aug 2009 05:45:29 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1692,1.1693
Message-ID: <20090805054529.496E711C008C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26696

Modified Files:
	kernel.spec 
Log Message:
Fix /usr/sbin/perf script. (#515494)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -p -r1.1692 -r1.1693
--- kernel.spec	5 Aug 2009 05:37:45 -0000	1.1692
+++ kernel.spec	5 Aug 2009 05:45:27 -0000	1.1693
@@ -1671,7 +1671,7 @@ ls $man9dir | grep -q '' || > $man9dir/B
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 cat <<EOF >>$RPM_BUILD_ROOT/usr/sbin/perf
 #!/bin/bash
-exec /usr/libexec/perf-`uname -r`
+exec /usr/libexec/perf-\$(uname -r)
 EOF
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/perf
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
@@ -1943,6 +1943,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix /usr/sbin/perf script. (#515494)
+
 * Wed Aug 05 2009 Dave Jones <davej at redhat.com>
 - Fix shift in pci cacheline size printk.
 



From dwayne at fedoraproject.org  Wed Aug  5 05:46:57 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  5 Aug 2009 05:46:57 +0000 (UTC)
Subject: rpms/translate-toolkit/devel .cvsignore, 1.17, 1.18 sources, 1.18, 
	1.19 translate-toolkit.spec, 1.33, 1.34
Message-ID: <20090805054657.953A711C008C@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26993

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1
- Update to 1.4.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	31 Jul 2009 20:14:22 -0000	1.17
+++ .cvsignore	5 Aug 2009 05:46:57 -0000	1.18
@@ -1,4 +1 @@
-translate-toolkit-1.3.0.tar.bz2
-translate-toolkit-1.4.0-beta1.tar.bz2
-translate-toolkit-1.4.0-rc1.tar.bz2
-translate-toolkit-1.4.0-rc2.tar.bz2
+translate-toolkit-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	31 Jul 2009 20:14:23 -0000	1.18
+++ sources	5 Aug 2009 05:46:57 -0000	1.19
@@ -1,4 +1 @@
-b21e7b1e382c03ecfeece6eab295840c  translate-toolkit-1.3.0.tar.bz2
-1fd86891d3a8fa0e92d1fed3a04d3697  translate-toolkit-1.4.0-beta1.tar.bz2
-373ea5b4d02ef3c8cc35cdce34c73863  translate-toolkit-1.4.0-rc1.tar.bz2
-e7f1227922ed8a03fbfcb1e63511e73e  translate-toolkit-1.4.0-rc2.tar.bz2
+e588e04d6a71975f62dc96828824a510  translate-toolkit-1.4.0.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- translate-toolkit.spec	31 Jul 2009 20:43:38 -0000	1.33
+++ translate-toolkit.spec	5 Aug 2009 05:46:57 -0000	1.34
@@ -2,14 +2,13 @@
 
 Name:           translate-toolkit
 Version:        1.4.0
-Release:        0.5.rc2%{?dist}
+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/translate/%{name}-%{version}.tar.bz2
-Source0:        http://translate.sourceforge.net/snapshots/%{name}-%{version}-rc2/%{name}-%{version}-rc2.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/1.4.0/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
@@ -49,9 +48,9 @@ Including:
             wiki (MediaWiki, DokuWiki), iCal
     * Specialised - OpenOffice.org GSI/SDF, PHP,
             Mozilla (.dtd, .properties, etc), Symbian,
-            Innosetup, tikiwiki
+            Innosetup, tikiwiki, subtitles
   * Tools: count, search, debug, segment and pretranslate localization 
-            files. Extract terminology from localization files.
+            files. Extract terminology. Pseudo-localize
   * Checkers: validate translations with over 45 checks
 
 %package devel
@@ -67,7 +66,7 @@ toolkit or to use the libraries in other
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q
 %patch0 -p1
 
 
@@ -123,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1
+- Update to 1.4.0 final
+
 * Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-0.5.rc2
 - Fix tarball reference
 



From oget at fedoraproject.org  Wed Aug  5 05:49:58 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  5 Aug 2009 05:49:58 +0000 (UTC)
Subject: rpms/creox/devel creox.desktop,1.1,1.2 creox.spec,1.2,1.3
Message-ID: <20090805054958.9C9F811C008C@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/creox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27947

Modified Files:
	creox.desktop creox.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.2.2-0.4.rc2
- Update .desktop file



Index: creox.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/creox/devel/creox.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- creox.desktop	9 May 2009 23:07:26 -0000	1.1
+++ creox.desktop	5 Aug 2009 05:49:57 -0000	1.2
@@ -6,4 +6,4 @@ Type=Application
 Exec=creox -caption "%c" %i
 Icon=creox
 Terminal=false
-Categories=AudioVideo;Audio;X-Jack;
+Categories=AudioVideo;Audio;X-Jack;X-DigitalProcessing;


Index: creox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/creox/devel/creox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- creox.spec	24 Jul 2009 19:38:54 -0000	1.2
+++ creox.spec	5 Aug 2009 05:49:58 -0000	1.3
@@ -4,7 +4,7 @@ Summary:       Real-time Sound Processor
 Name:          creox
 Group:         Applications/Multimedia
 Version:       0.2.2
-Release:       0.3.%{pre}%{?dist}
+Release:       0.4.%{pre}%{?dist}
 License:       GPLv2
 URL:           http://zyzstar.kosoru.com/?creox
 Source0:       http://zyzstar.kosoru.com/projects/creox/downloads/%{name}-%{version}%{?pre}.tar.bz2
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.2.2-0.4.rc2
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-0.3.rc2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bskeggs at fedoraproject.org  Wed Aug  5 05:54:38 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  5 Aug 2009 05:54:38 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.42, 1.43 kernel.spec, 1.1693,
	1.1694
Message-ID: <20090805055438.5310B11C008C@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: respect nomodeset



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   30 
 drivers/gpu/drm/Makefile                    |    1 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5056 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  227 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  557 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  622 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  595 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   52 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   88 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  143 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  144 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  369 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1131 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   49 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   43 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     | 1027 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_fifo.c      |  683 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  751 
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1018 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  431 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  246 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  567 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  192 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  825 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  116 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1143 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_display.c      |  250 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  291 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  146 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  586 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  192 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_output.c       |  797 +
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv20_graph.c        |  958 +
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  222 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  811 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  153 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  284 
 drivers/gpu/drm/nouveau/nv50_display.c      |  849 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  264 
 drivers/gpu/drm/nouveau/nvreg.h             |  503 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/nouveau_drm.h                   |  214 
 75 files changed, 54259 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- drm-nouveau.patch	4 Aug 2009 06:46:46 -0000	1.42
+++ drm-nouveau.patch	5 Aug 2009 05:54:37 -0000	1.43
@@ -7958,10 +7958,10 @@ index 0000000..f15873f
 +#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..c9b169f
+index 0000000..62b37cb
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
-@@ -0,0 +1,363 @@
+@@ -0,0 +1,369 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -8301,12 +8301,18 @@ index 0000000..c9b169f
 +{
 +	driver.num_ioctls = nouveau_max_ioctl;
 +
-+	if (nouveau_modeset == -1)
++	if (nouveau_modeset == -1) {
++#ifdef CONFIG_VGA_CONSOLE
++		if (vgacon_text_force())
++			nouveau_modeset = 0;
++		else
++#endif
 +#if defined(CONFIG_DRM_NOUVEAU_KMS)
-+		nouveau_modeset = 1;
++			nouveau_modeset = 1;
 +#else
-+		nouveau_modeset = 0;
++			nouveau_modeset = 0;
 +#endif
++	}
 +
 +	if (nouveau_modeset == 1)
 +		driver.driver_features |= DRIVER_MODESET;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1693
retrieving revision 1.1694
diff -u -p -r1.1693 -r1.1694
--- kernel.spec	5 Aug 2009 05:45:27 -0000	1.1693
+++ kernel.spec	5 Aug 2009 05:54:37 -0000	1.1694
@@ -1943,6 +1943,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: respect nomodeset
+
 * Wed Aug 05 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix /usr/sbin/perf script. (#515494)
 



From airlied at fedoraproject.org  Wed Aug  5 05:55:36 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 05:55:36 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.460,
	1.461 xserver-1.6.99-vga-arb.patch, 1.2, 1.3
Message-ID: <20090805055536.8080A11C008C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29566

Modified Files:
	xorg-x11-server.spec xserver-1.6.99-vga-arb.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.6.99-26.20090804
- fix VGA arb device lookup - noticed by mclasen in qemu



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- xorg-x11-server.spec	4 Aug 2009 10:14:56 -0000	1.460
+++ xorg-x11-server.spec	5 Aug 2009 05:55:36 -0000	1.461
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   25.%{gitdate}%{?dist}
+Release:   26.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.6.99-26.20090804
+- fix VGA arb device lookup - noticed by mclasen in qemu
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.6.99-25.20090804
 - fix VGA arb fatal error
 

xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1150 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1521 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.6.99-vga-arb.patch	4 Aug 2009 10:14:56 -0000	1.2
+++ xserver-1.6.99-vga-arb.patch	5 Aug 2009 05:55:36 -0000	1.3
@@ -1,4 +1,4 @@
-From 3e94ca1eb90ded7910edbfa42a63bd832cfa405c Mon Sep 17 00:00:00 2001
+From 5900761f4d2d75674d3d303ef37f60a9dcde4309 Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Mon, 3 Aug 2009 14:09:32 +1000
 Subject: [PATCH] X server: VGA arbitration.
@@ -225,7 +225,7 @@ index f6138c3..fa24813 100644
  	}
 diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
 new file mode 100644
-index 0000000..6a97b7c
+index 0000000..bac5183
 --- /dev/null
 +++ b/hw/xfree86/common/xf86VGAarbiter.c
 @@ -0,0 +1,1150 @@
@@ -355,16 +355,16 @@ index 0000000..6a97b7c
 +    int bus, devi, func;
 +    GDevPtr dev_tmp;
 +    struct pci_device *dev;
++    EntityInfoPtr entity;
 +
 +    if (vga_no_arb)
 +	return;
 +
-+    dev_tmp = xf86GetDevFromEntity(pScrn->entityList[0],
-+                                   pScrn->entityInstanceList[0]);
-+    sscanf(dev_tmp->busID, "PCI:%d:%d:%d", &bus, &devi, &func);
-+    ErrorF("registering PCI:%d:%d:%d with the VGA arbitration\n", bus, devi, func);
++    entity = xf86GetEntityInfo(pScrn->entityList[0]);
++    if (entity->type != BUS_PCI)
++	return;
 +
-+    dev = pci_device_find_by_slot(0, bus, devi, func);
++    dev = entity->bus.id.pci;
 +    pScrn->vgaDev = dev;
 +}
 +



From bskeggs at fedoraproject.org  Wed Aug  5 06:00:26 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Wed,  5 Aug 2009 06:00:26 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.38,
	1.39 nouveau-bicubic-2x.patch, 1.5,
	1.6 nouveau-multiple-xserver.patch, 1.7,
	1.8 nouveau-transition-hack.patch, 1.8, 1.9 sources, 1.39,
	1.40 xorg-x11-drv-nouveau.spec, 1.48, 1.49
Message-ID: <20090805060026.F205211C0349@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30894

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-2.20090803git712064e
- dri2 fixes, no wfb without kms, non-kms fb resize fixes, other misc fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	4 Aug 2009 06:52:52 -0000	1.38
+++ .cvsignore	5 Aug 2009 06:00:25 -0000	1.39
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090803git619103a.tar.bz2
+xf86-video-nouveau-0.0.15-20090805git712064e.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/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-bicubic-2x.patch	4 Aug 2009 06:52:52 -0000	1.5
+++ nouveau-bicubic-2x.patch	5 Aug 2009 06:00:26 -0000	1.6
@@ -1,4 +1,4 @@
-From 9eed08a8ebccf41c5b65c66a15806fd755249106 Mon Sep 17 00:00:00 2001
+From 23a7cd9fcfc2fdc589e86321d96c2c886fd46991 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 3/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-multiple-xserver.patch	4 Aug 2009 06:52:52 -0000	1.7
+++ nouveau-multiple-xserver.patch	5 Aug 2009 06:00:26 -0000	1.8
@@ -1,14 +1,14 @@
-From e90a14ed87748789557583187d6bb3d96c6d117f Mon Sep 17 00:00:00 2001
+From c8327229aa73e2b946d0c1e61f25911f7dd3644b 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
 
 ---
- src/nv_driver.c |   91 ++++++++++++++++++++++++++++++++++++++----------------
- 1 files changed, 64 insertions(+), 27 deletions(-)
+ src/nv_driver.c |   84 +++++++++++++++++++++++++++++++++++++-----------------
+ 1 files changed, 57 insertions(+), 27 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index ad45d19..2ab42e1 100644
+index 62cba05..06023e2 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -19,7 +19,7 @@ index ad45d19..2ab42e1 100644
  
  #include "nv_include.h"
  
-@@ -377,16 +378,24 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -377,6 +378,7 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
   */
  
  /* Mandatory */
@@ -27,17 +27,11 @@ index ad45d19..2ab42e1 100644
  static Bool
  NVEnterVT(int scrnIndex, int flags)
  {
- 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- 	NVPtr pNv = NVPTR(pScrn);
-+	int ret;
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
+@@ -390,8 +392,10 @@ NVEnterVT(int scrnIndex, int flags)
+ 	if (ret)
+ 		ErrorF("Unable to get master: %d\n", ret);
  
 -	if (!pNv->NoAccel)
-+	ret = ioctl(nouveau_device(pNv->dev)->fd, DRM_IOCTL_SET_MASTER, NULL);
-+	if (ret)
-+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to set master\n");
-+
 +	if (!pNv->NoAccel) {
 +		NVMapMemGART(pScrn);
  		NVAccelCommonInit(pScrn);
@@ -45,23 +39,16 @@ index ad45d19..2ab42e1 100644
  
  	if (!pNv->kms_enable) {
  		/* Save current state, VGA fonts etc */
-@@ -429,11 +438,15 @@ NVLeaveVT(int scrnIndex, int flags)
- {
- 	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- 	NVPtr pNv = NVPTR(pScrn);
-+	struct nouveau_device_priv *nvdev = nouveau_device(pNv->dev);
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");
+@@ -440,6 +444,8 @@ NVLeaveVT(int scrnIndex, int flags)
  
  	NVSync(pScrn);
  
 +	nouveau_bo_ref(NULL, &pNv->GART);
-+	ioctl(nvdev->fd, DRM_IOCTL_DROP_MASTER, NULL);
 +
- 	if (!pNv->kms_enable) {
- 		if (pNv->Architecture < NV_ARCH_50)
- 			NVRestore(pScrn);
-@@ -1172,6 +1185,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+ 	ret = drmDropMaster(nouveau_device(pNv->dev)->fd);
+ 	if (ret)
+ 		ErrorF("Error dropping master: %d\n", ret);
+@@ -1185,6 +1191,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  
  
  static Bool
@@ -114,7 +101,7 @@ index ad45d19..2ab42e1 100644
  NVMapMem(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
-@@ -1211,6 +1270,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1224,6 +1276,9 @@ NVMapMem(ScrnInfoPtr pScrn)
  		goto skip_offscreen_gart;
  
  	if (!pNv->exa_driver_pixmaps) {
@@ -124,7 +111,7 @@ index ad45d19..2ab42e1 100644
  		size = (pNv->VRAMPhysicalSize / 2) - size;
  
  		if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1227,6 +1289,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1240,6 +1295,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  			return FALSE;
  		}
  
@@ -132,7 +119,7 @@ index ad45d19..2ab42e1 100644
  		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
  			   "Allocated %dMiB VRAM for offscreen pixmaps\n",
  			   (uint32_t)(pNv->offscreen->size >> 20));
-@@ -1236,32 +1299,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1249,32 +1305,6 @@ NVMapMem(ScrnInfoPtr pScrn)
  		nouveau_bo_unmap(pNv->offscreen);
  	}
  

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-transition-hack.patch	4 Aug 2009 06:52:52 -0000	1.8
+++ nouveau-transition-hack.patch	5 Aug 2009 06:00:26 -0000	1.9
@@ -1,4 +1,4 @@
-From e2d92e84979a51eaedb87ca9b8e44699f0166c7e Mon Sep 17 00:00:00 2001
+From e0b897898184f96a9a8ef8d583b612ea63dbd92b Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] f12: transitions
  1 files changed, 169 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index de1fa00..cbc97c8 100644
+index 3f04be1..2220d04 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -172,6 +172,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	4 Aug 2009 06:52:52 -0000	1.39
+++ sources	5 Aug 2009 06:00:26 -0000	1.40
@@ -1 +1 @@
-edc867f0c964a749e7b535a6a26ad0f6  xf86-video-nouveau-0.0.15-20090803git619103a.tar.bz2
+fbae58a5c8b661a84f96b1d6989a6de3  xf86-video-nouveau-0.0.15-20090805git712064e.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-nouveau.spec	4 Aug 2009 06:52:52 -0000	1.48
+++ xorg-x11-drv-nouveau.spec	5 Aug 2009 06:00:26 -0000	1.49
@@ -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 20090803
-%define git_version 619103a
+%define gitdate 20090805
+%define git_version 712064e
 
 %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:   1.%{snapshot}%{?dist}
+Release:   2.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-2.20090803git712064e
+- dri2 fixes, no wfb without kms, non-kms fb resize fixes, other misc fixes
+
 * Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-1.20090803git619103a
 - upstream update, misc fixes
 



From airlied at fedoraproject.org  Wed Aug  5 06:03:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 06:03:52 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-vga-arb.patch,1.3,1.4
Message-ID: <20090805060352.74EC211C008C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31869

Modified Files:
	xserver-1.6.99-vga-arb.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.6.99-26.20090804
- fix VGA arb device lookup - noticed by mclasen in qemu


xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1149 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1520 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.6.99-vga-arb.patch	5 Aug 2009 05:55:36 -0000	1.3
+++ xserver-1.6.99-vga-arb.patch	5 Aug 2009 06:03:51 -0000	1.4
@@ -1,4 +1,4 @@
-From 5900761f4d2d75674d3d303ef37f60a9dcde4309 Mon Sep 17 00:00:00 2001
+From 0fa02caca3108dee3f1ddfb8ba8ce0b6bb61bcd1 Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Mon, 3 Aug 2009 14:09:32 +1000
 Subject: [PATCH] X server: VGA arbitration.
@@ -14,7 +14,7 @@ test with lots more sigio mouse movement
  hw/xfree86/common/xf86DPMS.c           |    4 +-
  hw/xfree86/common/xf86Init.c           |   11 +-
  hw/xfree86/common/xf86PM.c             |    6 +-
- hw/xfree86/common/xf86VGAarbiter.c     | 1150 ++++++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86VGAarbiter.c     | 1149 ++++++++++++++++++++++++++++++++
  hw/xfree86/common/xf86VGAarbiter.h     |   48 ++
  hw/xfree86/common/xf86VGAarbiterPriv.h |  266 ++++++++
  hw/xfree86/common/xf86str.h            |    4 +-
@@ -23,7 +23,7 @@ test with lots more sigio mouse movement
  hw/xfree86/int10/generic.c             |    2 +
  hw/xfree86/loader/sdksyms.sh           |    1 +
  include/xorg-config.h.in               |    3 +
- 15 files changed, 1521 insertions(+), 10 deletions(-)
+ 15 files changed, 1520 insertions(+), 10 deletions(-)
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.c
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.h
  create mode 100644 hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -225,10 +225,10 @@ index f6138c3..fa24813 100644
  	}
 diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
 new file mode 100644
-index 0000000..bac5183
+index 0000000..9f12490
 --- /dev/null
 +++ b/hw/xfree86/common/xf86VGAarbiter.c
-@@ -0,0 +1,1150 @@
+@@ -0,0 +1,1149 @@
 +/*
 + * This code was stolen from RAC and adapted to control the legacy vga
 + * interface.
@@ -262,6 +262,7 @@ index 0000000..bac5183
 +#define DEBUG
 +#include "xf86VGAarbiter.h"
 +#include "xf86VGAarbiterPriv.h"
++#include "xf86Bus.h"
 +#include "pciaccess.h"
 +
 +#ifdef DEBUG
@@ -352,19 +353,17 @@ index 0000000..bac5183
 +void
 +xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)
 +{
-+    int bus, devi, func;
-+    GDevPtr dev_tmp;
 +    struct pci_device *dev;
-+    EntityInfoPtr entity;
++    EntityPtr pEnt;
 +
 +    if (vga_no_arb)
 +	return;
 +
-+    entity = xf86GetEntityInfo(pScrn->entityList[0]);
-+    if (entity->type != BUS_PCI)
++    pEnt = xf86Entities[pScrn->entityList[0]];
++    if (pEnt->bus.type != BUS_PCI)
 +	return;
 +
-+    dev = entity->bus.id.pci;
++    dev = pEnt->bus.id.pci;
 +    pScrn->vgaDev = dev;
 +}
 +



From akurtakov at fedoraproject.org  Wed Aug  5 06:09:20 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  5 Aug 2009 06:09:20 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.647,1.648
Message-ID: <20090805060920.C0AF811C008C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv921/devel

Modified Files:
	eclipse.spec 
Log Message:
Disable initialize.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -p -r1.647 -r1.648
--- eclipse.spec	4 Aug 2009 12:48:10 -0000	1.647
+++ eclipse.spec	5 Aug 2009 06:09:20 -0000	1.648
@@ -11,7 +11,7 @@ Epoch:  1
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
 %define swtver          3.5.0.v3550
-%define initialize      1
+%define initialize      0
 
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.27%{?dist}
+Release:        0.3.28%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1485,6 +1485,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.28
+- Disable initialize.
+
 * Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.27
 - No need to copy eclipse.ini for secondary archs.
 



From pkgdb at fedoraproject.org  Wed Aug  5 06:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:09:37 +0000
Subject: [pkgdb] anerley was added for pbrobinson
Message-ID: <20090805060937.2FD7A10F89F@bastion2.fedora.phx.redhat.com>

tibbs has added Package anerley with summary Moblin widgets for people information
tibbs has approved Package anerley
tibbs has added a Fedora devel branch for anerley with an owner of pbrobinson
tibbs has approved anerley in Fedora devel
tibbs has approved Package anerley
tibbs has set commit to Approved for 107427 on anerley (Fedora devel)
tibbs has set checkout to Approved for 107427 on anerley (Fedora devel)
tibbs has set build to Approved for 107427 on anerley (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anerley



From pkgdb at fedoraproject.org  Wed Aug  5 06:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:09:37 +0000
Subject: [pkgdb] anerley summary updated by tibbs
Message-ID: <20090805060937.E886C10F8A2@bastion2.fedora.phx.redhat.com>

tibbs set package anerley summary to Moblin widgets for people information

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anerley



From pkgdb at fedoraproject.org  Wed Aug  5 06:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:09:37 +0000
Subject: [pkgdb] anerley (Fedora, 11) updated by tibbs
Message-ID: <20090805060937.F32B110F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for anerley
tibbs has set commit to Approved for 107427 on anerley (Fedora 11)
tibbs has set checkout to Approved for 107427 on anerley (Fedora 11)
tibbs has set build to Approved for 107427 on anerley (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anerley



From tibbs at fedoraproject.org  Wed Aug  5 06:09:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:09:44 +0000 (UTC)
Subject: rpms/anerley - New directory
Message-ID: <20090805060944.36E8D11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anerley
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsds1119/rpms/anerley

Log Message:
Directory /cvs/pkgs/rpms/anerley added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:09:44 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:09:44 +0000 (UTC)
Subject: rpms/anerley/devel - New directory
Message-ID: <20090805060944.7BAD511C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsds1119/rpms/anerley/devel

Log Message:
Directory /cvs/pkgs/rpms/anerley/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:09:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:09:50 +0000 (UTC)
Subject: rpms/anerley Makefile,NONE,1.1
Message-ID: <20090805060950.BC33411C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anerley
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsds1119/rpms/anerley

Added Files:
	Makefile 
Log Message:
Setup of module anerley


--- NEW FILE Makefile ---
# Top level Makefile for module anerley
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 06:09:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:09:51 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090805060951.3D3CF11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsds1119/rpms/anerley/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module anerley


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: anerley
# $Id: Makefile,v 1.1 2009/08/05 06:09:50 tibbs Exp $
NAME := anerley
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 06:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:10:12 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Session-Store-Cache was added for
	iarnell
Message-ID: <20090805061012.954FF10F8AC@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-Catalyst-Plugin-Session-Store-Cache with summary Store sessions using a Catalyst::Plugin::Cache
tibbs has approved Package perl-Catalyst-Plugin-Session-Store-Cache
tibbs has added a Fedora devel branch for perl-Catalyst-Plugin-Session-Store-Cache with an owner of iarnell
tibbs has approved perl-Catalyst-Plugin-Session-Store-Cache in Fedora devel
tibbs has approved Package perl-Catalyst-Plugin-Session-Store-Cache
tibbs has set commit to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora devel)
tibbs has set build to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Session-Store-Cache



From pkgdb at fedoraproject.org  Wed Aug  5 06:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:10:13 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Session-Store-Cache summary updated by
	tibbs
Message-ID: <20090805061013.CDA8110F8BA@bastion2.fedora.phx.redhat.com>

tibbs set package perl-Catalyst-Plugin-Session-Store-Cache summary to Store sessions using a Catalyst::Plugin::Cache

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Session-Store-Cache



From pkgdb at fedoraproject.org  Wed Aug  5 06:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:10:13 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Session-Store-Cache (Fedora,
	11) updated by tibbs
Message-ID: <20090805061013.DDCD410F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-Catalyst-Plugin-Session-Store-Cache
tibbs has set commit to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 11)
tibbs has set build to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 11)
tibbs approved watchbugzilla on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 11) for perl-sig
tibbs approved watchcommits on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Session-Store-Cache



From pkgdb at fedoraproject.org  Wed Aug  5 06:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:10:13 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Session-Store-Cache (Fedora,
	11) updated by tibbs
Message-ID: <20090805061013.E9FAA10F8BD@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on perl-Catalyst-Plugin-Session-Store-Cache (Fedora devel) for perl-sig
tibbs approved watchcommits on perl-Catalyst-Plugin-Session-Store-Cache (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Session-Store-Cache



From tibbs at fedoraproject.org  Wed Aug  5 06:10:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:10:20 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache - New directory
Message-ID: <20090805061020.1F9F711C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuF1521/rpms/perl-Catalyst-Plugin-Session-Store-Cache

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:10:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:10:20 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel - New directory
Message-ID: <20090805061020.5CE4D11C04E3@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuF1521/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:10:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:10:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache Makefile,NONE,1.1
Message-ID: <20090805061027.6533A11C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuF1521/rpms/perl-Catalyst-Plugin-Session-Store-Cache

Added Files:
	Makefile 
Log Message:
Setup of module perl-Catalyst-Plugin-Session-Store-Cache


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Catalyst-Plugin-Session-Store-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 tibbs at fedoraproject.org  Wed Aug  5 06:10:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:10:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090805061027.D1EAC11C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsuF1521/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Catalyst-Plugin-Session-Store-Cache


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Catalyst-Plugin-Session-Store-Cache
# $Id: Makefile,v 1.1 2009/08/05 06:10:27 tibbs Exp $
NAME := perl-Catalyst-Plugin-Session-Store-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  Wed Aug  5 06:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:10:13 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Session-Store-Cache (Fedora,
	11) updated by tibbs
Message-ID: <20090805061014.07E4D10F8C1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for perl-Catalyst-Plugin-Session-Store-Cache
tibbs has set commit to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 10)
tibbs has set checkout to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 10)
tibbs has set build to Approved for 107427 on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 10)
tibbs approved watchbugzilla on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 10) for perl-sig
tibbs approved watchcommits on perl-Catalyst-Plugin-Session-Store-Cache (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Session-Store-Cache



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:18 +0000
Subject: [pkgdb] perl-DBIx-Class-TimeStamp was added for iarnell
Message-ID: <20090805061118.AD25A10F8A0@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-DBIx-Class-TimeStamp with summary DBIx::Class extension to update and create date and time based fields
tibbs has approved Package perl-DBIx-Class-TimeStamp
tibbs has added a Fedora devel branch for perl-DBIx-Class-TimeStamp with an owner of iarnell
tibbs has approved perl-DBIx-Class-TimeStamp in Fedora devel
tibbs has approved Package perl-DBIx-Class-TimeStamp
tibbs has set commit to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora devel)
tibbs has set build to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-TimeStamp



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:19 +0000
Subject: [pkgdb] perl-DBIx-Class-TimeStamp summary updated by tibbs
Message-ID: <20090805061119.F30CC10F8A2@bastion2.fedora.phx.redhat.com>

tibbs set package perl-DBIx-Class-TimeStamp summary to DBIx::Class extension to update and create date and time based fields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-TimeStamp



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:19 +0000
Subject: [pkgdb] perl-DBIx-Class-TimeStamp (Fedora, 11) updated by tibbs
Message-ID: <20090805061120.0757A10F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-DBIx-Class-TimeStamp
tibbs has set commit to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora 11)
tibbs has set build to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora 11)
tibbs approved watchbugzilla on perl-DBIx-Class-TimeStamp (Fedora 11) for perl-sig
tibbs approved watchcommits on perl-DBIx-Class-TimeStamp (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-TimeStamp



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:19 +0000
Subject: [pkgdb] perl-DBIx-Class-TimeStamp (Fedora, 11) updated by tibbs
Message-ID: <20090805061120.0FA0C10F8B6@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on perl-DBIx-Class-TimeStamp (Fedora devel) for perl-sig
tibbs approved watchcommits on perl-DBIx-Class-TimeStamp (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-TimeStamp



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:19 +0000
Subject: [pkgdb] perl-DBIx-Class-TimeStamp (Fedora, 11) updated by tibbs
Message-ID: <20090805061120.296FF10F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for perl-DBIx-Class-TimeStamp
tibbs has set commit to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora 10)
tibbs has set checkout to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora 10)
tibbs has set build to Approved for 107427 on perl-DBIx-Class-TimeStamp (Fedora 10)
tibbs approved watchbugzilla on perl-DBIx-Class-TimeStamp (Fedora 10) for perl-sig
tibbs approved watchcommits on perl-DBIx-Class-TimeStamp (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Class-TimeStamp



From tibbs at fedoraproject.org  Wed Aug  5 06:11:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:11:26 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/devel - New directory
Message-ID: <20090805061126.4EBC011C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsxG2580/rpms/perl-DBIx-Class-TimeStamp/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:11:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:11:26 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp - New directory
Message-ID: <20090805061126.24FD311C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsxG2580/rpms/perl-DBIx-Class-TimeStamp

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:11:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:11:32 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp Makefile,NONE,1.1
Message-ID: <20090805061132.A7E6C11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsxG2580/rpms/perl-DBIx-Class-TimeStamp

Added Files:
	Makefile 
Log Message:
Setup of module perl-DBIx-Class-TimeStamp


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBIx-Class-TimeStamp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 06:11:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:11:32 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090805061132.F1BEA11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsxG2580/rpms/perl-DBIx-Class-TimeStamp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBIx-Class-TimeStamp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DBIx-Class-TimeStamp
# $Id: Makefile,v 1.1 2009/08/05 06:11:32 tibbs Exp $
NAME := perl-DBIx-Class-TimeStamp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:48 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-PageCache was added for iarnell
Message-ID: <20090805061148.23D7A10F8A1@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-Catalyst-Plugin-PageCache with summary Cache the output of entire pages
tibbs has approved Package perl-Catalyst-Plugin-PageCache
tibbs has added a Fedora devel branch for perl-Catalyst-Plugin-PageCache with an owner of iarnell
tibbs has approved perl-Catalyst-Plugin-PageCache in Fedora devel
tibbs has approved Package perl-Catalyst-Plugin-PageCache
tibbs has set commit to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora devel)
tibbs has set build to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-PageCache



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:49 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-PageCache summary updated by tibbs
Message-ID: <20090805061149.9154210F8C5@bastion2.fedora.phx.redhat.com>

tibbs set package perl-Catalyst-Plugin-PageCache summary to Cache the output of entire pages

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-PageCache



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:49 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-PageCache (Fedora, 11) updated by tibbs
Message-ID: <20090805061149.9755E10F8C9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-Catalyst-Plugin-PageCache
tibbs has set commit to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora 11)
tibbs has set build to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora 11)
tibbs approved watchbugzilla on perl-Catalyst-Plugin-PageCache (Fedora 11) for perl-sig
tibbs approved watchcommits on perl-Catalyst-Plugin-PageCache (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-PageCache



From pkgdb at fedoraproject.org  Wed Aug  5 06:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:49 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-PageCache (Fedora, 11) updated by tibbs
Message-ID: <20090805061149.9DB8210F8CC@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on perl-Catalyst-Plugin-PageCache (Fedora devel) for perl-sig
tibbs approved watchcommits on perl-Catalyst-Plugin-PageCache (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-PageCache



From tibbs at fedoraproject.org  Wed Aug  5 06:11:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:11:56 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache - New directory
Message-ID: <20090805061156.2039111C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaQ2900/rpms/perl-Catalyst-Plugin-PageCache

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:11:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:11:56 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache/devel - New directory
Message-ID: <20090805061156.4387611C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaQ2900/rpms/perl-Catalyst-Plugin-PageCache/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug  5 06:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:11:49 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-PageCache (Fedora, 11) updated by tibbs
Message-ID: <20090805061149.A847610F8CF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for perl-Catalyst-Plugin-PageCache
tibbs has set commit to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora 10)
tibbs has set checkout to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora 10)
tibbs has set build to Approved for 107427 on perl-Catalyst-Plugin-PageCache (Fedora 10)
tibbs approved watchbugzilla on perl-Catalyst-Plugin-PageCache (Fedora 10) for perl-sig
tibbs approved watchcommits on perl-Catalyst-Plugin-PageCache (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-PageCache



From tibbs at fedoraproject.org  Wed Aug  5 06:12:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:12:02 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache Makefile,NONE,1.1
Message-ID: <20090805061202.92C1011C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaQ2900/rpms/perl-Catalyst-Plugin-PageCache

Added Files:
	Makefile 
Log Message:
Setup of module perl-Catalyst-Plugin-PageCache


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Catalyst-Plugin-PageCache
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 06:12:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:12:02 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090805061202.EF84B11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaQ2900/rpms/perl-Catalyst-Plugin-PageCache/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Catalyst-Plugin-PageCache


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Catalyst-Plugin-PageCache
# $Id: Makefile,v 1.1 2009/08/05 06:12:02 tibbs Exp $
NAME := perl-Catalyst-Plugin-PageCache
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 06:13:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:13:03 +0000
Subject: [pkgdb] dvisvgm was added for mgieseki
Message-ID: <20090805061303.E658710F8B2@bastion2.fedora.phx.redhat.com>

tibbs has added Package dvisvgm with summary A DVI to SVG converter
tibbs has approved Package dvisvgm
tibbs has added a Fedora devel branch for dvisvgm with an owner of mgieseki
tibbs has approved dvisvgm in Fedora devel
tibbs has approved Package dvisvgm
tibbs has set commit to Approved for 107427 on dvisvgm (Fedora devel)
tibbs has set checkout to Approved for 107427 on dvisvgm (Fedora devel)
tibbs has set build to Approved for 107427 on dvisvgm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvisvgm



From pkgdb at fedoraproject.org  Wed Aug  5 06:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:13:04 +0000
Subject: [pkgdb] dvisvgm summary updated by tibbs
Message-ID: <20090805061304.EF7B610F8B6@bastion2.fedora.phx.redhat.com>

tibbs set package dvisvgm summary to A DVI to SVG converter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvisvgm



From pkgdb at fedoraproject.org  Wed Aug  5 06:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:13:04 +0000
Subject: [pkgdb] dvisvgm (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805061305.070C310F8BB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for dvisvgm
tibbs has set commit to Approved for 107427 on dvisvgm (Fedora 11)
tibbs has set checkout to Approved for 107427 on dvisvgm (Fedora 11)
tibbs has set build to Approved for 107427 on dvisvgm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvisvgm



From pkgdb at fedoraproject.org  Wed Aug  5 06:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:13:04 +0000
Subject: [pkgdb] dvisvgm (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805061305.0BBF910F8BD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for dvisvgm
tibbs has set commit to Approved for 107427 on dvisvgm (Fedora 10)
tibbs has set checkout to Approved for 107427 on dvisvgm (Fedora 10)
tibbs has set build to Approved for 107427 on dvisvgm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvisvgm



From pkgdb at fedoraproject.org  Wed Aug  5 06:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:13:04 +0000
Subject: [pkgdb] dvisvgm (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805061305.1D45D10F8C0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for dvisvgm
tibbs has set commit to Approved for 107427 on dvisvgm (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on dvisvgm (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on dvisvgm (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dvisvgm



From tibbs at fedoraproject.org  Wed Aug  5 06:13:11 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:13:11 +0000 (UTC)
Subject: rpms/dvisvgm/devel - New directory
Message-ID: <20090805061311.4390311C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWo3399/rpms/dvisvgm/devel

Log Message:
Directory /cvs/pkgs/rpms/dvisvgm/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:13:11 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:13:11 +0000 (UTC)
Subject: rpms/dvisvgm - New directory
Message-ID: <20090805061311.1DD1711C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dvisvgm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWo3399/rpms/dvisvgm

Log Message:
Directory /cvs/pkgs/rpms/dvisvgm added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:13:18 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:13:18 +0000 (UTC)
Subject: rpms/dvisvgm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090805061318.DC73711C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWo3399/rpms/dvisvgm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dvisvgm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dvisvgm
# $Id: Makefile,v 1.1 2009/08/05 06:13:18 tibbs Exp $
NAME := dvisvgm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Aug  5 06:13:18 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:13:18 +0000 (UTC)
Subject: rpms/dvisvgm Makefile,NONE,1.1
Message-ID: <20090805061318.5571D11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dvisvgm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWo3399/rpms/dvisvgm

Added Files:
	Makefile 
Log Message:
Setup of module dvisvgm


--- NEW FILE Makefile ---
# Top level Makefile for module dvisvgm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug  5 06:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:14:06 +0000
Subject: [pkgdb] nimbus was added for mcepl
Message-ID: <20090805061406.5B74810F8B6@bastion2.fedora.phx.redhat.com>

tibbs has added Package nimbus with summary Desktop theme originally from Sun
tibbs has approved Package nimbus
tibbs has added a Fedora devel branch for nimbus with an owner of mcepl
tibbs has approved nimbus in Fedora devel
tibbs has approved Package nimbus
tibbs has set commit to Approved for 107427 on nimbus (Fedora devel)
tibbs has set checkout to Approved for 107427 on nimbus (Fedora devel)
tibbs has set build to Approved for 107427 on nimbus (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Wed Aug  5 06:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:14:07 +0000
Subject: [pkgdb] nimbus summary updated by tibbs
Message-ID: <20090805061407.3E38610F8B9@bastion2.fedora.phx.redhat.com>

tibbs set package nimbus summary to Desktop theme originally from Sun

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Wed Aug  5 06:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:14:07 +0000
Subject: [pkgdb] nimbus (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805061407.D1D3910F8C4@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for nimbus
tibbs has set commit to Approved for 107427 on nimbus (Fedora 11)
tibbs has set checkout to Approved for 107427 on nimbus (Fedora 11)
tibbs has set build to Approved for 107427 on nimbus (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Wed Aug  5 06:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:14:07 +0000
Subject: [pkgdb] nimbus (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805061408.03DDA10F8C8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for nimbus
tibbs has set commit to Approved for 107427 on nimbus (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on nimbus (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on nimbus (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nimbus



From tibbs at fedoraproject.org  Wed Aug  5 06:14:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:14:13 +0000 (UTC)
Subject: rpms/nimbus - New directory
Message-ID: <20090805061413.1932C11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nimbus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvssv3886/rpms/nimbus

Log Message:
Directory /cvs/pkgs/rpms/nimbus added to the repository




From pkgdb at fedoraproject.org  Wed Aug  5 06:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:14:07 +0000
Subject: [pkgdb] nimbus (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805061408.0FAC110F8CA@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for nimbus
tibbs has set commit to Approved for 107427 on nimbus (Fedora 10)
tibbs has set checkout to Approved for 107427 on nimbus (Fedora 10)
tibbs has set build to Approved for 107427 on nimbus (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nimbus



From tibbs at fedoraproject.org  Wed Aug  5 06:14:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:14:13 +0000 (UTC)
Subject: rpms/nimbus/devel - New directory
Message-ID: <20090805061413.3EE0211C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nimbus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvssv3886/rpms/nimbus/devel

Log Message:
Directory /cvs/pkgs/rpms/nimbus/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:14:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:14:19 +0000 (UTC)
Subject: rpms/nimbus Makefile,NONE,1.1
Message-ID: <20090805061419.9A3BD11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nimbus
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvssv3886/rpms/nimbus

Added Files:
	Makefile 
Log Message:
Setup of module nimbus


--- NEW FILE Makefile ---
# Top level Makefile for module nimbus
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 06:14:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:14:20 +0000 (UTC)
Subject: rpms/nimbus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090805061420.3047011C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nimbus/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvssv3886/rpms/nimbus/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nimbus


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nimbus
# $Id: Makefile,v 1.1 2009/08/05 06:14:19 tibbs Exp $
NAME := nimbus
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 06:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:16:03 +0000
Subject: [pkgdb] R-preprocessCore was added for pingou
Message-ID: <20090805061604.0A89410F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package R-preprocessCore with summary A collection of pre-processing functions
tibbs has approved Package R-preprocessCore
tibbs has added a Fedora devel branch for R-preprocessCore with an owner of pingou
tibbs has approved R-preprocessCore in Fedora devel
tibbs has approved Package R-preprocessCore
tibbs has set commit to Approved for 107427 on R-preprocessCore (Fedora devel)
tibbs has set checkout to Approved for 107427 on R-preprocessCore (Fedora devel)
tibbs has set build to Approved for 107427 on R-preprocessCore (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-preprocessCore



From pkgdb at fedoraproject.org  Wed Aug  5 06:16:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:16:04 +0000
Subject: [pkgdb] R-preprocessCore summary updated by tibbs
Message-ID: <20090805061604.E95A810F8A0@bastion2.fedora.phx.redhat.com>

tibbs set package R-preprocessCore summary to A collection of pre-processing functions

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-preprocessCore



From pkgdb at fedoraproject.org  Wed Aug  5 06:16:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:16:04 +0000
Subject: [pkgdb] R-preprocessCore (Fedora, 11) updated by tibbs
Message-ID: <20090805061604.F1F5010F8A9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for R-preprocessCore
tibbs has set commit to Approved for 107427 on R-preprocessCore (Fedora 11)
tibbs has set checkout to Approved for 107427 on R-preprocessCore (Fedora 11)
tibbs has set build to Approved for 107427 on R-preprocessCore (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-preprocessCore



From tibbs at fedoraproject.org  Wed Aug  5 06:16:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:16:10 +0000 (UTC)
Subject: rpms/R-preprocessCore - New directory
Message-ID: <20090805061610.1E7A011C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-preprocessCore
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaf4659/rpms/R-preprocessCore

Log Message:
Directory /cvs/pkgs/rpms/R-preprocessCore added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:16:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:16:10 +0000 (UTC)
Subject: rpms/R-preprocessCore/devel - New directory
Message-ID: <20090805061610.5A6C311C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-preprocessCore/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaf4659/rpms/R-preprocessCore/devel

Log Message:
Directory /cvs/pkgs/rpms/R-preprocessCore/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 06:16:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:16:17 +0000 (UTC)
Subject: rpms/R-preprocessCore Makefile,NONE,1.1
Message-ID: <20090805061617.16D8511C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-preprocessCore
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaf4659/rpms/R-preprocessCore

Added Files:
	Makefile 
Log Message:
Setup of module R-preprocessCore


--- NEW FILE Makefile ---
# Top level Makefile for module R-preprocessCore
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 06:16:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 06:16:17 +0000 (UTC)
Subject: rpms/R-preprocessCore/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090805061617.B385A11C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-preprocessCore/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsaf4659/rpms/R-preprocessCore/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-preprocessCore


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-preprocessCore
# $Id: Makefile,v 1.1 2009/08/05 06:16:17 tibbs Exp $
NAME := R-preprocessCore
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 06:16:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 06:16:04 +0000
Subject: [pkgdb] R-preprocessCore (Fedora, 11) updated by tibbs
Message-ID: <20090805061605.074F210F8AF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for R-preprocessCore
tibbs has set commit to Approved for 107427 on R-preprocessCore (Fedora 10)
tibbs has set checkout to Approved for 107427 on R-preprocessCore (Fedora 10)
tibbs has set build to Approved for 107427 on R-preprocessCore (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-preprocessCore



From dwayne at fedoraproject.org  Wed Aug  5 06:16:50 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  5 Aug 2009 06:16:50 +0000 (UTC)
Subject: rpms/translate-toolkit/F-11 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 translate-toolkit.spec, 1.32, 1.33
Message-ID: <20090805061650.E47DC11C008C@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-serv4927

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1
- Update to 1.4.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	31 Jul 2009 20:54:42 -0000	1.17
+++ .cvsignore	5 Aug 2009 06:16:50 -0000	1.18
@@ -1,4 +1 @@
-translate-toolkit-1.3.0.tar.bz2
-translate-toolkit-1.4.0-beta1.tar.bz2
-translate-toolkit-1.4.0-rc1.tar.bz2
-translate-toolkit-1.4.0-rc2.tar.bz2
+translate-toolkit-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	31 Jul 2009 20:54:42 -0000	1.18
+++ sources	5 Aug 2009 06:16:50 -0000	1.19
@@ -1,4 +1 @@
-b21e7b1e382c03ecfeece6eab295840c  translate-toolkit-1.3.0.tar.bz2
-1fd86891d3a8fa0e92d1fed3a04d3697  translate-toolkit-1.4.0-beta1.tar.bz2
-373ea5b4d02ef3c8cc35cdce34c73863  translate-toolkit-1.4.0-rc1.tar.bz2
-e7f1227922ed8a03fbfcb1e63511e73e  translate-toolkit-1.4.0-rc2.tar.bz2
+e588e04d6a71975f62dc96828824a510  translate-toolkit-1.4.0.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/translate-toolkit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- translate-toolkit.spec	31 Jul 2009 20:54:42 -0000	1.32
+++ translate-toolkit.spec	5 Aug 2009 06:16:50 -0000	1.33
@@ -2,14 +2,13 @@
 
 Name:           translate-toolkit
 Version:        1.4.0
-Release:        0.4.rc2%{?dist}
+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/translate/%{name}-%{version}.tar.bz2
-Source0:        http://translate.sourceforge.net/snapshots/%{name}-%{version}-rc2/%{name}-%{version}-rc2.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/1.4.0/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
@@ -49,9 +48,9 @@ Including:
             wiki (MediaWiki, DokuWiki), iCal
     * Specialised - OpenOffice.org GSI/SDF, PHP,
             Mozilla (.dtd, .properties, etc), Symbian,
-            Innosetup, tikiwiki
+            Innosetup, tikiwiki, subtitles
   * Tools: count, search, debug, segment and pretranslate localization 
-            files. Extract terminology from localization files.
+            files. Extract terminology. Pseudo-localize
   * Checkers: validate translations with over 45 checks
 
 %package devel
@@ -67,7 +66,7 @@ toolkit or to use the libraries in other
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q
 %patch0 -p1
 
 
@@ -123,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1
+- Update to 1.4.0 final
+
 * Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-0.4.rc2
 - Update to 1.4.0 rc2:
    - Some small fixes for XLIFF support



From xhorak at fedoraproject.org  Wed Aug  5 06:37:09 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  5 Aug 2009 06:37:09 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.62,1.63
Message-ID: <20090805063709.3B31711C008C@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-serv10048

Modified Files:
	epiphany-extensions.spec 
Log Message:
Rebuild against newer gecko


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- epiphany-extensions.spec	24 Jul 2009 20:00:18 -0000	1.62
+++ epiphany-extensions.spec	5 Aug 2009 06:37:01 -0000	1.63
@@ -1,10 +1,10 @@
 %global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.12
+%global gecko_version       1.9.0.13
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -114,6 +114,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Wed Aug  5 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-4
+- Rebuild against newer gecko
+
 * Fri Jul 24 2009 Peter Gordon <peter at thecodergeek.com> - 2.24.3-3
 - Rebuild against newer gecko (1.9.0.12).
 - Resolves: #513648 (epiphany-extensions dependencies block a security update)



From rakesh at fedoraproject.org  Wed Aug  5 06:53:32 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Wed,  5 Aug 2009 06:53:32 +0000 (UTC)
Subject: rpms/gflags/devel .cvsignore, 1.3, 1.4 gflags.spec, 1.6,
	1.7 import.log, 1.2, 1.3 sources, 1.3,
	1.4 gflags-1.0-gcc44.patch, 1.1, NONE
Message-ID: <20090805065332.511A211C008C@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14049/devel

Modified Files:
	.cvsignore gflags.spec import.log sources 
Removed Files:
	gflags-1.0-gcc44.patch 
Log Message:
Updated to 1.1 and fixed FTBFS #511721



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jan 2009 21:55:15 -0000	1.3
+++ .cvsignore	5 Aug 2009 06:53:29 -0000	1.4
@@ -1 +1 @@
-gflags-1.0.tar.gz
+gflags-1.1.tar.gz


Index: gflags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/gflags.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gflags.spec	24 Jul 2009 23:55:39 -0000	1.6
+++ gflags.spec	5 Aug 2009 06:53:30 -0000	1.7
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gflags
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Library for commandline flag processing
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://code.google.com/p/google-%{name}/
 Source0:        http://google-%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         %{name}-1.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-setuptools-devel
 
@@ -31,7 +30,6 @@ This package contains development files 
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 
 %build
 %configure --disable-static
@@ -78,24 +76,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gflags_completions.sh
 %{_bindir}/gflags2man.py
 %{_libdir}/libgflags.so.*
+%{_libdir}/libgflags_nothreads.so.*
 %{python_sitelib}/gflags.py
 %{python_sitelib}/gflags.pyc
 %{python_sitelib}/gflags.pyo
 %{python_sitelib}/*egg-info
-%exclude %{_bindir}/*.pyc
-%exclude %{_bindir}/*.pyo
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/designstyle.css doc/gflags.html
 %{_libdir}/libgflags.so
+%{_libdir}/libgflags_nothreads.so
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %dir %{_includedir}/google
 %{_includedir}/google/*.h
 
 %changelog
+* Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.1-1
+- removed extra files included in %%files section and updated to 1.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jan 2009 21:55:15 -0000	1.2
+++ import.log	5 Aug 2009 06:53:30 -0000	1.3
@@ -1,2 +1,3 @@
 gflags-0_9-6_fc10:HEAD:gflags-0.9-6.fc10.src.rpm:1222674675
 gflags-1_0-1_fc10:HEAD:gflags-1.0-1.fc10.src.rpm:1232013079
+gflags-1_1-1_fc11:HEAD:gflags-1.1-1.fc11.src.rpm:1249455264


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jan 2009 21:55:15 -0000	1.3
+++ sources	5 Aug 2009 06:53:30 -0000	1.4
@@ -1 +1 @@
-20125f5248f32214a5af20f67f115377  gflags-1.0.tar.gz
+91816d7c96f06d1929f4a4fff6b47864  gflags-1.1.tar.gz


--- gflags-1.0-gcc44.patch DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 07:14:50 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 07:14:50 +0000 (UTC)
Subject: rpms/kernel/devel revert-ftrace-powerpc-snafu.patch, NONE,
	1.1 kernel.spec, 1.1694, 1.1695
Message-ID: <20090805071451.0671511C008C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21393

Modified Files:
	kernel.spec 
Added Files:
	revert-ftrace-powerpc-snafu.patch 
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.129.rc5.git3
- revert-ftrace-powerpc-snafu.patch - fix ppc build


revert-ftrace-powerpc-snafu.patch:
 recordmcount.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revert-ftrace-powerpc-snafu.patch ---
commit 4e7fea66de82caf76bf11213150b629562cca74b
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date:   Wed Aug 5 17:07:10 2009 +1000

    Revert "ftrace: Fix the conditional that updates $ref_func"
    
    This reverts commit fc4c73554c9d93b3e495f2f7acae1323b0d5db84.

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index d29baa2..d99b343 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -414,7 +414,7 @@ while (<IN>) {
 	    $offset = hex $1;
 	} else {
 	    # if we already have a function, and this is weak, skip it
-	    if (!defined($ref_func) && !defined($weak{$text})) {
+	    if (!defined($ref_func) || !defined($weak{$text})) {
 		$ref_func = $text;
 		$offset = hex $1;
 	    }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -p -r1.1694 -r1.1695
--- kernel.spec	5 Aug 2009 05:54:37 -0000	1.1694
+++ kernel.spec	5 Aug 2009 07:14:49 -0000	1.1695
@@ -588,6 +588,8 @@ Patch05: linux-2.6-makefile-after_link.p
 
 %if !%{nopatches}
 
+# revert powerpc breakage
+Patch08: revert-ftrace-powerpc-snafu.patch
 # revert upstream patches we get via other methods
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
@@ -1109,6 +1111,7 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
+ApplyPatch revert-ftrace-powerpc-snafu.patch
 #ApplyPatch git-cpufreq.patch
 #ApplyPatch git-bluetooth.patch
 
@@ -1943,6 +1946,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.132.rc5.git3
+- revert-ftrace-powerpc-snafu.patch - fix ppc build
+
 * Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: respect nomodeset
 



From rakesh at fedoraproject.org  Wed Aug  5 07:42:04 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Wed,  5 Aug 2009 07:42:04 +0000 (UTC)
Subject: rpms/svgalib/devel import.log, NONE,
	1.1 svgalib-1.9.25-round_gtf_gtfcalc_c.patch, NONE,
	1.1 svgalib.spec, 1.14, 1.15
Message-ID: <20090805074204.3CDC211C008C@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/svgalib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27627/devel

Modified Files:
	svgalib.spec 
Added Files:
	import.log svgalib-1.9.25-round_gtf_gtfcalc_c.patch 
Log Message:
Fixed FTBFS #511561



--- NEW FILE import.log ---
svgalib-1_9_25-8_fc11:HEAD:svgalib-1.9.25-8.fc11.src.rpm:1249458342

svgalib-1.9.25-round_gtf_gtfcalc_c.patch:
 gtfcalc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE svgalib-1.9.25-round_gtf_gtfcalc_c.patch ---
--- svgalib-1.9.25.org/utils/gtf/gtfcalc.c	2009-08-05 13:05:26.473160060 +0530
+++ svgalib-1.9.25/utils/gtf/gtfcalc.c	2009-08-05 13:05:41.876227891 +0530
@@ -64,7 +64,7 @@
 
 /*-------------------------- Implementation -------------------------------*/
 
-static double round(double v)
+double round(double v)
 {
 	return floor(v + 0.5);
 }


Index: svgalib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- svgalib.spec	27 Jul 2009 05:10:16 -0000	1.14
+++ svgalib.spec	5 Aug 2009 07:42:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.25
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Low-level fullscreen SVGA graphics library
 Group:		System Environment/Libraries
 License:	Public Domain
@@ -12,6 +12,7 @@ Patch1:		svgalib-1.4.3-fhs.patch
 Patch2:		svgalib-1.9.21-demos.patch
 Patch3:		svgalib-1.9.21-cfg.patch
 Patch4:		svgalib-1.9.25-kernel-2.6.26.patch
+Patch5:		svgalib-1.9.25-round_gtf_gtfcalc_c.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Exclusivearch:	%{ix86} x86_64
 
@@ -42,6 +43,7 @@ library.
 %patch2 -p1
 %patch3 -p1 -b .defaultcfg
 %patch4 -p1
+%patch5 -p1 -b .round_gtf_gtfcalc_c
 
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
 #demo dir
@@ -132,6 +134,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.9.25-8
+- Fixed FTBFS #511561 with svgalib-1.9.25-round_gtf_gtfcalc_c.patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.25-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From beekhof at fedoraproject.org  Wed Aug  5 07:45:30 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed,  5 Aug 2009 07:45:30 +0000 (UTC)
Subject: rpms/cluster-glue/devel cluster-glue.spec,1.1,1.2
Message-ID: <20090805074530.61F8D11C008C@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29236

Modified Files:
	cluster-glue.spec 
Log Message:
Use %{_libdir}/ocf as the location for resource agents


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cluster-glue.spec	29 Jul 2009 06:49:37 -0000	1.1
+++ cluster-glue.spec	5 Aug 2009 07:45:29 -0000	1.2
@@ -13,7 +13,7 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}7%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}8%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Base
@@ -43,7 +43,8 @@ BuildRequires: libuuid-devel
 		--enable-fatal-warnings=no   \
 		--localstatedir=%{_var}      \
 		--with-daemon-group=%{gname} \
-		--with-daemon-user=%{uname}
+		--with-daemon-user=%{uname}  \
+		--with-ocf-root=%{_libdir}/ocf 
 
 %build
 make %{_smp_mflags}
@@ -165,6 +166,9 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Wed Aug  5 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.8.75cab275433e.hg
+- Use %{_libdir}/ocf for resource agents
+
 * Tue Jul  28 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.7.75cab275433e.hg
 - Add a leading zero to the revision when alphatag is used
 



From adrian at fedoraproject.org  Wed Aug  5 07:45:37 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed,  5 Aug 2009 07:45:37 +0000 (UTC)
Subject: rpms/wordpress/F-11 wordpress.spec,1.30,1.31
Message-ID: <20090805074537.D2EE911C008C@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29284

Modified Files:
	wordpress.spec 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/wordpress.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- wordpress.spec	28 Jul 2009 08:52:42 -0000	1.30
+++ wordpress.spec	5 Aug 2009 07:45:37 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.2
+Version: 2.8.3
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
+- updated to 2.8.3 for security fixes
+
 * Tue Jul 28 2009 Adrian Reber <adrian at lisas.de> - 2.8.2-1
 - updated to 2.8.2 for security fixes - BZ 512900
 - fixed "wrong-script-end-of-line-encoding" of license.txt



From kasal at fedoraproject.org  Wed Aug  5 07:46:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  5 Aug 2009 07:46:00 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.53,1.54
Message-ID: <20090805074600.2D62A11C008C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29391

Modified Files:
	util-linux-ng.spec 
Log Message:
* Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> 2.16-4
- set conflict with versions of e2fsprogs containing fsck


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- util-linux-ng.spec	30 Jul 2009 21:29:42 -0000	1.53
+++ util-linux-ng.spec	5 Aug 2009 07:45:59 -0000	1.54
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -50,8 +50,8 @@ Source11: http://download.sourceforge.ne
 Conflicts: initscripts <= 4.58
 %endif
 Conflicts: kernel < 2.2.12-7
-# old versions of e2fsprogs provides libblkid
-Conflicts: e2fsprogs < 1.41.6-2
+# old versions of e2fsprogs contain fsck, uuidgen
+Conflicts: e2fsprogs < 1.41.8-5
 
 # old versions of util-linux have been splited to more sub-packages
 Obsoletes: mount < 2.11, losetup < 2.11
@@ -707,6 +707,9 @@ fi
 
 
 %changelog
+* Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> 2.16-4
+- set conflict with versions of e2fsprogs containing fsck
+
 * Thu Jul 30 2009 Karel Zak <kzak at redhat.com> 2.16-3
 - remove the mount.conf support (see #214891)
 



From adrian at fedoraproject.org  Wed Aug  5 07:45:55 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed,  5 Aug 2009 07:45:55 +0000 (UTC)
Subject: rpms/wordpress/F-10 wordpress.spec,1.30,1.31
Message-ID: <20090805074555.0EC9011C008C@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29356

Modified Files:
	wordpress.spec 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/wordpress.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- wordpress.spec	28 Jul 2009 08:53:16 -0000	1.30
+++ wordpress.spec	5 Aug 2009 07:45:54 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.2
+Version: 2.8.3
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
+- updated to 2.8.3 for security fixes
+
 * Tue Jul 28 2009 Adrian Reber <adrian at lisas.de> - 2.8.2-1
 - updated to 2.8.2 for security fixes - BZ 512900
 - fixed "wrong-script-end-of-line-encoding" of license.txt



From adrian at fedoraproject.org  Wed Aug  5 07:46:30 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed,  5 Aug 2009 07:46:30 +0000 (UTC)
Subject: rpms/wordpress/EL-5 wordpress.spec,1.29,1.30
Message-ID: <20090805074630.E533411C008C@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29511

Modified Files:
	wordpress.spec 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/wordpress.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- wordpress.spec	28 Jul 2009 08:53:46 -0000	1.29
+++ wordpress.spec	5 Aug 2009 07:46:30 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.2
+Version: 2.8.3
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
+- updated to 2.8.3 for security fixes
+
 * Tue Jul 28 2009 Adrian Reber <adrian at lisas.de> - 2.8.2-1
 - updated to 2.8.2 for security fixes - BZ 512900
 - fixed "wrong-script-end-of-line-encoding" of license.txt



From pbrobinson at fedoraproject.org  Wed Aug  5 07:49:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  5 Aug 2009 07:49:37 +0000 (UTC)
Subject: rpms/anerley/devel anerley.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805074937.2B8D511C008C@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anerley.spec import.log 
Log Message:
- Initial import



--- NEW FILE anerley.spec ---
Name:           anerley
Version:        0.0.20
Release:        1%{?dist}
Summary:        Moblin widgets for people information

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://www.moblin.org/
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: evolution-data-server-devel
BuildRequires: glib2-devel
BuildRequires: nbtk-devel
BuildRequires: telepathy-glib-devel
BuildRequires: telepathy-mission-control-devel
BuildRequires: pkgconfig

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: intltool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: gnome-common

%description
Moblin widgets for management of people information using telepathy 
and associated protocols

%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
./autogen.sh
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/*.so.*
%{_datadir}/anerley

%files devel
%defattr(-,root,root,-)
%{_includedir}/anerley
%{_libdir}/pkgconfig/anerley.pc
%{_libdir}/*.so

%changelog
* Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-1
- New upstream release - 0.0.20

* Mon Jul 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.18-1
- New upstream release - 0.0.18

* Wed Jul 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.17-1
- New upstream release - 0.0.17, add translations

* Sat Jul 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.15-1
- New upstream release - 0.0.15

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.13-1
- New upstream release, review feedback

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.9-1
- Initial packaging


--- NEW FILE import.log ---
anerley-0_0_20-1_fc11:HEAD:anerley-0.0.20-1.fc11.src.rpm:1249458481


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:09:50 -0000	1.1
+++ .cvsignore	5 Aug 2009 07:49:36 -0000	1.2
@@ -0,0 +1 @@
+anerley-0.0.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:09:51 -0000	1.1
+++ sources	5 Aug 2009 07:49:36 -0000	1.2
@@ -0,0 +1 @@
+7e3d52f677cb99dc2fb729295f9c559b  anerley-0.0.20.tar.bz2



From pingou at fedoraproject.org  Wed Aug  5 07:55:15 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 07:55:15 +0000 (UTC)
Subject: rpms/R-preprocessCore/devel R-preprocessCore.spec, NONE,
	1.1 import.log, NONE, 1.1 preprocessCore_license, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805075515.BD65F11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-preprocessCore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32057/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R-preprocessCore.spec import.log preprocessCore_license 
Log Message:
Original import



--- NEW FILE R-preprocessCore.spec ---
%global packname  preprocessCore
%global bioc     2.4

Name:             R-%{packname}
Version:          1.6.0
Release:          2%{?dist}
Summary:          A collection of pre-processing functions

Group:            Applications/Engineering 
License:          LGPLv2+  
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
Source1:          preprocessCore_license
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R-methods
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R-methods 

%package           devel
Summary:           Development files for %{name}        
Group:             Development/Libraries
Requires:          %{name} = %{version} 


%description
A library of core preprocessing routines

%description    devel
The %{name}-devel  package contains Header and libraries files for
developing applications that use %{name}

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

## Keep the headers of place for the -devel
## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html

install -m 664 -p %{SOURCE1}  %{buildroot}%{_libdir}/R/library/%{packname}

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
#i386 arch
%dir %{_libdir}/R/library/%{packname}
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%doc %{_libdir}/R/library/%{packname}/preprocessCore_license
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/libs
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/help

%files          devel
%defattr(-,root,root,-)
%{_libdir}/R/library/%{packname}/include/

%changelog
* Tue Aug 04 2009 pingou <pingou at pingoured.fr> 1.6.0-2
- Add the file preprocessCore_license which contains the mail from upstream regarding the license

* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.6.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-preprocessCore-1_6_0-2_fc11:HEAD:R-preprocessCore-1.6.0-2.fc11.src.rpm:1249458870


--- NEW FILE preprocessCore_license ---
>From bmb at bmbolstad.com Sat Aug  1 21:11:42 2009
Return-Path: <bmb at bmbolstad.com>
Delivered-To: pingou at pingoured.fr
Received: from b0.ovh.net (HELO queue) (213.186.33.50) by b0.ovh.net with
 SMTP; 1 Aug 2009 21:11:42 -0000
Received: from nila.lunarpages.com (216.97.230.70) by mx0.ovh.net with
 SMTP; 1 Aug 2009 21:11:41 -0000
Received: from localhost ([127.0.0.1] helo=bmbolstad.com) by
 nila.lunarpages.com with esmtpa (Exim 4.69) (envelope-from
 <bmb at bmbolstad.com>) id 1MXLrM-0002qg-Hn for pingou at pingoured.fr; Sat, 01
 Aug 2009 14:11:20 -0700
Received: from 99.37.156.253 ([99.37.156.253]) (SquirrelMail authenticated
 user bmb at bmbolstad.com) by bmbolstad.com with HTTP; Sat, 1 Aug 2009
 14:11:20 -0700 (PDT)
Message-ID: <27028.99.37.156.253.1249161080.squirrel at bmbolstad.com>
In-Reply-To: <1249158185.2765.3.camel at red.localdomain>
References: <1249158185.2765.3.camel at red.localdomain>
Date: Sat, 1 Aug 2009 14:11:20 -0700 (PDT)
Subject: Re: preprocessCore license
From: bmb at bmbolstad.com
To: "Pierre-Yves" <pingou at pingoured.fr>
User-Agent: SquirrelMail/1.4.13
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
X-Priority: 3 (Normal)
Importance: Normal
X-AntiAbuse: This header was added to track abuse, please include it with
 any abuse report
X-AntiAbuse: Primary Hostname - nila.lunarpages.com
X-AntiAbuse: Original Domain - pingoured.fr
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - bmbolstad.com
X-Source: 
X-Source-Args: 
X-Source-Dir: 
X-Ovh-Tracer-Id: 12649766930274309798
X-Ovh-Remote: 216.97.230.70 (nila.lunarpages.com)
X-Ovh-Local: 213.186.33.32 (mx0.ovh.net)
X-Spam-Check: DONE|U 0.5/N
X-Evolution-Source: imap://pingou%40pingoured.fr at ssl0.ovh.net/
Content-Transfer-Encoding: 8bit

The licence in the DESCRIPTION is the intended licence




> Dear Mr,
>
> My name is Pierre-Yves Chibon and I am involved in the linux
> distribution Fedora as packager.
> I am particularly taking care of R package and I come to the point of
> packaging your library preprocessCore for Fedora.
>
> In the process of review of the package [1] before its integration it
> comes to the view of the reviewer that there are some contradiction in
> the license of the library.
> The description file mentions LGPL version 2 or later while several of
> the C files in the src folder are under GPL version 2 or later.
>
> Could you please clarify the license of the library ?
>
> Thanks in advance for your help,
>
> Best regards,
>
> Pierre
>
>
> [1] https://bugzilla.redhat.com/show_bug.cgi?id=515080
>
>




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-preprocessCore/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:16:17 -0000	1.1
+++ .cvsignore	5 Aug 2009 07:55:15 -0000	1.2
@@ -0,0 +1 @@
+preprocessCore_1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-preprocessCore/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:16:17 -0000	1.1
+++ sources	5 Aug 2009 07:55:15 -0000	1.2
@@ -0,0 +1 @@
+7a56f8a97da4f117b61c601e656a5a83  preprocessCore_1.6.0.tar.gz



From pingou at fedoraproject.org  Wed Aug  5 07:56:31 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 07:56:31 +0000 (UTC)
Subject: rpms/R-preprocessCore/F-10 R-preprocessCore.spec, NONE,
	1.1 import.log, 
	NONE, 1.1 preprocessCore_license, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805075631.5C59D11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-preprocessCore/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32497/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	R-preprocessCore.spec import.log preprocessCore_license 
Log Message:
Original import



--- NEW FILE R-preprocessCore.spec ---
%global packname  preprocessCore
%global bioc     2.4

Name:             R-%{packname}
Version:          1.6.0
Release:          2%{?dist}
Summary:          A collection of pre-processing functions

Group:            Applications/Engineering 
License:          LGPLv2+  
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
Source1:          preprocessCore_license
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R-methods
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R-methods 

%package           devel
Summary:           Development files for %{name}        
Group:             Development/Libraries
Requires:          %{name} = %{version} 


%description
A library of core preprocessing routines

%description    devel
The %{name}-devel  package contains Header and libraries files for
developing applications that use %{name}

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

## Keep the headers of place for the -devel
## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html

install -m 664 -p %{SOURCE1}  %{buildroot}%{_libdir}/R/library/%{packname}

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
#i386 arch
%dir %{_libdir}/R/library/%{packname}
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%doc %{_libdir}/R/library/%{packname}/preprocessCore_license
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/libs
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/help

%files          devel
%defattr(-,root,root,-)
%{_libdir}/R/library/%{packname}/include/

%changelog
* Tue Aug 04 2009 pingou <pingou at pingoured.fr> 1.6.0-2
- Add the file preprocessCore_license which contains the mail from upstream regarding the license

* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.6.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-preprocessCore-1_6_0-2_fc11:F-10:R-preprocessCore-1.6.0-2.fc11.src.rpm:1249458968


--- NEW FILE preprocessCore_license ---
>From bmb at bmbolstad.com Sat Aug  1 21:11:42 2009
Return-Path: <bmb at bmbolstad.com>
Delivered-To: pingou at pingoured.fr
Received: from b0.ovh.net (HELO queue) (213.186.33.50) by b0.ovh.net with
 SMTP; 1 Aug 2009 21:11:42 -0000
Received: from nila.lunarpages.com (216.97.230.70) by mx0.ovh.net with
 SMTP; 1 Aug 2009 21:11:41 -0000
Received: from localhost ([127.0.0.1] helo=bmbolstad.com) by
 nila.lunarpages.com with esmtpa (Exim 4.69) (envelope-from
 <bmb at bmbolstad.com>) id 1MXLrM-0002qg-Hn for pingou at pingoured.fr; Sat, 01
 Aug 2009 14:11:20 -0700
Received: from 99.37.156.253 ([99.37.156.253]) (SquirrelMail authenticated
 user bmb at bmbolstad.com) by bmbolstad.com with HTTP; Sat, 1 Aug 2009
 14:11:20 -0700 (PDT)
Message-ID: <27028.99.37.156.253.1249161080.squirrel at bmbolstad.com>
In-Reply-To: <1249158185.2765.3.camel at red.localdomain>
References: <1249158185.2765.3.camel at red.localdomain>
Date: Sat, 1 Aug 2009 14:11:20 -0700 (PDT)
Subject: Re: preprocessCore license
From: bmb at bmbolstad.com
To: "Pierre-Yves" <pingou at pingoured.fr>
User-Agent: SquirrelMail/1.4.13
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
X-Priority: 3 (Normal)
Importance: Normal
X-AntiAbuse: This header was added to track abuse, please include it with
 any abuse report
X-AntiAbuse: Primary Hostname - nila.lunarpages.com
X-AntiAbuse: Original Domain - pingoured.fr
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - bmbolstad.com
X-Source: 
X-Source-Args: 
X-Source-Dir: 
X-Ovh-Tracer-Id: 12649766930274309798
X-Ovh-Remote: 216.97.230.70 (nila.lunarpages.com)
X-Ovh-Local: 213.186.33.32 (mx0.ovh.net)
X-Spam-Check: DONE|U 0.5/N
X-Evolution-Source: imap://pingou%40pingoured.fr at ssl0.ovh.net/
Content-Transfer-Encoding: 8bit

The licence in the DESCRIPTION is the intended licence




> Dear Mr,
>
> My name is Pierre-Yves Chibon and I am involved in the linux
> distribution Fedora as packager.
> I am particularly taking care of R package and I come to the point of
> packaging your library preprocessCore for Fedora.
>
> In the process of review of the package [1] before its integration it
> comes to the view of the reviewer that there are some contradiction in
> the license of the library.
> The description file mentions LGPL version 2 or later while several of
> the C files in the src folder are under GPL version 2 or later.
>
> Could you please clarify the license of the library ?
>
> Thanks in advance for your help,
>
> Best regards,
>
> Pierre
>
>
> [1] https://bugzilla.redhat.com/show_bug.cgi?id=515080
>
>




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-preprocessCore/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:16:17 -0000	1.1
+++ .cvsignore	5 Aug 2009 07:56:31 -0000	1.2
@@ -0,0 +1 @@
+preprocessCore_1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-preprocessCore/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:16:17 -0000	1.1
+++ sources	5 Aug 2009 07:56:31 -0000	1.2
@@ -0,0 +1 @@
+7a56f8a97da4f117b61c601e656a5a83  preprocessCore_1.6.0.tar.gz



From pingou at fedoraproject.org  Wed Aug  5 07:57:34 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 07:57:34 +0000 (UTC)
Subject: rpms/R-preprocessCore/F-11 R-preprocessCore.spec, NONE,
	1.1 import.log, 
	NONE, 1.1 preprocessCore_license, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090805075734.CE3EF11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-preprocessCore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv426/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	R-preprocessCore.spec import.log preprocessCore_license 
Log Message:
Original import



--- NEW FILE R-preprocessCore.spec ---
%global packname  preprocessCore
%global bioc     2.4

Name:             R-%{packname}
Version:          1.6.0
Release:          2%{?dist}
Summary:          A collection of pre-processing functions

Group:            Applications/Engineering 
License:          LGPLv2+  
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
Source1:          preprocessCore_license
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R-methods
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tetex-latex R-methods 

%package           devel
Summary:           Development files for %{name}        
Group:             Development/Libraries
Requires:          %{name} = %{version} 


%description
A library of core preprocessing routines

%description    devel
The %{name}-devel  package contains Header and libraries files for
developing applications that use %{name}

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

## Keep the headers of place for the -devel
## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html

install -m 664 -p %{SOURCE1}  %{buildroot}%{_libdir}/R/library/%{packname}

%check
%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
#i386 arch
%dir %{_libdir}/R/library/%{packname}
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%doc %{_libdir}/R/library/%{packname}/preprocessCore_license
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/libs
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/help

%files          devel
%defattr(-,root,root,-)
%{_libdir}/R/library/%{packname}/include/

%changelog
* Tue Aug 04 2009 pingou <pingou at pingoured.fr> 1.6.0-2
- Add the file preprocessCore_license which contains the mail from upstream regarding the license

* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.6.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-preprocessCore-1_6_0-2_fc11:F-11:R-preprocessCore-1.6.0-2.fc11.src.rpm:1249459033


--- NEW FILE preprocessCore_license ---
>From bmb at bmbolstad.com Sat Aug  1 21:11:42 2009
Return-Path: <bmb at bmbolstad.com>
Delivered-To: pingou at pingoured.fr
Received: from b0.ovh.net (HELO queue) (213.186.33.50) by b0.ovh.net with
 SMTP; 1 Aug 2009 21:11:42 -0000
Received: from nila.lunarpages.com (216.97.230.70) by mx0.ovh.net with
 SMTP; 1 Aug 2009 21:11:41 -0000
Received: from localhost ([127.0.0.1] helo=bmbolstad.com) by
 nila.lunarpages.com with esmtpa (Exim 4.69) (envelope-from
 <bmb at bmbolstad.com>) id 1MXLrM-0002qg-Hn for pingou at pingoured.fr; Sat, 01
 Aug 2009 14:11:20 -0700
Received: from 99.37.156.253 ([99.37.156.253]) (SquirrelMail authenticated
 user bmb at bmbolstad.com) by bmbolstad.com with HTTP; Sat, 1 Aug 2009
 14:11:20 -0700 (PDT)
Message-ID: <27028.99.37.156.253.1249161080.squirrel at bmbolstad.com>
In-Reply-To: <1249158185.2765.3.camel at red.localdomain>
References: <1249158185.2765.3.camel at red.localdomain>
Date: Sat, 1 Aug 2009 14:11:20 -0700 (PDT)
Subject: Re: preprocessCore license
From: bmb at bmbolstad.com
To: "Pierre-Yves" <pingou at pingoured.fr>
User-Agent: SquirrelMail/1.4.13
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
X-Priority: 3 (Normal)
Importance: Normal
X-AntiAbuse: This header was added to track abuse, please include it with
 any abuse report
X-AntiAbuse: Primary Hostname - nila.lunarpages.com
X-AntiAbuse: Original Domain - pingoured.fr
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - bmbolstad.com
X-Source: 
X-Source-Args: 
X-Source-Dir: 
X-Ovh-Tracer-Id: 12649766930274309798
X-Ovh-Remote: 216.97.230.70 (nila.lunarpages.com)
X-Ovh-Local: 213.186.33.32 (mx0.ovh.net)
X-Spam-Check: DONE|U 0.5/N
X-Evolution-Source: imap://pingou%40pingoured.fr at ssl0.ovh.net/
Content-Transfer-Encoding: 8bit

The licence in the DESCRIPTION is the intended licence




> Dear Mr,
>
> My name is Pierre-Yves Chibon and I am involved in the linux
> distribution Fedora as packager.
> I am particularly taking care of R package and I come to the point of
> packaging your library preprocessCore for Fedora.
>
> In the process of review of the package [1] before its integration it
> comes to the view of the reviewer that there are some contradiction in
> the license of the library.
> The description file mentions LGPL version 2 or later while several of
> the C files in the src folder are under GPL version 2 or later.
>
> Could you please clarify the license of the library ?
>
> Thanks in advance for your help,
>
> Best regards,
>
> Pierre
>
>
> [1] https://bugzilla.redhat.com/show_bug.cgi?id=515080
>
>




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-preprocessCore/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:16:17 -0000	1.1
+++ .cvsignore	5 Aug 2009 07:57:34 -0000	1.2
@@ -0,0 +1 @@
+preprocessCore_1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-preprocessCore/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:16:17 -0000	1.1
+++ sources	5 Aug 2009 07:57:34 -0000	1.2
@@ -0,0 +1 @@
+7a56f8a97da4f117b61c601e656a5a83  preprocessCore_1.6.0.tar.gz



From timlau at fedoraproject.org  Wed Aug  5 07:58:26 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  5 Aug 2009 07:58:26 +0000 (UTC)
Subject: rpms/postr/devel fix_upload_button.patch, NONE, 1.1 postr.spec, 1.16,
	1.17
Message-ID: <20090805075826.6C42C11C008C@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv709

Modified Files:
	postr.spec 
Added Files:
	fix_upload_button.patch 
Log Message:
Added patch to fix upload button

fix_upload_button.patch:
 postr.glade |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_upload_button.patch ---
--- postr-0.12.3/src/postr.glade	2008-12-19 14:51:01.000000000 +0000
+++ postr-0.12.3/src/postr.glade	2009-06-04 12:31:57.870332040 +0100
@@ -256,7 +256,7 @@
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="response_id">0</property>
-                        <signal name="activate" handler="on_upload_activate"/>
+                        <signal name="clicked" handler="on_upload_activate"/>
                         <child>
                           <widget class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- postr.spec	26 Jul 2009 19:18:14 -0000	1.16
+++ postr.spec	5 Aug 2009 07:58:26 -0000	1.17
@@ -2,13 +2,14 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
+Patch0:		fix_upload_button.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,6 +30,7 @@ Tool for uploading photos to the photo-s
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -71,6 +73,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Aug 5 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-4
+- Added fix_upload_button.patch to fix the upload button
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcepl at fedoraproject.org  Wed Aug  5 08:00:52 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  5 Aug 2009 08:00:52 +0000 (UTC)
Subject: rpms/nimbus/devel import.log, NONE,
	1.1 nimbus-0.0.17-stock-icons.patch, NONE, 1.1 nimbus.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805080052.3014611C008C@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/nimbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nimbus-0.0.17-stock-icons.patch nimbus.spec 
Log Message:
Initial commit.



--- NEW FILE import.log ---
nimbus-0_0_17-6_fc11:HEAD:nimbus-0.0.17-6.fc11.src.rpm:1249459136

nimbus-0.0.17-stock-icons.patch:
 gtk-engine/gtk-2.0/Makefile.am |   12 ++++++++----
 gtk-engine/gtk-2.0/gtkrc       |    2 --
 gtk-engine/gtk-2.0/iconrc      |    2 +-
 gtk-engine/gtk-2.0/iconrc.in   |    2 +-
 icons/index.theme.in           |    7 ++++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE nimbus-0.0.17-stock-icons.patch ---
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/gtkrc	2008-04-08 14:20:00.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/gtkrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,5 +1,3 @@
-include "iconrc"
-
 style "default"
 {
   bg[NORMAL]        = "#d6d9df"
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc	2008-08-14 11:18:46.000000000 +0200
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "/usr/local/share/themes/nimbus/gtk-2.0"
+pixmap_path "/usr/local/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/iconrc.in	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/iconrc.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,4 +1,4 @@
-pixmap_path "@prefix@/share/themes/nimbus/gtk-2.0"
+pixmap_path "@prefix@/share/icons/nimbus/24x24/stock"
 style "icon-style"
 {
    stock["gtk-dialog-authentication"] =  {{ "dialog_authentication.png",*,*,*}}
diff -dur nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am
--- nimbus-0.0.17.orig/gtk-engine/gtk-2.0/Makefile.am	2007-03-21 12:37:25.000000000 +0100
+++ nimbus-0.0.17/gtk-engine/gtk-2.0/Makefile.am	2009-07-26 02:16:55.000000000 +0200
@@ -1,7 +1,11 @@
 themedir = $(datadir)/themes//$(PACKAGE)/gtk-2.0
-theme_DATA =	gtkrc		\
-		iconrc		\
-		dialog_authentication.png  \
+theme_DATA =	gtkrc		
+
+iconrcdir = $(datadir)/icons//$(PACKAGE)
+iconrc_DATA = 	iconrc
+
+icondir = $(datadir)/icons//$(PACKAGE)/24x24/stock
+icon_DATA = 	dialog_authentication.png  \
 		dialog_info.png  \
 		dialog_warning.png  \
 		dialog_error.png  \
@@ -99,5 +103,5 @@
 		zoom-in.png  \
 		zoom-out.png  
 
-EXTRA_DIST = $(theme_DATA)    \
+EXTRA_DIST = $(iconrc_DATA)    \
 	     iconrc.in	      
diff -dur nimbus-0.0.17.orig/icons/index.theme.in nimbus-0.0.17/icons/index.theme.in
--- nimbus-0.0.17.orig/icons/index.theme.in	2007-10-05 10:17:20.000000000 +0200
+++ nimbus-0.0.17/icons/index.theme.in	2009-07-08 00:28:04.000000000 +0200
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=nimbus
 Inherits=Tango
-Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
+Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,24x24/stock,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes
 Example=user-desktop
 
 [12x12/actions]
@@ -129,6 +129,11 @@
 Context=Status
 Type=Fixed
 
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
 [32x32/actions]
 Size=32
 Context=Actions


--- NEW FILE nimbus.spec ---
Name:      nimbus
Version:   0.0.17
Release:   6%{?dist}
Summary:   Desktop theme originally from Sun

Group:      User Interface/Desktops
License:   LGPLv2

URL:      https://nimbus.dev.java.net/
# SHA1 0b984715e0c010ce034a32b7ba69e0582be65362
Source0:   http://dlc.sun.com/osol/jds/downloads/extras/nimbus-%{version}.tar.bz2
Patch0:     nimbus-0.0.17-stock-icons.patch

BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:   icon-naming-utils glib2-devel gtk2-devel
BuildRequires:   intltool automake libtool autoconf

%description
Just a virtual package to collect all Nimbus related components.

%package -n nimbus-theme-gnome
Summary: Desktop theme from Sun
Group: User Interface/Desktops
Requires:   gtk-nimbus-engine, nimbus-icon-theme, nimbus-metacity-theme
BuildArch: noarch

%description -n nimbus-theme-gnome
The nimbus Theme Pack for Gnome make use of nimbus Metacity theme, nimbus
gtk2 theme and Icon set. It originates from Opensolaris by Sun.

%package -n gtk-nimbus-engine
Summary: Gtk+ engine for %{name}
Group: User Interface/Desktops
Requires: gtk2-engines

%description -n gtk-nimbus-engine
Gtk+ engine for %{name}.

%package -n nimbus-icon-theme
Summary: Icons for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires: fedora-logos

%description -n nimbus-icon-theme
Icons for %{name}.

%package -n nimbus-metacity-theme
Summary: Metacity theme for %{name}
Group: User Interface/Desktops
BuildArch: noarch
Requires:   metacity

%description -n nimbus-metacity-theme
Theme for metacity as part of %{name}.

%prep
%setup -q -n nimbus-%{version}
%patch0 -p1 -b .stok-icons

echo 'NotificationTheme=nimbus' >> index.theme
TMPFILE=$(mktemp rpmbuild-nimbus-XXXXXX)
iconv -f iso-8859-1 -t utf-8 ChangeLog >$TMPFILE
touch --reference=ChangeLog $TMPFILE
chmod --reference=ChangeLog $TMPFILE
mv $TMPFILE ChangeLog


%build
aclocal --force
libtoolize --copy --force --automake
intltoolize --automake --copy --force
autoconf --force
automake --copy --add-missing
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#no-la
find $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/ \( -name \*.la -o -name \*.a \) -delete
install -Dp -m 0644 index.theme \
   $RPM_BUILD_ROOT%{_datadir}/themes/nimbus/index.theme
touch $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/icon-theme.cache

# removing OpenSolaris branding use start-here.png from Fedora
find $RPM_BUILD_ROOT%{_datadir}/icons/nimbus/ -name start-here.png \
     |while read FILENAME ; do
            NEWICON=$(echo $FILENAME \
            |sed -e "s!$RPM_BUILD_ROOT.*nimbus\(.*\)\$!\.\./\.\./\.\./Fedora\1!")
			  	ln -sf -v $NEWICON $FILENAME
	  done
	
%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/nimbus &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
	 touch --no-create %{_datadir}/icons/nimbus &>/dev/null
	 gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/nimbus &>/dev/null || :

%files -n gtk-nimbus-engine
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING gtk-engine/docs.txt
%{_libdir}/gtk-2.0/*/engines/libnimbus.so
%{_datadir}/themes/nimbus/gtk-2.0/gtkrc
%dir %{_datadir}/themes/nimbus/gtk-2.0/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-metacity-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/themes/nimbus/metacity-1/
%dir %{_datadir}/themes/nimbus/

%files -n nimbus-icon-theme
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_datadir}/icons/nimbus/
%ghost %{_datadir}/icons/nimbus/icon-theme.cache

%files -n nimbus-theme-gnome
%defattr(-,root,root,-)
%{_datadir}/themes/nimbus/index.theme

%changelog
* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-6
- remove OpenSolaris branding
- add Requires for fedora-logos to nimbus-icon-theme

* Tue Aug  4 2009 Mat?j Cepl <mcepl at redhat.com> - 0.0.17-5
- new version of nimbus-0.0.17-stock-icons.patch
- remove another unnecessary %%dir in %%files

* Sat May 16 2009 matej <mcepl at redhat.com> 0.0.17-4
- reogrganization of subpackages
- many changes in %%files

* Mon Apr 20 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-3
- Packaging Review fixes

* Thu Mar 12 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-2
- Fix License tag.

* Mon Mar 02 2009 Matej Cepl <mcepl at redhat.com> 0.0.17-1
- Initial affert to package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:14:19 -0000	1.1
+++ .cvsignore	5 Aug 2009 08:00:51 -0000	1.2
@@ -0,0 +1 @@
+nimbus-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nimbus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:14:19 -0000	1.1
+++ sources	5 Aug 2009 08:00:51 -0000	1.2
@@ -0,0 +1 @@
+c338357e3918cf391193b8429cab5975  nimbus-0.0.17.tar.bz2



From hedayat at fedoraproject.org  Wed Aug  5 08:07:42 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  5 Aug 2009 08:07:42 +0000 (UTC)
Subject: rpms/rcssserver/devel .cvsignore, 1.8, 1.9 rcssserver.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20090805080742.854B211C008C@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3712

Modified Files:
	.cvsignore rcssserver.spec sources 
Log Message:
Updated to 13.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Apr 2009 14:05:11 -0000	1.8
+++ .cvsignore	5 Aug 2009 08:07:42 -0000	1.9
@@ -1 +1 @@
-rcssserver-13.2.0.tar.gz
+rcssserver-13.2.2.tar.gz


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/rcssserver.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rcssserver.spec	27 Jul 2009 02:51:27 -0000	1.12
+++ rcssserver.spec	5 Aug 2009 08:07:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           rcssserver
-Version:        13.2.0
-Release:        3%{?dist}
+Version:        13.2.2
+Release:        1%{?dist}
 Summary:        Robocup 2D Soccer Simulation Server
 
 Group:          Applications/System
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Wed Aug 05 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.2-1
+- Updated to 13.2.2 which brings some bug fixes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Apr 2009 14:05:11 -0000	1.8
+++ sources	5 Aug 2009 08:07:42 -0000	1.9
@@ -1 +1 @@
-fb50619cddf6a1514f220a960fed91f1  rcssserver-13.2.0.tar.gz
+3af8e644ba9944f1106a712b926bdc65  rcssserver-13.2.2.tar.gz



From timlau at fedoraproject.org  Wed Aug  5 08:08:07 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  5 Aug 2009 08:08:07 +0000 (UTC)
Subject: rpms/postr/F-11 fix_upload_button.patch, NONE, 1.1 postr.spec, 1.15,
	1.16
Message-ID: <20090805080807.85D5311C008C@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3835

Modified Files:
	postr.spec 
Added Files:
	fix_upload_button.patch 
Log Message:
Added patch to fix upload button

fix_upload_button.patch:
 postr.glade |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_upload_button.patch ---
--- postr-0.12.3/src/postr.glade	2008-12-19 14:51:01.000000000 +0000
+++ postr-0.12.3/src/postr.glade	2009-06-04 12:31:57.870332040 +0100
@@ -256,7 +256,7 @@
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="response_id">0</property>
-                        <signal name="activate" handler="on_upload_activate"/>
+                        <signal name="clicked" handler="on_upload_activate"/>
                         <child>
                           <widget class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-11/postr.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- postr.spec	27 Feb 2009 01:56:43 -0000	1.15
+++ postr.spec	5 Aug 2009 08:08:07 -0000	1.16
@@ -2,13 +2,14 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
+Patch0:		fix_upload_button.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,6 +30,7 @@ Tool for uploading photos to the photo-s
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -71,6 +73,12 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Aug 5 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-4
+- Added fix_upload_button.patch to fix the upload button
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From dwayne at fedoraproject.org  Wed Aug  5 08:10:16 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  5 Aug 2009 08:10:16 +0000 (UTC)
Subject: rpms/translate-toolkit/F-10 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 translate-toolkit.spec, 1.25, 1.26
Message-ID: <20090805081016.DBB8A11C0439@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4386

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1
- Update to 1.4.0 final
   - Placeable API
   - Improved format support:
     * Java .properties files
     * Windows .rc files
     * XLIFF whitespace handling
     * Subtitle fortmats (added)
   - Small fixes to Mozilla support.
   - Improvements to podebug, pofilter checks and pot2po
   - Improved output formats for pocount
   - Extra startup options for tmserver
   - API documentation has been augmented with diagrams
- Remove old excludes for /usr/bin/*.py{o,c}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	4 Feb 2009 19:12:38 -0000	1.13
+++ .cvsignore	5 Aug 2009 08:10:16 -0000	1.14
@@ -1 +1 @@
-translate-toolkit-1.3.0.tar.bz2
+translate-toolkit-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Feb 2009 19:12:38 -0000	1.14
+++ sources	5 Aug 2009 08:10:16 -0000	1.15
@@ -1 +1 @@
-b21e7b1e382c03ecfeece6eab295840c  translate-toolkit-1.3.0.tar.bz2
+e588e04d6a71975f62dc96828824a510  translate-toolkit-1.4.0.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-10/translate-toolkit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- translate-toolkit.spec	4 Feb 2009 19:12:38 -0000	1.25
+++ translate-toolkit.spec	5 Aug 2009 08:10:16 -0000	1.26
@@ -1,20 +1,26 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.3.0
+Version:        1.4.0
 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/translate/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/1.4.0/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+# The following are needed for man page generation
+BuildRequires:  python-lxml
+BuildRequires:  python-iniparse
+BuildRequires:  python-simplejson
+BuildRequires:  python-vobject
+BuildRequires:  gaupol
 Requires:       gettext-libs
 Requires:       python-enchant
 Requires:       python-iniparse
@@ -23,6 +29,7 @@ Requires:       python-lxml
 %ifarch %{ix86}
 Requires:       python-psyco
 %endif
+Requires:       python-simplejson
 Requires:       python-vobject
 
 
@@ -41,9 +48,9 @@ Including:
             wiki (MediaWiki, DokuWiki), iCal
     * Specialised - OpenOffice.org GSI/SDF, PHP,
             Mozilla (.dtd, .properties, etc), Symbian,
-            Innosetup, tikiwiki
+            Innosetup, tikiwiki, subtitles
   * Tools: count, search, debug, segment and pretranslate localization 
-            files. Extract terminology from localization files.
+            files. Extract terminology. Pseudo-localize
   * Checkers: validate translations with over 45 checks
 
 %package devel
@@ -75,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 for program in $RPM_BUILD_ROOT/%{_bindir}/*; do
     case $(basename $program) in
-      pocompendium|poen|pomigrate2|popuretext|poreencode|posplit|pocount|poglossary|lookupclient.py)
+      pocompendium|poen|pomigrate2|popuretext|poreencode|posplit|pocount|poglossary|lookupclient.py|tmserver|build_tmdb)
        ;;
       *)
         LC_ALL=C PYTHONPATH=. $program --manpage \
@@ -108,8 +115,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{_datadir}/translate-toolkit
 %{python_sitelib}/translate*
-%exclude %{_bindir}/*.pyc
-%exclude %{_bindir}/*.pyo
 
 %files devel
 %defattr(-,root,root,-)
@@ -117,6 +122,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1
+- Update to 1.4.0 final
+   - Placeable API
+   - Improved format support:
+     * Java .properties files
+     * Windows .rc files
+     * XLIFF whitespace handling
+     * Subtitle fortmats (added)
+   - Small fixes to Mozilla support.
+   - Improvements to podebug, pofilter checks and pot2po
+   - Improved output formats for pocount
+   - Extra startup options for tmserver
+   - API documentation has been augmented with diagrams
+- Remove old excludes for /usr/bin/*.py{o,c}
+
 * Wed Feb 4 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.3.0-1
 - Update to 1.3.0 final release
 



From timlau at fedoraproject.org  Wed Aug  5 08:21:55 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed,  5 Aug 2009 08:21:55 +0000 (UTC)
Subject: rpms/postr/F-10 fix_upload_button.patch, NONE, 1.1 postr.spec, 1.11,
	1.12
Message-ID: <20090805082155.55F6011C008C@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7857

Modified Files:
	postr.spec 
Added Files:
	fix_upload_button.patch 
Log Message:
Added patch to fix upload button

fix_upload_button.patch:
 postr.glade |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_upload_button.patch ---
--- postr-0.12.3/src/postr.glade	2008-12-19 14:51:01.000000000 +0000
+++ postr-0.12.3/src/postr.glade	2009-06-04 12:31:57.870332040 +0100
@@ -256,7 +256,7 @@
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="response_id">0</property>
-                        <signal name="activate" handler="on_upload_activate"/>
+                        <signal name="clicked" handler="on_upload_activate"/>
                         <child>
                           <widget class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-10/postr.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- postr.spec	6 Jan 2009 14:22:17 -0000	1.11
+++ postr.spec	5 Aug 2009 08:21:55 -0000	1.12
@@ -2,13 +2,14 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
+Patch0:		fix_upload_button.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,6 +30,7 @@ Tool for uploading photos to the photo-s
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -67,13 +69,28 @@ touch --no-create %{_datadir}/icons/hico
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{python_sitelib}/Postr-%{version}-py2.5.egg-info
+%{python_sitelib}/Postr-%{version}-py?.?.egg-info
 
 
 %changelog
+* Wed Aug 5 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-4
+- Added fix_upload_button.patch to fix the upload button
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jan 6 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-1
 - New upstream version 0.12.3
 
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.12.2-3
+- Fix locations for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.12.2-2
+- Rebuild for Python 2.6
+
 * Tue Sep 9 2008 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.2-1
 - New upstream version 0.12.2
 - added missing gnome-python2-gconf requirement.



From akurtakov at fedoraproject.org  Wed Aug  5 08:27:59 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  5 Aug 2009 08:27:59 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.648,1.649
Message-ID: <20090805082759.2742A11C008C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9382/devel

Modified Files:
	eclipse.spec 
Log Message:
- Reenable initialize.
- Fix paths in initializer call.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -p -r1.648 -r1.649
--- eclipse.spec	5 Aug 2009 06:09:20 -0000	1.648
+++ eclipse.spec	5 Aug 2009 08:27:58 -0000	1.649
@@ -11,7 +11,7 @@ Epoch:  1
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
 %define swtver          3.5.0.v3550
-%define initialize      0
+%define initialize      1
 
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.28%{?dist}
+Release:        0.3.29%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -948,8 +948,8 @@ pushd $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins  $RPM_BUILD_ROOT/dropins
 mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
 libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
-java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \
-     -cp $libdir_path/startup.jar \
+java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT/$libdir_path/configuration \
+     -cp /$libdir_path/startup.jar \
      org.eclipse.core.launcher.Main \
      -debug -consolelog \
      -metadataRepository file:$metadataDir \
@@ -1485,6 +1485,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.29
+- Reenable initialize.
+- Fix paths in initializer call.
+
 * Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.28
 - Disable initialize.
 



From pingou at fedoraproject.org  Wed Aug  5 08:29:33 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:29:33 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/F-11 sources,1.2,1.3
Message-ID: <20090805082933.9B1CA11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9905/F-11

Modified Files:
	sources 
Log Message:
Add new sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jan 2008 19:46:40 -0000	1.2
+++ sources	5 Aug 2009 08:29:33 -0000	1.3
@@ -1 +1 @@
-99c65caca57cdb1fade02f740c2569f2  hgu95av2probe_2.0.0.tar.gz
+fef7ce5ddf8cbb3684a4885527eaf5fb  hgu95av2probe_2.4.0.tar.gz



From pingou at fedoraproject.org  Wed Aug  5 08:29:33 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:29:33 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/F-10 sources,1.2,1.3
Message-ID: <20090805082933.7150A11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9905/F-10

Modified Files:
	sources 
Log Message:
Add new sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jan 2008 19:46:40 -0000	1.2
+++ sources	5 Aug 2009 08:29:33 -0000	1.3
@@ -1 +1 @@
-99c65caca57cdb1fade02f740c2569f2  hgu95av2probe_2.0.0.tar.gz
+fef7ce5ddf8cbb3684a4885527eaf5fb  hgu95av2probe_2.4.0.tar.gz



From pingou at fedoraproject.org  Wed Aug  5 08:29:33 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:29:33 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090805082933.DDB3511C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9905/devel

Modified Files:
	.cvsignore sources 
Log Message:
Add new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jan 2008 19:46:40 -0000	1.2
+++ .cvsignore	5 Aug 2009 08:29:33 -0000	1.3
@@ -1 +1 @@
-hgu95av2probe_2.0.0.tar.gz
+hgu95av2probe_2.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jan 2008 19:46:40 -0000	1.2
+++ sources	5 Aug 2009 08:29:33 -0000	1.3
@@ -1 +1 @@
-99c65caca57cdb1fade02f740c2569f2  hgu95av2probe_2.0.0.tar.gz
+fef7ce5ddf8cbb3684a4885527eaf5fb  hgu95av2probe_2.4.0.tar.gz



From huzaifas at fedoraproject.org  Wed Aug  5 08:30:38 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  5 Aug 2009 08:30:38 +0000 (UTC)
Subject: rpms/dia/devel import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 dia.spec, 
	1.41, 1.42 sources, 1.6, 1.7 dia-0.92.2-dtd.patch, 1.1,
	NONE dia-0.94-fallbacktoxpmicons.patch, 1.2,
	NONE dia-0.95-pre6-help.patch, 1.2, NONE dia-0.96-1-clocks.patch,
	1.1, NONE dia-0.96-python-detect.patch, 1.1,
	NONE dia-0.96.1-64bit.patch, 1.1, NONE dia-0.96.1-desktop.patch,
	1.1, NONE dia-0.96.1-plugins.patch, 1.1,
	NONE dia-0.96.1-pythonpath.patch, 1.1,
	NONE dia-0.96.1-svg-export.patch, 1.1, NONE
Message-ID: <20090805083038.3A5BB11C0349@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10325/devel

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	import.log 
Removed Files:
	dia-0.92.2-dtd.patch dia-0.94-fallbacktoxpmicons.patch 
	dia-0.95-pre6-help.patch dia-0.96-1-clocks.patch 
	dia-0.96-python-detect.patch dia-0.96.1-64bit.patch 
	dia-0.96.1-desktop.patch dia-0.96.1-plugins.patch 
	dia-0.96.1-pythonpath.patch dia-0.96.1-svg-export.patch 
Log Message:
new version



--- NEW FILE import.log ---
dia-0_97-1_fc10:HEAD:dia-0.97-1.fc10.src.rpm:1249446680


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jun 2007 08:22:46 -0000	1.6
+++ .cvsignore	5 Aug 2009 08:30:37 -0000	1.7
@@ -1 +1 @@
-dia-0.96.1.tar.bz2
+dia-0.97.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- dia.spec	24 Jul 2009 20:14:18 -0000	1.41
+++ dia.spec	5 Aug 2009 08:30:37 -0000	1.42
@@ -1,24 +1,14 @@
 Name:           dia
-Version:        0.96.1
-Release:        18%{?dist}
+Version:        0.97
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.96/%{name}-%{version}.tar.bz2
-Patch1:         dia-0.92.2-dtd.patch
-Patch2:         dia-0.95-pre6-help.patch
-Patch3:         dia-0.94-fallbacktoxpmicons.patch
-Patch4:         dia-0.96-python-detect.patch
-Patch5:         dia-0.96.1-64bit.patch
-Patch6:         dia-0.96.1-desktop.patch
-Patch7:         dia-0.96.1-svg-export.patch
-Patch8:		dia-0.96.1-plugins.patch
-Patch9:		dia-0.96.1-pythonpath.patch
-Patch10:        dia-0.96-1-clocks.patch
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -33,16 +23,6 @@ and can export to PostScript(TM).
 
 %prep
 %setup -q
-%patch1 -p1 -b .dtd
-%patch2 -p1 -b .help
-%patch3 -p1 -b .fallbacktoxpmicons
-%patch4 -p1 -b .py-detect
-%patch5 -p1 -b .64bit
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .orig
-%patch9 -p1 -b .pythonpath
-%patch10 -p1 -b .clock
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -60,10 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %name
 
-# stop rpmlint from complaining
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/python/doxrev.py
-
 # Since we're not using the cairo stuff, but a stub plugin still
 # gets built, Dia complains it doesn't have an init function.  So
 # kill the plugin
@@ -74,13 +50,9 @@ desktop-file-install --vendor fedora  --
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --remove-category Application                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -113,12 +85,14 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime-info/*
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/omf/%{name}/*.omf
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.96.1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
+- update to 0.97
+- drop old patches
 
 * Tue Mar 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.96.1-17
 - Resolves: rhbz#486726


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jun 2007 08:22:46 -0000	1.6
+++ sources	5 Aug 2009 08:30:38 -0000	1.7
@@ -1 +1 @@
-7b81b22baa2df55efe4845865dddc7b6  dia-0.96.1.tar.bz2
+3d11f9aaa5a4923f0a5533962c87bdfb  dia-0.97.tar.bz2


--- dia-0.92.2-dtd.patch DELETED ---


--- dia-0.94-fallbacktoxpmicons.patch DELETED ---


--- dia-0.95-pre6-help.patch DELETED ---


--- dia-0.96-1-clocks.patch DELETED ---


--- dia-0.96-python-detect.patch DELETED ---


--- dia-0.96.1-64bit.patch DELETED ---


--- dia-0.96.1-desktop.patch DELETED ---


--- dia-0.96.1-plugins.patch DELETED ---


--- dia-0.96.1-pythonpath.patch DELETED ---


--- dia-0.96.1-svg-export.patch DELETED ---



From pingou at fedoraproject.org  Wed Aug  5 08:36:35 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:36:35 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/F-10 R-hgu95av2probe.spec,1.3,1.4
Message-ID: <20090805083635.D24C111C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11772/F-10

Modified Files:
	R-hgu95av2probe.spec 
Log Message:
Increase release number


Index: R-hgu95av2probe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/F-10/R-hgu95av2probe.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-hgu95av2probe.spec	5 Aug 2009 08:03:00 -0000	1.3
+++ R-hgu95av2probe.spec	5 Aug 2009 08:36:35 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          2.4.0 
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Probe sequence data for microarrays of type hgu95av2
 Summary(fr):      Donn?es des primers de puces ? ADN de type hgu92av2
 
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-2
+- Increase release number
+
 * Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-1
 - Update to 2.4.0
 - Add R and BR for R-AnnotationDbi



From pingou at fedoraproject.org  Wed Aug  5 08:36:36 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:36:36 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/devel R-hgu95av2probe.spec,1.5,1.6
Message-ID: <20090805083636.32CCC11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11772/devel

Modified Files:
	R-hgu95av2probe.spec 
Log Message:
Increase release number


Index: R-hgu95av2probe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/devel/R-hgu95av2probe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-hgu95av2probe.spec	5 Aug 2009 08:03:00 -0000	1.5
+++ R-hgu95av2probe.spec	5 Aug 2009 08:36:36 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          2.4.0 
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Probe sequence data for microarrays of type hgu95av2
 Summary(fr):      Donn?es des primers de puces ? ADN de type hgu92av2
 
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-2
+- Increase release number
+
 * Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-1
 - Update to 2.4.0
 - Add R and BR for R-AnnotationDbi



From pingou at fedoraproject.org  Wed Aug  5 08:36:35 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:36:35 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/F-11 R-hgu95av2probe.spec,1.4,1.5
Message-ID: <20090805083635.F185311C0346@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11772/F-11

Modified Files:
	R-hgu95av2probe.spec 
Log Message:
Increase release number


Index: R-hgu95av2probe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/F-11/R-hgu95av2probe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-hgu95av2probe.spec	5 Aug 2009 08:03:00 -0000	1.4
+++ R-hgu95av2probe.spec	5 Aug 2009 08:36:35 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          2.4.0 
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Probe sequence data for microarrays of type hgu95av2
 Summary(fr):      Donn?es des primers de puces ? ADN de type hgu92av2
 
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-2
+- Increase release number
+
 * Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-1
 - Update to 2.4.0
 - Add R and BR for R-AnnotationDbi



From huzaifas at fedoraproject.org  Wed Aug  5 08:43:05 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  5 Aug 2009 08:43:05 +0000 (UTC)
Subject: rpms/dia/devel dia.spec,1.42,1.43
Message-ID: <20090805084305.D8F9911C008C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13547

Modified Files:
	dia.spec 
Log Message:
Disable with-python


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- dia.spec	5 Aug 2009 08:30:37 -0000	1.42
+++ dia.spec	5 Aug 2009 08:43:05 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.97
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -31,7 +31,7 @@ mv usage-layers.xml.UTF-8 doc/en/usage-l
 
 
 %build
-%configure --enable-gnome --enable-db2html --with-python
+%configure --enable-gnome --enable-db2html 
 make %{?_smp_mflags}
  
 
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-2
+- Disable --with-python
+
 * Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
 - update to 0.97
 - drop old patches



From kdudka at fedoraproject.org  Wed Aug  5 08:45:05 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  5 Aug 2009 08:45:05 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.4-install-SELinux.patch, NONE,
	1.1 coreutils-7.4-ls-1U.patch, NONE, 1.1 coreutils.spec, 1.263, 1.264
Message-ID: <20090805084505.ABD0311C008C@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14073

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-7.4-install-SELinux.patch coreutils-7.4-ls-1U.patch 
Log Message:
- ls -1U with two or more arguments (or with -R or -s) works properly again
- install runs faster again with SELinux enabled (#479502)

coreutils-7.4-install-SELinux.patch:
 jm-macros.m4 |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE coreutils-7.4-install-SELinux.patch ---
diff -ruNp coreutils-7.4.orig/m4/jm-macros.m4 coreutils-7.4/m4/jm-macros.m4
--- coreutils-7.4.orig/m4/jm-macros.m4	2009-08-05 10:27:30.660795719 +0200
+++ coreutils-7.4/m4/jm-macros.m4	2009-08-05 10:30:46.912858189 +0200
@@ -47,7 +47,21 @@ AC_DEFUN([coreutils_MACROS],
   AC_CHECK_FUNCS_ONCE([directio])
 
   # Used by install.c.
-  AC_CHECK_FUNCS_ONCE([matchpathcon_init_prefix])
+  coreutils_saved_libs=$LIBS
+    LIBS="$LIBS $LIB_SELINUX"
+    AC_CHECK_FUNCS([matchpathcon_init_prefix], [],
+    [
+      case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
+	no:*) # SELinux disabled
+	  ;;
+	*:no) # SELinux disabled
+	  ;;
+	*)
+	AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
+	AC_MSG_WARN([The install utility may run slowly])
+      esac
+    ])
+  LIBS=$coreutils_saved_libs
 
   # Used by sort.c.
   AC_CHECK_FUNCS_ONCE([nl_langinfo])

coreutils-7.4-ls-1U.patch:
 src/ls.c           |   29 +++++++++++++++--------------
 tests/misc/ls-misc |   15 +++++++++++++--
 2 files changed, 28 insertions(+), 16 deletions(-)

--- NEW FILE coreutils-7.4-ls-1U.patch ---
diff -ruNp coreutils-7.4.orig/src/ls.c coreutils-7.4/src/ls.c
--- coreutils-7.4.orig/src/ls.c	2009-08-05 10:14:46.397545653 +0200
+++ coreutils-7.4/src/ls.c	2009-08-05 10:20:47.564858256 +0200
@@ -2480,6 +2480,19 @@ print_dir (char const *name, char const 
       DEV_INO_PUSH (dir_stat.st_dev, dir_stat.st_ino);
     }
 
+  if (recursive | print_dir_name)
+    {
+      if (!first)
+	DIRED_PUTCHAR ('\n');
+      first = false;
+      DIRED_INDENT ();
+      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
+      dired_pos += quote_name (stdout, realname ? realname : name,
+			       dirname_quoting_options, NULL);
+      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
+      DIRED_FPUTS_LITERAL (":\n", stdout);
+    }
+
   /* Read the directory entries, and insert the subfiles into the `cwd_file'
      table.  */
 
@@ -2519,7 +2532,8 @@ print_dir (char const *name, char const 
 		 ls uses constant memory while processing the entries of
 		 this directory.  Useful when there are many (millions)
 		 of entries in a directory.  */
-	      if (format == one_per_line && sort_type == sort_none)
+	      if (format == one_per_line && sort_type == sort_none
+		      && !print_block_size && !recursive)
 		{
 		  /* We must call sort_files in spite of
 		     "sort_type == sort_none" for its initialization
@@ -2555,19 +2569,6 @@ print_dir (char const *name, char const 
   if (recursive)
     extract_dirs_from_files (name, command_line_arg);
 
-  if (recursive | print_dir_name)
-    {
-      if (!first)
-	DIRED_PUTCHAR ('\n');
-      first = false;
-      DIRED_INDENT ();
-      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
-      dired_pos += quote_name (stdout, realname ? realname : name,
-			       dirname_quoting_options, NULL);
-      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
-      DIRED_FPUTS_LITERAL (":\n", stdout);
-    }
-
   if (format == long_format || print_block_size)
     {
       const char *p;
diff -ruNp coreutils-7.4.orig/tests/misc/ls-misc coreutils-7.4/tests/misc/ls-misc
--- coreutils-7.4.orig/tests/misc/ls-misc	2009-04-24 14:50:28.000000000 +0200
+++ coreutils-7.4/tests/misc/ls-misc	2009-08-05 10:20:47.564858256 +0200
@@ -18,6 +18,7 @@
 use strict;
 
 (my $program_name = $0) =~ s|.*/||;
+my $prog = 'ls';
 
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@@ -224,6 +225,18 @@ my @Tests =
       {PRE => sub { mk_file @v_files }},
       {POST => sub { unlink @v_files }},
       ],
+
+     # Test for the ls -1U bug fixed in coreutils-7.5.
+     # It is triggered only with -1U and with two or more arguments,
+     # at least one of which is a nonempty directory.
+     ['multi-arg-U1', '-U1 d no-such',
+      {OUT => "d:\nf\n"},
+      {ERR_SUBST=>'s/ch:.*/ch:/'},
+      {ERR => "$prog: cannot access no-such:\n"},
+      $mkdir_reg,
+      $rmdir_reg,
+      {EXIT => 2},
+     ],
     );
 
 # Start with an unset LS_COLORS environment variable.
@@ -232,8 +245,6 @@ delete $ENV{LS_COLORS};
 my $save_temps = $ENV{SAVE_TEMPS};
 my $verbose = $ENV{VERBOSE};
 
-my $prog = 'ls';
-
 setuid_setup;
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 $fail


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- coreutils.spec	24 Jul 2009 19:30:04 -0000	1.263
+++ coreutils.spec	5 Aug 2009 08:45:05 -0000	1.264
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -19,6 +19,8 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
+Patch1: coreutils-7.4-ls-1U.patch
+Patch2: coreutils-7.4-install-SELinux.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -99,6 +101,8 @@ the old GNU fileutils, sh-utils, and tex
 %setup -q
 
 # From upstream
+%patch1 -p1 -b .ls-1U
+%patch2 -p1 -b .install-SELinux
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -308,6 +312,10 @@ fi
 /sbin/runuser
 
 %changelog
+* Wed Aug 05 2009 Kamil Dudka <kdudka at redhat.com> - 7.4-5
+- ls -1U with two or more arguments (or with -R or -s) works properly again
+- install runs faster again with SELinux enabled (#479502)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Wed Aug  5 08:46:30 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  5 Aug 2009 08:46:30 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.649,1.650
Message-ID: <20090805084630.0FF7311C008C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14836/devel

Modified Files:
	eclipse.spec 
Log Message:
Additional output to debug ppc64 build failures.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -p -r1.649 -r1.650
--- eclipse.spec	5 Aug 2009 08:27:58 -0000	1.649
+++ eclipse.spec	5 Aug 2009 08:46:29 -0000	1.650
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.29%{?dist}
+Release:        0.3.30%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -936,6 +936,9 @@ popd
 rm -r $sdkDir/configuration/org.eclipse.update
 
 %if %{initialize}
+# dump bundles.info and config.ini to check what's wrong with ppc64 build
+cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/config.ini
+cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1485,6 +1488,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.30
+- Additional output to debug ppc64 build failures.
+
 * Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.29
 - Reenable initialize.
 - Fix paths in initializer call.



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:02 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up commit
Message-ID: <20090805084802.99C2510F890@bastion2.fedora.phx.redhat.com>

twaugh has given up the commit acl on device-mapper-multipath (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:02 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up watchcommits
Message-ID: <20090805084803.58D4B10F8A2@bastion2.fedora.phx.redhat.com>

twaugh has given up the watchcommits acl on device-mapper-multipath (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:10 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up watchcommits
Message-ID: <20090805084810.A6E0B10F8B2@bastion2.fedora.phx.redhat.com>

twaugh has given up the watchcommits acl on device-mapper-multipath (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pingou at fedoraproject.org  Wed Aug  5 08:03:01 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:03:01 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/devel R-hgu95av2probe.spec,1.4,1.5
Message-ID: <20090805080301.2223A11C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2113/devel

Modified Files:
	R-hgu95av2probe.spec 
Log Message:
Update to 2.4.0


Index: R-hgu95av2probe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/devel/R-hgu95av2probe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-hgu95av2probe.spec	24 Jul 2009 16:12:22 -0000	1.4
+++ R-hgu95av2probe.spec	5 Aug 2009 08:03:00 -0000	1.5
@@ -1,8 +1,8 @@
 %define packname  hgu95av2probe 
 
 Name:             R-%{packname}
-Version:          2.0.0 
-Release:          4%{?dist}
+Version:          2.4.0 
+Release:          1%{?dist}
 Summary:          Probe sequence data for microarrays of type hgu95av2
 Summary(fr):      Donn?es des primers de puces ? ADN de type hgu92av2
 
@@ -13,15 +13,16 @@ Source0:          http://www.bioconducto
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
-
+Requires:         R-AnnotationDbi
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex 
+BuildRequires:    R-devel tetex-latex R-AnnotationDbi
 
 %description
 This package was automatically created by package matchprobes version 1.9.2. 
 The probe sequence data was obtained from http://www.affymetrix.com. 
 The file name was HG\_U95Av2\_probe\_tab.
+
 %description -l fr
 Ce fichier a ?t? automatiquement cr?e par la version 1.9.2 du paquet
 matchprobes; Les sequences ont ?t? obtenues sur le site
@@ -43,7 +44,7 @@ rm -rf %{buildroot}%{_datadir}/R/library
 
 %check
 # Cyclic require with the package matchprobes
-#%{_bindir}/R CMD check %{packname}
+%{_bindir}/R CMD check %{packname}
 
 %clean
 rm -rf %{buildroot}
@@ -74,6 +75,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-1
+- Update to 2.4.0
+- Add R and BR for R-AnnotationDbi
+- Re-enable the check (circular dependency with matchprobes is not anymore)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pingou at fedoraproject.org  Wed Aug  5 08:03:00 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:03:00 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/F-11 R-hgu95av2probe.spec,1.3,1.4
Message-ID: <20090805080300.D577611C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2113/F-11

Modified Files:
	R-hgu95av2probe.spec 
Log Message:
Update to 2.4.0


Index: R-hgu95av2probe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/F-11/R-hgu95av2probe.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-hgu95av2probe.spec	23 Feb 2009 23:01:04 -0000	1.3
+++ R-hgu95av2probe.spec	5 Aug 2009 08:03:00 -0000	1.4
@@ -1,8 +1,8 @@
 %define packname  hgu95av2probe 
 
 Name:             R-%{packname}
-Version:          2.0.0 
-Release:          3%{?dist}
+Version:          2.4.0 
+Release:          1%{?dist}
 Summary:          Probe sequence data for microarrays of type hgu95av2
 Summary(fr):      Donn?es des primers de puces ? ADN de type hgu92av2
 
@@ -13,15 +13,16 @@ Source0:          http://www.bioconducto
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
-
+Requires:         R-AnnotationDbi
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex 
+BuildRequires:    R-devel tetex-latex R-AnnotationDbi
 
 %description
 This package was automatically created by package matchprobes version 1.9.2. 
 The probe sequence data was obtained from http://www.affymetrix.com. 
 The file name was HG\_U95Av2\_probe\_tab.
+
 %description -l fr
 Ce fichier a ?t? automatiquement cr?e par la version 1.9.2 du paquet
 matchprobes; Les sequences ont ?t? obtenues sur le site
@@ -43,7 +44,7 @@ rm -rf %{buildroot}%{_datadir}/R/library
 
 %check
 # Cyclic require with the package matchprobes
-#%{_bindir}/R CMD check %{packname}
+%{_bindir}/R CMD check %{packname}
 
 %clean
 rm -rf %{buildroot}
@@ -74,6 +75,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-1
+- Update to 2.4.0
+- Add R and BR for R-AnnotationDbi
+- Re-enable the check (circular dependency with matchprobes is not anymore)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pingou at fedoraproject.org  Wed Aug  5 08:03:00 2009
From: pingou at fedoraproject.org (pingou)
Date: Wed,  5 Aug 2009 08:03:00 +0000 (UTC)
Subject: rpms/R-hgu95av2probe/F-10 R-hgu95av2probe.spec,1.2,1.3
Message-ID: <20090805080300.9A7E511C008C@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-hgu95av2probe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2113/F-10

Modified Files:
	R-hgu95av2probe.spec 
Log Message:
Update to 2.4.0


Index: R-hgu95av2probe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hgu95av2probe/F-10/R-hgu95av2probe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-hgu95av2probe.spec	9 Feb 2008 20:04:35 -0000	1.2
+++ R-hgu95av2probe.spec	5 Aug 2009 08:03:00 -0000	1.3
@@ -1,8 +1,8 @@
 %define packname  hgu95av2probe 
 
 Name:             R-%{packname}
-Version:          2.0.0 
-Release:          2%{?dist}
+Version:          2.4.0 
+Release:          1%{?dist}
 Summary:          Probe sequence data for microarrays of type hgu95av2
 Summary(fr):      Donn?es des primers de puces ? ADN de type hgu92av2
 
@@ -13,15 +13,16 @@ Source0:          http://www.bioconducto
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
-
+Requires:         R-AnnotationDbi
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex 
+BuildRequires:    R-devel tetex-latex R-AnnotationDbi
 
 %description
 This package was automatically created by package matchprobes version 1.9.2. 
 The probe sequence data was obtained from http://www.affymetrix.com. 
 The file name was HG\_U95Av2\_probe\_tab.
+
 %description -l fr
 Ce fichier a ?t? automatiquement cr?e par la version 1.9.2 du paquet
 matchprobes; Les sequences ont ?t? obtenues sur le site
@@ -43,7 +44,7 @@ rm -rf %{buildroot}%{_datadir}/R/library
 
 %check
 # Cyclic require with the package matchprobes
-#%{_bindir}/R CMD check %{packname}
+%{_bindir}/R CMD check %{packname}
 
 %clean
 rm -rf %{buildroot}
@@ -74,6 +75,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 pingou <pingou at pingoured.fr> - 2.4.0-1
+- Update to 2.4.0
+- Add R and BR for R-AnnotationDbi
+- Re-enable the check (circular dependency with matchprobes is not anymore)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb 09 2008 Pingou <pingoufc4 at yahoo.fr> 2.0.0-2
 - Change the URL
 



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:13 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up commit
Message-ID: <20090805084813.391FA10F8B9@bastion2.fedora.phx.redhat.com>

twaugh has given up the commit acl on device-mapper-multipath (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:15 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up watchcommits
Message-ID: <20090805084815.9F54410F8BE@bastion2.fedora.phx.redhat.com>

twaugh has given up the watchcommits acl on device-mapper-multipath (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:17 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up commit
Message-ID: <20090805084817.CCE8110F8C5@bastion2.fedora.phx.redhat.com>

twaugh has given up the commit acl on device-mapper-multipath (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:20 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up watchcommits
Message-ID: <20090805084821.B99F910F8CB@bastion2.fedora.phx.redhat.com>

twaugh has given up the watchcommits acl on device-mapper-multipath (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:21 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up commit
Message-ID: <20090805084822.909E610F8CE@bastion2.fedora.phx.redhat.com>

twaugh has given up the commit acl on device-mapper-multipath (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:24 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up watchcommits
Message-ID: <20090805084825.D767010F8D5@bastion2.fedora.phx.redhat.com>

twaugh has given up the watchcommits acl on device-mapper-multipath (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:26 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up commit
Message-ID: <20090805084827.5202510F8DC@bastion2.fedora.phx.redhat.com>

twaugh has given up the commit acl on device-mapper-multipath (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:28 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up watchcommits
Message-ID: <20090805084830.C18D610F8E5@bastion2.fedora.phx.redhat.com>

twaugh has given up the watchcommits acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From pkgdb at fedoraproject.org  Wed Aug  5 08:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 08:48:29 +0000
Subject: [pkgdb] device-mapper-multipath: twaugh has given up commit
Message-ID: <20090805084831.CD3D110F8E9@bastion2.fedora.phx.redhat.com>

twaugh has given up the commit acl on device-mapper-multipath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/device-mapper-multipath



From kdudka at fedoraproject.org  Wed Aug  5 08:56:45 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed,  5 Aug 2009 08:56:45 +0000 (UTC)
Subject: rpms/coreutils/F-11 coreutils-7.4-install-SELinux.patch, NONE,
	1.1 coreutils-7.4-ls-1U.patch, NONE, 1.1 coreutils.spec, 1.258, 1.259
Message-ID: <20090805085645.AD99011C008C@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/coreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17516

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-7.4-install-SELinux.patch coreutils-7.4-ls-1U.patch 
Log Message:
- ls -1U with two or more arguments (or with -R or -s) works properly again
- install runs faster again with SELinux enabled (#479502)

coreutils-7.4-install-SELinux.patch:
 jm-macros.m4 |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE coreutils-7.4-install-SELinux.patch ---
diff -ruNp coreutils-7.2.orig/m4/jm-macros.m4 coreutils-7.2/m4/jm-macros.m4
--- coreutils-7.2.orig/m4/jm-macros.m4	2009-08-05 10:50:48.389482889 +0200
+++ coreutils-7.2/m4/jm-macros.m4	2009-08-05 10:53:37.894733210 +0200
@@ -47,7 +47,21 @@ AC_DEFUN([coreutils_MACROS],
   AC_CHECK_FUNCS_ONCE([directio])
 
   # Used by install.c.
-  AC_CHECK_FUNCS_ONCE([matchpathcon_init_prefix])
+  coreutils_saved_libs=$LIBS
+    LIBS="$LIBS $LIB_SELINUX"
+    AC_CHECK_FUNCS([matchpathcon_init_prefix], [],
+    [
+      case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
+	no:*) # SELinux disabled
+	  ;;
+	*:no) # SELinux disabled
+	  ;;
+	*)
+	AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
+	AC_MSG_WARN([The install utility may run slowly])
+      esac
+    ])
+  LIBS=$coreutils_saved_libs
 
   # Used by sort.c.
   AC_CHECK_FUNCS_ONCE([nl_langinfo])

coreutils-7.4-ls-1U.patch:
 src/ls.c           |   29 +++++++++++++++--------------
 tests/misc/ls-misc |   15 +++++++++++++--
 2 files changed, 28 insertions(+), 16 deletions(-)

--- NEW FILE coreutils-7.4-ls-1U.patch ---
diff -ruNp coreutils-7.2.orig/src/ls.c coreutils-7.2/src/ls.c
--- coreutils-7.2.orig/src/ls.c	2009-08-05 10:50:48.432858145 +0200
+++ coreutils-7.2/src/ls.c	2009-08-05 10:52:21.066692900 +0200
@@ -2411,6 +2411,19 @@ print_dir (char const *name, char const 
       DEV_INO_PUSH (dir_stat.st_dev, dir_stat.st_ino);
     }
 
+  if (recursive | print_dir_name)
+    {
+      if (!first)
+	DIRED_PUTCHAR ('\n');
+      first = false;
+      DIRED_INDENT ();
+      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
+      dired_pos += quote_name (stdout, realname ? realname : name,
+			       dirname_quoting_options, NULL);
+      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
+      DIRED_FPUTS_LITERAL (":\n", stdout);
+    }
+
   /* Read the directory entries, and insert the subfiles into the `cwd_file'
      table.  */
 
@@ -2450,7 +2463,8 @@ print_dir (char const *name, char const 
 		 ls uses constant memory while processing the entries of
 		 this directory.  Useful when there are many (millions)
 		 of entries in a directory.  */
-	      if (format == one_per_line && sort_type == sort_none)
+	      if (format == one_per_line && sort_type == sort_none
+		      && !print_block_size && !recursive)
 		{
 		  /* We must call sort_files in spite of
 		     "sort_type == sort_none" for its initialization
@@ -2486,19 +2500,6 @@ print_dir (char const *name, char const 
   if (recursive)
     extract_dirs_from_files (name, command_line_arg);
 
-  if (recursive | print_dir_name)
-    {
-      if (!first)
-	DIRED_PUTCHAR ('\n');
-      first = false;
-      DIRED_INDENT ();
-      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
-      dired_pos += quote_name (stdout, realname ? realname : name,
-			       dirname_quoting_options, NULL);
-      PUSH_CURRENT_DIRED_POS (&subdired_obstack);
-      DIRED_FPUTS_LITERAL (":\n", stdout);
-    }
-
   if (format == long_format || print_block_size)
     {
       const char *p;
diff -ruNp coreutils-7.2.orig/tests/misc/ls-misc coreutils-7.2/tests/misc/ls-misc
--- coreutils-7.2.orig/tests/misc/ls-misc	2009-03-29 19:44:10.000000000 +0200
+++ coreutils-7.2/tests/misc/ls-misc	2009-08-05 10:52:21.067920550 +0200
@@ -18,6 +18,7 @@
 use strict;
 
 (my $program_name = $0) =~ s|.*/||;
+my $prog = 'ls';
 
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@@ -224,6 +225,18 @@ my @Tests =
       {PRE => sub { mk_file @v_files }},
       {POST => sub { unlink @v_files }},
       ],
+
+     # Test for the ls -1U bug fixed in coreutils-7.5.
+     # It is triggered only with -1U and with two or more arguments,
+     # at least one of which is a nonempty directory.
+     ['multi-arg-U1', '-U1 d no-such',
+      {OUT => "d:\nf\n"},
+      {ERR_SUBST=>'s/ch:.*/ch:/'},
+      {ERR => "$prog: cannot access no-such:\n"},
+      $mkdir_reg,
+      $rmdir_reg,
+      {EXIT => 2},
+     ],
     );
 
 # Start with an unset LS_COLORS environment variable.
@@ -232,8 +245,6 @@ delete $ENV{LS_COLORS};
 my $save_temps = $ENV{SAVE_TEMPS};
 my $verbose = $ENV{VERBOSE};
 
-my $prog = 'ls';
-
 setuid_setup;
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 $fail


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-11/coreutils.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- coreutils.spec	8 Jul 2009 14:44:11 -0000	1.258
+++ coreutils.spec	5 Aug 2009 08:56:45 -0000	1.259
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -19,6 +19,8 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
+Patch1: coreutils-7.4-ls-1U.patch
+Patch2: coreutils-7.4-install-SELinux.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -99,6 +101,8 @@ the old GNU fileutils, sh-utils, and tex
 %setup -q
 
 # From upstream
+%patch1 -p1 -b .ls-1U
+%patch2 -p1 -b .install-SELinux
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -311,6 +315,10 @@ fi
 /sbin/runuser
 
 %changelog
+* Wed Aug 05 2009 Kamil Dudka <kdudka at redhat.com> - 7.2-3
+- ls -1U with two or more arguments (or with -R or -s) works properly again
+- install runs faster again with SELinux enabled (#479502)
+
 * Wed Jul 09 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-2
 - do not ignore sort's version sort for multibyte locales
   (#509688)



From corsepiu at fedoraproject.org  Wed Aug  5 09:03:01 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 09:03:01 +0000 (UTC)
Subject: rpms/perl-Proc-Simple/devel .cvsignore, 1.2,
	1.3 perl-Proc-Simple.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090805090301.DD80C11C008C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Proc-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19151

Modified Files:
	.cvsignore perl-Proc-Simple.spec sources 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.26-1
- Rebuilt for mass rebuilt breakdown.
- Update to 1.26 from CPAN.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Proc-Simple/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jul 2009 12:43:51 -0000	1.2
+++ .cvsignore	5 Aug 2009 09:03:01 -0000	1.3
@@ -1 +1 @@
-Proc-Simple-1.25.tgz
+Proc-Simple-1.26.tar.gz


Index: perl-Proc-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Proc-Simple/devel/perl-Proc-Simple.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Proc-Simple.spec	26 Jul 2009 16:18:12 -0000	1.2
+++ perl-Proc-Simple.spec	5 Aug 2009 09:03:01 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Proc-Simple
-Version:        1.25
-Release:        2%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Launch and control background processes
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Proc-Simple/
-Source0:        http://www.cpan.org/authors/id/M/MS/MSCHILLI/Proc-Simple-%{version}.tgz
+Source0:        http://www.cpan.org/authors/id/M/MS/MSCHILLI/Proc-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -18,8 +18,7 @@ a user's point of view. Either external 
 launched and controlled as processes in the background.
 
 %prep
-# tar archive do not longer contains directory Proc-Simple-%{version}
-%setup -q -n mschilli-proc-simple-perl-54fa3ecd4a55aba3aa83d2843c13ecbe14d8291b
+%setup -q -n Proc-Simple-%{version}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -48,6 +47,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.26-1
+- Rebuilt for mass rebuilt breakdown.
+- Update to 1.26 from CPAN.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Proc-Simple/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jul 2009 12:43:51 -0000	1.2
+++ sources	5 Aug 2009 09:03:01 -0000	1.3
@@ -1 +1 @@
-7599854c77efc7d1cc45d1eec899ceb7  Proc-Simple-1.25.tgz
+06e381d16536af2582e989d8f2edcdaf  Proc-Simple-1.26.tar.gz



From gerd at fedoraproject.org  Wed Aug  5 09:03:29 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed,  5 Aug 2009 09:03:29 +0000 (UTC)
Subject: rpms/parrot/devel parrot.spec,1.12,1.13
Message-ID: <20090805090329.9AD4911C008C@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19323

Modified Files:
	parrot.spec 
Log Message:
parrot.spec


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- parrot.spec	4 Aug 2009 01:46:01 -0000	1.12
+++ parrot.spec	5 Aug 2009 09:03:29 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -220,10 +220,8 @@ done
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-%ifnarch ppc
 %{?_without_fulltest: FULL=''}
 %{?!_without_tests: make ${FULL}test}
-%endif
 
 
 %clean
@@ -270,7 +268,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-8
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
+- ppc test included again
 - include the necessary module Parrot::Oplib::core
 - change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*
@@ -304,7 +303,6 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
 - Removed wrong prefix from pkgconfig per Christoph Wickert
 - Changed i386 to ix86 per Christoph Wickert
-- Changed hard-coded path requirement to perl.
 
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0



From hedayat at fedoraproject.org  Wed Aug  5 09:15:31 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  5 Aug 2009 09:15:31 +0000 (UTC)
Subject: rpms/rcssserver/F-11 .cvsignore, 1.8, 1.9 rcssserver.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20090805091531.813CB11C008C@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21894

Modified Files:
	.cvsignore rcssserver.spec sources 
Log Message:
Updated to 13.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Apr 2009 14:05:11 -0000	1.8
+++ .cvsignore	5 Aug 2009 09:15:31 -0000	1.9
@@ -1 +1 @@
-rcssserver-13.2.0.tar.gz
+rcssserver-13.2.2.tar.gz


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-11/rcssserver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rcssserver.spec	7 Apr 2009 14:05:11 -0000	1.10
+++ rcssserver.spec	5 Aug 2009 09:15:31 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rcssserver
-Version:        13.2.0
+Version:        13.2.2
 Release:        1%{?dist}
 Summary:        Robocup 2D Soccer Simulation Server
 
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Wed Aug 05 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.2-1
+- Updated to 13.2.2 which brings some bug fixes
+
 * Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
 - Updated to the latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Apr 2009 14:05:11 -0000	1.8
+++ sources	5 Aug 2009 09:15:31 -0000	1.9
@@ -1 +1 @@
-fb50619cddf6a1514f220a960fed91f1  rcssserver-13.2.0.tar.gz
+3af8e644ba9944f1106a712b926bdc65  rcssserver-13.2.2.tar.gz



From akurtakov at fedoraproject.org  Wed Aug  5 09:19:48 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  5 Aug 2009 09:19:48 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.650,1.651
Message-ID: <20090805091948.7183911C008C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23486/devel

Modified Files:
	eclipse.spec 
Log Message:
Revert initialize call path changes.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -p -r1.650 -r1.651
--- eclipse.spec	5 Aug 2009 08:46:29 -0000	1.650
+++ eclipse.spec	5 Aug 2009 09:19:48 -0000	1.651
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.30%{?dist}
+Release:        0.3.31%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -937,7 +937,7 @@ rm -r $sdkDir/configuration/org.eclipse.
 
 %if %{initialize}
 # dump bundles.info and config.ini to check what's wrong with ppc64 build
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/config.ini
+cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
@@ -951,8 +951,8 @@ pushd $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins  $RPM_BUILD_ROOT/dropins
 mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
 libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
-java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT/$libdir_path/configuration \
-     -cp /$libdir_path/startup.jar \
+java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \
+     -cp $libdir_path/startup.jar \
      org.eclipse.core.launcher.Main \
      -debug -consolelog \
      -metadataRepository file:$metadataDir \
@@ -1488,6 +1488,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.31
+- Revert initialize call path changes.
+
 * Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.30
 - Additional output to debug ppc64 build failures.
 



From hedayat at fedoraproject.org  Wed Aug  5 09:22:39 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  5 Aug 2009 09:22:39 +0000 (UTC)
Subject: rpms/rcssserver/F-10 .cvsignore, 1.8, 1.9 rcssserver.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20090805092239.C21F711C008C@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24210

Modified Files:
	.cvsignore rcssserver.spec sources 
Log Message:
Updated to 13.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Apr 2009 14:26:36 -0000	1.8
+++ .cvsignore	5 Aug 2009 09:22:39 -0000	1.9
@@ -1 +1 @@
-rcssserver-13.2.0.tar.gz
+rcssserver-13.2.2.tar.gz


Index: rcssserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/rcssserver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rcssserver.spec	16 Apr 2009 14:23:48 -0000	1.9
+++ rcssserver.spec	5 Aug 2009 09:22:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rcssserver
-Version:        13.2.0
-Release:        1%{?dist}.1
+Version:        13.2.2
+Release:        1%{?dist}
 Summary:        Robocup 2D Soccer Simulation Server
 
 Group:          Applications/System
@@ -104,8 +104,11 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Wed Aug 05 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.2-1
+- Updated to 13.2.2 which brings some bug fixes
+
 * Thu Apr 16 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1.1
-- Fixed a libtool build problem caused by autoreconf conmmand
+- Fixed a libtool build problem caused by autoreconf command
 
 * Tue Apr 07 2009 Hedayat Vatankhah <hedayat at grad.com> 13.2.0-1
 - Updated to the latest upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Apr 2009 14:26:36 -0000	1.8
+++ sources	5 Aug 2009 09:22:39 -0000	1.9
@@ -1 +1 @@
-fb50619cddf6a1514f220a960fed91f1  rcssserver-13.2.0.tar.gz
+3af8e644ba9944f1106a712b926bdc65  rcssserver-13.2.2.tar.gz



From pkgdb at fedoraproject.org  Wed Aug  5 09:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:34:22 +0000
Subject: [pkgdb] vbetool ownership updated
Message-ID: <20090805093423.14A5010F89F@bastion2.fedora.phx.redhat.com>

Package vbetool in Fedora devel is now owned by pknirsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pghmcfc at fedoraproject.org  Wed Aug  5 09:34:40 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed,  5 Aug 2009 09:34:40 +0000 (UTC)
Subject: rpms/gtkwave/devel .cvsignore, 1.57, 1.58 gtkwave.spec, 1.64,
	1.65 sources, 1.57, 1.58 gtkwave-3.2.1.patch, 1.1, NONE
Message-ID: <20090805093440.A946F11C008C@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26819

Modified Files:
	.cvsignore gtkwave.spec sources 
Removed Files:
	gtkwave-3.2.1.patch 
Log Message:
update to 3.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	14 Apr 2009 15:14:36 -0000	1.57
+++ .cvsignore	5 Aug 2009 09:34:39 -0000	1.58
@@ -1 +1 @@
-gtkwave-3.2.1.tar.gz
+gtkwave-3.2.2.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gtkwave.spec	25 Jul 2009 01:49:03 -0000	1.64
+++ gtkwave.spec	5 Aug 2009 09:34:39 -0000	1.65
@@ -2,13 +2,12 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.2.1
-Release:	%{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}.1
+Version:	3.2.2
+Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
 Source0:	http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz
-Patch0:		gtkwave-3.2.1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, bzip2-devel, zlib-devel, gperf, flex
 # BR: /usr/include/tcl.h rather than tcl-devel for compatibility with
@@ -24,11 +23,8 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
-# Upstream patch to fix crash on print to file (#511858)
-%patch0 -p0 -b .print-to-file
-
 # Note that GTKWave is a GUI application but no desktop entry is provided for it.
-# This is because the application requires at least one mandatory parameter (file
+# This is because the application required at least one mandatory parameter (file
 # to view) and cannot be opened in a "no file" mode from a menu.
 
 %build
@@ -61,6 +57,8 @@ done
 %files
 %defattr(-,root,root,-)
 %doc %{_docdir}/gtkwave-%{version}/
+%{_bindir}/evcd2vcd
+%{_bindir}/fst2vcd
 %{_bindir}/ghwdump
 %{_bindir}/gtkwave
 %{_bindir}/lxt2miner
@@ -72,12 +70,15 @@ done
 %{_bindir}/tex2vcd
 %{_bindir}/tla2vcd
 %{_bindir}/twinwave
+%{_bindir}/vcd2fst
 %{_bindir}/vcd2lxt
 %{_bindir}/vcd2lxt2
 %{_bindir}/vcd2vzt
 %{_bindir}/vermin
 %{_bindir}/vzt2vcd
 %{_bindir}/vztminer
+%{_mandir}/man1/evcd2vcd.1*
+%{_mandir}/man1/fst2vcd.1*
 %{_mandir}/man1/ghwdump.1*
 %{_mandir}/man1/gtkwave.1*
 %{_mandir}/man1/lxt2miner.1*
@@ -89,6 +90,7 @@ done
 %{_mandir}/man1/tex2vcd.1*
 %{_mandir}/man1/tla2vcd.1*
 %{_mandir}/man1/twinwave.1*
+%{_mandir}/man1/vcd2fst.1*
 %{_mandir}/man1/vcd2lxt.1*
 %{_mandir}/man1/vcd2lxt2.1*
 %{_mandir}/man1/vcd2vzt.1*
@@ -98,8 +100,12 @@ done
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Aug  5 2009 Paul Howarth <paul at city-fan.org> 3.2.2-1
+- update to 3.2.2 (new tools evcd2vcd/fst2vcd/vcd2fst)
+- drop print-to-file patch, no longer needed
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jul 15 2009 Paul Howarth <paul at city-fan.org> 3.2.1-2
 - add upstream patch for crash on print to file (#511858)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Apr 2009 15:14:36 -0000	1.57
+++ sources	5 Aug 2009 09:34:39 -0000	1.58
@@ -1 +1 @@
-6b1cb76e454d073da35ec646311178a4  gtkwave-3.2.1.tar.gz
+644f090233f50c8e51ed9ad6b6bcf48b  gtkwave-3.2.2.tar.gz


--- gtkwave-3.2.1.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Aug  5 09:34:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:34:44 +0000
Subject: [pkgdb] vbetool ownership updated
Message-ID: <20090805093445.A7E0510F89F@bastion2.fedora.phx.redhat.com>

Package vbetool in Fedora 10 is now owned by pknirsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 09:35:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:35:12 +0000
Subject: [pkgdb] vbetool: till has requested watchbugzilla
Message-ID: <20090805093512.EED1010F89F@bastion2.fedora.phx.redhat.com>

till has requested the watchbugzilla acl on vbetool (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 09:35:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:35:18 +0000
Subject: [pkgdb] vbetool: till has given up watchbugzilla
Message-ID: <20090805093518.66A6710F8A2@bastion2.fedora.phx.redhat.com>

till has given up the watchbugzilla acl on vbetool (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From monnerat at fedoraproject.org  Wed Aug  5 09:36:08 2009
From: monnerat at fedoraproject.org (Patrick Monnerat)
Date: Wed,  5 Aug 2009 09:36:08 +0000 (UTC)
Subject: rpms/php-PHPMailer/devel import.log, NONE, 1.1 php-PHPMailer.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805093608.1919611C008C@cvs1.fedora.phx.redhat.com>

Author: monnerat

Update of /cvs/pkgs/rpms/php-PHPMailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26794/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-PHPMailer.spec 
Log Message:

* Wed Aug  5 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Initial import.



--- NEW FILE import.log ---
php-PHPMailer-5_0_2-3_fc10:HEAD:php-PHPMailer-5.0.2-3.fc10.src.rpm:1249464851


--- NEW FILE php-PHPMailer.spec ---
Name:		php-PHPMailer
Summary:	PHP email transport class with a lot of features
Version:	5.0.2
Release:	3%{?dist}
License:	LGPLv2+
Group:		System Environment/Libraries
Source0:	http://downloads.sourceforge.net/phpmailer/PHPMailer_v%{version}.tar.gz
URL:		http://phpmailer.worxware.com/
Requires:	php-mbstring >= 5.1.0
BuildRequires:	dos2unix
Buildarch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root

%description
Full Featured Email Transfer Class for PHP. PHPMailer features:

    * Supports emails digitally signed with S/MIME encryption!
    * Supports emails with multiple TOs, CCs, BCCs and REPLY-TOs
    * Works on any platform.
    * Supports Text & HTML emails.
    * Embedded image support.
    * Multipart/alternative emails for mail clients that do not read
      HTML email.
    * Flexible debugging.
    * Custom mail headers.
    * Redundant SMTP servers.
    * Support for 8bit, base64, binary, and quoted-printable encoding.
    * Word wrap.
    * Multiple fs, string, and binary attachments (those from database,
      string, etc).
    * SMTP authentication.
    * Tested on multiple SMTP servers: Sendmail, qmail, Postfix, Gmail,
      Imail, Exchange, etc.
    * Good documentation, many examples included in download.
    * It's swift, small, and simple.


#-------------------------------------------------------------------------------
%prep
#-------------------------------------------------------------------------------

%setup -q -n PHPMailer_v%{version}

#	Make sure all files are \n terminated.

find . -type f | xargs dos2unix

#	Change default language path.

sed -i -e								\
    "/function SetLanguage/s#'language/'#'%{_datadir}/PHPMailer/language/'#" \
    class.phpmailer.php


#-------------------------------------------------------------------------------
%build
#-------------------------------------------------------------------------------

#	Nothing to do.


#-------------------------------------------------------------------------------
%install
#-------------------------------------------------------------------------------

rm -rf "${RPM_BUILD_ROOT}"

#	install directories.

install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/PHPMailer/language/"


#	Install class files.

install -p -m 644							\
	class.phpmailer.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -m 644 class.smtp.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -m 644 class.pop3.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"


#	Install language files (these are not gettextized).

install -p -m 644 language/*.php					\
	"${RPM_BUILD_ROOT}/%{_datadir}/PHPMailer/language"

#	Tag language files.

(
	cd "${RPM_BUILD_ROOT}"
	find ".%{_datadir}/PHPMailer/language" -name "phpmailer.lang-*.php" |
		sed -e 's/^\.//'					\
		    -e 's#^.*/phpmailer\.lang-\(.*\)\.php$#%lang(\1) &#'
) > files.list


#-------------------------------------------------------------------------------
%clean
#-------------------------------------------------------------------------------

rm -rf "${RPM_BUILD_ROOT}"


#-------------------------------------------------------------------------------
%files -f files.list
#-------------------------------------------------------------------------------

%defattr(-, root, root, -)
%doc docs/* README LICENSE ChangeLog.txt
%doc examples
%{_datadir}/php/PHPMailer
%dir %{_datadir}/PHPMailer
%dir %{_datadir}/PHPMailer/language


#-------------------------------------------------------------------------------
%changelog
#-------------------------------------------------------------------------------

* Mon Aug  3 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Home page change.
- Package description from new home page.
- Requires php-mbstring.

* Fri Jun 19 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-2
- Suppress "ed" build requirement.
- Tag language files.
- Move class files to a package-specific directory.

* Tue Jun  2 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-1
- Initial RPM spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:29:50 -0000	1.1
+++ .cvsignore	5 Aug 2009 09:36:07 -0000	1.2
@@ -0,0 +1 @@
+PHPMailer_v5.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:29:50 -0000	1.1
+++ sources	5 Aug 2009 09:36:07 -0000	1.2
@@ -0,0 +1 @@
+2f7296bb63e863c5528c2d591e38f4e5  PHPMailer_v5.0.2.tar.gz



From pkgdb at fedoraproject.org  Wed Aug  5 09:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:37:15 +0000
Subject: [pkgdb] vbetool ownership updated
Message-ID: <20090805093716.21F6F10F890@bastion2.fedora.phx.redhat.com>

Package vbetool in Fedora 7 is now owned by pknirsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 09:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:37:19 +0000
Subject: [pkgdb] vbetool ownership updated
Message-ID: <20090805093719.B03A410F8A1@bastion2.fedora.phx.redhat.com>

Package vbetool in Fedora 8 is now owned by pknirsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 09:37:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:37:23 +0000
Subject: [pkgdb] vbetool ownership updated
Message-ID: <20090805093723.E3B5510F8AF@bastion2.fedora.phx.redhat.com>

Package vbetool in Fedora 9 is now owned by pknirsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 09:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 09:37:37 +0000
Subject: [pkgdb] vbetool ownership updated
Message-ID: <20090805093739.772DC10F890@bastion2.fedora.phx.redhat.com>

Package vbetool in Fedora 11 is now owned by pknirsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From mgieseki at fedoraproject.org  Wed Aug  5 09:44:45 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 09:44:45 +0000 (UTC)
Subject: rpms/dvisvgm/devel dvisvgm-0.8.1-potrace.patch, NONE,
	1.1 dvisvgm.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805094445.9EBEC11C008C@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dvisvgm-0.8.1-potrace.patch dvisvgm.spec import.log 
Log Message:
initial import


dvisvgm-0.8.1-potrace.patch:
 Makefile.am     |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvisvgm-0.8.1-potrace.patch ---
diff -r 1c65b524363d Makefile.am
--- a/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -5,5 +5,5 @@
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = LICENSE
-SUBDIRS = potracelib src doc 
+SUBDIRS = src doc 
 
diff -r 1c65b524363d configure.ac
--- a/configure.ac	Sun Aug 02 09:11:21 2009 +0200
+++ b/configure.ac	Tue Aug 04 17:37:00 2009 +0200
@@ -146,5 +146,5 @@
 
 AC_SUBST(DATE)
 AC_SUBST(EXTRA_LIBS)
-AC_CONFIG_FILES([Makefile potracelib/Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
 AC_OUTPUT
diff -r 1c65b524363d src/Makefile.am
--- a/src/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/src/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -9,7 +9,7 @@
 dvisvgm_SOURCES      = cmdline.h gzstream.h cmdline.c StreamCounter.h \
 							  dvisvgm.cpp gzstream.cpp
 							  
-dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ ../potracelib/libpotrace.a
+dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ -lpotrace
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
 
 libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CharmapTranslator.h Color.h \
@@ -28,7 +28,7 @@
 
 EXTRA_DIST = options.ggo getopt.h getopt.c getopt1.c psdefs.psc iapi.h ierrors.h
 
-AM_CXXFLAGS = -I../potracelib -I../../potracelib -Wall
+AM_CXXFLAGS = -Wall
 
 # the commandline parser is generated by gengetopt (gets version number from config.h)
 cmdline.c: options.ggo


--- NEW FILE dvisvgm.spec ---
Name:           dvisvgm
Version:        0.8.1
Release:        4%{?dist}
Summary:        A DVI to SVG converter

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://dvisvgm.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Patch to use potrace library provided by separate package
Patch0:         dvisvgm-0.8.1-potrace.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript

%description
dvisvgm is a command line utility that converts DVI files, as created by 
TeX/LaTeX, to the XML-based scalable vector graphics format SVG. Besides 
the basic DVI command set, dvisvgm also supports various special sets, like 
color, PostScript and TPIC.

Fonts that are only available as Metafont source are automatically vectorized 
so that the generated SVG is freely scalable without loss of quality.


%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
# Remove bundled potracelib
rm -rf potracelib


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README
%{_bindir}/dvisvgm
%{_mandir}/man1/dvisvgm.1.*


%changelog
* Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
- removed bundled potrace library in prep section

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-3
- don't use bundled potrace library

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-2
- rebased to upstream with added tarball
- added LICENSE to doc

* Sun Aug 01 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-1
- initial release


--- NEW FILE import.log ---
dvisvgm-0_8_1-4_fc11:HEAD:dvisvgm-0.8.1-4.fc11.src.rpm:1249465460


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:13:18 -0000	1.1
+++ .cvsignore	5 Aug 2009 09:44:45 -0000	1.2
@@ -0,0 +1 @@
+dvisvgm-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:13:18 -0000	1.1
+++ sources	5 Aug 2009 09:44:45 -0000	1.2
@@ -0,0 +1 @@
+a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz



From monnerat at fedoraproject.org  Wed Aug  5 09:46:30 2009
From: monnerat at fedoraproject.org (Patrick Monnerat)
Date: Wed,  5 Aug 2009 09:46:30 +0000 (UTC)
Subject: rpms/php-PHPMailer/F-10 import.log, NONE, 1.1 php-PHPMailer.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805094630.3EAD711C008C@cvs1.fedora.phx.redhat.com>

Author: monnerat

Update of /cvs/pkgs/rpms/php-PHPMailer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29483/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-PHPMailer.spec 
Log Message:

* Wed Aug  5 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Initial import



--- NEW FILE import.log ---
php-PHPMailer-5_0_2-3_fc10:F-10:php-PHPMailer-5.0.2-3.fc10.src.rpm:1249465490


--- NEW FILE php-PHPMailer.spec ---
Name:		php-PHPMailer
Summary:	PHP email transport class with a lot of features
Version:	5.0.2
Release:	3%{?dist}
License:	LGPLv2+
Group:		System Environment/Libraries
Source0:	http://downloads.sourceforge.net/phpmailer/PHPMailer_v%{version}.tar.gz
URL:		http://phpmailer.worxware.com/
Requires:	php-mbstring >= 5.1.0
BuildRequires:	dos2unix
Buildarch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root

%description
Full Featured Email Transfer Class for PHP. PHPMailer features:

    * Supports emails digitally signed with S/MIME encryption!
    * Supports emails with multiple TOs, CCs, BCCs and REPLY-TOs
    * Works on any platform.
    * Supports Text & HTML emails.
    * Embedded image support.
    * Multipart/alternative emails for mail clients that do not read
      HTML email.
    * Flexible debugging.
    * Custom mail headers.
    * Redundant SMTP servers.
    * Support for 8bit, base64, binary, and quoted-printable encoding.
    * Word wrap.
    * Multiple fs, string, and binary attachments (those from database,
      string, etc).
    * SMTP authentication.
    * Tested on multiple SMTP servers: Sendmail, qmail, Postfix, Gmail,
      Imail, Exchange, etc.
    * Good documentation, many examples included in download.
    * It's swift, small, and simple.


#-------------------------------------------------------------------------------
%prep
#-------------------------------------------------------------------------------

%setup -q -n PHPMailer_v%{version}

#	Make sure all files are \n terminated.

find . -type f | xargs dos2unix

#	Change default language path.

sed -i -e								\
    "/function SetLanguage/s#'language/'#'%{_datadir}/PHPMailer/language/'#" \
    class.phpmailer.php


#-------------------------------------------------------------------------------
%build
#-------------------------------------------------------------------------------

#	Nothing to do.


#-------------------------------------------------------------------------------
%install
#-------------------------------------------------------------------------------

rm -rf "${RPM_BUILD_ROOT}"

#	install directories.

install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/PHPMailer/language/"


#	Install class files.

install -p -m 644							\
	class.phpmailer.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -m 644 class.smtp.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -m 644 class.pop3.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"


#	Install language files (these are not gettextized).

install -p -m 644 language/*.php					\
	"${RPM_BUILD_ROOT}/%{_datadir}/PHPMailer/language"

#	Tag language files.

(
	cd "${RPM_BUILD_ROOT}"
	find ".%{_datadir}/PHPMailer/language" -name "phpmailer.lang-*.php" |
		sed -e 's/^\.//'					\
		    -e 's#^.*/phpmailer\.lang-\(.*\)\.php$#%lang(\1) &#'
) > files.list


#-------------------------------------------------------------------------------
%clean
#-------------------------------------------------------------------------------

rm -rf "${RPM_BUILD_ROOT}"


#-------------------------------------------------------------------------------
%files -f files.list
#-------------------------------------------------------------------------------

%defattr(-, root, root, -)
%doc docs/* README LICENSE ChangeLog.txt
%doc examples
%{_datadir}/php/PHPMailer
%dir %{_datadir}/PHPMailer
%dir %{_datadir}/PHPMailer/language


#-------------------------------------------------------------------------------
%changelog
#-------------------------------------------------------------------------------

* Mon Aug  3 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Home page change.
- Package description from new home page.
- Requires php-mbstring.

* Fri Jun 19 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-2
- Suppress "ed" build requirement.
- Tag language files.
- Move class files to a package-specific directory.

* Tue Jun  2 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-1
- Initial RPM spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:29:50 -0000	1.1
+++ .cvsignore	5 Aug 2009 09:46:29 -0000	1.2
@@ -0,0 +1 @@
+PHPMailer_v5.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:29:50 -0000	1.1
+++ sources	5 Aug 2009 09:46:30 -0000	1.2
@@ -0,0 +1 @@
+2f7296bb63e863c5528c2d591e38f4e5  PHPMailer_v5.0.2.tar.gz



From adrian at fedoraproject.org  Wed Aug  5 09:47:32 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed,  5 Aug 2009 09:47:32 +0000 (UTC)
Subject: rpms/wordpress/F-10 .cvsignore,1.24,1.25 sources,1.24,1.25
Message-ID: <20090805094732.E10FF11C008C@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30139

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Jul 2009 08:53:16 -0000	1.24
+++ .cvsignore	5 Aug 2009 09:47:32 -0000	1.25
@@ -1 +1 @@
-wordpress-2.8.2.tar.gz
+wordpress-2.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Jul 2009 08:53:16 -0000	1.24
+++ sources	5 Aug 2009 09:47:32 -0000	1.25
@@ -1 +1 @@
-8fde8c4aa3e4d86ce9ddca7cdc0769a2  wordpress-2.8.2.tar.gz
+0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz



From monnerat at fedoraproject.org  Wed Aug  5 09:47:50 2009
From: monnerat at fedoraproject.org (Patrick Monnerat)
Date: Wed,  5 Aug 2009 09:47:50 +0000 (UTC)
Subject: rpms/php-PHPMailer/F-11 import.log, NONE, 1.1 php-PHPMailer.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805094750.838F711C008C@cvs1.fedora.phx.redhat.com>

Author: monnerat

Update of /cvs/pkgs/rpms/php-PHPMailer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30101/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-PHPMailer.spec 
Log Message:

* Wed Aug  5 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Initial import



--- NEW FILE import.log ---
php-PHPMailer-5_0_2-3_fc10:F-11:php-PHPMailer-5.0.2-3.fc10.src.rpm:1249465628


--- NEW FILE php-PHPMailer.spec ---
Name:		php-PHPMailer
Summary:	PHP email transport class with a lot of features
Version:	5.0.2
Release:	3%{?dist}
License:	LGPLv2+
Group:		System Environment/Libraries
Source0:	http://downloads.sourceforge.net/phpmailer/PHPMailer_v%{version}.tar.gz
URL:		http://phpmailer.worxware.com/
Requires:	php-mbstring >= 5.1.0
BuildRequires:	dos2unix
Buildarch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root

%description
Full Featured Email Transfer Class for PHP. PHPMailer features:

    * Supports emails digitally signed with S/MIME encryption!
    * Supports emails with multiple TOs, CCs, BCCs and REPLY-TOs
    * Works on any platform.
    * Supports Text & HTML emails.
    * Embedded image support.
    * Multipart/alternative emails for mail clients that do not read
      HTML email.
    * Flexible debugging.
    * Custom mail headers.
    * Redundant SMTP servers.
    * Support for 8bit, base64, binary, and quoted-printable encoding.
    * Word wrap.
    * Multiple fs, string, and binary attachments (those from database,
      string, etc).
    * SMTP authentication.
    * Tested on multiple SMTP servers: Sendmail, qmail, Postfix, Gmail,
      Imail, Exchange, etc.
    * Good documentation, many examples included in download.
    * It's swift, small, and simple.


#-------------------------------------------------------------------------------
%prep
#-------------------------------------------------------------------------------

%setup -q -n PHPMailer_v%{version}

#	Make sure all files are \n terminated.

find . -type f | xargs dos2unix

#	Change default language path.

sed -i -e								\
    "/function SetLanguage/s#'language/'#'%{_datadir}/PHPMailer/language/'#" \
    class.phpmailer.php


#-------------------------------------------------------------------------------
%build
#-------------------------------------------------------------------------------

#	Nothing to do.


#-------------------------------------------------------------------------------
%install
#-------------------------------------------------------------------------------

rm -rf "${RPM_BUILD_ROOT}"

#	install directories.

install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/PHPMailer/language/"


#	Install class files.

install -p -m 644							\
	class.phpmailer.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -m 644 class.smtp.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"
install -p -m 644 class.pop3.php "${RPM_BUILD_ROOT}/%{_datadir}/php/PHPMailer/"


#	Install language files (these are not gettextized).

install -p -m 644 language/*.php					\
	"${RPM_BUILD_ROOT}/%{_datadir}/PHPMailer/language"

#	Tag language files.

(
	cd "${RPM_BUILD_ROOT}"
	find ".%{_datadir}/PHPMailer/language" -name "phpmailer.lang-*.php" |
		sed -e 's/^\.//'					\
		    -e 's#^.*/phpmailer\.lang-\(.*\)\.php$#%lang(\1) &#'
) > files.list


#-------------------------------------------------------------------------------
%clean
#-------------------------------------------------------------------------------

rm -rf "${RPM_BUILD_ROOT}"


#-------------------------------------------------------------------------------
%files -f files.list
#-------------------------------------------------------------------------------

%defattr(-, root, root, -)
%doc docs/* README LICENSE ChangeLog.txt
%doc examples
%{_datadir}/php/PHPMailer
%dir %{_datadir}/PHPMailer
%dir %{_datadir}/PHPMailer/language


#-------------------------------------------------------------------------------
%changelog
#-------------------------------------------------------------------------------

* Mon Aug  3 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Home page change.
- Package description from new home page.
- Requires php-mbstring.

* Fri Jun 19 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-2
- Suppress "ed" build requirement.
- Tag language files.
- Move class files to a package-specific directory.

* Tue Jun  2 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-1
- Initial RPM spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:29:50 -0000	1.1
+++ .cvsignore	5 Aug 2009 09:47:50 -0000	1.2
@@ -0,0 +1 @@
+PHPMailer_v5.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:29:50 -0000	1.1
+++ sources	5 Aug 2009 09:47:50 -0000	1.2
@@ -0,0 +1 @@
+2f7296bb63e863c5528c2d591e38f4e5  PHPMailer_v5.0.2.tar.gz



From adrian at fedoraproject.org  Wed Aug  5 09:48:32 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed,  5 Aug 2009 09:48:32 +0000 (UTC)
Subject: rpms/wordpress/F-11 .cvsignore,1.24,1.25 sources,1.24,1.25
Message-ID: <20090805094832.561FD11C008C@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30885

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Jul 2009 08:52:42 -0000	1.24
+++ .cvsignore	5 Aug 2009 09:48:31 -0000	1.25
@@ -1 +1 @@
-wordpress-2.8.2.tar.gz
+wordpress-2.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Jul 2009 08:52:42 -0000	1.24
+++ sources	5 Aug 2009 09:48:32 -0000	1.25
@@ -1 +1 @@
-8fde8c4aa3e4d86ce9ddca7cdc0769a2  wordpress-2.8.2.tar.gz
+0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz



From adrian at fedoraproject.org  Wed Aug  5 09:49:02 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed,  5 Aug 2009 09:49:02 +0000 (UTC)
Subject: rpms/wordpress/EL-5 .cvsignore,1.23,1.24 sources,1.23,1.24
Message-ID: <20090805094902.87A2711C008C@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31434

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
- updated to 2.8.3 for security fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	28 Jul 2009 08:53:46 -0000	1.23
+++ .cvsignore	5 Aug 2009 09:49:02 -0000	1.24
@@ -1 +1 @@
-wordpress-2.8.2.tar.gz
+wordpress-2.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	28 Jul 2009 08:53:46 -0000	1.23
+++ sources	5 Aug 2009 09:49:02 -0000	1.24
@@ -1 +1 @@
-8fde8c4aa3e4d86ce9ddca7cdc0769a2  wordpress-2.8.2.tar.gz
+0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz



From mschwendt at fedoraproject.org  Wed Aug  5 09:50:40 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  5 Aug 2009 09:50:40 +0000 (UTC)
Subject: extras-repoclosure rc-report.py,1.64,1.65
Message-ID: <20090805095040.6F3B611C0425@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31858

Modified Files:
	rc-report.py 
Log Message:
move an empty line inbetween package details in private reports


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- rc-report.py	4 Aug 2009 09:52:55 -0000	1.64
+++ rc-report.py	5 Aug 2009 09:50:39 -0000	1.65
@@ -223,7 +223,9 @@
                 continue
             else:
                 # Copy report per broken package.
-                b.report.append( line.rstrip() )
+                r = line.rstrip()
+                if len(r)>0:
+                    b.report.append( r )
 
         elif inbody == 2:
             n = line.lstrip().rstrip()
@@ -274,7 +276,7 @@
         if b.new:
             print 'NEW breakage: %s in %s' % (b.pkgid, b.repoid)
         if b.mail:
-            r = '\n'.join(b.report)+'\n'
+            r = '\n'.join(b.report)+'\n\n'
             reports.setdefault(b.owner,[b.new,''])
             reports[b.owner][1] += r
             # Also build mails for co-owners.



From huzaifas at fedoraproject.org  Wed Aug  5 09:52:28 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  5 Aug 2009 09:52:28 +0000 (UTC)
Subject: rpms/dia/F-10 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 dia.spec, 
	1.29, 1.30 sources, 1.6, 1.7 dia-0.92.2-dtd.patch, 1.1,
	NONE dia-0.94-fallbacktoxpmicons.patch, 1.2,
	NONE dia-0.95-pre6-help.patch, 1.2,
	NONE dia-0.96-python-detect.patch, 1.1,
	NONE dia-0.96.1-64bit.patch, 1.1, NONE dia-0.96.1-desktop.patch,
	1.1, NONE dia-0.96.1-plugins.patch, 1.1,
	NONE dia-0.96.1-pythonpath.patch, 1.1,
	NONE dia-0.96.1-svg-export.patch, 1.1, NONE
Message-ID: <20090805095228.60CF711C008C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32416/F-10

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	import.log 
Removed Files:
	dia-0.92.2-dtd.patch dia-0.94-fallbacktoxpmicons.patch 
	dia-0.95-pre6-help.patch dia-0.96-python-detect.patch 
	dia-0.96.1-64bit.patch dia-0.96.1-desktop.patch 
	dia-0.96.1-plugins.patch dia-0.96.1-pythonpath.patch 
	dia-0.96.1-svg-export.patch 
Log Message:
version bump



--- NEW FILE import.log ---
dia-0_97-1_fc10:F-10:dia-0.97-1.fc10.src.rpm:1249451593


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jun 2007 08:22:46 -0000	1.6
+++ .cvsignore	5 Aug 2009 09:52:27 -0000	1.7
@@ -1 +1 @@
-dia-0.96.1.tar.bz2
+dia-0.97.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-10/dia.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- dia.spec	2 Feb 2009 06:47:07 -0000	1.29
+++ dia.spec	5 Aug 2009 09:52:28 -0000	1.30
@@ -1,30 +1,20 @@
 Name:           dia
-Version:        0.96.1
-Release:        10%{?dist}
+Version:        0.97
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.96/%{name}-%{version}.tar.bz2
-Patch1:         dia-0.92.2-dtd.patch
-Patch2:         dia-0.95-pre6-help.patch
-Patch3:         dia-0.94-fallbacktoxpmicons.patch
-Patch4:         dia-0.96-python-detect.patch
-Patch5:         dia-0.96.1-64bit.patch
-Patch6:         dia-0.96.1-desktop.patch
-Patch7:         dia-0.96.1-svg-export.patch
-Patch8:         dia-0.96.1-plugins.patch
-Patch9:         dia-0.96.1-pythonpath.patch
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
 
 %description
-The Dia drawing program is designed to be like the Windows(TM) Visio
-program.  Dia can be used to draw different types of diagrams, and
+The Dia drawing program can be used to draw different types of diagrams, and
 includes support for UML static structure diagrams (class diagrams),
 entity relationship modeling, and network diagrams.  Dia can load and
 save diagrams to a custom file format, can load and save in .xml format,
@@ -33,15 +23,6 @@ and can export to PostScript(TM).
 
 %prep
 %setup -q
-%patch1 -p1 -b .dtd
-%patch2 -p1 -b .help
-%patch3 -p1 -b .fallbacktoxpmicons
-%patch4 -p1 -b .py-detect
-%patch5 -p1 -b .64bit
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .orig
-%patch9 -p1 -b .pythonpath
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -59,10 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %name
 
-# stop rpmlint from complaining
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/python/doxrev.py
-
 # Since we're not using the cairo stuff, but a stub plugin still
 # gets built, Dia complains it doesn't have an init function.  So
 # kill the plugin
@@ -73,13 +50,9 @@ desktop-file-install --vendor fedora  --
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --remove-category Application                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -112,16 +85,37 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime-info/*
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/omf/%{name}/*.omf
 
 
 %changelog
-* Mon Feb 02 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-10
+* Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
+- update to 0.97
+- drop old patches
+
+* Tue Mar 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.96.1-17
+- Resolves: rhbz#486726
+- Version bump
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.96.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 02 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-13
 - Resolves: rhbz#483312
 
-* Mon Jan 26 2009 Caol?n McNamara <caolanm at redhat.com> 1:0.96.1-9
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1:0.96.1-12
+- Update description for new trademark guidelines
+
+* Mon Jan 26 2009 Caol?n McNamara <caolanm at redhat.com> 1:0.96.1-11
 - Resolves: rhbz#481551 python modules search path
 
+* Sat Jan 03 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-10
+- Patch so that plugins dont look for .la files
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:0.96.1-9
+- Rebuild for Python 2.6
+
 * Fri Oct 31 2008 Caol?n McNamara <caolanm at redhat.com> 1:0.96.1-8
 - kill the ".la"s
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jun 2007 08:22:46 -0000	1.6
+++ sources	5 Aug 2009 09:52:28 -0000	1.7
@@ -1 +1 @@
-7b81b22baa2df55efe4845865dddc7b6  dia-0.96.1.tar.bz2
+3d11f9aaa5a4923f0a5533962c87bdfb  dia-0.97.tar.bz2


--- dia-0.92.2-dtd.patch DELETED ---


--- dia-0.94-fallbacktoxpmicons.patch DELETED ---


--- dia-0.95-pre6-help.patch DELETED ---


--- dia-0.96-python-detect.patch DELETED ---


--- dia-0.96.1-64bit.patch DELETED ---


--- dia-0.96.1-desktop.patch DELETED ---


--- dia-0.96.1-plugins.patch DELETED ---


--- dia-0.96.1-pythonpath.patch DELETED ---


--- dia-0.96.1-svg-export.patch DELETED ---



From huzaifas at fedoraproject.org  Wed Aug  5 09:53:34 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  5 Aug 2009 09:53:34 +0000 (UTC)
Subject: rpms/dia/F-10 dia.spec,1.30,1.31
Message-ID: <20090805095334.F3EC111C008C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv310

Modified Files:
	dia.spec 
Log Message:
fix python


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-10/dia.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- dia.spec	5 Aug 2009 09:52:28 -0000	1.30
+++ dia.spec	5 Aug 2009 09:53:34 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.97
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -31,7 +31,7 @@ mv usage-layers.xml.UTF-8 doc/en/usage-l
 
 
 %build
-%configure --enable-gnome --enable-db2html --with-python
+%configure --enable-gnome --enable-db2html 
 make %{?_smp_mflags}
  
 
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-2
+- Disable --with-python
+
 * Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
 - update to 0.97
 - drop old patches



From mgieseki at fedoraproject.org  Wed Aug  5 10:04:40 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 10:04:40 +0000 (UTC)
Subject: rpms/dvisvgm/F-10 dvisvgm-0.8.1-potrace.patch, NONE,
	1.1 dvisvgm.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090805100440.227F611C0346@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2572/F-10

Modified Files:
	sources 
Added Files:
	dvisvgm-0.8.1-potrace.patch dvisvgm.spec 
Log Message:
package import to branch directories


dvisvgm-0.8.1-potrace.patch:
 Makefile.am     |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvisvgm-0.8.1-potrace.patch ---
diff -r 1c65b524363d Makefile.am
--- a/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -5,5 +5,5 @@
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = LICENSE
-SUBDIRS = potracelib src doc 
+SUBDIRS = src doc 
 
diff -r 1c65b524363d configure.ac
--- a/configure.ac	Sun Aug 02 09:11:21 2009 +0200
+++ b/configure.ac	Tue Aug 04 17:37:00 2009 +0200
@@ -146,5 +146,5 @@
 
 AC_SUBST(DATE)
 AC_SUBST(EXTRA_LIBS)
-AC_CONFIG_FILES([Makefile potracelib/Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
 AC_OUTPUT
diff -r 1c65b524363d src/Makefile.am
--- a/src/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/src/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -9,7 +9,7 @@
 dvisvgm_SOURCES      = cmdline.h gzstream.h cmdline.c StreamCounter.h \
 							  dvisvgm.cpp gzstream.cpp
 							  
-dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ ../potracelib/libpotrace.a
+dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ -lpotrace
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
 
 libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CharmapTranslator.h Color.h \
@@ -28,7 +28,7 @@
 
 EXTRA_DIST = options.ggo getopt.h getopt.c getopt1.c psdefs.psc iapi.h ierrors.h
 
-AM_CXXFLAGS = -I../potracelib -I../../potracelib -Wall
+AM_CXXFLAGS = -Wall
 
 # the commandline parser is generated by gengetopt (gets version number from config.h)
 cmdline.c: options.ggo


--- NEW FILE dvisvgm.spec ---
Name:           dvisvgm
Version:        0.8.1
Release:        4%{?dist}
Summary:        A DVI to SVG converter

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://dvisvgm.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Patch to use potrace library provided by separate package
Patch0:         dvisvgm-0.8.1-potrace.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript

%description
dvisvgm is a command line utility that converts DVI files, as created by 
TeX/LaTeX, to the XML-based scalable vector graphics format SVG. Besides 
the basic DVI command set, dvisvgm also supports various special sets, like 
color, PostScript and TPIC.

Fonts that are only available as Metafont source are automatically vectorized 
so that the generated SVG is freely scalable without loss of quality.


%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
# Remove bundled potracelib
rm -rf potracelib


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README
%{_bindir}/dvisvgm
%{_mandir}/man1/dvisvgm.1.*


%changelog
* Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
- removed bundled potrace library in prep section

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-3
- don't use bundled potrace library

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-2
- rebased to upstream with added tarball
- added LICENSE to doc

* Sun Aug 01 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:13:18 -0000	1.1
+++ sources	5 Aug 2009 10:04:39 -0000	1.2
@@ -0,0 +1 @@
+a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz



From mgieseki at fedoraproject.org  Wed Aug  5 10:04:39 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 10:04:39 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 dvisvgm-0.8.1-potrace.patch, NONE,
	1.1 dvisvgm.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090805100439.EC63011C008C@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2572/EL-5

Modified Files:
	sources 
Added Files:
	dvisvgm-0.8.1-potrace.patch dvisvgm.spec 
Log Message:
package import to branch directories


dvisvgm-0.8.1-potrace.patch:
 Makefile.am     |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvisvgm-0.8.1-potrace.patch ---
diff -r 1c65b524363d Makefile.am
--- a/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -5,5 +5,5 @@
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = LICENSE
-SUBDIRS = potracelib src doc 
+SUBDIRS = src doc 
 
diff -r 1c65b524363d configure.ac
--- a/configure.ac	Sun Aug 02 09:11:21 2009 +0200
+++ b/configure.ac	Tue Aug 04 17:37:00 2009 +0200
@@ -146,5 +146,5 @@
 
 AC_SUBST(DATE)
 AC_SUBST(EXTRA_LIBS)
-AC_CONFIG_FILES([Makefile potracelib/Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
 AC_OUTPUT
diff -r 1c65b524363d src/Makefile.am
--- a/src/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/src/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -9,7 +9,7 @@
 dvisvgm_SOURCES      = cmdline.h gzstream.h cmdline.c StreamCounter.h \
 							  dvisvgm.cpp gzstream.cpp
 							  
-dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ ../potracelib/libpotrace.a
+dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ -lpotrace
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
 
 libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CharmapTranslator.h Color.h \
@@ -28,7 +28,7 @@
 
 EXTRA_DIST = options.ggo getopt.h getopt.c getopt1.c psdefs.psc iapi.h ierrors.h
 
-AM_CXXFLAGS = -I../potracelib -I../../potracelib -Wall
+AM_CXXFLAGS = -Wall
 
 # the commandline parser is generated by gengetopt (gets version number from config.h)
 cmdline.c: options.ggo


--- NEW FILE dvisvgm.spec ---
Name:           dvisvgm
Version:        0.8.1
Release:        4%{?dist}
Summary:        A DVI to SVG converter

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://dvisvgm.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Patch to use potrace library provided by separate package
Patch0:         dvisvgm-0.8.1-potrace.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript

%description
dvisvgm is a command line utility that converts DVI files, as created by 
TeX/LaTeX, to the XML-based scalable vector graphics format SVG. Besides 
the basic DVI command set, dvisvgm also supports various special sets, like 
color, PostScript and TPIC.

Fonts that are only available as Metafont source are automatically vectorized 
so that the generated SVG is freely scalable without loss of quality.


%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
# Remove bundled potracelib
rm -rf potracelib


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README
%{_bindir}/dvisvgm
%{_mandir}/man1/dvisvgm.1.*


%changelog
* Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
- removed bundled potrace library in prep section

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-3
- don't use bundled potrace library

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-2
- rebased to upstream with added tarball
- added LICENSE to doc

* Sun Aug 01 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:13:18 -0000	1.1
+++ sources	5 Aug 2009 10:04:39 -0000	1.2
@@ -0,0 +1 @@
+a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz



From mgieseki at fedoraproject.org  Wed Aug  5 10:04:40 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 10:04:40 +0000 (UTC)
Subject: rpms/dvisvgm/F-11 dvisvgm-0.8.1-potrace.patch, NONE,
	1.1 dvisvgm.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090805100440.69F4011C034A@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2572/F-11

Modified Files:
	sources 
Added Files:
	dvisvgm-0.8.1-potrace.patch dvisvgm.spec 
Log Message:
package import to branch directories


dvisvgm-0.8.1-potrace.patch:
 Makefile.am     |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvisvgm-0.8.1-potrace.patch ---
diff -r 1c65b524363d Makefile.am
--- a/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -5,5 +5,5 @@
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = LICENSE
-SUBDIRS = potracelib src doc 
+SUBDIRS = src doc 
 
diff -r 1c65b524363d configure.ac
--- a/configure.ac	Sun Aug 02 09:11:21 2009 +0200
+++ b/configure.ac	Tue Aug 04 17:37:00 2009 +0200
@@ -146,5 +146,5 @@
 
 AC_SUBST(DATE)
 AC_SUBST(EXTRA_LIBS)
-AC_CONFIG_FILES([Makefile potracelib/Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/dvisvgm.txt doc/Makefile])
 AC_OUTPUT
diff -r 1c65b524363d src/Makefile.am
--- a/src/Makefile.am	Sun Aug 02 09:11:21 2009 +0200
+++ b/src/Makefile.am	Tue Aug 04 17:37:00 2009 +0200
@@ -9,7 +9,7 @@
 dvisvgm_SOURCES      = cmdline.h gzstream.h cmdline.c StreamCounter.h \
 							  dvisvgm.cpp gzstream.cpp
 							  
-dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ ../potracelib/libpotrace.a
+dvisvgm_LDADD        = $(noinst_LIBRARIES) @EXTRA_LIBS@ -lpotrace
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
 
 libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CharmapTranslator.h Color.h \
@@ -28,7 +28,7 @@
 
 EXTRA_DIST = options.ggo getopt.h getopt.c getopt1.c psdefs.psc iapi.h ierrors.h
 
-AM_CXXFLAGS = -I../potracelib -I../../potracelib -Wall
+AM_CXXFLAGS = -Wall
 
 # the commandline parser is generated by gengetopt (gets version number from config.h)
 cmdline.c: options.ggo


--- NEW FILE dvisvgm.spec ---
Name:           dvisvgm
Version:        0.8.1
Release:        4%{?dist}
Summary:        A DVI to SVG converter

Group:          Applications/Publishing
License:        GPLv2+
URL:            http://dvisvgm.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Patch to use potrace library provided by separate package
Patch0:         dvisvgm-0.8.1-potrace.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript

%description
dvisvgm is a command line utility that converts DVI files, as created by 
TeX/LaTeX, to the XML-based scalable vector graphics format SVG. Besides 
the basic DVI command set, dvisvgm also supports various special sets, like 
color, PostScript and TPIC.

Fonts that are only available as Metafont source are automatically vectorized 
so that the generated SVG is freely scalable without loss of quality.


%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
# Remove bundled potracelib
rm -rf potracelib


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README
%{_bindir}/dvisvgm
%{_mandir}/man1/dvisvgm.1.*


%changelog
* Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
- removed bundled potrace library in prep section

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-3
- don't use bundled potrace library

* Mon Aug 02 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-2
- rebased to upstream with added tarball
- added LICENSE to doc

* Sun Aug 01 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:13:18 -0000	1.1
+++ sources	5 Aug 2009 10:04:40 -0000	1.2
@@ -0,0 +1 @@
+a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz



From hadess at fedoraproject.org  Wed Aug  5 10:08:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  5 Aug 2009 10:08:54 +0000 (UTC)
Subject: rpms/bluez/devel bluetooth.init, 1.4, 1.5 bluez.spec, 1.85,
	1.86 bluetooth.conf, 1.3, NONE
Message-ID: <20090805100854.3C09D11C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3748

Modified Files:
	bluetooth.init bluez.spec 
Removed Files:
	bluetooth.conf 
Log Message:
* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 4.47-2
- Remove hid2hci calls, they're in udev now
- Work-around udev bug, bluetoothd wasn't getting enabled
  on coldplug



Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluetooth.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bluetooth.init	12 Jun 2009 17:40:17 -0000	1.4
+++ bluetooth.init	5 Aug 2009 10:08:53 -0000	1.5
@@ -4,8 +4,8 @@
 # description: Turn HID adapters into Bluetooth ones
 #
 ### BEGIN INIT INFO
-# Short-Description: Turn HID adapters into Bluetooth ones
-# Description: Turn HID adapters into Bluetooth ones
+# Short-Description: Trigger bluetoothd start-up
+# Description: Trigger bluetoothd start-up
 ### END INIT INFO
 
 # Source function library.
@@ -15,21 +15,18 @@
 
 start()
 {
-	echo -n $"Starting hid2hci:"
-	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
-	RETVAL=$?
-	touch /var/lock/subsys/bluetooth
+	echo -n $"Enabling Bluetooth devices:"
+	udevadm trigger --subsystem-match=bluetooth
 	echo ""
-	return $RETVAL
+	return 0
 }
 
 stop()
 {
+	# FIXME If somebody figures out how to disable the K* script
 	echo -n "Stopping Bluetooth services:"
-	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
-	RETVAL=$?
 	echo ""
-	return $RETVAL
+	return 0
 }
 
 case "$1" in
@@ -39,11 +36,8 @@ case "$1" in
   stop)
 	stop
 	;;
-  status)
-	RETVAL=0
-	;;
   *)
-	echo $"Usage: $0 {start|stop|status}"
+	echo $"Usage: $0 {start|stop}"
 	exit 3
 	;;
 esac


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- bluez.spec	2 Aug 2009 00:44:12 -0000	1.85
+++ bluez.spec	5 Aug 2009 10:08:53 -0000	1.86
@@ -1,12 +1,11 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.47
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
-Source2: bluetooth.conf
 Source3: dund.init
 Source4: dund.conf
 Source5: pand.init
@@ -134,7 +133,7 @@ This includes hidd, dund and pand.
 %build
 libtoolize -f -c
 autoreconf
-%configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
+%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
 make
 
 %install
@@ -223,7 +222,6 @@ fi
 %{_mandir}/man8/*
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
-%config(noreplace) %{_sysconfdir}/sysconfig/bluetooth
 %config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %{_libdir}/bluetooth/
@@ -270,6 +268,11 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 4.47-2
+- Remove hid2hci calls, they're in udev now
+- Work-around udev bug, bluetoothd wasn't getting enabled
+  on coldplug
+
 * Sun Aug 02 2009 Bastien Nocera <bnocera at redhat.com> 4.47-1
 - Update to 4.47
 


--- bluetooth.conf DELETED ---



From ovasik at fedoraproject.org  Wed Aug  5 10:12:20 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  5 Aug 2009 10:12:20 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.61,1.62
Message-ID: <20090805101220.9886011C008C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4846

Modified Files:
	filesystem.spec 
Log Message:
Prov/obs pm-utils-filesystem, do own dirs for pm-utils hooks(#515362), Do own man sections for /usr/share/man/<locale> dirs (#220265), Do own /usr/share/sounds(#515485)


Index: filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- filesystem.spec	4 Aug 2009 14:58:21 -0000	1.61
+++ filesystem.spec	5 Aug 2009 10:12:20 -0000	1.62
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.27
+Version: 2.4.28
 Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
@@ -14,6 +14,8 @@ BuildRequires: iso-codes
 # Can be removed after f14 or so
 Provides: xorg-x11-filesystem = 7.3-6
 Obsoletes: xorg-x11-filesystem < 7.3-6
+Provides: pm-utils-filesytem = 1.2.5-6
+Obsoletes: pm-utils-filesytem < 1.2.5-6
 
 %description
 The filesystem package is one of the basic packages that is installed
@@ -34,9 +36,9 @@ cd %{buildroot}
 
 mkdir -p mnt/{floppy,cdrom} \
         bin boot dev \
-        etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki} \
+        etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \
         home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
-        usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,themes,xsessions,X11},src,src/kernels,src/debug} \
+        usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} \
         var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
 ln -snf ../var/tmp usr/tmp
@@ -81,7 +83,7 @@ cat $RPM_BUILD_DIR/filelist | grep "loca
 done
 
 cat $RPM_BUILD_DIR/filelist | grep "/share/man" | while read a b c d; do
-    mkdir -p -m 755 %{buildroot}/$d
+    mkdir -p -m 755 %{buildroot}/$d/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}
 done
 
 for i in `echo man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}`; do
@@ -138,6 +140,7 @@ rm -rf %{buildroot}
 /usr/share/misc
 /usr/share/omf
 /usr/share/pixmaps
+/usr/share/sounds
 /usr/share/themes
 /usr/share/xsessions
 /usr/share/X11
@@ -164,6 +167,12 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Wed Aug 05 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.28-1
+- Provide/obsolete pm-utils-filesystem, own dirs for pm-utils
+  hooks(#515362)
+- Do own man sections for /usr/share/man/<locale> dirs (#220265)
+- Do own /usr/share/sounds (#515485)
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.4.27-1
 - Prov/Obs: xorg-x11-filesystem
 



From huzaifas at fedoraproject.org  Wed Aug  5 10:12:26 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  5 Aug 2009 10:12:26 +0000 (UTC)
Subject: rpms/dia/F-11 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 dia.spec, 
	1.40, 1.41 sources, 1.6, 1.7 dia-0.92.2-dtd.patch, 1.1,
	NONE dia-0.94-fallbacktoxpmicons.patch, 1.2,
	NONE dia-0.95-pre6-help.patch, 1.2, NONE dia-0.96-1-clocks.patch,
	1.1, NONE dia-0.96-python-detect.patch, 1.1,
	NONE dia-0.96.1-64bit.patch, 1.1, NONE dia-0.96.1-desktop.patch,
	1.1, NONE dia-0.96.1-plugins.patch, 1.1,
	NONE dia-0.96.1-pythonpath.patch, 1.1,
	NONE dia-0.96.1-svg-export.patch, 1.1, NONE
Message-ID: <20090805101226.E099011C008C@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4742/F-11

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	import.log 
Removed Files:
	dia-0.92.2-dtd.patch dia-0.94-fallbacktoxpmicons.patch 
	dia-0.95-pre6-help.patch dia-0.96-1-clocks.patch 
	dia-0.96-python-detect.patch dia-0.96.1-64bit.patch 
	dia-0.96.1-desktop.patch dia-0.96.1-plugins.patch 
	dia-0.96.1-pythonpath.patch dia-0.96.1-svg-export.patch 
Log Message:
version update



--- NEW FILE import.log ---
dia-0_97-1_fc10:F-11:dia-0.97-1.fc10.src.rpm:1249452748


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jun 2007 08:22:46 -0000	1.6
+++ .cvsignore	5 Aug 2009 10:12:25 -0000	1.7
@@ -1 +1 @@
-dia-0.96.1.tar.bz2
+dia-0.97.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/dia.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- dia.spec	31 Mar 2009 05:18:11 -0000	1.40
+++ dia.spec	5 Aug 2009 10:12:26 -0000	1.41
@@ -1,24 +1,14 @@
 Name:           dia
-Version:        0.96.1
-Release:        17%{?dist}
+Version:        0.97
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.96/%{name}-%{version}.tar.bz2
-Patch1:         dia-0.92.2-dtd.patch
-Patch2:         dia-0.95-pre6-help.patch
-Patch3:         dia-0.94-fallbacktoxpmicons.patch
-Patch4:         dia-0.96-python-detect.patch
-Patch5:         dia-0.96.1-64bit.patch
-Patch6:         dia-0.96.1-desktop.patch
-Patch7:         dia-0.96.1-svg-export.patch
-Patch8:		dia-0.96.1-plugins.patch
-Patch9:		dia-0.96.1-pythonpath.patch
-Patch10:        dia-0.96-1-clocks.patch
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -33,16 +23,6 @@ and can export to PostScript(TM).
 
 %prep
 %setup -q
-%patch1 -p1 -b .dtd
-%patch2 -p1 -b .help
-%patch3 -p1 -b .fallbacktoxpmicons
-%patch4 -p1 -b .py-detect
-%patch5 -p1 -b .64bit
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .orig
-%patch9 -p1 -b .pythonpath
-%patch10 -p1 -b .clock
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -60,10 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %name
 
-# stop rpmlint from complaining
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/python/doxrev.py
-
 # Since we're not using the cairo stuff, but a stub plugin still
 # gets built, Dia complains it doesn't have an init function.  So
 # kill the plugin
@@ -74,13 +50,9 @@ desktop-file-install --vendor fedora  --
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --remove-category Application                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -113,10 +85,15 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime-info/*
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/omf/%{name}/*.omf
 
 
 %changelog
+* Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
+- update to 0.97
+- drop old patches
+
 * Tue Mar 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.96.1-17
 - Resolves: rhbz#486726
 - Version bump


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jun 2007 08:22:46 -0000	1.6
+++ sources	5 Aug 2009 10:12:26 -0000	1.7
@@ -1 +1 @@
-7b81b22baa2df55efe4845865dddc7b6  dia-0.96.1.tar.bz2
+3d11f9aaa5a4923f0a5533962c87bdfb  dia-0.97.tar.bz2


--- dia-0.92.2-dtd.patch DELETED ---


--- dia-0.94-fallbacktoxpmicons.patch DELETED ---


--- dia-0.95-pre6-help.patch DELETED ---


--- dia-0.96-1-clocks.patch DELETED ---


--- dia-0.96-python-detect.patch DELETED ---


--- dia-0.96.1-64bit.patch DELETED ---


--- dia-0.96.1-desktop.patch DELETED ---


--- dia-0.96.1-plugins.patch DELETED ---


--- dia-0.96.1-pythonpath.patch DELETED ---


--- dia-0.96.1-svg-export.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Aug  5 10:19:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  5 Aug 2009 10:19:57 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.391, 1.392 jd.spec, 1.451, 1.452 sources,
	1.392, 1.393
Message-ID: <20090805101957.15E0F11C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7401/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- .cvsignore	4 Aug 2009 05:47:41 -0000	1.391
+++ .cvsignore	5 Aug 2009 10:19:55 -0000	1.392
@@ -1 +1 @@
-jd-2.4.2-svn3014_trunk.tgz
+jd-2.4.2-svn3017_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -p -r1.451 -r1.452
--- jd.spec	4 Aug 2009 05:47:41 -0000	1.451
+++ jd.spec	5 Aug 2009 10:19:55 -0000	1.452
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3014_trunk
+%define         strtag        svn3017_trunk
 %define         repoid        41293
 # 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
-* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3014
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3017
 
 * 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/F-10/sources,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- sources	4 Aug 2009 05:47:41 -0000	1.392
+++ sources	5 Aug 2009 10:19:56 -0000	1.393
@@ -1 +1 @@
-97da105284b8d30f3f9e5374eb42fb41  jd-2.4.2-svn3014_trunk.tgz
+a13668a4a8ecd321f93e36808913fb73  jd-2.4.2-svn3017_trunk.tgz



From mtasaka at fedoraproject.org  Wed Aug  5 10:19:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  5 Aug 2009 10:19:57 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.385, 1.386 jd.spec, 1.447, 1.448 sources,
	1.386, 1.387
Message-ID: <20090805101957.3CFD511C008C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7401/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- .cvsignore	4 Aug 2009 05:47:41 -0000	1.385
+++ .cvsignore	5 Aug 2009 10:19:56 -0000	1.386
@@ -1 +1 @@
-jd-2.4.2-svn3014_trunk.tgz
+jd-2.4.2-svn3017_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -p -r1.447 -r1.448
--- jd.spec	4 Aug 2009 05:47:41 -0000	1.447
+++ jd.spec	5 Aug 2009 10:19:56 -0000	1.448
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3014_trunk
+%define         strtag        svn3017_trunk
 %define         repoid        41293
 # 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
-* Tue Aug  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3014
+* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3017
 
 * 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/F-11/sources,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- sources	4 Aug 2009 05:47:42 -0000	1.386
+++ sources	5 Aug 2009 10:19:56 -0000	1.387
@@ -1 +1 @@
-97da105284b8d30f3f9e5374eb42fb41  jd-2.4.2-svn3014_trunk.tgz
+a13668a4a8ecd321f93e36808913fb73  jd-2.4.2-svn3017_trunk.tgz



From huzaifas at fedoraproject.org  Wed Aug  5 10:20:32 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Wed,  5 Aug 2009 10:20:32 +0000 (UTC)
Subject: rpms/dia/F-11 dia.spec,1.41,1.42
Message-ID: <20090805102032.2C83E11C0425@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7670

Modified Files:
	dia.spec 
Log Message:
update


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/dia.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- dia.spec	5 Aug 2009 10:12:26 -0000	1.41
+++ dia.spec	5 Aug 2009 10:20:31 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.97
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -31,7 +31,7 @@ mv usage-layers.xml.UTF-8 doc/en/usage-l
 
 
 %build
-%configure --enable-gnome --enable-db2html --with-python
+%configure --enable-gnome --enable-db2html 
 make %{?_smp_mflags}
  
 
@@ -90,6 +90,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-2
+- Disable --with-python
+
 * Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
 - update to 0.97
 - drop old patches



From till at fedoraproject.org  Wed Aug  5 10:44:09 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed,  5 Aug 2009 10:44:09 +0000 (UTC)
Subject: rpms/pm-utils/devel pm-utils.spec,1.121,1.122
Message-ID: <20090805104409.30A7411C008C@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12652

Modified Files:
	pm-utils.spec 
Log Message:
* Wed Aug 05 2009 Till Maas <opensource at till.name> - 1.2.5-6
- filesystem subpackage contents are now provided by filesystem (Red Hat
  Bugzilla 515362) filesystem-2.4.28-1.fc12



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- pm-utils.spec	26 Jul 2009 18:59:02 -0000	1.121
+++ pm-utils.spec	5 Aug 2009 10:44:06 -0000	1.122
@@ -2,7 +2,7 @@ Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -17,7 +17,6 @@ Requires: hal
 %ifarch %{ix86} x86_64
 Requires: vbetool
 %endif
-Requires: %{name}-filesystem = %{version}-%{release}
 BuildRequires: xmlto
 
 Source0: http://pm-utils.freedesktop.org/releases/pm-utils-%{version}.tar.gz
@@ -44,13 +43,6 @@ Requires:       pkgconfig
 This package contains the pkg-config files for development
 when building programs that use %{name}.
 
-%package filesystem
-Group: System Environment/Base
-Summary: Directories for hooks
-
-%description filesystem
-This package contains the necessary directories for hooks to put their files
-in.
 
 %prep
 %setup -q 
@@ -82,6 +74,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/pm-utils-hd-apm-restore.conf
+# The following dirs are owned by filesystem-2.4.28-1.fc12 and newer
+#%dir %{_sysconfdir}/pm/
+#%dir %{_sysconfdir}/pm/config.d
+#%dir %{_sysconfdir}/pm/power.d
+#%dir %{_sysconfdir}/pm/sleep.d
+#%dir %{_libdir}/pm-utils/
+#%dir %{_libdir}/pm-utils/module.d
+#%dir %{_libdir}/pm-utils/power.d
+#%dir %{_libdir}/pm-utils/sleep.d
 %{_libdir}/pm-utils/bin/
 %{_libdir}/pm-utils/defaults
 %{_libdir}/pm-utils/functions
@@ -107,24 +108,16 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 
-%files filesystem
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/pm/
-%dir %{_sysconfdir}/pm/config.d
-%dir %{_sysconfdir}/pm/power.d
-%dir %{_sysconfdir}/pm/sleep.d
-%dir %{_libdir}/pm-utils/
-%dir %{_libdir}/pm-utils/module.d
-%dir %{_libdir}/pm-utils/power.d
-%dir %{_libdir}/pm-utils/sleep.d
-
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/pm-utils.pc
 
 
 %changelog
+* Wed Aug 05 2009 Till Maas <opensource at till.name> - 1.2.5-6
+- filesystem subpackage contents are now provided by filesystem (Red Hat
+  Bugzilla 515362) filesystem-2.4.28-1.fc12
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From beekhof at fedoraproject.org  Wed Aug  5 11:00:09 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed,  5 Aug 2009 11:00:09 +0000 (UTC)
Subject: rpms/cluster-glue/devel cluster-glue.spec,1.2,1.3
Message-ID: <20090805110010.0234D11C0439@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16824

Modified Files:
	cluster-glue.spec 
Log Message:
Revert previous check-in, continue to use the upstream value for OCF_ROOT


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cluster-glue.spec	5 Aug 2009 07:45:29 -0000	1.2
+++ cluster-glue.spec	5 Aug 2009 11:00:07 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}8%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}7%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Base
@@ -43,8 +43,7 @@ BuildRequires: libuuid-devel
 		--enable-fatal-warnings=no   \
 		--localstatedir=%{_var}      \
 		--with-daemon-group=%{gname} \
-		--with-daemon-user=%{uname}  \
-		--with-ocf-root=%{_libdir}/ocf 
+		--with-daemon-user=%{uname}
 
 %build
 make %{_smp_mflags}
@@ -166,9 +165,6 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
-* Wed Aug  5 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.8.75cab275433e.hg
-- Use %{_libdir}/ocf for resource agents
-
 * Tue Jul  28 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.7.75cab275433e.hg
 - Add a leading zero to the revision when alphatag is used
 



From mcepl at fedoraproject.org  Wed Aug  5 11:11:40 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  5 Aug 2009 11:11:40 +0000 (UTC)
Subject: rpms/syncevolution/devel syncevolution-build.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syncevolution.spec,
	1.11, 1.12 syncevolution-0.8.1a-build.patch, 1.1, NONE
Message-ID: <20090805111140.4031E11C008C@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19348

Modified Files:
	.cvsignore sources syncevolution.spec 
Added Files:
	syncevolution-build.patch 
Removed Files:
	syncevolution-0.8.1a-build.patch 
Log Message:
Working on upgrade, but FTBFS momentarily

syncevolution-build.patch:
 syncevo-dbus-server.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syncevolution-build.patch ---
diff -up syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp.Fedora-build syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp
--- syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp.Fedora-build	2009-07-21 16:38:28.000000000 +0200
+++ syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp	2009-08-05 12:36:29.410272268 +0200
@@ -475,7 +475,7 @@ need_password (const char *username,
                gpointer data)
 {
 	char *password = NULL;
-	char *server = NULL;
+	const char *server = NULL;
 	GnomeKeyringResult res;
 
 	server = strstr (server_url, "://");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Mar 2009 15:05:39 -0000	1.4
+++ .cvsignore	5 Aug 2009 11:11:38 -0000	1.5
@@ -1 +1,2 @@
 syncevolution-0.8.1a.tar.gz
+syncevolution-0.8.1+0.9+beta3+20090723.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Mar 2009 15:05:39 -0000	1.4
+++ sources	5 Aug 2009 11:11:39 -0000	1.5
@@ -1 +1 @@
-a4bb354520530da4846f3c216d50d42f  syncevolution-0.8.1a.tar.gz
+5c84744312f10fa93195c711434b6a0c  syncevolution-0.8.1+0.9+beta3+20090723.tar.gz


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- syncevolution.spec	27 Jul 2009 05:17:58 -0000	1.11
+++ syncevolution.spec	5 Aug 2009 11:11:39 -0000	1.12
@@ -1,56 +1,94 @@
 Summary: SyncML client for evolution
 Name: syncevolution
-Version: 0.8.1a
-Release: 2%{?dist}
-License: GPLv2+
+Version: 0.8.1+0.9+beta3+20090723
+Release: 1.0.1%{?dist}
+License: LGPLv2+
 Group: Applications/Productivity
-URL: http://www.estamos.de/projects/SyncML/
-Source0: http://www.estamos.de/download/syncevolution/sources/%{name}-%{version}.tar.gz
-# Patch filed upstream at
-# https://sourceforge.net/tracker/index.php\
-#     ?func=detail&aid=2707496&group_id=146288&atid=764733
-Patch0: syncevolution-0.8.1a-build.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: evolution
-Requires: curl
-BuildRequires: evolution-data-server-devel
-BuildRequires: curl-devel
+URL: http://syncevolution.org/
+Source: http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
+Patch0: syncevolution-build.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: boost-devel
 BuildRequires: cppunit-devel
-BuildRequires: gcc-c++
+BuildRequires: evolution-data-server-devel
+BuildRequires: expat-devel
+BuildRequires: glib2-devel
+BuildRequires: libsoup-devel
+BuildRequires: libical-devel
+BuildRequires: pcre-devel
+BuildRequires: intltool automake libtool autoconf
 
 %description
 syncevolution is designed to provide a SyncML client that can
 connect to and sync with various SyncML-based servers
 
+%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
-%patch0 -p1 -b .build
-%configure --enable-unit-tests
+%patch0 -p1 -b .Fedora-build
 
 %build
+aclocal --force
+libtoolize --copy --force --automake
+intltoolize --automake --copy --force
+autoconf --force
+automake --copy --add-missing
+%configure --enable-unit-tests --enable-libsoup  \
+    --enable-dbus-service --enable-shared --with-expat=system \
+    --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}
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
-%check
-# FIXME: currently doesn't work at all, all tests fail; need to be
-# discussed with upstream.
-#make check
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/share
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/testcases
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+#Remove libtool archives and static libs
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+#make test
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README COPYING HACKING
+%doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
+%{_sysconfdir}/default/syncevolution
 %{_bindir}/*
+%{_libdir}/*so.0*
+%{_libdir}/syncevolution/*so.0*
+%{_libexecdir}/syncevo-dbus-server
+%{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/syncevo-dbus
+%{_includedir}/synthesis
+%{_libdir}/pkgconfig/syncevo-dbus.pc
+%{_libdir}/pkgconfig/synthesis.pc
+%{_libdir}/*so
+%{_libdir}/syncevolution/*so
 
 %changelog
+* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.1
+- fixing rpath, currently FTBFS!!!
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- syncevolution-0.8.1a-build.patch DELETED ---



From hadess at fedoraproject.org  Wed Aug  5 11:44:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  5 Aug 2009 11:44:40 +0000 (UTC)
Subject: rpms/gstreamer/F-11 .cvsignore, 1.40, 1.41 gstreamer.spec, 1.102,
	1.103 sources, 1.41, 1.42
Message-ID: <20090805114441.13D1811C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26640

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
- Update to 0.10.24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	28 Jul 2009 11:07:16 -0000	1.40
+++ .cvsignore	5 Aug 2009 11:44:38 -0000	1.41
@@ -1 +1 @@
-gstreamer-0.10.23.4.tar.bz2
+gstreamer-0.10.24.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-11/gstreamer.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gstreamer.spec	28 Jul 2009 11:07:16 -0000	1.102
+++ gstreamer.spec	5 Aug 2009 11:44:39 -0000	1.103
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.23.4
+Version: 	0.10.24
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
+- Update to 0.10.24
+
 * Tue Jul 28 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23.4-1
 - Update to 0.10.23.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-11/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	28 Jul 2009 11:07:17 -0000	1.41
+++ sources	5 Aug 2009 11:44:39 -0000	1.42
@@ -1 +1 @@
-539aa9e2c4f9bb906bdb222c8a5c7d1a  gstreamer-0.10.23.4.tar.bz2
+178d3326c96c360c9a15751bd5d73a6c  gstreamer-0.10.24.tar.bz2



From lkundrak at fedoraproject.org  Wed Aug  5 11:44:50 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  5 Aug 2009 11:44:50 +0000 (UTC)
Subject: rpms/system-config-keyboard/devel
	system-config-keyboard-dracut.patch, 
	NONE, 1.1 system-config-keyboard.spec, 1.51, 1.52
Message-ID: <20090805114450.3649911C008C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26704

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-dracut.patch 
Log Message:
* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-3
- Include dracutSetupString() patch by Hans


system-config-keyboard-dracut.patch:
 keyboard.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE system-config-keyboard-dracut.patch ---
Index: lib/keyboard.py
===================================================================
--- lib/keyboard.py	(revision 596)
+++ lib/keyboard.py	(working copy)
@@ -186,3 +186,15 @@
 
         if os.access(argv[0], os.X_OK) == 1:
             call (argv)
+
+    def dracutSetupString(self):
+        args = ""
+        keyboardtype = self._var("KEYBOARDTYPE")
+        keytable = self._var("KEYTABLE")
+
+        if keyboardtype:
+             args += " KEYBOARDTYPE=%s" % keyboardtype
+        if keytable:
+             args += " KEYTABLE=%s" % keytable
+
+        return args


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- system-config-keyboard.spec	28 Jul 2009 11:17:31 -0000	1.51
+++ system-config-keyboard.spec	5 Aug 2009 11:44:49 -0000	1.52
@@ -3,13 +3,14 @@
 
 Name:           system-config-keyboard
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
+Patch0:         system-config-keyboard-dracut.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -33,6 +34,7 @@ the user to change the default keyboard 
 
 %prep
 %setup -q
+%patch0 -p0 -b .dracut
 
 
 %build
@@ -82,6 +84,9 @@ fi
 
 
 %changelog
+* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-3
+- Include dracutSetupString() patch by Hans
+
 * Mon Jul 27 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-2
 - Disable debuginfo subpackage
 



From kraxel at fedoraproject.org  Wed Aug  5 11:49:57 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Wed,  5 Aug 2009 11:49:57 +0000 (UTC)
Subject: rpms/xen/devel xen-no-werror.patch,NONE,1.1 xen.spec,1.239,1.240
Message-ID: <20090805114957.3C0A011C008C@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27722

Modified Files:
	xen.spec 
Added Files:
	xen-no-werror.patch 
Log Message:
fix build

xen-no-werror.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-no-werror.patch ---
diff -up xen-3.4.0/tools/libxc/Makefile.werror xen-3.4.0/tools/libxc/Makefile
--- xen-3.4.0/tools/libxc/Makefile.werror	2009-08-05 13:40:32.000000000 +0200
+++ xen-3.4.0/tools/libxc/Makefile	2009-08-05 13:40:52.000000000 +0200
@@ -52,7 +52,7 @@ GUEST_SRCS-$(CONFIG_IA64)    += xc_dom_i
 
 -include $(XEN_TARGET_ARCH)/Makefile
 
-CFLAGS   += -Werror -Wmissing-prototypes
+CFLAGS   += -Wmissing-prototypes
 CFLAGS   += $(INCLUDES) -I. -I../xenstore -I../include
 
 # Needed for posix_fadvise64() in xc_linux.c


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- xen.spec	27 Jul 2009 07:47:01 -0000	1.239
+++ xen.spec	5 Aug 2009 11:49:56 -0000	1.240
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -36,6 +36,8 @@ Patch3: xen-xenstore-cli.patch
 Patch4: xen-dumpdir.patch
 Patch5: xen-net-disable-iptables-on-bridge.patch
 
+Patch10: xen-no-werror.patch
+
 Patch100: xen-configure-xend.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -132,6 +134,8 @@ which manage Xen virtual machines.
 %patch4 -p1
 %patch5 -p1
 
+%patch10 -p1
+
 %patch100 -p1
 
 # stubdom sources
@@ -190,6 +194,9 @@ done
 # README's not intended for end users
 rm -f %{buildroot}/%{_sysconfdir}/xen/README*
 
+# standard gnu info files
+rm -rf %{buildroot}/usr/info
+
 ############ fixup files in /etc ############
 
 # udev
@@ -219,14 +226,6 @@ install -m 644 %{SOURCE30} %{buildroot}%
 install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
 install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
 
-############ fixup info files ############
-
-mkdir -p %{buildroot}/usr/share/info
-for info in %{buildroot}/usr/info/*info*; do
-	mv "$info" "%{buildroot}/usr/share/info/xen-$(basename $info)"
-done
-rmdir %{buildroot}/usr/info
-
 ############ create dirs in /var ############
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/domain
@@ -280,16 +279,6 @@ fi
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%post doc
-/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-configure.info
-/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-standards.info
-
-%preun doc
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-configure.info
-  /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-standards.info
-fi
-
 %clean
 rm -rf %{buildroot}
 
@@ -450,7 +439,6 @@ rm -rf %{buildroot}
 %doc docs/misc/
 %doc dist/install/usr/share/doc/xen/html
 %doc dist/install/usr/share/doc/xen/pdf/*.pdf
-/usr/share/info/*info*
 
 %files devel
 %defattr(-,root,root)
@@ -461,6 +449,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Wed Aug 5 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.0-4
+- Kill info files.  No xen docs, just standard gnu stuff.
+- kill -Werror in tools/libxc to fix build.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pvrabec at fedoraproject.org  Wed Aug  5 11:50:03 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed,  5 Aug 2009 11:50:03 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-4.1.4.1-sysacc.patch, 1.1,
	1.2 shadow-utils.spec, 1.136, 1.137
Message-ID: <20090805115003.9863411C0425@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27752

Modified Files:
	shadow-4.1.4.1-sysacc.patch shadow-utils.spec 
Log Message:
increase threshold for uid/gid reservations to 200 (#515667)


shadow-4.1.4.1-sysacc.patch:
 find_new_gid.c |   93 +++++++++++++++++++++++++++++++----------------------
 find_new_uid.c |   99 +++++++++++++++++++++++++++++++++------------------------
 2 files changed, 113 insertions(+), 79 deletions(-)

Index: shadow-4.1.4.1-sysacc.patch
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-4.1.4.1-sysacc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shadow-4.1.4.1-sysacc.patch	16 Jul 2009 13:41:55 -0000	1.1
+++ shadow-4.1.4.1-sysacc.patch	5 Aug 2009 11:50:02 -0000	1.2
@@ -15,7 +15,7 @@ diff -up shadow-4.1.4.1/libmisc/find_new
  		gid_max = (gid_t) getdef_ulong ("GID_MAX", 60000UL);
  	} else {
 -		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 1UL);
-+		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 101UL);
++		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 201UL);
  		gid_max = (gid_t) getdef_ulong ("GID_MIN", 500UL) - 1;
  		gid_max = (gid_t) getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
  	}
@@ -161,7 +161,7 @@ diff -up shadow-4.1.4.1/libmisc/find_new
  		uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
  	} else {
 -		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 1UL);
-+		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL);
++		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 201UL);
  		uid_max = (uid_t) getdef_ulong ("UID_MIN", 500UL) - 1;
  		uid_max = (uid_t) getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
  	}


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- shadow-utils.spec	27 Jul 2009 04:15:11 -0000	1.136
+++ shadow-utils.spec	5 Aug 2009 11:50:03 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.4.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Wed Aug 05 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.4.1-6
+- increase threshold for uid/gid reservations to 200 (#515667)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:4.1.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Wed Aug  5 12:06:09 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed,  5 Aug 2009 12:06:09 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-Schema-Loader/devel
	perl-DBIx-Class-Schema-Loader.spec, 1.7, 1.8
Message-ID: <20090805120609.DA56211C008C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-DBIx-Class-Schema-Loader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31496

Modified Files:
	perl-DBIx-Class-Schema-Loader.spec 
Log Message:
* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04006-5
- Remove R: DBIX::Class.



Index: perl-DBIx-Class-Schema-Loader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-Schema-Loader/devel/perl-DBIx-Class-Schema-Loader.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DBIx-Class-Schema-Loader.spec	5 Aug 2009 05:17:48 -0000	1.7
+++ perl-DBIx-Class-Schema-Loader.spec	5 Aug 2009 12:06:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-Class-Schema-Loader
 Version:        0.04006
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Dynamic definition of a DBIx::Class::Schema
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -43,9 +43,6 @@ BuildRequires:  perl(Test::Pod::Coverage
 Requires:       perl(Class::Accessor::Fast) >= 0.30
 Requires:       perl(Class::Data::Accessor) >= 0.03
 
-# Just to be safe
-Requires:       perl(DBIX::Class)
-
 %description
 DBIx::Class::Schema::Loader automates the definition of a
 DBIx::Class::Schema by scanning database table definitions
@@ -100,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04006-5
+- Remove R: DBIX::Class.
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.04006-4
 - Fix mass rebuild breakdown:
   Replace bundled Module-Install with Module-Install-0.91.



From dwalsh at fedoraproject.org  Wed Aug  5 12:11:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 12:11:44 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-11
	setroubleshoot-plugins-2.0.18-global_ssp.patch, 1.3,
	1.4 setroubleshoot-plugins.spec, 1.26, 1.27
Message-ID: <20090805121144.8CCAA11C008C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32644

Modified Files:
	setroubleshoot-plugins-2.0.18-global_ssp.patch 
	setroubleshoot-plugins.spec 
Log Message:
* Wed Aug 4 2009  <dwalsh at redhat.com> - 2.0.18-5
- Try agian to remove stunnel_is_daemon plugin


setroubleshoot-plugins-2.0.18-global_ssp.patch:
 Makefile.am   |    1 -
 Makefile.in   |    1 -
 global_ssp.py |    5 +++--
 3 files changed, 3 insertions(+), 4 deletions(-)

Index: setroubleshoot-plugins-2.0.18-global_ssp.patch
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-11/setroubleshoot-plugins-2.0.18-global_ssp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- setroubleshoot-plugins-2.0.18-global_ssp.patch	4 Aug 2009 10:27:51 -0000	1.3
+++ setroubleshoot-plugins-2.0.18-global_ssp.patch	5 Aug 2009 12:11:43 -0000	1.4
@@ -33,12 +33,12 @@ diff -up setroubleshoot-plugins-2.0.18/s
  	use_samba_home_dirs.py		\
 diff -up setroubleshoot-plugins-2.0.18/src/Makefile.in.global_ssp setroubleshoot-plugins-2.0.18/src/Makefile.in
 --- setroubleshoot-plugins-2.0.18/src/Makefile.in.global_ssp	2009-06-05 11:00:18.000000000 -0400
-+++ setroubleshoot-plugins-2.0.18/src/Makefile.in	2009-08-04 06:24:14.000000000 -0400
-@@ -212,7 +212,6 @@ PLUGIN_FILES = \
- 	filesystem_associate.py		\
- 	ftpd_is_daemon.py		\
- 	ftp_home_dir.py			\
--	global_ssp.py			\
- 	httpd_bad_labels.py		\
- 	httpd_builtin_scripting.py	\
- 	httpd_can_network_connect_db.py	\
++++ setroubleshoot-plugins-2.0.18/src/Makefile.in	2009-08-05 08:10:41.000000000 -0400
+@@ -251,7 +251,6 @@ PLUGIN_FILES = \
+ 	secure_mode_policyload.py	\
+ 	spamd_enable_home_dirs.py	\
+ 	squid_connect_any.py		\
+-	stunnel_is_daemon.py		\
+ 	swapfile.py			\
+ 	use_nfs_home_dirs.py		\
+ 	use_samba_home_dirs.py		\


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-11/setroubleshoot-plugins.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- setroubleshoot-plugins.spec	4 Aug 2009 10:27:51 -0000	1.26
+++ setroubleshoot-plugins.spec	5 Aug 2009 12:11:44 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
 Version: 2.0.18
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -54,7 +54,7 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
-* Tue Aug 4 2009  <dwalsh at redhat.com> - 2.0.18-4
+* Wed Aug 4 2009  <dwalsh at redhat.com> - 2.0.18-5
 - Try agian to remove stunnel_is_daemon plugin
 
 * Fri Jul 31 2009  <dwalsh at redhat.com> - 2.0.18-3



From ovasik at fedoraproject.org  Wed Aug  5 12:24:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  5 Aug 2009 12:24:22 +0000 (UTC)
Subject: rpms/docbook-style-xsl/F-11 docbook-xsl-fop1extensionpath.patch,
	NONE, 1.1 docbook-style-xsl.spec, 1.58, 1.59
Message-ID: <20090805122422.8C77D11C008C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3374

Modified Files:
	docbook-style-xsl.spec 
Added Files:
	docbook-xsl-fop1extensionpath.patch 
Log Message:
 Add extension URL to fop1 extension(#505364)

docbook-xsl-fop1extensionpath.patch:
 fop1.xsl |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE docbook-xsl-fop1extensionpath.patch ---
diff -urNp docbook-xsl-1.74.3-orig/fo/fop1.xsl docbook-xsl-1.74.3/fo/fop1.xsl
--- docbook-xsl-1.74.3-orig/fo/fop1.xsl	2009-01-06 21:04:27.000000000 +0100
+++ docbook-xsl-1.74.3/fo/fop1.xsl	2009-08-05 14:18:41.000000000 +0200
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version='1.0'>
 


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/docbook-style-xsl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- docbook-style-xsl.spec	11 Mar 2009 22:19:47 -0000	1.58
+++ docbook-style-xsl.spec	5 Aug 2009 12:24:21 -0000	1.59
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.74.3
-Release: 1%{?dist}
+Release: 2{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -30,6 +30,7 @@ Patch2: docbook-xsl-marginleft.patch
 Patch3: docbook-xsl-newmethods.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
 Patch5: docbook-xsl-list-item-body.patch
+Patch6: docbook-xsl-fop1extensions.patch
 
 
 %description
@@ -47,6 +48,7 @@ popd
 %patch3 -p1 -b .newmethods
 %patch4 -p1 -b .nonconstant
 %patch5 -p1 -b .listitembody
+%patch6 -p1 -b .fop1ext
 
 cp -p %{SOURCE1} Makefile
 
@@ -117,6 +119,9 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Wed Aug 05 2009 Ondrej Vasik <ovasik at redhat.com> 1.74.3-2
+- Add extension URL to fop1 extension(#505364)
+
 * Wed Mar 11 2009 Ondrej Vasik <ovasik at redhat.com> 1.74.3-1
 - New upstream release 1.74.3
 



From ovasik at fedoraproject.org  Wed Aug  5 12:25:24 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  5 Aug 2009 12:25:24 +0000 (UTC)
Subject: rpms/docbook-style-xsl/F-11 docbook-style-xsl.spec,1.59,1.60
Message-ID: <20090805122524.C57EC11C008C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3598

Modified Files:
	docbook-style-xsl.spec 
Log Message:
Disttag accident ;)


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/docbook-style-xsl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- docbook-style-xsl.spec	5 Aug 2009 12:24:21 -0000	1.59
+++ docbook-style-xsl.spec	5 Aug 2009 12:25:24 -0000	1.60
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.74.3
-Release: 2{?dist}
+Release: 2%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML



From jnovy at fedoraproject.org  Wed Aug  5 12:26:02 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  5 Aug 2009 12:26:02 +0000 (UTC)
Subject: rpms/mc/devel mc-extensions.patch, 1.14, 1.15 mc-ipv6.patch, 1.3,
	1.4 mc.spec, 1.145, 1.146
Message-ID: <20090805122602.51CA811C008C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3799

Modified Files:
	mc-ipv6.patch mc.spec 
Added Files:
	mc-extensions.patch 
Log Message:
* Wed Aug  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.2.pre1
- update extension binding to be more Fedora-like
- update to upstream IPv6 patch


mc-extensions.patch:
 configure      |    2 +-
 configure.ac   |    2 +-
 misc/mc.ext.in |   39 ++++++++++++++++++++++++++++-----------
 3 files changed, 30 insertions(+), 13 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: mc-extensions.patch
diff -N mc-extensions.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mc-extensions.patch	5 Aug 2009 12:26:01 -0000	1.15
@@ -0,0 +1,118 @@
+diff -up mc-4.7.0-pre1/configure.ac.extensions mc-4.7.0-pre1/configure.ac
+--- mc-4.7.0-pre1/configure.ac.extensions	2009-07-31 18:36:24.000000000 +0200
++++ mc-4.7.0-pre1/configure.ac	2009-08-05 12:51:08.000000000 +0200
+@@ -67,7 +67,7 @@ AC_PROG_LN_S
+ AC_CHECK_TOOL(AR, ar, ar)
+ 
+ dnl Only list browsers here that can be run in background (i.e. with `&')
+-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
++AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
+ 
+ dnl
+ dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
+diff -up mc-4.7.0-pre1/configure.extensions mc-4.7.0-pre1/configure
+--- mc-4.7.0-pre1/configure.extensions	2009-07-31 20:49:03.000000000 +0200
++++ mc-4.7.0-pre1/configure	2009-08-05 12:51:08.000000000 +0200
+@@ -15250,7 +15250,7 @@ else
+ fi
+ 
+ 
+-for ac_prog in gnome-moz-remote mozilla konqueror opera netscape
++for ac_prog in firefox gnome-moz-remote mozilla konqueror opera netscape
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+diff -up mc-4.7.0-pre1/misc/mc.ext.in.extensions mc-4.7.0-pre1/misc/mc.ext.in
+--- mc-4.7.0-pre1/misc/mc.ext.in.extensions	2009-06-23 20:55:11.000000000 +0200
++++ mc-4.7.0-pre1/misc/mc.ext.in	2009-08-05 13:01:48.000000000 +0200
+@@ -221,8 +221,8 @@ regex/\.rpm$
+ 
+ # deb
+ regex/\.u?deb$
+-	Open=%cd %p#deb
+-	View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
++	Open=%cd %p#uar
++	View=%view{ascii} file %f && nm %f
+ 
+ # dpkg
+ shell/.debd
+@@ -397,11 +397,16 @@ regex/\.([wW][aA][wW]22)$
+        Open=vplay -s 22 %f
+ 
+ regex/\.([mM][pP]3)$
+-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+-	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++	Include=audio
++#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++
++regex/\.([mM][kK][aA])$
++	Include=audio
+ 
+ regex/\.([oO][gG][gG|aA|vV|xX])$
+-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Open=ogg123 %f
++#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 	View=%view{ascii} ogginfo %s
+ 
+ regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
+@@ -414,11 +419,15 @@ regex/\.([wW][mM][aA])$
+ 	Open=mplayer -vo null %f
+ 	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
+ 
++include/audio
++	Open=mplayer %f
++	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
+ 
+ ### Play lists ###
+ 
+ regex/\.([mM]3[uU]|[pP][lL][sS])$
+-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
++	Open=mplayer -vo null -playlist %f
++#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+ 
+ 
+ ### Video ###
+@@ -432,6 +441,9 @@ regex/\.([aA][sS][fFxX])$
+ regex/\.([dD][iI][vV][xX])$
+ 	Include=video
+ 
++regex/\.([mM][kK][vV])$
++	Include=video
++
+ regex/\.([mM][oO][vV]|[qQ][tT])$
+ 	Include=video
+ 
+@@ -496,22 +508,27 @@ shell/.abw
+ 
+ # Microsoft Word Document
+ regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ type/^Microsoft\ Word
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ 
+ # RTF document
+ regex/\.([rR][tT][fF])$
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 
+ # Microsoft Excel Worksheet
+ regex/\.([xX][lL][sSwW])$
+-	Open=(gnumeric %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(gnumeric %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} xls2csv %f || strings %f
+ type/^Microsoft\ Excel
+-	Open=(gnumeric %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(gnumeric %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} xls2csv %f || strings %f
+ 
+ # Use OpenOffice.org to open any MS Office documents

mc-ipv6.patch:
 ftpfs.c   |  311 ++++++++++++++++++++++++++++++++++++++++++--------------------
 ftpfs.h   |    3 
 utilvfs.c |   16 ++-
 3 files changed, 231 insertions(+), 99 deletions(-)

Index: mc-ipv6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc-ipv6.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mc-ipv6.patch	20 Nov 2006 14:08:49 -0000	1.3
+++ mc-ipv6.patch	5 Aug 2009 12:26:01 -0000	1.4
@@ -1,43 +1,69 @@
---- mc-2006-09-12-21/vfs/ftpfs.c.ipv6	2006-03-08 16:17:55.000000000 +0100
-+++ mc-2006-09-12-21/vfs/ftpfs.c	2006-09-26 10:43:27.000000000 +0200
-@@ -639,12 +639,13 @@ ftpfs_get_proxy_host_and_port (const cha
+commit 883967347e817e1743d265d19a95a432cf875b5e
+Author: Slava Zanko <slavazanko at gmail.com>
+Date:   Wed Aug 5 09:44:39 2009 +0300
+
+    Ticket #121 (support IPv6).
+    
+    121_support_IPv6 -> origin/121_support_IPv6
+    
+    Thanks to Dan Kopecek.
+    
+    Signed-off-by: Slava Zanko <slavazanko at gmail.com>
+
+diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c
+index 9ac03bc..f2baaee 100644
+--- a/vfs/ftpfs.c
++++ b/vfs/ftpfs.c
+@@ -652,17 +652,17 @@ ftpfs_get_proxy_host_and_port (const char *proxy, char **host, int *port)
  static int
  ftpfs_open_socket (struct vfs_class *me, struct vfs_s_super *super)
  {
 -    struct   sockaddr_in server_address;
 -    struct   hostent *hp;
 -    int      my_socket;
-+    struct addrinfo hints, *res, *restmp;
-+    int      my_socket = 0;
-     char     *host;
+-    char     *host;
 -    int      port = SUP.port;
-+    char     *port;
+-    int      free_host = 0;
++    struct addrinfo hints, *res, *curr_res;
++    int      my_socket = 0;
++    char     *host = NULL;
++    char     *port = NULL;
 +    int      tmp_port;
-     int      free_host = 0;
 +    int      e;
  
      (void) me;
      
-@@ -657,62 +658,83 @@ ftpfs_open_socket (struct vfs_class *me,
- 	return -1;
+     /* Use a proxy host? */
+-    host = SUP.host;
++    host = g_strdup(SUP.host);
+ 
+     if (!host || !*host){
+ 	print_vfs_message (_("ftpfs: Invalid host name."));
+@@ -671,61 +671,86 @@ ftpfs_open_socket (struct vfs_class *me, struct vfs_s_super *super)
      }
  
-+    port = malloc (sizeof (char) * 6);
-+    if (port == NULL) {
-+      ftpfs_errno = errno;
-+      return -1;
-+    }
-+
      /* Hosts to connect to that start with a ! should use proxy */
 +    tmp_port = SUP.port;
 +
      if (SUP.proxy){
 -	ftpfs_get_proxy_host_and_port (ftpfs_proxy_host, &host, &port);
+-	free_host = 1;
++	char *orig_host = host;
++
 +	ftpfs_get_proxy_host_and_port (ftpfs_proxy_host, &host, &tmp_port);
- 	free_host = 1;
++
++	if (orig_host != host)
++	    g_free(orig_host);
++    }
++
++    port = g_strdup_printf("%hu", (unsigned short) tmp_port);
++    if (port == NULL) {
++	g_free (host);
++	ftpfs_errno = errno;
++	return -1;
      }
  
--    enable_interrupt_key(); /* clear the interrupt flag */
+     enable_interrupt_key(); /* clear the interrupt flag */
 -    
 -    /* Get host address */
 -    memset ((char *) &server_address, 0, sizeof (server_address));
@@ -54,178 +80,183 @@
 -	    return -1;
 -	}
 -	server_address.sin_family = hp->h_addrtype;
--
+ 
 -	/* We copy only 4 bytes, we cannot trust hp->h_length, as it comes from the DNS */
 -	memcpy ((char *) &server_address.sin_addr, (char *) hp->h_addr, 4);
-+    if (snprintf (port, 6, "%hu", (unsigned short)tmp_port) < 0) {
-+      g_free (port);
-+      if (free_host)
-+	g_free (host);
-+      ftpfs_errno = errno;
-+      return -1;
-     }
+-    }
++    memset (&hints, 0, sizeof (struct addrinfo));
++    hints.ai_socktype = SOCK_STREAM;
++    hints.ai_flags = AI_ADDRCONFIG;
  
 -    server_address.sin_port = htons (port);
-+    enable_interrupt_key(); /* clear the interrupt flag */
  
 -    /* Connect */
 -    if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
--	disable_interrupt_key();
++    e = getaddrinfo (host, port, &hints, &res);
++    g_free (port);
++    port = NULL;
++
++    if ( e != 0 ) {
+ 	disable_interrupt_key();
 -	ftpfs_errno = errno;
 -        if (free_host)
 -	    g_free (host);
--	return -1;
--    }
++	print_vfs_message (_("ftpfs: %s"), gai_strerror (e));
++	g_free (host);
++	ftpfs_errno = EINVAL;
+ 	return -1;
+     }
 -    
 -    print_vfs_message (_("ftpfs: making connection to %s"), host);
 -    if (free_host)
-+    memset (&hints, 0, sizeof (struct addrinfo));
-+    hints.ai_socktype = SOCK_STREAM;
-+    hints.ai_flags = AI_ADDRCONFIG;
 +
-+    if ((e = getaddrinfo (host, port, &hints, &res)) != 0) {
-+      disable_interrupt_key();
-+      print_vfs_message (_("ftpfs: %s"), gai_strerror (e));
-+      if (free_host)
++    for (curr_res = res; curr_res != NULL; curr_res = curr_res->ai_next) {
++
++	my_socket = socket (curr_res->ai_family, curr_res->ai_socktype, curr_res->ai_protocol);
++
++	if (my_socket < 0) {
++
++	    if (curr_res->ai_next != NULL)
++		continue;
++
++	    disable_interrupt_key();
++	    print_vfs_message (_("ftpfs: %s"), unix_error_string (errno));
++	    g_free (host);
++	    freeaddrinfo (res);
++	    ftpfs_errno = errno;
++	    return -1;
++	}
++
++	print_vfs_message (_("ftpfs: making connection to %s"), host);
  	g_free (host);
--
++	host = NULL;
++
++	if ( connect (my_socket, curr_res->ai_addr, curr_res->ai_addrlen) >= 0 )
++	    break;
+ 
 -    if (connect (my_socket, (struct sockaddr *) &server_address,
 -	     sizeof (server_address)) < 0){
--	ftpfs_errno = errno;
+ 	ftpfs_errno = errno;
 -	if (errno == EINTR && got_interrupt ())
-+      g_free (port);
-+      ftpfs_errno = EINVAL;
-+      return -1;
-+    }
-+    g_free (port);
++	close (my_socket);
 +
-+    for (restmp = res; res != NULL; res = res->ai_next) {
-+      my_socket = socket (res->ai_family, res->ai_socktype, res->ai_protocol);
-+      if (my_socket < 0) {
-+	if (res->ai_next == NULL) {
-+	  disable_interrupt_key();
-+	  print_vfs_message (_("ftpfs: %s"), unix_error_string (errno));
-+	  if (free_host)
-+	    g_free (host);
-+	  freeaddrinfo (restmp);
-+	  ftpfs_errno = errno;
-+	  return -1;
-+	} else
-+	  continue;
-+      } else {
-+	print_vfs_message (_("ftpfs: making connection to %s"), host);
-+	if (free_host)
-+	  g_free (host);
-+	
-+	if (connect (my_socket, res->ai_addr, res->ai_addrlen) < 0) {
-+	  ftpfs_errno = errno;
-+	  close (my_socket);
-+	  if (errno == EINTR && got_interrupt ()) {
++	if (errno == EINTR && got_interrupt ()) {
  	    print_vfs_message (_("ftpfs: connection interrupted by user"));
 -	else
-+	  } else if (res->ai_next == NULL) {
++	} else if (res->ai_next == NULL) {
  	    print_vfs_message (_("ftpfs: connection to server failed: %s"),
 -				   unix_error_string(errno));
 -	disable_interrupt_key();
 -	close (my_socket);
--	return -1;
-+			       unix_error_string (errno));
-+	  } else
++				unix_error_string (errno));
++	} else {
 +	    continue;
-+	  freeaddrinfo (restmp);
-+	  disable_interrupt_key ();
-+	  return -1;
-+	} else
-+	  break;
-+      }
++	}
++
++	freeaddrinfo (res);
++	disable_interrupt_key ();
+ 	return -1;
      }
 -    disable_interrupt_key();
 +
-+    freeaddrinfo (restmp);
++    freeaddrinfo (res);
 +    disable_interrupt_key ();
      return my_socket;
  }
  
-@@ -861,93 +883,179 @@ ftpfs_get_current_directory (struct vfs_
+@@ -874,84 +899,174 @@ ftpfs_get_current_directory (struct vfs_class *me, struct vfs_s_super *super)
      
  /* Setup Passive ftp connection, we use it for source routed connections */
  static int
 -ftpfs_setup_passive (struct vfs_class *me, struct vfs_s_super *super, int my_socket, struct sockaddr_in *sa)
-+ftpfs_setup_passive (struct vfs_class *me, struct vfs_s_super *super, int my_socket, struct sockaddr_storage *sa, socklen_t *salen)
++ftpfs_setup_passive (struct vfs_class *me, struct vfs_s_super *super,
++	int my_socket, struct sockaddr_storage *sa, socklen_t *salen)
  {
-+  char *c;
-+  
-+  if (ftpfs_command (me, super, WAIT_REPLY | WANT_STRING, "EPSV") == COMPLETE) {
-+    int port;
-+    /* (|||<port>|) */
-+    c = strchr (reply_str, '|');
-+    if (c == NULL)
-+      return 0;
-+    if(strlen(c) > 3)
-+      c+=3;
-+    else
-+      return 0;
-+
-+    port = atoi (c);
-+    if (port < 0 || port > 65535)
-+      return 0;
-+    port = htons (port);
-+
-+    switch (sa->ss_family) {
-+    case AF_INET:
-+      ((struct sockaddr_in *)sa)->sin_port = port;
-+      break;
-+    case AF_INET6:
-+      ((struct sockaddr_in6 *)sa)->sin6_port = port;
-+      break;
-+    default:
-+      print_vfs_message (_("ftpfs: invalid address family"));
-+      ERRNOR (EINVAL, -1);
-+    }
-+  } else if (sa->ss_family == AF_INET) {
-     int xa, xb, xc, xd, xe, xf;
-     char n [6];
--    char *c;
-     
-     if (ftpfs_command (me, super, WAIT_REPLY | WANT_STRING, "PASV") != COMPLETE)
+-    int xa, xb, xc, xd, xe, xf;
+-    char n [6];
+     char *c;
+-    
+-    if (ftpfs_command (me, super, WAIT_REPLY | WANT_STRING, "PASV") != COMPLETE)
 -	return 0;
--
-+      return 0;
-+    
-     /* Parse remote parameters */
-     for (c = reply_str + 4; (*c) && (!isdigit ((unsigned char) *c)); c++)
+ 
+-    /* Parse remote parameters */
+-    for (c = reply_str + 4; (*c) && (!isdigit ((unsigned char) *c)); c++)
 -	;
-+      ;
-     if (!*c)
--	return 0;
-+      return 0;
-     if (!isdigit ((unsigned char) *c))
+-    if (!*c)
 -	return 0;
-+      return 0;
-     if (sscanf (c, "%d,%d,%d,%d,%d,%d", &xa, &xb, &xc, &xd, &xe, &xf) != 6)
+-    if (!isdigit ((unsigned char) *c))
 -	return 0;
-+      return 0;
-     n [0] = (unsigned char) xa;
-     n [1] = (unsigned char) xb;
-     n [2] = (unsigned char) xc;
-     n [3] = (unsigned char) xd;
-     n [4] = (unsigned char) xe;
-     n [5] = (unsigned char) xf;
-+    
-+    memcpy (&(((struct sockaddr_in *)sa)->sin_addr.s_addr), (void *)n, 4);
-+    memcpy (&(((struct sockaddr_in *)sa)->sin_port), (void *)&n[4], 2);
-+  } else
-+    return 0;
- 
+-    if (sscanf (c, "%d,%d,%d,%d,%d,%d", &xa, &xb, &xc, &xd, &xe, &xf) != 6)
++    if (ftpfs_command (me, super, WAIT_REPLY | WANT_STRING, "EPSV") == COMPLETE) {
++	int port;
++	/* (|||<port>|) */
++	c = strchr (reply_str, '|');
++	if (c == NULL)
++	    return 0;
++	if(strlen(c) > 3)
++	    c+=3;
++	else
++	    return 0;
++
++	port = atoi (c);
++	if (port < 0 || port > 65535)
++	    return 0;
++	port = htons (port);
++
++	switch (sa->ss_family) {
++	case AF_INET:
++	    ((struct sockaddr_in *)sa)->sin_port = port;
++	break;
++	case AF_INET6:
++	    ((struct sockaddr_in6 *)sa)->sin6_port = port;
++	break;
++	default:
++	    print_vfs_message (_("ftpfs: invalid address family"));
++	    ERRNOR (EINVAL, -1);
++	}
++    } else if (sa->ss_family == AF_INET) {
++	int xa, xb, xc, xd, xe, xf;
++	char n [6];
++
++	if (ftpfs_command (me, super, WAIT_REPLY | WANT_STRING, "PASV") != COMPLETE)
++	    return 0;
++
++	/* Parse remote parameters */
++	for (c = reply_str + 4; (*c) && (!isdigit ((unsigned char) *c)); c++);
++
++	if (!*c)
++	    return 0;
++	if (!isdigit ((unsigned char) *c))
++	    return 0;
++	if (sscanf (c, "%d,%d,%d,%d,%d,%d", &xa, &xb, &xc, &xd, &xe, &xf) != 6)
++	    return 0;
++
++	n [0] = (unsigned char) xa;
++	n [1] = (unsigned char) xb;
++	n [2] = (unsigned char) xc;
++	n [3] = (unsigned char) xd;
++	n [4] = (unsigned char) xe;
++	n [5] = (unsigned char) xf;
++
++	memcpy (&(((struct sockaddr_in *)sa)->sin_addr.s_addr), (void *)n, 4);
++	memcpy (&(((struct sockaddr_in *)sa)->sin_port), (void *)&n[4], 2);
++    } else
+ 	return 0;
+-    n [0] = (unsigned char) xa;
+-    n [1] = (unsigned char) xb;
+-    n [2] = (unsigned char) xc;
+-    n [3] = (unsigned char) xd;
+-    n [4] = (unsigned char) xe;
+-    n [5] = (unsigned char) xf;
+-
 -    memcpy (&(sa->sin_addr.s_addr), (void *)n, 4);
 -    memcpy (&(sa->sin_port), (void *)&n[4], 2);
 -    if (connect (my_socket, (struct sockaddr *) sa, sizeof (struct sockaddr_in)) < 0)
--	return 0;
--    return 1;
-+  if (connect (my_socket, (struct sockaddr *) sa, *salen ) < 0)
-+    return 0;
 +
-+  return 1;
++    if (connect (my_socket, (struct sockaddr *) sa, *salen ) < 0)
+ 	return 0;
++
+     return 1;
  }
  
  static int
@@ -235,9 +266,9 @@
 -    int data;
 -    socklen_t len = sizeof(data_addr);
 -    struct protoent *pe;
-+  struct sockaddr_storage data_addr;
-+  socklen_t data_addrlen;
-+  int data_sock;
++    struct sockaddr_storage data_addr;
++    socklen_t data_addrlen;
++    int data_sock;
  
 -    pe = getprotobyname ("tcp");
 -    if (pe == NULL)
@@ -250,122 +281,117 @@
 -    data = socket (AF_INET, SOCK_STREAM, pe->p_proto);
 -    if (data < 0)
 -	ERRNOR (EIO, -1);
-+  memset (&data_addr, 0, sizeof (struct sockaddr_storage));
-+  data_addrlen = sizeof (struct sockaddr_storage);
++    memset (&data_addr, 0, sizeof (struct sockaddr_storage));
++    data_addrlen = sizeof (struct sockaddr_storage);
++
++    if (getpeername (SUP.sock, (struct sockaddr *) &data_addr, &data_addrlen) == -1)
++	return -1;
++
++    switch (data_addr.ss_family) {
++    case AF_INET:
++	((struct sockaddr_in *)&data_addr)->sin_port = 0;
++    break;
++    case AF_INET6:
++	((struct sockaddr_in6 *)&data_addr)->sin6_port = 0;
++    break;
++    default:
++	print_vfs_message (_("ftpfs: invalid address family"));
++	ERRNOR(EINVAL, -1);
++    }
++
++    data_sock = socket (data_addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
++    if (data_sock < 0) {
++	if (SUP.use_passive_connection) {
++	    print_vfs_message (_("ftpfs: could not setup passive mode: %s"), unix_error_string (errno));
++	    SUP.use_passive_connection = 0;
++	    goto again;
++	}
++
++	print_vfs_message (_("ftpfs: could not create socket: %s"), unix_error_string (errno));
++	return -1;
++    }
  
--    if (SUP.use_passive_connection) {
+     if (SUP.use_passive_connection) {
 -	if (ftpfs_setup_passive (me, super, data, &data_addr))
 -	    return data;
--
--	SUP.use_passive_connection = 0;
--	print_vfs_message (_("ftpfs: could not setup passive mode"));
-+  if (getpeername (SUP.sock, (struct sockaddr *) &data_addr, &data_addrlen) == -1)
-+    return -1;
-+  
-+  switch (data_addr.ss_family) {
-+  case AF_INET:
-+    ((struct sockaddr_in *)&data_addr)->sin_port = 0;
-+    break;
-+  case AF_INET6:
-+    ((struct sockaddr_in6 *)&data_addr)->sin6_port = 0;
-+    break;
-+  default:
-+    print_vfs_message (_("ftpfs: invalid address family"));
-+    ERRNOR(EINVAL, -1);
-+  }
++
++	if (ftpfs_setup_passive (me, super, data_sock, &data_addr, &data_addrlen))
++	    return data_sock;
+ 
+ 	SUP.use_passive_connection = 0;
+ 	print_vfs_message (_("ftpfs: could not setup passive mode"));
  
 -	/* data or data_addr may be damaged by ftpfs_setup_passive */
 -	close (data);
--	goto again;
-+  data_sock = socket (data_addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
-+  if (data_sock < 0) {
-+    if (SUP.use_passive_connection) {
-+      print_vfs_message (_("ftpfs: could not setup passive mode: %s"), unix_error_string (errno));
-+      SUP.use_passive_connection = 0;
-+      goto again;
++	close (data_sock);
+ 	goto again;
      }
-+    print_vfs_message (_("ftpfs: could not create socket: %s"), unix_error_string (errno));
-+    return -1;
-+  }
- 
-+  if (SUP.use_passive_connection) {
-+    if (ftpfs_setup_passive (me, super, data_sock, &data_addr, &data_addrlen))
-+      return data_sock;
-+
-+    SUP.use_passive_connection = 0;
-+    print_vfs_message (_("ftpfs: could not setup passive mode"));
-+
-+    close (data_sock);
-+    goto again;
-+  }
-+  
+ 
      /* If passive setup fails, fallback to active connections */
      /* Active FTP connection */
 -    if ((bind (data, (struct sockaddr *)&data_addr, len) == 0) &&
 -	(getsockname (data, (struct sockaddr *) &data_addr, &len) == 0) && 
 -	(listen (data, 1) == 0))
-+  if ((bind (data_sock, (struct sockaddr *)&data_addr, data_addrlen) == 0) &&
-+      (getsockname (data_sock, (struct sockaddr *)&data_addr, &data_addrlen) == 0) && 
-+      (listen (data_sock, 1) == 0))
-     {
+-    {
 -	unsigned char *a = (unsigned char *)&data_addr.sin_addr;
 -	unsigned char *p = (unsigned char *)&data_addr.sin_port;
-+      unsigned short int port;
-+      char *addr;
-+      unsigned int af;
-+
-+      switch (data_addr.ss_family) {
-+      case AF_INET: 
-+	af = FTP_INET;
-+	port = ((struct sockaddr_in *)&data_addr)->sin_port;
++    if ((bind (data_sock, (struct sockaddr *)&data_addr, data_addrlen) == 0) &&
++      (getsockname (data_sock, (struct sockaddr *)&data_addr, &data_addrlen) == 0) && 
++      (listen (data_sock, 1) == 0)) {
++	unsigned short int port;
++	char *addr;
++	unsigned int af;
++
++	switch (data_addr.ss_family) {
++	case AF_INET: 
++	    af = FTP_INET;
++	    port = ((struct sockaddr_in *)&data_addr)->sin_port;
 +	break;
-+      case AF_INET6: 
-+	af = FTP_INET6;
-+	port = ((struct sockaddr_in6 *)&data_addr)->sin6_port;
++	case AF_INET6: 
++	    af = FTP_INET6;
++	    port = ((struct sockaddr_in6 *)&data_addr)->sin6_port;
 +	break;
-+      default:
-+	print_vfs_message (_("ftpfs: invalid address family"));
-+	ERRNOR (EINVAL, -1);
-+      }
-+      port = ntohs (port);
-+     
-+      addr = malloc (NI_MAXHOST);
-+      if (addr == NULL)
-+	ERRNOR (ENOMEM, -1);
-+
-+      if (getnameinfo ((struct sockaddr *)&data_addr, data_addrlen, addr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) != 0) {
++	default:
++	    print_vfs_message (_("ftpfs: invalid address family"));
++	    ERRNOR (EINVAL, -1);
++	}
++
++	port = ntohs (port);
++
++	addr = malloc (NI_MAXHOST);
++	if (addr == NULL)
++	    ERRNOR (ENOMEM, -1);
++
++	if (getnameinfo ((struct sockaddr *)&data_addr, data_addrlen, addr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) != 0) {
++	    g_free (addr);
++	    ERRNOR (EIO, -1);
++	}
++
++	if (ftpfs_command (me, super, WAIT_REPLY, "EPRT |%u|%s|%hu|", af, addr, port) == COMPLETE) {
++	    g_free (addr);
++	    return data_sock;
++	}
 +	g_free (addr);
-+	ERRNOR (EIO, -1);
-+      }
 +
-+      if (ftpfs_command (me, super, WAIT_REPLY, "EPRT |%u|%s|%hu|", af, addr, port) == COMPLETE) {
-+	g_free (addr);
-+	return data_sock;
-+      }
-+      g_free (addr);
-+      
-+      if (FTP_INET == af) {
-+	unsigned char *a = (unsigned char *)&((struct sockaddr_in *)&data_addr)->sin_addr;
-+	unsigned char *p = (unsigned char *)&port;
++	if (FTP_INET == af) {
++	    unsigned char *a = (unsigned char *)&((struct sockaddr_in *)&data_addr)->sin_addr;
++	    unsigned char *p = (unsigned char *)&port;
  	
 -	if (ftpfs_command (me, super, WAIT_REPLY, "PORT %d,%d,%d,%d,%d,%d", a[0], a[1], 
 -		     a[2], a[3], p[0], p[1]) == COMPLETE)
 -	    return data;
-+	if (ftpfs_command (me, super, WAIT_REPLY, "PORT %u,%u,%u,%u,%u,%u", a[0], a[1], a[2], a[3],
-+			   p[0], p[1]) == COMPLETE)
++	if (ftpfs_command (me, super, WAIT_REPLY, 
++			    "PORT %u,%u,%u,%u,%u,%u", a[0], a[1], a[2], a[3],
++			    p[0], p[1]) == COMPLETE)
 +	  return data_sock;
-+      }
++	}
      }
 -    close (data);
--    ftpfs_errno = EIO;
--    return -1;
-+
-+  close (data_sock);
-+  ftpfs_errno = EIO;
-+  return -1;
++    close (data_sock);
+     ftpfs_errno = EIO;
+     return -1;
  }
- 
- static int
+@@ -960,7 +1075,7 @@ static int
  ftpfs_open_data_connection (struct vfs_class *me, struct vfs_s_super *super, const char *cmd,
  		      const char *remote, int isbinary, int reget)
  {
@@ -374,9 +400,11 @@
      int s, j, data;
      socklen_t fromlen = sizeof(from);
      
---- mc-2006-09-12-21/vfs/ftpfs.h.ipv6	2005-05-29 14:10:08.000000000 +0200
-+++ mc-2006-09-12-21/vfs/ftpfs.h	2006-09-26 10:42:36.000000000 +0200
-@@ -15,6 +15,9 @@ extern int ftpfs_first_cd_then_ls;
+diff --git a/vfs/ftpfs.h b/vfs/ftpfs.h
+index b2003db..0f41b18 100644
+--- a/vfs/ftpfs.h
++++ b/vfs/ftpfs.h
+@@ -21,6 +21,9 @@ extern int ftpfs_first_cd_then_ls;
  void ftpfs_init_passwd (void);
  void init_ftpfs (void);
  
@@ -386,27 +414,29 @@
  #define OPT_FLUSH        1
  #define OPT_IGNORE_ERROR 2
  
---- mc-2006-08-12-18/vfs/utilvfs.c.ipv6	2006-01-30 18:01:58.000000000 +0100
-+++ mc-2006-08-12-18/vfs/utilvfs.c	2010-12-14 20:41:09.000000000 +0100
-@@ -109,7 +109,21 @@ vfs_split_url (const char *path, char **
+diff --git a/vfs/utilvfs.c b/vfs/utilvfs.c
+index af05144..f53914a 100644
+--- a/vfs/utilvfs.c
++++ b/vfs/utilvfs.c
+@@ -123,7 +123,21 @@ vfs_split_url (const char *path, char **host, char **user, int *port,
      }
  
      /* Check if the host comes with a port spec, if so, chop it */
 -    colon = strchr (rest, ':');
 +    if ('[' == *rest) {
-+      colon = strchr (++rest, ']');
-+      if (colon) {
-+	colon[0] = '\0';
-+	colon[1] = '\0';
-+	colon++;
-+      } else {
-+	g_free (pcopy);
-+	*host = NULL;
-+	*port = 0;
-+	return NULL;
-+      }
++	colon = strchr (++rest, ']');
++	if (colon) {
++	    colon[0] = '\0';
++	    colon[1] = '\0';
++	    colon++;
++	} else {
++	    g_free (pcopy);
++	    *host = NULL;
++	    *port = 0;
++	    return NULL;
++	}
 +    } else
-+      colon = strchr (rest, ':');
++	colon = strchr (rest, ':');
 +
      if (colon) {
  	*colon = 0;


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- mc.spec	3 Aug 2009 10:38:05 -0000	1.145
+++ mc.spec	5 Aug 2009 12:26:02 -0000	1.146
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.1.pre1%{?dist}
+Release:	0.2.pre1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -15,6 +15,7 @@ Requires:	dev >= 3.3-3
 Patch1:		mc-ipv6.patch
 Patch2:		mc-prompt.patch
 Patch3:		mc-exit.patch
+Patch4:		mc-extensions.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -28,6 +29,7 @@ specific files.
 %patch1 -p1 -b .ipv6
 %patch2 -p1 -b .prompt
 %patch3 -p1 -b .exit
+%patch4 -p1 -b .extensions
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -83,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Wed Aug  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.2.pre1
+- update extension binding to be more Fedora-like
+- update to upstream IPv6 patch
+
 * Mon Aug  3 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.1.pre1
 - update to 4.7.0-pre1 (fixes #513757)
 



From nphilipp at fedoraproject.org  Wed Aug  5 12:40:59 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  5 Aug 2009 12:40:59 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.75,1.76
Message-ID: <20090805124059.A1C2211C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6576

Modified Files:
	xsane.spec 
Log Message:
Merge Review (#226658):
- replace %desktop_vendor macro with "fedora"
- fix xsane-gimp requirements
- move EULA and documentation into -common subpackage



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- xsane.spec	3 Aug 2009 16:50:05 -0000	1.75
+++ xsane.spec	5 Aug 2009 12:40:58 -0000	1.76
@@ -1,11 +1,10 @@
 # if you rebuild, please change bugtracker_url accordingly:
 %global bugtracker_url http://bugzilla.redhat.com
-%global desktop_vendor fedora
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.997
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -24,6 +23,7 @@ BuildRequires: sane-backends-devel >= 1.
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
+Requires: xsane-common
 
 %description
 XSane is an X based interface for the SANE (Scanner Access Now Easy)
@@ -34,14 +34,23 @@ performing the scan and then manipulatin
 %package gimp
 Summary: GIMP plug-in providing the SANE scanner interface
 Group: Applications/Multimedia
+Requires: gimp >= 2:2.2.12-4
 Requires(post): gimp >= 2:2.2.12-4
 Requires(preun): gimp >= 2:2.2.12-4
+Requires: xsane-common
 
 %description gimp
 This package provides the regular XSane frontend for the SANE scanner
 interface, but it works as a GIMP plug-in. You must have GIMP
 installed to use this package.
 
+%package common
+Summary: Common files for xsane packages
+Group: Applications/Multimedia
+
+%description
+This package contains common files needed by other xsane packages.
+
 %prep
 %setup -q
 
@@ -78,8 +87,8 @@ install src/xsane-gimp %{buildroot}%{_bi
 
 # use our own desktop file
 rm %{buildroot}%{_datadir}/applications/xsane.desktop
-desktop-file-install --vendor %{desktop_vendor}         \
-    --dir %{buildroot}%{_datadir}/applications          \
+desktop-file-install --vendor fedora \
+    --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
@@ -107,19 +116,26 @@ fi
 %doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.COPYING xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
 %{_bindir}/xsane
 %{_mandir}/man1/*
-%{_datadir}/sane
-%{_datadir}/applications/%{desktop_vendor}-xsane.desktop
+%{_datadir}/applications/fedora-xsane.desktop
 %{_datadir}/pixmaps/xsane.xpm
 
 %files gimp
 %defattr(-,root,root)
 %{_bindir}/xsane-gimp
-%dir %{_datadir}/sane
-%dir %{_datadir}/sane/xsane
-%{_datadir}/sane/xsane/*eula*
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
+%files common
+%defattr(-,root,root)
+%dir %{_datadir}/sane
+%{_datadir}/sane/xsane
+
 %changelog
+* Wed Aug 05 2009 Nils Philippsen <nils at redhat.com> 0.997-3
+- Merge Review (#226658):
+  - replace %%desktop_vendor macro with "fedora"
+  - fix xsane-gimp requirements
+  - move EULA and documentation into -common subpackage
+
 * Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> 0.997-2
 - remove ExcludeArch: s390 s390x
 



From nphilipp at fedoraproject.org  Wed Aug  5 12:41:43 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  5 Aug 2009 12:41:43 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.76,1.77
Message-ID: <20090805124143.594C111C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6781

Modified Files:
	xsane.spec 
Log Message:
fix -common description



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- xsane.spec	5 Aug 2009 12:40:58 -0000	1.76
+++ xsane.spec	5 Aug 2009 12:41:43 -0000	1.77
@@ -48,7 +48,7 @@ installed to use this package.
 Summary: Common files for xsane packages
 Group: Applications/Multimedia
 
-%description
+%description common
 This package contains common files needed by other xsane packages.
 
 %prep



From hadess at fedoraproject.org  Wed Aug  5 12:43:19 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  5 Aug 2009 12:43:19 +0000 (UTC)
Subject: rpms/gstreamer/devel .cvsignore, 1.41, 1.42 gstreamer.spec, 1.103, 
	1.104 sources, 1.42, 1.43
Message-ID: <20090805124319.AB48D11C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7255

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
- Update to 0.10.24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	28 Jul 2009 11:24:22 -0000	1.41
+++ .cvsignore	5 Aug 2009 12:43:19 -0000	1.42
@@ -1 +1 @@
-gstreamer-0.10.23.4.tar.bz2
+gstreamer-0.10.24.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gstreamer.spec	28 Jul 2009 11:24:22 -0000	1.103
+++ gstreamer.spec	5 Aug 2009 12:43:19 -0000	1.104
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.23.4
+Version: 	0.10.24
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
+- Update to 0.10.24
+
 * Tue Jul 28 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23.4-1
 - Update to 0.10.23.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	28 Jul 2009 11:24:22 -0000	1.42
+++ sources	5 Aug 2009 12:43:19 -0000	1.43
@@ -1 +1 @@
-539aa9e2c4f9bb906bdb222c8a5c7d1a  gstreamer-0.10.23.4.tar.bz2
+178d3326c96c360c9a15751bd5d73a6c  gstreamer-0.10.24.tar.bz2



From hadess at fedoraproject.org  Wed Aug  5 12:46:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  5 Aug 2009 12:46:16 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.27,
	1.28 gstreamer-plugins-base.spec, 1.85, 1.86 sources, 1.28, 1.29
Message-ID: <20090805124616.2E04D11C008C@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-serv7944

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Log Message:
* Wed Aug 05 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/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	28 Jul 2009 12:01:58 -0000	1.27
+++ .cvsignore	5 Aug 2009 12:46:15 -0000	1.28
@@ -1 +1 @@
-gst-plugins-base-0.10.23.4.tar.bz2
+gst-plugins-base-0.10.24.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- gstreamer-plugins-base.spec	28 Jul 2009 12:01:58 -0000	1.85
+++ gstreamer-plugins-base.spec	5 Aug 2009 12:46:15 -0000	1.86
@@ -1,10 +1,10 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.22
+%define         _gst            0.10.24
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.23.4
+Version: 	0.10.24
 Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
@@ -245,6 +245,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
+- Update to 0.10.24
+
 * Tue Jul 28 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23.4-1
 - Update to 0.10.23.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	28 Jul 2009 12:01:58 -0000	1.28
+++ sources	5 Aug 2009 12:46:15 -0000	1.29
@@ -1 +1 @@
-78594c5672b3bf41b37a3a9f7c16bb3b  gst-plugins-base-0.10.23.4.tar.bz2
+a3ec977c9c6602caacc2d3a7c12a17bf  gst-plugins-base-0.10.24.tar.bz2



From till at fedoraproject.org  Wed Aug  5 12:49:54 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed,  5 Aug 2009 12:49:54 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.71,1.72
Message-ID: <20090805124954.ADF6511C008C@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8734

Modified Files:
	comps-f12.xml.in 
Log Message:
- add password recovery tools
- add pdfresurrect
- sort forensics group



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- comps-f12.xml.in	4 Aug 2009 20:48:53 -0000	1.71
+++ comps-f12.xml.in	5 Aug 2009 12:49:54 -0000	1.72
@@ -4715,19 +4715,20 @@
     <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="default">chkrootkit</packagereq>
-        <packagereq type="default">Unhide</packagereq>
         <packagereq type="default">clamav</packagereq>
         <packagereq type="default">dc3dd</packagereq>
         <packagereq type="default">dd_rescue</packagereq>
-        <packagereq type="default">sleuthkit</packagereq>
+        <packagereq type="default">foremost</packagereq>
         <packagereq type="default">gpart</packagereq>
         <packagereq type="default">hexedit</packagereq>
+        <packagereq type="default">pdfresurrect</packagereq>
         <packagereq type="default">prelude</packagereq>
-        <packagereq type="default">testdisk</packagereq>
-        <packagereq type="default">foremost</packagereq>
-        <packagereq type="default">sectool</packagereq>
         <packagereq type="default">rkhunter</packagereq>
         <packagereq type="default">scanmem</packagereq>
+        <packagereq type="default">sectool</packagereq>
+        <packagereq type="default">sleuthkit</packagereq>
+        <packagereq type="default">testdisk</packagereq>
+        <packagereq type="default">Unhide</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4775,6 +4776,20 @@
     </packagelist>
   </group>
   <group>
+    <id>it-security-password-recovery</id>
+    <_name>Password recovery tools</_name>
+    <_description>These tools can be used to recover passwords.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+        <packagereq type="default">crack</packagereq>
+        <packagereq type="default">john</packagereq>
+        <packagereq type="default">medusa</packagereq>
+        <packagereq type="default">ophcrack</packagereq>
+        <packagereq type="default">xlcrack</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>romanian-support</id>
     <_name>Romanian Support</_name>
     <_description/>
@@ -6190,6 +6205,7 @@
       <groupid>it-security-intrusion-detection</groupid>
       <groupid>it-security-reconnaissance</groupid>
       <groupid>it-security-wireless</groupid>
+      <groupid>it-security-password-recovery</groupid>
     </grouplist>
   </category>
   <category>



From rdieter at fedoraproject.org  Wed Aug  5 12:52:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:52:01 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.3.0-trademarks.patch, NONE,
	1.1 .cvsignore, 1.64, 1.65 kdegames.spec, 1.116, 1.117 sources,
	1.69, 1.70 kdegames-4.2.2-ksirk-kde#187235.patch, 1.1,
	NONE kdegames-4.2.2-ksirk-rh#486380.patch, 1.2, NONE
Message-ID: <20090805125201.6A77911C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9432/F-10

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-4.3.0-trademarks.patch 
Removed Files:
	kdegames-4.2.2-ksirk-kde#187235.patch 
	kdegames-4.2.2-ksirk-rh#486380.patch 
Log Message:
kde-4.3.0


kdegames-4.3.0-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 8 files changed, 70 insertions(+), 65 deletions(-)

--- NEW FILE kdegames-4.3.0-trademarks.patch ---
diff -up kdegames-4.3.0/doc/kbattleship/index.docbook.trademarks kdegames-4.3.0/doc/kbattleship/index.docbook
--- kdegames-4.3.0/doc/kbattleship/index.docbook.trademarks	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.0/doc/kbattleship/index.docbook	2009-07-31 23:01:31.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 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.0/doc/ktron/index.docbook.trademarks kdegames-4.3.0/doc/ktron/index.docbook
--- kdegames-4.3.0/doc/ktron/index.docbook.trademarks	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.0/doc/ktron/index.docbook	2009-07-31 23:01:31.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 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -up kdegames-4.3.0/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.0/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.0/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 17:20:37.000000000 +0200
+++ kdegames-4.3.0/kbattleship/src/kbattleship.desktop	2009-07-31 23:01:31.000000000 +0200
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
 Name[be]=???????????? ??????
 Name[bn]=??????-??????????????????????????????
 Name[cs]=Lod??
@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
 Name[ro]=B??t??lie naval??
 Name[sr]=?????????????????????????
 Name[sr at latin]=K???podmornice
-Name[sv]=Kbattleship
 Name[ta]=??????????????????????????????????????????
 Name[tg]=K?????????? ??????????????
 Name[uk]=???????????????? ??????
-Name[x-test]=xxKBattleshipxx
-Name[zh_TW]=KBattleship ??????
+Name[x-test]=xxKSinkShipsxx
+Name[zh_TW]=KSinkShips ??????
 Exec=kbattleship -caption "%c"
 Icon=kbattleship
 Type=Application
 X-DocPath=kbattleship/index.html
-GenericName=Battleship Game
+GenericName=Ship Sinking Game
 GenericName[be]=???????????? ?? ???????????? ??????
 GenericName[bn]=?????????????????????????????? ????????????
 GenericName[ca]=Joc d'enfonsar la flota
@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
 GenericName[cy]=G??m Longau Rhyfel
 GenericName[da]=S??nke slagskibe-spil
 GenericName[de]=Schiffe versenken
-GenericName[el]=???????????????? Battleship
 GenericName[eo]=Batal??ipa ludo
 GenericName[es]=Juego de la batalla de naves
 GenericName[et]=Laevade pommitamise m??ng
@@ -40,7 +37,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]=????????????????????? ?????????
@@ -74,7 +70,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.0/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.0/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.0/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 13:11:24.000000000 +0200
+++ kdegames-4.3.0/kbattleship/src/kbattleship.protocol	2009-07-31 23:15:48.000000000 +0200
@@ -5,34 +5,34 @@ 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[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[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[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[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[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[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.0/kbattleship/src/main.cpp.trademarks kdegames-4.3.0/kbattleship/src/main.cpp
--- kdegames-4.3.0/kbattleship/src/main.cpp.trademarks	2009-03-18 10:57:42.000000000 +0100
+++ kdegames-4.3.0/kbattleship/src/main.cpp	2009-07-31 23:01:31.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 @@ int main(int argc, char** argv)
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     
diff -up kdegames-4.3.0/ktron/main.cpp.trademarks kdegames-4.3.0/ktron/main.cpp
--- kdegames-4.3.0/ktron/main.cpp.trademarks	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.0/ktron/main.cpp	2009-07-31 23:01:31.000000000 +0200
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -up kdegames-4.3.0/ktron/player.cpp.trademarks kdegames-4.3.0/ktron/player.cpp
--- kdegames-4.3.0/ktron/player.cpp.trademarks	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.0/ktron/player.cpp	2009-07-31 23:01:31.000000000 +0200
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.0/README.trademarks kdegames-4.3.0/README
--- kdegames-4.3.0/README.trademarks	2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.0/README	2009-07-31 23:01:31.000000000 +0200
@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	30 May 2009 11:46:47 -0000	1.64
+++ .cvsignore	5 Aug 2009 12:52:00 -0000	1.65
@@ -1 +1,5 @@
-kdegames-4.2.4.tar.bz2
+kdegames-4.2.90.tar.bz2
+kdegames-4.2.95.tar.bz2
+kdegames-4.2.96.tar.bz2
+kdegames-4.2.98.tar.bz2
+kdegames-4.3.0.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- kdegames.spec	30 May 2009 11:38:17 -0000	1.116
+++ kdegames.spec	5 Aug 2009 12:52:01 -0000	1.117
@@ -1,17 +1,15 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.2.4
+Version: 4.3.0
 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
-# Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
-Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
-# Fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
-Patch1:  kdegames-4.2.2-ksirk-rh#486380.patch
+Patch0:  kdegames-4.3.0-trademarks.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -42,7 +40,6 @@ Games for the K Desktop Environment 4, i
 * bovo
 * kapman
 * katomic
-* kbattleship
 * kblackbox
 * kblocks
 * kbounce
@@ -64,7 +61,9 @@ Games for the K Desktop Environment 4, i
 * kreversi
 * ksame
 * kshisen
+* ksinkships
 * ksirk
+* ksnakeduel / ksnake
 * kspaceduel
 * ksquares
 * ksudoku
@@ -92,8 +91,7 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}
-%patch0 -p1 -b .ksirk-kde#187235
-%patch1 -p1 -b .ksirk-rh#486380
+%patch0 -p1 -b .trademarks
 
 %build
 
@@ -173,6 +171,7 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/sounds/kapman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/kde4/services/kbattleship.protocol
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
@@ -198,11 +197,29 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat May 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Sat Jul 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-2
+- reenable and rebrand the ship sinking game and the snake duel game (#502359)
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-6
 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	30 May 2009 11:46:47 -0000	1.69
+++ sources	5 Aug 2009 12:52:01 -0000	1.70
@@ -1 +1 @@
-ac4a0315a35ad47b95a6a656127f8731  kdegames-4.2.4.tar.bz2
+9997c1fab82519ebc59e661c4324fa0a  kdegames-4.3.0.tar.bz2


--- kdegames-4.2.2-ksirk-kde#187235.patch DELETED ---


--- kdegames-4.2.2-ksirk-rh#486380.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 12:52:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:52:01 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames-4.3.0-trademarks.patch, NONE,
	1.1 .cvsignore, 1.67, 1.68 kdegames.spec, 1.128, 1.129 sources,
	1.70, 1.71 kdegames-4.2.2-ksirk-kde#187235.patch, 1.1,
	NONE kdegames-4.2.2-ksirk-rh#486380.patch, 1.2, NONE
Message-ID: <20090805125201.DD95E11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9432/F-11

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-4.3.0-trademarks.patch 
Removed Files:
	kdegames-4.2.2-ksirk-kde#187235.patch 
	kdegames-4.2.2-ksirk-rh#486380.patch 
Log Message:
kde-4.3.0


kdegames-4.3.0-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 8 files changed, 70 insertions(+), 65 deletions(-)

--- NEW FILE kdegames-4.3.0-trademarks.patch ---
diff -up kdegames-4.3.0/doc/kbattleship/index.docbook.trademarks kdegames-4.3.0/doc/kbattleship/index.docbook
--- kdegames-4.3.0/doc/kbattleship/index.docbook.trademarks	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.0/doc/kbattleship/index.docbook	2009-07-31 23:01:31.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 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-If you want to play &kbattleship;, you will need two players, either play
+If you want to play &kappname;, you will need two players, either play
 against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally,
-&kbattleship; will suggest your full name, but you can enter any string
+&kappname; will suggest your full name, but you can enter any string
 you want. The predefined port should be ok. However, if you encounter
 problems, you can choose any other free port above 1024.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&kbattleship; can be played online on any GGZ Gaming Zone site. You can
+&kappname; can be played online on any GGZ Gaming Zone site. You can
 find other players there, and compete against them. Just enter one
-of the available Battleship rooms with any GGZ core client, such as
-kggz, and &kbattleship; will be offered to you as your favourite
+of the available rooms with any GGZ core client, such as
+kggz, and &kappname; will be offered to you as your favourite
 game client. If a GGZ core client is installed, you can try
 out GGZ by visiting the <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 Remember that when playing online, the opponent might be either a
 human player or a computer player. The latter one might behave
-differently from the computer player included in &kbattleship;.
+differently from the computer player included in &kappname;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.0/doc/ktron/index.docbook.trademarks kdegames-4.3.0/doc/ktron/index.docbook
--- kdegames-4.3.0/doc/ktron/index.docbook.trademarks	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.0/doc/ktron/index.docbook	2009-07-31 23:01:31.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 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. You can play
 &kappname; against the computer or a friend.
 The aim of the game is to live longer than your opponent. To do that,
diff -up kdegames-4.3.0/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.0/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.0/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 17:20:37.000000000 +0200
+++ kdegames-4.3.0/kbattleship/src/kbattleship.desktop	2009-07-31 23:01:31.000000000 +0200
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=KSinkShips
 Name[be]=???????????? ??????
 Name[bn]=??????-??????????????????????????????
 Name[cs]=Lod??
@@ -14,17 +13,16 @@ Name[pa]=??????-???????????? ???????????
 Name[ro]=B??t??lie naval??
 Name[sr]=?????????????????????????
 Name[sr at latin]=K???podmornice
-Name[sv]=Kbattleship
 Name[ta]=??????????????????????????????????????????
 Name[tg]=K?????????? ??????????????
 Name[uk]=???????????????? ??????
-Name[x-test]=xxKBattleshipxx
-Name[zh_TW]=KBattleship ??????
+Name[x-test]=xxKSinkShipsxx
+Name[zh_TW]=KSinkShips ??????
 Exec=kbattleship -caption "%c"
 Icon=kbattleship
 Type=Application
 X-DocPath=kbattleship/index.html
-GenericName=Battleship Game
+GenericName=Ship Sinking Game
 GenericName[be]=???????????? ?? ???????????? ??????
 GenericName[bn]=?????????????????????????????? ????????????
 GenericName[ca]=Joc d'enfonsar la flota
@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lod??
 GenericName[cy]=G??m Longau Rhyfel
 GenericName[da]=S??nke slagskibe-spil
 GenericName[de]=Schiffe versenken
-GenericName[el]=???????????????? Battleship
 GenericName[eo]=Batal??ipa ludo
 GenericName[es]=Juego de la batalla de naves
 GenericName[et]=Laevade pommitamise m??ng
@@ -40,7 +37,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]=????????????????????? ?????????
@@ -74,7 +70,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.0/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.0/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.0/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 13:11:24.000000000 +0200
+++ kdegames-4.3.0/kbattleship/src/kbattleship.protocol	2009-07-31 23:15:48.000000000 +0200
@@ -5,34 +5,34 @@ 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[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[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[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[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[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[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.0/kbattleship/src/main.cpp.trademarks kdegames-4.3.0/kbattleship/src/main.cpp
--- kdegames-4.3.0/kbattleship/src/main.cpp.trademarks	2009-03-18 10:57:42.000000000 +0100
+++ kdegames-4.3.0/kbattleship/src/main.cpp	2009-07-31 23:01:31.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 @@ int main(int argc, char** argv)
     KCmdLineArgs::init(argc, argv, &aboutData);
 
     KCmdLineOptions options;
-    options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup"));
+    options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KApplication app;
     
diff -up kdegames-4.3.0/ktron/main.cpp.trademarks kdegames-4.3.0/ktron/main.cpp
--- kdegames-4.3.0/ktron/main.cpp.trademarks	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.0/ktron/main.cpp	2009-07-31 23:01:31.000000000 +0200
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData( "ktron", 0, ki18n("KTron"), 
+  KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), 
     KTRON_VERSION, description, KAboutData::License_GPL, notice);
   aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   KCmdLineArgs::init( argc, argv, &aboutData );
 
   KCmdLineOptions options;
-  options.add("ktron", ki18n("Start in KTron mode"));
+  // This is the default anyway, why does this need an option? -- Kevin Kofler
+  // options.add("ktron", ki18n("Start in KTron mode"));
   options.add("snake", ki18n("Start in KSnake mode"));
   KCmdLineArgs::addCmdLineOptions(options);
 
diff -up kdegames-4.3.0/ktron/player.cpp.trademarks kdegames-4.3.0/ktron/player.cpp
--- kdegames-4.3.0/ktron/player.cpp.trademarks	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.0/ktron/player.cpp	2009-07-31 23:01:31.000000000 +0200
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.0/README.trademarks kdegames-4.3.0/README
--- kdegames-4.3.0/README.trademarks	2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.0/README	2009-07-31 23:01:31.000000000 +0200
@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
     Play backgammon against a local human player, via a game server or
     against GNU Backgammon (not included)
 
-* kbattleship
-    Sink battleship of your opponents, with built-in game server.
-
 * kblackbox
     Find the balls hidden in the black box by shooting laser beams!
 
@@ -70,6 +67,15 @@ This is a compilation of more than 20 va
 * kshisen
     Patience game where you take away all pieces.
 
+* ksinkships
+    Sink ships of your opponents, with built-in game server.
+
+* ksnake
+    Don't bite yourself, eat apples!
+
+* ksnakeduel
+    Like ksnake, but without fruits.
+
 * kspaceduel
     Two player game with shooting spaceships flying around a sun.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	30 May 2009 11:38:18 -0000	1.67
+++ .cvsignore	5 Aug 2009 12:52:01 -0000	1.68
@@ -1 +1,5 @@
-kdegames-4.2.4.tar.bz2
+kdegames-4.2.90.tar.bz2
+kdegames-4.2.95.tar.bz2
+kdegames-4.2.96.tar.bz2
+kdegames-4.2.98.tar.bz2
+kdegames-4.3.0.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- kdegames.spec	30 May 2009 11:38:18 -0000	1.128
+++ kdegames.spec	5 Aug 2009 12:52:01 -0000	1.129
@@ -1,17 +1,15 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.2.4
+Version: 4.3.0
 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
-# Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
-Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
-# Fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
-Patch1:  kdegames-4.2.2-ksirk-rh#486380.patch
+Patch0:  kdegames-4.3.0-trademarks.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -42,7 +40,6 @@ Games for the K Desktop Environment 4, i
 * bovo
 * kapman
 * katomic
-* kbattleship
 * kblackbox
 * kblocks
 * kbounce
@@ -64,7 +61,9 @@ Games for the K Desktop Environment 4, i
 * kreversi
 * ksame
 * kshisen
+* ksinkships
 * ksirk
+* ksnakeduel / ksnake
 * kspaceduel
 * ksquares
 * ksudoku
@@ -92,8 +91,7 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}
-%patch0 -p1 -b .ksirk-kde#187235
-%patch1 -p1 -b .ksirk-rh#486380
+%patch0 -p1 -b .trademarks
 
 %build
 
@@ -173,6 +171,7 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/sounds/kapman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/kde4/services/kbattleship.protocol
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
@@ -198,11 +197,29 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat May 30 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Sat Jul 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-2
+- reenable and rebrand the ship sinking game and the snake duel game (#502359)
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk???? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-6
 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	30 May 2009 11:38:19 -0000	1.70
+++ sources	5 Aug 2009 12:52:01 -0000	1.71
@@ -1 +1 @@
-ac4a0315a35ad47b95a6a656127f8731  kdegames-4.2.4.tar.bz2
+9997c1fab82519ebc59e661c4324fa0a  kdegames-4.3.0.tar.bz2


--- kdegames-4.2.2-ksirk-kde#187235.patch DELETED ---


--- kdegames-4.2.2-ksirk-rh#486380.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 12:54:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:54:03 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-10 kdepim-runtime.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805125403.A5A0411C008C@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-serv10083/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	kdepim-runtime.spec 
Log Message:
kde-4.3.0



--- NEW FILE kdepim-runtime.spec ---
%define akonadi_version 1.1.95

Name: kdepim-runtime
Summary: KDE PIM Runtime Environment
Version: 4.3.0
Release: 1%{?dist}

License: GPLv2
Group: Applications/Productivity
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: %{name}-libs = %{version}-%{release}

BuildRequires: akonadi-devel >= %{akonadi_version}
BuildRequires: desktop-file-utils
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: kdelibs-experimental-devel >= %{version}
BuildRequires: zlib-devel
BuildRequires: soprano-devel
BuildRequires: libxslt-devel
BuildRequires: libxml2-devel

%description
%{summary}


%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: akonadi%{?_isa} >= %{akonadi_version}

%description libs
%{summary}.


%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: kdepimlibs-devel

%description devel
%{summary}.
Install %{name}-devel if you want to write or compile %{name} plugins.


%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

# make symlinks relative
mkdir -p %{buildroot}%{_docdir}/HTML/en/common
pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
   if [ -d $i -a -L $i/common ]; then
      rm -f $i/common
      ln -nfs ../common $i
   fi
done
popd

%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
   desktop-file-validate $f
done

%post
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
update-mime-database %{_kde4_datadir}/mime >& /dev/null ||:
update-desktop-database -q &> /dev/null ||:

%postun
if [ $1 -eq 0 ] ; then
  update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  update-desktop-database -q &> /dev/null ||:
fi

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_libdir}/kde4/*.so
%{_kde4_datadir}/akonadi/agents/*
%{_kde4_datadir}/applications/kde4/*
%{_kde4_datadir}/config/*rc
%{_kde4_datadir}/dbus-1/interfaces/*.xml
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/*

%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/akonadi/xml/
%{_kde4_libdir}/lib*.so

%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*

%changelog
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0

* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
- 4.3rc3

* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
- 4.3rc2

* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
- -devel: Requires: kdepimlibs-devel
- Req: akonadi >= 1.1.95

* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-2
- cleanup

* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
- first try


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jun 2009 17:08:36 -0000	1.1
+++ .cvsignore	5 Aug 2009 12:54:03 -0000	1.2
@@ -0,0 +1,4 @@
+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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jun 2009 17:08:36 -0000	1.1
+++ sources	5 Aug 2009 12:54:03 -0000	1.2
@@ -0,0 +1 @@
+d29f9b0921534309d4595de5c9b619f1  kdepim-runtime-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 12:54:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:54:03 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-11 kdepim-runtime.spec, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805125403.E9CB811C008C@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-serv10083/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	kdepim-runtime.spec 
Log Message:
kde-4.3.0



--- NEW FILE kdepim-runtime.spec ---
%define akonadi_version 1.1.95

Name: kdepim-runtime
Summary: KDE PIM Runtime Environment
Version: 4.3.0
Release: 1%{?dist}

License: GPLv2
Group: Applications/Productivity
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: %{name}-libs = %{version}-%{release}

BuildRequires: akonadi-devel >= %{akonadi_version}
BuildRequires: desktop-file-utils
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: kdelibs-experimental-devel >= %{version}
BuildRequires: zlib-devel
BuildRequires: soprano-devel
BuildRequires: libxslt-devel
BuildRequires: libxml2-devel

%description
%{summary}


%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: akonadi%{?_isa} >= %{akonadi_version}

%description libs
%{summary}.


%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: kdepimlibs-devel

%description devel
%{summary}.
Install %{name}-devel if you want to write or compile %{name} plugins.


%prep
%setup -q


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

# make symlinks relative
mkdir -p %{buildroot}%{_docdir}/HTML/en/common
pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
   if [ -d $i -a -L $i/common ]; then
      rm -f $i/common
      ln -nfs ../common $i
   fi
done
popd

%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
   desktop-file-validate $f
done

%post
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:

%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
update-mime-database %{_kde4_datadir}/mime >& /dev/null ||:
update-desktop-database -q &> /dev/null ||:

%postun
if [ $1 -eq 0 ] ; then
  update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
  update-desktop-database -q &> /dev/null ||:
fi

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_libdir}/kde4/*.so
%{_kde4_datadir}/akonadi/agents/*
%{_kde4_datadir}/applications/kde4/*
%{_kde4_datadir}/config/*rc
%{_kde4_datadir}/dbus-1/interfaces/*.xml
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/*

%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/akonadi/xml/
%{_kde4_libdir}/lib*.so

%files libs
%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*

%changelog
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0

* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
- 4.3rc3

* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
- 4.3rc2

* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
- -devel: Requires: kdepimlibs-devel
- Req: akonadi >= 1.1.95

* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-2
- cleanup

* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
- first try


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jun 2009 17:08:36 -0000	1.1
+++ .cvsignore	5 Aug 2009 12:54:03 -0000	1.2
@@ -0,0 +1,4 @@
+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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jun 2009 17:08:36 -0000	1.1
+++ sources	5 Aug 2009 12:54:03 -0000	1.2
@@ -0,0 +1 @@
+d29f9b0921534309d4595de5c9b619f1  kdepim-runtime-4.3.0.tar.bz2



From ovasik at fedoraproject.org  Wed Aug  5 12:54:26 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  5 Aug 2009 12:54:26 +0000 (UTC)
Subject: rpms/docbook-style-xsl/F-11 docbook-style-xsl.spec,1.60,1.61
Message-ID: <20090805125426.BCCB611C008C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10417

Modified Files:
	docbook-style-xsl.spec 
Log Message:
fix name of patch in spec file (already have coffee ;) )


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/docbook-style-xsl.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- docbook-style-xsl.spec	5 Aug 2009 12:25:24 -0000	1.60
+++ docbook-style-xsl.spec	5 Aug 2009 12:54:26 -0000	1.61
@@ -30,7 +30,7 @@ Patch2: docbook-xsl-marginleft.patch
 Patch3: docbook-xsl-newmethods.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
 Patch5: docbook-xsl-list-item-body.patch
-Patch6: docbook-xsl-fop1extensions.patch
+Patch6: docbook-xsl-fop1extensionpath.patch
 
 
 %description



From rdieter at fedoraproject.org  Wed Aug  5 12:57:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:57:44 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 kdemultimedia-4.2.85-nomplayerthumbs.patch, 
	NONE, 1.1 .cvsignore, 1.61, 1.62 kdemultimedia.spec, 1.132,
	1.133 sources, 1.64, 1.65
Message-ID: <20090805125744.2978B11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11839/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Added Files:
	kdemultimedia-4.2.85-nomplayerthumbs.patch 
Log Message:
kde-4.3.0


kdemultimedia-4.2.85-nomplayerthumbs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdemultimedia-4.2.85-nomplayerthumbs.patch ---
diff -up kdemultimedia-4.2.85/CMakeLists.txt.nomplayerthumbs kdemultimedia-4.2.85/CMakeLists.txt
--- kdemultimedia-4.2.85/CMakeLists.txt.nomplayerthumbs	2009-05-06 19:04:42.000000000 -0500
+++ kdemultimedia-4.2.85/CMakeLists.txt	2009-05-17 10:23:16.895948032 -0500
@@ -39,7 +39,7 @@ add_subdirectory(cmake)
 macro_optional_add_subdirectory(doc)
 add_subdirectory(libkcddb)
 add_subdirectory(libkcompactdisc)
-add_subdirectory(mplayerthumbs)
+#add_subdirectory(mplayerthumbs)
 
 if (TAGLIB_FOUND)
   macro_optional_add_subdirectory(juk)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	30 May 2009 14:06:26 -0000	1.61
+++ .cvsignore	5 Aug 2009 12:57:43 -0000	1.62
@@ -1 +1,5 @@
-kdemultimedia-4.2.4.tar.bz2
+kdemultimedia-4.2.90.tar.bz2
+kdemultimedia-4.2.95.tar.bz2
+kdemultimedia-4.2.96.tar.bz2
+kdemultimedia-4.2.98.tar.bz2
+kdemultimedia-4.3.0.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- kdemultimedia.spec	30 May 2009 14:06:26 -0000	1.132
+++ kdemultimedia.spec	5 Aug 2009 12:57:43 -0000	1.133
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.4
+Version: 4.3.0
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -8,23 +8,33 @@ 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/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-# upstream patches
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
+
+## upstream patches
+
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
 # FLAC_OGG_LIBRARY:FILEPATH=FLAC_OGG_LIBRARY-NOTFOUND
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: flac-devel
+BuildRequires: glib2-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: libtheora-devel
 ## needed to build Kscd, keep for now -- Kevin
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
+# KMix PulseAudio integration is not anywhere near shippable.
+# Almost everything is commented out, it basically does nothing.
+# BuildRequires: pulseaudio-libs-devel
 BuildRequires: taglib-devel
+%if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
+%endif
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
@@ -65,6 +75,9 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+%patch1 -p1 -b .nomplayerthumbs
+
+
 %build
 
 mkdir -p %{_target_platform}
@@ -120,6 +133,7 @@ fi
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
+%{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -151,11 +165,32 @@ fi
 
 
 %changelog
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.2.90-2
+- fix build issue without xine-lib
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Mon May 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Disable BR pulseaudio-libs-devel, KMix PA integration does not work yet.
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 May 2009 14:06:26 -0000	1.64
+++ sources	5 Aug 2009 12:57:43 -0000	1.65
@@ -1 +1 @@
-c35f9581401a13a7c14255d30066e75d  kdemultimedia-4.2.4.tar.bz2
+75c0c42f22f5ffc98262441751ccb247  kdemultimedia-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 12:57:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:57:44 +0000 (UTC)
Subject: rpms/kdemultimedia/F-11 kdemultimedia-4.2.85-nomplayerthumbs.patch, 
	NONE, 1.1 .cvsignore, 1.64, 1.65 kdemultimedia.spec, 1.143,
	1.144 sources, 1.65, 1.66
Message-ID: <20090805125744.6875F11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11839/F-11

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Added Files:
	kdemultimedia-4.2.85-nomplayerthumbs.patch 
Log Message:
kde-4.3.0


kdemultimedia-4.2.85-nomplayerthumbs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdemultimedia-4.2.85-nomplayerthumbs.patch ---
diff -up kdemultimedia-4.2.85/CMakeLists.txt.nomplayerthumbs kdemultimedia-4.2.85/CMakeLists.txt
--- kdemultimedia-4.2.85/CMakeLists.txt.nomplayerthumbs	2009-05-06 19:04:42.000000000 -0500
+++ kdemultimedia-4.2.85/CMakeLists.txt	2009-05-17 10:23:16.895948032 -0500
@@ -39,7 +39,7 @@ add_subdirectory(cmake)
 macro_optional_add_subdirectory(doc)
 add_subdirectory(libkcddb)
 add_subdirectory(libkcompactdisc)
-add_subdirectory(mplayerthumbs)
+#add_subdirectory(mplayerthumbs)
 
 if (TAGLIB_FOUND)
   macro_optional_add_subdirectory(juk)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	30 May 2009 14:06:26 -0000	1.64
+++ .cvsignore	5 Aug 2009 12:57:44 -0000	1.65
@@ -1 +1,5 @@
-kdemultimedia-4.2.4.tar.bz2
+kdemultimedia-4.2.90.tar.bz2
+kdemultimedia-4.2.95.tar.bz2
+kdemultimedia-4.2.96.tar.bz2
+kdemultimedia-4.2.98.tar.bz2
+kdemultimedia-4.3.0.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-11/kdemultimedia.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- kdemultimedia.spec	5 Jun 2009 11:23:27 -0000	1.143
+++ kdemultimedia.spec	5 Aug 2009 12:57:44 -0000	1.144
@@ -1,31 +1,40 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.4
-Release: 2%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 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/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-Patch0:  kdemultimedia-4.2.3-noxine.patch
-# upstream patches
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
+
+## upstream patches
+
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
 # FLAC_OGG_LIBRARY:FILEPATH=FLAC_OGG_LIBRARY-NOTFOUND
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: flac-devel
+BuildRequires: glib2-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: libtheora-devel
 ## needed to build Kscd, keep for now -- Kevin
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
+# KMix PulseAudio integration is not anywhere near shippable.
+# Almost everything is commented out, it basically does nothing.
+# BuildRequires: pulseaudio-libs-devel
 BuildRequires: taglib-devel
-BuildRequires: libxcb-devel
+%if 0%{?fedora}
+BuildRequires: xine-lib-devel libxcb-devel
+%endif
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4 >= %{version}
@@ -65,7 +74,9 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q -n kdemultimedia-%{version}
-%patch0 -p1 -b .xinelib
+
+%patch1 -p1 -b .nomplayerthumbs
+
 
 %build
 
@@ -122,6 +133,7 @@ fi
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
+%{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -153,14 +165,32 @@ fi
 
 
 %changelog
-* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.2.4-2
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.2.90-2
 - fix build issue without xine-lib
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Mon May 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Disable BR pulseaudio-libs-devel, KMix PA integration does not work yet.
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	30 May 2009 14:06:26 -0000	1.65
+++ sources	5 Aug 2009 12:57:44 -0000	1.66
@@ -1 +1 @@
-c35f9581401a13a7c14255d30066e75d  kdemultimedia-4.2.4.tar.bz2
+75c0c42f22f5ffc98262441751ccb247  kdemultimedia-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 12:59:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 12:59:58 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.194,1.195
Message-ID: <20090805125958.0FB4A11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12492

Modified Files:
	kdenetwork.spec 
Log Message:
upstreamable patch



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- kdenetwork.spec	29 Jul 2009 23:17:00 -0000	1.194
+++ kdenetwork.spec	5 Aug 2009 12:59:57 -0000	1.195
@@ -10,6 +10,7 @@ URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: krdc-icons.tar.bz2
 
+## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 # upstream patches (4.3 branch):
 



From rdieter at fedoraproject.org  Wed Aug  5 13:01:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:01:17 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.2.98-kdrc-icon.patch, NONE,
	1.1 .cvsignore, 1.63, 1.64 kdenetwork.spec, 1.172, 1.173 sources,
	1.73, 1.74 kdenetwork-4.1.96-system-libgadu.patch, 1.1,
	NONE kdenetwork-4.2.0-kopete-view-history.patch, 1.1,
	NONE kdenetwork-4.2.0-libv4l.patch, 1.1,
	NONE kdenetwork-4.2.4-kopete-ymsg16.patch, 1.1,
	NONE kdenetwork-4.3.0-krdc-fullscreen-icons.patch, 1.1, NONE
Message-ID: <20090805130117.6660911C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12919/F-10

Modified Files:
	.cvsignore kdenetwork.spec sources 
Added Files:
	kdenetwork-4.2.98-kdrc-icon.patch 
Removed Files:
	kdenetwork-4.1.96-system-libgadu.patch 
	kdenetwork-4.2.0-kopete-view-history.patch 
	kdenetwork-4.2.0-libv4l.patch 
	kdenetwork-4.2.4-kopete-ymsg16.patch 
	kdenetwork-4.3.0-krdc-fullscreen-icons.patch 
Log Message:
kde-4.3.0


kdenetwork-4.2.98-kdrc-icon.patch:
 CMakeLists.txt |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE kdenetwork-4.2.98-kdrc-icon.patch ---
diff -up kdenetwork-4.2.98/krdc/CMakeLists.txt.me kdenetwork-4.2.98/krdc/CMakeLists.txt
--- kdenetwork-4.2.98/krdc/CMakeLists.txt.me	2009-06-17 22:08:12.000000000 +0200
+++ kdenetwork-4.2.98/krdc/CMakeLists.txt	2009-07-24 14:26:34.000000000 +0200
@@ -73,6 +73,8 @@ kde4_add_ui_files(krdc_SRCS
     config/general.ui
 )
 
+kde4_add_app_icon(krdc_SRCS "hi*-apps-krdc.png")
+
 kde4_add_executable(krdc ${krdc_SRCS})
 
 target_link_libraries(krdc
@@ -93,3 +95,5 @@ install(FILES pointcursor.png pointcurso
 if(NOT INSIDE_KDENETWORK)
     macro_display_feature_log()
 endif(NOT INSIDE_KDENETWORK)
+
+kde4_install_icons( ${ICON_INSTALL_DIR}   )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	30 May 2009 14:10:54 -0000	1.63
+++ .cvsignore	5 Aug 2009 13:01:16 -0000	1.64
@@ -1 +1,6 @@
-kdenetwork-4.2.4.tar.bz2
+kdenetwork-4.2.90.tar.bz2
+kdenetwork-4.2.95.tar.bz2
+kdenetwork-4.2.96.tar.bz2
+kdenetwork-4.2.98.tar.bz2
+krdc-icons.tar.bz2
+kdenetwork-4.3.0.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- kdenetwork.spec	7 Jul 2009 10:38:31 -0000	1.172
+++ kdenetwork.spec	5 Aug 2009 13:01:17 -0000	1.173
@@ -1,25 +1,18 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.2.4
-Release: 4%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdenetwork-4.2.0-libv4l.patch
+Source1: krdc-icons.tar.bz2
 
-# 4.2 upstream patches
-# implement YMSG 16 protocol to allow logging into Yahoo! again (Matt Rogers)
-Patch100: kdenetwork-4.2.4-kopete-ymsg16.patch
-
-# build Kopete against the system libgadu (backported from 4.3)
-# http://websvn.kde.org/?view=rev&revision=909144
-# http://websvn.kde.org/?view=rev&revision=909145
-Patch200: kdenetwork-4.1.96-system-libgadu.patch
-Patch201: kdenetwork-4.2.0-kopete-view-history.patch
-Patch202: kdenetwork-4.3.0-krdc-fullscreen-icons.patch
+## upstream me!  -- Rex :)
+Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+# upstream patches (4.3 branch):
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +23,7 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
+BuildRequires: kdelibs-experimental >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -53,6 +47,7 @@ BuildRequires: libv4l-devel
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: mozilla-filesystem
 
 # kopete/yahoo
 Requires(hint): jasper
@@ -93,21 +88,19 @@ Requires: kdelibs4-devel
 
 
 %prep
-%setup -q
-%patch1 -p1 -b .libv4l
-# 4.2 upstream patches
-%patch100 -p0 -b .kopete-ymsg16
-chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+%setup -q -a 1
+%patch1 -p1 -b .icon
+
 # 4.3 upstream patches
-%patch200 -p0 -b .system-libgadu
-rm -rf kopete/protocols/gadu/libgadu/
-%patch201 -p1 -b .kopete-view-history
-%patch202 -p1 -b .krdc-fullscreen-icons
+chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -170,7 +163,8 @@ fi
 %{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
+%{_libdir}/mozilla/plugins/libskypebuttons.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -180,25 +174,35 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/kopete/
+%{_kde4_includedir}/krdc/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 
 
 %changelog
-* Tue Jul  7 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-4
-- #505237 -  Upstream patch for KRDC full screen icons
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-* Thu Jun 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
-- implement YMSG 16 protocol to allow logging into Yahoo! again (upstream patch)
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Mon Jun  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- respun tarball
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-3
+- BR: kdelibs-experimental
+
+* Thu Jun 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.90-2
+- implement YMSG 16 protocol to allow logging into Yahoo! again (upstream patch)
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	1 Jun 2009 11:52:31 -0000	1.73
+++ sources	5 Aug 2009 13:01:17 -0000	1.74
@@ -1 +1,2 @@
-3071bbb1a24c62b81593e76187a84fb6  kdenetwork-4.2.4.tar.bz2
+7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
+f9695ff06d0d67a78a71fb9b3ddbd4f3  kdenetwork-4.3.0.tar.bz2


--- kdenetwork-4.1.96-system-libgadu.patch DELETED ---


--- kdenetwork-4.2.0-kopete-view-history.patch DELETED ---


--- kdenetwork-4.2.0-libv4l.patch DELETED ---


--- kdenetwork-4.2.4-kopete-ymsg16.patch DELETED ---


--- kdenetwork-4.3.0-krdc-fullscreen-icons.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:01:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:01:17 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork-4.2.98-kdrc-icon.patch, NONE,
	1.1 .cvsignore, 1.67, 1.68 kdenetwork.spec, 1.190, 1.191 sources,
	1.74, 1.75 kdenetwork-4.1.96-system-libgadu.patch, 1.1,
	NONE kdenetwork-4.2.0-kopete-view-history.patch, 1.1,
	NONE kdenetwork-4.2.0-libv4l.patch, 1.1,
	NONE kdenetwork-4.2.4-kopete-ymsg16.patch, 1.1,
	NONE kdenetwork-4.3.0-krdc-fullscreen-icons.patch, 1.1, NONE
Message-ID: <20090805130117.D3B7511C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12919/F-11

Modified Files:
	.cvsignore kdenetwork.spec sources 
Added Files:
	kdenetwork-4.2.98-kdrc-icon.patch 
Removed Files:
	kdenetwork-4.1.96-system-libgadu.patch 
	kdenetwork-4.2.0-kopete-view-history.patch 
	kdenetwork-4.2.0-libv4l.patch 
	kdenetwork-4.2.4-kopete-ymsg16.patch 
	kdenetwork-4.3.0-krdc-fullscreen-icons.patch 
Log Message:
kde-4.3.0


kdenetwork-4.2.98-kdrc-icon.patch:
 CMakeLists.txt |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE kdenetwork-4.2.98-kdrc-icon.patch ---
diff -up kdenetwork-4.2.98/krdc/CMakeLists.txt.me kdenetwork-4.2.98/krdc/CMakeLists.txt
--- kdenetwork-4.2.98/krdc/CMakeLists.txt.me	2009-06-17 22:08:12.000000000 +0200
+++ kdenetwork-4.2.98/krdc/CMakeLists.txt	2009-07-24 14:26:34.000000000 +0200
@@ -73,6 +73,8 @@ kde4_add_ui_files(krdc_SRCS
     config/general.ui
 )
 
+kde4_add_app_icon(krdc_SRCS "hi*-apps-krdc.png")
+
 kde4_add_executable(krdc ${krdc_SRCS})
 
 target_link_libraries(krdc
@@ -93,3 +95,5 @@ install(FILES pointcursor.png pointcurso
 if(NOT INSIDE_KDENETWORK)
     macro_display_feature_log()
 endif(NOT INSIDE_KDENETWORK)
+
+kde4_install_icons( ${ICON_INSTALL_DIR}   )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	30 May 2009 14:10:54 -0000	1.67
+++ .cvsignore	5 Aug 2009 13:01:17 -0000	1.68
@@ -1 +1,6 @@
-kdenetwork-4.2.4.tar.bz2
+kdenetwork-4.2.90.tar.bz2
+kdenetwork-4.2.95.tar.bz2
+kdenetwork-4.2.96.tar.bz2
+kdenetwork-4.2.98.tar.bz2
+krdc-icons.tar.bz2
+kdenetwork-4.3.0.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- kdenetwork.spec	7 Jul 2009 10:38:31 -0000	1.190
+++ kdenetwork.spec	5 Aug 2009 13:01:17 -0000	1.191
@@ -1,25 +1,18 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.2.4
-Release: 4%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdenetwork-4.2.0-libv4l.patch
+Source1: krdc-icons.tar.bz2
 
-# 4.2 upstream patches
-# implement YMSG 16 protocol to allow logging into Yahoo! again (Matt Rogers)
-Patch100: kdenetwork-4.2.4-kopete-ymsg16.patch
-
-# build Kopete against the system libgadu (backported from 4.3)
-# http://websvn.kde.org/?view=rev&revision=909144
-# http://websvn.kde.org/?view=rev&revision=909145
-Patch200: kdenetwork-4.1.96-system-libgadu.patch
-Patch201: kdenetwork-4.2.0-kopete-view-history.patch
-Patch202: kdenetwork-4.3.0-krdc-fullscreen-icons.patch
+## upstream me!  -- Rex :)
+Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+# upstream patches (4.3 branch):
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +23,7 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
+BuildRequires: kdelibs-experimental >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -53,6 +47,7 @@ BuildRequires: libv4l-devel
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: mozilla-filesystem
 
 # kopete/yahoo
 Requires(hint): jasper
@@ -93,21 +88,19 @@ Requires: kdelibs4-devel
 
 
 %prep
-%setup -q
-%patch1 -p1 -b .libv4l
-# 4.2 upstream patches
-%patch100 -p0 -b .kopete-ymsg16
-chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+%setup -q -a 1
+%patch1 -p1 -b .icon
+
 # 4.3 upstream patches
-%patch200 -p0 -b .system-libgadu
-rm -rf kopete/protocols/gadu/libgadu/
-%patch201 -p1 -b .kopete-view-history
-%patch202 -p1 -b .krdc-fullscreen-icons
+chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -170,7 +163,8 @@ fi
 %{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
+%{_libdir}/mozilla/plugins/libskypebuttons.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -180,25 +174,35 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/kopete/
+%{_kde4_includedir}/krdc/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 
 
 %changelog
-* Tue Jul  7 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-4
-- #505237 -  Upstream patch for KRDC full screen icons
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-* Thu Jun 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
-- implement YMSG 16 protocol to allow logging into Yahoo! again (upstream patch)
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Mon Jun  1 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- respun tarball
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-3
+- BR: kdelibs-experimental
+
+* Thu Jun 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.90-2
+- implement YMSG 16 protocol to allow logging into Yahoo! again (upstream patch)
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-11/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	1 Jun 2009 11:52:32 -0000	1.74
+++ sources	5 Aug 2009 13:01:17 -0000	1.75
@@ -1 +1,2 @@
-3071bbb1a24c62b81593e76187a84fb6  kdenetwork-4.2.4.tar.bz2
+7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
+f9695ff06d0d67a78a71fb9b3ddbd4f3  kdenetwork-4.3.0.tar.bz2


--- kdenetwork-4.1.96-system-libgadu.patch DELETED ---


--- kdenetwork-4.2.0-kopete-view-history.patch DELETED ---


--- kdenetwork-4.2.0-libv4l.patch DELETED ---


--- kdenetwork-4.2.4-kopete-ymsg16.patch DELETED ---


--- kdenetwork-4.3.0-krdc-fullscreen-icons.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:04:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:04:05 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch,
	NONE, 1.1 .cvsignore, 1.12, 1.13 kdeplasma-addons.spec, 1.17,
	1.18 sources, 1.13,
	1.14 kdeplasma-addons-4.2.1-lancelot-qt45.patch, 1.1,
	NONE kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch, 1.1, NONE
Message-ID: <20090805130405.F23B511C008C@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-serv13736/F-10

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Added Files:
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch 
Removed Files:
	kdeplasma-addons-4.2.1-lancelot-qt45.patch 
	kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch 
Log Message:
kde-4.3.0


kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch:
 plasma-runner-contacts.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch ---
diff -up kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop
--- kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner	2009-03-26 09:43:17.000000000 -0500
+++ kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop	2009-04-30 14:43:36.820331028 -0500
@@ -92,4 +92,3 @@ X-KDE-PluginInfo-Email=tpr at iki.fi
 X-KDE-PluginInfo-Name=kabccontacts
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	31 May 2009 14:29:48 -0000	1.12
+++ .cvsignore	5 Aug 2009 13:04:05 -0000	1.13
@@ -1 +1,5 @@
-kdeplasma-addons-4.2.4.tar.bz2
+kdeplasma-addons-4.2.90.tar.bz2
+kdeplasma-addons-4.2.95.tar.bz2
+kdeplasma-addons-4.2.96.tar.bz2
+kdeplasma-addons-4.2.98.tar.bz2
+kdeplasma-addons-4.3.0.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kdeplasma-addons.spec	31 May 2009 14:29:48 -0000	1.17
+++ kdeplasma-addons.spec	5 Aug 2009 13:04:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.2.4
-Release:        1%{?dist}
+Version:        4.3.0
+Release:        5%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -9,23 +9,34 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://ivan.fomentgroup.org/blog/2009/03/09/patch-for-lancelot-and-qt4/
-# http://bugs.gentoo.org/258758
-Patch0:         kdeplasma-addons-4.2.1-lancelot-qt45.patch
-# http://bugzilla.redhat.com/497659
-Patch1:         kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch
+## upstreamable patches
+# disable contacts krunner that induces mostly needless kres-migrator and
+# akonadi launch on first login
+Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
+
+## upstream patches
 
 BuildRequires:  boost-devel
+BuildRequires:  eigen2-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
-# for libplasmaclock
+# for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
+# RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
+BuildRequires:  kdeedu-devel >= %{version}
 %if 0%{?fedora} > 9
 # Optional (but recommended), enables automatic rotation for frame applet
 BuildRequires:  libkexiv2-devel >= 0.4.0
+# lancelot eye-candy
+BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
 %endif
-BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  qimageblitz-devel
+BuildRequires:  soprano-devel
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+# when -libs was introduced
+Obsoletes: kdeplasma-addons < 4.3.0-3
 
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
@@ -39,21 +50,27 @@ Provides: kdeplasmoids = %{version}-%{re
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Obsoletes: kde-plasma-weather < 1.0.0-100
+Provides: kde-plasma-weather = 1.0.0-100
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 Additional plasmoids for KDE.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
-%if 0%{?_qt45:1}
-%patch0 -p0 -b .lancelot-qt45
-%patch1 -p1 -b .rssnow_qt451_hack
-%endif
+
+%patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
 
 
 %build
@@ -72,26 +89,34 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
-# omit -devel type stuff, for now
+# 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
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -103,32 +128,78 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/lancelot
 %{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
+%{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
-%{_kde4_appsdir}/plasma-bluemarble/
+%{_kde4_appsdir}/plasma-applet-opendesktop/
+%{_kde4_appsdir}/plasma_pastebin/
+%{_kde4_appsdir}/plasma_wallpaper_pattern/
 %{_kde4_appsdir}/rssnow/
-%{_kde4_datadir}/config/comic.knsrc
+%{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/liblancelot.so.*
-%{_kde4_libdir}/libplasmaconverter.so.*
-%{_kde4_libdir}/libplasmacomicprovidercore.so.*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libconversion.so.*
+%{_kde4_libdir}/libocsclient.so.*
+%{_kde4_libdir}/liblancelot.so.*
+%{_kde4_libdir}/libplasmapotdprovidercore.so.*
+%{_kde4_libdir}/libplasmacomicprovidercore.so.*
+%{_kde4_libdir}/libplasmaweather.so.*
+%{_kde4_libdir}/librtm.so.*
+
 
 %changelog
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- fix microblog post crasher (kdebug#202364)
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- -libs subpkg to sanitize multilib
+
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- fix to allow updating of status via microblog plasmoid 
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- BR: libXcomposite-devel (lancelot eye-candy)
+
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Mon May 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-4
+- BR: eigen2-devel soprano-devel
+
+* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- BR kdeedu-devel (for Marble)
+
+* Sun May 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Obsoletes/Provides: kde-plasma-weather
 
-* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- hack around rssnow+qt-4.5.1 bugosity (kde#190651,rhbz#497659)
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Fri May 08 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- disable contacts krunner by default
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	31 May 2009 14:29:48 -0000	1.13
+++ sources	5 Aug 2009 13:04:05 -0000	1.14
@@ -1 +1 @@
-8cd684126de488203f644bb59af60ac2  kdeplasma-addons-4.2.4.tar.bz2
+74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2


--- kdeplasma-addons-4.2.1-lancelot-qt45.patch DELETED ---


--- kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:04:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:04:06 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch,
	NONE, 1.1 .cvsignore, 1.15, 1.16 kdeplasma-addons.spec, 1.35,
	1.36 sources, 1.14,
	1.15 kdeplasma-addons-4.2.1-lancelot-qt45.patch, 1.1,
	NONE kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch, 1.1,
	NONE kdeplasma-addons-4.2.4-no_bluemarble.patch, 1.1, NONE
Message-ID: <20090805130406.54EA511C008C@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-serv13736/F-11

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Added Files:
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch 
Removed Files:
	kdeplasma-addons-4.2.1-lancelot-qt45.patch 
	kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch 
	kdeplasma-addons-4.2.4-no_bluemarble.patch 
Log Message:
kde-4.3.0


kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch:
 plasma-runner-contacts.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch ---
diff -up kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop
--- kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner	2009-03-26 09:43:17.000000000 -0500
+++ kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop	2009-04-30 14:43:36.820331028 -0500
@@ -92,4 +92,3 @@ X-KDE-PluginInfo-Email=tpr at iki.fi
 X-KDE-PluginInfo-Name=kabccontacts
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	31 May 2009 14:29:49 -0000	1.15
+++ .cvsignore	5 Aug 2009 13:04:05 -0000	1.16
@@ -1 +1,5 @@
-kdeplasma-addons-4.2.4.tar.bz2
+kdeplasma-addons-4.2.90.tar.bz2
+kdeplasma-addons-4.2.95.tar.bz2
+kdeplasma-addons-4.2.96.tar.bz2
+kdeplasma-addons-4.2.98.tar.bz2
+kdeplasma-addons-4.3.0.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- kdeplasma-addons.spec	18 Jun 2009 13:59:01 -0000	1.35
+++ kdeplasma-addons.spec	5 Aug 2009 13:04:06 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.2.4
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        5%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -9,25 +9,34 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://ivan.fomentgroup.org/blog/2009/03/09/patch-for-lancelot-and-qt4/
-# http://bugs.gentoo.org/258758
-Patch0:         kdeplasma-addons-4.2.1-lancelot-qt45.patch
-# http://bugzilla.redhat.com/497659
-Patch1:         kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch
-# omit bluemarble
-Patch2:         kdeplasma-addons-4.2.4-no_bluemarble.patch
+## upstreamable patches
+# disable contacts krunner that induces mostly needless kres-migrator and
+# akonadi launch on first login
+Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
+
+## upstream patches
 
 BuildRequires:  boost-devel
+BuildRequires:  eigen2-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
-# for libplasmaclock
+# for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
+# RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
+BuildRequires:  kdeedu-devel >= %{version}
 %if 0%{?fedora} > 9
 # Optional (but recommended), enables automatic rotation for frame applet
 BuildRequires:  libkexiv2-devel >= 0.4.0
+# lancelot eye-candy
+BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
 %endif
-BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  qimageblitz-devel
+BuildRequires:  soprano-devel
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+# when -libs was introduced
+Obsoletes: kdeplasma-addons < 4.3.0-3
 
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
@@ -41,22 +50,27 @@ Provides: kdeplasmoids = %{version}-%{re
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Obsoletes: kde-plasma-weather < 1.0.0-100
+Provides: kde-plasma-weather = 1.0.0-100
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 Additional plasmoids for KDE.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
-%if 0%{?_qt45:1}
-%patch0 -p0 -b .lancelot-qt45
-%patch1 -p1 -b .rssnow_qt451_hack
-%endif
-%patch2 -p1 -b .no_bluemarble
+
+%patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
 
 
 %build
@@ -75,26 +89,34 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
-# omit -devel type stuff, for now
+# 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
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -106,34 +128,78 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/lancelot
 %{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
+%{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-applet-opendesktop/
+%{_kde4_appsdir}/plasma_pastebin/
+%{_kde4_appsdir}/plasma_wallpaper_pattern/
 %{_kde4_appsdir}/rssnow/
-%{_kde4_datadir}/config/comic.knsrc
+%{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/liblancelot.so.*
-%{_kde4_libdir}/libplasmaconverter.so.*
-%{_kde4_libdir}/libplasmacomicprovidercore.so.*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libconversion.so.*
+%{_kde4_libdir}/libocsclient.so.*
+%{_kde4_libdir}/liblancelot.so.*
+%{_kde4_libdir}/libplasmapotdprovidercore.so.*
+%{_kde4_libdir}/libplasmacomicprovidercore.so.*
+%{_kde4_libdir}/libplasmaweather.so.*
+%{_kde4_libdir}/librtm.so.*
+
 
 %changelog
-* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
-- drop bluemarble applet
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- fix microblog post crasher (kdebug#202364)
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- -libs subpkg to sanitize multilib
+
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- fix to allow updating of status via microblog plasmoid 
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- BR: libXcomposite-devel (lancelot eye-candy)
+
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Mon May 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-4
+- BR: eigen2-devel soprano-devel
+
+* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- BR kdeedu-devel (for Marble)
 
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sun May 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Obsoletes/Provides: kde-plasma-weather
 
-* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- hack around rssnow+qt-4.5.1 bugosity (kde#190651,rhbz#497659)
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Fri May 08 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- disable contacts krunner by default
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	31 May 2009 14:29:50 -0000	1.14
+++ sources	5 Aug 2009 13:04:06 -0000	1.15
@@ -1 +1 @@
-8cd684126de488203f644bb59af60ac2  kdeplasma-addons-4.2.4.tar.bz2
+74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2


--- kdeplasma-addons-4.2.1-lancelot-qt45.patch DELETED ---


--- kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch DELETED ---


--- kdeplasma-addons-4.2.4-no_bluemarble.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:06:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:06:17 +0000 (UTC)
Subject: rpms/kdepim/F-10 .cvsignore, 1.63, 1.64 kdepim.spec, 1.212,
	1.213 sources, 1.72, 1.73 kdepim-4.2.patch, 1.1, NONE
Message-ID: <20090805130617.AF09B11C034A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14471/F-10

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.2.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	2 Jun 2009 10:14:26 -0000	1.63
+++ .cvsignore	5 Aug 2009 13:06:17 -0000	1.64
@@ -1 +1,5 @@
-kdepim-4.2.4.tar.bz2
+kdepim-4.2.90.tar.bz2
+kdepim-4.2.95.tar.bz2
+kdepim-4.2.96.tar.bz2
+kdepim-4.2.98.tar.bz2
+kdepim-4.3.0.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- kdepim.spec	26 Jun 2009 10:55:34 -0000	1.212
+++ kdepim.spec	5 Aug 2009 13:06:17 -0000	1.213
@@ -5,18 +5,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.2.4
-Release: 2%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
-URL:	   http://www.kde.org/
+URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# 4.2 upstream patches
-# Patch100, GPGME 1.2.0 will break crypto in kdepim,
-# https://bugs.kde.org/show_bug.cgi?id=197458
-Patch100: kdepim-4.2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +20,11 @@ Provides: kdepim4 = %{version}-%{release
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
+# Upgrade path
+%if 0%{?fedora} < 12
+Requires: kdepim-runtime >= %{version}
+%endif
+
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -32,6 +33,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -80,7 +82,7 @@ Install %{name}-devel if you want to wri
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-#Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -91,8 +93,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 
-# 4.2 upstream patches
-%patch100 -p0 -b .kde197458
+# omit conflict with oxygen-icons, working on a better long-term fix with
+# oxygen folk to get all the icons/temporary stuff out of kdepim
+rm -fv icons/temporary/ox16-status-meeting-organizer.png
+
 
 %build
 mkdir -p %{_target_platform}
@@ -108,9 +112,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# conflict with oxygen-icon-theme
-rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
-
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
 pushd %{buildroot}%{_docdir}/HTML/en
@@ -163,7 +164,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/akonadi/agents/*.desktop
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
@@ -172,7 +172,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
-%{_mandir}/man1/kabcclient.1*
 
 %files libs
 %defattr(-,root,root,-)
@@ -189,14 +188,33 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.4-2
-- fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3 
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-2
+- Requires: kdepim-runtime (< F-12)
+
+* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.2.90-1
+- KDE 4.3 Beta 2
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- fix meeting-organizer icon conflict with oxygen-icons
+- -libs: (re)add dep on kdelibs4
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
 - drop extraneous BR's, including libmal-devel (not currently used)
@@ -214,7 +232,7 @@ rm -rf %{buildroot}
 - upstream korganizer-view patch
 
 * Wed Mar 04 2009 Than Ngo <than at redhat.com> - 4.2.1-2
-- upstream patch, speed up folder syncing 
+- upstream patch, speed up folder syncing
 
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	2 Jun 2009 10:14:26 -0000	1.72
+++ sources	5 Aug 2009 13:06:17 -0000	1.73
@@ -1 +1 @@
-e3b14bea173511628767475f0dbfb6ac  kdepim-4.2.4.tar.bz2
+ddc887f19ef9cd454f4f3226c955aaaf  kdepim-4.3.0.tar.bz2


--- kdepim-4.2.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:06:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:06:18 +0000 (UTC)
Subject: rpms/kdepim/F-11 .cvsignore, 1.63, 1.64 kdepim.spec, 1.218,
	1.219 sources, 1.71, 1.72 kdepim-4.2.patch, 1.1, NONE
Message-ID: <20090805130618.5D14A11C0439@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14471/F-11

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.2.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	31 May 2009 15:21:26 -0000	1.63
+++ .cvsignore	5 Aug 2009 13:06:17 -0000	1.64
@@ -1 +1,5 @@
-kdepim-4.2.4.tar.bz2
+kdepim-4.2.90.tar.bz2
+kdepim-4.2.95.tar.bz2
+kdepim-4.2.96.tar.bz2
+kdepim-4.2.98.tar.bz2
+kdepim-4.3.0.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- kdepim.spec	26 Jun 2009 10:47:47 -0000	1.218
+++ kdepim.spec	5 Aug 2009 13:06:18 -0000	1.219
@@ -5,18 +5,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.2.4
-Release: 2%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
-URL:	   http://www.kde.org/
+URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# 4.2 upstream patches
-# Patch100, GPGME 1.2.0 will break crypto in kdepim,
-# https://bugs.kde.org/show_bug.cgi?id=197458
-Patch100: kdepim-4.2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +20,11 @@ Provides: kdepim4 = %{version}-%{release
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
+# Upgrade path
+%if 0%{?fedora} < 12
+Requires: kdepim-runtime >= %{version}
+%endif
+
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -32,6 +33,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel
 BuildRequires: libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -80,7 +82,7 @@ Install %{name}-devel if you want to wri
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-#Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -91,8 +93,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 
-# 4.2 upstream patches
-%patch100 -p0 -b .kde197458
+# omit conflict with oxygen-icons, working on a better long-term fix with
+# oxygen folk to get all the icons/temporary stuff out of kdepim
+rm -fv icons/temporary/ox16-status-meeting-organizer.png
+
 
 %build
 mkdir -p %{_target_platform}
@@ -108,9 +112,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# conflict with oxygen-icon-theme
-rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
-
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
 pushd %{buildroot}%{_docdir}/HTML/en
@@ -163,7 +164,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/akonadi/agents/*.desktop
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/config.kcfg/*
@@ -172,7 +172,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
-%{_mandir}/man1/kabcclient.1*
 
 %files libs
 %defattr(-,root,root,-)
@@ -189,14 +188,33 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.4-2
-- fix the incompatible change in GPGME 1.2.0, it will break crypto in kdepim (upstream patch)
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3 
+
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-2
+- Requires: kdepim-runtime (< F-12)
+
+* Mon Jun 29 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.2.90-1
+- KDE 4.3 Beta 2
 
-* Sat May 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- fix meeting-organizer icon conflict with oxygen-icons
+- -libs: (re)add dep on kdelibs4
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Mon Apr 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
 - drop extraneous BR's, including libmal-devel (not currently used)
@@ -214,7 +232,7 @@ rm -rf %{buildroot}
 - upstream korganizer-view patch
 
 * Wed Mar 04 2009 Than Ngo <than at redhat.com> - 4.2.1-2
-- upstream patch, speed up folder syncing 
+- upstream patch, speed up folder syncing
 
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	31 May 2009 15:21:26 -0000	1.71
+++ sources	5 Aug 2009 13:06:18 -0000	1.72
@@ -1 +1 @@
-e3b14bea173511628767475f0dbfb6ac  kdepim-4.2.4.tar.bz2
+ddc887f19ef9cd454f4f3226c955aaaf  kdepim-4.3.0.tar.bz2


--- kdepim-4.2.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:07:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:07:46 +0000 (UTC)
Subject: rpms/kdesdk/F-10 .cvsignore, 1.56, 1.57 kdesdk.spec, 1.132,
	1.133 sources, 1.59, 1.60
Message-ID: <20090805130746.163D311C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14984/F-10

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	31 May 2009 14:42:08 -0000	1.56
+++ .cvsignore	5 Aug 2009 13:07:45 -0000	1.57
@@ -1 +1,5 @@
-kdesdk-4.2.4.tar.bz2
+kdesdk-4.2.90.tar.bz2
+kdesdk-4.2.95.tar.bz2
+kdesdk-4.2.96.tar.bz2
+kdesdk-4.2.98.tar.bz2
+kdesdk-4.3.0.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- kdesdk.spec	3 Jun 2009 12:37:31 -0000	1.132
+++ kdesdk.spec	5 Aug 2009 13:07:45 -0000	1.133
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -223,14 +223,23 @@ fi
 
 
 %changelog
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- restore blockquote patch (#487624)
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Thu May 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	31 May 2009 14:42:08 -0000	1.59
+++ sources	5 Aug 2009 13:07:45 -0000	1.60
@@ -1 +1 @@
-fb0672edb1e24859614935764ef4e8d3  kdesdk-4.2.4.tar.bz2
+eda2376a54d66899bf7beb60cc0843b1  kdesdk-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 13:07:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:07:46 +0000 (UTC)
Subject: rpms/kdesdk/F-11 .cvsignore, 1.59, 1.60 kdesdk.spec, 1.147,
	1.148 sources, 1.60, 1.61
Message-ID: <20090805130746.4AD1B11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14984/F-11

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-11/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	31 May 2009 14:42:08 -0000	1.59
+++ .cvsignore	5 Aug 2009 13:07:46 -0000	1.60
@@ -1 +1,5 @@
-kdesdk-4.2.4.tar.bz2
+kdesdk-4.2.90.tar.bz2
+kdesdk-4.2.95.tar.bz2
+kdesdk-4.2.96.tar.bz2
+kdesdk-4.2.98.tar.bz2
+kdesdk-4.3.0.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-11/kdesdk.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdesdk.spec	3 Jun 2009 12:37:32 -0000	1.147
+++ kdesdk.spec	5 Aug 2009 13:07:46 -0000	1.148
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -223,14 +223,23 @@ fi
 
 
 %changelog
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- restore blockquote patch (#487624)
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Thu May 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-11/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	31 May 2009 14:42:09 -0000	1.60
+++ sources	5 Aug 2009 13:07:46 -0000	1.61
@@ -1 +1 @@
-fb0672edb1e24859614935764ef4e8d3  kdesdk-4.2.4.tar.bz2
+eda2376a54d66899bf7beb60cc0843b1  kdesdk-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 13:09:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:09:13 +0000 (UTC)
Subject: rpms/kdetoys/F-10 .cvsignore, 1.32, 1.33 kdetoys.spec, 1.42,
	1.43 sources, 1.32, 1.33 kdetoys-4.2.0-dt_fixes.patch, 1.1, NONE
Message-ID: <20090805130913.93D8911C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15326/F-10

Modified Files:
	.cvsignore kdetoys.spec sources 
Removed Files:
	kdetoys-4.2.0-dt_fixes.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	31 May 2009 15:03:58 -0000	1.32
+++ .cvsignore	5 Aug 2009 13:09:13 -0000	1.33
@@ -1 +1,5 @@
-kdetoys-4.2.4.tar.bz2
+kdetoys-4.2.90.tar.bz2
+kdetoys-4.2.95.tar.bz2
+kdetoys-4.2.96.tar.bz2
+kdetoys-4.2.98.tar.bz2
+kdetoys-4.3.0.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kdetoys.spec	31 May 2009 15:03:58 -0000	1.42
+++ kdetoys.spec	5 Aug 2009 13:09:13 -0000	1.43
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -10,8 +10,7 @@ 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)
 
-# upstreamable patches
-Patch50: kdetoys-4.2.0-dt_fixes.patch
+# upstream patches
 
 # need kdebase-workspace-devel for KTux
 BuildRequires: kdebase-workspace-devel >= %{version}
@@ -36,8 +35,6 @@ Requires(postun): /sbin/ldconfig
 %prep
 %setup -q
 
-%patch50 -p1 -b .dt_fixes
-
 
 %build
 
@@ -89,11 +86,23 @@ fi
 
 
 %changelog
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu May 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	31 May 2009 15:03:58 -0000	1.32
+++ sources	5 Aug 2009 13:09:13 -0000	1.33
@@ -1 +1 @@
-57aca161a82d6f599132014d6d6b51db  kdetoys-4.2.4.tar.bz2
+6975e332bdd1cdf60b8509c544cedb06  kdetoys-4.3.0.tar.bz2


--- kdetoys-4.2.0-dt_fixes.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:09:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:09:13 +0000 (UTC)
Subject: rpms/kdetoys/F-11 .cvsignore, 1.36, 1.37 kdetoys.spec, 1.52,
	1.53 sources, 1.33, 1.34 kdetoys-4.2.0-dt_fixes.patch, 1.3, NONE
Message-ID: <20090805130913.CA7F011C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15326/F-11

Modified Files:
	.cvsignore kdetoys.spec sources 
Removed Files:
	kdetoys-4.2.0-dt_fixes.patch 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	31 May 2009 15:04:00 -0000	1.36
+++ .cvsignore	5 Aug 2009 13:09:13 -0000	1.37
@@ -1 +1,5 @@
-kdetoys-4.2.4.tar.bz2
+kdetoys-4.2.90.tar.bz2
+kdetoys-4.2.95.tar.bz2
+kdetoys-4.2.96.tar.bz2
+kdetoys-4.2.98.tar.bz2
+kdetoys-4.3.0.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-11/kdetoys.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- kdetoys.spec	31 May 2009 15:04:00 -0000	1.52
+++ kdetoys.spec	5 Aug 2009 13:09:13 -0000	1.53
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -10,8 +10,7 @@ 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)
 
-# upstreamable patches
-Patch50: kdetoys-4.2.0-dt_fixes.patch
+# upstream patches
 
 # need kdebase-workspace-devel for KTux
 BuildRequires: kdebase-workspace-devel >= %{version}
@@ -36,8 +35,6 @@ Requires(postun): /sbin/ldconfig
 %prep
 %setup -q
 
-%patch50 -p1 -b .dt_fixes
-
 
 %build
 
@@ -89,11 +86,23 @@ fi
 
 
 %changelog
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu May 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	31 May 2009 15:04:00 -0000	1.33
+++ sources	5 Aug 2009 13:09:13 -0000	1.34
@@ -1 +1 @@
-57aca161a82d6f599132014d6d6b51db  kdetoys-4.2.4.tar.bz2
+6975e332bdd1cdf60b8509c544cedb06  kdetoys-4.3.0.tar.bz2


--- kdetoys-4.2.0-dt_fixes.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:12:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:12:35 +0000 (UTC)
Subject: rpms/kdeutils/F-10 kdeutils-4.2.85-pykde4.patch, NONE,
	1.1 .cvsignore, 
	1.59, 1.60 kdeutils.spec, 1.158, 1.159 sources, 1.63,
	1.64 kdeutils-4.2.2-pykde4.patch, 1.1,
	NONE kdeutils-4.2.4-ark_servicepack.patch, 1.1, NONE
Message-ID: <20090805131235.C0C8911C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16176/F-10

Modified Files:
	.cvsignore kdeutils.spec sources 
Added Files:
	kdeutils-4.2.85-pykde4.patch 
Removed Files:
	kdeutils-4.2.2-pykde4.patch 
	kdeutils-4.2.4-ark_servicepack.patch 
Log Message:
kde-4.3.0


kdeutils-4.2.85-pykde4.patch:
 CMakeLists.txt |   21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

--- NEW FILE kdeutils-4.2.85-pykde4.patch ---
diff -up kdeutils-4.2.85/printer-applet/CMakeLists.txt.pykde4 kdeutils-4.2.85/printer-applet/CMakeLists.txt
--- kdeutils-4.2.85/printer-applet/CMakeLists.txt.pykde4	2009-04-28 08:45:59.000000000 -0500
+++ kdeutils-4.2.85/printer-applet/CMakeLists.txt	2009-05-17 10:03:09.381947455 -0500
@@ -4,24 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE4)
-IF(NOT PYKDE4_FOUND)
-    macro_log_feature(PYKDE4_FOUND "PyKDE4" "PyKDE4 was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE4_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	31 May 2009 15:10:22 -0000	1.59
+++ .cvsignore	5 Aug 2009 13:12:35 -0000	1.60
@@ -1 +1,5 @@
-kdeutils-4.2.4.tar.bz2
+kdeutils-4.2.90.tar.bz2
+kdeutils-4.2.95.tar.bz2
+kdeutils-4.2.96.tar.bz2
+kdeutils-4.2.98.tar.bz2
+kdeutils-4.3.0.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- kdeutils.spec	4 Jun 2009 15:05:18 -0000	1.158
+++ kdeutils.spec	5 Aug 2009 13:12:35 -0000	1.159
@@ -1,12 +1,10 @@
-%if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
-%define include_kjots 1
-%endif
+# define to include applet
+%define printer_applet 1
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.4
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -14,69 +12,74 @@ Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%if 0%{?include_kjots}
-Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
-%endif
-Patch1:         kdeutils-4.2.2-pykde4.patch
-# upstream fixes
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-# http://bugzilla.redhat.com/504136
-Patch50: kdeutils-4.2.4-ark_servicepack.patch
+Patch1:         kdeutils-4.2.85-pykde4.patch
+
+## upstreamed patches
+
+## upstream fixes
+
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
+BuildRequires:  desktop-file-utils
+BuildRequires:  kdelibs-experimental-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
-BuildRequires:  python
+BuildRequires:  python-devel python
+BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
-
+%if 0%{?printer_applet}
 %if 0%{?fedora} < 11
 # upgrade path so it doesn't get lost
 Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
 %endif
+%else
+Obsoletes: %{name}-printer-applet < %{epoch}:%{version}-%{release}
+%endif
 
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 6:4.0.0
-Obsoletes: kdeutils-libs < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
+Obsoletes: kdeutils < 6:4.3.0-2
+
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description
 Utilities for the K Desktop Environment.
 Includes:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-%if 0%{?include_kjots}
-  * kjots (note taker)
-%endif
-  * ktimer (task scheduler)
-  * kwalletmanager (kde wallet management Tool)
-  * kwikdisk (removable media utility)
-  * okteta (binary/hex editor)
+  * ark: tar/gzip archive manager
+  * kcalc: scientific calculator
+  * kcharselect: character selector
+  * kdelirc: Linux Infrared Remote Control frontend 
+  * kdessh: ssh front end
+  * kdf: view disk usage
+  * kfloppy: floppy formatting tool
+  * kgpg: gpg gui
+  * ktimer: task scheduler
+  * kwalletmanager: kde wallet management tool
+  * okteta: binary/hex editor
   * superkaramba
-  * sweeper (clean unwanted traces the user leaves on the system)
+  * sweeper: clean unwanted traces the user leaves on the system
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
 
 %package printer-applet
 Summary:  KDE printer applet
 Group:    Applications/System
-Requires: PyKDE4 >= %{version}
+Requires: PyKDE4 
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
 %description printer-applet
@@ -85,31 +88,18 @@ Requires: system-config-printer-libs
 
 %prep
 %setup -q
-%if 0%{?include_kjots}
-# unpack kdepim
-%setup -q -T -D -a 1
-# extract kjots
-mv -f kdepim-%{version}/kjots .
-# extract kjots documentation
-mv -f kdepim-%{version}/doc/kjots doc
-# get rid of the rest of kdepim
-rm -rf kdepim-%{version}
-# make kjots build with kdeutils
-%patch0 -p1 -b .kjots
-%endif
-%patch1 -p1 -b .pykde4
-
-%patch50 -p1 -b .ark_servicepack
 
-
-# upstream fixes
+# NEEDSWORK
+#patch1 -p1 -b .pykde4
 
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  %{?printer_applet:-DINSTALL_PRINTER_APPLET=TRUE} \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -121,19 +111,28 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
-rm -f %{buildroot}%{_kde4_libdir}/liboktetacore.so %{buildroot}%{_kde4_libdir}/liboktetagui.so
-# FIXME: if something builds against these, there should be a -devel package
+rm -f %{buildroot}%{_kde4_libdir}/libokteta{core,gui}.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdelirc_shared.so
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+# make an exception for irkick service-style .desktop, while we consult
+# upstream
+  if [ "`basename $f .desktop`" != "irkick" ]; then
+  desktop-file-validate $f
+  fi
+done
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -143,7 +142,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -152,11 +150,16 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_kde4_bindir}/ark
+%{_kde4_bindir}/irkick
 %{_kde4_bindir}/kcalc
 %{_kde4_bindir}/kcharselect
 %{_kde4_bindir}/kdessh
@@ -170,6 +173,7 @@ fi
 %{_kde4_bindir}/superkaramba
 %{_kde4_bindir}/sweeper
 %{_kde4_appsdir}/ark/
+%{_kde4_appsdir}/irkick/
 %{_kde4_appsdir}/kcalc/
 %{_kde4_appsdir}/kcharselect/
 %{_kde4_appsdir}/kconf_update/*
@@ -178,44 +182,70 @@ fi
 %{_kde4_appsdir}/kwalletmanager/
 %{_kde4_appsdir}/okteta/
 %{_kde4_appsdir}/oktetapart/
+%{_kde4_appsdir}/profiles/
+%{_kde4_appsdir}/remotes/
 %{_kde4_appsdir}/superkaramba/
 %{_kde4_appsdir}/sweeper/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/autostart/irkick.desktop
 %{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_configdir}/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
-%{_kde4_libdir}/kde4/*
-%if 0%{?include_kjots}
-%{_kde4_bindir}/kjots
-%{_kde4_appsdir}/kjots/
-%{_kde4_docdir}/HTML/en/kjots/
-%endif
+%{_kde4_libdir}/kde4/*.so
 %{_mandir}/man1/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
+
+%if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
 %{_kde4_bindir}/printer-applet
 %{_kde4_datadir}/autostart/printer-applet.desktop
 %{_kde4_appsdir}/printer-applet/
+%endif
 
 
 %changelog
-* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-2
+- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 6:4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Mon Jul 13 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 - Add support for PackageKit service packs (#504136)
 
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- remove F9 kjots hack
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- reenable printer-applet
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu May 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
 - revert -printer-applet dep changes (and drop for f11+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	31 May 2009 15:10:23 -0000	1.63
+++ sources	5 Aug 2009 13:12:35 -0000	1.64
@@ -1 +1 @@
-e7214cb1e84d2e6793d3dbeb8f33a3fe  kdeutils-4.2.4.tar.bz2
+9d17d3d7bf25be5af1cbd4abf04e4c99  kdeutils-4.3.0.tar.bz2


--- kdeutils-4.2.2-pykde4.patch DELETED ---


--- kdeutils-4.2.4-ark_servicepack.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 13:12:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:12:36 +0000 (UTC)
Subject: rpms/kdeutils/F-11 kdeutils-4.2.85-pykde4.patch, NONE,
	1.1 .cvsignore, 
	1.64, 1.65 kdeutils.spec, 1.178, 1.179 sources, 1.65,
	1.66 kdeutils-4.2.2-pykde4.patch, 1.1,
	NONE kdeutils-4.2.4-ark_servicepack.patch, 1.1, NONE
Message-ID: <20090805131236.3AB7711C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16176/F-11

Modified Files:
	.cvsignore kdeutils.spec sources 
Added Files:
	kdeutils-4.2.85-pykde4.patch 
Removed Files:
	kdeutils-4.2.2-pykde4.patch 
	kdeutils-4.2.4-ark_servicepack.patch 
Log Message:
kde-4.3.0


kdeutils-4.2.85-pykde4.patch:
 CMakeLists.txt |   21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

--- NEW FILE kdeutils-4.2.85-pykde4.patch ---
diff -up kdeutils-4.2.85/printer-applet/CMakeLists.txt.pykde4 kdeutils-4.2.85/printer-applet/CMakeLists.txt
--- kdeutils-4.2.85/printer-applet/CMakeLists.txt.pykde4	2009-04-28 08:45:59.000000000 -0500
+++ kdeutils-4.2.85/printer-applet/CMakeLists.txt	2009-05-17 10:03:09.381947455 -0500
@@ -4,24 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
 macro_optional_find_package(PythonLibrary)
 macro_optional_find_package(SIP)
 
-find_package(PyQt4)
-IF(NOT PYQT4_FOUND)
-    macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
-ENDIF(NOT PYQT4_FOUND)
-
-find_package(PyKDE4)
-IF(NOT PYKDE4_FOUND)
-    macro_log_feature(PYKDE4_FOUND "PyKDE4" "PyKDE4 was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
-ENDIF(NOT PYKDE4_FOUND)
-
-find_package(PyCups)
-IF(NOT PYCUPS_FOUND)
-    macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found.  It is needed by printer-applet to run.  (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYCUPS_FOUND)
-
-IF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND)
-    SET(INSTALL_PRINTER_APPLET TRUE)
-ENDIF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND)
+if(PYTHONLIBRARY_FOUND)
+   set(INSTALL_PRINTER_APPLET TRUE)
+endif(PYTHONLIBRARY_FOUND)
 
 IF(INSTALL_PRINTER_APPLET)
     install( FILES


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	31 May 2009 15:10:23 -0000	1.64
+++ .cvsignore	5 Aug 2009 13:12:35 -0000	1.65
@@ -1 +1,5 @@
-kdeutils-4.2.4.tar.bz2
+kdeutils-4.2.90.tar.bz2
+kdeutils-4.2.95.tar.bz2
+kdeutils-4.2.96.tar.bz2
+kdeutils-4.2.98.tar.bz2
+kdeutils-4.3.0.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- kdeutils.spec	28 Jun 2009 20:37:22 -0000	1.178
+++ kdeutils.spec	5 Aug 2009 13:12:36 -0000	1.179
@@ -1,12 +1,10 @@
-%if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
-%define include_kjots 1
-%endif
+# define to include applet
+%define printer_applet 1
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.4
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -14,68 +12,74 @@ Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%if 0%{?include_kjots}
-Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
-%endif
-Patch1:         kdeutils-4.2.2-pykde4.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://bugzilla.redhat.com/504136
-Patch100: kdeutils-4.2.4-ark_servicepack.patch
+Patch1:         kdeutils-4.2.85-pykde4.patch
+
+## upstreamed patches
+
+## upstream fixes
+
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
+BuildRequires:  desktop-file-utils
+BuildRequires:  kdelibs-experimental-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
-BuildRequires:  python
+BuildRequires:  python-devel python
+BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
-
+%if 0%{?printer_applet}
 %if 0%{?fedora} < 11
 # upgrade path so it doesn't get lost
 Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
 %endif
+%else
+Obsoletes: %{name}-printer-applet < %{epoch}:%{version}-%{release}
+%endif
 
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 6:4.0.0
-Obsoletes: kdeutils-libs < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
+Obsoletes: kdeutils < 6:4.3.0-2
+
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description
 Utilities for the K Desktop Environment.
 Includes:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-%if 0%{?include_kjots}
-  * kjots (note taker)
-%endif
-  * ktimer (task scheduler)
-  * kwalletmanager (kde wallet management Tool)
-  * kwikdisk (removable media utility)
-  * okteta (binary/hex editor)
+  * ark: tar/gzip archive manager
+  * kcalc: scientific calculator
+  * kcharselect: character selector
+  * kdelirc: Linux Infrared Remote Control frontend 
+  * kdessh: ssh front end
+  * kdf: view disk usage
+  * kfloppy: floppy formatting tool
+  * kgpg: gpg gui
+  * ktimer: task scheduler
+  * kwalletmanager: kde wallet management tool
+  * okteta: binary/hex editor
   * superkaramba
-  * sweeper (clean unwanted traces the user leaves on the system)
+  * sweeper: clean unwanted traces the user leaves on the system
+
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
 
 %package printer-applet
 Summary:  KDE printer applet
 Group:    Applications/System
-Requires: PyKDE4 >= %{version}
+Requires: PyKDE4 
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
 %description printer-applet
@@ -84,31 +88,18 @@ Requires: system-config-printer-libs
 
 %prep
 %setup -q
-%if 0%{?include_kjots}
-# unpack kdepim
-%setup -q -T -D -a 1
-# extract kjots
-mv -f kdepim-%{version}/kjots .
-# extract kjots documentation
-mv -f kdepim-%{version}/doc/kjots doc
-# get rid of the rest of kdepim
-rm -rf kdepim-%{version}
-# make kjots build with kdeutils
-%patch0 -p1 -b .kjots
-%endif
-%patch1 -p1 -b .pykde4
-
-%patch100 -p1 -b .ark_servicepack
 
-
-# upstream fixes
+# NEEDSWORK
+#patch1 -p1 -b .pykde4
 
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+  %{?printer_applet:-DINSTALL_PRINTER_APPLET=TRUE} \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -120,19 +111,28 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
-rm -f %{buildroot}%{_kde4_libdir}/liboktetacore.so %{buildroot}%{_kde4_libdir}/liboktetagui.so
-# FIXME: if something builds against these, there should be a -devel package
+rm -f %{buildroot}%{_kde4_libdir}/libokteta{core,gui}.so
+rm -f %{buildroot}%{_kde4_libdir}/libkdelirc_shared.so
 rm -f %{buildroot}%{_kde4_libdir}/libkerfuffle.so
 rm -f %{buildroot}%{_kde4_libdir}/libkmilo.so
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+# make an exception for irkick service-style .desktop, while we consult
+# upstream
+  if [ "`basename $f .desktop`" != "irkick" ]; then
+  desktop-file-validate $f
+  fi
+done
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -142,7 +142,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -151,11 +150,16 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_kde4_bindir}/ark
+%{_kde4_bindir}/irkick
 %{_kde4_bindir}/kcalc
 %{_kde4_bindir}/kcharselect
 %{_kde4_bindir}/kdessh
@@ -169,6 +173,7 @@ fi
 %{_kde4_bindir}/superkaramba
 %{_kde4_bindir}/sweeper
 %{_kde4_appsdir}/ark/
+%{_kde4_appsdir}/irkick/
 %{_kde4_appsdir}/kcalc/
 %{_kde4_appsdir}/kcharselect/
 %{_kde4_appsdir}/kconf_update/*
@@ -177,44 +182,70 @@ fi
 %{_kde4_appsdir}/kwalletmanager/
 %{_kde4_appsdir}/okteta/
 %{_kde4_appsdir}/oktetapart/
+%{_kde4_appsdir}/profiles/
+%{_kde4_appsdir}/remotes/
 %{_kde4_appsdir}/superkaramba/
 %{_kde4_appsdir}/sweeper/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/autostart/irkick.desktop
 %{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_configdir}/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
-%{_kde4_libdir}/kde4/*
-%if 0%{?include_kjots}
-%{_kde4_bindir}/kjots
-%{_kde4_appsdir}/kjots/
-%{_kde4_docdir}/HTML/en/kjots/
-%endif
+%{_kde4_libdir}/kde4/*.so
 %{_mandir}/man1/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
+
+%if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
 %{_kde4_bindir}/printer-applet
 %{_kde4_datadir}/autostart/printer-applet.desktop
 %{_kde4_appsdir}/printer-applet/
+%endif
 
 
 %changelog
-* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.4-2
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
+- include epoch's in -libs-related Requires
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-2
+- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 6:4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Mon Jul 13 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 - Add support for PackageKit service packs (#504136)
 
-* Sun May 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- remove F9 kjots hack
+
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- reenable printer-applet
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu May 14 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-4
 - revert -printer-applet dep changes (and drop for f11+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	31 May 2009 15:10:23 -0000	1.65
+++ sources	5 Aug 2009 13:12:36 -0000	1.66
@@ -1 +1 @@
-e7214cb1e84d2e6793d3dbeb8f33a3fe  kdeutils-4.2.4.tar.bz2
+9d17d3d7bf25be5af1cbd4abf04e4c99  kdeutils-4.3.0.tar.bz2


--- kdeutils-4.2.2-pykde4.patch DELETED ---


--- kdeutils-4.2.4-ark_servicepack.patch DELETED ---



From kasal at fedoraproject.org  Wed Aug  5 13:15:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  5 Aug 2009 13:15:10 +0000 (UTC)
Subject: rpms/syncevolution/devel syncevolution.spec,1.12,1.13
Message-ID: <20090805131510.5352311C008C@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16973

Modified Files:
	syncevolution.spec 
Log Message:
- fixing autoconfigury; now it fails in a later stage of build


Index: syncevolution.spec
===================================================================
RCS file: /cvs/extras/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- syncevolution.spec	5 Aug 2009 11:11:39 -0000	1.12
+++ syncevolution.spec	5 Aug 2009 13:15:10 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: SyncML client for evolution
 Name: syncevolution
 Version: 0.8.1+0.9+beta3+20090723
-Release: 1.0.1%{?dist}
+Release: 1.0.2%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
@@ -35,18 +35,19 @@ Files for development with %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .Fedora-build
+# use the ac macros in Makefile.am
+sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
+touch -r Makefile-gen.am Makefile.am
 
 %build
-aclocal --force
-libtoolize --copy --force --automake
 intltoolize --automake --copy --force
-autoconf --force
-automake --copy --add-missing
+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
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
+	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
@@ -57,8 +58,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/te
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
 #Remove libtool archives and static libs
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name '*.a' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/syncevolution/*so
 
 %changelog
+* Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.2
+- fixing autoconfigury; now it fails in a later stage of build ;-)
+
 * Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.1
 - fixing rpath, currently FTBFS!!!
 



From rdieter at fedoraproject.org  Wed Aug  5 13:11:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 13:11:04 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils-4.2.90-ark_servicepack.patch,1.1,NONE
Message-ID: <20090805131104.11AFF11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15747

Removed Files:
	kdeutils-4.2.90-ark_servicepack.patch 
Log Message:
upstreamed patch



--- kdeutils-4.2.90-ark_servicepack.patch DELETED ---



From gerd at fedoraproject.org  Wed Aug  5 13:49:40 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed,  5 Aug 2009 13:49:40 +0000 (UTC)
Subject: rpms/rakudo/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rakudo.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090805134940.4553511C008C@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26134/devel

Modified Files:
	.cvsignore import.log rakudo.spec sources 
Log Message:
initial the Rakudo package for Fedora 12 again



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Aug 2009 07:03:43 -0000	1.2
+++ .cvsignore	5 Aug 2009 13:49:39 -0000	1.3
@@ -1,2 +1 @@
-parrot-1.4.0.tar.gz
 rakudo-2009-07.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Aug 2009 07:03:48 -0000	1.1
+++ import.log	5 Aug 2009 13:49:39 -0000	1.2
@@ -1 +1,2 @@
 rakudo-2009_07-3_fc11:HEAD:rakudo-2009.07-3.fc11.src.rpm:1249282522
+rakudo-0_0_2009_07_1_4_0-1_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-1.fc11.src.rpm:1249480110


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rakudo.spec	3 Aug 2009 07:03:50 -0000	1.1
+++ rakudo.spec	5 Aug 2009 13:49:40 -0000	1.2
@@ -2,61 +2,49 @@
 %global month 07
 %global parrot_version 1.4.0
 
+ExcludeArch:ppc
+
+%define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
+%define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
+
 Name:           rakudo
-Version:        %{year}.%{month}
-Release:        3%{?dist}
+Version:        0.0.%{year}.%{month}_%{parrot_version}
+Release:        1%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
 URL:            http://www.rakudo.org/
 
 Source0:        http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{year}-%{month}.tar.gz
-Source1:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{parrot_version}/parrot-%{parrot_version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  readline-devel
 BuildRequires:  gmp-devel
 BuildRequires:  gdbm-devel
 BuildRequires:  libicu-devel
-BuildRequires:  perl(Test::Harness)
-BuildRequires:  perl(Test::Simple)
-BuildRequires:  ctags
-BuildRequires:  openssl-devel
+BuildRequires:  parrot >= %{parrot_version}
+BuildRequires:  parrot-devel >= %{parrot_version}
+BuildRequires:  parrot-tools >= %{parrot_version}
 
 %description
 Rakudo Perl 6, or just Rakudo, is a Perl 6 compiler for the Parrot virtual
 machine. Rakudo is an implementation of the Perl 6 specification that runs
-on the Parrot VM.
+on the Parrot VM. More information about Perl 6 is available from:
+http://perl6-projects.org
 
 %prep
-%setup -q -n rakudo-%{year}-%{month} -a1
+%setup -q -n %{name}-%{year}-%{month}
 exit 0
 
 %build
-%ifarch %{ix86} x86_64
-    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -maccumulate-outgoing-args"
-%else
-# The PowerPC-architecture do not build with the '-maccumulate-outgoing-args'
-# option.
-    RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-%endif
-
-cd parrot-%{parrot_version}
-export LD_LIBRARY_PATH=$( pwd )/blib/lib
-
-%{__perl} Configure.pl --parrot_is_shared \
-  --disable-rpath \
-  --optimize="$RPM_OPT_FLAGS" 
-make
-cd ..
-%{__perl} Configure.pl --parrot-config=./parrot-1.4.0/parrot_config
+%{__perl} Configure.pl
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__install} -D --mode=755 perl6 $RPM_BUILD_ROOT/usr/bin/perl6
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %check
 make test
@@ -68,14 +56,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/perl6
 %doc CREDITS LICENSE README
+%{_bindir}/perl6
+%{parrot_dynext}/perl6_group.so
+%{parrot_dynext}/perl6_ops.so
+%{parrot_dynext}/perl6_ops_cg.so
+%{parrot_dynext}/perl6_ops_cgp.so
+%{parrot_dynext}/perl6_ops_switch.so
+%{par_lang_perl6}/lib/Safe.pm
+%{par_lang_perl6}/lib/Test.pm
+%{par_lang_perl6}/perl6.pbc
+
 
 %changelog
-* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 2009.07-3
-- Fix versioning
+* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-1
 - Provide full SourceURLs
-- strip binary
-
-* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 2009.07-2
+- strip binary ???
 - first .spec file created
+
+* Fri Jul 31 2009 wayland <wayland at wayland.id.au> 0.0.2009.07-1
+- Tim Nelson also created an initial .spec file some things are taken from it


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Aug 2009 07:03:51 -0000	1.2
+++ sources	5 Aug 2009 13:49:40 -0000	1.3
@@ -1,2 +1 @@
-3f66816c0f2ba18bdd2cf7bedd59f045  parrot-1.4.0.tar.gz
-df841289a91a804a5bd2fe3125dfc06b  rakudo-2009-07.tar.gz
+9ea4e8dbe344d9b916d78e13e687a9f9  rakudo-2009-07.tar.gz



From pvrabec at fedoraproject.org  Wed Aug  5 13:53:27 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed,  5 Aug 2009 13:53:27 +0000 (UTC)
Subject: rpms/shadow-utils/F-11 shadow-4.1.4.1-sysacc.patch, 1.1,
	1.2 shadow-utils.spec, 1.131, 1.132
Message-ID: <20090805135327.E9CFF11C008C@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27618

Modified Files:
	shadow-4.1.4.1-sysacc.patch shadow-utils.spec 
Log Message:
increase threshold for uid/gid reservations to 200 (#515667)


shadow-4.1.4.1-sysacc.patch:
 find_new_gid.c |   93 +++++++++++++++++++++++++++++++----------------------
 find_new_uid.c |   99 +++++++++++++++++++++++++++++++++------------------------
 2 files changed, 113 insertions(+), 79 deletions(-)

Index: shadow-4.1.4.1-sysacc.patch
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/F-11/shadow-4.1.4.1-sysacc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shadow-4.1.4.1-sysacc.patch	17 Jul 2009 14:04:27 -0000	1.1
+++ shadow-4.1.4.1-sysacc.patch	5 Aug 2009 13:53:27 -0000	1.2
@@ -15,7 +15,7 @@ diff -up shadow-4.1.4.1/libmisc/find_new
  		gid_max = (gid_t) getdef_ulong ("GID_MAX", 60000UL);
  	} else {
 -		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 1UL);
-+		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 101UL);
++		gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 201UL);
  		gid_max = (gid_t) getdef_ulong ("GID_MIN", 500UL) - 1;
  		gid_max = (gid_t) getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
  	}
@@ -161,7 +161,7 @@ diff -up shadow-4.1.4.1/libmisc/find_new
  		uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
  	} else {
 -		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 1UL);
-+		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL);
++		uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 201UL);
  		uid_max = (uid_t) getdef_ulong ("UID_MIN", 500UL) - 1;
  		uid_max = (uid_t) getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
  	}


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/F-11/shadow-utils.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- shadow-utils.spec	17 Jul 2009 14:04:27 -0000	1.131
+++ shadow-utils.spec	5 Aug 2009 13:53:27 -0000	1.132
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Wed Aug 05 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.4.1-5
+- increase threshold for uid/gid reservations to 200 (#515667)
+
 * Thu Jul 16 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.4.1-4
 - fix a list of owned directories (#510366)
 



From jnovy at fedoraproject.org  Wed Aug  5 13:55:00 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  5 Aug 2009 13:55:00 +0000 (UTC)
Subject: rpms/xz/devel .cvsignore,1.2,1.3 sources,1.2,1.3 xz.spec,1.2,1.3
Message-ID: <20090805135500.0256411C008C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/xz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28150

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Thu Jul 30 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.9.beta.20090803git
- update to the latest GIT snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 18:19:25 -0000	1.2
+++ .cvsignore	5 Aug 2009 13:54:59 -0000	1.3
@@ -1 +1 @@
-xz-4.999.8beta.tar.gz
+xz-4.999.8beta.20090804git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 18:19:25 -0000	1.2
+++ sources	5 Aug 2009 13:54:59 -0000	1.3
@@ -1 +1 @@
-f00967331a487e88d51207fe17c56f52  xz-4.999.8beta.tar.gz
+5efad2a123674034cb0c5a5794686e7a  xz-4.999.8beta.20090804git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/xz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xz.spec	27 Jul 2009 08:50:20 -0000	1.2
+++ xz.spec	5 Aug 2009 13:54:59 -0000	1.3
@@ -1,10 +1,13 @@
+%define git_date 20090804
+
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.8
-Release:	0.8.beta%{?dist}
+Release:	0.9.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz
+# source created as "make dist" in checked out GIT tree
+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}
@@ -67,6 +70,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 rm -f %{buildroot}/%{_libdir}/*.a
 rm -f %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}/%{_docdir}/%{name}
 
 %check
 LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
@@ -102,6 +106,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 04 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.9.beta.20090804git
+- update to the latest GIT snapshot
+
 * 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
 



From makowski at fedoraproject.org  Wed Aug  5 13:55:18 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Wed,  5 Aug 2009 13:55:18 +0000 (UTC)
Subject: rpms/firebird/devel README.Fedora,1.2,1.3 firebird.spec,1.6,1.7
Message-ID: <20090805135518.C5A2C11C008C@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28242

Modified Files:
	README.Fedora firebird.spec 
Log Message:
* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
- remove stupid rm -rf in postun



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.Fedora	11 Jul 2009 16:02:06 -0000	1.2
+++ README.Fedora	5 Aug 2009 13:55:18 -0000	1.3
@@ -4,9 +4,11 @@ Differences between upstream and the Fed
 * All files are installed according to the FHS. Relatively complete
   environment as provided by upstream may be found in %{fbroot} 
 
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat have a symlink in /usr/bin
+* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
   In /usr/bin you have also isql-fb symlinked to Firebird isql.
   We can't name it isql to avoid conflict with isql from UNIX-ODBC
+  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
+  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- firebird.spec	30 Jul 2009 13:24:01 -0000	1.6
+++ firebird.spec	5 Aug 2009 13:55:18 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -315,7 +315,7 @@ ln	-s	%{fbroot}/bin/gbak	.%{_bindir}/gba
 ln	-s	%{fbroot}/bin/gfix	.%{_bindir}/gfix
 ln	-s	%{fbroot}/bin/gsec	.%{_bindir}/gsec
 ln	-s	%{fbroot}/bin/nbackup	.%{_bindir}/nbackup
-ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat
+ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat-fb
 
  
 %clean
@@ -407,7 +407,6 @@ fi
 
 %postun	
 /sbin/ldconfig
-rm -Rf	%{_var}/run/%{name}
 
 %files 
 %defattr(0644,root,root,0755)
@@ -444,7 +443,7 @@ rm -Rf	%{_var}/run/%{name}
 %{_bindir}/gsec
 %{_bindir}/gfix
 %{_bindir}/nbackup
-%{_bindir}/gstat
+%{_bindir}/gstat-fb
 %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
@@ -523,6 +522,10 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
+- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
+- remove stupid rm -rf in postun
+
 * Thu Jul 30 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
 - Update to 2.1.3.18185
 - Fix rh #514463



From gerd at fedoraproject.org  Wed Aug  5 14:00:44 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed,  5 Aug 2009 14:00:44 +0000 (UTC)
Subject: rpms/rakudo/devel rakudo.spec,1.2,1.3
Message-ID: <20090805140044.EC8B011C008C@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30690

Modified Files:
	rakudo.spec 
Log Message:
* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-1
- Fix versioning
- use 'ExcludeArch:ppc' for now
- Provide full SourceURLs
- strip binary ???
- first .spec file created



Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rakudo.spec	5 Aug 2009 13:49:40 -0000	1.2
+++ rakudo.spec	5 Aug 2009 14:00:44 -0000	1.3
@@ -2,11 +2,11 @@
 %global month 07
 %global parrot_version 1.4.0
 
-ExcludeArch:ppc
-
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
 
+ExcludeArch:ppc
+
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
 Release:        1%{?dist}
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-1
+- Fix versioning
+- use 'ExcludeArch:ppc' for now
 - Provide full SourceURLs
 - strip binary ???
 - first .spec file created



From langel at fedoraproject.org  Wed Aug  5 14:11:41 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed,  5 Aug 2009 14:11:41 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-11 java-1.6.0-openjdk-netxandplugin.patch,
	NONE, 1.1 java-1.6.0-openjdk-securitypatches.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.125,
	1.126 java-1.6.0-openjdk-netx.patch, 1.1, NONE
Message-ID: <20090805141141.CA34D11C008C@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1252

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Removed Files:
	java-1.6.0-openjdk-netx.patch 
Log Message:
* Tue Aug  4 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-27.b16
- Updated java-1.6.0-openjdk-netx.patch, and renamed to
java-1.6.0-openjdk-netxandplugin.patch.
- Added java-1.6.0-openjdk-securitypatches.patch.
- Resolves: rhbz#512101
- Resolves: rhbz#512896
- Resolves: rhbz#512914
- Resolves: rhbz#512907
- Resolves: rhbz#512921
- Resolves: rhbz#511915
- Resolves: rhbz#512915
- Resolves: rhbz#512920
- Resolves: rhbz#512714
- Resolves: rhbz#513215
- Resolves: rhbz#513220
- Resolves: rhbz#513222
- Resolves: rhbz#513223
- Resolves: rhbz#503794



java-1.6.0-openjdk-netxandplugin.patch:
 JNLPRuntime.java                                                 |    2 
 plugin/icedtea/netscape/javascript/JSObject.java                 |   37 ++++++-
 plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java |   47 ++++++++++
 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java       |    6 +
 rt/net/sourceforge/jnlp/SecurityDesc.java                        |   24 +++++
 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java             |   27 ++++-
 6 files changed, 131 insertions(+), 12 deletions(-)

--- NEW FILE java-1.6.0-openjdk-netxandplugin.patch ---
--- ../JNLPRuntime.java	2009-07-09 12:51:44.000000000 -0400
+++ rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java	2009-07-09 12:52:04.000000000 -0400
@@ -282,7 +282,7 @@
 
         String homeDir = System.getProperty("user.home");
 	File baseDir = new File(homeDir + "/.netx/");
-	if (homeDir == null || !baseDir.mkdir())
+	if (homeDir == null || (!baseDir.isDirectory() && !baseDir.mkdir()))
             return null;
 
         props.setProperty("basedir", baseDir.toString());
diff -r d20bab985f89 plugin/icedtea/netscape/javascript/JSObject.java
--- a/plugin/icedtea/netscape/javascript/JSObject.java	Fri Jul 17 06:04:59 2009 -0400
+++ plugin/icedtea/netscape/javascript/JSObject.java	Tue Jul 21 14:48:24 2009 -0400
@@ -47,6 +47,10 @@
 package netscape.javascript;
 
 import java.applet.Applet;
+import java.security.AccessControlContext;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.BasicPermission;
 
 import sun.applet.PluginAppletViewer;
 import sun.applet.PluginDebug;
@@ -102,13 +106,37 @@
     /**
      * it is illegal to construct a JSObject manually
      */
-    // FIXME: make private!
     public JSObject(int jsobj_addr) {
-        PluginDebug.debug ("JSObject int CONSTRUCTOR");
-        internal = jsobj_addr;
+        this((long) jsobj_addr);
     }
 
     public JSObject(long jsobj_addr) {
+        
+        // See if the caller has permission
+        
+        try {
+            AccessController.getContext().checkPermission(new JSObjectCreatePermission());
+        } catch (AccessControlException ace) {
+            
+            // If not, only caller with JSObject.getWindow on the stack may 
+            // make this call unprivileged.
+            
+            // Although this check is inefficient, it should happen only once
+            // during applet init, so we look the other way
+
+            StackTraceElement[] stack =  Thread.currentThread().getStackTrace();
+            boolean mayProceed = false;
+            
+            for (int i=0; i < stack.length; i++) {
+                if (stack[i].getClassName().equals("netscape.javascript.JSObject") &&
+                    stack[i].getMethodName().equals("getWindow")) {
+                    mayProceed = true;
+                }
+            }
+
+            if (!mayProceed) throw ace;
+        }
+
         PluginDebug.debug ("JSObject long CONSTRUCTOR");
         internal = jsobj_addr;
     }
@@ -234,7 +262,7 @@
         internal = ((PluginAppletViewer)
                     applet.getAppletContext()).getWindow();
         PluginDebug.debug ("GOT IT: " + internal);
-        return new JSObject(internal);
+        return new JSObject((long) internal);
     }
 
 
@@ -259,5 +287,4 @@
 
         return false;
     }
-
 }
diff -r d20bab985f89 plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java	Tue Jul 21 14:48:24 2009 -0400
@@ -0,0 +1,47 @@
+/* JSObjectCreatePermission.java
+   Copyright (C) 2009  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+ 
+package netscape.javascript;
+
+import java.security.BasicPermission;
+
+
+public class JSObjectCreatePermission extends BasicPermission {
+    public JSObjectCreatePermission() {
+        super("JSObjectCreate");
+    }
+}
diff -r d20bab985f89 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Fri Jul 17 06:04:59 2009 -0400
+++ plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Tue Jul 21 14:48:24 2009 -0400
@@ -58,6 +58,7 @@
 import java.util.List;
 
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import netscape.javascript.JSObjectCreatePermission;
 
 
 
@@ -1285,12 +1286,15 @@
 
 		CodeSource cs = new CodeSource((URL) null, (java.security.cert.Certificate  [])null);
 		
-		if (src != null) {
+		if (src != null && src.length() > 0) {
 			try {
 				cs = new CodeSource(new URL(src + "/"), (java.security.cert.Certificate[]) null);
 			} catch (MalformedURLException mfue) {
 				// do nothing
 			}
+		} else {
+		    JSObjectCreatePermission perm = new JSObjectCreatePermission();
+		    grantedPermissions.add(perm);
 		}
 
 		ProtectionDomain pd = new ProtectionDomain(cs, grantedPermissions, null, null);
diff -r 438cbd2f7252 rt/net/sourceforge/jnlp/SecurityDesc.java
--- a/rt/net/sourceforge/jnlp/SecurityDesc.java	Wed Jul 15 12:56:10 2009 +0200
+++ rt/net/sourceforge/jnlp/SecurityDesc.java	Wed Jul 15 11:58:08 2009 -0400
@@ -166,6 +166,30 @@
 
         return permissions;
     }
+    
+    /**
+     * Returns a PermissionCollection containing the sandbox permissions
+     */
+    public PermissionCollection getSandBoxPermissions() {
+        
+        Permissions permissions = new Permissions();
+
+        for (int i=0; i < sandboxPermissions.length; i++)
+            permissions.add(sandboxPermissions[i]);
+
+        if (downloadHost != null)
+            permissions.add(new SocketPermission(downloadHost,
+                                                 "connect, accept"));
+
+        // properties
+        PropertyDesc props[] = file.getResources().getProperties();
+        for (int i=0; i < props.length; i++) {
+            // should only allow jnlp.* properties if in sandbox?
+            permissions.add(new PropertyPermission(props[i].getKey(), "read,write"));
+        }
+
+        return permissions;
+    }
 
 }
 
diff -r 438cbd2f7252 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 15 12:56:10 2009 +0200
+++ rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 15 11:58:08 2009 -0400
@@ -435,12 +469,29 @@
         // access w/o security dialog once we actually check certificates.
 
         // copy security permissions from SecurityDesc element
-		if (security != null) {
-        	Enumeration e = security.getPermissions().elements();
-        	while (e.hasMoreElements())
-            	result.add((Permission) e.nextElement());
-		}
+        if (security != null) {
+            // Security desc. is used only to track security settings for the
+            // application. However, an application may comprise of multiple
+            // jars, and as such, security must be evaluated on a per jar basis.
+            
+            // set default perms
+            PermissionCollection permissions = security.getSandBoxPermissions();
+            
+            // If more than default is needed, evaluate based on codesource
+            if (security.getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS) ||
+                security.getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS)) {
 
+                if (cs.getCodeSigners() != null) {
+                    permissions = security.getPermissions();
+                }
+            }
+
+            Enumeration<Permission> e = permissions.elements();
+            while (e.hasMoreElements())
+                result.add(e.nextElement());
+        }
+
+	    
         // add in permission to read the cached JAR files
         for (int i=0; i < resourcePermissions.size(); i++)
             result.add((Permission) resourcePermissions.get(i));

java-1.6.0-openjdk-securitypatches.patch:
 ./THIRD_PARTY_README                                                                                                   |    2 
 jdk/src/share/classes/java/awt/Cursor.java                                                                             |   14 
 jdk/src/share/classes/javax/swing/text/LayoutQueue.java                                                                |   22 
 make/sun/net/FILES_java.gmk                                                                                            |    1 
 openjdk/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html                                            |   29 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/Builder.java                                                   |   33 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizable.java                                  |   63 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java                           |   56 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java                    |   43 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizer.java                                    |  149 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java                                  |   56 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java                                      |   43 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java                                       |   52 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java                                      |   64 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java                             |   66 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java                          |  154 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java                             |   94 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java                                     |  122 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java                                              |   79 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java                                  |   46 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties                            |   26 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java     |   37 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java                  |  176 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java                    |  152 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java            |  187 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java              |   64 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java           |   62 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java |  221 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java    |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java                         |   42 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.java                                            |   53 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties                                      |   27 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java                  |   66 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java                         |   35 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java                            |   35 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java              |   59 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java                 |   72 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java                                   |   33 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java                   |  237 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java                                     |   50 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java                          |   94 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java                                      |   70 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java                                  |   83 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java                                  |  258 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java                                  |   73 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java                            |   49 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java                                    |   48 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java                           |  238 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java                                |  147 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java                                 |  116 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java                               |  248 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java                                |  500 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java                      |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java                                  |  206 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java                                |   96 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java                              |  116 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java                        |  143 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java                                        |   65 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java                                    |   86 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java                               |   69 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java                               |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java                                 |  126 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java         |   64 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java                      |   50 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java                     |   44 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java         |   78 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java          |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java          |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java                                        |   67 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java                                |   54 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java                         |   88 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java                             |  164 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java                             |   73 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java                              |   52 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java                                   |   62 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java                                    |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java                         |  163 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java                                       |  118 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java                                   |  244 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java                               |  214 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java                             |   57 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java                             |   70 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java                              |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java                              |  101 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java                                |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java                         |   74 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java                             |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java                      |  117 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java                            |   69 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java                                 |   68 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java                          |  124 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java                          |   58 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java                    |   83 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java                                      |  136 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java                   |   63 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java                                  |  382 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java                          |  164 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java                     |  129 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java                                    |  138 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java                                    |   71 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java                         |  148 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java                            |  114 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java                          |  150 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java                         |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java                          |  149 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java                                      |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java                                      |  100 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Injector.java                                            |  192 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java                                |  659 ++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java                             |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java                       |  127 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java                        |  346 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java                               |  284 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java                              |  323 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java                             | 2039 +++++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java                            |  226 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java                             | 1374 +++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java                                    |  105 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java                            |   94 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java                             |  299 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java                                   | 1432 +++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java                                 |  100 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java                                    |  286 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java                                   |  556 ++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java                           |  425 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java                            | 2631 ++++++++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java                                 |  371 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java                                    |  824 +++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java                    |   60 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java                    |   47 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java                                           |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java                         |  319 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java                      |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java                                |   44 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java                                       |  230 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java                                   |   40 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java                              |   37 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java                      |   59 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java                                         |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java                                  |   43 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java                    |  261 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java                                 |  317 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java      |  106 
 openjdk/jdk/src/share/classes/sun/net/ApplicationProxy.java                                                            |   43 
 src/share/classes/com/sun/codemodel/internal/CodeWriter.java                                                           |   10 
 src/share/classes/com/sun/codemodel/internal/JAnnotatable.java                                                         |    1 
 src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java                                               |    1 
 src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java                                                       |    4 
 src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java                                                    |    1 
 src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java                                                      |   10 
 src/share/classes/com/sun/codemodel/internal/JArray.java                                                               |   10 
 src/share/classes/com/sun/codemodel/internal/JArrayClass.java                                                          |   24 
 src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java                                                        |    4 
 src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java                                                    |    4 
 src/share/classes/com/sun/codemodel/internal/JAtom.java                                                                |    6 
 src/share/classes/com/sun/codemodel/internal/JBlock.java                                                               |   12 
 src/share/classes/com/sun/codemodel/internal/JBreak.java                                                               |    6 
 src/share/classes/com/sun/codemodel/internal/JCase.java                                                                |    8 
 src/share/classes/com/sun/codemodel/internal/JCast.java                                                                |    2 
 src/share/classes/com/sun/codemodel/internal/JClass.java                                                               |   58 
 src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java                                         |   10 
 src/share/classes/com/sun/codemodel/internal/JClassContainer.java                                                      |   34 
 src/share/classes/com/sun/codemodel/internal/JCodeModel.java                                                           |   50 
 src/share/classes/com/sun/codemodel/internal/JCommentPart.java                                                         |   20 
 src/share/classes/com/sun/codemodel/internal/JContinue.java                                                            |    6 
 src/share/classes/com/sun/codemodel/internal/JDefinedClass.java                                                        |   76 
 src/share/classes/com/sun/codemodel/internal/JDirectClass.java                                                         |    3 
 src/share/classes/com/sun/codemodel/internal/JDocComment.java                                                          |   13 
 src/share/classes/com/sun/codemodel/internal/JEnumConstant.java                                                        |    4 
 src/share/classes/com/sun/codemodel/internal/JExpr.java                                                                |   41 
 src/share/classes/com/sun/codemodel/internal/JFieldVar.java                                                            |    5 
 src/share/classes/com/sun/codemodel/internal/JForEach.java                                                             |   50 
 src/share/classes/com/sun/codemodel/internal/JForLoop.java                                                             |   18 
 src/share/classes/com/sun/codemodel/internal/JFormatter.java                                                           |    6 
 src/share/classes/com/sun/codemodel/internal/JGenerifiable.java                                                        |   10 
 src/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java                                                    |   10 
 src/share/classes/com/sun/codemodel/internal/JInvocation.java                                                          |   10 
 src/share/classes/com/sun/codemodel/internal/JJavaName.java                                                            |    1 
 src/share/classes/com/sun/codemodel/internal/JLabel.java                                                               |    8 
 src/share/classes/com/sun/codemodel/internal/JMethod.java                                                              |  517 -
 src/share/classes/com/sun/codemodel/internal/JMods.java                                                                |   26 
 src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java                                                       |   10 
 src/share/classes/com/sun/codemodel/internal/JNullType.java                                                            |    6 
 src/share/classes/com/sun/codemodel/internal/JPackage.java                                                             |   93 
 src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java                                                       |   12 
 src/share/classes/com/sun/codemodel/internal/JResourceFile.java                                                        |    8 
 src/share/classes/com/sun/codemodel/internal/JStringLiteral.java                                                       |   12 
 src/share/classes/com/sun/codemodel/internal/JSwitch.java                                                              |    6 
 src/share/classes/com/sun/codemodel/internal/JType.java                                                                |   10 
 src/share/classes/com/sun/codemodel/internal/JTypeVar.java                                                             |   14 
 src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java                                                        |    1 
 src/share/classes/com/sun/codemodel/internal/JVar.java                                                                 |    8 
 src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java                                                |    1 
 src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java                                                      |   12 
 src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java                                                    |    8 
 src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java                                                |    6 
 src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java                                                      |   14 
 src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java                                                  |   40 
 src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java                                                        |   10 
 src/share/classes/com/sun/codemodel/internal/package-info.java                                                         |    1 
 src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java                                             |    6 
 src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java                                                  |   13 
 src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java                                             |   16 
 src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java                                                   |  333 -
 src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java                                               |  164 
 src/share/classes/com/sun/codemodel/internal/util/Surrogate.java                                                       |  448 -
 src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java                                             |   18 
 src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java                                                |   28 
 src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java                                              |    1 
 src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java                                            |    8 
 src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java                                              |   22 
 src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java                                        |   14 
 src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java                                                 |   12 
 src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java                                                 |    2 
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java                                                 |    3 
 src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java                                                 |    2 
 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java                                                 |    3 
 src/share/classes/com/sun/imageio/stream/StreamCloser.java                                                             |   44 
 src/share/classes/com/sun/istack/internal/Nullable.java                                                                |    2 
 src/share/classes/com/sun/istack/internal/Pool.java                                                                    |   30 
 src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java                                         |   32 
 src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java                                       |   19 
 src/share/classes/com/sun/istack/internal/ws/package-info.java                                                         |    2 
 src/share/classes/com/sun/jndi/dns/DnsContext.java                                                                     |    2 
 src/share/classes/com/sun/media/sound/JDK13Services.java                                                               |   21 
 src/share/classes/com/sun/media/sound/JSSecurityManager.java                                                           |   55 
 src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java                                                      |    4 
 src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                                              |    3 
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java               |   76 
 src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java                                                     |   21 
 src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java                                                         |    2 
 src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties                                                  |    5 
 src/share/classes/com/sun/tools/internal/jxc/Messages.java                                                             |    1 
 src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java                                   |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Const.java                                                            |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java                                                |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java                                       |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties                                              |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java                                                         |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Options.java                                                          |    6 
 src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java                                            |   37 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java                                                   |  105 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java                                                    |   83 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java                                         |    4 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java                                           |    6 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java                                               |   50 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java                                      |   74 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java                                               |  158 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java                                                    |  141 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd                                                     |    2 
 src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java                                               |    4 
 src/share/classes/com/sun/tools/internal/ws/Invoker.java                                                               |   28 
 src/share/classes/com/sun/tools/internal/ws/WsGen.java                                                                 |    2 
 src/share/classes/com/sun/tools/internal/ws/WsImport.java                                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java                                               |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java                                        |    3 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java                                               |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/package-info.java                                                          |   62 
 src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java                                          |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java                          |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java                                     |    4 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java                                      |   40 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java                                  |  207 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java               |    3 
 src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java                                        |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java                                               |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java                                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java                                    |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java                                       |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java                                |    8 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java                                        |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java                                     |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java                                         |    4 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java                                             |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java                      |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java                             |    8 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java                      |   14 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java                        |   50 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java               |   17 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java                           |    7 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java                                   |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java                            |    5 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java                                    |  126 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java                                |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java                                     |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java                                       |    6 
 src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java                                           |   36 
 src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java                                        |    8 
 src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java                                               |  141 
 src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java                                             |  306 -
 src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java                                           |    4 
 src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java                                                |    8 
 src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java                                        |  846 +--
 src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java                                           |  294 -
 src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java                                                |  286 -
 src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties                                         |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/generator.properties                                             |    3 
 src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/model.properties                                                 |   10 
 src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties                                               |   15 
 src/share/classes/com/sun/tools/internal/ws/resources/processor.properties                                             |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/util.properties                                                  |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties                                          |   25 
 src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties                                             |   66 
 src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties                                                  |   48 
 src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/spi/package-info.java                                                      |    2 
 src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java                                         |    4 
 src/share/classes/com/sun/tools/internal/ws/version.properties                                                         |    8 
 src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java                                              |    1 
 src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java                                     |    1 
 src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java                                               |    5 
 src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java                                         |    8 
 src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java                                             |   12 
 src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java                                          |   11 
 src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java                                                     |   11 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java                                                |   45 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java                                                   |   47 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java                                            |    7 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java                                             |   75 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java                                                |   71 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java                                                   |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java                                                 |    7 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java                                               |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java                                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java                                      |   11 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java                                      |    4 
 src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java                                       |   17 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java                               |    1 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java                                                |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java                                                 |  122 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java                                      |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java                                              |  308 -
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java                |    3 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java                                            |   90 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java                                      |   33 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java                                    |   14 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java                                            |    4 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java                             |    3 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java                                  |   12 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java                                                |    9 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/AbortException.java                                                       |    3 
 src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java                                                 |   12 
 src/share/classes/com/sun/tools/internal/xjc/Driver.java                                                               |   27 
 src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java                                                        |   31 
 src/share/classes/com/sun/tools/internal/xjc/Language.java                                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties                                                  |  113 
 src/share/classes/com/sun/tools/internal/xjc/Messages.java                                                             |   42 
 src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java                                                          |   68 
 src/share/classes/com/sun/tools/internal/xjc/Options.java                                                              |  143 
 src/share/classes/com/sun/tools/internal/xjc/Plugin.java                                                               |   10 
 src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/XJCListener.java                                                          |    5 
 src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java                                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java                                   |    6 
 src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java                                                    |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java                                                     |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/Property.java                                                         |   18 
 src/share/classes/com/sun/tools/internal/xjc/api/Reference.java                                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java                                                   |   50 
 src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java                                                      |   12 
 src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/XJC.java                                                              |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java                                           |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java                                      |   19 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/package.html                                                          |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java                                              |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties                                              |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java                                         |   36 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java                                      |    4 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java                                    |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties                                   |   11 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java                                          |   17 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java                            |    9 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java                                    |    9 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java                                   |   47 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java                            |   31 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java                               |   48 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java                                      |  137 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java                                      |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java                              |    3 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java                            |   27 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java                                   |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java                            |    7 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java                            |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java                                      |   28 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java                              |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java                                     |   20 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java                                    |   16 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java                                |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java                        |   24 
 src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java                                        |    6 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java                                |    6 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java                                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java                                  |   22 
 src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java                                               |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java                                         |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java                                                     |    8 
 src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java                                               |    9 
 src/share/classes/com/sun/tools/internal/xjc/model/CClass.java                                                         |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java                                                     |   28 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java                                                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java                                                |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CElement.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java                                                   |   20 
 src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java                                                  |    4 
 src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java                                                  |   22 
 src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java                                         |   38 
 src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java                                                       |    7 
 src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java                                             |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java                                                    |   14 
 src/share/classes/com/sun/tools/internal/xjc/model/Model.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java                                                   |   23 
 src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java                                                    |   18 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java                                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java                                                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/package-info.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java                                                 |    7 
 src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java                                               |    3 
 src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java                                                |   24 
 src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java                                                 |   10 
 src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java                                                      |   10 
 src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java                                               |    8 
 src/share/classes/com/sun/tools/internal/xjc/package-info.java                                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/Const.java                                                         |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java                                       |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties                                           |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java                                                      |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java                                                   |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties                                       |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java                                                  |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java                                                |   30 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java                                      |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java                                    |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java                                        |   42 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java                                     |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java                                        |   64 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java                                    |   24 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java                                      |   34 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java                                 |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java                                         |   50 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java                                       |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java                                         |    4 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd                                       |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd                                               |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java                                                 |   16 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java                                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java                      |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java                                       |   24 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java                                        |  102 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java                                  |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java                                 |   48 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java                             |   22 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java                                     |  104 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java                                     |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties                              |   29 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java                                         |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java                             |   34 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java                                   |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java                               |   17 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java                                    |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java                                          |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java                                             |   14 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java                                       |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java                               |   11 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties                                 |  102 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java                                            |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java                                   |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java                                   |   37 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java                          |   35 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java                |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java                                    |    7 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java                               |   27 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java                              |   17 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java                                      |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java                                     |   11 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java                               |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java                            |   27 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java                                 |  158 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java                            |   26 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java                             |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java                                   |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties                        |   13 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng                                     |    7 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd                                     |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html                                    |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd                                         |    4 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd                                          |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java                           |    9 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java                          |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java                       |  204 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java                          |   58 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java                     |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java                  |   74 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java                 |   32 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java                            |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties                          |   14 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java                                     |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java                |   18 
 src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java                                           |   22 
 src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java                                                        |   24 
 src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java                                             |    4 
 src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java                                              |  142 
 src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties                                             |    9 
 src/share/classes/com/sun/tools/internal/xjc/util/Messages.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java                                                   |    3 
 src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java                                                      |    4 
 src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/Util.java                                                            |    4 
 src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java                                               |   34 
 src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java                                                       |   10 
 src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java                                                   |   19 
 src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java                                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java                                                 |   56 
 src/share/classes/com/sun/xml/internal/bind/IDResolver.java                                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/Locatable.java                                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/Util.java                                                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java                                              |   13 
 src/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java                                                   |   25 
 src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java                                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/api/Bridge.java                                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java                                                |    3 
 src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java                                                     |   49 
 src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java                                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java                                                     |   16 
 src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java                                                     |   26 
 src/share/classes/com/sun/xml/internal/bind/api/package-info.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java                                     |    6 
 src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java                                                 |   23 
 src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java                                          |   12 
 src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java                                                   |   30 
 src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties                                             |   33 
 src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java                                       |   43 
 src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java                                      |   55 
 src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java                                           |   14 
 src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java                                                  |   24 
 src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java                                                  |   89 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java                                               |   73 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java                                           |   24 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java                                                 |   26 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties                                           |   34 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java                                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java                                                   |  307 -
 src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java                                     |   19 
 src/share/classes/com/sun/xml/internal/bind/util/Which.java                                                            |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java                                                       |   46 
 src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java                                                     |   33 
 src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/TODO.java                                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java                                                 |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java                                    |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java                                              |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java                               |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java                                   |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java                                               |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java                                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java                                              |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java                                   |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java                                            |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java                                           |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java                                           |   89 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java                                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java                                 |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java                                                |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties                                          |   44 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java                                            |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java                                        |    7 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java                               |  127 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java                              |  160 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java                                    |   21 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java                                     |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java                              |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java                                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java                                                    |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java                                                |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java                                      |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java                                      |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java                                         |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/package-info.java                                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java                                            |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java                                          |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java                                             |   40 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java                                                 |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java                                                 |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java                                          |   63 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java                                      |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java                                                |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java                                        |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java                                |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java                                            |  184 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java                                                |   95 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java                                           |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java                                             |   32 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties                                             |   22 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java                                                       |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java                                                |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java                                                   |    7 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java                                          |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java                                      |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java                                              |   73 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java                       |  145 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java                                    |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java                                |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java                                           |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java                                       |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java                               |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java                                           |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java                               |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java                        |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java                                 |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java                                          |   12 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java                                      |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java                         |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java                                        |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java                                 |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java                                           |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java                                             |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java                        |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java                           |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java                      |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java                         |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java                          |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java                        |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java                           |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java                          |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java                                 |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java                        |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java                           |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java                            |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java                            |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java                                       |   21 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java                       |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java                                   |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java                             |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java                          |   70 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java                           |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java                                        |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java                                 |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java                                      |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties                                |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java                                  |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java                            |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java                           |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java                               |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java                              |   27 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java                          |   91 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java                        |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java                           |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java                                |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java                                    |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java                                  |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java                                                     |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java                                       |   59 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java                                        |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java                                         |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java                                         |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java                                     |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java                                       |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java                                           |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java                                              |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java                                                  |   31 
 src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java                                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java                                                      |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java                                                        |   22 
 src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java                                              |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties                                         |  101 
 src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java                                         |   47 
 src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java                                           |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java                                                        |  499 -
 src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java                                             |  342 -
 src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java                                                        |  715 +-
 src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java                                              |   78 
 src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java                                                  |  108 
 src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java                                                 |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java                              |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java                             |   55 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java                             |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java                      |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java                        |   10 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java                              |   96 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java                               |   76 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java                         |   30 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java                |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java                                 |   76 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java                             |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java                                |  101 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java                                |   42 
 src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java                            |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java                                          |  461 -
 src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java                                      |   82 
 src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java                                 |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties                                 |    7 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java                                           |   46 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java                                                   |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java                                                 |    3 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java                                          |  518 +
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java                                      |  106 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java                     |   83 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java                                           |   40 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java                                             |   25 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java                                        |  522 +
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java                                    |  295 -
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java                                               |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java                                      |   37 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java                                    |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java                                       |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java                                           |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java                                      |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java                                   |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java                                    |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java                              |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java                               |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java                                          |   68 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java                                      |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java                         |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java                                       |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java                             |   48 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java                                    |   38 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java                                    |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java                                  |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java                                 |   42 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java                                  |   72 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java                                       |    4 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java                                  |   70 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java                                  |   84 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java                                 |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java                                   |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java                                    |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java                           |   18 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java                       |   22 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java                               |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java                          |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java                                               |   30 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java                                           |   95 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java                                       |  111 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java                                           |   37 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java                                     |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java                                      |  116 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java                                           |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java                                               |   22 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java                                          |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java                                                 |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java                                            |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java                                           |   78 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java                                           |   10 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java                                  |   80 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java                                |   34 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java                                    |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java                                                 |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java                                |   68 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java                            |  107 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java                                               |  166 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java                                        |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java                                               |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java                                              |   64 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java                                                |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java                               |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java                                         |  108 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java                                     |   74 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java                                               |   14 
 src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java                                           |   69 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java                               |   85 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java                        |    6 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties                               |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java                                       |    4 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java                           |  102 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java                          |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java                     |  260 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java                  |  112 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java                         |  170 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java                     |  440 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java                     |   30 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java                        |  318 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java                       |  500 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java                  |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java                         | 1840 +++---
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java                       |  156 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java                      |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java                   |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java                         |   12 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java                            |  148 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java                     |  236 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java                     |  228 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java                          |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java                         |   88 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java                          |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java                          |   60 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java                         |  158 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java                         |  136 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java                         |  254 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java                         |  166 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java                                     |   46 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java                                               |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java                                        |   20 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java                          |   23 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java                                  |   58 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java                                |   13 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java                                 |   14 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java                                     |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java                                            |  132 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java                            |   64 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java                                    |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java                                           |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java                                   |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java                                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java                                        |   33 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java                                        |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java                                           |  191 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java                           |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java                               |  201 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java                                  |   23 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java                         |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java                  |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java                                   |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java                                          |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java                                         |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java                                       |   13 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java                                   |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java                                        |   30 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java                                    |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java                                       |   93 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java                                      |   58 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java                                  |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java                                         |   21 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java                                        |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties                                |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java                                          |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java                                     |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties                                |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java                                          |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java                                     |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java                                   |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java                                 |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java                                    |   64 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java                             |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java                                   |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java                            |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties                              |    6 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java                                  |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java                              |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java                                     |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java                                   |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java                                    |   15 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java                             |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java                                   |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java                            |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties                              |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java                                  |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java                              |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java                                                 |   84 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java                                        |   10 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java                                       |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java                                             |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java                                             |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java                                  |  103 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java                                         |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java                                       |   37 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java                                                |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java                                     |   33 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java                                        |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java                               |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java                                              |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java                                             |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java                                 |   39 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java                                         |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java                                   |   10 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java                |   79 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java                                    |   14 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java                           |    6 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java                             |    4 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java                                   |   10 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java                                 |    6 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java                                    |   62 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java                                    |   20 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java                                |  186 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java                                    |   12 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java                                   |   10 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java                                           |   32 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java                            |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java                      |   36 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java                  |   38 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java                           |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java                                |   78 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java                                |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java                      |   52 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java                 |    4 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java          |  148 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java                |   34 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java                         |   22 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java                 |   62 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java                                                |   36 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java                                             |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java                                   |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java                                        |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java                                         |    3 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java                                         |   16 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java                                           |    2 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java                                            |   10 
 src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java                                       |   12 
 src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java                                                  |    6 
 src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java                                              |   10 
 src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java                                                 |    7 
 src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java                                                |    8 
 src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java                                             |   16 
 src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java                                                   |    8 
 src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java                                              |   18 
 src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java                                                |    6 
 src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java                                                    |   11 
 src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java                                             |   52 
 src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java                                         |    2 
 src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java                                      |   12 
 src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java                                   |    6 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java                                    |    8 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java                             |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java                              |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties                                            |    1 
 src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java                                                         |   14 
 src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java                                              |   10 
 src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java                                             |    5 
 src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/rngom/parse/Context.java                                                        |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties                                                 |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java                                          |    2 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java                              |   76 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java                                         |   10 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties                                         |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java                                          |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java                                           |   12 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java                                           |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java                                    |   12 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java                                                   |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java                              |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java                                               |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java                                        |   16 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java                                               |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java                                              |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java                                      |   22 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java                               |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java                                       |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java                                         |  108 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java                                                 |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties                                             |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java                                               |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java                                               |  284 -
 src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/rngom/util/Uri.java                                                             |   72 
 src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java                                                           |    1 
 src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java                                         |    8 
 src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java                                               |    2 
 src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java                                                 |   17 
 src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java                                                      |   24 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java                                              |   46 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java                                     |   28 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java                                            |   72 
 src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java                                             |    2 
 src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java                                              |   18 
 src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java                                       |   72 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java                                              |   32 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java                                     |    4 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java                                          |   18 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java                                        |   30 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java                                        |   16 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java                                |   16 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java                                                 |   10 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java                                               |    3 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java                                         |  124 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java                                       |   96 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java                                   |   84 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java                                     |   29 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java                               |   45 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java                             |   29 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java                               |   22 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java                             |  136 
 src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java                                                        |    6 
 src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java                                                      |  661 +-
 src/share/classes/com/sun/xml/internal/txw2/TXW.java                                                                   |   10 
 src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java                                                   |    4 
 src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java                                         |    6 
 src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java                                                     |   22 
 src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java                                              |   10 
 src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java                                             |    2 
 src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java                                                      |   92 
 src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java                                        |    3 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java                                                |   26 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java                                                |  104 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java                                                      |  107 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java                                                |   32 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java                                            |   17 
 src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java                            |    9 
 src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java                                    |   17 
 src/share/classes/com/sun/xml/internal/ws/api/BindingID.java                                                           |   36 
 src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java                                                         |    6 
 src/share/classes/com/sun/xml/internal/ws/api/WSService.java                                                           |   82 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java                         |   51 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java                                      |   30 
 src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java                                 |    8 
 src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java                                                     |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/Message.java                                                     |   26 
 src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java                                                    |   34 
 src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java                                                      |   99 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java                                   |   12 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java                                   |   10 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java                               |   14 
 src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java                                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java                                                    |   24 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java                                       |   44 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java                                        |    9 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java                                                |   19 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java                                                |   28 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java                                              |    5 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java                                                |   20 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java                                               |   23 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java                                     |    7 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java                                     |   90 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java                                                          |    6 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java                                                         |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java                                                         |   27 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java                                                          |   32 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java                                                     |    9 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java                                     |    7 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java                                     |   31 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java                                                |   11 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java                                                          |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java                                  |    8 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java                                        |    6 
 src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java                                                |   22 
 src/share/classes/com/sun/xml/internal/ws/api/server/Container.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java                                             |   38 
 src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java                                   |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/Module.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java                                          |   18 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java                                                   |   12 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java                                                   |   35 
 src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java                                    |  115 
 src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java                                    |   54 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java                                     |   28 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java                              |   13 
 src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java                                                     |    8 
 src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java                                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java                                                 |   24 
 src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java                                           |    9 
 src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java                                                     |   15 
 src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java                                                |    4 
 src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java                                         |    1 
 src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java                                               |   10 
 src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java                                             |   17 
 src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java                                                         |    3 
 src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java                                                   |    4 
 src/share/classes/com/sun/xml/internal/ws/client/Stub.java                                                             |   75 
 src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java                                                |  147 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java                                            |   77 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java                                         |    2 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java                                     |   31 
 src/share/classes/com/sun/xml/internal/ws/client/package-info.java                                                     |  134 
 src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java                                           |  262 
 src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java                                                |   18 
 src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java                                         |    4 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java                                              |   72 
 src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java                                                      |   11 
 src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java                                            |  161 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java                                                  |   14 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java                                                  |   67 
 src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java                                               |  141 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java                                    |   12 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java                             |   35 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java                             |    6 
 src/share/classes/com/sun/xml/internal/ws/developer/Stateful.java                                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java                                     |    4 
 src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java                                             |   20 
 src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java                                                |   44 
 src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java                                                      |   86 
 src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java                                            |  458 -
 src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java                                                      |  259 
 src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java                                               |  220 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java                                                |   32 
 src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java                                                       |   21 
 src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java                                                     |   11 
 src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java                                            |  141 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java                                   |   51 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java                               |    6 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java                     |   14 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java                  |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java                       |    2 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java                       |    6 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java                         |   36 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java                                  |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java                                           |   10 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java                        |   10 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java                          |    2 
 src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java                                                   |   11 
 src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java                                                 |  284 -
 src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java                                                       |   22 
 src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java                                                       |   49 
 src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java                                                  |   82 
 src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java                                        |   69 
 src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java                                           |   65 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java                                              |    8 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java                                                |    6 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java                                                     |  129 
 src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java                                              |   18 
 src/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java                                         |   20 
 src/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java                                            |    4 
 src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java                                          |   13 
 src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java                                        |   85 
 src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java                                           |   81 
 src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java                                             |   10 
 src/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java                                               |    2 
 src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java                                      |    5 
 src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java                                             |    8 
 src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java                                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java                                           |    7 
 src/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java                                                |    4 
 src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java                                                  |   15 
 src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java                                               |    6 
 src/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java                                                 |   14 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java                                                |   24 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java                                                |  393 -
 src/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java                                     |    2 
 src/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java                               |    2 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java                                         |    3 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java                                             |    6 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java                                           |    8 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java                                           |    8 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java                                            |   78 
 src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java                                              |   59 
 src/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java                                              |   12 
 src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java                                                    |   33 
 src/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java                                                     |    6 
 src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java                                                    |  211 
 src/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java                                                      |    7 
 src/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java                                       |  109 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java                                        |   18 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java                                               |   12 
 src/share/classes/com/sun/xml/internal/ws/package-info.java                                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java                                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java                                            |  100 
 src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java                                                |   80 
 src/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java                                              |   32 
 src/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java                                              |   24 
 src/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java                                               |   16 
 src/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java                                            |    4 
 src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java                                               |   60 
 src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java                                           |   32 
 src/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java                                                |   10 
 src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java                                                |  193 
 src/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java                                             |   40 
 src/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java                                                  |   18 
 src/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java                                             |    8 
 src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java                                             |  338 -
 src/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java                                            |   24 
 src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties                                              |    6 
 src/share/classes/com/sun/xml/internal/ws/resources/client.properties                                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/handler.properties                                                 |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties                                              |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties                                                 |    8 
 src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties                                             |    3 
 src/share/classes/com/sun/xml/internal/ws/resources/sender.properties                                                  |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/server.properties                                                  |   26 
 src/share/classes/com/sun/xml/internal/ws/resources/soap.properties                                                    |    3 
 src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/util.properties                                                    |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties                                               |    7 
 src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties                                              |    1 
 src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java                                         |   46 
 src/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java                                        |    2 
 src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java                                                  |   30 
 src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java                                                   |   62 
 src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java                                         |    5 
 src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java                                                  |   10 
 src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java                                                      |   15 
 src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java                                                   |   35 
 src/share/classes/com/sun/xml/internal/ws/server/package-info.java                                                     |   80 
 src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java                                |    2 
 src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java                              |   13 
 src/share/classes/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java                                        |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java                                     |  107 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java                                     |    3 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java                               |    3 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java                                        |   28 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java                               |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java                                          |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java                                  |   72 
 src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java                                               |   37 
 src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java                                                        |   19 
 src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java                                               |   74 
 src/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java                                           |   14 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java                                            |    5 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java                                           |   17 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java                                           |   47 
 src/share/classes/com/sun/xml/internal/ws/transport/Headers.java                                                       |   11 
 src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java                               |    9 
 src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java                                              |  211 
 src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java                                         |   16 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java                               |  224 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java                            |    2 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java                                 |  102 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java                                      |   13 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java                              |  490 -
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java                                         |   30 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java                                     |   18 
 src/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java                                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java                                                    |    7 
 src/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java                                                            |    6 
 src/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java                                              |    8 
 src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java                                              |   12 
 src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java                                         |    5 
 src/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/util/Pool.java                                                               |   24 
 src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java                                                           |   12 
 src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java                                                     |   36 
 src/share/classes/com/sun/xml/internal/ws/util/UtilException.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java                                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties                                        |    1 
 src/share/classes/com/sun/xml/internal/ws/util/version.properties                                                      |    8 
 src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java                                |    8 
 src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java                                                     |   57 
 src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java                               |   12 
 src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java                                                        |   48 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java                                   |   21 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java                                    |   15 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java                                                  |   36 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java                                           |  123 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java                                               |    2 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java                              |   10 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java                                   |    8 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java                                             |    3 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java                         |   50 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java                                               |  129 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/xsom/SCD.java                                                                   |    1 
 src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java                                                          |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java                                                        |   16 
 src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java                                                        |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java                                                       |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java                                                        |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java                                                         |   37 
 src/share/classes/com/sun/xml/internal/xsom/XSComponent.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSContentType.java                                                         |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java                                                         |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java                                                         |   45 
 src/share/classes/com/sun/xml/internal/xsom/XSFacet.java                                                               |   12 
 src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java                                                  |    1 
 src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java                                                          |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSNotation.java                                                            |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSParticle.java                                                            |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java                                               |   16 
 src/share/classes/com/sun/xml/internal/xsom/XSSchema.java                                                              |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java                                                          |   38 
 src/share/classes/com/sun/xml/internal/xsom/XSTerm.java                                                                |   10 
 src/share/classes/com/sun/xml/internal/xsom/XSType.java                                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java                                                     |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSVariety.java                                                             |    7 
 src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java                                                            |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSXPath.java                                                               |    3 
 src/share/classes/com/sun/xml/internal/xsom/XmlString.java                                                             |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java                                                   |   26 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java                                                 |   22 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java                                                |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java                                                 |   18 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java                                                 |    9 
 src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java                                                  |  117 
 src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/Const.java                                                            |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java                                                  |   12 
 src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java                                                      |   68 
 src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java                                                        |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java                                                        |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java                                           |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java                                               |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java                                               |   16 
 src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java                                                     |   12 
 src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java                                                     |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java                                                              |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java                                        |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java                                                       |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java                                                    |   29 
 src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/UName.java                                                            |   43 
 src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java                                              |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/Util.java                                                             |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java                                                     |   36 
 src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java                                                        |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/package.html                                                          |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java                                            |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java                                   |   19 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java                                                |   47 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java                                                  |    8 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties                                            |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties                                         |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java                                             |   89 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java                                             |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java                                                     |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java                                            |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java                                   |   16 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java                                     |    8 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java                                      |   37 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java                                   |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java                                     |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java                                         |   50 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java                                |   74 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java                                         |  154 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java                                              |  809 +--
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java                                     |  177 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java                              |  153 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java                                    |  277 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java                                          |   25 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java                                   |  317 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java                                  |  259 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java                                       |  689 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java                                         | 1465 ++---
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java                     |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java                                     |  770 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java                                               |   25 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java                                              |   15 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java                                               |  163 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java                                   |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java                                               |  247 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java                                  |  281 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java                                          |  173 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java                                         |   79 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java                                      |  175 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java                                            |  257 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java                                              |  135 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java                                            |  701 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java                                               |   13 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java                                       |    3 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java                                            |  143 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java                                          |  195 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java                                        |  207 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java                                               |  133 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java                                             |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java                                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java                                                    |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java                                               |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java                                           |  105 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java                                        |   82 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java                                             |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java                                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java                                       |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java                                      |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java                                                |  204 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java                                                         |   26 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java                                              |   16 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java                                               |   13 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java                                        |    5 
 src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java                                                     |   46 
 src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java                                                      |   12 
 src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java                                                     |   50 
 src/share/classes/com/sun/xml/internal/xsom/parser/package.html                                                        |    2 
 src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java                                            |    6 
 src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java                                                |    1 
 src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java                                       |    1 
 src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java                                                       |   22 
 src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties                                                 |   31 
 src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java                                                    |   10 
 src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java                                                      |   14 
 src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java                                                          |   12 
 src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java                                                         |   10 
 src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java                                                 |   16 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java                                         |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java                                          |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java                                                    |    6 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java                                          |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java                                                |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java                                       |    1 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java                                                 |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java                                                     |    2 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java                                            |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java                                             |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/package.html                                                       |    2 
 src/share/classes/java/beans/Introspector.java                                                                         |   29 
 src/share/classes/java/beans/MetaData.java                                                                             |   83 
 src/share/classes/java/net/Socket.java                                                                                 |   15 
 src/share/classes/java/net/SocksSocketImpl.java                                                                        |   26 
 src/share/classes/java/net/URL.java                                                                                    |   10 
 src/share/classes/javax/accessibility/AccessibleResourceBundle.java                                                    |   15 
 src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java                                                    |    2 
 src/share/classes/javax/imageio/spi/ImageReaderSpi.java                                                                |    6 
 src/share/classes/javax/imageio/spi/ImageWriterSpi.java                                                                |    6 
 src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java                                                  |   10 
 src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java                                                 |   10 
 src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java                                        |    9 
 src/share/classes/javax/management/openmbean/OpenType.java                                                             |    5 
 src/share/classes/javax/swing/plaf/synth/Region.java                                                                   |  292 -
 src/share/classes/javax/xml/bind/Binder.java                                                                           |   92 
 src/share/classes/javax/xml/bind/ContextFinder.java                                                                    |   63 
 src/share/classes/javax/xml/bind/DatatypeConverter.java                                                                |  170 
 src/share/classes/javax/xml/bind/DatatypeConverterImpl.java                                                            |    2 
 src/share/classes/javax/xml/bind/DatatypeConverterInterface.java                                                       |  138 
 src/share/classes/javax/xml/bind/JAXBContext.java                                                                      |  206 
 src/share/classes/javax/xml/bind/JAXBElement.java                                                                      |   52 
 src/share/classes/javax/xml/bind/JAXBException.java                                                                    |   42 
 src/share/classes/javax/xml/bind/JAXBIntrospector.java                                                                 |   30 
 src/share/classes/javax/xml/bind/MarshalException.java                                                                 |   30 
 src/share/classes/javax/xml/bind/Marshaller.java                                                                       |  220 
 src/share/classes/javax/xml/bind/Messages.java                                                                         |   20 
 src/share/classes/javax/xml/bind/Messages.properties                                                                   |   26 
 src/share/classes/javax/xml/bind/NotIdentifiableEvent.java                                                             |    8 
 src/share/classes/javax/xml/bind/ParseConversionEvent.java                                                             |    6 
 src/share/classes/javax/xml/bind/PrintConversionEvent.java                                                             |    6 
 src/share/classes/javax/xml/bind/PropertyException.java                                                                |   66 
 src/share/classes/javax/xml/bind/UnmarshalException.java                                                               |   32 
 src/share/classes/javax/xml/bind/Unmarshaller.java                                                                     |  382 -
 src/share/classes/javax/xml/bind/UnmarshallerHandler.java                                                              |   26 
 src/share/classes/javax/xml/bind/ValidationEvent.java                                                                  |   38 
 src/share/classes/javax/xml/bind/ValidationEventHandler.java                                                           |   43 
 src/share/classes/javax/xml/bind/ValidationEventLocator.java                                                           |   30 
 src/share/classes/javax/xml/bind/ValidationException.java                                                              |   24 
 src/share/classes/javax/xml/bind/Validator.java                                                                        |  114 
 src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java                                                        |    7 
 src/share/classes/javax/xml/bind/annotation/XmlAccessType.java                                                         |    7 
 src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java                                                      |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java                                                       |   22 
 src/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java                                                       |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAnyElement.java                                                         |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAttribute.java                                                          |   22 
 src/share/classes/javax/xml/bind/annotation/XmlElement.java                                                            |   26 
 src/share/classes/javax/xml/bind/annotation/XmlElementDecl.java                                                        |   36 
 src/share/classes/javax/xml/bind/annotation/XmlElementRef.java                                                         |   26 
 src/share/classes/javax/xml/bind/annotation/XmlElementRefs.java                                                        |    2 
 src/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java                                                     |   14 
 src/share/classes/javax/xml/bind/annotation/XmlElements.java                                                           |   18 
 src/share/classes/javax/xml/bind/annotation/XmlEnum.java                                                               |   12 
 src/share/classes/javax/xml/bind/annotation/XmlEnumValue.java                                                          |   16 
 src/share/classes/javax/xml/bind/annotation/XmlID.java                                                                 |   21 
 src/share/classes/javax/xml/bind/annotation/XmlIDREF.java                                                              |   50 
 src/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java                                                   |   12 
 src/share/classes/javax/xml/bind/annotation/XmlList.java                                                               |   12 
 src/share/classes/javax/xml/bind/annotation/XmlMimeType.java                                                           |    2 
 src/share/classes/javax/xml/bind/annotation/XmlMixed.java                                                              |   50 
 src/share/classes/javax/xml/bind/annotation/XmlNs.java                                                                 |    8 
 src/share/classes/javax/xml/bind/annotation/XmlNsForm.java                                                             |   13 
 src/share/classes/javax/xml/bind/annotation/XmlRootElement.java                                                        |   18 
 src/share/classes/javax/xml/bind/annotation/XmlSchema.java                                                             |   22 
 src/share/classes/javax/xml/bind/annotation/XmlSchemaType.java                                                         |   17 
 src/share/classes/javax/xml/bind/annotation/XmlTransient.java                                                          |   17 
 src/share/classes/javax/xml/bind/annotation/XmlType.java                                                               |  110 
 src/share/classes/javax/xml/bind/annotation/XmlValue.java                                                              |   30 
 src/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java                                                   |   24 
 src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java                                           |   16 
 src/share/classes/javax/xml/bind/annotation/adapters/package.html                                                      |    4 
 src/share/classes/javax/xml/bind/annotation/package.html                                                               |   26 
 src/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java                                                  |   87 
 src/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java                                                |   36 
 src/share/classes/javax/xml/bind/attachment/package.html                                                               |   18 
 src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java                                                   |  142 
 src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java                                                 |  116 
 src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java                                            |   43 
 src/share/classes/javax/xml/bind/helpers/Messages.java                                                                 |   26 
 src/share/classes/javax/xml/bind/helpers/Messages.properties                                                           |   34 
 src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java                                                      |   64 
 src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java                                               |  106 
 src/share/classes/javax/xml/bind/helpers/package.html                                                                  |   16 
 src/share/classes/javax/xml/bind/package.html                                                                          |   10 
 src/share/classes/javax/xml/bind/util/JAXBResult.java                                                                  |   50 
 src/share/classes/javax/xml/bind/util/JAXBSource.java                                                                  |   62 
 src/share/classes/javax/xml/bind/util/Messages.java                                                                    |   18 
 src/share/classes/javax/xml/bind/util/Messages.properties                                                              |   23 
 src/share/classes/javax/xml/bind/util/ValidationEventCollector.java                                                    |   34 
 src/share/classes/javax/xml/bind/util/package.html                                                                     |   10 
 src/share/classes/javax/xml/soap/AttachmentPart.java                                                                   |  186 
 src/share/classes/javax/xml/soap/Detail.java                                                                           |    6 
 src/share/classes/javax/xml/soap/DetailEntry.java                                                                      |    6 
 src/share/classes/javax/xml/soap/FactoryFinder.java                                                                    |   12 
 src/share/classes/javax/xml/soap/MessageFactory.java                                                                   |   32 
 src/share/classes/javax/xml/soap/MimeHeader.java                                                                       |   18 
 src/share/classes/javax/xml/soap/MimeHeaders.java                                                                      |    6 
 src/share/classes/javax/xml/soap/Name.java                                                                             |   24 
 src/share/classes/javax/xml/soap/Node.java                                                                             |   30 
 src/share/classes/javax/xml/soap/SAAJMetaFactory.java                                                                  |   38 
 src/share/classes/javax/xml/soap/SAAJResult.java                                                                       |   92 
 src/share/classes/javax/xml/soap/SOAPBody.java                                                                         |  112 
 src/share/classes/javax/xml/soap/SOAPBodyElement.java                                                                  |   10 
 src/share/classes/javax/xml/soap/SOAPConnection.java                                                                   |   12 
 src/share/classes/javax/xml/soap/SOAPConnectionFactory.java                                                            |    9 
 src/share/classes/javax/xml/soap/SOAPConstants.java                                                                    |   26 
 src/share/classes/javax/xml/soap/SOAPElement.java                                                                      |  144 
 src/share/classes/javax/xml/soap/SOAPElementFactory.java                                                               |    6 
 src/share/classes/javax/xml/soap/SOAPEnvelope.java                                                                     |    6 
 src/share/classes/javax/xml/soap/SOAPException.java                                                                    |    6 
 src/share/classes/javax/xml/soap/SOAPFactory.java                                                                      |   54 
 src/share/classes/javax/xml/soap/SOAPFault.java                                                                        |  218 
 src/share/classes/javax/xml/soap/SOAPFaultElement.java                                                                 |    8 
 src/share/classes/javax/xml/soap/SOAPHeader.java                                                                       |   14 
 src/share/classes/javax/xml/soap/SOAPHeaderElement.java                                                                |   74 
 src/share/classes/javax/xml/soap/SOAPMessage.java                                                                      |  134 
 src/share/classes/javax/xml/soap/SOAPPart.java                                                                         |   14 
 src/share/classes/javax/xml/soap/Text.java                                                                             |    6 
 src/share/classes/javax/xml/soap/package.html                                                                          |   12 
 src/share/classes/javax/xml/ws/Action.java                                                                             |   22 
 src/share/classes/javax/xml/ws/Binding.java                                                                            |   10 
 src/share/classes/javax/xml/ws/BindingProvider.java                                                                    |   78 
 src/share/classes/javax/xml/ws/Dispatch.java                                                                           |   12 
 src/share/classes/javax/xml/ws/Endpoint.java                                                                           |   66 
 src/share/classes/javax/xml/ws/EndpointReference.java                                                                  |   42 
 src/share/classes/javax/xml/ws/FaultAction.java                                                                        |   10 
 src/share/classes/javax/xml/ws/Holder.java                                                                             |    4 
 src/share/classes/javax/xml/ws/LogicalMessage.java                                                                     |    8 
 src/share/classes/javax/xml/ws/RequestWrapper.java                                                                     |    9 
 src/share/classes/javax/xml/ws/RespectBinding.java                                                                     |    6 
 src/share/classes/javax/xml/ws/RespectBindingFeature.java                                                              |   28 
 src/share/classes/javax/xml/ws/Response.java                                                                           |    4 
 src/share/classes/javax/xml/ws/ResponseWrapper.java                                                                    |    9 
 src/share/classes/javax/xml/ws/Service.java                                                                            |  183 
 src/share/classes/javax/xml/ws/ServiceMode.java                                                                        |    2 
 src/share/classes/javax/xml/ws/WebEndpoint.java                                                                        |    2 
 src/share/classes/javax/xml/ws/WebFault.java                                                                           |    4 
 src/share/classes/javax/xml/ws/WebServiceClient.java                                                                   |    2 
 src/share/classes/javax/xml/ws/WebServiceContext.java                                                                  |   12 
 src/share/classes/javax/xml/ws/WebServiceException.java                                                                |   24 
 src/share/classes/javax/xml/ws/WebServiceFeature.java                                                                  |   36 
 src/share/classes/javax/xml/ws/WebServiceProvider.java                                                                 |    6 
 src/share/classes/javax/xml/ws/WebServiceRef.java                                                                      |    2 
 src/share/classes/javax/xml/ws/handler/Handler.java                                                                    |   14 
 src/share/classes/javax/xml/ws/handler/HandlerResolver.java                                                            |    4 
 src/share/classes/javax/xml/ws/handler/LogicalHandler.java                                                             |    2 
 src/share/classes/javax/xml/ws/handler/LogicalMessageContext.java                                                      |    8 
 src/share/classes/javax/xml/ws/handler/MessageContext.java                                                             |   46 
 src/share/classes/javax/xml/ws/handler/PortInfo.java                                                                   |    8 
 src/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java                                                           |    4 
 src/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java                                                    |   14 
 src/share/classes/javax/xml/ws/http/HTTPBinding.java                                                                   |    4 
 src/share/classes/javax/xml/ws/http/HTTPException.java                                                                 |   10 
 src/share/classes/javax/xml/ws/soap/Addressing.java                                                                    |   24 
 src/share/classes/javax/xml/ws/soap/AddressingFeature.java                                                             |   58 
 src/share/classes/javax/xml/ws/soap/MTOM.java                                                                          |   18 
 src/share/classes/javax/xml/ws/soap/MTOMFeature.java                                                                   |   40 
 src/share/classes/javax/xml/ws/soap/SOAPBinding.java                                                                   |   16 
 src/share/classes/javax/xml/ws/soap/SOAPFaultException.java                                                            |    6 
 src/share/classes/javax/xml/ws/spi/FactoryFinder.java                                                                  |   14 
 src/share/classes/javax/xml/ws/spi/Provider.java                                                                       |   60 
 src/share/classes/javax/xml/ws/spi/ServiceDelegate.java                                                                |  162 
 src/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java                                                    |    8 
 src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java                                                  |   29 
 src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java                                           |   62 
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java                                            |   39 
 src/share/classes/org/relaxng/datatype/Datatype.java                                                                   |    1 
 src/share/classes/org/relaxng/datatype/DatatypeBuilder.java                                                            |    1 
 src/share/classes/org/relaxng/datatype/DatatypeException.java                                                          |    1 
 src/share/classes/org/relaxng/datatype/DatatypeLibrary.java                                                            |    1 
 src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java                                                     |    1 
 src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java                                                 |    1 
 src/share/classes/org/relaxng/datatype/ValidationContext.java                                                          |    1 
 src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java                                              |    3 
 src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java                                       |    1 
 src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java                                             |    1 
 src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java                                                     |   20 
 src/share/lib/security/java.security                                                                                   |    2 
 src/share/lib/security/java.security-solaris                                                                           |    2 
 src/share/lib/security/java.security-windows                                                                           |    2 
 src/share/native/com/sun/java/util/jar/pack/unpack.cpp                                                                 |   10 
 src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c                                                              |   26 
 2008 files changed, 56587 insertions(+), 28511 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 java-1.6.0-openjdk-securitypatches.patchIndex: java-1.6.0-openjdk-securitypatches.patch
===================================================================
RCS file: java-1.6.0-openjdk-securitypatches.patch
diff -N java-1.6.0-openjdk-securitypatches.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java-1.6.0-openjdk-securitypatches.patch	5 Aug 2009 14:11:40 -0000	1.3
@@ -0,0 +1,171008 @@
+--- old/jdk/src/share/classes/javax/swing/text/LayoutQueue.java	2009-07-17 10:36:04.000000000 -0400
++++ openjdk/jdk/src/share/classes/javax/swing/text/LayoutQueue.java	2009-07-22 11:25:41.000000000 -0400
+@@ -25,6 +25,7 @@
+ package javax.swing.text;
+ 
+ import java.util.Vector;
++import sun.awt.AppContext;
+ 
+ /**
+  * A queue of text layout tasks.
+@@ -35,10 +36,10 @@
+  */
+ public class LayoutQueue {
+ 
+-    Vector tasks;
+-    Thread worker;
++    private static final Object DEFAULT_QUEUE = new Object();	
+ 
+-    static LayoutQueue defaultQueue;
++    private Vector<Runnable> tasks;
++    private Thread worker;
+ 
+     /**
+      * Construct a layout queue.
+@@ -51,10 +52,15 @@
+      * Fetch the default layout queue.
+      */
+     public static LayoutQueue getDefaultQueue() {
+-        if (defaultQueue == null) {
+-            defaultQueue = new LayoutQueue();
++        AppContext ac = AppContext.getAppContext();
++        synchronized (DEFAULT_QUEUE) {
++            LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
++            if (defaultQueue == null) {
++                defaultQueue = new LayoutQueue();
++                ac.put(DEFAULT_QUEUE, defaultQueue);
++            }
++            return defaultQueue;
+         }
+-        return defaultQueue;
+     }
+ 
+     /**
+@@ -63,7 +69,9 @@
+      * @param q the new queue.
+      */
+     public static void setDefaultQueue(LayoutQueue q) {
+-        defaultQueue = q;
++        synchronized (DEFAULT_QUEUE) {
++            AppContext.getAppContext().put(DEFAULT_QUEUE, q);
++        }
+     }
+ 
+     /**
+--- old/jdk/src/share/classes/java/awt/Cursor.java	2009-07-17 10:36:02.000000000 -0400
++++ openjdk/jdk/src/share/classes/java/awt/Cursor.java	2009-07-22 11:28:14.000000000 -0400
+@@ -119,6 +119,11 @@
+ 
+     protected static Cursor predefined[] = new Cursor[14];
+ 
++    /**
++     * This field is a private replacement for 'predefined' array.
++     */
++    private final static Cursor[] predefinedPrivate = new Cursor[14];
++
+     /* Localization names and default values */
+     static final String[][] cursorProperties = {
+         { "AWT.DefaultCursor", "Default Cursor" },
+@@ -252,10 +257,15 @@
+         if (type < Cursor.DEFAULT_CURSOR || type > Cursor.MOVE_CURSOR) {
+             throw new IllegalArgumentException("illegal cursor type");
+         }
++        Cursor c = predefinedPrivate[type];
++        if (c == null) {
++            predefinedPrivate[type] = c = new Cursor(type);
++        }
++        // fill 'predefined' array for backwards compatibility.
+         if (predefined[type] == null) {
+-            predefined[type] = new Cursor(type);
++            predefined[type] = c;
+         }
+-        return predefined[type];
++        return c;
+     }
+ 
+     /**
+--- old/src/share/classes/javax/accessibility/AccessibleResourceBundle.java	Fri Jun 19 15:30:16 2009
++++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java	Fri Jun 19 15:30:14 2009
+@@ -44,15 +44,11 @@
+      * localized display strings.
+      */
+     public Object[][] getContents() {
+-        return contents;
+-    }
++        // The table holding the mapping between the programmatic keys
++        // and the display strings for the en_US locale.
++        return new Object[][] {
+ 
+-    /**
+-     * The table holding the mapping between the programmatic keys
+-     * and the display strings for the en_US locale.
+-     */
+-    static final Object[][] contents = {
+-    // LOCALIZE THIS
++        // LOCALIZE THIS
+         // Role names
+ //        { "application","application" },
+ //        { "border","border" },
+@@ -151,5 +147,6 @@
+         { "vertical","vertical" },
+         { "horizontal","horizontal" }
+     // END OF MATERIAL TO LOCALIZE
+-    };
++        };
++    }
+ }
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	2009-04-24 17:32:19.463300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	2009-04-24 17:32:18.529300000 +0400
+@@ -51,7 +51,7 @@
+               entensions,
+               mimeType,
+               "com.sun.imageio.plugins.bmp.BMPImageReader",
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               false,
+               null, null, null, null,
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	2009-04-24 17:32:32.537300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	2009-04-24 17:32:31.632300000 +0400
+@@ -32,6 +32,7 @@
+ import javax.imageio.spi.ImageWriterSpi;
+ import javax.imageio.spi.ServiceRegistry;
+ import javax.imageio.spi.IIORegistry;
++import javax.imageio.stream.ImageOutputStream;
+ import javax.imageio.ImageWriter;
+ import javax.imageio.ImageTypeSpecifier;
+ import javax.imageio.IIOException;
+@@ -55,7 +56,7 @@
+               entensions,
+               mimeType,
+               "com.sun.imageio.plugins.bmp.BMPImageWriter",
+-              STANDARD_OUTPUT_TYPE,
++              new Class[] { ImageOutputStream.class },
+               readerSpiNames,
+               false,
+               null, null, null, null,
+--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	2009-04-24 17:32:39.646300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	2009-04-24 17:32:38.722300000 +0400
+@@ -62,7 +62,7 @@
+               suffixes,
+               MIMETypes,
+               readerClassName,
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               true,
+               GIFStreamMetadata.nativeMetadataFormatName,
+--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	2009-04-24 17:32:48.539300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	2009-04-24 17:32:44.764300000 +0400
+@@ -31,6 +31,7 @@
+ import javax.imageio.ImageTypeSpecifier;
+ import javax.imageio.ImageWriter;
+ import javax.imageio.spi.ImageWriterSpi;
++import javax.imageio.stream.ImageOutputStream;
+ import com.sun.imageio.plugins.common.PaletteBuilder;
+ 
+ public class GIFImageWriterSpi extends ImageWriterSpi {
+@@ -59,7 +60,7 @@
+               suffixes,
+               MIMETypes,
+               writerClassName,
+-              STANDARD_OUTPUT_TYPE,
++              new Class[] { ImageOutputStream.class },
+               readerSpiNames,
+               true,
+               GIFWritableStreamMetadata.NATIVE_FORMAT_NAME,
+--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java	2009-04-24 17:32:57.302300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java	2009-04-24 17:32:56.484300000 +0400
+@@ -48,7 +48,7 @@
+               JPEG.suffixes,
+               JPEG.MIMETypes,
+               "com.sun.imageio.plugins.jpeg.JPEGImageReader",
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               true,
+               JPEG.nativeStreamMetadataFormatName,
+--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java	2009-04-24 17:33:03.013300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java	2009-04-24 17:33:02.189300000 +0400
+@@ -28,6 +28,7 @@
+ import javax.imageio.spi.ImageWriterSpi;
+ import javax.imageio.spi.ServiceRegistry;
+ import javax.imageio.spi.IIORegistry;
[...170615 lines suppressed...]
+-
+-import javax.xml.namespace.QName;
+-
+-/**
+- * <p> XMLReader provides a high-level streaming parser interface
+- * for reading XML documents. </p>
+- *
+- * <p> The {@link #next} method is used to read events from the XML document. </p>
+- *
+- * <p> Each time it is called, {@link #next} returns the new state of the reader. </p>
+- *
+- * <p> Possible states are: BOF, the initial state, START, denoting the start
+- * tag of an element, END, denoting the end tag of an element, CHARS, denoting
+- * the character content of an element, PI, denoting a processing instruction,
+- * EOF, denoting the end of the document. </p>
+- *
+- * <p> Depending on the state the reader is in, one or more of the following
+- * query methods will be meaningful: {@link #getName}, {@link #getURI},
+- * {@link #getLocalName}, {@link #getAttributes}, {@link #getValue}. </p>
+- *
+- * <p> Elements visited by a XMLReader are tagged with unique IDs. The ID of the
+- * current element can be found by calling {@link #getElementId}. </p>
+- *
+- * <p> A XMLReader is always namespace-aware, and keeps track of the namespace
+- * declarations which are in scope at any time during streaming. The
+- * {@link #getURI(java.lang.String)} method can be used to find the URI
+- * associated to a given prefix in the current scope. </p>
+- *
+- * <p> XMLReaders can be created using a {@link XMLReaderFactory}. </p>
+- *
+- * <p> Some utility methods, {@link #nextContent} and {@link #nextElementContent}
+- * make it possible to ignore whitespace and processing instructions with
+- * minimum impact on the client code. </p>
+- *
+- * <p> Similarly, the {@link #skipElement} and {@link #skipElement(int elementId)}
+- * methods allow to skip to the end tag of an element ignoring all its content. </p>
+- *
+- * <p> Finally, the {@link #recordElement} method can be invoked when the XMLReader
+- * is positioned on the start tag of an element to record the element's contents
+- * so that they can be played back later. </p>
+- *
+- * @see XMLReaderFactory
+- *
+- * @author WS Development Team
+- */
+-public interface XMLReader {
+-    /**
+-     * The initial state of a XMLReader.
+-     */
+-    public static final int BOF = 0;
+-
+-    /**
+-     * The state denoting the start tag of an element.
+-     */
+-    public static final int START = 1;
+-
+-    /**
+-     * The state denoting the end tag of an element.
+-     */
+-    public static final int END = 2;
+-
+-    /**
+-     * The state denoting the character content of an element.
+-     */
+-    public static final int CHARS = 3;
+-
+-    /**
+-     * The state denoting a processing instruction.
+-     */
+-    public static final int PI = 4;
+-
+-    /**
+-     * The state denoting that the end of the document has been reached.
+-     */
+-    public static final int EOF = 5;
+-
+-    /**
+-     * Return the next state of the XMLReader.
+-     *
+-     * The return value is one of: START, END, CHARS, PI, EOF.
+-     */
+-    public int next();
+-
+-    /*
+-    * Return the next state of the XMLReader.
+-    *
+-    * <p> Whitespace character content and processing instructions are ignored. </p>
+-    *
+-    * <p> The return value is one of: START, END, CHARS, EOF. </p>
+-    */
+-    public int nextContent();
+-
+-    /**
+-     * Return the next state of the XMLReader.
+-     *
+-     * <p> Whitespace character content, processing instructions are ignored.
+-     * Non-whitespace character content triggers an exception. </p>
+-     *
+-     * <p> The return value is one of: START, END, EOF. </p>
+-     */
+-    public int nextElementContent();
+-
+-    /**
+-     * Return the current state of the XMLReader.
+-     *
+-     */
+-    public int getState();
+-
+-    /**
+-     * Return the current qualified name.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END. </p>
+-     */
+-    public QName getName();
+-
+-    /**
+-     * Return the current URI.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END. </p>
+-     */
+-    public String getURI();
+-
+-    /**
+-     * Return the current local name.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END, PI. </p>
+-     */
+-    public String getLocalName();
+-
+-    /**
+-     * Return the current attribute list. In the jaxws implementation,
+-     * this list also includes namespace declarations.
+-     *
+-     * <p> Meaningful only when the state is one of: START. </p>
+-     *
+-     * <p> The returned {@link Attributes} object belong to the XMLReader and is
+-     * only guaranteed to be valid until the {@link #next} method is called,
+-     * directly or indirectly.</p>
+-     */
+-    public Attributes getAttributes();
+-
+-    /**
+-     * Return the current value.
+-     *
+-     * <p> Meaningful only when the state is one of: CHARS, PI. </p>
+-     */
+-    public String getValue();
+-
+-    /**
+-     * Return the current element ID.
+-     */
+-    public int getElementId();
+-
+-    /**
+-     * Return the current line number.
+-     *
+-     * <p> Due to aggressive parsing, this value may be off by a few lines. </p>
+-     */
+-    public int getLineNumber();
+-
+-    /**
+-     * Return the URI for the given prefix.
+-     *
+-     * <p> If there is no namespace declaration in scope for the given
+-     * prefix, return null. </p>
+-     */
+-    public String getURI(String prefix);
+-
+-    /**
+-     * Return an iterator on all prefixes in scope, except for the default prefix.
+-     *
+-     */
+-    public Iterator getPrefixes();
+-
+-    /**
+-     * Records the current element and leaves the reader positioned on its end tag.
+-     *
+-     * <p> The XMLReader must be positioned on the start tag of the element.
+-     * The returned reader will play back all events starting with the
+-     * start tag of the element and ending with its end tag. </p>
+-     */
+-    public XMLReader recordElement();
+-
+-    /**
+-     * Skip all nodes up to the end tag of the element with the current element ID.
+-     */
+-    public void skipElement();
+-
+-    /**
+-     * Skip all nodes up to the end tag of the element with the given element ID.
+-     */
+-    public void skipElement(int elementId);
+-
+-    /**
+-     * Close the XMLReader.
+-     *
+-     * <p> All subsequent calls to {@link #next} will return EOF. </p>
+-     */
+-    public void close();
+-}


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- java-1.6.0-openjdk.spec	3 Aug 2009 23:04:25 -0000	1.125
+++ java-1.6.0-openjdk.spec	5 Aug 2009 14:11:41 -0000	1.126
@@ -123,17 +123,22 @@
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
 # but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now.
-#%define tapsetdir	/usr/share/systemtap/tapset/%{sdkdir}
-%define tapsetdir	/usr/share/systemtap/tapset
+# use the root tapset dir for now. To distinquish between 64
+# and 32 bit architectures we place the tapsets under the arch
+# specific dir (note that systemtap will only pickup the tapset
+# for the primary arch for now). Systemtap uses the machine name
+# aka build_cpu as architecture specific directory name.
+ #%define tapsetdir	/usr/share/systemtap/tapset/%{sdkdir}
+ %define tapsetdir	/usr/share/systemtap/tapset/%{_build_cpu}
 %endif
 
+
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack 0
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 26.%{openjdkver}%{?dist}
+Release: 27.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -170,7 +175,8 @@ Patch4:	  java-1.6.0-openjdk-java-access
 Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
 Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:   java-1.6.0-openjdk-netx.patch
+Patch8:   java-1.6.0-openjdk-netxandplugin.patch
+Patch9:   java-1.6.0-openjdk-securitypatches.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -415,6 +421,7 @@ patch -l -p0 < %{PATCH4}
 patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH7}
 patch -l -p0 < %{PATCH8}
+patch -l -p0 < %{PATCH9}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -962,6 +969,25 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Tue Aug  4 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-27.b16
+- Updated java-1.6.0-openjdk-netx.patch, and renamed to 
+java-1.6.0-openjdk-netxandplugin.patch.
+- Added java-1.6.0-openjdk-securitypatches.patch.
+- Resolves: rhbz#512101
+- Resolves: rhbz#512896
+- Resolves: rhbz#512914
+- Resolves: rhbz#512907
+- Resolves: rhbz#512921
+- Resolves: rhbz#511915
+- Resolves: rhbz#512915
+- Resolves: rhbz#512920
+- Resolves: rhbz#512714
+- Resolves: rhbz#513215
+- Resolves: rhbz#513220
+- Resolves: rhbz#513222
+- Resolves: rhbz#513223
+- Resolves: rhbz#503794
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 1:1.6.0.0-26.b16
 - Rebuild against newer gecko
 


--- java-1.6.0-openjdk-netx.patch DELETED ---



From caolanm at fedoraproject.org  Wed Aug  5 14:16:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  5 Aug 2009 14:16:31 +0000 (UTC)
Subject: rpms/hunspell-so/devel .cvsignore, 1.1, 1.2 hunspell-so.spec, 1.2, 
	1.3 sources, 1.1, 1.2 so-SO@dictionaries.addons.mozilla.org3.xpi,
	1.1, NONE
Message-ID: <20090805141631.27D8311C008C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-so/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2406

Modified Files:
	.cvsignore hunspell-so.spec sources 
Removed Files:
	so-SO at dictionaries.addons.mozilla.org3.xpi 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-so/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 May 2009 20:42:34 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:16:30 -0000	1.2
@@ -0,0 +1 @@
+dict-so.oxt


Index: hunspell-so.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-so/devel/hunspell-so.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hunspell-so.spec	25 Jul 2009 02:40:39 -0000	1.2
+++ hunspell-so.spec	5 Aug 2009 14:16:30 -0000	1.3
@@ -1,9 +1,9 @@
 Name: hunspell-so
 Summary: Somali hunspell dictionaries
-Version: 0.1.2
-Release: 2%{?dist}
+Version: 0.1.3
+Release: 1%{?dist}
 Group: Applications/Text
-Source: http://www.opensourcesomalia.org/uploads/so-SO at dictionaries.addons.mozilla.org3.xpi
+Source: http://extensions.services.openoffice.org/files/2727/0/dict-so.oxt
 URL: http://www.opensourcesomalia.org/index.php?page=hingaad-saxe
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2+
@@ -21,8 +21,7 @@ Somali hunspell dictionaries.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p dictionaries/so-SO.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/so_SO.aff
-cp -p dictionaries/so-SO.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/so_SO.dic
+cp -p so_SO.* $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
 so_SO_aliases="so_DJ so_ET so_KE"
@@ -38,10 +37,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc xuquuqda/*
+%doc README_so_SO.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Aug 05 2009 Caolan McNamara <caolanm at redhat.com> - 0.1.3-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-so/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 May 2009 20:42:34 -0000	1.1
+++ sources	5 Aug 2009 14:16:30 -0000	1.2
@@ -0,0 +1 @@
+e9405a7244359896405f08af5cf09de2  dict-so.oxt


--- so-SO at dictionaries.addons.mozilla.org3.xpi DELETED ---



From vcrhonek at fedoraproject.org  Wed Aug  5 14:17:23 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  5 Aug 2009 14:17:23 +0000 (UTC)
Subject: rpms/texinfo/devel texinfo.spec,1.61,1.62
Message-ID: <20090805141723.1F56C11C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2632

Modified Files:
	texinfo.spec 
Log Message:
Fix changelog entry and rebuild


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- texinfo.spec	4 Aug 2009 12:09:03 -0000	1.61
+++ texinfo.spec	5 Aug 2009 14:17:22 -0000	1.62
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -146,8 +146,12 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Aug  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-5
+- Fix changelog entry and rebuild
+
 * Tue Aug  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-4
-- Fix data types
+- Fix data types (fix by Ralf Corsepius)
+  Resolves: #515402
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.13a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From mcepl at fedoraproject.org  Wed Aug  5 14:19:26 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed,  5 Aug 2009 14:19:26 +0000 (UTC)
Subject: rpms/syncevolution/devel syncevolution.spec,1.13,1.14
Message-ID: <20090805141926.4AD1311C0349@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3051

Modified Files:
	syncevolution.spec 
Log Message:
* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.3
- missing BuildRequires



Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- syncevolution.spec	5 Aug 2009 13:15:10 -0000	1.13
+++ syncevolution.spec	5 Aug 2009 14:19:26 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: SyncML client for evolution
 Name: syncevolution
 Version: 0.8.1+0.9+beta3+20090723
-Release: 1.0.2%{?dist}
+Release: 1.0.3%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
@@ -17,6 +17,8 @@ BuildRequires: glib2-devel
 BuildRequires: libsoup-devel
 BuildRequires: libical-devel
 BuildRequires: pcre-devel
+BuildRequires: libcurl-devel
+BuildRequires: gnome-keyring-devel
 BuildRequires: intltool automake libtool autoconf
 
 %description
@@ -86,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/syncevolution/*so
 
 %changelog
+* Wed Aug  5 2009 Mat?j Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.3
+- missing BuildRequires
+
 * Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.2
 - fixing autoconfigury; now it fails in a later stage of build ;-)
 



From wtogami at fedoraproject.org  Wed Aug  5 14:22:02 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed,  5 Aug 2009 14:22:02 +0000 (UTC)
Subject: rpms/tftp/devel tftp-hpa-0.49-fortify-strcpy-crash.patch, NONE,
	1.1 tftp.spec, 1.50, 1.51
Message-ID: <20090805142202.4C9F311C0349@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/tftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3558

Modified Files:
	tftp.spec 
Added Files:
	tftp-hpa-0.49-fortify-strcpy-crash.patch 
Log Message:
Bug #515361 tftp FORTIFY_SOURCE strcpy crash


tftp-hpa-0.49-fortify-strcpy-crash.patch:
 tftp.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE tftp-hpa-0.49-fortify-strcpy-crash.patch ---
diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
--- tftp-hpa-0.49.orig/tftp/tftp.c	2008-10-20 18:08:31.000000000 -0400
+++ tftp-hpa-0.49/tftp/tftp.c	2009-08-05 09:47:18.072585848 -0400
@@ -279,15 +279,16 @@
             struct tftphdr *tp, const char *mode)
 {
     char *cp;
+    size_t len;
 
     tp->th_opcode = htons((u_short) request);
     cp = (char *)&(tp->th_stuff);
-    strcpy(cp, name);
-    cp += strlen(name);
-    *cp++ = '\0';
-    strcpy(cp, mode);
-    cp += strlen(mode);
-    *cp++ = '\0';
+    len = strlen(name) + 1;
+    memcpy(cp, name, len);
+    cp += len;
+    len = strlen(mode) + 1;
+    memcpy(cp, mode, len);
+    cp += len;
     return (cp - (char *)tp);
 }
 


Index: tftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- tftp.spec	27 Jul 2009 05:53:22 -0000	1.50
+++ tftp.spec	5 Aug 2009 14:22:02 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: 0.49
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Patch0: tftp-0.40-remap.patch
 Patch2: tftp-hpa-0.39-tzfix.patch
 Patch3: tftp-0.42-tftpboot.patch
 Patch4: tftp-0.49-chk_retcodes.patch
+Patch5: tftp-hpa-0.49-fortify-strcpy-crash.patch
 
 BuildRequires: tcp_wrappers-devel readline-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +44,7 @@ enabled unless it is expressly needed.  
 %patch2 -p1 -b .tzfix
 %patch3 -p1 -b .tftpboot
 %patch4 -p1 -b .chk_retcodes
+%patch5 -p1 -b .fortify-strcpy-crash
 
 %build
 
@@ -88,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Wed Aug 05 2009 Warren Togami <wtogami at redhat.com> - 0.49-5
+- Bug #515361 tftp FORTIFY_SOURCE strcpy crash 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.49-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From iarnell at fedoraproject.org  Wed Aug  5 14:29:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:29:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache/F-10 FileCache.pm, NONE,
	1.1 perl-Catalyst-Plugin-PageCache.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805142949.7BF0611C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5724/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	FileCache.pm perl-Catalyst-Plugin-PageCache.spec 
Log Message:
initial import


--- NEW FILE FileCache.pm ---
package Catalyst::Plugin::Cache::FileCache;

use strict;
use base 'Class::Data::Inheritable';

our $VERSION = '0.7';

use Cache::FileCache;

__PACKAGE__->mk_classdata('cache');

sub setup {
    my $self = shift;

    my $params = {};

    if ( $self->config->{cache} ) {
        $params = { %{ $self->config->{cache} } };
    }

    if ( $params->{storage} ) {
        $params->{cache_root} = delete $params->{storage};
    }

    if ( $params->{expires} ) {
        $params->{default_expires_in} = delete $params->{expires};
    }

    $self->cache( Cache::FileCache->new($params) );

    return $self->NEXT::setup(@_);
}

1;


__END__

=head1 NAME

Catalyst::Plugin::Cache::FileCache - (DEPRECATED) File cache

=head1 SYNOPSIS

    use Catalyst qw[Cache::FileCache];

    MyApp->config->{cache}->{storage} = '/tmp';
    MyApp->config->{cache}->{expires} = 3600;

    my $data;

    unless ( $data = $c->cache->get('data') ) {
        $data = MyApp::Model::Data->retrieve('data');
        $c->cache->set( 'data', $data );
    }

    $c->response->body($data);

=head1 DEPRECATION NOTICE

This module has been deprecated in favor of L<Catalyst::Plugin::Cache>.
You can configure that module to use a FileCache backend.

=head1 DESCRIPTION

Extends base class with a file cache.

=head1 METHODS

=head2 setup

=head2 cache

Returns an instance of C<Cache::FileCache>

=head1 SEE ALSO

L<Catalyst::Plugin::Cache>, L<Cache::FileCache>, L<Catalyst>.

=head1 AUTHOR

Christian Hansen, C<ch at ngmedia.com>
Sebastian Riedel C<sri at oook.de>

=head1 LICENSE

This library is free software . You can redistribute it and/or modify it under
the same terms as perl itself.

=cut


--- NEW FILE perl-Catalyst-Plugin-PageCache.spec ---
Name:           perl-Catalyst-Plugin-PageCache
Version:        0.22
Release:        1%{?dist}
Summary:        Cache the output of entire pages
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Plugin-PageCache/
Source0:        http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-PageCache-%{version}.tar.gz
# Catalyst::Plugin::Cache::FileCache is deprecated, but necessary for testing
# this module. Rather than package a deprecated module, just include a private
# copy here for testing (license is also "same as perl")
# upstream bug at http://rt.cpan.org/Ticket/Display.html?id=47373
Source1:        http://search.cpan.org/src/MRAMBERG/Catalyst-Plugin-Cache-FileCache-0.7/lib/Catalyst/Plugin/Cache/FileCache.pm
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Plugin::I18N)
BuildRequires:  perl(Catalyst::Runtime)
BuildRequires:  perl(DateTime)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(MRO::Compat) >= 0.10
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# for FileCache
BuildRequires:  perl(Cache::FileCache)
BuildRequires:  perl(Class::Data::Inheritable)

Requires:       perl(Catalyst::Runtime)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Many dynamic websites perform heavy processing on most pages, yet this
information may rarely change from request to request. Using the PageCache
plugin, you can cache the full output of different pages so they are served
to your visitors as fast as possible. This method of caching is very useful
for withstanding a Slashdotting, for example.

%prep
%setup -q -n Catalyst-Plugin-PageCache-%{version}
iconv -f iso-8859-1 -t utf-8 README >README.conv && mv README.conv README
# install private copy file FileCache
install -D -m 0644 %{SOURCE1} t/lib/Catalyst/Plugin/Cache/FileCache.pm

%build
PERL5_CPANPLUS_IS_RUNNING=1 %{__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
TEST_POD=yep make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Jul 19 2009 Iain Arnell 0.22-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:12:02 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:29:49 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-PageCache-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:12:02 -0000	1.1
+++ sources	5 Aug 2009 14:29:49 -0000	1.2
@@ -0,0 +1 @@
+46bc5d125956f66424aec94d33b087df  Catalyst-Plugin-PageCache-0.22.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:29:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:29:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache/F-11 FileCache.pm, NONE,
	1.1 perl-Catalyst-Plugin-PageCache.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805142949.9D51E11C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5724/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	FileCache.pm perl-Catalyst-Plugin-PageCache.spec 
Log Message:
initial import


--- NEW FILE FileCache.pm ---
package Catalyst::Plugin::Cache::FileCache;

use strict;
use base 'Class::Data::Inheritable';

our $VERSION = '0.7';

use Cache::FileCache;

__PACKAGE__->mk_classdata('cache');

sub setup {
    my $self = shift;

    my $params = {};

    if ( $self->config->{cache} ) {
        $params = { %{ $self->config->{cache} } };
    }

    if ( $params->{storage} ) {
        $params->{cache_root} = delete $params->{storage};
    }

    if ( $params->{expires} ) {
        $params->{default_expires_in} = delete $params->{expires};
    }

    $self->cache( Cache::FileCache->new($params) );

    return $self->NEXT::setup(@_);
}

1;


__END__

=head1 NAME

Catalyst::Plugin::Cache::FileCache - (DEPRECATED) File cache

=head1 SYNOPSIS

    use Catalyst qw[Cache::FileCache];

    MyApp->config->{cache}->{storage} = '/tmp';
    MyApp->config->{cache}->{expires} = 3600;

    my $data;

    unless ( $data = $c->cache->get('data') ) {
        $data = MyApp::Model::Data->retrieve('data');
        $c->cache->set( 'data', $data );
    }

    $c->response->body($data);

=head1 DEPRECATION NOTICE

This module has been deprecated in favor of L<Catalyst::Plugin::Cache>.
You can configure that module to use a FileCache backend.

=head1 DESCRIPTION

Extends base class with a file cache.

=head1 METHODS

=head2 setup

=head2 cache

Returns an instance of C<Cache::FileCache>

=head1 SEE ALSO

L<Catalyst::Plugin::Cache>, L<Cache::FileCache>, L<Catalyst>.

=head1 AUTHOR

Christian Hansen, C<ch at ngmedia.com>
Sebastian Riedel C<sri at oook.de>

=head1 LICENSE

This library is free software . You can redistribute it and/or modify it under
the same terms as perl itself.

=cut


--- NEW FILE perl-Catalyst-Plugin-PageCache.spec ---
Name:           perl-Catalyst-Plugin-PageCache
Version:        0.22
Release:        1%{?dist}
Summary:        Cache the output of entire pages
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Plugin-PageCache/
Source0:        http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-PageCache-%{version}.tar.gz
# Catalyst::Plugin::Cache::FileCache is deprecated, but necessary for testing
# this module. Rather than package a deprecated module, just include a private
# copy here for testing (license is also "same as perl")
# upstream bug at http://rt.cpan.org/Ticket/Display.html?id=47373
Source1:        http://search.cpan.org/src/MRAMBERG/Catalyst-Plugin-Cache-FileCache-0.7/lib/Catalyst/Plugin/Cache/FileCache.pm
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Plugin::I18N)
BuildRequires:  perl(Catalyst::Runtime)
BuildRequires:  perl(DateTime)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(MRO::Compat) >= 0.10
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# for FileCache
BuildRequires:  perl(Cache::FileCache)
BuildRequires:  perl(Class::Data::Inheritable)

Requires:       perl(Catalyst::Runtime)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Many dynamic websites perform heavy processing on most pages, yet this
information may rarely change from request to request. Using the PageCache
plugin, you can cache the full output of different pages so they are served
to your visitors as fast as possible. This method of caching is very useful
for withstanding a Slashdotting, for example.

%prep
%setup -q -n Catalyst-Plugin-PageCache-%{version}
iconv -f iso-8859-1 -t utf-8 README >README.conv && mv README.conv README
# install private copy file FileCache
install -D -m 0644 %{SOURCE1} t/lib/Catalyst/Plugin/Cache/FileCache.pm

%build
PERL5_CPANPLUS_IS_RUNNING=1 %{__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
TEST_POD=yep make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Jul 19 2009 Iain Arnell 0.22-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:12:02 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:29:49 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-PageCache-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:12:02 -0000	1.1
+++ sources	5 Aug 2009 14:29:49 -0000	1.2
@@ -0,0 +1 @@
+46bc5d125956f66424aec94d33b087df  Catalyst-Plugin-PageCache-0.22.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:29:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:29:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-PageCache/devel FileCache.pm, NONE,
	1.1 perl-Catalyst-Plugin-PageCache.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805142949.D83F011C034A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5724/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FileCache.pm perl-Catalyst-Plugin-PageCache.spec 
Log Message:
initial import


--- NEW FILE FileCache.pm ---
package Catalyst::Plugin::Cache::FileCache;

use strict;
use base 'Class::Data::Inheritable';

our $VERSION = '0.7';

use Cache::FileCache;

__PACKAGE__->mk_classdata('cache');

sub setup {
    my $self = shift;

    my $params = {};

    if ( $self->config->{cache} ) {
        $params = { %{ $self->config->{cache} } };
    }

    if ( $params->{storage} ) {
        $params->{cache_root} = delete $params->{storage};
    }

    if ( $params->{expires} ) {
        $params->{default_expires_in} = delete $params->{expires};
    }

    $self->cache( Cache::FileCache->new($params) );

    return $self->NEXT::setup(@_);
}

1;


__END__

=head1 NAME

Catalyst::Plugin::Cache::FileCache - (DEPRECATED) File cache

=head1 SYNOPSIS

    use Catalyst qw[Cache::FileCache];

    MyApp->config->{cache}->{storage} = '/tmp';
    MyApp->config->{cache}->{expires} = 3600;

    my $data;

    unless ( $data = $c->cache->get('data') ) {
        $data = MyApp::Model::Data->retrieve('data');
        $c->cache->set( 'data', $data );
    }

    $c->response->body($data);

=head1 DEPRECATION NOTICE

This module has been deprecated in favor of L<Catalyst::Plugin::Cache>.
You can configure that module to use a FileCache backend.

=head1 DESCRIPTION

Extends base class with a file cache.

=head1 METHODS

=head2 setup

=head2 cache

Returns an instance of C<Cache::FileCache>

=head1 SEE ALSO

L<Catalyst::Plugin::Cache>, L<Cache::FileCache>, L<Catalyst>.

=head1 AUTHOR

Christian Hansen, C<ch at ngmedia.com>
Sebastian Riedel C<sri at oook.de>

=head1 LICENSE

This library is free software . You can redistribute it and/or modify it under
the same terms as perl itself.

=cut


--- NEW FILE perl-Catalyst-Plugin-PageCache.spec ---
Name:           perl-Catalyst-Plugin-PageCache
Version:        0.22
Release:        1%{?dist}
Summary:        Cache the output of entire pages
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Plugin-PageCache/
Source0:        http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-PageCache-%{version}.tar.gz
# Catalyst::Plugin::Cache::FileCache is deprecated, but necessary for testing
# this module. Rather than package a deprecated module, just include a private
# copy here for testing (license is also "same as perl")
# upstream bug at http://rt.cpan.org/Ticket/Display.html?id=47373
Source1:        http://search.cpan.org/src/MRAMBERG/Catalyst-Plugin-Cache-FileCache-0.7/lib/Catalyst/Plugin/Cache/FileCache.pm
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Plugin::I18N)
BuildRequires:  perl(Catalyst::Runtime)
BuildRequires:  perl(DateTime)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(MRO::Compat) >= 0.10
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# for FileCache
BuildRequires:  perl(Cache::FileCache)
BuildRequires:  perl(Class::Data::Inheritable)

Requires:       perl(Catalyst::Runtime)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Many dynamic websites perform heavy processing on most pages, yet this
information may rarely change from request to request. Using the PageCache
plugin, you can cache the full output of different pages so they are served
to your visitors as fast as possible. This method of caching is very useful
for withstanding a Slashdotting, for example.

%prep
%setup -q -n Catalyst-Plugin-PageCache-%{version}
iconv -f iso-8859-1 -t utf-8 README >README.conv && mv README.conv README
# install private copy file FileCache
install -D -m 0644 %{SOURCE1} t/lib/Catalyst/Plugin/Cache/FileCache.pm

%build
PERL5_CPANPLUS_IS_RUNNING=1 %{__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
TEST_POD=yep make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Jul 19 2009 Iain Arnell 0.22-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:12:02 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:29:49 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-PageCache-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-PageCache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:12:02 -0000	1.1
+++ sources	5 Aug 2009 14:29:49 -0000	1.2
@@ -0,0 +1 @@
+46bc5d125956f66424aec94d33b087df  Catalyst-Plugin-PageCache-0.22.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:32:23 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:32:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-10
	perl-Catalyst-Plugin-Session-Store-Cache.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805143223.452EA11C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6314/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Catalyst-Plugin-Session-Store-Cache.spec 
Log Message:
initial import


--- NEW FILE perl-Catalyst-Plugin-Session-Store-Cache.spec ---
Name:           perl-Catalyst-Plugin-Session-Store-Cache
Version:        0.01
Release:        1%{?dist}
Summary:        Store sessions using a Catalyst::Plugin::Cache
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-Cache/
Source0:        http://www.cpan.org/authors/id/L/LB/LBR/Catalyst-Plugin-Session-Store-Cache-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.06
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(Catalyst::Plugin::Session) >= 0.06
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This plugin will store your session data in whatever cache module you have
configured.

%prep
%setup -q -n Catalyst-Plugin-Session-Store-Cache-%{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
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Jul 31 2009 Iain Arnell 0.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:10:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:32:23 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-Session-Store-Cache-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:10:27 -0000	1.1
+++ sources	5 Aug 2009 14:32:23 -0000	1.2
@@ -0,0 +1 @@
+edaca2c58c08314fa94878ff5a4fb14e  Catalyst-Plugin-Session-Store-Cache-0.01.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:32:23 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:32:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-11
	perl-Catalyst-Plugin-Session-Store-Cache.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805143223.6B55111C034A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6314/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Catalyst-Plugin-Session-Store-Cache.spec 
Log Message:
initial import


--- NEW FILE perl-Catalyst-Plugin-Session-Store-Cache.spec ---
Name:           perl-Catalyst-Plugin-Session-Store-Cache
Version:        0.01
Release:        1%{?dist}
Summary:        Store sessions using a Catalyst::Plugin::Cache
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-Cache/
Source0:        http://www.cpan.org/authors/id/L/LB/LBR/Catalyst-Plugin-Session-Store-Cache-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.06
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(Catalyst::Plugin::Session) >= 0.06
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This plugin will store your session data in whatever cache module you have
configured.

%prep
%setup -q -n Catalyst-Plugin-Session-Store-Cache-%{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
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Jul 31 2009 Iain Arnell 0.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:10:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:32:23 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-Session-Store-Cache-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:10:27 -0000	1.1
+++ sources	5 Aug 2009 14:32:23 -0000	1.2
@@ -0,0 +1 @@
+edaca2c58c08314fa94878ff5a4fb14e  Catalyst-Plugin-Session-Store-Cache-0.01.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:32:23 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:32:23 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel
	perl-Catalyst-Plugin-Session-Store-Cache.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805143223.9D52611C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6314/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Catalyst-Plugin-Session-Store-Cache.spec 
Log Message:
initial import


--- NEW FILE perl-Catalyst-Plugin-Session-Store-Cache.spec ---
Name:           perl-Catalyst-Plugin-Session-Store-Cache
Version:        0.01
Release:        1%{?dist}
Summary:        Store sessions using a Catalyst::Plugin::Cache
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-Cache/
Source0:        http://www.cpan.org/authors/id/L/LB/LBR/Catalyst-Plugin-Session-Store-Cache-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.06
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(Catalyst::Plugin::Session) >= 0.06
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This plugin will store your session data in whatever cache module you have
configured.

%prep
%setup -q -n Catalyst-Plugin-Session-Store-Cache-%{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
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Jul 31 2009 Iain Arnell 0.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:10:27 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:32:23 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-Session-Store-Cache-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-Cache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:10:27 -0000	1.1
+++ sources	5 Aug 2009 14:32:23 -0000	1.2
@@ -0,0 +1 @@
+edaca2c58c08314fa94878ff5a4fb14e  Catalyst-Plugin-Session-Store-Cache-0.01.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:37:54 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:37:54 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/F-10 perl-DBIx-Class-TimeStamp.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805143754.5C38211C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7644/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBIx-Class-TimeStamp.spec 
Log Message:
initial import


--- NEW FILE perl-DBIx-Class-TimeStamp.spec ---
Name:           perl-DBIx-Class-TimeStamp
Version:        0.12
Release:        1%{?dist}
Summary:        DBIx::Class extension to update and create date and time based fields
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Class-TimeStamp/
Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/DBIx-Class-TimeStamp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Grouped)
BuildRequires:  perl(DateTime)
BuildRequires:  perl(DateTime::Format::MySQL)
BuildRequires:  perl(DateTime::Format::SQLite)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(DBIx::Class::DynamicDefault)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Time::Warp)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# not picked up automatically
Requires:       perl(DBIx::Class)
Requires:       perl(DBIx::Class::DynamicDefault)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Works in conjunction with InflateColumn::DateTime to automatically set
update and create date and time based fields in a table.

%prep
%setup -q -n DBIx-Class-TimeStamp-%{version}

%build
PERL5_CPANPLUS_IS_RUNNING=1 %{__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
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 02 2009 Iain Arnell 0.12-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:11:32 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:37:54 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Class-TimeStamp-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:11:32 -0000	1.1
+++ sources	5 Aug 2009 14:37:54 -0000	1.2
@@ -0,0 +1 @@
+cb909b9e6e43ecfe3f367e2f90f5cf92  DBIx-Class-TimeStamp-0.12.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:37:54 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:37:54 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/F-11 perl-DBIx-Class-TimeStamp.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805143754.94DD111C034A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7644/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBIx-Class-TimeStamp.spec 
Log Message:
initial import


--- NEW FILE perl-DBIx-Class-TimeStamp.spec ---
Name:           perl-DBIx-Class-TimeStamp
Version:        0.12
Release:        1%{?dist}
Summary:        DBIx::Class extension to update and create date and time based fields
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Class-TimeStamp/
Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/DBIx-Class-TimeStamp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Grouped)
BuildRequires:  perl(DateTime)
BuildRequires:  perl(DateTime::Format::MySQL)
BuildRequires:  perl(DateTime::Format::SQLite)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(DBIx::Class::DynamicDefault)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Time::Warp)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# not picked up automatically
Requires:       perl(DBIx::Class)
Requires:       perl(DBIx::Class::DynamicDefault)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Works in conjunction with InflateColumn::DateTime to automatically set
update and create date and time based fields in a table.

%prep
%setup -q -n DBIx-Class-TimeStamp-%{version}

%build
PERL5_CPANPLUS_IS_RUNNING=1 %{__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
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 02 2009 Iain Arnell 0.12-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:11:32 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:37:54 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Class-TimeStamp-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:11:32 -0000	1.1
+++ sources	5 Aug 2009 14:37:54 -0000	1.2
@@ -0,0 +1 @@
+cb909b9e6e43ecfe3f367e2f90f5cf92  DBIx-Class-TimeStamp-0.12.tar.gz



From iarnell at fedoraproject.org  Wed Aug  5 14:37:54 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 14:37:54 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/devel perl-DBIx-Class-TimeStamp.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805143754.D460111C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBIx-Class-TimeStamp.spec 
Log Message:
initial import


--- NEW FILE perl-DBIx-Class-TimeStamp.spec ---
Name:           perl-DBIx-Class-TimeStamp
Version:        0.12
Release:        1%{?dist}
Summary:        DBIx::Class extension to update and create date and time based fields
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Class-TimeStamp/
Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/DBIx-Class-TimeStamp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Grouped)
BuildRequires:  perl(DateTime)
BuildRequires:  perl(DateTime::Format::MySQL)
BuildRequires:  perl(DateTime::Format::SQLite)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(DBIx::Class::DynamicDefault)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Time::Warp)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
# not picked up automatically
Requires:       perl(DBIx::Class)
Requires:       perl(DBIx::Class::DynamicDefault)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Works in conjunction with InflateColumn::DateTime to automatically set
update and create date and time based fields in a table.

%prep
%setup -q -n DBIx-Class-TimeStamp-%{version}

%build
PERL5_CPANPLUS_IS_RUNNING=1 %{__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
TEST_POD=1 make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 02 2009 Iain Arnell 0.12-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 06:11:32 -0000	1.1
+++ .cvsignore	5 Aug 2009 14:37:54 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Class-TimeStamp-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 06:11:32 -0000	1.1
+++ sources	5 Aug 2009 14:37:54 -0000	1.2
@@ -0,0 +1 @@
+cb909b9e6e43ecfe3f367e2f90f5cf92  DBIx-Class-TimeStamp-0.12.tar.gz



From kraxel at fedoraproject.org  Wed Aug  5 14:38:11 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Wed,  5 Aug 2009 14:38:11 +0000 (UTC)
Subject: rpms/xenner/devel xenner.spec,1.42,1.43
Message-ID: <20090805143811.183DC11C0349@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7743

Modified Files:
	xenner.spec 
Log Message:
Add BuildRequires: libuuid-devel


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xenner.spec	27 Jul 2009 07:47:14 -0000	1.42
+++ xenner.spec	5 Aug 2009 14:38:10 -0000	1.43
@@ -1,7 +1,7 @@
 Name:         xenner
 License:      GPLv2+
 Version:      0.47
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
 Source0:      http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Buildroot:    %{_tmppath}/root-%{name}-%
 ExclusiveArch: %{ix86} x86_64
 BuildRequires: xen-devel
 BuildRequires: e2fsprogs-devel
+BuildRequires: libuuid-devel
 BuildRequires: libaio-devel
 BuildRequires: zlib-devel
 BuildRequires: python util-linux-ng
@@ -56,6 +57,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Aug 3 2009 Gerd Hoffmann <kraxel at redhat.com> - 0.47-3.fc10
+- Add BuildRequires: libuuid-devel
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.47-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From till at fedoraproject.org  Wed Aug  5 14:39:28 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed,  5 Aug 2009 14:39:28 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.72,1.73
Message-ID: <20090805143928.3EE3611C0349@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8015

Modified Files:
	comps-f12.xml.in 
Log Message:
- remove tab char



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- comps-f12.xml.in	5 Aug 2009 12:49:54 -0000	1.72
+++ comps-f12.xml.in	5 Aug 2009 14:39:27 -0000	1.73
@@ -740,7 +740,7 @@
       <packagereq type="mandatory">coreutils</packagereq>
       <packagereq type="mandatory">cpio</packagereq>
       <packagereq type="mandatory">cronie</packagereq>
-	  <packagereq type="mandatory">cronie-anacron</packagereq>
+      <packagereq type="mandatory">cronie-anacron</packagereq>
       <packagereq type="mandatory">dhclient</packagereq>
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">fedora-release</packagereq>



From langel at fedoraproject.org  Wed Aug  5 14:08:14 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed,  5 Aug 2009 14:08:14 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel
	java-1.6.0-openjdk-netxandplugin.patch, 
	NONE, 1.1 java-1.6.0-openjdk-securitypatches.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.131,
	1.132 java-1.6.0-openjdk-netx.patch, 1.1, NONE
Message-ID: <20090805140814.E374711C008C@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv309

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Removed Files:
	java-1.6.0-openjdk-netx.patch 
Log Message:
* Tue Aug  4 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-28.b16
- Updated java-1.6.0-openjdk-netx.patch, and renamed to
java-1.6.0-openjdk-netxandplugin.patch.
- Added java-1.6.0-openjdk-securitypatches.patch.
- Resolves: rhbz#512101
- Resolves: rhbz#512896
- Resolves: rhbz#512914
- Resolves: rhbz#512907
- Resolves: rhbz#512921
- Resolves: rhbz#511915
- Resolves: rhbz#512915
- Resolves: rhbz#512920
- Resolves: rhbz#512714
- Resolves: rhbz#513215
- Resolves: rhbz#513220
- Resolves: rhbz#513222
- Resolves: rhbz#513223
- Resolves: rhbz#503794



java-1.6.0-openjdk-netxandplugin.patch:
 JNLPRuntime.java                                                 |    2 
 plugin/icedtea/netscape/javascript/JSObject.java                 |   37 ++++++-
 plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java |   47 ++++++++++
 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java       |    6 +
 rt/net/sourceforge/jnlp/SecurityDesc.java                        |   24 +++++
 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java             |   27 ++++-
 6 files changed, 131 insertions(+), 12 deletions(-)

--- NEW FILE java-1.6.0-openjdk-netxandplugin.patch ---
--- ../JNLPRuntime.java	2009-07-09 12:51:44.000000000 -0400
+++ rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java	2009-07-09 12:52:04.000000000 -0400
@@ -282,7 +282,7 @@
 
         String homeDir = System.getProperty("user.home");
 	File baseDir = new File(homeDir + "/.netx/");
-	if (homeDir == null || !baseDir.mkdir())
+	if (homeDir == null || (!baseDir.isDirectory() && !baseDir.mkdir()))
             return null;
 
         props.setProperty("basedir", baseDir.toString());
diff -r d20bab985f89 plugin/icedtea/netscape/javascript/JSObject.java
--- a/plugin/icedtea/netscape/javascript/JSObject.java	Fri Jul 17 06:04:59 2009 -0400
+++ plugin/icedtea/netscape/javascript/JSObject.java	Tue Jul 21 14:48:24 2009 -0400
@@ -47,6 +47,10 @@
 package netscape.javascript;
 
 import java.applet.Applet;
+import java.security.AccessControlContext;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.BasicPermission;
 
 import sun.applet.PluginAppletViewer;
 import sun.applet.PluginDebug;
@@ -102,13 +106,37 @@
     /**
      * it is illegal to construct a JSObject manually
      */
-    // FIXME: make private!
     public JSObject(int jsobj_addr) {
-        PluginDebug.debug ("JSObject int CONSTRUCTOR");
-        internal = jsobj_addr;
+        this((long) jsobj_addr);
     }
 
     public JSObject(long jsobj_addr) {
+        
+        // See if the caller has permission
+        
+        try {
+            AccessController.getContext().checkPermission(new JSObjectCreatePermission());
+        } catch (AccessControlException ace) {
+            
+            // If not, only caller with JSObject.getWindow on the stack may 
+            // make this call unprivileged.
+            
+            // Although this check is inefficient, it should happen only once
+            // during applet init, so we look the other way
+
+            StackTraceElement[] stack =  Thread.currentThread().getStackTrace();
+            boolean mayProceed = false;
+            
+            for (int i=0; i < stack.length; i++) {
+                if (stack[i].getClassName().equals("netscape.javascript.JSObject") &&
+                    stack[i].getMethodName().equals("getWindow")) {
+                    mayProceed = true;
+                }
+            }
+
+            if (!mayProceed) throw ace;
+        }
+
         PluginDebug.debug ("JSObject long CONSTRUCTOR");
         internal = jsobj_addr;
     }
@@ -234,7 +262,7 @@
         internal = ((PluginAppletViewer)
                     applet.getAppletContext()).getWindow();
         PluginDebug.debug ("GOT IT: " + internal);
-        return new JSObject(internal);
+        return new JSObject((long) internal);
     }
 
 
@@ -259,5 +287,4 @@
 
         return false;
     }
-
 }
diff -r d20bab985f89 plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java	Tue Jul 21 14:48:24 2009 -0400
@@ -0,0 +1,47 @@
+/* JSObjectCreatePermission.java
+   Copyright (C) 2009  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+ 
+package netscape.javascript;
+
+import java.security.BasicPermission;
+
+
+public class JSObjectCreatePermission extends BasicPermission {
+    public JSObjectCreatePermission() {
+        super("JSObjectCreate");
+    }
+}
diff -r d20bab985f89 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Fri Jul 17 06:04:59 2009 -0400
+++ plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Tue Jul 21 14:48:24 2009 -0400
@@ -58,6 +58,7 @@
 import java.util.List;
 
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import netscape.javascript.JSObjectCreatePermission;
 
 
 
@@ -1285,12 +1286,15 @@
 
 		CodeSource cs = new CodeSource((URL) null, (java.security.cert.Certificate  [])null);
 		
-		if (src != null) {
+		if (src != null && src.length() > 0) {
 			try {
 				cs = new CodeSource(new URL(src + "/"), (java.security.cert.Certificate[]) null);
 			} catch (MalformedURLException mfue) {
 				// do nothing
 			}
+		} else {
+		    JSObjectCreatePermission perm = new JSObjectCreatePermission();
+		    grantedPermissions.add(perm);
 		}
 
 		ProtectionDomain pd = new ProtectionDomain(cs, grantedPermissions, null, null);
diff -r 438cbd2f7252 rt/net/sourceforge/jnlp/SecurityDesc.java
--- a/rt/net/sourceforge/jnlp/SecurityDesc.java	Wed Jul 15 12:56:10 2009 +0200
+++ rt/net/sourceforge/jnlp/SecurityDesc.java	Wed Jul 15 11:58:08 2009 -0400
@@ -166,6 +166,30 @@
 
         return permissions;
     }
+    
+    /**
+     * Returns a PermissionCollection containing the sandbox permissions
+     */
+    public PermissionCollection getSandBoxPermissions() {
+        
+        Permissions permissions = new Permissions();
+
+        for (int i=0; i < sandboxPermissions.length; i++)
+            permissions.add(sandboxPermissions[i]);
+
+        if (downloadHost != null)
+            permissions.add(new SocketPermission(downloadHost,
+                                                 "connect, accept"));
+
+        // properties
+        PropertyDesc props[] = file.getResources().getProperties();
+        for (int i=0; i < props.length; i++) {
+            // should only allow jnlp.* properties if in sandbox?
+            permissions.add(new PropertyPermission(props[i].getKey(), "read,write"));
+        }
+
+        return permissions;
+    }
 
 }
 
diff -r 438cbd2f7252 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 15 12:56:10 2009 +0200
+++ rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 15 11:58:08 2009 -0400
@@ -435,12 +469,29 @@
         // access w/o security dialog once we actually check certificates.
 
         // copy security permissions from SecurityDesc element
-		if (security != null) {
-        	Enumeration e = security.getPermissions().elements();
-        	while (e.hasMoreElements())
-            	result.add((Permission) e.nextElement());
-		}
+        if (security != null) {
+            // Security desc. is used only to track security settings for the
+            // application. However, an application may comprise of multiple
+            // jars, and as such, security must be evaluated on a per jar basis.
+            
+            // set default perms
+            PermissionCollection permissions = security.getSandBoxPermissions();
+            
+            // If more than default is needed, evaluate based on codesource
+            if (security.getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS) ||
+                security.getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS)) {
 
+                if (cs.getCodeSigners() != null) {
+                    permissions = security.getPermissions();
+                }
+            }
+
+            Enumeration<Permission> e = permissions.elements();
+            while (e.hasMoreElements())
+                result.add(e.nextElement());
+        }
+
+	    
         // add in permission to read the cached JAR files
         for (int i=0; i < resourcePermissions.size(); i++)
             result.add((Permission) resourcePermissions.get(i));

java-1.6.0-openjdk-securitypatches.patch:
 ./THIRD_PARTY_README                                                                                                   |    2 
 jdk/src/share/classes/java/awt/Cursor.java                                                                             |   14 
 jdk/src/share/classes/javax/swing/text/LayoutQueue.java                                                                |   22 
 make/sun/net/FILES_java.gmk                                                                                            |    1 
 openjdk/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html                                            |   29 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/Builder.java                                                   |   33 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizable.java                                  |   63 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java                           |   56 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java                    |   43 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizer.java                                    |  149 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java                                  |   56 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java                                      |   43 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java                                       |   52 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java                                      |   64 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java                             |   66 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java                          |  154 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java                             |   94 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java                                     |  122 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java                                              |   79 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java                                  |   46 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties                            |   26 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java     |   37 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java                  |  176 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java                    |  152 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java            |  187 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java              |   64 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java           |   62 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java |  221 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java    |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java                         |   42 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.java                                            |   53 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties                                      |   27 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java                  |   66 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java                         |   35 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java                            |   35 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java              |   59 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java                 |   72 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java                                   |   33 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java                   |  237 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java                                     |   50 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java                          |   94 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java                                      |   70 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java                                  |   83 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java                                  |  258 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java                                  |   73 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java                            |   49 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java                                    |   48 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java                           |  238 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java                                |  147 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java                                 |  116 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java                               |  248 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java                                |  500 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java                      |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java                                  |  206 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java                                |   96 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java                              |  116 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java                        |  143 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java                                        |   65 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java                                    |   86 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java                               |   69 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java                               |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java                                 |  126 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java         |   64 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java                      |   50 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java                     |   44 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java         |   78 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java          |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java          |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java                                        |   67 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java                                |   54 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java                         |   88 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java                             |  164 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java                             |   73 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java                              |   52 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java                                   |   62 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java                                    |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java                         |  163 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java                                       |  118 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java                                   |  244 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java                               |  214 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java                             |   57 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java                             |   70 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java                              |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java                              |  101 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java                                |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java                         |   74 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java                             |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java                      |  117 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java                            |   69 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java                                 |   68 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java                          |  124 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java                          |   58 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java                    |   83 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java                                      |  136 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java                   |   63 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java                                  |  382 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java                          |  164 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java                     |  129 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java                                    |  138 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java                                    |   71 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java                         |  148 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java                            |  114 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java                          |  150 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java                         |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java                          |  149 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java                                      |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java                                      |  100 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Injector.java                                            |  192 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java                                |  659 ++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java                             |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java                       |  127 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java                        |  346 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java                               |  284 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java                              |  323 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java                             | 2039 +++++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java                            |  226 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java                             | 1374 +++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java                                    |  105 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java                            |   94 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java                             |  299 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java                                   | 1432 +++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java                                 |  100 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java                                    |  286 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java                                   |  556 ++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java                           |  425 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java                            | 2631 ++++++++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java                                 |  371 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java                                    |  824 +++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java                    |   60 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java                    |   47 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java                                           |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java                         |  319 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java                      |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java                                |   44 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java                                       |  230 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java                                   |   40 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java                              |   37 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java                      |   59 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java                                         |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java                                  |   43 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java                    |  261 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java                                 |  317 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java      |  106 
 openjdk/jdk/src/share/classes/sun/net/ApplicationProxy.java                                                            |   43 
 src/share/classes/com/sun/codemodel/internal/CodeWriter.java                                                           |   10 
 src/share/classes/com/sun/codemodel/internal/JAnnotatable.java                                                         |    1 
 src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java                                               |    1 
 src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java                                                       |    4 
 src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java                                                    |    1 
 src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java                                                      |   10 
 src/share/classes/com/sun/codemodel/internal/JArray.java                                                               |   10 
 src/share/classes/com/sun/codemodel/internal/JArrayClass.java                                                          |   24 
 src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java                                                        |    4 
 src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java                                                    |    4 
 src/share/classes/com/sun/codemodel/internal/JAtom.java                                                                |    6 
 src/share/classes/com/sun/codemodel/internal/JBlock.java                                                               |   12 
 src/share/classes/com/sun/codemodel/internal/JBreak.java                                                               |    6 
 src/share/classes/com/sun/codemodel/internal/JCase.java                                                                |    8 
 src/share/classes/com/sun/codemodel/internal/JCast.java                                                                |    2 
 src/share/classes/com/sun/codemodel/internal/JClass.java                                                               |   58 
 src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java                                         |   10 
 src/share/classes/com/sun/codemodel/internal/JClassContainer.java                                                      |   34 
 src/share/classes/com/sun/codemodel/internal/JCodeModel.java                                                           |   50 
 src/share/classes/com/sun/codemodel/internal/JCommentPart.java                                                         |   20 
 src/share/classes/com/sun/codemodel/internal/JContinue.java                                                            |    6 
 src/share/classes/com/sun/codemodel/internal/JDefinedClass.java                                                        |   76 
 src/share/classes/com/sun/codemodel/internal/JDirectClass.java                                                         |    3 
 src/share/classes/com/sun/codemodel/internal/JDocComment.java                                                          |   13 
 src/share/classes/com/sun/codemodel/internal/JEnumConstant.java                                                        |    4 
 src/share/classes/com/sun/codemodel/internal/JExpr.java                                                                |   41 
 src/share/classes/com/sun/codemodel/internal/JFieldVar.java                                                            |    5 
 src/share/classes/com/sun/codemodel/internal/JForEach.java                                                             |   50 
 src/share/classes/com/sun/codemodel/internal/JForLoop.java                                                             |   18 
 src/share/classes/com/sun/codemodel/internal/JFormatter.java                                                           |    6 
 src/share/classes/com/sun/codemodel/internal/JGenerifiable.java                                                        |   10 
 src/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java                                                    |   10 
 src/share/classes/com/sun/codemodel/internal/JInvocation.java                                                          |   10 
 src/share/classes/com/sun/codemodel/internal/JJavaName.java                                                            |    1 
 src/share/classes/com/sun/codemodel/internal/JLabel.java                                                               |    8 
 src/share/classes/com/sun/codemodel/internal/JMethod.java                                                              |  517 -
 src/share/classes/com/sun/codemodel/internal/JMods.java                                                                |   26 
 src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java                                                       |   10 
 src/share/classes/com/sun/codemodel/internal/JNullType.java                                                            |    6 
 src/share/classes/com/sun/codemodel/internal/JPackage.java                                                             |   93 
 src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java                                                       |   12 
 src/share/classes/com/sun/codemodel/internal/JResourceFile.java                                                        |    8 
 src/share/classes/com/sun/codemodel/internal/JStringLiteral.java                                                       |   12 
 src/share/classes/com/sun/codemodel/internal/JSwitch.java                                                              |    6 
 src/share/classes/com/sun/codemodel/internal/JType.java                                                                |   10 
 src/share/classes/com/sun/codemodel/internal/JTypeVar.java                                                             |   14 
 src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java                                                        |    1 
 src/share/classes/com/sun/codemodel/internal/JVar.java                                                                 |    8 
 src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java                                                |    1 
 src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java                                                      |   12 
 src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java                                                    |    8 
 src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java                                                |    6 
 src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java                                                      |   14 
 src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java                                                  |   40 
 src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java                                                        |   10 
 src/share/classes/com/sun/codemodel/internal/package-info.java                                                         |    1 
 src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java                                             |    6 
 src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java                                                  |   13 
 src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java                                             |   16 
 src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java                                                   |  333 -
 src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java                                               |  164 
 src/share/classes/com/sun/codemodel/internal/util/Surrogate.java                                                       |  448 -
 src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java                                             |   18 
 src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java                                                |   28 
 src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java                                              |    1 
 src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java                                            |    8 
 src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java                                              |   22 
 src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java                                        |   14 
 src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java                                                 |   12 
 src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java                                                 |    2 
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java                                                 |    3 
 src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java                                                 |    2 
 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java                                                 |    3 
 src/share/classes/com/sun/imageio/stream/StreamCloser.java                                                             |   44 
 src/share/classes/com/sun/istack/internal/Nullable.java                                                                |    2 
 src/share/classes/com/sun/istack/internal/Pool.java                                                                    |   30 
 src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java                                         |   32 
 src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java                                       |   19 
 src/share/classes/com/sun/istack/internal/ws/package-info.java                                                         |    2 
 src/share/classes/com/sun/jndi/dns/DnsContext.java                                                                     |    2 
 src/share/classes/com/sun/media/sound/JDK13Services.java                                                               |   21 
 src/share/classes/com/sun/media/sound/JSSecurityManager.java                                                           |   55 
 src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java                                                      |    4 
 src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                                              |    3 
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java               |   76 
 src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java                                                     |   21 
 src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java                                                         |    2 
 src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties                                                  |    5 
 src/share/classes/com/sun/tools/internal/jxc/Messages.java                                                             |    1 
 src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java                                   |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Const.java                                                            |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java                                                |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java                                       |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties                                              |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java                                                         |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Options.java                                                          |    6 
 src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java                                            |   37 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java                                                   |  105 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java                                                    |   83 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java                                         |    4 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java                                           |    6 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java                                               |   50 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java                                      |   74 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java                                               |  158 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java                                                    |  141 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd                                                     |    2 
 src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java                                               |    4 
 src/share/classes/com/sun/tools/internal/ws/Invoker.java                                                               |   28 
 src/share/classes/com/sun/tools/internal/ws/WsGen.java                                                                 |    2 
 src/share/classes/com/sun/tools/internal/ws/WsImport.java                                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java                                               |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java                                        |    3 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java                                               |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/package-info.java                                                          |   62 
 src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java                                          |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java                          |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java                                     |    4 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java                                      |   40 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java                                  |  207 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java               |    3 
 src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java                                        |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java                                               |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java                                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java                                    |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java                                       |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java                                |    8 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java                                        |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java                                     |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java                                         |    4 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java                                             |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java                      |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java                             |    8 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java                      |   14 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java                        |   50 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java               |   17 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java                           |    7 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java                                   |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java                            |    5 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java                                    |  126 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java                                |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java                                     |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java                                       |    6 
 src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java                                           |   36 
 src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java                                        |    8 
 src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java                                               |  141 
 src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java                                             |  306 -
 src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java                                           |    4 
 src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java                                                |    8 
 src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java                                        |  846 +--
 src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java                                           |  294 -
 src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java                                                |  286 -
 src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties                                         |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/generator.properties                                             |    3 
 src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/model.properties                                                 |   10 
 src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties                                               |   15 
 src/share/classes/com/sun/tools/internal/ws/resources/processor.properties                                             |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/util.properties                                                  |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties                                          |   25 
 src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties                                             |   66 
 src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties                                                  |   48 
 src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/spi/package-info.java                                                      |    2 
 src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java                                         |    4 
 src/share/classes/com/sun/tools/internal/ws/version.properties                                                         |    8 
 src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java                                              |    1 
 src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java                                     |    1 
 src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java                                               |    5 
 src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java                                         |    8 
 src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java                                             |   12 
 src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java                                          |   11 
 src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java                                                     |   11 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java                                                |   45 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java                                                   |   47 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java                                            |    7 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java                                             |   75 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java                                                |   71 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java                                                   |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java                                                 |    7 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java                                               |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java                                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java                                      |   11 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java                                      |    4 
 src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java                                       |   17 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java                               |    1 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java                                                |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java                                                 |  122 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java                                      |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java                                              |  308 -
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java                |    3 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java                                            |   90 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java                                      |   33 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java                                    |   14 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java                                            |    4 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java                             |    3 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java                                  |   12 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java                                                |    9 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/AbortException.java                                                       |    3 
 src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java                                                 |   12 
 src/share/classes/com/sun/tools/internal/xjc/Driver.java                                                               |   27 
 src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java                                                        |   31 
 src/share/classes/com/sun/tools/internal/xjc/Language.java                                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties                                                  |  113 
 src/share/classes/com/sun/tools/internal/xjc/Messages.java                                                             |   42 
 src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java                                                          |   68 
 src/share/classes/com/sun/tools/internal/xjc/Options.java                                                              |  143 
 src/share/classes/com/sun/tools/internal/xjc/Plugin.java                                                               |   10 
 src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/XJCListener.java                                                          |    5 
 src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java                                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java                                   |    6 
 src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java                                                    |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java                                                     |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/Property.java                                                         |   18 
 src/share/classes/com/sun/tools/internal/xjc/api/Reference.java                                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java                                                   |   50 
 src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java                                                      |   12 
 src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/XJC.java                                                              |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java                                           |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java                                      |   19 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/package.html                                                          |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java                                              |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties                                              |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java                                         |   36 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java                                      |    4 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java                                    |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties                                   |   11 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java                                          |   17 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java                            |    9 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java                                    |    9 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java                                   |   47 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java                            |   31 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java                               |   48 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java                                      |  137 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java                                      |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java                              |    3 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java                            |   27 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java                                   |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java                            |    7 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java                            |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java                                      |   28 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java                              |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java                                     |   20 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java                                    |   16 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java                                |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java                        |   24 
 src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java                                        |    6 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java                                |    6 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java                                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java                                  |   22 
 src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java                                               |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java                                         |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java                                                     |    8 
 src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java                                               |    9 
 src/share/classes/com/sun/tools/internal/xjc/model/CClass.java                                                         |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java                                                     |   28 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java                                                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java                                                |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CElement.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java                                                   |   20 
 src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java                                                  |    4 
 src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java                                                  |   22 
 src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java                                         |   38 
 src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java                                                       |    7 
 src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java                                             |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java                                                    |   14 
 src/share/classes/com/sun/tools/internal/xjc/model/Model.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java                                                   |   23 
 src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java                                                    |   18 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java                                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java                                                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/package-info.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java                                                 |    7 
 src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java                                               |    3 
 src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java                                                |   24 
 src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java                                                 |   10 
 src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java                                                      |   10 
 src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java                                               |    8 
 src/share/classes/com/sun/tools/internal/xjc/package-info.java                                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/Const.java                                                         |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java                                       |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties                                           |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java                                                      |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java                                                   |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties                                       |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java                                                  |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java                                                |   30 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java                                      |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java                                    |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java                                        |   42 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java                                     |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java                                        |   64 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java                                    |   24 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java                                      |   34 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java                                 |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java                                         |   50 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java                                       |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java                                         |    4 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd                                       |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd                                               |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java                                                 |   16 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java                                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java                      |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java                                       |   24 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java                                        |  102 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java                                  |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java                                 |   48 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java                             |   22 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java                                     |  104 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java                                     |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties                              |   29 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java                                         |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java                             |   34 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java                                   |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java                               |   17 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java                                    |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java                                          |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java                                             |   14 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java                                       |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java                               |   11 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties                                 |  102 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java                                            |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java                                   |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java                                   |   37 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java                          |   35 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java                |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java                                    |    7 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java                               |   27 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java                              |   17 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java                                      |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java                                     |   11 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java                               |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java                            |   27 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java                                 |  158 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java                            |   26 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java                             |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java                                   |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties                        |   13 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng                                     |    7 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd                                     |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html                                    |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd                                         |    4 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd                                          |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java                           |    9 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java                          |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java                       |  204 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java                          |   58 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java                     |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java                  |   74 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java                 |   32 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java                            |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties                          |   14 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java                                     |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java                |   18 
 src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java                                           |   22 
 src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java                                                        |   24 
 src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java                                             |    4 
 src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java                                              |  142 
 src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties                                             |    9 
 src/share/classes/com/sun/tools/internal/xjc/util/Messages.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java                                                   |    3 
 src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java                                                      |    4 
 src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/Util.java                                                            |    4 
 src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java                                               |   34 
 src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java                                                       |   10 
 src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java                                                   |   19 
 src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java                                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java                                                 |   56 
 src/share/classes/com/sun/xml/internal/bind/IDResolver.java                                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/Locatable.java                                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/Util.java                                                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java                                              |   13 
 src/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java                                                   |   25 
 src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java                                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/api/Bridge.java                                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java                                                |    3 
 src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java                                                     |   49 
 src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java                                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java                                                     |   16 
 src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java                                                     |   26 
 src/share/classes/com/sun/xml/internal/bind/api/package-info.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java                                     |    6 
 src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java                                                 |   23 
 src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java                                          |   12 
 src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java                                                   |   30 
 src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties                                             |   33 
 src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java                                       |   43 
 src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java                                      |   55 
 src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java                                           |   14 
 src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java                                                  |   24 
 src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java                                                  |   89 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java                                               |   73 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java                                           |   24 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java                                                 |   26 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties                                           |   34 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java                                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java                                                   |  307 -
 src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java                                     |   19 
 src/share/classes/com/sun/xml/internal/bind/util/Which.java                                                            |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java                                                       |   46 
 src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java                                                     |   33 
 src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/TODO.java                                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java                                                 |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java                                    |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java                                              |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java                               |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java                                   |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java                                               |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java                                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java                                              |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java                                   |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java                                            |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java                                           |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java                                           |   89 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java                                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java                                 |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java                                                |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties                                          |   44 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java                                            |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java                                        |    7 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java                               |  127 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java                              |  160 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java                                    |   21 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java                                     |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java                              |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java                                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java                                                    |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java                                                |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java                                      |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java                                      |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java                                         |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/package-info.java                                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java                                            |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java                                          |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java                                             |   40 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java                                                 |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java                                                 |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java                                          |   63 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java                                      |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java                                                |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java                                        |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java                                |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java                                            |  184 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java                                                |   95 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java                                           |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java                                             |   32 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties                                             |   22 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java                                                       |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java                                                |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java                                                   |    7 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java                                          |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java                                      |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java                                              |   73 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java                       |  145 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java                                    |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java                                |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java                                           |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java                                       |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java                               |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java                                           |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java                               |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java                        |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java                                 |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java                                          |   12 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java                                      |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java                         |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java                                        |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java                                 |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java                                           |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java                                             |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java                        |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java                           |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java                      |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java                         |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java                          |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java                        |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java                           |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java                          |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java                                 |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java                        |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java                           |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java                            |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java                            |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java                                       |   21 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java                       |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java                                   |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java                             |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java                          |   70 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java                           |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java                                        |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java                                 |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java                                      |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties                                |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java                                  |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java                            |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java                           |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java                               |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java                              |   27 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java                          |   91 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java                        |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java                           |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java                                |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java                                    |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java                                  |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java                                                     |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java                                       |   59 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java                                        |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java                                         |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java                                         |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java                                     |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java                                       |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java                                           |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java                                              |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java                                                  |   31 
 src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java                                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java                                                      |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java                                                        |   22 
 src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java                                              |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties                                         |  101 
 src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java                                         |   47 
 src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java                                           |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java                                                        |  499 -
 src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java                                             |  342 -
 src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java                                                        |  715 +-
 src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java                                              |   78 
 src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java                                                  |  108 
 src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java                                                 |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java                              |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java                             |   55 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java                             |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java                      |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java                        |   10 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java                              |   96 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java                               |   76 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java                         |   30 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java                |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java                                 |   76 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java                             |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java                                |  101 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java                                |   42 
 src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java                            |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java                                          |  461 -
 src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java                                      |   82 
 src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java                                 |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties                                 |    7 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java                                           |   46 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java                                                   |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java                                                 |    3 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java                                          |  518 +
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java                                      |  106 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java                     |   83 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java                                           |   40 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java                                             |   25 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java                                        |  522 +
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java                                    |  295 -
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java                                               |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java                                      |   37 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java                                    |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java                                       |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java                                           |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java                                      |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java                                   |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java                                    |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java                              |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java                               |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java                                          |   68 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java                                      |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java                         |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java                                       |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java                             |   48 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java                                    |   38 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java                                    |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java                                  |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java                                 |   42 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java                                  |   72 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java                                       |    4 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java                                  |   70 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java                                  |   84 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java                                 |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java                                   |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java                                    |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java                           |   18 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java                       |   22 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java                               |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java                          |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java                                               |   30 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java                                           |   95 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java                                       |  111 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java                                           |   37 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java                                     |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java                                      |  116 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java                                           |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java                                               |   22 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java                                          |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java                                                 |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java                                            |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java                                           |   78 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java                                           |   10 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java                                  |   80 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java                                |   34 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java                                    |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java                                                 |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java                                |   68 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java                            |  107 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java                                               |  166 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java                                        |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java                                               |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java                                              |   64 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java                                                |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java                               |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java                                         |  108 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java                                     |   74 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java                                               |   14 
 src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java                                           |   69 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java                               |   85 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java                        |    6 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties                               |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java                                       |    4 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java                           |  102 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java                          |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java                     |  260 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java                  |  112 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java                         |  170 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java                     |  440 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java                     |   30 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java                        |  318 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java                       |  500 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java                  |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java                         | 1840 +++---
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java                       |  156 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java                      |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java                   |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java                         |   12 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java                            |  148 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java                     |  236 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java                     |  228 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java                          |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java                         |   88 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java                          |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java                          |   60 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java                         |  158 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java                         |  136 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java                         |  254 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java                         |  166 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java                                     |   46 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java                                               |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java                                        |   20 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java                          |   23 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java                                  |   58 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java                                |   13 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java                                 |   14 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java                                     |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java                                            |  132 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java                            |   64 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java                                    |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java                                           |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java                                   |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java                                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java                                        |   33 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java                                        |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java                                           |  191 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java                           |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java                               |  201 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java                                  |   23 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java                         |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java                  |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java                                   |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java                                          |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java                                         |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java                                       |   13 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java                                   |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java                                        |   30 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java                                    |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java                                       |   93 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java                                      |   58 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java                                  |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java                                         |   21 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java                                        |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties                                |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java                                          |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java                                     |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties                                |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java                                          |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java                                     |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java                                   |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java                                 |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java                                    |   64 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java                             |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java                                   |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java                            |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties                              |    6 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java                                  |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java                              |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java                                     |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java                                   |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java                                    |   15 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java                             |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java                                   |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java                            |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties                              |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java                                  |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java                              |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java                                                 |   84 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java                                        |   10 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java                                       |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java                                             |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java                                             |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java                                  |  103 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java                                         |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java                                       |   37 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java                                                |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java                                     |   33 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java                                        |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java                               |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java                                              |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java                                             |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java                                 |   39 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java                                         |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java                                   |   10 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java                |   79 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java                                    |   14 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java                           |    6 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java                             |    4 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java                                   |   10 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java                                 |    6 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java                                    |   62 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java                                    |   20 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java                                |  186 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java                                    |   12 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java                                   |   10 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java                                           |   32 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java                            |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java                      |   36 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java                  |   38 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java                           |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java                                |   78 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java                                |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java                      |   52 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java                 |    4 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java          |  148 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java                |   34 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java                         |   22 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java                 |   62 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java                                                |   36 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java                                             |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java                                   |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java                                        |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java                                         |    3 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java                                         |   16 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java                                           |    2 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java                                            |   10 
 src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java                                       |   12 
 src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java                                                  |    6 
 src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java                                              |   10 
 src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java                                                 |    7 
 src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java                                                |    8 
 src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java                                             |   16 
 src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java                                                   |    8 
 src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java                                              |   18 
 src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java                                                |    6 
 src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java                                                    |   11 
 src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java                                             |   52 
 src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java                                         |    2 
 src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java                                      |   12 
 src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java                                   |    6 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java                                    |    8 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java                             |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java                              |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties                                            |    1 
 src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java                                                         |   14 
 src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java                                              |   10 
 src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java                                             |    5 
 src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/rngom/parse/Context.java                                                        |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties                                                 |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java                                          |    2 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java                              |   76 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java                                         |   10 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties                                         |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java                                          |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java                                           |   12 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java                                           |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java                                    |   12 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java                                                   |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java                              |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java                                               |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java                                        |   16 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java                                               |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java                                              |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java                                      |   22 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java                               |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java                                       |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java                                         |  108 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java                                                 |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties                                             |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java                                               |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java                                               |  284 -
 src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/rngom/util/Uri.java                                                             |   72 
 src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java                                                           |    1 
 src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java                                         |    8 
 src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java                                               |    2 
 src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java                                                 |   17 
 src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java                                                      |   24 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java                                              |   46 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java                                     |   28 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java                                            |   72 
 src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java                                             |    2 
 src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java                                              |   18 
 src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java                                       |   72 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java                                              |   32 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java                                     |    4 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java                                          |   18 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java                                        |   30 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java                                        |   16 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java                                |   16 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java                                                 |   10 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java                                               |    3 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java                                         |  124 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java                                       |   96 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java                                   |   84 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java                                     |   29 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java                               |   45 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java                             |   29 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java                               |   22 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java                             |  136 
 src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java                                                        |    6 
 src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java                                                      |  661 +-
 src/share/classes/com/sun/xml/internal/txw2/TXW.java                                                                   |   10 
 src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java                                                   |    4 
 src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java                                         |    6 
 src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java                                                     |   22 
 src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java                                              |   10 
 src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java                                             |    2 
 src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java                                                      |   92 
 src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java                                        |    3 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java                                                |   26 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java                                                |  104 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java                                                      |  107 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java                                                |   32 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java                                            |   17 
 src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java                            |    9 
 src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java                                    |   17 
 src/share/classes/com/sun/xml/internal/ws/api/BindingID.java                                                           |   36 
 src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java                                                         |    6 
 src/share/classes/com/sun/xml/internal/ws/api/WSService.java                                                           |   82 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java                         |   51 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java                                      |   30 
 src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java                                 |    8 
 src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java                                                     |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/Message.java                                                     |   26 
 src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java                                                    |   34 
 src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java                                                      |   99 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java                                   |   12 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java                                   |   10 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java                               |   14 
 src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java                                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java                                                    |   24 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java                                       |   44 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java                                        |    9 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java                                                |   19 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java                                                |   28 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java                                              |    5 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java                                                |   20 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java                                               |   23 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java                                     |    7 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java                                     |   90 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java                                                          |    6 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java                                                         |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java                                                         |   27 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java                                                          |   32 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java                                                     |    9 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java                                     |    7 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java                                     |   31 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java                                                |   11 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java                                                          |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java                                  |    8 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java                                        |    6 
 src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java                                                |   22 
 src/share/classes/com/sun/xml/internal/ws/api/server/Container.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java                                             |   38 
 src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java                                   |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/Module.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java                                          |   18 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java                                                   |   12 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java                                                   |   35 
 src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java                                    |  115 
 src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java                                    |   54 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java                                     |   28 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java                              |   13 
 src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java                                                     |    8 
 src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java                                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java                                                 |   24 
 src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java                                           |    9 
 src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java                                                     |   15 
 src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java                                                |    4 
 src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java                                         |    1 
 src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java                                               |   10 
 src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java                                             |   17 
 src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java                                                         |    3 
 src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java                                                   |    4 
 src/share/classes/com/sun/xml/internal/ws/client/Stub.java                                                             |   75 
 src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java                                                |  147 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java                                            |   77 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java                                         |    2 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java                                     |   31 
 src/share/classes/com/sun/xml/internal/ws/client/package-info.java                                                     |  134 
 src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java                                           |  262 
 src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java                                                |   18 
 src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java                                         |    4 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java                                              |   72 
 src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java                                                      |   11 
 src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java                                            |  161 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java                                                  |   14 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java                                                  |   67 
 src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java                                               |  141 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java                                    |   12 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java                             |   35 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java                             |    6 
 src/share/classes/com/sun/xml/internal/ws/developer/Stateful.java                                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java                                     |    4 
 src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java                                             |   20 
 src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java                                                |   44 
 src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java                                                      |   86 
 src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java                                            |  458 -
 src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java                                                      |  259 
 src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java                                               |  220 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java                                                |   32 
 src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java                                                       |   21 
 src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java                                                     |   11 
 src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java                                            |  141 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java                                   |   51 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java                               |    6 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java                     |   14 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java                  |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java                       |    2 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java                       |    6 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java                         |   36 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java                                  |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java                                           |   10 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java                        |   10 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java                          |    2 
 src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java                                                   |   11 
 src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java                                                 |  284 -
 src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java                                                       |   22 
 src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java                                                       |   49 
 src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java                                                  |   82 
 src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java                                        |   69 
 src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java                                           |   65 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java                                              |    8 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java                                                |    6 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java                                                     |  129 
 src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java                                              |   18 
 src/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java                                         |   20 
 src/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java                                            |    4 
 src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java                                          |   13 
 src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java                                        |   85 
 src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java                                           |   81 
 src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java                                             |   10 
 src/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java                                               |    2 
 src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java                                      |    5 
 src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java                                             |    8 
 src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java                                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java                                           |    7 
 src/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java                                                |    4 
 src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java                                                  |   15 
 src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java                                               |    6 
 src/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java                                                 |   14 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java                                                |   24 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java                                                |  393 -
 src/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java                                     |    2 
 src/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java                               |    2 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java                                         |    3 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java                                             |    6 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java                                           |    8 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java                                           |    8 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java                                            |   78 
 src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java                                              |   59 
 src/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java                                              |   12 
 src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java                                                    |   33 
 src/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java                                                     |    6 
 src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java                                                    |  211 
 src/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java                                                      |    7 
 src/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java                                       |  109 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java                                        |   18 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java                                               |   12 
 src/share/classes/com/sun/xml/internal/ws/package-info.java                                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java                                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java                                            |  100 
 src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java                                                |   80 
 src/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java                                              |   32 
 src/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java                                              |   24 
 src/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java                                               |   16 
 src/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java                                            |    4 
 src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java                                               |   60 
 src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java                                           |   32 
 src/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java                                                |   10 
 src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java                                                |  193 
 src/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java                                             |   40 
 src/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java                                                  |   18 
 src/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java                                             |    8 
 src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java                                             |  338 -
 src/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java                                            |   24 
 src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties                                              |    6 
 src/share/classes/com/sun/xml/internal/ws/resources/client.properties                                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/handler.properties                                                 |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties                                              |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties                                                 |    8 
 src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties                                             |    3 
 src/share/classes/com/sun/xml/internal/ws/resources/sender.properties                                                  |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/server.properties                                                  |   26 
 src/share/classes/com/sun/xml/internal/ws/resources/soap.properties                                                    |    3 
 src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/util.properties                                                    |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties                                               |    7 
 src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties                                              |    1 
 src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java                                         |   46 
 src/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java                                        |    2 
 src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java                                                  |   30 
 src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java                                                   |   62 
 src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java                                         |    5 
 src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java                                                  |   10 
 src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java                                                      |   15 
 src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java                                                   |   35 
 src/share/classes/com/sun/xml/internal/ws/server/package-info.java                                                     |   80 
 src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java                                |    2 
 src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java                              |   13 
 src/share/classes/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java                                        |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java                                     |  107 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java                                     |    3 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java                               |    3 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java                                        |   28 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java                               |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java                                          |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java                                  |   72 
 src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java                                               |   37 
 src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java                                                        |   19 
 src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java                                               |   74 
 src/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java                                           |   14 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java                                            |    5 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java                                           |   17 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java                                           |   47 
 src/share/classes/com/sun/xml/internal/ws/transport/Headers.java                                                       |   11 
 src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java                               |    9 
 src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java                                              |  211 
 src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java                                         |   16 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java                               |  224 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java                            |    2 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java                                 |  102 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java                                      |   13 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java                              |  490 -
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java                                         |   30 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java                                     |   18 
 src/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java                                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java                                                    |    7 
 src/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java                                                            |    6 
 src/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java                                              |    8 
 src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java                                              |   12 
 src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java                                         |    5 
 src/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/util/Pool.java                                                               |   24 
 src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java                                                           |   12 
 src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java                                                     |   36 
 src/share/classes/com/sun/xml/internal/ws/util/UtilException.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java                                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties                                        |    1 
 src/share/classes/com/sun/xml/internal/ws/util/version.properties                                                      |    8 
 src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java                                |    8 
 src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java                                                     |   57 
 src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java                               |   12 
 src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java                                                        |   48 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java                                   |   21 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java                                    |   15 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java                                                  |   36 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java                                           |  123 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java                                               |    2 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java                              |   10 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java                                   |    8 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java                                             |    3 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java                         |   50 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java                                               |  129 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/xsom/SCD.java                                                                   |    1 
 src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java                                                          |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java                                                        |   16 
 src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java                                                        |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java                                                       |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java                                                        |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java                                                         |   37 
 src/share/classes/com/sun/xml/internal/xsom/XSComponent.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSContentType.java                                                         |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java                                                         |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java                                                         |   45 
 src/share/classes/com/sun/xml/internal/xsom/XSFacet.java                                                               |   12 
 src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java                                                  |    1 
 src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java                                                          |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSNotation.java                                                            |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSParticle.java                                                            |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java                                               |   16 
 src/share/classes/com/sun/xml/internal/xsom/XSSchema.java                                                              |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java                                                          |   38 
 src/share/classes/com/sun/xml/internal/xsom/XSTerm.java                                                                |   10 
 src/share/classes/com/sun/xml/internal/xsom/XSType.java                                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java                                                     |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSVariety.java                                                             |    7 
 src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java                                                            |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSXPath.java                                                               |    3 
 src/share/classes/com/sun/xml/internal/xsom/XmlString.java                                                             |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java                                                   |   26 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java                                                 |   22 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java                                                |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java                                                 |   18 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java                                                 |    9 
 src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java                                                  |  117 
 src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/Const.java                                                            |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java                                                  |   12 
 src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java                                                      |   68 
 src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java                                                        |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java                                                        |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java                                           |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java                                               |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java                                               |   16 
 src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java                                                     |   12 
 src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java                                                     |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java                                                              |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java                                        |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java                                                       |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java                                                    |   29 
 src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/UName.java                                                            |   43 
 src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java                                              |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/Util.java                                                             |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java                                                     |   36 
 src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java                                                        |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/package.html                                                          |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java                                            |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java                                   |   19 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java                                                |   47 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java                                                  |    8 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties                                            |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties                                         |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java                                             |   89 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java                                             |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java                                                     |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java                                            |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java                                   |   16 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java                                     |    8 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java                                      |   37 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java                                   |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java                                     |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java                                         |   50 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java                                |   74 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java                                         |  154 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java                                              |  809 +--
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java                                     |  177 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java                              |  153 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java                                    |  277 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java                                          |   25 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java                                   |  317 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java                                  |  259 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java                                       |  689 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java                                         | 1465 ++---
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java                     |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java                                     |  770 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java                                               |   25 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java                                              |   15 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java                                               |  163 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java                                   |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java                                               |  247 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java                                  |  281 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java                                          |  173 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java                                         |   79 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java                                      |  175 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java                                            |  257 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java                                              |  135 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java                                            |  701 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java                                               |   13 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java                                       |    3 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java                                            |  143 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java                                          |  195 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java                                        |  207 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java                                               |  133 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java                                             |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java                                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java                                                    |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java                                               |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java                                           |  105 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java                                        |   82 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java                                             |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java                                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java                                       |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java                                      |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java                                                |  204 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java                                                         |   26 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java                                              |   16 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java                                               |   13 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java                                        |    5 
 src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java                                                     |   46 
 src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java                                                      |   12 
 src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java                                                     |   50 
 src/share/classes/com/sun/xml/internal/xsom/parser/package.html                                                        |    2 
 src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java                                            |    6 
 src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java                                                |    1 
 src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java                                       |    1 
 src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java                                                       |   22 
 src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties                                                 |   31 
 src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java                                                    |   10 
 src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java                                                      |   14 
 src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java                                                          |   12 
 src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java                                                         |   10 
 src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java                                                 |   16 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java                                         |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java                                          |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java                                                    |    6 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java                                          |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java                                                |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java                                       |    1 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java                                                 |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java                                                     |    2 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java                                            |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java                                             |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/package.html                                                       |    2 
 src/share/classes/java/beans/Introspector.java                                                                         |   29 
 src/share/classes/java/beans/MetaData.java                                                                             |   83 
 src/share/classes/java/net/Socket.java                                                                                 |   15 
 src/share/classes/java/net/SocksSocketImpl.java                                                                        |   26 
 src/share/classes/java/net/URL.java                                                                                    |   10 
 src/share/classes/javax/accessibility/AccessibleResourceBundle.java                                                    |   15 
 src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java                                                    |    2 
 src/share/classes/javax/imageio/spi/ImageReaderSpi.java                                                                |    6 
 src/share/classes/javax/imageio/spi/ImageWriterSpi.java                                                                |    6 
 src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java                                                  |   10 
 src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java                                                 |   10 
 src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java                                        |    9 
 src/share/classes/javax/management/openmbean/OpenType.java                                                             |    5 
 src/share/classes/javax/swing/plaf/synth/Region.java                                                                   |  292 -
 src/share/classes/javax/xml/bind/Binder.java                                                                           |   92 
 src/share/classes/javax/xml/bind/ContextFinder.java                                                                    |   63 
 src/share/classes/javax/xml/bind/DatatypeConverter.java                                                                |  170 
 src/share/classes/javax/xml/bind/DatatypeConverterImpl.java                                                            |    2 
 src/share/classes/javax/xml/bind/DatatypeConverterInterface.java                                                       |  138 
 src/share/classes/javax/xml/bind/JAXBContext.java                                                                      |  206 
 src/share/classes/javax/xml/bind/JAXBElement.java                                                                      |   52 
 src/share/classes/javax/xml/bind/JAXBException.java                                                                    |   42 
 src/share/classes/javax/xml/bind/JAXBIntrospector.java                                                                 |   30 
 src/share/classes/javax/xml/bind/MarshalException.java                                                                 |   30 
 src/share/classes/javax/xml/bind/Marshaller.java                                                                       |  220 
 src/share/classes/javax/xml/bind/Messages.java                                                                         |   20 
 src/share/classes/javax/xml/bind/Messages.properties                                                                   |   26 
 src/share/classes/javax/xml/bind/NotIdentifiableEvent.java                                                             |    8 
 src/share/classes/javax/xml/bind/ParseConversionEvent.java                                                             |    6 
 src/share/classes/javax/xml/bind/PrintConversionEvent.java                                                             |    6 
 src/share/classes/javax/xml/bind/PropertyException.java                                                                |   66 
 src/share/classes/javax/xml/bind/UnmarshalException.java                                                               |   32 
 src/share/classes/javax/xml/bind/Unmarshaller.java                                                                     |  382 -
 src/share/classes/javax/xml/bind/UnmarshallerHandler.java                                                              |   26 
 src/share/classes/javax/xml/bind/ValidationEvent.java                                                                  |   38 
 src/share/classes/javax/xml/bind/ValidationEventHandler.java                                                           |   43 
 src/share/classes/javax/xml/bind/ValidationEventLocator.java                                                           |   30 
 src/share/classes/javax/xml/bind/ValidationException.java                                                              |   24 
 src/share/classes/javax/xml/bind/Validator.java                                                                        |  114 
 src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java                                                        |    7 
 src/share/classes/javax/xml/bind/annotation/XmlAccessType.java                                                         |    7 
 src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java                                                      |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java                                                       |   22 
 src/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java                                                       |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAnyElement.java                                                         |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAttribute.java                                                          |   22 
 src/share/classes/javax/xml/bind/annotation/XmlElement.java                                                            |   26 
 src/share/classes/javax/xml/bind/annotation/XmlElementDecl.java                                                        |   36 
 src/share/classes/javax/xml/bind/annotation/XmlElementRef.java                                                         |   26 
 src/share/classes/javax/xml/bind/annotation/XmlElementRefs.java                                                        |    2 
 src/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java                                                     |   14 
 src/share/classes/javax/xml/bind/annotation/XmlElements.java                                                           |   18 
 src/share/classes/javax/xml/bind/annotation/XmlEnum.java                                                               |   12 
 src/share/classes/javax/xml/bind/annotation/XmlEnumValue.java                                                          |   16 
 src/share/classes/javax/xml/bind/annotation/XmlID.java                                                                 |   21 
 src/share/classes/javax/xml/bind/annotation/XmlIDREF.java                                                              |   50 
 src/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java                                                   |   12 
 src/share/classes/javax/xml/bind/annotation/XmlList.java                                                               |   12 
 src/share/classes/javax/xml/bind/annotation/XmlMimeType.java                                                           |    2 
 src/share/classes/javax/xml/bind/annotation/XmlMixed.java                                                              |   50 
 src/share/classes/javax/xml/bind/annotation/XmlNs.java                                                                 |    8 
 src/share/classes/javax/xml/bind/annotation/XmlNsForm.java                                                             |   13 
 src/share/classes/javax/xml/bind/annotation/XmlRootElement.java                                                        |   18 
 src/share/classes/javax/xml/bind/annotation/XmlSchema.java                                                             |   22 
 src/share/classes/javax/xml/bind/annotation/XmlSchemaType.java                                                         |   17 
 src/share/classes/javax/xml/bind/annotation/XmlTransient.java                                                          |   17 
 src/share/classes/javax/xml/bind/annotation/XmlType.java                                                               |  110 
 src/share/classes/javax/xml/bind/annotation/XmlValue.java                                                              |   30 
 src/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java                                                   |   24 
 src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java                                           |   16 
 src/share/classes/javax/xml/bind/annotation/adapters/package.html                                                      |    4 
 src/share/classes/javax/xml/bind/annotation/package.html                                                               |   26 
 src/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java                                                  |   87 
 src/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java                                                |   36 
 src/share/classes/javax/xml/bind/attachment/package.html                                                               |   18 
 src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java                                                   |  142 
 src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java                                                 |  116 
 src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java                                            |   43 
 src/share/classes/javax/xml/bind/helpers/Messages.java                                                                 |   26 
 src/share/classes/javax/xml/bind/helpers/Messages.properties                                                           |   34 
 src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java                                                      |   64 
 src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java                                               |  106 
 src/share/classes/javax/xml/bind/helpers/package.html                                                                  |   16 
 src/share/classes/javax/xml/bind/package.html                                                                          |   10 
 src/share/classes/javax/xml/bind/util/JAXBResult.java                                                                  |   50 
 src/share/classes/javax/xml/bind/util/JAXBSource.java                                                                  |   62 
 src/share/classes/javax/xml/bind/util/Messages.java                                                                    |   18 
 src/share/classes/javax/xml/bind/util/Messages.properties                                                              |   23 
 src/share/classes/javax/xml/bind/util/ValidationEventCollector.java                                                    |   34 
 src/share/classes/javax/xml/bind/util/package.html                                                                     |   10 
 src/share/classes/javax/xml/soap/AttachmentPart.java                                                                   |  186 
 src/share/classes/javax/xml/soap/Detail.java                                                                           |    6 
 src/share/classes/javax/xml/soap/DetailEntry.java                                                                      |    6 
 src/share/classes/javax/xml/soap/FactoryFinder.java                                                                    |   12 
 src/share/classes/javax/xml/soap/MessageFactory.java                                                                   |   32 
 src/share/classes/javax/xml/soap/MimeHeader.java                                                                       |   18 
 src/share/classes/javax/xml/soap/MimeHeaders.java                                                                      |    6 
 src/share/classes/javax/xml/soap/Name.java                                                                             |   24 
 src/share/classes/javax/xml/soap/Node.java                                                                             |   30 
 src/share/classes/javax/xml/soap/SAAJMetaFactory.java                                                                  |   38 
 src/share/classes/javax/xml/soap/SAAJResult.java                                                                       |   92 
 src/share/classes/javax/xml/soap/SOAPBody.java                                                                         |  112 
 src/share/classes/javax/xml/soap/SOAPBodyElement.java                                                                  |   10 
 src/share/classes/javax/xml/soap/SOAPConnection.java                                                                   |   12 
 src/share/classes/javax/xml/soap/SOAPConnectionFactory.java                                                            |    9 
 src/share/classes/javax/xml/soap/SOAPConstants.java                                                                    |   26 
 src/share/classes/javax/xml/soap/SOAPElement.java                                                                      |  144 
 src/share/classes/javax/xml/soap/SOAPElementFactory.java                                                               |    6 
 src/share/classes/javax/xml/soap/SOAPEnvelope.java                                                                     |    6 
 src/share/classes/javax/xml/soap/SOAPException.java                                                                    |    6 
 src/share/classes/javax/xml/soap/SOAPFactory.java                                                                      |   54 
 src/share/classes/javax/xml/soap/SOAPFault.java                                                                        |  218 
 src/share/classes/javax/xml/soap/SOAPFaultElement.java                                                                 |    8 
 src/share/classes/javax/xml/soap/SOAPHeader.java                                                                       |   14 
 src/share/classes/javax/xml/soap/SOAPHeaderElement.java                                                                |   74 
 src/share/classes/javax/xml/soap/SOAPMessage.java                                                                      |  134 
 src/share/classes/javax/xml/soap/SOAPPart.java                                                                         |   14 
 src/share/classes/javax/xml/soap/Text.java                                                                             |    6 
 src/share/classes/javax/xml/soap/package.html                                                                          |   12 
 src/share/classes/javax/xml/ws/Action.java                                                                             |   22 
 src/share/classes/javax/xml/ws/Binding.java                                                                            |   10 
 src/share/classes/javax/xml/ws/BindingProvider.java                                                                    |   78 
 src/share/classes/javax/xml/ws/Dispatch.java                                                                           |   12 
 src/share/classes/javax/xml/ws/Endpoint.java                                                                           |   66 
 src/share/classes/javax/xml/ws/EndpointReference.java                                                                  |   42 
 src/share/classes/javax/xml/ws/FaultAction.java                                                                        |   10 
 src/share/classes/javax/xml/ws/Holder.java                                                                             |    4 
 src/share/classes/javax/xml/ws/LogicalMessage.java                                                                     |    8 
 src/share/classes/javax/xml/ws/RequestWrapper.java                                                                     |    9 
 src/share/classes/javax/xml/ws/RespectBinding.java                                                                     |    6 
 src/share/classes/javax/xml/ws/RespectBindingFeature.java                                                              |   28 
 src/share/classes/javax/xml/ws/Response.java                                                                           |    4 
 src/share/classes/javax/xml/ws/ResponseWrapper.java                                                                    |    9 
 src/share/classes/javax/xml/ws/Service.java                                                                            |  183 
 src/share/classes/javax/xml/ws/ServiceMode.java                                                                        |    2 
 src/share/classes/javax/xml/ws/WebEndpoint.java                                                                        |    2 
 src/share/classes/javax/xml/ws/WebFault.java                                                                           |    4 
 src/share/classes/javax/xml/ws/WebServiceClient.java                                                                   |    2 
 src/share/classes/javax/xml/ws/WebServiceContext.java                                                                  |   12 
 src/share/classes/javax/xml/ws/WebServiceException.java                                                                |   24 
 src/share/classes/javax/xml/ws/WebServiceFeature.java                                                                  |   36 
 src/share/classes/javax/xml/ws/WebServiceProvider.java                                                                 |    6 
 src/share/classes/javax/xml/ws/WebServiceRef.java                                                                      |    2 
 src/share/classes/javax/xml/ws/handler/Handler.java                                                                    |   14 
 src/share/classes/javax/xml/ws/handler/HandlerResolver.java                                                            |    4 
 src/share/classes/javax/xml/ws/handler/LogicalHandler.java                                                             |    2 
 src/share/classes/javax/xml/ws/handler/LogicalMessageContext.java                                                      |    8 
 src/share/classes/javax/xml/ws/handler/MessageContext.java                                                             |   46 
 src/share/classes/javax/xml/ws/handler/PortInfo.java                                                                   |    8 
 src/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java                                                           |    4 
 src/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java                                                    |   14 
 src/share/classes/javax/xml/ws/http/HTTPBinding.java                                                                   |    4 
 src/share/classes/javax/xml/ws/http/HTTPException.java                                                                 |   10 
 src/share/classes/javax/xml/ws/soap/Addressing.java                                                                    |   24 
 src/share/classes/javax/xml/ws/soap/AddressingFeature.java                                                             |   58 
 src/share/classes/javax/xml/ws/soap/MTOM.java                                                                          |   18 
 src/share/classes/javax/xml/ws/soap/MTOMFeature.java                                                                   |   40 
 src/share/classes/javax/xml/ws/soap/SOAPBinding.java                                                                   |   16 
 src/share/classes/javax/xml/ws/soap/SOAPFaultException.java                                                            |    6 
 src/share/classes/javax/xml/ws/spi/FactoryFinder.java                                                                  |   14 
 src/share/classes/javax/xml/ws/spi/Provider.java                                                                       |   60 
 src/share/classes/javax/xml/ws/spi/ServiceDelegate.java                                                                |  162 
 src/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java                                                    |    8 
 src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java                                                  |   29 
 src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java                                           |   62 
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java                                            |   39 
 src/share/classes/org/relaxng/datatype/Datatype.java                                                                   |    1 
 src/share/classes/org/relaxng/datatype/DatatypeBuilder.java                                                            |    1 
 src/share/classes/org/relaxng/datatype/DatatypeException.java                                                          |    1 
 src/share/classes/org/relaxng/datatype/DatatypeLibrary.java                                                            |    1 
 src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java                                                     |    1 
 src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java                                                 |    1 
 src/share/classes/org/relaxng/datatype/ValidationContext.java                                                          |    1 
 src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java                                              |    3 
 src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java                                       |    1 
 src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java                                             |    1 
 src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java                                                     |   20 
 src/share/lib/security/java.security                                                                                   |    2 
 src/share/lib/security/java.security-solaris                                                                           |    2 
 src/share/lib/security/java.security-windows                                                                           |    2 
 src/share/native/com/sun/java/util/jar/pack/unpack.cpp                                                                 |   10 
 src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c                                                              |   26 
 2008 files changed, 56587 insertions(+), 28511 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 java-1.6.0-openjdk-securitypatches.patchIndex: java-1.6.0-openjdk-securitypatches.patch
===================================================================
RCS file: java-1.6.0-openjdk-securitypatches.patch
diff -N java-1.6.0-openjdk-securitypatches.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java-1.6.0-openjdk-securitypatches.patch	5 Aug 2009 14:08:13 -0000	1.3
@@ -0,0 +1,171008 @@
+--- old/jdk/src/share/classes/javax/swing/text/LayoutQueue.java	2009-07-17 10:36:04.000000000 -0400
++++ openjdk/jdk/src/share/classes/javax/swing/text/LayoutQueue.java	2009-07-22 11:25:41.000000000 -0400
+@@ -25,6 +25,7 @@
+ package javax.swing.text;
+ 
+ import java.util.Vector;
++import sun.awt.AppContext;
+ 
+ /**
+  * A queue of text layout tasks.
+@@ -35,10 +36,10 @@
+  */
+ public class LayoutQueue {
+ 
+-    Vector tasks;
+-    Thread worker;
++    private static final Object DEFAULT_QUEUE = new Object();	
+ 
+-    static LayoutQueue defaultQueue;
++    private Vector<Runnable> tasks;
++    private Thread worker;
+ 
+     /**
+      * Construct a layout queue.
+@@ -51,10 +52,15 @@
+      * Fetch the default layout queue.
+      */
+     public static LayoutQueue getDefaultQueue() {
+-        if (defaultQueue == null) {
+-            defaultQueue = new LayoutQueue();
++        AppContext ac = AppContext.getAppContext();
++        synchronized (DEFAULT_QUEUE) {
++            LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
++            if (defaultQueue == null) {
++                defaultQueue = new LayoutQueue();
++                ac.put(DEFAULT_QUEUE, defaultQueue);
++            }
++            return defaultQueue;
+         }
+-        return defaultQueue;
+     }
+ 
+     /**
+@@ -63,7 +69,9 @@
+      * @param q the new queue.
+      */
+     public static void setDefaultQueue(LayoutQueue q) {
+-        defaultQueue = q;
++        synchronized (DEFAULT_QUEUE) {
++            AppContext.getAppContext().put(DEFAULT_QUEUE, q);
++        }
+     }
+ 
+     /**
+--- old/jdk/src/share/classes/java/awt/Cursor.java	2009-07-17 10:36:02.000000000 -0400
++++ openjdk/jdk/src/share/classes/java/awt/Cursor.java	2009-07-22 11:28:14.000000000 -0400
+@@ -119,6 +119,11 @@
+ 
+     protected static Cursor predefined[] = new Cursor[14];
+ 
++    /**
++     * This field is a private replacement for 'predefined' array.
++     */
++    private final static Cursor[] predefinedPrivate = new Cursor[14];
++
+     /* Localization names and default values */
+     static final String[][] cursorProperties = {
+         { "AWT.DefaultCursor", "Default Cursor" },
+@@ -252,10 +257,15 @@
+         if (type < Cursor.DEFAULT_CURSOR || type > Cursor.MOVE_CURSOR) {
+             throw new IllegalArgumentException("illegal cursor type");
+         }
++        Cursor c = predefinedPrivate[type];
++        if (c == null) {
++            predefinedPrivate[type] = c = new Cursor(type);
++        }
++        // fill 'predefined' array for backwards compatibility.
+         if (predefined[type] == null) {
+-            predefined[type] = new Cursor(type);
++            predefined[type] = c;
+         }
+-        return predefined[type];
++        return c;
+     }
+ 
+     /**
+--- old/src/share/classes/javax/accessibility/AccessibleResourceBundle.java	Fri Jun 19 15:30:16 2009
++++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java	Fri Jun 19 15:30:14 2009
+@@ -44,15 +44,11 @@
+      * localized display strings.
+      */
+     public Object[][] getContents() {
+-        return contents;
+-    }
++        // The table holding the mapping between the programmatic keys
++        // and the display strings for the en_US locale.
++        return new Object[][] {
+ 
+-    /**
+-     * The table holding the mapping between the programmatic keys
+-     * and the display strings for the en_US locale.
+-     */
+-    static final Object[][] contents = {
+-    // LOCALIZE THIS
++        // LOCALIZE THIS
+         // Role names
+ //        { "application","application" },
+ //        { "border","border" },
+@@ -151,5 +147,6 @@
+         { "vertical","vertical" },
+         { "horizontal","horizontal" }
+     // END OF MATERIAL TO LOCALIZE
+-    };
++        };
++    }
+ }
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	2009-04-24 17:32:19.463300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	2009-04-24 17:32:18.529300000 +0400
+@@ -51,7 +51,7 @@
+               entensions,
+               mimeType,
+               "com.sun.imageio.plugins.bmp.BMPImageReader",
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               false,
+               null, null, null, null,
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	2009-04-24 17:32:32.537300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	2009-04-24 17:32:31.632300000 +0400
+@@ -32,6 +32,7 @@
+ import javax.imageio.spi.ImageWriterSpi;
+ import javax.imageio.spi.ServiceRegistry;
+ import javax.imageio.spi.IIORegistry;
++import javax.imageio.stream.ImageOutputStream;
+ import javax.imageio.ImageWriter;
+ import javax.imageio.ImageTypeSpecifier;
+ import javax.imageio.IIOException;
+@@ -55,7 +56,7 @@
+               entensions,
+               mimeType,
+               "com.sun.imageio.plugins.bmp.BMPImageWriter",
+-              STANDARD_OUTPUT_TYPE,
++              new Class[] { ImageOutputStream.class },
+               readerSpiNames,
+               false,
+               null, null, null, null,
+--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	2009-04-24 17:32:39.646300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	2009-04-24 17:32:38.722300000 +0400
+@@ -62,7 +62,7 @@
+               suffixes,
+               MIMETypes,
+               readerClassName,
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               true,
+               GIFStreamMetadata.nativeMetadataFormatName,
+--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	2009-04-24 17:32:48.539300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	2009-04-24 17:32:44.764300000 +0400
+@@ -31,6 +31,7 @@
+ import javax.imageio.ImageTypeSpecifier;
+ import javax.imageio.ImageWriter;
+ import javax.imageio.spi.ImageWriterSpi;
++import javax.imageio.stream.ImageOutputStream;
+ import com.sun.imageio.plugins.common.PaletteBuilder;
+ 
+ public class GIFImageWriterSpi extends ImageWriterSpi {
+@@ -59,7 +60,7 @@
+               suffixes,
+               MIMETypes,
+               writerClassName,
+-              STANDARD_OUTPUT_TYPE,
++              new Class[] { ImageOutputStream.class },
+               readerSpiNames,
+               true,
+               GIFWritableStreamMetadata.NATIVE_FORMAT_NAME,
+--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java	2009-04-24 17:32:57.302300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java	2009-04-24 17:32:56.484300000 +0400
+@@ -48,7 +48,7 @@
+               JPEG.suffixes,
+               JPEG.MIMETypes,
+               "com.sun.imageio.plugins.jpeg.JPEGImageReader",
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               true,
+               JPEG.nativeStreamMetadataFormatName,
+--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java	2009-04-24 17:33:03.013300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java	2009-04-24 17:33:02.189300000 +0400
+@@ -28,6 +28,7 @@
+ import javax.imageio.spi.ImageWriterSpi;
+ import javax.imageio.spi.ServiceRegistry;
+ import javax.imageio.spi.IIORegistry;
[...170615 lines suppressed...]
+-
+-import javax.xml.namespace.QName;
+-
+-/**
+- * <p> XMLReader provides a high-level streaming parser interface
+- * for reading XML documents. </p>
+- *
+- * <p> The {@link #next} method is used to read events from the XML document. </p>
+- *
+- * <p> Each time it is called, {@link #next} returns the new state of the reader. </p>
+- *
+- * <p> Possible states are: BOF, the initial state, START, denoting the start
+- * tag of an element, END, denoting the end tag of an element, CHARS, denoting
+- * the character content of an element, PI, denoting a processing instruction,
+- * EOF, denoting the end of the document. </p>
+- *
+- * <p> Depending on the state the reader is in, one or more of the following
+- * query methods will be meaningful: {@link #getName}, {@link #getURI},
+- * {@link #getLocalName}, {@link #getAttributes}, {@link #getValue}. </p>
+- *
+- * <p> Elements visited by a XMLReader are tagged with unique IDs. The ID of the
+- * current element can be found by calling {@link #getElementId}. </p>
+- *
+- * <p> A XMLReader is always namespace-aware, and keeps track of the namespace
+- * declarations which are in scope at any time during streaming. The
+- * {@link #getURI(java.lang.String)} method can be used to find the URI
+- * associated to a given prefix in the current scope. </p>
+- *
+- * <p> XMLReaders can be created using a {@link XMLReaderFactory}. </p>
+- *
+- * <p> Some utility methods, {@link #nextContent} and {@link #nextElementContent}
+- * make it possible to ignore whitespace and processing instructions with
+- * minimum impact on the client code. </p>
+- *
+- * <p> Similarly, the {@link #skipElement} and {@link #skipElement(int elementId)}
+- * methods allow to skip to the end tag of an element ignoring all its content. </p>
+- *
+- * <p> Finally, the {@link #recordElement} method can be invoked when the XMLReader
+- * is positioned on the start tag of an element to record the element's contents
+- * so that they can be played back later. </p>
+- *
+- * @see XMLReaderFactory
+- *
+- * @author WS Development Team
+- */
+-public interface XMLReader {
+-    /**
+-     * The initial state of a XMLReader.
+-     */
+-    public static final int BOF = 0;
+-
+-    /**
+-     * The state denoting the start tag of an element.
+-     */
+-    public static final int START = 1;
+-
+-    /**
+-     * The state denoting the end tag of an element.
+-     */
+-    public static final int END = 2;
+-
+-    /**
+-     * The state denoting the character content of an element.
+-     */
+-    public static final int CHARS = 3;
+-
+-    /**
+-     * The state denoting a processing instruction.
+-     */
+-    public static final int PI = 4;
+-
+-    /**
+-     * The state denoting that the end of the document has been reached.
+-     */
+-    public static final int EOF = 5;
+-
+-    /**
+-     * Return the next state of the XMLReader.
+-     *
+-     * The return value is one of: START, END, CHARS, PI, EOF.
+-     */
+-    public int next();
+-
+-    /*
+-    * Return the next state of the XMLReader.
+-    *
+-    * <p> Whitespace character content and processing instructions are ignored. </p>
+-    *
+-    * <p> The return value is one of: START, END, CHARS, EOF. </p>
+-    */
+-    public int nextContent();
+-
+-    /**
+-     * Return the next state of the XMLReader.
+-     *
+-     * <p> Whitespace character content, processing instructions are ignored.
+-     * Non-whitespace character content triggers an exception. </p>
+-     *
+-     * <p> The return value is one of: START, END, EOF. </p>
+-     */
+-    public int nextElementContent();
+-
+-    /**
+-     * Return the current state of the XMLReader.
+-     *
+-     */
+-    public int getState();
+-
+-    /**
+-     * Return the current qualified name.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END. </p>
+-     */
+-    public QName getName();
+-
+-    /**
+-     * Return the current URI.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END. </p>
+-     */
+-    public String getURI();
+-
+-    /**
+-     * Return the current local name.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END, PI. </p>
+-     */
+-    public String getLocalName();
+-
+-    /**
+-     * Return the current attribute list. In the jaxws implementation,
+-     * this list also includes namespace declarations.
+-     *
+-     * <p> Meaningful only when the state is one of: START. </p>
+-     *
+-     * <p> The returned {@link Attributes} object belong to the XMLReader and is
+-     * only guaranteed to be valid until the {@link #next} method is called,
+-     * directly or indirectly.</p>
+-     */
+-    public Attributes getAttributes();
+-
+-    /**
+-     * Return the current value.
+-     *
+-     * <p> Meaningful only when the state is one of: CHARS, PI. </p>
+-     */
+-    public String getValue();
+-
+-    /**
+-     * Return the current element ID.
+-     */
+-    public int getElementId();
+-
+-    /**
+-     * Return the current line number.
+-     *
+-     * <p> Due to aggressive parsing, this value may be off by a few lines. </p>
+-     */
+-    public int getLineNumber();
+-
+-    /**
+-     * Return the URI for the given prefix.
+-     *
+-     * <p> If there is no namespace declaration in scope for the given
+-     * prefix, return null. </p>
+-     */
+-    public String getURI(String prefix);
+-
+-    /**
+-     * Return an iterator on all prefixes in scope, except for the default prefix.
+-     *
+-     */
+-    public Iterator getPrefixes();
+-
+-    /**
+-     * Records the current element and leaves the reader positioned on its end tag.
+-     *
+-     * <p> The XMLReader must be positioned on the start tag of the element.
+-     * The returned reader will play back all events starting with the
+-     * start tag of the element and ending with its end tag. </p>
+-     */
+-    public XMLReader recordElement();
+-
+-    /**
+-     * Skip all nodes up to the end tag of the element with the current element ID.
+-     */
+-    public void skipElement();
+-
+-    /**
+-     * Skip all nodes up to the end tag of the element with the given element ID.
+-     */
+-    public void skipElement(int elementId);
+-
+-    /**
+-     * Close the XMLReader.
+-     *
+-     * <p> All subsequent calls to {@link #next} will return EOF. </p>
+-     */
+-    public void close();
+-}


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- java-1.6.0-openjdk.spec	30 Jul 2009 15:42:27 -0000	1.131
+++ java-1.6.0-openjdk.spec	5 Aug 2009 14:08:13 -0000	1.132
@@ -123,9 +123,13 @@
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
 # but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now.
+# use the root tapset dir for now. To distinquish between 64
+# and 32 bit architectures we place the tapsets under the arch
+# specific dir (note that systemtap will only pickup the tapset
+# for the primary arch for now). Systemtap uses the machine name
+# aka build_cpu as architecture specific directory name.
 #%define tapsetdir	/usr/share/systemtap/tapset/%{sdkdir}
-%define tapsetdir	/usr/share/systemtap/tapset
+%define tapsetdir	/usr/share/systemtap/tapset/%{_build_cpu}
 %endif
 
 # Prevent brp-java-repack-jars from being run.
@@ -133,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 27.%{openjdkver}%{?dist}
+Release: 28.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -170,9 +174,10 @@ Patch4:	  java-1.6.0-openjdk-java-access
 Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
 Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:	  java-1.6.0-openjdk-netx.patch
+Patch8:	  java-1.6.0-openjdk-netxandplugin.patch
 Patch9:   java-1.6.0-openjdk-execvpe.patch
 Patch10:  java-1.6.0-openjdk-x11.patch
+Patch11:  java-1.6.0-openjdk-securitypatches.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -419,6 +424,7 @@ patch -l -p0 < %{PATCH7}
 patch -l -p0 < %{PATCH8}
 patch -l -p0 < %{PATCH9}
 patch -l -p0 < %{PATCH10}
+patch -l -p0 < %{PATCH11}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -966,6 +972,25 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Tue Aug  4 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-28.b16
+- Updated java-1.6.0-openjdk-netx.patch, and renamed to
+java-1.6.0-openjdk-netxandplugin.patch.
+- Added java-1.6.0-openjdk-securitypatches.patch.
+- Resolves: rhbz#512101
+- Resolves: rhbz#512896
+- Resolves: rhbz#512914
+- Resolves: rhbz#512907
+- Resolves: rhbz#512921
+- Resolves: rhbz#511915
+- Resolves: rhbz#512915
+- Resolves: rhbz#512920
+- Resolves: rhbz#512714
+- Resolves: rhbz#513215
+- Resolves: rhbz#513220
+- Resolves: rhbz#513222
+- Resolves: rhbz#513223
+- Resolves: rhbz#503794
+
 * Thu Jul 30 2009 Lillian Angel  <langel at redhat.com> - 1:1.6.0-27.b16
 - java-1.6.0-openjdk-x11.patch updated.
 


--- java-1.6.0-openjdk-netx.patch DELETED ---



From langel at fedoraproject.org  Wed Aug  5 14:10:46 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed,  5 Aug 2009 14:10:46 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk-netxandplugin.patch,
	NONE, 1.1 java-1.6.0-openjdk-securitypatches.patch, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.112,
	1.113 java-1.6.0-openjdk-netx.patch, 1.1, NONE
Message-ID: <20090805141046.D7E7711C0439@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv966

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Removed Files:
	java-1.6.0-openjdk-netx.patch 
Log Message:
* Wed Aug  5 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-20.b16
- Updated java-1.6.0-openjdk-netx.patch, and renamed to
java-1.6.0-openjdk-netxandplugin.patch.
- Added java-1.6.0-openjdk-securitypatches.patch.
- Resolves: rhbz#512101
- Resolves: rhbz#512896
- Resolves: rhbz#512914
- Resolves: rhbz#512907
- Resolves: rhbz#512921
- Resolves: rhbz#511915
- Resolves: rhbz#512915
- Resolves: rhbz#512920
- Resolves: rhbz#512714
- Resolves: rhbz#513215
- Resolves: rhbz#513220
- Resolves: rhbz#513222
- Resolves: rhbz#513223
- Resolves: rhbz#503794



java-1.6.0-openjdk-netxandplugin.patch:
 JNLPRuntime.java                                                 |    2 
 plugin/icedtea/netscape/javascript/JSObject.java                 |   37 ++++++-
 plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java |   47 ++++++++++
 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java       |    6 +
 rt/net/sourceforge/jnlp/SecurityDesc.java                        |   24 +++++
 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java             |   27 ++++-
 6 files changed, 131 insertions(+), 12 deletions(-)

--- NEW FILE java-1.6.0-openjdk-netxandplugin.patch ---
--- ../JNLPRuntime.java	2009-07-09 12:51:44.000000000 -0400
+++ rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java	2009-07-09 12:52:04.000000000 -0400
@@ -282,7 +282,7 @@
 
         String homeDir = System.getProperty("user.home");
 	File baseDir = new File(homeDir + "/.netx/");
-	if (homeDir == null || !baseDir.mkdir())
+	if (homeDir == null || (!baseDir.isDirectory() && !baseDir.mkdir()))
             return null;
 
         props.setProperty("basedir", baseDir.toString());
diff -r d20bab985f89 plugin/icedtea/netscape/javascript/JSObject.java
--- a/plugin/icedtea/netscape/javascript/JSObject.java	Fri Jul 17 06:04:59 2009 -0400
+++ plugin/icedtea/netscape/javascript/JSObject.java	Tue Jul 21 14:48:24 2009 -0400
@@ -47,6 +47,10 @@
 package netscape.javascript;
 
 import java.applet.Applet;
+import java.security.AccessControlContext;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.BasicPermission;
 
 import sun.applet.PluginAppletViewer;
 import sun.applet.PluginDebug;
@@ -102,13 +106,37 @@
     /**
      * it is illegal to construct a JSObject manually
      */
-    // FIXME: make private!
     public JSObject(int jsobj_addr) {
-        PluginDebug.debug ("JSObject int CONSTRUCTOR");
-        internal = jsobj_addr;
+        this((long) jsobj_addr);
     }
 
     public JSObject(long jsobj_addr) {
+        
+        // See if the caller has permission
+        
+        try {
+            AccessController.getContext().checkPermission(new JSObjectCreatePermission());
+        } catch (AccessControlException ace) {
+            
+            // If not, only caller with JSObject.getWindow on the stack may 
+            // make this call unprivileged.
+            
+            // Although this check is inefficient, it should happen only once
+            // during applet init, so we look the other way
+
+            StackTraceElement[] stack =  Thread.currentThread().getStackTrace();
+            boolean mayProceed = false;
+            
+            for (int i=0; i < stack.length; i++) {
+                if (stack[i].getClassName().equals("netscape.javascript.JSObject") &&
+                    stack[i].getMethodName().equals("getWindow")) {
+                    mayProceed = true;
+                }
+            }
+
+            if (!mayProceed) throw ace;
+        }
+
         PluginDebug.debug ("JSObject long CONSTRUCTOR");
         internal = jsobj_addr;
     }
@@ -234,7 +262,7 @@
         internal = ((PluginAppletViewer)
                     applet.getAppletContext()).getWindow();
         PluginDebug.debug ("GOT IT: " + internal);
-        return new JSObject(internal);
+        return new JSObject((long) internal);
     }
 
 
@@ -259,5 +287,4 @@
 
         return false;
     }
-
 }
diff -r d20bab985f89 plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java	Tue Jul 21 14:48:24 2009 -0400
@@ -0,0 +1,47 @@
+/* JSObjectCreatePermission.java
+   Copyright (C) 2009  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+ 
+package netscape.javascript;
+
+import java.security.BasicPermission;
+
+
+public class JSObjectCreatePermission extends BasicPermission {
+    public JSObjectCreatePermission() {
+        super("JSObjectCreate");
+    }
+}
diff -r d20bab985f89 plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Fri Jul 17 06:04:59 2009 -0400
+++ plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Tue Jul 21 14:48:24 2009 -0400
@@ -58,6 +58,7 @@
 import java.util.List;
 
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import netscape.javascript.JSObjectCreatePermission;
 
 
 
@@ -1285,12 +1286,15 @@
 
 		CodeSource cs = new CodeSource((URL) null, (java.security.cert.Certificate  [])null);
 		
-		if (src != null) {
+		if (src != null && src.length() > 0) {
 			try {
 				cs = new CodeSource(new URL(src + "/"), (java.security.cert.Certificate[]) null);
 			} catch (MalformedURLException mfue) {
 				// do nothing
 			}
+		} else {
+		    JSObjectCreatePermission perm = new JSObjectCreatePermission();
+		    grantedPermissions.add(perm);
 		}
 
 		ProtectionDomain pd = new ProtectionDomain(cs, grantedPermissions, null, null);
diff -r 438cbd2f7252 rt/net/sourceforge/jnlp/SecurityDesc.java
--- a/rt/net/sourceforge/jnlp/SecurityDesc.java	Wed Jul 15 12:56:10 2009 +0200
+++ rt/net/sourceforge/jnlp/SecurityDesc.java	Wed Jul 15 11:58:08 2009 -0400
@@ -166,6 +166,30 @@
 
         return permissions;
     }
+    
+    /**
+     * Returns a PermissionCollection containing the sandbox permissions
+     */
+    public PermissionCollection getSandBoxPermissions() {
+        
+        Permissions permissions = new Permissions();
+
+        for (int i=0; i < sandboxPermissions.length; i++)
+            permissions.add(sandboxPermissions[i]);
+
+        if (downloadHost != null)
+            permissions.add(new SocketPermission(downloadHost,
+                                                 "connect, accept"));
+
+        // properties
+        PropertyDesc props[] = file.getResources().getProperties();
+        for (int i=0; i < props.length; i++) {
+            // should only allow jnlp.* properties if in sandbox?
+            permissions.add(new PropertyPermission(props[i].getKey(), "read,write"));
+        }
+
+        return permissions;
+    }
 
 }
 
diff -r 438cbd2f7252 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 15 12:56:10 2009 +0200
+++ rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 15 11:58:08 2009 -0400
@@ -435,12 +469,29 @@
         // access w/o security dialog once we actually check certificates.
 
         // copy security permissions from SecurityDesc element
-		if (security != null) {
-        	Enumeration e = security.getPermissions().elements();
-        	while (e.hasMoreElements())
-            	result.add((Permission) e.nextElement());
-		}
+        if (security != null) {
+            // Security desc. is used only to track security settings for the
+            // application. However, an application may comprise of multiple
+            // jars, and as such, security must be evaluated on a per jar basis.
+            
+            // set default perms
+            PermissionCollection permissions = security.getSandBoxPermissions();
+            
+            // If more than default is needed, evaluate based on codesource
+            if (security.getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS) ||
+                security.getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS)) {
 
+                if (cs.getCodeSigners() != null) {
+                    permissions = security.getPermissions();
+                }
+            }
+
+            Enumeration<Permission> e = permissions.elements();
+            while (e.hasMoreElements())
+                result.add(e.nextElement());
+        }
+
+	    
         // add in permission to read the cached JAR files
         for (int i=0; i < resourcePermissions.size(); i++)
             result.add((Permission) resourcePermissions.get(i));

java-1.6.0-openjdk-securitypatches.patch:
 ./THIRD_PARTY_README                                                                                                   |    2 
 jdk/src/share/classes/java/awt/Cursor.java                                                                             |   14 
 jdk/src/share/classes/javax/swing/text/LayoutQueue.java                                                                |   22 
 make/sun/net/FILES_java.gmk                                                                                            |    1 
 openjdk/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html                                            |   29 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/Builder.java                                                   |   33 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizable.java                                  |   63 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java                           |   56 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java                    |   43 
 openjdk/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizer.java                                    |  149 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java                                  |   56 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java                                      |   43 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java                                       |   52 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java                                      |   64 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java                             |   66 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java                          |  154 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java                             |   94 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java                                     |  122 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java                                              |   79 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java                                  |   46 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties                            |   26 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java     |   37 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java                  |  176 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java                    |  152 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java            |  187 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java              |   64 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java           |   62 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java |  221 
 openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java    |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java                         |   42 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.java                                            |   53 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties                                      |   27 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java                  |   66 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java                         |   35 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java                            |   35 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java              |   59 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java                 |   72 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java                                   |   33 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java                   |  237 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java                                     |   50 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java                          |   94 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java                                      |   70 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java                                  |   83 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java                                  |  258 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java                                  |   73 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java                            |   49 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java                                    |   48 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java                           |  238 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java                                |  147 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java                                 |  116 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java                               |  248 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java                                |  500 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java                      |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java                                  |  206 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java                                |   96 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java                              |  116 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java                        |  143 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java                                        |   65 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java                                    |   86 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java                               |   69 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java                               |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java                                 |  126 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java         |   64 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java                      |   50 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java                     |   44 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java         |   78 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java          |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java          |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java                                        |   67 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java                                |   54 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java                         |   88 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java                             |  164 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java                             |   73 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java                              |   52 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java                                   |   62 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java                                    |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java                         |  163 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java                                       |  118 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java                                   |  244 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java                               |  214 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java                             |   57 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java                             |   70 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java                              |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java                              |  101 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java                                |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java                         |   74 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java                             |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java                      |  117 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java                            |   69 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java                                 |   68 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java                          |  124 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java                          |   58 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java                    |   83 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java                                      |  136 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java                   |   63 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java                                  |  382 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java                          |  164 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java                     |  129 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java                                    |  138 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java                                    |   71 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java                         |  148 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java                            |  114 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java                          |  150 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java                         |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java                          |  149 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java                                      |   55 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java                                      |  100 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Injector.java                                            |  192 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java                                |  659 ++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java                             |   84 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java                       |  127 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java                        |  346 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java                               |  284 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java                              |  323 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java                             | 2039 +++++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java                            |  226 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java                             | 1374 +++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java                                    |  105 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java                            |   94 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java                             |  299 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java                                   | 1432 +++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java                                 |  100 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java                                    |  286 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java                                   |  556 ++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java                           |  425 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java                            | 2631 ++++++++++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java                                 |  371 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java                                    |  824 +++
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java                    |   60 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java                    |   47 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java                                           |   87 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java                         |  319 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java                      |   76 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java                                |   44 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java                                       |  230 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java                                   |   40 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java                              |   37 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java                      |   59 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java                                         |   92 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java                                  |   43 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java                    |  261 
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java                                 |  317 +
 openjdk/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java      |  106 
 openjdk/jdk/src/share/classes/sun/net/ApplicationProxy.java                                                            |   43 
 src/share/classes/com/sun/codemodel/internal/CodeWriter.java                                                           |   10 
 src/share/classes/com/sun/codemodel/internal/JAnnotatable.java                                                         |    1 
 src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java                                               |    1 
 src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java                                                       |    4 
 src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java                                                    |    1 
 src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java                                                      |   10 
 src/share/classes/com/sun/codemodel/internal/JArray.java                                                               |   10 
 src/share/classes/com/sun/codemodel/internal/JArrayClass.java                                                          |   24 
 src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java                                                        |    4 
 src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java                                                    |    4 
 src/share/classes/com/sun/codemodel/internal/JAtom.java                                                                |    6 
 src/share/classes/com/sun/codemodel/internal/JBlock.java                                                               |   12 
 src/share/classes/com/sun/codemodel/internal/JBreak.java                                                               |    6 
 src/share/classes/com/sun/codemodel/internal/JCase.java                                                                |    8 
 src/share/classes/com/sun/codemodel/internal/JCast.java                                                                |    2 
 src/share/classes/com/sun/codemodel/internal/JClass.java                                                               |   58 
 src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java                                         |   10 
 src/share/classes/com/sun/codemodel/internal/JClassContainer.java                                                      |   34 
 src/share/classes/com/sun/codemodel/internal/JCodeModel.java                                                           |   50 
 src/share/classes/com/sun/codemodel/internal/JCommentPart.java                                                         |   20 
 src/share/classes/com/sun/codemodel/internal/JContinue.java                                                            |    6 
 src/share/classes/com/sun/codemodel/internal/JDefinedClass.java                                                        |   76 
 src/share/classes/com/sun/codemodel/internal/JDirectClass.java                                                         |    3 
 src/share/classes/com/sun/codemodel/internal/JDocComment.java                                                          |   13 
 src/share/classes/com/sun/codemodel/internal/JEnumConstant.java                                                        |    4 
 src/share/classes/com/sun/codemodel/internal/JExpr.java                                                                |   41 
 src/share/classes/com/sun/codemodel/internal/JFieldVar.java                                                            |    5 
 src/share/classes/com/sun/codemodel/internal/JForEach.java                                                             |   50 
 src/share/classes/com/sun/codemodel/internal/JForLoop.java                                                             |   18 
 src/share/classes/com/sun/codemodel/internal/JFormatter.java                                                           |    6 
 src/share/classes/com/sun/codemodel/internal/JGenerifiable.java                                                        |   10 
 src/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java                                                    |   10 
 src/share/classes/com/sun/codemodel/internal/JInvocation.java                                                          |   10 
 src/share/classes/com/sun/codemodel/internal/JJavaName.java                                                            |    1 
 src/share/classes/com/sun/codemodel/internal/JLabel.java                                                               |    8 
 src/share/classes/com/sun/codemodel/internal/JMethod.java                                                              |  517 -
 src/share/classes/com/sun/codemodel/internal/JMods.java                                                                |   26 
 src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java                                                       |   10 
 src/share/classes/com/sun/codemodel/internal/JNullType.java                                                            |    6 
 src/share/classes/com/sun/codemodel/internal/JPackage.java                                                             |   93 
 src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java                                                       |   12 
 src/share/classes/com/sun/codemodel/internal/JResourceFile.java                                                        |    8 
 src/share/classes/com/sun/codemodel/internal/JStringLiteral.java                                                       |   12 
 src/share/classes/com/sun/codemodel/internal/JSwitch.java                                                              |    6 
 src/share/classes/com/sun/codemodel/internal/JType.java                                                                |   10 
 src/share/classes/com/sun/codemodel/internal/JTypeVar.java                                                             |   14 
 src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java                                                        |    1 
 src/share/classes/com/sun/codemodel/internal/JVar.java                                                                 |    8 
 src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java                                                |    1 
 src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java                                                      |   12 
 src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java                                                    |    8 
 src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java                                                |    6 
 src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java                                                      |   14 
 src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java                                                  |   40 
 src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java                                                        |   10 
 src/share/classes/com/sun/codemodel/internal/package-info.java                                                         |    1 
 src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java                                             |    6 
 src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java                                                  |   13 
 src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java                                             |   16 
 src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java                                                   |  333 -
 src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java                                               |  164 
 src/share/classes/com/sun/codemodel/internal/util/Surrogate.java                                                       |  448 -
 src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java                                             |   18 
 src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java                                                |   28 
 src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java                                              |    1 
 src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java                                            |    8 
 src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java                                              |   22 
 src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java                                        |   14 
 src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java                                                 |   12 
 src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java                                                 |    2 
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java                                                 |    3 
 src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java                                                   |    2 
 src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java                                                   |    3 
 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java                                                 |    2 
 src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java                                                 |    3 
 src/share/classes/com/sun/imageio/stream/StreamCloser.java                                                             |   44 
 src/share/classes/com/sun/istack/internal/Nullable.java                                                                |    2 
 src/share/classes/com/sun/istack/internal/Pool.java                                                                    |   30 
 src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java                                         |   32 
 src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java                                       |   19 
 src/share/classes/com/sun/istack/internal/ws/package-info.java                                                         |    2 
 src/share/classes/com/sun/jndi/dns/DnsContext.java                                                                     |    2 
 src/share/classes/com/sun/media/sound/JDK13Services.java                                                               |   21 
 src/share/classes/com/sun/media/sound/JSSecurityManager.java                                                           |   55 
 src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java                                                      |    4 
 src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                                              |    3 
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java               |   76 
 src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java                                                     |   21 
 src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java                                                         |    2 
 src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties                                                  |    5 
 src/share/classes/com/sun/tools/internal/jxc/Messages.java                                                             |    1 
 src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java                                   |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Const.java                                                            |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java                                                |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java                                       |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties                                              |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java                                                         |    1 
 src/share/classes/com/sun/tools/internal/jxc/apt/Options.java                                                          |    6 
 src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java                                            |   37 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java                                                   |  105 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java                                                    |   83 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java                                         |    4 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java                                           |    6 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java                                               |   50 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java                                      |   74 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java                                               |  158 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java                                                    |  141 
 src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd                                                     |    2 
 src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java                                               |    4 
 src/share/classes/com/sun/tools/internal/ws/Invoker.java                                                               |   28 
 src/share/classes/com/sun/tools/internal/ws/WsGen.java                                                                 |    2 
 src/share/classes/com/sun/tools/internal/ws/WsImport.java                                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java                                               |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java                                        |    3 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java                                               |    1 
 src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/package-info.java                                                          |   62 
 src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java                                          |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java                          |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java                                     |    4 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java                                      |   40 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java                                  |  207 
 src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java               |    3 
 src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java                                        |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java                                           |    1 
 src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java                                               |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java                                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java                                    |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java                                       |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java                                |    8 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java                                        |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java                                     |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java                                         |    4 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java                                             |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java                      |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java                             |    8 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java                      |   14 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java                        |   50 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java               |   17 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java                           |    7 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java                                   |    2 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java                            |    5 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java                                    |  126 
 src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java                                |   30 
 src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java                                     |    6 
 src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java                                       |    6 
 src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java                                           |   36 
 src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java                                        |    8 
 src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java                                               |  141 
 src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java                                             |  306 -
 src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java                                           |    4 
 src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java                                                |    8 
 src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java                                        |  846 +--
 src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java                                           |  294 -
 src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java                                                |  286 -
 src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties                                         |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/generator.properties                                             |    3 
 src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/model.properties                                                 |   10 
 src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties                                               |   15 
 src/share/classes/com/sun/tools/internal/ws/resources/processor.properties                                             |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/util.properties                                                  |    1 
 src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties                                          |   25 
 src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties                                             |   66 
 src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties                                                  |   48 
 src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java                                              |    2 
 src/share/classes/com/sun/tools/internal/ws/spi/package-info.java                                                      |    2 
 src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java                                         |    4 
 src/share/classes/com/sun/tools/internal/ws/version.properties                                                         |    8 
 src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java                                              |    1 
 src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java                                     |    1 
 src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java                                               |    5 
 src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java                                         |    8 
 src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java                                             |   12 
 src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java                                          |   11 
 src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java                                                     |   11 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java                                                |   45 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java                                                   |   47 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java                                            |    7 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java                                             |   75 
 src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java                                                |   71 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java                                                   |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java                                                 |    7 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java                                               |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java                                                  |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java                                      |   11 
 src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java                                      |    4 
 src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java                                       |   17 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java                               |    1 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java                                                |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java                                                 |  122 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java                                          |    1 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java                                      |    2 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java                                              |  308 -
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java                |    3 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java                                            |   90 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java                                      |   33 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java                                    |   14 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java                                            |    4 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java                             |    3 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java                                  |   12 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java                                                |    9 
 src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/AbortException.java                                                       |    3 
 src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java                                                 |   12 
 src/share/classes/com/sun/tools/internal/xjc/Driver.java                                                               |   27 
 src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java                                                        |   31 
 src/share/classes/com/sun/tools/internal/xjc/Language.java                                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties                                                  |  113 
 src/share/classes/com/sun/tools/internal/xjc/Messages.java                                                             |   42 
 src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java                                                          |   68 
 src/share/classes/com/sun/tools/internal/xjc/Options.java                                                              |  143 
 src/share/classes/com/sun/tools/internal/xjc/Plugin.java                                                               |   10 
 src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/XJCListener.java                                                          |    5 
 src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java                                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java                                   |    6 
 src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java                                                    |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java                                                     |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/Property.java                                                         |   18 
 src/share/classes/com/sun/tools/internal/xjc/api/Reference.java                                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java                                                   |   50 
 src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java                                                      |   12 
 src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/XJC.java                                                              |    4 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java                                           |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java                                      |   19 
 src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/package.html                                                          |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java                                              |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties                                              |    2 
 src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java                                         |   36 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java                                      |    4 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java                                    |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties                                   |   11 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java                                          |   17 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java                            |    9 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java                                    |    9 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java                                   |   47 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java                            |   31 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java                               |   48 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java                                      |  137 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java                                      |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java                              |    3 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java                            |   27 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java                                   |   14 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java                            |    7 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java                            |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java                                      |   28 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java                              |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java                                     |   20 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java                                    |   16 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java                                |   12 
 src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java                        |   24 
 src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java                                        |    6 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java                                |    6 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java                                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java                                  |   22 
 src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java                                               |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java                                         |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java                                                     |    8 
 src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java                                               |    9 
 src/share/classes/com/sun/tools/internal/xjc/model/CClass.java                                                         |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java                                                     |   28 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java                                                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java                                                |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CElement.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java                                                   |   20 
 src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java                                                  |    4 
 src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java                                                  |   22 
 src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java                                         |   38 
 src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java                                                       |    7 
 src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java                                             |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java                                                    |   14 
 src/share/classes/com/sun/tools/internal/xjc/model/Model.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java                                                   |   23 
 src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java                                                    |   18 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java                                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java                                                      |    3 
 src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/model/package-info.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java                                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java                                                 |    7 
 src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java                                               |    3 
 src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java                                                |   24 
 src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java                                                 |   10 
 src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java                                                      |   10 
 src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java                                               |    8 
 src/share/classes/com/sun/tools/internal/xjc/package-info.java                                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/Const.java                                                         |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java                                       |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties                                           |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java                                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java                                                      |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java                                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java                                                   |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties                                       |   21 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java                                                  |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java                                                |   30 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java                                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java                                      |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java                                    |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java                                        |   42 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java                                     |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java                                        |   64 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java                                    |   24 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java                                      |   34 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java                                 |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java                                         |   50 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java                                       |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java                                         |    4 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd                                       |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd                                               |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java                                                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java                                      |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java                                                 |   16 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java                                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java                                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java                                                |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java                      |   20 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java                                       |   24 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java                                        |  102 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java                                  |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java                                 |   48 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java                             |   22 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java                                     |  104 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java                                     |   12 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties                              |   29 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java                                         |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java                             |   34 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java                                   |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java                               |   17 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java                                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java                                    |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java                                          |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java                                             |   14 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java                                          |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java                                       |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java                               |   11 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java                                            |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties                                 |  102 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java                                            |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java                                   |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java                                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java                                   |   37 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java                          |   35 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java                    |    8 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java                |   18 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java                                    |    7 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java                               |   27 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java                              |   17 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java                                      |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java                                     |   11 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java                               |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java                            |   27 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java                                 |  158 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java                            |   26 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java                             |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java                                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java                     |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java                                   |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java                             |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java                              |    5 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties                        |   13 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java                       |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng                                     |    7 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd                                     |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java                               |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html                                    |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd                                         |    4 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd                                          |    2 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java                  |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java                           |    9 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java                          |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java                       |  204 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java                          |   58 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java                     |   36 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java                  |   74 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java                 |   32 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java                            |    3 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties                          |   14 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java                                     |    6 
 src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java                |   18 
 src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java                                           |    1 
 src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java                                        |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java                                           |   22 
 src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java                                                        |   24 
 src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java                                             |    4 
 src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java                                              |  142 
 src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java                                              |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties                                             |    9 
 src/share/classes/com/sun/tools/internal/xjc/util/Messages.java                                                        |    2 
 src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java                                                   |    3 
 src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java                                         |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java                                                      |    4 
 src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java                                                 |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java                                                    |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java                                                   |    1 
 src/share/classes/com/sun/tools/internal/xjc/util/Util.java                                                            |    4 
 src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java                                               |   34 
 src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java                                                       |   10 
 src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java                                                   |   19 
 src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java                                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java                                                 |   56 
 src/share/classes/com/sun/xml/internal/bind/IDResolver.java                                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/Locatable.java                                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/Util.java                                                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java                                              |   13 
 src/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java                                                   |   25 
 src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java                                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/api/Bridge.java                                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java                                                |    3 
 src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java                                                     |   49 
 src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java                                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java                                                     |   16 
 src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java                                                     |   26 
 src/share/classes/com/sun/xml/internal/bind/api/package-info.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java                                     |    6 
 src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java                                                 |   23 
 src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java                                          |   12 
 src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java                                                   |   30 
 src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties                                             |   33 
 src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java                                       |   43 
 src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java                                      |   55 
 src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java                                           |   14 
 src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java                                                  |   24 
 src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java                                                  |   89 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java                                               |   73 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java                                           |   24 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java                                                 |   26 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties                                           |   34 
 src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java                                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java                                                   |  307 -
 src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java                                     |   19 
 src/share/classes/com/sun/xml/internal/bind/util/Which.java                                                            |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java                                                       |   46 
 src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java                                                     |   33 
 src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/TODO.java                                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java                                                 |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java                                    |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java                                              |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java                               |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java                                   |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java                                               |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java                                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java                                              |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java                                   |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java                                            |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java                                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java                                           |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java                                           |   89 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java                                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java                                 |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java                                                |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties                                          |   44 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java                                            |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java                                        |    7 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java                               |  127 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java                              |  160 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java                                    |   21 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java                                     |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java                              |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java                                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java                                                    |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java                                                |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java                                      |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java                                      |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java                                         |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/package-info.java                                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java                                            |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java                                          |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java                                             |   40 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java                                                 |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java                                                 |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java                                          |   63 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java                                      |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java                                                |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java                                        |   13 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java                                |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java                                            |  184 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java                                                |   95 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java                                           |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java                                             |   32 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties                                             |   22 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java                                                       |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java                                                |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java                                                   |    7 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java                                          |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java                                      |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java                                              |   73 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java                       |  145 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java                                    |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java                                |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java                                              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java                                           |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java                                       |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java                               |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java                                           |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java                               |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java                        |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java                                 |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java                                          |   12 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java                                      |    9 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java                         |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java                             |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java                                        |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java                                 |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java                                           |   18 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java                         |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java                                             |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java                        |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java                           |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java                      |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java                         |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java                          |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java                        |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java                           |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java                          |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java                                 |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java                                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java                        |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java                           |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java                            |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java                             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java                            |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java                                       |   21 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java                          |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java                       |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java             |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java              |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java                                   |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java                             |   10 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java                                     |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java                          |   70 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java                                  |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java                           |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java                                        |   15 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java                              |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java                                 |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java                                      |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties                                |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java                                      |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java                                  |   14 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java                            |    6 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java                           |   16 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java                               |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java                                    |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java                              |   27 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java                          |   91 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java                        |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java                           |    2 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java                                |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java                                    |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java                                  |   25 
 src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java                                        |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java                                                |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties                                           |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java                                                     |    8 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java                                       |   59 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java                                         |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java                                            |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java                                   |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java                                     |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java                                             |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java                          |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java                                        |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java                                         |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java                                         |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java                                     |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java                                       |    4 
 src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java                                       |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java                                           |   11 
 src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java                                              |   17 
 src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java                                                  |   31 
 src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java                                                  |    3 
 src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java                                               |    1 
 src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java                                                      |    5 
 src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java                                                   |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java                                                        |   22 
 src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java                                              |    1 
 src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties                                         |  101 
 src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java                                         |   47 
 src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java                                           |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java                                                        |  499 -
 src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java                                             |  342 -
 src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java                                                        |  715 +-
 src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java                                              |   78 
 src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java                                                  |  108 
 src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java                                                 |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java                              |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java                             |   55 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java                             |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java                      |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java                        |   10 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java                              |   96 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java                               |   76 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java                         |   30 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java                |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java                                 |   76 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java                             |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java                                |  101 
 src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java                                |   42 
 src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java                            |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java                                          |  461 -
 src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java                                      |   82 
 src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java                                 |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties                                 |    7 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java                                           |   46 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java                                                   |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java                                                 |    3 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java                                          |  518 +
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java                                      |  106 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java                     |   83 
 src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java                                           |   40 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java                                             |   25 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java                                        |  522 +
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java                                    |  295 -
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java                                               |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java                                      |   37 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java                                    |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java                                       |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java                                           |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java                                      |    2 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java                                   |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java                                    |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java                              |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java                               |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java                                          |   68 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java                                      |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java                         |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java                                       |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java                             |   48 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java                                    |   38 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java                                    |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java                                  |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java                                 |   42 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java                                  |   72 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java                                       |    4 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java                                  |   70 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java                                  |   84 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java                                 |   32 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java                                   |    8 
 src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java                                    |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java                           |   18 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java                       |   22 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java                               |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java                          |   14 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java                                               |   30 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java                                           |   95 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java                                       |  111 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java                                           |   37 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java                                     |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java                                      |  116 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java                                               |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java                                           |   12 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java                                               |   22 
 src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java                                          |   20 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java                                                 |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java                                            |   28 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java                                           |   78 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java                                           |   10 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java                                  |   80 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java                                |   34 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java                                    |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java                                                 |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java                                |   68 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java                            |  107 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java                                               |  166 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java                                        |   26 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java                                               |   24 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java                                              |   64 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java                                                |   16 
 src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java                               |    6 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java                                         |  108 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java                                     |   74 
 src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java                                               |   14 
 src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java                                           |   69 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java                               |   85 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java                        |    6 
 src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties                               |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java                                       |    4 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java                           |  102 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java                          |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java                     |  260 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java                  |  112 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java                         |  170 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java                     |  440 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java                     |   30 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java                        |  318 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java                       |  500 -
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java                  |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java                         | 1840 +++---
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java                       |  156 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java                      |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java                   |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java                         |   12 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java                            |  148 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java                     |  236 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java                     |  228 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java                          |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java                         |   88 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java                          |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java                          |   60 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java                         |  158 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java                         |  136 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java                         |  254 
 src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java                         |  166 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java                                     |   46 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java                                               |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java                                        |   20 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java                          |   23 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java                                  |   58 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java                                |   13 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java                                 |   14 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java                                     |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java                                            |  132 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java                            |   64 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java                                    |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java                                           |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java                                   |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java                                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java                                        |   33 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java                                        |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java                                           |  191 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java                           |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java                               |  201 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java                                  |   23 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java                         |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java                  |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java                                   |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java                                          |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java                                         |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java                                       |   13 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java                                   |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java                                        |   30 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java                                    |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java                                       |   93 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java                                      |   58 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java                                  |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java                                         |   21 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java                                        |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties                                |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java                                          |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java                                     |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties                                |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java                                          |   34 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java                                     |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java                                   |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java                                 |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java                                    |   64 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java                             |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java                                   |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java                            |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties                              |    6 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java                                  |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java                              |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java                                     |   17 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java                                   |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java                              |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java                                    |   15 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java                             |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java                                   |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java                            |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties                              |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java                                  |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java                              |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java                       |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java                                 |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java                                                 |   84 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java                                        |   10 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java                                       |    8 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java                                             |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java                                             |   11 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java                                  |  103 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java                                         |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java                                       |   37 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java                                                |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties                                     |    1 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java                                     |   33 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java                                        |    3 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java                               |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java                                              |    7 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java                                             |    9 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java                                 |   39 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java                                         |    5 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java                                   |   10 
 src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java                |   79 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java                                    |   14 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java                           |    6 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java                             |    4 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java                                   |   10 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java                                 |    6 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java                                    |   62 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java                                    |   20 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java                                |  186 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java                                    |   12 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java                                   |   10 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java                                           |   32 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java                            |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java                      |   36 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java                  |   38 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java                           |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java                                |   78 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java                                |    2 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java                      |   52 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java                 |    4 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java          |  148 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java                |   34 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java                         |   22 
 src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java                 |   62 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java                                                |   36 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java                                             |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java                                   |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java                                        |    1 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java                                         |    3 
 src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java                                         |   16 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java                                           |    2 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java                                            |   10 
 src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java                                       |   12 
 src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java                                                  |    6 
 src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java                                              |   10 
 src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java                                                 |    7 
 src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java                                                |    8 
 src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java                                             |   16 
 src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java                                                   |    8 
 src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java                                              |   18 
 src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java                                                |    6 
 src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java                                                    |   11 
 src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java                                             |   52 
 src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java                                         |    2 
 src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java                                      |   12 
 src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java                                   |    6 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java                                    |    8 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java                             |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java                              |    2 
 src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties                                            |    1 
 src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java                                                         |   14 
 src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java                                              |   10 
 src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java                                             |    5 
 src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/rngom/parse/Context.java                                                        |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties                                                 |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java                                          |    2 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java                              |   76 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java                                         |   10 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties                                         |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java                                          |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java                                           |   12 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java                                                      |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java                                           |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java                                    |   12 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java                                                   |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java                              |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java                                               |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java                                        |   16 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java                                               |    6 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java                                              |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java                                      |   22 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java                               |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java                                       |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java                                         |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java                                         |  108 
 src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java                                                 |    8 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties                                             |    1 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java                                               |    4 
 src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java                                               |  284 -
 src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/rngom/util/Uri.java                                                             |   72 
 src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java                                                           |    1 
 src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java                                         |    8 
 src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java                                               |    2 
 src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java                                                 |   17 
 src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java                                                      |   24 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java                                              |   46 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java                                     |   28 
 src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java                                            |   72 
 src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java                                             |    2 
 src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java                                              |   18 
 src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java                                       |   72 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java                                              |   32 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java                                     |    4 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java                                          |   18 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java                                        |   30 
 src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java                                        |   16 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java                                |   16 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java                                                 |   10 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java                                               |    3 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java                                         |  124 
 src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java                                       |   96 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java                                   |   84 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java                                     |   29 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java                               |   45 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java                             |   29 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java                               |   22 
 src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java                             |  136 
 src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java                                                        |    6 
 src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java                                                      |  661 +-
 src/share/classes/com/sun/xml/internal/txw2/TXW.java                                                                   |   10 
 src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java                                                   |    4 
 src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java                                         |    6 
 src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java                                                     |   22 
 src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java                                              |   10 
 src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java                                             |    2 
 src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java                                                      |   92 
 src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java                                        |    3 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java                                                |   26 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java                                                |  104 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java                                                      |  107 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java                                                |   32 
 src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java                                            |   17 
 src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java                            |    9 
 src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java                                    |   17 
 src/share/classes/com/sun/xml/internal/ws/api/BindingID.java                                                           |   36 
 src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java                                                     |    3 
 src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java                                                         |    6 
 src/share/classes/com/sun/xml/internal/ws/api/WSService.java                                                           |   82 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java                         |   51 
 src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java                                      |   30 
 src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java                                 |    8 
 src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java                                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java                                                     |    2 
 src/share/classes/com/sun/xml/internal/ws/api/message/Message.java                                                     |   26 
 src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java                                                    |   34 
 src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java                                                      |   99 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java                                   |   12 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java                                   |   10 
 src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java                               |   14 
 src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java                                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java                                                    |   24 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java                                       |   44 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java                                        |    9 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java                                                |   19 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java                                                |   28 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java                                              |    5 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java                                                |   20 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java                                               |   23 
 src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java                                     |    7 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java                                     |   90 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java                                                          |    6 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java                                                         |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java                                                         |   27 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java                                                          |   32 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java                                                     |    9 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java                                     |    7 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java                                     |   31 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java                                                |   11 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java                                                          |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java                                  |    8 
 src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java                                        |    6 
 src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java                                                |   22 
 src/share/classes/com/sun/xml/internal/ws/api/server/Container.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java                                             |   38 
 src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java                                   |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/Module.java                                                       |    6 
 src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java                                          |   18 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java                                                   |   12 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java                                             |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java                                           |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java                                                   |   35 
 src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java                                    |  115 
 src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java                                    |   54 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java                                     |   28 
 src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java                              |   13 
 src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java                                                     |    8 
 src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java                                                 |    2 
 src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java                                                 |   24 
 src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java                                           |    9 
 src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java                                                     |   15 
 src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java                                                |    4 
 src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java                                         |    1 
 src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java                                               |   10 
 src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java                                             |   17 
 src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java                                                         |    3 
 src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java                                                   |    4 
 src/share/classes/com/sun/xml/internal/ws/client/Stub.java                                                             |   75 
 src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java                                                |  147 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java                                            |   77 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java                                         |    2 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java                                     |   31 
 src/share/classes/com/sun/xml/internal/ws/client/package-info.java                                                     |  134 
 src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java                                           |  262 
 src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java                                                |   18 
 src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java                                         |    4 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java                                              |   72 
 src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java                                                      |   11 
 src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java                                            |  161 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java                                                  |   14 
 src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java                                                  |   67 
 src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java                                               |  141 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java                                    |   12 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java                             |   35 
 src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java                             |    6 
 src/share/classes/com/sun/xml/internal/ws/developer/Stateful.java                                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java                                     |    4 
 src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java                                             |   20 
 src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java                                                |   44 
 src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java                                                      |   86 
 src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java                                            |  458 -
 src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java                                                      |  259 
 src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java                                               |  220 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java                                                |   32 
 src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java                                                       |   21 
 src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java                                                     |   11 
 src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java                                            |  141 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java                                   |   51 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java                               |    6 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java                     |   14 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java                  |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java                       |    2 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java                       |    6 
 src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java                         |   36 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java                                  |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java                                           |   10 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java                        |   10 
 src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java                          |    2 
 src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java                                                   |   11 
 src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java                                                 |  284 -
 src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java                                                       |   22 
 src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java                                                       |   49 
 src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java                                                  |   82 
 src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java                                        |   69 
 src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java                                           |   65 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java                                              |    8 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java                                                |    6 
 src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java                                                     |  129 
 src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java                                              |   18 
 src/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java                                         |   20 
 src/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java                                            |    4 
 src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java                                          |   13 
 src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java                                        |   85 
 src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java                                           |   81 
 src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java                                             |   10 
 src/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java                                               |    2 
 src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java                                      |    5 
 src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java                                             |    8 
 src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java                                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java                                           |    7 
 src/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java                                                |    4 
 src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java                                                  |   15 
 src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java                                               |    6 
 src/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java                                                 |   14 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java                                                |   24 
 src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java                                                |  393 -
 src/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java                                     |    2 
 src/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java                               |    2 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java                                         |    3 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java                                             |    6 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java                                           |    8 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java                                           |    8 
 src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java                                            |   78 
 src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java                                              |   59 
 src/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java                                              |   12 
 src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java                                                    |   33 
 src/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java                                                     |    6 
 src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java                                                    |  211 
 src/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java                                           |    4 
 src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java                                                      |    7 
 src/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java                                       |  109 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java                                        |   18 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java                                              |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java                                               |   12 
 src/share/classes/com/sun/xml/internal/ws/package-info.java                                                            |    2 
 src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java                                                    |    4 
 src/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java                                              |    4 
 src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java                                            |  100 
 src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java                                                |   80 
 src/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java                                              |   32 
 src/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java                                              |   24 
 src/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java                                               |   16 
 src/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java                                            |    4 
 src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java                                               |   60 
 src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java                                           |   32 
 src/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java                                                |   10 
 src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java                                                |  193 
 src/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java                                                  |   16 
 src/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java                                             |   40 
 src/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java                                                  |   18 
 src/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java                                             |    8 
 src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java                                             |  338 -
 src/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java                                            |   24 
 src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties                                              |    6 
 src/share/classes/com/sun/xml/internal/ws/resources/client.properties                                                  |    2 
 src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties                                                |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/handler.properties                                                 |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties                                              |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties                                                 |    8 
 src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties                                             |    3 
 src/share/classes/com/sun/xml/internal/ws/resources/sender.properties                                                  |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/server.properties                                                  |   26 
 src/share/classes/com/sun/xml/internal/ws/resources/soap.properties                                                    |    3 
 src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/util.properties                                                    |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties                                               |    1 
 src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties                                               |    7 
 src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties                                              |    1 
 src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java                                         |   46 
 src/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java                                        |    2 
 src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java                                                  |   30 
 src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java                                                   |   62 
 src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java                                         |    5 
 src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java                                        |    4 
 src/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java                                                  |   10 
 src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java                                                      |   15 
 src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java                                                   |   35 
 src/share/classes/com/sun/xml/internal/ws/server/package-info.java                                                     |   80 
 src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java                                |    2 
 src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java                              |   13 
 src/share/classes/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java                                        |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java                                     |  107 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java                                     |    3 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java                               |    3 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java                                        |   28 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java                               |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java                                          |    2 
 src/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java                                                |   16 
 src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java                                  |   72 
 src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java                                               |   37 
 src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java                                                        |   19 
 src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java                                               |   74 
 src/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java                                           |   14 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java                                            |    5 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java                                           |   17 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java                                           |   47 
 src/share/classes/com/sun/xml/internal/ws/transport/Headers.java                                                       |   11 
 src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java                               |    9 
 src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java                                              |  211 
 src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java                                         |   16 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java                               |  224 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java                            |    2 
 src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java                                 |  102 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java                                      |   13 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java                              |  490 -
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java                                         |   30 
 src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java                                     |   18 
 src/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java                                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java                                                    |    7 
 src/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java                                                            |    6 
 src/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java                                              |    8 
 src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java                                              |   12 
 src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java                                         |    5 
 src/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java                                                |    2 
 src/share/classes/com/sun/xml/internal/ws/util/Pool.java                                                               |   24 
 src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java                                                           |   12 
 src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java                                                     |   36 
 src/share/classes/com/sun/xml/internal/ws/util/UtilException.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java                                                      |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java                                       |    2 
 src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java                                       |    4 
 src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties                                        |    1 
 src/share/classes/com/sun/xml/internal/ws/util/version.properties                                                      |    8 
 src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java                                |    8 
 src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java                                                     |   57 
 src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java                               |   12 
 src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java                                                        |   48 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java                                   |   21 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java                                    |   15 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java                                                  |   36 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java                                           |  123 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java                                               |    2 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java                              |   10 
 src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java                                   |    8 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java                                             |    3 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java                         |   50 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java                                               |  129 
 src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java                                                     |    1 
 src/share/classes/com/sun/xml/internal/xsom/SCD.java                                                                   |    1 
 src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java                                                          |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java                                                        |   16 
 src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java                                                        |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java                                                       |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java                                                        |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java                                                         |   37 
 src/share/classes/com/sun/xml/internal/xsom/XSComponent.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSContentType.java                                                         |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java                                                         |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java                                                         |   45 
 src/share/classes/com/sun/xml/internal/xsom/XSFacet.java                                                               |   12 
 src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java                                                  |    1 
 src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java                                                          |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java                                                      |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSNotation.java                                                            |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSParticle.java                                                            |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java                                               |   16 
 src/share/classes/com/sun/xml/internal/xsom/XSSchema.java                                                              |    6 
 src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java                                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java                                                          |   38 
 src/share/classes/com/sun/xml/internal/xsom/XSTerm.java                                                                |   10 
 src/share/classes/com/sun/xml/internal/xsom/XSType.java                                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java                                                     |    4 
 src/share/classes/com/sun/xml/internal/xsom/XSVariety.java                                                             |    7 
 src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java                                                            |    8 
 src/share/classes/com/sun/xml/internal/xsom/XSXPath.java                                                               |    3 
 src/share/classes/com/sun/xml/internal/xsom/XmlString.java                                                             |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java                                                   |   26 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java                                                 |   22 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java                                                |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java                                                 |   18 
 src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java                                                 |    9 
 src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java                                                  |  117 
 src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java                                                    |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/Const.java                                                            |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java                                                  |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java                                                  |   12 
 src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java                                                      |   68 
 src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java                                                        |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java                                                        |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java                                            |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java                                           |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java                                               |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java                                               |   16 
 src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java                                                     |   12 
 src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java                                                     |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java                                                              |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java                                        |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java                                                       |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java                                                    |   29 
 src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java                                                   |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/UName.java                                                            |   43 
 src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java                                              |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/Util.java                                                             |   20 
 src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java                                                     |   36 
 src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java                                                        |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/package.html                                                          |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java                                            |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java                                   |   19 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java                                                |   47 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java                                                  |    8 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties                                            |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties                                         |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java                                             |   89 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java                                             |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java                                                     |    5 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java                                            |   10 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java                                   |   16 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java                                        |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java                                     |    8 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java                                      |   37 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java                                   |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java                                     |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java                                         |   50 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java                                |   74 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java                                         |  154 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java                                              |  809 +--
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java                                     |  177 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java                              |  153 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java                                    |  277 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java                                          |   25 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java                                   |  317 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java                                  |  259 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java                                       |  689 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java                                         | 1465 ++---
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java                     |   31 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java                                     |  770 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java                                               |   25 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java                                              |   15 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java                                               |  163 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java                                   |    7 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java                                               |  247 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java                                  |  281 -
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java                                          |  173 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java                                         |   79 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java                                      |  175 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java                                            |  257 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java                                              |  135 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java                                            |  701 +-
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java                                               |   13 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java                                       |    3 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java                                            |  143 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java                                          |  195 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java                                        |  207 
 src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java                                               |  133 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java                                             |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java                                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java                                                    |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java                                               |   14 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java                                                      |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java                                           |  105 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java                                        |   82 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java                                             |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java                                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java                                                |    4 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java                                       |    2 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java                                      |    6 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java                                         |    1 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java                                                |  204 
 src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java                                                         |   26 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java                                              |   16 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java                                               |   13 
 src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java                                        |    5 
 src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java                                                     |   46 
 src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java                                                 |    1 
 src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java                                                      |   12 
 src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java                                                     |   50 
 src/share/classes/com/sun/xml/internal/xsom/parser/package.html                                                        |    2 
 src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java                                            |    6 
 src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java                                                |    1 
 src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java                                       |    1 
 src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java                                                       |   22 
 src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties                                                 |   31 
 src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java                                                    |   10 
 src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java                                                      |   14 
 src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java                                                          |   12 
 src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java                                                         |   10 
 src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java                                                 |   16 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java                                         |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java                                          |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java                                                    |    6 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java                                          |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java                                           |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java                                                |    5 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java                                       |    1 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java                                                 |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java                                                     |    2 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java                                            |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java                                             |    4 
 src/share/classes/com/sun/xml/internal/xsom/visitor/package.html                                                       |    2 
 src/share/classes/java/beans/Introspector.java                                                                         |   29 
 src/share/classes/java/beans/MetaData.java                                                                             |   83 
 src/share/classes/java/net/Socket.java                                                                                 |   15 
 src/share/classes/java/net/SocksSocketImpl.java                                                                        |   26 
 src/share/classes/java/net/URL.java                                                                                    |   10 
 src/share/classes/javax/accessibility/AccessibleResourceBundle.java                                                    |   15 
 src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java                                                    |    2 
 src/share/classes/javax/imageio/spi/ImageReaderSpi.java                                                                |    6 
 src/share/classes/javax/imageio/spi/ImageWriterSpi.java                                                                |    6 
 src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java                                                  |   10 
 src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java                                                 |   10 
 src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java                                        |    9 
 src/share/classes/javax/management/openmbean/OpenType.java                                                             |    5 
 src/share/classes/javax/swing/plaf/synth/Region.java                                                                   |  292 -
 src/share/classes/javax/xml/bind/Binder.java                                                                           |   92 
 src/share/classes/javax/xml/bind/ContextFinder.java                                                                    |   63 
 src/share/classes/javax/xml/bind/DatatypeConverter.java                                                                |  170 
 src/share/classes/javax/xml/bind/DatatypeConverterImpl.java                                                            |    2 
 src/share/classes/javax/xml/bind/DatatypeConverterInterface.java                                                       |  138 
 src/share/classes/javax/xml/bind/JAXBContext.java                                                                      |  206 
 src/share/classes/javax/xml/bind/JAXBElement.java                                                                      |   52 
 src/share/classes/javax/xml/bind/JAXBException.java                                                                    |   42 
 src/share/classes/javax/xml/bind/JAXBIntrospector.java                                                                 |   30 
 src/share/classes/javax/xml/bind/MarshalException.java                                                                 |   30 
 src/share/classes/javax/xml/bind/Marshaller.java                                                                       |  220 
 src/share/classes/javax/xml/bind/Messages.java                                                                         |   20 
 src/share/classes/javax/xml/bind/Messages.properties                                                                   |   26 
 src/share/classes/javax/xml/bind/NotIdentifiableEvent.java                                                             |    8 
 src/share/classes/javax/xml/bind/ParseConversionEvent.java                                                             |    6 
 src/share/classes/javax/xml/bind/PrintConversionEvent.java                                                             |    6 
 src/share/classes/javax/xml/bind/PropertyException.java                                                                |   66 
 src/share/classes/javax/xml/bind/UnmarshalException.java                                                               |   32 
 src/share/classes/javax/xml/bind/Unmarshaller.java                                                                     |  382 -
 src/share/classes/javax/xml/bind/UnmarshallerHandler.java                                                              |   26 
 src/share/classes/javax/xml/bind/ValidationEvent.java                                                                  |   38 
 src/share/classes/javax/xml/bind/ValidationEventHandler.java                                                           |   43 
 src/share/classes/javax/xml/bind/ValidationEventLocator.java                                                           |   30 
 src/share/classes/javax/xml/bind/ValidationException.java                                                              |   24 
 src/share/classes/javax/xml/bind/Validator.java                                                                        |  114 
 src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java                                                        |    7 
 src/share/classes/javax/xml/bind/annotation/XmlAccessType.java                                                         |    7 
 src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java                                                      |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java                                                       |   22 
 src/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java                                                       |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAnyElement.java                                                         |   14 
 src/share/classes/javax/xml/bind/annotation/XmlAttribute.java                                                          |   22 
 src/share/classes/javax/xml/bind/annotation/XmlElement.java                                                            |   26 
 src/share/classes/javax/xml/bind/annotation/XmlElementDecl.java                                                        |   36 
 src/share/classes/javax/xml/bind/annotation/XmlElementRef.java                                                         |   26 
 src/share/classes/javax/xml/bind/annotation/XmlElementRefs.java                                                        |    2 
 src/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java                                                     |   14 
 src/share/classes/javax/xml/bind/annotation/XmlElements.java                                                           |   18 
 src/share/classes/javax/xml/bind/annotation/XmlEnum.java                                                               |   12 
 src/share/classes/javax/xml/bind/annotation/XmlEnumValue.java                                                          |   16 
 src/share/classes/javax/xml/bind/annotation/XmlID.java                                                                 |   21 
 src/share/classes/javax/xml/bind/annotation/XmlIDREF.java                                                              |   50 
 src/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java                                                   |   12 
 src/share/classes/javax/xml/bind/annotation/XmlList.java                                                               |   12 
 src/share/classes/javax/xml/bind/annotation/XmlMimeType.java                                                           |    2 
 src/share/classes/javax/xml/bind/annotation/XmlMixed.java                                                              |   50 
 src/share/classes/javax/xml/bind/annotation/XmlNs.java                                                                 |    8 
 src/share/classes/javax/xml/bind/annotation/XmlNsForm.java                                                             |   13 
 src/share/classes/javax/xml/bind/annotation/XmlRootElement.java                                                        |   18 
 src/share/classes/javax/xml/bind/annotation/XmlSchema.java                                                             |   22 
 src/share/classes/javax/xml/bind/annotation/XmlSchemaType.java                                                         |   17 
 src/share/classes/javax/xml/bind/annotation/XmlTransient.java                                                          |   17 
 src/share/classes/javax/xml/bind/annotation/XmlType.java                                                               |  110 
 src/share/classes/javax/xml/bind/annotation/XmlValue.java                                                              |   30 
 src/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java                                                   |   24 
 src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java                                           |   16 
 src/share/classes/javax/xml/bind/annotation/adapters/package.html                                                      |    4 
 src/share/classes/javax/xml/bind/annotation/package.html                                                               |   26 
 src/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java                                                  |   87 
 src/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java                                                |   36 
 src/share/classes/javax/xml/bind/attachment/package.html                                                               |   18 
 src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java                                                   |  142 
 src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java                                                 |  116 
 src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java                                            |   43 
 src/share/classes/javax/xml/bind/helpers/Messages.java                                                                 |   26 
 src/share/classes/javax/xml/bind/helpers/Messages.properties                                                           |   34 
 src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java                                                 |   18 
 src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java                                                      |   64 
 src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java                                               |  106 
 src/share/classes/javax/xml/bind/helpers/package.html                                                                  |   16 
 src/share/classes/javax/xml/bind/package.html                                                                          |   10 
 src/share/classes/javax/xml/bind/util/JAXBResult.java                                                                  |   50 
 src/share/classes/javax/xml/bind/util/JAXBSource.java                                                                  |   62 
 src/share/classes/javax/xml/bind/util/Messages.java                                                                    |   18 
 src/share/classes/javax/xml/bind/util/Messages.properties                                                              |   23 
 src/share/classes/javax/xml/bind/util/ValidationEventCollector.java                                                    |   34 
 src/share/classes/javax/xml/bind/util/package.html                                                                     |   10 
 src/share/classes/javax/xml/soap/AttachmentPart.java                                                                   |  186 
 src/share/classes/javax/xml/soap/Detail.java                                                                           |    6 
 src/share/classes/javax/xml/soap/DetailEntry.java                                                                      |    6 
 src/share/classes/javax/xml/soap/FactoryFinder.java                                                                    |   12 
 src/share/classes/javax/xml/soap/MessageFactory.java                                                                   |   32 
 src/share/classes/javax/xml/soap/MimeHeader.java                                                                       |   18 
 src/share/classes/javax/xml/soap/MimeHeaders.java                                                                      |    6 
 src/share/classes/javax/xml/soap/Name.java                                                                             |   24 
 src/share/classes/javax/xml/soap/Node.java                                                                             |   30 
 src/share/classes/javax/xml/soap/SAAJMetaFactory.java                                                                  |   38 
 src/share/classes/javax/xml/soap/SAAJResult.java                                                                       |   92 
 src/share/classes/javax/xml/soap/SOAPBody.java                                                                         |  112 
 src/share/classes/javax/xml/soap/SOAPBodyElement.java                                                                  |   10 
 src/share/classes/javax/xml/soap/SOAPConnection.java                                                                   |   12 
 src/share/classes/javax/xml/soap/SOAPConnectionFactory.java                                                            |    9 
 src/share/classes/javax/xml/soap/SOAPConstants.java                                                                    |   26 
 src/share/classes/javax/xml/soap/SOAPElement.java                                                                      |  144 
 src/share/classes/javax/xml/soap/SOAPElementFactory.java                                                               |    6 
 src/share/classes/javax/xml/soap/SOAPEnvelope.java                                                                     |    6 
 src/share/classes/javax/xml/soap/SOAPException.java                                                                    |    6 
 src/share/classes/javax/xml/soap/SOAPFactory.java                                                                      |   54 
 src/share/classes/javax/xml/soap/SOAPFault.java                                                                        |  218 
 src/share/classes/javax/xml/soap/SOAPFaultElement.java                                                                 |    8 
 src/share/classes/javax/xml/soap/SOAPHeader.java                                                                       |   14 
 src/share/classes/javax/xml/soap/SOAPHeaderElement.java                                                                |   74 
 src/share/classes/javax/xml/soap/SOAPMessage.java                                                                      |  134 
 src/share/classes/javax/xml/soap/SOAPPart.java                                                                         |   14 
 src/share/classes/javax/xml/soap/Text.java                                                                             |    6 
 src/share/classes/javax/xml/soap/package.html                                                                          |   12 
 src/share/classes/javax/xml/ws/Action.java                                                                             |   22 
 src/share/classes/javax/xml/ws/Binding.java                                                                            |   10 
 src/share/classes/javax/xml/ws/BindingProvider.java                                                                    |   78 
 src/share/classes/javax/xml/ws/Dispatch.java                                                                           |   12 
 src/share/classes/javax/xml/ws/Endpoint.java                                                                           |   66 
 src/share/classes/javax/xml/ws/EndpointReference.java                                                                  |   42 
 src/share/classes/javax/xml/ws/FaultAction.java                                                                        |   10 
 src/share/classes/javax/xml/ws/Holder.java                                                                             |    4 
 src/share/classes/javax/xml/ws/LogicalMessage.java                                                                     |    8 
 src/share/classes/javax/xml/ws/RequestWrapper.java                                                                     |    9 
 src/share/classes/javax/xml/ws/RespectBinding.java                                                                     |    6 
 src/share/classes/javax/xml/ws/RespectBindingFeature.java                                                              |   28 
 src/share/classes/javax/xml/ws/Response.java                                                                           |    4 
 src/share/classes/javax/xml/ws/ResponseWrapper.java                                                                    |    9 
 src/share/classes/javax/xml/ws/Service.java                                                                            |  183 
 src/share/classes/javax/xml/ws/ServiceMode.java                                                                        |    2 
 src/share/classes/javax/xml/ws/WebEndpoint.java                                                                        |    2 
 src/share/classes/javax/xml/ws/WebFault.java                                                                           |    4 
 src/share/classes/javax/xml/ws/WebServiceClient.java                                                                   |    2 
 src/share/classes/javax/xml/ws/WebServiceContext.java                                                                  |   12 
 src/share/classes/javax/xml/ws/WebServiceException.java                                                                |   24 
 src/share/classes/javax/xml/ws/WebServiceFeature.java                                                                  |   36 
 src/share/classes/javax/xml/ws/WebServiceProvider.java                                                                 |    6 
 src/share/classes/javax/xml/ws/WebServiceRef.java                                                                      |    2 
 src/share/classes/javax/xml/ws/handler/Handler.java                                                                    |   14 
 src/share/classes/javax/xml/ws/handler/HandlerResolver.java                                                            |    4 
 src/share/classes/javax/xml/ws/handler/LogicalHandler.java                                                             |    2 
 src/share/classes/javax/xml/ws/handler/LogicalMessageContext.java                                                      |    8 
 src/share/classes/javax/xml/ws/handler/MessageContext.java                                                             |   46 
 src/share/classes/javax/xml/ws/handler/PortInfo.java                                                                   |    8 
 src/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java                                                           |    4 
 src/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java                                                    |   14 
 src/share/classes/javax/xml/ws/http/HTTPBinding.java                                                                   |    4 
 src/share/classes/javax/xml/ws/http/HTTPException.java                                                                 |   10 
 src/share/classes/javax/xml/ws/soap/Addressing.java                                                                    |   24 
 src/share/classes/javax/xml/ws/soap/AddressingFeature.java                                                             |   58 
 src/share/classes/javax/xml/ws/soap/MTOM.java                                                                          |   18 
 src/share/classes/javax/xml/ws/soap/MTOMFeature.java                                                                   |   40 
 src/share/classes/javax/xml/ws/soap/SOAPBinding.java                                                                   |   16 
 src/share/classes/javax/xml/ws/soap/SOAPFaultException.java                                                            |    6 
 src/share/classes/javax/xml/ws/spi/FactoryFinder.java                                                                  |   14 
 src/share/classes/javax/xml/ws/spi/Provider.java                                                                       |   60 
 src/share/classes/javax/xml/ws/spi/ServiceDelegate.java                                                                |  162 
 src/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java                                                    |    8 
 src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java                                                  |   29 
 src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java                                           |   62 
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java                                            |   39 
 src/share/classes/org/relaxng/datatype/Datatype.java                                                                   |    1 
 src/share/classes/org/relaxng/datatype/DatatypeBuilder.java                                                            |    1 
 src/share/classes/org/relaxng/datatype/DatatypeException.java                                                          |    1 
 src/share/classes/org/relaxng/datatype/DatatypeLibrary.java                                                            |    1 
 src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java                                                     |    1 
 src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java                                                 |    1 
 src/share/classes/org/relaxng/datatype/ValidationContext.java                                                          |    1 
 src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java                                              |    3 
 src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java                                       |    1 
 src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java                                             |    1 
 src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java                                                     |   20 
 src/share/lib/security/java.security                                                                                   |    2 
 src/share/lib/security/java.security-solaris                                                                           |    2 
 src/share/lib/security/java.security-windows                                                                           |    2 
 src/share/native/com/sun/java/util/jar/pack/unpack.cpp                                                                 |   10 
 src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c                                                              |   26 
 2008 files changed, 56587 insertions(+), 28511 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 java-1.6.0-openjdk-securitypatches.patchIndex: java-1.6.0-openjdk-securitypatches.patch
===================================================================
RCS file: java-1.6.0-openjdk-securitypatches.patch
diff -N java-1.6.0-openjdk-securitypatches.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java-1.6.0-openjdk-securitypatches.patch	5 Aug 2009 14:10:44 -0000	1.3
@@ -0,0 +1,171008 @@
+--- old/jdk/src/share/classes/javax/swing/text/LayoutQueue.java	2009-07-17 10:36:04.000000000 -0400
++++ openjdk/jdk/src/share/classes/javax/swing/text/LayoutQueue.java	2009-07-22 11:25:41.000000000 -0400
+@@ -25,6 +25,7 @@
+ package javax.swing.text;
+ 
+ import java.util.Vector;
++import sun.awt.AppContext;
+ 
+ /**
+  * A queue of text layout tasks.
+@@ -35,10 +36,10 @@
+  */
+ public class LayoutQueue {
+ 
+-    Vector tasks;
+-    Thread worker;
++    private static final Object DEFAULT_QUEUE = new Object();	
+ 
+-    static LayoutQueue defaultQueue;
++    private Vector<Runnable> tasks;
++    private Thread worker;
+ 
+     /**
+      * Construct a layout queue.
+@@ -51,10 +52,15 @@
+      * Fetch the default layout queue.
+      */
+     public static LayoutQueue getDefaultQueue() {
+-        if (defaultQueue == null) {
+-            defaultQueue = new LayoutQueue();
++        AppContext ac = AppContext.getAppContext();
++        synchronized (DEFAULT_QUEUE) {
++            LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
++            if (defaultQueue == null) {
++                defaultQueue = new LayoutQueue();
++                ac.put(DEFAULT_QUEUE, defaultQueue);
++            }
++            return defaultQueue;
+         }
+-        return defaultQueue;
+     }
+ 
+     /**
+@@ -63,7 +69,9 @@
+      * @param q the new queue.
+      */
+     public static void setDefaultQueue(LayoutQueue q) {
+-        defaultQueue = q;
++        synchronized (DEFAULT_QUEUE) {
++            AppContext.getAppContext().put(DEFAULT_QUEUE, q);
++        }
+     }
+ 
+     /**
+--- old/jdk/src/share/classes/java/awt/Cursor.java	2009-07-17 10:36:02.000000000 -0400
++++ openjdk/jdk/src/share/classes/java/awt/Cursor.java	2009-07-22 11:28:14.000000000 -0400
+@@ -119,6 +119,11 @@
+ 
+     protected static Cursor predefined[] = new Cursor[14];
+ 
++    /**
++     * This field is a private replacement for 'predefined' array.
++     */
++    private final static Cursor[] predefinedPrivate = new Cursor[14];
++
+     /* Localization names and default values */
+     static final String[][] cursorProperties = {
+         { "AWT.DefaultCursor", "Default Cursor" },
+@@ -252,10 +257,15 @@
+         if (type < Cursor.DEFAULT_CURSOR || type > Cursor.MOVE_CURSOR) {
+             throw new IllegalArgumentException("illegal cursor type");
+         }
++        Cursor c = predefinedPrivate[type];
++        if (c == null) {
++            predefinedPrivate[type] = c = new Cursor(type);
++        }
++        // fill 'predefined' array for backwards compatibility.
+         if (predefined[type] == null) {
+-            predefined[type] = new Cursor(type);
++            predefined[type] = c;
+         }
+-        return predefined[type];
++        return c;
+     }
+ 
+     /**
+--- old/src/share/classes/javax/accessibility/AccessibleResourceBundle.java	Fri Jun 19 15:30:16 2009
++++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java	Fri Jun 19 15:30:14 2009
+@@ -44,15 +44,11 @@
+      * localized display strings.
+      */
+     public Object[][] getContents() {
+-        return contents;
+-    }
++        // The table holding the mapping between the programmatic keys
++        // and the display strings for the en_US locale.
++        return new Object[][] {
+ 
+-    /**
+-     * The table holding the mapping between the programmatic keys
+-     * and the display strings for the en_US locale.
+-     */
+-    static final Object[][] contents = {
+-    // LOCALIZE THIS
++        // LOCALIZE THIS
+         // Role names
+ //        { "application","application" },
+ //        { "border","border" },
+@@ -151,5 +147,6 @@
+         { "vertical","vertical" },
+         { "horizontal","horizontal" }
+     // END OF MATERIAL TO LOCALIZE
+-    };
++        };
++    }
+ }
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	2009-04-24 17:32:19.463300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java	2009-04-24 17:32:18.529300000 +0400
+@@ -51,7 +51,7 @@
+               entensions,
+               mimeType,
+               "com.sun.imageio.plugins.bmp.BMPImageReader",
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               false,
+               null, null, null, null,
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	2009-04-24 17:32:32.537300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java	2009-04-24 17:32:31.632300000 +0400
+@@ -32,6 +32,7 @@
+ import javax.imageio.spi.ImageWriterSpi;
+ import javax.imageio.spi.ServiceRegistry;
+ import javax.imageio.spi.IIORegistry;
++import javax.imageio.stream.ImageOutputStream;
+ import javax.imageio.ImageWriter;
+ import javax.imageio.ImageTypeSpecifier;
+ import javax.imageio.IIOException;
+@@ -55,7 +56,7 @@
+               entensions,
+               mimeType,
+               "com.sun.imageio.plugins.bmp.BMPImageWriter",
+-              STANDARD_OUTPUT_TYPE,
++              new Class[] { ImageOutputStream.class },
+               readerSpiNames,
+               false,
+               null, null, null, null,
+--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	2009-04-24 17:32:39.646300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java	2009-04-24 17:32:38.722300000 +0400
+@@ -62,7 +62,7 @@
+               suffixes,
+               MIMETypes,
+               readerClassName,
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               true,
+               GIFStreamMetadata.nativeMetadataFormatName,
+--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	2009-04-24 17:32:48.539300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java	2009-04-24 17:32:44.764300000 +0400
+@@ -31,6 +31,7 @@
+ import javax.imageio.ImageTypeSpecifier;
+ import javax.imageio.ImageWriter;
+ import javax.imageio.spi.ImageWriterSpi;
++import javax.imageio.stream.ImageOutputStream;
+ import com.sun.imageio.plugins.common.PaletteBuilder;
+ 
+ public class GIFImageWriterSpi extends ImageWriterSpi {
+@@ -59,7 +60,7 @@
+               suffixes,
+               MIMETypes,
+               writerClassName,
+-              STANDARD_OUTPUT_TYPE,
++              new Class[] { ImageOutputStream.class },
+               readerSpiNames,
+               true,
+               GIFWritableStreamMetadata.NATIVE_FORMAT_NAME,
+--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java	2009-04-24 17:32:57.302300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java	2009-04-24 17:32:56.484300000 +0400
+@@ -48,7 +48,7 @@
+               JPEG.suffixes,
+               JPEG.MIMETypes,
+               "com.sun.imageio.plugins.jpeg.JPEGImageReader",
+-              STANDARD_INPUT_TYPE,
++              new Class[] { ImageInputStream.class },
+               writerSpiNames,
+               true,
+               JPEG.nativeStreamMetadataFormatName,
+--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java	2009-04-24 17:33:03.013300000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java	2009-04-24 17:33:02.189300000 +0400
+@@ -28,6 +28,7 @@
+ import javax.imageio.spi.ImageWriterSpi;
+ import javax.imageio.spi.ServiceRegistry;
+ import javax.imageio.spi.IIORegistry;
[...170615 lines suppressed...]
+-
+-import javax.xml.namespace.QName;
+-
+-/**
+- * <p> XMLReader provides a high-level streaming parser interface
+- * for reading XML documents. </p>
+- *
+- * <p> The {@link #next} method is used to read events from the XML document. </p>
+- *
+- * <p> Each time it is called, {@link #next} returns the new state of the reader. </p>
+- *
+- * <p> Possible states are: BOF, the initial state, START, denoting the start
+- * tag of an element, END, denoting the end tag of an element, CHARS, denoting
+- * the character content of an element, PI, denoting a processing instruction,
+- * EOF, denoting the end of the document. </p>
+- *
+- * <p> Depending on the state the reader is in, one or more of the following
+- * query methods will be meaningful: {@link #getName}, {@link #getURI},
+- * {@link #getLocalName}, {@link #getAttributes}, {@link #getValue}. </p>
+- *
+- * <p> Elements visited by a XMLReader are tagged with unique IDs. The ID of the
+- * current element can be found by calling {@link #getElementId}. </p>
+- *
+- * <p> A XMLReader is always namespace-aware, and keeps track of the namespace
+- * declarations which are in scope at any time during streaming. The
+- * {@link #getURI(java.lang.String)} method can be used to find the URI
+- * associated to a given prefix in the current scope. </p>
+- *
+- * <p> XMLReaders can be created using a {@link XMLReaderFactory}. </p>
+- *
+- * <p> Some utility methods, {@link #nextContent} and {@link #nextElementContent}
+- * make it possible to ignore whitespace and processing instructions with
+- * minimum impact on the client code. </p>
+- *
+- * <p> Similarly, the {@link #skipElement} and {@link #skipElement(int elementId)}
+- * methods allow to skip to the end tag of an element ignoring all its content. </p>
+- *
+- * <p> Finally, the {@link #recordElement} method can be invoked when the XMLReader
+- * is positioned on the start tag of an element to record the element's contents
+- * so that they can be played back later. </p>
+- *
+- * @see XMLReaderFactory
+- *
+- * @author WS Development Team
+- */
+-public interface XMLReader {
+-    /**
+-     * The initial state of a XMLReader.
+-     */
+-    public static final int BOF = 0;
+-
+-    /**
+-     * The state denoting the start tag of an element.
+-     */
+-    public static final int START = 1;
+-
+-    /**
+-     * The state denoting the end tag of an element.
+-     */
+-    public static final int END = 2;
+-
+-    /**
+-     * The state denoting the character content of an element.
+-     */
+-    public static final int CHARS = 3;
+-
+-    /**
+-     * The state denoting a processing instruction.
+-     */
+-    public static final int PI = 4;
+-
+-    /**
+-     * The state denoting that the end of the document has been reached.
+-     */
+-    public static final int EOF = 5;
+-
+-    /**
+-     * Return the next state of the XMLReader.
+-     *
+-     * The return value is one of: START, END, CHARS, PI, EOF.
+-     */
+-    public int next();
+-
+-    /*
+-    * Return the next state of the XMLReader.
+-    *
+-    * <p> Whitespace character content and processing instructions are ignored. </p>
+-    *
+-    * <p> The return value is one of: START, END, CHARS, EOF. </p>
+-    */
+-    public int nextContent();
+-
+-    /**
+-     * Return the next state of the XMLReader.
+-     *
+-     * <p> Whitespace character content, processing instructions are ignored.
+-     * Non-whitespace character content triggers an exception. </p>
+-     *
+-     * <p> The return value is one of: START, END, EOF. </p>
+-     */
+-    public int nextElementContent();
+-
+-    /**
+-     * Return the current state of the XMLReader.
+-     *
+-     */
+-    public int getState();
+-
+-    /**
+-     * Return the current qualified name.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END. </p>
+-     */
+-    public QName getName();
+-
+-    /**
+-     * Return the current URI.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END. </p>
+-     */
+-    public String getURI();
+-
+-    /**
+-     * Return the current local name.
+-     *
+-     * <p> Meaningful only when the state is one of: START, END, PI. </p>
+-     */
+-    public String getLocalName();
+-
+-    /**
+-     * Return the current attribute list. In the jaxws implementation,
+-     * this list also includes namespace declarations.
+-     *
+-     * <p> Meaningful only when the state is one of: START. </p>
+-     *
+-     * <p> The returned {@link Attributes} object belong to the XMLReader and is
+-     * only guaranteed to be valid until the {@link #next} method is called,
+-     * directly or indirectly.</p>
+-     */
+-    public Attributes getAttributes();
+-
+-    /**
+-     * Return the current value.
+-     *
+-     * <p> Meaningful only when the state is one of: CHARS, PI. </p>
+-     */
+-    public String getValue();
+-
+-    /**
+-     * Return the current element ID.
+-     */
+-    public int getElementId();
+-
+-    /**
+-     * Return the current line number.
+-     *
+-     * <p> Due to aggressive parsing, this value may be off by a few lines. </p>
+-     */
+-    public int getLineNumber();
+-
+-    /**
+-     * Return the URI for the given prefix.
+-     *
+-     * <p> If there is no namespace declaration in scope for the given
+-     * prefix, return null. </p>
+-     */
+-    public String getURI(String prefix);
+-
+-    /**
+-     * Return an iterator on all prefixes in scope, except for the default prefix.
+-     *
+-     */
+-    public Iterator getPrefixes();
+-
+-    /**
+-     * Records the current element and leaves the reader positioned on its end tag.
+-     *
+-     * <p> The XMLReader must be positioned on the start tag of the element.
+-     * The returned reader will play back all events starting with the
+-     * start tag of the element and ending with its end tag. </p>
+-     */
+-    public XMLReader recordElement();
+-
+-    /**
+-     * Skip all nodes up to the end tag of the element with the current element ID.
+-     */
+-    public void skipElement();
+-
+-    /**
+-     * Skip all nodes up to the end tag of the element with the given element ID.
+-     */
+-    public void skipElement(int elementId);
+-
+-    /**
+-     * Close the XMLReader.
+-     *
+-     * <p> All subsequent calls to {@link #next} will return EOF. </p>
+-     */
+-    public void close();
+-}


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- java-1.6.0-openjdk.spec	9 Jul 2009 18:15:54 -0000	1.112
+++ java-1.6.0-openjdk.spec	5 Aug 2009 14:10:45 -0000	1.113
@@ -120,17 +120,22 @@
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
 # but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now.
-#%define tapsetdir	/usr/share/systemtap/tapset/%{sdkdir}
-%define tapsetdir	/usr/share/systemtap/tapset
+# use the root tapset dir for now. To distinquish between 64
+# and 32 bit architectures we place the tapsets under the arch
+# specific dir (note that systemtap will only pickup the tapset
+# for the primary arch for now). Systemtap uses the machine name
+# aka build_cpu as architecture specific directory name.
+ #%define tapsetdir	/usr/share/systemtap/tapset/%{sdkdir}
+ %define tapsetdir	/usr/share/systemtap/tapset/%{_build_cpu}
 %endif
 
+
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack 0
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 19.%{openjdkver}%{?dist}
+Release: 20.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -165,7 +170,8 @@ Patch4:   java-1.6.0-openjdk-java-access
 Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
 Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:	  java-1.6.0-openjdk-netx.patch
+Patch8:	  java-1.6.0-openjdk-netxandplugin.patch
+Patch9:	  java-1.6.0-openjdk-securitypatches.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -404,6 +410,7 @@ patch -l -p0 < %{PATCH4}
 patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH7}
 patch -l -p0 < %{PATCH8}
+patch -l -p0 < %{PATCH9}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -947,6 +954,25 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Wed Aug  5 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-20.b16
+- Updated java-1.6.0-openjdk-netx.patch, and renamed to 
+java-1.6.0-openjdk-netxandplugin.patch.
+- Added java-1.6.0-openjdk-securitypatches.patch.
+- Resolves: rhbz#512101
+- Resolves: rhbz#512896
+- Resolves: rhbz#512914
+- Resolves: rhbz#512907
+- Resolves: rhbz#512921
+- Resolves: rhbz#511915
+- Resolves: rhbz#512915
+- Resolves: rhbz#512920
+- Resolves: rhbz#512714
+- Resolves: rhbz#513215
+- Resolves: rhbz#513220
+- Resolves: rhbz#513222
+- Resolves: rhbz#513223
+- Resolves: rhbz#503794
+
 * Thu Jul  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b16
 - Added java-1.6.0-openjdk-netx.patch
 - Moved policytool to devel package.


--- java-1.6.0-openjdk-netx.patch DELETED ---



From makowski at fedoraproject.org  Wed Aug  5 14:47:35 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Wed,  5 Aug 2009 14:47:35 +0000 (UTC)
Subject: rpms/firebird/F-11 README.Fedora,1.2,1.3 firebird.spec,1.6,1.7
Message-ID: <20090805144735.8314F11C0349@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9374

Modified Files:
	README.Fedora firebird.spec 
Log Message:
* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
- remove stupid rm -rf in postun



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.Fedora	12 Jul 2009 09:12:36 -0000	1.2
+++ README.Fedora	5 Aug 2009 14:47:35 -0000	1.3
@@ -4,9 +4,11 @@ Differences between upstream and the Fed
 * All files are installed according to the FHS. Relatively complete
   environment as provided by upstream may be found in %{fbroot} 
 
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat have a symlink in /usr/bin
+* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
   In /usr/bin you have also isql-fb symlinked to Firebird isql.
   We can't name it isql to avoid conflict with isql from UNIX-ODBC
+  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
+  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/firebird.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- firebird.spec	30 Jul 2009 12:49:11 -0000	1.6
+++ firebird.spec	5 Aug 2009 14:47:35 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -315,7 +315,7 @@ ln	-s	%{fbroot}/bin/gbak	.%{_bindir}/gba
 ln	-s	%{fbroot}/bin/gfix	.%{_bindir}/gfix
 ln	-s	%{fbroot}/bin/gsec	.%{_bindir}/gsec
 ln	-s	%{fbroot}/bin/nbackup	.%{_bindir}/nbackup
-ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat
+ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat-fb
 
  
 %clean
@@ -407,7 +407,6 @@ fi
 
 %postun	
 /sbin/ldconfig
-rm -Rf	%{_var}/run/%{name}
 
 %files 
 %defattr(0644,root,root,0755)
@@ -444,7 +443,7 @@ rm -Rf	%{_var}/run/%{name}
 %{_bindir}/gsec
 %{_bindir}/gfix
 %{_bindir}/nbackup
-%{_bindir}/gstat
+%{_bindir}/gstat-fb
 %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
@@ -523,6 +522,10 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
+- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
+- remove stupid rm -rf in postun
+
 * Thu Jul 30 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
 - Update to 2.1.3.18185
 - Fix rh #514463



From vcrhonek at fedoraproject.org  Wed Aug  5 14:56:13 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  5 Aug 2009 14:56:13 +0000 (UTC)
Subject: rpms/texinfo/F-11 texinfo.spec,1.60,1.61
Message-ID: <20090805145613.EE76911C0349@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11374

Modified Files:
	texinfo.spec 
Log Message:
Fix changelog entry and rebuild


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-11/texinfo.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- texinfo.spec	4 Aug 2009 12:25:54 -0000	1.60
+++ texinfo.spec	5 Aug 2009 14:56:13 -0000	1.61
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -146,8 +146,12 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Aug  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-4
+- Fix changelog entry and rebuild
+
 * Tue Aug  4 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-3
-- Fix data types
+- Fix data types (fix by Ralf Corsepius)
+  Resolves: #515402
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.13a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From nosnilmot at fedoraproject.org  Wed Aug  5 15:01:06 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Wed,  5 Aug 2009 15:01:06 +0000 (UTC)
Subject: rpms/libsilc/F-10 silc-toolkit-1.1.8-libtool.patch, NONE,
	1.1 silc-toolkit-1.1.8-stringformat.patch, NONE,
	1.1 libsilc.spec, 1.24, 1.25
Message-ID: <20090805150106.4B8A011C0349@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13263/F-10

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-libtool.patch 
	silc-toolkit-1.1.8-stringformat.patch 
Log Message:
- Backport patch to fix string format vulnerability (#515648)



silc-toolkit-1.1.8-libtool.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-libtool.patch ---
diff -up silc-toolkit-1.1.8/lib/Makefile.am.libtool silc-toolkit-1.1.8/lib/Makefile.am
--- silc-toolkit-1.1.8/lib/Makefile.am.libtool	2008-12-23 12:56:45.000000000 -0500
+++ silc-toolkit-1.1.8/lib/Makefile.am	2008-12-23 12:56:59.000000000 -0500
@@ -73,8 +73,8 @@ all:
 
 install-exec-hook:
 	-mkdir -p $(DESTDIR)$(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
-	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 
 LIB_BASE_VERSION=@LIB_BASE_VERSION@
 LIBSILC_CURRENT=@LIBSILC_CURRENT@

silc-toolkit-1.1.8-stringformat.patch:
 client_entry.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-stringformat.patch ---
From: Pekka Riikonen <priikone at silcnet.org>
Date: Fri, 31 Jul 2009 19:32:57 +0000 (+0300)
Subject: Fixed string format vulnerability in client entry handling.
X-Git-Tag: silc.client.1.1.8~1
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=1598b3a51b51a434037461ccd35487bc0df3137c

Fixed string format vulnerability in client entry handling.

Reported and patch provided by William Cummings.
---

diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c
index 003f2fc..c950bfb 100644
--- a/lib/silcclient/client_entry.c
+++ b/lib/silcclient/client_entry.c
@@ -801,10 +801,10 @@ SilcClientEntry silc_client_add_client(SilcClient client,
 		      client_entry->server, sizeof(client_entry->server));
   if (nickname && client->internal->params->full_nicknames)
     silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		  nickname);
+		  "%s", nickname);
   else if (nickname)
     silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		  parsed);
+		  "%s", parsed);
 
   silc_parse_userfqdn(username, client_entry->username,
 		      sizeof(client_entry->username),
@@ -900,10 +900,10 @@ void silc_client_update_client(SilcClient client,
 			client_entry->server, sizeof(client_entry->server));
     if (client->internal->params->full_nicknames)
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    nickname);
+		    "%s", nickname);
     else
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    parsed);
+		    "%s", parsed);
 
     /* Normalize nickname */
     nick = silc_identifier_check(parsed, strlen(parsed),
@@ -1206,7 +1206,7 @@ SilcClientEntry silc_client_nickname_format(SilcClient client,
         return NULL;
 
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    cp);
+		    "%s", cp);
       silc_free(cp);
     }
 


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-10/libsilc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libsilc.spec	3 Dec 2008 16:43:55 -0000	1.24
+++ libsilc.spec	5 Aug 2009 15:01:05 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 1%{dist}
+Release: 5%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -9,6 +9,8 @@ Source0: http://www.silcnet.org/download
 Patch0:  silc-toolkit-1.1-wordsize.patch
 Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
+Patch3:  silc-toolkit-1.1.8-libtool.patch
+Patch4:  silc-toolkit-1.1.8-stringformat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -42,6 +44,8 @@ applications.
 %patch0 -p1 -b .wordsize
 %patch1 -p1 -b .libidn
 %patch2 -p1 -b .docinst
+%patch3 -p1 -b .libtool
+%patch4 -p1 -b .stringformat
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -55,8 +59,8 @@ EOF
 chmod +x %{__find_provides}
 
 %build
-autoreconf
-%configure --libdir=%{_libdir} --enable-shared \
+autoreconf -f -i
+%configure --libdir=%{_libdir} --enable-shared --without-libtoolfix \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
            --docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -131,6 +135,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-5
+- Backport patch to fix string format vulnerability (#515648)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-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.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Dec 23 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-2
+- Fix building with libtool 2.2
+
 * Wed Dec 03 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-1
 - Update to 1.1.8
 



From nosnilmot at fedoraproject.org  Wed Aug  5 15:01:06 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Wed,  5 Aug 2009 15:01:06 +0000 (UTC)
Subject: rpms/libsilc/F-11 silc-toolkit-1.1.8-stringformat.patch, NONE,
	1.1 libsilc.spec, 1.26, 1.27
Message-ID: <20090805150106.6898D11C034A@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13263/F-11

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-stringformat.patch 
Log Message:
- Backport patch to fix string format vulnerability (#515648)



silc-toolkit-1.1.8-stringformat.patch:
 client_entry.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-stringformat.patch ---
From: Pekka Riikonen <priikone at silcnet.org>
Date: Fri, 31 Jul 2009 19:32:57 +0000 (+0300)
Subject: Fixed string format vulnerability in client entry handling.
X-Git-Tag: silc.client.1.1.8~1
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=1598b3a51b51a434037461ccd35487bc0df3137c

Fixed string format vulnerability in client entry handling.

Reported and patch provided by William Cummings.
---

diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c
index 003f2fc..c950bfb 100644
--- a/lib/silcclient/client_entry.c
+++ b/lib/silcclient/client_entry.c
@@ -801,10 +801,10 @@ SilcClientEntry silc_client_add_client(SilcClient client,
 		      client_entry->server, sizeof(client_entry->server));
   if (nickname && client->internal->params->full_nicknames)
     silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		  nickname);
+		  "%s", nickname);
   else if (nickname)
     silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		  parsed);
+		  "%s", parsed);
 
   silc_parse_userfqdn(username, client_entry->username,
 		      sizeof(client_entry->username),
@@ -900,10 +900,10 @@ void silc_client_update_client(SilcClient client,
 			client_entry->server, sizeof(client_entry->server));
     if (client->internal->params->full_nicknames)
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    nickname);
+		    "%s", nickname);
     else
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    parsed);
+		    "%s", parsed);
 
     /* Normalize nickname */
     nick = silc_identifier_check(parsed, strlen(parsed),
@@ -1206,7 +1206,7 @@ SilcClientEntry silc_client_nickname_format(SilcClient client,
         return NULL;
 
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    cp);
+		    "%s", cp);
       silc_free(cp);
     }
 


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-11/libsilc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libsilc.spec	25 Feb 2009 18:11:03 -0000	1.26
+++ libsilc.spec	5 Aug 2009 15:01:06 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 3%{dist}
+Release: 5%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -10,6 +10,7 @@ Patch0:  silc-toolkit-1.1-wordsize.patch
 Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
 Patch3:  silc-toolkit-1.1.8-libtool.patch
+Patch4:  silc-toolkit-1.1.8-stringformat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -44,6 +45,7 @@ applications.
 %patch1 -p1 -b .libidn
 %patch2 -p1 -b .docinst
 %patch3 -p1 -b .libtool
+%patch4 -p1 -b .stringformat
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -57,7 +59,7 @@ EOF
 chmod +x %{__find_provides}
 
 %build
-autoreconf -i
+autoreconf -f -i
 %configure --libdir=%{_libdir} --enable-shared --without-libtoolfix \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
            --docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
@@ -133,6 +135,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-5
+- Backport patch to fix string format vulnerability (#515648)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-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.1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From nosnilmot at fedoraproject.org  Wed Aug  5 15:01:06 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Wed,  5 Aug 2009 15:01:06 +0000 (UTC)
Subject: rpms/libsilc/devel silc-toolkit-1.1.8-stringformat.patch, NONE,
	1.1 libsilc.spec, 1.27, 1.28
Message-ID: <20090805150106.BA70011C0349@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13263/devel

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-stringformat.patch 
Log Message:
- Backport patch to fix string format vulnerability (#515648)



silc-toolkit-1.1.8-stringformat.patch:
 client_entry.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE silc-toolkit-1.1.8-stringformat.patch ---
From: Pekka Riikonen <priikone at silcnet.org>
Date: Fri, 31 Jul 2009 19:32:57 +0000 (+0300)
Subject: Fixed string format vulnerability in client entry handling.
X-Git-Tag: silc.client.1.1.8~1
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=1598b3a51b51a434037461ccd35487bc0df3137c

Fixed string format vulnerability in client entry handling.

Reported and patch provided by William Cummings.
---

diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c
index 003f2fc..c950bfb 100644
--- a/lib/silcclient/client_entry.c
+++ b/lib/silcclient/client_entry.c
@@ -801,10 +801,10 @@ SilcClientEntry silc_client_add_client(SilcClient client,
 		      client_entry->server, sizeof(client_entry->server));
   if (nickname && client->internal->params->full_nicknames)
     silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		  nickname);
+		  "%s", nickname);
   else if (nickname)
     silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		  parsed);
+		  "%s", parsed);
 
   silc_parse_userfqdn(username, client_entry->username,
 		      sizeof(client_entry->username),
@@ -900,10 +900,10 @@ void silc_client_update_client(SilcClient client,
 			client_entry->server, sizeof(client_entry->server));
     if (client->internal->params->full_nicknames)
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    nickname);
+		    "%s", nickname);
     else
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    parsed);
+		    "%s", parsed);
 
     /* Normalize nickname */
     nick = silc_identifier_check(parsed, strlen(parsed),
@@ -1206,7 +1206,7 @@ SilcClientEntry silc_client_nickname_format(SilcClient client,
         return NULL;
 
       silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
-		    cp);
+		    "%s", cp);
       silc_free(cp);
     }
 


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libsilc.spec	25 Jul 2009 08:38:40 -0000	1.27
+++ libsilc.spec	5 Aug 2009 15:01:06 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 4%{dist}
+Release: 5%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -10,6 +10,7 @@ Patch0:  silc-toolkit-1.1-wordsize.patch
 Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
 Patch3:  silc-toolkit-1.1.8-libtool.patch
+Patch4:  silc-toolkit-1.1.8-stringformat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -44,6 +45,7 @@ applications.
 %patch1 -p1 -b .libidn
 %patch2 -p1 -b .docinst
 %patch3 -p1 -b .libtool
+%patch4 -p1 -b .stringformat
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -57,7 +59,7 @@ EOF
 chmod +x %{__find_provides}
 
 %build
-autoreconf -i
+autoreconf -f -i
 %configure --libdir=%{_libdir} --enable-shared --without-libtoolfix \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
            --docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
@@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-5
+- Backport patch to fix string format vulnerability (#515648)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwayne at fedoraproject.org  Wed Aug  5 15:02:40 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  5 Aug 2009 15:02:40 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 virtaal.spec, 1.11, 1.12
Message-ID: <20090805150240.A61A811C0349@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13842

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
- Update to 0.4.0 final
  - Terminology suggestions
  - Syntax highlighting
  - Support for "placeables" or placeholders
  - Support for editing inline elements of XLIFF files
  - Improvements to preferences
  - Updated translations.
  - Improvements for right-to-left languages.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Aug 2009 06:08:37 -0000	1.9
+++ .cvsignore	5 Aug 2009 15:02:40 -0000	1.10
@@ -1,4 +1 @@
-virtaal-0.3.1.tar.bz2
-virtaal-0.4.0-beta1.tar.bz2
-virtaal-0.4.0-rc1.tar.bz2
-virtaal-0.4.0-rc2.tar.bz2
+virtaal-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Aug 2009 06:08:38 -0000	1.9
+++ sources	5 Aug 2009 15:02:40 -0000	1.10
@@ -1,4 +1 @@
-eef03a4afa2f8a1e17f94a807268b7e3  virtaal-0.3.1.tar.bz2
-30ce41da361ef9efab109eea8efebf64  virtaal-0.4.0-beta1.tar.bz2
-a4b889b28f905803351e89356baf83d0  virtaal-0.4.0-rc1.tar.bz2
-92f4615361f7574d62a58ef0a5085d5c  virtaal-0.4.0-rc2.tar.bz2
+1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- virtaal.spec	1 Aug 2009 06:08:38 -0000	1.11
+++ virtaal.spec	5 Aug 2009 15:02:40 -0000	1.12
@@ -2,14 +2,13 @@
 
 Name:           virtaal
 Version:        0.4.0
-Release:        0.3.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-#Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
-Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-rc2/%{name}-%{version}-rc2.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
@@ -54,7 +53,7 @@ converters allow translators to edit: Op
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
 
@@ -142,6 +141,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
+- Update to 0.4.0 final
+  - Terminology suggestions
+  - Syntax highlighting
+  - Support for "placeables" or placeholders
+  - Support for editing inline elements of XLIFF files
+  - Improvements to preferences
+  - Updated translations.
+  - Improvements for right-to-left languages.
+
 * Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
 - Update to 0.4.0 rc2:
   - More improvements to the RTL interface of Virtaal



From iarnell at fedoraproject.org  Wed Aug  5 15:05:26 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 15:05:26 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.261, 1.262 comps-f11.xml.in, 1.279,
	1.280 comps-f12.xml.in, 1.73, 1.74
Message-ID: <20090805150526.3D74C11C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14868

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
Log Message:
add slashem to games


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- comps-f10.xml.in	4 Aug 2009 18:25:53 -0000	1.261
+++ comps-f10.xml.in	5 Aug 2009 15:05:25 -0000	1.262
@@ -1838,6 +1838,7 @@
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">sirius</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slashem</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">solarwolf</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- comps-f11.xml.in	4 Aug 2009 18:55:00 -0000	1.279
+++ comps-f11.xml.in	5 Aug 2009 15:05:25 -0000	1.280
@@ -2178,6 +2178,7 @@
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">sirius</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slashem</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">solarwolf</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- comps-f12.xml.in	5 Aug 2009 14:39:27 -0000	1.73
+++ comps-f12.xml.in	5 Aug 2009 15:05:25 -0000	1.74
@@ -2305,6 +2305,7 @@
       <packagereq type="optional">shippy</packagereq>
       <packagereq type="optional">sirius</packagereq>
       <packagereq type="optional">six</packagereq>
+      <packagereq type="optional">slashem</packagereq>
       <packagereq type="optional">slingshot</packagereq>
       <packagereq type="optional">smashteroid</packagereq>
       <packagereq type="optional">solarwolf</packagereq>



From makowski at fedoraproject.org  Wed Aug  5 15:06:36 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Wed,  5 Aug 2009 15:06:36 +0000 (UTC)
Subject: rpms/firebird/F-10 README.Fedora,1.2,1.3 firebird.spec,1.5,1.6
Message-ID: <20090805150636.9840811C0349@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15231

Modified Files:
	README.Fedora firebird.spec 
Log Message:
* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
- remove stupid rm -rf in postun



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-10/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.Fedora	12 Jul 2009 09:12:36 -0000	1.2
+++ README.Fedora	5 Aug 2009 15:06:36 -0000	1.3
@@ -4,9 +4,11 @@ Differences between upstream and the Fed
 * All files are installed according to the FHS. Relatively complete
   environment as provided by upstream may be found in %{fbroot} 
 
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat have a symlink in /usr/bin
+* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
   In /usr/bin you have also isql-fb symlinked to Firebird isql.
   We can't name it isql to avoid conflict with isql from UNIX-ODBC
+  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
+  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-10/firebird.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- firebird.spec	30 Jul 2009 13:18:28 -0000	1.5
+++ firebird.spec	5 Aug 2009 15:06:36 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -315,7 +315,7 @@ ln	-s	%{fbroot}/bin/gbak	.%{_bindir}/gba
 ln	-s	%{fbroot}/bin/gfix	.%{_bindir}/gfix
 ln	-s	%{fbroot}/bin/gsec	.%{_bindir}/gsec
 ln	-s	%{fbroot}/bin/nbackup	.%{_bindir}/nbackup
-ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat
+ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat-fb
 
  
 %clean
@@ -407,7 +407,6 @@ fi
 
 %postun	
 /sbin/ldconfig
-rm -Rf	%{_var}/run/%{name}
 
 %files 
 %defattr(0644,root,root,0755)
@@ -444,7 +443,7 @@ rm -Rf	%{_var}/run/%{name}
 %{_bindir}/gsec
 %{_bindir}/gfix
 %{_bindir}/nbackup
-%{_bindir}/gstat
+%{_bindir}/gstat-fb
 %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
@@ -523,6 +522,10 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
+- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
+- remove stupid rm -rf in postun
+
 * Thu Jul 30 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
 - Update to 2.1.3.18185
 - Fix rh #514463



From iarnell at fedoraproject.org  Wed Aug  5 15:12:29 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Wed,  5 Aug 2009 15:12:29 +0000 (UTC)
Subject: rpms/perl-Net-Amazon/devel .cvsignore, 1.5, 1.6 perl-Net-Amazon.spec,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090805151229.65DCE11C0349@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Net-Amazon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16864

Modified Files:
	.cvsignore perl-Net-Amazon.spec sources 
Log Message:
* Wed Aug 05 2009 Iain Arnell <iarnell at gmail.com> 0.55-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Jun 2009 04:03:39 -0000	1.5
+++ .cvsignore	5 Aug 2009 15:12:28 -0000	1.6
@@ -1 +1 @@
-Net-Amazon-0.54.tar.gz
+Net-Amazon-0.55.tar.gz


Index: perl-Net-Amazon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/perl-Net-Amazon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Net-Amazon.spec	30 Jul 2009 22:23:27 -0000	1.5
+++ perl-Net-Amazon.spec	5 Aug 2009 15:12:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Net-Amazon
-Version:        0.54
-Release:        2%{?dist}
+Version:        0.55
+Release:        1%{?dist}
 Summary:        Framework for accessing amazon.com via REST
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 05 2009 Iain Arnell <iarnell at gmail.com> 0.55-1
+- update to latest upstream
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0.54-2
 - Bump for F12 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Jun 2009 04:03:39 -0000	1.5
+++ sources	5 Aug 2009 15:12:29 -0000	1.6
@@ -1 +1 @@
-822e13802950c1dfc0af23354dbf7c70  Net-Amazon-0.54.tar.gz
+cd2eec3cedd46060faf3b47dbf9b147a  Net-Amazon-0.55.tar.gz



From makowski at fedoraproject.org  Wed Aug  5 15:16:33 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Wed,  5 Aug 2009 15:16:33 +0000 (UTC)
Subject: rpms/firebird/EL-4 README.Fedora,1.2,1.3 firebird.spec,1.5,1.6
Message-ID: <20090805151633.C22D911C0349@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18019

Modified Files:
	README.Fedora firebird.spec 
Log Message:
* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
- remove stupid rm -rf in postun



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-4/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.Fedora	12 Jul 2009 09:12:35 -0000	1.2
+++ README.Fedora	5 Aug 2009 15:16:33 -0000	1.3
@@ -4,9 +4,11 @@ Differences between upstream and the Fed
 * All files are installed according to the FHS. Relatively complete
   environment as provided by upstream may be found in %{fbroot} 
 
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat have a symlink in /usr/bin
+* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
   In /usr/bin you have also isql-fb symlinked to Firebird isql.
   We can't name it isql to avoid conflict with isql from UNIX-ODBC
+  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
+  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-4/firebird.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- firebird.spec	30 Jul 2009 12:26:03 -0000	1.5
+++ firebird.spec	5 Aug 2009 15:16:33 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -315,7 +315,7 @@ ln	-s	%{fbroot}/bin/gbak	.%{_bindir}/gba
 ln	-s	%{fbroot}/bin/gfix	.%{_bindir}/gfix
 ln	-s	%{fbroot}/bin/gsec	.%{_bindir}/gsec
 ln	-s	%{fbroot}/bin/nbackup	.%{_bindir}/nbackup
-ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat
+ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat-fb
 
  
 %clean
@@ -407,7 +407,6 @@ fi
 
 %postun	
 /sbin/ldconfig
-rm -Rf	%{_var}/run/%{name}
 
 %files 
 %defattr(0644,root,root,0755)
@@ -444,7 +443,7 @@ rm -Rf	%{_var}/run/%{name}
 %{_bindir}/gsec
 %{_bindir}/gfix
 %{_bindir}/nbackup
-%{_bindir}/gstat
+%{_bindir}/gstat-fb
 %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
@@ -523,6 +522,10 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
+- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
+- remove stupid rm -rf in postun
+
 * Thu Jul 30 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
 - Update to 2.1.3.18185
 - Fix rh #514463



From makowski at fedoraproject.org  Wed Aug  5 15:18:56 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Wed,  5 Aug 2009 15:18:56 +0000 (UTC)
Subject: rpms/firebird/EL-5 README.Fedora,1.2,1.3 firebird.spec,1.6,1.7
Message-ID: <20090805151856.7396611C0349@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18758

Modified Files:
	README.Fedora firebird.spec 
Log Message:
* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
- remove stupid rm -rf in postun



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-5/README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README.Fedora	12 Jul 2009 09:02:29 -0000	1.2
+++ README.Fedora	5 Aug 2009 15:18:56 -0000	1.3
@@ -4,9 +4,11 @@ Differences between upstream and the Fed
 * All files are installed according to the FHS. Relatively complete
   environment as provided by upstream may be found in %{fbroot} 
 
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat have a symlink in /usr/bin
+* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin
   In /usr/bin you have also isql-fb symlinked to Firebird isql.
   We can't name it isql to avoid conflict with isql from UNIX-ODBC
+  In /usr/bin you have also gstat-fb symlinked to Firebird gstat.
+  We can't name it gstat to avoid conflict with gstat from Ganglia-gmond
 
 * According to Fedora packaging rules, firebird service is not started 
   automatically. You need to start it, as root : 


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/EL-5/firebird.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- firebird.spec	30 Jul 2009 12:11:16 -0000	1.6
+++ firebird.spec	5 Aug 2009 15:18:56 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -315,7 +315,7 @@ ln	-s	%{fbroot}/bin/gbak	.%{_bindir}/gba
 ln	-s	%{fbroot}/bin/gfix	.%{_bindir}/gfix
 ln	-s	%{fbroot}/bin/gsec	.%{_bindir}/gsec
 ln	-s	%{fbroot}/bin/nbackup	.%{_bindir}/nbackup
-ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat
+ln	-s	%{fbroot}/bin/gstat	.%{_bindir}/gstat-fb
 
  
 %clean
@@ -407,7 +407,6 @@ fi
 
 %postun	
 /sbin/ldconfig
-rm -Rf	%{_var}/run/%{name}
 
 %files 
 %defattr(0644,root,root,0755)
@@ -444,7 +443,7 @@ rm -Rf	%{_var}/run/%{name}
 %{_bindir}/gsec
 %{_bindir}/gfix
 %{_bindir}/nbackup
-%{_bindir}/gstat
+%{_bindir}/gstat-fb
 %dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
@@ -523,6 +522,10 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
+- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
+- remove stupid rm -rf in postun
+
 * Thu Jul 30 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-1
 - Update to 2.1.3.18185
 - Fix rh #514463



From veillard at fedoraproject.org  Wed Aug  5 15:24:45 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed,  5 Aug 2009 15:24:45 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.44, 1.45 libvirt.spec, 1.162,
	1.163 sources, 1.45,
	1.46 libvirt-fix-permissions-problem-starting-qemu.patch, 1.1, NONE
Message-ID: <20090805152445.AA20511C0349@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20379

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	libvirt-fix-permissions-problem-starting-qemu.patch 
Log Message:
- Upstream release of 0.7.0
- ESX, VBox3, Power Hypervisor drivers
- new net filesystem glusterfs
- Storage cloning for LVM and Disk backends
- interface implementation based on netcf
- Support cgroups in QEMU driver
- QEmu hotplug NIC support
- a lot of fixes
Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	29 Jul 2009 14:58:18 -0000	1.44
+++ .cvsignore	5 Aug 2009 15:24:45 -0000	1.45
@@ -11,3 +11,4 @@ libvirt-0.6.4.tar.gz
 libvirt-0.6.5.tar.gz
 libvirt-0.7.0-0.1.gitf055724.tar.gz
 libvirt-0.7.0-0.6.gite195b43.tar.gz
+libvirt-0.7.0.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- libvirt.spec	31 Jul 2009 08:55:24 -0000	1.162
+++ libvirt.spec	5 Aug 2009 15:24:45 -0000	1.163
@@ -78,13 +78,10 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 0.9.gite195b43%{?dist}%{?extra_release}
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: libvirt-0.7.0-0.6.gite195b43.tar.gz
-
-# Should be in 0.7.0
-Patch01: libvirt-fix-permissions-problem-starting-qemu.patch
+Source: libvirt-%{version}.tar.gz
 
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
@@ -255,8 +252,6 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
-%patch01 -p1
-
 %patch200 -p0
 
 %build
@@ -617,6 +612,16 @@ fi
 %endif
 
 %changelog
+* Wed Aug  5 2009 Daniel Veillard <veillard at redhat.com> - 0.7.0-1.fc12
+- Upstream release of 0.7.0
+- ESX, VBox3, Power Hypervisor drivers
+- new net filesystem glusterfs
+- Storage cloning for LVM and Disk backends
+- interface implementation based on netcf
+- Support cgroups in QEMU driver
+- QEmu hotplug NIC support
+- a lot of fixes
+
 * Fri Jul 31 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-0.9.gite195b43
 - Set perms on /var/lib/libvirt/images to 0711
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	29 Jul 2009 14:58:18 -0000	1.45
+++ sources	5 Aug 2009 15:24:45 -0000	1.46
@@ -1 +1 @@
-30d52d580ad19473e80831ab1c222347  libvirt-0.7.0-0.6.gite195b43.tar.gz
+8c2c14a7695c9c661004bcfc6468d62d  libvirt-0.7.0.tar.gz


--- libvirt-fix-permissions-problem-starting-qemu.patch DELETED ---



From rakesh at fedoraproject.org  Wed Aug  5 15:25:07 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Wed,  5 Aug 2009 15:25:07 +0000 (UTC)
Subject: rpms/ntop/devel 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.10, 1.11 sources, 1.4, 1.5 ntop-http_c.patch, 1.1, NONE
Message-ID: <20090805152507.B67C411C0349@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20459/devel

Modified Files:
	.cvsignore import.log ntop-geoip.patch ntop.spec sources 
Added Files:
	ntop-lua_wget.patch 
Removed Files:
	ntop-http_c.patch 
Log Message:

 - Updated to 3.3.10, updated geoip patch
 - lua_wget patch to prevent wget lua
 - removed ntop-http_c.patch



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/devel/.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	5 Aug 2009 15:25:07 -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/devel/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	5 Aug 2009 15:25:07 -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:HEAD:ntop-3.3.10-1.fc11.src.rpm:1249486132

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/devel/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	5 Aug 2009 15:25:07 -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/devel/ntop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntop.spec	25 Jul 2009 19:39:24 -0000	1.10
+++ ntop.spec	5 Aug 2009 15:25:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ntop
-Version:        3.3.9
-Release:        6%{?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,13 +16,13 @@ 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
 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, 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
@@ -68,7 +68,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
+#%patch6 -p1 -b .http_c
 
 %build
 #run ntop own autoconf wrapper
@@ -188,6 +189,11 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-1
+- Updated to 3.3.10, updated geoip patch
+- lua_wget patch to prevent wget lua
+- removed ntop-http_c.patch
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/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	5 Aug 2009 15:25:07 -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 rdieter at fedoraproject.org  Wed Aug  5 15:34:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 15:34:40 +0000 (UTC)
Subject: rpms/kde-filesystem/devel kde-filesystem.spec,1.42,1.43
Message-ID: <20090805153440.9486011C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23996

Modified Files:
	kde-filesystem.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4-30
- kill the ownership of %_datadir/sounds (#515745)



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kde-filesystem.spec	4 Aug 2009 15:20:40 -0000	1.42
+++ kde-filesystem.spec	5 Aug 2009 15:34:40 -0000	1.43
@@ -14,10 +14,15 @@
 %define _kde4_buildtype release
 %define _kde4_macros_api 2
 
+%if 0%{?fedora} > 11
+# see http://bugzilla.redhat.com/515745
+%define exclude_sounds 1
+%endif
+
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 29%{?dist}
+Release: 30%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -155,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 %{_datadir}/mimelnk/
 %{_datadir}/services/
 %{_datadir}/servicetypes/
-%{_datadir}/sounds/
+%{?exclude_sounds:%exclude }%{_datadir}/sounds/
 %{_datadir}/templates/
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
@@ -174,13 +179,16 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 %{_kde4_sharedir}/templates/
 %{_kde4_datadir}/autostart/
 %{_kde4_datadir}/icons/locolor
-%{_kde4_datadir}/sounds/
+%{?exclude_sounds:%exclude }%{_kde4_datadir}/sounds/
 %{_kde4_datadir}/wallpapers/
 %dir %{_kde4_docdir}/HTML/
 %lang(en) %{_kde4_docdir}/HTML/en/
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4-30
+- kill the ownership of %%_datadir/sounds (#515745)
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4-29
 - drop unused (and confusing) /etc/kde4/ crud
 



From kkofler at fedoraproject.org  Wed Aug  5 15:42:05 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  5 Aug 2009 15:42:05 +0000 (UTC)
Subject: rpms/kdegames3/F-11 kdegames3.spec,1.11,1.12
Message-ID: <20090805154205.A89CB11C0349@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26112/F-11

Modified Files:
	kdegames3.spec 
Log Message:
Sync from devel:

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-5
- drop KSnakeDuel, part of kdegames since 4.3


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/F-11/kdegames3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kdegames3.spec	25 Feb 2009 10:45:08 -0000	1.11
+++ kdegames3.spec	5 Aug 2009 15:42:05 -0000	1.12
@@ -4,12 +4,12 @@
 %define make_cvs 0
 
 # These games are already in KDE 4.
-%define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktuberling kwin4 lskat
+%define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
 
 Name:    kdegames3
 Summary: K Desktop Environment 3 - Games not ported to KDE 4
 Version: 3.5.10
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -35,7 +35,7 @@ BuildRequires: automake libtool
 Games and gaming libraries for the K Desktop Environment which have not been
 ported to KDE 4 yet.
 Included with this package are: atlantik, kasteroids, kbackgammon, kboxpush,
-kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake, ksnakeduel.
+kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake.
 
 %package devel
 Summary: Development files for kdegames3
@@ -189,6 +189,12 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-5
+- drop KSnakeDuel, part of kdegames since 4.3
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kkofler at fedoraproject.org  Wed Aug  5 15:45:23 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  5 Aug 2009 15:45:23 +0000 (UTC)
Subject: rpms/kdegames3/F-10 kdegames3.spec,1.10,1.11
Message-ID: <20090805154523.6714C11C0349@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26805/F-10

Modified Files:
	kdegames3.spec 
Log Message:
Sync from devel:

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-5
- drop KSnakeDuel, part of kdegames since 4.3

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: kdegames3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames3/F-10/kdegames3.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kdegames3.spec	15 Feb 2009 01:52:26 -0000	1.10
+++ kdegames3.spec	5 Aug 2009 15:45:23 -0000	1.11
@@ -4,12 +4,12 @@
 %define make_cvs 0
 
 # These games are already in KDE 4.
-%define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktuberling kwin4 lskat
+%define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
 
 Name:    kdegames3
 Summary: K Desktop Environment 3 - Games not ported to KDE 4
 Version: 3.5.10
-Release: 3%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
@@ -35,7 +35,7 @@ BuildRequires: automake libtool
 Games and gaming libraries for the K Desktop Environment which have not been
 ported to KDE 4 yet.
 Included with this package are: atlantik, kasteroids, kbackgammon, kboxpush,
-kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake, ksnakeduel.
+kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake.
 
 %package devel
 Summary: Development files for kdegames3
@@ -189,6 +189,15 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-5
+- drop KSnakeDuel, part of kdegames since 4.3
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-3
 - readd kbackgammon, not actually part of KDE 4
 



From rdieter at fedoraproject.org  Wed Aug  5 15:46:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 15:46:13 +0000 (UTC)
Subject: rpms/kde-l10n/F-11 .cvsignore, 1.25, 1.26 kde-l10n.spec, 1.83,
	1.84 sources, 1.28, 1.29 subdirs-kde-l10n, 1.18, 1.19
Message-ID: <20090805154613.31C6411C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27076/F-11

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	10 Jun 2009 10:52:55 -0000	1.25
+++ .cvsignore	5 Aug 2009 15:46:12 -0000	1.26
@@ -1,236 +1,280 @@
-kde-l10n-bg-4.1.2.tar.bz2
-kde-l10n-ca-4.1.2.tar.bz2
-kde-l10n-cs-4.1.2.tar.bz2
-kde-l10n-csb-4.1.2.tar.bz2
-kde-l10n-da-4.1.2.tar.bz2
-kde-l10n-de-4.1.2.tar.bz2
-kde-l10n-el-4.1.2.tar.bz2
-kde-l10n-en_GB-4.1.2.tar.bz2
-kde-l10n-eo-4.1.2.tar.bz2
-kde-l10n-es-4.1.2.tar.bz2
-kde-l10n-et-4.1.2.tar.bz2
-kde-l10n-fi-4.1.2.tar.bz2
-kde-l10n-fr-4.1.2.tar.bz2
-kde-l10n-fy-4.1.2.tar.bz2
-kde-l10n-ga-4.1.2.tar.bz2
-kde-l10n-gl-4.1.2.tar.bz2
-kde-l10n-hi-4.1.2.tar.bz2
-kde-l10n-hu-4.1.2.tar.bz2
-kde-l10n-it-4.1.2.tar.bz2
-kde-l10n-ja-4.1.2.tar.bz2
-kde-l10n-kk-4.1.2.tar.bz2
-kde-l10n-km-4.1.2.tar.bz2
-kde-l10n-ko-4.1.2.tar.bz2
-kde-l10n-ku-4.1.2.tar.bz2
-kde-l10n-lt-4.1.2.tar.bz2
-kde-l10n-lv-4.1.2.tar.bz2
-kde-l10n-mk-4.1.2.tar.bz2
-kde-l10n-ml-4.1.2.tar.bz2
-kde-l10n-nb-4.1.2.tar.bz2
-kde-l10n-nds-4.1.2.tar.bz2
-kde-l10n-nl-4.1.2.tar.bz2
-kde-l10n-nn-4.1.2.tar.bz2
-kde-l10n-pa-4.1.2.tar.bz2
-kde-l10n-pl-4.1.2.tar.bz2
-kde-l10n-pt-4.1.2.tar.bz2
-kde-l10n-pt_BR-4.1.2.tar.bz2
-kde-l10n-ru-4.1.2.tar.bz2
-kde-l10n-sl-4.1.2.tar.bz2
-kde-l10n-sr-4.1.2.tar.bz2
-kde-l10n-sv-4.1.2.tar.bz2
-kde-l10n-ta-4.1.2.tar.bz2
-kde-l10n-th-4.1.2.tar.bz2
-kde-l10n-tr-4.1.2.tar.bz2
-kde-l10n-uk-4.1.2.tar.bz2
-kde-l10n-wa-4.1.2.tar.bz2
-kde-l10n-zh_CN-4.1.2.tar.bz2
-kde-l10n-zh_TW-4.1.2.tar.bz2
-kde-l10n-bg-4.1.80.tar.bz2
-kde-l10n-ca-4.1.80.tar.bz2
-kde-l10n-cs-4.1.80.tar.bz2
-kde-l10n-csb-4.1.80.tar.bz2
-kde-l10n-da-4.1.80.tar.bz2
-kde-l10n-de-4.1.80.tar.bz2
-kde-l10n-el-4.1.80.tar.bz2
-kde-l10n-en_GB-4.1.80.tar.bz2
-kde-l10n-eo-4.1.80.tar.bz2
-kde-l10n-es-4.1.80.tar.bz2
-kde-l10n-et-4.1.80.tar.bz2
-kde-l10n-fi-4.1.80.tar.bz2
-kde-l10n-fr-4.1.80.tar.bz2
-kde-l10n-fy-4.1.80.tar.bz2
-kde-l10n-ga-4.1.80.tar.bz2
-kde-l10n-gl-4.1.80.tar.bz2
-kde-l10n-hi-4.1.80.tar.bz2
-kde-l10n-hu-4.1.80.tar.bz2
-kde-l10n-it-4.1.80.tar.bz2
-kde-l10n-ja-4.1.80.tar.bz2
-kde-l10n-kk-4.1.80.tar.bz2
-kde-l10n-km-4.1.80.tar.bz2
-kde-l10n-ko-4.1.80.tar.bz2
-kde-l10n-ku-4.1.80.tar.bz2
-kde-l10n-lt-4.1.80.tar.bz2
-kde-l10n-lv-4.1.80.tar.bz2
-kde-l10n-mk-4.1.80.tar.bz2
-kde-l10n-ml-4.1.80.tar.bz2
-kde-l10n-nb-4.1.80.tar.bz2
-kde-l10n-nds-4.1.80.tar.bz2
-kde-l10n-nl-4.1.80.tar.bz2
-kde-l10n-nn-4.1.80.tar.bz2
-kde-l10n-pa-4.1.80.tar.bz2
-kde-l10n-pl-4.1.80.tar.bz2
-kde-l10n-pt-4.1.80.tar.bz2
-kde-l10n-pt_BR-4.1.80.tar.bz2
-kde-l10n-ru-4.1.80.tar.bz2
-kde-l10n-sl-4.1.80.tar.bz2
-kde-l10n-sr-4.1.80.tar.bz2
-kde-l10n-sv-4.1.80.tar.bz2
-kde-l10n-ta-4.1.80.tar.bz2
-kde-l10n-th-4.1.80.tar.bz2
-kde-l10n-tr-4.1.80.tar.bz2
-kde-l10n-uk-4.1.80.tar.bz2
-kde-l10n-wa-4.1.80.tar.bz2
-kde-l10n-zh_CN-4.1.80.tar.bz2
-kde-l10n-zh_TW-4.1.80.tar.bz2
-kde-l10n-bg-4.1.85.tar.bz2
-kde-l10n-ca-4.1.85.tar.bz2
-kde-l10n-cs-4.1.85.tar.bz2
-kde-l10n-csb-4.1.85.tar.bz2
-kde-l10n-da-4.1.85.tar.bz2
-kde-l10n-de-4.1.85.tar.bz2
-kde-l10n-el-4.1.85.tar.bz2
-kde-l10n-en_GB-4.1.85.tar.bz2
-kde-l10n-eo-4.1.85.tar.bz2
-kde-l10n-es-4.1.85.tar.bz2
-kde-l10n-et-4.1.85.tar.bz2
-kde-l10n-fi-4.1.85.tar.bz2
-kde-l10n-fr-4.1.85.tar.bz2
-kde-l10n-fy-4.1.85.tar.bz2
-kde-l10n-ga-4.1.85.tar.bz2
-kde-l10n-gl-4.1.85.tar.bz2
-kde-l10n-hi-4.1.85.tar.bz2
-kde-l10n-hu-4.1.85.tar.bz2
-kde-l10n-it-4.1.85.tar.bz2
-kde-l10n-ja-4.1.85.tar.bz2
-kde-l10n-kk-4.1.85.tar.bz2
-kde-l10n-km-4.1.85.tar.bz2
-kde-l10n-ko-4.1.85.tar.bz2
-kde-l10n-ku-4.1.85.tar.bz2
-kde-l10n-lt-4.1.85.tar.bz2
-kde-l10n-lv-4.1.85.tar.bz2
-kde-l10n-mk-4.1.85.tar.bz2
-kde-l10n-ml-4.1.85.tar.bz2
-kde-l10n-nb-4.1.85.tar.bz2
-kde-l10n-nds-4.1.85.tar.bz2
-kde-l10n-nl-4.1.85.tar.bz2
-kde-l10n-nn-4.1.85.tar.bz2
-kde-l10n-pa-4.1.85.tar.bz2
-kde-l10n-pl-4.1.85.tar.bz2
-kde-l10n-pt-4.1.85.tar.bz2
-kde-l10n-pt_BR-4.1.85.tar.bz2
-kde-l10n-ru-4.1.85.tar.bz2
-kde-l10n-sl-4.1.85.tar.bz2
-kde-l10n-sr-4.1.85.tar.bz2
-kde-l10n-sv-4.1.85.tar.bz2
-kde-l10n-ta-4.1.85.tar.bz2
-kde-l10n-th-4.1.85.tar.bz2
-kde-l10n-tr-4.1.85.tar.bz2
-kde-l10n-uk-4.1.85.tar.bz2
-kde-l10n-wa-4.1.85.tar.bz2
-kde-l10n-zh_CN-4.1.85.tar.bz2
-kde-l10n-zh_TW-4.1.85.tar.bz2
-kde-l10n-bg-4.1.96.tar.bz2
-kde-l10n-ca-4.1.96.tar.bz2
-kde-l10n-cs-4.1.96.tar.bz2
-kde-l10n-csb-4.1.96.tar.bz2
-kde-l10n-da-4.1.96.tar.bz2
-kde-l10n-de-4.1.96.tar.bz2
-kde-l10n-el-4.1.96.tar.bz2
-kde-l10n-en_GB-4.1.96.tar.bz2
-kde-l10n-eo-4.1.96.tar.bz2
-kde-l10n-es-4.1.96.tar.bz2
-kde-l10n-et-4.1.96.tar.bz2
-kde-l10n-fi-4.1.96.tar.bz2
-kde-l10n-fr-4.1.96.tar.bz2
-kde-l10n-fy-4.1.96.tar.bz2
-kde-l10n-ga-4.1.96.tar.bz2
-kde-l10n-gl-4.1.96.tar.bz2
-kde-l10n-hi-4.1.96.tar.bz2
-kde-l10n-hu-4.1.96.tar.bz2
-kde-l10n-it-4.1.96.tar.bz2
-kde-l10n-ja-4.1.96.tar.bz2
-kde-l10n-kk-4.1.96.tar.bz2
-kde-l10n-km-4.1.96.tar.bz2
-kde-l10n-ko-4.1.96.tar.bz2
-kde-l10n-ku-4.1.96.tar.bz2
-kde-l10n-lt-4.1.96.tar.bz2
-kde-l10n-lv-4.1.96.tar.bz2
-kde-l10n-mk-4.1.96.tar.bz2
-kde-l10n-ml-4.1.96.tar.bz2
-kde-l10n-nb-4.1.96.tar.bz2
-kde-l10n-nds-4.1.96.tar.bz2
-kde-l10n-nl-4.1.96.tar.bz2
-kde-l10n-nn-4.1.96.tar.bz2
-kde-l10n-pa-4.1.96.tar.bz2
-kde-l10n-pl-4.1.96.tar.bz2
-kde-l10n-pt-4.1.96.tar.bz2
-kde-l10n-pt_BR-4.1.96.tar.bz2
-kde-l10n-ru-4.1.96.tar.bz2
-kde-l10n-sl-4.1.96.tar.bz2
-kde-l10n-sr-4.1.96.tar.bz2
-kde-l10n-sv-4.1.96.tar.bz2
-kde-l10n-ta-4.1.96.tar.bz2
-kde-l10n-th-4.1.96.tar.bz2
-kde-l10n-tr-4.1.96.tar.bz2
-kde-l10n-uk-4.1.96.tar.bz2
-kde-l10n-wa-4.1.96.tar.bz2
-kde-l10n-zh_CN-4.1.96.tar.bz2
-kde-l10n-zh_TW-4.1.96.tar.bz2
-kde-l10n-bg-4.2.0.tar.bz2
-kde-l10n-ca-4.2.0.tar.bz2
-kde-l10n-cs-4.2.0.tar.bz2
-kde-l10n-csb-4.2.0.tar.bz2
-kde-l10n-da-4.2.0.tar.bz2
-kde-l10n-de-4.2.0.tar.bz2
-kde-l10n-el-4.2.0.tar.bz2
-kde-l10n-en_GB-4.2.0.tar.bz2
-kde-l10n-es-4.2.0.tar.bz2
-kde-l10n-et-4.2.0.tar.bz2
-kde-l10n-fi-4.2.0.tar.bz2
-kde-l10n-fr-4.2.0.tar.bz2
-kde-l10n-ga-4.2.0.tar.bz2
-kde-l10n-gl-4.2.0.tar.bz2
-kde-l10n-hi-4.2.0.tar.bz2
-kde-l10n-hu-4.2.0.tar.bz2
-kde-l10n-it-4.2.0.tar.bz2
-kde-l10n-ja-4.2.0.tar.bz2
-kde-l10n-kk-4.2.0.tar.bz2
-kde-l10n-km-4.2.0.tar.bz2
-kde-l10n-ko-4.2.0.tar.bz2
-kde-l10n-ku-4.2.0.tar.bz2
-kde-l10n-lt-4.2.0.tar.bz2
-kde-l10n-lv-4.2.0.tar.bz2
-kde-l10n-mk-4.2.0.tar.bz2
-kde-l10n-ml-4.2.0.tar.bz2
-kde-l10n-nb-4.2.0.tar.bz2
-kde-l10n-nds-4.2.0.tar.bz2
-kde-l10n-nl-4.2.0.tar.bz2
-kde-l10n-nn-4.2.0.tar.bz2
-kde-l10n-pa-4.2.0.tar.bz2
-kde-l10n-pl-4.2.0.tar.bz2
-kde-l10n-pt-4.2.0.tar.bz2
-kde-l10n-pt_BR-4.2.0.tar.bz2
-kde-l10n-ru-4.2.0.tar.bz2
-kde-l10n-sl-4.2.0.tar.bz2
-kde-l10n-sr-4.2.0.tar.bz2
-kde-l10n-sv-4.2.0.tar.bz2
-kde-l10n-th-4.2.0.tar.bz2
-kde-l10n-tr-4.2.0.tar.bz2
-kde-l10n-uk-4.2.0.tar.bz2
-kde-l10n-wa-4.2.0.tar.bz2
-kde-l10n-zh_CN-4.2.0.tar.bz2
-kde-l10n-zh_TW-4.2.0.tar.bz2
-kde-l10n-ar-4.2.0.tar.bz2
-kde-l10n-eu-4.2.0.tar.bz2
-kde-l10n-he-4.2.0.tar.bz2
-kde-l10n-kn-4.2.4.tar.bz2
+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


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/kde-l10n.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- kde-l10n.spec	10 Jun 2009 10:57:04 -0000	1.83
+++ kde-l10n.spec	5 Aug 2009 15:46:13 -0000	1.84
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.2.4
-Release: 2%{dist}
+Version: 4.3.0
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -74,6 +74,8 @@ Source61: ftp://ftp.kde.org/pub/kde/stab
 
 Source1000: subdirs-kde-l10n
 
+# upstream patches
+
 Requires: kde-filesystem
 
 BuildRequires: kdelibs4-devel >= %{version}
@@ -130,14 +132,15 @@ Provides: %{name}-be = %{version}-%{rele
 %description Belarusian
 Belarusian language support for KDE
 
-%package Bengali
-Summary: Bengali language support for KDE
+%package Bengali-India
+Summary: Bengali India language support for KDE
 Group: User Interface/Desktops
 Requires: kde-filesystem
 Provides: %{name}-bn_IN = %{version}-%{release}
+Obsoletes: %{name}-Bengali
 
-%description Bengali
-Bengali language support for KDE
+%description Bengali-India
+Bengali India language support for KDE
 
 %package Bulgarian
 Summary: Bulgarian language support for KDE
@@ -804,6 +807,8 @@ for i in $(cat %{SOURCE1000}) ; do
   bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
 done
 
+# upstream patches
+
 %build
 for i in $(cat %{SOURCE1000}) ; do
   pushd %{name}-$i-%{version}
@@ -873,56 +878,68 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root)
-%lang(af) %{_datadir}/locale/af/*
+%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
+%lang(af) %{_datadir}/locale/af/entry.desktop
 %endif
 
 %files Arabic
 %defattr(-,root,root)
-%lang(ar) %{_datadir}/locale/ar/*
+%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
+%lang(ar) %{_datadir}/locale/ar/entry.desktop
+%lang(ar) %{_datadir}/locale/ar/LC_SCRIPTS/
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
 
 %if %{buildall}
 %files Azerbaijani
 %defattr(-,root,root)
-%lang(az) %{_datadir}/locale/az/*
+%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
+%lang(az) %{_datadir}/locale/az/entry.desktop
 %endif
 
 %if %{buildall}
 %files Belarusian
 %defattr(-,root,root)
-%lang(be) %{_datadir}/locale/be/*
+%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
+%lang(be) %{_datadir}/locale/be/entry.desktop
 %endif
 
 %files Bulgarian
 %defattr(-,root,root)
-%lang(bg) %{_datadir}/locale/bg/*
+%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+%lang(bg) %{_datadir}/locale/bg/entry.desktop
 %lang(bg) %{_kde4_appsdir}/kvtml/bg
 
-%files Bengali
+%files Bengali-India
 %defattr(-,root,root)
-%lang(bn_IN) %{_datadir}/locale/bn_IN/*
+%lang(bn_IN) %{_datadir}/locale/bn_IN/LC_MESSAGES/*
+%lang(bn_IN) %{_datadir}/locale/bn_IN/entry.desktop
 
 %if %{buildall}
 %files Tibetan
 %defattr(-,root,root)
-%lang(bo) %{_datadir}/locale/bo/*
+%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
+%lang(bo) %{_datadir}/locale/bo/entry.desktop
 %endif
 
 %if %{buildall}
 %files Breton
 %defattr(-,root,root)
-%lang(br) %{_datadir}/locale/br/*
+%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+%lang(br) %{_datadir}/locale/br/entry.desktop
 %endif
 
 %if %{buildall}
 %files Bosnian
 %defattr(-,root,root)
-%lang(bs) %{_datadir}/locale/bs/*
+%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
+%lang(bs) %{_datadir}/locale/bs/entry.desktop
 %endif
 
 %files Catalan
 %defattr(-,root,root)
-%lang(ca) %{_datadir}/locale/ca/*
+%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
+%lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
+%lang(ca) %{_datadir}/locale/ca/entry.desktop
 %lang(ca) %{_kde4_appsdir}/khangman/ca.txt
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
@@ -931,7 +948,8 @@ rm -rf %{buildroot}
 
 %files Czech
 %defattr(-,root,root)
-%lang(cs) %{_datadir}/locale/cs/*
+%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cs) %{_datadir}/locale/cs/entry.desktop
 %lang(cs) %{_kde4_appsdir}/khangman/cs.txt
 %lang(cs) %{_kde4_appsdir}/klettres/cs
 %lang(cs) %{_kde4_appsdir}/kvtml/cs
@@ -940,12 +958,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Welsh
 %defattr(-,root,root)
-%lang(cy) %{_datadir}/locale/cy/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/entry.desktop
 %endif
 
 %files Danish
 %defattr(-,root,root)
-%lang(da) %{_datadir}/locale/da/*
+%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+%lang(da) %{_datadir}/locale/da/entry.desktop
 %lang(da) %{_kde4_appsdir}/ktuberling/sounds/da*
 %lang(da) %{_kde4_appsdir}/khangman/da.txt
 %lang(da) %{_kde4_appsdir}/klettres/da
@@ -955,7 +975,9 @@ rm -rf %{buildroot}
 
 %files German
 %defattr(-,root,root)
-%lang(de) %{_datadir}/locale/de/*
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
+%lang(de) %{_datadir}/locale/de/LC_SCRIPTS/
+%lang(de) %{_datadir}/locale/de/entry.desktop
 %lang(de) %{_kde4_appsdir}/klettres/de
 %lang(de) %{_kde4_appsdir}/ktuberling/sounds/de*
 %lang(de) %{_kde4_appsdir}/khangman/de.txt
@@ -966,16 +988,19 @@ rm -rf %{buildroot}
 
 %files Greek
 %defattr(-,root,root)
-%lang(el) %{_datadir}/locale/el/*
+%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
+%lang(el) %{_datadir}/locale/el/entry.desktop
 %lang(el) %{_kde4_appsdir}/kvtml/el
 
 %files Gujarati
 %defattr(-,root,root)
-%lang(gu) %{_datadir}/locale/gu/*
+%lang(gu) %{_datadir}/locale/gu/LC_MESSAGES/*
+%lang(gu) %{_datadir}/locale/gu/entry.desktop
 
 %files British
 %defattr(-,root,root)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
+%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+%lang(en_GB) %{_datadir}/locale/en_GB/entry.desktop
 %lang(en_GB) %{_kde4_appsdir}/klettres/en_GB
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
@@ -986,12 +1011,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Esperanto
 %defattr(-,root,root)
-%lang(eo) %{_datadir}/locale/eo/*
+%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+%lang(eo) %{_datadir}/locale/eo/entry.desktop
 %endif
 
 %files Spanish
 %defattr(-,root,root)
-%lang(es) %{_datadir}/locale/es/*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
+%lang(es) %{_datadir}/locale/es/entry.desktop
 %lang(es) %{_kde4_appsdir}/ktuberling/sounds/es*
 #%lang(es) %{_kde4_appsdir}/khangman/data/es
 %lang(es) %{_kde4_appsdir}/khangman/es.txt
@@ -1002,7 +1029,8 @@ rm -rf %{buildroot}
 
 %files Estonian
 %defattr(-,root,root)
-%lang(et) %{_datadir}/locale/et/*
+%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
+%lang(et) %{_datadir}/locale/et/entry.desktop
 %lang(et) %{_kde4_appsdir}/khangman/et.txt
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
@@ -1010,17 +1038,20 @@ rm -rf %{buildroot}
 
 %files Basque
 %defattr(-,root,root)
-%lang(eu) %{_datadir}/locale/eu/*
+%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+%lang(eu) %{_datadir}/locale/eu/entry.desktop
 
 %if %{buildall}
 %files Farsi
 %defattr(-,root,root)
-%lang(fa) %{_datadir}/locale/fa/*
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+%lang(fa) %{_datadir}/locale/fa/entry.desktop
 %endif
 
 %files Finnish
 %defattr(-,root,root)
-%lang(fi) %{_datadir}/locale/fi/*
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+%lang(fi) %{_datadir}/locale/fi/entry.desktop
 %lang(fi) %{_kde4_appsdir}/khangman/fi.txt
 %lang(fi) %{_kde4_appsdir}/ktuberling/sounds/fi*
 %lang(fi) %{_kde4_appsdir}/kvtml/fi
@@ -1028,12 +1059,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Faroese
 %defattr(-,root,root)
-%lang(fo) %{_datadir}/locale/fo/*
+%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
+%lang(fo) %{_datadir}/locale/fo/entry.desktop
 %endif
 
 %files French
 %defattr(-,root,root)
-%lang(fr) %{_datadir}/locale/fr/*
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
+%lang(fr) %{_datadir}/locale/fr/entry.desktop
 %lang(fr) %{_kde4_appsdir}/ktuberling/sounds/fr*
 %lang(fr) %{_kde4_appsdir}/khangman/fr.txt
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
@@ -1043,18 +1076,23 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Frisian
 %defattr(-,root,root)
-%lang(fy) %{_datadir}/locale/fy/*
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/entry.desktop
 %endif
 
 %files Irish
 %defattr(-,root,root)
-%lang(ga) %{_datadir}/locale/ga/*
+%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(ga) %{_datadir}/locale/ga/LC_SCRIPTS/
+%lang(ga) %{_datadir}/locale/ga/entry.desktop
 %lang(ga) %{_kde4_appsdir}/khangman/ga.txt
+%lang(ga) %{_kde4_appsdir}/ktuberling/sounds/ga*
 %lang(ga) %{_kde4_appsdir}/kvtml/ga
 
 %files Galician
 %defattr(-,root,root)
-%lang(gl) %{_datadir}/locale/gl/*
+%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
+%lang(gl) %{_datadir}/locale/gl/entry.desktop
 %lang(gl) %{_kde4_appsdir}/kvtml/gl
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
@@ -1063,22 +1101,26 @@ rm -rf %{buildroot}
 
 %files Hebrew
 %defattr(-,root,root)
-%lang(he) %{_datadir}/locale/he/*
+%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+%lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_kde4_appsdir}/klettres/he
 
 %files Hindi
 %defattr(-,root,root)
-%lang(hi) %{_datadir}/locale/hi/*
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+%lang(hi) %{_datadir}/locale/hi/entry.desktop
 
 %if %{buildall}
 %files Croatian
 %defattr(-,root,root)
-%lang(hr) %{_datadir}/locale/hr/*
+%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
+%lang(hr) %{_datadir}/locale/hr/entry.desktop
 %endif
 
 %files Hungarian
 %defattr(-,root,root)
-%lang(hu) %{_datadir}/locale/hu/*
+%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+%lang(hu) %{_datadir}/locale/hu/entry.desktop
 %lang(hu) %{_kde4_appsdir}/khangman/hu.txt
 %lang(hu) %{_kde4_appsdir}/kvtml/hu
 %lang(hu) %{_kde4_appsdir}/klettres/hu
@@ -1087,16 +1129,19 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Indonesian
 %defattr(-,root,root)
-%lang(id) %{_datadir}/locale/id/*
+%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
+%lang(id) %{_datadir}/locale/id/entry.desktop
 %endif
 
 %files Icelandic
 %defattr(-,root,root)
-%lang(is) %{_datadir}/locale/is/*
+%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
+%lang(is) %{_datadir}/locale/is/entry.desktop
 
 %files Italian
 %defattr(-,root,root)
-%lang(it) %{_datadir}/locale/it/*
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
+%lang(it) %{_datadir}/locale/it/entry.desktop
 %lang(it) %{_kde4_appsdir}/ktuberling/sounds/it*
 %lang(it) %{_kde4_appsdir}/klettres/it
 %lang(it) %{_kde4_appsdir}/kvtml/it
@@ -1106,48 +1151,60 @@ rm -rf %{buildroot}
 
 %files Japanese
 %defattr(-,root,root)
-%lang(ja) %{_datadir}/locale/ja/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_SCRIPTS/
+%lang(ja) %{_datadir}/locale/ja/entry.desktop
 %lang(ja) %{_kde4_docdir}/HTML/ja
 
 %files Kannada
 %defattr(-,root,root)
-%lang(kn) %{_datadir}/locale/kn/*
+%lang(kn) %{_datadir}/locale/kn/LC_MESSAGES/*
+%lang(kn) %{_datadir}/locale/kn/entry.desktop
 
 %files Kashubian
 %defattr(-,root,root)
-%lang(csb) %{_datadir}/locale/csb/*
+%lang(csb) %{_datadir}/locale/csb/LC_MESSAGES/*
+%lang(csb) %{_datadir}/locale/csb/entry.desktop
 
 %files Kazakh
 %defattr(-,root,root)
-%lang(kk) %{_datadir}/locale/kk/*
+%lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
+%lang(kk) %{_datadir}/locale/kk/entry.desktop
 
 %files Khmer
 %defattr(-,root,root)
-%lang(km) %{_datadir}/locale/km/*
+%lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
+%lang(km) %{_datadir}/locale/km/entry.desktop
 
 %files Korean
 %defattr(-,root,root)
-%lang(ko) %{_datadir}/locale/ko/*
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
+%lang(ko) %{_datadir}/locale/ko/LC_SCRIPTS/
+%lang(ko) %{_datadir}/locale/ko/entry.desktop
 %lang(ko) %{_kde4_docdir}/HTML/ko/
 
 %files Kurdish
 %defattr(-,root,root)
-%lang(ku) %{_datadir}/locale/ku/*
+%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
+%lang(ku) %{_datadir}/locale/ku/entry.desktop
 
 %if %{buildall}
 %files Lao
 %defattr(-,root,root)
-%lang(lo) %{_datadir}/locale/lo/*
+%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
+%lang(lo) %{_datadir}/locale/lo/entry.desktop
 %endif
 
 %files Lithuanian
 %defattr(-,root,root)
-%lang(lt) %{_datadir}/locale/lt/*
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lt) %{_datadir}/locale/lt/entry.desktop
 %lang(lt) %{_kde4_docdir}/HTML/lt/
 
 %files LowSaxon
 %defattr(-,root,root)
-%lang(nds) %{_datadir}/locale/nds/*
+%lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/*
+%lang(nds) %{_datadir}/locale/nds/entry.desktop
 %lang(nds) %{_kde4_appsdir}/klettres/nds
 %lang(nds) %{_kde4_appsdir}/khangman/nds.txt
 %lang(nds) %{_kde4_appsdir}/kvtml/nds
@@ -1157,46 +1214,57 @@ rm -rf %{buildroot}
 
 %files Latvian
 %defattr(-,root,root)
-%lang(lv) %{_datadir}/locale/lv/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/entry.desktop
 
 %if %{buildall}
 %files Maori
 %defattr(-,root,root)
-%lang(mi) %{_datadir}/locale/mi/*
+%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
+%lang(mi) %{_datadir}/locale/mi/entry.desktop
 %endif
 
 %files Macedonian
 %defattr(-,root,root)
-%lang(mk) %{_datadir}/locale/mk/*
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(mk) %{_datadir}/locale/mk/entry.desktop
 
 %files Maithili
 %defattr(-,root,root)
-%lang(mai) %{_datadir}/locale/mai/*
+%lang(mai) %{_datadir}/locale/mai/LC_MESSAGES/*
+%lang(mai) %{_datadir}/locale/mai/entry.desktop
 
 %files Marathi
 %defattr(-,root,root)
-%lang(mr) %{_datadir}/locale/mr/*
+%lang(mr) %{_datadir}/locale/mr/LC_MESSAGES/*
+%lang(mr) %{_datadir}/locale/mr/entry.desktop
 
 %files Malayalam
 %defattr(-,root,root)
-%lang(ml) %{_datadir}/locale/ml/*
+%lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
+%lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
+%lang(ml) %{_datadir}/locale/ml/entry.desktop
 %lang(ml) %{_kde4_appsdir}/klettres/ml/
 
 %if %{buildall}
 %files Maltese
 %defattr(-,root,root)
-%lang(mt) %{_datadir}/locale/mt/*
+%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
+%lang(mt) %{_datadir}/locale/mt/entry.desktop
 %endif
 
 %if %{buildall}
 %files Nepali
 %defattr(-,root,root)
-%lang(ne) %{_datadir}/locale/ne/*
+%lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
+%lang(ne) %{_datadir}/locale/ne/entry.desktop
 %endif
 
 %files Dutch
 %defattr(-,root,root)
-%lang(nl) %{_datadir}/locale/nl/*
+%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %{_datadir}/locale/nl/LC_SCRIPTS/
+%lang(nl) %{_datadir}/locale/nl/entry.desktop
 %lang(nl) %{_kde4_appsdir}/ktuberling/sounds/nl*
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
@@ -1209,12 +1277,15 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files NorthernSami
 %defattr(-,root,root)
-%lang(se) %{_datadir}/locale/se/*
+%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
+%lang(se) %{_datadir}/locale/se/entry.desktop
 %endif
 
 %files Norwegian
 %defattr(-,root,root)
-%lang(nb) %{_datadir}/locale/nb/*
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_datadir}/locale/nb/LC_SCRIPTS/
+%lang(nb) %{_datadir}/locale/nb/entry.desktop
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
@@ -1226,7 +1297,9 @@ rm -rf %{buildroot}
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
-%lang(nn) %{_datadir}/locale/nn/*
+%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
+%lang(nn) %{_datadir}/locale/nn/LC_SCRIPTS/
+%lang(nn) %{_datadir}/locale/nn/entry.desktop
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
 %lang(nn) %{_kde4_appsdir}/kvtml/nn/
 %lang(nn) %{_kde4_docdir}/HTML/nn
@@ -1235,23 +1308,28 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Occitan
 %defattr(-,root,root)
-%lang(oc) %{_datadir}/locale/oc/*
+%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
+%lang(oc) %{_datadir}/locale/oc/entry.desktop
 %endif
 
 %files Punjabi
 %defattr(-,root,root)
-%lang(pa) %{_datadir}/locale/pa/*
+%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
+%lang(pa) %{_datadir}/locale/pa/entry.desktop
 
 %files Polish
 %defattr(-,root,root)
-%lang(pl) %{_datadir}/locale/pl/*
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
+%lang(pl) %{_datadir}/locale/pl/LC_SCRIPTS/
+%lang(pl) %{_datadir}/locale/pl/entry.desktop
 %lang(pl) %{_kde4_appsdir}/khangman/pl.txt
 %lang(pl) %{_kde4_appsdir}/kvtml/pl
 %lang(pl) %{_kde4_docdir}/HTML/pl
 
 %files Portuguese
 %defattr(-,root,root)
-%lang(pt) %{_datadir}/locale/pt/*
+%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
+%lang(pt) %{_datadir}/locale/pt/entry.desktop
 %lang(pt) %{_kde4_appsdir}/khangman/pt.txt
 %lang(pt) %{_kde4_appsdir}/ktuberling/sounds/pt*
 %lang(pt) %{_kde4_appsdir}/kvtml/pt
@@ -1260,26 +1338,26 @@ rm -rf %{buildroot}
 
 %files Brazil
 %defattr(-,root,root)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/entry.desktop
 %lang(pt_BR) %{_kde4_appsdir}/khangman/pt_BR.txt
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
-%lang(pt_BR) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.pt_BR.xml
-%lang(pt_BR) %{_kde4_appsdir}/kturtle/data/logokeywords.pt_BR.xml
-%lang(pt_BR) %{_kde4_appsdir}/kturtle/examples/pt_BR/*.logo
 %lang(pt_BR) %{_mandir}/pt_BR/*/*
 
 %files Romanian
 %defattr(-,root,root)
-%lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
+%lang(ro) %{_datadir}/locale/ro/entry.desktop
 %lang(ro) %{_kde4_appsdir}/kvtml/ro
 %lang(ro) %{_kde4_appsdir}/ktuberling/sounds/ro*
 %lang(ro) %{_kde4_docdir}/HTML/ro
 
 %files Russian
 %defattr(-,root,root)
-%lang(ru) %{_datadir}/locale/ru/*
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_datadir}/locale/ru/entry.desktop
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
 %lang(ru) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.ru.xml
@@ -1289,13 +1367,15 @@ rm -rf %{buildroot}
 
 %files Slovak
 %defattr(-,root,root)
-%lang(sk) %{_datadir}/locale/sk/*
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+%lang(sk) %{_datadir}/locale/sk/entry.desktop
 #%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
 #%lang(sk) %{_kde4_appsdir}/klettres/sk
 
 %files Slovenian
 %defattr(-,root,root)
-%lang(sl) %{_datadir}/locale/sl/*
+%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%lang(sl) %{_datadir}/locale/sl/entry.desktop
 %lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
 %lang(sl) %{_kde4_appsdir}/khangman/sl.txt
 %lang(sl) %{_kde4_appsdir}/kvtml/sl
@@ -1306,7 +1386,9 @@ rm -rf %{buildroot}
 
 %files Serbian
 %defattr(-,root,root)
-%lang(sr) %{_datadir}/locale/sr/*
+%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr/LC_SCRIPTS/
+%lang(sr) %{_datadir}/locale/sr/entry.desktop
 %lang(sr) %{_kde4_appsdir}/ktuberling/sounds/sr*
 %lang(sr) %{_kde4_docdir}/HTML/sr
 %lang(sr) %{_kde4_docdir}/HTML/sr at latin
@@ -1317,12 +1399,16 @@ rm -rf %{buildroot}
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
 %lang(sr) %{_kde4_appsdir}/kvtml/sr*
-%lang(sr) %{_datadir}/locale/sr at latin/*
-%lang(sr) %{_mandir}/sr*/man1/*
+%lang(sr) %{_datadir}/locale/sr at latin/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr at latin/entry.desktop
+%lang(sr) %{_mandir}/sr/*/*
+%lang(sr) %{_mandir}/sr at latin/*/*
 
 %files Swedish
 %defattr(-,root,root)
-%lang(sv) %{_datadir}/locale/sv/*
+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
+%lang(sv) %{_datadir}/locale/sv/entry.desktop
+%lang(sv) %{_datadir}/locale/sv/LC_SCRIPTS/
 %lang(sv) %{_kde4_appsdir}/ktuberling/sounds/sv*
 %lang(sv) %{_kde4_appsdir}/khangman/sv.txt
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
@@ -1332,29 +1418,36 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Tamil
 %defattr(-,root,root)
-%lang(ta) %{_datadir}/locale/ta/*
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(ta) %{_datadir}/locale/ta/entry.desktop
 %endif
 
 %files Tajik
 %defattr(-,root,root)
-%lang(tg) %{_datadir}/locale/tg/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/entry.desktop
 %lang(tg) %{_kde4_appsdir}/kvtml/tg
 %lang(tg) %{_kde4_appsdir}/khangman/tg.txt
 
 %files Thai
 %defattr(-,root,root)
-%lang(th) %{_datadir}/locale/th/*
+%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
+%lang(th) %{_datadir}/locale/th/charset
+%lang(th) %{_datadir}/locale/th/entry.desktop
 
 %files Turkish
 %defattr(-,root,root)
-%lang(tr) %{_datadir}/locale/tr/*
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+%lang(tr) %{_datadir}/locale/tr/entry.desktop
 %lang(tr) %{_kde4_appsdir}/khangman/tr.txt
 %lang(tr) %{_kde4_appsdir}/kvtml/tr
 %lang(tr) %{_kde4_docdir}/HTML/tr
 
 %files Ukrainian
 %defattr(-,root,root)
-%lang(uk) %{_datadir}/locale/uk/*
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_datadir}/locale/uk/LC_SCRIPTS/
+%lang(uk) %{_datadir}/locale/uk/entry.desktop
 %lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk*
 %lang(uk) %{_kde4_appsdir}/kvtml/uk
 %lang(uk) %{_kde4_docdir}/HTML/uk
@@ -1363,47 +1456,68 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Venda
 %defattr(-,root,root)
-%lang(ven) %{_datadir}/locale/ven/*
+%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
+%lang(ven) %{_datadir}/locale/ven/entry.desktop
 %endif
 
 %if %{buildall}
 %files Vietnamese
 %defattr(-,root,root)
-%lang(vi) %{_datadir}/locale/vi/*
+%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
+%lang(vi) %{_datadir}/locale/vi/entry.desktop
 %endif
 
 %files Walloon
 %defattr(-,root,root)
-%lang(wa) %{_datadir}/locale/wa/*
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
+%lang(wa) %{_datadir}/locale/wa/entry.desktop
+%lang(wa) %{_kde4_appsdir}/ktuberling/sounds/wa*
 %lang(wa) %{_kde4_docdir}/HTML/wa
 
 %if %{buildall}
 %files Xhosa
 %defattr(-,root,root)
-%lang(xh) %{_datadir}/locale/xh/*
+%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
+%lang(xh) %{_datadir}/locale/xh/entry.desktop
 %endif
 
 %files Chinese
 %defattr(-,root,root)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_SCRIPTS/
+%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
+%lang(zh_CN) %{_datadir}/locale/zh_CN/entry.desktop
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
 %lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
 %lang(zh_CN) %{_kde4_docdir}/HTML/zh_CN
 
 %files Chinese-Traditional
 %defattr(-,root,root)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
-* Wed Jun 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- add omitted Kannada
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Tue Jul 14 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.2.95-2
+- fix duplicate directory ownership (/usr/share/locale/*/LC_MESSAGES)
 
-* Sat Jun 06 2009 Than Ngo <than at redhat.com> - 4.2.4-1
-- 4.2.4
+* Tue Jun 30 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Tue May 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Mar 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	10 Jun 2009 10:52:55 -0000	1.28
+++ sources	5 Aug 2009 15:46:13 -0000	1.29
@@ -1,56 +1,56 @@
-63f899e898f0dbbb549a14ca560350a0  kde-l10n-ar-4.2.4.tar.bz2
-04352d8c1e6820505adf230ef582326a  kde-l10n-bg-4.2.4.tar.bz2
-8541726ab77ae698e7d917021513150d  kde-l10n-bn_IN-4.2.4.tar.bz2
-6d90c8a58ef21cc84fbde5034abcdfd2  kde-l10n-ca-4.2.4.tar.bz2
-c528e407bc177d8cc8f07900942ed98a  kde-l10n-cs-4.2.4.tar.bz2
-b63dfbfa73b7fd0cb6b86652ec0a115d  kde-l10n-csb-4.2.4.tar.bz2
-39cdd4d26781d2af6528316f924dd2f9  kde-l10n-da-4.2.4.tar.bz2
-2f1185db36349a14a600ec58656c82ec  kde-l10n-de-4.2.4.tar.bz2
-8cec4b527e64f11698217029413730ab  kde-l10n-el-4.2.4.tar.bz2
-7598465393f948243f9da0252620ba93  kde-l10n-en_GB-4.2.4.tar.bz2
-dbe304dbadf6d03dfb73bc8577c603d6  kde-l10n-es-4.2.4.tar.bz2
-313999a61733d722324b4e899d8fecdd  kde-l10n-et-4.2.4.tar.bz2
-d1744798414c697683f35f4eb800801d  kde-l10n-eu-4.2.4.tar.bz2
-7d9d0e64d741c7c74917161336ccd982  kde-l10n-fi-4.2.4.tar.bz2
-0da9b56a0bc2a0cbb113974a365f0350  kde-l10n-fr-4.2.4.tar.bz2
-4c5f9d3c1f5c4514af509b9989186548  kde-l10n-ga-4.2.4.tar.bz2
-e1e3031948ff689b83f7e7f192ccda3c  kde-l10n-gl-4.2.4.tar.bz2
-17f0f8c638932e3cc757b99e0f70de9f  kde-l10n-gu-4.2.4.tar.bz2
-7b8e776c0a308c50749ae5a4e66e6caa  kde-l10n-he-4.2.4.tar.bz2
-65854d31de0eadd32680a2c03c0644f9  kde-l10n-hi-4.2.4.tar.bz2
-9c0e191bc9d1d6e53d400611f3b7817c  kde-l10n-hu-4.2.4.tar.bz2
-490b1de7f603cd070a17f2a91b120f6b  kde-l10n-is-4.2.4.tar.bz2
-b32ebadc4ec0c02202db7a6b7431b78d  kde-l10n-it-4.2.4.tar.bz2
-756f92c06b8cb013e4fc0ee6a8388465  kde-l10n-ja-4.2.4.tar.bz2
-3d8f1c7f64a950b2370bfc695a8dca3d  kde-l10n-kk-4.2.4.tar.bz2
-81559bf93f7fc0e7a776dc5021393846  kde-l10n-km-4.2.4.tar.bz2
-0604120363f244fb9f6a9f52b28e9cd3  kde-l10n-ko-4.2.4.tar.bz2
-3861b5ed7bc1281f8e7dc7b3898b3cfb  kde-l10n-ku-4.2.4.tar.bz2
-18a4848bb2e191995219bcb43d05692d  kde-l10n-lt-4.2.4.tar.bz2
-2d387abb28a3309d09060c18217b6eac  kde-l10n-lv-4.2.4.tar.bz2
-458e575aff53d9ee7e71c362a5414f22  kde-l10n-mai-4.2.4.tar.bz2
-feebd0b5db522c87d9206583db7c737d  kde-l10n-mk-4.2.4.tar.bz2
-e9d4bc43113e74040e59a7fbc4e751a9  kde-l10n-ml-4.2.4.tar.bz2
-5d1b6b899093994f81827d4f218f7c06  kde-l10n-mr-4.2.4.tar.bz2
-d01bca94aa6eef4add56af21b8a7c1d9  kde-l10n-nb-4.2.4.tar.bz2
-ded46915af415c47b8c449ab36261298  kde-l10n-nds-4.2.4.tar.bz2
-77aef34bf6e2993e95fa043a6e4d884d  kde-l10n-nl-4.2.4.tar.bz2
-8efa6f0754c7c03751bdb64a00702955  kde-l10n-nn-4.2.4.tar.bz2
-d2eac659c14a3feeba3021f4268ac7ca  kde-l10n-pa-4.2.4.tar.bz2
-6749341a81d7807e326ce954b197b3e5  kde-l10n-pl-4.2.4.tar.bz2
-c364a53f7409ebc1f9fde2e9eeecd8b5  kde-l10n-pt-4.2.4.tar.bz2
-a1b1f1dc212ca772977488cc89ef9932  kde-l10n-pt_BR-4.2.4.tar.bz2
-0a8c80367b875602f6c45dd7468da11a  kde-l10n-ro-4.2.4.tar.bz2
-d18ed35c1ff28ba2ee493fde9750210d  kde-l10n-ru-4.2.4.tar.bz2
-59fbfc7bf835dfbd04458e5ddc5629a1  kde-l10n-sk-4.2.4.tar.bz2
-89042687ac864b2edbfc88de0250940f  kde-l10n-sl-4.2.4.tar.bz2
-9d50b526065a2d98e9614260673f99c2  kde-l10n-sr-4.2.4.tar.bz2
-b70552996f20bf629531420fbf9bf9d1  kde-l10n-sv-4.2.4.tar.bz2
-39f5305b0a3d3d54fb503a7c4723e8b9  kde-l10n-tg-4.2.4.tar.bz2
-5164f4a21632fa1a065a9cc68409e1b1  kde-l10n-th-4.2.4.tar.bz2
-73996436690460bb7cbd77862bcb7350  kde-l10n-tr-4.2.4.tar.bz2
-f69f121a0abc6129ec8e2f5bca171623  kde-l10n-uk-4.2.4.tar.bz2
-402f19e737e56855bb3dfbbb240b891c  kde-l10n-wa-4.2.4.tar.bz2
-373ef1ab6e56d063982c0e53b575ad3e  kde-l10n-zh_CN-4.2.4.tar.bz2
-b1e8f50ea643b4ed8115d5c3257792cd  kde-l10n-zh_TW-4.2.4.tar.bz2
-8b875d82ff0cb84a607e85e319a7bc33  kde-l10n-kn-4.2.4.tar.bz2
+97be5e3b2f06b86dcd2a3bdc4a9db55c  kde-l10n-ar-4.3.0.tar.bz2
+fb0a71d21cf32e48a28916d365b4cd96  kde-l10n-bg-4.3.0.tar.bz2
+26164201b1d8b6c922385353f2a7aefb  kde-l10n-bn_IN-4.3.0.tar.bz2
+1f9e2f387083be475ec995c0e965b1cf  kde-l10n-ca-4.3.0.tar.bz2
+f19c3a3bfae24f4caf98a40f6bed7463  kde-l10n-csb-4.3.0.tar.bz2
+8d8ec27742416e134b2990abbd9af14b  kde-l10n-cs-4.3.0.tar.bz2
+b81c512af946a1e365c2eada3d82e4e0  kde-l10n-da-4.3.0.tar.bz2
+c7ca5df8998b4ae0977bc706db86d89f  kde-l10n-de-4.3.0.tar.bz2
+24b9e6117c254a7eb42bb7ac3ee5956e  kde-l10n-el-4.3.0.tar.bz2
+1596bbb2848517bba0cf50854de47e89  kde-l10n-en_GB-4.3.0.tar.bz2
+34dc196b2395e3a3223346cf2dafde5a  kde-l10n-es-4.3.0.tar.bz2
+aeb0683e93853f67c50ba2fcd1e4a41c  kde-l10n-et-4.3.0.tar.bz2
+f513bfa2c570f733bb36279b06d96136  kde-l10n-eu-4.3.0.tar.bz2
+dc151141386e6e1af9dc2b405dd8a9d9  kde-l10n-fi-4.3.0.tar.bz2
+faa1b6b4d9640c9a45f0e86a5af64091  kde-l10n-fr-4.3.0.tar.bz2
+145deb5a130537b5abd8c75c316f88a5  kde-l10n-ga-4.3.0.tar.bz2
+fde9f9726edf1ba1a32302ea285a1bf5  kde-l10n-gl-4.3.0.tar.bz2
+fdda752dc37f1957662c8c8eb5fb581c  kde-l10n-gu-4.3.0.tar.bz2
+f6ca255a2759ac90a1dbef609d0f173e  kde-l10n-he-4.3.0.tar.bz2
+ad1bd358a3bf4a515e95607edfdde4c9  kde-l10n-hi-4.3.0.tar.bz2
+ba442f81bc3ed72710e5ea1c44c2949d  kde-l10n-hu-4.3.0.tar.bz2
+40e82eea13e31644bf3982ab56595d18  kde-l10n-is-4.3.0.tar.bz2
+7974d9d51286c0bbe3ce9201cea05372  kde-l10n-it-4.3.0.tar.bz2
+e0bc5aecab2dab8a32a7a379c3bda98c  kde-l10n-ja-4.3.0.tar.bz2
+c007430e5839c943c27d2c08a3271c01  kde-l10n-kk-4.3.0.tar.bz2
+4cde7eb586388fb3268aecc901c2f297  kde-l10n-km-4.3.0.tar.bz2
+e08b0161309fc03c0178a357f45c38e0  kde-l10n-kn-4.3.0.tar.bz2
+9a10bf30852acd34040c6fa8fcf1bc27  kde-l10n-ko-4.3.0.tar.bz2
+80dbde92c9cc2a3b18ddc8f8e6bf6228  kde-l10n-ku-4.3.0.tar.bz2
+0f7d011ce2e22f92e7e814445cf6ff97  kde-l10n-lt-4.3.0.tar.bz2
+e097c2d2be217ae29cb769504356281c  kde-l10n-lv-4.3.0.tar.bz2
+2eda87bfb1490736fc0bd245177b015e  kde-l10n-mai-4.3.0.tar.bz2
+853109465d2dc4031f0cd729775cca55  kde-l10n-mk-4.3.0.tar.bz2
+953f5f1d4cbb785cc4d8ef4a488c6661  kde-l10n-ml-4.3.0.tar.bz2
+c8d80300e921f31eca1ab8ea1de85ceb  kde-l10n-mr-4.3.0.tar.bz2
+cfe753a7bebfda9f5f6f25399d8dad0c  kde-l10n-nb-4.3.0.tar.bz2
+b7b453507e58788503835fec4eddd5a9  kde-l10n-nds-4.3.0.tar.bz2
+9118bfb78b280b0228f4f299420f98ea  kde-l10n-nl-4.3.0.tar.bz2
+f6863912c5d4d326097e1f995299dbc1  kde-l10n-nn-4.3.0.tar.bz2
+a533709989a31c15600ddf9a3e3a7301  kde-l10n-pa-4.3.0.tar.bz2
+25fb4028a7bb2000b06363e23efec62d  kde-l10n-pl-4.3.0.tar.bz2
+0020f01a730b5511712a89e13a1d4d76  kde-l10n-pt_BR-4.3.0.tar.bz2
+257a995ca6c0adaab8024445dbce848f  kde-l10n-pt-4.3.0.tar.bz2
+f29614843f53950f87efe76fdb05d3d1  kde-l10n-ro-4.3.0.tar.bz2
+5bc404cea173009d5a817685ca61bcad  kde-l10n-ru-4.3.0.tar.bz2
+24945e807ad3703f546a7f6787cb0345  kde-l10n-sk-4.3.0.tar.bz2
+02117baab6317032245d6ae9f958eb45  kde-l10n-sl-4.3.0.tar.bz2
+26338c314a2a3da58f93e8f606b185c2  kde-l10n-sr-4.3.0.tar.bz2
+7499b0fb6ddbb10c2f2e0fb0e88cb097  kde-l10n-sv-4.3.0.tar.bz2
+539ee71a082043ba788bf6c18a75d7d2  kde-l10n-tg-4.3.0.tar.bz2
+2c5dd52012d3e21eaefde4211bee2d1c  kde-l10n-th-4.3.0.tar.bz2
+0d163e01436737a8f4b74d99527997a2  kde-l10n-tr-4.3.0.tar.bz2
+43be454febc2f9ca48b66fd5ce057898  kde-l10n-uk-4.3.0.tar.bz2
+76bc9dbac978806a7cd73a53fdbe8b69  kde-l10n-wa-4.3.0.tar.bz2
+7d0ddb25d6f6e21858b7811bfbd61458  kde-l10n-zh_CN-4.3.0.tar.bz2
+ce2a8abf6d8a43a4823ba2e19ad05649  kde-l10n-zh_TW-4.3.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-11/subdirs-kde-l10n,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- subdirs-kde-l10n	10 Jun 2009 10:52:55 -0000	1.18
+++ subdirs-kde-l10n	5 Aug 2009 15:46:13 -0000	1.19
@@ -2,8 +2,8 @@ ar
 bg
 bn_IN
 ca
-cs
 csb
+cs
 da
 de
 el
@@ -39,8 +39,8 @@ nl
 nn
 pa
 pl
-pt
 pt_BR
+pt
 ro
 ru
 sk



From rdieter at fedoraproject.org  Wed Aug  5 15:46:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 15:46:12 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 .cvsignore, 1.17, 1.18 kde-l10n.spec, 1.63,
	1.64 sources, 1.24, 1.25 subdirs-kde-l10n, 1.17, 1.18
Message-ID: <20090805154612.EC87511C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27076/F-10

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	10 Jun 2009 10:52:54 -0000	1.17
+++ .cvsignore	5 Aug 2009 15:46:12 -0000	1.18
@@ -1,236 +1,280 @@
-kde-l10n-bg-4.1.2.tar.bz2
-kde-l10n-ca-4.1.2.tar.bz2
-kde-l10n-cs-4.1.2.tar.bz2
-kde-l10n-csb-4.1.2.tar.bz2
-kde-l10n-da-4.1.2.tar.bz2
-kde-l10n-de-4.1.2.tar.bz2
-kde-l10n-el-4.1.2.tar.bz2
-kde-l10n-en_GB-4.1.2.tar.bz2
-kde-l10n-eo-4.1.2.tar.bz2
-kde-l10n-es-4.1.2.tar.bz2
-kde-l10n-et-4.1.2.tar.bz2
-kde-l10n-fi-4.1.2.tar.bz2
-kde-l10n-fr-4.1.2.tar.bz2
-kde-l10n-fy-4.1.2.tar.bz2
-kde-l10n-ga-4.1.2.tar.bz2
-kde-l10n-gl-4.1.2.tar.bz2
-kde-l10n-hi-4.1.2.tar.bz2
-kde-l10n-hu-4.1.2.tar.bz2
-kde-l10n-it-4.1.2.tar.bz2
-kde-l10n-ja-4.1.2.tar.bz2
-kde-l10n-kk-4.1.2.tar.bz2
-kde-l10n-km-4.1.2.tar.bz2
-kde-l10n-ko-4.1.2.tar.bz2
-kde-l10n-ku-4.1.2.tar.bz2
-kde-l10n-lt-4.1.2.tar.bz2
-kde-l10n-lv-4.1.2.tar.bz2
-kde-l10n-mk-4.1.2.tar.bz2
-kde-l10n-ml-4.1.2.tar.bz2
-kde-l10n-nb-4.1.2.tar.bz2
-kde-l10n-nds-4.1.2.tar.bz2
-kde-l10n-nl-4.1.2.tar.bz2
-kde-l10n-nn-4.1.2.tar.bz2
-kde-l10n-pa-4.1.2.tar.bz2
-kde-l10n-pl-4.1.2.tar.bz2
-kde-l10n-pt-4.1.2.tar.bz2
-kde-l10n-pt_BR-4.1.2.tar.bz2
-kde-l10n-ru-4.1.2.tar.bz2
-kde-l10n-sl-4.1.2.tar.bz2
-kde-l10n-sr-4.1.2.tar.bz2
-kde-l10n-sv-4.1.2.tar.bz2
-kde-l10n-ta-4.1.2.tar.bz2
-kde-l10n-th-4.1.2.tar.bz2
-kde-l10n-tr-4.1.2.tar.bz2
-kde-l10n-uk-4.1.2.tar.bz2
-kde-l10n-wa-4.1.2.tar.bz2
-kde-l10n-zh_CN-4.1.2.tar.bz2
-kde-l10n-zh_TW-4.1.2.tar.bz2
-kde-l10n-bg-4.1.80.tar.bz2
-kde-l10n-ca-4.1.80.tar.bz2
-kde-l10n-cs-4.1.80.tar.bz2
-kde-l10n-csb-4.1.80.tar.bz2
-kde-l10n-da-4.1.80.tar.bz2
-kde-l10n-de-4.1.80.tar.bz2
-kde-l10n-el-4.1.80.tar.bz2
-kde-l10n-en_GB-4.1.80.tar.bz2
-kde-l10n-eo-4.1.80.tar.bz2
-kde-l10n-es-4.1.80.tar.bz2
-kde-l10n-et-4.1.80.tar.bz2
-kde-l10n-fi-4.1.80.tar.bz2
-kde-l10n-fr-4.1.80.tar.bz2
-kde-l10n-fy-4.1.80.tar.bz2
-kde-l10n-ga-4.1.80.tar.bz2
-kde-l10n-gl-4.1.80.tar.bz2
-kde-l10n-hi-4.1.80.tar.bz2
-kde-l10n-hu-4.1.80.tar.bz2
-kde-l10n-it-4.1.80.tar.bz2
-kde-l10n-ja-4.1.80.tar.bz2
-kde-l10n-kk-4.1.80.tar.bz2
-kde-l10n-km-4.1.80.tar.bz2
-kde-l10n-ko-4.1.80.tar.bz2
-kde-l10n-ku-4.1.80.tar.bz2
-kde-l10n-lt-4.1.80.tar.bz2
-kde-l10n-lv-4.1.80.tar.bz2
-kde-l10n-mk-4.1.80.tar.bz2
-kde-l10n-ml-4.1.80.tar.bz2
-kde-l10n-nb-4.1.80.tar.bz2
-kde-l10n-nds-4.1.80.tar.bz2
-kde-l10n-nl-4.1.80.tar.bz2
-kde-l10n-nn-4.1.80.tar.bz2
-kde-l10n-pa-4.1.80.tar.bz2
-kde-l10n-pl-4.1.80.tar.bz2
-kde-l10n-pt-4.1.80.tar.bz2
-kde-l10n-pt_BR-4.1.80.tar.bz2
-kde-l10n-ru-4.1.80.tar.bz2
-kde-l10n-sl-4.1.80.tar.bz2
-kde-l10n-sr-4.1.80.tar.bz2
-kde-l10n-sv-4.1.80.tar.bz2
-kde-l10n-ta-4.1.80.tar.bz2
-kde-l10n-th-4.1.80.tar.bz2
-kde-l10n-tr-4.1.80.tar.bz2
-kde-l10n-uk-4.1.80.tar.bz2
-kde-l10n-wa-4.1.80.tar.bz2
-kde-l10n-zh_CN-4.1.80.tar.bz2
-kde-l10n-zh_TW-4.1.80.tar.bz2
-kde-l10n-bg-4.1.85.tar.bz2
-kde-l10n-ca-4.1.85.tar.bz2
-kde-l10n-cs-4.1.85.tar.bz2
-kde-l10n-csb-4.1.85.tar.bz2
-kde-l10n-da-4.1.85.tar.bz2
-kde-l10n-de-4.1.85.tar.bz2
-kde-l10n-el-4.1.85.tar.bz2
-kde-l10n-en_GB-4.1.85.tar.bz2
-kde-l10n-eo-4.1.85.tar.bz2
-kde-l10n-es-4.1.85.tar.bz2
-kde-l10n-et-4.1.85.tar.bz2
-kde-l10n-fi-4.1.85.tar.bz2
-kde-l10n-fr-4.1.85.tar.bz2
-kde-l10n-fy-4.1.85.tar.bz2
-kde-l10n-ga-4.1.85.tar.bz2
-kde-l10n-gl-4.1.85.tar.bz2
-kde-l10n-hi-4.1.85.tar.bz2
-kde-l10n-hu-4.1.85.tar.bz2
-kde-l10n-it-4.1.85.tar.bz2
-kde-l10n-ja-4.1.85.tar.bz2
-kde-l10n-kk-4.1.85.tar.bz2
-kde-l10n-km-4.1.85.tar.bz2
-kde-l10n-ko-4.1.85.tar.bz2
-kde-l10n-ku-4.1.85.tar.bz2
-kde-l10n-lt-4.1.85.tar.bz2
-kde-l10n-lv-4.1.85.tar.bz2
-kde-l10n-mk-4.1.85.tar.bz2
-kde-l10n-ml-4.1.85.tar.bz2
-kde-l10n-nb-4.1.85.tar.bz2
-kde-l10n-nds-4.1.85.tar.bz2
-kde-l10n-nl-4.1.85.tar.bz2
-kde-l10n-nn-4.1.85.tar.bz2
-kde-l10n-pa-4.1.85.tar.bz2
-kde-l10n-pl-4.1.85.tar.bz2
-kde-l10n-pt-4.1.85.tar.bz2
-kde-l10n-pt_BR-4.1.85.tar.bz2
-kde-l10n-ru-4.1.85.tar.bz2
-kde-l10n-sl-4.1.85.tar.bz2
-kde-l10n-sr-4.1.85.tar.bz2
-kde-l10n-sv-4.1.85.tar.bz2
-kde-l10n-ta-4.1.85.tar.bz2
-kde-l10n-th-4.1.85.tar.bz2
-kde-l10n-tr-4.1.85.tar.bz2
-kde-l10n-uk-4.1.85.tar.bz2
-kde-l10n-wa-4.1.85.tar.bz2
-kde-l10n-zh_CN-4.1.85.tar.bz2
-kde-l10n-zh_TW-4.1.85.tar.bz2
-kde-l10n-bg-4.1.96.tar.bz2
-kde-l10n-ca-4.1.96.tar.bz2
-kde-l10n-cs-4.1.96.tar.bz2
-kde-l10n-csb-4.1.96.tar.bz2
-kde-l10n-da-4.1.96.tar.bz2
-kde-l10n-de-4.1.96.tar.bz2
-kde-l10n-el-4.1.96.tar.bz2
-kde-l10n-en_GB-4.1.96.tar.bz2
-kde-l10n-eo-4.1.96.tar.bz2
-kde-l10n-es-4.1.96.tar.bz2
-kde-l10n-et-4.1.96.tar.bz2
-kde-l10n-fi-4.1.96.tar.bz2
-kde-l10n-fr-4.1.96.tar.bz2
-kde-l10n-fy-4.1.96.tar.bz2
-kde-l10n-ga-4.1.96.tar.bz2
-kde-l10n-gl-4.1.96.tar.bz2
-kde-l10n-hi-4.1.96.tar.bz2
-kde-l10n-hu-4.1.96.tar.bz2
-kde-l10n-it-4.1.96.tar.bz2
-kde-l10n-ja-4.1.96.tar.bz2
-kde-l10n-kk-4.1.96.tar.bz2
-kde-l10n-km-4.1.96.tar.bz2
-kde-l10n-ko-4.1.96.tar.bz2
-kde-l10n-ku-4.1.96.tar.bz2
-kde-l10n-lt-4.1.96.tar.bz2
-kde-l10n-lv-4.1.96.tar.bz2
-kde-l10n-mk-4.1.96.tar.bz2
-kde-l10n-ml-4.1.96.tar.bz2
-kde-l10n-nb-4.1.96.tar.bz2
-kde-l10n-nds-4.1.96.tar.bz2
-kde-l10n-nl-4.1.96.tar.bz2
-kde-l10n-nn-4.1.96.tar.bz2
-kde-l10n-pa-4.1.96.tar.bz2
-kde-l10n-pl-4.1.96.tar.bz2
-kde-l10n-pt-4.1.96.tar.bz2
-kde-l10n-pt_BR-4.1.96.tar.bz2
-kde-l10n-ru-4.1.96.tar.bz2
-kde-l10n-sl-4.1.96.tar.bz2
-kde-l10n-sr-4.1.96.tar.bz2
-kde-l10n-sv-4.1.96.tar.bz2
-kde-l10n-ta-4.1.96.tar.bz2
-kde-l10n-th-4.1.96.tar.bz2
-kde-l10n-tr-4.1.96.tar.bz2
-kde-l10n-uk-4.1.96.tar.bz2
-kde-l10n-wa-4.1.96.tar.bz2
-kde-l10n-zh_CN-4.1.96.tar.bz2
-kde-l10n-zh_TW-4.1.96.tar.bz2
-kde-l10n-bg-4.2.0.tar.bz2
-kde-l10n-ca-4.2.0.tar.bz2
-kde-l10n-cs-4.2.0.tar.bz2
-kde-l10n-csb-4.2.0.tar.bz2
-kde-l10n-da-4.2.0.tar.bz2
-kde-l10n-de-4.2.0.tar.bz2
-kde-l10n-el-4.2.0.tar.bz2
-kde-l10n-en_GB-4.2.0.tar.bz2
-kde-l10n-es-4.2.0.tar.bz2
-kde-l10n-et-4.2.0.tar.bz2
-kde-l10n-fi-4.2.0.tar.bz2
-kde-l10n-fr-4.2.0.tar.bz2
-kde-l10n-ga-4.2.0.tar.bz2
-kde-l10n-gl-4.2.0.tar.bz2
-kde-l10n-hi-4.2.0.tar.bz2
-kde-l10n-hu-4.2.0.tar.bz2
-kde-l10n-it-4.2.0.tar.bz2
-kde-l10n-ja-4.2.0.tar.bz2
-kde-l10n-kk-4.2.0.tar.bz2
-kde-l10n-km-4.2.0.tar.bz2
-kde-l10n-ko-4.2.0.tar.bz2
-kde-l10n-ku-4.2.0.tar.bz2
-kde-l10n-lt-4.2.0.tar.bz2
-kde-l10n-lv-4.2.0.tar.bz2
-kde-l10n-mk-4.2.0.tar.bz2
-kde-l10n-ml-4.2.0.tar.bz2
-kde-l10n-nb-4.2.0.tar.bz2
-kde-l10n-nds-4.2.0.tar.bz2
-kde-l10n-nl-4.2.0.tar.bz2
-kde-l10n-nn-4.2.0.tar.bz2
-kde-l10n-pa-4.2.0.tar.bz2
-kde-l10n-pl-4.2.0.tar.bz2
-kde-l10n-pt-4.2.0.tar.bz2
-kde-l10n-pt_BR-4.2.0.tar.bz2
-kde-l10n-ru-4.2.0.tar.bz2
-kde-l10n-sl-4.2.0.tar.bz2
-kde-l10n-sr-4.2.0.tar.bz2
-kde-l10n-sv-4.2.0.tar.bz2
-kde-l10n-th-4.2.0.tar.bz2
-kde-l10n-tr-4.2.0.tar.bz2
-kde-l10n-uk-4.2.0.tar.bz2
-kde-l10n-wa-4.2.0.tar.bz2
-kde-l10n-zh_CN-4.2.0.tar.bz2
-kde-l10n-zh_TW-4.2.0.tar.bz2
-kde-l10n-ar-4.2.0.tar.bz2
-kde-l10n-eu-4.2.0.tar.bz2
-kde-l10n-he-4.2.0.tar.bz2
-kde-l10n-kn-4.2.4.tar.bz2
+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


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- kde-l10n.spec	10 Jun 2009 10:57:04 -0000	1.63
+++ kde-l10n.spec	5 Aug 2009 15:46:12 -0000	1.64
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.2.4
-Release: 2%{dist}
+Version: 4.3.0
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -74,6 +74,8 @@ Source61: ftp://ftp.kde.org/pub/kde/stab
 
 Source1000: subdirs-kde-l10n
 
+# upstream patches
+
 Requires: kde-filesystem
 
 BuildRequires: kdelibs4-devel >= %{version}
@@ -130,14 +132,15 @@ Provides: %{name}-be = %{version}-%{rele
 %description Belarusian
 Belarusian language support for KDE
 
-%package Bengali
-Summary: Bengali language support for KDE
+%package Bengali-India
+Summary: Bengali India language support for KDE
 Group: User Interface/Desktops
 Requires: kde-filesystem
 Provides: %{name}-bn_IN = %{version}-%{release}
+Obsoletes: %{name}-Bengali
 
-%description Bengali
-Bengali language support for KDE
+%description Bengali-India
+Bengali India language support for KDE
 
 %package Bulgarian
 Summary: Bulgarian language support for KDE
@@ -804,6 +807,8 @@ for i in $(cat %{SOURCE1000}) ; do
   bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
 done
 
+# upstream patches
+
 %build
 for i in $(cat %{SOURCE1000}) ; do
   pushd %{name}-$i-%{version}
@@ -873,56 +878,68 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root)
-%lang(af) %{_datadir}/locale/af/*
+%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
+%lang(af) %{_datadir}/locale/af/entry.desktop
 %endif
 
 %files Arabic
 %defattr(-,root,root)
-%lang(ar) %{_datadir}/locale/ar/*
+%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
+%lang(ar) %{_datadir}/locale/ar/entry.desktop
+%lang(ar) %{_datadir}/locale/ar/LC_SCRIPTS/
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
 
 %if %{buildall}
 %files Azerbaijani
 %defattr(-,root,root)
-%lang(az) %{_datadir}/locale/az/*
+%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
+%lang(az) %{_datadir}/locale/az/entry.desktop
 %endif
 
 %if %{buildall}
 %files Belarusian
 %defattr(-,root,root)
-%lang(be) %{_datadir}/locale/be/*
+%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
+%lang(be) %{_datadir}/locale/be/entry.desktop
 %endif
 
 %files Bulgarian
 %defattr(-,root,root)
-%lang(bg) %{_datadir}/locale/bg/*
+%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+%lang(bg) %{_datadir}/locale/bg/entry.desktop
 %lang(bg) %{_kde4_appsdir}/kvtml/bg
 
-%files Bengali
+%files Bengali-India
 %defattr(-,root,root)
-%lang(bn_IN) %{_datadir}/locale/bn_IN/*
+%lang(bn_IN) %{_datadir}/locale/bn_IN/LC_MESSAGES/*
+%lang(bn_IN) %{_datadir}/locale/bn_IN/entry.desktop
 
 %if %{buildall}
 %files Tibetan
 %defattr(-,root,root)
-%lang(bo) %{_datadir}/locale/bo/*
+%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
+%lang(bo) %{_datadir}/locale/bo/entry.desktop
 %endif
 
 %if %{buildall}
 %files Breton
 %defattr(-,root,root)
-%lang(br) %{_datadir}/locale/br/*
+%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+%lang(br) %{_datadir}/locale/br/entry.desktop
 %endif
 
 %if %{buildall}
 %files Bosnian
 %defattr(-,root,root)
-%lang(bs) %{_datadir}/locale/bs/*
+%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
+%lang(bs) %{_datadir}/locale/bs/entry.desktop
 %endif
 
 %files Catalan
 %defattr(-,root,root)
-%lang(ca) %{_datadir}/locale/ca/*
+%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
+%lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
+%lang(ca) %{_datadir}/locale/ca/entry.desktop
 %lang(ca) %{_kde4_appsdir}/khangman/ca.txt
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
@@ -931,7 +948,8 @@ rm -rf %{buildroot}
 
 %files Czech
 %defattr(-,root,root)
-%lang(cs) %{_datadir}/locale/cs/*
+%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cs) %{_datadir}/locale/cs/entry.desktop
 %lang(cs) %{_kde4_appsdir}/khangman/cs.txt
 %lang(cs) %{_kde4_appsdir}/klettres/cs
 %lang(cs) %{_kde4_appsdir}/kvtml/cs
@@ -940,12 +958,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Welsh
 %defattr(-,root,root)
-%lang(cy) %{_datadir}/locale/cy/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/entry.desktop
 %endif
 
 %files Danish
 %defattr(-,root,root)
-%lang(da) %{_datadir}/locale/da/*
+%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+%lang(da) %{_datadir}/locale/da/entry.desktop
 %lang(da) %{_kde4_appsdir}/ktuberling/sounds/da*
 %lang(da) %{_kde4_appsdir}/khangman/da.txt
 %lang(da) %{_kde4_appsdir}/klettres/da
@@ -955,7 +975,9 @@ rm -rf %{buildroot}
 
 %files German
 %defattr(-,root,root)
-%lang(de) %{_datadir}/locale/de/*
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
+%lang(de) %{_datadir}/locale/de/LC_SCRIPTS/
+%lang(de) %{_datadir}/locale/de/entry.desktop
 %lang(de) %{_kde4_appsdir}/klettres/de
 %lang(de) %{_kde4_appsdir}/ktuberling/sounds/de*
 %lang(de) %{_kde4_appsdir}/khangman/de.txt
@@ -966,16 +988,19 @@ rm -rf %{buildroot}
 
 %files Greek
 %defattr(-,root,root)
-%lang(el) %{_datadir}/locale/el/*
+%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
+%lang(el) %{_datadir}/locale/el/entry.desktop
 %lang(el) %{_kde4_appsdir}/kvtml/el
 
 %files Gujarati
 %defattr(-,root,root)
-%lang(gu) %{_datadir}/locale/gu/*
+%lang(gu) %{_datadir}/locale/gu/LC_MESSAGES/*
+%lang(gu) %{_datadir}/locale/gu/entry.desktop
 
 %files British
 %defattr(-,root,root)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
+%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+%lang(en_GB) %{_datadir}/locale/en_GB/entry.desktop
 %lang(en_GB) %{_kde4_appsdir}/klettres/en_GB
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
@@ -986,12 +1011,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Esperanto
 %defattr(-,root,root)
-%lang(eo) %{_datadir}/locale/eo/*
+%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+%lang(eo) %{_datadir}/locale/eo/entry.desktop
 %endif
 
 %files Spanish
 %defattr(-,root,root)
-%lang(es) %{_datadir}/locale/es/*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
+%lang(es) %{_datadir}/locale/es/entry.desktop
 %lang(es) %{_kde4_appsdir}/ktuberling/sounds/es*
 #%lang(es) %{_kde4_appsdir}/khangman/data/es
 %lang(es) %{_kde4_appsdir}/khangman/es.txt
@@ -1002,7 +1029,8 @@ rm -rf %{buildroot}
 
 %files Estonian
 %defattr(-,root,root)
-%lang(et) %{_datadir}/locale/et/*
+%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
+%lang(et) %{_datadir}/locale/et/entry.desktop
 %lang(et) %{_kde4_appsdir}/khangman/et.txt
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
@@ -1010,17 +1038,20 @@ rm -rf %{buildroot}
 
 %files Basque
 %defattr(-,root,root)
-%lang(eu) %{_datadir}/locale/eu/*
+%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+%lang(eu) %{_datadir}/locale/eu/entry.desktop
 
 %if %{buildall}
 %files Farsi
 %defattr(-,root,root)
-%lang(fa) %{_datadir}/locale/fa/*
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+%lang(fa) %{_datadir}/locale/fa/entry.desktop
 %endif
 
 %files Finnish
 %defattr(-,root,root)
-%lang(fi) %{_datadir}/locale/fi/*
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+%lang(fi) %{_datadir}/locale/fi/entry.desktop
 %lang(fi) %{_kde4_appsdir}/khangman/fi.txt
 %lang(fi) %{_kde4_appsdir}/ktuberling/sounds/fi*
 %lang(fi) %{_kde4_appsdir}/kvtml/fi
@@ -1028,12 +1059,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Faroese
 %defattr(-,root,root)
-%lang(fo) %{_datadir}/locale/fo/*
+%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
+%lang(fo) %{_datadir}/locale/fo/entry.desktop
 %endif
 
 %files French
 %defattr(-,root,root)
-%lang(fr) %{_datadir}/locale/fr/*
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
+%lang(fr) %{_datadir}/locale/fr/entry.desktop
 %lang(fr) %{_kde4_appsdir}/ktuberling/sounds/fr*
 %lang(fr) %{_kde4_appsdir}/khangman/fr.txt
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
@@ -1043,18 +1076,23 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Frisian
 %defattr(-,root,root)
-%lang(fy) %{_datadir}/locale/fy/*
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/entry.desktop
 %endif
 
 %files Irish
 %defattr(-,root,root)
-%lang(ga) %{_datadir}/locale/ga/*
+%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(ga) %{_datadir}/locale/ga/LC_SCRIPTS/
+%lang(ga) %{_datadir}/locale/ga/entry.desktop
 %lang(ga) %{_kde4_appsdir}/khangman/ga.txt
+%lang(ga) %{_kde4_appsdir}/ktuberling/sounds/ga*
 %lang(ga) %{_kde4_appsdir}/kvtml/ga
 
 %files Galician
 %defattr(-,root,root)
-%lang(gl) %{_datadir}/locale/gl/*
+%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
+%lang(gl) %{_datadir}/locale/gl/entry.desktop
 %lang(gl) %{_kde4_appsdir}/kvtml/gl
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
@@ -1063,22 +1101,26 @@ rm -rf %{buildroot}
 
 %files Hebrew
 %defattr(-,root,root)
-%lang(he) %{_datadir}/locale/he/*
+%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+%lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_kde4_appsdir}/klettres/he
 
 %files Hindi
 %defattr(-,root,root)
-%lang(hi) %{_datadir}/locale/hi/*
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+%lang(hi) %{_datadir}/locale/hi/entry.desktop
 
 %if %{buildall}
 %files Croatian
 %defattr(-,root,root)
-%lang(hr) %{_datadir}/locale/hr/*
+%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
+%lang(hr) %{_datadir}/locale/hr/entry.desktop
 %endif
 
 %files Hungarian
 %defattr(-,root,root)
-%lang(hu) %{_datadir}/locale/hu/*
+%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+%lang(hu) %{_datadir}/locale/hu/entry.desktop
 %lang(hu) %{_kde4_appsdir}/khangman/hu.txt
 %lang(hu) %{_kde4_appsdir}/kvtml/hu
 %lang(hu) %{_kde4_appsdir}/klettres/hu
@@ -1087,16 +1129,19 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Indonesian
 %defattr(-,root,root)
-%lang(id) %{_datadir}/locale/id/*
+%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
+%lang(id) %{_datadir}/locale/id/entry.desktop
 %endif
 
 %files Icelandic
 %defattr(-,root,root)
-%lang(is) %{_datadir}/locale/is/*
+%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
+%lang(is) %{_datadir}/locale/is/entry.desktop
 
 %files Italian
 %defattr(-,root,root)
-%lang(it) %{_datadir}/locale/it/*
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
+%lang(it) %{_datadir}/locale/it/entry.desktop
 %lang(it) %{_kde4_appsdir}/ktuberling/sounds/it*
 %lang(it) %{_kde4_appsdir}/klettres/it
 %lang(it) %{_kde4_appsdir}/kvtml/it
@@ -1106,48 +1151,60 @@ rm -rf %{buildroot}
 
 %files Japanese
 %defattr(-,root,root)
-%lang(ja) %{_datadir}/locale/ja/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/LC_SCRIPTS/
+%lang(ja) %{_datadir}/locale/ja/entry.desktop
 %lang(ja) %{_kde4_docdir}/HTML/ja
 
 %files Kannada
 %defattr(-,root,root)
-%lang(kn) %{_datadir}/locale/kn/*
+%lang(kn) %{_datadir}/locale/kn/LC_MESSAGES/*
+%lang(kn) %{_datadir}/locale/kn/entry.desktop
 
 %files Kashubian
 %defattr(-,root,root)
-%lang(csb) %{_datadir}/locale/csb/*
+%lang(csb) %{_datadir}/locale/csb/LC_MESSAGES/*
+%lang(csb) %{_datadir}/locale/csb/entry.desktop
 
 %files Kazakh
 %defattr(-,root,root)
-%lang(kk) %{_datadir}/locale/kk/*
+%lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
+%lang(kk) %{_datadir}/locale/kk/entry.desktop
 
 %files Khmer
 %defattr(-,root,root)
-%lang(km) %{_datadir}/locale/km/*
+%lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
+%lang(km) %{_datadir}/locale/km/entry.desktop
 
 %files Korean
 %defattr(-,root,root)
-%lang(ko) %{_datadir}/locale/ko/*
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
+%lang(ko) %{_datadir}/locale/ko/LC_SCRIPTS/
+%lang(ko) %{_datadir}/locale/ko/entry.desktop
 %lang(ko) %{_kde4_docdir}/HTML/ko/
 
 %files Kurdish
 %defattr(-,root,root)
-%lang(ku) %{_datadir}/locale/ku/*
+%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
+%lang(ku) %{_datadir}/locale/ku/entry.desktop
 
 %if %{buildall}
 %files Lao
 %defattr(-,root,root)
-%lang(lo) %{_datadir}/locale/lo/*
+%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
+%lang(lo) %{_datadir}/locale/lo/entry.desktop
 %endif
 
 %files Lithuanian
 %defattr(-,root,root)
-%lang(lt) %{_datadir}/locale/lt/*
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lt) %{_datadir}/locale/lt/entry.desktop
 %lang(lt) %{_kde4_docdir}/HTML/lt/
 
 %files LowSaxon
 %defattr(-,root,root)
-%lang(nds) %{_datadir}/locale/nds/*
+%lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/*
+%lang(nds) %{_datadir}/locale/nds/entry.desktop
 %lang(nds) %{_kde4_appsdir}/klettres/nds
 %lang(nds) %{_kde4_appsdir}/khangman/nds.txt
 %lang(nds) %{_kde4_appsdir}/kvtml/nds
@@ -1157,46 +1214,57 @@ rm -rf %{buildroot}
 
 %files Latvian
 %defattr(-,root,root)
-%lang(lv) %{_datadir}/locale/lv/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/entry.desktop
 
 %if %{buildall}
 %files Maori
 %defattr(-,root,root)
-%lang(mi) %{_datadir}/locale/mi/*
+%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
+%lang(mi) %{_datadir}/locale/mi/entry.desktop
 %endif
 
 %files Macedonian
 %defattr(-,root,root)
-%lang(mk) %{_datadir}/locale/mk/*
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(mk) %{_datadir}/locale/mk/entry.desktop
 
 %files Maithili
 %defattr(-,root,root)
-%lang(mai) %{_datadir}/locale/mai/*
+%lang(mai) %{_datadir}/locale/mai/LC_MESSAGES/*
+%lang(mai) %{_datadir}/locale/mai/entry.desktop
 
 %files Marathi
 %defattr(-,root,root)
-%lang(mr) %{_datadir}/locale/mr/*
+%lang(mr) %{_datadir}/locale/mr/LC_MESSAGES/*
+%lang(mr) %{_datadir}/locale/mr/entry.desktop
 
 %files Malayalam
 %defattr(-,root,root)
-%lang(ml) %{_datadir}/locale/ml/*
+%lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
+%lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
+%lang(ml) %{_datadir}/locale/ml/entry.desktop
 %lang(ml) %{_kde4_appsdir}/klettres/ml/
 
 %if %{buildall}
 %files Maltese
 %defattr(-,root,root)
-%lang(mt) %{_datadir}/locale/mt/*
+%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
+%lang(mt) %{_datadir}/locale/mt/entry.desktop
 %endif
 
 %if %{buildall}
 %files Nepali
 %defattr(-,root,root)
-%lang(ne) %{_datadir}/locale/ne/*
+%lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
+%lang(ne) %{_datadir}/locale/ne/entry.desktop
 %endif
 
 %files Dutch
 %defattr(-,root,root)
-%lang(nl) %{_datadir}/locale/nl/*
+%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %{_datadir}/locale/nl/LC_SCRIPTS/
+%lang(nl) %{_datadir}/locale/nl/entry.desktop
 %lang(nl) %{_kde4_appsdir}/ktuberling/sounds/nl*
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
@@ -1209,12 +1277,15 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files NorthernSami
 %defattr(-,root,root)
-%lang(se) %{_datadir}/locale/se/*
+%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
+%lang(se) %{_datadir}/locale/se/entry.desktop
 %endif
 
 %files Norwegian
 %defattr(-,root,root)
-%lang(nb) %{_datadir}/locale/nb/*
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_datadir}/locale/nb/LC_SCRIPTS/
+%lang(nb) %{_datadir}/locale/nb/entry.desktop
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
@@ -1226,7 +1297,9 @@ rm -rf %{buildroot}
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
-%lang(nn) %{_datadir}/locale/nn/*
+%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
+%lang(nn) %{_datadir}/locale/nn/LC_SCRIPTS/
+%lang(nn) %{_datadir}/locale/nn/entry.desktop
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
 %lang(nn) %{_kde4_appsdir}/kvtml/nn/
 %lang(nn) %{_kde4_docdir}/HTML/nn
@@ -1235,23 +1308,28 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Occitan
 %defattr(-,root,root)
-%lang(oc) %{_datadir}/locale/oc/*
+%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
+%lang(oc) %{_datadir}/locale/oc/entry.desktop
 %endif
 
 %files Punjabi
 %defattr(-,root,root)
-%lang(pa) %{_datadir}/locale/pa/*
+%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
+%lang(pa) %{_datadir}/locale/pa/entry.desktop
 
 %files Polish
 %defattr(-,root,root)
-%lang(pl) %{_datadir}/locale/pl/*
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
+%lang(pl) %{_datadir}/locale/pl/LC_SCRIPTS/
+%lang(pl) %{_datadir}/locale/pl/entry.desktop
 %lang(pl) %{_kde4_appsdir}/khangman/pl.txt
 %lang(pl) %{_kde4_appsdir}/kvtml/pl
 %lang(pl) %{_kde4_docdir}/HTML/pl
 
 %files Portuguese
 %defattr(-,root,root)
-%lang(pt) %{_datadir}/locale/pt/*
+%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
+%lang(pt) %{_datadir}/locale/pt/entry.desktop
 %lang(pt) %{_kde4_appsdir}/khangman/pt.txt
 %lang(pt) %{_kde4_appsdir}/ktuberling/sounds/pt*
 %lang(pt) %{_kde4_appsdir}/kvtml/pt
@@ -1260,26 +1338,26 @@ rm -rf %{buildroot}
 
 %files Brazil
 %defattr(-,root,root)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/entry.desktop
 %lang(pt_BR) %{_kde4_appsdir}/khangman/pt_BR.txt
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
-%lang(pt_BR) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.pt_BR.xml
-%lang(pt_BR) %{_kde4_appsdir}/kturtle/data/logokeywords.pt_BR.xml
-%lang(pt_BR) %{_kde4_appsdir}/kturtle/examples/pt_BR/*.logo
 %lang(pt_BR) %{_mandir}/pt_BR/*/*
 
 %files Romanian
 %defattr(-,root,root)
-%lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
+%lang(ro) %{_datadir}/locale/ro/entry.desktop
 %lang(ro) %{_kde4_appsdir}/kvtml/ro
 %lang(ro) %{_kde4_appsdir}/ktuberling/sounds/ro*
 %lang(ro) %{_kde4_docdir}/HTML/ro
 
 %files Russian
 %defattr(-,root,root)
-%lang(ru) %{_datadir}/locale/ru/*
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_datadir}/locale/ru/entry.desktop
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
 %lang(ru) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.ru.xml
@@ -1289,13 +1367,15 @@ rm -rf %{buildroot}
 
 %files Slovak
 %defattr(-,root,root)
-%lang(sk) %{_datadir}/locale/sk/*
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+%lang(sk) %{_datadir}/locale/sk/entry.desktop
 #%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
 #%lang(sk) %{_kde4_appsdir}/klettres/sk
 
 %files Slovenian
 %defattr(-,root,root)
-%lang(sl) %{_datadir}/locale/sl/*
+%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%lang(sl) %{_datadir}/locale/sl/entry.desktop
 %lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
 %lang(sl) %{_kde4_appsdir}/khangman/sl.txt
 %lang(sl) %{_kde4_appsdir}/kvtml/sl
@@ -1306,7 +1386,9 @@ rm -rf %{buildroot}
 
 %files Serbian
 %defattr(-,root,root)
-%lang(sr) %{_datadir}/locale/sr/*
+%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr/LC_SCRIPTS/
+%lang(sr) %{_datadir}/locale/sr/entry.desktop
 %lang(sr) %{_kde4_appsdir}/ktuberling/sounds/sr*
 %lang(sr) %{_kde4_docdir}/HTML/sr
 %lang(sr) %{_kde4_docdir}/HTML/sr at latin
@@ -1317,12 +1399,16 @@ rm -rf %{buildroot}
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
 %lang(sr) %{_kde4_appsdir}/kvtml/sr*
-%lang(sr) %{_datadir}/locale/sr at latin/*
-%lang(sr) %{_mandir}/sr*/man1/*
+%lang(sr) %{_datadir}/locale/sr at latin/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr at latin/entry.desktop
+%lang(sr) %{_mandir}/sr/*/*
+%lang(sr) %{_mandir}/sr at latin/*/*
 
 %files Swedish
 %defattr(-,root,root)
-%lang(sv) %{_datadir}/locale/sv/*
+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
+%lang(sv) %{_datadir}/locale/sv/entry.desktop
+%lang(sv) %{_datadir}/locale/sv/LC_SCRIPTS/
 %lang(sv) %{_kde4_appsdir}/ktuberling/sounds/sv*
 %lang(sv) %{_kde4_appsdir}/khangman/sv.txt
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
@@ -1332,29 +1418,36 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Tamil
 %defattr(-,root,root)
-%lang(ta) %{_datadir}/locale/ta/*
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(ta) %{_datadir}/locale/ta/entry.desktop
 %endif
 
 %files Tajik
 %defattr(-,root,root)
-%lang(tg) %{_datadir}/locale/tg/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/entry.desktop
 %lang(tg) %{_kde4_appsdir}/kvtml/tg
 %lang(tg) %{_kde4_appsdir}/khangman/tg.txt
 
 %files Thai
 %defattr(-,root,root)
-%lang(th) %{_datadir}/locale/th/*
+%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
+%lang(th) %{_datadir}/locale/th/charset
+%lang(th) %{_datadir}/locale/th/entry.desktop
 
 %files Turkish
 %defattr(-,root,root)
-%lang(tr) %{_datadir}/locale/tr/*
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+%lang(tr) %{_datadir}/locale/tr/entry.desktop
 %lang(tr) %{_kde4_appsdir}/khangman/tr.txt
 %lang(tr) %{_kde4_appsdir}/kvtml/tr
 %lang(tr) %{_kde4_docdir}/HTML/tr
 
 %files Ukrainian
 %defattr(-,root,root)
-%lang(uk) %{_datadir}/locale/uk/*
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_datadir}/locale/uk/LC_SCRIPTS/
+%lang(uk) %{_datadir}/locale/uk/entry.desktop
 %lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk*
 %lang(uk) %{_kde4_appsdir}/kvtml/uk
 %lang(uk) %{_kde4_docdir}/HTML/uk
@@ -1363,47 +1456,68 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Venda
 %defattr(-,root,root)
-%lang(ven) %{_datadir}/locale/ven/*
+%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
+%lang(ven) %{_datadir}/locale/ven/entry.desktop
 %endif
 
 %if %{buildall}
 %files Vietnamese
 %defattr(-,root,root)
-%lang(vi) %{_datadir}/locale/vi/*
+%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
+%lang(vi) %{_datadir}/locale/vi/entry.desktop
 %endif
 
 %files Walloon
 %defattr(-,root,root)
-%lang(wa) %{_datadir}/locale/wa/*
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
+%lang(wa) %{_datadir}/locale/wa/entry.desktop
+%lang(wa) %{_kde4_appsdir}/ktuberling/sounds/wa*
 %lang(wa) %{_kde4_docdir}/HTML/wa
 
 %if %{buildall}
 %files Xhosa
 %defattr(-,root,root)
-%lang(xh) %{_datadir}/locale/xh/*
+%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
+%lang(xh) %{_datadir}/locale/xh/entry.desktop
 %endif
 
 %files Chinese
 %defattr(-,root,root)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_SCRIPTS/
+%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
+%lang(zh_CN) %{_datadir}/locale/zh_CN/entry.desktop
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
 %lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
 %lang(zh_CN) %{_kde4_docdir}/HTML/zh_CN
 
 %files Chinese-Traditional
 %defattr(-,root,root)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
-* Wed Jun 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- add omitted Kannada
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Tue Jul 14 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.2.95-2
+- fix duplicate directory ownership (/usr/share/locale/*/LC_MESSAGES)
 
-* Sat Jun 06 2009 Than Ngo <than at redhat.com> - 4.2.4-1
-- 4.2.4
+* Tue Jun 30 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Tue May 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Mar 31 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Jun 2009 10:52:54 -0000	1.24
+++ sources	5 Aug 2009 15:46:12 -0000	1.25
@@ -1,56 +1,56 @@
-63f899e898f0dbbb549a14ca560350a0  kde-l10n-ar-4.2.4.tar.bz2
-04352d8c1e6820505adf230ef582326a  kde-l10n-bg-4.2.4.tar.bz2
-8541726ab77ae698e7d917021513150d  kde-l10n-bn_IN-4.2.4.tar.bz2
-6d90c8a58ef21cc84fbde5034abcdfd2  kde-l10n-ca-4.2.4.tar.bz2
-c528e407bc177d8cc8f07900942ed98a  kde-l10n-cs-4.2.4.tar.bz2
-b63dfbfa73b7fd0cb6b86652ec0a115d  kde-l10n-csb-4.2.4.tar.bz2
-39cdd4d26781d2af6528316f924dd2f9  kde-l10n-da-4.2.4.tar.bz2
-2f1185db36349a14a600ec58656c82ec  kde-l10n-de-4.2.4.tar.bz2
-8cec4b527e64f11698217029413730ab  kde-l10n-el-4.2.4.tar.bz2
-7598465393f948243f9da0252620ba93  kde-l10n-en_GB-4.2.4.tar.bz2
-dbe304dbadf6d03dfb73bc8577c603d6  kde-l10n-es-4.2.4.tar.bz2
-313999a61733d722324b4e899d8fecdd  kde-l10n-et-4.2.4.tar.bz2
-d1744798414c697683f35f4eb800801d  kde-l10n-eu-4.2.4.tar.bz2
-7d9d0e64d741c7c74917161336ccd982  kde-l10n-fi-4.2.4.tar.bz2
-0da9b56a0bc2a0cbb113974a365f0350  kde-l10n-fr-4.2.4.tar.bz2
-4c5f9d3c1f5c4514af509b9989186548  kde-l10n-ga-4.2.4.tar.bz2
-e1e3031948ff689b83f7e7f192ccda3c  kde-l10n-gl-4.2.4.tar.bz2
-17f0f8c638932e3cc757b99e0f70de9f  kde-l10n-gu-4.2.4.tar.bz2
-7b8e776c0a308c50749ae5a4e66e6caa  kde-l10n-he-4.2.4.tar.bz2
-65854d31de0eadd32680a2c03c0644f9  kde-l10n-hi-4.2.4.tar.bz2
-9c0e191bc9d1d6e53d400611f3b7817c  kde-l10n-hu-4.2.4.tar.bz2
-490b1de7f603cd070a17f2a91b120f6b  kde-l10n-is-4.2.4.tar.bz2
-b32ebadc4ec0c02202db7a6b7431b78d  kde-l10n-it-4.2.4.tar.bz2
-756f92c06b8cb013e4fc0ee6a8388465  kde-l10n-ja-4.2.4.tar.bz2
-3d8f1c7f64a950b2370bfc695a8dca3d  kde-l10n-kk-4.2.4.tar.bz2
-81559bf93f7fc0e7a776dc5021393846  kde-l10n-km-4.2.4.tar.bz2
-0604120363f244fb9f6a9f52b28e9cd3  kde-l10n-ko-4.2.4.tar.bz2
-3861b5ed7bc1281f8e7dc7b3898b3cfb  kde-l10n-ku-4.2.4.tar.bz2
-18a4848bb2e191995219bcb43d05692d  kde-l10n-lt-4.2.4.tar.bz2
-2d387abb28a3309d09060c18217b6eac  kde-l10n-lv-4.2.4.tar.bz2
-458e575aff53d9ee7e71c362a5414f22  kde-l10n-mai-4.2.4.tar.bz2
-feebd0b5db522c87d9206583db7c737d  kde-l10n-mk-4.2.4.tar.bz2
-e9d4bc43113e74040e59a7fbc4e751a9  kde-l10n-ml-4.2.4.tar.bz2
-5d1b6b899093994f81827d4f218f7c06  kde-l10n-mr-4.2.4.tar.bz2
-d01bca94aa6eef4add56af21b8a7c1d9  kde-l10n-nb-4.2.4.tar.bz2
-ded46915af415c47b8c449ab36261298  kde-l10n-nds-4.2.4.tar.bz2
-77aef34bf6e2993e95fa043a6e4d884d  kde-l10n-nl-4.2.4.tar.bz2
-8efa6f0754c7c03751bdb64a00702955  kde-l10n-nn-4.2.4.tar.bz2
-d2eac659c14a3feeba3021f4268ac7ca  kde-l10n-pa-4.2.4.tar.bz2
-6749341a81d7807e326ce954b197b3e5  kde-l10n-pl-4.2.4.tar.bz2
-c364a53f7409ebc1f9fde2e9eeecd8b5  kde-l10n-pt-4.2.4.tar.bz2
-a1b1f1dc212ca772977488cc89ef9932  kde-l10n-pt_BR-4.2.4.tar.bz2
-0a8c80367b875602f6c45dd7468da11a  kde-l10n-ro-4.2.4.tar.bz2
-d18ed35c1ff28ba2ee493fde9750210d  kde-l10n-ru-4.2.4.tar.bz2
-59fbfc7bf835dfbd04458e5ddc5629a1  kde-l10n-sk-4.2.4.tar.bz2
-89042687ac864b2edbfc88de0250940f  kde-l10n-sl-4.2.4.tar.bz2
-9d50b526065a2d98e9614260673f99c2  kde-l10n-sr-4.2.4.tar.bz2
-b70552996f20bf629531420fbf9bf9d1  kde-l10n-sv-4.2.4.tar.bz2
-39f5305b0a3d3d54fb503a7c4723e8b9  kde-l10n-tg-4.2.4.tar.bz2
-5164f4a21632fa1a065a9cc68409e1b1  kde-l10n-th-4.2.4.tar.bz2
-73996436690460bb7cbd77862bcb7350  kde-l10n-tr-4.2.4.tar.bz2
-f69f121a0abc6129ec8e2f5bca171623  kde-l10n-uk-4.2.4.tar.bz2
-402f19e737e56855bb3dfbbb240b891c  kde-l10n-wa-4.2.4.tar.bz2
-373ef1ab6e56d063982c0e53b575ad3e  kde-l10n-zh_CN-4.2.4.tar.bz2
-b1e8f50ea643b4ed8115d5c3257792cd  kde-l10n-zh_TW-4.2.4.tar.bz2
-8b875d82ff0cb84a607e85e319a7bc33  kde-l10n-kn-4.2.4.tar.bz2
+97be5e3b2f06b86dcd2a3bdc4a9db55c  kde-l10n-ar-4.3.0.tar.bz2
+fb0a71d21cf32e48a28916d365b4cd96  kde-l10n-bg-4.3.0.tar.bz2
+26164201b1d8b6c922385353f2a7aefb  kde-l10n-bn_IN-4.3.0.tar.bz2
+1f9e2f387083be475ec995c0e965b1cf  kde-l10n-ca-4.3.0.tar.bz2
+f19c3a3bfae24f4caf98a40f6bed7463  kde-l10n-csb-4.3.0.tar.bz2
+8d8ec27742416e134b2990abbd9af14b  kde-l10n-cs-4.3.0.tar.bz2
+b81c512af946a1e365c2eada3d82e4e0  kde-l10n-da-4.3.0.tar.bz2
+c7ca5df8998b4ae0977bc706db86d89f  kde-l10n-de-4.3.0.tar.bz2
+24b9e6117c254a7eb42bb7ac3ee5956e  kde-l10n-el-4.3.0.tar.bz2
+1596bbb2848517bba0cf50854de47e89  kde-l10n-en_GB-4.3.0.tar.bz2
+34dc196b2395e3a3223346cf2dafde5a  kde-l10n-es-4.3.0.tar.bz2
+aeb0683e93853f67c50ba2fcd1e4a41c  kde-l10n-et-4.3.0.tar.bz2
+f513bfa2c570f733bb36279b06d96136  kde-l10n-eu-4.3.0.tar.bz2
+dc151141386e6e1af9dc2b405dd8a9d9  kde-l10n-fi-4.3.0.tar.bz2
+faa1b6b4d9640c9a45f0e86a5af64091  kde-l10n-fr-4.3.0.tar.bz2
+145deb5a130537b5abd8c75c316f88a5  kde-l10n-ga-4.3.0.tar.bz2
+fde9f9726edf1ba1a32302ea285a1bf5  kde-l10n-gl-4.3.0.tar.bz2
+fdda752dc37f1957662c8c8eb5fb581c  kde-l10n-gu-4.3.0.tar.bz2
+f6ca255a2759ac90a1dbef609d0f173e  kde-l10n-he-4.3.0.tar.bz2
+ad1bd358a3bf4a515e95607edfdde4c9  kde-l10n-hi-4.3.0.tar.bz2
+ba442f81bc3ed72710e5ea1c44c2949d  kde-l10n-hu-4.3.0.tar.bz2
+40e82eea13e31644bf3982ab56595d18  kde-l10n-is-4.3.0.tar.bz2
+7974d9d51286c0bbe3ce9201cea05372  kde-l10n-it-4.3.0.tar.bz2
+e0bc5aecab2dab8a32a7a379c3bda98c  kde-l10n-ja-4.3.0.tar.bz2
+c007430e5839c943c27d2c08a3271c01  kde-l10n-kk-4.3.0.tar.bz2
+4cde7eb586388fb3268aecc901c2f297  kde-l10n-km-4.3.0.tar.bz2
+e08b0161309fc03c0178a357f45c38e0  kde-l10n-kn-4.3.0.tar.bz2
+9a10bf30852acd34040c6fa8fcf1bc27  kde-l10n-ko-4.3.0.tar.bz2
+80dbde92c9cc2a3b18ddc8f8e6bf6228  kde-l10n-ku-4.3.0.tar.bz2
+0f7d011ce2e22f92e7e814445cf6ff97  kde-l10n-lt-4.3.0.tar.bz2
+e097c2d2be217ae29cb769504356281c  kde-l10n-lv-4.3.0.tar.bz2
+2eda87bfb1490736fc0bd245177b015e  kde-l10n-mai-4.3.0.tar.bz2
+853109465d2dc4031f0cd729775cca55  kde-l10n-mk-4.3.0.tar.bz2
+953f5f1d4cbb785cc4d8ef4a488c6661  kde-l10n-ml-4.3.0.tar.bz2
+c8d80300e921f31eca1ab8ea1de85ceb  kde-l10n-mr-4.3.0.tar.bz2
+cfe753a7bebfda9f5f6f25399d8dad0c  kde-l10n-nb-4.3.0.tar.bz2
+b7b453507e58788503835fec4eddd5a9  kde-l10n-nds-4.3.0.tar.bz2
+9118bfb78b280b0228f4f299420f98ea  kde-l10n-nl-4.3.0.tar.bz2
+f6863912c5d4d326097e1f995299dbc1  kde-l10n-nn-4.3.0.tar.bz2
+a533709989a31c15600ddf9a3e3a7301  kde-l10n-pa-4.3.0.tar.bz2
+25fb4028a7bb2000b06363e23efec62d  kde-l10n-pl-4.3.0.tar.bz2
+0020f01a730b5511712a89e13a1d4d76  kde-l10n-pt_BR-4.3.0.tar.bz2
+257a995ca6c0adaab8024445dbce848f  kde-l10n-pt-4.3.0.tar.bz2
+f29614843f53950f87efe76fdb05d3d1  kde-l10n-ro-4.3.0.tar.bz2
+5bc404cea173009d5a817685ca61bcad  kde-l10n-ru-4.3.0.tar.bz2
+24945e807ad3703f546a7f6787cb0345  kde-l10n-sk-4.3.0.tar.bz2
+02117baab6317032245d6ae9f958eb45  kde-l10n-sl-4.3.0.tar.bz2
+26338c314a2a3da58f93e8f606b185c2  kde-l10n-sr-4.3.0.tar.bz2
+7499b0fb6ddbb10c2f2e0fb0e88cb097  kde-l10n-sv-4.3.0.tar.bz2
+539ee71a082043ba788bf6c18a75d7d2  kde-l10n-tg-4.3.0.tar.bz2
+2c5dd52012d3e21eaefde4211bee2d1c  kde-l10n-th-4.3.0.tar.bz2
+0d163e01436737a8f4b74d99527997a2  kde-l10n-tr-4.3.0.tar.bz2
+43be454febc2f9ca48b66fd5ce057898  kde-l10n-uk-4.3.0.tar.bz2
+76bc9dbac978806a7cd73a53fdbe8b69  kde-l10n-wa-4.3.0.tar.bz2
+7d0ddb25d6f6e21858b7811bfbd61458  kde-l10n-zh_CN-4.3.0.tar.bz2
+ce2a8abf6d8a43a4823ba2e19ad05649  kde-l10n-zh_TW-4.3.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/subdirs-kde-l10n,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- subdirs-kde-l10n	10 Jun 2009 10:52:54 -0000	1.17
+++ subdirs-kde-l10n	5 Aug 2009 15:46:12 -0000	1.18
@@ -2,8 +2,8 @@ ar
 bg
 bn_IN
 ca
-cs
 csb
+cs
 da
 de
 el
@@ -39,8 +39,8 @@ nl
 nn
 pa
 pl
-pt
 pt_BR
+pt
 ro
 ru
 sk



From berrange at fedoraproject.org  Wed Aug  5 15:48:14 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed,  5 Aug 2009 15:48:14 +0000 (UTC)
Subject: rpms/libvirt/F-11 libvirt-0.6.2-buf-locale-escape.patch, NONE,
	1.1 libvirt-0.6.2-hotplug-labelling.patch, NONE,
	1.1 libvirt-0.6.2-hotplug-monitor-syntax.patch, NONE,
	1.1 libvirt-0.6.2-monitor-prompt-discard.patch, NONE,
	1.1 libvirt-0.6.2-pci-device-crash.patch, NONE,
	1.1 libvirt-0.6.2-qemu-name-uniqueness.patch, NONE,
	1.1 libvirt.spec, 1.135, 1.136
Message-ID: <20090805154814.6F5CC11C0349@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27721

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.2-buf-locale-escape.patch 
	libvirt-0.6.2-hotplug-labelling.patch 
	libvirt-0.6.2-hotplug-monitor-syntax.patch 
	libvirt-0.6.2-monitor-prompt-discard.patch 
	libvirt-0.6.2-pci-device-crash.patch 
	libvirt-0.6.2-qemu-name-uniqueness.patch 
Log Message:
Misc important fixes from BZ

- Fix crash when attaching/detaching non-existant PCI device (rhbz #510907)
- Fix QEMU guest name/uuid uniqueness checks (rhbz #507405)
- Fix to use correct pci_add/del syntax for QEMU (rhbz #499669)
- Relabel disks before hotplugging them to guest (rhbz #496442)
- Correctly handle 8-bit high bytes when escaping XML (rhbz #479517)


libvirt-0.6.2-buf-locale-escape.patch:
 buf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvirt-0.6.2-buf-locale-escape.patch ---
commit 8feb499ba2c3625632210c997b49f5df515c05d4
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Tue Aug 4 18:13:09 2009 +0100

    Fix escaping of 8-bit high characters
    
    Fix  https://bugzilla.redhat.com/show_bug.cgi?id=479517
    
    * src/buf.c: Cast to 'unsigned char' before doing compare to
      avoid rejecting 8-bit high characters

diff --git a/src/buf.c b/src/buf.c
index 259175d..c802aa2 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -304,7 +304,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
             *out++ = 'o';
             *out++ = 's';
             *out++ = ';';
-        } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
+        } else if (((unsigned char)*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
                    (*cur == '\r')) {
             /*
              * default case, just copy !

libvirt-0.6.2-hotplug-labelling.patch:
 qemu_driver.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE libvirt-0.6.2-hotplug-labelling.patch ---
commit 1795bfe4a177a5eff1b3b0a16d56df6f371c0f8e
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Mon Jul 6 16:01:55 2009 +0100

    Fix SELinux denial during hotplug
    
    * src/qemu_driver.c: Relabel disk images *before* running QEMU
    hotplug monitor commands

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 5a0ab12..342ba01 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4225,10 +4225,14 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
         switch (dev->data.disk->device) {
         case VIR_DOMAIN_DISK_DEVICE_CDROM:
         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+            if (driver->securityDriver)
+                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
             ret = qemudDomainChangeEjectableMedia(dom->conn, vm, dev);
             break;
 
         case VIR_DOMAIN_DISK_DEVICE_DISK:
+            if (driver->securityDriver)
+                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
             if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
                 ret = qemudDomainAttachUsbMassstorageDevice(dom->conn, vm, dev);
             } else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI ||
@@ -4240,8 +4244,6 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
                                  virDomainDiskBusTypeToString(dev->data.disk->bus));
                 goto cleanup;
             }
-            if (driver->securityDriver)
-                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
             break;
 
         default:

libvirt-0.6.2-hotplug-monitor-syntax.patch:
 qemu_driver.c |   56 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 14 deletions(-)

--- NEW FILE libvirt-0.6.2-hotplug-monitor-syntax.patch ---
commit 326ecb78145cfeb7706ef0dcd521b19d934950e7
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Mon Jul 6 15:58:55 2009 +0100

    Fix PCI device hotplug/unplug with newer QEMU
    
    * src/qemu_driver.c: Try new monitor syntax for hotplug first. If
      that fails fallback to old KVM specific syntax

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 2e55045..5a0ab12 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4004,6 +4004,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
     char *cmd, *reply, *s;
     char *safe_path;
     const char* type = virDomainDiskBusTypeToString(dev->data.disk->bus);
+    int tryOldSyntax = 0;
 
     for (i = 0 ; i < vm->def->ndisks ; i++) {
         if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
@@ -4018,14 +4019,15 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
         return -1;
     }
 
+try_command:
     safe_path = qemudEscapeMonitorArg(dev->data.disk->src);
     if (!safe_path) {
         virReportOOMError(conn);
         return -1;
     }
 
-    ret = virAsprintf(&cmd, "pci_add 0 storage file=%s,if=%s",
-                      safe_path, type);
+    ret = virAsprintf(&cmd, "pci_add %s storage file=%s,if=%s",
+                      (tryOldSyntax ? "0": "pci_addr=auto"), safe_path, type);
     VIR_FREE(safe_path);
     if (ret == -1) {
         virReportOOMError(conn);
@@ -4041,17 +4043,27 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
 
     DEBUG ("%s: pci_add reply: %s", vm->def->name, reply);
     /* If the command succeeds qemu prints:
-     * OK bus 0... */
-#define PCI_ATTACH_OK_MSG "OK bus 0, slot "
-    if ((s=strstr(reply, PCI_ATTACH_OK_MSG))) {
-        char* dummy = s;
-        s += strlen(PCI_ATTACH_OK_MSG);
+     * OK bus 0, slot XXX...
+     * or
+     * OK domain 0, bus 0, slot XXX
+     */
+    if ((s = strstr(reply, "OK ")) &&
+        (s = strstr(s, "slot "))) {
+        char *dummy = s;
+        s += strlen("slot ");
 
         if (virStrToLong_i ((const char*)s, &dummy, 10, &dev->data.disk->slotnum) == -1)
             VIR_WARN("%s", _("Unable to parse slot number\n"));
+        /* XXX not neccessarily always going to end up in domain 0 / bus 0 :-( */
+        /* XXX this slotnum is not persistant across restarts :-( */
+    } else if (!tryOldSyntax && strstr(reply, "invalid char in expression")) {
+        VIR_FREE(reply);
+        VIR_FREE(cmd);
+        tryOldSyntax = 1;
+        goto try_command;
     } else {
         qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-                          _("adding %s disk failed"), type);
+                          _("adding %s disk failed: %s"), type, reply);
         VIR_FREE(reply);
         VIR_FREE(cmd);
         return -1;
@@ -4268,6 +4280,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
     char *cmd = NULL;
     char *reply = NULL;
     virDomainDiskDefPtr detach = NULL;
+    int tryOldSyntax = 0;
 
     for (i = 0 ; i < vm->def->ndisks ; i++) {
         if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
@@ -4289,9 +4302,17 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
         goto cleanup;
     }
 
-    if (virAsprintf(&cmd, "pci_del 0 %d", detach->slotnum) < 0) {
-        virReportOOMError(conn);
-        goto cleanup;
+try_command:
+    if (tryOldSyntax) {
+        if (virAsprintf(&cmd, "pci_del 0 %d", detach->slotnum) < 0) {
+            virReportOOMError(conn);
+            goto cleanup;
+        }
+    } else {
+        if (virAsprintf(&cmd, "pci_del pci_addr=0:0:%d", detach->slotnum) < 0) {
+            virReportOOMError(conn);
+            goto cleanup;
+        }
     }
 
     if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
@@ -4301,12 +4322,19 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
     }
 
     DEBUG ("%s: pci_del reply: %s",vm->def->name,  reply);
+
+    if (!tryOldSyntax &&
+        strstr(reply, "extraneous characters")) {
+        tryOldSyntax = 1;
+        goto try_command;
+    }
     /* If the command fails due to a wrong slot qemu prints: invalid slot,
      * nothing is printed on success */
-    if (strstr(reply, "invalid slot")) {
+    if (strstr(reply, "invalid slot") ||
+        strstr(reply, "Invalid pci address")) {
         qemudReportError (conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-                          _("failed to detach disk %s: invalid slot %d"),
-                          detach->dst, detach->slotnum);
+                          _("failed to detach disk %s: invalid slot %d: %s"),
+                          detach->dst, detach->slotnum, reply);
         goto cleanup;
     }
 

libvirt-0.6.2-monitor-prompt-discard.patch:
 qemu_driver.c |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

--- NEW FILE libvirt-0.6.2-monitor-prompt-discard.patch ---
commit 2d1f2e706c8b13571e1227df1c69b2302da35d5a
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Mon Jul 6 15:45:04 2009 +0100

    Fix problem with QEMU monitor welcome prompt confusing libvirt
    after a libvirtd daemon restart with active guests
    
    * src/qemu_driver: Read and dicard pending monitor data
      before issuing new monitor commands.

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index e2b7acb..2e55045 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1744,6 +1744,28 @@ cleanup:
     qemuDriverUnlock(driver);
 }
 
+
+/* Throw away any data available on the monitor
+ * This is done before executing a command, in order
+ * to allow re-synchronization if something went badly
+ * wrong in the past. it also deals with problem of
+ * QEMU *sometimes* re-printing its initial greeting
+ * when we reconnect to the monitor after restarts.
+ */
+static void
+qemuMonitorDiscardPendingData(virDomainObjPtr vm) {
+    char buf[1024];
+    int ret = 0;
+
+    /* Monitor is non-blocking, so just loop till we
+     * get -1 or 0. Don't bother with detecting
+     * errors, since we'll deal with that better later */
+    do {
+        ret = read(vm->monitor, buf, sizeof (buf)-1);
+    } while (ret > 0);
+}
+
+
 static int
 qemudMonitorCommandExtra(const virDomainObjPtr vm,
                          const char *cmd,
@@ -1755,6 +1777,8 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
     size_t cmdlen = strlen(cmd);
     size_t extralen = extra ? strlen(extra) : 0;
 
+    qemuMonitorDiscardPendingData(vm);
+
     if (safewrite(vm->monitor, cmd, cmdlen) != cmdlen)
         return -1;
     if (safewrite(vm->monitor, "\r", 1) != 1)

libvirt-0.6.2-pci-device-crash.patch:
 pci.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-0.6.2-pci-device-crash.patch ---
commit 4a7acedd3c59a6a750576cb8680bc3f08fe0b52c
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Thu Jul 16 13:23:32 2009 +0100

    Fix free of unitialized data upon PCI open fail

diff --git a/src/pci.c b/src/pci.c
index 3ffa0aa..4030a14 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -834,10 +834,8 @@ pciReadDeviceID(pciDevice *dev, const char *id_name)
              dev->name, id_name);
 
     /* ID string is '0xNNNN\n' ... i.e. 7 bytes */
-    if (virFileReadAll(path, 7, &id_str) < 7) {
-        VIR_FREE(id_str);
+    if (virFileReadAll(path, 7, &id_str) < 0)
         return NULL;
-    }
 
     /* Check for 0x suffix */
     if (id_str[0] != '0' || id_str[1] != 'x') {

libvirt-0.6.2-qemu-name-uniqueness.patch:
 qemu_driver.c |  103 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 83 insertions(+), 20 deletions(-)

--- NEW FILE libvirt-0.6.2-qemu-name-uniqueness.patch ---
diff -rupN libvirt-0.6.2/src/qemu_driver.c libvirt-0.6.2.new/src/qemu_driver.c
--- libvirt-0.6.2/src/qemu_driver.c	2009-08-05 16:25:22.000000000 +0100
+++ libvirt-0.6.2.new/src/qemu_driver.c	2009-08-05 16:27:48.000000000 +0100
@@ -2174,22 +2174,37 @@ static virDomainPtr qemudDomainCreate(vi
     if (virSecurityDriverVerify(conn, def) < 0)
         goto cleanup;
 
-    vm = virDomainFindByName(&driver->domains, def->name);
-    if (vm) {
-        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-                         _("domain '%s' is already defined"),
-                         def->name);
-        goto cleanup;
-    }
+    /* See if a VM with matching UUID already exists */
     vm = virDomainFindByUUID(&driver->domains, def->uuid);
     if (vm) {
-        char uuidstr[VIR_UUID_STRING_BUFLEN];
+        /* UUID matches, but if names don't match, refuse it */
+        if (STRNEQ(vm->def->name, def->name)) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             vm->def->name, uuidstr);
+            goto cleanup;
+        }
 
-        virUUIDFormat(def->uuid, uuidstr);
-        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-                         _("domain with uuid '%s' is already defined"),
-                         uuidstr);
-        goto cleanup;
+        /* UUID & name match, but if VM is already active, refuse it */
+        if (virDomainIsActive(vm)) {
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain is already active as '%s'"), vm->def->name);
+            goto cleanup;
+        }
+        virDomainObjUnlock(vm);
+    } else {
+        /* UUID does not match, but if a name matches, refuse it */
+        vm = virDomainFindByName(&driver->domains, def->name);
+        if (vm) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             def->name, uuidstr);
+            goto cleanup;
+        }
     }
 
     if (!(vm = virDomainAssignDef(conn,
@@ -2368,6 +2383,11 @@ static int qemudDomainDestroy(virDomainP
                          _("no domain with matching id %d"), dom->id);
         goto cleanup;
     }
+    if (!virDomainIsActive(vm)) {
+        qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+                         "%s", _("domain is not running"));
+        goto cleanup;
+    }
 
     qemudShutdownVMDaemon(dom->conn, driver, vm);
     event = virDomainEventNewFromObj(vm,
@@ -3272,17 +3292,36 @@ static int qemudDomainRestore(virConnect
         goto cleanup;
     }
 
-    /* Ensure the name and UUID don't already exist in an active VM */
+    /* See if a VM with matching UUID already exists */
     vm = virDomainFindByUUID(&driver->domains, def->uuid);
-    if (!vm)
-        vm = virDomainFindByName(&driver->domains, def->name);
     if (vm) {
+        /* UUID matches, but if names don't match, refuse it */
+        if (STRNEQ(vm->def->name, def->name)) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             vm->def->name, uuidstr);
+            goto cleanup;
+        }
+
+        /* UUID & name match, but if VM is already active, refuse it */
         if (virDomainIsActive(vm)) {
             qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
                              _("domain is already active as '%s'"), vm->def->name);
             goto cleanup;
-        } else {
-            virDomainObjUnlock(vm);
+        }
+        virDomainObjUnlock(vm);
+    } else {
+        /* UUID does not match, but if a name matches, refuse it */
+        vm = virDomainFindByName(&driver->domains, def->name);
+        if (vm) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             def->name, uuidstr);
+            goto cleanup;
         }
     }
 
@@ -3470,18 +3509,41 @@ static virDomainPtr qemudDomainDefine(vi
     if (virSecurityDriverVerify(conn, def) < 0)
         goto cleanup;
 
-    vm = virDomainFindByName(&driver->domains, def->name);
+    /* See if a VM with matching UUID already exists */
+    vm = virDomainFindByUUID(&driver->domains, def->uuid);
     if (vm) {
+        /* UUID matches, but if names don't match, refuse it */
+        if (STRNEQ(vm->def->name, def->name)) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             vm->def->name, uuidstr);
+            goto cleanup;
+        }
+
+        /* UUID & name match */
         virDomainObjUnlock(vm);
         newVM = 0;
+    } else {
+        /* UUID does not match, but if a name matches, refuse it */
+        vm = virDomainFindByName(&driver->domains, def->name);
+        if (vm) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             def->name, uuidstr);
+            goto cleanup;
+        }
     }
 
     if (!(vm = virDomainAssignDef(conn,
                                   &driver->domains,
                                   def))) {
-        virDomainDefFree(def);
         goto cleanup;
     }
+    def = NULL;
     vm->persistent = 1;
 
     if (virDomainSaveConfig(conn,
@@ -3503,6 +3565,7 @@ static virDomainPtr qemudDomainDefine(vi
     if (dom) dom->id = vm->def->id;
 
 cleanup:
+    virDomainDefFree(def);
     if (vm)
         virDomainObjUnlock(vm);
     if (event)


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- libvirt.spec	3 Jul 2009 10:05:41 -0000	1.135
+++ libvirt.spec	5 Aug 2009 15:48:14 -0000	1.136
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 13%{?dist}%{?extra_release}
+Release: 14%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -104,6 +104,18 @@ Patch14: libvirt-0.6.2-avoid-broken-netw
 Patch15: libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch
 # Don't unnecessarily try to change a file context (bug #507555)
 Patch16: libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch
+# Misc useful fix
+Patch17: libvirt-0.6.2-monitor-prompt-discard.patch
+# rhbz #496442
+Patch18: libvirt-0.6.2-hotplug-labelling.patch
+# rhbz 499669
+Patch19: libvirt-0.6.2-hotplug-monitor-syntax.patch
+# rhbz #510907
+Patch20: libvirt-0.6.2-pci-device-crash.patch
+# rhbz #507405
+Patch21: libvirt-0.6.2-qemu-name-uniqueness.patch
+# rhbz #479517
+Patch22: libvirt-0.6.2-buf-locale-escape.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -272,6 +284,12 @@ of recent versions of Linux (and other O
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %patch200 -p0
 
@@ -595,6 +613,13 @@ fi
 %endif
 
 %changelog
+* Wed Aug  5 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.2-14.fc11
+- Fix crash when attaching/detaching non-existant PCI device (rhbz #510907)
+- Fix QEMU guest name/uuid uniqueness checks (rhbz #507405)
+- Fix to use correct pci_add/del syntax for QEMU (rhbz #499669)
+- Relabel disks before hotplugging them to guest (rhbz #496442)
+- Correctly handle 8-bit high bytes when escaping XML (rhbz #479517)
+
 * Fri Jul  3 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-13.fc11
 - Fix libvirtd crash with bad capabilities data (bug #505635)
 - Don't unnecessarily try to change a file context (bug #507555)



From kkofler at fedoraproject.org  Wed Aug  5 15:48:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  5 Aug 2009 15:48:34 +0000 (UTC)
Subject: rpms/kde-i18n/F-10 kde-i18n.spec,1.94,1.95
Message-ID: <20090805154834.01E6811C0349@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-i18n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27961/F-10

Modified Files:
	kde-i18n.spec 
Log Message:
Sync from devel:

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-8
- catch the missing files in the locale directories

* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-7
- fix duplicate directory ownership (/usr/share/locale/*/LC_MESSAGES)

* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1:3.5.10-6
- omit kuickshow bits
- s/redhatify/flags/ macro

* Mon Jun 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-5
- remove ktron files, conflict with kde-l10n 4.3


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/F-10/kde-i18n.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- kde-i18n.spec	4 Apr 2009 15:38:04 -0000	1.94
+++ kde-i18n.spec	5 Aug 2009 15:48:33 -0000	1.95
@@ -1,12 +1,13 @@
 %define buildall 0
 
-%define redhatify 1
+# build -flags subpkg
+#define flags 1
 
 Summary: Internationalization support for KDE3
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 4%{?dist}
+Release: 9%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -70,6 +71,13 @@ Requires: kde-filesystem
 %description
 %{summary}.
 
+%package flags
+Summary: Geopolitical flags
+Group: User Interface/Desktops
+Requires: kde-filesystem
+%description flags
+%{summary}.
+
 %package Afrikaans
 Summary: Afrikaans(af) language support for KDE3
 Group: User Interface/Desktops
@@ -685,7 +693,7 @@ for i in $(find %{buildroot}%{_docdir}/H
    rm -f $i
 done
 
-%if %{redhatify}
+%if ! 0%{?flags}
 # See http://fedoraproject.org/wiki/Languages
    rm -f %{buildroot}%{_datadir}/locale/*/flag.png
 %endif
@@ -994,6 +1002,7 @@ done
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktip.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktouch.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktraderclient.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktron.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kttsd.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktuberling.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kturtle.mo
@@ -1193,6 +1202,7 @@ done
    rm -rf %{buildroot}%{_docdir}/HTML/*/kteatime
    rm -rf %{buildroot}%{_docdir}/HTML/*/ktimer
    rm -rf %{buildroot}%{_docdir}/HTML/*/ktouch
+   rm -rf %{buildroot}%{_docdir}/HTML/*/ktron
    rm -rf %{buildroot}%{_docdir}/HTML/*/kttsd
    rm -rf %{buildroot}%{_docdir}/HTML/*/ktuberling
    rm -rf %{buildroot}%{_docdir}/HTML/*/kturtle
@@ -1244,6 +1254,7 @@ done
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuickshow.mo
 
    # remove docs which conflict with KDE 4 extragear
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit
@@ -1253,6 +1264,7 @@ done
    rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins
    rm -rf %{buildroot}%{_docdir}/HTML/*/ksig
    rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kuickshow
 
    # remove obsolete KDE 3 application data translations
    rm -rf %{buildroot}%{_datadir}/apps
@@ -1321,62 +1333,76 @@ done
 %clean
 rm -rf %{buildroot}
 
+%if 0%{?flags}
+%files flags
+%{_datadir}/locale/*/*.png
+%endif
 
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/*
+%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
+%lang(af) %{_datadir}/locale/af/charset
 %lang(af) %{_docdir}/HTML/af/
 %endif
 
 %files Arabic 
 %defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/*
+%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
+%lang(ar) %{_datadir}/locale/ar/charset
 
 %if %{buildall}
 %files Azerbaijani
 %defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/*
+%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
+%lang(az) %{_datadir}/locale/az/charset
 %endif
 
 %if %{buildall}
 %files Belarusian
 %defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/*
+%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
+%lang(be) %{_datadir}/locale/be/charset
 %endif
 
 %files Bulgarian
 %defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/*
+%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+%lang(bg) %{_datadir}/locale/bg/charset
 %if 0%{?fedora} < 9
 %lang(bg) %{_datadir}/apps/khangman/data/bg
 %endif
 
 %files Bengali
 %defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/*
+%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/*
+%lang(bn) %{_datadir}/locale/bn/charset
 
 %if %{buildall}
 %files Tibetan
 %defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/*
+%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
+%lang(bo) %{_datadir}/locale/bo/charset
 %endif
 
 %if %{buildall}
 %files Breton
 %defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/*
+%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+%lang(br) %{_datadir}/locale/br/charset
 %endif
 
 %if %{buildall}
 %files Bosnian
 %defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/*
+%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
+%lang(bs) %{_datadir}/locale/bs/charset
 %endif
 
 %files Catalan
 %defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/*
+%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
+%lang(ca) %{_datadir}/locale/ca/charset
 %lang(ca) %{_docdir}/HTML/ca/
 %if 0%{?fedora} < 9
 %lang(ca) %{_datadir}/apps/khangman/ca.txt
@@ -1390,7 +1416,8 @@ rm -rf %{buildroot}
 
 %files Czech
 %defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/*
+%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cs) %{_datadir}/locale/cs/charset
 %lang(cs) %{_docdir}/HTML/cs/
 %if 0%{?fedora} < 9
 %lang(cs) %{_datadir}/apps/khangman/data/cs
@@ -1401,12 +1428,15 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Welsh
 %defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/charset
 %endif
 
 %files Danish
 %defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/*
+%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+%lang(da) %{_datadir}/locale/da/charset
+%lang(da) %{_datadir}/locale/da/da.compendium
 %lang(da) %{_docdir}/HTML/da/
 %if 0%{?fedora} < 9
 %lang(da) %{_datadir}/apps/ktuberling/sounds/da/*
@@ -1417,7 +1447,8 @@ rm -rf %{buildroot}
 
 %files German
 %defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/*
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
+%lang(de) %{_datadir}/locale/de/charset
 %lang(de) %{_docdir}/HTML/de/
 %if 0%{?fedora} < 9
 %lang(de) %{_datadir}/apps/klettres/de
@@ -1432,11 +1463,13 @@ rm -rf %{buildroot}
 
 %files Greek
 %defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/*
+%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
+%lang(el) %{_datadir}/locale/el/charset
 
 %files British
 %defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
+%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+%lang(en_GB) %{_datadir}/locale/en_GB/charset
 %lang(en_GB) %{_docdir}/HTML/en_GB/
 %if 0%{?fedora} < 9
 %lang(en_GB) %{_datadir}/apps/katepart/syntax/logohighlightstyle.en_GB.xml
@@ -1448,12 +1481,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Esperanto
 %defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/*
+%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+%lang(eo) %{_datadir}/locale/eo/charset
 %endif
 
 %files Spanish
 %defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
+%lang(es) %{_datadir}/locale/es/charset
 %lang(es) %{_docdir}/HTML/es/
 %if 0%{?fedora} < 9
 %lang(es) %{_datadir}/apps/ktuberling/sounds/es/*
@@ -1467,7 +1502,8 @@ rm -rf %{buildroot}
 
 %files Estonian
 %defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/*
+%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
+%lang(et) %{_datadir}/locale/et/charset
 %lang(et) %{_docdir}/HTML/et/
 %if 0%{?fedora} < 9
 %lang(et) %{_datadir}/apps/kanagram/data/et
@@ -1478,18 +1514,21 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Basque
 %defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/*
+%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+%lang(eu) %{_datadir}/locale/eu/charset
 %endif
 
 %if %{buildall}
 %files Farsi
 %defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/*
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+%lang(fa) %{_datadir}/locale/fa/charset
 %endif
 
 %files Finnish
 %defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/*
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+%lang(fi) %{_datadir}/locale/fi/charset
 %lang(fi) %{_docdir}/HTML/fi/
 %if 0%{?fedora} < 9
 %lang(fi) %{_datadir}/apps/khangman/data/fi
@@ -1499,12 +1538,16 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Faroese
 %defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/*
+%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
+%lang(fo) %{_datadir}/locale/fo/charset
 %endif
 
 %files French
 %defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/*
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
+%lang(fr) %{_datadir}/locale/fr/charset
+%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
+%lang(fr) %{_datadir}/locale/fr/relecture_*
 %lang(fr) %{_docdir}/HTML/fr/
 %if 0%{?fedora} < 9
 %lang(fr) %{_datadir}/apps/ktuberling/sounds/fr/*
@@ -1519,22 +1562,26 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Frisian
 %defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/*
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/charset
 %endif
 
 %if %{buildall}
 %files Irish
 %defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/*
+%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(ga) %{_datadir}/locale/ga/charset
 
 %files Galician
 %defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/*
+%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
+%lang(gl) %{_datadir}/locale/gl/charset
 %endif
 
 %files Hebrew
 %defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/*
+%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+%lang(he) %{_datadir}/locale/he/charset
 %lang(he) %{_docdir}/HTML/he/
 %if 0%{?fedora} < 9
 %lang(he) %{_datadir}/apps/klettres/he
@@ -1542,18 +1589,21 @@ rm -rf %{buildroot}
 
 %files Hindi
 %defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/*
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+%lang(hi) %{_datadir}/locale/hi/charset
 
 %if %{buildall}
 %files Croatian
 %defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/*
+%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
+%lang(hr) %{_datadir}/locale/hr/charset
 %lang(hr) %{_docdir}/HTML/hr/
 %endif
 
 %files Hungarian
 %defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/*
+%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+%lang(hu) %{_datadir}/locale/hu/charset
 %lang(hu) %{_docdir}/HTML/hu/
 %if 0%{?fedora} < 9
 %lang(hu) %{_datadir}/apps/khangman/data/hu
@@ -1563,17 +1613,20 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Indonesian
 %defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/*
+%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
+%lang(id) %{_datadir}/locale/id/charset
 %lang(id) %{_docdir}/HTML/id/
 %endif
 
 %files Icelandic
 %defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/*
+%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
+%lang(is) %{_datadir}/locale/is/charset
 
 %files Italian
 %defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/*
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
+%lang(it) %{_datadir}/locale/it/charset
 %lang(it) %{_docdir}/HTML/it/
 %if 0%{?fedora} < 9
 %lang(it) %{_datadir}/apps/kanagram/data/it/*
@@ -1588,59 +1641,69 @@ rm -rf %{buildroot}
 
 %files Japanese
 %defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/charset
 %lang(ja) %{_docdir}/HTML/ja/
 
 %files Korean
 %defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/*
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
+%lang(ko) %{_datadir}/locale/ko/charset
 %lang(ko) %{_docdir}/HTML/ko/
 
 %if %{buildall}
 %files Kurdish
 %defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/*
+%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
+%lang(ku) %{_datadir}/locale/ku/charset
 %lang(ku) %{_docdir}/HTML/ku/
 %endif
 
 %if %{buildall}
 %files Lao
 %defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/*
+%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
+%lang(lo) %{_datadir}/locale/lo/charset
 %lang(lo) %{_docdir}/HTML/lo/
 %endif
 
 %files Lithuanian
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/*
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lt) %{_datadir}/locale/lt/charset
 
 %if %{buildall}
 %files Latvian
 %defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/charset
 %endif
 
 %if %{buildall}
 %files Maori
 %defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/*
+%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
+%lang(mi) %{_datadir}/locale/mi/charset
 %endif
 
 %if %{buildall}
 %files Macedonian
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/*
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(mk) %{_datadir}/locale/mk/charset
 %endif
 
 %if %{buildall}
 %files Maltese
 %defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/*
+%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
+%lang(mt) %{_datadir}/locale/mt/charset
 %endif
 
 %files Dutch
 %defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/*
+%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %{_datadir}/locale/nl/charset
 %lang(nl) %{_docdir}/HTML/nl/
 %if 0%{?fedora} < 9
 %lang(nl) %{_datadir}/apps/ktuberling/sounds/nl/*
@@ -1653,7 +1716,9 @@ rm -rf %{buildroot}
 
 %files Norwegian
 %defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/*
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_datadir}/locale/nb/charset
+%lang(nb) %{_datadir}/locale/nb/README
 #%lang(nb) %{_docdir}/HTML/nb/
 #%if 0%{?fedora} < 9
 #%lang(nb) %{_datadir}/apps/khangman/data/nb
@@ -1662,7 +1727,8 @@ rm -rf %{buildroot}
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/*
+%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
+%lang(nn) %{_datadir}/locale/nn/charset
 #%lang(nn) %{_docdir}/HTML/nn/
 %if 0%{?fedora} < 9
 %lang(nn) %{_datadir}/apps/khangman/data/nn
@@ -1672,16 +1738,19 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Occitan
 %defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/*
+%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
+%lang(oc) %{_datadir}/locale/oc/charset
 %endif
 
 %files Punjabi
 %defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/*
+%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
+%lang(pa) %{_datadir}/locale/pa/charset
 
 %files Polish
 %defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/*
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
+%lang(pl) %{_datadir}/locale/pl/charset
 %lang(pl) %{_docdir}/HTML/pl/
 %if 0%{?fedora} < 9
 %lang(pl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.pl.xml
@@ -1693,7 +1762,8 @@ rm -rf %{buildroot}
 
 %files Portuguese
 %defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/*
+%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
+%lang(pt) %{_datadir}/locale/pt/charset
 %lang(pt) %{_docdir}/HTML/pt/
 %if 0%{?fedora} < 9
 %lang(pt) %{_datadir}/apps/ktuberling/sounds/pt/*
@@ -1703,7 +1773,8 @@ rm -rf %{buildroot}
 
 %files Brazil
 %defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/charset
 %lang(pt_BR) %{_docdir}/HTML/pt_BR/
 %if 0%{?fedora} < 9
 %lang(pt_BR) %{_datadir}/apps/khangman/data/pt_BR
@@ -1716,7 +1787,8 @@ rm -rf %{buildroot}
 
 %files Romanian
 %defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
+%lang(ro) %{_datadir}/locale/ro/charset
 %lang(ro) %{_docdir}/HTML/ro/
 %if 0%{?fedora} < 9
 %lang(ro) %{_datadir}/apps/ktuberling/sounds/ro/*
@@ -1724,7 +1796,8 @@ rm -rf %{buildroot}
 
 %files Russian
 %defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/*
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_datadir}/locale/ru/charset
 %lang(ru) %{_docdir}/HTML/ru/
 %if 0%{?fedora} < 9
 %lang(ru) %{_datadir}/apps/kanagram/data/ru
@@ -1736,7 +1809,8 @@ rm -rf %{buildroot}
 
 %files Slovak
 %defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/*
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+%lang(sk) %{_datadir}/locale/sk/charset
 %lang(sk) %{_docdir}/HTML/sk/
 %if 0%{?fedora} < 9
 %lang(sk) %{_datadir}/apps/ktuberling/sounds/sk/*
@@ -1748,7 +1822,8 @@ rm -rf %{buildroot}
 
 %files Slovenian
 %defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/*
+%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%lang(sl) %{_datadir}/locale/sl/charset
 %lang(sl) %{_docdir}/HTML/sl/
 %if 0%{?fedora} < 9
 %lang(sl) %{_datadir}/apps/ktuberling/sounds/sl/*
@@ -1761,7 +1836,8 @@ rm -rf %{buildroot}
 
 %files Serbian
 %defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/*
+%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr/charset
 %lang(sr) %{_docdir}/HTML/sr/
 %if 0%{?fedora} < 9
 %lang(sr) %{_datadir}/apps/khangman/data/sr
@@ -1773,7 +1849,8 @@ rm -rf %{buildroot}
 
 %files Swedish
 %defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/*
+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
+%lang(sv) %{_datadir}/locale/sv/charset
 %lang(sv) %{_docdir}/HTML/sv/
 %if 0%{?fedora} < 9
 %lang(sv) %{_datadir}/apps/ktuberling/sounds/sv/*
@@ -1786,23 +1863,27 @@ rm -rf %{buildroot}
 
 %files Tamil
 %defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/*
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(ta) %{_datadir}/locale/ta/charset
 
 %if %{buildall}
 %files Tajik
 %defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/charset
 %endif
 
 %if %{buildall}
 %files Thai
 %defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/*
+%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
+%lang(th) %{_datadir}/locale/th/charset
 %endif
 
 %files Turkish
 %defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/*
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+%lang(tr) %{_datadir}/locale/tr/charset
 %lang(tr) %{_docdir}/HTML/tr/
 %if 0%{?fedora} < 9
 %lang(tr) %{_datadir}/apps/khangman/data/tr
@@ -1812,45 +1893,68 @@ rm -rf %{buildroot}
 %files Ukrainian
 %defattr(-,root,root,-)
 %lang(uk) %{_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/*
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_datadir}/locale/uk/charset
 
 %if %{buildall}
 %files Venda
 %defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/*
+%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
+%lang(ven) %{_datadir}/locale/ven/charset
 %endif
 
 %if %{buildall}
 %files Vietnamese
 %defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/*
+%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
+%lang(vi) %{_datadir}/locale/vi/charset
 %endif
 
 %if %{buildall}
 %files Walloon
 %defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/*
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
+%lang(wa) %{_datadir}/locale/wa/charset
 %endif
 
 %if %{buildall}
 %files Xhosa
 %defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/*
+%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
+%lang(xh) %{_datadir}/locale/xh/charset
 %lang(xh) %{_docdir}/HTML/xh/
 %endif
 
 %files Chinese
 %defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
 %lang(zh_CN) %{_docdir}/HTML/zh_CN/
 
 %files Chinese-Big5
 %defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/charset
 %lang(zh_TW) %{_docdir}/HTML/zh_TW/
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-8
+- catch the missing files in the locale directories
+
+* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-7
+- fix duplicate directory ownership (/usr/share/locale/*/LC_MESSAGES)
+
+* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1:3.5.10-6
+- omit kuickshow bits
+- s/redhatify/flags/ macro
+
+* Mon Jun 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-5
+- remove ktron files, conflict with kde-l10n 4.3
+
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
 - remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2
 



From kkofler at fedoraproject.org  Wed Aug  5 15:48:34 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  5 Aug 2009 15:48:34 +0000 (UTC)
Subject: rpms/kde-i18n/F-11 kde-i18n.spec,1.95,1.96
Message-ID: <20090805154834.3ED4011C034A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-i18n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27961/F-11

Modified Files:
	kde-i18n.spec 
Log Message:
Sync from devel:

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-8
- catch the missing files in the locale directories

* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-7
- fix duplicate directory ownership (/usr/share/locale/*/LC_MESSAGES)

* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1:3.5.10-6
- omit kuickshow bits
- s/redhatify/flags/ macro

* Mon Jun 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-5
- remove ktron files, conflict with kde-l10n 4.3


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/F-11/kde-i18n.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kde-i18n.spec	4 Apr 2009 15:33:50 -0000	1.95
+++ kde-i18n.spec	5 Aug 2009 15:48:34 -0000	1.96
@@ -1,12 +1,13 @@
 %define buildall 0
 
-%define redhatify 1
+# build -flags subpkg
+#define flags 1
 
 Summary: Internationalization support for KDE3
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 4%{?dist}
+Release: 9%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -70,6 +71,13 @@ Requires: kde-filesystem
 %description
 %{summary}.
 
+%package flags
+Summary: Geopolitical flags
+Group: User Interface/Desktops
+Requires: kde-filesystem
+%description flags
+%{summary}.
+
 %package Afrikaans
 Summary: Afrikaans(af) language support for KDE3
 Group: User Interface/Desktops
@@ -685,7 +693,7 @@ for i in $(find %{buildroot}%{_docdir}/H
    rm -f $i
 done
 
-%if %{redhatify}
+%if ! 0%{?flags}
 # See http://fedoraproject.org/wiki/Languages
    rm -f %{buildroot}%{_datadir}/locale/*/flag.png
 %endif
@@ -994,6 +1002,7 @@ done
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktip.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktouch.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktraderclient.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktron.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kttsd.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktuberling.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kturtle.mo
@@ -1193,6 +1202,7 @@ done
    rm -rf %{buildroot}%{_docdir}/HTML/*/kteatime
    rm -rf %{buildroot}%{_docdir}/HTML/*/ktimer
    rm -rf %{buildroot}%{_docdir}/HTML/*/ktouch
+   rm -rf %{buildroot}%{_docdir}/HTML/*/ktron
    rm -rf %{buildroot}%{_docdir}/HTML/*/kttsd
    rm -rf %{buildroot}%{_docdir}/HTML/*/ktuberling
    rm -rf %{buildroot}%{_docdir}/HTML/*/kturtle
@@ -1244,6 +1254,7 @@ done
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/webarchiver.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ksig.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpovmodeler.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kuickshow.mo
 
    # remove docs which conflict with KDE 4 extragear
    rm -rf %{buildroot}%{_docdir}/HTML/*/kcoloredit
@@ -1253,6 +1264,7 @@ done
    rm -rf %{buildroot}%{_docdir}/HTML/*/konq-plugins
    rm -rf %{buildroot}%{_docdir}/HTML/*/ksig
    rm -rf %{buildroot}%{_docdir}/HTML/*/kpovmodeler
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kuickshow
 
    # remove obsolete KDE 3 application data translations
    rm -rf %{buildroot}%{_datadir}/apps
@@ -1321,62 +1333,76 @@ done
 %clean
 rm -rf %{buildroot}
 
+%if 0%{?flags}
+%files flags
+%{_datadir}/locale/*/*.png
+%endif
 
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/*
+%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
+%lang(af) %{_datadir}/locale/af/charset
 %lang(af) %{_docdir}/HTML/af/
 %endif
 
 %files Arabic 
 %defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/*
+%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
+%lang(ar) %{_datadir}/locale/ar/charset
 
 %if %{buildall}
 %files Azerbaijani
 %defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/*
+%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
+%lang(az) %{_datadir}/locale/az/charset
 %endif
 
 %if %{buildall}
 %files Belarusian
 %defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/*
+%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
+%lang(be) %{_datadir}/locale/be/charset
 %endif
 
 %files Bulgarian
 %defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/*
+%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
+%lang(bg) %{_datadir}/locale/bg/charset
 %if 0%{?fedora} < 9
 %lang(bg) %{_datadir}/apps/khangman/data/bg
 %endif
 
 %files Bengali
 %defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/*
+%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/*
+%lang(bn) %{_datadir}/locale/bn/charset
 
 %if %{buildall}
 %files Tibetan
 %defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/*
+%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
+%lang(bo) %{_datadir}/locale/bo/charset
 %endif
 
 %if %{buildall}
 %files Breton
 %defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/*
+%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+%lang(br) %{_datadir}/locale/br/charset
 %endif
 
 %if %{buildall}
 %files Bosnian
 %defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/*
+%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
+%lang(bs) %{_datadir}/locale/bs/charset
 %endif
 
 %files Catalan
 %defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/*
+%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
+%lang(ca) %{_datadir}/locale/ca/charset
 %lang(ca) %{_docdir}/HTML/ca/
 %if 0%{?fedora} < 9
 %lang(ca) %{_datadir}/apps/khangman/ca.txt
@@ -1390,7 +1416,8 @@ rm -rf %{buildroot}
 
 %files Czech
 %defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/*
+%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cs) %{_datadir}/locale/cs/charset
 %lang(cs) %{_docdir}/HTML/cs/
 %if 0%{?fedora} < 9
 %lang(cs) %{_datadir}/apps/khangman/data/cs
@@ -1401,12 +1428,15 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Welsh
 %defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/charset
 %endif
 
 %files Danish
 %defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/*
+%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
+%lang(da) %{_datadir}/locale/da/charset
+%lang(da) %{_datadir}/locale/da/da.compendium
 %lang(da) %{_docdir}/HTML/da/
 %if 0%{?fedora} < 9
 %lang(da) %{_datadir}/apps/ktuberling/sounds/da/*
@@ -1417,7 +1447,8 @@ rm -rf %{buildroot}
 
 %files German
 %defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/*
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
+%lang(de) %{_datadir}/locale/de/charset
 %lang(de) %{_docdir}/HTML/de/
 %if 0%{?fedora} < 9
 %lang(de) %{_datadir}/apps/klettres/de
@@ -1432,11 +1463,13 @@ rm -rf %{buildroot}
 
 %files Greek
 %defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/*
+%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
+%lang(el) %{_datadir}/locale/el/charset
 
 %files British
 %defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
+%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
+%lang(en_GB) %{_datadir}/locale/en_GB/charset
 %lang(en_GB) %{_docdir}/HTML/en_GB/
 %if 0%{?fedora} < 9
 %lang(en_GB) %{_datadir}/apps/katepart/syntax/logohighlightstyle.en_GB.xml
@@ -1448,12 +1481,14 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Esperanto
 %defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/*
+%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+%lang(eo) %{_datadir}/locale/eo/charset
 %endif
 
 %files Spanish
 %defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
+%lang(es) %{_datadir}/locale/es/charset
 %lang(es) %{_docdir}/HTML/es/
 %if 0%{?fedora} < 9
 %lang(es) %{_datadir}/apps/ktuberling/sounds/es/*
@@ -1467,7 +1502,8 @@ rm -rf %{buildroot}
 
 %files Estonian
 %defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/*
+%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
+%lang(et) %{_datadir}/locale/et/charset
 %lang(et) %{_docdir}/HTML/et/
 %if 0%{?fedora} < 9
 %lang(et) %{_datadir}/apps/kanagram/data/et
@@ -1478,18 +1514,21 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Basque
 %defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/*
+%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
+%lang(eu) %{_datadir}/locale/eu/charset
 %endif
 
 %if %{buildall}
 %files Farsi
 %defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/*
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
+%lang(fa) %{_datadir}/locale/fa/charset
 %endif
 
 %files Finnish
 %defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/*
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
+%lang(fi) %{_datadir}/locale/fi/charset
 %lang(fi) %{_docdir}/HTML/fi/
 %if 0%{?fedora} < 9
 %lang(fi) %{_datadir}/apps/khangman/data/fi
@@ -1499,12 +1538,16 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Faroese
 %defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/*
+%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
+%lang(fo) %{_datadir}/locale/fo/charset
 %endif
 
 %files French
 %defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/*
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
+%lang(fr) %{_datadir}/locale/fr/charset
+%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
+%lang(fr) %{_datadir}/locale/fr/relecture_*
 %lang(fr) %{_docdir}/HTML/fr/
 %if 0%{?fedora} < 9
 %lang(fr) %{_datadir}/apps/ktuberling/sounds/fr/*
@@ -1519,22 +1562,26 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Frisian
 %defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/*
+%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+%lang(fy) %{_datadir}/locale/fy/charset
 %endif
 
 %if %{buildall}
 %files Irish
 %defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/*
+%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
+%lang(ga) %{_datadir}/locale/ga/charset
 
 %files Galician
 %defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/*
+%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
+%lang(gl) %{_datadir}/locale/gl/charset
 %endif
 
 %files Hebrew
 %defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/*
+%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+%lang(he) %{_datadir}/locale/he/charset
 %lang(he) %{_docdir}/HTML/he/
 %if 0%{?fedora} < 9
 %lang(he) %{_datadir}/apps/klettres/he
@@ -1542,18 +1589,21 @@ rm -rf %{buildroot}
 
 %files Hindi
 %defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/*
+%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+%lang(hi) %{_datadir}/locale/hi/charset
 
 %if %{buildall}
 %files Croatian
 %defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/*
+%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
+%lang(hr) %{_datadir}/locale/hr/charset
 %lang(hr) %{_docdir}/HTML/hr/
 %endif
 
 %files Hungarian
 %defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/*
+%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
+%lang(hu) %{_datadir}/locale/hu/charset
 %lang(hu) %{_docdir}/HTML/hu/
 %if 0%{?fedora} < 9
 %lang(hu) %{_datadir}/apps/khangman/data/hu
@@ -1563,17 +1613,20 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Indonesian
 %defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/*
+%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
+%lang(id) %{_datadir}/locale/id/charset
 %lang(id) %{_docdir}/HTML/id/
 %endif
 
 %files Icelandic
 %defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/*
+%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
+%lang(is) %{_datadir}/locale/is/charset
 
 %files Italian
 %defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/*
+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
+%lang(it) %{_datadir}/locale/it/charset
 %lang(it) %{_docdir}/HTML/it/
 %if 0%{?fedora} < 9
 %lang(it) %{_datadir}/apps/kanagram/data/it/*
@@ -1588,59 +1641,69 @@ rm -rf %{buildroot}
 
 %files Japanese
 %defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/*
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
+%lang(ja) %{_datadir}/locale/ja/charset
 %lang(ja) %{_docdir}/HTML/ja/
 
 %files Korean
 %defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/*
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
+%lang(ko) %{_datadir}/locale/ko/charset
 %lang(ko) %{_docdir}/HTML/ko/
 
 %if %{buildall}
 %files Kurdish
 %defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/*
+%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
+%lang(ku) %{_datadir}/locale/ku/charset
 %lang(ku) %{_docdir}/HTML/ku/
 %endif
 
 %if %{buildall}
 %files Lao
 %defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/*
+%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
+%lang(lo) %{_datadir}/locale/lo/charset
 %lang(lo) %{_docdir}/HTML/lo/
 %endif
 
 %files Lithuanian
 %defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/*
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lt) %{_datadir}/locale/lt/charset
 
 %if %{buildall}
 %files Latvian
 %defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/*
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/charset
 %endif
 
 %if %{buildall}
 %files Maori
 %defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/*
+%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
+%lang(mi) %{_datadir}/locale/mi/charset
 %endif
 
 %if %{buildall}
 %files Macedonian
 %defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/*
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+%lang(mk) %{_datadir}/locale/mk/charset
 %endif
 
 %if %{buildall}
 %files Maltese
 %defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/*
+%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
+%lang(mt) %{_datadir}/locale/mt/charset
 %endif
 
 %files Dutch
 %defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/*
+%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %{_datadir}/locale/nl/charset
 %lang(nl) %{_docdir}/HTML/nl/
 %if 0%{?fedora} < 9
 %lang(nl) %{_datadir}/apps/ktuberling/sounds/nl/*
@@ -1653,7 +1716,9 @@ rm -rf %{buildroot}
 
 %files Norwegian
 %defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/*
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_datadir}/locale/nb/charset
+%lang(nb) %{_datadir}/locale/nb/README
 #%lang(nb) %{_docdir}/HTML/nb/
 #%if 0%{?fedora} < 9
 #%lang(nb) %{_datadir}/apps/khangman/data/nb
@@ -1662,7 +1727,8 @@ rm -rf %{buildroot}
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/*
+%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
+%lang(nn) %{_datadir}/locale/nn/charset
 #%lang(nn) %{_docdir}/HTML/nn/
 %if 0%{?fedora} < 9
 %lang(nn) %{_datadir}/apps/khangman/data/nn
@@ -1672,16 +1738,19 @@ rm -rf %{buildroot}
 %if %{buildall}
 %files Occitan
 %defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/*
+%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
+%lang(oc) %{_datadir}/locale/oc/charset
 %endif
 
 %files Punjabi
 %defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/*
+%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
+%lang(pa) %{_datadir}/locale/pa/charset
 
 %files Polish
 %defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/*
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
+%lang(pl) %{_datadir}/locale/pl/charset
 %lang(pl) %{_docdir}/HTML/pl/
 %if 0%{?fedora} < 9
 %lang(pl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.pl.xml
@@ -1693,7 +1762,8 @@ rm -rf %{buildroot}
 
 %files Portuguese
 %defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/*
+%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
+%lang(pt) %{_datadir}/locale/pt/charset
 %lang(pt) %{_docdir}/HTML/pt/
 %if 0%{?fedora} < 9
 %lang(pt) %{_datadir}/apps/ktuberling/sounds/pt/*
@@ -1703,7 +1773,8 @@ rm -rf %{buildroot}
 
 %files Brazil
 %defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
+%lang(pt_BR) %{_datadir}/locale/pt_BR/charset
 %lang(pt_BR) %{_docdir}/HTML/pt_BR/
 %if 0%{?fedora} < 9
 %lang(pt_BR) %{_datadir}/apps/khangman/data/pt_BR
@@ -1716,7 +1787,8 @@ rm -rf %{buildroot}
 
 %files Romanian
 %defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/*
+%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
+%lang(ro) %{_datadir}/locale/ro/charset
 %lang(ro) %{_docdir}/HTML/ro/
 %if 0%{?fedora} < 9
 %lang(ro) %{_datadir}/apps/ktuberling/sounds/ro/*
@@ -1724,7 +1796,8 @@ rm -rf %{buildroot}
 
 %files Russian
 %defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/*
+%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
+%lang(ru) %{_datadir}/locale/ru/charset
 %lang(ru) %{_docdir}/HTML/ru/
 %if 0%{?fedora} < 9
 %lang(ru) %{_datadir}/apps/kanagram/data/ru
@@ -1736,7 +1809,8 @@ rm -rf %{buildroot}
 
 %files Slovak
 %defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/*
+%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
+%lang(sk) %{_datadir}/locale/sk/charset
 %lang(sk) %{_docdir}/HTML/sk/
 %if 0%{?fedora} < 9
 %lang(sk) %{_datadir}/apps/ktuberling/sounds/sk/*
@@ -1748,7 +1822,8 @@ rm -rf %{buildroot}
 
 %files Slovenian
 %defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/*
+%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
+%lang(sl) %{_datadir}/locale/sl/charset
 %lang(sl) %{_docdir}/HTML/sl/
 %if 0%{?fedora} < 9
 %lang(sl) %{_datadir}/apps/ktuberling/sounds/sl/*
@@ -1761,7 +1836,8 @@ rm -rf %{buildroot}
 
 %files Serbian
 %defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/*
+%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%lang(sr) %{_datadir}/locale/sr/charset
 %lang(sr) %{_docdir}/HTML/sr/
 %if 0%{?fedora} < 9
 %lang(sr) %{_datadir}/apps/khangman/data/sr
@@ -1773,7 +1849,8 @@ rm -rf %{buildroot}
 
 %files Swedish
 %defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/*
+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
+%lang(sv) %{_datadir}/locale/sv/charset
 %lang(sv) %{_docdir}/HTML/sv/
 %if 0%{?fedora} < 9
 %lang(sv) %{_datadir}/apps/ktuberling/sounds/sv/*
@@ -1786,23 +1863,27 @@ rm -rf %{buildroot}
 
 %files Tamil
 %defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/*
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(ta) %{_datadir}/locale/ta/charset
 
 %if %{buildall}
 %files Tajik
 %defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/charset
 %endif
 
 %if %{buildall}
 %files Thai
 %defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/*
+%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
+%lang(th) %{_datadir}/locale/th/charset
 %endif
 
 %files Turkish
 %defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/*
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+%lang(tr) %{_datadir}/locale/tr/charset
 %lang(tr) %{_docdir}/HTML/tr/
 %if 0%{?fedora} < 9
 %lang(tr) %{_datadir}/apps/khangman/data/tr
@@ -1812,45 +1893,68 @@ rm -rf %{buildroot}
 %files Ukrainian
 %defattr(-,root,root,-)
 %lang(uk) %{_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/*
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+%lang(uk) %{_datadir}/locale/uk/charset
 
 %if %{buildall}
 %files Venda
 %defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/*
+%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
+%lang(ven) %{_datadir}/locale/ven/charset
 %endif
 
 %if %{buildall}
 %files Vietnamese
 %defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/*
+%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
+%lang(vi) %{_datadir}/locale/vi/charset
 %endif
 
 %if %{buildall}
 %files Walloon
 %defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/*
+%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
+%lang(wa) %{_datadir}/locale/wa/charset
 %endif
 
 %if %{buildall}
 %files Xhosa
 %defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/*
+%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
+%lang(xh) %{_datadir}/locale/xh/charset
 %lang(xh) %{_docdir}/HTML/xh/
 %endif
 
 %files Chinese
 %defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
+%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
 %lang(zh_CN) %{_docdir}/HTML/zh_CN/
 
 %files Chinese-Big5
 %defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
+%lang(zh_TW) %{_datadir}/locale/zh_TW/charset
 %lang(zh_TW) %{_docdir}/HTML/zh_TW/
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.5.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-8
+- catch the missing files in the locale directories
+
+* Tue Jul  7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.5.10-7
+- fix duplicate directory ownership (/usr/share/locale/*/LC_MESSAGES)
+
+* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1:3.5.10-6
+- omit kuickshow bits
+- s/redhatify/flags/ macro
+
+* Mon Jun 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-5
+- remove ktron files, conflict with kde-l10n 4.3
+
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.10-4
 - remove kdesvn-build documentation, conflicts with kde-l10n 4.2.2
 



From ajax at fedoraproject.org  Wed Aug  5 15:52:45 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  5 Aug 2009 15:52:45 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-0.10.6-rom-sanity.patch, NONE, 
	1.1 libpciaccess.spec, 1.23, 1.24
Message-ID: <20090805155245.E58BB11C0349@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29062

Modified Files:
	libpciaccess.spec 
Added Files:
	libpciaccess-0.10.6-rom-sanity.patch 
Log Message:
* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 0.10.6-5
- libpciaccess-0.10.6-rom-sanity.patch: If we hit the /dev/mem path for
  reading a device's ROM, verify that it looks like it at least might belong
  to the device in question by checking vendor and device ID match.  Fixes
  vbetool post hanging forever (and thus blocking boot) on some dual-gpu
  laptops.


libpciaccess-0.10.6-rom-sanity.patch:
 linux_devmem.c |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE libpciaccess-0.10.6-rom-sanity.patch ---
diff -up libpciaccess-0.10.6/src/linux_devmem.c.jx libpciaccess-0.10.6/src/linux_devmem.c
--- libpciaccess-0.10.6/src/linux_devmem.c.jx	2008-10-15 18:35:54.000000000 -0400
+++ libpciaccess-0.10.6/src/linux_devmem.c	2009-08-05 11:43:14.000000000 -0400
@@ -50,6 +50,30 @@
 #include "pciaccess_private.h"
 #include "linux_devmem.h"
 
+static int
+rom_sanity_check(struct pci_device *info, void *buffer)
+{
+    unsigned char *bios = buffer;
+    int offset;
+    unsigned short vendor, device;
+
+    if (bios[0] != 0x55 || bios[1] != 0xAA)
+        return 0;
+
+    offset = (bios[0x19] << 8) + bios[0x18];
+
+    if (bios[offset] != 'P' ||
+       bios[offset+1] != 'C' ||
+       bios[offset+2] != 'I' ||
+       bios[offset+3] != 'R')
+       return 0;
+
+    vendor = (bios[offset+5] << 8) + bios[offset+4];
+    device = (bios[offset+7] << 8) + bios[offset+6];
+
+    return (info->vendor_id == vendor) && (info->device_id == device);
+}
+
 /**
  * Read a device's expansion ROM using /dev/mem.
  * 
@@ -152,5 +176,5 @@ pci_device_linux_devmem_read_rom(struct 
 	}
     }
 
-    return err;
+    return rom_sanity_check(dev, buffer);
 }


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libpciaccess.spec	3 Aug 2009 00:00:31 -0000	1.23
+++ libpciaccess.spec	5 Aug 2009 15:52:45 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.10.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -21,6 +21,7 @@ Patch0:		libpciaccess-fd-cache.patch
 Patch2:		libpciaccess-rom-size.patch
 Patch3:         libpciaccess-boot-vga.patch
 Patch4:		libpciaccess-vga-arbiter.patch
+Patch5:         libpciaccess-0.10.6-rom-sanity.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
 Requires:       hwdata
@@ -44,6 +45,7 @@ Development package for libpciaccess.
 %patch2 -p1 -b .rom-size
 %patch3 -p1 -b .bootvga
 %patch4 -p1 -b .vgaarb
+%patch5 -p1 -b .jx
 
 %build
 autoreconf -v --install
@@ -74,6 +76,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 0.10.6-5
+- libpciaccess-0.10.6-rom-sanity.patch: If we hit the /dev/mem path for
+  reading a device's ROM, verify that it looks like it at least might belong
+  to the device in question by checking vendor and device ID match.  Fixes
+  vbetool post hanging forever (and thus blocking boot) on some dual-gpu
+  laptops.
+
 * Mon Aug 03 2009 Dave Airlie <airlied at redhat.com> 0.10.6-4
 - Add support for default vga arb device selection
 - Update libpciaccess VGA arb code for newer kernel API



From rdieter at fedoraproject.org  Wed Aug  5 15:53:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 15:53:26 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.141,1.142
Message-ID: <20090805155326.5EB8B11C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29292

Modified Files:
	kdegames.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- Conflicts: kdegames3 < 3.5.10-6
- %check: desktop-file-validate
- use %?_isa in -libs deps



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- kdegames.spec	31 Jul 2009 21:17:21 -0000	1.141
+++ kdegames.spec	5 Aug 2009 15:53:26 -0000	1.142
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -12,6 +12,9 @@ Patch0:  kdegames-4.3.0-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# KSnakeDuel moved here from kdegames3
+Conflicts: kdegames3 < 3.5.10-6
+
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -21,12 +24,13 @@ Provides:  ksudoku = 1:0.5-1
 Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
+BuildRequires: desktop-file-utils
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: qca2-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if "%{?_ggz_version}" < "0.99.5"
 %define _skip_ggzconfig -DSKIP_GGZCONFIG=1
@@ -80,7 +84,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Header files for compiling KDE 4 game applications
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdegames4-devel < %{version}-%{release}
 Provides:  kdegames4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -115,6 +119,12 @@ install -m644 -p -D ./ksquares/src/modul
 %endif
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 %if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
@@ -197,6 +207,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- Conflicts: kdegames3 < 3.5.10-6
+- %%check: desktop-file-validate
+- use %%?_isa in -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From jakub at fedoraproject.org  Wed Aug  5 15:56:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  5 Aug 2009 15:56:26 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-builtin-unreachable.patch, NONE,
	1.1 gcc44-pr40971.patch, NONE, 1.1 .cvsignore, 1.281,
	1.282 gcc.spec, 1.59, 1.60 sources, 1.285, 1.286
Message-ID: <20090805155626.239D411C0349@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30027

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-builtin-unreachable.patch gcc44-pr40971.patch 
Log Message:
4.4.1-4

gcc44-builtin-unreachable.patch:
 builtins.c                                      |   15 ++++++
 builtins.def                                    |    1 
 cfgcleanup.c                                    |   22 ++++++++-
 cfgrtl.c                                        |   14 +++---
 doc/extend.texi                                 |   55 ++++++++++++++++++++++++
 emit-rtl.c                                      |   19 ++++++++
 jump.c                                          |    2 
 rtl.h                                           |    1 
 testsuite/g++.dg/other/builtin-unreachable-1.C  |   11 ++++
 testsuite/gcc.dg/builtin-unreachable-1.c        |   17 +++++++
 testsuite/gcc.dg/builtin-unreachable-2.c        |   20 ++++++++
 testsuite/gcc.dg/builtin-unreachable-3.c        |    9 +++
 testsuite/gcc.dg/builtin-unreachable-4.c        |   14 ++++++
 testsuite/gcc.target/i386/builtin-unreachable.c |   13 +++++
 14 files changed, 204 insertions(+), 9 deletions(-)

--- NEW FILE gcc44-builtin-unreachable.patch ---
2009-07-25  David Daney  <ddaney at caviumnetworks.com>

	PR rtl-optimization/40445
	* emit-rtl.c (next_nonnote_insn_bb): New function.
	* rtl.h (next_nonnote_insn_bb): Declare new function.
	* cfgcleanup.c (try_optimize_cfg): Don't remove an empty block
	with no successors that is the successor of the ENTRY_BLOCK.
	Continue from the top after removing an empty fallthrough block.
	* cfgrtl.c (get_last_bb_insn): Call next_nonnote_insn_bb instead
	of next_nonnote_insn.

	* g++.dg/other/builtin-unreachable-1.C: New testcase.

2009-07-25  David Daney  <ddaney at caviumnetworks.com>

	* cfgcleanup.c (old_insns_match_p): Handle the case of empty
	blocks.

	* gcc.dg/builtin-unreachable-4.c: New test.

2009-06-17  David Daney  <ddaney at caviumnetworks.com>

	* jump.c (cleanup_barriers): Handle case of no insns before a
	barrier.

	* gcc.dg/builtin-unreachable-3.c: New test.

2009-06-17  David Daney  <ddaney at caviumnetworks.com>

	* gcc.target/i386/builtin-unreachable.c: New test.

2009-06-11  David Daney  <ddaney at caviumnetworks.com>

	PR c/39252
	* doc/extend.texi ( __builtin_unreachable): Document new builtin.
	* builtins.c (expand_builtin_unreachable): New function.
	(expand_builtin): Handle BUILT_IN_UNREACHABLE case.
	* builtins.def (BUILT_IN_UNREACHABLE): Add new builtin.
	* cfgcleanup.c (try_optimize_cfg): Delete empty blocks with no
	successors.
	* cfgrtl.c (rtl_verify_flow_info): Handle empty blocks when
	searching for missing barriers.

	* gcc.dg/builtin-unreachable-1.c: New test.
	* gcc.dg/builtin-unreachable-2.c: Same.

--- gcc/doc/extend.texi	(revision 148402)
+++ gcc/doc/extend.texi	(revision 148404)
@@ -6815,6 +6815,61 @@ intentionally executing an illegal instr
 you should not rely on any particular implementation.
 @end deftypefn
 
+ at deftypefn {Built-in Function} void __builtin_unreachable (void)
+If control flow reaches the point of the @code{__builtin_unreachable},
+the program is undefined.  It is useful in situations where the
+compiler cannot deduce the unreachability of the code.
+
+One such case is immediately following an @code{asm} statement that
+will either never terminate, or one that transfers control elsewhere
+and never returns.  In this example, without the
+ at code{__builtin_unreachable}, GCC would issue a warning that control
+reaches the end of a non-void function.  It would also generate code
+to return after the @code{asm}.
+
+ at smallexample
+int f (int c, int v)
+@{
+  if (c)
+    @{
+      return v;
+    @}
+  else
+    @{
+      asm("jmp error_handler");
+      __builtin_unreachable ();
+    @}
+@}
+ at end smallexample
+
+Because the @code{asm} statement unconditionally transfers control out
+of the function, control will never reach the end of the function
+body.  The @code{__builtin_unreachable} is in fact unreachable and
+communicates this fact to the compiler.
+
+Another use for @code{__builtin_unreachable} is following a call a
+function that never returns but that is not declared
+ at code{__attribute__((noreturn))}, as in this example:
+
+ at smallexample
+void function_that_never_returns (void);
+
+int g (int c)
+@{
+  if (c)
+    @{
+      return 1;
+    @}
+  else
+    @{
+      function_that_never_returns ();
+      __builtin_unreachable ();
+    @}
+@}
+ at end smallexample
+
+ at end deftypefn
+
 @deftypefn {Built-in Function} void __builtin___clear_cache (char *@var{begin}, char *@var{end})
 This function is used to flush the processor's instruction cache for
 the region of memory between @var{begin} inclusive and @var{end}
--- gcc/builtins.c	(revision 148402)
+++ gcc/builtins.c	(revision 148404)
@@ -5298,6 +5298,17 @@ expand_builtin_trap (void)
   emit_barrier ();
 }
 
+/* Expand a call to __builtin_unreachable.  We do nothing except emit
+   a barrier saying that control flow will not pass here.
+
+   It is the responsibility of the program being compiled to ensure
+   that control flow does never reach __builtin_unreachable.  */
+static void
+expand_builtin_unreachable (void)
+{
+  emit_barrier ();
+}
+
 /* Expand EXP, a call to fabs, fabsf or fabsl.
    Return NULL_RTX if a normal call should be emitted rather than expanding
    the function inline.  If convenient, the result should be placed
@@ -6795,6 +6806,10 @@ expand_builtin (tree exp, rtx target, rt
       expand_builtin_trap ();
       return const0_rtx;
 
+    case BUILT_IN_UNREACHABLE:
+      expand_builtin_unreachable ();
+      return const0_rtx;
+
     case BUILT_IN_PRINTF:
       target = expand_builtin_printf (exp, target, mode, false);
       if (target)
--- gcc/builtins.def	(revision 148402)
+++ gcc/builtins.def	(revision 148404)
@@ -698,6 +698,7 @@ DEF_GCC_BUILTIN        (BUILT_IN_SETJMP,
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_NOTHROW_3_4)
 DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_PTR, ATTR_FORMAT_STRFTIME_NOTHROW_3_0)
 DEF_GCC_BUILTIN        (BUILT_IN_TRAP, "trap", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_UNREACHABLE, "unreachable", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_UNWIND_INIT, "unwind_init", BT_FN_VOID, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_UPDATE_SETJMP_BUF, "update_setjmp_buf", BT_FN_VOID_PTR_INT, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_VA_COPY, "va_copy", BT_FN_VOID_VALIST_REF_VALIST_ARG, ATTR_NULL)
--- gcc/cfgcleanup.c	(revision 148402)
+++ gcc/cfgcleanup.c	(revision 148404)
@@ -953,7 +953,12 @@ old_insns_match_p (int mode ATTRIBUTE_UN
   if (GET_CODE (i1) != GET_CODE (i2))
     return false;
 
-  p1 = PATTERN (i1);
+  /* __builtin_unreachable() may lead to empty blocks (ending with
+     NOTE_INSN_BASIC_BLOCK).  They may be crossjumped. */
+  if (NOTE_INSN_BASIC_BLOCK_P (i1) && NOTE_INSN_BASIC_BLOCK_P (i2))
+    return true;
+
+   p1 = PATTERN (i1);
   p2 = PATTERN (i2);
 
   if (GET_CODE (p1) != GET_CODE (p2))
@@ -1873,8 +1878,18 @@ try_optimize_cfg (int mode)
 	      edge s;
 	      bool changed_here = false;
 
-	      /* Delete trivially dead basic blocks.  */
-	      if (EDGE_COUNT (b->preds) == 0)
+	      /* Delete trivially dead basic blocks.  This is either
+		 blocks with no predecessors, or empty blocks with no
+		 successors.  However if the empty block with no
+		 successors is the successor of the ENTRY_BLOCK, it is
+		 kept.  This ensures that the ENTRY_BLOCK will have a
+		 successor which is a precondition for many RTL
+		 passes.  Empty blocks may result from expanding
+		 __builtin_unreachable ().  */
+	      if (EDGE_COUNT (b->preds) == 0
+		  || (EDGE_COUNT (b->succs) == 0
+		      && BB_HEAD (b) == BB_END (b)
+		      && single_succ_edge (ENTRY_BLOCK_PTR)->dest != b))
 		{
 		  c = b->prev_bb;
 		  if (dump_file)
@@ -1946,6 +1961,7 @@ try_optimize_cfg (int mode)
 		  delete_basic_block (b);
 		  changed = true;
 		  b = c;
+		  continue;
 		}
 
 	      if (single_succ_p (b)
--- gcc/cfgrtl.c	(revision 148402)
+++ gcc/cfgrtl.c	(revision 148404)
@@ -1708,11 +1708,11 @@ get_last_bb_insn (basic_block bb)
     end = tmp;
 
   /* Include any barriers that may follow the basic block.  */
-  tmp = next_nonnote_insn (end);
+  tmp = next_nonnote_insn_bb (end);
   while (tmp && BARRIER_P (tmp))
     {
       end = tmp;
-      tmp = next_nonnote_insn (end);
+      tmp = next_nonnote_insn_bb (end);
     }
 
   return end;
@@ -2040,15 +2040,17 @@ rtl_verify_flow_info (void)
 	  rtx insn;
 
 	  /* Ensure existence of barrier in BB with no fallthru edges.  */
-	  for (insn = BB_END (bb); !insn || !BARRIER_P (insn);
-	       insn = NEXT_INSN (insn))
-	    if (!insn
-		|| NOTE_INSN_BASIC_BLOCK_P (insn))
+	  for (insn = NEXT_INSN (BB_END (bb)); ; insn = NEXT_INSN (insn))
+	    {
+	      if (!insn || NOTE_INSN_BASIC_BLOCK_P (insn))
 		{
 		  error ("missing barrier after block %i", bb->index);
 		  err = 1;
 		  break;
 		}
+	      if (BARRIER_P (insn))
+		break;
+	    }
 	}
       else if (e->src != ENTRY_BLOCK_PTR
 	       && e->dest != EXIT_BLOCK_PTR)
--- gcc/jump.c	(revision 148623)
+++ gcc/jump.c	(revision 148624)
@@ -113,6 +113,8 @@ cleanup_barriers (void)
       if (BARRIER_P (insn))
 	{
 	  prev = prev_nonnote_insn (insn);
+	  if (!prev)
+	    continue;
 	  if (BARRIER_P (prev))
 	    delete_insn (insn);
 	  else if (prev != PREV_INSN (insn))
--- gcc/emit-rtl.c	(revision 150088)
+++ gcc/emit-rtl.c	(revision 150090)
@@ -2998,6 +2998,25 @@ next_nonnote_insn (rtx insn)
   return insn;
 }
 
+/* Return the next insn after INSN that is not a NOTE, but stop the
+   search before we enter another basic block.  This routine does not
+   look inside SEQUENCEs.  */
+
+rtx
+next_nonnote_insn_bb (rtx insn)
+{
+  while (insn)
+    {
+      insn = NEXT_INSN (insn);
+      if (insn == 0 || !NOTE_P (insn))
+	break;
+      if (NOTE_INSN_BASIC_BLOCK_P (insn))
+	return NULL_RTX;
+    }
+
+  return insn;
+}
+
 /* Return the previous insn before INSN that is not a NOTE.  This routine does
    not look inside SEQUENCEs.  */
 
--- gcc/rtl.h	(revision 150088)
+++ gcc/rtl.h	(revision 150090)
@@ -1626,6 +1626,7 @@ extern rtx previous_insn (rtx);
 extern rtx next_insn (rtx);
 extern rtx prev_nonnote_insn (rtx);
 extern rtx next_nonnote_insn (rtx);
+extern rtx next_nonnote_insn_bb (rtx);
 extern rtx prev_real_insn (rtx);
 extern rtx next_real_insn (rtx);
 extern rtx prev_active_insn (rtx);
--- gcc/testsuite/gcc.dg/builtin-unreachable-2.c	(revision 0)
+++ gcc/testsuite/gcc.dg/builtin-unreachable-2.c	(revision 148404)
@@ -0,0 +1,20 @@
+/* Check that __builtin_unreachable() is a no-return function thus
+   causing the dead call to foo() to be removed.  The comparison is
+   dead too, and should be removed.  */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized -fdump-rtl-cse1" } */
+void foo (void);
+
+int
+f (int i)
+{
+  if (i > 1)
+    __builtin_unreachable();
+  if (i > 1)
+    foo ();
+  return 1;
+}
+/* { dg-final { scan-tree-dump-not "foo" "optimized" } } */
+/* { dg-final { scan-rtl-dump-not "\\(if_then_else" "cse1" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
+/* { dg-final { cleanup-rtl-dump "cse1" } } */
--- gcc/testsuite/gcc.dg/builtin-unreachable-1.c	(revision 0)
+++ gcc/testsuite/gcc.dg/builtin-unreachable-1.c	(revision 148404)
@@ -0,0 +1,17 @@
+/* Check that __builtin_unreachable() prevents the 'control reaches
+   end of non-void function' diagnostic.  */
+/* { dg-do compile } */
+/* { dg-options "-O2 -Wreturn-type" } */
+int
+f(int a, int b)
+{
+  if (a)
+    {
+      return b;
+    }
+  else
+    {
+      asm ("bug");
+      __builtin_unreachable();
+    }
+}
--- gcc/testsuite/gcc.dg/builtin-unreachable-3.c	(revision 0)
+++ gcc/testsuite/gcc.dg/builtin-unreachable-3.c	(revision 148624)
@@ -0,0 +1,9 @@
+/* Check that a function containing only __builtin_unreachable()
+   doesn't ICE.  */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+const char *
+f (void)
+{
+  __builtin_unreachable ();
+}
--- gcc/testsuite/gcc.target/i386/builtin-unreachable.c	(revision 0)
+++ gcc/testsuite/gcc.target/i386/builtin-unreachable.c	(revision 148622)
@@ -0,0 +1,13 @@
+/* This should return 1 without setting up a stack frame or
+   jumping.  */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-O2 -fomit-frame-pointer" } */
+int h (char *p)
+{
+  if (*p)
+    __builtin_unreachable ();
+  return p ? 1 : 0;
+}
+/* { dg-final { scan-assembler-not "%e\[bs\]p" } } */
+/* { dg-final { scan-assembler-not "\[\\t \]+j" } } */
--- gcc/testsuite/gcc.dg/builtin-unreachable-4.c	(revision 0)
+++ gcc/testsuite/gcc.dg/builtin-unreachable-4.c	(revision 150090)
@@ -0,0 +1,14 @@
+/* Check that this valid code doesn't ICE.  */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+void
+g (int a, int b, int c, int d)
+{
+  if (d)
+    {
+      ((void)
+       (!(a && b && c) ? __builtin_unreachable (), 0 : 0));
+    }
+  ((void)
+   (!(a && b && c) ? __builtin_unreachable (), 0 : 0));
+}
--- gcc/testsuite/g++.dg/other/builtin-unreachable-1.C	(revision 0)
+++ gcc/testsuite/g++.dg/other/builtin-unreachable-1.C	(revision 150090)
@@ -0,0 +1,11 @@
+// PR c++/40445
+// Check that a function containing only __builtin_unreachable()
+// doesn't ICE.
+
+// { dg-do compile }
+// { dg-options "-O0" }
+const char *
+f (void)
+{
+  __builtin_unreachable ();
+}

gcc44-pr40971.patch:
 config/rs6000/rs6000.c     |   30 ++++++++++++++++++++++++++++--
 testsuite/gcc.dg/pr40971.c |   23 +++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

--- NEW FILE gcc44-pr40971.patch ---
2009-08-05  Jakub Jelinek  <jakub at redhat.com>

	PR target/40971
	* config/rs6000/rs6000.c (rs6000_legitimize_address): For
	[DT][FDI]mode ensure the offset isn't 4/8/12 bytes below 0x8000.

	* gcc.dg/pr40971.c: New test.

--- gcc/config/rs6000/rs6000.c.jj	2009-04-27 16:47:29.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2009-08-05 16:53:42.000000000 +0200
@@ -3808,6 +3808,8 @@ rtx
 rs6000_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
 			   enum machine_mode mode)
 {
+  unsigned int extra = 0;
+
   if (GET_CODE (x) == SYMBOL_REF)
     {
       enum tls_model model = SYMBOL_REF_TLS_MODEL (x);
@@ -3815,10 +3817,32 @@ rs6000_legitimize_address (rtx x, rtx ol
 	return rs6000_legitimize_tls_address (x, model);
     }
 
+  switch (mode)
+    {
+    case DFmode:
+    case DDmode:
+      extra = 4;
+      break;
+    case DImode:
+      if (!TARGET_POWERPC64)
+	extra = 4;
+      break;
+    case TFmode:
+    case TDmode:
+      extra = 12;
+      break;
+    case TImode:
+      extra = TARGET_POWERPC64 ? 8 : 12;
+      break;
+    default:
+      break;
+    }
+
   if (GET_CODE (x) == PLUS
       && GET_CODE (XEXP (x, 0)) == REG
       && GET_CODE (XEXP (x, 1)) == CONST_INT
-      && (unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000) >= 0x10000
+      && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
+	  >= 0x10000 - extra)
       && !((TARGET_POWERPC64
 	    && (mode == DImode || mode == TImode)
 	    && (INTVAL (XEXP (x, 1)) & 3) != 0)
@@ -3831,10 +3855,12 @@ rs6000_legitimize_address (rtx x, rtx ol
       HOST_WIDE_INT high_int, low_int;
       rtx sum;
       low_int = ((INTVAL (XEXP (x, 1)) & 0xffff) ^ 0x8000) - 0x8000;
+      if (low_int >= 0x8000 - extra)
+	low_int = 0;
       high_int = INTVAL (XEXP (x, 1)) - low_int;
       sum = force_operand (gen_rtx_PLUS (Pmode, XEXP (x, 0),
 					 GEN_INT (high_int)), 0);
-      return gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
+      return plus_constant (sum, low_int);
     }
   else if (GET_CODE (x) == PLUS
 	   && GET_CODE (XEXP (x, 0)) == REG
--- gcc/testsuite/gcc.dg/pr40971.c.jj	2009-08-05 16:46:17.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr40971.c	2009-08-05 16:45:44.000000000 +0200
@@ -0,0 +1,23 @@
+/* PR target/40971 */
+/* { dg-do compile } */
+/* { dg-options "-O -fstack-protector -fno-strict-aliasing" } */
+/* { dg-require-effective-target fstack_protector } */
+
+extern void bar (char *);
+
+void
+foo (int f, long a)
+{
+  {
+    char d[32768];
+    bar (d);
+  }
+  double b = f;
+  while (a)
+    {
+      char c[sizeof (double)];
+      __builtin_memcpy (c, &b, sizeof (c));
+      if (*(double *) c != 2.0)
+	break;
+    }
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- .cvsignore	25 Jul 2009 10:08:12 -0000	1.281
+++ .cvsignore	5 Aug 2009 15:56:25 -0000	1.282
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090725.tar.bz2
+gcc-4.4.1-20090805.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gcc.spec	25 Jul 2009 20:06:16 -0000	1.59
+++ gcc.spec	5 Aug 2009 15:56:25 -0000	1.60
@@ -1,9 +1,9 @@
-%global DATE 20090725
-%global SVNREV 150088
+%global DATE 20090805
+%global SVNREV 150492
 %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 3
+%global gcc_release 4
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -163,6 +163,8 @@ Patch29: gcc44-libstdc++-docs.patch
 Patch30: gcc44-rh503816-1.patch
 Patch31: gcc44-rh503816-2.patch
 Patch32: gcc44-unique-object.patch
+Patch33: gcc44-builtin-unreachable.patch
+Patch34: gcc44-pr40971.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -474,6 +476,8 @@ which are required to compile with the G
 %patch30 -p0 -b .rh503816-1~
 %patch31 -p0 -b .rh503816-2~
 %patch32 -p0 -b .unique-object~
+%patch33 -p0 -b .builtin-unreachable~
+%patch34 -p0 -b .pr40971~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1812,6 +1816,16 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Aug  5 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-4
+- update from gcc-4_4-branch
+  - PRs build/40010, c++/39987, c++/40749, c++/40834, c++/40948, debug/39706,
+	fortran/40822, fortran/40848, fortran/40851, fortran/40878,
+	libfortran/40853, middle-end/40943, rtl-optimization/40924,
+	target/40577, testsuite/40829, testsuite/40891,
+	tree-optimization/40570
+- backport __builtin_unreachable () support
+- fix powerpc ICE in memory_address (#515672, PR target/40971)
+
 * Sat Jul 25 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-3
 - update from gcc-4_4-branch
   - PR fortran/40727


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- sources	25 Jul 2009 20:06:17 -0000	1.285
+++ sources	5 Aug 2009 15:56:25 -0000	1.286
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-790eff8544b324a732498609bffbb7f7  gcc-4.4.1-20090725.tar.bz2
+ab532d487e6e0e1a1a3dd2f202a121b3  gcc-4.4.1-20090805.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 15:57:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 15:57:03 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames.spec,1.117,1.118
Message-ID: <20090805155703.38BAF11C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30250/F-10

Modified Files:
	kdegames.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- Conflicts: kdegames3 < 3.5.10-6
- %check: desktop-file-validate
- use %?_isa in -libs deps



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- kdegames.spec	5 Aug 2009 12:52:01 -0000	1.117
+++ kdegames.spec	5 Aug 2009 15:57:03 -0000	1.118
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -12,6 +12,9 @@ Patch0:  kdegames-4.3.0-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# KSnakeDuel moved here from kdegames3
+Conflicts: kdegames3 < 3.5.10-6
+
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -21,12 +24,13 @@ Provides:  ksudoku = 1:0.5-1
 Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
+BuildRequires: desktop-file-utils
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: qca2-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if "%{?_ggz_version}" < "0.99.5"
 %define _skip_ggzconfig -DSKIP_GGZCONFIG=1
@@ -80,7 +84,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Header files for compiling KDE 4 game applications
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdegames4-devel < %{version}-%{release}
 Provides:  kdegames4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -115,6 +119,12 @@ install -m644 -p -D ./ksquares/src/modul
 %endif
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 %if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
@@ -197,6 +207,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- Conflicts: kdegames3 < 3.5.10-6
+- %%check: desktop-file-validate
+- use %%?_isa in -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Wed Aug  5 15:57:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 15:57:03 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames.spec,1.129,1.130
Message-ID: <20090805155703.620C711C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30250/F-11

Modified Files:
	kdegames.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- Conflicts: kdegames3 < 3.5.10-6
- %check: desktop-file-validate
- use %?_isa in -libs deps



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- kdegames.spec	5 Aug 2009 12:52:01 -0000	1.129
+++ kdegames.spec	5 Aug 2009 15:57:03 -0000	1.130
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -12,6 +12,9 @@ Patch0:  kdegames-4.3.0-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# KSnakeDuel moved here from kdegames3
+Conflicts: kdegames3 < 3.5.10-6
+
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -21,12 +24,13 @@ Provides:  ksudoku = 1:0.5-1
 Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
+BuildRequires: desktop-file-utils
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: qca2-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if "%{?_ggz_version}" < "0.99.5"
 %define _skip_ggzconfig -DSKIP_GGZCONFIG=1
@@ -80,7 +84,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Header files for compiling KDE 4 game applications
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdegames4-devel < %{version}-%{release}
 Provides:  kdegames4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -115,6 +119,12 @@ install -m644 -p -D ./ksquares/src/modul
 %endif
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 %if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
@@ -197,6 +207,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- Conflicts: kdegames3 < 3.5.10-6
+- %%check: desktop-file-validate
+- use %%?_isa in -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From kyle at fedoraproject.org  Wed Aug  5 16:07:45 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed,  5 Aug 2009 16:07:45 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.4.bz2.sign, NONE, 1.1 .cvsignore,
	1.1050, 1.1051 kernel.spec, 1.1685,
	1.1686 linux-2.6-upstream-reverts.patch, 1.9, 1.10 sources,
	1.1012, 1.1013 upstream, 1.923, 1.924 patch-2.6.30.3.bz2.sign,
	1.1, NONE patch-2.6.30.4-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090805160745.338E911C0349@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25310

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.30.4.bz2.sign 
Removed Files:
	patch-2.6.30.3.bz2.sign patch-2.6.30.4-rc1.bz2.sign 
Log Message:
* Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
- Update to released 2.6.30.4.
- Drop now-unneeded upstream reverts.



--- NEW FILE patch-2.6.30.4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKcikpyGugalF9Dw4RAghuAJ4hGw7RUz1Io7pyaK1UwCgq3osI4gCfVXyy
8qT8uiYUt0NbGEhbgLFJ8OQ=
=DF17
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -p -r1.1050 -r1.1051
--- .cvsignore	29 Jul 2009 21:27:54 -0000	1.1050
+++ .cvsignore	5 Aug 2009 16:07:43 -0000	1.1051
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.3.bz2
-patch-2.6.30.4-rc1.bz2
+patch-2.6.30.4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1685
retrieving revision 1.1686
diff -u -p -r1.1685 -r1.1686
--- kernel.spec	29 Jul 2009 21:28:58 -0000	1.1685
+++ kernel.spec	5 Aug 2009 16:07:43 -0000	1.1686
@@ -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 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1835,6 +1835,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
+- Update to released 2.6.30.4.
+- Drop now-unneeded upstream reverts.
+
 * Wed Jul 29 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.30.4-rc1
 

linux-2.6-upstream-reverts.patch:
 0 files changed

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- linux-2.6-upstream-reverts.patch	29 Jul 2009 21:53:01 -0000	1.9
+++ linux-2.6-upstream-reverts.patch	5 Aug 2009 16:07:44 -0000	1.10
@@ -1,454 +1 @@
-From: Alan Stern <stern at rowland.harvard.edu>
-[Alan Stern requested this be removed from -stable]
 
-commit 914b701280a76f96890ad63eb0fa99bf204b961c upstream.
-
-This patch (as1256) changes ehci-hcd and all the other drivers in the
-EHCI family to make use of the new clear_tt_buffer callbacks.  When a
-Clear-TT-Buffer request is in progress for a QH, the QH is not allowed
-to be linked into the async schedule until the request is finished.
-At that time, if there are any URBs queued for the QH, it is linked
-into the async schedule.
-
-Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/usb/host/ehci-au1xxx.c |    2 
- drivers/usb/host/ehci-fsl.c    |    2 
- drivers/usb/host/ehci-hcd.c    |    2 
- drivers/usb/host/ehci-ixp4xx.c |    2 
- drivers/usb/host/ehci-orion.c  |    2 
- drivers/usb/host/ehci-pci.c    |    2 
- drivers/usb/host/ehci-ppc-of.c |    2 
- drivers/usb/host/ehci-ps3.c    |    2 
- drivers/usb/host/ehci-q.c      |   91 ++++++++++++++++++++++++++++++-----------
- drivers/usb/host/ehci.h        |    2 
- 10 files changed, 86 insertions(+), 23 deletions(-)
-
---- a/drivers/usb/host/ehci-au1xxx.c
-+++ b/drivers/usb/host/ehci-au1xxx.c
-@@ -112,6 +112,8 @@ static const struct hc_driver ehci_au1xx
- 	.bus_resume		= ehci_bus_resume,
- 	.relinquish_port	= ehci_relinquish_port,
- 	.port_handed_over	= ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,
- };
- 
- static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
---- a/drivers/usb/host/ehci-fsl.c
-+++ b/drivers/usb/host/ehci-fsl.c
-@@ -324,6 +324,8 @@ static const struct hc_driver ehci_fsl_h
- 	.bus_resume = ehci_bus_resume,
- 	.relinquish_port = ehci_relinquish_port,
- 	.port_handed_over = ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
- };
- 
- static int ehci_fsl_drv_probe(struct platform_device *pdev)
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -353,7 +353,9 @@ struct ehci_qh {
- 	unsigned short		period;		/* polling interval */
- 	unsigned short		start;		/* where polling starts */
- #define NO_FRAME ((unsigned short)~0)			/* pick new start */
-+
- 	struct usb_device	*dev;		/* access to TT */
-+	unsigned		clearing_tt:1;	/* Clear-TT-Buf in progress */
- } __attribute__ ((aligned (32)));
- 
- /*-------------------------------------------------------------------------*/
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1003,6 +1003,8 @@ idle_timeout:
- 		schedule_timeout_uninterruptible(1);
- 		goto rescan;
- 	case QH_STATE_IDLE:		/* fully unlinked */
-+		if (qh->clearing_tt)
-+			goto idle_timeout;
- 		if (list_empty (&qh->qtd_list)) {
- 			qh_put (qh);
- 			break;
---- a/drivers/usb/host/ehci-ixp4xx.c
-+++ b/drivers/usb/host/ehci-ixp4xx.c
-@@ -60,6 +60,8 @@ static const struct hc_driver ixp4xx_ehc
- #endif
- 	.relinquish_port	= ehci_relinquish_port,
- 	.port_handed_over	= ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,
- };
- 
- static int ixp4xx_ehci_probe(struct platform_device *pdev)
---- a/drivers/usb/host/ehci-orion.c
-+++ b/drivers/usb/host/ehci-orion.c
-@@ -164,6 +164,8 @@ static const struct hc_driver ehci_orion
- 	.bus_resume = ehci_bus_resume,
- 	.relinquish_port = ehci_relinquish_port,
- 	.port_handed_over = ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
- };
- 
- static void __init
---- a/drivers/usb/host/ehci-pci.c
-+++ b/drivers/usb/host/ehci-pci.c
-@@ -408,6 +408,8 @@ static const struct hc_driver ehci_pci_h
- 	.bus_resume =		ehci_bus_resume,
- 	.relinquish_port =	ehci_relinquish_port,
- 	.port_handed_over =	ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,
- };
- 
- /*-------------------------------------------------------------------------*/
---- a/drivers/usb/host/ehci-ppc-of.c
-+++ b/drivers/usb/host/ehci-ppc-of.c
-@@ -78,6 +78,8 @@ static const struct hc_driver ehci_ppc_o
- #endif
- 	.relinquish_port	= ehci_relinquish_port,
- 	.port_handed_over	= ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,
- };
- 
- 
---- a/drivers/usb/host/ehci-ps3.c
-+++ b/drivers/usb/host/ehci-ps3.c
-@@ -74,6 +74,8 @@ static const struct hc_driver ps3_ehci_h
- #endif
- 	.relinquish_port	= ehci_relinquish_port,
- 	.port_handed_over	= ehci_port_handed_over,
-+
-+	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,
- };
- 
- static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -139,6 +139,55 @@ qh_refresh (struct ehci_hcd *ehci, struc
- 
- /*-------------------------------------------------------------------------*/
- 
-+static void qh_link_async(struct ehci_hcd *ehci, struct ehci_qh *qh);
-+
-+static void ehci_clear_tt_buffer_complete(struct usb_hcd *hcd,
-+		struct usb_host_endpoint *ep)
-+{
-+	struct ehci_hcd		*ehci = hcd_to_ehci(hcd);
-+	struct ehci_qh		*qh = ep->hcpriv;
-+	unsigned long		flags;
-+
-+	spin_lock_irqsave(&ehci->lock, flags);
-+	qh->clearing_tt = 0;
-+	if (qh->qh_state == QH_STATE_IDLE && !list_empty(&qh->qtd_list)
-+			&& HC_IS_RUNNING(hcd->state))
-+		qh_link_async(ehci, qh);
-+	spin_unlock_irqrestore(&ehci->lock, flags);
-+}
-+
-+static void ehci_clear_tt_buffer(struct ehci_hcd *ehci, struct ehci_qh *qh,
-+		struct urb *urb, u32 token)
-+{
-+
-+	/* If an async split transaction gets an error or is unlinked,
-+	 * the TT buffer may be left in an indeterminate state.  We
-+	 * have to clear the TT buffer.
-+	 *
-+	 * Note: this routine is never called for Isochronous transfers.
-+	 */
-+	if (urb->dev->tt && !usb_pipeint(urb->pipe) && !qh->clearing_tt) {
-+#ifdef DEBUG
-+		struct usb_device *tt = urb->dev->tt->hub;
-+		dev_dbg(&tt->dev,
-+			"clear tt buffer port %d, a%d ep%d t%08x\n",
-+			urb->dev->ttport, urb->dev->devnum,
-+			usb_pipeendpoint(urb->pipe), token);
-+#endif /* DEBUG */
-+		if (!ehci_is_TDI(ehci)
-+				|| urb->dev->tt->hub !=
-+				   ehci_to_hcd(ehci)->self.root_hub) {
-+			if (usb_hub_clear_tt_buffer(urb) == 0)
-+				qh->clearing_tt = 1;
-+		} else {
-+
-+			/* REVISIT ARC-derived cores don't clear the root
-+			 * hub TT buffer in this way...
-+			 */
-+		}
-+	}
-+}
-+
- static int qtd_copy_status (
- 	struct ehci_hcd *ehci,
- 	struct urb *urb,
-@@ -195,28 +244,6 @@ static int qtd_copy_status (
- 			usb_pipeendpoint (urb->pipe),
- 			usb_pipein (urb->pipe) ? "in" : "out",
- 			token, status);
--
--		/* if async CSPLIT failed, try cleaning out the TT buffer */
--		if (status != -EPIPE
--				&& urb->dev->tt
--				&& !usb_pipeint(urb->pipe)
--				&& ((token & QTD_STS_MMF) != 0
--					|| QTD_CERR(token) == 0)
--				&& (!ehci_is_TDI(ehci)
--			                || urb->dev->tt->hub !=
--					   ehci_to_hcd(ehci)->self.root_hub)) {
--#ifdef DEBUG
--			struct usb_device *tt = urb->dev->tt->hub;
--			dev_dbg (&tt->dev,
--				"clear tt buffer port %d, a%d ep%d t%08x\n",
--				urb->dev->ttport, urb->dev->devnum,
--				usb_pipeendpoint (urb->pipe), token);
--#endif /* DEBUG */
--			/* REVISIT ARC-derived cores don't clear the root
--			 * hub TT buffer in this way...
--			 */
--			usb_hub_clear_tt_buffer(urb);
--		}
- 	}
- 
- 	return status;
-@@ -407,9 +434,16 @@ qh_completions (struct ehci_hcd *ehci, s
- 			/* qh unlinked; token in overlay may be most current */
- 			if (state == QH_STATE_IDLE
- 					&& cpu_to_hc32(ehci, qtd->qtd_dma)
--						== qh->hw_current)
-+						== qh->hw_current) {
- 				token = hc32_to_cpu(ehci, qh->hw_token);
- 
-+				/* An unlink may leave an incomplete
-+				 * async transaction in the TT buffer.
-+				 * We have to clear it.
-+				 */
-+				ehci_clear_tt_buffer(ehci, qh, urb, token);
-+			}
-+
- 			/* force halt for unlinked or blocked qh, so we'll
- 			 * patch the qh later and so that completions can't
- 			 * activate it while we "know" it's stopped.
-@@ -435,6 +469,13 @@ halt:
- 					&& (qtd->hw_alt_next
- 						& EHCI_LIST_END(ehci)))
- 				last_status = -EINPROGRESS;
-+
-+			/* As part of low/full-speed endpoint-halt processing
-+			 * we must clear the TT buffer (11.17.5).
-+			 */
-+			if (unlikely(last_status != -EINPROGRESS &&
-+					last_status != -EREMOTEIO))
-+				ehci_clear_tt_buffer(ehci, qh, urb, token);
- 		}
- 
- 		/* if we're removing something not at the queue head,
-@@ -864,6 +905,10 @@ static void qh_link_async (struct ehci_h
- 	__hc32		dma = QH_NEXT(ehci, qh->qh_dma);
- 	struct ehci_qh	*head;
- 
-+	/* Don't link a QH if there's a Clear-TT-Buffer pending */
-+	if (unlikely(qh->clearing_tt))
-+		return;
-+
- 	/* (re)start the async schedule? */
- 	head = ehci->async;
- 	timer_action_done (ehci, TIMER_ASYNC_OFF);
-From: Alan Stern <stern at rowland.harvard.edu>
-[Alan Stern requested this be removed from -stable]
-
-commit cb88a1b887bb8908f6e00ce29e893ea52b074940 upstream.
-
-This patch (as1255) updates the interface for calling
-usb_hub_clear_tt_buffer().  Even the name of the function is changed!
-
-When an async URB (i.e., Control or Bulk) going through a high-speed
-hub to a non-high-speed device is cancelled or fails, the hub's
-Transaction Translator buffer may be left busy still trying to
-complete the transaction.  The buffer has to be cleared; that's what
-usb_hub_clear_tt_buffer() does.
-
-It isn't safe to send any more URBs to the same endpoint until the TT
-buffer is fully clear.  Therefore the HCD needs to be told when the
-Clear-TT-Buffer request has finished.  This patch adds a callback
-method to struct hc_driver for that purpose, and makes the hub driver
-invoke the callback at the proper time.
-
-The patch also changes a couple of names; "hub_tt_kevent" and
-"tt.kevent" now look rather antiquated.
-
-Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/usb/core/hcd.h    |    4 ++++
- drivers/usb/core/hub.c    |   40 ++++++++++++++++++++++++++--------------
- drivers/usb/core/hub.h    |    6 ++++--
- drivers/usb/host/ehci-q.c |    2 +-
- 4 files changed, 35 insertions(+), 17 deletions(-)
-
---- a/drivers/usb/core/hcd.h
-+++ b/drivers/usb/core/hcd.h
-@@ -224,6 +224,10 @@ struct hc_driver {
- 	void	(*relinquish_port)(struct usb_hcd *, int);
- 		/* has a port been handed over to a companion? */
- 	int	(*port_handed_over)(struct usb_hcd *, int);
-+
-+		/* CLEAR_TT_BUFFER completion callback */
-+	void	(*clear_tt_buffer_complete)(struct usb_hcd *,
-+				struct usb_host_endpoint *);
- };
- 
- extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -448,10 +448,10 @@ hub_clear_tt_buffer (struct usb_device *
-  * talking to TTs must queue control transfers (not just bulk and iso), so
-  * both can talk to the same hub concurrently.
-  */
--static void hub_tt_kevent (struct work_struct *work)
-+static void hub_tt_work(struct work_struct *work)
- {
- 	struct usb_hub		*hub =
--		container_of(work, struct usb_hub, tt.kevent);
-+		container_of(work, struct usb_hub, tt.clear_work);
- 	unsigned long		flags;
- 	int			limit = 100;
- 
-@@ -460,6 +460,7 @@ static void hub_tt_kevent (struct work_s
- 		struct list_head	*temp;
- 		struct usb_tt_clear	*clear;
- 		struct usb_device	*hdev = hub->hdev;
-+		const struct hc_driver	*drv;
- 		int			status;
- 
- 		temp = hub->tt.clear_list.next;
-@@ -469,21 +470,25 @@ static void hub_tt_kevent (struct work_s
- 		/* drop lock so HCD can concurrently report other TT errors */
- 		spin_unlock_irqrestore (&hub->tt.lock, flags);
- 		status = hub_clear_tt_buffer (hdev, clear->devinfo, clear->tt);
--		spin_lock_irqsave (&hub->tt.lock, flags);
--
- 		if (status)
- 			dev_err (&hdev->dev,
- 				"clear tt %d (%04x) error %d\n",
- 				clear->tt, clear->devinfo, status);
-+
-+		/* Tell the HCD, even if the operation failed */
-+		drv = clear->hcd->driver;
-+		if (drv->clear_tt_buffer_complete)
-+			(drv->clear_tt_buffer_complete)(clear->hcd, clear->ep);
-+
- 		kfree(clear);
-+		spin_lock_irqsave(&hub->tt.lock, flags);
- 	}
- 	spin_unlock_irqrestore (&hub->tt.lock, flags);
- }
- 
- /**
-- * usb_hub_tt_clear_buffer - clear control/bulk TT state in high speed hub
-- * @udev: the device whose split transaction failed
-- * @pipe: identifies the endpoint of the failed transaction
-+ * usb_hub_clear_tt_buffer - clear control/bulk TT state in high speed hub
-+ * @urb: an URB associated with the failed or incomplete split transaction
-  *
-  * High speed HCDs use this to tell the hub driver that some split control or
-  * bulk transaction failed in a way that requires clearing internal state of
-@@ -493,8 +498,10 @@ static void hub_tt_kevent (struct work_s
-  * It may not be possible for that hub to handle additional full (or low)
-  * speed transactions until that state is fully cleared out.
-  */
--void usb_hub_tt_clear_buffer (struct usb_device *udev, int pipe)
-+int usb_hub_clear_tt_buffer(struct urb *urb)
- {
-+	struct usb_device	*udev = urb->dev;
-+	int			pipe = urb->pipe;
- 	struct usb_tt		*tt = udev->tt;
- 	unsigned long		flags;
- 	struct usb_tt_clear	*clear;
-@@ -506,7 +513,7 @@ void usb_hub_tt_clear_buffer (struct usb
- 	if ((clear = kmalloc (sizeof *clear, GFP_ATOMIC)) == NULL) {
- 		dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
- 		/* FIXME recover somehow ... RESET_TT? */
--		return;
-+		return -ENOMEM;
- 	}
- 
- 	/* info that CLEAR_TT_BUFFER needs */
-@@ -518,14 +525,19 @@ void usb_hub_tt_clear_buffer (struct usb
- 			: (USB_ENDPOINT_XFER_BULK << 11);
- 	if (usb_pipein (pipe))
- 		clear->devinfo |= 1 << 15;
--	
-+
-+	/* info for completion callback */
-+	clear->hcd = bus_to_hcd(udev->bus);
-+	clear->ep = urb->ep;
-+
- 	/* tell keventd to clear state for this TT */
- 	spin_lock_irqsave (&tt->lock, flags);
- 	list_add_tail (&clear->clear_list, &tt->clear_list);
--	schedule_work (&tt->kevent);
-+	schedule_work(&tt->clear_work);
- 	spin_unlock_irqrestore (&tt->lock, flags);
-+	return 0;
- }
--EXPORT_SYMBOL_GPL(usb_hub_tt_clear_buffer);
-+EXPORT_SYMBOL_GPL(usb_hub_clear_tt_buffer);
- 
- /* If do_delay is false, return the number of milliseconds the caller
-  * needs to delay.
-@@ -816,7 +828,7 @@ static void hub_quiesce(struct usb_hub *
- 	if (hub->has_indicators)
- 		cancel_delayed_work_sync(&hub->leds);
- 	if (hub->tt.hub)
--		cancel_work_sync(&hub->tt.kevent);
-+		cancel_work_sync(&hub->tt.clear_work);
- }
- 
- /* caller has locked the hub device */
-@@ -933,7 +945,7 @@ static int hub_configure(struct usb_hub 
- 
- 	spin_lock_init (&hub->tt.lock);
- 	INIT_LIST_HEAD (&hub->tt.clear_list);
--	INIT_WORK (&hub->tt.kevent, hub_tt_kevent);
-+	INIT_WORK(&hub->tt.clear_work, hub_tt_work);
- 	switch (hdev->descriptor.bDeviceProtocol) {
- 		case 0:
- 			break;
---- a/drivers/usb/core/hub.h
-+++ b/drivers/usb/core/hub.h
-@@ -185,16 +185,18 @@ struct usb_tt {
- 	/* for control/bulk error recovery (CLEAR_TT_BUFFER) */
- 	spinlock_t		lock;
- 	struct list_head	clear_list;	/* of usb_tt_clear */
--	struct work_struct			kevent;
-+	struct work_struct	clear_work;
- };
- 
- struct usb_tt_clear {
- 	struct list_head	clear_list;
- 	unsigned		tt;
- 	u16			devinfo;
-+	struct usb_hcd		*hcd;
-+	struct usb_host_endpoint	*ep;
- };
- 
--extern void usb_hub_tt_clear_buffer(struct usb_device *dev, int pipe);
-+extern int usb_hub_clear_tt_buffer(struct urb *urb);
- extern void usb_ep0_reinit(struct usb_device *);
- 
- #endif /* __LINUX_HUB_H */
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -215,7 +215,7 @@ static int qtd_copy_status (
- 			/* REVISIT ARC-derived cores don't clear the root
- 			 * hub TT buffer in this way...
- 			 */
--			usb_hub_tt_clear_buffer (urb->dev, urb->pipe);
-+			usb_hub_clear_tt_buffer(urb);
- 		}
- 	}
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -p -r1.1012 -r1.1013
--- sources	29 Jul 2009 21:27:54 -0000	1.1012
+++ sources	5 Aug 2009 16:07:44 -0000	1.1013
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-4361d948bdcbd298cf6a3ff4189a9d37  patch-2.6.30.3.bz2
-e0910e02830d92375bfcf1597df28762  patch-2.6.30.4-rc1.bz2
+d0fc44b54ba5953140b3f2aa9a1f2580  patch-2.6.30.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -p -r1.923 -r1.924
--- upstream	29 Jul 2009 21:27:54 -0000	1.923
+++ upstream	5 Aug 2009 16:07:44 -0000	1.924
@@ -1,4 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.3.bz2
-patch-2.6.30.4-rc1.bz2
+patch-2.6.30.4.bz2
 


--- patch-2.6.30.3.bz2.sign DELETED ---


--- patch-2.6.30.4-rc1.bz2.sign DELETED ---



From eponyme at fedoraproject.org  Wed Aug  5 16:11:18 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed,  5 Aug 2009 16:11:18 +0000 (UTC)
Subject: rpms/fotowall/devel .cvsignore, 1.6, 1.7 fotowall.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20090805161118.E0F8111C0349@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2418

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 May 2009 19:37:24 -0000	1.6
+++ .cvsignore	5 Aug 2009 16:11:18 -0000	1.7
@@ -1 +1 @@
-fotowall-0.6.1.tar.bz2
+fotowall-0.7.1.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/fotowall.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fotowall.spec	24 Jul 2009 23:03:43 -0000	1.8
+++ fotowall.spec	5 Aug 2009 16:11:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fotowall
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
 
@@ -21,7 +21,9 @@ change colors, text, shadows, etc.. 
 %prep
 %setup -q
 # for hidden-file-or-dir warning 
-sed -i -e "s/\.bin/bin/" %{name}.pro
+sed -i -e "s/\.build/build/" %{name}.pro
+# Unused file
+sed -i -e "/scripts/d" -e "s at man\ \\\@man@" %{name}.pro
 
 %build
 qmake-qt4
@@ -49,11 +51,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/man/man?/%{name}.?.gz
 
-
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1
+- Update to 0.7.1
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Wed May  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.6.1-1
 - Rebuild for 0.6.1
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 May 2009 19:37:24 -0000	1.6
+++ sources	5 Aug 2009 16:11:18 -0000	1.7
@@ -1 +1 @@
-4c0bda6a28c4acc6dbb9539fdb807cda  fotowall-0.6.1.tar.bz2
+f81077b88dafa04e9616e5d1219beb79  fotowall-0.7.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug  5 16:11:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:11:52 +0000
Subject: [pkgdb] php-PHPMailer: remi has requested watchcommits
Message-ID: <20090805161152.676B610F890@bastion2.fedora.phx.redhat.com>

remi has requested the watchcommits acl on php-PHPMailer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From pkgdb at fedoraproject.org  Wed Aug  5 16:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:11:56 +0000
Subject: [pkgdb] php-PHPMailer: remi has requested watchbugzilla
Message-ID: <20090805161156.B352F10F8A0@bastion2.fedora.phx.redhat.com>

remi has requested the watchbugzilla acl on php-PHPMailer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From eponyme at fedoraproject.org  Wed Aug  5 16:12:47 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed,  5 Aug 2009 16:12:47 +0000 (UTC)
Subject: rpms/fotowall/F-11 .cvsignore, 1.6, 1.7 fotowall.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090805161247.B1E9C11C0349@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2805

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 May 2009 19:42:40 -0000	1.6
+++ .cvsignore	5 Aug 2009 16:12:47 -0000	1.7
@@ -1 +1 @@
-fotowall-0.6.1.tar.bz2
+fotowall-0.7.1.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/fotowall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fotowall.spec	8 May 2009 19:42:40 -0000	1.7
+++ fotowall.spec	5 Aug 2009 16:12:47 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.6.1
+Version:        0.7.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -21,7 +21,9 @@ change colors, text, shadows, etc.. 
 %prep
 %setup -q
 # for hidden-file-or-dir warning 
-sed -i -e "s/\.bin/bin/" %{name}.pro
+sed -i -e "s/\.build/build/" %{name}.pro
+# Unused file
+sed -i -e "/scripts/d" -e "s at man\ \\\@man@" %{name}.pro
 
 %build
 qmake-qt4
@@ -49,8 +51,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/man/man?/%{name}.?.gz
 
-
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1
+- Update to 0.7.1
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Wed May  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.6.1-1
 - Rebuild for 0.6.1
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 May 2009 19:42:40 -0000	1.6
+++ sources	5 Aug 2009 16:12:47 -0000	1.7
@@ -1 +1 @@
-4c0bda6a28c4acc6dbb9539fdb807cda  fotowall-0.6.1.tar.bz2
+f81077b88dafa04e9616e5d1219beb79  fotowall-0.7.1.tar.bz2



From eponyme at fedoraproject.org  Wed Aug  5 16:14:03 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Wed,  5 Aug 2009 16:14:03 +0000 (UTC)
Subject: rpms/fotowall/F-10 .cvsignore, 1.6, 1.7 fotowall.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090805161403.D6A7211C0349@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/fotowall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3143

Modified Files:
	.cvsignore fotowall.spec sources 
Log Message:
Update to 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 May 2009 19:46:05 -0000	1.6
+++ .cvsignore	5 Aug 2009 16:14:03 -0000	1.7
@@ -1 +1 @@
-fotowall-0.6.1.tar.bz2
+fotowall-0.7.1.tar.bz2


Index: fotowall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/fotowall.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fotowall.spec	8 May 2009 19:46:05 -0000	1.6
+++ fotowall.spec	5 Aug 2009 16:14:03 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           fotowall
-Version:        0.6.1
+Version:        0.7.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Photo collection creativity tool
@@ -21,7 +21,9 @@ change colors, text, shadows, etc.. 
 %prep
 %setup -q
 # for hidden-file-or-dir warning 
-sed -i -e "s/\.bin/bin/" %{name}.pro
+sed -i -e "s/\.build/build/" %{name}.pro
+# Unused file
+sed -i -e "/scripts/d" -e "s at man\ \\\@man@" %{name}.pro
 
 %build
 qmake-qt4
@@ -49,8 +51,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/man/man?/%{name}.?.gz
 
-
 %changelog
+* Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.7.1-1
+- Update to 0.7.1
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Wed May  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.6.1-1
 - Rebuild for 0.6.1
 * Wed Apr 22 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1:0.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotowall/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 May 2009 19:46:05 -0000	1.6
+++ sources	5 Aug 2009 16:14:03 -0000	1.7
@@ -1 +1 @@
-4c0bda6a28c4acc6dbb9539fdb807cda  fotowall-0.6.1.tar.bz2
+f81077b88dafa04e9616e5d1219beb79  fotowall-0.7.1.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug  5 16:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:14:35 +0000
Subject: [pkgdb] php-PHPMailer had acl change status
Message-ID: <20090805161436.0C76710F899@bastion2.fedora.phx.redhat.com>

monnerat has set the watchbugzilla acl on php-PHPMailer (Fedora devel) to Approved for remi

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From pkgdb at fedoraproject.org  Wed Aug  5 16:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:14:39 +0000
Subject: [pkgdb] php-PHPMailer had acl change status
Message-ID: <20090805161440.7332610F8A1@bastion2.fedora.phx.redhat.com>

monnerat has set the watchcommits acl on php-PHPMailer (Fedora devel) to Approved for remi

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From jakub at fedoraproject.org  Wed Aug  5 16:18:07 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed,  5 Aug 2009 16:18:07 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-pr40971.patch,1.1,1.2
Message-ID: <20090805161807.C14C311C0349@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3950

Modified Files:
	gcc44-pr40971.patch 
Log Message:
4.4.1-4

gcc44-pr40971.patch:
 config/rs6000/rs6000.c     |   28 ++++++++++++++++++++++++++--
 testsuite/gcc.dg/pr40971.c |   23 +++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

Index: gcc44-pr40971.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr40971.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-pr40971.patch	5 Aug 2009 15:56:25 -0000	1.1
+++ gcc44-pr40971.patch	5 Aug 2009 16:18:07 -0000	1.2
@@ -8,19 +8,12 @@
 
 --- gcc/config/rs6000/rs6000.c.jj	2009-04-27 16:47:29.000000000 +0200
 +++ gcc/config/rs6000/rs6000.c	2009-08-05 16:53:42.000000000 +0200
-@@ -3808,6 +3808,8 @@ rtx
- rs6000_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
- 			   enum machine_mode mode)
+@@ -4490,6 +4490,28 @@ rs6000_legitimize_address (rtx x, rtx ol
  {
+   rtx ret = NULL_RTX;
+   rtx orig_x = x;
 +  unsigned int extra = 0;
 +
-   if (GET_CODE (x) == SYMBOL_REF)
-     {
-       enum tls_model model = SYMBOL_REF_TLS_MODEL (x);
-@@ -3815,10 +3817,32 @@ rs6000_legitimize_address (rtx x, rtx ol
- 	return rs6000_legitimize_tls_address (x, model);
-     }
- 
 +  switch (mode)
 +    {
 +    case DFmode:
@@ -41,17 +34,19 @@
 +    default:
 +      break;
 +    }
-+
-   if (GET_CODE (x) == PLUS
-       && GET_CODE (XEXP (x, 0)) == REG
-       && GET_CODE (XEXP (x, 1)) == CONST_INT
--      && (unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000) >= 0x10000
-+      && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
-+	  >= 0x10000 - extra)
-       && !((TARGET_POWERPC64
- 	    && (mode == DImode || mode == TImode)
- 	    && (INTVAL (XEXP (x, 1)) & 3) != 0)
-@@ -3831,10 +3855,12 @@ rs6000_legitimize_address (rtx x, rtx ol
+ 
+   if (GET_CODE (x) == SYMBOL_REF)
+     {
+@@ -4512,7 +4534,7 @@ rs6000_legitimize_address (rtx x, rtx ol
+ 	   && GET_CODE (XEXP (x, 0)) == REG
+ 	   && GET_CODE (XEXP (x, 1)) == CONST_INT
+ 	   && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
+-	       >= 0x10000)
++	       >= 0x10000 - extra)
+ 	   && !((TARGET_POWERPC64
+ 		 && (mode == DImode || mode == TImode)
+ 		 && (INTVAL (XEXP (x, 1)) & 3) != 0)
+@@ -4524,10 +4546,12 @@ rs6000_legitimize_address (rtx x, rtx ol
        HOST_WIDE_INT high_int, low_int;
        rtx sum;
        low_int = ((INTVAL (XEXP (x, 1)) & 0xffff) ^ 0x8000) - 0x8000;
@@ -60,8 +55,8 @@
        high_int = INTVAL (XEXP (x, 1)) - low_int;
        sum = force_operand (gen_rtx_PLUS (Pmode, XEXP (x, 0),
  					 GEN_INT (high_int)), 0);
--      return gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
-+      return plus_constant (sum, low_int);
+-      ret = gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
++      ret = plus_constant (sum, low_int);
      }
    else if (GET_CODE (x) == PLUS
  	   && GET_CODE (XEXP (x, 0)) == REG



From pkgdb at fedoraproject.org  Wed Aug  5 16:23:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:23:44 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper: gouldwp has requested
	watchbugzilla
Message-ID: <20090805162344.DBA8E10F890@bastion2.fedora.phx.redhat.com>

gouldwp has requested the watchbugzilla acl on perl-Apache-Session-Wrapper (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:23:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:23:50 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper: gouldwp has requested
	watchcommits
Message-ID: <20090805162350.5F12F10F8A0@bastion2.fedora.phx.redhat.com>

gouldwp has requested the watchcommits acl on perl-Apache-Session-Wrapper (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:23:54 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper: gouldwp has requested commit
Message-ID: <20090805162354.AE2D510F8AD@bastion2.fedora.phx.redhat.com>

gouldwp has requested the commit acl on perl-Apache-Session-Wrapper (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:25:19 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper: gouldwp has requested
	approveacls
Message-ID: <20090805162519.6BBD810F890@bastion2.fedora.phx.redhat.com>

gouldwp has requested the approveacls acl on perl-Apache-Session-Wrapper (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pbrobinson at fedoraproject.org  Wed Aug  5 16:32:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  5 Aug 2009 16:32:54 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.6, 1.7 mojito.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20090805163254.C8BF411C0349@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7884

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.19.2 - updated translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Jul 2009 14:28:49 -0000	1.6
+++ .cvsignore	5 Aug 2009 16:32:54 -0000	1.7
@@ -1 +1 @@
-mojito-0.19.1.tar.bz2
+mojito-0.19.2.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mojito.spec	28 Jul 2009 14:28:50 -0000	1.8
+++ mojito.spec	5 Aug 2009 16:32:54 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.19.1
+Version:        0.19.2
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -103,6 +103,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Aug  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.2-1
+- Update to 0.19.2 - updated translations
+
 * Tue Jul 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.1-1
 - Update to 0.19.1 - updated translations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Jul 2009 14:28:50 -0000	1.6
+++ sources	5 Aug 2009 16:32:54 -0000	1.7
@@ -1 +1 @@
-30b2aa446f7ab0f3c5c89573ba1bf130  mojito-0.19.1.tar.bz2
+82060180703522e2477b5066ffae8d08  mojito-0.19.2.tar.bz2



From berrange at fedoraproject.org  Wed Aug  5 16:41:25 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed,  5 Aug 2009 16:41:25 +0000 (UTC)
Subject: rpms/perl-Sys-Virt-TCK/devel Sys-Virt-TCK-0.1.0-cleanup-skip.patch, 
	NONE, 1.1 perl-Sys-Virt-TCK.spec, 1.2, 1.3
Message-ID: <20090805164125.C598211C0349@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9746

Modified Files:
	perl-Sys-Virt-TCK.spec 
Added Files:
	Sys-Virt-TCK-0.1.0-cleanup-skip.patch 
Log Message:
Fix missing dep. Fix sanitycheck cleanup. Remove broken test

Sys-Virt-TCK-0.1.0-cleanup-skip.patch:
 TCK.pm |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-cleanup-skip.patch ---
diff -rup Sys-Virt-TCK-0.1.0/lib/Sys/Virt/TCK.pm Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm
--- Sys-Virt-TCK-0.1.0/lib/Sys/Virt/TCK.pm	2009-07-22 18:33:55.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm	2009-08-05 17:22:15.000000000 +0100
@@ -57,7 +57,13 @@ sub setup {
 
     $self->reset if $self->{autoclean};
 
-    $self->sanity_check;
+    eval {
+	$self->sanity_check;
+    };
+    if ($@) {
+	$self->{conn} = undef;
+	die $@;
+    }
 
     return $self->{conn};
 }


Index: perl-Sys-Virt-TCK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel/perl-Sys-Virt-TCK.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Sys-Virt-TCK.spec	26 Jul 2009 16:38:15 -0000	1.2
+++ perl-Sys-Virt-TCK.spec	5 Aug 2009 16:41:25 -0000	1.3
@@ -10,10 +10,11 @@
 Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit
 Name: perl-%{appname}
 Version: 0.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 License: GPLv2 or Artistic
 Group: Development/Tools
 Source: http://libvirt.org/sources/tck/%{appname}-%{version}.tar.gz
+Patch1: %{appname}-%{version}-cleanup-skip.patch
 Url: http://libvirt.org/
 BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libvirt >= 0.6.2
@@ -42,6 +43,8 @@ BuildRequires: perl(XML::Writer)
 BuildRequires: perl(XML::XPath)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
+# RPM autoprovides mising this
+Requires: perl(Test::Exception)
 BuildArchitectures: noarch
 
 %description
@@ -51,7 +54,7 @@ technology.
 
 %prep
 %setup -q -n %{appname}-%{version}
-
+%patch1 -p1
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -69,6 +72,9 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 %__install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt-tck
 
+# Requires newer libvirt perl binding
+rm -f $RPM_BUILD_ROOT/%{_datadir}/libvirt-tck/tests/storage/200-clone-vol-dir.t
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/cache/libvirt-tck
 
 %changelog
+* Wed Aug  5 2009 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-5
+- Add missing perl-Test-Exception dep
+- Skip cleanup if sanity check fails
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Aug  5 16:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:43:20 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper had acl change status
Message-ID: <20090805164320.D93D010F890@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Apache-Session-Wrapper (Fedora EPEL 5) to Approved for gouldwp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:43:21 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper had acl change status
Message-ID: <20090805164321.BDF0F10F8A0@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Apache-Session-Wrapper (Fedora EPEL 5) to Approved for gouldwp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:43:22 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper had acl change status
Message-ID: <20090805164322.5F62110F8A9@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on perl-Apache-Session-Wrapper (Fedora EPEL 5) to Approved for gouldwp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:43:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:43:23 +0000
Subject: [pkgdb] perl-Apache-Session-Wrapper had acl change status
Message-ID: <20090805164323.9245D10F8AD@bastion2.fedora.phx.redhat.com>

spot has set the approveacls acl on perl-Apache-Session-Wrapper (Fedora EPEL 5) to Approved for gouldwp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Apache-Session-Wrapper



From pkgdb at fedoraproject.org  Wed Aug  5 16:46:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:46:55 +0000
Subject: [pkgdb] vacation was added for bubeck
Message-ID: <20090805164655.A444010F88F@bastion2.fedora.phx.redhat.com>

tibbs has added Package vacation with summary Automatic mail answering program
tibbs has approved Package vacation
tibbs has added a Fedora devel branch for vacation with an owner of bubeck
tibbs has approved vacation in Fedora devel
tibbs has approved Package vacation
tibbs has set commit to Approved for 107427 on vacation (Fedora devel)
tibbs has set checkout to Approved for 107427 on vacation (Fedora devel)
tibbs has set build to Approved for 107427 on vacation (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vacation



From pkgdb at fedoraproject.org  Wed Aug  5 16:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:46:56 +0000
Subject: [pkgdb] vacation summary updated by tibbs
Message-ID: <20090805164656.EC00310F89F@bastion2.fedora.phx.redhat.com>

tibbs set package vacation summary to Automatic mail answering program

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vacation



From pkgdb at fedoraproject.org  Wed Aug  5 16:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:46:56 +0000
Subject: [pkgdb] vacation (Fedora, 11) updated by tibbs
Message-ID: <20090805164657.1254010F8A2@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for vacation
tibbs has set commit to Approved for 107427 on vacation (Fedora 11)
tibbs has set checkout to Approved for 107427 on vacation (Fedora 11)
tibbs has set build to Approved for 107427 on vacation (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vacation



From pkgdb at fedoraproject.org  Wed Aug  5 16:46:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:46:56 +0000
Subject: [pkgdb] vacation (Fedora, 11) updated by tibbs
Message-ID: <20090805164657.1ABA710F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for vacation
tibbs has set commit to Approved for 107427 on vacation (Fedora 10)
tibbs has set checkout to Approved for 107427 on vacation (Fedora 10)
tibbs has set build to Approved for 107427 on vacation (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vacation



From tibbs at fedoraproject.org  Wed Aug  5 16:47:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:02 +0000 (UTC)
Subject: rpms/vacation - New directory
Message-ID: <20090805164702.2AEA911C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vacation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11050/rpms/vacation

Log Message:
Directory /cvs/pkgs/rpms/vacation added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 16:47:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:02 +0000 (UTC)
Subject: rpms/vacation/devel - New directory
Message-ID: <20090805164702.4891111C034A@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vacation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11050/rpms/vacation/devel

Log Message:
Directory /cvs/pkgs/rpms/vacation/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 16:47:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:08 +0000 (UTC)
Subject: rpms/vacation Makefile,NONE,1.1
Message-ID: <20090805164708.1B46911C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vacation
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11050/rpms/vacation

Added Files:
	Makefile 
Log Message:
Setup of module vacation


--- NEW FILE Makefile ---
# Top level Makefile for module vacation
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 16:47:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:08 +0000 (UTC)
Subject: rpms/vacation/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090805164708.502C611C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vacation/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl11050/rpms/vacation/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vacation


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vacation
# $Id: Makefile,v 1.1 2009/08/05 16:47:08 tibbs Exp $
NAME := vacation
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 16:47:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:47:43 +0000
Subject: [pkgdb] cxxtest was added for mgieseki
Message-ID: <20090805164743.E6D0D10F88F@bastion2.fedora.phx.redhat.com>

tibbs has added Package cxxtest with summary A JUnit-like testing framework for C++
tibbs has approved Package cxxtest
tibbs has added a Fedora devel branch for cxxtest with an owner of mgieseki
tibbs has approved cxxtest in Fedora devel
tibbs has approved Package cxxtest
tibbs has set commit to Approved for 107427 on cxxtest (Fedora devel)
tibbs has set checkout to Approved for 107427 on cxxtest (Fedora devel)
tibbs has set build to Approved for 107427 on cxxtest (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cxxtest



From pkgdb at fedoraproject.org  Wed Aug  5 16:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:47:46 +0000
Subject: [pkgdb] cxxtest summary updated by tibbs
Message-ID: <20090805164746.5B0B810F8B0@bastion2.fedora.phx.redhat.com>

tibbs set package cxxtest summary to A JUnit-like testing framework for C++

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cxxtest



From pkgdb at fedoraproject.org  Wed Aug  5 16:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:47:46 +0000
Subject: [pkgdb] cxxtest (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164746.6FB7110F8B6@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for cxxtest
tibbs has set commit to Approved for 107427 on cxxtest (Fedora 11)
tibbs has set checkout to Approved for 107427 on cxxtest (Fedora 11)
tibbs has set build to Approved for 107427 on cxxtest (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cxxtest



From pkgdb at fedoraproject.org  Wed Aug  5 16:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:47:46 +0000
Subject: [pkgdb] cxxtest (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164746.7B8F610F8B8@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for cxxtest
tibbs has set commit to Approved for 107427 on cxxtest (Fedora 10)
tibbs has set checkout to Approved for 107427 on cxxtest (Fedora 10)
tibbs has set build to Approved for 107427 on cxxtest (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cxxtest



From pkgdb at fedoraproject.org  Wed Aug  5 16:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:47:46 +0000
Subject: [pkgdb] cxxtest (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164746.AA03310F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for cxxtest
tibbs has set commit to Approved for 107427 on cxxtest (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on cxxtest (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on cxxtest (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cxxtest



From tibbs at fedoraproject.org  Wed Aug  5 16:47:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:53 +0000 (UTC)
Subject: rpms/cxxtest - New directory
Message-ID: <20090805164753.1CCCC11C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/cxxtest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc11418/rpms/cxxtest

Log Message:
Directory /cvs/pkgs/rpms/cxxtest added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 16:47:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:53 +0000 (UTC)
Subject: rpms/cxxtest/devel - New directory
Message-ID: <20090805164753.47DB211C0383@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/cxxtest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc11418/rpms/cxxtest/devel

Log Message:
Directory /cvs/pkgs/rpms/cxxtest/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 16:47:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:59 +0000 (UTC)
Subject: rpms/cxxtest Makefile,NONE,1.1
Message-ID: <20090805164759.8D1E211C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/cxxtest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc11418/rpms/cxxtest

Added Files:
	Makefile 
Log Message:
Setup of module cxxtest


--- NEW FILE Makefile ---
# Top level Makefile for module cxxtest
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 16:47:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:47:59 +0000 (UTC)
Subject: rpms/cxxtest/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090805164759.E281411C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/cxxtest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsc11418/rpms/cxxtest/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cxxtest


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cxxtest
# $Id: Makefile,v 1.1 2009/08/05 16:47:59 tibbs Exp $
NAME := cxxtest
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 16:48:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:48:22 +0000
Subject: [pkgdb] pipestat was added for smilner
Message-ID: <20090805164822.8612910F8AF@bastion2.fedora.phx.redhat.com>

tibbs has added Package pipestat with summary Simple python script to watch data flowing over an anonymous pipe on shell consoles
tibbs has approved Package pipestat
tibbs has added a Fedora devel branch for pipestat with an owner of smilner
tibbs has approved pipestat in Fedora devel
tibbs has approved Package pipestat
tibbs has set commit to Approved for 107427 on pipestat (Fedora devel)
tibbs has set checkout to Approved for 107427 on pipestat (Fedora devel)
tibbs has set build to Approved for 107427 on pipestat (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pipestat



From pkgdb at fedoraproject.org  Wed Aug  5 16:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:48:23 +0000
Subject: [pkgdb] pipestat summary updated by tibbs
Message-ID: <20090805164823.5C06E10F8B2@bastion2.fedora.phx.redhat.com>

tibbs set package pipestat summary to Simple python script to watch data flowing over an anonymous pipe on shell consoles

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pipestat



From pkgdb at fedoraproject.org  Wed Aug  5 16:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:48:23 +0000
Subject: [pkgdb] pipestat (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164823.6DC7E10F8CC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for pipestat
tibbs has set commit to Approved for 107427 on pipestat (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on pipestat (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on pipestat (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pipestat



From pkgdb at fedoraproject.org  Wed Aug  5 16:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:48:23 +0000
Subject: [pkgdb] pipestat (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164823.64F4210F8CA@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for pipestat
tibbs has set commit to Approved for 107427 on pipestat (Fedora 11)
tibbs has set checkout to Approved for 107427 on pipestat (Fedora 11)
tibbs has set build to Approved for 107427 on pipestat (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pipestat



From tibbs at fedoraproject.org  Wed Aug  5 16:48:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:48:29 +0000 (UTC)
Subject: rpms/pipestat - New directory
Message-ID: <20090805164829.18F9D11C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pipestat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz11836/rpms/pipestat

Log Message:
Directory /cvs/pkgs/rpms/pipestat added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 16:48:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:48:29 +0000 (UTC)
Subject: rpms/pipestat/devel - New directory
Message-ID: <20090805164829.3855E11C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pipestat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz11836/rpms/pipestat/devel

Log Message:
Directory /cvs/pkgs/rpms/pipestat/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug  5 16:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:48:23 +0000
Subject: [pkgdb] pipestat (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164823.7576510F8CF@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for pipestat
tibbs has set commit to Approved for 107427 on pipestat (Fedora 10)
tibbs has set checkout to Approved for 107427 on pipestat (Fedora 10)
tibbs has set build to Approved for 107427 on pipestat (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pipestat



From tibbs at fedoraproject.org  Wed Aug  5 16:48:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:48:35 +0000 (UTC)
Subject: rpms/pipestat Makefile,NONE,1.1
Message-ID: <20090805164835.57B8211C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pipestat
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz11836/rpms/pipestat

Added Files:
	Makefile 
Log Message:
Setup of module pipestat


--- NEW FILE Makefile ---
# Top level Makefile for module pipestat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 16:48:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 16:48:35 +0000 (UTC)
Subject: rpms/pipestat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090805164835.9210F11C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/pipestat/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz11836/rpms/pipestat/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pipestat


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pipestat
# $Id: Makefile,v 1.1 2009/08/05 16:48:35 tibbs Exp $
NAME := pipestat
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 16:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 16:49:22 +0000
Subject: [pkgdb] php-PHPMailer (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090805164922.E3C2310F8BD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for php-PHPMailer
tibbs has set commit to Approved for 107427 on php-PHPMailer (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on php-PHPMailer (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on php-PHPMailer (Fedora EPEL 5)
tibbs changed owner of php-PHPMailer in Fedora EPEL 5 to remi

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-PHPMailer



From tmraz at fedoraproject.org  Wed Aug  5 16:51:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  5 Aug 2009 16:51:10 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.22,1.23
Message-ID: <20090805165110.1E2CA11C0349@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12404

Modified Files:
	cronie.spec 
Log Message:
* Wed Aug  5 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-4
- 515762 move anacron provides and obsoletes to the anacron subpackage



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- cronie.spec	24 Jul 2009 19:39:27 -0000	1.22
+++ cronie.spec	5 Aug 2009 16:51:09 -0000	1.23
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -18,8 +18,6 @@ Requires: /usr/sbin/sendmail
 Conflicts: sysklogd < 1.4.1
 Provides: vixie-cron = 4:4.4
 Obsoletes: vixie-cron <= 4:4.3
-Provides: anacron = 2.3
-Obsoletes: anacron <= 2.3
 
 %if %{with selinux}
 Requires: libselinux >= 2.0.64
@@ -49,6 +47,8 @@ SELinux.
 Summary: Utility for running regular jobs
 Requires: crontabs
 Group: System Environment/Base
+Provides: anacron = 2.4
+Obsoletes: anacron <= 2.3
 
 %description anacron
 Anacron becames part of cronie. Anacron is used only for running regular jobs.
@@ -151,6 +151,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Wed Aug  5 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-4
+- 515762 move anacron provides and obsoletes to the anacron subpackage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mgieseki at fedoraproject.org  Wed Aug  5 17:13:01 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 17:13:01 +0000 (UTC)
Subject: rpms/cxxtest/devel cxxtest.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805171301.5FA5811C0349@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/cxxtest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18202/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cxxtest.spec import.log 
Log Message:
initial import



--- NEW FILE cxxtest.spec ---
Name:           cxxtest
Version:        3.10.1
Release:        3%{?dist}
Summary:        A JUnit-like testing framework for C++

Group:          Development/Tools
License:        LGPLv2+
URL:            http://cxxtest.tigris.org
Source0:        http://cxxtest.tigris.org/files/documents/6421/43281/%{name}-%{version}.tar.gz

# Documentation
Source1:        http://cxxtest.tigris.org/files/documents/6421/43284/%{name}-guide-%{version}.pdf

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
Its advantages over existing alternatives are that it:
 - doesn't require RTTI
 - doesn't require member template functions
 - doesn't require exception handling
 - doesn't require any external libraries (including memory management,
   file/console I/O, graphics libraries)


%package doc
Summary:        Documentation on how to use CxxTest
Group:          Documentation

%description doc
This package contains the documentation on how to use CxxTest.


%prep
%setup -q -n %{name}
cp -a %{SOURCE1} .

%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 644 cxxtest/* $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 755 cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen.py
ln -s %{_bindir}/cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README Versions
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif  
%{_bindir}/cxxtestgen.py
%{_bindir}/cxxtestgen
%{_includedir}/cxxtest/



%files doc 
%defattr(-,root,root,-)
%doc cxxtest-guide-3.10.1.pdf


%changelog
* Wed Aug 05 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-3
- added exclude tags in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-2
- moved headers from devel to main package
- added BuildRequires to avoid build problems
- dropped Requires tag
- cxxtest include directory now explicitely listed in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-1
- initial release


--- NEW FILE import.log ---
cxxtest-3_10_1-3_fc11:HEAD:cxxtest-3.10.1-3.fc11.src.rpm:1249492332


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cxxtest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:47:59 -0000	1.1
+++ .cvsignore	5 Aug 2009 17:13:01 -0000	1.2
@@ -0,0 +1,2 @@
+cxxtest-3.10.1.tar.gz
+cxxtest-guide-3.10.1.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cxxtest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:59 -0000	1.1
+++ sources	5 Aug 2009 17:13:01 -0000	1.2
@@ -0,0 +1,2 @@
+ec7d089b6b5d67048e7db84c3231a35c  cxxtest-3.10.1.tar.gz
+d2b0f683457ef266a316d47fc97115b1  cxxtest-guide-3.10.1.pdf



From rdieter at fedoraproject.org  Wed Aug  5 17:19:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:19:15 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.93,1.94
Message-ID: <20090805171915.E846511C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19968

Modified Files:
	digikam.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.4.beta3
- drop xdg-utils references 
- tighten -libs related deps via %{?_isa}



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- digikam.spec	24 Jul 2009 12:08:54 -0000	1.93
+++ digikam.spec	5 Aug 2009 17:19:15 -0000	1.94
@@ -23,13 +23,11 @@ BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: jasper-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
-BuildRequires: kdeedu-devel >= 4.2.0
-Requires: kdeedu-marble >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 
 BuildRequires: kdelibs4-devel
-# Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
-#Requires: kdelibs4 >= %{kde4_version}
 
 # trash protocol support needed
 # FIXME: should probably be handled lower in the stack
@@ -45,9 +43,7 @@ BuildRequires: sqlite-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
-Requires: %{name}-libs = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -65,13 +61,15 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version}
 %description libs
 %{summary}.
 
 %package devel
 Summary: Development files for %{name}
 Group:	 Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 This package contains the libraries, include files and other resources
 needed to develop applications using %{name}.
@@ -145,7 +143,8 @@ rm -rf %{buildroot}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libdigikamcore.so.1*
+%{_kde4_libdir}/libdigikamdatabase.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -155,6 +154,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.4.beta3
+- drop xdg-utils references 
+- tighten -libs related deps via %%{?_isa}
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.3.beta3
 - digikam-1.0.0-beta3
 



From mgieseki at fedoraproject.org  Wed Aug  5 17:20:08 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 17:20:08 +0000 (UTC)
Subject: rpms/cxxtest/EL-5 cxxtest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090805172008.B28FC11C0425@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/cxxtest/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20205/EL-5

Modified Files:
	sources 
Added Files:
	cxxtest.spec 
Log Message:
set up branch directories


--- NEW FILE cxxtest.spec ---
Name:           cxxtest
Version:        3.10.1
Release:        3%{?dist}
Summary:        A JUnit-like testing framework for C++

Group:          Development/Tools
License:        LGPLv2+
URL:            http://cxxtest.tigris.org
Source0:        http://cxxtest.tigris.org/files/documents/6421/43281/%{name}-%{version}.tar.gz

# Documentation
Source1:        http://cxxtest.tigris.org/files/documents/6421/43284/%{name}-guide-%{version}.pdf

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
Its advantages over existing alternatives are that it:
 - doesn't require RTTI
 - doesn't require member template functions
 - doesn't require exception handling
 - doesn't require any external libraries (including memory management,
   file/console I/O, graphics libraries)


%package doc
Summary:        Documentation on how to use CxxTest
Group:          Documentation

%description doc
This package contains the documentation on how to use CxxTest.


%prep
%setup -q -n %{name}
cp -a %{SOURCE1} .

%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 644 cxxtest/* $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 755 cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen.py
ln -s %{_bindir}/cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README Versions
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif  
%{_bindir}/cxxtestgen.py
%{_bindir}/cxxtestgen
%{_includedir}/cxxtest/



%files doc 
%defattr(-,root,root,-)
%doc cxxtest-guide-3.10.1.pdf


%changelog
* Wed Aug 05 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-3
- added exclude tags in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-2
- moved headers from devel to main package
- added BuildRequires to avoid build problems
- dropped Requires tag
- cxxtest include directory now explicitely listed in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cxxtest/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:59 -0000	1.1
+++ sources	5 Aug 2009 17:20:08 -0000	1.2
@@ -0,0 +1,2 @@
+ec7d089b6b5d67048e7db84c3231a35c  cxxtest-3.10.1.tar.gz
+d2b0f683457ef266a316d47fc97115b1  cxxtest-guide-3.10.1.pdf



From mgieseki at fedoraproject.org  Wed Aug  5 17:20:08 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 17:20:08 +0000 (UTC)
Subject: rpms/cxxtest/F-10 cxxtest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090805172008.ED93811C0425@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/cxxtest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20205/F-10

Modified Files:
	sources 
Added Files:
	cxxtest.spec 
Log Message:
set up branch directories


--- NEW FILE cxxtest.spec ---
Name:           cxxtest
Version:        3.10.1
Release:        3%{?dist}
Summary:        A JUnit-like testing framework for C++

Group:          Development/Tools
License:        LGPLv2+
URL:            http://cxxtest.tigris.org
Source0:        http://cxxtest.tigris.org/files/documents/6421/43281/%{name}-%{version}.tar.gz

# Documentation
Source1:        http://cxxtest.tigris.org/files/documents/6421/43284/%{name}-guide-%{version}.pdf

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
Its advantages over existing alternatives are that it:
 - doesn't require RTTI
 - doesn't require member template functions
 - doesn't require exception handling
 - doesn't require any external libraries (including memory management,
   file/console I/O, graphics libraries)


%package doc
Summary:        Documentation on how to use CxxTest
Group:          Documentation

%description doc
This package contains the documentation on how to use CxxTest.


%prep
%setup -q -n %{name}
cp -a %{SOURCE1} .

%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 644 cxxtest/* $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 755 cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen.py
ln -s %{_bindir}/cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README Versions
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif  
%{_bindir}/cxxtestgen.py
%{_bindir}/cxxtestgen
%{_includedir}/cxxtest/



%files doc 
%defattr(-,root,root,-)
%doc cxxtest-guide-3.10.1.pdf


%changelog
* Wed Aug 05 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-3
- added exclude tags in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-2
- moved headers from devel to main package
- added BuildRequires to avoid build problems
- dropped Requires tag
- cxxtest include directory now explicitely listed in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cxxtest/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:59 -0000	1.1
+++ sources	5 Aug 2009 17:20:08 -0000	1.2
@@ -0,0 +1,2 @@
+ec7d089b6b5d67048e7db84c3231a35c  cxxtest-3.10.1.tar.gz
+d2b0f683457ef266a316d47fc97115b1  cxxtest-guide-3.10.1.pdf



From mgieseki at fedoraproject.org  Wed Aug  5 17:20:09 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed,  5 Aug 2009 17:20:09 +0000 (UTC)
Subject: rpms/cxxtest/F-11 cxxtest.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090805172009.3958111C04E3@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/cxxtest/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20205/F-11

Modified Files:
	sources 
Added Files:
	cxxtest.spec 
Log Message:
set up branch directories


--- NEW FILE cxxtest.spec ---
Name:           cxxtest
Version:        3.10.1
Release:        3%{?dist}
Summary:        A JUnit-like testing framework for C++

Group:          Development/Tools
License:        LGPLv2+
URL:            http://cxxtest.tigris.org
Source0:        http://cxxtest.tigris.org/files/documents/6421/43281/%{name}-%{version}.tar.gz

# Documentation
Source1:        http://cxxtest.tigris.org/files/documents/6421/43284/%{name}-guide-%{version}.pdf

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
Its advantages over existing alternatives are that it:
 - doesn't require RTTI
 - doesn't require member template functions
 - doesn't require exception handling
 - doesn't require any external libraries (including memory management,
   file/console I/O, graphics libraries)


%package doc
Summary:        Documentation on how to use CxxTest
Group:          Documentation

%description doc
This package contains the documentation on how to use CxxTest.


%prep
%setup -q -n %{name}
cp -a %{SOURCE1} .

%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 644 cxxtest/* $RPM_BUILD_ROOT/%{_includedir}/cxxtest
install -D -p -m 755 cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen.py
ln -s %{_bindir}/cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README Versions
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif  
%{_bindir}/cxxtestgen.py
%{_bindir}/cxxtestgen
%{_includedir}/cxxtest/



%files doc 
%defattr(-,root,root,-)
%doc cxxtest-guide-3.10.1.pdf


%changelog
* Wed Aug 05 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-3
- added exclude tags in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-2
- moved headers from devel to main package
- added BuildRequires to avoid build problems
- dropped Requires tag
- cxxtest include directory now explicitely listed in files section

* Tue Aug 04 2009 Martin Gieseking <martin.gieseking at uos.de> - 3.10.1-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cxxtest/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:59 -0000	1.1
+++ sources	5 Aug 2009 17:20:09 -0000	1.2
@@ -0,0 +1,2 @@
+ec7d089b6b5d67048e7db84c3231a35c  cxxtest-3.10.1.tar.gz
+d2b0f683457ef266a316d47fc97115b1  cxxtest-guide-3.10.1.pdf



From twaugh at fedoraproject.org  Wed Aug  5 17:26:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  5 Aug 2009 17:26:01 +0000 (UTC)
Subject: rpms/hplip/devel hplip-3.9.8.tar.gz.asc, NONE, 1.1 .cvsignore, 1.32,
	1.33 hplip.spec, 1.214, 1.215 sources, 1.32,
	1.33 hplip-dbus.patch, 1.1, NONE hplip-desktop.patch, 1.7,
	NONE hplip-device-id.patch, 1.4, NONE hplip-disc-media.patch,
	1.2, NONE hplip-libsane.patch, 1.6,
	NONE hplip-marker-supply.patch, 1.9,
	NONE hplip-no-root-config.patch, 1.10,
	NONE hplip-resolution-405400.patch, 1.1,
	NONE hplip-segfault.patch, 1.2, NONE
Message-ID: <20090805172601.5ACDD11C0349@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21471

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-3.9.8.tar.gz.asc 
Removed Files:
	hplip-dbus.patch hplip-desktop.patch hplip-device-id.patch 
	hplip-disc-media.patch hplip-libsane.patch 
	hplip-marker-supply.patch hplip-no-root-config.patch 
	hplip-resolution-405400.patch hplip-segfault.patch 
Log Message:
* Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
- 3.9.8.



--- NEW FILE hplip-3.9.8.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4q+sACgkQhA7anpATwAWrnwCeNjw4P14Md8GsBRtbgLo+Hr6M
nwMAoJoSt8h4xjpXdmEWuhoFie0drfBT
=pkCz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	27 Jul 2009 18:23:08 -0000	1.32
+++ .cvsignore	5 Aug 2009 17:26:00 -0000	1.33
@@ -29,3 +29,4 @@ hplip-2.8.10.tar.gz
 hplip-2.8.12.tar.gz
 hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
+hplip-3.9.8.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- hplip.spec	4 Aug 2009 10:03:53 -0000	1.214
+++ hplip.spec	5 Aug 2009 17:26:01 -0000	1.215
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.6b
-Release: 5%{?dist}
+Version: 3.9.8
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,17 +14,8 @@ Conflicts: selinux-policy < 3.0.3-3
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
-Patch1: hplip-desktop.patch
-Patch2: hplip-segfault.patch
-Patch3: hplip-device-id.patch
-Patch4: hplip-marker-supply.patch
-Patch5: hplip-dbus.patch
-Patch6: hplip-strstr-const.patch
-Patch8: hplip-libsane.patch
-Patch12: hplip-no-root-config.patch
-Patch13: hplip-ui-optional.patch
-Patch14: hplip-disc-media.patch
-Patch15: hplip-resolution-405400.patch
+Patch1: hplip-strstr-const.patch
+Patch2: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -106,47 +97,11 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fix desktop file.
-%patch1 -p1 -b .desktop
-
-# Prevent crash when DEVICE_URI/PRINTER environment variables are not
-# set (bug #479808 comment 6).
-%patch2 -p1 -b .segfault
-
-# Fixed device-id attributes reported by backend.
-%patch3 -p1 -b .device-id
-
-# Low ink is a warning condition, not an error.
-%patch4 -p1 -b .marker-supply
-
-# Prevent backend crash when D-Bus not running (bug #474362).
-%patch5 -p1 -b .dbus
-
 # Fix compilation.
-%patch6 -p1 -b .strstr-const
-
-# Link libsane-hpaio against libsane (bug #234813).
-%patch8 -p1 -b .libsane
-
-# Prevent SELinux audit message from the CUPS backends (bug #241776)
-%patch12 -p1 -b .no-root-config
+%patch1 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
-%patch13 -p1 -b .ui-optional
-
-# Set disc media for disc page sizes (bug #495672).
-%patch14 -p1 -b .disc-media
-
-# Fixed HWResolution for 'Normal' output from the hpcups driver
-# (laundpad bug #405400).
-%patch15 -p1 -b .resolution-405400
-
-# Fix hpcups fax PPDs (bug #515356)
-pushd fax/ppd
-gunzip *hpcups*
-perl -pi -e 's/^(\*Product:.*\")(.*)\"/\1(\2)"/' *hpcups*
-gzip -n *hpcups*
-popd
+%patch2 -p1 -b .ui-optional
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
@@ -355,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
+- 3.9.8.
+
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
 - Fix hpcups fax PPDs (bug #515356)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Jul 2009 18:23:08 -0000	1.32
+++ sources	5 Aug 2009 17:26:01 -0000	1.33
@@ -1 +1 @@
-49a87fe7d7a57a075ed9631113cee662  hplip-3.9.6b.tar.gz
+cb1cf49c5f062993b78fc2768f531ed8  hplip-3.9.8.tar.gz


--- hplip-dbus.patch DELETED ---


--- hplip-desktop.patch DELETED ---


--- hplip-device-id.patch DELETED ---


--- hplip-disc-media.patch DELETED ---


--- hplip-libsane.patch DELETED ---


--- hplip-marker-supply.patch DELETED ---


--- hplip-no-root-config.patch DELETED ---


--- hplip-resolution-405400.patch DELETED ---


--- hplip-segfault.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Aug  5 17:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 17:26:44 +0000
Subject: [pkgdb] vbetool (Fedora, 10) updated by toshio
Message-ID: <20090805172644.7AFFA10F9DF@bastion2.fedora.phx.redhat.com>

toshio changed owner of vbetool in Fedora 11 to ajax

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 17:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 17:26:44 +0000
Subject: [pkgdb] vbetool (Fedora, 10) updated by toshio
Message-ID: <20090805172644.84B6710F9E4@bastion2.fedora.phx.redhat.com>

toshio changed owner of vbetool in Fedora 10 to ajax

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From pkgdb at fedoraproject.org  Wed Aug  5 17:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 17:26:44 +0000
Subject: [pkgdb] vbetool (Fedora, 10) updated by toshio
Message-ID: <20090805172644.953F710F9E9@bastion2.fedora.phx.redhat.com>

toshio changed owner of vbetool in Fedora devel to ajax

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vbetool



From rdieter at fedoraproject.org  Wed Aug  5 17:27:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:27:58 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.94,1.95
Message-ID: <20090805172758.7BCD411C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22106

Modified Files:
	digikam.spec 
Log Message:
Releae++



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- digikam.spec	5 Aug 2009 17:19:15 -0000	1.94
+++ digikam.spec	5 Aug 2009 17:27:58 -0000	1.95
@@ -3,7 +3,7 @@
 
 Name:	 digikam
 Version: 1.0.0
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia



From rdieter at fedoraproject.org  Wed Aug  5 17:31:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:31:17 +0000 (UTC)
Subject: rpms/digikam/F-11 digikam.spec,1.88,1.89
Message-ID: <20090805173117.BFBAD11C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22897

Modified Files:
	digikam.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
- rebuild against kde-4.3
- optimize scriptlets
- tighten -libs related deps via %{?_isa}



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/digikam.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- digikam.spec	17 Mar 2009 15:20:10 -0000	1.88
+++ digikam.spec	5 Aug 2009 17:31:17 -0000	1.89
@@ -1,7 +1,7 @@
 
 Name:	 digikam
 Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -20,13 +20,12 @@ BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: jasper-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
-BuildRequires: kdeedu-devel >= 4.2.0
-Requires: kdeedu-marble >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 
 BuildRequires: kdelibs4-devel
-# Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
+# min kdelibs Req
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
-#Requires: kdelibs4 >= %{kde4_version}
 
 # trash protocol support needed
 # FIXME: should probably be handled lower in the stack
@@ -41,9 +40,7 @@ BuildRequires: sqlite-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
-Requires: %{name}-libs = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -61,13 +58,15 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version} 
 %description libs
 %{summary}.
 
 %package devel
 Summary: Development files for %{name}
 Group:	 Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 This package contains the libraries, include files and other resources
 needed to develop applications using %{name}.
@@ -108,12 +107,18 @@ desktop-file-validate %{buildroot}%{_dat
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -141,7 +146,8 @@ rm -rf %{buildroot}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libdigikamcore.so.1*
+%{_kde4_libdir}/libdigikamdatabase.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -151,6 +157,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
+- rebuild against kde-4.3
+- optimize scriptlets
+- tighten -libs related deps via %%{?_isa}
+
 * Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
 - digikam-0.10.0 (final)
 



From twaugh at fedoraproject.org  Wed Aug  5 17:33:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  5 Aug 2009 17:33:03 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-3.9.8.tar.gz.asc, NONE, 1.1 upstream-key.gpg, 
	NONE, 1.1 .cvsignore, 1.32, 1.33 hplip.spec, 1.212,
	1.213 sources, 1.32, 1.33 hplip-dbus.patch, 1.1,
	NONE hplip-desktop.patch, 1.7, NONE hplip-device-id.patch, 1.4,
	NONE hplip-disc-media.patch, 1.2, NONE hplip-libsane.patch, 1.6,
	NONE hplip-marker-supply.patch, 1.9,
	NONE hplip-no-root-config.patch, 1.10,
	NONE hplip-resolution-405400.patch, 1.1,
	NONE hplip-segfault.patch, 1.2, NONE
Message-ID: <20090805173303.4AE4A11C0349@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24010

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-3.9.8.tar.gz.asc upstream-key.gpg 
Removed Files:
	hplip-dbus.patch hplip-desktop.patch hplip-device-id.patch 
	hplip-disc-media.patch hplip-libsane.patch 
	hplip-marker-supply.patch hplip-no-root-config.patch 
	hplip-resolution-405400.patch hplip-segfault.patch 
Log Message:
* Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
- 3.9.8.



--- NEW FILE hplip-3.9.8.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4q+sACgkQhA7anpATwAWrnwCeNjw4P14Md8GsBRtbgLo+Hr6M
nwMAoJoSt8h4xjpXdmEWuhoFie0drfBT
=pkCz
-----END PGP SIGNATURE-----


--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (GNU/Linux)

mQGiBEmsEsMRBADFqq0c+rVIhPMpxe2FOjej096uuS1ta0epuKdu1K0yuVJ7vrdI
1PrRj7GJjdxfcDHYyDPhmohZbehiybG1l32S2IfaTMT/yJ//lxKbmOnscQY02RL8
gh5ijIJjJRaALBpqSvnRkEdaglfcB906Bs9mHO0HuitF74q307Eos7p+LwCg9ewf
kuNMxaNw4vOxlmykQ34rgUMD/RzrIdCzUC5UViiX4Z2rSvokOPDRgK8z3QEGMzo2
V8vSkdEEe9uYIGPpAuQo+K0NlQ0ARkC1A9S/q0RzHCjEKgWpGoD6PKt8rkW0UjF0
Qn5FU1rt3o1TmTHs1a5WwGuh8cLmGLH53UqL2y+BHllC+593a05kbaBcqva5lMZs
4bmXBACFBww+OYSSJAAnL/KrNwPG4j6dozmEMai+L/dyd+bgucnDES9mSLugMJgb
KfOeLIJpuEGdtwimrjo1lqRemTcSu6ZN8bkOPEjqOo87B1moL+03W0czRzKuW8Bs
z1PbnVrtiCi35MlqLDJNLxfiH+LLG1xmGMR7CaqOgnJoKts5srQ0SFBMSVAgKEhQ
IExpbnV4IEltYWdpbmcgYW5kIFByaW50aW5nKSA8aHBsaXBAaHAuY29tPohgBBMR
AgAgBQJJrBLDAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQhA7anpATwAU/
cACdGVT/nlI6lfu/Zu+RDaFcVoWin2UAniB0GDAxJ4CbexUOpp2Os9cyRWgMuQIN
BEmsEsMQCAC+pa6E4uDxifvZMM41JbHb/ayxd/Th2Qfc/epXi0tpgm1viktR07AQ
e7fFTRzfRHaS1JqE7Y9EBO6txEJhJkI5ix5PG/1TeteMiTHxB9CdDzyHEVbxx5HG
ajYgKVpvK13HKTW+IDna5yJCNfZmPfZJxuQLjgI2dnPcFyv3OKAUJPKX7qmTqngY
wi+wdsbznkp4D8sKVsLBqc1coHbOHGalAOuHissq7gtlSR4Wg/9BrkDeMVjLNTz6
5BlPiVTZ7S2cLOhvINTZaelN03+vmSnt/0lmIs0gV+zPozct6/fD8WqQ9jd3XD1O
7zUKnIRFmmw34kaZAI9SDUbcqc0Ajj+3AAMFB/9VoZCAPn2G6R28ZcKbvNtqz32+
yd16QVvh1IR8f+1EmYecaZ1xbJqis2g6LC7e1brebOflDhFE6D6mIA5ojKETvzz4
GKcHD7BwuK/3wFE8z5gU6EeWlQhorhPETZvfUDtKD8Vt1ys8EyC0RJ3aCgr+DTE5
skzfyrmfb4m6I65eTGlOjIwGa+nQXSRKPRfiLRTqG6qTl85DEmNoPkauKZZfnJwd
n6B2IWu2o22qHc2J4SfXxzRRRzyq1ALpR15xpijHmEP/TLVxsstIBKx3IRL0rDTd
B8oVpL8ab1W6zFvR447s1BqJTMBDhQor6Tmxl5VXH+HQawJajETaNL/vcm0QiEkE
GBECAAkFAkmsEsMCGwwACgkQhA7anpATwAV6uACgwkAczeBsAzcoETrSCULCQ+Gy
28sAnA5Xi4CWi5YNNwvlw1AAS00TpNV6
=BMWb
-----END PGP PUBLIC KEY BLOCK-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	27 Jul 2009 18:24:04 -0000	1.32
+++ .cvsignore	5 Aug 2009 17:33:02 -0000	1.33
@@ -29,3 +29,4 @@ hplip-2.8.10.tar.gz
 hplip-2.8.12.tar.gz
 hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
+hplip-3.9.8.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- hplip.spec	4 Aug 2009 09:54:58 -0000	1.212
+++ hplip.spec	5 Aug 2009 17:33:03 -0000	1.213
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.6b
-Release: 5%{?dist}
+Version: 3.9.8
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,17 +14,8 @@ Conflicts: selinux-policy < 3.0.3-3
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
-Patch1: hplip-desktop.patch
-Patch2: hplip-segfault.patch
-Patch3: hplip-device-id.patch
-Patch4: hplip-marker-supply.patch
-Patch5: hplip-dbus.patch
-Patch6: hplip-strstr-const.patch
-Patch8: hplip-libsane.patch
-Patch12: hplip-no-root-config.patch
-Patch13: hplip-ui-optional.patch
-Patch14: hplip-disc-media.patch
-Patch15: hplip-resolution-405400.patch
+Patch1: hplip-strstr-const.patch
+Patch2: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -106,47 +97,11 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fix desktop file.
-%patch1 -p1 -b .desktop
-
-# Prevent crash when DEVICE_URI/PRINTER environment variables are not
-# set (bug #479808 comment 6).
-%patch2 -p1 -b .segfault
-
-# Fixed device-id attributes reported by backend.
-%patch3 -p1 -b .device-id
-
-# Low ink is a warning condition, not an error.
-%patch4 -p1 -b .marker-supply
-
-# Prevent backend crash when D-Bus not running (bug #474362).
-%patch5 -p1 -b .dbus
-
 # Fix compilation.
-%patch6 -p1 -b .strstr-const
-
-# Link libsane-hpaio against libsane (bug #234813).
-%patch8 -p1 -b .libsane
-
-# Prevent SELinux audit message from the CUPS backends (bug #241776)
-%patch12 -p1 -b .no-root-config
+%patch1 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
-%patch13 -p1 -b .ui-optional
-
-# Set disc media for disc page sizes (bug #495672).
-%patch14 -p1 -b .disc-media
-
-# Fixed HWResolution for 'Normal' output from the hpcups driver
-# (laundpad bug #405400).
-%patch15 -p1 -b .resolution-405400
-
-# Fix hpcups fax PPDs (bug #515356)
-pushd fax/ppd
-gunzip *hpcups*
-perl -pi -e 's/^(\*Product:.*\")(.*)\"/\1(\2)"/' *hpcups*
-gzip -n *hpcups*
-popd
+%patch2 -p1 -b .ui-optional
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
@@ -355,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
+- 3.9.8.
+
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
 - Fix hpcups fax PPDs (bug #515356)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Jul 2009 18:24:06 -0000	1.32
+++ sources	5 Aug 2009 17:33:03 -0000	1.33
@@ -1 +1 @@
-49a87fe7d7a57a075ed9631113cee662  hplip-3.9.6b.tar.gz
+cb1cf49c5f062993b78fc2768f531ed8  hplip-3.9.8.tar.gz


--- hplip-dbus.patch DELETED ---


--- hplip-desktop.patch DELETED ---


--- hplip-device-id.patch DELETED ---


--- hplip-disc-media.patch DELETED ---


--- hplip-libsane.patch DELETED ---


--- hplip-marker-supply.patch DELETED ---


--- hplip-no-root-config.patch DELETED ---


--- hplip-resolution-405400.patch DELETED ---


--- hplip-segfault.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug  5 17:33:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:33:08 +0000 (UTC)
Subject: rpms/digikam/F-10 digikam.spec,1.79,1.80
Message-ID: <20090805173308.766E611C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24052

Modified Files:
	digikam.spec 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
- rebuild against kde-4.3
- optimize scriptlets
- tighten -libs related deps via %{?_isa}



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- digikam.spec	17 Mar 2009 18:00:24 -0000	1.79
+++ digikam.spec	5 Aug 2009 17:33:08 -0000	1.80
@@ -1,7 +1,7 @@
 
 Name:	 digikam
 Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -20,13 +20,12 @@ BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: jasper-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
-BuildRequires: kdeedu-devel >= 4.2.0
-Requires: kdeedu-marble >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 
 BuildRequires: kdelibs4-devel
-# Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
+# min kdelibs Req
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
-#Requires: kdelibs4 >= %{kde4_version}
 
 # trash protocol support needed
 # FIXME: should probably be handled lower in the stack
@@ -41,9 +40,7 @@ BuildRequires: sqlite-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
-Requires: %{name}-libs = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -61,13 +58,15 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version} 
 %description libs
 %{summary}.
 
 %package devel
 Summary: Development files for %{name}
 Group:	 Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 This package contains the libraries, include files and other resources
 needed to develop applications using %{name}.
@@ -108,12 +107,18 @@ desktop-file-validate %{buildroot}%{_dat
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -141,7 +146,8 @@ rm -rf %{buildroot}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libdigikamcore.so.1*
+%{_kde4_libdir}/libdigikamdatabase.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -151,6 +157,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
+- rebuild against kde-4.3
+- optimize scriptlets
+- tighten -libs related deps via %%{?_isa}
+
 * Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
 - digikam-0.10.0 (final)
 



From rdieter at fedoraproject.org  Wed Aug  5 17:45:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:45:04 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-11 .cvsignore,1.41,1.42 sources,1.42,1.43
Message-ID: <20090805174504.B8E0011C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26546/F-11

Modified Files:
	.cvsignore sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	29 May 2009 13:25:20 -0000	1.41
+++ .cvsignore	5 Aug 2009 17:45:04 -0000	1.42
@@ -1 +1 @@
-kdeaccessibility-4.2.4.tar.bz2
+kdeaccessibility-4.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	29 May 2009 13:25:20 -0000	1.42
+++ sources	5 Aug 2009 17:45:04 -0000	1.43
@@ -1 +1 @@
-602fe3667cdbbf89e7803a2baaa902c4  kdeaccessibility-4.2.4.tar.bz2
+76435ce1bf787713effe079a3664d3cd  kdeaccessibility-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 17:45:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:45:04 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 .cvsignore,1.37,1.38 sources,1.40,1.41
Message-ID: <20090805174504.95C4111C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26546/F-10

Modified Files:
	.cvsignore sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	29 May 2009 13:25:20 -0000	1.37
+++ .cvsignore	5 Aug 2009 17:45:04 -0000	1.38
@@ -1 +1 @@
-kdeaccessibility-4.2.4.tar.bz2
+kdeaccessibility-4.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	29 May 2009 13:25:20 -0000	1.40
+++ sources	5 Aug 2009 17:45:04 -0000	1.41
@@ -1 +1 @@
-602fe3667cdbbf89e7803a2baaa902c4  kdeaccessibility-4.2.4.tar.bz2
+76435ce1bf787713effe079a3664d3cd  kdeaccessibility-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 17:45:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:45:04 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore,1.44,1.45
Message-ID: <20090805174504.D674811C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26546/devel

Modified Files:
	.cvsignore 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	29 Jul 2009 22:06:46 -0000	1.44
+++ .cvsignore	5 Aug 2009 17:45:04 -0000	1.45
@@ -1,5 +1 @@
-kdeaccessibility-4.2.90.tar.bz2
-kdeaccessibility-4.2.95.tar.bz2
-kdeaccessibility-4.2.96.tar.bz2
-kdeaccessibility-4.2.98.tar.bz2
 kdeaccessibility-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 17:48:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 17:48:32 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-kdebug#202550.patch, NONE,
	1.1 kdelibs.spec, 1.499, 1.500
Message-ID: <20090805174832.A791211C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27433

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kdebug#202550.patch 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- microblog crashes plasma on show friends toggle (kdebug#202550)


kdelibs-4.3.1-kdebug#202550.patch:
 private/service_p.h |   17 +++++++++++++++++
 service.cpp         |    8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-kdebug#202550.patch ---
--- branches/KDE/4.3/kdelibs/plasma/private/service_p.h	2009/08/02 18:26:50	1005966
+++ branches/KDE/4.3/kdelibs/plasma/private/service_p.h	2009/08/02 18:27:44	1005967
@@ -73,6 +73,7 @@
     ServicePrivate(Service *service)
         : q(service),
           config(0),
+          dummyConfig(0),
           tempFile(0)
     {
     }
@@ -80,6 +81,7 @@
     ~ServicePrivate()
     {
         delete config;
+        delete dummyConfig;
         delete tempFile;
     }
 
@@ -98,10 +100,25 @@
         associatedGraphicsWidgets.remove(static_cast<QGraphicsWidget*>(obj));
     }
 
+    KConfigGroup dummyGroup()
+    {
+        if (!dummyConfig) {
+            if (!tempFile) {
+                tempFile = new KTemporaryFile;
+                tempFile->open();
+            }
+
+            dummyConfig = new KConfig(tempFile->fileName());
+        }
+
+        return KConfigGroup(dummyConfig, "DummyGroup");
+    }
+
     Service *q;
     QString destination;
     QString name;
     ConfigLoader *config;
+    KConfig *dummyConfig;
     KTemporaryFile *tempFile;
     QMultiHash<QWidget *, QString> associatedWidgets;
     QMultiHash<QGraphicsWidget *, QString> associatedGraphicsWidgets;
--- branches/KDE/4.3/kdelibs/plasma/service.cpp	2009/08/02 18:26:50	1005966
+++ branches/KDE/4.3/kdelibs/plasma/service.cpp	2009/08/02 18:27:44	1005967
@@ -116,7 +116,7 @@
 {
     if (!d->config) {
         kDebug() << "No valid operations scheme has been registered";
-        return KConfigGroup();
+        return d->dummyGroup();
     }
 
     d->config->writeConfig();
@@ -212,6 +212,9 @@
     delete d->tempFile;
     d->tempFile = 0;
 
+    delete d->dummyConfig;
+    d->dummyConfig = 0;
+
     registerOperationsScheme();
 }
 
@@ -258,6 +261,9 @@
     delete d->config;
     delete d->tempFile;
 
+    delete d->dummyConfig;
+    d->dummyConfig = 0;
+
     //FIXME: make KSharedConfig and KConfigSkeleton not braindamaged in 4.2 and then get rid of the
     //       temp file object here
     d->tempFile = new KTemporaryFile;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- kdelibs.spec	29 Jul 2009 23:05:01 -0000	1.499
+++ kdelibs.spec	5 Aug 2009 17:48:32 -0000	1.500
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,10 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
+# http://bugs.kde.org/202550
+Patch100: kdelibs-4.3.1-kdebug#202550.patch
 
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
 #Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
@@ -217,6 +219,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
+%patch100 -p4 -b .kdebug#202550
 
 
 %build
@@ -399,6 +402,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- microblog crashes plasma on show friends toggle (kdebug#202550)
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From ajax at fedoraproject.org  Wed Aug  5 17:55:58 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  5 Aug 2009 17:55:58 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.461,
	1.462 xserver-1.6.99-vga-arb.patch, 1.4, 1.5
Message-ID: <20090805175558.D364911C0349@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28844

Modified Files:
	xorg-x11-server.spec xserver-1.6.99-vga-arb.patch 
Log Message:
* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 1.6.99-27.20090804
- xserver-1.6.99-vga-arb.patch: Fix crashes from miscompilation without
  xorg-config.h.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- xorg-x11-server.spec	5 Aug 2009 05:55:36 -0000	1.461
+++ xorg-x11-server.spec	5 Aug 2009 17:55:58 -0000	1.462
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   26.%{gitdate}%{?dist}
+Release:   27.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -527,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 1.6.99-27.20090804
+- xserver-1.6.99-vga-arb.patch: Fix crashes from miscompilation without
+  xorg-config.h.
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.6.99-26.20090804
 - fix VGA arb device lookup - noticed by mclasen in qemu
 
@@ -568,7 +572,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Jul 23 2009 Adam Jackson <ajax at redhat.com> 1.6.99-16.20090721
 - xserver-1.6.99-linkmap.patch: Print load offsets of all DSOs on backtrace
-  so we addr2line afterwards.
+  so we can addr2line afterwards.
 
 * Tue Jul 21 2009 Adam Jackson <ajax at redhat.com> 1.6.99-15.20090721
 - Today's git snapshot.

xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1151 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1522 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xserver-1.6.99-vga-arb.patch	5 Aug 2009 06:03:51 -0000	1.4
+++ xserver-1.6.99-vga-arb.patch	5 Aug 2009 17:55:58 -0000	1.5
@@ -1,7 +1,7 @@
-From 0fa02caca3108dee3f1ddfb8ba8ce0b6bb61bcd1 Mon Sep 17 00:00:00 2001
+From 1dd898dc07dadbb2f115bbb177bb52d05bea2df3 Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Mon, 3 Aug 2009 14:09:32 +1000
-Subject: [PATCH] X server: VGA arbitration.
+Subject: [PATCH 03/15] X server: VGA arbitration.
 
 This patch adds the VGA arb paths to the X server.
 
@@ -14,7 +14,7 @@ test with lots more sigio mouse movement
  hw/xfree86/common/xf86DPMS.c           |    4 +-
  hw/xfree86/common/xf86Init.c           |   11 +-
  hw/xfree86/common/xf86PM.c             |    6 +-
- hw/xfree86/common/xf86VGAarbiter.c     | 1149 ++++++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86VGAarbiter.c     | 1151 ++++++++++++++++++++++++++++++++
  hw/xfree86/common/xf86VGAarbiter.h     |   48 ++
  hw/xfree86/common/xf86VGAarbiterPriv.h |  266 ++++++++
  hw/xfree86/common/xf86str.h            |    4 +-
@@ -23,7 +23,7 @@ test with lots more sigio mouse movement
  hw/xfree86/int10/generic.c             |    2 +
  hw/xfree86/loader/sdksyms.sh           |    1 +
  include/xorg-config.h.in               |    3 +
- 15 files changed, 1520 insertions(+), 10 deletions(-)
+ 15 files changed, 1522 insertions(+), 10 deletions(-)
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.c
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.h
  create mode 100644 hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -225,10 +225,10 @@ index f6138c3..fa24813 100644
  	}
 diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
 new file mode 100644
-index 0000000..9f12490
+index 0000000..13802cd
 --- /dev/null
 +++ b/hw/xfree86/common/xf86VGAarbiter.c
-@@ -0,0 +1,1149 @@
+@@ -0,0 +1,1151 @@
 +/*
 + * This code was stolen from RAC and adapted to control the legacy vga
 + * interface.
@@ -259,13 +259,15 @@ index 0000000..9f12490
 + *
 + */
 +
-+#define DEBUG
++#include "xorg-config.h"
++
 +#include "xf86VGAarbiter.h"
 +#include "xf86VGAarbiterPriv.h"
 +#include "xf86Bus.h"
 +#include "pciaccess.h"
 +
 +#ifdef DEBUG
++#error no, really, you don't want to do this
 +#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
 +#define DPRINT(x) ErrorF(x "\n");
 +#else
@@ -1821,5 +1823,5 @@ index ffb35f8..603ae13 100644
  #undef PCI_TXT_IDS_PATH
  
 -- 
-1.5.4.1
+1.6.4
 



From rdieter at fedoraproject.org  Wed Aug  5 18:13:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 18:13:50 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-kdebug#202550.patch, NONE,
	1.1 kdelibs.spec, 1.433, 1.434
Message-ID: <20090805181350.A19A411C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32701/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kdebug#202550.patch 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- microblog crashes plasma on show friends toggle (kdebug#202550)


kdelibs-4.3.1-kdebug#202550.patch:
 private/service_p.h |   17 +++++++++++++++++
 service.cpp         |    8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-kdebug#202550.patch ---
--- branches/KDE/4.3/kdelibs/plasma/private/service_p.h	2009/08/02 18:26:50	1005966
+++ branches/KDE/4.3/kdelibs/plasma/private/service_p.h	2009/08/02 18:27:44	1005967
@@ -73,6 +73,7 @@
     ServicePrivate(Service *service)
         : q(service),
           config(0),
+          dummyConfig(0),
           tempFile(0)
     {
     }
@@ -80,6 +81,7 @@
     ~ServicePrivate()
     {
         delete config;
+        delete dummyConfig;
         delete tempFile;
     }
 
@@ -98,10 +100,25 @@
         associatedGraphicsWidgets.remove(static_cast<QGraphicsWidget*>(obj));
     }
 
+    KConfigGroup dummyGroup()
+    {
+        if (!dummyConfig) {
+            if (!tempFile) {
+                tempFile = new KTemporaryFile;
+                tempFile->open();
+            }
+
+            dummyConfig = new KConfig(tempFile->fileName());
+        }
+
+        return KConfigGroup(dummyConfig, "DummyGroup");
+    }
+
     Service *q;
     QString destination;
     QString name;
     ConfigLoader *config;
+    KConfig *dummyConfig;
     KTemporaryFile *tempFile;
     QMultiHash<QWidget *, QString> associatedWidgets;
     QMultiHash<QGraphicsWidget *, QString> associatedGraphicsWidgets;
--- branches/KDE/4.3/kdelibs/plasma/service.cpp	2009/08/02 18:26:50	1005966
+++ branches/KDE/4.3/kdelibs/plasma/service.cpp	2009/08/02 18:27:44	1005967
@@ -116,7 +116,7 @@
 {
     if (!d->config) {
         kDebug() << "No valid operations scheme has been registered";
-        return KConfigGroup();
+        return d->dummyGroup();
     }
 
     d->config->writeConfig();
@@ -212,6 +212,9 @@
     delete d->tempFile;
     d->tempFile = 0;
 
+    delete d->dummyConfig;
+    d->dummyConfig = 0;
+
     registerOperationsScheme();
 }
 
@@ -258,6 +261,9 @@
     delete d->config;
     delete d->tempFile;
 
+    delete d->dummyConfig;
+    d->dummyConfig = 0;
+
     //FIXME: make KSharedConfig and KConfigSkeleton not braindamaged in 4.2 and then get rid of the
     //       temp file object here
     d->tempFile = new KTemporaryFile;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -p -r1.433 -r1.434
--- kdelibs.spec	4 Aug 2009 19:32:57 -0000	1.433
+++ kdelibs.spec	5 Aug 2009 18:13:50 -0000	1.434
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,10 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
+# http://bugs.kde.org/202550
+Patch100: kdelibs-4.3.1-kdebug#202550.patch
 
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
 #Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
@@ -217,6 +219,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
+%patch100 -p4 -b .kdebug#202550
 
 
 %build
@@ -399,6 +402,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- microblog crashes plasma on show friends toggle (kdebug#202550)
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Wed Aug  5 18:13:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 18:13:50 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-kdebug#202550.patch, NONE,
	1.1 kdelibs.spec, 1.487, 1.488
Message-ID: <20090805181350.D94FB11C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32701/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kdebug#202550.patch 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- microblog crashes plasma on show friends toggle (kdebug#202550)


kdelibs-4.3.1-kdebug#202550.patch:
 private/service_p.h |   17 +++++++++++++++++
 service.cpp         |    8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-kdebug#202550.patch ---
--- branches/KDE/4.3/kdelibs/plasma/private/service_p.h	2009/08/02 18:26:50	1005966
+++ branches/KDE/4.3/kdelibs/plasma/private/service_p.h	2009/08/02 18:27:44	1005967
@@ -73,6 +73,7 @@
     ServicePrivate(Service *service)
         : q(service),
           config(0),
+          dummyConfig(0),
           tempFile(0)
     {
     }
@@ -80,6 +81,7 @@
     ~ServicePrivate()
     {
         delete config;
+        delete dummyConfig;
         delete tempFile;
     }
 
@@ -98,10 +100,25 @@
         associatedGraphicsWidgets.remove(static_cast<QGraphicsWidget*>(obj));
     }
 
+    KConfigGroup dummyGroup()
+    {
+        if (!dummyConfig) {
+            if (!tempFile) {
+                tempFile = new KTemporaryFile;
+                tempFile->open();
+            }
+
+            dummyConfig = new KConfig(tempFile->fileName());
+        }
+
+        return KConfigGroup(dummyConfig, "DummyGroup");
+    }
+
     Service *q;
     QString destination;
     QString name;
     ConfigLoader *config;
+    KConfig *dummyConfig;
     KTemporaryFile *tempFile;
     QMultiHash<QWidget *, QString> associatedWidgets;
     QMultiHash<QGraphicsWidget *, QString> associatedGraphicsWidgets;
--- branches/KDE/4.3/kdelibs/plasma/service.cpp	2009/08/02 18:26:50	1005966
+++ branches/KDE/4.3/kdelibs/plasma/service.cpp	2009/08/02 18:27:44	1005967
@@ -116,7 +116,7 @@
 {
     if (!d->config) {
         kDebug() << "No valid operations scheme has been registered";
-        return KConfigGroup();
+        return d->dummyGroup();
     }
 
     d->config->writeConfig();
@@ -212,6 +212,9 @@
     delete d->tempFile;
     d->tempFile = 0;
 
+    delete d->dummyConfig;
+    d->dummyConfig = 0;
+
     registerOperationsScheme();
 }
 
@@ -258,6 +261,9 @@
     delete d->config;
     delete d->tempFile;
 
+    delete d->dummyConfig;
+    d->dummyConfig = 0;
+
     //FIXME: make KSharedConfig and KConfigSkeleton not braindamaged in 4.2 and then get rid of the
     //       temp file object here
     d->tempFile = new KTemporaryFile;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- kdelibs.spec	4 Aug 2009 20:03:08 -0000	1.487
+++ kdelibs.spec	5 Aug 2009 18:13:50 -0000	1.488
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,10 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
+# http://bugs.kde.org/202550
+Patch100: kdelibs-4.3.1-kdebug#202550.patch
 
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
 #Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
@@ -217,6 +219,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
+%patch100 -p4 -b .kdebug#202550
 
 
 %build
@@ -399,6 +402,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- microblog crashes plasma on show friends toggle (kdebug#202550)
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From spot at fedoraproject.org  Wed Aug  5 18:21:43 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  5 Aug 2009 18:21:43 +0000 (UTC)
Subject: rpms/xmbdfed/devel xmbdfed-4.7-getline.patch, NONE, 1.1 xmbdfed.spec,
	1.3, 1.4
Message-ID: <20090805182143.47C4F11C0347@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmbdfed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1681

Modified Files:
	xmbdfed.spec 
Added Files:
	xmbdfed-4.7-getline.patch 
Log Message:
fix getline conflict

xmbdfed-4.7-getline.patch:
 bdfgname.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE xmbdfed-4.7-getline.patch ---
diff -up xmbdfed-4.7/bdfgname.c.getline xmbdfed-4.7/bdfgname.c
--- xmbdfed-4.7/bdfgname.c.getline	2009-08-05 14:16:46.000000000 -0400
+++ xmbdfed-4.7/bdfgname.c	2009-08-05 14:17:16.000000000 -0400
@@ -47,9 +47,9 @@ static unsigned long adobe_names_used;
 
 static int
 #ifdef __STDC__
-getline(FILE *in, char *buf, int limit)
+_bdf_getline(FILE *in, char *buf, int limit)
 #else
-getline(in, buf, limit)
+_bdf_getline(in, buf, limit)
 FILE *in;
 char *buf;
 int limit;
@@ -99,11 +99,11 @@ FILE *in;
 
     while (!feof(in)) {
         pos = ftell(in);
-        (void) getline(in, buf, 256);
+        (void) _bdf_getline(in, buf, 256);
         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
             buf[0] = 0;
             pos = ftell(in);
-            (void) getline(in, buf, 256);
+            (void) _bdf_getline(in, buf, 256);
         }
 
         if (buf[0] == 0)
@@ -170,11 +170,11 @@ FILE *in;
 
     while (!feof(in)) {
         pos = ftell(in);
-        (void) getline(in, buf, 256);
+        (void) _bdf_getline(in, buf, 256);
         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
             buf[0] = 0;
             pos = ftell(in);
-            (void) getline(in, buf, 256);
+            (void) _bdf_getline(in, buf, 256);
         }
 
         c = _bdf_atol(buf, 0, 16);


Index: xmbdfed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmbdfed/devel/xmbdfed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmbdfed.spec	27 Jul 2009 08:09:16 -0000	1.3
+++ xmbdfed.spec	5 Aug 2009 18:21:43 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		xmbdfed
 Summary: 	Bitmap Font Editor
 Version:	4.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	MIT
 Group:		Applications/System
 Source0:	http://crl.nmsu.edu/~mleisher/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source2:	xmbdfed.desktop
 Patch0:		http://crl.nmsu.edu/~mleisher/%{name}-4.7-patch1
 Patch1:		xmbdfed-4.7-linux.patch
 Patch2:		xmbdfed-4.7-staticfix.patch
+Patch3:		xmbdfed-4.7-getline.patch
 URL:		http://crl.nmsu.edu/~mleisher/xmbdfed.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel, lesstif-devel, libXpm-devel, libXmu-devel
@@ -57,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xmbdfed*
 
 %changelog
+* Wed Aug  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-6
+- fix function naming conflict of "getline" with stdio.h
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Wed Aug  5 18:22:12 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  5 Aug 2009 18:22:12 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-0.10.6-rom-sanity.patch, 1.1, 
	1.2 libpciaccess.spec, 1.24, 1.25
Message-ID: <20090805182212.740FD11C0347@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1869

Modified Files:
	libpciaccess-0.10.6-rom-sanity.patch libpciaccess.spec 
Log Message:
* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 0.10.6-6
- D'oh.  Fix obvious sense inversion in the previous patch.


libpciaccess-0.10.6-rom-sanity.patch:
 linux_devmem.c |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

Index: libpciaccess-0.10.6-rom-sanity.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-0.10.6-rom-sanity.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libpciaccess-0.10.6-rom-sanity.patch	5 Aug 2009 15:52:45 -0000	1.1
+++ libpciaccess-0.10.6-rom-sanity.patch	5 Aug 2009 18:22:12 -0000	1.2
@@ -37,5 +37,5 @@ diff -up libpciaccess-0.10.6/src/linux_d
      }
  
 -    return err;
-+    return rom_sanity_check(dev, buffer);
++    return !rom_sanity_check(dev, buffer);
  }


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libpciaccess.spec	5 Aug 2009 15:52:45 -0000	1.24
+++ libpciaccess.spec	5 Aug 2009 18:22:12 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.10.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 0.10.6-6
+- D'oh.  Fix obvious sense inversion in the previous patch.
+
 * Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 0.10.6-5
 - libpciaccess-0.10.6-rom-sanity.patch: If we hit the /dev/mem path for
   reading a device's ROM, verify that it looks like it at least might belong



From rdieter at fedoraproject.org  Wed Aug  5 18:25:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 18:25:23 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-kdebug#199557.patch, NONE,
	1.1 kdelibs.spec, 1.500, 1.501
Message-ID: <20090805182523.2039D11C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2498

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kdebug#199557.patch 
Log Message:
- khtml crasher (kdebug#199557)


kdelibs-4.3.1-kdebug#199557.patch:
 kencodingdetector.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-kdebug#199557.patch ---
--- branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp	2009/07/31 10:31:46	1005095
+++ branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp	2009/07/31 10:33:05	1005096
@@ -889,7 +889,7 @@
         const char *autoDetectedEncoding;
         if ((c1 == 0xFE && c2 == 0xFF) || (c1 == 0xFF && c2 == 0xFE))
         {
-            autoDetectedEncoding = "ISO-10646-UCS-2";
+            autoDetectedEncoding = "UTF-16";
         }
         else if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF)
         {
@@ -908,7 +908,7 @@
             int nul_count_even = (c2 != 0) + (c4 != 0) + (c6 != 0) + (c8 != 0) + (c10 != 0);
             int nul_count_odd = (c1 != 0) + (c3 != 0) + (c5 != 0) + (c7 != 0) + (c9 != 0);
             if ((nul_count_even==0 && nul_count_odd==5) || (nul_count_even==5 && nul_count_odd==0))
-                autoDetectedEncoding = "ISO-10646-UCS-2";
+                autoDetectedEncoding = "UTF-16";
             else
                 autoDetectedEncoding = 0;
         }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- kdelibs.spec	5 Aug 2009 17:48:32 -0000	1.500
+++ kdelibs.spec	5 Aug 2009 18:25:22 -0000	1.501
@@ -85,6 +85,8 @@ Patch20: kdelibs-4.1.70-cmake.patch
 # 4.3 branch
 # http://bugs.kde.org/202550
 Patch100: kdelibs-4.3.1-kdebug#202550.patch
+# http://bugs.kde.org/199557
+Patch101: kdelibs-4.3.1-kdebug#199557.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -220,6 +222,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 # upstream patches
 # 4.3
 %patch100 -p4 -b .kdebug#202550
+%patch101 -p4 -b .kdebug#199557
 
 
 %build
@@ -404,6 +407,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
+- khtml crasher (kdebug#199557)
 
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0



From rdieter at fedoraproject.org  Wed Aug  5 18:36:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 18:36:06 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-kdebug#199557.patch, NONE,
	1.1 kdelibs.spec, 1.434, 1.435
Message-ID: <20090805183606.982BA11C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4972/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kdebug#199557.patch 
Log Message:
khtml crasher (kdebug#199557)


kdelibs-4.3.1-kdebug#199557.patch:
 kencodingdetector.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-kdebug#199557.patch ---
--- branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp	2009/07/31 10:31:46	1005095
+++ branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp	2009/07/31 10:33:05	1005096
@@ -889,7 +889,7 @@
         const char *autoDetectedEncoding;
         if ((c1 == 0xFE && c2 == 0xFF) || (c1 == 0xFF && c2 == 0xFE))
         {
-            autoDetectedEncoding = "ISO-10646-UCS-2";
+            autoDetectedEncoding = "UTF-16";
         }
         else if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF)
         {
@@ -908,7 +908,7 @@
             int nul_count_even = (c2 != 0) + (c4 != 0) + (c6 != 0) + (c8 != 0) + (c10 != 0);
             int nul_count_odd = (c1 != 0) + (c3 != 0) + (c5 != 0) + (c7 != 0) + (c9 != 0);
             if ((nul_count_even==0 && nul_count_odd==5) || (nul_count_even==5 && nul_count_odd==0))
-                autoDetectedEncoding = "ISO-10646-UCS-2";
+                autoDetectedEncoding = "UTF-16";
             else
                 autoDetectedEncoding = 0;
         }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -p -r1.434 -r1.435
--- kdelibs.spec	5 Aug 2009 18:13:50 -0000	1.434
+++ kdelibs.spec	5 Aug 2009 18:36:06 -0000	1.435
@@ -85,6 +85,8 @@ Patch20: kdelibs-4.1.70-cmake.patch
 # 4.3 branch
 # http://bugs.kde.org/202550
 Patch100: kdelibs-4.3.1-kdebug#202550.patch
+# http://bugs.kde.org/199557
+Patch101: kdelibs-4.3.1-kdebug#199557.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -220,6 +222,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 # upstream patches
 # 4.3
 %patch100 -p4 -b .kdebug#202550
+%patch101 -p4 -b .kdebug#199557
 
 
 %build
@@ -404,6 +407,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
+- khtml crasher (kdebug#199557)
 
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0



From rdieter at fedoraproject.org  Wed Aug  5 18:36:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 18:36:06 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-kdebug#199557.patch, NONE,
	1.1 kdelibs.spec, 1.488, 1.489
Message-ID: <20090805183606.CA4FA11C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4972/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-kdebug#199557.patch 
Log Message:
khtml crasher (kdebug#199557)


kdelibs-4.3.1-kdebug#199557.patch:
 kencodingdetector.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-kdebug#199557.patch ---
--- branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp	2009/07/31 10:31:46	1005095
+++ branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp	2009/07/31 10:33:05	1005096
@@ -889,7 +889,7 @@
         const char *autoDetectedEncoding;
         if ((c1 == 0xFE && c2 == 0xFF) || (c1 == 0xFF && c2 == 0xFE))
         {
-            autoDetectedEncoding = "ISO-10646-UCS-2";
+            autoDetectedEncoding = "UTF-16";
         }
         else if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF)
         {
@@ -908,7 +908,7 @@
             int nul_count_even = (c2 != 0) + (c4 != 0) + (c6 != 0) + (c8 != 0) + (c10 != 0);
             int nul_count_odd = (c1 != 0) + (c3 != 0) + (c5 != 0) + (c7 != 0) + (c9 != 0);
             if ((nul_count_even==0 && nul_count_odd==5) || (nul_count_even==5 && nul_count_odd==0))
-                autoDetectedEncoding = "ISO-10646-UCS-2";
+                autoDetectedEncoding = "UTF-16";
             else
                 autoDetectedEncoding = 0;
         }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -p -r1.488 -r1.489
--- kdelibs.spec	5 Aug 2009 18:13:50 -0000	1.488
+++ kdelibs.spec	5 Aug 2009 18:36:06 -0000	1.489
@@ -85,6 +85,8 @@ Patch20: kdelibs-4.1.70-cmake.patch
 # 4.3 branch
 # http://bugs.kde.org/202550
 Patch100: kdelibs-4.3.1-kdebug#202550.patch
+# http://bugs.kde.org/199557
+Patch101: kdelibs-4.3.1-kdebug#199557.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -220,6 +222,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 # upstream patches
 # 4.3
 %patch100 -p4 -b .kdebug#202550
+%patch101 -p4 -b .kdebug#199557
 
 
 %build
@@ -404,6 +407,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
+- khtml crasher (kdebug#199557)
 
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0



From akurtakov at fedoraproject.org  Wed Aug  5 18:37:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  5 Aug 2009 18:37:08 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.651,1.652
Message-ID: <20090805183708.6A49111C0347@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5279/devel

Modified Files:
	eclipse.spec 
Log Message:
Manually enable o.e.core.runtime and o.e.equinox.ds because it's not enabled on ppc64.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -p -r1.651 -r1.652
--- eclipse.spec	5 Aug 2009 09:19:48 -0000	1.651
+++ eclipse.spec	5 Aug 2009 18:37:08 -0000	1.652
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.31%{?dist}
+Release:        0.3.32%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -936,9 +936,14 @@ popd
 rm -r $sdkDir/configuration/org.eclipse.update
 
 %if %{initialize}
+#Find better way to fix this
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090525,plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090525,plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,true|" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # dump bundles.info and config.ini to check what's wrong with ppc64 build
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+#cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+#cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1488,6 +1493,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.32
+- Manually enable o.e.core.runtime and o.e.equinox.ds because it's not enabled on ppc64.
+
 * Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.31
 - Revert initialize call path changes.
 



From akurtakov at fedoraproject.org  Wed Aug  5 18:38:10 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed,  5 Aug 2009 18:38:10 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.652,1.653
Message-ID: <20090805183810.BF5B611C0347@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5512/devel

Modified Files:
	eclipse.spec 
Log Message:
Keep printing bundles.info in case another fix is needed.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -p -r1.652 -r1.653
--- eclipse.spec	5 Aug 2009 18:37:08 -0000	1.652
+++ eclipse.spec	5 Aug 2009 18:38:10 -0000	1.653
@@ -942,8 +942,8 @@ sed --in-place "s|org.eclipse.core.runti
 sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090601,plugins/org.eclipse.equinox.ds_1.1.0.v20090601.jar,4,true|" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # dump bundles.info and config.ini to check what's wrong with ppc64 build
-#cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-#cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+cat  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 # FIXME: investigate why it doesn't work to set this -- configuration data is
 # always written to /usr/share/eclipse/configuration, even with
 #     -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration



From spot at fedoraproject.org  Wed Aug  5 18:38:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed,  5 Aug 2009 18:38:27 +0000 (UTC)
Subject: rpms/xmbdfed/devel xmbdfed.spec,1.4,1.5
Message-ID: <20090805183827.1109C11C0347@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmbdfed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5579

Modified Files:
	xmbdfed.spec 
Log Message:
actually apply patch3


Index: xmbdfed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmbdfed/devel/xmbdfed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xmbdfed.spec	5 Aug 2009 18:21:43 -0000	1.4
+++ xmbdfed.spec	5 Aug 2009 18:38:26 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		xmbdfed
 Summary: 	Bitmap Font Editor
 Version:	4.7
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	MIT
 Group:		Applications/System
 Source0:	http://crl.nmsu.edu/~mleisher/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@ editing font properties. The editor work
 %patch0 -p0 -b .patch1
 %patch1 -p1 -b .linux
 %patch2 -p1 -b .staticfix
+%patch3 -p1 -b .getline
 
 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -58,6 +59,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xmbdfed*
 
 %changelog
+* Wed Aug  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-7
+- actually apply patch3
+
 * Wed Aug  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-6
 - fix function naming conflict of "getline" with stdio.h
 



From rakesh at fedoraproject.org  Wed Aug  5 18:53:50 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Wed,  5 Aug 2009 18:53:50 +0000 (UTC)
Subject: rpms/ctemplate/devel .cvsignore, 1.3, 1.4 ctemplate.spec, 1.7,
	1.8 import.log, 1.3, 1.4 sources, 1.3,
	1.4 ctemplate-0.93.bswap.patch, 1.1, NONE
Message-ID: <20090805185350.C19A311C0347@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ctemplate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7776/devel

Modified Files:
	.cvsignore ctemplate.spec import.log sources 
Removed Files:
	ctemplate-0.93.bswap.patch 
Log Message:
Updated to 0.95



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Apr 2009 15:52:36 -0000	1.3
+++ .cvsignore	5 Aug 2009 18:53:50 -0000	1.4
@@ -1 +1 @@
-ctemplate-0.93.tar.gz
+ctemplate-0.95.tar.gz


Index: ctemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/ctemplate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ctemplate.spec	24 Jul 2009 19:47:04 -0000	1.7
+++ ctemplate.spec	5 Aug 2009 18:53:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ctemplate
-Version:        0.93
-Release:        3%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple but powerful template language for C++
 
 Group:          Development/Tools
@@ -8,7 +8,7 @@ License:        BSD
 URL:            http://code.google.com/p/google-ctemplate/
 Source0:        http://google-ctemplate.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         ctemplate-0.93.consts.patch
-Patch1:         ctemplate-0.93.bswap.patch
+#Patch1:         ctemplate-0.93.bswap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  chrpath, python
 
@@ -31,7 +31,7 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .const
 chmod 644 src/template_string.cc
-%patch1 -p1 -b .bswap
+#%patch1 -p1 -b .bswap
 
 %build
 %configure --disable-static
@@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
-mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/
+#mv $RPM_BUILD_ROOT%{_includedir}/google/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/
 sed -i -e 's|^#include <google|#include <ctemplate|g' $RPM_BUILD_ROOT%{_includedir}/%{name}/*.h
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*.h
 
 %changelog
+* Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.95-1
+- Updated to ctemplate
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.93-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	12 Apr 2009 18:01:48 -0000	1.3
+++ import.log	5 Aug 2009 18:53:50 -0000	1.4
@@ -1,3 +1,4 @@
 ctemplate-0_91-2_fc10:HEAD:ctemplate-0.91-2.fc10.src.rpm:1220684308
 ctemplate-0_93-1_fc11:HEAD:ctemplate-0.93-1.fc11.src.rpm:1239551194
 ctemplate-0_93-2_fc11:HEAD:ctemplate-0.93-2.fc11.src.rpm:1239559001
+ctemplate-0_95-1_fc11:HEAD:ctemplate-0.95-1.fc11.src.rpm:1249498503


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctemplate/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 15:52:36 -0000	1.3
+++ sources	5 Aug 2009 18:53:50 -0000	1.4
@@ -1 +1 @@
-bd42a10bbbcf3e4bffd21663c0bd61fa  ctemplate-0.93.tar.gz
+d6cfabbe1742dbe6f3bd10b77be319f1  ctemplate-0.95.tar.gz


--- ctemplate-0.93.bswap.patch DELETED ---



From dwayne at fedoraproject.org  Wed Aug  5 19:14:05 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  5 Aug 2009 19:14:05 +0000 (UTC)
Subject: rpms/virtaal/F-11 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 virtaal.spec, 1.10, 1.11
Message-ID: <20090805191405.9DB2E11C0347@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12068

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
- Update to 0.4.0 final
  - Terminology suggestions
  - Syntax highlighting
  - Support for "placeables" or placeholders
  - Support for editing inline elements of XLIFF files
  - Improvements to preferences
  - Updated translations.
  - Improvements for right-to-left languages.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Aug 2009 07:55:08 -0000	1.9
+++ .cvsignore	5 Aug 2009 19:14:05 -0000	1.10
@@ -1,4 +1 @@
-virtaal-0.3.1.tar.bz2
-virtaal-0.4.0-beta1.tar.bz2
-virtaal-0.4.0-rc1.tar.bz2
-virtaal-0.4.0-rc2.tar.bz2
+virtaal-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Aug 2009 07:55:08 -0000	1.9
+++ sources	5 Aug 2009 19:14:05 -0000	1.10
@@ -1,4 +1 @@
-eef03a4afa2f8a1e17f94a807268b7e3  virtaal-0.3.1.tar.bz2
-30ce41da361ef9efab109eea8efebf64  virtaal-0.4.0-beta1.tar.bz2
-a4b889b28f905803351e89356baf83d0  virtaal-0.4.0-rc1.tar.bz2
-92f4615361f7574d62a58ef0a5085d5c  virtaal-0.4.0-rc2.tar.bz2
+1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/virtaal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- virtaal.spec	1 Aug 2009 07:55:08 -0000	1.10
+++ virtaal.spec	5 Aug 2009 19:14:05 -0000	1.11
@@ -2,14 +2,13 @@
 
 Name:           virtaal
 Version:        0.4.0
-Release:        0.3.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-#Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
-Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.4.0-rc2/%{name}-%{version}-rc2.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
@@ -54,7 +53,7 @@ converters allow translators to edit: Op
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q
 %patch0 -p1 -b .setup_drop_MO_generation
 %patch1 -p1 -b .autocorr_shared_location
 
@@ -141,6 +140,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
+- Update to 0.4.0 final
+  - Terminology suggestions
+  - Syntax highlighting
+  - Support for "placeables" or placeholders
+  - Support for editing inline elements of XLIFF files
+  - Improvements to preferences
+  - Updated translations.
+  - Improvements for right-to-left languages.
+
 * Fri Jul 31 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-0.3.rc2
 - Update to 0.4.0 rc2:
   - More improvements to the RTL interface of Virtaal



From dwalsh at fedoraproject.org  Wed Aug  5 19:21:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 19:21:58 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.101,
	1.102 libsemanage-rhat.patch, 
	1.52, 1.53 libsemanage.spec, 1.180, 1.181 sources, 1.104, 1.105
Message-ID: <20090805192158.5B3EA11C0347@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13431

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
	* Revert hard linking of files between tmp/active/previous.
	* Enable configuration of bzip behavior from Stephen Smalley.
	  bzip-blocksize=0 to disable compression and decompression support.
	  bzip-blocksize=1..9 to set the blocksize for compression.
	  bzip-small=true to reduce memory usage for decompression.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	7 Jul 2009 21:09:14 -0000	1.101
+++ .cvsignore	5 Aug 2009 19:21:57 -0000	1.102
@@ -107,3 +107,4 @@ libsemanage-2.0.30.tgz
 libsemanage-2.0.31.tgz
 libsemanage-2.0.32.tgz
 libsemanage-2.0.33.tgz
+libsemanage-2.0.35.tgz

libsemanage-rhat.patch:
 genhomedircon.c |    9 +++++++++
 semanage.conf   |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- libsemanage-rhat.patch	10 Jul 2009 18:46:50 -0000	1.52
+++ libsemanage-rhat.patch	5 Aug 2009 19:21:57 -0000	1.53
@@ -1,7 +1,18 @@
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.33/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.33/src/genhomedircon.c	2009-07-10 14:46:05.000000000 -0400
-@@ -794,6 +794,10 @@
++++ libsemanage-2.0.33/src/genhomedircon.c	2009-07-15 10:32:20.000000000 -0400
+@@ -304,6 +304,10 @@
+ 			continue;
+ 		if (!semanage_list_find(shells, pwbuf->pw_shell))
+ 			continue;
++		int len = strlen(pwbuf->pw_dir) -1;
++		for(; len > 0 && pwbuf->pw_dir[len]=='/'; len--) {
++			pwbuf->pw_dir[len]=0;
++		}
+ 		if (strcmp(pwbuf->pw_dir, "/") == 0)
+ 			continue;
+ 		if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
+@@ -794,6 +798,11 @@
  			 * /root */
  			continue;
  		}
@@ -9,37 +20,16 @@ diff --exclude-from=exclude -N -u -r nsa
 +			/* don't relabel /root*/
 +			continue;
 +		}
++
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.33/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.33/src/semanage.conf	2009-07-10 14:45:44.000000000 -0400
++++ libsemanage-2.0.33/src/semanage.conf	2009-07-15 10:30:33.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.33/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.33/src/semanage_store.c	2009-07-10 14:45:44.000000000 -0400
-@@ -441,8 +441,6 @@
- 	char tmp[PATH_MAX];
- 	char buf[4192];
- 
--	if (link(src,dst) == 0) return 0;
--
- 	n = snprintf(tmp, PATH_MAX, "%s.tmp", dst);
- 	if (n < 0 || n >= PATH_MAX)
- 		return -1;
-@@ -510,7 +508,8 @@
- 				goto cleanup;
- 			}
- 		} else if (S_ISREG(sb.st_mode)) {
--			if (semanage_copy_file(path, path2, sb.st_mode) == -1) {
-+			if ((link(path,path2) == -1) && 
-+			     (semanage_copy_file(path, path2, sb.st_mode) == -1)) {
- 				goto cleanup;
- 			}
- 		}


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- libsemanage.spec	25 Jul 2009 08:35:48 -0000	1.180
+++ libsemanage.spec	5 Aug 2009 19:21:58 -0000	1.181
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.33
-Release: 3%{?dist}
+Version: 2.0.35
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
+	* Revert hard linking of files between tmp/active/previous.
+	* Enable configuration of bzip behavior from Stephen Smalley.
+	  bzip-blocksize=0 to disable compression and decompression support.
+	  bzip-blocksize=1..9 to set the blocksize for compression.
+	  bzip-small=true to reduce memory usage for decompression.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- sources	10 Jul 2009 18:46:52 -0000	1.104
+++ sources	5 Aug 2009 19:21:58 -0000	1.105
@@ -1 +1 @@
-3c5af39fda8e81567f0c6d4bf96cfc7f  libsemanage-2.0.33.tgz
+a1592f93fbe653d9c9e1de00597d7df4  libsemanage-2.0.35.tgz



From dwalsh at fedoraproject.org  Wed Aug  5 19:27:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 19:27:54 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.197,
	1.198 policycoreutils-rhat.patch, 1.424,
	1.425 policycoreutils.spec, 1.616, 1.617 sources, 1.203, 1.204
Message-ID: <20090805192754.EA37D11C0347@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14690

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.70-1
- Update to upstream
	* Modify restorecon to only call realpath() on user-supplied pathnames
	from Stephen Smalley.
	* Fix typo in fixfiles that prevented it from relabeling btrfs 
	  filesystems from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- .cvsignore	29 Jul 2009 13:43:53 -0000	1.197
+++ .cvsignore	5 Aug 2009 19:27:53 -0000	1.198
@@ -202,3 +202,4 @@ policycoreutils-2.0.64.tgz
 policycoreutils-2.0.65.tgz
 policycoreutils-2.0.67.tgz
 policycoreutils-2.0.68.tgz
+policycoreutils-2.0.70.tgz

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 restorecond/Makefile                        |   20 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  399 +++-------------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  220 +++++++++++++++
 restorecond/walk.c                          |   30 ++
 restorecond/watch.c                         |  346 ++++++++++++++++++++++++
 scripts/Makefile                            |    3 
 scripts/sandbox                             |  139 +++++++++
 scripts/sandbox.8                           |   22 +
 scripts/sandbox.py                          |   67 ++++
 semanage/semanage                           |   59 +++-
 semanage/semanage.8                         |    2 
 semanage/seobject.py                        |  283 +++++++++++++------
 18 files changed, 1167 insertions(+), 461 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- policycoreutils-rhat.patch	29 Jul 2009 13:44:02 -0000	1.424
+++ policycoreutils-rhat.patch	5 Aug 2009 19:27:53 -0000	1.425
@@ -1195,18 +1195,6 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.68/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.68/scripts/fixfiles	2009-07-29 09:31:44.000000000 -0400
-@@ -129,7 +129,7 @@
- if [ ! -z "$FILEPATH" ]; then
-     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 | \
-+	    ! \( -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
-     else
- 	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.68/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.68/scripts/Makefile	2009-07-29 09:30:07.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -p -r1.616 -r1.617
--- policycoreutils.spec	29 Jul 2009 13:58:16 -0000	1.616
+++ policycoreutils.spec	5 Aug 2009 19:27:54 -0000	1.617
@@ -5,7 +5,7 @@
 %define	sepolgenver	1.0.16
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.68
+Version: 2.0.70
 Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
@@ -266,6 +266,13 @@ else
 fi
 
 %changelog
+* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.70-1
+- Update to upstream
+	* Modify restorecon to only call realpath() on user-supplied pathnames
+	from Stephen Smalley.
+	* Fix typo in fixfiles that prevented it from relabeling btrfs 
+	  filesystems from Dan Walsh.
+
 * Sun Jul 29 2009 Dan Walsh <dwalsh at redhat.com> 2.0.68-1
 - Fix location of man pages
 - Update to upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- sources	29 Jul 2009 13:44:04 -0000	1.203
+++ sources	5 Aug 2009 19:27:54 -0000	1.204
@@ -1,2 +1,2 @@
 e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
-aed0ab49649832c19b650e9edefb3c64  policycoreutils-2.0.68.tgz
+8c4c0c43a9b6c3865e2a8b8bdd222f90  policycoreutils-2.0.70.tgz



From dwalsh at fedoraproject.org  Wed Aug  5 19:37:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 19:37:53 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.43,
	1.44 selinux-policy.spec, 1.889, 1.890
Message-ID: <20090805193753.595D111C0347@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16982

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-5
- Allow svirt images to create sock_file in svirt_var_run_t


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  285 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  122 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   25 
 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               |   41 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   43 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |    8 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  106 +
 policy/modules/services/virt.te                    |  264 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1303 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 291 files changed, 12888 insertions(+), 2598 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- policy-F12.patch	4 Aug 2009 11:32:06 -0000	1.43
+++ policy-F12.patch	5 Aug 2009 19:37:52 -0000	1.44
@@ -1008,7 +1008,7 @@ diff -b -B --ignore-all-space --exclude-
  		java_domtrans_unconfined(rpm_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.6.26/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/admin/sudo.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/admin/sudo.if	2009-08-05 07:57:19.000000000 -0400
 @@ -66,8 +66,8 @@
  	allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_sudo_t self:unix_dgram_socket sendto;
@@ -1041,6 +1041,18 @@ diff -b -B --ignore-all-space --exclude-
  
  	tunable_policy(`use_nfs_home_dirs',`
  		fs_manage_nfs_files($1_sudo_t)
+@@ -147,6 +149,11 @@
+ 	optional_policy(`
+ 		dbus_system_bus_client($1_sudo_t)
+ 	')
++
++	optional_policy(`
++		fprintd_dbus_chat($1_sudo_t)
++	')	  
++
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.6.26/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/admin/tmpreaper.te	2009-07-30 15:33:08.000000000 -0400
@@ -2575,8 +2587,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.26/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te	2009-07-30 15:33:08.000000000 -0400
-@@ -0,0 +1,287 @@
++++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te	2009-08-05 07:20:45.000000000 -0400
+@@ -0,0 +1,285 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -2769,12 +2781,10 @@ diff -b -B --ignore-all-space --exclude-
 +        xserver_common_app(nsplugin_t)
 +	xserver_rw_shm(nsplugin_t)
 +	xserver_read_xdm_tmp_files(nsplugin_t)
-+	xserver_read_xdm_pid(nsplugin_t)
 +	xserver_read_user_xauth(nsplugin_t)
 +	xserver_read_user_iceauth(nsplugin_t)
 +	xserver_use_user_fonts(nsplugin_t)
 +	xserver_manage_home_fonts(nsplugin_t)
-+	xserver_dontaudit_rw_xdm_home_files(nsplugin_t)
 +')
 +
 +########################################
@@ -3948,8 +3958,25 @@ 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.26/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/apps/screen.if	2009-07-30 15:33:08.000000000 -0400
-@@ -157,3 +157,24 @@
++++ serefpolicy-3.6.26/policy/modules/apps/screen.if	2009-08-05 07:38:57.000000000 -0400
+@@ -61,6 +61,8 @@
+ 	manage_fifo_files_pattern($1_screen_t, screen_dir_t, screen_var_run_t)
+ 	manage_dirs_pattern($1_screen_t, screen_dir_t, screen_dir_t)
+ 	filetrans_pattern($1_screen_t, screen_dir_t, screen_var_run_t, fifo_file)
++	dontaudit $3 $1_var_run_t:fifo_file read;
++
+ 	files_pid_filetrans($1_screen_t, screen_dir_t, dir)
+ 
+ 	allow $1_screen_t screen_home_t:dir list_dir_perms;
+@@ -91,6 +93,7 @@
+ 	# Revert to the user domain when a shell is executed.
+ 	corecmd_shell_domtrans($1_screen_t, $3)
+ 	corecmd_bin_domtrans($1_screen_t, $3)
++	allow $3 $1_screen_t:process sigchld;
+ 
+ 	corenet_all_recvfrom_unlabeled($1_screen_t)
+ 	corenet_all_recvfrom_netlabel($1_screen_t)
+@@ -157,3 +160,24 @@
  		nscd_socket_use($1_screen_t)
  	')
  ')
@@ -4561,7 +4588,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.26/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/domain.if	2009-08-03 08:04:07.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/domain.if	2009-08-05 08:03:44.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -4744,7 +4771,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.26/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/domain.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/domain.te	2009-08-05 07:21:34.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -4802,7 +4829,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	xserver_dontaudit_use_xdm_fds(domain)
  	xserver_dontaudit_rw_xdm_pipes(domain)
-+	xserver_dontaudit_rw_xdm_home_files(domain)
++	xserver_dontaudit_append_xdm_home_files(domain)
  ')
  
  ########################################
@@ -5643,31 +5670,24 @@ 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.26/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/roles/staff.te	2009-07-30 15:33:08.000000000 -0400
-@@ -15,156 +15,105 @@
++++ serefpolicy-3.6.26/policy/modules/roles/staff.te	2009-08-05 07:37:10.000000000 -0400
+@@ -15,156 +15,110 @@
  # 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)
 -')
 -
@@ -5682,7 +5702,11 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
 -	dbus_role_template(staff, 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(`
 -	ethereal_role(staff_r, staff_t)
 -')
@@ -5694,113 +5718,117 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
 -	games_role(staff_r, staff_t)
 -')
--
++auth_domtrans_pam_console(staff_t)
+ 
 -optional_policy(`
 -	gift_role(staff_r, staff_t)
 -')
--
--optional_policy(`
++seutil_run_newrole(staff_t, staff_r)
++netutils_run_ping(staff_t, staff_r)
+ 
+ optional_policy(`
 -	gnome_role(staff_r, staff_t)
--')
--
--optional_policy(`
--	gpg_role(staff_r, staff_t)
 +	sudo_role_template(staff, staff_r, staff_t)
  ')
  
  optional_policy(`
--	irc_role(staff_r, staff_t)
+-	gpg_role(staff_r, staff_t)
 +	auditadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	java_role(staff_r, staff_t)
+-	irc_role(staff_r, staff_t)
 +	kerneloops_manage_tmp_files(staff_t)
  ')
  
  optional_policy(`
--	lockdev_role(staff_r, staff_t)
+-	java_role(staff_r, staff_t)
 +	logadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	lpd_role(staff_r, staff_t)
+-	lockdev_role(staff_r, staff_t)
 +	postgresql_role(staff_r, staff_t)
  ')
  
  optional_policy(`
--	mozilla_role(staff_r, staff_t)
+-	lpd_role(staff_r, staff_t)
 +	rtkit_daemon_system_domain(staff_t)
  ')
  
  optional_policy(`
--	mplayer_role(staff_r, staff_t)
+-	mozilla_role(staff_r, staff_t)
 +	secadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	mta_role(staff_r, staff_t)
+-	mplayer_role(staff_r, staff_t)
 +	ssh_role_template(staff, staff_r, staff_t)
  ')
  
  optional_policy(`
--	oident_manage_user_content(staff_t)
--	oident_relabel_user_content(staff_t)
+-	mta_role(staff_r, staff_t)
 +	sysadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	pyzor_role(staff_r, staff_t)
+-	oident_manage_user_content(staff_t)
+-	oident_relabel_user_content(staff_t)
 +	usernetctl_run(staff_t, staff_r)
  ')
  
  optional_policy(`
--	razor_role(staff_r, staff_t)
+-	pyzor_role(staff_r, staff_t)
 +	unconfined_role_change(staff_r)
  ')
  
  optional_policy(`
--	rssh_role(staff_r, staff_t)
+-	razor_role(staff_r, staff_t)
 +	webadm_role_change(staff_r)
  ')
  
 -optional_policy(`
--	screen_role_template(staff, staff_r, staff_t)
+-	rssh_role(staff_r, staff_t)
 -')
 +domain_read_all_domains_state(staff_t)
 +domain_getattr_all_domains(staff_t)
 +domain_obj_id_change_exemption(staff_t)
  
 -optional_policy(`
--	secadm_role_change(staff_r)
+-	screen_role_template(staff, staff_r, staff_t)
 -')
 +files_read_kernel_modules(staff_t)
  
 -optional_policy(`
--	spamassassin_role(staff_r, staff_t)
+-	secadm_role_change(staff_r)
 -')
 +kernel_read_fs_sysctls(staff_t)
  
 -optional_policy(`
--	ssh_role_template(staff, staff_r, staff_t)
+-	spamassassin_role(staff_r, staff_t)
 -')
 +modutils_read_module_config(staff_t)
 +modutils_read_module_deps(staff_t)
  
 -optional_policy(`
--	su_role_template(staff, staff_r, staff_t)
+-	ssh_role_template(staff, staff_r, staff_t)
 -')
 +miscfiles_read_hwdata(staff_t)
  
 -optional_policy(`
--	sudo_role_template(staff, staff_r, staff_t)
+-	su_role_template(staff, staff_r, staff_t)
 -')
 +term_use_unallocated_ttys(staff_t)
  
  optional_policy(`
+-	sudo_role_template(staff, staff_r, staff_t)
++	gnomeclock_dbus_chat(staff_t)
+ ')
+ 
+ optional_policy(`
 -	sysadm_role_change(staff_r)
 -	userdom_dontaudit_use_user_terminals(staff_t)
-+	gnomeclock_dbus_chat(staff_t)
++	lpd_list_spool(staff_t
  ')
  
  optional_policy(`
@@ -5820,6 +5848,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 -	userhelper_role_template(staff, staff_r, staff_t)
++	screen_role_template(staff, staff_r, staff_t)
 +	screen_manage_var_run(staff_t)
  ')
  
@@ -9828,7 +9857,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.26/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/dbus.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/dbus.if	2009-08-05 07:49:49.000000000 -0400
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -9867,7 +9896,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_read_user_home_content_files($1_dbusd_t)
  
  	ifdef(`hide_broken_symptoms', `
-@@ -153,6 +157,10 @@
+@@ -153,12 +157,15 @@
  	')
  
  	optional_policy(`
@@ -9878,7 +9907,14 @@ diff -b -B --ignore-all-space --exclude-
  		hal_dbus_chat($1_dbusd_t)
  	')
  
-@@ -178,10 +186,12 @@
+ 	optional_policy(`
+-		xserver_use_xdm_fds($1_dbusd_t)
+-		xserver_rw_xdm_pipes($1_dbusd_t)
++		xserver_use_xdm($1_dbusd_t)
+ 	')
+ ')
+ 
+@@ -178,10 +185,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -9892,7 +9928,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($1)
-@@ -190,6 +200,10 @@
+@@ -190,6 +199,10 @@
  	files_search_pids($1)
  	stream_connect_pattern($1, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
  	dbus_read_config($1)
@@ -9903,7 +9939,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -256,7 +270,7 @@
+@@ -256,7 +269,7 @@
  
  ########################################
  ## <summary>
@@ -10959,8 +10995,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/modemmanager.te serefpolicy-3.6.26/policy/modules/services/modemmanager.te
 --- nsaserefpolicy/policy/modules/services/modemmanager.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/services/modemmanager.te	2009-07-30 15:33:08.000000000 -0400
-@@ -0,0 +1,41 @@
++++ serefpolicy-3.6.26/policy/modules/services/modemmanager.te	2009-08-05 15:31:50.000000000 -0400
+@@ -0,0 +1,46 @@
 +policy_module(ModemManager,1.0.0)
 +
 +########################################
@@ -10992,6 +11028,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +files_read_etc_files(ModemManager_t)
 +
++term_use_unallocated_ttys(ModemManager_t)
++
 +miscfiles_read_localization(ModemManager_t)
 +
 +logging_send_syslog_msg(ModemManager_t)
@@ -11000,8 +11038,11 @@ diff -b -B --ignore-all-space --exclude-
 +	networkmanager_dbus_chat(ModemManager_t)
 +')
 +
-+permissive ModemManager_t;
++optional_policy(`
++	udev_read_db(ModemManager_t)
++')
 +
++permissive ModemManager_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.26/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2009-07-29 15:15:33.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/mta.fc	2009-07-30 15:33:09.000000000 -0400
@@ -11536,7 +11577,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.26/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/networkmanager.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/networkmanager.te	2009-08-05 08:04:33.000000000 -0400
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -11564,20 +11605,21 @@ diff -b -B --ignore-all-space --exclude-
  allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
  allow NetworkManager_t self:udp_socket create_socket_perms;
  allow NetworkManager_t self:packet_socket create_socket_perms;
-@@ -51,8 +55,10 @@
+@@ -51,8 +55,11 @@
  manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
  logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
  
 -rw_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
 -files_search_tmp(NetworkManager_t)
++manage_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
 +manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
-+files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file)
++files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, { sock_file file })
 +
 +manage_files_pattern(NetworkManager_t, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
  
  manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
-@@ -63,6 +69,8 @@
+@@ -63,6 +70,8 @@
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
  kernel_load_module(NetworkManager_t)
@@ -11586,7 +11628,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -81,13 +89,18 @@
+@@ -81,13 +90,18 @@
  corenet_sendrecv_isakmp_server_packets(NetworkManager_t)
  corenet_sendrecv_dhcpc_server_packets(NetworkManager_t)
  corenet_sendrecv_all_client_packets(NetworkManager_t)
@@ -11605,7 +11647,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mls_file_read_all_levels(NetworkManager_t)
  
-@@ -98,15 +111,20 @@
+@@ -98,15 +112,20 @@
  
  domain_use_interactive_fds(NetworkManager_t)
  domain_read_confined_domains_state(NetworkManager_t)
@@ -11627,7 +11669,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(NetworkManager_t)
  
  miscfiles_read_localization(NetworkManager_t)
-@@ -116,25 +134,40 @@
+@@ -116,25 +135,40 @@
  
  seutil_read_config(NetworkManager_t)
  
@@ -11675,7 +11717,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -146,8 +179,25 @@
+@@ -146,8 +180,25 @@
  ')
  
  optional_policy(`
@@ -11703,7 +11745,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -155,23 +205,51 @@
+@@ -155,23 +206,51 @@
  ')
  
  optional_policy(`
@@ -11757,7 +11799,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -179,12 +257,15 @@
+@@ -179,12 +258,15 @@
  ')
  
  optional_policy(`
@@ -12592,7 +12634,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.26/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-03 06:50:17.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-05 15:36:05.000000000 -0400
 @@ -38,9 +38,10 @@
  
  allow policykit_t self:capability { setgid setuid };
@@ -12650,7 +12692,15 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -104,6 +119,7 @@
+@@ -96,6 +111,7 @@
+ files_read_usr_files(policykit_auth_t)
+ 
+ auth_use_nsswitch(policykit_auth_t)
++auth_domtrans_chk_passwd(policykit_auth_t)
+ 
+ logging_send_syslog_msg(policykit_auth_t)
+ 
+@@ -104,6 +120,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -12658,7 +12708,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -116,6 +132,13 @@
+@@ -116,6 +133,13 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -12672,7 +12722,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -123,7 +146,8 @@
+@@ -123,7 +147,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -12682,7 +12732,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;
  
-@@ -153,9 +177,12 @@
+@@ -153,9 +178,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -12696,7 +12746,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -167,7 +194,8 @@
+@@ -167,7 +195,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -14979,7 +15029,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.26/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/setroubleshoot.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/setroubleshoot.te	2009-08-05 08:03:58.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -15013,7 +15063,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(setroubleshootd_t)
  corecmd_exec_shell(setroubleshootd_t)
-@@ -68,16 +77,25 @@
+@@ -68,16 +77,26 @@
  
  dev_read_urand(setroubleshootd_t)
  dev_read_sysfs(setroubleshootd_t)
@@ -15021,6 +15071,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_getattr_all_chr_files(setroubleshootd_t)
  
  domain_dontaudit_search_all_domains_state(setroubleshootd_t)
++domain_signull_all_domains(setroubleshootd_t)
  
  files_read_usr_files(setroubleshootd_t)
  files_read_etc_files(setroubleshootd_t)
@@ -15040,7 +15091,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +112,54 @@
+@@ -94,23 +113,54 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -16637,7 +16688,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.26/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-04 05:06:14.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-05 15:13:13.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -16855,7 +16906,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -195,8 +290,154 @@
+@@ -195,8 +290,155 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -16885,6 +16936,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +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)
@@ -17107,7 +17159,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.26/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/xserver.if	2009-08-03 06:49:41.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/xserver.if	2009-08-05 07:48:30.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -17418,7 +17470,7 @@ diff -b -B --ignore-all-space --exclude-
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1159,6 +1281,276 @@
+@@ -1159,6 +1281,278 @@
  
  ########################################
  ## <summary>
@@ -17541,7 +17593,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
-+##	Dontaudit write to .xsession-errors file
++##	Dontaudit append to .xsession-errors file
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -17549,7 +17601,7 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`xserver_dontaudit_rw_xdm_home_files',`
++interface(`xserver_dontaudit_append_xdm_home_files',`
 +	gen_require(`
 +		type xdm_home_t;
 +	')
@@ -17574,6 +17626,7 @@ diff -b -B --ignore-all-space --exclude-
 +	gen_require(`
 +		type xdm_t, xdm_tmp_t;
 +		type xdm_xproperty_t;
++		type xdm_home_t;
 +		class x_client all_x_client_perms;
 +		class x_drawable all_x_drawable_perms;
 +		class x_property all_x_property_perms;
@@ -17589,11 +17642,12 @@ diff -b -B --ignore-all-space --exclude-
 +	xserver_xdm_stream_connect($1)
 +	xserver_setattr_xdm_tmp_dirs($1)
 +	xserver_read_xdm_pid($1)
++	xserver_search_xdm_lib($1)
 +
 +	allow $1 xdm_t:x_client { getattr destroy };
 +	allow $1 xdm_t:x_drawable { read receive get_property getattr send list_child add_child };
 +	allow $1 xdm_xproperty_t:x_property { write read };
-+
++	allow $1 xdm_home_t:file append_file_perms;
 +')
 +
 +########################################
@@ -17695,7 +17749,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.
-@@ -1172,7 +1564,103 @@
+@@ -1172,7 +1566,103 @@
  interface(`xserver_unconfined',`
  	gen_require(`
  		attribute xserver_unconfined_type;
@@ -19251,7 +19305,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.26/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-07-30 09:44:08.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-05 07:18:15.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -19641,7 +19695,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +
 +optional_policy(`
-+	xserver_rw_xdm_home_files(daemon)
++	xserver_dontaudit_append_xdm_home_files(daemon)
 +	tunable_policy(`use_nfs_home_dirs',`
 +		fs_dontaudit_rw_nfs_files(daemon)
 +	')
@@ -22990,7 +23044,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.26/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-05 07:54:48.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -23900,7 +23954,7 @@ diff -b -B --ignore-all-space --exclude-
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -891,28 +953,43 @@
+@@ -891,28 +953,47 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -23916,6 +23970,10 @@ diff -b -B --ignore-all-space --exclude-
 +		devicekit_dbus_chat($1_usertype)
 +		devicekit_dbus_chat_disk($1_usertype)
 +		devicekit_dbus_chat_power($1_usertype)
++	')
++
++	optional_policy(`
++		fprintd_dbus_chat($1_t)
  	')
  
  	optional_policy(`
@@ -23951,7 +24009,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -946,8 +1023,8 @@
+@@ -946,8 +1027,8 @@
  	# Declarations
  	#
  
@@ -23961,7 +24019,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -956,11 +1033,12 @@
+@@ -956,11 +1037,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -23976,7 +24034,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,37 +1056,55 @@
+@@ -978,37 +1060,55 @@
  		')
  	')
  
@@ -24046,7 +24104,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -1042,7 +1138,7 @@
+@@ -1042,7 +1142,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -24055,7 +24113,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1147,7 @@
+@@ -1051,8 +1151,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -24065,7 +24123,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1170,8 @@
+@@ -1075,7 +1174,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -24075,7 +24133,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1187,7 @@
+@@ -1091,6 +1191,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -24083,7 +24141,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1195,6 @@
+@@ -1098,8 +1199,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -24092,7 +24150,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)
-@@ -1154,20 +1249,6 @@
+@@ -1154,20 +1253,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -24113,7 +24171,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1294,7 @@
+@@ -1213,6 +1298,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -24121,7 +24179,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1360,15 @@
+@@ -1278,11 +1364,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -24137,7 +24195,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1460,13 @@
+@@ -1374,12 +1464,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -24152,7 +24210,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1499,14 @@
+@@ -1412,6 +1503,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -24167,7 +24225,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1522,11 @@
+@@ -1427,9 +1526,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -24179,7 +24237,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1583,25 @@
+@@ -1486,6 +1587,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -24205,7 +24263,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1676,8 @@
+@@ -1560,6 +1680,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -24214,7 +24272,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1771,7 @@
+@@ -1653,6 +1775,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -24222,7 +24280,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)
  ')
-@@ -1780,19 +1899,32 @@
+@@ -1780,19 +1903,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -24262,7 +24320,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1959,7 @@
+@@ -1827,6 +1963,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -24270,7 +24328,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2507,7 @@
+@@ -2374,7 +2511,7 @@
  
  ########################################
  ## <summary>
@@ -24279,7 +24337,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2861,32 @@
+@@ -2728,11 +2865,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -24314,7 +24372,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3014,25 @@
+@@ -2860,7 +3018,25 @@
  		type user_tmp_t;
  	')
  
@@ -24341,7 +24399,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3069,7 @@
+@@ -2897,6 +3073,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -24349,7 +24407,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3200,501 @@
+@@ -3027,3 +3204,501 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -p -r1.889 -r1.890
--- selinux-policy.spec	4 Aug 2009 11:32:06 -0000	1.889
+++ selinux-policy.spec	5 Aug 2009 19:37:52 -0000	1.890
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-5
+- Allow svirt images to create sock_file in svirt_var_run_t
+
 * Tue Aug 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-4
 - Allow exim to getattr on mountpoints
 - Fixes for pulseaudio



From awjb at fedoraproject.org  Wed Aug  5 20:05:54 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Wed,  5 Aug 2009 20:05:54 +0000 (UTC)
Subject: rpms/synce-sync-engine/devel synce-sync-engine.spec,1.14,1.15
Message-ID: <20090805200554.921F311C0347@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-sync-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21739

Modified Files:
	synce-sync-engine.spec 
Log Message:
- fix #514639



Index: synce-sync-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-sync-engine/devel/synce-sync-engine.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- synce-sync-engine.spec	27 Jul 2009 05:17:35 -0000	1.14
+++ synce-sync-engine.spec	5 Aug 2009 20:05:54 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           synce-sync-engine
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Synce synchronization engine
 
 Group:          Applications/Communications
@@ -57,6 +57,13 @@ mv \
 
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/plugins/
 
+# install the dbus activation service
+install -Dpm0644 config/org.synce.SyncEngine.service \
+ $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.synce.SyncEngine.service
+
+# spurious doc dir installed by build process
+rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/sync-engine
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/opensync/defaults/
 
 # make defaults file
@@ -74,12 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING
+%doc CHANGELOG COPYING config/syncengine.conf.xml
 %{_bindir}/*py
 %{_bindir}/sync-engine
 %{python_sitelib}/SyncEngine/
 %{python_sitelib}/synce_sync_engine-%{version}-py?.?.egg-info/
-%{_datadir}/doc/sync-engine/
+%{_datadir}/dbus-1/services/org.synce.SyncEngine.service
 
 %files -n libopensync-plugin-synce-wm5
 %defattr(-,root,root,-)
@@ -87,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/*
 
 %changelog
+* Wed Aug 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-3
+- install dbus file (#514639)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From transif at fedoraproject.org  Wed Aug  5 20:13:56 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  5 Aug 2009 20:13:56 +0000 (UTC)
Subject: comps/po ca.po,1.20,1.21
Message-ID: <20090805201356.A599411C0347@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23880/po

Modified Files:
	ca.po 
Log Message:
Sending translation for Catalan


Index: ca.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ca.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ca.po	1 May 2009 17:28:00 -0000	1.20
+++ ca.po	5 Aug 2009 20:13:56 -0000	1.21
@@ -17,15 +17,13 @@
 #   http://www.softcatala.org/projectes/fedora/
 #   i contacteu l'anterior traductor/a.
 #
-# Nota: les cadenes marcades amb TODO tenen una traducci? inexacta o l'original.
-# Aix? ?s degut a que comps-po ha de tenir el 100% de cadenes per assegurar el 
-# suport
+
 msgid ""
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-01 14:12+0000\n"
-"PO-Revision-Date: 2009-05-01 23:25+0100\n"
+"POT-Creation-Date: 2009-04-29 15:51-0400\n"
+"PO-Revision-Date: 2009-08-05 23:25+0100\n"
 "Last-Translator: Oscar Osta Pueyo <oostap at gmail.com>\n"
 "Language-Team: Catalan <fedora at softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +120,7 @@ msgstr "Suport per al bengal?"
 #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
 msgid "Bhutanese Support"
-msgstr "Bhutanese Support"
+msgstr ""
 
 #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
@@ -533,7 +531,6 @@ msgstr "Lleng?es"
 msgid "Lao Support"
 msgstr "Suport per al lao"
 
-# TODO
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
 #: ../comps-f10.xml.in.h:104 ../comps-f11.xml.in.h:119
 msgid "Latvian Support"
@@ -1232,7 +1229,6 @@ msgstr "Paquets de tipus de lletres de m
 msgid "Esperanto Support"
 msgstr "Suport per a l'esperanto"
 
-# TODO
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:96 ../comps-f11.xml.in.h:108
 msgid "Kashubian Support"
 msgstr "Suport per al caixubi"
@@ -1259,7 +1255,6 @@ msgstr "Entorn d'escriptori SUGAR"
 msgid "SUGAR is the desktop environment developed for the OLPC XO."
 msgstr "El SUGAR ?s un entorn d'escriptori desenvolupat per al XO de l'OLPC."
 
-# TODO
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:245
 msgid "Walloon Support"
@@ -1281,7 +1276,6 @@ msgstr "M?todes d'entrada"
 msgid "Input method packages for the input of international text."
 msgstr "Paquets de m?todes d'entrada per a introduir text internacional."
 
-# TODO
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
 msgid "Kashmiri Support"
 msgstr "Suport per al caixmiri"
@@ -1294,17 +1288,14 @@ msgstr "Suport per al konkani"
 msgid "LXDE"
 msgstr "LXDE"
 
-# TODO
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
 msgid "Maithili Support"
 msgstr "Suport per al maithili"
 
-# TODO
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
 msgid "Myanmar (Burmese) Support"
 msgstr "Suport per al myanmar (birm?)"
 
-# TODO
 #: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:170
 msgid "Sindhi Support"
 msgstr "Suport per al sindhi"
@@ -1318,7 +1309,6 @@ msgstr ""
 msgid "Tajik Support"
 msgstr "Suport per al tajik"
 
-# TODO
 #: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:239
 msgid "Uzbek Support"
 msgstr "Suport per a l'uzbek"
@@ -1379,14 +1369,13 @@ msgstr "Suport per al kazakh"
 msgid "Kinyarwanda Support"
 msgstr "Suport per al kinyarwanda"
 
-# TODO
 #: ../comps-f11.xml.in.h:118
 msgid "Latin Support"
 msgstr "Suport per al llat?"
 
 #: ../comps-f11.xml.in.h:126
 msgid "Luxembourgish Support"
-msgstr ""
+msgstr "Suport per al luxemburgu?s"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
@@ -1398,7 +1387,7 @@ msgstr "Suport per al malt?s"
 
 #: ../comps-f11.xml.in.h:134
 msgid "Manx Support"
-msgstr ""
+msgstr "Suport per al manx"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"



From dwalsh at fedoraproject.org  Wed Aug  5 20:18:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 20:18:06 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.44,1.45
Message-ID: <20090805201806.6D91611C0347@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24580

Modified Files:
	policy-F12.patch 
Log Message:
* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-5
- Allow svirt images to create sock_file in svirt_var_run_t


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  285 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  122 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   25 
 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               |   41 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   43 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |    8 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  106 +
 policy/modules/services/virt.te                    |  264 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1303 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 291 files changed, 12888 insertions(+), 2598 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- policy-F12.patch	5 Aug 2009 19:37:52 -0000	1.44
+++ policy-F12.patch	5 Aug 2009 20:18:06 -0000	1.45
@@ -5670,7 +5670,7 @@ diff -b -B --ignore-all-space --exclude-
 +gen_user(guest_u, user, guest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.26/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/roles/staff.te	2009-08-05 07:37:10.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/roles/staff.te	2009-08-05 16:17:34.000000000 -0400
 @@ -15,156 +15,110 @@
  # Local policy
  #
@@ -5828,7 +5828,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 -	sysadm_role_change(staff_r)
 -	userdom_dontaudit_use_user_terminals(staff_t)
-+	lpd_list_spool(staff_t
++	lpd_list_spool(staff_t)
  ')
  
  optional_policy(`



From rdieter at fedoraproject.org  Wed Aug  5 20:26:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 20:26:48 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.74,1.75
Message-ID: <20090805202648.7013511C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26057

Modified Files:
	comps-f12.xml.in 
Log Message:
punt kde-plasma-networkmanagement, still not near testable



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- comps-f12.xml.in	5 Aug 2009 15:05:25 -0000	1.74
+++ comps-f12.xml.in	5 Aug 2009 20:26:48 -0000	1.75
@@ -3561,7 +3561,6 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
-      <packagereq type="default">kde-plasma-networkmanagement</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>
@@ -3582,6 +3581,7 @@
       <packagereq type="default">kpackagekit</packagereq>
       <packagereq type="default">ksshaskpass</packagereq>
       <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>
@@ -3605,6 +3605,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-plasma-networkmanagement</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>



From dwalsh at fedoraproject.org  Wed Aug  5 20:37:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 20:37:40 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.45,1.46
Message-ID: <20090805203740.61B6911C0347@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28930

Modified Files:
	policy-F12.patch 
Log Message:
* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-5
- Allow svirt images to create sock_file in svirt_var_run_t


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  285 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  122 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   25 
 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               |   41 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   43 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |    8 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  106 +
 policy/modules/services/virt.te                    |  264 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1303 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 291 files changed, 12888 insertions(+), 2598 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- policy-F12.patch	5 Aug 2009 20:18:06 -0000	1.45
+++ policy-F12.patch	5 Aug 2009 20:37:39 -0000	1.46
@@ -3958,12 +3958,12 @@ 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.26/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/apps/screen.if	2009-08-05 07:38:57.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/apps/screen.if	2009-08-05 16:33:49.000000000 -0400
 @@ -61,6 +61,8 @@
  	manage_fifo_files_pattern($1_screen_t, screen_dir_t, screen_var_run_t)
  	manage_dirs_pattern($1_screen_t, screen_dir_t, screen_dir_t)
  	filetrans_pattern($1_screen_t, screen_dir_t, screen_var_run_t, fifo_file)
-+	dontaudit $3 $1_var_run_t:fifo_file read;
++	dontaudit $3 screen_var_run_t:fifo_file read;
 +
  	files_pid_filetrans($1_screen_t, screen_dir_t, dir)
  



From bubeck at fedoraproject.org  Wed Aug  5 20:42:46 2009
From: bubeck at fedoraproject.org (Dr. Tilmann Bubeck)
Date: Wed,  5 Aug 2009 20:42:46 +0000 (UTC)
Subject: rpms/vacation/devel import.log, NONE, 1.1 vacation.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805204246.315E011C0347@cvs1.fedora.phx.redhat.com>

Author: bubeck

Update of /cvs/pkgs/rpms/vacation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30111/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vacation.spec 
Log Message:
First checkin



--- NEW FILE import.log ---
vacation-1_2_7_0-6_fc11:HEAD:vacation-1.2.7.0-6.fc11.src.rpm:1249504928


--- NEW FILE vacation.spec ---
Summary: Automatic mail answering program
Name: vacation
Version: 1.2.7.0
Release: 6%{?dist}
License: GPLv2
Group: Applications/System
Source: http://downloads.sourceforge.net/vacation/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: smtpdaemon
URL: http://sourceforge.net/projects/vacation/
BuildRequires: gdbm-devel

%description 
Vacation is the automatic mail answering program found
on many Unix systems.

%description	-l de
Vacation beantwortet automatisch alle eingehenden EMails
mit einer Standard-Antwort und ist auf vielen Unix-Systemen
vorhanden.

%prep
%setup -q

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

install -D -p -m 755 vacation        $RPM_BUILD_ROOT%{_bindir}/vacation
install -D -p -m 755 vaclook         $RPM_BUILD_ROOT%{_bindir}/vaclook
install -D -p -m 444 vacation.man    $RPM_BUILD_ROOT%{_mandir}/man1/vacation.1
install -D -p -m 444 vaclook.man     $RPM_BUILD_ROOT%{_mandir}/man1/vaclook.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/vacation
%{_bindir}/vaclook
%{_mandir}/*/*
%doc COPYING README README.smrsh ChangeLog

%changelog
* Mon Aug 03 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-6
- changed license to GPLv2 until licensing is clarified with upstream
- changed source URL to "downloads" instead of "download".
  (bz #474802)

* Mon Jul 06 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-5
- Fixes according comments from bz #474802

* Wed Jun 24 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-4
- repackaged for Fedora 11.
- Fixed bugs from bz #474802

* Fri Dec 05 2008 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-1
- Upgraded to 1.2.7.0
- repackaged for Fedora 10.

* Tue Sep 03 2002 Pete O'Hara <pete at guardiandigital.com>
- Version 1.2.7.rc1, Release 1.2.1
  - Upgraded to 1.2.7.rc1

* Mon Aug 26 2002 Pete O'Hara <pete at guardiandigital.com>
- Version 1.2.6.1, Release 1.2.0
  - Initial release for Mail Suite

* Sun Nov 11 2001 Devon <devon at tuxfan.homeip.net>
- upgrade to version 1.2.7.rc1
* Sat Nov 10 2001 Devon <devon at tuxfan.homeip.net>
- upgrade to version 1.2.6
* Wed Sep 19 2001 Devon <devon at tuxfan.homeip.net>
- added %%post link /etc/smrsh to /usr/bin/vacation
- added %%postun deletion of /etc/smrsh/vacation
- defined a umask of 022 fix permissions on created files.
  $HOME/.forward was created group writable, smrsh refused
  to run in that case. See vacation-1.2.2-permissions.patch

* Mon Aug 07 2000 Than Ngo <than at redhat.de>
- fix specfile and patch file to rebuilt

* Mon Aug 07 2000 Michael Stefaniuc <mstefani at redhat.com>
- upgraded to 1.2.2
- fixed security fix

* Wed Aug 02 2000 Than Ngo <than at redhat.de>
- fix manpath (Bug #15070)

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Sun Jul 16 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- add security fix

* Mon Jul 10 2000 Than Ngo <than at redhat.de>
- fix problem (it won't include the .vacation.msg) (bug #13572)
- use RPM macros

* Mon Jul 03 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Sun May 28 2000 Ngo Than <than at redhat.de>
- rebuild for 7.0
- put man pages in correct place
- cleanup specfile
- fix Summary

* Fri Dec 10 1999 Ngo Than <than at redhat.de>
- initial RPM for powertools-6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:47:08 -0000	1.1
+++ .cvsignore	5 Aug 2009 20:42:45 -0000	1.2
@@ -0,0 +1 @@
+vacation-1.2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:08 -0000	1.1
+++ sources	5 Aug 2009 20:42:46 -0000	1.2
@@ -0,0 +1 @@
+cae9253eee4c2e68af01bc6b1f469cd2  vacation-1.2.7.0.tar.gz



From rdieter at fedoraproject.org  Wed Aug  5 20:52:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 20:52:04 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.303,1.304
Message-ID: <20090805205204.5D96611C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31783

Modified Files:
	qt.spec 
Log Message:
* 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



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- qt.spec	30 Jul 2009 11:37:22 -0000	1.303
+++ qt.spec	5 Aug 2009 20:52:03 -0000	1.304
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -249,8 +249,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
@@ -285,7 +285,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}.
@@ -294,7 +294,7 @@ 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"
@@ -309,7 +309,7 @@ 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"
@@ -324,7 +324,7 @@ 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"
@@ -354,11 +354,13 @@ Provides: qt4-assistant = %{version}-%{r
 %if "%{name}" != "qt4"
 Provides: %{name}-assistant = %{version}-%{release}
 %endif
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "qt4"
 Obsoletes: qt4-x11 < %{version}-%{release}
 Provides:  qt4-x11 = %{version}-%{release}
 %endif
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description x11
 Qt libraries used for drawing widgets and OpenGL items.
@@ -563,13 +565,18 @@ for i in * ; do
 done
 popd
 
-# _debug lib symlinks (see bug #196513)
+# _debug targets (see bug #196513)
 pushd %{buildroot}%{_qt4_libdir}
 for lib in libQt*.so ; do
-  ln -s $lib $(basename $lib .so)_debug.so
+   libbase=`basename $lib .so | sed -e 's/^lib//'`
+#  ln -s $lib lib${libbase}_debug.so
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so 
 done
 for lib in libQt*.a ; do
-  ln -s $lib $(basename $lib .a)_debug.a
+   libbase=`basename $lib .a | sed -e 's/^lib//' `
+#  ln -s $lib lib${libbase}_debug.a
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.a
+
 done
 popd
 
@@ -916,6 +923,11 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* 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
 



From rdieter at fedoraproject.org  Wed Aug  5 20:59:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 20:59:40 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.304,1.305
Message-ID: <20090805205940.A985811C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv697

Modified Files:
	qt.spec 
Log Message:
fix scriptlet typo



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- qt.spec	5 Aug 2009 20:52:03 -0000	1.304
+++ qt.spec	5 Aug 2009 20:59:40 -0000	1.305
@@ -576,7 +576,6 @@ for lib in libQt*.a ; do
    libbase=`basename $lib .a | sed -e 's/^lib//' `
 #  ln -s $lib lib${libbase}_debug.a
    echo "INPUT(-l${libbase})" > lib${libbase}_debug.a
-
 done
 popd
 
@@ -688,7 +687,7 @@ rm -rf %{buildroot}
 %post devel
 touch --no-create %{_datadir}/icons/hicolor ||:
 
-%posttrans
+%posttrans devel
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun devel



From dwayne at fedoraproject.org  Wed Aug  5 21:02:16 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Wed,  5 Aug 2009 21:02:16 +0000 (UTC)
Subject: rpms/virtaal/F-10 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 virtaal.spec, 1.6, 1.7
Message-ID: <20090805210216.13E7B11C0347@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1291

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
- Update to 0.4.0 final
  - Terminology suggestions
  - Syntax highlighting
  - Support for "placeables" or placeholders
  - Support for editing inline elements of XLIFF files
  - Improvements to preferences
  - Updated translations.
  - Improvements for right-to-left languages.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Feb 2009 18:03:12 -0000	1.5
+++ .cvsignore	5 Aug 2009 21:02:15 -0000	1.6
@@ -1 +1 @@
-virtaal-0.3.1.tar.bz2
+virtaal-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Feb 2009 18:03:12 -0000	1.5
+++ sources	5 Aug 2009 21:02:15 -0000	1.6
@@ -1 +1 @@
-eef03a4afa2f8a1e17f94a807268b7e3  virtaal-0.3.1.tar.bz2
+1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-10/virtaal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- virtaal.spec	18 Feb 2009 18:03:12 -0000	1.6
+++ virtaal.spec	5 Aug 2009 21:02:15 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           virtaal
-Version:        0.3.1
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+Source0:        http://sourceforge.net/projects/translate/files/Virtaal/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
@@ -19,7 +19,7 @@ BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-Requires:       translate-toolkit >= 1.3
+Requires:       translate-toolkit >= 1.4
 Requires:       libtranslate
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -69,7 +69,7 @@ popd
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}
+%{__python} setup.py install -O1 --skip-build --install-data=/usr --nodepcheck --root %{buildroot}
 
 desktop-file-install                                     \
    --delete-original                                     \
@@ -136,6 +136,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
+- Update to 0.4.0 final
+  - Terminology suggestions
+  - Syntax highlighting
+  - Support for "placeables" or placeholders
+  - Support for editing inline elements of XLIFF files
+  - Improvements to preferences
+  - Updated translations.
+  - Improvements for right-to-left languages.
+
 * Wed Feb 18 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3.1-1
 - Update to 0.3.1 release
 - Package icons



From rdieter at fedoraproject.org  Wed Aug  5 21:02:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 21:02:54 +0000 (UTC)
Subject: rpms/qt/F-11 qt-x11-opensource-src-4.5.2-timestamp.patch, NONE,
	1.1 qt.spec, 1.275, 1.276
Message-ID: <20090805210254.ABFB211C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1552

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-timestamp.patch 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.1
- use linker scripts for _debug targets (#510246)
- apply upstream patch to fix issue in Copy and paste
- optimize (icon-mostly) scriptlets
- -x11: Requires(post,postun): /sbin/ldconfig


qt-x11-opensource-src-4.5.2-timestamp.patch:
 qapplication_x11.cpp |   36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-timestamp.patch ---
>From 9e5fa633913ef952ca4ef5312fe396bcfc885321 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
Date: Wed, 22 Jul 2009 17:12:17 +0200
Subject: [PATCH] Revert "Added a check that X11 timestamp goes forward only."

In some cases we might get an invalid timestamp that is far away in
the future, so remembering it will break all consequent X calls that
require a timestamp because it just contains junk (for example
clipboard will stop working). This happens with XIM+SCIM pair -
whenever we start input method and type something to the widget, we
get a XKeyPress event with a commited string, however the 'serial' and
'time' members of the XEvent structure are not initialized (according
to valgrind) and contain junk.

This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb.

Reviewed-By: Brad
---
 src/gui/kernel/qapplication_x11.cpp |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 163ceb6..abedfd6 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event)
 #ifdef ALIEN_DEBUG
     //qDebug() << "QApplication::x11ProcessEvent:" << event->type;
 #endif
-    Time time = 0, userTime = 0;
     switch (event->type) {
     case ButtonPress:
         pressed_window = event->xbutton.window;
-        userTime = event->xbutton.time;
+        X11->userTime = event->xbutton.time;
         // fallthrough intended
     case ButtonRelease:
-        time = event->xbutton.time;
+        X11->time = event->xbutton.time;
         break;
     case MotionNotify:
-        time = event->xmotion.time;
+        X11->time = event->xmotion.time;
         break;
     case XKeyPress:
-        userTime = event->xkey.time;
+        X11->userTime = event->xkey.time;
         // fallthrough intended
     case XKeyRelease:
-        time = event->xkey.time;
+        X11->time = event->xkey.time;
         break;
     case PropertyNotify:
-        time = event->xproperty.time;
+        X11->time = event->xproperty.time;
         break;
     case EnterNotify:
     case LeaveNotify:
-        time = event->xcrossing.time;
+        X11->time = event->xcrossing.time;
         break;
     case SelectionClear:
-        time = event->xselectionclear.time;
+        X11->time = event->xselectionclear.time;
         break;
     default:
-#ifndef QT_NO_XFIXES
-        if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) {
-            XFixesSelectionNotifyEvent *req =
-                reinterpret_cast<XFixesSelectionNotifyEvent *>(event);
-            time = req->selection_timestamp;
-        }
-#endif
         break;
     }
-    if (time > X11->time)
-        X11->time = time;
-    if (userTime > X11->userTime)
-        X11->userTime = userTime;
+#ifndef QT_NO_XFIXES
+    if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) {
+        XFixesSelectionNotifyEvent *req =
+            reinterpret_cast<XFixesSelectionNotifyEvent *>(event);
+        X11->time = req->selection_timestamp;
+    }
+#endif
 
     QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window);
 
-- 
1.6.1



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- qt.spec	2 Jul 2009 11:51:25 -0000	1.275
+++ qt.spec	5 Aug 2009 21:02:54 -0000	1.276
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -55,6 +55,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.2-timestamp.patch
 
 ## qt-copy patches
 %define qt_copy 20090626
@@ -336,6 +337,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 Obsoletes: qt4-x11 < %{version}-%{release}
 Provides:  qt4-x11 = %{version}-%{release}
 %endif
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description x11
 Qt libraries used for drawing widgets and OpenGL items.
@@ -369,6 +372,7 @@ test -x apply_patches && ./apply_patches
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
+%patch55 -p1 -b .timestamp
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -533,13 +537,17 @@ for i in * ; do
 done
 popd
 
-# _debug lib symlinks (see bug #196513)
+# _debug targets (see bug #196513)
 pushd %{buildroot}%{_qt4_libdir}
 for lib in libQt*.so ; do
-  ln -s $lib $(basename $lib .so)_debug.so
+   libbase=`basename $lib .so | sed -e 's/^lib//'`
+#  ln -s $lib lib${libbase}_debug.so
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so
 done
 for lib in libQt*.a ; do
-  ln -s $lib $(basename $lib .a)_debug.a
+   libbase=`basename $lib .a | sed -e 's/^lib//' `
+#  ln -s $lib lib${libbase}_debug.a
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.a
 done
 popd
 
@@ -649,21 +657,29 @@ rm -rf %{buildroot}
 
 %post devel
 touch --no-create %{_datadir}/icons/hicolor ||:
+
+%posttrans devel
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun devel
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
 
 %post x11
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
+
+%posttrans x11
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun x11
 /sbin/ldconfig
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
 
 
 %files
@@ -856,6 +872,12 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.1
+- use linker scripts for _debug targets (#510246)
+- apply upstream patch to fix issue in Copy and paste
+- 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
 



From sparks at fedoraproject.org  Wed Aug  5 21:07:53 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Wed,  5 Aug 2009 21:07:53 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/devel
	fedora-security-guide-en-US.spec, 1.6, 1.7 import.log, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090805210753.79EF811C0347@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-serv3210/devel

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Fixed issues related to Bug 515043.



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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fedora-security-guide-en-US.spec	28 Jul 2009 02:25:35 -0000	1.6
+++ fedora-security-guide-en-US.spec	5 Aug 2009 21:07:53 -0000	1.7
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+- Fixed issues related to Bug 515043.
+
+
 * Mon Jul 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-17
 - Repaired vendor information in SPEC.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	28 Jul 2009 02:25:35 -0000	1.5
+++ import.log	5 Aug 2009 21:07:53 -0000	1.6
@@ -3,3 +3,4 @@ fedora-security-guide-en-US-1_0-14_fc11:
 fedora-security-guide-en-US-1_0-15_fc11:HEAD:fedora-security-guide-en-US-1.0-15.fc11.src.rpm:1247616043
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Jul 2009 02:25:35 -0000	1.6
+++ sources	5 Aug 2009 21:07:53 -0000	1.7
@@ -1 +1 @@
-22065b4df0ca71af7601d8939c876c23  fedora-security-guide-en-US-1.0.tgz
+1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz



From dwmw2 at fedoraproject.org  Wed Aug  5 21:08:27 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed,  5 Aug 2009 21:08:27 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ppc-perfctr-oops-fix.patch,1.1,1.2
Message-ID: <20090805210827.3312A11C0347@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3301

Modified Files:
	linux-2.6-ppc-perfctr-oops-fix.patch 
Log Message:
Fix perfctr match

linux-2.6-ppc-perfctr-oops-fix.patch:
 mpc7450-pmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6-ppc-perfctr-oops-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ppc-perfctr-oops-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-ppc-perfctr-oops-fix.patch	1 Aug 2009 13:31:25 -0000	1.1
+++ linux-2.6-ppc-perfctr-oops-fix.patch	5 Aug 2009 21:08:26 -0000	1.2
@@ -7,7 +7,7 @@ index 75ff47f..ea383c1 100644
  static int init_mpc7450_pmu(void)
  {
 -	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
-+	if (cur_cpu_spec->oprofile_cpu_type &&
++	if (!cur_cpu_spec->oprofile_cpu_type ||
 +	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
  		return -ENODEV;
  



From sparks at fedoraproject.org  Wed Aug  5 21:23:58 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Wed,  5 Aug 2009 21:23:58 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/F-10
	fedora-security-guide-en-US.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090805212358.359D511C0347@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-serv5879/F-10

Modified Files:
	fedora-security-guide-en-US.spec sources 
Log Message:
Fixed issues related to Bug 515043.



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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fedora-security-guide-en-US.spec	28 Jul 2009 03:00:59 -0000	1.2
+++ fedora-security-guide-en-US.spec	5 Aug 2009 21:23:58 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+- Fixed issues related to Bug 515043.
+
+
 * Mon Jul 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-17
 - Repaired vendor information in SPEC.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Jul 2009 03:00:59 -0000	1.3
+++ sources	5 Aug 2009 21:23:58 -0000	1.4
@@ -1 +1 @@
-22065b4df0ca71af7601d8939c876c23  fedora-security-guide-en-US-1.0.tgz
+1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz



From sparks at fedoraproject.org  Wed Aug  5 21:23:58 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Wed,  5 Aug 2009 21:23:58 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/F-11
	fedora-security-guide-en-US.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090805212358.55F5211C0348@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-serv5879/F-11

Modified Files:
	fedora-security-guide-en-US.spec sources 
Log Message:
Fixed issues related to Bug 515043.



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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fedora-security-guide-en-US.spec	28 Jul 2009 02:59:03 -0000	1.2
+++ fedora-security-guide-en-US.spec	5 Aug 2009 21:23:58 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+- Fixed issues related to Bug 515043.
+
+
 * Mon Jul 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-17
 - Repaired vendor information in SPEC.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Jul 2009 02:59:03 -0000	1.3
+++ sources	5 Aug 2009 21:23:58 -0000	1.4
@@ -1 +1 @@
-22065b4df0ca71af7601d8939c876c23  fedora-security-guide-en-US-1.0.tgz
+1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz



From dwalsh at fedoraproject.org  Wed Aug  5 21:31:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  5 Aug 2009 21:31:18 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.46,
	1.47 selinux-policy.spec, 1.890, 1.891
Message-ID: <20090805213118.34F5011C0347@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7312

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-6
- Allow devicekit_disk to list inotify


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  285 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  122 -
 policy/modules/roles/sysadm.te                     |  125 --
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |    7 
 policy/modules/services/cups.te                    |   13 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   25 
 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               |   44 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   45 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   43 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   36 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   78 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  108 +
 policy/modules/services/virt.te                    |  264 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1303 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 293 files changed, 12904 insertions(+), 2600 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- policy-F12.patch	5 Aug 2009 20:37:39 -0000	1.46
+++ policy-F12.patch	5 Aug 2009 21:31:17 -0000	1.47
@@ -1142,6 +1142,17 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(awstats_t)
  
  sysnet_dns_name_resolve(awstats_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/calamaris.te serefpolicy-3.6.26/policy/modules/apps/calamaris.te
+--- nsaserefpolicy/policy/modules/apps/calamaris.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/apps/calamaris.te	2009-08-05 16:42:44.000000000 -0400
+@@ -84,3 +84,7 @@
+ optional_policy(`
+ 	nis_use_ypbind(calamaris_t)
+ ')
++
++optional_policy(`
++	nscd_socket_use(calamaris_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.26/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/apps/cpufreqselector.te	2009-07-30 15:33:08.000000000 -0400
@@ -4932,7 +4943,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.26/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/files.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/files.if	2009-08-05 17:20:50.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -10117,7 +10128,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.26/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-05 16:52:16.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)
@@ -10155,7 +10166,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_setsched(devicekit_disk_t)
  
  corecmd_exec_bin(devicekit_disk_t)
-@@ -79,11 +86,13 @@
+@@ -79,21 +86,26 @@
  dev_rw_sysfs(devicekit_disk_t)
  dev_read_urand(devicekit_disk_t)
  dev_getattr_usbfs_dirs(devicekit_disk_t)
@@ -10167,9 +10178,14 @@ diff -b -B --ignore-all-space --exclude-
  files_read_usr_files(devicekit_disk_t)
 +files_manage_isid_type_dirs(devicekit_disk_t)
  
++fs_list_inotifyfs(devicekit_disk_t)
++fs_manage_fusefs_dirs(devicekit_disk_t)
  fs_mount_all_fs(devicekit_disk_t)
  fs_unmount_all_fs(devicekit_disk_t)
-@@ -94,6 +103,8 @@
+-fs_manage_fusefs_dirs(devicekit_disk_t)
+ 
+ storage_raw_read_fixed_disk(devicekit_disk_t)
+ storage_raw_write_fixed_disk(devicekit_disk_t)
  storage_raw_read_removable_device(devicekit_disk_t)
  storage_raw_write_removable_device(devicekit_disk_t)
  
@@ -10178,7 +10194,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(devicekit_disk_t)
  
  miscfiles_read_localization(devicekit_disk_t)
-@@ -110,6 +121,7 @@
+@@ -110,6 +122,7 @@
  ')
  
  optional_policy(`
@@ -10186,7 +10202,7 @@ 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,6 +146,19 @@
+@@ -134,6 +147,19 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
@@ -10206,7 +10222,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # DeviceKit-Power local policy
-@@ -142,6 +167,7 @@
+@@ -142,6 +168,7 @@
  allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace };
  allow devicekit_power_t self:fifo_file rw_fifo_file_perms;
  allow devicekit_power_t self:unix_dgram_socket create_socket_perms;
@@ -10214,7 +10230,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 +177,7 @@
+@@ -151,6 +178,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -10222,7 +10238,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +186,7 @@
+@@ -159,6 +187,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -10230,7 +10246,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)
-@@ -180,8 +208,11 @@
+@@ -180,8 +209,11 @@
  ')
  
  optional_policy(`
@@ -10243,7 +10259,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +234,23 @@
+@@ -203,17 +235,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -10709,7 +10725,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.26/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/hal.te	2009-08-04 05:57:57.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/hal.te	2009-08-05 17:09:21.000000000 -0400
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -10803,10 +10819,15 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +491,17 @@
+@@ -469,10 +491,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
++manage_dirs_pattern(hald_dccm_t, hald_var_run_t, hald_var_run_t)
++manage_files_pattern(hald_dccm_t, hald_var_run_t, hald_var_run_t)
++manage_sock_files_pattern(hald_dccm_t, hald_var_run_t, hald_var_run_t)
++files_pid_filetrans(hald_dccm_t, hald_var_run_t, { dir file sock_file })
++
 +manage_sock_files_pattern(hald_dccm_t, hald_tmp_t, hald_tmp_t)
 +files_tmp_filetrans(hald_dccm_t, hald_tmp_t, sock_file)
 +
@@ -10821,7 +10842,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +513,7 @@
+@@ -484,6 +518,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -10829,7 +10850,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +521,9 @@
+@@ -491,3 +526,9 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -13953,7 +13974,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.26/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/rpc.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/rpc.te	2009-08-05 17:22:27.000000000 -0400
 @@ -91,6 +91,8 @@
  
  seutil_dontaudit_search_config(rpcd_t)
@@ -13990,6 +14011,17 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`nfs_export_all_ro',`
  	dev_getattr_all_blk_files(nfsd_t)
+@@ -189,8 +197,10 @@
+ fs_rw_rpc_sockets(gssd_t) 
+ fs_read_rpc_files(gssd_t) 
+ 
++fs_list_inotifyfs(gssd_t)
+ files_list_tmp(gssd_t) 
+ files_read_usr_symlinks(gssd_t) 
++files_dontaudit_write_var_dirs(gssd_t) 
+ 
+ auth_use_nsswitch(gssd_t)
+ auth_manage_cache(gssd_t) 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.6.26/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/rsync.te	2009-07-30 15:33:09.000000000 -0400
@@ -16491,6 +16523,18 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	sssd over dbus.
  ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.6.26/policy/modules/services/sysstat.te
+--- nsaserefpolicy/policy/modules/services/sysstat.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/sysstat.te	2009-08-05 17:06:04.000000000 -0400
+@@ -19,7 +19,7 @@
+ # Local policy
+ #
+ 
+-allow sysstat_t self:capability { sys_resource sys_tty_config };
++allow sysstat_t self:capability { dac_override sys_resource sys_tty_config };
+ dontaudit sysstat_t self:capability sys_admin;
+ allow sysstat_t self:fifo_file rw_fifo_file_perms;
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.26/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/uucp.te	2009-07-30 15:33:09.000000000 -0400
@@ -16533,7 +16577,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.26/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.if	2009-08-05 16:59:48.000000000 -0400
 @@ -103,7 +103,7 @@
  
  ########################################
@@ -16631,7 +16675,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an virt environment
  ## </summary>
-@@ -327,3 +364,54 @@
+@@ -327,3 +364,56 @@
  
  	virt_manage_log($1)
  ')
@@ -16664,6 +16708,8 @@ diff -b -B --ignore-all-space --exclude-
 +	files_tmpfs_file($1_tmpfs_t)
 +
 +	type $1_image_t, virt_image_type;
++	files_type($1_image_t)
++	dev_node($1_image_t)
 +
 +	manage_dirs_pattern($1_t, $1_image_t, $1_image_t)
 +	manage_files_pattern($1_t, $1_image_t, $1_image_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -p -r1.890 -r1.891
--- selinux-policy.spec	5 Aug 2009 19:37:52 -0000	1.890
+++ selinux-policy.spec	5 Aug 2009 21:31:17 -0000	1.891
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-6
+- Allow devicekit_disk to list inotify
+
 * Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-5
 - Allow svirt images to create sock_file in svirt_var_run_t
 



From amdunn at fedoraproject.org  Wed Aug  5 21:33:00 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Wed,  5 Aug 2009 21:33:00 +0000 (UTC)
Subject: rpms/coq/devel .cvsignore, 1.5, 1.6 coq.spec, 1.12, 1.13 import.log,
	1.8, 1.9 sources, 1.5, 1.6 RecTutorial.v, 1.1, NONE
Message-ID: <20090805213300.50AA111C0347@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/coq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7642/devel

Modified Files:
	.cvsignore coq.spec import.log sources 
Removed Files:
	RecTutorial.v 
Log Message:
* Wed Aug 05 2009 Alan Dunn <amdunn at gmail.com> - 8.2pl1-1
- New upstream release
- Eliminated modification of tar_base_name that occurred for only version 8.2
- Added reference to bugzilla bug for ppc64 ExcludeArch
- HTML form of documentation seems to no longer be distributed -> must generate
  Decided for consistency to generate all documentation
- Additional file for iconv - documentation license file
- Changed tutorial directory name, now also using bundled version
  of tutorial



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Jun 2009 11:14:51 -0000	1.5
+++ .cvsignore	5 Aug 2009 21:32:59 -0000	1.6
@@ -1,7 +1 @@
-Coq-RecTutorial.pdf.gz
-Coq-Library-8.2.pdf.gz
-Coq-Reference-Manual-8.2.pdf.gz
-Coq-Tutorial-8.2.pdf.gz
-coq-8.2-1.tar.gz
-coq-refman-html-8.2.tar.gz
-coq-stdlib-html-8.2.tar.gz
+coq-8.2pl1.tar.gz


Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/coq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- coq.spec	24 Jul 2009 19:29:30 -0000	1.12
+++ coq.spec	5 Aug 2009 21:33:00 -0000	1.13
@@ -23,39 +23,32 @@
 %global _enable_debug_package 0
 %global debug_package %{nil}
 
-# The "-1" will have to be removed at the next version upgrade... this is
-# just for 8.2
-%global tar_base_name coq-%{version}-1
-
-Name:		coq
-Version:	8.2
-Release:	2%{?dist}
-Summary:	Coq proof management system
-
-Group:		Applications/Engineering
-License:	LGPLv2
-URL:		http://coq.inria.fr/
-Source0:	http://coq.inria.fr/V%{version}/files/%{tar_base_name}.tar.gz
-Source1:	Coq-Library-%{version}.pdf.gz
-Source2:	Coq-Reference-Manual-%{version}.pdf.gz
-Source3:	Coq-Tutorial-%{version}.pdf.gz 
-Source4:	Coq-RecTutorial.pdf.gz
-Source5:	coq-refman-html-%{version}.tar.gz
-Source6:	coq-stdlib-html-%{version}.tar.gz
-Source7:	RecTutorial.v
-Source8:	coqide.desktop
-Source10:	README.coq-emacs
-Patch0:		coq-makefile-strip-%{version}.patch
-Patch1:		coq-check-%{version}.patch
-Patch2:		coq-micromega-%{version}.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs
+%global tar_base_name coq-%{version}
+
+Name:           coq
+Version:        8.2pl1
+Release:        1%{?dist}
+Summary:        Coq proof management system
+
+Group:          Applications/Engineering
+License:        LGPLv2
+URL:            http://coq.inria.fr/
+Source0:        http://coq.inria.fr/V%{version}/files/%{tar_base_name}.tar.gz
+Source1:        coqide.desktop
+Source2:        README.coq-emacs
+Patch0:         coq-makefile-strip-8.2.patch
+Patch1:         coq-check-8.2.patch
+Patch2:         coq-micromega-8.2.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs
 # Needed for execstack, NOT for preventing stripping of custom
 # bytecode executables as before
 BuildRequires:  prelink
+# For documentation
+BuildRequires:  texlive-latex, texlive-texmf, hevea
 ExcludeArch: s390 s390x sparc64
-# Getting an error re: pthread_atfork - going to file a bugzilla bug
-# and number will end up here
+# ppc64 build fails in both opt and non-opt versions
+# bz: 515813
 ExcludeArch: ppc64
 
 %description
@@ -72,9 +65,9 @@ Coqide.
 # also the full name of the IDE) or "coq" and "ide" will find
 # this. (If the package were named "coq-ide", the former would fail.)
 %package coqide
-Group:		Applications/Engineering
-Summary:	Coqide IDE for Coq proof management system
-Requires:	coq
+Group:          Applications/Engineering
+Summary:        Coqide IDE for Coq proof management system
+Requires:       coq
 
 %description coqide
 Coq is a formal proof management system. It allows for the development
@@ -85,9 +78,9 @@ modules and loaded into the system.
 This package provides Coqide, a lightweight IDE for Coq.
 
 %package doc
-Group:		Applications/Engineering
-License:	Open Publication
-Summary:	Documentation for Coq proof management system
+Group:          Applications/Engineering
+License:        Open Publication
+Summary:        Documentation for Coq proof management system
 
 %description doc
 Coq is a formal proof management system. It allows for the development
@@ -104,9 +97,9 @@ main one, and one specifically on recurs
 for the latter is also included.
 
 %package emacs
-Group:		Applications/Engineering
-Summary:	Elisp files for Coq proof management system
-Requires:	coq, emacs
+Group:          Applications/Engineering
+Summary:        Elisp files for Coq proof management system
+Requires:       coq, emacs
 
 %description emacs
 Coq is a formal proof management system. It allows for the development
@@ -161,19 +154,14 @@ This package provides emacs mode files f
 
 # Fix some files that are not in UTF-8 encoding
 
-for f in CHANGES CREDITS COPYRIGHT; do
+for f in CHANGES CREDITS COPYRIGHT doc/LICENSE; do
 mv $f $f.old; iconv -f ISO-8859-1 -t UTF-8 < $f.old > $f; rm $f.old
 done
 
 %global emacs_lispdir %{_datadir}/emacs/site-lisp
 %global tex_dir %{_datadir}/texmf/tex/latex/misc
 
-# Seems like setup only sets up the main file
-cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE10 .
-gunzip *.gz
-for f in *.tar; do
-tar xf $f
-done
+cp %SOURCE1 %SOURCE2 .
 
 %build
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
@@ -206,14 +194,23 @@ done
 # executables
 
 %global coq_sopath %{_libdir}/ocaml/stublibs
+%global coqdocdir %{_defaultdocdir}/coq-%{version}
+
+./configure -prefix %{_prefix}      \
+            -libdir %{_datadir}/coq \
+            -bindir %{_bindir}      \
+            -mandir %{_mandir}      \
+            -docdir %{coqdocdir}    \
+            -emacs %{emacs_lispdir} \
+            -coqdocdir %{tex_dir} \
+            %{opt_option} \
+            -reals all \
+            -camlp5dir %{_libdir}/ocaml/camlp5 \
+            -coqrunbyteflags "-dllib -lcoqrun -dllpath %{coq_sopath}"
 
-./configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all -camlp5dir %{_libdir}/ocaml/camlp5 -coqrunbyteflags "-dllib -lcoqrun -dllpath %{coq_sopath}"
 export CAML_LD_LIBRARY_PATH=`pwd`/kernel/byterun:${CAML_LD_LIBRARY_PATH}
 make world VERBOSE=1
 
-# Fix permissions in the documentation
-chmod -R a+rX refman stdlib
-
 # Clear any execstack permissions that ELF binaries may have
 for f in bin/*; do
 file $f | grep "ELF" && execstack -c $f
@@ -237,8 +234,8 @@ mkdir -p %{buildroot}%{coqdatadir}
 
 sed -i -e 's|ICON-LOCATION-BASE|%{coqdatadir}/ide/coq.png|' coqide.desktop
 
-desktop-file-install --vendor="fedora"			\
---dir=%{buildroot}%{_datadir}/applications		\
+desktop-file-install --vendor="fedora"                  \
+--dir=%{buildroot}%{_datadir}/applications              \
 coqide.desktop
 
 # Install main Coq .v files
@@ -249,11 +246,16 @@ done
 
 # Install tutorial code
 
-%global tutorialcodedir %{coqdatadir}/tutorial
+%global tutorialcodedir %{coqdatadir}/RecTutorial
 %if %(test -d %{buildroot}%{tutorialcodedir} && echo 1 || echo 0) != 1
 mkdir -p %{buildroot}%{tutorialcodedir}
 %endif
-mv RecTutorial.v %{buildroot}%{tutorialcodedir}
+cp doc/RecTutorial/RecTutorial.v %{buildroot}%{tutorialcodedir}
+
+# Install documentation not installed by install-doc in Makefile
+for f in CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL LICENSE README;
+do cp $f %{buildroot}%{coqdocdir};
+done
 
 # Coq tries to move a .so into share - move it (easier than a makefile
 # patch)
@@ -264,6 +266,9 @@ mv %{buildroot}%{coqdatadir}/dllcoqrun.s
 # Micromega contrib tries to sneak an executable into share - move it
 mv %{buildroot}%{coqdatadir}/contrib/micromega/csdpcert %{buildroot}%{_bindir}
 
+# Don't install libcoqrun.a (it might not exist, but get rid of it if it does)
+rm -f %{buildroot}%{coqdatadir}/libcoqrun.a
+
 %clean
 rm -rf %{buildroot}
 
@@ -276,18 +281,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL LICENSE README
-%doc %{_mandir}/man1/*
+# DON'T use the doc macro here or else it wipes out all the other documentation installed!
+%{_mandir}/man1/*
 %{coqdatadir}
-%if %(test -e %{buildroot}%{coqdatadir}/libcoqrun.a && echo 1 || echo 0) == 1 
-%exclude %{coqdatadir}/libcoqrun.a
-%endif
 %{coq_sopath}/dllcoqrun.so
 %{_bindir}/coq*
 %{_bindir}/gallina
 %{_bindir}/csdpcert
 %exclude %{_bindir}/coqide*
 %exclude %{coqdatadir}/ide
+%exclude %{coqdatadir}/config/coq_config.cmo
 %if %{opt}
 %exclude %{coqdatadir}/*/*.cmxa
 %exclude %{coqdatadir}/*/*.cmx
@@ -295,6 +298,17 @@ rm -rf %{buildroot}
 %exclude %{coqdatadir}/*/*.o
 %endif
 %{tex_dir}/coq*
+# A few documentation files here should stay in the main package (and
+# are excluded from doc), but the bulk of the documentation is in the
+# doc subpackage
+%dir %{coqdocdir}
+%{coqdocdir}/CHANGES
+%{coqdocdir}/COMPATIBILITY
+%{coqdocdir}/COPYRIGHT
+%{coqdocdir}/CREDITS
+%{coqdocdir}/INSTALL
+%{coqdocdir}/LICENSE
+%{coqdocdir}/README
 
 %files coqide
 %defattr(-,root,root,-)
@@ -308,15 +322,15 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%doc Coq-Library-%{version}.pdf
-%doc Coq-Reference-Manual-%{version}.pdf
-%doc Coq-Tutorial-%{version}.pdf
-%doc Coq-RecTutorial.pdf
-%dir %{coqdatadir}
 %{tutorialcodedir}
-# Standard permissions with - in defattr make the manual unreadable... unknown how to fix
-%doc refman
-%doc stdlib
+%{coqdocdir}/*
+%exclude %{coqdocdir}/CHANGES
+%exclude %{coqdocdir}/COMPATIBILITY
+%exclude %{coqdocdir}/COPYRIGHT
+%exclude %{coqdocdir}/CREDITS
+%exclude %{coqdocdir}/INSTALL
+%exclude %{coqdocdir}/LICENSE
+%exclude %{coqdocdir}/README
 
 %files emacs
 %defattr(-,root,root,-)
@@ -324,6 +338,16 @@ rm -rf %{buildroot}
 %doc README.coq-emacs
 
 %changelog
+* Wed Aug 05 2009 Alan Dunn <amdunn at gmail.com> - 8.2pl1-1
+- New upstream release
+- Eliminated modification of tar_base_name that occurred for only version 8.2
+- Added reference to bugzilla bug for ppc64 ExcludeArch
+- HTML form of documentation seems to no longer be distributed -> must generate
+  Decided for consistency to generate all documentation
+- Additional file for iconv - documentation license file
+- Changed tutorial directory name, now also using bundled version
+  of tutorial
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	19 Jun 2009 11:14:53 -0000	1.8
+++ import.log	5 Aug 2009 21:33:00 -0000	1.9
@@ -6,3 +6,4 @@ coq-8_1pl3-5_fc9:HEAD:coq-8.1pl3-5.fc9.s
 coq-8_1pl4-2_fc10:HEAD:coq-8.1pl4-2.fc10.src.rpm:1236185498
 coq-8_1pl4-3_fc10:HEAD:coq-8.1pl4-3.fc10.src.rpm:1236186130
 coq-8_2-1_fc10:HEAD:coq-8.2-1.fc10.src.rpm:1245409718
+coq-8_2pl1-1_fc10:HEAD:coq-8.2pl1-1.fc10.src.rpm:1249507545


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Jun 2009 11:14:53 -0000	1.5
+++ sources	5 Aug 2009 21:33:00 -0000	1.6
@@ -1,7 +1 @@
-0e3d5eac23416ec75dd59fabdcc1367c  Coq-RecTutorial.pdf.gz
-127760a6d9b9bcd213cdd58ab191a363  Coq-Library-8.2.pdf.gz
-b97ab411eb3288ded1d9f8c27e308115  Coq-Reference-Manual-8.2.pdf.gz
-29b7e61e742b17c904739f546223f2e0  Coq-Tutorial-8.2.pdf.gz
-6907d97342e7b547e2e6d905a474235d  coq-8.2-1.tar.gz
-cc0005c859cbfd574f22242ec9557dc5  coq-refman-html-8.2.tar.gz
-9ff70e125ba31d53b866b8b322031ac6  coq-stdlib-html-8.2.tar.gz
+36eed48bc63ada8abf27f96eb126906c  coq-8.2pl1.tar.gz


--- RecTutorial.v DELETED ---



From bubeck at fedoraproject.org  Wed Aug  5 21:34:15 2009
From: bubeck at fedoraproject.org (Dr. Tilmann Bubeck)
Date: Wed,  5 Aug 2009 21:34:15 +0000 (UTC)
Subject: rpms/vacation/devel license-clarification, NONE, 1.1 vacation.spec, 
	1.1, 1.2
Message-ID: <20090805213415.125D111C0347@cvs1.fedora.phx.redhat.com>

Author: bubeck

Update of /cvs/pkgs/rpms/vacation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7903

Modified Files:
	vacation.spec 
Added Files:
	license-clarification 
Log Message:
* Wed Aug 05 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-7
- changed license to BSD as upstream told me
  (corresponding mail is included in doc).




--- NEW FILE license-clarification ---
Return-Path: <chris at csamuel.org>
X-Original-To: t.bubeck at reinform.de
Delivered-To: t.bubeck at reinform.de
Received: from localhost (amavis2.loef.reinform.de [10.1.1.53])
	by postfix.loef.reinform.de (Postfix) with ESMTP id 9B1941BBFD
	for <t.bubeck at reinform.de>; Tue,  4 Aug 2009 15:38:19 +0200 (CEST)
X-Virus-Scanned: amavisd-new at reinform.de
X-Spam-Flag: NO
X-Spam-Score: -2.601
X-Spam-Level: 
X-Spam-Status: No, score=-2.601 required=5 tests=[BAYES_00=-2.599,
	SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=ham
Received: from mx1.reinform.de ([82.141.45.13])
	by localhost (amavis2.loef.reinform.de [10.1.1.53]) (amavisd-new, port 10024)
	with ESMTP id kX0K-cx4NTZh for <t.bubeck at reinform.de>;
	Tue,  4 Aug 2009 15:38:11 +0200 (CEST)
Received: from csamuel.org (csamuel.org [74.50.50.137])
	by mx1.reinform.de (Postfix) with ESMTP id 2C6B863735
	for <t.bubeck at reinform.de>; Tue,  4 Aug 2009 15:38:11 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by csamuel.org (Postfix) with ESMTP id C662D4076A;
	Tue,  4 Aug 2009 23:37:38 +1000 (EST)
Received: from csamuel.org ([127.0.0.1])
 by localhost (csamuel.org [127.0.0.1]) (amavisd-maia, port 10024) with LMTP
 id 06301-01; Tue,  4 Aug 2009 23:37:33 +1000 (EST)
Received: from quad.localnet (124-254-75-238-static-dsl.ispone.net.au [124.254.75.238])
	by csamuel.org (Postfix) with ESMTPS id D9EC44056E;
	Tue,  4 Aug 2009 23:37:32 +1000 (EST)
From: Chris Samuel <chris at csamuel.org>
To: "Dr. Tilmann Bubeck" <t.bubeck at reinform.de>
Subject: Re: Clarification about license of vacation
Date: Tue, 4 Aug 2009 23:37:57 +1000
User-Agent: KMail/1.12.0 (Linux/2.6.30-cs-1-intel-kms-uvc; KDE/4.2.98; x86_64; ; )
Cc: sean.rima at tcob1.net
References: <200908031549.23666.t.bubeck at reinform.de>
In-Reply-To: <200908031549.23666.t.bubeck at reinform.de>
X-Face: Wcb;^Ll1x`\6);#5&v=2":47)c~M=K)9_=0mp[Ob~p==:85h/k)fj6nBf@^SdaXtmdYGRq
	[>N&^2m#i\v9ZHe:G-e=OR}-sEf`CdEL2/\).SeCBSC"Cn[(:./c*I|/3KCDO$<{n8m;X_
	g\Y9LQ=v/b5`)L,WOQdI*?SqUCgiw/9`KxgdU5;z8L.3)F!1M3=w:i9MsWp&v;%usOXL;w
	6kF?wAZjss.+y(78'qBu";bx]>"2dZd/S$^K)nU^N0HM\^^;s#q
MIME-Version: 1.0
Content-Type: multipart/signed;
  boundary="nextPart2820739.ksyRrFV6lr";
  protocol="application/pgp-signature";
  micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <200908042338.00904.chris at csamuel.org>

--nextPart2820739.ksyRrFV6lr
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

On Mon, 3 Aug 2009 11:49:22 pm Dr. Tilmann Bubeck wrote:

Hi there,

> The key question is wether its GPLv2 (only v2) or also "GPLv2+" (and
> following GPL versions).

Vacation 1.2.7.0 was completely rebased from the version here:

http://savannah.nongnu.org/projects/vacation/

which is licensed under the modified BSD license (no advertising clause).

The earlier versions I inherited at SourceForge were based on the original =
BSD=20
license with advertising clause which wasn't GPL compatible and a big issue=
=20
because it was linking against gdbm!

I contacted Eric Allman (the original author) about the licensing before=20
rebasing in 2006 and he wrote:

# The advertising clause is obsolete at this point --- the Regents declared=
 it
# to be null-and-void several years ago.  You can strip it off with no
# problem.

> The best way to clarify the situation would be to state it in the README =
or
> LICENSE file clearly. Otherwise you answer to this mail could fill the ga=
p.

Agreed! I'll try and get to that in the near future, and clean up the docs.=
=20

Sorry about the confusion,
Chris
=2D-=20
 Chris Samuel  :  http://www.csamuel.org/  :  Melbourne, VIC

This email may come with a PGP signature as a file. Do not panic.
=46or more info see: http://en.wikipedia.org/wiki/OpenPGP

--nextPart2820739.ksyRrFV6lr
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQEVAwUASng5tY1yjaOTJg85AQKZegf9FiOmntfjdKnj66fS+b2A7P8eYWo+Lokr
0H2pC1PkP3Db6u7Ix0qZYt/+1Eptzr5KsUmPhxRkUwlUfY7QQHpL2fMxpGyKPBOp
BPaPOQqs6sOzpkwdxVwd3D637SJRtfUrf/+U7xzeh8cNp4SO5qugpBhsGIyLrZVn
Xzpst5xTtpZHrHeyoi5CmR9lA+YipRiBBowcp8TAXLMH7Sbp/Y2Qu9jodTlCbCW3
dMyPG83iKJFd5ui0Qxsb+czhK4S5wsqDdSwrtHYfc1Q/cAP6wBhKNIB3aMr/SDHA
aJJ5ot3jvMddaJqEWEHWLf34Y8XRc3TXcFc8YbRPrAuvaCB4ia2nCQ==
=O6Dc
-----END PGP SIGNATURE-----

--nextPart2820739.ksyRrFV6lr--


Index: vacation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/devel/vacation.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vacation.spec	5 Aug 2009 20:42:46 -0000	1.1
+++ vacation.spec	5 Aug 2009 21:34:14 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: Automatic mail answering program
 Name: vacation
 Version: 1.2.7.0
-Release: 6%{?dist}
-License: GPLv2
+Release: 7%{?dist}
+License: BSD
 Group: Applications/System
 Source: http://downloads.sourceforge.net/vacation/%{name}-%{version}.tar.gz
+Source1: license-clarification
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: smtpdaemon
 URL: http://sourceforge.net/projects/vacation/
@@ -21,6 +22,7 @@ vorhanden.
 
 %prep
 %setup -q
+cp -p %SOURCE1 .
 
 %build
 make %{?_smp_mflags}
@@ -41,9 +43,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/vacation
 %{_bindir}/vaclook
 %{_mandir}/*/*
-%doc COPYING README README.smrsh ChangeLog
+%doc COPYING README README.smrsh ChangeLog license-clarification
 
 %changelog
+* Wed Aug 05 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-7
+- changed license to BSD as upstream told me
+  (corresponding mail is included in doc).
+
 * Mon Aug 03 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-6
 - changed license to GPLv2 until licensing is clarified with upstream
 - changed source URL to "downloads" instead of "download".



From clumens at fedoraproject.org  Wed Aug  5 21:40:34 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed,  5 Aug 2009 21:40:34 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.650, 1.651 anaconda.spec, 1.800, 
	1.801 sources, 1.784, 1.785
Message-ID: <20090805214034.867BB11C0439@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9969

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -p -r1.650 -r1.651
--- .cvsignore	31 Jul 2009 19:19:03 -0000	1.650
+++ .cvsignore	5 Aug 2009 21:40:33 -0000	1.651
@@ -1,3 +1,4 @@
 anaconda-12.5.tar.bz2
 anaconda-12.6.tar.bz2
 anaconda-12.7.tar.bz2
+anaconda-12.8.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -p -r1.800 -r1.801
--- anaconda.spec	31 Jul 2009 19:19:03 -0000	1.800
+++ anaconda.spec	5 Aug 2009 21:40:34 -0000	1.801
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.7
+Version: 12.8
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -104,7 +104,6 @@ Requires: libbdevid-python
 Requires: libuser-python
 Requires: newt-python
 Requires: authconfig
-Requires: gnome-python2-gtkhtml2
 Requires: system-config-firewall
 Requires: cryptsetup-luks
 Requires: python-cryptsetup >= %{pythoncryptsetupver}
@@ -112,7 +111,7 @@ Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
 %ifnarch s390 s390x ppc64
-Requires: system-config-keyboard >= 1.3.0
+Requires: system-config-keyboard >= 1.3.1
 %endif
 Requires: hal, dbus-python
 Requires: cracklib-python
@@ -208,6 +207,40 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Aug 05 2009 Chris Lumens <clumens at redhat.com> - 12.8-1
+- Don't try to unmount the CD before we later unmount the CD (#515564).
+  (clumens)
+- Do not offer going back when ugrade root for ks upgrade is not found
+  (#499321) (rvykydal)
+- Rebuild .pot file and update translations. (clumens)
+- Import the logging stuff (#515564). (clumens)
+- Add keyboard kernel cmdline options to grub.conf for dracut (hdegoede)
+- Fix backtrace in network.dracutSetupString in the static ip case (hdegoede)
+- Write dracut i18n cmdline options to grub.conf (hdegoede)
+- Pass InstalltData to booty __init__ as it needs access to many of its
+  members (hdegoede)
+- Fix ctrl-alt-deleter behavior /before/ end of install. (pjones)
+- Merge branch 'master' of ssh://git.fedoraproject.org/git/anaconda (notting)
+- No longer use HAL in list-harddrives. (clumens)
+- The names of a couple basic udev methods has changed. (clumens)
+- Move basic udev methods out of the storage module (#514592). (clumens)
+- We do not actually require gtkhtml2 or the python bindings for it.
+  (notting)
+- Fix some typos in rescue mode (#515091) (msivak)
+- Add a dracutSetupString method to network.py (hdegoede)
+- Fix backtrace due to iscsi.getNode() not finding the iscsi node (hdegoede)
+- Use dracutSetupString() method to add the kernel parameters needed for
+  dracut (hdegoede)
+- Add a dracutSetupString method to devices.py classes (hdegoede)
+- Differentiate between ibft discovered and manually added iscsi disks
+  (hdegoede)
+- Store iscsi node pointer in iScsiDiskDevice objects (hdegoede)
+- When checking logical partition dependcies, make sure the are one the same
+  disk (hdegoede)
+- Only set iscsi nodes to autostart when none of the LUN's contain /
+  (hdegoede)
+- Add functions to go from an iScsiDiskDevice to an libiscsi node (hdegoede)
+
 * Fri Jul 31 2009 Chris Lumens <clumens at redhat.com> - 12.7-1
 - Fix up udev sillies (related to #514501) (katzj)
 - Log when we unmount filesystems so we have a match for mount messages.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.784
retrieving revision 1.785
diff -u -p -r1.784 -r1.785
--- sources	31 Jul 2009 19:19:03 -0000	1.784
+++ sources	5 Aug 2009 21:40:34 -0000	1.785
@@ -1 +1 @@
-9817081809bd5e752cdb304212328494  anaconda-12.7.tar.bz2
+3ec836d293455dc1710d2338f39be59b  anaconda-12.8.tar.bz2



From dcantrel at fedoraproject.org  Wed Aug  5 21:48:30 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  5 Aug 2009 21:48:30 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.1.0-CVE-2009-0692.patch, NONE,
	1.1 dhcp-4.1.0-CVE-2009-1892.patch, NONE, 1.1 dhcp.spec, 1.264, 1.265
Message-ID: <20090805214830.D8A0911C0347@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11696

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0-CVE-2009-0692.patch dhcp-4.1.0-CVE-2009-1892.patch 
Log Message:
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-27
- Fix for CVE-2009-0692
- Fix for CVE-2009-1892 (#511834)


dhcp-4.1.0-CVE-2009-0692.patch:
 dhclient.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-4.1.0-CVE-2009-0692.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.CVE-2009-0692 dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.CVE-2009-0692	2008-06-11 10:17:10.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-08-05 11:32:24.000000000 -1000
@@ -3054,8 +3054,15 @@ void script_write_params (client, prefix
 		if (data.len > 3) {
 			struct iaddr netmask, subnet, broadcast;
 
-			memcpy (netmask.iabuf, data.data, data.len);
-			netmask.len = data.len;
+			/*
+			 * No matter the length of the subnet-mask option,
+			 * use only the first four octets.  Note that
+			 * subnet-mask options longer than 4 octets are not
+			 * in conformance with RFC 2132, but servers with this
+			 * flaw do exist.
+			 */
+			memcpy(netmask.iabuf, data.data, 4);
+			netmask.len = 4;
 			data_string_forget (&data, MDL);
 
 			subnet = subnet_number (lease -> address, netmask);

dhcp-4.1.0-CVE-2009-1892.patch:
 dhcp.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE dhcp-4.1.0-CVE-2009-1892.patch ---
diff -up dhcp-4.1.0/server/dhcp.c.CVE-2009-1892 dhcp-4.1.0/server/dhcp.c
--- dhcp-4.1.0/server/dhcp.c.CVE-2009-1892	2008-11-03 08:13:58.000000000 -1000
+++ dhcp-4.1.0/server/dhcp.c	2009-08-05 11:34:07.000000000 -1000
@@ -1755,6 +1755,8 @@ void ack_lease (packet, lease, offer, wh
 				host_reference (&host, h, MDL);
 		}
 		if (!host) {
+			if (hp)
+				host_dereference (&hp, MDL);
 			find_hosts_by_haddr (&hp,
 					     packet -> raw -> htype,
 					     packet -> raw -> chaddr,


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- dhcp.spec	24 Jul 2009 20:13:13 -0000	1.264
+++ dhcp.spec	5 Aug 2009 21:48:30 -0000	1.265
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  26%{?dist}
+Release:  27%{?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.
@@ -49,6 +49,8 @@ Patch18:  %{name}-4.1.0-missing-ipv6-not
 Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
 Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
+Patch22:  %{name}-4.1.0-CVE-2009-0692.patch
+Patch23:  %{name}-4.1.0-CVE-2009-1892.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -203,6 +205,14 @@ libdhcpctl and libomapi static libraries
 # Ensure 64-bit platforms parse lease file dates & times correctly (#448615)
 %patch21 -p1
 
+# Fix for CVE-2009-0692 (patch from Mandriva SRPM)
+# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0692
+%patch22 -p1
+
+# Fix for CVE-2009-1892 (patch from Mandriva SRPM)
+# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
+%patch23 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -457,6 +467,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-27
+- Fix for CVE-2009-0692
+- Fix for CVE-2009-1892 (#511834)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12:4.1.0-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bubeck at fedoraproject.org  Wed Aug  5 21:49:11 2009
From: bubeck at fedoraproject.org (Dr. Tilmann Bubeck)
Date: Wed,  5 Aug 2009 21:49:11 +0000 (UTC)
Subject: rpms/vacation/F-11 import.log, NONE, 1.1 license-clarification, NONE,
	1.1 vacation.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805214911.A743211C0347@cvs1.fedora.phx.redhat.com>

Author: bubeck

Update of /cvs/pkgs/rpms/vacation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11884/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license-clarification vacation.spec 
Log Message:
 initial checkin



--- NEW FILE import.log ---
vacation-1_2_7_0-7_fc12:F-11:vacation-1.2.7.0-7.fc12.src.rpm:1249508913


--- NEW FILE license-clarification ---
Return-Path: <chris at csamuel.org>
X-Original-To: t.bubeck at reinform.de
Delivered-To: t.bubeck at reinform.de
Received: from localhost (amavis2.loef.reinform.de [10.1.1.53])
	by postfix.loef.reinform.de (Postfix) with ESMTP id 9B1941BBFD
	for <t.bubeck at reinform.de>; Tue,  4 Aug 2009 15:38:19 +0200 (CEST)
X-Virus-Scanned: amavisd-new at reinform.de
X-Spam-Flag: NO
X-Spam-Score: -2.601
X-Spam-Level: 
X-Spam-Status: No, score=-2.601 required=5 tests=[BAYES_00=-2.599,
	SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=ham
Received: from mx1.reinform.de ([82.141.45.13])
	by localhost (amavis2.loef.reinform.de [10.1.1.53]) (amavisd-new, port 10024)
	with ESMTP id kX0K-cx4NTZh for <t.bubeck at reinform.de>;
	Tue,  4 Aug 2009 15:38:11 +0200 (CEST)
Received: from csamuel.org (csamuel.org [74.50.50.137])
	by mx1.reinform.de (Postfix) with ESMTP id 2C6B863735
	for <t.bubeck at reinform.de>; Tue,  4 Aug 2009 15:38:11 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by csamuel.org (Postfix) with ESMTP id C662D4076A;
	Tue,  4 Aug 2009 23:37:38 +1000 (EST)
Received: from csamuel.org ([127.0.0.1])
 by localhost (csamuel.org [127.0.0.1]) (amavisd-maia, port 10024) with LMTP
 id 06301-01; Tue,  4 Aug 2009 23:37:33 +1000 (EST)
Received: from quad.localnet (124-254-75-238-static-dsl.ispone.net.au [124.254.75.238])
	by csamuel.org (Postfix) with ESMTPS id D9EC44056E;
	Tue,  4 Aug 2009 23:37:32 +1000 (EST)
From: Chris Samuel <chris at csamuel.org>
To: "Dr. Tilmann Bubeck" <t.bubeck at reinform.de>
Subject: Re: Clarification about license of vacation
Date: Tue, 4 Aug 2009 23:37:57 +1000
User-Agent: KMail/1.12.0 (Linux/2.6.30-cs-1-intel-kms-uvc; KDE/4.2.98; x86_64; ; )
Cc: sean.rima at tcob1.net
References: <200908031549.23666.t.bubeck at reinform.de>
In-Reply-To: <200908031549.23666.t.bubeck at reinform.de>
X-Face: Wcb;^Ll1x`\6);#5&v=2":47)c~M=K)9_=0mp[Ob~p==:85h/k)fj6nBf@^SdaXtmdYGRq
	[>N&^2m#i\v9ZHe:G-e=OR}-sEf`CdEL2/\).SeCBSC"Cn[(:./c*I|/3KCDO$<{n8m;X_
	g\Y9LQ=v/b5`)L,WOQdI*?SqUCgiw/9`KxgdU5;z8L.3)F!1M3=w:i9MsWp&v;%usOXL;w
	6kF?wAZjss.+y(78'qBu";bx]>"2dZd/S$^K)nU^N0HM\^^;s#q
MIME-Version: 1.0
Content-Type: multipart/signed;
  boundary="nextPart2820739.ksyRrFV6lr";
  protocol="application/pgp-signature";
  micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <200908042338.00904.chris at csamuel.org>

--nextPart2820739.ksyRrFV6lr
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

On Mon, 3 Aug 2009 11:49:22 pm Dr. Tilmann Bubeck wrote:

Hi there,

> The key question is wether its GPLv2 (only v2) or also "GPLv2+" (and
> following GPL versions).

Vacation 1.2.7.0 was completely rebased from the version here:

http://savannah.nongnu.org/projects/vacation/

which is licensed under the modified BSD license (no advertising clause).

The earlier versions I inherited at SourceForge were based on the original =
BSD=20
license with advertising clause which wasn't GPL compatible and a big issue=
=20
because it was linking against gdbm!

I contacted Eric Allman (the original author) about the licensing before=20
rebasing in 2006 and he wrote:

# The advertising clause is obsolete at this point --- the Regents declared=
 it
# to be null-and-void several years ago.  You can strip it off with no
# problem.

> The best way to clarify the situation would be to state it in the README =
or
> LICENSE file clearly. Otherwise you answer to this mail could fill the ga=
p.

Agreed! I'll try and get to that in the near future, and clean up the docs.=
=20

Sorry about the confusion,
Chris
=2D-=20
 Chris Samuel  :  http://www.csamuel.org/  :  Melbourne, VIC

This email may come with a PGP signature as a file. Do not panic.
=46or more info see: http://en.wikipedia.org/wiki/OpenPGP

--nextPart2820739.ksyRrFV6lr
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQEVAwUASng5tY1yjaOTJg85AQKZegf9FiOmntfjdKnj66fS+b2A7P8eYWo+Lokr
0H2pC1PkP3Db6u7Ix0qZYt/+1Eptzr5KsUmPhxRkUwlUfY7QQHpL2fMxpGyKPBOp
BPaPOQqs6sOzpkwdxVwd3D637SJRtfUrf/+U7xzeh8cNp4SO5qugpBhsGIyLrZVn
Xzpst5xTtpZHrHeyoi5CmR9lA+YipRiBBowcp8TAXLMH7Sbp/Y2Qu9jodTlCbCW3
dMyPG83iKJFd5ui0Qxsb+czhK4S5wsqDdSwrtHYfc1Q/cAP6wBhKNIB3aMr/SDHA
aJJ5ot3jvMddaJqEWEHWLf34Y8XRc3TXcFc8YbRPrAuvaCB4ia2nCQ==
=O6Dc
-----END PGP SIGNATURE-----

--nextPart2820739.ksyRrFV6lr--


--- NEW FILE vacation.spec ---
Summary: Automatic mail answering program
Name: vacation
Version: 1.2.7.0
Release: 7%{?dist}
License: BSD
Group: Applications/System
Source: http://downloads.sourceforge.net/vacation/%{name}-%{version}.tar.gz
Source1: license-clarification
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: smtpdaemon
URL: http://sourceforge.net/projects/vacation/
BuildRequires: gdbm-devel

%description 
Vacation is the automatic mail answering program found
on many Unix systems.

%description	-l de
Vacation beantwortet automatisch alle eingehenden EMails
mit einer Standard-Antwort und ist auf vielen Unix-Systemen
vorhanden.

%prep
%setup -q
cp -p %SOURCE1 .

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

install -D -p -m 755 vacation        $RPM_BUILD_ROOT%{_bindir}/vacation
install -D -p -m 755 vaclook         $RPM_BUILD_ROOT%{_bindir}/vaclook
install -D -p -m 444 vacation.man    $RPM_BUILD_ROOT%{_mandir}/man1/vacation.1
install -D -p -m 444 vaclook.man     $RPM_BUILD_ROOT%{_mandir}/man1/vaclook.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/vacation
%{_bindir}/vaclook
%{_mandir}/*/*
%doc COPYING README README.smrsh ChangeLog license-clarification

%changelog
* Wed Aug 05 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-7
- changed license to BSD as upstream told me
  (corresponding mail is included in doc).

* Mon Aug 03 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-6
- changed license to GPLv2 until licensing is clarified with upstream
- changed source URL to "downloads" instead of "download".
  (bz #474802)

* Mon Jul 06 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-5
- Fixes according comments from bz #474802

* Wed Jun 24 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-4
- repackaged for Fedora 11.
- Fixed bugs from bz #474802

* Fri Dec 05 2008 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-1
- Upgraded to 1.2.7.0
- repackaged for Fedora 10.

* Tue Sep 03 2002 Pete O'Hara <pete at guardiandigital.com>
- Version 1.2.7.rc1, Release 1.2.1
  - Upgraded to 1.2.7.rc1

* Mon Aug 26 2002 Pete O'Hara <pete at guardiandigital.com>
- Version 1.2.6.1, Release 1.2.0
  - Initial release for Mail Suite

* Sun Nov 11 2001 Devon <devon at tuxfan.homeip.net>
- upgrade to version 1.2.7.rc1
* Sat Nov 10 2001 Devon <devon at tuxfan.homeip.net>
- upgrade to version 1.2.6
* Wed Sep 19 2001 Devon <devon at tuxfan.homeip.net>
- added %%post link /etc/smrsh to /usr/bin/vacation
- added %%postun deletion of /etc/smrsh/vacation
- defined a umask of 022 fix permissions on created files.
  $HOME/.forward was created group writable, smrsh refused
  to run in that case. See vacation-1.2.2-permissions.patch

* Mon Aug 07 2000 Than Ngo <than at redhat.de>
- fix specfile and patch file to rebuilt

* Mon Aug 07 2000 Michael Stefaniuc <mstefani at redhat.com>
- upgraded to 1.2.2
- fixed security fix

* Wed Aug 02 2000 Than Ngo <than at redhat.de>
- fix manpath (Bug #15070)

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Sun Jul 16 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- add security fix

* Mon Jul 10 2000 Than Ngo <than at redhat.de>
- fix problem (it won't include the .vacation.msg) (bug #13572)
- use RPM macros

* Mon Jul 03 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Sun May 28 2000 Ngo Than <than at redhat.de>
- rebuild for 7.0
- put man pages in correct place
- cleanup specfile
- fix Summary

* Fri Dec 10 1999 Ngo Than <than at redhat.de>
- initial RPM for powertools-6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:47:08 -0000	1.1
+++ .cvsignore	5 Aug 2009 21:49:11 -0000	1.2
@@ -0,0 +1 @@
+vacation-1.2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:08 -0000	1.1
+++ sources	5 Aug 2009 21:49:11 -0000	1.2
@@ -0,0 +1 @@
+cae9253eee4c2e68af01bc6b1f469cd2  vacation-1.2.7.0.tar.gz



From mgrepl at fedoraproject.org  Wed Aug  5 21:49:50 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed,  5 Aug 2009 21:49:50 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.39,
	1.40 selinux-policy.spec, 1.894, 1.895
Message-ID: <20090805214950.5CAC411C0347@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-serv12138

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow svirt images to create sock_file in svirt_var_run_t



policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    4 
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/sudo.if              |    4 
 modules/admin/usermanage.te        |    1 
 modules/apps/calamaris.te          |    4 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/screen.if             |    1 
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |    9 +
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |   12 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.te           |    3 
 modules/services/dbus.if           |    4 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |    8 -
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    1 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   29 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   41 +++++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    6 
 modules/system/userdomain.if       |   28 ++-
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 124 files changed, 2022 insertions(+), 635 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- policy-20090521.patch	4 Aug 2009 11:25:19 -0000	1.39
+++ policy-20090521.patch	5 Aug 2009 21:49:50 -0000	1.40
@@ -167,7 +167,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.12/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-06-25 10:19:43.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-07-13 11:23:45.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/readahead.te	2009-08-05 21:59:03.000000000 +0200
 @@ -50,11 +50,13 @@
  domain_use_interactive_fds(readahead_t)
  domain_read_all_domains_state(readahead_t)
@@ -517,6 +517,20 @@ diff -b -B --ignore-all-space --exclude-
 +
 +permissive shorewall_t;
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.6.12/policy/modules/admin/sudo.if
+--- nsaserefpolicy/policy/modules/admin/sudo.if	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/admin/sudo.if	2009-08-05 23:24:01.000000000 +0200
+@@ -152,6 +152,10 @@
+ 	optional_policy(`
+ 		dbus_system_bus_client($1_sudo_t)
+ 	')
++
++	optional_policy(`
++		fprintd_dbus_chat($1_sudo_t)
++	')
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.12/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/admin/usermanage.te	2009-06-25 10:21:01.000000000 +0200
@@ -528,6 +542,19 @@ diff -b -B --ignore-all-space --exclude-
  
  # Execute /usr/bin/{passwd,chfn,chsh} and /usr/sbin/{useradd,vipw}.
  corecmd_exec_bin(groupadd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/calamaris.te serefpolicy-3.6.12/policy/modules/apps/calamaris.te
+--- nsaserefpolicy/policy/modules/apps/calamaris.te	2009-04-07 21:54:49.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/calamaris.te	2009-08-05 23:27:19.000000000 +0200
+@@ -82,5 +82,9 @@
+ ')
+ 
+ optional_policy(`
++	nscd_socket_use(calamaris_t)
++')  
++
++optional_policy(`
+ 	nis_use_ypbind(calamaris_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gitosis.fc serefpolicy-3.6.12/policy/modules/apps/gitosis.fc
 --- nsaserefpolicy/policy/modules/apps/gitosis.fc	1970-01-01 01:00:00.000000000 +0100
 +++ serefpolicy-3.6.12/policy/modules/apps/gitosis.fc	2009-06-25 10:21:01.000000000 +0200
@@ -1291,6 +1318,17 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	hal_dbus_chat(sandbox_net_client_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.12/policy/modules/apps/screen.if
+--- nsaserefpolicy/policy/modules/apps/screen.if	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/screen.if	2009-08-05 23:21:33.000000000 +0200
+@@ -62,6 +62,7 @@
+ 	manage_dirs_pattern($1_screen_t, screen_dir_t, screen_dir_t)
+ 	filetrans_pattern($1_screen_t, screen_dir_t, screen_var_run_t, fifo_file)
+ 	files_pid_filetrans($1_screen_t, screen_dir_t, dir)
++	dontaudit $3 screen_var_run_t:fifo_file read;
+ 
+ 	allow $1_screen_t screen_home_t:dir list_dir_perms;
+ 	read_files_pattern($1_screen_t, screen_home_t, screen_home_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.6.12/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2009-04-07 21:54:49.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/vmware.fc	2009-06-25 10:21:01.000000000 +0200
@@ -1795,7 +1833,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write the controlling
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.12/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/roles/staff.te	2009-06-25 10:21:01.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/roles/staff.te	2009-08-05 21:52:27.000000000 +0200
 @@ -44,6 +44,10 @@
  ')
  
@@ -1807,7 +1845,18 @@ diff -b -B --ignore-all-space --exclude-
  	secadm_role_change(staff_r)
  ')
  
-@@ -95,6 +99,10 @@
+@@ -87,6 +91,10 @@
+ ')
+ 
+ optional_policy(`
++        lpd_list_spool(staff_t)
++')
++
++optional_policy(`
+ 	kerneloops_dbus_chat(staff_t)
+ ')
+ 
+@@ -95,6 +103,10 @@
  ')
  
  optional_policy(`
@@ -2128,6 +2177,20 @@ diff -b -B --ignore-all-space --exclude-
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
  userdom_manage_user_home_content_dirs(cups_pdf_t)
  userdom_manage_user_home_content_files(cups_pdf_t)
+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-08-05 21:48:06.000000000 +0200
+@@ -176,6 +176,10 @@
+ 		xserver_use_xdm_fds($1_dbusd_t)
+ 		xserver_rw_xdm_pipes($1_dbusd_t)
+ 	')
++
++	optional_policy(`
++                xserver_use_xdm($1_dbusd_t)
++        ')
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.6.12/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/dcc.te	2009-06-25 10:21:01.000000000 +0200
@@ -3776,7 +3839,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(uucpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-08-04 09:35:17.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-08-05 20:44:32.000000000 +0200
 @@ -22,6 +22,13 @@
  
  ## <desc>
@@ -3820,9 +3883,11 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	brctl_domtrans(virtd_t)
  ')
-@@ -306,7 +321,9 @@
+@@ -305,8 +320,11 @@
+ 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_lnk_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)
  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)
  
@@ -3830,7 +3895,7 @@ diff -b -B --ignore-all-space --exclude-
  allow svirt_t svirt_image_t:dir search_dir_perms;
  manage_dirs_pattern(svirt_t, svirt_image_t, svirt_image_t)
  manage_files_pattern(svirt_t, svirt_image_t, svirt_image_t)
-@@ -316,16 +333,17 @@
+@@ -316,16 +334,17 @@
  dontaudit svirt_t virt_content_t:file write_file_perms;
  dontaudit svirt_t virt_content_t:dir write;
  
@@ -3851,7 +3916,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_udp_sendrecv_generic_if(svirt_t)
  corenet_udp_sendrecv_generic_node(svirt_t)
  corenet_udp_sendrecv_all_ports(svirt_t)
-@@ -353,10 +371,6 @@
+@@ -353,10 +372,6 @@
  ')
  
  optional_policy(`
@@ -3883,8 +3948,45 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.12/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-06-25 10:21:01.000000000 +0200
-@@ -861,6 +861,24 @@
++++ serefpolicy-3.6.12/policy/modules/services/xserver.if	2009-08-05 23:23:17.000000000 +0200
+@@ -599,9 +599,10 @@
+ #
+ interface(`xserver_use_xdm_fds',`
+ 	gen_require(`
+-		type xdm_t;
++		type xdm_t, xdm_home_t;
+ 	')
+ 
++	allow $1 xdm_home_t:file append_file_perms;
+ 	allow $1 xdm_t:fd use; 
+ ')
+ 
+@@ -779,6 +780,24 @@
+ 	manage_files_pattern($1, xdm_var_run_t, xdm_var_run_t)
+ ')
+ 
++#######################################
++## <summary>
++##      Search XDM var lib dirs.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`xserver_search_xdm_lib',`
++        gen_require(`
++                type xdm_var_lib_t;
++        ')
++
++        allow $1 xdm_var_lib_t:dir search_dir_perms;
++')
++
+ ########################################
+ ## <summary>
+ ##	Read XDM var lib files.
+@@ -861,6 +880,24 @@
  
  ########################################
  ## <summary>
@@ -3909,8 +4011,11 @@ 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().
-@@ -1411,6 +1429,7 @@
+@@ -1409,8 +1446,10 @@
+ 	# Allow connections to X server.
+ 	xserver_stream_connect_xdm($1)
  	xserver_read_xdm_tmp_files($1)
++	xserver_search_xdm_lib($1)
  	xserver_xdm_stream_connect($1)
  	xserver_setattr_xdm_tmp_dirs($1)
 +	xserver_read_xdm_pid($1)
@@ -4751,7 +4856,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.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-07-31 09:32:45.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-05 23:25:40.000000000 +0200
 @@ -627,12 +627,6 @@
  		')
  
@@ -4765,7 +4870,7 @@ diff -b -B --ignore-all-space --exclude-
  			evolution_dbus_chat($1_usertype)
  			evolution_alarm_dbus_chat($1_usertype)
  	')
-@@ -968,6 +962,16 @@
+@@ -968,6 +962,21 @@
  	')
  
  		optional_policy(`
@@ -4775,6 +4880,11 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
++		fprintd_dbus_chat($1_t)
++	')
++
++
++	optional_policy(`
 +		gnomeclock_dbus_chat($1_usertype)
 +	')
 +
@@ -4782,7 +4892,7 @@ diff -b -B --ignore-all-space --exclude-
  		gnome_manage_config($1_usertype)
  		gnome_manage_gconf_home_files($1_usertype)
  		gnome_read_gconf_config($1_usertype)
-@@ -1457,6 +1461,7 @@
+@@ -1457,6 +1466,7 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -4790,7 +4900,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_home($1)
  ')
  
-@@ -1880,7 +1885,7 @@
+@@ -1880,7 +1890,7 @@
  		type user_home_t;
  	')
  
@@ -4799,7 +4909,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3317,10 +3322,6 @@
+@@ -3317,10 +3327,6 @@
    seutil_run_newrole($1_t, $1_r)
  
    optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -p -r1.894 -r1.895
--- selinux-policy.spec	4 Aug 2009 09:38:12 -0000	1.894
+++ selinux-policy.spec	5 Aug 2009 21:49:50 -0000	1.895
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 73%{?dist}
+Release: 74%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 5 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-74
+- Allow svirt images to create sock_file in svirt_var_run_t
+
 * Tue Aug 4 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-73
 - Allow svirt_t to stream_connect to virtd_t 
 



From bubeck at fedoraproject.org  Wed Aug  5 22:00:23 2009
From: bubeck at fedoraproject.org (Dr. Tilmann Bubeck)
Date: Wed,  5 Aug 2009 22:00:23 +0000 (UTC)
Subject: rpms/vacation/F-10 import.log, NONE, 1.1 license-clarification, NONE,
	1.1 vacation.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805220023.2D58911C0439@cvs1.fedora.phx.redhat.com>

Author: bubeck

Update of /cvs/pkgs/rpms/vacation/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14360/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license-clarification vacation.spec 
Log Message:
first checkin



--- NEW FILE import.log ---
vacation-1_2_7_0-7_fc12:F-10:vacation-1.2.7.0-7.fc12.src.rpm:1249509589


--- NEW FILE license-clarification ---
Return-Path: <chris at csamuel.org>
X-Original-To: t.bubeck at reinform.de
Delivered-To: t.bubeck at reinform.de
Received: from localhost (amavis2.loef.reinform.de [10.1.1.53])
	by postfix.loef.reinform.de (Postfix) with ESMTP id 9B1941BBFD
	for <t.bubeck at reinform.de>; Tue,  4 Aug 2009 15:38:19 +0200 (CEST)
X-Virus-Scanned: amavisd-new at reinform.de
X-Spam-Flag: NO
X-Spam-Score: -2.601
X-Spam-Level: 
X-Spam-Status: No, score=-2.601 required=5 tests=[BAYES_00=-2.599,
	SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=ham
Received: from mx1.reinform.de ([82.141.45.13])
	by localhost (amavis2.loef.reinform.de [10.1.1.53]) (amavisd-new, port 10024)
	with ESMTP id kX0K-cx4NTZh for <t.bubeck at reinform.de>;
	Tue,  4 Aug 2009 15:38:11 +0200 (CEST)
Received: from csamuel.org (csamuel.org [74.50.50.137])
	by mx1.reinform.de (Postfix) with ESMTP id 2C6B863735
	for <t.bubeck at reinform.de>; Tue,  4 Aug 2009 15:38:11 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by csamuel.org (Postfix) with ESMTP id C662D4076A;
	Tue,  4 Aug 2009 23:37:38 +1000 (EST)
Received: from csamuel.org ([127.0.0.1])
 by localhost (csamuel.org [127.0.0.1]) (amavisd-maia, port 10024) with LMTP
 id 06301-01; Tue,  4 Aug 2009 23:37:33 +1000 (EST)
Received: from quad.localnet (124-254-75-238-static-dsl.ispone.net.au [124.254.75.238])
	by csamuel.org (Postfix) with ESMTPS id D9EC44056E;
	Tue,  4 Aug 2009 23:37:32 +1000 (EST)
From: Chris Samuel <chris at csamuel.org>
To: "Dr. Tilmann Bubeck" <t.bubeck at reinform.de>
Subject: Re: Clarification about license of vacation
Date: Tue, 4 Aug 2009 23:37:57 +1000
User-Agent: KMail/1.12.0 (Linux/2.6.30-cs-1-intel-kms-uvc; KDE/4.2.98; x86_64; ; )
Cc: sean.rima at tcob1.net
References: <200908031549.23666.t.bubeck at reinform.de>
In-Reply-To: <200908031549.23666.t.bubeck at reinform.de>
X-Face: Wcb;^Ll1x`\6);#5&v=2":47)c~M=K)9_=0mp[Ob~p==:85h/k)fj6nBf@^SdaXtmdYGRq
	[>N&^2m#i\v9ZHe:G-e=OR}-sEf`CdEL2/\).SeCBSC"Cn[(:./c*I|/3KCDO$<{n8m;X_
	g\Y9LQ=v/b5`)L,WOQdI*?SqUCgiw/9`KxgdU5;z8L.3)F!1M3=w:i9MsWp&v;%usOXL;w
	6kF?wAZjss.+y(78'qBu";bx]>"2dZd/S$^K)nU^N0HM\^^;s#q
MIME-Version: 1.0
Content-Type: multipart/signed;
  boundary="nextPart2820739.ksyRrFV6lr";
  protocol="application/pgp-signature";
  micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <200908042338.00904.chris at csamuel.org>

--nextPart2820739.ksyRrFV6lr
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

On Mon, 3 Aug 2009 11:49:22 pm Dr. Tilmann Bubeck wrote:

Hi there,

> The key question is wether its GPLv2 (only v2) or also "GPLv2+" (and
> following GPL versions).

Vacation 1.2.7.0 was completely rebased from the version here:

http://savannah.nongnu.org/projects/vacation/

which is licensed under the modified BSD license (no advertising clause).

The earlier versions I inherited at SourceForge were based on the original =
BSD=20
license with advertising clause which wasn't GPL compatible and a big issue=
=20
because it was linking against gdbm!

I contacted Eric Allman (the original author) about the licensing before=20
rebasing in 2006 and he wrote:

# The advertising clause is obsolete at this point --- the Regents declared=
 it
# to be null-and-void several years ago.  You can strip it off with no
# problem.

> The best way to clarify the situation would be to state it in the README =
or
> LICENSE file clearly. Otherwise you answer to this mail could fill the ga=
p.

Agreed! I'll try and get to that in the near future, and clean up the docs.=
=20

Sorry about the confusion,
Chris
=2D-=20
 Chris Samuel  :  http://www.csamuel.org/  :  Melbourne, VIC

This email may come with a PGP signature as a file. Do not panic.
=46or more info see: http://en.wikipedia.org/wiki/OpenPGP

--nextPart2820739.ksyRrFV6lr
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQEVAwUASng5tY1yjaOTJg85AQKZegf9FiOmntfjdKnj66fS+b2A7P8eYWo+Lokr
0H2pC1PkP3Db6u7Ix0qZYt/+1Eptzr5KsUmPhxRkUwlUfY7QQHpL2fMxpGyKPBOp
BPaPOQqs6sOzpkwdxVwd3D637SJRtfUrf/+U7xzeh8cNp4SO5qugpBhsGIyLrZVn
Xzpst5xTtpZHrHeyoi5CmR9lA+YipRiBBowcp8TAXLMH7Sbp/Y2Qu9jodTlCbCW3
dMyPG83iKJFd5ui0Qxsb+czhK4S5wsqDdSwrtHYfc1Q/cAP6wBhKNIB3aMr/SDHA
aJJ5ot3jvMddaJqEWEHWLf34Y8XRc3TXcFc8YbRPrAuvaCB4ia2nCQ==
=O6Dc
-----END PGP SIGNATURE-----

--nextPart2820739.ksyRrFV6lr--


--- NEW FILE vacation.spec ---
Summary: Automatic mail answering program
Name: vacation
Version: 1.2.7.0
Release: 7%{?dist}
License: BSD
Group: Applications/System
Source: http://downloads.sourceforge.net/vacation/%{name}-%{version}.tar.gz
Source1: license-clarification
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: smtpdaemon
URL: http://sourceforge.net/projects/vacation/
BuildRequires: gdbm-devel

%description 
Vacation is the automatic mail answering program found
on many Unix systems.

%description	-l de
Vacation beantwortet automatisch alle eingehenden EMails
mit einer Standard-Antwort und ist auf vielen Unix-Systemen
vorhanden.

%prep
%setup -q
cp -p %SOURCE1 .

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

install -D -p -m 755 vacation        $RPM_BUILD_ROOT%{_bindir}/vacation
install -D -p -m 755 vaclook         $RPM_BUILD_ROOT%{_bindir}/vaclook
install -D -p -m 444 vacation.man    $RPM_BUILD_ROOT%{_mandir}/man1/vacation.1
install -D -p -m 444 vaclook.man     $RPM_BUILD_ROOT%{_mandir}/man1/vaclook.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/vacation
%{_bindir}/vaclook
%{_mandir}/*/*
%doc COPYING README README.smrsh ChangeLog license-clarification

%changelog
* Wed Aug 05 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-7
- changed license to BSD as upstream told me
  (corresponding mail is included in doc).

* Mon Aug 03 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-6
- changed license to GPLv2 until licensing is clarified with upstream
- changed source URL to "downloads" instead of "download".
  (bz #474802)

* Mon Jul 06 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-5
- Fixes according comments from bz #474802

* Wed Jun 24 2009 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-4
- repackaged for Fedora 11.
- Fixed bugs from bz #474802

* Fri Dec 05 2008 Dr. Tilmann Bubeck <t.bubeck at reinform.de> - 1.2.7.0-1
- Upgraded to 1.2.7.0
- repackaged for Fedora 10.

* Tue Sep 03 2002 Pete O'Hara <pete at guardiandigital.com>
- Version 1.2.7.rc1, Release 1.2.1
  - Upgraded to 1.2.7.rc1

* Mon Aug 26 2002 Pete O'Hara <pete at guardiandigital.com>
- Version 1.2.6.1, Release 1.2.0
  - Initial release for Mail Suite

* Sun Nov 11 2001 Devon <devon at tuxfan.homeip.net>
- upgrade to version 1.2.7.rc1
* Sat Nov 10 2001 Devon <devon at tuxfan.homeip.net>
- upgrade to version 1.2.6
* Wed Sep 19 2001 Devon <devon at tuxfan.homeip.net>
- added %%post link /etc/smrsh to /usr/bin/vacation
- added %%postun deletion of /etc/smrsh/vacation
- defined a umask of 022 fix permissions on created files.
  $HOME/.forward was created group writable, smrsh refused
  to run in that case. See vacation-1.2.2-permissions.patch

* Mon Aug 07 2000 Than Ngo <than at redhat.de>
- fix specfile and patch file to rebuilt

* Mon Aug 07 2000 Michael Stefaniuc <mstefani at redhat.com>
- upgraded to 1.2.2
- fixed security fix

* Wed Aug 02 2000 Than Ngo <than at redhat.de>
- fix manpath (Bug #15070)

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Sun Jul 16 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- add security fix

* Mon Jul 10 2000 Than Ngo <than at redhat.de>
- fix problem (it won't include the .vacation.msg) (bug #13572)
- use RPM macros

* Mon Jul 03 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Sun May 28 2000 Ngo Than <than at redhat.de>
- rebuild for 7.0
- put man pages in correct place
- cleanup specfile
- fix Summary

* Fri Dec 10 1999 Ngo Than <than at redhat.de>
- initial RPM for powertools-6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:47:08 -0000	1.1
+++ .cvsignore	5 Aug 2009 22:00:22 -0000	1.2
@@ -0,0 +1 @@
+vacation-1.2.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vacation/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:47:08 -0000	1.1
+++ sources	5 Aug 2009 22:00:22 -0000	1.2
@@ -0,0 +1 @@
+cae9253eee4c2e68af01bc6b1f469cd2  vacation-1.2.7.0.tar.gz



From caolanm at fedoraproject.org  Wed Aug  5 22:07:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  5 Aug 2009 22:07:27 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.3, 1.4
Message-ID: <20090805220727.D943511C0347@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-serv16063/F-11

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
Log Message:
little fix

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |    1 +
 sc/source/filter/ftools/ftools.cxx                 |    1 +
 soltools/mkdepend/def.h                            |    2 +-
 soltools/mkdepend/main.c                           |    2 +-
 soltools/mkdepend/parse.c                          |    4 ++--
 sw/source/core/doc/docbm.cxx                       |    4 ++--
 sw/source/filter/ww8/WW8TableInfo.cxx              |    1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	12 Mar 2009 13:45:06 -0000	1.3
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	5 Aug 2009 22:07:27 -0000	1.4
@@ -86,3 +86,14 @@ Index: mkdepend/parse.c
  		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
  		case IF:
  		case IFFALSE:
+diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>



From caolanm at fedoraproject.org  Wed Aug  5 22:07:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  5 Aug 2009 22:07:28 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.3,
	1.4 openoffice.org.spec, 1.1976, 1.1977
Message-ID: <20090805220728.B547F11C0348@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16063/devel

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
	openoffice.org.spec 
Log Message:
little fix

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |    1 +
 sc/source/filter/ftools/ftools.cxx                 |    1 +
 soltools/mkdepend/def.h                            |    2 +-
 soltools/mkdepend/main.c                           |    2 +-
 soltools/mkdepend/parse.c                          |    4 ++--
 sw/source/core/doc/docbm.cxx                       |    4 ++--
 sw/source/filter/ww8/WW8TableInfo.cxx              |    1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	12 Mar 2009 13:45:06 -0000	1.3
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	5 Aug 2009 22:07:27 -0000	1.4
@@ -86,3 +86,14 @@ Index: mkdepend/parse.c
  		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
  		case IF:
  		case IFFALSE:
+diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -p -r1.1976 -r1.1977
--- openoffice.org.spec	29 Jul 2009 12:37:35 -0000	1.1976
+++ openoffice.org.spec	5 Aug 2009 22:07:27 -0000	1.1977
@@ -1712,8 +1712,8 @@ autoconf
  --with-system-headers --with-system-apache-commons \
  --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-writer2latex \
+ --without-myspell-dicts --without-system-mspack --without-fonts \
+ --without-gpc --without-agg --without-ppds --without-afms \
  %{stlflags} --with-lang="%{langpack_langs}" \
  --with-poor-help-localizations="$POORHELPS"
 



From mclasen at fedoraproject.org  Wed Aug  5 22:11:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 22:11:20 +0000 (UTC)
Subject: rpms/libgnome/devel libgnome-2.19.1-default-settings.patch, 1.1,
	1.2 libgnome.spec, 1.149, 1.150
Message-ID: <20090805221120.6FC4611C0347@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17381

Modified Files:
	libgnome-2.19.1-default-settings.patch libgnome.spec 
Log Message:
Default to Clearlooks GTK+ theme


libgnome-2.19.1-default-settings.patch:
 desktop_gnome_interface.schemas.in.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: libgnome-2.19.1-default-settings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome-2.19.1-default-settings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libgnome-2.19.1-default-settings.patch	12 Aug 2007 04:20:12 -0000	1.1
+++ libgnome-2.19.1-default-settings.patch	5 Aug 2009 22:11:20 -0000	1.2
@@ -10,15 +10,6 @@ diff -up libgnome-2.19.1/schemas/desktop
        <locale name="C">
          <short>Icon Theme</short>
          <long>Icon theme to use for the panel, nautilus etc.</long>
-@@ -141,7 +141,7 @@
-       <applyto>/desktop/gnome/interface/gtk_theme</applyto>
-       <owner>gnome</owner>
-       <type>string</type>
--      <default>Clearlooks</default>
-+      <default>Nodoka</default>
-       <locale name="C">
- 	<short>Gtk+ Theme</short>
- 	<long>Basename of the default theme used by gtk+.</long>
 @@ -265,7 +265,7 @@
        <applyto>/desktop/gnome/interface/show_input_method_menu</applyto>
        <owner>gnome</owner>


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- libgnome.spec	5 Aug 2009 02:28:41 -0000	1.149
+++ libgnome.spec	5 Aug 2009 22:11:20 -0000	1.150
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.26.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.26/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -203,6 +203,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Aug  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-8
+- Default to Clearlooks GTK+ theme
+
 * Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-7
 - Default to Constantine backgrounds
 



From rvinyard at fedoraproject.org  Wed Aug  5 22:21:07 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  5 Aug 2009 22:21:07 +0000 (UTC)
Subject: rpms/papyrus/devel .cvsignore, 1.18, 1.19 papyrus.spec, 1.27,
	1.28 sources, 1.18, 1.19
Message-ID: <20090805222107.5376811C0347@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19259

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 May 2009 18:34:38 -0000	1.18
+++ .cvsignore	5 Aug 2009 22:21:06 -0000	1.19
@@ -1 +1,2 @@
-papyrus-0.11.1.tar.bz2
+papyrus-0.12.0.tar.bz2
+papyrus-0.12.0-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- papyrus.spec	25 Jul 2009 23:14:27 -0000	1.27
+++ papyrus.spec	5 Aug 2009 22:21:06 -0000	1.28
@@ -1,11 +1,12 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.11.1
-Release:          3%{?dist}
+Version:          0.12.0
+Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://downloads.sourceforge.net/libpapyrus/papyrus-0.11.1.tar.bz2
+Source0:          http://downloads.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/libpapyrus/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10
 BuildRequires:    cairomm-devel >= 1.2
@@ -36,6 +37,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the Papyrus
@@ -45,7 +49,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/papyrus-0.11
+hierarchy and can be found at /usr/share/gtk-doc/html/papyrus-0.12
 
 %package          extras
 Summary:          Extra shapes for the papyrus scenegraph library
@@ -87,7 +91,7 @@ developing papyrus-gtkmm applications.
 
 
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-demos --enable-papyrus-gtkmm --enable-papyrus-extras --enable-static=no
@@ -95,14 +99,13 @@ developing papyrus-gtkmm applications.
 
 %install
 %{__rm} -rf %{buildroot}
-
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-# Fix documentation installation and put papyrus docs under gtk-doc
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/ doc/papyrus-0.11.devhelp
+# Put docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/ doc/papyrus-0.12.devhelp
 
 
 %clean
@@ -129,16 +132,16 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus.so
 %{_libdir}/pkgconfig/papyrus-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus.h
-%{_includedir}/papyrus-0.11/papyrus/
-%dir %{_includedir}/papyrus-0.11/
+%{_includedir}/papyrus-0.12/papyrus.h
+%{_includedir}/papyrus-0.12/papyrus/
+%dir %{_includedir}/papyrus-0.12/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.11.1/
+%{_datadir}/papyrus-0.12.0/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/papyrus-0.11/
+%doc %{_datadir}/gtk-doc/html/papyrus-0.12/
 
 %files extras
 %defattr(-,root,root,-)
@@ -149,8 +152,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus-extras.so
 %{_libdir}/pkgconfig/papyrus-extras-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus-extras.h
-%{_includedir}/papyrus-0.11/papyrus-extras/
+%{_includedir}/papyrus-0.12/papyrus-extras.h
+%{_includedir}/papyrus-0.12/papyrus-extras/
 %{_bindir}/papyrus-extras-demo
 %doc AUTHORS COPYING
 
@@ -163,18 +166,23 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus-gtkmm.so
 %{_libdir}/pkgconfig/papyrus-gtkmm-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus-gtkmm.h
-%{_includedir}/papyrus-0.11/papyrus-gtkmm/
+%{_includedir}/papyrus-0.12/papyrus-gtkmm.h
+%{_includedir}/papyrus-0.12/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.11.1/
+%{_datadir}/papyrus-gtkmm-0.12.0/
 %doc AUTHORS COPYING
 
 
 %changelog
+* Wed Aug  5 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.0-1
+- New release
+- Made doc subpackage noarch conditional
+- Added separate doc source
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue May 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.2-1
+* Tue May 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.1-2
 - Rebuild for cairomm-1.8
 
 * Thu May 14 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	14 May 2009 18:34:38 -0000	1.18
+++ sources	5 Aug 2009 22:21:07 -0000	1.19
@@ -1 +1,2 @@
-a16c6e4f0a3958bc566b4e632a84ea13  papyrus-0.11.1.tar.bz2
+3d222606d9831f36e690b8d2f68c1478  papyrus-0.12.0.tar.bz2
+fae4586278eb7434dc82f09ccab1d753  papyrus-0.12.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Aug  5 22:21:13 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  5 Aug 2009 22:21:13 +0000 (UTC)
Subject: rpms/papyrus/F-11 .cvsignore, 1.18, 1.19 papyrus.spec, 1.26,
	1.27 sources, 1.18, 1.19
Message-ID: <20090805222113.6F22A11C0347@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19305

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 May 2009 18:34:45 -0000	1.18
+++ .cvsignore	5 Aug 2009 22:21:13 -0000	1.19
@@ -1 +1,2 @@
-papyrus-0.11.1.tar.bz2
+papyrus-0.12.0.tar.bz2
+papyrus-0.12.0-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/papyrus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- papyrus.spec	26 May 2009 16:22:53 -0000	1.26
+++ papyrus.spec	5 Aug 2009 22:21:13 -0000	1.27
@@ -1,11 +1,12 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.11.1
-Release:          2%{?dist}
+Version:          0.12.0
+Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://downloads.sourceforge.net/libpapyrus/papyrus-0.11.1.tar.bz2
+Source0:          http://downloads.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/libpapyrus/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10
 BuildRequires:    cairomm-devel >= 1.2
@@ -36,6 +37,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the Papyrus
@@ -45,7 +49,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/papyrus-0.11
+hierarchy and can be found at /usr/share/gtk-doc/html/papyrus-0.12
 
 %package          extras
 Summary:          Extra shapes for the papyrus scenegraph library
@@ -87,7 +91,7 @@ developing papyrus-gtkmm applications.
 
 
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-demos --enable-papyrus-gtkmm --enable-papyrus-extras --enable-static=no
@@ -95,14 +99,13 @@ developing papyrus-gtkmm applications.
 
 %install
 %{__rm} -rf %{buildroot}
-
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-# Fix documentation installation and put papyrus docs under gtk-doc
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/ doc/papyrus-0.11.devhelp
+# Put docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/ doc/papyrus-0.12.devhelp
 
 
 %clean
@@ -129,16 +132,16 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus.so
 %{_libdir}/pkgconfig/papyrus-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus.h
-%{_includedir}/papyrus-0.11/papyrus/
-%dir %{_includedir}/papyrus-0.11/
+%{_includedir}/papyrus-0.12/papyrus.h
+%{_includedir}/papyrus-0.12/papyrus/
+%dir %{_includedir}/papyrus-0.12/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.11.1/
+%{_datadir}/papyrus-0.12.0/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/papyrus-0.11/
+%doc %{_datadir}/gtk-doc/html/papyrus-0.12/
 
 %files extras
 %defattr(-,root,root,-)
@@ -149,8 +152,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus-extras.so
 %{_libdir}/pkgconfig/papyrus-extras-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus-extras.h
-%{_includedir}/papyrus-0.11/papyrus-extras/
+%{_includedir}/papyrus-0.12/papyrus-extras.h
+%{_includedir}/papyrus-0.12/papyrus-extras/
 %{_bindir}/papyrus-extras-demo
 %doc AUTHORS COPYING
 
@@ -163,15 +166,23 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus-gtkmm.so
 %{_libdir}/pkgconfig/papyrus-gtkmm-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus-gtkmm.h
-%{_includedir}/papyrus-0.11/papyrus-gtkmm/
+%{_includedir}/papyrus-0.12/papyrus-gtkmm.h
+%{_includedir}/papyrus-0.12/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.11.1/
+%{_datadir}/papyrus-gtkmm-0.12.0/
 %doc AUTHORS COPYING
 
 
 %changelog
-* Tue May 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.2-1
+* Wed Aug  5 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.0-1
+- New release
+- Made doc subpackage noarch conditional
+- Added separate doc source
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.1-2
 - Rebuild for cairomm-1.8
 
 * Thu May 14 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	14 May 2009 18:34:45 -0000	1.18
+++ sources	5 Aug 2009 22:21:13 -0000	1.19
@@ -1 +1,2 @@
-a16c6e4f0a3958bc566b4e632a84ea13  papyrus-0.11.1.tar.bz2
+3d222606d9831f36e690b8d2f68c1478  papyrus-0.12.0.tar.bz2
+fae4586278eb7434dc82f09ccab1d753  papyrus-0.12.0-doc.tar.bz2



From rvinyard at fedoraproject.org  Wed Aug  5 22:21:20 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed,  5 Aug 2009 22:21:20 +0000 (UTC)
Subject: rpms/papyrus/F-10 .cvsignore, 1.18, 1.19 papyrus.spec, 1.29,
	1.30 sources, 1.18, 1.19
Message-ID: <20090805222120.767AE11C0416@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19337

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 May 2009 18:34:53 -0000	1.18
+++ .cvsignore	5 Aug 2009 22:21:20 -0000	1.19
@@ -1 +1,2 @@
-papyrus-0.11.1.tar.bz2
+papyrus-0.12.0.tar.bz2
+papyrus-0.12.0-doc.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- papyrus.spec	26 May 2009 16:22:47 -0000	1.29
+++ papyrus.spec	5 Aug 2009 22:21:20 -0000	1.30
@@ -1,11 +1,12 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.11.1
-Release:          2%{?dist}
+Version:          0.12.0
+Release:          1%{?dist}
 License:          LGPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://downloads.sourceforge.net/libpapyrus/papyrus-0.11.1.tar.bz2
+Source0:          http://downloads.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/libpapyrus/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10
 BuildRequires:    cairomm-devel >= 1.2
@@ -36,6 +37,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the Papyrus
@@ -45,7 +49,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/papyrus-0.11
+hierarchy and can be found at /usr/share/gtk-doc/html/papyrus-0.12
 
 %package          extras
 Summary:          Extra shapes for the papyrus scenegraph library
@@ -87,7 +91,7 @@ developing papyrus-gtkmm applications.
 
 
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-demos --enable-papyrus-gtkmm --enable-papyrus-extras --enable-static=no
@@ -95,14 +99,13 @@ developing papyrus-gtkmm applications.
 
 %install
 %{__rm} -rf %{buildroot}
-
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-# Fix documentation installation and put papyrus docs under gtk-doc
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.11/ doc/papyrus-0.11.devhelp
+# Put docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-0.12/ doc/papyrus-0.12.devhelp
 
 
 %clean
@@ -129,16 +132,16 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus.so
 %{_libdir}/pkgconfig/papyrus-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus.h
-%{_includedir}/papyrus-0.11/papyrus/
-%dir %{_includedir}/papyrus-0.11/
+%{_includedir}/papyrus-0.12/papyrus.h
+%{_includedir}/papyrus-0.12/papyrus/
+%dir %{_includedir}/papyrus-0.12/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.11.1/
+%{_datadir}/papyrus-0.12.0/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/papyrus-0.11/
+%doc %{_datadir}/gtk-doc/html/papyrus-0.12/
 
 %files extras
 %defattr(-,root,root,-)
@@ -149,8 +152,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus-extras.so
 %{_libdir}/pkgconfig/papyrus-extras-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus-extras.h
-%{_includedir}/papyrus-0.11/papyrus-extras/
+%{_includedir}/papyrus-0.12/papyrus-extras.h
+%{_includedir}/papyrus-0.12/papyrus-extras/
 %{_bindir}/papyrus-extras-demo
 %doc AUTHORS COPYING
 
@@ -163,15 +166,23 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libpapyrus-gtkmm.so
 %{_libdir}/pkgconfig/papyrus-gtkmm-1.0.pc
-%{_includedir}/papyrus-0.11/papyrus-gtkmm.h
-%{_includedir}/papyrus-0.11/papyrus-gtkmm/
+%{_includedir}/papyrus-0.12/papyrus-gtkmm.h
+%{_includedir}/papyrus-0.12/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.11.1/
+%{_datadir}/papyrus-gtkmm-0.12.0/
 %doc AUTHORS COPYING
 
 
 %changelog
-* Tue May 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.2-1
+* Wed Aug  5 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.12.0-1
+- New release
+- Made doc subpackage noarch conditional
+- Added separate doc source
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 26 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.1-2
 - Rebuild for cairomm-1.8
 
 * Thu May 14 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.11.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	14 May 2009 18:34:53 -0000	1.18
+++ sources	5 Aug 2009 22:21:20 -0000	1.19
@@ -1 +1,2 @@
-a16c6e4f0a3958bc566b4e632a84ea13  papyrus-0.11.1.tar.bz2
+3d222606d9831f36e690b8d2f68c1478  papyrus-0.12.0.tar.bz2
+fae4586278eb7434dc82f09ccab1d753  papyrus-0.12.0-doc.tar.bz2



From mclasen at fedoraproject.org  Wed Aug  5 22:26:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 22:26:17 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.194,1.195
Message-ID: <20090805222617.74FB711C0347@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20423

Modified Files:
	metacity.spec 
Log Message:
Change default theme to Clearlooks



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- metacity.spec	25 Jul 2009 12:05:50 -0000	1.194
+++ metacity.spec	5 Aug 2009 22:26:17 -0000	1.195
@@ -1,10 +1,9 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
-Patch0: default-theme.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=135056
@@ -70,11 +69,13 @@ API. This package exists purely for tech
 
 %prep
 %setup -q
-%patch0 -p1 -b .default-theme
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
 %patch6 -p1 -b .no-lame-dialog
 
+# force regeneration
+rm src/metacity.schemas
+
 autoreconf -i -f
 
 %build
@@ -178,6 +179,12 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Aug  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.0-4
+- Change the default theme to Clearlooks
+
+* Thu Jul  2 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.0-3
+- Shrink GConf schemas
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dcantrel at fedoraproject.org  Wed Aug  5 22:33:29 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  5 Aug 2009 22:33:29 +0000 (UTC)
Subject: rpms/dhcp/F-10 dhcp-4.0.0-CVE-2009-0692.patch, NONE,
	1.1 dhcp-4.0.0-CVE-2009-1892.patch, NONE, 1.1 dhcp.spec, 1.233, 1.234
Message-ID: <20090805223329.94EBB11C0347@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21847

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.0.0-CVE-2009-0692.patch dhcp-4.0.0-CVE-2009-1892.patch 
Log Message:
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-37
- Fix for CVE-2009-0692
- Fix for CVE-2009-1892 (#511834)


dhcp-4.0.0-CVE-2009-0692.patch:
 dhclient.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-4.0.0-CVE-2009-0692.patch ---
diff -up dhcp-4.0.0/client/dhclient.c.CVE-2009-0692 dhcp-4.0.0/client/dhclient.c
--- dhcp-4.0.0/client/dhclient.c.CVE-2009-0692	2007-11-30 11:51:42.000000000 -1000
+++ dhcp-4.0.0/client/dhclient.c	2009-08-05 12:10:19.000000000 -1000
@@ -2813,8 +2813,15 @@ void script_write_params (client, prefix
 		if (data.len > 3) {
 			struct iaddr netmask, subnet, broadcast;
 
-			memcpy (netmask.iabuf, data.data, data.len);
-			netmask.len = data.len;
+			/*
+			 * No matter the length of the subnet-mask option,
+			 * use only the first four octets.  Note that
+			 * subnet-mask options longer than 4 octets are not
+			 * in conformance with RFC 2132, but servers with this
+			 * flaw do exist.
+			 */
+			memcpy(netmask.iabuf, data.data, 4);
+			netmask.len = 4;
 			data_string_forget (&data, MDL);
 
 			subnet = subnet_number (lease -> address, netmask);

dhcp-4.0.0-CVE-2009-1892.patch:
 dhcp.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE dhcp-4.0.0-CVE-2009-1892.patch ---
diff -up dhcp-4.0.0/server/dhcp.c.CVE-2009-1892 dhcp-4.0.0/server/dhcp.c
--- dhcp-4.0.0/server/dhcp.c.CVE-2009-1892	2007-11-02 12:09:02.000000000 -1000
+++ dhcp-4.0.0/server/dhcp.c	2009-08-05 12:11:26.000000000 -1000
@@ -1725,6 +1725,8 @@ void ack_lease (packet, lease, offer, wh
 				host_reference (&host, h, MDL);
 		}
 		if (!host) {
+			if (hp)
+				host_dereference (&hp, MDL);
 			find_hosts_by_haddr (&hp,
 					     packet -> raw -> htype,
 					     packet -> raw -> chaddr,


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-10/dhcp.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- dhcp.spec	27 Jun 2009 02:34:43 -0000	1.233
+++ dhcp.spec	5 Aug 2009 22:33:29 -0000	1.234
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  36%{?dist}
+Release:  37%{?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.
@@ -49,6 +49,8 @@ Patch19:  %{name}-4.0.0-inherit-leases.p
 Patch20:  %{name}-4.0.0-garbage-chars.patch
 Patch21:  %{name}-4.0.0-port-validation.patch
 Patch22:  %{name}-4.0.0-invalid-dhclient-conf.patch
+Patch23:  %{name}-4.0.0-CVE-2009-0692.patch
+Patch24:  %{name}-4.0.0-CVE-2009-1892.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -212,6 +214,14 @@ client library.
 # The sample dhclient.conf should say 'supersede domain-search' (#467955)
 %patch22 -p1
 
+# Fix for CVE-2009-0692 (patch from Mandriva SRPM)
+# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0692
+%patch23 -p1
+
+# Fix for CVE-2009-1892 (patch from Mandriva SRPM)
+# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
+%patch24 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0644 %{SOURCE5} .
 %{__install} -p -m 0644 %{SOURCE6} doc/
@@ -449,6 +459,10 @@ fi
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-37
+- Fix for CVE-2009-0692
+- Fix for CVE-2009-1892 (#511834)
+
 * Fri Jun 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-36
 - Fix SELinux denials in dhclient-script when the script makes backup
   configuration files and restores them later (#483747)



From mclasen at fedoraproject.org  Wed Aug  5 22:33:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 22:33:28 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.195,1.196
Message-ID: <20090805223328.6D97111C0347@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21757

Modified Files:
	metacity.spec 
Log Message:
fix spec



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- metacity.spec	5 Aug 2009 22:26:17 -0000	1.195
+++ metacity.spec	5 Aug 2009 22:33:26 -0000	1.196
@@ -182,9 +182,6 @@ fi
 * Wed Aug  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.0-4
 - Change the default theme to Clearlooks
 
-* Thu Jul  2 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.0-3
-- Shrink GConf schemas
-
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Wed Aug  5 22:41:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  5 Aug 2009 22:41:53 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel defaults.patch, NONE,
	1.1 fedora-gnome-theme.spec, 1.11, 1.12
Message-ID: <20090805224153.3798211C0347@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24204

Modified Files:
	fedora-gnome-theme.spec 
Added Files:
	defaults.patch 
Log Message:
Match defaults changes


defaults.patch:
 index.theme.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE defaults.patch ---
diff -up fedora-gnome-theme-8.0.0/theme/index.theme.in.clearlooks fedora-gnome-theme-8.0.0/theme/index.theme.in
--- fedora-gnome-theme-8.0.0/theme/index.theme.in.clearlooks	2009-08-05 18:37:55.370795569 -0400
+++ fedora-gnome-theme-8.0.0/theme/index.theme.in	2009-08-05 18:35:56.716521654 -0400
@@ -3,6 +3,7 @@ _Name=Fedora
 _Comment=Fedora default theme
 Type=X-GNOME-Metatheme
 Encoding=UTF-8
-GtkTheme=Nodoka
-MetacityTheme=Nodoka
+GtkTheme=Clearlooks
+MetacityTheme=Clearlooks
 IconTheme=Fedora
+NotificationTheme=nodoka


Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fedora-gnome-theme.spec	24 Jul 2009 22:35:41 -0000	1.11
+++ fedora-gnome-theme.spec	5 Aug 2009 22:41:52 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
 Version: 8.0.0
-Release: 9%{?dist} 
+Release: 10%{?dist}
 BuildArch: noarch
 # No version given, no license attribution.
 License: GPL+
@@ -9,7 +9,9 @@ Group: User Interface/Desktops
 # There is no official upstream yet
 Source0: %{name}-%{version}.tar.bz2
 URL: http://www.redhat.com
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: defaults.patch
 
 Requires: nodoka-metacity-theme
 Requires: gtk-nodoka-engine
@@ -26,11 +28,11 @@ Obsoletes: redhat-artwork
 This package contains the Fedora GNOME meta theme.
 
 %prep
-%setup -q 
-echo 'NotificationTheme=nodoka' >> theme/index.theme.in
+%setup -q
+%patch0 -p1 -b .defaults
 
 %build
-%configure 
+%configure
 make
 
 %install
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Wed Aug  5 2009 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-10
+- Match default changes in GConf schemas
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:12 +0000
Subject: [pkgdb] mausezahn was added for bonii
Message-ID: <20090805224312.BFDCD10F899@bastion2.fedora.phx.redhat.com>

tibbs has added Package mausezahn with summary A fast versatile packet generator
tibbs has approved Package mausezahn
tibbs has added a Fedora devel branch for mausezahn with an owner of bonii
tibbs has approved mausezahn in Fedora devel
tibbs has approved Package mausezahn
tibbs has set commit to Approved for 107427 on mausezahn (Fedora devel)
tibbs has set checkout to Approved for 107427 on mausezahn (Fedora devel)
tibbs has set build to Approved for 107427 on mausezahn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mausezahn



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:13 +0000
Subject: [pkgdb] mausezahn summary updated by tibbs
Message-ID: <20090805224313.69CCB10F8A1@bastion2.fedora.phx.redhat.com>

tibbs set package mausezahn summary to A fast versatile packet generator

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mausezahn



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:13 +0000
Subject: [pkgdb] mausezahn (Fedora, 11) updated by tibbs
Message-ID: <20090805224313.AD94510F8AC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for mausezahn
tibbs has set commit to Approved for 107427 on mausezahn (Fedora 11)
tibbs has set checkout to Approved for 107427 on mausezahn (Fedora 11)
tibbs has set build to Approved for 107427 on mausezahn (Fedora 11)
tibbs approved watchbugzilla on mausezahn (Fedora 11) for bonii
tibbs approved watchcommits on mausezahn (Fedora 11) for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mausezahn



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:13 +0000
Subject: [pkgdb] mausezahn (Fedora, 11) updated by tibbs
Message-ID: <20090805224314.1F73410F8B2@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on mausezahn (Fedora devel) for bonii
tibbs approved watchcommits on mausezahn (Fedora devel) for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mausezahn



From tibbs at fedoraproject.org  Wed Aug  5 22:43:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:43:20 +0000 (UTC)
Subject: rpms/mausezahn - New directory
Message-ID: <20090805224320.29BD911C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mausezahn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsI24606/rpms/mausezahn

Log Message:
Directory /cvs/pkgs/rpms/mausezahn added to the repository




From pkgdb at fedoraproject.org  Wed Aug  5 22:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:13 +0000
Subject: [pkgdb] mausezahn (Fedora, 11) updated by tibbs
Message-ID: <20090805224314.5875E10F8B6@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for mausezahn
tibbs has set commit to Approved for 107427 on mausezahn (Fedora 10)
tibbs has set checkout to Approved for 107427 on mausezahn (Fedora 10)
tibbs has set build to Approved for 107427 on mausezahn (Fedora 10)
tibbs approved watchbugzilla on mausezahn (Fedora 10) for bonii
tibbs approved watchcommits on mausezahn (Fedora 10) for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mausezahn



From tibbs at fedoraproject.org  Wed Aug  5 22:43:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:43:20 +0000 (UTC)
Subject: rpms/mausezahn/devel - New directory
Message-ID: <20090805224320.4F6D811C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mausezahn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsI24606/rpms/mausezahn/devel

Log Message:
Directory /cvs/pkgs/rpms/mausezahn/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 22:43:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:43:26 +0000 (UTC)
Subject: rpms/mausezahn Makefile,NONE,1.1
Message-ID: <20090805224326.3AE1611C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mausezahn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsI24606/rpms/mausezahn

Added Files:
	Makefile 
Log Message:
Setup of module mausezahn


--- NEW FILE Makefile ---
# Top level Makefile for module mausezahn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 22:43:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:43:26 +0000 (UTC)
Subject: rpms/mausezahn/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090805224326.8218011C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mausezahn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsI24606/rpms/mausezahn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mausezahn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mausezahn
# $Id: Makefile,v 1.1 2009/08/05 22:43:26 tibbs Exp $
NAME := mausezahn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:51 +0000
Subject: [pkgdb] offtrac was added for jkeating
Message-ID: <20090805224351.EFF9410F8AF@bastion2.fedora.phx.redhat.com>

tibbs has added Package offtrac with summary Trac xmlrpc library
tibbs has approved Package offtrac
tibbs has added a Fedora devel branch for offtrac with an owner of jkeating
tibbs has approved offtrac in Fedora devel
tibbs has approved Package offtrac
tibbs has set commit to Approved for 107427 on offtrac (Fedora devel)
tibbs has set checkout to Approved for 107427 on offtrac (Fedora devel)
tibbs has set build to Approved for 107427 on offtrac (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:52 +0000
Subject: [pkgdb] offtrac summary updated by tibbs
Message-ID: <20090805224352.E6ABD10F8C2@bastion2.fedora.phx.redhat.com>

tibbs set package offtrac summary to Trac xmlrpc library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:43:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:43:52 +0000
Subject: [pkgdb] offtrac (Fedora, 11) updated by tibbs
Message-ID: <20090805224353.3A24F10F8C5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for offtrac
tibbs has set commit to Approved for 107427 on offtrac (Fedora 11)
tibbs has set checkout to Approved for 107427 on offtrac (Fedora 11)
tibbs has set build to Approved for 107427 on offtrac (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From tibbs at fedoraproject.org  Wed Aug  5 22:43:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:43:59 +0000 (UTC)
Subject: rpms/offtrac - New directory
Message-ID: <20090805224359.149D611C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/offtrac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsj24920/rpms/offtrac

Log Message:
Directory /cvs/pkgs/rpms/offtrac added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 22:43:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:43:59 +0000 (UTC)
Subject: rpms/offtrac/devel - New directory
Message-ID: <20090805224359.3FCCC11C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/offtrac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsj24920/rpms/offtrac/devel

Log Message:
Directory /cvs/pkgs/rpms/offtrac/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 22:44:05 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:44:05 +0000 (UTC)
Subject: rpms/offtrac Makefile,NONE,1.1
Message-ID: <20090805224405.B696D11C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/offtrac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsj24920/rpms/offtrac

Added Files:
	Makefile 
Log Message:
Setup of module offtrac


--- NEW FILE Makefile ---
# Top level Makefile for module offtrac
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug  5 22:44:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:44:06 +0000 (UTC)
Subject: rpms/offtrac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090805224406.2E09D11C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/offtrac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsj24920/rpms/offtrac/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module offtrac


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: offtrac
# $Id: Makefile,v 1.1 2009/08/05 22:44:06 tibbs Exp $
NAME := offtrac
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug  5 22:49:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:49:33 +0000
Subject: [pkgdb] offtrac ownership updated
Message-ID: <20090805224933.4DC4810F88F@bastion2.fedora.phx.redhat.com>

Package offtrac in Fedora 11 was orphaned by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:49:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:49:33 +0000
Subject: [pkgdb] offtrac (un)retirement
Message-ID: <20090805224933.7102010F899@bastion2.fedora.phx.redhat.com>

Package offtrac in Fedora 11 has been retired by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:49:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:49:34 +0000
Subject: [pkgdb] offtrac ownership updated
Message-ID: <20090805224934.E675C10F8A0@bastion2.fedora.phx.redhat.com>

Package offtrac in Fedora devel was orphaned by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:49:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:49:34 +0000
Subject: [pkgdb] offtrac (un)retirement
Message-ID: <20090805224935.16D2510F8A2@bastion2.fedora.phx.redhat.com>

Package offtrac in Fedora devel has been retired by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:55:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:55:02 +0000
Subject: [pkgdb] python-offtrac was added for jkeating
Message-ID: <20090805225502.CFEA610F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-offtrac with summary Trac xmlrpc library
tibbs has approved Package python-offtrac
tibbs has added a Fedora devel branch for python-offtrac with an owner of jkeating
tibbs has approved python-offtrac in Fedora devel
tibbs has approved Package python-offtrac
tibbs has set commit to Approved for 107427 on python-offtrac (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-offtrac (Fedora devel)
tibbs has set build to Approved for 107427 on python-offtrac (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-offtrac



From pkgdb at fedoraproject.org  Wed Aug  5 22:55:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:55:03 +0000
Subject: [pkgdb] python-offtrac summary updated by tibbs
Message-ID: <20090805225504.02DCA10F8A0@bastion2.fedora.phx.redhat.com>

tibbs set package python-offtrac summary to Trac xmlrpc library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-offtrac



From tibbs at fedoraproject.org  Wed Aug  5 22:55:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:55:10 +0000 (UTC)
Subject: rpms/python-offtrac/devel - New directory
Message-ID: <20090805225510.644F611C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-offtrac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR26731/rpms/python-offtrac/devel

Log Message:
Directory /cvs/pkgs/rpms/python-offtrac/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 22:55:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:55:10 +0000 (UTC)
Subject: rpms/python-offtrac - New directory
Message-ID: <20090805225510.3EC5B11C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-offtrac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR26731/rpms/python-offtrac

Log Message:
Directory /cvs/pkgs/rpms/python-offtrac added to the repository




From tibbs at fedoraproject.org  Wed Aug  5 22:55:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:55:16 +0000 (UTC)
Subject: rpms/python-offtrac Makefile,NONE,1.1
Message-ID: <20090805225516.92CED11C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-offtrac
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR26731/rpms/python-offtrac

Added Files:
	Makefile 
Log Message:
Setup of module python-offtrac


--- NEW FILE Makefile ---
# Top level Makefile for module python-offtrac
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug  5 22:55:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 05 Aug 2009 22:55:03 +0000
Subject: [pkgdb] python-offtrac (Fedora, 11) updated by tibbs
Message-ID: <20090805225504.426D710F8A9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for python-offtrac
tibbs has set commit to Approved for 107427 on python-offtrac (Fedora 11)
tibbs has set checkout to Approved for 107427 on python-offtrac (Fedora 11)
tibbs has set build to Approved for 107427 on python-offtrac (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-offtrac



From tibbs at fedoraproject.org  Wed Aug  5 22:55:17 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed,  5 Aug 2009 22:55:17 +0000 (UTC)
Subject: rpms/python-offtrac/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090805225517.1323311C0347@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-offtrac/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR26731/rpms/python-offtrac/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-offtrac


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-offtrac
# $Id: Makefile,v 1.1 2009/08/05 22:55:16 tibbs Exp $
NAME := python-offtrac
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Aug  5 22:56:36 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  5 Aug 2009 22:56:36 +0000 (UTC)
Subject: rpms/libX11/devel .cvsignore, 1.16, 1.17 commitid, 1.1,
	1.2 libX11.spec, 1.64, 1.65 sources, 1.15, 1.16
Message-ID: <20090805225636.742F911C0347@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27074

Modified Files:
	.cvsignore commitid libX11.spec sources 
Log Message:
* Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-4.20090805
- Today's git snapshot
- minor soname bump to 6.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Jul 2009 07:11:34 -0000	1.16
+++ .cvsignore	5 Aug 2009 22:56:35 -0000	1.17
@@ -1 +1 @@
-libX11-20090712.tar.bz2
+libX11-20090805.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/commitid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- commitid	12 Jul 2009 07:11:35 -0000	1.1
+++ commitid	5 Aug 2009 22:56:36 -0000	1.2
@@ -1 +1 @@
-554f755e5545f63d3c8f299297927238da155773
+9da7e230d5320e1556ad2084fcd06ee7994385ea


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- libX11.spec	25 Jul 2009 05:09:10 -0000	1.64
+++ libX11.spec	5 Aug 2009 22:56:36 -0000	1.65
@@ -1,10 +1,10 @@
 %define tarball libX11
-%define gitdate 20090712
+%define gitdate 20090805
 
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.2.99
-Release: 3.%{gitdate}%{?dist}
+Release: 4.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libX11.so.6
-%{_libdir}/libX11.so.6.2.0
+%{_libdir}/libX11.so.6.3.0
 %{_libdir}/libX11-xcb.so.1
 %{_libdir}/libX11-xcb.so.1.0.0
 
@@ -116,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-4.20090805
+- Today's git snapshot
+- minor soname bump to 6.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.99-3.20090712
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Jul 2009 07:11:35 -0000	1.15
+++ sources	5 Aug 2009 22:56:36 -0000	1.16
@@ -1 +1 @@
-59e23f040427385c116f03ece2bdf880  libX11-20090712.tar.bz2
+f45b5af929e4366a3f1466e390add673  libX11-20090805.tar.bz2



From myoung at fedoraproject.org  Wed Aug  5 23:00:24 2009
From: myoung at fedoraproject.org (myoung)
Date: Wed,  5 Aug 2009 23:00:24 +0000 (UTC)
Subject: rpms/kernel/devel
	alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch,
	NONE, 1.1.2.2 drm-intel-next.patch, 1.4.6.3,
	1.4.6.4 drm-intel-pm.patch, NONE, 1.4.2.2 drm-page-flip.patch,
	NONE, 1.2.6.2 drm-r600-kms.patch, NONE,
	1.1.2.2 drm-vga-arb.patch, NONE,
	1.5.2.2 hid-ignore-all-recent-imon-devices.patch, NONE,
	1.1.2.2 linux-2.6-alsa-improve-hda-powerdown.patch, NONE,
	1.1.6.2 linux-2.6-bluetooth-autosuspend.diff, NONE,
	1.1.6.2 linux-2.6-defaults-aspm.patch, NONE,
	1.1.6.2 linux-2.6-dell-laptop-rfkill-fix.patch, NONE,
	1.1.6.2 linux-2.6-driver-level-usb-autosuspend.diff, NONE,
	1.1.6.2 linux-2.6-fix-usb-serial-autosuspend.diff, NONE,
	1.2.6.2 linux-2.6-ksm-kvm.patch, NONE,
	1.2.6.2 linux-2.6-ksm.patch, NONE,
	1.2.6.2 linux-2.6-ppc-perfctr-oops-fix.patch, NONE,
	1.2.2.2 linux-2.6-qcserial-autosuspend.diff, NONE,
	1.1.6.2 linux-2.6-usb-uvc-autosuspend.diff, NONE,
	1.1.6.2 linux-2.6-vga-arb.patch, NONE,
	1.6.2.2 linux-2.6.30-hush-rom-warning.patch, NONE,
	1.2.2.2 linux-2.6.30-no-pcspkr-modalias.patch, NONE,
	1.1.6.2 patch-2.6.31-rc5-git3.bz2.sign, NONE,
	1.1.2.2 patch-2.6.31-rc5.bz2.sign, NONE,
	1.1.6.2 revert-ftrace-powerpc-snafu.patch, NONE,
	1.1.2.2 .cvsignore, 1.1014.2.21, 1.1014.2.22 Makefile.config,
	1.70, 1.70.6.1 TODO, 1.54.6.8, 1.54.6.9 config-debug, 1.23.6.3,
	1.23.6.4 config-generic, 1.238.6.31, 1.238.6.32 config-i686-PAE,
	1.1.18.1, 1.1.18.2 config-nodebug, 1.31.6.4,
	1.31.6.5 config-powerpc-generic, 1.33.6.8,
	1.33.6.9 config-powerpc32-generic, 1.30.6.2,
	1.30.6.3 config-powerpc64, 1.27.6.3, 1.27.6.4 config-s390x,
	1.11.6.3, 1.11.6.4 config-x86-generic, 1.68.6.14,
	1.68.6.15 config-x86_64-generic, 1.68.2.13,
	1.68.2.14 drm-nouveau.patch, 1.8.6.13, 1.8.6.14 kernel.spec,
	1.1294.2.43, 1.1294.2.44 linux-2.6-pci-cacheline-sizing.patch,
	1.1.2.2, 1.1.2.3 linux-2.6.31-lirc.patch, 1.2.2.2,
	1.2.2.3 sources, 1.976.2.22, 1.976.2.23 upstream, 1.888.2.21,
	1.888.2.22 config-i586, 1.6, NONE drm-modesetting-radeon.patch,
	1.54.6.9, NONE drm-next.patch, 1.6.6.7,
	NONE linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch, 1.1.2.2,
	NONE patch-2.6.31-rc3.bz2.sign, 1.1.2.2, NONE
Message-ID: <20090805230024.D6EAD11C0439@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27452

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore Makefile.config TODO config-debug config-generic 
	config-i686-PAE config-nodebug config-powerpc-generic 
	config-powerpc32-generic config-powerpc64 config-s390x 
	config-x86-generic config-x86_64-generic drm-nouveau.patch 
	kernel.spec linux-2.6-pci-cacheline-sizing.patch 
	linux-2.6.31-lirc.patch sources upstream 
Added Files:
      Tag: private-myoung-dom0-branch
	alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch 
	drm-intel-next.patch drm-intel-pm.patch drm-page-flip.patch 
	drm-r600-kms.patch drm-vga-arb.patch 
	hid-ignore-all-recent-imon-devices.patch 
	linux-2.6-alsa-improve-hda-powerdown.patch 
	linux-2.6-bluetooth-autosuspend.diff 
	linux-2.6-defaults-aspm.patch 
	linux-2.6-dell-laptop-rfkill-fix.patch 
	linux-2.6-driver-level-usb-autosuspend.diff 
	linux-2.6-fix-usb-serial-autosuspend.diff 
	linux-2.6-ksm-kvm.patch linux-2.6-ksm.patch 
	linux-2.6-ppc-perfctr-oops-fix.patch 
	linux-2.6-qcserial-autosuspend.diff 
	linux-2.6-usb-uvc-autosuspend.diff linux-2.6-vga-arb.patch 
	linux-2.6.30-hush-rom-warning.patch 
	linux-2.6.30-no-pcspkr-modalias.patch 
	patch-2.6.31-rc5-git3.bz2.sign patch-2.6.31-rc5.bz2.sign 
	revert-ftrace-powerpc-snafu.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	config-i586 drm-modesetting-radeon.patch drm-next.patch 
	linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch 
	patch-2.6.31-rc3.bz2.sign 
Log Message:
update pvops to current rawhide


alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch:
 pcm_native.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch ---
>From 7402d155b5ba6551241cdde9724c2c49dd6cc7ea Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun, 2 Aug 2009 17:41:28 +0200
Subject: [PATCH] Tell user that stream to be rewound is suspended

Return STRPIPE instead of EBADF when userspace attempts to rewind
of forward a stream that was suspended in meanwhile, so that it
can be recovered by snd_pcm_recover().

This was causing Pulseaudio to unload the ALSA sink module under a race
condition when it attempted to rewind the stream right after resume from
suspend, before writing to the stream which would cause it to revive the
stream otherwise. Tested to work with Pulseaudio patched to attempt to
snd_pcm_recover() upon receiving an error from snd_pcm_rewind().

Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 sound/core/pcm_native.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index ac2150e..d89c816 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2208,6 +2208,9 @@ static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *subst
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
@@ -2253,6 +2256,9 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
@@ -2299,6 +2305,9 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
@@ -2345,6 +2354,9 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst
 	case SNDRV_PCM_STATE_XRUN:
 		ret = -EPIPE;
 		goto __end;
+	case SNDRV_PCM_STATE_SUSPENDED:
+		ret = -ESTRPIPE;
+		goto __end;
 	default:
 		ret = -EBADFD;
 		goto __end;
-- 
1.6.2.5


drm-intel-next.patch:
 i915_drv.h         |    3 
 i915_gem_debugfs.c |    2 
 i915_irq.c         |  232 +++++++++++-----
 i915_reg.h         |   45 +++
 intel_bios.c       |   40 ++
 intel_bios.h       |   45 +++
 intel_crt.c        |   12 
 intel_display.c    |  759 +++++++++++++++++++++++++++++++++++------------------
 intel_dp.c         |  216 +++++++++++++--
 intel_drv.h        |    3 
 intel_hdmi.c       |   64 ----
 intel_lvds.c       |   12 
 intel_sdvo.c       |  254 ++++++++++++-----
 intel_tv.c         |   22 +
 14 files changed, 1202 insertions(+), 507 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.4.6.3 -r 1.4.6.4 drm-intel-next.patchIndex: drm-intel-next.patch
===================================================================
RCS file: drm-intel-next.patch
diff -N drm-intel-next.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-next.patch	5 Aug 2009 23:00:10 -0000	1.4.6.4
@@ -0,0 +1,2555 @@
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index d087528..5f3a259 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -219,6 +219,7 @@ typedef struct drm_i915_private {
+ 	unsigned int lvds_vbt:1;
+ 	unsigned int int_crt_support:1;
+ 	unsigned int lvds_use_ssc:1;
++	unsigned int edp_support:1;
+ 	int lvds_ssc_freq;
+ 
+ 	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
+@@ -229,6 +230,7 @@ typedef struct drm_i915_private {
+ 
+ 	spinlock_t error_lock;
+ 	struct drm_i915_error_state *first_error;
++	struct work_struct error_work;
+ 
+ 	/* Register state */
+ 	u8 saveLBB;
+@@ -888,6 +890,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+ 						      IS_I915GM(dev)))
+ #define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
+ #define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
++#define SUPPORTS_EDP(dev)		(IS_IGDNG_M(dev))
+ #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev))
+ /* dsparb controlled by hw only */
+ #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
+diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
+index 9a44bfc..cb3b974 100644
+--- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
++++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
+@@ -343,6 +343,8 @@ static int i915_error_state(struct seq_file *m, void *unused)
+ 
+ 	error = dev_priv->first_error;
+ 
++	seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
++		   error->time.tv_usec);
+ 	seq_printf(m, "EIR: 0x%08x\n", error->eir);
+ 	seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
+ 	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
+diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
+index 7ba23a6..f340b3f 100644
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -290,6 +290,35 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
+ 	return ret;
+ }
+ 
++/**
++ * i915_error_work_func - do process context error handling work
++ * @work: work struct
++ *
++ * Fire an error uevent so userspace can see that a hang or error
++ * was detected.
++ */
++static void i915_error_work_func(struct work_struct *work)
++{
++	drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
++						    error_work);
++	struct drm_device *dev = dev_priv->dev;
++	char *event_string = "ERROR=1";
++	char *envp[] = { event_string, NULL };
++
++	DRM_DEBUG("generating error event\n");
++
++	kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, envp);
++}
++
++/**
++ * i915_capture_error_state - capture an error record for later analysis
++ * @dev: drm device
++ *
++ * Should be called when an error is detected (either a hang or an error
++ * interrupt) to capture error state from the time of the error.  Fills
++ * out a structure which becomes available in debugfs for user level tools
++ * to pick up.
++ */
+ static void i915_capture_error_state(struct drm_device *dev)
+ {
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
+@@ -325,12 +354,137 @@ static void i915_capture_error_state(struct drm_device *dev)
+ 		error->acthd = I915_READ(ACTHD_I965);
+ 	}
+ 
++	do_gettimeofday(&error->time);
++
+ 	dev_priv->first_error = error;
+ 
+ out:
+ 	spin_unlock_irqrestore(&dev_priv->error_lock, flags);
+ }
+ 
++/**
++ * i915_handle_error - handle an error interrupt
++ * @dev: drm device
++ *
++ * Do some basic checking of regsiter state at error interrupt time and
++ * dump it to the syslog.  Also call i915_capture_error_state() to make
++ * sure we get a record and make it available in debugfs.  Fire a uevent
++ * so userspace knows something bad happened (should trigger collection
++ * of a ring dump etc.).
++ */
++static void i915_handle_error(struct drm_device *dev)
++{
++	struct drm_i915_private *dev_priv = dev->dev_private;
++	u32 eir = I915_READ(EIR);
++	u32 pipea_stats = I915_READ(PIPEASTAT);
++	u32 pipeb_stats = I915_READ(PIPEBSTAT);
++
++	i915_capture_error_state(dev);
++
++	printk(KERN_ERR "render error detected, EIR: 0x%08x\n",
++	       eir);
++
++	if (IS_G4X(dev)) {
++		if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
++			u32 ipeir = I915_READ(IPEIR_I965);
++
++			printk(KERN_ERR "  IPEIR: 0x%08x\n",
++			       I915_READ(IPEIR_I965));
++			printk(KERN_ERR "  IPEHR: 0x%08x\n",
++			       I915_READ(IPEHR_I965));
++			printk(KERN_ERR "  INSTDONE: 0x%08x\n",
++			       I915_READ(INSTDONE_I965));
++			printk(KERN_ERR "  INSTPS: 0x%08x\n",
++			       I915_READ(INSTPS));
++			printk(KERN_ERR "  INSTDONE1: 0x%08x\n",
++			       I915_READ(INSTDONE1));
++			printk(KERN_ERR "  ACTHD: 0x%08x\n",
++			       I915_READ(ACTHD_I965));
++			I915_WRITE(IPEIR_I965, ipeir);
++			(void)I915_READ(IPEIR_I965);
++		}
++		if (eir & GM45_ERROR_PAGE_TABLE) {
++			u32 pgtbl_err = I915_READ(PGTBL_ER);
++			printk(KERN_ERR "page table error\n");
++			printk(KERN_ERR "  PGTBL_ER: 0x%08x\n",
++			       pgtbl_err);
++			I915_WRITE(PGTBL_ER, pgtbl_err);
++			(void)I915_READ(PGTBL_ER);
++		}
++	}
++
++	if (IS_I9XX(dev)) {
++		if (eir & I915_ERROR_PAGE_TABLE) {
++			u32 pgtbl_err = I915_READ(PGTBL_ER);
++			printk(KERN_ERR "page table error\n");
++			printk(KERN_ERR "  PGTBL_ER: 0x%08x\n",
++			       pgtbl_err);
++			I915_WRITE(PGTBL_ER, pgtbl_err);
++			(void)I915_READ(PGTBL_ER);
++		}
++	}
++
++	if (eir & I915_ERROR_MEMORY_REFRESH) {
++		printk(KERN_ERR "memory refresh error\n");
++		printk(KERN_ERR "PIPEASTAT: 0x%08x\n",
++		       pipea_stats);
++		printk(KERN_ERR "PIPEBSTAT: 0x%08x\n",
++		       pipeb_stats);
++		/* pipestat has already been acked */
++	}
++	if (eir & I915_ERROR_INSTRUCTION) {
++		printk(KERN_ERR "instruction error\n");
++		printk(KERN_ERR "  INSTPM: 0x%08x\n",
++		       I915_READ(INSTPM));
++		if (!IS_I965G(dev)) {
++			u32 ipeir = I915_READ(IPEIR);
++
++			printk(KERN_ERR "  IPEIR: 0x%08x\n",
++			       I915_READ(IPEIR));
++			printk(KERN_ERR "  IPEHR: 0x%08x\n",
++			       I915_READ(IPEHR));
++			printk(KERN_ERR "  INSTDONE: 0x%08x\n",
++			       I915_READ(INSTDONE));
++			printk(KERN_ERR "  ACTHD: 0x%08x\n",
++			       I915_READ(ACTHD));
++			I915_WRITE(IPEIR, ipeir);
++			(void)I915_READ(IPEIR);
++		} else {
++			u32 ipeir = I915_READ(IPEIR_I965);
++
++			printk(KERN_ERR "  IPEIR: 0x%08x\n",
++			       I915_READ(IPEIR_I965));
++			printk(KERN_ERR "  IPEHR: 0x%08x\n",
++			       I915_READ(IPEHR_I965));
++			printk(KERN_ERR "  INSTDONE: 0x%08x\n",
++			       I915_READ(INSTDONE_I965));
++			printk(KERN_ERR "  INSTPS: 0x%08x\n",
++			       I915_READ(INSTPS));
++			printk(KERN_ERR "  INSTDONE1: 0x%08x\n",
++			       I915_READ(INSTDONE1));
[...2162 lines suppressed...]
++		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
++		encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
++		connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
++		sdvo_priv->is_tv = true;
++		intel_output->needs_tv_clock = true;
++	} else if (flags & SDVO_OUTPUT_RGB0) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
++		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
++		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
++	} else if (flags & SDVO_OUTPUT_RGB1) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
++		encoder->encoder_type = DRM_MODE_ENCODER_DAC;
++		connector->connector_type = DRM_MODE_CONNECTOR_VGA;
++	} else if (flags & SDVO_OUTPUT_LVDS0) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
++		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
++		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
++		sdvo_priv->is_lvds = true;
++	} else if (flags & SDVO_OUTPUT_LVDS1) {
++
++		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
++		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
++		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
++		sdvo_priv->is_lvds = true;
++	} else {
++
++		unsigned char bytes[2];
++
++		sdvo_priv->controlled_output = 0;
++		memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
++		DRM_DEBUG_KMS(I915_SDVO,
++				"%s: Unknown SDVO output type (0x%02x%02x)\n",
++				  SDVO_NAME(sdvo_priv),
++				  bytes[0], bytes[1]);
++		ret = false;
++	}
++
++	if (ret && registered)
++		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
++
++
++	return ret;
++
++}
++
+ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+ {
+ 	struct drm_connector *connector;
+ 	struct intel_output *intel_output;
+ 	struct intel_sdvo_priv *sdvo_priv;
+ 
+-	int connector_type;
+ 	u8 ch[0x40];
+ 	int i;
+-	int encoder_type;
+ 
+ 	intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL);
+ 	if (!intel_output) {
+@@ -1925,88 +2075,28 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+ 	intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo;
+ 
+ 	/* In defaut case sdvo lvds is false */
+-	sdvo_priv->is_lvds = false;
+ 	intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);
+ 
+-	if (sdvo_priv->caps.output_flags &
+-	    (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)) {
+-		if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0)
+-			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS0;
+-		else
+-			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS1;
+-
+-		encoder_type = DRM_MODE_ENCODER_TMDS;
+-		connector_type = DRM_MODE_CONNECTOR_DVID;
+-
+-		if (intel_sdvo_get_supp_encode(intel_output,
+-					       &sdvo_priv->encode) &&
+-		    intel_sdvo_get_digital_encoding_mode(intel_output) &&
+-		    sdvo_priv->is_hdmi) {
+-			/* enable hdmi encoding mode if supported */
+-			intel_sdvo_set_encode(intel_output, SDVO_ENCODE_HDMI);
+-			intel_sdvo_set_colorimetry(intel_output,
+-						   SDVO_COLORIMETRY_RGB256);
+-			connector_type = DRM_MODE_CONNECTOR_HDMIA;
+-		}
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_SVID0)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
+-		encoder_type = DRM_MODE_ENCODER_TVDAC;
+-		connector_type = DRM_MODE_CONNECTOR_SVIDEO;
+-		sdvo_priv->is_tv = true;
+-		intel_output->needs_tv_clock = true;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
+-		encoder_type = DRM_MODE_ENCODER_DAC;
+-		connector_type = DRM_MODE_CONNECTOR_VGA;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
+-		encoder_type = DRM_MODE_ENCODER_DAC;
+-		connector_type = DRM_MODE_CONNECTOR_VGA;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS0)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
+-		encoder_type = DRM_MODE_ENCODER_LVDS;
+-		connector_type = DRM_MODE_CONNECTOR_LVDS;
+-		sdvo_priv->is_lvds = true;
+-	}
+-	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS1)
+-	{
+-		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
+-		encoder_type = DRM_MODE_ENCODER_LVDS;
+-		connector_type = DRM_MODE_CONNECTOR_LVDS;
+-		sdvo_priv->is_lvds = true;
+-	}
+-	else
+-	{
+-		unsigned char bytes[2];
+-
+-		sdvo_priv->controlled_output = 0;
+-		memcpy (bytes, &sdvo_priv->caps.output_flags, 2);
+-		DRM_DEBUG_KMS(I915_SDVO,
+-				"%s: Unknown SDVO output type (0x%02x%02x)\n",
+-				  SDVO_NAME(sdvo_priv),
+-				  bytes[0], bytes[1]);
+-		encoder_type = DRM_MODE_ENCODER_NONE;
+-		connector_type = DRM_MODE_CONNECTOR_Unknown;
++	if (intel_sdvo_output_setup(intel_output,
++				    sdvo_priv->caps.output_flags) != true) {
++		DRM_DEBUG("SDVO output failed to setup on SDVO%c\n",
++			  output_device == SDVOB ? 'B' : 'C');
+ 		goto err_i2c;
+ 	}
+ 
++
+ 	connector = &intel_output->base;
+ 	drm_connector_init(dev, connector, &intel_sdvo_connector_funcs,
+-			   connector_type);
++			   connector->connector_type);
++
+ 	drm_connector_helper_add(connector, &intel_sdvo_connector_helper_funcs);
+ 	connector->interlace_allowed = 0;
+ 	connector->doublescan_allowed = 0;
+ 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
+ 
+-	drm_encoder_init(dev, &intel_output->enc, &intel_sdvo_enc_funcs, encoder_type);
++	drm_encoder_init(dev, &intel_output->enc,
++			&intel_sdvo_enc_funcs, intel_output->enc.encoder_type);
++
+ 	drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
+ 
+ 	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
+diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
+index a43c98e..da4ab4d 100644
+--- a/drivers/gpu/drm/i915/intel_tv.c
++++ b/drivers/gpu/drm/i915/intel_tv.c
+@@ -1490,6 +1490,27 @@ static struct input_res {
+ 	{"1920x1080", 1920, 1080},
+ };
+ 
++/*
++ * Chose preferred mode  according to line number of TV format
++ */
++static void
++intel_tv_chose_preferred_modes(struct drm_connector *connector,
++			       struct drm_display_mode *mode_ptr)
++{
++	struct intel_output *intel_output = to_intel_output(connector);
++	const struct tv_mode *tv_mode = intel_tv_mode_find(intel_output);
++
++	if (tv_mode->nbr_end < 480 && mode_ptr->vdisplay == 480)
++		mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
++	else if (tv_mode->nbr_end > 480) {
++		if (tv_mode->progressive == true && tv_mode->nbr_end < 720) {
++			if (mode_ptr->vdisplay == 720)
++				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
++		} else if (mode_ptr->vdisplay == 1080)
++				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
++	}
++}
++
+ /**
+  * Stub get_modes function.
+  *
+@@ -1544,6 +1565,7 @@ intel_tv_get_modes(struct drm_connector *connector)
+ 		mode_ptr->clock = (int) tmp;
+ 
+ 		mode_ptr->type = DRM_MODE_TYPE_DRIVER;
++		intel_tv_chose_preferred_modes(connector, mode_ptr);
+ 		drm_mode_probed_add(connector, mode_ptr);
+ 		count++;
+ 	}

drm-intel-pm.patch:
 i915_drv.c      |   15 +
 i915_drv.h      |   14 +
 i915_gem.c      |    8 
 i915_reg.h      |   22 ++
 intel_display.c |  484 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 intel_drv.h     |    4 
 6 files changed, 512 insertions(+), 35 deletions(-)

--- NEW FILE drm-intel-pm.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.jx	2009-08-03 14:00:43.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-08-03 14:01:07.000000000 -0400
@@ -43,6 +43,21 @@ module_param_named(modeset, i915_modeset
 unsigned int i915_fbpercrtc = 0;
 module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 
+unsigned int i915_powersave = 1;
+module_param_named(powersave, i915_powersave, int, 0400);
+
+unsigned int i915_lvdsclock = 1;
+module_param_named(lvdsclock, i915_lvdsclock, int, 0400);
+
+unsigned int i915_lvdsscale = 85;
+module_param_named(lvdsscale, i915_lvdsscale, int, 0400);
+
+unsigned int i915_displayclock = 1;
+module_param_named(displayclock, i915_displayclock, int, 0600);
+
+unsigned int i915_renderclock = 0;
+module_param_named(renderclock, i915_renderclock, int, 0600);
+
 static struct drm_driver driver;
 
 static struct pci_device_id pciidlist[] = {
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.jx	2009-08-03 14:00:44.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-03 14:01:07.000000000 -0400
@@ -438,6 +438,12 @@ typedef struct drm_i915_private {
 		struct drm_i915_gem_phys_object *phys_objs[I915_MAX_PHYS_OBJECT];
 	} mm;
 	struct sdvo_device_mapping sdvo_mappings[2];
+
+	/* Reclocking support */
+	struct work_struct idle_work;
+	struct timer_list idle_timer;
+	bool busy;
+	u16 orig_clock;
 } drm_i915_private_t;
 
 /** driver private structure attached to each drm_gem_object */
@@ -567,6 +573,11 @@ enum intel_chip_family {
 extern struct drm_ioctl_desc i915_ioctls[];
 extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc;
+extern unsigned int i915_powersave;
+extern unsigned int i915_lvdsclock;
+extern unsigned int i915_lvdsscale;
+extern unsigned int i915_displayclock;
+extern unsigned int i915_renderclock;
 
 extern int i915_master_create(struct drm_device *dev, struct drm_master *master);
 extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);
@@ -895,6 +906,9 @@ extern int i915_wait_ring(struct drm_dev
 /* dsparb controlled by hw only */
 #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
 
+#define HAS_FW_BLC(dev) (IS_I9XX(dev) || IS_G4X(dev) || IS_IGDNG(dev))
+#define HAS_PIPE_CXSR(dev) (IS_G4X(dev) || IS_IGDNG(dev))
+
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
 
 #endif
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c.jx	2009-08-03 14:00:43.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_gem.c	2009-08-03 14:01:07.000000000 -0400
@@ -29,6 +29,7 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
+#include "intel_drv.h"
 #include <linux/swap.h>
 #include <linux/pci.h>
 
@@ -980,6 +981,7 @@ i915_gem_set_domain_ioctl(struct drm_dev
 {
 	struct drm_i915_gem_set_domain *args = data;
 	struct drm_gem_object *obj;
+	struct drm_i915_gem_object *obj_priv;
 	uint32_t read_domains = args->read_domains;
 	uint32_t write_domain = args->write_domain;
 	int ret;
@@ -1003,8 +1005,12 @@ i915_gem_set_domain_ioctl(struct drm_dev
 	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
 	if (obj == NULL)
 		return -EBADF;
+	obj_priv = obj->driver_private;
 
 	mutex_lock(&dev->struct_mutex);
+
+	intel_mark_busy(dev, obj);
+
 #if WATCH_BUF
 	DRM_INFO("set_domain_ioctl %p(%zd), %08x %08x\n",
 		 obj, obj->size, read_domains, write_domain);
@@ -2761,6 +2767,8 @@ i915_gem_object_set_to_gpu_domain(struct
 	BUG_ON(obj->pending_read_domains & I915_GEM_DOMAIN_CPU);
 	BUG_ON(obj->pending_write_domain == I915_GEM_DOMAIN_CPU);
 
+	intel_mark_busy(dev, obj);
+
 #if WATCH_BUF
 	DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
 		 __func__, obj,
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.jx	2009-08-03 14:00:44.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-03 14:01:07.000000000 -0400
@@ -55,7 +55,7 @@
 /* PCI config space */
 
 #define HPLLCC	0xc0 /* 855 only */
-#define   GC_CLOCK_CONTROL_MASK		(3 << 0)
+#define   GC_CLOCK_CONTROL_MASK		(0xf << 0)
 #define   GC_CLOCK_133_200		(0 << 0)
 #define   GC_CLOCK_100_200		(1 << 0)
 #define   GC_CLOCK_100_133		(2 << 0)
@@ -65,6 +65,25 @@
 #define   GC_DISPLAY_CLOCK_190_200_MHZ	(0 << 4)
 #define   GC_DISPLAY_CLOCK_333_MHZ	(4 << 4)
 #define   GC_DISPLAY_CLOCK_MASK		(7 << 4)
+#define   GM45_GC_RENDER_CLOCK_MASK	(0xf << 0)
+#define   GM45_GC_RENDER_CLOCK_266_MHZ	(8 << 0)
+#define   GM45_GC_RENDER_CLOCK_320_MHZ	(9 << 0)
+#define   GM45_GC_RENDER_CLOCK_400_MHZ	(0xb << 0)
+#define   GM45_GC_RENDER_CLOCK_533_MHZ	(0xc << 0)
+#define   I965_GC_RENDER_CLOCK_MASK	(0xf << 0)
+#define   I965_GC_RENDER_CLOCK_267_MHZ	(2 << 0)
+#define   I965_GC_RENDER_CLOCK_333_MHZ	(3 << 0)
+#define   I965_GC_RENDER_CLOCK_444_MHZ	(4 << 0)
+#define   I965_GC_RENDER_CLOCK_533_MHZ	(5 << 0)
+#define   I945_GC_RENDER_CLOCK_MASK	(7 << 0)
+#define   I945_GC_RENDER_CLOCK_166_MHZ	(0 << 0)
+#define   I945_GC_RENDER_CLOCK_200_MHZ	(1 << 0)
+#define   I945_GC_RENDER_CLOCK_250_MHZ	(3 << 0)
+#define   I945_GC_RENDER_CLOCK_400_MHZ	(5 << 0)
+#define   I915_GC_RENDER_CLOCK_MASK	(7 << 0)
+#define   I915_GC_RENDER_CLOCK_166_MHZ	(0 << 0)
+#define   I915_GC_RENDER_CLOCK_200_MHZ	(1 << 0)
+#define   I915_GC_RENDER_CLOCK_333_MHZ	(4 << 0)
 #define LBB	0xf4
 
 /* VGA stuff */
@@ -1586,6 +1605,7 @@
 #define   PIPECONF_PROGRESSIVE	(0 << 21)
 #define   PIPECONF_INTERLACE_W_FIELD_INDICATION	(6 << 21)
 #define   PIPECONF_INTERLACE_FIELD_0_ONLY		(7 << 21)
+#define   PIPECONF_CXSR_DOWNCLOCK	(1<<16)
 #define PIPEASTAT		0x70024
 #define   PIPE_FIFO_UNDERRUN_STATUS		(1UL<<31)
 #define   PIPE_CRC_ERROR_ENABLE			(1UL<<29)
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx	2009-08-03 14:00:44.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-03 14:11:56.000000000 -0400
@@ -38,6 +38,7 @@
 
 bool intel_pipe_has_type (struct drm_crtc *crtc, int type);
 static void intel_update_watermarks(struct drm_device *dev);
+static void intel_increase_pllclock(struct drm_crtc *crtc, int schedule);
 
 typedef struct {
     /* given values */
@@ -67,6 +68,8 @@ struct intel_limit {
     intel_p2_t	    p2;
     bool (* find_pll)(const intel_limit_t *, struct drm_crtc *,
 		      int, int, intel_clock_t *);
+    bool (* find_reduced_pll)(const intel_limit_t *, struct drm_crtc *,
+			      int, int, intel_clock_t *);
 };
 
 #define I8XX_DOT_MIN		  25000
@@ -192,7 +195,7 @@ struct intel_limit {
 #define G4X_P2_SINGLE_CHANNEL_LVDS_LIMIT          0
 
 /*The parameter is for DUAL_CHANNEL_LVDS on G4x platform*/
-#define G4X_DOT_DUAL_CHANNEL_LVDS_MIN           80000
+#define G4X_DOT_DUAL_CHANNEL_LVDS_MIN           10000
 #define G4X_DOT_DUAL_CHANNEL_LVDS_MAX           224000
 #define G4X_N_DUAL_CHANNEL_LVDS_MIN             1
 #define G4X_N_DUAL_CHANNEL_LVDS_MAX             3
@@ -261,6 +264,9 @@ static bool
 intel_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
 		    int target, int refclk, intel_clock_t *best_clock);
 static bool
+intel_find_best_reduced_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
+			    int target, int refclk, intel_clock_t *best_clock);
+static bool
 intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
 			int target, int refclk, intel_clock_t *best_clock);
 static bool
@@ -286,6 +292,7 @@ static const intel_limit_t intel_limits_
 	.p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
 		 .p2_slow = I8XX_P2_SLOW,	.p2_fast = I8XX_P2_FAST },
 	.find_pll = intel_find_best_PLL,
+	.find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_i8xx_lvds = {
@@ -300,6 +307,7 @@ static const intel_limit_t intel_limits_
 	.p2  = { .dot_limit = I8XX_P2_SLOW_LIMIT,
 		 .p2_slow = I8XX_P2_LVDS_SLOW,	.p2_fast = I8XX_P2_LVDS_FAST },
 	.find_pll = intel_find_best_PLL,
+	.find_reduced_pll = intel_find_best_reduced_PLL,
 };
 	
 static const intel_limit_t intel_limits_i9xx_sdvo = {
@@ -314,6 +322,7 @@ static const intel_limit_t intel_limits_
 	.p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,	.p2_fast = I9XX_P2_SDVO_DAC_FAST },
 	.find_pll = intel_find_best_PLL,
+	.find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_i9xx_lvds = {
@@ -331,6 +340,7 @@ static const intel_limit_t intel_limits_
 	.p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_LVDS_SLOW,	.p2_fast = I9XX_P2_LVDS_FAST },
 	.find_pll = intel_find_best_PLL,
+	.find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
     /* below parameter and function is for G4X Chipset Family*/
@@ -348,6 +358,7 @@ static const intel_limit_t intel_limits_
 		 .p2_fast = G4X_P2_SDVO_FAST
 	},
 	.find_pll = intel_g4x_find_best_PLL,
+	.find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_hdmi = {
@@ -364,6 +375,7 @@ static const intel_limit_t intel_limits_
 		 .p2_fast = G4X_P2_HDMI_DAC_FAST
 	},
 	.find_pll = intel_g4x_find_best_PLL,
+	.find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_single_channel_lvds = {
@@ -388,6 +400,7 @@ static const intel_limit_t intel_limits_
 		 .p2_fast = G4X_P2_SINGLE_CHANNEL_LVDS_FAST
 	},
 	.find_pll = intel_g4x_find_best_PLL,
+	.find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {
@@ -412,6 +425,7 @@ static const intel_limit_t intel_limits_
 		 .p2_fast = G4X_P2_DUAL_CHANNEL_LVDS_FAST
 	},
 	.find_pll = intel_g4x_find_best_PLL,
+	.find_reduced_pll = intel_g4x_find_best_PLL,
 };
 
 static const intel_limit_t intel_limits_g4x_display_port = {
@@ -449,6 +463,7 @@ static const intel_limit_t intel_limits_
 	.p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,	.p2_fast = I9XX_P2_SDVO_DAC_FAST },
 	.find_pll = intel_find_best_PLL,
+	.find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_igd_lvds = {
@@ -464,6 +479,7 @@ static const intel_limit_t intel_limits_
 	.p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_LVDS_SLOW,	.p2_fast = I9XX_P2_LVDS_SLOW },
 	.find_pll = intel_find_best_PLL,
+	.find_reduced_pll = intel_find_best_reduced_PLL,
 };
 
 static const intel_limit_t intel_limits_igdng_sdvo = {
@@ -688,15 +704,16 @@ intel_find_best_PLL(const intel_limit_t 
 
 	memset (best_clock, 0, sizeof (*best_clock));
 
-	for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
-		for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max; clock.m2++) {
-			/* m1 is always 0 in IGD */
-			if (clock.m2 >= clock.m1 && !IS_IGD(dev))
-				break;
-			for (clock.n = limit->n.min; clock.n <= limit->n.max;
-			     clock.n++) {
-				for (clock.p1 = limit->p1.min;
-				     clock.p1 <= limit->p1.max; clock.p1++) {
+	for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) {
+		for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max;
+		     clock.m1++) {
+			for (clock.m2 = limit->m2.min;
+			     clock.m2 <= limit->m2.max; clock.m2++) {
+				/* m1 is always 0 in IGD */
+				if (clock.m2 >= clock.m1 && !IS_IGD(dev))
+					break;
+				for (clock.n = limit->n.min;
+				     clock.n <= limit->n.max; clock.n++) {
 					int this_err;
 
 					intel_clock(dev, refclk, &clock);
@@ -717,6 +734,46 @@ intel_find_best_PLL(const intel_limit_t 
 	return (err != target);
 }
 
+
+static bool
+intel_find_best_reduced_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
+			    int target, int refclk, intel_clock_t *best_clock)
+
+{
+	struct drm_device *dev = crtc->dev;
+	intel_clock_t clock;
+	int err = target;
+	bool found = false;
+
+	memcpy(&clock, best_clock, sizeof(intel_clock_t));
+
+	for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
+		for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max; clock.m2++) {
+			/* m1 is always 0 in IGD */
+			if (clock.m2 >= clock.m1 && !IS_IGD(dev))
+				break;
+			for (clock.n = limit->n.min; clock.n <= limit->n.max;
+			     clock.n++) {
+				int this_err;
+
+				intel_clock(dev, refclk, &clock);
+
+//				if (!intel_PLL_is_valid(crtc, &clock))
+//					continue;
+
+				this_err = abs(clock.dot - target);
+				if (this_err < err) {
+					*best_clock = clock;
+					err = this_err;
+					found = true;
+				}
+			}
+		}
+	}
+
+	return found;
+}
+
 static bool
 intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
 			int target, int refclk, intel_clock_t *best_clock)
@@ -747,7 +804,7 @@ intel_g4x_find_best_PLL(const intel_limi
 	max_n = limit->n.max;
 	/* based on hardware requriment prefer smaller n to precision */
 	for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
-		/* based on hardware requirment prefere larger m1,m2, p1 */
+		/* based on hardware requirment prefere larger m1,m2, */
 		for (clock.m1 = limit->m1.max;
 		     clock.m1 >= limit->m1.min; clock.m1--) {
 			for (clock.m2 = limit->m2.max;
@@ -757,8 +814,8 @@ intel_g4x_find_best_PLL(const intel_limi
 					int this_err;
 
 					intel_clock(dev, refclk, &clock);
-					if (!intel_PLL_is_valid(crtc, &clock))
-						continue;
+//					if (!intel_PLL_is_valid(crtc, &clock))
+//						continue;
 					this_err = abs(clock.dot - target) ;
 					if (this_err < err_most) {
 						*best_clock = clock;
@@ -832,15 +889,14 @@ intel_igdng_find_best_PLL(const intel_li
 
 	memset(best_clock, 0, sizeof(*best_clock));
 	max_n = limit->n.max;
-	/* based on hardware requriment prefer smaller n to precision */
-	for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
-		/* based on hardware requirment prefere larger m1,m2, p1 */
-		for (clock.m1 = limit->m1.max;
-		     clock.m1 >= limit->m1.min; clock.m1--) {
-			for (clock.m2 = limit->m2.max;
-			     clock.m2 >= limit->m2.min; clock.m2--) {
-				for (clock.p1 = limit->p1.max;
-				     clock.p1 >= limit->p1.min; clock.p1--) {
+	for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) {
+		/* based on hardware requriment prefer smaller n to precision */
+		for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
+			/* based on hardware requirment prefere larger m1,m2 */
+			for (clock.m1 = limit->m1.max;
+			     clock.m1 >= limit->m1.min; clock.m1--) {
+				for (clock.m2 = limit->m2.max;
+				     clock.m2 >= limit->m2.min; clock.m2--) {
 					int this_err;
 
 					intel_clock(dev, refclk, &clock);
@@ -1029,6 +1085,7 @@ intel_pipe_set_base(struct drm_crtc *crt
 		intel_wait_for_vblank(dev);
 		i915_gem_object_unpin(intel_fb->obj);
 	}
+	intel_increase_pllclock(crtc, true);
 
 	if (!dev->primary->master)
 		return 0;
@@ -2036,6 +2093,18 @@ static int intel_get_fifo_size(struct dr
 	return size;
 }
 
+static void g4x_update_wm(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	u32 fw_blc_self = I915_READ(FW_BLC_SELF);
+
+	if (i915_powersave)
+		fw_blc_self |= FW_BLC_SELF_EN;
+	else
+		fw_blc_self &= ~FW_BLC_SELF_EN;
+	I915_WRITE(FW_BLC_SELF, fw_blc_self);
+}
+
 static void i965_update_wm(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2087,7 +2156,7 @@ static void i9xx_update_wm(struct drm_de
 	cwm = 2;
 
 	/* Calc sr entries for one plane configs */
-	if (sr_hdisplay && (!planea_clock || !planeb_clock)) {
+	if (HAS_FW_BLC(dev) && sr_hdisplay && (!planea_clock || !planeb_clock)) {
 		/* self-refresh has much higher latency */
 		const static int sr_latency_ns = 6000;
 
@@ -2102,8 +2171,7 @@ static void i9xx_update_wm(struct drm_de
 		srwm = total_size - sr_entries;
 		if (srwm < 0)
 			srwm = 1;
-		if (IS_I9XX(dev))
-			I915_WRITE(FW_BLC_SELF, (srwm & 0x3f));
+		I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN | (srwm & 0x3f));
 	}
 
 	DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
@@ -2177,9 +2245,6 @@ static void intel_update_watermarks(stru
 	unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
 	int enabled = 0, pixel_size = 0;
 
-	if (DSPARB_HWCONTROL(dev))
-		return;
-
 	/* Get the clock config from both planes */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		intel_crtc = to_intel_crtc(crtc);
@@ -2212,7 +2277,9 @@ static void intel_update_watermarks(stru
 	else if (IS_IGD(dev))
 		igd_disable_cxsr(dev);
 
-	if (IS_I965G(dev))
+	if (IS_G4X(dev))
+		g4x_update_wm(dev);
+	else if (IS_I965G(dev))
 		i965_update_wm(dev);
 	else if (IS_I9XX(dev) || IS_MOBILE(dev))
 		i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
@@ -2246,9 +2313,9 @@ static int intel_crtc_mode_set(struct dr
 	int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
 	int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
 	int refclk, num_outputs = 0;
-	intel_clock_t clock;
-	u32 dpll = 0, fp = 0, dspcntr, pipeconf;
-	bool ok, is_sdvo = false, is_dvo = false;
+	intel_clock_t clock, reduced_clock;
+	u32 dpll = 0, fp = 0, fp2 = 0, dspcntr, pipeconf;
+	bool ok, has_reduced_clock = false, is_sdvo = false, is_dvo = false;
 	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;
@@ -2331,6 +2398,14 @@ static int intel_crtc_mode_set(struct dr
 		return -EINVAL;
 	}
 
+	if (limit->find_reduced_pll && is_lvds) {
+		memcpy(&reduced_clock, &clock, sizeof(intel_clock_t));
+		has_reduced_clock = limit->find_reduced_pll(limit, crtc,
+							    (adjusted_mode->clock*i915_lvdsscale/100),
+							    refclk,
+							    &reduced_clock);
+	}
+
 	/* SDVO TV has fixed PLL values depend on its clock range,
 	   this mirrors vbios setting. */
 	if (is_sdvo && is_tv) {
@@ -2376,10 +2451,17 @@ static int intel_crtc_mode_set(struct dr
 				  link_bw, &m_n);
 	}
 
-	if (IS_IGD(dev))
+	if (IS_IGD(dev)) {
 		fp = (1 << clock.n) << 16 | clock.m1 << 8 | clock.m2;
-	else
+		if (has_reduced_clock)
+			fp2 = (1 << reduced_clock.n) << 16 |
+				reduced_clock.m1 << 8 | reduced_clock.m2;
+	} else {
 		fp = clock.n << 16 | clock.m1 << 8 | clock.m2;
+		if (has_reduced_clock)
+			fp2 = reduced_clock.n << 16 | reduced_clock.m1 << 8 |
+				reduced_clock.m2;
+	}
 
 	if (!IS_IGDNG(dev))
 		dpll = DPLL_VGA_MODE_DIS;
@@ -2408,6 +2490,8 @@ static int intel_crtc_mode_set(struct dr
 			/* also FPA1 */
 			if (IS_IGDNG(dev))
 				dpll |= (1 << (clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
+			if (IS_G4X(dev) && has_reduced_clock)
+				dpll |= (1 << (reduced_clock.p1 - 1)) << DPLL_FPA1_P1_POST_DIV_SHIFT;
 		}
 		switch (clock.p2) {
 		case 5:
@@ -2534,9 +2618,25 @@ static int intel_crtc_mode_set(struct dr
 	}
 	if (is_dp)
 		intel_dp_set_m_n(crtc, mode, adjusted_mode);
+	
 
 	if (!is_edp) {
 		I915_WRITE(fp_reg, fp);
+		if (has_reduced_clock && i915_powersave && i915_lvdsclock) {
+			I915_WRITE(fp_reg + 4, fp2);
+			intel_crtc->lowfreq_avail = true;
+			if (HAS_PIPE_CXSR(dev)) {
+				DRM_DEBUG("enabling CxSR downclocking\n");
+				pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
+			}
+		} else {
+			I915_WRITE(fp_reg + 4, fp);
+			intel_crtc->lowfreq_avail = false;
+			if (HAS_PIPE_CXSR(dev)) {
+				DRM_DEBUG("disabling CxSR downclocking\n");
+				pipeconf &= ~PIPECONF_CXSR_DOWNCLOCK;
+			}
+		}
 		I915_WRITE(dpll_reg, dpll);
 		I915_READ(dpll_reg);
 		/* Wait for the clocks to stabilize. */
@@ -2748,6 +2848,8 @@ fail_locked:
 	return ret;
 }
 
+#define CRTC_IDLE_TIMEOUT 1000 /* ms */
+
 static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
 {
 	struct drm_device *dev = crtc->dev;
@@ -2757,6 +2859,12 @@ static int intel_crtc_cursor_move(struct
 	uint32_t temp = 0;
 	uint32_t adder;
 
+	if (!intel_crtc->busy)
+		intel_increase_pllclock(crtc, true);
+	intel_crtc->busy = true;
+	mod_timer(&intel_crtc->idle_timer, jiffies +
+		  msecs_to_jiffies(CRTC_IDLE_TIMEOUT));
+
 	if (x < 0) {
 		temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
 		x = -x;
@@ -3054,6 +3162,286 @@ struct drm_display_mode *intel_crtc_mode
 	return mode;
 }
 
+#define GPU_IDLE_TIMEOUT 500 /* ms */
+
+/* When this timer fires, we've been idle for awhile */
+static void intel_gpu_idle_timer(unsigned long arg)
+{
+	struct drm_device *dev = (struct drm_device *)arg;
+	drm_i915_private_t *dev_priv = dev->dev_private;
+
+	DRM_DEBUG("idle timer fired, downclocking\n");
+
+	dev_priv->busy = false;
+
+	schedule_work(&dev_priv->idle_work);
+}
+
+void intel_increase_renderclock(struct drm_device *dev, int schedule)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+
+	if (!i915_renderclock)
+		return;
+
+	if (IS_G4X(dev) || IS_I9XX(dev)) {
+		/* Up to maximum... */
+		pci_write_config_word(dev->pdev, GCFGC, dev_priv->orig_clock);
+	} else if (IS_I85X(dev)) {
+		pci_write_config_word(dev->pdev, HPLLCC, dev_priv->orig_clock);
+	}
+	DRM_DEBUG("increasing render clock frequency\n");
+
+	if (!schedule)
+		return;
+
+	/* Schedule downclock */
+	mod_timer(&dev_priv->idle_timer, jiffies +
+		  msecs_to_jiffies(GPU_IDLE_TIMEOUT));
+}
+
+void intel_decrease_renderclock(struct drm_device *dev)
+{
+	if (!i915_renderclock)
+		return;
+
+	if (IS_G4X(dev)) {
+		u16 gcfgc;
+
+		/* Adjust render clock... */
+		pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+		/* Down to minimum... */
+		gcfgc &= ~GM45_GC_RENDER_CLOCK_MASK;
+		gcfgc |= GM45_GC_RENDER_CLOCK_266_MHZ;
+
+		pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+	} else if (IS_I965G(dev)) {
+		u16 gcfgc;
+
+		/* Adjust render clock... */
+		pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+		/* Down to minimum... */
+		gcfgc &= ~I965_GC_RENDER_CLOCK_MASK;
+		gcfgc |= I965_GC_RENDER_CLOCK_267_MHZ;
+
+		pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+	} else if (IS_I945G(dev) || IS_I945GM(dev)) {
+		u16 gcfgc;
+
+		/* Adjust render clock... */
+		pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+		/* Down to minimum... */
+		gcfgc &= ~I945_GC_RENDER_CLOCK_MASK;
+		gcfgc |= I945_GC_RENDER_CLOCK_166_MHZ;
+
+		pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+	} else if (IS_I915G(dev) || IS_I915GM(dev)) {
+		u16 gcfgc;
+
+		/* Adjust render clock... */
+		pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+		/* Down to minimum... */
+		gcfgc &= ~I915_GC_RENDER_CLOCK_MASK;
+		gcfgc |= I915_GC_RENDER_CLOCK_166_MHZ;
+
+		pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+	} else if (IS_I85X(dev)) {
+		u16 hpllcc;
+
+		/* Adjust render clock... */
+		pci_read_config_word(dev->pdev, HPLLCC, &hpllcc);
+
+		/* Up to maximum... */
+		hpllcc &= ~GC_CLOCK_CONTROL_MASK;
+		hpllcc |= GC_CLOCK_133_200;
+
+		pci_write_config_word(dev->pdev, HPLLCC, hpllcc);
+	}
+	DRM_DEBUG("decreasing render clock frequency\n");
+}
+
+/* Note that no increase function is needed for this - increase_renderclock()
+ *  will also rewrite these bits
+ */
+void intel_decrease_displayclock(struct drm_device *dev)
+{
+	if (!i915_displayclock)
+		return;
+
+	if (IS_I945G(dev) || IS_I945GM(dev) || IS_I915G(dev) ||
+	    IS_I915GM(dev)) {
+		u16 gcfgc;
+
+		/* Adjust render clock... */
+		pci_read_config_word(dev->pdev, GCFGC, &gcfgc);
+
+		/* Down to minimum... */
+		gcfgc &= ~0xf0;
+		gcfgc |= 0x80;
+
+		pci_write_config_word(dev->pdev, GCFGC, gcfgc);
+	}
+}
+
+static void intel_crtc_idle_timer(unsigned long arg)
+{
+	struct intel_crtc *intel_crtc = (struct intel_crtc *)arg;
+	struct drm_crtc *crtc = &intel_crtc->base;
+	drm_i915_private_t *dev_priv = crtc->dev->dev_private;
+
+	DRM_DEBUG("idle timer fired, downclocking\n");
+
+	intel_crtc->busy = false;
+
+	schedule_work(&dev_priv->idle_work);
+}
+
+static void intel_increase_pllclock(struct drm_crtc *crtc, int schedule)
+{
+	struct drm_device *dev = crtc->dev;
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	int pipe = intel_crtc->pipe;
+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
+	int dpll = I915_READ(dpll_reg);
+
+	if (!i915_lvdsclock)
+		return;
+
+	if (!HAS_PIPE_CXSR(dev) && (dpll & DISPLAY_RATE_SELECT_FPA1)) {
+		DRM_DEBUG("upclocking LVDS\n");
+
+		I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
+		I915_WRITE(dpll_reg, dpll & ~DISPLAY_RATE_SELECT_FPA1);
+		dpll = I915_READ(dpll_reg);
+		intel_wait_for_vblank(dev);
+		dpll = I915_READ(dpll_reg);
+		if (dpll & DISPLAY_RATE_SELECT_FPA1)
+			DRM_DEBUG("failed to upclock LVDS!\n");
+		I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) & 0x3);
+	}
+
+	if (!schedule)
+		return;
+
+	/* Schedule downclock */
+	mod_timer(&intel_crtc->idle_timer, jiffies +
+		  msecs_to_jiffies(CRTC_IDLE_TIMEOUT));
+}
+
+static void intel_decrease_pllclock(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	int pipe = intel_crtc->pipe;
+	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
+	int dpll = I915_READ(dpll_reg);
+
+	if (!i915_lvdsclock)
+		return;
+
+	/*
+	 * Since this is called by a timer, we should never get here in
+	 * the manual case.
+	 */
+	if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
+		DRM_DEBUG("downclocking LVDS\n");
+		I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
+
+		dpll |= DISPLAY_RATE_SELECT_FPA1;
+		I915_WRITE(dpll_reg, dpll);
+		dpll = I915_READ(dpll_reg);
+		intel_wait_for_vblank(dev);
+		dpll = I915_READ(dpll_reg);
+		if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
+			DRM_DEBUG("failed to downclock LVDS!\n");
+		I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) & 0x3);
+	}
+
+}
+
+/**
+ * intel_idle_update - adjust clocks for idleness
+ * @work: work struct
+ *
+ * Either the GPU or display (or both) went idle.  Check the busy status
+ * here and adjust the CRTC and GPU clocks as necessary.
+ */
+static void intel_idle_update(struct work_struct *work)
+{
+	drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
+						    idle_work);
+	struct drm_device *dev = dev_priv->dev;
+	struct drm_crtc *crtc;
+	struct intel_crtc *intel_crtc;
+
+	if (!i915_powersave)
+		return;
+
+	mutex_lock(&dev->struct_mutex);
+
+	/* GPU isn't processing, downclock it. */
+	if (!dev_priv->busy) {
+		intel_decrease_renderclock(dev);
+		intel_decrease_displayclock(dev);
+	}
+
+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+		/* Skip inactive CRTCs */
+		if (!crtc->fb)
+			continue;
+
+		intel_crtc = to_intel_crtc(crtc);
+		if (!intel_crtc->busy)
+			intel_decrease_pllclock(crtc);
+	}
+
+	mutex_unlock(&dev->struct_mutex);
+}
+
+/**
+ * intel_mark_busy - mark the GPU and possibly the display busy
+ * @dev: drm device
+ * @obj: object we're operating on
+ *
+ * Callers can use this function to indicate that the GPU is busy processing
+ * commands.  If @obj matches one of the CRTC objects (i.e. it's a scanout
+ * buffer), we'll also mark the display as busy, so we know to increase its
+ * clock frequency.
+ */
+void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_crtc *crtc = NULL;
+	struct intel_framebuffer *intel_fb;
+	struct intel_crtc *intel_crtc;
+
+	dev_priv->busy = true;
+	intel_increase_renderclock(dev, true);
+
+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+		if (!crtc->fb)
+			continue;
+
+		intel_crtc = to_intel_crtc(crtc);
+		intel_fb = to_intel_framebuffer(crtc->fb);
+		if (intel_fb->obj == obj) {
+			if (!intel_crtc->busy)
+				intel_increase_pllclock(crtc, true);
+			intel_crtc->busy = true;
+			mod_timer(&intel_crtc->idle_timer, jiffies +
+				  msecs_to_jiffies(CRTC_IDLE_TIMEOUT));
+		}
+	}
+
+
+}
+
 static void intel_crtc_destroy(struct drm_crtc *crtc)
 {
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -3110,6 +3498,10 @@ static void intel_crtc_init(struct drm_d
 	intel_crtc->mode_set.crtc = &intel_crtc->base;
 	intel_crtc->mode_set.connectors = (struct drm_connector **)(intel_crtc + 1);
 	intel_crtc->mode_set.num_connectors = 0;
+	intel_crtc->busy = false;
+
+	setup_timer(&intel_crtc->idle_timer, intel_crtc_idle_timer,
+		    (unsigned long)intel_crtc);
 
 	if (i915_fbpercrtc) {
 
@@ -3399,6 +3791,7 @@ static const struct drm_mode_config_func
 
 void intel_modeset_init(struct drm_device *dev)
 {
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	int num_pipe;
 	int i;
 
@@ -3433,15 +3826,38 @@ void intel_modeset_init(struct drm_devic
 	DRM_DEBUG("%d display pipe%s available.\n",
 		  num_pipe, num_pipe > 1 ? "s" : "");
 
+	if (IS_I85X(dev))
+		pci_read_config_word(dev->pdev, HPLLCC, &dev_priv->orig_clock);
+	else if (IS_I9XX(dev) || IS_G4X(dev))
+		pci_read_config_word(dev->pdev, GCFGC, &dev_priv->orig_clock);
+
 	for (i = 0; i < num_pipe; i++) {
 		intel_crtc_init(dev, i);
 	}
 
 	intel_setup_outputs(dev);
+
+	INIT_WORK(&dev_priv->idle_work, intel_idle_update);
+	setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer,
+		    (unsigned long)dev);
 }
 
 void intel_modeset_cleanup(struct drm_device *dev)
 {
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
+	/* Clean up up/down clocking */
+	if (!HAS_PIPE_CXSR(dev)) {
+		u32 dpll_b = I915_READ(DPLL_B);
+
+		del_timer_sync(&dev_priv->idle_timer);
+		dpll_b &= ~DISPLAY_RATE_SELECT_FPA1;
+		I915_WRITE(DPLL_B, dpll_b);
+		POSTING_READ(DPLL_B);
+		intel_wait_for_vblank(dev);
+	}
+
+	intel_increase_renderclock(dev, false);
 	drm_mode_config_cleanup(dev);
 }
 
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx	2009-08-03 14:00:44.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-03 14:01:07.000000000 -0400
@@ -99,6 +99,9 @@ struct intel_crtc {
 	struct intel_framebuffer *fbdev_fb;
 	/* a mode_set for fbdev users on this crtc */
 	struct drm_mode_set mode_set;
+	bool busy; /* is scanout buffer being updated frequently? */
+	struct timer_list idle_timer;
+	bool lowfreq_avail;
 };
 
 #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)
@@ -117,6 +120,7 @@ extern void intel_hdmi_init(struct drm_d
 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);
+extern void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj);
 extern void intel_lvds_init(struct drm_device *dev);
 extern void intel_dp_init(struct drm_device *dev, int dp_reg);
 void

drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                          |  169 +++++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                   |   12 +
 b/drivers/gpu/drm/drm_drv.c                           |    1 
 b/drivers/gpu/drm/drm_fops.c                          |   68 +++++++
 b/drivers/gpu/drm/drm_irq.c                           |   43 ++++
 b/drivers/gpu/drm/i915/i915_drv.c                     |    1 
 b/drivers/gpu/drm/i915/intel_display.c                |   24 +-
 b/drivers/gpu/drm/radeon/atombios_crtc.c              |    1 
 b/drivers/gpu/drm/radeon/radeon_display.c             |    3 
 b/include/drm/drm.h                                   |   25 ++
 b/include/drm/drmP.h                                  |   32 +++
 b/include/drm/drm_crtc.h                              |   27 ++
 b/include/drm/drm_crtc_helper.h                       |    4 
 b/include/drm/drm_mode.h                              |   17 +
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 16 files changed, 415 insertions(+), 16 deletions(-)

--- NEW FILE drm-page-flip.patch ---
>From 2c6289cd75e125745e38dc563fa33301d05923a0 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at hinata.local>
Date: Mon, 13 Jul 2009 09:07:19 -0400
Subject: [PATCH] Add modesetting pageflip ioctl and corresponding drm event
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

This patch adds a vblank synced pageflip ioctl for to the modesetting
family of ioctls.  The ioctl takes a crtc and an fb and schedules a
pageflip to the new fb at the next coming vertical blank event.  This
feature lets userspace implement tear-free updating of the screen contents
with hw-guaranteed low latency page flipping.

The ioctl is asynchronous in that it returns immediately and then later
notifies the client by making an event available for reading on the drm fd.
This lets applications add the drm fd to their main loop and handle other
tasks while waiting for the flip to happen.  The event includes the time
of the flip, the frame counter and a 64 bit opaque token provided by
user space in the ioctl.

Based on work and suggestions from
	Jesse Barnes <jbarnes at virtuousgeek.org>,
	Jakob Bornecrantz <wallbraker at gmail.com>,
	Chris Wilson <chris at chris-wilson.co.uk>

Signed-off-by: Kristian H?gsberg <krh at redhat.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---
 drivers/gpu/drm/drm_crtc.c              |  169 ++++++++++++++++++++++++++++++-
 drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
 drivers/gpu/drm/drm_drv.c               |    1 +
 drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++-
 drivers/gpu/drm/drm_irq.c               |   43 ++++++++
 drivers/gpu/drm/i915/i915_drv.c         |    1 +
 drivers/gpu/drm/i915/intel_display.c    |   24 +++--
 drivers/gpu/drm/radeon/atombios_crtc.c  |    1 -
 drivers/gpu/drm/radeon/radeon_display.c |    3 +-
 include/drm/drm.h                       |   25 +++++
 include/drm/drmP.h                      |   32 ++++++
 include/drm/drm_crtc.h                  |   27 +++++
 include/drm/drm_crtc_helper.h           |    4 +
 include/drm/drm_mode.h                  |   16 +++
 14 files changed, 413 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 8fab789..32212e6 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -34,6 +34,8 @@
 #include "drmP.h"
 #include "drm_crtc.h"
 
+#undef set_base
+
 struct drm_prop_enum_list {
 	int type;
 	char *name;
@@ -342,6 +344,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
 EXPORT_SYMBOL(drm_framebuffer_cleanup);
 
 /**
+ * drm_crtc_async_flip - do a set_base call from a work queue
+ * @work: work struct
+ *
+ * Called when a set_base call is queued by the page flip code.  This
+ * allows the flip ioctl itself to return immediately and allow userspace
+ * to continue working.
+ */
+static void drm_crtc_async_flip(struct work_struct *work)
+{
+	struct drm_crtc *crtc = container_of(work, struct drm_crtc, async_flip);
+	struct drm_device *dev = crtc->dev;
+	struct drm_pending_flip *pending;
+
+	BUG_ON(crtc->pending_flip == NULL);
+
+	mutex_lock(&dev->struct_mutex);
+	crtc->funcs->set_base(crtc, 0, 0, NULL);
+
+	pending = crtc->pending_flip;
+	crtc->pending_flip = NULL;
+
+	pending->frame = drm_vblank_count(dev, crtc->pipe);
+	list_add_tail(&pending->link, &dev->flip_list);
+
+	mutex_unlock(&dev->struct_mutex);
+}
+
+/**
  * drm_crtc_init - Initialise a new CRTC object
  * @dev: DRM device
  * @crtc: CRTC object to init
@@ -352,17 +382,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
  *
  * Inits a new object created as base part of an driver crtc object.
  */
-void drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
+void drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, int pipe,
 		   const struct drm_crtc_funcs *funcs)
 {
 	crtc->dev = dev;
 	crtc->funcs = funcs;
+	crtc->pipe = pipe;
 
 	mutex_lock(&dev->mode_config.mutex);
 	drm_mode_object_get(dev, &crtc->base, DRM_MODE_OBJECT_CRTC);
 
 	list_add_tail(&crtc->head, &dev->mode_config.crtc_list);
 	dev->mode_config.num_crtc++;
+	INIT_WORK(&crtc->async_flip, drm_crtc_async_flip);
 	mutex_unlock(&dev->mode_config.mutex);
 }
 EXPORT_SYMBOL(drm_crtc_init);
@@ -381,6 +413,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
 
+	mutex_lock(&dev->mode_config.mutex);
+	flush_work(&crtc->async_flip);
+
 	if (crtc->gamma_store) {
 		kfree(crtc->gamma_store);
 		crtc->gamma_store = NULL;
@@ -388,6 +423,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
 
 	drm_mode_object_put(dev, &crtc->base);
 	list_del(&crtc->head);
+	mutex_unlock(&dev->mode_config.mutex);
 	dev->mode_config.num_crtc--;
 }
 EXPORT_SYMBOL(drm_crtc_cleanup);
@@ -2452,3 +2488,134 @@ out:
 	mutex_unlock(&dev->mode_config.mutex);
 	return ret;
 }
+
+/**
+ * drm_mode_page_flip_ioctl - page flip ioctl
+ * @dev: DRM device
+ * @data: ioctl args
+ * @file_priv: file private data
+ *
+ * The page flip ioctl replaces the current front buffer with a new
+ * one, using the CRTC's set_base function, which should just update
+ * the front buffer base pointer.  It's up to set_base to make
+ * sure the update doesn't result in tearing (on some hardware the
+ * base register is double buffered, so this is easy).
+ *
+ * Note that this covers just the simple case of flipping the front
+ * buffer immediately.  Interval handling and interlaced modes have to
+ * be handled by userspace, or with new ioctls.
+ */
+int drm_mode_page_flip_ioctl(struct drm_device *dev, void *data,
+			     struct drm_file *file_priv)
+{
+	struct drm_pending_flip *pending;
+	struct drm_mode_page_flip *flip_data = data;
+	struct drm_mode_object *drm_obj, *fb_obj;
+	struct drm_crtc *crtc;
+	int ret = 0;
+
+	if (!(drm_core_check_feature(dev, DRIVER_MODESET)))
+		return -ENODEV;
+
+	/*
+	 * Reject unknown flags so future userspace knows what we (don't)
+	 * support
+	 */
+	if (flip_data->flags & (~DRM_MODE_PAGE_FLIP_FLAGS_MASK)) {
+		DRM_DEBUG("bad page flip flags\n");
+		return -EINVAL;
+	}
+
+	pending = kzalloc(sizeof *pending, GFP_KERNEL);
+	if (pending == NULL)
+		return -ENOMEM;
+
+	mutex_lock(&dev->struct_mutex);
+
+	fb_obj = drm_mode_object_find(dev, flip_data->fb_id,
+				      DRM_MODE_OBJECT_FB);
+	if (!fb_obj) {
+		DRM_DEBUG("unknown fb %d\n", flip_data->fb_id);
+		ret = -ENOENT;
+		goto out_unlock;
+	}
+
+	drm_obj = drm_mode_object_find(dev, flip_data->crtc_id,
+				       DRM_MODE_OBJECT_CRTC);
+	if (!drm_obj) {
+		DRM_DEBUG("unknown crtc %d\n", flip_data->crtc_id);
+		ret = -ENOENT;
+		goto out_unlock;
+	}
+	crtc = obj_to_crtc(drm_obj);
+	if (!crtc->enabled) {
+		DRM_DEBUG("crtc %d not enabled\n", flip_data->crtc_id);
+		ret = -EINVAL;
+		goto out_unlock;
+	}
+
+	if (crtc->fb->funcs->unpin == NULL) {
+		DRM_DEBUG("fb for crtc %d does not support delayed unpin\n",
+			  flip_data->crtc_id);
+		ret = -ENODEV;
+		goto out_unlock;
+	}
+
+	pending->crtc = crtc;
+	pending->old_fb = crtc->fb;
+	pending->pipe = crtc->pipe;
+	pending->event.base.type = DRM_EVENT_MODE_PAGE_FLIP;
+	pending->event.base.length = sizeof pending->event;
+	pending->event.user_data = flip_data->user_data;
+	pending->pending_event.event = &pending->event.base;
+	pending->pending_event.file_priv = file_priv;
+	pending->pending_event.destroy =
+		(void (*) (struct drm_pending_event *)) kfree;
+
+	/* Get vblank ref for completion handling */
+	ret = drm_vblank_get(dev, crtc->pipe);
+	if (ret) {
+		DRM_DEBUG("failed to take vblank ref\n");
+		goto out_unlock;
+	}
+
+	/*
+	 * The set_base call will change the domain on the new fb,
+	 * which will force the rendering to finish and block the
+	 * ioctl.  We need to do this last part from a work queue, to
+	 * avoid blocking userspace here.
+	 */
+	crtc->fb = obj_to_fb(fb_obj);
+
+	if (crtc->pending_flip != NULL) {
+	    struct drm_pending_flip *old_flip;
+
+	    /* We have an outstanding flip request for this crtc/pipe.
+	     * In order to satisfy the user we can either queue the requests
+	     * and apply them on sequential vblanks, or we can drop old
+	     * requests.
+	     *
+	     * Here we choose to discard the previous request for
+	     * simplicity. Note that since we have not yet applied the
+	     * previous flip, we need to preserve the original (i.e. still
+	     * current) fb.
+	     */
+
+	    old_flip = crtc->pending_flip;
+	    pending->old_fb = old_flip->old_fb;
+	    old_flip->old_fb = NULL;
+	    drm_finish_pending_flip (dev, old_flip, 0);
+	} else
+	    schedule_work(&crtc->async_flip);
+	crtc->pending_flip = pending;
+
+	mutex_unlock(&dev->struct_mutex);
+
+	return 0;
+
+out_unlock:
+	mutex_unlock(&dev->struct_mutex);
+	kfree(pending);
+
+	return ret;
+}
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 3da9cfa..5a26bab 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -868,8 +868,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 		old_fb = set->crtc->fb;
 		if (set->crtc->fb != set->fb)
 			set->crtc->fb = set->fb;
+		mutex_lock(&dev->struct_mutex);
 		ret = crtc_funcs->mode_set_base(set->crtc,
 						set->x, set->y, old_fb);
+		mutex_unlock(&dev->struct_mutex);
 		if (ret != 0)
 		    goto fail_set_mode;
 	}
@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
 	return 0;
 }
 EXPORT_SYMBOL(drm_helper_resume_force_mode);
+
+int
+drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
+			 struct drm_framebuffer *old_fb)
+{
+	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+
+	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
+}
+EXPORT_SYMBOL(drm_crtc_helper_set_base);
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index b39d7bf..c66c993 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
+	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
 };
 
 #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 251bc0e..dcd9c66 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 
 	INIT_LIST_HEAD(&priv->lhead);
 	INIT_LIST_HEAD(&priv->fbs);
+	INIT_LIST_HEAD(&priv->event_list);
+	init_waitqueue_head(&priv->event_wait);
 
 	if (dev->driver->driver_features & DRIVER_GEM)
 		drm_gem_open(dev, priv);
@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
 {
 	struct drm_file *file_priv = filp->private_data;
 	struct drm_device *dev = file_priv->minor->dev;
+	struct drm_pending_flip *f, *ft;
+	struct drm_pending_event *e, *et;
+
 	int retcode = 0;
 
 	lock_kernel();
@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
 	if (file_priv->minor->master)
 		drm_master_release(dev, filp);
 
+	mutex_lock(&dev->struct_mutex);
+
+	/* Remove pending flips */
+	list_for_each_entry_safe(f, ft, &dev->flip_list, link)
+		if (f->pending_event.file_priv == file_priv)
+			drm_finish_pending_flip(dev, f, 0);
+
+	/* Remove unconsumed events */
+	list_for_each_entry_safe(e, et, &file_priv->event_list, link)
+		e->destroy(e);
+
+	mutex_unlock(&dev->struct_mutex);
+
 	if (dev->driver->driver_features & DRIVER_GEM)
 		drm_gem_release(dev, file_priv);
 
@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
 }
 EXPORT_SYMBOL(drm_release);
 
-/** No-op. */
+ssize_t drm_read(struct file *filp, char __user *buffer,
+		 size_t count, loff_t *offset)
+{
+	struct drm_file *file_priv = filp->private_data;
+	struct drm_device *dev = file_priv->minor->dev;
+	struct drm_pending_event *event;
+	ssize_t total, ret;
+
+	ret = wait_event_interruptible(file_priv->event_wait,
+				       !list_empty(&file_priv->event_list));
+	if (ret < 0)
+		return ret;
+
+	total = 0;
+	while (!list_empty(&file_priv->event_list)) {
+		mutex_lock(&dev->struct_mutex);
+		event = list_first_entry(&file_priv->event_list,
+					 struct drm_pending_event, link);
+		if (total + event->event->length > count) {
+			mutex_unlock(&dev->struct_mutex);
+			break;
+		}
+		list_del(&event->link);
+		mutex_unlock(&dev->struct_mutex);
+
+		if (copy_to_user(buffer + total,
+				 event->event, event->event->length)) {
+			total = -EFAULT;
+			break;
+		}
+
+		total += event->event->length;
+		event->destroy(event);
+	}
+
+	return total;
+}
+EXPORT_SYMBOL(drm_read);
+
 unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait)
 {
-	return 0;
+	struct drm_file *file_priv = filp->private_data;
+	unsigned int mask = 0;
+
+	poll_wait(filp, &file_priv->event_wait, wait);
+
+	if (!list_empty(&file_priv->event_list))
+		mask |= POLLIN | POLLRDNORM;
+
+	return mask;
 }
 EXPORT_SYMBOL(drm_poll);
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index b4a3dbc..c7a17f6 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -34,6 +34,7 @@
  */
 
 #include "drmP.h"
+#include "drm_crtc_helper.h"
 
 #include <linux/interrupt.h>	/* For task queue support */
 
@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
 	return 0;
 }
 
+#define vblank_passed(a,b) ((long)(a - b) > 0)
+
+void drm_finish_pending_flip(struct drm_device *dev,
+			     struct drm_pending_flip *f, u32 frame)
+{
+	struct timeval now;
+
+	f->event.frame = frame;
+	do_gettimeofday(&now);
+	f->event.tv_sec = now.tv_sec;
+	f->event.tv_usec = now.tv_usec;	
+	drm_vblank_put(dev, f->pipe);
+	list_del_init(&f->link);
+	list_add_tail(&f->pending_event.link,
+		      &f->pending_event.file_priv->event_list);
+	if (f->old_fb)
+	    f->old_fb->funcs->unpin(f->old_fb);
+	wake_up_interruptible(&f->pending_event.file_priv->event_wait);
+}
+
+static void drm_flip_work_func(struct work_struct *work)
+{
+	struct drm_device *dev =
+		container_of(work, struct drm_device, flip_work);
+	struct drm_pending_flip *f, *t;
+	u32 frame;
+
+	mutex_lock(&dev->struct_mutex);
+
+	list_for_each_entry_safe(f, t, &dev->flip_list, link) {
+		frame = drm_vblank_count(dev, f->pipe);
+		if (vblank_passed(frame, f->frame))
+			drm_finish_pending_flip(dev, f, frame);
+	}
+
+	mutex_unlock(&dev->struct_mutex);
+}
+
 static void vblank_disable_fn(unsigned long arg)
 {
 	struct drm_device *dev = (struct drm_device *)arg;
@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
 		atomic_set(&dev->vblank_refcount[i], 0);
 	}
 
+	INIT_LIST_HEAD(&dev->flip_list);
+	INIT_WORK(&dev->flip_work, drm_flip_work_func);
 	dev->vblank_disable_allowed = 0;
 
 	return 0;
@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
 {
 	atomic_inc(&dev->_vblank_count[crtc]);
 	DRM_WAKEUP(&dev->vbl_queue[crtc]);
+	schedule_work(&dev->flip_work);
 }
 EXPORT_SYMBOL(drm_handle_vblank);
+
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index fc4b68a..322b0f2 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -203,6 +203,7 @@ static struct drm_driver driver = {
 		 .mmap = drm_gem_mmap,
 		 .poll = drm_poll,
 		 .fasync = drm_fasync,
+		 .read = drm_read,
 #ifdef CONFIG_COMPAT
 		 .compat_ioctl = i915_compat_ioctl,
 #endif
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 508838e..697c31a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -863,6 +863,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 	u32 dspcntr, alignment;
 	int ret;
 
+	BUG_ON(!mutex_is_locked(&dev->struct_mutex));
+
 	/* no fb bound */
 	if (!crtc->fb) {
 		DRM_DEBUG("No FB bound\n");
@@ -898,17 +900,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 		BUG();
 	}
 
-	mutex_lock(&dev->struct_mutex);
 	ret = i915_gem_object_pin(obj, alignment);
 	if (ret != 0) {
-		mutex_unlock(&dev->struct_mutex);
 		return ret;
 	}
 
 	ret = i915_gem_object_set_to_gtt_domain(obj, 1);
 	if (ret != 0) {
 		i915_gem_object_unpin(obj);
-		mutex_unlock(&dev->struct_mutex);
 		return ret;
 	}
 
@@ -944,7 +943,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 	default:
 		DRM_ERROR("Unknown color depth\n");
 		i915_gem_object_unpin(obj);
-		mutex_unlock(&dev->struct_mutex);
 		return -EINVAL;
 	}
 	if (IS_I965G(dev)) {
@@ -972,13 +970,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 		I915_READ(dspbase);
 	}
 
-	intel_wait_for_vblank(dev);
-
 	if (old_fb) {
 		intel_fb = to_intel_framebuffer(old_fb);
+		intel_wait_for_vblank(dev);
 		i915_gem_object_unpin(intel_fb->obj);
 	}
-	mutex_unlock(&dev->struct_mutex);
 
 	if (!dev->primary->master)
 		return 0;
@@ -2364,7 +2360,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 	I915_WRITE(dspcntr_reg, dspcntr);
 
 	/* Flush the plane changes */
+	mutex_lock(&dev->struct_mutex);
 	ret = intel_pipe_set_base(crtc, x, y, old_fb);
+	mutex_unlock(&dev->struct_mutex);
 
 	intel_update_watermarks(dev);
 
@@ -2840,6 +2838,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
 	.gamma_set = intel_crtc_gamma_set,
 	.set_config = drm_crtc_helper_set_config,
 	.destroy = intel_crtc_destroy,
+	.set_base = drm_crtc_helper_set_base,
 };
 
 
@@ -2852,7 +2851,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
 	if (intel_crtc == NULL)
 		return;
 
-	drm_crtc_init(dev, &intel_crtc->base, &intel_crtc_funcs);
+	drm_crtc_init(dev, &intel_crtc->base, pipe, &intel_crtc_funcs);
 
 	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
 	intel_crtc->pipe = pipe;
@@ -3071,9 +3070,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
 	return drm_gem_handle_create(file_priv, object, handle);
 }
 
+static void intel_user_framebuffer_unpin(struct drm_framebuffer *fb)
+{
+	struct intel_framebuffer *intel_fb;
+
+	intel_fb = to_intel_framebuffer(fb);
+	i915_gem_object_unpin(intel_fb->obj);
+}
+
 static const struct drm_framebuffer_funcs intel_fb_funcs = {
 	.destroy = intel_user_framebuffer_destroy,
 	.create_handle = intel_user_framebuffer_create_handle,
+	.unpin = intel_user_framebuffer_unpin
 };
 
 int intel_framebuffer_create(struct drm_device *dev,
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index c0080cc..501209d 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -535,7 +535,6 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = {
 	.dpms = atombios_crtc_dpms,
 	.mode_fixup = atombios_crtc_mode_fixup,
 	.mode_set = atombios_crtc_mode_set,
-	.mode_set_base = atombios_crtc_set_base,
 	.prepare = atombios_crtc_prepare,
 	.commit = atombios_crtc_commit,
 };
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 3efcf1a..372ba35 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
 	.gamma_set = radeon_crtc_gamma_set,
 	.set_config = drm_crtc_helper_set_config,
 	.destroy = radeon_crtc_destroy,
+	.set_base = radeon_crtc_set_base,
 };
 
 static void radeon_crtc_init(struct drm_device *dev, int index)
@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
 	if (radeon_crtc == NULL)
 		return;
 
-	drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs);
+	drm_crtc_init(dev, &radeon_crtc->base, index, &radeon_crtc_funcs);
 
 	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
 	radeon_crtc->crtc_id = index;
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 7cb50bd..1920323 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -686,6 +686,7 @@ struct drm_gem_open {
 #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
 #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
 #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
 
 /**
  * Device specific ioctls should only be in their respective headers
@@ -698,6 +699,30 @@ struct drm_gem_open {
 #define DRM_COMMAND_BASE                0x40
 #define DRM_COMMAND_END			0xA0
 
+/**
+ * Header for events written back to userspace on the drm fd.  The
+ * type defines the type of event, the length specifies the total
+ * length of the event (including the header), and user_data is
+ * typically a 64 bit value passed with the ioctl that triggered the
+ * event.  A read on the drm fd will always only return complete
+ * events, that is, if for example the read buffer is 100 bytes, and
+ * there are two 64 byte events pending, only one will be returned.
+ */
+struct drm_event {
+	__u32 type;
+	__u32 length;
+};
+
+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
+
+struct drm_event_page_flip {
+	struct drm_event base;
+	__u64 user_data;
+	__u32 tv_sec;
+	__u32 tv_usec;
+	__u32 frame;
+};
+
 /* typedef area */
 #ifndef __KERNEL__
 typedef struct drm_clip_rect drm_clip_rect_t;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 45b67d9..4ff43ab 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -402,6 +402,14 @@ struct drm_buf_entry {
 	struct drm_freelist freelist;
 };
 
+/* Event queued up for userspace to read */
+struct drm_pending_event {
+	struct drm_event *event;
+	struct list_head link;
+	struct drm_file *file_priv;
+	void (*destroy) (struct drm_pending_event *event);
+};
+
 /** File private data */
 struct drm_file {
 	int authenticated;
@@ -425,6 +433,9 @@ struct drm_file {
 	struct drm_master *master; /* master this node is currently associated with
 				      N.B. not always minor->master */
 	struct list_head fbs;
+
+	wait_queue_head_t event_wait;
+	struct list_head event_list;
 };
 
 /** Wait queue */
@@ -873,6 +884,16 @@ struct drm_minor {
 	struct drm_mode_group mode_group;
 };
 
+struct drm_pending_flip {
+	struct drm_pending_event pending_event;
+	struct drm_framebuffer *old_fb;
+	struct drm_crtc *crtc;
+	u32 frame;
+	int pipe;
+	struct list_head link;
+	struct drm_event_page_flip event;
+};
+
 /**
  * DRM device structure. This structure represent a complete card that
  * may contain multiple heads.
@@ -972,6 +993,13 @@ struct drm_device {
 
 	u32 max_vblank_count;           /**< size of vblank counter register */
 
+	struct work_struct flip_work;
+
+	/**
+	 * List of objects waiting on flip completion
+	 */
+	struct list_head flip_list;
+
 	/*@} */
 	cycles_t ctx_start;
 	cycles_t lck_start;
@@ -1108,6 +1136,8 @@ extern int drm_lastclose(struct drm_device *dev);
 extern int drm_open(struct inode *inode, struct file *filp);
 extern int drm_stub_open(struct inode *inode, struct file *filp);
 extern int drm_fasync(int fd, struct file *filp, int on);
+extern ssize_t drm_read(struct file *filp, char __user *buffer,
+			size_t count, loff_t *offset);
 extern int drm_release(struct inode *inode, struct file *filp);
 
 				/* Mapping support (drm_vm.h) */
@@ -1274,6 +1304,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
 extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
 extern int drm_modeset_ctl(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv);
+extern void drm_finish_pending_flip(struct drm_device *dev,
+				   struct drm_pending_flip *f, u32 frame);
 
 				/* AGP/GART support (drm_agpsupport.h) */
 extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 7300fb8..0b5dc47 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -238,6 +238,12 @@ struct drm_display_info {
 };
 
 struct drm_framebuffer_funcs {
+	/*
+	 * Unpin the old fb after setting a mode.  Must be called
+	 * after the old framebuffer is no longer visible, ie, after
+	 * the next vblank, typically.
+	 */
+	void (*unpin)(struct drm_framebuffer *fb);
 	void (*destroy)(struct drm_framebuffer *framebuffer);
 	int (*create_handle)(struct drm_framebuffer *fb,
 			     struct drm_file *file_priv,
@@ -288,6 +294,7 @@ struct drm_property {
 struct drm_crtc;
 struct drm_connector;
 struct drm_encoder;
+struct drm_pending_flip;
 
 /**
  * drm_crtc_funcs - control CRTCs for a given device
@@ -331,17 +338,29 @@ struct drm_crtc_funcs {
 	void (*destroy)(struct drm_crtc *crtc);
 
 	int (*set_config)(struct drm_mode_set *set);
+
+	/*
+	 * Move the crtc on the current fb to the given position.
+	 * This function is optional.  If old_fb is provided, the
+	 * function will wait for vblank and unpin it.  If old_fb is
+	 * NULL, nothing is unpinned and the caller must call
+	 * mode_unpin_fb to release the old framebuffer.
+	 */
+	int (*set_base)(struct drm_crtc *crtc, int x, int y,
+			struct drm_framebuffer *old_fb);
 };
 
 /**
  * drm_crtc - central CRTC control structure
  * @enabled: is this CRTC enabled?
+ * @pipe: pipe number (as seen by DRM vblank functions)
  * @x: x position on screen
  * @y: y position on screen
  * @desired_mode: new desired mode
  * @desired_x: desired x for desired_mode
  * @desired_y: desired y for desired_mode
  * @funcs: CRTC control functions
+ * @async_work: work queue for async set base calls
  *
  * Each CRTC may have one or more connectors associated with it.  This structure
  * allows the CRTC to be controlled.
@@ -359,6 +378,7 @@ struct drm_crtc {
 
 	struct drm_display_mode mode;
 
+	int pipe;
 	int x, y;
 	struct drm_display_mode *desired_mode;
 	int desired_x, desired_y;
@@ -368,6 +388,10 @@ struct drm_crtc {
 	uint32_t gamma_size;
 	uint16_t *gamma_store;
 
+	/* Allow async set_pipe_base calls for flipping */
+	struct work_struct async_flip;
+	struct drm_pending_flip *pending_flip;
+
 	/* if you are using the helper */
 	void *helper_private;
 };
@@ -589,6 +613,7 @@ struct drm_mode_config {
 
 extern void drm_crtc_init(struct drm_device *dev,
 			  struct drm_crtc *crtc,
+			  int pipe,
 			  const struct drm_crtc_funcs *funcs);
 extern void drm_crtc_cleanup(struct drm_crtc *crtc);
 
@@ -736,4 +761,6 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
 extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
 				    void *data, struct drm_file *file_priv);
 extern bool drm_detect_hdmi_monitor(struct edid *edid);
+extern int drm_mode_page_flip_ioctl(struct drm_device *dev, void *data,
+				    struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 6769ff6..dd10566 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -123,4 +123,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
 }
 
 extern int drm_helper_resume_force_mode(struct drm_device *dev);
+
+extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
+				    struct drm_framebuffer *old_fb);
+
 #endif
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index ae304cc..464b779 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -265,4 +265,20 @@ struct drm_mode_crtc_lut {
 	__u64 blue;
 };
 
+#define DRM_MODE_PAGE_FLIP_WAIT		(1<<0) /* block on previous page flip */
+#define DRM_MODE_PAGE_FLIP_FLAGS_MASK	(DRM_MODE_PAGE_FLIP_WAIT)
+
+struct drm_mode_page_flip {
+	/** Handle of new front buffer */
+	__u32 fb_id;
+	__u32 crtc_id;
+
+	/* 64 bit cookie returned to userspace in the page flip event. */
+	__u64 user_data;
+	/**
+	 * page flip flags (wait on flip only for now)
+	 */
+	__u32 flags;
+};
+
 #endif
-- 
1.6.3.3

diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c
--- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~	2009-07-24 19:38:36.000000000 -0400
+++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-07-26 18:06:06.000000000 -0400
@@ -1014,7 +1014,7 @@ nv04_crtc_create(struct drm_device *dev,
 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
 	nv_crtc->mode_set.num_connectors = 0;
 
-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
 
diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c
--- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~	2009-07-24 19:38:36.000000000 -0400
+++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-07-26 18:06:23.000000000 -0400
@@ -796,7 +796,7 @@ nv50_crtc_create(struct drm_device *dev,
 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
 	crtc->mode_set.num_connectors = 0;
 
-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
 

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    2 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  137 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  338 ++++----
 b/drivers/gpu/drm/radeon/radeon_drv.h    |    1 
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  980 ++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 20 files changed, 3364 insertions(+), 495 deletions(-)

--- NEW FILE drm-r600-kms.patch ---
>From 6599b4a047d80cd7b8715b5ad74e0735e6d4b941 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse at redhat.com>
Date: Fri, 24 Jul 2009 19:42:23 +0200
Subject: [PATCH] radeon: add basic KMS support for r6xx & r7xx chipset.

This only provide a kms drm fb device for this hw and allow X
to run with no acceleration.
---
 drivers/gpu/drm/radeon/Makefile        |    2 +-
 drivers/gpu/drm/radeon/atombios_crtc.c |    1 +
 drivers/gpu/drm/radeon/avivod.h        |   60 ++
 drivers/gpu/drm/radeon/r100.c          |   69 ++
 drivers/gpu/drm/radeon/r300.c          |    2 +-
 drivers/gpu/drm/radeon/r300.h          |   36 -
 drivers/gpu/drm/radeon/r600.c          | 1243 ++++++++++++++++++++++++++++++--
 drivers/gpu/drm/radeon/r600d.h         |  349 +++++++++
 drivers/gpu/drm/radeon/radeon.h        |   51 ++-
 drivers/gpu/drm/radeon/radeon_asic.h   |  137 ++++-
 drivers/gpu/drm/radeon/radeon_clocks.c |   10 +-
 drivers/gpu/drm/radeon/radeon_device.c |  338 +++++----
 drivers/gpu/drm/radeon/radeon_drv.h    |    1 +
 drivers/gpu/drm/radeon/radeon_ring.c   |   63 +--
 drivers/gpu/drm/radeon/radeon_share.h  |   66 ++
 drivers/gpu/drm/radeon/radeon_ttm.c    |    6 +-
 drivers/gpu/drm/radeon/rs400.c         |    2 +-
 drivers/gpu/drm/radeon/rs780.c         |  102 ---
 drivers/gpu/drm/radeon/rv770.c         |  980 +++++++++++++++++++++++--
 drivers/gpu/drm/radeon/rv770d.h        |  340 +++++++++
 20 files changed, 3364 insertions(+), 494 deletions(-)
 create mode 100644 drivers/gpu/drm/radeon/avivod.h
 delete mode 100644 drivers/gpu/drm/radeon/r300.h
 create mode 100644 drivers/gpu/drm/radeon/r600d.h
 delete mode 100644 drivers/gpu/drm/radeon/rs780.c
 create mode 100644 drivers/gpu/drm/radeon/rv770d.h

diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 013d380..7384cad 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -13,7 +13,7 @@ radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
 	radeon_encoders.o radeon_display.o radeon_cursor.o radeon_i2c.o \
 	radeon_clocks.o radeon_fb.o radeon_gem.o radeon_ring.o radeon_irq_kms.o \
 	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \
-	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rs780.o rv770.o \
+	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o \
 	radeon_test.o
 
 radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 74d034f..629d7c8 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -370,6 +370,7 @@ void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
 					pll_flags |= RADEON_PLL_USE_REF_DIV;
 			}
 			radeon_encoder = to_radeon_encoder(encoder);
+			break;
 		}
 	}
 
diff --git a/drivers/gpu/drm/radeon/avivod.h b/drivers/gpu/drm/radeon/avivod.h
new file mode 100644
index 0000000..d4e6e6e
--- /dev/null
+++ b/drivers/gpu/drm/radeon/avivod.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009 Advanced Micro Devices, Inc.
+ * Copyright 2009 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Authors: Dave Airlie
+ *          Alex Deucher
+ *          Jerome Glisse
+ */
+#ifndef AVIVOD_H
+#define AVIVOD_H
+
+
+#define	D1CRTC_CONTROL					0x6080
+#define		CRTC_EN						(1 << 0)
+#define	D1CRTC_UPDATE_LOCK				0x60E8
+#define	D1GRPH_PRIMARY_SURFACE_ADDRESS			0x6110
+#define	D1GRPH_SECONDARY_SURFACE_ADDRESS		0x6118
+
+#define	D2CRTC_CONTROL					0x6880
+#define	D2CRTC_UPDATE_LOCK				0x68E8
+#define	D2GRPH_PRIMARY_SURFACE_ADDRESS			0x6910
+#define	D2GRPH_SECONDARY_SURFACE_ADDRESS		0x6918
+
+#define	D1VGA_CONTROL					0x0330
+#define		DVGA_CONTROL_MODE_ENABLE			(1 << 0)
+#define		DVGA_CONTROL_TIMING_SELECT			(1 << 8)
+#define		DVGA_CONTROL_SYNC_POLARITY_SELECT		(1 << 9)
+#define		DVGA_CONTROL_OVERSCAN_TIMING_SELECT		(1 << 10)
+#define		DVGA_CONTROL_OVERSCAN_COLOR_EN			(1 << 16)
+#define		DVGA_CONTROL_ROTATE				(1 << 24)
+#define D2VGA_CONTROL					0x0338
+
+#define	VGA_HDP_CONTROL					0x328
+#define		VGA_MEM_PAGE_SELECT_EN				(1 << 0)
+#define		VGA_MEMORY_DISABLE				(1 << 4)
+#define		VGA_RBBM_LOCK_DISABLE				(1 << 8)
+#define		VGA_SOFT_RESET					(1 << 16)
+#define	VGA_MEMORY_BASE_ADDRESS				0x0310
+#define	VGA_RENDER_CONTROL				0x0300
+#define		VGA_VSTATUS_CNTL_MASK				0x00030000
+
+#endif
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f1ba8ff..59ef4f9 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -644,6 +644,12 @@ int r100_cp_reset(struct radeon_device *rdev)
 	return -1;
 }
 
+void r100_cp_commit(struct radeon_device *rdev)
+{
+	WREG32(RADEON_CP_RB_WPTR, rdev->cp.wptr);
+	(void)RREG32(RADEON_CP_RB_WPTR);
+}
+
 
 /*
  * CS functions
@@ -2278,3 +2284,66 @@ void r100_bandwidth_update(struct radeon_device *rdev)
 			  (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL));
 	}
 }
+
+void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
+{
+	radeon_ring_write(rdev, PACKET0(RADEON_CP_IB_BASE, 1));
+	radeon_ring_write(rdev, ib->gpu_addr);
+	radeon_ring_write(rdev, ib->length_dw);
+}
+
+int r100_ib_test(struct radeon_device *rdev)
+{
+	struct radeon_ib *ib;
+	uint32_t scratch;
+	uint32_t tmp = 0;
+	unsigned i;
+	int r;
+
+	r = radeon_scratch_get(rdev, &scratch);
+	if (r) {
+		DRM_ERROR("radeon: failed to get scratch reg (%d).\n", r);
+		return r;
+	}
+	WREG32(scratch, 0xCAFEDEAD);
+	r = radeon_ib_get(rdev, &ib);
+	if (r) {
+		return r;
+	}
+	ib->ptr[0] = PACKET0(scratch, 0);
+	ib->ptr[1] = 0xDEADBEEF;
+	ib->ptr[2] = PACKET2(0);
+	ib->ptr[3] = PACKET2(0);
+	ib->ptr[4] = PACKET2(0);
+	ib->ptr[5] = PACKET2(0);
+	ib->ptr[6] = PACKET2(0);
+	ib->ptr[7] = PACKET2(0);
+	ib->length_dw = 8;
+	r = radeon_ib_schedule(rdev, ib);
+	if (r) {
+		radeon_scratch_free(rdev, scratch);
+		radeon_ib_free(rdev, &ib);
+		return r;
+	}
+	r = radeon_fence_wait(ib->fence, false);
+	if (r) {
+		return r;
+	}
+	for (i = 0; i < rdev->usec_timeout; i++) {
+		tmp = RREG32(scratch);
+		if (tmp == 0xDEADBEEF) {
+			break;
+		}
+		DRM_UDELAY(1);
+	}
[...4102 lines suppressed...]
+#define	MC_VM_AGP_TOP					0x2028
+#define	MC_VM_AGP_BOT					0x202C
+#define	MC_VM_AGP_BASE					0x2030
+#define	MC_VM_FB_LOCATION				0x2024
+#define	MC_VM_MB_L1_TLB0_CNTL				0x2234
+#define	MC_VM_MB_L1_TLB1_CNTL				0x2238
+#define	MC_VM_MB_L1_TLB2_CNTL				0x223C
+#define	MC_VM_MB_L1_TLB3_CNTL				0x2240
+#define		ENABLE_L1_TLB					(1 << 0)
+#define		ENABLE_L1_FRAGMENT_PROCESSING			(1 << 1)
+#define		SYSTEM_ACCESS_MODE_PA_ONLY			(0 << 3)
+#define		SYSTEM_ACCESS_MODE_USE_SYS_MAP			(1 << 3)
+#define		SYSTEM_ACCESS_MODE_IN_SYS			(2 << 3)
+#define		SYSTEM_ACCESS_MODE_NOT_IN_SYS			(3 << 3)
+#define		SYSTEM_APERTURE_UNMAPPED_ACCESS_PASS_THRU	(0 << 5)
+#define		EFFECTIVE_L1_TLB_SIZE(x)			((x)<<15)
+#define		EFFECTIVE_L1_QUEUE_SIZE(x)			((x)<<18)
+#define	MC_VM_MD_L1_TLB0_CNTL				0x2654
+#define	MC_VM_MD_L1_TLB1_CNTL				0x2658
+#define	MC_VM_MD_L1_TLB2_CNTL				0x265C
+#define	MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR		0x203C
+#define	MC_VM_SYSTEM_APERTURE_HIGH_ADDR			0x2038
+#define	MC_VM_SYSTEM_APERTURE_LOW_ADDR			0x2034
+
+#define	PA_CL_ENHANCE					0x8A14
+#define		CLIP_VTX_REORDER_ENA				(1 << 0)
+#define		NUM_CLIP_SEQ(x)					((x) << 1)
+#define PA_SC_AA_CONFIG					0x28C04
+#define PA_SC_CLIPRECT_RULE				0x2820C
+#define	PA_SC_EDGERULE					0x28230
+#define	PA_SC_FIFO_SIZE					0x8BCC
+#define		SC_PRIM_FIFO_SIZE(x)				((x) << 0)
+#define		SC_HIZ_TILE_FIFO_SIZE(x)			((x) << 12)
+#define	PA_SC_FORCE_EOV_MAX_CNTS			0x8B24
+#define		FORCE_EOV_MAX_CLK_CNT(x)			((x)<<0)
+#define		FORCE_EOV_MAX_REZ_CNT(x)			((x)<<16)
+#define PA_SC_LINE_STIPPLE				0x28A0C
+#define	PA_SC_LINE_STIPPLE_STATE			0x8B10
+#define PA_SC_MODE_CNTL					0x28A4C
+#define	PA_SC_MULTI_CHIP_CNTL				0x8B20
+#define		SC_EARLYZ_TILE_FIFO_SIZE(x)			((x) << 20)
+
+#define	SCRATCH_REG0					0x8500
+#define	SCRATCH_REG1					0x8504
+#define	SCRATCH_REG2					0x8508
+#define	SCRATCH_REG3					0x850C
+#define	SCRATCH_REG4					0x8510
+#define	SCRATCH_REG5					0x8514
+#define	SCRATCH_REG6					0x8518
+#define	SCRATCH_REG7					0x851C
+#define	SCRATCH_UMSK					0x8540
+#define	SCRATCH_ADDR					0x8544
+
+#define	SMX_DC_CTL0					0xA020
+#define		USE_HASH_FUNCTION				(1 << 0)
+#define		CACHE_DEPTH(x)					((x) << 1)
+#define		FLUSH_ALL_ON_EVENT				(1 << 10)
+#define		STALL_ON_EVENT					(1 << 11)
+#define	SMX_EVENT_CTL					0xA02C
+#define		ES_FLUSH_CTL(x)					((x) << 0)
+#define		GS_FLUSH_CTL(x)					((x) << 3)
+#define		ACK_FLUSH_CTL(x)				((x) << 6)
+#define		SYNC_FLUSH_CTL					(1 << 8)
+
+#define	SPI_CONFIG_CNTL					0x9100
+#define		GPR_WRITE_PRIORITY(x)				((x) << 0)
+#define		DISABLE_INTERP_1				(1 << 5)
+#define	SPI_CONFIG_CNTL_1				0x913C
+#define		VTX_DONE_DELAY(x)				((x) << 0)
+#define		INTERP_ONE_PRIM_PER_ROW				(1 << 4)
+#define	SPI_INPUT_Z					0x286D8
+#define	SPI_PS_IN_CONTROL_0				0x286CC
+#define		NUM_INTERP(x)					((x)<<0)
+#define		POSITION_ENA					(1<<8)
+#define		POSITION_CENTROID				(1<<9)
+#define		POSITION_ADDR(x)				((x)<<10)
+#define		PARAM_GEN(x)					((x)<<15)
+#define		PARAM_GEN_ADDR(x)				((x)<<19)
+#define		BARYC_SAMPLE_CNTL(x)				((x)<<26)
+#define		PERSP_GRADIENT_ENA				(1<<28)
+#define		LINEAR_GRADIENT_ENA				(1<<29)
+#define		POSITION_SAMPLE					(1<<30)
+#define		BARYC_AT_SAMPLE_ENA				(1<<31)
+
+#define	SQ_CONFIG					0x8C00
+#define		VC_ENABLE					(1 << 0)
+#define		EXPORT_SRC_C					(1 << 1)
+#define		DX9_CONSTS					(1 << 2)
+#define		ALU_INST_PREFER_VECTOR				(1 << 3)
+#define		DX10_CLAMP					(1 << 4)
+#define		CLAUSE_SEQ_PRIO(x)				((x) << 8)
+#define		PS_PRIO(x)					((x) << 24)
+#define		VS_PRIO(x)					((x) << 26)
+#define		GS_PRIO(x)					((x) << 28)
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_0			0x8DB0
+#define		SIMDA_RING0(x)					((x)<<0)
+#define		SIMDA_RING1(x)					((x)<<8)
+#define		SIMDB_RING0(x)					((x)<<16)
+#define		SIMDB_RING1(x)					((x)<<24)
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_1			0x8DB4
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_2			0x8DB8
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_3			0x8DBC
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_4			0x8DC0
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_5			0x8DC4
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_6			0x8DC8
+#define	SQ_DYN_GPR_SIZE_SIMD_AB_7			0x8DCC
+#define		ES_PRIO(x)					((x) << 30)
+#define	SQ_GPR_RESOURCE_MGMT_1				0x8C04
+#define		NUM_PS_GPRS(x)					((x) << 0)
+#define		NUM_VS_GPRS(x)					((x) << 16)
+#define		DYN_GPR_ENABLE					(1 << 27)
+#define		NUM_CLAUSE_TEMP_GPRS(x)				((x) << 28)
+#define	SQ_GPR_RESOURCE_MGMT_2				0x8C08
+#define		NUM_GS_GPRS(x)					((x) << 0)
+#define		NUM_ES_GPRS(x)					((x) << 16)
+#define	SQ_MS_FIFO_SIZES				0x8CF0
+#define		CACHE_FIFO_SIZE(x)				((x) << 0)
+#define		FETCH_FIFO_HIWATER(x)				((x) << 8)
+#define		DONE_FIFO_HIWATER(x)				((x) << 16)
+#define		ALU_UPDATE_FIFO_HIWATER(x)			((x) << 24)
+#define	SQ_STACK_RESOURCE_MGMT_1			0x8C10
+#define		NUM_PS_STACK_ENTRIES(x)				((x) << 0)
+#define		NUM_VS_STACK_ENTRIES(x)				((x) << 16)
+#define	SQ_STACK_RESOURCE_MGMT_2			0x8C14
+#define		NUM_GS_STACK_ENTRIES(x)				((x) << 0)
+#define		NUM_ES_STACK_ENTRIES(x)				((x) << 16)
+#define	SQ_THREAD_RESOURCE_MGMT				0x8C0C
+#define		NUM_PS_THREADS(x)				((x) << 0)
+#define		NUM_VS_THREADS(x)				((x) << 8)
+#define		NUM_GS_THREADS(x)				((x) << 16)
+#define		NUM_ES_THREADS(x)				((x) << 24)
+
+#define	SX_DEBUG_1					0x9058
+#define		ENABLE_NEW_SMX_ADDRESS				(1 << 16)
+#define	SX_EXPORT_BUFFER_SIZES				0x900C
+#define		COLOR_BUFFER_SIZE(x)				((x) << 0)
+#define		POSITION_BUFFER_SIZE(x)				((x) << 8)
+#define		SMX_BUFFER_SIZE(x)				((x) << 16)
+#define	SX_MISC						0x28350
+
+#define	TA_CNTL_AUX					0x9508
+#define		DISABLE_CUBE_WRAP				(1 << 0)
+#define		DISABLE_CUBE_ANISO				(1 << 1)
+#define		SYNC_GRADIENT					(1 << 24)
+#define		SYNC_WALKER					(1 << 25)
+#define		SYNC_ALIGNER					(1 << 26)
+#define		BILINEAR_PRECISION_6_BIT			(0 << 31)
+#define		BILINEAR_PRECISION_8_BIT			(1 << 31)
+
+#define	TCP_CNTL					0x9610
+
+#define	VGT_CACHE_INVALIDATION				0x88C4
+#define		CACHE_INVALIDATION(x)				((x)<<0)
+#define			VC_ONLY						0
+#define			TC_ONLY						1
+#define			VC_AND_TC					2
+#define		AUTO_INVLD_EN(x)				((x) << 6)
+#define			NO_AUTO						0
+#define			ES_AUTO						1
+#define			GS_AUTO						2
+#define			ES_AND_GS_AUTO					3
+#define	VGT_ES_PER_GS					0x88CC
+#define	VGT_GS_PER_ES					0x88C8
+#define	VGT_GS_PER_VS					0x88E8
+#define	VGT_GS_VERTEX_REUSE				0x88D4
+#define	VGT_NUM_INSTANCES				0x8974
+#define	VGT_OUT_DEALLOC_CNTL				0x28C5C
+#define		DEALLOC_DIST_MASK				0x0000007F
+#define	VGT_STRMOUT_EN					0x28AB0
+#define	VGT_VERTEX_REUSE_BLOCK_CNTL			0x28C58
+#define		VTX_REUSE_DEPTH_MASK				0x000000FF
+
+#define VM_CONTEXT0_CNTL				0x1410
+#define		ENABLE_CONTEXT					(1 << 0)
+#define		PAGE_TABLE_DEPTH(x)				(((x) & 3) << 1)
+#define		RANGE_PROTECTION_FAULT_ENABLE_DEFAULT		(1 << 4)
+#define	VM_CONTEXT0_PAGE_TABLE_BASE_ADDR		0x153C
+#define	VM_CONTEXT0_PAGE_TABLE_END_ADDR			0x157C
+#define	VM_CONTEXT0_PAGE_TABLE_START_ADDR		0x155C
+#define VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR	0x1518
+#define VM_L2_CNTL					0x1400
+#define		ENABLE_L2_CACHE					(1 << 0)
+#define		ENABLE_L2_FRAGMENT_PROCESSING			(1 << 1)
+#define		ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE		(1 << 9)
+#define		EFFECTIVE_L2_QUEUE_SIZE(x)			(((x) & 7) << 14)
+#define VM_L2_CNTL2					0x1404
+#define		INVALIDATE_ALL_L1_TLBS				(1 << 0)
+#define		INVALIDATE_L2_CACHE				(1 << 1)
+#define VM_L2_CNTL3					0x1408
+#define		BANK_SELECT(x)					((x) << 0)
+#define		CACHE_UPDATE_MODE(x)				((x) << 6)
+#define	VM_L2_STATUS					0x140C
+#define		L2_BUSY						(1 << 0)
+
+#define	WAIT_UNTIL					0x8040
+
+#endif
-- 
1.6.2.5


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   |   23 +++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |    9 +++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    3 +++
 11 files changed, 120 insertions(+)

--- NEW FILE drm-vga-arb.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-05 10:15:15.000000000 +1000
@@ -38,6 +38,7 @@
 
 #include <linux/interrupt.h>	/* For task queue support */
 
+#include <linux/vgaarb.h>
 /**
  * Get interrupt from bus id.
  *
@@ -212,6 +213,26 @@ err:
 }
 EXPORT_SYMBOL(drm_vblank_init);
 
+static void drm_irq_vgaarb_nokms(void *cookie, bool state)
+{
+	struct drm_device *dev = cookie;
+
+	if (dev->driver->vgaarb_irq) {
+		dev->driver->vgaarb_irq(dev, state);
+		return;
+	}
+
+	if (!dev->irq_enabled)
+		return;
+
+	if (state)
+		dev->driver->irq_uninstall(dev);
+	else {
+		dev->driver->irq_preinstall(dev);
+		dev->driver->irq_postinstall(dev);
+	}
+}
+
 /**
  * Install IRQ handler.
  *
@@ -272,6 +293,9 @@ int drm_irq_install(struct drm_device *d
 		return ret;
 	}
 
+	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+		vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
+
 	/* After installing handler */
 	ret = dev->driver->irq_postinstall(dev);
 	if (ret < 0) {
@@ -320,6 +344,9 @@ int drm_irq_uninstall(struct drm_device 
 
 	DRM_DEBUG("irq=%d\n", dev->pdev->irq);
 
+	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+		vga_client_register(dev->pdev, NULL, NULL, NULL);
+
 	dev->driver->irq_uninstall(dev);
 
 	free_irq(dev->pdev->irq, dev);
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb	2009-08-05 07:03:48.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-05 10:15:15.000000000 +1000
@@ -33,6 +33,7 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
+#include <linux/vgaarb.h>
 #define I915_DRV	"i915_drv"
 
 /* Really want an OS-independent resettable timer.  Would like to have
@@ -984,6 +985,19 @@ static int i915_probe_agp(struct drm_dev
 	return 0;
 }
 
+/* true = enable decode, false = disable decoder */
+static unsigned int i915_vga_set_decode(void *cookie, bool state)
+{
+	struct drm_device *dev = cookie;
+
+	intel_modeset_vga_set_state(dev, state);
+	if (state)
+		return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
+		       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+	else
+		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+}
+
 static int i915_load_modeset_init(struct drm_device *dev,
 				  unsigned long prealloc_size,
 				  unsigned long agp_size)
@@ -1029,6 +1043,11 @@ static int i915_load_modeset_init(struct
 	if (ret)
 		DRM_INFO("failed to find VBIOS tables\n");
 
+	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
+	ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
+	if (ret)
+		goto destroy_ringbuffer;
+
 	ret = drm_irq_install(dev);
 	if (ret)
 		goto destroy_ringbuffer;
@@ -1278,6 +1297,7 @@ int i915_driver_unload(struct drm_device
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		drm_irq_uninstall(dev);
+		vga_client_register(dev->pdev, NULL, NULL, NULL);
 	}
 
 	if (dev->pdev->msi_enabled)
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-05 10:15:15.000000000 +1000
@@ -760,6 +760,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);
+extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 
 /**
  * Lock test for when it's just for synchronization of ring access.
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-05 10:15:15.000000000 +1000
@@ -30,6 +30,7 @@
  * fb aperture size and the amount of pre-reserved memory.
  */
 #define INTEL_GMCH_CTRL		0x52
+#define INTEL_GMCH_VGA_DISABLE  (1 << 1)
 #define INTEL_GMCH_ENABLED	0x4
 #define INTEL_GMCH_MEM_MASK	0x1
 #define INTEL_GMCH_MEM_64M	0x1
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-05 10:15:15.000000000 +1000
@@ -3871,3 +3871,26 @@ struct drm_encoder *intel_best_encoder(s
 
 	return &intel_output->enc;
 }
+
+/*
+ * set vga decode state - true == enable VGA decode
+ */
+int intel_modeset_vga_set_state(struct drm_device *dev, bool state)
+{
+	struct pci_dev *bridge_dev;
+	u16 gmch_ctrl;
+
+	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+	if (!bridge_dev) {
+		DRM_ERROR("Can't disable VGA, no bridge\n");
+		return -1;
+	}
+
+	pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
+	if (state)
+		gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE;
+	else
+		gmch_ctrl |= INTEL_GMCH_VGA_DISABLE;
+	pci_write_config_word(bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
+	return 0;
+}
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-05 10:15:15.000000000 +1000
@@ -161,4 +161,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 -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb	2009-08-05 10:14:23.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-05 10:15:15.000000000 +1000
@@ -1497,6 +1497,20 @@ void r100_vram_init_sizes(struct radeon_
 		rdev->mc.real_vram_size = rdev->mc.aper_size;
 }
 
+void r100_vga_set_state(struct radeon_device *rdev, bool state)
+{
+	uint32_t temp;
+
+	temp = RREG32(RADEON_CONFIG_CNTL);
+	if (state == false) {
+		temp &= ~(1<<8);
+		temp |= (1<<9);
+	} else {
+		temp &= ~(1<<9);
+	}
+	WREG32(RADEON_CONFIG_CNTL, temp);
+}
+
 void r100_vram_info(struct radeon_device *rdev)
 {
 	r100_vram_get_type(rdev);
diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-05 10:15:15.000000000 +1000
@@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_devi
 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);
@@ -84,6 +85,7 @@ static struct radeon_asic r100_asic = {
 	.init = &r100_init,
 	.errata = &r100_errata,
 	.vram_info = &r100_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &r100_gpu_reset,
 	.mc_init = &r100_mc_init,
 	.mc_fini = &r100_mc_fini,
@@ -147,6 +149,7 @@ static struct radeon_asic r300_asic = {
 	.init = &r300_init,
 	.errata = &r300_errata,
 	.vram_info = &r300_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &r300_gpu_reset,
 	.mc_init = &r300_mc_init,
 	.mc_fini = &r300_mc_fini,
@@ -190,6 +193,7 @@ static struct radeon_asic r420_asic = {
 	.init = &r300_init,
 	.errata = &r420_errata,
 	.vram_info = &r420_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &r300_gpu_reset,
 	.mc_init = &r420_mc_init,
 	.mc_fini = &r420_mc_fini,
@@ -240,6 +244,7 @@ static struct radeon_asic rs400_asic = {
 	.init = &r300_init,
 	.errata = &rs400_errata,
 	.vram_info = &rs400_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &r300_gpu_reset,
 	.mc_init = &rs400_mc_init,
 	.mc_fini = &rs400_mc_fini,
@@ -292,6 +297,7 @@ static struct radeon_asic rs600_asic = {
 	.init = &r300_init,
 	.errata = &rs600_errata,
 	.vram_info = &rs600_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &r300_gpu_reset,
 	.mc_init = &rs600_mc_init,
 	.mc_fini = &rs600_mc_fini,
@@ -337,6 +343,7 @@ static struct radeon_asic rs690_asic = {
 	.init = &r300_init,
 	.errata = &rs690_errata,
 	.vram_info = &rs690_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &r300_gpu_reset,
 	.mc_init = &rs690_mc_init,
 	.mc_fini = &rs690_mc_fini,
@@ -389,6 +396,7 @@ static struct radeon_asic rv515_asic = {
 	.init = &rv515_init,
 	.errata = &rv515_errata,
 	.vram_info = &rv515_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &rv515_gpu_reset,
 	.mc_init = &rv515_mc_init,
 	.mc_fini = &rv515_mc_fini,
@@ -432,6 +440,7 @@ static struct radeon_asic r520_asic = {
 	.init = &rv515_init,
 	.errata = &r520_errata,
 	.vram_info = &r520_vram_info,
+	.vga_set_state = &r100_vga_set_state,
 	.gpu_reset = &rv515_gpu_reset,
 	.mc_init = &r520_mc_init,
 	.mc_fini = &r520_mc_fini,
diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-05 10:15:29.000000000 +1000
@@ -29,6 +29,7 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/radeon_drm.h>
+#include <linux/vgaarb.h>
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "radeon_asic.h"
@@ -475,7 +476,18 @@ void radeon_combios_fini(struct radeon_d
 int radeon_modeset_init(struct radeon_device *rdev);
 void radeon_modeset_fini(struct radeon_device *rdev);
 
+/* if we get transitioned to only one device, tak VGA back */
+static unsigned int radeon_vga_set_decode(void *cookie, bool state)
+{
+	struct radeon_device *rdev = cookie;
 
+	radeon_vga_set_state(rdev, state);
+	if (state)
+		return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
+		       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+	else
+		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+}
 /*
  * Radeon device.
  */
@@ -566,6 +578,12 @@ int radeon_device_init(struct radeon_dev
 		/* Initialize surface registers */
 		radeon_surface_init(rdev);
 
+		/* if we have > 1 VGA cards, then disable the radeon VGA resources */
+		ret = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
+		if (ret) {
+			return -EINVAL;
+		}
+
 		/* TODO: disable VGA need to use VGA request */
 		/* BIOS*/
 		if (!radeon_get_bios(rdev)) {
@@ -700,6 +718,7 @@ void radeon_device_fini(struct radeon_de
 		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 -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-05 10:15:15.000000000 +1000
@@ -579,6 +579,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);
@@ -879,6 +880,7 @@ static inline void radeon_ring_write(str
 #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 -up linux-2.6.30.noarch/include/drm/drmP.h.arb linux-2.6.30.noarch/include/drm/drmP.h
--- linux-2.6.30.noarch/include/drm/drmP.h.arb	2009-08-05 10:14:24.000000000 +1000
+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-05 10:15:15.000000000 +1000
@@ -797,6 +797,9 @@ struct drm_driver {
 	int (*gem_init_object) (struct drm_gem_object *obj);
 	void (*gem_free_object) (struct drm_gem_object *obj);
 
+	/* vga arb irq handler */
+	void (*vgaarb_irq)(struct drm_device *dev, bool state);
+
 	/* Driver private ops for this object */
 	struct vm_operations_struct *gem_vm_ops;
 

hid-ignore-all-recent-imon-devices.patch:
 hid-core.c |   10 +++++-----
 hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

--- NEW FILE hid-ignore-all-recent-imon-devices.patch ---
[PATCH] hid: ignore all recent SoundGraph iMON devices

After some inspection of the Windows iMON driver, several additional
device IDs were added to the lirc_imon driver. At least a few of these
have been seen in the wild, and require manual quirking to keep the
usbhid driver from binding to them. Rather than list out every single
device, ignore the entire device ID range, 0x0034 - 0x0046. Some of
these may not advertise themselves as HID devices, but no harm done to
such devices anyway.

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 drivers/hid/hid-core.c |   10 +++++-----
 drivers/hid/hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5eb10c2..18bf803 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1623,11 +1623,6 @@ static const struct hid_device_id hid_ignore_list[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
@@ -1694,6 +1689,11 @@ static bool hid_ignore(struct hid_device *hdev)
 				hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)
 			return true;
 		break;
+	case USB_VENDOR_ID_SOUNDGRAPH:
+		if (hdev->product >= USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST &&
+		    hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST)
+			return true;
+		break;
 	}
 
 	if (hdev->type == HID_TYPE_USBMOUSE &&
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6301010..989a3ba 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -376,11 +376,8 @@
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
 
 #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST	0x0034
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST	0x0046
 
 #define USB_VENDOR_ID_SUN		0x0430
 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab

linux-2.6-alsa-improve-hda-powerdown.patch:
 hda_codec.c      |    9 +++++++--
 patch_sigmatel.c |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-alsa-improve-hda-powerdown.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Wed, 22 Jul 2009 10:39:24 +0000 (+0200)
Subject: ALSA: hda - Reduce click noise at power-saving
X-Git-Url: http://kernel.ubuntu.com/git?p=dtchen%2Fubuntu-karmic.git;a=commitdiff_plain;h=d6c571bdc08f1958f70c71eb11677066729e8505

ALSA: hda - Reduce click noise at power-saving

Add some tricks to reduce the click noise at powering down to D3
in the power saving mode on STAC/IDT codecs.
The key seems to be to reset PINs before the power-down, and some
delay before entering D3.  The needed delay is significantly long,
but I don't know why.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Daniel T Chen <seven.steps at gmail.com>
---

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 88480c0..4d72e50 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2356,9 +2356,14 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
 	hda_nid_t nid;
 	int i;
 
-	snd_hda_codec_write(codec, fg, 0, AC_VERB_SET_POWER_STATE,
+	/* this delay seems necessary to avoid click noise at power-down */
+	if (power_state == AC_PWRST_D3)
+		msleep(100);
+	snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE,
 			    power_state);
-	msleep(10); /* partial workaround for "azx_get_response timeout" */
+	/* partial workaround for "azx_get_response timeout" */
+	if (power_state == AC_PWRST_D0)
+		msleep(10);
 
 	nid = codec->start_nid;
 	for (i = 0; i < codec->num_nodes; i++, nid++) {
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index da7f9f6..3637b31 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4746,6 +4746,20 @@ static int stac92xx_hp_check_power_status(struct hda_codec *codec,
 static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
 {
 	struct sigmatel_spec *spec = codec->spec;
+	int i;
+	hda_nid_t nid;
+
+	/* reset each pin before powering down DAC/ADC to avoid click noise */
+	nid = codec->start_nid;
+	for (i = 0; i < codec->num_nodes; i++, nid++) {
+		unsigned int wcaps = get_wcaps(codec, nid);
+		unsigned int wid_type = (wcaps & AC_WCAP_TYPE) >>
+			AC_WCAP_TYPE_SHIFT;
+		if (wid_type == AC_WID_PIN)
+			snd_hda_codec_read(codec, nid, 0,
+				AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+	}
+
 	if (spec->eapd_mask)
 		stac_gpio_set(codec, spec->gpio_mask,
 				spec->gpio_dir, spec->gpio_data &

linux-2.6-bluetooth-autosuspend.diff:
 btusb.c |  185 +++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 143 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6-bluetooth-autosuspend.diff ---
commit 7ed6456e2717d641a287bf6a83c1bf80395d312c
Author: Matthew Garrett <mjg at redhat.com>
Date:   Sat Jul 18 23:19:10 2009 +0100

    Add support for bluetooth autosuspend

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e70c57e..2f4b4c6 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -145,6 +145,7 @@ static struct usb_device_id blacklist_table[] = {
 #define BTUSB_INTR_RUNNING	0
 #define BTUSB_BULK_RUNNING	1
 #define BTUSB_ISOC_RUNNING	2
+#define BTUSB_SUSPENDING	3
 
 struct btusb_data {
 	struct hci_dev       *hdev;
@@ -157,11 +158,13 @@ struct btusb_data {
 	unsigned long flags;
 
 	struct work_struct work;
+	struct work_struct waker;
 
 	struct usb_anchor tx_anchor;
 	struct usb_anchor intr_anchor;
 	struct usb_anchor bulk_anchor;
 	struct usb_anchor isoc_anchor;
+	struct usb_anchor deferred;
 
 	struct usb_endpoint_descriptor *intr_ep;
 	struct usb_endpoint_descriptor *bulk_tx_ep;
@@ -174,6 +177,7 @@ struct btusb_data {
 	unsigned int sco_num;
 	int isoc_altsetting;
 	int suspend_count;
+	int did_iso_resume:1;
 };
 
 static void btusb_intr_complete(struct urb *urb)
@@ -202,6 +206,10 @@ 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)
 
 	urb->transfer_flags |= URB_FREE_BUFFER;
 
+	usb_mark_last_busy(data->udev);
 	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;
+
 	usb_anchor_urb(urb, &data->isoc_anchor);
 
 	err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -490,6 +506,12 @@ 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;
 
@@ -517,9 +539,17 @@ failed:
 	return err;
 }
 
+static void btusb_stop_traffic(struct btusb_data *data)
+{
+	usb_kill_anchored_urbs(&data->intr_anchor);
+	usb_kill_anchored_urbs(&data->bulk_anchor);
+	usb_kill_anchored_urbs(&data->isoc_anchor);
+}
+
 static int btusb_close(struct hci_dev *hdev)
 {
 	struct btusb_data *data = hdev->driver_data;
+	int err;
 
 	BT_DBG("%s", hdev->name);
 
@@ -529,13 +559,15 @@ static int btusb_close(struct hci_dev *hdev)
 	cancel_work_sync(&data->work);
 
 	clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
-	usb_kill_anchored_urbs(&data->isoc_anchor);
-
 	clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-	usb_kill_anchored_urbs(&data->bulk_anchor);
-
 	clear_bit(BTUSB_INTR_RUNNING, &data->flags);
-	usb_kill_anchored_urbs(&data->intr_anchor);
+	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);
+	}
 
 	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);
 
@@ -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)
 		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) {
+		schedule_work(&data->waker);
+		err = 0;
+	} 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_free_urb(urb);
-
+	spin_unlock(&data->lock);
 	return err;
 }
 
@@ -742,9 +782,26 @@ static void btusb_work(struct work_struct *work)
 		usb_kill_anchored_urbs(&data->isoc_anchor);
 
 		__set_isoc_interface(hdev, 0);
+		if (data->did_iso_resume) {
+			data->did_iso_resume = 0;
+			usb_autopm_put_interface(data->isoc);
+		}
 	}
 }
 
+static void btusb_waker(struct work_struct *work)
+{
+	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);
+}
+
 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,
 	spin_lock_init(&data->lock);
 
 	INIT_WORK(&data->work, btusb_work);
+	INIT_WORK(&data->waker, btusb_waker);
 
 	init_usb_anchor(&data->tx_anchor);
 	init_usb_anchor(&data->intr_anchor);
 	init_usb_anchor(&data->bulk_anchor);
 	init_usb_anchor(&data->isoc_anchor);
+	init_usb_anchor(&data->deferred);
 
 	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;
 }
@@ -947,60 +1007,100 @@ 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__);
 
 	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);
+		return -EBUSY;
+	}
+
+	set_bit(BTUSB_SUSPENDING, &data->flags);
+	spin_unlock_irq(&data->lock);
 
+	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)
+{
+	struct urb *urb;
+	int err = 0;
 
-	return 0;
+	while ((urb = usb_get_from_anchor(&data->tx_anchor))) {
+		err = usb_submit_urb(urb, GFP_ATOMIC);
+		if (err < 0)
+			break;
+	}
+
+	usb_scuttle_anchored_urbs(&data->tx_anchor);
+	return err;
 }
 
+
 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;
 
 	if (--data->suspend_count)
 		return 0;
 
-	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);
-			return err;
+		if (ret < 0) {
+			clear_bit(HCI_RUNNING, &hdev->flags);
+			return ret;
 		}
+
+		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) {
 			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;
+			}
+		}
 	}
 
-	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);
+		}
 	}
 
+	schedule_work(&data->work);
 	return 0;
 }
 
@@ -1011,6 +1111,7 @@ static struct usb_driver btusb_driver = {
 	.suspend	= btusb_suspend,
 	.resume		= btusb_resume,
 	.id_table	= btusb_table,
+	.supports_autosuspend = 1,
 };
 
 static int __init btusb_init(void)

linux-2.6-defaults-aspm.patch:
 aspm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-aspm.patch ---
diff -up linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg linux-2.6.30.noarch/drivers/pci/pcie/aspm.c
--- linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg	2009-07-16 22:01:11.000000000 +0100
+++ linux-2.6.30.noarch/drivers/pci/pcie/aspm.c	2009-07-16 22:01:30.000000000 +0100
@@ -65,7 +65,7 @@ static LIST_HEAD(link_list);
 #define POLICY_DEFAULT 0	/* BIOS default setting */
 #define POLICY_PERFORMANCE 1	/* high performance */
 #define POLICY_POWERSAVE 2	/* high power saving */
-static int aspm_policy;
+static int aspm_policy = POLICY_POWERSAVE;
 static const char *policy_str[] = {
 	[POLICY_DEFAULT] = "default",
 	[POLICY_PERFORMANCE] = "performance",

linux-2.6-dell-laptop-rfkill-fix.patch:
 b/drivers/input/input.c              |   91 +++++++++++++++++++++++++++----
 b/drivers/platform/x86/dell-laptop.c |  100 +++++++++++++++++++++++++++++++++++
 b/include/linux/input.h              |    5 +
 drivers/platform/x86/dell-laptop.c   |    5 -
 4 files changed, 185 insertions(+), 16 deletions(-)

--- NEW FILE linux-2.6-dell-laptop-rfkill-fix.patch ---
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 7c237e6..80f1e48 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -88,19 +88,26 @@ static int input_defuzz_abs_event(int value, int old_val, int fuzz)
  */
 static void input_pass_event(struct input_dev *dev,
 			     unsigned int type, unsigned int code, int value)
-{
-	struct input_handle *handle;
+
+{	struct input_handle *handle;
 
 	rcu_read_lock();
 
 	handle = rcu_dereference(dev->grab);
-	if (handle)
+	if (handle) {
 		handle->handler->event(handle, type, code, value);
-	else
-		list_for_each_entry_rcu(handle, &dev->h_list, d_node)
-			if (handle->open)
-				handle->handler->event(handle,
-							type, code, value);
+		goto out;
+	}
+
+	handle = rcu_dereference(dev->filter);
+	if (handle && handle->handler->filter(handle, type, code, value))
+		goto out;
+
+	list_for_each_entry_rcu(handle, &dev->h_list, d_node)
+		if (handle->open)
+			handle->handler->event(handle,
+					       type, code, value);
+out:
 	rcu_read_unlock();
 }
 
@@ -375,12 +382,15 @@ int input_grab_device(struct input_handle *handle)
 }
 EXPORT_SYMBOL(input_grab_device);
 
-static void __input_release_device(struct input_handle *handle)
+static void __input_release_device(struct input_handle *handle, bool filter)
 {
 	struct input_dev *dev = handle->dev;
 
-	if (dev->grab == handle) {
-		rcu_assign_pointer(dev->grab, NULL);
+	if (handle == (filter ? dev->filter : dev->grab)) {
+		if (filter)
+			rcu_assign_pointer(dev->filter, NULL);
+		else
+			rcu_assign_pointer(dev->grab, NULL);
 		/* Make sure input_pass_event() notices that grab is gone */
 		synchronize_rcu();
 
@@ -404,12 +414,65 @@ void input_release_device(struct input_handle *handle)
 	struct input_dev *dev = handle->dev;
 
 	mutex_lock(&dev->mutex);
-	__input_release_device(handle);
+	__input_release_device(handle, false);
 	mutex_unlock(&dev->mutex);
 }
 EXPORT_SYMBOL(input_release_device);
 
 /**
+ * input_filter_device - allow input events to be filtered from higher layers
+ * @handle: input handle that wants to filter the device
+ *
+ * When a device is filtered by an input handle all events generated by
+ * the device are to this handle. If the filter function returns true then
+ * the event is discarded rather than being passed to any other input handles,
+ * otherwise it is passed to them as normal. Grabs will be handled before
+ * filters, so a grabbed device will not deliver events to a filter function.
+ */
+int input_filter_device(struct input_handle *handle)
+{
+	struct input_dev *dev = handle->dev;
+	int retval;
+
+	retval = mutex_lock_interruptible(&dev->mutex);
+	if (retval)
+		return retval;
+
+	if (dev->filter) {
+		retval = -EBUSY;
+		goto out;
+	}
+
+	rcu_assign_pointer(dev->filter, handle);
+	synchronize_rcu();
+
+ out:
+	mutex_unlock(&dev->mutex);
+	return retval;
+}
+EXPORT_SYMBOL(input_filter_device);
+
+/**
+ * input_unfilter_device - removes a filter from a device
+ * @handle: input handle that owns the device
+ *
+ * Removes the filter from a device so that other input handles can
+ * start receiving unfiltered input events. Upon release all handlers
+ * attached to the device have their start() method called so they
+ * have a change to synchronize device state with the rest of the
+ * system.
+ */
+void input_unfilter_device(struct input_handle *handle)
+{
+	struct input_dev *dev = handle->dev;
+
+	mutex_lock(&dev->mutex);
+	__input_release_device(handle, true);
+	mutex_unlock(&dev->mutex);
+}
+EXPORT_SYMBOL(input_unfilter_device);
+
+/**
  * input_open_device - open input device
  * @handle: handle through which device is being accessed
  *
@@ -482,7 +545,9 @@ void input_close_device(struct input_handle *handle)
 
 	mutex_lock(&dev->mutex);
 
-	__input_release_device(handle);
+	/* Release both grabs and filters */
+	__input_release_device(handle, false);
+	__input_release_device(handle, true);
 
 	if (!--dev->users && dev->close)
 		dev->close(dev);
diff --git a/include/linux/input.h b/include/linux/input.h
index 8b3bc3e..e28f116 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1118,6 +1118,7 @@ struct input_dev {
 	int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
 
 	struct input_handle *grab;
+	struct input_handle *filter;
 
 	spinlock_t event_lock;
 	struct mutex mutex;
@@ -1218,6 +1219,7 @@ struct input_handler {
 	void *private;
 
 	void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
+	bool (*filter)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
 	int (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);
 	void (*disconnect)(struct input_handle *handle);
 	void (*start)(struct input_handle *handle);
@@ -1295,6 +1297,9 @@ void input_unregister_handle(struct input_handle *);
 int input_grab_device(struct input_handle *);
 void input_release_device(struct input_handle *);
 
+int input_filter_device(struct input_handle *);
+void input_unfilter_device(struct input_handle *);
+
 int input_open_device(struct input_handle *);
 void input_close_device(struct input_handle *);
 
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 74909c4..71a4149 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -22,6 +22,7 @@
 #include <linux/rfkill.h>
 #include <linux/power_supply.h>
 #include <linux/acpi.h>
+#include <linux/input.h>
 #include "../../firmware/dcdbas.h"
 
 #define BRIGHTNESS_TOKEN 0x7d
@@ -206,6 +207,16 @@ static const struct rfkill_ops dell_rfkill_ops = {
 	.query = dell_rfkill_query,
 };
 
+static void dell_rfkill_update(void)
+{
+	if (wifi_rfkill)
+		dell_rfkill_query(wifi_rfkill, (void *)1);
+	if (bluetooth_rfkill)
+		dell_rfkill_query(bluetooth_rfkill, (void *)2);
+	if (wwan_rfkill)
+		dell_rfkill_query(wwan_rfkill, (void *)3);
+}
+
 static int dell_setup_rfkill(void)
 {
 	struct calling_interface_buffer buffer;
@@ -310,6 +321,90 @@ static struct backlight_ops dell_ops = {
 	.update_status  = dell_send_intensity,
 };
 
+static const struct input_device_id dell_input_ids[] = {
+	{
+		.bustype = 0x11,
+		.vendor = 0x01,
+		.product = 0x01,
+		.version = 0xab41,
+		.flags = INPUT_DEVICE_ID_MATCH_BUS |
+			 INPUT_DEVICE_ID_MATCH_VENDOR |
+			 INPUT_DEVICE_ID_MATCH_PRODUCT |
+			 INPUT_DEVICE_ID_MATCH_VERSION
+	},
+	{ },
+};
+
+static bool dell_input_filter(struct input_handle *handle, unsigned int type,
+			     unsigned int code, int value)
+{
+	if (type == EV_KEY && code == KEY_WLAN && value == 1) {
+		dell_rfkill_update();
+		return 1;
+	}
+
+	return 0;
+}
+
+static void dell_input_event(struct input_handle *handle, unsigned int type,
+			     unsigned int code, int value)
+{
+}
+
+static int dell_input_connect(struct input_handler *handler,
+			      struct input_dev *dev,
+			      const struct input_device_id *id)
+{
+	struct input_handle *handle;
+	int error;
+
+	handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
+	if (!handle)
+		return -ENOMEM;
+
+	handle->dev = dev;
+	handle->handler = handler;
+	handle->name = "dell-laptop";
+
+	error = input_register_handle(handle);
+	if (error)
+		goto err_free_handle;
+
+	error = input_open_device(handle);
+	if (error)
+		goto err_unregister_handle;
+
+	error = input_filter_device(handle);
+	if (error)
+		goto err_close_handle;
+
+	return 0;
+
+err_close_handle:
+	input_close_device(handle);
+err_unregister_handle:
+	input_unregister_handle(handle);
+err_free_handle:
+	kfree(handle);
+	return error;
+}
+
+static void dell_input_disconnect(struct input_handle *handle)
+{
+	input_close_device(handle);
+	input_unregister_handle(handle);
+	kfree(handle);
+}
+
+static struct input_handler dell_input_handler = {
+	.name = "dell-laptop",
+	.filter = dell_input_filter,
+	.event = dell_input_event,
+	.connect = dell_input_connect,
+	.disconnect = dell_input_disconnect,
+	.id_table = dell_input_ids,
+};
+
 static int __init dell_init(void)
 {
 	struct calling_interface_buffer buffer;
@@ -333,6 +428,10 @@ static int __init dell_init(void)
 		goto out;
 	}
 
+	if (input_register_handler(&dell_input_handler))
+		printk(KERN_INFO
+		       "dell-laptop: Could not register input filter\n");
+
 #ifdef CONFIG_ACPI
 	/* In the event of an ACPI backlight being available, don't
 	 * register the platform controller.
@@ -388,6 +487,7 @@ static void __exit dell_exit(void)
 		rfkill_unregister(bluetooth_rfkill);
 	if (wwan_rfkill)
 		rfkill_unregister(wwan_rfkill);
+	input_unregister_handler(&dell_input_handler);
 }
 
 module_init(dell_init);
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 71a4149..e559fa1 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -198,8 +198,8 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
 	dell_send_request(&buffer, 17, 11);
 	status = buffer.output[1];
 
-	if (status & BIT(bit))
-		rfkill_set_hw_state(rfkill, !!(status & BIT(16)));
+	rfkill_set_sw_state(rfkill, !!(status & BIT(bit)));
+	rfkill_set_hw_state(rfkill, !(status & BIT(16)));
 }
 
 static const struct rfkill_ops dell_rfkill_ops = {
-- 
1.6.3.3


linux-2.6-driver-level-usb-autosuspend.diff:
 drivers/usb/core/driver.c |   15 +++++++++++++++
 include/linux/usb.h       |    4 ++++
 2 files changed, 19 insertions(+)

--- NEW FILE linux-2.6-driver-level-usb-autosuspend.diff ---
commit 0f592e33934bf6108e33e34f00b425f98ee833ef
Author: Matthew Garrett <mjg at redhat.com>
Date:   Wed Jul 8 19:04:23 2009 +0100

    usb: Allow drivers to enable USB autosuspend on a per-device basis
    
    USB autosuspend is currently only enabled by default for hubs. On other
    hardware the decision is made by userspace. This is unnecessary in cases
    where we know that the hardware supports autosuspend, so this patch adds
    a function to allow drivers to enable it at probe time.
    
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 69e5773..6e81caa 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1560,6 +1560,21 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
 EXPORT_SYMBOL_GPL(usb_autopm_put_interface_async);
 
 /**
+ * usb_device_autosuspend_enable - enable autosuspend on a device
+ * @udev: the usb_device to be autosuspended
+ *
+ * This routine should be called by an interface driver when it knows that
+ * the device in question supports USB autosuspend.
+ *
+ */
+void usb_device_autosuspend_enable(struct usb_device *udev)
+{
+	udev->autosuspend_disabled = 0;
+	udev->autoresume_disabled = 0;
+}
+EXPORT_SYMBOL_GPL(usb_device_autosuspend_enable);
+
+/**
  * usb_autopm_get_interface - increment a USB interface's PM-usage counter
  * @intf: the usb_interface whose counter should be incremented
  *
diff --git a/include/linux/usb.h b/include/linux/usb.h
index b1e3c2f..61bddbe 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -543,6 +543,7 @@ extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
 
 /* USB autosuspend and autoresume */
 #ifdef CONFIG_USB_SUSPEND
+extern void usb_device_autosuspend_enable(struct usb_device *udev);
 extern int usb_autopm_set_interface(struct usb_interface *intf);
 extern int usb_autopm_get_interface(struct usb_interface *intf);
 extern void usb_autopm_put_interface(struct usb_interface *intf);
@@ -568,6 +569,9 @@ static inline void usb_mark_last_busy(struct usb_device *udev)
 
 #else
 
+static inline void usb_device_autosuspend_enable(struct usb_device *udev)
+{ }
+
 static inline int usb_autopm_set_interface(struct usb_interface *intf)
 { return 0; }
 

linux-2.6-fix-usb-serial-autosuspend.diff:
 usb-serial.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-fix-usb-serial-autosuspend.diff ---
commit 3b8e1210f0a558145ba87eddb20f7b104676d6f6
Author: Oliber Neukum <oliver at neukum.org>
Date:   Sat Jul 18 07:19:04 2009 +0200

    usb: fix counter logic in opening serial converters
    
    the usage counter must be increased only after autoresumption

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 99188c9..3d1a756 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -216,16 +216,15 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
 		goto bailout_port_put;
 	}
 
-	++port->port.count;
-
 	/* set up our port structure making the tty driver
 	 * remember our port object, and us it */
 	tty->driver_data = port;
 	tty_port_tty_set(&port->port, tty);
 
 	/* If the console is attached, the device is already open */
-	if (port->port.count == 1 && !port->console) {
+	if (!port->port.count && !port->console) {
 		first = 1;
+
 		/* lock this module before we call it
 		 * this may fail, which means we must bail out,
 		 * safe because we are called with BKL held */
@@ -242,6 +241,8 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
 		if (retval)
 			goto bailout_module_put;
 
+		++port->port.count;
+
 		/* only call the device specific open if this
 		 * is the first time the port is opened */
 		retval = serial->type->open(tty, port, filp);
@@ -249,6 +250,8 @@ static int serial_open (struct tty_struct *tty, struct file *filp)
 			goto bailout_interface_put;
 		mutex_unlock(&serial->disc_mutex);
 		set_bit(ASYNCB_INITIALIZED, &port->port.flags);
+	} else {
+		++port->port.count;
 	}
 	mutex_unlock(&port->mutex);
 	/* Now do the correct tty layer semantics */

linux-2.6-ksm-kvm.patch:
 arch/x86/include/asm/kvm_host.h |    1 
 arch/x86/kvm/mmu.c              |   89 ++++++++++++++++++++++++++++++++--------
 arch/x86/kvm/paging_tmpl.h      |   15 +++++-
 virt/kvm/kvm_main.c             |   14 ++++++
 4 files changed, 100 insertions(+), 19 deletions(-)

--- NEW FILE linux-2.6-ksm-kvm.patch ---
When using mmu notifiers, we are allowed to remove the page count
reference tooken by get_user_pages to a specific page that is mapped
inside the shadow page tables.

This is needed so we can balance the pagecount against mapcount
checking.

(Right now kvm increase the pagecount and does not increase the
mapcount when mapping page into shadow page table entry,
so when comparing pagecount against mapcount, you have no
reliable result.)

add SPTE_HOST_WRITEABLE flag notify that the host physical page we are
pointing to from the spte is write protected, and therefore we cant
change its access to be write unless we run get_user_pages(write = 1).

(this is needed for change_pte support in kvm)

support for change_pte mmu notifiers is needed for kvm if it want ksm to
directly map pages into its shadow page tables.

Signed-off-by: Izik Eidus <ieidus at redhat.com>
Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
---
--- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-07-23 14:58:56.000000000 -0500
+++ linux-2.6.30.x86_64-ksm/arch/x86/include/asm/kvm_host.h	2009-07-23 15:00:04.000000000 -0500
@@ -796,5 +796,6 @@ asmlinkage void kvm_handle_fault_on_rebo
 int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
 int kvm_age_hva(struct kvm *kvm, unsigned long hva);
 int cpuid_maxphyaddr(struct kvm_vcpu *vcpu);
+void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
 
 #endif /* _ASM_X86_KVM_HOST_H */
--- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-07-23 14:58:56.000000000 -0500
+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/mmu.c	2009-07-23 15:00:04.000000000 -0500
@@ -139,6 +139,8 @@ module_param(oos_shadow, bool, 0644);
 #define ACC_USER_MASK    PT_USER_MASK
 #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
 
+#define SPTE_HOST_WRITEABLE (1ULL << PT_FIRST_AVAIL_BITS_SHIFT)
+
 #define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)
 
 struct kvm_rmap_desc {
@@ -254,6 +256,11 @@ static pfn_t spte_to_pfn(u64 pte)
 	return (pte & PT64_BASE_ADDR_MASK) >> PAGE_SHIFT;
 }
 
+static pte_t ptep_val(pte_t *ptep)
+{
+	return *ptep;
+}
+
 static gfn_t pse36_gfn_delta(u32 gpte)
 {
 	int shift = 32 - PT32_DIR_PSE36_SHIFT - PAGE_SHIFT;
@@ -566,9 +573,7 @@ static void rmap_remove(struct kvm *kvm,
 	if (*spte & shadow_accessed_mask)
 		kvm_set_pfn_accessed(pfn);
 	if (is_writeble_pte(*spte))
-		kvm_release_pfn_dirty(pfn);
-	else
-		kvm_release_pfn_clean(pfn);
+		kvm_set_pfn_dirty(pfn);
 	rmapp = gfn_to_rmap(kvm, sp->gfns[spte - sp->spt], is_large_pte(*spte));
 	if (!*rmapp) {
 		printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte);
@@ -677,7 +682,8 @@ static int rmap_write_protect(struct kvm
 	return write_protected;
 }
 
-static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp)
+static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
+			   unsigned long data)
 {
 	u64 *spte;
 	int need_tlb_flush = 0;
@@ -692,8 +698,48 @@ static int kvm_unmap_rmapp(struct kvm *k
 	return need_tlb_flush;
 }
 
+static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,
+			     unsigned long data)
+{
+	int need_flush = 0;
+	u64 *spte, new_spte;
+	pte_t *ptep = (pte_t *)data;
+	pfn_t new_pfn;
+
+	new_pfn = pte_pfn(ptep_val(ptep));
+	spte = rmap_next(kvm, rmapp, NULL);
+	while (spte) {
+		BUG_ON(!is_shadow_present_pte(*spte));
+		rmap_printk("kvm_set_pte_rmapp: spte %p %llx\n", spte, *spte);
+		need_flush = 1;
+		if (pte_write(ptep_val(ptep))) {
+			rmap_remove(kvm, spte);
+			set_shadow_pte(spte, shadow_trap_nonpresent_pte);
+			spte = rmap_next(kvm, rmapp, NULL);
+		} else {
+			new_spte = *spte &~ (PT64_BASE_ADDR_MASK);
+			new_spte |= new_pfn << PAGE_SHIFT;
+
+			if (!pte_write(ptep_val(ptep))) {
+				new_spte &= ~PT_WRITABLE_MASK;
+				new_spte &= ~SPTE_HOST_WRITEABLE;
+				if (is_writeble_pte(*spte))
+					kvm_set_pfn_dirty(spte_to_pfn(*spte));
+			}
+			set_shadow_pte(spte, new_spte);
+			spte = rmap_next(kvm, rmapp, spte);
+		}
+	}
+	if (need_flush)
+		kvm_flush_remote_tlbs(kvm);
+
+	return 0;
+}
+
 static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,
-			  int (*handler)(struct kvm *kvm, unsigned long *rmapp))
+			  unsigned long data,
+			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,
+					 unsigned long data))
 {
 	int i;
 	int retval = 0;
@@ -714,11 +760,13 @@ static int kvm_handle_hva(struct kvm *kv
 		end = start + (memslot->npages << PAGE_SHIFT);
 		if (hva >= start && hva < end) {
 			gfn_t gfn_offset = (hva - start) >> PAGE_SHIFT;
-			retval |= handler(kvm, &memslot->rmap[gfn_offset]);
+			retval |= handler(kvm, &memslot->rmap[gfn_offset],
+					  data);
 			retval |= handler(kvm,
 					  &memslot->lpage_info[
 						  gfn_offset /
-						  KVM_PAGES_PER_HPAGE].rmap_pde);
+						  KVM_PAGES_PER_HPAGE].rmap_pde,
+						  data);
 		}
 	}
 
@@ -727,10 +775,16 @@ static int kvm_handle_hva(struct kvm *kv
 
 int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
 {
-	return kvm_handle_hva(kvm, hva, kvm_unmap_rmapp);
+	return kvm_handle_hva(kvm, hva, 0, kvm_unmap_rmapp);
+}
+
+void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)
+{
+	kvm_handle_hva(kvm, hva, (unsigned long)&pte, kvm_set_pte_rmapp);
 }
 
-static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp)
+static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,
+			 unsigned long data)
 {
 	u64 *spte;
 	int young = 0;
@@ -756,7 +810,7 @@ static int kvm_age_rmapp(struct kvm *kvm
 
 int kvm_age_hva(struct kvm *kvm, unsigned long hva)
 {
-	return kvm_handle_hva(kvm, hva, kvm_age_rmapp);
+	return kvm_handle_hva(kvm, hva, 0, kvm_age_rmapp);
 }
 
 #ifdef MMU_DEBUG
@@ -1665,7 +1719,7 @@ static int set_spte(struct kvm_vcpu *vcp
 		    unsigned pte_access, int user_fault,
 		    int write_fault, int dirty, int largepage,
 		    gfn_t gfn, pfn_t pfn, bool speculative,
-		    bool can_unsync)
+		    bool can_unsync, bool reset_host_protection)
 {
 	u64 spte;
 	int ret = 0;
@@ -1723,6 +1777,8 @@ static int set_spte(struct kvm_vcpu *vcp
 				spte &= ~PT_WRITABLE_MASK;
 		}
 	}
+	if (reset_host_protection)
+		spte |= SPTE_HOST_WRITEABLE;
 
 	if (pte_access & ACC_WRITE_MASK)
 		mark_page_dirty(vcpu->kvm, gfn);
@@ -1736,7 +1792,8 @@ static void mmu_set_spte(struct kvm_vcpu
 			 unsigned pt_access, unsigned pte_access,
 			 int user_fault, int write_fault, int dirty,
 			 int *ptwrite, int largepage, gfn_t gfn,
-			 pfn_t pfn, bool speculative)
+			 pfn_t pfn, bool speculative,
+             bool reset_host_protection)
 {
 	int was_rmapped = 0;
 	int was_writeble = is_writeble_pte(*shadow_pte);
@@ -1765,7 +1822,8 @@ static void mmu_set_spte(struct kvm_vcpu
 			was_rmapped = 1;
 	}
 	if (set_spte(vcpu, shadow_pte, pte_access, user_fault, write_fault,
-		      dirty, largepage, gfn, pfn, speculative, true)) {
+		      dirty, largepage, gfn, pfn, speculative, true,
+              reset_host_protection)) {
 		if (write_fault)
 			*ptwrite = 1;
 		kvm_x86_ops->tlb_flush(vcpu);
@@ -1782,8 +1840,7 @@ static void mmu_set_spte(struct kvm_vcpu
 	page_header_update_slot(vcpu->kvm, shadow_pte, gfn);
 	if (!was_rmapped) {
 		rmap_add(vcpu, shadow_pte, gfn, largepage);
-		if (!is_rmap_pte(*shadow_pte))
-			kvm_release_pfn_clean(pfn);
+		kvm_release_pfn_clean(pfn);
 	} else {
 		if (was_writeble)
 			kvm_release_pfn_dirty(pfn);
@@ -1813,7 +1870,7 @@ static int __direct_map(struct kvm_vcpu 
 		    || (largepage && iterator.level == PT_DIRECTORY_LEVEL)) {
 			mmu_set_spte(vcpu, iterator.sptep, ACC_ALL, ACC_ALL,
 				     0, write, 1, &pt_write,
-				     largepage, gfn, pfn, false);
+				     largepage, gfn, pfn, false, true);
 			++vcpu->stat.pf_fixed;
 			break;
 		}
--- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-07-23 14:58:56.000000000 -0500
+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/paging_tmpl.h	2009-07-23 15:01:49.000000000 -0500
@@ -266,9 +266,13 @@ static void FNAME(update_pte)(struct kvm
 	if (mmu_notifier_retry(vcpu, vcpu->arch.update_pte.mmu_seq))
 		return;
 	kvm_get_pfn(pfn);
+    /*
+     * we call mmu_set_spte() with reset_host_protection = true beacuse that
+     * vcpu->arch.update_pte.pfn was fetched from get_user_pages(write = 1).
+     */ 
 	mmu_set_spte(vcpu, spte, page->role.access, pte_access, 0, 0,
 		     gpte & PT_DIRTY_MASK, NULL, largepage,
-		     gpte_to_gfn(gpte), pfn, true);
+		     gpte_to_gfn(gpte), pfn, true, true);
 }
 
 /*
@@ -302,7 +306,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu
 				     user_fault, write_fault,
 				     gw->ptes[gw->level-1] & PT_DIRTY_MASK,
 				     ptwrite, largepage,
-				     gw->gfn, pfn, false);
+				     gw->gfn, pfn, false, true);
 			break;
 		}
 
@@ -552,6 +556,7 @@ static void FNAME(prefetch_page)(struct 
 static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
 {
 	int i, offset, nr_present;
+        bool reset_host_protection = 1;
 
 	offset = nr_present = 0;
 
@@ -589,9 +594,13 @@ static int FNAME(sync_page)(struct kvm_v
 
 		nr_present++;
 		pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte);
+        if (!(sp->spt[i] & SPTE_HOST_WRITEABLE)) {
+            pte_access &= ~PT_WRITABLE_MASK;
+                         reset_host_protection = 0;
+                } else { reset_host_protection = 1; }
 		set_spte(vcpu, &sp->spt[i], pte_access, 0, 0,
 			 is_dirty_pte(gpte), 0, gfn,
-			 spte_to_pfn(sp->spt[i]), true, false);
+			 spte_to_pfn(sp->spt[i]), true, false, reset_host_protection);
 	}
 
 	return !nr_present;
--- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-07-23 14:58:58.000000000 -0500
+++ linux-2.6.30.x86_64-ksm/virt/kvm/kvm_main.c	2009-07-23 15:00:04.000000000 -0500
@@ -859,6 +859,19 @@ static void kvm_mmu_notifier_invalidate_
 
 }
 
+static void kvm_mmu_notifier_change_pte(struct mmu_notifier *mn,
+					struct mm_struct *mm,
+					unsigned long address,
+					pte_t pte)
+{
+	struct kvm *kvm = mmu_notifier_to_kvm(mn);
+
+	spin_lock(&kvm->mmu_lock);
+	kvm->mmu_notifier_seq++;
+	kvm_set_spte_hva(kvm, address, pte);
+	spin_unlock(&kvm->mmu_lock);
+}
+
 static void kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn,
 						    struct mm_struct *mm,
 						    unsigned long start,
@@ -938,6 +951,7 @@ static const struct mmu_notifier_ops kvm
 	.invalidate_range_start	= kvm_mmu_notifier_invalidate_range_start,
 	.invalidate_range_end	= kvm_mmu_notifier_invalidate_range_end,
 	.clear_flush_young	= kvm_mmu_notifier_clear_flush_young,
+	.change_pte		= kvm_mmu_notifier_change_pte,
 	.release		= kvm_mmu_notifier_release,
 };
 #endif /* CONFIG_MMU_NOTIFIER && KVM_ARCH_WANT_MMU_NOTIFIER */

linux-2.6-ksm.patch:
 b/arch/alpha/include/asm/mman.h     |    3 
 b/arch/mips/include/asm/mman.h      |    3 
 b/arch/parisc/include/asm/mman.h    |    3 
 b/arch/xtensa/include/asm/mman.h    |    3 
 b/fs/proc/page.c                    |    5 
 b/include/asm-generic/mman-common.h |    5 
 b/include/linux/ksm.h               |   50 +
 b/include/linux/mm.h                |    1 
 b/include/linux/mmu_notifier.h      |   34 
 b/include/linux/rmap.h              |    6 
 b/include/linux/sched.h             |    7 
 b/kernel/fork.c                     |    8 
 b/mm/Kconfig                        |   11 
 b/mm/Makefile                       |    1 
 b/mm/ksm.c                          |   56 +
 b/mm/madvise.c                      |   41 
 b/mm/memory.c                       |    9 
 b/mm/mmu_notifier.c                 |   22 
 b/mm/mremap.c                       |   14 
 b/mm/rmap.c                         |   23 
 include/linux/ksm.h                 |   29 
 mm/ksm.c                            | 1506 +++++++++++++++++++++++++++++++++++-
 mm/madvise.c                        |   16 
 mm/memory.c                         |    7 
 24 files changed, 1780 insertions(+), 83 deletions(-)

--- NEW FILE linux-2.6-ksm.patch ---
From: Izik Eidus <ieidus at redhat.com>
Subject: [PATCH 01/10] ksm: add mmu_notifier set_pte_at_notify()
Date: 	Fri, 17 Jul 2009 20:30:41 +0300

The set_pte_at_notify() macro allows setting a pte in the shadow page
table directly, instead of flushing the shadow page table entry and then
getting vmexit to set it.  It uses a new change_pte() callback to do so.

set_pte_at_notify() is an optimization for kvm, and other users of
mmu_notifiers, for COW pages.  It is useful for kvm when ksm is used,
because it allows kvm not to have to receive vmexit and only then map
the ksm page into the shadow page table, but instead map it directly
at the same time as Linux maps the page into the host page table.

Users of mmu_notifiers who don't implement new mmu_notifier_change_pte()
callback will just receive the mmu_notifier_invalidate_page() callback.

Signed-off-by: Izik Eidus <ieidus at redhat.com>
Signed-off-by: Chris Wright <chrisw at redhat.com>
Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---
 include/linux/mmu_notifier.h |   34 ++++++++++++++++++++++++++++++++++
 mm/memory.c                  |    9 +++++++--
 mm/mmu_notifier.c            |   20 ++++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
index b77486d..4e02ee2 100644
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@ -62,6 +62,15 @@ struct mmu_notifier_ops {
 				 unsigned long address);
 
 	/*
+	 * change_pte is called in cases that pte mapping to page is changed:
+	 * for example, when ksm remaps pte to point to a new shared page.
+	 */
+	void (*change_pte)(struct mmu_notifier *mn,
+			   struct mm_struct *mm,
+			   unsigned long address,
+			   pte_t pte);
+
+	/*
 	 * Before this is invoked any secondary MMU is still ok to
 	 * read/write to the page previously pointed to by the Linux
 	 * pte because the page hasn't been freed yet and it won't be
@@ -154,6 +163,8 @@ extern void __mmu_notifier_mm_destroy(struct mm_struct *mm);
 extern void __mmu_notifier_release(struct mm_struct *mm);
 extern int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
 					  unsigned long address);
+extern void __mmu_notifier_change_pte(struct mm_struct *mm,
+				      unsigned long address, pte_t pte);
 extern void __mmu_notifier_invalidate_page(struct mm_struct *mm,
 					  unsigned long address);
 extern void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
@@ -175,6 +186,13 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
 	return 0;
 }
 
+static inline void mmu_notifier_change_pte(struct mm_struct *mm,
+					   unsigned long address, pte_t pte)
+{
+	if (mm_has_notifiers(mm))
+		__mmu_notifier_change_pte(mm, address, pte);
+}
+
 static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
 					  unsigned long address)
 {
@@ -236,6 +254,16 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 	__young;							\
 })
 
+#define set_pte_at_notify(__mm, __address, __ptep, __pte)		\
+({									\
+	struct mm_struct *___mm = __mm;					\
+	unsigned long ___address = __address;				\
+	pte_t ___pte = __pte;						\
+									\
+	set_pte_at(___mm, ___address, __ptep, ___pte);			\
+	mmu_notifier_change_pte(___mm, ___address, ___pte);		\
+})
+
 #else /* CONFIG_MMU_NOTIFIER */
 
 static inline void mmu_notifier_release(struct mm_struct *mm)
@@ -248,6 +276,11 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
 	return 0;
 }
 
+static inline void mmu_notifier_change_pte(struct mm_struct *mm,
+					   unsigned long address, pte_t pte)
+{
+}
+
 static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
 					  unsigned long address)
 {
@@ -273,6 +306,7 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 
 #define ptep_clear_flush_young_notify ptep_clear_flush_young
 #define ptep_clear_flush_notify ptep_clear_flush
+#define set_pte_at_notify set_pte_at
 
 #endif /* CONFIG_MMU_NOTIFIER */
 
diff --git a/mm/memory.c b/mm/memory.c
index 6521619..8159a62 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2113,9 +2113,14 @@ gotten:
 		 * seen in the presence of one thread doing SMC and another
 		 * thread doing COW.
 		 */
-		ptep_clear_flush_notify(vma, address, page_table);
+		ptep_clear_flush(vma, address, page_table);
 		page_add_new_anon_rmap(new_page, vma, address);
-		set_pte_at(mm, address, page_table, entry);
+		/*
+		 * We call the notify macro here because, when using secondary
+		 * mmu page tables (such as kvm shadow page tables), we want the
+		 * new page to be mapped directly into the secondary page table.
+		 */
+		set_pte_at_notify(mm, address, page_table, entry);
 		update_mmu_cache(vma, address, entry);
 		if (old_page) {
 			/*
diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
index 5f4ef02..7e33f2c 100644
--- a/mm/mmu_notifier.c
+++ b/mm/mmu_notifier.c
@@ -99,6 +99,26 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
 	return young;
 }
 
+void __mmu_notifier_change_pte(struct mm_struct *mm, unsigned long address,
+			       pte_t pte)
+{
+	struct mmu_notifier *mn;
+	struct hlist_node *n;
+
+	rcu_read_lock();
+	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+		if (mn->ops->change_pte)
+			mn->ops->change_pte(mn, mm, address, pte);
+		/*
+		 * Some drivers don't have change_pte,
+		 * so we must call invalidate_page in that case.
+		 */
+		else if (mn->ops->invalidate_page)
+			mn->ops->invalidate_page(mn, mm, address);
+	}
+	rcu_read_unlock();
+}
+
 void __mmu_notifier_invalidate_page(struct mm_struct *mm,
 					  unsigned long address)
 {
-- 
1.5.6.5

--

From: Izik Eidus <ieidus at redhat.com>
Subject: [PATCH 02/10] ksm: first tidy up madvise_vma()
Date: 	Fri, 17 Jul 2009 20:30:42 +0300

madvise.c has several levels of switch statements, what to do in which?
Move MADV_DOFORK code down from madvise_vma() to madvise_behavior(), so
madvise_vma() can be a simple router, to madvise_behavior() by default.

vma->vm_flags is an unsigned long so use the same type for new_flags.
Add missing comment lines to describe MADV_DONTFORK and MADV_DOFORK.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Signed-off-by: Chris Wright <chrisw at redhat.com>
Signed-off-by: Izik Eidus <ieidus at redhat.com>
---
 mm/madvise.c |   39 +++++++++++++--------------------------
 1 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/mm/madvise.c b/mm/madvise.c
index 76eb419..66c3126 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -41,7 +41,7 @@ static long madvise_behavior(struct vm_area_struct * vma,
 	struct mm_struct * mm = vma->vm_mm;
 	int error = 0;
 	pgoff_t pgoff;
-	int new_flags = vma->vm_flags;
+	unsigned long new_flags = vma->vm_flags;
 
 	switch (behavior) {
 	case MADV_NORMAL:
@@ -57,6 +57,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
 		new_flags |= VM_DONTCOPY;
 		break;
 	case MADV_DOFORK:
+		if (vma->vm_flags & VM_IO) {
[...2246 lines suppressed...]
+	unsigned long nr_pages;
+
+	err = strict_strtoul(buf, 10, &nr_pages);
+	if (err)
+		return -EINVAL;
+
+	ksm_max_kernel_pages = nr_pages;
+
+	return count;
+}
+
+static ssize_t max_kernel_pages_show(struct kobject *kobj,
+				     struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_max_kernel_pages);
+}
+KSM_ATTR(max_kernel_pages);
+
+static struct attribute *ksm_attrs[] = {
+	&sleep_millisecs_attr.attr,
+	&pages_to_scan_attr.attr,
+	&run_attr.attr,
+	&pages_shared_attr.attr,
+	&kernel_pages_allocated_attr.attr,
+	&max_kernel_pages_attr.attr,
+	NULL,
+};
+
+static struct attribute_group ksm_attr_group = {
+	.attrs = ksm_attrs,
+	.name = "ksm",
+};
+
+static int __init ksm_init(void)
+{
+	struct task_struct *ksm_thread;
+	int err;
+
+	err = ksm_slab_init();
+	if (err)
+		goto out;
+
+	err = mm_slots_hash_init();
+	if (err)
+		goto out_free1;
+
+	ksm_thread = kthread_run(ksm_scan_thread, NULL, "ksmd");
+	if (IS_ERR(ksm_thread)) {
+		printk(KERN_ERR "ksm: creating kthread failed\n");
+		err = PTR_ERR(ksm_thread);
+		goto out_free2;
+	}
+
+	err = sysfs_create_group(mm_kobj, &ksm_attr_group);
+	if (err) {
+		printk(KERN_ERR "ksm: register sysfs failed\n");
+		goto out_free3;
+	}
+
+	return 0;
+
+out_free3:
+	kthread_stop(ksm_thread);
+out_free2:
+	mm_slots_hash_free();
+out_free1:
+	ksm_slab_free();
+out:
+	return err;
 }
+module_init(ksm_init)
-- 
1.5.6.5

--
From: Izik Eidus <ieidus at redhat.com>
Subject: [PATCH 08/10] ksm: prevent mremap move poisoning
Date: 	Fri, 17 Jul 2009 20:30:48 +0300

KSM's scan allows for user pages to be COWed or unmapped at any time,
without requiring any notification.  But its stable tree does assume
that when it finds a KSM page where it placed a KSM page, then it is
the same KSM page that it placed there.

mremap move could break that assumption: if an area containing a KSM
page was unmapped, then an area containing a different KSM page was
moved with mremap into the place of the original, before KSM's scan
came around to notice.  That could then poison a node of the stable
tree, so that memcmps would "lie" and upset the ordering of the tree.

Probably noone will ever need mremap move on a VM_MERGEABLE area;
except that prohibiting it would make trouble for schemes in which we
try making everything VM_MERGEABLE e.g. for testing: an mremap which
normally works would then fail mysteriously.

There's no need to go to any trouble, such as re-sorting KSM's list of
rmap_items to match the new layout: simply unmerge the area to COW all
its KSM pages before moving, but leave VM_MERGEABLE on so that they're
remerged later.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Signed-off-by: Chris Wright <chrisw at redhat.com>
Signed-off-by: Izik Eidus <ieidus at redhat.com>
---
 mm/mremap.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index a39b7b9..93addde 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -11,6 +11,7 @@
 #include <linux/hugetlb.h>
 #include <linux/slab.h>
 #include <linux/shm.h>
+#include <linux/ksm.h>
 #include <linux/mman.h>
 #include <linux/swap.h>
 #include <linux/capability.h>
@@ -182,6 +183,17 @@ static unsigned long move_vma(struct vm_area_struct *vma,
 	if (mm->map_count >= sysctl_max_map_count - 3)
 		return -ENOMEM;
 
+	/*
+	 * Advise KSM to break any KSM pages in the area to be moved:
+	 * it would be confusing if they were to turn up at the new
+	 * location, where they happen to coincide with different KSM
+	 * pages recently unmapped.  But leave vma->vm_flags as it was,
+	 * so KSM can come around to merge on vma and new_vma afterwards.
+	 */
+	if (ksm_madvise(vma, old_addr, old_addr + old_len,
+						MADV_UNMERGEABLE, &vm_flags))
+		return -ENOMEM;
+
 	new_pgoff = vma->vm_pgoff + ((old_addr - vma->vm_start) >> PAGE_SHIFT);
 	new_vma = copy_vma(&vma, new_addr, new_len, new_pgoff);
 	if (!new_vma)
-- 
1.5.6.5

--
From: Izik Eidus <ieidus at redhat.com>
Subject: [PATCH 09/10] ksm: change copyright message
Date: 	Fri, 17 Jul 2009 20:30:49 +0300

Adding Hugh Dickins into the authors list.

Signed-off-by: Izik Eidus <ieidus at redhat.com>
---
 mm/ksm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index a0fbdb2..75d7802 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -4,11 +4,12 @@
  * This code enables dynamic sharing of identical pages found in different
  * memory areas, even if they are not shared by fork()
  *
- * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2008-2009 Red Hat, Inc.
  * Authors:
  *	Izik Eidus
  *	Andrea Arcangeli
  *	Chris Wright
+ *	Hugh Dickins
  *
  * This work is licensed under the terms of the GNU GPL, version 2.
  */
-- 
1.5.6.5

--
From: Izik Eidus <ieidus at redhat.com>
Subject: [PATCH 10/10] ksm: change ksm nice level to be 5
Date: 	Fri, 17 Jul 2009 20:30:50 +0300

ksm should try not to disturb other tasks as much as possible.

Signed-off-by: Izik Eidus <ieidus at redhat.com>
---
 mm/ksm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index 75d7802..4afe345 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1270,7 +1270,7 @@ static void ksm_do_scan(unsigned int scan_npages)
 
 static int ksm_scan_thread(void *nothing)
 {
-	set_user_nice(current, 0);
+	set_user_nice(current, 5);
 
 	while (!kthread_should_stop()) {
 		if (ksm_run & KSM_RUN_MERGE) {
-- 
1.5.6.5

linux-2.6-ppc-perfctr-oops-fix.patch:
 mpc7450-pmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-perfctr-oops-fix.patch ---
diff --git a/arch/powerpc/kernel/mpc7450-pmu.c b/arch/powerpc/kernel/mpc7450-pmu.c
index 75ff47f..ea383c1 100644
--- a/arch/powerpc/kernel/mpc7450-pmu.c
+++ b/arch/powerpc/kernel/mpc7450-pmu.c
@@ -408,7 +408,8 @@ struct power_pmu mpc7450_pmu = {
 
 static int init_mpc7450_pmu(void)
 {
-	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
+	if (cur_cpu_spec->oprofile_cpu_type &&
+	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
 		return -ENODEV;
 
 	return register_power_pmu(&mpc7450_pmu);

linux-2.6-qcserial-autosuspend.diff:
 qcserial.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE linux-2.6-qcserial-autosuspend.diff ---
commit b2bcfa17349e5a6a01170b5269ee261dbd762a0c
Author: Matthew Garrett <mjg at redhat.com>
Date:   Sat Jul 18 14:43:36 2009 +0100

    usb: enable autosuspend by default on qcserial
    
    All qcserial hardware supports autosuspend properly. Enable it by default.
    
    Signed-off-by: Matthew Garrett <mjg at redhat.com>

diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 7528b8d..959a176 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -74,6 +74,8 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
 	ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
 	dbg("This Interface = %d", ifnum);
 
+	usb_device_autosuspend_enable(serial->dev);
+
 	switch (nintf) {
 	case 1:
 		/* QDL mode */

linux-2.6-usb-uvc-autosuspend.diff:
 uvc_driver.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE linux-2.6-usb-uvc-autosuspend.diff ---
commit 9d4c919bcfa794c054cc33155c7e3c53ac2c5684
Author: Matthew Garrett <mjg at redhat.com>
Date:   Sun Jul 19 02:24:49 2009 +0100

    Enable autosuspend on UVC by default

diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 89927b7..8de516b 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1647,6 +1647,8 @@ static int uvc_probe(struct usb_interface *intf,
 			"supported.\n", ret);
 	}
 
+	usb_device_autosuspend_enable(udev);
+
 	uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n");
 	return 0;
 

linux-2.6-vga-arb.patch:
 drivers/gpu/Makefile     |    2 
 drivers/gpu/vga/Kconfig  |   10 
 drivers/gpu/vga/Makefile |    1 
 drivers/gpu/vga/vgaarb.c | 1195 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 +
 drivers/video/Kconfig    |    2 
 include/linux/pci.h      |    2 
 include/linux/vgaarb.h   |  196 +++++++
 8 files changed, 1450 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-vga-arb.patch ---
>From a00c47b3e783fe9ebb871071d2472387451d9225 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Tue, 14 Jul 2009 15:57:29 +0300
Subject: [PATCH] vga: implements VGA arbitration on Linux

changes since last patch:
fix up so the arb doesn't turn off vga decodes
on hw until first used. This worksaround an
X.org problem with older X servers which fail
at detecting boot device if doesn't have the VGA
bit enabled. Newer pciacccess + X server fix this.
add default processing
use hex for the target API to match the output API
balance pci get/put
use the decodes count for userspace to get card
count also if a gpu disables decodes move it to
the next card

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 drivers/gpu/Makefile     |    2 +-
 drivers/gpu/vga/Kconfig  |   10 +
 drivers/gpu/vga/Makefile |    1 +
 drivers/gpu/vga/vgaarb.c | 1195 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 ++
 drivers/video/Kconfig    |    2 +
 include/linux/pci.h      |    2 +
 include/linux/vgaarb.h   |  195 ++++++++
 8 files changed, 1450 insertions(+), 1 deletions(-)
 create mode 100644 drivers/gpu/vga/Kconfig
 create mode 100644 drivers/gpu/vga/Makefile
 create mode 100644 drivers/gpu/vga/vgaarb.c
 create mode 100644 include/linux/vgaarb.h

diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index de566cf..30879df 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1 +1 @@
-obj-y			+= drm/
+obj-y			+= drm/ vga/
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
new file mode 100644
index 0000000..790e675
--- /dev/null
+++ b/drivers/gpu/vga/Kconfig
@@ -0,0 +1,10 @@
+config VGA_ARB
+	bool "VGA Arbitration" if EMBEDDED
+	default y
+	depends on PCI
+	help
+	  Some "legacy" VGA devices implemented on PCI typically have the same
+	  hard-decoded addresses as they did on ISA. When multiple PCI devices
+	  are accessed at same time they need some kind of coordination. Please
+	  see Documentation/vgaarbiter.txt for more details. Select this to
+	  enable VGA arbiter.
diff --git a/drivers/gpu/vga/Makefile b/drivers/gpu/vga/Makefile
new file mode 100644
index 0000000..7cc8c1e
--- /dev/null
+++ b/drivers/gpu/vga/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VGA_ARB)  += vgaarb.o
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
new file mode 100644
index 0000000..08ba44d
--- /dev/null
+++ b/drivers/gpu/vga/vgaarb.c
@@ -0,0 +1,1195 @@
+/*
+ * vgaarb.c
+ *
+ * (C) Copyright 2005 Benjamin Herrenschmidt <benh at kernel.crashing.org>
+ * (C) Copyright 2007 Paulo R. Zanoni <przanoni at gmail.com>
+ * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti at freedesktop.org>
+ *
+ * Implements the VGA arbitration. For details refer to
+ * Documentation/vgaarbiter.txt
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/spinlock.h>
+#include <linux/poll.h>
+#include <linux/miscdevice.h>
+
+#include <linux/uaccess.h>
+
+#include <linux/vgaarb.h>
+
+static void vga_arbiter_notify_clients(void);
+/*
+ * We keep a list of all vga devices in the system to speed
+ * up the various operations of the arbiter
+ */
+struct vga_device {
+	struct list_head list;
+	struct pci_dev *pdev;
+	unsigned int decodes;	/* what does it decodes */
+	unsigned int owns;	/* what does it owns */
+	unsigned int locks;	/* what does it locks */
+	unsigned int io_lock_cnt;	/* legacy IO lock count */
+	unsigned int mem_lock_cnt;	/* legacy MEM lock count */
+	unsigned int io_norm_cnt;	/* normal IO count */
+	unsigned int mem_norm_cnt;	/* normal MEM count */
+
+	/* allow IRQ enable/disable hook */
+	void *cookie;
+	void (*irq_set_state)(void *cookie, bool enable);
+	unsigned int (*set_vga_decode)(void *cookie, bool decode);
+};
+
+static LIST_HEAD(vga_list);
+static int vga_count, vga_decode_count;
+static bool vga_arbiter_used;
+static DEFINE_SPINLOCK(vga_lock);
+static DECLARE_WAIT_QUEUE_HEAD(vga_wait_queue);
+
+
+static const char *vga_iostate_to_str(unsigned int iostate)
+{
+	/* Ignore VGA_RSRC_IO and VGA_RSRC_MEM */
+	iostate &= VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM;
+	switch (iostate) {
+	case VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM:
+		return "io+mem";
+	case VGA_RSRC_LEGACY_IO:
+		return "io";
+	case VGA_RSRC_LEGACY_MEM:
+		return "mem";
+	}
+	return "none";
+}
+
+static int vga_str_to_iostate(char *buf, int str_size, int *io_state)
+{
+	/* we could in theory hand out locks on IO and mem
+	 * separately to userspace but it can cause deadlocks */
+	if (strncmp(buf, "none", 4) == 0) {
+		*io_state = VGA_RSRC_NONE;
+		return 1;
+	}
+
+	/* XXX We're not chekcing the str_size! */
+	if (strncmp(buf, "io+mem", 6) == 0)
+		goto both;
+	else if (strncmp(buf, "io", 2) == 0)
+		goto both;
+	else if (strncmp(buf, "mem", 3) == 0)
+		goto both;
+	return 0;
+both:
+	*io_state = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM;
+	return 1;
+}
+
+#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
+/* this is only used a cookie - it should not be dereferenced */
+static struct pci_dev *vga_default;
+#endif
+
+static void vga_arb_device_card_gone(struct pci_dev *pdev);
+
+/* Find somebody in our list */
+static struct vga_device *vgadev_find(struct pci_dev *pdev)
+{
+	struct vga_device *vgadev;
+
+	list_for_each_entry(vgadev, &vga_list, list)
+		if (pdev == vgadev->pdev)
+			return vgadev;
+	return NULL;
+}
+
+/* Returns the default VGA device (vgacon's babe) */
+#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
+struct pci_dev *vga_default_device(void)
+{
+	return vga_default;
+}
+#endif
+
+static inline void vga_irq_set_state(struct vga_device *vgadev, bool state)
+{
+	if (vgadev->irq_set_state)
+		vgadev->irq_set_state(vgadev->cookie, state);
+}
+
+
+/* If we don't ever use VGA arb we should avoid
+   turning off anything anywhere due to old X servers getting
+   confused about the boot device not being VGA */
+static void vga_check_first_use(void)
+{
+	/* we should inform all GPUs in the system that
+	 * VGA arb has occured and to try and disable resources
+	 * if they can */
+	if (!vga_arbiter_used) {
+		vga_arbiter_used = true;
+		vga_arbiter_notify_clients();
+	}
+}
+
+static struct vga_device *__vga_tryget(struct vga_device *vgadev,
+				       unsigned int rsrc)
+{
+	unsigned int wants, legacy_wants, match;
+	struct vga_device *conflict;
+	unsigned int pci_bits;
+	/* Account for "normal" resources to lock. If we decode the legacy,
+	 * counterpart, we need to request it as well
+	 */
+	if ((rsrc & VGA_RSRC_NORMAL_IO) &&
+	    (vgadev->decodes & VGA_RSRC_LEGACY_IO))
+		rsrc |= VGA_RSRC_LEGACY_IO;
+	if ((rsrc & VGA_RSRC_NORMAL_MEM) &&
+	    (vgadev->decodes & VGA_RSRC_LEGACY_MEM))
+		rsrc |= VGA_RSRC_LEGACY_MEM;
+
+	pr_devel("%s: %d\n", __func__, rsrc);
+	pr_devel("%s: owns: %d\n", __func__, vgadev->owns);
+
+	/* Check what resources we need to acquire */
+	wants = rsrc & ~vgadev->owns;
+
+	/* We already own everything, just mark locked & bye bye */
+	if (wants == 0)
+		goto lock_them;
+
+	/* We don't need to request a legacy resource, we just enable
+	 * appropriate decoding and go
+	 */
+	legacy_wants = wants & VGA_RSRC_LEGACY_MASK;
+	if (legacy_wants == 0)
+		goto enable_them;
+
+	/* Ok, we don't, let's find out how we need to kick off */
+	list_for_each_entry(conflict, &vga_list, list) {
+		unsigned int lwants = legacy_wants;
+		unsigned int change_bridge = 0;
+
+		/* Don't conflict with myself */
+		if (vgadev == conflict)
+			continue;
+
+		/* Check if the architecture allows a conflict between those
+		 * 2 devices or if they are on separate domains
+		 */
+		if (!vga_conflicts(vgadev->pdev, conflict->pdev))
+			continue;
+
+		/* We have a possible conflict. before we go further, we must
+		 * check if we sit on the same bus as the conflicting device.
+		 * if we don't, then we must tie both IO and MEM resources
+		 * together since there is only a single bit controlling
+		 * VGA forwarding on P2P bridges
+		 */
+		if (vgadev->pdev->bus != conflict->pdev->bus) {
+			change_bridge = 1;
+			lwants = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM;
+		}
+
+		/* Check if the guy has a lock on the resource. If he does,
+		 * return the conflicting entry
+		 */
+		if (conflict->locks & lwants)
+			return conflict;
+
+		/* Ok, now check if he owns the resource we want. We don't need
+		 * to check "decodes" since it should be impossible to own
+		 * own legacy resources you don't decode unless I have a bug
+		 * in this code...
+		 */
+		WARN_ON(conflict->owns & ~conflict->decodes);
+		match = lwants & conflict->owns;
+		if (!match)
+			continue;
+
+		/* looks like he doesn't have a lock, we can steal
+		 * them from him
+		 */
+		vga_irq_set_state(conflict, false);
+
+		pci_bits = 0;
+		if (lwants & (VGA_RSRC_LEGACY_MEM|VGA_RSRC_NORMAL_MEM))
+			pci_bits |= PCI_COMMAND_MEMORY;
+		if (lwants & (VGA_RSRC_LEGACY_IO|VGA_RSRC_NORMAL_IO))
+			pci_bits |= PCI_COMMAND_IO;
+
+		pci_set_vga_state(conflict->pdev, false, pci_bits,
+				  change_bridge);
+		conflict->owns &= ~lwants;
+		/* If he also owned non-legacy, that is no longer the case */
+		if (lwants & VGA_RSRC_LEGACY_MEM)
+			conflict->owns &= ~VGA_RSRC_NORMAL_MEM;
+		if (lwants & VGA_RSRC_LEGACY_IO)
+			conflict->owns &= ~VGA_RSRC_NORMAL_IO;
+	}
+
+enable_them:
+	/* ok dude, we got it, everybody conflicting has been disabled, let's
+	 * enable us. Make sure we don't mark a bit in "owns" that we don't
+	 * also have in "decodes". We can lock resources we don't decode but
+	 * not own them.
+	 */
+	pci_bits = 0;
+	if (wants & (VGA_RSRC_LEGACY_MEM|VGA_RSRC_NORMAL_MEM))
+		pci_bits |= PCI_COMMAND_MEMORY;
+	if (wants & (VGA_RSRC_LEGACY_IO|VGA_RSRC_NORMAL_IO))
+		pci_bits |= PCI_COMMAND_IO;
+	pci_set_vga_state(vgadev->pdev, true, pci_bits, !!(wants & VGA_RSRC_LEGACY_MASK));
+
+	vga_irq_set_state(vgadev, true);
+	vgadev->owns |= (wants & vgadev->decodes);
+lock_them:
+	vgadev->locks |= (rsrc & VGA_RSRC_LEGACY_MASK);
+	if (rsrc & VGA_RSRC_LEGACY_IO)
+		vgadev->io_lock_cnt++;
+	if (rsrc & VGA_RSRC_LEGACY_MEM)
+		vgadev->mem_lock_cnt++;
+	if (rsrc & VGA_RSRC_NORMAL_IO)
+		vgadev->io_norm_cnt++;
+	if (rsrc & VGA_RSRC_NORMAL_MEM)
+		vgadev->mem_norm_cnt++;
+
+	return NULL;
+}
+
+static void __vga_put(struct vga_device *vgadev, unsigned int rsrc)
+{
+	unsigned int old_locks = vgadev->locks;
+
+	pr_devel("%s\n", __func__);
+
+	/* Update our counters, and account for equivalent legacy resources
+	 * if we decode them
+	 */
+	if ((rsrc & VGA_RSRC_NORMAL_IO) && vgadev->io_norm_cnt > 0) {
+		vgadev->io_norm_cnt--;
+		if (vgadev->decodes & VGA_RSRC_LEGACY_IO)
+			rsrc |= VGA_RSRC_LEGACY_IO;
+	}
+	if ((rsrc & VGA_RSRC_NORMAL_MEM) && vgadev->mem_norm_cnt > 0) {
+		vgadev->mem_norm_cnt--;
+		if (vgadev->decodes & VGA_RSRC_LEGACY_MEM)
+			rsrc |= VGA_RSRC_LEGACY_MEM;
+	}
+	if ((rsrc & VGA_RSRC_LEGACY_IO) && vgadev->io_lock_cnt > 0)
+		vgadev->io_lock_cnt--;
+	if ((rsrc & VGA_RSRC_LEGACY_MEM) && vgadev->mem_lock_cnt > 0)
+		vgadev->mem_lock_cnt--;
+
+	/* Just clear lock bits, we do lazy operations so we don't really
+	 * have to bother about anything else at this point
+	 */
+	if (vgadev->io_lock_cnt == 0)
+		vgadev->locks &= ~VGA_RSRC_LEGACY_IO;
+	if (vgadev->mem_lock_cnt == 0)
+		vgadev->locks &= ~VGA_RSRC_LEGACY_MEM;
+
+	/* Kick the wait queue in case somebody was waiting if we actually
+	 * released something
+	 */
+	if (old_locks != vgadev->locks)
+		wake_up_all(&vga_wait_queue);
+}
+
+int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible)
+{
+	struct vga_device *vgadev, *conflict;
+	unsigned long flags;
+	wait_queue_t wait;
+	int rc = 0;
+
+	vga_check_first_use();
+	/* The one who calls us should check for this, but lets be sure... */
+	if (pdev == NULL)
+		pdev = vga_default_device();
+	if (pdev == NULL)
+		return 0;
+
+	for (;;) {
+		spin_lock_irqsave(&vga_lock, flags);
+		vgadev = vgadev_find(pdev);
+		if (vgadev == NULL) {
+			spin_unlock_irqrestore(&vga_lock, flags);
+			rc = -ENODEV;
+			break;
+		}
+		conflict = __vga_tryget(vgadev, rsrc);
+		spin_unlock_irqrestore(&vga_lock, flags);
+		if (conflict == NULL)
+			break;
+
+
+		/* We have a conflict, we wait until somebody kicks the
+		 * work queue. Currently we have one work queue that we
+		 * kick each time some resources are released, but it would
+		 * be fairly easy to have a per device one so that we only
+		 * need to attach to the conflicting device
+		 */
+		init_waitqueue_entry(&wait, current);
+		add_wait_queue(&vga_wait_queue, &wait);
+		set_current_state(interruptible ?
+				  TASK_INTERRUPTIBLE :
+				  TASK_UNINTERRUPTIBLE);
+		if (signal_pending(current)) {
+			rc = -EINTR;
+			break;
+		}
+		schedule();
+		remove_wait_queue(&vga_wait_queue, &wait);
+		set_current_state(TASK_RUNNING);
+	}
+	return rc;
+}
+EXPORT_SYMBOL(vga_get);
+
+int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)
+{
+	struct vga_device *vgadev;
+	unsigned long flags;
+	int rc = 0;
+
+	vga_check_first_use();
+
+	/* The one who calls us should check for this, but lets be sure... */
+	if (pdev == NULL)
+		pdev = vga_default_device();
+	if (pdev == NULL)
+		return 0;
+	spin_lock_irqsave(&vga_lock, flags);
+	vgadev = vgadev_find(pdev);
+	if (vgadev == NULL) {
+		rc = -ENODEV;
+		goto bail;
+	}
+	if (__vga_tryget(vgadev, rsrc))
+		rc = -EBUSY;
+bail:
+	spin_unlock_irqrestore(&vga_lock, flags);
+	return rc;
+}
+EXPORT_SYMBOL(vga_tryget);
+
+void vga_put(struct pci_dev *pdev, unsigned int rsrc)
+{
+	struct vga_device *vgadev;
+	unsigned long flags;
+
+	/* The one who calls us should check for this, but lets be sure... */
+	if (pdev == NULL)
+		pdev = vga_default_device();
+	if (pdev == NULL)
+		return;
+	spin_lock_irqsave(&vga_lock, flags);
+	vgadev = vgadev_find(pdev);
+	if (vgadev == NULL)
+		goto bail;
+	__vga_put(vgadev, rsrc);
+bail:
+	spin_unlock_irqrestore(&vga_lock, flags);
+}
+EXPORT_SYMBOL(vga_put);
+
+/*
+ * Currently, we assume that the "initial" setup of the system is
+ * not sane, that is we come up with conflicting devices and let
+ * the arbiter's client decides if devices decodes or not legacy
+ * things.
+ */
+static void vga_arbiter_add_pci_device(struct pci_dev *pdev)
+{
+	struct vga_device *vgadev;
+	unsigned long flags;
+	struct pci_bus *bus;
+	struct pci_dev *bridge;
+	u16 cmd;
+
+	/* Only deal with VGA class devices */
+	if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+		return;
+
+	/* Allocate structure */
+	vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL);
+	if (vgadev == NULL) {
+		pr_err("vgaarb: failed to allocate pci device\n");
+		/* What to do on allocation failure ? For now, let's
+		 * just do nothing, I'm not sure there is anything saner
+		 * to be done
+		 */
+		return;
+	}
+
+	memset(vgadev, 0, sizeof(*vgadev));
+
+	/* Take lock & check for duplicates */
+	spin_lock_irqsave(&vga_lock, flags);
+	if (vgadev_find(pdev) != NULL) {
+		BUG_ON(1);
+		goto fail;
+	}
+	vgadev->pdev = pdev;
+
+	/* By default, assume we decode everything */
+	vgadev->decodes = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
+			  VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+
+	/* by default mark it as decoding */
+	vga_decode_count++;
+	/* Mark that we "own" resources based on our enables, we will
+	 * clear that below if the bridge isn't forwarding
+	 */
+	pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+	if (cmd & PCI_COMMAND_IO)
+		vgadev->owns |= VGA_RSRC_LEGACY_IO;
+	if (cmd & PCI_COMMAND_MEMORY)
+		vgadev->owns |= VGA_RSRC_LEGACY_MEM;
+
+	/* Check if VGA cycles can get down to us */
+	bus = pdev->bus;
+	while (bus) {
+		bridge = bus->self;
+		if (bridge) {
+			u16 l;
+			pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
+					     &l);
+			if (!(l & PCI_BRIDGE_CTL_VGA)) {
+				vgadev->owns = 0;
+				break;
+			}
+		}
+		bus = bus->parent;
+	}
+
+	/* Deal with VGA default device. Use first enabled one
+	 * by default if arch doesn't have it's own hook
+	 */
+#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
+	if (vga_default == NULL &&
+	    ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK))
+		vga_default = pci_dev_get(pdev);
+#endif
+
+	/* Add to the list */
+	list_add(&vgadev->list, &vga_list);
+	vga_count++;
+	pr_info("vgaarb: device added: PCI:%s,decodes=%s,owns=%s,locks=%s\n",
+		pci_name(pdev),
+		vga_iostate_to_str(vgadev->decodes),
+		vga_iostate_to_str(vgadev->owns),
+		vga_iostate_to_str(vgadev->locks));
+
+	spin_unlock_irqrestore(&vga_lock, flags);
+	return;
+fail:
+	spin_unlock_irqrestore(&vga_lock, flags);
+	kfree(vgadev);
+}
+
+static void vga_arbiter_del_pci_device(struct pci_dev *pdev)
+{
+	struct vga_device *vgadev;
+	unsigned long flags;
+
+	spin_lock_irqsave(&vga_lock, flags);
+	vgadev = vgadev_find(pdev);
+	if (vgadev == NULL)
+		goto bail;
+
+	if (vga_default == pdev) {
+		pci_dev_put(vga_default);
+		vga_default = NULL;
+	}
+
+	if (vgadev->decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
+		vga_decode_count--;
+
+	/* Remove entry from list */
+	list_del(&vgadev->list);
+	vga_count--;
+	/* Notify userland driver that the device is gone so it discards
+	 * it's copies of the pci_dev pointer
+	 */
+	vga_arb_device_card_gone(pdev);
+
+	/* Wake up all possible waiters */
+	wake_up_all(&vga_wait_queue);
+bail:
+	spin_unlock_irqrestore(&vga_lock, flags);
+	kfree(vgadev);
+}
+
+/* this is called with the lock */
+static inline void vga_update_device_decodes(struct vga_device *vgadev,
+					     int new_decodes)
+{
+	int old_decodes;
+	struct vga_device *new_vgadev, *conflict;
+
+	old_decodes = vgadev->decodes;
+	vgadev->decodes = new_decodes;
+
+	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s\n",
+		pci_name(vgadev->pdev),
+		vga_iostate_to_str(old_decodes),
+		vga_iostate_to_str(vgadev->decodes));
+
+	/* if we own the decodes we should move them along to
+	   another card */
+	if ((vgadev->owns & new_decodes) && (vga_count > 1)) {
+		vgadev->owns &= new_decodes;
+		list_for_each_entry(new_vgadev, &vga_list, list) {
+			if ((new_vgadev != vgadev) &&
+			    (new_vgadev->decodes & VGA_RSRC_LEGACY_MASK)) {
+				conflict = __vga_tryget(new_vgadev, VGA_RSRC_LEGACY_MASK);
+				if (!conflict)
+					__vga_put(new_vgadev, VGA_RSRC_LEGACY_MASK);
+				break;
+			}
+		}
+	}
+
+	/* change decodes counter */
+	if (old_decodes != new_decodes) {
+		if (new_decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
+			vga_decode_count++;
+		else
+			vga_decode_count--;
+	}
+}
+
+void __vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes, bool userspace)
+{
+	struct vga_device *vgadev;
+	unsigned long flags;
+
+	decodes &= VGA_RSRC_LEGACY_MASK;
+
+	spin_lock_irqsave(&vga_lock, flags);
+	vgadev = vgadev_find(pdev);
+	if (vgadev == NULL)
+		goto bail;
+
+	/* don't let userspace futz with kernel driver decodes */
+	if (userspace && vgadev->set_vga_decode)
+		goto bail;
+
+	/* update the device decodes + counter */
+	vga_update_device_decodes(vgadev, decodes);
+
+	/* XXX if somebody is going from "doesn't decode" to "decodes" state
+	 * here, additional care must be taken as we may have pending owner
+	 * ship of non-legacy region ...
+	 */
+bail:
+	spin_unlock_irqrestore(&vga_lock, flags);
+}
+
+void vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes)
+{
+	__vga_set_legacy_decoding(pdev, decodes, false);
+}
+EXPORT_SYMBOL(vga_set_legacy_decoding);
+
+/* return number of active VGA devices */
+/* call with NULL to unregister */
+int vga_client_register(struct pci_dev *pdev, void *cookie,
+			void (*irq_set_state)(void *cookie, bool state),
+			unsigned int (*set_vga_decode)(void *cookie, bool decode))
+{
+	int ret = -1;
+	struct vga_device *vgadev;
+	unsigned long flags;
+
+	spin_lock_irqsave(&vga_lock, flags);
+	vgadev = vgadev_find(pdev);
+	if (!vgadev)
+		goto bail;
+
+	vgadev->irq_set_state = irq_set_state;
+	vgadev->set_vga_decode = set_vga_decode;
+	vgadev->cookie = cookie;
+	ret = 0;
+
+bail:
+	spin_unlock_irqrestore(&vga_lock, flags);
+	return ret;
+
+}
+EXPORT_SYMBOL(vga_client_register);
+
+/*
+ * Char driver implementation
+ *
+ * Semantics is:
+ *
+ *  open       : open user instance of the arbitrer. by default, it's
+ *                attached to the default VGA device of the system.
+ *
+ *  close      : close user instance, release locks
+ *
+ *  read       : return a string indicating the status of the target.
+ *                an IO state string is of the form {io,mem,io+mem,none},
+ *                mc and ic are respectively mem and io lock counts (for
+ *                debugging/diagnostic only). "decodes" indicate what the
+ *                card currently decodes, "owns" indicates what is currently
+ *                enabled on it, and "locks" indicates what is locked by this
+ *                card. If the card is unplugged, we get "invalid" then for
+ *                card_ID and an -ENODEV error is returned for any command
+ *                until a new card is targeted
+ *
+ *   "<card_ID>,decodes=<io_state>,owns=<io_state>,locks=<io_state> (ic,mc)"
+ *
+ * write       : write a command to the arbiter. List of commands is:
+ *
+ *   target <card_ID>   : switch target to card <card_ID> (see below)
+ *   lock <io_state>    : acquires locks on target ("none" is invalid io_state)
+ *   trylock <io_state> : non-blocking acquire locks on target
+ *   unlock <io_state>  : release locks on target
+ *   unlock all         : release all locks on target held by this user
+ *   decodes <io_state> : set the legacy decoding attributes for the card
+ *
+ * poll         : event if something change on any card (not just the target)
+ *
+ * card_ID is of the form "PCI:domain:bus:dev.fn". It can be set to "default"
+ * to go back to the system default card (TODO: not implemented yet).
+ * Currently, only PCI is supported as a prefix, but the userland API may
+ * support other bus types in the future, even if the current kernel
+ * implementation doesn't.
+ *
+ * Note about locks:
+ *
+ * The driver keeps track of which user has what locks on which card. It
+ * supports stacking, like the kernel one. This complexifies the implementation
+ * a bit, but makes the arbiter more tolerant to userspace problems and able
+ * to properly cleanup in all cases when a process dies.
+ * Currently, a max of 16 cards simultaneously can have locks issued from
+ * userspace for a given user (file descriptor instance) of the arbiter.
+ *
+ * If the device is hot-unplugged, there is a hook inside the module to notify
+ * they being added/removed in the system and automatically added/removed in
+ * the arbiter.
+ */
+
+#define MAX_USER_CARDS         16
+#define PCI_INVALID_CARD       ((struct pci_dev *)-1UL)
+
+/*
+ * Each user has an array of these, tracking which cards have locks
+ */
+struct vga_arb_user_card {
+	struct pci_dev *pdev;
+	unsigned int mem_cnt;
+	unsigned int io_cnt;
+};
+
+struct vga_arb_private {
+	struct list_head list;
+	struct pci_dev *target;
+	struct vga_arb_user_card cards[MAX_USER_CARDS];
+	spinlock_t lock;
+};
+
+static LIST_HEAD(vga_user_list);
+static DEFINE_SPINLOCK(vga_user_lock);
+
+
+/*
+ * This function gets a string in the format: "PCI:domain:bus:dev.fn" and
+ * returns the respective values. If the string is not in this format,
+ * it returns 0.
+ */
+static int vga_pci_str_to_vars(char *buf, int count, unsigned int *domain,
+			       unsigned int *bus, unsigned int *devfn)
+{
+	int n;
+	unsigned int slot, func;
+
+
+	n = sscanf(buf, "PCI:%x:%x:%x.%x", domain, bus, &slot, &func);
+	if (n != 4)
+		return 0;
+
+	*devfn = PCI_DEVFN(slot, func);
+
+	return 1;
+}
+
+static ssize_t vga_arb_read(struct file *file, char __user * buf,
+			    size_t count, loff_t *ppos)
+{
+	struct vga_arb_private *priv = file->private_data;
+	struct vga_device *vgadev;
+	struct pci_dev *pdev;
+	unsigned long flags;
+	size_t len;
+	int rc;
+	char *lbuf;
+
+	lbuf = kmalloc(1024, GFP_KERNEL);
+	if (lbuf == NULL)
+		return -ENOMEM;
+
+	/* Shields against vga_arb_device_card_gone (pci_dev going
+	 * away), and allows access to vga list
+	 */
+	spin_lock_irqsave(&vga_lock, flags);
+
+	/* If we are targetting the default, use it */
+	pdev = priv->target;
+	if (pdev == NULL || pdev == PCI_INVALID_CARD) {
+		spin_unlock_irqrestore(&vga_lock, flags);
+		len = sprintf(lbuf, "invalid");
+		goto done;
+	}
+
+	/* Find card vgadev structure */
+	vgadev = vgadev_find(pdev);
+	if (vgadev == NULL) {
+		/* Wow, it's not in the list, that shouldn't happen,
+		 * let's fix us up and return invalid card
+		 */
+		if (pdev == priv->target)
+			vga_arb_device_card_gone(pdev);
+		spin_unlock_irqrestore(&vga_lock, flags);
+		len = sprintf(lbuf, "invalid");
+		goto done;
+	}
+
+	/* Fill the buffer with infos */
+	len = snprintf(lbuf, 1024,
+		       "count:%d,PCI:%s,decodes=%s,owns=%s,locks=%s(%d:%d)\n",
+		       vga_decode_count, pci_name(pdev),
+		       vga_iostate_to_str(vgadev->decodes),
+		       vga_iostate_to_str(vgadev->owns),
+		       vga_iostate_to_str(vgadev->locks),
+		       vgadev->io_lock_cnt, vgadev->mem_lock_cnt);
+
+	spin_unlock_irqrestore(&vga_lock, flags);
+done:
+
+	/* Copy that to user */
+	if (len > count)
+		len = count;
+	rc = copy_to_user(buf, lbuf, len);
+	kfree(lbuf);
+	if (rc)
+		return -EFAULT;
+	return len;
+}
+
+/*
+ * TODO: To avoid parsing inside kernel and to improve the speed we may
+ * consider use ioctl here
+ */
+static ssize_t vga_arb_write(struct file *file, const char __user * buf,
+			     size_t count, loff_t *ppos)
+{
+	struct vga_arb_private *priv = file->private_data;
+	struct vga_arb_user_card *uc = NULL;
+	struct pci_dev *pdev;
+
+	unsigned int io_state;
+
+	char *kbuf, *curr_pos;
+	size_t remaining = count;
+
+	int ret_val;
+	int i;
+
+
+	kbuf = kmalloc(count + 1, GFP_KERNEL);
+	if (!kbuf)
+		return -ENOMEM;
+
+	if (copy_from_user(kbuf, buf, count)) {
+		kfree(kbuf);
+		return -EFAULT;
+	}
+	curr_pos = kbuf;
+	kbuf[count] = '\0';	/* Just to make sure... */
+
+	if (strncmp(curr_pos, "lock ", 5) == 0) {
+		curr_pos += 5;
+		remaining -= 5;
+
+		pr_devel("client 0x%X called 'lock'\n", (int)priv);
+
+		if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) {
+			ret_val = -EPROTO;
+			goto done;
+		}
+		if (io_state == VGA_RSRC_NONE) {
+			ret_val = -EPROTO;
+			goto done;
+		}
+
+		pdev = priv->target;
+		if (priv->target == NULL) {
+			ret_val = -ENODEV;
+			goto done;
+		}
+
+		vga_get_uninterruptible(pdev, io_state);
+
+		/* Update the client's locks lists... */
+		for (i = 0; i < MAX_USER_CARDS; i++) {
+			if (priv->cards[i].pdev == pdev) {
+				if (io_state & VGA_RSRC_LEGACY_IO)
+					priv->cards[i].io_cnt++;
+				if (io_state & VGA_RSRC_LEGACY_MEM)
+					priv->cards[i].mem_cnt++;
+				break;
+			}
+		}
+
+		ret_val = count;
+		goto done;
+	} else if (strncmp(curr_pos, "unlock ", 7) == 0) {
+		curr_pos += 7;
+		remaining -= 7;
+
+		pr_devel("client 0x%X called 'unlock'\n", (int)priv);
+
+		if (strncmp(curr_pos, "all", 3) == 0)
+			io_state = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM;
+		else {
+			if (!vga_str_to_iostate
+			    (curr_pos, remaining, &io_state)) {
+				ret_val = -EPROTO;
+				goto done;
+			}
+			/* TODO: Add this?
+			   if (io_state == VGA_RSRC_NONE) {
+			   ret_val = -EPROTO;
+			   goto done;
+			   }
+			  */
+		}
+
+		pdev = priv->target;
+		if (priv->target == NULL) {
+			ret_val = -ENODEV;
+			goto done;
+		}
+		for (i = 0; i < MAX_USER_CARDS; i++) {
+			if (priv->cards[i].pdev == pdev)
+				uc = &priv->cards[i];
+		}
+
+		if (!uc)
+			return -EINVAL;
+
+		if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0)
+			return -EINVAL;
+
+		if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0)
+			return -EINVAL;
+
+		vga_put(pdev, io_state);
+
+		if (io_state & VGA_RSRC_LEGACY_IO)
+			uc->io_cnt--;
+		if (io_state & VGA_RSRC_LEGACY_MEM)
+			uc->mem_cnt--;
+
+		ret_val = count;
+		goto done;
+	} else if (strncmp(curr_pos, "trylock ", 8) == 0) {
+		curr_pos += 8;
+		remaining -= 8;
+
+		pr_devel("client 0x%X called 'trylock'\n", (int)priv);
+
+		if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) {
+			ret_val = -EPROTO;
+			goto done;
+		}
+		/* TODO: Add this?
+		   if (io_state == VGA_RSRC_NONE) {
+		   ret_val = -EPROTO;
+		   goto done;
+		   }
+		 */
+
+		pdev = priv->target;
+		if (priv->target == NULL) {
+			ret_val = -ENODEV;
+			goto done;
+		}
+
+		if (vga_tryget(pdev, io_state)) {
+			/* Update the client's locks lists... */
+			for (i = 0; i < MAX_USER_CARDS; i++) {
+				if (priv->cards[i].pdev == pdev) {
+					if (io_state & VGA_RSRC_LEGACY_IO)
+						priv->cards[i].io_cnt++;
+					if (io_state & VGA_RSRC_LEGACY_MEM)
+						priv->cards[i].mem_cnt++;
+					break;
+				}
+			}
+			ret_val = count;
+			goto done;
+		} else {
+			ret_val = -EBUSY;
+			goto done;
+		}
+
+	} else if (strncmp(curr_pos, "target ", 7) == 0) {
+		unsigned int domain, bus, devfn;
+		struct vga_device *vgadev;
+
+		curr_pos += 7;
+		remaining -= 7;
+		pr_devel("client 0x%X called 'target'\n", (int)priv);
+		/* if target is default */
+		if (!strncmp(buf, "default", 7))
+			pdev = pci_dev_get(vga_default_device());
+		else {
+			if (!vga_pci_str_to_vars(curr_pos, remaining,
+						 &domain, &bus, &devfn)) {
+				ret_val = -EPROTO;
+				goto done;
+			}
+
+			pdev = pci_get_bus_and_slot(bus, devfn);
+			if (!pdev) {
+				pr_info("vgaarb: invalid PCI address!\n");
+				ret_val = -ENODEV;
+				goto done;
+			}
+		}
+
+		vgadev = vgadev_find(pdev);
+		if (vgadev == NULL) {
+			pr_info("vgaarb: this pci device is not a vga device\n");
+			pci_dev_put(pdev);
+			ret_val = -ENODEV;
+			goto done;
+		}
+
+		priv->target = pdev;
+		for (i = 0; i < MAX_USER_CARDS; i++) {
+			if (priv->cards[i].pdev == pdev)
+				break;
+			if (priv->cards[i].pdev == NULL) {
+				priv->cards[i].pdev = pdev;
+				priv->cards[i].io_cnt = 0;
+				priv->cards[i].mem_cnt = 0;
+				break;
+			}
+		}
+		if (i == MAX_USER_CARDS) {
+			pr_err("vgaarb: maximum user cards number reached!\n");
+			pci_dev_put(pdev);
+			/* XXX: which value to return? */
+			ret_val =  -ENOMEM;
+			goto done;
+		}
+
+		ret_val = count;
+		pci_dev_put(pdev);
+		goto done;
+
+
+	} else if (strncmp(curr_pos, "decodes ", 8) == 0) {
+		curr_pos += 8;
+		remaining -= 8;
+		pr_devel("vgaarb: client 0x%X called 'decodes'\n", (int)priv);
+
+		if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) {
+			ret_val = -EPROTO;
+			goto done;
+		}
+		pdev = priv->target;
+		if (priv->target == NULL) {
+			ret_val = -ENODEV;
+			goto done;
+		}
+
+		__vga_set_legacy_decoding(pdev, io_state, true);
+		ret_val = count;
+		goto done;
+	}
+	/* If we got here, the message written is not part of the protocol! */
+	kfree(kbuf);
+	return -EPROTO;
+
+done:
+	kfree(kbuf);
+	return ret_val;
+}
+
+static unsigned int vga_arb_fpoll(struct file *file, poll_table * wait)
+{
+	struct vga_arb_private *priv = file->private_data;
+
+	pr_devel("%s\n", __func__);
+
+	if (priv == NULL)
+		return -ENODEV;
+	poll_wait(file, &vga_wait_queue, wait);
+	return POLLIN;
+}
+
+static int vga_arb_open(struct inode *inode, struct file *file)
+{
+	struct vga_arb_private *priv;
+	unsigned long flags;
+
+	pr_devel("%s\n", __func__);
+
+	priv = kmalloc(sizeof(struct vga_arb_private), GFP_KERNEL);
+	if (priv == NULL)
+		return -ENOMEM;
+	memset(priv, 0, sizeof(*priv));
+	spin_lock_init(&priv->lock);
+	file->private_data = priv;
+
+	spin_lock_irqsave(&vga_user_lock, flags);
+	list_add(&priv->list, &vga_user_list);
+	spin_unlock_irqrestore(&vga_user_lock, flags);
+
+	/* Set the client' lists of locks */
+	priv->target = vga_default_device(); /* Maybe this is still null! */
+	priv->cards[0].pdev = priv->target;
+	priv->cards[0].io_cnt = 0;
+	priv->cards[0].mem_cnt = 0;
+
+
+	return 0;
+}
+
+static int vga_arb_release(struct inode *inode, struct file *file)
+{
+	struct vga_arb_private *priv = file->private_data;
+	struct vga_arb_user_card *uc;
+	unsigned long flags;
+	int i;
+
+	pr_devel("%s\n", __func__);
+
+	if (priv == NULL)
+		return -ENODEV;
+
+	spin_lock_irqsave(&vga_user_lock, flags);
+	list_del(&priv->list);
+	for (i = 0; i < MAX_USER_CARDS; i++) {
+		uc = &priv->cards[i];
+		if (uc->pdev == NULL)
+			continue;
+		pr_devel("uc->io_cnt == %d, uc->mem_cnt == %d\n",
+			 uc->io_cnt, uc->mem_cnt);
+		while (uc->io_cnt--)
+			vga_put(uc->pdev, VGA_RSRC_LEGACY_IO);
+		while (uc->mem_cnt--)
+			vga_put(uc->pdev, VGA_RSRC_LEGACY_MEM);
+	}
+	spin_unlock_irqrestore(&vga_user_lock, flags);
+
+	kfree(priv);
+
+	return 0;
+}
+
+static void vga_arb_device_card_gone(struct pci_dev *pdev)
+{
+}
+
+/*
+ * callback any registered clients to let them know we have a
+ * change in VGA cards
+ */
+static void vga_arbiter_notify_clients(void)
+{
+	struct vga_device *vgadev;
+	unsigned long flags;
+	uint32_t new_decodes;
+	bool new_state;
+
+	if (!vga_arbiter_used)
+		return;
+
+	spin_lock_irqsave(&vga_lock, flags);
+	list_for_each_entry(vgadev, &vga_list, list) {
+		if (vga_count > 1)
+			new_state = false;
+		else
+			new_state = true;
+		if (vgadev->set_vga_decode) {
+			new_decodes = vgadev->set_vga_decode(vgadev->cookie, new_state);
+			vga_update_device_decodes(vgadev, new_decodes);
+		}
+	}
+	spin_unlock_irqrestore(&vga_lock, flags);
+}
+
+static int pci_notify(struct notifier_block *nb, unsigned long action,
+		      void *data)
+{
+	struct device *dev = data;
+	struct pci_dev *pdev = to_pci_dev(dev);
+
+	pr_devel("%s\n", __func__);
+
+	/* For now we're only intereted in devices added and removed. I didn't
+	 * test this thing here, so someone needs to double check for the
+	 * cases of hotplugable vga cards. */
+	if (action == BUS_NOTIFY_ADD_DEVICE)
+		vga_arbiter_add_pci_device(pdev);
+	else if (action == BUS_NOTIFY_DEL_DEVICE)
+		vga_arbiter_del_pci_device(pdev);
+
+	vga_arbiter_notify_clients();
+	return 0;
+}
+
+static struct notifier_block pci_notifier = {
+	.notifier_call = pci_notify,
+};
+
+static const struct file_operations vga_arb_device_fops = {
+	.read = vga_arb_read,
+	.write = vga_arb_write,
+	.poll = vga_arb_fpoll,
+	.open = vga_arb_open,
+	.release = vga_arb_release,
+};
+
+static struct miscdevice vga_arb_device = {
+	MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops
+};
+
+static int __init vga_arb_device_init(void)
+{
+	int rc;
+	struct pci_dev *pdev;
+
+	rc = misc_register(&vga_arb_device);
+	if (rc < 0)
+		pr_err("vgaarb: error %d registering device\n", rc);
+
+	bus_register_notifier(&pci_bus_type, &pci_notifier);
+
+	/* We add all pci devices satisfying vga class in the arbiter by
+	 * default */
+	pdev = NULL;
+	while ((pdev =
+		pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+			       PCI_ANY_ID, pdev)) != NULL)
+		vga_arbiter_add_pci_device(pdev);
+
+	pr_info("vgaarb: loaded\n");
+	return rc;
+}
+subsys_initcall(vga_arb_device_init);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index dbd0f94..d837606 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2502,6 +2502,50 @@ int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type)
 	return 0;
 }
 
+/**
+ * pci_set_vga_state - set VGA decode state on device and parents if requested
+ * @dev the PCI device
+ * @decode - true = enable decoding, false = disable decoding
+ * @command_bits PCI_COMMAND_IO and/or PCI_COMMAND_MEMORY
+ * @change_bridge - traverse ancestors and change bridges
+ */
+int pci_set_vga_state(struct pci_dev *dev, bool decode,
+		      unsigned int command_bits, bool change_bridge)
+{
+	struct pci_bus *bus;
+	struct pci_dev *bridge;
+	u16 cmd;
+
+	WARN_ON(command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY));
+
+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
+	if (decode == true)
+		cmd |= command_bits;
+	else
+		cmd &= ~command_bits;
+	pci_write_config_word(dev, PCI_COMMAND, cmd);
+
+	if (change_bridge == false)
+		return 0;
+
+	bus = dev->bus;
+	while (bus) {
+		bridge = bus->self;
+		if (bridge) {
+			pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
+					     &cmd);
+			if (decode == true)
+				cmd |= PCI_BRIDGE_CTL_VGA;
+			else
+				cmd &= ~PCI_BRIDGE_CTL_VGA;
+			pci_write_config_word(bridge, PCI_BRIDGE_CONTROL,
+					      cmd);
+		}
+		bus = bus->parent;
+	}
+	return 0;
+}
+
 #define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE
 static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
 spinlock_t resource_alignment_lock = SPIN_LOCK_UNLOCKED;
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8afcf08..f4ed145 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -7,6 +7,8 @@ menu "Graphics support"
 
 source "drivers/char/agp/Kconfig"
 
+source "drivers/gpu/vga/Kconfig"
+
 source "drivers/gpu/drm/Kconfig"
 
 config VGASTATE
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 115fb7b..7ba6eba 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -805,6 +805,8 @@ int pci_cfg_space_size_ext(struct pci_dev *dev);
 int pci_cfg_space_size(struct pci_dev *dev);
 unsigned char pci_bus_max_busnr(struct pci_bus *bus);
 
+int pci_set_vga_state(struct pci_dev *pdev, bool decode,
+		      unsigned int command_bits, bool change_bridge);
 /* kmem_cache style wrapper around pci_alloc_consistent() */
 
 #include <linux/dmapool.h>
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
new file mode 100644
index 0000000..68229ce
--- /dev/null
+++ b/include/linux/vgaarb.h
@@ -0,0 +1,195 @@
+/*
+ * vgaarb.c
+ *
+ * (C) Copyright 2005 Benjamin Herrenschmidt <benh at kernel.crashing.org>
+ * (C) Copyright 2007 Paulo R. Zanoni <przanoni at gmail.com>
+ * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti at freedesktop.org>
+ */
+
+#ifndef LINUX_VGA_H
+
+#include <asm/vga.h>
+
+/* Legacy VGA regions */
+#define VGA_RSRC_NONE	       0x00
+#define VGA_RSRC_LEGACY_IO     0x01
+#define VGA_RSRC_LEGACY_MEM    0x02
+#define VGA_RSRC_LEGACY_MASK   (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM)
+/* Non-legacy access */
+#define VGA_RSRC_NORMAL_IO     0x04
+#define VGA_RSRC_NORMAL_MEM    0x08
+
+/* Passing that instead of a pci_dev to use the system "default"
+ * device, that is the one used by vgacon. Archs will probably
+ * have to provide their own vga_default_device();
+ */
+#define VGA_DEFAULT_DEVICE     (NULL)
+
+/* For use by clients */
+
+/**
+ *     vga_set_legacy_decoding
+ *
+ *     @pdev: pci device of the VGA card
+ *     @decodes: bit mask of what legacy regions the card decodes
+ *
+ *     Indicates to the arbiter if the card decodes legacy VGA IOs,
+ *     legacy VGA Memory, both, or none. All cards default to both,
+ *     the card driver (fbdev for example) should tell the arbiter
+ *     if it has disabled legacy decoding, so the card can be left
+ *     out of the arbitration process (and can be safe to take
+ *     interrupts at any time.
+ */
+extern void vga_set_legacy_decoding(struct pci_dev *pdev,
+									unsigned int decodes);
+
+/**
+ *     vga_get         - acquire & locks VGA resources
+ *
+ *     pdev: pci device of the VGA card or NULL for the system default
+ *     rsrc: bit mask of resources to acquire and lock
+ *     interruptible: blocking should be interruptible by signals ?
+ *
+ *     This function acquires VGA resources for the given
+ *     card and mark those resources locked. If the resource requested
+ *     are "normal" (and not legacy) resources, the arbiter will first check
+ *     wether the card is doing legacy decoding for that type of resource. If
+ *     yes, the lock is "converted" into a legacy resource lock.
+ *     The arbiter will first look for all VGA cards that might conflict
+ *     and disable their IOs and/or Memory access, inlcuding VGA forwarding
+ *     on P2P bridges if necessary, so that the requested resources can
+ *     be used. Then, the card is marked as locking these resources and
+ *     the IO and/or Memory accesse are enabled on the card (including
+ *     VGA forwarding on parent P2P bridges if any).
+ *     This function will block if some conflicting card is already locking
+ *     one of the required resources (or any resource on a different bus
+ *     segment, since P2P bridges don't differenciate VGA memory and IO
+ *     afaik). You can indicate wether this blocking should be interruptible
+ *     by a signal (for userland interface) or not.
+ *     Must not be called at interrupt time or in atomic context.
+ *     If the card already owns the resources, the function succeeds.
+ *     Nested calls are supported (a per-resource counter is maintained)
+ */
+
+extern int vga_get(struct pci_dev *pdev, unsigned int rsrc,
+											int interruptible);
+
+/**
+ *     vga_get_interruptible
+ *
+ *     Shortcut to vga_get
+ */
+
+static inline int vga_get_interruptible(struct pci_dev *pdev,
+										unsigned int rsrc)
+{
+       return vga_get(pdev, rsrc, 1);
+}
+
+/**
+ *     vga_get_interruptible
+ *
+ *     Shortcut to vga_get
+ */
+
+static inline int vga_get_uninterruptible(struct pci_dev *pdev,
+											unsigned int rsrc)
+{
+       return vga_get(pdev, rsrc, 0);
+}
+
+/**
+ *     vga_tryget      - try to acquire & lock legacy VGA resources
+ *
+ *     @pdev: pci devivce of VGA card or NULL for system default
+ *     @rsrc: bit mask of resources to acquire and lock
+ *
+ *     This function performs the same operation as vga_get(), but
+ *     will return an error (-EBUSY) instead of blocking if the resources
+ *     are already locked by another card. It can be called in any context
+ */
+
+extern int vga_tryget(struct pci_dev *pdev, unsigned int rsrc);
+
+/**
+ *     vga_put         - release lock on legacy VGA resources
+ *
+ *     @pdev: pci device of VGA card or NULL for system default
+ *     @rsrc: but mask of resource to release
+ *
+ *     This function releases resources previously locked by vga_get()
+ *     or vga_tryget(). The resources aren't disabled right away, so
+ *     that a subsequence vga_get() on the same card will succeed
+ *     immediately. Resources have a counter, so locks are only
+ *     released if the counter reaches 0.
+ */
+
+extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
+
+
+/**
+ *     vga_default_device
+ *
+ *     This can be defined by the platform. The default implementation
+ *     is rather dumb and will probably only work properly on single
+ *     vga card setups and/or x86 platforms.
+ *
+ *     If your VGA default device is not PCI, you'll have to return
+ *     NULL here. In this case, I assume it will not conflict with
+ *     any PCI card. If this is not true, I'll have to define two archs
+ *     hooks for enabling/disabling the VGA default device if that is
+ *     possible. This may be a problem with real _ISA_ VGA cards, in
+ *     addition to a PCI one. I don't know at this point how to deal
+ *     with that card. Can theirs IOs be disabled at all ? If not, then
+ *     I suppose it's a matter of having the proper arch hook telling
+ *     us about it, so we basically never allow anybody to succeed a
+ *     vga_get()...
+ */
+
+#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
+extern struct pci_dev *vga_default_device(void);
+#endif
+
+/**
+ *     vga_conflicts
+ *
+ *     Architectures should define this if they have several
+ *     independant PCI domains that can afford concurrent VGA
+ *     decoding
+ */
+
+#ifndef __ARCH_HAS_VGA_CONFLICT
+static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
+{
+       return 1;
+}
+#endif
+
+/*
+ * Register a client with the VGA arbitration logic
+ * return value: number of VGA devices in system.
+ *
+ * Clients have two callback mechanisms they can use.
+ * irq enable/disable callback -
+ *    If a client can't disable its GPUs VGA resources, then we
+ *    need to be able to ask it to turn off its irqs when we
+ *    turn off its mem and io decoding.
+ * set_vga_decode
+ *    If a client can disable its GPU VGA resource, it will
+ *    get a callback from this to set the encode/decode state
+ *
+ * Clients with disable abilities should check the return value
+ * of this function and if the VGA device count is > 1, should
+ * disable VGA decoding resources.
+ *
+ * Rationale: we cannot disable VGA decode resources unconditionally
+ * some single GPU laptops seem to require ACPI or BIOS access to the
+ * VGA registers to control things like backlights etc.
+ * Hopefully newer multi-GPU laptops do something saner, and desktops
+ * won't have any special ACPI for this.
+ */
+int vga_client_register(struct pci_dev *pdev, void *cookie,
+			void (*irq_set_state)(void *cookie, bool state),
+			unsigned int (*set_vga_decode)(void *cookie, bool state));
+
+#endif /* LINUX_VGA_H */
-- 
1.5.4.1


linux-2.6.30-hush-rom-warning.patch:
 setup-res.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.30-hush-rom-warning.patch ---
diff -up linux-2.6.30.noarch/drivers/pci/setup-res.c.jx linux-2.6.30.noarch/drivers/pci/setup-res.c
--- linux-2.6.30.noarch/drivers/pci/setup-res.c.jx	2009-07-27 17:56:13.000000000 -0400
+++ linux-2.6.30.noarch/drivers/pci/setup-res.c	2009-07-27 17:58:25.000000000 -0400
@@ -101,6 +101,7 @@ int pci_claim_resource(struct pci_dev *d
 	struct resource *res = &dev->resource[resource];
 	struct resource *root;
 	int err;
+	const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
 
 	root = pci_find_parent_resource(dev, res);
 
@@ -108,8 +109,13 @@ int pci_claim_resource(struct pci_dev *d
 	if (root != NULL)
 		err = request_resource(root, res);
 
-	if (err) {
-		const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
+	if (err && resource == 6) {
+		dev_info(&dev->dev, "BAR %d: %s of %s %pR\n",
+			resource,
+			root ? "address space collision on" :
+				"no parent found for",
+			dtype, res);
+	} else if (err) {
 		dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
 			resource,
 			root ? "address space collision on" :

linux-2.6.30-no-pcspkr-modalias.patch:
 pcspkr.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE linux-2.6.30-no-pcspkr-modalias.patch ---
diff -up linux-2.6.30.noarch/drivers/input/misc/pcspkr.c.jx linux-2.6.30.noarch/drivers/input/misc/pcspkr.c
--- linux-2.6.30.noarch/drivers/input/misc/pcspkr.c.jx	2009-07-28 16:54:44.000000000 -0400
+++ linux-2.6.30.noarch/drivers/input/misc/pcspkr.c	2009-07-28 16:59:36.000000000 -0400
@@ -23,7 +23,6 @@
 MODULE_AUTHOR("Vojtech Pavlik <vojtech at ucw.cz>");
 MODULE_DESCRIPTION("PC Speaker beeper driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:pcspkr");
 
 #if defined(CONFIG_MIPS) || defined(CONFIG_X86)
 /* Use the global PIT lock ! */


--- NEW FILE patch-2.6.31-rc5-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKeMweyGugalF9Dw4RAp18AJ9Ch7DQJA5GwevbuXDXattxayrJMACfSDOb
t3+OUGZ1dQ2Y8+z9QDVk2zM=
=HbQm
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.31-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKc5FayGugalF9Dw4RAhV0AJwOz4HlfA1WCi74lPIuro8pDNPrzgCgh/ag
vf8aBky58al8AnVRvhpNaIs=
=vgyD
-----END PGP SIGNATURE-----

revert-ftrace-powerpc-snafu.patch:
 recordmcount.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE revert-ftrace-powerpc-snafu.patch ---
commit 4e7fea66de82caf76bf11213150b629562cca74b
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date:   Wed Aug 5 17:07:10 2009 +1000

    Revert "ftrace: Fix the conditional that updates $ref_func"
    
    This reverts commit fc4c73554c9d93b3e495f2f7acae1323b0d5db84.

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index d29baa2..d99b343 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -414,7 +414,7 @@ while (<IN>) {
 	    $offset = hex $1;
 	} else {
 	    # if we already have a function, and this is weak, skip it
-	    if (!defined($ref_func) && !defined($weak{$text})) {
+	    if (!defined($ref_func) || !defined($weak{$text})) {
 		$ref_func = $text;
 		$offset = hex $1;
 	    }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.21
retrieving revision 1.1014.2.22
diff -u -p -r1.1014.2.21 -r1.1014.2.22
--- .cvsignore	15 Jul 2009 20:58:03 -0000	1.1014.2.21
+++ .cvsignore	5 Aug 2009 23:00:08 -0000	1.1014.2.22
@@ -5,4 +5,5 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc3.bz2
+patch-2.6.31-rc5.bz2
+patch-2.6.31-rc5-git3.bz2


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.70
retrieving revision 1.70.6.1
diff -u -p -r1.70 -r1.70.6.1
--- Makefile.config	5 Feb 2009 21:11:18 -0000	1.70
+++ Makefile.config	5 Aug 2009 23:00:08 -0000	1.70.6.1
@@ -5,7 +5,7 @@
 CFG		= kernel-$(VERSION)
 
 CONFIGFILES	= \
-	$(CFG)-i586.config $(CFG)-i586-debug.config \
+	$(CFG)-i686.config $(CFG)-i686-debug.config \
 	$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config $(CFG)-arm.config \
@@ -68,10 +68,10 @@ kernel-$(VERSION)-i686-PAE.config: confi
 kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i586.config: config-i586 temp-x86-generic
+kernel-$(VERSION)-i686.config: /dev/null temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i586-debug.config: config-i586 temp-x86-debug-generic
+kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.54.6.8
retrieving revision 1.54.6.9
diff -u -p -r1.54.6.8 -r1.54.6.9
--- TODO	27 Jun 2009 11:05:09 -0000	1.54.6.8
+++ TODO	5 Aug 2009 23:00:08 -0000	1.54.6.9
@@ -59,8 +59,11 @@
 * linux-2.6-execshield.patch
 	Not interesting to upstream.
 
-* linux-2.6.29-lirc.patch
 * linux-2.6-sysrq-c.patch
+* linux-2.6.31-lirc.patch
+* lirc_streamzap-buffer-rework.patch
+* hdpvr-ir-enable.patch
+* hid-ignore-all-recent-imon-devices.patch
 	jarod working on upstreaming
 
 * linux-2.6-silence-acpi-blacklist.patch
@@ -81,3 +84,6 @@
 * 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: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.23.6.3
retrieving revision 1.23.6.4
diff -u -p -r1.23.6.3 -r1.23.6.4
--- config-debug	3 Jul 2009 18:54:45 -0000	1.23.6.3
+++ config-debug	5 Aug 2009 23:00:08 -0000	1.23.6.4
@@ -50,4 +50,3 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
-


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.31
retrieving revision 1.238.6.32
diff -u -p -r1.238.6.31 -r1.238.6.32
--- config-generic	15 Jul 2009 21:32:22 -0000	1.238.6.31
+++ config-generic	5 Aug 2009 23:00:08 -0000	1.238.6.32
@@ -16,7 +16,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
 CONFIG_BUILD_DOCSRC=y
-CONFIG_DYNAMIC_DEBUG=y
 
 #
 # General setup
@@ -97,7 +96,6 @@ CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-# CONFIG_DEBUG_KOBJECT is not set
 
 #
 # PCMCIA/CardBus support
@@ -2177,7 +2175,8 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -2246,6 +2245,7 @@ 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
 
 #
 # PCMCIA character devices
@@ -2777,6 +2777,7 @@ CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
@@ -2811,6 +2812,8 @@ CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_USB_GSPCA_SONIXB=m
 CONFIG_USB_GSPCA_SONIXJ=m
 CONFIG_USB_GSPCA_SPCA500=m
@@ -2867,6 +2870,7 @@ CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
 
 #
 # USB Host-to-Host Cables
@@ -3353,22 +3357,6 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_KGDB_TESTS=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 
-# These debug options are deliberatly left on.
-# They aren't that much of a performance impact, and the value
-# from getting out-of-tree modules fixed is worth the trade-off.
-CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DEBUG_SLAB_LEAK=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DEBUG_DEVRES=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_NX_TEST=m
-CONFIG_DEBUG_BOOT_PARAMS=y
-
 #
 # Security options
 #
@@ -3517,12 +3505,9 @@ CONFIG_PROC_PID_CPUSET=y
 
 CONFIG_RELAY=y
 # CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
 
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
 
 CONFIG_KEXEC=y
 
@@ -3775,6 +3760,7 @@ CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_APM_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_PMU=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_MAX17040=m
@@ -4013,6 +3999,7 @@ CONFIG_STRIP_ASM_SYMS=y
 
 # CONFIG_RCU_FANOUT_EXACT is not set
 
+CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 
 CONFIG_FSNOTIFY=y
@@ -4032,9 +4019,33 @@ CONFIG_PPS=m
 # CONFIG_RDC_17F3101X is not set
 # CONFIG_FB_UDL is not set
 
+# DEBUG options that don't get enabled/disabled with 'make debug/release'
+#
+# Kmemleak still produces a lot of false positives.
 # CONFIG_DEBUG_KMEMLEAK is not set
-
 #
+# This generates a huge amount of dmesg spew
+# CONFIG_DEBUG_KOBJECT 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
+# from getting useful bug-reports makes it worth leaving them on.
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_NX_TEST=m
+CONFIG_DEBUG_BOOT_PARAMS=y
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+
 # added for xen pvops patch
 #
 CONFIG_XEN_DOM0=y


Index: config-i686-PAE
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i686-PAE,v
retrieving revision 1.1.18.1
retrieving revision 1.1.18.2
diff -u -p -r1.1.18.1 -r1.1.18.2
--- config-i686-PAE	27 Jun 2009 11:05:10 -0000	1.1.18.1
+++ config-i686-PAE	5 Aug 2009 23:00:09 -0000	1.1.18.2
@@ -1,5 +1,3 @@
-CONFIG_M686=y
-# CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.31.6.4
retrieving revision 1.31.6.5
diff -u -p -r1.31.6.4 -r1.31.6.5
--- config-nodebug	3 Jul 2009 18:54:45 -0000	1.31.6.4
+++ config-nodebug	5 Aug 2009 23:00:09 -0000	1.31.6.5
@@ -49,4 +49,3 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
-


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.33.6.8
retrieving revision 1.33.6.9
diff -u -p -r1.33.6.8 -r1.33.6.9
--- config-powerpc-generic	10 Jul 2009 19:04:29 -0000	1.33.6.8
+++ config-powerpc-generic	5 Aug 2009 23:00:09 -0000	1.33.6.9
@@ -312,7 +312,7 @@ CONFIG_USB_FHCI_HCD=m
 
 # CONFIG_DRM_RADEON_KMS is not set
 
-CONFIG_AMIGAONE=y
+# CONFIG_AMIGAONE is not set
 
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.30.6.2
retrieving revision 1.30.6.3
diff -u -p -r1.30.6.2 -r1.30.6.3
--- config-powerpc32-generic	27 Jun 2009 11:05:10 -0000	1.30.6.2
+++ config-powerpc32-generic	5 Aug 2009 23:00:09 -0000	1.30.6.3
@@ -187,3 +187,5 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_RCU_FANOUT=32
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_EVENT_PROFILE=y
+


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.27.6.3
retrieving revision 1.27.6.4
diff -u -p -r1.27.6.3 -r1.27.6.4
--- config-powerpc64	27 Jun 2009 11:05:10 -0000	1.27.6.3
+++ config-powerpc64	5 Aug 2009 23:00:09 -0000	1.27.6.4
@@ -185,3 +185,4 @@ CONFIG_RELOCATABLE=y
 CONFIG_RCU_FANOUT=64
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_EVENT_PROFILE=y


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.11.6.3
retrieving revision 1.11.6.4
diff -u -p -r1.11.6.3 -r1.11.6.4
--- config-s390x	27 Jun 2009 11:05:10 -0000	1.11.6.3
+++ config-s390x	5 Aug 2009 23:00:09 -0000	1.11.6.4
@@ -228,3 +228,5 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="/dev/jokes"
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_EVENT_PROFILE=y
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.14
retrieving revision 1.68.6.15
diff -u -p -r1.68.6.14 -r1.68.6.15
--- config-x86-generic	10 Jul 2009 19:04:29 -0000	1.68.6.14
+++ config-x86-generic	5 Aug 2009 23:00:09 -0000	1.68.6.15
@@ -26,7 +26,7 @@ CONFIG_X86_BIGSMP=y
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
+CONFIG_M686=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
@@ -75,7 +75,11 @@ CONFIG_X86_CPU_DEBUG=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
+
 CONFIG_HIGHPTE=n
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
@@ -468,6 +472,7 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_OLD_MCE is not set
 CONFIG_X86_MCE_INTEL=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.13
retrieving revision 1.68.2.14
diff -u -p -r1.68.2.13 -r1.68.2.14
--- config-x86_64-generic	10 Jul 2009 19:04:29 -0000	1.68.2.13
+++ config-x86_64-generic	5 Aug 2009 23:00:10 -0000	1.68.2.14
@@ -377,5 +377,6 @@ CONFIG_RCU_FANOUT=64
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_MCE_INJECT is not set

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   30 
 drivers/gpu/drm/Makefile                    |    1 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5056 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  227 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  557 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  622 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  595 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   52 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   88 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  143 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  144 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  369 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1131 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   49 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   43 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     | 1027 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_fifo.c      |  683 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  751 
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1018 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  431 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  246 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  567 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  192 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  825 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  116 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1143 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_display.c      |  250 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  291 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  146 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  586 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  192 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_output.c       |  797 +
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv20_graph.c        |  958 +
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  222 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  811 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  153 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  284 
 drivers/gpu/drm/nouveau/nv50_display.c      |  849 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  264 
 drivers/gpu/drm/nouveau/nvreg.h             |  503 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/nouveau_drm.h                   |  214 
 75 files changed, 54259 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.13 -r 1.8.6.14 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.13
retrieving revision 1.8.6.14
diff -u -p -r1.8.6.13 -r1.8.6.14
--- drm-nouveau.patch	15 Jul 2009 20:58:03 -0000	1.8.6.13
+++ drm-nouveau.patch	5 Aug 2009 23:00:12 -0000	1.8.6.14
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..3339338 100644
+index 39b393d..5ea10e5 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -143,3 +143,22 @@ config DRM_SAVAGE
+@@ -143,3 +143,33 @@ 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.
@@ -14,6 +14,9 @@ index 39b393d..3339338 100644
 +	select FB_CFB_FILLRECT
 +	select FB_CFB_COPYAREA
 +	select FB_CFB_IMAGEBLIT
++	select FB
++	select FRAMEBUFFER_CONSOLE if !EMBEDDED
++	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
 +	help
 +	  Choose this option for open-source nVidia support.
 +
@@ -25,6 +28,14 @@ index 39b393d..3339338 100644
 +	and you have a new enough userspace to support this. Running old
 +	userspaces with this enabled will cause pain.
 +
++config DRM_NOUVEAU_BACKLIGHT
++	bool "Support for backlight control"
++	depends on DRM_NOUVEAU
++	default y
++	help
++	  Say Y here if you want to control the backlight of your display
++	  (e.g. a laptop panel).
++
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
 index fe23f29..4c6a38d 100644
 --- a/drivers/gpu/drm/Makefile
@@ -94,10 +105,10 @@ index 6246e3f..436e2fe 100644
  		if (map->type == _DRM_REGISTERS)
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..f5d93b5
+index 0000000..a04127f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
 +#
 +# Makefile for the drm device driver.  This driver provides support for the
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
@@ -108,7 +119,7 @@ index 0000000..f5d93b5
 +             nouveau_sgdma.o nouveau_dma.o \
 +             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_fbcon.o nouveau_backlight.o \
++	     nouveau_display.o nouveau_connector.o nouveau_fbcon.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -116,20 +127,21 @@ index 0000000..f5d93b5
 +             nv04_graph.o nv10_graph.o nv20_graph.o \
 +             nv40_graph.o nv50_graph.o \
 +             nv04_instmem.o nv50_instmem.o \
-+             nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
++             nv50_crtc.o nv50_dac.o nv50_sor.o \
 +             nv50_cursor.o nv50_display.o nv50_fbcon.o \
 +             nv04_display.o nv04_output.o nv04_crtc.o nv04_cursor.o \
-+	     nv04_fbcon.o
++             nv04_fbcon.o
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
++nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
-index 0000000..395639b
+index 0000000..20564f8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,155 @@
 +/*
 + * Copyright (C) 2009 Red Hat <mjg at redhat.com>
 + *
@@ -172,7 +184,8 @@ index 0000000..395639b
 +static int nv40_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	int val = (nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16;
++	int val = (nv_rd32(dev, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK)
++									>> 16;
 +
 +	return val;
 +}
@@ -181,9 +194,9 @@ index 0000000..395639b
 +{
 +	struct drm_device *dev = bl_get_data(bd);
 +	int val = bd->props.brightness;
-+	int reg = nv_rd32(NV40_PMC_BACKLIGHT);
++	int reg = nv_rd32(dev, NV40_PMC_BACKLIGHT);
 +
-+	nv_wr32(NV40_PMC_BACKLIGHT,
++	nv_wr32(dev, NV40_PMC_BACKLIGHT,
 +		 (val << 16) | (reg & ~NV40_PMC_BACKLIGHT_MASK));
 +
 +	return 0;
@@ -199,7 +212,7 @@ index 0000000..395639b
 +{
 +	struct drm_device *dev = bl_get_data(bd);
 +
-+	return nv_rd32(NV50_PDISPLAY_BACKLIGHT);
++	return nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT);
 +}
 +
 +static int nv50_set_intensity(struct backlight_device *bd)
@@ -207,8 +220,8 @@ index 0000000..395639b
 +	struct drm_device *dev = bl_get_data(bd);
 +	int val = bd->props.brightness;
 +
-+	nv_wr32(NV50_PDISPLAY_BACKLIGHT, val | NV50_PDISPLAY_BACKLIGHT_ENABLE);
-+
++	nv_wr32(dev, NV50_PDISPLAY_SOR_BACKLIGHT,
++		val | NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE);
 +	return 0;
 +}
 +
@@ -223,7 +236,7 @@ index 0000000..395639b
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct backlight_device *bd;
 +
-+	if (!(nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
++	if (!(nv_rd32(dev, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
 +		return 0;
 +
 +	bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,
@@ -244,7 +257,7 @@ index 0000000..395639b
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct backlight_device *bd;
 +
-+	if (!nv_rd32(NV50_PDISPLAY_BACKLIGHT))
++	if (!nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT))
 +		return 0;
 +
 +	bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,
@@ -265,13 +278,13 @@ index 0000000..395639b
 +
 +	switch (dev_priv->card_type) {
 +	case NV_40:
-+	case NV_44:
 +		return nouveau_nv40_backlight_init(dev);
-+		break;
 +	case NV_50:
 +		return nouveau_nv50_backlight_init(dev);
++	default:
 +		break;
 +	}
++
 +	return 0;
 +}
 +
@@ -286,10 +299,10 @@ index 0000000..395639b
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..f719eb4
+index 0000000..defc0c8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,4861 @@
+@@ -0,0 +1,5056 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -396,17 +409,17 @@ index 0000000..f719eb4
 +		  save_pci_nv_20 & ~NV_PBUS_PCI_NV_20_ROM_SHADOW_ENABLED);
 +
 +	/* bail if no rom signature */
-+	if (nv_rd08(NV_PROM_OFFSET) != 0x55 ||
-+	    nv_rd08(NV_PROM_OFFSET + 1) != 0xaa)
++	if (nv_rd08(dev, NV_PROM_OFFSET) != 0x55 ||
++	    nv_rd08(dev, NV_PROM_OFFSET + 1) != 0xaa)
 +		goto out;
 +
 +	/* additional check (see note below) - read PCI record header */
-+	pcir_ptr = nv_rd08(NV_PROM_OFFSET + 0x18) |
-+		   nv_rd08(NV_PROM_OFFSET + 0x19) << 8;
-+	if (nv_rd08(NV_PROM_OFFSET + pcir_ptr) != 'P' ||
-+	    nv_rd08(NV_PROM_OFFSET + pcir_ptr + 1) != 'C' ||
-+	    nv_rd08(NV_PROM_OFFSET + pcir_ptr + 2) != 'I' ||
-+	    nv_rd08(NV_PROM_OFFSET + pcir_ptr + 3) != 'R')
++	pcir_ptr = nv_rd08(dev, NV_PROM_OFFSET + 0x18) |
++		   nv_rd08(dev, NV_PROM_OFFSET + 0x19) << 8;
[...16454 lines suppressed...]
 +
-+#define NOUVEAU_DRM_HEADER_PATCHLEVEL 14
++#define NOUVEAU_DRM_HEADER_PATCHLEVEL 15
 +
 +struct drm_nouveau_channel_alloc {
 +	uint32_t     fb_ctxdma_handle;
@@ -54133,8 +54610,7 @@ index 0000000..dc6a194
 +	int          channel;
 +
 +	/* Notifier memory */
-+	drm_handle_t notifier;
-+	int          notifier_size;
++	uint32_t     notifier_handle;
 +
 +	/* DRM-enforced subchannel assignments */
 +	struct {
@@ -54142,15 +54618,6 @@ index 0000000..dc6a194
 +		uint32_t grclass;
 +	} subchan[8];
 +	uint32_t nr_subchan;
-+
-+/* !MM_ENABLED ONLY */
-+	uint32_t     put_base;
-+	/* FIFO control regs */
-+	drm_handle_t ctrl;
-+	int          ctrl_size;
-+	/* DMA command buffer */
-+	drm_handle_t cmdbuf;
-+	int          cmdbuf_size;
 +};
 +
 +struct drm_nouveau_channel_free {
@@ -54163,14 +54630,10 @@ index 0000000..dc6a194
 +	int      class;
 +};
 +
-+#define NOUVEAU_MEM_ACCESS_RO	1
-+#define NOUVEAU_MEM_ACCESS_WO	2
-+#define NOUVEAU_MEM_ACCESS_RW	3
 +struct drm_nouveau_notifierobj_alloc {
-+	int      channel;
++	uint32_t channel;
 +	uint32_t handle;
-+	int      count;
-+
++	uint32_t size;
 +	uint32_t offset;
 +};
 +
@@ -54179,52 +54642,6 @@ index 0000000..dc6a194
 +	uint32_t handle;
 +};
 +
-+/* This is needed to avoid a race condition.
-+ * Otherwise you may be writing in the fetch area.
-+ * Is this large enough, as it's only 32 bytes, and the maximum fetch size is 256 bytes?
-+ */
-+#define NOUVEAU_DMA_SKIPS 8
-+
-+#define NOUVEAU_MEM_FB			0x00000001
-+#define NOUVEAU_MEM_AGP			0x00000002
-+#define NOUVEAU_MEM_FB_ACCEPTABLE	0x00000004
-+#define NOUVEAU_MEM_AGP_ACCEPTABLE	0x00000008
-+#define NOUVEAU_MEM_PCI			0x00000010
-+#define NOUVEAU_MEM_PCI_ACCEPTABLE	0x00000020
-+#define NOUVEAU_MEM_PINNED		0x00000040
-+#define NOUVEAU_MEM_USER_BACKED		0x00000080
-+#define NOUVEAU_MEM_MAPPED		0x00000100
-+#define NOUVEAU_MEM_TILE		0x00000200
-+#define NOUVEAU_MEM_TILE_ZETA		0x00000400
-+#define NOUVEAU_MEM_INSTANCE		0x01000000 /* internal */
-+#define NOUVEAU_MEM_NOTIFIER            0x02000000 /* internal */
-+#define NOUVEAU_MEM_NOVM		0x04000000 /* internal */
-+#define NOUVEAU_MEM_USER		0x08000000 /* internal */
-+#define NOUVEAU_MEM_INTERNAL (NOUVEAU_MEM_INSTANCE | \
-+			      NOUVEAU_MEM_NOTIFIER | \
-+			      NOUVEAU_MEM_NOVM | \
-+			      NOUVEAU_MEM_USER)
-+
-+struct drm_nouveau_mem_alloc {
-+	int flags;
-+	int alignment;
-+	uint64_t size;	// in bytes
-+	uint64_t offset;
-+	drm_handle_t map_handle;
-+};
-+
-+struct drm_nouveau_mem_free {
-+	uint64_t offset;
-+	int flags;
-+};
-+
-+struct drm_nouveau_mem_tile {
-+	uint64_t offset;
-+	uint64_t delta;
-+	uint64_t size;
-+	int flags;
-+};
-+
 +/* FIXME : maybe unify {GET,SET}PARAMs */
 +#define NOUVEAU_GETPARAM_PCI_VENDOR      3
 +#define NOUVEAU_GETPARAM_PCI_DEVICE      4
@@ -54235,15 +54652,12 @@ index 0000000..dc6a194
 +#define NOUVEAU_GETPARAM_AGP_SIZE        9
 +#define NOUVEAU_GETPARAM_PCI_PHYSICAL    10
 +#define NOUVEAU_GETPARAM_CHIPSET_ID      11
-+#define NOUVEAU_GETPARAM_MM_ENABLED      12
-+#define NOUVEAU_GETPARAM_VM_VRAM_BASE    13
++#define NOUVEAU_GETPARAM_VM_VRAM_BASE    12
 +struct drm_nouveau_getparam {
 +	uint64_t param;
 +	uint64_t value;
 +};
 +
-+#define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1
-+#define NOUVEAU_SETPARAM_CMDBUF_SIZE     2
 +struct drm_nouveau_setparam {
 +	uint64_t param;
 +	uint64_t value;
@@ -54327,8 +54741,12 @@ index 0000000..dc6a194
 +	uint32_t handle;
 +};
 +
++#define NOUVEAU_GEM_CPU_PREP_NOWAIT                                  0x00000001
++#define NOUVEAU_GEM_CPU_PREP_NOBLOCK                                 0x00000002
++#define NOUVEAU_GEM_CPU_PREP_WRITE                                   0x00000004
 +struct drm_nouveau_gem_cpu_prep {
 +	uint32_t handle;
++	uint32_t flags;
 +};
 +
 +struct drm_nouveau_gem_cpu_fini {
@@ -54337,38 +54755,19 @@ index 0000000..dc6a194
 +
 +struct drm_nouveau_gem_tile {
 +	uint32_t handle;
-+	uint32_t delta;
++	uint32_t offset;
 +	uint32_t size;
-+	uint32_t flags;
-+};
-+
-+enum nouveau_card_type {
-+	NV_UNKNOWN =0,
-+	NV_04      =4,
-+	NV_05      =5,
-+	NV_10      =10,
-+	NV_11      =11,
-+	NV_17      =17,
-+	NV_20      =20,
-+	NV_30      =30,
-+	NV_40      =40,
-+	NV_44      =44,
-+	NV_50      =50,
-+	NV_LAST    =0xffff,
++	uint32_t tile_mode;
++	uint32_t tile_flags;
 +};
 +
 +enum nouveau_bus_type {
-+	NV_AGP     =0,
-+	NV_PCI     =1,
-+	NV_PCIE    =2,
++	NV_AGP     = 0,
++	NV_PCI     = 1,
++	NV_PCIE    = 2,
 +};
 +
-+#define NOUVEAU_MAX_SAREA_CLIPRECTS 16
-+
 +struct drm_nouveau_sarea {
-+	/* the cliprects */
-+	struct drm_clip_rect boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
-+	unsigned int nbox;
 +};
 +
 +#define DRM_NOUVEAU_CARD_INIT          0x00
@@ -54379,19 +54778,13 @@ index 0000000..dc6a194
 +#define DRM_NOUVEAU_GROBJ_ALLOC        0x05
 +#define DRM_NOUVEAU_NOTIFIEROBJ_ALLOC  0x06
 +#define DRM_NOUVEAU_GPUOBJ_FREE        0x07
-+#define DRM_NOUVEAU_MEM_ALLOC          0x08
-+#define DRM_NOUVEAU_MEM_FREE           0x09
-+#define DRM_NOUVEAU_MEM_TILE           0x0a
-+#define DRM_NOUVEAU_SUSPEND            0x0b
-+#define DRM_NOUVEAU_RESUME             0x0c
 +#define DRM_NOUVEAU_GEM_NEW            0x40
 +#define DRM_NOUVEAU_GEM_PUSHBUF        0x41
 +#define DRM_NOUVEAU_GEM_PUSHBUF_CALL   0x42
-+#define DRM_NOUVEAU_GEM_PIN            0x43
-+#define DRM_NOUVEAU_GEM_UNPIN          0x44
++#define DRM_NOUVEAU_GEM_PIN            0x43 /* !KMS only */
++#define DRM_NOUVEAU_GEM_UNPIN          0x44 /* !KMS only */
 +#define DRM_NOUVEAU_GEM_CPU_PREP       0x45
 +#define DRM_NOUVEAU_GEM_CPU_FINI       0x46
-+#define DRM_NOUVEAU_GEM_TILE           0x47
-+#define DRM_NOUVEAU_GEM_INFO           0x48
++#define DRM_NOUVEAU_GEM_INFO           0x47
 +
 +#endif /* __NOUVEAU_DRM_H__ */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.43
retrieving revision 1.1294.2.44
diff -u -p -r1.1294.2.43 -r1.1294.2.44
--- kernel.spec	15 Jul 2009 22:20:03 -0000	1.1294.2.43
+++ kernel.spec	5 Aug 2009 23:00:15 -0000	1.1294.2.44
@@ -1,9 +1,12 @@
+# We have to override the new %%install behavior because, well... the kernel is special.
+%global __spec_install_pre %{___build_pre}
+
 Summary: The Linux kernel
 
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 0
+%global released_kernel 0
 
 # Versions of various parts
 
@@ -57,9 +60,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 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -98,6 +101,8 @@ Summary: The Linux kernel
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+# dracut initrd-generic
+%define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
@@ -196,9 +201,8 @@ Summary: The Linux kernel
 %endif
 %define debuginfodir /usr/lib/debug
 
-# We only build -PAE for 686 as of Fedora 11.
+# kernel-PAE is only built on i686.
 %ifarch i686
-%define with_up 0
 %define with_pae 1
 %else
 %define with_pae 0
@@ -218,7 +222,7 @@ Summary: The Linux kernel
 %define with_debug 0
 %endif
 
-%define all_x86 i386 i586 i686
+%define all_x86 i386 i686
 
 %if %{with_vdso_install}
 # These arches install vdso/ directories.
@@ -250,12 +254,6 @@ Summary: The Linux kernel
 %define with_perf 0
 %endif
 
-# no need to build headers again for these arches,
-# they can just use i586 and ppc64 headers
-%ifarch i686 ppc64iseries
-%define with_headers 0
-%endif
-
 # don't build noarch kernels or headers (duh)
 %ifarch noarch
 %define with_up 0
@@ -375,7 +373,7 @@ Summary: The Linux kernel
 
 # We don't build a kernel on i386; we only do kernel-headers there,
 # and we no longer build for 31bit S390. Same for 32bit sparc and arm.
-%define nobuildarches i386 i586 ppc ppc64 ia64 sparc sparc64 390 s390x alpha alphaev56 %{arm}
+%define nobuildarches i386 ppc ppc64 ia64 sparc sparc64 390 s390x alpha alphaev56 %{arm}
 
 %ifarch %nobuildarches
 %define with_up 0
@@ -444,7 +442,7 @@ Summary: The Linux kernel
 Provides: kernel = %{rpmversion}-%{pkg_release}\
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:.%{1}}\
 Provides: kernel-drm = 4.3.0\
-Provides: kernel-drm-nouveau = 14\
+Provides: kernel-drm-nouveau = 15\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
@@ -491,7 +489,11 @@ BuildRequires: xmlto
 BuildRequires: sparse >= 0.4.1
 %endif
 %if %{with_perftool}
-BuildRequires: elfutils-libelf-devel zlib-devel
+BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel
+%endif
+%if %{with_dracut}
+BuildRequires: dracut-kernel >= 0.7
+BuildRequires: dracut-generic >= 0.7
 %endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
@@ -521,8 +523,7 @@ Source23: config-generic
 Source24: config-rhel-generic
 
 Source30: config-x86-generic
-Source31: config-i586
-Source32: config-i686-PAE
+Source31: config-i686-PAE
 
 Source40: config-x86_64-generic
 
@@ -588,6 +589,8 @@ Patch05: linux-2.6-makefile-after_link.p
 
 %if !%{nopatches}
 
+# revert powerpc breakage
+Patch08: revert-ftrace-powerpc-snafu.patch
 # revert upstream patches we get via other methods
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
@@ -608,6 +611,7 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
+Patch148: linux-2.6-ppc-perfctr-oops-fix.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -617,25 +621,35 @@ Patch250: linux-2.6-debug-sizeof-structs
 Patch260: linux-2.6-debug-nmi-timeout.patch
 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
 Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
 Patch360: linux-2.6-debug-always-inline-kzalloc.patch
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
+Patch383: linux-2.6-defaults-aspm.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
+Patch452: linux-2.6.30-no-pcspkr-modalias.patch
 
 Patch460: linux-2.6-serial-460800.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
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
+Patch601: linux-2.6-alsa-improve-hda-powerdown.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
+Patch611: alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
@@ -646,19 +660,28 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1000: linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch
-
 Patch1515: linux-2.6.31-lirc.patch
 Patch1516: lirc_streamzap-buffer-rework.patch
 Patch1517: hdpvr-ir-enable.patch
+Patch1518: hid-ignore-all-recent-imon-devices.patch
+
+Patch1550: linux-2.6-ksm.patch
+Patch1551: linux-2.6-ksm-kvm.patch
 
 # nouveau + drm fixes
-Patch1811: drm-next.patch
-Patch1812: drm-modesetting-radeon.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
+Patch1821: drm-page-flip.patch
+# anholt's tree as of 2009-08-03
+Patch1824: drm-intel-next.patch
+Patch1825: drm-intel-pm.patch
+Patch1826: drm-r600-kms.patch
+
+# vga arb
+Patch1900: linux-2.6-vga-arb.patch
+Patch1901: drm-vga-arb.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -685,6 +708,7 @@ Patch3050: linux-2.6-nfsd4-proots.patch
 Patch11010: via-hwmon-temp-sensor.patch
 
 # patches headed upstream
+Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
@@ -1091,6 +1115,7 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
+ApplyPatch revert-ftrace-powerpc-snafu.patch
 #ApplyPatch git-cpufreq.patch
 #ApplyPatch git-bluetooth.patch
 
@@ -1108,6 +1133,7 @@ ApplyPatch sched-introduce-SCHED_RESET_O
 # Architecture patches
 # x86(-64)
 ApplyPatch via-hwmon-temp-sensor.patch
+ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
 #
 # PowerPC
@@ -1123,6 +1149,8 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
+# Fix oops in 7450 perfctr
+ApplyPatch linux-2.6-ppc-perfctr-oops-fix.patch
 
 #
 # SPARC64
@@ -1144,10 +1172,17 @@ ApplyPatch linux-2.6-execshield.patch
 
 # btrfs
 
+# eCryptfs
+
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.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
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1170,6 +1205,8 @@ ApplyPatch linux-2.6-defaults-pci_no_msi
 #ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
 #ApplyPatch linux-2.6-defaults-pciehp.patch
+# enable ASPM by default on hardware we expect to work
+ApplyPatch linux-2.6-defaults-aspm.patch
 
 #
 # SCSI Bits.
@@ -1178,7 +1215,9 @@ ApplyPatch linux-2.6-defaults-pci_no_msi
 # ALSA
 # squelch hda_beep by default
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+ApplyPatch linux-2.6-alsa-improve-hda-powerdown.patch
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
+ApplyPatch alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch
 
 # Networking
 
@@ -1189,11 +1228,14 @@ ApplyPatch linux-2.6-input-kill-stupid-m
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
+ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
+
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
+ApplyPatch linux-2.6.30-hush-rom-warning.patch
 
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
@@ -1221,25 +1263,37 @@ ApplyPatch linux-2.6-crash-driver.patch
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
-ApplyPatch linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.31-lirc.patch
 # should be a short-lived patch, hopefully fixing bz#508952 w/o breaking anything else...
 ApplyPatch lirc_streamzap-buffer-rework.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
+# tell usbhid to ignore all imon devices (sent upstream 2009.07.31)
+ApplyPatch hid-ignore-all-recent-imon-devices.patch
+
+# Add kernel KSM support
+ApplyPatch linux-2.6-ksm.patch
+# Optimize KVM for KSM support
+ApplyPatch linux-2.6-ksm-kvm.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-#ApplyPatch drm-next.patch
-#ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-r600-kms.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
+ApplyPatch drm-page-flip.patch
+ApplyPatch drm-intel-next.patch
+ApplyPatch drm-intel-pm.patch
+
+# VGA arb + drm
+ApplyPatch linux-2.6-vga-arb.patch
+ApplyPatch drm-vga-arb.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1627,7 +1681,7 @@ ls $man9dir | grep -q '' || > $man9dir/B
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 cat <<EOF >>$RPM_BUILD_ROOT/usr/sbin/perf
 #!/bin/bash
-exec /usr/libexec/perf-`uname -r`
+exec /usr/libexec/perf-\$(uname -r)
 EOF
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/perf
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
@@ -1665,6 +1719,27 @@ make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib
 make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
 %endif
 
+%if %{with_dracut}
+%if !%{with_firmware}
+# dracut needs the firmware files
+    make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+%endif
+    for i in $RPM_BUILD_ROOT/lib/modules/*; do
+	[ -d $i ] || continue
+	KernelVer=${i##$RPM_BUILD_ROOT/lib/modules/}
+        depmod -b $RPM_BUILD_ROOT $KernelVer
+    	dracut  --strip \
+	    --fwdir $RPM_BUILD_ROOT/lib/firmware:/lib/firmware \
+            -k $i $RPM_BUILD_ROOT/boot/initrd-generic-${KernelVer}.img $KernelVer
+	rm -fr $i/modules.dep
+    done
+%if !%{with_firmware}
+# remove the firmware files, if ! with_firmware
+    rm -fr $RPM_BUILD_ROOT/lib/firmware 
+%endif
+%endif
+
+
 ###
 ### clean
 ###
@@ -1836,6 +1911,9 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
+%if %{with_dracut}\
+/boot/initrd-generic-%{KVERREL}%{?2:.%{2}}.img\
+%endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
 %dir /usr/src/kernels\
@@ -1875,6 +1953,197 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.132.rc5.git3
+- revert-ftrace-powerpc-snafu.patch - fix ppc build
+
+* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: respect nomodeset
+
+* Wed Aug 05 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix /usr/sbin/perf script. (#515494)
+
+* Wed Aug 05 2009 Dave Jones <davej at redhat.com>
+- Fix shift in pci cacheline size printk.
+
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.128.rc5.git3
+- 2.6.31-rc5-git3
+- drop cpufreq + set memory fixes
+
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com>
+- Add Jeromes initial r600 kms work.
+- rebase arb patch
+
+* Tue Aug 04 2009 Kyle McMartin <kyle at redhat.com>
+- alsa-tell-user-that-stream-to-be-rewound-is-suspended.patch: apply patch
+  destined for 2.6.32, requested by Lennart.
+
+* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: more code share between nv50/<nv50 kms, bug fixes
+
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com>
+- update VGA arb patches again
+
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
+- Update intel drm from anholt's tree
+- Rebase drm-intel-pm.patch to match
+- Drop gen3 fb hack, merged
+- Drop previous watermark setup change
+
+* Mon Aug 03 2009 Dave Jones <davej at redhat.com> 2.6.31-0.122.rc5.git2
+- 2.6.31-rc5-git2
+
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
+- (Attempt to) fix watermark setup on Intel 9xx parts.
+
+* Mon Aug 03 2009 Jarod Wilson <jarod at redhat.com>
+- make usbhid driver ignore all recent SoundGraph iMON devices, so the
+  lirc_imon driver can grab them instead
+
+* Mon Aug 03 2009 Dave Airlie <airlied at redhat.com>
+- update VGA arb patches
+
+* Sat Aug 01 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.118.rc5
+- Fix boot failures on ppc32 (#514010, #505071)
+
+* Fri Jul 31 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.117.rc5
+- Linux 2.6.31-rc5
+
+* Fri Jul 31 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-dell-laptop-rfkill-fix.patch: Fix up Dell rfkill
+
+* Fri Jul 31 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: build against 2.6.31-rc4-git6, fix script parsing on some G8x chips
+
+* Thu Jul 30 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31-rc4-git6
+  New config item: CONFIG_BATTERY_DS2782 is not set
+- Add last-minute set_memory_wc() fix from LKML.
+
+* Thu Jul 30 2009 Matthew Garrett <mjg at redhat.com>
+- drm-intel-pm.patch: Don't reclock external outputs. Increase the reduced
+   clock slightly to avoid upsetting some hardware. Disable renderclock
+   adjustment for the moment - it's breaking on some hardware.
+
+* Thu Jul 30 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: another DCB 1.5 entry, G80 corruption fixes, small <G80 KMS fix
+
+* Thu Jul 30 2009 Dave Airlie <airlied at redhat.com> 
+- fix VGA ARB + kms
+
+* Wed Jul 29 2009 Dave Jones <davej at redhat.com>
+- Add support for dracut. (Harald Hoyer)
+
+* Wed Jul 29 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: nv50/nva0 tiled scanout fixes, nv40 kms fixes
+
+* Wed Jul 29 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31-rc4-git3
+- Drop linux-2.6-ecryptfs-overflow-fixes.patch, merged upstream now.
+
+* Wed Jul 29 2009 Dave Airlie <airlied at redhat.com>
+- update VGA arb patches
+
+* Tue Jul 28 2009 Adam Jackson <ajax at redhat.com>
+- Remove the pcspkr modalias.  If you're still living in 1994, load it
+  by hand.
+
+* Tue Jul 28 2009 Eric Sandeen <sandeen at redhat.com> 2.6.31-0.102.rc4.git2
+- Fix eCryptfs overflow issues (CVE-2009-2406, CVE-2009-2407)
+
+* Tue Jul 28 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.101.rc4.git2
+- 2.6.31-rc4-git2
+- rebase linux-2.6-fix-usb-serial-autosuspend.diff
+- config changes:
+ - USB_GSPCA_SN9C20X=m (_EVDEV=y)
+
+* Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: cleanup userspace API, various bugfixes.
+  Looks worse than it is, register macros got cleaned up, which
+  touches pretty much everywhere..
+
+* Mon Jul 27 2009 Adam Jackson <ajax at redhat.com>
+- Warn quieter about not finding PCI bus parents for ROM BARs, they're
+  not usually needed and there's nothing you can do about it anyway.
+
+* Mon Jul 27 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-alsa-improve-hda-powerdown.patch - attempt to reduce audio glitches
+   caused by HDA powerdown
+- disable CONFIG_DEBUG_KOBJECT again for now, since it produces huge dmesg spew
+
+* Mon Jul 27 2009 Dave Airlie <airlied at redhat.com>
+- update vga arb code
+
+* Mon Jul 27 2009 Matthew Garrett <mjg at redhat.com>
+- drm-intel-pm.patch - Add runtime PM for Intel graphics
+
+* Fri Jul 24 2009 Kristian H?gsberg <krh at redhat.com>
+- Add drm-page-flip.patch to support vsynced page flipping on intel
+  chipsets.
+- Really add patch.
+- Fix patch to not break nouveau.
+
+* Fri Jul 24 2009 Chuck Ebbert <cebbert at redhat.com>
+- Enable CONFIG_DEBUG_KOBJECT in debug kernels. (#513606)
+
+* Thu Jul 23 2009 Kyle McMartin <kyle at redhat.com>
+- perf BuildRequires binutils-devel now.
+
+* Thu Jul 23 2009 Justin M. Forbes <jforbes at redhat.com>
+- Add KSM support
+
+* Thu Jul 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.87.rc4
+- Linux 2.6.31-rc4
+- config changes:
+ - USB_CDC_PHONET=m [all]
+ - EVENT_PROFILE=y [i386, x86_64, powerpc, s390]
+
+* Wed Jul 22 2009 Tom "spot" Callaway <tcallawa at redhat.com>
+- We have to override the new %%install behavior because, well... the kernel is special.
+
+* Wed Jul 22 2009 Dave Jones <davej at redhat.com>
+- 2.6.31-rc3-git5
+
+* Wed Jul 22 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.82.rc3.git4
+- Enable KMS for nouveau
+
+* Wed Jul 22 2009 Ben Skeggs <bskeggs at redhat.com>
+- Update nouveau from upstream (initial suspend/resume + misc bugfixes)
+
+* Mon Jul 20 2009 Adam Jackson <ajax at redhat.com>
+- Disable VGA arbiter patches for a moment
+
+* Mon Jul 20 2009 Adam Jackson <ajax at redhat.com>
+- Revive 4k framebuffers for intel gen3
+
+* Mon Jul 20 2009 Dave Jones <davej at redhat.com> 2.6.31-0.78.rc3.git4
+- Enable CONFIG_RTC_HCTOSYS (#489494)
+
+* Mon Jul 20 2009 Dave Jones <davej at redhat.com> 2.6.31-0.77.rc3.git4
+- Don't build 586 kernels any more.
+
+* Sun Jul 19 2009 Dave Jones <davej at redhat.com> 2.6.31-0.75.rc3.git4
+- build a 'full' package on i686 (Bill Nottingham)
+
+* Sun Jul 19 2009 Dave Jones <davej at redhat.com> 2.6.31-0.74.rc3.git4
+- 2.6.31-rc3-git4
+
+* Sat Jul 18 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-driver-level-usb-autosuspend.diff - allow drivers to enable autopm
+- linux-2.6-fix-usb-serial-autosuspend.diff - fix generic usb-serial autopm
+- linux-2.6-qcserial-autosuspend.diff - enable autopm by default on qcserial
+- linux-2.6-bluetooth-autosuspend.diff - enable autopm by default on btusb
+- linux-2.6-usb-uvc-autosuspend.diff - enable autopm by default on uvc
+
+* Thu Jul 16 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc3-git3
+
+* Thu Jul 16 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-defaults-aspm.patch - default ASPM to on for PCIe >= 1.1 hardware
+
+* Thu Jul 16 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.69.rc3
+- linux-2.6-vga-arb.patch - add VGA arbiter.
+- drm-vga-arb.patch - add VGA arbiter support to drm
+
 * Wed Jul 15 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops patch x2
 
@@ -2672,3 +2941,4 @@ fi
 # rpm-change-log-uses-utc: t
 # End:
 ###
+

linux-2.6-pci-cacheline-sizing.patch:
 common.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Index: linux-2.6-pci-cacheline-sizing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-pci-cacheline-sizing.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-pci-cacheline-sizing.patch	27 Jun 2009 11:05:15 -0000	1.1.2.2
+++ linux-2.6-pci-cacheline-sizing.patch	5 Aug 2009 23:00:16 -0000	1.1.2.3
@@ -30,7 +30,7 @@ index 2202b62..f371fe8 100644
 +	if (c->x86_clflush_size > 0) {
 +		pci_cache_line_size = c->x86_clflush_size >> 2;
 +		printk(KERN_DEBUG "PCI: pci_cache_line_size set to %d bytes\n",
-+			pci_cache_line_size >> 2);
++			pci_cache_line_size << 2);
 +	} else {
 +		pci_cache_line_size = 32 >> 2;
 +		printk(KERN_DEBUG "PCI: Unknown cacheline size. Setting to 32 bytes\n");

linux-2.6.31-lirc.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  112 +
 drivers/input/lirc/Makefile           |   20 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 ++++++
 drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 +++
 drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
 drivers/input/lirc/lirc_imon.c        | 2062 ++++++++++++++++++++++++++++++++++
 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      | 1223 ++++++++++++++++++++
 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         | 1294 +++++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  777 ++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++++
 24 files changed, 14506 insertions(+)

Index: linux-2.6.31-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.31-lirc.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.2 -r1.2.2.3
--- linux-2.6.31-lirc.patch	9 Jul 2009 22:53:02 -0000	1.2.2.2
+++ linux-2.6.31-lirc.patch	5 Aug 2009 23:00:17 -0000	1.2.2.3
@@ -51,8 +51,8 @@ index 381190c..fc79bdf 100644
 +S:	Maintained
 +
  LINUX SECURITY MODULE (LSM) FRAMEWORK
- P:	Chris Wright
- M:	chrisw at sous-sol.org
+ M:	Chris Wright <chrisw at sous-sol.org>
+ L:	linux-security-module at vger.kernel.org
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index cd50c00..442f94f 100644
 --- a/drivers/input/Kconfig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.22
retrieving revision 1.976.2.23
diff -u -p -r1.976.2.22 -r1.976.2.23
--- sources	15 Jul 2009 20:58:07 -0000	1.976.2.22
+++ sources	5 Aug 2009 23:00:18 -0000	1.976.2.23
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-39a1c949531faa70e147d0aa5be6c6ec  patch-2.6.31-rc3.bz2
+09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2
+6bc3320216b43bd8ce98e5f0565b485f  patch-2.6.31-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.21
retrieving revision 1.888.2.22
diff -u -p -r1.888.2.21 -r1.888.2.22
--- upstream	15 Jul 2009 20:58:07 -0000	1.888.2.21
+++ upstream	5 Aug 2009 23:00:18 -0000	1.888.2.22
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc3.bz2
-
+patch-2.6.31-rc5.bz2
+patch-2.6.31-rc5-git3.bz2


--- config-i586 DELETED ---


--- drm-modesetting-radeon.patch DELETED ---


--- drm-next.patch DELETED ---


--- linux-2.6-cpufreq-ppc-suspend-clusterfuck.patch DELETED ---


--- patch-2.6.31-rc3.bz2.sign DELETED ---



From jkeating at fedoraproject.org  Wed Aug  5 23:11:00 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  5 Aug 2009 23:11:00 +0000 (UTC)
Subject: rpms/python-offtrac/devel import.log, NONE, 1.1 python-offtrac.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805231100.1DAC511C0347@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/python-offtrac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29460/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-offtrac.spec 
Log Message:
New hotness



--- NEW FILE import.log ---
python-offtrac-0_0_2-1_fc11:HEAD:python-offtrac-0.0.2-1.fc11.src.rpm:1249513739


--- NEW FILE python-offtrac.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-offtrac
Version:        0.0.2
Release:        1%{?dist}
Summary:        Trac xmlrpc library

Group:          Development/Languages
License:        GPLv2+
URL:            http://fedorahosted.org/offtrac
# No tarballs are made, generate them from scm
# git clone git://git.fedorahosted.org/git/offtrac
# cd offtrac
# git checkout -b tarball %{version}
# python setup.py sdist --formats=bztar
# 
Source0:        offtrac-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel

%description
There is the offtrac python library which offers the TracServer class. This
object is how one interacts with a Trac instance via xmlrpc.


%prep
%setup -q -n offtrac-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING LICENSE README
# For noarch packages: sitelib
%{python_sitelib}/*


%changelog
* Wed Aug 05 2009 Jesse Keating <jkeating at redhat.com> - 0.0.2-1
- Fix licensing issues

* Tue Aug 04 2009 Jesse Keating <jkeating at redhat.com> - 0.0.1-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 22:55:16 -0000	1.1
+++ .cvsignore	5 Aug 2009 23:10:58 -0000	1.2
@@ -0,0 +1 @@
+offtrac-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 22:55:16 -0000	1.1
+++ sources	5 Aug 2009 23:10:59 -0000	1.2
@@ -0,0 +1 @@
+0498b93c6f4ffbfdc139124e94b2ae0a  offtrac-0.0.2.tar.bz2



From rdieter at fedoraproject.org  Wed Aug  5 23:14:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  5 Aug 2009 23:14:37 +0000 (UTC)
Subject: rpms/qt/F-10 qt-x11-opensource-src-4.5.2-timestamp.patch, NONE,
	1.1 qt.spec, 1.231, 1.232
Message-ID: <20090805231437.0D5E111C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30823

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-timestamp.patch 
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.1
- use linker scripts for _debug targets (#510246)
- apply upstream patch to fix issue in Copy and paste
- optimize (icon-mostly) scriptlets
- -x11: Requires(post,postun): /sbin/ldconfig


qt-x11-opensource-src-4.5.2-timestamp.patch:
 qapplication_x11.cpp |   36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-timestamp.patch ---
>From 9e5fa633913ef952ca4ef5312fe396bcfc885321 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
Date: Wed, 22 Jul 2009 17:12:17 +0200
Subject: [PATCH] Revert "Added a check that X11 timestamp goes forward only."

In some cases we might get an invalid timestamp that is far away in
the future, so remembering it will break all consequent X calls that
require a timestamp because it just contains junk (for example
clipboard will stop working). This happens with XIM+SCIM pair -
whenever we start input method and type something to the widget, we
get a XKeyPress event with a commited string, however the 'serial' and
'time' members of the XEvent structure are not initialized (according
to valgrind) and contain junk.

This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb.

Reviewed-By: Brad
---
 src/gui/kernel/qapplication_x11.cpp |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 163ceb6..abedfd6 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event)
 #ifdef ALIEN_DEBUG
     //qDebug() << "QApplication::x11ProcessEvent:" << event->type;
 #endif
-    Time time = 0, userTime = 0;
     switch (event->type) {
     case ButtonPress:
         pressed_window = event->xbutton.window;
-        userTime = event->xbutton.time;
+        X11->userTime = event->xbutton.time;
         // fallthrough intended
     case ButtonRelease:
-        time = event->xbutton.time;
+        X11->time = event->xbutton.time;
         break;
     case MotionNotify:
-        time = event->xmotion.time;
+        X11->time = event->xmotion.time;
         break;
     case XKeyPress:
-        userTime = event->xkey.time;
+        X11->userTime = event->xkey.time;
         // fallthrough intended
     case XKeyRelease:
-        time = event->xkey.time;
+        X11->time = event->xkey.time;
         break;
     case PropertyNotify:
-        time = event->xproperty.time;
+        X11->time = event->xproperty.time;
         break;
     case EnterNotify:
     case LeaveNotify:
-        time = event->xcrossing.time;
+        X11->time = event->xcrossing.time;
         break;
     case SelectionClear:
-        time = event->xselectionclear.time;
+        X11->time = event->xselectionclear.time;
         break;
     default:
-#ifndef QT_NO_XFIXES
-        if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) {
-            XFixesSelectionNotifyEvent *req =
-                reinterpret_cast<XFixesSelectionNotifyEvent *>(event);
-            time = req->selection_timestamp;
-        }
-#endif
         break;
     }
-    if (time > X11->time)
-        X11->time = time;
-    if (userTime > X11->userTime)
-        X11->userTime = userTime;
+#ifndef QT_NO_XFIXES
+    if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) {
+        XFixesSelectionNotifyEvent *req =
+            reinterpret_cast<XFixesSelectionNotifyEvent *>(event);
+        X11->time = req->selection_timestamp;
+    }
+#endif
 
     QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window);
 
-- 
1.6.1



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- qt.spec	2 Jul 2009 13:42:38 -0000	1.231
+++ qt.spec	5 Aug 2009 23:14:36 -0000	1.232
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -55,6 +55,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.2-timestamp.patch
 
 ## qt-copy patches
 %define qt_copy 20090626
@@ -336,6 +337,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 Obsoletes: qt4-x11 < %{version}-%{release}
 Provides:  qt4-x11 = %{version}-%{release}
 %endif
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description x11
 Qt libraries used for drawing widgets and OpenGL items.
@@ -369,6 +372,7 @@ test -x apply_patches && ./apply_patches
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
+%patch55 -p1 -b .timestamp
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -533,13 +537,17 @@ for i in * ; do
 done
 popd
 
-# _debug lib symlinks (see bug #196513)
+# _debug targets (see bug #196513)
 pushd %{buildroot}%{_qt4_libdir}
 for lib in libQt*.so ; do
-  ln -s $lib $(basename $lib .so)_debug.so
+   libbase=`basename $lib .so | sed -e 's/^lib//'`
+#  ln -s $lib lib${libbase}_debug.so
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so
 done
 for lib in libQt*.a ; do
-  ln -s $lib $(basename $lib .a)_debug.a
+   libbase=`basename $lib .a | sed -e 's/^lib//' `
+#  ln -s $lib lib${libbase}_debug.a
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.a
 done
 popd
 
@@ -649,21 +657,29 @@ rm -rf %{buildroot}
 
 %post devel
 touch --no-create %{_datadir}/icons/hicolor ||:
+
+%posttrans devel
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun devel
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
 
 %post x11
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
+
+%posttrans x11
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun x11
 /sbin/ldconfig
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+fi
 
 
 %files
@@ -856,6 +872,12 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.1
+- use linker scripts for _debug targets (#510246)
+- apply upstream patch to fix issue in Copy and paste
+- 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
 



From jkeating at fedoraproject.org  Wed Aug  5 23:14:32 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed,  5 Aug 2009 23:14:32 +0000 (UTC)
Subject: rpms/python-offtrac/F-11 import.log, NONE, 1.1 python-offtrac.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090805231432.38A1211C0347@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/python-offtrac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30759/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-offtrac.spec 
Log Message:
Put offtrac on F-11 too



--- NEW FILE import.log ---
python-offtrac-0_0_2-1_fc11:F-11:python-offtrac-0.0.2-1.fc11.src.rpm:1249514043


--- NEW FILE python-offtrac.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-offtrac
Version:        0.0.2
Release:        1%{?dist}
Summary:        Trac xmlrpc library

Group:          Development/Languages
License:        GPLv2+
URL:            http://fedorahosted.org/offtrac
# No tarballs are made, generate them from scm
# git clone git://git.fedorahosted.org/git/offtrac
# cd offtrac
# git checkout -b tarball %{version}
# python setup.py sdist --formats=bztar
# 
Source0:        offtrac-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel

%description
There is the offtrac python library which offers the TracServer class. This
object is how one interacts with a Trac instance via xmlrpc.


%prep
%setup -q -n offtrac-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING LICENSE README
# For noarch packages: sitelib
%{python_sitelib}/*


%changelog
* Wed Aug 05 2009 Jesse Keating <jkeating at redhat.com> - 0.0.2-1
- Fix licensing issues

* Tue Aug 04 2009 Jesse Keating <jkeating at redhat.com> - 0.0.1-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 22:55:16 -0000	1.1
+++ .cvsignore	5 Aug 2009 23:14:31 -0000	1.2
@@ -0,0 +1 @@
+offtrac-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 22:55:16 -0000	1.1
+++ sources	5 Aug 2009 23:14:31 -0000	1.2
@@ -0,0 +1 @@
+0498b93c6f4ffbfdc139124e94b2ae0a  offtrac-0.0.2.tar.bz2



From phuang at fedoraproject.org  Wed Aug  5 23:23:44 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed,  5 Aug 2009 23:23:44 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.36, 1.37 ibus.spec, 1.77, 1.78 sources,
	1.41, 1.42
Message-ID: <20090805232344.4727C11C0347@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32369

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20090806


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	23 Jul 2009 05:09:28 -0000	1.36
+++ .cvsignore	5 Aug 2009 23:23:43 -0000	1.37
@@ -1 +1 @@
-ibus-1.2.0.20090723.tar.gz
+ibus-1.2.0.20090806.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- ibus.spec	27 Jul 2009 23:54:35 -0000	1.77
+++ ibus.spec	5 Aug 2009 23:23:43 -0000	1.78
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090723
-Release:    3%{?dist}
+Version:    1.2.0.20090806
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -228,6 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Aug 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090806-1
+- Update to 1.2.0.20090806
+- Fix bug 515106 - don't install duplicate files
+
 * Tue Jul 28 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090723-3
 - Update xinput-ibus: setup QT_IM_MODULE if the ibus qt input method plugin exists. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	23 Jul 2009 05:09:28 -0000	1.41
+++ sources	5 Aug 2009 23:23:43 -0000	1.42
@@ -1 +1 @@
-fa9f880953d4a34a4c4e72a5db763b5f  ibus-1.2.0.20090723.tar.gz
+1bf904d8fd631ab94d2c4a81e7da6c93  ibus-1.2.0.20090806.tar.gz



From oget at fedoraproject.org  Wed Aug  5 23:27:47 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  5 Aug 2009 23:27:47 +0000 (UTC)
Subject: rpms/gnome-guitar/devel gnome-guitar.spec,1.4,1.5
Message-ID: <20090805232747.12BA911C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/gnome-guitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv568

Modified Files:
	gnome-guitar.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.1-6
- Update .desktop files
- Add missing Requires



Index: gnome-guitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-guitar/devel/gnome-guitar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-guitar.spec	25 Jul 2009 00:39:14 -0000	1.4
+++ gnome-guitar.spec	5 Aug 2009 23:27:46 -0000	1.5
@@ -4,7 +4,7 @@
 Name:            gnome-guitar
 Summary:         A small suite of applications for the guitarist
 Version:         0.8.1
-Release:         5%{?dist}
+Release:         6%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://gnome-chord.sourceforge.net/
@@ -22,6 +22,7 @@ BuildRequires:   gtk-sharp2-devel
 BuildRequires:   ImageMagick
 BuildRequires:   mono-devel
 
+Requires:        mono(gconf-sharp)
 Requires(pre):   GConf2
 Requires(post):  GConf2
 Requires(preun): GConf2
@@ -73,8 +74,18 @@ convert gnome-chord/pixmaps/gnome-chord-
 convert gnome-scale/pixmaps/gnome-scale-logo.png -resize 64x64\! \
         $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/gnome-scale.png
 
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-chord.desktop
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-scale.desktop
+desktop-file-install                                    \
+--add-category="AudioVideo"                             \
+--add-category="X-AudioVideoTools"                      \
+--dir=%{buildroot}%{_datadir}/applications              \
+%{buildroot}/%{_datadir}/applications/gnome-chord.desktop
+
+desktop-file-install                                    \
+--add-category="AudioVideo"                             \
+--add-category="X-AudioVideoTools"                      \
+--dir=%{buildroot}%{_datadir}/applications              \
+%{buildroot}/%{_datadir}/applications/gnome-scale.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -127,6 +138,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/pkgconfig/libgnomeguitarui.pc
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.1-6
+- Update .desktop files
+- Add missing Requires
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Aug  5 23:33:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  5 Aug 2009 23:33:10 +0000 (UTC)
Subject: rpms/guitarix/devel guitarix.spec,1.4,1.5
Message-ID: <20090805233310.779A711C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/guitarix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1498

Modified Files:
	guitarix.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
- Update .desktop file



Index: guitarix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guitarix/devel/guitarix.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- guitarix.spec	28 Jul 2009 02:15:37 -0000	1.4
+++ guitarix.spec	5 Aug 2009 23:33:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           guitarix
 Version:        0.05.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -52,6 +52,12 @@ sed -i 's|\.png||' %{name}.desktop
 rm -rf %{buildroot}
 ./waf -vvv install --destdir="%{buildroot}"
 
+desktop-file-install                                    \
+--add-category="X-DigitalProcessing"                    \
+--dir=%{buildroot}%{_datadir}/applications              \
+%{buildroot}/%{_datadir}/applications/%{name}.desktop
+
+
 %check
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -70,6 +76,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
+- Update .desktop file
+
 * Mon Jul 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.05.0-1
 - Update to 0.05.0
 



From dcantrel at fedoraproject.org  Wed Aug  5 23:42:45 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  5 Aug 2009 23:42:45 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhcp-4.1.0-CVE-2009-0692.patch, NONE,
	1.1 dhcp-4.1.0-CVE-2009-1892.patch, NONE, 1.1 dhcp.spec, 1.259,
	1.260 dhcp-4.1.0-lease-file-semicolons.patch, 1.1, NONE
Message-ID: <20090805234245.B4E1111C0347@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3714

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0-CVE-2009-0692.patch dhcp-4.1.0-CVE-2009-1892.patch 
Removed Files:
	dhcp-4.1.0-lease-file-semicolons.patch 
Log Message:
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-25
- Fix for CVE-2009-0692
- Fix for CVE-2009-1892 (#511834)
- Disable patch for #514828 since that fix is still in updates-testing


dhcp-4.1.0-CVE-2009-0692.patch:
 dhclient.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-4.1.0-CVE-2009-0692.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.CVE-2009-0692 dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.CVE-2009-0692	2008-06-11 10:17:10.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-08-05 11:32:24.000000000 -1000
@@ -3054,8 +3054,15 @@ void script_write_params (client, prefix
 		if (data.len > 3) {
 			struct iaddr netmask, subnet, broadcast;
 
-			memcpy (netmask.iabuf, data.data, data.len);
-			netmask.len = data.len;
+			/*
+			 * No matter the length of the subnet-mask option,
+			 * use only the first four octets.  Note that
+			 * subnet-mask options longer than 4 octets are not
+			 * in conformance with RFC 2132, but servers with this
+			 * flaw do exist.
+			 */
+			memcpy(netmask.iabuf, data.data, 4);
+			netmask.len = 4;
 			data_string_forget (&data, MDL);
 
 			subnet = subnet_number (lease -> address, netmask);

dhcp-4.1.0-CVE-2009-1892.patch:
 dhcp.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE dhcp-4.1.0-CVE-2009-1892.patch ---
diff -up dhcp-4.1.0/server/dhcp.c.CVE-2009-1892 dhcp-4.1.0/server/dhcp.c
--- dhcp-4.1.0/server/dhcp.c.CVE-2009-1892	2008-11-03 08:13:58.000000000 -1000
+++ dhcp-4.1.0/server/dhcp.c	2009-08-05 11:34:07.000000000 -1000
@@ -1755,6 +1755,8 @@ void ack_lease (packet, lease, offer, wh
 				host_reference (&host, h, MDL);
 		}
 		if (!host) {
+			if (hp)
+				host_dereference (&hp, MDL);
 			find_hosts_by_haddr (&hp,
 					     packet -> raw -> htype,
 					     packet -> raw -> chaddr,


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- dhcp.spec	5 Aug 2009 04:11:02 -0000	1.259
+++ dhcp.spec	5 Aug 2009 23:42:45 -0000	1.260
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  24%{?dist}
+Release:  25%{?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.
@@ -47,7 +47,8 @@ Patch17:  %{name}-4.1.0-invalid-dhclient
 Patch18:  %{name}-4.1.0-missing-ipv6-not-fatal.patch
 Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
-Patch21:  %{name}-4.1.0-lease-file-semicolons.patch
+Patch21:  %{name}-4.1.0-CVE-2009-0692.patch
+Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -200,9 +201,14 @@ libdhcpctl and libomapi static libraries
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19867])
 %patch20 -p1
 
-# Add missing semicolons to lines in the client lease file (#514828)
+# Fix for CVE-2009-0692 (patch from Mandriva SRPM)
+# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0692
 %patch21 -p1
 
+# Fix for CVE-2009-1892 (patch from Mandriva SRPM)
+# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
+%patch22 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -448,6 +454,11 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-25
+- Fix for CVE-2009-0692
+- Fix for CVE-2009-1892 (#511834)
+- Disable patch for #514828 since that fix is still in updates-testing
+
 * Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-24
 - Correct lease file format written by dhclient (#514828)
 


--- dhcp-4.1.0-lease-file-semicolons.patch DELETED ---



From airlied at fedoraproject.org  Wed Aug  5 23:48:17 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  5 Aug 2009 23:48:17 +0000 (UTC)
Subject: rpms/libpciaccess/devel libpciaccess-0.10.6-no-rom-fallback.patch, 
	NONE, 1.1 libpciaccess.spec, 1.25,
	1.26 libpciaccess-0.10.6-rom-sanity.patch, 1.2, NONE
Message-ID: <20090805234817.13BB811C034A@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4646

Modified Files:
	libpciaccess.spec 
Added Files:
	libpciaccess-0.10.6-no-rom-fallback.patch 
Removed Files:
	libpciaccess-0.10.6-rom-sanity.patch 
Log Message:
* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 0.10.6-7
- disable rom reading fallbacks


libpciaccess-0.10.6-no-rom-fallback.patch:
 configure.ac      |    8 ++++++++
 src/linux_sysfs.c |    6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE libpciaccess-0.10.6-no-rom-fallback.patch ---
>From 57cf6f1f428ab73fb2a88c39c694e7d14c2c96c6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 6 Aug 2009 09:39:01 +1000
Subject: [PATCH] pciaccess: make linux rom reading fallback optional

On kernels which have ROM files, the boot VGA rom file
will contain the 0xc0000 file anyways. If another card
is missing a rom file there is no need for this.

This is fallback is disabled by default, on the premise
that distro shipping this new a pciaccess will be running
on kernels with working rom support which is been upstream
for a long time
---
 configure.ac      |    8 ++++++++
 src/linux_sysfs.c |    5 +++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index c55112c..528e32b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,14 @@ AC_ARG_WITH(pciids-path, AC_HELP_STRING([--with-pciids-path=PCIIDS_PATH],
 	[Path to pci.ids file]), [pciids_path="$withval"])
 AC_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids])
 
+AC_ARG_ENABLE(linux-rom-fallback, AS_HELP_STRING([--enable-linux-rom-fallback],
+		[Enable support for falling back to /dev/mem for roms (default: enabled)]),
+		[LINUX_ROM=$enableval],[LINUX_ROM=no])
+
+if test "x$LINUX_ROM" = xyes; then
+	AC_DEFINE(LINUX_ROM, 1, [Linux ROM read fallback])
+fi
+
 use_zlib=no
 AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib],
 	[Enable zlib support to read gzip compressed pci.ids]),
diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
index 65e1cf6..02fbd13 100644
--- a/src/linux_sysfs.c
+++ b/src/linux_sysfs.c
@@ -327,10 +327,15 @@ pci_device_linux_sysfs_read_rom( struct pci_device * dev, void * buffer )
     
     fd = open( name, O_RDWR );
     if ( fd == -1 ) {
+#ifdef LINUX_ROM
 	/* If reading the ROM using sysfs fails, fall back to the old
 	 * /dev/mem based interface.
+	 * disable this for newer kernels using configure
 	 */
 	return pci_device_linux_devmem_read_rom(dev, buffer);
+#else
+	return errno;
+#endif
     }
 
 
-- 
1.5.4.1



Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libpciaccess.spec	5 Aug 2009 18:22:12 -0000	1.25
+++ libpciaccess.spec	5 Aug 2009 23:48:16 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.10.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -21,7 +21,7 @@ Patch0:		libpciaccess-fd-cache.patch
 Patch2:		libpciaccess-rom-size.patch
 Patch3:         libpciaccess-boot-vga.patch
 Patch4:		libpciaccess-vga-arbiter.patch
-Patch5:         libpciaccess-0.10.6-rom-sanity.patch
+Patch5:         libpciaccess-0.10.6-no-rom-fallback.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
 Requires:       hwdata
@@ -45,7 +45,7 @@ Development package for libpciaccess.
 %patch2 -p1 -b .rom-size
 %patch3 -p1 -b .bootvga
 %patch4 -p1 -b .vgaarb
-%patch5 -p1 -b .jx
+%patch5 -p1 -b .romfall
 
 %build
 autoreconf -v --install
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 0.10.6-7
+- disable rom reading fallbacks
+
 * Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 0.10.6-6
 - D'oh.  Fix obvious sense inversion in the previous patch.
 


--- libpciaccess-0.10.6-rom-sanity.patch DELETED ---



From oget at fedoraproject.org  Wed Aug  5 23:52:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  5 Aug 2009 23:52:41 +0000 (UTC)
Subject: rpms/hydrogen/devel hydrogen.spec,1.12,1.13
Message-ID: <20090805235241.9C8E411C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5414

Modified Files:
	hydrogen.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.6.rc1.1
- Update .desktop file



Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hydrogen.spec	25 Jul 2009 02:47:36 -0000	1.12
+++ hydrogen.spec	5 Aug 2009 23:52:41 -0000	1.13
@@ -4,7 +4,7 @@
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.5.%{prerel}%{?dist}
+Release:      0.6.%{prerel}%{?dist}
 URL:          http://www.hydrogen-music.org/
 Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
 # For convenience, to take the svn snapshot:
@@ -49,8 +49,9 @@ scons install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor fedora              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
   --add-category X-Drumming                       \
-  --add-category X-MIDI                           \
+  --add-category Midi                             \
   --add-category X-Jack                           \
+  --add-category AudioVideoEditing                \
   --remove-mime-type text/xml                     \
   --delete-original                               \
   $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
@@ -91,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.6.rc1.1
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-0.5.rc1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Aug  5 23:58:12 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed,  5 Aug 2009 23:58:12 +0000 (UTC)
Subject: rpms/jamin/devel jamin.spec,1.2,1.3
Message-ID: <20090805235812.2AF7C11C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jamin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6454

Modified Files:
	jamin.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-7
- Update .desktop file



Index: jamin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jamin/devel/jamin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jamin.spec	25 Jul 2009 03:53:10 -0000	1.2
+++ jamin.spec	5 Aug 2009 23:58:11 -0000	1.3
@@ -1,7 +1,7 @@
 Name:          jamin
 Summary:       JACK Audio Connection Kit (JACK) Audio Mastering interface
 Version:       0.95.0
-Release:       6%{?dist}
+Release:       7%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://jamin.sourceforge.net
@@ -58,7 +58,7 @@ NOCONFIGURE=indeed ./autogen.sh
 
 # desktop file categories
 BASE="Audio"
-XTRA="X-Multitrack X-Digital_Processing X-Jack"
+XTRA="X-Multitrack X-DigitalProcessing X-Jack"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install                            \
@@ -100,6 +100,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.95.0-7
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dcantrel at fedoraproject.org  Wed Aug  5 23:59:10 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed,  5 Aug 2009 23:59:10 +0000 (UTC)
Subject: rpms/dhcp/devel .cvsignore, 1.27, 1.28 dhcp.spec, 1.265,
	1.266 sources, 1.29, 1.30 dhcp-4.1.0-CVE-2009-0692.patch, 1.1, NONE
Message-ID: <20090805235910.9252E11C0347@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6754

Modified Files:
	.cvsignore dhcp.spec sources 
Removed Files:
	dhcp-4.1.0-CVE-2009-0692.patch 
Log Message:
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
  CVE-2009-0692



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	9 Jul 2009 20:08:40 -0000	1.27
+++ .cvsignore	5 Aug 2009 23:59:10 -0000	1.28
@@ -1,2 +1,2 @@
-dhcp-4.1.0.tar.gz
 ldap-for-dhcp-4.1.0-4.tar.gz
+dhcp-4.1.0p1.tar.gz


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- dhcp.spec	5 Aug 2009 21:48:30 -0000	1.265
+++ dhcp.spec	5 Aug 2009 23:59:10 -0000	1.266
@@ -4,13 +4,16 @@
 # Where dhcp configuration files are stored
 %define dhcpconfdir %{_sysconfdir}/dhcp
 
+# Base version number from ISC
+%define basever 4.1.0
+
 # LDAP patch version
-%define ldappatchver %{version}-4
+%define ldappatchver %{basever}-4
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
-Version:  4.1.0
-Release:  27%{?dist}
+Version:  %{basever}p1
+Release:  1%{?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.
@@ -49,8 +52,7 @@ Patch18:  %{name}-4.1.0-missing-ipv6-not
 Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
 Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
-Patch22:  %{name}-4.1.0-CVE-2009-0692.patch
-Patch23:  %{name}-4.1.0-CVE-2009-1892.patch
+Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -116,7 +118,7 @@ libdhcpctl and libomapi static libraries
 %setup -T -D -a 1
 
 # Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{basever}-ldap.patch
 
 # Replace the standard ISC warning message about requesting help with an
 # explanation that this is a patched build of ISC DHCP and bugs should be
@@ -205,13 +207,9 @@ libdhcpctl and libomapi static libraries
 # Ensure 64-bit platforms parse lease file dates & times correctly (#448615)
 %patch21 -p1
 
-# Fix for CVE-2009-0692 (patch from Mandriva SRPM)
-# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0692
-%patch22 -p1
-
 # Fix for CVE-2009-1892 (patch from Mandriva SRPM)
 # http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
-%patch23 -p1
+%patch22 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
@@ -467,6 +465,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
+- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
+  CVE-2009-0692
+
 * Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-27
 - Fix for CVE-2009-0692
 - Fix for CVE-2009-1892 (#511834)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	10 Jul 2009 02:29:08 -0000	1.29
+++ sources	5 Aug 2009 23:59:10 -0000	1.30
@@ -1,2 +1,2 @@
-1fffed2e8c3d67b111316d6a9b33db7a  dhcp-4.1.0.tar.gz
 39b4ff6ce0fcf84c69c12f221b0b6eb4  ldap-for-dhcp-4.1.0-4.tar.gz
+325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz


--- dhcp-4.1.0-CVE-2009-0692.patch DELETED ---



From lmacken at fedoraproject.org  Thu Aug  6 00:00:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  6 Aug 2009 00:00:53 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.16,
	1.17 liveusb-creator.spec, 1.25, 1.26 sources, 1.20, 1.21
Message-ID: <20090806000053.B5F7711C0347@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7233

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	24 Jun 2009 18:46:45 -0000	1.16
+++ .cvsignore	6 Aug 2009 00:00:53 -0000	1.17
@@ -1 +1 @@
-liveusb-creator-3.7.tar.bz2
+liveusb-creator-3.7.2.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- liveusb-creator.spec	25 Jul 2009 11:10:12 -0000	1.25
+++ liveusb-creator.spec	6 Aug 2009 00:00:53 -0000	1.26
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.7
-Release:        2%{?dist}
+Version:        3.7.2
+Release:        1%{?dist}
 Summary:        A liveusb creator
 
 Group:          Applications/System
@@ -68,8 +68,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Aug 05 2009 Luke Macken <lmacken at redhat.com> - 3.7.2-1
+- 3.7.2
+
+* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.1-1
+- 3.7.1
 
 * Wed Jun 24 2009 Luke Macken <lmacken at redhat.com> - 3.7
 - Latest upstream bugfix release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	24 Jun 2009 18:46:46 -0000	1.20
+++ sources	6 Aug 2009 00:00:53 -0000	1.21
@@ -1 +1 @@
-77311f148e097020c7759d6f420c28c7  liveusb-creator-3.7.tar.bz2
+dfca2084def4359c4a18bc36f2c8ad9c  liveusb-creator-3.7.2.tar.bz2



From dcantrel at fedoraproject.org  Thu Aug  6 00:04:51 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  6 Aug 2009 00:04:51 +0000 (UTC)
Subject: rpms/dhcp/F-11 .cvsignore, 1.25, 1.26 dhcp.spec, 1.260,
	1.261 sources, 1.26, 1.27 dhcp-4.1.0-CVE-2009-0692.patch, 1.1, NONE
Message-ID: <20090806000451.920FF11C0347@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7784

Modified Files:
	.cvsignore dhcp.spec sources 
Removed Files:
	dhcp-4.1.0-CVE-2009-0692.patch 
Log Message:
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
  CVE-2009-0692



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	13 Apr 2009 21:56:00 -0000	1.25
+++ .cvsignore	6 Aug 2009 00:04:50 -0000	1.26
@@ -1,2 +1,2 @@
-dhcp-4.1.0.tar.gz
 ldap-for-dhcp-4.1.0-2.tar.gz
+dhcp-4.1.0p1.tar.gz


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- dhcp.spec	5 Aug 2009 23:42:45 -0000	1.260
+++ dhcp.spec	6 Aug 2009 00:04:51 -0000	1.261
@@ -4,13 +4,16 @@
 # Where dhcp configuration files are stored
 %define dhcpconfdir %{_sysconfdir}/dhcp
 
+# Base version number from ISC
+%define basever 4.1.0
+
 # LDAP patch version
-%define ldappatchver %{version}-2
+%define ldappatchver %{basever}-2
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
-Version:  4.1.0
-Release:  25%{?dist}
+Version:  %{basever}p1
+Release:  1%{?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.
@@ -20,7 +23,7 @@ License:  ISC
 Group:    System Environment/Daemons
 URL:      http://isc.org/products/DHCP/
 Source0:  ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
-Source1:  http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{ldappatchver}.tar.gz
+Source1:  http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/ldap-for-dhcp-%{ldappatchver}.tar.gz
 Source2:  dhcpd.init
 Source3:  dhcrelay.init
 Source4:  dhclient-script
@@ -47,8 +50,7 @@ Patch17:  %{name}-4.1.0-invalid-dhclient
 Patch18:  %{name}-4.1.0-missing-ipv6-not-fatal.patch
 Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
-Patch21:  %{name}-4.1.0-CVE-2009-0692.patch
-Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
+Patch21:  %{name}-4.1.0-CVE-2009-1892.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -115,7 +117,7 @@ libdhcpctl and libomapi static libraries
 %setup -T -D -a 1
 
 # Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{basever}-ldap.patch
 
 # Replace the standard ISC warning message about requesting help with an
 # explanation that this is a patched build of ISC DHCP and bugs should be
@@ -201,13 +203,9 @@ libdhcpctl and libomapi static libraries
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19867])
 %patch20 -p1
 
-# Fix for CVE-2009-0692 (patch from Mandriva SRPM)
-# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0692
-%patch21 -p1
-
 # Fix for CVE-2009-1892 (patch from Mandriva SRPM)
 # http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
-%patch22 -p1
+%patch21 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
@@ -454,6 +452,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
+- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
+  CVE-2009-0692
+
 * Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-25
 - Fix for CVE-2009-0692
 - Fix for CVE-2009-1892 (#511834)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	13 Apr 2009 21:56:00 -0000	1.26
+++ sources	6 Aug 2009 00:04:51 -0000	1.27
@@ -1,2 +1,2 @@
-1fffed2e8c3d67b111316d6a9b33db7a  dhcp-4.1.0.tar.gz
 04d735015e104e3e6377e7fb80fd4fce  ldap-for-dhcp-4.1.0-2.tar.gz
+325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz


--- dhcp-4.1.0-CVE-2009-0692.patch DELETED ---



From lmacken at fedoraproject.org  Thu Aug  6 00:07:51 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  6 Aug 2009 00:07:51 +0000 (UTC)
Subject: rpms/liveusb-creator/F-11 .cvsignore, 1.15,
	1.16 liveusb-creator.spec, 1.22, 1.23 sources, 1.19, 1.20
Message-ID: <20090806000751.8C68111C0347@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8200

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Jun 2009 18:52:38 -0000	1.15
+++ .cvsignore	6 Aug 2009 00:07:51 -0000	1.16
@@ -1 +1 @@
-liveusb-creator-3.7.tar.bz2
+liveusb-creator-3.7.2.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/liveusb-creator.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- liveusb-creator.spec	24 Jun 2009 18:52:38 -0000	1.22
+++ liveusb-creator.spec	6 Aug 2009 00:07:51 -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:           liveusb-creator
-Version:        3.7
+Version:        3.7.2
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Wed Aug 05 2009 Luke Macken <lmacken at redhat.com> - 3.7.2-1
+- 3.7.2
+
+* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.1-1
+- 3.7.1
+
 * Wed Jun 24 2009 Luke Macken <lmacken at redhat.com> - 3.7
 - Latest upstream bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	24 Jun 2009 18:52:38 -0000	1.19
+++ sources	6 Aug 2009 00:07:51 -0000	1.20
@@ -1 +1 @@
-77311f148e097020c7759d6f420c28c7  liveusb-creator-3.7.tar.bz2
+dfca2084def4359c4a18bc36f2c8ad9c  liveusb-creator-3.7.2.tar.bz2



From bojan at fedoraproject.org  Thu Aug  6 00:11:25 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:11:25 +0000 (UTC)
Subject: rpms/apr/devel apr-1.3.8.tar.bz2.asc, NONE, 1.1 .cvsignore, 1.17,
	1.18 apr.spec, 1.90, 1.91 sources, 1.17,
	1.18 apr-1.3.7.tar.bz2.asc, 1.1, NONE
Message-ID: <20090806001125.6856611C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8650

Modified Files:
	.cvsignore apr.spec sources 
Added Files:
	apr-1.3.8.tar.bz2.asc 
Removed Files:
	apr-1.3.7.tar.bz2.asc 
Log Message:
Bump up to 1.3.8.


--- NEW FILE apr-1.3.8.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKeKEWAAoJEKNIuYR/chSn7NUP/iaCorqo2mTGAdW/VJO6sFWZ
tR874sJPL4/y4bl8OQ9QttDm220u3iApJHps3DtH7lD95OEYJ9p+lAAbiJF+frkj
8cNorwiH+eHu6yzVmjaYi4svIzEnvqugjdG2jJ3mckjLcM6Xz/JalS0iVpl/hpti
MZ/HNtPOyjECDN5RQT86cfUboWjwvQb5awXkzdtI9+58xJZ4piDxPexBVud7Eelo
Ax6UD8gfGXpkloYLFK+cujwYZDKPO6CrizSWULo3Gm/6a/7D3jZCmcmBM4JVexMd
Umy3KDHBmkE0TEKbEuxoHNOgLT8gI4BnLyt6OGPQHTaY2jjH2TRDLjw/WOYDAR9d
qYOEWsF4pHwOs2I2IOZI1x5dzBHnajRIxPsd3dEK/pmrKJEccoOOPrq1hNCdiKPp
9/zLJ8fMoqkxTvPkQQLjSYu3BMLRuK5ET+ULP4Rd+C8zAfztpJigHb7Qxnzi54d3
oqUqBkSG88IWWn+s9IMmUGem7f9m/9kVfmSSWz7KMsJo3i8Jd8FaGLNsnh7v3qMg
V9uUof8BaPnFrsX5j7zPyvFv1uYH4FMQKRoxjlvQ26s+jn6H78lncRmDiUT7dsJy
BGI+1AT/CcIBHrD+UeJtQ26KcAWPnOama7kJgfgdqXbJV4Wp6Pm1ItB668x5ToHk
GQGu/3OxUAALS20RWacr
=a7Bb
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	26 Jul 2009 10:32:23 -0000	1.17
+++ .cvsignore	6 Aug 2009 00:11:25 -0000	1.18
@@ -1 +1 @@
-apr-1.3.7.tar.bz2
+apr-1.3.8.tar.bz2


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- apr.spec	26 Jul 2009 11:07:31 -0000	1.90
+++ apr.spec	6 Aug 2009 00:11:25 -0000	1.91
@@ -5,8 +5,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.7
-Release: 2%{?dist}
+Version: 1.3.8
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -127,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1
+- bump up to 1.3.8
+- CVE-2009-2412
+- allocator alignment fixes
+
 * Sun Jul 26 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.7-2
 - include apr_cv_sock_cloexec too
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	26 Jul 2009 10:32:23 -0000	1.17
+++ sources	6 Aug 2009 00:11:25 -0000	1.18
@@ -1 +1 @@
-1414f695a236a2bf8e470ca624d6a2e8  apr-1.3.7.tar.bz2
+3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2


--- apr-1.3.7.tar.bz2.asc DELETED ---



From bojan at fedoraproject.org  Thu Aug  6 00:11:34 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:11:34 +0000 (UTC)
Subject: rpms/apr-util/devel apr-util-1.3.9.tar.bz2.asc, NONE, 1.1 .cvsignore,
	1.13, 1.14 apr-util.spec, 1.70, 1.71 sources, 1.15,
	1.16 apr-util-1.3.8.tar.bz2.asc, 1.1, NONE
Message-ID: <20090806001134.E077511C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8688

Modified Files:
	.cvsignore apr-util.spec sources 
Added Files:
	apr-util-1.3.9.tar.bz2.asc 
Removed Files:
	apr-util-1.3.8.tar.bz2.asc 
Log Message:
Bump up to 1.3.9.


--- NEW FILE apr-util-1.3.9.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKeKMTAAoJEKNIuYR/chSnLwsQAJVeM3J873BwSOiVOOX4cWKl
V2GV0Pi4dopAxXCllLF3lE2NRSCzGE6T7NfKV0MTyyFSuZ8r8sAdA/LI03TS8HCq
m08Yrq2cJdKKSeq4d+uES+BgtV+pVYX8/2tSTvfQ9v5jfGrxv+mNW1EXTFI2Sw3v
CSEkzqZeb2XSCjNfqQR0Jz6wTT3YQmf/hIQ068Bte4LqlW6RkSpT41vIpHHYndji
y8S7iDdx/Pzdgf2dB6g1ifAL9n526I/Ajfe5workKqblKYc4G5QMW9sE5sLIYAdI
hEZZoCvUPFvb6XtMtHUnDIaWLndnBlVv4h1re6MvPKqS7XpgTEDGOFcs6UIUTo1D
aUHyEMeSf/TipUD9VdCNeOETVr8NTXoiqiqgZqz0XZxAL4Wzh3ntqjCtIT6zjsTD
cwOT01xDXpd0pNadbQdF9sKSP/9v/qnwLCFnYXMNIGn7QyzRhOTjMTeAph4vLZ6d
/YriQr2oGIY/w+0zS0Xqtpgcx0jgwh8IZYg2s8yNwBq+Yz6d28pgLL2Dw+AJSEYy
RwuGe8BoRhZxkUlKa2gQfWite2VRtC3SbitzTlJ8Ks76ar+5ANSKuLvnwvf6T2gG
A6dvP2qkc7rVwmcA1MXEzxKwwmWN1yQ9CDguFc+vH4bwMbYO+uLx5VsR95+jLK7/
NQdRuYPRt1h6A4w9pFb9
=9TqS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	15 Jul 2009 07:57:16 -0000	1.13
+++ .cvsignore	6 Aug 2009 00:11:34 -0000	1.14
@@ -1 +1 @@
-apr-util-1.3.8.tar.bz2
+apr-util-1.3.9.tar.bz2


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- apr-util.spec	24 Jul 2009 16:59:47 -0000	1.70
+++ apr-util.spec	6 Aug 2009 00:11:34 -0000	1.71
@@ -3,8 +3,8 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.3.8
-Release: 3%{?dist}
+Version: 1.3.9
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -188,6 +188,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+- CVE-2009-2412
+- allocator alignment fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -212,6 +217,8 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun  8 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.7-1
 - bump up to 1.3.7
+- CVE-2009-0023
+- "billion laughs" fix of apr_xml_* interface
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 Jul 2009 07:57:17 -0000	1.15
+++ sources	6 Aug 2009 00:11:34 -0000	1.16
@@ -1 +1 @@
-34a0e815cdc2b79bf561468b84ff1aa3  apr-util-1.3.8.tar.bz2
+29dd557f7bd891fc2bfdffcfa081db59  apr-util-1.3.9.tar.bz2


--- apr-util-1.3.8.tar.bz2.asc DELETED ---



From oget at fedoraproject.org  Thu Aug  6 00:12:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 00:12:06 +0000 (UTC)
Subject: rpms/kguitar/devel kguitar.desktop,1.1,1.2 kguitar.spec,1.5,1.6
Message-ID: <20090806001206.982CA11C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kguitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8890

Modified Files:
	kguitar.desktop kguitar.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-8.926svn
- Update .desktop file



Index: kguitar.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/kguitar/devel/kguitar.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
Binary files /tmp/cvsmyOfk1 and /tmp/cvsEWnhGd differ


Index: kguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kguitar/devel/kguitar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kguitar.spec	25 Jul 2009 04:35:37 -0000	1.5
+++ kguitar.spec	6 Aug 2009 00:12:06 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		  kguitar
 Version:	  0.5.1
-Release:	  7.%{svnver}%{?dist}
+Release:	  8.%{svnver}%{?dist}
 Group:		  Applications/Multimedia
 Summary:	  Guitar Tabulature Music Editor
 License:	  GPLv2+
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_texmf_main}/tex/generic/kgtabs
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-8.926svn
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-7.926svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bojan at fedoraproject.org  Thu Aug  6 00:22:11 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:22:11 +0000 (UTC)
Subject: rpms/apr/F-11 apr-1.3.8.tar.bz2.asc, NONE, 1.1 apr.spec, 1.83,
	1.84 sources, 1.15, 1.16 apr-1.3.5.tar.bz2.asc, 1.1, NONE
Message-ID: <20090806002211.6145111C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11191

Modified Files:
	apr.spec sources 
Added Files:
	apr-1.3.8.tar.bz2.asc 
Removed Files:
	apr-1.3.5.tar.bz2.asc 
Log Message:
Bump up to 1.3.8.


--- NEW FILE apr-1.3.8.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKeKEWAAoJEKNIuYR/chSn7NUP/iaCorqo2mTGAdW/VJO6sFWZ
tR874sJPL4/y4bl8OQ9QttDm220u3iApJHps3DtH7lD95OEYJ9p+lAAbiJF+frkj
8cNorwiH+eHu6yzVmjaYi4svIzEnvqugjdG2jJ3mckjLcM6Xz/JalS0iVpl/hpti
MZ/HNtPOyjECDN5RQT86cfUboWjwvQb5awXkzdtI9+58xJZ4piDxPexBVud7Eelo
Ax6UD8gfGXpkloYLFK+cujwYZDKPO6CrizSWULo3Gm/6a/7D3jZCmcmBM4JVexMd
Umy3KDHBmkE0TEKbEuxoHNOgLT8gI4BnLyt6OGPQHTaY2jjH2TRDLjw/WOYDAR9d
qYOEWsF4pHwOs2I2IOZI1x5dzBHnajRIxPsd3dEK/pmrKJEccoOOPrq1hNCdiKPp
9/zLJ8fMoqkxTvPkQQLjSYu3BMLRuK5ET+ULP4Rd+C8zAfztpJigHb7Qxnzi54d3
oqUqBkSG88IWWn+s9IMmUGem7f9m/9kVfmSSWz7KMsJo3i8Jd8FaGLNsnh7v3qMg
V9uUof8BaPnFrsX5j7zPyvFv1uYH4FMQKRoxjlvQ26s+jn6H78lncRmDiUT7dsJy
BGI+1AT/CcIBHrD+UeJtQ26KcAWPnOama7kJgfgdqXbJV4Wp6Pm1ItB668x5ToHk
GQGu/3OxUAALS20RWacr
=a7Bb
-----END PGP SIGNATURE-----


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/apr.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- apr.spec	8 Jun 2009 06:39:33 -0000	1.83
+++ apr.spec	6 Aug 2009 00:22:11 -0000	1.84
@@ -5,7 +5,7 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.5
+Version: 1.3.8
 Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
@@ -52,6 +52,12 @@ C data structures and routines.
 # does not use -lrt).
 export ac_cv_search_shm_open=no
 
+# We know we have these on new Fedoras (kernel >= 2.6.28)
+export apr_cv_epoll_create1=yes
+export apr_cv_dup3=yes
+export apr_cv_accept4=yes
+export apr_cv_sock_cloexec=yes
+
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
@@ -121,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1
+- bump up to 1.3.8
+- CVE-2009-2412
+- allocator alignment fixes
+
 * Mon Jun  8 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.5-1
 - bump up to 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	8 Jun 2009 06:39:33 -0000	1.15
+++ sources	6 Aug 2009 00:22:11 -0000	1.16
@@ -1 +1 @@
-9ac9a00eaa190937fdbbde7b4f03ac1e  apr-1.3.5.tar.bz2
+3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2


--- apr-1.3.5.tar.bz2.asc DELETED ---



From mclasen at fedoraproject.org  Thu Aug  6 00:24:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  6 Aug 2009 00:24:40 +0000 (UTC)
Subject: rpms/gnome-panel/devel recent-icon.patch, NONE, 1.1 gnome-panel.spec,
	1.363, 1.364
Message-ID: <20090806002440.81C6411C0347@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11383

Modified Files:
	gnome-panel.spec 
Added Files:
	recent-icon.patch 
Log Message:
Make 'Clear Recent Documents' obey the menu-images setting


recent-icon.patch:
 panel-recent.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE recent-icon.patch ---
--- gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-08-05 20:10:20.383768104 -0400
+++ gnome-panel-2.27.4.recent/gnome-panel/panel-recent.c	2009-08-05 19:58:53.593528282 -0400
@@ -227,7 +227,7 @@
 
 	add_menu_separator (recent_menu);
 
-	menu_item = panel_image_menu_item_new ();
+	menu_item = gtk_image_menu_item_new ();
 	setup_menu_item_with_icon (menu_item,
 				   panel_menu_icon_get_size (),
 				   NULL,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -p -r1.363 -r1.364
--- gnome-panel.spec	3 Aug 2009 03:30:02 -0000	1.363
+++ gnome-panel.spec	6 Aug 2009 00:24:40 -0000	1.364
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.27.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -122,6 +122,8 @@ Patch45: panel-icons.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=589632
 Patch46:gnome-panel-2.27.4-fix-monitor.patch
 
+Patch47: recent-icon.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -368,6 +370,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Aug  5 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-7
+- Make 'Clear Recent Documents' follow the menu-images setting
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-6
 - Save some space
 



From bojan at fedoraproject.org  Thu Aug  6 00:28:48 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:28:48 +0000 (UTC)
Subject: rpms/apr-util/F-11 apr-util-1.3.9.tar.bz2.asc, NONE,
	1.1 apr-util.spec, 
	1.63, 1.64 sources, 1.14, 1.15 apr-util-1.3.7.tar.bz2.asc, 1.1, NONE
Message-ID: <20090806002848.91F1011C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12406

Modified Files:
	apr-util.spec sources 
Added Files:
	apr-util-1.3.9.tar.bz2.asc 
Removed Files:
	apr-util-1.3.7.tar.bz2.asc 
Log Message:
Bump up to 1.3.9.


--- NEW FILE apr-util-1.3.9.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKeKMTAAoJEKNIuYR/chSnLwsQAJVeM3J873BwSOiVOOX4cWKl
V2GV0Pi4dopAxXCllLF3lE2NRSCzGE6T7NfKV0MTyyFSuZ8r8sAdA/LI03TS8HCq
m08Yrq2cJdKKSeq4d+uES+BgtV+pVYX8/2tSTvfQ9v5jfGrxv+mNW1EXTFI2Sw3v
CSEkzqZeb2XSCjNfqQR0Jz6wTT3YQmf/hIQ068Bte4LqlW6RkSpT41vIpHHYndji
y8S7iDdx/Pzdgf2dB6g1ifAL9n526I/Ajfe5workKqblKYc4G5QMW9sE5sLIYAdI
hEZZoCvUPFvb6XtMtHUnDIaWLndnBlVv4h1re6MvPKqS7XpgTEDGOFcs6UIUTo1D
aUHyEMeSf/TipUD9VdCNeOETVr8NTXoiqiqgZqz0XZxAL4Wzh3ntqjCtIT6zjsTD
cwOT01xDXpd0pNadbQdF9sKSP/9v/qnwLCFnYXMNIGn7QyzRhOTjMTeAph4vLZ6d
/YriQr2oGIY/w+0zS0Xqtpgcx0jgwh8IZYg2s8yNwBq+Yz6d28pgLL2Dw+AJSEYy
RwuGe8BoRhZxkUlKa2gQfWite2VRtC3SbitzTlJ8Ks76ar+5ANSKuLvnwvf6T2gG
A6dvP2qkc7rVwmcA1MXEzxKwwmWN1yQ9CDguFc+vH4bwMbYO+uLx5VsR95+jLK7/
NQdRuYPRt1h6A4w9pFb9
=9TqS
-----END PGP SIGNATURE-----


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-11/apr-util.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- apr-util.spec	8 Jun 2009 06:52:46 -0000	1.63
+++ apr-util.spec	6 Aug 2009 00:28:48 -0000	1.64
@@ -3,13 +3,14 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.3.7
+Version: 1.3.9
 Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
+Patch2: apr-util-1.3.7-nodbmdso.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: db4-devel, expat-devel, e2fsprogs-devel
@@ -94,9 +95,7 @@ This package provides the LDAP support f
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
-
-# Our apr.h file is arch specific
-sed -i -e 's,apr_h=\(.*\)/apr.h",apr_h=\1/apr-%{_arch}.h",' build/dso.m4
+%patch2 -p1 -b .nodbmdso
 
 %build
 autoheader && autoconf
@@ -153,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
-%{_libdir}/apr-util-%{apuver}/apr_dbm*
 %dir %{_libdir}/apr-util-%{apuver}
 
 %files pgsql
@@ -190,6 +188,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+- CVE-2009-2412
+- allocator alignment fixes
+- disable DBM-drivers-as-DSO support
+
 * Mon Jun  8 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.7-1
 - bump up to 1.3.7
 - CVE-2009-0023


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Jun 2009 06:52:46 -0000	1.14
+++ sources	6 Aug 2009 00:28:48 -0000	1.15
@@ -1 +1 @@
-2ed3ae6734290296faa193e1177d50e6  apr-util-1.3.7.tar.bz2
+29dd557f7bd891fc2bfdffcfa081db59  apr-util-1.3.9.tar.bz2


--- apr-util-1.3.7.tar.bz2.asc DELETED ---



From bojan at fedoraproject.org  Thu Aug  6 00:29:20 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:29:20 +0000 (UTC)
Subject: rpms/apr-util/F-11 apr-util-1.3.7-nodbmdso.patch,NONE,1.1
Message-ID: <20090806002920.BDE9011C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12525

Added Files:
	apr-util-1.3.7-nodbmdso.patch 
Log Message:
Add apr-util-1.3.7-nodbmdso.patch.

apr-util-1.3.7-nodbmdso.patch:
 build/dso.m4  |   18 ++++++++++--------
 dbm/apr_dbm.c |    3 +++
 2 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE apr-util-1.3.7-nodbmdso.patch ---
--- apr-util-1.3.7/build/dso.m4.nodbmdso
+++ apr-util-1.3.7/build/dso.m4
@@ -44,6 +44,16 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
      fi
   fi
 
+
+  ### Hack: force static linking of DBM code.
+  objs=
+  test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
+  test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
+  test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
+  EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
+  APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
+  APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
+
   if test "$apu_dso_build" = "0"; then
 
      # Statically link the drivers:
@@ -42,9 +65,6 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
      test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
      test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo"
      test $apu_have_odbc = 1 && objs="$objs dbd/apr_dbd_odbc.lo"
-     test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
-     test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
-     test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
      test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
      test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
      test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
@@ -65,10 +85,8 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
      fi
 
      APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
-     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
      APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap"
      APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
-     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
      APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
 
   else
@@ -82,9 +100,6 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
      test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
      test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
      test $apu_have_odbc = 1 && dsos="$dsos dbd/apr_dbd_odbc.la"
-     test $apu_have_db = 1 && dsos="$dsos dbm/apr_dbm_db.la"
-     test $apu_have_gdbm = 1 && dsos="$dsos dbm/apr_dbm_gdbm.la"
-     test $apu_have_ndbm = 1 && dsos="$dsos dbm/apr_dbm_ndbm.la"
      test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
 
      if test -n "$dsos"; then
--- apr-util-1.3.7/dbm/apr_dbm.c.nodbmdso
+++ apr-util-1.3.7/dbm/apr_dbm.c
@@ -56,6 +56,9 @@
 #error a DBM implementation was not specified
 #endif
 
+#undef APU_DSO_BUILD
+#define APU_DSO_BUILD 0
+
 #if APU_DSO_BUILD
 
 static apr_hash_t *drivers = NULL;



From bojan at fedoraproject.org  Thu Aug  6 00:34:09 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:34:09 +0000 (UTC)
Subject: rpms/apr/F-10 apr-1.3.8.tar.bz2.asc, NONE, 1.1 apr.spec, 1.80,
	1.81 sources, 1.15, 1.16 apr-1.3.5.tar.bz2.asc, 1.1, NONE
Message-ID: <20090806003409.87E3211C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13409

Modified Files:
	apr.spec sources 
Added Files:
	apr-1.3.8.tar.bz2.asc 
Removed Files:
	apr-1.3.5.tar.bz2.asc 
Log Message:
Bump up to 1.3.8.


--- NEW FILE apr-1.3.8.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKeKEWAAoJEKNIuYR/chSn7NUP/iaCorqo2mTGAdW/VJO6sFWZ
tR874sJPL4/y4bl8OQ9QttDm220u3iApJHps3DtH7lD95OEYJ9p+lAAbiJF+frkj
8cNorwiH+eHu6yzVmjaYi4svIzEnvqugjdG2jJ3mckjLcM6Xz/JalS0iVpl/hpti
MZ/HNtPOyjECDN5RQT86cfUboWjwvQb5awXkzdtI9+58xJZ4piDxPexBVud7Eelo
Ax6UD8gfGXpkloYLFK+cujwYZDKPO6CrizSWULo3Gm/6a/7D3jZCmcmBM4JVexMd
Umy3KDHBmkE0TEKbEuxoHNOgLT8gI4BnLyt6OGPQHTaY2jjH2TRDLjw/WOYDAR9d
qYOEWsF4pHwOs2I2IOZI1x5dzBHnajRIxPsd3dEK/pmrKJEccoOOPrq1hNCdiKPp
9/zLJ8fMoqkxTvPkQQLjSYu3BMLRuK5ET+ULP4Rd+C8zAfztpJigHb7Qxnzi54d3
oqUqBkSG88IWWn+s9IMmUGem7f9m/9kVfmSSWz7KMsJo3i8Jd8FaGLNsnh7v3qMg
V9uUof8BaPnFrsX5j7zPyvFv1uYH4FMQKRoxjlvQ26s+jn6H78lncRmDiUT7dsJy
BGI+1AT/CcIBHrD+UeJtQ26KcAWPnOama7kJgfgdqXbJV4Wp6Pm1ItB668x5ToHk
GQGu/3OxUAALS20RWacr
=a7Bb
-----END PGP SIGNATURE-----


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-10/apr.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- apr.spec	8 Jun 2009 06:39:37 -0000	1.80
+++ apr.spec	6 Aug 2009 00:34:09 -0000	1.81
@@ -5,7 +5,7 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.5
+Version: 1.3.8
 Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1
+- bump up to 1.3.8
+- CVE-2009-2412
+- allocator alignment fixes
+
 * Mon Jun  8 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.5-1
 - bump up to 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	8 Jun 2009 06:39:37 -0000	1.15
+++ sources	6 Aug 2009 00:34:09 -0000	1.16
@@ -1 +1 @@
-9ac9a00eaa190937fdbbde7b4f03ac1e  apr-1.3.5.tar.bz2
+3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2


--- apr-1.3.5.tar.bz2.asc DELETED ---



From bojan at fedoraproject.org  Thu Aug  6 00:42:24 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu,  6 Aug 2009 00:42:24 +0000 (UTC)
Subject: rpms/apr-util/F-10 apr-util-1.3.9.tar.bz2.asc, NONE,
	1.1 apr-util-1.3.7-nodbmdso.patch, 1.1, 1.2 apr-util.spec, 1.63,
	1.64 sources, 1.14, 1.15 apr-util-1.3.7.tar.bz2.asc, 1.1, NONE
Message-ID: <20090806004224.DCAA811C0347@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14602

Modified Files:
	apr-util-1.3.7-nodbmdso.patch apr-util.spec sources 
Added Files:
	apr-util-1.3.9.tar.bz2.asc 
Removed Files:
	apr-util-1.3.7.tar.bz2.asc 
Log Message:
Bump up to 1.3.9.


--- NEW FILE apr-util-1.3.9.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKeKMTAAoJEKNIuYR/chSnLwsQAJVeM3J873BwSOiVOOX4cWKl
V2GV0Pi4dopAxXCllLF3lE2NRSCzGE6T7NfKV0MTyyFSuZ8r8sAdA/LI03TS8HCq
m08Yrq2cJdKKSeq4d+uES+BgtV+pVYX8/2tSTvfQ9v5jfGrxv+mNW1EXTFI2Sw3v
CSEkzqZeb2XSCjNfqQR0Jz6wTT3YQmf/hIQ068Bte4LqlW6RkSpT41vIpHHYndji
y8S7iDdx/Pzdgf2dB6g1ifAL9n526I/Ajfe5workKqblKYc4G5QMW9sE5sLIYAdI
hEZZoCvUPFvb6XtMtHUnDIaWLndnBlVv4h1re6MvPKqS7XpgTEDGOFcs6UIUTo1D
aUHyEMeSf/TipUD9VdCNeOETVr8NTXoiqiqgZqz0XZxAL4Wzh3ntqjCtIT6zjsTD
cwOT01xDXpd0pNadbQdF9sKSP/9v/qnwLCFnYXMNIGn7QyzRhOTjMTeAph4vLZ6d
/YriQr2oGIY/w+0zS0Xqtpgcx0jgwh8IZYg2s8yNwBq+Yz6d28pgLL2Dw+AJSEYy
RwuGe8BoRhZxkUlKa2gQfWite2VRtC3SbitzTlJ8Ks76ar+5ANSKuLvnwvf6T2gG
A6dvP2qkc7rVwmcA1MXEzxKwwmWN1yQ9CDguFc+vH4bwMbYO+uLx5VsR95+jLK7/
NQdRuYPRt1h6A4w9pFb9
=9TqS
-----END PGP SIGNATURE-----

apr-util-1.3.7-nodbmdso.patch:
 build/dso.m4  |   18 ++++++++++--------
 dbm/apr_dbm.c |    3 +++
 2 files changed, 13 insertions(+), 8 deletions(-)

Index: apr-util-1.3.7-nodbmdso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-10/apr-util-1.3.7-nodbmdso.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apr-util-1.3.7-nodbmdso.patch	29 Jun 2009 20:45:07 -0000	1.1
+++ apr-util-1.3.7-nodbmdso.patch	6 Aug 2009 00:42:24 -0000	1.2
@@ -1,26 +1,7 @@
 --- apr-util-1.3.7/build/dso.m4.nodbmdso
 +++ apr-util-1.3.7/build/dso.m4
-@@ -27,10 +27,33 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
-   if test "$enable_util_dso" = "no"; then
-      apu_dso_build="0"
-   else
--     apr_h="`$apr_config --includedir`/apr.h"
--     apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`"
-+     AC_CACHE_CHECK([whether APR has DSO support], [apu_cv_aprdso],
-+       [apu_save_CPPFLAGS=$CPPFLAGS
-+        CPPFLAGS="$CPPFLAGS $APR_INCLUDES"
-+        AC_EGREP_CPP([yes], [#include "apr.h"
-+#if APR_HAS_DSO
-+yes
-+#endif
-+], [apu_cv_aprdso=yes], [apu_cv_aprdso=no])
-+        CPPFLAGS=$apu_save_CPPFLAGS])
-+
-+     if test $apu_cv_aprdso = yes; then
-+        apu_dso_build=1
-+     else
-+        apu_dso_build=0
-+     fi
+@@ -44,6 +44,16 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
+      fi
    fi
  
 +


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-10/apr-util.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- apr-util.spec	29 Jun 2009 20:54:46 -0000	1.63
+++ apr-util.spec	6 Aug 2009 00:42:24 -0000	1.64
@@ -3,8 +3,8 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.3.7
-Release: 3%{?dist}
+Version: 1.3.9
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -97,9 +97,6 @@ This package provides the LDAP support f
 %patch1 -p1 -b .pkgconf
 %patch2 -p1 -b .nodbmdso
 
-# Our apr.h file is arch specific
-sed -i -e 's,apr_h=\(.*\)/apr.h",apr_h=\1/apr-%{_arch}.h",' build/dso.m4
-
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
@@ -139,7 +136,7 @@ export MALLOC_CHECK_=2 MALLOC_PERTURB_=$
 cd test
 make %{?_smp_mflags} testall
 # testall breaks with DBD DSO; ignore
-export LD_LIBRARY_PATH="`echo "../dbd/.libs:../ldap/.libs:$LD_LIBRARY_PATH" | sed -e 's/::*$//'`"
+export LD_LIBRARY_PATH="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$LD_LIBRARY_PATH" | sed -e 's/::*$//'`"
 ./testall -v -q || true
 ./testall testrmm
 ./testall testdbm
@@ -191,6 +188,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
+- bump up to 1.3.9
+- CVE-2009-2412
+- allocator alignment fixes
+
 * Mon Jun 29 2009 Joe Orton <jorton at redhat.com> 1.3.7-3
 - fix files list
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Jun 2009 06:52:50 -0000	1.14
+++ sources	6 Aug 2009 00:42:24 -0000	1.15
@@ -1 +1 @@
-2ed3ae6734290296faa193e1177d50e6  apr-util-1.3.7.tar.bz2
+29dd557f7bd891fc2bfdffcfa081db59  apr-util-1.3.9.tar.bz2


--- apr-util-1.3.7.tar.bz2.asc DELETED ---



From oget at fedoraproject.org  Thu Aug  6 00:57:50 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 00:57:50 +0000 (UTC)
Subject: rpms/lash/devel lash-panel.desktop,NONE,1.1 lash.spec,1.24,1.25
Message-ID: <20090806005750.D536B11C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/lash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18009

Modified Files:
	lash.spec 
Added Files:
	lash-panel.desktop 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-8
- Update .desktop file



--- NEW FILE lash-panel.desktop ---
[Desktop Entry]
Name=LASH Panel
GenericName=LASH Control Panel
Comment=LASH Control Panel
Icon=lash
Exec=lash_panel
Terminal=false
Type=Application
Categories=AudioVideo;X-Lash;X-Jack;X-AudioVideoTools;


Index: lash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lash/devel/lash.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lash.spec	25 Jul 2009 04:57:31 -0000	1.24
+++ lash.spec	6 Aug 2009 00:57:50 -0000	1.25
@@ -3,11 +3,12 @@
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.4
-Release:      7%{?dist}
+Release:      8%{?dist}
 License:      GPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
 Source0:      http://download.savannah.gnu.org/releases/lash/lash-%{version}.tar.gz
+Source1:      %{name}-panel.desktop
 Patch0:       lash-0.5.3-no-static-lib.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +22,7 @@ BuildRequires: readline-devel
 BuildRequires: swig
 BuildRequires: texi2html
 
-%if 0%{?fedora} < 11
+%if 0%{?fedora} < 12
 BuildRequires: e2fsprogs-devel
 %else
 BuildRequires: libuuid-devel
@@ -41,7 +42,7 @@ Requires:     alsa-lib-devel
 Requires:     jack-audio-connection-kit-devel
 Requires:     pkgconfig
 
-%if 0%{?fedora} < 11
+%if 0%{?fedora} < 12
 Requires:     e2fsprogs-devel
 %else
 Requires:     libuuid-devel
@@ -102,22 +103,10 @@ mv %{buildroot}%{_datadir}/lash/dtds/las
 rm -rf %{buildroot}%{_datadir}/lash
 
 # install the desktop entry
-cat << EOF > %{name}-panel.desktop
-[Desktop Entry]
-Name=LASH Panel
-GenericName=LASH Control Panel
-Comment=LASH Control Panel
-Icon=lash.png
-Exec=%{_bindir}/lash_panel
-Terminal=false
-Type=Application
-EOF
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora              \
+desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
-  lash-panel.desktop
+  %{SOURCE1}
 
 # Work around the newer texi2html which is behaving somehow else
 if [ ! -d docs/lash-manual-html-split/lash-manual/ ]; then
@@ -171,6 +160,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/lash.py*
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-8
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Aug  6 01:08:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  6 Aug 2009 01:08:17 +0000 (UTC)
Subject: rpms/libtheora/devel .cvsignore, 1.13, 1.14 libtheora.spec, 1.36,
	1.37 sources, 1.13, 1.14
Message-ID: <20090806010817.4EEA011C0347@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libtheora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20184

Modified Files:
	.cvsignore libtheora.spec sources 
Log Message:
1.1beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Jun 2009 14:51:03 -0000	1.13
+++ .cvsignore	6 Aug 2009 01:08:16 -0000	1.14
@@ -1,3 +1 @@
-libtheora-1.0.tar.bz2
-libtheora-1.1alpha1.tar.bz2
-libtheora-1.1alpha2.tar.bz2
+libtheora-1.1beta1.tar.bz2


Index: libtheora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libtheora.spec	25 Jul 2009 08:45:24 -0000	1.36
+++ libtheora.spec	6 Aug 2009 01:08:17 -0000	1.37
@@ -1,13 +1,13 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
-Version: 1.1alpha2
-Release: 2%{?dist}
+Version: 1.1beta1
+Release: 1%{?dist}
 Epoch: 1
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.theora.org
-Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.bz2 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
 BuildRequires: SDL-devel libpng-devel
@@ -49,8 +49,8 @@ Requires: libtheora = %{epoch}:%{version
 BuildArch: noarch
 
 %description devel-docs
-The libtheora-devel-docs package contains the documentation needed to develop
-applications with libtheora.
+The libtheora-devel-docs package contains the documentation needed
+to develop applications with libtheora.
 
 
 %package -n theora-tools
@@ -59,7 +59,7 @@ Group: Applications/Multimedia
 Requires: libtheora = %{epoch}:%{version}-%{release}
 
 %description -n theora-tools
-The theora-tools package contains simple command line tools for use 
+The theora-tools package contains simple command line tools for use
 with theora bitstreams.
 
 
@@ -103,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING 
+%doc README COPYING
 %{_libdir}/*.so.*
 
 %files devel
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug  5 2009 Matthias Clasen <mclasen at redhat.com> - 1.1beta1
+- 1.1beta1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1alpha2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Jun 2009 14:51:03 -0000	1.13
+++ sources	6 Aug 2009 01:08:17 -0000	1.14
@@ -1 +1 @@
-ddcdba802154b39072d5182c97153c0e  libtheora-1.1alpha2.tar.bz2
+4b5e93ff571edb394d931c1228aaa351  libtheora-1.1beta1.tar.bz2



From oget at fedoraproject.org  Thu Aug  6 01:14:37 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 01:14:37 +0000 (UTC)
Subject: rpms/minicomputer/devel minicomputer.desktop, 1.1,
	1.2 minicomputer.spec, 1.2, 1.3
Message-ID: <20090806011437.7531911C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/minicomputer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21999

Modified Files:
	minicomputer.desktop minicomputer.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-5
- Update .desktop file



Index: minicomputer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/devel/minicomputer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- minicomputer.desktop	27 Apr 2009 17:00:00 -0000	1.1
+++ minicomputer.desktop	6 Aug 2009 01:14:37 -0000	1.2
@@ -6,4 +6,4 @@ Icon=minicomputer
 Type=Application
 Exec=minicomputer
 Terminal=false
-Categories=AudioVideo;Audio;Midi;X-Jack;
+Categories=AudioVideo;Audio;Midi;X-Jack;X-Synthesis;


Index: minicomputer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minicomputer/devel/minicomputer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- minicomputer.spec	25 Jul 2009 14:33:49 -0000	1.2
+++ minicomputer.spec	6 Aug 2009 01:14:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		minicomputer
 Version:	1.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Software Synthesizer
 Group:		Applications/Multimedia
 License:	GPLv3+
@@ -19,7 +19,7 @@ BuildRequires:	scons
 Requires:	hicolor-icon-theme
 
 %description
-Minicomputer is a standalone Linux softwaresynthesizer for creating 
+Minicomputer is a standalone Linux software synthesizer for creating 
 experimental electronic sounds as its often used in but not limited to
 Industrial music, IDM, EBM, Glitch, sound design and minimal electronic. It is
 monophonic but can produce up to 8 different sounds at the same time. It uses
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.3-5
+- Update .desktop file
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Thu Aug  6 01:18:51 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu,  6 Aug 2009 01:18:51 +0000 (UTC)
Subject: rpms/nbd/devel .cvsignore, 1.4, 1.5 nbd.spec, 1.8, 1.9 sources, 1.4,
	1.5 nbd-module.patch, 1.1, NONE
Message-ID: <20090806011851.1831C11C0347@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/nbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22769

Modified Files:
	.cvsignore nbd.spec sources 
Removed Files:
	nbd-module.patch 
Log Message:
- Update to 2.9.13
- Dropped nbd-module.patch (merged upstream)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 May 2009 23:07:41 -0000	1.4
+++ .cvsignore	6 Aug 2009 01:18:50 -0000	1.5
@@ -1 +1 @@
-nbd-2.9.12.tar.bz2
+nbd-2.9.13.tar.bz2


Index: nbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbd/devel/nbd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nbd.spec	25 Jul 2009 15:49:19 -0000	1.8
+++ nbd.spec	6 Aug 2009 01:18:50 -0000	1.9
@@ -1,14 +1,12 @@
 Name:           nbd
-Version:        2.9.12
-Release:        2%{dist}
+Version:        2.9.13
+Release:        1%{dist}
 Summary:        Network Block Device user-space tools (TCP version)
 
 Group:          Applications/System
 License:        GPL+
 URL:            http://nbd.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/nbd/nbd-%{version}.tar.bz2
-# Sent to nbd-general at lists.sourceforge.net on 14/05/2009
-Patch0:         %{name}-module.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -20,7 +18,6 @@ remote block devices over a TCP/IP netwo
 
 %prep
 %setup -q
-%patch0 -b .module
 
 %build
 %configure
@@ -41,6 +38,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nbd-client
 
 %changelog
+* Thu Aug  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.9.13-1
+- Update to 2.9.13
+- Dropped nbd-module.patch (merged upstream)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 May 2009 23:07:41 -0000	1.4
+++ sources	6 Aug 2009 01:18:50 -0000	1.5
@@ -1 +1 @@
-ba96954c3dadcd51a6bc30d13e635dc7  nbd-2.9.12.tar.bz2
+03fcc0bec557a3019afb0991c70a62e3  nbd-2.9.13.tar.bz2


--- nbd-module.patch DELETED ---



From cwickert at fedoraproject.org  Thu Aug  6 01:24:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  6 Aug 2009 01:24:55 +0000 (UTC)
Subject: rpms/lxpanel/devel .cvsignore, 1.14, 1.15 lxpanel.spec, 1.24,
	1.25 sources, 1.14, 1.15
Message-ID: <20090806012455.55F7611C0347@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24072

Modified Files:
	.cvsignore lxpanel.spec sources 
Log Message:
* Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 21:36:36 -0000	1.14
+++ .cvsignore	6 Aug 2009 01:24:54 -0000	1.15
@@ -1 +1 @@
-lxpanel-0.5.1.tar.gz
+lxpanel-0.5.2.tar.gz


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lxpanel.spec	2 Aug 2009 21:36:36 -0000	1.24
+++ lxpanel.spec	6 Aug 2009 01:24:54 -0000	1.25
@@ -4,7 +4,7 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2
+
 * Sun Aug 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-1
 - Update to 0.5.1
 - Remove cpu-history.patch and manpages.patch, fixed upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 21:36:36 -0000	1.14
+++ sources	6 Aug 2009 01:24:54 -0000	1.15
@@ -1 +1 @@
-c4792350c2211242a3d28d912ac79a89  lxpanel-0.5.1.tar.gz
+b04c93877179a3c1be4a4fba4c2a0f94  lxpanel-0.5.2.tar.gz



From oget at fedoraproject.org  Thu Aug  6 01:54:18 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 01:54:18 +0000 (UTC)
Subject: rpms/swami/devel swami.desktop,1.1,1.2 swami.spec,1.2,1.3
Message-ID: <20090806015418.E1AFC11C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/swami/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31377

Modified Files:
	swami.desktop swami.spec 
Log Message:
* Wed Aug 03 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-6
- Update .desktop file



Index: swami.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/swami/devel/swami.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- swami.desktop	13 Apr 2009 17:53:52 -0000	1.1
+++ swami.desktop	6 Aug 2009 01:54:18 -0000	1.2
@@ -7,5 +7,5 @@ Icon=swami
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=GTK;AudioVideo;Audio;Midi;Music;
+Categories=GTK;AudioVideo;Audio;AudioVideoEditing;Midi;
 MimeType=audio/dls;audio/x-soundfont;


Index: swami.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swami/devel/swami.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- swami.spec	27 Jul 2009 05:11:38 -0000	1.2
+++ swami.spec	6 Aug 2009 01:54:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           swami
 Version:        0.9.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MIDI instrument and sound editor
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -103,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Wed Aug 03 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-6
+- Update .desktop file
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Thu Aug  6 01:55:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 01:55:07 +0000 (UTC)
Subject: rpms/swami/devel swami.spec,1.3,1.4
Message-ID: <20090806015507.8334511C0347@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/swami/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31512

Modified Files:
	swami.spec 
Log Message:
correct the date of the last changelog entry



Index: swami.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swami/devel/swami.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- swami.spec	6 Aug 2009 01:54:18 -0000	1.3
+++ swami.spec	6 Aug 2009 01:55:07 -0000	1.4
@@ -103,7 +103,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
-* Wed Aug 03 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-6
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-6
 - Update .desktop file
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-5



From whot at fedoraproject.org  Thu Aug  6 01:56:14 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  6 Aug 2009 01:56:14 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.56, 1.57 sources, 1.55,
	1.56 xorg-x11-proto-devel.spec, 1.105, 1.106
Message-ID: <20090806015614.0D41311C0347@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-serv31917

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-28
- xextproto 7.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	23 Jul 2009 12:54:42 -0000	1.56
+++ .cvsignore	6 Aug 2009 01:56:13 -0000	1.57
@@ -27,6 +27,5 @@ glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-1.9.99.15.tar.bz2
 randrproto-1.3.0.tar.bz2
-xextproto-7.0.99.3.tar.bz2
-fixesproto-c7c9beab9a41d835008e1070c0ed8470293fe6ba.tar.bz2
+xextproto-7.1.0.tar.bz2
 fixesproto-4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	23 Jul 2009 12:54:42 -0000	1.55
+++ sources	6 Aug 2009 01:56:13 -0000	1.56
@@ -23,5 +23,5 @@ c9f8cebfba72bfab674bc0170551fb8d  glprot
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 87a569587d6141af0aa0ab4b604d083a  inputproto-1.9.99.15.tar.bz2
 a49416013fff33c853efb32f1926551e  randrproto-1.3.0.tar.bz2
-417c21cbc02572d84dffdd5f92a760e7  xextproto-7.0.99.3.tar.bz2
+d54562771718a02508c6e0255409145d  xextproto-7.1.0.tar.bz2
 157644edb3cd526f2cb164eb79c52bad  fixesproto-4.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.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- xorg-x11-proto-devel.spec	29 Jul 2009 19:59:25 -0000	1.105
+++ xorg-x11-proto-devel.spec	6 Aug 2009 01:56:13 -0000	1.106
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -32,7 +32,7 @@ Source16: http://www.x.org/pub/individua
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
 Source19: http://www.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
-Source21: http://www.x.org/pub/individual/proto/xextproto-7.0.99.3.tar.bz2
+Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.0.tar.bz2
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.tar.bz2
@@ -258,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-28
+- xextproto 7.1.0
+
 * Wed Jul 29 2009 Kristian H?gsberg <krh at redhat.com> - 7.4-27
 - Add patch for DRI2 page flipping.
 



From sandeen at fedoraproject.org  Thu Aug  6 02:15:35 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Thu,  6 Aug 2009 02:15:35 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.8-filefrag-fix.patch, NONE,
	1.1 e2fsprogs-1.41.8-freefrag-defrag.patch, NONE,
	1.1 e2fsprogs.spec, 1.147, 1.148
Message-ID: <20090806021535.1747B11C0344@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3653

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.8-filefrag-fix.patch 
	e2fsprogs-1.41.8-freefrag-defrag.patch 
Log Message:
* Fri Aug 05 2009 Eric Sandeen <sandeen at redhat.com> 1.41.8-6
- Fix filefrag in fallback case
- Add e2freefrag & e4defrag (experimental)


e2fsprogs-1.41.8-filefrag-fix.patch:
 filefrag.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE e2fsprogs-1.41.8-filefrag-fix.patch ---
It looks like some debugging crept in?

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: e2fsprogs-1.41.8/misc/filefrag.c
===================================================================
--- e2fsprogs-1.41.8.orig/misc/filefrag.c
+++ e2fsprogs-1.41.8/misc/filefrag.c
@@ -95,8 +95,6 @@ static int get_bmap(int fd, unsigned lon
 	int	ret;
 	unsigned int b;
 
-	printf("Calling get_bmap for block %lu\n", block);
-	abort();
 	b = block;
 	ret = ioctl(fd, FIBMAP, &b); /* FIBMAP takes pointer to integer */
 	if (ret < 0) {

e2fsprogs-1.41.8-freefrag-defrag.patch:
 Makefile.in          |    3 
 configure            |    2 
 configure.in         |    2 
 misc/Makefile.in     |   46 -
 misc/e2freefrag.8.in |   99 ++
 misc/e2freefrag.c    |  284 ++++++
 misc/e2freefrag.h    |   20 
 misc/e4defrag.8.in   |   76 +
 misc/e4defrag.c      | 2147 +++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 2669 insertions(+), 10 deletions(-)

--- NEW FILE e2fsprogs-1.41.8-freefrag-defrag.patch ---
Index: e2fsprogs-1.41.8/misc/e4defrag.8.in
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.8/misc/e4defrag.8.in
@@ -0,0 +1,76 @@
+.TH E4DEFRAG 8 "May 2009" "e4defrag version 2.0"
+.SH NAME
+e4defrag \- online defragmenter for ext4 filesystem
+.SH SYNOPSIS
+.B e4defrag
+[
+.B \-c
+]
+[
+.B \-v
+]
+.I target
+\&...
+.SH DESCRIPTION
+.B e4defrag
+reduces fragmentation of extent based file. The file targeted by
+.B e4defrag
+is created on ext4 filesystem made with "-O extent" option (see
+.BR mke2fs (8)).
+The targeted file gets more contiguous blocks and improves the file access
+speed.
+.PP
+.I target
+is a regular file, a directory, or a device that is mounted as ext4 filesystem.
+If
+.I target
+is a directory,
+.B e4defrag
+reduces fragmentation of all files in it. If
+.I target
+is a device,
+.B e4defrag
+gets the mount point of it and reduces fragmentation of all files in this mount
+point.
+.SH OPTIONS
+.TP
+.B \-c
+Get the fragmentation count and calculate fragmentation score based on it
+before and after defrag. By seeing this score, we can determine whether we
+should execute
+.B e4defrag
+to
+.IR target .
+When used with
+.B \-v
+option, the fragmentation count before and after defrag is printed for each
+file.
+.IP
+If this option is specified,
+.I target
+is never defragmented.
+.TP
+.B \-v
+Print error messages and the fragmentation count before and after defrag for
+each file.
+.SH NOTES
+.B e4defrag
+does not support swap file, files in lost+found directory, and files allocated
+in indirect blocks. When
+.I target
+is a device or a mount point,
+.B e4defrag
+doesn't defragment files in mount point of other device.
+.PP
+Non-privileged users can execute
+.B e4defrag
+to their own file, but the score is not printed if
+.B \-c
+option is specified. Therefore, it is desirable to be executed by root user.
+.SH AUTHOR
+Written by Akira Fujita <a-fujita at rs.jp.nec.com> and Takashi Sato
+<t-sato at yk.jp.nec.com>.
+.SH SEE ALSO
+.BR mke2fs (8),
+.BR mount (8).
+
Index: e2fsprogs-1.41.8/misc/e4defrag.c
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.8/misc/e4defrag.c
@@ -0,0 +1,2147 @@
+/*
+ * e4defrag.c - ext4 filesystem defragmenter
+ *
+ * Copyright (C) 2009 NEC Software Tohoku, Ltd.
+ *
+ * Author: Akira Fujita	<a-fujita at rs.jp.nec.com>
+ *         Takashi Sato	<t-sato at yk.jp.nec.com>
+ */
+
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#endif
+
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <ctype.h>
+#include <dirent.h>
+#include <endian.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ftw.h>
+#include <limits.h>
+#include <mntent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ext2fs/ext2_types.h>
+#include <ext2fs/ext2fs.h>
+#include <linux/fs.h>
+#include <ext2fs/fiemap.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <sys/syscall.h>
+#include <sys/vfs.h>
+
+/* A relatively new ioctl interface ... */
+#ifndef EXT4_IOC_MOVE_EXT
+#define EXT4_IOC_MOVE_EXT      _IOWR('f', 15, struct move_extent)
+#endif
+
+/* Macro functions */
+#define PRINT_ERR_MSG(msg)	fprintf(stderr, "%s\n", (msg))
+#define IN_FTW_PRINT_ERR_MSG(msg)	\
+	fprintf(stderr, "\t%s\t\t[ NG ]\n", (msg))
+#define PRINT_FILE_NAME(file)	fprintf(stderr, " \"%s\"\n", (file))
+#define PRINT_ERR_MSG_WITH_ERRNO(msg)	\
+	fprintf(stderr, "\t%s:%s\t[ NG ]\n", (msg), strerror(errno))
+#define STATISTIC_ERR_MSG(msg)	\
+	fprintf(stderr, "\t%s\n", (msg))
+#define STATISTIC_ERR_MSG_WITH_ERRNO(msg)	\
+	fprintf(stderr, "\t%s:%s\n", (msg), strerror(errno))
+#define min(x, y) (((x) > (y)) ? (y) : (x))
+#define SECTOR_TO_BLOCK(sectors, blocksize) \
+	((sectors) / ((blocksize) >> 9))
+#define CALC_SCORE(ratio) \
+	((ratio) > 10 ? (80 + 20 * (ratio) / 100) : (8 * (ratio)))
+/* Wrap up the free function */
+#define FREE(tmp)				\
+	do {					\
+		if ((tmp) != NULL)		\
+			free(tmp);		\
+	} while (0)				\
+/* Insert list2 after list1 */
+#define insert(list1, list2)			\
+	do {					\
+		list2->next = list1->next;	\
+		list1->next->prev = list2;	\
+		list2->prev = list1;		\
+		list1->next = list2;		\
+	} while (0)
+
+/* To delete unused warning */
+#ifdef __GNUC__
+#define EXT2FS_ATTR(x) __attribute__(x)
+#else
+#define EXT2FS_ATTR(x)
+#endif
+
+/* The mode of defrag */
+#define DETAIL			0x01
+#define STATISTIC		0x02
+
+#define DEVNAME			0
+#define DIRNAME			1
+#define FILENAME		2
+
+#define FTW_OPEN_FD		2000
+
+#define FS_EXT4			"ext4"
+#define ROOT_UID		0
+
+#define BOUND_SCORE		55
+#define SHOW_FRAG_FILES	5
+
+/* Magic number for ext4 */
+#define EXT4_SUPER_MAGIC	0xEF53
+
+/* Definition of flex_bg */
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
+
+/* The following macro is used for ioctl FS_IOC_FIEMAP
+ * EXTENT_MAX_COUNT:	the maximum number of extents for exchanging between
+ *			kernel-space and user-space per ioctl
+ */
[...2437 lines suppressed...]
+	if (info->real_free_chunks) {
+		info->min = (info->min * fs->blocksize) >> 10;
+		info->max = (info->max * fs->blocksize) >> 10;
+		info->avg = (info->avg / info->real_free_chunks *
+			     fs->blocksize) >> 10;
+	} else {
+		info->min = 0;
+	}
+
+	printf("\nMin free chunk: %lu KB \nMax free chunk: %lu KB\n"
+	       "Avg free chunk: %lu KB\n", info->min, info->max, info->avg);
+
+	printf("\nHISTOGRAM OF FREE CHUNK SIZES:\n");
+	printf("%s :  %12s  %12s  %7s\n", "Chunk Size Range", "Free chunks",
+	       "Free Blocks", "Percent");
+	for (i = 0; i < MAX_HIST; i++) {
+		end = 1 << (i + info->blocksize_bits - units);
+		if (info->histogram.fc_chunks[i] != 0)
+			printf("%5lu%c...%5lu%c- :  %12lu  %12lu  %6.2f%%\n",
+			       start, *unitp, end, *unitp,
+			       info->histogram.fc_chunks[i],
+			       info->histogram.fc_blocks[i],
+			       (double)info->histogram.fc_blocks[i] * 100 /
+			       fs->super->s_free_blocks_count);
+		start = end;
+		if (start == 1<<10) {
+			start = 1;
+			units += 10;
+			unitp++;
+		}
+	}
+
+	return retval;
+}
+
+void close_device(char *device_name, ext2_filsys fs)
+{
+	int retval = ext2fs_close(fs);
+
+	if (retval)
+		com_err(device_name, retval, "while closing the filesystem.\n");
+}
+
+void collect_info(ext2_filsys fs, struct chunk_info *chunk_info)
+{
+	unsigned int retval = 0, i, free_blks;
+
+	printf("Device: %s\n", fs->device_name);
+	printf("Blocksize: %u bytes\n", fs->blocksize);
+
+	retval = ext2fs_read_block_bitmap(fs);
+	if (retval) {
+		com_err(fs->device_name, retval, "while reading block bitmap");
+		close_device(fs->device_name, fs);
+		exit(1);
+	}
+
+	init_chunk_info(fs, chunk_info);
+
+	retval = get_chunk_info(fs, chunk_info);
+	if (retval) {
+		com_err(fs->device_name, retval, "while collecting chunk info");
+                close_device(fs->device_name, fs);
+		exit(1);
+	}
+}
+
+void open_device(char *device_name, ext2_filsys *fs)
+{
+	int retval;
+	int flag = EXT2_FLAG_FORCE;
+
+	retval = ext2fs_open(device_name, flag, 0, 0, unix_io_manager, fs);
+	if (retval) {
+		com_err(device_name, retval, "while opening filesystem");
+		exit(1);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	struct chunk_info chunk_info = { .chunkbytes = DEFAULT_CHUNKSIZE };
+	errcode_t retval = 0;
+	ext2_filsys fs = NULL;
+	char *device_name;
+	char *progname;
+	char c, *end;
+
+	progname = argv[0];
+
+	while ((c = getopt(argc, argv, "c:h")) != EOF) {
+		switch (c) {
+		case 'c':
+			chunk_info.chunkbytes = strtoull(optarg, &end, 0);
+			if (*end != '\0') {
+				fprintf(stderr, "%s: bad chunk size '%s'\n",
+					progname, optarg);
+				usage(progname);
+			}
+			if (chunk_info.chunkbytes &
+			    (chunk_info.chunkbytes - 1)) {
+				fprintf(stderr, "%s: chunk size must be a "
+					"power of 2.", argv[0]);
+				usage(progname);
+			}
+			chunk_info.chunkbytes *= 1024;
+			break;
+		default:
+			fprintf(stderr, "%s: bad option '%c'\n",
+				progname, c);
+		case 'h':
+			usage(progname);
+			break;
+		}
+	}
+
+	if (optind == argc) {
+		fprintf(stderr, "%s: missing device name.\n", progname);
+		usage(progname);
+	}
+
+	device_name = argv[optind];
+
+	open_device(device_name, &fs);
+
+	if (chunk_info.chunkbytes < fs->blocksize) {
+		fprintf(stderr, "%s: chunksize must be greater than or equal "
+			"to filesystem blocksize.\n", progname);
+		exit(1);
+	}
+	collect_info(fs, &chunk_info);
+	close_device(device_name, fs);
+
+	return retval;
+}
Index: e2fsprogs-1.41.8/misc/e2freefrag.h
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.8/misc/e2freefrag.h
@@ -0,0 +1,20 @@
+#include <sys/types.h>
+
+#define DEFAULT_CHUNKSIZE (1024*1024)
+
+#define MAX_HIST	32
+struct free_chunk_histogram {
+	unsigned long fc_chunks[MAX_HIST];
+	unsigned long fc_blocks[MAX_HIST];
+};
+
+struct chunk_info {
+	unsigned long chunkbytes;	/* chunk size in bytes */
+	int chunkbits;			/* chunk size in bits */
+	unsigned long free_chunks;	/* total free chunks of given size */
+	unsigned long real_free_chunks; /* free chunks of any size */
+	int blocksize_bits;		/* fs blocksize in bits */
+	int blks_in_chunk;		/* number of blocks in a chunk */
+	unsigned long min, max, avg;	/* chunk size stats */
+	struct free_chunk_histogram histogram; /* histogram of all chunk sizes*/
+};
Index: e2fsprogs-1.41.8/configure
===================================================================
--- e2fsprogs-1.41.8.orig/configure
+++ e2fsprogs-1.41.8/configure
@@ -15790,7 +15790,7 @@ fi
 
 
 
-for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit
+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: e2fsprogs-1.41.8/configure.in
===================================================================
--- e2fsprogs-1.41.8.orig/configure.in
+++ e2fsprogs-1.41.8/configure.in
@@ -828,7 +828,7 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
 	[#include <sys/types.h>
 	 #include <sys/socket.h>])
 dnl
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit)
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate)
 dnl
 dnl Check to see if -lsocket is required (solaris) to make something
 dnl that uses socket() to compile; this is needed for the UUID library
Index: e2fsprogs-1.41.8/Makefile.in
===================================================================
--- e2fsprogs-1.41.8.orig/Makefile.in
+++ e2fsprogs-1.41.8/Makefile.in
@@ -57,6 +57,9 @@ clean-doc:
 distclean-doc:
 	-test -d doc && cd doc && $(MAKE) distclean
 
+install-e4defrag: subs all-libs-recursive
+	$(MAKE) -C misc install-e4defrag
+
 install: subs all-libs-recursive install-progs-recursive \
   install-shlibs-libs-recursive install-doc-libs
 	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- e2fsprogs.spec	25 Jul 2009 23:54:38 -0000	1.147
+++ e2fsprogs.spec	6 Aug 2009 02:15:34 -0000	1.148
@@ -4,13 +4,17 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.8
-Release: 5%{?dist}
+Release: 6%{?dist}
+
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
 Group: System Environment/Base
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: ext2_types-wrapper.h
+
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+Patch3: e2fsprogs-1.41.8-filefrag-fix.patch
+Patch4: e2fsprogs-1.41.8-freefrag-defrag.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +140,10 @@ It was originally inspired by the Multic
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
+# fix filefrag
+%patch3 -p1 -b .filefrag
+# frag tools
+%patch4 -p1 -b .frag
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -145,7 +153,7 @@ make %{?_smp_mflags} V=1
 %install
 rm -rf %{buildroot}
 export PATH=/sbin:$PATH
-make install install-libs DESTDIR=%{buildroot} INSTALL="%{__install} -p" \
+make install install-libs install-e4defrag DESTDIR=%{buildroot} INSTALL="%{__install} -p" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
 
 # ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
@@ -208,8 +216,12 @@ exit 0
 %{_root_sbindir}/resize2fs
 %{_root_sbindir}/tune2fs
 %{_sbindir}/filefrag
+%{_sbindir}/e2freefrag
 %{_sbindir}/mklost+found
 
+%{_bindir}/e4defrag
+%{_mandir}/man8/e4defrag.8*
+
 %{_bindir}/chattr
 %{_bindir}/lsattr
 %{_mandir}/man1/chattr.1*
@@ -223,6 +235,7 @@ exit 0
 %{_mandir}/man8/dumpe2fs.8*
 %{_mandir}/man8/e2fsck.8*
 %{_mandir}/man8/filefrag.8*
+%{_mandir}/man8/e2freefrag.8*
 %{_mandir}/man8/fsck.ext2.8*
 %{_mandir}/man8/fsck.ext3.8*
 %{_mandir}/man8/fsck.ext4.8*
@@ -291,6 +304,10 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Fri Aug 05 2009 Eric Sandeen <sandeen at redhat.com> 1.41.8-6
+- Fix filefrag in fallback case
+- Add e2freefrag & e4defrag (experimental)
+
 * Sun Jul 26 2009 Karel Zak <kzak at redhat.com> 1.41.8-5
 - disable fsck (replaced by util-linux-ng)
 



From oget at fedoraproject.org  Thu Aug  6 02:19:17 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 02:19:17 +0000 (UTC)
Subject: rpms/jack-keyboard/devel jack-keyboard.spec,1.2,1.3
Message-ID: <20090806021918.0052F11C0344@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/jack-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4948

Modified Files:
	jack-keyboard.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-4
- Update the .desktop file



Index: jack-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-keyboard/devel/jack-keyboard.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jack-keyboard.spec	25 Jul 2009 03:46:15 -0000	1.2
+++ jack-keyboard.spec	6 Aug 2009 02:19:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		jack-keyboard
 Version:	2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Virtual keyboard for JACK MIDI
 Group:		Applications/Multimedia
 License:	BSD
@@ -48,6 +48,7 @@ install -pm 644	%{SOURCE1} \
 desktop-file-install						\
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
 	--remove-category=Application				\
+	--add-category=X-Jack					\
 	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 
@@ -78,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-4
+- Update the .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caillon at fedoraproject.org  Thu Aug  6 02:30:19 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu,  6 Aug 2009 02:30:19 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.168,1.169
Message-ID: <20090806023019.4782611C0439@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7390

Modified Files:
	xulrunner.spec 
Log Message:
BuildRequires: libnotify-devel


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- xulrunner.spec	3 Aug 2009 20:53:34 -0000	1.168
+++ xulrunner.spec	6 Aug 2009 02:30:19 -0000	1.169
@@ -63,6 +63,7 @@ BuildRequires:  hunspell-devel
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  libnotify-devel
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
@@ -103,6 +104,7 @@ Requires: hunspell-devel
 Requires: sqlite-devel
 Requires: startup-notification-devel
 Requires: alsa-lib-devel
+Requires: libnotify-devel
 
 %description devel
 Gecko development files.



From oget at fedoraproject.org  Thu Aug  6 02:58:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 02:58:49 +0000 (UTC)
Subject: rpms/aldrin/devel aldrin.spec,1.6,1.7
Message-ID: <20090806025849.4CE0C11C0344@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/aldrin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13913

Modified Files:
	aldrin.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.13-3
- Update the .desktop file



Index: aldrin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/devel/aldrin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- aldrin.spec	24 Jul 2009 16:41:33 -0000	1.6
+++ aldrin.spec	6 Aug 2009 02:58:48 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		aldrin
 Version:	0.13
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Modular music sequencer/tracker
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -41,8 +41,9 @@ touch -r CREDITS CREDITS~
 %{__rm} -rf $RPM_BUILD_ROOT
 scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install 	--vendor="fedora" \
+desktop-file-install	--vendor="fedora" \
 			--remove-category="Application" \
+			--add-category="Sequencer" \
 			--delete-original \
 			--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 			$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -79,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.13-3
+- Update the .desktop file
+
 * 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
 



From oget at fedoraproject.org  Thu Aug  6 03:07:14 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 03:07:14 +0000 (UTC)
Subject: rpms/frescobaldi/devel frescobaldi.spec,1.6,1.7
Message-ID: <20090806030714.53FB711C0344@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15534

Modified Files:
	frescobaldi.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-3
- Update the .desktop file



Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/frescobaldi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- frescobaldi.spec	24 Jul 2009 23:12:44 -0000	1.6
+++ frescobaldi.spec	6 Aug 2009 03:07:14 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           frescobaldi
 Version:        0.7.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
 # python/hyphenator.py is LGPLv2+
@@ -88,6 +88,7 @@ desktop-file-install                    
    --dir=%{buildroot}%{_datadir}/applications                \
    --remove-category=Application                             \
    --add-category=AudioVideo                                 \
+   --add-category=X-Notation                                 \
    --delete-original                                         \
    %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
@@ -122,6 +123,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-3
+- Update the .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rakesh at fedoraproject.org  Thu Aug  6 03:16:11 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  6 Aug 2009 03:16:11 +0000 (UTC)
Subject: rpms/flickcurl/devel .cvsignore, 1.2, 1.3 flickcurl.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090806031611.3052111C0344@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/flickcurl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061/devel

Modified Files:
	.cvsignore flickcurl.spec import.log sources 
Log Message:
Updated to 1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Jun 2009 11:05:08 -0000	1.2
+++ .cvsignore	6 Aug 2009 03:16:10 -0000	1.3
@@ -1 +1 @@
-flickcurl-1.10.tar.gz
+flickcurl-1.13.tar.gz


Index: flickcurl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/flickcurl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- flickcurl.spec	24 Jul 2009 22:53:40 -0000	1.2
+++ flickcurl.spec	6 Aug 2009 03:16:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		flickcurl
-Version:	1.10
-Release:	4%{?dist}
+Version:	1.13
+Release:	1%{?dist}
 Summary:	C library for the Flickr API
 
 Group:		System Environment/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}-config.1.gz
 
 %changelog
+* Thu Aug 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.13-1
+- Updated to 1.13
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	8 Jun 2009 11:05:08 -0000	1.1
+++ import.log	6 Aug 2009 03:16:11 -0000	1.2
@@ -1 +1,2 @@
 flickcurl-1_10-3_fc10:HEAD:flickcurl-1.10-3.fc10.src.rpm:1244458708
+flickcurl-1_13-1_fc11:HEAD:flickcurl-1.13-1.fc11.src.rpm:1249528778


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flickcurl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jun 2009 11:05:08 -0000	1.2
+++ sources	6 Aug 2009 03:16:11 -0000	1.3
@@ -1 +1 @@
-9d952990fd13a8beebbffe58061bbd0f  flickcurl-1.10.tar.gz
+d0a90b9e06e8927f2eb13c55f4fe9640  flickcurl-1.13.tar.gz



From rakesh at fedoraproject.org  Thu Aug  6 03:28:17 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  6 Aug 2009 03:28:17 +0000 (UTC)
Subject: rpms/dvtm/devel Makefile-0.5.2.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 dvtm.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 Makefile-0.5.1.patch, 1.1, NONE
Message-ID: <20090806032817.3144411C0344@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/dvtm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20242/devel

Modified Files:
	.cvsignore dvtm.spec import.log sources 
Added Files:
	Makefile-0.5.2.patch 
Removed Files:
	Makefile-0.5.1.patch 
Log Message:
Updated to 5.2


Makefile-0.5.2.patch:
 Makefile |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE Makefile-0.5.2.patch ---
--- dvtm-0.5.1.org/Makefile	2009-05-10 04:23:02.000000000 +0530
+++ dvtm-0.5.1/Makefile	2009-06-04 13:01:24.000000000 +0530
@@ -12,14 +12,14 @@
 	@echo "CC       = ${CC}"
 
 .c.o:
-	@echo CC $<
+	@echo CC -c ${CFLAGS} $<
 	@${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk
 
 dvtm: ${OBJ}
-	@echo CC -o $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@echo ${CC} ${CFLAGS} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} ${CFLAGS} -o $@ ${OBJ} ${LDFLAGS}
 
 debug: clean
 	@make CFLAGS='${DEBUG_CFLAGS}'
@@ -40,13 +40,11 @@
 	@rm -rf dvtm-${VERSION}
 
 install: dvtm
-	@echo stripping executable
-	@strip -s dvtm
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dvtm ${DESTDIR}${PREFIX}/bin
+	@cp -pf dvtm ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm
-	@cp -f dvtm-status ${DESTDIR}${PREFIX}/bin
+	@cp -pf dvtm-status ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm-status
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvtm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Jun 2009 10:30:20 -0000	1.2
+++ .cvsignore	6 Aug 2009 03:28:16 -0000	1.3
@@ -1 +1 @@
-dvtm-0.5.1.tar.gz
+dvtm-0.5.2.tar.gz


Index: dvtm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvtm/devel/dvtm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dvtm.spec	24 Jul 2009 20:40:57 -0000	1.2
+++ dvtm.spec	6 Aug 2009 03:28:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dvtm
-Version:        0.5.1
-Release:        6%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        Tiling window management for the console
 
 Group:          Applications/System
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 06 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.5.2-1
+- Updated to 0.5.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dvtm/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	8 Jun 2009 10:30:20 -0000	1.1
+++ import.log	6 Aug 2009 03:28:16 -0000	1.2
@@ -1 +1,2 @@
 dvtm-0_5_1-5_fc10:HEAD:dvtm-0.5.1-5.fc10.src.rpm:1244456586
+dvtm-0_5_2-1_fc11:HEAD:dvtm-0.5.2-1.fc11.src.rpm:1249528935


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvtm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jun 2009 10:30:20 -0000	1.2
+++ sources	6 Aug 2009 03:28:16 -0000	1.3
@@ -1 +1 @@
-15af44198d6a636190480122b8de7155  dvtm-0.5.1.tar.gz
+7872b9e61705a4e9952655b3b88e4add  dvtm-0.5.2.tar.gz


--- Makefile-0.5.1.patch DELETED ---



From oget at fedoraproject.org  Thu Aug  6 03:28:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 03:28:30 +0000 (UTC)
Subject: rpms/tuxguitar/devel tuxguitar.desktop, 1.1, 1.2 tuxguitar.spec, 1.5,
	1.6
Message-ID: <20090806032830.090A911C0344@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20393

Modified Files:
	tuxguitar.desktop tuxguitar.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-3
- Update the .desktop file



Index: tuxguitar.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/tuxguitar.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tuxguitar.desktop	3 Oct 2008 17:40:22 -0000	1.1
+++ tuxguitar.desktop	6 Aug 2009 03:28:29 -0000	1.2
@@ -10,5 +10,5 @@ Exec=tuxguitar %f
 Icon=tuxguitar
 Terminal=false
 Type=Application
-Categories=AudioVideo;Audio;
+Categories=AudioVideo;Audio;X-Notation;
 MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;audio/midi;


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/tuxguitar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tuxguitar.spec	27 Jul 2009 06:22:49 -0000	1.5
+++ tuxguitar.spec	6 Aug 2009 03:28:29 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:          A multitrack tablature editor and player written in Java-SWT
 Name:             tuxguitar
 Version:          1.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 URL:              http://www.tuxguitar.com.ar
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 Source9:          %{name}.desktop
@@ -176,6 +176,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/%{name}
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-3
+- Update the .desktop file
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Thu Aug  6 03:50:03 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 03:50:03 +0000 (UTC)
Subject: rpms/zynjacku/devel lv2rack.desktop, 1.1, 1.2 zynjacku.desktop, 1.1,
	1.2 zynjacku.spec, 1.3, 1.4
Message-ID: <20090806035003.709A411C0425@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynjacku/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24832

Modified Files:
	lv2rack.desktop zynjacku.desktop zynjacku.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-3
- Update the .desktop file



Index: lv2rack.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/devel/lv2rack.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lv2rack.desktop	17 Apr 2009 18:54:11 -0000	1.1
+++ lv2rack.desktop	6 Aug 2009 03:50:03 -0000	1.2
@@ -6,4 +6,4 @@ Exec=lv2rack
 Icon=zynjacku
 Terminal=false
 Type=Application
-Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;
+Categories=GTK;AudioVideo;Audio;Midi;X-Jack;X-DigitalProcessing;


Index: zynjacku.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/devel/zynjacku.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynjacku.desktop	17 Apr 2009 18:54:11 -0000	1.1
+++ zynjacku.desktop	6 Aug 2009 03:50:03 -0000	1.2
@@ -6,4 +6,4 @@ Exec=zynjacku
 Icon=zynjacku
 Terminal=false
 Type=Application
-Categories=GTK;AudioVideo;Audio;Midi;Music;X-Jack;
+Categories=GTK;AudioVideo;Audio;Midi;X-Jack;X-Synthesis;


Index: zynjacku.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/devel/zynjacku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zynjacku.spec	27 Jul 2009 09:05:35 -0000	1.3
+++ zynjacku.spec	6 Aug 2009 03:50:03 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		zynjacku
 Version:	5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	LV2 synths and plugins host
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/72x72/apps/%{name}.png
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-3
+- Update the .desktop file
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Thu Aug  6 04:03:47 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 04:03:47 +0000 (UTC)
Subject: rpms/mscore/devel mscore.spec,1.3,1.4
Message-ID: <20090806040347.BCA6911C00E4@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10430

Modified Files:
	mscore.spec 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-6
- Update the .desktop file



Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mscore.spec	25 Jul 2009 15:16:25 -0000	1.3
+++ mscore.spec	6 Aug 2009 04:03:47 -0000	1.4
@@ -9,7 +9,7 @@
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -142,6 +142,9 @@ sed -i 's|relStaff %%d, %%d|relStaff %%d
 # Remove preshipped fonts. We will build them from source
 rm -f %{name}/%{name}/fonts/*.ttf
 
+# Fix GenericName
+sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
+
 %build
 # Build the actual program
 mkdir build
@@ -167,7 +170,13 @@ mkdir -p %{buildroot}/%{_fontdir}
 install -pm 644 %{name}/%{name}/fonts/%{fontfamilyname}*.ttf %{buildroot}/%{_fontdir}
 
 # Desktop file
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-install \
+   --dir=%{buildroot}/%{_datadir}/applications \
+   --remove-category="Application" \
+   --add-category="X-Notation" \
+   --remove-category="Sequencer" \
+   --remove-category="AudioVideoEditing" \
+   %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Move images to the freedesktop location
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/apps/
@@ -231,6 +240,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %endif
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-6
+- Update the .desktop file
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kyle at fedoraproject.org  Thu Aug  6 04:05:39 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  6 Aug 2009 04:05:39 +0000 (UTC)
Subject: rpms/kernel/devel die-floppy-die.patch, NONE, 1.1 kernel.spec,
	1.1695, 1.1696
Message-ID: <20090806040539.071DA11C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5586

Modified Files:
	kernel.spec 
Added Files:
	die-floppy-die.patch 
Log Message:
* Thu Aug 06 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.0.133.rc5.git3
- die-floppy-die.patch: it's the 21st century, let's not rely on
  steam powered technology.


die-floppy-die.patch:
 floppy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE die-floppy-die.patch ---
Kill the floppy.ko pnp modalias. We were surviving just fine without
autoloading floppy drivers, tyvm.

Please feel free to register all complaints in the wastepaper bin.

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 91b7530..2ea84a6 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4631,7 +4631,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
 	{ "PNP0700", 0 },
 	{ }
 };
-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
 
 #else
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1695
retrieving revision 1.1696
diff -u -p -r1.1695 -r1.1696
--- kernel.spec	5 Aug 2009 07:14:49 -0000	1.1695
+++ kernel.spec	6 Aug 2009 04:05:38 -0000	1.1696
@@ -639,6 +639,8 @@ Patch452: linux-2.6.30-no-pcspkr-modalia
 
 Patch460: linux-2.6-serial-460800.patch
 
+Patch470: die-floppy-die.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
@@ -1221,6 +1223,9 @@ ApplyPatch alsa-tell-user-that-stream-to
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 
+# stop floppy.ko from autoloading during udev...
+ApplyPatch die-floppy-die.patch
+
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
@@ -1946,6 +1951,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 06 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.0.133.rc5.git3
+- die-floppy-die.patch: it's the 21st century, let's not rely on
+  steam powered technology.
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.132.rc5.git3
 - revert-ftrace-powerpc-snafu.patch - fix ppc build
 



From oget at fedoraproject.org  Thu Aug  6 04:16:40 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 04:16:40 +0000 (UTC)
Subject: rpms/kmplayer/devel kmplayer.spec,1.15,1.16
Message-ID: <20090806041640.7435511C00E4@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/kmplayer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687

Modified Files:
	kmplayer.spec 
Log Message:
* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-3
- Update the .desktop file



Index: kmplayer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmplayer/devel/kmplayer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kmplayer.spec	25 Jul 2009 04:40:39 -0000	1.15
+++ kmplayer.spec	6 Aug 2009 04:16:39 -0000	1.16
@@ -1,7 +1,7 @@
 Name:    kmplayer
 Summary: A simple frontend for MPlayer/FFMpeg/Phonon
 Version: 0.11.1b
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   Applications/Multimedia
 # The documentation is GFDL.
 # The files under src/moz-sdk are MPLv1.1 or GPLv2+ or LGPLv2+
@@ -91,9 +91,11 @@ fi
 # oxygen conflicts
 rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/kmplayer.*
 
-
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmplayer.desktop
+# Desktop file
+desktop-file-install \
+   --dir=%{buildroot}/%{_kde4_datadir}/applications/kde4 \
+   --add-category="Player" \
+   %{buildroot}/%{_kde4_datadir}/applications/kde4/kmplayer.desktop
 
 
 %clean
@@ -132,6 +134,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1b-3
+- Update the .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Thu Aug  6 04:18:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  6 Aug 2009 04:18:59 +0000 (UTC)
Subject: rpms/seahorse/devel password-tab.patch, NONE, 1.1 seahorse.spec,
	1.76, 1.77
Message-ID: <20090806041859.9BF5611C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18326

Modified Files:
	seahorse.spec 
Added Files:
	password-tab.patch 
Log Message:
Bring the password tab back


password-tab.patch:
 seahorse-key-manager.xml |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE password-tab.patch ---
diff --git a/src/seahorse-key-manager.xml b/src/seahorse-key-manager.xml
index cc7c4ec..85f71ef 100644
--- a/src/seahorse-key-manager.xml
+++ b/src/seahorse-key-manager.xml
@@ -39,13 +39,13 @@
             <property name="can_focus">True</property>
             <property name="border_width">3</property>
             <child>
-              <object class="GtkScrolledWindow" id="sec-key-tab">
+              <object class="GtkScrolledWindow" id="password-tab">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="border_width">3</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <child>
-                  <object class="GtkTreeView" id="sec-key-list">
+                  <object class="GtkTreeView" id="password-list">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">12</property>
@@ -69,7 +69,26 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkScrolledWindow" id="sec-key-tab">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="border_width">3</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTreeView" id="sec-key-list">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="border_width">12</property>
+                    <property name="rules_hint">True</property>
+                    <signal name="button_press_event" handler="on_keymanager_key_list_button_pressed"/>
+                    <signal name="row_activated" handler="on_keymanager_row_activated"/>
+                    <signal name="popup_menu" handler="on_keymanager_key_list_popup_menu"/>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label26">


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- seahorse.spec	28 Jul 2009 04:48:03 -0000	1.76
+++ seahorse.spec	6 Aug 2009 04:18:59 -0000	1.77
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.27.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -9,6 +9,8 @@ License:        GPLv2+ and LGPLv2+
 URL:            http://projects.gnome.org/seahorse/
 Source:         http://download.gnome.org/sources/seahorse/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# from upstream
+Patch0:		password-tab.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -59,6 +61,7 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
+%patch0 -p1 -b .password-tab
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -163,6 +166,9 @@ fi
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Thu Aug  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
+- Bring the password tab back
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From whot at fedoraproject.org  Thu Aug  6 04:21:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  6 Aug 2009 04:21:51 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-11 .cvsignore, 1.33, 1.34 sources, 1.33, 
	1.34 xorg-x11-drv-evdev.spec, 1.52, 1.53
Message-ID: <20090806042151.B8F0E11C00E4@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-serv19583

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.4-1
- evdev 2.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	30 Jul 2009 01:22:43 -0000	1.33
+++ .cvsignore	6 Aug 2009 04:21:51 -0000	1.34
@@ -1 +1 @@
-xf86-input-evdev-2.2.3.tar.bz2
+xf86-input-evdev-2.2.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	30 Jul 2009 01:22:43 -0000	1.33
+++ sources	6 Aug 2009 04:21:51 -0000	1.34
@@ -1 +1 @@
-dbfe9aa75a476165af8b467a7665742b  xf86-input-evdev-2.2.3.tar.bz2
+6d0bd6cd3f50a42687c663d4764aeb44  xf86-input-evdev-2.2.4.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.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xorg-x11-drv-evdev.spec	30 Jul 2009 01:22:43 -0000	1.52
+++ xorg-x11-drv-evdev.spec	6 Aug 2009 04:21:51 -0000	1.53
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.3
+Version:    2.2.4
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -72,6 +72,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.4-1
+- evdev 2.2.4
+
 * Thu Jul 30 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.3-1
 - evdev 2.2.3
 



From pgordon at fedoraproject.org  Thu Aug  6 04:30:26 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  6 Aug 2009 04:30:26 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore, 1.12, 1.13 midori.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20090806043026.A463611C034A@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21226

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.9; switch back to using system waf.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Jun 2009 03:22:06 -0000	1.12
+++ .cvsignore	6 Aug 2009 04:30:25 -0000	1.13
@@ -1 +1 @@
-midori-0.1.7.tar.bz2
+midori-0.1.9.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- midori.spec	25 Jul 2009 12:10:59 -0000	1.24
+++ midori.spec	6 Aug 2009 04:30:25 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		midori
-Version:	0.1.7
-Release:	2%{?dist}
+Version:	0.1.9
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -18,15 +18,14 @@ BuildRequires:	intltool
 BuildRequires:	libidn-devel
 BuildRequires:	libsexy-devel
 BuildRequires:	librsvg2
-BuildRequires:	libsoup-devel
+BuildRequires:	libsoup-devel >= 2.25.2
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	unique-devel
-## XXX: Using the system waf makes it fail to build (python error).
-# BuildRequires:	waf >= 1.5
+BuildRequires:	waf >= 1.5
 BuildRequires:	webkitgtk-devel >= 1.1.1
 
 %description
@@ -47,21 +46,21 @@ implemented, and some are still quite in
 %prep
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
-#rm -rf waf
+rm -rf waf
 
 
 %build
 export CFLAGS="%{optflags}"
-./waf	--prefix=%{_usr}			\
+waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
 	configure
-./waf %{?_smp_mflags} build
+waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-./waf --destdir=%{buildroot} install
+waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -102,6 +101,13 @@ fi
 
 
 %changelog
+* Wed Aug 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.9-1
+- Update to new upstream release (0.1.9): lots of fixes and updates for tab
+  functionality and the tab panel, as well as menu fixes, and enhancements
+  for being private data with just a few simple clicks!
+- Revert to using the system waf, now that it no longer causes Python errors
+  when compiling.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Jun 2009 03:22:06 -0000	1.12
+++ sources	6 Aug 2009 04:30:25 -0000	1.13
@@ -1 +1 @@
-c6299ecf93417526f37bc0154c18b126  midori-0.1.7.tar.bz2
+faf5295091f47372352840b84c422149  midori-0.1.9.tar.bz2



From airlied at fedoraproject.org  Thu Aug  6 05:33:44 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu,  6 Aug 2009 05:33:44 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1696,
	1.1697 linux-2.6-vga-arb.patch, 1.6, 1.7
Message-ID: <20090806053345.0FEA011C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1287

Modified Files:
	kernel.spec linux-2.6-vga-arb.patch 
Log Message:
* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.134.rc5.git3
- fixup vga arb warning at startup and handover between gpus



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1696
retrieving revision 1.1697
diff -u -p -r1.1696 -r1.1697
--- kernel.spec	6 Aug 2009 04:05:38 -0000	1.1696
+++ kernel.spec	6 Aug 2009 05:33:43 -0000	1.1697
@@ -1951,6 +1951,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.134.rc5.git3
+- fixup vga arb warning at startup and handover between gpus
+
 * Thu Aug 06 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.0.133.rc5.git3
 - die-floppy-die.patch: it's the 21st century, let's not rely on
   steam powered technology.

linux-2.6-vga-arb.patch:
 drivers/gpu/Makefile     |    2 
 drivers/gpu/vga/Kconfig  |   10 
 drivers/gpu/vga/Makefile |    1 
 drivers/gpu/vga/vgaarb.c | 1206 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 +
 drivers/video/Kconfig    |    2 
 include/linux/pci.h      |    2 
 include/linux/vgaarb.h   |  196 +++++++
 8 files changed, 1461 insertions(+), 2 deletions(-)

Index: linux-2.6-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vga-arb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- linux-2.6-vga-arb.patch	4 Aug 2009 01:47:32 -0000	1.6
+++ linux-2.6-vga-arb.patch	6 Aug 2009 05:33:44 -0000	1.7
@@ -1,4 +1,4 @@
-From a00c47b3e783fe9ebb871071d2472387451d9225 Mon Sep 17 00:00:00 2001
+From 83ec7b4c9fecfcffe396290f6e96ea5a60a59598 Mon Sep 17 00:00:00 2001
 From: Tiago Vignatti <tiago.vignatti at nokia.com>
 Date: Tue, 14 Jul 2009 15:57:29 +0300
 Subject: [PATCH] vga: implements VGA arbitration on Linux
@@ -15,18 +15,20 @@ balance pci get/put
 use the decodes count for userspace to get card
 count also if a gpu disables decodes move it to
 the next card
+do handover properly to next card
+optimise notify to only be done when something happens
 
 Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
 ---
  drivers/gpu/Makefile     |    2 +-
  drivers/gpu/vga/Kconfig  |   10 +
  drivers/gpu/vga/Makefile |    1 +
- drivers/gpu/vga/vgaarb.c | 1195 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/gpu/vga/vgaarb.c | 1206 ++++++++++++++++++++++++++++++++++++++++++++++
  drivers/pci/pci.c        |   44 ++
  drivers/video/Kconfig    |    2 +
  include/linux/pci.h      |    2 +
  include/linux/vgaarb.h   |  195 ++++++++
- 8 files changed, 1450 insertions(+), 1 deletions(-)
+ 8 files changed, 1461 insertions(+), 1 deletions(-)
  create mode 100644 drivers/gpu/vga/Kconfig
  create mode 100644 drivers/gpu/vga/Makefile
  create mode 100644 drivers/gpu/vga/vgaarb.c
@@ -64,10 +66,10 @@ index 0000000..7cc8c1e
 +obj-$(CONFIG_VGA_ARB)  += vgaarb.o
 diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
 new file mode 100644
-index 0000000..08ba44d
+index 0000000..199138f
 --- /dev/null
 +++ b/drivers/gpu/vga/vgaarb.c
-@@ -0,0 +1,1195 @@
+@@ -0,0 +1,1206 @@
 +/*
 + * vgaarb.c
 + *
@@ -476,7 +478,7 @@ index 0000000..08ba44d
 + * the arbiter's client decides if devices decodes or not legacy
 + * things.
 + */
-+static void vga_arbiter_add_pci_device(struct pci_dev *pdev)
++static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)
 +{
 +	struct vga_device *vgadev;
 +	unsigned long flags;
@@ -486,7 +488,7 @@ index 0000000..08ba44d
 +
 +	/* Only deal with VGA class devices */
 +	if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
-+		return;
++		return false;
 +
 +	/* Allocate structure */
 +	vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL);
@@ -496,7 +498,7 @@ index 0000000..08ba44d
 +		 * just do nothing, I'm not sure there is anything saner
 +		 * to be done
 +		 */
-+		return;
++		return false;
 +	}
 +
 +	memset(vgadev, 0, sizeof(*vgadev));
@@ -559,21 +561,25 @@ index 0000000..08ba44d
 +		vga_iostate_to_str(vgadev->locks));
 +
 +	spin_unlock_irqrestore(&vga_lock, flags);
-+	return;
++	return true;
 +fail:
 +	spin_unlock_irqrestore(&vga_lock, flags);
 +	kfree(vgadev);
++	return false;
 +}
 +
-+static void vga_arbiter_del_pci_device(struct pci_dev *pdev)
++static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
 +{
 +	struct vga_device *vgadev;
 +	unsigned long flags;
++	bool ret = true;
 +
 +	spin_lock_irqsave(&vga_lock, flags);
 +	vgadev = vgadev_find(pdev);
-+	if (vgadev == NULL)
++	if (vgadev == NULL) {
++		ret = false;
 +		goto bail;
++	}
 +
 +	if (vga_default == pdev) {
 +		pci_dev_put(vga_default);
@@ -596,6 +602,7 @@ index 0000000..08ba44d
 +bail:
 +	spin_unlock_irqrestore(&vga_lock, flags);
 +	kfree(vgadev);
++	return ret;
 +}
 +
 +/* this is called with the lock */
@@ -608,18 +615,22 @@ index 0000000..08ba44d
 +	old_decodes = vgadev->decodes;
 +	vgadev->decodes = new_decodes;
 +
-+	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s\n",
++	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s:owns=%s\n",
 +		pci_name(vgadev->pdev),
 +		vga_iostate_to_str(old_decodes),
-+		vga_iostate_to_str(vgadev->decodes));
++		vga_iostate_to_str(vgadev->decodes),
++		vga_iostate_to_str(vgadev->owns));
++
 +
 +	/* if we own the decodes we should move them along to
 +	   another card */
-+	if ((vgadev->owns & new_decodes) && (vga_count > 1)) {
-+		vgadev->owns &= new_decodes;
++	if ((vgadev->owns & old_decodes) && (vga_count > 1)) {
++		/* set us to own nothing */
++		vgadev->owns &= ~old_decodes;
 +		list_for_each_entry(new_vgadev, &vga_list, list) {
 +			if ((new_vgadev != vgadev) &&
 +			    (new_vgadev->decodes & VGA_RSRC_LEGACY_MASK)) {
++				pr_info("vgaarb: transferring owner from PCI:%s to PCI:%s\n", pci_name(vgadev->pdev), pci_name(new_vgadev->pdev));
 +				conflict = __vga_tryget(new_vgadev, VGA_RSRC_LEGACY_MASK);
 +				if (!conflict)
 +					__vga_put(new_vgadev, VGA_RSRC_LEGACY_MASK);
@@ -1209,6 +1220,7 @@ index 0000000..08ba44d
 +{
 +	struct device *dev = data;
 +	struct pci_dev *pdev = to_pci_dev(dev);
++	bool notify = false;
 +
 +	pr_devel("%s\n", __func__);
 +
@@ -1216,11 +1228,12 @@ index 0000000..08ba44d
 +	 * test this thing here, so someone needs to double check for the
 +	 * cases of hotplugable vga cards. */
 +	if (action == BUS_NOTIFY_ADD_DEVICE)
-+		vga_arbiter_add_pci_device(pdev);
++		notify = vga_arbiter_add_pci_device(pdev);
 +	else if (action == BUS_NOTIFY_DEL_DEVICE)
-+		vga_arbiter_del_pci_device(pdev);
++		notify = vga_arbiter_del_pci_device(pdev);
 +
-+	vga_arbiter_notify_clients();
++	if (notify)
++		vga_arbiter_notify_clients();
 +	return 0;
 +}
 +
@@ -1319,7 +1332,7 @@ index dbd0f94..d837606 100644
  static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
  spinlock_t resource_alignment_lock = SPIN_LOCK_UNLOCKED;
 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 8afcf08..f4ed145 100644
+index 3b54b39..a0d9ee1 100644
 --- a/drivers/video/Kconfig
 +++ b/drivers/video/Kconfig
 @@ -7,6 +7,8 @@ menu "Graphics support"
@@ -1546,5 +1559,5 @@ index 0000000..68229ce
 +
 +#endif /* LINUX_VGA_H */
 -- 
-1.5.4.1
+1.6.4
 



From pgordon at fedoraproject.org  Thu Aug  6 06:11:52 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  6 Aug 2009 06:11:52 +0000 (UTC)
Subject: rpms/midori/F-11 .cvsignore, 1.12, 1.13 midori.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20090806061152.D0D1311C00E4@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8695/F-11

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.7; revert to using system waf.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Jun 2009 03:23:22 -0000	1.12
+++ .cvsignore	6 Aug 2009 06:11:50 -0000	1.13
@@ -1 +1 @@
-midori-0.1.7.tar.bz2
+midori-0.1.9.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- midori.spec	4 Jun 2009 03:23:22 -0000	1.24
+++ midori.spec	6 Aug 2009 06:11:51 -0000	1.25
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.7
+Version:	0.1.9
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -18,15 +18,14 @@ BuildRequires:	intltool
 BuildRequires:	libidn-devel
 BuildRequires:	libsexy-devel
 BuildRequires:	librsvg2
-BuildRequires:	libsoup-devel
+BuildRequires:	libsoup-devel >= 2.25.2
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	unique-devel
-## XXX: Using the system waf makes it fail to build (python error).
-# BuildRequires:	waf >= 1.5
+BuildRequires:	waf >= 1.5
 BuildRequires:	webkitgtk-devel >= 1.1.1
 
 %description
@@ -47,21 +46,21 @@ implemented, and some are still quite in
 %prep
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
-#rm -rf waf
+rm -rf waf
 
 
 %build
 export CFLAGS="%{optflags}"
-./waf	--prefix=%{_usr}			\
+waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
 	configure
-./waf %{?_smp_mflags} build
+waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-./waf --destdir=%{buildroot} install
+waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -102,6 +101,13 @@ fi
 
 
 %changelog
+* Wed Aug 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.9-1
+- Update to new upstream release (0.1.9): lots of fixes and updates for tab
+  functionality and the tab panel, as well as menu fixes, and enhancements
+  for being private data with just a few simple clicks!
+- Revert to using the system waf, now that it no longer causes Python errors
+  when compiling.
+
 * Wed Jun 03 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.7-1
 - Update to new upstream release (0.1.7): Implements saving activation state
   of extensions, ignore mouse buttons used for horizontal scrolling, panel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Jun 2009 03:23:22 -0000	1.12
+++ sources	6 Aug 2009 06:11:51 -0000	1.13
@@ -1 +1 @@
-c6299ecf93417526f37bc0154c18b126  midori-0.1.7.tar.bz2
+faf5295091f47372352840b84c422149  midori-0.1.9.tar.bz2



From pgordon at fedoraproject.org  Thu Aug  6 07:01:35 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  6 Aug 2009 07:01:35 +0000 (UTC)
Subject: rpms/midori/devel midori.spec,1.25,1.26
Message-ID: <20090806070135.E69F511C02C6@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19722/devel

Modified Files:
	midori.spec 
Log Message:
Wording correction for the changelog entries.


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- midori.spec	6 Aug 2009 04:30:25 -0000	1.25
+++ midori.spec	6 Aug 2009 07:01:35 -0000	1.26
@@ -104,7 +104,7 @@ fi
 * Wed Aug 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.9-1
 - Update to new upstream release (0.1.9): lots of fixes and updates for tab
   functionality and the tab panel, as well as menu fixes, and enhancements
-  for being private data with just a few simple clicks!
+  for deleting private data with just a few simple clicks!
 - Revert to using the system waf, now that it no longer causes Python errors
   when compiling.
 



From pgordon at fedoraproject.org  Thu Aug  6 07:01:35 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  6 Aug 2009 07:01:35 +0000 (UTC)
Subject: rpms/midori/F-11 midori.spec,1.25,1.26
Message-ID: <20090806070135.E5B2611C00E4@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19722/F-11

Modified Files:
	midori.spec 
Log Message:
Wording correction for the changelog entries.


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- midori.spec	6 Aug 2009 06:11:51 -0000	1.25
+++ midori.spec	6 Aug 2009 07:01:34 -0000	1.26
@@ -104,7 +104,7 @@ fi
 * Wed Aug 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.9-1
 - Update to new upstream release (0.1.9): lots of fixes and updates for tab
   functionality and the tab panel, as well as menu fixes, and enhancements
-  for being private data with just a few simple clicks!
+  for deleting private data with just a few simple clicks!
 - Revert to using the system waf, now that it no longer causes Python errors
   when compiling.
 



From gerd at fedoraproject.org  Thu Aug  6 07:24:19 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Thu,  6 Aug 2009 07:24:19 +0000 (UTC)
Subject: rpms/parrot/F-11 parrot.spec,1.9,1.10
Message-ID: <20090806072419.9351B11C00E4@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24584

Modified Files:
	parrot.spec 
Log Message:
ppc test included again; by this update to 1.4.0-9


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-11/parrot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- parrot.spec	4 Aug 2009 02:56:15 -0000	1.9
+++ parrot.spec	6 Aug 2009 07:24:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -220,10 +220,8 @@ done
 # 'make fulltest' is done by default; it take a lot of time
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
-%ifnarch ppc
 %{?_without_fulltest: FULL=''}
 %{?!_without_tests: make ${FULL}test}
-%endif
 
 
 %clean
@@ -270,7 +268,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-8
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
+- ppc test included again
 - include the necessary module Parrot::Oplib::core
 - change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*
@@ -304,7 +303,6 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
 - Removed wrong prefix from pkgconfig per Christoph Wickert
 - Changed i386 to ix86 per Christoph Wickert
-- Changed hard-coded path requirement to perl.
 
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0



From oget at fedoraproject.org  Thu Aug  6 07:25:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 07:25:49 +0000 (UTC)
Subject: rpms/zynaddsubfx/devel zynaddsubfx-build-flags.patch, NONE,
	1.1 zynaddsubfx-jack-support.patch, NONE,
	1.1 zynaddsubfx.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 zynaddsubfx-fltk-config-broken-2.patch, 1.1,
	1.2 zynaddsubfx.spec, 1.15, 1.16 zyn_lash-0.5.0pre0.diff, 1.1,
	NONE zynaddsubfx-unzombify.patch, 1.1, NONE
Message-ID: <20090806072549.290A411C00E4@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25521

Modified Files:
	.cvsignore sources zynaddsubfx-fltk-config-broken-2.patch 
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-build-flags.patch zynaddsubfx-jack-support.patch 
	zynaddsubfx.desktop 
Removed Files:
	zyn_lash-0.5.0pre0.diff zynaddsubfx-unzombify.patch 
Log Message:
* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
- Update to 2.4.0
- Update scriptlets according to new guidelines
- Update the .desktop file
- Use Fedora specific flags during compilation
- License is GPLv2+ (just run the program on the command line :))


zynaddsubfx-build-flags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zynaddsubfx-build-flags.patch ---
--- ZynAddSubFX-2.4.0.old/src/Makefile	2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile	2009-08-06 01:49:58.000000000 -0400
@@ -1,7 +1,7 @@
 include Makefile.inc
 
 ifneq ($(MAKECMDGOALS),debug)
-  CXXFLAGS= -O6 -Wall -g 
+  CXXFLAGS= $(RPM_OPT_FLAGS)
 else 
   CXXFLAGS= -O0 -Wall -Wpointer-arith 
 endif

zynaddsubfx-jack-support.patch:
 Makefile.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zynaddsubfx-jack-support.patch ---
diff -rupN ZynAddSubFX-2.4.0.old/src/Makefile.inc ZynAddSubFX-2.4.0/src/Makefile.inc
--- ZynAddSubFX-2.4.0.old/src/Makefile.inc	2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile.inc	2009-08-06 00:52:56.000000000 -0400
@@ -29,9 +29,9 @@ LINUX_MIDIIN=ALSA
 #parameters (run 'zynaddsubfx --help' for help) 
 
 #LINUX_AUDIOOUT=OSS_AND_JACK
-LINUX_AUDIOOUT=OSS
+#LINUX_AUDIOOUT=OSS
 #LINUX_AUDIOOUT=NONE
-#LINUX_AUDIOOUT=JACK
+LINUX_AUDIOOUT=JACK
 #LINUX_AUDIOOUT=JACK_RT     JACK_RT support is broken
 #for PortAudio (PA)
 #LINUX_AUDIOOUT=PA


--- NEW FILE zynaddsubfx.desktop ---
[Desktop Entry]
Name=ZynAddSubFX
Comment=Real-time software synthesizer
GenericName=Software Synthesizer
Icon=zynaddsubfx
Type=Application
Exec=zynaddsubfx
Terminal=false
Categories=AudioVideo;X-Synthesis;Midi;X-Jack;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Sep 2006 04:54:47 -0000	1.2
+++ .cvsignore	6 Aug 2009 07:25:48 -0000	1.3
@@ -1 +1 @@
-ZynAddSubFX-2.2.1.tar.bz2
+ZynAddSubFX-2.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Sep 2006 04:54:47 -0000	1.2
+++ sources	6 Aug 2009 07:25:48 -0000	1.3
@@ -1 +1 @@
-fca8560e37d799bd20d17e22b11674d6  ZynAddSubFX-2.2.1.tar.bz2
+b60b3c8a61c91e1aca54866d23c69f90  ZynAddSubFX-2.4.0.tar.bz2

zynaddsubfx-fltk-config-broken-2.patch:
 Controller/Makefile |   10 +++++-----
 Spliter/Makefile    |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

Index: zynaddsubfx-fltk-config-broken-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx-fltk-config-broken-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynaddsubfx-fltk-config-broken-2.patch	2 Sep 2006 04:54:47 -0000	1.1
+++ zynaddsubfx-fltk-config-broken-2.patch	6 Aug 2009 07:25:48 -0000	1.2
@@ -1,32 +1,53 @@
---- ExternalPrograms/Controller/compile.sh~	2006-07-20 23:56:05.000000000 -0700
-+++ ExternalPrograms/Controller/compile.sh	2006-07-20 23:55:48.000000000 -0700
-@@ -1,10 +1,10 @@
- ./clean.sh
- fluid -c ControllerUI.fl
--gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
--gcc `fltk-config --cflags` -c Controller.C -o Controller.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
- 
- 
- 
--gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm
-+gcc -o controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
- 
---- ExternalPrograms/Spliter/compile.sh~	2005-03-12 10:16:26.000000000 -0800
-+++ ExternalPrograms/Spliter/compile.sh	2006-07-20 23:54:51.000000000 -0700
-@@ -1,8 +1,8 @@
- ./clean.sh
- fluid -c SpliterUI.fl
--gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
--gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
- 
--gcc -o spliter *.o `fltk-config --ldflags` -lasound
-+gcc -o spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
- 
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile	2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile	2009-08-06 01:45:49.000000000 -0400
+@@ -1,18 +1,18 @@
+ controller: main.o Controller.o ControllerUI.o
+-	gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
++	gcc -o zynaddsubfx-controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
+ 
+ ControllerUI.cxx ControllerUI.h: ControllerUI.fl
+ 	fluid -c ControllerUI.fl
+ 
+ ControllerUI.o: ControllerUI.cxx ControllerUI.h
+-	gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
+ 
+ Controller.o: Controller.C Controller.h
+-	gcc `fltk-config --cflags` -c Controller.C -o Controller.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o
+ 
+ main.o: main.C Controller.h ControllerUI.h
+-	gcc `fltk-config --cflags` -c main.C -o main.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+-	rm -f *.o controller ControllerUI.cxx ControllerUI.h 
++	rm -f *.o zynaddsubfx-controller ControllerUI.cxx ControllerUI.h 
+ 
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile	2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile	2009-08-06 01:46:05.000000000 -0400
+@@ -1,17 +1,17 @@
+ spliter: main.o Spliter.o SpliterUI.o
+-	gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
++	gcc -o zynaddsubfx-spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
+ 
+ SplitterUI.cxx SpliterUI.h: SpliterUI.fl
+ 	fluid -c SpliterUI.fl
+ 
+ SpliterUI.o: SplitterUI.cxx SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+ 
+ Spliter.o: Spliter.C Spliter.h
+-	gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Spliter.C -o Spliter.o
+ 
+ main.o: main.C Spliter.h SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c main.C -o main.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+-	rm -f *.o spliter SpliterUI.cxx SpliterUI.h 
++	rm -f *.o zynaddsubfx-spliter SpliterUI.cxx SpliterUI.h 


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- zynaddsubfx.spec	27 Jul 2009 09:05:22 -0000	1.15
+++ zynaddsubfx.spec	6 Aug 2009 07:25:48 -0000	1.16
@@ -1,15 +1,16 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
-Version:        2.2.1
-Release:        21%{?dist}
-License:        GPLv2
+Version:        2.4.0
+Release:        1%{?dist}
+License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
 Source0:        http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{version}.tar.bz2
-Patch0:         zyn_lash-0.5.0pre0.diff
+Source1:        zynaddsubfx.desktop
+Patch0:         zynaddsubfx-jack-support.patch
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
-Patch3:		zynaddsubfx-unzombify.patch
+Patch3:         zynaddsubfx-build-flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -20,55 +21,42 @@ Requires:       hicolor-icon-theme
 BuildRequires:  alsa-lib-devel fftw3-devel fltk-devel mxml-devel
 BuildRequires:  jack-audio-connection-kit-devel zlib-devel lash-devel
 BuildRequires:  libX11-devel fltk-fluid
-BuildRequires:  ImageMagick perl
+BuildRequires:  ImageMagick
 
-BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
+#dssi support is broken for now
+#BuildRequires:  dssi-devel
+BuildRequires:  desktop-file-utils
 
 %description
 ZynAddSubFX is an open source software synthesizer capable of making a
-countless number of instrument sounds.
-
-%package doc
-Summary:        Documentation and examples for ZynAddSubFX
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
-
-%description doc
-Documentation and examples for ZynAddSubFX
+countless number of instrument sounds. It is microtonal, and the instruments
+made by it sounds like those from professional keyboards. The program has
+effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q -n ZynAddSubFX-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 
 %build
-# fix microtuning bug (no keyboard mapping being done)
-%{__perl} -p -i -e "s|tmp=Pmapping\[tx\]|Pmapping\[tx\]=tmp|g" src/Misc/Microtonal.C
-
 %ifarch %{ix86} x86_64 
 # We're ok.
 %else
-%{__perl} -p -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
+sed -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
 %endif
 
 cd src
 # do not use smp flags, makefile is not smp safe
-%ifarch %{ix86} x86_64 
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_YES `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%else
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_NO `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%endif
+make
 
 # build external programs
 cd ../ExternalPrograms
 cd Controller
-./compile.sh
+make
 cd ../Spliter
-./compile.sh
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,31 +71,16 @@ install -m 0755 zynaddsubfx $RPM_BUILD_R
 # install external programs
 cd ../ExternalPrograms
 cd Controller
-install -m 0755 controller $RPM_BUILD_ROOT%{_bindir}/controller
+install -m 0755 zynaddsubfx-controller $RPM_BUILD_ROOT%{_bindir}/controller
 cd ../Spliter
-install -m 0755 spliter $RPM_BUILD_ROOT%{_bindir}/spliter
+install -m 0755 zynaddsubfx-spliter $RPM_BUILD_ROOT%{_bindir}/spliter
 cd ../..
 
-BASE="Application;AudioVideo;"
-CATS="X-Synthesis;X-MIDI;X-Jack;"
-%{__cat} << EOF > %{name}.desktop
-[Desktop Entry]
-Name=ZynAddSubFX
-Comment=Real-time software synthesizer
-Icon=zynaddsubfx
-Type=Application
-Exec=%{_bindir}/%{name}
-Terminal=false
-Categories=${BASE}${CATS}
-Encoding=UTF-8
-EOF
+# .desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora              \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
-  --add-category Application                      \
-  %{name}.desktop
+desktop-file-install --vendor fedora \
+   --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -128,18 +101,20 @@ install -m 644 zynaddsubfx-64.png $RPM_B
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
+%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
@@ -150,6 +125,13 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
+- Update to 2.4.0
+- Update scriptlets according to new guidelines
+- Update the .desktop file
+- Use Fedora specific flags during compilation
+- License is GPLv2+ (just run the program on the command line :))
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- zyn_lash-0.5.0pre0.diff DELETED ---


--- zynaddsubfx-unzombify.patch DELETED ---



From jens at fedoraproject.org  Thu Aug  6 07:26:46 2009
From: jens at fedoraproject.org (Jens Kuehnel)
Date: Thu,  6 Aug 2009 07:26:46 +0000 (UTC)
Subject: rpms/miredo/devel miredo.spec,1.3,1.4
Message-ID: <20090806072646.CFF1B11C00E4@cvs1.fedora.phx.redhat.com>

Author: jens

Update of /cvs/pkgs/rpms/miredo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25313

Modified Files:
	miredo.spec 
Log Message:
Fix for 515506



Index: miredo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/devel/miredo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- miredo.spec	28 Jul 2009 11:35:17 -0000	1.3
+++ miredo.spec	6 Aug 2009 07:26:46 -0000	1.4
@@ -8,7 +8,7 @@
 
 Name:           miredo
 Version:        1.1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tunneling of IPv6 over UDP through NATs
 
 Group:          Applications/Internet
@@ -80,7 +80,7 @@ Summary:        Tunneling client for IPv
 Group:          Applications/Internet
 Requires:       %{name}-libs = %{version}-%{release}
 Provides:       %{name} = %{version}-%{release}
-Obsoletes:      %{name} = 1.1.6-2
+Obsoletes:      %{name} <= 1.1.6
 
 
 %description client
@@ -174,7 +174,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/miredo
 %{_libdir}/libteredo.so.*
 %{_libdir}/libtun6.so.*
-%{_libdir}/miredo/miredo-privproc
+%{_libdir}/miredo/
 
 %files devel
 %defattr(-,root,root,-)
@@ -205,6 +205,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
+- Fix Obsoletes for smooth upgrade
+
 * Tue Jul 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-3
 - without July as optional, hopefully the last EL fix
 



From caillon at fedoraproject.org  Thu Aug  6 07:52:22 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu,  6 Aug 2009 07:52:22 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner-mozconfig, 1.26, 1.27 xulrunner.spec,
	1.169, 1.170
Message-ID: <20090806075222.2B98211C00E4@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29765

Modified Files:
	xulrunner-mozconfig xulrunner.spec 
Log Message:
lcms support is dead


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xulrunner-mozconfig	30 Jun 2009 21:22:20 -0000	1.26
+++ xulrunner-mozconfig	6 Aug 2009 07:52:21 -0000	1.27
@@ -2,9 +2,6 @@
 
 # --with-system-png is disabled because Mozilla requires APNG support in libpng
 #ac_add_options --with-system-png
-# --enable-system-lcms is disabled because Mozilla patched lcms.h to have INTENT_{MIN,MAX}
-# See https://bugzilla.mozilla.org/show_bug.cgi?id=444014
-#ac_add_options --enable-system-lcms
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- xulrunner.spec	6 Aug 2009 02:30:19 -0000	1.169
+++ xulrunner.spec	6 Aug 2009 07:52:21 -0000	1.170
@@ -2,7 +2,6 @@
 %define nspr_version 4.8
 %define nss_version 3.12.1.1
 %define cairo_version 1.6.0
-%define lcms_version 1.17
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
 %define tarballdir mozilla-1.9.1
@@ -48,7 +47,6 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  zip
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
-BuildRequires:  lcms-devel >= %{lcms_version}
 BuildRequires:  libIDL-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gnome-vfs2-devel
@@ -89,7 +87,6 @@ Requires: libjpeg-devel
 Requires: zip
 Requires: bzip2-devel
 Requires: zlib-devel
-Requires: lcms-devel >= %{lcms_version}
 Requires: libIDL-devel
 Requires: gtk2-devel
 Requires: gnome-vfs2-devel



From caillon at fedoraproject.org  Thu Aug  6 07:58:46 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu,  6 Aug 2009 07:58:46 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.170,1.171
Message-ID: <20090806075846.CC66711C00E4@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32139

Modified Files:
	xulrunner.spec 
Log Message:
raise nss requirement


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- xulrunner.spec	6 Aug 2009 07:52:21 -0000	1.170
+++ xulrunner.spec	6 Aug 2009 07:58:46 -0000	1.171
@@ -1,6 +1,6 @@
 # Minimal required versions
 %define nspr_version 4.8
-%define nss_version 3.12.1.1
+%define nss_version 3.12.3.99
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14



From oget at fedoraproject.org  Thu Aug  6 08:00:02 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 08:00:02 +0000 (UTC)
Subject: rpms/zynaddsubfx/F-11 zynaddsubfx-build-flags.patch, NONE,
	1.1 zynaddsubfx-jack-support.patch, NONE,
	1.1 zynaddsubfx.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 zynaddsubfx-fltk-config-broken-2.patch, 1.1,
	1.2 zynaddsubfx.spec, 1.14, 1.15 zyn_lash-0.5.0pre0.diff, 1.1,
	NONE zynaddsubfx-unzombify.patch, 1.1, NONE
Message-ID: <20090806080002.B822411C0439@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32496

Modified Files:
	.cvsignore sources zynaddsubfx-fltk-config-broken-2.patch 
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-build-flags.patch zynaddsubfx-jack-support.patch 
	zynaddsubfx.desktop 
Removed Files:
	zyn_lash-0.5.0pre0.diff zynaddsubfx-unzombify.patch 
Log Message:
* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
- Update to 2.4.0
- Update scriptlets according to new guidelines
- Update the .desktop file
- Use Fedora specific flags during compilation
- License is GPLv2+ (just run the program on the command line :))


zynaddsubfx-build-flags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zynaddsubfx-build-flags.patch ---
--- ZynAddSubFX-2.4.0.old/src/Makefile	2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile	2009-08-06 01:49:58.000000000 -0400
@@ -1,7 +1,7 @@
 include Makefile.inc
 
 ifneq ($(MAKECMDGOALS),debug)
-  CXXFLAGS= -O6 -Wall -g 
+  CXXFLAGS= $(RPM_OPT_FLAGS)
 else 
   CXXFLAGS= -O0 -Wall -Wpointer-arith 
 endif

zynaddsubfx-jack-support.patch:
 Makefile.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zynaddsubfx-jack-support.patch ---
diff -rupN ZynAddSubFX-2.4.0.old/src/Makefile.inc ZynAddSubFX-2.4.0/src/Makefile.inc
--- ZynAddSubFX-2.4.0.old/src/Makefile.inc	2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile.inc	2009-08-06 00:52:56.000000000 -0400
@@ -29,9 +29,9 @@ LINUX_MIDIIN=ALSA
 #parameters (run 'zynaddsubfx --help' for help) 
 
 #LINUX_AUDIOOUT=OSS_AND_JACK
-LINUX_AUDIOOUT=OSS
+#LINUX_AUDIOOUT=OSS
 #LINUX_AUDIOOUT=NONE
-#LINUX_AUDIOOUT=JACK
+LINUX_AUDIOOUT=JACK
 #LINUX_AUDIOOUT=JACK_RT     JACK_RT support is broken
 #for PortAudio (PA)
 #LINUX_AUDIOOUT=PA


--- NEW FILE zynaddsubfx.desktop ---
[Desktop Entry]
Name=ZynAddSubFX
Comment=Real-time software synthesizer
GenericName=Software Synthesizer
Icon=zynaddsubfx
Type=Application
Exec=zynaddsubfx
Terminal=false
Categories=AudioVideo;X-Synthesis;Midi;X-Jack;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Sep 2006 04:54:47 -0000	1.2
+++ .cvsignore	6 Aug 2009 08:00:02 -0000	1.3
@@ -1 +1 @@
-ZynAddSubFX-2.2.1.tar.bz2
+ZynAddSubFX-2.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Sep 2006 04:54:47 -0000	1.2
+++ sources	6 Aug 2009 08:00:02 -0000	1.3
@@ -1 +1 @@
-fca8560e37d799bd20d17e22b11674d6  ZynAddSubFX-2.2.1.tar.bz2
+b60b3c8a61c91e1aca54866d23c69f90  ZynAddSubFX-2.4.0.tar.bz2

zynaddsubfx-fltk-config-broken-2.patch:
 Controller/Makefile |   10 +++++-----
 Spliter/Makefile    |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

Index: zynaddsubfx-fltk-config-broken-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-11/zynaddsubfx-fltk-config-broken-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynaddsubfx-fltk-config-broken-2.patch	2 Sep 2006 04:54:47 -0000	1.1
+++ zynaddsubfx-fltk-config-broken-2.patch	6 Aug 2009 08:00:02 -0000	1.2
@@ -1,32 +1,53 @@
---- ExternalPrograms/Controller/compile.sh~	2006-07-20 23:56:05.000000000 -0700
-+++ ExternalPrograms/Controller/compile.sh	2006-07-20 23:55:48.000000000 -0700
-@@ -1,10 +1,10 @@
- ./clean.sh
- fluid -c ControllerUI.fl
--gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
--gcc `fltk-config --cflags` -c Controller.C -o Controller.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
- 
- 
- 
--gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm
-+gcc -o controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
- 
---- ExternalPrograms/Spliter/compile.sh~	2005-03-12 10:16:26.000000000 -0800
-+++ ExternalPrograms/Spliter/compile.sh	2006-07-20 23:54:51.000000000 -0700
-@@ -1,8 +1,8 @@
- ./clean.sh
- fluid -c SpliterUI.fl
--gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
--gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
- 
--gcc -o spliter *.o `fltk-config --ldflags` -lasound
-+gcc -o spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
- 
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile	2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile	2009-08-06 01:45:49.000000000 -0400
+@@ -1,18 +1,18 @@
+ controller: main.o Controller.o ControllerUI.o
+-	gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
++	gcc -o zynaddsubfx-controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
+ 
+ ControllerUI.cxx ControllerUI.h: ControllerUI.fl
+ 	fluid -c ControllerUI.fl
+ 
+ ControllerUI.o: ControllerUI.cxx ControllerUI.h
+-	gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
+ 
+ Controller.o: Controller.C Controller.h
+-	gcc `fltk-config --cflags` -c Controller.C -o Controller.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o
+ 
+ main.o: main.C Controller.h ControllerUI.h
+-	gcc `fltk-config --cflags` -c main.C -o main.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+-	rm -f *.o controller ControllerUI.cxx ControllerUI.h 
++	rm -f *.o zynaddsubfx-controller ControllerUI.cxx ControllerUI.h 
+ 
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile	2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile	2009-08-06 01:46:05.000000000 -0400
+@@ -1,17 +1,17 @@
+ spliter: main.o Spliter.o SpliterUI.o
+-	gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
++	gcc -o zynaddsubfx-spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
+ 
+ SplitterUI.cxx SpliterUI.h: SpliterUI.fl
+ 	fluid -c SpliterUI.fl
+ 
+ SpliterUI.o: SplitterUI.cxx SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+ 
+ Spliter.o: Spliter.C Spliter.h
+-	gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Spliter.C -o Spliter.o
+ 
+ main.o: main.C Spliter.h SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c main.C -o main.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+-	rm -f *.o spliter SpliterUI.cxx SpliterUI.h 
++	rm -f *.o zynaddsubfx-spliter SpliterUI.cxx SpliterUI.h 


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-11/zynaddsubfx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- zynaddsubfx.spec	25 Feb 2009 18:47:42 -0000	1.14
+++ zynaddsubfx.spec	6 Aug 2009 08:00:02 -0000	1.15
@@ -1,15 +1,16 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
-Version:        2.2.1
-Release:        20%{?dist}
-License:        GPLv2
+Version:        2.4.0
+Release:        1%{?dist}
+License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
 Source0:        http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{version}.tar.bz2
-Patch0:         zyn_lash-0.5.0pre0.diff
+Source1:        zynaddsubfx.desktop
+Patch0:         zynaddsubfx-jack-support.patch
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
-Patch3:		zynaddsubfx-unzombify.patch
+Patch3:         zynaddsubfx-build-flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -20,55 +21,42 @@ Requires:       hicolor-icon-theme
 BuildRequires:  alsa-lib-devel fftw3-devel fltk-devel mxml-devel
 BuildRequires:  jack-audio-connection-kit-devel zlib-devel lash-devel
 BuildRequires:  libX11-devel fltk-fluid
-BuildRequires:  ImageMagick perl
+BuildRequires:  ImageMagick
 
-BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
+#dssi support is broken for now
+#BuildRequires:  dssi-devel
+BuildRequires:  desktop-file-utils
 
 %description
 ZynAddSubFX is an open source software synthesizer capable of making a
-countless number of instrument sounds.
-
-%package doc
-Summary:        Documentation and examples for ZynAddSubFX
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
-
-%description doc
-Documentation and examples for ZynAddSubFX
+countless number of instrument sounds. It is microtonal, and the instruments
+made by it sounds like those from professional keyboards. The program has
+effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q -n ZynAddSubFX-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 
 %build
-# fix microtuning bug (no keyboard mapping being done)
-%{__perl} -p -i -e "s|tmp=Pmapping\[tx\]|Pmapping\[tx\]=tmp|g" src/Misc/Microtonal.C
-
 %ifarch %{ix86} x86_64 
 # We're ok.
 %else
-%{__perl} -p -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
+sed -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
 %endif
 
 cd src
 # do not use smp flags, makefile is not smp safe
-%ifarch %{ix86} x86_64 
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_YES `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%else
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_NO `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%endif
+make
 
 # build external programs
 cd ../ExternalPrograms
 cd Controller
-./compile.sh
+make
 cd ../Spliter
-./compile.sh
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,31 +71,16 @@ install -m 0755 zynaddsubfx $RPM_BUILD_R
 # install external programs
 cd ../ExternalPrograms
 cd Controller
-install -m 0755 controller $RPM_BUILD_ROOT%{_bindir}/controller
+install -m 0755 zynaddsubfx-controller $RPM_BUILD_ROOT%{_bindir}/controller
 cd ../Spliter
-install -m 0755 spliter $RPM_BUILD_ROOT%{_bindir}/spliter
+install -m 0755 zynaddsubfx-spliter $RPM_BUILD_ROOT%{_bindir}/spliter
 cd ../..
 
-BASE="Application;AudioVideo;"
-CATS="X-Synthesis;X-MIDI;X-Jack;"
-%{__cat} << EOF > %{name}.desktop
-[Desktop Entry]
-Name=ZynAddSubFX
-Comment=Real-time software synthesizer
-Icon=zynaddsubfx
-Type=Application
-Exec=%{_bindir}/%{name}
-Terminal=false
-Categories=${BASE}${CATS}
-Encoding=UTF-8
-EOF
+# .desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora              \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
-  --add-category Application                      \
-  %{name}.desktop
+desktop-file-install --vendor fedora \
+   --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -128,18 +101,20 @@ install -m 644 zynaddsubfx-64.png $RPM_B
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
+%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
@@ -150,6 +125,16 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
+- Update to 2.4.0
+- Update scriptlets according to new guidelines
+- Update the .desktop file
+- Use Fedora specific flags during compilation
+- License is GPLv2+ (just run the program on the command line :))
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- zyn_lash-0.5.0pre0.diff DELETED ---


--- zynaddsubfx-unzombify.patch DELETED ---



From caillon at fedoraproject.org  Thu Aug  6 08:03:58 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu,  6 Aug 2009 08:03:58 +0000 (UTC)
Subject: rpms/firefox/devel firefox.spec,1.334,1.335
Message-ID: <20090806080358.3593B11C00E4@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891

Modified Files:
	firefox.spec 
Log Message:
Remove spurious BuildRequires - these are all BuildRequire'd by xulrunner-devel, which we BR



Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- firefox.spec	3 Aug 2009 22:47:03 -0000	1.334
+++ firefox.spec	6 Aug 2009 08:03:57 -0000	1.335
@@ -57,19 +57,8 @@ Source100:      find-external-requires
 # ---------------------------------------------------
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:  zip
-BuildRequires:  libIDL-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  gtk2-devel
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  libgnomeui-devel
-BuildRequires:  krb5-devel
-BuildRequires:  pango-devel
-BuildRequires:  freetype-devel >= 2.1.9
-BuildRequires:  libXt-devel
-BuildRequires:  libXrender-devel
 BuildRequires:  system-bookmarks
-BuildRequires:  startup-notification-devel
 BuildRequires:  xulrunner-devel-unstable >= %{xulrunner_version}
 
 Requires:       xulrunner >= %{xulrunner_version}



From vcrhonek at fedoraproject.org  Thu Aug  6 08:27:45 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu,  6 Aug 2009 08:27:45 +0000 (UTC)
Subject: rpms/fetchmail/devel .cvsignore, 1.20, 1.21 fetchmail.spec, 1.67,
	1.68 sources, 1.20, 1.21 fetchmail-6.2.5-addrconf.patch, 1.2, NONE
Message-ID: <20090806082745.EA52111C00E4@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7442

Modified Files:
	.cvsignore fetchmail.spec sources 
Removed Files:
	fetchmail-6.2.5-addrconf.patch 
Log Message:
Update to fetchmail-6.3.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	3 Dec 2008 14:01:12 -0000	1.20
+++ .cvsignore	6 Aug 2009 08:27:45 -0000	1.21
@@ -4,3 +4,5 @@ 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


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- fetchmail.spec	24 Jul 2009 22:42:23 -0000	1.67
+++ fetchmail.spec	6 Aug 2009 08:27:45 -0000	1.68
@@ -3,12 +3,11 @@
 
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.3.9
-Release: 5%{?dist}
+Version: 6.3.11
+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
-Patch0: fetchmail-6.2.5-addrconf.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -46,7 +45,6 @@ need to have Python and Tk installed in 
 
 %prep
 %setup -q
-%patch0 -p1 -b .addrconf
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -85,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.11-1
+- Update to fetchmail-6.3.11
+- Remove addrconf patch (upstream now)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	3 Dec 2008 14:01:12 -0000	1.20
+++ sources	6 Aug 2009 08:27:45 -0000	1.21
@@ -1,2 +1,2 @@
-72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
-f8a950df048af14ee80728341bca1426  fetchmail-6.3.9.tar.bz2.asc
+43b28f296cc0024d3c727319eacae324  fetchmail-6.3.11.tar.bz2
+347a29dbce620e82ad48572a337715ed  fetchmail-6.3.11.tar.bz2.asc


--- fetchmail-6.2.5-addrconf.patch DELETED ---



From oget at fedoraproject.org  Thu Aug  6 08:02:11 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu,  6 Aug 2009 08:02:11 +0000 (UTC)
Subject: rpms/zynaddsubfx/F-10 zynaddsubfx-build-flags.patch, NONE,
	1.1 zynaddsubfx-jack-support.patch, NONE,
	1.1 zynaddsubfx.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 zynaddsubfx-fltk-config-broken-2.patch, 1.1,
	1.2 zynaddsubfx.spec, 1.13, 1.14 zyn_lash-0.5.0pre0.diff, 1.1,
	NONE zynaddsubfx-unzombify.patch, 1.1, NONE
Message-ID: <20090806080211.3AE1011C00E4@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/zynaddsubfx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv723

Modified Files:
	.cvsignore sources zynaddsubfx-fltk-config-broken-2.patch 
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-build-flags.patch zynaddsubfx-jack-support.patch 
	zynaddsubfx.desktop 
Removed Files:
	zyn_lash-0.5.0pre0.diff zynaddsubfx-unzombify.patch 
Log Message:
* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
- Update to 2.4.0
- Update scriptlets according to new guidelines
- Update the .desktop file
- Use Fedora specific flags during compilation
- License is GPLv2+ (just run the program on the command line :))


zynaddsubfx-build-flags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zynaddsubfx-build-flags.patch ---
--- ZynAddSubFX-2.4.0.old/src/Makefile	2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile	2009-08-06 01:49:58.000000000 -0400
@@ -1,7 +1,7 @@
 include Makefile.inc
 
 ifneq ($(MAKECMDGOALS),debug)
-  CXXFLAGS= -O6 -Wall -g 
+  CXXFLAGS= $(RPM_OPT_FLAGS)
 else 
   CXXFLAGS= -O0 -Wall -Wpointer-arith 
 endif

zynaddsubfx-jack-support.patch:
 Makefile.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zynaddsubfx-jack-support.patch ---
diff -rupN ZynAddSubFX-2.4.0.old/src/Makefile.inc ZynAddSubFX-2.4.0/src/Makefile.inc
--- ZynAddSubFX-2.4.0.old/src/Makefile.inc	2009-07-15 15:48:41.000000000 -0400
+++ ZynAddSubFX-2.4.0/src/Makefile.inc	2009-08-06 00:52:56.000000000 -0400
@@ -29,9 +29,9 @@ LINUX_MIDIIN=ALSA
 #parameters (run 'zynaddsubfx --help' for help) 
 
 #LINUX_AUDIOOUT=OSS_AND_JACK
-LINUX_AUDIOOUT=OSS
+#LINUX_AUDIOOUT=OSS
 #LINUX_AUDIOOUT=NONE
-#LINUX_AUDIOOUT=JACK
+LINUX_AUDIOOUT=JACK
 #LINUX_AUDIOOUT=JACK_RT     JACK_RT support is broken
 #for PortAudio (PA)
 #LINUX_AUDIOOUT=PA


--- NEW FILE zynaddsubfx.desktop ---
[Desktop Entry]
Name=ZynAddSubFX
Comment=Real-time software synthesizer
GenericName=Software Synthesizer
Icon=zynaddsubfx
Type=Application
Exec=zynaddsubfx
Terminal=false
Categories=AudioVideo;X-Synthesis;Midi;X-Jack;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Sep 2006 04:54:47 -0000	1.2
+++ .cvsignore	6 Aug 2009 08:02:10 -0000	1.3
@@ -1 +1 @@
-ZynAddSubFX-2.2.1.tar.bz2
+ZynAddSubFX-2.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Sep 2006 04:54:47 -0000	1.2
+++ sources	6 Aug 2009 08:02:10 -0000	1.3
@@ -1 +1 @@
-fca8560e37d799bd20d17e22b11674d6  ZynAddSubFX-2.2.1.tar.bz2
+b60b3c8a61c91e1aca54866d23c69f90  ZynAddSubFX-2.4.0.tar.bz2

zynaddsubfx-fltk-config-broken-2.patch:
 Controller/Makefile |   10 +++++-----
 Spliter/Makefile    |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

Index: zynaddsubfx-fltk-config-broken-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-10/zynaddsubfx-fltk-config-broken-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynaddsubfx-fltk-config-broken-2.patch	2 Sep 2006 04:54:47 -0000	1.1
+++ zynaddsubfx-fltk-config-broken-2.patch	6 Aug 2009 08:02:10 -0000	1.2
@@ -1,32 +1,53 @@
---- ExternalPrograms/Controller/compile.sh~	2006-07-20 23:56:05.000000000 -0700
-+++ ExternalPrograms/Controller/compile.sh	2006-07-20 23:55:48.000000000 -0700
-@@ -1,10 +1,10 @@
- ./clean.sh
- fluid -c ControllerUI.fl
--gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
--gcc `fltk-config --cflags` -c Controller.C -o Controller.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Controller.C -o Controller.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
- 
- 
- 
--gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm
-+gcc -o controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
- 
---- ExternalPrograms/Spliter/compile.sh~	2005-03-12 10:16:26.000000000 -0800
-+++ ExternalPrograms/Spliter/compile.sh	2006-07-20 23:54:51.000000000 -0700
-@@ -1,8 +1,8 @@
- ./clean.sh
- fluid -c SpliterUI.fl
--gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
--gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
--gcc `fltk-config --cflags` -c main.C -o main.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c Spliter.C -o Spliter.o
-+gcc $RPM_OPT_FLAGS `fltk-config --cflags` -c main.C -o main.o
- 
--gcc -o spliter *.o `fltk-config --ldflags` -lasound
-+gcc -o spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
- 
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Controller/Makefile	2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Controller/Makefile	2009-08-06 01:45:49.000000000 -0400
+@@ -1,18 +1,18 @@
+ controller: main.o Controller.o ControllerUI.o
+-	gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
++	gcc -o zynaddsubfx-controller *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound -lpthread -lm
+ 
+ ControllerUI.cxx ControllerUI.h: ControllerUI.fl
+ 	fluid -c ControllerUI.fl
+ 
+ ControllerUI.o: ControllerUI.cxx ControllerUI.h
+-	gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
+ 
+ Controller.o: Controller.C Controller.h
+-	gcc `fltk-config --cflags` -c Controller.C -o Controller.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o
+ 
+ main.o: main.C Controller.h ControllerUI.h
+-	gcc `fltk-config --cflags` -c main.C -o main.o
++	gcc $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+-	rm -f *.o controller ControllerUI.cxx ControllerUI.h 
++	rm -f *.o zynaddsubfx-controller ControllerUI.cxx ControllerUI.h 
+ 
+diff -rupN ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile
+--- ZynAddSubFX-2.4.0.old/ExternalPrograms/Spliter/Makefile	2009-07-15 15:48:41.000000000 -0400
++++ ZynAddSubFX-2.4.0/ExternalPrograms/Spliter/Makefile	2009-08-06 01:46:05.000000000 -0400
+@@ -1,17 +1,17 @@
+ spliter: main.o Spliter.o SpliterUI.o
+-	gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
++	gcc -o zynaddsubfx-spliter *.o -lXft -lXrender -lfontconfig -lfreetype -lz -lX11 -lfltk -lXft -lpthread -lm -lXext -lX11 -lasound
+ 
+ SplitterUI.cxx SpliterUI.h: SpliterUI.fl
+ 	fluid -c SpliterUI.fl
+ 
+ SpliterUI.o: SplitterUI.cxx SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+ 
+ Spliter.o: Spliter.C Spliter.h
+-	gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c Spliter.C -o Spliter.o
+ 
+ main.o: main.C Spliter.h SpliterUI.h
+-	gcc -g `fltk-config --cflags` -c main.C -o main.o
++	gcc -g $(RPM_OPT_FLAGS) `fltk-config --cflags` -c main.C -o main.o
+ 
+ clean:
+-	rm -f *.o spliter SpliterUI.cxx SpliterUI.h 
++	rm -f *.o zynaddsubfx-spliter SpliterUI.cxx SpliterUI.h 


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynaddsubfx/F-10/zynaddsubfx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- zynaddsubfx.spec	11 Aug 2008 22:24:03 -0000	1.13
+++ zynaddsubfx.spec	6 Aug 2009 08:02:10 -0000	1.14
@@ -1,15 +1,16 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
-Version:        2.2.1
-Release:        19%{?dist}
-License:        GPLv2
+Version:        2.4.0
+Release:        1%{?dist}
+License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
 Source0:        http://download.sf.net/sourceforge/zynaddsubfx/ZynAddSubFX-%{version}.tar.bz2
-Patch0:         zyn_lash-0.5.0pre0.diff
+Source1:        zynaddsubfx.desktop
+Patch0:         zynaddsubfx-jack-support.patch
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
-Patch3:		zynaddsubfx-unzombify.patch
+Patch3:         zynaddsubfx-build-flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -20,55 +21,42 @@ Requires:       hicolor-icon-theme
 BuildRequires:  alsa-lib-devel fftw3-devel fltk-devel mxml-devel
 BuildRequires:  jack-audio-connection-kit-devel zlib-devel lash-devel
 BuildRequires:  libX11-devel fltk-fluid
-BuildRequires:  ImageMagick perl
+BuildRequires:  ImageMagick
 
-BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
+#dssi support is broken for now
+#BuildRequires:  dssi-devel
+BuildRequires:  desktop-file-utils
 
 %description
 ZynAddSubFX is an open source software synthesizer capable of making a
-countless number of instrument sounds.
-
-%package doc
-Summary:        Documentation and examples for ZynAddSubFX
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
-
-%description doc
-Documentation and examples for ZynAddSubFX
+countless number of instrument sounds. It is microtonal, and the instruments
+made by it sounds like those from professional keyboards. The program has
+effects like Reverb, Echo, Chorus, Phaser...
 
 %prep
 %setup -q -n ZynAddSubFX-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 
 %build
-# fix microtuning bug (no keyboard mapping being done)
-%{__perl} -p -i -e "s|tmp=Pmapping\[tx\]|Pmapping\[tx\]=tmp|g" src/Misc/Microtonal.C
-
 %ifarch %{ix86} x86_64 
 # We're ok.
 %else
-%{__perl} -p -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
+sed -i -e "s|ASM_F2I=YES|ASM_F2I=NO|g" src/Makefile.inc
 %endif
 
 cd src
 # do not use smp flags, makefile is not smp safe
-%ifarch %{ix86} x86_64 
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_YES `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%else
-make AUDIOOUT=JACK CXXFLAGS="-DOS_LINUX -DALSAMIDIIN -DFFTW_VERSION_3 -DASM_F2I_NO `fltk-config --cflags`  -DJACKAUDIOOUT  `pkg-config --cflags jack` `pkg-config --cflags lash-1.0`"
-%endif
+make
 
 # build external programs
 cd ../ExternalPrograms
 cd Controller
-./compile.sh
+make
 cd ../Spliter
-./compile.sh
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,31 +71,16 @@ install -m 0755 zynaddsubfx $RPM_BUILD_R
 # install external programs
 cd ../ExternalPrograms
 cd Controller
-install -m 0755 controller $RPM_BUILD_ROOT%{_bindir}/controller
+install -m 0755 zynaddsubfx-controller $RPM_BUILD_ROOT%{_bindir}/controller
 cd ../Spliter
-install -m 0755 spliter $RPM_BUILD_ROOT%{_bindir}/spliter
+install -m 0755 zynaddsubfx-spliter $RPM_BUILD_ROOT%{_bindir}/spliter
 cd ../..
 
-BASE="Application;AudioVideo;"
-CATS="X-Synthesis;X-MIDI;X-Jack;"
-%{__cat} << EOF > %{name}.desktop
-[Desktop Entry]
-Name=ZynAddSubFX
-Comment=Real-time software synthesizer
-Icon=zynaddsubfx
-Type=Application
-Exec=%{_bindir}/%{name}
-Terminal=false
-Categories=${BASE}${CATS}
-Encoding=UTF-8
-EOF
+# .desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora              \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
-  --add-category Application                      \
-  %{name}.desktop
+desktop-file-install --vendor fedora \
+   --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -128,18 +101,20 @@ install -m 644 zynaddsubfx-64.png $RPM_B
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-# update icon themes
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
+%doc AUTHORS.txt ChangeLog COPYING FAQ.txt HISTORY.txt README.txt bugs.txt
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
@@ -150,6 +125,19 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Thu Aug 06 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 2.4.0-1
+- Update to 2.4.0
+- Update scriptlets according to new guidelines
+- Update the .desktop file
+- Use Fedora specific flags during compilation
+- License is GPLv2+ (just run the program on the command line :))
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Aug 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2.1-19
 - Fix license tag.
 


--- zyn_lash-0.5.0pre0.diff DELETED ---


--- zynaddsubfx-unzombify.patch DELETED ---



From jolsa at fedoraproject.org  Thu Aug  6 08:35:25 2009
From: jolsa at fedoraproject.org (Jiri Olsa)
Date: Thu,  6 Aug 2009 08:35:25 +0000 (UTC)
Subject: rpms/latrace/devel import.log, NONE, 1.1 latrace.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090806083525.A635C11C00E4@cvs1.fedora.phx.redhat.com>

Author: jolsa

Update of /cvs/extras/rpms/latrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9023/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log latrace.spec 
Log Message:
import



--- NEW FILE import.log ---
latrace-0_5_6-1_fc11:HEAD:latrace-0.5.6-1.fc11.src.rpm:1249547703


--- NEW FILE latrace.spec ---
Name:           latrace
Version:        0.5.6
Release:        1%{?dist}
Summary:        LD_AUDIT feature frontend for glibc 2.4+
Group:          Development/Debuggers
License:        GPLv3+
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
URL:            http://latrace.sourceforge.net/
Source:         http://downloads.sourceforge.net/latrace/%{name}-%{version}.tar.bz2
ExclusiveArch:  %{ix86} x86_64 arm
BuildRequires:  autoconf bison asciidoc xmlto

%description
allows you to trace library calls and get their statistics in a
manner similar to the strace utility (syscall tracing)

%prep
%setup -q

%build
autoconf
%configure
make V=1

%install
rm -rf %{buildroot}
make install ROOTDIR=%{buildroot} V=1

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README ReleaseNotes TODO COPYING
%config(noreplace)  %{_sysconfdir}/*
%{_libdir}/libltaudit.so.%{version}
%{_bindir}/latrace
%{_mandir}/man1/*

%changelog
* Sun Jul 05 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.6-1
- updates based on the Fedora review comments

* Thu Jul 02 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.5-2
- minor updates based on the Fedora review comments

* Sat Jun 13 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.5-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/latrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Jul 2009 05:34:39 -0000	1.1
+++ .cvsignore	6 Aug 2009 08:35:25 -0000	1.2
@@ -0,0 +1 @@
+latrace-0.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/latrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Jul 2009 05:34:39 -0000	1.1
+++ sources	6 Aug 2009 08:35:25 -0000	1.2
@@ -0,0 +1 @@
+c47ba7e6461b3101e0c170c37320b5c7  latrace-0.5.6.tar.bz2



From caillon at fedoraproject.org  Thu Aug  6 08:37:36 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu,  6 Aug 2009 08:37:36 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec,1.142,1.143
Message-ID: <20090806083736.2A8F511C00E4@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9503

Modified Files:
	thunderbird.spec 
Log Message:
sync buildrequires/requires to be more in line with XR/FF


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- thunderbird.spec	3 Aug 2009 12:04:06 -0000	1.142
+++ thunderbird.spec	6 Aug 2009 08:37:35 -0000	1.143
@@ -1,8 +1,9 @@
-%define desktop_file_utils_version 0.9
-%define nspr_version 4.6
-%define nss_version 3.12.3
-%define cairo_version 1.0
-%define dbus_glib_version 0.6
+%define nspr_version 4.8
+%define nss_version 3.12.3.99
+%define cairo_version 1.6.0
+%define freetype_version 2.1.9
+%define sqlite_version 3.6.14
+
 %define version_internal 3.0b3
 %define build_langpacks 1
 
@@ -50,29 +51,34 @@ Patch4:         thunderbird-pango.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       nspr >= %{nspr_version}
-Requires:       nss >= %{nss_version}
-Requires:       hunspell
-BuildRequires:  libcurl-devel
-BuildRequires:  cairo-devel >= %{cairo_version}
-BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires:  libpng-devel, libjpeg-devel, gtk2-devel
-BuildRequires:  zlib-devel, gzip, zip, unzip
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
+BuildRequires:  cairo-devel >= %{cairo_version}
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  zip
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  libIDL-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  pango-devel >= 1.22
-BuildRequires:  freetype-devel >= 2.1.9
-BuildRequires:  libXt-devel
-BuildRequires:  libXrender-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  autoconf213
-BuildRequires:  GConf2-devel
+BuildRequires:  gtk2-devel
 BuildRequires:  gnome-vfs2-devel
+BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
+BuildRequires:  krb5-devel
+BuildRequires:  pango-devel
+BuildRequires:  freetype-devel >= %{freetype_version}
+BuildRequires:  libXt-devel
+BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
-Requires:       desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires:  sqlite-devel >= %{sqlite_version}
+BuildRequires:  startup-notification-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libnotify-devel
+
+Requires:       mozilla-filesystem
+Requires:       nspr >= %{nspr_version}
+Requires:       nss >= %{nss_version}
+Requires:       sqlite >= %{sqlite_version}
 
 %define mozappdir %{_libdir}/thunderbird-%{version_internal}
 



From jolsa at fedoraproject.org  Thu Aug  6 08:39:56 2009
From: jolsa at fedoraproject.org (Jiri Olsa)
Date: Thu,  6 Aug 2009 08:39:56 +0000 (UTC)
Subject: rpms/latrace/F-11 import.log, NONE, 1.1 latrace.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090806083956.2CD1F11C00E4@cvs1.fedora.phx.redhat.com>

Author: jolsa

Update of /cvs/extras/rpms/latrace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log latrace.spec 
Log Message:
import



--- NEW FILE import.log ---
latrace-0_5_6-1_fc11:F-11:latrace-0.5.6-1.fc11.src.rpm:1249547963


--- NEW FILE latrace.spec ---
Name:           latrace
Version:        0.5.6
Release:        1%{?dist}
Summary:        LD_AUDIT feature frontend for glibc 2.4+
Group:          Development/Debuggers
License:        GPLv3+
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
URL:            http://latrace.sourceforge.net/
Source:         http://downloads.sourceforge.net/latrace/%{name}-%{version}.tar.bz2
ExclusiveArch:  %{ix86} x86_64 arm
BuildRequires:  autoconf bison asciidoc xmlto

%description
allows you to trace library calls and get their statistics in a
manner similar to the strace utility (syscall tracing)

%prep
%setup -q

%build
autoconf
%configure
make V=1

%install
rm -rf %{buildroot}
make install ROOTDIR=%{buildroot} V=1

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README ReleaseNotes TODO COPYING
%config(noreplace)  %{_sysconfdir}/*
%{_libdir}/libltaudit.so.%{version}
%{_bindir}/latrace
%{_mandir}/man1/*

%changelog
* Sun Jul 05 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.6-1
- updates based on the Fedora review comments

* Thu Jul 02 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.5-2
- minor updates based on the Fedora review comments

* Sat Jun 13 2009 Jiri Olsa <olsajiri at gmail.com> 0.5.5-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/latrace/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Jul 2009 05:34:39 -0000	1.1
+++ .cvsignore	6 Aug 2009 08:39:55 -0000	1.2
@@ -0,0 +1 @@
+latrace-0.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/latrace/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Jul 2009 05:34:39 -0000	1.1
+++ sources	6 Aug 2009 08:39:55 -0000	1.2
@@ -0,0 +1 @@
+c47ba7e6461b3101e0c170c37320b5c7  latrace-0.5.6.tar.bz2



From jens at fedoraproject.org  Thu Aug  6 08:39:56 2009
From: jens at fedoraproject.org (Jens Kuehnel)
Date: Thu,  6 Aug 2009 08:39:56 +0000 (UTC)
Subject: rpms/miredo/EL-5 miredo.spec,1.2,1.3
Message-ID: <20090806083956.33E4311C02C6@cvs1.fedora.phx.redhat.com>

Author: jens

Update of /cvs/pkgs/rpms/miredo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9754/EL-5

Modified Files:
	miredo.spec 
Log Message:
Update to 1.1.7-4
Fixes the obsolete bug 515506




Index: miredo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/EL-5/miredo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- miredo.spec	25 Jul 2009 12:37:43 -0000	1.2
+++ miredo.spec	6 Aug 2009 08:39:55 -0000	1.3
@@ -1,7 +1,14 @@
 # vim: expandtab
+
+%if 0%{?rhel}
+%define withjudy 0
+%else
+%define withjudy 1
+%endif
+
 Name:           miredo
 Version:        1.1.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Tunneling of IPv6 over UDP through NATs
 
 Group:          Applications/Internet
@@ -13,7 +20,12 @@ Source2:        miredo-server.init
 Patch0:         miredo-config-not-exec
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libcap-devel Judy-devel
+BuildRequires:    libcap-devel 
+%if %{withjudy}
+BuildRequires:     Judy-devel
+%endif
+
+
 Requires(pre):    shadow-utils
 Requires(post):   chkconfig, /sbin/ldconfig
 # This is for /sbin/service
@@ -68,7 +80,7 @@ Summary:        Tunneling client for IPv
 Group:          Applications/Internet
 Requires:       %{name}-libs = %{version}-%{release}
 Provides:       %{name} = %{version}-%{release}
-Obsoletes:      %{name} = 1.1.6-2
+Obsoletes:      %{name} <= 1.1.6
 
 
 %description client
@@ -85,7 +97,10 @@ part of miredo. Most people only need th
                --disable-static \
                --disable-rpath \
                --enable-miredo-user \
-               --without-Judy
+%if %{withjudy} == 0
+               --without-Judy \
+%endif
+
 
 # rpath does not really work
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -159,7 +174,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/miredo
 %{_libdir}/libteredo.so.*
 %{_libdir}/libtun6.so.*
-%{_libdir}/miredo/miredo-privproc
+%{_libdir}/miredo/
 
 %files devel
 %defattr(-,root,root,-)
@@ -190,6 +205,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
+- Fix Obsoletes for smooth upgrade
+
+* Tue Jul 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-3
+- without July as optional, hopefully the last EL fix
+
 * Sun Jul 19 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-2
 - rename miredo to miredo-libs
 - fixes EL



From jens at fedoraproject.org  Thu Aug  6 08:39:56 2009
From: jens at fedoraproject.org (Jens Kuehnel)
Date: Thu,  6 Aug 2009 08:39:56 +0000 (UTC)
Subject: rpms/miredo/F-10 miredo.spec,1.2,1.3
Message-ID: <20090806083956.5B6E511C00E4@cvs1.fedora.phx.redhat.com>

Author: jens

Update of /cvs/pkgs/rpms/miredo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9754/F-10

Modified Files:
	miredo.spec 
Log Message:
Update to 1.1.7-4
Fixes the obsolete bug 515506




Index: miredo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/F-10/miredo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- miredo.spec	25 Jul 2009 13:44:59 -0000	1.2
+++ miredo.spec	6 Aug 2009 08:39:56 -0000	1.3
@@ -1,7 +1,14 @@
 # vim: expandtab
+
+%if 0%{?rhel}
+%define withjudy 0
+%else
+%define withjudy 1
+%endif
+
 Name:           miredo
 Version:        1.1.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Tunneling of IPv6 over UDP through NATs
 
 Group:          Applications/Internet
@@ -13,7 +20,12 @@ Source2:        miredo-server.init
 Patch0:         miredo-config-not-exec
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libcap-devel Judy-devel
+BuildRequires:    libcap-devel 
+%if %{withjudy}
+BuildRequires:     Judy-devel
+%endif
+
+
 Requires(pre):    shadow-utils
 Requires(post):   chkconfig, /sbin/ldconfig
 # This is for /sbin/service
@@ -68,7 +80,7 @@ Summary:        Tunneling client for IPv
 Group:          Applications/Internet
 Requires:       %{name}-libs = %{version}-%{release}
 Provides:       %{name} = %{version}-%{release}
-Obsoletes:      %{name} = 1.1.6-2
+Obsoletes:      %{name} <= 1.1.6
 
 
 %description client
@@ -85,7 +97,10 @@ part of miredo. Most people only need th
                --disable-static \
                --disable-rpath \
                --enable-miredo-user \
-               --without-Judy
+%if %{withjudy} == 0
+               --without-Judy \
+%endif
+
 
 # rpath does not really work
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -159,7 +174,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/miredo
 %{_libdir}/libteredo.so.*
 %{_libdir}/libtun6.so.*
-%{_libdir}/miredo/miredo-privproc
+%{_libdir}/miredo/
 
 %files devel
 %defattr(-,root,root,-)
@@ -190,6 +205,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
+- Fix Obsoletes for smooth upgrade
+
+* Tue Jul 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-3
+- without July as optional, hopefully the last EL fix
+
 * Sun Jul 19 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-2
 - rename miredo to miredo-libs
 - fixes EL



From jens at fedoraproject.org  Thu Aug  6 08:39:56 2009
From: jens at fedoraproject.org (Jens Kuehnel)
Date: Thu,  6 Aug 2009 08:39:56 +0000 (UTC)
Subject: rpms/miredo/F-11 miredo.spec,1.2,1.3
Message-ID: <20090806083956.8188D11C02C6@cvs1.fedora.phx.redhat.com>

Author: jens

Update of /cvs/pkgs/rpms/miredo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9754/F-11

Modified Files:
	miredo.spec 
Log Message:
Update to 1.1.7-4
Fixes the obsolete bug 515506




Index: miredo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/F-11/miredo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- miredo.spec	25 Jul 2009 13:30:10 -0000	1.2
+++ miredo.spec	6 Aug 2009 08:39:56 -0000	1.3
@@ -1,7 +1,14 @@
 # vim: expandtab
+
+%if 0%{?rhel}
+%define withjudy 0
+%else
+%define withjudy 1
+%endif
+
 Name:           miredo
 Version:        1.1.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Tunneling of IPv6 over UDP through NATs
 
 Group:          Applications/Internet
@@ -13,7 +20,12 @@ Source2:        miredo-server.init
 Patch0:         miredo-config-not-exec
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libcap-devel Judy-devel
+BuildRequires:    libcap-devel 
+%if %{withjudy}
+BuildRequires:     Judy-devel
+%endif
+
+
 Requires(pre):    shadow-utils
 Requires(post):   chkconfig, /sbin/ldconfig
 # This is for /sbin/service
@@ -68,7 +80,7 @@ Summary:        Tunneling client for IPv
 Group:          Applications/Internet
 Requires:       %{name}-libs = %{version}-%{release}
 Provides:       %{name} = %{version}-%{release}
-Obsoletes:      %{name} = 1.1.6-2
+Obsoletes:      %{name} <= 1.1.6
 
 
 %description client
@@ -85,7 +97,10 @@ part of miredo. Most people only need th
                --disable-static \
                --disable-rpath \
                --enable-miredo-user \
-               --without-Judy
+%if %{withjudy} == 0
+               --without-Judy \
+%endif
+
 
 # rpath does not really work
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -159,7 +174,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/miredo
 %{_libdir}/libteredo.so.*
 %{_libdir}/libtun6.so.*
-%{_libdir}/miredo/miredo-privproc
+%{_libdir}/miredo/
 
 %files devel
 %defattr(-,root,root,-)
@@ -190,6 +205,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
+- Fix Obsoletes for smooth upgrade
+
+* Tue Jul 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-3
+- without July as optional, hopefully the last EL fix
+
 * Sun Jul 19 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-2
 - rename miredo to miredo-libs
 - fixes EL



From caillon at fedoraproject.org  Thu Aug  6 08:43:56 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Thu,  6 Aug 2009 08:43:56 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird-redhat-default-prefs.js,1.4,1.5
Message-ID: <20090806084356.8717C11C00E4@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11013

Modified Files:
	thunderbird-redhat-default-prefs.js 
Log Message:
Enable NM by default



Index: thunderbird-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/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	6 Aug 2009 08:43:56 -0000	1.5
@@ -5,6 +5,7 @@ pref("general.useragent.vendor", "Fedora
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
 
 # Make hyperlinks work
 pref("network.protocol-handler.app.http", "COMMAND");



From pbrobinson at fedoraproject.org  Thu Aug  6 09:01:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  6 Aug 2009 09:01:15 +0000 (UTC)
Subject: rpms/clutter-imcontext/devel .cvsignore, 1.2,
	1.3 clutter-imcontext.spec, 1.4, 1.5 sources, 1.2,
	1.3 clutter-imcontext-clutter1.patch, 1.2, NONE
Message-ID: <20090806090115.2601011C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-imcontext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14786

Modified Files:
	.cvsignore clutter-imcontext.spec sources 
Removed Files:
	clutter-imcontext-clutter1.patch 
Log Message:
- New 0.1.4 upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-imcontext/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jul 2009 20:15:13 -0000	1.2
+++ .cvsignore	6 Aug 2009 09:01:14 -0000	1.3
@@ -1 +1 @@
-clutter-imcontext-0.1.2.tar.bz2
+clutter-imcontext-0.1.4.tar.bz2


Index: clutter-imcontext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-imcontext/devel/clutter-imcontext.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- clutter-imcontext.spec	4 Aug 2009 16:37:36 -0000	1.4
+++ clutter-imcontext.spec	6 Aug 2009 09:01:14 -0000	1.5
@@ -1,16 +1,12 @@
 Name:           clutter-imcontext
-Version:        0.1.2
-Release:        6%{?dist}
+Version:        0.1.4
+Release:        1%{?dist}
 Summary:        IMContext Framework Library for Clutter
 
 Group:          System Environment/Libraries
-# Upstream license clarification for clutter-imtext.{c,h} are LGPLv2. 
-# Its updated upstream and will be in the next release
-# http://lists.moblin.org/pipermail/dev/2009-July/005522.html
 License:        LGPLv2
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:		clutter-imcontext-clutter1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel
@@ -39,7 +35,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .clutter1
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 sed -i '/configure/d' autogen.sh
@@ -78,6 +73,11 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Aug  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
+- New 0.1.4 upstream release.
+- license clarfied so remove spec file note
+- remove upstreamed clutter patches
+
 * Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-6
 - Add some more clutter 1.0 bits
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-imcontext/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Jul 2009 20:15:13 -0000	1.2
+++ sources	6 Aug 2009 09:01:14 -0000	1.3
@@ -1 +1 @@
-6b6fb6690c74f496470166640e8cd0f2  clutter-imcontext-0.1.2.tar.bz2
+9f71a3cc9e73ea13888bfdb9bc4e8cf7  clutter-imcontext-0.1.4.tar.bz2


--- clutter-imcontext-clutter1.patch DELETED ---



From airlied at fedoraproject.org  Thu Aug  6 09:15:09 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu,  6 Aug 2009 09:15:09 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.24, 1.25 libdrm.spec, 1.82,
	1.83 sources, 1.24, 1.25
Message-ID: <20090806091509.8DE6711C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17273

Modified Files:
	.cvsignore libdrm.spec sources 
Log Message:
* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.7
- rebase to new libdrm snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Jul 2009 15:23:26 -0000	1.24
+++ .cvsignore	6 Aug 2009 09:15:09 -0000	1.25
@@ -1 +1 @@
-libdrm-20090728.tar.bz2
+libdrm-20090806.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- libdrm.spec	29 Jul 2009 19:48:21 -0000	1.82
+++ libdrm.spec	6 Aug 2009 09:15:09 -0000	1.83
@@ -1,9 +1,9 @@
-%define gitdate 20090728
+%define gitdate 20090806
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.12
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.7
+- rebase to new libdrm snapshot
+
 * Wed Jul 29 2009 Kristian H?gsberg <krh at redhat.com> - 2.4.12-0.6
 - Add libdrm support for KMS pageflip ioctl.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Jul 2009 15:23:26 -0000	1.24
+++ sources	6 Aug 2009 09:15:09 -0000	1.25
@@ -1 +1 @@
-864db607b6e034c67eca104bbf786cc0  libdrm-20090728.tar.bz2
+bb6ed358a4ee3e2520d582af19ec713c  libdrm-20090806.tar.bz2



From xhorak at fedoraproject.org  Thu Aug  6 09:20:13 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 09:20:13 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec,1.143,1.144
Message-ID: <20090806092013.B9EC011C0425@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18331

Modified Files:
	thunderbird.spec 
Log Message:
Removed unused build requirements


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- thunderbird.spec	6 Aug 2009 08:37:35 -0000	1.143
+++ thunderbird.spec	6 Aug 2009 09:20:13 -0000	1.144
@@ -12,7 +12,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.6.b3%{?dist}
+Release:        3.7.b3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -73,7 +73,6 @@ BuildRequires:  hunspell-devel
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  libnotify-devel
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
@@ -300,6 +299,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Aug  6 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.7.beta3
+- Removed unused build requirements
+
 * Mon Aug  3 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.6.beta3
 - Build with system hunspell
 



From hadess at fedoraproject.org  Thu Aug  6 09:34:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  6 Aug 2009 09:34:41 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.84,1.85
Message-ID: <20090806093441.0654411C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21689

Modified Files:
	gnome-bluetooth.spec 
Log Message:
* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-2
- Remove requirement on the main package from -libs, and move
  the icons from the main package to the -libs sub-package (#515845)



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- gnome-bluetooth.spec	4 Aug 2009 18:37:16 -0000	1.84
+++ gnome-bluetooth.spec	6 Aug 2009 09:34:40 -0000	1.85
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -41,7 +41,6 @@ monitor and use Bluetooth devices.
 Summary:	GTK+ Bluetooth device selection widgets
 Group:		System Environment/Libraries
 License:	LGPLv2+
-Requires:	%{name} = %{version}-%{release}
 
 %description libs
 This package contains libraries needed for applications that
@@ -114,10 +113,6 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule					\
 	%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
 	>& /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -155,9 +150,19 @@ if [ $1 -eq 0 ] ; then
 	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%postun libs -p /sbin/ldconfig
+%posttrans libs
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 
 %files -f gnome-bluetooth2.lang
 %defattr(-,root,root,-)
@@ -168,14 +173,14 @@ fi
 %{_libdir}/gnome-bluetooth/
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-bluetooth/
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/status/*
 %{_mandir}/man1/*
 
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libgnome-bluetooth.so.*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/status/*
 
 %files libs-devel
 %defattr(-,root,root,-)
@@ -185,6 +190,10 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-2
+- Remove requirement on the main package from -libs, and move
+  the icons from the main package to the -libs sub-package (#515845)
+
 * Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-1
 - Update to 2.27.9
 



From xhorak at fedoraproject.org  Thu Aug  6 09:39:05 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 09:39:05 +0000 (UTC)
Subject: rpms/thunderbird/F-11 thunderbird-mozconfig, 1.14,
	1.15 thunderbird.spec, 1.137, 1.138
Message-ID: <20090806093905.438AC11C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22467

Modified Files:
	thunderbird-mozconfig thunderbird.spec 
Log Message:
Fixed buildrequires


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-mozconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- thunderbird-mozconfig	3 Mar 2009 15:39:19 -0000	1.14
+++ thunderbird-mozconfig	6 Aug 2009 09:39:04 -0000	1.15
@@ -26,6 +26,9 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-crashreporter
+ac_add_options --enable-libxul
+ac_add_options --disable-static
+ac_add_options --enable-system-hunspell
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- thunderbird.spec	21 Jul 2009 10:24:05 -0000	1.137
+++ thunderbird.spec	6 Aug 2009 09:39:05 -0000	1.138
@@ -35,6 +35,7 @@ Source100:      find-external-requires
 
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
+Patch3:         xulrunner-gtk-include.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -86,7 +87,8 @@ Mozilla Thunderbird is a standalone mail
 #cd mozilla
 
 %patch1 -p0 -b .jemalloc
-%patch2 -p1 -b .shared-error
+#%patch2 -p1 -b .shared-error
+%patch2 -p1 -b .gtk
 
 %if %{official_branding}
 # Required by Mozilla Corporation



From xhorak at fedoraproject.org  Thu Aug  6 09:46:46 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 09:46:46 +0000 (UTC)
Subject: rpms/thunderbird/F-11 thunderbird-mozconfig, 1.15,
	1.16 thunderbird.spec, 1.138, 1.139
Message-ID: <20090806094646.5FF7511C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24019

Modified Files:
	thunderbird-mozconfig thunderbird.spec 
Log Message:
Fix wrong commit


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-mozconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- thunderbird-mozconfig	6 Aug 2009 09:39:04 -0000	1.15
+++ thunderbird-mozconfig	6 Aug 2009 09:46:46 -0000	1.16
@@ -26,9 +26,6 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-crashreporter
-ac_add_options --enable-libxul
-ac_add_options --disable-static
-ac_add_options --enable-system-hunspell
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- thunderbird.spec	6 Aug 2009 09:39:05 -0000	1.138
+++ thunderbird.spec	6 Aug 2009 09:46:46 -0000	1.139
@@ -35,7 +35,6 @@ Source100:      find-external-requires
 
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
-Patch3:         xulrunner-gtk-include.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -87,8 +86,7 @@ Mozilla Thunderbird is a standalone mail
 #cd mozilla
 
 %patch1 -p0 -b .jemalloc
-#%patch2 -p1 -b .shared-error
-%patch2 -p1 -b .gtk
+%patch2 -p1 -b .shared-error
 
 %if %{official_branding}
 # Required by Mozilla Corporation



From xhorak at fedoraproject.org  Thu Aug  6 09:48:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 09:48:12 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec,1.144,1.145
Message-ID: <20090806094812.6235D11C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24327

Modified Files:
	thunderbird.spec 
Log Message:
Add missing buildrequire


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- thunderbird.spec	6 Aug 2009 09:20:13 -0000	1.144
+++ thunderbird.spec	6 Aug 2009 09:48:12 -0000	1.145
@@ -73,6 +73,7 @@ BuildRequires:  hunspell-devel
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  autoconf213
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}



From dnovotny at fedoraproject.org  Thu Aug  6 09:55:02 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu,  6 Aug 2009 09:55:02 +0000 (UTC)
Subject: rpms/file/devel file.spec,1.104,1.105
Message-ID: <20090806095502.9FCD411C00E4@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25775

Modified Files:
	file.spec 
Log Message:

rebuilt for multilib



Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- file.spec	24 Jul 2009 22:44:29 -0000	1.104
+++ file.spec	6 Aug 2009 09:55:02 -0000	1.105
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 06 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-8
+- rebuild for #515767 -  multilib: file /usr/share/misc/magic.mgc conflicts
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.03-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stransky at fedoraproject.org  Thu Aug  6 10:32:19 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 10:32:19 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.spec,1.145,1.146
Message-ID: <20090806103219.1B8BB11C00E4@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3176

Modified Files:
	thunderbird.spec 
Log Message:
added desktop-file-utils


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- thunderbird.spec	6 Aug 2009 09:48:12 -0000	1.145
+++ thunderbird.spec	6 Aug 2009 10:32:18 -0000	1.146
@@ -74,6 +74,7 @@ BuildRequires:  sqlite-devel >= %{sqlite
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf213
+BuildRequires:  desktop-file-utils
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}



From harald at fedoraproject.org  Thu Aug  6 10:36:18 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  6 Aug 2009 10:36:18 +0000 (UTC)
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.33,1.34
Message-ID: <20090806103618.D47E111C00E4@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/pcmciautils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4185

Modified Files:
	pcmciautils.spec 
Log Message:
* Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 015-4
- add i686 buildarch



Index: pcmciautils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- pcmciautils.spec	25 Jul 2009 23:22:26 -0000	1.33
+++ pcmciautils.spec	6 Aug 2009 10:36:18 -0000	1.34
@@ -2,9 +2,9 @@ Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
 Version: 015
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
-ExclusiveArch: i386 i586 x86_64 ia64 ppc ppc64 %{?arm}
+ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc ppc64 %{?arm}
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
 Obsoletes: pcmcia-cs < 3.2.9
@@ -54,6 +54,9 @@ mv $RPM_BUILD_ROOT/sbin/pcmcia-socket-st
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 015-4
+- add i686 buildarch
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 015-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Thu Aug  6 10:46:27 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Thu,  6 Aug 2009 10:46:27 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.13,
	1.14 perl-Log-Log4perl.spec, 1.22, 1.23 sources, 1.13, 1.14
Message-ID: <20090806104627.88B8611C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6213

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
* Thu Aug 06 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.24-1
- Fix mass rebuild breakdown: Upgrade to upstream 1.24.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	20 Jan 2009 08:20:07 -0000	1.13
+++ .cvsignore	6 Aug 2009 10:46:27 -0000	1.14
@@ -1 +1 @@
-Log-Log4perl-1.20.tar.gz
+Log-Log4perl-1.24.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Log-Log4perl.spec	26 Jul 2009 09:02:17 -0000	1.22
+++ perl-Log-Log4perl.spec	6 Aug 2009 10:46:27 -0000	1.23
@@ -1,25 +1,26 @@
 Name:           perl-Log-Log4perl
-Version:        1.20
-Release:        4%{?dist}
+Version:        1.24
+Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic
-# CPAN URL:     http://search.cpan.org/dist/Log-Log4perl/
-URL:            http://log4perl.sourceforge.net/
-Source0:        http://log4perl.sourceforge.net/releases/Log-Log4perl-%{version}.tar.gz
+URL:            http://search.cpan.org/dist/Log-Log4perl/
+Source0:        http://www.cpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More) >= 0.45
+
+# Optional tests
 BuildRequires:  perl(Log::Dispatch)
-BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
+BuildRequires:  perl(Log::Dispatch::FileRotate)
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
-# perl(RRDs) is provided by rrdtool-perl (a rrdtool subpackage)
 BuildRequires:  perl(RRDs)
+BuildRequires:  perl(DBI)
+
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -27,7 +28,6 @@ Log::Log4perl lets you remote-control an
 behaviour of your system from the outside. It implements the widely
 popular (Java-based) Log4j logging package in pure Perl.
 
-
 %prep
 %setup -q -n Log-Log4perl-%{version}
 find lib -name "*.pm" -exec chmod -c a-x {} ';'
@@ -42,8 +42,8 @@ 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/*
 
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test L4P_ALL_TESTS=1
@@ -56,11 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Log/
-%{_mandir}/man3/*.3pm*
-
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
+* Thu Aug 06 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.24-1
+- Fix mass rebuild breakdown: Upgrade to upstream 1.24.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	20 Jan 2009 08:20:07 -0000	1.13
+++ sources	6 Aug 2009 10:46:27 -0000	1.14
@@ -1 +1 @@
-f60a1f8633fb7544fdc4d1e842564a8b  Log-Log4perl-1.20.tar.gz
+102dd4fc918ffb730c7cde49aeaecb3a  Log-Log4perl-1.24.tar.gz



From atkac at fedoraproject.org  Thu Aug  6 12:03:20 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  6 Aug 2009 12:03:20 +0000 (UTC)
Subject: rpms/adns/devel adns14-rh514838.patch,NONE,1.1 adns.spec,1.18,1.19
Message-ID: <20090806120320.F236711C00E4@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/adns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22634

Modified Files:
	adns.spec 
Added Files:
	adns14-rh514838.patch 
Log Message:
- return empty string instead of NULL from adns_strerror (#514838)


adns14-rh514838.patch:
 general.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE adns14-rh514838.patch ---
diff -up adns-1.4/src/general.c.rh514838 adns-1.4/src/general.c
--- adns-1.4/src/general.c.rh514838	2006-04-08 16:36:57.000000000 +0200
+++ adns-1.4/src/general.c	2009-08-06 13:55:06.752562767 +0200
@@ -267,6 +267,8 @@ static const struct sinfo {
   SINFO( nodata,              "No such data"                                 )
 };
 
+static const char *unknown_error_str = "unknown error code";
+
 static int si_compar(const void *key, const void *elem) {
   const adns_status *st= key;
   const struct sinfo *si= elem;
@@ -283,7 +285,7 @@ const char *adns_strerror(adns_status st
   const struct sinfo *si;
 
   si= findsinfo(st);
-  return si->string;
+  return (si == NULL) ? unknown_error_str : si->string;
 }
 
 const char *adns_errabbrev(adns_status st) {


Index: adns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/adns/devel/adns.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- adns.spec	24 Jul 2009 16:36:07 -0000	1.18
+++ adns.spec	6 Aug 2009 12:03:19 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		adns
 Version:	1.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
@@ -11,6 +11,8 @@ Source0:        ftp://ftp.chiark.greenen
 BuildRequires:	autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		adns14-rh514838.patch
+
 %description
 adns is a resolver library for C (and C++) programs. In contrast with
 the existing interfaces, gethostbyname et al and libresolv, it has the
@@ -69,6 +71,8 @@ programs for use from the command line a
 %prep
 %setup -q
 
+%patch0 -p1 -b .rh514838
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
@@ -111,6 +115,9 @@ rm -fr $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Aug 06 2009 Adam Tkac <atkac redhat com> 1.4-7
+- return empty string instead of NULL from adns_strerror (#514838)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atkac at fedoraproject.org  Thu Aug  6 12:16:15 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  6 Aug 2009 12:16:15 +0000 (UTC)
Subject: rpms/adns/devel adns.spec,1.19,1.20
Message-ID: <20090806121615.1742611C00E4@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/adns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24857

Modified Files:
	adns.spec 
Log Message:
- correct previous changelog entry and rebuild



Index: adns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/adns/devel/adns.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- adns.spec	6 Aug 2009 12:03:19 -0000	1.19
+++ adns.spec	6 Aug 2009 12:16:14 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		adns
 Version:	1.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
@@ -115,8 +115,11 @@ rm -fr $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Aug 06 2009 Adam Tkac <atkac redhat com> 1.4-8
+- rebuild
+
 * Thu Aug 06 2009 Adam Tkac <atkac redhat com> 1.4-7
-- return empty string instead of NULL from adns_strerror (#514838)
+- don't crash in adns_strerror if parameter is unknown error code (#514838)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From atkac at fedoraproject.org  Thu Aug  6 12:16:50 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  6 Aug 2009 12:16:50 +0000 (UTC)
Subject: rpms/adns/F-11 adns14-rh514838.patch,NONE,1.1 adns.spec,1.17,1.18
Message-ID: <20090806121650.D239411C00E4@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/adns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25086

Modified Files:
	adns.spec 
Added Files:
	adns14-rh514838.patch 
Log Message:
- don't crash in adns_strerror if parameter is unknown error code (#514838)


adns14-rh514838.patch:
 general.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE adns14-rh514838.patch ---
diff -up adns-1.4/src/general.c.rh514838 adns-1.4/src/general.c
--- adns-1.4/src/general.c.rh514838	2006-04-08 16:36:57.000000000 +0200
+++ adns-1.4/src/general.c	2009-08-06 13:55:06.752562767 +0200
@@ -267,6 +267,8 @@ static const struct sinfo {
   SINFO( nodata,              "No such data"                                 )
 };
 
+static const char *unknown_error_str = "unknown error code";
+
 static int si_compar(const void *key, const void *elem) {
   const adns_status *st= key;
   const struct sinfo *si= elem;
@@ -283,7 +285,7 @@ const char *adns_strerror(adns_status st
   const struct sinfo *si;
 
   si= findsinfo(st);
-  return si->string;
+  return (si == NULL) ? unknown_error_str : si->string;
 }
 
 const char *adns_errabbrev(adns_status st) {


Index: adns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/adns/F-11/adns.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- adns.spec	24 Feb 2009 00:10:39 -0000	1.17
+++ adns.spec	6 Aug 2009 12:16:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		adns
 Version:	1.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 Summary:	Advanced, easy to use, asynchronous-capable DNS client library
 
@@ -11,6 +11,8 @@ Source0:        ftp://ftp.chiark.greenen
 BuildRequires:	autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		adns14-rh514838.patch
+
 %description
 adns is a resolver library for C (and C++) programs. In contrast with
 the existing interfaces, gethostbyname et al and libresolv, it has the
@@ -69,6 +71,8 @@ programs for use from the command line a
 %prep
 %setup -q
 
+%patch0 -p1 -b .rh514838
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
@@ -111,6 +115,9 @@ rm -fr $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Aug 06 2009 Adam Tkac <atkac redhat com> 1.4-6
+- don't crash in adns_strerror if parameter is unknown error code (#514838)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From twaugh at fedoraproject.org  Thu Aug  6 13:01:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  6 Aug 2009 13:01:56 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.fdi,1.3,1.4 hplip.spec,1.213,1.214
Message-ID: <20090806130156.1E11511C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1409

Modified Files:
	hplip.fdi hplip.spec 
Log Message:
* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-2
- Removed access_control.grant_group line from HAL fdi file.



Index: hplip.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.fdi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hplip.fdi	4 Apr 2008 16:44:33 -0000	1.3
+++ hplip.fdi	6 Aug 2009 13:01:55 -0000	1.4
@@ -6,7 +6,6 @@
     <match key="info.subsystem" contains="usb_device">
       <match key="usb_device.vendor_id" int="0x03f0">
         <append key="info.capabilities" type="strlist">scanner</append>
-        <append key="access_control.grant_group" type="strlist">lp</append>
       </match>
     </match>
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- hplip.spec	5 Aug 2009 17:33:03 -0000	1.213
+++ hplip.spec	6 Aug 2009 13:01:55 -0000	1.214
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -310,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-2
+- Removed access_control.grant_group line from HAL fdi file.
+
 * Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
 - 3.9.8.
 



From twaugh at fedoraproject.org  Thu Aug  6 13:02:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  6 Aug 2009 13:02:19 +0000 (UTC)
Subject: rpms/hplip/devel hplip.fdi,1.3,1.4 hplip.spec,1.215,1.216
Message-ID: <20090806130219.E479D11C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1617

Modified Files:
	hplip.fdi hplip.spec 
Log Message:
* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-2
- Removed access_control.grant_group line from HAL fdi file.



Index: hplip.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.fdi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hplip.fdi	4 Apr 2008 16:44:33 -0000	1.3
+++ hplip.fdi	6 Aug 2009 13:02:19 -0000	1.4
@@ -6,7 +6,6 @@
     <match key="info.subsystem" contains="usb_device">
       <match key="usb_device.vendor_id" int="0x03f0">
         <append key="info.capabilities" type="strlist">scanner</append>
-        <append key="access_control.grant_group" type="strlist">lp</append>
       </match>
     </match>
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- hplip.spec	5 Aug 2009 17:26:01 -0000	1.215
+++ hplip.spec	6 Aug 2009 13:02:19 -0000	1.216
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -310,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-2
+- Removed access_control.grant_group line from HAL fdi file.
+
 * Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
 - 3.9.8.
 



From mschwendt at fedoraproject.org  Thu Aug  6 13:03:17 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  6 Aug 2009 13:03:17 +0000 (UTC)
Subject: rpms/bmpx/F-11 bmpx-compile.patch,1.1,1.2 bmpx.spec,1.20,1.21
Message-ID: <20090806130317.5EA3C11C00E4@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/bmpx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1931

Modified Files:
	bmpx-compile.patch bmpx.spec 
Log Message:
* Thu Aug  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.40.14-14.1
- Rebuild for ABI-incompatible cairomm on Fedora 11:
  BMP exits instead of playing any track (#511333)


bmpx-compile.patch:
 docs/images/Makefile.am |    2 +-
 src/ui-part-library.cc  |    2 +-
 src/uri.cc              |    1 +
 widgets/popup.cc        |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

Index: bmpx-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-11/bmpx-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bmpx-compile.patch	5 Mar 2009 08:45:59 -0000	1.1
+++ bmpx-compile.patch	6 Aug 2009 13:03:17 -0000	1.2
@@ -1,4 +1,4 @@
---- bmpx-0.40.14/src/uri.cc.orig	2008-04-06 01:49:24.000000000 +0200
+--- bmpx-0.40.14.orig/src/uri.cc	2008-04-06 01:49:24.000000000 +0200
 +++ bmpx-0.40.14/src/uri.cc	2009-02-23 19:23:56.000000000 +0100
 @@ -35,6 +35,7 @@
  //  BMPx is covered by.
@@ -8,3 +8,34 @@
  #include <string>
  #include <boost/algorithm/string.hpp>
  #include <glibmm.h>
+--- bmpx-0.40.14.orig/widgets/popup.cc	2009-03-10 16:01:16.000000000 +0000
++++ bmpx-0.40.14/widgets/popup.cc	2009-03-10 16:01:30.000000000 +0000
+@@ -308,7 +308,7 @@
+ 
+ 		if (m_location == ARROW_TOP)
+ 		{
+-			Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h };
++			Cairo::Matrix matrix(1, 0, 0, -1, 0, h);
+ 			cr->set_matrix (matrix);
+ 		}
+ 
+--- bmpx-0.40.14.orig/src/ui-part-library.cc	2009-03-10 16:31:30.000000000 +0000
++++ bmpx-0.40.14/src/ui-part-library.cc	2009-03-10 16:32:26.000000000 +0000
+@@ -509,8 +509,8 @@
+       if( node != NODE_BRANCH )
+       {
+         // Clone this node as one child row
+-        UID uid (Bmp::AlbumArtist ((*i_toplevel)[mStoreArtistCR.artist]).bmpx_album_artist_id);
+         Bmp::AlbumArtist aa ((*i_toplevel)[mStoreArtistCR.artist]);
++        UID uid (aa.bmpx_album_artist_id);
+ 
+         UidIterMapIter uid_i = mUidIterMap.find (uid);
+         if( uid_i != mUidIterMap.end() )
+--- bmpx-0.40.14.orig/docs/images/Makefile.am	2009-07-14 08:40:53.000000000 +0100
++++ bmpx-0.40.14/docs/images/Makefile.am	2009-07-14 09:57:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png favicon.ico
++image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
+ imagedir=$(prefix)/share/doc/@PACKAGE@/images
+ 
+ EXTRA_DIST=$(image_DATA)


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-11/bmpx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- bmpx.spec	5 Mar 2009 08:49:24 -0000	1.20
+++ bmpx.spec	6 Aug 2009 13:03:17 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	13%{?dist}
+Release:	14%{?dist}.1
 
 License:	GPLv2
 Group:		Applications/Multimedia
@@ -183,6 +183,13 @@ fi
 
 
 %changelog
+* Thu Aug  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.40.14-14.1
+- Rebuild for ABI-incompatible cairomm on Fedora 11:
+  BMP exits instead of playing any track (#511333)
+
+* Tue Jul 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.40.14-14
+- Resolves: rhbz#489552 fix to compile 
+
 * Thu Mar 5 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-13
 - needs even more
 - and i forgot to update the version-number



From mschwendt at fedoraproject.org  Thu Aug  6 13:05:20 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  6 Aug 2009 13:05:20 +0000 (UTC)
Subject: rpms/bmpx/F-10 bmpx-compile.patch,NONE,1.1 bmpx.spec,1.16,1.17
Message-ID: <20090806130520.D48DA11C00E4@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/bmpx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3112

Modified Files:
	bmpx.spec 
Added Files:
	bmpx-compile.patch 
Log Message:
sync with F-11 for needed rebuild (rhbz 511333)

bmpx-compile.patch:
 docs/images/Makefile.am |    2 +-
 src/ui-part-library.cc  |    2 +-
 src/uri.cc              |    1 +
 widgets/popup.cc        |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE bmpx-compile.patch ---
--- bmpx-0.40.14.orig/src/uri.cc	2008-04-06 01:49:24.000000000 +0200
+++ bmpx-0.40.14/src/uri.cc	2009-02-23 19:23:56.000000000 +0100
@@ -35,6 +35,7 @@
 //  BMPx is covered by.
 
 #include <glib.h>
+#include <stdio.h>
 #include <string>
 #include <boost/algorithm/string.hpp>
 #include <glibmm.h>
--- bmpx-0.40.14.orig/widgets/popup.cc	2009-03-10 16:01:16.000000000 +0000
+++ bmpx-0.40.14/widgets/popup.cc	2009-03-10 16:01:30.000000000 +0000
@@ -308,7 +308,7 @@
 
 		if (m_location == ARROW_TOP)
 		{
-			Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h };
+			Cairo::Matrix matrix(1, 0, 0, -1, 0, h);
 			cr->set_matrix (matrix);
 		}
 
--- bmpx-0.40.14.orig/src/ui-part-library.cc	2009-03-10 16:31:30.000000000 +0000
+++ bmpx-0.40.14/src/ui-part-library.cc	2009-03-10 16:32:26.000000000 +0000
@@ -509,8 +509,8 @@
       if( node != NODE_BRANCH )
       {
         // Clone this node as one child row
-        UID uid (Bmp::AlbumArtist ((*i_toplevel)[mStoreArtistCR.artist]).bmpx_album_artist_id);
         Bmp::AlbumArtist aa ((*i_toplevel)[mStoreArtistCR.artist]);
+        UID uid (aa.bmpx_album_artist_id);
 
         UidIterMapIter uid_i = mUidIterMap.find (uid);
         if( uid_i != mUidIterMap.end() )
--- bmpx-0.40.14.orig/docs/images/Makefile.am	2009-07-14 08:40:53.000000000 +0100
+++ bmpx-0.40.14/docs/images/Makefile.am	2009-07-14 09:57:46.000000000 +0100
@@ -1,4 +1,4 @@
-image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png favicon.ico
+image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
 imagedir=$(prefix)/share/doc/@PACKAGE@/images
 
 EXTRA_DIST=$(image_DATA)


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/F-10/bmpx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bmpx.spec	5 Mar 2009 08:29:08 -0000	1.16
+++ bmpx.spec	6 Aug 2009 13:05:20 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Beep Media Player eXperimental
 Name:		bmpx
 Version:	0.40.14
-Release:	9%{?dist}
+Release:	14%{?dist}.1
 
 License:	GPLv2
 Group:		Applications/Multimedia
@@ -9,6 +9,7 @@ URL:		http://bmpx.backtrace.info/
 Source:		http://files.beep-media-player.org/releases/0.40/%{name}-%{version}.tar.bz2
 Patch0:		bmpx-libsoup24.patch
 Patch1:		bmpx-hostnotfound.patch
+Patch2:		bmpx-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gcc-c++
@@ -80,14 +81,17 @@ Development files required for compiling
 %setup -q
 %patch0 -p1 -b .libsoup24
 %patch1 -p1 -b .hostnotfound
+%patch2 -p1 -b .compile
 
 %build
+autoreconf -i -f
 %configure \
   --disable-hal \
   --enable-mp4v2 \
   --disable-sid \
   --enable-modplug \
   --with-cdparanoia
+#  --without-cdparanoia
 #	--enable-sid \
 
 %{__make} %{?_smp_mflags}
@@ -179,12 +183,33 @@ fi
 
 
 %changelog
-* Tue Feb 24 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-9 
-- cleanup
+* Thu Aug  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.40.14-14.1
+- Rebuild for ABI-incompatible cairomm on Fedora 11:
+  BMP exits instead of playing any track (#511333)
 
-* Mon Feb 23 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-8 
+* Tue Jul 14 2009 Caol?n McNamara <caolanm at redhat.com> - 0.40.14-14
+- Resolves: rhbz#489552 fix to compile 
+
+* Thu Mar 5 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-13
+- needs even more
+- and i forgot to update the version-number
+
+* Tue Feb 24 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-12
+- fix compile error because of missing header-file
+- but needs more
+
+* Tue Feb 24 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-11
+- specfile merge
+
+* Mon Feb 23 2009 josef radinger <cheese at nosuchhost.net> - 0.40.14-10
 - reenable cdparanoia
 
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.40.14-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.40.14-8
+- rebuild for new boost
+
 * Sun Sep 14 2008 josef radinger <cheese at nosuchhost.net> - 0.40.14-7
 - cvs problems
 



From stransky at fedoraproject.org  Thu Aug  6 13:07:38 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 13:07:38 +0000 (UTC)
Subject: rpms/firefox/F-11 firefox.sh.in,1.33,1.34 firefox.spec,1.336,1.337
Message-ID: <20090806130738.A961E11C00E4@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3662

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
Fix for #437596 - Firefox needs to register proper name for session restore.


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.sh.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- firefox.sh.in	7 Jan 2009 15:49:05 -0000	1.33
+++ firefox.sh.in	6 Aug 2009 13:07:38 -0000	1.34
@@ -102,6 +102,11 @@ fi
 export MOZ_PLUGIN_PATH
 
 ##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="/usr/bin/firefox"
+
+##
 ## If plugins are wrapped, check them
 ##
 if [ -x "/usr/bin/mozilla-plugin-config" ]


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -p -r1.336 -r1.337
--- firefox.spec	3 Aug 2009 22:00:57 -0000	1.336
+++ firefox.spec	6 Aug 2009 13:07:38 -0000	1.337
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -340,6 +340,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-3
+- Fix for #437596 - Firefox needs to register proper name
+  for session restore.
+
 * Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-2
 - Updated to 3.5.2.
 



From ovasik at fedoraproject.org  Thu Aug  6 13:11:36 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  6 Aug 2009 13:11:36 +0000 (UTC)
Subject: rpms/tar/devel tar.spec,1.85,1.86
Message-ID: <20090806131136.DF83011C00E4@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4729

Modified Files:
	tar.spec 
Log Message:
Do process install-info only when info file exists(#515923)


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- tar.spec	27 Jul 2009 05:31:57 -0000	1.85
+++ tar.spec	6 Aug 2009 13:11:36 -0000	1.86
@@ -2,7 +2,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.22
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -73,11 +73,15 @@ make check
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/tar.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/tar.info.gz ]; then
+   /sbin/install-info %{_infodir}/tar.info.gz %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/tar.info.gz %{_infodir}/dir || :
+   if [ -f %{_infodir}/tar.info.gz ]; then
+      /sbin/install-info --delete %{_infodir}/tar.info.gz %{_infodir}/dir || :
+   fi
 fi
 
 %files -f %{name}.lang
@@ -96,6 +100,9 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-7
+- do process install-info only without --excludedocs(#515923)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:1.22-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jakub at fedoraproject.org  Thu Aug  6 13:17:59 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  6 Aug 2009 13:17:59 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.19.51.0.14-unique-is-global.patch,
	NONE, 1.1 binutils.spec, 1.173, 1.174
Message-ID: <20090806131759.DDDC911C00E4@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6187

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.19.51.0.14-unique-is-global.patch 
Log Message:
2.19.51.0.14-31.fc12

binutils-2.19.51.0.14-unique-is-global.patch:
 elf.c         |    2 +-
 elf32-mips.c  |    2 +-
 elfn32-mips.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE binutils-2.19.51.0.14-unique-is-global.patch ---
2009-08-06  Jakub Jelinek  <jakub at redhat.com>
	    Alan Modra  <amodra at bigpond.net.au>

	PR binutils/10492
	* elf.c (sym_is_global): Return true even for BSF_GNU_UNIQUE
	symbols.
	* elf32-mips.c (mips_elf_sym_is_global): Likewise.
	* elfn32-mips.c (mips_elf_sym_is_global): Likewise.

--- bfd/elf.c.jj	2009-08-06 14:20:38.000000000 +0200
+++ bfd/elf.c	2009-08-06 14:41:06.000000000 +0200
@@ -3084,7 +3084,7 @@ sym_is_global (bfd *abfd, asymbol *sym)
   if (bed->elf_backend_sym_is_global)
     return (*bed->elf_backend_sym_is_global) (abfd, sym);
 
-  return ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
+  return ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0
 	  || bfd_is_und_section (bfd_get_section (sym))
 	  || bfd_is_com_section (bfd_get_section (sym)));
 }
--- bfd/elf32-mips.c.jj	2009-08-06 14:17:48.000000000 +0200
+++ bfd/elf32-mips.c	2009-08-06 14:41:52.000000000 +0200
@@ -1450,7 +1450,7 @@ mips_elf_sym_is_global (bfd *abfd ATTRIB
   if (SGI_COMPAT (abfd))
     return (sym->flags & BSF_SECTION_SYM) == 0;
   else
-    return ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
+    return ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0
 	    || bfd_is_und_section (bfd_get_section (sym))
 	    || bfd_is_com_section (bfd_get_section (sym)));
 }
--- bfd/elfn32-mips.c.jj	2008-11-19 15:50:38.000000000 +0100
+++ bfd/elfn32-mips.c	2009-08-06 14:42:32.000000000 +0200
@@ -2289,7 +2289,7 @@ mips_elf_sym_is_global (bfd *abfd ATTRIB
   if (SGI_COMPAT (abfd))
     return (sym->flags & BSF_SECTION_SYM) == 0;
   else
-    return ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
+    return ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0
 	    || bfd_is_und_section (bfd_get_section (sym))
 	    || bfd_is_com_section (bfd_get_section (sym)));
 }


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- binutils.spec	24 Jul 2009 18:04:11 -0000	1.173
+++ binutils.spec	6 Aug 2009 13:17:59 -0000	1.174
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.51.0.14
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -31,6 +31,7 @@ Patch05: binutils-2.19.51.0.10-version.p
 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
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -103,6 +104,7 @@ to consider using libelf instead of BFD.
 %patch06 -p0 -b .set-long-long~
 %patch07 -p0 -b .build-id~
 %patch09 -p0 -b .moxie~
+%patch10 -p0 -b .unique-is-global~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -353,6 +355,9 @@ fi
 %endif # %{isnative}
 
 %changelog
+* 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)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.19.51.0.14-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stransky at fedoraproject.org  Thu Aug  6 13:20:09 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 13:20:09 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.sh.in, 1.10,
	1.11 thunderbird.spec, 1.146, 1.147 thunderbird-pango.patch, 1.1,
	NONE xulrunner-elif.patch, 1.1, NONE
Message-ID: <20090806132009.61CC811C0425@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6600

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Removed Files:
	thunderbird-pango.patch xulrunner-elif.patch 
Log Message:
* Thu Aug  6 2009 Martin Stransky <stransky at redhat.com> - 3.0-3.8.beta3
- Added fix for #437596
- Removed unused patches




Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.sh.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- thunderbird.sh.in	7 Jan 2009 22:34:21 -0000	1.10
+++ thunderbird.sh.in	6 Aug 2009 13:20:09 -0000	1.11
@@ -41,6 +41,11 @@ MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
 #export MOZ_DISABLE_PANGO
 
 ##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
+
+##
 ## Disable the GNOME crash dialog, Moz has it's own
 ## 
 GNOME_DISABLE_CRASH_DIALOG=1


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- thunderbird.spec	6 Aug 2009 10:32:18 -0000	1.146
+++ thunderbird.spec	6 Aug 2009 13:20:09 -0000	1.147
@@ -12,7 +12,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.7.b3%{?dist}
+Release:        3.8.b3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -36,8 +36,6 @@ Source100:      find-external-requires
 
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
-Patch3:         xulrunner-elif.patch
-Patch4:         thunderbird-pango.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -98,8 +96,6 @@ Mozilla Thunderbird is a standalone mail
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
-#%patch3 -p0 -b .xulrunner-elif
-#%patch4 -p1 -b .pango-fix
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -301,6 +297,10 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Aug  6 2009 Martin Stransky <stransky at redhat.com> - 3.0-3.8.beta3
+- Added fix for #437596
+- Removed unused patches
+
 * Thu Aug  6 2009 Jan Horak <jhorak at redhat.com> - 3.0-3.7.beta3
 - Removed unused build requirements
 


--- thunderbird-pango.patch DELETED ---


--- xulrunner-elif.patch DELETED ---



From twaugh at fedoraproject.org  Thu Aug  6 13:21:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  6 Aug 2009 13:21:19 +0000 (UTC)
Subject: rpms/cups/F-11 cups-libusb.rules,NONE,1.1 cups.spec,1.496,1.497
Message-ID: <20090806132119.0135C11C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6917

Modified Files:
	cups.spec 
Added Files:
	cups-libusb.rules 
Log Message:
* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
- Ship udev rules to allow libusb to access printer devices.



--- NEW FILE cups-libusb.rules ---
# Allow the lp group to read and write raw USB devices for printers.
# This is required for the CUPS usb backend when built with libusb
# support.
ACTION=="add", SUBSYSTEM=="usb", \
  ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
  DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- cups.spec	4 Aug 2009 12:33:00 -0000	1.496
+++ cups.spec	6 Aug 2009 13:21:18 -0000	1.497
@@ -16,6 +16,7 @@ Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: cups-libusb.rules
 Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
@@ -120,6 +121,9 @@ Requires: portreserve
 
 Requires: poppler-utils
 
+# We ship udev rules.
+Requires: udev
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -340,6 +344,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 extension=phpcups.so
 __EOF__
 
+# Install the udev rules.
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d
+install -m644 %{SOURCE3} \
+	%{buildroot}%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules
 
 %post
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
@@ -404,6 +412,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
+%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules
 %dir %attr(0755,root,lp) /etc/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
@@ -513,7 +522,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+- Ship udev rules to allow libusb to access printer devices.
 - Fixed duplex test pages (bug #514898, STR #3277).
 - Removed temporary snmp option from socket backend.
 



From twaugh at fedoraproject.org  Thu Aug  6 13:21:23 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  6 Aug 2009 13:21:23 +0000 (UTC)
Subject: rpms/cups/devel cups-libusb.rules,NONE,1.1 cups.spec,1.492,1.493
Message-ID: <20090806132123.0E71011C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6948

Modified Files:
	cups.spec 
Added Files:
	cups-libusb.rules 
Log Message:
* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
- Ship udev rules to allow libusb to access printer devices.



--- NEW FILE cups-libusb.rules ---
# Allow the lp group to read and write raw USB devices for printers.
# This is required for the CUPS usb backend when built with libusb
# support.
ACTION=="add", SUBSYSTEM=="usb", \
  ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
  DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- cups.spec	4 Aug 2009 12:32:18 -0000	1.492
+++ cups.spec	6 Aug 2009 13:21:22 -0000	1.493
@@ -16,6 +16,7 @@ Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: cups-libusb.rules
 Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
@@ -120,6 +121,9 @@ Requires: portreserve
 
 Requires: poppler-utils
 
+# We ship udev rules.
+Requires: udev
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -340,6 +344,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 extension=phpcups.so
 __EOF__
 
+# Install the udev rules.
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d
+install -m644 %{SOURCE3} \
+	%{buildroot}%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules
 
 %post
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
@@ -404,6 +412,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
+%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules
 %dir %attr(0755,root,lp) /etc/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
@@ -513,7 +522,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+- Ship udev rules to allow libusb to access printer devices.
 - Fixed duplex test pages (bug #514898, STR #3277).
 
 * Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12



From ovasik at fedoraproject.org  Thu Aug  6 13:24:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  6 Aug 2009 13:24:22 +0000 (UTC)
Subject: rpms/coreutils/devel .cvsignore, 1.20, 1.21 coreutils.spec, 1.264, 
	1.265 sources, 1.22, 1.23
Message-ID: <20090806132422.CCD3F11C0349@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7564

Modified Files:
	.cvsignore coreutils.spec sources 
Log Message:
do process install-info only with info files present(#515970), BuildRequire for xz-utils, use xz tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 May 2009 12:11:34 -0000	1.20
+++ .cvsignore	6 Aug 2009 13:24:22 -0000	1.21
@@ -1 +1 @@
-coreutils-7.4.tar.gz
+coreutils-7.4.tar.xz


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- coreutils.spec	5 Aug 2009 08:45:05 -0000	1.264
+++ coreutils.spec	6 Aug 2009 13:24:22 -0000	1.265
@@ -1,13 +1,12 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Using .tar.gz tarball until xz utils will be in Fedora
-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
@@ -62,6 +61,7 @@ BuildRequires: automake >= 1.10.1
 BuildRequires: libcap-devel >= 2.0.6
 BuildRequires: libattr-devel
 BuildRequires: attr
+BuildRequires: xz-utils
 
 Requires(post): libselinux >= 1.25.6-1
 Requires:       libattr
@@ -247,19 +247,25 @@ 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 || :
+  fi
 done
 
 %preun
 if [ $1 = 0 ]; then
+  if [ -f %{_infodir}/%{name}.info ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+  fi
 fi
 
 %post
 /bin/grep -v '(sh-utils)\|(fileutils)\|(textutils)' %{_infodir}/dir > \
   %{_infodir}/dir.rpmmodify || exit 0
     /bin/mv -f %{_infodir}/dir.rpmmodify %{_infodir}/dir
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -f %{_infodir}/%{name}.info ]; then
+  /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -312,6 +318,10 @@ fi
 /sbin/runuser
 
 %changelog
+* Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
+- do process install-info only with info files present(#515970)
+- BuildRequire for xz-utils, use xz tarball
+
 * Wed Aug 05 2009 Kamil Dudka <kdudka at redhat.com> - 7.4-5
 - ls -1U with two or more arguments (or with -R or -s) works properly again
 - install runs faster again with SELinux enabled (#479502)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	25 May 2009 12:11:34 -0000	1.22
+++ sources	6 Aug 2009 13:24:22 -0000	1.23
@@ -1 +1 @@
-c52f4f64dda9a245c38e74c09fdd86d2  coreutils-7.4.tar.gz
+e8d906c153f271430e3efb2b9a35a35f  coreutils-7.4.tar.xz



From stransky at fedoraproject.org  Thu Aug  6 13:30:14 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 13:30:14 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.sh.in, 1.8, 1.9 seamonkey.spec, 1.59,
	1.60
Message-ID: <20090806133014.8C02511C0439@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8688

Modified Files:
	seamonkey.sh.in seamonkey.spec 
Log Message:
Added fix for #437596


Index: seamonkey.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.sh.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- seamonkey.sh.in	24 Jul 2009 21:42:52 -0000	1.8
+++ seamonkey.sh.in	6 Aug 2009 13:30:14 -0000	1.9
@@ -86,6 +86,11 @@ fi
 export MOZ_PLUGIN_PATH
 
 ##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="/usr/bin/seamonkey"
+
+##
 ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
 ## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
 ##


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- seamonkey.spec	24 Jul 2009 21:42:52 -0000	1.59
+++ seamonkey.spec	6 Aug 2009 13:30:14 -0000	1.60
@@ -18,7 +18,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        1.beta1%{?dist}
+Release:        2.beta1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -341,6 +341,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> 2.0-2.beta1
+- Added fix for #437596
+
 * Wed Jul 22 2009 Martin Stransky <stransky at redhat.com> 2.0-1.beta1
 - Update to 2.0 beta 1
 



From ovasik at fedoraproject.org  Thu Aug  6 13:31:14 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  6 Aug 2009 13:31:14 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.265,1.266
Message-ID: <20090806133114.B46F011C00E4@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8950

Modified Files:
	coreutils.spec 
Log Message:
package is xz, not xz-utils


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- coreutils.spec	6 Aug 2009 13:24:22 -0000	1.265
+++ coreutils.spec	6 Aug 2009 13:31:14 -0000	1.266
@@ -61,7 +61,7 @@ BuildRequires: automake >= 1.10.1
 BuildRequires: libcap-devel >= 2.0.6
 BuildRequires: libattr-devel
 BuildRequires: attr
-BuildRequires: xz-utils
+BuildRequires: xz
 
 Requires(post): libselinux >= 1.25.6-1
 Requires:       libattr
@@ -320,7 +320,7 @@ fi
 %changelog
 * Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
 - do process install-info only with info files present(#515970)
-- BuildRequire for xz-utils, use xz tarball
+- BuildRequires for xz, use xz tarball
 
 * Wed Aug 05 2009 Kamil Dudka <kdudka at redhat.com> - 7.4-5
 - ls -1U with two or more arguments (or with -R or -s) works properly again



From mschwendt at fedoraproject.org  Thu Aug  6 13:34:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu,  6 Aug 2009 13:34:56 +0000 (UTC)
Subject: rpms/bmpx/devel bmpx.spec,1.22,1.23
Message-ID: <20090806133456.6040F11C00E4@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/bmpx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9778

Modified Files:
	bmpx.spec 
Log Message:
What problems does that refer to?


Index: bmpx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- bmpx.spec	24 Jul 2009 18:16:14 -0000	1.22
+++ bmpx.spec	6 Aug 2009 13:34:56 -0000	1.23
@@ -28,6 +28,7 @@ BuildRequires:	gstreamer-plugins-base-de
 # BuildRequires:	hal-devel
 BuildRequires:	taglib-devel
 # Has some mysterious problems on ppc right now..
+# [mschwendt asks: What problems are that? Builds fine on F-12]
 # BuildRequires:	libsidplay-devel
 BuildRequires:	startup-notification-devel
 BuildRequires:	libofa-devel



From twaugh at fedoraproject.org  Thu Aug  6 13:39:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  6 Aug 2009 13:39:14 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.497,1.498
Message-ID: <20090806133914.C3FE411C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11259

Modified Files:
	cups.spec 
Log Message:
1.4-0.rc1.14


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- cups.spec	6 Aug 2009 13:21:18 -0000	1.497
+++ cups.spec	6 Aug 2009 13:39:14 -0000	1.498
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.13%{?dist}
+Release: 0.%{pre}.14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -522,7 +522,7 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
 - Ship udev rules to allow libusb to access printer devices.
 - Fixed duplex test pages (bug #514898, STR #3277).
 - Removed temporary snmp option from socket backend.



From ovasik at fedoraproject.org  Thu Aug  6 13:10:57 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  6 Aug 2009 13:10:57 +0000 (UTC)
Subject: rpms/cpio/devel cpio.spec,1.67,1.68
Message-ID: <20090806131057.910AD11C00E4@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/cpio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4589

Modified Files:
	cpio.spec 
Log Message:
do process install-info info file exists(#515924)


Index: cpio.spec
===================================================================
RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- cpio.spec	24 Jul 2009 19:32:37 -0000	1.67
+++ cpio.spec	6 Aug 2009 13:10:57 -0000	1.68
@@ -3,7 +3,7 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -71,11 +71,15 @@ install -c -p -m 0644 %{SOURCE1} ${RPM_B
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/cpio.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/cpio.info.gz ]; then
+	/sbin/install-info %{_infodir}/cpio.info.gz %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/cpio.info.gz %{_infodir}/dir || :
+	if [ -f %{_infodir}/cpio.info.gz ]; then
+		/sbin/install-info --delete %{_infodir}/cpio.info.gz %{_infodir}/dir || :
+	fi
 fi
 
 %files -f %{name}.lang
@@ -86,6 +90,9 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> 2.10-3
+- do process install-info only without --excludedocs(#515924)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stransky at fedoraproject.org  Thu Aug  6 13:10:16 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 13:10:16 +0000 (UTC)
Subject: rpms/firefox/devel firefox.sh.in, 1.33, 1.34 firefox.spec, 1.335,
	1.336
Message-ID: <20090806131016.AE6A711C0439@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4314

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
Fix for #437596 - Firefox needs to register proper name for session restore


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- firefox.sh.in	7 Jan 2009 15:49:05 -0000	1.33
+++ firefox.sh.in	6 Aug 2009 13:10:16 -0000	1.34
@@ -102,6 +102,11 @@ fi
 export MOZ_PLUGIN_PATH
 
 ##
+## Set MOZ_APP_LAUNCHER for gnome-session
+##
+export MOZ_APP_LAUNCHER="/usr/bin/firefox"
+
+##
 ## If plugins are wrapped, check them
 ##
 if [ -x "/usr/bin/mozilla-plugin-config" ]


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -p -r1.335 -r1.336
--- firefox.spec	6 Aug 2009 08:03:57 -0000	1.335
+++ firefox.spec	6 Aug 2009 13:10:16 -0000	1.336
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -329,6 +329,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-2
+- Fix for #437596 - Firefox needs to register proper name
+  for session restore.
+
 * Mon Aug  3 2009 Christopher Aillon <caillon at redhat.com> - 3.5.2-1
 - Update to 3.5.2
 



From peter at fedoraproject.org  Thu Aug  6 13:41:45 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 13:41:45 +0000 (UTC)
Subject: rpms/xerces-c/devel xerces-c--CVE-2009-1885.diff, NONE,
	1.1 import.log, 1.1, 1.2 xerces-c.spec, 1.6, 1.7
Message-ID: <20090806134145.14A1A11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11837/devel

Modified Files:
	import.log xerces-c.spec 
Added Files:
	xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Jun 2008 12:39:58 -0000	1.1
+++ import.log	6 Aug 2009 13:41:44 -0000	1.2
@@ -1 +1,2 @@
 xerces-c-2_8_0-2_fc9:HEAD:xerces-c-2.8.0-2.fc9.src.rpm:1214829476
+xerces-c-2_8_0-5_fc11:HEAD:xerces-c-2.8.0-5.fc11.src.rpm:1249566064


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/devel/xerces-c.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xerces-c.spec	27 Jul 2009 07:47:39 -0000	1.6
+++ xerces-c.spec	6 Aug 2009 13:41:44 -0000	1.7
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
 Version:	2.8.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
-Source:		http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
+Source0:	http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
+PAtch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -55,6 +56,7 @@ find ./samples -type f -perm 755 -exec c
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
 rm doc/html/apiDocs/XMLRegisterCleanup_8hpp__incl.map
 rm doc/html/apiDocs/XSConstants_8hpp__incl.map
+%patch0 -p0 -b .CVE-2009-1885
 
 # make rpmlint happy
 sed -i 's/\r//' doc/charter.xml
@@ -124,6 +126,9 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-5
+- Fix CVE-2009-1885
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jsafrane at fedoraproject.org  Thu Aug  6 13:53:27 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu,  6 Aug 2009 13:53:27 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi.spec,1.21,1.22
Message-ID: <20090806135327.4DABD11C00E4@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13861

Modified Files:
	freeipmi.spec 
Log Message:
Fix installation with --excludedocs option
Resolves: #515926


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- freeipmi.spec	29 Jul 2009 07:25:51 -0000	1.21
+++ freeipmi.spec	6 Aug 2009 13:53:27 -0000	1.22
@@ -2,7 +2,7 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: freeipmi
 Version: 0.7.11
@@ -96,12 +96,12 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
 /sbin/ldconfig
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
 fi
 
 %postun -p /sbin/ldconfig
@@ -291,6 +291,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Thu Aug  6 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.11-2
+- Fix installation with --excludedocs option (#515926)
+
 * Wed Jul 29 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.11-1
 - Update to freeipmi-0.7.11
 



From peter at fedoraproject.org  Thu Aug  6 13:57:50 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 13:57:50 +0000 (UTC)
Subject: rpms/xerces-c/F-11 xerces-c--CVE-2009-1885.diff, NONE,
	1.1 import.log, 1.1, 1.2 xerces-c.spec, 1.5, 1.6
Message-ID: <20090806135750.7A4F211C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14720/F-11

Modified Files:
	import.log xerces-c.spec 
Added Files:
	xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Jun 2008 12:39:58 -0000	1.1
+++ import.log	6 Aug 2009 13:57:50 -0000	1.2
@@ -1 +1,2 @@
 xerces-c-2_8_0-2_fc9:HEAD:xerces-c-2.8.0-2.fc9.src.rpm:1214829476
+xerces-c-2_8_0-5_fc11:F-11:xerces-c-2.8.0-5.fc11.src.rpm:1249566790


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/F-11/xerces-c.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xerces-c.spec	26 Feb 2009 08:32:42 -0000	1.5
+++ xerces-c.spec	6 Aug 2009 13:57:50 -0000	1.6
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
 Version:	2.8.0
-Release:	3%{?dist}
+Release:	5%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
-Source:		http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
+Source0:	http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
+PAtch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -55,6 +56,7 @@ find ./samples -type f -perm 755 -exec c
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
 rm doc/html/apiDocs/XMLRegisterCleanup_8hpp__incl.map
 rm doc/html/apiDocs/XSConstants_8hpp__incl.map
+%patch0 -p0 -b .CVE-2009-1885
 
 # make rpmlint happy
 sed -i 's/\r//' doc/charter.xml
@@ -124,6 +126,12 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-5
+- Fix CVE-2009-1885
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Aug  6 13:59:54 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 13:59:54 +0000 (UTC)
Subject: rpms/xerces-c/F-10 xerces-c--CVE-2009-1885.diff, NONE,
	1.1 import.log, 1.1, 1.2 xerces-c.spec, 1.4, 1.5
Message-ID: <20090806135954.3974C11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15205/F-10

Modified Files:
	import.log xerces-c.spec 
Added Files:
	xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Jun 2008 12:39:58 -0000	1.1
+++ import.log	6 Aug 2009 13:59:54 -0000	1.2
@@ -1 +1,2 @@
 xerces-c-2_8_0-2_fc9:HEAD:xerces-c-2.8.0-2.fc9.src.rpm:1214829476
+xerces-c-2_8_0-5_fc11:F-10:xerces-c-2.8.0-5.fc11.src.rpm:1249567159


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/F-10/xerces-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xerces-c.spec	30 Jun 2008 12:39:58 -0000	1.4
+++ xerces-c.spec	6 Aug 2009 13:59:54 -0000	1.5
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
 Version:	2.8.0
-Release:	2%{?dist}
+Release:	5%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
-Source:		http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
+Source0:	http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
+PAtch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -55,6 +56,7 @@ find ./samples -type f -perm 755 -exec c
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
 rm doc/html/apiDocs/XMLRegisterCleanup_8hpp__incl.map
 rm doc/html/apiDocs/XSConstants_8hpp__incl.map
+%patch0 -p0 -b .CVE-2009-1885
 
 # make rpmlint happy
 sed -i 's/\r//' doc/charter.xml
@@ -124,6 +126,15 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-5
+- Fix CVE-2009-1885
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jun 30 2008 Peter Lemenkov <lemenkov at gmail.com> 2.8.0-2
 - Spec cleanups ( https://bugzilla.redhat.com/show_bug.cgi?id=435132 )
 



From peter at fedoraproject.org  Thu Aug  6 14:26:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 14:26:47 +0000 (UTC)
Subject: rpms/xerces-c/EL-5 import.log, NONE,
	1.1 xerces-c--CVE-2009-1885.diff, NONE, 1.1 xerces-c.spec, 1.4, 1.5
Message-ID: <20090806142647.D400211C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20860/EL-5

Modified Files:
	xerces-c.spec 
Added Files:
	import.log xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885


--- NEW FILE import.log ---
xerces-c-2_7_0-8_fc11:EL-5:xerces-c-2.7.0-8.fc11.src.rpm:1249568782

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/EL-5/xerces-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xerces-c.spec	26 Feb 2008 22:44:34 -0000	1.4
+++ xerces-c.spec	6 Aug 2009 14:26:47 -0000	1.5
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
-Name: 		xerces-c
-Version: 	2.7.0
-Release:	7%{?dist}
+Name:		xerces-c
+Version:	2.7.0
+Release:	8%{?dist}
 License:	Apache Software License
 Group:		System Environment/Libraries
-URL: 		http://xml.apache.org/xerces-c/
-Source: 	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
+URL:		http://xml.apache.org/xerces-c/
+Source0:	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
+Patch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,10 +17,10 @@ generating, manipulating, and validating
 faithful to the XML 1.0 recommendation and associated standards ( DOM
 1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).
 
-%package 	devel
-Summary: 	Header files, libraries and development documentation for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
+%package	devel
+Summary:	Header files, libraries and development documentation for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -53,6 +54,7 @@ rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
+%patch0 -p0 -b .CVE-2009-1885
 
 %build
 export XERCESCROOT="$PWD"
@@ -115,6 +117,9 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
+- Fix CVE-2009-1885
+
 * Wed Feb 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-7
 - rebuild
 



From jcollie at fedoraproject.org  Thu Aug  6 14:27:28 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  6 Aug 2009 14:27:28 +0000 (UTC)
Subject: rpms/python-paramiko/EL-5 .cvsignore, 1.11,
	1.12 python-paramiko.spec, 1.15, 1.16 sources, 1.11, 1.12
Message-ID: <20090806142728.3F1FA11C00E4@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-paramiko/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21119

Modified Files:
	.cvsignore python-paramiko.spec sources 
Log Message:
* Thu Jul 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.5-1
- v1.7.5 (Ernest) 19jul09
- -----------------------
-  * added support for ARC4 cipher and CTR block chaining (Denis Bernard)
-  * made transport threads daemonize, to fix python 2.6 atexit behavior
-  * support unicode hostnames, and IP6 addresses (Maxime Ripard, Shikhar
-    Bhushan)
-  * various small bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Jul 2008 11:52:04 -0000	1.11
+++ .cvsignore	6 Aug 2009 14:27:28 -0000	1.12
@@ -1 +1 @@
-paramiko-1.7.4.tar.gz
+paramiko-1.7.5.tar.gz


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/EL-5/python-paramiko.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-paramiko.spec	16 Feb 2009 19:06:30 -0000	1.15
+++ python-paramiko.spec	6 Aug 2009 14:27:28 -0000	1.16
@@ -3,8 +3,8 @@
 %define srcname paramiko
 
 Name:           python-paramiko
-Version:        1.7.4
-Release:        4%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -55,6 +55,18 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Jul 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.5-1
+- v1.7.5 (Ernest) 19jul09
+- -----------------------
+-  * added support for ARC4 cipher and CTR block chaining (Denis Bernard)
+-  * made transport threads daemonize, to fix python 2.6 atexit behavior
+-  * support unicode hostnames, and IP6 addresses (Maxime Ripard, Shikhar
+-    Bhushan)
+-  * various small bug fixes
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.4-4
 - Add demos as documentation. BZ#485742
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Jul 2008 11:52:04 -0000	1.11
+++ sources	6 Aug 2009 14:27:28 -0000	1.12
@@ -1 +1 @@
-6ae82f2eb30748be789d4ff3909e4b5e  paramiko-1.7.4.tar.gz
+7eac2199bea086cc22966eb223c64e7f  paramiko-1.7.5.tar.gz



From peter at fedoraproject.org  Thu Aug  6 14:27:39 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 14:27:39 +0000 (UTC)
Subject: rpms/xerces-c/EL-4 import.log, NONE,
	1.1 xerces-c--CVE-2009-1885.diff, NONE, 1.1 xerces-c.spec, 1.4, 1.5
Message-ID: <20090806142739.B71C911C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244/EL-4

Modified Files:
	xerces-c.spec 
Added Files:
	import.log xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885


--- NEW FILE import.log ---
xerces-c-2_7_0-8_fc11:EL-4:xerces-c-2.7.0-8.fc11.src.rpm:1249568835

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/EL-4/xerces-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xerces-c.spec	26 Feb 2008 22:46:26 -0000	1.4
+++ xerces-c.spec	6 Aug 2009 14:27:39 -0000	1.5
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
-Name: 		xerces-c
-Version: 	2.7.0
-Release:	7%{?dist}
+Name:		xerces-c
+Version:	2.7.0
+Release:	8%{?dist}
 License:	Apache Software License
 Group:		System Environment/Libraries
-URL: 		http://xml.apache.org/xerces-c/
-Source: 	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
+URL:		http://xml.apache.org/xerces-c/
+Source0:	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
+Patch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,10 +17,10 @@ generating, manipulating, and validating
 faithful to the XML 1.0 recommendation and associated standards ( DOM
 1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).
 
-%package 	devel
-Summary: 	Header files, libraries and development documentation for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
+%package	devel
+Summary:	Header files, libraries and development documentation for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -53,6 +54,7 @@ rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
+%patch0 -p0 -b .CVE-2009-1885
 
 %build
 export XERCESCROOT="$PWD"
@@ -115,6 +117,9 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
+- Fix CVE-2009-1885
+
 * Wed Feb 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-7
 - rebuild
 



From peter at fedoraproject.org  Thu Aug  6 14:36:35 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 14:36:35 +0000 (UTC)
Subject: rpms/xerces-c27/devel import.log, NONE,
	1.1 xerces-c--CVE-2009-1885.diff, NONE, 1.1 xerces-c27.spec, 1.4, 1.5
Message-ID: <20090806143635.0740211C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c27/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23148/devel

Modified Files:
	xerces-c27.spec 
Added Files:
	import.log xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885


--- NEW FILE import.log ---
xerces-c27-2_7_0-8_fc11:HEAD:xerces-c27-2.7.0-8.fc11.src.rpm:1249569297

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: xerces-c27.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c27/devel/xerces-c27.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xerces-c27.spec	27 Jul 2009 07:47:50 -0000	1.4
+++ xerces-c27.spec	6 Aug 2009 14:36:34 -0000	1.5
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
-Name: 		xerces-c27
-Version: 	2.7.0
-Release:	7%{?dist}
+Name:		xerces-c27
+Version:	2.7.0
+Release:	8%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
-URL: 		http://xml.apache.org/xerces-c/
-Source:         http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+URL:		http://xml.apache.org/xerces-c/
+Source0:        http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+Patch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,10 +21,10 @@ Note that this package contains Xerces-C
 applications that cannot use a newer version.
 
 
-%package 	devel
-Summary: 	Header files, libraries and development documentation for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
+%package	devel
+Summary:	Header files, libraries and development documentation for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -56,6 +57,8 @@ for i in feedback.xml migration.xml rele
 	};
 done;
 
+%patch0 -p0 -b .CVE-2009-1885
+
 
 %build
 export XERCESCROOT="$PWD"
@@ -125,6 +128,9 @@ mv $RPM_BUILD_ROOT%{_includedir}/xercesc
 
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
+- Fix CVE-2009-1885
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Thu Aug  6 14:38:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 14:38:06 +0000 (UTC)
Subject: rpms/xerces-c27/F-11 import.log, NONE,
	1.1 xerces-c--CVE-2009-1885.diff, NONE, 1.1 xerces-c27.spec, 1.3, 1.4
Message-ID: <20090806143806.E2EC811C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c27/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24243/F-11

Modified Files:
	xerces-c27.spec 
Added Files:
	import.log xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885


--- NEW FILE import.log ---
xerces-c27-2_7_0-8_fc11:F-11:xerces-c27-2.7.0-8.fc11.src.rpm:1249569451

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: xerces-c27.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c27/F-11/xerces-c27.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xerces-c27.spec	26 Feb 2009 08:33:43 -0000	1.3
+++ xerces-c27.spec	6 Aug 2009 14:38:06 -0000	1.4
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
-Name: 		xerces-c27
-Version: 	2.7.0
-Release:	6%{?dist}
+Name:		xerces-c27
+Version:	2.7.0
+Release:	8%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
-URL: 		http://xml.apache.org/xerces-c/
-Source:         http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+URL:		http://xml.apache.org/xerces-c/
+Source0:        http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+Patch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,10 +21,10 @@ Note that this package contains Xerces-C
 applications that cannot use a newer version.
 
 
-%package 	devel
-Summary: 	Header files, libraries and development documentation for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
+%package	devel
+Summary:	Header files, libraries and development documentation for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -56,6 +57,8 @@ for i in feedback.xml migration.xml rele
 	};
 done;
 
+%patch0 -p0 -b .CVE-2009-1885
+
 
 %build
 export XERCESCROOT="$PWD"
@@ -125,6 +128,12 @@ mv $RPM_BUILD_ROOT%{_includedir}/xercesc
 
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
+- Fix CVE-2009-1885
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From stransky at fedoraproject.org  Thu Aug  6 14:05:51 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 14:05:51 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.171,1.172
Message-ID: <20090806140551.272BC11C00E4@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534

Modified Files:
	xulrunner.spec 
Log Message:
Rebuild


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- xulrunner.spec	6 Aug 2009 07:58:46 -0000	1.171
+++ xulrunner.spec	6 Aug 2009 14:05:50 -0000	1.172
@@ -12,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -451,6 +451,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 6 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-2
+- Rebuilt
+
 * Mon Aug 3 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-1
 - Update to 1.9.1.2
 



From peter at fedoraproject.org  Thu Aug  6 14:39:36 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  6 Aug 2009 14:39:36 +0000 (UTC)
Subject: rpms/xerces-c27/F-10 import.log, NONE,
	1.1 xerces-c--CVE-2009-1885.diff, NONE, 1.1 xerces-c27.spec, 1.2, 1.3
Message-ID: <20090806143936.51A2D11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c27/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24656/F-10

Modified Files:
	xerces-c27.spec 
Added Files:
	import.log xerces-c--CVE-2009-1885.diff 
Log Message:
CVE-2009-1885


--- NEW FILE import.log ---
xerces-c27-2_7_0-8_fc11:F-10:xerces-c27-2.7.0-8.fc11.src.rpm:1249569514

xerces-c--CVE-2009-1885.diff:
 DTDScanner.cpp |  565 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 292 insertions(+), 273 deletions(-)

--- NEW FILE xerces-c--CVE-2009-1885.diff ---
--- src/xercesc/validators/DTD/DTDScanner.cpp	2007-08-28 22:43:25.000000000 +0400
+++ src/xercesc/validators/DTD/DTDScanner.cpp	2009-08-06 17:21:40.086497628 +0400
@@ -27,7 +27,9 @@
 #include <xercesc/util/FlagJanitor.hpp>
 #include <xercesc/util/Janitor.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/ValueStackOf.hpp>
 #include <xercesc/util/UnexpectedEOFException.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <xercesc/framework/XMLDocumentHandler.hpp>
 #include <xercesc/framework/XMLEntityHandler.hpp>
@@ -39,7 +41,6 @@
 #include <xercesc/validators/DTD/DTDEntityDecl.hpp>
 #include <xercesc/validators/DTD/DocTypeHandler.hpp>
 #include <xercesc/validators/DTD/DTDScanner.hpp>
-#include <xercesc/util/OutOfMemoryException.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -1046,338 +1047,356 @@
     // Check for a PE ref here, but don't require spaces
     checkForPERef(false, true);
 
-    // We have to check entity nesting here
-    unsigned int curReader;
-
+    ValueStackOf<XMLSize_t>* arrNestedDecl=NULL;
     //
     //  We know that the caller just saw an opening parenthesis, so we need
-    //  to parse until we hit the end of it, recursing for other nested
-    //  parentheses we see.
+    //  to parse until we hit the end of it; if we find several parenthesis,
+    //  store them in an array to be processed later.
     //
     //  We have to check for one up front, since it could be something like
     //  (((a)*)) etc...
     //
     ContentSpecNode* curNode = 0;
-    if (fReaderMgr->skippedChar(chOpenParen))
+    while(fReaderMgr->skippedChar(chOpenParen))
     {
-        curReader = fReaderMgr->getCurrentReaderNum();
-
-        // Lets call ourself and get back the resulting node
-        curNode = scanChildren(elemDecl, bufToUse);
+        // to check entity nesting
+        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
+        if(arrNestedDecl==NULL)
+            arrNestedDecl=new (fMemoryManager) ValueStackOf<XMLSize_t>(5, fMemoryManager);
+        arrNestedDecl->push(curReader);
 
-        // If that failed, no need to go further, return failure
-        if (!curNode)
-            return 0;
-
-        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
     }
-     else
+    // We must find a leaf node here, either standalone or nested in the parenthesis
+    if (!fReaderMgr->getName(bufToUse))
     {
-        // Not a nested paren, so it must be a leaf node
-        if (!fReaderMgr->getName(bufToUse))
-        {
-            fScanner->emitError(XMLErrs::ExpectedElementName);
-            return 0;
-        }
+        fScanner->emitError(XMLErrs::ExpectedElementName);
+        return 0;
+    }
 
-        //
-        //  Create a leaf node for it. If we can find the element id for
-        //  this element, then use it. Else, we have to fault in an element
-        //  decl, marked as created because of being in a content model.
-        //
-        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-        if (!decl)
-        {
-            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
-            (
-                bufToUse.getRawBuffer()
-                , fEmptyNamespaceId
-                , DTDElementDecl::Any
-                , fGrammarPoolMemoryManager
-            );
-            decl->setCreateReason(XMLElementDecl::InContentModel);
-            decl->setExternalElemDeclaration(isReadingExternalEntity());
-            fDTDGrammar->putElemDecl(decl);
-        }
-        curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    //
+    //  Create a leaf node for it. If we can find the element id for
+    //  this element, then use it. Else, we have to fault in an element
+    //  decl, marked as created because of being in a content model.
+    //
+    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+    if (!decl)
+    {
+        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
         (
-            decl->getElementName()
+            bufToUse.getRawBuffer()
+            , fEmptyNamespaceId
+            , DTDElementDecl::Any
             , fGrammarPoolMemoryManager
         );
+        decl->setCreateReason(XMLElementDecl::InContentModel);
+        decl->setExternalElemDeclaration(isReadingExternalEntity());
+        fDTDGrammar->putElemDecl(decl);
+    }
+    curNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+    (
+        decl->getElementName()
+        , fGrammarPoolMemoryManager
+    );
 
-        // Check for a PE ref here, but don't require spaces
-        const bool gotSpaces = checkForPERef(false, true);
+    // Check for a PE ref here, but don't require spaces
+    const bool gotSpaces = checkForPERef(false, true);
 
-        // Check for a repetition character after the leaf
-        const XMLCh repCh = fReaderMgr->peekNextChar();
-        ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
-        if (tmpNode != curNode)
+    // Check for a repetition character after the leaf
+    XMLCh repCh = fReaderMgr->peekNextChar();
+    ContentSpecNode* tmpNode = makeRepNode(repCh, curNode, fGrammarPoolMemoryManager);
+    if (tmpNode != curNode)
+    {
+        if (gotSpaces)
         {
-            if (gotSpaces)
+            if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
             {
-                if (fScanner->emitErrorWillThrowException(XMLErrs::UnexpectedWhitespace))
-                {
-                    delete tmpNode;
-                }
-                fScanner->emitError(XMLErrs::UnexpectedWhitespace);
+                delete tmpNode;
             }
-            fReaderMgr->getNextChar();
-            curNode = tmpNode;
+            fScanner->emitError(XMLErrs::UnexpectedWhitespace);
         }
+        fReaderMgr->getNextChar();
+        curNode = tmpNode;
     }
 
-    // Check for a PE ref here, but don't require spaces
-    checkForPERef(false, true);
+    while(arrNestedDecl==NULL || !arrNestedDecl->empty())
+    {
+        // Check for a PE ref here, but don't require spaces
+        checkForPERef(false, true);
 
-    //
-    //  Ok, the next character tells us what kind of content this particular
-    //  model this particular parentesized section is. Its either a choice if
-    //  we see ',', a sequence if we see '|', or a single leaf node if we see
-    //  a closing paren.
-    //
-    const XMLCh opCh = fReaderMgr->peekNextChar();
-
-    if ((opCh != chComma)
-    &&  (opCh != chPipe)
-    &&  (opCh != chCloseParen))
-    {
-        // Not a legal char, so delete our node and return failure
-        delete curNode;
-        fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
-        return 0;
-    }
+        //
+        //  Ok, the next character tells us what kind of content this particular
+        //  model this particular parentesized section is. Its either a choice if
+        //  we see ',', a sequence if we see '|', or a single leaf node if we see
+        //  a closing paren.
+        //
+        const XMLCh opCh = fReaderMgr->peekNextChar();
+
+        if ((opCh != chComma)
+        &&  (opCh != chPipe)
+        &&  (opCh != chCloseParen))
+        {
+            // Not a legal char, so delete our node and return failure
+            delete curNode;
+            fScanner->emitError(XMLErrs::ExpectedSeqChoiceLeaf);
+            return 0;
+        }
 
-    //
-    //  Create the head node of the correct type. We need this to remember
-    //  the top of the local tree. If it was a single subexpr, then just
-    //  set the head node to the current node. For the others, we'll build
-    //  the tree off the second child as we move across.
-    //
-    ContentSpecNode* headNode = 0;
-    ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
-    if (opCh == chComma)
-    {
-        curType = ContentSpecNode::Sequence;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else if (opCh == chPipe)
-    {
-        curType = ContentSpecNode::Choice;
-        headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
-        (
-            curType
-            , curNode
-            , 0
-            , true
-            , true
-            , fGrammarPoolMemoryManager
-        );
-        curNode = headNode;
-    }
-     else
-    {
-        headNode = curNode;
-        fReaderMgr->getNextChar();
-    }
+        //
+        //  Create the head node of the correct type. We need this to remember
+        //  the top of the local tree. If it was a single subexpr, then just
+        //  set the head node to the current node. For the others, we'll build
+        //  the tree off the second child as we move across.
+        //
+        ContentSpecNode* headNode = 0;
+        ContentSpecNode::NodeTypes curType = ContentSpecNode::UnknownType;
+        if (opCh == chComma)
+        {
+            curType = ContentSpecNode::Sequence;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+        else if (opCh == chPipe)
+        {
+            curType = ContentSpecNode::Choice;
+            headNode = new (fGrammarPoolMemoryManager) ContentSpecNode
+            (
+                curType
+                , curNode
+                , 0
+                , true
+                , true
+                , fGrammarPoolMemoryManager
+            );
+            curNode = headNode;
+        }
+         else
+        {
+            headNode = curNode;
+            fReaderMgr->getNextChar();
+        }
 
-    //
-    //  If it was a sequence or choice, we just loop until we get to the
-    //  end of our section, adding each new leaf or sub expression to the
-    //  right child of the current node, and making that new node the current
-    //  node.
-    //
-    if ((opCh == chComma) || (opCh == chPipe))
-    {
-        ContentSpecNode* lastNode = 0;
-        while (true)
+        //
+        //  If it was a sequence or choice, we just loop until we get to the
+        //  end of our section, adding each new leaf or sub expression to the
+        //  right child of the current node, and making that new node the current
+        //  node.
+        //
+        if ((opCh == chComma) || (opCh == chPipe))
         {
-            //
-            //  The next thing must either be another | or , character followed
-            //  by another leaf or subexpression, or a closing parenthesis, or a
-            //  PE ref.
-            //
-            if (fReaderMgr->lookingAtChar(chPercent))
-            {
-                checkForPERef(false, true);
-            }
-             else if (fReaderMgr->skippedSpace())
-            {
-                // Just skip whitespace
-                fReaderMgr->skipPastSpaces();
-            }
-             else if (fReaderMgr->skippedChar(chCloseParen))
+            ContentSpecNode* lastNode = 0;
+            while (true)
             {
                 //
-                //  We've hit the end of this section, so break out. But, we
-                //  need to see if we left a partial sequence of choice node
-                //  without a second node. If so, we have to undo that and
-                //  put its left child into the right node of the previous
-                //  node.
+                //  The next thing must either be another | or , character followed
+                //  by another leaf or subexpression, or a closing parenthesis, or a
+                //  PE ref.
                 //
-                if ((curNode->getType() == ContentSpecNode::Choice)
-                ||  (curNode->getType() == ContentSpecNode::Sequence))
+                if (fReaderMgr->lookingAtChar(chPercent))
                 {
-                    if (!curNode->getSecond())
+                    checkForPERef(false, true);
+                }
+                 else if (fReaderMgr->skippedSpace())
+                {
+                    // Just skip whitespace
+                    fReaderMgr->skipPastSpaces();
+                }
+                 else if (fReaderMgr->skippedChar(chCloseParen))
+                {
+                    //
+                    //  We've hit the end of this section, so break out. But, we
+                    //  need to see if we left a partial sequence of choice node
+                    //  without a second node. If so, we have to undo that and
+                    //  put its left child into the right node of the previous
+                    //  node.
+                    //
+                    if ((curNode->getType() == ContentSpecNode::Choice)
+                    ||  (curNode->getType() == ContentSpecNode::Sequence))
                     {
-                        ContentSpecNode* saveFirst = curNode->orphanFirst();
-                        lastNode->setSecond(saveFirst);
-                        curNode = lastNode;
+                        if (!curNode->getSecond())
+                        {
+                            ContentSpecNode* saveFirst = curNode->orphanFirst();
+                            lastNode->setSecond(saveFirst);
+                            curNode = lastNode;
+                        }
                     }
+                    break;
                 }
-                break;
-            }
-             else if (fReaderMgr->skippedChar(opCh))
-            {
-                // Check for a PE ref here, but don't require spaces
-                checkForPERef(false, true);
-
-                if (fReaderMgr->skippedChar(chOpenParen))
+                else if (fReaderMgr->skippedChar(opCh))
                 {
-                    curReader = fReaderMgr->getCurrentReaderNum();
+                    // Check for a PE ref here, but don't require spaces
+                    checkForPERef(false, true);
 
-                    // Recurse to handle this new guy
-                    ContentSpecNode* subNode;
-                    try {
-                        subNode = scanChildren(elemDecl, bufToUse);
-                    }
-                    catch (const XMLErrs::Codes)
+                    if (fReaderMgr->skippedChar(chOpenParen))
                     {
-                        delete headNode;
-                        throw;
-                    }
+                        const XMLSize_t curReader = fReaderMgr->getCurrentReaderNum();
 
-                    // If it failed, we are done, clean up here and return failure
-                    if (!subNode)
-                    {
-                        delete headNode;
-                        return 0;
+                        // Recurse to handle this new guy
+                        ContentSpecNode* subNode;
+                        try {
+                            subNode = scanChildren(elemDecl, bufToUse);
+                        }
+                        catch (const XMLErrs::Codes)
+                        {
+                            delete headNode;
+                            throw;
+                        }
+
+                        // If it failed, we are done, clean up here and return failure
+                        if (!subNode)
+                        {
+                            delete headNode;
+                            return 0;
+                        }
+
+                        if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                            fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+                        // Else patch it in and make it the new current
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , subNode
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
                     }
+                    else
+                    {
+                        //
+                        //  Got to be a leaf node, so get a name. If we cannot get
+                        //  one, then clean up and get outa here.
+                        //
+                        if (!fReaderMgr->getName(bufToUse))
+                        {
+                            delete headNode;
+                            fScanner->emitError(XMLErrs::ExpectedElementName);
+                            return 0;
+                        }
 
-                    if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation())
-                        fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+                        //
+                        //  Create a leaf node for it. If we can find the element
+                        //  id for this element, then use it. Else, we have to
+                        //  fault in an element decl, marked as created because
+                        //  of being in a content model.
+                        //
+                        XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
+                        if (!decl)
+                        {
+                            decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                            (
+                                bufToUse.getRawBuffer()
+                                , fEmptyNamespaceId
+                                , DTDElementDecl::Any
+                                , fGrammarPoolMemoryManager
+                            );
+                            decl->setCreateReason(XMLElementDecl::InContentModel);
+                            decl->setExternalElemDeclaration(isReadingExternalEntity());
+                            fDTDGrammar->putElemDecl(decl);
+                        }
 
-                    // Else patch it in and make it the new current
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , subNode
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
+                        ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            decl->getElementName()
+                            , fGrammarPoolMemoryManager
+                        );
+
+                        // Check for a repetition character after the leaf
+                        const XMLCh repCh = fReaderMgr->peekNextChar();
+                        ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
+                        if (tmpLeaf != tmpLeaf2)
+                            fReaderMgr->getNextChar();
+
+                        //
+                        //  Create a new sequence or choice node, with the leaf
+                        //  (or rep surrounding it) we just got as its first node.
+                        //  Make the new node the second node of the current node,
+                        //  and then make it the current node.
+                        //
+                        ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
+                        (
+                            curType
+                            , tmpLeaf2
+                            , 0
+                            , true
+                            , true
+                            , fGrammarPoolMemoryManager
+                        );
+                        curNode->setSecond(newCur);
+                        lastNode = curNode;
+                        curNode = newCur;
+                    }
                 }
                  else
                 {
-                    //
-                    //  Got to be a leaf node, so get a name. If we cannot get
-                    //  one, then clean up and get outa here.
-                    //
-                    if (!fReaderMgr->getName(bufToUse))
+                    // Cannot be valid
+                    delete headNode;  // emitError may do a throw so need to clean-up first
+                    if (opCh == chComma)
                     {
-                        delete headNode;
-                        fScanner->emitError(XMLErrs::ExpectedElementName);
-                        return 0;
+                        fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
                     }
-
-                    //
-                    //  Create a leaf node for it. If we can find the element
-                    //  id for this element, then use it. Else, we have to
-                    //  fault in an element decl, marked as created because
-                    //  of being in a content model.
-                    //
-                    XMLElementDecl* decl = fDTDGrammar->getElemDecl(fEmptyNamespaceId, 0, bufToUse.getRawBuffer(), Grammar::TOP_LEVEL_SCOPE);
-                    if (!decl)
+                     else
                     {
-                        decl = new (fGrammarPoolMemoryManager) DTDElementDecl
+                        fScanner->emitError
                         (
-                            bufToUse.getRawBuffer()
-                            , fEmptyNamespaceId
-                            , DTDElementDecl::Any
-                            , fGrammarPoolMemoryManager
+                            XMLErrs::ExpectedSeqOrCloseParen
+                            , elemDecl.getFullName()
                         );
                         decl->setCreateReason(XMLElementDecl::InContentModel);
                         decl->setExternalElemDeclaration(isReadingExternalEntity());
                         fDTDGrammar->putElemDecl(decl);
-                    }
+                    }                
+                    return 0;
+                }
+            }
+        }
 
-                    ContentSpecNode* tmpLeaf = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        decl->getElementName()
-                        , fGrammarPoolMemoryManager
-                    );
+        //
+        //  We saw the terminating parenthesis so lets check for any repetition
+        //  character, and create a node for that, making the head node the child
+        //  of it.
+        //
+        const XMLCh repCh = fReaderMgr->peekNextChar();
+        curNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
+        if (curNode != headNode)
+            fReaderMgr->getNextChar();
 
-                    // Check for a repetition character after the leaf
-                    const XMLCh repCh = fReaderMgr->peekNextChar();
-                    ContentSpecNode* tmpLeaf2 = makeRepNode(repCh, tmpLeaf, fGrammarPoolMemoryManager);
-                    if (tmpLeaf != tmpLeaf2)
-                        fReaderMgr->getNextChar();
+        // prepare for recursion
+        if(arrNestedDecl==NULL)
+            break;
+        else
+        {
+            // If that failed, no need to go further, return failure
+            if (!curNode)
+                return 0;
 
-                    //
-                    //  Create a new sequence or choice node, with the leaf
-                    //  (or rep surrounding it) we just got as its first node.
-                    //  Make the new node the second node of the current node,
-                    //  and then make it the current node.
-                    //
-                    ContentSpecNode* newCur = new (fGrammarPoolMemoryManager) ContentSpecNode
-                    (
-                        curType
-                        , tmpLeaf2
-                        , 0
-                        , true
-                        , true
-                        , fGrammarPoolMemoryManager
-                    );
-                    curNode->setSecond(newCur);
-                    lastNode = curNode;
-                    curNode = newCur;
-                }
-            }
-             else
+            const XMLSize_t curReader = arrNestedDecl->pop();
+            if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always)
+                fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE);
+
+            if(arrNestedDecl->empty())
             {
-                // Cannot be valid
-                delete headNode;  // emitError may do a throw so need to clean-up first
-                if (opCh == chComma)
-                {
-                    fScanner->emitError(XMLErrs::ExpectedChoiceOrCloseParen);
-                }
-                 else
-                {
-                    fScanner->emitError
-                    (
-                        XMLErrs::ExpectedSeqOrCloseParen
-                        , elemDecl.getFullName()
-                    );
-                }                
-                return 0;
+                delete arrNestedDecl;
+                arrNestedDecl=NULL;
             }
         }
     }
 
-    //
-    //  We saw the terminating parenthesis so lets check for any repetition
-    //  character, and create a node for that, making the head node the child
-    //  of it.
-    //
-    XMLCh repCh = fReaderMgr->peekNextChar();
-    ContentSpecNode* retNode = makeRepNode(repCh, headNode, fGrammarPoolMemoryManager);
-    if (retNode != headNode)
-        fReaderMgr->getNextChar();
-
-    return retNode;
+    return curNode;
 }
 
 


Index: xerces-c27.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c27/F-10/xerces-c27.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xerces-c27.spec	4 Jun 2008 19:37:41 -0000	1.2
+++ xerces-c27.spec	6 Aug 2009 14:39:36 -0000	1.3
@@ -1,11 +1,12 @@
 Summary:	Validating XML Parser
-Name: 		xerces-c27
-Version: 	2.7.0
-Release:	5%{?dist}
+Name:		xerces-c27
+Version:	2.7.0
+Release:	8%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
-URL: 		http://xml.apache.org/xerces-c/
-Source:         http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+URL:		http://xml.apache.org/xerces-c/
+Source0:        http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+Patch0:		xerces-c--CVE-2009-1885.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,10 +21,10 @@ Note that this package contains Xerces-C
 applications that cannot use a newer version.
 
 
-%package 	devel
-Summary: 	Header files, libraries and development documentation for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
+%package	devel
+Summary:	Header files, libraries and development documentation for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -56,6 +57,8 @@ for i in feedback.xml migration.xml rele
 	};
 done;
 
+%patch0 -p0 -b .CVE-2009-1885
+
 
 %build
 export XERCESCROOT="$PWD"
@@ -125,6 +128,15 @@ mv $RPM_BUILD_ROOT%{_includedir}/xercesc
 
 
 %changelog
+* Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
+- Fix CVE-2009-1885
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jun 04 2008 Xavier Bachelot <xavier at bachelot.org> - 2.7.0-5
 - Fix Source: url.
 



From mtasaka at fedoraproject.org  Thu Aug  6 14:54:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  6 Aug 2009 14:54:44 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.386, 1.387 jd.spec, 1.448, 1.449 sources,
	1.387, 1.388
Message-ID: <20090806145444.6244511C02C6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- .cvsignore	5 Aug 2009 10:19:56 -0000	1.386
+++ .cvsignore	6 Aug 2009 14:54:44 -0000	1.387
@@ -1 +1 @@
-jd-2.4.2-svn3017_trunk.tgz
+jd-2.4.2-beta090806.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -p -r1.448 -r1.449
--- jd.spec	5 Aug 2009 10:19:56 -0000	1.448
+++ jd.spec	6 Aug 2009 14:54:44 -0000	1.449
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3017_trunk
-%define         repoid        41293
+%define         strtag        beta090806
+%define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3017
+* 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
 
 * 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/F-11/sources,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- sources	5 Aug 2009 10:19:56 -0000	1.387
+++ sources	6 Aug 2009 14:54:44 -0000	1.388
@@ -1 +1 @@
-a13668a4a8ecd321f93e36808913fb73  jd-2.4.2-svn3017_trunk.tgz
+b6960e2962ffc9ea0382073a2f2046e4  jd-2.4.2-beta090806.tgz



From mtasaka at fedoraproject.org  Thu Aug  6 14:54:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  6 Aug 2009 14:54:44 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.392, 1.393 jd.spec, 1.452, 1.453 sources,
	1.393, 1.394
Message-ID: <20090806145444.3ECFB11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- .cvsignore	5 Aug 2009 10:19:55 -0000	1.392
+++ .cvsignore	6 Aug 2009 14:54:43 -0000	1.393
@@ -1 +1 @@
-jd-2.4.2-svn3017_trunk.tgz
+jd-2.4.2-beta090806.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -p -r1.452 -r1.453
--- jd.spec	5 Aug 2009 10:19:55 -0000	1.452
+++ jd.spec	6 Aug 2009 14:54:43 -0000	1.453
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3017_trunk
-%define         repoid        41293
+%define         strtag        beta090806
+%define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3017
+* 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
 
 * 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/F-10/sources,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- sources	5 Aug 2009 10:19:56 -0000	1.393
+++ sources	6 Aug 2009 14:54:44 -0000	1.394
@@ -1 +1 @@
-a13668a4a8ecd321f93e36808913fb73  jd-2.4.2-svn3017_trunk.tgz
+b6960e2962ffc9ea0382073a2f2046e4  jd-2.4.2-beta090806.tgz



From mtasaka at fedoraproject.org  Thu Aug  6 14:54:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  6 Aug 2009 14:54:44 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.385, 1.386 jd.spec, 1.448, 1.449 sources,
	1.386, 1.387
Message-ID: <20090806145444.9BC8C11C0349@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- .cvsignore	5 Aug 2009 04:57:30 -0000	1.385
+++ .cvsignore	6 Aug 2009 14:54:44 -0000	1.386
@@ -1 +1 @@
-jd-2.4.2-svn3017_trunk.tgz
+jd-2.4.2-beta090806.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -p -r1.448 -r1.449
--- jd.spec	5 Aug 2009 04:57:30 -0000	1.448
+++ jd.spec	6 Aug 2009 14:54:44 -0000	1.449
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3017_trunk
-%define         repoid        41293
+%define         strtag        beta090806
+%define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -135,8 +135,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Aug  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3017
+* 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
 
 * 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.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- sources	5 Aug 2009 04:57:30 -0000	1.386
+++ sources	6 Aug 2009 14:54:44 -0000	1.387
@@ -1 +1 @@
-a13668a4a8ecd321f93e36808913fb73  jd-2.4.2-svn3017_trunk.tgz
+b6960e2962ffc9ea0382073a2f2046e4  jd-2.4.2-beta090806.tgz



From hadess at fedoraproject.org  Thu Aug  6 14:58:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  6 Aug 2009 14:58:33 +0000 (UTC)
Subject: rpms/gypsy/devel .cvsignore, 1.2, 1.3 gypsy.spec, 1.9, 1.10 sources,
	1.2, 1.3
Message-ID: <20090806145833.E7D9911C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gypsy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28376

Modified Files:
	.cvsignore gypsy.spec sources 
Log Message:
* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 0.7-1
- Update to 0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 May 2008 11:30:51 -0000	1.2
+++ .cvsignore	6 Aug 2009 14:58:33 -0000	1.3
@@ -1 +1 @@
-gypsy-0.6.tar.gz
+gypsy-0.7.tar.gz


Index: gypsy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/devel/gypsy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gypsy.spec	25 Jul 2009 01:58:35 -0000	1.9
+++ gypsy.spec	6 Aug 2009 14:58:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gypsy
-Version:        0.6
-Release:        10%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        A GPS multiplexing daemon
 
 Group:          System Environment/Libraries
@@ -10,8 +10,6 @@ URL:            http://gypsy.freedesktop
 Source0:        http://gypsy.freedesktop.org/gypsy-releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         0001-Make-gypsy-run-as-a-system-service.patch
-
 BuildRequires: bluez-libs-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -19,9 +17,6 @@ BuildRequires: glib2-devel
 BuildRequires: gtk-doc
 BuildRequires: libxslt
 
-# For patch0
-BuildRequires: automake autoconf libtool
-
 Requires: dbus
 
 %description
@@ -51,10 +46,6 @@ This package contains developer document
 %prep
 %setup -q
 
-%patch0 -p1 -b .dbus
-libtoolize -f
-autoreconf
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -91,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gypsy
 
 %changelog
+* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 0.7-1
+- Update to 0.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 May 2008 11:30:51 -0000	1.2
+++ sources	6 Aug 2009 14:58:33 -0000	1.3
@@ -1 +1 @@
-d5990275a06717dbdd00b9c372a49849  gypsy-0.6.tar.gz
+cde52c121693014efa75d9098fd7de22  gypsy-0.7.tar.gz



From pkgdb at fedoraproject.org  Thu Aug  6 15:01:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:01:44 +0000
Subject: [pkgdb] sysvinit: notting has requested watchbugzilla
Message-ID: <20090806150144.9246610F879@bastion2.fedora.phx.redhat.com>

notting has requested the watchbugzilla acl on sysvinit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:01:45 +0000
Subject: [pkgdb] sysvinit: notting has requested commit
Message-ID: <20090806150145.6700410F890@bastion2.fedora.phx.redhat.com>

notting has requested the commit acl on sysvinit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:01:46 +0000
Subject: [pkgdb] sysvinit: notting has requested approveacls
Message-ID: <20090806150146.97CDE10F89F@bastion2.fedora.phx.redhat.com>

notting has requested the approveacls acl on sysvinit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From markmc at fedoraproject.org  Thu Aug  6 15:01:50 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  6 Aug 2009 15:01:50 +0000 (UTC)
Subject: rpms/libvirt/devel
	libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch,
	NONE, 1.1 libvirt.spec, 1.163, 1.164
Message-ID: <20090806150150.0847A11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28990

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch 
Log Message:
* Thu Aug  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-2
- Make sure qemu can access kernel/initrd (bug #516034)
- Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)


libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch:
 qemu_driver.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch ---
From: Mark McLoughlin <markmc at redhat.com>
Subject: [PATCH] chown kernel/initrd before spawning qemu

If we're running qemu unprivileged, we need to chown any supplied kernel
or initrd before spawning it.

* src/qemu_driver.c: rename qemuDomainSetDiskOwnership() to
  qemuDomainSetFileOwnership(), pass it a path string instead of a disk
  definition and use it for chowning the kernel/initrd in
  qemuDomainSetAllDeviceOwnership()
---
 src/qemu_driver.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 412b68d..bd58435 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1684,18 +1684,18 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn,
 
 }
 
-static int qemuDomainSetDiskOwnership(virConnectPtr conn,
-                                      virDomainDiskDefPtr def,
+static int qemuDomainSetFileOwnership(virConnectPtr conn,
+                                      const char *path,
                                       uid_t uid, gid_t gid)
 {
 
-    if (!def->src)
+    if (!path)
         return 0;
 
-    VIR_DEBUG("Setting ownership on %s to %d:%d", def->src, uid, gid);
-    if (chown(def->src, uid, gid) < 0) {
+    VIR_DEBUG("Setting ownership on %s to %d:%d", path, uid, gid);
+    if (chown(path, uid, gid) < 0) {
         virReportSystemError(conn, errno, _("cannot set ownership on %s"),
-                             def->src);
+                             path);
         return -1;
     }
     return 0;
@@ -1725,7 +1725,7 @@ static int qemuDomainSetDeviceOwnership(virConnectPtr conn,
             (def->data.disk->readonly || def->data.disk->shared))
             return 0;
 
-        return qemuDomainSetDiskOwnership(conn, def->data.disk, uid, gid);
+        return qemuDomainSetFileOwnership(conn, def->data.disk->src, uid, gid);
 
     case VIR_DOMAIN_DEVICE_HOSTDEV:
         return qemuDomainSetHostdevOwnership(conn, def->data.hostdev, uid, gid);
@@ -1753,12 +1753,16 @@ static int qemuDomainSetAllDeviceOwnership(virConnectPtr conn,
     uid = restore ? 0 : driver->user;
     gid = restore ? 0 : driver->group;
 
+    if (qemuDomainSetFileOwnership(conn, def->os.kernel, uid, gid) < 0 ||
+        qemuDomainSetFileOwnership(conn, def->os.initrd, uid, gid) < 0)
+        return -1;
+
     for (i = 0 ; i < def->ndisks ; i++) {
         if (restore &&
             (def->disks[i]->readonly || def->disks[i]->shared))
             continue;
 
-        if (qemuDomainSetDiskOwnership(conn, def->disks[i], uid, gid) < 0)
+        if (qemuDomainSetFileOwnership(conn, def->disks[i]->src, uid, gid) < 0)
             return -1;
     }
 
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- libvirt.spec	5 Aug 2009 15:24:45 -0000	1.163
+++ libvirt.spec	6 Aug 2009 15:01:49 -0000	1.164
@@ -78,11 +78,14 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 
+# Make sure qemu can access kernel/initrd (bug #516034)
+Patch01: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
+
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
 Patch200: libvirt-0.6.4-svirt-sound.patch
@@ -252,6 +255,8 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
+%patch01 -p1
+
 %patch200 -p0
 
 %build
@@ -497,7 +502,7 @@ fi
 
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
 %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
 
 %if %{with_qemu}
@@ -612,7 +617,11 @@ fi
 %endif
 
 %changelog
-* Wed Aug  5 2009 Daniel Veillard <veillard at redhat.com> - 0.7.0-1.fc12
+* Thu Aug  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-2
+- Make sure qemu can access kernel/initrd (bug #516034)
+- Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)
+
+* Wed Aug  5 2009 Daniel Veillard <veillard at redhat.com> - 0.7.0-1
 - Upstream release of 0.7.0
 - ESX, VBox3, Power Hypervisor drivers
 - new net filesystem glusterfs



From pkgdb at fedoraproject.org  Thu Aug  6 15:01:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:01:47 +0000
Subject: [pkgdb] sysvinit: notting has requested watchcommits
Message-ID: <20090806150147.B9FF510F8A1@bastion2.fedora.phx.redhat.com>

notting has requested the watchcommits acl on sysvinit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:02:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:02:23 +0000
Subject: [pkgdb] sysvinit had acl change status
Message-ID: <20090806150223.EA27610F879@bastion2.fedora.phx.redhat.com>

notting has set the watchbugzilla acl on sysvinit (Fedora devel) to Approved for notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:02:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:02:26 +0000
Subject: [pkgdb] sysvinit had acl change status
Message-ID: <20090806150226.44AB510F890@bastion2.fedora.phx.redhat.com>

notting has set the watchcommits acl on sysvinit (Fedora devel) to Approved for notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:02:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:02:28 +0000
Subject: [pkgdb] sysvinit had acl change status
Message-ID: <20090806150229.0056F10F8A0@bastion2.fedora.phx.redhat.com>

notting has set the commit acl on sysvinit (Fedora devel) to Approved for notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:02:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:02:30 +0000
Subject: [pkgdb] sysvinit had acl change status
Message-ID: <20090806150230.B003A10F8A1@bastion2.fedora.phx.redhat.com>

notting has set the approveacls acl on sysvinit (Fedora devel) to Approved for notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:03:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:03:45 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150345.16CF710F879@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora devel is now owned by notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:03:53 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150353.94DA710F899@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora 10 was orphaned by notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:03:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:03:57 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150357.ED5A210F8AC@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora 11 was orphaned by notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:04:03 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150403.8C0F310F8A1@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora devel is now owned by notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:04:44 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150445.2381710F8A9@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora devel is now owned by notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:05:09 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150511.B800310F8B2@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora devel is now owned by notting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:05:39 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150539.E744510F899@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora 10 is now owned by plautrba

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:06:02 +0000
Subject: [pkgdb] sysvinit ownership updated
Message-ID: <20090806150603.0E5ED10F879@bastion2.fedora.phx.redhat.com>

Package sysvinit in Fedora 11 is now owned by plautrba

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From pkgdb at fedoraproject.org  Thu Aug  6 15:07:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 15:07:50 +0000
Subject: [pkgdb] sysvinit (Fedora, devel) updated by notting
Message-ID: <20090806150750.5BDB710F879@bastion2.fedora.phx.redhat.com>

notting changed owner of sysvinit in Fedora devel to plautrba

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sysvinit



From harald at fedoraproject.org  Thu Aug  6 15:13:34 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  6 Aug 2009 15:13:34 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.5, 1.6 dracut.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090806151335.089A611C00E4@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32013

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
- version 0.8 
- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Jul 2009 09:11:39 -0000	1.5
+++ .cvsignore	6 Aug 2009 15:13:34 -0000	1.6
@@ -1 +1 @@
-dracut-0.7.tar.bz2
+dracut-0.8.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dracut.spec	3 Aug 2009 18:27:50 -0000	1.10
+++ dracut.spec	6 Aug 2009 15:13:34 -0000	1.11
@@ -12,8 +12,8 @@
 %endif
 
 Name: dracut
-Version: 0.7
-Release: 4%{?rdist}
+Version: 0.8
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -22,17 +22,18 @@ Source0: dracut-%{version}%{?dashgittag}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
-Requires: module-init-tools
+Requires: module-init-tools >= 3.7-9
 Requires: cpio
 Requires: coreutils
 Requires: findutils
 Requires: binutils
 Requires: grep
 Requires: which
+Requires: mktemp >= 1.5-5
 Requires: mount
 Requires: bash
 Requires: /bin/sh 
-Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils
+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
@@ -82,12 +83,10 @@ kernel modules and firmware files needed
 
 %package tools
 Summary: dracut tools to build the local initramfs
-Requires: %{name} = %{version}-%{release}
-Requires: ql2100-firmware
-Requires: ql2200-firmware
-Requires: ql23xx-firmware
-Requires: ql2400-firmware
-Requires: ql2500-firmware
+Requires: coreutils cryptsetup-luks device-mapper
+Requires: diffutils dmraid findutils gawk grep lvm2
+Requires: module-init-tools sed
+Requires: cpio gzip
 
 %description tools
 This package contains tools to assemble the local initrd and host configuration.
@@ -144,26 +143,29 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
-* Mon Aug 03 2009 Warren Togami <wtogami at redhat.com> 0.7-4
-- require which, file, bzip2
-
-* Sun Jul 26 2009 Harald Hoyer <harald at redhat.com> 0.7-1
-- build without /sbin/switch_root
+* Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
+- version 0.8 
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 24 2009 Harald Hoyer <harald at redhat.com> 0.7-1
 - version 0.7
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 22 2009 Harald Hoyer <harald at redhat.com> 0.6-1
 - version 0.6
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 17 2009 Harald Hoyer <harald at redhat.com> 0.5-1
 - version 0.5
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Sat Jul 04 2009 Harald Hoyer <harald at redhat.com> 0.4-1
 - version 0.4
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Thu Jul 02 2009 Harald Hoyer <harald at redhat.com> 0.3-1
 - version 0.3
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 01 2009 Harald Hoyer <harald at redhat.com> 0.2-1
 - version 0.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Jul 2009 09:11:39 -0000	1.6
+++ sources	6 Aug 2009 15:13:34 -0000	1.7
@@ -1 +1 @@
-01687a7dd7d56f63b0bf3dfd6fd60d9e  dracut-0.7.tar.bz2
+ee98470ff5b7f3a288573632c07e9cb6  dracut-0.8.tar.bz2



From stransky at fedoraproject.org  Thu Aug  6 15:24:41 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  6 Aug 2009 15:24:41 +0000 (UTC)
Subject: rpms/firefox/devel firefox.spec,1.336,1.337
Message-ID: <20090806152441.0AC2411C00E4@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1457

Modified Files:
	firefox.spec 
Log Message:
Rebuilt


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -p -r1.336 -r1.337
--- firefox.spec	6 Aug 2009 13:10:16 -0000	1.336
+++ firefox.spec	6 Aug 2009 15:24:40 -0000	1.337
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.2
+%define xulrunner_version 1.9.1.2-2
 %define internal_version %{version}
 
 %define official_branding    1
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -329,6 +329,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-3
+- Rebuilt
+
 * Thu Aug 6 2009 Martin Stransky <stransky at redhat.com> - 3.5.2-2
 - Fix for #437596 - Firefox needs to register proper name
   for session restore.



From jjames at fedoraproject.org  Thu Aug  6 15:29:07 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu,  6 Aug 2009 15:29:07 +0000 (UTC)
Subject: rpms/check/F-10 check.spec,1.11,1.12
Message-ID: <20090806152907.7A49E11C00E4@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2146/F-10

Modified Files:
	check.spec 
Log Message:
* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-5
- Support --excludedocs (bz 515933)
- Replace broken upstream info dir entry



Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/check.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- check.spec	7 Apr 2009 15:03:13 -0000	1.11
+++ check.spec	6 Aug 2009 15:29:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           check
 Version:        0.9.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 # This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
@@ -56,13 +56,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -e %{_infodir}/%{name}.info* ]; then
+  /sbin/install-info \
+    --entry='* Check: (check).               A unit testing framework for C.' \
+    %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %postun -p /sbin/ldconfig
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ $1 = 0 -a -e %{_infodir}/%{name}.info* ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
 %files
@@ -86,6 +90,10 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
+- Support --excludedocs (bz 515933)
+- Replace broken upstream info dir entry
+
 * Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-2
 - Add check-0.9.6-strdup.patch
 



From jjames at fedoraproject.org  Thu Aug  6 15:29:07 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu,  6 Aug 2009 15:29:07 +0000 (UTC)
Subject: rpms/check/F-11 check.spec,1.12,1.13
Message-ID: <20090806152907.9BA0C11C02C6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2146/F-11

Modified Files:
	check.spec 
Log Message:
* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-5
- Support --excludedocs (bz 515933)
- Replace broken upstream info dir entry



Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-11/check.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- check.spec	7 Apr 2009 15:03:14 -0000	1.12
+++ check.spec	6 Aug 2009 15:29:07 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           check
 Version:        0.9.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 # This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
@@ -56,13 +56,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -e %{_infodir}/%{name}.info* ]; then
+  /sbin/install-info \
+    --entry='* Check: (check).               A unit testing framework for C.' \
+    %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %postun -p /sbin/ldconfig
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ $1 = 0 -a -e %{_infodir}/%{name}.info* ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
 %files
@@ -86,6 +90,10 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-4
+- Support --excludedocs (bz 515933)
+- Replace broken upstream info dir entry
+
 * Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
 - Add check-0.9.6-strdup.patch
 



From jjames at fedoraproject.org  Thu Aug  6 15:29:07 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu,  6 Aug 2009 15:29:07 +0000 (UTC)
Subject: rpms/check/devel check.spec,1.13,1.14
Message-ID: <20090806152907.C3A1E11C034A@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/check/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2146/devel

Modified Files:
	check.spec 
Log Message:
* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-5
- Support --excludedocs (bz 515933)
- Replace broken upstream info dir entry



Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/check.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- check.spec	24 Jul 2009 18:51:31 -0000	1.13
+++ check.spec	6 Aug 2009 15:29:07 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           check
 Version:        0.9.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 # This patch fixes debian bug 519597: use of -ansi conflicts with strdup()
@@ -56,13 +56,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -e %{_infodir}/%{name}.info* ]; then
+  /sbin/install-info \
+    --entry='* Check: (check).               A unit testing framework for C.' \
+    %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %postun -p /sbin/ldconfig
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ $1 = 0 -a -e %{_infodir}/%{name}.info* ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
 %files
@@ -86,6 +90,10 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-5
+- Support --excludedocs (bz 515933)
+- Replace broken upstream info dir entry
+
 * 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
 



From harald at fedoraproject.org  Thu Aug  6 15:35:48 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  6 Aug 2009 15:35:48 +0000 (UTC)
Subject: rpms/dracut/F-11 .cvsignore, 1.6, 1.7 dracut.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090806153548.5B7A011C00E4@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3629

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
- version 0.8 
- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Jul 2009 09:12:35 -0000	1.6
+++ .cvsignore	6 Aug 2009 15:35:48 -0000	1.7
@@ -1 +1 @@
-dracut-0.7.tar.bz2
+dracut-0.8.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dracut.spec	25 Jul 2009 09:12:35 -0000	1.5
+++ dracut.spec	6 Aug 2009 15:35:48 -0000	1.6
@@ -1,7 +1,7 @@
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
-%define with_switch_root 1
+%define with_switch_root 0
 %endif
 
 %if %{defined gittag}
@@ -12,7 +12,7 @@
 %endif
 
 Name: dracut
-Version: 0.7
+Version: 0.8
 Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
@@ -22,30 +22,33 @@ Source0: dracut-%{version}%{?dashgittag}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
-Requires: module-init-tools
+Requires: module-init-tools >= 3.7-9
 Requires: cpio
 Requires: coreutils
 Requires: findutils
 Requires: binutils
 Requires: grep
-Requires: mktemp
+Requires: which
+Requires: mktemp >= 1.5-5
 Requires: mount
 Requires: bash
 Requires: /bin/sh 
-Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils
+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: cryptsetup-luks
 Requires: bridge-utils
+Requires: file
+Requires: bzip2
 %ifnarch s390 s390x
 Requires: dmraid
 Requires: kbd
 %endif
 
 %if ! 0%{?with_switch_root}
-Requires: /sbin/switch_root
+Requires: util-linux-ng >= 2.16
 BuildArch: noarch
 %endif
 
@@ -80,12 +83,10 @@ kernel modules and firmware files needed
 
 %package tools
 Summary: dracut tools to build the local initramfs
-Requires: %{name} = %{version}-%{release}
-Requires: ql2100-firmware
-Requires: ql2200-firmware
-Requires: ql23xx-firmware
-Requires: ql2400-firmware
-Requires: ql2500-firmware
+Requires: coreutils cryptsetup-luks device-mapper
+Requires: diffutils dmraid findutils gawk grep lvm2
+Requires: module-init-tools sed
+Requires: cpio gzip
 
 %description tools
 This package contains tools to assemble the local initrd and host configuration.
@@ -142,20 +143,29 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
+- version 0.8 
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+
 * Fri Jul 24 2009 Harald Hoyer <harald at redhat.com> 0.7-1
 - version 0.7
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 22 2009 Harald Hoyer <harald at redhat.com> 0.6-1
 - version 0.6
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Fri Jul 17 2009 Harald Hoyer <harald at redhat.com> 0.5-1
 - version 0.5
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Sat Jul 04 2009 Harald Hoyer <harald at redhat.com> 0.4-1
 - version 0.4
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Thu Jul 02 2009 Harald Hoyer <harald at redhat.com> 0.3-1
 - version 0.3
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
 
 * Wed Jul 01 2009 Harald Hoyer <harald at redhat.com> 0.2-1
 - version 0.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Jul 2009 09:12:35 -0000	1.6
+++ sources	6 Aug 2009 15:35:48 -0000	1.7
@@ -1 +1 @@
-01687a7dd7d56f63b0bf3dfd6fd60d9e  dracut-0.7.tar.bz2
+ee98470ff5b7f3a288573632c07e9cb6  dracut-0.8.tar.bz2



From pbrobinson at fedoraproject.org  Thu Aug  6 15:45:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  6 Aug 2009 15:45:48 +0000 (UTC)
Subject: rpms/gypsy/F-11 .cvsignore, 1.2, 1.3 gypsy.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <20090806154548.17EF111C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gypsy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6000

Modified Files:
	.cvsignore gypsy.spec sources 
Log Message:
- Update to 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 May 2008 11:30:51 -0000	1.2
+++ .cvsignore	6 Aug 2009 15:45:47 -0000	1.3
@@ -1 +1 @@
-gypsy-0.6.tar.gz
+gypsy-0.7.tar.gz


Index: gypsy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-11/gypsy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gypsy.spec	19 Jun 2009 12:41:36 -0000	1.8
+++ gypsy.spec	6 Aug 2009 15:45:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gypsy
-Version:        0.6
-Release:        9%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        A GPS multiplexing daemon
 
 Group:          System Environment/Libraries
@@ -10,8 +10,6 @@ URL:            http://gypsy.freedesktop
 Source0:        http://gypsy.freedesktop.org/gypsy-releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         0001-Make-gypsy-run-as-a-system-service.patch
-
 BuildRequires: bluez-libs-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -19,9 +17,6 @@ BuildRequires: glib2-devel
 BuildRequires: gtk-doc
 BuildRequires: libxslt
 
-# For patch0
-BuildRequires: automake autoconf libtool
-
 Requires: dbus
 
 %description
@@ -51,10 +46,6 @@ This package contains developer document
 %prep
 %setup -q
 
-%patch0 -p1 -b .dbus
-libtoolize -f
-autoreconf
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -91,6 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gypsy
 
 %changelog
+* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 0.7-1
+- Update to 0.7
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.6-9
 - Gypsy is supposed to run as a system service, as root
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 May 2008 11:30:51 -0000	1.2
+++ sources	6 Aug 2009 15:45:47 -0000	1.3
@@ -1 +1 @@
-d5990275a06717dbdd00b9c372a49849  gypsy-0.6.tar.gz
+cde52c121693014efa75d9098fd7de22  gypsy-0.7.tar.gz



From xhorak at fedoraproject.org  Thu Aug  6 15:51:29 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 15:51:29 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.31,1.32
Message-ID: <20090806155129.4B14511C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7146

Modified Files:
	blam.spec 
Log Message:
* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- blam.spec	4 Aug 2009 08:52:31 -0000	1.31
+++ blam.spec	6 Aug 2009 15:51:29 -0000	1.32
@@ -5,7 +5,7 @@
 
 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
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
 - Rebuild against newer gecko
 



From akurtakov at fedoraproject.org  Thu Aug  6 15:57:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  6 Aug 2009 15:57:33 +0000 (UTC)
Subject: rpms/eclipse/devel sources,1.75,1.76 eclipse.spec,1.653,1.654
Message-ID: <20090806155733.86B4811C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8432/devel

Modified Files:
	sources eclipse.spec 
Log Message:
Fix missing launcher for ppc64.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	3 Aug 2009 15:29:56 -0000	1.75
+++ sources	6 Aug 2009 15:57:33 -0000	1.76
@@ -5,4 +5,4 @@ e1313563c7e36aa46e33789a1386b815  eclips
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
 047b352b07b04f7f8e96afb81e69862c  eclipse-build-generatedScripts.tar.bz2
-5f22063a596f9b5aa6295d0df20d8c62  eclipse-build-R0_0_2_1.tar.gz
+fed4220be8e4db0743365cfadac65d2e  eclipse-build-R0_0_2_1.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -p -r1.653 -r1.654
--- eclipse.spec	5 Aug 2009 18:38:10 -0000	1.653
+++ eclipse.spec	6 Aug 2009 15:57:33 -0000	1.654
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.32%{?dist}
+Release:        0.3.33%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -393,10 +393,6 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 %patch31 -p1
 %patch38
 
-# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
-sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
-  features/org.eclipse.equinox.executable/target.build.xml
-
 # 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
@@ -422,6 +418,7 @@ IFS='
   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/%{_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
@@ -1493,6 +1490,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Aug 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.33
+- Fix missing launcher for ppc64.
+
 * Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.32
 - Manually enable o.e.core.runtime and o.e.equinox.ds because it's not enabled on ppc64.
 



From pbrobinson at fedoraproject.org  Thu Aug  6 15:59:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  6 Aug 2009 15:59:47 +0000 (UTC)
Subject: rpms/gypsy/F-10 .cvsignore, 1.2, 1.3 gypsy.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090806155947.740FE11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gypsy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8901

Modified Files:
	.cvsignore gypsy.spec sources 
Log Message:
- Update to 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 May 2008 11:30:51 -0000	1.2
+++ .cvsignore	6 Aug 2009 15:59:47 -0000	1.3
@@ -1 +1 @@
-gypsy-0.6.tar.gz
+gypsy-0.7.tar.gz


Index: gypsy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-10/gypsy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gypsy.spec	21 Jun 2009 15:59:20 -0000	1.3
+++ gypsy.spec	6 Aug 2009 15:59:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gypsy
-Version:        0.6
-Release:        9%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        A GPS multiplexing daemon
 
 Group:          System Environment/Libraries
@@ -10,8 +10,6 @@ URL:            http://gypsy.freedesktop
 Source0:        http://gypsy.freedesktop.org/gypsy-releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         0001-Make-gypsy-run-as-a-system-service.patch
-
 BuildRequires: bluez-libs-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -19,9 +17,6 @@ BuildRequires: glib2-devel
 BuildRequires: gtk-doc
 BuildRequires: libxslt
 
-# For patch0
-BuildRequires: automake autoconf libtool
-
 Requires: dbus
 
 %description
@@ -51,10 +46,6 @@ This package contains developer document
 %prep
 %setup -q
 
-%patch0 -p1 -b .dbus
-libtoolize -f
-autoreconf
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -91,6 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gypsy
 
 %changelog
+* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 0.7-1
+- Update to 0.7
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.6-9
 - Gypsy is supposed to run as a system service, as root
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 May 2008 11:30:51 -0000	1.2
+++ sources	6 Aug 2009 15:59:47 -0000	1.3
@@ -1 +1 @@
-d5990275a06717dbdd00b9c372a49849  gypsy-0.6.tar.gz
+cde52c121693014efa75d9098fd7de22  gypsy-0.7.tar.gz



From rjones at fedoraproject.org  Thu Aug  6 16:15:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 16:15:10 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.44, 1.45 libguestfs.spec, 1.82, 
	1.83 sources, 1.44, 1.45
Message-ID: <20090806161510.2C85111C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11790

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.66


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	29 Jul 2009 15:40:16 -0000	1.44
+++ .cvsignore	6 Aug 2009 16:15:09 -0000	1.45
@@ -1 +1 @@
-libguestfs-1.0.65.tar.gz
+libguestfs-1.0.66.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- libguestfs.spec	29 Jul 2009 15:40:16 -0000	1.82
+++ libguestfs.spec	6 Aug 2009 16:15:09 -0000	1.83
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.65
+Version:     1.0.66
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -339,7 +339,7 @@ export LIBGUESTFS_DEBUG=1
 # 503236   i386         F-12   cryptomgr_test at doublefault_fn
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu (FIXED)
-# -        ?            F-12   qemu TCG on Xen is broken again
+# 516022   all          F-12   virtio-net gives "Network is unreachable" errors
 
 #%ifarch x86_64
 #make check
@@ -537,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
+- New upstream release 1.0.66.
+
 * Wed Jul 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.65-1
 - New upstream release 1.0.65.
 - Add Obsoletes for virt-df2 (RHBZ#514309).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	29 Jul 2009 15:40:16 -0000	1.44
+++ sources	6 Aug 2009 16:15:09 -0000	1.45
@@ -1 +1 @@
-ac72d1b46d9a78c6d2dc3439fcc0784d  libguestfs-1.0.65.tar.gz
+385d65176732738566e9ab99898104f7  libguestfs-1.0.66.tar.gz



From rjones at fedoraproject.org  Thu Aug  6 16:15:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 16:15:12 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.31, 1.32 libguestfs.spec, 1.50, 
	1.51 sources, 1.31, 1.32
Message-ID: <20090806161512.377EB11C034A@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11812

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.66


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	29 Jul 2009 15:40:31 -0000	1.31
+++ .cvsignore	6 Aug 2009 16:15:11 -0000	1.32
@@ -1 +1 @@
-libguestfs-1.0.65.tar.gz
+libguestfs-1.0.66.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- libguestfs.spec	29 Jul 2009 15:40:31 -0000	1.50
+++ libguestfs.spec	6 Aug 2009 16:15:11 -0000	1.51
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.65
+Version:     1.0.66
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -533,6 +533,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
+- New upstream release 1.0.66.
+
 * Wed Jul 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.65-1
 - New upstream release 1.0.65.
 - Add Obsoletes for virt-df2 (RHBZ#514309).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	29 Jul 2009 15:40:31 -0000	1.31
+++ sources	6 Aug 2009 16:15:11 -0000	1.32
@@ -1 +1 @@
-ac72d1b46d9a78c6d2dc3439fcc0784d  libguestfs-1.0.65.tar.gz
+385d65176732738566e9ab99898104f7  libguestfs-1.0.66.tar.gz



From rjones at fedoraproject.org  Thu Aug  6 16:15:18 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 16:15:18 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.25, 1.26 libguestfs.spec, 1.53, 
	1.54 sources, 1.25, 1.26
Message-ID: <20090806161518.0366011C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11828

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.66


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	29 Jul 2009 15:40:44 -0000	1.25
+++ .cvsignore	6 Aug 2009 16:15:17 -0000	1.26
@@ -1 +1 @@
-libguestfs-1.0.65.tar.gz
+libguestfs-1.0.66.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libguestfs.spec	29 Jul 2009 15:54:32 -0000	1.53
+++ libguestfs.spec	6 Aug 2009 16:15:17 -0000	1.54
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.65
+Version:     1.0.66
 Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -533,6 +533,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
+- New upstream release 1.0.66.
+
 * Wed Jul 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.65-2
 - New upstream release 1.0.65.
 - Remove RHEL 5 patch, now upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	29 Jul 2009 15:40:44 -0000	1.25
+++ sources	6 Aug 2009 16:15:17 -0000	1.26
@@ -1 +1 @@
-ac72d1b46d9a78c6d2dc3439fcc0784d  libguestfs-1.0.65.tar.gz
+385d65176732738566e9ab99898104f7  libguestfs-1.0.66.tar.gz



From rjones at fedoraproject.org  Thu Aug  6 16:20:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 16:20:49 +0000 (UTC)
Subject: rpms/ocaml-pa-do/devel ocaml-pa-do.spec,1.11,1.12
Message-ID: <20090806162049.AAB1011C00E4@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-serv12810

Modified Files:
	ocaml-pa-do.spec 
Log Message:
Force rebuild.


Index: ocaml-pa-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pa-do/devel/ocaml-pa-do.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-pa-do.spec	25 Jul 2009 20:02:24 -0000	1.11
+++ ocaml-pa-do.spec	6 Aug 2009 16:20:49 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-pa-do
 Version:        0.8.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml syntax extension for delimited overloading
 
 Group:          Development/Libraries
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 0.8.9-7
+- Force rebuild again to test FTBFS issue.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Thu Aug  6 16:22:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 16:22:42 +0000 (UTC)
Subject: rpms/collectd/devel collectd.spec,1.20,1.21
Message-ID: <20090806162242.7AEAD11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13140

Modified Files:
	collectd.spec 
Log Message:
Force rebuild.


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- collectd.spec	24 Jul 2009 19:14:20 -0000	1.20
+++ collectd.spec	6 Aug 2009 16:22:42 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -407,6 +407,9 @@ fi
 
 
 %changelog
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 4.6.2-3
+- Force rebuild to test FTBFS issue.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Thu Aug  6 16:29:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 16:29:04 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.13,1.14
Message-ID: <20090806162904.0594711C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14247

Modified Files:
	mozvoikko.spec 
Log Message:
* Thu Aug 06 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/devel/mozvoikko.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mozvoikko.spec	4 Aug 2009 08:54:23 -0000	1.13
+++ mozvoikko.spec	6 Aug 2009 16:29:03 -0000	1.14
@@ -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
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.8.rc1
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.7.rc1
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Thu Aug  6 16:30:53 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 16:30:53 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.32,1.33
Message-ID: <20090806163053.636AB11C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14719

Modified Files:
	blam.spec 
Log Message:
Rebuild


Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- blam.spec	6 Aug 2009 15:51:29 -0000	1.32
+++ blam.spec	6 Aug 2009 16:30:53 -0000	1.33
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.5
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Thu Aug  6 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-16
+- Rebuild
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Thu Aug  6 16:31:02 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 16:31:02 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed.spec,1.7,1.8
Message-ID: <20090806163102.EB3D511C00E4@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-serv14767

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Thu Aug 06 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/devel/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Gtk2-MozEmbed.spec	4 Aug 2009 09:00:14 -0000	1.7
+++ perl-Gtk2-MozEmbed.spec	6 Aug 2009 16:31:02 -0000	1.8
@@ -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
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.6
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Thu Aug  6 16:32:06 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 16:32:06 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.57,
	1.58
Message-ID: <20090806163206.D2F1311C00E4@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-serv15091

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-10
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gnome-python2-extras.spec	4 Aug 2009 09:00:58 -0000	1.57
+++ gnome-python2-extras.spec	6 Aug 2009 16:32:06 -0000	1.58
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: Additional PyGNOME Python extension modules
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-10
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-9
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Thu Aug  6 16:32:56 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 16:32:56 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.61,1.62
Message-ID: <20090806163256.C0B5F11C00E4@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15377

Modified Files:
	Miro.spec 
Log Message:
* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-3
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- Miro.spec	4 Aug 2009 09:01:54 -0000	1.61
+++ Miro.spec	6 Aug 2009 16:32:56 -0000	1.62
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-3
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-2
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Thu Aug  6 16:32:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Thu,  6 Aug 2009 16:32:49 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.26,1.27
Message-ID: <20090806163249.AE17A11C00E4@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-serv15327

Modified Files:
	gnome-web-photo.spec 
Log Message:
Rebuild


Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gnome-web-photo.spec	4 Aug 2009 08:59:15 -0000	1.26
+++ gnome-web-photo.spec	6 Aug 2009 16:32:49 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.8
-Release: 4%{?dist}
+Release: 5%{?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
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 0.8-5
+- Rebuild against newer gecko
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.8-4
 - Rebuild against newer gecko
 



From rjones at fedoraproject.org  Thu Aug  6 16:36:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 16:36:02 +0000 (UTC)
Subject: rpms/collectd/devel collectd.spec,1.21,1.22
Message-ID: <20090806163602.E220A11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16018

Modified Files:
	collectd.spec 
Log Message:
types.db file moved.


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- collectd.spec	6 Aug 2009 16:22:42 -0000	1.21
+++ collectd.spec	6 Aug 2009 16:36:02 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -308,7 +308,7 @@ fi
 %{_libdir}/collectd/vmem.so
 %{_libdir}/collectd/vserver.so
 %{_libdir}/collectd/wireless.so
-%{_libdir}/collectd/types.db
+%{_datadir}/collectd/types.db
 
 %doc AUTHORS ChangeLog COPYING INSTALL README
 %doc %{_mandir}/man1/collectd.1*
@@ -407,8 +407,9 @@ fi
 
 
 %changelog
-* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 4.6.2-3
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 4.6.2-4
 - Force rebuild to test FTBFS issue.
+- lib/collectd/types.db seems to have moved to share/collectd/types.db
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From limb at fedoraproject.org  Thu Aug  6 16:55:04 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  6 Aug 2009 16:55:04 +0000 (UTC)
Subject: rpms/vdrift/devel vdrift.spec,1.17,1.18
Message-ID: <20090806165504.E18CA11C00E4@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/vdrift/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19537

Modified Files:
	vdrift.spec 
Log Message:
Path fix.



Index: vdrift.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdrift/devel/vdrift.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vdrift.spec	27 Jul 2009 06:48:47 -0000	1.17
+++ vdrift.spec	6 Aug 2009 16:55:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name: vdrift
 Version:  20090615
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary: Driving/drift racing simulation
 
 Group: Amusements/Games 
@@ -95,7 +95,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConsc
 #make
 #cd ..
 
-CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
+CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin prefix=/usr use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
 
 %install
 rm -rf %{buildroot}
@@ -143,6 +143,9 @@ rm -rf %{buildroot}
 %{_datadir}/vdrift
 
 %changelog
+* Thu Aug 06 2009 Jon Ciesla <limb at jcomserv.net> - 20090615-3
+- Path fix, BZ 515908.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090615-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gd at fedoraproject.org  Thu Aug  6 17:00:00 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu,  6 Aug 2009 17:00:00 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.192,1.193
Message-ID: <20090806170000.8FE5211C00E4@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20358

Modified Files:
	samba.spec 
Log Message:
Fix required talloc version number
resolves: #516086

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- samba.spec	27 Jul 2009 03:46:36 -0000	1.192
+++ samba.spec	6 Aug 2009 17:00:00 -0000	1.193
@@ -1,7 +1,7 @@
-%define main_release 41
+%define main_release 42
 %define samba_version 3.4.0
 %define tdb_version 1.1.3
-%define talloc_version 1.2.0
+%define talloc_version 1.3.0
 #%define pre_release rc1
 %define pre_release %nil
 
@@ -888,6 +888,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Aug 06 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0-0.42
+- Fix required talloc version number
+- resolves: #516086
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.4.0-0.41.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gerd at fedoraproject.org  Thu Aug  6 17:01:04 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Thu,  6 Aug 2009 17:01:04 +0000 (UTC)
Subject: rpms/rakudo/devel rakudo.spec,1.3,1.4
Message-ID: <20090806170104.368BA11C00E4@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20625

Modified Files:
	rakudo.spec 
Log Message:
add man page


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rakudo.spec	5 Aug 2009 14:00:44 -0000	1.3
+++ rakudo.spec	6 Aug 2009 17:01:04 -0000	1.4
@@ -9,7 +9,7 @@ ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -19,11 +19,13 @@ Source0:        http://cloud.github.com/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# This librarys are needed while pbc_to_exe include them
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 BuildRequires:  gmp-devel
 BuildRequires:  gdbm-devel
 BuildRequires:  libicu-devel
+
 BuildRequires:  parrot >= %{parrot_version}
 BuildRequires:  parrot-devel >= %{parrot_version}
 BuildRequires:  parrot-tools >= %{parrot_version}
@@ -45,6 +47,9 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+# Creating man-page
+%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
+pod2man --section=1 --name=perl6 docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/perl6.1.gz
 
 %check
 make test
@@ -66,13 +71,17 @@ rm -rf $RPM_BUILD_ROOT
 %{par_lang_perl6}/lib/Safe.pm
 %{par_lang_perl6}/lib/Test.pm
 %{par_lang_perl6}/perl6.pbc
+%{_mandir}/man1/perl6.1.gz
 
 
 %changelog
+* Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-2
+- Add a perl6 man page
+
 * Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-1
 - Fix versioning
 - use 'ExcludeArch:ppc' for now
-- Provide full SourceURLs
+- Provide full SourceURL
 - strip binary ???
 - first .spec file created
 



From jnovy at fedoraproject.org  Thu Aug  6 17:06:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu,  6 Aug 2009 17:06:31 +0000 (UTC)
Subject: rpms/rpm/devel rpm.spec,1.357,1.358
Message-ID: <20090806170631.9CED211C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19525

Modified Files:
	rpm.spec 
Log Message:
* Thu Aug 06 2009 Jindrich Novy <jnovy at redhat.com> - 4.7.1-3
- rebuild because of the new xz



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -p -r1.357 -r1.358
--- rpm.spec	27 Jul 2009 03:12:23 -0000	1.357
+++ rpm.spec	6 Aug 2009 17:06:31 -0000	1.358
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -404,6 +404,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Aug 06 2009 Jindrich Novy <jnovy at redhat.com> - 4.7.1-3
+- rebuild because of the new xz
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jkeating at fedoraproject.org  Thu Aug  6 17:09:20 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu,  6 Aug 2009 17:09:20 +0000 (UTC)
Subject: rpms/mugshot/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE mugshot.spec, 1.44, NONE sources, 1.25, NONE
Message-ID: <20090806170920.6DA9C11C0416@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/mugshot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22028

Added Files:
	dead.package 
Removed Files:
	Makefile mugshot.spec sources 
Log Message:
kill it with fire


--- NEW FILE dead.package ---
Retired


--- Makefile DELETED ---


--- mugshot.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Thu Aug  6 17:10:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 17:10:20 +0000
Subject: [pkgdb] mugshot ownership updated
Message-ID: <20090806171020.57DD510F882@bastion2.fedora.phx.redhat.com>

Package mugshot in Fedora devel was orphaned by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mugshot



From pkgdb at fedoraproject.org  Thu Aug  6 17:10:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 17:10:20 +0000
Subject: [pkgdb] mugshot (un)retirement
Message-ID: <20090806171020.6F69910F899@bastion2.fedora.phx.redhat.com>

Package mugshot in Fedora devel has been retired by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mugshot



From jussilehtola at fedoraproject.org  Thu Aug  6 17:13:56 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  6 Aug 2009 17:13:56 +0000 (UTC)
Subject: rpms/efte/F-10 efte.spec,1.1,1.2
Message-ID: <20090806171356.1C30011C00E4@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23388/F-10

Modified Files:
	efte.spec 
Log Message:
Added Requires: xorg-x11-fonts-misc.


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-10/efte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- efte.spec	2 Jul 2009 05:30:57 -0000	1.1
+++ efte.spec	6 Aug 2009 17:13:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		efte
 Version:	1.0
-Release:	4%{?dist}
+Release:	7%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -20,6 +20,8 @@ BuildRequires:	libXpm-devel
 
 Provides:	efte(binary) = %{version}-%{release}
 Requires:	efte-common = %{version}-%{release}
+# Needed for fonts to show correctly
+Requires:	xorg-x11-fonts-misc
 
 # Branch nefte on its own since it has less dependencies
 %package -n nefte
@@ -78,6 +80,8 @@ for doc in Artistic AUTHORS COPYING HIST
 done
 # Delete version line from desktop file
 sed -i '/Version/d' packaging/shared/efte.desktop
+# Append encoding line to desktop file (necessary for EPEL)
+echo "Encoding=UTF-8" >> packaging/shared/efte.desktop
 # Remove optflags lines from cmake configs
 sed -i '/CMAKE_CXX_FLAGS/d' src/CMakeLists.txt
 
@@ -131,6 +135,15 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
+- Added Requires: xorg-x11-fonts-misc.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-5
+- Fix EPEL build.
+
 * Tue Jun 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-4
 - Fix review issues.
 - Branch nefte into an own package.



From jussilehtola at fedoraproject.org  Thu Aug  6 17:13:56 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  6 Aug 2009 17:13:56 +0000 (UTC)
Subject: rpms/efte/devel efte.spec,1.3,1.4
Message-ID: <20090806171356.64C9511C00E4@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23388/devel

Modified Files:
	efte.spec 
Log Message:
Added Requires: xorg-x11-fonts-misc.


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/devel/efte.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- efte.spec	24 Jul 2009 21:04:43 -0000	1.3
+++ efte.spec	6 Aug 2009 17:13:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		efte
 Version:	1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -20,6 +20,8 @@ BuildRequires:	libXpm-devel
 
 Provides:	efte(binary) = %{version}-%{release}
 Requires:	efte-common = %{version}-%{release}
+# Needed for fonts to show correctly
+Requires:	xorg-x11-fonts-misc
 
 # Branch nefte on its own since it has less dependencies
 %package -n nefte
@@ -133,6 +135,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
+- Added Requires: xorg-x11-fonts-misc.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jussilehtola at fedoraproject.org  Thu Aug  6 17:13:56 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  6 Aug 2009 17:13:56 +0000 (UTC)
Subject: rpms/efte/F-11 efte.spec,1.1,1.2
Message-ID: <20090806171356.300FF11C02C6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23388/F-11

Modified Files:
	efte.spec 
Log Message:
Added Requires: xorg-x11-fonts-misc.


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-11/efte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- efte.spec	2 Jul 2009 05:30:57 -0000	1.1
+++ efte.spec	6 Aug 2009 17:13:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		efte
 Version:	1.0
-Release:	4%{?dist}
+Release:	7%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -20,6 +20,8 @@ BuildRequires:	libXpm-devel
 
 Provides:	efte(binary) = %{version}-%{release}
 Requires:	efte-common = %{version}-%{release}
+# Needed for fonts to show correctly
+Requires:	xorg-x11-fonts-misc
 
 # Branch nefte on its own since it has less dependencies
 %package -n nefte
@@ -78,6 +80,8 @@ for doc in Artistic AUTHORS COPYING HIST
 done
 # Delete version line from desktop file
 sed -i '/Version/d' packaging/shared/efte.desktop
+# Append encoding line to desktop file (necessary for EPEL)
+echo "Encoding=UTF-8" >> packaging/shared/efte.desktop
 # Remove optflags lines from cmake configs
 sed -i '/CMAKE_CXX_FLAGS/d' src/CMakeLists.txt
 
@@ -131,6 +135,15 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
+- Added Requires: xorg-x11-fonts-misc.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-5
+- Fix EPEL build.
+
 * Tue Jun 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-4
 - Fix review issues.
 - Branch nefte into an own package.



From jussilehtola at fedoraproject.org  Thu Aug  6 17:14:37 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu,  6 Aug 2009 17:14:37 +0000 (UTC)
Subject: rpms/efte/EL-5 efte.spec,1.2,1.3
Message-ID: <20090806171437.16FF811C00E4@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23517/EL-5

Modified Files:
	efte.spec 
Log Message:
Added Requires: xorg-x11-fonts-misc.


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/EL-5/efte.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- efte.spec	16 Jul 2009 09:35:12 -0000	1.2
+++ efte.spec	6 Aug 2009 17:14:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		efte
 Version:	1.0
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -20,6 +20,8 @@ BuildRequires:	libXpm-devel
 
 Provides:	efte(binary) = %{version}-%{release}
 Requires:	efte-common = %{version}-%{release}
+# Needed for fonts to show correctly
+Requires:	xorg-x11-fonts-misc
 
 # Branch nefte on its own since it has less dependencies
 %package -n nefte
@@ -133,6 +135,12 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
+- Added Requires: xorg-x11-fonts-misc.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-5
 - Fix EPEL build.
 



From ricky at fedoraproject.org  Thu Aug  6 17:46:12 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Thu,  6 Aug 2009 17:46:12 +0000 (UTC)
Subject: rpms/python-fedora/EL-5 .cvsignore, 1.24, 1.25 python-fedora.spec, 
	1.27, 1.28 sources, 1.25, 1.26
Message-ID: <20090806174612.3EE2A11C00E4@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29596/EL-5

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
- New release 0.3.15.
- Relicensed to LGPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Jul 2009 02:27:12 -0000	1.24
+++ .cvsignore	6 Aug 2009 17:46:11 -0000	1.25
@@ -1 +1 @@
-python-fedora-0.3.14.tar.gz
+python-fedora-0.3.15.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- python-fedora.spec	28 Jul 2009 02:27:12 -0000	1.27
+++ python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.28
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.14
+Version:        0.3.15
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
-License:        GPLv2
+License:        LGPLv2+
 URL:            https://fedorahosted.org/python-fedora/
 Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
+- New release 0.3.15.
+- Relicensed to LGPLv2+
+
 * Mon Jul 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.14-1
 - New release 0.3.14.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	28 Jul 2009 02:27:12 -0000	1.25
+++ sources	6 Aug 2009 17:46:12 -0000	1.26
@@ -1 +1 @@
-68ad34a2b353b22d2987444943cbc69f  python-fedora-0.3.14.tar.gz
+78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz



From ricky at fedoraproject.org  Thu Aug  6 17:46:12 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Thu,  6 Aug 2009 17:46:12 +0000 (UTC)
Subject: rpms/python-fedora/devel .cvsignore, 1.34, 1.35 python-fedora.spec, 
	1.44, 1.45 sources, 1.35, 1.36
Message-ID: <20090806174612.DDAD711C00E4@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29596/devel

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
- New release 0.3.15.
- Relicensed to LGPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	28 Jul 2009 02:27:13 -0000	1.34
+++ .cvsignore	6 Aug 2009 17:46:12 -0000	1.35
@@ -1 +1 @@
-python-fedora-0.3.14.tar.gz
+python-fedora-0.3.15.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- python-fedora.spec	28 Jul 2009 02:27:13 -0000	1.44
+++ python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.45
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.14
+Version:        0.3.15
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
-License:        GPLv2
+License:        LGPLv2+
 URL:            https://fedorahosted.org/python-fedora/
 Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,12 +65,13 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
+- New release 0.3.15.
+- Relicensed to LGPLv2+
+
 * 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/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	28 Jul 2009 02:27:13 -0000	1.35
+++ sources	6 Aug 2009 17:46:12 -0000	1.36
@@ -1 +1 @@
-68ad34a2b353b22d2987444943cbc69f  python-fedora-0.3.14.tar.gz
+78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz



From ricky at fedoraproject.org  Thu Aug  6 17:46:12 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Thu,  6 Aug 2009 17:46:12 +0000 (UTC)
Subject: rpms/python-fedora/F-10 .cvsignore, 1.33, 1.34 python-fedora.spec, 
	1.37, 1.38 sources, 1.34, 1.35
Message-ID: <20090806174612.6B6F511C00E4@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29596/F-10

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
- New release 0.3.15.
- Relicensed to LGPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	28 Jul 2009 02:27:13 -0000	1.33
+++ .cvsignore	6 Aug 2009 17:46:12 -0000	1.34
@@ -1 +1 @@
-python-fedora-0.3.14.tar.gz
+python-fedora-0.3.15.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/python-fedora.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- python-fedora.spec	28 Jul 2009 02:27:13 -0000	1.37
+++ python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.38
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.14
+Version:        0.3.15
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
-License:        GPLv2
+License:        LGPLv2+
 URL:            https://fedorahosted.org/python-fedora/
 Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
+- New release 0.3.15.
+- Relicensed to LGPLv2+
+
 * Mon Jul 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.14-1
 - New release 0.3.14.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	28 Jul 2009 02:27:13 -0000	1.34
+++ sources	6 Aug 2009 17:46:12 -0000	1.35
@@ -1 +1 @@
-68ad34a2b353b22d2987444943cbc69f  python-fedora-0.3.14.tar.gz
+78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz



From ricky at fedoraproject.org  Thu Aug  6 17:46:12 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Thu,  6 Aug 2009 17:46:12 +0000 (UTC)
Subject: rpms/python-fedora/F-11 .cvsignore, 1.33, 1.34 python-fedora.spec, 
	1.43, 1.44 sources, 1.34, 1.35
Message-ID: <20090806174612.B164711C00E4@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/python-fedora/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29596/F-11

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:
* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
- New release 0.3.15.
- Relicensed to LGPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	28 Jul 2009 02:20:55 -0000	1.33
+++ .cvsignore	6 Aug 2009 17:46:12 -0000	1.34
@@ -1 +1 @@
-python-fedora-0.3.14.tar.gz
+python-fedora-0.3.15.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-11/python-fedora.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- python-fedora.spec	28 Jul 2009 02:23:43 -0000	1.43
+++ python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.44
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.14
+Version:        0.3.15
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
-License:        GPLv2
+License:        LGPLv2+
 URL:            https://fedorahosted.org/python-fedora/
 Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
+- New release 0.3.15.
+- Relicensed to LGPLv2+
+
 * Mon Jul 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.14-1
 - New release 0.3.14.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	28 Jul 2009 02:20:56 -0000	1.34
+++ sources	6 Aug 2009 17:46:12 -0000	1.35
@@ -1 +1 @@
-68ad34a2b353b22d2987444943cbc69f  python-fedora-0.3.14.tar.gz
+78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz



From ausil at fedoraproject.org  Thu Aug  6 17:46:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  6 Aug 2009 17:46:31 +0000 (UTC)
Subject: rpms/fedora-packager/devel .cvsignore, 1.10,
	1.11 fedora-packager.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20090806174631.A8FBF11C00E4@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/fedora-packager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29713

Modified Files:
	.cvsignore fedora-packager.spec sources 
Log Message:
update to 0.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	30 Jul 2009 16:03:30 -0000	1.10
+++ .cvsignore	6 Aug 2009 17:46:31 -0000	1.11
@@ -1 +1 @@
-fedora-packager-0.3.7.tar.bz2
+fedora-packager-0.3.8.tar.bz2


Index: fedora-packager.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/devel/fedora-packager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fedora-packager.spec	30 Jul 2009 16:03:30 -0000	1.13
+++ fedora-packager.spec	6 Aug 2009 17:46:31 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           fedora-packager
-Version:        0.3.7
+Version:        0.3.8
 Release:        1%{?dist}
 Summary:        Tools for setting up a fedora maintainer environment
 
@@ -14,6 +14,7 @@ Requires:       rpm-build rpmdevtools rp
 Requires:       mock cvs curl wget
 Requires:       pyOpenSSL python-pycurl
 Requires:       redhat-rpm-config
+Requires:       python-offtrac
 
 BuildArch:      noarch
 
@@ -45,10 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fedoradev-pkgowners
 %{_bindir}/fedora-cert
 %{_bindir}/fedora-getsvn
+%{_bindir}/fedora-hosted
 %{_bindir}/rpmbuild-md5
 
 
 %changelog
+* Tue Aug 04 2009 Jesse Keating <jkeating at redhat.com> - 0.3.8-1
+- Add fedora-hosted and require offtrac
+
 * Thu Jul 30 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.7-1
 - define user_cert in fedora-cvs before refrencing it 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 Jul 2009 16:03:30 -0000	1.10
+++ sources	6 Aug 2009 17:46:31 -0000	1.11
@@ -1 +1 @@
-b5c1953ee29f796679a486d11a73f5a5  fedora-packager-0.3.7.tar.bz2
+9ed5de737d99248c53e0ccb27acaa3b6  fedora-packager-0.3.8.tar.bz2



From ausil at fedoraproject.org  Thu Aug  6 17:48:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  6 Aug 2009 17:48:31 +0000 (UTC)
Subject: rpms/fedora-packager/F-11 .cvsignore, 1.9, 1.10 fedora-packager.spec,
	1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20090806174831.E8E6F11C00E4@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/fedora-packager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30119

Modified Files:
	.cvsignore fedora-packager.spec sources 
Log Message:
update to 0.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 16:15:32 -0000	1.9
+++ .cvsignore	6 Aug 2009 17:48:31 -0000	1.10
@@ -1 +1 @@
-fedora-packager-0.3.7.tar.bz2
+fedora-packager-0.3.8.tar.bz2


Index: fedora-packager.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/F-11/fedora-packager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fedora-packager.spec	30 Jul 2009 16:15:32 -0000	1.11
+++ fedora-packager.spec	6 Aug 2009 17:48:31 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           fedora-packager
-Version:        0.3.7
+Version:        0.3.8
 Release:        1%{?dist}
 Summary:        Tools for setting up a fedora maintainer environment
 
@@ -14,6 +14,7 @@ Requires:       rpm-build rpmdevtools rp
 Requires:       mock cvs curl wget
 Requires:       pyOpenSSL python-pycurl
 Requires:       redhat-rpm-config
+Requires:       python-offtrac
 
 BuildArch:      noarch
 
@@ -45,10 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fedoradev-pkgowners
 %{_bindir}/fedora-cert
 %{_bindir}/fedora-getsvn
+%{_bindir}/fedora-hosted
 %{_bindir}/rpmbuild-md5
 
 
 %changelog
+* Tue Aug 04 2009 Jesse Keating <jkeating at redhat.com> - 0.3.8-1
+- Add fedora-hosted and require offtrac
+
 * Thu Jul 30 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.7-1
 - define user_cert in fedora-cvs before refrencing it 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 Jul 2009 16:15:32 -0000	1.10
+++ sources	6 Aug 2009 17:48:31 -0000	1.11
@@ -1 +1 @@
-b5c1953ee29f796679a486d11a73f5a5  fedora-packager-0.3.7.tar.bz2
+9ed5de737d99248c53e0ccb27acaa3b6  fedora-packager-0.3.8.tar.bz2



From ausil at fedoraproject.org  Thu Aug  6 17:49:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  6 Aug 2009 17:49:23 +0000 (UTC)
Subject: rpms/fedora-packager/F-10 .cvsignore, 1.9, 1.10 fedora-packager.spec,
	1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20090806174923.778F211C00E4@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/fedora-packager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30369

Modified Files:
	.cvsignore fedora-packager.spec sources 
Log Message:
update to 0.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 16:14:12 -0000	1.9
+++ .cvsignore	6 Aug 2009 17:49:23 -0000	1.10
@@ -1 +1 @@
-fedora-packager-0.3.7.tar.bz2
+fedora-packager-0.3.8.tar.bz2


Index: fedora-packager.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/F-10/fedora-packager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-packager.spec	30 Jul 2009 16:14:13 -0000	1.10
+++ fedora-packager.spec	6 Aug 2009 17:49:23 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           fedora-packager
-Version:        0.3.7
+Version:        0.3.8
 Release:        1%{?dist}
 Summary:        Tools for setting up a fedora maintainer environment
 
@@ -14,6 +14,7 @@ Requires:       rpm-build rpmdevtools rp
 Requires:       mock cvs curl wget
 Requires:       pyOpenSSL python-pycurl
 Requires:       redhat-rpm-config
+Requires:       python-offtrac
 
 BuildArch:      noarch
 
@@ -45,10 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fedoradev-pkgowners
 %{_bindir}/fedora-cert
 %{_bindir}/fedora-getsvn
+%{_bindir}/fedora-hosted
 %{_bindir}/rpmbuild-md5
 
 
 %changelog
+* Tue Aug 04 2009 Jesse Keating <jkeating at redhat.com> - 0.3.8-1
+- Add fedora-hosted and require offtrac
+
 * Thu Jul 30 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.7-1
 - define user_cert in fedora-cvs before refrencing it 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 Jul 2009 16:14:13 -0000	1.10
+++ sources	6 Aug 2009 17:49:23 -0000	1.11
@@ -1 +1 @@
-b5c1953ee29f796679a486d11a73f5a5  fedora-packager-0.3.7.tar.bz2
+9ed5de737d99248c53e0ccb27acaa3b6  fedora-packager-0.3.8.tar.bz2



From rjones at fedoraproject.org  Thu Aug  6 17:50:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 17:50:27 +0000 (UTC)
Subject: rpms/libguestfs/EL-5
	0001-Tests-Don-t-test-block-size-in-statvfs-test.patch, NONE,
	1.1 0002-Always-pass-mkswap-f-parameter.patch, NONE,
	1.1 libguestfs.spec, 1.54, 1.55
Message-ID: <20090806175027.AEF3611C0425@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30754

Modified Files:
	libguestfs.spec 
Added Files:
	0001-Tests-Don-t-test-block-size-in-statvfs-test.patch 
	0002-Always-pass-mkswap-f-parameter.patch 
Log Message:
Incorporate upstream patches to fix some tests.

0001-Tests-Don-t-test-block-size-in-statvfs-test.patch:
 generator.ml |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE 0001-Tests-Don-t-test-block-size-in-statvfs-test.patch ---
>From a8a4ce2bd3fd021e063cb3b939b45059f07ed053 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Thu, 6 Aug 2009 18:40:59 +0100
Subject: [PATCH 1/2] Tests: Don't test block size in statvfs test.

The block size changes between kernel releases, causing
a false failure in the tests.  The error was:

test_statvfs_0: bsize was 65536, expected 131072
---
 src/generator.ml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/generator.ml b/src/generator.ml
index 7ac4ac8..8b0fc66 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -1619,8 +1619,7 @@ This is the same as the C<lstat(2)> system call.");
 
   ("statvfs", (RStruct ("statbuf", "statvfs"), [String "path"]), 54, [],
    [InitSquashFS, Always, TestOutputStruct (
-      [["statvfs"; "/"]], [CompareWithInt ("namemax", 256);
-                           CompareWithInt ("bsize", 131072)])],
+      [["statvfs"; "/"]], [CompareWithInt ("namemax", 256)])],
    "get file system statistics",
    "\
 Returns file system statistics for any mounted file system.
-- 
1.6.2.5


0002-Always-pass-mkswap-f-parameter.patch:
 swap.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0002-Always-pass-mkswap-f-parameter.patch ---
>From 530a90d3d4d7d107f52ac8db90fdb86c4f3e1737 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Thu, 6 Aug 2009 18:46:57 +0100
Subject: [PATCH 2/2] Always pass mkswap -f parameter.

Otherwise mkswap will give a silly error if you ask it to
swap on a whole device.
---
 daemon/swap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/swap.c b/daemon/swap.c
index db93e57..3ebdef6 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -34,9 +34,9 @@ mkswap (char *device, const char *flag, const char *value)
   int r;
 
   if (!flag)
-    r = command (NULL, &err, "/sbin/mkswap", device, NULL);
+    r = command (NULL, &err, "/sbin/mkswap", "-f", device, NULL);
   else
-    r = command (NULL, &err, "/sbin/mkswap", flag, value, device, NULL);
+    r = command (NULL, &err, "/sbin/mkswap", "-f", flag, value, device, NULL);
 
   if (r == -1) {
     reply_with_error ("mkswap: %s", err);
-- 
1.6.2.5



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libguestfs.spec	6 Aug 2009 16:15:17 -0000	1.54
+++ libguestfs.spec	6 Aug 2009 17:50:27 -0000	1.55
@@ -5,13 +5,16 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     2%{?dist}
+Release:     3%{?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
 
+Patch0:      0001-Tests-Don-t-test-block-size-in-statvfs-test.patch
+Patch1:      0002-Always-pass-mkswap-f-parameter.patch
+
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -306,6 +309,9 @@ Requires:    jpackage-utils
 
 mkdir -p daemon/m4
 
+%patch0 -p1
+%patch1 -p1
+
 
 %build
 %if %{buildnonet}
@@ -533,8 +539,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-3
 - New upstream release 1.0.66.
+- Incorporate upstream patches to fix some tests.
 
 * Wed Jul 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.65-2
 - New upstream release 1.0.65.



From ausil at fedoraproject.org  Thu Aug  6 17:50:58 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  6 Aug 2009 17:50:58 +0000 (UTC)
Subject: rpms/fedora-packager/EL-5 .cvsignore, 1.7, 1.8 fedora-packager.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20090806175058.CC8BB11C00E4@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/fedora-packager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30917

Modified Files:
	.cvsignore fedora-packager.spec sources 
Log Message:
update to 0.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	30 Jul 2009 16:13:24 -0000	1.7
+++ .cvsignore	6 Aug 2009 17:50:58 -0000	1.8
@@ -1 +1 @@
-fedora-packager-0.3.7.tar.bz2
+fedora-packager-0.3.8.tar.bz2


Index: fedora-packager.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/EL-5/fedora-packager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fedora-packager.spec	30 Jul 2009 16:13:24 -0000	1.10
+++ fedora-packager.spec	6 Aug 2009 17:50:58 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           fedora-packager
-Version:        0.3.7
+Version:        0.3.8
 Release:        1%{?dist}
 Summary:        Tools for setting up a fedora maintainer environment
 
@@ -14,6 +14,7 @@ Requires:       rpm-build rpmdevtools rp
 Requires:       mock cvs curl wget
 Requires:       pyOpenSSL python-pycurl
 Requires:       redhat-rpm-config
+Requires:       python-offtrac
 
 BuildArch:      noarch
 
@@ -45,10 +46,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fedoradev-pkgowners
 %{_bindir}/fedora-cert
 %{_bindir}/fedora-getsvn
+%{_bindir}/fedora-hosted
 %{_bindir}/rpmbuild-md5
 
 
 %changelog
+* Tue Aug 04 2009 Jesse Keating <jkeating at redhat.com> - 0.3.8-1
+- Add fedora-hosted and require offtrac
+
 * Thu Jul 30 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.7-1
 - define user_cert in fedora-cvs before refrencing it 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-packager/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 Jul 2009 16:13:24 -0000	1.8
+++ sources	6 Aug 2009 17:50:58 -0000	1.9
@@ -1 +1 @@
-b5c1953ee29f796679a486d11a73f5a5  fedora-packager-0.3.7.tar.bz2
+9ed5de737d99248c53e0ccb27acaa3b6  fedora-packager-0.3.8.tar.bz2



From rjones at fedoraproject.org  Thu Aug  6 17:50:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 17:50:56 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.51,1.52
Message-ID: <20090806175056.8221611C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30942

Modified Files:
	libguestfs.spec 
Log Message:
Disable tests (because of RHBZ#516096).


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- libguestfs.spec	6 Aug 2009 16:15:11 -0000	1.51
+++ libguestfs.spec	6 Aug 2009 17:50:56 -0000	1.52
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     1%{?dist}
+Release:     1%{?dist}.1
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -335,11 +335,12 @@ export LIBGUESTFS_DEBUG=1
 # 503236   i386         F-12   cryptomgr_test at doublefault_fn
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu
-# -        ?            F-12   qemu TCG on Xen is broken again
+# 516022   all          F-12   virtio-net gives "Network is unreachable" errors
+# 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 
-%ifarch x86_64
-make check
-%endif
+#%ifarch x86_64
+#make check
+#%endif
 
 
 %install
@@ -533,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1.fc11.1
+- Disable tests (because of RHBZ#516096).
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
 - New upstream release 1.0.66.
 



From rjones at fedoraproject.org  Thu Aug  6 17:51:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  6 Aug 2009 17:51:31 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.83,1.84
Message-ID: <20090806175131.7009211C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31250

Modified Files:
	libguestfs.spec 
Log Message:
Update comment.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- libguestfs.spec	6 Aug 2009 16:15:09 -0000	1.83
+++ libguestfs.spec	6 Aug 2009 17:51:31 -0000	1.84
@@ -340,6 +340,7 @@ export LIBGUESTFS_DEBUG=1
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu (FIXED)
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
+# 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 
 #%ifarch x86_64
 #make check



From firewing at fedoraproject.org  Thu Aug  6 17:56:05 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Thu,  6 Aug 2009 17:56:05 +0000 (UTC)
Subject: rpms/fwbackups/F-10 .cvsignore, 1.12, 1.13 fwbackups.spec, 1.28,
	1.29 sources, 1.12, 1.13 fwbackups-1.43.3rc2-oldtokeep.patch,
	1.1, NONE
Message-ID: <20090806175605.76C5611C00E4@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32087/F-10

Modified Files:
	.cvsignore fwbackups.spec sources 
Removed Files:
	fwbackups-1.43.3rc2-oldtokeep.patch 
Log Message:
Update to 1.43.3rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 May 2009 21:53:10 -0000	1.12
+++ .cvsignore	6 Aug 2009 17:56:05 -0000	1.13
@@ -1 +1 @@
-fwbackups-1.43.3rc2.tar.bz2
+fwbackups-1.43.3rc3.tar.bz2


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/fwbackups.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- fwbackups.spec	21 Jul 2009 18:30:32 -0000	1.28
+++ fwbackups.spec	6 Aug 2009 17:56:05 -0000	1.29
@@ -1,34 +1,25 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.4.rc2%{?dist}
+Release:           0.5.rc3%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
-Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc2.tar.bz2
-# Fixes one-time backups in 1.43.3rc2 (RH bug #512356)
-Patch0:            fwbackups-1.43.3rc2-oldtokeep.patch
+Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc3.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
-BuildRequires:     intltool, glib2-devel
+BuildRequires:     intltool
 BuildRequires:     python-devel >= 2.4
-BuildRequires:     scrollkeeper
-# Pulls libxml2
-BuildRequires:     gnome-doc-utils
 
 Requires:          /usr/bin/crontab
 Requires:          tar, rsync
-Requires:          notify-python, gnome-python2-gnome
+Requires:          notify-python
 Requires:          pygtk2, pygtk2-libglade
 Requires:          python >= 2.4
 Requires:          python-paramiko
-Requires(post):    scrollkeeper
-Requires(postun):  scrollkeeper
 
 %description
 fwbackups is a feature-rich user backup program that allows users (including
@@ -40,12 +31,10 @@ or from the contents of an external fold
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2
-%patch0 -p1 -b .oldtokeep
+%setup -q -n %{name}-%{version}rc3
 
 %build
-autoreconf -v -i -f
-%configure --disable-scrollkeeper
+%configure
 # We don't implement this yet: make %{?_smp_mflags}
 make
 
@@ -58,29 +47,26 @@ desktop-file-install --vendor fedora\
     --delete-original \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
-%find_lang %{name} --with-gnome
+#find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-
-%postun
-scrollkeeper-update -q || :
 
-
-%files -f %{name}.lang
+#files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{name}/
 
 %changelog
+* Thu Aug 6 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.5.rc3
+- Update to 1.43.3rc3
+
 * Tue Jul 21 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.4.rc2
 - Add patch to fix one-time backups (#512356)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 May 2009 21:53:10 -0000	1.12
+++ sources	6 Aug 2009 17:56:05 -0000	1.13
@@ -1 +1 @@
-1a012abc624881c743bc24f56aa7888d  fwbackups-1.43.3rc2.tar.bz2
+765e2e972354ef4e7fe70e98ee1d7a11  fwbackups-1.43.3rc3.tar.bz2


--- fwbackups-1.43.3rc2-oldtokeep.patch DELETED ---



From firewing at fedoraproject.org  Thu Aug  6 17:56:05 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Thu,  6 Aug 2009 17:56:05 +0000 (UTC)
Subject: rpms/fwbackups/F-11 .cvsignore, 1.12, 1.13 fwbackups.spec, 1.28,
	1.29 sources, 1.12, 1.13 fwbackups-1.43.3rc2-oldtokeep.patch,
	1.1, NONE
Message-ID: <20090806175605.A563C11C00E4@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32087/F-11

Modified Files:
	.cvsignore fwbackups.spec sources 
Removed Files:
	fwbackups-1.43.3rc2-oldtokeep.patch 
Log Message:
Update to 1.43.3rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Jun 2009 15:10:08 -0000	1.12
+++ .cvsignore	6 Aug 2009 17:56:05 -0000	1.13
@@ -1 +1 @@
-fwbackups-1.43.3rc2.tar.bz2
+fwbackups-1.43.3rc3.tar.bz2


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/fwbackups.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- fwbackups.spec	21 Jul 2009 18:30:33 -0000	1.28
+++ fwbackups.spec	6 Aug 2009 17:56:05 -0000	1.29
@@ -1,34 +1,25 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.4.rc2%{?dist}
+Release:           0.5.rc3%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
-Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc2.tar.bz2
-# Fixes one-time backups in 1.43.3rc2 (RH bug #512356)
-Patch0:            fwbackups-1.43.3rc2-oldtokeep.patch
+Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc3.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
-BuildRequires:     intltool, glib2-devel
+BuildRequires:     intltool
 BuildRequires:     python-devel >= 2.4
-BuildRequires:     scrollkeeper
-# Pulls libxml2
-BuildRequires:     gnome-doc-utils
 
 Requires:          /usr/bin/crontab
 Requires:          tar, rsync
-Requires:          notify-python, gnome-python2-gnome
+Requires:          notify-python
 Requires:          pygtk2, pygtk2-libglade
 Requires:          python >= 2.4
 Requires:          python-paramiko
-Requires(post):    scrollkeeper
-Requires(postun):  scrollkeeper
 
 %description
 fwbackups is a feature-rich user backup program that allows users (including
@@ -40,12 +31,10 @@ or from the contents of an external fold
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2
-%patch0 -p1 -b .oldtokeep
+%setup -q -n %{name}-%{version}rc3
 
 %build
-autoreconf -v -i -f
-%configure --disable-scrollkeeper
+%configure
 # We don't implement this yet: make %{?_smp_mflags}
 make
 
@@ -58,29 +47,26 @@ desktop-file-install --vendor fedora\
     --delete-original \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
-%find_lang %{name} --with-gnome
+#find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-
-%postun
-scrollkeeper-update -q || :
 
-
-%files -f %{name}.lang
+#files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{name}/
 
 %changelog
+* Thu Aug 6 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.5.rc3
+- Update to 1.43.3rc3
+
 * Tue Jul 21 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.4.rc2
 - Add patch to fix one-time backups (#512356)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Jun 2009 15:10:09 -0000	1.12
+++ sources	6 Aug 2009 17:56:05 -0000	1.13
@@ -1 +1 @@
-1a012abc624881c743bc24f56aa7888d  fwbackups-1.43.3rc2.tar.bz2
+765e2e972354ef4e7fe70e98ee1d7a11  fwbackups-1.43.3rc3.tar.bz2


--- fwbackups-1.43.3rc2-oldtokeep.patch DELETED ---



From firewing at fedoraproject.org  Thu Aug  6 17:56:05 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Thu,  6 Aug 2009 17:56:05 +0000 (UTC)
Subject: rpms/fwbackups/devel .cvsignore, 1.12, 1.13 fwbackups.spec, 1.31,
	1.32 sources, 1.12, 1.13 fwbackups-1.43.3rc2-oldtokeep.patch,
	1.1, NONE
Message-ID: <20090806175605.DE25811C00E4@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32087/devel

Modified Files:
	.cvsignore fwbackups.spec sources 
Removed Files:
	fwbackups-1.43.3rc2-oldtokeep.patch 
Log Message:
Update to 1.43.3rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 May 2009 21:53:11 -0000	1.12
+++ .cvsignore	6 Aug 2009 17:56:05 -0000	1.13
@@ -1 +1 @@
-fwbackups-1.43.3rc2.tar.bz2
+fwbackups-1.43.3rc3.tar.bz2


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/fwbackups.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- fwbackups.spec	24 Jul 2009 23:22:04 -0000	1.31
+++ fwbackups.spec	6 Aug 2009 17:56:05 -0000	1.32
@@ -1,34 +1,25 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.5.rc2%{?dist}
+Release:           0.6.rc3%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
-Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc2.tar.bz2
-# Fixes one-time backups in 1.43.3rc2 (RH bug #512356)
-Patch0:            fwbackups-1.43.3rc2-oldtokeep.patch
+Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc3.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
-BuildRequires:     intltool, glib2-devel
+BuildRequires:     intltool
 BuildRequires:     python-devel >= 2.4
-BuildRequires:     scrollkeeper
-# Pulls libxml2
-BuildRequires:     gnome-doc-utils
 
 Requires:          /usr/bin/crontab
 Requires:          tar, rsync
-Requires:          notify-python, gnome-python2-gnome
+Requires:          notify-python
 Requires:          pygtk2, pygtk2-libglade
 Requires:          python >= 2.4
 Requires:          python-paramiko
-Requires(post):    scrollkeeper
-Requires(postun):  scrollkeeper
 
 %description
 fwbackups is a feature-rich user backup program that allows users (including
@@ -40,12 +31,10 @@ or from the contents of an external fold
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2
-%patch0 -p1 -b .oldtokeep
+%setup -q -n %{name}-%{version}rc3
 
 %build
-autoreconf -v -f -i
-%configure --disable-scrollkeeper
+%configure
 # We don't implement this yet: make %{?_smp_mflags}
 make
 
@@ -58,29 +47,26 @@ desktop-file-install --vendor fedora\
     --delete-original \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
-%find_lang %{name} --with-gnome
+#find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-
-%postun
-scrollkeeper-update -q || :
 
-
-%files -f %{name}.lang
+#files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{name}/
 
 %changelog
+* Thu Aug 6 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc3
+- Update to 1.43.3rc3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43.3-0.5.rc2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 May 2009 21:53:11 -0000	1.12
+++ sources	6 Aug 2009 17:56:05 -0000	1.13
@@ -1 +1 @@
-1a012abc624881c743bc24f56aa7888d  fwbackups-1.43.3rc2.tar.bz2
+765e2e972354ef4e7fe70e98ee1d7a11  fwbackups-1.43.3rc3.tar.bz2


--- fwbackups-1.43.3rc2-oldtokeep.patch DELETED ---



From ajax at fedoraproject.org  Thu Aug  6 18:04:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  6 Aug 2009 18:04:05 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.249,1.250
Message-ID: <20090806180405.95A8911C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1729

Modified Files:
	mesa.spec 
Log Message:
* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 7.6-0.8
- Build --disable-asm on x86 since it makes everything all textrel'y and
  that makes selinux unhappy.  Strictly we only need to disable the asm
  dispatch code, but the build system doesn't make that an option yet.



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- mesa.spec	31 Jul 2009 16:21:01 -0000	1.249
+++ mesa.spec	6 Aug 2009 18:04:05 -0000	1.250
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.7%{?dist}
+Release: 0.8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -187,8 +187,13 @@ autoreconf --install  
 
 export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
 export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
+%ifarch %{ix86}
+# i do not have words for how much the assembly dispatch code infuriates me
+%define common_flags --enable-selinux --enable-pic --disable-asm
+%else
 %define common_flags --enable-selinux --enable-pic
-%define osmesa_flags --with-driver=osmesa --disable-asm %{common_flags}
+%endif
+%define osmesa_flags --with-driver=osmesa %{common_flags}
 
 # first, build the osmesa variants. XXX this is overkill.  osmesa32 is
 # sufficient to render to any of the channel sizes, according to the
@@ -288,7 +293,7 @@ popd
 
 # this keeps breaking, check it early.  note that the exit from eu-ftr is odd.
 pushd $RPM_BUILD_ROOT%{_libdir}
-for i in libOSMesa*.so ; do
+for i in libOSMesa*.so libGL.so ; do
     eu-findtextrel $i && exit 1
 done
 
@@ -369,6 +374,11 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 7.6-0.8
+- Build --disable-asm on x86 since it makes everything all textrel'y and
+  that makes selinux unhappy.  Strictly we only need to disable the asm
+  dispatch code, but the build system doesn't make that an option yet.
+
 * Fri Jul 31 2009 Kristian H?gsberg <krh at redhat.com> 7.6-0.7
 - Add DRI2 pageflipping patch.
 



From ajax at fedoraproject.org  Thu Aug  6 18:05:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  6 Aug 2009 18:05:30 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-dri2-crash-fixes.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.462, 1.463
Message-ID: <20090806180530.E248C11C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2110

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-dri2-crash-fixes.patch 
Log Message:
* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 1.6.99-28.20090804
- xserver-1.6.99-dri2-crash-fixes.patch: don't cough and die just because
  the driver had the gall not to register a SwapBuffers handler.


xserver-1.6.99-dri2-crash-fixes.patch:
 dri2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.6.99-dri2-crash-fixes.patch ---
>From 6ba2c0f1e15b0dc6126c668461746d134b6e396d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 5 Aug 2009 15:02:03 -0400
Subject: [PATCH] dri2: fix pageflipping code to not crash non-flipping drivers

---
 hw/xfree86/dri2/dri2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 7b9fb23..9958bca 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -392,7 +392,8 @@ DRI2SwapBuffers(DrawablePtr pDraw)
     if (pSrcBuffer == NULL || pDestBuffer == NULL)
 	return BadValue;
 
-    if (DRI2FlipCheck(pDraw) &&
+    if (ds->SwapBuffers &&
+        DRI2FlipCheck(pDraw) &&
 	(*ds->SwapBuffers)(pDraw, pDestBuffer, pSrcBuffer, pPriv))
     {
 	pPriv->swapPending = TRUE;
-- 
1.6.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- xorg-x11-server.spec	5 Aug 2009 17:55:58 -0000	1.462
+++ xorg-x11-server.spec	6 Aug 2009 18:05:30 -0000	1.463
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   27.%{gitdate}%{?dist}
+Release:   28.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -79,6 +79,7 @@ Patch6027: xserver-1.6.0-displayfd.patch
 Patch6028: xserver-1.6.99-randr-error-debugging.patch
 Patch6029: xserver-1.6.1-proc-cmdline.patch
 Patch6030: xserver-1.6.99-right-of.patch
+Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
 
 %define moduledir	%{_libdir}/xorg/modules
@@ -527,6 +528,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 1.6.99-28.20090804
+- xserver-1.6.99-dri2-crash-fixes.patch: don't cough and die just because
+  the driver had the gall not to register a SwapBuffers handler.
+
 * Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 1.6.99-27.20090804
 - xserver-1.6.99-vga-arb.patch: Fix crashes from miscompilation without
   xorg-config.h.



From ksyz at fedoraproject.org  Thu Aug  6 18:12:53 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Thu,  6 Aug 2009 18:12:53 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/devel import.log, NONE,
	1.1 perl-XML-Parser-Lite-Tree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090806181253.D206C11C00E4@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27309/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-XML-Parser-Lite-Tree.spec 
Log Message:
Initial import of perl-XML-Parser-Lite-Tree




--- NEW FILE import.log ---
perl-XML-Parser-Lite-Tree-0_09-1_fc11:HEAD:perl-XML-Parser-Lite-Tree-0.09-1.fc11.src.rpm:1249580052


--- NEW FILE perl-XML-Parser-Lite-Tree.spec ---
Name:           perl-XML-Parser-Lite-Tree
Version:        0.09
Release:        1%{?dist}
Summary:        Lightweight XML tree builder
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/XML-Parser-Lite-Tree/
Source0:        http://www.cpan.org/authors/id/I/IA/IAMCAL/XML-Parser-Lite-Tree-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a singleton class for parsing XML into a tree structure. How does
this differ from other XML tree generators? By using XML::Parser::Lite,
which is a pure perl XML parser. Using this module you can tree-ify simple
XML without having to compile any C.

%prep
%setup -q -n XML-Parser-Lite-Tree-%{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 README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 02 2009 Michal Ingeli <mi at v3.sk> - 0.09-1
- Update to newer version with fixed license
 
* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> - 0.08-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 21:18:49 -0000	1.1
+++ .cvsignore	6 Aug 2009 18:12:53 -0000	1.2
@@ -0,0 +1 @@
+XML-Parser-Lite-Tree-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 21:18:49 -0000	1.1
+++ sources	6 Aug 2009 18:12:53 -0000	1.2
@@ -0,0 +1 @@
+07b45f4374b166769ca865b7ecc77508  XML-Parser-Lite-Tree-0.09.tar.gz



From ksyz at fedoraproject.org  Thu Aug  6 18:15:06 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Thu,  6 Aug 2009 18:15:06 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/F-11 import.log, NONE,
	1.1 perl-XML-Parser-Lite-Tree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090806181506.3812611C00E4@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4963/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-XML-Parser-Lite-Tree.spec 
Log Message:
Initial import of perl-XML-Parser-Lite-Tree




--- NEW FILE import.log ---
perl-XML-Parser-Lite-Tree-0_09-1_fc11:F-11:perl-XML-Parser-Lite-Tree-0.09-1.fc11.src.rpm:1249582396


--- NEW FILE perl-XML-Parser-Lite-Tree.spec ---
Name:           perl-XML-Parser-Lite-Tree
Version:        0.09
Release:        1%{?dist}
Summary:        Lightweight XML tree builder
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/XML-Parser-Lite-Tree/
Source0:        http://www.cpan.org/authors/id/I/IA/IAMCAL/XML-Parser-Lite-Tree-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a singleton class for parsing XML into a tree structure. How does
this differ from other XML tree generators? By using XML::Parser::Lite,
which is a pure perl XML parser. Using this module you can tree-ify simple
XML without having to compile any C.

%prep
%setup -q -n XML-Parser-Lite-Tree-%{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 README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 02 2009 Michal Ingeli <mi at v3.sk> - 0.09-1
- Update to newer version with fixed license
 
* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> - 0.08-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 21:18:49 -0000	1.1
+++ .cvsignore	6 Aug 2009 18:15:05 -0000	1.2
@@ -0,0 +1 @@
+XML-Parser-Lite-Tree-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 21:18:49 -0000	1.1
+++ sources	6 Aug 2009 18:15:06 -0000	1.2
@@ -0,0 +1 @@
+07b45f4374b166769ca865b7ecc77508  XML-Parser-Lite-Tree-0.09.tar.gz



From ksyz at fedoraproject.org  Thu Aug  6 18:24:46 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Thu,  6 Aug 2009 18:24:46 +0000 (UTC)
Subject: rpms/perl-XML-Parser-Lite-Tree/EL-5 import.log, NONE,
	1.1 perl-XML-Parser-Lite-Tree.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090806182446.1B19411C00E4@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5822/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-XML-Parser-Lite-Tree.spec 
Log Message:
Initial import of perl-XML-Parser-Lite-Tree 




--- NEW FILE import.log ---
perl-XML-Parser-Lite-Tree-0_09-1_fc11:EL-5:perl-XML-Parser-Lite-Tree-0.09-1.fc11.src.rpm:1249582494


--- NEW FILE perl-XML-Parser-Lite-Tree.spec ---
Name:           perl-XML-Parser-Lite-Tree
Version:        0.09
Release:        1%{?dist}
Summary:        Lightweight XML tree builder
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/XML-Parser-Lite-Tree/
Source0:        http://www.cpan.org/authors/id/I/IA/IAMCAL/XML-Parser-Lite-Tree-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a singleton class for parsing XML into a tree structure. How does
this differ from other XML tree generators? By using XML::Parser::Lite,
which is a pure perl XML parser. Using this module you can tree-ify simple
XML without having to compile any C.

%prep
%setup -q -n XML-Parser-Lite-Tree-%{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 README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 02 2009 Michal Ingeli <mi at v3.sk> - 0.09-1
- Update to newer version with fixed license
 
* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> - 0.08-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 21:18:49 -0000	1.1
+++ .cvsignore	6 Aug 2009 18:24:45 -0000	1.2
@@ -0,0 +1 @@
+XML-Parser-Lite-Tree-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser-Lite-Tree/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 21:18:49 -0000	1.1
+++ sources	6 Aug 2009 18:24:45 -0000	1.2
@@ -0,0 +1 @@
+07b45f4374b166769ca865b7ecc77508  XML-Parser-Lite-Tree-0.09.tar.gz



From limb at fedoraproject.org  Thu Aug  6 18:35:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  6 Aug 2009 18:35:59 +0000 (UTC)
Subject: rpms/vdrift/F-11 vdrift.spec,1.16,1.17
Message-ID: <20090806183559.2328611C00E4@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/vdrift/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8733

Modified Files:
	vdrift.spec 
Log Message:
Path fix.



Index: vdrift.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdrift/F-11/vdrift.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vdrift.spec	1 Jul 2009 19:30:29 -0000	1.16
+++ vdrift.spec	6 Aug 2009 18:35:58 -0000	1.17
@@ -1,6 +1,6 @@
 Name: vdrift
 Version:  20090615
-Release:  1%{?dist}
+Release:  3%{?dist}
 Summary: Driving/drift racing simulation
 
 Group: Amusements/Games 
@@ -95,7 +95,7 @@ sed -i 's/linuxx86/linuxppc/' src/SConsc
 #make
 #cd ..
 
-CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
+CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin prefix=/usr use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
 
 %install
 rm -rf %{buildroot}
@@ -143,6 +143,12 @@ rm -rf %{buildroot}
 %{_datadir}/vdrift
 
 %changelog
+* Thu Aug 06 2009 Jon Ciesla <limb at jcomserv.net> - 20090615-3
+- Path fix, BZ 515908.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090615-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 30 2009 Jon Ciesla <limb at jcomserv.net> - 20090615-1
 - Update to 2009-06-15.
 - Split data into noarch subpackage, BZ 508079.



From till at fedoraproject.org  Thu Aug  6 18:37:00 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu,  6 Aug 2009 18:37:00 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.75,1.76
Message-ID: <20090806183700.3401211C00E4@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8971

Modified Files:
	comps-f12.xml.in 
Log Message:
- remove it-security groups and category



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- comps-f12.xml.in	5 Aug 2009 20:26:48 -0000	1.75
+++ comps-f12.xml.in	6 Aug 2009 18:37:00 -0000	1.76
@@ -4675,123 +4675,6 @@
     </packagelist>
   </group>
   <group>
-    <id>it-security-reconnaissance</id>
-    <_name>Reconnaissance tools</_name>
-    <_description>These tools can be used to perform IT security related reconnaissance.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">argus</packagereq>
-        <packagereq type="default">cgf</packagereq>
-        <packagereq type="default">dsniff</packagereq>
-        <packagereq type="default">etherape</packagereq>
-        <packagereq type="default">ettercap</packagereq>
-        <packagereq type="default">examiner</packagereq>
-        <packagereq type="default">firewalk</packagereq>
-        <packagereq type="default">halberd</packagereq>
-        <packagereq type="default">hping3</packagereq>
-        <packagereq type="default">hunt</packagereq>
-        <packagereq type="default">iptraf</packagereq>
-        <packagereq type="default">Lynis</packagereq>
-        <packagereq type="default">nbtscan</packagereq>
-        <packagereq type="default">nc6</packagereq>
-        <packagereq type="default">nc</packagereq>
-        <packagereq type="default">nessus</packagereq>
-        <packagereq type="default">nmap</packagereq>
-        <packagereq type="default">pcapdiff</packagereq>
-        <packagereq type="default">picviz</packagereq>
-        <packagereq type="default">scanssh</packagereq>
-        <packagereq type="default">socat</packagereq>
-        <packagereq type="default">tcpdump</packagereq>
-        <packagereq type="default">tcpxtract</packagereq>
-        <packagereq type="default">tiger</packagereq>
-        <packagereq type="default">wireshark</packagereq>
-        <packagereq type="default">xprobe2</packagereq>
-    </packagelist>
-</group>
-  <group>
-    <id>it-security-forensics</id>
-    <_name>Forensics tools</_name>
-    <_description>These tools can be used to perform IT security related forensics.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">chkrootkit</packagereq>
-        <packagereq type="default">clamav</packagereq>
-        <packagereq type="default">dc3dd</packagereq>
-        <packagereq type="default">dd_rescue</packagereq>
-        <packagereq type="default">foremost</packagereq>
-        <packagereq type="default">gpart</packagereq>
-        <packagereq type="default">hexedit</packagereq>
-        <packagereq type="default">pdfresurrect</packagereq>
-        <packagereq type="default">prelude</packagereq>
-        <packagereq type="default">rkhunter</packagereq>
-        <packagereq type="default">scanmem</packagereq>
-        <packagereq type="default">sectool</packagereq>
-        <packagereq type="default">sleuthkit</packagereq>
-        <packagereq type="default">testdisk</packagereq>
-        <packagereq type="default">Unhide</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>it-security-wireless</id>
-    <_name>Wireless tools</_name>
-    <_description>These tools can be used to perform IT security related wireless auditing.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">aircrack-ng</packagereq>
-        <packagereq type="default">airsnort</packagereq>
-        <packagereq type="default">kismet</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>it-security-code-analysis</id>
-    <_name>Code analysis tools</_name>
-    <_description>These tools can be used to perform security related code analysis.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">pscan</packagereq>
-        <packagereq type="default">splint</packagereq>
-        <packagereq type="default">rats</packagereq>
-        <packagereq type="default">flawfinder</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>it-security-intrusion-detection</id>
-    <_name>Intrusion detection tools</_name>
-    <_description>These tools can be used to setup intrusion detection systems.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">aide</packagereq>
-        <packagereq type="default">prewikka</packagereq>
-        <packagereq type="default">prelude-manager</packagereq>
-        <packagereq type="default">prelude-notify</packagereq>
-        <packagereq type="default">snort</packagereq>
-        <packagereq type="default">tripwire</packagereq>
-        <packagereq type="default">labrea</packagereq>
-        <packagereq type="default">pads</packagereq>
-        <packagereq type="default">honeyd</packagereq>
-        <packagereq type="default">Nebula</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>it-security-password-recovery</id>
-    <_name>Password recovery tools</_name>
-    <_description>These tools can be used to recover passwords.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">crack</packagereq>
-        <packagereq type="default">john</packagereq>
-        <packagereq type="default">medusa</packagereq>
-        <packagereq type="default">ophcrack</packagereq>
-        <packagereq type="default">xlcrack</packagereq>
-    </packagelist>
-  </group>
-  <group>
     <id>romanian-support</id>
     <_name>Romanian Support</_name>
     <_description/>
@@ -6197,20 +6080,6 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zu_ZA</packagereq>
     </packagelist>
   </group>
-  <category>
-    <id>it-security</id>
-    <_name>IT Security</_name>
-    <_description>These packages are useful for IT security related tasks.</_description>
-    <grouplist>
-      <groupid>it-security-code-analysis</groupid>
-      <groupid>it-security-forensics</groupid>
-      <groupid>it-security-intrusion-detection</groupid>
-      <groupid>it-security-reconnaissance</groupid>
-      <groupid>it-security-wireless</groupid>
-      <groupid>it-security-password-recovery</groupid>
-    </grouplist>
-  </category>
-  <category>
     <id>language-support</id>
     <_name>Languages</_name>
     <_description>These packages provide support for various locales including fonts and input methods.</_description>



From scop at fedoraproject.org  Thu Aug  6 18:41:58 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  6 Aug 2009 18:41:58 +0000 (UTC)
Subject: rpms/cvsps/devel cvsps-2.2b1-dynamic-logbuf.patch, NONE,
	1.1 cvsps.spec, 1.10, 1.11
Message-ID: <20090806184158.67D0A11C00E4@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvsps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9859

Modified Files:
	cvsps.spec 
Added Files:
	cvsps-2.2b1-dynamic-logbuf.patch 
Log Message:
* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
- Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
  Andreas Schwab).
- Use %global instead of %define.


cvsps-2.2b1-dynamic-logbuf.patch:
 cache.c |   27 ++++++++++++++++++++++++---
 cvsps.c |   36 ++++++++++++++++++++----------------
 2 files changed, 44 insertions(+), 19 deletions(-)

--- NEW FILE cvsps-2.2b1-dynamic-logbuf.patch ---
# From: http://ydirson.free.fr/soft/git/cvsps.git

commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50
Author: David D. Kilzer <ddkilzer at kilzer.net>
Date:   Mon Jun 20 01:04:34 2005 +0200

    Dynamically allocate the log buffer to prevent warning messages
    
    On anoncvs.opensource.apple.com (Apple's anonymous CVS server for
    WebKit), some very long log entries were included in CVS.  I got tired
    of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be
    dynamically allocated.

diff --git i/cache.c w/cache.c
index 4c51cf7..01a8ed3 100644
--- i/cache.c
+++ w/cache.c
@@ -108,10 +108,19 @@ time_t read_cache()
     int tag_flags = 0;
     char branchbuff[LOG_STR_MAX] = "";
     int branch_add = 0;
-    char logbuff[LOG_STR_MAX] = "";
+    int logbufflen = LOG_STR_MAX + 1;
+    char * logbuff = malloc(logbufflen);
     time_t cache_date = -1;
     int read_version;
 
+    if (logbuff == NULL)
+    {
+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen);
+	exit(1);
+    }
+
+    logbuff[0] = 0;
+
     if (!(fp = cache_open("r")))
 	goto out;
 
@@ -299,8 +308,19 @@ time_t read_cache()
 	    else
 	    {
 		/* Make sure we have enough in the buffer */
-		if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX)
-		    strcat(logbuff, buff);
+		int len = strlen(buff);
+		if (strlen(logbuff) + len >= LOG_STR_MAX)
+		{
+		    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
+		    char * newlogbuff = realloc(logbuff, logbufflen);
+		    if (newlogbuff == NULL)
+		    {
+			debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen);
+			exit(1);
+		    }
+		    logbuff = newlogbuff;
+		}
+		strcat(logbuff, buff);
 	    }
 	    break;
 	case CACHE_NEED_PS_MEMBERS:
@@ -332,6 +352,7 @@ time_t read_cache()
  out_close:
     fclose(fp);
  out:
+    free(logbuff);
     return cache_date;
 }
 
diff --git i/cvsps.c w/cvsps.c
index f0e7d29..db28d7c 100644
--- i/cvsps.c
+++ w/cvsps.c
@@ -269,7 +269,8 @@ static void load_from_cvs()
     PatchSetMember * psm = NULL;
     char datebuff[26];
     char authbuff[AUTH_STR_MAX];
-    char logbuff[LOG_STR_MAX + 1];
+    int logbufflen = LOG_STR_MAX + 1;
+    char * logbuff = malloc(logbufflen);
     int loglen = 0;
     int have_log = 0;
     char cmd[BUFSIZ];
@@ -277,6 +278,12 @@ static void load_from_cvs()
     char use_rep_buff[PATH_MAX];
     char * ltype;
 
+    if (logbuff == NULL)
+    {
+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen);
+	exit(1);
+    }
+
     if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
     {
 	ltype = "rlog";
@@ -484,25 +491,22 @@ static void load_from_cvs()
 		 */
 		if (have_log || !is_revision_metadata(buff))
 		{
-		    /* if the log buffer is full, that's it.  
-		     * 
-		     * Also, read lines (fgets) always have \n in them
-		     * (unless truncation happens)
-		     * which we count on.  So if truncation happens,
-		     * be careful to put a \n on.
-		     * 
-		     * Buffer has LOG_STR_MAX + 1 for room for \0 if
-		     * necessary
-		     */
-		    if (loglen < LOG_STR_MAX)
+		    /* If the log buffer is full, try to reallocate more. */
+		    if (loglen < logbufflen)
 		    {
 			int len = strlen(buff);
 			
-			if (len >= LOG_STR_MAX - loglen)
+			if (len >= logbufflen - loglen)
 			{
-			    debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log");
-			    len = LOG_STR_MAX - loglen;
-			    buff[len - 1] = '\n';
+			    debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename);
+			    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
+			    char * newlogbuff = realloc(logbuff, logbufflen);
+			    if (newlogbuff == NULL)
+			    {
+				debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen);
+				exit(1);
+			    }
+			    logbuff = newlogbuff;
 			}
 
 			debug(DEBUG_STATUS, "appending %s to log", buff);


Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/devel/cvsps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cvsps.spec	24 Jul 2009 19:51:52 -0000	1.10
+++ cvsps.spec	6 Aug 2009 18:41:58 -0000	1.11
@@ -1,14 +1,16 @@
-%define prever  b1
+%global prever  b1
 
 Name:           cvsps
 Version:        2.2
-Release:        0.3.%{prever}%{?dist}
+Release:        0.4.%{prever}%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
 License:        GPL+
 URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}%{prever}.tar.gz
+# #516083
+Patch0:         %{name}-2.2b1-dynamic-logbuf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -28,6 +30,7 @@ changes were committed 'atomically' to t
 
 %prep
 %setup -q -n %{name}-%{version}%{prever}
+%patch0 -p1
 sed -i -e 's/diffs\\-opts/diff\\-opts/' cvsps.1
 
 
@@ -52,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
+- Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
+  Andreas Schwab).
+- Use %%global instead of %%define.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.3.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Thu Aug  6 18:48:09 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  6 Aug 2009 18:48:09 +0000 (UTC)
Subject: rpms/kernel/devel drm-hush-vblank-warning.patch, NONE,
	1.1 kernel.spec, 1.1697, 1.1698
Message-ID: <20090806184809.7F2D511C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11622

Modified Files:
	kernel.spec 
Added Files:
	drm-hush-vblank-warning.patch 
Log Message:
* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>
- Hush DRM vblank warnings, they're constant (and harmless) under DRI2.


drm-hush-vblank-warning.patch:
 drm_irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE drm-hush-vblank-warning.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.jx	2009-08-06 11:09:29.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-06 14:44:34.000000000 -0400
@@ -634,7 +634,7 @@ int drm_wait_vblank(struct drm_device *d
 
 	ret = drm_vblank_get(dev, crtc);
 	if (ret) {
-		DRM_ERROR("failed to acquire vblank counter, %d\n", ret);
+		DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);
 		return ret;
 	}
 	seq = drm_vblank_count(dev, crtc);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1697
retrieving revision 1.1698
diff -u -p -r1.1697 -r1.1698
--- kernel.spec	6 Aug 2009 05:33:43 -0000	1.1697
+++ kernel.spec	6 Aug 2009 18:48:09 -0000	1.1698
@@ -679,6 +679,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
+Patch1827: drm-hush-vblank-warning.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1282,6 +1283,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-r600-kms.patch
+ApplyPatch drm-hush-vblank-warning.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1951,6 +1953,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>
+- Hush DRM vblank warnings, they're constant (and harmless) under DRI2.
+
 * Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.134.rc5.git3
 - fixup vga arb warning at startup and handover between gpus
 



From scop at fedoraproject.org  Thu Aug  6 19:01:58 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  6 Aug 2009 19:01:58 +0000 (UTC)
Subject: rpms/cvsps/F-11 cvsps-2.2b1-dynamic-logbuf.patch, NONE,
	1.1 cvsps.spec, 1.9, 1.10
Message-ID: <20090806190158.18E0D11C00E4@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cvsps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13873

Modified Files:
	cvsps.spec 
Added Files:
	cvsps-2.2b1-dynamic-logbuf.patch 
Log Message:
* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
- Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
  Andreas Schwab).
- Use %global instead of %define.


cvsps-2.2b1-dynamic-logbuf.patch:
 cache.c |   27 ++++++++++++++++++++++++---
 cvsps.c |   36 ++++++++++++++++++++----------------
 2 files changed, 44 insertions(+), 19 deletions(-)

--- NEW FILE cvsps-2.2b1-dynamic-logbuf.patch ---
# From: http://ydirson.free.fr/soft/git/cvsps.git

commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50
Author: David D. Kilzer <ddkilzer at kilzer.net>
Date:   Mon Jun 20 01:04:34 2005 +0200

    Dynamically allocate the log buffer to prevent warning messages
    
    On anoncvs.opensource.apple.com (Apple's anonymous CVS server for
    WebKit), some very long log entries were included in CVS.  I got tired
    of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be
    dynamically allocated.

diff --git i/cache.c w/cache.c
index 4c51cf7..01a8ed3 100644
--- i/cache.c
+++ w/cache.c
@@ -108,10 +108,19 @@ time_t read_cache()
     int tag_flags = 0;
     char branchbuff[LOG_STR_MAX] = "";
     int branch_add = 0;
-    char logbuff[LOG_STR_MAX] = "";
+    int logbufflen = LOG_STR_MAX + 1;
+    char * logbuff = malloc(logbufflen);
     time_t cache_date = -1;
     int read_version;
 
+    if (logbuff == NULL)
+    {
+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen);
+	exit(1);
+    }
+
+    logbuff[0] = 0;
+
     if (!(fp = cache_open("r")))
 	goto out;
 
@@ -299,8 +308,19 @@ time_t read_cache()
 	    else
 	    {
 		/* Make sure we have enough in the buffer */
-		if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX)
-		    strcat(logbuff, buff);
+		int len = strlen(buff);
+		if (strlen(logbuff) + len >= LOG_STR_MAX)
+		{
+		    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
+		    char * newlogbuff = realloc(logbuff, logbufflen);
+		    if (newlogbuff == NULL)
+		    {
+			debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen);
+			exit(1);
+		    }
+		    logbuff = newlogbuff;
+		}
+		strcat(logbuff, buff);
 	    }
 	    break;
 	case CACHE_NEED_PS_MEMBERS:
@@ -332,6 +352,7 @@ time_t read_cache()
  out_close:
     fclose(fp);
  out:
+    free(logbuff);
     return cache_date;
 }
 
diff --git i/cvsps.c w/cvsps.c
index f0e7d29..db28d7c 100644
--- i/cvsps.c
+++ w/cvsps.c
@@ -269,7 +269,8 @@ static void load_from_cvs()
     PatchSetMember * psm = NULL;
     char datebuff[26];
     char authbuff[AUTH_STR_MAX];
-    char logbuff[LOG_STR_MAX + 1];
+    int logbufflen = LOG_STR_MAX + 1;
+    char * logbuff = malloc(logbufflen);
     int loglen = 0;
     int have_log = 0;
     char cmd[BUFSIZ];
@@ -277,6 +278,12 @@ static void load_from_cvs()
     char use_rep_buff[PATH_MAX];
     char * ltype;
 
+    if (logbuff == NULL)
+    {
+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen);
+	exit(1);
+    }
+
     if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
     {
 	ltype = "rlog";
@@ -484,25 +491,22 @@ static void load_from_cvs()
 		 */
 		if (have_log || !is_revision_metadata(buff))
 		{
-		    /* if the log buffer is full, that's it.  
-		     * 
-		     * Also, read lines (fgets) always have \n in them
-		     * (unless truncation happens)
-		     * which we count on.  So if truncation happens,
-		     * be careful to put a \n on.
-		     * 
-		     * Buffer has LOG_STR_MAX + 1 for room for \0 if
-		     * necessary
-		     */
-		    if (loglen < LOG_STR_MAX)
+		    /* If the log buffer is full, try to reallocate more. */
+		    if (loglen < logbufflen)
 		    {
 			int len = strlen(buff);
 			
-			if (len >= LOG_STR_MAX - loglen)
+			if (len >= logbufflen - loglen)
 			{
-			    debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log");
-			    len = LOG_STR_MAX - loglen;
-			    buff[len - 1] = '\n';
+			    debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename);
+			    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
+			    char * newlogbuff = realloc(logbuff, logbufflen);
+			    if (newlogbuff == NULL)
+			    {
+				debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen);
+				exit(1);
+			    }
+			    logbuff = newlogbuff;
 			}
 
 			debug(DEBUG_STATUS, "appending %s to log", buff);


Index: cvsps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvsps/F-11/cvsps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cvsps.spec	24 Feb 2009 10:28:47 -0000	1.9
+++ cvsps.spec	6 Aug 2009 19:01:57 -0000	1.10
@@ -1,14 +1,16 @@
-%define prever  b1
+%global prever  b1
 
 Name:           cvsps
 Version:        2.2
-Release:        0.2.%{prever}%{?dist}
+Release:        0.4.%{prever}%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
 License:        GPL+
 URL:            http://www.cobite.com/cvsps/
 Source0:        http://www.cobite.com/cvsps/%{name}-%{version}%{prever}.tar.gz
+# #516083
+Patch0:         %{name}-2.2b1-dynamic-logbuf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -28,6 +30,7 @@ changes were committed 'atomically' to t
 
 %prep
 %setup -q -n %{name}-%{version}%{prever}
+%patch0 -p1
 sed -i -e 's/diffs\\-opts/diff\\-opts/' cvsps.1
 
 
@@ -52,6 +55,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2-0.4.b1
+- Apply David D. Kilzer's dynamic log buffer allocation patch (#516083,
+  Andreas Schwab).
+- Use %%global instead of %%define.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.3.b1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.2.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Thu Aug  6 19:13:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 19:13:12 +0000 (UTC)
Subject: rpms/perl-Email-MIME-Modifier/devel .cvsignore, 1.7,
	1.8 perl-Email-MIME-Modifier.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090806191312.B747A11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15821

Modified Files:
	.cvsignore perl-Email-MIME-Modifier.spec sources 
Log Message:
update to 1.444


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Feb 2009 11:38:24 -0000	1.7
+++ .cvsignore	6 Aug 2009 19:13:12 -0000	1.8
@@ -1 +1 @@
-Email-MIME-Modifier-1.443.tar.gz
+Email-MIME-Modifier-1.444.tar.gz


Index: perl-Email-MIME-Modifier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel/perl-Email-MIME-Modifier.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Email-MIME-Modifier.spec	26 Jul 2009 05:49:37 -0000	1.11
+++ perl-Email-MIME-Modifier.spec	6 Aug 2009 19:13:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-Modifier
-Version:        1.443
-Release:        3%{?dist}
+Version:        1.444
+Release:        1%{?dist}
 Summary:        Modify Email::MIME Objects Easily
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.444-1
+- update to 1.444
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.443-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Feb 2009 11:38:24 -0000	1.7
+++ sources	6 Aug 2009 19:13:12 -0000	1.8
@@ -1 +1 @@
-0677f89051fbb1522eb2be44446c9c0d  Email-MIME-Modifier-1.443.tar.gz
+3f75aad8a6683a23075ced1ed0eb41e4  Email-MIME-Modifier-1.444.tar.gz



From agk at fedoraproject.org  Thu Aug  6 19:18:16 2009
From: agk at fedoraproject.org (agk)
Date: Thu,  6 Aug 2009 19:18:16 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.51.tgz.asc, NONE, 1.1 .cvsignore, 1.69,
	1.70 lvm2.spec, 1.166, 1.167 sources, 1.74, 1.75 upstream, 1.62,
	1.63 LVM2.2.02.50.tgz.asc, 1.1, NONE
Message-ID: <20090806191816.1B14D11C00E4@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16953

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.51.tgz.asc 
Removed Files:
	LVM2.2.02.50.tgz.asc 
Log Message:
New upstream, fixing a bug that made lvm2-cluster 2.02.50 unusable and
finishing the data alignment support.



--- NEW FILE LVM2.2.02.51.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBKeyTEIoGRwVZ+LBcRAp3SAKDV9fwpAL4SNOs0VmtZ4v9FBJUHhQCeKY1n
5PeRAqJFAyLmL9asVl61/Uk=
=jnKk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	28 Jul 2009 22:24:12 -0000	1.69
+++ .cvsignore	6 Aug 2009 19:18:15 -0000	1.70
@@ -1,2 +1 @@
-LVM2.2.02.49.tgz
-LVM2.2.02.50.tgz
+LVM2.2.02.51.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- lvm2.spec	30 Jul 2009 09:31:23 -0000	1.166
+++ lvm2.spec	6 Aug 2009 19:18:15 -0000	1.167
@@ -7,8 +7,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.50
-Release: 2%{?dist}
+Version: 2.02.51
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -62,8 +62,6 @@ install -m 0600 /dev/null $RPM_BUILD_ROO
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
-mv $RPM_BUILD_ROOT/usr/include/lvm.h $RPM_BUILD_ROOT/usr/include/lvm2app.h
-mv $RPM_BUILD_ROOT/usr%{_libdir}/pkgconfig/liblvm2app.pc $RPM_BUILD_ROOT/usr%{_libdir}/pkgconfig/lvm2app.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -308,6 +306,16 @@ This package contains the device-mapper 
 
 
 %changelog
+* Thu Aug 6 2009 Alasdair Kergon <agk at redhat.com> - 2.02.51-1
+- Fix clvmd locking broken in 2.02.50-1.
+- Only change LV /dev symlinks on ACTIVATE not PRELOAD (so not done twice).
+- Make lvconvert honour log mirror options combined with downconversion.
+- Add devices/data_alignment_detection to lvm.conf.
+- Add devices/data_alignment_offset_detection to lvm.conf.
+- Add --dataalignmentoffset to pvcreate to shift start of aligned data area.
+- Update synopsis in lvconvert manpage to mention --repair.
+- Document -I option of clvmd in the man page.
+
 * Thu Jul 30 2009 Alasdair Kergon <agk at redhat.com> - 2.02.50-2
 - lvm2-devel requires device-mapper-devel.
 - Fix lvm2app.pc filename.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	28 Jul 2009 22:24:12 -0000	1.74
+++ sources	6 Aug 2009 19:18:15 -0000	1.75
@@ -1,2 +1 @@
-ae49c161e7533c8e33b669c80154bd46  LVM2.2.02.49.tgz
-29b75848a56a8ddcc7395d3282eb8499  LVM2.2.02.50.tgz
+725d07794007e021bfc592b1636100c7  LVM2.2.02.51.tgz


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- upstream	28 Jul 2009 22:24:12 -0000	1.62
+++ upstream	6 Aug 2009 19:18:15 -0000	1.63
@@ -1 +1 @@
-LVM2.2.02.50.tgz
+LVM2.2.02.51.tgz


--- LVM2.2.02.50.tgz.asc DELETED ---



From spot at fedoraproject.org  Thu Aug  6 19:21:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 19:21:22 +0000 (UTC)
Subject: rpms/perl-Email-MIME-Creator/devel .cvsignore, 1.4,
	1.5 perl-Email-MIME-Creator.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090806192122.4964511C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Email-MIME-Creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17413

Modified Files:
	.cvsignore perl-Email-MIME-Creator.spec sources 
Log Message:
update to 1.456


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Creator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Mar 2009 19:22:30 -0000	1.4
+++ .cvsignore	6 Aug 2009 19:21:22 -0000	1.5
@@ -1 +1 @@
-Email-MIME-Creator-1.455.tar.gz
+Email-MIME-Creator-1.456.tar.gz


Index: perl-Email-MIME-Creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Creator/devel/perl-Email-MIME-Creator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Email-MIME-Creator.spec	26 Jul 2009 05:49:09 -0000	1.8
+++ perl-Email-MIME-Creator.spec	6 Aug 2009 19:21:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Email-MIME-Creator
-Version:        1.455
-Release:        2%{?dist}
+Version:        1.456
+Release:        1%{?dist}
 Summary:        Email::MIME constructor for starting anew
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.456-1
+- update to 1.456
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.455-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Creator/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Mar 2009 19:22:31 -0000	1.4
+++ sources	6 Aug 2009 19:21:22 -0000	1.5
@@ -1 +1 @@
-4dbaf20060158505b50d3851bd147982  Email-MIME-Creator-1.455.tar.gz
+3e34396a03fe3c65170909fb57f116cc  Email-MIME-Creator-1.456.tar.gz



From agk at fedoraproject.org  Thu Aug  6 19:28:48 2009
From: agk at fedoraproject.org (agk)
Date: Thu,  6 Aug 2009 19:28:48 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.167,1.168
Message-ID: <20090806192848.2EBC811C00E4@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18384

Modified Files:
	lvm2.spec 
Log Message:
inc dm version no



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- lvm2.spec	6 Aug 2009 19:18:15 -0000	1.167
+++ lvm2.spec	6 Aug 2009 19:28:48 -0000	1.168
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.35
+%define device_mapper_version 1.02.36
 %define corosync_version 1.0.0-1
 %define clusterlib_version 3.0.0-20
 



From jforbes at fedoraproject.org  Thu Aug  6 19:37:29 2009
From: jforbes at fedoraproject.org (jforbes)
Date: Thu,  6 Aug 2009 19:37:29 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch, 
	NONE, 1.1 kernel.spec, 1.1698, 1.1699
Message-ID: <20090806193729.98BCC11C00E4@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19349

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch 
Log Message:
Fix kvm virtio_blk errors (bz #514901)

linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch:
 blk-core.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch ---
From: Mark McLoughlin <markmc at redhat.com>
Subject: [PATCH] block: silently error unsupported empty barriers too

With 2.6.31-rc5 in a KVM guest using dm and virtio_blk, we see the
following errors:

  end_request: I/O error, dev vda, sector 0
  end_request: I/O error, dev vda, sector 0

The errors go away if dm stops submitting empty barriers, by reverting:

  commit 52b1fd5a27c625c78373e024bf570af3c9d44a79
  Author: Mikulas Patocka <mpatocka at redhat.com>
    dm: send empty barriers to targets in dm_flush

We should error all barriers, even empty barriers, on devices like
virtio_blk which don't support them.

See also:

  https://bugzilla.redhat.com/514901

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Mikulas Patocka <mpatocka at redhat.com>
Cc: Alasdair G Kergon <agk at redhat.com>
Cc: Neil Brown <neilb at suse.de>
---
 block/blk-core.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index e3299a7..35ad2bb 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1163,8 +1163,7 @@ static int __make_request(struct request_queue *q, struct bio *bio)
 	const int unplug = bio_unplug(bio);
 	int rw_flags;
 
-	if (bio_barrier(bio) && bio_has_data(bio) &&
-	    (q->next_ordered == QUEUE_ORDERED_NONE)) {
+	if (bio_barrier(bio) && (q->next_ordered == QUEUE_ORDERED_NONE)) {
 		bio_endio(bio, -EOPNOTSUPP);
 		return 0;
 	}
-- 
1.6.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1698
retrieving revision 1.1699
diff -u -p -r1.1698 -r1.1699
--- kernel.spec	6 Aug 2009 18:48:09 -0000	1.1698
+++ kernel.spec	6 Aug 2009 19:37:29 -0000	1.1699
@@ -711,6 +711,7 @@ Patch11010: via-hwmon-temp-sensor.patch
 
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
+Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
 %endif
 
@@ -1279,6 +1280,9 @@ ApplyPatch linux-2.6-ksm.patch
 # Optimize KVM for KSM support
 ApplyPatch linux-2.6-ksm-kvm.patch
 
+# Fix block I/O errors in KVM
+ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
+
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
@@ -1953,6 +1957,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com>
+- Fix kvm virtio_blk errors (#514901)
+
 * Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>
 - Hush DRM vblank warnings, they're constant (and harmless) under DRI2.
 



From lennart at fedoraproject.org  Thu Aug  6 19:44:06 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu,  6 Aug 2009 19:44:06 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore, 1.14, 1.15 libatasmart.spec, 1.17,
	1.18 sources, 1.14, 1.15
Message-ID: <20090806194406.687FF11C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 Apr 2009 22:58:08 -0000	1.14
+++ .cvsignore	6 Aug 2009 19:44:06 -0000	1.15
@@ -1 +1 @@
-libatasmart-0.13.tar.gz
+libatasmart-0.14.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libatasmart.spec	25 Jul 2009 05:20:53 -0000	1.17
+++ libatasmart.spec	6 Aug 2009 19:44:06 -0000	1.18
@@ -1,6 +1,6 @@
 Name: libatasmart
-Version: 0.13
-Release: 2%{?dist}
+Version: 0.14
+Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/public/libatasmart-%{version}.tar.gz
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU*
 
 %changelog
+* Thu Aug 6 2009 Lennart Poettering <lpoetter at redhat.com> 0.14-1
+- New upstream 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/libatasmart/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Apr 2009 22:58:08 -0000	1.14
+++ sources	6 Aug 2009 19:44:06 -0000	1.15
@@ -1 +1 @@
-1dbefaaf98c01305ca82df514a0b2258  libatasmart-0.13.tar.gz
+5f8bef94ed2b65748a6e37c059b81042  libatasmart-0.14.tar.gz



From spot at fedoraproject.org  Thu Aug  6 19:44:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 19:44:52 +0000 (UTC)
Subject: rpms/beesu/devel .cvsignore, 1.6, 1.7 beesu.spec, 1.8, 1.9 sources, 
	1.6, 1.7
Message-ID: <20090806194452.9098711C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20947

Modified Files:
	.cvsignore beesu.spec sources 
Log Message:
update to 2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 May 2009 17:59:53 -0000	1.6
+++ .cvsignore	6 Aug 2009 19:44:52 -0000	1.7
@@ -1,3 +1 @@
-beesu-2.3.tar.bz2
-nautilus-beesu-manager-1.0.tar.bz2
-nautilus-beesu-manager-1.2.tar.bz2
+beesu-2.4.tar.bz2


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/beesu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- beesu.spec	24 Jul 2009 17:57:17 -0000	1.8
+++ beesu.spec	6 Aug 2009 19:44:52 -0000	1.9
@@ -1,8 +1,10 @@
 %global nbmversion 1.2
 
 Name: beesu
-Version: 2.3
-Release: 5%{?dist}
+Version: 2.4
+# Don't ever decrease this version or the nbm subpackage will go backwards.
+# It is easier to do this than to track a separate release field.
+Release: 6%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -33,7 +35,7 @@ to Nautilus using beesu to elevate the u
 %setup -q -a1
 
 %build
-make CFLAGS="%{optflags}"
+make CFLAGS="%{optflags} -fno-delete-null-pointer-checks"
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +93,9 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-6
+- beesu updated to 2.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2009 17:59:53 -0000	1.6
+++ sources	6 Aug 2009 19:44:52 -0000	1.7
@@ -1,2 +1 @@
-71cccc332aabe321cf4747cf9f7bf532  beesu-2.3.tar.bz2
-7233e64926347ae3009151c36a42d8d9  nautilus-beesu-manager-1.2.tar.bz2
+580377e57cc6fe5998adc3b8b04fc0e1  beesu-2.4.tar.bz2



From agk at fedoraproject.org  Thu Aug  6 19:48:20 2009
From: agk at fedoraproject.org (agk)
Date: Thu,  6 Aug 2009 19:48:20 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.168,1.169
Message-ID: <20090806194820.823AA11C00E4@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21254

Modified Files:
	lvm2.spec 
Log Message:
The build system failed to recover correctly from the build failure and left
the database in an inconsistent state.  Abandon -1.



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- lvm2.spec	6 Aug 2009 19:28:48 -0000	1.168
+++ lvm2.spec	6 Aug 2009 19:48:20 -0000	1.169
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.51
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -306,7 +306,7 @@ This package contains the device-mapper 
 
 
 %changelog
-* Thu Aug 6 2009 Alasdair Kergon <agk at redhat.com> - 2.02.51-1
+* Thu Aug 6 2009 Alasdair Kergon <agk at redhat.com> - 2.02.51-2
 - Fix clvmd locking broken in 2.02.50-1.
 - Only change LV /dev symlinks on ACTIVATE not PRELOAD (so not done twice).
 - Make lvconvert honour log mirror options combined with downconversion.



From nosnilmot at fedoraproject.org  Thu Aug  6 20:00:18 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Thu,  6 Aug 2009 20:00:18 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec, 1.89,
	1.90 pidgin-NOT-UPSTREAM-2.6.0-reread-resolvconf.patch, 1.1, NONE
Message-ID: <20090806200018.D97E011C0439@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23344

Modified Files:
	pidgin.spec 
Removed Files:
	pidgin-NOT-UPSTREAM-2.6.0-reread-resolvconf.patch 
Log Message:
Drop patch to re-read resolv.conf, upstream implemented something equivalent,
and don't package non-plugin symlinks to libraries the real plugins are
linked to.



Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- pidgin.spec	4 Aug 2009 18:42:54 -0000	1.89
+++ pidgin.spec	6 Aug 2009 20:00:18 -0000	1.90
@@ -114,8 +114,7 @@ Source2:        one_time_password.c
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-Patch0: pidgin-NOT-UPSTREAM-2.6.0-reread-resolvconf.patch
-Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
+Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
 
@@ -370,9 +369,8 @@ Doxygen generated API documentation.
 echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %setup -q -n pidgin-2.6.0devel
 ## Patches 0-99: Fedora specific or upstream wont accept
-%patch0 -p1 -b .resolv
 %if %{force_sound_aplay}
-%patch1 -p1 -b .aplay
+%patch0 -p1 -b .aplay
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
@@ -465,6 +463,11 @@ install -m 644 prefs.xml $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
+# remove non-plugin unrequired library symlinks
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+
 # make sure that we can write to all the files we've installed
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*


--- pidgin-NOT-UPSTREAM-2.6.0-reread-resolvconf.patch DELETED ---



From pghmcfc at fedoraproject.org  Thu Aug  6 20:02:00 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  6 Aug 2009 20:02:00 +0000 (UTC)
Subject: rpms/gtkwave/devel gtkwave-3.2.2-BZ515672.patch, NONE,
	1.1 gtkwave.spec, 1.65, 1.66
Message-ID: <20090806200200.2979C11C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24139

Modified Files:
	gtkwave.spec 
Added Files:
	gtkwave-3.2.2-BZ515672.patch 
Log Message:
add patch to work around #515672 (internal compiler error on PPC)

gtkwave-3.2.2-BZ515672.patch:
 fstapi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gtkwave-3.2.2-BZ515672.patch ---
--- gtkwave-3.2.2/src/helpers/fst/fstapi.c	2009-08-06 20:44:14.000000000 +0100
+++ gtkwave-3.2.2/src/helpers/fst/fstapi.c	2009-08-06 20:45:27.000000000 +0100
@@ -2431,7 +2431,8 @@
 	{
 	FILE *fcomp;
 	off_t offpnt, uclen;
-	char gz_membuf[FST_GZIO_LEN];
+	const BZ515672_BODGE = 32;
+	char gz_membuf[FST_GZIO_LEN + BZ515672_BODGE];
 	void *zhandle;
         int flen = strlen(xc->filename);
         char *hf = calloc(1, flen + 16 + 32 + 1);


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gtkwave.spec	5 Aug 2009 09:34:39 -0000	1.65
+++ gtkwave.spec	6 Aug 2009 20:01:59 -0000	1.66
@@ -3,11 +3,12 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
 Version:	3.2.2
-Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
+Release:	%{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
 Source0:	http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz
+Patch0:		gtkwave-3.2.2-BZ515672.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, bzip2-devel, zlib-devel, gperf, flex
 # BR: /usr/include/tcl.h rather than tcl-devel for compatibility with
@@ -23,6 +24,9 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
+# Work around #515672 (internal compiler error on PPC)
+%patch0 -p1 -b .BZ515672
+
 # Note that GTKWave is a GUI application but no desktop entry is provided for it.
 # This is because the application required at least one mandatory parameter (file
 # to view) and cannot be opened in a "no file" mode from a menu.
@@ -100,6 +104,9 @@ done
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Thu Aug  6 2009 Paul Howarth <paul at city-fan.org> 3.2.2-2
+- add patch to work around #515672 (internal compiler error on PPC)
+
 * Wed Aug  5 2009 Paul Howarth <paul at city-fan.org> 3.2.2-1
 - update to 3.2.2 (new tools evcd2vcd/fst2vcd/vcd2fst)
 - drop print-to-file patch, no longer needed



From adamwill at fedoraproject.org  Thu Aug  6 20:03:35 2009
From: adamwill at fedoraproject.org (Adam Williamson)
Date: Thu,  6 Aug 2009 20:03:35 +0000 (UTC)
Subject: rpms/congruity/devel congruity.spec,1.2,1.3
Message-ID: <20090806200335.6AD4111C00E4@cvs1.fedora.phx.redhat.com>

Author: adamwill

Update of /cvs/pkgs/rpms/congruity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24532

Modified Files:
	congruity.spec 
Log Message:
- new release 13



Index: congruity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/devel/congruity.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- congruity.spec	24 Jul 2009 19:25:40 -0000	1.2
+++ congruity.spec	6 Aug 2009 20:03:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		congruity
-Version:	12
-Release:	2%{?dist}
+Version:	13
+Release:	1%{?dist}
 Summary:	Application to program Logitech Harmony universal remote controls
 
 Group:		Applications/System
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Thu Aug 06 2009 Adam Williamson <awilliam at redhat.com> - 13-1
+- new release 13
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From adamwill at fedoraproject.org  Thu Aug  6 20:06:20 2009
From: adamwill at fedoraproject.org (Adam Williamson)
Date: Thu,  6 Aug 2009 20:06:20 +0000 (UTC)
Subject: rpms/congruity/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090806200620.1EF3E11C00E4@cvs1.fedora.phx.redhat.com>

Author: adamwill

Update of /cvs/pkgs/rpms/congruity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25179

Modified Files:
	.cvsignore sources 
Log Message:
- update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jul 2009 02:39:02 -0000	1.2
+++ .cvsignore	6 Aug 2009 20:06:19 -0000	1.3
@@ -1 +1 @@
-congruity-12.tar.bz2
+congruity-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jul 2009 02:39:02 -0000	1.2
+++ sources	6 Aug 2009 20:06:19 -0000	1.3
@@ -1 +1 @@
-f9bffabe843372a299dddda66576608a  congruity-12.tar.bz2
+39006bf88433c65224ea01e15b9a04df  congruity-13.tar.bz2



From spot at fedoraproject.org  Thu Aug  6 20:09:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 20:09:24 +0000 (UTC)
Subject: rpms/beesu/devel .cvsignore, 1.7, 1.8 beesu.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20090806200924.AAF1811C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25923

Modified Files:
	.cvsignore beesu.spec sources 
Log Message:
fix sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Aug 2009 19:44:52 -0000	1.7
+++ .cvsignore	6 Aug 2009 20:09:24 -0000	1.8
@@ -1 +1,2 @@
 beesu-2.4.tar.bz2
+nautilus-beesu-manager-1.2.tar.bz2


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/beesu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- beesu.spec	6 Aug 2009 19:44:52 -0000	1.9
+++ beesu.spec	6 Aug 2009 20:09:24 -0000	1.10
@@ -4,7 +4,7 @@ Name: beesu
 Version: 2.4
 # Don't ever decrease this version or the nbm subpackage will go backwards.
 # It is easier to do this than to track a separate release field.
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -93,6 +93,9 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-7
+- fix sources
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-6
 - beesu updated to 2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2009 19:44:52 -0000	1.7
+++ sources	6 Aug 2009 20:09:24 -0000	1.8
@@ -1 +1,2 @@
 580377e57cc6fe5998adc3b8b04fc0e1  beesu-2.4.tar.bz2
+7233e64926347ae3009151c36a42d8d9  nautilus-beesu-manager-1.2.tar.bz2



From spot at fedoraproject.org  Thu Aug  6 20:15:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 20:15:33 +0000 (UTC)
Subject: rpms/beesu/F-11 beesu.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <20090806201533.6008511C02C6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27956/F-11

Modified Files:
	beesu.spec sources 
Log Message:
updates in all branches


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-11/beesu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- beesu.spec	11 May 2009 17:59:52 -0000	1.7
+++ beesu.spec	6 Aug 2009 20:15:32 -0000	1.8
@@ -1,8 +1,10 @@
 %global nbmversion 1.2
 
 Name: beesu
-Version: 2.3
-Release: 4%{?dist}
+Version: 2.4
+# Don't ever decrease this version or the nbm subpackage will go backwards.
+# It is easier to do this than to track a separate release field.
+Release: 7%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -33,7 +35,7 @@ to Nautilus using beesu to elevate the u
 %setup -q -a1
 
 %build
-make CFLAGS="%{optflags}"
+make CFLAGS="%{optflags} -fno-delete-null-pointer-checks"
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +93,15 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-7
+- fix sources
+
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-6
+- beesu updated to 2.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-4
 - nautilus-beesu-manager update to 1.2
  - one new installable script to change file access


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2009 17:59:52 -0000	1.6
+++ sources	6 Aug 2009 20:15:32 -0000	1.7
@@ -1,2 +1,2 @@
-71cccc332aabe321cf4747cf9f7bf532  beesu-2.3.tar.bz2
+580377e57cc6fe5998adc3b8b04fc0e1  beesu-2.4.tar.bz2
 7233e64926347ae3009151c36a42d8d9  nautilus-beesu-manager-1.2.tar.bz2



From spot at fedoraproject.org  Thu Aug  6 20:15:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 20:15:33 +0000 (UTC)
Subject: rpms/beesu/F-10 beesu.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090806201533.5D18311C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27956/F-10

Modified Files:
	beesu.spec sources 
Log Message:
updates in all branches


Index: beesu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-10/beesu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- beesu.spec	11 May 2009 17:59:52 -0000	1.6
+++ beesu.spec	6 Aug 2009 20:15:31 -0000	1.7
@@ -1,8 +1,10 @@
 %global nbmversion 1.2
 
 Name: beesu
-Version: 2.3
-Release: 4%{?dist}
+Version: 2.4
+# Don't ever decrease this version or the nbm subpackage will go backwards.
+# It is easier to do this than to track a separate release field.
+Release: 7%{?dist}
 Summary: Graphical wrapper for su
 URL: http://www.honeybeenet.altervista.org
 Group: Applications/System
@@ -33,7 +35,7 @@ to Nautilus using beesu to elevate the u
 %setup -q -a1
 
 %build
-make CFLAGS="%{optflags}"
+make CFLAGS="%{optflags} -fno-delete-null-pointer-checks"
 
 %install
 rm -rf %{buildroot}
@@ -91,6 +93,15 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/nautilus-beesu-manager.png 
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-7
+- fix sources
+
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.4-6
+- beesu updated to 2.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.3-4
 - nautilus-beesu-manager update to 1.2
  - one new installable script to change file access


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2009 17:59:52 -0000	1.6
+++ sources	6 Aug 2009 20:15:31 -0000	1.7
@@ -1,2 +1,2 @@
-71cccc332aabe321cf4747cf9f7bf532  beesu-2.3.tar.bz2
+580377e57cc6fe5998adc3b8b04fc0e1  beesu-2.4.tar.bz2
 7233e64926347ae3009151c36a42d8d9  nautilus-beesu-manager-1.2.tar.bz2



From salimma at fedoraproject.org  Thu Aug  6 20:20:57 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  6 Aug 2009 20:20:57 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets-0.11.0-gecko_ver.patch, NONE,
	1.1 google-gadgets.spec, 1.17, 1.18
Message-ID: <20090806202057.A2F9011C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29060/F-11

Modified Files:
	google-gadgets.spec 
Added Files:
	google-gadgets-0.11.0-gecko_ver.patch 
Log Message:
* Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
- Backport Gecko version detection fix


google-gadgets-0.11.0-gecko_ver.patch:
 libmozjs_glue.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE google-gadgets-0.11.0-gecko_ver.patch ---
--- google-gadgets/extensions/smjs_script_runtime/libmozjs_glue.cc.gecko_ver	2009-05-02 15:05:22.514103786 -0400
+++ google-gadgets/extensions/smjs_script_runtime/libmozjs_glue.cc	2009-08-06 15:55:35.660899747 -0400
@@ -199,7 +199,7 @@
 
   static const GREVersionRange kGREVersion = {
     "1.9a", PR_TRUE,
-    "1.9.1", PR_TRUE
+    "1.9.2", PR_TRUE
   };
 
   rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0,


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- google-gadgets.spec	3 Aug 2009 23:03:59 -0000	1.17
+++ google-gadgets.spec	6 Aug 2009 20:20:55 -0000	1.18
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.0
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -14,6 +14,7 @@ Source0:        http://google-gadgets-fo
 # http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=311
 # patch taken from svn r1239
 Patch0:         %{name}-0.11.0-sidebar_gtk.patch
+Patch1:         %{name}-0.11.0-gecko_ver.patch
 #Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,6 +81,7 @@ developing applications that use %{name}
 %prep
 %setup -q -n %{name}-for-linux-%{version}
 %patch0 -p1 -b .sidebar_gtk
+%patch1 -p1 -b .gecko_ver
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
@@ -208,6 +210,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
+- Backport Gecko version detection fix
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.11.0-3
 - Rebuild against newer gecko
 
@@ -218,7 +223,7 @@ update-desktop-database &> /dev/null || 
 - Update to 0.11.0
 
 * Sat May  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.6-0.1.20090430svn1449%{?dist}
-- Update to SVN checkout, for xulrunner 1.9.1.2 compatibility
+- Update to SVN checkout, for xulrunner 1.9.1 compatibility
 
 * Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 0.10.5-6
 - Rebuild against newer gecko



From salimma at fedoraproject.org  Thu Aug  6 20:20:57 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  6 Aug 2009 20:20:57 +0000 (UTC)
Subject: rpms/google-gadgets/devel google-gadgets-0.11.0-gecko_ver.patch,
	NONE, 1.1 google-gadgets.spec, 1.15, 1.16
Message-ID: <20090806202057.C9BF511C02C6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29060/devel

Modified Files:
	google-gadgets.spec 
Added Files:
	google-gadgets-0.11.0-gecko_ver.patch 
Log Message:
* Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
- Backport Gecko version detection fix


google-gadgets-0.11.0-gecko_ver.patch:
 libmozjs_glue.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE google-gadgets-0.11.0-gecko_ver.patch ---
--- google-gadgets/extensions/smjs_script_runtime/libmozjs_glue.cc.gecko_ver	2009-05-02 15:05:22.514103786 -0400
+++ google-gadgets/extensions/smjs_script_runtime/libmozjs_glue.cc	2009-08-06 15:55:35.660899747 -0400
@@ -199,7 +199,7 @@
 
   static const GREVersionRange kGREVersion = {
     "1.9a", PR_TRUE,
-    "1.9.1", PR_TRUE
+    "1.9.2", PR_TRUE
   };
 
   rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0,


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- google-gadgets.spec	25 Jul 2009 01:04:06 -0000	1.15
+++ google-gadgets.spec	6 Aug 2009 20:20:57 -0000	1.16
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.0
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -14,6 +14,7 @@ Source0:        http://google-gadgets-fo
 # http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=311
 # patch taken from svn r1239
 Patch0:         %{name}-0.11.0-sidebar_gtk.patch
+Patch1:         %{name}-0.11.0-gecko_ver.patch
 #Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,6 +81,7 @@ developing applications that use %{name}
 %prep
 %setup -q -n %{name}-for-linux-%{version}
 %patch0 -p1 -b .sidebar_gtk
+%patch1 -p1 -b .gecko_ver
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 
@@ -208,8 +210,14 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Aug  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.0-4
+- Backport Gecko version detection fix
+
+* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.11.0-3
+- Rebuild against newer gecko
+
+* Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 0.11.0-2
+- Rebuild against newer gecko
 
 * Wed Jul  1 2009 Michel Salim <michel at erdos.localdomain> - 0.11.0-1
 - Update to 0.11.0



From pghmcfc at fedoraproject.org  Thu Aug  6 20:23:42 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu,  6 Aug 2009 20:23:42 +0000 (UTC)
Subject: rpms/gtkwave/devel gtkwave.spec, 1.66,
	1.67 gtkwave-3.2.2-BZ515672.patch, 1.1, NONE
Message-ID: <20090806202342.C299A11C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29733

Modified Files:
	gtkwave.spec 
Removed Files:
	gtkwave-3.2.2-BZ515672.patch 
Log Message:
drop patch for #515672, not needed with gcc 4.4.1-4


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- gtkwave.spec	6 Aug 2009 20:01:59 -0000	1.66
+++ gtkwave.spec	6 Aug 2009 20:23:42 -0000	1.67
@@ -3,12 +3,11 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
 Version:	3.2.2
-Release:	%{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}
+Release:	%{?prerel:0.}3%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
 Source0:	http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz
-Patch0:		gtkwave-3.2.2-BZ515672.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, bzip2-devel, zlib-devel, gperf, flex
 # BR: /usr/include/tcl.h rather than tcl-devel for compatibility with
@@ -24,9 +23,6 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
-# Work around #515672 (internal compiler error on PPC)
-%patch0 -p1 -b .BZ515672
-
 # Note that GTKWave is a GUI application but no desktop entry is provided for it.
 # This is because the application required at least one mandatory parameter (file
 # to view) and cannot be opened in a "no file" mode from a menu.
@@ -104,6 +100,9 @@ done
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Thu Aug  6 2009 Paul Howarth <paul at city-fan.org> 3.2.2-3
+- drop patch for #515672, not needed with gcc 4.4.1-4
+
 * Thu Aug  6 2009 Paul Howarth <paul at city-fan.org> 3.2.2-2
 - add patch to work around #515672 (internal compiler error on PPC)
 


--- gtkwave-3.2.2-BZ515672.patch DELETED ---



From spot at fedoraproject.org  Thu Aug  6 20:26:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  6 Aug 2009 20:26:36 +0000 (UTC)
Subject: rpms/nwsclient/devel nwsclient.spec,1.3,1.4
Message-ID: <20090806202636.137AE11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/nwsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30431

Modified Files:
	nwsclient.spec 
Log Message:
fix FTBFS


Index: nwsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nwsclient/devel/nwsclient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nwsclient.spec	25 Jul 2009 19:43:38 -0000	1.3
+++ nwsclient.spec	6 Aug 2009 20:26:35 -0000	1.4
@@ -3,7 +3,7 @@
 Name:		nwsclient
 Summary: 	NetWorkSpaces Client for Python
 Version:	1.6.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/nws-py/%{name}-%{version}.tar.gz
@@ -46,13 +46,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc %{_datadir}/doc/%{name}-%{version}/
 %{_bindir}/*
-%exclude %{_bindir}/PythonNWSSleighWorker.pyc
-%exclude %{_bindir}/PythonNWSSleighWorker.pyo
 %{python_sitelib}/nws/
 %{python_sitelib}/%{name}-%{version}-py*.egg-info
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.3-5
+- fix FTBFS
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Thu Aug  6 20:35:59 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  6 Aug 2009 20:35:59 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1699,1.1700
Message-ID: <20090806203559.B90C511C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32029

Modified Files:
	kernel.spec 
Log Message:
tag and build


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1699
retrieving revision 1.1700
diff -u -p -r1.1699 -r1.1700
--- kernel.spec	6 Aug 2009 19:37:29 -0000	1.1699
+++ kernel.spec	6 Aug 2009 20:35:59 -0000	1.1700
@@ -1300,7 +1300,7 @@ ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
-ApplyPatch drm-vga-arb.patch
+#ApplyPatch drm-vga-arb.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1957,7 +1957,7 @@ fi
 # and build.
 
 %changelog
-* Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com>
+* Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.31-0.137.rc5.git3
 - Fix kvm virtio_blk errors (#514901)
 
 * Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>



From wtogami at fedoraproject.org  Thu Aug  6 20:44:31 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  6 Aug 2009 20:44:31 +0000 (UTC)
Subject: rpms/farsight2/devel .cvsignore, 1.8, 1.9 farsight2.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <20090806204431.37A1F11C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv713

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
0.0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 May 2009 18:11:23 -0000	1.8
+++ .cvsignore	6 Aug 2009 20:44:30 -0000	1.9
@@ -1 +1 @@
-farsight2-0.0.12.tar.gz
+farsight2-0.0.14.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- farsight2.spec	24 Jul 2009 22:30:41 -0000	1.15
+++ farsight2.spec	6 Aug 2009 20:44:30 -0000	1.16
@@ -6,8 +6,8 @@
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.12
-Release:        4%{?dist}
+Version:        0.0.14
+Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -20,7 +20,7 @@ BuildRequires:	glib2-devel >= 2.14
 BuildRequires:  gstreamer-devel >= %{gst_ver}
 BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
 BuildRequires:	gstreamer-python-devel >= %{gst_python}
-BuildRequires:	libnice-devel >= 0.0.6
+BuildRequires:	libnice-devel >= 0.0.9
 BuildRequires:	gupnp-igd-devel
 BuildRequires:	python-devel
 BuildRequires:	pygobject2-devel
@@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libfsrtpconference.so
 %{_libdir}/gstreamer-0.10/libfsvideoanyrate.so
 %{_libdir}/gstreamer-0.10/libfsrtcpfilter.so
-%{_libdir}/gstreamer-0.10/libfsrtpconference.so
+%{_libdir}/gstreamer-0.10/libfsmsnconference.so
 
 
 %files python
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 06 2009 Warren Togami <wtogami at redhat.com> - 0.0.14-1
+- 0.0.14
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 May 2009 18:11:23 -0000	1.8
+++ sources	6 Aug 2009 20:44:31 -0000	1.9
@@ -1 +1 @@
-cd4cb116947dd8ce2c837ba398e27c4e  farsight2-0.0.12.tar.gz
+fbfa45661b7949abf9bf92c2531ac392  farsight2-0.0.14.tar.gz



From ajax at fedoraproject.org  Thu Aug  6 20:48:38 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  6 Aug 2009 20:48:38 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1700,1.1701
Message-ID: <20090806204838.8E84111C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2071

Modified Files:
	kernel.spec 
Log Message:
oops, uncomment that


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1700
retrieving revision 1.1701
diff -u -p -r1.1700 -r1.1701
--- kernel.spec	6 Aug 2009 20:35:59 -0000	1.1700
+++ kernel.spec	6 Aug 2009 20:48:38 -0000	1.1701
@@ -1300,7 +1300,7 @@ ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
-#ApplyPatch drm-vga-arb.patch
+ApplyPatch drm-vga-arb.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1957,7 +1957,7 @@ fi
 # and build.
 
 %changelog
-* Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.31-0.137.rc5.git3
+* Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.31-0.138.rc5.git3
 - Fix kvm virtio_blk errors (#514901)
 
 * Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>



From wtogami at fedoraproject.org  Thu Aug  6 20:55:40 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  6 Aug 2009 20:55:40 +0000 (UTC)
Subject: rpms/gupnp-igd/F-11 .cvsignore, 1.2, 1.3 gupnp-igd.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090806205540.B3D6A11C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/gupnp-igd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2984

Modified Files:
	.cvsignore gupnp-igd.spec sources 
Log Message:
- Fix macros that were there for no good reason.
- Update to 0.1.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Jan 2009 01:03:04 -0000	1.2
+++ .cvsignore	6 Aug 2009 20:55:40 -0000	1.3
@@ -1 +1 @@
-gupnp-igd-0.1.1.tar.gz
+gupnp-igd-0.1.3.tar.gz


Index: gupnp-igd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/F-11/gupnp-igd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gupnp-igd.spec	25 Feb 2009 02:57:04 -0000	1.2
+++ gupnp-igd.spec	6 Aug 2009 20:55:40 -0000	1.3
@@ -1,8 +1,5 @@
-%define gupnp_ver 0.12.3
-%define glib2_ver 2.14
-
 Name:           gupnp-igd
-Version:        0.1.1
+Version:        0.1.3
 Release:        3%{?dist}
 Summary:	Library to handle UPnP IGD port mapping        
 
@@ -12,8 +9,8 @@ URL:            http://www.gupnp.org/
 Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glib2-devel >= %{glib2_ver}
-BuildRequires:	gupnp-devel >= %{gupnp_ver}
+BuildRequires:  glib2-devel
+BuildRequires:  gupnp-devel
 
 
 %description
@@ -74,6 +71,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 06 2009 Warren Togami <wtogami at redhat.com> - 0.1.3-3
+- Fix macros that were there for no good reason.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.3-1
+- Update to 0.1.3.
+
+* Sat May 16 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jan 2009 01:03:04 -0000	1.2
+++ sources	6 Aug 2009 20:55:40 -0000	1.3
@@ -1 +1 @@
-9db86ff97c54ca89150c81009a8694d6  gupnp-igd-0.1.1.tar.gz
+ea0afa85c19fda67ef0ae54fa4faeb9f  gupnp-igd-0.1.3.tar.gz



From wtogami at fedoraproject.org  Thu Aug  6 20:57:17 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  6 Aug 2009 20:57:17 +0000 (UTC)
Subject: rpms/libnice/F-11 .cvsignore, 1.4, 1.5 libnice.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090806205717.10B7811C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/libnice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3345

Modified Files:
	.cvsignore libnice.spec sources 
Log Message:
0.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 00:20:14 -0000	1.4
+++ .cvsignore	6 Aug 2009 20:57:16 -0000	1.5
@@ -1 +1 @@
-libnice-0.0.6.tar.gz
+libnice-0.0.9.tar.gz


Index: libnice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/F-11/libnice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libnice.spec	14 Apr 2009 00:20:15 -0000	1.4
+++ libnice.spec	6 Aug 2009 20:57:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           libnice
-Version:        0.0.6
+Version:        0.0.9
 Release:        1%{?dist}
 Summary:        GLib ICE implementation
 
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:	glib2-devel
 BuildRequires:  gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
+BuildRequires:	gupnp-igd-devel >= 0.1.2
 
 
 %description
@@ -81,6 +82,23 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
+- Update to 0.0.9.
+- Drop sha1 patch. Fixed upstream.
+
+* 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 Jul 21 2009 Warren Togami <wtogami at redhat.com> - 0.0.8-2
+- stun sha1 patch from upstream to make it work at all
+
+* Sun Jun 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.8-1
+- Update to 0.0.8.
+
+* Sun Jun 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.7-1
+- Update to 0.0.7.
+- Add BR on gupnp-igd-devel.
+
 * Mon Apr 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-1
 - Update to 0.0.6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Apr 2009 00:20:15 -0000	1.4
+++ sources	6 Aug 2009 20:57:16 -0000	1.5
@@ -1 +1 @@
-055e3eedf735ee1257fd4bb9ce86d04e  libnice-0.0.6.tar.gz
+19ac2565ee7487c1f32487b948110b19  libnice-0.0.9.tar.gz



From slankes at fedoraproject.org  Thu Aug  6 20:58:35 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu,  6 Aug 2009 20:58:35 +0000 (UTC)
Subject: rpms/kde-plasma-stasks/F-11 kde-plasma-stasks-4.3.patch, NONE,
	1.1 kde-plasma-stasks.spec, 1.1, 1.2
Message-ID: <20090806205835.0E73E11C02C6@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/kde-plasma-stasks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3568/F-11

Modified Files:
	kde-plasma-stasks.spec 
Added Files:
	kde-plasma-stasks-4.3.patch 
Log Message:
rebuild with added patch for kde 4.3

kde-plasma-stasks-4.3.patch:
 stasks_allinone.patch |only
 stasks_applet.cpp     |   31 ++++++++++++++++---------------
 stasks_applet.h       |   11 +++++------
 stasks_task.cpp       |    2 +-
 stasks_task.h         |    5 ++---
 stasks_tooltip.cpp    |    1 +
 6 files changed, 25 insertions(+), 25 deletions(-)

--- NEW FILE kde-plasma-stasks-4.3.patch ---
Only in stasks-0.5.1/applet: stasks_allinone.patch
diff -ur stasks-0.5.1.orig/applet/stasks_applet.cpp stasks-0.5.1/applet/stasks_applet.cpp
--- stasks-0.5.1.orig/applet/stasks_applet.cpp	2009-03-22 01:18:21.000000000 +0100
+++ stasks-0.5.1/applet/stasks_applet.cpp	2009-07-02 02:24:48.000000000 +0200
@@ -73,9 +73,9 @@
     if (appletContainment) m_groupManager->setScreen(appletContainment->screen());
     
     connect(this, SIGNAL(settingsChanged()), m_groupManager, SLOT(reconnect()));
-    connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractItemPtr)), this, SLOT(itemAdded(AbstractItemPtr)));
-    connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractItemPtr)), this, SLOT(itemRemoved(AbstractItemPtr)));
-    connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractItemPtr)), SLOT(itemPositionChanged(AbstractItemPtr)));
+    connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractGroupableItem *)), this, SLOT(itemAdded(AbstractGroupableItem *)));
+    connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractGroupableItem *)), this, SLOT(itemRemoved(AbstractGroupableItem *)));
+    connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractGroupableItem *)), SLOT(itemPositionChanged(AbstractGroupableItem *)));
     connect(this, SIGNAL(settingsChanged()), this, SLOT(configuration()));
 
     m_layout = new QGraphicsLinearLayout(this);
@@ -87,7 +87,7 @@
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
     setMaximumSize(INT_MAX,INT_MAX);
 }
-void STasksApplet::itemAdded(TaskManager::AbstractItemPtr groupableItem)
+void STasksApplet::itemAdded(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem *item = new STasksItem(groupableItem, this);
     if (m_items.contains(item)) 
@@ -106,7 +106,7 @@
     m_tasksHash[groupableItem] = item;
 
 }
-void STasksApplet::itemRemoved(TaskManager::AbstractItemPtr groupableItem)
+void STasksApplet::itemRemoved(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem* item = m_tasksHash[groupableItem];
     if(item == 0) 
@@ -120,7 +120,7 @@
     m_layout->activate();
     delete item;
 }
-void STasksApplet::itemPositionChanged(AbstractItemPtr groupableItem)
+void STasksApplet::itemPositionChanged(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem* item = m_tasksHash[groupableItem];
     if (!m_items.contains(item))
@@ -138,7 +138,7 @@
     m_items.clear();
     m_tasksHash.clear();
     
-    foreach(TaskManager::AbstractItemPtr item,m_groupManager->rootGroup()->members() ) 
+    foreach(AbstractGroupableItem *item, m_groupManager->rootGroup()->members() ) 
     {
 	itemAdded(item);
     }
@@ -153,6 +153,8 @@
     {
         m_layout->setOrientation((formFactor() == Plasma::Vertical)?Qt::Vertical:Qt::Horizontal);
     }
+    
+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 }
 void STasksApplet::updateSize()
 {
@@ -271,7 +273,7 @@
     }
     return count;
 }
-AbstractItemPtr STasksApplet::selectSubTask(int index)
+AbstractGroupableItem * STasksApplet::selectSubTask(int index)
 {
 
     foreach(STasksItem *item, m_items) 
@@ -345,14 +347,13 @@
     }
 
     //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks;
-    AbstractItemPtr taskItem = selectSubTask( m_activeIconIndex);
-    if (taskItem) 
-    {
-	if (!taskItem->isGroupItem())
-	{
+    AbstractGroupableItem *taskItem = selectSubTask( m_activeIconIndex);
+        if (taskItem) {
+        if (!taskItem->isGroupItem())
+        {
 	    TaskManager::TaskItem* task = static_cast<TaskManager::TaskItem*>(taskItem);
-	    if (task->task())
-	    task->task()->activate();
+	    if (task->task()) 
+	    task->task()->activateRaiseOrIconify();
 	}
     }
 }
diff -ur stasks-0.5.1.orig/applet/stasks_applet.h stasks-0.5.1/applet/stasks_applet.h
--- stasks-0.5.1.orig/applet/stasks_applet.h	2009-03-21 23:22:42.000000000 +0100
+++ stasks-0.5.1/applet/stasks_applet.h	2009-07-02 02:19:39.000000000 +0200
@@ -51,7 +51,6 @@
 using TaskManager::TaskPtr;
 using TaskManager::StartupPtr;
 using TaskManager::GroupPtr;
-using TaskManager::AbstractItemPtr;
 using TaskManager::AbstractGroupableItem;
 using TaskManager::GroupManager;
 using TaskManager::TaskItem;
@@ -88,14 +87,14 @@
 	int fps() {return 35;}
     private:
 	QGraphicsLinearLayout *m_layout;
-	QHash<AbstractItemPtr, STasksItem*> m_tasksHash;
+	QHash<AbstractGroupableItem *, STasksItem*> m_tasksHash;
 	qreal m_iconSize;
 	Ui::stasksConfigG m_configG;
 	Ui::stasksConfigA m_configA;
 	void reload();
 	void constraintsEvent(Plasma::Constraints constraints);
 	int totalSubTasks();
-	AbstractItemPtr selectSubTask(int index);
+	AbstractGroupableItem * selectSubTask(int index);
 	int activeIndex();
 	//task
         TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy;
@@ -119,13 +118,13 @@
     public slots:
 	void updateSize();
 	void updateActiveIconIndex(STasksItem *item);
-	void itemPositionChanged(AbstractItemPtr groupableItem);
+	void itemPositionChanged(AbstractGroupableItem *);
 	void expandTasksChanged(int state);
 	void lightColorChanged(int state);
     private slots:
 	void configuration();
-	void itemAdded(AbstractItemPtr groupableItem);
-	void itemRemoved(AbstractItemPtr groupableItem);
+	void itemAdded(AbstractGroupableItem *);
+	void itemRemoved(AbstractGroupableItem *);
     protected slots:
         void configAccepted();
     signals:
diff -ur stasks-0.5.1.orig/applet/stasks_task.cpp stasks-0.5.1/applet/stasks_task.cpp
--- stasks-0.5.1.orig/applet/stasks_task.cpp	2009-03-21 22:51:03.000000000 +0100
+++ stasks-0.5.1/applet/stasks_task.cpp	2009-07-02 02:20:44.000000000 +0200
@@ -155,7 +155,7 @@
 {
     return m_task->task();
 }
-TaskManager::AbstractItemPtr STasksTask::abstractItem()
+TaskManager::AbstractGroupableItem* STasksTask::abstractItem()
 {
     return m_abstractItem;
 }
diff -ur stasks-0.5.1.orig/applet/stasks_task.h stasks-0.5.1/applet/stasks_task.h
--- stasks-0.5.1.orig/applet/stasks_task.h	2009-03-21 22:50:37.000000000 +0100
+++ stasks-0.5.1/applet/stasks_task.h	2009-07-02 02:21:53.000000000 +0200
@@ -43,7 +43,6 @@
 using TaskManager::TaskPtr;
 using TaskManager::StartupPtr;
 using TaskManager::GroupPtr;
-using TaskManager::AbstractItemPtr;
 using TaskManager::AbstractGroupableItem;
 using TaskManager::GroupManager;
 using TaskManager::TaskItem;
@@ -78,7 +77,7 @@
 	QString description();
 	int desktop();
 	TaskPtr task();
-	TaskManager::AbstractItemPtr abstractItem();
+	TaskManager::AbstractGroupableItem * abstractItem();
 	GroupPtr group();
 	TaskManager::TaskItem* taskItem();
 	StartupPtr startup();
@@ -92,7 +91,7 @@
 	TaskManager::TaskGroup* m_group;
 	STasksApplet *m_applet;
 
-	TaskManager::AbstractItemPtr m_abstractItem;
+	TaskManager::AbstractGroupableItem * m_abstractItem;
 	TaskFlags m_flags;
         ItemType m_type;
     private slots:
diff -ur stasks-0.5.1.orig/applet/stasks_tooltip.cpp stasks-0.5.1/applet/stasks_tooltip.cpp
--- stasks-0.5.1.orig/applet/stasks_tooltip.cpp	2009-03-21 22:37:38.000000000 +0100
+++ stasks-0.5.1/applet/stasks_tooltip.cpp	2009-07-02 02:22:43.000000000 +0200
@@ -75,6 +75,7 @@
 
 STasksToolTip::STasksToolTip(int size, QWidget *parent) : QWidget(parent)
 {
+    setAttribute(Qt::WA_TranslucentBackground);
     setWindowFlags(Qt::ToolTip);
 
     m_size = size;


Index: kde-plasma-stasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-stasks/F-11/kde-plasma-stasks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kde-plasma-stasks.spec	9 May 2009 21:51:05 -0000	1.1
+++ kde-plasma-stasks.spec	6 Aug 2009 20:58:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kde-plasma-stasks
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        Alternate Task-Switcher plasma applet
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php/STasks?content=99739
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/99739-stasks-%{version}.tar.gz
+Patch0:         kde-plasma-stasks-4.3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,6 +19,7 @@ A plasmoid offering an alternate task-sw
 
 %prep
 %setup -qn stasks-%{version}
+%patch0 -p1
 find \( -name "*.cpp" -o -name "*.h" -o -name "README" -o -name "COPYING" \) -exec chmod -x {} \;
 
 %build
@@ -42,6 +44,18 @@ rm -rf %{buildroot}
 %doc COPYING README
 
 %changelog
+* Mon Jul 30 2009 Sven Lankes <sven at lank.es> 0.5.1-6
+- Rebuild to fix changelog dates that broke mass rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Sven Lankes <sven at lank.es> 0.5.1-4
+- Really fix it for KDE 4.3
+
+* Mon Jun 29 2009 Sven Lankes <sven at lank.es> 0.5.1-3
+- Add two patches for KDE 4.3 plasma
+
 * Sat May 09 2009 Sven Lankes <sven at lank.es> 0.5.1-2
 - Remove executable bits from documentation files
 



From slankes at fedoraproject.org  Thu Aug  6 20:58:34 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Thu,  6 Aug 2009 20:58:34 +0000 (UTC)
Subject: rpms/kde-plasma-stasks/F-10 kde-plasma-stasks-4.3.patch, NONE,
	1.1 kde-plasma-stasks.spec, 1.1, 1.2
Message-ID: <20090806205834.C3F8011C00E4@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/kde-plasma-stasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3568/F-10

Modified Files:
	kde-plasma-stasks.spec 
Added Files:
	kde-plasma-stasks-4.3.patch 
Log Message:
rebuild with added patch for kde 4.3

kde-plasma-stasks-4.3.patch:
 stasks_allinone.patch |only
 stasks_applet.cpp     |   31 ++++++++++++++++---------------
 stasks_applet.h       |   11 +++++------
 stasks_task.cpp       |    2 +-
 stasks_task.h         |    5 ++---
 stasks_tooltip.cpp    |    1 +
 6 files changed, 25 insertions(+), 25 deletions(-)

--- NEW FILE kde-plasma-stasks-4.3.patch ---
Only in stasks-0.5.1/applet: stasks_allinone.patch
diff -ur stasks-0.5.1.orig/applet/stasks_applet.cpp stasks-0.5.1/applet/stasks_applet.cpp
--- stasks-0.5.1.orig/applet/stasks_applet.cpp	2009-03-22 01:18:21.000000000 +0100
+++ stasks-0.5.1/applet/stasks_applet.cpp	2009-07-02 02:24:48.000000000 +0200
@@ -73,9 +73,9 @@
     if (appletContainment) m_groupManager->setScreen(appletContainment->screen());
     
     connect(this, SIGNAL(settingsChanged()), m_groupManager, SLOT(reconnect()));
-    connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractItemPtr)), this, SLOT(itemAdded(AbstractItemPtr)));
-    connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractItemPtr)), this, SLOT(itemRemoved(AbstractItemPtr)));
-    connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractItemPtr)), SLOT(itemPositionChanged(AbstractItemPtr)));
+    connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractGroupableItem *)), this, SLOT(itemAdded(AbstractGroupableItem *)));
+    connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractGroupableItem *)), this, SLOT(itemRemoved(AbstractGroupableItem *)));
+    connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractGroupableItem *)), SLOT(itemPositionChanged(AbstractGroupableItem *)));
     connect(this, SIGNAL(settingsChanged()), this, SLOT(configuration()));
 
     m_layout = new QGraphicsLinearLayout(this);
@@ -87,7 +87,7 @@
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
     setMaximumSize(INT_MAX,INT_MAX);
 }
-void STasksApplet::itemAdded(TaskManager::AbstractItemPtr groupableItem)
+void STasksApplet::itemAdded(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem *item = new STasksItem(groupableItem, this);
     if (m_items.contains(item)) 
@@ -106,7 +106,7 @@
     m_tasksHash[groupableItem] = item;
 
 }
-void STasksApplet::itemRemoved(TaskManager::AbstractItemPtr groupableItem)
+void STasksApplet::itemRemoved(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem* item = m_tasksHash[groupableItem];
     if(item == 0) 
@@ -120,7 +120,7 @@
     m_layout->activate();
     delete item;
 }
-void STasksApplet::itemPositionChanged(AbstractItemPtr groupableItem)
+void STasksApplet::itemPositionChanged(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem* item = m_tasksHash[groupableItem];
     if (!m_items.contains(item))
@@ -138,7 +138,7 @@
     m_items.clear();
     m_tasksHash.clear();
     
-    foreach(TaskManager::AbstractItemPtr item,m_groupManager->rootGroup()->members() ) 
+    foreach(AbstractGroupableItem *item, m_groupManager->rootGroup()->members() ) 
     {
 	itemAdded(item);
     }
@@ -153,6 +153,8 @@
     {
         m_layout->setOrientation((formFactor() == Plasma::Vertical)?Qt::Vertical:Qt::Horizontal);
     }
+    
+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 }
 void STasksApplet::updateSize()
 {
@@ -271,7 +273,7 @@
     }
     return count;
 }
-AbstractItemPtr STasksApplet::selectSubTask(int index)
+AbstractGroupableItem * STasksApplet::selectSubTask(int index)
 {
 
     foreach(STasksItem *item, m_items) 
@@ -345,14 +347,13 @@
     }
 
     //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks;
-    AbstractItemPtr taskItem = selectSubTask( m_activeIconIndex);
-    if (taskItem) 
-    {
-	if (!taskItem->isGroupItem())
-	{
+    AbstractGroupableItem *taskItem = selectSubTask( m_activeIconIndex);
+        if (taskItem) {
+        if (!taskItem->isGroupItem())
+        {
 	    TaskManager::TaskItem* task = static_cast<TaskManager::TaskItem*>(taskItem);
-	    if (task->task())
-	    task->task()->activate();
+	    if (task->task()) 
+	    task->task()->activateRaiseOrIconify();
 	}
     }
 }
diff -ur stasks-0.5.1.orig/applet/stasks_applet.h stasks-0.5.1/applet/stasks_applet.h
--- stasks-0.5.1.orig/applet/stasks_applet.h	2009-03-21 23:22:42.000000000 +0100
+++ stasks-0.5.1/applet/stasks_applet.h	2009-07-02 02:19:39.000000000 +0200
@@ -51,7 +51,6 @@
 using TaskManager::TaskPtr;
 using TaskManager::StartupPtr;
 using TaskManager::GroupPtr;
-using TaskManager::AbstractItemPtr;
 using TaskManager::AbstractGroupableItem;
 using TaskManager::GroupManager;
 using TaskManager::TaskItem;
@@ -88,14 +87,14 @@
 	int fps() {return 35;}
     private:
 	QGraphicsLinearLayout *m_layout;
-	QHash<AbstractItemPtr, STasksItem*> m_tasksHash;
+	QHash<AbstractGroupableItem *, STasksItem*> m_tasksHash;
 	qreal m_iconSize;
 	Ui::stasksConfigG m_configG;
 	Ui::stasksConfigA m_configA;
 	void reload();
 	void constraintsEvent(Plasma::Constraints constraints);
 	int totalSubTasks();
-	AbstractItemPtr selectSubTask(int index);
+	AbstractGroupableItem * selectSubTask(int index);
 	int activeIndex();
 	//task
         TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy;
@@ -119,13 +118,13 @@
     public slots:
 	void updateSize();
 	void updateActiveIconIndex(STasksItem *item);
-	void itemPositionChanged(AbstractItemPtr groupableItem);
+	void itemPositionChanged(AbstractGroupableItem *);
 	void expandTasksChanged(int state);
 	void lightColorChanged(int state);
     private slots:
 	void configuration();
-	void itemAdded(AbstractItemPtr groupableItem);
-	void itemRemoved(AbstractItemPtr groupableItem);
+	void itemAdded(AbstractGroupableItem *);
+	void itemRemoved(AbstractGroupableItem *);
     protected slots:
         void configAccepted();
     signals:
diff -ur stasks-0.5.1.orig/applet/stasks_task.cpp stasks-0.5.1/applet/stasks_task.cpp
--- stasks-0.5.1.orig/applet/stasks_task.cpp	2009-03-21 22:51:03.000000000 +0100
+++ stasks-0.5.1/applet/stasks_task.cpp	2009-07-02 02:20:44.000000000 +0200
@@ -155,7 +155,7 @@
 {
     return m_task->task();
 }
-TaskManager::AbstractItemPtr STasksTask::abstractItem()
+TaskManager::AbstractGroupableItem* STasksTask::abstractItem()
 {
     return m_abstractItem;
 }
diff -ur stasks-0.5.1.orig/applet/stasks_task.h stasks-0.5.1/applet/stasks_task.h
--- stasks-0.5.1.orig/applet/stasks_task.h	2009-03-21 22:50:37.000000000 +0100
+++ stasks-0.5.1/applet/stasks_task.h	2009-07-02 02:21:53.000000000 +0200
@@ -43,7 +43,6 @@
 using TaskManager::TaskPtr;
 using TaskManager::StartupPtr;
 using TaskManager::GroupPtr;
-using TaskManager::AbstractItemPtr;
 using TaskManager::AbstractGroupableItem;
 using TaskManager::GroupManager;
 using TaskManager::TaskItem;
@@ -78,7 +77,7 @@
 	QString description();
 	int desktop();
 	TaskPtr task();
-	TaskManager::AbstractItemPtr abstractItem();
+	TaskManager::AbstractGroupableItem * abstractItem();
 	GroupPtr group();
 	TaskManager::TaskItem* taskItem();
 	StartupPtr startup();
@@ -92,7 +91,7 @@
 	TaskManager::TaskGroup* m_group;
 	STasksApplet *m_applet;
 
-	TaskManager::AbstractItemPtr m_abstractItem;
+	TaskManager::AbstractGroupableItem * m_abstractItem;
 	TaskFlags m_flags;
         ItemType m_type;
     private slots:
diff -ur stasks-0.5.1.orig/applet/stasks_tooltip.cpp stasks-0.5.1/applet/stasks_tooltip.cpp
--- stasks-0.5.1.orig/applet/stasks_tooltip.cpp	2009-03-21 22:37:38.000000000 +0100
+++ stasks-0.5.1/applet/stasks_tooltip.cpp	2009-07-02 02:22:43.000000000 +0200
@@ -75,6 +75,7 @@
 
 STasksToolTip::STasksToolTip(int size, QWidget *parent) : QWidget(parent)
 {
+    setAttribute(Qt::WA_TranslucentBackground);
     setWindowFlags(Qt::ToolTip);
 
     m_size = size;


Index: kde-plasma-stasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-stasks/F-10/kde-plasma-stasks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kde-plasma-stasks.spec	9 May 2009 21:51:05 -0000	1.1
+++ kde-plasma-stasks.spec	6 Aug 2009 20:58:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kde-plasma-stasks
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        Alternate Task-Switcher plasma applet
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php/STasks?content=99739
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/99739-stasks-%{version}.tar.gz
+Patch0:         kde-plasma-stasks-4.3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,6 +19,7 @@ A plasmoid offering an alternate task-sw
 
 %prep
 %setup -qn stasks-%{version}
+%patch0 -p1
 find \( -name "*.cpp" -o -name "*.h" -o -name "README" -o -name "COPYING" \) -exec chmod -x {} \;
 
 %build
@@ -42,6 +44,18 @@ rm -rf %{buildroot}
 %doc COPYING README
 
 %changelog
+* Mon Jul 30 2009 Sven Lankes <sven at lank.es> 0.5.1-6
+- Rebuild to fix changelog dates that broke mass rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Sven Lankes <sven at lank.es> 0.5.1-4
+- Really fix it for KDE 4.3
+
+* Mon Jun 29 2009 Sven Lankes <sven at lank.es> 0.5.1-3
+- Add two patches for KDE 4.3 plasma
+
 * Sat May 09 2009 Sven Lankes <sven at lank.es> 0.5.1-2
 - Remove executable bits from documentation files
 



From smilner at fedoraproject.org  Thu Aug  6 21:13:54 2009
From: smilner at fedoraproject.org (smilner)
Date: Thu,  6 Aug 2009 21:13:54 +0000 (UTC)
Subject: rpms/Django/devel Django.spec,1.24,1.25
Message-ID: <20090806211354.64EFC11C00E4@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5535

Modified Files:
	Django.spec 
Log Message:
applied patch for Django in rawhide


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- Django.spec	2 Aug 2009 00:35:26 -0000	1.24
+++ Django.spec	6 Aug 2009 21:13:52 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -93,22 +93,22 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
-
-%if 0%{?rhel} == 5
-%exclude %{_bindir}/django-admin.pyc
-%exclude %{_bindir}/django-admin.pyo
-%endif
 # -----------------
+ 
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
 
+
 %changelog
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+- Applied Daniel Mach's patch from bz#516016.
+
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
 - Update for Django 1.1 release.
 - Moved /usr/bin/django-admin.py to /usr/bin/django-admin



From wtogami at fedoraproject.org  Thu Aug  6 21:16:17 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  6 Aug 2009 21:16:17 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.29, 1.30 pidgin.spec, 1.90,
	1.91 sources, 1.29, 1.30
Message-ID: <20090806211617.CE9A211C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5938

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
new snapshot - theoretically better sound quality in voice chat



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	4 Aug 2009 18:42:53 -0000	1.29
+++ .cvsignore	6 Aug 2009 21:16:17 -0000	1.30
@@ -1 +1 @@
-pidgin-2.6.0-devel-20090804.tar.bz2
+pidgin-2.6.0-devel-20090806.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- pidgin.spec	6 Aug 2009 20:00:18 -0000	1.90
+++ pidgin.spec	6 Aug 2009 21:16:17 -0000	1.91
@@ -82,8 +82,8 @@
 
 Name:		pidgin
 Version:	2.6.0
-%define snapshot 20090804
-Release:	0.9.%{snapshot}%{?dist}
+%define snapshot 20090806
+Release:	0.10.%{snapshot}%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -444,7 +444,6 @@ install -m 0755 libpurple/plugins/one_ti
 
 desktop-file-install --vendor pidgin --delete-original       \
   --add-category X-Red-Hat-Base                            \
-  --copy-generic-name-to-name                              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
   $RPM_BUILD_ROOT%{_datadir}/applications/pidgin.desktop
 
@@ -616,6 +615,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.10.20090806
+- new snapshot - theoretically better sound quality in voice chat
+
 * Tue Aug 04 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.9.20090804
 - new snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	4 Aug 2009 18:42:54 -0000	1.29
+++ sources	6 Aug 2009 21:16:17 -0000	1.30
@@ -1 +1 @@
-64cef02befaa484076becdd24181c1a9  pidgin-2.6.0-devel-20090804.tar.bz2
+8357c7bbe385f6e7db3932f6039c6ca4  pidgin-2.6.0-devel-20090806.tar.bz2



From rstrode at fedoraproject.org  Thu Aug  6 21:27:12 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu,  6 Aug 2009 21:27:12 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.479,1.480
Message-ID: <20090806212712.B923F11C00E4@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8786

Modified Files:
	gdm.spec 
Log Message:
- rebuild



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- gdm.spec	2 Aug 2009 03:11:55 -0000	1.479
+++ gdm.spec	6 Aug 2009 21:27:12 -0000	1.480
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.27.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -122,7 +122,7 @@ Requires:  fprintd-pam
 
 %description
 GDM provides the graphical login screen, shown shortly after boot up,
-log out, and when user switching.
+log out, and when user-switching.
 
 %description user-switch-applet
 The GDM user switcher applet provides a mechanism for changing among
@@ -390,6 +390,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Aug 06 2009 Ray Strode <rstrode at redhat.com> 1:2.27.4-5
+- rebuild
+
 * Sat Aug  1 2009 Matthias Clasen <mclasen at redhat.com> 1:2.27.4-4
 - Drop unneeded direct deps
 



From dcantrel at fedoraproject.org  Thu Aug  6 21:30:06 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  6 Aug 2009 21:30:06 +0000 (UTC)
Subject: rpms/dhcp/F-11 56dhclient,NONE,1.1 dhcp.spec,1.261,1.262
Message-ID: <20090806213006.595E611C0439@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9234

Modified Files:
	dhcp.spec 
Added Files:
	56dhclient 
Log Message:
* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
  resume with active dhclient leases (#479639)



--- NEW FILE 56dhclient ---
#!/bin/sh
# If we are running dhclient, shutdown running instances cleanly and
# bring them back up on resume.

. "${PM_FUNCTIONS}"

PM_DHCLIENT_RUNDIR="${PM_UTILS_RUNDIR}/network"
PM_DHCLIENT_SUSPEND="${PM_DHCLIENT_RUNDIR}/dhclient.suspend"

suspend_dhclient() {
    [ ! -d /etc/sysconfig/network-scripts ] && return
    [ ! -x /sbin/ifdown ] && return

    [ ! -d ${PM_DHCLIENT_RUNDIR} ] && /bin/mkdir -p ${PM_DHCLIENT_RUNDIR}
    [ -f ${PM_DHCLIENT_SUSPEND} ] && /bin/rm -f ${PM_DHCLIENT_SUSPEND}

    cd /etc/sysconfig/network-scripts
    for ifcfg in ifcfg-* ; do
        # Clear relevant parameters set by previous interface
        # (lo doesn't set them)
        NM_CONTROLLED=
        BOOTPROTO=

        . ./${ifcfg}

        if [ "${NM_CONTROLLED}" = "no" ] || [ "${NM_CONTROLLED}" = "n" ] || [ "${NM_CONTROLLED}" = "false" ]; then
            if [ "${BOOTPROTO}" = "bootp" ] || [ "${BOOTPROTO}" = "dhcp" ] || [ -z "${BOOTPROTO}" ]; then
                # device is not NetworkManager controlled and uses dhcp,
                # now see if it's actually up at the moment
                /sbin/ip link show ${DEVICE} | /bin/grep -qE "state (UP|UNKNOWN)" >/dev/null 2>&1
                if [ $? -eq 0 ]; then
                    echo "${DEVICE}" >> ${PM_DHCLIENT_SUSPEND}
                    /sbin/ifdown ${DEVICE}
                fi
            fi
        fi
    done
}

resume_dhclient() {
    [ ! -f ${PM_DHCLIENT_SUSPEND} ] && return
    [ ! -x /sbin/ifup ] && return

    cd /etc/sysconfig/network-scripts
    while read device ; do
        /sbin/ifup ${DEVICE}
    done < ${PM_DHCLIENT_SUSPEND}

    /bin/rm -f ${PM_DHCLIENT_SUSPEND}
}

case "$1" in
    hibernate|suspend)
        suspend_dhclient
        ;;
    thaw|resume)
        resume_dhclient
        ;;
    *) exit $NA
        ;;
esac


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- dhcp.spec	6 Aug 2009 00:04:51 -0000	1.261
+++ dhcp.spec	6 Aug 2009 21:30:06 -0000	1.262
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  1%{?dist}
+Release:  2%{?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.
@@ -28,6 +28,7 @@ Source2:  dhcpd.init
 Source3:  dhcrelay.init
 Source4:  dhclient-script
 Source5:  README.dhclient.d
+Source6:  56dhclient
 
 Patch0:   %{name}-4.1.0-errwarn-message.patch
 Patch1:   %{name}-4.1.0-memory.patch
@@ -340,6 +341,10 @@ EOF
 # Install empty directory for dhclient.d scripts
 %{__mkdir} -p %{buildroot}%{dhcpconfdir}/dhclient.d
 
+# Install pm-utils script to handle suspend/resume and dhclient leases
+%{__mkdir} -p %{buildroot}%{_libdir}/pm-utils/sleep.d
+%{__install} -p -m 0755 %{SOURCE6} %{buildroot}%{_libdir}/pm-utils/sleep.d
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -433,6 +438,7 @@ fi
 %dir %{_localstatedir}/lib/dhclient
 /sbin/dhclient
 /sbin/dhclient-script
+%{_libdir}/pm-utils
 %attr(0644,root,root) %{_mandir}/man5/dhclient.conf.5.gz
 %attr(0644,root,root) %{_mandir}/man5/dhclient.leases.5.gz
 %attr(0644,root,root) %{_mandir}/man8/dhclient.8.gz
@@ -452,6 +458,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
+- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
+  resume with active dhclient leases (#479639)
+
 * Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
 - Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
   CVE-2009-0692



From mbarnes at fedoraproject.org  Thu Aug  6 21:39:29 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  6 Aug 2009 21:39:29 +0000 (UTC)
Subject: rpms/pygtk2/F-11 pygtk-2.14.1-fix-invalid-free.patch, NONE,
	1.1 pygtk2.spec, 1.23, 1.24
Message-ID: <20090806213929.ADF7611C00E4@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10495

Modified Files:
	pygtk2.spec 
Added Files:
	pygtk-2.14.1-fix-invalid-free.patch 
Log Message:

* Thu Aug 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.1-2.fc11
- Add patch for GNOME bug #585458 (invalid freeing of string).


pygtk-2.14.1-fix-invalid-free.patch:
 gtk.override |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE pygtk-2.14.1-fix-invalid-free.patch ---
diff -up pygtk-2.14.1/gtk/gtk.override.fix-invalid-free pygtk-2.14.1/gtk/gtk.override
--- pygtk-2.14.1/gtk/gtk.override.fix-invalid-free	2009-03-05 17:06:49.000000000 -0500
+++ pygtk-2.14.1/gtk/gtk.override	2009-08-06 17:37:20.000000000 -0400
@@ -7496,7 +7496,8 @@ _wrap_gtk_recent_info_get_application_in
                                                &time_);
     if (ret) {
         py_ret = Py_BuildValue("(sii)", app_exec, count, time_);
-        g_free(app_exec);
+        /* Note that we mustn't free 'app_exec' even though it's not
+         * 'const'.  See bug #585458. */
     } else {
         py_ret = Py_None;
     }


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/F-11/pygtk2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pygtk2.spec	6 Mar 2009 12:54:08 -0000	1.23
+++ pygtk2.spec	6 Aug 2009 21:39:29 -0000	1.24
@@ -15,7 +15,7 @@
 
 Name: pygtk2
 Version: 2.14.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -30,6 +30,9 @@ Patch0: pygtk-nodisplay-exception.patch
 # RH bug #379051 / GNOME bug #523001
 Patch1: pygtk2-2.12.1-pygtk-generic-cell-renderer-activate.patch
 
+# GNOME bug #585458
+Patch2: pygtk-2.14.1-fix-invalid-free.patch
+
 ### Dependencies ###
 
 # Leave these requirements alone!  RPM isn't smart enough
@@ -102,6 +105,7 @@ This package contains documentation file
 %setup -q -n pygtk-%{version}
 %patch0 -p1
 %patch1 -p1 -b .pygtk-generic-cell-renderer-activate
+%patch2 -p1 -b .fix-invalid-free
 
 %build
 %configure --enable-thread --enable-numpy
@@ -163,6 +167,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Thu Aug 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.1-2.fc11
+- Add patch for GNOME bug #585458 (invalid freeing of string).
+
 * Fri Mar 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.1-1.fc11
 - Update to 2.14.1
 - Bump gtk2_version to 2.9.0 for gtkunixprint requirement.



From till at fedoraproject.org  Thu Aug  6 21:41:33 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu,  6 Aug 2009 21:41:33 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.280,1.281
Message-ID: <20090806214133.3C05611C00E4@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855

Modified Files:
	comps-f11.xml.in 
Log Message:
remove it security group/category



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- comps-f11.xml.in	5 Aug 2009 15:05:25 -0000	1.280
+++ comps-f11.xml.in	6 Aug 2009 21:41:32 -0000	1.281
@@ -4542,41 +4542,6 @@
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
-  <group>                                                         
-    <id>it-security-reconnaissance</id>                                       
-    <_name>IT Security Reconnaissance Tools</_name>                           
-    <_description>These tools can be used to perform IT security related reconnaissance.</_description>
-    <default>false</default>                                                                           
-    <uservisible>true</uservisible>
-    <packagelist>
-        <packagereq type="default">argus</packagereq>
-        <packagereq type="default">cgf</packagereq>
-        <packagereq type="default">dsniff</packagereq>
-        <packagereq type="default">etherape</packagereq>
-        <packagereq type="default">ettercap</packagereq>
-        <packagereq type="default">examiner</packagereq>
-        <packagereq type="default">firewalk</packagereq>
-        <packagereq type="default">halberd</packagereq>
-        <packagereq type="default">hping3</packagereq>
-        <packagereq type="default">hunt</packagereq>
-        <packagereq type="default">iptraf</packagereq>
-        <packagereq type="default">Lynis</packagereq>
-        <packagereq type="default">nbtscan</packagereq>
-        <packagereq type="default">nc6</packagereq>
-        <packagereq type="default">nc</packagereq>
-        <packagereq type="default">nessus</packagereq>
-        <packagereq type="default">nmap</packagereq>
-        <packagereq type="default">pcapdiff</packagereq>
-        <packagereq type="default">picviz</packagereq>
-        <packagereq type="default">scanssh</packagereq>
-        <packagereq type="default">socat</packagereq>
-        <packagereq type="default">tcpdump</packagereq>
-        <packagereq type="default">tcpxtract</packagereq>
-        <packagereq type="default">tiger</packagereq>
-        <packagereq type="default">wireshark</packagereq>
-        <packagereq type="default">xprobe2</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>romanian-support</id>
     <_name>Romanian Support</_name>
@@ -5967,14 +5932,6 @@
     </packagelist>
   </group>
   <category>
-    <id>it-security</id>
-    <_name>IT Security</_name>
-    <_description>These packages are useful for IT security related tasks.</_description>
-    <grouplist>
-      <groupid>it-security-reconnaissance</groupid>
-    </grouplist>
-  </category>
-  <category>
     <id>language-support</id>
     <_name>Languages</_name>
     <_description>These packages provide support for various locales including fonts and input methods.</_description>



From dcantrel at fedoraproject.org  Thu Aug  6 21:45:19 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu,  6 Aug 2009 21:45:19 +0000 (UTC)
Subject: rpms/dhcp/devel 56dhclient,NONE,1.1 dhcp.spec,1.266,1.267
Message-ID: <20090806214519.41A9611C00E4@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11380

Modified Files:
	dhcp.spec 
Added Files:
	56dhclient 
Log Message:
* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
  resume with active dhclient leases (#479639)



--- NEW FILE 56dhclient ---
#!/bin/sh
# If we are running dhclient, shutdown running instances cleanly and
# bring them back up on resume.

. "${PM_FUNCTIONS}"

PM_DHCLIENT_RUNDIR="${PM_UTILS_RUNDIR}/network"
PM_DHCLIENT_SUSPEND="${PM_DHCLIENT_RUNDIR}/dhclient.suspend"

suspend_dhclient() {
    [ ! -d /etc/sysconfig/network-scripts ] && return
    [ ! -x /sbin/ifdown ] && return

    [ ! -d ${PM_DHCLIENT_RUNDIR} ] && /bin/mkdir -p ${PM_DHCLIENT_RUNDIR}
    [ -f ${PM_DHCLIENT_SUSPEND} ] && /bin/rm -f ${PM_DHCLIENT_SUSPEND}

    cd /etc/sysconfig/network-scripts
    for ifcfg in ifcfg-* ; do
        # Clear relevant parameters set by previous interface
        # (lo doesn't set them)
        NM_CONTROLLED=
        BOOTPROTO=

        . ./${ifcfg}

        if [ "${NM_CONTROLLED}" = "no" ] || [ "${NM_CONTROLLED}" = "n" ] || [ "${NM_CONTROLLED}" = "false" ]; then
            if [ "${BOOTPROTO}" = "bootp" ] || [ "${BOOTPROTO}" = "dhcp" ] || [ -z "${BOOTPROTO}" ]; then
                # device is not NetworkManager controlled and uses dhcp,
                # now see if it's actually up at the moment
                /sbin/ip link show ${DEVICE} | /bin/grep -qE "state (UP|UNKNOWN)" >/dev/null 2>&1
                if [ $? -eq 0 ]; then
                    echo "${DEVICE}" >> ${PM_DHCLIENT_SUSPEND}
                    /sbin/ifdown ${DEVICE}
                fi
            fi
        fi
    done
}

resume_dhclient() {
    [ ! -f ${PM_DHCLIENT_SUSPEND} ] && return
    [ ! -x /sbin/ifup ] && return

    cd /etc/sysconfig/network-scripts
    while read device ; do
        /sbin/ifup ${DEVICE}
    done < ${PM_DHCLIENT_SUSPEND}

    /bin/rm -f ${PM_DHCLIENT_SUSPEND}
}

case "$1" in
    hibernate|suspend)
        suspend_dhclient
        ;;
    thaw|resume)
        resume_dhclient
        ;;
    *) exit $NA
        ;;
esac


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- dhcp.spec	5 Aug 2009 23:59:10 -0000	1.266
+++ dhcp.spec	6 Aug 2009 21:45:18 -0000	1.267
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  1%{?dist}
+Release:  2%{?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.
@@ -29,6 +29,7 @@ Source3:  dhcrelay.init
 Source4:  dhclient-script
 Source5:  README.dhclient.d
 Source6:  10-dhclient
+Source7:  56dhclient
 
 Patch0:   %{name}-4.1.0-errwarn-message.patch
 Patch1:   %{name}-4.1.0-memory.patch
@@ -350,6 +351,10 @@ EOF
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
 %{__install} -p -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
 
+# Install pm-utils script to handle suspend/resume and dhclient leases
+%{__mkdir} -p %{buildroot}%{_libdir}/pm-utils/sleep.d
+%{__install} -p -m 0755 %{SOURCE6} %{buildroot}%{_libdir}/pm-utils/sleep.d
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -446,6 +451,7 @@ fi
 %dir %{_localstatedir}/lib/dhclient
 /sbin/dhclient
 /sbin/dhclient-script
+%{_libdir}/pm-utils
 %attr(0644,root,root) %{_mandir}/man5/dhclient.conf.5.gz
 %attr(0644,root,root) %{_mandir}/man5/dhclient.leases.5.gz
 %attr(0644,root,root) %{_mandir}/man8/dhclient.8.gz
@@ -465,6 +471,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
+- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
+  resume with active dhclient leases (#479639)
+
 * Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
 - Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
   CVE-2009-0692



From pkgdb at fedoraproject.org  Thu Aug  6 21:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 21:53:05 +0000
Subject: [pkgdb] olpc-utils: cjb has requested commit
Message-ID: <20090806215306.6C18210F8A0@bastion2.fedora.phx.redhat.com>

cjb has requested the commit acl on olpc-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 21:53:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 21:53:28 +0000
Subject: [pkgdb] olpc-utils: cjb has requested watchcommits
Message-ID: <20090806215328.7CDA710F882@bastion2.fedora.phx.redhat.com>

cjb has requested the watchcommits acl on olpc-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 21:55:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 21:55:15 +0000
Subject: [pkgdb] olpc-utils: sayamind has requested watchcommits
Message-ID: <20090806215515.34AF110F890@bastion2.fedora.phx.redhat.com>

sayamind has requested the watchcommits acl on olpc-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 21:55:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 21:55:16 +0000
Subject: [pkgdb] olpc-utils: sayamind has requested commit
Message-ID: <20090806215516.DE08310F8A9@bastion2.fedora.phx.redhat.com>

sayamind has requested the commit acl on olpc-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 21:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 21:56:22 +0000
Subject: [pkgdb] olpc-utils: cjb has requested watchbugzilla
Message-ID: <20090806215623.5CE5F10F8BA@bastion2.fedora.phx.redhat.com>

cjb has requested the watchbugzilla acl on olpc-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:10:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:10:06 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806221006.2049D10F882@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on olpc-utils (Fedora 11) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:10:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:10:17 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806221018.C28FC10F882@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on olpc-utils (Fedora 11) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:10:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:10:22 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806221023.3185D10F8B6@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on olpc-utils (Fedora 11) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:10:30 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806221030.60DF410F8BE@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on olpc-utils (Fedora 11) to Approved for sayamind

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:13:44 +0000
Subject: [pkgdb] olpc-utils: cjb has requested approveacls
Message-ID: <20090806221344.9738110F882@bastion2.fedora.phx.redhat.com>

cjb has requested the approveacls acl on olpc-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From hubbitus at fedoraproject.org  Thu Aug  6 22:15:25 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  6 Aug 2009 22:15:25 +0000 (UTC)
Subject: rpms/ccze/devel ccze-0.2.1-Wmulticharacter.patch, NONE,
	1.1 ccze.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090806221525.3FA2011C00E4@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ccze/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18399/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ccze-0.2.1-Wmulticharacter.patch ccze.spec import.log 
Log Message:
Initial push ccze into Fedora.



ccze-0.2.1-Wmulticharacter.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ccze-0.2.1-Wmulticharacter.patch ---
diff -NaurEbBH ccze-0.2.1.orig/src/Makefile.in ccze-0.2.1/src/Makefile.in
--- ccze-0.2.1.orig/src/Makefile.in	2003-05-13 14:09:30.000000000 -0400
+++ ccze-0.2.1/src/Makefile.in	2009-07-11 15:06:20.000000000 -0400
@@ -22,7 +22,7 @@
 		-Wbad-function-cast -Wsign-compare -Wchar-subscripts \
 		-Wcomment -Wformat -Wformat-nonliteral -Wformat-security \
 		-Wimplicit -Wmain -Wmissing-braces -Wparentheses \
-		-Wreturn-type -Wswitch -Wmulticharacter \
+		-Wreturn-type -Wswitch \
 		-Wmissing-noreturn -Wmissing-declarations @WFLAGS_3X@
 WFLAGS_ICC	= -Wall -wd193,279,810,869,1418,1419
 WFLAGS_3X	= -Wsequence-point -Wdiv-by-zero -W -Wunused \


--- NEW FILE ccze.spec ---
Summary:		A robust log colorizer
Summary(ru):	?????? ???????????? ?????
Name:		ccze
Version:		0.2.1
Release:		5%{?dist}
# http://web.archive.org/web/20040803024236/bonehunter.rulez.org/CCZE.phtml
URL:			http://bonehunter.rulez.org/CCZE.html
License:		GPLv2+
Group:		Applications/Text
Source:		ftp://bonehunter.rulez.org/pub/ccze/stable/ccze-%{version}.tar.gz
# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel >= 5.0, pcre-devel >= 3.1
# Upstream is dead. So, patch himself.
Patch0:		ccze-0.2.1-Wmulticharacter.patch

%description
CCZE is a roboust and modular log colorizer, with plugins for apm,
exim, fetchmail, httpd, postfix, procmail, squid, syslog, ulogd,
vsftpd, xferlog and more.

%description -l ru
CCZE ??? ?????? ? ????????? ?????????????? ?????. ??????? ??????-
-??????? ???: apm, exim, fetchmail, httpd, postfix, procmail, squid,
syslog, ulogd, vsftpd, xferlog ? ??????.

%prep
%setup -q
%patch0 -p1 -b .-Wmulticharacter

%build
%configure --with-builtins=all
# To avoid problem: /usr/include/errno.h:69: error: two or more data types in declaration specifiers
# we add -D__error_t_defined=1 to inform what errno_t already defined.
make %{?_smp_mflags} CFLAGS="%{optflags} -D__error_t_defined=1"

%install
rm -rf %{buildroot}

iconv -f ISO-8859-1 -t UTF-8 THANKS > THANKS.new
touch --reference THANKS THANKS.new
mv -f THANKS.new THANKS

#% makeinstall
make install DESTDIR="%{buildroot}"

install -d %{buildroot}/%{_sysconfdir}
src/ccze-dump > %{buildroot}/%{_sysconfdir}/cczerc

rm %{buildroot}/%{_includedir}/ccze.h

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog ChangeLog-0.1 NEWS README THANKS FAQ
%config(noreplace) %{_sysconfdir}/cczerc
%{_bindir}/ccze
%{_bindir}/ccze-cssdump
%{_mandir}/man1/ccze.1*
%{_mandir}/man1/ccze-cssdump.1*
%{_mandir}/man7/ccze-plugin.7*

%changelog
* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-5
- Things of Martin Gieseking in informal review:
- Add %%{?_smp_mflags} to make.
- Change BuildRoot.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-4
- %%makeinstall replaced by make install DESTDIR="%%{buildroot}" as pointed by Jussi Lehtola.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-3
- Import form ftp://ftp.pbone.net/mirror/norlug.org/norlug/redhat-7.3/SRPMS/ccze-0.2.1-2.norlug.src.rpm
- Reformat with tabs.
- Remove unneded defines, and replece it by direct values in appropriate tags:
	%%define version 0.2.1, %%define dist stable, %%define release 2.norlug
- Add %%{?dist} part into release
- Add Fedora system optflags to build
- Add Patch0: ccze-0.2.1-Wmulticharacter.patch
- Add -D__error_t_defined=1 into CFLAGS.
- Add clan buildroot in %%install
- License changed from GPL to GPLv2+
- Add noreplace option to %%config file
- Remove devel file %%{_includedir}/ccze.h
- Add COPYING to %%doc files.
- iconv'ed THANKS from ISO-8859-1 (guessed)
- Add Summary and description on Russian.

* Thu Sep 4 2003 Chip Cuccio <chipster at norlug.org> 0.2.1-2
- initial build


--- NEW FILE import.log ---
ccze-0_2_1-5_fc11:HEAD:ccze-0.2.1-5.fc11.src.rpm:1249596890


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:31:39 -0000	1.1
+++ .cvsignore	6 Aug 2009 22:15:23 -0000	1.2
@@ -0,0 +1 @@
+ccze-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:31:39 -0000	1.1
+++ sources	6 Aug 2009 22:15:23 -0000	1.2
@@ -0,0 +1 @@
+221966bce7c5f011eca38157241a0432  ccze-0.2.1.tar.gz



From pkgdb at fedoraproject.org  Thu Aug  6 22:16:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:16:29 +0000
Subject: [pkgdb] olpc-utils: cjb has requested watchbugzilla
Message-ID: <20090806221630.2914610F882@bastion2.fedora.phx.redhat.com>

cjb has requested the watchbugzilla acl on olpc-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:16:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:16:32 +0000
Subject: [pkgdb] olpc-utils: cjb has requested watchcommits
Message-ID: <20090806221632.388CB10F8A2@bastion2.fedora.phx.redhat.com>

cjb has requested the watchcommits acl on olpc-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:16:34 +0000
Subject: [pkgdb] olpc-utils: cjb has requested commit
Message-ID: <20090806221634.B1D7610F8B4@bastion2.fedora.phx.redhat.com>

cjb has requested the commit acl on olpc-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:16:37 +0000
Subject: [pkgdb] olpc-utils: cjb has requested approveacls
Message-ID: <20090806221637.C4EE810F8BA@bastion2.fedora.phx.redhat.com>

cjb has requested the approveacls acl on olpc-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From hubbitus at fedoraproject.org  Thu Aug  6 22:17:43 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  6 Aug 2009 22:17:43 +0000 (UTC)
Subject: rpms/ccze/F-10 ccze-0.2.1-Wmulticharacter.patch, NONE, 1.1 ccze.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090806221743.EF81311C00E4@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ccze/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	ccze-0.2.1-Wmulticharacter.patch ccze.spec import.log 
Log Message:
Initial push ccze into Fedora.



ccze-0.2.1-Wmulticharacter.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ccze-0.2.1-Wmulticharacter.patch ---
diff -NaurEbBH ccze-0.2.1.orig/src/Makefile.in ccze-0.2.1/src/Makefile.in
--- ccze-0.2.1.orig/src/Makefile.in	2003-05-13 14:09:30.000000000 -0400
+++ ccze-0.2.1/src/Makefile.in	2009-07-11 15:06:20.000000000 -0400
@@ -22,7 +22,7 @@
 		-Wbad-function-cast -Wsign-compare -Wchar-subscripts \
 		-Wcomment -Wformat -Wformat-nonliteral -Wformat-security \
 		-Wimplicit -Wmain -Wmissing-braces -Wparentheses \
-		-Wreturn-type -Wswitch -Wmulticharacter \
+		-Wreturn-type -Wswitch \
 		-Wmissing-noreturn -Wmissing-declarations @WFLAGS_3X@
 WFLAGS_ICC	= -Wall -wd193,279,810,869,1418,1419
 WFLAGS_3X	= -Wsequence-point -Wdiv-by-zero -W -Wunused \


--- NEW FILE ccze.spec ---
Summary:		A robust log colorizer
Summary(ru):	?????? ???????????? ?????
Name:		ccze
Version:		0.2.1
Release:		5%{?dist}
# http://web.archive.org/web/20040803024236/bonehunter.rulez.org/CCZE.phtml
URL:			http://bonehunter.rulez.org/CCZE.html
License:		GPLv2+
Group:		Applications/Text
Source:		ftp://bonehunter.rulez.org/pub/ccze/stable/ccze-%{version}.tar.gz
# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel >= 5.0, pcre-devel >= 3.1
# Upstream is dead. So, patch himself.
Patch0:		ccze-0.2.1-Wmulticharacter.patch

%description
CCZE is a roboust and modular log colorizer, with plugins for apm,
exim, fetchmail, httpd, postfix, procmail, squid, syslog, ulogd,
vsftpd, xferlog and more.

%description -l ru
CCZE ??? ?????? ? ????????? ?????????????? ?????. ??????? ??????-
-??????? ???: apm, exim, fetchmail, httpd, postfix, procmail, squid,
syslog, ulogd, vsftpd, xferlog ? ??????.

%prep
%setup -q
%patch0 -p1 -b .-Wmulticharacter

%build
%configure --with-builtins=all
# To avoid problem: /usr/include/errno.h:69: error: two or more data types in declaration specifiers
# we add -D__error_t_defined=1 to inform what errno_t already defined.
make %{?_smp_mflags} CFLAGS="%{optflags} -D__error_t_defined=1"

%install
rm -rf %{buildroot}

iconv -f ISO-8859-1 -t UTF-8 THANKS > THANKS.new
touch --reference THANKS THANKS.new
mv -f THANKS.new THANKS

#% makeinstall
make install DESTDIR="%{buildroot}"

install -d %{buildroot}/%{_sysconfdir}
src/ccze-dump > %{buildroot}/%{_sysconfdir}/cczerc

rm %{buildroot}/%{_includedir}/ccze.h

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog ChangeLog-0.1 NEWS README THANKS FAQ
%config(noreplace) %{_sysconfdir}/cczerc
%{_bindir}/ccze
%{_bindir}/ccze-cssdump
%{_mandir}/man1/ccze.1*
%{_mandir}/man1/ccze-cssdump.1*
%{_mandir}/man7/ccze-plugin.7*

%changelog
* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-5
- Things of Martin Gieseking in informal review:
- Add %%{?_smp_mflags} to make.
- Change BuildRoot.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-4
- %%makeinstall replaced by make install DESTDIR="%%{buildroot}" as pointed by Jussi Lehtola.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-3
- Import form ftp://ftp.pbone.net/mirror/norlug.org/norlug/redhat-7.3/SRPMS/ccze-0.2.1-2.norlug.src.rpm
- Reformat with tabs.
- Remove unneded defines, and replece it by direct values in appropriate tags:
	%%define version 0.2.1, %%define dist stable, %%define release 2.norlug
- Add %%{?dist} part into release
- Add Fedora system optflags to build
- Add Patch0: ccze-0.2.1-Wmulticharacter.patch
- Add -D__error_t_defined=1 into CFLAGS.
- Add clan buildroot in %%install
- License changed from GPL to GPLv2+
- Add noreplace option to %%config file
- Remove devel file %%{_includedir}/ccze.h
- Add COPYING to %%doc files.
- iconv'ed THANKS from ISO-8859-1 (guessed)
- Add Summary and description on Russian.

* Thu Sep 4 2003 Chip Cuccio <chipster at norlug.org> 0.2.1-2
- initial build


--- NEW FILE import.log ---
ccze-0_2_1-5_fc11:F-10:ccze-0.2.1-5.fc11.src.rpm:1249597033


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:31:39 -0000	1.1
+++ .cvsignore	6 Aug 2009 22:17:43 -0000	1.2
@@ -0,0 +1 @@
+ccze-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:31:39 -0000	1.1
+++ sources	6 Aug 2009 22:17:43 -0000	1.2
@@ -0,0 +1 @@
+221966bce7c5f011eca38157241a0432  ccze-0.2.1.tar.gz



From hubbitus at fedoraproject.org  Thu Aug  6 22:19:53 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  6 Aug 2009 22:19:53 +0000 (UTC)
Subject: rpms/ccze/F-11 ccze-0.2.1-Wmulticharacter.patch, NONE, 1.1 ccze.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090806221953.BB24911C00E4@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ccze/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20004/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	ccze-0.2.1-Wmulticharacter.patch ccze.spec import.log 
Log Message:
Initial push ccze into Fedora.



ccze-0.2.1-Wmulticharacter.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ccze-0.2.1-Wmulticharacter.patch ---
diff -NaurEbBH ccze-0.2.1.orig/src/Makefile.in ccze-0.2.1/src/Makefile.in
--- ccze-0.2.1.orig/src/Makefile.in	2003-05-13 14:09:30.000000000 -0400
+++ ccze-0.2.1/src/Makefile.in	2009-07-11 15:06:20.000000000 -0400
@@ -22,7 +22,7 @@
 		-Wbad-function-cast -Wsign-compare -Wchar-subscripts \
 		-Wcomment -Wformat -Wformat-nonliteral -Wformat-security \
 		-Wimplicit -Wmain -Wmissing-braces -Wparentheses \
-		-Wreturn-type -Wswitch -Wmulticharacter \
+		-Wreturn-type -Wswitch \
 		-Wmissing-noreturn -Wmissing-declarations @WFLAGS_3X@
 WFLAGS_ICC	= -Wall -wd193,279,810,869,1418,1419
 WFLAGS_3X	= -Wsequence-point -Wdiv-by-zero -W -Wunused \


--- NEW FILE ccze.spec ---
Summary:		A robust log colorizer
Summary(ru):	?????? ???????????? ?????
Name:		ccze
Version:		0.2.1
Release:		5%{?dist}
# http://web.archive.org/web/20040803024236/bonehunter.rulez.org/CCZE.phtml
URL:			http://bonehunter.rulez.org/CCZE.html
License:		GPLv2+
Group:		Applications/Text
Source:		ftp://bonehunter.rulez.org/pub/ccze/stable/ccze-%{version}.tar.gz
# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel >= 5.0, pcre-devel >= 3.1
# Upstream is dead. So, patch himself.
Patch0:		ccze-0.2.1-Wmulticharacter.patch

%description
CCZE is a roboust and modular log colorizer, with plugins for apm,
exim, fetchmail, httpd, postfix, procmail, squid, syslog, ulogd,
vsftpd, xferlog and more.

%description -l ru
CCZE ??? ?????? ? ????????? ?????????????? ?????. ??????? ??????-
-??????? ???: apm, exim, fetchmail, httpd, postfix, procmail, squid,
syslog, ulogd, vsftpd, xferlog ? ??????.

%prep
%setup -q
%patch0 -p1 -b .-Wmulticharacter

%build
%configure --with-builtins=all
# To avoid problem: /usr/include/errno.h:69: error: two or more data types in declaration specifiers
# we add -D__error_t_defined=1 to inform what errno_t already defined.
make %{?_smp_mflags} CFLAGS="%{optflags} -D__error_t_defined=1"

%install
rm -rf %{buildroot}

iconv -f ISO-8859-1 -t UTF-8 THANKS > THANKS.new
touch --reference THANKS THANKS.new
mv -f THANKS.new THANKS

#% makeinstall
make install DESTDIR="%{buildroot}"

install -d %{buildroot}/%{_sysconfdir}
src/ccze-dump > %{buildroot}/%{_sysconfdir}/cczerc

rm %{buildroot}/%{_includedir}/ccze.h

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog ChangeLog-0.1 NEWS README THANKS FAQ
%config(noreplace) %{_sysconfdir}/cczerc
%{_bindir}/ccze
%{_bindir}/ccze-cssdump
%{_mandir}/man1/ccze.1*
%{_mandir}/man1/ccze-cssdump.1*
%{_mandir}/man7/ccze-plugin.7*

%changelog
* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-5
- Things of Martin Gieseking in informal review:
- Add %%{?_smp_mflags} to make.
- Change BuildRoot.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-4
- %%makeinstall replaced by make install DESTDIR="%%{buildroot}" as pointed by Jussi Lehtola.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-3
- Import form ftp://ftp.pbone.net/mirror/norlug.org/norlug/redhat-7.3/SRPMS/ccze-0.2.1-2.norlug.src.rpm
- Reformat with tabs.
- Remove unneded defines, and replece it by direct values in appropriate tags:
	%%define version 0.2.1, %%define dist stable, %%define release 2.norlug
- Add %%{?dist} part into release
- Add Fedora system optflags to build
- Add Patch0: ccze-0.2.1-Wmulticharacter.patch
- Add -D__error_t_defined=1 into CFLAGS.
- Add clan buildroot in %%install
- License changed from GPL to GPLv2+
- Add noreplace option to %%config file
- Remove devel file %%{_includedir}/ccze.h
- Add COPYING to %%doc files.
- iconv'ed THANKS from ISO-8859-1 (guessed)
- Add Summary and description on Russian.

* Thu Sep 4 2003 Chip Cuccio <chipster at norlug.org> 0.2.1-2
- initial build


--- NEW FILE import.log ---
ccze-0_2_1-5_fc11:F-11:ccze-0.2.1-5.fc11.src.rpm:1249597171


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:31:39 -0000	1.1
+++ .cvsignore	6 Aug 2009 22:19:53 -0000	1.2
@@ -0,0 +1 @@
+ccze-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:31:39 -0000	1.1
+++ sources	6 Aug 2009 22:19:53 -0000	1.2
@@ -0,0 +1 @@
+221966bce7c5f011eca38157241a0432  ccze-0.2.1.tar.gz



From hubbitus at fedoraproject.org  Thu Aug  6 22:21:13 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu,  6 Aug 2009 22:21:13 +0000 (UTC)
Subject: rpms/ccze/EL-5 ccze-0.2.1-Wmulticharacter.patch, NONE, 1.1 ccze.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090806222113.6338B11C00E4@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/ccze/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20357/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	ccze-0.2.1-Wmulticharacter.patch ccze.spec import.log 
Log Message:
Initial push ccze into Fedora.



ccze-0.2.1-Wmulticharacter.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ccze-0.2.1-Wmulticharacter.patch ---
diff -NaurEbBH ccze-0.2.1.orig/src/Makefile.in ccze-0.2.1/src/Makefile.in
--- ccze-0.2.1.orig/src/Makefile.in	2003-05-13 14:09:30.000000000 -0400
+++ ccze-0.2.1/src/Makefile.in	2009-07-11 15:06:20.000000000 -0400
@@ -22,7 +22,7 @@
 		-Wbad-function-cast -Wsign-compare -Wchar-subscripts \
 		-Wcomment -Wformat -Wformat-nonliteral -Wformat-security \
 		-Wimplicit -Wmain -Wmissing-braces -Wparentheses \
-		-Wreturn-type -Wswitch -Wmulticharacter \
+		-Wreturn-type -Wswitch \
 		-Wmissing-noreturn -Wmissing-declarations @WFLAGS_3X@
 WFLAGS_ICC	= -Wall -wd193,279,810,869,1418,1419
 WFLAGS_3X	= -Wsequence-point -Wdiv-by-zero -W -Wunused \


--- NEW FILE ccze.spec ---
Summary:		A robust log colorizer
Summary(ru):	?????? ???????????? ?????
Name:		ccze
Version:		0.2.1
Release:		5%{?dist}
# http://web.archive.org/web/20040803024236/bonehunter.rulez.org/CCZE.phtml
URL:			http://bonehunter.rulez.org/CCZE.html
License:		GPLv2+
Group:		Applications/Text
Source:		ftp://bonehunter.rulez.org/pub/ccze/stable/ccze-%{version}.tar.gz
# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel >= 5.0, pcre-devel >= 3.1
# Upstream is dead. So, patch himself.
Patch0:		ccze-0.2.1-Wmulticharacter.patch

%description
CCZE is a roboust and modular log colorizer, with plugins for apm,
exim, fetchmail, httpd, postfix, procmail, squid, syslog, ulogd,
vsftpd, xferlog and more.

%description -l ru
CCZE ??? ?????? ? ????????? ?????????????? ?????. ??????? ??????-
-??????? ???: apm, exim, fetchmail, httpd, postfix, procmail, squid,
syslog, ulogd, vsftpd, xferlog ? ??????.

%prep
%setup -q
%patch0 -p1 -b .-Wmulticharacter

%build
%configure --with-builtins=all
# To avoid problem: /usr/include/errno.h:69: error: two or more data types in declaration specifiers
# we add -D__error_t_defined=1 to inform what errno_t already defined.
make %{?_smp_mflags} CFLAGS="%{optflags} -D__error_t_defined=1"

%install
rm -rf %{buildroot}

iconv -f ISO-8859-1 -t UTF-8 THANKS > THANKS.new
touch --reference THANKS THANKS.new
mv -f THANKS.new THANKS

#% makeinstall
make install DESTDIR="%{buildroot}"

install -d %{buildroot}/%{_sysconfdir}
src/ccze-dump > %{buildroot}/%{_sysconfdir}/cczerc

rm %{buildroot}/%{_includedir}/ccze.h

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog ChangeLog-0.1 NEWS README THANKS FAQ
%config(noreplace) %{_sysconfdir}/cczerc
%{_bindir}/ccze
%{_bindir}/ccze-cssdump
%{_mandir}/man1/ccze.1*
%{_mandir}/man1/ccze-cssdump.1*
%{_mandir}/man7/ccze-plugin.7*

%changelog
* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-5
- Things of Martin Gieseking in informal review:
- Add %%{?_smp_mflags} to make.
- Change BuildRoot.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-4
- %%makeinstall replaced by make install DESTDIR="%%{buildroot}" as pointed by Jussi Lehtola.

* Sat Jul 11 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.1-3
- Import form ftp://ftp.pbone.net/mirror/norlug.org/norlug/redhat-7.3/SRPMS/ccze-0.2.1-2.norlug.src.rpm
- Reformat with tabs.
- Remove unneded defines, and replece it by direct values in appropriate tags:
	%%define version 0.2.1, %%define dist stable, %%define release 2.norlug
- Add %%{?dist} part into release
- Add Fedora system optflags to build
- Add Patch0: ccze-0.2.1-Wmulticharacter.patch
- Add -D__error_t_defined=1 into CFLAGS.
- Add clan buildroot in %%install
- License changed from GPL to GPLv2+
- Add noreplace option to %%config file
- Remove devel file %%{_includedir}/ccze.h
- Add COPYING to %%doc files.
- iconv'ed THANKS from ISO-8859-1 (guessed)
- Add Summary and description on Russian.

* Thu Sep 4 2003 Chip Cuccio <chipster at norlug.org> 0.2.1-2
- initial build


--- NEW FILE import.log ---
ccze-0_2_1-5_fc11:EL-5:ccze-0.2.1-5.fc11.src.rpm:1249597241


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:31:39 -0000	1.1
+++ .cvsignore	6 Aug 2009 22:21:12 -0000	1.2
@@ -0,0 +1 @@
+ccze-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccze/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:31:39 -0000	1.1
+++ sources	6 Aug 2009 22:21:13 -0000	1.2
@@ -0,0 +1 @@
+221966bce7c5f011eca38157241a0432  ccze-0.2.1.tar.gz



From hadess at fedoraproject.org  Thu Aug  6 22:23:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  6 Aug 2009 22:23:04 +0000 (UTC)
Subject: rpms/libgdata/F-11 .cvsignore, 1.4, 1.5 libgdata.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090806222304.C894511C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20722

Modified Files:
	.cvsignore libgdata.spec sources 
Log Message:
* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
- Update to 0.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 May 2009 15:46:46 -0000	1.4
+++ .cvsignore	6 Aug 2009 22:23:04 -0000	1.5
@@ -1 +1 @@
-libgdata-0.3.0.tar.bz2
+libgdata-0.4.0.tar.bz2


Index: libgdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/libgdata.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libgdata.spec	26 May 2009 15:46:46 -0000	1.4
+++ libgdata.spec	6 Aug 2009 22:23:04 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libgdata
-Version:        0.3.0
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Library for the GData protocol
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/libgdata
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel libsoup-devel libxml2-devel gtk-doc intltool
@@ -69,6 +69,9 @@ cd gdata/tests
 %{_datadir}/gtk-doc/html/gdata/
 
 %changelog
+* Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
+- Update to 0.4.0
+
 * Tue May 26 2009 Bastien Nocera <bnocera at redhat.com> 0.3.0-1
 - Update to 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 May 2009 15:46:46 -0000	1.4
+++ sources	6 Aug 2009 22:23:04 -0000	1.5
@@ -1 +1 @@
-54c4de90fd00cd6685cbdd8c5054abb7  libgdata-0.3.0.tar.bz2
+06b14f1cd96432b0717ed03fe013ca4d  libgdata-0.4.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Aug  6 22:26:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:26:33 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806222633.6B8B310F89F@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on olpc-utils (Fedora 11) to Approved for sayamind

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:26:44 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806222644.AF5DB10F8AF@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on olpc-utils (Fedora devel) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:26:46 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806222646.CE42210F8B4@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on olpc-utils (Fedora devel) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:26:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:26:49 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806222649.5CF8810F8BA@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on olpc-utils (Fedora devel) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:26:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:26:54 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806222656.18A9710F8C3@bastion2.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on olpc-utils (Fedora devel) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Thu Aug  6 22:27:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:27:01 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090806222701.CD31E10F89F@bastion2.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on olpc-utils (Fedora 11) to Approved for cjb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From wtogami at fedoraproject.org  Thu Aug  6 22:35:14 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu,  6 Aug 2009 22:35:14 +0000 (UTC)
Subject: rpms/farsight2/F-11 .cvsignore, 1.6, 1.7 farsight2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090806223514.694E811C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/farsight2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22205

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
0.0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jun 2009 16:57:44 -0000	1.6
+++ .cvsignore	6 Aug 2009 22:35:13 -0000	1.7
@@ -1 +1 @@
-farsight2-0.0.12.tar.gz
+farsight2-0.0.14.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-11/farsight2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- farsight2.spec	22 Jun 2009 16:57:44 -0000	1.10
+++ farsight2.spec	6 Aug 2009 22:35:14 -0000	1.11
@@ -3,11 +3,10 @@
 %define gst_ver 0.10.22
 %define gst_plugins_base_ver 0.10.22
 %define gst_plugins_good 0.10.7
-%define gst_plugins_farsight 0.12.9
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.12
+Version:        0.0.14
 Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
@@ -21,7 +20,7 @@ BuildRequires:	glib2-devel >= 2.14
 BuildRequires:  gstreamer-devel >= %{gst_ver}
 BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
 BuildRequires:	gstreamer-python-devel >= %{gst_python}
-BuildRequires:	libnice-devel >= 0.0.6
+BuildRequires:	libnice-devel >= 0.0.9
 BuildRequires:	gupnp-igd-devel
 BuildRequires:	python-devel
 BuildRequires:	pygobject2-devel
@@ -101,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libfsrtpconference.so
 %{_libdir}/gstreamer-0.10/libfsvideoanyrate.so
 %{_libdir}/gstreamer-0.10/libfsrtcpfilter.so
-%{_libdir}/gstreamer-0.10/libfsrtpconference.so
+%{_libdir}/gstreamer-0.10/libfsmsnconference.so
 
 
 %files python
@@ -119,9 +118,26 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Jun 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-1
+* Thu Aug 06 2009 Warren Togami <wtogami at redhat.com> - 0.0.14-1
+- 0.0.14
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Warren Togami <wtogami at redhat.com> - 0.0.12-3
+- rebuild
+
+* Mon Jun 22 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-2
+- Remove unnecessary requires on gst-plugins-farsight.
+
+* Sat May 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-1
 - Update to 0.0.12.
-- Remove unnecessary requires on gstreamer-plugins-farsight. (#507009)
+
+* Tue May 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.11-1
+- Update to 0.0.11.
+
+* Wed May 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.10-1
+- Update to 0.0.10.
 
 * Tue Apr  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
 - Update to 0.0.9.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jun 2009 16:57:44 -0000	1.6
+++ sources	6 Aug 2009 22:35:14 -0000	1.7
@@ -1 +1 @@
-cd4cb116947dd8ce2c837ba398e27c4e  farsight2-0.0.12.tar.gz
+fbfa45661b7949abf9bf92c2531ac392  farsight2-0.0.14.tar.gz



From pkgdb at fedoraproject.org  Thu Aug  6 22:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:40:54 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested watchbugzilla
Message-ID: <20090806224054.9BA9110F890@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-plasma-stasks (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:40:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:40:58 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested watchcommits
Message-ID: <20090806224059.26BB210F8A0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-plasma-stasks (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:02 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested commit
Message-ID: <20090806224103.05CD810F8A9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-plasma-stasks (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:04 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested commit
Message-ID: <20090806224104.A384210F8AF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-plasma-stasks (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:05 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested watchcommits
Message-ID: <20090806224106.19D9810F8B5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-plasma-stasks (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:07 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested watchbugzilla
Message-ID: <20090806224108.3DCE310F8B6@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-plasma-stasks (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:09 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested watchbugzilla
Message-ID: <20090806224109.F404510F8B9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-plasma-stasks (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:12 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested commit
Message-ID: <20090806224112.8090410F8BF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-plasma-stasks (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:41:11 +0000
Subject: [pkgdb] kde-plasma-stasks: mathstuf has requested watchcommits
Message-ID: <20090806224111.4EDDA10F8BC@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-plasma-stasks (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:46:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:46:58 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224658.B31D710F890@bastion2.fedora.phx.redhat.com>

slankes has set the watchbugzilla acl on kde-plasma-stasks (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:04 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224704.2B7D110F8A0@bastion2.fedora.phx.redhat.com>

slankes has set the watchcommits acl on kde-plasma-stasks (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:05 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224706.33FAC10F8AC@bastion2.fedora.phx.redhat.com>

slankes has set the commit acl on kde-plasma-stasks (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:12 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224714.8CB0A10F8AF@bastion2.fedora.phx.redhat.com>

slankes has set the commit acl on kde-plasma-stasks (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:11 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224713.3000310F8B2@bastion2.fedora.phx.redhat.com>

slankes has set the watchbugzilla acl on kde-plasma-stasks (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:12 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224713.DFDEA10F8B7@bastion2.fedora.phx.redhat.com>

slankes has set the watchcommits acl on kde-plasma-stasks (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:18 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224718.CBD1410F8BE@bastion2.fedora.phx.redhat.com>

slankes has set the watchcommits acl on kde-plasma-stasks (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:16 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224716.A05F110F8BB@bastion2.fedora.phx.redhat.com>

slankes has set the commit acl on kde-plasma-stasks (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:47:20 +0000
Subject: [pkgdb] kde-plasma-stasks had acl change status
Message-ID: <20090806224720.7DEC710F8C1@bastion2.fedora.phx.redhat.com>

slankes has set the watchbugzilla acl on kde-plasma-stasks (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-plasma-stasks



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:12 +0000
Subject: [pkgdb] strigi: mathstuf has requested watchcommits
Message-ID: <20090806225515.531A610F8B4@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on strigi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:13 +0000
Subject: [pkgdb] strigi: mathstuf has requested commit
Message-ID: <20090806225515.9809210F8B5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on strigi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:18 +0000
Subject: [pkgdb] strigi: mathstuf has requested watchbugzilla
Message-ID: <20090806225518.9CC8010F8B7@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on strigi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:27 +0000
Subject: [pkgdb] strigi: mathstuf has requested watchcommits
Message-ID: <20090806225528.8D2A010F8B9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on strigi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:29 +0000
Subject: [pkgdb] strigi: mathstuf has requested watchbugzilla
Message-ID: <20090806225530.2B48E10F8BE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on strigi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:32 +0000
Subject: [pkgdb] strigi: mathstuf has requested commit
Message-ID: <20090806225532.A030510F8C3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on strigi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:35 +0000
Subject: [pkgdb] strigi: mathstuf has requested watchbugzilla
Message-ID: <20090806225537.C89F710F8CE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on strigi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:36 +0000
Subject: [pkgdb] strigi: mathstuf has requested watchcommits
Message-ID: <20090806225538.0594510F8D0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on strigi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:36 +0000
Subject: [pkgdb] strigi: mathstuf has requested commit
Message-ID: <20090806225538.00FB210F882@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on strigi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:47 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested watchcommits
Message-ID: <20090806225547.EF25F10F8A9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on solar-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:48 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested commit
Message-ID: <20090806225549.0CA5610F879@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on solar-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:52 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested watchbugzilla
Message-ID: <20090806225553.935BE10F8DD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on solar-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:58 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested watchbugzilla
Message-ID: <20090806225558.A45F210F8E5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on solar-kde-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:55:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:55:59 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested watchcommits
Message-ID: <20090806225559.79E9C10F8E8@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on solar-kde-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:01 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested commit
Message-ID: <20090806225601.9676810F890@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on solar-kde-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:03 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested commit
Message-ID: <20090806225603.D8D4310F8FA@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on solar-kde-theme (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:06 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested watchbugzilla
Message-ID: <20090806225606.EE4A610F901@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on solar-kde-theme (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:07 +0000
Subject: [pkgdb] solar-kde-theme: mathstuf has requested watchcommits
Message-ID: <20090806225607.3938810F908@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on solar-kde-theme (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:18 +0000
Subject: [pkgdb] leonidas-kde-theme: mathstuf has requested watchbugzilla
Message-ID: <20090806225618.1465A10F8B9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on leonidas-kde-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:22 +0000
Subject: [pkgdb] leonidas-kde-theme: mathstuf has requested watchcommits
Message-ID: <20090806225622.BD14C10F8BE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on leonidas-kde-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:22 +0000
Subject: [pkgdb] leonidas-kde-theme: mathstuf has requested commit
Message-ID: <20090806225623.53E1210F8BF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on leonidas-kde-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:23 +0000
Subject: [pkgdb] leonidas-kde-theme: mathstuf has requested commit
Message-ID: <20090806225623.EF3CF10F8BA@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on leonidas-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:26 +0000
Subject: [pkgdb] leonidas-kde-theme: mathstuf has requested watchcommits
Message-ID: <20090806225627.164B610F923@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on leonidas-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:29 +0000
Subject: [pkgdb] leonidas-kde-theme: mathstuf has requested watchbugzilla
Message-ID: <20090806225629.72CDC10F92B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on leonidas-kde-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:39 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested watchbugzilla
Message-ID: <20090806225639.CDE8C10F8C0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegames3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:39 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested watchcommits
Message-ID: <20090806225640.20BEC10F933@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegames3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:40 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested commit
Message-ID: <20090806225641.58DF510F939@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegames3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:46 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested watchcommits
Message-ID: <20090806225647.4075710F93F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegames3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:46 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested commit
Message-ID: <20090806225647.4510110F944@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegames3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:46 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested watchbugzilla
Message-ID: <20090806225647.0D14A10F943@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegames3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:50 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested watchbugzilla
Message-ID: <20090806225650.B256010F94F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegames3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:51 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested commit
Message-ID: <20090806225651.915D510F955@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegames3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:51 +0000
Subject: [pkgdb] kdegames3: mathstuf has requested watchcommits
Message-ID: <20090806225651.B518F10F958@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegames3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 22:56:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:56:59 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested watchbugzilla
Message-ID: <20090806225659.BFC0810F8CD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-i18n (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:02 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested commit
Message-ID: <20090806225703.6F43110F965@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-i18n (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:03 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested watchcommits
Message-ID: <20090806225704.7844910F96A@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-i18n (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:17 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested commit
Message-ID: <20090806225724.67FA710F97E@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-i18n (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:16 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested watchcommits
Message-ID: <20090806225722.691B810F976@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-i18n (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:16 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested watchbugzilla
Message-ID: <20090806225722.9946D10F8D2@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-i18n (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:21 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested watchcommits
Message-ID: <20090806225725.8B36110F970@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-i18n (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:22 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested commit
Message-ID: <20090806225725.E199B10F982@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-i18n (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:25 +0000
Subject: [pkgdb] kde-i18n: mathstuf has requested watchbugzilla
Message-ID: <20090806225727.381DF10F986@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-i18n (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:34 +0000
Subject: [pkgdb] sip: mathstuf has requested watchbugzilla
Message-ID: <20090806225735.E70B610F8D1@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on sip (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:35 +0000
Subject: [pkgdb] sip: mathstuf has requested watchcommits
Message-ID: <20090806225736.7BDB310F985@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on sip (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:35 +0000
Subject: [pkgdb] sip: mathstuf has requested commit
Message-ID: <20090806225737.4A6F610F987@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on sip (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:42 +0000
Subject: [pkgdb] sip: mathstuf has requested watchbugzilla
Message-ID: <20090806225742.BA6D410F98C@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on sip (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:42 +0000
Subject: [pkgdb] sip: mathstuf has requested watchcommits
Message-ID: <20090806225743.1D0E710F98F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on sip (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:43 +0000
Subject: [pkgdb] sip: mathstuf has requested commit
Message-ID: <20090806225743.8018810F992@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on sip (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:47 +0000
Subject: [pkgdb] sip: mathstuf has requested watchbugzilla
Message-ID: <20090806225747.B10D310F8D8@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on sip (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:48 +0000
Subject: [pkgdb] sip: mathstuf has requested watchcommits
Message-ID: <20090806225748.9830B10F8D9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on sip (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:50 +0000
Subject: [pkgdb] sip: mathstuf has requested commit
Message-ID: <20090806225750.427AF10F997@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on sip (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:58 +0000
Subject: [pkgdb] soprano: mathstuf has requested watchcommits
Message-ID: <20090806225758.BA8E610F8D4@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on soprano (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:58 +0000
Subject: [pkgdb] soprano: mathstuf has requested watchbugzilla
Message-ID: <20090806225759.09B3D10F999@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on soprano (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:57:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:57:59 +0000
Subject: [pkgdb] soprano: mathstuf has requested commit
Message-ID: <20090806225759.7DB2E10F99E@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on soprano (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:58:06 +0000
Subject: [pkgdb] soprano: mathstuf has requested watchbugzilla
Message-ID: <20090806225809.CD9B710F9A4@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:58:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:58:08 +0000
Subject: [pkgdb] soprano: mathstuf has requested watchcommits
Message-ID: <20090806225811.77BD910F8E1@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:58:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:58:08 +0000
Subject: [pkgdb] soprano: mathstuf has requested commit
Message-ID: <20090806225812.076BC10F9AC@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:58:12 +0000
Subject: [pkgdb] soprano: mathstuf has requested watchcommits
Message-ID: <20090806225813.E4E2B10F9AE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on soprano (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:58:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:58:11 +0000
Subject: [pkgdb] soprano: mathstuf has requested watchbugzilla
Message-ID: <20090806225813.9FFB810F9A2@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on soprano (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 22:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 22:58:14 +0000
Subject: [pkgdb] soprano: mathstuf has requested commit
Message-ID: <20090806225815.AC24210F9B0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on soprano (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:24 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested watchbugzilla
Message-ID: <20090806230024.4F1E310F8B9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-l10n (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:25 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested watchcommits
Message-ID: <20090806230025.5F91110F8EE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-l10n (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:26 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested commit
Message-ID: <20090806230026.65E3510F8F5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-l10n (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:32 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested watchbugzilla
Message-ID: <20090806230033.0C83D10F8BC@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-l10n (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:32 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested watchcommits
Message-ID: <20090806230033.8B9FE10F900@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-l10n (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:34 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested watchcommits
Message-ID: <20090806230035.5313910F907@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-l10n (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:33 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested commit
Message-ID: <20090806230035.B094910F90B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-l10n (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:34 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested commit
Message-ID: <20090806230037.D320810F917@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-l10n (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:00:37 +0000
Subject: [pkgdb] kde-l10n: mathstuf has requested watchbugzilla
Message-ID: <20090806230038.35ADD10F9B3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-l10n (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:09:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:09:48 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090806230948.5726B10F8BF@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on soprano (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:09:49 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090806230950.2FEB910F8E3@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on soprano (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:09:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:09:51 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090806230951.4BF9A10F8EA@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on soprano (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:09:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:09:58 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090806231001.2103410F8F5@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on soprano (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:09:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:09:59 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090806231001.2D05810F8F9@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on soprano (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:09:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:09:57 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090806231000.EADD810F8EC@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on soprano (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:25 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231026.2B14C10F905@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on strigi (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:27 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231031.8A26D10F92F@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on strigi (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:26 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231031.39AC910F92B@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on strigi (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:36 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231042.4440010F939@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on strigi (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:38 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231043.5AF5010F93C@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on strigi (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:40 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231045.3298110F916@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on strigi (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:41 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231045.B151D10F913@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on strigi (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:42 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231048.8FA5710F949@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on strigi (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:10:41 +0000
Subject: [pkgdb] strigi had acl change status
Message-ID: <20090806231047.8909610F946@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on strigi (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/strigi



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:11 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231111.1B3BA10F8C1@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on solar-kde-theme (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:13 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231113.CD4A610F936@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on solar-kde-theme (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:14 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231114.AA2CC10F94E@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on solar-kde-theme (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:18 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231119.9173110F95A@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on solar-kde-theme (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:18 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231119.8661710F958@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on solar-kde-theme (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:21 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231121.EEFC410F965@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on solar-kde-theme (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:24 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231125.0765A10F971@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on solar-kde-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:24 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231125.5E76310F8CA@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on solar-kde-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:27 +0000
Subject: [pkgdb] solar-kde-theme had acl change status
Message-ID: <20090806231127.B57B410F979@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on solar-kde-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/solar-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:38 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231138.8992C10F8C7@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kdegames3 (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:39 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231140.4C49F10F96D@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on kdegames3 (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:40 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231141.1F41210F980@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on kdegames3 (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:46 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231147.8890C10F91F@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kdegames3 (Fedora 10) to Obsolete for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:49 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231150.4536910F920@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kdegames3 (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:50 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231151.24C6710F98E@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on kdegames3 (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:53 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231153.E3B1C10F997@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on kdegames3 (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:56 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231157.153F710F99D@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on kdegames3 (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:56 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231157.F233010F882@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kdegames3 (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:11:58 +0000
Subject: [pkgdb] kdegames3 had acl change status
Message-ID: <20090806231200.A41C210F9A6@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on kdegames3 (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames3



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:12 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231213.0D59510F9BF@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on kde-l10n (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:16 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231217.C71AD10F9CB@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on kde-l10n (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:17 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231218.448EF10F9CD@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on kde-l10n (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:06 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231209.8279A10F9B8@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kde-l10n (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:09 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231210.3A5F710F8C8@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on kde-l10n (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:15 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231217.82B2310F923@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kde-l10n (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:32 +0000
Subject: [pkgdb] leonidas-kde-theme had acl change status
Message-ID: <20090806231232.CBDA410F9F0@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on leonidas-kde-theme (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:21 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231221.2BD2010F9DC@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on kde-l10n (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:22 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231224.3811310F9E3@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on kde-l10n (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:23 +0000
Subject: [pkgdb] kde-l10n had acl change status
Message-ID: <20090806231225.00C8C10F9A7@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on kde-l10n (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-l10n



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:38 +0000
Subject: [pkgdb] leonidas-kde-theme had acl change status
Message-ID: <20090806231239.401D910F9ED@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on leonidas-kde-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:37 +0000
Subject: [pkgdb] leonidas-kde-theme had acl change status
Message-ID: <20090806231238.3751610FA07@bastion2.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on leonidas-kde-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:35 +0000
Subject: [pkgdb] leonidas-kde-theme had acl change status
Message-ID: <20090806231236.164A610F9FE@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on leonidas-kde-theme (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:33 +0000
Subject: [pkgdb] leonidas-kde-theme had acl change status
Message-ID: <20090806231235.4E7E410F9FC@bastion2.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on leonidas-kde-theme (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:12:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:12:39 +0000
Subject: [pkgdb] leonidas-kde-theme had acl change status
Message-ID: <20090806231239.921E810FA0C@bastion2.fedora.phx.redhat.com>

kkofler has set the commit acl on leonidas-kde-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/leonidas-kde-theme



From pkgdb at fedoraproject.org  Thu Aug  6 23:13:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:13:38 +0000
Subject: [pkgdb] soprano: kkofler has requested watchbugzilla
Message-ID: <20090806231339.6A9A310F8DC@bastion2.fedora.phx.redhat.com>

kkofler has requested the watchbugzilla acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:13:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:13:41 +0000
Subject: [pkgdb] soprano: kkofler has requested watchcommits
Message-ID: <20090806231342.D38A910F8BD@bastion2.fedora.phx.redhat.com>

kkofler has requested the watchcommits acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:13:44 +0000
Subject: [pkgdb] soprano: kkofler has requested commit
Message-ID: <20090806231345.23FE010F924@bastion2.fedora.phx.redhat.com>

kkofler has requested the commit acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:13:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:13:45 +0000
Subject: [pkgdb] soprano: kkofler has requested approveacls
Message-ID: <20090806231347.0FBD110F8BE@bastion2.fedora.phx.redhat.com>

kkofler has requested the approveacls acl on soprano (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:46 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested watchbugzilla
Message-ID: <20090806231648.0610E10F8E4@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:46 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested watchcommits
Message-ID: <20090806231647.E51D010F8E3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:47 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested commit
Message-ID: <20090806231648.C73D110F8C1@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:49 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested watchbugzilla
Message-ID: <20090806231650.2E8A610F8EB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:50 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested watchcommits
Message-ID: <20090806231650.7B52E10F8EE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:51 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested commit
Message-ID: <20090806231651.F343D10F8F1@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:53 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested commit
Message-ID: <20090806231654.1446710F8F9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:54 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested watchcommits
Message-ID: <20090806231655.350E210F8F5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Thu Aug  6 23:16:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 06 Aug 2009 23:16:55 +0000
Subject: [pkgdb] kdepim-runtime: mathstuf has requested watchbugzilla
Message-ID: <20090806231657.53F3310F8FD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From whot at fedoraproject.org  Thu Aug  6 23:44:20 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  6 Aug 2009 23:44:20 +0000 (UTC)
Subject: rpms/xorg-x11-drv-vmmouse/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xorg-x11-drv-vmmouse.spec, 1.28,
	1.29 vmmouse-12.6.4-abi.patch, 1.1, NONE
Message-ID: <20090806234420.9BFB611C00E4@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4551

Modified Files:
	.cvsignore sources xorg-x11-drv-vmmouse.spec 
Removed Files:
	vmmouse-12.6.4-abi.patch 
Log Message:
* Fri Aug 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 12.6.5-1
- vmmouse 12.6.5
- vmmouse-12.6.4-abi.patch: Drop.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 May 2009 22:03:56 -0000	1.12
+++ .cvsignore	6 Aug 2009 23:44:19 -0000	1.13
@@ -1 +1 @@
-xf86-input-vmmouse-12.6.4.tar.bz2
+xf86-input-vmmouse-12.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 May 2009 22:03:56 -0000	1.12
+++ sources	6 Aug 2009 23:44:19 -0000	1.13
@@ -1 +1 @@
-df950f43c46895b5015cea759866da31  xf86-input-vmmouse-12.6.4.tar.bz2
+ce78e0135b5e34338a1ea98afb933120  xf86-input-vmmouse-12.6.5.tar.bz2


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-vmmouse.spec	27 Jul 2009 08:34:58 -0000	1.28
+++ xorg-x11-drv-vmmouse.spec	6 Aug 2009 23:44:19 -0000	1.29
@@ -4,15 +4,14 @@
 
 Summary:    Xorg X11 vmmouse input driver
 Name:	    xorg-x11-drv-vmmouse
-Version:    12.6.4
-Release:    3%{?dist}.1
+Version:    12.6.5
+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
-Patch0:	    vmmouse-12.6.4-abi.patch
 
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
@@ -26,7 +25,6 @@ X.Org X11 vmmouse input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static --with-hal-callouts-dir=%{_bindir}
@@ -53,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 
 %changelog
+* Fri Aug 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 12.6.5-1
+- vmmouse 12.6.5
+- vmmouse-12.6.4-abi.patch: Drop.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.6.4-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- vmmouse-12.6.4-abi.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:01 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested watchcommits
Message-ID: <20090807002401.B18B010F882@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:02 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested commit
Message-ID: <20090807002402.894C310F89F@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:09 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested watchbugzilla
Message-ID: <20090807002409.5670D10F8AD@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:06 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested approveacls
Message-ID: <20090807002406.AA8C510F8A2@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:11 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested watchbugzilla
Message-ID: <20090807002411.98B2610F8B5@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:11 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested watchcommits
Message-ID: <20090807002412.355F410F8B7@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:15 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested approveacls
Message-ID: <20090807002415.58A8C10F8BB@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:14 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested commit
Message-ID: <20090807002414.B119410F8BC@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:19 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested watchbugzilla
Message-ID: <20090807002419.C393610F8C2@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:20 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested watchcommits
Message-ID: <20090807002420.3AE3310F8C6@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:20 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested commit
Message-ID: <20090807002420.E9D7710F8C8@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:24:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:24:24 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested approveacls
Message-ID: <20090807002424.BB27210F8CB@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:00 +0000
Subject: [pkgdb] sip: rdieter has requested approveacls
Message-ID: <20090807002500.79A0610F8A9@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on sip (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:05 +0000
Subject: [pkgdb] sip: rdieter has given up watchbugzilla
Message-ID: <20090807002506.14DC010F8B6@bastion2.fedora.phx.redhat.com>

rdieter has given up the watchbugzilla acl on sip (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:03 +0000
Subject: [pkgdb] sip: rdieter has requested watchbugzilla
Message-ID: <20090807002503.F275910F8B4@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on sip (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:10 +0000
Subject: [pkgdb] sip: rdieter has requested approveacls
Message-ID: <20090807002511.CE81B10F8BC@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on sip (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:12 +0000
Subject: [pkgdb] sip: rdieter has requested approveacls
Message-ID: <20090807002512.D1CD110F8CD@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on sip (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:15 +0000
Subject: [pkgdb] sip: rdieter has requested approveacls
Message-ID: <20090807002515.154D810F8CE@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on sip (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sip



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:31 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002531.6DE0D10F8D1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-i18n (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:32 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002533.00C6110F8D6@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-i18n (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:33 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002533.E3BAF10F8DC@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora devel) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:38 +0000
Subject: [pkgdb] akonadi: mathstuf has requested watchcommits
Message-ID: <20090807002538.AF33A10F8DE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on akonadi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:38 +0000
Subject: [pkgdb] akonadi: mathstuf has requested commit
Message-ID: <20090807002539.6158110F8E3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on akonadi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:41 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002542.0DFE610F8E8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-i18n (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:42 +0000
Subject: [pkgdb] akonadi: mathstuf has requested watchbugzilla
Message-ID: <20090807002543.3A7B610F8F4@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on akonadi (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:42 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002543.49D1710F8F5@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-i18n (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:42 +0000
Subject: [pkgdb] akonadi: mathstuf has requested commit
Message-ID: <20090807002543.DB6DB10F8FB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on akonadi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:44 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002545.BC69B10F8C9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:46 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002549.6757E10F890@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-i18n (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:44 +0000
Subject: [pkgdb] akonadi: mathstuf has requested watchbugzilla
Message-ID: <20090807002546.A9AAC10F90C@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on akonadi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:43 +0000
Subject: [pkgdb] akonadi: mathstuf has requested watchcommits
Message-ID: <20090807002546.414DA10F90B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on akonadi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:47 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002550.1A88D10F919@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-i18n (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:25:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:25:49 +0000
Subject: [pkgdb] kde-i18n had acl change status
Message-ID: <20090807002550.AFC6D10F91B@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-i18n (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-i18n



From pkgdb at fedoraproject.org  Fri Aug  7 00:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:26:17 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20090807002617.BA3EC10F882@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on akonadi (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:26:18 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20090807002618.C00B810F8AF@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on akonadi (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:26:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:26:20 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20090807002620.9957710F91D@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on akonadi (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:26:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:26:23 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20090807002624.7EBA810F8B2@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on akonadi (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:26:24 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20090807002625.75B7D10F926@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on akonadi (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:26:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:26:25 +0000
Subject: [pkgdb] akonadi had acl change status
Message-ID: <20090807002626.72FA410F92A@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on akonadi (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Fri Aug  7 00:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:28:58 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002858.87AAD10F8D6@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on soprano (Fedora 10) to Approved for kkofler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:28:59 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002859.BCA9510F8DB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on soprano (Fedora 10) to Approved for kkofler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:29:00 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002901.0F69E10F8DC@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on soprano (Fedora 10) to Approved for kkofler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:29:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:29:02 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002902.450FE10F8D9@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on soprano (Fedora 10) to Approved for kkofler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:29:03 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002903.C200510F8E4@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on soprano (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:29:05 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002905.85C8C10F8E8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on soprano (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:29:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:29:07 +0000
Subject: [pkgdb] soprano had acl change status
Message-ID: <20090807002907.C2FF310F8EC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on soprano (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/soprano



From pkgdb at fedoraproject.org  Fri Aug  7 00:30:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:30:19 +0000
Subject: [pkgdb] kdeutils: mathstuf has requested watchcommits
Message-ID: <20090807003019.BE14410F8F3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:30:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:30:19 +0000
Subject: [pkgdb] kdeutils: mathstuf has requested commit
Message-ID: <20090807003020.6493F10F8FB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:30:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:30:21 +0000
Subject: [pkgdb] kdeutils: mathstuf has requested watchcommits
Message-ID: <20090807003022.467D910F8FF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:30:22 +0000
Subject: [pkgdb] kdeutils: mathstuf has requested commit
Message-ID: <20090807003022.472BB10F900@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:30:22 +0000
Subject: [pkgdb] kdeutils: mathstuf has requested watchbugzilla
Message-ID: <20090807003022.D7B2410F904@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:30:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:30:26 +0000
Subject: [pkgdb] kdeutils: mathstuf has requested watchbugzilla
Message-ID: <20090807003026.F247710F90D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:31:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:31:35 +0000
Subject: [pkgdb] kdeutils: rdieter has given up approveacls
Message-ID: <20090807003135.B938810F8B8@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdeutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:31:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:31:37 +0000
Subject: [pkgdb] kdeutils: rdieter has requested approveacls
Message-ID: <20090807003137.EAF2A10F8CC@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:31:45 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090807003145.AA09F10F8BF@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeutils (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:31:46 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090807003146.ACF3310F911@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeutils (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:34:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:34:31 +0000
Subject: [pkgdb] kdetoys: mathstuf has requested commit
Message-ID: <20090807003432.0A3B710F8DE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdetoys (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:34:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:34:32 +0000
Subject: [pkgdb] kdetoys: mathstuf has requested watchcommits
Message-ID: <20090807003432.687A110F8E3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdetoys (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:34:33 +0000
Subject: [pkgdb] kdetoys: mathstuf has requested watchbugzilla
Message-ID: <20090807003433.B765610F8E8@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdetoys (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:15 +0000
Subject: [pkgdb] kde-settings: mathstuf has requested commit
Message-ID: <20090807004216.14FDB10F89F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-settings (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:16 +0000
Subject: [pkgdb] kde-settings: mathstuf has requested watchcommits
Message-ID: <20090807004216.4629210F8AC@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-settings (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:17 +0000
Subject: [pkgdb] kde-settings: mathstuf has requested watchbugzilla
Message-ID: <20090807004217.9BC3910F8B5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-settings (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:17 +0000
Subject: [pkgdb] kde-settings: mathstuf has requested commit
Message-ID: <20090807004217.BBDC710F8BA@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kde-settings (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:18 +0000
Subject: [pkgdb] kde-settings: mathstuf has requested watchcommits
Message-ID: <20090807004218.4FF5010F8BF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kde-settings (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:19 +0000
Subject: [pkgdb] kde-settings: mathstuf has requested watchbugzilla
Message-ID: <20090807004219.A3AE110F8C4@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kde-settings (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:28 +0000
Subject: [pkgdb] kdesdk: mathstuf has requested commit
Message-ID: <20090807004228.93A1210F8C5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdesdk (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:29 +0000
Subject: [pkgdb] kdesdk: mathstuf has requested watchcommits
Message-ID: <20090807004229.7A57B10F8C8@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdesdk (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:30 +0000
Subject: [pkgdb] kdesdk: mathstuf has requested watchbugzilla
Message-ID: <20090807004230.ACA3A10F8CB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdesdk (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:31 +0000
Subject: [pkgdb] kdesdk: mathstuf has requested commit
Message-ID: <20090807004231.4CD9D10F8D0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdesdk (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:31 +0000
Subject: [pkgdb] kdesdk: mathstuf has requested watchcommits
Message-ID: <20090807004231.A166B10F8D5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdesdk (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:42 +0000
Subject: [pkgdb] kdeplasma-addons: mathstuf has requested commit
Message-ID: <20090807004242.8969110F89F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeplasma-addons (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:32 +0000
Subject: [pkgdb] kdesdk: mathstuf has requested watchbugzilla
Message-ID: <20090807004233.0EA1610F8DA@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdesdk (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:43 +0000
Subject: [pkgdb] kdeplasma-addons: mathstuf has requested watchcommits
Message-ID: <20090807004243.45D6810F8DF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeplasma-addons (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:44 +0000
Subject: [pkgdb] kdeplasma-addons: mathstuf has requested commit
Message-ID: <20090807004244.AFCEC10F8E6@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeplasma-addons (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:45 +0000
Subject: [pkgdb] kdeplasma-addons: mathstuf has requested watchcommits
Message-ID: <20090807004245.9AE0B10F8EE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeplasma-addons (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:45 +0000
Subject: [pkgdb] kdeplasma-addons: mathstuf has requested watchbugzilla
Message-ID: <20090807004245.9B23610F8EF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeplasma-addons (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:46 +0000
Subject: [pkgdb] kdeplasma-addons: mathstuf has requested watchbugzilla
Message-ID: <20090807004246.EC16110F8FE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeplasma-addons (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From zaitcev at fedoraproject.org  Fri Aug  7 00:42:54 2009
From: zaitcev at fedoraproject.org (Pete Zaitcev)
Date: Fri,  7 Aug 2009 00:42:54 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd-test.patch, NONE, 1.1.2.1 chunkd.spec, 1.6,
	1.6.2.1
Message-ID: <20090807004254.8BE8811C00E4@cvs1.fedora.phx.redhat.com>

Author: zaitcev

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21649

Modified Files:
      Tag: private-zaitcev-bz514651-1
	chunkd.spec 
Added Files:
      Tag: private-zaitcev-bz514651-1
	chunkd-test.patch 
Log Message:
Test build 514651.1, get failure logs.


chunkd-test.patch:
 0 files changed

--- NEW FILE chunkd-test.patch ---


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -p -r1.6 -r1.6.2.1
--- chunkd.spec	30 Jul 2009 01:52:14 -0000	1.6
+++ chunkd.spec	7 Aug 2009 00:42:54 -0000	1.6.2.1
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.7.g6b1e9b66%{?dist}
+Release:	0.7.g6b1e9b66.bz514651.1%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -12,15 +12,16 @@ URL:		http://hail.wiki.kernel.org/
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
 Source3:	chunkd.sysconf
+
+# The placeholder for experimentation
+Patch1001:	chunkd-test.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # N.B. We need cld to build, because our "make check" spawns a private copy.
 BuildRequires:	libevent-devel glib2-devel openssl-devel zlib-devel
 BuildRequires:	libxml2-devel procps cld cld-devel
 
-# ugly and embarrassing!  pkg build fails on big endian
-ExcludeArch:	ppc ppc64
-
 %description
 Single-node data storage daemon for cloud computing.
 
@@ -41,7 +42,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n %{name}-%{version}git
-
+%patch1001 -p1
 
 %build
 %configure --disable-static
@@ -98,6 +99,10 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Aug 6 2009 Pete Zaitcev <zaitcev at redhat.com>
+- test build for bz#514651.
+- bump to 0.4-0.7.g6b1e9b66.bz514651.1
+
 * Wed Jul 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.7.g6b1e9b66
 - update source to commit 6b1e9b6641df0353a81c7b1352f5f652c5a7f9d8
 



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:56 +0000
Subject: [pkgdb] kdepimlibs: mathstuf has requested commit
Message-ID: <20090807004256.E6C7010F8AD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepimlibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:57 +0000
Subject: [pkgdb] kdepimlibs: mathstuf has requested watchcommits
Message-ID: <20090807004257.4A9D110F904@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepimlibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:42:58 +0000
Subject: [pkgdb] kdepimlibs: mathstuf has requested watchbugzilla
Message-ID: <20090807004258.B6E7710F907@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepimlibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:00 +0000
Subject: [pkgdb] kdepimlibs: mathstuf has requested commit
Message-ID: <20090807004300.3CE0710F90D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepimlibs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:00 +0000
Subject: [pkgdb] kdepimlibs: mathstuf has requested watchcommits
Message-ID: <20090807004300.A033210F912@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepimlibs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:01 +0000
Subject: [pkgdb] kdepimlibs: mathstuf has requested watchbugzilla
Message-ID: <20090807004301.ACF6610F915@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepimlibs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:07 +0000
Subject: [pkgdb] kdepim: mathstuf has requested commit
Message-ID: <20090807004307.BA35A10F916@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:07 +0000
Subject: [pkgdb] kdepim: mathstuf has requested watchcommits
Message-ID: <20090807004307.E9AAA10F91B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:09 +0000
Subject: [pkgdb] kdepim: mathstuf has requested watchbugzilla
Message-ID: <20090807004309.2087210F91E@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepim (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:10 +0000
Subject: [pkgdb] kdepim: mathstuf has requested commit
Message-ID: <20090807004310.EAB4910F922@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdepim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:31:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:31:47 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20090807003147.9CA1210F916@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeutils (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:11 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20090807004311.33F3810F926@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-settings (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:11 +0000
Subject: [pkgdb] kdepim: mathstuf has requested watchcommits
Message-ID: <20090807004311.69DDD10F92B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdepim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:12 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20090807004312.340B110F92F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-settings (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:12 +0000
Subject: [pkgdb] kdepim: mathstuf has requested watchbugzilla
Message-ID: <20090807004313.0D6D410F934@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdepim (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:13 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20090807004313.87F3E10F936@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-settings (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:16 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20090807004316.EA80A10F939@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kde-settings (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:17 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20090807004317.F19B010F93E@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kde-settings (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:19 +0000
Subject: [pkgdb] kde-settings had acl change status
Message-ID: <20090807004319.741D610F940@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kde-settings (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kde-settings



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:47 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090807004347.2F89010F8C0@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:48 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090807004348.2CC5810F8C6@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:49 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090807004349.76D7610F947@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:50 +0000
Subject: [pkgdb] kdenetwork: mathstuf has requested commit
Message-ID: <20090807004350.4DC2E10F950@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdenetwork (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:50 +0000
Subject: [pkgdb] kdenetwork: mathstuf has requested watchcommits
Message-ID: <20090807004350.4CFA610F94F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdenetwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:50 +0000
Subject: [pkgdb] kdenetwork: mathstuf has requested watchbugzilla
Message-ID: <20090807004350.EAE6210F953@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdenetwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:51 +0000
Subject: [pkgdb] kdenetwork: mathstuf has requested watchcommits
Message-ID: <20090807004351.3949D10F958@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdenetwork (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:51 +0000
Subject: [pkgdb] kdenetwork: mathstuf has requested watchbugzilla
Message-ID: <20090807004351.E064010F95D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdenetwork (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:53 +0000
Subject: [pkgdb] kdenetwork: mathstuf has requested commit
Message-ID: <20090807004354.0F1FF10F960@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdenetwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:55 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090807004355.219DC10F964@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdetoys (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:55 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090807004355.AFC3910F969@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdetoys (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:57 +0000
Subject: [pkgdb] kdetoys had acl change status
Message-ID: <20090807004357.931A310F8CB@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdetoys (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:59 +0000
Subject: [pkgdb] kdemultimedia: mathstuf has requested commit
Message-ID: <20090807004359.D1C6E10F96D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdemultimedia (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:43:59 +0000
Subject: [pkgdb] kdemultimedia: mathstuf has requested watchcommits
Message-ID: <20090807004359.DFD0610F970@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdemultimedia (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:01 +0000
Subject: [pkgdb] kdemultimedia: mathstuf has requested watchbugzilla
Message-ID: <20090807004401.CBEA910F974@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdemultimedia (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:02 +0000
Subject: [pkgdb] kdemultimedia: mathstuf has requested commit
Message-ID: <20090807004402.26AE710F979@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdemultimedia (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:02 +0000
Subject: [pkgdb] kdemultimedia: mathstuf has requested watchcommits
Message-ID: <20090807004402.9494910F97E@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdemultimedia (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:04 +0000
Subject: [pkgdb] kdemultimedia: mathstuf has requested watchbugzilla
Message-ID: <20090807004404.D8B6910F983@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdemultimedia (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:12 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested commit
Message-ID: <20090807004412.C72D410F8D2@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdelibs-experimental (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:13 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested watchcommits
Message-ID: <20090807004413.29A1010F98A@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdelibs-experimental (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:14 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested watchbugzilla
Message-ID: <20090807004414.A676E10F98F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdelibs-experimental (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:14 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested commit
Message-ID: <20090807004414.DA3CD10F993@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdelibs-experimental (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:15 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested watchcommits
Message-ID: <20090807004415.B201710F997@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdelibs-experimental (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:16 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested watchbugzilla
Message-ID: <20090807004416.A9C9E10F99B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdelibs-experimental (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:29 +0000
Subject: [pkgdb] kdelibs: mathstuf has requested commit
Message-ID: <20090807004429.4362510F8D5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdelibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:29 +0000
Subject: [pkgdb] kdelibs: mathstuf has requested watchcommits
Message-ID: <20090807004429.A112510F99D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdelibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:30 +0000
Subject: [pkgdb] kdelibs: mathstuf has requested watchbugzilla
Message-ID: <20090807004430.B6D9B10F8D9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdelibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:31 +0000
Subject: [pkgdb] kdelibs: mathstuf has requested commit
Message-ID: <20090807004432.1556D10F9A1@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdelibs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:32 +0000
Subject: [pkgdb] kdelibs: mathstuf has requested watchcommits
Message-ID: <20090807004432.7565710F9A6@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdelibs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:33 +0000
Subject: [pkgdb] kdelibs: mathstuf has requested watchbugzilla
Message-ID: <20090807004433.D04EA10F9AB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdelibs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:58 +0000
Subject: [pkgdb] kdegraphics: mathstuf has requested commit
Message-ID: <20090807004458.59F1C10F8DE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegraphics (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 00:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:44:59 +0000
Subject: [pkgdb] kdegraphics: mathstuf has requested watchcommits
Message-ID: <20090807004459.6396210F8DF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegraphics (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:00 +0000
Subject: [pkgdb] kdegraphics: mathstuf has requested watchbugzilla
Message-ID: <20090807004500.79C8910F9AC@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegraphics (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:01 +0000
Subject: [pkgdb] kdegraphics: mathstuf has requested commit
Message-ID: <20090807004501.C7C5910F9AF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegraphics (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:02 +0000
Subject: [pkgdb] kdegraphics: mathstuf has requested watchbugzilla
Message-ID: <20090807004502.8DDA110F9B5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegraphics (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:18 +0000
Subject: [pkgdb] kdegraphics: mathstuf has requested watchcommits
Message-ID: <20090807004518.9F20910F8E7@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegraphics (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:26 +0000
Subject: [pkgdb] kdegames: mathstuf has requested commit
Message-ID: <20090807004526.45E9D10F9BA@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegames (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:26 +0000
Subject: [pkgdb] kdegames: mathstuf has requested watchcommits
Message-ID: <20090807004526.DCBF510F9BD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegames (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:27 +0000
Subject: [pkgdb] kdegames: mathstuf has requested watchbugzilla
Message-ID: <20090807004527.F29B510F8EE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegames (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:28 +0000
Subject: [pkgdb] kdegames: mathstuf has requested commit
Message-ID: <20090807004528.666BB10F9C3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdegames (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:29 +0000
Subject: [pkgdb] kdegames: mathstuf has requested watchcommits
Message-ID: <20090807004529.7A60A10F9C5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdegames (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:32 +0000
Subject: [pkgdb] kdegames: mathstuf has requested watchbugzilla
Message-ID: <20090807004532.6B07F10F9CB@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdegames (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:39 +0000
Subject: [pkgdb] kdeedu: mathstuf has requested commit
Message-ID: <20090807004539.EACC110F8F9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeedu (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:40 +0000
Subject: [pkgdb] kdeedu: mathstuf has requested watchcommits
Message-ID: <20090807004540.0FB1010F8F3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeedu (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:41 +0000
Subject: [pkgdb] kdeedu: mathstuf has requested watchbugzilla
Message-ID: <20090807004541.83C4810F9CD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeedu (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:41 +0000
Subject: [pkgdb] kdeedu: mathstuf has requested commit
Message-ID: <20090807004541.C793010F9D6@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeedu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:42 +0000
Subject: [pkgdb] kdeedu: mathstuf has requested watchcommits
Message-ID: <20090807004542.8AFD810F9D9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeedu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:43 +0000
Subject: [pkgdb] kdeedu: mathstuf has requested watchbugzilla
Message-ID: <20090807004543.AA3E410F9DD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeedu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:55 +0000
Subject: [pkgdb] kdebindings: mathstuf has requested commit
Message-ID: <20090807004555.DCCBF10F900@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebindings (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:56 +0000
Subject: [pkgdb] kdebindings: mathstuf has requested watchcommits
Message-ID: <20090807004556.D884010F8FF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebindings (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Fri Aug  7 00:45:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:45:57 +0000
Subject: [pkgdb] kdebindings: mathstuf has requested watchbugzilla
Message-ID: <20090807004557.C94D310F9E3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebindings (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:01 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20090807004601.1668210F9EA@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdesdk (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:01 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20090807004601.6B1A210F902@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdesdk (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:02 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20090807004603.4068D10F9F4@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdesdk (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:04 +0000
Subject: [pkgdb] kdebase-workspace: mathstuf has requested commit
Message-ID: <20090807004604.8EACA10F9EF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebase-workspace (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:05 +0000
Subject: [pkgdb] kdebase-workspace: mathstuf has requested watchcommits
Message-ID: <20090807004605.B75BE10F9F9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebase-workspace (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:06 +0000
Subject: [pkgdb] kdebase-workspace: mathstuf has requested watchbugzilla
Message-ID: <20090807004606.7139A10F9FE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebase-workspace (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:07 +0000
Subject: [pkgdb] kdesdk: rdieter has given up approveacls
Message-ID: <20090807004607.EEEA010FA09@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdesdk (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:07 +0000
Subject: [pkgdb] kdebase-workspace: mathstuf has requested commit
Message-ID: <20090807004607.DB85010FA06@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:08 +0000
Subject: [pkgdb] kdebase-workspace: mathstuf has requested watchcommits
Message-ID: <20090807004608.8FC0410FA0D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:09 +0000
Subject: [pkgdb] kdebase-workspace: mathstuf has requested watchbugzilla
Message-ID: <20090807004609.A29C910FA12@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebase-workspace (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:10 +0000
Subject: [pkgdb] kdesdk: rdieter has requested approveacls
Message-ID: <20090807004610.3807E10FA14@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdesdk (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:15 +0000
Subject: [pkgdb] kdebase-runtime: mathstuf has requested commit
Message-ID: <20090807004615.9E5C110F904@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebase-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:15 +0000
Subject: [pkgdb] kdebase-runtime: mathstuf has requested watchcommits
Message-ID: <20090807004616.0123710FA1A@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebase-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:17 +0000
Subject: [pkgdb] kdebase-runtime: mathstuf has requested watchbugzilla
Message-ID: <20090807004617.A6F6110FA23@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebase-runtime (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:18 +0000
Subject: [pkgdb] kdebase-runtime: mathstuf has requested commit
Message-ID: <20090807004618.775CF10FA2A@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:18 +0000
Subject: [pkgdb] kdebase-runtime: mathstuf has requested watchcommits
Message-ID: <20090807004618.ACBE310FA2F@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:19 +0000
Subject: [pkgdb] kdebase-runtime: mathstuf has requested watchbugzilla
Message-ID: <20090807004620.148D310FA33@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebase-runtime (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:26 +0000
Subject: [pkgdb] kdebase: mathstuf has requested commit
Message-ID: <20090807004626.1D32710F909@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebase (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:26 +0000
Subject: [pkgdb] kdebase: mathstuf has requested watchcommits
Message-ID: <20090807004626.9512E10FA35@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebase (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:27 +0000
Subject: [pkgdb] kdebase: mathstuf has requested watchbugzilla
Message-ID: <20090807004627.DB1C610FA39@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebase (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:28 +0000
Subject: [pkgdb] kdebase: mathstuf has requested commit
Message-ID: <20090807004628.534D510FA3B@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdebase (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:28 +0000
Subject: [pkgdb] kdebase: mathstuf has requested watchcommits
Message-ID: <20090807004628.D693C10FA41@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdebase (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:30 +0000
Subject: [pkgdb] kdebase: mathstuf has requested watchbugzilla
Message-ID: <20090807004630.2992310FA47@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdebase (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:33 +0000
Subject: [pkgdb] kdeplasma-addons had acl change status
Message-ID: <20090807004633.23C4B10FA4D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeplasma-addons (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:34 +0000
Subject: [pkgdb] kdeplasma-addons had acl change status
Message-ID: <20090807004634.504D110FA53@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeplasma-addons (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:36 +0000
Subject: [pkgdb] kdeartwork: mathstuf has requested commit
Message-ID: <20090807004636.3C1E310FA58@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:36 +0000
Subject: [pkgdb] kdeplasma-addons had acl change status
Message-ID: <20090807004637.0806710F90F@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeplasma-addons (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:36 +0000
Subject: [pkgdb] kdeartwork: mathstuf has requested watchcommits
Message-ID: <20090807004637.113D710FA5C@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:34:29 +0000
Subject: [pkgdb] kdetoys: mathstuf has requested commit
Message-ID: <20090807003429.1FAE010F8CE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdetoys (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:34:29 +0000
Subject: [pkgdb] kdetoys: mathstuf has requested watchcommits
Message-ID: <20090807003430.714DA10F8D5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdetoys (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:34:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:34:31 +0000
Subject: [pkgdb] kdetoys: mathstuf has requested watchbugzilla
Message-ID: <20090807003431.5C54B10F8D9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdetoys (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdetoys



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:38 +0000
Subject: [pkgdb] kdeartwork: mathstuf has requested watchbugzilla
Message-ID: <20090807004638.10CB510FA62@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:38 +0000
Subject: [pkgdb] kdeartwork: mathstuf has requested commit
Message-ID: <20090807004638.567D610FA67@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeartwork (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:38 +0000
Subject: [pkgdb] kdeartwork: mathstuf has requested watchcommits
Message-ID: <20090807004639.104E110FA6D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeartwork (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:41 +0000
Subject: [pkgdb] kdeartwork: mathstuf has requested watchbugzilla
Message-ID: <20090807004641.4DD7510FA73@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeartwork (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:41 +0000
Subject: [pkgdb] kdeplasma-addons had acl change status
Message-ID: <20090807004641.8A95610FA75@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeplasma-addons (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:42 +0000
Subject: [pkgdb] kdeplasma-addons had acl change status
Message-ID: <20090807004642.B9C9610FA7C@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeplasma-addons (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:43 +0000
Subject: [pkgdb] kdeplasma-addons had acl change status
Message-ID: <20090807004643.B074510FA84@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeplasma-addons (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeplasma-addons



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:48 +0000
Subject: [pkgdb] kdeadmin: mathstuf has requested commit
Message-ID: <20090807004648.428E310F910@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:48 +0000
Subject: [pkgdb] kdeadmin: mathstuf has requested watchcommits
Message-ID: <20090807004648.B32E110FA8A@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:50 +0000
Subject: [pkgdb] kdeadmin: mathstuf has requested watchbugzilla
Message-ID: <20090807004650.0DBD910FA8E@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:50 +0000
Subject: [pkgdb] kdeadmin: mathstuf has requested commit
Message-ID: <20090807004650.B5D5B10FA93@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeadmin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:51 +0000
Subject: [pkgdb] kdeadmin: mathstuf has requested watchcommits
Message-ID: <20090807004651.3A62E10FA98@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeadmin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:52 +0000
Subject: [pkgdb] kdeadmin: mathstuf has requested watchbugzilla
Message-ID: <20090807004652.CC2BD10FA9D@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeadmin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:59 +0000
Subject: [pkgdb] kdeaccessibility: mathstuf has requested commit
Message-ID: <20090807004659.23EA710F913@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 00:46:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:46:59 +0000
Subject: [pkgdb] kdeaccessibility: mathstuf has requested watchcommits
Message-ID: <20090807004659.7DCE710FAA0@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:00 +0000
Subject: [pkgdb] kdeaccessibility: mathstuf has requested watchbugzilla
Message-ID: <20090807004700.9769C10FAA3@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:02 +0000
Subject: [pkgdb] kdeaccessibility: mathstuf has requested commit
Message-ID: <20090807004702.2000F10FAA8@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdeaccessibility (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:02 +0000
Subject: [pkgdb] kdeaccessibility: mathstuf has requested watchcommits
Message-ID: <20090807004702.DD3AC10FAAD@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdeaccessibility (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:03 +0000
Subject: [pkgdb] kdeaccessibility: mathstuf has requested watchbugzilla
Message-ID: <20090807004703.AFD5410FAB2@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdeaccessibility (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:27 +0000
Subject: [pkgdb] kdepimlibs: rdieter has given up approveacls
Message-ID: <20090807004727.87B5D10F91B@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdepimlibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:29 +0000
Subject: [pkgdb] kdepimlibs: rdieter has requested approveacls
Message-ID: <20090807004729.AB27810FAB3@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepimlibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:34 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20090807004734.7E0E910F922@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepimlibs (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:35 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20090807004735.6D83710FAB8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepimlibs (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:47:37 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20090807004737.2DF9F10FABD@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepimlibs (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:48:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:48:33 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090807004833.DFA0510F934@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:48:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:48:34 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090807004835.3D92C10F937@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:48:35 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090807004836.0A6E810FAC2@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:48:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:48:40 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090807004840.BC80A10F93A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:48:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:48:41 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090807004841.5107010FAC5@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:48:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:48:43 +0000
Subject: [pkgdb] kdepim had acl change status
Message-ID: <20090807004843.A653D10FAC9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdepim



From pkgdb at fedoraproject.org  Fri Aug  7 00:51:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:51:22 +0000
Subject: [pkgdb] kdenetwork: rdieter has given up approveacls
Message-ID: <20090807005122.2AF6610F946@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdenetwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:51:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:51:24 +0000
Subject: [pkgdb] kdenetwork: rdieter has requested approveacls
Message-ID: <20090807005124.3F2D010F949@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdenetwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:51:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:51:28 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20090807005128.5933710F94E@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdenetwork (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:51:29 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20090807005129.6126110F953@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdenetwork (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:51:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:51:31 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20090807005131.7CF6B10F958@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdenetwork (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Fri Aug  7 00:52:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:52:19 +0000
Subject: [pkgdb] kdemultimedia: rdieter has given up approveacls
Message-ID: <20090807005219.121DA10F960@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdemultimedia (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:52:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:52:21 +0000
Subject: [pkgdb] kdemultimedia: rdieter has requested approveacls
Message-ID: <20090807005221.96F0C10F963@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdemultimedia (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:52:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:52:26 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20090807005226.E64F110F968@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdemultimedia (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:52:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:52:27 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20090807005228.0801D10F96D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdemultimedia (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:52:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:52:28 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20090807005228.90A9F10F972@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdemultimedia (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:07 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090807005407.C58F810F982@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs-experimental (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:08 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090807005409.0E14C10F988@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs-experimental (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:09 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090807005409.E934410F98E@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs-experimental (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:15 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090807005415.363AA10F8DD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs-experimental (Fedora 9) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:17 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090807005417.1D73410F993@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs-experimental (Fedora 9) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:18 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20090807005418.6C58610F997@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs-experimental (Fedora 9) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:45 +0000
Subject: [pkgdb] kdelibs: rdieter has given up approveacls
Message-ID: <20090807005445.D87A510F99B@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdelibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:48 +0000
Subject: [pkgdb] kdelibs: rdieter has requested approveacls
Message-ID: <20090807005448.43A2510F99E@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdelibs (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:53 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090807005453.797DC10F9A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:54 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090807005454.CD94F10F9A8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Fri Aug  7 00:54:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 00:54:56 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20090807005456.18A1210F9AD@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdelibs



From airlied at fedoraproject.org  Fri Aug  7 00:58:46 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  7 Aug 2009 00:58:46 +0000 (UTC)
Subject: rpms/pyxf86config/devel fix-errorf-visibility.patch, NONE,
	1.1 pyxf86config.spec, 1.53, 1.54
Message-ID: <20090807005846.6EE7B11C00E4@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/pyxf86config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27247

Modified Files:
	pyxf86config.spec 
Added Files:
	fix-errorf-visibility.patch 
Log Message:
* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 0.3.37-6
- fix ErrorF/VErrorF symbol visibility - hacky but should do for now


fix-errorf-visibility.patch:
 xf86config_ext.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fix-errorf-visibility.patch ---
diff -up pyxf86config-0.3.37/xf86config_ext.c.da pyxf86config-0.3.37/xf86config_ext.c
--- pyxf86config-0.3.37/xf86config_ext.c.da	2009-08-07 10:57:05.000000000 +1000
+++ pyxf86config-0.3.37/xf86config_ext.c	2009-08-07 10:57:07.000000000 +1000
@@ -213,7 +213,7 @@ xf86freeVendor (XF86ConfVendorPtr p)
 }
 
 void
-ErrorF(const char *format, ...)
+__attribute__((visibility("default"))) ErrorF(const char *format, ...)
 {
   gchar *buffer;
   va_list args;
@@ -226,7 +226,7 @@ ErrorF(const char *format, ...)
 }
 
 void
-VErrorF(const char *format, va_list args)
+__attribute__((visibility("default"))) VErrorF(const char *format, va_list args)
 {
   gchar *buffer;
 


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- pyxf86config.spec	27 Jul 2009 01:39:29 -0000	1.53
+++ pyxf86config.spec	7 Aug 2009 00:58:46 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
 Version: 0.3.37
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://fedoraproject.org/wiki/pyxf86config
 Source0: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2
@@ -12,6 +12,7 @@ BuildRequires: libX11-devel
 BuildRequires: python-devel
 BuildRequires: libxf86config-devel >= 1.3.0.0-26
 
+Patch0: fix-errorf-visibility.patch
 ExcludeArch: s390 s390x
 
 %description
@@ -20,6 +21,7 @@ It is used to read and write X server co
 
 %prep
 %setup -q
+%patch0 -p1 -b .symbol
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 0.3.37-6
+- fix ErrorF/VErrorF symbol visibility - hacky but should do for now
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.37-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Aug  7 01:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:09:33 +0000
Subject: [pkgdb] kdegames: rdieter has given up approveacls
Message-ID: <20090807010934.0B0FF10F8C0@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 01:09:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:09:36 +0000
Subject: [pkgdb] kdegames: rdieter has requested approveacls
Message-ID: <20090807010936.7489810F8C3@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegames (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 01:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:09:41 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20090807010941.250F810F8C8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegames (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 01:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:09:41 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20090807010941.7400F10F8CD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegames (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 01:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:09:42 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20090807010942.5CBF610F92C@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegames (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:03 +0000
Subject: [pkgdb] kdeedu: rdieter has given up approveacls
Message-ID: <20090807011003.75A7810F935@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdeedu (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:06 +0000
Subject: [pkgdb] kdeedu: rdieter has requested approveacls
Message-ID: <20090807011006.D860210F937@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeedu (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:12 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20090807011012.B1B7910F93E@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeedu (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:14 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20090807011014.19EC710F942@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeedu (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:14 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20090807011014.34A5210F947@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeedu (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:37 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090807011037.E237E10F94A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-workspace (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:40 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090807011040.A48FD10F94E@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase-workspace (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:41 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090807011041.2B0A410F952@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-workspace (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:46 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090807011046.4C1DA10F955@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-workspace (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:46 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090807011046.F283410F95A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-workspace (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 01:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:10:47 +0000
Subject: [pkgdb] kdebase-workspace had acl change status
Message-ID: <20090807011047.DAFE010F961@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase-workspace (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-workspace



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:08 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090807011108.41DE010F96B@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-runtime (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:08 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090807011108.984C210F970@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-runtime (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:09 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090807011109.C87DD10F9F6@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase-runtime (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:13 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090807011114.0FF5A10F972@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase-runtime (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:15 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090807011115.92A1010F9FF@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase-runtime (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:15 +0000
Subject: [pkgdb] kdebase-runtime had acl change status
Message-ID: <20090807011116.017F410FA05@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase-runtime (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase-runtime



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:38 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090807011139.2FD1C10F89F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:39 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090807011139.A8A5010F97A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:41 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090807011141.A4DAD10FA0D@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase (Fedora 10) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:47 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090807011147.8023B10FA13@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebase (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:47 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090807011147.EE25010FA11@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebase (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 01:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:11:49 +0000
Subject: [pkgdb] kdebase had acl change status
Message-ID: <20090807011149.4DA6010F97D@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebase (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdebase



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:13 +0000
Subject: [pkgdb] kdeartwork: rdieter has requested watchbugzilla
Message-ID: <20090807011213.8315810F97F@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:15 +0000
Subject: [pkgdb] kdeartwork: rdieter has requested watchcommits
Message-ID: <20090807011215.69A5C10F981@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:16 +0000
Subject: [pkgdb] kdeartwork: rdieter has requested commit
Message-ID: <20090807011216.5FCAC10F984@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:16 +0000
Subject: [pkgdb] kdeartwork: rdieter has requested approveacls
Message-ID: <20090807011216.BF19710FA1D@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeartwork (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:21 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20090807011221.5866710F98A@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeartwork (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:22 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20090807011222.539C310FA25@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeartwork (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:22 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20090807011222.D6F0710FA2A@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeartwork (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:44 +0000
Subject: [pkgdb] kdeadmin: rdieter has requested watchbugzilla
Message-ID: <20090807011244.8D5FE10F8DB@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:44 +0000
Subject: [pkgdb] kdeadmin: rdieter has requested watchcommits
Message-ID: <20090807011244.ED9B410F8DE@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:47 +0000
Subject: [pkgdb] kdeadmin: rdieter has requested commit
Message-ID: <20090807011247.25E9610FA2C@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:49 +0000
Subject: [pkgdb] kdeadmin: rdieter has requested approveacls
Message-ID: <20090807011249.4476810FA2F@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeadmin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:52 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20090807011253.0F9AB10F994@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeadmin (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:53 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20090807011253.BBC9210FA36@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeadmin (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:12:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:12:54 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20090807011254.EE43F10FA3B@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeadmin (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:17 +0000
Subject: [pkgdb] kdeaccessibility: rdieter has requested watchcommits
Message-ID: <20090807011317.22C7D10F8E3@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:17 +0000
Subject: [pkgdb] kdeaccessibility: rdieter has requested watchbugzilla
Message-ID: <20090807011317.A3EA010F99A@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:18 +0000
Subject: [pkgdb] kdeaccessibility: rdieter has requested commit
Message-ID: <20090807011318.5B94710FA41@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:19 +0000
Subject: [pkgdb] kdeaccessibility: rdieter has requested approveacls
Message-ID: <20090807011319.93EE310FA43@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdeaccessibility (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:24 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20090807011324.24FC210FA49@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeaccessibility (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:24 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20090807011324.7B83410FA4D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeaccessibility (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:13:25 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20090807011325.CA9C510FA50@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaccessibility (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Fri Aug  7 01:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:14:25 +0000
Subject: [pkgdb] kdegraphics: rdieter has given up approveacls
Message-ID: <20090807011425.CDDFD10F8E9@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdegraphics (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 01:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:14:27 +0000
Subject: [pkgdb] kdegraphics: rdieter has requested approveacls
Message-ID: <20090807011427.C48CF10F8EC@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdegraphics (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 01:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:14:31 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20090807011431.B91A810F8EF@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegraphics (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 01:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:14:32 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20090807011432.4AF2F10F9A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegraphics (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Fri Aug  7 01:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 01:14:33 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20090807011433.A347310F9AF@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdegraphics



From snecker at fedoraproject.org  Fri Aug  7 01:25:00 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Fri,  7 Aug 2009 01:25:00 +0000 (UTC)
Subject: rpms/mapnik/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090807012500.318CA11C00E4@cvs1.fedora.phx.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4436

Modified Files:
	.cvsignore sources 
Log Message:
Update to 0.6.1
Patch to enable demo to build
Patch to use system agg
Remove old patches
Spec file cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 06:45:11 -0000	1.3
+++ .cvsignore	7 Aug 2009 01:24:59 -0000	1.4
@@ -1 +1,7 @@
-mapnik_src-0.5.2.svn738.tar.gz
+mapnik-0.6.1.tar.bz2
+mapnik-build-viewer.patch
+mapnik.spec
+mapnik-freetype.patch
+no_date_footer.html
+viewer.desktop
+mapnik-data.license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2008 06:45:11 -0000	1.3
+++ sources	7 Aug 2009 01:25:00 -0000	1.4
@@ -1 +1,7 @@
-01b65569ff99e3b3e70880bc47302a11  mapnik_src-0.5.2.svn738.tar.gz
+44093af694321ef2034b1fd2edc998c9  mapnik-0.6.1.tar.bz2
+be169250b3c63161cc9f679883eb9863  mapnik-build-viewer.patch
+3ae4e10b33cc68cd548f29deb7b8b7de  mapnik.spec
+7bf5cf2dc1ef6c907a7e89fca6b8f84e  mapnik-freetype.patch
+7c87cbae93e72e80516cea82251a5662  no_date_footer.html
+8d2512af058081317139232bddd5f28a  viewer.desktop
+c6275aff9486b06e6f9a54e671cb0bd2  mapnik-data.license



From snecker at fedoraproject.org  Fri Aug  7 01:26:52 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Fri,  7 Aug 2009 01:26:52 +0000 (UTC)
Subject: rpms/mapnik/devel mapnik-0.5.2-gcc44.patch, 1.1,
	NONE use-system-fonts.patch, 1.1, NONE
Message-ID: <20090807012652.A9E7F11C00E4@cvs1.fedora.phx.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6323

Removed Files:
	mapnik-0.5.2-gcc44.patch use-system-fonts.patch 
Log Message:
Remove old patches



--- mapnik-0.5.2-gcc44.patch DELETED ---


--- use-system-fonts.patch DELETED ---



From snecker at fedoraproject.org  Fri Aug  7 01:33:30 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Fri,  7 Aug 2009 01:33:30 +0000 (UTC)
Subject: rpms/mapnik/devel mapnik.spec,1.15,1.16
Message-ID: <20090807013330.866C111C00E4@cvs1.fedora.phx.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9075

Modified Files:
	mapnik.spec 
Log Message:
Updated spec file



Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mapnik.spec	25 Jul 2009 11:47:18 -0000	1.15
+++ mapnik.spec	7 Aug 2009 01:33:30 -0000	1.16
@@ -1,16 +1,15 @@
 Name:      mapnik
-Version:   0.5.2
-Release:   0.14.svn780%{?dist}
+Version:   0.6.1
+Release:   1%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
 URL:       http://mapnik.org/
-Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
+Source0:   http://download.berlios.de/mapnik/mapnik-%{version}.tar.bz2
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Source3:   viewer.desktop
-Patch0:    use-system-fonts.patch
-Patch1:    mapnik-0.5.2-gcc44.patch
+Patch0:	   mapnik-build-viewer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} >= 11
@@ -21,7 +20,7 @@ Requires:  dejavu-fonts
 
 BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
-BuildRequires: scons doxygen desktop-file-utils
+BuildRequires: scons desktop-file-utils
 BuildRequires: libtool-ltdl-devel qt-devel > 4.3
 BuildRequires: libxml2-devel boost-devel libicu-devel
 BuildRequires: libtiff-devel libjpeg-devel libpng-devel
@@ -94,16 +93,15 @@ License:  GPLv2+ GeoGratis
 Group:    Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-python = %{version}-%{release}
-Requires: freetype-devel
 
 %description demo
 Demo application and sample vector datas distributed with the Mapnik
 spatial visualization library
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
+
 %patch0 -p0
-%patch1 -p1 -b .gcc44
 
 # clean SVN
 find . -type d -name .svn -exec rm -rf '{}' +
@@ -129,6 +127,7 @@ set -x
 
 # fix spurious exec flag
 chmod -x demo/viewer/images/*.png
+chmod -x bindings/python/mapnik/ogcserver/modserver.py
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
@@ -158,6 +157,7 @@ scons         PREFIX=%{_prefix} \
               XMLPARSER=libxml2 \
               GDAL_INCLUDES=%{_includedir}/gdal \
               INTERNAL_LIBAGG=False
+	      SYSTEM_FONTS=True
 
 # build mapnik viewer app
 pushd demo/viewer
@@ -167,14 +167,6 @@ qmake-qt4 viewer.pro
 make
 popd
 
-# build doxygen docs
-# use multilib aware footer
-sed -i -e 's|HTML_FOOTER|HTML_FOOTER=no_date_footer.html\n\#|g' docs/doxygen/Doxyfile
-install -p -m 644 %{SOURCE2} docs/doxygen/
-pushd docs/doxygen
-doxygen
-popd
-
 %install
 
 rm -rf %{buildroot}
@@ -205,7 +197,7 @@ Name: %{name}
 Description: Free Toolkit for developing mapping applications
 Version: %{version}
 Libs: -lmapnik
-Cflags: -I${includedir}/%{name} -I${includedir}/agg
+Cflags: -I${includedir}/%{name} -I${includedir}/agg2
 EOF
 
 mkdir -p %{buildroot}%{_datadir}/pkgconfig/
@@ -221,9 +213,14 @@ desktop-file-install --vendor="fedora" \
 export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir}
 
-pushd tests/python/
-./test_load_map.py || true
-./test_save_map.py || true
+pushd tests/python_tests/
+./load_map_test.py || true
+./save_map_test.py || true
+./datasource_test.py || true
+./font_test_test.py || true
+./object_test.py || true
+./projection_test.py || true
+./render_test.py || true
 popd
 
 %clean
@@ -243,7 +240,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/doxygen/html
+%doc docs/
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}.so
@@ -267,8 +264,11 @@ rm -rf %{buildroot}
 %doc demo/python demo/test
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-0.14.svn780
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug  7 2009 Christopher Brown <snecker[AT]fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+- Add mapnik-build-viewer.patch
+- Drop use-system-fonts.patch as scons provides this
+- Drop mapnik-0.5.2-gcc44.patch as the code is now good for gcc44
 
 * Sat Jun 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.5.2-0.13.svn780
 - Require individual dejavu font packages



From snecker at fedoraproject.org  Fri Aug  7 01:34:44 2009
From: snecker at fedoraproject.org (Christopher Brown)
Date: Fri,  7 Aug 2009 01:34:44 +0000 (UTC)
Subject: rpms/mapnik/devel mapnik.spec,1.16,1.17
Message-ID: <20090807013444.CDB9C11C00E4@cvs1.fedora.phx.redhat.com>

Author: snecker

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9579

Modified Files:
	mapnik.spec 
Log Message:



Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mapnik.spec	7 Aug 2009 01:33:30 -0000	1.16
+++ mapnik.spec	7 Aug 2009 01:34:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+



From dcantrel at fedoraproject.org  Fri Aug  7 02:09:09 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri,  7 Aug 2009 02:09:09 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.651, 1.652 anaconda.spec, 1.801, 
	1.802 sources, 1.785, 1.786
Message-ID: <20090807020909.A78D611C00E4@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20072

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12.9-1
- Avoid finding the word 'engine' in comments. (jkeating)
- Don't try to get dso deps of statically linked files. (jkeating)
- Call shutDown() correctly for s390 (karsten)
- Remove unused variable from loader/loader.c (karsten)
- Delete unpackaged files on non-livearches. (karsten)
- Do not set parted.PARTITION_BOOTABLE on s390. (root)
- Complete udev setup in linuxrc.s390 for automatic module loading (root)
- Recognize mpath devices when we see them. (pjones)
- Make DiskDevice.partedDisk a property. (pjones)
- Make questionInitializeDisk() somewhat less ugly. (pjones)
- Add a description to DiskDevice, and use it in the UI. (pjones)
- Get rid of Device.description, it is unused. (pjones)
- Close the opened file descriptors when necessary. (#499854) (jgranado)
- Add the glade files to the install image so save-to-bugzilla works
  (#515444). (clumens)
- New system-config-keyboard has a different version then I expected
  (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -p -r1.651 -r1.652
--- .cvsignore	5 Aug 2009 21:40:33 -0000	1.651
+++ .cvsignore	7 Aug 2009 02:09:09 -0000	1.652
@@ -1,4 +1 @@
-anaconda-12.5.tar.bz2
-anaconda-12.6.tar.bz2
-anaconda-12.7.tar.bz2
-anaconda-12.8.tar.bz2
+anaconda-12.9.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -p -r1.801 -r1.802
--- anaconda.spec	5 Aug 2009 21:40:34 -0000	1.801
+++ anaconda.spec	7 Aug 2009 02:09:09 -0000	1.802
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.8
+Version: 12.9
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -111,7 +111,7 @@ Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
 %ifnarch s390 s390x ppc64
-Requires: system-config-keyboard >= 1.3.1
+Requires: system-config-keyboard >= 1.3.0-3
 %endif
 Requires: hal, dbus-python
 Requires: cracklib-python
@@ -162,6 +162,8 @@ find %{buildroot} -type f -name "*.la" |
 
 %ifarch %livearches
 desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
+%else
+%{__rm} -rf %{buildroot}%{_bindir}/liveinst %{buildroot}%{_sbindir}/liveinst
 %endif
 
 %find_lang %{name}
@@ -207,6 +209,25 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12.9-1
+- Avoid finding the word 'engine' in comments. (jkeating)
+- Don't try to get dso deps of statically linked files. (jkeating)
+- Call shutDown() correctly for s390 (karsten)
+- Remove unused variable from loader/loader.c (karsten)
+- Delete unpackaged files on non-livearches. (karsten)
+- Do not set parted.PARTITION_BOOTABLE on s390. (root)
+- Complete udev setup in linuxrc.s390 for automatic module loading (root)
+- Recognize mpath devices when we see them. (pjones)
+- Make DiskDevice.partedDisk a property. (pjones)
+- Make questionInitializeDisk() somewhat less ugly. (pjones)
+- Add a description to DiskDevice, and use it in the UI. (pjones)
+- Get rid of Device.description, it is unused. (pjones)
+- Close the opened file descriptors when necessary. (#499854) (jgranado)
+- Add the glade files to the install image so save-to-bugzilla works
+  (#515444). (clumens)
+- New system-config-keyboard has a different version then I expected
+  (hdegoede)
+
 * Wed Aug 05 2009 Chris Lumens <clumens at redhat.com> - 12.8-1
 - Don't try to unmount the CD before we later unmount the CD (#515564).
   (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -p -r1.785 -r1.786
--- sources	5 Aug 2009 21:40:34 -0000	1.785
+++ sources	7 Aug 2009 02:09:09 -0000	1.786
@@ -1 +1 @@
-3ec836d293455dc1710d2338f39be59b  anaconda-12.8.tar.bz2
+a1c60be641cbbdfa87af26385a438a64  anaconda-12.9.tar.bz2



From spot at fedoraproject.org  Fri Aug  7 02:41:37 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  7 Aug 2009 02:41:37 +0000 (UTC)
Subject: rpms/blacs/devel Bmake.inc,1.9,1.10 blacs.spec,1.32,1.33
Message-ID: <20090807024137.5B61111C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/blacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29151

Modified Files:
	Bmake.inc blacs.spec 
Log Message:
rework for new MPI model


Index: Bmake.inc
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- Bmake.inc	23 Sep 2008 16:03:50 -0000	1.9
+++ Bmake.inc	7 Aug 2009 02:41:37 -0000	1.10
@@ -13,7 +13,7 @@
 #  -----------------------------
 #  The top level BLACS directory
 #  -----------------------------
-   BTOPdir = $(RPM_BUILD_DIR)/blacs/BLACS
+   BTOPdir = $(RPM_BUILD_DIR)/blacs/BLACS-FOO
 
 #  ---------------------------------------------------------------------------
 #  The communication library your BLACS have been written for.


Index: blacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- blacs.spec	24 Jul 2009 18:09:01 -0000	1.32
+++ blacs.spec	7 Aug 2009 02:41:37 -0000	1.33
@@ -1,7 +1,32 @@
+# These macros will go away soon. Hopefully.
+%global _openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload openmpi-%{_arch};
+
+%global	_lam_load \
+ . /etc/profile.d/modules.sh; \
+ module load lam-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _lam_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload lam-%{_arch};
+
+%global _mpich2_load \
+ . /etc/profile.d/modules.sh; \
+ module load mpich2-%{__isa_bits}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _mpich2_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload mpich2-%{__isa_bits};
+
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -14,8 +39,7 @@ Source5: http://www.netlib.org/blacs/f77
 Source6: http://www.netlib.org/blacs/cblacsqref.ps
 Source7: http://www.netlib.org/blacs/lawn94.ps
 BuildRequires: gcc-gfortran
-BuildRequires: lapack, blas, openmpi-devel
-Requires: lapack, blas
+BuildRequires: lapack, blas
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-fedora.patch
 
@@ -30,30 +54,121 @@ algorithms makes it impractical to rewri
 parallel machine. The BLACS exist in order to make linear algebra 
 applications both easier to program and more portable. 
 
-%package devel
-Summary: Development libraries for blacs
+%package common
+Summary: Common files for blacs
+Group: Development/Libraries
+Requires: lapack, blas
+
+%description common
+The BLACS (Basic Linear Algebra Communication Subprograms) project is
+an ongoing investigation whose purpose is to create a linear algebra
+oriented message passing interface that may be implemented efficiently
+and uniformly across a large range of distributed memory platforms.
+
+The length of time required to implement efficient distributed memory
+algorithms makes it impractical to rewrite programs for every new
+parallel machine. The BLACS exist in order to make linear algebra
+applications both easier to program and more portable.
+
+This file contains common files which are not specific to any MPI implementation.
+
+%package lam
+Summary: BLACS libraries compiled against lam
+Group: Development/Libraries
+BuildRequires: lam-devel
+Requires: %{name}-common = %{version}-%{release}
+Requires: environment-modules
+
+%description lam
+The BLACS (Basic Linear Algebra Communication Subprograms) project is
+an ongoing investigation whose purpose is to create a linear algebra
+oriented message passing interface that may be implemented efficiently
+and uniformly across a large range of distributed memory platforms.
+
+The length of time required to implement efficient distributed memory
+algorithms makes it impractical to rewrite programs for every new
+parallel machine. The BLACS exist in order to make linear algebra
+applications both easier to program and more portable.
+
+This package contains BLACS libraries compiled with lam.
+
+%package lam-devel
+Summary: Development libraries for blacs (lam)
+Group: Development/Libraries
+Requires: %{name}-lam = %{version}-%{release}
+Provides: %{name}-lam-static = %{version}-%{release}
+
+%description lam-devel
+This package contains development libraries for blacs, compiled	against lam.
+
+%package mpich2
+Summary: BLACS libraries compiled against mpich2
+Group: Development/Libraries
+BuildRequires: mpich2-devel
+Requires: %{name}-common = %{version}-%{release}
+Requires: environment-modules
+
+%description mpich2
+The BLACS (Basic Linear Algebra Communication Subprograms) project is
+an ongoing investigation whose purpose is to create a linear algebra
+oriented message passing interface that may be implemented efficiently
+and uniformly across a large range of distributed memory platforms.
+
+The length of time required to implement efficient distributed memory
+algorithms makes it impractical to rewrite programs for every new
+parallel machine. The BLACS exist in order to make linear algebra
+applications both easier to program and more portable.
+
+This package contains BLACS libraries compiled with mpich2.
+
+%package mpich2-devel
+Summary: Development libraries for blacs (mpich2)
+Group: Development/Libraries
+Requires: %{name}-mpich2 = %{version}-%{release}
+Provides: %{name}-mpich2-static = %{version}-%{release}
+
+%description mpich2-devel
+This package contains development libraries for blacs, compiled against mpich2.
+
+%package openmpi
+Summary: BLACS libraries compiled against openmpi
+Group: Development/Libraries
+Requires: %{name}-common = %{version}-%{release}
+Requires: environment-modules
+
+%description openmpi
+The BLACS (Basic Linear Algebra Communication Subprograms) project is
+an ongoing investigation whose purpose is to create a linear algebra
+oriented message passing interface that may be implemented efficiently
+and uniformly across a large range of distributed memory platforms.
+
+The length of time required to implement efficient distributed memory
+algorithms makes it impractical to rewrite programs for every new
+parallel machine. The BLACS exist in order to make linear algebra
+applications both easier to program and more portable.
+
+This package contains BLACS libraries compiled with openmpi.
+
+%package openmpi-devel
+Summary: Development libraries for blacs (openmpi)
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+BuildRequires: openmpi-devel
+Requires: %{name}-openmpi = %{version}-%{release}
+Provides: %{name}-openmpi-static = %{version}-%{release}
 
-%description devel
-This package contains development libraries for blacs.
+%description openmpi-devel
+This package contains development libraries for blacs, compiled	against openmpi.
 
 %prep
 %setup -q -c -n %{name}
 %patch0 -p1
-cd BLACS/
-cp -f %{SOURCE1} .
-
-%build
-cd BLACS/
-CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//g'`
-RPM_OPT_FLAGS=`echo $CFLAGS`
-make mpi
-
-cd TESTING/
-make
-cd ../..
+for i in lam mpich2 openmpi; do
+	cp -a BLACS BLACS-$i
+	cp -f %{SOURCE1} BLACS-$i/
+	sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
+done
 
+# copy in docs:
 cp %{SOURCE2} mpi_prop.ps
 cp %{SOURCE3} blacs_install.ps
 cp %{SOURCE4} mpiblacs_issues.ps
@@ -61,44 +176,117 @@ cp %{SOURCE5} f77blacsqref.ps
 cp %{SOURCE6} cblacsqref.ps
 cp %{SOURCE7} lawn94.ps
 
-%install
-rm -fr ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-
-cd BLACS/LIB
-for f in *.a *.so*; do
-  cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f
-done
-cd ../TESTING/EXE
-cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir}
+%build
+# CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//g'`
+# RPM_OPT_FLAGS=`echo $CFLAGS`
 
-cd ${RPM_BUILD_ROOT}%{_libdir}
-for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
-  ln -fs $i.so.1.0.0 $i.so.1
-  ln -s $i.so.1.0.0 $i.so
-done
+# To avoid replicated code define a build macro
+%define dobuild() \
+cd BLACS-$MPI_COMPILER; \
+make mpi ; \
 cd ..
 
-%post -p /sbin/ldconfig
+# Build LAM version
+export MPI_COMPILER=lam
+%{_lam_load}
+RPM_OPT_FLAGS=`echo $CFLAGS`
+%dobuild
+%{_lam_unload}
+
+# Build mpich2 version
+export MPI_COMPILER=mpich2
+%{_mpich2_load}
+RPM_OPT_FLAGS=`echo $CFLAGS`
+%dobuild
+%{_mpich2_unload}
+
+# Build OpenMPI version
+export MPI_COMPILER=openmpi
+%{_openmpi_load}
+RPM_OPT_FLAGS=`echo $CFLAGS`
+%dobuild
+%{_openmpi_unload}
 
-%postun -p /sbin/ldconfig
+# cd TESTING/
+# make
+# cd ../..
+
+%install
+# mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+
+for i in lam mpich2 openmpi; do 
+  mkdir -p %{buildroot}%{_libdir}/blacs-$i/
+  pushd BLACS-$i/LIB
+  for f in *.a *.so*; do
+    cp -f $f %{buildroot}%{_libdir}/blacs-$i/$f
+  done
+  popd
+  pushd %{buildroot}%{_libdir}/blacs-$i/
+  for l in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do
+    ln -fs $l.so.1.0.0 $l.so.1
+    ln -s $l.so.1.0.0 $l.so
+  done
+  popd
+# Generate environment module file
+mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles/
+cat << EOF > %{buildroot}%{_datadir}/Modules/modulefiles/blacs-$i-%{_arch}
+#%Module 1.0
+#
+#  Blacs libraries compiled with $i support
+#
+prepend-path		LD_LIBRARY_PATH		%{_libdir}/blacs-$i
+setenv			LDFLAGS			-L%{_libdir}/blacs-$i
+EOF
+done
+
+# cd ../TESTING/EXE
+# cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir}
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
-%files
+%files common
 %defattr(-,root,root,0755)
 %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps
-%{_bindir}/x*test_MPI-LINUX-0
-%{_libdir}/libmpiblacs*.so.*
+# %{_bindir}/x*test_MPI-LINUX-0
+
+%files lam
+%defattr(-,root,root,0755)
+%dir %{_libdir}/blacs-lam/
+%{_datadir}/Modules/modulefiles/blacs-lam-%{_arch}
+%{_libdir}/blacs-lam/*.so.*
+
+%files lam-devel
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-lam/*.a
+%{_libdir}/blacs-lam/*.so
 
-%files devel
+%files mpich2
 %defattr(-,root,root,0755)
-%{_libdir}/libmpiblacs*.a
-%{_libdir}/libmpiblacs*.so
+%dir %{_libdir}/blacs-mpich2/
+%{_datadir}/Modules/modulefiles/blacs-mpich2-%{_arch}
+%{_libdir}/blacs-mpich2/*.so.*
+
+%files mpich2-devel
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-mpich2/*.a
+%{_libdir}/blacs-mpich2/*.so
+
+%files openmpi
+%defattr(-,root,root,0755)
+%dir %{_libdir}/blacs-openmpi/
+%{_datadir}/Modules/modulefiles/blacs-openmpi-%{_arch}
+%{_libdir}/blacs-openmpi/*.so.*
+
+%files openmpi-devel
+%defattr(-,root,root,0755)
+%{_libdir}/blacs-openmpi/*.a
+%{_libdir}/blacs-openmpi/*.so
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-33
+- rework package to handle all supported MPI environments in Fedora
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Fri Aug  7 02:42:11 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  7 Aug 2009 02:42:11 +0000 (UTC)
Subject: rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.9,
	1.10 scalapack.spec, 1.25, 1.26
Message-ID: <20090807024211.1B2A011C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/scalapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29363

Modified Files:
	scalapack-1.7-fedora.patch scalapack.spec 
Log Message:
update for new MPI

scalapack-1.7-fedora.patch:
 scalapack-1.7.5/scalapack-1.7.5/SLmake.inc |   31 ++++++++++++++---------------
 scalapack-1.7/scalapack-1.7.5/Makefile     |    5 +++-
 2 files changed, 20 insertions(+), 16 deletions(-)

Index: scalapack-1.7-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- scalapack-1.7-fedora.patch	23 Sep 2008 17:59:13 -0000	1.9
+++ scalapack-1.7-fedora.patch	7 Aug 2009 02:42:10 -0000	1.10
@@ -15,7 +15,7 @@
  	( cd $(REDISTdir)/SRC; $(MAKE) clean )
 +
 +shared: scalapacklib
-+	( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. )
++	( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; $(CC) -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. )
 --- scalapack-1.7.5/scalapack-1.7.5/SLmake.inc.fedora	2001-08-08 21:59:50.000000000 -0500
 +++ scalapack-1.7.5/scalapack-1.7.5/SLmake.inc	2006-03-08 18:09:05.000000000 -0600
 @@ -19,7 +19,7 @@
@@ -23,7 +23,7 @@
  #  $(HOME)/SCALAPACK
  #
 -home          = $(HOME)/SCALAPACK
-+home          = $(RPM_BUILD_DIR)/scalapack-1.7.5/scalapack-1.7.5
++home          = $(RPM_BUILD_DIR)/scalapack-1.7.5/scalapack-1.7.5-FOO
  #
  #  The platform identifier to suffix to the end of library names
  #


Index: scalapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- scalapack.spec	27 Jul 2009 03:51:18 -0000	1.25
+++ scalapack.spec	7 Aug 2009 02:42:10 -0000	1.26
@@ -1,13 +1,63 @@
+# These macros will go away soon. Hopefully.
+%global _openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload openmpi-%{_arch};
+
+%global _lam_load \
+ . /etc/profile.d/modules.sh; \
+ module load lam-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _lam_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload lam-%{_arch};
+
+%global _mpich2_load \
+ . /etc/profile.d/modules.sh; \
+ module load mpich2-%{__isa_bits}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _mpich2_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload mpich2-%{__isa_bits};
+
+# The blacs packages should probably provide these.
+%global _blacs_openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load blacs-openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _blacs_openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload blacs-openmpi-%{_arch};
+
+%global _blacs_lam_load \
+ . /etc/profile.d/modules.sh; \
+ module load blacs-lam-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _blacs_lam_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload blacs-lam-%{_arch};
+
+%global _blacs_mpich2_load \
+ . /etc/profile.d/modules.sh; \
+ module load blacs-mpich2-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
+%global _blacs_mpich2_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload blacs-mpich2-%{_arch};
+
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack-dev/
 Source0: http://www.netlib.org/scalapack/scalapack-%{version}.tgz
-BuildRequires: lapack-devel, blas-devel, openmpi-devel, blacs-devel
+BuildRequires: lapack-devel, blas-devel
 BuildRequires: gcc-gfortran, glibc-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
@@ -38,61 +88,294 @@ routines, all interprocessor communicati
 BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK 
 routines resemble their LAPACK equivalents as much as possible. 
 
-%package devel
-Summary: Development libraries for scalapack
+%package common
+Summary: Common files for scalapack
+Group: Development/Libraries
+
+%description common
+The ScaLAPACK (or Scalable LAPACK) library includes a subset
+of LAPACK routines redesigned for distributed memory MIMD
+parallel computers. It is currently written in a
+Single-Program-Multiple-Data style using explicit message
+passing for interprocessor communication. It assumes
+matrices are laid out in a two-dimensional block cyclic
+decomposition.
+
+ScaLAPACK is designed for heterogeneous computing and is
+portable on any computer that supports MPI or PVM.
+
+Like LAPACK, the ScaLAPACK routines are based on
+block-partitioned algorithms in order to minimize the frequency
+of data movement between different levels of the memory hierarchy.
+(For such machines, the memory hierarchy includes the off-processor
+memory of other processors, in addition to the hierarchy of registers,
+cache, and local memory on each processor.) The fundamental building
+blocks of the ScaLAPACK library are distributed memory versions (PBLAS)
+of the Level 1, 2 and 3 BLAS, and a set of Basic Linear Algebra
+Communication Subprograms (BLACS) for communication tasks that arise
+frequently in parallel linear algebra computations. In the ScaLAPACK
+routines, all interprocessor communication occurs within the PBLAS and the
+BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
+routines resemble their LAPACK equivalents as much as possible.
+
+This package contains common files which are not specific to any MPI implementation.
+
+%package lam
+Summary: ScaLAPACK libraries compiled against lam
+Group: Development/Libraries
+BuildRequires: blacs-lam-devel, lam-devel
+Requires: %{name}-common = %{version}-%{release}
+Requires: environment-modules
+
+%description lam
+The ScaLAPACK (or Scalable LAPACK) library includes a subset
+of LAPACK routines redesigned for distributed memory MIMD
+parallel computers. It is currently written in a
+Single-Program-Multiple-Data style using explicit message
+passing for interprocessor communication. It assumes
+matrices are laid out in a two-dimensional block cyclic
+decomposition.
+
+ScaLAPACK is designed for heterogeneous computing and is
+portable on any computer that supports MPI or PVM.
+
+Like LAPACK, the ScaLAPACK routines are based on
+block-partitioned algorithms in order to minimize the frequency
+of data movement between different levels of the memory hierarchy.
+(For such machines, the memory hierarchy includes the off-processor
+memory of other processors, in addition to the hierarchy of registers,
+cache, and local memory on each processor.) The fundamental building
+blocks of the ScaLAPACK library are distributed memory versions (PBLAS)
+of the Level 1, 2 and 3 BLAS, and a set of Basic Linear Algebra
+Communication Subprograms (BLACS) for communication tasks that arise
+frequently in parallel linear algebra computations. In the ScaLAPACK
+routines, all interprocessor communication occurs within the PBLAS and the
+BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
+routines resemble their LAPACK equivalents as much as possible.
+
+This package contains ScaLAPACK libraries compiled with lam.
+
+%package lam-devel
+Summary: Development libraries for ScaLAPACK (lam)
+Group: Development/Libraries
+Requires: %{name}-lam = %{version}-%{release}
+Provides: %{name}-lam-static = %{version}-%{release}
+
+%description lam-devel
+This package contains development libraries for ScaLAPACK, compiled against lam.
+
+%package mpich2
+Summary: ScaLAPACK libraries compiled against mpich2
+Group: Development/Libraries
+BuildRequires: blacs-mpich2-devel, mpich2-devel
+Requires: %{name}-common = %{version}-%{release}
+Requires: environment-modules
+
+%description mpich2
+The ScaLAPACK (or Scalable LAPACK) library includes a subset
+of LAPACK routines redesigned for distributed memory MIMD
+parallel computers. It is currently written in a
+Single-Program-Multiple-Data style using explicit message
+passing for interprocessor communication. It assumes
+matrices are laid out in a two-dimensional block cyclic
+decomposition.
+
+ScaLAPACK is designed for heterogeneous computing and is
+portable on any computer that supports MPI or PVM.
+
+Like LAPACK, the ScaLAPACK routines are based on
+block-partitioned algorithms in order to minimize the frequency
+of data movement between different levels of the memory hierarchy.
+(For such machines, the memory hierarchy includes the off-processor
+memory of other processors, in addition to the hierarchy of registers,
+cache, and local memory on each processor.) The fundamental building
+blocks of the ScaLAPACK library are distributed memory versions (PBLAS)
+of the Level 1, 2 and 3 BLAS, and a set of Basic Linear Algebra
+Communication Subprograms (BLACS) for communication tasks that arise
+frequently in parallel linear algebra computations. In the ScaLAPACK
+routines, all interprocessor communication occurs within the PBLAS and the
+BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
+routines resemble their LAPACK equivalents as much as possible.
+
+This package contains ScaLAPACK	libraries compiled with	mpich2.
+
+%package mpich2-devel
+Summary: Development libraries for ScaLAPACK (mpich2)
+Group: Development/Libraries
+Requires: %{name}-mpich2 = %{version}-%{release}
+Provides: %{name}-mpich2-static = %{version}-%{release}
+
+%description mpich2-devel
+This package contains development libraries for ScaLAPACK, compiled against mpich2.
+
+%package openmpi
+Summary: ScaLAPACK libraries compiled against openmpi
+Group: Development/Libraries
+BuildRequires: blacs-openmpi-devel, openmpi-devel
+Requires: %{name}-common = %{version}-%{release}
+Requires: environment-modules
+
+%description openmpi
+The ScaLAPACK (or Scalable LAPACK) library includes a subset
+of LAPACK routines redesigned for distributed memory MIMD
+parallel computers. It is currently written in a
+Single-Program-Multiple-Data style using explicit message
+passing for interprocessor communication. It assumes
+matrices are laid out in a two-dimensional block cyclic
+decomposition.
+
+ScaLAPACK is designed for heterogeneous computing and is
+portable on any computer that supports MPI or PVM.
+
+Like LAPACK, the ScaLAPACK routines are based on
+block-partitioned algorithms in order to minimize the frequency
+of data movement between different levels of the memory hierarchy.
+(For such machines, the memory hierarchy includes the off-processor
+memory of other processors, in addition to the hierarchy of registers,
+cache, and local memory on each processor.) The fundamental building
+blocks of the ScaLAPACK library are distributed memory versions (PBLAS)
+of the Level 1, 2 and 3 BLAS, and a set of Basic Linear Algebra
+Communication Subprograms (BLACS) for communication tasks that arise
+frequently in parallel linear algebra computations. In the ScaLAPACK
+routines, all interprocessor communication occurs within the PBLAS and the
+BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
+routines resemble their LAPACK equivalents as much as possible.
+
+This package contains ScaLAPACK	libraries compiled with	openmpi.
+
+%package openmpi-devel
+Summary: Development libraries for ScaLAPACK (openmpi)
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-openmpi = %{version}-%{release}
+Provides: %{name}-openmpi-static = %{version}-%{release}
 
-%description devel
-This package contains development libraries for scalapack.
+%description openmpi-devel
+This package contains development libraries for ScaLAPACK, compiled against openmpi.
 
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 cd %{name}-%{version}/
 sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
+cd ..
+for i in lam mpich2 openmpi; do
+  cp -a %{name}-%{version} %{name}-%{version}-$i
+  sed -i "s|FOO|$i|g" %{name}-%{version}-$i/SLmake.inc
+done
 
 %build
-cd %{name}-%{version}
-make lib
-make exe
+%define dobuild() \
+cd %{name}-%{version}-$MPI_COMPILER ; \
+make lib ; \
+cd ..
+
+# Build LAM version
+export MPI_COMPILER=lam
+%{_lam_load}
+%{_blacs_lam_load}
+RPM_OPT_FLAGS=`echo $CFLAGS`
+%dobuild
+%{_blacs_lam_unload}
+%{_lam_unload}
+
+# Build mpich2 version
+export MPI_COMPILER=mpich2
+%{_mpich2_load}
+%{_blacs_mpich2_load}
+RPM_OPT_FLAGS=`echo $CFLAGS`
+%dobuild
+%{_blacs_mpich2_unload}
+%{_mpich2_unload}
+
+# Build OpenMPI version
+export MPI_COMPILER=openmpi
+%{_openmpi_load}
+%{_blacs_openmpi_load}
+RPM_OPT_FLAGS=`echo $CFLAGS`
+%dobuild
+%{_blacs_openmpi_unload}
+%{_openmpi_unload}
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
+for i in lam mpich2 openmpi; do
+  mkdir -p %{buildroot}%{_libdir}/scalapack-$i/
+  pushd %{name}-%{version}-$i
+  for f in *.a *.so*; do
+    cp -f $f %{buildroot}%{_libdir}/scalapack-$i/$f
+  done
+  popd
+  pushd %{buildroot}%{_libdir}/scalapack-$i/
+  ln -fs libscalapack.so.1.0.0 libscalapack.so.1
+  ln -s libscalapack.so.1.0.0 libscalapack.so
+  popd
+# Generate environment module file
+mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles/
+cat << EOF > %{buildroot}%{_datadir}/Modules/modulefiles/scalapack-$i-%{_arch}
+#%Module 1.0
+#
+#  Blacs libraries compiled with $i support
+#
+prepend-path            LD_LIBRARY_PATH         %{_libdir}/scalapack-$i
+setenv                  LDFLAGS                 -L%{_libdir}/scalapack-$i
+EOF
+done
+
+# Copy docs
 cd %{name}-%{version}
 cp -f INSTALL/scalapack_install.ps ../
 cp -f README ../
-cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir}
-cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir}
-cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir}
-
-cd ${RPM_BUILD_ROOT}%{_libdir}
-ln -fs libscalapack.so.1.0.0 libscalapack.so.1
-ln -s libscalapack.so.1.0.0 libscalapack.so
-cd ..
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+#cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir}
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
-%files
-%defattr(-,root,root)
+%files common
+%defattr(-,root,root,-)
 %doc scalapack_install.ps README
-%{_bindir}/x*
-%{_libdir}/libscalapack.so.*
+# %{_bindir}/x*
 
-%files devel
-%defattr(-,root,root)
-%{_libdir}/libscalapack.a
-%{_libdir}/libscalapack.so
+%files lam
+%defattr(-,root,root,-)
+%dir %{_libdir}/scalapack-lam/
+%{_datadir}/Modules/modulefiles/scalapack-lam-%{_arch}
+%{_libdir}/scalapack-lam/libscalapack.so.*
+
+%files lam-devel
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-lam/libscalapack.a
+%{_libdir}/scalapack-lam/libscalapack.so
+
+%files mpich2
+%defattr(-,root,root,-)
+%dir %{_libdir}/scalapack-mpich2/
+%{_datadir}/Modules/modulefiles/scalapack-mpich2-%{_arch}
+%{_libdir}/scalapack-mpich2/libscalapack.so.*
+
+%files mpich2-devel
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-mpich2/libscalapack.a
+%{_libdir}/scalapack-mpich2/libscalapack.so
+
+%files openmpi
+%defattr(-,root,root,-)
+%dir %{_libdir}/scalapack-openmpi/
+%{_datadir}/Modules/modulefiles/scalapack-openmpi-%{_arch}
+%{_libdir}/scalapack-openmpi/libscalapack.so.*
+
+%files openmpi-devel
+%defattr(-,root,root,-)
+%{_libdir}/scalapack-openmpi/libscalapack.a
+%{_libdir}/scalapack-openmpi/libscalapack.so
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-7
+- rework package to handle all supported MPI environments in Fedora
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Fri Aug  7 02:42:37 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  7 Aug 2009 02:42:37 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.32,1.33
Message-ID: <20090807024237.CC53011C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29545

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
update for new MPI model


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- R-RScaLAPACK.spec	24 Jul 2009 16:10:12 -0000	1.32
+++ R-RScaLAPACK.spec	7 Aug 2009 02:42:37 -0000	1.33
@@ -6,19 +6,46 @@
 %define bitsize 32
 %endif
 
+# These macros will go away soon. Hopefully.
+%global _openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS";
+%global _openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload openmpi-%{_arch};
+
+# The blacs packages should probably provide this.
+%global _blacs_openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load blacs-openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS";
+%global _blacs_openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload blacs-openmpi-%{_arch};
+
+# The scalapack packages should probably provide this.
+%global _scalapack_openmpi_load \
+ . /etc/profile.d/modules.sh; \
+ module load scalapack-openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS";
+%global _scalapack_openmpi_unload \
+ . /etc/profile.d/modules.sh; \
+ module unload scalapack-openmpi-%{_arch};
+
 Name: R-%{packname}
 Version: 0.5.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: MIT
 URL: http://cran.r-project.org/contrib
 Group: Applications/Engineering
 Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
 BuildRequires: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel
-BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf, automake
-Requires: R, scalapack, openmpi-libs
-Requires(post): R
-Requires(postun): R
+BuildRequires: gcc-gfortran, blacs-openmpi-devel, scalapack-openmpi-devel, autoconf, automake
+Requires: R-core, scalapack-openmpi, openmpi
+Requires(post): R-core
+Requires(postun): R-core
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: R-RScaLAPACK-0.5.1-mpi-blacs.patch
 Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
@@ -62,9 +89,23 @@ autoconf
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL --configure-args="--with-blas=%{_libdir} CC='mpicc' F77='mpif77' CFLAGS='$RPM_OPT_FLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -lutil -llapack -lmpi'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+
+# Build OpenMPI version
+export MPI_COMPILER=openmpi
+%{_openmpi_load}
+OPENMPICFLAGS="$CFLAGS"
+OPENMPILDFLAGS="$LDFLAGS"
+%{_blacs_openmpi_load}
+BLACSCFLAGS="$CFLAGS"
+BLACSLDFLAGS="$LDFLAGS"
+%{_scalapack_openmpi_load}
+RPM_OPT_FLAGS="$CFLAGS %{optflags}"
+%{_bindir}/R CMD INSTALL --configure-args="--with-blas=%{_libdir} CC='mpicc' F77='mpif77' CFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+%{_scalapack_openmpi_unload}
+%{_blacs_openmpi_unload}
+%{_openmpi_unload}
+
 # 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
@@ -87,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com>  - 0.5.1-21
+- Update for new MPI scheme
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Fri Aug  7 03:01:40 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:01:40 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-Perl/devel .cvsignore, 1.5,
	1.6 perl-File-Find-Rule-Perl.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090807030140.5D0E111C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4056

Modified Files:
	.cvsignore perl-File-Find-Rule-Perl.spec sources 
Log Message:
* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 16:43:19 -0000	1.5
+++ .cvsignore	7 Aug 2009 03:01:39 -0000	1.6
@@ -1 +1 @@
-File-Find-Rule-Perl-1.08.tar.gz
+File-Find-Rule-Perl-1.09.tar.gz


Index: perl-File-Find-Rule-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/devel/perl-File-Find-Rule-Perl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-File-Find-Rule-Perl.spec	26 Jul 2009 05:59:48 -0000	1.10
+++ perl-File-Find-Rule-Perl.spec	7 Aug 2009 03:01:40 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		perl-File-Find-Rule-Perl
-Version:	1.08
-Release:	2%{?dist}
+Version:	1.09
+Release:	1%{?dist}
 Summary:	Common rules for searching for Perl things
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -60,6 +60,9 @@ cd ..
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
+- Upstream update.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 16:43:19 -0000	1.5
+++ sources	7 Aug 2009 03:01:40 -0000	1.6
@@ -1 +1 @@
-c9951ae98727d3f7e8bc91b3d0733a77  File-Find-Rule-Perl-1.08.tar.gz
+c2f62c50f781abf8d7af6f17d4a47db2  File-Find-Rule-Perl-1.09.tar.gz



From corsepiu at fedoraproject.org  Fri Aug  7 03:04:18 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:04:18 +0000 (UTC)
Subject: rpms/perl-HTTP-Response-Encoding/devel .cvsignore, 1.2,
	1.3 perl-HTTP-Response-Encoding.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090807030418.135D411C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4828

Modified Files:
	.cvsignore perl-HTTP-Response-Encoding.spec sources 
Log Message:
* Fri Aug 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.06-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Feb 2009 02:45:47 -0000	1.2
+++ .cvsignore	7 Aug 2009 03:04:17 -0000	1.3
@@ -1 +1 @@
-HTTP-Response-Encoding-0.05.tar.gz
+HTTP-Response-Encoding-0.06.tar.gz


Index: perl-HTTP-Response-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel/perl-HTTP-Response-Encoding.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-HTTP-Response-Encoding.spec	26 Jul 2009 06:35:21 -0000	1.4
+++ perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:04:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Response-Encoding
-Version:        0.05
-Release:        4%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        HTTP::Response::Encoding Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.06-1
+- Upstream update.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Feb 2009 02:45:47 -0000	1.2
+++ sources	7 Aug 2009 03:04:17 -0000	1.3
@@ -1 +1 @@
-bb5880687bfb8b1e220c5c3c2b7d1408  HTTP-Response-Encoding-0.05.tar.gz
+7e1d46f2d88022580e1a18bb7ac4ab71  HTTP-Response-Encoding-0.06.tar.gz



From dcantrel at fedoraproject.org  Fri Aug  7 03:05:23 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri,  7 Aug 2009 03:05:23 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.652, 1.653 anaconda.spec, 1.802, 
	1.803 sources, 1.786, 1.787
Message-ID: <20090807030523.2000811C00E4@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5198

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12.10-1
- Add missing 'i' in loader/loader.c for non-s390 arches. (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -p -r1.652 -r1.653
--- .cvsignore	7 Aug 2009 02:09:09 -0000	1.652
+++ .cvsignore	7 Aug 2009 03:05:22 -0000	1.653
@@ -1 +1 @@
-anaconda-12.9.tar.bz2
+anaconda-12.10.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -p -r1.802 -r1.803
--- anaconda.spec	7 Aug 2009 02:09:09 -0000	1.802
+++ anaconda.spec	7 Aug 2009 03:05:22 -0000	1.803
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.9
+Version: 12.10
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -209,6 +209,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12.10-1
+- Add missing 'i' in loader/loader.c for non-s390 arches. (dcantrell)
+
 * Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12.9-1
 - Avoid finding the word 'engine' in comments. (jkeating)
 - Don't try to get dso deps of statically linked files. (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -p -r1.786 -r1.787
--- sources	7 Aug 2009 02:09:09 -0000	1.786
+++ sources	7 Aug 2009 03:05:22 -0000	1.787
@@ -1 +1 @@
-a1c60be641cbbdfa87af26385a438a64  anaconda-12.9.tar.bz2
+87998ade4b3c40545ec29ff52a1c42c1  anaconda-12.10.tar.bz2



From corsepiu at fedoraproject.org  Fri Aug  7 03:08:39 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:08:39 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-Perl/F-11 .cvsignore, 1.5,
	1.6 perl-File-Find-Rule-Perl.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090807030839.9E39711C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6139/F-11

Modified Files:
	.cvsignore perl-File-Find-Rule-Perl.spec sources 
Log Message:
* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 16:43:19 -0000	1.5
+++ .cvsignore	7 Aug 2009 03:08:39 -0000	1.6
@@ -1 +1 @@
-File-Find-Rule-Perl-1.08.tar.gz
+File-Find-Rule-Perl-1.09.tar.gz


Index: perl-File-Find-Rule-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-11/perl-File-Find-Rule-Perl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-File-Find-Rule-Perl.spec	20 Jul 2009 16:43:19 -0000	1.9
+++ perl-File-Find-Rule-Perl.spec	7 Aug 2009 03:08:39 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		perl-File-Find-Rule-Perl
-Version:	1.08
+Version:	1.09
 Release:	1%{?dist}
 Summary:	Common rules for searching for Perl things
 License:	GPL+ or Artistic
@@ -60,6 +60,9 @@ cd ..
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
+- Upstream update.
+
 * Mon Jul 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 16:43:19 -0000	1.5
+++ sources	7 Aug 2009 03:08:39 -0000	1.6
@@ -1 +1 @@
-c9951ae98727d3f7e8bc91b3d0733a77  File-Find-Rule-Perl-1.08.tar.gz
+c2f62c50f781abf8d7af6f17d4a47db2  File-Find-Rule-Perl-1.09.tar.gz



From corsepiu at fedoraproject.org  Fri Aug  7 03:08:39 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:08:39 +0000 (UTC)
Subject: rpms/perl-File-Find-Rule-Perl/F-10 .cvsignore, 1.5,
	1.6 perl-File-Find-Rule-Perl.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090807030839.B953011C02C6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6139/F-10

Modified Files:
	.cvsignore perl-File-Find-Rule-Perl.spec sources 
Log Message:
* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Jul 2009 16:43:19 -0000	1.5
+++ .cvsignore	7 Aug 2009 03:08:39 -0000	1.6
@@ -1 +1 @@
-File-Find-Rule-Perl-1.08.tar.gz
+File-Find-Rule-Perl-1.09.tar.gz


Index: perl-File-Find-Rule-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-10/perl-File-Find-Rule-Perl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-File-Find-Rule-Perl.spec	20 Jul 2009 16:43:19 -0000	1.8
+++ perl-File-Find-Rule-Perl.spec	7 Aug 2009 03:08:39 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		perl-File-Find-Rule-Perl
-Version:	1.08
+Version:	1.09
 Release:	1%{?dist}
 Summary:	Common rules for searching for Perl things
 License:	GPL+ or Artistic
@@ -60,6 +60,9 @@ cd ..
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.09-1
+- Upstream update.
+
 * Mon Jul 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 1.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-Perl/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Jul 2009 16:43:19 -0000	1.5
+++ sources	7 Aug 2009 03:08:39 -0000	1.6
@@ -1 +1 @@
-c9951ae98727d3f7e8bc91b3d0733a77  File-Find-Rule-Perl-1.08.tar.gz
+c2f62c50f781abf8d7af6f17d4a47db2  File-Find-Rule-Perl-1.09.tar.gz



From corsepiu at fedoraproject.org  Fri Aug  7 03:13:15 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:13:15 +0000 (UTC)
Subject: rpms/perl-HTTP-Response-Encoding/devel
	perl-HTTP-Response-Encoding.spec, 1.5, 1.6
Message-ID: <20090807031315.3FFCB11C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7479

Modified Files:
	perl-HTTP-Response-Encoding.spec 
Log Message:
Fix changelog date.


Index: perl-HTTP-Response-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel/perl-HTTP-Response-Encoding.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:04:17 -0000	1.5
+++ perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:13:14 -0000	1.6
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.06-1
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.06-1
 - Upstream update.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4



From corsepiu at fedoraproject.org  Fri Aug  7 03:16:12 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:16:12 +0000 (UTC)
Subject: rpms/perl-HTTP-Response-Encoding/F-10 .cvsignore, 1.2,
	1.3 perl-HTTP-Response-Encoding.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090807031612.62E3E11C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8218/F-10

Modified Files:
	.cvsignore perl-HTTP-Response-Encoding.spec sources 
Log Message:
* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Feb 2009 02:57:52 -0000	1.2
+++ .cvsignore	7 Aug 2009 03:16:12 -0000	1.3
@@ -1 +1 @@
-HTTP-Response-Encoding-0.05.tar.gz
+HTTP-Response-Encoding-0.06.tar.gz


Index: perl-HTTP-Response-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-10/perl-HTTP-Response-Encoding.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-HTTP-Response-Encoding.spec	21 Feb 2009 02:57:52 -0000	1.1
+++ perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:16:12 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Response-Encoding
-Version:        0.05
+Version:        0.06
 Release:        1%{?dist}
 Summary:        HTTP::Response::Encoding Perl module
 License:        GPL+ or Artistic
@@ -51,5 +51,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
+- Upstream update.
+
 * Fri Feb 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.05-1
 - Initial Fedora package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Feb 2009 02:57:52 -0000	1.2
+++ sources	7 Aug 2009 03:16:12 -0000	1.3
@@ -1 +1 @@
-bb5880687bfb8b1e220c5c3c2b7d1408  HTTP-Response-Encoding-0.05.tar.gz
+7e1d46f2d88022580e1a18bb7ac4ab71  HTTP-Response-Encoding-0.06.tar.gz



From corsepiu at fedoraproject.org  Fri Aug  7 03:16:12 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:16:12 +0000 (UTC)
Subject: rpms/perl-HTTP-Response-Encoding/devel
	perl-HTTP-Response-Encoding.spec, 1.6, 1.7
Message-ID: <20090807031612.89B2411C02C6@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8218/devel

Modified Files:
	perl-HTTP-Response-Encoding.spec 
Log Message:
* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
- Upstream update.



Index: perl-HTTP-Response-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/devel/perl-HTTP-Response-Encoding.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:13:14 -0000	1.6
+++ perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:16:12 -0000	1.7
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> 0.06-1
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
 - Upstream update.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4



From corsepiu at fedoraproject.org  Fri Aug  7 03:16:12 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Fri,  7 Aug 2009 03:16:12 +0000 (UTC)
Subject: rpms/perl-HTTP-Response-Encoding/F-11 .cvsignore, 1.2,
	1.3 perl-HTTP-Response-Encoding.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090807031612.3777911C00E4@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8218/F-11

Modified Files:
	.cvsignore perl-HTTP-Response-Encoding.spec sources 
Log Message:
* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Feb 2009 02:45:47 -0000	1.2
+++ .cvsignore	7 Aug 2009 03:16:11 -0000	1.3
@@ -1 +1 @@
-HTTP-Response-Encoding-0.05.tar.gz
+HTTP-Response-Encoding-0.06.tar.gz


Index: perl-HTTP-Response-Encoding.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-11/perl-HTTP-Response-Encoding.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-HTTP-Response-Encoding.spec	26 Feb 2009 20:04:50 -0000	1.3
+++ perl-HTTP-Response-Encoding.spec	7 Aug 2009 03:16:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Response-Encoding
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        HTTP::Response::Encoding Perl module
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 07 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.06-1
+- Upstream update.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Response-Encoding/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Feb 2009 02:45:47 -0000	1.2
+++ sources	7 Aug 2009 03:16:11 -0000	1.3
@@ -1 +1 @@
-bb5880687bfb8b1e220c5c3c2b7d1408  HTTP-Response-Encoding-0.05.tar.gz
+7e1d46f2d88022580e1a18bb7ac4ab71  HTTP-Response-Encoding-0.06.tar.gz



From jsteffan at fedoraproject.org  Fri Aug  7 04:24:57 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Fri,  7 Aug 2009 04:24:57 +0000 (UTC)
Subject: rpms/zope/EL-5 .cvsignore, 1.23, 1.24 import.log, 1.2, 1.3 sources, 
	1.23, 1.24 zope.spec, 1.40, 1.41
Message-ID: <20090807042457.CBE7311C00D7@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11893/EL-5

Modified Files:
	.cvsignore import.log sources zope.spec 
Log Message:
Update to 2.10.9, CVE-2009-0669 CVE-2009-0668



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	25 May 2009 23:42:15 -0000	1.23
+++ .cvsignore	7 Aug 2009 04:24:54 -0000	1.24
@@ -1 +1 @@
-Zope-2.10.8-final.tgz
+Zope-2.10.9-final.tgz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 May 2009 23:42:15 -0000	1.2
+++ import.log	7 Aug 2009 04:24:55 -0000	1.3
@@ -1,2 +1,3 @@
 zope-2_10_7-1_fc9:EL-5:zope-2.10.7-1.fc9.src.rpm:1224970306
 zope-2_10_8-1_fc9:EL-5:zope-2.10.8-1.fc9.src.rpm:1243292305
+zope-2_10_9-1_fc9:EL-5:zope-2.10.9-1.fc9.src.rpm:1249619049


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 May 2009 23:42:15 -0000	1.23
+++ sources	7 Aug 2009 04:24:55 -0000	1.24
@@ -1 +1 @@
-8bf75f7ecf0cfe8be46bfbea560d62f5  Zope-2.10.8-final.tgz
+5615c5c1bb2d920c79bc53e3770f438e  Zope-2.10.9-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/EL-5/zope.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- zope.spec	25 May 2009 23:42:15 -0000	1.40
+++ zope.spec	7 Aug 2009 04:24:55 -0000	1.41
@@ -14,7 +14,7 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.10.8
+Version: 2.10.9
 Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
@@ -181,6 +181,11 @@ fi
 
 
 %changelog
+* Thu Aug 6 2009 Jonathan Steffan <jon a fedoraunity.org> 2.10.9-1
+- Update to 2.10.9
+- Fix CVE-2009-0669 (BZ#513428)
+- Fix CVE-2009-0668 (BZ#513422)
+
 * Mon May 25 2009 Jonathan Steffan <jon a fedoraunity.org> 2.10.8-1
 - Update to 2.10.8
 



From cchance at fedoraproject.org  Fri Aug  7 04:58:25 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri,  7 Aug 2009 04:58:25 +0000 (UTC)
Subject: rpms/ibus-table-quick/devel COPYING.tables, NONE,
	1.1 ibus-table-quick.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807045825.D4CF811C00D7@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-quick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19957/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.tables ibus-table-quick.spec import.log 
Log Message:
new package, originally from ibus-table-cangjie



--- NEW FILE COPYING.tables ---
           Copyright-Only Dedication* (based on United States law)
                        or Public Domain Certification
             This license is acceptable for Free Cultural Works.

The person or persons who have associated work with this document (the 
"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of 
his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever 
copyright the dedicators holds in the work of authorship identified below (the 
"Work") to the public domain. A certifier, moreover, dedicates any copyright 
interest he may have in the associated work, and for these purposes, is 
described as a "dedicator" below.

A certifier has taken reasonable steps to verify the copyright status of this 
work. Certifier recognizes that his good faith efforts may not shield him from 
liability if in fact the work certified is not in the public domain.

Dedicator makes this dedication for the benefit of the public at large and to 
the detriment of the Dedicator's heirs and successors. Dedicator intends this 
dedication to be an overt act of relinquishment in perpetuity of all present 
and future rights under copyright law, whether vested or contingent, in the 
Work. Dedicator understands that such relinquishment of all rights includes 
the relinquishment of all rights to enforce (by lawsuit or otherwise) those 
copyrights in the Work.

Dedicator recognizes that, once placed in the public domain, the Work may be 
freely reproduced, distributed, transmitted, used, modified, built upon, or 
otherwise exploited by anyone for any purpose, commercial or non-commercial, 
and in any way, including by methods that have not yet been invented or 
conceived.


--- NEW FILE ibus-table-quick.spec ---
Name:       ibus-table-quick
Version:    1.2.0.20090720
Release:    2%{?dist}
Summary:    Quick input methods for ibus-table
License:    Public Domain and GPLv2+ 
Group:      System Environment/Libraries
URL:        http://code.google.com/p/ibus/
Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Source1:    COPYING.tables

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

Requires:         ibus >= 1.2, ibus-table >= 1.2
Requires(post):   ibus >= 1.2, ibus-table >= 1.2
BuildRequires:    ibus >= 1.2, ibus-table >= 1.2

%description
The package contains Quick input methods for Table engine of IBus platform. 

%prep
%setup -q
%__cp COPYING icons/COPYING.icons
%__cp %{SOURCE1} tables/COPYING.tables

%build
export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
%configure \
    --prefix=%{_prefix} \
    --enable-quick5 \
    --enable-quick3
%__make %{?_smp_mflags}

%install
%__rm -rf %{buildroot}
make DESTDIR=%{buildroot} NO_INDEX=true INSTALL="install -p" install

%clean
%__rm -rf %{buildroot}

%post
cd %{_datadir}/ibus-table/tables/
%{_bindir}/ibus-table-createdb -i -n quick3.db
%{_bindir}/ibus-table-createdb -i -n quick5.db

%files
%defattr(-,root,root,-)
%doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
%{_datadir}/ibus-table/icons/quick5.png
%{_datadir}/ibus-table/icons/quick3.png

%changelog
* Wed Jul 22 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090720-2.fc12
- Removed unneccessary BuildRequires.
- Removed unneccessary owned directories.
- Changed autogen.sh to configure.

* Mon Jul 20 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090720-1.fc12
- Separated from ibus-table-cangjie to ibus-table-quick.


--- NEW FILE import.log ---
ibus-table-quick-1_2_0_20090720-2_fc12:HEAD:ibus-table-quick-1.2.0.20090720-2.fc12.src.rpm:1249620991


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Jul 2009 19:17:23 -0000	1.1
+++ .cvsignore	7 Aug 2009 04:58:24 -0000	1.2
@@ -0,0 +1 @@
+ibus-table-quick-1.2.0.20090720.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Jul 2009 19:17:23 -0000	1.1
+++ sources	7 Aug 2009 04:58:24 -0000	1.2
@@ -0,0 +1 @@
+12a8505b00bb976b914d7e9191049243  ibus-table-quick-1.2.0.20090720.tar.gz



From cchance at fedoraproject.org  Fri Aug  7 05:01:43 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri,  7 Aug 2009 05:01:43 +0000 (UTC)
Subject: rpms/ibus-table-translit/devel ibus-table-translit.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807050143.11D2F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-translit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21685/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-table-translit.spec import.log 
Log Message:
new package



--- NEW FILE ibus-table-translit.spec ---
Name:       ibus-table-translit
Version:    1.2.0.20090720
Release:    2%{?dist}
Summary:    Translit input methods for ibus-table
License:    GPLv2+
Group:      System Environment/Libraries
URL:        http://code.google.com/p/ibus/
Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

Requires:         ibus >= 1.2, ibus-table >= 1.2
Requires(post):   ibus >= 1.2, ibus-table >= 1.2
BuildRequires:    ibus >= 1.2, ibus-table >= 1.2

%description
The package contains Translit input methods for Table engine of IBus platform. 

%prep
%setup -q

%build
export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
%configure --prefix=%{_prefix}
%__make %{?_smp_mflags}

%install
%__rm -rf %{buildroot}
%__make DESTDIR=%{buildroot} NO_INDEX=true INSTALL="install -p" install

%clean
%__rm -rf %{buildroot}

%post
cd %{_datadir}/ibus-table/tables/
%{_bindir}/ibus-table-createdb -i -n translit.db

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_datadir}/ibus-table/tables/translit.db
%{_datadir}/ibus-table/icons/translit.png

%changelog
* Wed Jul 22 2009 Caius 'kaio' Chance <kaio at kaio.me> - 1.2.0.20090720-2.fc12
- Removed BuildRequires of gettext-devel and automake.
- Removed directories that do not need to own.
- Changed from autogen.sh to configure.

* Mon Jul 20 2009 Caius 'kaio' Chance <kaio at kaio.me> - 1.2.0.20090720-1.fc12
- Ported from SCIM.


--- NEW FILE import.log ---
ibus-table-translit-1_2_0_20090720-2_fc12:HEAD:ibus-table-translit-1.2.0.20090720-2.fc12.src.rpm:1249621190


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-translit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Jul 2009 19:17:52 -0000	1.1
+++ .cvsignore	7 Aug 2009 05:01:42 -0000	1.2
@@ -0,0 +1 @@
+ibus-table-translit-1.2.0.20090720.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-translit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Jul 2009 19:17:53 -0000	1.1
+++ sources	7 Aug 2009 05:01:42 -0000	1.2
@@ -0,0 +1 @@
+a77c76c5494622fb71a3184fa39b3876  ibus-table-translit-1.2.0.20090720.tar.gz



From cchance at fedoraproject.org  Fri Aug  7 05:03:26 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri,  7 Aug 2009 05:03:26 +0000 (UTC)
Subject: rpms/ibus-table-xinhua/devel ibus-table-xinhua.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807050326.7424111C00D7@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-xinhua/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22264/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-table-xinhua.spec import.log 
Log Message:
new package



--- NEW FILE ibus-table-xinhua.spec ---
Name:       ibus-table-xinhua
Version:    1.2.0.20090720
Release:    2%{?dist}
Summary:    Xin Hua input methods for ibus-table
License:    GPLv3+
Group:      System Environment/Libraries
URL:        http://code.google.com/p/ibus/
Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:  noarch

Requires:         ibus >= 1.2, ibus-table >= 1.2
Requires(post):   ibus >= 1.2, ibus-table >= 1.2
BuildRequires:    ibus >= 1.2, ibus-table >= 1.2

%description
The package contains Xin Hua input methods for Table engine of IBus platform. 

%prep
%setup -q

%build
export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
%configure --prefix=%{_prefix}
%__make %{?_smp_mflags}

%install
%__rm -rf %{buildroot}
%__make DESTDIR=%{buildroot} NO_INDEX=true INSTALL="install -p" install

%clean
%__rm -rf %{buildroot}

%post
cd %{_datadir}/ibus-table/tables/
%{_bindir}/ibus-table-createdb -i -n xinhua-ibus.db

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_datadir}/ibus-table/tables/xinhua-ibus.db
%{_datadir}/ibus-table/icons/xinhua.png

%changelog
* Wed Jul 22 2009 Caius 'kaio' Chance <kaio at kaio.me> - 1.2.0.20090720-2.fc12
- Removed BuildRequires of gettext-devel and automake.
- Removed unneccessary owned directories.
- Changed autogen.sh to configure.

* Mon Jul 20 2009 Caius 'kaio' Chance <kaio at kaio.me> - 1.2.0.20090720-1.fc12
- Introduce from upstream.


--- NEW FILE import.log ---
ibus-table-xinhua-1_2_0_20090720-2_fc12:HEAD:ibus-table-xinhua-1.2.0.20090720-2.fc12.src.rpm:1249621306


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-xinhua/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Jul 2009 19:07:45 -0000	1.1
+++ .cvsignore	7 Aug 2009 05:03:26 -0000	1.2
@@ -0,0 +1 @@
+ibus-table-xinhua-1.2.0.20090720.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-xinhua/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Jul 2009 19:07:45 -0000	1.1
+++ sources	7 Aug 2009 05:03:26 -0000	1.2
@@ -0,0 +1 @@
+823e6441e4ead4b5c692cb5546c2692d  ibus-table-xinhua-1.2.0.20090720.tar.gz



From mclasen at fedoraproject.org  Fri Aug  7 05:34:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  7 Aug 2009 05:34:23 +0000 (UTC)
Subject: rpms/gtk2/devel gdm-background.patch, NONE, 1.1 gtk2.spec, 1.392,
	1.393
Message-ID: <20090807053423.6BB2511C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29552

Modified Files:
	gtk2.spec 
Added Files:
	gdm-background.patch 
Log Message:
Fix gdm background drawing


gdm-background.patch:
 gdkwindow.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gdm-background.patch ---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 7a000aa..ec36191 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -5049,7 +5049,7 @@ gdk_window_invalidate_rect (GdkWindow          *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  if (private->input_only || !private->viewable)
+  if (private->input_only || !private->viewable || !GDK_WINDOW_IS_MAPPED (window))
     return;
 
   if (!rect)
@@ -5135,6 +5135,7 @@ gdk_window_invalidate_maybe_recurse (GdkWindow       *window,
 
   if (private->input_only ||
       !private->viewable ||
+      !GDK_WINDOW_IS_MAPPED (window) ||
       gdk_region_empty (region))
     return;
 
@@ -7929,7 +7930,7 @@ _gdk_window_calculate_full_clip_region (GdkWindow *window,
   if (base_y_offset)
     *base_y_offset = 0;
 
-  if (!private->viewable || private->input_only)
+  if (!private->viewable || !GDK_WINDOW_IS_MAPPED (window) || private->input_only)
     return gdk_region_new ();
 
   window_get_size_rectangle (window, &visible_rect);


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- gtk2.spec	2 Aug 2009 05:39:49 -0000	1.392
+++ gtk2.spec	7 Aug 2009 05:34:22 -0000	1.393
@@ -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.17/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@ Patch0: gtk+-2.13.5-lib64.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch1: default_printer.patch
 
+Patch2: gdm-background.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -141,6 +143,7 @@ This package contains developer document
 
 %patch0 -p1 -b .lib64
 %patch1 -p0 -b .default-printer
+%patch2 -p1 -b .gdm-background
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -385,6 +388,9 @@ fi
 
 
 %changelog
+* Fri Aug  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-5
+- Fix gdm background drawing
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-4
 - Save some space
 



From airlied at fedoraproject.org  Fri Aug  7 05:48:12 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  7 Aug 2009 05:48:12 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.66, 1.67 commitid, 1.29,
	1.30 sources, 1.61, 1.62 xorg-x11-server.spec, 1.463, 1.464
Message-ID: <20090807054812.D808F11C00D7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv416

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Log Message:
* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-29.20090807
- rebase upstream
- libxf86config.a revenge, brought back .a upstream, doesn't work as .so



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	4 Aug 2009 06:10:29 -0000	1.66
+++ .cvsignore	7 Aug 2009 05:48:12 -0000	1.67
@@ -1 +1 @@
-xorg-server-20090804.tar.bz2
+xorg-server-20090807.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- commitid	4 Aug 2009 06:10:29 -0000	1.29
+++ commitid	7 Aug 2009 05:48:12 -0000	1.30
@@ -1 +1 @@
-736f2d64725c6df8413e627bd40ce7ecb011acc7
+e94c7c42ce9d6a194b76ba7e8b3904b180f93a1b


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	4 Aug 2009 06:10:29 -0000	1.61
+++ sources	7 Aug 2009 05:48:12 -0000	1.62
@@ -1 +1 @@
-7588aa54124e59be6989a9f70d935d0a  xorg-server-20090804.tar.bz2
+13b6f940d5b27fe39fbd6bfbd5801983  xorg-server-20090807.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- xorg-x11-server.spec	6 Aug 2009 18:05:30 -0000	1.463
+++ xorg-x11-server.spec	7 Aug 2009 05:48:12 -0000	1.464
@@ -1,4 +1,4 @@
-# This package is an experiment in active integration of upstream SCM with
+9 This package is an experiment in active integration of upstream SCM with
 # Fedora packaging.  It works something like this:
 #
 # The "pristine" source is actually a git repo (with no working checkout).
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090804
+%define gitdate 20090807
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   28.%{gitdate}%{?dist}
+Release:   29.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -267,7 +267,6 @@ Obsoletes: xorg-x11-sdk xorg-x11-server-
 Requires: xorg-x11-util-macros
 Requires: xorg-x11-proto-devel
 Requires: pkgconfig pixman-devel libpciaccess-devel
-Provides: libxf86config-devel = %{version}-%{release}
 # Virtual provide for transition.  Delete me someday.
 Provides: xorg-x11-server-sdk = %{version}-%{release}
 
@@ -286,17 +285,9 @@ BuildArch: noarch
 %description source
 Xserver source code needed to build VNC server (Xvnc)
 
-%package -n libxf86config
-Summary: Xorg configuration parser library
-Group: System Environment/Libraries
-
-%description -n libxf86config
-Xorg configuration parser library
-
 %package -n libxf86config-devel
 Summary: Xorg configuration parser library development files
 Group: Development/Libraries
-Requires: libxf86config = %{version}-%{release}
 Requires: xorg-x11-server-devel = %{version}-%{release}
 
 %description -n libxf86config-devel
@@ -516,18 +507,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{xserver_source_dir}
 
-
-%files -n libxf86config
-%defattr(-, root, root, -)
-%{_libdir}/libxf86config.so.0*
-
-
 %files -n libxf86config-devel
 %defattr(-, root, root, -)
-%{_libdir}/libxf86config.so
+%{_libdir}/libxf86config.a
 
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-29.20090807
+- rebase upstream
+- libxf86config.a revenge, brought back .a upstream, doesn't work as .so
+
 * Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 1.6.99-28.20090804
 - xserver-1.6.99-dri2-crash-fixes.patch: don't cough and die just because
   the driver had the gall not to register a SwapBuffers handler.



From airlied at fedoraproject.org  Fri Aug  7 05:49:11 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  7 Aug 2009 05:49:11 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.464,1.465
Message-ID: <20090807054911.6428D11C00D7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv726

Modified Files:
	xorg-x11-server.spec 
Log Message:
oops fatfingered



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- xorg-x11-server.spec	7 Aug 2009 05:48:12 -0000	1.464
+++ xorg-x11-server.spec	7 Aug 2009 05:49:11 -0000	1.465
@@ -1,4 +1,4 @@
-9 This package is an experiment in active integration of upstream SCM with
+# This package is an experiment in active integration of upstream SCM with
 # Fedora packaging.  It works something like this:
 #
 # The "pristine" source is actually a git repo (with no working checkout).



From airlied at fedoraproject.org  Fri Aug  7 05:50:47 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  7 Aug 2009 05:50:47 +0000 (UTC)
Subject: rpms/pyxf86config/devel pyxf86config.spec, 1.54,
	1.55 fix-errorf-visibility.patch, 1.1, NONE
Message-ID: <20090807055047.976F011C00D7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/pyxf86config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1335

Modified Files:
	pyxf86config.spec 
Removed Files:
	fix-errorf-visibility.patch 
Log Message:
* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 0.3.37-7
- fix X server and put this back



Index: pyxf86config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- pyxf86config.spec	7 Aug 2009 00:58:46 -0000	1.54
+++ pyxf86config.spec	7 Aug 2009 05:50:47 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
 Version: 0.3.37
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://fedoraproject.org/wiki/pyxf86config
 Source0: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2
@@ -10,9 +10,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 BuildRequires: python-devel
-BuildRequires: libxf86config-devel >= 1.3.0.0-26
+BuildRequires: libxf86config-devel >= 1.6.99-29
 
-Patch0: fix-errorf-visibility.patch
 ExcludeArch: s390 s390x
 
 %description
@@ -21,7 +20,6 @@ It is used to read and write X server co
 
 %prep
 %setup -q
-%patch0 -p1 -b .symbol
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -44,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 0.3.37-7
+- fix X server and put this back
+
 * Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 0.3.37-6
 - fix ErrorF/VErrorF symbol visibility - hacky but should do for now
 


--- fix-errorf-visibility.patch DELETED ---



From phuang at fedoraproject.org  Fri Aug  7 06:06:00 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  7 Aug 2009 06:06:00 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.37, 1.38 ibus.spec, 1.78, 1.79 sources,
	1.42, 1.43
Message-ID: <20090807060600.7A63611C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6181

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to ibus-1.2.0.20090807


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	5 Aug 2009 23:23:43 -0000	1.37
+++ .cvsignore	7 Aug 2009 06:05:58 -0000	1.38
@@ -1 +1 @@
-ibus-1.2.0.20090806.tar.gz
+ibus-1.2.0.20090807.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- ibus.spec	5 Aug 2009 23:23:43 -0000	1.78
+++ ibus.spec	7 Aug 2009 06:05:59 -0000	1.79
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090806
+Version:    1.2.0.20090807
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -228,6 +228,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-1
+- Update to 1.2.0.20090807
+
 * Thu Aug 06 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090806-1
 - Update to 1.2.0.20090806
 - Fix bug 515106 - don't install duplicate files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	5 Aug 2009 23:23:43 -0000	1.42
+++ sources	7 Aug 2009 06:05:59 -0000	1.43
@@ -1 +1 @@
-1bf904d8fd631ab94d2c4a81e7da6c93  ibus-1.2.0.20090806.tar.gz
+e8f54de7ab4e423036bef67b5b602872  ibus-1.2.0.20090807.tar.gz



From awjb at fedoraproject.org  Fri Aug  7 06:37:36 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  7 Aug 2009 06:37:36 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-11 fancy-free.patch, NONE,
	1.1 claws-mail-plugins.spec, 1.42, 1.43
Message-ID: <20090807063736.3FFFC11C00D7@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-serv15131/F-11

Modified Files:
	claws-mail-plugins.spec 
Added Files:
	fancy-free.patch 
Log Message:
- fix #515373


fancy-free.patch:
 fancy_viewer.c |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE fancy-free.patch ---
diff -Nur claws-mail-extra-plugins-3.7.2/fancy-0.9.7/src/fancy_viewer.c /home/kevin/projects/claws-mail/plugins/fancy/src/fancy_viewer.c
--- claws-mail-extra-plugins-3.7.2/fancy-0.9.7/src/fancy_viewer.c	2009-06-19 01:36:50.000000000 -0600
+++ /home/kevin/projects/claws-mail/plugins/fancy/src/fancy_viewer.c	2009-07-04 10:34:52.000000000 -0600
@@ -107,8 +107,19 @@
         return FALSE;
     }
     if (procmime_get_part(viewer->filename, partinfo) < 0) {
-            g_free(viewer->filename);
+        g_free(viewer->filename);
+        viewer->filename = NULL;
     } else {
+        const gchar *charset = NULL;
+        if (_viewer && _viewer->mimeview &&
+            _viewer->mimeview->messageview->forced_charset)
+            charset = _viewer->mimeview->messageview->forced_charset;
+        else
+            charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
+        if (!charset)
+            charset = conv_get_locale_charset_str();
+        debug_print("using %s charset\n", charset);
+        g_object_set(viewer->settings, "default-encoding", charset, NULL);
         gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
         webkit_web_view_open(viewer->view, tmp);
         g_free(tmp);
@@ -182,6 +193,7 @@
     debug_print("filename: %s\n", viewer->filename);
 	if (!viewer->filename) {
 		alertpanel_error(_("Filename is null."));
+        g_free(program);
 		return;
 	}
 
@@ -275,8 +287,6 @@
     webkit_web_view_open(viewer->view, "about:blank");
     debug_print("fancy_clear_viewer\n");
     viewer->to_load = NULL;
-    if(viewer->cur_link)
-        g_free(viewer->cur_link);
     vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin));
     vadj->value = 0.0;
     g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0);
@@ -345,12 +355,9 @@
 {
     gtk_label_set_text(GTK_LABEL(viewer->l_link), link);
     if(link) {
-        if (viewer->cur_link) {
+        if (viewer->cur_link)
             g_free(viewer->cur_link);
-            viewer->cur_link = g_strdup(link);
-        } else {
-            viewer->cur_link = g_strdup(link);
-        }
+        viewer->cur_link = g_strdup(link);
     }
 }
 
@@ -795,7 +802,7 @@
 
 const gchar *plugin_desc(void)
 {
-    return g_strdup_printf("This plugin renders HTML e-mail using the WebKit" 
+    return g_strdup_printf("This plugin renders HTML mail using the WebKit " 
                            "%d.%d.%d library.", WEBKIT_MAJOR_VERSION, 
                            WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION);
 }


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-11/claws-mail-plugins.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- claws-mail-plugins.spec	7 Jul 2009 04:42:02 -0000	1.42
+++ claws-mail-plugins.spec	7 Aug 2009 06:37:34 -0000	1.43
@@ -19,13 +19,15 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.2
-Release:        1%{?dist}
+Release:        3%{?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}
@@ -268,6 +270,7 @@ exporting of your meetings or all your c
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
+%patch0 -p1
 
 %build
 #acpi_notifier
@@ -606,6 +609,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* 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



From awjb at fedoraproject.org  Fri Aug  7 06:37:36 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  7 Aug 2009 06:37:36 +0000 (UTC)
Subject: rpms/claws-mail-plugins/devel fancy-free.patch, NONE,
	1.1 claws-mail-plugins.spec, 1.43, 1.44
Message-ID: <20090807063736.4353B11C0349@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-serv15131/devel

Modified Files:
	claws-mail-plugins.spec 
Added Files:
	fancy-free.patch 
Log Message:
- fix #515373


fancy-free.patch:
 fancy_viewer.c |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE fancy-free.patch ---
diff -Nur claws-mail-extra-plugins-3.7.2/fancy-0.9.7/src/fancy_viewer.c /home/kevin/projects/claws-mail/plugins/fancy/src/fancy_viewer.c
--- claws-mail-extra-plugins-3.7.2/fancy-0.9.7/src/fancy_viewer.c	2009-06-19 01:36:50.000000000 -0600
+++ /home/kevin/projects/claws-mail/plugins/fancy/src/fancy_viewer.c	2009-07-04 10:34:52.000000000 -0600
@@ -107,8 +107,19 @@
         return FALSE;
     }
     if (procmime_get_part(viewer->filename, partinfo) < 0) {
-            g_free(viewer->filename);
+        g_free(viewer->filename);
+        viewer->filename = NULL;
     } else {
+        const gchar *charset = NULL;
+        if (_viewer && _viewer->mimeview &&
+            _viewer->mimeview->messageview->forced_charset)
+            charset = _viewer->mimeview->messageview->forced_charset;
+        else
+            charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
+        if (!charset)
+            charset = conv_get_locale_charset_str();
+        debug_print("using %s charset\n", charset);
+        g_object_set(viewer->settings, "default-encoding", charset, NULL);
         gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
         webkit_web_view_open(viewer->view, tmp);
         g_free(tmp);
@@ -182,6 +193,7 @@
     debug_print("filename: %s\n", viewer->filename);
 	if (!viewer->filename) {
 		alertpanel_error(_("Filename is null."));
+        g_free(program);
 		return;
 	}
 
@@ -275,8 +287,6 @@
     webkit_web_view_open(viewer->view, "about:blank");
     debug_print("fancy_clear_viewer\n");
     viewer->to_load = NULL;
-    if(viewer->cur_link)
-        g_free(viewer->cur_link);
     vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin));
     vadj->value = 0.0;
     g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0);
@@ -345,12 +355,9 @@
 {
     gtk_label_set_text(GTK_LABEL(viewer->l_link), link);
     if(link) {
-        if (viewer->cur_link) {
+        if (viewer->cur_link)
             g_free(viewer->cur_link);
-            viewer->cur_link = g_strdup(link);
-        } else {
-            viewer->cur_link = g_strdup(link);
-        }
+        viewer->cur_link = g_strdup(link);
     }
 }
 
@@ -795,7 +802,7 @@
 
 const gchar *plugin_desc(void)
 {
-    return g_strdup_printf("This plugin renders HTML e-mail using the WebKit" 
+    return g_strdup_printf("This plugin renders HTML mail using the WebKit " 
                            "%d.%d.%d library.", WEBKIT_MAJOR_VERSION, 
                            WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION);
 }


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- claws-mail-plugins.spec	24 Jul 2009 19:02:45 -0000	1.43
+++ claws-mail-plugins.spec	7 Aug 2009 06:37:35 -0000	1.44
@@ -19,13 +19,15 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.2
-Release:        2%{?dist}
+Release:        3%{?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}
@@ -268,6 +270,7 @@ exporting of your meetings or all your c
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
+%patch0 -p1
 
 %build
 #acpi_notifier
@@ -606,6 +609,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* 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
 



From phuang at fedoraproject.org  Fri Aug  7 06:47:17 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri,  7 Aug 2009 06:47:17 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.20,1.21 ibus.spec,1.79,1.80
Message-ID: <20090807064717.61BC911C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18036

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Fix bug 516145

ibus-HEAD.patch:
 ibusimcontext.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-HEAD.patch	19 Jul 2009 05:19:02 -0000	1.20
+++ ibus-HEAD.patch	7 Aug 2009 06:47:16 -0000	1.21
@@ -1 +1,30 @@
-
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 68a77d8..d914eae 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -774,14 +774,22 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
+     ibusimcontext->preedit_visible = visible;
+ 
+     if (ibusimcontext->preedit_visible) {
+-        if (flag)
++        if (flag) {
++            /* invisible => visible */
+             g_signal_emit (ibusimcontext, _signal_preedit_start_id, 0);
++        }
+         g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
+     }
+     else {
+-        g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
+-        if (flag)
++        if (flag) {
++            /* visible => invisible */
++            g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
+             g_signal_emit (ibusimcontext, _signal_preedit_end_id, 0);
++        }
++        else {
++            /* still invisible */
++            /* do nothing */
++        }
+     }
+ }
+ 


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- ibus.spec	7 Aug 2009 06:05:59 -0000	1.79
+++ ibus.spec	7 Aug 2009 06:47:16 -0000	1.80
@@ -8,14 +8,14 @@
 
 Name:       ibus
 Version:    1.2.0.20090807
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-# Patch0:     ibus-HEAD.patch
+Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,7 +114,7 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 # ./autogen.sh --help
 
 %build
@@ -228,6 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-2
+- Update ibus-HEAD.patch
+- Fix bug 516154.
+
 * Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-1
 - Update to 1.2.0.20090807
 



From paragn at fedoraproject.org  Fri Aug  7 06:47:38 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri,  7 Aug 2009 06:47:38 +0000 (UTC)
Subject: rpms/mod_auth_mysql/devel mod_auth_mysql.spec,1.30,1.31
Message-ID: <20090807064738.B1A6311C00D7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/mod_auth_mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18155

Modified Files:
	mod_auth_mysql.spec 
Log Message:
* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 1:3.0.0-10
- Spec cleanup as suggested in review bug #226152




Index: mod_auth_mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_auth_mysql/devel/mod_auth_mysql.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mod_auth_mysql.spec	25 Jul 2009 14:42:06 -0000	1.30
+++ mod_auth_mysql.spec	7 Aug 2009 06:47:38 -0000	1.31
@@ -1,12 +1,12 @@
 Summary: Basic authentication for the Apache web server using a MySQL database
 Name: mod_auth_mysql
 Version: 3.0.0
-Release: 9
+Release: 10%{?dist}
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
-Source: mod_auth_mysql-%{version}.tar.gz
-Source2: auth_mysql.conf
+Source0: http://downloads.sourceforge.net/modauthmysql/mod_auth_mysql-%{version}.tar.gz
+Source1: auth_mysql.conf
 Patch0: mod_auth_mysql-3.0.0-apr1x.patch
 Patch1: mod_auth_mysql-3.0.0-disable.patch
 License: ASL 1.1
@@ -28,25 +28,28 @@ web server by checking data in a MySQL d
         -c %{name}.c -L%{_libdir}/mysql -lmysqlclient
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 install -m755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 
 # Install the config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/auth_mysql.conf \
+install -p -m 644 %{SOURCE1} \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README CONFIGURE CHANGES
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 1:3.0.0-10
+- Spec cleanup as suggested in review bug #226152
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Fri Aug  7 07:13:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  7 Aug 2009 07:13:08 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.654,1.655
Message-ID: <20090807071308.EC7E011C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25879/devel

Modified Files:
	eclipse.spec 
Log Message:
Fix missing fragment on ppc64.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -p -r1.654 -r1.655
--- eclipse.spec	6 Aug 2009 15:57:33 -0000	1.654
+++ eclipse.spec	7 Aug 2009 07:13:06 -0000	1.655
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.33%{?dist}
+Release:        0.3.34%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -419,6 +419,7 @@ IFS='
 
   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
@@ -1490,6 +1491,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Aug 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.34
+- Fix missing fragment on ppc64.
+
 * Thu Aug 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.33
 - Fix missing launcher for ppc64.
 



From dwmw2 at fedoraproject.org  Fri Aug  7 07:19:07 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri,  7 Aug 2009 07:19:07 +0000 (UTC)
Subject: rpms/exim/devel exim.init,1.2,1.3
Message-ID: <20090807071907.476DB11C00D7@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27468

Modified Files:
	exim.init 
Log Message:
Don't complain if /etc/sysconfig/network absent


Index: exim.init
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- exim.init	6 Feb 2007 18:08:56 -0000	1.2
+++ exim.init	7 Aug 2009 07:19:06 -0000	1.3
@@ -13,7 +13,7 @@
 . /etc/init.d/functions
 
 # Source networking configuration.
-. /etc/sysconfig/network
+[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
 
 # Source exim configureation.
 if [ -f /etc/sysconfig/exim ] ; then



From jorton at fedoraproject.org  Fri Aug  7 07:35:02 2009
From: jorton at fedoraproject.org (jorton)
Date: Fri,  7 Aug 2009 07:35:02 +0000 (UTC)
Subject: rpms/subversion/F-11 sources, 1.39, 1.40 subversion.spec, 1.142,
	1.143 upstream, 1.24, 1.25
Message-ID: <20090807073502.AA90311C00D7@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30889

Modified Files:
	sources subversion.spec upstream 
Log Message:
* Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
- update to 1.6.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	16 Jun 2009 14:29:46 -0000	1.39
+++ sources	7 Aug 2009 07:35:01 -0000	1.40
@@ -1 +1 @@
-93f128306b11e1a1c64ff51338777952  subversion-1.6.2.tar.gz
+9649be6c47b7d915dce75a1198900c25  subversion-1.6.4.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/subversion.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- subversion.spec	16 Jun 2009 14:29:46 -0000	1.142
+++ subversion.spec	7 Aug 2009 07:35:01 -0000	1.143
@@ -14,8 +14,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.2
-Release: 3%{?dist}
+Version: 1.6.4
+Release: 2%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -188,6 +188,13 @@ install -m 644 $RPM_SOURCE_DIR/subversio
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
        ${RPM_BUILD_ROOT}%{python_sitearch}/*/*.{a,la}
 
+# The SVN build system is broken w.r.t. DSO support; it treats
+# normal libraries as DSOs and puts them in $libdir, whereas they
+# should go in some subdir somewhere, and be linked using -module,
+# etc.  So, forcibly nuke the .so's for libsvn_auth_{gnome,kde},
+# since nothing should ever link against them directly.
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_auth_*.so
+
 # remove stuff produced with Perl modules
 find $RPM_BUILD_ROOT -type f \
     -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \
@@ -318,6 +325,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
+- update to 1.6.4
+
+* Thu Jul 23 2009 Joe Orton <jorton at redhat.com> 1.6.3-2
+- remove -devel dependency on -gnome, -kde (#513313)
+
+* Tue Jun 23 2009 Joe Orton <jorton at redhat.com> 1.6.3-1
+- update to 1.6.3
+
 * Sun Jun 14 2009 Joe Orton <jorton at redhat.com> 1.6.2-3
 - add -gnome, -kde subpackages
 
@@ -327,10 +343,6 @@ rm -rf ${RPM_BUILD_ROOT}
 * Fri May 15 2009 Joe Orton <jorton at redhat.com> 1.6.2-1
 - update to 1.6.2
 
-* Thu May 14 2009 Joe Orton <jorton at redhat.com> 1.6.1-5
-- fix libjavahl link (#496617)
-- fix RPATHs in binaries (#469524)
-
 * Wed Apr 15 2009 Joe Orton <jorton at redhat.com> 1.6.1-4
 - really disable PIE
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/upstream,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- upstream	14 Apr 2009 07:37:15 -0000	1.24
+++ upstream	7 Aug 2009 07:35:01 -0000	1.25
@@ -1 +1 @@
-subversion-1.6.1.tar.gz
+subversion-1.6.4.tar.gz



From rjones at fedoraproject.org  Fri Aug  7 07:37:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri,  7 Aug 2009 07:37:09 +0000 (UTC)
Subject: rpms/libguestfs/EL-5
	0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch,
	NONE, 1.1 libguestfs.spec, 1.55, 1.56
Message-ID: <20090807073709.72CB311C00D7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31557

Modified Files:
	libguestfs.spec 
Added Files:
	0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch 
Log Message:
Another patch to try to fix the tests.

0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch:
 generator.ml |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE 0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch ---
>From 39e4f1dad208124640f0f795518390ba680a9704 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Fri, 7 Aug 2009 08:32:56 +0100
Subject: [PATCH 3/3] Tests: swapon_device test mkswap /dev/sda1 instead of /dev/sdb.

On RHEL 5, mkswap /dev/sdb fails, even with the '-f' option
(contradictory to what the manual page says).

This commit adds a new 'InitPartition' initialization which
just creates /dev/sda1, and then does the swap test on that.
---
 src/generator.ml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/generator.ml b/src/generator.ml
index 8b0fc66..fdf8f09 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -301,6 +301,12 @@ and test_init =
     (* Block devices are empty and no filesystems are mounted. *)
   | InitEmpty
 
+    (* /dev/sda contains a single partition /dev/sda1, with random
+     * content.  /dev/sdb and /dev/sdc may have random content.
+     * No LVM.
+     *)
+  | InitPartition
+
     (* /dev/sda contains a single partition /dev/sda1, which is formatted
      * as ext2, empty [except for lost+found] and mounted on /.
      * /dev/sdb and /dev/sdc may have random content.
@@ -3207,10 +3213,10 @@ C<alloc> command which allocates a file in the host and
 attaches it as a device.");
 
   ("swapon_device", (RErr, [String "device"]), 170, [],
-   [InitNone, Always, TestRun (
-      [["mkswap"; "/dev/sdb"];
-       ["swapon_device"; "/dev/sdb"];
-       ["swapoff_device"; "/dev/sdb"]])],
+   [InitPartition, Always, TestRun (
+      [["mkswap"; "/dev/sda1"];
+       ["swapon_device"; "/dev/sda1"];
+       ["swapoff_device"; "/dev/sda1"]])],
    "enable swap on device",
    "\
 This command enables the libguestfs appliance to use the
@@ -5318,6 +5324,13 @@ and generate_one_test_body name i test_name init test =
          [["blockdev_setrw"; "/dev/sda"];
           ["umount_all"];
           ["lvm_remove_all"]]
+   | InitPartition ->
+       pr "  /* InitPartition for %s: create /dev/sda1 */\n" test_name;
+       List.iter (generate_test_command_call test_name)
+         [["blockdev_setrw"; "/dev/sda"];
+          ["umount_all"];
+          ["lvm_remove_all"];
+          ["sfdiskM"; "/dev/sda"; ","]]
    | InitBasicFS ->
        pr "  /* InitBasicFS for %s: create ext2 on /dev/sda1 */\n" test_name;
        List.iter (generate_test_command_call test_name)
-- 
1.6.2.5



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libguestfs.spec	6 Aug 2009 17:50:27 -0000	1.55
+++ libguestfs.spec	7 Aug 2009 07:37:09 -0000	1.56
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -14,6 +14,7 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 
 Patch0:      0001-Tests-Don-t-test-block-size-in-statvfs-test.patch
 Patch1:      0002-Always-pass-mkswap-f-parameter.patch
+Patch2:      0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch
 
 # Currently fails on PPC because:
 # "No Package Found for kernel"
@@ -311,6 +312,7 @@ mkdir -p daemon/m4
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -539,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-4
+- Another patch to try to fix the tests.
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-3
 - New upstream release 1.0.66.
 - Incorporate upstream patches to fix some tests.



From jorton at fedoraproject.org  Fri Aug  7 07:39:56 2009
From: jorton at fedoraproject.org (jorton)
Date: Fri,  7 Aug 2009 07:39:56 +0000 (UTC)
Subject: rpms/subversion/devel subversion-1.6.4.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.33, 1.34 sources, 1.40, 1.41 subversion.spec,
	1.147, 1.148 upstream, 1.26, 1.27
Message-ID: <20090807073956.C959511C00D7@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv452

Modified Files:
	.cvsignore sources subversion.spec upstream 
Added Files:
	subversion-1.6.4.tar.gz.asc 
Log Message:
* Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
- update to 1.6.4



--- NEW FILE subversion-1.6.4.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp3xLYACgkQCwOubk4kUXwuHwCgxFKL+QnzIebGGcjqPm4l/iBp
/2QAni/Ye1w73QjIikRxSsvNaBxr7Ik6
=Vkwq
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4n9QACgkQ5dMCc/WdJfBD0QCg+UN5zZ9HS6bouwVexaFWYXbh
GeEAmQGA7yQtvHgYJ97DJM3LNAW6cd5X
=5fXs
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4k+UACgkQokEGqRcG/W7VUQCeNFQ7VJgRxQFOG1Ukp026e+H4
bDUAoIRMH84/Bb3OYa5Gr0xSOuhPhWEx
=EfId
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp5RxgACgkQ9o1G+2zNQDgGHACdGJWmRW6L8qjrBpIPIqdvQfGw
X7IAn2icEiXqv7/TMROxCVGJh5jvxVAx
=2Td8
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)

iEYEABECAAYFAkp7Az8ACgkQ/P1jBZgh97KJSQCgyQz56frR5zEAf+l4m/Ny3Dr5
u50AmQErCcguvMp/MJva2oluweihoW4Y
=ZQx2
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	23 Jun 2009 09:52:59 -0000	1.33
+++ .cvsignore	7 Aug 2009 07:39:56 -0000	1.34
@@ -1 +1 @@
-subversion-1.6.3.tar.gz
+subversion-1.6.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	23 Jun 2009 09:52:59 -0000	1.40
+++ sources	7 Aug 2009 07:39:56 -0000	1.41
@@ -1 +1 @@
-8357468ed2485b88151c50fb5deb28ca  subversion-1.6.3.tar.gz
+9649be6c47b7d915dce75a1198900c25  subversion-1.6.4.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- subversion.spec	27 Jul 2009 04:57:44 -0000	1.147
+++ subversion.spec	7 Aug 2009 07:39:56 -0000	1.148
@@ -14,8 +14,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.3
-Release: 3%{?dist}
+Version: 1.6.4
+Release: 2%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -325,6 +325,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
+- update to 1.6.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- upstream	23 Jun 2009 09:52:59 -0000	1.26
+++ upstream	7 Aug 2009 07:39:56 -0000	1.27
@@ -1 +1 @@
-subversion-1.6.3.tar.gz
+subversion-1.6.4.tar.gz



From jorton at fedoraproject.org  Fri Aug  7 07:42:00 2009
From: jorton at fedoraproject.org (jorton)
Date: Fri,  7 Aug 2009 07:42:00 +0000 (UTC)
Subject: rpms/subversion/F-10 sources,1.36,1.37 subversion.spec,1.129,1.130
Message-ID: <20090807074200.B080D11C00D7@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv983

Modified Files:
	sources subversion.spec 
Log Message:
* Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
- update to 1.6.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	28 May 2009 10:41:33 -0000	1.36
+++ sources	7 Aug 2009 07:42:00 -0000	1.37
@@ -1 +1 @@
-93f128306b11e1a1c64ff51338777952  subversion-1.6.2.tar.gz
+9649be6c47b7d915dce75a1198900c25  subversion-1.6.4.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/subversion.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- subversion.spec	28 May 2009 10:41:33 -0000	1.129
+++ subversion.spec	7 Aug 2009 07:42:00 -0000	1.130
@@ -14,7 +14,7 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.2
+Version: 1.6.4
 Release: 2%{?dist}
 License: ASL 1.1
 Group: Development/Tools
@@ -286,6 +286,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
+- update to 1.6.4
+
 * Thu May 28 2009 Joe Orton <jorton at redhat.com> 1.6.2-2.fc10
 - update to 1.6.2 (#500933, #469524)
 



From twaugh at fedoraproject.org  Fri Aug  7 07:53:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  7 Aug 2009 07:53:56 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.493,1.494
Message-ID: <20090807075356.E204611C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3849

Modified Files:
	cups.spec 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Require acl.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- cups.spec	6 Aug 2009 13:21:22 -0000	1.493
+++ cups.spec	7 Aug 2009 07:53:56 -0000	1.494
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.13%{?dist}
+Release: 0.%{pre}.14%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -121,8 +121,9 @@ Requires: portreserve
 
 Requires: poppler-utils
 
-# We ship udev rules.
+# We ship udev rules which use setfacl.
 Requires: udev
+Requires: acl
 
 %package devel
 Summary: Common Unix Printing System - development environment
@@ -522,6 +523,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Require acl.
+
 * Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
 - Ship udev rules to allow libusb to access printer devices.
 - Fixed duplex test pages (bug #514898, STR #3277).



From twaugh at fedoraproject.org  Fri Aug  7 08:11:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  7 Aug 2009 08:11:13 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.498,1.499
Message-ID: <20090807081113.A666211C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8706

Modified Files:
	cups.spec 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Require acl.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -p -r1.498 -r1.499
--- cups.spec	6 Aug 2009 13:39:14 -0000	1.498
+++ cups.spec	7 Aug 2009 08:11:13 -0000	1.499
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.14%{?dist}
+Release: 0.%{pre}.15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -121,8 +121,9 @@ Requires: portreserve
 
 Requires: poppler-utils
 
-# We ship udev rules.
+# We ship udev rules which use setfacl.
 Requires: udev
+Requires: acl
 
 %package devel
 Summary: Common Unix Printing System - development environment
@@ -522,6 +523,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Require acl.
+
 * Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
 - Ship udev rules to allow libusb to access printer devices.
 - Fixed duplex test pages (bug #514898, STR #3277).



From rjones at fedoraproject.org  Fri Aug  7 08:38:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri,  7 Aug 2009 08:38:25 +0000 (UTC)
Subject: rpms/libguestfs/devel
	0001-Allow-network-interface-to-be-configured.patch, NONE,
	1.1 libguestfs.spec, 1.84, 1.85
Message-ID: <20090807083825.81D8211C00D7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15737

Modified Files:
	libguestfs.spec 
Added Files:
	0001-Allow-network-interface-to-be-configured.patch 
Log Message:
Set network interface to ne2k_pci (workaround for RHBZ#516022).

0001-Allow-network-interface-to-be-configured.patch:
 configure.ac  |   11 +++++++++++
 src/guestfs.c |    3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Allow-network-interface-to-be-configured.patch ---
>From b5b87cdb764dc757295316878a7fd6e2ff01bec4 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Fri, 7 Aug 2009 09:31:35 +0100
Subject: [PATCH] Allow network interface to be configured.

Add ./configure --with-net-if=(virtio|ne2k_pci) option.

This lets you workaround the following virtio_net bug:

https://bugzilla.redhat.com/show_bug.cgi?id=516022
---
 configure.ac  |   11 +++++++++++
 src/guestfs.c |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index f6f1735..cf0591d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,17 @@ AC_ARG_WITH([drive-if],
         [with_drive_if=ide])
 AC_DEFINE_UNQUOTED([DRIVE_IF],["$with_drive_if"],[Default drive interface.])
 
+dnl Set interface used by the network.  Normally you should
+dnl leave this at the default (virtio) but you can use the
+dnl alternative (ne2k_pci) because of bugs in virtio networking
+dnl eg. https://bugzilla.redhat.com/show_bug.cgi?id=516022
+AC_ARG_WITH([net-if],
+        [AS_HELP_STRING([--with-net-if],
+          [set default net driver (virtio|ne2k_pci) @<:@default=virtio@:>@])],
+        [],
+        [with_net_if=virtio])
+AC_DEFINE_UNQUOTED([NET_IF],["$with_net_if"],[Default network interface.])
+
 dnl Check for febootstrap etc.
 AC_CHECK_PROG([FEBOOTSTRAP],
         [febootstrap],[febootstrap],[no])
diff --git a/src/guestfs.c b/src/guestfs.c
index de63275..186c570 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1103,7 +1103,7 @@ guestfs_launch (guestfs_h *g)
     }
 #endif
     add_cmdline (g, "-net");
-    add_cmdline (g, "nic,model=virtio,vlan=0"); /* model=ne2k_pci also works */
+    add_cmdline (g, "nic,model=" NET_IF ",vlan=0");
 
     /* These options recommended by KVM developers to improve reliability. */
     if (qemu_supports (g, "-no-hpet"))
-- 
1.6.2.5



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- libguestfs.spec	6 Aug 2009 17:51:31 -0000	1.84
+++ libguestfs.spec	7 Aug 2009 08:38:23 -0000	1.85
@@ -5,13 +5,15 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     1%{?dist}
+Release:     2%{?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
 
+Patch0:      0001-Allow-network-interface-to-be-configured.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -292,6 +294,8 @@ Requires:    jpackage-utils
 
 mkdir -p daemon/m4
 
+%patch0 -p1
+
 
 %build
 %if %{buildnonet}
@@ -303,12 +307,14 @@ createrepo repo
 %define extra %nil
 %endif
 
+# --with-net-if=ne2k_pci is a workaround for RHBZ#516022.
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
   --mandir=%{_mandir} \
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   --enable-debug-command \
   --enable-supermin \
+  --with-net-if=ne2k_pci \
   %{extra}
 
 # This ensures that /usr/sbin/chroot is on the path.  Not needed
@@ -340,11 +346,12 @@ export LIBGUESTFS_DEBUG=1
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu (FIXED)
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
+#                                 (WORKAROUND ENABLED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 
-#%ifarch x86_64
-#make check
-#%endif
+%ifarch x86_64
+make check
+%endif
 
 
 %install
@@ -538,6 +545,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-2
+- Set network interface to ne2k_pci (workaround for RHBZ#516022).
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
 - New upstream release 1.0.66.
 



From jakub at fedoraproject.org  Fri Aug  7 08:40:29 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  7 Aug 2009 08:40:29 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.282, 1.283 gcc.spec, 1.60, 1.61 sources,
	1.286, 1.287 gcc44-builtin-unreachable.patch, 1.1, NONE
Message-ID: <20090807084029.4981F11C0439@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16970

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-builtin-unreachable.patch 
Log Message:
4.4.1-5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- .cvsignore	5 Aug 2009 15:56:25 -0000	1.282
+++ .cvsignore	7 Aug 2009 08:40:28 -0000	1.283
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090805.tar.bz2
+gcc-4.4.1-20090807.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gcc.spec	5 Aug 2009 15:56:25 -0000	1.60
+++ gcc.spec	7 Aug 2009 08:40:28 -0000	1.61
@@ -1,9 +1,9 @@
-%global DATE 20090805
-%global SVNREV 150492
+%global DATE 20090807
+%global SVNREV 150557
 %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 4
+%global gcc_release 5
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -163,8 +163,7 @@ Patch29: gcc44-libstdc++-docs.patch
 Patch30: gcc44-rh503816-1.patch
 Patch31: gcc44-rh503816-2.patch
 Patch32: gcc44-unique-object.patch
-Patch33: gcc44-builtin-unreachable.patch
-Patch34: gcc44-pr40971.patch
+Patch33: gcc44-pr40971.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -476,8 +475,7 @@ which are required to compile with the G
 %patch30 -p0 -b .rh503816-1~
 %patch31 -p0 -b .rh503816-2~
 %patch32 -p0 -b .unique-object~
-%patch33 -p0 -b .builtin-unreachable~
-%patch34 -p0 -b .pr40971~
+%patch33 -p0 -b .pr40971~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1816,6 +1814,11 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Aug  7 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-5
+- update from gcc-4_4-branch
+  - PRs c++/40948, target/40906
+- -fexceptions support for -freorder-blocks-and-partition
+
 * Wed Aug  5 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-4
 - update from gcc-4_4-branch
   - PRs build/40010, c++/39987, c++/40749, c++/40834, c++/40948, debug/39706,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- sources	5 Aug 2009 15:56:25 -0000	1.286
+++ sources	7 Aug 2009 08:40:28 -0000	1.287
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-ab532d487e6e0e1a1a3dd2f202a121b3  gcc-4.4.1-20090805.tar.bz2
+4ca33c6e0f65f7a29a2f8117d025006d  gcc-4.4.1-20090807.tar.bz2


--- gcc44-builtin-unreachable.patch DELETED ---



From markmc at fedoraproject.org  Fri Aug  7 08:53:27 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  7 Aug 2009 08:53:27 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-vnet-hdr-slirp-bustage.patch, NONE,
	1.1 qemu.spec, 1.118, 1.119
Message-ID: <20090807085327.6E3B311C00D7@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19731

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-vnet-hdr-slirp-bustage.patch 
Log Message:
* Fri Aug  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.5.rc1
- Fix virtio_net with -net user (#516022)


qemu-fix-vnet-hdr-slirp-bustage.patch:
 net.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE qemu-fix-vnet-hdr-slirp-bustage.patch ---
>From 97064ad88123744056d141e96247348dd2d9621c Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 7 Aug 2009 09:39:51 +0100
Subject: [PATCH] net: fix vnet_hdr bustage with slirp

slirp has started using VLANClientState::opaque and this has caused the
kvm specific tap_has_vnet_hdr() hack to break because we blindly use
this opaque pointer even if it is not a tap client.

Add yet another hack to check that we're actually getting called with a
tap client.

[Needed on stable-0.11 too]

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-vnet-hdr-slirp-bustage.patch
---
 net.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/net.c b/net.c
index c7702f8..2428f63 100644
--- a/net.c
+++ b/net.c
@@ -1521,6 +1521,9 @@ int tap_has_vnet_hdr(void *opaque)
     VLANClientState *vc = opaque;
     TAPState *s = vc->opaque;
 
+    if (vc->receive != tap_receive)
+        return 0;
+
     return s ? s->has_vnet_hdr : 0;
 }
 
@@ -1529,6 +1532,9 @@ void tap_using_vnet_hdr(void *opaque, int using_vnet_hdr)
     VLANClientState *vc = opaque;
     TAPState *s = vc->opaque;
 
+    if (vc->receive != tap_receive)
+        return;
+
     if (!s || !s->has_vnet_hdr)
         return;
 
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- qemu.spec	4 Aug 2009 14:48:16 -0000	1.118
+++ qemu.spec	7 Aug 2009 08:53:27 -0000	1.119
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.4.%{kvmvertag}%{?dist}
+Release: 0.5.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -31,6 +31,9 @@ Patch04: qemu-add-ksm-support.patch
 # Fix extboot checksum (bug #514899)
 Patch05: qemu-fix-extboot-signrom.patch
 
+# Fix virtio_net with -net user (bug #516022)
+Patch06: qemu-fix-vnet-hdr-slirp-bustage.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
@@ -216,6 +219,7 @@ such as kvmtrace and kvm_stat.
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
+%patch06 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -480,6 +484,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Aug  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.5.rc1
+- Fix virtio_net with -net user (#516022)
+
 * Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.4.rc1
 - Update to qemu-kvm-0.11-rc1; no changes from rc1-rc0
 



From rjones at fedoraproject.org  Fri Aug  7 08:57:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri,  7 Aug 2009 08:57:49 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.85,1.86
Message-ID: <20090807085749.741CF11C00D7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20743

Modified Files:
	libguestfs.spec 
Log Message:
Rerun autoreconf because patch touches configure script.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- libguestfs.spec	7 Aug 2009 08:38:23 -0000	1.85
+++ libguestfs.spec	7 Aug 2009 08:57:49 -0000	1.86
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -13,6 +13,7 @@ Source0:     http://libguestfs.org/downl
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch0:      0001-Allow-network-interface-to-be-configured.patch
+BuildRequires: automake, autoconf, libtool
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -295,6 +296,7 @@ Requires:    jpackage-utils
 mkdir -p daemon/m4
 
 %patch0 -p1
+autoreconf -i
 
 
 %build
@@ -545,8 +547,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-2
+* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-3
 - Set network interface to ne2k_pci (workaround for RHBZ#516022).
+- Rerun autoconf because patch touches configure script.
 
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
 - New upstream release 1.0.66.



From kalev at fedoraproject.org  Fri Aug  7 08:58:01 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri,  7 Aug 2009 08:58:01 +0000 (UTC)
Subject: rpms/powwow/F-10 powwow-long-prompt.patch, NONE, 1.1 powwow.spec,
	1.2, 1.3
Message-ID: <20090807085801.DD3FE11C00D7@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20710/F-10

Modified Files:
	powwow.spec 
Added Files:
	powwow-long-prompt.patch 
Log Message:
Apply patch to match prompts longer than terminal width (#509288).


powwow-long-prompt.patch:
 main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE powwow-long-prompt.patch ---
commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Aug 6 21:35:48 2009 +0300

    Match prompts longer than terminal width
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288

diff --git a/main.c b/main.c
index 9e680a2..0c3ec7e 100644
--- a/main.c
+++ b/main.c
@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
      * match #prompts. They usually have no #print, so we print manually
      * if islast is not set and a #prompt matches.
      */
-    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
-	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
+    if ((is_iac_prompt || islast)
+        && search_prompt(linestart, 1) && surely_isprompt) {
 
 	char *reprint;
 	/*
@@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
      * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
      *     so never match #actions on it.
      */
-    if (lineend == end && tcp_fd == tcp_main_fd && printstrlen(linestart) < cols) {
+    if (lineend == end && tcp_fd == tcp_main_fd) {
 	/*
 	 * The last line in the chunk we received has no trailing \n
 	 * Assume it is a prompt.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/powwow.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- powwow.spec	1 May 2009 22:52:08 -0000	1.2
+++ powwow.spec	7 Aug 2009 08:58:01 -0000	1.3
@@ -1,12 +1,15 @@
 Name:           powwow
 Version:        1.2.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
+# Match prompts longer than terminal width
+# https://bugzilla.redhat.com/show_bug.cgi?id=509288
+Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -31,6 +34,8 @@ for developing applications which use po
 %prep
 %setup -q
 
+%patch0 -p1 -b .long-prompt
+
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-2
+- Apply patch to match prompts longer than terminal width (#509288).
+
 * Sat May 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-1
 - Update to powwow 1.2.15.
 



From kalev at fedoraproject.org  Fri Aug  7 08:58:02 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri,  7 Aug 2009 08:58:02 +0000 (UTC)
Subject: rpms/powwow/F-11 powwow-long-prompt.patch, NONE, 1.1 powwow.spec,
	1.2, 1.3
Message-ID: <20090807085802.3C0F911C00D7@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20710/F-11

Modified Files:
	powwow.spec 
Added Files:
	powwow-long-prompt.patch 
Log Message:
Apply patch to match prompts longer than terminal width (#509288).


powwow-long-prompt.patch:
 main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE powwow-long-prompt.patch ---
commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Aug 6 21:35:48 2009 +0300

    Match prompts longer than terminal width
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288

diff --git a/main.c b/main.c
index 9e680a2..0c3ec7e 100644
--- a/main.c
+++ b/main.c
@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
      * match #prompts. They usually have no #print, so we print manually
      * if islast is not set and a #prompt matches.
      */
-    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
-	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
+    if ((is_iac_prompt || islast)
+        && search_prompt(linestart, 1) && surely_isprompt) {
 
 	char *reprint;
 	/*
@@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
      * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
      *     so never match #actions on it.
      */
-    if (lineend == end && tcp_fd == tcp_main_fd && printstrlen(linestart) < cols) {
+    if (lineend == end && tcp_fd == tcp_main_fd) {
 	/*
 	 * The last line in the chunk we received has no trailing \n
 	 * Assume it is a prompt.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/powwow.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- powwow.spec	1 May 2009 22:48:35 -0000	1.2
+++ powwow.spec	7 Aug 2009 08:58:02 -0000	1.3
@@ -1,12 +1,15 @@
 Name:           powwow
 Version:        1.2.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
+# Match prompts longer than terminal width
+# https://bugzilla.redhat.com/show_bug.cgi?id=509288
+Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -31,6 +34,8 @@ for developing applications which use po
 %prep
 %setup -q
 
+%patch0 -p1 -b .long-prompt
+
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-2
+- Apply patch to match prompts longer than terminal width (#509288).
+
 * Sat May 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-1
 - Update to powwow 1.2.15.
 



From kalev at fedoraproject.org  Fri Aug  7 08:58:02 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri,  7 Aug 2009 08:58:02 +0000 (UTC)
Subject: rpms/powwow/devel powwow-long-prompt.patch, NONE, 1.1 powwow.spec,
	1.3, 1.4
Message-ID: <20090807085802.7E5C911C0349@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20710/devel

Modified Files:
	powwow.spec 
Added Files:
	powwow-long-prompt.patch 
Log Message:
Apply patch to match prompts longer than terminal width (#509288).


powwow-long-prompt.patch:
 main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE powwow-long-prompt.patch ---
commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Aug 6 21:35:48 2009 +0300

    Match prompts longer than terminal width
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288

diff --git a/main.c b/main.c
index 9e680a2..0c3ec7e 100644
--- a/main.c
+++ b/main.c
@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
      * match #prompts. They usually have no #print, so we print manually
      * if islast is not set and a #prompt matches.
      */
-    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
-	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
+    if ((is_iac_prompt || islast)
+        && search_prompt(linestart, 1) && surely_isprompt) {
 
 	char *reprint;
 	/*
@@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
      * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
      *     so never match #actions on it.
      */
-    if (lineend == end && tcp_fd == tcp_main_fd && printstrlen(linestart) < cols) {
+    if (lineend == end && tcp_fd == tcp_main_fd) {
 	/*
 	 * The last line in the chunk we received has no trailing \n
 	 * Assume it is a prompt.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/powwow.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- powwow.spec	26 Jul 2009 19:20:16 -0000	1.3
+++ powwow.spec	7 Aug 2009 08:58:02 -0000	1.4
@@ -1,12 +1,15 @@
 Name:           powwow
 Version:        1.2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
+# Match prompts longer than terminal width
+# https://bugzilla.redhat.com/show_bug.cgi?id=509288
+Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -31,6 +34,8 @@ for developing applications which use po
 %prep
 %setup -q
 
+%patch0 -p1 -b .long-prompt
+
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-3
+- Apply patch to match prompts longer than terminal width (#509288).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From paragn at fedoraproject.org  Fri Aug  7 09:01:11 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri,  7 Aug 2009 09:01:11 +0000 (UTC)
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.24,1.25
Message-ID: <20090807090111.DA45A11C00D7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/mod_auth_kerb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21607

Modified Files:
	mod_auth_kerb.spec 
Log Message:
* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 5.4-5
- Spec cleanup as suggested in review bug #226150





Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- mod_auth_kerb.spec	25 Jul 2009 14:41:45 -0000	1.24
+++ mod_auth_kerb.spec	7 Aug 2009 09:01:11 -0000	1.25
@@ -2,15 +2,15 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.4
-Release: 4
+Release: 5%{?dist}
 License: BSD and MIT
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/modauthkerb/%{name}-%{version}.tar.gz
 Source1: auth_kerb.conf
 Patch1: mod_auth_kerb-5.4-rcopshack.patch
 Patch2: mod_auth_kerb-5.4-fixes.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: httpd-devel, krb5-devel
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
 
@@ -36,7 +36,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd
          $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 install -m 755 src/.libs/mod_auth_kerb.so \
         $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_auth_kerb.so
-install -m 644 $RPM_SOURCE_DIR/auth_kerb.conf \
+install -p -m 644 %{SOURCE1} \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/auth_kerb.conf
 
 %clean
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 5.4-5
+- Spec cleanup as suggested in review bug #226150
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From paragn at fedoraproject.org  Fri Aug  7 09:01:46 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri,  7 Aug 2009 09:01:46 +0000 (UTC)
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.33,1.34
Message-ID: <20090807090146.D23B511C00D7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/mod_auth_pgsql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21746

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 2.0.3-10
- Spec cleanup as suggested in review bug #226153




Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mod_auth_pgsql.spec	25 Jul 2009 14:43:13 -0000	1.33
+++ mod_auth_pgsql.spec	7 Aug 2009 09:01:46 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache HTTP Server using a PostgreSQL database
 Name: mod_auth_pgsql
 Version: 2.0.3
-Release: 9
+Release: 10%{?dist}
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -27,13 +27,13 @@ database.
 %{_sbindir}/apxs -Wc,-Wformat-security -c %{name}.c -lpq
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 install -m755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 
 # Install the config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/auth_pgsql.conf \
+install -p -m 644 %{SOURCE1} \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
 # Extract the licensing conditions
@@ -44,16 +44,19 @@ mkdir -p $RPM_BUILD_ROOT%{contentdir}/ma
 cp *.html $RPM_BUILD_ROOT%{contentdir}/manual/mod
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README INSTALL LICENSE
 %{contentdir}/manual/mod/*.html
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 2.0.3-10
+- Spec cleanup as suggested in review bug #226153
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Fri Aug  7 09:06:39 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri,  7 Aug 2009 09:06:39 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.86,1.87
Message-ID: <20090807090639.AEB0B11C00D7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22844

Modified Files:
	libguestfs.spec 
Log Message:
Add BR gettext, gettext-devel.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- libguestfs.spec	7 Aug 2009 08:57:49 -0000	1.86
+++ libguestfs.spec	7 Aug 2009 09:06:39 -0000	1.87
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -13,7 +13,7 @@ Source0:     http://libguestfs.org/downl
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch0:      0001-Allow-network-interface-to-be-configured.patch
-BuildRequires: automake, autoconf, libtool
+BuildRequires: automake, autoconf, libtool, gettext, gettext-devel
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -547,7 +547,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-3
+* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-4
 - Set network interface to ne2k_pci (workaround for RHBZ#516022).
 - Rerun autoconf because patch touches configure script.
 



From caolanm at fedoraproject.org  Fri Aug  7 09:10:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  7 Aug 2009 09:10:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.227, 1.228 sources, 1.369,
	1.370
Message-ID: <20090807091040.31C5111C0439@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23901

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- .cvsignore	29 Jul 2009 07:52:04 -0000	1.227
+++ .cvsignore	7 Aug 2009 09:10:39 -0000	1.228
@@ -10,3 +10,4 @@ or-IN_DEV300_m40.sdf
 acor_en-GB.dat
 acor_en-ZA.dat
 OOO310_m17.tar.bz2
+OOO310_m18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- sources	29 Jul 2009 07:52:04 -0000	1.369
+++ sources	7 Aug 2009 09:10:39 -0000	1.370
@@ -9,4 +9,4 @@ f501a4d62ed251d360ea6c544177a94f  redhat
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 f3842c64faf98fe9a8752e4a820c97bc  acor_en-GB.dat
 bccdb30725b178260e5ce74d0ad27879  acor_en-ZA.dat
-fba352dfe5ac3f8689c5c1bcee25719c  OOO310_m17.tar.bz2
+1f7711384c49a2fef4abb02053e5949f  OOO310_m18.tar.bz2



From paragn at fedoraproject.org  Fri Aug  7 09:11:21 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri,  7 Aug 2009 09:11:21 +0000 (UTC)
Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.22,1.23
Message-ID: <20090807091121.3507011C00D7@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/mod_authz_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24586

Modified Files:
	mod_authz_ldap.spec 
Log Message:
* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 0.26-14
- Spec cleanup as suggested in review bug #226154




Index: mod_authz_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mod_authz_ldap.spec	25 Jul 2009 14:43:47 -0000	1.22
+++ mod_authz_ldap.spec	7 Aug 2009 09:11:21 -0000	1.23
@@ -2,11 +2,11 @@
 Summary: LDAP authorization module for the Apache HTTP Server
 Name: mod_authz_ldap
 Version: 0.26
-Release: 13
+Release: 14%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://authzldap.othello.ch/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://authzldap.othello.ch/download/%{name}-%{version}.tar.gz
 Source1: mod_authz_ldap.conf
 Patch1: mod_authz_ldap-0.22-hook.patch
 Patch2: mod_authz_ldap-0.22-passlog.patch
@@ -15,7 +15,7 @@ Patch4: mod_authz_ldap-0.26-subreq.patch
 Patch5: mod_authz_ldap-0.26-apr1x.patch
 Patch6: mod_authz_ldap-0.26-parser.patch
 Patch7: mod_authz_ldap-0.26-sslvar.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: httpd-devel, openssl-devel, openldap-devel
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo httpd-devel missing)
 Requires: openldap
@@ -59,7 +59,7 @@ install -m 755 module/.libs/mod_authz_ld
 
 # install the conf.d fragment
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/mod_authz_ldap.conf \
+install -p -m 644 %{SOURCE1} \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/authz_ldap.conf
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/httpd/modules/{*.la,*.so.*}
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_sysconfdir}/httpd/conf.d/authz_ldap.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/authz_ldap.conf
 %{_libdir}/httpd/modules/*.so
 %{_bindir}/cert*
 %{_mandir}/man1/cert*
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS AUTHORS ChangeLog COPYING
 
 %changelog
+* Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 0.26-14
+- Spec cleanup as suggested in review bug #226154
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Fri Aug  7 09:14:48 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri,  7 Aug 2009 09:14:48 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.87,1.88
Message-ID: <20090807091448.ED4C211C00D7@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520

Modified Files:
	libguestfs.spec 
Log Message:
Add BR cvs.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- libguestfs.spec	7 Aug 2009 09:06:39 -0000	1.87
+++ libguestfs.spec	7 Aug 2009 09:14:48 -0000	1.88
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     4%{?dist}
+Release:     5%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -13,7 +13,7 @@ Source0:     http://libguestfs.org/downl
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch0:      0001-Allow-network-interface-to-be-configured.patch
-BuildRequires: automake, autoconf, libtool, gettext, gettext-devel
+BuildRequires: automake, autoconf, libtool, gettext, gettext-devel, cvs
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -547,7 +547,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-4
+* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-5
 - Set network interface to ne2k_pci (workaround for RHBZ#516022).
 - Rerun autoconf because patch touches configure script.
 



From kraxel at fedoraproject.org  Fri Aug  7 09:40:13 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri,  7 Aug 2009 09:40:13 +0000 (UTC)
Subject: rpms/xen/devel .cvsignore,1.40,1.41 sources,1.55,1.56
Message-ID: <20090807094013.B0E6C11C0439@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986

Modified Files:
	.cvsignore sources 
Log Message:
upload xen 3.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	27 May 2009 16:24:00 -0000	1.40
+++ .cvsignore	7 Aug 2009 09:40:13 -0000	1.41
@@ -6,3 +6,4 @@ lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
 xen-3.4.0.tar.gz
+xen-3.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	27 May 2009 16:24:00 -0000	1.55
+++ sources	7 Aug 2009 09:40:13 -0000	1.56
@@ -4,3 +4,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
 bf1b29f07ec2c12673779600aea183b2  xen-3.4.0.tar.gz
+c3f8dbcf833140825b1e2f16b64655f3  xen-3.4.1.tar.gz



From kalev at fedoraproject.org  Fri Aug  7 10:03:12 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri,  7 Aug 2009 10:03:12 +0000 (UTC)
Subject: rpms/powwow/F-10 powwow-long-prompt.patch, 1.1, 1.2 powwow.spec, 1.3,
	1.4
Message-ID: <20090807100313.01C8611C00D7@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5519/F-10

Modified Files:
	powwow-long-prompt.patch powwow.spec 
Log Message:
Update powwow-long-prompt.patch to the version sent upstream.


powwow-long-prompt.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: powwow-long-prompt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/powwow-long-prompt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- powwow-long-prompt.patch	7 Aug 2009 08:58:01 -0000	1.1
+++ powwow-long-prompt.patch	7 Aug 2009 10:03:12 -0000	1.2
@@ -1,4 +1,4 @@
-commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
+commit 4f8d9b7abffbdb9a41d174e16d5345e6d9f87387
 Author: Kalev Lember <kalev at smartlink.ee>
 Date:   Thu Aug 6 21:35:48 2009 +0300
 
@@ -7,20 +7,9 @@ Date:   Thu Aug 6 21:35:48 2009 +0300
     Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288
 
 diff --git a/main.c b/main.c
-index 9e680a2..0c3ec7e 100644
+index 9e680a2..508015a 100644
 --- a/main.c
 +++ b/main.c
-@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
-      * match #prompts. They usually have no #print, so we print manually
-      * if islast is not set and a #prompt matches.
-      */
--    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
--	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
-+    if ((is_iac_prompt || islast)
-+        && search_prompt(linestart, 1) && surely_isprompt) {
- 
- 	char *reprint;
- 	/*
 @@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
       * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
       *     so never match #actions on it.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/powwow.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- powwow.spec	7 Aug 2009 08:58:01 -0000	1.3
+++ powwow.spec	7 Aug 2009 10:03:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           powwow
 Version:        1.2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-3
+- Update powwow-long-prompt.patch to the version sent upstream.
+
 * Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-2
 - Apply patch to match prompts longer than terminal width (#509288).
 



From kalev at fedoraproject.org  Fri Aug  7 10:03:13 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri,  7 Aug 2009 10:03:13 +0000 (UTC)
Subject: rpms/powwow/F-11 powwow-long-prompt.patch, 1.1, 1.2 powwow.spec, 1.3,
	1.4
Message-ID: <20090807100313.47F5A11C0349@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5519/F-11

Modified Files:
	powwow-long-prompt.patch powwow.spec 
Log Message:
Update powwow-long-prompt.patch to the version sent upstream.


powwow-long-prompt.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: powwow-long-prompt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/powwow-long-prompt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- powwow-long-prompt.patch	7 Aug 2009 08:58:01 -0000	1.1
+++ powwow-long-prompt.patch	7 Aug 2009 10:03:12 -0000	1.2
@@ -1,4 +1,4 @@
-commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
+commit 4f8d9b7abffbdb9a41d174e16d5345e6d9f87387
 Author: Kalev Lember <kalev at smartlink.ee>
 Date:   Thu Aug 6 21:35:48 2009 +0300
 
@@ -7,20 +7,9 @@ Date:   Thu Aug 6 21:35:48 2009 +0300
     Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288
 
 diff --git a/main.c b/main.c
-index 9e680a2..0c3ec7e 100644
+index 9e680a2..508015a 100644
 --- a/main.c
 +++ b/main.c
-@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
-      * match #prompts. They usually have no #print, so we print manually
-      * if islast is not set and a #prompt matches.
-      */
--    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
--	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
-+    if ((is_iac_prompt || islast)
-+        && search_prompt(linestart, 1) && surely_isprompt) {
- 
- 	char *reprint;
- 	/*
 @@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
       * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
       *     so never match #actions on it.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-11/powwow.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- powwow.spec	7 Aug 2009 08:58:02 -0000	1.3
+++ powwow.spec	7 Aug 2009 10:03:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           powwow
 Version:        1.2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-3
+- Update powwow-long-prompt.patch to the version sent upstream.
+
 * Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-2
 - Apply patch to match prompts longer than terminal width (#509288).
 



From kalev at fedoraproject.org  Fri Aug  7 10:03:13 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Fri,  7 Aug 2009 10:03:13 +0000 (UTC)
Subject: rpms/powwow/devel powwow-long-prompt.patch, 1.1, 1.2 powwow.spec,
	1.4, 1.5
Message-ID: <20090807100313.8FD2311C00D7@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5519/devel

Modified Files:
	powwow-long-prompt.patch powwow.spec 
Log Message:
Update powwow-long-prompt.patch to the version sent upstream.


powwow-long-prompt.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: powwow-long-prompt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/powwow-long-prompt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- powwow-long-prompt.patch	7 Aug 2009 08:58:02 -0000	1.1
+++ powwow-long-prompt.patch	7 Aug 2009 10:03:13 -0000	1.2
@@ -1,4 +1,4 @@
-commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
+commit 4f8d9b7abffbdb9a41d174e16d5345e6d9f87387
 Author: Kalev Lember <kalev at smartlink.ee>
 Date:   Thu Aug 6 21:35:48 2009 +0300
 
@@ -7,20 +7,9 @@ Date:   Thu Aug 6 21:35:48 2009 +0300
     Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288
 
 diff --git a/main.c b/main.c
-index 9e680a2..0c3ec7e 100644
+index 9e680a2..508015a 100644
 --- a/main.c
 +++ b/main.c
-@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
-      * match #prompts. They usually have no #print, so we print manually
-      * if islast is not set and a #prompt matches.
-      */
--    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
--	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
-+    if ((is_iac_prompt || islast)
-+        && search_prompt(linestart, 1) && surely_isprompt) {
- 
- 	char *reprint;
- 	/*
 @@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
       * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
       *     so never match #actions on it.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/devel/powwow.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- powwow.spec	7 Aug 2009 08:58:02 -0000	1.4
+++ powwow.spec	7 Aug 2009 10:03:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           powwow
 Version:        1.2.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-4
+- Update powwow-long-prompt.patch to the version sent upstream.
+
 * Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-3
 - Apply patch to match prompts longer than terminal width (#509288).
 



From till at fedoraproject.org  Fri Aug  7 10:24:11 2009
From: till at fedoraproject.org (Till Maas)
Date: Fri,  7 Aug 2009 10:24:11 +0000 (UTC)
Subject: rpms/lzip/devel lzip.spec,1.5,1.6
Message-ID: <20090807102411.7C39E11C00D7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/lzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690

Modified Files:
	lzip.spec 
Log Message:
* Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.7-2
- Exclude lzdiff & lzgrep, they will become part of zutils:
  http://www.nongnu.org/lzip/zutils.html
  and fixes a conflict with xz-lzma-compat: Red Hat Bugzilla #515502
- Use globbing for all manpages



Index: lzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lzip/devel/lzip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lzip.spec	28 Jul 2009 08:35:09 -0000	1.5
+++ lzip.spec	7 Aug 2009 10:24:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lzip
 Version:        1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LZMA compressor with integrity checking
 
 Group:          Applications/File
@@ -59,18 +59,24 @@ fi
 %defattr(-,root,root,-)
 # TODO is currently empty
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/lzdiff
-%{_bindir}/lzgrep
+%exclude %{_bindir}/lzdiff
+%exclude %{_bindir}/lzgrep
 %{_bindir}/lzip
 %{_bindir}/lziprecover
 %{_infodir}/lzip.info*
-%{_mandir}/man1/lzdiff.1.gz
-%{_mandir}/man1/lzgrep.1.gz
+%exclude %{_mandir}/man1/lzdiff.1*
+%exclude %{_mandir}/man1/lzgrep.1*
 %{_mandir}/man1/lzip.1*
-%{_mandir}/man1/lziprecover.1.gz
+%{_mandir}/man1/lziprecover.1*
 
 
 %changelog
+* Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.7-2
+- Exclude lzdiff & lzgrep, they will become part of zutils:
+  http://www.nongnu.org/lzip/zutils.html
+  and fixes a conflict with xz-lzma-compat: Red Hat Bugzilla #515502
+- Use globbing for all manpages
+
 * Tue Jul 28 2009 Till Maas <opensource at till.name> - 1.7-1
 - Update to latest stable upstream
 - remove upstreamed patch



From airlied at fedoraproject.org  Fri Aug  7 10:47:28 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  7 Aug 2009 10:47:28 +0000 (UTC)
Subject: rpms/kernel/devel drm-radeon-fixes.patch, NONE,
	1.1 drm-r600-kms.patch, 1.1, 1.2 kernel.spec, 1.1701, 1.1702
Message-ID: <20090807104728.9237F11C00D7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16148

Modified Files:
	drm-r600-kms.patch kernel.spec 
Added Files:
	drm-radeon-fixes.patch 
Log Message:
* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.139.rc5.git3
- drm-r600-kms.patch - update r600 KMS
- drm-radeon-fixes.patch - patches for queue to Linus


drm-radeon-fixes.patch:
 drivers/gpu/drm/radeon/r600_cp.c       |   22 +++++++++++++++-------
 drivers/gpu/drm/radeon/radeon_device.c |    4 +++-
 drivers/gpu/drm/radeon/radeon_drv.h    |    1 +
 drivers/gpu/drm/radeon/radeon_object.c |    2 +-
 include/drm/drm_pciids.h               |    5 +++++
 5 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE drm-radeon-fixes.patch ---
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index 146f357..20f1790 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -384,8 +384,9 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
 		DRM_INFO("Loading RV670 PFP Microcode\n");
 		for (i = 0; i < PFP_UCODE_SIZE; i++)
 			RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]);
-	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
-		DRM_INFO("Loading RS780 CP Microcode\n");
+	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
+		DRM_INFO("Loading RS780/RS880 CP Microcode\n");
 		for (i = 0; i < PM4_UCODE_SIZE; i++) {
 			RADEON_WRITE(R600_CP_ME_RAM_DATA,
 				     RS780_cp_microcode[i][0]);
@@ -396,7 +397,7 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
 		}
 
 		RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-		DRM_INFO("Loading RS780 PFP Microcode\n");
+		DRM_INFO("Loading RS780/RS880 PFP Microcode\n");
 		for (i = 0; i < PFP_UCODE_SIZE; i++)
 			RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]);
 	}
@@ -783,6 +784,7 @@ static void r600_gfx_init(struct drm_device *dev,
 		break;
 	case CHIP_RV610:
 	case CHIP_RS780:
+	case CHIP_RS880:
 	case CHIP_RV620:
 		dev_priv->r600_max_pipes = 1;
 		dev_priv->r600_max_tile_pipes = 1;
@@ -917,7 +919,8 @@ static void r600_gfx_init(struct drm_device *dev,
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV630) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780))
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880))
 		RADEON_WRITE(R600_DB_DEBUG, R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE);
 	else
 		RADEON_WRITE(R600_DB_DEBUG, 0);
@@ -935,7 +938,8 @@ static void r600_gfx_init(struct drm_device *dev,
 	sq_ms_fifo_sizes = RADEON_READ(R600_SQ_MS_FIFO_SIZES);
 	if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
 		sq_ms_fifo_sizes = (R600_CACHE_FIFO_SIZE(0xa) |
 				    R600_FETCH_FIFO_HIWATER(0xa) |
 				    R600_DONE_FIFO_HIWATER(0xe0) |
@@ -978,7 +982,8 @@ static void r600_gfx_init(struct drm_device *dev,
 					    R600_NUM_ES_STACK_ENTRIES(0));
 	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
 		/* no vertex cache */
 		sq_config &= ~R600_VC_ENABLE;
 
@@ -1035,7 +1040,8 @@ static void r600_gfx_init(struct drm_device *dev,
 
 	if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780))
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880))
 		RADEON_WRITE(R600_VGT_CACHE_INVALIDATION, R600_CACHE_INVALIDATION(R600_TC_ONLY));
 	else
 		RADEON_WRITE(R600_VGT_CACHE_INVALIDATION, R600_CACHE_INVALIDATION(R600_VC_AND_TC));
@@ -1078,6 +1084,7 @@ static void r600_gfx_init(struct drm_device *dev,
 		break;
 	case CHIP_RV610:
 	case CHIP_RS780:
+	case CHIP_RS880:
 	case CHIP_RV620:
 		gs_prim_buffer_depth = 32;
 		break;
@@ -1123,6 +1130,7 @@ static void r600_gfx_init(struct drm_device *dev,
 	switch (dev_priv->flags & RADEON_FAMILY_MASK) {
 	case CHIP_RV610:
 	case CHIP_RS780:
+	case CHIP_RS880:
 	case CHIP_RV620:
 		tc_cntl = R600_TC_L2_SIZE(8);
 		break;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index a162ade..9ff6dcb 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -152,7 +152,9 @@ int radeon_mc_setup(struct radeon_device *rdev)
 		}
 	} else {
 		rdev->mc.vram_location = 0;
-		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+		tmp = rdev->mc.mc_vram_size;
+		tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
+		rdev->mc.gtt_location = tmp;
 	}
 	DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
 	DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 127d045..3933f82 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -143,6 +143,7 @@ enum radeon_family {
 	CHIP_RV635,
 	CHIP_RV670,
 	CHIP_RS780,
+	CHIP_RS880,
 	CHIP_RV770,
 	CHIP_RV730,
 	CHIP_RV710,
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index dd9ac2f..e98cae3 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -106,7 +106,7 @@ static inline uint32_t radeon_object_flags_from_domain(uint32_t domain)
 		flags |= TTM_PL_FLAG_VRAM | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
 	}
 	if (domain & RADEON_GEM_DOMAIN_GTT) {
-		flags |= TTM_PL_FLAG_TT | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
+		flags |= TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
 	}
 	if (domain & RADEON_GEM_DOMAIN_CPU) {
 		flags |= TTM_PL_FLAG_SYSTEM | TTM_PL_MASK_CACHING;
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 9d4c004..8535084 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -370,6 +370,11 @@
 	{0x1002, 0x9614, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0x1002, 0x9615, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0x1002, 0x9616, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9711, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0, 0, 0}
 
 #define r128_PCI_IDS \

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    3 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  139 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  340 ++++----
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  981 +++++++++++++++++++++++-
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 19 files changed, 3366 insertions(+), 498 deletions(-)

Index: drm-r600-kms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-r600-kms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-r600-kms.patch	5 Aug 2009 00:18:52 -0000	1.1
+++ drm-r600-kms.patch	7 Aug 2009 10:47:28 -0000	1.2
@@ -1,12 +1,14 @@
-From 6599b4a047d80cd7b8715b5ad74e0735e6d4b941 Mon Sep 17 00:00:00 2001
+From 00f3a05a622d6888af3ba284e7115f3a08035a3e Mon Sep 17 00:00:00 2001
 From: Jerome Glisse <jglisse at redhat.com>
 Date: Fri, 24 Jul 2009 19:42:23 +0200
 Subject: [PATCH] radeon: add basic KMS support for r6xx & r7xx chipset.
 
 This only provide a kms drm fb device for this hw and allow X
 to run with no acceleration.
+
+Signed-off-by: Jerome Glisse <jglisse at redhat.com>
 ---
- drivers/gpu/drm/radeon/Makefile        |    2 +-
+ drivers/gpu/drm/radeon/Makefile        |    3 +-
  drivers/gpu/drm/radeon/atombios_crtc.c |    1 +
  drivers/gpu/drm/radeon/avivod.h        |   60 ++
  drivers/gpu/drm/radeon/r100.c          |   69 ++
@@ -15,18 +17,17 @@ to run with no acceleration.
  drivers/gpu/drm/radeon/r600.c          | 1243 ++++++++++++++++++++++++++++++--
  drivers/gpu/drm/radeon/r600d.h         |  349 +++++++++
  drivers/gpu/drm/radeon/radeon.h        |   51 ++-
- drivers/gpu/drm/radeon/radeon_asic.h   |  137 ++++-
+ drivers/gpu/drm/radeon/radeon_asic.h   |  139 ++++-
  drivers/gpu/drm/radeon/radeon_clocks.c |   10 +-
- drivers/gpu/drm/radeon/radeon_device.c |  338 +++++----
- drivers/gpu/drm/radeon/radeon_drv.h    |    1 +
+ drivers/gpu/drm/radeon/radeon_device.c |  340 +++++----
  drivers/gpu/drm/radeon/radeon_ring.c   |   63 +--
  drivers/gpu/drm/radeon/radeon_share.h  |   66 ++
  drivers/gpu/drm/radeon/radeon_ttm.c    |    6 +-
  drivers/gpu/drm/radeon/rs400.c         |    2 +-
  drivers/gpu/drm/radeon/rs780.c         |  102 ---
- drivers/gpu/drm/radeon/rv770.c         |  980 +++++++++++++++++++++++--
+ drivers/gpu/drm/radeon/rv770.c         |  981 ++++++++++++++++++++++++--
  drivers/gpu/drm/radeon/rv770d.h        |  340 +++++++++
- 20 files changed, 3364 insertions(+), 494 deletions(-)
+ 19 files changed, 3366 insertions(+), 497 deletions(-)
  create mode 100644 drivers/gpu/drm/radeon/avivod.h
  delete mode 100644 drivers/gpu/drm/radeon/r300.h
  create mode 100644 drivers/gpu/drm/radeon/r600d.h
@@ -34,18 +35,19 @@ to run with no acceleration.
  create mode 100644 drivers/gpu/drm/radeon/rv770d.h
 
 diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
-index 013d380..7384cad 100644
+index 013d380..308416f 100644
 --- a/drivers/gpu/drm/radeon/Makefile
 +++ b/drivers/gpu/drm/radeon/Makefile
-@@ -13,7 +13,7 @@ radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
+@@ -13,8 +13,7 @@ radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
  	radeon_encoders.o radeon_display.o radeon_cursor.o radeon_i2c.o \
  	radeon_clocks.o radeon_fb.o radeon_gem.o radeon_ring.o radeon_irq_kms.o \
  	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \
 -	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rs780.o rv770.o \
-+	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o \
- 	radeon_test.o
+-	radeon_test.o
++	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o
  
  radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
+ 
 diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
 index 74d034f..629d7c8 100644
 --- a/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -264,7 +266,7 @@ index 8486b4d..0000000
 -
 -#endif
 diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 538cd90..ae3a9e9 100644
+index 538cd90..46c9ffd 100644
 --- a/drivers/gpu/drm/radeon/r600.c
 +++ b/drivers/gpu/drm/radeon/r600.c
 @@ -25,12 +25,17 @@
@@ -618,8 +620,8 @@ index 538cd90..ae3a9e9 100644
 +	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
 +	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 +	/* Setup GPU memory space */
++	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
 +	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
-+	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
 +	if (rdev->flags & RADEON_IS_AGP) {
 +		r = radeon_agp_init(rdev);
 +		if (r)
@@ -688,25 +690,22 @@ index 538cd90..ae3a9e9 100644
 +	rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);
 +	rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
 +	return 0;
- }
- 
--void r600_vram_info(struct radeon_device *rdev)
++}
++
 +int r600_gpu_reset(struct radeon_device *rdev)
- {
--	r600_vram_get_type(rdev);
--	rdev->mc.real_vram_size = RREG32(R600_CONFIG_MEMSIZE);
--	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
++{
 +	/* FIXME: implement */
 +	return 0;
-+}
+ }
  
--	/* Could aper size report 0 ? */
--	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
--	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+-void r600_vram_info(struct radeon_device *rdev)
 +static u32 r600_get_tile_pipe_to_backend_map(u32 num_tile_pipes,
 +					     u32 num_backends,
 +					     u32 backend_disable_mask)
-+{
+ {
+-	r600_vram_get_type(rdev);
+-	rdev->mc.real_vram_size = RREG32(R600_CONFIG_MEMSIZE);
+-	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
 +	u32 backend_map = 0;
 +	u32 enabled_backends_mask;
 +	u32 enabled_backends_count;
@@ -714,7 +713,10 @@ index 538cd90..ae3a9e9 100644
 +	u32 swizzle_pipe[R6XX_MAX_PIPES];
 +	u32 cur_backend;
 +	u32 i;
-+
+ 
+-	/* Could aper size report 0 ? */
+-	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+-	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 +	if (num_tile_pipes > R6XX_MAX_PIPES)
 +		num_tile_pipes = R6XX_MAX_PIPES;
 +	if (num_tile_pipes < 1)
@@ -821,8 +823,8 @@ index 538cd90..ae3a9e9 100644
 +		val >>= 1;
 +	}
 +	return ret;
-+}
-+
+ }
+ 
 +void r600_gpu_init(struct radeon_device *rdev)
 +{
 +	u32 tiling_config;
@@ -1091,8 +1093,8 @@ index 538cd90..ae3a9e9 100644
 +		break;
 +	}
 +	WREG32(TC_CNTL, tmp);
- }
- 
++}
++
 +
  /*
   * Indirect registers accessor
@@ -1351,7 +1353,11 @@ index 538cd90..ae3a9e9 100644
 +		  uint64_t dst_offset,
 +		  unsigned num_pages,
 +		  struct radeon_fence *fence)
-+{
+ {
+-	WREG32(R600_PCIE_PORT_INDEX, ((reg) & 0xff));
+-	(void)RREG32(R600_PCIE_PORT_INDEX);
+-	WREG32(R600_PCIE_PORT_DATA, (v));
+-	(void)RREG32(R600_PCIE_PORT_DATA);
 +	/* FIXME: implement */
 +	return 0;
 +}
@@ -1371,11 +1377,7 @@ index 538cd90..ae3a9e9 100644
 +int r600_set_surface_reg(struct radeon_device *rdev, int reg,
 +			 uint32_t tiling_flags, uint32_t pitch,
 +			 uint32_t offset, uint32_t obj_size)
- {
--	WREG32(R600_PCIE_PORT_INDEX, ((reg) & 0xff));
--	(void)RREG32(R600_PCIE_PORT_INDEX);
--	WREG32(R600_PCIE_PORT_DATA, (v));
--	(void)RREG32(R600_PCIE_PORT_DATA);
++{
 +	/* FIXME: implement */
 +	return 0;
 +}
@@ -1933,7 +1935,7 @@ index 0000000..3337227
 +
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index b1d945b..542131c 100644
+index b1d945b..0c5c63a 100644
 --- a/drivers/gpu/drm/radeon/radeon.h
 +++ b/drivers/gpu/drm/radeon/radeon.h
 @@ -50,8 +50,8 @@
@@ -1997,20 +1999,20 @@ index b1d945b..542131c 100644
 -	unsigned		gtt_location;
 -	unsigned		gtt_size;
 -	unsigned		vram_location;
+ 	/* for some chips with <= 32MB we need to lie
+ 	 * about vram size near mc fb location */
+-	unsigned		mc_vram_size;
++	u64			mc_vram_size;
 +	u64			gtt_location;
 +	u64			gtt_size;
 +	u64			gtt_start;
 +	u64			gtt_end;
 +	u64			vram_location;
- 	/* for some chips with <= 32MB we need to lie
- 	 * about vram size near mc fb location */
--	unsigned		mc_vram_size;
-+	u64			mc_vram_size;
 +	u64			vram_start;
 +	u64			vram_end;
-+	u64			real_vram_size;
  	unsigned		vram_width;
 -	unsigned		real_vram_size;
++	u64			real_vram_size;
  	int			vram_mtrr;
  	bool			vram_is_ddr;
  };
@@ -2095,7 +2097,7 @@ index b1d945b..542131c 100644
  #define radeon_irq_process(rdev) (rdev)->asic->irq_process((rdev))
  #define radeon_fence_ring_emit(rdev, fence) (rdev)->asic->fence_ring_emit((rdev), (fence))
 diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index 9a75876..6c30d11 100644
+index 9a75876..7e9bb12 100644
 --- a/drivers/gpu/drm/radeon/radeon_asic.h
 +++ b/drivers/gpu/drm/radeon/radeon_asic.h
 @@ -58,6 +58,7 @@ int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
@@ -2181,15 +2183,18 @@ index 9a75876..6c30d11 100644
  	.irq_set = &rs600_irq_set,
  	.irq_process = &r100_irq_process,
  	.fence_ring_emit = &r300_fence_ring_emit,
-@@ -380,6 +401,7 @@ static struct radeon_asic rv515_asic = {
+@@ -380,7 +401,10 @@ static struct radeon_asic rv515_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
  	.cp_disable = &r100_cp_disable,
 +	.cp_commit = &r100_cp_commit,
  	.ring_start = &rv515_ring_start,
++	.ring_ib_execute = &r100_ring_ib_execute,
++	.ib_test = &r100_ib_test,
  	.irq_set = &r100_irq_set,
  	.irq_process = &r100_irq_process,
-@@ -422,7 +444,10 @@ static struct radeon_asic r520_asic = {
+ 	.fence_ring_emit = &r300_fence_ring_emit,
+@@ -422,7 +446,10 @@ static struct radeon_asic r520_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
  	.cp_disable = &r100_cp_disable,
@@ -2200,7 +2205,7 @@ index 9a75876..6c30d11 100644
  	.irq_set = &r100_irq_set,
  	.irq_process = &r100_irq_process,
  	.fence_ring_emit = &r300_fence_ring_emit,
-@@ -440,9 +465,119 @@ static struct radeon_asic r520_asic = {
+@@ -440,9 +467,119 @@ static struct radeon_asic r520_asic = {
  };
  
  /*
@@ -2343,7 +2348,7 @@ index a37cbce..152eef1 100644
  			mpll->reference_div = spll->reference_div;
  	} else {
 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index a162ade..532074e 100644
+index 9ff6dcb..d4c804d 100644
 --- a/drivers/gpu/drm/radeon/radeon_device.c
 +++ b/drivers/gpu/drm/radeon/radeon_device.c
 @@ -37,7 +37,7 @@
@@ -2364,20 +2369,20 @@ index a162ade..532074e 100644
  {
  	int i;
  
-@@ -154,16 +154,16 @@ int radeon_mc_setup(struct radeon_device *rdev)
- 		rdev->mc.vram_location = 0;
- 		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+@@ -156,16 +156,14 @@ int radeon_mc_setup(struct radeon_device *rdev)
+ 		tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
+ 		rdev->mc.gtt_location = tmp;
  	}
 -	DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
-+	DRM_INFO("radeon: VRAM %uM\n", (unsigned)(rdev->mc.real_vram_size >> 20));
++	DRM_INFO("radeon: VRAM %uM\n", (unsigned)(rdev->mc.mc_vram_size >> 20));
  	DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
 -		 rdev->mc.vram_location,
 -		 rdev->mc.vram_location + rdev->mc.mc_vram_size - 1);
+-	if (rdev->mc.real_vram_size != rdev->mc.mc_vram_size)
+-		DRM_INFO("radeon: VRAM less than aperture workaround enabled\n");
+-	DRM_INFO("radeon: GTT %uM\n", rdev->mc.gtt_size >> 20);
 +		 (unsigned)rdev->mc.vram_location,
 +		 (unsigned)(rdev->mc.vram_location + rdev->mc.mc_vram_size - 1));
- 	if (rdev->mc.real_vram_size != rdev->mc.mc_vram_size)
- 		DRM_INFO("radeon: VRAM less than aperture workaround enabled\n");
--	DRM_INFO("radeon: GTT %uM\n", rdev->mc.gtt_size >> 20);
 +	DRM_INFO("radeon: GTT %uM\n", (unsigned)(rdev->mc.gtt_size >> 20));
  	DRM_INFO("radeon: GTT from 0x%08X to 0x%08X\n",
 -		 rdev->mc.gtt_location,
@@ -2387,7 +2392,7 @@ index a162ade..532074e 100644
  	return 0;
  }
  
-@@ -203,6 +203,31 @@ static bool radeon_card_posted(struct radeon_device *rdev)
+@@ -205,6 +203,31 @@ static bool radeon_card_posted(struct radeon_device *rdev)
  
  }
  
@@ -2397,7 +2402,7 @@ index a162ade..532074e 100644
 +	if (rdev->dummy_page.page == NULL)
 +		return -ENOMEM;
 +	rdev->dummy_page.addr = pci_map_page(rdev->pdev, rdev->dummy_page.page,
-+					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
++					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);	
 +	if (!rdev->dummy_page.addr) {
 +		__free_page(rdev->dummy_page.page);
 +		rdev->dummy_page.page = NULL;
@@ -2419,7 +2424,7 @@ index a162ade..532074e 100644
  
  /*
   * Registers accessors functions.
-@@ -328,9 +353,15 @@ int radeon_asic_init(struct radeon_device *rdev)
+@@ -330,9 +353,15 @@ int radeon_asic_init(struct radeon_device *rdev)
  	case CHIP_RV635:
  	case CHIP_RV670:
  	case CHIP_RS780:
@@ -2435,7 +2440,7 @@ index a162ade..532074e 100644
  	default:
  		/* FIXME: not supported yet */
  		return -EINVAL;
-@@ -453,7 +484,7 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -455,7 +484,7 @@ int radeon_device_init(struct radeon_device *rdev,
  		       struct pci_dev *pdev,
  		       uint32_t flags)
  {
@@ -2444,7 +2449,7 @@ index a162ade..532074e 100644
  	int dma_bits;
  
  	DRM_INFO("radeon: Initializing kernel modesetting.\n");
-@@ -492,10 +523,6 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -494,10 +523,6 @@ int radeon_device_init(struct radeon_device *rdev,
  	if (r) {
  		return r;
  	}
@@ -2455,7 +2460,7 @@ index a162ade..532074e 100644
  
  	/* set DMA mask + need_dma32 flags.
  	 * PCIE - can handle 40-bits.
-@@ -526,111 +553,118 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -528,111 +553,118 @@ int radeon_device_init(struct radeon_device *rdev,
  	DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
  	DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
  
@@ -2531,7 +2536,7 @@ index a162ade..532074e 100644
 +		rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
 +				MTRR_TYPE_WRCOMB, 1);
 +		DRM_INFO("Detected VRAM RAM=%uM, BAR=%uM\n",
-+				(unsigned)(rdev->mc.real_vram_size >> 20),
++				(unsigned)(rdev->mc.mc_vram_size >> 20),
 +				(unsigned)(rdev->mc.aper_size >> 20));
 +		DRM_INFO("RAM width %dbits %cDR\n",
 +				rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
@@ -2663,7 +2668,7 @@ index a162ade..532074e 100644
  	r = radeon_modeset_init(rdev);
  	if (r) {
  		return r;
-@@ -656,26 +690,29 @@ void radeon_device_fini(struct radeon_device *rdev)
+@@ -658,26 +690,29 @@ void radeon_device_fini(struct radeon_device *rdev)
  	rdev->shutdown = true;
  	/* Order matter so becarefull if you rearrange anythings */
  	radeon_modeset_fini(rdev);
@@ -2709,7 +2714,7 @@ index a162ade..532074e 100644
  	iounmap(rdev->rmmio);
  	rdev->rmmio = NULL;
  }
-@@ -713,9 +750,12 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
+@@ -715,9 +750,12 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
  	/* wait for gpu to finish processing current batch */
  	radeon_fence_wait_last(rdev);
  
@@ -2725,7 +2730,7 @@ index a162ade..532074e 100644
  	/* evict remaining vram memory */
  	radeon_object_evict_vram(rdev);
  
-@@ -751,33 +791,37 @@ int radeon_resume_kms(struct drm_device *dev)
+@@ -753,33 +791,37 @@ int radeon_resume_kms(struct drm_device *dev)
  	if (radeon_gpu_reset(rdev)) {
  		/* FIXME: what do we want to do here ? */
  	}
@@ -2789,18 +2794,6 @@ index a162ade..532074e 100644
  	}
  out:
  	fb_set_suspend(rdev->fbdev_info, 0);
-diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 127d045..3933f82 100644
---- a/drivers/gpu/drm/radeon/radeon_drv.h
-+++ b/drivers/gpu/drm/radeon/radeon_drv.h
-@@ -143,6 +143,7 @@ enum radeon_family {
- 	CHIP_RV635,
- 	CHIP_RV670,
- 	CHIP_RS780,
-+	CHIP_RS880,
- 	CHIP_RV770,
- 	CHIP_RV730,
- 	CHIP_RV710,
 diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
 index 60d1593..37d0958 100644
 --- a/drivers/gpu/drm/radeon/radeon_ring.c
@@ -2973,7 +2966,7 @@ index 63a7735..365d4bc 100644
 +
  #endif
 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 15c3531..d2799cc 100644
+index 15c3531..d2aff30 100644
 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
 @@ -352,7 +352,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
@@ -2990,7 +2983,7 @@ index 15c3531..d2799cc 100644
  	}
  	DRM_INFO("radeon: %uM of VRAM memory ready\n",
 -		 rdev->mc.real_vram_size / (1024 * 1024));
-+		 (unsigned)(rdev->mc.real_vram_size / (1024 * 1024)));
++		 (unsigned)rdev->mc.real_vram_size / (1024 * 1024));
  	r = ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT, 0,
  			   ((rdev->mc.gtt_size) >> PAGE_SHIFT));
  	if (r) {
@@ -3125,10 +3118,10 @@ index 0affcff..0000000
 -	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 -}
 diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
-index 21d8ffd..08ce913 100644
+index 21d8ffd..3e12447 100644
 --- a/drivers/gpu/drm/radeon/rv770.c
 +++ b/drivers/gpu/drm/radeon/rv770.c
-@@ -26,99 +26,963 @@
+@@ -26,99 +26,964 @@
   *          Jerome Glisse
   */
  #include "drmP.h"
@@ -3964,7 +3957,8 @@ index 21d8ffd..08ce913 100644
 +	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
 +	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 +	/* Setup GPU memory space */
-+	rdev->mc.real_vram_size = rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
++	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
++	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
 +	if (rdev->flags & RADEON_IS_AGP) {
 +		r = radeon_agp_init(rdev);
 +		if (r)
@@ -4497,5 +4491,5 @@ index 0000000..b0a4354
 +
 +#endif
 -- 
-1.6.2.5
+1.6.0.6
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1701
retrieving revision 1.1702
diff -u -p -r1.1701 -r1.1702
--- kernel.spec	6 Aug 2009 20:48:38 -0000	1.1701
+++ kernel.spec	7 Aug 2009 10:47:28 -0000	1.1702
@@ -670,6 +670,7 @@ Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 
 # nouveau + drm fixes
+Patch1810: drm-radeon-fixes.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1286,6 +1287,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch drm-radeon-fixes.patch
 ApplyPatch drm-r600-kms.patch
 ApplyPatch drm-hush-vblank-warning.patch
 
@@ -1957,6 +1959,10 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.139.rc5.git3
+- drm-r600-kms.patch - update r600 KMS
+- drm-radeon-fixes.patch - patches for queue to Linus
+
 * Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.31-0.138.rc5.git3
 - Fix kvm virtio_blk errors (#514901)
 



From jnovy at fedoraproject.org  Fri Aug  7 10:53:59 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  7 Aug 2009 10:53:59 +0000 (UTC)
Subject: rpms/mc/devel mc-shell-patterns.patch,NONE,1.1 mc.spec,1.146,1.147
Message-ID: <20090807105359.1094011C00D7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17557

Modified Files:
	mc.spec 
Added Files:
	mc-shell-patterns.patch 
Log Message:
* Fri Aug  7 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.3.pre1
- support shell patterns in copy dialog (#516180)
  (http://www.midnight-commander.org/ticket/414)


mc-shell-patterns.patch:
 glob.c |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

--- NEW FILE mc-shell-patterns.patch ---
diff -d -urpN mc.7/src/search/glob.c mc.8/src/search/glob.c
--- mc.7/src/search/glob.c	2009-06-29 14:06:35.000000000 +0200
+++ mc.8/src/search/glob.c	2009-07-03 12:40:36.000000000 +0200
@@ -141,8 +142,36 @@ mc_search__run_glob (mc_search_t * mc_se
 }
 
 /* --------------------------------------------------------------------------------------------- */
+static GString *
+mc_search__translate_replace_glob_to_regex (gchar *str)
+{
+    GString *buff = g_string_new ("");
+    int cnt = '0';
+
+    while (*str) {
+	char c = *str++;
+	switch (c) {
+	case '*':
+	case '?':
+	    g_string_append_c (buff, '\\');
+	    c = ++cnt;
+	    break;
+	/* breaks copying: mc uses "\0" internally, it must not be changed */
+	/*case '\\':*/
+	case '&':
+	    g_string_append_c (buff, '\\');
+	    break;
+	}
+	g_string_append_c (buff, c);
+    }
+    return buff;
+}
+
 GString *
 mc_search_glob_prepare_replace_str (mc_search_t * mc_search, GString * replace_str)
 {
-    return mc_search_regex_prepare_replace_str (mc_search, replace_str);
+    GString *repl = mc_search__translate_replace_glob_to_regex(replace_str->str);
+    GString *res = mc_search_regex_prepare_replace_str (mc_search, repl);
+    g_string_free (repl, TRUE);
+    return res;
 }


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- mc.spec	5 Aug 2009 12:26:02 -0000	1.146
+++ mc.spec	7 Aug 2009 10:53:58 -0000	1.147
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.2.pre1%{?dist}
+Release:	0.3.pre1%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -16,6 +16,7 @@ Patch1:		mc-ipv6.patch
 Patch2:		mc-prompt.patch
 Patch3:		mc-exit.patch
 Patch4:		mc-extensions.patch
+Patch5:		mc-shell-patterns.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -30,6 +31,7 @@ specific files.
 %patch2 -p1 -b .prompt
 %patch3 -p1 -b .exit
 %patch4 -p1 -b .extensions
+%patch5 -p1 -b .shell-patterns
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -85,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Fri Aug  7 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.3.pre1
+- support shell patterns in copy dialog (#516180)
+  (http://www.midnight-commander.org/ticket/414)
+
 * Wed Aug  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.2.pre1
 - update extension binding to be more Fedora-like
 - update to upstream IPv6 patch



From twaugh at fedoraproject.org  Fri Aug  7 11:05:11 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  7 Aug 2009 11:05:11 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.499,1.500
Message-ID: <20090807110511.5E9BE11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19794

Modified Files:
	cups.spec 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Clear out cache files on upgrade.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- cups.spec	7 Aug 2009 08:11:13 -0000	1.499
+++ cups.spec	7 Aug 2009 11:05:11 -0000	1.500
@@ -373,10 +373,7 @@ install -m644 %{SOURCE3} \
 	 --slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz \
 	 --initscript cups
 %endif
-if [ $1 -eq 1 ]; then
-  # First install.  Build ppds.dat.
-  /sbin/service cups reload >/dev/null 2>&1 || :
-fi
+rm -f %{_localstatedir}/cache/cups/*
 exit 0
 
 %post libs -p /sbin/ldconfig
@@ -524,6 +521,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Clear out cache files on upgrade.
 - Require acl.
 
 * Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14



From twaugh at fedoraproject.org  Fri Aug  7 11:05:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  7 Aug 2009 11:05:58 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.494,1.495
Message-ID: <20090807110558.68C5711C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19987

Modified Files:
	cups.spec 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Clear out cache files on upgrade.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- cups.spec	7 Aug 2009 07:53:56 -0000	1.494
+++ cups.spec	7 Aug 2009 11:05:58 -0000	1.495
@@ -373,10 +373,7 @@ install -m644 %{SOURCE3} \
 	 --slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz \
 	 --initscript cups
 %endif
-if [ $1 -eq 1 ]; then
-  # First install.  Build ppds.dat.
-  /sbin/service cups reload >/dev/null 2>&1 || :
-fi
+rm -f %{_localstatedir}/cache/cups/*
 exit 0
 
 %post libs -p /sbin/ldconfig
@@ -524,6 +521,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Clear out cache files on upgrade.
 - Require acl.
 
 * Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13



From caolanm at fedoraproject.org  Fri Aug  7 11:06:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  7 Aug 2009 11:06:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1977,
	1.1978 sources, 1.370, 1.371
Message-ID: <20090807110640.283F811C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20162

Modified Files:
	openoffice.org.spec sources 
Log Message:
Resolves: rhbz#516011 keep help .xsl files as non-docs


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1977
retrieving revision 1.1978
diff -u -p -r1.1977 -r1.1978
--- openoffice.org.spec	5 Aug 2009 22:07:27 -0000	1.1977
+++ openoffice.org.spec	7 Aug 2009 11:06:39 -0000	1.1978
@@ -1,5 +1,5 @@
 %define oootag OOO310
-%define ooomilestone 17
+%define ooomilestone 18
 %define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
@@ -2484,8 +2484,8 @@ rm -rf $RPM_BUILD_ROOT
 %{baseinstdir}/share/uno_packages/cache
 %dir %{baseinstdir}/extensions
 %dir %{basisinstdir}
-%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help
+%docdir %{basisinstdir}/help/en
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/default.css
 %{basisinstdir}/help/en/err.html
@@ -4200,6 +4200,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Aug 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.1
+- Resolves: rhbz#516011 keep help .xsl files as non-docs
+- latest milestone
+
 * Wed Jul 29 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-17.1
 - latest milestone
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- sources	7 Aug 2009 09:10:39 -0000	1.370
+++ sources	7 Aug 2009 11:06:40 -0000	1.371
@@ -3,10 +3,10 @@ e3a0b76dcd876f3d721ee7183729153d  unowin
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
 f501a4d62ed251d360ea6c544177a94f  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
 1f7711384c49a2fef4abb02053e5949f  OOO310_m18.tar.bz2
+ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz



From mtruch at fedoraproject.org  Fri Aug  7 11:10:25 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Fri,  7 Aug 2009 11:10:25 +0000 (UTC)
Subject: rpms/slimdata/devel slimdata.spec,1.4,1.5
Message-ID: <20090807111025.B348111C0439@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/slimdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20972

Modified Files:
	slimdata.spec 
Log Message:
Slimdata doesn't work on any bigendian arch.



Index: slimdata.spec
===================================================================
RCS file: /cvs/extras/rpms/slimdata/devel/slimdata.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- slimdata.spec	27 Jul 2009 04:27:16 -0000	1.4
+++ slimdata.spec	7 Aug 2009 11:10:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           slimdata
 Version:        2.6.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tools and library for reading and writing slim compressed data
 
 Group:          Development/Libraries
@@ -18,7 +18,7 @@ BuildRequires:     numpy
 BuildRequires:     texlive-latex doxygen pdfjam
 
 #The current slim algorithm assumes little-endian.  Upstream is (slowly) working on this.
-ExcludeArch: ppc64 ppc
+ExcludeArch: ppc64 ppc sparcv9 sparc64
 
 %description
 Slim is a data compression system for scientific data sets, both a binary and a
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_libdir}/libslim.so
 
 %changelog
+* Fri Aug 7 2009 Matthew Truch <matt at truch.net> - 2.6.3-7
+- Excluearch sparcv9 and sparc64 as slimdata doesn't work on bigendian machines
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sayamind at fedoraproject.org  Fri Aug  7 11:15:49 2009
From: sayamind at fedoraproject.org (Sayamindu Dasgupta)
Date: Fri,  7 Aug 2009 11:15:49 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 olpc-utils-dmidetect.patch, NONE,
	1.1 olpc-utils.spec, 1.9, 1.10
Message-ID: <20090807111549.39B1311C00D7@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-serv22725

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-dmidetect.patch 
Log Message:
version 1.0.3-2 : Detect XO 1.5 correctly (dlo #9422)



olpc-utils-dmidetect.patch:
 olpc-configure |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE olpc-utils-dmidetect.patch ---
diff --git a/etc/rc.d/init.d/olpc-configure b/etc/rc.d/init.d/olpc-configure
index e8315fd..a57c4e7 100755
--- a/etc/rc.d/init.d/olpc-configure
+++ b/etc/rc.d/init.d/olpc-configure
@@ -15,14 +15,17 @@ MFG_DATA=/ofw/mfg-data
 XO_VERSION=0
 
 get_xo_version() {
-	# FIXME: is this reliable?
-	[ -e "/ofw/banner-name" ] || return
-
-	banner=$(</ofw/banner-name)
-	if [ "${banner:0:6}" == "OLPC C" ]; then
-		XO_VERSION="1"
-	elif [ "${banner}" == "OLPC XO 1.5" ]; then
-		XO_VERSION="1.5"
+	# This requires an OFW that runs setup-smbios at boot.
+	[ -e "/sys/class/dmi/id/product_name" ] || return
+
+	name=$(</sys/class/dmi/id/product_name)
+	version=$(</sys/class/dmi/id/product_version)
+	if [ "${name}" == "XO" ]; then
+		if [ "${version}" == "1" ]; then
+			XO_VERSION="1"
+		elif [ "${version}" == "1.5" ]; then
+			XO_VERSION="1.5"
+		fi
 	fi
 }
 


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- olpc-utils.spec	6 Jul 2009 13:59:38 -0000	1.9
+++ olpc-utils.spec	7 Aug 2009 11:15:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    1.0.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -8,6 +8,8 @@ License:    GPLv2+
 Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: olpc-utils-dmidetect.patch
+
 # for olpc-dm
 BuildRequires:  ConsoleKit-devel
 Requires:       /usr/bin/xauth
@@ -30,6 +32,8 @@ becoming root, and cleaning the datastor
 %prep
 %setup -q
 
+%patch1 -p1
+
 
 %build
 make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -81,6 +85,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Fri Aug 10 2009 Sayamindu Dasgupta <sayamindu at laptop.org> 1.0.3-2
+- Detect XO 1.5 correctly (dlo #9422)
+
 * Mon Jul  6 2009 Daniel Drake <dsd at laptop.org> 1.0.3-1
 - Bug fix release
 



From airlied at fedoraproject.org  Fri Aug  7 11:37:15 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  7 Aug 2009 11:37:15 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.465,
	1.466 xserver-1.4.99-pic-libxf86config.patch, 1.1, 1.2
Message-ID: <20090807113715.E0B5A11C00D7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28815

Modified Files:
	xorg-x11-server.spec xserver-1.4.99-pic-libxf86config.patch 
Log Message:
* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-30.20090807
- goddamit: reapply picify libxf86config.a hopefully



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -p -r1.465 -r1.466
--- xorg-x11-server.spec	7 Aug 2009 05:49:11 -0000	1.465
+++ xorg-x11-server.spec	7 Aug 2009 11:37:15 -0000	1.466
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   29.%{gitdate}%{?dist}
+Release:   30.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -46,6 +46,7 @@ Source20:  http://svn.exactcode.de/t2/tr
 Source30: find-provides
 #define __find_provides {nil}
 
+Patch5: xserver-1.4.99-pic-libxf86config.patch
 Patch10: xserver-1.6.99-linkmap.patch
 
 # airlied to upstream for 1.7
@@ -513,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-30.20090807
+- goddamit: reapply picify libxf86config.a hopefully
+
 * Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-29.20090807
 - rebase upstream
 - libxf86config.a revenge, brought back .a upstream, doesn't work as .so

xserver-1.4.99-pic-libxf86config.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xserver-1.4.99-pic-libxf86config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.4.99-pic-libxf86config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.4.99-pic-libxf86config.patch	2 Nov 2007 17:15:11 -0000	1.1
+++ xserver-1.4.99-pic-libxf86config.patch	7 Aug 2009 11:37:15 -0000	1.2
@@ -1,25 +1,18 @@
-From 6344659a33a7c192dffe6e796c771d02f78da5e5 Mon Sep 17 00:00:00 2001
+From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
-Date: Thu, 1 Nov 2007 15:02:24 -0400
+Date: Mon, 10 Dec 2007 11:26:57 -0500
 Subject: [PATCH] Build libxf86config with -fPIC.
 
----
- hw/xfree86/parser/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
 diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 849ee8b..0691158 100644
+index b8fab28..ed831c9 100644
 --- a/hw/xfree86/parser/Makefile.am
 +++ b/hw/xfree86/parser/Makefile.am
-@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
- 	DRI.c \
- 	Extensions.c
+@@ -33,7 +33,7 @@ libxf86config_a_SOURCES = \
+ 	$(INTERNAL_SOURCES)
+ libxf86config_a_CFLAGS = $(AM_CFLAGS)
  
 -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC -fvisibility=hidden
  
  EXTRA_DIST = \
  	Configint.h \
--- 
-1.5.3.4
-



From pbrobinson at fedoraproject.org  Fri Aug  7 11:38:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 11:38:55 +0000 (UTC)
Subject: rpms/anerley/devel anerley.spec,1.1,1.2
Message-ID: <20090807113855.BAABD11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29402

Modified Files:
	anerley.spec 
Log Message:
- Spec file cleanups


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- anerley.spec	5 Aug 2009 07:49:36 -0000	1.1
+++ anerley.spec	7 Aug 2009 11:38:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           anerley
 Version:        0.0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -14,14 +14,10 @@ BuildRequires: glib2-devel
 BuildRequires: nbtk-devel
 BuildRequires: telepathy-glib-devel
 BuildRequires: telepathy-mission-control-devel
-BuildRequires: pkgconfig
-
+BuildRequires: intltool
+BuildRequires: gettext
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: intltool
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: gnome-common
 
 %description
 Moblin widgets for management of people information using telepathy 
@@ -39,14 +35,17 @@ Files for development with %{name}.
 %prep
 %setup -q
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -73,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-2
+- Spec file cleanups
+
 * Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-1
 - New upstream release - 0.0.20
 



From pkgdb at fedoraproject.org  Fri Aug  7 11:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 11:39:47 +0000
Subject: [pkgdb] olpc-utils: sayamind has requested watchcommits
Message-ID: <20090807113947.DCDB510F890@bastion2.fedora.phx.redhat.com>

sayamind has requested the watchcommits acl on olpc-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Fri Aug  7 11:39:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 11:39:56 +0000
Subject: [pkgdb] olpc-utils: sayamind has requested commit
Message-ID: <20090807113957.03DEA10F8AC@bastion2.fedora.phx.redhat.com>

sayamind has requested the commit acl on olpc-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pbrobinson at fedoraproject.org  Fri Aug  7 11:41:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 11:41:53 +0000 (UTC)
Subject: rpms/bognor-regis/devel bognor-regis.spec,1.7,1.8
Message-ID: <20090807114153.4BEA011C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bognor-regis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30296

Modified Files:
	bognor-regis.spec 
Log Message:
- Spec file cleanups


Index: bognor-regis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/devel/bognor-regis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bognor-regis.spec	24 Jul 2009 18:56:58 -0000	1.7
+++ bognor-regis.spec	7 Aug 2009 11:41:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bognor-regis
 Version:        0.4.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Media daemon and play queue manager
 
 Group:          Applications/Multimedia
@@ -9,18 +9,14 @@ 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)
 
-BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gstreamer-devel
-BuildRequires: pkgconfig
+BuildRequires: intltool
+BuildRequires: gettext
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 Media daemon and play queue manager
@@ -37,14 +33,17 @@ Files for development with %{name}.
 %prep
 %setup -q
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
 rm -rf %{buildroot}/%{_libdir}/*.la
@@ -71,6 +70,9 @@ rm -rf %{buildroot}
 %{_libdir}/libbognor-regis-0.4.so
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.9-2
+- Spec file cleanups
+
 * Fri Jul 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.9-1
 - New upstream 0.4.9 release
 



From pbrobinson at fedoraproject.org  Fri Aug  7 11:45:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 11:45:59 +0000 (UTC)
Subject: rpms/clutter-imcontext/devel clutter-imcontext.spec,1.5,1.6
Message-ID: <20090807114559.3E02411C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-imcontext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32005

Modified Files:
	clutter-imcontext.spec 
Log Message:
- Spec file cleanups


Index: clutter-imcontext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-imcontext/devel/clutter-imcontext.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- clutter-imcontext.spec	6 Aug 2009 09:01:14 -0000	1.5
+++ clutter-imcontext.spec	7 Aug 2009 11:45:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           clutter-imcontext
 Version:        0.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        IMContext Framework Library for Clutter
 
 Group:          System Environment/Libraries
@@ -11,13 +11,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires: glib2-devel
 BuildRequires: clutter-devel >= 1.0.0
-BuildRequires: pkgconfig
 BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 IMContext Framework Library for Clutter
@@ -36,8 +33,8 @@ Files for development with %{name}.
 %prep
 %setup -q
 
-# run autogen.sh until we have a proper release, but don't run configure twice.
-sed -i '/configure/d' autogen.sh
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
 
 %build
@@ -46,7 +43,7 @@ make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -73,6 +70,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-2
+- Spec file cleanups
+
 * Thu Aug  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
 - New 0.1.4 upstream release.
 - license clarfied so remove spec file note



From tbzatek at fedoraproject.org  Fri Aug  7 11:47:21 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri,  7 Aug 2009 11:47:21 +0000 (UTC)
Subject: rpms/libarchive/devel .cvsignore, 1.10, 1.11 libarchive.spec, 1.13, 
	1.14 sources, 1.10, 1.11
Message-ID: <20090807114721.EB20211C00D7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/libarchive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32369

Modified Files:
	.cvsignore libarchive.spec sources 
Log Message:
* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> 2.7.1-1
- Update to 2.7.1
- Drop deprecated lzma dependency, libxz handles both formats



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libarchive/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 May 2009 12:38:37 -0000	1.10
+++ .cvsignore	7 Aug 2009 11:47:21 -0000	1.11
@@ -1 +1 @@
-libarchive-2.7.0.tar.gz
+libarchive-2.7.1.tar.gz


Index: libarchive.spec
===================================================================
RCS file: /cvs/extras/rpms/libarchive/devel/libarchive.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libarchive.spec	27 Jul 2009 13:39:58 -0000	1.13
+++ libarchive.spec	7 Aug 2009 11:47:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libarchive
-Version:        2.7.0
-Release:        3%{?dist}
+Version:        2.7.1
+Release:        1%{?dist}
 Summary:        A library for handling streaming archive formats 
 
 Group:          System Environment/Libraries
@@ -17,7 +17,6 @@ BuildRequires: bison
 BuildRequires: sharutils
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
-BuildRequires: lzma-devel
 BuildRequires: xz-devel
 BuildRequires: e2fsprogs-devel
 BuildRequires: libacl-devel
@@ -90,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> 2.7.1-1
+- Update to 2.7.1
+- Drop deprecated lzma dependency, libxz handles both formats
+
 * Mon Jul 27 2009 Tomas Bzatek <tbzatek at redhat.com> 2.7.0-3
 - Enable XZ compression format
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libarchive/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 May 2009 12:38:37 -0000	1.10
+++ sources	7 Aug 2009 11:47:21 -0000	1.11
@@ -1 +1 @@
-a2103ca334037562ad327eb3aed54869  libarchive-2.7.0.tar.gz
+f43382413b4457d0e192771b100a66e7  libarchive-2.7.1.tar.gz



From pbrobinson at fedoraproject.org  Fri Aug  7 11:50:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 11:50:50 +0000 (UTC)
Subject: rpms/anerley/devel anerley.spec,1.2,1.3
Message-ID: <20090807115050.3419F11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv745

Modified Files:
	anerley.spec 
Log Message:
- Re-add gnome-comnmon buildreq


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- anerley.spec	7 Aug 2009 11:38:55 -0000	1.2
+++ anerley.spec	7 Aug 2009 11:50:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           anerley
 Version:        0.0.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -18,6 +18,7 @@ BuildRequires: intltool
 BuildRequires: gettext
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
+BuildRequires: gnome-common
 
 %description
 Moblin widgets for management of people information using telepathy 
@@ -72,6 +73,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-3
+- Re-add gnome-comnmon buildreq
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-2
 - Spec file cleanups
 



From dwalsh at fedoraproject.org  Fri Aug  7 11:51:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  7 Aug 2009 11:51:54 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.47,
	1.48 selinux-policy.spec, 1.891, 1.892
Message-ID: <20090807115154.A5EB311C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1063

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Aug 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-7
- Allow nsplugin to connecto the session bus
- Allow samba_net to write to coolkey data


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  123 -
 policy/modules/roles/sysadm.te                     |  123 -
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |   11 
 policy/modules/services/cups.te                    |   29 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   25 
 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               |   48 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   45 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   45 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   80 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  108 +
 policy/modules/services/virt.te                    |  264 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  138 ++
 policy/modules/system/init.te                      |  166 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   76 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   34 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1302 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 294 files changed, 12925 insertions(+), 2609 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- policy-F12.patch	5 Aug 2009 21:31:17 -0000	1.47
+++ policy-F12.patch	7 Aug 2009 11:51:54 -0000	1.48
@@ -2598,8 +2598,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.26/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te	2009-08-05 07:20:45.000000000 -0400
-@@ -0,0 +1,285 @@
++++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te	2009-08-06 08:01:24.000000000 -0400
+@@ -0,0 +1,286 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -2761,6 +2761,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	dbus_session_bus_client(nsplugin_t)
++	dbus_connect_session_bus(nsplugin_t)
 +	dbus_system_bus_client(nsplugin_t)
 +')
 +
@@ -4142,7 +4143,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.26/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/apps/wine.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/apps/wine.te	2009-08-07 06:43:34.000000000 -0400
 @@ -9,20 +9,35 @@
  type wine_t;
  type wine_exec_t;
@@ -5373,7 +5374,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.26/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if	2009-08-07 07:36:43.000000000 -0400
 @@ -1807,7 +1807,7 @@
  	')
  
@@ -5681,24 +5682,31 @@ 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.26/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/roles/staff.te	2009-08-05 16:17:34.000000000 -0400
-@@ -15,156 +15,110 @@
++++ serefpolicy-3.6.26/policy/modules/roles/staff.te	2009-08-07 06:42:40.000000000 -0400
+@@ -15,156 +15,109 @@
  # 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)
 -')
--
--optional_policy(`
++seutil_run_newrole(staff_t, staff_r)
++netutils_run_ping(staff_t, staff_r)
+ 
+ optional_policy(`
 -	bluetooth_role(staff_r, staff_t)
 -')
 -
@@ -5713,11 +5721,7 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
 -	dbus_role_template(staff, 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(`
 -	ethereal_role(staff_r, staff_t)
 -')
@@ -5729,157 +5733,154 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
 -	games_role(staff_r, staff_t)
 -')
-+auth_domtrans_pam_console(staff_t)
- 
+-
 -optional_policy(`
 -	gift_role(staff_r, staff_t)
 -')
-+seutil_run_newrole(staff_t, staff_r)
-+netutils_run_ping(staff_t, staff_r)
- 
- optional_policy(`
+-
+-optional_policy(`
 -	gnome_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+-	gpg_role(staff_r, staff_t)
 +	sudo_role_template(staff, staff_r, staff_t)
  ')
  
  optional_policy(`
--	gpg_role(staff_r, staff_t)
+-	irc_role(staff_r, staff_t)
 +	auditadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	irc_role(staff_r, staff_t)
+-	java_role(staff_r, staff_t)
 +	kerneloops_manage_tmp_files(staff_t)
  ')
  
  optional_policy(`
--	java_role(staff_r, staff_t)
+-	lockdev_role(staff_r, staff_t)
 +	logadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	lockdev_role(staff_r, staff_t)
+-	lpd_role(staff_r, staff_t)
 +	postgresql_role(staff_r, staff_t)
  ')
  
  optional_policy(`
--	lpd_role(staff_r, staff_t)
+-	mozilla_role(staff_r, staff_t)
 +	rtkit_daemon_system_domain(staff_t)
  ')
  
  optional_policy(`
--	mozilla_role(staff_r, staff_t)
+-	mplayer_role(staff_r, staff_t)
 +	secadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	mplayer_role(staff_r, staff_t)
+-	mta_role(staff_r, staff_t)
 +	ssh_role_template(staff, staff_r, staff_t)
  ')
  
  optional_policy(`
--	mta_role(staff_r, staff_t)
+-	oident_manage_user_content(staff_t)
+-	oident_relabel_user_content(staff_t)
 +	sysadm_role_change(staff_r)
  ')
  
  optional_policy(`
--	oident_manage_user_content(staff_t)
--	oident_relabel_user_content(staff_t)
+-	pyzor_role(staff_r, staff_t)
 +	usernetctl_run(staff_t, staff_r)
  ')
  
  optional_policy(`
--	pyzor_role(staff_r, staff_t)
+-	razor_role(staff_r, staff_t)
 +	unconfined_role_change(staff_r)
  ')
  
  optional_policy(`
--	razor_role(staff_r, staff_t)
+-	rssh_role(staff_r, staff_t)
 +	webadm_role_change(staff_r)
  ')
  
 -optional_policy(`
--	rssh_role(staff_r, staff_t)
+-	screen_role_template(staff, staff_r, staff_t)
 -')
 +domain_read_all_domains_state(staff_t)
 +domain_getattr_all_domains(staff_t)
 +domain_obj_id_change_exemption(staff_t)
  
 -optional_policy(`
--	screen_role_template(staff, staff_r, staff_t)
+-	secadm_role_change(staff_r)
 -')
 +files_read_kernel_modules(staff_t)
  
 -optional_policy(`
--	secadm_role_change(staff_r)
+-	spamassassin_role(staff_r, staff_t)
 -')
 +kernel_read_fs_sysctls(staff_t)
  
 -optional_policy(`
--	spamassassin_role(staff_r, staff_t)
+-	ssh_role_template(staff, staff_r, staff_t)
 -')
 +modutils_read_module_config(staff_t)
 +modutils_read_module_deps(staff_t)
  
 -optional_policy(`
--	ssh_role_template(staff, staff_r, staff_t)
+-	su_role_template(staff, staff_r, staff_t)
 -')
 +miscfiles_read_hwdata(staff_t)
  
 -optional_policy(`
--	su_role_template(staff, staff_r, staff_t)
+-	sudo_role_template(staff, staff_r, staff_t)
 -')
 +term_use_unallocated_ttys(staff_t)
  
  optional_policy(`
--	sudo_role_template(staff, staff_r, staff_t)
+-	sysadm_role_change(staff_r)
+-	userdom_dontaudit_use_user_terminals(staff_t)
 +	gnomeclock_dbus_chat(staff_t)
  ')
  
  optional_policy(`
--	sysadm_role_change(staff_r)
--	userdom_dontaudit_use_user_terminals(staff_t)
+-	thunderbird_role(staff_r, staff_t)
 +	lpd_list_spool(staff_t)
  ')
  
  optional_policy(`
--	thunderbird_role(staff_r, staff_t)
+-	tvtime_role(staff_r, staff_t)
 +	kerneloops_dbus_chat(staff_t)
  ')
  
  optional_policy(`
--	tvtime_role(staff_r, staff_t)
+-	uml_role(staff_r, staff_t)
 +	rpm_dbus_chat(staff_usertype)
  ')
  
  optional_policy(`
--	uml_role(staff_r, staff_t)
+-	userhelper_role_template(staff, staff_r, staff_t)
 +	sandbox_transition(staff_t, staff_r)
  ')
  
  optional_policy(`
--	userhelper_role_template(staff, staff_r, staff_t)
+-	vmware_role(staff_r, staff_t)
 +	screen_role_template(staff, staff_r, staff_t)
 +	screen_manage_var_run(staff_t)
  ')
  
  optional_policy(`
--	vmware_role(staff_r, staff_t)
+-	wireshark_role(staff_r, staff_t)
 +	setroubleshoot_stream_connect(staff_t)
 +	setroubleshoot_dbus_chat(staff_t)
  ')
  
  optional_policy(`
--	wireshark_role(staff_r, staff_t)
+-	xserver_role(staff_r, staff_t)
 +	virt_stream_connect(staff_t)
  ')
- 
--optional_policy(`
--	xserver_role(staff_r, staff_t)
--')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.26/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/roles/sysadm.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/roles/sysadm.te	2009-08-06 07:59:15.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -6138,7 +6139,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +322,12 @@
+@@ -418,17 +322,13 @@
  ')
  
  optional_policy(`
@@ -6153,13 +6154,11 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 -	vmware_role(sysadm_r, sysadm_t)
--')
--
--optional_policy(`
- 	vpn_run(sysadm_t, sysadm_r)
++	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +336,12 @@
+ optional_policy(`
+@@ -440,13 +340,12 @@
  ')
  
  optional_policy(`
@@ -6862,7 +6861,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.26/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/roles/unconfineduser.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/roles/unconfineduser.te	2009-08-06 07:58:58.000000000 -0400
 @@ -0,0 +1,395 @@
 +policy_module(unconfineduser, 1.0.0)
 +
@@ -7261,7 +7260,7 @@ diff -b -B --ignore-all-space --exclude-
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.26/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/roles/unprivuser.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/roles/unprivuser.te	2009-08-07 06:42:14.000000000 -0400
 @@ -14,142 +14,21 @@
  userdom_unpriv_user_template(user)
  
@@ -9787,17 +9786,28 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.26/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/cups.fc	2009-07-30 15:33:08.000000000 -0400
-@@ -13,6 +13,8 @@
++++ serefpolicy-3.6.26/policy/modules/services/cups.fc	2009-08-07 07:43:48.000000000 -0400
+@@ -13,7 +13,9 @@
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
  
+-/etc/hp(/.*)?			gen_context(system_u:object_r:hplip_etc_t,s0)
 +/etc/cups/interfaces(/.*)?	gen_context(system_u:object_r:cupsd_interface_t,s0)
 +
- /etc/hp(/.*)?			gen_context(system_u:object_r:hplip_etc_t,s0)
++/etc/hp(/.*)?			gen_context(system_u:object_r:hplip_var_lib_t,s0)
  
  /etc/printcap.* 	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-@@ -62,3 +64,8 @@
+ 
+@@ -52,6 +54,8 @@
+ /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ 
++/var/lib/hp(/.*)?		gen_context(system_u:object_r:hplip_var_lib_t,s0)
++
+ /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
+ /var/log/turboprint.*		gen_context(system_u:object_r:cupsd_log_t,s0)
+ 
+@@ -62,3 +67,8 @@
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/turboprint(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
@@ -9808,7 +9818,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.26/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/cups.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/cups.te	2009-08-07 07:43:13.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -9819,6 +9829,22 @@ diff -b -B --ignore-all-space --exclude-
  type cupsd_rw_etc_t;
  files_config_file(cupsd_rw_etc_t)
  
+@@ -64,12 +67,12 @@
+ # For CUPS to run as a backend
+ cups_backend(hplip_t, hplip_exec_t)
+ 
+-type hplip_etc_t;
+-files_config_file(hplip_etc_t)
+-
+ type hplip_tmp_t;
+ files_tmp_file(hplip_tmp_t)
+ 
++type hplip_var_lib_t alias hplip_etc_t;
++files_type(hplip_var_lib_t)
++
+ type hplip_var_run_t;
+ files_pid_file(hplip_var_run_t)
+ 
 @@ -116,6 +119,9 @@
  read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t)
  files_search_etc(cupsd_t)
@@ -9829,6 +9855,15 @@ diff -b -B --ignore-all-space --exclude-
  manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
+@@ -146,7 +152,7 @@
+ 
+ allow cupsd_t hplip_t:process { signal sigkill };
+ 
+-read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
++read_files_pattern(cupsd_t, hplip_var_lib_t, hplip_var_lib_t)
+ 
+ allow cupsd_t hplip_var_run_t:file read_file_perms;
+ 
 @@ -250,6 +256,7 @@
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
@@ -9837,6 +9872,15 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
+@@ -360,7 +367,7 @@
+ 
+ domtrans_pattern(cupsd_config_t, hplip_exec_t, hplip_t)
+ 
+-read_files_pattern(cupsd_config_t, hplip_etc_t, hplip_etc_t)
++read_files_pattern(cupsd_config_t, hplip_var_lib_t, hplip_var_lib_t)
+ 
+ kernel_read_system_state(cupsd_config_t)
+ kernel_read_all_sysctls(cupsd_config_t)
 @@ -419,6 +426,10 @@
  ')
  
@@ -9857,6 +9901,19 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
+@@ -596,9 +609,9 @@
+ 
+ cups_stream_connect(hplip_t)
+ 
+-allow hplip_t hplip_etc_t:dir list_dir_perms;
+-read_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
+-read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
++allow hplip_t hplip_var_lib_t:dir list_dir_perms;
++read_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
++read_lnk_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
+ files_search_etc(hplip_t)
+ 
+ manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.26/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/cvs.te	2009-07-30 15:33:08.000000000 -0400
@@ -9868,7 +9925,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.26/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/dbus.if	2009-08-05 07:49:49.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/dbus.if	2009-08-06 08:01:02.000000000 -0400
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -10128,7 +10185,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.26/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-05 16:52:16.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-07 07:49:12.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)
@@ -10202,7 +10259,7 @@ 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,6 +147,19 @@
+@@ -134,14 +147,28 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
@@ -10222,8 +10279,10 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # DeviceKit-Power local policy
-@@ -142,6 +168,7 @@
- allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace };
+ #
+ 
+-allow devicekit_power_t self:capability { dac_override sys_tty_config sys_nice sys_ptrace };
++allow devicekit_power_t self:capability { dac_override net_admin sys_tty_config sys_nice sys_ptrace };
  allow devicekit_power_t self:fifo_file rw_fifo_file_perms;
  allow devicekit_power_t self:unix_dgram_socket create_socket_perms;
 +allow devicekit_power_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -10246,7 +10305,16 @@ 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)
-@@ -180,8 +209,11 @@
+@@ -167,6 +196,8 @@
+ files_read_etc_files(devicekit_power_t)
+ files_read_usr_files(devicekit_power_t)
+ 
++fs_list_inotifyfs(devicekit_power_t)
++
+ term_use_all_terms(devicekit_power_t)
+ 
+ auth_use_nsswitch(devicekit_power_t)
+@@ -180,8 +211,11 @@
  ')
  
  optional_policy(`
@@ -10259,7 +10327,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +235,23 @@
+@@ -203,17 +237,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -10698,6 +10766,17 @@ diff -b -B --ignore-all-space --exclude-
 -	ntpd_rw_shm(gpsd_t)
 +	ntp_rw_shm(gpsd_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.6.26/policy/modules/services/hal.fc
+--- nsaserefpolicy/policy/modules/services/hal.fc	2009-07-28 13:28:33.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/hal.fc	2009-08-06 08:14:20.000000000 -0400
+@@ -26,6 +26,7 @@
+ /var/run/pm(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
+ /var/run/pm-utils(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
+ /var/run/vbe.*	 	--			gen_context(system_u:object_r:hald_var_run_t,s0)
++/var/run/synce.*	 			gen_context(system_u:object_r:hald_var_run_t,s0)
+ 
+ ifdef(`distro_gentoo',`
+ /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.26/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/hal.if	2009-07-30 15:33:08.000000000 -0400
@@ -12655,7 +12734,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.26/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-05 15:36:05.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-07 06:11:40.000000000 -0400
 @@ -38,9 +38,10 @@
  
  allow policykit_t self:capability { setgid setuid };
@@ -12713,15 +12792,18 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -96,6 +111,7 @@
+@@ -95,7 +110,10 @@
+ files_read_etc_files(policykit_auth_t)
  files_read_usr_files(policykit_auth_t)
  
++fs_getattr_all_fs(polkit_auth_t)
++
  auth_use_nsswitch(policykit_auth_t)
 +auth_domtrans_chk_passwd(policykit_auth_t)
  
  logging_send_syslog_msg(policykit_auth_t)
  
-@@ -104,6 +120,7 @@
+@@ -104,6 +122,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -12729,7 +12811,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -116,6 +133,13 @@
+@@ -116,6 +135,13 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -12743,7 +12825,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -123,7 +147,8 @@
+@@ -123,7 +149,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -12753,7 +12835,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;
  
-@@ -153,9 +178,12 @@
+@@ -153,9 +180,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -12767,7 +12849,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -167,7 +195,8 @@
+@@ -167,7 +197,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -14135,8 +14217,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit_daemon.te serefpolicy-3.6.26/policy/modules/services/rtkit_daemon.te
 --- nsaserefpolicy/policy/modules/services/rtkit_daemon.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/services/rtkit_daemon.te	2009-07-30 15:33:09.000000000 -0400
-@@ -0,0 +1,36 @@
++++ serefpolicy-3.6.26/policy/modules/services/rtkit_daemon.te	2009-08-07 07:36:54.000000000 -0400
+@@ -0,0 +1,38 @@
 +policy_module(rtkit_daemon,1.0.0)
 +
 +########################################
@@ -14162,6 +14244,8 @@ diff -b -B --ignore-all-space --exclude-
 +domain_getsched_all_domains(rtkit_daemon_t)
 +domain_read_all_domains_state(rtkit_daemon_t)
 +
++kernel_read_system_state(rtkit_daemon_t)
++
 +fs_rw_anon_inodefs_files(rtkit_daemon_t)
 +
 +auth_use_nsswitch(rtkit_daemon_t)
@@ -14361,7 +14445,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.26/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/samba.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/samba.te	2009-08-06 07:30:26.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -14376,7 +14460,14 @@ diff -b -B --ignore-all-space --exclude-
  type nmbd_t;
  type nmbd_exec_t;
  init_daemon_domain(nmbd_t, nmbd_exec_t)
-@@ -207,8 +214,10 @@
+@@ -201,14 +208,16 @@
+ files_read_usr_symlinks(samba_net_t)
+ 
+ auth_use_nsswitch(samba_net_t)
+-auth_read_cache(samba_net_t)
++auth_rw_cache(samba_net_t)
+ 
+ logging_send_syslog_msg(samba_net_t)
  
  miscfiles_read_localization(samba_net_t) 
  
@@ -23090,7 +23181,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.26/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-05 07:54:48.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-07 06:43:58.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -24080,7 +24171,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,37 +1060,55 @@
+@@ -978,36 +1060,53 @@
  		')
  	')
  
@@ -24146,11 +24237,9 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		ppp_run_cond($1_t, $1_r)
  	')
-+
  ')
  
- #######################################
-@@ -1042,7 +1142,7 @@
+@@ -1042,7 +1141,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -24159,7 +24248,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1151,7 @@
+@@ -1051,8 +1150,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -24169,7 +24258,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1174,8 @@
+@@ -1075,7 +1173,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -24179,7 +24268,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1191,7 @@
+@@ -1091,6 +1190,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -24187,7 +24276,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1199,6 @@
+@@ -1098,8 +1198,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -24196,7 +24285,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)
-@@ -1154,20 +1253,6 @@
+@@ -1154,20 +1252,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -24217,7 +24306,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1298,7 @@
+@@ -1213,6 +1297,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -24225,7 +24314,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1364,15 @@
+@@ -1278,11 +1363,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -24241,7 +24330,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1464,13 @@
+@@ -1374,12 +1463,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -24256,7 +24345,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1503,14 @@
+@@ -1412,6 +1502,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -24271,7 +24360,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1526,11 @@
+@@ -1427,9 +1525,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -24283,7 +24372,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1587,25 @@
+@@ -1486,6 +1586,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -24309,7 +24398,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1680,8 @@
+@@ -1560,6 +1679,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -24318,7 +24407,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1775,7 @@
+@@ -1653,6 +1774,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -24326,7 +24415,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)
  ')
-@@ -1780,19 +1903,32 @@
+@@ -1780,19 +1902,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -24366,7 +24455,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1963,7 @@
+@@ -1827,6 +1962,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -24374,7 +24463,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2511,7 @@
+@@ -2374,7 +2510,7 @@
  
  ########################################
  ## <summary>
@@ -24383,7 +24472,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2865,32 @@
+@@ -2728,11 +2864,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -24418,7 +24507,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3018,25 @@
+@@ -2860,7 +3017,25 @@
  		type user_tmp_t;
  	')
  
@@ -24445,7 +24534,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3073,7 @@
+@@ -2897,6 +3072,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -24453,7 +24542,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3204,501 @@
+@@ -3027,3 +3203,501 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -p -r1.891 -r1.892
--- selinux-policy.spec	5 Aug 2009 21:31:17 -0000	1.891
+++ selinux-policy.spec	7 Aug 2009 11:51:54 -0000	1.892
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-7
+- Allow nsplugin to connecto the session bus
+- Allow samba_net to write to coolkey data
+
 * Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-6
 - Allow devicekit_disk to list inotify
 



From pkgdb at fedoraproject.org  Fri Aug  7 11:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 11:52:50 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090807115250.D427B10F8AC@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on olpc-utils (Fedora devel) to Approved for sayamind

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pkgdb at fedoraproject.org  Fri Aug  7 11:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 11:52:52 +0000
Subject: [pkgdb] olpc-utils had acl change status
Message-ID: <20090807115252.9448C10F8B7@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on olpc-utils (Fedora devel) to Approved for sayamind

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/olpc-utils



From pbrobinson at fedoraproject.org  Fri Aug  7 11:54:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 11:54:45 +0000 (UTC)
Subject: rpms/jana/devel jana.spec,1.1,1.2 import.log,1.1,NONE
Message-ID: <20090807115445.94B0711C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/jana/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1889

Modified Files:
	jana.spec 
Removed Files:
	import.log 
Log Message:
- Spec file cleanups


Index: jana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jana/devel/jana.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jana.spec	3 Aug 2009 21:44:02 -0000	1.1
+++ jana.spec	7 Aug 2009 11:54:45 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:           jana
 Version:        0.4.5
-Release:        0.2.%{snapshot}%{?dist}
+Release:        0.3.%{snapshot}%{?dist}
 Summary:        An interface library for time-related PIM
 
 Group:          System Environment/Libraries
@@ -22,13 +22,10 @@ BuildRequires: evolution-data-server-dev
 BuildRequires: gtk2-devel
 BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
-BuildRequires: pkgconfig
+BuildRequires: intltool
 
 # Require these because we're using a git snapshot
 BuildRequires: libtool
-BuildRequires: intltool
-BuildRequires: automake
-BuildRequires: autoconf
 BuildRequires: gnome-common
 
 %description
@@ -48,14 +45,17 @@ Files for development with %{name}.
 %prep
 %setup -q
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --disable-static --enable-gtk-doc 
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
 rm -rf %{buildroot}/%{_libdir}/*.la
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libjana
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.3.20090622gitb416a41
+- A few minor spec cleanups
+
 * Fri Jul  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.5-0.2.20090622gitb416a41
 - Updates from package review
 


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Fri Aug  7 11:58:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 11:58:45 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.9,1.10 import.log,1.1,NONE
Message-ID: <20090807115845.08A6E11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2883

Modified Files:
	mojito.spec 
Removed Files:
	import.log 
Log Message:
- Spec file cleanups


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mojito.spec	5 Aug 2009 16:32:54 -0000	1.9
+++ mojito.spec	7 Aug 2009 11:58:44 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.19.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -15,7 +15,6 @@ BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: NetworkManager-glib-devel
-BuildRequires: pkgconfig
 BuildRequires: rest-devel
 BuildRequires: twitter-glib-devel
 BuildRequires: intltool
@@ -23,8 +22,6 @@ BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 Mojito is a social data server which will fetch data from the "social web", 
@@ -46,8 +43,11 @@ Files for development with %{name}.
 %setup -q
 chmod 644 examples/*.py 
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --enable-gtk-doc --with-gnome --with-online=networkmanager --disable-static --enable-lastfm-key --enable-myspace-key --enable-flickr-key
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -61,10 +61,8 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 #Remove libtool archives and static libs.
-rm -rf %{buildroot}/%{_libdir}/*.a
-rm -rf %{buildroot}/%{_libdir}/*.la
-rm -rf %{buildroot}/%{_libdir}/mojito/services/*.a
-rm -rf %{buildroot}/%{_libdir}/mojito/services/*.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %find_lang %{name}
 
@@ -103,6 +101,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Aug  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.2-2
+- A few minor spec file cleanups
+
 * Wed Aug  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.2-1
 - Update to 0.19.2 - updated translations
 


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Fri Aug  7 12:04:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:04:34 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.17,1.18 import.log,1.1,NONE
Message-ID: <20090807120434.2665411C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4335

Modified Files:
	nbtk.spec 
Removed Files:
	import.log 
Log Message:
- Spec file cleanups


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nbtk.spec	1 Aug 2009 14:21:57 -0000	1.17
+++ nbtk.spec	7 Aug 2009 12:04:33 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        0.16.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -13,16 +13,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
-BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: libccss-devel
-BuildRequires: pkgconfig
 BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 Obsoletes: mux < 0.4
 Provides: mux = 0.4
@@ -48,8 +44,8 @@ Files for development with %{name}.
 %patch0 -p1 -b .clutter1
 %patch1 -p1 -b .clutter1-pkcfg
 
-# run autogen.sh until we have a proper release, but don't run configure twice.
-sed -i '/configure/d' autogen.sh
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
 
 %build
@@ -83,9 +79,12 @@ rm -rf %{buildroot}
 %{_includedir}/nbtk-1.0
 %{_libdir}/pkgconfig/nbtk*.pc
 %{_libdir}/libnbtk*.so
-%{_datadir}/gtk-doc/html/nbtk
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-9
+- A few minor spec file cleanups
+
 * Sat Aug  1 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-8
 - Rebuild
 


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Fri Aug  7 12:05:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:05:30 +0000 (UTC)
Subject: rpms/rest/devel rest.spec,1.4,1.5 import.log,1.1,NONE
Message-ID: <20090807120530.A404811C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4662

Modified Files:
	rest.spec 
Removed Files:
	import.log 
Log Message:
- Spec file cleanups


Index: rest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/rest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rest.spec	27 Jul 2009 02:59:41 -0000	1.4
+++ rest.spec	7 Aug 2009 12:05:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rest
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library for access to RESTful web services
 
 Group:          System Environment/Libraries
@@ -13,12 +13,9 @@ BuildRequires: glib2-devel
 BuildRequires: libsoup-devel
 BuildRequires: libxml2-devel
 BuildRequires: gtk-doc
-BuildRequires: pkgconfig
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 This library was designed to make it easier to access web services that
@@ -42,17 +39,20 @@ Files for development with %{name}.
 %prep
 %setup -q -n librest-%{version}
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
-#Remove libtool archives
-rm -rf %{buildroot}/%{_libdir}/*.la
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
 rm -rf %{buildroot}
@@ -72,9 +72,12 @@ rm -rf %{buildroot}
 %{_includedir}/rest
 %{_libdir}/pkgconfig/rest.pc
 %{_libdir}/librest.so
-%{_datadir}/gtk-doc/html/rest
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5-3
+- A few minor spec file cleanups
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- import.log DELETED ---



From leigh123linux at fedoraproject.org  Fri Aug  7 12:15:31 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri,  7 Aug 2009 12:15:31 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.10, 1.11 qbittorrent.spec, 1.24,
	1.25 sources, 1.10, 1.11
Message-ID: <20090807121531.0BA9311C00D7@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7461

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Fri Aug 07 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.8.rc2
- update to 1.4.0rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Aug 2009 20:12:15 -0000	1.10
+++ .cvsignore	7 Aug 2009 12:15:30 -0000	1.11
@@ -1 +1 @@
-qbittorrent-2417svn.tar.gz
+qbittorrent-1.4.0rc2.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- qbittorrent.spec	3 Aug 2009 20:12:15 -0000	1.24
+++ qbittorrent.spec	7 Aug 2009 12:15:30 -0000	1.25
@@ -1,16 +1,16 @@
-%define svn_rev 2417
+#%%define svn_rev 2417
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.0
-Release: 0.7.20090803svn%{?dist}
+Release: 0.8.rc2%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
-Source0:  %{name}-%{svn_rev}svn.tar.gz
-#Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+#Source0:  %{name}-%{svn_rev}svn.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}rc2.tar.gz
 Patch0:  qbittorrent_flag.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Aug 07 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.8.rc2
+- update to 1.4.0rc2
+
 * Mon Aug 03 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.7.20090803svn
 - update to svn 2417
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Aug 2009 20:12:15 -0000	1.10
+++ sources	7 Aug 2009 12:15:30 -0000	1.11
@@ -1 +1 @@
-eb3592a2fd89bb887c69d6acd6745839  qbittorrent-2417svn.tar.gz
+1a334937282ba95d78a4ab32c5f519d7  qbittorrent-1.4.0rc2.tar.gz



From pbrobinson at fedoraproject.org  Fri Aug  7 12:16:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:16:50 +0000 (UTC)
Subject: rpms/twitter-glib/devel twitter-glib.spec,1.2,1.3
Message-ID: <20090807121650.15BFC11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/twitter-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7777

Modified Files:
	twitter-glib.spec 
Log Message:
- Spec file cleanups


Index: twitter-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twitter-glib/devel/twitter-glib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- twitter-glib.spec	27 Jul 2009 06:24:30 -0000	1.2
+++ twitter-glib.spec	7 Aug 2009 12:16:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           twitter-glib
 Version:        0.9.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library wrapping the Twitter RESTful API
 
 Group:          System Environment/Libraries
@@ -9,9 +9,7 @@ URL:            http://live.gnome.org/Tw
 Source0:        http://www.gnome.org/~ebassi/source/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-BuildRequires: pkgconfig
 BuildRequires: libsoup-devel
 BuildRequires: json-glib-devel
 BuildRequires: gtk-doc
@@ -35,14 +33,14 @@ Files for development with %{name}.
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 #Remove libtool archives.
-rm -rf %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
 rm -rf %{buildroot}
@@ -62,9 +60,12 @@ rm -rf %{buildroot}
 %{_includedir}/twitter-glib-1.0
 %{_libdir}/libtwitter-glib-1.0.so
 %{_libdir}/pkgconfig/twitter-glib-1.0.pc
-%{_datadir}/gtk-doc/html/twitter-glib
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.8-3
+- A few minor spec file cleanups
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Fri Aug  7 12:17:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:17:52 +0000 (UTC)
Subject: rpms/gssdp/devel import.log,1.1,NONE
Message-ID: <20090807121752.792BC11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8042

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Fri Aug  7 12:24:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:24:11 +0000 (UTC)
Subject: rpms/gssdp/devel gssdp.spec,1.11,1.12
Message-ID: <20090807122411.6FAC311C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9230

Modified Files:
	gssdp.spec 
Log Message:
- some spec file cleanups


Index: gssdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gssdp/devel/gssdp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gssdp.spec	25 Jul 2009 01:34:46 -0000	1.11
+++ gssdp.spec	7 Aug 2009 12:24:11 -0000	1.12
@@ -54,15 +54,17 @@ This package contains developer document
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgssdp-1.0.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -85,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/gssdp
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-4



From leigh123linux at fedoraproject.org  Fri Aug  7 12:24:39 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri,  7 Aug 2009 12:24:39 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.25,1.26
Message-ID: <20090807122439.B40A311C00D7@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9348

Modified Files:
	qbittorrent.spec 
Log Message:
* Fri Aug 07 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.9.rc2
- correct prep section package name



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- qbittorrent.spec	7 Aug 2009 12:15:30 -0000	1.25
+++ qbittorrent.spec	7 Aug 2009 12:24:39 -0000	1.26
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.0
-Release: 0.8.rc2%{?dist}
+Release: 0.9.rc2%{?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
@@ -30,7 +30,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1 -b .qbittorrent_flag
 
 %build
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Aug 07 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.9.rc2
+- correct prep section package name
+
 * Fri Aug 07 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.8.rc2
 - update to 1.4.0rc2
 



From rdieter at fedoraproject.org  Fri Aug  7 12:25:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 12:25:40 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.56, 1.57 kde-settings-svn.sh, 
	1.2, 1.3 kde-settings.spec, 1.78, 1.79 sources, 1.57, 1.58
Message-ID: <20090807122540.47AC811C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9642

Modified Files:
	.cvsignore kde-settings-svn.sh kde-settings.spec sources 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-1
- upstream branch for F-12 (kde-4.3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	30 Apr 2009 18:40:34 -0000	1.56
+++ .cvsignore	7 Aug 2009 12:25:39 -0000	1.57
@@ -1 +1 @@
-kde-settings-4.2-20090430svn.tar.bz2
+kde-settings-4.3-1.tar.bz2


Index: kde-settings-svn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings-svn.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-settings-svn.sh	26 Jan 2009 21:08:05 -0000	1.2
+++ kde-settings-svn.sh	7 Aug 2009 12:25:40 -0000	1.3
@@ -1,7 +1,7 @@
 #/bin/sh
 
 DATE=$(date +%Y%m%d)
-EXPORT_DIR=kde-settings-4.2
+EXPORT_DIR=kde-settings-4.3
 
 set -x
 rm -rf $EXPORT_DIR


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- kde-settings.spec	25 Jul 2009 08:16:02 -0000	1.78
+++ kde-settings.spec	7 Aug 2009 12:25:40 -0000	1.79
@@ -1,21 +1,14 @@
-# THIS SPECFILE IS FOR F11 ONLY!
-# Sorry, it is just too different for conditionals to be worth it.
-# The actuall tarball also DIFFERS between releases!
-# Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
-
-%define svndate 20090430svn
+# THIS SPECFILE IS FOR F12 ONLY!
 
 Summary: Config files for kde
 Name:    kde-settings
-Version: 4.2
-Release: 11.%{svndate}%{?dist}
+Version: 4.3
+Release: 1
 
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: kde-settings-%{version}-%{svndate}.tar.bz2
-# used to generate Source0
-Source1: kde-settings-svn.sh
+Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{release}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -70,7 +63,7 @@ Requires: xine-lib-pulseaudio
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}-%{release}
 
 
 %build
@@ -158,6 +151,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-1
+- upstream branch for F-12 (kde-4.3)
+
 * Sat Jul 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2-11.20090430svn
 - rebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 - rename %%{rel} to %%{svndate} to fix automated bumps


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	30 Apr 2009 18:40:34 -0000	1.57
+++ sources	7 Aug 2009 12:25:40 -0000	1.58
@@ -1 +1 @@
-c49d47bdbfdd148edea664b3707fe668  kde-settings-4.2-20090430svn.tar.bz2
+1e5e73189228b70decbfad5e45f7848d  kde-settings-4.3-1.tar.bz2



From pbrobinson at fedoraproject.org  Fri Aug  7 12:30:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:30:09 +0000 (UTC)
Subject: rpms/gupnp/devel gupnp.spec,1.22,1.23
Message-ID: <20090807123009.9F96411C0439@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10674

Modified Files:
	gupnp.spec 
Log Message:
- some spec file cleanups


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gupnp.spec	25 Jul 2009 01:53:30 -0000	1.22
+++ gupnp.spec	7 Aug 2009 12:30:09 -0000	1.23
@@ -9,7 +9,7 @@ URL:            http://www.gupnp.org/
 Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gssdp-devel >= 0.6
+BuildRequires: gssdp-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk-doc
 BuildRequires: libsoup-devel
@@ -31,11 +31,11 @@ Requires: gssdp-devel
 Requires: pkgconfig
 Requires: libsoup-devel
 Requires: libxml2-devel
-Requires: e2fsprogs-devel
+Requires: libuuid-devel
 Requires: glib2-devel
 
 %description devel
-Files for development with gupnp.
+Files for development with %{name}.
 
 %package docs
 Summary: Documentation files for %{name}
@@ -52,15 +52,17 @@ This package contains developer document
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-1.0.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -81,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/gupnp
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.8-3



From pbrobinson at fedoraproject.org  Fri Aug  7 12:32:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:32:53 +0000 (UTC)
Subject: rpms/gupnp-av/devel gupnp-av.spec,1.12,1.13
Message-ID: <20090807123253.30D2A11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11270

Modified Files:
	gupnp-av.spec 
Log Message:
- some spec file cleanups


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/gupnp-av.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gupnp-av.spec	25 Jul 2009 01:53:43 -0000	1.12
+++ gupnp-av.spec	7 Aug 2009 12:32:53 -0000	1.13
@@ -25,7 +25,7 @@ GUPnP-AV is a collection of helpers for 
 applications using GUPnP.
 
 %package devel
-Summary: Development package for gupnp-av
+Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: gssdp-devel
@@ -33,7 +33,7 @@ Requires: gupnp-devel
 Requires: pkgconfig
 
 %description devel
-Files for development with gupnp-av.
+Files for development with %{name}.
 
 %package docs
 Summary: Documentation files for %{name}
@@ -50,15 +50,17 @@ This package contains developer document
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-av-1.0.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -78,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/gupnp-av/
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2



From pbrobinson at fedoraproject.org  Fri Aug  7 12:34:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:34:29 +0000 (UTC)
Subject: rpms/gupnp-tools/devel gupnp-tools.spec,1.14,1.15
Message-ID: <20090807123429.41C2911C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11637

Modified Files:
	gupnp-tools.spec 
Log Message:
- some spec file cleanups


Index: gupnp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-tools/devel/gupnp-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gupnp-tools.spec	25 Jul 2009 01:54:08 -0000	1.14
+++ gupnp-tools.spec	7 Aug 2009 12:34:29 -0000	1.15
@@ -13,7 +13,6 @@ BuildRequires: gupnp-devel
 BuildRequires: gupnp-av-devel
 BuildRequires: gssdp-devel
 BuildRequires: gtk2-devel
-BuildRequires: glib2-devel >= 2.12
 BuildRequires: libsoup-devel
 BuildRequires: libuuid-devel
 BuildRequires: gnome-icon-theme
@@ -33,11 +32,11 @@ DimmableLight v1.0 implementation. 
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor=gupnp \
 --delete-original --dir=%{buildroot}%{_datadir}/applications \
@@ -52,7 +51,7 @@ desktop-file-install --vendor=gupnp \
 %{buildroot}/%{_datadir}/applications/gupnp-universal-cp.desktop
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)



From pbrobinson at fedoraproject.org  Fri Aug  7 12:39:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:39:56 +0000 (UTC)
Subject: rpms/gupnp-ui/devel gupnp-ui.spec,1.5,1.6
Message-ID: <20090807123956.1716B11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12873

Modified Files:
	gupnp-ui.spec 
Log Message:
- some spec file cleanups


Index: gupnp-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-ui/devel/gupnp-ui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gupnp-ui.spec	30 Jul 2009 21:48:28 -0000	1.5
+++ gupnp-ui.spec	7 Aug 2009 12:39:55 -0000	1.6
@@ -14,7 +14,6 @@ BuildRequires: gssdp-devel
 BuildRequires: gupnp-devel
 BuildRequires: gtk2-devel
 BuildRequires: libsoup-devel
-BuildRequires: pkgconfig
 
 Requires: dbus
 
@@ -27,14 +26,14 @@ GUPnP-UI is a collection of helpers for 
 application components for gupnp applications.
 
 %package devel
-Summary: Development package for gupnp-ui
+Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: gtk2-devel
 Requires: pkgconfig
 
 %description devel
-Files for development with gupnp-ui.
+Files for development with %{name}.
 
 %package docs
 Summary: Documentation files for %{name}
@@ -52,15 +51,17 @@ This package contains developer document
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgupnp-ui-1.0.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -81,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/gupnp-ui
+%doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0.1.1-5



From kkofler at fedoraproject.org  Fri Aug  7 12:43:05 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  7 Aug 2009 12:43:05 +0000 (UTC)
Subject: rpms/xchat/F-11 xchat-2.8.6-connect-mnemonic.patch, NONE,
	1.1 xchat-2.8.4-redhat-desktop.patch, 1.2, 1.3 xchat.spec, 1.101,
	1.102
Message-ID: <20090807124305.7DAFE11C00D7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13596/F-11

Modified Files:
	xchat-2.8.4-redhat-desktop.patch xchat.spec 
Added Files:
	xchat-2.8.6-connect-mnemonic.patch 
Log Message:
Sync from devel:

* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Sat Jul 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-10
- Fixed patch for the "C_onnect" issue (#512034, Edward Sheldrake)

* Thu Jul 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-9
- Fix literal underscore in "C_onnect" button (#512034, Matthias Clasen)

* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-8
- Change Name in xchat.desktop to XChat IRC (#293841)

xchat-2.8.6-connect-mnemonic.patch:
 gtkutil.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xchat-2.8.6-connect-mnemonic.patch ---
diff -urp xchat-2.8.6.orig/src/fe-gtk/gtkutil.c xchat-2.8.6/src/fe-gtk/gtkutil.c
--- xchat-2.8.6.orig/src/fe-gtk/gtkutil.c	2009-07-18 11:25:02.000000000 +0100
+++ xchat-2.8.6/src/fe-gtk/gtkutil.c	2009-07-18 11:27:01.000000000 +0100
@@ -376,6 +376,7 @@ gtkutil_button (GtkWidget *box, char *st
 	{
 		gtk_button_set_label (GTK_BUTTON (wid), labeltext);
 		gtk_button_set_image (GTK_BUTTON (wid), gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU));
+		gtk_button_set_use_underline (GTK_BUTTON (wid), TRUE);
 		if (box)
 			gtk_container_add (GTK_CONTAINER (box), wid);
 	}

xchat-2.8.4-redhat-desktop.patch:
 xchat.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: xchat-2.8.4-redhat-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-11/xchat-2.8.4-redhat-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xchat-2.8.4-redhat-desktop.patch	5 Dec 2007 14:56:08 -0000	1.2
+++ xchat-2.8.4-redhat-desktop.patch	7 Aug 2009 12:43:05 -0000	1.3
@@ -1,26 +1,9 @@
 diff -ur xchat-2.8.4/xchat.desktop xchat-2.8.4-redhat-desktop/xchat.desktop
 --- xchat-2.8.4/xchat.desktop	2007-06-23 17:50:27.000000000 +0200
 +++ xchat-2.8.4-redhat-desktop/xchat.desktop	2007-07-04 12:00:46.000000000 +0200
-@@ -1,23 +1,10 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=XChat IRC
--Name[zh_TW]=????
--Comment[de]=IRC-Client
--Comment[es]=Aplicaci?n de IRC
--Comment[fi]=IRC-sovellus
--Comment[fr]=Client IRC
--Comment[hu]=IRC-kliens
--Comment[lt]=IRC klientas
--Comment[no]=IRC-klient
--Comment[pt_BR]=Cliente de IRC
--Comment[sl]=Odjemalec IRC
--Comment[sv]=IRC-klient
--Comment[ro]=Client de IRC
--Comment[zh_TW]=X-Chat ????
--Comment=Chat with other people using Internet Relay Chat
-+Name=IRC
-+Comment=X-Chat
+@@ -16,8 +16,8 @@
+ Comment[zh_TW]=X-Chat ????
+ Comment=Chat with other people using Internet Relay Chat
  Exec=xchat
 -Icon=xchat.png
 +Icon=xchat


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-11/xchat.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- xchat.spec	26 Feb 2009 08:00:41 -0000	1.101
+++ xchat.spec	7 Aug 2009 12:43:05 -0000	1.102
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   7%{?dist}
+Release:   11%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -27,6 +27,8 @@ Patch40: xchat-2.8.4-shm-pixmaps.patch
 # Both the "IRC" and "UTF-8" settings will try to accept both Latin1 and UTF-8
 # when it comes in, however "IRC" sends Latin1, "UTF-8" sends UTF-8.
 Patch41: xchat-2.8.6-default-utf8.patch
+# fix literal underscore in "C_onnect" button (#512034, Edward Sheldrake)
+Patch42: xchat-2.8.6-connect-mnemonic.patch
 
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -75,6 +77,7 @@ This package contains the X-Chat plugin 
 %patch35 -p1 -b .tray-icon
 %patch40 -p1 -b .shm-pixmaps
 %patch41 -p1 -b .default-utf8
+%patch42 -p1 -b .connect-mnemonic
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
@@ -164,6 +167,18 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-10
+- Fixed patch for the "C_onnect" issue (#512034, Edward Sheldrake)
+
+* Thu Jul 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-9
+- Fix literal underscore in "C_onnect" button (#512034, Matthias Clasen)
+
+* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-8
+- Change Name in xchat.desktop to XChat IRC (#293841)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Fri Aug  7 12:44:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:44:04 +0000 (UTC)
Subject: rpms/gupnp-vala/devel gupnp-vala.spec,1.6,1.7
Message-ID: <20090807124404.2E06B11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13858

Modified Files:
	gupnp-vala.spec 
Log Message:
- some spec file cleanups


Index: gupnp-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-vala/devel/gupnp-vala.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gupnp-vala.spec	25 Jul 2009 01:54:24 -0000	1.6
+++ gupnp-vala.spec	7 Aug 2009 12:44:04 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           gupnp-vala
 Version:        0.5.4
 Release:        3%{?dist}
-Summary:        GUPnP is a upnp framework. This adds vala language bindings
+Summary:        GUPnP is a uPnP framework. This adds vala language bindings
 
 Group:          Development/Languages
 License:        LGPLv2+
@@ -35,17 +35,17 @@ This package adds vala language bindings
 # The generated files are noarch, but configure need to be told the
 # real host alias for building
 %configure --target=%{_host_alias}
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 %check
 make check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)



From peter at fedoraproject.org  Fri Aug  7 12:44:55 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  7 Aug 2009 12:44:55 +0000 (UTC)
Subject: rpms/xerces-c/EL-4 xerces-c.spec,1.5,1.6
Message-ID: <20090807124455.06EBB11C00D7@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14029/EL-4

Modified Files:
	xerces-c.spec 
Log Message:
some rpmlint messages were suppressed, but I don't think they worths to rebuild packages


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/EL-4/xerces-c.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xerces-c.spec	6 Aug 2009 14:27:39 -0000	1.5
+++ xerces-c.spec	7 Aug 2009 12:44:54 -0000	1.6
@@ -1,8 +1,8 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
 Version:	2.7.0
-Release:	8%{?dist}
-License:	Apache Software License
+Release:	9%{?dist}
+License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
 Source0:	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
@@ -54,6 +54,13 @@ rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
+
+iconv -f iso8859-1 -t utf-8 credits.txt > credits.txt.conv && mv -f credits.txt.conv credits.txt;
+for i in feedback.xml migration.xml releases_archive.xml; do {
+	iconv -f iso8859-1 -t utf-8 doc/$i > doc/$i.conv && mv -f doc/$i.conv doc/$i;
+	};
+done;
+
 %patch0 -p0 -b .CVE-2009-1885
 
 %build
@@ -117,6 +124,9 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Fri Aug  7 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-9
+- Some rpmlint messages were suppressed (thanks to Xavier Bachelot)
+
 * Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
 - Fix CVE-2009-1885
 



From peter at fedoraproject.org  Fri Aug  7 12:44:55 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  7 Aug 2009 12:44:55 +0000 (UTC)
Subject: rpms/xerces-c/EL-5 xerces-c.spec,1.5,1.6
Message-ID: <20090807124455.376B011C00D7@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/xerces-c/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14029/EL-5

Modified Files:
	xerces-c.spec 
Log Message:
some rpmlint messages were suppressed, but I don't think they worths to rebuild packages


Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/EL-5/xerces-c.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xerces-c.spec	6 Aug 2009 14:26:47 -0000	1.5
+++ xerces-c.spec	7 Aug 2009 12:44:55 -0000	1.6
@@ -1,8 +1,8 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
 Version:	2.7.0
-Release:	8%{?dist}
-License:	Apache Software License
+Release:	9%{?dist}
+License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
 Source0:	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
@@ -54,6 +54,13 @@ rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
 %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
+
+iconv -f iso8859-1 -t utf-8 credits.txt > credits.txt.conv && mv -f credits.txt.conv credits.txt;
+for i in feedback.xml migration.xml releases_archive.xml; do {
+	iconv -f iso8859-1 -t utf-8 doc/$i > doc/$i.conv && mv -f doc/$i.conv doc/$i;
+	};
+done;
+
 %patch0 -p0 -b .CVE-2009-1885
 
 %build
@@ -117,6 +124,9 @@ export XERCESCROOT="$PWD"
 #%{_datadir}/%{name}/samples
 
 %changelog
+* Fri Aug  7 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-9
+- Some rpmlint messages were suppressed (thanks to Xavier Bachelot)
+
 * Thu Aug  6 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.0-8
 - Fix CVE-2009-1885
 



From drago01 at fedoraproject.org  Fri Aug  7 12:45:24 2009
From: drago01 at fedoraproject.org (drago01)
Date: Fri,  7 Aug 2009 12:45:24 +0000 (UTC)
Subject: rpms/compiz/devel compiz-gtk,1.11,1.12 compiz.spec,1.175,1.176
Message-ID: <20090807124524.A564311C00D7@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14158

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Enable directrendering and always-swap


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- compiz-gtk	9 Jun 2009 03:10:58 -0000	1.11
+++ compiz-gtk	7 Aug 2009 12:45:24 -0000	1.12
@@ -2,18 +2,18 @@
 
 function runCompiz() {
 	gtk-window-decorator &
-	exec compiz --ignore-desktop-hints glib gconf gnomecompat $@
+	exec compiz --ignore-desktop-hints --always-swap glib gconf gnomecompat $@
 }
 
 DIRECT=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
 ISSW=`glxinfo | grep "Software Rasterizer" -c`
 
-# Disabled for now, does not work as expected
-#HAVETFP=`glxinfo | grep texture_from_pixmap -c`
+# Try with direct rendering
+HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-#if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then 
-#	runCompiz $@
-#fi
+if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then 
+	runCompiz $@
+fi
 
 # Try again with indirect rendering
 export LIBGL_ALWAYS_INDIRECT=1


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- compiz.spec	1 Aug 2009 13:12:35 -0000	1.175
+++ compiz.spec	7 Aug 2009 12:45:24 -0000	1.176
@@ -14,7 +14,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -364,6 +364,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-10
+- Enable direct rendering and always-swap by default
+- Tearing free compiz for INTEL cards ;)
+
 * Sat Aug 01 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-9
 - Fix build
 



From drago01 at fedoraproject.org  Fri Aug  7 12:48:16 2009
From: drago01 at fedoraproject.org (drago01)
Date: Fri,  7 Aug 2009 12:48:16 +0000 (UTC)
Subject: rpms/compiz/devel compiz-gtk,1.12,1.13
Message-ID: <20090807124817.002E711C00D7@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15608

Modified Files:
	compiz-gtk 
Log Message:
fix software rendering check


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- compiz-gtk	7 Aug 2009 12:45:24 -0000	1.12
+++ compiz-gtk	7 Aug 2009 12:48:16 -0000	1.13
@@ -11,7 +11,7 @@ ISSW=`glxinfo | grep "Software Rasterize
 # Try with direct rendering
 HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then 
+if ( [ $HAVE3D == "Yes" ]  && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
 	runCompiz $@
 fi
 



From pbrobinson at fedoraproject.org  Fri Aug  7 12:53:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 12:53:02 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.4,1.5
Message-ID: <20090807125302.A333011C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16899

Modified Files:
	rygel.spec 
Log Message:
- Own rygel include dir, some spec file cleanups


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rygel.spec	27 Jul 2009 03:42:44 -0000	1.4
+++ rygel.spec	7 Aug 2009 12:53:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -21,7 +21,6 @@ BuildRequires: gstreamer-devel
 BuildRequires: GConf2-devel
 BuildRequires: libgee-devel >= 0.1.5
 BuildRequires: libsoup-devel
-BuildRequires: pkgconfig
 
 %description
 Rygel is an implementation of the UPnP MediaServer V 2.0 specification that is 
@@ -29,36 +28,36 @@ specifically designed for GNOME. It is b
 in Vala language. The project was previously known as gupnp-media-server. 
 
 %package devel
-Summary: Development package for rygel
+Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
-Files for development with rygel.
+Files for development with %{name}.
 
 %package tracker
-Summary: Tracker plugin for rygel
+Summary: Tracker plugin for %{name}
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: tracker
 
 %description tracker
-A plugin for rygel to use tracker to locate media on the local machine
+A plugin for rygel to use tracker to locate media on the local machine.
 
 %prep
 %setup -q
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
-rm -rf %{buildroot}/%{_libdir}/rygel-1.0/*.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
 rm -rf %{buildroot}
@@ -80,12 +79,15 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/rygel-1.0/rygel.h
+%{_includedir}/rygel-1.0
 %{_libdir}/pkgconfig/rygel-1.0.pc
 %{_datadir}/vala/vapi/rygel-1.0.deps
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-5
+- Own rygel include dir, some spec file cleanups
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From icon at fedoraproject.org  Fri Aug  7 12:53:59 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Fri,  7 Aug 2009 12:53:59 +0000 (UTC)
Subject: rpms/python-feedparser/EL-4 democracynow_feedparser_fix.patch, NONE,
	1.1 python-feedparser.spec, 1.6, 1.7
Message-ID: <20090807125359.1565611C00D7@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17106/EL-4

Modified Files:
	python-feedparser.spec 
Added Files:
	democracynow_feedparser_fix.patch 
Log Message:
Apply patch for title-munging issue (#491373)


democracynow_feedparser_fix.patch:
 feedparser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE democracynow_feedparser_fix.patch ---
--- feedparser.py.orig	2007-12-28 00:59:15.000000000 +0100
+++ feedparser.py	2007-12-28 00:59:46.000000000 +0100
@@ -563,7 +563,7 @@
 
     def mapContentType(self, contentType):
         contentType = contentType.lower()
-        if contentType == 'text':
+        if contentType == 'text' or contentType == 'plain':
             contentType = 'text/plain'
         elif contentType == 'html':
             contentType = 'text/html'


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/EL-4/python-feedparser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-feedparser.spec	27 Dec 2008 19:12:50 -0000	1.6
+++ python-feedparser.spec	7 Aug 2009 12:53:58 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://feedparser.org/
 Source0:        http://download.sourceforge.net/feedparser/feedparser-%{version}.zip
 Patch0:         feedparser_utf8_decoding.patch
+Patch1:         democracynow_feedparser_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,6 +29,7 @@ modules, including Dublin Core and Apple
 %prep
 %setup -q -c
 %patch0 -p0 -b .utf8_decoding
+%patch1 -p0 -b .title_munging
 find -type f -exec sed -i 's/\r//' {} ';'
 find -type f -exec chmod 0644 {} ';'
 
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-5
+- Apply patch for title munging issue (#491373)
+
 * Sat Dec 27 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-4
 - fix license tag
 - Patch for a utf8 decoding issue (#477024)



From icon at fedoraproject.org  Fri Aug  7 12:53:59 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Fri,  7 Aug 2009 12:53:59 +0000 (UTC)
Subject: rpms/python-feedparser/EL-5 democracynow_feedparser_fix.patch, NONE,
	1.1 python-feedparser.spec, 1.5, 1.6
Message-ID: <20090807125359.4DD0C11C00D7@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17106/EL-5

Modified Files:
	python-feedparser.spec 
Added Files:
	democracynow_feedparser_fix.patch 
Log Message:
Apply patch for title-munging issue (#491373)


democracynow_feedparser_fix.patch:
 feedparser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE democracynow_feedparser_fix.patch ---
--- feedparser.py.orig	2007-12-28 00:59:15.000000000 +0100
+++ feedparser.py	2007-12-28 00:59:46.000000000 +0100
@@ -563,7 +563,7 @@
 
     def mapContentType(self, contentType):
         contentType = contentType.lower()
-        if contentType == 'text':
+        if contentType == 'text' or contentType == 'plain':
             contentType = 'text/plain'
         elif contentType == 'html':
             contentType = 'text/html'


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/EL-5/python-feedparser.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-feedparser.spec	5 Jun 2009 14:12:35 -0000	1.5
+++ python-feedparser.spec	7 Aug 2009 12:53:59 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://feedparser.org/
 Source0:        http://feedparser.googlecode.com/files/feedparser-%{version}.zip
 Patch0:         feedparser_utf8_decoding.patch
+Patch1:         democracynow_feedparser_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@ modules, including Dublin Core and Apple
 %prep
 %setup -q -c
 %patch0 -p0 -b .utf8_decoding
+%patch1 -p0 -b .title_munging
 find -type f -exec sed -i 's/\r//' {} ';'
 find -type f -exec chmod 0644 {} ';'
 
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-10
+- Apply patch for title munging issue (#491373)
+
 * Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 4.1-9
 - Use setuptools to generate egg-info
 



From icon at fedoraproject.org  Fri Aug  7 12:54:00 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Fri,  7 Aug 2009 12:54:00 +0000 (UTC)
Subject: rpms/python-feedparser/devel democracynow_feedparser_fix.patch, NONE,
	1.1 python-feedparser.spec, 1.11, 1.12
Message-ID: <20090807125400.1A04411C00D7@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17106/devel

Modified Files:
	python-feedparser.spec 
Added Files:
	democracynow_feedparser_fix.patch 
Log Message:
Apply patch for title-munging issue (#491373)


democracynow_feedparser_fix.patch:
 feedparser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE democracynow_feedparser_fix.patch ---
--- feedparser.py.orig	2007-12-28 00:59:15.000000000 +0100
+++ feedparser.py	2007-12-28 00:59:46.000000000 +0100
@@ -563,7 +563,7 @@
 
     def mapContentType(self, contentType):
         contentType = contentType.lower()
-        if contentType == 'text':
+        if contentType == 'text' or contentType == 'plain':
             contentType = 'text/plain'
         elif contentType == 'html':
             contentType = 'text/html'


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/python-feedparser.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-feedparser.spec	26 Jul 2009 20:23:00 -0000	1.11
+++ python-feedparser.spec	7 Aug 2009 12:53:59 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://feedparser.org/
 Source0:        http://feedparser.googlecode.com/files/feedparser-%{version}.zip
 Patch0:         feedparser_utf8_decoding.patch
+Patch1:         democracynow_feedparser_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@ modules, including Dublin Core and Apple
 %prep
 %setup -q -c
 %patch0 -p0 -b .utf8_decoding
+%patch1 -p0 -b .title_munging
 find -type f -exec sed -i 's/\r//' {} ';'
 find -type f -exec chmod 0644 {} ';'
 
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-10
+- Apply patch for title munging issue (#491373)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From icon at fedoraproject.org  Fri Aug  7 12:53:59 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Fri,  7 Aug 2009 12:53:59 +0000 (UTC)
Subject: rpms/python-feedparser/F-11 democracynow_feedparser_fix.patch, NONE,
	1.1 python-feedparser.spec, 1.10, 1.11
Message-ID: <20090807125359.D378E11C00D7@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17106/F-11

Modified Files:
	python-feedparser.spec 
Added Files:
	democracynow_feedparser_fix.patch 
Log Message:
Apply patch for title-munging issue (#491373)


democracynow_feedparser_fix.patch:
 feedparser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE democracynow_feedparser_fix.patch ---
--- feedparser.py.orig	2007-12-28 00:59:15.000000000 +0100
+++ feedparser.py	2007-12-28 00:59:46.000000000 +0100
@@ -563,7 +563,7 @@
 
     def mapContentType(self, contentType):
         contentType = contentType.lower()
-        if contentType == 'text':
+        if contentType == 'text' or contentType == 'plain':
             contentType = 'text/plain'
         elif contentType == 'html':
             contentType = 'text/html'


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/F-11/python-feedparser.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-feedparser.spec	4 Mar 2009 18:27:40 -0000	1.10
+++ python-feedparser.spec	7 Aug 2009 12:53:59 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        8%{?dist}
+Release:        10%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://feedparser.org/
 Source0:        http://feedparser.googlecode.com/files/feedparser-%{version}.zip
 Patch0:         feedparser_utf8_decoding.patch
+Patch1:         democracynow_feedparser_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@ modules, including Dublin Core and Apple
 %prep
 %setup -q -c
 %patch0 -p0 -b .utf8_decoding
+%patch1 -p0 -b .title_munging
 find -type f -exec sed -i 's/\r//' {} ';'
 find -type f -exec chmod 0644 {} ';'
 
@@ -52,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-10
+- Apply patch for title munging issue (#491373)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar 04 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-8
 - Fix source URL (moved to googlecode).
 



From icon at fedoraproject.org  Fri Aug  7 12:53:59 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Fri,  7 Aug 2009 12:53:59 +0000 (UTC)
Subject: rpms/python-feedparser/F-10 democracynow_feedparser_fix.patch, NONE,
	1.1 python-feedparser.spec, 1.6, 1.7
Message-ID: <20090807125359.8988B11C00D7@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17106/F-10

Modified Files:
	python-feedparser.spec 
Added Files:
	democracynow_feedparser_fix.patch 
Log Message:
Apply patch for title-munging issue (#491373)


democracynow_feedparser_fix.patch:
 feedparser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE democracynow_feedparser_fix.patch ---
--- feedparser.py.orig	2007-12-28 00:59:15.000000000 +0100
+++ feedparser.py	2007-12-28 00:59:46.000000000 +0100
@@ -563,7 +563,7 @@
 
     def mapContentType(self, contentType):
         contentType = contentType.lower()
-        if contentType == 'text':
+        if contentType == 'text' or contentType == 'plain':
             contentType = 'text/plain'
         elif contentType == 'html':
             contentType = 'text/html'


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/F-10/python-feedparser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-feedparser.spec	27 Dec 2008 18:43:10 -0000	1.6
+++ python-feedparser.spec	7 Aug 2009 12:53:59 -0000	1.7
@@ -2,14 +2,15 @@
 
 Name:           python-feedparser
 Version:        4.1
-Release:        5%{?dist}
+Release:        10%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://feedparser.org/
-Source0:        http://download.sourceforge.net/feedparser/feedparser-%{version}.zip
+Source0:        http://feedparser.googlecode.com/files/feedparser-%{version}.zip
 Patch0:         feedparser_utf8_decoding.patch
+Patch1:         democracynow_feedparser_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@ modules, including Dublin Core and Apple
 %prep
 %setup -q -c
 %patch0 -p0 -b .utf8_decoding
+%patch1 -p0 -b .title_munging
 find -type f -exec sed -i 's/\r//' {} ';'
 find -type f -exec chmod 0644 {} ';'
 
@@ -52,9 +54,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Dec 27 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-5
+* Fri Aug 07 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-10
+- Apply patch for title munging issue (#491373)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Mar 04 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-8
+- Fix source URL (moved to googlecode).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Dec 27 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-6
 - Patch for a utf8 decoding issue (#477024)
 
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.1-5
+- Rebuild for Python 2.6
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.1-4
 - fix license tag
 



From tbzatek at fedoraproject.org  Fri Aug  7 12:55:53 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri,  7 Aug 2009 12:55:53 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch, 
	NONE, 1.1 gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch, 
	NONE, 1.1 gvfs-archive-integration.patch, 1.1, 1.2 gvfs.spec,
	1.141, 1.142
Message-ID: <20090807125553.0EDC611C00D7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17943

Modified Files:
	gvfs-archive-integration.patch gvfs.spec 
Added Files:
	gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch 
	gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch 
Log Message:
* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.3-3
- Fix bad mount prefix stripping (part of #509612)
- Fix gvfsd-sftp segfault when asking a question
- Enable tar+xz in the archive mounter


gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch:
 gvfsbackendsftp.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch ---
>From 54a2ed675de586102462415fce72ed28aa7e2388 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 7 Aug 2009 11:29:11 +0200
Subject: [PATCH] =?UTF-8?q?Bug=20589434=20=E2=80=93=20gvfsd-sftp=20crashed=20with=20SIGSEGV=20in=20strlen()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pass correct pointer to the choices struct
---
 daemon/gvfsbackendsftp.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 3b510a7..b32d11b 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -1034,7 +1034,6 @@ handle_login (GVfsBackend *backend,
                strstr (buffer, "Key fingerprint:") != NULL)
         {
 	  const gchar *choices[] = {_("Log In Anyway"), _("Cancel Login")};
-	  const gchar *v_choices = (const gchar *)choices;
 	  const gchar *choice_string;
 	  gchar *hostname = NULL;
 	  gchar *fingerprint = NULL;
@@ -1055,7 +1054,7 @@ handle_login (GVfsBackend *backend,
 
 	  if (!g_mount_source_ask_question (mount_source,
 					    message,
-					    &v_choices,
+					    (const gchar **) &choices,
 					    2,
 					    &aborted,
 					    &choice) || 
-- 
1.6.4


gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch:
 gdaemonfile.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch ---
>From 3ba4f3e3deae84cbd5ffe8e7bfd2803d96e7e2e6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed, 5 Aug 2009 16:50:28 +0200
Subject: [PATCH] Don't strip mount prefix when returning local mapped path

On complex URIs like 'dav://server/gallery/w/TestAlbum',
g_file_get_path () would return malformed path with the middle
path '/gallery/w' stripped. This patch ensures full path to be
returned.

See bug #590862 for more details.
---
 client/gdaemonfile.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 8e14929..be9baef 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -167,7 +167,6 @@ g_daemon_file_get_path (GFile *file)
 {
   GDaemonFile *daemon_file = G_DAEMON_FILE (file);
   GMountInfo *mount_info;
-  const char *rel_path;
   char *path;
 
   /* This is a sync i/o call, which is a bit unfortunate, as
@@ -185,12 +184,7 @@ g_daemon_file_get_path (GFile *file)
   path = NULL;
   
   if (mount_info->fuse_mountpoint)
-    {
-      rel_path = daemon_file->path +
-	strlen (mount_info->mount_spec->mount_prefix);
-
-      path = g_build_filename (mount_info->fuse_mountpoint, rel_path, NULL);
-    }
+    path = g_build_filename (mount_info->fuse_mountpoint, daemon_file->path, NULL);
   
   g_mount_info_unref (mount_info);
   
-- 
1.6.4


gvfs-archive-integration.patch:
 Makefile.am                 |   16 ++++++++++++++++
 mount-archive.desktop.in.in |   14 ++++++++++++++
 2 files changed, 30 insertions(+)

Index: gvfs-archive-integration.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs-archive-integration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gvfs-archive-integration.patch	14 Jul 2009 03:08:46 -0000	1.1
+++ gvfs-archive-integration.patch	7 Aug 2009 12:55:52 -0000	1.2
@@ -39,7 +39,7 @@ diff -up /dev/null gvfs-1.3.2/mount-arch
 +_Name=Archive Mounter
 +Exec=@libexecdir@/gvfsd-archive file=%u
 +X-Gnome-Vfs-System=gio
-+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;
++MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;application/x-xz-compressed-tar;
 +Terminal=false
 +StartupNotify=false
 +Type=Application


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- gvfs.spec	4 Aug 2009 15:42:43 -0000	1.141
+++ gvfs.spec	7 Aug 2009 12:55:52 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,7 +40,13 @@ Patch2: gvfs-1.3.4-output-stream-callbac
 # smb url don't work in the run application dialog
 # http://bugzilla.gnome.org/show_bug.cgi?id=573994
 Patch3: gvfs-1.3.4-smb-browse-fake-content-type.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=497631 
+# Bad mount prefix stripping in g_daemon_file_get_path()
+# http://bugzilla.gnome.org/show_bug.cgi?id=590862
+Patch4: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
+# gvfsd-sftp crashed with SIGSEGV in strlen()
+# http://bugzilla.gnome.org/show_bug.cgi?id=589434
+Patch5: gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=497631
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
 Patch9: gvfs-1.2.3-sftp-40sec-timeout.patch
@@ -89,7 +95,7 @@ shares (SMB) to applications using gvfs.
 Summary: Archiving support for gvfs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-BuildRequires: libarchive-devel >= libarchive-2.5.903a-2
+BuildRequires: libarchive-devel >= libarchive-2.7.1-1
 
 %description archive
 This package provides support for accessing files inside Zip and Tar archives,
@@ -130,6 +136,8 @@ media players (Media Transfer Protocol) 
 %patch1 -p1 -b .archive-integration
 %patch2 -p1 -b .gedit-segfault
 %patch3 -p1 -b .smb-fake-content-type
+%patch4 -p1 -b .mount-prefix
+%patch5 -p1 -b .sftp-choices-segfault
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 
@@ -278,6 +286,11 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.3-3
+- Fix bad mount prefix stripping (part of #509612)
+- Fix gvfsd-sftp segfault when asking a question
+- Enable tar+xz in the archive mounter
+
 * Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.3-2
 - Fix gedit crashed with SEGV in strlen()
 - Fix SMB protocol not handled when opening from a bookmark (#509832)



From jreznik at fedoraproject.org  Fri Aug  7 12:57:03 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  7 Aug 2009 12:57:03 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.10,
	1.11 kde-plasma-runcommand.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20090807125703.BF5EF11C00D7@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18378

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
- update to 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 08:22:02 -0000	1.10
+++ .cvsignore	7 Aug 2009 12:57:03 -0000	1.11
@@ -1 +1 @@
-91495-runcommand-1.4.tar.bz2
+91495-runcommand-2.0.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kde-plasma-runcommand.spec	4 Aug 2009 08:22:02 -0000	1.13
+++ kde-plasma-runcommand.spec	7 Aug 2009 12:57:03 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        1.4
+Version:        2.0
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
+- update to 2.0
+
 * Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
 - update to 1.4
 - gettext BR removed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Aug 2009 08:22:02 -0000	1.10
+++ sources	7 Aug 2009 12:57:03 -0000	1.11
@@ -1 +1 @@
-1f483eefe383d88ae646267c94417380  91495-runcommand-1.4.tar.bz2
+f6564295ce60a7622d03a50767a5c4bb  91495-runcommand-2.0.tar.bz2



From rdieter at fedoraproject.org  Fri Aug  7 12:58:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 12:58:11 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-10 .cvsignore, 1.2,
	1.3 oxygen-icon-theme.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090807125811.D0F6811C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/oxygen-icon-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18693/F-10

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Apr 2009 23:12:58 -0000	1.2
+++ .cvsignore	7 Aug 2009 12:58:11 -0000	1.3
@@ -1 +1 @@
-kdebase-runtime-4.2.2.tar.bz2
+oxygen-icons-4.3.0.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-10/oxygen-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oxygen-icon-theme.spec	1 Apr 2009 23:12:58 -0000	1.1
+++ oxygen-icon-theme.spec	7 Aug 2009 12:58:11 -0000	1.2
@@ -1,46 +1,30 @@
-
-%define icons_svg 1
-
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.2.2
+Version:       4.3.0
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/oxygen-icons-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
+BuildRequires: kde-filesystem
 
-# Most of the following deps are bogus in this context, needed only 
-# because we're curerntly building from kdebase-runtime tarball.
-# upstream will provide standalone oxygen-icon-theme tarballs soon.
-BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: OpenEXR-devel
-BuildRequires: openssl-devel
-BuildRequires: pkgconfig
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel
+# some icons moved here in older kdepim's...
+#Conflicts: kdepim < 4.2.85
 
-%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+Obsoletes: oxygen-icon-theme-scalable < 4.2.85 
 
 
 %description
 %{summary}.
 
-%package scalable
-Summary: Oxygen icon theme, scalable(svg) icons
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-%description scalable
-%{summary}.
 
 %prep
-%setup -q -n kdebase-runtime-%{version}
+%setup -q -n oxygen-icons-%{version}
 
 
 %build
@@ -49,20 +33,13 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
+make %{?_smp_mflags} -C %{_target_platform} 
+
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
-
-%if 0%{?icons_svg}
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
-sed -e "s|^%{buildroot}||" svg.list > svg-include.list
-sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
-%else
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
-  xargs --no-run-if-empty rm -fv
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -81,37 +58,35 @@ touch --no-create %{_kde4_iconsdir}/oxyg
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 fi
 
-%if 0%{?icons_svg}
-%post scalable
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%posttrans scalable
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+%files 
+%defattr(-,root,root,-)
+%doc AUTHORS CONTRIBUTING COPYING TODO*
+%{_kde4_iconsdir}/oxygen/
 
-%postun scalable
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
 
+%changelog
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-%files %{?icons_svg:-f svg-exclude.list}
-%defattr(-,root,root,-)
-%doc pics/oxygen/AUTHORS
-%doc pics/oxygen/CONTRIBUTING
-%doc pics/oxygen/COPYING
-%doc pics/oxygen/TODO*
-#{_kde4_iconsdir}/default.kde4
-%{_kde4_iconsdir}/oxygen/
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-%if 0%{?icons_svg}
-%files scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
+* Mon Jul 13 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-1
+- oxygen-icons-4.2.85
 
-%changelog
 * Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
 - kde-4.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Apr 2009 23:12:58 -0000	1.2
+++ sources	7 Aug 2009 12:58:11 -0000	1.3
@@ -1 +1 @@
-cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2
+26b63e75f9f198f91a022e5f198119bb  oxygen-icons-4.3.0.tar.bz2



From rdieter at fedoraproject.org  Fri Aug  7 12:58:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 12:58:12 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-11 .cvsignore, 1.2,
	1.3 oxygen-icon-theme.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090807125812.0A26611C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/oxygen-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18693/F-11

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Mar 2009 15:57:58 -0000	1.2
+++ .cvsignore	7 Aug 2009 12:58:11 -0000	1.3
@@ -1 +1 @@
-kdebase-runtime-4.2.2.tar.bz2
+oxygen-icons-4.3.0.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-11/oxygen-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oxygen-icon-theme.spec	31 Mar 2009 15:57:58 -0000	1.1
+++ oxygen-icon-theme.spec	7 Aug 2009 12:58:11 -0000	1.2
@@ -1,46 +1,30 @@
-
-%define icons_svg 1
-
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.2.2
+Version:       4.3.0
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/oxygen-icons-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
+BuildRequires: kde-filesystem
 
-# Most of the following deps are bogus in this context, needed only 
-# because we're curerntly building from kdebase-runtime tarball.
-# upstream will provide standalone oxygen-icon-theme tarballs soon.
-BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: OpenEXR-devel
-BuildRequires: openssl-devel
-BuildRequires: pkgconfig
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel
+# some icons moved here in older kdepim's...
+#Conflicts: kdepim < 4.2.85
 
-%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+Obsoletes: oxygen-icon-theme-scalable < 4.2.85 
 
 
 %description
 %{summary}.
 
-%package scalable
-Summary: Oxygen icon theme, scalable(svg) icons
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-%description scalable
-%{summary}.
 
 %prep
-%setup -q -n kdebase-runtime-%{version}
+%setup -q -n oxygen-icons-%{version}
 
 
 %build
@@ -49,20 +33,13 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
+make %{?_smp_mflags} -C %{_target_platform} 
+
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
-
-%if 0%{?icons_svg}
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
-sed -e "s|^%{buildroot}||" svg.list > svg-include.list
-sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
-%else
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
-  xargs --no-run-if-empty rm -fv
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -81,37 +58,35 @@ touch --no-create %{_kde4_iconsdir}/oxyg
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 fi
 
-%if 0%{?icons_svg}
-%post scalable
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%posttrans scalable
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+%files 
+%defattr(-,root,root,-)
+%doc AUTHORS CONTRIBUTING COPYING TODO*
+%{_kde4_iconsdir}/oxygen/
 
-%postun scalable
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-fi
-%endif
 
+%changelog
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
 
-%files %{?icons_svg:-f svg-exclude.list}
-%defattr(-,root,root,-)
-%doc pics/oxygen/AUTHORS
-%doc pics/oxygen/CONTRIBUTING
-%doc pics/oxygen/COPYING
-%doc pics/oxygen/TODO*
-#{_kde4_iconsdir}/default.kde4
-%{_kde4_iconsdir}/oxygen/
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-%if 0%{?icons_svg}
-%files scalable -f svg-include.list
-%defattr(-,root,root,-)
-%endif
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
+* Mon Jul 13 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-1
+- oxygen-icons-4.2.85
 
-%changelog
 * Tue Mar 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-1
 - kde-4.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Mar 2009 15:57:58 -0000	1.2
+++ sources	7 Aug 2009 12:58:11 -0000	1.3
@@ -1 +1 @@
-cff3fbdb98faeec0ae65d8caea7a5b0f  kdebase-runtime-4.2.2.tar.bz2
+26b63e75f9f198f91a022e5f198119bb  oxygen-icons-4.3.0.tar.bz2



From hedayat at fedoraproject.org  Fri Aug  7 13:00:05 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri,  7 Aug 2009 13:00:05 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/devel .cvsignore, 1.3,
	1.4 gnome-applet-jalali-calendar.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090807130005.897F311C0439@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19341

Modified Files:
	.cvsignore gnome-applet-jalali-calendar.spec sources 
Log Message:
New upstream version 1.6.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Mar 2009 17:39:50 -0000	1.3
+++ .cvsignore	7 Aug 2009 13:00:05 -0000	1.4
@@ -1 +1 @@
-jalali-calendar-1.6.7.tar.bz2
+jalali-calendar-1.6.8.tar.bz2


Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-applet-jalali-calendar.spec	25 Jul 2009 00:33:14 -0000	1.5
+++ gnome-applet-jalali-calendar.spec	7 Aug 2009 13:00:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-applet-jalali-calendar
-Version:        1.6.7
-Release:        2%{?dist}
+Version:        1.6.8
+Release:        1%{?dist}
 Summary:        Jalali calendar panel applet for GNOME
 
 Group:          User Interface/Desktops
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_datadir}/jalali-calendar
 
 %changelog
+* Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.8-1
+- Updated to 1.6.8 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Mar 2009 17:39:51 -0000	1.3
+++ sources	7 Aug 2009 13:00:05 -0000	1.4
@@ -1 +1 @@
-126751a8212d09df5c6029f599ae71bd  jalali-calendar-1.6.7.tar.bz2
+0f63d33f6d7060fe5eb5fe22f981c97f  jalali-calendar-1.6.8.tar.bz2



From jreznik at fedoraproject.org  Fri Aug  7 13:04:28 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  7 Aug 2009 13:04:28 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-11 .cvsignore, 1.10,
	1.11 kde-plasma-runcommand.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <20090807130428.8EA7611C00D7@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20714

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
- update to 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 08:30:43 -0000	1.10
+++ .cvsignore	7 Aug 2009 13:04:28 -0000	1.11
@@ -1 +1 @@
-91495-runcommand-1.4.tar.bz2
+91495-runcommand-2.0.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/kde-plasma-runcommand.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- kde-plasma-runcommand.spec	4 Aug 2009 08:30:43 -0000	1.12
+++ kde-plasma-runcommand.spec	7 Aug 2009 13:04:28 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        1.4
+Version:        2.0
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
+- update to 2.0
+
 * Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
 - update to 1.4
 - gettext BR removed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Aug 2009 08:30:43 -0000	1.10
+++ sources	7 Aug 2009 13:04:28 -0000	1.11
@@ -1 +1 @@
-1f483eefe383d88ae646267c94417380  91495-runcommand-1.4.tar.bz2
+f6564295ce60a7622d03a50767a5c4bb  91495-runcommand-2.0.tar.bz2



From hedayat at fedoraproject.org  Fri Aug  7 13:09:16 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri,  7 Aug 2009 13:09:16 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/F-11 .cvsignore, 1.3,
	1.4 gnome-applet-jalali-calendar.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090807130916.3C04111C00D7@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22656

Modified Files:
	.cvsignore gnome-applet-jalali-calendar.spec sources 
Log Message:
New upstream version 1.6.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Mar 2009 17:39:50 -0000	1.3
+++ .cvsignore	7 Aug 2009 13:09:15 -0000	1.4
@@ -1 +1 @@
-jalali-calendar-1.6.7.tar.bz2
+jalali-calendar-1.6.8.tar.bz2


Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-11/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-applet-jalali-calendar.spec	21 Mar 2009 17:39:51 -0000	1.4
+++ gnome-applet-jalali-calendar.spec	7 Aug 2009 13:09:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           gnome-applet-jalali-calendar
-Version:        1.6.7
+Version:        1.6.8
 Release:        1%{?dist}
 Summary:        Jalali calendar panel applet for GNOME
 
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_datadir}/jalali-calendar
 
 %changelog
+* Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.8-1
+- Updated to 1.6.8 release
+
 * Sat Mar 21 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.7-1
 - Updated to 1.6.7 release (which contains info about year 1388)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Mar 2009 17:39:51 -0000	1.3
+++ sources	7 Aug 2009 13:09:16 -0000	1.4
@@ -1 +1 @@
-126751a8212d09df5c6029f599ae71bd  jalali-calendar-1.6.7.tar.bz2
+0f63d33f6d7060fe5eb5fe22f981c97f  jalali-calendar-1.6.8.tar.bz2



From jreznik at fedoraproject.org  Fri Aug  7 13:14:32 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  7 Aug 2009 13:14:32 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel kde-plasma-runcommand.spec, 1.14, 
	1.15
Message-ID: <20090807131432.60FAE11C00D7@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23439

Modified Files:
	kde-plasma-runcommand.spec 
Log Message:
* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
- gettext BR readded



Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kde-plasma-runcommand.spec	7 Aug 2009 12:57:03 -0000	1.14
+++ kde-plasma-runcommand.spec	7 Aug 2009 13:14:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@ Source0:        http://www.kde-look.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -47,6 +48,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
+- gettext BR readded
+
 * Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
 - update to 2.0
 



From jreznik at fedoraproject.org  Fri Aug  7 13:22:17 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  7 Aug 2009 13:22:17 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-11 kde-plasma-runcommand.spec, 1.13,
	1.14
Message-ID: <20090807132217.CA1B411C00D7@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26906

Modified Files:
	kde-plasma-runcommand.spec 
Log Message:
* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
- gettext BR readded



Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-11/kde-plasma-runcommand.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kde-plasma-runcommand.spec	7 Aug 2009 13:04:28 -0000	1.13
+++ kde-plasma-runcommand.spec	7 Aug 2009 13:22:17 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@ Source0:        http://www.kde-look.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -47,6 +48,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
+- gettext BR readded
+
 * Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
 - update to 2.0
 



From tbzatek at fedoraproject.org  Fri Aug  7 13:23:01 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri,  7 Aug 2009 13:23:01 +0000 (UTC)
Subject: rpms/gvfs/F-11
	gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch, NONE,
	1.1 gvfs.spec, 1.140, 1.141
Message-ID: <20090807132301.0807B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27227

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch 
Log Message:
* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-10
- Fix bad mount prefix stripping (part of #509612)


gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch:
 gdaemonfile.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch ---
>From 3ba4f3e3deae84cbd5ffe8e7bfd2803d96e7e2e6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed, 5 Aug 2009 16:50:28 +0200
Subject: [PATCH] Don't strip mount prefix when returning local mapped path

On complex URIs like 'dav://server/gallery/w/TestAlbum',
g_file_get_path () would return malformed path with the middle
path '/gallery/w' stripped. This patch ensures full path to be
returned.

See bug #590862 for more details.
---
 client/gdaemonfile.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 8e14929..be9baef 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -167,7 +167,6 @@ g_daemon_file_get_path (GFile *file)
 {
   GDaemonFile *daemon_file = G_DAEMON_FILE (file);
   GMountInfo *mount_info;
-  const char *rel_path;
   char *path;
 
   /* This is a sync i/o call, which is a bit unfortunate, as
@@ -185,12 +184,7 @@ g_daemon_file_get_path (GFile *file)
   path = NULL;
   
   if (mount_info->fuse_mountpoint)
-    {
-      rel_path = daemon_file->path +
-	strlen (mount_info->mount_spec->mount_prefix);
-
-      path = g_build_filename (mount_info->fuse_mountpoint, rel_path, NULL);
-    }
+    path = g_build_filename (mount_info->fuse_mountpoint, daemon_file->path, NULL);
   
   g_mount_info_unref (mount_info);
   
-- 
1.6.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- gvfs.spec	4 Aug 2009 15:48:09 -0000	1.140
+++ gvfs.spec	7 Aug 2009 13:23:00 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -43,6 +43,9 @@ Patch5: gvfs-1.2.3-sftp-40sec-timeout.pa
 # smb url don't work in the run application dialog 
 # http://bugzilla.gnome.org/show_bug.cgi?id=573994 
 Patch6: gvfs-1.3.4-smb-browse-fake-content-type.patch
+# Bad mount prefix stripping in g_daemon_file_get_path()
+# http://bugzilla.gnome.org/show_bug.cgi?id=590862
+Patch7: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -178,6 +181,7 @@ media players (Media Transfer Protocol) 
 %patch4 -p1 -b .cdda-query
 %patch5 -p1 -b .sftp-timeout
 %patch6 -p1 -b .smb-fake-content-type
+%patch7 -p1 -b .mount-prefix
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -343,6 +347,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-10
+- Fix bad mount prefix stripping (part of #509612)
+
 * Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-9
 - Fix SMB protocol not handled when opening from a bookmark (#509832)
 



From jreznik at fedoraproject.org  Fri Aug  7 13:30:44 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  7 Aug 2009 13:30:44 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.8,
	1.9 kde-plasma-runcommand.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20090807133044.871A311C034A@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28965

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
- gettext BR readded

* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
- update to 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Aug 2009 08:35:06 -0000	1.8
+++ .cvsignore	7 Aug 2009 13:30:44 -0000	1.9
@@ -1 +1 @@
-91495-runcommand-1.4.tar.bz2
+91495-runcommand-2.0.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kde-plasma-runcommand.spec	4 Aug 2009 08:35:06 -0000	1.9
+++ kde-plasma-runcommand.spec	7 Aug 2009 13:30:44 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        1.4
-Release:        1%{?dist}
+Version:        2.0
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -12,6 +12,7 @@ Source0:        http://www.kde-look.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  gettext
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -47,6 +48,12 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-2
+- gettext BR readded
+
+* Fri Aug 07 2009 Jaroslav Reznik <jreznik at redhat.com> - 2.0-1
+- update to 2.0
+
 * Mon Aug 04 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4-1
 - update to 1.4
 - gettext BR removed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Aug 2009 08:35:06 -0000	1.9
+++ sources	7 Aug 2009 13:30:44 -0000	1.10
@@ -1 +1 @@
-1f483eefe383d88ae646267c94417380  91495-runcommand-1.4.tar.bz2
+f6564295ce60a7622d03a50767a5c4bb  91495-runcommand-2.0.tar.bz2



From hedayat at fedoraproject.org  Fri Aug  7 13:10:24 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri,  7 Aug 2009 13:10:24 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/F-10 .cvsignore, 1.3,
	1.4 gnome-applet-jalali-calendar.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090807131024.CDCE311C0439@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22965

Modified Files:
	.cvsignore gnome-applet-jalali-calendar.spec sources 
Log Message:
New upstream version 1.6.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Mar 2009 18:12:57 -0000	1.3
+++ .cvsignore	7 Aug 2009 13:10:24 -0000	1.4
@@ -1 +1 @@
-jalali-calendar-1.6.7.tar.bz2
+jalali-calendar-1.6.8.tar.bz2


Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-10/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-applet-jalali-calendar.spec	21 Mar 2009 18:12:58 -0000	1.2
+++ gnome-applet-jalali-calendar.spec	7 Aug 2009 13:10:24 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           gnome-applet-jalali-calendar
-Version:        1.6.7
+Version:        1.6.8
 Release:        1%{?dist}
 Summary:        Jalali calendar panel applet for GNOME
 
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_datadir}/jalali-calendar
 
 %changelog
+* Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.8-1
+- Updated to 1.6.8 release
+
 * Sat Mar 21 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.7-1
 - Updated to 1.6.7 release (which contains info about year 1388)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Mar 2009 18:12:58 -0000	1.3
+++ sources	7 Aug 2009 13:10:24 -0000	1.4
@@ -1 +1 @@
-126751a8212d09df5c6029f599ae71bd  jalali-calendar-1.6.7.tar.bz2
+0f63d33f6d7060fe5eb5fe22f981c97f  jalali-calendar-1.6.8.tar.bz2



From jfch2222 at fedoraproject.org  Fri Aug  7 13:39:44 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  7 Aug 2009 13:39:44 +0000 (UTC)
Subject: rpms/openssh-blacklist/F-11 .cvsignore, 1.2,
	1.3 openssh-blacklist.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090807133944.DF3B711C00D7@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh-blacklist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31072

Modified Files:
	.cvsignore openssh-blacklist.spec sources 
Log Message:
Packaged only downloader



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh-blacklist/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Jul 2009 09:02:27 -0000	1.2
+++ .cvsignore	7 Aug 2009 13:39:44 -0000	1.3
@@ -1 +0,0 @@
-openssh-blacklist-0.7.tgz


Index: openssh-blacklist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh-blacklist/F-11/openssh-blacklist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-blacklist.spec	22 Jul 2009 09:02:27 -0000	1.1
+++ openssh-blacklist.spec	7 Aug 2009 13:39:44 -0000	1.2
@@ -1,37 +1,43 @@
 Name:		openssh-blacklist
-Version:	0.7
+Version:	1.0
 Release:	1%{?dist}
-Summary:	Fingerprints of the openssh keys affected by CVE-2008-0166
+Summary:	Downloader of the openssh keys affected by CVE-2008-0166
 
 Group:		Applications/Internet
-License:	CC-BY
+License:	GPLv2
 URL:		http://www.benhur.prf.cuni.cz/medved-7/wydobitki/?path=openssh-blacklist
-Source0:	http://www.benhur.prf.cuni.cz/medved-7/wydobitki/openssh-blacklist/%{name}-%{version}.tgz
+Source0:	http://www.benhur.prf.cuni.cz/medved-7/wydobitki/openssh-blacklist/%{name}-downloader-%{version}.tgz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 %description
-Fingerprints of the openssh keys affected by CVE-2008-0166
+Downloader of the openssh keys affected by CVE-2008-0166
 
 %prep
-%setup -q
+%setup -q -n %{name}-downloader-%{version}
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv fingerprints/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
+cp -p openssh-blacklist-downloader.pl $RPM_BUILD_ROOT%{_bindir}/openssh-blacklist-downloader
+cp -p openssh-blacklist.sites $RPM_BUILD_ROOT/%{_sysconfdir}/openssh-blacklist.sites
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING CONTENT
-%{_datadir}/%{name}
+%doc COPYING
+%{_bindir}/openssh-blacklist-downloader
+%config %{_sysconfdir}/openssh-blacklist.sites
 
 %changelog
+* Fri Aug  7 2009 Jan F. Chadima <jchadima at redhat.com> - 1.0-1
+- Packaged only downloader
+
 * Mon Jul 20 2009 Jan F. Chadima <jchadima at redhat.com> - 0.7-1
 - Redesigned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh-blacklist/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Jul 2009 09:02:27 -0000	1.2
+++ sources	7 Aug 2009 13:39:44 -0000	1.3
@@ -1 +1 @@
-2aef528646064e86b015128462543e2f  openssh-blacklist-0.7.tgz
+9451ce82b9fb0ef1095a031d702ecb8b  openssh-blacklist-downloader-1.0.tgz



From smilner at fedoraproject.org  Fri Aug  7 13:41:09 2009
From: smilner at fedoraproject.org (smilner)
Date: Fri,  7 Aug 2009 13:41:09 +0000 (UTC)
Subject: rpms/pipestat/devel import.log, NONE, 1.1 pipestat.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807134109.AB24211C00D7@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31517/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pipestat.spec 
Log Message:
Import of pipestat srpm.



--- NEW FILE import.log ---
pipestat-0_2-1_fc11:HEAD:pipestat-0.2-1.fc11.src.rpm:1249652440


--- NEW FILE pipestat.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pipestat
Version:        0.2
Release:        1%{?dist}
Summary:        Watches data flowing over an anonymous pipe

Group:          Applications/System
License:        GPLv3+
URL:            http://code.google.com/p/pipestat/
Source0:        http://pipestat.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Simple python scripts to watch data flowing over an anonymous pipe
on shell consoles.

%prep
%setup -q


%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 AUTHORS COPYING LICENSE
%{python_sitelib}/*
%{_bindir}/pipestat


%changelog
* Mon Aug  3 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-1
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:48:35 -0000	1.1
+++ .cvsignore	7 Aug 2009 13:41:09 -0000	1.2
@@ -0,0 +1 @@
+pipestat-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:48:35 -0000	1.1
+++ sources	7 Aug 2009 13:41:09 -0000	1.2
@@ -0,0 +1 @@
+5be7ee30c24196d8935065db7a764d36  pipestat-0.2.tar.gz



From smilner at fedoraproject.org  Fri Aug  7 13:50:11 2009
From: smilner at fedoraproject.org (smilner)
Date: Fri,  7 Aug 2009 13:50:11 +0000 (UTC)
Subject: rpms/pipestat/devel pipestat.spec,1.1,1.2
Message-ID: <20090807135011.6643A11C0425@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2186

Modified Files:
	pipestat.spec 
Log Message:
Fixed description per request.



Index: pipestat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/pipestat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pipestat.spec	7 Aug 2009 13:41:09 -0000	1.1
+++ pipestat.spec	7 Aug 2009 13:50:11 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           pipestat
 Version:        0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Watches data flowing over an anonymous pipe
 
 Group:          Applications/System
@@ -16,7 +16,7 @@ BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
 
 %description
-Simple python scripts to watch data flowing over an anonymous pipe
+Simple python script to watch data flowing over an anonymous pipe
 on shell consoles.
 
 %prep
@@ -44,5 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-2
+- Fixed description.
+
 * Mon Aug  3 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-1
 - Initial spec



From caolanm at fedoraproject.org  Fri Aug  7 13:58:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  7 Aug 2009 13:58:23 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch, 1.1,
	1.2 sources, 1.371, 1.372
Message-ID: <20090807135823.3931611C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4224

Modified Files:
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 
	sources 
Log Message:
fix patch

openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:
 comphelper/source/misc/mediadescriptor.cxx |    1 
 ucbhelper/source/client/content.cxx        |   75 +++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

Index: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101274.opening-a-directory.patch	22 Apr 2009 13:51:36 -0000	1.1
+++ openoffice.org-3.1.0.ooo101274.opening-a-directory.patch	7 Aug 2009 13:58:22 -0000	1.2
@@ -165,13 +165,11 @@ Index: comphelper/source/misc/mediadescr
 ===================================================================
 --- comphelper/source/misc/mediadescriptor.cxx	(revision 270567)
 +++ comphelper/source/misc/mediadescriptor.cxx	(working copy)
-@@ -727,7 +727,8 @@
- 					xRequest->getRequest() >>= exIO;
+@@ -728,6 +728,7 @@
  					bAbort = (
- 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     ) ||
--								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
-+								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ||
-+                                (exIO.Code == css::ucb::IOErrorCode_NO_FILE)
- 							);
- 				}
- 				break;
+ 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     )
+ 							 || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
++							 || (exIO.Code == css::ucb::IOErrorCode_NO_FILE )
+ #ifdef MACOSX
+                              // this is a workaround for MAC, on this platform if the file is locked
+                              // the returned error code looks to be wrong


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- sources	7 Aug 2009 11:06:40 -0000	1.371
+++ sources	7 Aug 2009 13:58:22 -0000	1.372
@@ -4,9 +4,9 @@ b54bcc9fdb23389e961b281508d9110c  docume
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
+ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 f3842c64faf98fe9a8752e4a820c97bc  acor_en-GB.dat
 bccdb30725b178260e5ce74d0ad27879  acor_en-ZA.dat
 1f7711384c49a2fef4abb02053e5949f  OOO310_m18.tar.bz2
-ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz



From michich at fedoraproject.org  Fri Aug  7 14:06:04 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri,  7 Aug 2009 14:06:04 +0000 (UTC)
Subject: rpms/tpm-tools/devel tpm-tools-1.3.3-check-fwrite-success.patch,
	NONE, 1.1 tpm-tools.spec, 1.7,
	1.8 tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch,
	1.1, NONE
Message-ID: <20090807140604.4797711C00D7@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/tpm-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6223

Modified Files:
	tpm-tools.spec 
Added Files:
	tpm-tools-1.3.3-check-fwrite-success.patch 
Removed Files:
	tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch 
Log Message:
* Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.3-1
- New upstream release 1.3.3.
- No longer needed patch, dropped:
  tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
- Use global instead of define for macros.
- Remove rpaths.
- LICENSE file is suddenly missing in upstream tarball.
- Added patch to allow compilation:
  tpm-tools-1.3.3-check-fwrite-success.patch


tpm-tools-1.3.3-check-fwrite-success.patch:
 tpm_unsealdata.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE tpm-tools-1.3.3-check-fwrite-success.patch ---
Upstream uses -Werror and Fedora adds -D_FORTIFY_SOURCE=2, so the return value
from fwrite must be checked.

Patch sent to upstream maintainer Rajiv Andrade on 2009-08-07.

Index: tpm-tools-1.3.3/src/cmds/tpm_unsealdata.c
===================================================================
--- tpm-tools-1.3.3.orig/src/cmds/tpm_unsealdata.c
+++ tpm-tools-1.3.3/src/cmds/tpm_unsealdata.c
@@ -91,7 +91,10 @@ int main(int argc, char **argv)
 			return rc;
 	}
 
-	fwrite(tss_data, tss_size, 1, fp);
+	if (fwrite(tss_data, tss_size, 1, fp) != 1) {
+		logError(_("Unable to write output file"));
+		return rc;
+	}
 	fclose(fp);
 	free(tss_data);
 	return rc;


Index: tpm-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/tpm-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tpm-tools.spec	29 Jul 2009 11:36:28 -0000	1.7
+++ tpm-tools.spec	7 Aug 2009 14:06:03 -0000	1.8
@@ -1,6 +1,7 @@
-%define name            tpm-tools
-%define version         1.3.1
-%define release         10
+%global name            tpm-tools
+%global version         1.3.3
+%global tarballrev      -1
+%global release         1
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -8,11 +9,11 @@ Version:          %{version}
 Release:          %{release}%{?dist}
 License:          CPL
 Group:            Applications/System
-Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
+Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}%{tarballrev}.tar.gz
+Patch0:           %{name}-1.3.3-check-fwrite-success.patch
 URL:              http://trousers.sourceforge.net
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    trousers-devel openssl-devel opencryptoki-devel
-Patch0:           tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
 
 %description
 tpm-tools is a group of tools to manage and utilize the Trusted Computing
@@ -46,7 +47,9 @@ for developing tpm-tools applications.
 %patch0 -p1
 
 %build
-%configure
+%configure --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -64,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README
 %attr(755, root, root) %{_bindir}/tpm_*
 %attr(755, root, root) %{_sbindir}/tpm_*
 %attr(755, root, root) %{_libdir}/libtpm_unseal.so.?.?.?
@@ -84,6 +87,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.3-1
+- New upstream release 1.3.3.
+- No longer needed patch, dropped:
+  tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
+- Use global instead of define for macros.
+- Remove rpaths.
+- LICENSE file is suddenly missing in upstream tarball.
+- Added patch to allow compilation:
+  tpm-tools-1.3.3-check-fwrite-success.patch
+
 * Wed Jul 29 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.1-10
 - Split the pkcs11 utilities into a subpackage.
 


--- tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch DELETED ---



From pbrobinson at fedoraproject.org  Fri Aug  7 14:06:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  7 Aug 2009 14:06:16 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.18,1.19
Message-ID: <20090807140616.D92AC11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6299

Modified Files:
	nbtk.spec 
Log Message:
- And once more with feeling


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nbtk.spec	7 Aug 2009 12:04:33 -0000	1.18
+++ nbtk.spec	7 Aug 2009 14:06:16 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        0.16.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -45,7 +45,7 @@ Files for development with %{name}.
 %patch1 -p1 -b .clutter1-pkcfg
 
 # Don't run configure from autogen.sh
-sed -i 's|echo|exit 0|g' autogen.sh
+sed -i '/configure/d' autogen.sh
 ./autogen.sh
 
 %build
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-10
+- And once more with feeling
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-9
 - A few minor spec file cleanups
 



From rdieter at fedoraproject.org  Fri Aug  7 14:09:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 14:09:24 +0000 (UTC)
Subject: rpms/kphotoalbum/devel kphotoalbum.spec,1.40,1.41
Message-ID: <20090807140924.12A8D11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7100

Modified Files:
	kphotoalbum.spec 
Log Message:
add marble, kdelibs4 deps



Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kphotoalbum.spec	29 Jul 2009 22:10:26 -0000	1.40
+++ kphotoalbum.spec	7 Aug 2009 14:09:23 -0000	1.41
@@ -8,21 +8,25 @@ License: GPLv2+
 Group:   Applications/Multimedia 
 URL:	 http://kphotoalbum.org/
 Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
-#Source0: http://kphotoalbum.org/data/snapshots/kphotoalbum-%{pre}.tar.bz2
-#Source0: kphotoalbum-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext
 # marble integration
-BuildRequires: kdeedu-devel >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 BuildRequires: kdelibs4-devel
 BuildRequires: libkdcraw-devel >= 0.4.0
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: soprano-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version}
+
 %description
 A photo album tool. Focuses on three key points:
   * It must be easy to describe a number of images at a time. 



From rdieter at fedoraproject.org  Fri Aug  7 14:11:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 14:11:09 +0000 (UTC)
Subject: rpms/kphotoalbum/F-10 .cvsignore, 1.14, 1.15 kphotoalbum.spec, 1.34,
	1.35 sources, 1.13, 1.14
Message-ID: <20090807141109.C223911C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7590/F-10

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Log Message:
4.0.2 goodness (and rebuild against kde-4.3.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 May 2009 17:09:45 -0000	1.14
+++ .cvsignore	7 Aug 2009 14:11:09 -0000	1.15
@@ -1 +1 @@
-kphotoalbum-4.0.1.tar.bz2
+kphotoalbum-4.0.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-10/kphotoalbum.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- kphotoalbum.spec	22 May 2009 17:09:45 -0000	1.34
+++ kphotoalbum.spec	7 Aug 2009 14:11:09 -0000	1.35
@@ -1,30 +1,31 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.0.1
+Version: 4.0.2
 Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia 
 URL:	 http://kphotoalbum.org/
 Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
-#Source0: http://kphotoalbum.org/data/snapshots/kphotoalbum-%{pre}.tar.bz2
-#Source0: kphotoalbum-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext
 # marble integration
-BuildRequires: kdeedu-devel >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 BuildRequires: kdelibs4-devel
 BuildRequires: libkdcraw-devel >= 0.4.0
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: soprano-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version}
 
 %description
 A photo album tool. Focuses on three key points:
@@ -83,12 +84,18 @@ rm -rf %{buildroot} 
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null ||:
-xdg-desktop-menu forceupdate 2> /dev/null ||: 
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null ||:
-xdg-desktop-menu forceupdate 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -102,6 +109,12 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 
 
 %changelog
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-1
+- kphotoalbum-4.0.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0.1-1
 - kphotoalbum-4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 May 2009 17:09:45 -0000	1.13
+++ sources	7 Aug 2009 14:11:09 -0000	1.14
@@ -1 +1 @@
-00879c947585bc17a84d84cd3af417a5  kphotoalbum-4.0.1.tar.bz2
+2a01730dd3f0c14827c8ab3921fc64c2  kphotoalbum-4.0.2.tar.bz2



From rdieter at fedoraproject.org  Fri Aug  7 14:11:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 14:11:10 +0000 (UTC)
Subject: rpms/kphotoalbum/F-11 .cvsignore, 1.15, 1.16 kphotoalbum.spec, 1.38,
	1.39 sources, 1.14, 1.15
Message-ID: <20090807141110.528DB11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7590/F-11

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Log Message:
4.0.2 goodness (and rebuild against kde-4.3.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 May 2009 16:46:05 -0000	1.15
+++ .cvsignore	7 Aug 2009 14:11:09 -0000	1.16
@@ -1 +1 @@
-kphotoalbum-4.0.1.tar.bz2
+kphotoalbum-4.0.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/kphotoalbum.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kphotoalbum.spec	22 May 2009 16:46:05 -0000	1.38
+++ kphotoalbum.spec	7 Aug 2009 14:11:09 -0000	1.39
@@ -1,30 +1,31 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.0.1
+Version: 4.0.2
 Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia 
 URL:	 http://kphotoalbum.org/
 Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
-#Source0: http://kphotoalbum.org/data/snapshots/kphotoalbum-%{pre}.tar.bz2
-#Source0: kphotoalbum-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext
 # marble integration
-BuildRequires: kdeedu-devel >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 BuildRequires: kdelibs4-devel
 BuildRequires: libkdcraw-devel >= 0.4.0
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: soprano-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version}
 
 %description
 A photo album tool. Focuses on three key points:
@@ -83,12 +84,18 @@ rm -rf %{buildroot} 
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null ||:
-xdg-desktop-menu forceupdate 2> /dev/null ||: 
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null ||:
-xdg-desktop-menu forceupdate 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -102,6 +109,12 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 
 
 %changelog
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-1
+- kphotoalbum-4.0.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0.1-1
 - kphotoalbum-4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 May 2009 16:46:05 -0000	1.14
+++ sources	7 Aug 2009 14:11:10 -0000	1.15
@@ -1 +1 @@
-00879c947585bc17a84d84cd3af417a5  kphotoalbum-4.0.1.tar.bz2
+2a01730dd3f0c14827c8ab3921fc64c2  kphotoalbum-4.0.2.tar.bz2



From till at fedoraproject.org  Fri Aug  7 14:12:35 2009
From: till at fedoraproject.org (Till Maas)
Date: Fri,  7 Aug 2009 14:12:35 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.57,1.58
Message-ID: <20090807141235.33A1B11C00D7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8161

Modified Files:
	pam_mount.spec 
Log Message:
* Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.27-3
- Use %global instead of %define
- BR: lzip only if the tarball might be packaged with lzip / has a .lz suffix



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- pam_mount.spec	25 Jul 2009 23:09:52 -0000	1.57
+++ pam_mount.spec	7 Aug 2009 14:12:35 -0000	1.58
@@ -1,8 +1,8 @@
-%define packext bz2
+%global packext bz2
 
 Name:           pam_mount
 Version:        1.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -18,7 +18,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libHX-devel >= 2.8
+%if %packext == lz
 BuildRequires:  lzip
+%endif
 Requires:       pam
 Requires:       libHX >= 2.8
 
@@ -110,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.27-3
+- Use %%global instead of %%define
+- BR: lzip only if the tarball might be packaged with lzip / has a .lz suffix
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jgarzik at fedoraproject.org  Fri Aug  7 14:14:47 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Fri,  7 Aug 2009 14:14:47 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.10,1.11 sources,1.7,1.8
Message-ID: <20090807141447.D565811C00D7@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8730

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cld.spec	30 Jul 2009 02:06:31 -0000	1.10
+++ cld.spec	7 Aug 2009 14:14:47 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.10.gdb750ce5%{?dist}
+Release:	0.11.gf830b4be%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit db750ce53f6e50dae361e746d712a3785124f7a0
+# pulled from upstream git, commit f830b4be92f89ad0a48ee0703fd1b829febfaf4a
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,10 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug  7 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.11.gf830b4be
+- update to commit f830b4be92f89ad0a48ee0703fd1b829febfaf4a
+  (major network protocol change)
+
 * Wed Jul 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.10.gdb750ce5
 - install cldcli
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	30 Jul 2009 01:48:03 -0000	1.7
+++ sources	7 Aug 2009 14:14:47 -0000	1.8
@@ -1 +1 @@
-dfc078233d0eb9decda86f015fe039c4  cld-0.2git.tar.gz
+a0e40260b7d715b1a66b1cfd0446e175  cld-0.2git.tar.gz



From pkgdb at fedoraproject.org  Fri Aug  7 14:15:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:15:19 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20090807141520.6ADF510F899@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on fabric (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Fri Aug  7 14:15:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:15:24 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20090807141526.CA1B710F8AC@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on fabric (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Fri Aug  7 14:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:15:27 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20090807141530.81F8610F8B6@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on fabric (Fedora 11) to Awaiting Review for jsteffan

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fabric



From michich at fedoraproject.org  Fri Aug  7 14:16:03 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri,  7 Aug 2009 14:16:03 +0000 (UTC)
Subject: rpms/opencryptoki/devel opencryptoki.spec,1.1,1.2
Message-ID: <20090807141603.651BF11C00D7@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/opencryptoki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9118

Modified Files:
	opencryptoki.spec 
Log Message:
* Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-1
- New upstream release 2.3.0:
  - adds support for RSA 4096 bit keys in the ICA token.



Index: opencryptoki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/opencryptoki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opencryptoki.spec	28 Jul 2009 10:27:44 -0000	1.1
+++ opencryptoki.spec	7 Aug 2009 14:16:03 -0000	1.2
@@ -1,11 +1,11 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
-Version:		2.2.8
-Release:		5%{?dist}
+Version:		2.3.0
+Release:		1%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
-Source:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}-2.2.8-do-not-create-group-in-pkcs11_startup.patch
 BuildRoot:		%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(pre):		shadow-utils coreutils sed
@@ -136,6 +136,10 @@ exit 0
 
 
 %changelog
+* Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-1
+- New upstream release 2.3.0:
+  - adds support for RSA 4096 bit keys in the ICA token.
+
 * Tue Jul 21 2009 Michal Schmidt <mschmidt at redhat.com> - 2.2.8-5
 - Require arch-specific dependency on -libs.
 



From jgarzik at fedoraproject.org  Fri Aug  7 14:17:26 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Fri,  7 Aug 2009 14:17:26 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090807141726.D2BC511C00D7@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9578

Modified Files:
	chunkd.spec sources 
Log Message:
update to latest upstream


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chunkd.spec	30 Jul 2009 01:52:14 -0000	1.6
+++ chunkd.spec	7 Aug 2009 14:17:26 -0000	1.7
@@ -1,13 +1,13 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.7.g6b1e9b66%{?dist}
+Release:	0.8.g95538bcf%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 6b1e9b6641df0353a81c7b1352f5f652c5a7f9d8
+# pulled from upstream git, commit 95538bcfd91486d8ade1e230820bf33312a7c298
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
@@ -98,6 +98,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug  7 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.8.g95538bcf
+- update source to commit 95538bcfd91486d8ade1e230820bf33312a7c298
+
 * Wed Jul 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.7.g6b1e9b66
 - update source to commit 6b1e9b6641df0353a81c7b1352f5f652c5a7f9d8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jul 2009 01:52:14 -0000	1.4
+++ sources	7 Aug 2009 14:17:26 -0000	1.5
@@ -1 +1 @@
-4a86f99c3d429949bacb52850dd00d57  chunkd-0.4git.tar.gz
+55f9d8fef2b6b5187178d677fc37afa8  chunkd-0.4git.tar.gz



From michich at fedoraproject.org  Fri Aug  7 14:19:00 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri,  7 Aug 2009 14:19:00 +0000 (UTC)
Subject: rpms/tpm-tools/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090807141900.7364811C00D7@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/tpm-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10674

Modified Files:
	.cvsignore sources 
Log Message:
uploaded the new source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Dec 2007 21:08:24 -0000	1.2
+++ .cvsignore	7 Aug 2009 14:19:00 -0000	1.3
@@ -1 +1 @@
-tpm-tools-1.3.1.tar.gz
+tpm-tools-1.3.3-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Dec 2007 21:08:24 -0000	1.2
+++ sources	7 Aug 2009 14:19:00 -0000	1.3
@@ -1 +1 @@
-ee1706b69bb76cc6d011757ea194f683  tpm-tools-1.3.1.tar.gz
+a3d9c657a3dfe1978ecc300108da708a  tpm-tools-1.3.3-1.tar.gz



From jfch2222 at fedoraproject.org  Fri Aug  7 14:18:59 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  7 Aug 2009 14:18:59 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel .cvsignore, 1.19, 1.20 cyrus-sasl.spec, 1.80, 
	1.81 sources, 1.22, 1.23 cyrus-sasl-2.1.22-encode64.patch, 1.1, NONE
Message-ID: <20090807141859.2CE3911C00D7@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10660

Modified Files:
	.cvsignore cyrus-sasl.spec sources 
Removed Files:
	cyrus-sasl-2.1.22-encode64.patch 
Log Message:
update to 2.1.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	10 Sep 2008 13:44:15 -0000	1.19
+++ .cvsignore	7 Aug 2009 14:18:58 -0000	1.20
@@ -1 +1 @@
-cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
+cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- cyrus-sasl.spec	24 Jul 2009 19:55:01 -0000	1.80
+++ cyrus-sasl.spec	7 Aug 2009 14:18:59 -0000	1.81
@@ -3,8 +3,8 @@
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
-Version: 2.1.22
-Release: 25%{?dist}
+Version: 2.1.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -31,7 +31,6 @@ Patch32: cyrus-sasl-2.1.22-warnings.patc
 Patch33: cyrus-sasl-2.1.22-current-db.patch
 Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 Patch35: cyrus-sasl-2.1.22-bad-elif.patch
-Patch36: cyrus-sasl-2.1.22-encode64.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -129,7 +128,6 @@ a directory server, accessed using LDAP,
 %setup -q
 chmod -x doc/*.html
 chmod -x include/*.h
-#%patch10 -p1 -b .db_bundle
 %patch11 -p1 -b .no_rpath
 %patch15 -p1 -b .path
 %patch24 -p1 -b .sizes
@@ -143,7 +141,6 @@ chmod -x include/*.h
 %patch33 -p1 -b .current-db
 %patch34 -p1 -b .ldap-timeout
 %patch35 -p1 -b .elif
-%patch36 -p1 -b .encode64
 
 # FIXME - we remove these files directly so that we can avoid using the -f
 # flag, which has a nasty habit of overwriting files like COPYING.
@@ -374,10 +371,13 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Aug  7 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-1
+- update to 2.1.23
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.22-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon May 11 2009 Jan Chadima <jchadima at redhat.com> - 2.1.22-24
+* Mon May 11 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.22-24
 - repair sasl_encode64 nul termination (#487251)
 
 * Thu Apr 16 2009 Robert Scheck <robert at fedoraproject.org> - 2.1.22-23


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	10 Sep 2008 13:44:15 -0000	1.22
+++ sources	7 Aug 2009 14:18:59 -0000	1.23
@@ -1 +1 @@
-4dde83929ded5435e4c72e7cc06b0ebb  cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
+8a5c63840b894cf7583b8521cf2f5152  cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz


--- cyrus-sasl-2.1.22-encode64.patch DELETED ---



From jgarzik at fedoraproject.org  Fri Aug  7 14:19:27 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Fri,  7 Aug 2009 14:19:27 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.5,1.6 tabled.spec,1.7,1.8
Message-ID: <20090807141927.011FB11C00D7@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10912

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Jul 2009 01:56:31 -0000	1.5
+++ sources	7 Aug 2009 14:19:26 -0000	1.6
@@ -1 +1 @@
-99321aef6a07b8bbfba5fb4a8c8adcb6  tabled-0.3git.tar.gz
+0d126c870756f4d3eefdcc31f43cc746  tabled-0.3git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tabled.spec	30 Jul 2009 01:56:31 -0000	1.7
+++ tabled.spec	7 Aug 2009 14:19:26 -0000	1.8
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.3
-Release:	0.8.g0b3ec75c%{?dist}
+Release:	0.9.g20e56358%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 0b3ec75c239e231ee2af8252466ec4fd9da2bd7c
+# pulled from upstream git, commit 20e56358d9320fc73ef2ecc689be960c9be91805
 # 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 Aug  7 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.9.g20e56358
+- update to git commit 20e56358d9320fc73ef2ecc689be960c9be91805
+
 * Wed Jul 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.8.g0b3ec75c
 - update to git commit 0b3ec75c239e231ee2af8252466ec4fd9da2bd7c
 



From davidz at fedoraproject.org  Fri Aug  7 14:22:37 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Fri,  7 Aug 2009 14:22:37 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel
	DeviceKit-disks-005-port-to-new-libatasmart.patch, NONE,
	1.1 DeviceKit-disks.spec, 1.30, 1.31
Message-ID: <20090807142237.2FDD011C00D7@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11819

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	DeviceKit-disks-005-port-to-new-libatasmart.patch 
Log Message:
* Fri Aug 07 2009 David Zeuthen <davidz at redhat.com> - 005-5%{?dist}
- Update for new libatasmart version



DeviceKit-disks-005-port-to-new-libatasmart.patch:
 devkit-disks-device.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE DeviceKit-disks-005-port-to-new-libatasmart.patch ---
--- DeviceKit-disks-005/src/devkit-disks-device.c.orig	2009-08-07 10:14:56.000000000 -0400
+++ DeviceKit-disks-005/src/devkit-disks-device.c	2009-08-07 10:16:07.000000000 -0400
@@ -7576,14 +7576,14 @@
                                 8, a->worst_value_valid,
                                 9, a->threshold,
                                 10, a->threshold_valid,
-                                11, a->good,
-                                12, a->good_valid,
+                                11, a->good_now,
+                                12, a->good_now_valid,
                                 13, a->pretty_unit,
                                 14, a->pretty_value,
                                 15, raw_data,
                                 G_MAXUINT);
 
-        if (!a->good && a->good_valid && a->prefailure)
+        if (!a->good_now && a->good_now_valid && a->prefailure)
                 data->has_bad_attributes = TRUE;
 
         g_ptr_array_add (data->attributes, g_value_get_boxed (&elem));


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- DeviceKit-disks.spec	24 Jul 2009 15:07:18 -0000	1.30
+++ DeviceKit-disks.spec	7 Aug 2009 14:22:37 -0000	1.31
@@ -12,11 +12,12 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 005
-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
 Source0: %{name}-%{version}.tar.gz
+Patch0: DeviceKit-disks-005-port-to-new-libatasmart.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -78,6 +79,7 @@ D-Bus interface definitions for DeviceKi
 
 %prep
 %setup -q
+%patch0 -p1 -b .new-libata-smart
 
 %build
 %configure --enable-gtk-doc
@@ -144,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Fri Aug 07 2009 David Zeuthen <davidz at redhat.com> - 005-5%{?dist}
+- Update for new libatasmart version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 005-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From michich at fedoraproject.org  Fri Aug  7 14:23:14 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri,  7 Aug 2009 14:23:14 +0000 (UTC)
Subject: rpms/opencryptoki/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090807142314.6180911C00D7@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/opencryptoki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12046

Modified Files:
	.cvsignore sources 
Log Message:
uploaded the new source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2009 10:27:44 -0000	1.2
+++ .cvsignore	7 Aug 2009 14:23:13 -0000	1.3
@@ -1 +1 @@
-opencryptoki-2.2.8.tar.bz2
+opencryptoki-2.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2009 10:27:44 -0000	1.2
+++ sources	7 Aug 2009 14:23:13 -0000	1.3
@@ -1 +1 @@
-f6081d6adadc32c753582467670067d5  opencryptoki-2.2.8.tar.bz2
+107d27f53dc0bcace678154e326c7f87  opencryptoki-2.3.0.tar.gz



From erikos at fedoraproject.org  Fri Aug  7 14:38:40 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri,  7 Aug 2009 14:38:40 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 sugar-datastore.spec, 1.16, 1.17
Message-ID: <20090807143840.E760F11C00D7@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15649

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Fri Aug 07 2009 Simon Schampijer <simon at schampijer.de> - 0.85.1-1
- PEP8 compliance fixes #1108
- Rebuild index when an inconsistency between the index and the metadata is detected
- Implement sorting by timestamp and title
- Return a consistent entry count when some entries are missing (dsd)
- Don't include in find() results entries without metadata
- Remove title option (copy-from-journal) #896
- Only one dot for the filename if we specify an extension (copy-from-journal)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Mar 2009 21:11:17 -0000	1.12
+++ .cvsignore	7 Aug 2009 14:38:40 -0000	1.13
@@ -1 +1 @@
-sugar-datastore-0.84.0.tar.bz2
+sugar-datastore-0.85.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Mar 2009 21:11:17 -0000	1.12
+++ sources	7 Aug 2009 14:38:40 -0000	1.13
@@ -1 +1 @@
-e57580e9fd44ecc2cb7a947dd8854817  sugar-datastore-0.84.0.tar.bz2
+38b3f3af867aad3679a89f8966e166c5  sugar-datastore-0.85.1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sugar-datastore.spec	27 Jul 2009 05:00:22 -0000	1.16
+++ sugar-datastore.spec	7 Aug 2009 14:38:40 -0000	1.17
@@ -4,8 +4,8 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.84.0
-Release: 2%{?dist}
+Version: 0.85.1
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
 Summary: Sugar Datastore
@@ -55,6 +55,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Aug 07 2009 Simon Schampijer <simon at schampijer.de> - 0.85.1-1
+- PEP8 compliance fixes #1108
+- Rebuild index when an inconsistency between the index and the metadata is detected
+- Implement sorting by timestamp and title
+- Return a consistent entry count when some entries are missing (dsd)
+- Don't include in find() results entries without metadata
+- Remove title option (copy-from-journal) #896
+- Only one dot for the filename if we specify an extension (copy-from-journal)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.84.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:15 +0000
Subject: [pkgdb] kdesvn: jreznik has requested watchbugzilla
Message-ID: <20090807144015.6C93D10F8A2@bastion2.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdesvn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:17 +0000
Subject: [pkgdb] kdesvn: jreznik has requested watchcommits
Message-ID: <20090807144018.8BE8510F8B5@bastion2.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesvn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:17 +0000
Subject: [pkgdb] kdesvn: jreznik has requested commit
Message-ID: <20090807144018.671DC10F865@bastion2.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdesvn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:27 +0000
Subject: [pkgdb] kdesvn: jreznik has requested watchcommits
Message-ID: <20090807144028.2FD0B10F8B6@bastion2.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesvn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:28 +0000
Subject: [pkgdb] kdesvn: jreznik has requested commit
Message-ID: <20090807144029.9A56510F8B7@bastion2.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdesvn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:36 +0000
Subject: [pkgdb] kdesvn: jreznik has requested commit
Message-ID: <20090807144036.C9EAA10F8A2@bastion2.fedora.phx.redhat.com>

jreznik has requested the commit acl on kdesvn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:37 +0000
Subject: [pkgdb] kdesvn: jreznik has requested watchcommits
Message-ID: <20090807144037.793D110F8B9@bastion2.fedora.phx.redhat.com>

jreznik has requested the watchcommits acl on kdesvn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:39 +0000
Subject: [pkgdb] kdesvn: jreznik has requested watchbugzilla
Message-ID: <20090807144039.C518310F8BB@bastion2.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdesvn (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 14:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 14:40:42 +0000
Subject: [pkgdb] kdesvn: jreznik has requested watchbugzilla
Message-ID: <20090807144042.B543610F8BE@bastion2.fedora.phx.redhat.com>

jreznik has requested the watchbugzilla acl on kdesvn (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From hedayat at fedoraproject.org  Fri Aug  7 14:52:03 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri,  7 Aug 2009 14:52:03 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.17,1.18
Message-ID: <20090807145203.2020811C00D7@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19377

Modified Files:
	rcssserver3d.spec 
Log Message:
Enabling noarch subpackages for -doc and -devel subpackages


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rcssserver3d.spec	1 Aug 2009 11:28:36 -0000	1.17
+++ rcssserver3d.spec	7 Aug 2009 14:52:02 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           rcssserver3d
 Version:        0.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
@@ -35,6 +35,7 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       boost-devel ode-devel DevIL-devel
 Requires:       libGL-devel libGLU-devel simspark-devel
+BuildArch:      noarch
 
 %description    devel
 This package contains the header files for %{name}. If you like to develop
@@ -43,6 +44,7 @@ programs using %{name}, you will need to
 %package        doc
 Summary:        Users manual for %{name}
 Group:          Documentation
+BuildArch:      noarch
 
 %description    doc
 This package contains the user documentation
@@ -104,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> - 0.6.1-7
+- Enabled noarch sub-packages for doc and devel subpackages
+
 * Sat Aug 01 2009 Hedayat Vatankhah <hedayat at grad.com> - 0.6.1-6
 - Rebuilt against rawhide tetex
 



From kraxel at fedoraproject.org  Fri Aug  7 14:56:03 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri,  7 Aug 2009 14:56:03 +0000 (UTC)
Subject: rpms/xen/devel .cvsignore, 1.41, 1.42 sources, 1.56, 1.57 xen.spec, 
	1.240, 1.241
Message-ID: <20090807145603.1A77F11C00D7@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20403

Modified Files:
	.cvsignore sources xen.spec 
Log Message:
3.4.1 update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	7 Aug 2009 09:40:13 -0000	1.41
+++ .cvsignore	7 Aug 2009 14:56:02 -0000	1.42
@@ -5,5 +5,4 @@ newlib-1.16.0.tar.gz
 lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
-xen-3.4.0.tar.gz
 xen-3.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	7 Aug 2009 09:40:13 -0000	1.56
+++ sources	7 Aug 2009 14:56:02 -0000	1.57
@@ -3,5 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib
 36cc57650cffda9a0269493be2a169bb  lwip-1.3.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
-bf1b29f07ec2c12673779600aea183b2  xen-3.4.0.tar.gz
 c3f8dbcf833140825b1e2f16b64655f3  xen-3.4.1.tar.gz


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- xen.spec	5 Aug 2009 11:49:56 -0000	1.240
+++ xen.spec	7 Aug 2009 14:56:02 -0000	1.241
@@ -5,12 +5,12 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 3.4.0
-Release: 4%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
-Source0: http://bits.xensource.com/oss-xen/release/3.4.0/xen-3.4.0.tar.gz
+Source0: http://bits.xensource.com/oss-xen/release/3.4.0/xen-%{version}.tar.gz
 Source1: %{name}.modules
 Source2: %{name}.logrotate
 Source3: dom0-kernel.repo
@@ -31,7 +31,6 @@ Source31: sysconfig.xenconsoled
 Source32: sysconfig.blktapctrl
 
 Patch1: xen-initscript.patch
-Patch2: xen-fix-deprecated-warnings.patch
 Patch3: xen-xenstore-cli.patch
 Patch4: xen-dumpdir.patch
 Patch5: xen-net-disable-iptables-on-bridge.patch
@@ -67,7 +66,8 @@ Requires: xen-runtime = %{version}-%{rel
 # installs xen.
 Requires: kpartx
 Prereq: chkconfig
-ExclusiveArch: %{ix86} x86_64 ia64
+ExclusiveArch: %{ix86} x86_64 ia64 noarch
+BuildArch: %{ix86} x86_64 ia64
 
 %description
 This package contains the XenD daemon and xm command line
@@ -110,7 +110,8 @@ This package contains the Xen hypervisor
 
 %package doc
 Summary: Xen documentation
-Group: Development/Libraries
+Group: Documentation
+BuildArch: noarch
 
 %description doc
 This package contains the Xen documentation.
@@ -129,7 +130,6 @@ which manage Xen virtual machines.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -449,6 +449,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 7 2007 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-1
+- update to 3.4.1 release.
+- make doc subpackage noarch.
+
 * Wed Aug 5 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.0-4
 - Kill info files.  No xen docs, just standard gnu stuff.
 - kill -Werror in tools/libxc to fix build.



From ajax at fedoraproject.org  Fri Aug  7 15:02:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri,  7 Aug 2009 15:02:10 +0000 (UTC)
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.27,
	1.28
Message-ID: <20090807150210.76A5711C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22037

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
* Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 4.2.2-3
- Un-ship the microcode, it doesn't actually get loaded.



Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-drv-rendition.spec	27 Jul 2009 08:30:20 -0000	1.27
+++ xorg-x11-drv-rendition.spec	7 Aug 2009 15:02:10 -0000	1.28
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 rendition video driver
 Name:      xorg-x11-drv-rendition
 Version:   4.2.2
-Release:   2%{?dist}.1
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -38,10 +38,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-# FIXME: Remove all libtool archives (*.la) from modules directory.  This
-# should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+rm -f $RPM_BUILD_ROOT%{moduledir}/*.uc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,11 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{driverdir}/rendition_drv.so
 %{_datadir}/hwdata/videoaliases/rendition.xinf
-%{moduledir}/v10002d.uc
-%{moduledir}/v20002d.uc
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 4.2.2-3
+- Un-ship the microcode, it doesn't actually get loaded.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kraxel at fedoraproject.org  Fri Aug  7 15:02:49 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri,  7 Aug 2009 15:02:49 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.241,1.242
Message-ID: <20090807150249.9419811C00D7@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22248

Modified Files:
	xen.spec 
Log Message:
fix year tyops


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- xen.spec	7 Aug 2009 14:56:02 -0000	1.241
+++ xen.spec	7 Aug 2009 15:02:49 -0000	1.242
@@ -449,7 +449,7 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
-* Fri Aug 7 2007 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-1
+* Fri Aug 7 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-1
 - update to 3.4.1 release.
 - make doc subpackage noarch.
 



From kraxel at fedoraproject.org  Fri Aug  7 15:14:17 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri,  7 Aug 2009 15:14:17 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.242,1.243
Message-ID: <20090807151417.987AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24893

Modified Files:
	xen.spec 
Log Message:
buildarch fixup


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- xen.spec	7 Aug 2009 15:02:49 -0000	1.242
+++ xen.spec	7 Aug 2009 15:14:15 -0000	1.243
@@ -67,7 +67,6 @@ Requires: xen-runtime = %{version}-%{rel
 Requires: kpartx
 Prereq: chkconfig
 ExclusiveArch: %{ix86} x86_64 ia64 noarch
-BuildArch: %{ix86} x86_64 ia64
 
 %description
 This package contains the XenD daemon and xm command line



From notting at fedoraproject.org  Fri Aug  7 15:17:53 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  7 Aug 2009 15:17:53 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.76,1.77
Message-ID: <20090807151753.7677F11C00D7@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25901

Modified Files:
	comps-f12.xml.in 
Log Message:
Fixed.



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- comps-f12.xml.in	6 Aug 2009 18:37:00 -0000	1.76
+++ comps-f12.xml.in	7 Aug 2009 15:17:53 -0000	1.77
@@ -6080,6 +6080,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zu_ZA</packagereq>
     </packagelist>
   </group>
+  <category>
     <id>language-support</id>
     <_name>Languages</_name>
     <_description>These packages provide support for various locales including fonts and input methods.</_description>



From kraxel at fedoraproject.org  Fri Aug  7 15:27:58 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Fri,  7 Aug 2009 15:27:58 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.243,1.244
Message-ID: <20090807152758.94E0B11C00D7@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29472

Modified Files:
	xen.spec 
Log Message:
buildarch fixup #2


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- xen.spec	7 Aug 2009 15:14:15 -0000	1.243
+++ xen.spec	7 Aug 2009 15:27:58 -0000	1.244
@@ -66,7 +66,8 @@ Requires: xen-runtime = %{version}-%{rel
 # installs xen.
 Requires: kpartx
 Prereq: chkconfig
-ExclusiveArch: %{ix86} x86_64 ia64 noarch
+ExclusiveArch: %{ix86} x86_64 ia64
+#ExclusiveArch: %{ix86} x86_64 ia64 noarch
 
 %description
 This package contains the XenD daemon and xm command line
@@ -110,7 +111,7 @@ This package contains the Xen hypervisor
 %package doc
 Summary: Xen documentation
 Group: Documentation
-BuildArch: noarch
+#BuildArch: noarch
 
 %description doc
 This package contains the Xen documentation.
@@ -450,7 +451,6 @@ rm -rf %{buildroot}
 %changelog
 * Fri Aug 7 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-1
 - update to 3.4.1 release.
-- make doc subpackage noarch.
 
 * Wed Aug 5 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.0-4
 - Kill info files.  No xen docs, just standard gnu stuff.



From jfch2222 at fedoraproject.org  Fri Aug  7 15:39:22 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  7 Aug 2009 15:39:22 +0000 (UTC)
Subject: rpms/openssh-blacklist/F-10 openssh-blacklist.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090807153922.5F77011C00D7@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh-blacklist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32413

Modified Files:
	openssh-blacklist.spec sources 
Log Message:
Packaged only downloader



Index: openssh-blacklist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh-blacklist/F-10/openssh-blacklist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-blacklist.spec	22 Jul 2009 09:11:17 -0000	1.1
+++ openssh-blacklist.spec	7 Aug 2009 15:39:21 -0000	1.2
@@ -1,37 +1,43 @@
 Name:		openssh-blacklist
-Version:	0.7
+Version:	1.0
 Release:	1%{?dist}
-Summary:	Fingerprints of the openssh keys affected by CVE-2008-0166
+Summary:	Downloader of the openssh keys affected by CVE-2008-0166
 
 Group:		Applications/Internet
-License:	CC-BY
+License:	GPLv2
 URL:		http://www.benhur.prf.cuni.cz/medved-7/wydobitki/?path=openssh-blacklist
-Source0:	http://www.benhur.prf.cuni.cz/medved-7/wydobitki/openssh-blacklist/%{name}-%{version}.tgz
+Source0:	http://www.benhur.prf.cuni.cz/medved-7/wydobitki/openssh-blacklist/%{name}-downloader-%{version}.tgz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 %description
-Fingerprints of the openssh keys affected by CVE-2008-0166
+Downloader of the openssh keys affected by CVE-2008-0166
 
 %prep
-%setup -q
+%setup -q -n %{name}-downloader-%{version}
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv fingerprints/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
+cp -p openssh-blacklist-downloader.pl $RPM_BUILD_ROOT%{_bindir}/openssh-blacklist-downloader
+cp -p openssh-blacklist.sites $RPM_BUILD_ROOT/%{_sysconfdir}/openssh-blacklist.sites
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING CONTENT
-%{_datadir}/%{name}
+%doc COPYING
+%{_bindir}/openssh-blacklist-downloader
+%config %{_sysconfdir}/openssh-blacklist.sites
 
 %changelog
+* Fri Aug  7 2009 Jan F. Chadima <jchadima at redhat.com> - 1.0-1
+- Packaged only downloader
+
 * Mon Jul 20 2009 Jan F. Chadima <jchadima at redhat.com> - 0.7-1
 - Redesigned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh-blacklist/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Jul 2009 09:11:17 -0000	1.2
+++ sources	7 Aug 2009 15:39:22 -0000	1.3
@@ -1 +1 @@
-2aef528646064e86b015128462543e2f  openssh-blacklist-0.7.tgz
+9451ce82b9fb0ef1095a031d702ecb8b  openssh-blacklist-downloader-1.0.tgz



From james at fedoraproject.org  Fri Aug  7 15:45:10 2009
From: james at fedoraproject.org (James Antill)
Date: Fri,  7 Aug 2009 15:45:10 +0000 (UTC)
Subject: rpms/zsh/devel zsh.spec,1.62,1.63
Message-ID: <20090807154510.C68F411C00D7@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/zsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1728

Modified Files:
	zsh.spec 
Log Message:
* Fri Aug  7 2009 James Antill <james at fedoraproject.org> - 4.3.10-4
- Allow --excludedocs command to work!
- Resolves: bug#515986



Index: zsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- zsh.spec	27 Jul 2009 09:04:54 -0000	1.62
+++ zsh.spec	7 Aug 2009 15:45:10 -0000	1.63
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.3.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -130,14 +130,21 @@ else
     grep -q "^%{_bindir}/zsh$" %{_sysconfdir}/shells || echo "%{_bindir}/zsh" >> %{_sysconfdir}/shells
 fi
 
+if [ -f %{_infodir}/zsh.info.gz ]; then
+# This is needed so that --excludedocs works.
 /sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \
   --entry="* zsh: (zsh).			An enhanced bourne shell."
+fi
+
 :
 
 %preun
 if [ "$1" = 0 ] ; then
+    if [ -f %{_infodir}/zsh.info.gz ]; then
+    # This is needed so that --excludedocs works.
     /sbin/install-info --delete %{_infodir}/zsh.info.gz %{_infodir}/dir \
       --entry="* zsh: (zsh).			An enhanced bourne shell."
+    fi
 fi
 :
 
@@ -168,6 +175,10 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Aug  7 2009 James Antill <james at fedoraproject.org> - 4.3.10-4
+- Allow --excludedocs command to work!
+- Resolves: bug#515986
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Fri Aug  7 15:49:59 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri,  7 Aug 2009 15:49:59 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel .cvsignore, 1.4,
	1.5 fedora-gnome-theme.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20090807154959.0BC6C11C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2986

Modified Files:
	.cvsignore fedora-gnome-theme.spec sources 
Log Message:
* Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 12.0-1
- Bump to 12.0
- Add gtk-cursor-theme-name to gtkrc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Oct 2007 15:23:32 -0000	1.4
+++ .cvsignore	7 Aug 2009 15:49:58 -0000	1.5
@@ -1 +1 @@
-fedora-gnome-theme-8.0.0.tar.bz2
+fedora-gnome-theme-12.0.tar.bz2


Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fedora-gnome-theme.spec	5 Aug 2009 22:41:52 -0000	1.12
+++ fedora-gnome-theme.spec	7 Aug 2009 15:49:58 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
-Version: 8.0.0
-Release: 10%{?dist}
+Version: 12.0
+Release: 1%{?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)
 
-Patch0: defaults.patch
-
 Requires: nodoka-metacity-theme
 Requires: gtk-nodoka-engine
 Requires: fedora-icon-theme
@@ -29,7 +27,6 @@ This package contains the Fedora GNOME m
 
 %prep
 %setup -q
-%patch0 -p1 -b .defaults
 
 %build
 %configure
@@ -55,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 12.0-1
+- Bump to 12.0
+- Add gtk-cursor-theme-name to gtkrc
+
 * Wed Aug  5 2009 Matthias Clasen  <mclasen at redhat.com> - 8.0.0-10
 - Match default changes in GConf schemas
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Oct 2007 15:23:32 -0000	1.4
+++ sources	7 Aug 2009 15:49:58 -0000	1.5
@@ -1 +1 @@
-47ac8761afe88141e1420eb7d69caa7c  fedora-gnome-theme-8.0.0.tar.bz2
+0eada735ee54995da21f54851e2f75a1  fedora-gnome-theme-12.0.tar.bz2



From ausil at fedoraproject.org  Fri Aug  7 15:57:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  7 Aug 2009 15:57:00 +0000 (UTC)
Subject: rpms/libpuzzle/devel libpuzzle.spec,1.3,1.4
Message-ID: <20090807155700.92DD411C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libpuzzle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5013

Modified Files:
	libpuzzle.spec 
Log Message:
add s390x and sparc64 to the list of arches using lib64



Index: libpuzzle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpuzzle/devel/libpuzzle.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libpuzzle.spec	25 Jul 2009 08:30:12 -0000	1.3
+++ libpuzzle.spec	7 Aug 2009 15:57:00 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		libpuzzle
 Version:	0.11
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Library to quickly find visually similar images (gif, png, jpg) 
 Group:		System Environment/Libraries
 License:	BSD
@@ -65,7 +65,7 @@ iconv -f iso8859-1 -t utf-8 php-plain/ex
 cd php/libpuzzle
 phpize
 
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64 s390x
 LDFLAGS="$LDFLAGS -L%{_builddir}/%{name}-%{version}/usr/lib64"; export LDFLAGS
 %endif
 
@@ -115,6 +115,9 @@ find %{buildroot} -name '*.la' -exec rm 
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 07 2009 Dennis Gilmore <dennis at ausil.us> - 0.11-7
+- add sparc64 and s390x to the list of arches that use lib64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Fri Aug  7 16:01:42 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  7 Aug 2009 16:01:42 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.3, 1.4 grubby.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090807160142.B5CE911C00D7@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6060

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Fri Aug  7 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.2-1
- Add --add-dracut-args new-kernel-pkg cmdline option



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jul 2009 14:02:58 -0000	1.3
+++ .cvsignore	7 Aug 2009 16:01:42 -0000	1.4
@@ -1 +1 @@
-grubby-7.0.1.tar.bz2
+grubby-7.0.2.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- grubby.spec	25 Jul 2009 01:32:04 -0000	1.3
+++ grubby.spec	7 Aug 2009 16:01:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name: grubby
-Version: 7.0.1
-Release: 2%{?dist}
+Version: 7.0.2
+Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
 License: GPLv2+
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.2-1
+- Add --add-dracut-args new-kernel-pkg cmdline option
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jul 2009 14:02:58 -0000	1.3
+++ sources	7 Aug 2009 16:01:42 -0000	1.4
@@ -1 +1 @@
-e5b80c67c591b34adc694584402c4bd6  grubby-7.0.1.tar.bz2
+76013d5d8393c280dced91fe6e1f6632  grubby-7.0.2.tar.bz2



From jwrdegoede at fedoraproject.org  Fri Aug  7 16:12:21 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  7 Aug 2009 16:12:21 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1702,1.1703
Message-ID: <20090807161221.610EB11C00D7@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7995

Modified Files:
	kernel.spec 
Log Message:
* Fri Aug 07 2009 Hans de Goede <hdegoede at redhat.com>
- When building a dracut generic initrd tell new-kernel-pkg to use that
  instead of running mkinitrd



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1702
retrieving revision 1.1703
diff -u -p -r1.1702 -r1.1703
--- kernel.spec	7 Aug 2009 10:47:28 -0000	1.1702
+++ kernel.spec	7 Aug 2009 16:12:21 -0000	1.1703
@@ -1799,7 +1799,12 @@ if [ `uname -i` == "x86_64" -o `uname -i
    [ -f /etc/sysconfig/kernel ]; then\
   /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
 fi}\
+%{expand:\
+%if %{with_dracut}\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --depmod --add-dracut-args --initrdfile=/boot/initrd-generic-%{KVERREL}%{?-v:.%{-v*}}.img --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%else\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%endif}\
 #if [ -x /sbin/weak-modules ]\
 #then\
 #    /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\
@@ -1959,6 +1964,10 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 07 2009 Hans de Goede <hdegoede at redhat.com>
+- When building a dracut generic initrd tell new-kernel-pkg to use that
+  instead of running mkinitrd
+
 * Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.139.rc5.git3
 - drm-r600-kms.patch - update r600 KMS
 - drm-radeon-fixes.patch - patches for queue to Linus



From pkgdb at fedoraproject.org  Fri Aug  7 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 16:20:00 +0000
Subject: [pkgdb] pyOpenSSL ownership updated
Message-ID: <20090807162000.D8DFD10F879@bastion2.fedora.phx.redhat.com>

Package pyOpenSSL in Fedora EPEL 5 is now owned by lmacken

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyOpenSSL



From pkgdb at fedoraproject.org  Fri Aug  7 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 16:20:00 +0000
Subject: [pkgdb] pyOpenSSL (un)retirement
Message-ID: <20090807162001.0CE1310F899@bastion2.fedora.phx.redhat.com>

Package pyOpenSSL in Fedora EPEL 5 has been retired by lmacken

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyOpenSSL



From akurtakov at fedoraproject.org  Fri Aug  7 16:21:32 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  7 Aug 2009 16:21:32 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-add-ppc64-filesystem.patch, NONE,
	1.1 eclipse.spec, 1.655, 1.656
Message-ID: <20090807162132.08D1211C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9887/devel

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-add-ppc64-filesystem.patch 
Log Message:
Another missing ppc64 fragment.

eclipse-add-ppc64-filesystem.patch:
 feature.xml |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE eclipse-add-ppc64-filesystem.patch ---
--- ./features/org.eclipse.platform/feature.xml	2009-08-07 18:30:54.000000000 +0300
+++ ./features/org.eclipse.platform/feature.xml	2009-08-07 18:50:29.043863537 +0300
@@ -440,6 +440,16 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
+	 
+   <plugin
+         id="org.eclipse.core.filesystem.linux.ppc64"
+         os="linux"
+         arch="ppc64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.core.filesystem.linux.x86"


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -p -r1.655 -r1.656
--- eclipse.spec	7 Aug 2009 07:13:06 -0000	1.655
+++ eclipse.spec	7 Aug 2009 16:21:31 -0000	1.656
@@ -13,7 +13,6 @@ Epoch:  1
 %define swtver          3.5.0.v3550
 %define initialize      1
 
-
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
 %define eclipse_arch    x86
@@ -30,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.34%{?dist}
+Release:        0.3.35%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -151,6 +150,8 @@ Patch47:        %{name}-jdt_launch-custo
 # https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
 Patch48:        %{name}-swt-buildagainstxulrunner.patch
 
+Patch49:        %{name}-add-ppc64-filesystem.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -388,6 +389,7 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 %ifarch ppc64
 %patch24 -p1
 %patch28
+%patch49
 %endif
 #%patch30
 %patch31 -p1
@@ -1491,6 +1493,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Aug 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.35
+- Another missing ppc64 fragment.
+
 * Fri Aug 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.34
 - Fix missing fragment on ppc64.
 



From hadess at fedoraproject.org  Fri Aug  7 16:25:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  7 Aug 2009 16:25:12 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-11 .cvsignore, 1.22,
	1.23 gstreamer-plugins-base.spec, 1.77, 1.78 sources, 1.23, 1.24
Message-ID: <20090807162512.9E17411C00D7@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-serv11189

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.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	28 Jul 2009 11:44:21 -0000	1.22
+++ .cvsignore	7 Aug 2009 16:25:12 -0000	1.23
@@ -1 +1 @@
-gst-plugins-base-0.10.23.4.tar.bz2
+gst-plugins-base-0.10.24.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.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- gstreamer-plugins-base.spec	28 Jul 2009 12:00:31 -0000	1.77
+++ gstreamer-plugins-base.spec	7 Aug 2009 16:25:12 -0000	1.78
@@ -1,10 +1,10 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.22
+%define         _gst            0.10.24
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.23.4
+Version: 	0.10.24
 Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
@@ -244,6 +244,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Fri Aug 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
+- Update to 0.10.24
+
 * Tue Jul 28 2009 Bastien Nocera <bnocera at redhat.com> 0.10.23.4-1
 - Update to 0.10.23.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	28 Jul 2009 11:44:21 -0000	1.23
+++ sources	7 Aug 2009 16:25:12 -0000	1.24
@@ -1 +1 @@
-78594c5672b3bf41b37a3a9f7c16bb3b  gst-plugins-base-0.10.23.4.tar.bz2
+a3ec977c9c6602caacc2d3a7c12a17bf  gst-plugins-base-0.10.24.tar.bz2



From cwickert at fedoraproject.org  Fri Aug  7 16:28:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  7 Aug 2009 16:28:11 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.16, 1.17 rednotebook.spec, 1.16,
	1.17 sources, 1.16, 1.17
Message-ID: <20090807162811.3E55C11C00D7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11867

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
- Updated to new upstream version 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	29 Jul 2009 21:42:38 -0000	1.16
+++ .cvsignore	7 Aug 2009 16:28:10 -0000	1.17
@@ -1 +1 @@
-rednotebook-0.8.2.tar.gz
+rednotebook-0.8.3.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rednotebook.spec	29 Jul 2009 21:42:38 -0000	1.16
+++ rednotebook.spec	7 Aug 2009 16:28:11 -0000	1.17
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.2
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
+- Updated to new upstream version 0.8.3
+
 * Wed Jul 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-1
 - Updated to new upstream version 0.8.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Jul 2009 21:42:38 -0000	1.16
+++ sources	7 Aug 2009 16:28:11 -0000	1.17
@@ -1 +1 @@
-40cf83b574943beb1bb4e0cd351e4c17  rednotebook-0.8.2.tar.gz
+0ed6f152312020c227bc8edbe4e4dbe2  rednotebook-0.8.3.tar.gz



From rdieter at fedoraproject.org  Fri Aug  7 16:29:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 16:29:26 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.262,1.263
Message-ID: <20090807162926.BD04E11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12163

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-6
- Requires: oxygen-icon-theme >= 4.3.0



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- kdebase-workspace.spec	4 Aug 2009 09:57:57 -0000	1.262
+++ kdebase-workspace.spec	7 Aug 2009 16:29:26 -0000	1.263
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -91,7 +91,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme >= 4.2.2 
+Requires: oxygen-icon-theme >= 4.3.0 
 
 # pkg-splits, upgrade path
 Requires: kdm = %{version}-%{release}
@@ -515,6 +515,9 @@ fi
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-6
+- Requires: oxygen-icon-theme >= 4.3.0
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From rrakus at fedoraproject.org  Fri Aug  7 16:31:29 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri,  7 Aug 2009 16:31:29 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-1.3.14-returns.patch, NONE, 1.1 yaboot.spec,
	1.62, 1.63
Message-ID: <20090807163129.181A711C00D7@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12744

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-returns.patch 
Log Message:
Fix bad return code in verbose mode (#515555)

yaboot-1.3.14-returns.patch:
 mkofboot |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE yaboot-1.3.14-returns.patch ---
--- yaboot-1.3.14/ybin/mkofboot.orig	2009-08-07 11:08:04.000000000 +1000
+++ yaboot-1.3.14/ybin/mkofboot	2009-08-07 11:08:09.000000000 +1000
@@ -1164,6 +1164,8 @@
     fi
     sync ; sync
     [ "$VERBOSE" = 1 ] && echo "$PRG: Installation successful"
+
+    return 0
 }
 
 ## make sure the first stage ofboot generator is compatible.


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- yaboot.spec	27 Jul 2009 08:50:50 -0000	1.62
+++ yaboot.spec	7 Aug 2009 16:31:28 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -28,6 +28,9 @@ Patch32: yaboot-relocatable-kernel.patch
 Patch33: yaboot-1.3.14-better_netboot.patch
 Patch34: yaboot-1.3.14-no-birecs.patch
 
+# mkofboot in verbose mode returns bad value
+Patch35: yaboot-1.3.14-returns.patch
+
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
@@ -64,6 +67,7 @@ yaboot can also bootload IBM pSeries mac
 %patch32 -p1 -b .relocatable
 %patch33 -p1 -b .netboot
 %patch34 -p1 -b .birecs
+%patch35 -p1 -b .returns
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -99,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Fri Aug 07 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-15
+- Fix bad return code in verbose mode (#515555)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.14-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Fri Aug  7 16:41:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  7 Aug 2009 16:41:17 +0000 (UTC)
Subject: rpms/rednotebook/F-10 .cvsignore, 1.10, 1.11 rednotebook.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20090807164117.5F14C11C00D7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14505/F-10

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
- Updated to new upstream version 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jul 2009 21:49:37 -0000	1.10
+++ .cvsignore	7 Aug 2009 16:41:16 -0000	1.11
@@ -1 +1 @@
-rednotebook-0.7.5.tar.gz
+rednotebook-0.8.3.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/rednotebook.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rednotebook.spec	1 Aug 2009 19:59:56 -0000	1.13
+++ rednotebook.spec	7 Aug 2009 16:41:17 -0000	1.14
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.2
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -12,7 +12,7 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
-BuildRequires:  python
+BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  desktop-file-utils
 
@@ -70,12 +70,19 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}/
 %{python_sitelib}/%{name}*.egg-info
 
-
 %changelog
-* Sat Aug 01 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.2-1
+* Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
+- Updated to new upstream version 0.8.3
+
+* Wed Jul 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-1
 - Updated to new upstream version 0.8.2
 
+* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-1
+- Updated to new upstream version 0.8.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.0-1
+- Updated BR python
 - Icon cache update added
 - Updated to new upstream version 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Aug 2009 19:59:56 -0000	1.13
+++ sources	7 Aug 2009 16:41:17 -0000	1.14
@@ -1 +1 @@
-40cf83b574943beb1bb4e0cd351e4c17  rednotebook-0.8.2.tar.gz
+0ed6f152312020c227bc8edbe4e4dbe2  rednotebook-0.8.3.tar.gz



From cwickert at fedoraproject.org  Fri Aug  7 16:41:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  7 Aug 2009 16:41:17 +0000 (UTC)
Subject: rpms/rednotebook/F-11 .cvsignore, 1.11, 1.12 rednotebook.spec, 1.14,
	1.15 sources, 1.14, 1.15
Message-ID: <20090807164117.C8E1011C00D7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14505/F-11

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
- Updated to new upstream version 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Jul 2009 21:49:38 -0000	1.11
+++ .cvsignore	7 Aug 2009 16:41:17 -0000	1.12
@@ -1 +1 @@
-rednotebook-0.7.5.tar.gz
+rednotebook-0.8.3.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rednotebook.spec	1 Aug 2009 20:02:29 -0000	1.14
+++ rednotebook.spec	7 Aug 2009 16:41:17 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.2
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -60,7 +60,6 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG LICENSE README
@@ -71,12 +70,19 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}/
 %{python_sitelib}/%{name}*.egg-info
 
-
 %changelog
-* Sat Aug 01 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.2-1
+* Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
+- Updated to new upstream version 0.8.3
+
+* Wed Jul 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.2-1
 - Updated to new upstream version 0.8.2
 
+* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-1
+- Updated to new upstream version 0.8.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Fabian Affolter <fabian at bernewireless.net> - 0.8.0-1
+- Updated BR python
 - Icon cache update added
 - Updated to new upstream version 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Aug 2009 19:59:57 -0000	1.14
+++ sources	7 Aug 2009 16:41:17 -0000	1.15
@@ -1 +1 @@
-40cf83b574943beb1bb4e0cd351e4c17  rednotebook-0.8.2.tar.gz
+0ed6f152312020c227bc8edbe4e4dbe2  rednotebook-0.8.3.tar.gz



From rdieter at fedoraproject.org  Fri Aug  7 16:53:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 16:53:12 +0000 (UTC)
Subject: rpms/exiv2/devel exiv2.spec,1.26,1.27
Message-ID: <20090807165312.E679E11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17554

Modified Files:
	exiv2.spec 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.2-2
- (again) drop -fvisibility-inlines-hidden (#496050)



Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- exiv2.spec	24 Jul 2009 20:21:40 -0000	1.26
+++ exiv2.spec	7 Aug 2009 16:53:12 -0000	1.27
@@ -7,7 +7,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -70,7 +70,7 @@ methods for Exif thumbnails, classes to 
 
 %patch1 -p1 -b .deps
 ## drop for now, seems no longer needed as of 0.18.2
-#patch2 -p1 -b .visibility
+%patch2 -p1 -b .visibility
 
 mkdir doc/html
 
@@ -131,6 +131,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.2-2
+- (again) drop -fvisibility-inlines-hidden (#496050)
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.2-1
 - exiv2-0.18.2
 - drop visibility patch



From rdieter at fedoraproject.org  Fri Aug  7 16:54:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 16:54:35 +0000 (UTC)
Subject: rpms/exiv2/F-11 exiv2.spec,1.26,1.27
Message-ID: <20090807165435.3236711C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17944

Modified Files:
	exiv2.spec 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.2-2
- (again) drop -fvisibility-inlines-hidden (#496050)



Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/F-11/exiv2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- exiv2.spec	24 Jul 2009 20:23:42 -0000	1.26
+++ exiv2.spec	7 Aug 2009 16:54:35 -0000	1.27
@@ -7,7 +7,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -70,7 +70,7 @@ methods for Exif thumbnails, classes to 
 
 %patch1 -p1 -b .deps
 ## drop for now, seems no longer needed as of 0.18.2
-#patch2 -p1 -b .visibility
+%patch2 -p1 -b .visibility
 
 mkdir doc/html
 
@@ -131,6 +131,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.2-2
+- (again) drop -fvisibility-inlines-hidden (#496050)
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.18.2-1
 - exiv2-0.18.2
 - drop visibility patch



From twaugh at fedoraproject.org  Fri Aug  7 17:12:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  7 Aug 2009 17:12:29 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.1.11.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.203, 1.204 sources, 1.209,
	1.210 system-config-printer-getdevices.patch, 1.1,
	1.2 system-config-printer.spec, 1.276,
	1.277 system-config-printer-1.1.10.tar.bz2.sig, 1.1,
	NONE system-config-printer-a6cf4d3.patch, 1.1, NONE
Message-ID: <20090807171229.5A88911C00D7@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-serv21528

Modified Files:
	.cvsignore sources system-config-printer-getdevices.patch 
	system-config-printer.spec 
Added Files:
	system-config-printer-1.1.11.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.10.tar.bz2.sig 
	system-config-printer-a6cf4d3.patch 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
- 1.1.11:
  - Several udev-configure-printer fixes.
  - Use case-insensitive PPD matching.
  - Better URI validity testing.
  - Another stale printer status icon fix.
  - Notice when jobs stop due to backend errors.
  - Warn about job history when renaming printers.
  - Small UI improvements.



--- NEW FILE system-config-printer-1.1.11.tar.xz.sig ---
??
?R?N??`??VS??U

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- .cvsignore	22 Jul 2009 14:25:18 -0000	1.203
+++ .cvsignore	7 Aug 2009 17:12:28 -0000	1.204
@@ -202,3 +202,4 @@ system-config-printer-1.1.7.tar.bz2
 pycups-1.9.46.tar.bz2
 system-config-printer-1.1.8.tar.bz2
 system-config-printer-1.1.10.tar.bz2
+system-config-printer-1.1.11.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- sources	22 Jul 2009 14:25:19 -0000	1.209
+++ sources	7 Aug 2009 17:12:28 -0000	1.210
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-18d7455f832a9bc5b72d15e5e38913cd  system-config-printer-1.1.10.tar.bz2
+73c67f5ff95aa5b88949c6f15dd2d836  system-config-printer-1.1.11.tar.xz

system-config-printer-getdevices.patch:
 cupspk.py |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

Index: system-config-printer-getdevices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-getdevices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-getdevices.patch	31 Jul 2009 14:14:42 -0000	1.1
+++ system-config-printer-getdevices.patch	7 Aug 2009 17:12:29 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up system-config-printer-1.1.10/cupspk.py.getdevices system-config-printer-1.1.10/cupspk.py
---- system-config-printer-1.1.10/cupspk.py.getdevices	2009-07-31 15:11:10.285962319 +0100
-+++ system-config-printer-1.1.10/cupspk.py	2009-07-31 15:11:23.732961871 +0100
+diff -up system-config-printer-1.1.11/cupspk.py.getdevices system-config-printer-1.1.11/cupspk.py
+--- system-config-printer-1.1.11/cupspk.py.getdevices	2009-08-05 11:33:24.000000000 +0100
++++ system-config-printer-1.1.11/cupspk.py	2009-08-07 18:05:45.528421465 +0100
 @@ -300,7 +300,53 @@ class Connection:
  #    getPPDs
  #    getServerPPD


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- system-config-printer.spec	4 Aug 2009 10:03:38 -0000	1.276
+++ system-config-printer.spec	7 Aug 2009 17:12:29 -0000	1.277
@@ -6,16 +6,15 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.10
-Release: 8%{?dist}
+Version: 1.1.11
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
-Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2
+Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-a6cf4d3.patch
-Patch2: system-config-printer-getdevices.patch
+Patch1: system-config-printer-getdevices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -24,12 +23,9 @@ BuildRequires: desktop-file-utils >= 0.2
 BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
-BuildRequires: dbus-glib-devel
 BuildRequires: xmlto
 BuildRequires: epydoc
 
-BuildRequires: automake, autoconf
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= 2.4.0, pygtk2-libglade
@@ -79,10 +75,7 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .a6cf4d3
-%patch2 -p1 -b .getdevices
-automake --copy --add-missing
-autoconf
+%patch1 -p1 -b .getdevices
 
 %build
 %configure --with-udev-rules
@@ -133,12 +126,7 @@ rm -rf %buildroot
 %files udev
 %defattr(-,root,root,-)
 %{_sysconfdir}/udev/rules.d/*.rules
-%{_sysconfdir}/dbus-1/system.d/*.conf
-%{_libexecdir}/printer-config-daemon
-%{_libexecdir}/udev-add-printer
-%{_datadir}/dbus-1/interfaces/*.xml
-%{_datadir}/dbus-1/system-services/*.service
-/lib/udev/udev-usb-printer
+/lib/udev/*
 
 %files
 %defattr(-,root,root,-)
@@ -195,6 +183,16 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
+- 1.1.11:
+  - Several udev-configure-printer fixes.
+  - Use case-insensitive PPD matching.
+  - Better URI validity testing.
+  - Another stale printer status icon fix.
+  - Notice when jobs stop due to backend errors.
+  - Warn about job history when renaming printers.
+  - Small UI improvements.
+
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-8
 - Dropped foomatic dependency from libs package.
 


--- system-config-printer-1.1.10.tar.bz2.sig DELETED ---


--- system-config-printer-a6cf4d3.patch DELETED ---



From shakthimaan at fedoraproject.org  Fri Aug  7 17:18:35 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  7 Aug 2009 17:18:35 +0000 (UTC)
Subject: rpms/mcu8051ide/devel add-she-bang-itcl.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 import.log, 1.1, 1.2 mcu8051ide.spec, 1.2, 1.3 sources,
	1.2, 1.3 mcu8051-1.1-desktop-exec-path-fix.patch, 1.1,
	NONE mcu8051-1.1-install.sh-spell-cp-p-fixes.patch, 1.1, NONE
Message-ID: <20090807171835.5900B11C00D7@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22855/devel

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Added Files:
	add-she-bang-itcl.patch 
Removed Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
	mcu8051-1.1-install.sh-spell-cp-p-fixes.patch 
Log Message:
Updated to mcu8051ide-1.2 sources.


add-she-bang-itcl.patch:
 itcl.tcl |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE add-she-bang-itcl.patch ---
diff -up ./lib/itcl.tcl.fix ./lib/itcl.tcl
--- ./lib/itcl.tcl.fix	2009-08-06 23:56:25.174372988 +0530
+++ ./lib/itcl.tcl	2009-08-06 23:56:36.441374797 +0530
@@ -1,3 +1,4 @@
+#!/usr/bin/tclsh
 #
 # itcl.tcl
 # ----------------------------------------------------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jun 2009 05:30:42 -0000	1.2
+++ .cvsignore	7 Aug 2009 17:18:34 -0000	1.3
@@ -1 +1 @@
-mcu8051ide-1.1.tar.gz
+mcu8051ide-1.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Jun 2009 05:30:42 -0000	1.1
+++ import.log	7 Aug 2009 17:18:35 -0000	1.2
@@ -1 +1,2 @@
 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


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/mcu8051ide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mcu8051ide.spec	25 Jul 2009 11:55:50 -0000	1.2
+++ mcu8051ide.spec	7 Aug 2009 17:18:35 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           mcu8051ide
-Version:        1.1
-Release:        5%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
 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
-Patch1:         mcu8051-1.1-install.sh-spell-cp-p-fixes.patch
+Patch0:         add-she-bang-itcl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  cmake tk-devel tkimg itcl tdom tcllib bwidget rxvt-unicode
+BuildRequires:  cmake tk-devel tkimg tcllib bwidget rxvt-unicode
+BuildRequires:  itcl >= 3.4
+BuildRequires:  tdom >= 0.8
 BuildRequires:  desktop-file-utils
 Requires:       electronics-menu
 Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc
@@ -22,11 +23,8 @@ Integrated Development Enviroment for so
 (e.g. AT89S8253). Supported languages are assembly and C.
 
 %prep
-%setup -q
-%patch0 -p1 -b .desktop
-%patch1 -p1 -b .sh
-rm lib/.tex*
-rm lib/.html
+%setup -q 
+%patch0 -p1 -b .fix
 
 %build
 %configure
@@ -41,8 +39,6 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/demo
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/{README,ChangeLog,LICENSE,TODO}
 chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
 
 %clean
@@ -59,8 +55,12 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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
+- Removed manual removal of lib/.tex* lib/.html files in setup stage
+- Added patch to add shebang to lib/itcl.tcl script
+- Added itcl, tdom explicit package dependency BuildRequires
 
 * Tue Jun 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.1-4
 - Added Requires: sdcc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jun 2009 05:30:42 -0000	1.2
+++ sources	7 Aug 2009 17:18:35 -0000	1.3
@@ -1 +1 @@
-2065070325c03161cb5b220800551fbc  mcu8051ide-1.1.tar.gz
+caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz


--- mcu8051-1.1-desktop-exec-path-fix.patch DELETED ---


--- mcu8051-1.1-install.sh-spell-cp-p-fixes.patch DELETED ---



From shakthimaan at fedoraproject.org  Fri Aug  7 17:21:37 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  7 Aug 2009 17:21:37 +0000 (UTC)
Subject: rpms/mcu8051ide/F-10 add-she-bang-itcl.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 import.log, 1.1, 1.2 mcu8051ide.spec, 1.1, 1.2 sources,
	1.2, 1.3 mcu8051-1.1-desktop-exec-path-fix.patch, 1.1,
	NONE mcu8051-1.1-install.sh-spell-cp-p-fixes.patch, 1.1, NONE
Message-ID: <20090807172137.667A911C00D7@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23709/F-10

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Added Files:
	add-she-bang-itcl.patch 
Removed Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
	mcu8051-1.1-install.sh-spell-cp-p-fixes.patch 
Log Message:
Updated to mcu8051ide-1.2 sources.


add-she-bang-itcl.patch:
 itcl.tcl |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE add-she-bang-itcl.patch ---
diff -up ./lib/itcl.tcl.fix ./lib/itcl.tcl
--- ./lib/itcl.tcl.fix	2009-08-06 23:56:25.174372988 +0530
+++ ./lib/itcl.tcl	2009-08-06 23:56:36.441374797 +0530
@@ -1,3 +1,4 @@
+#!/usr/bin/tclsh
 #
 # itcl.tcl
 # ----------------------------------------------------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jun 2009 05:34:45 -0000	1.2
+++ .cvsignore	7 Aug 2009 17:21:37 -0000	1.3
@@ -1 +1 @@
-mcu8051ide-1.1.tar.gz
+mcu8051ide-1.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Jun 2009 05:34:45 -0000	1.1
+++ import.log	7 Aug 2009 17:21:37 -0000	1.2
@@ -1 +1,2 @@
 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


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/mcu8051ide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mcu8051ide.spec	19 Jun 2009 05:34:46 -0000	1.1
+++ mcu8051ide.spec	7 Aug 2009 17:21:37 -0000	1.2
@@ -1,18 +1,19 @@
 Name:           mcu8051ide
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
 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
-Patch1:         mcu8051-1.1-install.sh-spell-cp-p-fixes.patch
+Patch0:         add-she-bang-itcl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  cmake tk-devel tkimg itcl tdom tcllib bwidget rxvt-unicode
+BuildRequires:  cmake tk-devel tkimg tcllib bwidget rxvt-unicode
+BuildRequires:  itcl >= 3.4
+BuildRequires:  tdom >= 0.8
 BuildRequires:  desktop-file-utils
 Requires:       electronics-menu
 Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc
@@ -22,11 +23,8 @@ Integrated Development Enviroment for so
 (e.g. AT89S8253). Supported languages are assembly and C.
 
 %prep
-%setup -q
-%patch0 -p1 -b .desktop
-%patch1 -p1 -b .sh
-rm lib/.tex*
-rm lib/.html
+%setup -q 
+%patch0 -p1 -b .fix
 
 %build
 %configure
@@ -41,8 +39,6 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/demo
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/{README,ChangeLog,LICENSE,TODO}
 chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
 
 %clean
@@ -59,6 +55,13 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* 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
+- Removed manual removal of lib/.tex* lib/.html files in setup stage
+- Added patch to add shebang to lib/itcl.tcl script
+- Added itcl, tdom explicit package dependency BuildRequires
+
 * Tue Jun 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.1-4
 - Added Requires: sdcc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jun 2009 05:34:46 -0000	1.2
+++ sources	7 Aug 2009 17:21:37 -0000	1.3
@@ -1 +1 @@
-2065070325c03161cb5b220800551fbc  mcu8051ide-1.1.tar.gz
+caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz


--- mcu8051-1.1-desktop-exec-path-fix.patch DELETED ---


--- mcu8051-1.1-install.sh-spell-cp-p-fixes.patch DELETED ---



From shakthimaan at fedoraproject.org  Fri Aug  7 17:24:07 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri,  7 Aug 2009 17:24:07 +0000 (UTC)
Subject: rpms/mcu8051ide/F-11 add-she-bang-itcl.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 import.log, 1.1, 1.2 mcu8051ide.spec, 1.1, 1.2 sources,
	1.2, 1.3 mcu8051-1.1-desktop-exec-path-fix.patch, 1.1,
	NONE mcu8051-1.1-install.sh-spell-cp-p-fixes.patch, 1.1, NONE
Message-ID: <20090807172407.37F8011C00D7@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25109/F-11

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Added Files:
	add-she-bang-itcl.patch 
Removed Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
	mcu8051-1.1-install.sh-spell-cp-p-fixes.patch 
Log Message:
Updated to mcu8051ide-1.2 sources.


add-she-bang-itcl.patch:
 itcl.tcl |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE add-she-bang-itcl.patch ---
diff -up ./lib/itcl.tcl.fix ./lib/itcl.tcl
--- ./lib/itcl.tcl.fix	2009-08-06 23:56:25.174372988 +0530
+++ ./lib/itcl.tcl	2009-08-06 23:56:36.441374797 +0530
@@ -1,3 +1,4 @@
+#!/usr/bin/tclsh
 #
 # itcl.tcl
 # ----------------------------------------------------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jun 2009 05:38:04 -0000	1.2
+++ .cvsignore	7 Aug 2009 17:24:06 -0000	1.3
@@ -1 +1 @@
-mcu8051ide-1.1.tar.gz
+mcu8051ide-1.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Jun 2009 05:38:04 -0000	1.1
+++ import.log	7 Aug 2009 17:24:06 -0000	1.2
@@ -1 +1,2 @@
 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


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/mcu8051ide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mcu8051ide.spec	19 Jun 2009 05:38:05 -0000	1.1
+++ mcu8051ide.spec	7 Aug 2009 17:24:07 -0000	1.2
@@ -1,18 +1,19 @@
 Name:           mcu8051ide
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
 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
-Patch1:         mcu8051-1.1-install.sh-spell-cp-p-fixes.patch
+Patch0:         add-she-bang-itcl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  cmake tk-devel tkimg itcl tdom tcllib bwidget rxvt-unicode
+BuildRequires:  cmake tk-devel tkimg tcllib bwidget rxvt-unicode
+BuildRequires:  itcl >= 3.4
+BuildRequires:  tdom >= 0.8
 BuildRequires:  desktop-file-utils
 Requires:       electronics-menu
 Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc
@@ -22,11 +23,8 @@ Integrated Development Enviroment for so
 (e.g. AT89S8253). Supported languages are assembly and C.
 
 %prep
-%setup -q
-%patch0 -p1 -b .desktop
-%patch1 -p1 -b .sh
-rm lib/.tex*
-rm lib/.html
+%setup -q 
+%patch0 -p1 -b .fix
 
 %build
 %configure
@@ -41,8 +39,6 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/demo
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/{README,ChangeLog,LICENSE,TODO}
 chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
 
 %clean
@@ -59,6 +55,13 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* 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
+- Removed manual removal of lib/.tex* lib/.html files in setup stage
+- Added patch to add shebang to lib/itcl.tcl script
+- Added itcl, tdom explicit package dependency BuildRequires
+
 * Tue Jun 09 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.1-4
 - Added Requires: sdcc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jun 2009 05:38:05 -0000	1.2
+++ sources	7 Aug 2009 17:24:07 -0000	1.3
@@ -1 +1 @@
-2065070325c03161cb5b220800551fbc  mcu8051ide-1.1.tar.gz
+caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz


--- mcu8051-1.1-desktop-exec-path-fix.patch DELETED ---


--- mcu8051-1.1-install.sh-spell-cp-p-fixes.patch DELETED ---



From firewing at fedoraproject.org  Fri Aug  7 17:24:50 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri,  7 Aug 2009 17:24:50 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-10 .cvsignore, 1.7,
	1.8 audio-convert-mod.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090807172450.3B25911C00D7@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25349/F-10

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
- Update to 3.46.0 (see ChangeLog for details on version changes)
- Update Source0 URL
- Add python-mutagen BuildRequires and Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jan 2009 13:29:13 -0000	1.7
+++ .cvsignore	7 Aug 2009 17:24:49 -0000	1.8
@@ -1 +1 @@
-audio-convert-mod-3.45.5b.tar.gz
+audio-convert-mod-3.46.0.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/audio-convert-mod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- audio-convert-mod.spec	27 Jan 2009 13:29:13 -0000	1.9
+++ audio-convert-mod.spec	7 Aug 2009 17:24:50 -0000	1.10
@@ -1,33 +1,35 @@
 Name:              audio-convert-mod
-Version:           3.45.5b
+Version:           3.46.0
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
-Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Source0:           http://downloads.diffingo.com/audio-convert-mod/audio-convert-mod-%{version}.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, intltool
+# Pulls gettext and autotools
+BuildRequires:     intltool
 BuildRequires:     python >= 2.4
+# Required for tags test
+BuildRequires:     python-mutagen
+
 Requires:          python >= 2.4
 Requires:          pygtk2-libglade
 Requires:          notify-python
-
 # FOSS encoders, decoders, taggers
 Requires:          flac
-Requires:          id3lib
-Requires:          libmp4v2
 Requires:          vorbis-tools
 Requires:          wavpack
+Requires:          python-mutagen
 
 %description
 audio-convert-mod is a simple audio file converter supporting various formats
-via external binaries. It facilitates the batch conversion of audio files
-from one format to another at a right-click. Drag-and-drop is also supported.
-File tags/metadata are preserved when possible.
+via external binaries. It allows for the batch conversion of audio files, either
+from directly within the program or from the file manager. Drag-and-drop
+conversion is also supported. File tags/metadata are preserved when possible.
 
 
 %prep
@@ -64,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
+- Update to 3.46.0 (see ChangeLog for details on version changes)
+- Update Source0 URL
+- Add python-mutagen BuildRequires and Requires
+
 * Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
 - Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
 - Drop NEWS and README


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jan 2009 13:29:13 -0000	1.7
+++ sources	7 Aug 2009 17:24:50 -0000	1.8
@@ -1 +1 @@
-adf1b630c0ea19b03db8e7ebf2132d03  audio-convert-mod-3.45.5b.tar.gz
+72c818e6840bb6a459b37ffe3140d888  audio-convert-mod-3.46.0.tar.bz2



From firewing at fedoraproject.org  Fri Aug  7 17:24:50 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri,  7 Aug 2009 17:24:50 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-11 .cvsignore, 1.7,
	1.8 audio-convert-mod.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090807172450.6D4DF11C00D7@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25349/F-11

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
- Update to 3.46.0 (see ChangeLog for details on version changes)
- Update Source0 URL
- Add python-mutagen BuildRequires and Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jan 2009 13:29:13 -0000	1.7
+++ .cvsignore	7 Aug 2009 17:24:50 -0000	1.8
@@ -1 +1 @@
-audio-convert-mod-3.45.5b.tar.gz
+audio-convert-mod-3.46.0.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-11/audio-convert-mod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- audio-convert-mod.spec	24 Feb 2009 03:08:40 -0000	1.11
+++ audio-convert-mod.spec	7 Aug 2009 17:24:50 -0000	1.12
@@ -1,33 +1,35 @@
 Name:              audio-convert-mod
-Version:           3.45.5b
-Release:           2%{?dist}
+Version:           3.46.0
+Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
-Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Source0:           http://downloads.diffingo.com/audio-convert-mod/audio-convert-mod-%{version}.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, intltool
+# Pulls gettext and autotools
+BuildRequires:     intltool
 BuildRequires:     python >= 2.4
+# Required for tags test
+BuildRequires:     python-mutagen
+
 Requires:          python >= 2.4
 Requires:          pygtk2-libglade
 Requires:          notify-python
-
 # FOSS encoders, decoders, taggers
 Requires:          flac
-Requires:          id3lib
-Requires:          libmp4v2
 Requires:          vorbis-tools
 Requires:          wavpack
+Requires:          python-mutagen
 
 %description
 audio-convert-mod is a simple audio file converter supporting various formats
-via external binaries. It facilitates the batch conversion of audio files
-from one format to another at a right-click. Drag-and-drop is also supported.
-File tags/metadata are preserved when possible.
+via external binaries. It allows for the batch conversion of audio files, either
+from directly within the program or from the file manager. Drag-and-drop
+conversion is also supported. File tags/metadata are preserved when possible.
 
 
 %prep
@@ -64,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
+- Update to 3.46.0 (see ChangeLog for details on version changes)
+- Update Source0 URL
+- Add python-mutagen BuildRequires and Requires
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.45.5b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jan 2009 13:29:13 -0000	1.7
+++ sources	7 Aug 2009 17:24:50 -0000	1.8
@@ -1 +1 @@
-adf1b630c0ea19b03db8e7ebf2132d03  audio-convert-mod-3.45.5b.tar.gz
+72c818e6840bb6a459b37ffe3140d888  audio-convert-mod-3.46.0.tar.bz2



From firewing at fedoraproject.org  Fri Aug  7 17:24:50 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri,  7 Aug 2009 17:24:50 +0000 (UTC)
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.7,
	1.8 audio-convert-mod.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20090807172450.9D34811C00D7@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25349/devel

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
- Update to 3.46.0 (see ChangeLog for details on version changes)
- Update Source0 URL
- Add python-mutagen BuildRequires and Requires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jan 2009 13:29:13 -0000	1.7
+++ .cvsignore	7 Aug 2009 17:24:50 -0000	1.8
@@ -1 +1 @@
-audio-convert-mod-3.45.5b.tar.gz
+audio-convert-mod-3.46.0.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- audio-convert-mod.spec	24 Jul 2009 17:32:43 -0000	1.12
+++ audio-convert-mod.spec	7 Aug 2009 17:24:50 -0000	1.13
@@ -1,33 +1,35 @@
 Name:              audio-convert-mod
-Version:           3.45.5b
-Release:           3%{?dist}
+Version:           3.46.0
+Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
-Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Source0:           http://downloads.diffingo.com/audio-convert-mod/audio-convert-mod-%{version}.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, intltool
+# Pulls gettext and autotools
+BuildRequires:     intltool
 BuildRequires:     python >= 2.4
+# Required for tags test
+BuildRequires:     python-mutagen
+
 Requires:          python >= 2.4
 Requires:          pygtk2-libglade
 Requires:          notify-python
-
 # FOSS encoders, decoders, taggers
 Requires:          flac
-Requires:          id3lib
-Requires:          libmp4v2
 Requires:          vorbis-tools
 Requires:          wavpack
+Requires:          python-mutagen
 
 %description
 audio-convert-mod is a simple audio file converter supporting various formats
-via external binaries. It facilitates the batch conversion of audio files
-from one format to another at a right-click. Drag-and-drop is also supported.
-File tags/metadata are preserved when possible.
+via external binaries. It allows for the batch conversion of audio files, either
+from directly within the program or from the file manager. Drag-and-drop
+conversion is also supported. File tags/metadata are preserved when possible.
 
 
 %prep
@@ -64,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
+- Update to 3.46.0 (see ChangeLog for details on version changes)
+- Update Source0 URL
+- Add python-mutagen BuildRequires and Requires
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.45.5b-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jan 2009 13:29:13 -0000	1.7
+++ sources	7 Aug 2009 17:24:50 -0000	1.8
@@ -1 +1 @@
-adf1b630c0ea19b03db8e7ebf2132d03  audio-convert-mod-3.45.5b.tar.gz
+72c818e6840bb6a459b37ffe3140d888  audio-convert-mod-3.46.0.tar.bz2



From twaugh at fedoraproject.org  Fri Aug  7 17:26:31 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  7 Aug 2009 17:26:31 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-1.1.11.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.203, 1.204 sources, 1.209, 1.210 system-config-printer.spec,
	1.271, 1.272 system-config-printer-1.1.10.tar.bz2.sig, 1.1,
	NONE system-config-printer-case-insensitive-matching.patch, 1.1, NONE
Message-ID: <20090807172631.C486A11C00D7@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-serv25950

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.11.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.10.tar.bz2.sig 
	system-config-printer-case-insensitive-matching.patch 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
- 1.1.11:
  - Several udev-configure-printer fixes.
  - Use case-insensitive PPD matching.
  - Better URI validity testing.
  - Another stale printer status icon fix.
  - Notice when jobs stop due to backend errors.
  - Warn about job history when renaming printers.
  - Small UI improvements.



--- NEW FILE system-config-printer-1.1.11.tar.xz.sig ---
??
?R?N??`??VS??U

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/.cvsignore,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- .cvsignore	28 Jul 2009 11:27:45 -0000	1.203
+++ .cvsignore	7 Aug 2009 17:26:31 -0000	1.204
@@ -202,3 +202,4 @@ system-config-printer-1.1.7.tar.bz2
 pycups-1.9.46.tar.bz2
 system-config-printer-1.1.8.tar.bz2
 system-config-printer-1.1.10.tar.bz2
+system-config-printer-1.1.11.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/sources,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- sources	28 Jul 2009 11:27:45 -0000	1.209
+++ sources	7 Aug 2009 17:26:31 -0000	1.210
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-18d7455f832a9bc5b72d15e5e38913cd  system-config-printer-1.1.10.tar.bz2
+73c67f5ff95aa5b88949c6f15dd2d836  system-config-printer-1.1.11.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- system-config-printer.spec	28 Jul 2009 11:27:45 -0000	1.271
+++ system-config-printer.spec	7 Aug 2009 17:26:31 -0000	1.272
@@ -6,15 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.10
+Version: 1.1.11
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
-Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2
+Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-case-insensitive-matching.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -63,7 +62,6 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .case-insensitive-matching
 
 %build
 %configure
@@ -166,6 +164,16 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
+- 1.1.11:
+  - Several udev-configure-printer fixes.
+  - Use case-insensitive PPD matching.
+  - Better URI validity testing.
+  - Another stale printer status icon fix.
+  - Notice when jobs stop due to backend errors.
+  - Warn about job history when renaming printers.
+  - Small UI improvements.
+
 * Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-1
 - Dropped no-longer-used python-sexy dependency.
 - 1.1.10:


--- system-config-printer-1.1.10.tar.bz2.sig DELETED ---


--- system-config-printer-case-insensitive-matching.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Aug  7 18:08:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:08:44 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested commit
Message-ID: <20090807180844.ECC0E10F879@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on oxygen-icon-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:08:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:08:46 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested watchbugzilla
Message-ID: <20090807180846.770D710F8A9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on oxygen-icon-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:08:49 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested watchcommits
Message-ID: <20090807180849.5028110F8B7@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on oxygen-icon-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:08:50 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested commit
Message-ID: <20090807180850.7890810F8BE@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on oxygen-icon-theme (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:08:51 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested watchbugzilla
Message-ID: <20090807180851.E000C10F8C5@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on oxygen-icon-theme (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:08:53 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested watchcommits
Message-ID: <20090807180853.7F14C10F8CC@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on oxygen-icon-theme (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From rdieter at fedoraproject.org  Fri Aug  7 18:22:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 18:22:52 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.57, 1.58 kde-settings.spec,
	1.79, 1.80 sources, 1.58, 1.59
Message-ID: <20090807182252.EB66511C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7443

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-2
- add default plasmarc, plasma-desktop-appletrc (#516263)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	7 Aug 2009 12:25:39 -0000	1.57
+++ .cvsignore	7 Aug 2009 18:22:52 -0000	1.58
@@ -1 +1 @@
-kde-settings-4.3-1.tar.bz2
+kde-settings-4.3-2.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- kde-settings.spec	7 Aug 2009 12:25:40 -0000	1.79
+++ kde-settings.spec	7 Aug 2009 18:22:52 -0000	1.80
@@ -3,7 +3,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: 1
+Release: 2
 
 Group:   System Environment/Base
 License: Public Domain
@@ -151,6 +151,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-2
+- add default plasmarc, plasma-desktop-appletrc (#516263)
+
 * Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-1
 - upstream branch for F-12 (kde-4.3)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	7 Aug 2009 12:25:40 -0000	1.58
+++ sources	7 Aug 2009 18:22:52 -0000	1.59
@@ -1 +1 @@
-1e5e73189228b70decbfad5e45f7848d  kde-settings-4.3-1.tar.bz2
+aaec4b24db35726824a330c8092c9335  kde-settings-4.3-2.tar.bz2



From rdieter at fedoraproject.org  Fri Aug  7 18:28:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 18:28:42 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.56, 1.57 kde-settings.spec,
	1.75, 1.76 sources, 1.57, 1.58
Message-ID: <20090807182842.9835B11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9467

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-11
- add default plasmarc, plasma-desktop-appletrc (#516263)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	30 Apr 2009 18:40:33 -0000	1.56
+++ .cvsignore	7 Aug 2009 18:28:42 -0000	1.57
@@ -1 +1 @@
-kde-settings-4.2-20090430svn.tar.bz2
+kde-settings-4.2-11.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- kde-settings.spec	30 Apr 2009 18:40:33 -0000	1.75
+++ kde-settings.spec	7 Aug 2009 18:28:42 -0000	1.76
@@ -1,20 +1,13 @@
 # THIS SPECFILE IS FOR F11 ONLY!
-# Sorry, it is just too different for conditionals to be worth it.
-# The actuall tarball also DIFFERS between releases!
-# Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
-
-%define rel 20090430svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 10.%{rel}%{?dist}
-
+Release: 11
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: kde-settings-%{version}-%{rel}.tar.bz2
-# used to generate Source0
+Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{release}.tar.bz2
 Source1: kde-settings-svn.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -70,7 +63,7 @@ Requires: xine-lib-pulseaudio
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}-%{release}
 
 
 %build
@@ -158,6 +151,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-11
+- add default plasmarc, plasma-desktop-appletrc (#516263)
+
 * Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-10.20090430svn
 - nepomukserverrc: disable nepomuk
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	30 Apr 2009 18:40:33 -0000	1.57
+++ sources	7 Aug 2009 18:28:42 -0000	1.58
@@ -1 +1 @@
-c49d47bdbfdd148edea664b3707fe668  kde-settings-4.2-20090430svn.tar.bz2
+ba7561b87f789f8472019ee9a2087224  kde-settings-4.2-11.tar.bz2



From rdieter at fedoraproject.org  Fri Aug  7 18:30:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  7 Aug 2009 18:30:54 +0000 (UTC)
Subject: rpms/kde-settings/F-10 .cvsignore, 1.48, 1.49 kde-settings.spec,
	1.66, 1.67 sources, 1.48, 1.49
Message-ID: <20090807183054.3DBB911C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9967

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-7
- add default plasmarc, plasma-desktop-appletrc (#516263)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	6 Feb 2009 17:58:55 -0000	1.48
+++ .cvsignore	7 Aug 2009 18:30:53 -0000	1.49
@@ -1 +1 @@
-kde-settings-4.1-20090206svn.tar.bz2
+kde-settings-4.1-7.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/kde-settings.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- kde-settings.spec	6 Feb 2009 19:14:20 -0000	1.66
+++ kde-settings.spec	7 Aug 2009 18:30:53 -0000	1.67
@@ -1,20 +1,14 @@
 # THIS SPECFILE IS FOR F10 ONLY!
-# Sorry, it is just too different for conditionals to be worth it.
-# The actuall tarball also DIFFERS between releases!
-# Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
-
-%define rel 20090206svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.1
-Release: 6.%{rel}%{?dist}
+Release: 7 
 
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: kde-settings-%{version}-%{rel}.tar.bz2
-# used to generate Source0
+Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{release}.tar.bz2
 Source1: kde-settings-svn.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -70,7 +64,7 @@ Requires: xine-lib-pulseaudio
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{release}
 
 
 %build
@@ -158,6 +152,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-7
+- add default plasmarc, plasma-desktop-appletrc (#516263)
+
 * Fri Feb 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-6.20090206svn
 - remove defaults.list, add mimeapps.list, including
   prefs to fix "mime-type/extension for .rpm is wrong" (#457783)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	6 Feb 2009 17:58:55 -0000	1.48
+++ sources	7 Aug 2009 18:30:54 -0000	1.49
@@ -1 +1 @@
-b47ba132dcb6cf6eb276357cf479d127  kde-settings-4.1-20090206svn.tar.bz2
+dd1af06adc935b9a254484c015bb879f  kde-settings-4.1-7.tar.bz2



From pkgdb at fedoraproject.org  Fri Aug  7 18:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:35:03 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20090807183503.184BD10F879@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on oxygen-icon-theme (Fedora 9) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:35:03 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20090807183503.B28DB10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on oxygen-icon-theme (Fedora 9) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:35:05 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20090807183505.9E93010F8B6@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on oxygen-icon-theme (Fedora 9) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:35:08 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20090807183509.1079110F8BD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on oxygen-icon-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:35:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:35:10 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20090807183510.5D32A10F8C4@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on oxygen-icon-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Fri Aug  7 18:35:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 18:35:10 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20090807183510.A67CD10F8CB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on oxygen-icon-theme (Fedora 11) to Approved for mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oxygen-icon-theme



From jforbes at fedoraproject.org  Fri Aug  7 19:07:40 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri,  7 Aug 2009 19:07:40 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ksm-updates.patch, NONE, 1.1 kernel.spec,
	1.1703, 1.1704
Message-ID: <20090807190740.0D89111C00D7@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18159

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ksm-updates.patch 
Log Message:
Include KSM updates from upstream

linux-2.6-ksm-updates.patch:
 Documentation/vm/00-INDEX |    2 
 Documentation/vm/ksm.txt  |   89 ++++++
 include/linux/ksm.h       |   31 +-
 kernel/fork.c             |    1 
 mm/Kconfig                |    2 
 mm/ksm.c                  |  665 ++++++++++++++++++++++++++++------------------
 mm/memory.c               |    5 
 mm/mmap.c                 |   16 -
 8 files changed, 539 insertions(+), 272 deletions(-)

--- NEW FILE linux-2.6-ksm-updates.patch ---
Date: 	Mon, 3 Aug 2009 13:10:02 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 1/12] ksm: rename kernel_pages_allocated

We're not implementing swapping of KSM pages in its first release;
but when that follows, "kernel_pages_allocated" will be a very poor
name for the sysfs file showing number of nodes in the stable tree:
rename that to "pages_shared" throughout.

But we already have a "pages_shared", counting those page slots
sharing the shared pages: first rename that to... "pages_sharing".

What will become of "max_kernel_pages" when the pages shared can
be swapped?  I guess it will just be removed, so keep that name.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   57 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

--- ksm0/mm/ksm.c	2009-08-01 05:02:09.000000000 +0100
+++ ksm1/mm/ksm.c	2009-08-02 13:49:36.000000000 +0100
@@ -150,10 +150,10 @@ static struct kmem_cache *rmap_item_cach
 static struct kmem_cache *mm_slot_cache;
 
 /* The number of nodes in the stable tree */
-static unsigned long ksm_kernel_pages_allocated;
+static unsigned long ksm_pages_shared;
 
 /* The number of page slots sharing those nodes */
-static unsigned long ksm_pages_shared;
+static unsigned long ksm_pages_sharing;
 
 /* Limit on the number of unswappable pages used */
 static unsigned long ksm_max_kernel_pages;
@@ -384,7 +384,7 @@ static void remove_rmap_item_from_tree(s
 				next_item->address |= NODE_FLAG;
 			} else {
 				rb_erase(&rmap_item->node, &root_stable_tree);
-				ksm_kernel_pages_allocated--;
+				ksm_pages_shared--;
 			}
 		} else {
 			struct rmap_item *prev_item = rmap_item->prev;
@@ -398,7 +398,7 @@ static void remove_rmap_item_from_tree(s
 		}
 
 		rmap_item->next = NULL;
-		ksm_pages_shared--;
+		ksm_pages_sharing--;
 
 	} else if (rmap_item->address & NODE_FLAG) {
 		unsigned char age;
@@ -748,7 +748,7 @@ static int try_to_merge_two_pages(struct
 	 * is the number of kernel pages that we hold.
 	 */
 	if (ksm_max_kernel_pages &&
-	    ksm_max_kernel_pages <= ksm_kernel_pages_allocated)
+	    ksm_max_kernel_pages <= ksm_pages_shared)
 		return err;
 
 	kpage = alloc_page(GFP_HIGHUSER);
@@ -787,7 +787,7 @@ static int try_to_merge_two_pages(struct
 		if (err)
 			break_cow(mm1, addr1);
 		else
-			ksm_pages_shared += 2;
+			ksm_pages_sharing += 2;
 	}
 
 	put_page(kpage);
@@ -817,7 +817,7 @@ static int try_to_merge_with_ksm_page(st
 	up_read(&mm1->mmap_sem);
 
 	if (!err)
-		ksm_pages_shared++;
+		ksm_pages_sharing++;
 
 	return err;
 }
@@ -935,7 +935,7 @@ static struct rmap_item *stable_tree_ins
 		}
 	}
 
-	ksm_kernel_pages_allocated++;
+	ksm_pages_shared++;
 
 	rmap_item->address |= NODE_FLAG | STABLE_FLAG;
 	rmap_item->next = NULL;
@@ -1051,7 +1051,7 @@ static void cmp_and_merge_page(struct pa
 	tree_rmap_item = stable_tree_search(page, page2, rmap_item);
 	if (tree_rmap_item) {
 		if (page == page2[0]) {			/* forked */
-			ksm_pages_shared++;
+			ksm_pages_sharing++;
 			err = 0;
 		} else
 			err = try_to_merge_with_ksm_page(rmap_item->mm,
@@ -1114,7 +1114,7 @@ static void cmp_and_merge_page(struct pa
 				break_cow(tree_rmap_item->mm,
 						tree_rmap_item->address);
 				break_cow(rmap_item->mm, rmap_item->address);
-				ksm_pages_shared -= 2;
+				ksm_pages_sharing -= 2;
 			}
 		}
 
@@ -1430,7 +1430,7 @@ static ssize_t run_store(struct kobject
 	/*
 	 * KSM_RUN_MERGE sets ksmd running, and 0 stops it running.
 	 * KSM_RUN_UNMERGE stops it running and unmerges all rmap_items,
-	 * breaking COW to free the kernel_pages_allocated (but leaves
+	 * breaking COW to free the unswappable pages_shared (but leaves
 	 * mm_slots on the list for when ksmd may be set running again).
 	 */
 
@@ -1449,22 +1449,6 @@ static ssize_t run_store(struct kobject
 }
 KSM_ATTR(run);
 
-static ssize_t pages_shared_show(struct kobject *kobj,
-				 struct kobj_attribute *attr, char *buf)
-{
-	return sprintf(buf, "%lu\n",
-			ksm_pages_shared - ksm_kernel_pages_allocated);
-}
-KSM_ATTR_RO(pages_shared);
-
-static ssize_t kernel_pages_allocated_show(struct kobject *kobj,
-					   struct kobj_attribute *attr,
-					   char *buf)
-{
-	return sprintf(buf, "%lu\n", ksm_kernel_pages_allocated);
-}
-KSM_ATTR_RO(kernel_pages_allocated);
-
 static ssize_t max_kernel_pages_store(struct kobject *kobj,
 				      struct kobj_attribute *attr,
 				      const char *buf, size_t count)
@@ -1488,13 +1472,28 @@ static ssize_t max_kernel_pages_show(str
 }
 KSM_ATTR(max_kernel_pages);
 
+static ssize_t pages_shared_show(struct kobject *kobj,
+				 struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_pages_shared);
+}
+KSM_ATTR_RO(pages_shared);
+
+static ssize_t pages_sharing_show(struct kobject *kobj,
+				  struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n",
+			ksm_pages_sharing - ksm_pages_shared);
+}
+KSM_ATTR_RO(pages_sharing);
+
 static struct attribute *ksm_attrs[] = {
 	&sleep_millisecs_attr.attr,
 	&pages_to_scan_attr.attr,
 	&run_attr.attr,
-	&pages_shared_attr.attr,
-	&kernel_pages_allocated_attr.attr,
 	&max_kernel_pages_attr.attr,
+	&pages_shared_attr.attr,
+	&pages_sharing_attr.attr,
 	NULL,
 };
 
--
Date: 	Mon, 3 Aug 2009 13:11:00 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 2/12] ksm: move pages_sharing updates

The pages_shared count is incremented and decremented when adding a node
to and removing a node from the stable tree: easy to understand.  But the
pages_sharing count was hard to follow, being adjusted in various places:
increment and decrement it when adding to and removing from the stable tree.

And the pages_sharing variable used to include the pages_shared, then those
were subtracted when shown in the pages_sharing sysfs file: now keep it as
an exclusive count of leaves hanging off the stable tree nodes, throughout.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

--- ksm1/mm/ksm.c	2009-08-02 13:49:36.000000000 +0100
+++ ksm2/mm/ksm.c	2009-08-02 13:49:43.000000000 +0100
@@ -152,7 +152,7 @@ static struct kmem_cache *mm_slot_cache;
 /* The number of nodes in the stable tree */
 static unsigned long ksm_pages_shared;
 
-/* The number of page slots sharing those nodes */
+/* The number of page slots additionally sharing those nodes */
 static unsigned long ksm_pages_sharing;
 
 /* Limit on the number of unswappable pages used */
@@ -382,6 +382,7 @@ static void remove_rmap_item_from_tree(s
 						&next_item->node,
 						&root_stable_tree);
 				next_item->address |= NODE_FLAG;
+				ksm_pages_sharing--;
 			} else {
 				rb_erase(&rmap_item->node, &root_stable_tree);
 				ksm_pages_shared--;
@@ -395,10 +396,10 @@ static void remove_rmap_item_from_tree(s
 				BUG_ON(next_item->prev != rmap_item);
 				next_item->prev = rmap_item->prev;
 			}
+			ksm_pages_sharing--;
 		}
 
 		rmap_item->next = NULL;
-		ksm_pages_sharing--;
 
 	} else if (rmap_item->address & NODE_FLAG) {
 		unsigned char age;
@@ -786,8 +787,6 @@ static int try_to_merge_two_pages(struct
 		 */
 		if (err)
 			break_cow(mm1, addr1);
-		else
-			ksm_pages_sharing += 2;
 	}
 
 	put_page(kpage);
@@ -816,9 +815,6 @@ static int try_to_merge_with_ksm_page(st
 	err = try_to_merge_one_page(vma, page1, kpage);
 	up_read(&mm1->mmap_sem);
 
-	if (!err)
-		ksm_pages_sharing++;
-
 	return err;
 }
 
@@ -935,13 +931,12 @@ static struct rmap_item *stable_tree_ins
 		}
 	}
 
-	ksm_pages_shared++;
-
 	rmap_item->address |= NODE_FLAG | STABLE_FLAG;
 	rmap_item->next = NULL;
 	rb_link_node(&rmap_item->node, parent, new);
 	rb_insert_color(&rmap_item->node, &root_stable_tree);
 
+	ksm_pages_shared++;
 	return rmap_item;
 }
 
@@ -1026,6 +1021,8 @@ static void stable_tree_append(struct rm
 
 	tree_rmap_item->next = rmap_item;
 	rmap_item->address |= STABLE_FLAG;
+
+	ksm_pages_sharing++;
 }
 
 /*
@@ -1050,10 +1047,9 @@ static void cmp_and_merge_page(struct pa
 	/* We first start with searching the page inside the stable tree */
 	tree_rmap_item = stable_tree_search(page, page2, rmap_item);
 	if (tree_rmap_item) {
-		if (page == page2[0]) {			/* forked */
-			ksm_pages_sharing++;
+		if (page == page2[0])			/* forked */
 			err = 0;
-		} else
+		else
 			err = try_to_merge_with_ksm_page(rmap_item->mm,
 							 rmap_item->address,
 							 page, page2[0]);
@@ -1114,7 +1110,6 @@ static void cmp_and_merge_page(struct pa
 				break_cow(tree_rmap_item->mm,
 						tree_rmap_item->address);
 				break_cow(rmap_item->mm, rmap_item->address);
-				ksm_pages_sharing -= 2;
 			}
 		}
 
@@ -1482,8 +1477,7 @@ KSM_ATTR_RO(pages_shared);
 static ssize_t pages_sharing_show(struct kobject *kobj,
 				  struct kobj_attribute *attr, char *buf)
 {
-	return sprintf(buf, "%lu\n",
-			ksm_pages_sharing - ksm_pages_shared);
+	return sprintf(buf, "%lu\n", ksm_pages_sharing);
 }
 KSM_ATTR_RO(pages_sharing);
 
--
Date: 	Mon, 3 Aug 2009 13:11:53 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 3/12] ksm: pages_unshared and pages_volatile

The pages_shared and pages_sharing counts give a good picture of how
successful KSM is at sharing; but no clue to how much wasted work it's
doing to get there.  Add pages_unshared (count of unique pages waiting
in the unstable tree, hoping to find a mate) and pages_volatile.

pages_volatile is harder to define.  It includes those pages changing
too fast to get into the unstable tree, but also whatever other edge
conditions prevent a page getting into the trees: a high value may
deserve investigation.  Don't try to calculate it from the various
conditions: it's the total of rmap_items less those accounted for.

Also show full_scans: the number of completed scans of everything
registered in the mm list.

The locking for all these counts is simply ksm_thread_mutex.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

--- ksm2/mm/ksm.c	2009-08-02 13:49:43.000000000 +0100
+++ ksm3/mm/ksm.c	2009-08-02 13:49:51.000000000 +0100
@@ -155,6 +155,12 @@ static unsigned long ksm_pages_shared;
 /* The number of page slots additionally sharing those nodes */
 static unsigned long ksm_pages_sharing;
 
+/* The number of nodes in the unstable tree */
+static unsigned long ksm_pages_unshared;
+
+/* The number of rmap_items in use: to calculate pages_volatile */
+static unsigned long ksm_rmap_items;
+
 /* Limit on the number of unswappable pages used */
 static unsigned long ksm_max_kernel_pages;
 
@@ -204,11 +210,17 @@ static void __init ksm_slab_free(void)
 
 static inline struct rmap_item *alloc_rmap_item(void)
 {
-	return kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+	struct rmap_item *rmap_item;
+
+	rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+	if (rmap_item)
+		ksm_rmap_items++;
+	return rmap_item;
 }
 
 static inline void free_rmap_item(struct rmap_item *rmap_item)
 {
+	ksm_rmap_items--;
 	rmap_item->mm = NULL;	/* debug safety */
 	kmem_cache_free(rmap_item_cache, rmap_item);
 }
@@ -419,6 +431,7 @@ static void remove_rmap_item_from_tree(s
 		BUG_ON(age > 2);
 		if (!age)
 			rb_erase(&rmap_item->node, &root_unstable_tree);
+		ksm_pages_unshared--;
 	}
 
 	rmap_item->address &= PAGE_MASK;
@@ -1002,6 +1015,7 @@ static struct rmap_item *unstable_tree_s
 	rb_link_node(&rmap_item->node, parent, new);
 	rb_insert_color(&rmap_item->node, &root_unstable_tree);
 
+	ksm_pages_unshared++;
 	return NULL;
 }
 
@@ -1098,6 +1112,8 @@ static void cmp_and_merge_page(struct pa
 		if (!err) {
 			rb_erase(&tree_rmap_item->node, &root_unstable_tree);
 			tree_rmap_item->address &= ~NODE_FLAG;
+			ksm_pages_unshared--;
+
 			/*
 			 * If we fail to insert the page into the stable tree,
 			 * we will have 2 virtual addresses that are pointing
@@ -1481,6 +1497,37 @@ static ssize_t pages_sharing_show(struct
 }
 KSM_ATTR_RO(pages_sharing);
 
+static ssize_t pages_unshared_show(struct kobject *kobj,
+				   struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_pages_unshared);
+}
+KSM_ATTR_RO(pages_unshared);
+
+static ssize_t pages_volatile_show(struct kobject *kobj,
+				   struct kobj_attribute *attr, char *buf)
+{
+	long ksm_pages_volatile;
+
+	ksm_pages_volatile = ksm_rmap_items - ksm_pages_shared
+				- ksm_pages_sharing - ksm_pages_unshared;
+	/*
+	 * It was not worth any locking to calculate that statistic,
+	 * but it might therefore sometimes be negative: conceal that.
+	 */
+	if (ksm_pages_volatile < 0)
+		ksm_pages_volatile = 0;
+	return sprintf(buf, "%ld\n", ksm_pages_volatile);
+}
+KSM_ATTR_RO(pages_volatile);
+
+static ssize_t full_scans_show(struct kobject *kobj,
+			       struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_scan.seqnr);
+}
+KSM_ATTR_RO(full_scans);
+
 static struct attribute *ksm_attrs[] = {
 	&sleep_millisecs_attr.attr,
 	&pages_to_scan_attr.attr,
@@ -1488,6 +1535,9 @@ static struct attribute *ksm_attrs[] = {
 	&max_kernel_pages_attr.attr,
 	&pages_shared_attr.attr,
 	&pages_sharing_attr.attr,
+	&pages_unshared_attr.attr,
+	&pages_volatile_attr.attr,
+	&full_scans_attr.attr,
 	NULL,
 };
 
--
Date: 	Mon, 3 Aug 2009 13:12:59 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 4/12] ksm: break cow once unshared

We kept agreeing not to bother about the unswappable shared KSM pages
which later become unshared by others: observation suggests they're not
a significant proportion.  But they are disadvantageous, and it is easier
to break COW to replace them by swappable pages, than offer statistics
to show that they don't matter; then we can stop worrying about them.

Doing this in ksm_do_scan, they don't go through cmp_and_merge_page on
this pass: give them a good chance of getting into the unstable tree
on the next pass, or back into the stable, by computing checksum now.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- ksm3/mm/ksm.c	2009-08-02 13:49:51.000000000 +0100
+++ ksm4/mm/ksm.c	2009-08-02 13:49:59.000000000 +0100
@@ -1275,6 +1275,14 @@ static void ksm_do_scan(unsigned int sca
 			return;
 		if (!PageKsm(page) || !in_stable_tree(rmap_item))
 			cmp_and_merge_page(page, rmap_item);
+		else if (page_mapcount(page) == 1) {
+			/*
+			 * Replace now-unshared ksm page by ordinary page.
+			 */
+			break_cow(rmap_item->mm, rmap_item->address);
+			remove_rmap_item_from_tree(rmap_item);
+			rmap_item->oldchecksum = calc_checksum(page);
+		}
 		put_page(page);
 	}
 }
--
Date: 	Mon, 3 Aug 2009 13:14:03 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 5/12] ksm: keep quiet while list empty

ksm_scan_thread already sleeps in wait_event_interruptible until setting
ksm_run activates it; but if there's nothing on its list to look at, i.e.
nobody has yet said madvise MADV_MERGEABLE, it's a shame to be clocking
up system time and full_scans: ksmd_should_run added to check that too.

And move the mutex_lock out around it: the new counts showed that when
ksm_run is stopped, a little work often got done afterwards, because it
had been read before taking the mutex.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

--- ksm4/mm/ksm.c	2009-08-02 13:49:59.000000000 +0100
+++ ksm5/mm/ksm.c	2009-08-02 13:50:07.000000000 +0100
@@ -1287,21 +1287,27 @@ static void ksm_do_scan(unsigned int sca
 	}
 }
 
+static int ksmd_should_run(void)
+{
+	return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.mm_list);
+}
+
 static int ksm_scan_thread(void *nothing)
 {
 	set_user_nice(current, 5);
 
 	while (!kthread_should_stop()) {
-		if (ksm_run & KSM_RUN_MERGE) {
-			mutex_lock(&ksm_thread_mutex);
+		mutex_lock(&ksm_thread_mutex);
+		if (ksmd_should_run())
 			ksm_do_scan(ksm_thread_pages_to_scan);
-			mutex_unlock(&ksm_thread_mutex);
+		mutex_unlock(&ksm_thread_mutex);
+
+		if (ksmd_should_run()) {
 			schedule_timeout_interruptible(
 				msecs_to_jiffies(ksm_thread_sleep_millisecs));
 		} else {
 			wait_event_interruptible(ksm_thread_wait,
-					(ksm_run & KSM_RUN_MERGE) ||
-					kthread_should_stop());
+				ksmd_should_run() || kthread_should_stop());
 		}
 	}
 	return 0;
@@ -1346,10 +1352,16 @@ int ksm_madvise(struct vm_area_struct *v
 
 int __ksm_enter(struct mm_struct *mm)
 {
-	struct mm_slot *mm_slot = alloc_mm_slot();
+	struct mm_slot *mm_slot;
+	int needs_wakeup;
+
+	mm_slot = alloc_mm_slot();
 	if (!mm_slot)
 		return -ENOMEM;
 
+	/* Check ksm_run too?  Would need tighter locking */
+	needs_wakeup = list_empty(&ksm_mm_head.mm_list);
+
 	spin_lock(&ksm_mmlist_lock);
 	insert_to_mm_slots_hash(mm, mm_slot);
 	/*
@@ -1361,6 +1373,10 @@ int __ksm_enter(struct mm_struct *mm)
 	spin_unlock(&ksm_mmlist_lock);
 
 	set_bit(MMF_VM_MERGEABLE, &mm->flags);
+
+	if (needs_wakeup)
+		wake_up_interruptible(&ksm_thread_wait);
+
 	return 0;
 }
 
--
Date: 	Mon, 3 Aug 2009 13:15:15 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 6/12] ksm: five little cleanups

1. We don't use __break_cow entry point now: merge it into break_cow.
2. remove_all_slot_rmap_items is just a special case of
   remove_trailing_rmap_items: use the latter instead.
3. Extend comment on unmerge_ksm_pages and rmap_items.
4. try_to_merge_two_pages should use try_to_merge_with_ksm_page
   instead of duplicating its code; and so swap them around.
5. Comment on cmp_and_merge_page described last year's: update it.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |  112 ++++++++++++++++++++---------------------------------
 1 file changed, 44 insertions(+), 68 deletions(-)

--- ksm5/mm/ksm.c	2009-08-02 13:50:07.000000000 +0100
+++ ksm6/mm/ksm.c	2009-08-02 13:50:15.000000000 +0100
@@ -315,22 +315,18 @@ static void break_ksm(struct vm_area_str
 	/* Which leaves us looping there if VM_FAULT_OOM: hmmm... */
 }
 
-static void __break_cow(struct mm_struct *mm, unsigned long addr)
+static void break_cow(struct mm_struct *mm, unsigned long addr)
 {
 	struct vm_area_struct *vma;
 
+	down_read(&mm->mmap_sem);
 	vma = find_vma(mm, addr);
 	if (!vma || vma->vm_start > addr)
-		return;
+		goto out;
 	if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
-		return;
+		goto out;
 	break_ksm(vma, addr);
-}
-
-static void break_cow(struct mm_struct *mm, unsigned long addr)
-{
-	down_read(&mm->mmap_sem);
-	__break_cow(mm, addr);
+out:
 	up_read(&mm->mmap_sem);
 }
 
@@ -439,17 +435,6 @@ static void remove_rmap_item_from_tree(s
 	cond_resched();		/* we're called from many long loops */
 }
 
-static void remove_all_slot_rmap_items(struct mm_slot *mm_slot)
-{
-	struct rmap_item *rmap_item, *node;
-
-	list_for_each_entry_safe(rmap_item, node, &mm_slot->rmap_list, link) {
-		remove_rmap_item_from_tree(rmap_item);
-		list_del(&rmap_item->link);
-		free_rmap_item(rmap_item);
-	}
-}
-
 static void remove_trailing_rmap_items(struct mm_slot *mm_slot,
 				       struct list_head *cur)
 {
@@ -471,6 +456,11 @@ static void remove_trailing_rmap_items(s
  * page and upping mmap_sem.  Nor does it fit with the way we skip dup'ing
  * rmap_items from parent to child at fork time (so as not to waste time
  * if exit comes before the next scan reaches it).
+ *
+ * Similarly, although we'd like to remove rmap_items (so updating counts
+ * and freeing memory) when unmerging an area, it's easier to leave that
+ * to the next pass of ksmd - consider, for example, how ksmd might be
+ * in cmp_and_merge_page on one of the rmap_items we would be removing.
  */
 static void unmerge_ksm_pages(struct vm_area_struct *vma,
 			      unsigned long start, unsigned long end)
@@ -495,7 +485,7 @@ static void unmerge_and_remove_all_rmap_
 				continue;
 			unmerge_ksm_pages(vma, vma->vm_start, vma->vm_end);
 		}
-		remove_all_slot_rmap_items(mm_slot);
+		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
 		up_read(&mm->mmap_sem);
 	}
 
@@ -533,7 +523,7 @@ static void remove_mm_from_lists(struct
 	list_del(&mm_slot->mm_list);
 	spin_unlock(&ksm_mmlist_lock);
 
-	remove_all_slot_rmap_items(mm_slot);
+	remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
 	free_mm_slot(mm_slot);
 	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
 }
@@ -740,6 +730,29 @@ out:
 }
 
 /*
+ * try_to_merge_with_ksm_page - like try_to_merge_two_pages,
+ * but no new kernel page is allocated: kpage must already be a ksm page.
+ */
+static int try_to_merge_with_ksm_page(struct mm_struct *mm1,
+				      unsigned long addr1,
+				      struct page *page1,
+				      struct page *kpage)
+{
+	struct vm_area_struct *vma;
+	int err = -EFAULT;
+
+	down_read(&mm1->mmap_sem);
+	vma = find_vma(mm1, addr1);
+	if (!vma || vma->vm_start > addr1)
+		goto out;
+
+	err = try_to_merge_one_page(vma, page1, kpage);
+out:
+	up_read(&mm1->mmap_sem);
+	return err;
+}
+
+/*
  * try_to_merge_two_pages - take two identical pages and prepare them
  * to be merged into one page.
  *
@@ -772,9 +785,8 @@ static int try_to_merge_two_pages(struct
 	down_read(&mm1->mmap_sem);
 	vma = find_vma(mm1, addr1);
 	if (!vma || vma->vm_start > addr1) {
-		put_page(kpage);
 		up_read(&mm1->mmap_sem);
-		return err;
+		goto out;
 	}
 
 	copy_user_highpage(kpage, page1, addr1, vma);
@@ -782,56 +794,20 @@ static int try_to_merge_two_pages(struct
 	up_read(&mm1->mmap_sem);
 
 	if (!err) {
-		down_read(&mm2->mmap_sem);
-		vma = find_vma(mm2, addr2);
-		if (!vma || vma->vm_start > addr2) {
-			put_page(kpage);
-			up_read(&mm2->mmap_sem);
-			break_cow(mm1, addr1);
-			return -EFAULT;
-		}
-
-		err = try_to_merge_one_page(vma, page2, kpage);
-		up_read(&mm2->mmap_sem);
-
+		err = try_to_merge_with_ksm_page(mm2, addr2, page2, kpage);
 		/*
-		 * If the second try_to_merge_one_page failed, we have a
-		 * ksm page with just one pte pointing to it, so break it.
+		 * If that fails, we have a ksm page with only one pte
+		 * pointing to it: so break it.
 		 */
 		if (err)
 			break_cow(mm1, addr1);
 	}
-
+out:
 	put_page(kpage);
 	return err;
 }
 
 /*
- * try_to_merge_with_ksm_page - like try_to_merge_two_pages,
- * but no new kernel page is allocated: kpage must already be a ksm page.
- */
-static int try_to_merge_with_ksm_page(struct mm_struct *mm1,
-				      unsigned long addr1,
-				      struct page *page1,
-				      struct page *kpage)
-{
-	struct vm_area_struct *vma;
-	int err = -EFAULT;
-
-	down_read(&mm1->mmap_sem);
-	vma = find_vma(mm1, addr1);
-	if (!vma || vma->vm_start > addr1) {
-		up_read(&mm1->mmap_sem);
-		return err;
-	}
-
-	err = try_to_merge_one_page(vma, page1, kpage);
-	up_read(&mm1->mmap_sem);
-
-	return err;
-}
-
-/*
  * stable_tree_search - search page inside the stable tree
  * @page: the page that we are searching identical pages to.
  * @page2: pointer into identical page that we are holding inside the stable
@@ -1040,10 +1016,10 @@ static void stable_tree_append(struct rm
 }
 
 /*
- * cmp_and_merge_page - take a page computes its hash value and check if there
- * is similar hash value to different page,
- * in case we find that there is similar hash to different page we call to
- * try_to_merge_two_pages().
+ * cmp_and_merge_page - first see if page can be merged into the stable tree;
+ * if not, compare checksum to previous and if it's the same, see if page can
+ * be inserted into the unstable tree, or merged with a page already there and
+ * both transferred to the stable tree.
  *
  * @page: the page that we are searching identical page to.
  * @rmap_item: the reverse mapping into the virtual address of this page
--
Date: 	Mon, 3 Aug 2009 13:16:15 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 7/12] ksm: fix endless loop on oom

break_ksm has been looping endlessly ignoring VM_FAULT_OOM: that should
only be a problem for ksmd when a memory control group imposes limits
(normally the OOM killer will kill others with an mm until it succeeds);
but in general (especially for MADV_UNMERGEABLE and KSM_RUN_UNMERGE) we
do need to route the error (or kill) back to the caller (or sighandling).

Test signal_pending in unmerge_ksm_pages, which could be a lengthy
procedure if it has to spill into swap: returning -ERESTARTSYS so that
trivial signals will restart but fatals will terminate (is that right?
we do different things in different places in mm, none exactly this).

unmerge_and_remove_all_rmap_items was forgetting to lock when going
down the mm_list: fix that.  Whether it's successful or not, reset
ksm_scan cursor to head; but only if it's successful, reset seqnr
(shown in full_scans) - page counts will have gone down to zero.

This patch leaves a significant OOM deadlock, but it's a good step
on the way, and that deadlock is fixed in a subsequent patch.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |  108 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 85 insertions(+), 23 deletions(-)

--- ksm6/mm/ksm.c	2009-08-02 13:50:15.000000000 +0100
+++ ksm7/mm/ksm.c	2009-08-02 13:50:25.000000000 +0100
@@ -294,10 +294,10 @@ static inline int in_stable_tree(struct
  * Could a ksm page appear anywhere else?  Actually yes, in a VM_PFNMAP
  * mmap of /dev/mem or /dev/kmem, where we would not want to touch it.
  */
-static void break_ksm(struct vm_area_struct *vma, unsigned long addr)
+static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
 {
 	struct page *page;
-	int ret;
+	int ret = 0;
 
 	do {
 		cond_resched();
@@ -310,9 +310,36 @@ static void break_ksm(struct vm_area_str
 		else
 			ret = VM_FAULT_WRITE;
 		put_page(page);
-	} while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS)));
-
-	/* Which leaves us looping there if VM_FAULT_OOM: hmmm... */
+	} while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS | VM_FAULT_OOM)));
+	/*
+	 * We must loop because handle_mm_fault() may back out if there's
+	 * any difficulty e.g. if pte accessed bit gets updated concurrently.
+	 *
+	 * VM_FAULT_WRITE is what we have been hoping for: it indicates that
+	 * COW has been broken, even if the vma does not permit VM_WRITE;
+	 * but note that a concurrent fault might break PageKsm for us.
+	 *
+	 * VM_FAULT_SIGBUS could occur if we race with truncation of the
+	 * backing file, which also invalidates anonymous pages: that's
+	 * okay, that truncation will have unmapped the PageKsm for us.
+	 *
+	 * VM_FAULT_OOM: at the time of writing (late July 2009), setting
+	 * aside mem_cgroup limits, VM_FAULT_OOM would only be set if the
+	 * current task has TIF_MEMDIE set, and will be OOM killed on return
+	 * to user; and ksmd, having no mm, would never be chosen for that.
+	 *
+	 * But if the mm is in a limited mem_cgroup, then the fault may fail
+	 * with VM_FAULT_OOM even if the current task is not TIF_MEMDIE; and
+	 * even ksmd can fail in this way - though it's usually breaking ksm
+	 * just to undo a merge it made a moment before, so unlikely to oom.
+	 *
+	 * That's a pity: we might therefore have more kernel pages allocated
+	 * than we're counting as nodes in the stable tree; but ksm_do_scan
+	 * will retry to break_cow on each pass, so should recover the page
+	 * in due course.  The important thing is to not let VM_MERGEABLE
+	 * be cleared while any such pages might remain in the area.
+	 */
+	return (ret & VM_FAULT_OOM) ? -ENOMEM : 0;
 }
 
 static void break_cow(struct mm_struct *mm, unsigned long addr)
@@ -462,39 +489,61 @@ static void remove_trailing_rmap_items(s
  * to the next pass of ksmd - consider, for example, how ksmd might be
  * in cmp_and_merge_page on one of the rmap_items we would be removing.
  */
-static void unmerge_ksm_pages(struct vm_area_struct *vma,
-			      unsigned long start, unsigned long end)
+static int unmerge_ksm_pages(struct vm_area_struct *vma,
+			     unsigned long start, unsigned long end)
 {
 	unsigned long addr;
+	int err = 0;
 
-	for (addr = start; addr < end; addr += PAGE_SIZE)
-		break_ksm(vma, addr);
+	for (addr = start; addr < end && !err; addr += PAGE_SIZE) {
+		if (signal_pending(current))
+			err = -ERESTARTSYS;
+		else
+			err = break_ksm(vma, addr);
+	}
+	return err;
 }
 
-static void unmerge_and_remove_all_rmap_items(void)
+static int unmerge_and_remove_all_rmap_items(void)
 {
 	struct mm_slot *mm_slot;
 	struct mm_struct *mm;
 	struct vm_area_struct *vma;
+	int err = 0;
+
+	spin_lock(&ksm_mmlist_lock);
+	mm_slot = list_entry(ksm_mm_head.mm_list.next,
+						struct mm_slot, mm_list);
+	spin_unlock(&ksm_mmlist_lock);
 
-	list_for_each_entry(mm_slot, &ksm_mm_head.mm_list, mm_list) {
+	while (mm_slot != &ksm_mm_head) {
 		mm = mm_slot->mm;
 		down_read(&mm->mmap_sem);
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
 			if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 				continue;
-			unmerge_ksm_pages(vma, vma->vm_start, vma->vm_end);
+			err = unmerge_ksm_pages(vma,
+						vma->vm_start, vma->vm_end);
+			if (err) {
+				up_read(&mm->mmap_sem);
+				goto out;
+			}
 		}
 		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
 		up_read(&mm->mmap_sem);
+
+		spin_lock(&ksm_mmlist_lock);
+		mm_slot = list_entry(mm_slot->mm_list.next,
+						struct mm_slot, mm_list);
+		spin_unlock(&ksm_mmlist_lock);
 	}
 
+	ksm_scan.seqnr = 0;
+out:
 	spin_lock(&ksm_mmlist_lock);
-	if (ksm_scan.mm_slot != &ksm_mm_head) {
-		ksm_scan.mm_slot = &ksm_mm_head;
-		ksm_scan.seqnr++;
-	}
+	ksm_scan.mm_slot = &ksm_mm_head;
 	spin_unlock(&ksm_mmlist_lock);
+	return err;
 }
 
 static void remove_mm_from_lists(struct mm_struct *mm)
@@ -1058,6 +1107,8 @@ static void cmp_and_merge_page(struct pa
 	/*
 	 * A ksm page might have got here by fork, but its other
 	 * references have already been removed from the stable tree.
+	 * Or it might be left over from a break_ksm which failed
+	 * when the mem_cgroup had reached its limit: try again now.
 	 */
 	if (PageKsm(page))
 		break_cow(rmap_item->mm, rmap_item->address);
@@ -1293,6 +1344,7 @@ int ksm_madvise(struct vm_area_struct *v
 		unsigned long end, int advice, unsigned long *vm_flags)
 {
 	struct mm_struct *mm = vma->vm_mm;
+	int err;
 
 	switch (advice) {
 	case MADV_MERGEABLE:
@@ -1305,9 +1357,11 @@ int ksm_madvise(struct vm_area_struct *v
 				 VM_MIXEDMAP  | VM_SAO))
 			return 0;		/* just ignore the advice */
 
-		if (!test_bit(MMF_VM_MERGEABLE, &mm->flags))
-			if (__ksm_enter(mm) < 0)
-				return -EAGAIN;
+		if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) {
+			err = __ksm_enter(mm);
+			if (err)
+				return err;
+		}
 
 		*vm_flags |= VM_MERGEABLE;
 		break;
@@ -1316,8 +1370,11 @@ int ksm_madvise(struct vm_area_struct *v
 		if (!(*vm_flags & VM_MERGEABLE))
 			return 0;		/* just ignore the advice */
 
-		if (vma->anon_vma)
-			unmerge_ksm_pages(vma, start, end);
+		if (vma->anon_vma) {
+			err = unmerge_ksm_pages(vma, start, end);
+			if (err)
+				return err;
+		}
 
 		*vm_flags &= ~VM_MERGEABLE;
 		break;
@@ -1448,8 +1505,13 @@ static ssize_t run_store(struct kobject
 	mutex_lock(&ksm_thread_mutex);
 	if (ksm_run != flags) {
 		ksm_run = flags;
-		if (flags & KSM_RUN_UNMERGE)
-			unmerge_and_remove_all_rmap_items();
+		if (flags & KSM_RUN_UNMERGE) {
+			err = unmerge_and_remove_all_rmap_items();
+			if (err) {
+				ksm_run = KSM_RUN_STOP;
+				count = err;
+			}
+		}
 	}
 	mutex_unlock(&ksm_thread_mutex);
 
--
Date: 	Mon, 3 Aug 2009 13:17:15 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 8/12] ksm: distribute remove_mm_from_lists

Do some housekeeping in ksm.c, to help make the next patch easier
to understand: remove the function remove_mm_from_lists, distributing
its code to its callsites scan_get_next_rmap_item and __ksm_exit.

That turns out to be a win in scan_get_next_rmap_item: move its
remove_trailing_rmap_items and cursor advancement up, and it becomes
simpler than before.  __ksm_exit becomes messier, but will change
again; and moving its remove_trailing_rmap_items up lets us strengthen
the unstable tree item's age condition in remove_rmap_item_from_tree.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   97 ++++++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 55 deletions(-)

--- ksm7/mm/ksm.c	2009-08-02 13:50:25.000000000 +0100
+++ ksm8/mm/ksm.c	2009-08-02 13:50:32.000000000 +0100
@@ -444,14 +444,9 @@ static void remove_rmap_item_from_tree(s
 		 * But __ksm_exit has to be careful: do the rb_erase
 		 * if it's interrupting a scan, and this rmap_item was
 		 * inserted by this scan rather than left from before.
-		 *
-		 * Because of the case in which remove_mm_from_lists
-		 * increments seqnr before removing rmaps, unstable_nr
-		 * may even be 2 behind seqnr, but should never be
-		 * further behind.  Yes, I did have trouble with this!
 		 */
 		age = (unsigned char)(ksm_scan.seqnr - rmap_item->address);
-		BUG_ON(age > 2);
+		BUG_ON(age > 1);
 		if (!age)
 			rb_erase(&rmap_item->node, &root_unstable_tree);
 		ksm_pages_unshared--;
@@ -546,37 +541,6 @@ out:
 	return err;
 }
 
-static void remove_mm_from_lists(struct mm_struct *mm)
-{
-	struct mm_slot *mm_slot;
-
-	spin_lock(&ksm_mmlist_lock);
-	mm_slot = get_mm_slot(mm);
-
-	/*
-	 * This mm_slot is always at the scanning cursor when we're
-	 * called from scan_get_next_rmap_item; but it's a special
-	 * case when we're called from __ksm_exit.
-	 */
-	if (ksm_scan.mm_slot == mm_slot) {
-		ksm_scan.mm_slot = list_entry(
-			mm_slot->mm_list.next, struct mm_slot, mm_list);
-		ksm_scan.address = 0;
-		ksm_scan.rmap_item = list_entry(
-			&ksm_scan.mm_slot->rmap_list, struct rmap_item, link);
-		if (ksm_scan.mm_slot == &ksm_mm_head)
-			ksm_scan.seqnr++;
-	}
-
-	hlist_del(&mm_slot->link);
-	list_del(&mm_slot->mm_list);
-	spin_unlock(&ksm_mmlist_lock);
-
-	remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
-	free_mm_slot(mm_slot);
-	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
-}
-
 static u32 calc_checksum(struct page *page)
 {
 	u32 checksum;
@@ -1248,33 +1212,31 @@ next_mm:
 		}
 	}
 
-	if (!ksm_scan.address) {
-		/*
-		 * We've completed a full scan of all vmas, holding mmap_sem
-		 * throughout, and found no VM_MERGEABLE: so do the same as
-		 * __ksm_exit does to remove this mm from all our lists now.
-		 */
-		remove_mm_from_lists(mm);
-		up_read(&mm->mmap_sem);
-		slot = ksm_scan.mm_slot;
-		if (slot != &ksm_mm_head)
-			goto next_mm;
-		return NULL;
-	}
-
 	/*
 	 * Nuke all the rmap_items that are above this current rmap:
 	 * because there were no VM_MERGEABLE vmas with such addresses.
 	 */
 	remove_trailing_rmap_items(slot, ksm_scan.rmap_item->link.next);
-	up_read(&mm->mmap_sem);
 
 	spin_lock(&ksm_mmlist_lock);
-	slot = list_entry(slot->mm_list.next, struct mm_slot, mm_list);
-	ksm_scan.mm_slot = slot;
+	ksm_scan.mm_slot = list_entry(slot->mm_list.next,
+						struct mm_slot, mm_list);
+	if (ksm_scan.address == 0) {
+		/*
+		 * We've completed a full scan of all vmas, holding mmap_sem
+		 * throughout, and found no VM_MERGEABLE: so do the same as
+		 * __ksm_exit does to remove this mm from all our lists now.
+		 */
+		hlist_del(&slot->link);
+		list_del(&slot->mm_list);
+		free_mm_slot(slot);
+		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+	}
 	spin_unlock(&ksm_mmlist_lock);
+	up_read(&mm->mmap_sem);
 
 	/* Repeat until we've completed scanning the whole list */
+	slot = ksm_scan.mm_slot;
 	if (slot != &ksm_mm_head)
 		goto next_mm;
 
@@ -1415,13 +1377,38 @@ int __ksm_enter(struct mm_struct *mm)
 
 void __ksm_exit(struct mm_struct *mm)
 {
+	struct mm_slot *mm_slot;
+
 	/*
 	 * This process is exiting: doesn't hold and doesn't need mmap_sem;
 	 * but we do need to exclude ksmd and other exiters while we modify
 	 * the various lists and trees.
 	 */
 	mutex_lock(&ksm_thread_mutex);
-	remove_mm_from_lists(mm);
+	spin_lock(&ksm_mmlist_lock);
+	mm_slot = get_mm_slot(mm);
+	if (!list_empty(&mm_slot->rmap_list)) {
+		spin_unlock(&ksm_mmlist_lock);
+		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
+		spin_lock(&ksm_mmlist_lock);
+	}
+
+	if (ksm_scan.mm_slot == mm_slot) {
+		ksm_scan.mm_slot = list_entry(
+			mm_slot->mm_list.next, struct mm_slot, mm_list);
+		ksm_scan.address = 0;
+		ksm_scan.rmap_item = list_entry(
+			&ksm_scan.mm_slot->rmap_list, struct rmap_item, link);
+		if (ksm_scan.mm_slot == &ksm_mm_head)
+			ksm_scan.seqnr++;
+	}
+
+	hlist_del(&mm_slot->link);
+	list_del(&mm_slot->mm_list);
+	spin_unlock(&ksm_mmlist_lock);
+
+	free_mm_slot(mm_slot);
+	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
 	mutex_unlock(&ksm_thread_mutex);
 }
 
--
Date: 	Mon, 3 Aug 2009 13:18:16 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 9/12] ksm: fix oom deadlock

There's a now-obvious deadlock in KSM's out-of-memory handling:
imagine ksmd or KSM_RUN_UNMERGE handling, holding ksm_thread_mutex,
trying to allocate a page to break KSM in an mm which becomes the
OOM victim (quite likely in the unmerge case): it's killed and goes
to exit, and hangs there waiting to acquire ksm_thread_mutex.

Clearly we must not require ksm_thread_mutex in __ksm_exit, simple
though that made everything else: perhaps use mmap_sem somehow?
And part of the answer lies in the comments on unmerge_ksm_pages:
__ksm_exit should also leave all the rmap_item removal to ksmd.

But there's a fundamental problem, that KSM relies upon mmap_sem to
guarantee the consistency of the mm it's dealing with, yet exit_mmap
tears down an mm without taking mmap_sem.  And bumping mm_users won't
help at all, that just ensures that the pages the OOM killer assumes
are on their way to being freed will not be freed.

The best answer seems to be, to move the ksm_exit callout from just
before exit_mmap, to the middle of exit_mmap: after the mm's pages
have been freed (if the mmu_gather is flushed), but before its page
tables and vma structures have been freed; and down_write,up_write
mmap_sem there to serialize with KSM's own reliance on mmap_sem.

But KSM then needs to be careful, whenever it downs mmap_sem, to
check that the mm is not already exiting: there's a danger of using
find_vma on a layout that's being torn apart, or writing into page
tables which have been freed for reuse; and even do_anonymous_page
and __do_fault need to check they're not being called by break_ksm
to reinstate a pte after zap_pte_range has zapped that page table.

Though it might be clearer to add an exiting flag, set while holding
mmap_sem in __ksm_exit, that wouldn't cover the issue of reinstating
a zapped pte.  All we need is to check whether mm_users is 0 - but
must remember that ksmd may detect that before __ksm_exit is reached.
So, ksm_test_exit(mm) added to comment such checks on mm->mm_users.

__ksm_exit now has to leave clearing up the rmap_items to ksmd,
that needs ksm_thread_mutex; but shift the exiting mm just after the
ksm_scan cursor so that it will soon be dealt with.  __ksm_enter raise
mm_count to hold the mm_struct, ksmd's exit processing (exactly like
its processing when it finds all VM_MERGEABLEs unmapped) mmdrop it,
similar procedure for KSM_RUN_UNMERGE (which has stopped ksmd).

But also give __ksm_exit a fast path: when there's no complication
(no rmap_items attached to mm and it's not at the ksm_scan cursor),
it can safely do all the exiting work itself.  This is not just an
optimization: when ksmd is not running, the raised mm_count would
otherwise leak mm_structs.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 include/linux/ksm.h |   31 +++++++--
 kernel/fork.c       |    1 
 mm/ksm.c            |  144 ++++++++++++++++++++++++++++--------------
 mm/memory.c         |    5 -
 mm/mmap.c           |    9 ++
 5 files changed, 137 insertions(+), 53 deletions(-)

--- ksm8/include/linux/ksm.h	2009-08-01 05:02:09.000000000 +0100
+++ ksm9/include/linux/ksm.h	2009-08-02 13:50:41.000000000 +0100
@@ -12,11 +12,14 @@
 #include <linux/sched.h>
 #include <linux/vmstat.h>
 
+struct mmu_gather;
+
 #ifdef CONFIG_KSM
 int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
 		unsigned long end, int advice, unsigned long *vm_flags);
 int __ksm_enter(struct mm_struct *mm);
-void __ksm_exit(struct mm_struct *mm);
+void __ksm_exit(struct mm_struct *mm,
+		struct mmu_gather **tlbp, unsigned long end);
 
 static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
 {
@@ -25,10 +28,24 @@ static inline int ksm_fork(struct mm_str
 	return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm)
+/*
+ * For KSM to handle OOM without deadlock when it's breaking COW in a
+ * likely victim of the OOM killer, exit_mmap() has to serialize with
+ * ksm_exit() after freeing mm's pages but before freeing its page tables.
+ * That leaves a window in which KSM might refault pages which have just
+ * been finally unmapped: guard against that with ksm_test_exit(), and
+ * use it after getting mmap_sem in ksm.c, to check if mm is exiting.
+ */
+static inline bool ksm_test_exit(struct mm_struct *mm)
+{
+	return atomic_read(&mm->mm_users) == 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm,
+			    struct mmu_gather **tlbp, unsigned long end)
 {
 	if (test_bit(MMF_VM_MERGEABLE, &mm->flags))
-		__ksm_exit(mm);
+		__ksm_exit(mm, tlbp, end);
 }
 
 /*
@@ -64,7 +81,13 @@ static inline int ksm_fork(struct mm_str
 	return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm)
+static inline bool ksm_test_exit(struct mm_struct *mm)
+{
+	return 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm,
+			    struct mmu_gather **tlbp, unsigned long end)
 {
 }
 
--- ksm8/kernel/fork.c	2009-08-01 05:02:09.000000000 +0100
+++ ksm9/kernel/fork.c	2009-08-02 13:50:41.000000000 +0100
@@ -492,7 +492,6 @@ void mmput(struct mm_struct *mm)
 
 	if (atomic_dec_and_test(&mm->mm_users)) {
 		exit_aio(mm);
-		ksm_exit(mm);
 		exit_mmap(mm);
 		set_mm_exe_file(mm, NULL);
 		if (!list_empty(&mm->mmlist)) {
--- ksm8/mm/ksm.c	2009-08-02 13:50:32.000000000 +0100
+++ ksm9/mm/ksm.c	2009-08-02 13:50:41.000000000 +0100
@@ -32,6 +32,7 @@
 #include <linux/mmu_notifier.h>
 #include <linux/ksm.h>
 
+#include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
 /*
@@ -347,6 +348,8 @@ static void break_cow(struct mm_struct *
 	struct vm_area_struct *vma;
 
 	down_read(&mm->mmap_sem);
+	if (ksm_test_exit(mm))
+		goto out;
 	vma = find_vma(mm, addr);
 	if (!vma || vma->vm_start > addr)
 		goto out;
@@ -365,6 +368,8 @@ static struct page *get_mergeable_page(s
 	struct page *page;
 
 	down_read(&mm->mmap_sem);
+	if (ksm_test_exit(mm))
+		goto out;
 	vma = find_vma(mm, addr);
 	if (!vma || vma->vm_start > addr)
 		goto out;
@@ -439,11 +444,11 @@ static void remove_rmap_item_from_tree(s
 	} else if (rmap_item->address & NODE_FLAG) {
 		unsigned char age;
 		/*
-		 * ksm_thread can and must skip the rb_erase, because
+		 * Usually ksmd can and must skip the rb_erase, because
 		 * root_unstable_tree was already reset to RB_ROOT.
-		 * But __ksm_exit has to be careful: do the rb_erase
-		 * if it's interrupting a scan, and this rmap_item was
-		 * inserted by this scan rather than left from before.
+		 * But be careful when an mm is exiting: do the rb_erase
+		 * if this rmap_item was inserted by this scan, rather
+		 * than left over from before.
 		 */
 		age = (unsigned char)(ksm_scan.seqnr - rmap_item->address);
 		BUG_ON(age > 1);
@@ -491,6 +496,8 @@ static int unmerge_ksm_pages(struct vm_a
 	int err = 0;
 
 	for (addr = start; addr < end && !err; addr += PAGE_SIZE) {
+		if (ksm_test_exit(vma->vm_mm))
+			break;
 		if (signal_pending(current))
 			err = -ERESTARTSYS;
 		else
@@ -507,34 +514,50 @@ static int unmerge_and_remove_all_rmap_i
 	int err = 0;
 
 	spin_lock(&ksm_mmlist_lock);
-	mm_slot = list_entry(ksm_mm_head.mm_list.next,
+	ksm_scan.mm_slot = list_entry(ksm_mm_head.mm_list.next,
 						struct mm_slot, mm_list);
 	spin_unlock(&ksm_mmlist_lock);
 
-	while (mm_slot != &ksm_mm_head) {
+	for (mm_slot = ksm_scan.mm_slot;
+			mm_slot != &ksm_mm_head; mm_slot = ksm_scan.mm_slot) {
 		mm = mm_slot->mm;
 		down_read(&mm->mmap_sem);
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
+			if (ksm_test_exit(mm))
+				break;
 			if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 				continue;
 			err = unmerge_ksm_pages(vma,
 						vma->vm_start, vma->vm_end);
-			if (err) {
-				up_read(&mm->mmap_sem);
-				goto out;
-			}
+			if (err)
+				goto error;
 		}
+
 		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
-		up_read(&mm->mmap_sem);
 
 		spin_lock(&ksm_mmlist_lock);
-		mm_slot = list_entry(mm_slot->mm_list.next,
+		ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next,
 						struct mm_slot, mm_list);
-		spin_unlock(&ksm_mmlist_lock);
+		if (ksm_test_exit(mm)) {
+			hlist_del(&mm_slot->link);
+			list_del(&mm_slot->mm_list);
+			spin_unlock(&ksm_mmlist_lock);
+
+			free_mm_slot(mm_slot);
+			clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+			up_read(&mm->mmap_sem);
+			mmdrop(mm);
+		} else {
+			spin_unlock(&ksm_mmlist_lock);
+			up_read(&mm->mmap_sem);
+		}
 	}
 
 	ksm_scan.seqnr = 0;
-out:
+	return 0;
+
+error:
+	up_read(&mm->mmap_sem);
 	spin_lock(&ksm_mmlist_lock);
 	ksm_scan.mm_slot = &ksm_mm_head;
 	spin_unlock(&ksm_mmlist_lock);
@@ -755,6 +778,9 @@ static int try_to_merge_with_ksm_page(st
 	int err = -EFAULT;
 
 	down_read(&mm1->mmap_sem);
+	if (ksm_test_exit(mm1))
+		goto out;
+
 	vma = find_vma(mm1, addr1);
 	if (!vma || vma->vm_start > addr1)
 		goto out;
@@ -796,6 +822,10 @@ static int try_to_merge_two_pages(struct
 		return err;
 
 	down_read(&mm1->mmap_sem);
+	if (ksm_test_exit(mm1)) {
+		up_read(&mm1->mmap_sem);
+		goto out;
+	}
 	vma = find_vma(mm1, addr1);
 	if (!vma || vma->vm_start > addr1) {
 		up_read(&mm1->mmap_sem);
@@ -1181,7 +1211,12 @@ next_mm:
 
 	mm = slot->mm;
 	down_read(&mm->mmap_sem);
-	for (vma = find_vma(mm, ksm_scan.address); vma; vma = vma->vm_next) {
+	if (ksm_test_exit(mm))
+		vma = NULL;
+	else
+		vma = find_vma(mm, ksm_scan.address);
+
+	for (; vma; vma = vma->vm_next) {
 		if (!(vma->vm_flags & VM_MERGEABLE))
 			continue;
 		if (ksm_scan.address < vma->vm_start)
@@ -1190,6 +1225,8 @@ next_mm:
 			ksm_scan.address = vma->vm_end;
 
 		while (ksm_scan.address < vma->vm_end) {
+			if (ksm_test_exit(mm))
+				break;
 			*page = follow_page(vma, ksm_scan.address, FOLL_GET);
 			if (*page && PageAnon(*page)) {
 				flush_anon_page(vma, *page, ksm_scan.address);
@@ -1212,6 +1249,11 @@ next_mm:
 		}
 	}
 
+	if (ksm_test_exit(mm)) {
+		ksm_scan.address = 0;
+		ksm_scan.rmap_item = list_entry(&slot->rmap_list,
+						struct rmap_item, link);
+	}
 	/*
 	 * Nuke all the rmap_items that are above this current rmap:
 	 * because there were no VM_MERGEABLE vmas with such addresses.
@@ -1226,24 +1268,29 @@ next_mm:
 		 * We've completed a full scan of all vmas, holding mmap_sem
 		 * throughout, and found no VM_MERGEABLE: so do the same as
 		 * __ksm_exit does to remove this mm from all our lists now.
+		 * This applies either when cleaning up after __ksm_exit
+		 * (but beware: we can reach here even before __ksm_exit),
+		 * or when all VM_MERGEABLE areas have been unmapped (and
+		 * mmap_sem then protects against race with MADV_MERGEABLE).
 		 */
 		hlist_del(&slot->link);
 		list_del(&slot->mm_list);
+		spin_unlock(&ksm_mmlist_lock);
+
 		free_mm_slot(slot);
 		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+		up_read(&mm->mmap_sem);
+		mmdrop(mm);
+	} else {
+		spin_unlock(&ksm_mmlist_lock);
+		up_read(&mm->mmap_sem);
 	}
-	spin_unlock(&ksm_mmlist_lock);
-	up_read(&mm->mmap_sem);
 
 	/* Repeat until we've completed scanning the whole list */
 	slot = ksm_scan.mm_slot;
 	if (slot != &ksm_mm_head)
 		goto next_mm;
 
-	/*
-	 * Bump seqnr here rather than at top, so that __ksm_exit
-	 * can skip rb_erase on unstable tree until we run again.
-	 */
 	ksm_scan.seqnr++;
 	return NULL;
 }
@@ -1368,6 +1415,7 @@ int __ksm_enter(struct mm_struct *mm)
 	spin_unlock(&ksm_mmlist_lock);
 
 	set_bit(MMF_VM_MERGEABLE, &mm->flags);
+	atomic_inc(&mm->mm_count);
 
 	if (needs_wakeup)
 		wake_up_interruptible(&ksm_thread_wait);
@@ -1375,41 +1423,45 @@ int __ksm_enter(struct mm_struct *mm)
 	return 0;
 }
 
-void __ksm_exit(struct mm_struct *mm)
+void __ksm_exit(struct mm_struct *mm,
+		struct mmu_gather **tlbp, unsigned long end)
 {
 	struct mm_slot *mm_slot;
+	int easy_to_free = 0;
 
 	/*
-	 * This process is exiting: doesn't hold and doesn't need mmap_sem;
-	 * but we do need to exclude ksmd and other exiters while we modify
-	 * the various lists and trees.
+	 * This process is exiting: if it's straightforward (as is the
+	 * case when ksmd was never running), free mm_slot immediately.
+	 * But if it's at the cursor or has rmap_items linked to it, use
+	 * mmap_sem to synchronize with any break_cows before pagetables
+	 * are freed, and leave the mm_slot on the list for ksmd to free.
+	 * Beware: ksm may already have noticed it exiting and freed the slot.
 	 */
-	mutex_lock(&ksm_thread_mutex);
+
 	spin_lock(&ksm_mmlist_lock);
 	mm_slot = get_mm_slot(mm);
-	if (!list_empty(&mm_slot->rmap_list)) {
-		spin_unlock(&ksm_mmlist_lock);
-		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
-		spin_lock(&ksm_mmlist_lock);
-	}
-
-	if (ksm_scan.mm_slot == mm_slot) {
-		ksm_scan.mm_slot = list_entry(
-			mm_slot->mm_list.next, struct mm_slot, mm_list);
-		ksm_scan.address = 0;
-		ksm_scan.rmap_item = list_entry(
-			&ksm_scan.mm_slot->rmap_list, struct rmap_item, link);
-		if (ksm_scan.mm_slot == &ksm_mm_head)
-			ksm_scan.seqnr++;
+	if (mm_slot && ksm_scan.mm_slot != mm_slot) {
+		if (list_empty(&mm_slot->rmap_list)) {
+			hlist_del(&mm_slot->link);
+			list_del(&mm_slot->mm_list);
+			easy_to_free = 1;
+		} else {
+			list_move(&mm_slot->mm_list,
+				  &ksm_scan.mm_slot->mm_list);
+		}
 	}
-
-	hlist_del(&mm_slot->link);
-	list_del(&mm_slot->mm_list);
 	spin_unlock(&ksm_mmlist_lock);
 
-	free_mm_slot(mm_slot);
-	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
-	mutex_unlock(&ksm_thread_mutex);
+	if (easy_to_free) {
+		free_mm_slot(mm_slot);
+		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+		mmdrop(mm);
+	} else if (mm_slot) {
+		tlb_finish_mmu(*tlbp, 0, end);
+		down_write(&mm->mmap_sem);
+		up_write(&mm->mmap_sem);
+		*tlbp = tlb_gather_mmu(mm, 1);
+	}
 }
 
 #define KSM_ATTR_RO(_name) \
--- ksm8/mm/memory.c	2009-08-01 05:02:09.000000000 +0100
+++ ksm9/mm/memory.c	2009-08-02 13:50:41.000000000 +0100
@@ -2647,8 +2647,9 @@ static int do_anonymous_page(struct mm_s
 	entry = maybe_mkwrite(pte_mkdirty(entry), vma);
 
 	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
-	if (!pte_none(*page_table))
+	if (!pte_none(*page_table) || ksm_test_exit(mm))
 		goto release;
+
 	inc_mm_counter(mm, anon_rss);
 	page_add_new_anon_rmap(page, vma, address);
 	set_pte_at(mm, address, page_table, entry);
@@ -2790,7 +2791,7 @@ static int __do_fault(struct mm_struct *
 	 * handle that later.
 	 */
 	/* Only go through if we didn't race with anybody else... */
-	if (likely(pte_same(*page_table, orig_pte))) {
+	if (likely(pte_same(*page_table, orig_pte) && !ksm_test_exit(mm))) {
 		flush_icache_page(vma, page);
 		entry = mk_pte(page, vma->vm_page_prot);
 		if (flags & FAULT_FLAG_WRITE)
--- ksm8/mm/mmap.c	2009-06-25 05:18:10.000000000 +0100
+++ ksm9/mm/mmap.c	2009-08-02 13:50:41.000000000 +0100
@@ -27,6 +27,7 @@
 #include <linux/mount.h>
 #include <linux/mempolicy.h>
 #include <linux/rmap.h>
+#include <linux/ksm.h>
 #include <linux/mmu_notifier.h>
 #include <linux/perf_counter.h>
 
@@ -2114,6 +2115,14 @@ void exit_mmap(struct mm_struct *mm)
 	/* Use -1 here to ensure all VMAs in the mm are unmapped */
 	end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL);
 	vm_unacct_memory(nr_accounted);
+
+	/*
+	 * For KSM to handle OOM without deadlock when it's breaking COW in a
+	 * likely victim of the OOM killer, we must serialize with ksm_exit()
+	 * after freeing mm's pages but before freeing its page tables.
+	 */
+	ksm_exit(mm, &tlb, end);
+
 	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
 	tlb_finish_mmu(tlb, 0, end);
 
--
Date: 	Mon, 3 Aug 2009 13:19:13 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 10/12] ksm: sysfs and defaults

At present KSM is just a waste of space if you don't have CONFIG_SYSFS=y
to provide the /sys/kernel/mm/ksm files to tune and activate it.

Make KSM depend on SYSFS?  Could do, but it might be better to provide
some defaults so that KSM works out-of-the-box, ready for testers to
madvise MADV_MERGEABLE, even without SYSFS.

Though anyone serious is likely to want to retune the numbers to their
taste once they have experience; and whether these settings ever reach
2.6.32 can be discussed along the way.  

Save 1kB from tiny kernels by #ifdef'ing the SYSFS side of it.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

--- ksm9/mm/ksm.c	2009-08-02 13:50:41.000000000 +0100
+++ ksm10/mm/ksm.c	2009-08-02 13:50:48.000000000 +0100
@@ -163,18 +163,18 @@ static unsigned long ksm_pages_unshared;
 static unsigned long ksm_rmap_items;
 
 /* Limit on the number of unswappable pages used */
-static unsigned long ksm_max_kernel_pages;
+static unsigned long ksm_max_kernel_pages = 2000;
 
 /* Number of pages ksmd should scan in one batch */
-static unsigned int ksm_thread_pages_to_scan;
+static unsigned int ksm_thread_pages_to_scan = 200;
 
 /* Milliseconds ksmd should sleep between batches */
-static unsigned int ksm_thread_sleep_millisecs;
+static unsigned int ksm_thread_sleep_millisecs = 20;
 
 #define KSM_RUN_STOP	0
 #define KSM_RUN_MERGE	1
 #define KSM_RUN_UNMERGE	2
-static unsigned int ksm_run;
+static unsigned int ksm_run = KSM_RUN_MERGE;
 
 static DECLARE_WAIT_QUEUE_HEAD(ksm_thread_wait);
 static DEFINE_MUTEX(ksm_thread_mutex);
@@ -506,6 +506,10 @@ static int unmerge_ksm_pages(struct vm_a
 	return err;
 }
 
+#ifdef CONFIG_SYSFS
+/*
+ * Only called through the sysfs control interface:
+ */
 static int unmerge_and_remove_all_rmap_items(void)
 {
 	struct mm_slot *mm_slot;
@@ -563,6 +567,7 @@ error:
 	spin_unlock(&ksm_mmlist_lock);
 	return err;
 }
+#endif /* CONFIG_SYSFS */
 
 static u32 calc_checksum(struct page *page)
 {
@@ -1464,6 +1469,11 @@ void __ksm_exit(struct mm_struct *mm,
 	}
 }
 
+#ifdef CONFIG_SYSFS
+/*
+ * This all compiles without CONFIG_SYSFS, but is a waste of space.
+ */
+
 #define KSM_ATTR_RO(_name) \
 	static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
 #define KSM_ATTR(_name) \
@@ -1646,6 +1656,7 @@ static struct attribute_group ksm_attr_g
 	.attrs = ksm_attrs,
 	.name = "ksm",
 };
+#endif /* CONFIG_SYSFS */
 
 static int __init ksm_init(void)
 {
@@ -1667,16 +1678,17 @@ static int __init ksm_init(void)
 		goto out_free2;
 	}
 
+#ifdef CONFIG_SYSFS
 	err = sysfs_create_group(mm_kobj, &ksm_attr_group);
 	if (err) {
 		printk(KERN_ERR "ksm: register sysfs failed\n");
-		goto out_free3;
+		kthread_stop(ksm_thread);
+		goto out_free2;
 	}
+#endif /* CONFIG_SYSFS */
 
 	return 0;
 
-out_free3:
-	kthread_stop(ksm_thread);
 out_free2:
 	mm_slots_hash_free();
 out_free1:
--
Date: 	Mon, 3 Aug 2009 13:21:34 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 11/12] ksm: add some documentation

Add Documentation/vm/ksm.txt: how to use the Kernel Samepage Merging feature

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Cc: Michael Kerrisk <mtk.manpages at googlemail.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
---

 Documentation/vm/00-INDEX |    2 
 Documentation/vm/ksm.txt  |   89 ++++++++++++++++++++++++++++++++++++
 mm/Kconfig                |    1 
 3 files changed, 92 insertions(+)

--- ksm10/Documentation/vm/00-INDEX	2009-06-10 04:05:27.000000000 +0100
+++ ksm11/Documentation/vm/00-INDEX	2009-08-02 13:50:57.000000000 +0100
@@ -6,6 +6,8 @@ balance
 	- various information on memory balancing.
 hugetlbpage.txt
 	- a brief summary of hugetlbpage support in the Linux kernel.
+ksm.txt
+	- how to use the Kernel Samepage Merging feature.
 locking
 	- info on how locking and synchronization is done in the Linux vm code.
 numa
--- ksm10/Documentation/vm/ksm.txt	1970-01-01 01:00:00.000000000 +0100
+++ ksm11/Documentation/vm/ksm.txt	2009-08-02 13:50:57.000000000 +0100
@@ -0,0 +1,89 @@
+How to use the Kernel Samepage Merging feature
+----------------------------------------------
+
+KSM is a memory-saving de-duplication feature, enabled by CONFIG_KSM=y,
+added to the Linux kernel in 2.6.32.  See mm/ksm.c for its implementation,
+and http://lwn.net/Articles/306704/ and http://lwn.net/Articles/330589/
+
+The KSM daemon ksmd periodically scans those areas of user memory which
+have been registered with it, looking for pages of identical content which
+can be replaced by a single write-protected page (which is automatically
+copied if a process later wants to update its content).
+
+KSM was originally developed for use with KVM (where it was known as
+Kernel Shared Memory), to fit more virtual machines into physical memory,
+by sharing the data common between them.  But it can be useful to any
+application which generates many instances of the same data.
+
+KSM only merges anonymous (private) pages, never pagecache (file) pages.
+KSM's merged pages are at present locked into kernel memory for as long
+as they are shared: so cannot be swapped out like the user pages they
+replace (but swapping KSM pages should follow soon in a later release).
+
+KSM only operates on those areas of address space which an application
+has advised to be likely candidates for merging, by using the madvise(2)
+system call: int madvise(addr, length, MADV_MERGEABLE).
+
+The app may call int madvise(addr, length, MADV_UNMERGEABLE) to cancel
+that advice and restore unshared pages: whereupon KSM unmerges whatever
+it merged in that range.  Note: this unmerging call may suddenly require
+more memory than is available - possibly failing with EAGAIN, but more
+probably arousing the Out-Of-Memory killer.
+
+If KSM is not configured into the running kernel, madvise MADV_MERGEABLE
+and MADV_UNMERGEABLE simply fail with EINVAL.  If the running kernel was
+built with CONFIG_KSM=y, those calls will normally succeed: even if the
+the KSM daemon is not currently running, MADV_MERGEABLE still registers
+the range for whenever the KSM daemon is started; even if the range
+cannot contain any pages which KSM could actually merge; even if
+MADV_UNMERGEABLE is applied to a range which was never MADV_MERGEABLE.
+
+Like other madvise calls, they are intended for use on mapped areas of
+the user address space: they will report ENOMEM if the specified range
+includes unmapped gaps (though working on the intervening mapped areas),
+and might fail with EAGAIN if not enough memory for internal structures.
+
+Applications should be considerate in their use of MADV_MERGEABLE,
+restricting its use to areas likely to benefit.  KSM's scans may use
+a lot of processing power, and its kernel-resident pages are a limited
+resource.  Some installations will disable KSM for these reasons.
+
+The KSM daemon is controlled by sysfs files in /sys/kernel/mm/ksm/,
+readable by all but writable only by root:
+
+max_kernel_pages - set to maximum number of kernel pages that KSM may use
+                   e.g. "echo 2000 > /sys/kernel/mm/ksm/max_kernel_pages"
+                   Value 0 imposes no limit on the kernel pages KSM may use;
+                   but note that any process using MADV_MERGEABLE can cause
+                   KSM to allocate these pages, unswappable until it exits.
+                   Default: 2000 (chosen for demonstration purposes)
+
+pages_to_scan    - how many present pages to scan before ksmd goes to sleep
+                   e.g. "echo 200 > /sys/kernel/mm/ksm/pages_to_scan"
+                   Default: 200 (chosen for demonstration purposes)
+
+sleep_millisecs  - how many milliseconds ksmd should sleep before next scan
+                   e.g. "echo 20 > /sys/kernel/mm/ksm/sleep_millisecs"
+                   Default: 20 (chosen for demonstration purposes)
+
+run              - set 0 to stop ksmd from running but keep merged pages,
+                   set 1 to run ksmd e.g. "echo 1 > /sys/kernel/mm/ksm/run",
+                   set 2 to stop ksmd and unmerge all pages currently merged,
+                         but leave mergeable areas registered for next run
+                   Default: 1 (for immediate use by apps which register)
+
+The effectiveness of KSM and MADV_MERGEABLE is shown in /sys/kernel/mm/ksm/:
+
+pages_shared     - how many shared unswappable kernel pages KSM is using
+pages_sharing    - how many more sites are sharing them i.e. how much saved
+pages_unshared   - how many pages unique but repeatedly checked for merging
+pages_volatile   - how many pages changing too fast to be placed in a tree
+full_scans       - how many times all mergeable areas have been scanned
+
+A high ratio of pages_sharing to pages_shared indicates good sharing, but
+a high ratio of pages_unshared to pages_sharing indicates wasted effort.
+pages_volatile embraces several different kinds of activity, but a high
+proportion there would also indicate poor use of madvise MADV_MERGEABLE.
+
+Izik Eidus,
+Hugh Dickins, 30 July 2009
--- ksm10/mm/Kconfig	2009-08-01 05:02:09.000000000 +0100
+++ ksm11/mm/Kconfig	2009-08-02 13:50:57.000000000 +0100
@@ -224,6 +224,7 @@ config KSM
 	  the many instances by a single resident page with that content, so
 	  saving memory until one or another app needs to modify the content.
 	  Recommended for use with KVM, or with other duplicative applications.
+	  See Documentation/vm/ksm.txt for more information.
 
 config DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"
--
Date: 	Mon, 3 Aug 2009 13:22:53 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 12/12] ksm: remove VM_MERGEABLE_FLAGS

KSM originally stood for Kernel Shared Memory: but the kernel has long
supported shared memory, and VM_SHARED and VM_MAYSHARE vmas, and KSM is
something else.  So we switched to saying "merge" instead of "share".

But Chris Wright points out that this is confusing where mmap.c merges
adjacent vmas: most especially in the name VM_MERGEABLE_FLAGS, used by
is_mergeable_vma() to let vmas be merged despite flags being different.

Call it VMA_MERGE_DESPITE_FLAGS?  Perhaps, but at present it consists
only of VM_CAN_NONLINEAR: so for now it's clearer on all sides to use
that directly, with a comment on it in is_mergeable_vma().

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---
This patch got lost along the way last time: no big deal but try again.

 mm/mmap.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- ksm11/mm/mmap.c	2009-08-02 13:50:41.000000000 +0100
+++ ksm12/mm/mmap.c	2009-08-02 13:51:04.000000000 +0100
@@ -660,9 +660,6 @@ again:			remove_next = 1 + (end > next->
 	validate_mm(mm);
 }
 
-/* Flags that can be inherited from an existing mapping when merging */
-#define VM_MERGEABLE_FLAGS (VM_CAN_NONLINEAR)
-
 /*
  * If the vma has a ->close operation then the driver probably needs to release
  * per-vma resources, so we don't attempt to merge those.
@@ -670,7 +667,8 @@ again:			remove_next = 1 + (end > next->
 static inline int is_mergeable_vma(struct vm_area_struct *vma,
 			struct file *file, unsigned long vm_flags)
 {
-	if ((vma->vm_flags ^ vm_flags) & ~VM_MERGEABLE_FLAGS)
+	/* VM_CAN_NONLINEAR may get set later by f_op->mmap() */
+	if ((vma->vm_flags ^ vm_flags) & ~VM_CAN_NONLINEAR)
 		return 0;
 	if (vma->vm_file != file)
 		return 0;



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1703
retrieving revision 1.1704
diff -u -p -r1.1703 -r1.1704
--- kernel.spec	7 Aug 2009 16:12:21 -0000	1.1703
+++ kernel.spec	7 Aug 2009 19:07:39 -0000	1.1704
@@ -668,6 +668,7 @@ Patch1518: hid-ignore-all-recent-imon-de
 
 Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
+Patch1552: linux-2.6-ksm-updates.patch
 
 # nouveau + drm fixes
 Patch1810: drm-radeon-fixes.patch
@@ -1278,6 +1279,7 @@ ApplyPatch hid-ignore-all-recent-imon-de
 
 # Add kernel KSM support
 ApplyPatch linux-2.6-ksm.patch
+ApplyPatch linux-2.6-ksm-updates.patch
 # Optimize KVM for KSM support
 ApplyPatch linux-2.6-ksm-kvm.patch
 
@@ -1964,6 +1966,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 07 2009 Justin M. Forbes <jforbes at redhat.com>
+- Apply KSM updates from upstream
+
 * Fri Aug 07 2009 Hans de Goede <hdegoede at redhat.com>
 - When building a dracut generic initrd tell new-kernel-pkg to use that
   instead of running mkinitrd



From zaitcev at fedoraproject.org  Fri Aug  7 19:25:41 2009
From: zaitcev at fedoraproject.org (Pete Zaitcev)
Date: Fri,  7 Aug 2009 19:25:41 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd-test.patch, 1.1.2.1, 1.1.2.2 chunkd.spec, 
	1.6.2.1, 1.6.2.2
Message-ID: <20090807192541.E3A5111C00D7@cvs1.fedora.phx.redhat.com>

Author: zaitcev

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21634

Modified Files:
      Tag: private-zaitcev-bz514651-1
	chunkd-test.patch chunkd.spec 
Log Message:
Fix endianness bugs. Test 2.


chunkd-test.patch:
 object.c |    2 +-
 server.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: chunkd-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/Attic/chunkd-test.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
--- chunkd-test.patch	7 Aug 2009 00:42:54 -0000	1.1.2.1
+++ chunkd-test.patch	7 Aug 2009 19:25:41 -0000	1.1.2.2
@@ -0,0 +1,24 @@
+diff -urp chunkd-0.4git/server/object.c chunkd-0.4git-p3/server/object.c
+--- chunkd-0.4git/server/object.c	2009-07-24 19:53:33.000000000 -0600
++++ chunkd-0.4git-p3/server/object.c	2009-08-07 13:21:33.000000000 -0600
+@@ -290,7 +290,7 @@ bool object_get(struct client *cli, bool
+ 
+ 	cli->in_len = obj->size;
+ 
+-	resp->req.data_len = GUINT32_TO_LE(obj->size);
++	resp->req.data_len = GUINT64_TO_LE((uint64_t)obj->size);
+ 	memcpy(resp->req.checksum, obj->hashstr, sizeof(obj->hashstr));
+ 	resp->req.checksum[sizeof(obj->hashstr)] = 0;
+ 	resp->mtime = GUINT64_TO_LE(obj->mtime);
+diff -urp chunkd-0.4git/server/server.c chunkd-0.4git-p3/server/server.c
+--- chunkd-0.4git/server/server.c	2009-07-24 19:53:33.000000000 -0600
++++ chunkd-0.4git-p3/server/server.c	2009-08-07 13:21:33.000000000 -0600
+@@ -649,7 +649,7 @@ static bool cli_resp_xml(struct client *
+ 
+ 	memcpy(resp, &cli->creq, sizeof(cli->creq));
+ 
+-	resp->data_len = GUINT64_TO_LE(content_len);
++	resp->data_len = GUINT32_TO_LE((uint32_t)content_len);
+ 
+ 	cli->state = evt_recycle;
+ 


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.1 -r1.6.2.2
--- chunkd.spec	7 Aug 2009 00:42:54 -0000	1.6.2.1
+++ chunkd.spec	7 Aug 2009 19:25:41 -0000	1.6.2.2
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.7.g6b1e9b66.bz514651.1%{?dist}
+Release:	0.7.g6b1e9b66.bz514651.2%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -101,7 +101,7 @@ fi
 %changelog
 * Thu Aug 6 2009 Pete Zaitcev <zaitcev at redhat.com>
 - test build for bz#514651.
-- bump to 0.4-0.7.g6b1e9b66.bz514651.1
+- bump to 0.4-0.7.g6b1e9b66.bz514651.2
 
 * Wed Jul 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.7.g6b1e9b66
 - update source to commit 6b1e9b6641df0353a81c7b1352f5f652c5a7f9d8



From notting at fedoraproject.org  Fri Aug  7 19:36:54 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  7 Aug 2009 19:36:54 +0000 (UTC)
Subject: rpms/selinux-policy/devel booleans-minimum.conf, 1.6,
	1.7 booleans-targeted.conf, 1.48, 1.49 selinux-policy.spec,
	1.892, 1.893
Message-ID: <20090807193654.CB58811C00D7@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24529

Modified Files:
	booleans-minimum.conf booleans-targeted.conf 
	selinux-policy.spec 
Log Message:
* Fri Aug 7 2009 Bill Nottingham <notting at redhat.com> 3.6.26-8
- Turn on execstack on a temporary basis (#512845)



Index: booleans-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-minimum.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- booleans-minimum.conf	27 Jul 2009 22:09:56 -0000	1.6
+++ booleans-minimum.conf	7 Aug 2009 19:36:54 -0000	1.7
@@ -8,7 +8,7 @@ allow_execmod = false
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = false
+allow_execstack = true
 
 # Allow ftpd to read cifs directories.
 # 


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- booleans-targeted.conf	27 Jul 2009 22:09:56 -0000	1.48
+++ booleans-targeted.conf	7 Aug 2009 19:36:54 -0000	1.49
@@ -8,7 +8,7 @@ allow_execmod = false
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = false
+allow_execstack = true
 
 # Allow ftpd to read cifs directories.
 # 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -p -r1.892 -r1.893
--- selinux-policy.spec	7 Aug 2009 11:51:54 -0000	1.892
+++ selinux-policy.spec	7 Aug 2009 19:36:54 -0000	1.893
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 7 2009 Bill Nottingham <notting at redhat.com> 3.6.26-8
+- Turn on execstack on a temporary basis (#512845)
+
 * Thu Aug 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-7
 - Allow nsplugin to connecto the session bus
 - Allow samba_net to write to coolkey data



From clumens at fedoraproject.org  Fri Aug  7 19:46:20 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri,  7 Aug 2009 19:46:20 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.653, 1.654 anaconda.spec, 1.803, 
	1.804 sources, 1.787, 1.788
Message-ID: <20090807194620.7065511C00D7@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26243

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -p -r1.653 -r1.654
--- .cvsignore	7 Aug 2009 03:05:22 -0000	1.653
+++ .cvsignore	7 Aug 2009 19:46:20 -0000	1.654
@@ -1 +1,2 @@
 anaconda-12.10.tar.bz2
+anaconda-12.11.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -p -r1.803 -r1.804
--- anaconda.spec	7 Aug 2009 03:05:22 -0000	1.803
+++ anaconda.spec	7 Aug 2009 19:46:20 -0000	1.804
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.10
+Version: 12.11
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -209,6 +209,17 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Aug 07 2009 Chris Lumens <clumens at redhat.com> - 12.11-1
+- upd-instroot: Inspect gtkrc for cursor theme (ajax)
+- Support NFS repos in kickstart (#495620, #507093). (clumens)
+- upd-instroot: xorg-x11-auth -> xorg-x11-xauth (ajax)
+- Check to see if the arch string starts with ppc64. (#516144) (jgranado)
+- vtActivate doesn't work on some ppc64 machines, so don't traceback
+  (#516206). (clumens)
+- Make all sysfs path's be _without_ /sys prefix (#516168) (hdegoede)
+- Do not go interactive if timezone in ks is not valid (#473647) (rvykydal)
+- Fix going back from "NFS Setup" screen in stage 1 (#507064) (rvykydal)
+
 * Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12.10-1
 - Add missing 'i' in loader/loader.c for non-s390 arches. (dcantrell)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -p -r1.787 -r1.788
--- sources	7 Aug 2009 03:05:22 -0000	1.787
+++ sources	7 Aug 2009 19:46:20 -0000	1.788
@@ -1 +1 @@
-87998ade4b3c40545ec29ff52a1c42c1  anaconda-12.10.tar.bz2
+274210a4a4d6ebdd786af6095b25ed10  anaconda-12.11.tar.bz2



From caolanm at fedoraproject.org  Fri Aug  7 19:50:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  7 Aug 2009 19:50:44 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch,
	1.1, 1.2
Message-ID: <20090807195044.C7E5411C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27064

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
first set of overlaps in dmake

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dag.c      |    9 ++++++---
 expand.c   |    6 ++++--
 getinp.c   |    6 ++++--
 path.c     |   10 +++++++---
 rulparse.c |    2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	29 Jul 2009 12:37:35 -0000	1.1
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	7 Aug 2009 19:50:44 -0000	1.2
@@ -1,4 +1,5 @@
---- dmake/rulparse.c	2009-07-29 13:31:47.000000000 +0100
+diff -ru dmake.orig/rulparse.c dmake/rulparse.c
+--- dmake.orig/rulparse.c	2009-07-29 13:31:47.000000000 +0100
 +++ dmake/rulparse.c	2009-07-29 13:32:09.000000000 +0100
 @@ -897,7 +897,7 @@
  	 /* Handle %-targets. */
@@ -9,3 +10,113 @@
  
  #ifdef DBUG
  	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
+diff -ru dmake.orig/dag.c dmake/dag.c
+--- dmake.orig/dag.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/dag.c	2009-08-07 20:30:59.000000000 +0100
+@@ -369,14 +369,17 @@
+ 	 /* strip out any \<nl> combinations where \ is the current
+ 	  * CONTINUATION char */
+ 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
+-	    if( p[1] == '\n' )
+-	       strcpy( p, p+2 );
++	    if( p[1] == '\n' ) {
++	       size_t len = strlen(p+2)+1;
++	       memmove ( p, p+2, len );
++	    }
+ 	    else
+ 	       p++;
+ 
+ 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
+ 	 if( p != q ) {
+-	    strcpy( q, p);
++	    size_t len = strlen(p)+1;
++	    memmove( q, p, len );
+ 	    p = q;
+ 	 }
+ 
+diff -ru dmake.orig/expand.c dmake/expand.c
+--- dmake.orig/expand.c	2009-08-07 20:18:34.000000000 +0100
++++ dmake/expand.c	2009-08-07 20:42:40.000000000 +0100
+@@ -365,7 +365,8 @@
+       if( (e = Basename(s)) != s) {
+ 	 if( !(mod & DIRECTORY_FLAG) ) {
+ 	    /* Move the basename to the start. */
+-	    strcpy(s, e);
++	    size_t len = strlen(e)+1;
++	    memmove(s, e, len);
+ 	 }
+ 	 else
+ 	    s = e;
+@@ -382,7 +383,8 @@
+ 
+       if( !(mod & FILE_FLAG) ) {
+ 	 /* Move the suffix to the start. */
+-	 strcpy( s, e );
++	 size_t len = strlen(e)+1;
++	 memmove( s, e, len );
+       }
+       else
+ 	 s = e;
+diff -ru dmake.orig/getinp.c dmake/getinp.c
+--- dmake.orig/getinp.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/getinp.c	2009-08-07 20:27:08.000000000 +0100
+@@ -169,7 +169,8 @@
+ 	  * text lines on input.  The maximum size of this is governened by
+ 	  * Buffer_size */
+ 	    if( q != p && q[-1] == CONTINUATION_CHAR ) {
+-	       strcpy( q, q+1 );
++	       size_t len = strlen(q+1)+1;
++	       memmove( q, q+1, len );
+ 	       q--;
+ 	       cont = FALSE;
+ 	    }
+@@ -290,7 +291,8 @@
+    while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
+       if( Comment || State == NORMAL_SCAN )
+ 	 if( c != str && c[-1] == ESCAPE_CHAR ) {
+-	    strcpy( c-1, c );        /* copy it left, due to \# */
++	    size_t len = strlen(c)+1;
++	    memmove( c-1, c, len );  /* copy it left, due to \# */
+ 	    if( pend ) (*pend)--;    /* shift tail pointer left */
+ 	 }
+ 	 else {
+diff -ru dmake.orig/path.c dmake/path.c
+--- dmake.orig/path.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/path.c	2009-08-07 20:41:30.000000000 +0100
+@@ -172,6 +172,7 @@
+    char *tpath;
+    int hasdriveletter = 0;
+    int delentry;
++   size_t len;
+ 
+    DB_ENTER( "Clean_path" );
+ 
+@@ -231,14 +232,16 @@
+ 	    p++;
+ 	 }
+ 	 while( *p == *DirSepStr);
+-	 strcpy(t+1,p);
++	 len = strlen(p)+1;
++	 memmove(t+1,p,len);
+ 	 continue;
+       }
+ 
+       /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
+        * the start of the path. */
+       if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
+-	 strcpy(q,p+1);
++	 len = strlen(p+1)+1;
++	 memmove(q,p+1,len);
+ 	 q = tpath;
+ 	 continue;
+       }
+@@ -268,7 +271,8 @@
+ 	 }
+ 	 while( *t == *DirSepStr);
+ 	 /* q points to first letter of the current directory/file. */
+-	 strcpy(q,t);
++	 len = strlen(t)+1;
++	 memmove(q,t,len);
+ 	 q = tpath;
+       }
+       else



From zaitcev at fedoraproject.org  Fri Aug  7 19:56:09 2009
From: zaitcev at fedoraproject.org (Pete Zaitcev)
Date: Fri,  7 Aug 2009 19:56:09 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd-test.patch, 1.1.2.2, 1.1.2.3 chunkd.spec, 
	1.6.2.2, 1.6.2.3
Message-ID: <20090807195609.E0E0211C00D7@cvs1.fedora.phx.redhat.com>

Author: zaitcev

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28050

Modified Files:
      Tag: private-zaitcev-bz514651-1
	chunkd-test.patch chunkd.spec 
Log Message:
Endianness, test 3.


chunkd-test.patch:
 object.c |    2 +-
 server.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: chunkd-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/Attic/chunkd-test.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
--- chunkd-test.patch	7 Aug 2009 19:25:41 -0000	1.1.2.2
+++ chunkd-test.patch	7 Aug 2009 19:56:09 -0000	1.1.2.3
@@ -18,7 +18,7 @@ diff -urp chunkd-0.4git/server/server.c 
  	memcpy(resp, &cli->creq, sizeof(cli->creq));
  
 -	resp->data_len = GUINT64_TO_LE(content_len);
-+	resp->data_len = GUINT32_TO_LE((uint32_t)content_len);
++	resp->data_len = GUINT64_TO_LE((uint64_t)content_len);
  
  	cli->state = evt_recycle;
  


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -p -r1.6.2.2 -r1.6.2.3
--- chunkd.spec	7 Aug 2009 19:25:41 -0000	1.6.2.2
+++ chunkd.spec	7 Aug 2009 19:56:09 -0000	1.6.2.3
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.7.g6b1e9b66.bz514651.2%{?dist}
+Release:	0.7.g6b1e9b66.bz514651.3%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -99,9 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
-* Thu Aug 6 2009 Pete Zaitcev <zaitcev at redhat.com>
+* Fri Aug 7 2009 Pete Zaitcev <zaitcev at redhat.com>
 - test build for bz#514651.
-- bump to 0.4-0.7.g6b1e9b66.bz514651.2
+- bump to 0.4-0.7.g6b1e9b66.bz514651.3
 
 * Wed Jul 29 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.7.g6b1e9b66
 - update source to commit 6b1e9b6641df0353a81c7b1352f5f652c5a7f9d8



From pkgdb at fedoraproject.org  Fri Aug  7 19:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:56:38 +0000
Subject: [pkgdb] potrace was added for jussilehtola
Message-ID: <20090807195638.B424E10F899@bastion2.fedora.phx.redhat.com>

kevin has added Package potrace with summary Transform bitmaps into vector graphics
kevin has approved Package potrace
kevin has added a Fedora devel branch for potrace with an owner of jussilehtola
kevin has approved potrace in Fedora devel
kevin has approved Package potrace
kevin has set commit to Approved for 107427 on potrace (Fedora devel)
kevin has set checkout to Approved for 107427 on potrace (Fedora devel)
kevin has set build to Approved for 107427 on potrace (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/potrace



From pkgdb at fedoraproject.org  Fri Aug  7 19:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:56:40 +0000
Subject: [pkgdb] potrace summary updated by kevin
Message-ID: <20090807195640.9C72A10F8A0@bastion2.fedora.phx.redhat.com>

kevin set package potrace summary to Transform bitmaps into vector graphics

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/potrace



From pkgdb at fedoraproject.org  Fri Aug  7 19:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:56:40 +0000
Subject: [pkgdb] potrace (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807195640.B39BF10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for potrace
kevin has set commit to Approved for 107427 on potrace (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on potrace (Fedora EPEL 5)
kevin has set build to Approved for 107427 on potrace (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/potrace



From pkgdb at fedoraproject.org  Fri Aug  7 19:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:56:40 +0000
Subject: [pkgdb] potrace (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807195640.BE0D410F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for potrace
kevin has set commit to Approved for 107427 on potrace (Fedora 10)
kevin has set checkout to Approved for 107427 on potrace (Fedora 10)
kevin has set build to Approved for 107427 on potrace (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/potrace



From pkgdb at fedoraproject.org  Fri Aug  7 19:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:56:40 +0000
Subject: [pkgdb] potrace (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807195640.D553710F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for potrace
kevin has set commit to Approved for 107427 on potrace (Fedora 11)
kevin has set checkout to Approved for 107427 on potrace (Fedora 11)
kevin has set build to Approved for 107427 on potrace (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/potrace



From kevin at fedoraproject.org  Fri Aug  7 19:56:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:56:48 +0000 (UTC)
Subject: rpms/potrace - New directory
Message-ID: <20090807195648.1C57311C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/potrace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28866/rpms/potrace

Log Message:
Directory /cvs/pkgs/rpms/potrace added to the repository




From kevin at fedoraproject.org  Fri Aug  7 19:56:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:56:48 +0000 (UTC)
Subject: rpms/potrace/devel - New directory
Message-ID: <20090807195648.4490911C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/potrace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28866/rpms/potrace/devel

Log Message:
Directory /cvs/pkgs/rpms/potrace/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 19:56:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:56:53 +0000 (UTC)
Subject: rpms/potrace Makefile,NONE,1.1
Message-ID: <20090807195653.CDA2911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/potrace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28866/rpms/potrace

Added Files:
	Makefile 
Log Message:
Setup of module potrace


--- NEW FILE Makefile ---
# Top level Makefile for module potrace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug  7 19:56:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:56:54 +0000 (UTC)
Subject: rpms/potrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090807195654.1C9B111C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/potrace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg28866/rpms/potrace/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module potrace


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: potrace
# $Id: Makefile,v 1.1 2009/08/07 19:56:53 kevin Exp $
NAME := potrace
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  7 19:57:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:57:47 +0000
Subject: [pkgdb] jide-oss was added for hicham
Message-ID: <20090807195747.952E510F890@bastion2.fedora.phx.redhat.com>

kevin has added Package jide-oss with summary Swing component library built on top of Java/Swing
kevin has approved Package jide-oss
kevin has added a Fedora devel branch for jide-oss with an owner of hicham
kevin has approved jide-oss in Fedora devel
kevin has approved Package jide-oss
kevin has set commit to Approved for 107427 on jide-oss (Fedora devel)
kevin has set checkout to Approved for 107427 on jide-oss (Fedora devel)
kevin has set build to Approved for 107427 on jide-oss (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jide-oss



From pkgdb at fedoraproject.org  Fri Aug  7 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:57:48 +0000
Subject: [pkgdb] jide-oss summary updated by kevin
Message-ID: <20090807195748.EBA1010F89F@bastion2.fedora.phx.redhat.com>

kevin set package jide-oss summary to Swing component library built on top of Java/Swing

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jide-oss



From kevin at fedoraproject.org  Fri Aug  7 19:58:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:58:00 +0000 (UTC)
Subject: rpms/jide-oss - New directory
Message-ID: <20090807195800.16CA911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jide-oss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss29291/rpms/jide-oss

Log Message:
Directory /cvs/pkgs/rpms/jide-oss added to the repository




From kevin at fedoraproject.org  Fri Aug  7 19:58:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:58:00 +0000 (UTC)
Subject: rpms/jide-oss/devel - New directory
Message-ID: <20090807195800.3EC9311C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss29291/rpms/jide-oss/devel

Log Message:
Directory /cvs/pkgs/rpms/jide-oss/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug  7 19:57:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:57:48 +0000
Subject: [pkgdb] jide-oss (Fedora, 11) updated by kevin
Message-ID: <20090807195748.F1C8010F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jide-oss
kevin has set commit to Approved for 107427 on jide-oss (Fedora 11)
kevin has set checkout to Approved for 107427 on jide-oss (Fedora 11)
kevin has set build to Approved for 107427 on jide-oss (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jide-oss



From kevin at fedoraproject.org  Fri Aug  7 19:58:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:58:06 +0000 (UTC)
Subject: rpms/jide-oss/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090807195806.6FE3C11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss29291/rpms/jide-oss/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jide-oss


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jide-oss
# $Id: Makefile,v 1.1 2009/08/07 19:58:06 kevin Exp $
NAME := jide-oss
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug  7 19:58:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 19:58:06 +0000 (UTC)
Subject: rpms/jide-oss Makefile,NONE,1.1
Message-ID: <20090807195806.276A011C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jide-oss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss29291/rpms/jide-oss

Added Files:
	Makefile 
Log Message:
Setup of module jide-oss


--- NEW FILE Makefile ---
# Top level Makefile for module jide-oss
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug  7 19:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 19:58:56 +0000
Subject: [pkgdb] jide-oss (Fedora, 10) updated by kevin
Message-ID: <20090807195856.DB30310F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jide-oss
kevin has set commit to Approved for 107427 on jide-oss (Fedora 10)
kevin has set checkout to Approved for 107427 on jide-oss (Fedora 10)
kevin has set build to Approved for 107427 on jide-oss (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jide-oss



From pkgdb at fedoraproject.org  Fri Aug  7 20:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:00:26 +0000
Subject: [pkgdb] gjs was added for pbrobinson
Message-ID: <20090807200026.9A2B610F890@bastion2.fedora.phx.redhat.com>

kevin has added Package gjs with summary Javascript Bindings for GNOME
kevin has approved Package gjs
kevin has added a Fedora devel branch for gjs with an owner of pbrobinson
kevin has approved gjs in Fedora devel
kevin has approved Package gjs
kevin has set commit to Approved for 107427 on gjs (Fedora devel)
kevin has set checkout to Approved for 107427 on gjs (Fedora devel)
kevin has set build to Approved for 107427 on gjs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gjs



From pkgdb at fedoraproject.org  Fri Aug  7 20:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:00:30 +0000
Subject: [pkgdb] gjs summary updated by kevin
Message-ID: <20090807200030.648DD10F8A1@bastion2.fedora.phx.redhat.com>

kevin set package gjs summary to Javascript Bindings for GNOME

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gjs



From pkgdb at fedoraproject.org  Fri Aug  7 20:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:00:30 +0000
Subject: [pkgdb] gjs (Fedora, 11) updated by kevin
Message-ID: <20090807200030.874C910F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gjs (Fedora devel) for otaylor
kevin approved watchcommits on gjs (Fedora devel) for otaylor
kevin approved commit on gjs (Fedora devel) for otaylor
kevin approved build on gjs (Fedora devel) for otaylor
kevin approved approveacls on gjs (Fedora devel) for otaylor
kevin approved watchbugzilla on gjs (Fedora devel) for walters
kevin approved watchcommits on gjs (Fedora devel) for walters
kevin approved commit on gjs (Fedora devel) for walters
kevin approved build on gjs (Fedora devel) for walters
kevin approved approveacls on gjs (Fedora devel) for walters

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gjs



From pkgdb at fedoraproject.org  Fri Aug  7 20:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:00:30 +0000
Subject: [pkgdb] gjs (Fedora, 11) updated by kevin
Message-ID: <20090807200030.A341F10F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gjs
kevin has set commit to Approved for 107427 on gjs (Fedora 11)
kevin has set checkout to Approved for 107427 on gjs (Fedora 11)
kevin has set build to Approved for 107427 on gjs (Fedora 11)
kevin approved watchbugzilla on gjs (Fedora 11) for otaylor
kevin approved watchcommits on gjs (Fedora 11) for otaylor
kevin approved commit on gjs (Fedora 11) for otaylor
kevin approved build on gjs (Fedora 11) for otaylor
kevin approved approveacls on gjs (Fedora 11) for otaylor
kevin approved watchbugzilla on gjs (Fedora 11) for walters
kevin approved watchcommits on gjs (Fedora 11) for walters
kevin approved commit on gjs (Fedora 11) for walters
kevin approved build on gjs (Fedora 11) for walters
kevin approved approveacls on gjs (Fedora 11) for walters

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gjs



From kevin at fedoraproject.org  Fri Aug  7 20:00:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:00:37 +0000 (UTC)
Subject: rpms/gjs/devel - New directory
Message-ID: <20090807200037.4303511C0425@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gjs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf29653/rpms/gjs/devel

Log Message:
Directory /cvs/pkgs/rpms/gjs/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:00:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:00:37 +0000 (UTC)
Subject: rpms/gjs - New directory
Message-ID: <20090807200037.2E1AB11C034A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gjs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf29653/rpms/gjs

Log Message:
Directory /cvs/pkgs/rpms/gjs added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:00:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:00:43 +0000 (UTC)
Subject: rpms/gjs Makefile,NONE,1.1
Message-ID: <20090807200043.5AC7511C034A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gjs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf29653/rpms/gjs

Added Files:
	Makefile 
Log Message:
Setup of module gjs


--- NEW FILE Makefile ---
# Top level Makefile for module gjs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug  7 20:00:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:00:43 +0000 (UTC)
Subject: rpms/gjs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090807200043.CDDF911C034A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gjs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf29653/rpms/gjs/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gjs


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gjs
# $Id: Makefile,v 1.1 2009/08/07 20:00:43 kevin Exp $
NAME := gjs
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  7 20:01:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:01:29 +0000
Subject: [pkgdb] perl-Beanstalk-Client summary updated by kevin
Message-ID: <20090807200129.1167810F89F@bastion2.fedora.phx.redhat.com>

kevin set package perl-Beanstalk-Client summary to Client class to talk to a beanstalkd server

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Beanstalk-Client



From pkgdb at fedoraproject.org  Fri Aug  7 20:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:01:27 +0000
Subject: [pkgdb] perl-Beanstalk-Client was added for ruben
Message-ID: <20090807200127.4A3D610F890@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Beanstalk-Client with summary Client class to talk to a beanstalkd server
kevin has approved Package perl-Beanstalk-Client
kevin has added a Fedora devel branch for perl-Beanstalk-Client with an owner of ruben
kevin has approved perl-Beanstalk-Client in Fedora devel
kevin has approved Package perl-Beanstalk-Client
kevin has set commit to Approved for 107427 on perl-Beanstalk-Client (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Beanstalk-Client (Fedora devel)
kevin has set build to Approved for 107427 on perl-Beanstalk-Client (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Beanstalk-Client



From pkgdb at fedoraproject.org  Fri Aug  7 20:01:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:01:29 +0000
Subject: [pkgdb] perl-Beanstalk-Client (Fedora, 11) updated by kevin
Message-ID: <20090807200129.1801310F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Beanstalk-Client
kevin has set commit to Approved for 107427 on perl-Beanstalk-Client (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Beanstalk-Client (Fedora 11)
kevin has set build to Approved for 107427 on perl-Beanstalk-Client (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Beanstalk-Client



From kevin at fedoraproject.org  Fri Aug  7 20:01:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:01:41 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client - New directory
Message-ID: <20090807200141.14DD211C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT29886/rpms/perl-Beanstalk-Client

Log Message:
Directory /cvs/pkgs/rpms/perl-Beanstalk-Client added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:01:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:01:41 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client/devel - New directory
Message-ID: <20090807200141.34AF011C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT29886/rpms/perl-Beanstalk-Client/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Beanstalk-Client/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:01:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:01:46 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client Makefile,NONE,1.1
Message-ID: <20090807200146.DE6E011C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT29886/rpms/perl-Beanstalk-Client

Added Files:
	Makefile 
Log Message:
Setup of module perl-Beanstalk-Client


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Beanstalk-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  Fri Aug  7 20:01:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:01:47 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090807200147.1FDF611C034A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT29886/rpms/perl-Beanstalk-Client/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Beanstalk-Client


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Beanstalk-Client
# $Id: Makefile,v 1.1 2009/08/07 20:01:47 kevin Exp $
NAME := perl-Beanstalk-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  Fri Aug  7 20:02:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:02:45 +0000
Subject: [pkgdb] perl-Math-Calc-Units was added for ruben
Message-ID: <20090807200245.9A02B10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Math-Calc-Units with summary Human-readable unit-aware calculator
kevin has approved Package perl-Math-Calc-Units
kevin has added a Fedora devel branch for perl-Math-Calc-Units with an owner of ruben
kevin has approved perl-Math-Calc-Units in Fedora devel
kevin has approved Package perl-Math-Calc-Units
kevin has set commit to Approved for 107427 on perl-Math-Calc-Units (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Math-Calc-Units (Fedora devel)
kevin has set build to Approved for 107427 on perl-Math-Calc-Units (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Calc-Units



From pkgdb at fedoraproject.org  Fri Aug  7 20:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:02:47 +0000
Subject: [pkgdb] perl-Math-Calc-Units summary updated by kevin
Message-ID: <20090807200247.F0CC710F8A0@bastion2.fedora.phx.redhat.com>

kevin set package perl-Math-Calc-Units summary to Human-readable unit-aware calculator

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Calc-Units



From kevin at fedoraproject.org  Fri Aug  7 20:03:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:03:00 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units - New directory
Message-ID: <20090807200300.1B6A111C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30084/rpms/perl-Math-Calc-Units

Log Message:
Directory /cvs/pkgs/rpms/perl-Math-Calc-Units added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:03:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:03:00 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units/devel - New directory
Message-ID: <20090807200300.3D54711C0381@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30084/rpms/perl-Math-Calc-Units/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Math-Calc-Units/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:03:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:03:06 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units Makefile,NONE,1.1
Message-ID: <20090807200306.4798111C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30084/rpms/perl-Math-Calc-Units

Added Files:
	Makefile 
Log Message:
Setup of module perl-Math-Calc-Units


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Math-Calc-Units
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug  7 20:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:02:47 +0000
Subject: [pkgdb] perl-Math-Calc-Units (Fedora, 11) updated by kevin
Message-ID: <20090807200248.0549510F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Math-Calc-Units
kevin has set commit to Approved for 107427 on perl-Math-Calc-Units (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Math-Calc-Units (Fedora 11)
kevin has set build to Approved for 107427 on perl-Math-Calc-Units (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Calc-Units



From kevin at fedoraproject.org  Fri Aug  7 20:03:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:03:06 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090807200306.A7E8811C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30084/rpms/perl-Math-Calc-Units/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Math-Calc-Units


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Math-Calc-Units
# $Id: Makefile,v 1.1 2009/08/07 20:03:06 kevin Exp $
NAME := perl-Math-Calc-Units
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  7 20:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:03:51 +0000
Subject: [pkgdb] trac-tickettemplate-plugin was added for jstanley
Message-ID: <20090807200351.E247310F89F@bastion2.fedora.phx.redhat.com>

kevin has added Package trac-tickettemplate-plugin with summary Allows creation of ticket templates in trac
kevin has approved Package trac-tickettemplate-plugin
kevin has added a Fedora devel branch for trac-tickettemplate-plugin with an owner of jstanley
kevin has approved trac-tickettemplate-plugin in Fedora devel
kevin has approved Package trac-tickettemplate-plugin
kevin has set commit to Approved for 107427 on trac-tickettemplate-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on trac-tickettemplate-plugin (Fedora devel)
kevin has set build to Approved for 107427 on trac-tickettemplate-plugin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tickettemplate-plugin



From pkgdb at fedoraproject.org  Fri Aug  7 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:03:53 +0000
Subject: [pkgdb] trac-tickettemplate-plugin summary updated by kevin
Message-ID: <20090807200353.B2AE410F8A9@bastion2.fedora.phx.redhat.com>

kevin set package trac-tickettemplate-plugin summary to Allows creation of ticket templates in trac

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tickettemplate-plugin



From pkgdb at fedoraproject.org  Fri Aug  7 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:03:53 +0000
Subject: [pkgdb] trac-tickettemplate-plugin (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807200353.BC58A10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for trac-tickettemplate-plugin
kevin has set commit to Approved for 107427 on trac-tickettemplate-plugin (Fedora 10)
kevin has set checkout to Approved for 107427 on trac-tickettemplate-plugin (Fedora 10)
kevin has set build to Approved for 107427 on trac-tickettemplate-plugin (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tickettemplate-plugin



From pkgdb at fedoraproject.org  Fri Aug  7 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:03:53 +0000
Subject: [pkgdb] trac-tickettemplate-plugin (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807200354.5679110F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for trac-tickettemplate-plugin
kevin has set commit to Approved for 107427 on trac-tickettemplate-plugin (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on trac-tickettemplate-plugin (Fedora EPEL 5)
kevin has set build to Approved for 107427 on trac-tickettemplate-plugin (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tickettemplate-plugin



From pkgdb at fedoraproject.org  Fri Aug  7 20:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:03:53 +0000
Subject: [pkgdb] trac-tickettemplate-plugin (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807200354.1A82910F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for trac-tickettemplate-plugin
kevin has set commit to Approved for 107427 on trac-tickettemplate-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on trac-tickettemplate-plugin (Fedora 11)
kevin has set build to Approved for 107427 on trac-tickettemplate-plugin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/trac-tickettemplate-plugin



From kevin at fedoraproject.org  Fri Aug  7 20:04:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:04:03 +0000 (UTC)
Subject: rpms/trac-tickettemplate-plugin - New directory
Message-ID: <20090807200403.1E9D711C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-tickettemplate-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu30244/rpms/trac-tickettemplate-plugin

Log Message:
Directory /cvs/pkgs/rpms/trac-tickettemplate-plugin added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:04:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:04:03 +0000 (UTC)
Subject: rpms/trac-tickettemplate-plugin/devel - New directory
Message-ID: <20090807200403.39BB811C0416@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-tickettemplate-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu30244/rpms/trac-tickettemplate-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/trac-tickettemplate-plugin/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:04:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:04:09 +0000 (UTC)
Subject: rpms/trac-tickettemplate-plugin Makefile,NONE,1.1
Message-ID: <20090807200409.1B1E311C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-tickettemplate-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu30244/rpms/trac-tickettemplate-plugin

Added Files:
	Makefile 
Log Message:
Setup of module trac-tickettemplate-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module trac-tickettemplate-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  Fri Aug  7 20:04:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:04:09 +0000 (UTC)
Subject: rpms/trac-tickettemplate-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090807200409.5DD6E11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/trac-tickettemplate-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu30244/rpms/trac-tickettemplate-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module trac-tickettemplate-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: trac-tickettemplate-plugin
# $Id: Makefile,v 1.1 2009/08/07 20:04:09 kevin Exp $
NAME := trac-tickettemplate-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  Fri Aug  7 20:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:04:53 +0000
Subject: [pkgdb] chameleon was added for jortel
Message-ID: <20090807200453.9508C10F8A2@bastion2.fedora.phx.redhat.com>

kevin has added Package chameleon with summary Database schema transformation tool
kevin has approved Package chameleon
kevin has added a Fedora devel branch for chameleon with an owner of jortel
kevin has approved chameleon in Fedora devel
kevin has approved Package chameleon
kevin has set commit to Approved for 107427 on chameleon (Fedora devel)
kevin has set checkout to Approved for 107427 on chameleon (Fedora devel)
kevin has set build to Approved for 107427 on chameleon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chameleon



From pkgdb at fedoraproject.org  Fri Aug  7 20:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:04:55 +0000
Subject: [pkgdb] chameleon summary updated by kevin
Message-ID: <20090807200456.09D3E10F8B7@bastion2.fedora.phx.redhat.com>

kevin set package chameleon summary to Database schema transformation tool

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chameleon



From pkgdb at fedoraproject.org  Fri Aug  7 20:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:04:55 +0000
Subject: [pkgdb] chameleon (Fedora EPEL, 4) updated by kevin
Message-ID: <20090807200456.102D210F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for chameleon
kevin has set commit to Approved for 107427 on chameleon (Fedora 10)
kevin has set checkout to Approved for 107427 on chameleon (Fedora 10)
kevin has set build to Approved for 107427 on chameleon (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chameleon



From pkgdb at fedoraproject.org  Fri Aug  7 20:04:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:04:56 +0000
Subject: [pkgdb] chameleon (Fedora EPEL, 4) updated by kevin
Message-ID: <20090807200456.37E9510F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for chameleon
kevin has set commit to Approved for 107427 on chameleon (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on chameleon (Fedora EPEL 5)
kevin has set build to Approved for 107427 on chameleon (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chameleon



From pkgdb at fedoraproject.org  Fri Aug  7 20:04:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:04:56 +0000
Subject: [pkgdb] chameleon (Fedora EPEL, 4) updated by kevin
Message-ID: <20090807200456.20BFD10F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for chameleon
kevin has set commit to Approved for 107427 on chameleon (Fedora 11)
kevin has set checkout to Approved for 107427 on chameleon (Fedora 11)
kevin has set build to Approved for 107427 on chameleon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chameleon



From kevin at fedoraproject.org  Fri Aug  7 20:05:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:05:03 +0000 (UTC)
Subject: rpms/chameleon - New directory
Message-ID: <20090807200503.1E65D11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chameleon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse30508/rpms/chameleon

Log Message:
Directory /cvs/pkgs/rpms/chameleon added to the repository




From pkgdb at fedoraproject.org  Fri Aug  7 20:04:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:04:56 +0000
Subject: [pkgdb] chameleon (Fedora EPEL, 4) updated by kevin
Message-ID: <20090807200456.2A35410F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for chameleon
kevin has set commit to Approved for 107427 on chameleon (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on chameleon (Fedora EPEL 4)
kevin has set build to Approved for 107427 on chameleon (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chameleon



From kevin at fedoraproject.org  Fri Aug  7 20:05:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:05:03 +0000 (UTC)
Subject: rpms/chameleon/devel - New directory
Message-ID: <20090807200503.3291011C0381@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chameleon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse30508/rpms/chameleon/devel

Log Message:
Directory /cvs/pkgs/rpms/chameleon/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:05:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:05:08 +0000 (UTC)
Subject: rpms/chameleon Makefile,NONE,1.1
Message-ID: <20090807200508.C77EE11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chameleon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse30508/rpms/chameleon

Added Files:
	Makefile 
Log Message:
Setup of module chameleon


--- NEW FILE Makefile ---
# Top level Makefile for module chameleon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug  7 20:05:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:05:09 +0000 (UTC)
Subject: rpms/chameleon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090807200509.06DCC11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chameleon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse30508/rpms/chameleon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chameleon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: chameleon
# $Id: Makefile,v 1.1 2009/08/07 20:05:08 kevin Exp $
NAME := chameleon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  7 20:05:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:05:47 +0000
Subject: [pkgdb] pyliblo was added for fab
Message-ID: <20090807200547.7D41810F8B2@bastion2.fedora.phx.redhat.com>

kevin has added Package pyliblo with summary Python bindings for the liblo OSC library
kevin has approved Package pyliblo
kevin has added a Fedora devel branch for pyliblo with an owner of fab
kevin has approved pyliblo in Fedora devel
kevin has approved Package pyliblo
kevin has set commit to Approved for 107427 on pyliblo (Fedora devel)
kevin has set checkout to Approved for 107427 on pyliblo (Fedora devel)
kevin has set build to Approved for 107427 on pyliblo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyliblo



From pkgdb at fedoraproject.org  Fri Aug  7 20:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:05:49 +0000
Subject: [pkgdb] pyliblo summary updated by kevin
Message-ID: <20090807200549.C3F9810F8B4@bastion2.fedora.phx.redhat.com>

kevin set package pyliblo summary to Python bindings for the liblo OSC library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyliblo



From pkgdb at fedoraproject.org  Fri Aug  7 20:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:05:49 +0000
Subject: [pkgdb] pyliblo (Fedora, 10) updated by kevin
Message-ID: <20090807200549.D22B110F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pyliblo
kevin has set commit to Approved for 107427 on pyliblo (Fedora 10)
kevin has set checkout to Approved for 107427 on pyliblo (Fedora 10)
kevin has set build to Approved for 107427 on pyliblo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyliblo



From pkgdb at fedoraproject.org  Fri Aug  7 20:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:05:49 +0000
Subject: [pkgdb] pyliblo (Fedora, 10) updated by kevin
Message-ID: <20090807200549.EB5CD10F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pyliblo
kevin has set commit to Approved for 107427 on pyliblo (Fedora 11)
kevin has set checkout to Approved for 107427 on pyliblo (Fedora 11)
kevin has set build to Approved for 107427 on pyliblo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyliblo



From kevin at fedoraproject.org  Fri Aug  7 20:06:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:06:00 +0000 (UTC)
Subject: rpms/pyliblo - New directory
Message-ID: <20090807200600.1B6C011C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyliblo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30826/rpms/pyliblo

Log Message:
Directory /cvs/pkgs/rpms/pyliblo added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:06:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:06:00 +0000 (UTC)
Subject: rpms/pyliblo/devel - New directory
Message-ID: <20090807200600.4328911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyliblo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30826/rpms/pyliblo/devel

Log Message:
Directory /cvs/pkgs/rpms/pyliblo/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:06:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:06:06 +0000 (UTC)
Subject: rpms/pyliblo Makefile,NONE,1.1
Message-ID: <20090807200606.3E56F11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyliblo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30826/rpms/pyliblo

Added Files:
	Makefile 
Log Message:
Setup of module pyliblo


--- NEW FILE Makefile ---
# Top level Makefile for module pyliblo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug  7 20:06:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:06:06 +0000 (UTC)
Subject: rpms/pyliblo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090807200606.8719311C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pyliblo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30826/rpms/pyliblo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyliblo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pyliblo
# $Id: Makefile,v 1.1 2009/08/07 20:06:06 kevin Exp $
NAME := pyliblo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  7 20:06:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:06:52 +0000
Subject: [pkgdb] bisho was added for pbrobinson
Message-ID: <20090807200652.5333010F8B2@bastion2.fedora.phx.redhat.com>

kevin has added Package bisho with summary Moblin configuration tool for mojito social network aggregator
kevin has approved Package bisho
kevin has added a Fedora devel branch for bisho with an owner of pbrobinson
kevin has approved bisho in Fedora devel
kevin has approved Package bisho
kevin has set commit to Approved for 107427 on bisho (Fedora devel)
kevin has set checkout to Approved for 107427 on bisho (Fedora devel)
kevin has set build to Approved for 107427 on bisho (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bisho



From pkgdb at fedoraproject.org  Fri Aug  7 20:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:06:54 +0000
Subject: [pkgdb] bisho summary updated by kevin
Message-ID: <20090807200654.8265E10F8B6@bastion2.fedora.phx.redhat.com>

kevin set package bisho summary to Moblin configuration tool for mojito social network aggregator

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bisho



From pkgdb at fedoraproject.org  Fri Aug  7 20:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:06:54 +0000
Subject: [pkgdb] bisho (Fedora, 11) updated by kevin
Message-ID: <20090807200654.8EC4E10F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for bisho
kevin has set commit to Approved for 107427 on bisho (Fedora 11)
kevin has set checkout to Approved for 107427 on bisho (Fedora 11)
kevin has set build to Approved for 107427 on bisho (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bisho



From kevin at fedoraproject.org  Fri Aug  7 20:07:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:07:01 +0000 (UTC)
Subject: rpms/bisho - New directory
Message-ID: <20090807200701.1F83611C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bisho
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU31077/rpms/bisho

Log Message:
Directory /cvs/pkgs/rpms/bisho added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:07:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:07:01 +0000 (UTC)
Subject: rpms/bisho/devel - New directory
Message-ID: <20090807200701.40C7111C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU31077/rpms/bisho/devel

Log Message:
Directory /cvs/pkgs/rpms/bisho/devel added to the repository




From kevin at fedoraproject.org  Fri Aug  7 20:07:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:07:07 +0000 (UTC)
Subject: rpms/bisho Makefile,NONE,1.1
Message-ID: <20090807200707.5109511C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bisho
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU31077/rpms/bisho

Added Files:
	Makefile 
Log Message:
Setup of module bisho


--- NEW FILE Makefile ---
# Top level Makefile for module bisho
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug  7 20:07:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  7 Aug 2009 20:07:07 +0000 (UTC)
Subject: rpms/bisho/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090807200707.9298A11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU31077/rpms/bisho/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bisho


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bisho
# $Id: Makefile,v 1.1 2009/08/07 20:07:07 kevin Exp $
NAME := bisho
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug  7 20:07:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:07:33 +0000
Subject: [pkgdb] nss-ldapd (Fedora, 11) updated by kevin
Message-ID: <20090807200733.AA42410F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for nss-ldapd
kevin has set commit to Approved for 107427 on nss-ldapd (Fedora 11)
kevin has set checkout to Approved for 107427 on nss-ldapd (Fedora 11)
kevin has set build to Approved for 107427 on nss-ldapd (Fedora 11)
kevin changed owner of nss-ldapd in Fedora 11 to nalin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-ldapd



From pkgdb at fedoraproject.org  Fri Aug  7 20:08:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 20:08:08 +0000
Subject: [pkgdb] opencv (Fedora EPEL, 5) updated by kevin
Message-ID: <20090807200808.B835810F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for opencv
kevin has set commit to Approved for 107427 on opencv (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on opencv (Fedora EPEL 5)
kevin has set build to Approved for 107427 on opencv (Fedora EPEL 5)
kevin changed owner of opencv in Fedora EPEL 5 to topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/opencv



From jussilehtola at fedoraproject.org  Fri Aug  7 20:15:24 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  7 Aug 2009 20:15:24 +0000 (UTC)
Subject: rpms/potrace/devel import.log, NONE, 1.1 potrace-1.8-buildlib.patch,
	NONE, 1.1 potrace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090807201524.ED60D11C00D7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/potrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv809/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log potrace-1.8-buildlib.patch potrace.spec 
Log Message:
Imported in Fedora.


--- NEW FILE import.log ---
potrace-1_8-4_fc11:HEAD:potrace-1.8-4.fc11.src.rpm:1249676109

potrace-1.8-buildlib.patch:
 Makefile.am |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE potrace-1.8-buildlib.patch ---
diff -up potrace-1.8/src/Makefile.am.orig potrace-1.8/src/Makefile.am
--- potrace-1.8/src/Makefile.am.orig	2007-04-09 03:36:44.000000000 +0300
+++ potrace-1.8/src/Makefile.am	2009-08-03 13:47:54.318147056 +0300
@@ -7,8 +7,7 @@
 #----------------------------------------------------------------------
 # programs:
 
-bin_PROGRAMS = potrace mkbitmap
-noinst_PROGRAMS = potracelib_demo
+bin_PROGRAMS = potrace mkbitmap potracelib_demo
 
 potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c	   \
  backend_eps.h flate.c flate.h lists.h greymap.c greymap.h render.c	   \
@@ -31,7 +30,7 @@ potracelib_demo_DEPENDENCIES = libpotrac
 #----------------------------------------------------------------------
 # static libraries:
 
-noinst_LIBRARIES = libpotrace.a
+lib_LIBRARIES = libpotrace.a
 libpotrace_a_SOURCES = curve.c curve.h trace.c trace.h decompose.c	\
  decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h	\
  progress.h


--- NEW FILE potrace.spec ---
Name:		potrace
Version:	1.8
Release:	4%{?dist}
Summary:	Transform bitmaps into vector graphics
Group:		Applications/Multimedia
# README defines license as GPLv2+
License:	GPLv2+
URL:		http://potrace.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Documentation
Source1:	http://potrace.sourceforge.net/potrace.pdf
Source2:	http://potrace.sourceforge.net/potracelib.pdf

# Patch to build library
Patch0:		potrace-1.8-buildlib.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	automake
BuildRequires:	zlib-devel

%description
Potrace is a utility for tracing a bitmap, which means, transforming a bitmap 
into a smooth, scalable image. The input is a bitmap (PBM, PGM, PPM, or BMP
format), and the default output is an encapsulated PostScript file (EPS).
A typical use is to create EPS files from scanned data, such as company or
university logos, handwritten notes, etc. The resulting image is not "jaggy"
like a bitmap, but smooth. It can then be rendered at any resolution.

Potrace can currently produce the following output formats: EPS, PostScript,
PDF, SVG (scalable vector graphics), Xfig, Gimppath, and PGM (for easy
antialiasing). Additional backends might be added in the future.

Mkbitmap is a program distributed with Potrace which can be used to pre-process
the input for better tracing behavior on greyscale and color images.


%package devel
Summary:	Potrace development library & library demo
Group:		Applications/Multimedia
Provides:	%{name}-static = %{version}-%{release}
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains the potrace development library & library demo.


%package doc
Summary:	Documentation on how to use the potrace library
Group:		Documentation
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildArch:	noarch
%endif

%description doc
This package contains documentation for the potrace algorithm and the potrace
library.

%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
cp -a %{SOURCE1} .
cp -a %{SOURCE2} .

%build
%configure --enable-metric
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -D -p -m 644 src/potracelib.h %{buildroot}%{_includedir}/potracelib.h

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/potrace
%{_bindir}/mkbitmap
%{_mandir}/man1/potrace.1.*
%{_mandir}/man1/mkbitmap.1.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/potracelib_demo
%{_libdir}/libpotrace.a
%{_includedir}/potracelib.h

%files doc
%defattr(-,root,root,-)
%doc potrace.pdf potracelib.pdf

%changelog
* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-4
- Corrected license tag.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-3
- Added missing BuildRequires.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-2
- Adjusted descriptions as per review comments. 

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-1
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/potrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 19:56:53 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:15:24 -0000	1.2
@@ -0,0 +1,3 @@
+potrace-1.8.tar.gz
+potrace.pdf
+potracelib.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/potrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:56:53 -0000	1.1
+++ sources	7 Aug 2009 20:15:24 -0000	1.2
@@ -0,0 +1,3 @@
+e73b45565737d64011612704dd4d9f86  potrace-1.8.tar.gz
+ead28818fe860068c9147be752be0f41  potrace.pdf
+0d68f90f965f9bbe5761ec5daab826cd  potracelib.pdf



From jussilehtola at fedoraproject.org  Fri Aug  7 20:17:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  7 Aug 2009 20:17:00 +0000 (UTC)
Subject: rpms/potrace/EL-5 potrace-1.8-buildlib.patch, NONE, 1.1 potrace.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090807201700.ACA7611C00D7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/potrace/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1060/EL-5

Modified Files:
	sources 
Added Files:
	potrace-1.8-buildlib.patch potrace.spec 
Log Message:
Imported in Fedora.

potrace-1.8-buildlib.patch:
 Makefile.am |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE potrace-1.8-buildlib.patch ---
diff -up potrace-1.8/src/Makefile.am.orig potrace-1.8/src/Makefile.am
--- potrace-1.8/src/Makefile.am.orig	2007-04-09 03:36:44.000000000 +0300
+++ potrace-1.8/src/Makefile.am	2009-08-03 13:47:54.318147056 +0300
@@ -7,8 +7,7 @@
 #----------------------------------------------------------------------
 # programs:
 
-bin_PROGRAMS = potrace mkbitmap
-noinst_PROGRAMS = potracelib_demo
+bin_PROGRAMS = potrace mkbitmap potracelib_demo
 
 potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c	   \
  backend_eps.h flate.c flate.h lists.h greymap.c greymap.h render.c	   \
@@ -31,7 +30,7 @@ potracelib_demo_DEPENDENCIES = libpotrac
 #----------------------------------------------------------------------
 # static libraries:
 
-noinst_LIBRARIES = libpotrace.a
+lib_LIBRARIES = libpotrace.a
 libpotrace_a_SOURCES = curve.c curve.h trace.c trace.h decompose.c	\
  decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h	\
  progress.h


--- NEW FILE potrace.spec ---
Name:		potrace
Version:	1.8
Release:	4%{?dist}
Summary:	Transform bitmaps into vector graphics
Group:		Applications/Multimedia
# README defines license as GPLv2+
License:	GPLv2+
URL:		http://potrace.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Documentation
Source1:	http://potrace.sourceforge.net/potrace.pdf
Source2:	http://potrace.sourceforge.net/potracelib.pdf

# Patch to build library
Patch0:		potrace-1.8-buildlib.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	automake
BuildRequires:	zlib-devel

%description
Potrace is a utility for tracing a bitmap, which means, transforming a bitmap 
into a smooth, scalable image. The input is a bitmap (PBM, PGM, PPM, or BMP
format), and the default output is an encapsulated PostScript file (EPS).
A typical use is to create EPS files from scanned data, such as company or
university logos, handwritten notes, etc. The resulting image is not "jaggy"
like a bitmap, but smooth. It can then be rendered at any resolution.

Potrace can currently produce the following output formats: EPS, PostScript,
PDF, SVG (scalable vector graphics), Xfig, Gimppath, and PGM (for easy
antialiasing). Additional backends might be added in the future.

Mkbitmap is a program distributed with Potrace which can be used to pre-process
the input for better tracing behavior on greyscale and color images.


%package devel
Summary:	Potrace development library & library demo
Group:		Applications/Multimedia
Provides:	%{name}-static = %{version}-%{release}
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains the potrace development library & library demo.


%package doc
Summary:	Documentation on how to use the potrace library
Group:		Documentation
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildArch:	noarch
%endif

%description doc
This package contains documentation for the potrace algorithm and the potrace
library.

%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
cp -a %{SOURCE1} .
cp -a %{SOURCE2} .

%build
%configure --enable-metric
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -D -p -m 644 src/potracelib.h %{buildroot}%{_includedir}/potracelib.h

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/potrace
%{_bindir}/mkbitmap
%{_mandir}/man1/potrace.1.*
%{_mandir}/man1/mkbitmap.1.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/potracelib_demo
%{_libdir}/libpotrace.a
%{_includedir}/potracelib.h

%files doc
%defattr(-,root,root,-)
%doc potrace.pdf potracelib.pdf

%changelog
* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-4
- Corrected license tag.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-3
- Added missing BuildRequires.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-2
- Adjusted descriptions as per review comments. 

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/potrace/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:56:53 -0000	1.1
+++ sources	7 Aug 2009 20:17:00 -0000	1.2
@@ -0,0 +1,3 @@
+e73b45565737d64011612704dd4d9f86  potrace-1.8.tar.gz
+ead28818fe860068c9147be752be0f41  potrace.pdf
+0d68f90f965f9bbe5761ec5daab826cd  potracelib.pdf



From jussilehtola at fedoraproject.org  Fri Aug  7 20:17:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  7 Aug 2009 20:17:00 +0000 (UTC)
Subject: rpms/potrace/F-10 potrace-1.8-buildlib.patch, NONE, 1.1 potrace.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090807201700.E22AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/potrace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1060/F-10

Modified Files:
	sources 
Added Files:
	potrace-1.8-buildlib.patch potrace.spec 
Log Message:
Imported in Fedora.

potrace-1.8-buildlib.patch:
 Makefile.am |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE potrace-1.8-buildlib.patch ---
diff -up potrace-1.8/src/Makefile.am.orig potrace-1.8/src/Makefile.am
--- potrace-1.8/src/Makefile.am.orig	2007-04-09 03:36:44.000000000 +0300
+++ potrace-1.8/src/Makefile.am	2009-08-03 13:47:54.318147056 +0300
@@ -7,8 +7,7 @@
 #----------------------------------------------------------------------
 # programs:
 
-bin_PROGRAMS = potrace mkbitmap
-noinst_PROGRAMS = potracelib_demo
+bin_PROGRAMS = potrace mkbitmap potracelib_demo
 
 potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c	   \
  backend_eps.h flate.c flate.h lists.h greymap.c greymap.h render.c	   \
@@ -31,7 +30,7 @@ potracelib_demo_DEPENDENCIES = libpotrac
 #----------------------------------------------------------------------
 # static libraries:
 
-noinst_LIBRARIES = libpotrace.a
+lib_LIBRARIES = libpotrace.a
 libpotrace_a_SOURCES = curve.c curve.h trace.c trace.h decompose.c	\
  decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h	\
  progress.h


--- NEW FILE potrace.spec ---
Name:		potrace
Version:	1.8
Release:	4%{?dist}
Summary:	Transform bitmaps into vector graphics
Group:		Applications/Multimedia
# README defines license as GPLv2+
License:	GPLv2+
URL:		http://potrace.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Documentation
Source1:	http://potrace.sourceforge.net/potrace.pdf
Source2:	http://potrace.sourceforge.net/potracelib.pdf

# Patch to build library
Patch0:		potrace-1.8-buildlib.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	automake
BuildRequires:	zlib-devel

%description
Potrace is a utility for tracing a bitmap, which means, transforming a bitmap 
into a smooth, scalable image. The input is a bitmap (PBM, PGM, PPM, or BMP
format), and the default output is an encapsulated PostScript file (EPS).
A typical use is to create EPS files from scanned data, such as company or
university logos, handwritten notes, etc. The resulting image is not "jaggy"
like a bitmap, but smooth. It can then be rendered at any resolution.

Potrace can currently produce the following output formats: EPS, PostScript,
PDF, SVG (scalable vector graphics), Xfig, Gimppath, and PGM (for easy
antialiasing). Additional backends might be added in the future.

Mkbitmap is a program distributed with Potrace which can be used to pre-process
the input for better tracing behavior on greyscale and color images.


%package devel
Summary:	Potrace development library & library demo
Group:		Applications/Multimedia
Provides:	%{name}-static = %{version}-%{release}
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains the potrace development library & library demo.


%package doc
Summary:	Documentation on how to use the potrace library
Group:		Documentation
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildArch:	noarch
%endif

%description doc
This package contains documentation for the potrace algorithm and the potrace
library.

%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
cp -a %{SOURCE1} .
cp -a %{SOURCE2} .

%build
%configure --enable-metric
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -D -p -m 644 src/potracelib.h %{buildroot}%{_includedir}/potracelib.h

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/potrace
%{_bindir}/mkbitmap
%{_mandir}/man1/potrace.1.*
%{_mandir}/man1/mkbitmap.1.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/potracelib_demo
%{_libdir}/libpotrace.a
%{_includedir}/potracelib.h

%files doc
%defattr(-,root,root,-)
%doc potrace.pdf potracelib.pdf

%changelog
* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-4
- Corrected license tag.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-3
- Added missing BuildRequires.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-2
- Adjusted descriptions as per review comments. 

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/potrace/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:56:53 -0000	1.1
+++ sources	7 Aug 2009 20:17:00 -0000	1.2
@@ -0,0 +1,3 @@
+e73b45565737d64011612704dd4d9f86  potrace-1.8.tar.gz
+ead28818fe860068c9147be752be0f41  potrace.pdf
+0d68f90f965f9bbe5761ec5daab826cd  potracelib.pdf



From jussilehtola at fedoraproject.org  Fri Aug  7 20:17:01 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  7 Aug 2009 20:17:01 +0000 (UTC)
Subject: rpms/potrace/F-11 potrace-1.8-buildlib.patch, NONE, 1.1 potrace.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090807201701.20DB511C00D7@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/potrace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1060/F-11

Modified Files:
	sources 
Added Files:
	potrace-1.8-buildlib.patch potrace.spec 
Log Message:
Imported in Fedora.

potrace-1.8-buildlib.patch:
 Makefile.am |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE potrace-1.8-buildlib.patch ---
diff -up potrace-1.8/src/Makefile.am.orig potrace-1.8/src/Makefile.am
--- potrace-1.8/src/Makefile.am.orig	2007-04-09 03:36:44.000000000 +0300
+++ potrace-1.8/src/Makefile.am	2009-08-03 13:47:54.318147056 +0300
@@ -7,8 +7,7 @@
 #----------------------------------------------------------------------
 # programs:
 
-bin_PROGRAMS = potrace mkbitmap
-noinst_PROGRAMS = potracelib_demo
+bin_PROGRAMS = potrace mkbitmap potracelib_demo
 
 potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c	   \
  backend_eps.h flate.c flate.h lists.h greymap.c greymap.h render.c	   \
@@ -31,7 +30,7 @@ potracelib_demo_DEPENDENCIES = libpotrac
 #----------------------------------------------------------------------
 # static libraries:
 
-noinst_LIBRARIES = libpotrace.a
+lib_LIBRARIES = libpotrace.a
 libpotrace_a_SOURCES = curve.c curve.h trace.c trace.h decompose.c	\
  decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h	\
  progress.h


--- NEW FILE potrace.spec ---
Name:		potrace
Version:	1.8
Release:	4%{?dist}
Summary:	Transform bitmaps into vector graphics
Group:		Applications/Multimedia
# README defines license as GPLv2+
License:	GPLv2+
URL:		http://potrace.sourceforge.net
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# Documentation
Source1:	http://potrace.sourceforge.net/potrace.pdf
Source2:	http://potrace.sourceforge.net/potracelib.pdf

# Patch to build library
Patch0:		potrace-1.8-buildlib.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	automake
BuildRequires:	zlib-devel

%description
Potrace is a utility for tracing a bitmap, which means, transforming a bitmap 
into a smooth, scalable image. The input is a bitmap (PBM, PGM, PPM, or BMP
format), and the default output is an encapsulated PostScript file (EPS).
A typical use is to create EPS files from scanned data, such as company or
university logos, handwritten notes, etc. The resulting image is not "jaggy"
like a bitmap, but smooth. It can then be rendered at any resolution.

Potrace can currently produce the following output formats: EPS, PostScript,
PDF, SVG (scalable vector graphics), Xfig, Gimppath, and PGM (for easy
antialiasing). Additional backends might be added in the future.

Mkbitmap is a program distributed with Potrace which can be used to pre-process
the input for better tracing behavior on greyscale and color images.


%package devel
Summary:	Potrace development library & library demo
Group:		Applications/Multimedia
Provides:	%{name}-static = %{version}-%{release}
Requires:	%{name} = %{version}-%{release}

%description devel
This package contains the potrace development library & library demo.


%package doc
Summary:	Documentation on how to use the potrace library
Group:		Documentation
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildArch:	noarch
%endif

%description doc
This package contains documentation for the potrace algorithm and the potrace
library.

%prep
%setup -q
%patch0 -p 1 -b .orig
autoreconf
cp -a %{SOURCE1} .
cp -a %{SOURCE2} .

%build
%configure --enable-metric
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -D -p -m 644 src/potracelib.h %{buildroot}%{_includedir}/potracelib.h

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/potrace
%{_bindir}/mkbitmap
%{_mandir}/man1/potrace.1.*
%{_mandir}/man1/mkbitmap.1.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/potracelib_demo
%{_libdir}/libpotrace.a
%{_includedir}/potracelib.h

%files doc
%defattr(-,root,root,-)
%doc potrace.pdf potracelib.pdf

%changelog
* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-4
- Corrected license tag.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-3
- Added missing BuildRequires.

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-2
- Adjusted descriptions as per review comments. 

* Mon Aug 03 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.8-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/potrace/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:56:53 -0000	1.1
+++ sources	7 Aug 2009 20:17:01 -0000	1.2
@@ -0,0 +1,3 @@
+e73b45565737d64011612704dd4d9f86  potrace-1.8.tar.gz
+ead28818fe860068c9147be752be0f41  potrace.pdf
+0d68f90f965f9bbe5761ec5daab826cd  potracelib.pdf



From mschwendt at fedoraproject.org  Fri Aug  7 20:25:37 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  7 Aug 2009 20:25:37 +0000 (UTC)
Subject: extras-buildsys/utils/pushscript WhatsNew.py,1.14,1.15
Message-ID: <20090807202537.0AE6811C00D7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2501

Modified Files:
	WhatsNew.py 
Log Message:
Don't query %arch when pruning old src.rpms, since %arch in src.rpms is the arch the package was built on


Index: WhatsNew.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/WhatsNew.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WhatsNew.py	1 Aug 2009 17:35:51 -0000	1.14
+++ WhatsNew.py	7 Aug 2009 20:25:36 -0000	1.15
@@ -46,18 +46,17 @@
             v = hdr['version']
             r = hdr['release']
             e = hdr['epoch']
-            a = hdr['arch']
             if e is None:
                 e = 0
-            newestrpms.setdefault("%s.%s" % (n,a),[])
-            newestrpms["%s.%s" % (n,a)].append((f,n,e,v,r,a))
+            newestrpms.setdefault(n,[])
+            newestrpms[n].append((f,n,e,v,r))
 
     for l in newestrpms.values():
         x = len(l)
         if x > 1:
             def sortByEVR(fnevr1, fnevr2):
-                (f1,n1,e1,v1,r1,a1) = fnevr1
-                (f2,n2,e2,v2,r2,a2) = fnevr2
+                (f1,n1,e1,v1,r1) = fnevr1
+                (f2,n2,e2,v2,r2) = fnevr2
                 rc = rpmUtils.miscutils.compareEVR((e1,v1,r1),(e2,v2,r2))
                 if rc == 0:
                     return 0
@@ -70,7 +69,7 @@
         oldies = []
         if len(l) > 1:
             oldies = l[1:]
-        for (f,n,e,v,r,a) in oldies:
+        for (f,n,e,v,r) in oldies:
             #print '  Ignoring', os.path.basename(f)
             rpmfiles.remove(f)
 



From ajax at fedoraproject.org  Fri Aug  7 20:26:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri,  7 Aug 2009 20:26:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-vmware/devel abi2.patch, NONE,
	1.1 xorg-x11-drv-vmware.spec, 1.25, 1.26
Message-ID: <20090807202630.A657F11C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2683

Modified Files:
	xorg-x11-drv-vmware.spec 
Added Files:
	abi2.patch 
Log Message:
* Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 10.16.7-2
- fix for symbol list removal.


abi2.patch:
 vmware.c |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE abi2.patch ---
diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
--- xf86-video-vmware-10.16.7/src/vmware.c.jx	2009-08-07 16:31:33.000000000 -0400
+++ xf86-video-vmware-10.16.7/src/vmware.c	2009-08-07 16:32:10.000000000 -0400
@@ -640,8 +640,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
         return FALSE;
     }
 
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
     if (!vgaHWGetHWRec(pScrn)) {
         return FALSE;
     }
@@ -959,7 +957,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
         VMWAREFreeRec(pScrn);
         return FALSE;
     }
-    xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
 
     /* Need ramdac for hwcursor */
     if (pVMWARE->hwCursor) {
@@ -967,7 +964,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
             VMWAREFreeRec(pScrn);
             return FALSE;
         }
-        xf86LoaderReqSymLists(ramdacSymbols, NULL);
     }
 
     return TRUE;
@@ -2051,9 +2047,6 @@ vmwareSetup(pointer module, pointer opts
         setupDone = TRUE;
         xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
 
-        LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
-                          shadowfbSymbols, NULL);
-
         return (pointer)1;
     }
     if (errmaj) {


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xorg-x11-drv-vmware.spec	4 Aug 2009 05:43:44 -0000	1.25
+++ xorg-x11-drv-vmware.spec	7 Aug 2009 20:26:30 -0000	1.26
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
 Version:    10.16.7
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -14,6 +14,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    vmware.xinf
 Patch0: abi.patch
+Patch1: abi2.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -31,6 +32,7 @@ X.Org X11 vmware video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .abi
+%patch1 -p1 -b .abi2
 
 %build
 %if 0%{?gitdate}
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 10.16.7-2
+- fix for symbol list removal.
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 10.16.7-1
 - vmware 10.16.7 + new abi patch
 



From ruben at fedoraproject.org  Fri Aug  7 20:27:00 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri,  7 Aug 2009 20:27:00 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units/devel import.log, NONE,
	1.1 perl-Math-Calc-Units.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090807202700.7AAF711C00D7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2867/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Math-Calc-Units.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
perl-Math-Calc-Units-1_06-2_fc11:HEAD:perl-Math-Calc-Units-1.06-2.fc11.src.rpm:1249676798


--- NEW FILE perl-Math-Calc-Units.spec ---
%define libname Math-Calc-Units
Name:           perl-%{libname}
Version:        1.06
Release:        2%{?dist}
Summary:        Human-readable unit-aware calculator
License:        GPLv2+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/%{libname}/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SF/SFINK/%{libname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Math::Calc::Units is a simple calculator that keeps track of units. It
currently handles combinations of byte sizes and duration only, although
adding any other multiplicative types is easy. Any unknown type is treated
as a unique user type (with some effort to map English plurals to their
singular forms).

%prep
%setup -q -n %{libname}-%{version}

# filter unwanted Provides
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Parse::Yapp::Driver)/d'
EOF

%global __perl_provides %{_builddir}/%{libname}-%{version}/%{name}-prov
chmod +x %{__perl_provides}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
rm -vf %{buildroot}%{perl_vendorlib}/Math/Calc/Units/Grammar.y


%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Artistic.html Changes COPYING LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/ucalc

%changelog
* Wed Jul 29 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.06-2
- Review fixes (#513874)

* Sun Jul 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.06-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Calc-Units/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:03:06 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:27:00 -0000	1.2
@@ -0,0 +1 @@
+Math-Calc-Units-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Calc-Units/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:03:06 -0000	1.1
+++ sources	7 Aug 2009 20:27:00 -0000	1.2
@@ -0,0 +1 @@
+8ba1ff6c998de586ae4f84aa68cda0d0  Math-Calc-Units-1.06.tar.gz



From notting at fedoraproject.org  Fri Aug  7 20:27:51 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  7 Aug 2009 20:27:51 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-1.3.14-returns.patch, 1.1, 1.2 yaboot.spec,
	1.63, 1.64
Message-ID: <20090807202751.836ED11C00D7@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3721

Modified Files:
	yaboot-1.3.14-returns.patch yaboot.spec 
Log Message:
mkofboot is a symlink in the source tree. patching it does not do what we
want.


yaboot-1.3.14-returns.patch:
 ybin |    2 ++
 1 file changed, 2 insertions(+)

Index: yaboot-1.3.14-returns.patch
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot-1.3.14-returns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yaboot-1.3.14-returns.patch	7 Aug 2009 16:31:28 -0000	1.1
+++ yaboot-1.3.14-returns.patch	7 Aug 2009 20:27:51 -0000	1.2
@@ -1,5 +1,5 @@
---- yaboot-1.3.14/ybin/mkofboot.orig	2009-08-07 11:08:04.000000000 +1000
-+++ yaboot-1.3.14/ybin/mkofboot	2009-08-07 11:08:09.000000000 +1000
+--- yaboot-1.3.14/ybin/ybin.orig	2009-08-07 11:08:04.000000000 +1000
++++ yaboot-1.3.14/ybin/ybin	2009-08-07 11:08:09.000000000 +1000
 @@ -1164,6 +1164,8 @@
      fi
      sync ; sync


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- yaboot.spec	7 Aug 2009 16:31:28 -0000	1.63
+++ yaboot.spec	7 Aug 2009 20:27:51 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Fri Aug 07 2009 Bill Nottingham <notting at redhat.com> - 1.3.14-16
+- fix patch file for (#515555)
+
 * Fri Aug 07 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-15
 - Fix bad return code in verbose mode (#515555)
 



From eponyme at fedoraproject.org  Fri Aug  7 20:31:03 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri,  7 Aug 2009 20:31:03 +0000 (UTC)
Subject: rpms/itaka/devel .cvsignore, 1.2, 1.3 itaka.spec, 1.5, 1.6 sources, 
	1.2, 1.3
Message-ID: <20090807203103.7E23411C00D7@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/itaka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4312

Modified Files:
	.cvsignore itaka.spec sources 
Log Message:
Update to 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2008 11:16:54 -0000	1.2
+++ .cvsignore	7 Aug 2009 20:31:03 -0000	1.3
@@ -1 +1 @@
-itaka-0.2.1.tar.bz2
+itaka-0.2.2.tar.bz2


Index: itaka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/devel/itaka.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- itaka.spec	25 Jul 2009 03:40:58 -0000	1.5
+++ itaka.spec	7 Aug 2009 20:31:03 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           itaka
-Version:        0.2.1
-Release:        6%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        On-demand screen capture server
 
 Group:          Applications/Communications
 License:        GPLv2+ and CC-BY-SA
 URL:            http://sourceforge.net/projects/%{name}
-Source0:        http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,28 +25,23 @@ displays an image of your screen in the 
 
 %prep
 %setup -q
+echo %{python_sitelib}
 sed -i -e "/gzip -9 -c share\/itaka.1 > share\/itaka.1.gz/d" Makefile
 sed -i -e "s/\$(INSTALL) -m 644 share\/itaka.1.gz \$(MANDIR)/\$(INSTALL) -m 644 share\/itaka.1 \$(MANDIR)/" Makefile
-sed -i -e "/rm share\/itaka.1.gz/d" Makefile
-
-sed -i -e "s/Icon=%{name}.png/Icon=%{name}/"  share/%{name}.desktop
-sed -i -e "/Encoding=UTF-8/d" share/%{name}.desktop 
-
-sed -i 's/\r//' HACKING
+sed -i -e "/mv config.py.old config.py/d" Makefile
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__sed} -i -e s@"\$(DESTDIR)/lib/itaka"@$RPM_BUILD_ROOT/%{python_sitelib}/%{name}@ Makefile
-%{__sed} -i -e s@"\$(LIBDIR)/itaka.py \$(BINDIR)/itaka"@"../../%{python_sitelib}/%{name}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name}"@ Makefile
-make install DESTDIR=$RPM_BUILD_ROOT/%{_prefix}
+sed -i -e s@"\$(PREFIX)/lib/itaka"@$RPM_BUILD_ROOT/%{python_sitelib}/%{name}@ Makefile
+sed -i -e s@"\$(LIBDIR)/itaka.py \$(BINDIR)/itaka"@"../../%{python_sitelib}/%{name}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name}"@ Makefile
+make install PREFIX=$RPM_BUILD_ROOT%{_prefix} REPLACEIMAGESDIR=%{_datadir}/%{name}/images
 desktop-file-install --vendor=""   \
        --remove-category="Application"  \
        --dir=%{buildroot}%{_datadir}/applications/   \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,28 +49,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT DOCUMENTATION HACKING README 
-%dir %{_datadir}/%{name}
-%dir %{python_sitelib}/%{name}
 %{_bindir}/%{name}
-%{python_sitelib}/%{name}/*
+%{_datadir}/%{name}
+%{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%dir %{_datadir}/%{name}/images/
-%{_datadir}/%{name}/images/*
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/pixmaps/%{name}.png
 
 
 
 %changelog
+* Fri Aug  7 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.2-1
+- Update to 0.2.2
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-6
 - 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.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.1-4
 - Rebuild for Python 2.6
-
 * Sat Nov 22 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.1-3
 - Fix package summary
 * Tue Aug 12 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2008 11:16:54 -0000	1.2
+++ sources	7 Aug 2009 20:31:03 -0000	1.3
@@ -1 +1 @@
-25c0919219c7e0479ab3f0534eadf25e  itaka-0.2.1.tar.bz2
+a965c5528b4e2e93c4a949113364e22c  itaka-0.2.2.tar.bz2



From hicham at fedoraproject.org  Fri Aug  7 20:31:58 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Fri,  7 Aug 2009 20:31:58 +0000 (UTC)
Subject: rpms/jide-oss/devel import.log, NONE,
	1.1 jide-oss-AquaJidePopupMenuUI.java.patch, NONE,
	1.1 jide-oss-Eclipse3xJideTabbedPaneUI.java.patch, NONE,
	1.1 jide-oss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807203158.BC2C811C00D7@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4515/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss-Eclipse3xJideTabbedPaneUI.java.patch jide-oss.spec 
Log Message:



--- NEW FILE import.log ---
jide-oss-2_7_1-3_1181svn_fc11:HEAD:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677077

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE jide-oss-AquaJidePopupMenuUI.java.patch ---
diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
@@ -5,14 +5,14 @@
  */
 
 package com.jidesoft.plaf.aqua;
-
-import apple.laf.AquaPopupMenuUI;
+
+import javax.swing.plaf.PopupMenuUI;
 import com.jidesoft.swing.SimpleScrollPane;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 
-public class AquaJidePopupMenuUI extends AquaPopupMenuUI {
+public class AquaJidePopupMenuUI extends PopupMenuUI {
     public AquaJidePopupMenuUI() {
     }
 

jide-oss-Eclipse3xJideTabbedPaneUI.java.patch:
 Eclipse3xJideTabbedPaneUI.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jide-oss-Eclipse3xJideTabbedPaneUI.java.patch ---
diff -up jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java.orig jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java
--- jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java.orig	2009-08-06 13:33:08.302907641 +0100
+++ jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java	2009-08-06 13:33:33.972908520 +0100
@@ -191,7 +191,7 @@ public class Eclipse3xJideTabbedPaneUI e
                 int next = _tabRuns[(i == _runCount - 1) ? 0 : i + 1];
                 int end = (next != 0 ? next - 1 : tabCount - 1);
                 for (int j = start; j <= end; j++) {
-                    if (_rects[j].intersects(clipRect)) {// ????????????
+                    if (_rects[j].intersects(clipRect)) {
                         paintTab(g, tabPlacement, _rects, j, iconRect, textRect);
                     }
                 }


--- NEW FILE jide-oss.spec ---
# SVN revision used
%global svnrel 1181

Name:		jide-oss
Version:	2.7.1
Release:	3.%{svnrel}svn%{?dist}
Summary:	Swing component library built on top of Java/Swing
License:	GPLv2 with exceptions
Group:		Development/Libraries
URL:		https://jide-oss.dev.java.net/

#This is an svn snapshot, to get this tarball :
#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
#create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss

Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2

#Patch0: remove an unknown character
Patch0:		jide-oss-Eclipse3xJideTabbedPaneUI.java.patch
#Patch1: use a standard component instead of a vendor specific extension
Patch1:		jide-oss-AquaJidePopupMenuUI.java.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0

%description
JIDE Common Layer is Swing component library built on top of Java/Swing.
It is also the foundation of other component products from JIDE.
This project has over 30 Swing components and over 100k lines of code.
It greatly enhanced the default component set provided by Swing and allow 
developers to focus on business logic layer instead of making components.

JIDE Common Layer was originally developed by JIDE Software developers
as a foundation in order to build other more advanced components.
In April of 2007, JIDE Software decided to open source this common layer
so that more and more developers can leverage them instead of wasting time
building them again.

%package javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name} = %{version}

%description javadoc
Javadoc for %{name}.

%package doc
Summary:	User documentation for %{name}
Group:		Documentation
Requires:	%{name} = %{version}

%description doc
User documentation for %{name}.

%prep
%setup -q -n %{name}
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
sed -i "s|\r||g" LICENSE.txt

%patch0 -p1
%patch1 -p1

%build
%ant javadoc jar

%install
rm -rf %{buildroot}
install -D -p -m 644 %{name}-%{version}.jar \
	%{buildroot}%{_javadir}/%{name}-%{version}.jar

install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p javadoc/* %{buildroot}%{_javadocdir}/%{name}

pushd %{buildroot}%{_javadir}
	for jar in *-%{version}*; do
		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
	done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%files doc
%defattr(-,root,root,-)
%doc docs/JIDE_Common_Layer_Developer_Guide.pdf

%changelog
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
- Added doc package.

* Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
- Removed Build Dependency on dos2unix.
- Used the svn revision in the rpm name.

* Wed Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-1.20090805svn
- Initial package for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 19:58:06 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:31:58 -0000	1.2
@@ -0,0 +1 @@
+jide-oss-2.7.1-1181svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:58:06 -0000	1.1
+++ sources	7 Aug 2009 20:31:58 -0000	1.2
@@ -0,0 +1 @@
+c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2



From eponyme at fedoraproject.org  Fri Aug  7 20:32:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri,  7 Aug 2009 20:32:33 +0000 (UTC)
Subject: rpms/itaka/F-11 .cvsignore, 1.2, 1.3 itaka.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20090807203233.5DD7811C00D7@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/itaka/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4679

Modified Files:
	.cvsignore itaka.spec sources 
Log Message:
Update to 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2008 11:16:54 -0000	1.2
+++ .cvsignore	7 Aug 2009 20:32:33 -0000	1.3
@@ -1 +1 @@
-itaka-0.2.1.tar.bz2
+itaka-0.2.2.tar.bz2


Index: itaka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/F-11/itaka.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- itaka.spec	25 Feb 2009 08:16:29 -0000	1.4
+++ itaka.spec	7 Aug 2009 20:32:33 -0000	1.5
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           itaka
-Version:        0.2.1
-Release:        5%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        On-demand screen capture server
 
 Group:          Applications/Communications
 License:        GPLv2+ and CC-BY-SA
 URL:            http://sourceforge.net/projects/%{name}
-Source0:        http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,28 +25,23 @@ displays an image of your screen in the 
 
 %prep
 %setup -q
+echo %{python_sitelib}
 sed -i -e "/gzip -9 -c share\/itaka.1 > share\/itaka.1.gz/d" Makefile
 sed -i -e "s/\$(INSTALL) -m 644 share\/itaka.1.gz \$(MANDIR)/\$(INSTALL) -m 644 share\/itaka.1 \$(MANDIR)/" Makefile
-sed -i -e "/rm share\/itaka.1.gz/d" Makefile
-
-sed -i -e "s/Icon=%{name}.png/Icon=%{name}/"  share/%{name}.desktop
-sed -i -e "/Encoding=UTF-8/d" share/%{name}.desktop 
-
-sed -i 's/\r//' HACKING
+sed -i -e "/mv config.py.old config.py/d" Makefile
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__sed} -i -e s@"\$(DESTDIR)/lib/itaka"@$RPM_BUILD_ROOT/%{python_sitelib}/%{name}@ Makefile
-%{__sed} -i -e s@"\$(LIBDIR)/itaka.py \$(BINDIR)/itaka"@"../../%{python_sitelib}/%{name}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name}"@ Makefile
-make install DESTDIR=$RPM_BUILD_ROOT/%{_prefix}
+sed -i -e s@"\$(PREFIX)/lib/itaka"@$RPM_BUILD_ROOT/%{python_sitelib}/%{name}@ Makefile
+sed -i -e s@"\$(LIBDIR)/itaka.py \$(BINDIR)/itaka"@"../../%{python_sitelib}/%{name}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name}"@ Makefile
+make install PREFIX=$RPM_BUILD_ROOT%{_prefix} REPLACEIMAGESDIR=%{_datadir}/%{name}/images
 desktop-file-install --vendor=""   \
        --remove-category="Application"  \
        --dir=%{buildroot}%{_datadir}/applications/   \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,25 +49,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT DOCUMENTATION HACKING README 
-%dir %{_datadir}/%{name}
-%dir %{python_sitelib}/%{name}
 %{_bindir}/%{name}
-%{python_sitelib}/%{name}/*
+%{_datadir}/%{name}
+%{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%dir %{_datadir}/%{name}/images/
-%{_datadir}/%{name}/images/*
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/pixmaps/%{name}.png
 
 
 
 %changelog
+* Fri Aug  7 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.2-1
+- Update to 0.2.2
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-6
+- 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.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.1-4
 - Rebuild for Python 2.6
-
 * Sat Nov 22 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.1-3
 - Fix package summary
 * Tue Aug 12 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2008 11:16:54 -0000	1.2
+++ sources	7 Aug 2009 20:32:33 -0000	1.3
@@ -1 +1 @@
-25c0919219c7e0479ab3f0534eadf25e  itaka-0.2.1.tar.bz2
+a965c5528b4e2e93c4a949113364e22c  itaka-0.2.2.tar.bz2



From eponyme at fedoraproject.org  Fri Aug  7 20:33:41 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Fri,  7 Aug 2009 20:33:41 +0000 (UTC)
Subject: rpms/itaka/F-10 .cvsignore, 1.2, 1.3 itaka.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090807203341.8764511C00D7@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/itaka/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4987

Modified Files:
	.cvsignore itaka.spec sources 
Log Message:
Update to 0.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2008 11:16:54 -0000	1.2
+++ .cvsignore	7 Aug 2009 20:33:41 -0000	1.3
@@ -1 +1 @@
-itaka-0.2.1.tar.bz2
+itaka-0.2.2.tar.bz2


Index: itaka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/F-10/itaka.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- itaka.spec	13 Aug 2008 11:16:54 -0000	1.1
+++ itaka.spec	7 Aug 2009 20:33:41 -0000	1.2
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           itaka
-Version:        0.2.1
-Release:        2%{?dist}
-Summary:        Itaka is an on-demand screen capture server
+Version:        0.2.2
+Release:        1%{?dist}
+Summary:        On-demand screen capture server
 
 Group:          Applications/Communications
 License:        GPLv2+ and CC-BY-SA
-URL:            http://www.jardinpresente.com.ar/trac/%{name}/
-Source0:        http://www.jardinpresente.com.ar/downloads//%{name}/%{version}/%{name}-%{version}.tar.bz2
+URL:            http://sourceforge.net/projects/%{name}
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,28 +25,23 @@ displays an image of your screen in the 
 
 %prep
 %setup -q
+echo %{python_sitelib}
 sed -i -e "/gzip -9 -c share\/itaka.1 > share\/itaka.1.gz/d" Makefile
 sed -i -e "s/\$(INSTALL) -m 644 share\/itaka.1.gz \$(MANDIR)/\$(INSTALL) -m 644 share\/itaka.1 \$(MANDIR)/" Makefile
-sed -i -e "/rm share\/itaka.1.gz/d" Makefile
-
-sed -i -e "s/Icon=%{name}.png/Icon=%{name}/"  share/%{name}.desktop
-sed -i -e "/Encoding=UTF-8/d" share/%{name}.desktop 
-
-sed -i 's/\r//' HACKING
+sed -i -e "/mv config.py.old config.py/d" Makefile
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__sed} -i -e s@"\$(DESTDIR)/lib/itaka"@$RPM_BUILD_ROOT/%{python_sitelib}/%{name}@ Makefile
-%{__sed} -i -e s@"\$(LIBDIR)/itaka.py \$(BINDIR)/itaka"@"../../%{python_sitelib}/%{name}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name}"@ Makefile
-make install DESTDIR=$RPM_BUILD_ROOT/%{_prefix}
+sed -i -e s@"\$(PREFIX)/lib/itaka"@$RPM_BUILD_ROOT/%{python_sitelib}/%{name}@ Makefile
+sed -i -e s@"\$(LIBDIR)/itaka.py \$(BINDIR)/itaka"@"../../%{python_sitelib}/%{name}/%{name}.py $RPM_BUILD_ROOT/%{_bindir}/%{name}"@ Makefile
+make install PREFIX=$RPM_BUILD_ROOT%{_prefix} REPLACEIMAGESDIR=%{_datadir}/%{name}/images
 desktop-file-install --vendor=""   \
        --remove-category="Application"  \
        --dir=%{buildroot}%{_datadir}/applications/   \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,19 +49,26 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT DOCUMENTATION HACKING README 
-%dir %{_datadir}/%{name}
-%dir %{python_sitelib}/%{name}
 %{_bindir}/%{name}
-%{python_sitelib}/%{name}/*
+%{_datadir}/%{name}
+%{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%dir %{_datadir}/%{name}/images/
-%{_datadir}/%{name}/images/*
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/pixmaps/%{name}.png
 
 
 
 %changelog
+* Fri Aug  7 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.2-1
+- Update to 0.2.2
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-6
+- 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.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.1-4
+- Rebuild for Python 2.6
+* Sat Nov 22 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.1-3
+- Fix package summary
 * Tue Aug 12 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 0.2.1-2
 - licence updated
 - directories own fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/itaka/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2008 11:16:54 -0000	1.2
+++ sources	7 Aug 2009 20:33:41 -0000	1.3
@@ -1 +1 @@
-25c0919219c7e0479ab3f0534eadf25e  itaka-0.2.1.tar.bz2
+a965c5528b4e2e93c4a949113364e22c  itaka-0.2.2.tar.bz2



From hicham at fedoraproject.org  Fri Aug  7 20:42:29 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Fri,  7 Aug 2009 20:42:29 +0000 (UTC)
Subject: rpms/jide-oss/F-11 import.log, NONE,
	1.1 jide-oss-AquaJidePopupMenuUI.java.patch, NONE,
	1.1 jide-oss-Eclipse3xJideTabbedPaneUI.java.patch, NONE,
	1.1 jide-oss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807204229.A8CB411C00D7@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6299/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss-Eclipse3xJideTabbedPaneUI.java.patch jide-oss.spec 
Log Message:



--- NEW FILE import.log ---
jide-oss-2_7_1-3_1181svn_fc11:F-11:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677715

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE jide-oss-AquaJidePopupMenuUI.java.patch ---
diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
@@ -5,14 +5,14 @@
  */
 
 package com.jidesoft.plaf.aqua;
-
-import apple.laf.AquaPopupMenuUI;
+
+import javax.swing.plaf.PopupMenuUI;
 import com.jidesoft.swing.SimpleScrollPane;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 
-public class AquaJidePopupMenuUI extends AquaPopupMenuUI {
+public class AquaJidePopupMenuUI extends PopupMenuUI {
     public AquaJidePopupMenuUI() {
     }
 

jide-oss-Eclipse3xJideTabbedPaneUI.java.patch:
 Eclipse3xJideTabbedPaneUI.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jide-oss-Eclipse3xJideTabbedPaneUI.java.patch ---
diff -up jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java.orig jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java
--- jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java.orig	2009-08-06 13:33:08.302907641 +0100
+++ jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java	2009-08-06 13:33:33.972908520 +0100
@@ -191,7 +191,7 @@ public class Eclipse3xJideTabbedPaneUI e
                 int next = _tabRuns[(i == _runCount - 1) ? 0 : i + 1];
                 int end = (next != 0 ? next - 1 : tabCount - 1);
                 for (int j = start; j <= end; j++) {
-                    if (_rects[j].intersects(clipRect)) {// ????????????
+                    if (_rects[j].intersects(clipRect)) {
                         paintTab(g, tabPlacement, _rects, j, iconRect, textRect);
                     }
                 }


--- NEW FILE jide-oss.spec ---
# SVN revision used
%global svnrel 1181

Name:		jide-oss
Version:	2.7.1
Release:	3.%{svnrel}svn%{?dist}
Summary:	Swing component library built on top of Java/Swing
License:	GPLv2 with exceptions
Group:		Development/Libraries
URL:		https://jide-oss.dev.java.net/

#This is an svn snapshot, to get this tarball :
#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
#create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss

Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2

#Patch0: remove an unknown character
Patch0:		jide-oss-Eclipse3xJideTabbedPaneUI.java.patch
#Patch1: use a standard component instead of a vendor specific extension
Patch1:		jide-oss-AquaJidePopupMenuUI.java.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0

%description
JIDE Common Layer is Swing component library built on top of Java/Swing.
It is also the foundation of other component products from JIDE.
This project has over 30 Swing components and over 100k lines of code.
It greatly enhanced the default component set provided by Swing and allow 
developers to focus on business logic layer instead of making components.

JIDE Common Layer was originally developed by JIDE Software developers
as a foundation in order to build other more advanced components.
In April of 2007, JIDE Software decided to open source this common layer
so that more and more developers can leverage them instead of wasting time
building them again.

%package javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name} = %{version}

%description javadoc
Javadoc for %{name}.

%package doc
Summary:	User documentation for %{name}
Group:		Documentation
Requires:	%{name} = %{version}

%description doc
User documentation for %{name}.

%prep
%setup -q -n %{name}
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
sed -i "s|\r||g" LICENSE.txt

%patch0 -p1
%patch1 -p1

%build
%ant javadoc jar

%install
rm -rf %{buildroot}
install -D -p -m 644 %{name}-%{version}.jar \
	%{buildroot}%{_javadir}/%{name}-%{version}.jar

install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p javadoc/* %{buildroot}%{_javadocdir}/%{name}

pushd %{buildroot}%{_javadir}
	for jar in *-%{version}*; do
		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
	done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%files doc
%defattr(-,root,root,-)
%doc docs/JIDE_Common_Layer_Developer_Guide.pdf

%changelog
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
- Added doc package.

* Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
- Removed Build Dependency on dos2unix.
- Used the svn revision in the rpm name.

* Wed Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-1.20090805svn
- Initial package for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 19:58:06 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:42:29 -0000	1.2
@@ -0,0 +1 @@
+jide-oss-2.7.1-1181svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:58:06 -0000	1.1
+++ sources	7 Aug 2009 20:42:29 -0000	1.2
@@ -0,0 +1 @@
+c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2



From hicham at fedoraproject.org  Fri Aug  7 20:46:06 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Fri,  7 Aug 2009 20:46:06 +0000 (UTC)
Subject: rpms/jide-oss/F-10 import.log, NONE,
	1.1 jide-oss-AquaJidePopupMenuUI.java.patch, NONE,
	1.1 jide-oss-Eclipse3xJideTabbedPaneUI.java.patch, NONE,
	1.1 jide-oss.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090807204606.28B8211C00D7@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/jide-oss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6913/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jide-oss-AquaJidePopupMenuUI.java.patch 
	jide-oss-Eclipse3xJideTabbedPaneUI.java.patch jide-oss.spec 
Log Message:



--- NEW FILE import.log ---
jide-oss-2_7_1-3_1181svn_fc11:F-10:jide-oss-2.7.1-3.1181svn.fc11.src.rpm:1249677941

jide-oss-AquaJidePopupMenuUI.java.patch:
 AquaJidePopupMenuUI.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE jide-oss-AquaJidePopupMenuUI.java.patch ---
diff -up jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java
--- jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java.orig	2009-08-06 13:47:15.841910104 +0100
+++ jide-oss/src/com/jidesoft/plaf/aqua/AquaJidePopupMenuUI.java	2009-08-06 13:55:33.894910534 +0100
@@ -5,14 +5,14 @@
  */
 
 package com.jidesoft.plaf.aqua;
-
-import apple.laf.AquaPopupMenuUI;
+
+import javax.swing.plaf.PopupMenuUI;
 import com.jidesoft.swing.SimpleScrollPane;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 
-public class AquaJidePopupMenuUI extends AquaPopupMenuUI {
+public class AquaJidePopupMenuUI extends PopupMenuUI {
     public AquaJidePopupMenuUI() {
     }
 

jide-oss-Eclipse3xJideTabbedPaneUI.java.patch:
 Eclipse3xJideTabbedPaneUI.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jide-oss-Eclipse3xJideTabbedPaneUI.java.patch ---
diff -up jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java.orig jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java
--- jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java.orig	2009-08-06 13:33:08.302907641 +0100
+++ jide-oss/src/com/jidesoft/plaf/eclipse/Eclipse3xJideTabbedPaneUI.java	2009-08-06 13:33:33.972908520 +0100
@@ -191,7 +191,7 @@ public class Eclipse3xJideTabbedPaneUI e
                 int next = _tabRuns[(i == _runCount - 1) ? 0 : i + 1];
                 int end = (next != 0 ? next - 1 : tabCount - 1);
                 for (int j = start; j <= end; j++) {
-                    if (_rects[j].intersects(clipRect)) {// ????????????
+                    if (_rects[j].intersects(clipRect)) {
                         paintTab(g, tabPlacement, _rects, j, iconRect, textRect);
                     }
                 }


--- NEW FILE jide-oss.spec ---
# SVN revision used
%global svnrel 1181

Name:		jide-oss
Version:	2.7.1
Release:	3.%{svnrel}svn%{?dist}
Summary:	Swing component library built on top of Java/Swing
License:	GPLv2 with exceptions
Group:		Development/Libraries
URL:		https://jide-oss.dev.java.net/

#This is an svn snapshot, to get this tarball :
#then to checkout the project source repository : svn checkout -r %{svnrel} https://jide-oss.dev.java.net/svn/jide-oss/trunk jide-oss --username guest
#create the tarball : tar -cjvf jide-oss-%{version}-%{svnrel}svn.tar.bz2 jide-oss

Source0:	%{name}-%{version}-%{svnrel}svn.tar.bz2

#Patch0: remove an unknown character
Patch0:		jide-oss-Eclipse3xJideTabbedPaneUI.java.patch
#Patch1: use a standard component instead of a vendor specific extension
Patch1:		jide-oss-AquaJidePopupMenuUI.java.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0

%description
JIDE Common Layer is Swing component library built on top of Java/Swing.
It is also the foundation of other component products from JIDE.
This project has over 30 Swing components and over 100k lines of code.
It greatly enhanced the default component set provided by Swing and allow 
developers to focus on business logic layer instead of making components.

JIDE Common Layer was originally developed by JIDE Software developers
as a foundation in order to build other more advanced components.
In April of 2007, JIDE Software decided to open source this common layer
so that more and more developers can leverage them instead of wasting time
building them again.

%package javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name} = %{version}

%description javadoc
Javadoc for %{name}.

%package doc
Summary:	User documentation for %{name}
Group:		Documentation
Requires:	%{name} = %{version}

%description doc
User documentation for %{name}.

%prep
%setup -q -n %{name}
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
sed -i "s|\r||g" LICENSE.txt

%patch0 -p1
%patch1 -p1

%build
%ant javadoc jar

%install
rm -rf %{buildroot}
install -D -p -m 644 %{name}-%{version}.jar \
	%{buildroot}%{_javadir}/%{name}-%{version}.jar

install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p javadoc/* %{buildroot}%{_javadocdir}/%{name}

pushd %{buildroot}%{_javadir}
	for jar in *-%{version}*; do
		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
	done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%files doc
%defattr(-,root,root,-)
%doc docs/JIDE_Common_Layer_Developer_Guide.pdf

%changelog
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-3.1181svn
- Added doc package.

* Thu Aug 06 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-2.1181svn
- Removed Build Dependency on dos2unix.
- Used the svn revision in the rpm name.

* Wed Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7.1-1.20090805svn
- Initial package for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 19:58:06 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:46:05 -0000	1.2
@@ -0,0 +1 @@
+jide-oss-2.7.1-1181svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jide-oss/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 19:58:06 -0000	1.1
+++ sources	7 Aug 2009 20:46:05 -0000	1.2
@@ -0,0 +1 @@
+c6526fefdeeb452c40593a4e4a86850c  jide-oss-2.7.1-1181svn.tar.bz2



From ruben at fedoraproject.org  Fri Aug  7 20:46:55 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri,  7 Aug 2009 20:46:55 +0000 (UTC)
Subject: rpms/perl-Math-Calc-Units/F-11 import.log, NONE,
	1.1 perl-Math-Calc-Units.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090807204655.439ED11C00D7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Math-Calc-Units/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7099/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Math-Calc-Units.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-Math-Calc-Units-1_06-2_fc11:F-11:perl-Math-Calc-Units-1.06-2.fc11.src.rpm:1249677404


--- NEW FILE perl-Math-Calc-Units.spec ---
%define libname Math-Calc-Units
Name:           perl-%{libname}
Version:        1.06
Release:        2%{?dist}
Summary:        Human-readable unit-aware calculator
License:        GPLv2+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/%{libname}/
Source0:        http://search.cpan.org/CPAN/authors/id/S/SF/SFINK/%{libname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Math::Calc::Units is a simple calculator that keeps track of units. It
currently handles combinations of byte sizes and duration only, although
adding any other multiplicative types is easy. Any unknown type is treated
as a unique user type (with some effort to map English plurals to their
singular forms).

%prep
%setup -q -n %{libname}-%{version}

# filter unwanted Provides
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Parse::Yapp::Driver)/d'
EOF

%global __perl_provides %{_builddir}/%{libname}-%{version}/%{name}-prov
chmod +x %{__perl_provides}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
rm -vf %{buildroot}%{perl_vendorlib}/Math/Calc/Units/Grammar.y


%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Artistic.html Changes COPYING LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/ucalc

%changelog
* Wed Jul 29 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.06-2
- Review fixes (#513874)

* Sun Jul 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.06-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Calc-Units/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:03:06 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:46:55 -0000	1.2
@@ -0,0 +1 @@
+Math-Calc-Units-1.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Calc-Units/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:03:06 -0000	1.1
+++ sources	7 Aug 2009 20:46:55 -0000	1.2
@@ -0,0 +1 @@
+8ba1ff6c998de586ae4f84aa68cda0d0  Math-Calc-Units-1.06.tar.gz



From ajax at fedoraproject.org  Fri Aug  7 20:50:39 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri,  7 Aug 2009 20:50:39 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel fedora-gnome-theme.spec,1.13,1.14
Message-ID: <20090807205039.70D4211C0425@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7749

Modified Files:
	fedora-gnome-theme.spec 
Log Message:
fix BR


Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fedora-gnome-theme.spec	7 Aug 2009 15:49:58 -0000	1.13
+++ fedora-gnome-theme.spec	7 Aug 2009 20:50:39 -0000	1.14
@@ -19,6 +19,7 @@ Requires: bluecurve-cursor-theme
 
 # we require XML::Parser for our in-tree intltool
 BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
 
 Obsoletes: redhat-artwork
 



From ruben at fedoraproject.org  Fri Aug  7 20:55:24 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri,  7 Aug 2009 20:55:24 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client/devel import.log, NONE,
	1.1 perl-Beanstalk-Client.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090807205524.5AF7C11C00D7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8583/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Beanstalk-Client.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-Beanstalk-Client-1_05-2_fc11:HEAD:perl-Beanstalk-Client-1.05-2.fc11.src.rpm:1249678500


--- NEW FILE perl-Beanstalk-Client.spec ---
Name:           perl-Beanstalk-Client
Version:        1.05
Release:        2%{?dist}
Summary:        Client class to talk to a beanstalkd server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Beanstalk-Client/
Source0:        http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Beanstalk-Client-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(Error)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(YAML::Syck)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Beanstalk::Client provides a Perl API of protocol version 1.0 to the
beanstalkd server, a fast, general-purpose, in-memory workqueue service by
Keith Rarick.

%prep
%setup -q -n Beanstalk-Client-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;


%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Jul 29 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.05-2
- Review fixes (#513869)

* Sun Jul 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.05-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Beanstalk-Client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:01:46 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:55:24 -0000	1.2
@@ -0,0 +1 @@
+Beanstalk-Client-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Beanstalk-Client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:01:47 -0000	1.1
+++ sources	7 Aug 2009 20:55:24 -0000	1.2
@@ -0,0 +1 @@
+065f07b4e6481d8c102bf39caf7961c6  Beanstalk-Client-1.05.tar.gz



From ruben at fedoraproject.org  Fri Aug  7 20:56:36 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri,  7 Aug 2009 20:56:36 +0000 (UTC)
Subject: rpms/perl-Beanstalk-Client/F-11 import.log, NONE,
	1.1 perl-Beanstalk-Client.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090807205636.19B4B11C00D7@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Beanstalk-Client/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8924/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Beanstalk-Client.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
perl-Beanstalk-Client-1_05-2_fc11:F-11:perl-Beanstalk-Client-1.05-2.fc11.src.rpm:1249678586


--- NEW FILE perl-Beanstalk-Client.spec ---
Name:           perl-Beanstalk-Client
Version:        1.05
Release:        2%{?dist}
Summary:        Client class to talk to a beanstalkd server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Beanstalk-Client/
Source0:        http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Beanstalk-Client-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(Error)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(YAML::Syck)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Beanstalk::Client provides a Perl API of protocol version 1.0 to the
beanstalkd server, a fast, general-purpose, in-memory workqueue service by
Keith Rarick.

%prep
%setup -q -n Beanstalk-Client-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;


%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Jul 29 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.05-2
- Review fixes (#513869)

* Sun Jul 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.05-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Beanstalk-Client/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:01:46 -0000	1.1
+++ .cvsignore	7 Aug 2009 20:56:35 -0000	1.2
@@ -0,0 +1 @@
+Beanstalk-Client-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Beanstalk-Client/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:01:47 -0000	1.1
+++ sources	7 Aug 2009 20:56:35 -0000	1.2
@@ -0,0 +1 @@
+065f07b4e6481d8c102bf39caf7961c6  Beanstalk-Client-1.05.tar.gz



From caillon at fedoraproject.org  Fri Aug  7 21:00:26 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Fri,  7 Aug 2009 21:00:26 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey-mozconfig,1.5,1.6
Message-ID: <20090807210026.638D511C0439@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10318

Modified Files:
	seamonkey-mozconfig 
Log Message:
--enable-system-hunspell



Index: seamonkey-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey-mozconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- seamonkey-mozconfig	24 Jul 2009 07:57:34 -0000	1.5
+++ seamonkey-mozconfig	7 Aug 2009 21:00:26 -0000	1.6
@@ -27,6 +27,7 @@ ac_add_options --enable-crypto
 ac_add_options --enable-safe-browsing
 ac_add_options --disable-crashreporter
 ac_add_options --enable-static
+ac_add_options --enable-system-hunspell
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1



From pkgdb at fedoraproject.org  Fri Aug  7 21:35:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:35:36 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213536.B824910F890@bastion2.fedora.phx.redhat.com>

orion has set the watchbugzilla acl on kdesvn (Fedora devel) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:35:37 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213537.DC08610F8A0@bastion2.fedora.phx.redhat.com>

orion has set the watchcommits acl on kdesvn (Fedora devel) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:35:38 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213538.DBD0C10F8A9@bastion2.fedora.phx.redhat.com>

orion has set the commit acl on kdesvn (Fedora devel) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:35:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:35:54 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213556.9B7AC10F8B7@bastion2.fedora.phx.redhat.com>

orion has set the commit acl on kdesvn (Fedora 10) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:35:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:35:51 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213556.A633610F8B8@bastion2.fedora.phx.redhat.com>

orion has set the watchcommits acl on kdesvn (Fedora 10) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:35:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:35:50 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213556.8645C10F8B6@bastion2.fedora.phx.redhat.com>

orion has set the watchbugzilla acl on kdesvn (Fedora 10) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From mathstuf at fedoraproject.org  Fri Aug  7 21:35:59 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri,  7 Aug 2009 21:35:59 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.53, 1.54
Message-ID: <20090807213559.A149111C00D7@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14395

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch 
Log Message:
Backport fix for lancelot kde#196809

kdeplasma-addons-4.3.0-lancelot-kde#196809.patch:
 ContactsKopete.cpp |  104 +++++++++++++++++++++++++++++++++++++----------------
 ContactsKopete.h   |    8 ++--
 2 files changed, 78 insertions(+), 34 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.0-lancelot-kde#196809.patch ---
Index: applets/lancelot/app/src/models/ContactsKopete.h
===================================================================
--- applets/lancelot/app/src/models/ContactsKopete.h	(revision 1008266)
+++ applets/lancelot/app/src/models/ContactsKopete.h	(revision 1008267)
@@ -31,19 +31,21 @@
     ContactsKopete();
     ~ContactsKopete();
 
-    void timerEvent(QTimerEvent * event);
-
 protected:
     void activate(int index);
     void load();
+    void load(bool forceReload);
     void updateContactData(const QString & contactId);
+    void timerEvent(QTimerEvent * event);
 
 protected Q_SLOTS:
     void contactChanged(const QString & contactId);
 
 private:
     org::kde::Kopete * m_interface;
-    QBasicTimer m_timer;
+    QBasicTimer m_delayTimer;
+    QBasicTimer m_checkRunningTimer;
+    QStringList m_contactsToUpdate;
     QString m_kopeteAvatarsDir;
     bool m_kopeteRunning : 1;
     bool m_noOnlineContacts : 1;
Index: applets/lancelot/app/src/models/ContactsKopete.cpp
===================================================================
--- applets/lancelot/app/src/models/ContactsKopete.cpp	(revision 1008266)
+++ applets/lancelot/app/src/models/ContactsKopete.cpp	(revision 1008267)
@@ -25,11 +25,12 @@
 
 // #define UPDATE_INTERVAL 15000
 #define CHECK_RUNNING_INTERVAL 5000
+#define DELAY_INTERVAL 500
 
 namespace Models {
 
 ContactsKopete::ContactsKopete()
-    : m_interface(NULL), m_kopeteRunning(true)
+    : m_interface(NULL), m_kopeteRunning(false)
 {
     setSelfTitle(i18n("Contacts"));
     setSelfIcon(KIcon("kopete"));
@@ -40,14 +41,27 @@
     m_kopeteAvatarsDir = KStandardDirs::locate(
             "data", "kopete/avatars/Contacts/");
 
-    m_timer.start(CHECK_RUNNING_INTERVAL, this);
+    m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this);
     load();
 }
 
 void ContactsKopete::timerEvent(QTimerEvent * event)
 {
-    if (event->timerId() == m_timer.timerId()) {
+    if (event->timerId() == m_checkRunningTimer.timerId()) {
         load();
+    } else if (event->timerId() == m_delayTimer.timerId()) {
+        qDebug() << "ContactsKopete::contactChanged [delayed]:"
+            << m_contactsToUpdate.size();
+        m_delayTimer.stop();
+        // checking whether we have a large update
+        if (m_contactsToUpdate.size() > 5) {
+            load(true);
+        } else {
+            foreach(QString contact, m_contactsToUpdate) {
+                updateContactData(contact);
+            }
+        }
+        m_contactsToUpdate.clear();
     }
 }
 
@@ -70,42 +84,65 @@
 
 void ContactsKopete::load()
 {
+    load(false);
+}
+
+void ContactsKopete::load(bool forceReload)
+{
     setEmitInhibited(true);
-    clear();
+    bool statusChanged = false;
+    // clear();
 
     if (!m_interface->isValid()) {
-        m_kopeteRunning = false;
-        m_timer.start(CHECK_RUNNING_INTERVAL, this);
+        if (m_kopeteRunning) {
+            qDebug() << "ContactsKopete::disconnecting D-Bus";
+            disconnect(m_interface, SIGNAL(contactChanged(const QString &)),
+                    this, SLOT(contactChanged(const QString &)));
+            statusChanged = true;
+        }
 
-        if (addService("kopete")) {
-            Item * item = const_cast < Item * > (& itemAt(0));
-            item->title = i18n("Messaging client");
-            item->description = i18n("Messaging client is not running");
-        } else {
-            add(i18n("Unable to find Kopete"), "",
-                    KIcon("application-x-executable"), QVariant("http://kopete.kde.org"));
+        if (forceReload || statusChanged) {
+            clear();
+            m_kopeteRunning = false;
+            m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this);
+
+            if (addService("kopete")) {
+                Item * item = const_cast < Item * > (& itemAt(0));
+                item->title = i18n("Messaging client");
+                item->description = i18n("Messaging client is not running");
+            } else {
+                add(i18n("Unable to find Kopete"), "",
+                        KIcon("application-x-executable"), QVariant("http://kopete.kde.org"));
+            }
         }
     } else {
-        connect(m_interface, SIGNAL(contactChanged(const QString &)),
-                this, SLOT(contactChanged(const QString &)));
+        if (!m_kopeteRunning) {
+            qDebug() << "ContactsKopete::connecting D-Bus";
+            connect(m_interface, SIGNAL(contactChanged(const QString &)),
+                    this, SLOT(contactChanged(const QString &)));
+            statusChanged = true;
+        }
 
-        m_kopeteRunning = true;
-        m_noOnlineContacts = false;
-        // m_timer.start(UPDATE_INTERVAL, this);
+        if (forceReload || statusChanged) {
+            qDebug() << "ContactsKopete::load: full";
+            clear();
+            m_kopeteRunning = true;
+            m_noOnlineContacts = false;
 
-        QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online");
-        if (!contacts.isValid()) {
-            m_kopeteRunning = false;
-            return;
-        }
+            QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online");
+            if (!contacts.isValid()) {
+                m_kopeteRunning = false;
+                return;
+            }
 
-        foreach (const QString& contact, contacts.value()) {
-             updateContactData(contact);
-        }
+            foreach (const QString& contact, contacts.value()) {
+                 updateContactData(contact);
+            }
 
-        if (size() == 0) {
-            add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant());
-            m_noOnlineContacts = true;
+            if (size() == 0) {
+                add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant());
+                m_noOnlineContacts = true;
+            }
         }
     }
     setEmitInhibited(false);
@@ -177,8 +214,13 @@
 
 void ContactsKopete::contactChanged(const QString & contactId)
 {
-    qDebug() << "ContactsKopete::contactChanged:" << contactId;
-    updateContactData(contactId);
+    // qDebug() << "ContactsKopete::contactChanged:" << contactId;
+    // updateContactData(contactId);
+    // delaying the update
+    if (!m_contactsToUpdate.contains(contactId)) {
+        m_contactsToUpdate << contactId;
+    }
+    m_delayTimer.start(DELAY_INTERVAL, this);
 }
 
 } // namespace Models


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- kdeplasma-addons.spec	4 Aug 2009 10:02:07 -0000	1.53
+++ kdeplasma-addons.spec	7 Aug 2009 21:35:59 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+## backports
+Patch201: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -71,6 +73,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch201 -p0
 
 
 %build
@@ -156,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-6
+- Add patch to fix kde#196809
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From pkgdb at fedoraproject.org  Fri Aug  7 21:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:36:00 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213600.367D410F8BC@bastion2.fedora.phx.redhat.com>

orion has set the watchbugzilla acl on kdesvn (Fedora 11) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:36:00 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213602.991F510F89F@bastion2.fedora.phx.redhat.com>

orion has set the watchcommits acl on kdesvn (Fedora 11) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From pkgdb at fedoraproject.org  Fri Aug  7 21:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 07 Aug 2009 21:36:01 +0000
Subject: [pkgdb] kdesvn had acl change status
Message-ID: <20090807213602.D05D310F8BD@bastion2.fedora.phx.redhat.com>

orion has set the commit acl on kdesvn (Fedora 11) to Approved for jreznik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kdesvn



From orion at fedoraproject.org  Fri Aug  7 22:02:44 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  7 Aug 2009 22:02:44 +0000 (UTC)
Subject: rpms/ant/devel ant.spec,1.100,1.101
Message-ID: <20090807220244.1030611C00D7@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17775

Modified Files:
	ant.spec 
Log Message:
* Fri Aug  7 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.1.7-11
- Add links to jar files into %{ant_home} (Bug #179759)



Index: ant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant/devel/ant.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- ant.spec	24 Jul 2009 16:53:53 -0000	1.100
+++ ant.spec	7 Aug 2009 22:02:43 -0000	1.101
@@ -55,7 +55,7 @@
 
 Name:           ant
 Version:        1.7.1
-Release:        10.2%{?dist}
+Release:        11%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -654,8 +654,8 @@ install -m 644 %{SOURCE26} $RPM_BUILD_RO
 %endif
 
 # jar aliases
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/%{name}/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done)
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -1066,6 +1066,9 @@ fi
 %{ant_home}/etc/common2master.xsl
 %endif
 %dir %{ant_home}/lib
+%{ant_home}/lib/%{name}.jar
+%{ant_home}/lib/%{name}-launcher.jar
+%{ant_home}/lib/%{name}-bootstrap.jar
 %dir %{_sysconfdir}/%{name}.d
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}/*
@@ -1079,6 +1082,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jmf.jar
 %{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%{ant_home}/lib/%{name}-jmf.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jmf
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
@@ -1088,6 +1092,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-nodeps.jar
 %{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
+%{ant_home}/lib/%{name}-nodeps.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
@@ -1097,6 +1102,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-swing.jar
 %{_javadir}/%{name}/%{name}-swing-%{version}.jar
+%{ant_home}/lib/%{name}-swing.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/swing
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.*
@@ -1106,6 +1112,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-trax.jar
 %{_javadir}/%{name}/%{name}-trax-%{version}.jar
+%{ant_home}/lib/%{name}-trax.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/trax
 %{ant_home}/etc/mmetrics-frames.xsl
 %{ant_home}/etc/coverage-frames.xsl
@@ -1139,6 +1146,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-antlr.jar
 %{_javadir}/%{name}/%{name}-antlr-%{version}.jar
+%{ant_home}/lib/%{name}-antlr.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/antlr
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-%{version}.jar.*
@@ -1148,6 +1156,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-bsf.jar
 %{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
+%{ant_home}/lib/%{name}-apache-bsf.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-%{version}.jar.*
@@ -1157,6 +1166,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-resolver.jar
 %{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
+%{ant_home}/lib/%{name}-apache-resolver.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-%{version}.jar.*
@@ -1166,6 +1176,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-logging.jar
 %{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
+%{ant_home}/lib/%{name}-commons-logging.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-%{version}.jar.*
@@ -1175,6 +1186,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-net.jar
 %{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
+%{ant_home}/lib/%{name}-commons-net.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-%{version}.jar.*
@@ -1186,6 +1198,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jai.jar
 %{_javadir}/%{name}/%{name}-jai-%{version}.jar
+%{ant_home}/lib/%{name}-jai.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jai
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-%{version}.jar.*
@@ -1197,6 +1210,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-bcel.jar
 %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-bcel.jar
+%{ant_home}/lib/%{name}-apache-bcel.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-%{version}.jar.*
@@ -1207,6 +1221,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-log4j.jar
 %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-log4j.jar
+%{ant_home}/lib/%{name}-apache-log4j.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-%{version}.jar.*
@@ -1217,6 +1232,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-oro.jar
 %{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-oro.jar
+%{ant_home}/lib/%{name}-apache-oro.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
 %{ant_home}/etc/maudit-frames.xsl
 %if %{gcj_support}
@@ -1228,6 +1244,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-regexp.jar
 %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-regexp.jar
+%{ant_home}/lib/%{name}-apache-regexp.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.*
@@ -1237,6 +1254,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-javamail.jar
 %{_javadir}/%{name}/%{name}-javamail-%{version}.jar
+%{ant_home}/lib/%{name}-javamail.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/javamail
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-%{version}.jar.*
@@ -1246,6 +1264,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jdepend.jar
 %{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
+%{ant_home}/lib/%{name}-jdepend.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
 %{ant_home}/etc/jdepend.xsl
 %{ant_home}/etc/jdepend-frames.xsl
@@ -1257,6 +1276,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jsch.jar
 %{_javadir}/%{name}/%{name}-jsch-%{version}.jar
+%{ant_home}/lib/%{name}-jsch.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jsch
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-%{version}.jar.*
@@ -1266,6 +1286,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-junit.jar
 %{_javadir}/%{name}/%{name}-junit-%{version}.jar
+%{ant_home}/lib/%{name}-junit.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/junit
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
@@ -1292,6 +1313,9 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug  7 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.1.7-11
+- Add links to jar files into %{ant_home} (Bug #179759)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7.1-10.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mathstuf at fedoraproject.org  Fri Aug  7 22:44:13 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri,  7 Aug 2009 22:44:13 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.54,1.55
Message-ID: <20090807224413.D733F11C00D7@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22566

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Rebuild for missing deps and fix comments


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- kdeplasma-addons.spec	7 Aug 2009 21:35:59 -0000	1.54
+++ kdeplasma-addons.spec	7 Aug 2009 22:44:11 -0000	1.55
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,8 +15,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-## backports
-Patch201: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
+# Backported from 4.3 branch
+# Commit 1008267
+Patch101: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -73,7 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch201 -p0
+%patch101 -p0
 
 
 %build
@@ -159,6 +160,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-7
+- Rebuild for mising rawhide oxygen-icon-theme
+- Fix patch comments
+
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-6
 - Add patch to fix kde#196809
 



From jkeating at fedoraproject.org  Fri Aug  7 23:09:17 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:09:17 +0000 (UTC)
Subject: fedora-release/compose README, 1.2, NONE fedora-live-base.ks, 1.1, 
	NONE fedora-livecd-desktop-default.ks, 1.1,
	NONE fedora-livecd-kde.ks, 1.1, NONE rawhide-fedora.ks, 1.2, NONE
Message-ID: <20090807230917.6145911C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release/compose
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25915/compose

Removed Files:
	README fedora-live-base.ks fedora-livecd-desktop-default.ks 
	fedora-livecd-kde.ks rawhide-fedora.ks 
Log Message:
Get ready for F12 Alpha



--- README DELETED ---


--- fedora-live-base.ks DELETED ---


--- fedora-livecd-desktop-default.ks DELETED ---


--- fedora-livecd-kde.ks DELETED ---


--- rawhide-fedora.ks DELETED ---



From jkeating at fedoraproject.org  Fri Aug  7 23:09:46 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:09:46 +0000 (UTC)
Subject: fedora-release RPM-GPG-KEY-fedora-primary, 1.1,
	1.2 fedora-release.spec, 1.73, 1.74 fedora-updates-testing.repo,
	1.13, 1.14 fedora-updates.repo, 1.17, 1.18 fedora.repo, 1.17,
	1.18 RPM-GPG-KEY-fedora-10-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-ia64, 1.1,
	NONE RPM-GPG-KEY-fedora-test-10-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-test-11-primary, 1.1,
	NONE RPM-GPG-KEY-fedora-test-ia64, 1.1,
	NONE RPM-GPG-KEY-fedora-test-primary, 1.1, NONE
Message-ID: <20090807230946.66A5511C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25915

Modified Files:
	RPM-GPG-KEY-fedora-primary fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo fedora.repo 
Removed Files:
	RPM-GPG-KEY-fedora-10-primary RPM-GPG-KEY-fedora-ia64 
	RPM-GPG-KEY-fedora-test-10-primary 
	RPM-GPG-KEY-fedora-test-11-primary 
	RPM-GPG-KEY-fedora-test-ia64 RPM-GPG-KEY-fedora-test-primary 
Log Message:
Get ready for F12 Alpha



Index: RPM-GPG-KEY-fedora-primary
===================================================================
RCS file: /cvs/fedora/fedora-release/RPM-GPG-KEY-fedora-primary,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RPM-GPG-KEY-fedora-primary	11 Jun 2008 19:21:53 -0000	1.1
+++ RPM-GPG-KEY-fedora-primary	7 Aug 2009 23:09:15 -0000	1.2
@@ -1,27 +1,29 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-mQGiBD+dnTsRBACwnlz4AhctOLlVBAsq+RaU82nb5P3bD1YJJpsAce1Ckd2sBUOJ
-D11NUCqH8c7EctOquOZ5zTcWxHiWWbLyKQwUw2SUvnWa5SSbi8kI8q9MTPsPvhwt
-gMrQMLenMO+nsrxrSaG6XcD+ssfJNxC7NQVCQAj3pvvg9rKi3ygsM7CXHwCghgsq
-X6TOr55HE90DbEsoq3b/jjsD/i8aIZ6urUgrpAkQslcakXdJLKgSdwjRUgVZgvYZ
-b7kAx1iPq0t/AhB3NJw3zW4AAKJohGg3xj5K4V8PJEZrSIpoRYlF43Kqlfu2p5gh
-WT89SP4YAlWPeTqf0+dTYUYz3b144k2ZFOdRuXIRxunoYNAUr9oMrxBXbJ/eY+0U
-QX3pBACYzKizyY4JJgd0zFJmNkcdK9nzcm+btYFnYQo33w5GSE686UNr+9yiXt9t
-mPRvNEbj3u+xoAX8B/5k3aZ5NbUhV64/VcKlUdRIxNlFCG7I9KgxeHWAYwi7yqOG
-XM3T/v6o7GLdQEB0ChFqS7kUlqmwLV+C3QhlrFe/Cuk26i+Q6rQiRmVkb3JhIFBy
-b2plY3QgPGZlZG9yYUByZWRoYXQuY29tPohbBBMRAgAbBQI/nZ07BgsJCAcDAgMV
-AgMDFgIBAh4BAheAAAoJELRCadBPKm/S2PAAnRTlhorITphab+oxAHtbxZF9BVyD
-AJ9WOVaZUG53IWWIAXOGv3j/cmr3lohGBBMRAgAGBQI/nZ22AAoJECGRgM3bQqYO
-R5QAoIp1G+omVktq/snxpmz5UeHjlSYjAKCRr/ea/L7S7ZTxB18cf1TYfad1x4hG
-BBARAgAGBQI/ntjgAAoJECnVuiSN9W0FUSUAoJnrone4J0o1HMkRz+6g9KVuO2Fy
-AJ0XyebOzVmI9U5OyOfnNmYV0wnQcrkBDQQ/nZ08EAQAugOfLWJbKwMA9vg2mJU5
-94TZU0HRJkx/fqYhx0YxWWRpzplrEyvcDXuYcWi1Hwh0tD86T4fR5GV6joWiWClz
-D+Hwhhb6gcSdeSGlGLlZAvWYtFSHWiv+3LaI9w8Vtczl99Bh2WiMDNDDGw0RQg6Z
-aftldLSe4j1pffpFGQ8SuisAAwUEAKVxqLT7fC5xQ6oclcZ+PhoDlePQ1BiTS7tu
-GM07bFF4nNvY91LL7S31pooz3XbGSWP8jxzSv1Fw35YhSmWGOBOEXluqMbVQGJJ5
-m8fqJOjC0imbfeWgr/T7zLrJeiljDxvX+6TyawyWQngF6v1Hq6FRV0O0bOp9Npt5
-zqCbDGs/iEYEGBECAAYFAj+dnTwACgkQtEJp0E8qb9L//gCcDVYnDegNCOxDn1se
-dDwxw+0h8OcAn1CZHof15QqxnTwEnvwF2QeOI5dn
-=mJAx
+mQINBEpvl68BEADHaID3riLF8dKEplScdHDoLvVSQA7w4KzRF3sC+4qmh6qxWxvb
+blUlrtkN9jn049g7JEydtBmqmhJpixtq0vMeiHSyyGgl5B1DfQnNCUUJUM+SKdLN
+1XjrsifYlYkpKiWWhStESwHAYeR+NS6ahPqHS2ZRtnSYsVGzr568YOMUqsfh7xOH
+/nugJEY7dHh+BkRkQlG2Sq7w1aIq5cLtHskUhIWG5odUbkzplEvv+t0OFxQfRh47
+l+PknILo7ecyrL55SzD/+R8ANqMu3BeMocwCga7pSl6RfZjdvLC8p8HhJ5gwGzGj
+3YxjLoga0lWNVIhsq/LpS9vPD2mVHsVlSLHsZSTSDr3zQf2nSlaxzZb9zWAW3cVR
+EXy9Ly835b6HFTPqgkclkymV31eDI1BU1AT/5gp7lrzUNA7xbvtQy4VrML/gCO/I
+4G7j5qOIZewlxEMHM1GvEPLPbnC4X3NmKmRogvxg9Sir7DHOq3uHDBQlBYi7FzBG
+QvjgjgjpGcmPLTVuuhzGLr8XFH5Gk3kSji7mrDxAW3sD/16ZQ5xzT8HEx4L+bdCw
+R+i2SpOvKLt2DPeFykAFnpkgHwkqCYtZhzT8QZ/9JR9UvRqPNskkB+41R/jgMw4+
+77dXYNdiL7502vpCvPqaqRuf0kWag9bq1ZBwsqUDz7FV1gvH0Tv+sugBHQARAQAB
+tCZGZWRvcmEgKDEyKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCSm+XrwIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEJ0cw0hXu8y6N2QP
+/R9wYh4bHYIUOv8ysc188PKXgvHFLGTIJOigqgIFfIl4FP92NlxorVLxQ5M59KWR
+DACsBwKNF4pVXTlULJQc6Mq3noNdFPyvYRfDPXUdOKPX3xNy0NHiuHPuXk8c7T6W
+yaBlZBy5oKaBq1LdoIsaw1vMnyd3Hdo/nh1fcZ19sqGtLwV5t4dmzOSACTi1Fpn+
+/mNKi1xrBwE7tvFpE08zW3uYTK3RKP300mRpcRqG66IVVuHdhRT6jTteyL/vHaw4
+jVyUg040JbJ1itZaqUcLagkSDRw04D1PxllVGr4laHlBEjdoqKwZV5PvMs6AE+zx
+GyFuFtRvAiOPO62g35uZBncGGZaTC+WwXWEaPkjPHxOFVTqemVamL11vEUDfSQqv
+ui9Ul24E06mb5AsHsyiptyrmUDbbpz6Wyo60kaMWSEISoiTGAIFMSimfLVkQLYAQ
+L5Q5AM/rnIHibd6PGFD0Twv7DMp429rw1ItosNRPA6G/BVi0FadN0OoPF5RBJU7z
+4xt0jy5mDHfX2Fc2xSbZPKV9lrvJd8KYdRXCIDwH9e0Dvlf7pw4lvxDvh1WtSbj2
+eNaJlTIksj/Qb3lbdMrZ72GNnIJF1gRkzjFg9ICaGrhMHQQ8phjwC4ME1h6iEVAJ
+5InJW4stZl1Bdl1NdxvQIbboVmtruN2VhgKKbXEFk1f+
+=f8U5
 -----END PGP PUBLIC KEY BLOCK-----


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- fedora-release.spec	30 Mar 2009 21:32:31 -0000	1.73
+++ fedora-release.spec	7 Aug 2009 23:09:15 -0000	1.74
@@ -3,7 +3,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.90
+Version:	11.91
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -46,10 +46,8 @@
 for arch in i386 x86_64 ppc ppc64
   do
   ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test-$arch
 done
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -57,11 +55,6 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
-for file in compose/*; do
-  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
-done
-
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -87,12 +80,17 @@
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
+- Update for F12-Alpha
+- Replace F11 key with F12
+- Drop old keys and inactive secondary arch keys
+- Fix metalink urls to be https
+- Drop the compose stuff
+
 * Mon Mar 30 2009 Jesse Keating <jkeating at redhat.com> - 11.90-1
 - Build for F12 collection
 


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-updates-testing.repo	4 Mar 2009 04:46:04 -0000	1.13
+++ fedora-updates-testing.repo	7 Aug 2009 23:09:15 -0000	1.14
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch - Test Updates
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
@@ -11,7 +11,7 @@
 name=Fedora $releasever - $basearch - Test Updates Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
@@ -20,7 +20,7 @@
 name=Fedora $releasever - Test Updates Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fedora-updates.repo	4 Mar 2009 04:46:04 -0000	1.17
+++ fedora-updates.repo	7 Aug 2009 23:09:15 -0000	1.18
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -11,7 +11,7 @@
 name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -20,7 +20,7 @@
 name=Fedora $releasever - Updates Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch


Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fedora.repo	4 Mar 2009 04:46:04 -0000	1.17
+++ fedora.repo	7 Aug 2009 23:09:15 -0000	1.18
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 gpgcheck=1
@@ -12,7 +12,7 @@
 name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 gpgcheck=1
@@ -22,7 +22,7 @@
 name=Fedora $releasever - Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 gpgcheck=1


--- RPM-GPG-KEY-fedora-10-primary DELETED ---


--- RPM-GPG-KEY-fedora-ia64 DELETED ---


--- RPM-GPG-KEY-fedora-test-10-primary DELETED ---


--- RPM-GPG-KEY-fedora-test-11-primary DELETED ---


--- RPM-GPG-KEY-fedora-test-ia64 DELETED ---


--- RPM-GPG-KEY-fedora-test-primary DELETED ---



From jkeating at fedoraproject.org  Fri Aug  7 23:14:22 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:14:22 +0000 (UTC)
Subject: rpms/fedora-release/devel fedora-release.spec,1.76,1.77
Message-ID: <20090807231422.D37A111C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26565

Modified Files:
	fedora-release.spec 
Log Message:
* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
- Update for F12-Alpha
- Replace F11 key with F12
- Drop old keys and inactive secondary arch keys
- Fix metalink urls to be https
- Drop the compose stuff



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- fedora-release.spec	24 Jul 2009 22:37:39 -0000	1.76
+++ fedora-release.spec	7 Aug 2009 23:14:22 -0000	1.77
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.90
-Release:	2
+Version:	11.91
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -46,10 +46,8 @@ pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 for arch in i386 x86_64 ppc ppc64
   do
   ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test-$arch
 done
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -57,11 +55,6 @@ for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
-for file in compose/*; do
-  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
-done
-
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -87,14 +80,16 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.90-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
+- Update for F12-Alpha
+- Replace F11 key with F12
+- Drop old keys and inactive secondary arch keys
+- Fix metalink urls to be https
+- Drop the compose stuff
 
 * Mon Mar 30 2009 Jesse Keating <jkeating at redhat.com> - 11.90-1
 - Build for F12 collection



From jkeating at fedoraproject.org  Fri Aug  7 23:21:26 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:21:26 +0000 (UTC)
Subject: rpms/fedora-release/devel .cvsignore,1.38,1.39 sources,1.62,1.63
Message-ID: <20090807232126.8DE4B11C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27515

Modified Files:
	.cvsignore sources 
Log Message:
New source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	30 Mar 2009 21:36:17 -0000	1.38
+++ .cvsignore	7 Aug 2009 23:21:24 -0000	1.39
@@ -1 +1 @@
-fedora-release-11.90.tar.gz
+fedora-release-11.91.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	30 Mar 2009 21:36:17 -0000	1.62
+++ sources	7 Aug 2009 23:21:24 -0000	1.63
@@ -1 +1 @@
-a1b03fe2eca987cea581c80daafdf6af  fedora-release-11.90.tar.gz
+4b6e80034156618037fb86dbedc2e89e  fedora-release-11.91.tar.gz



From jkeating at fedoraproject.org  Fri Aug  7 23:32:55 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:32:55 +0000 (UTC)
Subject: fedora-release RPM-GPG-KEY-fedora-12-primary, NONE,
	1.1 fedora-release.spec, 1.74, 1.75 RPM-GPG-KEY-fedora-primary,
	1.2, NONE
Message-ID: <20090807233255.5DF9511C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29522

Modified Files:
	fedora-release.spec 
Added Files:
	RPM-GPG-KEY-fedora-12-primary 
Removed Files:
	RPM-GPG-KEY-fedora-primary 
Log Message:
Fix the filename of the gpg key



--- NEW FILE RPM-GPG-KEY-fedora-12-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)

mQINBEpvl68BEADHaID3riLF8dKEplScdHDoLvVSQA7w4KzRF3sC+4qmh6qxWxvb
blUlrtkN9jn049g7JEydtBmqmhJpixtq0vMeiHSyyGgl5B1DfQnNCUUJUM+SKdLN
1XjrsifYlYkpKiWWhStESwHAYeR+NS6ahPqHS2ZRtnSYsVGzr568YOMUqsfh7xOH
/nugJEY7dHh+BkRkQlG2Sq7w1aIq5cLtHskUhIWG5odUbkzplEvv+t0OFxQfRh47
l+PknILo7ecyrL55SzD/+R8ANqMu3BeMocwCga7pSl6RfZjdvLC8p8HhJ5gwGzGj
3YxjLoga0lWNVIhsq/LpS9vPD2mVHsVlSLHsZSTSDr3zQf2nSlaxzZb9zWAW3cVR
EXy9Ly835b6HFTPqgkclkymV31eDI1BU1AT/5gp7lrzUNA7xbvtQy4VrML/gCO/I
4G7j5qOIZewlxEMHM1GvEPLPbnC4X3NmKmRogvxg9Sir7DHOq3uHDBQlBYi7FzBG
QvjgjgjpGcmPLTVuuhzGLr8XFH5Gk3kSji7mrDxAW3sD/16ZQ5xzT8HEx4L+bdCw
R+i2SpOvKLt2DPeFykAFnpkgHwkqCYtZhzT8QZ/9JR9UvRqPNskkB+41R/jgMw4+
77dXYNdiL7502vpCvPqaqRuf0kWag9bq1ZBwsqUDz7FV1gvH0Tv+sugBHQARAQAB
tCZGZWRvcmEgKDEyKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
IAUCSm+XrwIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEJ0cw0hXu8y6N2QP
/R9wYh4bHYIUOv8ysc188PKXgvHFLGTIJOigqgIFfIl4FP92NlxorVLxQ5M59KWR
DACsBwKNF4pVXTlULJQc6Mq3noNdFPyvYRfDPXUdOKPX3xNy0NHiuHPuXk8c7T6W
yaBlZBy5oKaBq1LdoIsaw1vMnyd3Hdo/nh1fcZ19sqGtLwV5t4dmzOSACTi1Fpn+
/mNKi1xrBwE7tvFpE08zW3uYTK3RKP300mRpcRqG66IVVuHdhRT6jTteyL/vHaw4
jVyUg040JbJ1itZaqUcLagkSDRw04D1PxllVGr4laHlBEjdoqKwZV5PvMs6AE+zx
GyFuFtRvAiOPO62g35uZBncGGZaTC+WwXWEaPkjPHxOFVTqemVamL11vEUDfSQqv
ui9Ul24E06mb5AsHsyiptyrmUDbbpz6Wyo60kaMWSEISoiTGAIFMSimfLVkQLYAQ
L5Q5AM/rnIHibd6PGFD0Twv7DMp429rw1ItosNRPA6G/BVi0FadN0OoPF5RBJU7z
4xt0jy5mDHfX2Fc2xSbZPKV9lrvJd8KYdRXCIDwH9e0Dvlf7pw4lvxDvh1WtSbj2
eNaJlTIksj/Qb3lbdMrZ72GNnIJF1gRkzjFg9ICaGrhMHQQ8phjwC4ME1h6iEVAJ
5InJW4stZl1Bdl1NdxvQIbboVmtruN2VhgKKbXEFk1f+
=f8U5
-----END PGP PUBLIC KEY BLOCK-----


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- fedora-release.spec	7 Aug 2009 23:09:15 -0000	1.74
+++ fedora-release.spec	7 Aug 2009 23:32:53 -0000	1.75
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	11.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-2
+- Fix the gpg key file name
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
 - Update for F12-Alpha
 - Replace F11 key with F12


--- RPM-GPG-KEY-fedora-primary DELETED ---



From jkeating at fedoraproject.org  Fri Aug  7 23:35:02 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:35:02 +0000 (UTC)
Subject: rpms/fedora-release/devel fedora-release.spec, 1.77, 1.78 sources, 
	1.63, 1.64
Message-ID: <20090807233502.B7BAD11C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30081

Modified Files:
	fedora-release.spec sources 
Log Message:
* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-2
- Fix the gpg key file name



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- fedora-release.spec	7 Aug 2009 23:14:22 -0000	1.77
+++ fedora-release.spec	7 Aug 2009 23:35:02 -0000	1.78
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	11.91
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-2
+- Fix the gpg key file name
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
 - Update for F12-Alpha
 - Replace F11 key with F12


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	7 Aug 2009 23:21:24 -0000	1.63
+++ sources	7 Aug 2009 23:35:02 -0000	1.64
@@ -1 +1 @@
-4b6e80034156618037fb86dbedc2e89e  fedora-release-11.91.tar.gz
+57bdb69581b8294bfdeeb393a5faf044  fedora-release-11.91.tar.gz



From jkeating at fedoraproject.org  Fri Aug  7 23:46:42 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:46:42 +0000 (UTC)
Subject: fedora-release Makefile,1.4,1.5
Message-ID: <20090807234642.439EA11C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31687

Modified Files:
	Makefile 
Log Message:
Fix tagging



Index: Makefile
===================================================================
RCS file: /cvs/fedora/fedora-release/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	21 May 2007 20:26:27 -0000	1.4
+++ Makefile	7 Aug 2009 23:46:41 -0000	1.5
@@ -1,8 +1,9 @@
 VERSION=$(shell awk '/Version/ { print $$2 }' fedora-release.spec)
+RELEASE=$(shell awk '/Release/ { print $$2 }' fedora-release.spec)
 
 CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
 
-CVSTAG = V$(subst .,-,$(VERSION))
+CVSTAG = V$(subst .,-,$(VERSION)-$(RELEASE))
 
 all:
 



From jkeating at fedoraproject.org  Fri Aug  7 23:47:33 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:47:33 +0000 (UTC)
Subject: fedora-release Makefile,1.5,1.6
Message-ID: <20090807234733.A7F5711C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31872

Modified Files:
	Makefile 
Log Message:
Stop making cvs quiet



Index: Makefile
===================================================================
RCS file: /cvs/fedora/fedora-release/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	7 Aug 2009 23:46:41 -0000	1.5
+++ Makefile	7 Aug 2009 23:47:33 -0000	1.6
@@ -8,7 +8,7 @@
 all:
 
 tag-archive:
-	@cvs -Q tag -F $(CVSTAG)
+	@cvs tag -F $(CVSTAG)
 
 create-archive:
 	@rm -rf /tmp/fedora-release



From jkeating at fedoraproject.org  Fri Aug  7 23:52:14 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:52:14 +0000 (UTC)
Subject: fedora-release Makefile,1.6,1.7
Message-ID: <20090807235214.8152911C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv334

Modified Files:
	Makefile 
Log Message:
Finally fix the tagging.  I hate CVS and make files



Index: Makefile
===================================================================
RCS file: /cvs/fedora/fedora-release/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	7 Aug 2009 23:47:33 -0000	1.6
+++ Makefile	7 Aug 2009 23:52:14 -0000	1.7
@@ -1,9 +1,9 @@
-VERSION=$(shell awk '/Version/ { print $$2 }' fedora-release.spec)
-RELEASE=$(shell awk '/Release/ { print $$2 }' fedora-release.spec)
+VERSION=$(shell awk '/Version:/ { print $$2 }' fedora-release.spec)
+RELEASE=$(shell awk '/Release:/ { print $$2 }' fedora-release.spec)
 
 CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
 
-CVSTAG = V$(subst .,-,$(VERSION)-$(RELEASE))
+CVSTAG = V$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
 
 all:
 



From jkeating at fedoraproject.org  Fri Aug  7 23:52:50 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri,  7 Aug 2009 23:52:50 +0000 (UTC)
Subject: rpms/fedora-release/devel sources,1.64,1.65
Message-ID: <20090807235250.DC34911C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv519

Modified Files:
	sources 
Log Message:
* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-2
- Fix the gpg key file name



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	7 Aug 2009 23:35:02 -0000	1.64
+++ sources	7 Aug 2009 23:52:50 -0000	1.65
@@ -1 +1 @@
-57bdb69581b8294bfdeeb393a5faf044  fedora-release-11.91.tar.gz
+8a857b6797729dd2e849e20e77460e49  fedora-release-11.91.tar.gz



From jkeating at fedoraproject.org  Sat Aug  8 00:04:50 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Sat,  8 Aug 2009 00:04:50 +0000 (UTC)
Subject: fedora-release fedora-release.spec,1.75,1.76
Message-ID: <20090808000450.4162F11C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv647

Modified Files:
	fedora-release.spec 
Log Message:
Bumping for new tarball



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- fedora-release.spec	7 Aug 2009 23:32:53 -0000	1.75
+++ fedora-release.spec	8 Aug 2009 00:04:48 -0000	1.76
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	11.91
-Release:	2
+Release:	3
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-3
+- Bump for new tarball
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-2
 - Fix the gpg key file name
 



From jkeating at fedoraproject.org  Sat Aug  8 00:09:10 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Sat,  8 Aug 2009 00:09:10 +0000 (UTC)
Subject: rpms/fedora-release/devel fedora-release.spec, 1.78, 1.79 sources, 
	1.65, 1.66
Message-ID: <20090808000910.E834B11C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4256

Modified Files:
	fedora-release.spec sources 
Log Message:
* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-3
- Bump for new tarball



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- fedora-release.spec	7 Aug 2009 23:35:02 -0000	1.78
+++ fedora-release.spec	8 Aug 2009 00:09:10 -0000	1.79
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	11.91
-Release:	2
+Release:	3
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-3
+- Bump for new tarball
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-2
 - Fix the gpg key file name
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	7 Aug 2009 23:52:50 -0000	1.65
+++ sources	8 Aug 2009 00:09:10 -0000	1.66
@@ -1 +1 @@
-8a857b6797729dd2e849e20e77460e49  fedora-release-11.91.tar.gz
+17a262094ce6d62da6ea6fdde61a84db  fedora-release-11.91.tar.gz



From hadess at fedoraproject.org  Sat Aug  8 01:01:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat,  8 Aug 2009 01:01:41 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-11 gstreamer-plugins-base.spec, 1.78, 
	1.79
Message-ID: <20090808010141.A459211C00D7@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-serv15485

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
Fix filelist


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-11/gstreamer-plugins-base.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- gstreamer-plugins-base.spec	7 Aug 2009 16:25:12 -0000	1.78
+++ gstreamer-plugins-base.spec	8 Aug 2009 01:01:39 -0000	1.79
@@ -106,7 +106,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstdecodebin.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdecodebin2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstplaybin.so
-%{_libdir}/gstreamer-%{majorminor}/libgstselector.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttypefindfunctions.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideotestsrc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaudiorate.so



From mathstuf at fedoraproject.org  Sat Aug  8 02:12:06 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sat,  8 Aug 2009 02:12:06 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.55,1.56
Message-ID: <20090808021206.E760411C00D7@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32273

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Wait for newRepo


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- kdeplasma-addons.spec	7 Aug 2009 22:44:11 -0000	1.55
+++ kdeplasma-addons.spec	8 Aug 2009 02:12:06 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -160,6 +160,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
+- Waited for newRepo task
+
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-7
 - Rebuild for mising rawhide oxygen-icon-theme
 - Fix patch comments



From mathstuf at fedoraproject.org  Sat Aug  8 02:32:46 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sat,  8 Aug 2009 02:32:46 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.36, 1.37
Message-ID: <20090808023246.DC29611C00D7@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4382

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch 
Log Message:
Backport fix for kde#196809

kdeplasma-addons-4.3.0-lancelot-kde#196809.patch:
 ContactsKopete.cpp |  104 +++++++++++++++++++++++++++++++++++++----------------
 ContactsKopete.h   |    8 ++--
 2 files changed, 78 insertions(+), 34 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.0-lancelot-kde#196809.patch ---
Index: applets/lancelot/app/src/models/ContactsKopete.h
===================================================================
--- applets/lancelot/app/src/models/ContactsKopete.h	(revision 1008266)
+++ applets/lancelot/app/src/models/ContactsKopete.h	(revision 1008267)
@@ -31,19 +31,21 @@
     ContactsKopete();
     ~ContactsKopete();
 
-    void timerEvent(QTimerEvent * event);
-
 protected:
     void activate(int index);
     void load();
+    void load(bool forceReload);
     void updateContactData(const QString & contactId);
+    void timerEvent(QTimerEvent * event);
 
 protected Q_SLOTS:
     void contactChanged(const QString & contactId);
 
 private:
     org::kde::Kopete * m_interface;
-    QBasicTimer m_timer;
+    QBasicTimer m_delayTimer;
+    QBasicTimer m_checkRunningTimer;
+    QStringList m_contactsToUpdate;
     QString m_kopeteAvatarsDir;
     bool m_kopeteRunning : 1;
     bool m_noOnlineContacts : 1;
Index: applets/lancelot/app/src/models/ContactsKopete.cpp
===================================================================
--- applets/lancelot/app/src/models/ContactsKopete.cpp	(revision 1008266)
+++ applets/lancelot/app/src/models/ContactsKopete.cpp	(revision 1008267)
@@ -25,11 +25,12 @@
 
 // #define UPDATE_INTERVAL 15000
 #define CHECK_RUNNING_INTERVAL 5000
+#define DELAY_INTERVAL 500
 
 namespace Models {
 
 ContactsKopete::ContactsKopete()
-    : m_interface(NULL), m_kopeteRunning(true)
+    : m_interface(NULL), m_kopeteRunning(false)
 {
     setSelfTitle(i18n("Contacts"));
     setSelfIcon(KIcon("kopete"));
@@ -40,14 +41,27 @@
     m_kopeteAvatarsDir = KStandardDirs::locate(
             "data", "kopete/avatars/Contacts/");
 
-    m_timer.start(CHECK_RUNNING_INTERVAL, this);
+    m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this);
     load();
 }
 
 void ContactsKopete::timerEvent(QTimerEvent * event)
 {
-    if (event->timerId() == m_timer.timerId()) {
+    if (event->timerId() == m_checkRunningTimer.timerId()) {
         load();
+    } else if (event->timerId() == m_delayTimer.timerId()) {
+        qDebug() << "ContactsKopete::contactChanged [delayed]:"
+            << m_contactsToUpdate.size();
+        m_delayTimer.stop();
+        // checking whether we have a large update
+        if (m_contactsToUpdate.size() > 5) {
+            load(true);
+        } else {
+            foreach(QString contact, m_contactsToUpdate) {
+                updateContactData(contact);
+            }
+        }
+        m_contactsToUpdate.clear();
     }
 }
 
@@ -70,42 +84,65 @@
 
 void ContactsKopete::load()
 {
+    load(false);
+}
+
+void ContactsKopete::load(bool forceReload)
+{
     setEmitInhibited(true);
-    clear();
+    bool statusChanged = false;
+    // clear();
 
     if (!m_interface->isValid()) {
-        m_kopeteRunning = false;
-        m_timer.start(CHECK_RUNNING_INTERVAL, this);
+        if (m_kopeteRunning) {
+            qDebug() << "ContactsKopete::disconnecting D-Bus";
+            disconnect(m_interface, SIGNAL(contactChanged(const QString &)),
+                    this, SLOT(contactChanged(const QString &)));
+            statusChanged = true;
+        }
 
-        if (addService("kopete")) {
-            Item * item = const_cast < Item * > (& itemAt(0));
-            item->title = i18n("Messaging client");
-            item->description = i18n("Messaging client is not running");
-        } else {
-            add(i18n("Unable to find Kopete"), "",
-                    KIcon("application-x-executable"), QVariant("http://kopete.kde.org"));
+        if (forceReload || statusChanged) {
+            clear();
+            m_kopeteRunning = false;
+            m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this);
+
+            if (addService("kopete")) {
+                Item * item = const_cast < Item * > (& itemAt(0));
+                item->title = i18n("Messaging client");
+                item->description = i18n("Messaging client is not running");
+            } else {
+                add(i18n("Unable to find Kopete"), "",
+                        KIcon("application-x-executable"), QVariant("http://kopete.kde.org"));
+            }
         }
     } else {
-        connect(m_interface, SIGNAL(contactChanged(const QString &)),
-                this, SLOT(contactChanged(const QString &)));
+        if (!m_kopeteRunning) {
+            qDebug() << "ContactsKopete::connecting D-Bus";
+            connect(m_interface, SIGNAL(contactChanged(const QString &)),
+                    this, SLOT(contactChanged(const QString &)));
+            statusChanged = true;
+        }
 
-        m_kopeteRunning = true;
-        m_noOnlineContacts = false;
-        // m_timer.start(UPDATE_INTERVAL, this);
+        if (forceReload || statusChanged) {
+            qDebug() << "ContactsKopete::load: full";
+            clear();
+            m_kopeteRunning = true;
+            m_noOnlineContacts = false;
 
-        QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online");
-        if (!contacts.isValid()) {
-            m_kopeteRunning = false;
-            return;
-        }
+            QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online");
+            if (!contacts.isValid()) {
+                m_kopeteRunning = false;
+                return;
+            }
 
-        foreach (const QString& contact, contacts.value()) {
-             updateContactData(contact);
-        }
+            foreach (const QString& contact, contacts.value()) {
+                 updateContactData(contact);
+            }
 
-        if (size() == 0) {
-            add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant());
-            m_noOnlineContacts = true;
+            if (size() == 0) {
+                add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant());
+                m_noOnlineContacts = true;
+            }
         }
     }
     setEmitInhibited(false);
@@ -177,8 +214,13 @@
 
 void ContactsKopete::contactChanged(const QString & contactId)
 {
-    qDebug() << "ContactsKopete::contactChanged:" << contactId;
-    updateContactData(contactId);
+    // qDebug() << "ContactsKopete::contactChanged:" << contactId;
+    // updateContactData(contactId);
+    // delaying the update
+    if (!m_contactsToUpdate.contains(contactId)) {
+        m_contactsToUpdate << contactId;
+    }
+    m_delayTimer.start(DELAY_INTERVAL, this);
 }
 
 } // namespace Models


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- kdeplasma-addons.spec	5 Aug 2009 13:04:06 -0000	1.36
+++ kdeplasma-addons.spec	8 Aug 2009 02:32:46 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+# Backported from 4.3 branch
+# Commit 1008267
+Patch101: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -71,6 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch101 -p0
 
 
 %build
@@ -156,6 +160,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
+- Waited for newRepo task
+
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-7
+- Rebuild for mising rawhide oxygen-icon-theme
+- Fix patch comments
+
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-6
+- Add patch to fix kde#196809
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From amdunn at fedoraproject.org  Sat Aug  8 02:35:30 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Sat,  8 Aug 2009 02:35:30 +0000 (UTC)
Subject: rpms/why/devel import.log,1.2,1.3 why.spec,1.4,1.5
Message-ID: <20090808023530.3803D11C00D7@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/why/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4980/devel

Modified Files:
	import.log why.spec 
Log Message:
* Fri Aug 07 2009 Alan Dunn <amdunn at gmail.com> - 2.17-4
- Removed now irrelevant check for no OCaml in Fedora < 9 (those
  distributions are EOL)
- Changed ExcludeArch to proper Fedora versions
- Builds coq subpackage exactly when Coq can be built, thus making
  build independent of whether Coq can be built
- define -> global
- Fixed accidental use of in tar ocamlgraph instead of one that is
  separately packaged



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/why/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Dec 2008 16:37:05 -0000	1.2
+++ import.log	8 Aug 2009 02:35:30 -0000	1.3
@@ -1,2 +1,3 @@
 why-2_14-2_fc9:HEAD:why-2.14-2.fc9.src.rpm:1217954050
 why-2_17-1_fc11:HEAD:why-2.17-1.fc11.src.rpm:1230136029
+why-2_17-4_fc10:HEAD:why-2.17-4.fc10.src.rpm:1249698515


Index: why.spec
===================================================================
RCS file: /cvs/pkgs/rpms/why/devel/why.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- why.spec	27 Jul 2009 07:15:16 -0000	1.4
+++ why.spec	8 Aug 2009 02:35:30 -0000	1.5
@@ -1,36 +1,37 @@
-Name:		why
-Version:	2.17
-Release:	3%{?dist}
-Summary:	Why software verification platform
-
-Group:		Applications/Engineering
-License:	GPLv2
-URL:		http://why.lri.fr/
-Source0:	http://why.lri.fr/download/why-%{version}.tar.gz
-Source1:	README.why-gwhy.Fedora
-Source2:	README.why-coq.Fedora
-Source3:	README.why
-Source4:	gwhy.desktop
-Source5:	gwhy-icon.png
-Source6:	min.mlw
-Source7:	min_why.why.result
-Source8:	http://caduceus.lri.fr/manual/caduceus.ps
-Source9:	http://gforge.inria.fr/docman/view.php/999/5097/krakatoa.pdf
-Patch0:		gwhy-%{version}.patch
-Patch1:		why-%{version}-Makefile.in.patch
-Patch2:		why-config.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ocaml >= 3.09, ocaml-camlp4-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, dos2unix, prelink, coq
-
-%if 0%{?fedora} < 9
-# There's no ocaml for ppc64 in Fedora <= 8
-ExcludeArch: ppc64
+Name:           why
+Version:        2.17
+Release:        4%{?dist}
+Summary:        Why software verification platform
+
+Group:          Applications/Engineering
+License:        GPLv2
+URL:            http://why.lri.fr/
+Source0:        http://why.lri.fr/download/why-%{version}.tar.gz
+Source1:        README.why-gwhy.Fedora
+Source2:        README.why-coq.Fedora
+Source3:        README.why
+Source4:        gwhy.desktop
+Source5:        gwhy-icon.png
+Source6:        min.mlw
+Source7:        min_why.why.result
+Source8:        http://caduceus.lri.fr/manual/caduceus.ps
+Source9:        http://gforge.inria.fr/docman/view.php/999/5097/krakatoa.pdf
+Patch0:         gwhy-%{version}.patch
+Patch1:         why-%{version}-Makefile.in.patch
+Patch2:         why-config.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  ocaml >= 3.09, ocaml-camlp4-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, dos2unix, prelink
+BuildRequires:  ocaml-ocamlgraph
+
+%if 0%{?fedora} >= 11
+# Doesn't seem to build on ppc64 for Fedora >= 11
+# bz: 516317
+ExcludeArch:    ppc64
 %endif
 
-%if 0%{?fedora} == 11
-# Encountering an odd ocaml ppc64 bug in F11 and don't want to stall the other platforms
-# bz: 
-ExcludeArch: ppc64
+# No coq on ppc64 (any Fedora version) at the moment
+%ifnarch ppc64
+%global has_coq 1
 %endif
 
 %description
@@ -51,9 +52,9 @@ Zenon is packaged for Fedora) so that th
 proven, resulting in a proof of program correctness.
 
 %package gwhy
-Group:		Applications/Engineering
-Summary:	IDE for Why software verification platform
-Requires:	why = %{version}, zenity
+Group:          Applications/Engineering
+Summary:        IDE for Why software verification platform
+Requires:       why = %{version}, zenity
 
 %description gwhy
 Gwhy is an optional graphical user interface for the Why software
@@ -62,15 +63,21 @@ assertions that need to be proven to dif
 providing an interface to do this and also supports inspection of why
 input files.
 
+# No Coq for ppc64 -> certain subpackages can't be built, but main why can be
+%if 0%{?has_coq} == 1
+
 %package coq
-Group:		Applications/Engineering
-Summary:	Libraries for interfacing Coq with Why
-Requires:	why = %{version}
+Group:          Applications/Engineering
+Summary:        Libraries for interfacing Coq with Why
+Requires:       why = %{version}
+BuildRequires:  coq
 
 %description coq
 This package contains a set of routines that assist in the
 manipulation of why Coq-formatted output within Coq.
 
+%endif
+
 %prep
 %setup -q
 
@@ -93,35 +100,35 @@ manipulation of why Coq-formatted output
 cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 %SOURCE9 .
 
 %build
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 # Native ocaml builds do not seem to work on ppc64 (many packages have
 # this problem)
 %ifarch ppc64
-%define opt 0
+%global opt 0
 %endif
 
 # If not building opt, disable the debug info creation as this would otherwise destroy the bytecode executables
 # If we have opt, as this has a dependency on ocaml, we should have ocamlopt.opt
 %if ! %{opt}
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
-%define _enable_debug_package 0
-%define debug_package %{nil}
-%define opt_option OCAMLBEST=byte OCAMLC=ocamlc OCAMLDEP=ocamldep OCAMLYACC=ocamlyacc OCAMLLEX=ocamllex
+%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%global _enable_debug_package 0
+%global debug_package %{nil}
+%global opt_option OCAMLBEST=byte OCAMLC=ocamlc OCAMLDEP=ocamldep OCAMLYACC=ocamlyacc OCAMLLEX=ocamllex
 %else
-%define opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
+%global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
 %endif
 
 # We actually want to install library files into a non /usr/lib
 # directory as they aren't architecture dependent
-./configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_datadir} --mandir=%{_mandir}
+./configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_datadir} --mandir=%{_mandir} %{!?has_coq: COQC=no}
 make %{opt_option}
 
 %check
 %if %opt
-%define why bin/why.opt
+%global why bin/why.opt
 %else
-%define why bin/why.byte
+%global why bin/why.byte
 %endif
 export WHYLIB=lib
 %why --why --output min min.mlw
@@ -130,11 +137,17 @@ diff min_why.why min_why.why.result > /d
 
 %install
 rm -rf %{buildroot}
-make %{opt_option} BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_datadir} MANDIR=%{buildroot}%{_mandir} COQLIB=%{buildroot}%{_datadir}/coq install
+
+make %{opt_option} BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_datadir} MANDIR=%{buildroot}%{_mandir} %{?has_coq: COQLIB=%{buildroot}%{_datadir}/coq} install
+
+# Fix a small bug in their Makefile: if no Coq, NO .v files should be installed
+%if 0%{?has_coq} != 1
+rm -f `find %{buildroot}%{_datadir}/coq -name '*.v'`
+%endif
 
 # Install desktop icon and menu entry
 
-%define why_data_dir %{_datadir}/why
+%global why_data_dir %{_datadir}/why
 %if %(test -d %{buildroot}%{why_data_dir} && echo 1 || echo 0) != 1
 mkdir -p %{buildroot}%{why_data_dir}
 %endif
@@ -142,17 +155,22 @@ cp gwhy-icon.png %{buildroot}%{why_data_
 
 sed -i -e 's|ICON-LOCATION-BASE|%{why_data_dir}|' gwhy.desktop
 
-desktop-file-install --vendor="fedora"			\
---dir=%{buildroot}%{_datadir}/applications		\
+desktop-file-install --vendor="fedora"                  \
+--dir=%{buildroot}%{_datadir}/applications              \
 gwhy.desktop
 
-%define why_doc_dir %{_defaultdocdir}/%{name}-%{version}/
-%define why_examples_dir %{why_doc_dir}examples/
+%global why_doc_dir %{_defaultdocdir}/%{name}-%{version}/
+%global why_examples_dir %{why_doc_dir}examples/
+
+%global fix_encoding() dos2unix %1; mv %1 %1.old; \
+                       iconv -f ISO-8859-1 -t UTF-8 < %1.old > %1; rm %1.old \
+                       %{nil}
 
 # Fix up documentation and examples
 mkdir -p %{buildroot}%{why_examples_dir}mlw/
 mkdir -p %{buildroot}%{why_examples_dir}c/
 cp -p doc/manual.ps %{buildroot}%{why_doc_dir}why-manual.ps
+%fix_encoding COPYING
 cp -p caduceus.ps krakatoa.pdf README.why COPYING LICENSE %{buildroot}%{why_doc_dir}
 
 # Copy in the example files after converting to proper UTF-8, fix line
@@ -162,7 +180,7 @@ for d in `find -mindepth 1 -maxdepth 1 -
 mkdir -p %{buildroot}%{why_examples_dir}mlw/$d
 done
 for f in `find -regex '.*\(\.mlw\|\.why\)' | egrep -v '_inv|_coq|_why'`; do
-dos2unix $f; mv $f $f.old; iconv -f ISO-8859-1 -t UTF-8 < $f.old > $f; rm $f.old
+%fix_encoding $f
 cp -p $f %{buildroot}%{why_examples_dir}mlw/$f
 done
 
@@ -171,7 +189,7 @@ for d in `find -mindepth 1 -maxdepth 1 -
 mkdir -p %{buildroot}%{why_examples_dir}c/$d
 done
 for f in `find -regex '.*\.c'`; do
-dos2unix $f; mv $f $f.old; iconv -f ISO-8859-1 -t UTF-8 < $f.old > $f; rm $f.old
+%fix_encoding $f
 cp -p $f %{buildroot}%{why_examples_dir}c/$f
 done
 
@@ -209,6 +227,8 @@ rm -rf %{buildroot}
 %{why_data_dir}/gwhy-icon.png
 %{_datadir}/applications/fedora-gwhy.desktop
 
+%if 0%{?has_coq} == 1
+
 %files coq
 %defattr(-,root,root,-)
 %dir %{_datadir}/coq
@@ -224,7 +244,19 @@ rm -rf %{buildroot}
 %{_datadir}/coq/jessie_why.v*
 %doc README.why-coq.Fedora
 
+%endif
+
 %changelog
+* Fri Aug 07 2009 Alan Dunn <amdunn at gmail.com> - 2.17-4
+- Removed now irrelevant check for no OCaml in Fedora < 9 (those
+  distributions are EOL)
+- Changed ExcludeArch to proper Fedora versions
+- Builds coq subpackage exactly when Coq can be built, thus making
+  build independent of whether Coq can be built
+- define -> global
+- Fixed accidental use of in tar ocamlgraph instead of one that is
+  separately packaged
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mathstuf at fedoraproject.org  Sat Aug  8 02:36:08 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sat,  8 Aug 2009 02:36:08 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.18, 1.19
Message-ID: <20090808023608.6F19F11C00D7@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5300

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch 
Log Message:
Backport fix for lancelot kde#196809

kdeplasma-addons-4.3.0-lancelot-kde#196809.patch:
 ContactsKopete.cpp |  104 +++++++++++++++++++++++++++++++++++++----------------
 ContactsKopete.h   |    8 ++--
 2 files changed, 78 insertions(+), 34 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.0-lancelot-kde#196809.patch ---
Index: applets/lancelot/app/src/models/ContactsKopete.h
===================================================================
--- applets/lancelot/app/src/models/ContactsKopete.h	(revision 1008266)
+++ applets/lancelot/app/src/models/ContactsKopete.h	(revision 1008267)
@@ -31,19 +31,21 @@
     ContactsKopete();
     ~ContactsKopete();
 
-    void timerEvent(QTimerEvent * event);
-
 protected:
     void activate(int index);
     void load();
+    void load(bool forceReload);
     void updateContactData(const QString & contactId);
+    void timerEvent(QTimerEvent * event);
 
 protected Q_SLOTS:
     void contactChanged(const QString & contactId);
 
 private:
     org::kde::Kopete * m_interface;
-    QBasicTimer m_timer;
+    QBasicTimer m_delayTimer;
+    QBasicTimer m_checkRunningTimer;
+    QStringList m_contactsToUpdate;
     QString m_kopeteAvatarsDir;
     bool m_kopeteRunning : 1;
     bool m_noOnlineContacts : 1;
Index: applets/lancelot/app/src/models/ContactsKopete.cpp
===================================================================
--- applets/lancelot/app/src/models/ContactsKopete.cpp	(revision 1008266)
+++ applets/lancelot/app/src/models/ContactsKopete.cpp	(revision 1008267)
@@ -25,11 +25,12 @@
 
 // #define UPDATE_INTERVAL 15000
 #define CHECK_RUNNING_INTERVAL 5000
+#define DELAY_INTERVAL 500
 
 namespace Models {
 
 ContactsKopete::ContactsKopete()
-    : m_interface(NULL), m_kopeteRunning(true)
+    : m_interface(NULL), m_kopeteRunning(false)
 {
     setSelfTitle(i18n("Contacts"));
     setSelfIcon(KIcon("kopete"));
@@ -40,14 +41,27 @@
     m_kopeteAvatarsDir = KStandardDirs::locate(
             "data", "kopete/avatars/Contacts/");
 
-    m_timer.start(CHECK_RUNNING_INTERVAL, this);
+    m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this);
     load();
 }
 
 void ContactsKopete::timerEvent(QTimerEvent * event)
 {
-    if (event->timerId() == m_timer.timerId()) {
+    if (event->timerId() == m_checkRunningTimer.timerId()) {
         load();
+    } else if (event->timerId() == m_delayTimer.timerId()) {
+        qDebug() << "ContactsKopete::contactChanged [delayed]:"
+            << m_contactsToUpdate.size();
+        m_delayTimer.stop();
+        // checking whether we have a large update
+        if (m_contactsToUpdate.size() > 5) {
+            load(true);
+        } else {
+            foreach(QString contact, m_contactsToUpdate) {
+                updateContactData(contact);
+            }
+        }
+        m_contactsToUpdate.clear();
     }
 }
 
@@ -70,42 +84,65 @@
 
 void ContactsKopete::load()
 {
+    load(false);
+}
+
+void ContactsKopete::load(bool forceReload)
+{
     setEmitInhibited(true);
-    clear();
+    bool statusChanged = false;
+    // clear();
 
     if (!m_interface->isValid()) {
-        m_kopeteRunning = false;
-        m_timer.start(CHECK_RUNNING_INTERVAL, this);
+        if (m_kopeteRunning) {
+            qDebug() << "ContactsKopete::disconnecting D-Bus";
+            disconnect(m_interface, SIGNAL(contactChanged(const QString &)),
+                    this, SLOT(contactChanged(const QString &)));
+            statusChanged = true;
+        }
 
-        if (addService("kopete")) {
-            Item * item = const_cast < Item * > (& itemAt(0));
-            item->title = i18n("Messaging client");
-            item->description = i18n("Messaging client is not running");
-        } else {
-            add(i18n("Unable to find Kopete"), "",
-                    KIcon("application-x-executable"), QVariant("http://kopete.kde.org"));
+        if (forceReload || statusChanged) {
+            clear();
+            m_kopeteRunning = false;
+            m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this);
+
+            if (addService("kopete")) {
+                Item * item = const_cast < Item * > (& itemAt(0));
+                item->title = i18n("Messaging client");
+                item->description = i18n("Messaging client is not running");
+            } else {
+                add(i18n("Unable to find Kopete"), "",
+                        KIcon("application-x-executable"), QVariant("http://kopete.kde.org"));
+            }
         }
     } else {
-        connect(m_interface, SIGNAL(contactChanged(const QString &)),
-                this, SLOT(contactChanged(const QString &)));
+        if (!m_kopeteRunning) {
+            qDebug() << "ContactsKopete::connecting D-Bus";
+            connect(m_interface, SIGNAL(contactChanged(const QString &)),
+                    this, SLOT(contactChanged(const QString &)));
+            statusChanged = true;
+        }
 
-        m_kopeteRunning = true;
-        m_noOnlineContacts = false;
-        // m_timer.start(UPDATE_INTERVAL, this);
+        if (forceReload || statusChanged) {
+            qDebug() << "ContactsKopete::load: full";
+            clear();
+            m_kopeteRunning = true;
+            m_noOnlineContacts = false;
 
-        QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online");
-        if (!contacts.isValid()) {
-            m_kopeteRunning = false;
-            return;
-        }
+            QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online");
+            if (!contacts.isValid()) {
+                m_kopeteRunning = false;
+                return;
+            }
 
-        foreach (const QString& contact, contacts.value()) {
-             updateContactData(contact);
-        }
+            foreach (const QString& contact, contacts.value()) {
+                 updateContactData(contact);
+            }
 
-        if (size() == 0) {
-            add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant());
-            m_noOnlineContacts = true;
+            if (size() == 0) {
+                add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant());
+                m_noOnlineContacts = true;
+            }
         }
     }
     setEmitInhibited(false);
@@ -177,8 +214,13 @@
 
 void ContactsKopete::contactChanged(const QString & contactId)
 {
-    qDebug() << "ContactsKopete::contactChanged:" << contactId;
-    updateContactData(contactId);
+    // qDebug() << "ContactsKopete::contactChanged:" << contactId;
+    // updateContactData(contactId);
+    // delaying the update
+    if (!m_contactsToUpdate.contains(contactId)) {
+        m_contactsToUpdate << contactId;
+    }
+    m_delayTimer.start(DELAY_INTERVAL, this);
 }
 
 } // namespace Models


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- kdeplasma-addons.spec	5 Aug 2009 13:04:05 -0000	1.18
+++ kdeplasma-addons.spec	8 Aug 2009 02:36:08 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,6 +15,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
+# Backported from 4.3 branch
+# Commit 1008267
+Patch101: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -71,6 +74,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch101 -p0
 
 
 %build
@@ -156,6 +160,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
+- Waited for newRepo task
+
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-7
+- Rebuild for mising rawhide oxygen-icon-theme
+- Fix patch comments
+
+* Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-6
+- Add patch to fix kde#196809
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From amdunn at fedoraproject.org  Sat Aug  8 02:52:26 2009
From: amdunn at fedoraproject.org (Alan Dunn)
Date: Sat,  8 Aug 2009 02:52:26 +0000 (UTC)
Subject: rpms/ocaml-ocamlgraph/devel ocamlgraph-1.1-no-view-graph-doc.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1,
	1.2 ocaml-ocamlgraph.spec, 1.8, 1.9 sources, 1.3,
	1.4 ocamlgraph-1.0-no-view-graph-doc.patch, 1.1, NONE
Message-ID: <20090808025226.3EFC811C00D7@cvs1.fedora.phx.redhat.com>

Author: amdunn

Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9441/devel

Modified Files:
	.cvsignore import.log ocaml-ocamlgraph.spec sources 
Added Files:
	ocamlgraph-1.1-no-view-graph-doc.patch 
Removed Files:
	ocamlgraph-1.0-no-view-graph-doc.patch 
Log Message:
* 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).


ocamlgraph-1.1-no-view-graph-doc.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ocamlgraph-1.1-no-view-graph-doc.patch ---
--- ocamlgraph-1.1/Makefile.in.orig	2009-08-07 22:07:11.000000000 -0400
+++ ocamlgraph-1.1/Makefile.in	2009-08-07 22:07:29.000000000 -0400
@@ -298,7 +298,7 @@
 	mkdir -p doc
 	rm -f doc/*
 	$(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC)
-	$(MAKE) -C $(VIEWER_DIR) doc
+#	$(MAKE) -C $(VIEWER_DIR) doc
 
 # literate programming
 $(NAME).tex: $(DOC_SRC)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Nov 2008 16:49:18 -0000	1.3
+++ .cvsignore	8 Aug 2009 02:52:25 -0000	1.4
@@ -1 +1 @@
-ocamlgraph-1.0.tar.gz
+ocamlgraph-1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Aug 2008 20:48:48 -0000	1.1
+++ import.log	8 Aug 2009 02:52:25 -0000	1.2
@@ -1 +1,2 @@
 ocaml-ocamlgraph-0_99c-2_fc9:HEAD:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524338
+ocaml-ocamlgraph-1_1-1_fc10:HEAD:ocaml-ocamlgraph-1.1-1.fc10.src.rpm:1249699549


Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/ocaml-ocamlgraph.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-ocamlgraph.spec	25 Jul 2009 20:00:48 -0000	1.8
+++ ocaml-ocamlgraph.spec	8 Aug 2009 02:52:26 -0000	1.9
@@ -17,23 +17,23 @@
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
-Name:		ocaml-ocamlgraph
-Version:	1.0
-Release:	6%{?dist}
-Summary:	OCaml library for arc and node graphs
+Name:           ocaml-ocamlgraph
+Version:        1.1
+Release:        1%{?dist}
+Summary:        OCaml library for arc and node graphs
 
-Group:		Development/Libraries
-License:	LGPLv2 with exceptions
+Group:          Development/Libraries
+License:        LGPLv2 with exceptions
 
-URL:		http://ocamlgraph.lri.fr/
-Source0:	http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
-Source1:	ocamlgraph-test.result
+URL:            http://ocamlgraph.lri.fr/
+Source0:        http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
+Source1:        ocamlgraph-test.result
 
-Patch0:         ocamlgraph-1.0-no-view-graph-doc.patch
+Patch0:         ocamlgraph-1.1-no-view-graph-doc.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
-BuildRequires:	ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  gtk2-devel, libgnomecanvas-devel
 
@@ -50,13 +50,13 @@ Language file format and Dot and Neato g
 tools.
 
 
-%package	devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 
-%description	devel
+%description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
@@ -131,6 +131,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2008 16:49:18 -0000	1.3
+++ sources	8 Aug 2009 02:52:26 -0000	1.4
@@ -1 +1 @@
-65dfcab73bc15776f7547860a78d682a  ocamlgraph-1.0.tar.gz
+62cf4b0c273db2af1dbf4f8fac957bfc  ocamlgraph-1.1.tar.gz


--- ocamlgraph-1.0-no-view-graph-doc.patch DELETED ---



From jstanley at fedoraproject.org  Sat Aug  8 02:59:02 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sat,  8 Aug 2009 02:59:02 +0000 (UTC)
Subject: rpms/trac-tickettemplate-plugin/F-10 README.license, NONE,
	1.1 import.log, NONE, 1.1 trac-tickettemplate-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808025902.4783311C00D7@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-tickettemplate-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11394/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.license import.log trac-tickettemplate-plugin.spec 
Log Message:
Initial import



--- NEW FILE README.license ---
                                                                                                                                                                                                                                                               
Delivered-To: jonstanley at gmail.com
Received: by 10.231.37.136 with SMTP id x8cs140695ibd;
        Thu, 6 Aug 2009 20:07:20 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.100.121.14 with SMTP id t14mr5736578anc.129.1249614440016; 
	Thu, 06 Aug 2009 20:07:20 -0700 (PDT)
In-Reply-To: <9de9792e0908061943y6c05633cw2fc38079470d8232 at mail.gmail.com>
References: <da159fda0908061906v35b0aci6cf4f559f78d3b8d at mail.gmail.com>
	 <9de9792e0908061943y6c05633cw2fc38079470d8232 at mail.gmail.com>
Date: Fri, 7 Aug 2009 11:07:19 +0800
Message-ID: <9de9792e0908062007v287219dbkceb49f65b85515d5 at mail.gmail.com>
Subject: Re: Trac ticket template plugin - licensing question
From: Richard Liao <richard.liao.i at gmail.com>
To: Jon Stanley <jonstanley at gmail.com>
Content-Type: text/plain; charset=GB2312
Content-Transfer-Encoding: quoted-printable

2009/8/7 Richard Liao <richard.liao.i at gmail.com>:
> The license is LGPLv2.1. I have updated license line in setup.py
> See also: http://trac-hacks.org/changeset/6330
>
Studied LGPLv2.1, I think BSD license should be more applicable to this plu=
gin.
See also: http://trac-hacks.org/changeset/6332

> On Fri, Aug 7, 2009 at 10:06 AM, Jon Stanley<jonstanley at gmail.com> wrote:
>> In setup.py, you mention that the license is BSD, yet there is a
>> license.txt which gives the text of LGPLv2.  No source files have a
>> notice stating which license they are under (which they should,
>> independently of any confusion).  Which one is accurate and which
>> license is this plugin released under?  And what version(s) of LGPL if
>> that indeed is the license (simply including the text of a license
>> with no further explanation is legally ineffective and in the case of
>> the GPL family of licenses, does not restrict us to that version).  If
>> that's what you intended, it needs to be explicitly stated.
>>
>> The context of the questions is that I'm attempting to package this
>> for inclusion into Fedora.
>>
>> Thanks!
>> -Jon
>>
>
>
>
> --
> '''=B9=FD=B3=CC=B8=C4=BD=F8=C4=CB=CA=C7=B4=DF=C9=FA=BF=C9=B4=D9=C9=FA=BF=
=BF=C6=D7=B5=C4=C8=CB=B5=C4=D7=E9=D6=AF!'''
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> =C8=ED=BC=FE=CA=C2=D2=B5=B2=BF - =D1=D0=B7=A2=B9=DC=C0=ED=D6=D0=D0=C4 - S=
PEG http://trac.rdev.kingsoft.net/kspeg
> Mr. Richard - =C1=CE=BD=DC <LiaoJie AT kingsoft.com> 13750037331
> =D3=CA=B1=E0: 519015            ; =B5=D8=D6=B7: =D6=E9=BA=A3=CA=D0=BC=AA=
=B4=F3=C1=AB=C9=BD=CF=EF8=BA=C5=BD=F0=C9=BD=C8=ED=BC=FE=B4=F3=CF=C3 F12
> =B5=E7=BB=B0: 0756-3335688-2756 ; =B4=AB=D5=E6: 0756-3335268
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>



--=20
'''=B9=FD=B3=CC=B8=C4=BD=F8=C4=CB=CA=C7=B4=DF=C9=FA=BF=C9=B4=D9=C9=FA=BF=BF=
=C6=D7=B5=C4=C8=CB=B5=C4=D7=E9=D6=AF!'''
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
=C8=ED=BC=FE=CA=C2=D2=B5=B2=BF - =D1=D0=B7=A2=B9=DC=C0=ED=D6=D0=D0=C4 - SPE=
G http://trac.rdev.kingsoft.net/kspeg
Mr. Richard - =C1=CE=BD=DC <LiaoJie AT kingsoft.com> 13750037331
=D3=CA=B1=E0: 519015            ; =B5=D8=D6=B7: =D6=E9=BA=A3=CA=D0=BC=AA=B4=
=F3=C1=AB=C9=BD=CF=EF8=BA=C5=BD=F0=C9=BD=C8=ED=BC=FE=B4=F3=CF=C3 F12
=B5=E7=BB=B0: 0756-3335688-2756 ; =B4=AB=D5=E6: 0756-3335268
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



--- NEW FILE import.log ---
trac-tickettemplate-plugin-0_5-0_1_svn6332_fc10:F-10:trac-tickettemplate-plugin-0.5-0.1.svn6332.fc10.src.rpm:1249700369


--- NEW FILE trac-tickettemplate-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           trac-tickettemplate-plugin
Version:        0.5
Release:        0.1.svn6332%{?dist}
Summary:        Allow for ticket templating

Group:          Applications/Internet
# Licensing situation unclear, BSD per email from upstream, included in %%doc
License:        BSD
URL:            http://trac-hacks.org/wiki/TracTicketTemplatePlugin
# Produce via 'svn export -r6332 http://trac-hacks.org/svn/tractickettemplateplugin/0.10 tractickettemplateplugin-0.10'
# tar -czvf trac-tractickettemplateplugin-0.10.svn6329.tar.gz tractickettemplateplugin-0.10
Source0:        trac-tractickettemplateplugin-0.10.svn6332.tar.gz
Source1:        README.license
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools
Requires:       trac >= 0.10
# Only for 0.10
Requires:       trac-webadmin

%description
A trac plugin to allow for ticket templates to be defined via the web admin
interface

%prep
%setup -q -n tractickettemplateplugin-0.10
cp %{SOURCE1} .

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# Remove the documentation files that got installed
rm $RPM_BUILD_ROOT%{python_sitelib}/tickettemplate/readme.txt
rm $RPM_BUILD_ROOT%{python_sitelib}/tickettemplate/version.txt
rm $RPM_BUILD_ROOT%{python_sitelib}/tickettemplate/changelog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%doc tickettemplate/readme.txt tickettemplate/changelog.txt tickettemplate/version.txt README.license

%changelog
* Thu Aug 6 2009 Jon Stanley <jonstanley at gmail.com> - 0.5-0.1.svn6332
- Include README.license, move to new SVN checkout to clear up licensing

* Thu Aug 6 2009 Jon Stanley <jonstanley at gmail.com> - 0.5-0.1.svn6329
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tickettemplate-plugin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:04:09 -0000	1.1
+++ .cvsignore	8 Aug 2009 02:59:01 -0000	1.2
@@ -0,0 +1 @@
+trac-tractickettemplateplugin-0.10.svn6332.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tickettemplate-plugin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:04:09 -0000	1.1
+++ sources	8 Aug 2009 02:59:02 -0000	1.2
@@ -0,0 +1 @@
+549785af69ab8d6694aee19788a2c18d  trac-tractickettemplateplugin-0.10.svn6332.tar.gz



From jstanley at fedoraproject.org  Sat Aug  8 03:00:22 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sat,  8 Aug 2009 03:00:22 +0000 (UTC)
Subject: rpms/trac-tickettemplate-plugin/EL-5 README.license, NONE,
	1.1 trac-tickettemplate-plugin.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090808030022.7E54011C0439@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-tickettemplate-plugin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11795

Modified Files:
	sources 
Added Files:
	README.license trac-tickettemplate-plugin.spec 
Log Message:
Initial import for EL-5



--- NEW FILE README.license ---
                                                                                                                                                                                                                                                               
Delivered-To: jonstanley at gmail.com
Received: by 10.231.37.136 with SMTP id x8cs140695ibd;
        Thu, 6 Aug 2009 20:07:20 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.100.121.14 with SMTP id t14mr5736578anc.129.1249614440016; 
	Thu, 06 Aug 2009 20:07:20 -0700 (PDT)
In-Reply-To: <9de9792e0908061943y6c05633cw2fc38079470d8232 at mail.gmail.com>
References: <da159fda0908061906v35b0aci6cf4f559f78d3b8d at mail.gmail.com>
	 <9de9792e0908061943y6c05633cw2fc38079470d8232 at mail.gmail.com>
Date: Fri, 7 Aug 2009 11:07:19 +0800
Message-ID: <9de9792e0908062007v287219dbkceb49f65b85515d5 at mail.gmail.com>
Subject: Re: Trac ticket template plugin - licensing question
From: Richard Liao <richard.liao.i at gmail.com>
To: Jon Stanley <jonstanley at gmail.com>
Content-Type: text/plain; charset=GB2312
Content-Transfer-Encoding: quoted-printable

2009/8/7 Richard Liao <richard.liao.i at gmail.com>:
> The license is LGPLv2.1. I have updated license line in setup.py
> See also: http://trac-hacks.org/changeset/6330
>
Studied LGPLv2.1, I think BSD license should be more applicable to this plu=
gin.
See also: http://trac-hacks.org/changeset/6332

> On Fri, Aug 7, 2009 at 10:06 AM, Jon Stanley<jonstanley at gmail.com> wrote:
>> In setup.py, you mention that the license is BSD, yet there is a
>> license.txt which gives the text of LGPLv2.  No source files have a
>> notice stating which license they are under (which they should,
>> independently of any confusion).  Which one is accurate and which
>> license is this plugin released under?  And what version(s) of LGPL if
>> that indeed is the license (simply including the text of a license
>> with no further explanation is legally ineffective and in the case of
>> the GPL family of licenses, does not restrict us to that version).  If
>> that's what you intended, it needs to be explicitly stated.
>>
>> The context of the questions is that I'm attempting to package this
>> for inclusion into Fedora.
>>
>> Thanks!
>> -Jon
>>
>
>
>
> --
> '''=B9=FD=B3=CC=B8=C4=BD=F8=C4=CB=CA=C7=B4=DF=C9=FA=BF=C9=B4=D9=C9=FA=BF=
=BF=C6=D7=B5=C4=C8=CB=B5=C4=D7=E9=D6=AF!'''
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> =C8=ED=BC=FE=CA=C2=D2=B5=B2=BF - =D1=D0=B7=A2=B9=DC=C0=ED=D6=D0=D0=C4 - S=
PEG http://trac.rdev.kingsoft.net/kspeg
> Mr. Richard - =C1=CE=BD=DC <LiaoJie AT kingsoft.com> 13750037331
> =D3=CA=B1=E0: 519015            ; =B5=D8=D6=B7: =D6=E9=BA=A3=CA=D0=BC=AA=
=B4=F3=C1=AB=C9=BD=CF=EF8=BA=C5=BD=F0=C9=BD=C8=ED=BC=FE=B4=F3=CF=C3 F12
> =B5=E7=BB=B0: 0756-3335688-2756 ; =B4=AB=D5=E6: 0756-3335268
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>



--=20
'''=B9=FD=B3=CC=B8=C4=BD=F8=C4=CB=CA=C7=B4=DF=C9=FA=BF=C9=B4=D9=C9=FA=BF=BF=
=C6=D7=B5=C4=C8=CB=B5=C4=D7=E9=D6=AF!'''
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
=C8=ED=BC=FE=CA=C2=D2=B5=B2=BF - =D1=D0=B7=A2=B9=DC=C0=ED=D6=D0=D0=C4 - SPE=
G http://trac.rdev.kingsoft.net/kspeg
Mr. Richard - =C1=CE=BD=DC <LiaoJie AT kingsoft.com> 13750037331
=D3=CA=B1=E0: 519015            ; =B5=D8=D6=B7: =D6=E9=BA=A3=CA=D0=BC=AA=B4=
=F3=C1=AB=C9=BD=CF=EF8=BA=C5=BD=F0=C9=BD=C8=ED=BC=FE=B4=F3=CF=C3 F12
=B5=E7=BB=B0: 0756-3335688-2756 ; =B4=AB=D5=E6: 0756-3335268
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



--- NEW FILE trac-tickettemplate-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           trac-tickettemplate-plugin
Version:        0.5
Release:        0.1.svn6332%{?dist}
Summary:        Allow for ticket templating

Group:          Applications/Internet
# Licensing situation unclear, BSD per email from upstream, included in %%doc
License:        BSD
URL:            http://trac-hacks.org/wiki/TracTicketTemplatePlugin
# Produce via 'svn export -r6332 http://trac-hacks.org/svn/tractickettemplateplugin/0.10 tractickettemplateplugin-0.10'
# tar -czvf trac-tractickettemplateplugin-0.10.svn6329.tar.gz tractickettemplateplugin-0.10
Source0:        trac-tractickettemplateplugin-0.10.svn6332.tar.gz
Source1:        README.license
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools
Requires:       trac >= 0.10
# Only for 0.10
Requires:       trac-webadmin

%description
A trac plugin to allow for ticket templates to be defined via the web admin
interface

%prep
%setup -q -n tractickettemplateplugin-0.10
cp %{SOURCE1} .

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
# Remove the documentation files that got installed
rm $RPM_BUILD_ROOT%{python_sitelib}/tickettemplate/readme.txt
rm $RPM_BUILD_ROOT%{python_sitelib}/tickettemplate/version.txt
rm $RPM_BUILD_ROOT%{python_sitelib}/tickettemplate/changelog.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%doc tickettemplate/readme.txt tickettemplate/changelog.txt tickettemplate/version.txt README.license

%changelog
* Thu Aug 6 2009 Jon Stanley <jonstanley at gmail.com> - 0.5-0.1.svn6332
- Include README.license, move to new SVN checkout to clear up licensing

* Thu Aug 6 2009 Jon Stanley <jonstanley at gmail.com> - 0.5-0.1.svn6329
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tickettemplate-plugin/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:04:09 -0000	1.1
+++ sources	8 Aug 2009 03:00:22 -0000	1.2
@@ -0,0 +1 @@
+549785af69ab8d6694aee19788a2c18d  trac-tractickettemplateplugin-0.10.svn6332.tar.gz



From mitr at fedoraproject.org  Sat Aug  8 03:34:48 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Sat,  8 Aug 2009 03:34:48 +0000 (UTC)
Subject: rpms/volume_key/devel volume_key-0.2-libblkid-type.patch, NONE,
	1.1 volume_key.spec, 1.2, 1.3
Message-ID: <20090808033448.341AB11C00D7@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20176

Modified Files:
	volume_key.spec 
Added Files:
	volume_key-0.2-libblkid-type.patch 
Log Message:
* Sat Aug  8 2009 Miloslav Trma? <mitr at redhat.com> - 0.2-3
- Handle changed "TYPE=crypto_LUKS" from libblkid
- Preserve file timestamps during installation


volume_key-0.2-libblkid-type.patch:
 volume.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE volume_key-0.2-libblkid-type.patch ---
diff --git a/lib/volume.c b/lib/volume.c
index 91c9dbc..62fc6ec 100644
--- a/lib/volume.c
+++ b/lib/volume.c
@@ -311,7 +311,11 @@ libvk_volume_open (const char *path, GError **error)
     }
   vol = g_new (struct libvk_volume, 1);
   vol->source = VOLUME_SOURCE_LOCAL;
-  vol->format = g_strdup (c);
+  /* The LUKS type identifier returned by blkid has changed. */
+  if (strcmp (c, "crypto_LUKS") == 0)
+    vol->format = g_strdup (LIBVK_VOLUME_FORMAT_LUKS);
+  else
+    vol->format = g_strdup (c);
   free (c);
 
   vol->hostname = g_strdup (g_get_host_name ());


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- volume_key.spec	27 Jul 2009 06:58:12 -0000	1.2
+++ volume_key.spec	8 Aug 2009 03:34:48 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.2
-Release: 2
+Release: 3
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
@@ -13,6 +13,7 @@ Source0: https://fedorahosted.org/releas
 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-1.0.7-rc1.tar.bz2
 # http://code.google.com/p/cryptsetup/issues/detail?id=15
 Patch0: https://fedorahosted.org/releases/v/o/volume_key/cryptsetup-svn-r62.patch
+Patch1: volume_key-0.2-libblkid-type.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: gettext-devel, glib2-devel, gnupg, gpgme-devel, libblkid-devel
 BuildRequires: nss-devel, python-devel
@@ -81,6 +82,7 @@ for other formats is possible, some form
 
 %prep
 %setup -q -a 1
+%patch1 -p1 -b .libblkid-type
 pushd cryptsetup-1.0.7-rc1
 %patch0 -p0 -b .cs-vk
 popd
@@ -91,7 +93,7 @@ cryptsetup_root=$(pwd)/cryptsetup-root
 pushd cryptsetup-1.0.7-rc1
 %configure --enable-static --disable-shared --with-pic
 make %{?_smp_mflags}
-make install "DESTDIR=$cryptsetup_root" INSTALL='install -p'
+make install "DESTDIR=$cryptsetup_root"
 popd
 
 %configure "CPPFLAGS=-I$cryptsetup_root"%{_includedir} \
@@ -101,7 +103,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'
 
 %find_lang volume_key
 
@@ -135,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Sat Aug  8 2009 Miloslav Trma? <mitr at redhat.com> - 0.2-3
+- Handle changed "TYPE=crypto_LUKS" from libblkid
+- Preserve file timestamps during installation
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bskeggs at fedoraproject.org  Sat Aug  8 03:44:40 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Sat,  8 Aug 2009 03:44:40 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-11 rh508970.patch, NONE,
	1.1 xorg-x11-drv-nouveau.spec, 1.53, 1.54
Message-ID: <20090808034440.0F7B511C00D7@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22943

Modified Files:
	xorg-x11-drv-nouveau.spec 
Added Files:
	rh508970.patch 
Log Message:
* Sat Aug 8 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-41.20090528git0c17b87
- rh#508970: fix for minor corruption at depth 16



rh508970.patch:
 nv04_exa.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE rh508970.patch ---
>From 712064e6188d65e2c7d85078b95a0292edcad0e7 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Wed, 5 Aug 2009 14:00:51 +1000
Subject: [PATCH] nv04-nv40/exa: set cliprect to drawing area for IFC

---
 src/nv04_exa.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nv04_exa.c b/src/nv04_exa.c
index de5da67..132c9d5 100644
--- a/src/nv04_exa.c
+++ b/src/nv04_exa.c
@@ -321,8 +321,8 @@ NV04EXAUploadIFC(ScrnInfoPtr pScrn, const char *src, int src_pitch,
 		return FALSE;
 
 	BEGIN_RING(chan, clip, NV01_CONTEXT_CLIP_RECTANGLE_POINT, 2);
-	OUT_RING  (chan, 0x0); 
-	OUT_RING  (chan, 0x7FFF7FFF);
+	OUT_RING  (chan, (y << 16) | x);
+	OUT_RING  (chan, (h << 16) | w);
 	BEGIN_RING(chan, ifc, NV01_IMAGE_FROM_CPU_OPERATION, 2);
 	OUT_RING  (chan, NV01_IMAGE_FROM_CPU_OPERATION_SRCCOPY);
 	OUT_RING  (chan, ifc_fmt);
-- 
1.6.4



Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xorg-x11-drv-nouveau.spec	18 Jun 2009 15:06:29 -0000	1.53
+++ xorg-x11-drv-nouveau.spec	8 Aug 2009 03:44:39 -0000	1.54
@@ -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:   40.%{snapshot}%{?dist}
+Release:   41.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -50,6 +50,7 @@ Patch5: dcbconf_7_4_ignore.diff
 Patch6: nouveau-fb-resize.patch
 Patch7: nouveau-bicubic-2x.patch
 Patch8: nv50-pramin-vbios.patch
+Patch9: rh508970.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -66,6 +67,7 @@ X.Org X11 nouveau video driver.
 %patch6 -p1 -b .fbresize
 %patch7 -p1 -b .bicubic
 %patch8 -p1 -b .pramin_bios
+%patch9 -p1 -b .rh508970
 
 %build
 autoreconf -v --install
@@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sat Aug 8 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-41.20090528git0c17b87
+- rh#508970: fix for minor corruption at depth 16
+
 * Fri Jun 19 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-40.20090528git0c17b87
 - correct thinko in pramin vbios patch
 



From cweyl at fedoraproject.org  Sat Aug  8 04:00:42 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 04:00:42 +0000 (UTC)
Subject: rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel .cvsignore, 1.5, 
	1.6 perl-MooseX-Emulate-Class-Accessor-Fast.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090808040042.56E2411C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26117

Modified Files:
	.cvsignore perl-MooseX-Emulate-Class-Accessor-Fast.spec 
	sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00902-1
- auto-update to 0.00902 (by cpan-spec-update 0.01)
- altered br on perl(Moose) (0.74 => 0.84)
- added a new req on perl(Moose) (version 0.84)
- added a new req on perl(namespace::clean) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 May 2009 07:14:33 -0000	1.5
+++ .cvsignore	8 Aug 2009 04:00:42 -0000	1.6
@@ -1 +1 @@
-MooseX-Emulate-Class-Accessor-Fast-0.00900.tar.gz
+MooseX-Emulate-Class-Accessor-Fast-0.00902.tar.gz


Index: perl-MooseX-Emulate-Class-Accessor-Fast.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/perl-MooseX-Emulate-Class-Accessor-Fast.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-MooseX-Emulate-Class-Accessor-Fast.spec	26 Jul 2009 11:26:04 -0000	1.7
+++ perl-MooseX-Emulate-Class-Accessor-Fast.spec	8 Aug 2009 04:00:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Emulate-Class-Accessor-Fast
-Version:    0.00900
-Release:    2%{?dist}
+Version:    0.00902
+Release:    1%{?dist}
 # lib/MooseX/Adopt/Class/Accessor/Fast.pm -> GPL+ or Artistic
 # lib/MooseX/Emulate/Class/Accessor/Fast.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -13,7 +13,7 @@ Requires:   perl(:MODULE_COMPAT_%(eval "
 BuildArch:  noarch
 
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(Moose)               >= 0.74
+BuildRequires: perl(Moose)               >= 0.84
 BuildRequires: perl(Moose::Role)
 BuildRequires: perl(namespace::clean)
 # tests
@@ -21,6 +21,9 @@ BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Exception)
 BuildRequires: perl(Class::Accessor::Fast)
 
+### auto-added reqs!
+Requires:  perl(Moose) >= 0.84
+Requires:  perl(namespace::clean)
 
 %description
 This module attempts to emulate the behavior of Class::Accessor::Fast
@@ -60,6 +63,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.00902-1
+- auto-update to 0.00902 (by cpan-spec-update 0.01)
+- altered br on perl(Moose) (0.74 => 0.84)
+- added a new req on perl(Moose) (version 0.84)
+- added a new req on perl(namespace::clean) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.00900-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Emulate-Class-Accessor-Fast/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 May 2009 07:14:34 -0000	1.5
+++ sources	8 Aug 2009 04:00:42 -0000	1.6
@@ -1 +1 @@
-36ed235d4d2d9759c24a99358eb471e6  MooseX-Emulate-Class-Accessor-Fast-0.00900.tar.gz
+4fa57ee9110fe6e868b8625a9e47b50c  MooseX-Emulate-Class-Accessor-Fast-0.00902.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 04:19:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 04:19:33 +0000 (UTC)
Subject: rpms/perl-MooseX-Params-Validate/devel .cvsignore, 1.8,
	1.9 perl-MooseX-Params-Validate.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090808041933.4495111C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17095

Modified Files:
	.cvsignore perl-MooseX-Params-Validate.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
- auto-update to 0.12 (by cpan-spec-update 0.01)
- added a new br on perl(Carp) (version 0)
- added a new br on perl(Devel::Caller) (version 0)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(Devel::Caller) (version 0)
- added a new req on perl(Moose) (version 0.58)
- added a new req on perl(Params::Validate) (version 0.88)
- added a new req on perl(Scalar::Util) (version 0)
- added a new req on perl(Sub::Exporter) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Apr 2009 20:28:29 -0000	1.8
+++ .cvsignore	8 Aug 2009 04:19:31 -0000	1.9
@@ -1 +1 @@
-MooseX-Params-Validate-0.09.tar.gz
+MooseX-Params-Validate-0.12.tar.gz


Index: perl-MooseX-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/perl-MooseX-Params-Validate.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-MooseX-Params-Validate.spec	26 Jul 2009 11:29:27 -0000	1.11
+++ perl-MooseX-Params-Validate.spec	8 Aug 2009 04:19:31 -0000	1.12
@@ -1,16 +1,18 @@
 Name:           perl-MooseX-Params-Validate
-Version:        0.09
-Release:        2%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Extension of Params::Validate using Moose's types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MooseX-Params-Validate/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-%{version}.tar.gz 
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Devel::Caller)
 BuildRequires:  perl(Moose)                 >= 0.58
 BuildRequires:  perl(Params::Validate)      >= 0.88
 BuildRequires:  perl(Scalar::Util)
@@ -19,6 +21,14 @@ BuildRequires:  perl(Sub::Name)
 BuildRequires:  perl(Test::Exception)       >= 0.21
 BuildRequires:  perl(Test::More)            >= 0.62
 
+### auto-added reqs!
+Requires:  perl(Carp)
+Requires:  perl(Devel::Caller)
+Requires:  perl(Moose) >= 0.58
+Requires:  perl(Params::Validate) >= 0.88
+Requires:  perl(Scalar::Util)
+Requires:  perl(Sub::Exporter)
+
 %description
 This module fills a gap in Moose by adding method parameter validation to
 Moose. This is just one of many developing options, it should be considered
@@ -35,7 +45,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} \; 
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
@@ -53,6 +63,18 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
+- auto-update to 0.12 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp) (version 0)
+- added a new br on perl(Devel::Caller) (version 0)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Devel::Caller) (version 0)
+- added a new req on perl(Moose) (version 0.58)
+- added a new req on perl(Params::Validate) (version 0.88)
+- added a new req on perl(Scalar::Util) (version 0)
+- added a new req on perl(Sub::Exporter) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Apr 2009 20:28:29 -0000	1.7
+++ sources	8 Aug 2009 04:19:31 -0000	1.8
@@ -1 +1 @@
-32f356facb51480c1f12d485e749cd08  MooseX-Params-Validate-0.09.tar.gz
+028c58ff0431b45e13f70f9d819e5b67  MooseX-Params-Validate-0.12.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 04:21:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 04:21:46 +0000 (UTC)
Subject: rpms/perl-MooseX-SemiAffordanceAccessor/devel .cvsignore, 1.2,
	1.3 perl-MooseX-SemiAffordanceAccessor.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090808042146.DC69211C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-SemiAffordanceAccessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17554

Modified Files:
	.cvsignore perl-MooseX-SemiAffordanceAccessor.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- auto-update to 0.05 (by cpan-spec-update 0.01)
- altered br on perl(Moose) (0.56 => 0.84)
- added a new req on perl(Moose) (version 0.84)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-SemiAffordanceAccessor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 00:29:28 -0000	1.2
+++ .cvsignore	8 Aug 2009 04:21:46 -0000	1.3
@@ -1 +1 @@
-MooseX-SemiAffordanceAccessor-0.03.tar.gz
+MooseX-SemiAffordanceAccessor-0.05.tar.gz


Index: perl-MooseX-SemiAffordanceAccessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-SemiAffordanceAccessor/devel/perl-MooseX-SemiAffordanceAccessor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-MooseX-SemiAffordanceAccessor.spec	26 Jul 2009 11:30:45 -0000	1.2
+++ perl-MooseX-SemiAffordanceAccessor.spec	8 Aug 2009 04:21:46 -0000	1.3
@@ -1,23 +1,26 @@
-Name:       perl-MooseX-SemiAffordanceAccessor 
-Version:    0.03 
-Release:    2%{?dist}
+Name:       perl-MooseX-SemiAffordanceAccessor
+Version:    0.05
+Release:    1%{?dist}
 # lib/MooseX/SemiAffordanceAccessor.pm -> GPL+ or Artistic
 # lib/MooseX/SemiAffordanceAccessor/Role/Attribute.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Name your accessors foo() and set_foo() 
-Source:     http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-%{version}.tar.gz 
+Summary:    Name your accessors foo() and set_foo()
+Source:     http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-SemiAffordanceAccessor
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Module::Build::Compat)
 #BuildRequires: perl(Moose) >= 0.55_04
-BuildRequires: perl(Moose) >= 0.56
+BuildRequires: perl(Moose) >= 0.84
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:  perl(Moose) >= 0.84
+
 %description
 This module does not provide any methods. Simply loading it changes the
 default naming policy for the loading class so that accessors are
@@ -52,15 +55,20 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README 
+%doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- auto-update to 0.05 (by cpan-spec-update 0.01)
+- altered br on perl(Moose) (0.56 => 0.84)
+- added a new req on perl(Moose) (version 0.84)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -70,4 +78,3 @@ rm -rf %{buildroot} 
 * Sun Jun 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-SemiAffordanceAccessor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 00:29:28 -0000	1.2
+++ sources	8 Aug 2009 04:21:46 -0000	1.3
@@ -1 +1 @@
-1d0b31890f78194fa9dc07bd046b6f54  MooseX-SemiAffordanceAccessor-0.03.tar.gz
+4e917185d50a0de2dc9942a643eb76bd  MooseX-SemiAffordanceAccessor-0.05.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 04:23:12 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 04:23:12 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/devel .cvsignore, 1.8,
	1.9 perl-MooseX-Types.spec, 1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20090808042312.2CF2611C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17898

Modified Files:
	.cvsignore perl-MooseX-Types.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
- auto-update to 0.16 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Jun 2009 02:01:15 -0000	1.8
+++ .cvsignore	8 Aug 2009 04:23:11 -0000	1.9
@@ -1 +1 @@
-MooseX-Types-0.13.tar.gz
+MooseX-Types-0.16.tar.gz


Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/perl-MooseX-Types.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-MooseX-Types.spec	26 Jul 2009 11:32:18 -0000	1.13
+++ perl-MooseX-Types.spec	8 Aug 2009 04:23:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Types
-Version:    0.13
-Release:    2%{?dist}
+Version:    0.16
+Release:    1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
+- auto-update to 0.16 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 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/extras/rpms/perl-MooseX-Types/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Jun 2009 02:01:16 -0000	1.8
+++ sources	8 Aug 2009 04:23:11 -0000	1.9
@@ -1 +1 @@
-486ce06514424fab008e50ef29512c69  MooseX-Types-0.13.tar.gz
+393527bf60ca5b3c48fb1758f066f541  MooseX-Types-0.16.tar.gz



From nb at fedoraproject.org  Sat Aug  8 04:33:35 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sat,  8 Aug 2009 04:33:35 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore,1.4,1.5 sources,1.4,1.5 znc.spec,1.7,1.8
Message-ID: <20090808043335.B045B11C02CB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19638

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade to ZNC 0.075.20090807svn1594



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jul 2009 18:10:45 -0000	1.4
+++ .cvsignore	8 Aug 2009 04:33:34 -0000	1.5
@@ -1 +1 @@
-znc-0.074.tar.gz
+znc-0.075.20090807svn1594.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jul 2009 18:10:45 -0000	1.4
+++ sources	8 Aug 2009 04:33:34 -0000	1.5
@@ -1 +1 @@
-378187acd114769f8f97ef2d4b19da25  znc-0.074.tar.gz
+89bacd3c6ff894c485cdef29cc8f278b  znc-0.075.20090807svn1594.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- znc.spec	27 Jul 2009 09:04:26 -0000	1.7
+++ znc.spec	8 Aug 2009 04:33:34 -0000	1.8
@@ -1,11 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.074
-Release:        2%{?dist}
+Version:        0.075
+Release:        1.20090807svn1594%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
+# SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.20090807svn1594.tar.bz2 
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
 BuildRequires:  openssl-devel >= 0.9.8
@@ -65,29 +67,42 @@ modules.
 %{_includedir}/znc/
 
 %changelog
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807svn1594
+- Upgrade to svn 1594
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
 - Fix date in changelog, disable c-ares
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
 - Backport patch to fix webadmin skins issue introduced in 0.072
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152
+
 * Sun Jul 12 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-7
 - Fix License: to be GPLv2 with exceptions
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-6
 - Fix permissions error in %%prep, not in source
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-5
 - Fix permissions error on q.cpp and add LICENSE.OpenSSL
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-4
 - Remove switch to enable debug, fix %%files section
+
 * Fri Jul 10 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-3
 - Move fixfreenode and log into separate znc-extra package
 - Move awayping into separate znc-awayping package
+
 * Thu Jul 9 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-2
 - Include modules with main package
+
 * Wed Jul 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-1
 - Initial Fedora package based on 0.070 of upstream



From nb at fedoraproject.org  Sat Aug  8 04:43:08 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sat,  8 Aug 2009 04:43:08 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore,1.5,1.6 sources,1.5,1.6 znc.spec,1.8,1.9
Message-ID: <20090808044309.0750311C02CB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21970

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Fix broken source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Aug 2009 04:33:34 -0000	1.5
+++ .cvsignore	8 Aug 2009 04:43:08 -0000	1.6
@@ -1 +1 @@
-znc-0.075.20090807svn1594.tar.bz2
+znc-0.075-2.20090807svn1594.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Aug 2009 04:33:34 -0000	1.5
+++ sources	8 Aug 2009 04:43:08 -0000	1.6
@@ -1 +1 @@
-89bacd3c6ff894c485cdef29cc8f278b  znc-0.075.20090807svn1594.tar.bz2
+813421017497d34ca371e61bfd248410  znc-0.075-2.20090807svn1594.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- znc.spec	8 Aug 2009 04:33:34 -0000	1.8
+++ znc.spec	8 Aug 2009 04:43:08 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        1.20090807svn1594%{?dist}
+Release:        2.20090807svn1594%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
@@ -67,6 +67,9 @@ modules.
 %{_includedir}/znc/
 
 %changelog
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-2.20090807svn1594
+- Fix broken source tarball
+
 * Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807svn1594
 - Upgrade to svn 1594
 



From nb at fedoraproject.org  Sat Aug  8 04:45:34 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sat,  8 Aug 2009 04:45:34 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.9,1.10
Message-ID: <20090808044534.61AFC11C02CB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22427

Modified Files:
	znc.spec 
Log Message:
Fix spec file



Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- znc.spec	8 Aug 2009 04:43:08 -0000	1.9
+++ znc.spec	8 Aug 2009 04:45:34 -0000	1.10
@@ -6,7 +6,7 @@ License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
 # SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.20090807svn1594.tar.bz2 
+Source0:        znc-0.075-2.20090807svn1594.tar.bz2 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl



From nb at fedoraproject.org  Sat Aug  8 05:28:32 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sat,  8 Aug 2009 05:28:32 +0000 (UTC)
Subject: rpms/znc-extra/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 znc-extra.spec, 1.1, 1.2
Message-ID: <20090808052832.389F711C02CB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30254

Modified Files:
	.cvsignore sources znc-extra.spec 
Log Message:
Update to 0.075-1.20090807git



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 04:02:36 -0000	1.2
+++ .cvsignore	8 Aug 2009 05:28:31 -0000	1.3
@@ -1 +1 @@
-znc-extra-0.074.tar.gz
+znc-extra-0.075.20090807git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 04:02:36 -0000	1.2
+++ sources	8 Aug 2009 05:28:31 -0000	1.3
@@ -1 +1 @@
-34c0f43318c8c4a2cfb3a962e1740255  znc-extra-0.074.tar.gz
+536a8414419b698274296a6e87d797e0  znc-extra-0.075.20090807git.tar.bz2


Index: znc-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/devel/znc-extra.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- znc-extra.spec	5 Aug 2009 04:02:36 -0000	1.1
+++ znc-extra.spec	8 Aug 2009 05:28:32 -0000	1.2
@@ -1,11 +1,12 @@
 Summary:        Extra modules for ZNC IRC bouncer
 Name:           znc-extra
-Version:        0.074
+Version:        0.075
 Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz
+# git snapshot 20090807 from git://git.znc.in/?p=psychon/znc-extra.git
+Source0:        znc-extra-0.075.20090807git.tar.bz2
 Requires:       znc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  znc-devel = %{version}
@@ -41,6 +42,9 @@ Extra modules for ZNC IRC bouncer
 %{_datadir}/znc/webadmin/skins/*
 
 %changelog
+* Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807git
+- Update to git snapshot 20090807
+
 * Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074 of znc-extra
 - Restore normal Requires and BuildRequires



From nb at fedoraproject.org  Sat Aug  8 05:29:11 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sat,  8 Aug 2009 05:29:11 +0000 (UTC)
Subject: rpms/znc-extra/devel znc-extra.spec,1.2,1.3
Message-ID: <20090808052911.1B2D811C02CB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30405

Modified Files:
	znc-extra.spec 
Log Message:
Fix SPEC file



Index: znc-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc-extra/devel/znc-extra.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- znc-extra.spec	8 Aug 2009 05:28:32 -0000	1.2
+++ znc-extra.spec	8 Aug 2009 05:29:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:        Extra modules for ZNC IRC bouncer
 Name:           znc-extra
 Version:        0.075
-Release:        1%{?dist}
+Release:        1.20090807git%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/



From nb at fedoraproject.org  Sat Aug  8 05:34:02 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Sat,  8 Aug 2009 05:34:02 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 znc.spec, 1.10,
	1.11
Message-ID: <20090808053402.ECB6C11C02CB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31299

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Modify source tarball name



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Aug 2009 04:43:08 -0000	1.6
+++ .cvsignore	8 Aug 2009 05:34:02 -0000	1.7
@@ -1 +1 @@
-znc-0.075-2.20090807svn1594.tar.bz2
+znc-0.075.20090807svn1594.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Aug 2009 04:43:08 -0000	1.6
+++ sources	8 Aug 2009 05:34:02 -0000	1.7
@@ -1 +1 @@
-813421017497d34ca371e61bfd248410  znc-0.075-2.20090807svn1594.tar.bz2
+813421017497d34ca371e61bfd248410  znc-0.075.20090807svn1594.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- znc.spec	8 Aug 2009 04:45:34 -0000	1.10
+++ znc.spec	8 Aug 2009 05:34:02 -0000	1.11
@@ -1,12 +1,12 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        2.20090807svn1594%{?dist}
+Release:        3.20090807svn1594%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
 # SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075-2.20090807svn1594.tar.bz2 
+Source0:        znc-0.075.20090807svn1594.tar.bz2 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -67,6 +67,9 @@ modules.
 %{_includedir}/znc/
 
 %changelog
+* Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-3.20090807svn1594
+- Fix source filename
+
 * Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-2.20090807svn1594
 - Fix broken source tarball
 



From cweyl at fedoraproject.org  Sat Aug  8 05:54:05 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 05:54:05 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/F-11 perl-MooseX-Types.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090808055405.5CE2411C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3366

Modified Files:
	perl-MooseX-Types.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
- auto-update to 0.16 (by cpan-spec-update 0.01)



Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-11/perl-MooseX-Types.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-MooseX-Types.spec	16 Jun 2009 14:46:57 -0000	1.9
+++ perl-MooseX-Types.spec	8 Aug 2009 05:54:04 -0000	1.10
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-Types
-Version:    0.12
+Version:    0.16
 Release:    1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic
@@ -25,7 +25,7 @@ BuildRequires: perl(Sub::Exporter)
 # for M::I
 BuildRequires: perl(CPAN)
 
-### auto-added brs!
+BuildRequires:  perl(Test::Moose)
 BuildRequires:  perl(Scalar::Util) >= 1.19
 BuildRequires:  perl(Sub::Name)
 
@@ -97,6 +97,16 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
+- auto-update to 0.16 (by cpan-spec-update 0.01)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 26 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.13-1
+- auto-update to 0.13 (by cpan-spec-update 0.01)
+- added a new br on perl(Test::Moose) (version 0)
+
 * Tue Jun 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
 - auto-update to 0.12 (by cpan-spec-update 0.01)
 - added a new req on perl(Carp) (version 0)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jun 2009 14:46:57 -0000	1.6
+++ sources	8 Aug 2009 05:54:05 -0000	1.7
@@ -1 +1 @@
-dcf283a722ff2bf059aaf20545a0276e  MooseX-Types-0.12.tar.gz
+393527bf60ca5b3c48fb1758f066f541  MooseX-Types-0.16.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 06:04:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 06:04:02 +0000 (UTC)
Subject: rpms/perl-Catalyst-Action-RenderView/devel .cvsignore, 1.6,
	1.7 perl-Catalyst-Action-RenderView.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090808060402.C27BB11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5372

Modified Files:
	.cvsignore perl-Catalyst-Action-RenderView.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
- auto-update to 0.11 (by cpan-spec-update 0.01)
- added a new req on perl(Catalyst::Runtime) (version 5.70)
- added a new req on perl(Data::Visitor) (version 0.24)
- added a new req on perl(MRO::Compat) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 May 2009 07:53:07 -0000	1.6
+++ .cvsignore	8 Aug 2009 06:04:02 -0000	1.7
@@ -1 +1 @@
-Catalyst-Action-RenderView-0.10.tar.gz
+Catalyst-Action-RenderView-0.11.tar.gz


Index: perl-Catalyst-Action-RenderView.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/perl-Catalyst-Action-RenderView.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Catalyst-Action-RenderView.spec	26 Jul 2009 04:08:31 -0000	1.10
+++ perl-Catalyst-Action-RenderView.spec	8 Aug 2009 06:04:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Action-RenderView
-Version:        0.10
-Release:        3%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Sensible default end action for view renders
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -27,11 +27,11 @@ BuildRequires:  perl(HTTP::Request::AsCG
 # use base
 Requires:       perl(Catalyst::Action)
 
-# not picked up automatically
-Requires:       perl(Catalyst) >= 5.7
-
-# until bundled M::I is updated
-BuildRequires:  perl(CPAN)
+### auto-added reqs!
+Requires:  perl(Catalyst::Runtime) >= 5.70
+Requires:  perl(Data::Visitor) >= 0.24
+Requires:  perl(MRO::Compat)
+Requires:  perl(Test::More)
 
 %description
 This action implements a sensible default end action, which will forward to
@@ -97,6 +97,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
+- auto-update to 0.11 (by cpan-spec-update 0.01)
+- added a new req on perl(Catalyst::Runtime) (version 5.70)
+- added a new req on perl(Data::Visitor) (version 0.24)
+- added a new req on perl(MRO::Compat) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 May 2009 07:53:07 -0000	1.6
+++ sources	8 Aug 2009 06:04:02 -0000	1.7
@@ -1 +1 @@
-7e9981fdaf84e114a2ee2265771450cd  Catalyst-Action-RenderView-0.10.tar.gz
+6231f873a1ad77dc22815eacf1b88976  Catalyst-Action-RenderView-0.11.tar.gz



From iarnell at fedoraproject.org  Sat Aug  8 06:11:14 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat,  8 Aug 2009 06:11:14 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/F-10 perl-DBIx-Class-TimeStamp.spec, 
	1.1, 1.2
Message-ID: <20090808061114.A5A4D11C02CB@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6806/F-10

Modified Files:
	perl-DBIx-Class-TimeStamp.spec 
Log Message:
* Sat Aug 08 2009 Iain Arnell <iarnell at gmail.com> 0.12-1.1
- BR DBD::SQLite



Index: perl-DBIx-Class-TimeStamp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-10/perl-DBIx-Class-TimeStamp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-DBIx-Class-TimeStamp.spec	5 Aug 2009 14:37:54 -0000	1.1
+++ perl-DBIx-Class-TimeStamp.spec	8 Aug 2009 06:11:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-Class-TimeStamp
 Version:        0.12
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        DBIx::Class extension to update and create date and time based fields
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -18,6 +18,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(Time::Warp)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(DBD::SQLite)
 # not picked up automatically
 Requires:       perl(DBIx::Class)
 Requires:       perl(DBIx::Class::DynamicDefault)
@@ -57,5 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Iain Arnell <iarnell at gmail.com> 0.12-1.1
+- BR DBD::SQLite
+
 * Sun Aug 02 2009 Iain Arnell 0.12-1
 - Specfile autogenerated by cpanspec 1.78.



From iarnell at fedoraproject.org  Sat Aug  8 06:11:14 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat,  8 Aug 2009 06:11:14 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-TimeStamp/F-11 perl-DBIx-Class-TimeStamp.spec, 
	1.1, 1.2
Message-ID: <20090808061114.C3B8311C0344@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6806/F-11

Modified Files:
	perl-DBIx-Class-TimeStamp.spec 
Log Message:
* Sat Aug 08 2009 Iain Arnell <iarnell at gmail.com> 0.12-1.1
- BR DBD::SQLite



Index: perl-DBIx-Class-TimeStamp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-TimeStamp/F-11/perl-DBIx-Class-TimeStamp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-DBIx-Class-TimeStamp.spec	5 Aug 2009 14:37:54 -0000	1.1
+++ perl-DBIx-Class-TimeStamp.spec	8 Aug 2009 06:11:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-Class-TimeStamp
 Version:        0.12
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        DBIx::Class extension to update and create date and time based fields
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -18,6 +18,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(Time::Warp)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(DBD::SQLite)
 # not picked up automatically
 Requires:       perl(DBIx::Class)
 Requires:       perl(DBIx::Class::DynamicDefault)
@@ -57,5 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Iain Arnell <iarnell at gmail.com> 0.12-1.1
+- BR DBD::SQLite
+
 * Sun Aug 02 2009 Iain Arnell 0.12-1
 - Specfile autogenerated by cpanspec 1.78.



From remi at fedoraproject.org  Sat Aug  8 06:21:08 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 06:21:08 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/devel .cvsignore, 1.2,
	1.3 php-pear-Auth-SASL.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090808062108.CD4A311C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506

Modified Files:
	.cvsignore php-pear-Auth-SASL.spec sources 
Log Message:
update to 1.0.3 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Sep 2006 16:16:56 -0000	1.2
+++ .cvsignore	8 Aug 2009 06:21:07 -0000	1.3
@@ -1 +1 @@
-Auth_SASL-1.0.2.tgz
+Auth_SASL-1.0.3.tgz


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/devel/php-pear-Auth-SASL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Auth-SASL.spec	26 Jul 2009 18:08:35 -0000	1.5
+++ php-pear-Auth-SASL.spec	8 Aug 2009 06:21:07 -0000	1.6
@@ -4,8 +4,8 @@
 Summary:     Abstraction of various SASL mechanism responses
 Summary(fr): Abstraction de diff?rents m?canismes de r?ponse SASL
 Name:        php-pear-Auth-SASL
-Version:     1.0.2
-Release:     7%{?dist}
+Version:     1.0.3
+Release:     1%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -85,6 +85,9 @@ fi
 %{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.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-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2006 16:16:56 -0000	1.2
+++ sources	8 Aug 2009 06:21:07 -0000	1.3
@@ -1 +1 @@
-e6a4f4e56dec992ac965678233437aa4  Auth_SASL-1.0.2.tgz
+8202de3b24015b6885871103e3af1e33  Auth_SASL-1.0.3.tgz



From remi at fedoraproject.org  Sat Aug  8 06:26:43 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 06:26:43 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/F-11 php-pear-Auth-SASL.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090808062643.CD73F11C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10733

Modified Files:
	php-pear-Auth-SASL.spec sources 
Log Message:
update to 1.0.3 (bugfix)


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/F-11/php-pear-Auth-SASL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-pear-Auth-SASL.spec	25 Apr 2009 05:58:48 -0000	1.4
+++ php-pear-Auth-SASL.spec	8 Aug 2009 06:26:43 -0000	1.5
@@ -4,8 +4,8 @@
 Summary:     Abstraction of various SASL mechanism responses
 Summary(fr): Abstraction de diff?rents m?canismes de r?ponse SASL
 Name:        php-pear-Auth-SASL
-Version:     1.0.2
-Release:     6%{?dist}
+Version:     1.0.3
+Release:     1%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -85,6 +85,9 @@ fi
 %{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.3-1
+- update to 1.0.3
+
 * Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-6
 - remove PEAR from sumnary
 - remove php (httpd) dependency


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2006 16:16:56 -0000	1.2
+++ sources	8 Aug 2009 06:26:43 -0000	1.3
@@ -1 +1 @@
-e6a4f4e56dec992ac965678233437aa4  Auth_SASL-1.0.2.tgz
+8202de3b24015b6885871103e3af1e33  Auth_SASL-1.0.3.tgz



From remi at fedoraproject.org  Sat Aug  8 06:32:39 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 06:32:39 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/F-10 php-pear-Auth-SASL.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090808063239.B2FD411C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12051

Modified Files:
	php-pear-Auth-SASL.spec sources 
Log Message:
update to 1.0.3 (bugfix)


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/F-10/php-pear-Auth-SASL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Auth-SASL.spec	25 Apr 2009 06:05:24 -0000	1.3
+++ php-pear-Auth-SASL.spec	8 Aug 2009 06:32:39 -0000	1.4
@@ -4,8 +4,8 @@
 Summary:     Abstraction of various SASL mechanism responses
 Summary(fr): Abstraction de diff?rents m?canismes de r?ponse SASL
 Name:        php-pear-Auth-SASL
-Version:     1.0.2
-Release:     6%{?dist}
+Version:     1.0.3
+Release:     1%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -85,6 +85,9 @@ fi
 %{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.3-1
+- update to 1.0.3
+
 * Sat Apr 25 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-6
 - remove PEAR from sumnary
 - remove php (httpd) dependency


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2006 16:16:56 -0000	1.2
+++ sources	8 Aug 2009 06:32:39 -0000	1.3
@@ -1 +1 @@
-e6a4f4e56dec992ac965678233437aa4  Auth_SASL-1.0.2.tgz
+8202de3b24015b6885871103e3af1e33  Auth_SASL-1.0.3.tgz



From cweyl at fedoraproject.org  Sat Aug  8 06:36:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 06:36:59 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-Plugin-Session-State-Cookie.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090808063659.502AE11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12988

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-Cookie.spec 
	sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
- auto-update to 0.12 (by cpan-spec-update 0.01)
- altered br on perl(Catalyst) (5.7010 => 5.80005)
- added a new req on perl(Catalyst) (version 5.80005)
- added a new req on perl(MRO::Compat) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 May 2009 07:01:50 -0000	1.4
+++ .cvsignore	8 Aug 2009 06:36:57 -0000	1.5
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-Cookie-0.11.tar.gz
+Catalyst-Plugin-Session-State-Cookie-0.12.tar.gz


Index: perl-Catalyst-Plugin-Session-State-Cookie.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/perl-Catalyst-Plugin-Session-State-Cookie.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Plugin-Session-State-Cookie.spec	26 Jul 2009 04:14:49 -0000	1.7
+++ perl-Catalyst-Plugin-Session-State-Cookie.spec	8 Aug 2009 06:36:58 -0000	1.8
@@ -1,17 +1,17 @@
 Name:           perl-Catalyst-Plugin-Session-State-Cookie
-Version:        0.11
-Release:        3%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Maintain session IDs using cookies
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-State-Cookie/
 Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz
-#Source0:        http://www.cpan.org/authors/id/N/NU/NUFFIN/Catalyst-Plugin-Session-State-Cookie-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Catalyst) >= 5.80005
 BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.19
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Test::More)
@@ -27,8 +27,9 @@ Requires:       perl(Catalyst::Plugin::S
 # until M::I is brought up...
 BuildRequires:  perl(CPAN)
 
-### auto-added brs!
-BuildRequires:  perl(Catalyst) >= 5.7010
+### auto-added reqs!
+Requires:  perl(Catalyst) >= 5.80005
+Requires:  perl(MRO::Compat)
 
 %description
 In order for Catalyst::Plugin::Session to work the session ID needs to
@@ -78,6 +79,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.12-1
+- auto-update to 0.12 (by cpan-spec-update 0.01)
+- altered br on perl(Catalyst) (5.7010 => 5.80005)
+- added a new req on perl(Catalyst) (version 5.80005)
+- added a new req on perl(MRO::Compat) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Session-State-Cookie/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 May 2009 07:01:50 -0000	1.4
+++ sources	8 Aug 2009 06:36:58 -0000	1.5
@@ -1 +1 @@
-20a663b2572acf7200e2fc11b221c06c  Catalyst-Plugin-Session-State-Cookie-0.11.tar.gz
+f5dc01dab3b2b5de8ee45257f2dfe37a  Catalyst-Plugin-Session-State-Cookie-0.12.tar.gz



From remi at fedoraproject.org  Sat Aug  8 06:39:24 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 06:39:24 +0000 (UTC)
Subject: rpms/php-pear-Auth-SASL/EL-5 php-pear-Auth-SASL.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090808063924.31C3D11C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Auth-SASL/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13645

Modified Files:
	php-pear-Auth-SASL.spec sources 
Log Message:
update to 1.0.3 (bugfix)


Index: php-pear-Auth-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/EL-5/php-pear-Auth-SASL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-Auth-SASL.spec	8 Sep 2006 16:43:52 -0000	1.2
+++ php-pear-Auth-SASL.spec	8 Aug 2009 06:39:23 -0000	1.3
@@ -1,16 +1,11 @@
 # default values when new /etc/rpm/macros.pear not present
 %{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
 
-Summary:     PEAR: Abstraction of various SASL mechanism responses
-Summary(fr): PEAR: Abstraction de diff?rents m?canismes de r?ponse SASL
+Summary:     Abstraction of various SASL mechanism responses
+Summary(fr): Abstraction de diff?rents m?canismes de r?ponse SASL
 Name:        php-pear-Auth-SASL
-Version:     1.0.2
-Release:     4%{?dist}
+Version:     1.0.3
+Release:     1%{?dist}
 License:     BSD
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Auth_SASL-%{version}.tgz
@@ -18,8 +13,8 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 URL:         http://pear.php.net/package/Auth_SASL
 
 BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.0.0
+BuildRequires:    php-pear >= 1:1.4.9-1.2
+Requires:         php-pear(PEAR) >= 1.4.9
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Provides:         php-pear(Auth_SASL) = %{version}
@@ -40,36 +35,43 @@ o Plain (en clair)
 o Anonymous (anonyme)
 o Login (Pseudo-m?canisme)
 
+
 %prep
 %setup -c -q
-mv package.xml Auth_SASL-%{version}/Auth_SASL.xml
+mv package.xml Auth_SASL-%{version}/%{name}.xml
+
 
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot}
 
 cd Auth_SASL-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Auth_SASL.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Auth_SASL.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Auth_SASL.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -80,9 +82,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %{pear_phpdir}/Auth
-%{pear_xmldir}/Auth_SASL.xml
+%{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.3-1
+- update to 1.0.3
+- remove PEAR from sumnary
+- remove php (httpd) dependency
+- spec clean up
+
 * Thu Sep 07 2006 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-4
 - last template.spec
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Auth-SASL/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2006 16:16:56 -0000	1.2
+++ sources	8 Aug 2009 06:39:23 -0000	1.3
@@ -1 +1 @@
-e6a4f4e56dec992ac965678233437aa4  Auth_SASL-1.0.2.tgz
+8202de3b24015b6885871103e3af1e33  Auth_SASL-1.0.3.tgz



From cweyl at fedoraproject.org  Sat Aug  8 06:39:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 06:39:52 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/devel .cvsignore, 1.8,
	1.9 perl-Catalyst-Plugin-Authentication.spec, 1.10, 1.11 sources,
	1.8, 1.9
Message-ID: <20090808063952.DE51F11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13849

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10013-1
- auto-update to 0.10013 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	15 Jun 2009 05:46:37 -0000	1.8
+++ .cvsignore	8 Aug 2009 06:39:52 -0000	1.9
@@ -1 +1 @@
-Catalyst-Plugin-Authentication-0.10012.tar.gz
+Catalyst-Plugin-Authentication-0.10013.tar.gz


Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Catalyst-Plugin-Authentication.spec	26 Jul 2009 04:12:28 -0000	1.10
+++ perl-Catalyst-Plugin-Authentication.spec	8 Aug 2009 06:39:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10012
-Release:        2%{?dist}
+Version:        0.10013
+Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10013-1
+- auto-update to 0.10013 (by cpan-spec-update 0.01)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10012-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	15 Jun 2009 05:46:37 -0000	1.8
+++ sources	8 Aug 2009 06:39:52 -0000	1.9
@@ -1 +1 @@
-9c3357e05fbeb1ccf62621fe4542a0eb  Catalyst-Plugin-Authentication-0.10012.tar.gz
+78d7f5793dcf965f8008789be91a0407  Catalyst-Plugin-Authentication-0.10013.tar.gz



From grandcross at fedoraproject.org  Sat Aug  8 06:40:37 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  8 Aug 2009 06:40:37 +0000 (UTC)
Subject: rpms/arm4/devel arm4.spec,1.4,1.5
Message-ID: <20090808064037.ED75F11C0439@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13987

Modified Files:
	arm4.spec 
Log Message:
Updated dependency to use libuuid-devel instead of uuid-devel




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/arm4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- arm4.spec	24 Jul 2009 17:06:00 -0000	1.4
+++ arm4.spec	8 Aug 2009 06:40:37 -0000	1.5
@@ -14,8 +14,8 @@ Source3:	arm4-arm4.cron
 Source4:	arm4-arm4.init
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
-Requires:	uuid openssl db4 db4-cxx sqlite
+BuildRequires:	libuuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
+Requires:	openssl db4 db4-cxx sqlite
 Requires(pre): shadow-utils	
 
 %description
@@ -168,6 +168,9 @@ rm -rf %{buildroot}
 %{_libdir}/libArmNative.*
 
 %changelog
+* Thu Aug 6 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-3
+- Fix bug 511471 Incorrect dependencies caused a failure to build from source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sat Aug  8 06:41:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 06:41:13 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-Plugin-ConfigLoader.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <20090808064113.991B411C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14272

Modified Files:
	.cvsignore perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
- auto-update to 0.25 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new req on perl(Catalyst::Runtime) (version 5.7008)
- added a new req on perl(Config::Any) (version 0.08)
- added a new req on perl(Data::Visitor) (version 0.24)
- added a new req on perl(MRO::Compat) (version 0.09)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Jan 2009 23:16:38 -0000	1.5
+++ .cvsignore	8 Aug 2009 06:41:13 -0000	1.6
@@ -1 +1 @@
-Catalyst-Plugin-ConfigLoader-0.22.tar.gz
+Catalyst-Plugin-ConfigLoader-0.25.tar.gz


Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Catalyst-Plugin-ConfigLoader.spec	26 Jul 2009 04:13:45 -0000	1.10
+++ perl-Catalyst-Plugin-ConfigLoader.spec	8 Aug 2009 06:41:13 -0000	1.11
@@ -1,17 +1,17 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.23
-Release:        2%{?dist}
+Version:        0.25
+Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-ConfigLoader/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-ConfigLoader-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/Catalyst-Plugin-ConfigLoader-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
-BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires: perl(Test::More)
 # cpan
 BuildRequires:  perl(Catalyst)
@@ -26,6 +26,12 @@ Requires:       perl(Catalyst)
 ### auto-added brs!
 BuildRequires:  perl(Catalyst::Runtime) >= 5.7008
 
+### auto-added reqs!
+Requires:  perl(Catalyst::Runtime) >= 5.7008
+Requires:  perl(Config::Any) >= 0.08
+Requires:  perl(Data::Visitor) >= 0.24
+Requires:  perl(MRO::Compat) >= 0.09
+
 %description
 This module will attempt to load find and load a configuration file of
 various types. Currently it supports YAML, JSON, XML, INI and Perl formats.
@@ -60,6 +66,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
+- auto-update to 0.25 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(Catalyst::Runtime) (version 5.7008)
+- added a new req on perl(Config::Any) (version 0.08)
+- added a new req on perl(Data::Visitor) (version 0.24)
+- added a new req on perl(MRO::Compat) (version 0.09)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 May 2009 07:36:49 -0000	1.6
+++ sources	8 Aug 2009 06:41:13 -0000	1.7
@@ -1 +1 @@
-0e92de2e1bf52cde8cd107ecdfd779ab  Catalyst-Plugin-ConfigLoader-0.23.tar.gz
+d6ad7bd4d7ae010d1e310d4de3518b9b  Catalyst-Plugin-ConfigLoader-0.25.tar.gz



From grandcross at fedoraproject.org  Sat Aug  8 06:43:24 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  8 Aug 2009 06:43:24 +0000 (UTC)
Subject: rpms/arm4/devel arm4.spec,1.5,1.6
Message-ID: <20090808064325.00C0711C02CB@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14817

Modified Files:
	arm4.spec 
Log Message:
Update version number




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/arm4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- arm4.spec	8 Aug 2009 06:40:37 -0000	1.5
+++ arm4.spec	8 Aug 2009 06:43:24 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		arm4
 Version:	0.8.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System



From grandcross at fedoraproject.org  Sat Aug  8 06:47:18 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  8 Aug 2009 06:47:18 +0000 (UTC)
Subject: rpms/arm4/devel arm4.spec,1.6,1.7
Message-ID: <20090808064718.C278B11C02CB@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16402

Modified Files:
	arm4.spec 
Log Message:
New tag to resolve CVS sync issues




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/arm4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- arm4.spec	8 Aug 2009 06:43:24 -0000	1.6
+++ arm4.spec	8 Aug 2009 06:47:18 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		arm4
 Version:	0.8.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -168,6 +168,9 @@ rm -rf %{buildroot}
 %{_libdir}/libArmNative.*
 
 %changelog
+* Sat Aug 8 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-3
+- New tag to correct CVS sync issues
+
 * Thu Aug 6 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-3
 - Fix bug 511471 Incorrect dependencies caused a failure to build from source
 



From jgarzik at fedoraproject.org  Sat Aug  8 06:47:32 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat,  8 Aug 2009 06:47:32 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.11,1.12 sources,1.8,1.9
Message-ID: <20090808064732.8299111C02CB@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16538

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cld.spec	7 Aug 2009 14:14:47 -0000	1.11
+++ cld.spec	8 Aug 2009 06:47:32 -0000	1.12
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.11.gf830b4be%{?dist}
+Release:	0.12.g85e14281%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit f830b4be92f89ad0a48ee0703fd1b829febfaf4a
+# pulled from upstream git, commit 85e14281e1638ed8417c71beab0ba9361a9f0d2d
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sat Aug  8 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.12.g85e14281
+- update to commit 85e14281e1638ed8417c71beab0ba9361a9f0d2d
+
 * Fri Aug  7 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.11.gf830b4be
 - update to commit f830b4be92f89ad0a48ee0703fd1b829febfaf4a
   (major network protocol change)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Aug 2009 14:14:47 -0000	1.8
+++ sources	8 Aug 2009 06:47:32 -0000	1.9
@@ -1 +1 @@
-a0e40260b7d715b1a66b1cfd0446e175  cld-0.2git.tar.gz
+b19b35eb82a894f6117c87af9a47bd65  cld-0.2git.tar.gz



From jgarzik at fedoraproject.org  Sat Aug  8 07:11:22 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat,  8 Aug 2009 07:11:22 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20090808071123.2EE0F11C02CB@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22353

Modified Files:
	chunkd.spec sources 
Log Message:
update to latest upstream


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- chunkd.spec	7 Aug 2009 14:17:26 -0000	1.7
+++ chunkd.spec	8 Aug 2009 07:11:21 -0000	1.8
@@ -1,13 +1,13 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.8.g95538bcf%{?dist}
+Release:	0.9.g68cabfe7%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 95538bcfd91486d8ade1e230820bf33312a7c298
+# pulled from upstream git, commit 68cabfe72a315a062126eaf405dfe2c186e04f99
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
@@ -98,6 +98,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sat Aug  8 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.9.g68cabfe7
+- update source to commit 68cabfe72a315a062126eaf405dfe2c186e04f99
+
 * Fri Aug  7 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.8.g95538bcf
 - update source to commit 95538bcfd91486d8ade1e230820bf33312a7c298
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Aug 2009 14:17:26 -0000	1.5
+++ sources	8 Aug 2009 07:11:21 -0000	1.6
@@ -1 +1 @@
-55f9d8fef2b6b5187178d677fc37afa8  chunkd-0.4git.tar.gz
+515902d4dbf4b3f040b87f36b28ccdad  chunkd-0.4git.tar.gz



From grandcross at fedoraproject.org  Sat Aug  8 07:20:38 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  8 Aug 2009 07:20:38 +0000 (UTC)
Subject: rpms/arm4/F-10 arm4.spec,1.3,1.4
Message-ID: <20090808072038.F1BCD11C0425@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25117

Modified Files:
	arm4.spec 
Log Message:
Fixed incorrect dependecy




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-10/arm4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- arm4.spec	20 May 2009 14:54:40 -0000	1.3
+++ arm4.spec	8 Aug 2009 07:20:38 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		arm4
 Version:	0.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -14,8 +14,8 @@ Source3:	arm4-arm4.cron
 Source4:	arm4-arm4.init
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
-Requires:	uuid openssl db4 db4-cxx sqlite
+BuildRequires:	e2fsprogs-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
+Requires:	openssl db4 db4-cxx sqlite
 Requires(pre): shadow-utils	
 
 %description
@@ -168,6 +168,9 @@ rm -rf %{buildroot}
 %{_libdir}/libArmNative.*
 
 %changelog
+* Sat Aug 8 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-2
+- Correct dependency on e2fsprogs-devel instead of uuid-devel
+
 * Sun May 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-1
 - Improved stability and performance
 - Assorted bug fixes



From jgarzik at fedoraproject.org  Sat Aug  8 07:22:33 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat,  8 Aug 2009 07:22:33 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.6,1.7 tabled.spec,1.8,1.9
Message-ID: <20090808072233.6840311C02CB@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801

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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Aug 2009 14:19:26 -0000	1.6
+++ sources	8 Aug 2009 07:22:33 -0000	1.7
@@ -1 +1 @@
-0d126c870756f4d3eefdcc31f43cc746  tabled-0.3git.tar.gz
+9da54871d542e240fe6090023645b3e5  tabled-0.3git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tabled.spec	7 Aug 2009 14:19:26 -0000	1.8
+++ tabled.spec	8 Aug 2009 07:22:33 -0000	1.9
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.3
-Release:	0.9.g20e56358%{?dist}
+Release:	0.10.ge1ef4104%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 20e56358d9320fc73ef2ecc689be960c9be91805
+# pulled from upstream git, commit e1ef4104ba859f251c9976d1e2afd3e0d9317067
 # 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
+* Sat Aug  8 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.10.ge1ef4104
+- update to git commit e1ef4104ba859f251c9976d1e2afd3e0d9317067
+
 * Fri Aug  7 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.9.g20e56358
 - update to git commit 20e56358d9320fc73ef2ecc689be960c9be91805
 



From remi at fedoraproject.org  Sat Aug  8 07:28:46 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 07:28:46 +0000 (UTC)
Subject: rpms/php-pear-Log/devel .cvsignore, 1.16, 1.17 php-pear-Log.spec,
	1.19, 1.20 sources, 1.16, 1.17
Message-ID: <20090808072846.2618611C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27189

Modified Files:
	.cvsignore php-pear-Log.spec sources 
Log Message:
update to 1.11.5 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	30 Mar 2009 16:32:36 -0000	1.16
+++ .cvsignore	8 Aug 2009 07:28:45 -0000	1.17
@@ -1 +1 @@
-Log-1.11.4.tgz
+Log-1.11.5.tgz


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/php-pear-Log.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- php-pear-Log.spec	26 Jul 2009 18:18:57 -0000	1.19
+++ php-pear-Log.spec	8 Aug 2009 07:28:45 -0000	1.20
@@ -4,8 +4,8 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.4
-Release:        2%{?dist}
+Version:        1.11.5
+Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
@@ -47,7 +47,7 @@ php-pear-Log peut optionellement utilise
 %prep
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -58,14 +58,14 @@ mv package.xml %{pear_name}-%{version}/%
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Log.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 popd
 # Sort out documentation
@@ -84,13 +84,13 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.4)
+# Should return (1.11.5)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 
 %postun
@@ -106,10 +106,14 @@ fi
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
+- update to 1.11.5
+- rename Log.xml to php-pear-Log.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	30 Mar 2009 16:32:36 -0000	1.16
+++ sources	8 Aug 2009 07:28:45 -0000	1.17
@@ -1 +1 @@
-739fbec7d758b7af6228b80a0f56bb28  Log-1.11.4.tgz
+832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz



From grandcross at fedoraproject.org  Sat Aug  8 07:29:02 2009
From: grandcross at fedoraproject.org (David Carter)
Date: Sat,  8 Aug 2009 07:29:02 +0000 (UTC)
Subject: rpms/arm4/F-11 arm4.spec,1.3,1.4
Message-ID: <20090808072902.891E811C02CB@cvs1.fedora.phx.redhat.com>

Author: grandcross

Update of /cvs/pkgs/rpms/arm4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27213

Modified Files:
	arm4.spec 
Log Message:
Fix incorrect dependency




Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/F-11/arm4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- arm4.spec	20 May 2009 14:51:11 -0000	1.3
+++ arm4.spec	8 Aug 2009 07:29:02 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		arm4
 Version:	0.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -14,8 +14,8 @@ Source3:	arm4-arm4.cron
 Source4:	arm4-arm4.init
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	uuid-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
-Requires:	uuid openssl db4 db4-cxx sqlite
+BuildRequires:	e2fsprogs-devel openssl-devel db4-utils db4-devel libxml2-devel sqlite-devel xerces-c-devel ant ant-javadoc
+Requires:	openssl db4 db4-cxx sqlite
 Requires(pre): shadow-utils	
 
 %description
@@ -168,6 +168,9 @@ rm -rf %{buildroot}
 %{_libdir}/libArmNative.*
 
 %changelog
+* Sat Aug 8 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-2
+- Changed incorrect dependency from uuid-devel to e2fsprogs-devel
+
 * Sun May 3 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-1
 - Improved stability and performance
 - Assorted bug fixes



From remi at fedoraproject.org  Sat Aug  8 07:34:01 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 07:34:01 +0000 (UTC)
Subject: rpms/php-pear-Log/F-11 php-pear-Log.spec, 1.18, 1.19 sources, 1.16,
	1.17
Message-ID: <20090808073401.0B9D311C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28534

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.5 (bugfix)


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-11/php-pear-Log.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- php-pear-Log.spec	30 Mar 2009 16:32:36 -0000	1.18
+++ php-pear-Log.spec	8 Aug 2009 07:34:00 -0000	1.19
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.4
+Version:        1.11.5
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -47,7 +47,7 @@ php-pear-Log peut optionellement utilise
 %prep
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -58,14 +58,14 @@ mv package.xml %{pear_name}-%{version}/%
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Log.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 popd
 # Sort out documentation
@@ -84,13 +84,13 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.4)
+# Should return (1.11.5)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 
 %postun
@@ -106,10 +106,14 @@ fi
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
+- update to 1.11.5
+- rename Log.xml to php-pear-Log.xml
+
 * Mon Mar 30 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.4-1
 - update to 1.11.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	30 Mar 2009 16:32:36 -0000	1.16
+++ sources	8 Aug 2009 07:34:00 -0000	1.17
@@ -1 +1 @@
-739fbec7d758b7af6228b80a0f56bb28  Log-1.11.4.tgz
+832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz



From remi at fedoraproject.org  Sat Aug  8 07:39:27 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 07:39:27 +0000 (UTC)
Subject: rpms/php-pear-Log/F-10 php-pear-Log.spec, 1.17, 1.18 sources, 1.16,
	1.17
Message-ID: <20090808073927.D2E8511C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29827

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.5 (bugfix)


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-10/php-pear-Log.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- php-pear-Log.spec	30 Mar 2009 16:40:12 -0000	1.17
+++ php-pear-Log.spec	8 Aug 2009 07:39:27 -0000	1.18
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.4
+Version:        1.11.5
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -47,7 +47,7 @@ php-pear-Log peut optionellement utilise
 %prep
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -58,14 +58,14 @@ mv package.xml %{pear_name}-%{version}/%
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Log.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 popd
 # Sort out documentation
@@ -84,13 +84,13 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return (1.11.4)
+# Should return (1.11.5)
 # 19 PASSED TESTS
 # 2 SKIPPED TESTS
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 
 %postun
@@ -106,10 +106,14 @@ fi
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
+- update to 1.11.5
+- rename Log.xml to php-pear-Log.xml
+
 * Mon Mar 30 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.4-1
 - update to 1.11.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	30 Mar 2009 16:40:12 -0000	1.16
+++ sources	8 Aug 2009 07:39:27 -0000	1.17
@@ -1 +1 @@
-739fbec7d758b7af6228b80a0f56bb28  Log-1.11.4.tgz
+832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz



From remi at fedoraproject.org  Sat Aug  8 07:45:40 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  8 Aug 2009 07:45:40 +0000 (UTC)
Subject: rpms/php-pear-Log/EL-5 php-pear-Log.spec, 1.11, 1.12 sources, 1.11,
	1.12
Message-ID: <20090808074540.CA4C611C02CB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31325

Modified Files:
	php-pear-Log.spec sources 
Log Message:
update to 1.11.5 (bugfix)


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/EL-5/php-pear-Log.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-pear-Log.spec	22 Nov 2008 19:27:34 -0000	1.11
+++ php-pear-Log.spec	8 Aug 2009 07:45:40 -0000	1.12
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.11.3
+Version:        1.11.5
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -47,7 +47,7 @@ php-pear-Log peut optionellement utilise
 %prep
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -58,14 +58,14 @@ mv package.xml %{pear_name}-%{version}/%
 rm -rf %{buildroot} docdir
 
 pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Log.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 popd
 # Sort out documentation
@@ -84,13 +84,13 @@ lst=$(find %{buildroot}%{pear_phpdir} -e
 # For documentation purpose only
 # After install, as root :
 # pear run-tests -p Log
-# Should return 
-# 15 PASSED TESTS
-# 3 SKIPPED TESTS
+# Should return (1.11.5)
+# 19 PASSED TESTS
+# 2 SKIPPED TESTS
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 
 %postun
@@ -106,10 +106,14 @@ fi
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
 %{pear_datadir}/Log
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Sat Aug 08 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.5-1
+- update to 1.11.5
+- rename Log.xml to php-pear-Log.xml
+
 * Sat Nov 22 2008 Remi Collet <Fedora at FamilleCollet.com> 1.11.3-1
 - update to 1.11.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Nov 2008 19:27:34 -0000	1.11
+++ sources	8 Aug 2009 07:45:40 -0000	1.12
@@ -1 +1 @@
-9f489de394e62072750a0c3afef214a1  Log-1.11.3.tgz
+832b1090f40789ff75f07a63b54930eb  Log-1.11.5.tgz



From pkgdb at fedoraproject.org  Sat Aug  8 08:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 08:07:45 +0000
Subject: [pkgdb] xmms-sid ownership updated
Message-ID: <20090808080745.92F8010F8A1@bastion2.fedora.phx.redhat.com>

Package xmms-sid in Fedora 10 was orphaned by mschwendt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xmms-sid



From pkgdb at fedoraproject.org  Sat Aug  8 08:07:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 08:07:47 +0000
Subject: [pkgdb] xmms-sid ownership updated
Message-ID: <20090808080748.19F8310F8A2@bastion2.fedora.phx.redhat.com>

Package xmms-sid in Fedora 11 was orphaned by mschwendt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xmms-sid



From pkgdb at fedoraproject.org  Sat Aug  8 08:08:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 08:08:09 +0000
Subject: [pkgdb] xmms-sid ownership updated
Message-ID: <20090808080809.D87D710F882@bastion2.fedora.phx.redhat.com>

Package xmms-sid in Fedora devel was orphaned by mschwendt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xmms-sid



From caolanm at fedoraproject.org  Sat Aug  8 08:42:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  8 Aug 2009 08:42:08 +0000 (UTC)
Subject: rpms/mythes-sk/devel mythes-sk.spec,1.15,1.16 sources,1.11,1.12
Message-ID: <20090808084208.90D3B11C02CB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12865

Modified Files:
	mythes-sk.spec sources 
Log Message:
latest version


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mythes-sk.spec	25 Jul 2009 15:40:00 -0000	1.15
+++ mythes-sk.spec	8 Aug 2009 08:42:08 -0000	1.16
@@ -1,8 +1,8 @@
 Name: mythes-sk
 Summary: Slovak thesaurus
-%define upstreamid 20090707
+%define upstreamid 20090807
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source: http://www.sk-spell.sk.cx/thesaurus/download/OOo-Thesaurus2-sk_SK.zip
 Group: Applications/Text
 URL: http://www.sk-spell.sk.cx/thesaurus/
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090807-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090707-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	8 Jul 2009 09:47:29 -0000	1.11
+++ sources	8 Aug 2009 08:42:08 -0000	1.12
@@ -1 +1 @@
-180d5a62c20958b7a8a8bae89f1d1b9a  OOo-Thesaurus2-sk_SK.zip
+7531549a790294ff33b6fc4242433959  OOo-Thesaurus2-sk_SK.zip



From caolanm at fedoraproject.org  Sat Aug  8 08:44:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  8 Aug 2009 08:44:18 +0000 (UTC)
Subject: rpms/mythes-es/devel mythes-es.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090808084418.70B4B11C02CB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-es/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13365

Modified Files:
	mythes-es.spec sources 
Log Message:
latest version


Index: mythes-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/mythes-es.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mythes-es.spec	25 Jul 2009 15:36:38 -0000	1.8
+++ mythes-es.spec	8 Aug 2009 08:44:18 -0000	1.9
@@ -1,8 +1,8 @@
 Name: mythes-es
 Summary: Spanish thesaurus
-%define upstreamid 20090708
+%define upstreamid 20090808
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source: http://openthes-es.berlios.de/download/OOo2-thes_es_ES.tar.bz2
 Group: Applications/Text
 URL: http://openthes-es.berlios.de
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Sat Aug 08 2009 Caol?n McNamara <caolanm at redhat.com> - 0.20090808-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090708-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Jul 2009 09:50:17 -0000	1.6
+++ sources	8 Aug 2009 08:44:18 -0000	1.7
@@ -1 +1 @@
-e266f5a971c550e7f2e9ac82a21b31a0  OOo2-thes_es_ES.tar.bz2
+57b245e02eb0db37b06a5b0654fe0dd7  OOo2-thes_es_ES.tar.bz2



From caolanm at fedoraproject.org  Sat Aug  8 08:45:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  8 Aug 2009 08:45:27 +0000 (UTC)
Subject: rpms/mythes-sl/devel mythes-sl.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <20090808084527.D3AE011C02CB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13737

Modified Files:
	mythes-sl.spec sources 
Log Message:
latest version


Index: mythes-sl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/mythes-sl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mythes-sl.spec	25 Jul 2009 15:40:16 -0000	1.9
+++ mythes-sl.spec	8 Aug 2009 08:45:27 -0000	1.10
@@ -1,8 +1,8 @@
 Name: mythes-sl
 Summary: Slovenian thesaurus
-%define upstreamid 20090708
+%define upstreamid 20090808
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Source: http://193.2.66.133:85/download/thes_sl_SI_v2.zip
 Group: Applications/Text
 URL: http://www.tezaver.si/
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090708-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090708-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Jul 2009 09:51:31 -0000	1.6
+++ sources	8 Aug 2009 08:45:27 -0000	1.7
@@ -1 +1 @@
-33e6c0a746ddd8bc1d354f8245a63b50  thes_sl_SI_v2.zip
+725bf66eb1b76b6cc6d93342398a14cb  thes_sl_SI_v2.zip



From caolanm at fedoraproject.org  Sat Aug  8 08:46:59 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  8 Aug 2009 08:46:59 +0000 (UTC)
Subject: rpms/hunspell-pl/devel .cvsignore, 1.43, 1.44 hunspell-pl.spec, 1.48,
	1.49 sources, 1.43, 1.44
Message-ID: <20090808084659.9BD7111C02CB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14320

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	8 Jul 2009 09:54:56 -0000	1.43
+++ .cvsignore	8 Aug 2009 08:46:59 -0000	1.44
@@ -1 +1,2 @@
 sjp-myspell-pl-20090708.zip
+sjp-myspell-pl-20090808.zip


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- hunspell-pl.spec	25 Jul 2009 02:37:45 -0000	1.48
+++ hunspell-pl.spec	8 Aug 2009 08:46:59 -0000	1.49
@@ -1,8 +1,8 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20090708
+%define upstreamid 20090808
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip
 Group: Applications/Text
 URL: http://www.kurnik.pl/dictionary/
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Sat Aug 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090808-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090708-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	8 Jul 2009 09:54:56 -0000	1.43
+++ sources	8 Aug 2009 08:46:59 -0000	1.44
@@ -1 +1 @@
-c9127c03d18e2513472f3c71edf9ff2c  sjp-myspell-pl-20090708.zip
+12ac267ca3f82112f2ea10a05466f9fa  sjp-myspell-pl-20090808.zip



From pkgdb at fedoraproject.org  Sat Aug  8 09:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 09:00:00 +0000
Subject: [pkgdb] chkrootkit: mschwendt has given up watchbugzilla
Message-ID: <20090808090000.5869110F882@bastion2.fedora.phx.redhat.com>

mschwendt has given up the watchbugzilla acl on chkrootkit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chkrootkit



From pkgdb at fedoraproject.org  Sat Aug  8 09:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 09:00:02 +0000
Subject: [pkgdb] chkrootkit: mschwendt has given up watchcommits
Message-ID: <20090808090002.A332D10F8A2@bastion2.fedora.phx.redhat.com>

mschwendt has given up the watchcommits acl on chkrootkit (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chkrootkit



From pkgdb at fedoraproject.org  Sat Aug  8 09:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 09:00:04 +0000
Subject: [pkgdb] chkrootkit: mschwendt has given up watchbugzilla
Message-ID: <20090808090004.DC1FD10F8AD@bastion2.fedora.phx.redhat.com>

mschwendt has given up the watchbugzilla acl on chkrootkit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chkrootkit



From pkgdb at fedoraproject.org  Sat Aug  8 09:00:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 09:00:07 +0000
Subject: [pkgdb] chkrootkit: mschwendt has given up watchcommits
Message-ID: <20090808090007.8A2AD10F8B4@bastion2.fedora.phx.redhat.com>

mschwendt has given up the watchcommits acl on chkrootkit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chkrootkit



From pkgdb at fedoraproject.org  Sat Aug  8 09:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 09:00:14 +0000
Subject: [pkgdb] chkrootkit: mschwendt has given up watchbugzilla
Message-ID: <20090808090015.0215810F882@bastion2.fedora.phx.redhat.com>

mschwendt has given up the watchbugzilla acl on chkrootkit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chkrootkit



From pkgdb at fedoraproject.org  Sat Aug  8 09:00:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 09:00:17 +0000
Subject: [pkgdb] chkrootkit: mschwendt has given up watchcommits
Message-ID: <20090808090017.1461910F8B8@bastion2.fedora.phx.redhat.com>

mschwendt has given up the watchcommits acl on chkrootkit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/chkrootkit



From caolanm at fedoraproject.org  Sat Aug  8 09:04:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat,  8 Aug 2009 09:04:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch,
	1.2, 1.3
Message-ID: <20090808090429.99B1D11C02CB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18693

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
second round of dmake fixes

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |    6 ++++--
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    2 +-
 make.c           |   15 ++++++++++-----
 6 files changed, 32 insertions(+), 16 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	7 Aug 2009 19:50:44 -0000	1.2
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	8 Aug 2009 09:04:29 -0000	1.3
@@ -120,3 +120,42 @@ diff -ru dmake.orig/path.c dmake/path.c
  	 q = tpath;
        }
        else
+--- dmake.orig/make.c	2009-08-08 09:56:10.000000000 +0100
++++ dmake/make.c	2009-08-08 10:00:04.000000000 +0100
+@@ -1352,8 +1352,10 @@
+        * Nothing in Expand() should be able to change dynamic macros. */
+       cmnd = Expand( rp->st_string );
+ 
+-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	 strcpy(cmnd,p);
++      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	 size_t len = strlen(p)+1;
++	 memmove(cmnd,p,len);
++      }
+ 
+       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
+        * possible for the user to reset it to, for example
+@@ -1381,8 +1383,10 @@
+ 	 shell  = ((l_attr & A_SHELL) != 0);
+ 
+ 	 /* clean up the attributes that we may have just added. */
+-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	    strcpy(cmnd,p);
++	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	    size_t len = strlen(p)+1;
++	    memmove(cmnd,p,len);
++	 }
+       }
+ 
+ #if defined(MSDOS)
+@@ -1477,8 +1481,9 @@
+    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
+       /* Remove the \<nl> sequences. */
+       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
++	 size_t len = strlen(n+2)+1;
+ 	 DB_PRINT( "make", ("fixing [%s]", p) );
+-	 strcpy( n, n+2 );
++	 memmove( n, n+2, len );
+ 	 p = n;
+       }
+       /* Look for an escape sequence and replace it by it's corresponding



From pbrobinson at fedoraproject.org  Sat Aug  8 09:44:46 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  8 Aug 2009 09:44:46 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808094446.B4B7711C02CB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28599/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bisho.spec import.log 
Log Message:
- initial import



--- NEW FILE bisho.spec ---
Name:           bisho
Version:        0.10.7
Release:        3%{?dist}
Summary:        Moblin configuration tool for mojito social network aggregator

Group:          System Environment/Libraries
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)

BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: gnome-keyring-devel
BuildRequires: libsoup-devel
BuildRequires: mojito-devel
BuildRequires: rest-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
BuildRequires: gettext
# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool

%description
A tool to configure user and account details for the mojito social network 
aggregation service.

%prep
%setup -q

# Don't run configure from autogen.sh
sed -i 's|echo|exit 0|g' autogen.sh
./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%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 COPYING AUTHORS TODO
%{_bindir}/bisho
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/bisho.png

%changelog
* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.7-3
- Further updates from review request

* Thu Aug  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.7-2
- Feedback from the review request

* Fri Jul 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.7-1
- New upstream 0.10.7 release, add translations

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.2-1
- Initial packaging


--- NEW FILE import.log ---
bisho-0_10_7-3_fc11:HEAD:bisho-0.10.7-3.fc11.src.rpm:1249724638


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:07:07 -0000	1.1
+++ .cvsignore	8 Aug 2009 09:44:46 -0000	1.2
@@ -0,0 +1 @@
+bisho-0.10.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:07:07 -0000	1.1
+++ sources	8 Aug 2009 09:44:46 -0000	1.2
@@ -0,0 +1 @@
+738c409b1a6757bc1f2e71447f7133f3  bisho-0.10.7.tar.bz2



From pbrobinson at fedoraproject.org  Sat Aug  8 09:45:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  8 Aug 2009 09:45:10 +0000 (UTC)
Subject: rpms/gjs/devel gjs.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808094510.AA27011C02CB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gjs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28769/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gjs.spec import.log 
Log Message:
- Initial import



--- NEW FILE gjs.spec ---
Name:           gjs
Version:        0.3
Release:        2%{?dist}
Summary:        Javascript Bindings for GNOME

Group:          System Environment/Libraries
# The following files contain code from Mozilla which
# is triple licensed under MPL1.1/LGPLv2+/GPLv2+:
# The console module (modules/console.c)
# Stack printer (gjs/stack.c)
License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
URL:            http://live.gnome.org/Gjs/
Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: xulrunner-devel
BuildRequires: gobject-introspection-devel
BuildRequires: dbus-glib-devel
BuildRequires: pkgconfig

%description
Gjs allows using GNOME libraries from Javascript. It's based on the
Spidermonkey Javascript engine from Mozilla and the GObject introspection
framework.

%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
# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%check
#make check

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/gjs-console
%{_libdir}/*.so.*
%{_libdir}/gjs-1.0
%{_datadir}/gjs-1.0

%files devel
%defattr(-,root,root,-)
%doc examples/*
%{_includedir}/gjs-1.0
%{_libdir}/pkgconfig/gjs-1.0.pc
%{_libdir}/pkgconfig/gjs-gi-1.0.pc
%{_libdir}/pkgconfig/gjs-dbus-1.0.pc
%{_libdir}/*.so

%changelog
* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
- Updates from the review request

* Wed Jul  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-1
- New upstream release. Clarify licensing for review

* Sat Jun 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.2-1
- Initial packaging


--- NEW FILE import.log ---
gjs-0_3-2_fc11:HEAD:gjs-0.3-2.fc11.src.rpm:1249724659


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:00:43 -0000	1.1
+++ .cvsignore	8 Aug 2009 09:45:10 -0000	1.2
@@ -0,0 +1 @@
+gjs-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:00:43 -0000	1.1
+++ sources	8 Aug 2009 09:45:10 -0000	1.2
@@ -0,0 +1 @@
+3dead54a91b2e00a746efa7def7e5e9c  gjs-0.3.tar.bz2



From pbrobinson at fedoraproject.org  Sat Aug  8 09:47:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  8 Aug 2009 09:47:02 +0000 (UTC)
Subject: rpms/gjs/F-11 gjs.spec,NONE,1.1 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090808094702.83C7911C02CB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gjs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29431

Modified Files:
	.cvsignore sources 
Added Files:
	gjs.spec 
Log Message:
- initial import


--- NEW FILE gjs.spec ---
Name:           gjs
Version:        0.3
Release:        2%{?dist}
Summary:        Javascript Bindings for GNOME

Group:          System Environment/Libraries
# The following files contain code from Mozilla which
# is triple licensed under MPL1.1/LGPLv2+/GPLv2+:
# The console module (modules/console.c)
# Stack printer (gjs/stack.c)
License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
URL:            http://live.gnome.org/Gjs/
Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: xulrunner-devel
BuildRequires: gobject-introspection-devel
BuildRequires: dbus-glib-devel
BuildRequires: pkgconfig

%description
Gjs allows using GNOME libraries from Javascript. It's based on the
Spidermonkey Javascript engine from Mozilla and the GObject introspection
framework.

%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
# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%check
#make check

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/gjs-console
%{_libdir}/*.so.*
%{_libdir}/gjs-1.0
%{_datadir}/gjs-1.0

%files devel
%defattr(-,root,root,-)
%doc examples/*
%{_includedir}/gjs-1.0
%{_libdir}/pkgconfig/gjs-1.0.pc
%{_libdir}/pkgconfig/gjs-gi-1.0.pc
%{_libdir}/pkgconfig/gjs-dbus-1.0.pc
%{_libdir}/*.so

%changelog
* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
- Updates from the review request

* Wed Jul  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-1
- New upstream release. Clarify licensing for review

* Sat Jun 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.2-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:00:43 -0000	1.1
+++ .cvsignore	8 Aug 2009 09:47:02 -0000	1.2
@@ -0,0 +1 @@
+gjs-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:00:43 -0000	1.1
+++ sources	8 Aug 2009 09:47:02 -0000	1.2
@@ -0,0 +1 @@
+3dead54a91b2e00a746efa7def7e5e9c  gjs-0.3.tar.bz2



From transif at fedoraproject.org  Sat Aug  8 10:56:39 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sat,  8 Aug 2009 10:56:39 +0000 (UTC)
Subject: comps/po nb.po,1.20,1.21
Message-ID: <20090808105639.4A67B11C02CB@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15691/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.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nb.po	29 Apr 2009 20:00:21 -0000	1.20
+++ nb.po	8 Aug 2009 10:56:37 -0000	1.21
@@ -1,8 +1,8 @@
 # Norwegian bokm?l translation of comps
 # Copyright (C) Red Hat, Inc.
 # This file is distributed under the same license as the comps package.
-# Kjartan Maraas <kmaraas at gnome.org>, 1998-2005.
-# Kjartan Maraas <kmaraas at gnome.org>, 2007.
+# Kjartan Maraas <kmaraas at gnome.org>, 1998-2009.
+# Espen Stefansen <espenas at gmail.com>, 2007.
 #
 #
 msgid ""
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2008-07-10 14:25+0200\n"
+"PO-Revision-Date: 2009-08-08 12:56+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"
@@ -1204,9 +1204,8 @@ msgid "Kashubian Support"
 msgstr "St?tte for kashubisk"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:114
-#, fuzzy
 msgid "Kurdish Support"
-msgstr "St?tte for tyrkisk"
+msgstr "St?tte for kurdisk"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:111
 #: ../comps-f11.xml.in.h:127
@@ -1236,9 +1235,8 @@ msgid "A software playground for learnin
 msgstr ""
 
 #: ../comps-f10.xml.in.h:71 ../comps-f11.xml.in.h:81
-#, fuzzy
 msgid "Haskell Development"
-msgstr "Web-utvikling"
+msgstr "Haskell-utvikling"
 
 #: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:88
 msgid "Input Methods"
@@ -1249,33 +1247,28 @@ msgid "Input method packages for the inp
 msgstr "Pakker med inndatametoder for inntasting av spesielle tegn."
 
 #: ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:107
-#, fuzzy
 msgid "Kashmiri Support"
-msgstr "St?tte for khmer"
+msgstr "St?tte for kashmirsk"
 
 #: ../comps-f10.xml.in.h:98 ../comps-f11.xml.in.h:112
-#, fuzzy
 msgid "Konkani Support"
-msgstr "St?tte for koreansk"
+msgstr "St?tte for konkani"
 
 #: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:115
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:129
-#, fuzzy
 msgid "Maithili Support"
-msgstr "St?tte for marathi"
+msgstr "St?tte for maithili"
 
 #: ../comps-f10.xml.in.h:120 ../comps-f11.xml.in.h:140
-#, fuzzy
 msgid "Myanmar (Burmese) Support"
-msgstr "St?tte for vietnamesisk"
+msgstr "St?tte for burmesisk"
 
 #: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:170
-#, fuzzy
 msgid "Sindhi Support"
-msgstr "St?tte for hindu"
+msgstr "St?tte for sindhi"
 
 #: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:184
 #, fuzzy
@@ -1283,19 +1276,16 @@ msgid "Support for developing programs i
 msgstr "St?tte for utvikling av programmer i programmeringsspr?ket Java."
 
 #: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:193
-#, fuzzy
 msgid "Tajik Support"
-msgstr "St?tte for thai"
+msgstr "St?tte for tadsjikisk"
 
 #: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:239
-#, fuzzy
 msgid "Uzbek Support"
-msgstr "St?tte for tsjekkisk"
+msgstr "St?tte for usbekisk"
 
 #: ../comps-f11.xml.in.h:6
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "St?tte for arabisk"
+msgstr "St?tte for amazigh"
 
 #: ../comps-f11.xml.in.h:13
 #, fuzzy
@@ -1303,14 +1293,12 @@ msgid "Azerbaijani Support"
 msgstr "St?tte for serbisk"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "St?tte for kinesisk"
+msgstr "St?tte for chichewa"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "St?tte for kroatisk"
+msgstr "St?tte for koptisk"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1318,26 +1306,23 @@ msgstr ""
 
 #: ../comps-f11.xml.in.h:48
 msgid "Electronic Lab"
-msgstr ""
+msgstr "Elektronikklab"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "St?tte for persisk"
+msgstr "St?tte for fijisk"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
-msgstr ""
+msgstr "Skriftutforming og pakking"
 
 #: ../comps-f11.xml.in.h:65
-#, fuzzy
 msgid "Frisian Support"
-msgstr "St?tte for persisk"
+msgstr "St?tte for frisisk"
 
 #: ../comps-f11.xml.in.h:66
-#, fuzzy
 msgid "Friulian Support"
-msgstr "St?tte for filipino"
+msgstr "St?tte for friulisk"
 
 #: ../comps-f11.xml.in.h:83
 #, fuzzy
@@ -1360,9 +1345,8 @@ msgid "Kinyarwanda Support"
 msgstr "St?tte for kannada"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "St?tte for latvisk"
+msgstr "St?tte for latinsk"
 
 #: ../comps-f11.xml.in.h:126
 #, fuzzy
@@ -1375,9 +1359,8 @@ msgid "Malagasy Support"
 msgstr "St?tte for malay"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "St?tte for malay"
+msgstr "St?tte for maltesisk"
 
 #: ../comps-f11.xml.in.h:134
 #, fuzzy
@@ -1390,7 +1373,7 @@ msgstr ""
 
 #: ../comps-f11.xml.in.h:147
 msgid "OCaml"
-msgstr ""
+msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:148
 #, fuzzy
@@ -1399,22 +1382,19 @@ msgstr "St?tte for tibetansk"
 
 #: ../comps-f11.xml.in.h:151
 msgid "Online Help and Documentation"
-msgstr ""
+msgstr "Hjelp og dokumentasjon"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "St?tte for spansk"
+msgstr "St?tte for sanskrit"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "St?tte for ukrainsk"
+msgstr "St?tte for sardinsk"
 
 #: ../comps-f11.xml.in.h:182
-#, fuzzy
 msgid "Sugar Desktop Environment"
-msgstr "Skrivebordsmilj?er"
+msgstr "Sugar skrivebordsmilj?"
 
 #: ../comps-f11.xml.in.h:183
 msgid ""
@@ -1430,14 +1410,12 @@ msgid ""
 msgstr "St?tte for utvikling av programmer i programmeringsspr?ket Java."
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "St?tte for Swati"
+msgstr "St?tte for swahili"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "St?tte for Telugu"
+msgstr "St?tte for tetum"
 
 #: ../comps-f11.xml.in.h:223
 #, fuzzy
@@ -1448,14 +1426,13 @@ msgstr ""
 "Denne gruppen er en samling av verkt?y og ressurser for armenske milj?er."
 
 #: ../comps-f11.xml.in.h:235
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "St?tte for tyrkisk"
+msgstr "St?tte for turkmensk"
 
 #: ../comps-f11.xml.in.h:237
 #, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "St?tte for serbisk"
+msgstr "St?tte for "
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From pkgdb at fedoraproject.org  Sat Aug  8 11:04:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:04:14 +0000
Subject: [pkgdb] gputils: rrankin has requested watchbugzilla
Message-ID: <20090808110414.51BCD10F8A1@bastion2.fedora.phx.redhat.com>

rrankin has requested the watchbugzilla acl on gputils (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:04:20 +0000
Subject: [pkgdb] gputils: rrankin has requested watchcommits
Message-ID: <20090808110420.D704110F882@bastion2.fedora.phx.redhat.com>

rrankin has requested the watchcommits acl on gputils (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:04:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:04:26 +0000
Subject: [pkgdb] gputils: rrankin has requested commit
Message-ID: <20090808110426.4F3B210F8AD@bastion2.fedora.phx.redhat.com>

rrankin has requested the commit acl on gputils (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:18:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:18:48 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808111848.9610510F882@bastion2.fedora.phx.redhat.com>

chitlesh has set the watchbugzilla acl on gputils (Fedora EPEL 5) to Approved for rrankin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:18:49 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808111849.6D79910F8A2@bastion2.fedora.phx.redhat.com>

chitlesh has set the watchcommits acl on gputils (Fedora EPEL 5) to Approved for rrankin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:18:50 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808111850.B66AD10F8AD@bastion2.fedora.phx.redhat.com>

chitlesh has set the commit acl on gputils (Fedora EPEL 5) to Approved for rrankin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:19:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:19:31 +0000
Subject: [pkgdb] gputils: chitlesh has requested watchcommits
Message-ID: <20090808111931.B355E10F8A0@bastion2.fedora.phx.redhat.com>

chitlesh has requested the watchcommits acl on gputils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:19:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:19:32 +0000
Subject: [pkgdb] gputils: chitlesh has requested commit
Message-ID: <20090808111932.D0EC110F8A9@bastion2.fedora.phx.redhat.com>

chitlesh has requested the commit acl on gputils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:19:33 +0000
Subject: [pkgdb] gputils: chitlesh has requested approveacls
Message-ID: <20090808111933.468F610F8AF@bastion2.fedora.phx.redhat.com>

chitlesh has requested the approveacls acl on gputils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:19:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:19:40 +0000
Subject: [pkgdb] gputils: chitlesh has requested watchbugzilla
Message-ID: <20090808111940.C836A10F8B5@bastion2.fedora.phx.redhat.com>

chitlesh has requested the watchbugzilla acl on gputils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From rrankin at fedoraproject.org  Sat Aug  8 11:35:07 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sat,  8 Aug 2009 11:35:07 +0000 (UTC)
Subject: rpms/gputils/EL-5 .cvsignore, 1.5, 1.6 gputils.spec, 1.11,
	1.12 sources, 1.5, 1.6 gputils-0.13.5.man-fr.patch, 1.1,
	NONE gputils-0.13.5.man.patch, 1.1, NONE
Message-ID: <20090808113507.AFF4911C02CB@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gputils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24351

Modified Files:
	.cvsignore gputils.spec sources 
Removed Files:
	gputils-0.13.5.man-fr.patch gputils-0.13.5.man.patch 
Log Message:

New upstream release supporting new processors 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Oct 2007 15:56:44 -0000	1.5
+++ .cvsignore	8 Aug 2009 11:35:07 -0000	1.6
@@ -1 +1 @@
-gputils-0.13.5.tar.gz
+gputils-0.13.7.tar.gz


Index: gputils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/EL-5/gputils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gputils.spec	28 Oct 2007 15:56:44 -0000	1.11
+++ gputils.spec	8 Aug 2009 11:35:07 -0000	1.12
@@ -1,15 +1,13 @@
 Name:		gputils
-Version:	0.13.5
+Version:	0.13.7
 Release:	1%{?dist}
 Summary:	Development utilities for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Outils de d?veloppement pour les microcontr?leurs PIC (TM) de Microchip (TM)
 
 Group:		Development/Languages
-License:	GPL
+License:	GPLv2+
 URL:		http://gputils.sourceforge.net
 Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}.man.patch
-Patch1:		%{name}-%{version}.man-fr.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -32,8 +30,6 @@ Voir la documentation pour une liste ? 
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -56,6 +52,13 @@ Voir la documentation pour une liste ? 
 %{_mandir}/fr/man1/*
 
 %changelog
+* Sat Aug 08 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> 0.13.7-1
+  - New upstream version with
+    Added support for all processors supported by MPLAB 8.20 
+	(except eeprom16 an d related).
+    Added support for "LIST M=?" directive.
+    Fixed several bugs.
+
 * Sun Oct 28 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.13.5-1
   - New upstream version
   - Patches to improve man pages formatting


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gputils/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Oct 2007 15:56:44 -0000	1.5
+++ sources	8 Aug 2009 11:35:07 -0000	1.6
@@ -1 +1 @@
-6d8e5ee2a80fbaffa780466e2eb8644b  gputils-0.13.5.tar.gz
+242e33919e9c318d6ac58b6db291d20e  gputils-0.13.7.tar.gz


--- gputils-0.13.5.man-fr.patch DELETED ---


--- gputils-0.13.5.man.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Aug  8 11:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:38:22 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808113822.AB90410F8A0@bastion2.fedora.phx.redhat.com>

rrankin has set the watchbugzilla acl on gputils (Fedora devel) to Approved for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:38:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:38:26 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808113826.5AC0110F8A9@bastion2.fedora.phx.redhat.com>

rrankin has set the watchcommits acl on gputils (Fedora devel) to Approved for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:38:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:38:29 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808113829.1F6D410F8AD@bastion2.fedora.phx.redhat.com>

rrankin has set the commit acl on gputils (Fedora devel) to Approved for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From pkgdb at fedoraproject.org  Sat Aug  8 11:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 11:38:32 +0000
Subject: [pkgdb] gputils had acl change status
Message-ID: <20090808113832.7E3E410F8B4@bastion2.fedora.phx.redhat.com>

rrankin has set the approveacls acl on gputils (Fedora devel) to Approved for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gputils



From victorv at fedoraproject.org  Sat Aug  8 11:53:58 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Sat,  8 Aug 2009 11:53:58 +0000 (UTC)
Subject: rpms/jemmy/devel import.log, NONE, 1.1 jemmy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808115358.3877011C02CB@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/jemmy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28740/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jemmy.spec 
Log Message:
Initial version



--- NEW FILE import.log ---
jemmy-2_3_0_0-4_fc12:HEAD:jemmy-2.3.0.0-4.fc12.src.rpm:1249732703


--- NEW FILE jemmy.spec ---
# Prevent brp-java-repack-jars from being run.
%global __jar_repack %{nil}

# Install time macros
%global target_jar build/%{name}.jar
%global target_javadoc build/javadoc/*


Name:           jemmy
Version:        2.3.0.0
Release:        4%{?dist}
Summary:        Java UI testing library

Group:          Development/Libraries
License:        CDDL
URL:            https://jemmy.dev.java.net

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#
# svn export https://jemmy.dev.java.net/svn/jemmy/trunk/Jemmy2 jemmy-2.3.0.0 --username <username>
# tar -czvf jemmy-2.3.0.0.tar.gz jemmy-2.3.0.0
#
# where <username> is a name of the user registered here: https://www.dev.java.net/servlets/Join
Source0:        jemmy-2.3.0.0.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant >= 1.6.5
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils

Requires:       java >= 1:1.6.0
Requires:       jpackage-utils

BuildArch:      noarch

%description
Jemmy is a Java UI testing library. Jemmy represents the most natural way to 
test Java UI - perform the testing right from the Java code. Jemmy is a Java 
library which provides clear and straightforward API to access Java UI. Tests 
are then just java programs, which use the API. Having the tests in Java allows 
to use all the flexibility of high level language to capture test logic and 
also do any other operations needed to be done from test.

%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
find . -type f -name '*.jar' | xargs -t rm
echo "Please, visit https://jemmy.dev.java.net for more info about Jemmy." > README.txt

%build
%ant jar javadoc

%install
%__rm -rf %{buildroot}

# jar
%__mkdir_p %{buildroot}%{_javadir}
%__cp -a %{target_jar} %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
%__ln_s ${jar} ${jar/-%{version}/}; done)

# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
%__cp -a %{target_javadoc} %{buildroot}%{_javadocdir}/%{name}

%clean
%__rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README.txt
%{_javadir}/*.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Sun Aug 02 2009 Victor Vasilyev <victor.vasilyev at sun.com> 2.3.0.0-4
- adjust macro defs
- svn export instead of checkout
* Wed Jul 30 2009 Victor Vasilyev <victor.vasilyev at sun.com> 2.3.0.0-3
- javadoc subpackage is added
* Wed Jul 30 2009 Victor Vasilyev <victor.vasilyev at sun.com> 2.3.0.0-2
- (B)R jpackage-utils
- 'define' macro -> 'global' macro
* Wed Jul 29 2009 Victor Vasilyev <victor.vasilyev at sun.com> 2.3.0.0-1
- release 2.3.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jemmy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:32:45 -0000	1.1
+++ .cvsignore	8 Aug 2009 11:53:57 -0000	1.2
@@ -0,0 +1 @@
+jemmy-2.3.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jemmy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:32:45 -0000	1.1
+++ sources	8 Aug 2009 11:53:57 -0000	1.2
@@ -0,0 +1 @@
+5175a212ed86fde706f84e1d3d256810  jemmy-2.3.0.0.tar.gz



From gemi at fedoraproject.org  Sat Aug  8 11:59:11 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 11:59:11 +0000 (UTC)
Subject: rpms/genius/devel .cvsignore, 1.7, 1.8 genius.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20090808115911.67AE811C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/genius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30648

Modified Files:
	.cvsignore genius.spec sources 
Log Message:
new release 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/genius/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 16:30:15 -0000	1.7
+++ .cvsignore	8 Aug 2009 11:59:10 -0000	1.8
@@ -1 +1 @@
-genius-1.0.6.tar.bz2
+genius-1.0.7.tar.gz


Index: genius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/genius/devel/genius.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- genius.spec	24 Jul 2009 23:51:19 -0000	1.13
+++ genius.spec	8 Aug 2009 11:59:11 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           genius
-Version:        1.0.6
-Release:        2%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator
 
 Group:          Applications/Engineering
 License:        GPLv3+
 URL:            http://www.jirka.org/genius.html
-Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.bz2
+Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vte-devel
@@ -126,6 +126,9 @@ fi
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-1
+- new release 1.0.7
+
 * 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/genius/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 16:30:15 -0000	1.7
+++ sources	8 Aug 2009 11:59:11 -0000	1.8
@@ -1 +1 @@
-9253dfa2490ff5fda0c118d9322c6608  genius-1.0.6.tar.bz2
+ac84575bc3c3ade32477d87901465d96  genius-1.0.7.tar.gz



From gemi at fedoraproject.org  Sat Aug  8 12:03:14 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 12:03:14 +0000 (UTC)
Subject: rpms/genius/F-10 .cvsignore, 1.7, 1.8 genius.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090808120314.E12E511C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/genius/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31520/F-10

Modified Files:
	.cvsignore genius.spec sources 
Log Message:
new release 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/genius/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 16:28:53 -0000	1.7
+++ .cvsignore	8 Aug 2009 12:03:14 -0000	1.8
@@ -1 +1 @@
-genius-1.0.6.tar.bz2
+genius-1.0.7.tar.gz


Index: genius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/genius/F-10/genius.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- genius.spec	17 Jun 2009 16:28:53 -0000	1.11
+++ genius.spec	8 Aug 2009 12:03:14 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           genius
-Version:        1.0.6
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator
 
 Group:          Applications/Engineering
 License:        GPLv3+
 URL:            http://www.jirka.org/genius.html
-Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.bz2
+Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vte-devel
@@ -126,6 +126,9 @@ fi
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-1
+- new release 1.0.7
+
 * Wed Jun 17 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6-1
 - new release 1.0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/genius/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 16:28:53 -0000	1.7
+++ sources	8 Aug 2009 12:03:14 -0000	1.8
@@ -1 +1 @@
-9253dfa2490ff5fda0c118d9322c6608  genius-1.0.6.tar.bz2
+ac84575bc3c3ade32477d87901465d96  genius-1.0.7.tar.gz



From gemi at fedoraproject.org  Sat Aug  8 12:03:15 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 12:03:15 +0000 (UTC)
Subject: rpms/genius/F-11 .cvsignore, 1.7, 1.8 genius.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <20090808120315.1B05B11C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/genius/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31520/F-11

Modified Files:
	.cvsignore genius.spec sources 
Log Message:
new release 1.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/genius/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jun 2009 16:30:15 -0000	1.7
+++ .cvsignore	8 Aug 2009 12:03:14 -0000	1.8
@@ -1 +1 @@
-genius-1.0.6.tar.bz2
+genius-1.0.7.tar.gz


Index: genius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/genius/F-11/genius.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- genius.spec	17 Jun 2009 16:30:15 -0000	1.12
+++ genius.spec	8 Aug 2009 12:03:14 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           genius
-Version:        1.0.6
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        An arbitrary precision integer and multiple precision floatingpoint calculator
 
 Group:          Applications/Engineering
 License:        GPLv3+
 URL:            http://www.jirka.org/genius.html
-Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.bz2
+Source0:        http://ftp.5z.com/pub/genius/genius-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vte-devel
@@ -126,6 +126,9 @@ fi
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-1
+- new release 1.0.7
+
 * Wed Jun 17 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6-1
 - new release 1.0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/genius/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jun 2009 16:30:15 -0000	1.7
+++ sources	8 Aug 2009 12:03:14 -0000	1.8
@@ -1 +1 @@
-9253dfa2490ff5fda0c118d9322c6608  genius-1.0.6.tar.bz2
+ac84575bc3c3ade32477d87901465d96  genius-1.0.7.tar.gz



From mcpierce at fedoraproject.org  Sat Aug  8 12:56:41 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat,  8 Aug 2009 12:56:41 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/devel .cvsignore, 1.6,
	1.7 rubygem-rubyforge.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20090808125641.A574D11C02CB@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11914

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
- Release 1.0.4 of RubyForge.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Feb 2009 19:25:55 -0000	1.6
+++ .cvsignore	8 Aug 2009 12:56:40 -0000	1.7
@@ -1 +1 @@
-rubyforge-1.0.3.gem
+rubyforge-1.0.4.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/rubygem-rubyforge.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-rubyforge.spec	27 Jul 2009 03:36:31 -0000	1.9
+++ rubygem-rubyforge.spec	8 Aug 2009 12:56:40 -0000	1.10
@@ -6,8 +6,8 @@
 
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
-Version: 	1.0.3
-Release: 	2%{?dist}
+Version: 	1.0.4
+Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
 URL: 		http://rubyforge.org/projects/codeforpeople
@@ -20,7 +20,7 @@ BuildArch: 	noarch
 Provides: 	rubygem(%{gemname}) = %{version}
 
 %description
-A script which automates a limited set of rubyforge operations.  
+A script which automates a limited set of rubyforge operations.
 
 
 %prep
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
+- Release 1.0.4 of RubyForge.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Feb 2009 19:25:55 -0000	1.6
+++ sources	8 Aug 2009 12:56:40 -0000	1.7
@@ -1 +1 @@
-020b8026f8804c1572b231850a283e39  rubyforge-1.0.3.gem
+923d48c9a664e32869e00af990fb83ac  rubyforge-1.0.4.gem



From mcpierce at fedoraproject.org  Sat Aug  8 13:04:34 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat,  8 Aug 2009 13:04:34 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-10 .cvsignore, 1.6,
	1.7 rubygem-rubyforge.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090808130434.BA66B11C02CB@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13757

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
- Release 1.0.4 of RubyForge.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Feb 2009 20:13:13 -0000	1.6
+++ .cvsignore	8 Aug 2009 13:04:34 -0000	1.7
@@ -1 +1 @@
-rubyforge-1.0.3.gem
+rubyforge-1.0.4.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/rubygem-rubyforge.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rubygem-rubyforge.spec	27 Feb 2009 20:13:13 -0000	1.7
+++ rubygem-rubyforge.spec	8 Aug 2009 13:04:34 -0000	1.8
@@ -6,7 +6,7 @@
 
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
-Version: 	1.0.3
+Version: 	1.0.4
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
@@ -20,7 +20,7 @@ BuildArch: 	noarch
 Provides: 	rubygem(%{gemname}) = %{version}
 
 %description
-A script which automates a limited set of rubyforge operations.  
+A script which automates a limited set of rubyforge operations.
 
 
 %prep
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
+- Release 1.0.4 of RubyForge.
+
 * Fri Feb 27 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.3-1
 - Release 1.0.3 of RubyForge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Feb 2009 20:13:13 -0000	1.6
+++ sources	8 Aug 2009 13:04:34 -0000	1.7
@@ -1 +1 @@
-020b8026f8804c1572b231850a283e39  rubyforge-1.0.3.gem
+923d48c9a664e32869e00af990fb83ac  rubyforge-1.0.4.gem



From mcpierce at fedoraproject.org  Sat Aug  8 13:11:26 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat,  8 Aug 2009 13:11:26 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-11 .cvsignore, 1.6,
	1.7 rubygem-rubyforge.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090808131126.8212B11C02CB@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15032

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
- Release 1.0.4 of RubyForge.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Feb 2009 19:25:55 -0000	1.6
+++ .cvsignore	8 Aug 2009 13:11:26 -0000	1.7
@@ -1 +1 @@
-rubyforge-1.0.3.gem
+rubyforge-1.0.4.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-11/rubygem-rubyforge.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-rubyforge.spec	27 Feb 2009 19:25:55 -0000	1.8
+++ rubygem-rubyforge.spec	8 Aug 2009 13:11:26 -0000	1.9
@@ -6,7 +6,7 @@
 
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
-Version: 	1.0.3
+Version: 	1.0.4
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
@@ -20,7 +20,7 @@ BuildArch: 	noarch
 Provides: 	rubygem(%{gemname}) = %{version}
 
 %description
-A script which automates a limited set of rubyforge operations.  
+A script which automates a limited set of rubyforge operations.
 
 
 %prep
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 1.0.4-1
+- Release 1.0.4 of RubyForge.
+
 * Fri Feb 27 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.3-1
 - Release 1.0.3 of RubyForge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Feb 2009 19:25:55 -0000	1.6
+++ sources	8 Aug 2009 13:11:26 -0000	1.7
@@ -1 +1 @@
-020b8026f8804c1572b231850a283e39  rubyforge-1.0.3.gem
+923d48c9a664e32869e00af990fb83ac  rubyforge-1.0.4.gem



From scop at fedoraproject.org  Sat Aug  8 13:18:06 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 13:18:06 +0000 (UTC)
Subject: rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.21,
	1.22
Message-ID: <20090808131806.2DC1511C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xml-commons-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16545

Modified Files:
	xml-commons-resolver.spec 
Log Message:
* Sat Aug  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 0:1.1-4.16
- Fix specfile UTF-8 encoding.



Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xml-commons-resolver.spec	27 Jul 2009 08:10:00 -0000	1.21
+++ xml-commons-resolver.spec	8 Aug 2009 13:18:05 -0000	1.22
@@ -7,7 +7,7 @@
 
 Name:           xml-commons-resolver
 Version:        1.1
-Release: 	4.15%{?dist}
+Release:        4.16%{?dist}
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        ASL 1.1
@@ -149,6 +149,9 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Aug  8 2009 Ville Skytt? <ville.skytta at iki.fi> - 0:1.1-4.16
+- Fix specfile UTF-8 encoding.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1-4.15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -212,5 +215,5 @@ fi
 * Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.0-2jpp
 - update for JPackage 1.5
 
-* Wed Nov 13 2002 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1jpp
+* Wed Nov 13 2002 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1jpp
 - Follow upstream changes, split out of xml-commons.



From ensc at fedoraproject.org  Sat Aug  8 13:33:14 2009
From: ensc at fedoraproject.org (ensc)
Date: Sat,  8 Aug 2009 13:33:14 +0000 (UTC)
Subject: rpms/clamav/devel clamav.spec,1.90,1.91
Message-ID: <20090808133314.48D6111C02CB@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20565

Modified Files:
	clamav.spec 
Log Message:
- renamed 'clamav' user/group to 'clamupdate'
- add the '%milteruser' user to the '%scanuser' group when the -scanner
  subpackage is installed



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- clamav.spec	24 Jul 2009 19:00:16 -0000	1.90
+++ clamav.spec	8 Aug 2009 13:33:12 -0000	1.91
@@ -6,7 +6,7 @@
 %bcond_with		unrar
 ##
 
-%global username	clamav
+%global username	clamupdate
 %global homedir		%_var/lib/clamav
 %global freshclamlog	%_var/log/freshclam.log
 %global milteruser	clamilt
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.2
-Release:	%release_func 2%{?snapshot:.%snapshot}
+Release:	%release_func 5%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -110,7 +110,7 @@ Requires:		clamav-filesystem = %version-
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
 Requires(post):		%__chown %__chmod
-Requires(post):		group(clamav)
+Requires(post):		group(%username)
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -344,8 +344,13 @@ export have_cv_ipv6=yes
 %configure --disable-clamav --with-dbdir=/var/lib/clamav	\
 	--enable-milter --disable-static			\
 	--disable-rpath						\
+	--with-user=%username		\
+	--with-group=%username		\
 	%{!?with_unrar:--disable-unrar}
 
+# TODO: check periodically that CLAMAVUSER is used for freshclam only
+
+
 # build with --as-needed and disable rpath
 sed -i \
 	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
@@ -463,6 +468,14 @@ rm -rf "$RPM_BUILD_ROOT"
 
 ## ------------------------------------------------------------
 
+%triggerprein filesystem -- clamav-filesystem < 0.95.2-3
+## REMOVE me in F14 or F15 (added in pre F12)
+! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { 
+	/usr/sbin/usermod  -l %username clamav || :
+	/usr/sbin/groupmod -n %username clamav || :
+	logger -t rpm/clamav "Renamed clamav user+group to %username" || :
+}
+
 %pre filesystem
 %__fe_groupadd 4 -r %username &>/dev/null || :
 %__fe_useradd  4 -r -s /sbin/nologin -d %homedir -M          \
@@ -509,6 +522,12 @@ test -e %freshclamlog || {
 	%__chown root:%username %freshclamlog
 }
 
+
+%triggerin milter -- clamav-scanner
+# Add the milteruser to the scanuser group; this is required when
+# milter and clamd communicate through local sockets
+/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || :
+
 %pre milter
 %__fe_groupadd 5 -r %milteruser &>/dev/null || :
 %__fe_useradd  5 -r -s /sbin/nologin -d %milterstatedir -M \
@@ -672,6 +691,11 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sat Aug  8 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-4
+- renamed 'clamav' user/group to 'clamupdate'
+- add the '%milteruser' user to the '%scanuser' group when the -scanner
+  subpackage is installed
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Sat Aug  8 14:46:08 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:46:08 +0000 (UTC)
Subject: rpms/kexec-tools/F-11 pofiles.tar.gz,1.2,NONE
Message-ID: <20090808144609.191FD11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kexec-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858/F-11

Removed Files:
	pofiles.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- pofiles.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:46:08 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:46:08 +0000 (UTC)
Subject: rpms/kexec-tools/F-7 pofiles.tar.gz,1.2,NONE
Message-ID: <20090808144609.208EA11C0381@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kexec-tools/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858/F-7

Removed Files:
	pofiles.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- pofiles.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:46:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:46:09 +0000 (UTC)
Subject: rpms/kexec-tools/devel pofiles.tar.gz,1.2,NONE
Message-ID: <20090808144609.B42A911C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858/devel

Removed Files:
	pofiles.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- pofiles.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:46:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:46:09 +0000 (UTC)
Subject: rpms/kexec-tools/F-9 pofiles.tar.gz,1.2,NONE
Message-ID: <20090808144609.721C811C0417@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kexec-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858/F-9

Removed Files:
	pofiles.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- pofiles.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:46:08 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:46:08 +0000 (UTC)
Subject: rpms/kexec-tools/F-10 pofiles.tar.gz,1.2,NONE
Message-ID: <20090808144609.1C0AA11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kexec-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858/F-10

Removed Files:
	pofiles.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- pofiles.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:46:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:46:09 +0000 (UTC)
Subject: rpms/kexec-tools/F-8 pofiles.tar.gz,1.2,NONE
Message-ID: <20090808144609.34DF111C0416@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kexec-tools/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858/F-8

Removed Files:
	pofiles.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- pofiles.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:49:51 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:49:51 +0000 (UTC)
Subject: rpms/eclipse-veditor/F-10 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 veditor_0_6_3.tar.bz, 1.1, NONE
Message-ID: <20090808144951.2213C11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/eclipse-veditor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5771/F-10

Modified Files:
	.cvsignore sources 
Removed Files:
	veditor_0_6_3.tar.bz 
Log Message:
Move tarball from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-veditor/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Jun 2009 16:41:15 -0000	1.1
+++ .cvsignore	8 Aug 2009 14:49:50 -0000	1.2
@@ -0,0 +1 @@
+veditor_0_6_3.tar.bz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-veditor/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Jun 2009 16:41:15 -0000	1.1
+++ sources	8 Aug 2009 14:49:50 -0000	1.2
@@ -0,0 +1 @@
+19cd810f9066c6cf65cbb6ae43eb362e  veditor_0_6_3.tar.bz


--- veditor_0_6_3.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:49:51 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:49:51 +0000 (UTC)
Subject: rpms/eclipse-veditor/F-11 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 veditor_0_6_3.tar.bz, 1.1, NONE
Message-ID: <20090808144951.B360511C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/eclipse-veditor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5771/F-11

Modified Files:
	.cvsignore sources 
Removed Files:
	veditor_0_6_3.tar.bz 
Log Message:
Move tarball from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-veditor/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Jun 2009 16:41:15 -0000	1.1
+++ .cvsignore	8 Aug 2009 14:49:51 -0000	1.2
@@ -0,0 +1 @@
+veditor_0_6_3.tar.bz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-veditor/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Jun 2009 16:41:15 -0000	1.1
+++ sources	8 Aug 2009 14:49:51 -0000	1.2
@@ -0,0 +1 @@
+19cd810f9066c6cf65cbb6ae43eb362e  veditor_0_6_3.tar.bz


--- veditor_0_6_3.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 14:49:52 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 14:49:52 +0000 (UTC)
Subject: rpms/eclipse-veditor/devel .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 veditor_0_6_3.tar.bz, 1.1, NONE
Message-ID: <20090808144952.378CE11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/eclipse-veditor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5771/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	veditor_0_6_3.tar.bz 
Log Message:
Move tarball from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-veditor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Jun 2009 16:41:15 -0000	1.1
+++ .cvsignore	8 Aug 2009 14:49:51 -0000	1.2
@@ -0,0 +1 @@
+veditor_0_6_3.tar.bz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-veditor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Jun 2009 16:41:15 -0000	1.1
+++ sources	8 Aug 2009 14:49:51 -0000	1.2
@@ -0,0 +1 @@
+19cd810f9066c6cf65cbb6ae43eb362e  veditor_0_6_3.tar.bz


--- veditor_0_6_3.tar.bz DELETED ---



From pbrobinson at fedoraproject.org  Sat Aug  8 14:53:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  8 Aug 2009 14:53:49 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/devel .cvsignore, 1.3, 1.4 gstreamer-rtsp.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090808145349.452C111C02CB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gstreamer-rtsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6758

Modified Files:
	.cvsignore gstreamer-rtsp.spec sources 
Log Message:
- Update to 0.10.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 May 2009 10:07:41 -0000	1.3
+++ .cvsignore	8 Aug 2009 14:53:48 -0000	1.4
@@ -1 +1 @@
-gst-rtsp-0.10.3.tar.bz2
+gst-rtsp-0.10.4.tar.bz2


Index: gstreamer-rtsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/gstreamer-rtsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gstreamer-rtsp.spec	25 Jul 2009 01:37:41 -0000	1.3
+++ gstreamer-rtsp.spec	8 Aug 2009 14:53:49 -0000	1.4
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gstreamer-rtsp
-Version:	0.10.3
-Release:	2%{?dist}
+Version:	0.10.4
+Release:	1%{?dist}
 Summary:	GStreamer RTSP server library
 
 Group:		Applications/Multimedia
@@ -56,8 +56,11 @@ Vala bindings for %{name}, the GStreamer
 
 %build
 %configure
-make %{?_smp_mflags}
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/gst-rtsp-server-0.10.vapi
 
 %changelog
+* Sat Aug  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.4-1
+- Update to 0.10.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 May 2009 10:07:42 -0000	1.3
+++ sources	8 Aug 2009 14:53:49 -0000	1.4
@@ -1 +1 @@
-22b9b4281d2e22a86bd74ec0f9f92b03  gst-rtsp-0.10.3.tar.bz2
+8daaca1299aeb42c6aac47b30291005b  gst-rtsp-0.10.4.tar.bz2



From pbrobinson at fedoraproject.org  Sat Aug  8 15:02:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  8 Aug 2009 15:02:42 +0000 (UTC)
Subject: rpms/gstreamer-rtsp/F-11 .cvsignore, 1.3, 1.4 gstreamer-rtsp.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090808150242.3CB4C11C02CB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gstreamer-rtsp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9634

Modified Files:
	.cvsignore gstreamer-rtsp.spec sources 
Log Message:
- Update to 0.10.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 May 2009 10:06:41 -0000	1.3
+++ .cvsignore	8 Aug 2009 15:02:41 -0000	1.4
@@ -1 +1 @@
-gst-rtsp-0.10.3.tar.bz2
+gst-rtsp-0.10.4.tar.bz2


Index: gstreamer-rtsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/F-11/gstreamer-rtsp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gstreamer-rtsp.spec	18 May 2009 10:06:41 -0000	1.2
+++ gstreamer-rtsp.spec	8 Aug 2009 15:02:41 -0000	1.3
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gstreamer-rtsp
-Version:	0.10.3
+Version:	0.10.4
 Release:	1%{?dist}
 Summary:	GStreamer RTSP server library
 
@@ -56,8 +56,11 @@ Vala bindings for %{name}, the GStreamer
 
 %build
 %configure
-make %{?_smp_mflags}
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/gst-rtsp-server-0.10.vapi
 
 %changelog
+* Sat Aug  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.4-1
+- Update to 0.10.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 18 2009 Bastien Nocera <bnocera at redhat.com> 0.10.3-1
 - Update to 0.10.3 (#501159)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-rtsp/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 May 2009 10:06:41 -0000	1.3
+++ sources	8 Aug 2009 15:02:41 -0000	1.4
@@ -1 +1 @@
-22b9b4281d2e22a86bd74ec0f9f92b03  gst-rtsp-0.10.3.tar.bz2
+8daaca1299aeb42c6aac47b30291005b  gst-rtsp-0.10.4.tar.bz2



From mcpierce at fedoraproject.org  Sat Aug  8 15:09:16 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat,  8 Aug 2009 15:09:16 +0000 (UTC)
Subject: rpms/rubygem-hoe/devel .cvsignore, 1.19, 1.20 rubygem-hoe.spec, 1.24,
	1.25 sources, 1.19, 1.20
Message-ID: <20090808150916.285A311C02CB@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11417

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
* Sat Aug  8 2009 Darryl Pierce <dpierce at redhat.com> - 2.3.3-1
- Release 2.3.3 of Hoe.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Jul 2009 12:35:34 -0000	1.19
+++ .cvsignore	8 Aug 2009 15:09:15 -0000	1.20
@@ -1 +1 @@
-hoe-2.3.2.gem
+hoe-2.3.3.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- rubygem-hoe.spec	27 Jul 2009 03:31:11 -0000	1.24
+++ rubygem-hoe.spec	8 Aug 2009 15:09:15 -0000	1.25
@@ -5,8 +5,8 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	2.3.2
-Release:    	2%{?dist}
+Version:    	2.3.3
+Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
 URL:        	http://rubyforge.org/projects/seattlerb/
@@ -14,7 +14,7 @@ Source0:    	http://gems.rubyforge.org/g
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   	ruby(abi) = 1.8
 Requires:   	rubygems
-Requires:   	rubygem(rubyforge) >= 1.0.3
+Requires:   	rubygem(rubyforge) >= 1.0.4
 Requires:   	rubygem(rake) >= 0.8.7
 BuildRequires:  rubygems
 BuildArch:  	noarch
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug  8 2009 Darryl Pierce <dpierce at redhat.com> - 2.3.3-1
+- Release 2.3.3 of Hoe.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Jul 2009 12:35:35 -0000	1.19
+++ sources	8 Aug 2009 15:09:15 -0000	1.20
@@ -1 +1 @@
-9b16f52bc6aa980837d6849940f047c1  hoe-2.3.2.gem
+07916972753011651388e7e3febda916  hoe-2.3.3.gem



From tmz at fedoraproject.org  Sat Aug  8 15:17:00 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  8 Aug 2009 15:17:00 +0000 (UTC)
Subject: rpms/puppet/devel puppet-0.24.8-activerecord-test.patch, NONE,
	1.1 puppet-0.24.8-condrestart.patch, NONE,
	1.1 puppet-0.24.8-read-proc-mounts.patch, NONE,
	1.1 puppet-0.24.8-rundir-perms.patch, NONE,
	1.1 puppet-0.24.8-status-options.patch, NONE,
	1.1 puppet-0.24.8-supplementary-groups.patch, NONE,
	1.1 puppet.spec, 1.34, 1.35
Message-ID: <20090808151700.B38F111C02CB@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/puppet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13083

Modified Files:
	puppet.spec 
Added Files:
	puppet-0.24.8-activerecord-test.patch 
	puppet-0.24.8-condrestart.patch 
	puppet-0.24.8-read-proc-mounts.patch 
	puppet-0.24.8-rundir-perms.patch 
	puppet-0.24.8-status-options.patch 
	puppet-0.24.8-supplementary-groups.patch 
Log Message:
Fix a number of packaging and source bugs

* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
- Fix status -p handling on older RHEL (#501577)
- Fix condrestart when daemon's aren't running (#480600)
- Fix timeout reading /proc/mounts (upstream #1963)
- Fix permissions on /var/log/puppet (#495096)
- Fix rails test for activerecord-2.3 (#515728)

* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
- Fix permissions on /var/run/puppet/ (#495096)
- Support initializing supplementary groups (#1806, #475201, Till Maas)
- Own the correct vim directory
- Move ext/ outside of doc datadir (rpmlint)
- Require ruby(selinux) rather then libselinux-ruby (#507848)


puppet-0.24.8-activerecord-test.patch:
 rails.rb |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE puppet-0.24.8-activerecord-test.patch ---
>From a7a9fb5afaa58922bb6ecb49e04b5ed59f381d22 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke at madstop.com>
Date: Thu, 23 Apr 2009 18:56:30 -0500
Subject: [PATCH/puppet] Fixing the Rails feature test to require 2.3.x

Signed-off-by: Luke Kanies <luke at madstop.com>
---
 lib/puppet/feature/rails.rb |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 63e6f00..561863c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,24 +28,11 @@ Puppet.features.add(:rails) do
         end
     end
 
-    # If we couldn't find it the normal way, try using a Gem.
-    unless defined? ActiveRecord
-        begin
-            require 'rubygems'
-            require 'rails'
-        rescue LoadError
-            # Nothing
-        end
+    unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
+        Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
+        raise "ActiveRecord 2.3 required for StoreConfigs"
     end
 
-    # We check a fairly specific class, so that we can be sure that we've
-    # loaded a new enough version of AR that will support the features we
-    # actually use.
-    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
-        require 'puppet/rails'
-        true
-    else
-        false
-    end
+    true
 end
 
-- 
1.6.4


puppet-0.24.8-condrestart.patch:
 client.init |    7 ++++++-
 server.init |   12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE puppet-0.24.8-condrestart.patch ---
>From fc161e4a5ad4d470d0fe17b734004ab675eaa6ae Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 10:22:19 -0400
Subject: [PATCH/puppet 2/2] conf/redhat/*.init: Fix condrestart/try-restart

Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
test for whether to restart the daemons.  This caused condrestart to
start the daemons even when they were not running, in cases where they
had died or been killed without cleaning up the $pidfile/$lockfile.

This was reported by Ingvar Hagelund in Red Hat bug #480600.
---
 conf/redhat/client.init |    7 ++++++-
 conf/redhat/server.init |   11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index f40e81d..fda156c 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -67,6 +67,10 @@ rh_status() {
     status $statusopts $puppetd
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -86,7 +90,8 @@ case "$1" in
         reload
 	;;
   condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
         rh_status
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a..74cb52f 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -89,7 +89,7 @@ genconfig() {
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
-puppetmaster_status() {
+rh_status() {
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
@@ -103,6 +103,10 @@ puppetmaster_status() {
     return $RETVAL
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 case "$1" in
   start)
 	start
@@ -114,10 +118,11 @@ case "$1" in
         restart
 	;;
   condrestart)
-	[ -f "$lockfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
-    puppetmaster_status
+    rh_status
 	;;
   genconfig)
 	genconfig
-- 
1.6.3.3


puppet-0.24.8-read-proc-mounts.patch:
 selinux.rb |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-read-proc-mounts.patch ---
>From 0ce5b22a45d675de6969f3f5e5d4565be0a2d2d1 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky at fedoraproject.org>
Date: Sat, 11 Jul 2009 01:57:52 -0400
Subject: [PATCH/puppet] Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads

This works around a linux kernel bug that causes a select() on
/proc/mounts to hang.
---
 lib/puppet/util/selinux.rb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index cd3b2ac..dc5daec 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
 
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
+        mounts = ""
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
-            mounts = mountfh.read
+            mountfh = File.open("/proc/mounts")
+            # We use read_nonblock() in a loop rather than read() to work-around
+            # a linux kernel bug.  See ticket #1963 for details.
+            while true
+                mounts += mountfh.read_nonblock(1024)
+            end
+        rescue EOFError
             mountfh.close
         rescue
             return nil
-- 
1.6.3.3


puppet-0.24.8-rundir-perms.patch:
 defaults.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE puppet-0.24.8-rundir-perms.patch ---
>From f9ccc92662c53d9890e337d4e9f1629eb1ff650f Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:19:01 +0200
Subject: [PATCH/puppet 1/6] Simplest fix for #495096 as it applies to the Fedora based distributions using the Red Hat RPM. Story continues.

---
 lib/puppet/defaults.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e36dd70..077faab 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -68,7 +68,7 @@ module Puppet
         },
         :rundir => { 
             :default => rundir,
-            :mode => 01777,
+            :mode => 0755,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
-- 
1.6.3.3


puppet-0.24.8-status-options.patch:
 client.init |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-status-options.patch ---
>From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 09:08:17 -0400
Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL

On RHEL < 5, the status function does not accept a -p option.  Using it
causes 'service puppet status' to produce erroneous output.  This was
also reported by Aaron Dummer in Red Hat bug #501577.
---
 conf/redhat/client.init |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab1..f40e81d 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -62,6 +62,11 @@ restart() {
     start
 }
 
+rh_status() {
+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
+    status $statusopts $puppetd
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -84,8 +89,7 @@ case "$1" in
 	[ -f "$pidfile" ] && restart
 	;;
   status)
-        status -p "$pidfile" $puppetd
-        RETVAL=$?
+        rh_status
 	;;
   once)
         shift
-- 
1.6.3.3


puppet-0.24.8-supplementary-groups.patch:
 util.rb             |    5 +++--
 util/suidmanager.rb |   12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE puppet-0.24.8-supplementary-groups.patch ---
>From 2a401c6897af3abbc27dfaaf162556745267d6b2 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:30:19 +0200
Subject: [PATCH/puppet 2/6] Support supplementary groups (Till Maas)

---
 lib/puppet/util.rb             |    5 +++--
 lib/puppet/util/suidmanager.rb |   11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index f8a8721..51a2a16 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -58,10 +58,11 @@ module Util
             end
             unless Puppet::Util::SUIDManager.uid == user
                 begin
+                    Puppet::Util::SUIDManager.initgroups(user)
                     Puppet::Util::SUIDManager.uid = user 
                     Puppet::Util::SUIDManager.euid = user 
-                rescue
-                    $stderr.puts "could not change to user %s" % user
+                rescue => detail
+                    $stderr.puts "could not change to user %s: %s" % [user, detail]
                     exit(74)
                 end
             end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index b071dca..9f6e3b6 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
     extend Forwardable
 
     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
-                               :uid=, :uid, :gid=, :gid ]
+                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
 
     to_delegate_to_process.each do |method|
         def_delegator Process, method
@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
         # We set both because some programs like to drop privs, i.e. bash.
         old_uid, old_gid = self.uid, self.gid
         old_euid, old_egid = self.euid, self.egid
+        old_groups = self.groups
         begin
             self.egid = convert_xid :gid, new_gid if new_gid
+            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
             self.euid = convert_xid :uid, new_uid if new_uid
   
             yield
         ensure
             self.euid, self.egid = old_euid, old_egid
+            self.groups = old_groups
         end
     end
     module_function :asuser
@@ -49,6 +52,12 @@ module Puppet::Util::SUIDManager
     end
     module_function :convert_xid
 
+    # Initialize supplementary groups
+    def initgroups(user)
+        require 'etc'
+        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
+    end
+    module_function :initgroups
 
     def run_and_capture(command, new_uid=nil, new_gid=nil)
         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
-- 
1.6.3.3



Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- puppet.spec	26 Jul 2009 19:39:51 -0000	1.34
+++ puppet.spec	8 Aug 2009 15:17:00 -0000	1.35
@@ -6,11 +6,25 @@
 
 Name:           puppet
 Version:        0.24.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+
+# https://bugzilla.redhat.com/495096
+Patch0:         puppet-0.24.8-rundir-perms.patch
+# https://bugzilla.redhat.com/475201
+Patch1:         puppet-0.24.8-supplementary-groups.patch
+# http://projects.reductivelabs.com/issues/1963
+Patch2:         puppet-0.24.8-read-proc-mounts.patch
+# https://bugzilla.redhat.com/501577
+Patch3:         puppet-0.24.8-status-options.patch
+# https://bugzilla.redhat.com/480600
+Patch4:         puppet-0.24.8-condrestart.patch
+# https://bugzilla.redhat.com/515728
+Patch5:         puppet-0.24.8-activerecord-test.patch
+
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,10 +38,14 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
-# Pull in libselinux-ruby where it is available
-%if 0%{?fedora} >=9
+# Pull in ruby selinux bindings where available
+%if 0%{?fedora}
+%if 0%{?fedora} >= 12
+%{!?_without_selinux:Requires: ruby(selinux)}
+%else
 %{!?_without_selinux:Requires: libselinux-ruby}
 %endif
+%endif
 
 Requires:       facter >= 1.5
 Requires:       ruby >= 1.8.1
@@ -61,6 +79,15 @@ The server can also function as a certif
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%if 0%{?fedora} >= 11
+%patch5 -p1
+%endif
+
 # Move puppetca, puppetd, and puppetmasterd to sbin
 mkdir sbin
 mv bin/puppet{ca,d,masterd} sbin/
@@ -75,6 +102,7 @@ done
 for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
+chmod +x ext/puppetstoredconfigclean.rb
 
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
@@ -86,7 +114,7 @@ ruby install.rb --destdir=%{buildroot} -
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
@@ -101,6 +129,12 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install the ext/ directory to %{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}/%{name}
+cp -a ext/ %{buildroot}%{_datadir}/%{name}
+# emacs and vim bits are installed elsewhere
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+
 # Install emacs mode files
 emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
 install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
@@ -114,7 +148,7 @@ install -Dp -m0644 ext/vim/syntax/puppet
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG COPYING LICENSE README examples ext
+%doc CHANGELOG COPYING LICENSE README examples
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
@@ -130,7 +164,8 @@ install -Dp -m0644 ext/vim/syntax/puppet
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # We don't want to require emacs or vim, so we need to own these dirs
 %{_datadir}/emacs
-%{_datadir}/vim/vimfiles
+%{_datadir}/vim
+%{_datadir}/%{name}
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -202,9 +237,23 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
+- Fix status -p handling on older RHEL (#501577)
+- Fix condrestart when daemon's aren't running (#480600)
+- Fix timeout reading /proc/mounts (upstream #1963)
+- Fix permissions on /var/log/puppet (#495096)
+- Fix rails test for activerecord-2.3 (#515728)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
+- Fix permissions on /var/run/puppet/ (#495096)
+- Support initializing supplementary groups (#1806, #475201, Till Maas)
+- Own the correct vim directory
+- Move ext/ outside of doc datadir (rpmlint)
+- Require ruby(selinux) rather then libselinux-ruby (#507848)
+
 * Fri May 29 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-2
 - Make Augeas and SELinux requirements build time options
 - Install emacs mode and vim syntax files (#491437)



From mcpierce at fedoraproject.org  Sat Aug  8 15:17:03 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat,  8 Aug 2009 15:17:03 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-10 .cvsignore, 1.19, 1.20 rubygem-hoe.spec, 1.22,
	1.23 sources, 1.19, 1.20
Message-ID: <20090808151703.B648211C02CB@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13070

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
* Sat Aug  8 2009 Darryl Pierce <dpierce at redhat.com> - 2.3.3-1
- Release 2.3.3 of Hoe.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Jul 2009 12:43:07 -0000	1.19
+++ .cvsignore	8 Aug 2009 15:17:03 -0000	1.20
@@ -1 +1 @@
-hoe-2.3.2.gem
+hoe-2.3.3.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/rubygem-hoe.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- rubygem-hoe.spec	1 Jul 2009 12:43:07 -0000	1.22
+++ rubygem-hoe.spec	8 Aug 2009 15:17:03 -0000	1.23
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	2.3.2
+Version:    	2.3.3
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -14,7 +14,7 @@ Source0:    	http://gems.rubyforge.org/g
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   	ruby(abi) = 1.8
 Requires:   	rubygems
-Requires:   	rubygem(rubyforge) >= 1.0.3
+Requires:   	rubygem(rubyforge) >= 1.0.4
 Requires:   	rubygem(rake) >= 0.8.7
 BuildRequires:  rubygems
 BuildArch:  	noarch
@@ -71,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug  8 2009 Darryl L. Pierce <cpierce at redhat.com> - 2.3.3-1
+- Release 2.3.3 of Hoe.
+- Changes RubyForge dependency to >= 1.0.4
+
 * Wed Jul  1 2009 Darryl Pierce <dpierce at redhat.com> - 2.3.2-1
 - Release 2.3.2 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Jul 2009 12:43:07 -0000	1.19
+++ sources	8 Aug 2009 15:17:03 -0000	1.20
@@ -1 +1 @@
-9b16f52bc6aa980837d6849940f047c1  hoe-2.3.2.gem
+07916972753011651388e7e3febda916  hoe-2.3.3.gem



From mcpierce at fedoraproject.org  Sat Aug  8 15:24:44 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat,  8 Aug 2009 15:24:44 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-11 .cvsignore, 1.19, 1.20 rubygem-hoe.spec, 1.24,
	1.25 sources, 1.19, 1.20
Message-ID: <20090808152444.A9D0E11C02CB@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14730

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 2.3.3-1
- Release 2.3.3 of Hoe.
- Changed RubyForge dependecy to >= 1.0.4.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Jul 2009 13:02:14 -0000	1.19
+++ .cvsignore	8 Aug 2009 15:24:44 -0000	1.20
@@ -1 +1 @@
-hoe-2.3.2.gem
+hoe-2.3.3.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/rubygem-hoe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- rubygem-hoe.spec	1 Jul 2009 13:02:14 -0000	1.24
+++ rubygem-hoe.spec	8 Aug 2009 15:24:44 -0000	1.25
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	2.3.2
+Version:    	2.3.3
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -14,7 +14,7 @@ Source0:    	http://gems.rubyforge.org/g
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   	ruby(abi) = 1.8
 Requires:   	rubygems
-Requires:   	rubygem(rubyforge) >= 1.0.3
+Requires:   	rubygem(rubyforge) >= 1.0.4
 Requires:   	rubygem(rake) >= 0.8.7
 BuildRequires:  rubygems
 BuildArch:  	noarch
@@ -71,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug  8 2009 Darryl L. Pierce <dpierce at redhat.com> - 2.3.3-1
+- Release 2.3.3 of Hoe.
+- Changed RubyForge dependecy to >= 1.0.4.
+
 * Wed Jul  1 2009 Darryl Pierce <dpierce at redhat.com> - 2.3.2-1
 - Release 2.3.2 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Jul 2009 13:02:14 -0000	1.19
+++ sources	8 Aug 2009 15:24:44 -0000	1.20
@@ -1 +1 @@
-9b16f52bc6aa980837d6849940f047c1  hoe-2.3.2.gem
+07916972753011651388e7e3febda916  hoe-2.3.3.gem



From tmz at fedoraproject.org  Sat Aug  8 15:48:40 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  8 Aug 2009 15:48:40 +0000 (UTC)
Subject: rpms/puppet/F-11 puppet-0.24.8-activerecord-test.patch, NONE,
	1.1 puppet-0.24.8-condrestart.patch, NONE,
	1.1 puppet-0.24.8-read-proc-mounts.patch, NONE,
	1.1 puppet-0.24.8-rundir-perms.patch, NONE,
	1.1 puppet-0.24.8-status-options.patch, NONE,
	1.1 puppet-0.24.8-supplementary-groups.patch, NONE,
	1.1 puppet.spec, 1.32, 1.33
Message-ID: <20090808154840.28FFB11C02CB@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/puppet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924

Modified Files:
	puppet.spec 
Added Files:
	puppet-0.24.8-activerecord-test.patch 
	puppet-0.24.8-condrestart.patch 
	puppet-0.24.8-read-proc-mounts.patch 
	puppet-0.24.8-rundir-perms.patch 
	puppet-0.24.8-status-options.patch 
	puppet-0.24.8-supplementary-groups.patch 
Log Message:
Fix a number of packaging and source bugs

* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
- Fix status -p handling on older RHEL (#501577)
- Fix condrestart when daemon's aren't running (#480600)
- Fix timeout reading /proc/mounts (upstream #1963)
- Fix permissions on /var/log/puppet (#495096)
- Fix rails test for activerecord-2.3 (#515728)

* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
- Fix permissions on /var/run/puppet/ (#495096)
- Support initializing supplementary groups (#1806, #475201, Till Maas)
- Own the correct vim directory
- Move ext/ outside of doc datadir (rpmlint)
- Require ruby(selinux) rather then libselinux-ruby (#507848)


puppet-0.24.8-activerecord-test.patch:
 rails.rb |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE puppet-0.24.8-activerecord-test.patch ---
>From a7a9fb5afaa58922bb6ecb49e04b5ed59f381d22 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke at madstop.com>
Date: Thu, 23 Apr 2009 18:56:30 -0500
Subject: [PATCH/puppet] Fixing the Rails feature test to require 2.3.x

Signed-off-by: Luke Kanies <luke at madstop.com>
---
 lib/puppet/feature/rails.rb |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 63e6f00..561863c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,24 +28,11 @@ Puppet.features.add(:rails) do
         end
     end
 
-    # If we couldn't find it the normal way, try using a Gem.
-    unless defined? ActiveRecord
-        begin
-            require 'rubygems'
-            require 'rails'
-        rescue LoadError
-            # Nothing
-        end
+    unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
+        Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
+        raise "ActiveRecord 2.3 required for StoreConfigs"
     end
 
-    # We check a fairly specific class, so that we can be sure that we've
-    # loaded a new enough version of AR that will support the features we
-    # actually use.
-    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
-        require 'puppet/rails'
-        true
-    else
-        false
-    end
+    true
 end
 
-- 
1.6.4


puppet-0.24.8-condrestart.patch:
 client.init |    7 ++++++-
 server.init |   12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE puppet-0.24.8-condrestart.patch ---
>From fc161e4a5ad4d470d0fe17b734004ab675eaa6ae Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 10:22:19 -0400
Subject: [PATCH/puppet 2/2] conf/redhat/*.init: Fix condrestart/try-restart

Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
test for whether to restart the daemons.  This caused condrestart to
start the daemons even when they were not running, in cases where they
had died or been killed without cleaning up the $pidfile/$lockfile.

This was reported by Ingvar Hagelund in Red Hat bug #480600.
---
 conf/redhat/client.init |    7 ++++++-
 conf/redhat/server.init |   11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index f40e81d..fda156c 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -67,6 +67,10 @@ rh_status() {
     status $statusopts $puppetd
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -86,7 +90,8 @@ case "$1" in
         reload
 	;;
   condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
         rh_status
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a..74cb52f 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -89,7 +89,7 @@ genconfig() {
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
-puppetmaster_status() {
+rh_status() {
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
@@ -103,6 +103,10 @@ puppetmaster_status() {
     return $RETVAL
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 case "$1" in
   start)
 	start
@@ -114,10 +118,11 @@ case "$1" in
         restart
 	;;
   condrestart)
-	[ -f "$lockfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
-    puppetmaster_status
+    rh_status
 	;;
   genconfig)
 	genconfig
-- 
1.6.3.3


puppet-0.24.8-read-proc-mounts.patch:
 selinux.rb |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-read-proc-mounts.patch ---
>From 0ce5b22a45d675de6969f3f5e5d4565be0a2d2d1 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky at fedoraproject.org>
Date: Sat, 11 Jul 2009 01:57:52 -0400
Subject: [PATCH/puppet] Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads

This works around a linux kernel bug that causes a select() on
/proc/mounts to hang.
---
 lib/puppet/util/selinux.rb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index cd3b2ac..dc5daec 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
 
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
+        mounts = ""
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
-            mounts = mountfh.read
+            mountfh = File.open("/proc/mounts")
+            # We use read_nonblock() in a loop rather than read() to work-around
+            # a linux kernel bug.  See ticket #1963 for details.
+            while true
+                mounts += mountfh.read_nonblock(1024)
+            end
+        rescue EOFError
             mountfh.close
         rescue
             return nil
-- 
1.6.3.3


puppet-0.24.8-rundir-perms.patch:
 defaults.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE puppet-0.24.8-rundir-perms.patch ---
>From f9ccc92662c53d9890e337d4e9f1629eb1ff650f Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:19:01 +0200
Subject: [PATCH/puppet 1/6] Simplest fix for #495096 as it applies to the Fedora based distributions using the Red Hat RPM. Story continues.

---
 lib/puppet/defaults.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e36dd70..077faab 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -68,7 +68,7 @@ module Puppet
         },
         :rundir => { 
             :default => rundir,
-            :mode => 01777,
+            :mode => 0755,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
-- 
1.6.3.3


puppet-0.24.8-status-options.patch:
 client.init |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-status-options.patch ---
>From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 09:08:17 -0400
Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL

On RHEL < 5, the status function does not accept a -p option.  Using it
causes 'service puppet status' to produce erroneous output.  This was
also reported by Aaron Dummer in Red Hat bug #501577.
---
 conf/redhat/client.init |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab1..f40e81d 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -62,6 +62,11 @@ restart() {
     start
 }
 
+rh_status() {
+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
+    status $statusopts $puppetd
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -84,8 +89,7 @@ case "$1" in
 	[ -f "$pidfile" ] && restart
 	;;
   status)
-        status -p "$pidfile" $puppetd
-        RETVAL=$?
+        rh_status
 	;;
   once)
         shift
-- 
1.6.3.3


puppet-0.24.8-supplementary-groups.patch:
 util.rb             |    5 +++--
 util/suidmanager.rb |   12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE puppet-0.24.8-supplementary-groups.patch ---
>From 2a401c6897af3abbc27dfaaf162556745267d6b2 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:30:19 +0200
Subject: [PATCH/puppet 2/6] Support supplementary groups (Till Maas)

---
 lib/puppet/util.rb             |    5 +++--
 lib/puppet/util/suidmanager.rb |   11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index f8a8721..51a2a16 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -58,10 +58,11 @@ module Util
             end
             unless Puppet::Util::SUIDManager.uid == user
                 begin
+                    Puppet::Util::SUIDManager.initgroups(user)
                     Puppet::Util::SUIDManager.uid = user 
                     Puppet::Util::SUIDManager.euid = user 
-                rescue
-                    $stderr.puts "could not change to user %s" % user
+                rescue => detail
+                    $stderr.puts "could not change to user %s: %s" % [user, detail]
                     exit(74)
                 end
             end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index b071dca..9f6e3b6 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
     extend Forwardable
 
     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
-                               :uid=, :uid, :gid=, :gid ]
+                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
 
     to_delegate_to_process.each do |method|
         def_delegator Process, method
@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
         # We set both because some programs like to drop privs, i.e. bash.
         old_uid, old_gid = self.uid, self.gid
         old_euid, old_egid = self.euid, self.egid
+        old_groups = self.groups
         begin
             self.egid = convert_xid :gid, new_gid if new_gid
+            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
             self.euid = convert_xid :uid, new_uid if new_uid
   
             yield
         ensure
             self.euid, self.egid = old_euid, old_egid
+            self.groups = old_groups
         end
     end
     module_function :asuser
@@ -49,6 +52,12 @@ module Puppet::Util::SUIDManager
     end
     module_function :convert_xid
 
+    # Initialize supplementary groups
+    def initgroups(user)
+        require 'etc'
+        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
+    end
+    module_function :initgroups
 
     def run_and_capture(command, new_uid=nil, new_gid=nil)
         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
-- 
1.6.3.3



Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/F-11/puppet.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- puppet.spec	24 Mar 2009 00:08:05 -0000	1.32
+++ puppet.spec	8 Aug 2009 15:48:39 -0000	1.33
@@ -1,13 +1,30 @@
+# Augeas and SELinux requirements may be disabled at build time by passing
+# --without augeas and/or --without selinux to rpmbuild or mock
+
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %define confdir conf/redhat
 
 Name:           puppet
 Version:        0.24.8
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+
+# https://bugzilla.redhat.com/495096
+Patch0:         puppet-0.24.8-rundir-perms.patch
+# https://bugzilla.redhat.com/475201
+Patch1:         puppet-0.24.8-supplementary-groups.patch
+# http://projects.reductivelabs.com/issues/1963
+Patch2:         puppet-0.24.8-read-proc-mounts.patch
+# https://bugzilla.redhat.com/501577
+Patch3:         puppet-0.24.8-status-options.patch
+# https://bugzilla.redhat.com/480600
+Patch4:         puppet-0.24.8-condrestart.patch
+# https://bugzilla.redhat.com/515728
+Patch5:         puppet-0.24.8-activerecord-test.patch
+
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,14 +38,19 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
-# Pull in libselinux-ruby where it is available
-%if 0%{?fedora} >=9
-Requires:       libselinux-ruby
+# Pull in ruby selinux bindings where available
+%if 0%{?fedora}
+%if 0%{?fedora} >= 12
+%{!?_without_selinux:Requires: ruby(selinux)}
+%else
+%{!?_without_selinux:Requires: libselinux-ruby}
+%endif
 %endif
 
 Requires:       facter >= 1.5
 Requires:       ruby >= 1.8.1
-Requires:       ruby-augeas
+%{!?_without_augeas:Requires: ruby-augeas}
+
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -57,6 +79,15 @@ The server can also function as a certif
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%if 0%{?fedora} >= 11
+%patch5 -p1
+%endif
+
 # Move puppetca, puppetd, and puppetmasterd to sbin
 mkdir sbin
 mv bin/puppet{ca,d,masterd} sbin/
@@ -71,6 +102,7 @@ done
 for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
+chmod +x ext/puppetstoredconfigclean.rb
 
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
@@ -82,7 +114,7 @@ ruby install.rb --destdir=%{buildroot} -
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
@@ -97,8 +129,26 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install the ext/ directory to %{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}/%{name}
+cp -a ext/ %{buildroot}%{_datadir}/%{name}
+# emacs and vim bits are installed elsewhere
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+
+# Install emacs mode files
+emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
+install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
+install -Dp -m0644 ext/emacs/puppet-mode-init.el \
+    $emacsdir/site-start.d/puppet-mode-init.el
+
+# Install vim syntax files
+vimdir=%{buildroot}%{_datadir}/vim/vimfiles
+install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
+install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
+
 %files
 %defattr(-, root, root, 0755)
+%doc CHANGELOG COPYING LICENSE README examples
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
@@ -111,8 +161,11 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README examples
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+# We don't want to require emacs or vim, so we need to own these dirs
+%{_datadir}/emacs
+%{_datadir}/vim
+%{_datadir}/%{name}
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -184,6 +237,28 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
+- Fix status -p handling on older RHEL (#501577)
+- Fix condrestart when daemon's aren't running (#480600)
+- Fix timeout reading /proc/mounts (upstream #1963)
+- Fix permissions on /var/log/puppet (#495096)
+- Fix rails test for activerecord-2.3 (#515728)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
+- Fix permissions on /var/run/puppet/ (#495096)
+- Support initializing supplementary groups (#1806, #475201, Till Maas)
+- Own the correct vim directory
+- Move ext/ outside of doc datadir (rpmlint)
+- Require ruby(selinux) rather then libselinux-ruby (#507848)
+
+* Fri May 29 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-2
+- Make Augeas and SELinux requirements build time options
+- Install emacs mode and vim syntax files (#491437)
+- Include ext/ directory in %%doc
+
 * Mon Mar 23 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-1
 - Update to 0.24.8
 - Quiet output from %%pre



From tmz at fedoraproject.org  Sat Aug  8 15:49:04 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  8 Aug 2009 15:49:04 +0000 (UTC)
Subject: rpms/puppet/F-10 puppet-0.24.8-activerecord-test.patch, NONE,
	1.1 puppet-0.24.8-condrestart.patch, NONE,
	1.1 puppet-0.24.8-read-proc-mounts.patch, NONE,
	1.1 puppet-0.24.8-rundir-perms.patch, NONE,
	1.1 puppet-0.24.8-status-options.patch, NONE,
	1.1 puppet-0.24.8-supplementary-groups.patch, NONE,
	1.1 puppet.spec, 1.31, 1.32
Message-ID: <20090808154904.2BDA611C02CB@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/puppet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20083

Modified Files:
	puppet.spec 
Added Files:
	puppet-0.24.8-activerecord-test.patch 
	puppet-0.24.8-condrestart.patch 
	puppet-0.24.8-read-proc-mounts.patch 
	puppet-0.24.8-rundir-perms.patch 
	puppet-0.24.8-status-options.patch 
	puppet-0.24.8-supplementary-groups.patch 
Log Message:
Fix a number of packaging and source bugs

* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
- Fix status -p handling on older RHEL (#501577)
- Fix condrestart when daemon's aren't running (#480600)
- Fix timeout reading /proc/mounts (upstream #1963)
- Fix permissions on /var/log/puppet (#495096)
- Fix rails test for activerecord-2.3 (#515728)

* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
- Fix permissions on /var/run/puppet/ (#495096)
- Support initializing supplementary groups (#1806, #475201, Till Maas)
- Own the correct vim directory
- Move ext/ outside of doc datadir (rpmlint)
- Require ruby(selinux) rather then libselinux-ruby (#507848)


puppet-0.24.8-activerecord-test.patch:
 rails.rb |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE puppet-0.24.8-activerecord-test.patch ---
>From a7a9fb5afaa58922bb6ecb49e04b5ed59f381d22 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke at madstop.com>
Date: Thu, 23 Apr 2009 18:56:30 -0500
Subject: [PATCH/puppet] Fixing the Rails feature test to require 2.3.x

Signed-off-by: Luke Kanies <luke at madstop.com>
---
 lib/puppet/feature/rails.rb |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 63e6f00..561863c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,24 +28,11 @@ Puppet.features.add(:rails) do
         end
     end
 
-    # If we couldn't find it the normal way, try using a Gem.
-    unless defined? ActiveRecord
-        begin
-            require 'rubygems'
-            require 'rails'
-        rescue LoadError
-            # Nothing
-        end
+    unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
+        Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
+        raise "ActiveRecord 2.3 required for StoreConfigs"
     end
 
-    # We check a fairly specific class, so that we can be sure that we've
-    # loaded a new enough version of AR that will support the features we
-    # actually use.
-    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
-        require 'puppet/rails'
-        true
-    else
-        false
-    end
+    true
 end
 
-- 
1.6.4


puppet-0.24.8-condrestart.patch:
 client.init |    7 ++++++-
 server.init |   12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE puppet-0.24.8-condrestart.patch ---
>From fc161e4a5ad4d470d0fe17b734004ab675eaa6ae Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 10:22:19 -0400
Subject: [PATCH/puppet 2/2] conf/redhat/*.init: Fix condrestart/try-restart

Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
test for whether to restart the daemons.  This caused condrestart to
start the daemons even when they were not running, in cases where they
had died or been killed without cleaning up the $pidfile/$lockfile.

This was reported by Ingvar Hagelund in Red Hat bug #480600.
---
 conf/redhat/client.init |    7 ++++++-
 conf/redhat/server.init |   11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index f40e81d..fda156c 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -67,6 +67,10 @@ rh_status() {
     status $statusopts $puppetd
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -86,7 +90,8 @@ case "$1" in
         reload
 	;;
   condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
         rh_status
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a..74cb52f 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -89,7 +89,7 @@ genconfig() {
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
-puppetmaster_status() {
+rh_status() {
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
@@ -103,6 +103,10 @@ puppetmaster_status() {
     return $RETVAL
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 case "$1" in
   start)
 	start
@@ -114,10 +118,11 @@ case "$1" in
         restart
 	;;
   condrestart)
-	[ -f "$lockfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
-    puppetmaster_status
+    rh_status
 	;;
   genconfig)
 	genconfig
-- 
1.6.3.3


puppet-0.24.8-read-proc-mounts.patch:
 selinux.rb |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-read-proc-mounts.patch ---
>From 0ce5b22a45d675de6969f3f5e5d4565be0a2d2d1 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky at fedoraproject.org>
Date: Sat, 11 Jul 2009 01:57:52 -0400
Subject: [PATCH/puppet] Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads

This works around a linux kernel bug that causes a select() on
/proc/mounts to hang.
---
 lib/puppet/util/selinux.rb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index cd3b2ac..dc5daec 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
 
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
+        mounts = ""
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
-            mounts = mountfh.read
+            mountfh = File.open("/proc/mounts")
+            # We use read_nonblock() in a loop rather than read() to work-around
+            # a linux kernel bug.  See ticket #1963 for details.
+            while true
+                mounts += mountfh.read_nonblock(1024)
+            end
+        rescue EOFError
             mountfh.close
         rescue
             return nil
-- 
1.6.3.3


puppet-0.24.8-rundir-perms.patch:
 defaults.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE puppet-0.24.8-rundir-perms.patch ---
>From f9ccc92662c53d9890e337d4e9f1629eb1ff650f Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:19:01 +0200
Subject: [PATCH/puppet 1/6] Simplest fix for #495096 as it applies to the Fedora based distributions using the Red Hat RPM. Story continues.

---
 lib/puppet/defaults.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e36dd70..077faab 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -68,7 +68,7 @@ module Puppet
         },
         :rundir => { 
             :default => rundir,
-            :mode => 01777,
+            :mode => 0755,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
-- 
1.6.3.3


puppet-0.24.8-status-options.patch:
 client.init |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-status-options.patch ---
>From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 09:08:17 -0400
Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL

On RHEL < 5, the status function does not accept a -p option.  Using it
causes 'service puppet status' to produce erroneous output.  This was
also reported by Aaron Dummer in Red Hat bug #501577.
---
 conf/redhat/client.init |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab1..f40e81d 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -62,6 +62,11 @@ restart() {
     start
 }
 
+rh_status() {
+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
+    status $statusopts $puppetd
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -84,8 +89,7 @@ case "$1" in
 	[ -f "$pidfile" ] && restart
 	;;
   status)
-        status -p "$pidfile" $puppetd
-        RETVAL=$?
+        rh_status
 	;;
   once)
         shift
-- 
1.6.3.3


puppet-0.24.8-supplementary-groups.patch:
 util.rb             |    5 +++--
 util/suidmanager.rb |   12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE puppet-0.24.8-supplementary-groups.patch ---
>From 2a401c6897af3abbc27dfaaf162556745267d6b2 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:30:19 +0200
Subject: [PATCH/puppet 2/6] Support supplementary groups (Till Maas)

---
 lib/puppet/util.rb             |    5 +++--
 lib/puppet/util/suidmanager.rb |   11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index f8a8721..51a2a16 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -58,10 +58,11 @@ module Util
             end
             unless Puppet::Util::SUIDManager.uid == user
                 begin
+                    Puppet::Util::SUIDManager.initgroups(user)
                     Puppet::Util::SUIDManager.uid = user 
                     Puppet::Util::SUIDManager.euid = user 
-                rescue
-                    $stderr.puts "could not change to user %s" % user
+                rescue => detail
+                    $stderr.puts "could not change to user %s: %s" % [user, detail]
                     exit(74)
                 end
             end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index b071dca..9f6e3b6 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
     extend Forwardable
 
     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
-                               :uid=, :uid, :gid=, :gid ]
+                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
 
     to_delegate_to_process.each do |method|
         def_delegator Process, method
@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
         # We set both because some programs like to drop privs, i.e. bash.
         old_uid, old_gid = self.uid, self.gid
         old_euid, old_egid = self.euid, self.egid
+        old_groups = self.groups
         begin
             self.egid = convert_xid :gid, new_gid if new_gid
+            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
             self.euid = convert_xid :uid, new_uid if new_uid
   
             yield
         ensure
             self.euid, self.egid = old_euid, old_egid
+            self.groups = old_groups
         end
     end
     module_function :asuser
@@ -49,6 +52,12 @@ module Puppet::Util::SUIDManager
     end
     module_function :convert_xid
 
+    # Initialize supplementary groups
+    def initgroups(user)
+        require 'etc'
+        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
+    end
+    module_function :initgroups
 
     def run_and_capture(command, new_uid=nil, new_gid=nil)
         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
-- 
1.6.3.3



Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/F-10/puppet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- puppet.spec	24 Mar 2009 01:04:14 -0000	1.31
+++ puppet.spec	8 Aug 2009 15:49:04 -0000	1.32
@@ -1,13 +1,30 @@
+# Augeas and SELinux requirements may be disabled at build time by passing
+# --without augeas and/or --without selinux to rpmbuild or mock
+
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %define confdir conf/redhat
 
 Name:           puppet
 Version:        0.24.8
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+
+# https://bugzilla.redhat.com/495096
+Patch0:         puppet-0.24.8-rundir-perms.patch
+# https://bugzilla.redhat.com/475201
+Patch1:         puppet-0.24.8-supplementary-groups.patch
+# http://projects.reductivelabs.com/issues/1963
+Patch2:         puppet-0.24.8-read-proc-mounts.patch
+# https://bugzilla.redhat.com/501577
+Patch3:         puppet-0.24.8-status-options.patch
+# https://bugzilla.redhat.com/480600
+Patch4:         puppet-0.24.8-condrestart.patch
+# https://bugzilla.redhat.com/515728
+Patch5:         puppet-0.24.8-activerecord-test.patch
+
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,14 +38,19 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
-# Pull in libselinux-ruby where it is available
-%if 0%{?fedora} >=9
-Requires:       libselinux-ruby
+# Pull in ruby selinux bindings where available
+%if 0%{?fedora}
+%if 0%{?fedora} >= 12
+%{!?_without_selinux:Requires: ruby(selinux)}
+%else
+%{!?_without_selinux:Requires: libselinux-ruby}
+%endif
 %endif
 
 Requires:       facter >= 1.5
 Requires:       ruby >= 1.8.1
-Requires:       ruby-augeas
+%{!?_without_augeas:Requires: ruby-augeas}
+
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -57,6 +79,15 @@ The server can also function as a certif
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%if 0%{?fedora} >= 11
+%patch5 -p1
+%endif
+
 # Move puppetca, puppetd, and puppetmasterd to sbin
 mkdir sbin
 mv bin/puppet{ca,d,masterd} sbin/
@@ -71,6 +102,7 @@ done
 for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
+chmod +x ext/puppetstoredconfigclean.rb
 
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
@@ -82,7 +114,7 @@ ruby install.rb --destdir=%{buildroot} -
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
@@ -97,8 +129,26 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install the ext/ directory to %{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}/%{name}
+cp -a ext/ %{buildroot}%{_datadir}/%{name}
+# emacs and vim bits are installed elsewhere
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+
+# Install emacs mode files
+emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
+install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
+install -Dp -m0644 ext/emacs/puppet-mode-init.el \
+    $emacsdir/site-start.d/puppet-mode-init.el
+
+# Install vim syntax files
+vimdir=%{buildroot}%{_datadir}/vim/vimfiles
+install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
+install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
+
 %files
 %defattr(-, root, root, 0755)
+%doc CHANGELOG COPYING LICENSE README examples
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
@@ -111,8 +161,11 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README examples
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+# We don't want to require emacs or vim, so we need to own these dirs
+%{_datadir}/emacs
+%{_datadir}/vim
+%{_datadir}/%{name}
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -184,6 +237,28 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
+- Fix status -p handling on older RHEL (#501577)
+- Fix condrestart when daemon's aren't running (#480600)
+- Fix timeout reading /proc/mounts (upstream #1963)
+- Fix permissions on /var/log/puppet (#495096)
+- Fix rails test for activerecord-2.3 (#515728)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
+- Fix permissions on /var/run/puppet/ (#495096)
+- Support initializing supplementary groups (#1806, #475201, Till Maas)
+- Own the correct vim directory
+- Move ext/ outside of doc datadir (rpmlint)
+- Require ruby(selinux) rather then libselinux-ruby (#507848)
+
+* Fri May 29 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-2
+- Make Augeas and SELinux requirements build time options
+- Install emacs mode and vim syntax files (#491437)
+- Include ext/ directory in %%doc
+
 * Mon Mar 23 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-1
 - Update to 0.24.8
 - Quiet output from %%pre



From tmz at fedoraproject.org  Sat Aug  8 15:49:27 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  8 Aug 2009 15:49:27 +0000 (UTC)
Subject: rpms/puppet/EL-5 puppet-0.24.8-activerecord-test.patch, NONE,
	1.1 puppet-0.24.8-condrestart.patch, NONE,
	1.1 puppet-0.24.8-read-proc-mounts.patch, NONE,
	1.1 puppet-0.24.8-rundir-perms.patch, NONE,
	1.1 puppet-0.24.8-status-options.patch, NONE,
	1.1 puppet-0.24.8-supplementary-groups.patch, NONE,
	1.1 puppet.spec, 1.29, 1.30
Message-ID: <20090808154927.CFFBC11C02CB@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/puppet/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20233

Modified Files:
	puppet.spec 
Added Files:
	puppet-0.24.8-activerecord-test.patch 
	puppet-0.24.8-condrestart.patch 
	puppet-0.24.8-read-proc-mounts.patch 
	puppet-0.24.8-rundir-perms.patch 
	puppet-0.24.8-status-options.patch 
	puppet-0.24.8-supplementary-groups.patch 
Log Message:
Fix a number of packaging and source bugs

* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
- Fix status -p handling on older RHEL (#501577)
- Fix condrestart when daemon's aren't running (#480600)
- Fix timeout reading /proc/mounts (upstream #1963)
- Fix permissions on /var/log/puppet (#495096)
- Fix rails test for activerecord-2.3 (#515728)

* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
- Fix permissions on /var/run/puppet/ (#495096)
- Support initializing supplementary groups (#1806, #475201, Till Maas)
- Own the correct vim directory
- Move ext/ outside of doc datadir (rpmlint)
- Require ruby(selinux) rather then libselinux-ruby (#507848)


puppet-0.24.8-activerecord-test.patch:
 rails.rb |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE puppet-0.24.8-activerecord-test.patch ---
>From a7a9fb5afaa58922bb6ecb49e04b5ed59f381d22 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke at madstop.com>
Date: Thu, 23 Apr 2009 18:56:30 -0500
Subject: [PATCH/puppet] Fixing the Rails feature test to require 2.3.x

Signed-off-by: Luke Kanies <luke at madstop.com>
---
 lib/puppet/feature/rails.rb |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 63e6f00..561863c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,24 +28,11 @@ Puppet.features.add(:rails) do
         end
     end
 
-    # If we couldn't find it the normal way, try using a Gem.
-    unless defined? ActiveRecord
-        begin
-            require 'rubygems'
-            require 'rails'
-        rescue LoadError
-            # Nothing
-        end
+    unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
+        Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
+        raise "ActiveRecord 2.3 required for StoreConfigs"
     end
 
-    # We check a fairly specific class, so that we can be sure that we've
-    # loaded a new enough version of AR that will support the features we
-    # actually use.
-    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
-        require 'puppet/rails'
-        true
-    else
-        false
-    end
+    true
 end
 
-- 
1.6.4


puppet-0.24.8-condrestart.patch:
 client.init |    7 ++++++-
 server.init |   12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE puppet-0.24.8-condrestart.patch ---
>From fc161e4a5ad4d470d0fe17b734004ab675eaa6ae Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 10:22:19 -0400
Subject: [PATCH/puppet 2/2] conf/redhat/*.init: Fix condrestart/try-restart

Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
test for whether to restart the daemons.  This caused condrestart to
start the daemons even when they were not running, in cases where they
had died or been killed without cleaning up the $pidfile/$lockfile.

This was reported by Ingvar Hagelund in Red Hat bug #480600.
---
 conf/redhat/client.init |    7 ++++++-
 conf/redhat/server.init |   11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index f40e81d..fda156c 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -67,6 +67,10 @@ rh_status() {
     status $statusopts $puppetd
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -86,7 +90,8 @@ case "$1" in
         reload
 	;;
   condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
         rh_status
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a..74cb52f 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -89,7 +89,7 @@ genconfig() {
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
-puppetmaster_status() {
+rh_status() {
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
@@ -103,6 +103,10 @@ puppetmaster_status() {
     return $RETVAL
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 case "$1" in
   start)
 	start
@@ -114,10 +118,11 @@ case "$1" in
         restart
 	;;
   condrestart)
-	[ -f "$lockfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
-    puppetmaster_status
+    rh_status
 	;;
   genconfig)
 	genconfig
-- 
1.6.3.3


puppet-0.24.8-read-proc-mounts.patch:
 selinux.rb |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-read-proc-mounts.patch ---
>From 0ce5b22a45d675de6969f3f5e5d4565be0a2d2d1 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky at fedoraproject.org>
Date: Sat, 11 Jul 2009 01:57:52 -0400
Subject: [PATCH/puppet] Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads

This works around a linux kernel bug that causes a select() on
/proc/mounts to hang.
---
 lib/puppet/util/selinux.rb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index cd3b2ac..dc5daec 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
 
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
+        mounts = ""
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
-            mounts = mountfh.read
+            mountfh = File.open("/proc/mounts")
+            # We use read_nonblock() in a loop rather than read() to work-around
+            # a linux kernel bug.  See ticket #1963 for details.
+            while true
+                mounts += mountfh.read_nonblock(1024)
+            end
+        rescue EOFError
             mountfh.close
         rescue
             return nil
-- 
1.6.3.3


puppet-0.24.8-rundir-perms.patch:
 defaults.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE puppet-0.24.8-rundir-perms.patch ---
>From f9ccc92662c53d9890e337d4e9f1629eb1ff650f Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:19:01 +0200
Subject: [PATCH/puppet 1/6] Simplest fix for #495096 as it applies to the Fedora based distributions using the Red Hat RPM. Story continues.

---
 lib/puppet/defaults.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e36dd70..077faab 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -68,7 +68,7 @@ module Puppet
         },
         :rundir => { 
             :default => rundir,
-            :mode => 01777,
+            :mode => 0755,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
-- 
1.6.3.3


puppet-0.24.8-status-options.patch:
 client.init |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-status-options.patch ---
>From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 09:08:17 -0400
Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL

On RHEL < 5, the status function does not accept a -p option.  Using it
causes 'service puppet status' to produce erroneous output.  This was
also reported by Aaron Dummer in Red Hat bug #501577.
---
 conf/redhat/client.init |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab1..f40e81d 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -62,6 +62,11 @@ restart() {
     start
 }
 
+rh_status() {
+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
+    status $statusopts $puppetd
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -84,8 +89,7 @@ case "$1" in
 	[ -f "$pidfile" ] && restart
 	;;
   status)
-        status -p "$pidfile" $puppetd
-        RETVAL=$?
+        rh_status
 	;;
   once)
         shift
-- 
1.6.3.3


puppet-0.24.8-supplementary-groups.patch:
 util.rb             |    5 +++--
 util/suidmanager.rb |   12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE puppet-0.24.8-supplementary-groups.patch ---
>From 2a401c6897af3abbc27dfaaf162556745267d6b2 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:30:19 +0200
Subject: [PATCH/puppet 2/6] Support supplementary groups (Till Maas)

---
 lib/puppet/util.rb             |    5 +++--
 lib/puppet/util/suidmanager.rb |   11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index f8a8721..51a2a16 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -58,10 +58,11 @@ module Util
             end
             unless Puppet::Util::SUIDManager.uid == user
                 begin
+                    Puppet::Util::SUIDManager.initgroups(user)
                     Puppet::Util::SUIDManager.uid = user 
                     Puppet::Util::SUIDManager.euid = user 
-                rescue
-                    $stderr.puts "could not change to user %s" % user
+                rescue => detail
+                    $stderr.puts "could not change to user %s: %s" % [user, detail]
                     exit(74)
                 end
             end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index b071dca..9f6e3b6 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
     extend Forwardable
 
     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
-                               :uid=, :uid, :gid=, :gid ]
+                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
 
     to_delegate_to_process.each do |method|
         def_delegator Process, method
@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
         # We set both because some programs like to drop privs, i.e. bash.
         old_uid, old_gid = self.uid, self.gid
         old_euid, old_egid = self.euid, self.egid
+        old_groups = self.groups
         begin
             self.egid = convert_xid :gid, new_gid if new_gid
+            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
             self.euid = convert_xid :uid, new_uid if new_uid
   
             yield
         ensure
             self.euid, self.egid = old_euid, old_egid
+            self.groups = old_groups
         end
     end
     module_function :asuser
@@ -49,6 +52,12 @@ module Puppet::Util::SUIDManager
     end
     module_function :convert_xid
 
+    # Initialize supplementary groups
+    def initgroups(user)
+        require 'etc'
+        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
+    end
+    module_function :initgroups
 
     def run_and_capture(command, new_uid=nil, new_gid=nil)
         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
-- 
1.6.3.3



Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-5/puppet.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- puppet.spec	24 Mar 2009 03:37:04 -0000	1.29
+++ puppet.spec	8 Aug 2009 15:49:27 -0000	1.30
@@ -1,21 +1,36 @@
+# Augeas and SELinux requirements may be disabled at build time by passing
+# --without augeas and/or --without selinux to rpmbuild or mock
+
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %define confdir conf/redhat
 
 Name:           puppet
 Version:        0.24.8
-Release:        1%{?dist}.1
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+
+# https://bugzilla.redhat.com/495096
+Patch0:         puppet-0.24.8-rundir-perms.patch
+# https://bugzilla.redhat.com/475201
+Patch1:         puppet-0.24.8-supplementary-groups.patch
+# http://projects.reductivelabs.com/issues/1963
+Patch2:         puppet-0.24.8-read-proc-mounts.patch
+# https://bugzilla.redhat.com/501577
+Patch3:         puppet-0.24.8-status-options.patch
+# https://bugzilla.redhat.com/480600
+Patch4:         puppet-0.24.8-condrestart.patch
+# https://bugzilla.redhat.com/515728
+Patch5:         puppet-0.24.8-activerecord-test.patch
+
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# If versioned BRs are needed, wait until
-# https://fedorahosted.org/fedora-infrastructure/ticket/1202 is resolved
-BuildRequires:  facter
-BuildRequires:  ruby
+BuildRequires:  facter >= 1.5
+BuildRequires:  ruby >= 1.8.1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
 BuildArch:      noarch
@@ -23,14 +38,19 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
-# Pull in libselinux-ruby where it is available
-%if 0%{?fedora} >=9
-Requires:       libselinux-ruby
+# Pull in ruby selinux bindings where available
+%if 0%{?fedora}
+%if 0%{?fedora} >= 12
+%{!?_without_selinux:Requires: ruby(selinux)}
+%else
+%{!?_without_selinux:Requires: libselinux-ruby}
+%endif
 %endif
 
 Requires:       facter >= 1.5
 Requires:       ruby >= 1.8.1
-Requires:       ruby-augeas
+%{!?_without_augeas:Requires: ruby-augeas}
+
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -59,6 +79,15 @@ The server can also function as a certif
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%if 0%{?fedora} >= 11
+%patch5 -p1
+%endif
+
 # Move puppetca, puppetd, and puppetmasterd to sbin
 mkdir sbin
 mv bin/puppet{ca,d,masterd} sbin/
@@ -73,6 +102,7 @@ done
 for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
+chmod +x ext/puppetstoredconfigclean.rb
 
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
@@ -84,7 +114,7 @@ ruby install.rb --destdir=%{buildroot} -
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
@@ -99,8 +129,26 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install the ext/ directory to %{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}/%{name}
+cp -a ext/ %{buildroot}%{_datadir}/%{name}
+# emacs and vim bits are installed elsewhere
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+
+# Install emacs mode files
+emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
+install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
+install -Dp -m0644 ext/emacs/puppet-mode-init.el \
+    $emacsdir/site-start.d/puppet-mode-init.el
+
+# Install vim syntax files
+vimdir=%{buildroot}%{_datadir}/vim/vimfiles
+install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
+install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
+
 %files
 %defattr(-, root, root, 0755)
+%doc CHANGELOG COPYING LICENSE README examples
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
@@ -113,8 +161,11 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README examples
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+# We don't want to require emacs or vim, so we need to own these dirs
+%{_datadir}/emacs
+%{_datadir}/vim
+%{_datadir}/%{name}
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -186,13 +237,33 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Mon Mar 23 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-1.1
+* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
+- Fix status -p handling on older RHEL (#501577)
+- Fix condrestart when daemon's aren't running (#480600)
+- Fix timeout reading /proc/mounts (upstream #1963)
+- Fix permissions on /var/log/puppet (#495096)
+- Fix rails test for activerecord-2.3 (#515728)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
+- Fix permissions on /var/run/puppet/ (#495096)
+- Support initializing supplementary groups (#1806, #475201, Till Maas)
+- Own the correct vim directory
+- Move ext/ outside of doc datadir (rpmlint)
+- Require ruby(selinux) rather then libselinux-ruby (#507848)
+
+* Fri May 29 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-2
+- Make Augeas and SELinux requirements build time options
+- Install emacs mode and vim syntax files (#491437)
+- Include ext/ directory in %%doc
+
+* Mon Mar 23 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-1
 - Update to 0.24.8
 - Quiet output from %%pre
 - Use upstream install script
 - Increase required facter version to >= 1.5
-- Remove versioned BRs, all supported releases are new enough (and it avoids
-  https://fedorahosted.org/fedora-infrastructure/ticket/1202)
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From tmz at fedoraproject.org  Sat Aug  8 15:49:50 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  8 Aug 2009 15:49:50 +0000 (UTC)
Subject: rpms/puppet/EL-4 puppet-0.24.8-activerecord-test.patch, NONE,
	1.1 puppet-0.24.8-condrestart.patch, NONE,
	1.1 puppet-0.24.8-read-proc-mounts.patch, NONE,
	1.1 puppet-0.24.8-rundir-perms.patch, NONE,
	1.1 puppet-0.24.8-status-options.patch, NONE,
	1.1 puppet-0.24.8-supplementary-groups.patch, NONE,
	1.1 puppet.spec, 1.27, 1.28
Message-ID: <20090808154950.DEB2C11C02CB@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/puppet/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20390

Modified Files:
	puppet.spec 
Added Files:
	puppet-0.24.8-activerecord-test.patch 
	puppet-0.24.8-condrestart.patch 
	puppet-0.24.8-read-proc-mounts.patch 
	puppet-0.24.8-rundir-perms.patch 
	puppet-0.24.8-status-options.patch 
	puppet-0.24.8-supplementary-groups.patch 
Log Message:
Fix a number of packaging and source bugs

* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
- Fix status -p handling on older RHEL (#501577)
- Fix condrestart when daemon's aren't running (#480600)
- Fix timeout reading /proc/mounts (upstream #1963)
- Fix permissions on /var/log/puppet (#495096)
- Fix rails test for activerecord-2.3 (#515728)

* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
- Fix permissions on /var/run/puppet/ (#495096)
- Support initializing supplementary groups (#1806, #475201, Till Maas)
- Own the correct vim directory
- Move ext/ outside of doc datadir (rpmlint)
- Require ruby(selinux) rather then libselinux-ruby (#507848)


puppet-0.24.8-activerecord-test.patch:
 rails.rb |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

--- NEW FILE puppet-0.24.8-activerecord-test.patch ---
>From a7a9fb5afaa58922bb6ecb49e04b5ed59f381d22 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke at madstop.com>
Date: Thu, 23 Apr 2009 18:56:30 -0500
Subject: [PATCH/puppet] Fixing the Rails feature test to require 2.3.x

Signed-off-by: Luke Kanies <luke at madstop.com>
---
 lib/puppet/feature/rails.rb |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 63e6f00..561863c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,24 +28,11 @@ Puppet.features.add(:rails) do
         end
     end
 
-    # If we couldn't find it the normal way, try using a Gem.
-    unless defined? ActiveRecord
-        begin
-            require 'rubygems'
-            require 'rails'
-        rescue LoadError
-            # Nothing
-        end
+    unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
+        Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
+        raise "ActiveRecord 2.3 required for StoreConfigs"
     end
 
-    # We check a fairly specific class, so that we can be sure that we've
-    # loaded a new enough version of AR that will support the features we
-    # actually use.
-    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
-        require 'puppet/rails'
-        true
-    else
-        false
-    end
+    true
 end
 
-- 
1.6.4


puppet-0.24.8-condrestart.patch:
 client.init |    7 ++++++-
 server.init |   12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE puppet-0.24.8-condrestart.patch ---
>From fc161e4a5ad4d470d0fe17b734004ab675eaa6ae Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 10:22:19 -0400
Subject: [PATCH/puppet 2/2] conf/redhat/*.init: Fix condrestart/try-restart

Previously, the Red Hat init scripts used the $pidfile or $lockfile as a
test for whether to restart the daemons.  This caused condrestart to
start the daemons even when they were not running, in cases where they
had died or been killed without cleaning up the $pidfile/$lockfile.

This was reported by Ingvar Hagelund in Red Hat bug #480600.
---
 conf/redhat/client.init |    7 ++++++-
 conf/redhat/server.init |   11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index f40e81d..fda156c 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -67,6 +67,10 @@ rh_status() {
     status $statusopts $puppetd
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -86,7 +90,8 @@ case "$1" in
         reload
 	;;
   condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
         rh_status
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a..74cb52f 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -89,7 +89,7 @@ genconfig() {
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
-puppetmaster_status() {
+rh_status() {
     if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
@@ -103,6 +103,10 @@ puppetmaster_status() {
     return $RETVAL
 }
 
+rh_status_q() {
+        rh_status >/dev/null 2>&1
+}
+
 case "$1" in
   start)
 	start
@@ -114,10 +118,11 @@ case "$1" in
         restart
 	;;
   condrestart)
-	[ -f "$lockfile" ] && restart
+	rh_status_q || exit 0
+	restart
 	;;
   status)
-    puppetmaster_status
+    rh_status
 	;;
   genconfig)
 	genconfig
-- 
1.6.3.3


puppet-0.24.8-read-proc-mounts.patch:
 selinux.rb |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-read-proc-mounts.patch ---
>From 0ce5b22a45d675de6969f3f5e5d4565be0a2d2d1 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky at fedoraproject.org>
Date: Sat, 11 Jul 2009 01:57:52 -0400
Subject: [PATCH/puppet] Fix #1963 - Failing to read /proc/mounts for selinux kills file downloads

This works around a linux kernel bug that causes a select() on
/proc/mounts to hang.
---
 lib/puppet/util/selinux.rb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index cd3b2ac..dc5daec 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
 
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
+        mounts = ""
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
-            mounts = mountfh.read
+            mountfh = File.open("/proc/mounts")
+            # We use read_nonblock() in a loop rather than read() to work-around
+            # a linux kernel bug.  See ticket #1963 for details.
+            while true
+                mounts += mountfh.read_nonblock(1024)
+            end
+        rescue EOFError
             mountfh.close
         rescue
             return nil
-- 
1.6.3.3


puppet-0.24.8-rundir-perms.patch:
 defaults.rb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE puppet-0.24.8-rundir-perms.patch ---
>From f9ccc92662c53d9890e337d4e9f1629eb1ff650f Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:19:01 +0200
Subject: [PATCH/puppet 1/6] Simplest fix for #495096 as it applies to the Fedora based distributions using the Red Hat RPM. Story continues.

---
 lib/puppet/defaults.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index e36dd70..077faab 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -68,7 +68,7 @@ module Puppet
         },
         :rundir => { 
             :default => rundir,
-            :mode => 01777,
+            :mode => 0755,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
-- 
1.6.3.3


puppet-0.24.8-status-options.patch:
 client.init |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE puppet-0.24.8-status-options.patch ---
>From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 3 Jul 2009 09:08:17 -0400
Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL

On RHEL < 5, the status function does not accept a -p option.  Using it
causes 'service puppet status' to produce erroneous output.  This was
also reported by Aaron Dummer in Red Hat bug #501577.
---
 conf/redhat/client.init |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab1..f40e81d 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -62,6 +62,11 @@ restart() {
     start
 }
 
+rh_status() {
+    status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile"
+    status $statusopts $puppetd
+}
+
 genconfig() {
   echo -n $"Generate configuration puppet: "
   $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
@@ -84,8 +89,7 @@ case "$1" in
 	[ -f "$pidfile" ] && restart
 	;;
   status)
-        status -p "$pidfile" $puppetd
-        RETVAL=$?
+        rh_status
 	;;
   once)
         shift
-- 
1.6.3.3


puppet-0.24.8-supplementary-groups.patch:
 util.rb             |    5 +++--
 util/suidmanager.rb |   12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE puppet-0.24.8-supplementary-groups.patch ---
>From 2a401c6897af3abbc27dfaaf162556745267d6b2 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date: Wed, 24 Jun 2009 15:30:19 +0200
Subject: [PATCH/puppet 2/6] Support supplementary groups (Till Maas)

---
 lib/puppet/util.rb             |    5 +++--
 lib/puppet/util/suidmanager.rb |   11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index f8a8721..51a2a16 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -58,10 +58,11 @@ module Util
             end
             unless Puppet::Util::SUIDManager.uid == user
                 begin
+                    Puppet::Util::SUIDManager.initgroups(user)
                     Puppet::Util::SUIDManager.uid = user 
                     Puppet::Util::SUIDManager.euid = user 
-                rescue
-                    $stderr.puts "could not change to user %s" % user
+                rescue => detail
+                    $stderr.puts "could not change to user %s: %s" % [user, detail]
                     exit(74)
                 end
             end
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index b071dca..9f6e3b6 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
     extend Forwardable
 
     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
-                               :uid=, :uid, :gid=, :gid ]
+                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
 
     to_delegate_to_process.each do |method|
         def_delegator Process, method
@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
         # We set both because some programs like to drop privs, i.e. bash.
         old_uid, old_gid = self.uid, self.gid
         old_euid, old_egid = self.euid, self.egid
+        old_groups = self.groups
         begin
             self.egid = convert_xid :gid, new_gid if new_gid
+            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
             self.euid = convert_xid :uid, new_uid if new_uid
   
             yield
         ensure
             self.euid, self.egid = old_euid, old_egid
+            self.groups = old_groups
         end
     end
     module_function :asuser
@@ -49,6 +52,12 @@ module Puppet::Util::SUIDManager
     end
     module_function :convert_xid
 
+    # Initialize supplementary groups
+    def initgroups(user)
+        require 'etc'
+        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
+    end
+    module_function :initgroups
 
     def run_and_capture(command, new_uid=nil, new_gid=nil)
         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
-- 
1.6.3.3



Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/EL-4/puppet.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- puppet.spec	24 Mar 2009 03:37:04 -0000	1.27
+++ puppet.spec	8 Aug 2009 15:49:50 -0000	1.28
@@ -1,21 +1,36 @@
+# Augeas and SELinux requirements may be disabled at build time by passing
+# --without augeas and/or --without selinux to rpmbuild or mock
+
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %define confdir conf/redhat
 
 Name:           puppet
 Version:        0.24.8
-Release:        1%{?dist}.1
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+
+# https://bugzilla.redhat.com/495096
+Patch0:         puppet-0.24.8-rundir-perms.patch
+# https://bugzilla.redhat.com/475201
+Patch1:         puppet-0.24.8-supplementary-groups.patch
+# http://projects.reductivelabs.com/issues/1963
+Patch2:         puppet-0.24.8-read-proc-mounts.patch
+# https://bugzilla.redhat.com/501577
+Patch3:         puppet-0.24.8-status-options.patch
+# https://bugzilla.redhat.com/480600
+Patch4:         puppet-0.24.8-condrestart.patch
+# https://bugzilla.redhat.com/515728
+Patch5:         puppet-0.24.8-activerecord-test.patch
+
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# If versioned BRs are needed, wait until
-# https://fedorahosted.org/fedora-infrastructure/ticket/1202 is resolved
-BuildRequires:  facter
-BuildRequires:  ruby
+BuildRequires:  facter >= 1.5
+BuildRequires:  ruby >= 1.8.1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
 BuildArch:      noarch
@@ -23,14 +38,19 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
-# Pull in libselinux-ruby where it is available
-%if 0%{?fedora} >=9
-Requires:       libselinux-ruby
+# Pull in ruby selinux bindings where available
+%if 0%{?fedora}
+%if 0%{?fedora} >= 12
+%{!?_without_selinux:Requires: ruby(selinux)}
+%else
+%{!?_without_selinux:Requires: libselinux-ruby}
+%endif
 %endif
 
 Requires:       facter >= 1.5
 Requires:       ruby >= 1.8.1
-Requires:       ruby-augeas
+%{!?_without_augeas:Requires: ruby-augeas}
+
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -59,6 +79,15 @@ The server can also function as a certif
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%if 0%{?fedora} >= 11
+%patch5 -p1
+%endif
+
 # Move puppetca, puppetd, and puppetmasterd to sbin
 mkdir sbin
 mv bin/puppet{ca,d,masterd} sbin/
@@ -73,6 +102,7 @@ done
 for f in external/nagios.rb network/http_server/mongrel.rb relationship.rb; do
   sed -i -e '1d' lib/puppet/$f
 done
+chmod +x ext/puppetstoredconfigclean.rb
 
 find examples/ -type f -empty | xargs rm
 find examples/ -type f | xargs chmod a-x
@@ -84,7 +114,7 @@ ruby install.rb --destdir=%{buildroot} -
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
+install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
 install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
 install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
@@ -99,8 +129,26 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 touch %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 
+# Install the ext/ directory to %{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}/%{name}
+cp -a ext/ %{buildroot}%{_datadir}/%{name}
+# emacs and vim bits are installed elsewhere
+rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim}
+
+# Install emacs mode files
+emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
+install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el
+install -Dp -m0644 ext/emacs/puppet-mode-init.el \
+    $emacsdir/site-start.d/puppet-mode-init.el
+
+# Install vim syntax files
+vimdir=%{buildroot}%{_datadir}/vim/vimfiles
+install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
+install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
+
 %files
 %defattr(-, root, root, 0755)
+%doc CHANGELOG COPYING LICENSE README examples
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
@@ -113,8 +161,11 @@ touch %{buildroot}%{_sysconfdir}/puppet/
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
-%doc CHANGELOG COPYING LICENSE README examples
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+# We don't want to require emacs or vim, so we need to own these dirs
+%{_datadir}/emacs
+%{_datadir}/vim
+%{_datadir}/%{name}
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -186,13 +237,33 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Mon Mar 23 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-1.1
+* Fri Aug 07 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-4
+- Fix status -p handling on older RHEL (#501577)
+- Fix condrestart when daemon's aren't running (#480600)
+- Fix timeout reading /proc/mounts (upstream #1963)
+- Fix permissions on /var/log/puppet (#495096)
+- Fix rails test for activerecord-2.3 (#515728)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Jeroen van Meeuwen <kanarip at kanarip.com>
+- Fix permissions on /var/run/puppet/ (#495096)
+- Support initializing supplementary groups (#1806, #475201, Till Maas)
+- Own the correct vim directory
+- Move ext/ outside of doc datadir (rpmlint)
+- Require ruby(selinux) rather then libselinux-ruby (#507848)
+
+* Fri May 29 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-2
+- Make Augeas and SELinux requirements build time options
+- Install emacs mode and vim syntax files (#491437)
+- Include ext/ directory in %%doc
+
+* Mon Mar 23 2009 Todd Zullinger <tmz at pobox.com> - 0.24.8-1
 - Update to 0.24.8
 - Quiet output from %%pre
 - Use upstream install script
 - Increase required facter version to >= 1.5
-- Remove versioned BRs, all supported releases are new enough (and it avoids
-  https://fedorahosted.org/fedora-infrastructure/ticket/1202)
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From bonii at fedoraproject.org  Sat Aug  8 16:12:15 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sat,  8 Aug 2009 16:12:15 +0000 (UTC)
Subject: rpms/mausezahn/devel README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 mausezahn.1, NONE, 1.1 mausezahn.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808161215.A14B311C02CB@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/mausezahn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25555/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log mausezahn.1 mausezahn.spec 
Log Message:

Initial package import into CVS



--- NEW FILE README.Fedora ---
Important changes in Mausezahn in Fedora:

The binary executable for Mausezahn is available in Fedora as 
/usr/bin/mausezahn as opposed to /usr/bin/mz. This is done in
keeping with the Fedora packaging guidelines with regards to 
problems that can occur in namespace with short names like 
"mz". For more reference see here:
http://fedoraproject.org/wiki/PackageMaintainers/Packaging_Tricks#Use_of_common_namespace


--- NEW FILE import.log ---
mausezahn-0_34_9-1_fc9:HEAD:mausezahn-0.34.9-1.fc9.src.rpm:1249747858


--- NEW FILE mausezahn.1 ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" 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 MAUSEZAHN 1 "July 18, 2009"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
mausezahn \- a fast versatile packet generator
.SH SYNOPSIS
.B mausezahn
.RI  [ options ] "<arg_string> | <hex_string>" 
.br
.SH DESCRIPTION
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBMausezahn\fP is a free fast traffic generator written in C which allows 
you to send nearly every possible and impossible packet. 
.br
Mausezahn can also be used for example as didactical tool in network labs or
for security audits including penetration and DoS testing. As traffic
generator Mausezahn is for example used test IP multicast or VoIP networks.
Speeds close to the Ethernet limit are reachable (depending on the HW
platform).
.br
.SH USAGE
Mausezahn supports two modes, \fBraw-layer-2\fP mode, where every single byte
to be sent can be specified, and \fBhigher-layer\fP mode, where packet builder
interfaces are used (using the \fI-t\fP option).
.br
To use the \fBraw-layer-2\fP mode, simply specify the desired frame as
hexadecimal sequence (the \fIhex_string\fP), such as
.PP
mausezahn eth0 "00:ab:cd:ef:00 00:00:00:00:00:01 08:00 ca:fe:ba:be"
.PP
The spaces within the byte string are optional and separate the Ethernet
fields (destination and source address, type field, and a short payload). The
only additional options supported are \fI-a\fP, \fI-b\fP, \fI-c\fP, and
\fI-p\fP. The frame length MUST be greater or equal 15 bytes.
.br
The \fBhigher-layer\fP mode is enabled using the \fI-t <packet_type>\fP
option. This option activates a packet builder and besides the
\fIpacket_type\fP an optional \fIarg_string\fP can be specified. The
\fIarg_string\fP contains packet-specific parameters, such as TCP flags, port
numbers, etc.
.PP
Note that Mausezahn requires root privileges. Please see the Mausezahn User's
Guide for more details or use Mausezahn's command line help.
.SH OPTIONS
Mausezahn has a built-in context specific help. Simply append the keyword
\fBhelp\fP to the configuration options. 
.br
The most important options are:
.TP
.B \-v
Verbose mode.
.TP
.B \-q
Quiet mode (only warnings and errors are displayed).
.TP
.B \-c <count>
Send the packet count times (default: 1, infinite: 0).
.TP
.B \-d <delay>
Apply delay between transmissions. The delay value can be specified in usec
(default, no additional unit needed), or in msec (e. g. 100m or 100msec), or
in seconds (e. g. 100s or 100sec).
.TP
.B \-p <lenght>
Pad the raw frame to specified length (using zero bytes). Note that for raw
layer 2 frames the specified length defines the whole frame length, while for
higher layer packets the number of additional padding bytes are specified.
.TP
.B \-a <Src_MAC|keyword>
Use specified source mac address (use hex notation such as 00:00:aa:bb:cc:dd).
By default the interface MAC address will be used. The keywords \fIrand\fP and
\fIown\fP refer to a random MAC address (only unicast addresses are created)
and the own address, respectively. You can also use the keywords mentioned
below (although broadcast-type source addresses are officially invalid).
.TP
.B \-b <Dst_MAC|keyword>
Use specified destination mac address.  By default a broadcast is sent in raw
layer 2 mode or the destination hosts/gateways interface MAC address in normal
(IP) mode. You can use the same keywords as mentioned above as well as
\fIbc\fP (or \fIbcast\fP), \fIcisco\fP, and \fIstp\fP. 
Please note that for the destination MAC address the \fIrand\fP keyword is
supported but creates a random address only once, even when you send multiple
packets. 
.TP
.B \-A <Src_IP|range|rand>
Use specified source IP address (default is own interface IP). Optionally the
keyword \fIrand\fP can again be used for a random source IP address or a range
can be specified, such as 192.168.1.1-192.168.1.100 or 10.1.0.0/16. Also a DNS
name can be specified for which Mausezahn tries to determine the corresponding
IP address automatically.
.TP
.B \-B <Dst_IP|range>
Use specified destination IP address (default is broadcast i. e.
255.255.255.255). As with the source address (see above) you can also specify
a range or a DNS name.
.TP
.B \-t <packet_type>
Create the specified packet type using the built-in packet builder. Currently
supported packet types are: \fIarp\fP, \fIbpdu\fP, \fIip\fP, \fIudp\fP,
\fItcp\fP, \fIrtp\fP, and \fIdns\fP. There is currently also a limited support
for ICMP. Enter \fI-t help\fP to verify which packet builders your actual
Mausezahn version supports. Also, for any particular packet type, for example
\fItcp\fP enter \fImausezahn \-t tcp help\fP to receive a context specific help.
.TP
.B \-T <packet_type>
Make this Mausezahn instance the receiving station. Currently (version 0.30)
only \fIrtp\fP is an option here and provides precise jitter measurements. For
this purpose start another Mausezahn instance on the sending station and the
local receiving station will output jitter statistics. See \fImausezahn \-T rtp
help\fP for a detailed help.
.TP
.B \-Q <[CoS:]vlan> [, <[CoS:]vlan>, ...]
Specify 802.1Q VLAN tag and optional Class of Service. An arbitrary number of
VLAN tags can be specified (that is you can simulate QinQ or even
QinQinQinQ...). Multiple tags must be separated via a comma or a period (e. g.
"5:10,20,2:30"). VLAN tags are not supported for ARP and BPDU packets (in
which case you could specify the whole frame in hex using the raw layer 2
interface of Mausezahn).
.TP
.B \-M <label[:cos[:ttl]][bos]> [, <label...>] 
Specify a MPLS label or even a MPLS label stack. Optionally for each label the
experimental bits (usually the Class of Service, CoS) and the Time To Live
(TTL) can be specified. And if you are really crazy you can set/unset the
Bottom of Stack (BoS) bit at each label using the \fIS\fP (set) and \fIs\fP
(unset) option. By default the BoS is set automatically and correctly. Any
other setting will lead to invalid frames. Enter \fI-M help\fP for detailed
instructions and examples.
.TP
.B \-P <ASCII_payload>
Specify a cleartext payload. Alternatively each packet type supports a
hexadecimal specification of the payload (see for example \fI-t udp help\fP).
.br
.SH COMBINATION OF RANGES
When multiple ranges are specified, e. g. destination port ranges AND
destination address ranges, then \fBall\fP possible combinations of ports and
addresses are used for packet generation. This can lead to a very huge number
of frames.
.br
.SH DISCLAIMER AND WARNING
Mausezahn has been designed as fast traffic generator so you quickly can
overwhelm a LAN segment with myriads of packets. And because Mausezahn should
also support security audits it is easily possible to create malicious
packets, SYN floods, specify port and address ranges, DNS and ARP poisoning,
etc.
.br
Therefore, don't use this tool when you are not aware of possible consequences
or have only little knowledge about networks and data communication.  If you
abuse Mausezahn for unallowed attacks and get caught, or damage something of
your own, then this is completely your fault.
.br
.SH EXAMPLES
Send BPDU frames for VLAN 5 as used with Cisco's PVST+ type of STP. Per
default Mausezahn assumes that you want to become the root bridge:
.PP
# mausezahn eth0 \-c 0 \-d 2s \-t bpdu vlan=5
.PP
Perform a CAM table overflow attack:
.PP
# mausezahn eth0 \-c 128000 \-a rand \-p 64
.PP
Perform a SYN flood attack to another VLAN using a VLAN hopping attack. This
only works if you are connected to the same VLAN which is configured as native
VLAN on the trunk.  We assume that the victim VLAN is VLAN 100 and the native
VLAN is VLAN 5. Also lets attack every host in VLAN 100 which use a IP prefix
of 10.100.100.0/24:
.PP
# mausezahn eth0 \-c 0 \-Q 5,100 \-t tcp flags=syn \-p 20
.PP
Send IP multicast packets to the multicast group 230.1.1.1 using a UDP header
with destination port 32000. Send one frame every 10 msec:
.PP
# mausezahn eth0 \-c 0 \-d 10msec \-B 230.1.1.1 \-t udp dp=32000 \-P "Multicast test packet"
.PP
Send UDP packets to the destination host target.anynetwork.foo using all
possible destionation ports and send every packet with all possible source
addresses of the range 172.30.0.0/16; pad with 1000 bytes and repeat this 10
times:
.PP
# mausezahn eth0 \-c 10 \-A 172.30.0.0/16 \-B target.anynetwork.foo \-t udp dp=1-65535 \-p 1000
.br
.SH AUTHOR
Herbert Haas 
.br
Visit www.perihel.at/sec/mz/ for Mausezahn news and additional information.
.PP
This manual page has been written by Vivek Shah <boni.vivek at gmail.com>
for the Fedora project.


--- NEW FILE mausezahn.spec ---
Name:		mausezahn
Version:	0.34.9
Release:	1%{?dist}
Summary:	A fast versatile packet generator

Group:		Applications/Internet
License:	GPLv2
URL:		http://www.perihel.at/sec/mz/
Source0:	http://www.perihel.at/sec/mz/mz-%{version}.tar.gz
Source1:	%{name}.1
Source2:	README.Fedora
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libpcap-devel >= 0.8, libnet-devel >= 1.1, cmake >= 2.4.0
Requires:	python-matplotlib

%description
Mausezahn is a free fast traffic generator written in C which allows you to 
send nearly every possible and impossible packet. Mausezahn can also be used 
for example as didactical tool in network labs or for security audits including
penetration and DoS testing. As traffic generator Mausezahn is for example used
to test IP multicast or VoIP networks. Speeds close to the Ethernet limit are 
reachable (depending on the HW platform).

%prep
%setup -q -n mz-%{version}
sed -i.optflags -e '/^SET(CMAKE_C_FLAGS/d' CMakeLists.txt

%build
%cmake .
make %{?_smp_mflags} VERBOSE=1

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.html" -delete
find $RPM_BUILD_ROOT -type f -name "*.pdf" -delete
mv $RPM_BUILD_ROOT%{_sbindir}/mz $RPM_BUILD_ROOT%{_sbindir}/%{name}
cp -p %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1/
mv $RPM_BUILD_ROOT%{_defaultdocdir}/mz \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
cp -p %SOURCE2 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
cp -pr AUTHORS ChangeLog COPYING README \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
rm $RPM_BUILD_ROOT%{_mandir}/man1/mz.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_defaultdocdir}/%{name}-%{version}/
%{_mandir}/man1/%{name}*

%changelog
* Sat Aug 8 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.9-1
- Updated to new upstream version

* Tue Aug 4 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.8-2
- Removed the cmake flags to be overriden by optflags

* Sat Aug 1 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.8-1
- Updated to new upstream version
- Removed extra empty doc line from files section
- Removed INSTALL files from doc section
- Added Fedora specific flags

* Sat Jul 18 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.6-2
- Cleaned up spaces in description and added a missing infinitive
- Unified all doc files to be copied in a single docdir

* Sat Jul 18 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.6-1
- Changed package name to mausezahn
- Added new README.Fedora
- Modified existing manpage

* Tue Nov 4 2008 Vivek Shah <boni.vivek at gmail.com> 0.34.5-2
- Changed binary and manpage file name to mausezahn to avoid conflicts
- Added Requires field for sample python script

* Sat Nov 1 2008 Vivek Shah <boni.vivek at gmail.com> 0.34.5-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mausezahn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 22:43:26 -0000	1.1
+++ .cvsignore	8 Aug 2009 16:12:12 -0000	1.2
@@ -0,0 +1 @@
+mz-0.34.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mausezahn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 22:43:26 -0000	1.1
+++ sources	8 Aug 2009 16:12:13 -0000	1.2
@@ -0,0 +1 @@
+17dcc41248744a14690a62bce3b637b2  mz-0.34.9.tar.gz



From bonii at fedoraproject.org  Sat Aug  8 16:15:47 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sat,  8 Aug 2009 16:15:47 +0000 (UTC)
Subject: rpms/mausezahn/F-10 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 mausezahn.1, NONE, 1.1 mausezahn.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808161547.847B111C02CB@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/mausezahn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26388/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log mausezahn.1 mausezahn.spec 
Log Message:

Initial package import into CVS



--- NEW FILE README.Fedora ---
Important changes in Mausezahn in Fedora:

The binary executable for Mausezahn is available in Fedora as 
/usr/bin/mausezahn as opposed to /usr/bin/mz. This is done in
keeping with the Fedora packaging guidelines with regards to 
problems that can occur in namespace with short names like 
"mz". For more reference see here:
http://fedoraproject.org/wiki/PackageMaintainers/Packaging_Tricks#Use_of_common_namespace


--- NEW FILE import.log ---
mausezahn-0_34_9-1_fc9:F-10:mausezahn-0.34.9-1.fc9.src.rpm:1249748044


--- NEW FILE mausezahn.1 ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" 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 MAUSEZAHN 1 "July 18, 2009"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
mausezahn \- a fast versatile packet generator
.SH SYNOPSIS
.B mausezahn
.RI  [ options ] "<arg_string> | <hex_string>" 
.br
.SH DESCRIPTION
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBMausezahn\fP is a free fast traffic generator written in C which allows 
you to send nearly every possible and impossible packet. 
.br
Mausezahn can also be used for example as didactical tool in network labs or
for security audits including penetration and DoS testing. As traffic
generator Mausezahn is for example used test IP multicast or VoIP networks.
Speeds close to the Ethernet limit are reachable (depending on the HW
platform).
.br
.SH USAGE
Mausezahn supports two modes, \fBraw-layer-2\fP mode, where every single byte
to be sent can be specified, and \fBhigher-layer\fP mode, where packet builder
interfaces are used (using the \fI-t\fP option).
.br
To use the \fBraw-layer-2\fP mode, simply specify the desired frame as
hexadecimal sequence (the \fIhex_string\fP), such as
.PP
mausezahn eth0 "00:ab:cd:ef:00 00:00:00:00:00:01 08:00 ca:fe:ba:be"
.PP
The spaces within the byte string are optional and separate the Ethernet
fields (destination and source address, type field, and a short payload). The
only additional options supported are \fI-a\fP, \fI-b\fP, \fI-c\fP, and
\fI-p\fP. The frame length MUST be greater or equal 15 bytes.
.br
The \fBhigher-layer\fP mode is enabled using the \fI-t <packet_type>\fP
option. This option activates a packet builder and besides the
\fIpacket_type\fP an optional \fIarg_string\fP can be specified. The
\fIarg_string\fP contains packet-specific parameters, such as TCP flags, port
numbers, etc.
.PP
Note that Mausezahn requires root privileges. Please see the Mausezahn User's
Guide for more details or use Mausezahn's command line help.
.SH OPTIONS
Mausezahn has a built-in context specific help. Simply append the keyword
\fBhelp\fP to the configuration options. 
.br
The most important options are:
.TP
.B \-v
Verbose mode.
.TP
.B \-q
Quiet mode (only warnings and errors are displayed).
.TP
.B \-c <count>
Send the packet count times (default: 1, infinite: 0).
.TP
.B \-d <delay>
Apply delay between transmissions. The delay value can be specified in usec
(default, no additional unit needed), or in msec (e. g. 100m or 100msec), or
in seconds (e. g. 100s or 100sec).
.TP
.B \-p <lenght>
Pad the raw frame to specified length (using zero bytes). Note that for raw
layer 2 frames the specified length defines the whole frame length, while for
higher layer packets the number of additional padding bytes are specified.
.TP
.B \-a <Src_MAC|keyword>
Use specified source mac address (use hex notation such as 00:00:aa:bb:cc:dd).
By default the interface MAC address will be used. The keywords \fIrand\fP and
\fIown\fP refer to a random MAC address (only unicast addresses are created)
and the own address, respectively. You can also use the keywords mentioned
below (although broadcast-type source addresses are officially invalid).
.TP
.B \-b <Dst_MAC|keyword>
Use specified destination mac address.  By default a broadcast is sent in raw
layer 2 mode or the destination hosts/gateways interface MAC address in normal
(IP) mode. You can use the same keywords as mentioned above as well as
\fIbc\fP (or \fIbcast\fP), \fIcisco\fP, and \fIstp\fP. 
Please note that for the destination MAC address the \fIrand\fP keyword is
supported but creates a random address only once, even when you send multiple
packets. 
.TP
.B \-A <Src_IP|range|rand>
Use specified source IP address (default is own interface IP). Optionally the
keyword \fIrand\fP can again be used for a random source IP address or a range
can be specified, such as 192.168.1.1-192.168.1.100 or 10.1.0.0/16. Also a DNS
name can be specified for which Mausezahn tries to determine the corresponding
IP address automatically.
.TP
.B \-B <Dst_IP|range>
Use specified destination IP address (default is broadcast i. e.
255.255.255.255). As with the source address (see above) you can also specify
a range or a DNS name.
.TP
.B \-t <packet_type>
Create the specified packet type using the built-in packet builder. Currently
supported packet types are: \fIarp\fP, \fIbpdu\fP, \fIip\fP, \fIudp\fP,
\fItcp\fP, \fIrtp\fP, and \fIdns\fP. There is currently also a limited support
for ICMP. Enter \fI-t help\fP to verify which packet builders your actual
Mausezahn version supports. Also, for any particular packet type, for example
\fItcp\fP enter \fImausezahn \-t tcp help\fP to receive a context specific help.
.TP
.B \-T <packet_type>
Make this Mausezahn instance the receiving station. Currently (version 0.30)
only \fIrtp\fP is an option here and provides precise jitter measurements. For
this purpose start another Mausezahn instance on the sending station and the
local receiving station will output jitter statistics. See \fImausezahn \-T rtp
help\fP for a detailed help.
.TP
.B \-Q <[CoS:]vlan> [, <[CoS:]vlan>, ...]
Specify 802.1Q VLAN tag and optional Class of Service. An arbitrary number of
VLAN tags can be specified (that is you can simulate QinQ or even
QinQinQinQ...). Multiple tags must be separated via a comma or a period (e. g.
"5:10,20,2:30"). VLAN tags are not supported for ARP and BPDU packets (in
which case you could specify the whole frame in hex using the raw layer 2
interface of Mausezahn).
.TP
.B \-M <label[:cos[:ttl]][bos]> [, <label...>] 
Specify a MPLS label or even a MPLS label stack. Optionally for each label the
experimental bits (usually the Class of Service, CoS) and the Time To Live
(TTL) can be specified. And if you are really crazy you can set/unset the
Bottom of Stack (BoS) bit at each label using the \fIS\fP (set) and \fIs\fP
(unset) option. By default the BoS is set automatically and correctly. Any
other setting will lead to invalid frames. Enter \fI-M help\fP for detailed
instructions and examples.
.TP
.B \-P <ASCII_payload>
Specify a cleartext payload. Alternatively each packet type supports a
hexadecimal specification of the payload (see for example \fI-t udp help\fP).
.br
.SH COMBINATION OF RANGES
When multiple ranges are specified, e. g. destination port ranges AND
destination address ranges, then \fBall\fP possible combinations of ports and
addresses are used for packet generation. This can lead to a very huge number
of frames.
.br
.SH DISCLAIMER AND WARNING
Mausezahn has been designed as fast traffic generator so you quickly can
overwhelm a LAN segment with myriads of packets. And because Mausezahn should
also support security audits it is easily possible to create malicious
packets, SYN floods, specify port and address ranges, DNS and ARP poisoning,
etc.
.br
Therefore, don't use this tool when you are not aware of possible consequences
or have only little knowledge about networks and data communication.  If you
abuse Mausezahn for unallowed attacks and get caught, or damage something of
your own, then this is completely your fault.
.br
.SH EXAMPLES
Send BPDU frames for VLAN 5 as used with Cisco's PVST+ type of STP. Per
default Mausezahn assumes that you want to become the root bridge:
.PP
# mausezahn eth0 \-c 0 \-d 2s \-t bpdu vlan=5
.PP
Perform a CAM table overflow attack:
.PP
# mausezahn eth0 \-c 128000 \-a rand \-p 64
.PP
Perform a SYN flood attack to another VLAN using a VLAN hopping attack. This
only works if you are connected to the same VLAN which is configured as native
VLAN on the trunk.  We assume that the victim VLAN is VLAN 100 and the native
VLAN is VLAN 5. Also lets attack every host in VLAN 100 which use a IP prefix
of 10.100.100.0/24:
.PP
# mausezahn eth0 \-c 0 \-Q 5,100 \-t tcp flags=syn \-p 20
.PP
Send IP multicast packets to the multicast group 230.1.1.1 using a UDP header
with destination port 32000. Send one frame every 10 msec:
.PP
# mausezahn eth0 \-c 0 \-d 10msec \-B 230.1.1.1 \-t udp dp=32000 \-P "Multicast test packet"
.PP
Send UDP packets to the destination host target.anynetwork.foo using all
possible destionation ports and send every packet with all possible source
addresses of the range 172.30.0.0/16; pad with 1000 bytes and repeat this 10
times:
.PP
# mausezahn eth0 \-c 10 \-A 172.30.0.0/16 \-B target.anynetwork.foo \-t udp dp=1-65535 \-p 1000
.br
.SH AUTHOR
Herbert Haas 
.br
Visit www.perihel.at/sec/mz/ for Mausezahn news and additional information.
.PP
This manual page has been written by Vivek Shah <boni.vivek at gmail.com>
for the Fedora project.


--- NEW FILE mausezahn.spec ---
Name:		mausezahn
Version:	0.34.9
Release:	1%{?dist}
Summary:	A fast versatile packet generator

Group:		Applications/Internet
License:	GPLv2
URL:		http://www.perihel.at/sec/mz/
Source0:	http://www.perihel.at/sec/mz/mz-%{version}.tar.gz
Source1:	%{name}.1
Source2:	README.Fedora
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libpcap-devel >= 0.8, libnet-devel >= 1.1, cmake >= 2.4.0
Requires:	python-matplotlib

%description
Mausezahn is a free fast traffic generator written in C which allows you to 
send nearly every possible and impossible packet. Mausezahn can also be used 
for example as didactical tool in network labs or for security audits including
penetration and DoS testing. As traffic generator Mausezahn is for example used
to test IP multicast or VoIP networks. Speeds close to the Ethernet limit are 
reachable (depending on the HW platform).

%prep
%setup -q -n mz-%{version}
sed -i.optflags -e '/^SET(CMAKE_C_FLAGS/d' CMakeLists.txt

%build
%cmake .
make %{?_smp_mflags} VERBOSE=1

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.html" -delete
find $RPM_BUILD_ROOT -type f -name "*.pdf" -delete
mv $RPM_BUILD_ROOT%{_sbindir}/mz $RPM_BUILD_ROOT%{_sbindir}/%{name}
cp -p %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1/
mv $RPM_BUILD_ROOT%{_defaultdocdir}/mz \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
cp -p %SOURCE2 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
cp -pr AUTHORS ChangeLog COPYING README \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
rm $RPM_BUILD_ROOT%{_mandir}/man1/mz.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_defaultdocdir}/%{name}-%{version}/
%{_mandir}/man1/%{name}*

%changelog
* Sat Aug 8 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.9-1
- Updated to new upstream version

* Tue Aug 4 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.8-2
- Removed the cmake flags to be overriden by optflags

* Sat Aug 1 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.8-1
- Updated to new upstream version
- Removed extra empty doc line from files section
- Removed INSTALL files from doc section
- Added Fedora specific flags

* Sat Jul 18 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.6-2
- Cleaned up spaces in description and added a missing infinitive
- Unified all doc files to be copied in a single docdir

* Sat Jul 18 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.6-1
- Changed package name to mausezahn
- Added new README.Fedora
- Modified existing manpage

* Tue Nov 4 2008 Vivek Shah <boni.vivek at gmail.com> 0.34.5-2
- Changed binary and manpage file name to mausezahn to avoid conflicts
- Added Requires field for sample python script

* Sat Nov 1 2008 Vivek Shah <boni.vivek at gmail.com> 0.34.5-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mausezahn/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 22:43:26 -0000	1.1
+++ .cvsignore	8 Aug 2009 16:15:47 -0000	1.2
@@ -0,0 +1 @@
+mz-0.34.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mausezahn/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 22:43:26 -0000	1.1
+++ sources	8 Aug 2009 16:15:47 -0000	1.2
@@ -0,0 +1 @@
+17dcc41248744a14690a62bce3b637b2  mz-0.34.9.tar.gz



From bonii at fedoraproject.org  Sat Aug  8 16:18:07 2009
From: bonii at fedoraproject.org (Vivek Shah)
Date: Sat,  8 Aug 2009 16:18:07 +0000 (UTC)
Subject: rpms/mausezahn/F-11 README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 mausezahn.1, NONE, 1.1 mausezahn.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090808161807.DC5B211C02CB@cvs1.fedora.phx.redhat.com>

Author: bonii

Update of /cvs/pkgs/rpms/mausezahn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26927/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log mausezahn.1 mausezahn.spec 
Log Message:

Initial package import into CVS



--- NEW FILE README.Fedora ---
Important changes in Mausezahn in Fedora:

The binary executable for Mausezahn is available in Fedora as 
/usr/bin/mausezahn as opposed to /usr/bin/mz. This is done in
keeping with the Fedora packaging guidelines with regards to 
problems that can occur in namespace with short names like 
"mz". For more reference see here:
http://fedoraproject.org/wiki/PackageMaintainers/Packaging_Tricks#Use_of_common_namespace


--- NEW FILE import.log ---
mausezahn-0_34_9-1_fc9:F-11:mausezahn-0.34.9-1.fc9.src.rpm:1249748211


--- NEW FILE mausezahn.1 ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" 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 MAUSEZAHN 1 "July 18, 2009"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
mausezahn \- a fast versatile packet generator
.SH SYNOPSIS
.B mausezahn
.RI  [ options ] "<arg_string> | <hex_string>" 
.br
.SH DESCRIPTION
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
.\" respectively.
\fBMausezahn\fP is a free fast traffic generator written in C which allows 
you to send nearly every possible and impossible packet. 
.br
Mausezahn can also be used for example as didactical tool in network labs or
for security audits including penetration and DoS testing. As traffic
generator Mausezahn is for example used test IP multicast or VoIP networks.
Speeds close to the Ethernet limit are reachable (depending on the HW
platform).
.br
.SH USAGE
Mausezahn supports two modes, \fBraw-layer-2\fP mode, where every single byte
to be sent can be specified, and \fBhigher-layer\fP mode, where packet builder
interfaces are used (using the \fI-t\fP option).
.br
To use the \fBraw-layer-2\fP mode, simply specify the desired frame as
hexadecimal sequence (the \fIhex_string\fP), such as
.PP
mausezahn eth0 "00:ab:cd:ef:00 00:00:00:00:00:01 08:00 ca:fe:ba:be"
.PP
The spaces within the byte string are optional and separate the Ethernet
fields (destination and source address, type field, and a short payload). The
only additional options supported are \fI-a\fP, \fI-b\fP, \fI-c\fP, and
\fI-p\fP. The frame length MUST be greater or equal 15 bytes.
.br
The \fBhigher-layer\fP mode is enabled using the \fI-t <packet_type>\fP
option. This option activates a packet builder and besides the
\fIpacket_type\fP an optional \fIarg_string\fP can be specified. The
\fIarg_string\fP contains packet-specific parameters, such as TCP flags, port
numbers, etc.
.PP
Note that Mausezahn requires root privileges. Please see the Mausezahn User's
Guide for more details or use Mausezahn's command line help.
.SH OPTIONS
Mausezahn has a built-in context specific help. Simply append the keyword
\fBhelp\fP to the configuration options. 
.br
The most important options are:
.TP
.B \-v
Verbose mode.
.TP
.B \-q
Quiet mode (only warnings and errors are displayed).
.TP
.B \-c <count>
Send the packet count times (default: 1, infinite: 0).
.TP
.B \-d <delay>
Apply delay between transmissions. The delay value can be specified in usec
(default, no additional unit needed), or in msec (e. g. 100m or 100msec), or
in seconds (e. g. 100s or 100sec).
.TP
.B \-p <lenght>
Pad the raw frame to specified length (using zero bytes). Note that for raw
layer 2 frames the specified length defines the whole frame length, while for
higher layer packets the number of additional padding bytes are specified.
.TP
.B \-a <Src_MAC|keyword>
Use specified source mac address (use hex notation such as 00:00:aa:bb:cc:dd).
By default the interface MAC address will be used. The keywords \fIrand\fP and
\fIown\fP refer to a random MAC address (only unicast addresses are created)
and the own address, respectively. You can also use the keywords mentioned
below (although broadcast-type source addresses are officially invalid).
.TP
.B \-b <Dst_MAC|keyword>
Use specified destination mac address.  By default a broadcast is sent in raw
layer 2 mode or the destination hosts/gateways interface MAC address in normal
(IP) mode. You can use the same keywords as mentioned above as well as
\fIbc\fP (or \fIbcast\fP), \fIcisco\fP, and \fIstp\fP. 
Please note that for the destination MAC address the \fIrand\fP keyword is
supported but creates a random address only once, even when you send multiple
packets. 
.TP
.B \-A <Src_IP|range|rand>
Use specified source IP address (default is own interface IP). Optionally the
keyword \fIrand\fP can again be used for a random source IP address or a range
can be specified, such as 192.168.1.1-192.168.1.100 or 10.1.0.0/16. Also a DNS
name can be specified for which Mausezahn tries to determine the corresponding
IP address automatically.
.TP
.B \-B <Dst_IP|range>
Use specified destination IP address (default is broadcast i. e.
255.255.255.255). As with the source address (see above) you can also specify
a range or a DNS name.
.TP
.B \-t <packet_type>
Create the specified packet type using the built-in packet builder. Currently
supported packet types are: \fIarp\fP, \fIbpdu\fP, \fIip\fP, \fIudp\fP,
\fItcp\fP, \fIrtp\fP, and \fIdns\fP. There is currently also a limited support
for ICMP. Enter \fI-t help\fP to verify which packet builders your actual
Mausezahn version supports. Also, for any particular packet type, for example
\fItcp\fP enter \fImausezahn \-t tcp help\fP to receive a context specific help.
.TP
.B \-T <packet_type>
Make this Mausezahn instance the receiving station. Currently (version 0.30)
only \fIrtp\fP is an option here and provides precise jitter measurements. For
this purpose start another Mausezahn instance on the sending station and the
local receiving station will output jitter statistics. See \fImausezahn \-T rtp
help\fP for a detailed help.
.TP
.B \-Q <[CoS:]vlan> [, <[CoS:]vlan>, ...]
Specify 802.1Q VLAN tag and optional Class of Service. An arbitrary number of
VLAN tags can be specified (that is you can simulate QinQ or even
QinQinQinQ...). Multiple tags must be separated via a comma or a period (e. g.
"5:10,20,2:30"). VLAN tags are not supported for ARP and BPDU packets (in
which case you could specify the whole frame in hex using the raw layer 2
interface of Mausezahn).
.TP
.B \-M <label[:cos[:ttl]][bos]> [, <label...>] 
Specify a MPLS label or even a MPLS label stack. Optionally for each label the
experimental bits (usually the Class of Service, CoS) and the Time To Live
(TTL) can be specified. And if you are really crazy you can set/unset the
Bottom of Stack (BoS) bit at each label using the \fIS\fP (set) and \fIs\fP
(unset) option. By default the BoS is set automatically and correctly. Any
other setting will lead to invalid frames. Enter \fI-M help\fP for detailed
instructions and examples.
.TP
.B \-P <ASCII_payload>
Specify a cleartext payload. Alternatively each packet type supports a
hexadecimal specification of the payload (see for example \fI-t udp help\fP).
.br
.SH COMBINATION OF RANGES
When multiple ranges are specified, e. g. destination port ranges AND
destination address ranges, then \fBall\fP possible combinations of ports and
addresses are used for packet generation. This can lead to a very huge number
of frames.
.br
.SH DISCLAIMER AND WARNING
Mausezahn has been designed as fast traffic generator so you quickly can
overwhelm a LAN segment with myriads of packets. And because Mausezahn should
also support security audits it is easily possible to create malicious
packets, SYN floods, specify port and address ranges, DNS and ARP poisoning,
etc.
.br
Therefore, don't use this tool when you are not aware of possible consequences
or have only little knowledge about networks and data communication.  If you
abuse Mausezahn for unallowed attacks and get caught, or damage something of
your own, then this is completely your fault.
.br
.SH EXAMPLES
Send BPDU frames for VLAN 5 as used with Cisco's PVST+ type of STP. Per
default Mausezahn assumes that you want to become the root bridge:
.PP
# mausezahn eth0 \-c 0 \-d 2s \-t bpdu vlan=5
.PP
Perform a CAM table overflow attack:
.PP
# mausezahn eth0 \-c 128000 \-a rand \-p 64
.PP
Perform a SYN flood attack to another VLAN using a VLAN hopping attack. This
only works if you are connected to the same VLAN which is configured as native
VLAN on the trunk.  We assume that the victim VLAN is VLAN 100 and the native
VLAN is VLAN 5. Also lets attack every host in VLAN 100 which use a IP prefix
of 10.100.100.0/24:
.PP
# mausezahn eth0 \-c 0 \-Q 5,100 \-t tcp flags=syn \-p 20
.PP
Send IP multicast packets to the multicast group 230.1.1.1 using a UDP header
with destination port 32000. Send one frame every 10 msec:
.PP
# mausezahn eth0 \-c 0 \-d 10msec \-B 230.1.1.1 \-t udp dp=32000 \-P "Multicast test packet"
.PP
Send UDP packets to the destination host target.anynetwork.foo using all
possible destionation ports and send every packet with all possible source
addresses of the range 172.30.0.0/16; pad with 1000 bytes and repeat this 10
times:
.PP
# mausezahn eth0 \-c 10 \-A 172.30.0.0/16 \-B target.anynetwork.foo \-t udp dp=1-65535 \-p 1000
.br
.SH AUTHOR
Herbert Haas 
.br
Visit www.perihel.at/sec/mz/ for Mausezahn news and additional information.
.PP
This manual page has been written by Vivek Shah <boni.vivek at gmail.com>
for the Fedora project.


--- NEW FILE mausezahn.spec ---
Name:		mausezahn
Version:	0.34.9
Release:	1%{?dist}
Summary:	A fast versatile packet generator

Group:		Applications/Internet
License:	GPLv2
URL:		http://www.perihel.at/sec/mz/
Source0:	http://www.perihel.at/sec/mz/mz-%{version}.tar.gz
Source1:	%{name}.1
Source2:	README.Fedora
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libpcap-devel >= 0.8, libnet-devel >= 1.1, cmake >= 2.4.0
Requires:	python-matplotlib

%description
Mausezahn is a free fast traffic generator written in C which allows you to 
send nearly every possible and impossible packet. Mausezahn can also be used 
for example as didactical tool in network labs or for security audits including
penetration and DoS testing. As traffic generator Mausezahn is for example used
to test IP multicast or VoIP networks. Speeds close to the Ethernet limit are 
reachable (depending on the HW platform).

%prep
%setup -q -n mz-%{version}
sed -i.optflags -e '/^SET(CMAKE_C_FLAGS/d' CMakeLists.txt

%build
%cmake .
make %{?_smp_mflags} VERBOSE=1

%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.html" -delete
find $RPM_BUILD_ROOT -type f -name "*.pdf" -delete
mv $RPM_BUILD_ROOT%{_sbindir}/mz $RPM_BUILD_ROOT%{_sbindir}/%{name}
cp -p %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1/
mv $RPM_BUILD_ROOT%{_defaultdocdir}/mz \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
cp -p %SOURCE2 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
cp -pr AUTHORS ChangeLog COPYING README \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
rm $RPM_BUILD_ROOT%{_mandir}/man1/mz.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_sbindir}/%{name}
%{_defaultdocdir}/%{name}-%{version}/
%{_mandir}/man1/%{name}*

%changelog
* Sat Aug 8 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.9-1
- Updated to new upstream version

* Tue Aug 4 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.8-2
- Removed the cmake flags to be overriden by optflags

* Sat Aug 1 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.8-1
- Updated to new upstream version
- Removed extra empty doc line from files section
- Removed INSTALL files from doc section
- Added Fedora specific flags

* Sat Jul 18 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.6-2
- Cleaned up spaces in description and added a missing infinitive
- Unified all doc files to be copied in a single docdir

* Sat Jul 18 2009 Vivek Shah <boni.vivek at gmail.com> 0.34.6-1
- Changed package name to mausezahn
- Added new README.Fedora
- Modified existing manpage

* Tue Nov 4 2008 Vivek Shah <boni.vivek at gmail.com> 0.34.5-2
- Changed binary and manpage file name to mausezahn to avoid conflicts
- Added Requires field for sample python script

* Sat Nov 1 2008 Vivek Shah <boni.vivek at gmail.com> 0.34.5-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mausezahn/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 22:43:26 -0000	1.1
+++ .cvsignore	8 Aug 2009 16:18:07 -0000	1.2
@@ -0,0 +1 @@
+mz-0.34.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mausezahn/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 22:43:26 -0000	1.1
+++ sources	8 Aug 2009 16:18:07 -0000	1.2
@@ -0,0 +1 @@
+17dcc41248744a14690a62bce3b637b2  mz-0.34.9.tar.gz



From eponyme at fedoraproject.org  Sat Aug  8 16:59:53 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  8 Aug 2009 16:59:53 +0000 (UTC)
Subject: rpms/clive/devel clive.spec,1.21,1.22
Message-ID: <20090808165953.CB9EF11C02CB@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1582

Modified Files:
	clive.spec 
Log Message:
Add perl(Getopt::ArgvFile) as a Require


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- clive.spec	3 Aug 2009 13:25:24 -0000	1.21
+++ clive.spec	8 Aug 2009 16:59:51 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Base) perl(Class::Singleton) perl(Getopt::ArgvFile) perl(Digest::SHA) perl(WWW::Curl)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton) perl(Getopt::ArgvFile)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2
+- Add perl(Getopt::ArgvFile) as a Require
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1
 - Update to 2.2.4
 - Add perl-Class-Singleton as an explicit require



From eponyme at fedoraproject.org  Sat Aug  8 17:00:54 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  8 Aug 2009 17:00:54 +0000 (UTC)
Subject: rpms/clive/F-11 clive.spec,1.20,1.21
Message-ID: <20090808170054.A8FB911C02CB@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1866

Modified Files:
	clive.spec 
Log Message:
Add perl(Getopt::ArgvFile) as a Require


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- clive.spec	3 Aug 2009 13:27:05 -0000	1.20
+++ clive.spec	8 Aug 2009 17:00:54 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Base) perl(Class::Singleton) perl(Getopt::ArgvFile) perl(Digest::SHA) perl(WWW::Curl)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton) perl(Getopt::ArgvFile)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2
+- Add perl(Getopt::ArgvFile) as a Require
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1
 - Update to 2.2.4
 - Add perl-Class-Singleton as an explicit require



From eponyme at fedoraproject.org  Sat Aug  8 17:01:44 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat,  8 Aug 2009 17:01:44 +0000 (UTC)
Subject: rpms/clive/F-10 clive.spec,1.18,1.19
Message-ID: <20090808170144.A6A2211C02CB@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2057

Modified Files:
	clive.spec 
Log Message:
Add perl(Getopt::ArgvFile) as a Require


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- clive.spec	3 Aug 2009 13:28:16 -0000	1.18
+++ clive.spec	8 Aug 2009 17:01:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           clive
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::Base) perl(Class::Singleton) perl(Getopt::ArgvFile) perl(Digest::SHA) perl(WWW::Curl)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(BerkeleyDB) perl(Digest::SHA) perl(Class::Singleton) perl(Getopt::ArgvFile)
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2
+- Add perl(Getopt::ArgvFile) as a Require
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1
 - Update to 2.2.4
 - Add perl-Class-Singleton as an explicit require



From gemi at fedoraproject.org  Sat Aug  8 17:02:49 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 17:02:49 +0000 (UTC)
Subject: rpms/oorexx/F-10 .cvsignore, 1.4, 1.5 oorexx-paths.patch, 1.1,
	1.2 oorexx.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090808170249.7B36311C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/oorexx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2311

Modified Files:
	.cvsignore oorexx-paths.patch oorexx.spec sources 
Log Message:
new release 4.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Nov 2007 23:57:46 -0000	1.4
+++ .cvsignore	8 Aug 2009 17:02:49 -0000	1.5
@@ -1,2 +1,2 @@
-ooRexx-3.2.0.tar.gz
-ooRexx-3.2.0-pdf.zip
+ooRexx-4.0.0-4801.source.tar.gz
+ooRexx-4.0.0-beta-pdf.zip

oorexx-paths.patch:
 Makefile.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: oorexx-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-10/oorexx-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oorexx-paths.patch	9 Oct 2006 20:33:13 -0000	1.1
+++ oorexx-paths.patch	8 Aug 2009 17:02:49 -0000	1.2
@@ -1,62 +1,42 @@
---- ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp.paths	2006-09-25 19:11:07.000000000 +0200
-+++ ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp	2006-09-25 19:12:09.000000000 +0200
-@@ -427,6 +427,9 @@
- //  fullname = (PSZ)string_data(imgpath);
+diff -up ooRexx-4.0.0.patched/Makefile.in.paths ooRexx-4.0.0.patched/Makefile.in
+--- ooRexx-4.0.0.patched/Makefile.in.paths	2009-08-08 18:06:40.000000000 +0200
++++ ooRexx-4.0.0.patched/Makefile.in	2009-08-08 18:09:39.000000000 +0200
+@@ -56,7 +56,7 @@
  
- //if ( imgpath && fullname )                         /* seg faultn          */
-+  if (fullname == 0) {
-+    fullname = SearchFileName((PCHAR)"/usr/share/ooRexx/" BASEIMAGE, 'P');
-+  }
-   if ( fullname != OREF_NULL )
-     image = fopen((PSZ)fullname, "rb");/* try to open the file              */
-   else
---- ooRexx-3.1.0/Makefile.in.paths	2006-09-25 19:12:21.000000000 +0200
-+++ ooRexx-3.1.0/Makefile.in	2006-09-25 19:14:15.000000000 +0200
-@@ -60,7 +60,7 @@
- top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(libdir)
  pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -415,7 +415,7 @@
- 			compile @REXXCAT@ rexx.img \
- 			stamp-h.in cscope.files cscope.out $(distdir).tar.gz
- 
--SUBDIRS = samples
-+SUBDIRS =
- DIST_SUBDIRS = samples
- 
- # This defines the current version of ooRexx
-@@ -462,7 +462,7 @@
- samples_dir = $(top_srcdir)/samples
- samples_windows_dir = $(top_srcdir)/samples/windows
- samples_unix_dir = $(top_srcdir)/samples/unix
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -631,7 +631,7 @@ build_extensions_rexutils_platform_dir =
+ build_api_platform_dir = $(api_ at ORX_PLATFORM@_dir)
+ build_os_platform_dir = $(platform_ at ORX_PLATFORM@_dir)
+ build_samples_platform_dir = $(samples_ at ORX_PLATFORM@_dir)
 -catdir = $(prefix)/bin
 +catdir = $(datadir)/ooRexx
  COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                    -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                    -DORX_CATDIR=\"$(catdir)\" \
-@@ -3170,7 +3170,7 @@
+@@ -4062,16 +4062,16 @@ install-exec-local:
  	echo $(DESTDIR) is destdir
  	echo $(prefix) is prefix
  	echo $(install_sh_PROGRAM)
 -	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img
-+	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(datadir)/ooRexx/rexx.img
++	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(catdir)/rexx.img
  	if test -z "$(GENCAT)"; then \
  		echo "No rexx.cat to install"; \
  	else \
-@@ -3181,9 +3181,9 @@
- 	$(install_sh_SCRIPT) $(rexutils_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
- 	for a in $(samples_dir)/*.rex; do \
- 		bn=`basename $$a`; \
--		$(install_sh_SCRIPT) $$a $(DESTDIR)$(prefix)/share/ooRexx/$$bn; \
-+		$(install_sh_SCRIPT) $$a $(DESTDIR)$(datadir)/ooRexx/$$bn; \
- 	done;
--	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme
-+	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(datadir)/ooRexx/readme
- 
- package:
- 	./rexx $(top_srcdir)/platform/unix/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)
+ 		$(install_sh_SCRIPT) rexx.cat $(DESTDIR)$(catdir)/rexx.cat; \
+ 	fi
+ 	$(install_sh_SCRIPT) $(build_os_platform_dir)/oorexx-config $(DESTDIR)$(prefix)/bin/oorexx-config
+-	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(prefix)/bin/rxregexp.cls
+-	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
+-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(prefix)/bin/socket.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(catdir)/rxregexp.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(catdir)/rxftp.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(catdir)/socket.cls
+ 	if test "$(ORX_SYS_STR)" != "AIX"; then \
+ 		$(install_sh_SCRIPT) $(rexxapi_server_unix_dir)/rxapid $(DESTDIR)$(prefix)/bin/rxapid; \
+ 	fi


Index: oorexx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-10/oorexx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- oorexx.spec	23 Feb 2008 09:02:34 -0000	1.10
+++ oorexx.spec	8 Aug 2009 17:02:49 -0000	1.11
@@ -1,17 +1,16 @@
 Name:           oorexx
-Version:        3.2.0
-Release:        4%{?dist}
+Version:        4.0.0
+Release:        1.4801%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
 License:        CPL
 URL:            http://www.oorexx.org
-Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}.tar.gz
-Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-pdf.zip
+Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-4801.source.tar.gz
+Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-beta-pdf.zip
 Patch0:         oorexx-paths.patch
-Patch1:         oorexx-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64 ppc64
+#ExcludeArch:    x86_64 ppc64
 
 
 %description
@@ -55,7 +54,6 @@ Header files and libraries for ooRexx.
 %setup -q -n ooRexx-%{version}
 unzip -qo %{SOURCE1}
 %patch0 -p1 -b .paths
-%patch1 -p1 -b .paths
 
 
 %build
@@ -70,8 +68,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec 
 rm -fr samples/**/.deps
 rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.csh
 rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.sh
-mv $RPM_BUILD_ROOT%{_bindir}/rxftp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
-mv $RPM_BUILD_ROOT%{_bindir}/rxregexp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/ooRexx/*
 
 # remove cruft
@@ -92,11 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CPLv1.0.txt readme.pdf
+%doc CPLv1.0.txt readme.pdf CHANGES
 %{_bindir}/rexx
 %{_bindir}/rexxc
-%{_bindir}/rxdelipc
-%{_bindir}/rxmigrate
+%{_bindir}/rexximage
+%{_bindir}/rxapi
+%{_bindir}/rxapid
 %{_bindir}/rxqueue
 %{_bindir}/rxsubcom
 %{_datadir}/ooRexx
@@ -106,12 +103,12 @@ rm -rf $RPM_BUILD_ROOT
 %files docs
 %defattr(-,root,root,-)
 %doc rexxpg.pdf rexxref.pdf rxftp.pdf rxmath.pdf rxsock.pdf
-%doc samples README.txt
+%doc samples ReleaseNotes
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/rexx.h
+%{_includedir}/*
 %{_libdir}/lib*.so
 %{_bindir}/oorexx-config
 
@@ -123,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-1.4801
+- new release 4.0.0
+
 * Sat Feb 23 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.2.0-4
 - fix for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Nov 2007 23:57:46 -0000	1.4
+++ sources	8 Aug 2009 17:02:49 -0000	1.5
@@ -1,2 +1,2 @@
-4a3220466acd13028311e3498efb306a  ooRexx-3.2.0.tar.gz
-3b02f3df1cd1d65a30b0139cf137908c  ooRexx-3.2.0-pdf.zip
+ddf8bcdf09b47511b598329a5da4184a  ooRexx-4.0.0-4801.source.tar.gz
+b5029eca42a75676cca05a544dc8a55f  ooRexx-4.0.0-beta-pdf.zip



From makowski at fedoraproject.org  Sat Aug  8 17:29:19 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Sat,  8 Aug 2009 17:29:19 +0000 (UTC)
Subject: rpms/firebird/devel firebird.spec,1.7,1.8
Message-ID: <20090808172919.DD62B11C02CB@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6077

Modified Files:
	firebird.spec 
Log Message:
* Sat Aug 08 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-3
- set correct setuid for Classic lock manager



Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- firebird.spec	5 Aug 2009 13:55:18 -0000	1.7
+++ firebird.spec	8 Aug 2009 17:29:18 -0000	1.8
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -501,6 +501,27 @@ fi
 %dir %{fbroot}/UDF-classic
 %defattr(0755,root,root,0755)
 %{fbroot}/bin-classic/*
+%{fbroot}/bin-classic/changeDBAPassword.sh
+%{fbroot}/bin-classic/changeGdsLibraryCompatibleLink.sh
+%{fbroot}/bin-classic/changeRunUser.sh
+%{fbroot}/bin-classic/createAliasDB.sh
+%{fbroot}/bin-classic/fb_config
+%{fbroot}/bin-classic/fb_inet_server
+%{fbroot}/bin-classic/fb_lock_print
+%{fbroot}/bin-classic/fbsvcmgr
+%{fbroot}/bin-classic/gbak
+%{fbroot}/bin-classic/gdef
+%{fbroot}/bin-classic/gds_drop
+%{fbroot}/bin-classic/gfix
+%{fbroot}/bin-classic/gpre
+%{fbroot}/bin-classic/gsec
+%{fbroot}/bin-classic/gsplit
+%{fbroot}/bin-classic/gstat
+%{fbroot}/bin-classic/isql
+%{fbroot}/bin-classic/nbackup
+%{fbroot}/bin-classic/qli
+%{fbroot}/bin-classic/restoreRootRunUser.sh
+%attr(6550,root,%{name}) %{fbroot}/bin-classic/fb_lock_mgr
 %{fbroot}/UDF-classic/*.so
 %defattr(0644,root,root,0755)
 %{fbroot}/UDF-classic/*.sql
@@ -522,6 +543,9 @@ fi
 
 
 %changelog
+* Sat Aug 08 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-3
+- set correct setuid for Classic lock manager
+
 * Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
 - rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
 - remove stupid rm -rf in postun



From myoung at fedoraproject.org  Sat Aug  8 18:06:14 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat,  8 Aug 2009 18:06:14 +0000 (UTC)
Subject: rpms/kernel/devel die-floppy-die.patch, NONE,
	1.1.2.2 drm-hush-vblank-warning.patch, NONE,
	1.1.2.2 drm-radeon-fixes.patch, NONE, 1.1.2.2
	linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch, 
	NONE, 1.1.2.2 linux-2.6-ksm-updates.patch, NONE,
	1.1.2.2 config-generic, 1.238.6.32,
	1.238.6.33 config-x86-generic, 1.68.6.15,
	1.68.6.16 drm-r600-kms.patch, 1.1.2.2, 1.1.2.3 kernel.spec,
	1.1294.2.44, 1.1294.2.45 linux-2.6-ppc-perfctr-oops-fix.patch,
	1.2.2.2, 1.2.2.3 linux-2.6-vga-arb.patch, 1.6.2.2,
	1.6.2.3 xen.pvops.patch, 1.1.2.29, 1.1.2.30 xen.pvops.post.patch,
	1.1.2.18, 1.1.2.19 xen.pvops.pre.patch, 1.1.2.14, 1.1.2.15
Message-ID: <20090808180614.F3FA311C02CB@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10194

Modified Files:
      Tag: private-myoung-dom0-branch
	config-generic config-x86-generic drm-r600-kms.patch 
	kernel.spec linux-2.6-ppc-perfctr-oops-fix.patch 
	linux-2.6-vga-arb.patch xen.pvops.patch xen.pvops.post.patch 
	xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	die-floppy-die.patch drm-hush-vblank-warning.patch 
	drm-radeon-fixes.patch 
	linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch 
	linux-2.6-ksm-updates.patch 
Log Message:
update pvops patch to latest rebase/master and current rawhide


die-floppy-die.patch:
 floppy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE die-floppy-die.patch ---
Kill the floppy.ko pnp modalias. We were surviving just fine without
autoloading floppy drivers, tyvm.

Please feel free to register all complaints in the wastepaper bin.

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 91b7530..2ea84a6 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4631,7 +4631,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
 	{ "PNP0700", 0 },
 	{ }
 };
-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
 
 #else
 

drm-hush-vblank-warning.patch:
 drm_irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE drm-hush-vblank-warning.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.jx	2009-08-06 11:09:29.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-06 14:44:34.000000000 -0400
@@ -634,7 +634,7 @@ int drm_wait_vblank(struct drm_device *d
 
 	ret = drm_vblank_get(dev, crtc);
 	if (ret) {
-		DRM_ERROR("failed to acquire vblank counter, %d\n", ret);
+		DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);
 		return ret;
 	}
 	seq = drm_vblank_count(dev, crtc);

drm-radeon-fixes.patch:
 drivers/gpu/drm/radeon/r600_cp.c       |   22 +++++++++++++++-------
 drivers/gpu/drm/radeon/radeon_device.c |    4 +++-
 drivers/gpu/drm/radeon/radeon_drv.h    |    1 +
 drivers/gpu/drm/radeon/radeon_object.c |    2 +-
 include/drm/drm_pciids.h               |    5 +++++
 5 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE drm-radeon-fixes.patch ---
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index 146f357..20f1790 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -384,8 +384,9 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
 		DRM_INFO("Loading RV670 PFP Microcode\n");
 		for (i = 0; i < PFP_UCODE_SIZE; i++)
 			RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]);
-	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
-		DRM_INFO("Loading RS780 CP Microcode\n");
+	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
+		DRM_INFO("Loading RS780/RS880 CP Microcode\n");
 		for (i = 0; i < PM4_UCODE_SIZE; i++) {
 			RADEON_WRITE(R600_CP_ME_RAM_DATA,
 				     RS780_cp_microcode[i][0]);
@@ -396,7 +397,7 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
 		}
 
 		RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-		DRM_INFO("Loading RS780 PFP Microcode\n");
+		DRM_INFO("Loading RS780/RS880 PFP Microcode\n");
 		for (i = 0; i < PFP_UCODE_SIZE; i++)
 			RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]);
 	}
@@ -783,6 +784,7 @@ static void r600_gfx_init(struct drm_device *dev,
 		break;
 	case CHIP_RV610:
 	case CHIP_RS780:
+	case CHIP_RS880:
 	case CHIP_RV620:
 		dev_priv->r600_max_pipes = 1;
 		dev_priv->r600_max_tile_pipes = 1;
@@ -917,7 +919,8 @@ static void r600_gfx_init(struct drm_device *dev,
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV630) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780))
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880))
 		RADEON_WRITE(R600_DB_DEBUG, R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE);
 	else
 		RADEON_WRITE(R600_DB_DEBUG, 0);
@@ -935,7 +938,8 @@ static void r600_gfx_init(struct drm_device *dev,
 	sq_ms_fifo_sizes = RADEON_READ(R600_SQ_MS_FIFO_SIZES);
 	if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
 		sq_ms_fifo_sizes = (R600_CACHE_FIFO_SIZE(0xa) |
 				    R600_FETCH_FIFO_HIWATER(0xa) |
 				    R600_DONE_FIFO_HIWATER(0xe0) |
@@ -978,7 +982,8 @@ static void r600_gfx_init(struct drm_device *dev,
 					    R600_NUM_ES_STACK_ENTRIES(0));
 	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
 		/* no vertex cache */
 		sq_config &= ~R600_VC_ENABLE;
 
@@ -1035,7 +1040,8 @@ static void r600_gfx_init(struct drm_device *dev,
 
 	if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
 	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780))
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+	    ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880))
 		RADEON_WRITE(R600_VGT_CACHE_INVALIDATION, R600_CACHE_INVALIDATION(R600_TC_ONLY));
 	else
 		RADEON_WRITE(R600_VGT_CACHE_INVALIDATION, R600_CACHE_INVALIDATION(R600_VC_AND_TC));
@@ -1078,6 +1084,7 @@ static void r600_gfx_init(struct drm_device *dev,
 		break;
 	case CHIP_RV610:
 	case CHIP_RS780:
+	case CHIP_RS880:
 	case CHIP_RV620:
 		gs_prim_buffer_depth = 32;
 		break;
@@ -1123,6 +1130,7 @@ static void r600_gfx_init(struct drm_device *dev,
 	switch (dev_priv->flags & RADEON_FAMILY_MASK) {
 	case CHIP_RV610:
 	case CHIP_RS780:
+	case CHIP_RS880:
 	case CHIP_RV620:
 		tc_cntl = R600_TC_L2_SIZE(8);
 		break;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index a162ade..9ff6dcb 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -152,7 +152,9 @@ int radeon_mc_setup(struct radeon_device *rdev)
 		}
 	} else {
 		rdev->mc.vram_location = 0;
-		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+		tmp = rdev->mc.mc_vram_size;
+		tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
+		rdev->mc.gtt_location = tmp;
 	}
 	DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
 	DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 127d045..3933f82 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -143,6 +143,7 @@ enum radeon_family {
 	CHIP_RV635,
 	CHIP_RV670,
 	CHIP_RS780,
+	CHIP_RS880,
 	CHIP_RV770,
 	CHIP_RV730,
 	CHIP_RV710,
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index dd9ac2f..e98cae3 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -106,7 +106,7 @@ static inline uint32_t radeon_object_flags_from_domain(uint32_t domain)
 		flags |= TTM_PL_FLAG_VRAM | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
 	}
 	if (domain & RADEON_GEM_DOMAIN_GTT) {
-		flags |= TTM_PL_FLAG_TT | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
+		flags |= TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
 	}
 	if (domain & RADEON_GEM_DOMAIN_CPU) {
 		flags |= TTM_PL_FLAG_SYSTEM | TTM_PL_MASK_CACHING;
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 9d4c004..8535084 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -370,6 +370,11 @@
 	{0x1002, 0x9614, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0x1002, 0x9615, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0x1002, 0x9616, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9711, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0, 0, 0}
 
 #define r128_PCI_IDS \

linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch:
 blk-core.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch ---
From: Mark McLoughlin <markmc at redhat.com>
Subject: [PATCH] block: silently error unsupported empty barriers too

With 2.6.31-rc5 in a KVM guest using dm and virtio_blk, we see the
following errors:

  end_request: I/O error, dev vda, sector 0
  end_request: I/O error, dev vda, sector 0

The errors go away if dm stops submitting empty barriers, by reverting:

  commit 52b1fd5a27c625c78373e024bf570af3c9d44a79
  Author: Mikulas Patocka <mpatocka at redhat.com>
    dm: send empty barriers to targets in dm_flush

We should error all barriers, even empty barriers, on devices like
virtio_blk which don't support them.

See also:

  https://bugzilla.redhat.com/514901

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Mikulas Patocka <mpatocka at redhat.com>
Cc: Alasdair G Kergon <agk at redhat.com>
Cc: Neil Brown <neilb at suse.de>
---
 block/blk-core.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index e3299a7..35ad2bb 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1163,8 +1163,7 @@ static int __make_request(struct request_queue *q, struct bio *bio)
 	const int unplug = bio_unplug(bio);
 	int rw_flags;
 
-	if (bio_barrier(bio) && bio_has_data(bio) &&
-	    (q->next_ordered == QUEUE_ORDERED_NONE)) {
+	if (bio_barrier(bio) && (q->next_ordered == QUEUE_ORDERED_NONE)) {
 		bio_endio(bio, -EOPNOTSUPP);
 		return 0;
 	}
-- 
1.6.4


linux-2.6-ksm-updates.patch:
 Documentation/vm/00-INDEX |    2 
 Documentation/vm/ksm.txt  |   89 ++++++
 include/linux/ksm.h       |   31 +-
 kernel/fork.c             |    1 
 mm/Kconfig                |    2 
 mm/ksm.c                  |  665 ++++++++++++++++++++++++++++------------------
 mm/memory.c               |    5 
 mm/mmap.c                 |   16 -
 8 files changed, 539 insertions(+), 272 deletions(-)

--- NEW FILE linux-2.6-ksm-updates.patch ---
Date: 	Mon, 3 Aug 2009 13:10:02 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 1/12] ksm: rename kernel_pages_allocated

We're not implementing swapping of KSM pages in its first release;
but when that follows, "kernel_pages_allocated" will be a very poor
name for the sysfs file showing number of nodes in the stable tree:
rename that to "pages_shared" throughout.

But we already have a "pages_shared", counting those page slots
sharing the shared pages: first rename that to... "pages_sharing".

What will become of "max_kernel_pages" when the pages shared can
be swapped?  I guess it will just be removed, so keep that name.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   57 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

--- ksm0/mm/ksm.c	2009-08-01 05:02:09.000000000 +0100
+++ ksm1/mm/ksm.c	2009-08-02 13:49:36.000000000 +0100
@@ -150,10 +150,10 @@ static struct kmem_cache *rmap_item_cach
 static struct kmem_cache *mm_slot_cache;
 
 /* The number of nodes in the stable tree */
-static unsigned long ksm_kernel_pages_allocated;
+static unsigned long ksm_pages_shared;
 
 /* The number of page slots sharing those nodes */
-static unsigned long ksm_pages_shared;
+static unsigned long ksm_pages_sharing;
 
 /* Limit on the number of unswappable pages used */
 static unsigned long ksm_max_kernel_pages;
@@ -384,7 +384,7 @@ static void remove_rmap_item_from_tree(s
 				next_item->address |= NODE_FLAG;
 			} else {
 				rb_erase(&rmap_item->node, &root_stable_tree);
-				ksm_kernel_pages_allocated--;
+				ksm_pages_shared--;
 			}
 		} else {
 			struct rmap_item *prev_item = rmap_item->prev;
@@ -398,7 +398,7 @@ static void remove_rmap_item_from_tree(s
 		}
 
 		rmap_item->next = NULL;
-		ksm_pages_shared--;
+		ksm_pages_sharing--;
 
 	} else if (rmap_item->address & NODE_FLAG) {
 		unsigned char age;
@@ -748,7 +748,7 @@ static int try_to_merge_two_pages(struct
 	 * is the number of kernel pages that we hold.
 	 */
 	if (ksm_max_kernel_pages &&
-	    ksm_max_kernel_pages <= ksm_kernel_pages_allocated)
+	    ksm_max_kernel_pages <= ksm_pages_shared)
 		return err;
 
 	kpage = alloc_page(GFP_HIGHUSER);
@@ -787,7 +787,7 @@ static int try_to_merge_two_pages(struct
 		if (err)
 			break_cow(mm1, addr1);
 		else
-			ksm_pages_shared += 2;
+			ksm_pages_sharing += 2;
 	}
 
 	put_page(kpage);
@@ -817,7 +817,7 @@ static int try_to_merge_with_ksm_page(st
 	up_read(&mm1->mmap_sem);
 
 	if (!err)
-		ksm_pages_shared++;
+		ksm_pages_sharing++;
 
 	return err;
 }
@@ -935,7 +935,7 @@ static struct rmap_item *stable_tree_ins
 		}
 	}
 
-	ksm_kernel_pages_allocated++;
+	ksm_pages_shared++;
 
 	rmap_item->address |= NODE_FLAG | STABLE_FLAG;
 	rmap_item->next = NULL;
@@ -1051,7 +1051,7 @@ static void cmp_and_merge_page(struct pa
 	tree_rmap_item = stable_tree_search(page, page2, rmap_item);
 	if (tree_rmap_item) {
 		if (page == page2[0]) {			/* forked */
-			ksm_pages_shared++;
+			ksm_pages_sharing++;
 			err = 0;
 		} else
 			err = try_to_merge_with_ksm_page(rmap_item->mm,
@@ -1114,7 +1114,7 @@ static void cmp_and_merge_page(struct pa
 				break_cow(tree_rmap_item->mm,
 						tree_rmap_item->address);
 				break_cow(rmap_item->mm, rmap_item->address);
-				ksm_pages_shared -= 2;
+				ksm_pages_sharing -= 2;
 			}
 		}
 
@@ -1430,7 +1430,7 @@ static ssize_t run_store(struct kobject
 	/*
 	 * KSM_RUN_MERGE sets ksmd running, and 0 stops it running.
 	 * KSM_RUN_UNMERGE stops it running and unmerges all rmap_items,
-	 * breaking COW to free the kernel_pages_allocated (but leaves
+	 * breaking COW to free the unswappable pages_shared (but leaves
 	 * mm_slots on the list for when ksmd may be set running again).
 	 */
 
@@ -1449,22 +1449,6 @@ static ssize_t run_store(struct kobject
 }
 KSM_ATTR(run);
 
-static ssize_t pages_shared_show(struct kobject *kobj,
-				 struct kobj_attribute *attr, char *buf)
-{
-	return sprintf(buf, "%lu\n",
-			ksm_pages_shared - ksm_kernel_pages_allocated);
-}
-KSM_ATTR_RO(pages_shared);
-
-static ssize_t kernel_pages_allocated_show(struct kobject *kobj,
-					   struct kobj_attribute *attr,
-					   char *buf)
-{
-	return sprintf(buf, "%lu\n", ksm_kernel_pages_allocated);
-}
-KSM_ATTR_RO(kernel_pages_allocated);
-
 static ssize_t max_kernel_pages_store(struct kobject *kobj,
 				      struct kobj_attribute *attr,
 				      const char *buf, size_t count)
@@ -1488,13 +1472,28 @@ static ssize_t max_kernel_pages_show(str
 }
 KSM_ATTR(max_kernel_pages);
 
+static ssize_t pages_shared_show(struct kobject *kobj,
+				 struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_pages_shared);
+}
+KSM_ATTR_RO(pages_shared);
+
+static ssize_t pages_sharing_show(struct kobject *kobj,
+				  struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n",
+			ksm_pages_sharing - ksm_pages_shared);
+}
+KSM_ATTR_RO(pages_sharing);
+
 static struct attribute *ksm_attrs[] = {
 	&sleep_millisecs_attr.attr,
 	&pages_to_scan_attr.attr,
 	&run_attr.attr,
-	&pages_shared_attr.attr,
-	&kernel_pages_allocated_attr.attr,
 	&max_kernel_pages_attr.attr,
+	&pages_shared_attr.attr,
+	&pages_sharing_attr.attr,
 	NULL,
 };
 
--
Date: 	Mon, 3 Aug 2009 13:11:00 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 2/12] ksm: move pages_sharing updates

The pages_shared count is incremented and decremented when adding a node
to and removing a node from the stable tree: easy to understand.  But the
pages_sharing count was hard to follow, being adjusted in various places:
increment and decrement it when adding to and removing from the stable tree.

And the pages_sharing variable used to include the pages_shared, then those
were subtracted when shown in the pages_sharing sysfs file: now keep it as
an exclusive count of leaves hanging off the stable tree nodes, throughout.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

--- ksm1/mm/ksm.c	2009-08-02 13:49:36.000000000 +0100
+++ ksm2/mm/ksm.c	2009-08-02 13:49:43.000000000 +0100
@@ -152,7 +152,7 @@ static struct kmem_cache *mm_slot_cache;
 /* The number of nodes in the stable tree */
 static unsigned long ksm_pages_shared;
 
-/* The number of page slots sharing those nodes */
+/* The number of page slots additionally sharing those nodes */
 static unsigned long ksm_pages_sharing;
 
 /* Limit on the number of unswappable pages used */
@@ -382,6 +382,7 @@ static void remove_rmap_item_from_tree(s
 						&next_item->node,
 						&root_stable_tree);
 				next_item->address |= NODE_FLAG;
+				ksm_pages_sharing--;
 			} else {
 				rb_erase(&rmap_item->node, &root_stable_tree);
 				ksm_pages_shared--;
@@ -395,10 +396,10 @@ static void remove_rmap_item_from_tree(s
 				BUG_ON(next_item->prev != rmap_item);
 				next_item->prev = rmap_item->prev;
 			}
+			ksm_pages_sharing--;
 		}
 
 		rmap_item->next = NULL;
-		ksm_pages_sharing--;
 
 	} else if (rmap_item->address & NODE_FLAG) {
 		unsigned char age;
@@ -786,8 +787,6 @@ static int try_to_merge_two_pages(struct
 		 */
 		if (err)
 			break_cow(mm1, addr1);
-		else
-			ksm_pages_sharing += 2;
 	}
 
 	put_page(kpage);
@@ -816,9 +815,6 @@ static int try_to_merge_with_ksm_page(st
 	err = try_to_merge_one_page(vma, page1, kpage);
 	up_read(&mm1->mmap_sem);
 
-	if (!err)
-		ksm_pages_sharing++;
-
 	return err;
 }
 
@@ -935,13 +931,12 @@ static struct rmap_item *stable_tree_ins
 		}
 	}
 
-	ksm_pages_shared++;
-
 	rmap_item->address |= NODE_FLAG | STABLE_FLAG;
 	rmap_item->next = NULL;
 	rb_link_node(&rmap_item->node, parent, new);
 	rb_insert_color(&rmap_item->node, &root_stable_tree);
 
+	ksm_pages_shared++;
 	return rmap_item;
 }
 
@@ -1026,6 +1021,8 @@ static void stable_tree_append(struct rm
 
 	tree_rmap_item->next = rmap_item;
 	rmap_item->address |= STABLE_FLAG;
+
+	ksm_pages_sharing++;
 }
 
 /*
@@ -1050,10 +1047,9 @@ static void cmp_and_merge_page(struct pa
 	/* We first start with searching the page inside the stable tree */
 	tree_rmap_item = stable_tree_search(page, page2, rmap_item);
 	if (tree_rmap_item) {
-		if (page == page2[0]) {			/* forked */
-			ksm_pages_sharing++;
+		if (page == page2[0])			/* forked */
 			err = 0;
-		} else
+		else
 			err = try_to_merge_with_ksm_page(rmap_item->mm,
 							 rmap_item->address,
 							 page, page2[0]);
@@ -1114,7 +1110,6 @@ static void cmp_and_merge_page(struct pa
 				break_cow(tree_rmap_item->mm,
 						tree_rmap_item->address);
 				break_cow(rmap_item->mm, rmap_item->address);
-				ksm_pages_sharing -= 2;
 			}
 		}
 
@@ -1482,8 +1477,7 @@ KSM_ATTR_RO(pages_shared);
 static ssize_t pages_sharing_show(struct kobject *kobj,
 				  struct kobj_attribute *attr, char *buf)
 {
-	return sprintf(buf, "%lu\n",
-			ksm_pages_sharing - ksm_pages_shared);
+	return sprintf(buf, "%lu\n", ksm_pages_sharing);
 }
 KSM_ATTR_RO(pages_sharing);
 
--
Date: 	Mon, 3 Aug 2009 13:11:53 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 3/12] ksm: pages_unshared and pages_volatile

The pages_shared and pages_sharing counts give a good picture of how
successful KSM is at sharing; but no clue to how much wasted work it's
doing to get there.  Add pages_unshared (count of unique pages waiting
in the unstable tree, hoping to find a mate) and pages_volatile.

pages_volatile is harder to define.  It includes those pages changing
too fast to get into the unstable tree, but also whatever other edge
conditions prevent a page getting into the trees: a high value may
deserve investigation.  Don't try to calculate it from the various
conditions: it's the total of rmap_items less those accounted for.

Also show full_scans: the number of completed scans of everything
registered in the mm list.

The locking for all these counts is simply ksm_thread_mutex.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

--- ksm2/mm/ksm.c	2009-08-02 13:49:43.000000000 +0100
+++ ksm3/mm/ksm.c	2009-08-02 13:49:51.000000000 +0100
@@ -155,6 +155,12 @@ static unsigned long ksm_pages_shared;
 /* The number of page slots additionally sharing those nodes */
 static unsigned long ksm_pages_sharing;
 
+/* The number of nodes in the unstable tree */
+static unsigned long ksm_pages_unshared;
+
+/* The number of rmap_items in use: to calculate pages_volatile */
+static unsigned long ksm_rmap_items;
+
 /* Limit on the number of unswappable pages used */
 static unsigned long ksm_max_kernel_pages;
 
@@ -204,11 +210,17 @@ static void __init ksm_slab_free(void)
 
 static inline struct rmap_item *alloc_rmap_item(void)
 {
-	return kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+	struct rmap_item *rmap_item;
+
+	rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+	if (rmap_item)
+		ksm_rmap_items++;
+	return rmap_item;
 }
 
 static inline void free_rmap_item(struct rmap_item *rmap_item)
 {
+	ksm_rmap_items--;
 	rmap_item->mm = NULL;	/* debug safety */
 	kmem_cache_free(rmap_item_cache, rmap_item);
 }
@@ -419,6 +431,7 @@ static void remove_rmap_item_from_tree(s
 		BUG_ON(age > 2);
 		if (!age)
 			rb_erase(&rmap_item->node, &root_unstable_tree);
+		ksm_pages_unshared--;
 	}
 
 	rmap_item->address &= PAGE_MASK;
@@ -1002,6 +1015,7 @@ static struct rmap_item *unstable_tree_s
 	rb_link_node(&rmap_item->node, parent, new);
 	rb_insert_color(&rmap_item->node, &root_unstable_tree);
 
+	ksm_pages_unshared++;
 	return NULL;
 }
 
@@ -1098,6 +1112,8 @@ static void cmp_and_merge_page(struct pa
 		if (!err) {
 			rb_erase(&tree_rmap_item->node, &root_unstable_tree);
 			tree_rmap_item->address &= ~NODE_FLAG;
+			ksm_pages_unshared--;
+
 			/*
 			 * If we fail to insert the page into the stable tree,
 			 * we will have 2 virtual addresses that are pointing
@@ -1481,6 +1497,37 @@ static ssize_t pages_sharing_show(struct
 }
 KSM_ATTR_RO(pages_sharing);
 
+static ssize_t pages_unshared_show(struct kobject *kobj,
+				   struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_pages_unshared);
+}
+KSM_ATTR_RO(pages_unshared);
+
+static ssize_t pages_volatile_show(struct kobject *kobj,
+				   struct kobj_attribute *attr, char *buf)
+{
+	long ksm_pages_volatile;
+
+	ksm_pages_volatile = ksm_rmap_items - ksm_pages_shared
+				- ksm_pages_sharing - ksm_pages_unshared;
+	/*
+	 * It was not worth any locking to calculate that statistic,
+	 * but it might therefore sometimes be negative: conceal that.
+	 */
+	if (ksm_pages_volatile < 0)
+		ksm_pages_volatile = 0;
+	return sprintf(buf, "%ld\n", ksm_pages_volatile);
+}
+KSM_ATTR_RO(pages_volatile);
+
+static ssize_t full_scans_show(struct kobject *kobj,
+			       struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", ksm_scan.seqnr);
+}
+KSM_ATTR_RO(full_scans);
+
 static struct attribute *ksm_attrs[] = {
 	&sleep_millisecs_attr.attr,
 	&pages_to_scan_attr.attr,
@@ -1488,6 +1535,9 @@ static struct attribute *ksm_attrs[] = {
 	&max_kernel_pages_attr.attr,
 	&pages_shared_attr.attr,
 	&pages_sharing_attr.attr,
+	&pages_unshared_attr.attr,
+	&pages_volatile_attr.attr,
+	&full_scans_attr.attr,
 	NULL,
 };
 
--
Date: 	Mon, 3 Aug 2009 13:12:59 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 4/12] ksm: break cow once unshared

We kept agreeing not to bother about the unswappable shared KSM pages
which later become unshared by others: observation suggests they're not
a significant proportion.  But they are disadvantageous, and it is easier
to break COW to replace them by swappable pages, than offer statistics
to show that they don't matter; then we can stop worrying about them.

Doing this in ksm_do_scan, they don't go through cmp_and_merge_page on
this pass: give them a good chance of getting into the unstable tree
on the next pass, or back into the stable, by computing checksum now.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- ksm3/mm/ksm.c	2009-08-02 13:49:51.000000000 +0100
+++ ksm4/mm/ksm.c	2009-08-02 13:49:59.000000000 +0100
@@ -1275,6 +1275,14 @@ static void ksm_do_scan(unsigned int sca
 			return;
 		if (!PageKsm(page) || !in_stable_tree(rmap_item))
 			cmp_and_merge_page(page, rmap_item);
+		else if (page_mapcount(page) == 1) {
+			/*
+			 * Replace now-unshared ksm page by ordinary page.
+			 */
+			break_cow(rmap_item->mm, rmap_item->address);
+			remove_rmap_item_from_tree(rmap_item);
+			rmap_item->oldchecksum = calc_checksum(page);
+		}
 		put_page(page);
 	}
 }
--
Date: 	Mon, 3 Aug 2009 13:14:03 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 5/12] ksm: keep quiet while list empty

ksm_scan_thread already sleeps in wait_event_interruptible until setting
ksm_run activates it; but if there's nothing on its list to look at, i.e.
nobody has yet said madvise MADV_MERGEABLE, it's a shame to be clocking
up system time and full_scans: ksmd_should_run added to check that too.

And move the mutex_lock out around it: the new counts showed that when
ksm_run is stopped, a little work often got done afterwards, because it
had been read before taking the mutex.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

--- ksm4/mm/ksm.c	2009-08-02 13:49:59.000000000 +0100
+++ ksm5/mm/ksm.c	2009-08-02 13:50:07.000000000 +0100
@@ -1287,21 +1287,27 @@ static void ksm_do_scan(unsigned int sca
 	}
 }
 
+static int ksmd_should_run(void)
+{
+	return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.mm_list);
+}
+
 static int ksm_scan_thread(void *nothing)
 {
 	set_user_nice(current, 5);
 
 	while (!kthread_should_stop()) {
-		if (ksm_run & KSM_RUN_MERGE) {
-			mutex_lock(&ksm_thread_mutex);
+		mutex_lock(&ksm_thread_mutex);
+		if (ksmd_should_run())
 			ksm_do_scan(ksm_thread_pages_to_scan);
-			mutex_unlock(&ksm_thread_mutex);
+		mutex_unlock(&ksm_thread_mutex);
+
+		if (ksmd_should_run()) {
 			schedule_timeout_interruptible(
 				msecs_to_jiffies(ksm_thread_sleep_millisecs));
 		} else {
 			wait_event_interruptible(ksm_thread_wait,
-					(ksm_run & KSM_RUN_MERGE) ||
-					kthread_should_stop());
+				ksmd_should_run() || kthread_should_stop());
 		}
 	}
 	return 0;
@@ -1346,10 +1352,16 @@ int ksm_madvise(struct vm_area_struct *v
 
 int __ksm_enter(struct mm_struct *mm)
 {
-	struct mm_slot *mm_slot = alloc_mm_slot();
+	struct mm_slot *mm_slot;
+	int needs_wakeup;
+
+	mm_slot = alloc_mm_slot();
 	if (!mm_slot)
 		return -ENOMEM;
 
+	/* Check ksm_run too?  Would need tighter locking */
+	needs_wakeup = list_empty(&ksm_mm_head.mm_list);
+
 	spin_lock(&ksm_mmlist_lock);
 	insert_to_mm_slots_hash(mm, mm_slot);
 	/*
@@ -1361,6 +1373,10 @@ int __ksm_enter(struct mm_struct *mm)
 	spin_unlock(&ksm_mmlist_lock);
 
 	set_bit(MMF_VM_MERGEABLE, &mm->flags);
+
+	if (needs_wakeup)
+		wake_up_interruptible(&ksm_thread_wait);
+
 	return 0;
 }
 
--
Date: 	Mon, 3 Aug 2009 13:15:15 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 6/12] ksm: five little cleanups

1. We don't use __break_cow entry point now: merge it into break_cow.
2. remove_all_slot_rmap_items is just a special case of
   remove_trailing_rmap_items: use the latter instead.
3. Extend comment on unmerge_ksm_pages and rmap_items.
4. try_to_merge_two_pages should use try_to_merge_with_ksm_page
   instead of duplicating its code; and so swap them around.
5. Comment on cmp_and_merge_page described last year's: update it.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |  112 ++++++++++++++++++++---------------------------------
 1 file changed, 44 insertions(+), 68 deletions(-)

--- ksm5/mm/ksm.c	2009-08-02 13:50:07.000000000 +0100
+++ ksm6/mm/ksm.c	2009-08-02 13:50:15.000000000 +0100
@@ -315,22 +315,18 @@ static void break_ksm(struct vm_area_str
 	/* Which leaves us looping there if VM_FAULT_OOM: hmmm... */
 }
 
-static void __break_cow(struct mm_struct *mm, unsigned long addr)
+static void break_cow(struct mm_struct *mm, unsigned long addr)
 {
 	struct vm_area_struct *vma;
 
+	down_read(&mm->mmap_sem);
 	vma = find_vma(mm, addr);
 	if (!vma || vma->vm_start > addr)
-		return;
+		goto out;
 	if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
-		return;
+		goto out;
 	break_ksm(vma, addr);
-}
-
-static void break_cow(struct mm_struct *mm, unsigned long addr)
-{
-	down_read(&mm->mmap_sem);
-	__break_cow(mm, addr);
+out:
 	up_read(&mm->mmap_sem);
 }
 
@@ -439,17 +435,6 @@ static void remove_rmap_item_from_tree(s
 	cond_resched();		/* we're called from many long loops */
 }
 
-static void remove_all_slot_rmap_items(struct mm_slot *mm_slot)
-{
-	struct rmap_item *rmap_item, *node;
-
-	list_for_each_entry_safe(rmap_item, node, &mm_slot->rmap_list, link) {
-		remove_rmap_item_from_tree(rmap_item);
-		list_del(&rmap_item->link);
-		free_rmap_item(rmap_item);
-	}
-}
-
 static void remove_trailing_rmap_items(struct mm_slot *mm_slot,
 				       struct list_head *cur)
 {
@@ -471,6 +456,11 @@ static void remove_trailing_rmap_items(s
  * page and upping mmap_sem.  Nor does it fit with the way we skip dup'ing
  * rmap_items from parent to child at fork time (so as not to waste time
  * if exit comes before the next scan reaches it).
+ *
+ * Similarly, although we'd like to remove rmap_items (so updating counts
+ * and freeing memory) when unmerging an area, it's easier to leave that
+ * to the next pass of ksmd - consider, for example, how ksmd might be
+ * in cmp_and_merge_page on one of the rmap_items we would be removing.
  */
 static void unmerge_ksm_pages(struct vm_area_struct *vma,
 			      unsigned long start, unsigned long end)
@@ -495,7 +485,7 @@ static void unmerge_and_remove_all_rmap_
 				continue;
 			unmerge_ksm_pages(vma, vma->vm_start, vma->vm_end);
 		}
-		remove_all_slot_rmap_items(mm_slot);
+		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
 		up_read(&mm->mmap_sem);
 	}
 
@@ -533,7 +523,7 @@ static void remove_mm_from_lists(struct
 	list_del(&mm_slot->mm_list);
 	spin_unlock(&ksm_mmlist_lock);
 
-	remove_all_slot_rmap_items(mm_slot);
+	remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
 	free_mm_slot(mm_slot);
 	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
 }
@@ -740,6 +730,29 @@ out:
 }
 
 /*
+ * try_to_merge_with_ksm_page - like try_to_merge_two_pages,
+ * but no new kernel page is allocated: kpage must already be a ksm page.
+ */
+static int try_to_merge_with_ksm_page(struct mm_struct *mm1,
+				      unsigned long addr1,
+				      struct page *page1,
+				      struct page *kpage)
+{
+	struct vm_area_struct *vma;
+	int err = -EFAULT;
+
+	down_read(&mm1->mmap_sem);
+	vma = find_vma(mm1, addr1);
+	if (!vma || vma->vm_start > addr1)
+		goto out;
+
+	err = try_to_merge_one_page(vma, page1, kpage);
+out:
+	up_read(&mm1->mmap_sem);
+	return err;
+}
+
+/*
  * try_to_merge_two_pages - take two identical pages and prepare them
  * to be merged into one page.
  *
@@ -772,9 +785,8 @@ static int try_to_merge_two_pages(struct
 	down_read(&mm1->mmap_sem);
 	vma = find_vma(mm1, addr1);
 	if (!vma || vma->vm_start > addr1) {
-		put_page(kpage);
 		up_read(&mm1->mmap_sem);
-		return err;
+		goto out;
 	}
 
 	copy_user_highpage(kpage, page1, addr1, vma);
@@ -782,56 +794,20 @@ static int try_to_merge_two_pages(struct
 	up_read(&mm1->mmap_sem);
 
 	if (!err) {
-		down_read(&mm2->mmap_sem);
-		vma = find_vma(mm2, addr2);
-		if (!vma || vma->vm_start > addr2) {
-			put_page(kpage);
-			up_read(&mm2->mmap_sem);
-			break_cow(mm1, addr1);
-			return -EFAULT;
-		}
-
-		err = try_to_merge_one_page(vma, page2, kpage);
-		up_read(&mm2->mmap_sem);
-
+		err = try_to_merge_with_ksm_page(mm2, addr2, page2, kpage);
 		/*
-		 * If the second try_to_merge_one_page failed, we have a
-		 * ksm page with just one pte pointing to it, so break it.
+		 * If that fails, we have a ksm page with only one pte
+		 * pointing to it: so break it.
 		 */
 		if (err)
 			break_cow(mm1, addr1);
 	}
-
+out:
 	put_page(kpage);
 	return err;
 }
 
 /*
- * try_to_merge_with_ksm_page - like try_to_merge_two_pages,
- * but no new kernel page is allocated: kpage must already be a ksm page.
- */
-static int try_to_merge_with_ksm_page(struct mm_struct *mm1,
-				      unsigned long addr1,
-				      struct page *page1,
-				      struct page *kpage)
-{
-	struct vm_area_struct *vma;
-	int err = -EFAULT;
-
-	down_read(&mm1->mmap_sem);
-	vma = find_vma(mm1, addr1);
-	if (!vma || vma->vm_start > addr1) {
-		up_read(&mm1->mmap_sem);
-		return err;
-	}
-
-	err = try_to_merge_one_page(vma, page1, kpage);
-	up_read(&mm1->mmap_sem);
-
-	return err;
-}
-
-/*
  * stable_tree_search - search page inside the stable tree
  * @page: the page that we are searching identical pages to.
  * @page2: pointer into identical page that we are holding inside the stable
@@ -1040,10 +1016,10 @@ static void stable_tree_append(struct rm
 }
 
 /*
- * cmp_and_merge_page - take a page computes its hash value and check if there
- * is similar hash value to different page,
- * in case we find that there is similar hash to different page we call to
- * try_to_merge_two_pages().
+ * cmp_and_merge_page - first see if page can be merged into the stable tree;
+ * if not, compare checksum to previous and if it's the same, see if page can
+ * be inserted into the unstable tree, or merged with a page already there and
+ * both transferred to the stable tree.
  *
  * @page: the page that we are searching identical page to.
  * @rmap_item: the reverse mapping into the virtual address of this page
--
Date: 	Mon, 3 Aug 2009 13:16:15 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 7/12] ksm: fix endless loop on oom

break_ksm has been looping endlessly ignoring VM_FAULT_OOM: that should
only be a problem for ksmd when a memory control group imposes limits
(normally the OOM killer will kill others with an mm until it succeeds);
but in general (especially for MADV_UNMERGEABLE and KSM_RUN_UNMERGE) we
do need to route the error (or kill) back to the caller (or sighandling).

Test signal_pending in unmerge_ksm_pages, which could be a lengthy
procedure if it has to spill into swap: returning -ERESTARTSYS so that
trivial signals will restart but fatals will terminate (is that right?
we do different things in different places in mm, none exactly this).

unmerge_and_remove_all_rmap_items was forgetting to lock when going
down the mm_list: fix that.  Whether it's successful or not, reset
ksm_scan cursor to head; but only if it's successful, reset seqnr
(shown in full_scans) - page counts will have gone down to zero.

This patch leaves a significant OOM deadlock, but it's a good step
on the way, and that deadlock is fixed in a subsequent patch.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |  108 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 85 insertions(+), 23 deletions(-)

--- ksm6/mm/ksm.c	2009-08-02 13:50:15.000000000 +0100
+++ ksm7/mm/ksm.c	2009-08-02 13:50:25.000000000 +0100
@@ -294,10 +294,10 @@ static inline int in_stable_tree(struct
  * Could a ksm page appear anywhere else?  Actually yes, in a VM_PFNMAP
  * mmap of /dev/mem or /dev/kmem, where we would not want to touch it.
  */
-static void break_ksm(struct vm_area_struct *vma, unsigned long addr)
+static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
 {
 	struct page *page;
-	int ret;
+	int ret = 0;
 
 	do {
 		cond_resched();
@@ -310,9 +310,36 @@ static void break_ksm(struct vm_area_str
 		else
 			ret = VM_FAULT_WRITE;
 		put_page(page);
-	} while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS)));
-
-	/* Which leaves us looping there if VM_FAULT_OOM: hmmm... */
+	} while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS | VM_FAULT_OOM)));
+	/*
+	 * We must loop because handle_mm_fault() may back out if there's
+	 * any difficulty e.g. if pte accessed bit gets updated concurrently.
+	 *
+	 * VM_FAULT_WRITE is what we have been hoping for: it indicates that
+	 * COW has been broken, even if the vma does not permit VM_WRITE;
+	 * but note that a concurrent fault might break PageKsm for us.
+	 *
+	 * VM_FAULT_SIGBUS could occur if we race with truncation of the
+	 * backing file, which also invalidates anonymous pages: that's
+	 * okay, that truncation will have unmapped the PageKsm for us.
+	 *
+	 * VM_FAULT_OOM: at the time of writing (late July 2009), setting
+	 * aside mem_cgroup limits, VM_FAULT_OOM would only be set if the
+	 * current task has TIF_MEMDIE set, and will be OOM killed on return
+	 * to user; and ksmd, having no mm, would never be chosen for that.
+	 *
+	 * But if the mm is in a limited mem_cgroup, then the fault may fail
+	 * with VM_FAULT_OOM even if the current task is not TIF_MEMDIE; and
+	 * even ksmd can fail in this way - though it's usually breaking ksm
+	 * just to undo a merge it made a moment before, so unlikely to oom.
+	 *
+	 * That's a pity: we might therefore have more kernel pages allocated
+	 * than we're counting as nodes in the stable tree; but ksm_do_scan
+	 * will retry to break_cow on each pass, so should recover the page
+	 * in due course.  The important thing is to not let VM_MERGEABLE
+	 * be cleared while any such pages might remain in the area.
+	 */
+	return (ret & VM_FAULT_OOM) ? -ENOMEM : 0;
 }
 
 static void break_cow(struct mm_struct *mm, unsigned long addr)
@@ -462,39 +489,61 @@ static void remove_trailing_rmap_items(s
  * to the next pass of ksmd - consider, for example, how ksmd might be
  * in cmp_and_merge_page on one of the rmap_items we would be removing.
  */
-static void unmerge_ksm_pages(struct vm_area_struct *vma,
-			      unsigned long start, unsigned long end)
+static int unmerge_ksm_pages(struct vm_area_struct *vma,
+			     unsigned long start, unsigned long end)
 {
 	unsigned long addr;
+	int err = 0;
 
-	for (addr = start; addr < end; addr += PAGE_SIZE)
-		break_ksm(vma, addr);
+	for (addr = start; addr < end && !err; addr += PAGE_SIZE) {
+		if (signal_pending(current))
+			err = -ERESTARTSYS;
+		else
+			err = break_ksm(vma, addr);
+	}
+	return err;
 }
 
-static void unmerge_and_remove_all_rmap_items(void)
+static int unmerge_and_remove_all_rmap_items(void)
 {
 	struct mm_slot *mm_slot;
 	struct mm_struct *mm;
 	struct vm_area_struct *vma;
+	int err = 0;
+
+	spin_lock(&ksm_mmlist_lock);
+	mm_slot = list_entry(ksm_mm_head.mm_list.next,
+						struct mm_slot, mm_list);
+	spin_unlock(&ksm_mmlist_lock);
 
-	list_for_each_entry(mm_slot, &ksm_mm_head.mm_list, mm_list) {
+	while (mm_slot != &ksm_mm_head) {
 		mm = mm_slot->mm;
 		down_read(&mm->mmap_sem);
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
 			if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 				continue;
-			unmerge_ksm_pages(vma, vma->vm_start, vma->vm_end);
+			err = unmerge_ksm_pages(vma,
+						vma->vm_start, vma->vm_end);
+			if (err) {
+				up_read(&mm->mmap_sem);
+				goto out;
+			}
 		}
 		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
 		up_read(&mm->mmap_sem);
+
+		spin_lock(&ksm_mmlist_lock);
+		mm_slot = list_entry(mm_slot->mm_list.next,
+						struct mm_slot, mm_list);
+		spin_unlock(&ksm_mmlist_lock);
 	}
 
+	ksm_scan.seqnr = 0;
+out:
 	spin_lock(&ksm_mmlist_lock);
-	if (ksm_scan.mm_slot != &ksm_mm_head) {
-		ksm_scan.mm_slot = &ksm_mm_head;
-		ksm_scan.seqnr++;
-	}
+	ksm_scan.mm_slot = &ksm_mm_head;
 	spin_unlock(&ksm_mmlist_lock);
+	return err;
 }
 
 static void remove_mm_from_lists(struct mm_struct *mm)
@@ -1058,6 +1107,8 @@ static void cmp_and_merge_page(struct pa
 	/*
 	 * A ksm page might have got here by fork, but its other
 	 * references have already been removed from the stable tree.
+	 * Or it might be left over from a break_ksm which failed
+	 * when the mem_cgroup had reached its limit: try again now.
 	 */
 	if (PageKsm(page))
 		break_cow(rmap_item->mm, rmap_item->address);
@@ -1293,6 +1344,7 @@ int ksm_madvise(struct vm_area_struct *v
 		unsigned long end, int advice, unsigned long *vm_flags)
 {
 	struct mm_struct *mm = vma->vm_mm;
+	int err;
 
 	switch (advice) {
 	case MADV_MERGEABLE:
@@ -1305,9 +1357,11 @@ int ksm_madvise(struct vm_area_struct *v
 				 VM_MIXEDMAP  | VM_SAO))
 			return 0;		/* just ignore the advice */
 
-		if (!test_bit(MMF_VM_MERGEABLE, &mm->flags))
-			if (__ksm_enter(mm) < 0)
-				return -EAGAIN;
+		if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) {
+			err = __ksm_enter(mm);
+			if (err)
+				return err;
+		}
 
 		*vm_flags |= VM_MERGEABLE;
 		break;
@@ -1316,8 +1370,11 @@ int ksm_madvise(struct vm_area_struct *v
 		if (!(*vm_flags & VM_MERGEABLE))
 			return 0;		/* just ignore the advice */
 
-		if (vma->anon_vma)
-			unmerge_ksm_pages(vma, start, end);
+		if (vma->anon_vma) {
+			err = unmerge_ksm_pages(vma, start, end);
+			if (err)
+				return err;
+		}
 
 		*vm_flags &= ~VM_MERGEABLE;
 		break;
@@ -1448,8 +1505,13 @@ static ssize_t run_store(struct kobject
 	mutex_lock(&ksm_thread_mutex);
 	if (ksm_run != flags) {
 		ksm_run = flags;
-		if (flags & KSM_RUN_UNMERGE)
-			unmerge_and_remove_all_rmap_items();
+		if (flags & KSM_RUN_UNMERGE) {
+			err = unmerge_and_remove_all_rmap_items();
+			if (err) {
+				ksm_run = KSM_RUN_STOP;
+				count = err;
+			}
+		}
 	}
 	mutex_unlock(&ksm_thread_mutex);
 
--
Date: 	Mon, 3 Aug 2009 13:17:15 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 8/12] ksm: distribute remove_mm_from_lists

Do some housekeeping in ksm.c, to help make the next patch easier
to understand: remove the function remove_mm_from_lists, distributing
its code to its callsites scan_get_next_rmap_item and __ksm_exit.

That turns out to be a win in scan_get_next_rmap_item: move its
remove_trailing_rmap_items and cursor advancement up, and it becomes
simpler than before.  __ksm_exit becomes messier, but will change
again; and moving its remove_trailing_rmap_items up lets us strengthen
the unstable tree item's age condition in remove_rmap_item_from_tree.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   97 ++++++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 55 deletions(-)

--- ksm7/mm/ksm.c	2009-08-02 13:50:25.000000000 +0100
+++ ksm8/mm/ksm.c	2009-08-02 13:50:32.000000000 +0100
@@ -444,14 +444,9 @@ static void remove_rmap_item_from_tree(s
 		 * But __ksm_exit has to be careful: do the rb_erase
 		 * if it's interrupting a scan, and this rmap_item was
 		 * inserted by this scan rather than left from before.
-		 *
-		 * Because of the case in which remove_mm_from_lists
-		 * increments seqnr before removing rmaps, unstable_nr
-		 * may even be 2 behind seqnr, but should never be
-		 * further behind.  Yes, I did have trouble with this!
 		 */
 		age = (unsigned char)(ksm_scan.seqnr - rmap_item->address);
-		BUG_ON(age > 2);
+		BUG_ON(age > 1);
 		if (!age)
 			rb_erase(&rmap_item->node, &root_unstable_tree);
 		ksm_pages_unshared--;
@@ -546,37 +541,6 @@ out:
 	return err;
 }
 
-static void remove_mm_from_lists(struct mm_struct *mm)
-{
-	struct mm_slot *mm_slot;
-
-	spin_lock(&ksm_mmlist_lock);
-	mm_slot = get_mm_slot(mm);
-
-	/*
-	 * This mm_slot is always at the scanning cursor when we're
-	 * called from scan_get_next_rmap_item; but it's a special
-	 * case when we're called from __ksm_exit.
-	 */
-	if (ksm_scan.mm_slot == mm_slot) {
-		ksm_scan.mm_slot = list_entry(
-			mm_slot->mm_list.next, struct mm_slot, mm_list);
-		ksm_scan.address = 0;
-		ksm_scan.rmap_item = list_entry(
-			&ksm_scan.mm_slot->rmap_list, struct rmap_item, link);
-		if (ksm_scan.mm_slot == &ksm_mm_head)
-			ksm_scan.seqnr++;
-	}
-
-	hlist_del(&mm_slot->link);
-	list_del(&mm_slot->mm_list);
-	spin_unlock(&ksm_mmlist_lock);
-
-	remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
-	free_mm_slot(mm_slot);
-	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
-}
-
 static u32 calc_checksum(struct page *page)
 {
 	u32 checksum;
@@ -1248,33 +1212,31 @@ next_mm:
 		}
 	}
 
-	if (!ksm_scan.address) {
-		/*
-		 * We've completed a full scan of all vmas, holding mmap_sem
-		 * throughout, and found no VM_MERGEABLE: so do the same as
-		 * __ksm_exit does to remove this mm from all our lists now.
-		 */
-		remove_mm_from_lists(mm);
-		up_read(&mm->mmap_sem);
-		slot = ksm_scan.mm_slot;
-		if (slot != &ksm_mm_head)
-			goto next_mm;
-		return NULL;
-	}
-
 	/*
 	 * Nuke all the rmap_items that are above this current rmap:
 	 * because there were no VM_MERGEABLE vmas with such addresses.
 	 */
 	remove_trailing_rmap_items(slot, ksm_scan.rmap_item->link.next);
-	up_read(&mm->mmap_sem);
 
 	spin_lock(&ksm_mmlist_lock);
-	slot = list_entry(slot->mm_list.next, struct mm_slot, mm_list);
-	ksm_scan.mm_slot = slot;
+	ksm_scan.mm_slot = list_entry(slot->mm_list.next,
+						struct mm_slot, mm_list);
+	if (ksm_scan.address == 0) {
+		/*
+		 * We've completed a full scan of all vmas, holding mmap_sem
+		 * throughout, and found no VM_MERGEABLE: so do the same as
+		 * __ksm_exit does to remove this mm from all our lists now.
+		 */
+		hlist_del(&slot->link);
+		list_del(&slot->mm_list);
+		free_mm_slot(slot);
+		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+	}
 	spin_unlock(&ksm_mmlist_lock);
+	up_read(&mm->mmap_sem);
 
 	/* Repeat until we've completed scanning the whole list */
+	slot = ksm_scan.mm_slot;
 	if (slot != &ksm_mm_head)
 		goto next_mm;
 
@@ -1415,13 +1377,38 @@ int __ksm_enter(struct mm_struct *mm)
 
 void __ksm_exit(struct mm_struct *mm)
 {
+	struct mm_slot *mm_slot;
+
 	/*
 	 * This process is exiting: doesn't hold and doesn't need mmap_sem;
 	 * but we do need to exclude ksmd and other exiters while we modify
 	 * the various lists and trees.
 	 */
 	mutex_lock(&ksm_thread_mutex);
-	remove_mm_from_lists(mm);
+	spin_lock(&ksm_mmlist_lock);
+	mm_slot = get_mm_slot(mm);
+	if (!list_empty(&mm_slot->rmap_list)) {
+		spin_unlock(&ksm_mmlist_lock);
+		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
+		spin_lock(&ksm_mmlist_lock);
+	}
+
+	if (ksm_scan.mm_slot == mm_slot) {
+		ksm_scan.mm_slot = list_entry(
+			mm_slot->mm_list.next, struct mm_slot, mm_list);
+		ksm_scan.address = 0;
+		ksm_scan.rmap_item = list_entry(
+			&ksm_scan.mm_slot->rmap_list, struct rmap_item, link);
+		if (ksm_scan.mm_slot == &ksm_mm_head)
+			ksm_scan.seqnr++;
+	}
+
+	hlist_del(&mm_slot->link);
+	list_del(&mm_slot->mm_list);
+	spin_unlock(&ksm_mmlist_lock);
+
+	free_mm_slot(mm_slot);
+	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
 	mutex_unlock(&ksm_thread_mutex);
 }
 
--
Date: 	Mon, 3 Aug 2009 13:18:16 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 9/12] ksm: fix oom deadlock

There's a now-obvious deadlock in KSM's out-of-memory handling:
imagine ksmd or KSM_RUN_UNMERGE handling, holding ksm_thread_mutex,
trying to allocate a page to break KSM in an mm which becomes the
OOM victim (quite likely in the unmerge case): it's killed and goes
to exit, and hangs there waiting to acquire ksm_thread_mutex.

Clearly we must not require ksm_thread_mutex in __ksm_exit, simple
though that made everything else: perhaps use mmap_sem somehow?
And part of the answer lies in the comments on unmerge_ksm_pages:
__ksm_exit should also leave all the rmap_item removal to ksmd.

But there's a fundamental problem, that KSM relies upon mmap_sem to
guarantee the consistency of the mm it's dealing with, yet exit_mmap
tears down an mm without taking mmap_sem.  And bumping mm_users won't
help at all, that just ensures that the pages the OOM killer assumes
are on their way to being freed will not be freed.

The best answer seems to be, to move the ksm_exit callout from just
before exit_mmap, to the middle of exit_mmap: after the mm's pages
have been freed (if the mmu_gather is flushed), but before its page
tables and vma structures have been freed; and down_write,up_write
mmap_sem there to serialize with KSM's own reliance on mmap_sem.

But KSM then needs to be careful, whenever it downs mmap_sem, to
check that the mm is not already exiting: there's a danger of using
find_vma on a layout that's being torn apart, or writing into page
tables which have been freed for reuse; and even do_anonymous_page
and __do_fault need to check they're not being called by break_ksm
to reinstate a pte after zap_pte_range has zapped that page table.

Though it might be clearer to add an exiting flag, set while holding
mmap_sem in __ksm_exit, that wouldn't cover the issue of reinstating
a zapped pte.  All we need is to check whether mm_users is 0 - but
must remember that ksmd may detect that before __ksm_exit is reached.
So, ksm_test_exit(mm) added to comment such checks on mm->mm_users.

__ksm_exit now has to leave clearing up the rmap_items to ksmd,
that needs ksm_thread_mutex; but shift the exiting mm just after the
ksm_scan cursor so that it will soon be dealt with.  __ksm_enter raise
mm_count to hold the mm_struct, ksmd's exit processing (exactly like
its processing when it finds all VM_MERGEABLEs unmapped) mmdrop it,
similar procedure for KSM_RUN_UNMERGE (which has stopped ksmd).

But also give __ksm_exit a fast path: when there's no complication
(no rmap_items attached to mm and it's not at the ksm_scan cursor),
it can safely do all the exiting work itself.  This is not just an
optimization: when ksmd is not running, the raised mm_count would
otherwise leak mm_structs.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 include/linux/ksm.h |   31 +++++++--
 kernel/fork.c       |    1 
 mm/ksm.c            |  144 ++++++++++++++++++++++++++++--------------
 mm/memory.c         |    5 -
 mm/mmap.c           |    9 ++
 5 files changed, 137 insertions(+), 53 deletions(-)

--- ksm8/include/linux/ksm.h	2009-08-01 05:02:09.000000000 +0100
+++ ksm9/include/linux/ksm.h	2009-08-02 13:50:41.000000000 +0100
@@ -12,11 +12,14 @@
 #include <linux/sched.h>
 #include <linux/vmstat.h>
 
+struct mmu_gather;
+
 #ifdef CONFIG_KSM
 int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
 		unsigned long end, int advice, unsigned long *vm_flags);
 int __ksm_enter(struct mm_struct *mm);
-void __ksm_exit(struct mm_struct *mm);
+void __ksm_exit(struct mm_struct *mm,
+		struct mmu_gather **tlbp, unsigned long end);
 
 static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
 {
@@ -25,10 +28,24 @@ static inline int ksm_fork(struct mm_str
 	return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm)
+/*
+ * For KSM to handle OOM without deadlock when it's breaking COW in a
+ * likely victim of the OOM killer, exit_mmap() has to serialize with
+ * ksm_exit() after freeing mm's pages but before freeing its page tables.
+ * That leaves a window in which KSM might refault pages which have just
+ * been finally unmapped: guard against that with ksm_test_exit(), and
+ * use it after getting mmap_sem in ksm.c, to check if mm is exiting.
+ */
+static inline bool ksm_test_exit(struct mm_struct *mm)
+{
+	return atomic_read(&mm->mm_users) == 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm,
+			    struct mmu_gather **tlbp, unsigned long end)
 {
 	if (test_bit(MMF_VM_MERGEABLE, &mm->flags))
-		__ksm_exit(mm);
+		__ksm_exit(mm, tlbp, end);
 }
 
 /*
@@ -64,7 +81,13 @@ static inline int ksm_fork(struct mm_str
 	return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm)
+static inline bool ksm_test_exit(struct mm_struct *mm)
+{
+	return 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm,
+			    struct mmu_gather **tlbp, unsigned long end)
 {
 }
 
--- ksm8/kernel/fork.c	2009-08-01 05:02:09.000000000 +0100
+++ ksm9/kernel/fork.c	2009-08-02 13:50:41.000000000 +0100
@@ -492,7 +492,6 @@ void mmput(struct mm_struct *mm)
 
 	if (atomic_dec_and_test(&mm->mm_users)) {
 		exit_aio(mm);
-		ksm_exit(mm);
 		exit_mmap(mm);
 		set_mm_exe_file(mm, NULL);
 		if (!list_empty(&mm->mmlist)) {
--- ksm8/mm/ksm.c	2009-08-02 13:50:32.000000000 +0100
+++ ksm9/mm/ksm.c	2009-08-02 13:50:41.000000000 +0100
@@ -32,6 +32,7 @@
 #include <linux/mmu_notifier.h>
 #include <linux/ksm.h>
 
+#include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
 /*
@@ -347,6 +348,8 @@ static void break_cow(struct mm_struct *
 	struct vm_area_struct *vma;
 
 	down_read(&mm->mmap_sem);
+	if (ksm_test_exit(mm))
+		goto out;
 	vma = find_vma(mm, addr);
 	if (!vma || vma->vm_start > addr)
 		goto out;
@@ -365,6 +368,8 @@ static struct page *get_mergeable_page(s
 	struct page *page;
 
 	down_read(&mm->mmap_sem);
+	if (ksm_test_exit(mm))
+		goto out;
 	vma = find_vma(mm, addr);
 	if (!vma || vma->vm_start > addr)
 		goto out;
@@ -439,11 +444,11 @@ static void remove_rmap_item_from_tree(s
 	} else if (rmap_item->address & NODE_FLAG) {
 		unsigned char age;
 		/*
-		 * ksm_thread can and must skip the rb_erase, because
+		 * Usually ksmd can and must skip the rb_erase, because
 		 * root_unstable_tree was already reset to RB_ROOT.
-		 * But __ksm_exit has to be careful: do the rb_erase
-		 * if it's interrupting a scan, and this rmap_item was
-		 * inserted by this scan rather than left from before.
+		 * But be careful when an mm is exiting: do the rb_erase
+		 * if this rmap_item was inserted by this scan, rather
+		 * than left over from before.
 		 */
 		age = (unsigned char)(ksm_scan.seqnr - rmap_item->address);
 		BUG_ON(age > 1);
@@ -491,6 +496,8 @@ static int unmerge_ksm_pages(struct vm_a
 	int err = 0;
 
 	for (addr = start; addr < end && !err; addr += PAGE_SIZE) {
+		if (ksm_test_exit(vma->vm_mm))
+			break;
 		if (signal_pending(current))
 			err = -ERESTARTSYS;
 		else
@@ -507,34 +514,50 @@ static int unmerge_and_remove_all_rmap_i
 	int err = 0;
 
 	spin_lock(&ksm_mmlist_lock);
-	mm_slot = list_entry(ksm_mm_head.mm_list.next,
+	ksm_scan.mm_slot = list_entry(ksm_mm_head.mm_list.next,
 						struct mm_slot, mm_list);
 	spin_unlock(&ksm_mmlist_lock);
 
-	while (mm_slot != &ksm_mm_head) {
+	for (mm_slot = ksm_scan.mm_slot;
+			mm_slot != &ksm_mm_head; mm_slot = ksm_scan.mm_slot) {
 		mm = mm_slot->mm;
 		down_read(&mm->mmap_sem);
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
+			if (ksm_test_exit(mm))
+				break;
 			if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 				continue;
 			err = unmerge_ksm_pages(vma,
 						vma->vm_start, vma->vm_end);
-			if (err) {
-				up_read(&mm->mmap_sem);
-				goto out;
-			}
+			if (err)
+				goto error;
 		}
+
 		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
-		up_read(&mm->mmap_sem);
 
 		spin_lock(&ksm_mmlist_lock);
-		mm_slot = list_entry(mm_slot->mm_list.next,
+		ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next,
 						struct mm_slot, mm_list);
-		spin_unlock(&ksm_mmlist_lock);
+		if (ksm_test_exit(mm)) {
+			hlist_del(&mm_slot->link);
+			list_del(&mm_slot->mm_list);
+			spin_unlock(&ksm_mmlist_lock);
+
+			free_mm_slot(mm_slot);
+			clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+			up_read(&mm->mmap_sem);
+			mmdrop(mm);
+		} else {
+			spin_unlock(&ksm_mmlist_lock);
+			up_read(&mm->mmap_sem);
+		}
 	}
 
 	ksm_scan.seqnr = 0;
-out:
+	return 0;
+
+error:
+	up_read(&mm->mmap_sem);
 	spin_lock(&ksm_mmlist_lock);
 	ksm_scan.mm_slot = &ksm_mm_head;
 	spin_unlock(&ksm_mmlist_lock);
@@ -755,6 +778,9 @@ static int try_to_merge_with_ksm_page(st
 	int err = -EFAULT;
 
 	down_read(&mm1->mmap_sem);
+	if (ksm_test_exit(mm1))
+		goto out;
+
 	vma = find_vma(mm1, addr1);
 	if (!vma || vma->vm_start > addr1)
 		goto out;
@@ -796,6 +822,10 @@ static int try_to_merge_two_pages(struct
 		return err;
 
 	down_read(&mm1->mmap_sem);
+	if (ksm_test_exit(mm1)) {
+		up_read(&mm1->mmap_sem);
+		goto out;
+	}
 	vma = find_vma(mm1, addr1);
 	if (!vma || vma->vm_start > addr1) {
 		up_read(&mm1->mmap_sem);
@@ -1181,7 +1211,12 @@ next_mm:
 
 	mm = slot->mm;
 	down_read(&mm->mmap_sem);
-	for (vma = find_vma(mm, ksm_scan.address); vma; vma = vma->vm_next) {
+	if (ksm_test_exit(mm))
+		vma = NULL;
+	else
+		vma = find_vma(mm, ksm_scan.address);
+
+	for (; vma; vma = vma->vm_next) {
 		if (!(vma->vm_flags & VM_MERGEABLE))
 			continue;
 		if (ksm_scan.address < vma->vm_start)
@@ -1190,6 +1225,8 @@ next_mm:
 			ksm_scan.address = vma->vm_end;
 
 		while (ksm_scan.address < vma->vm_end) {
+			if (ksm_test_exit(mm))
+				break;
 			*page = follow_page(vma, ksm_scan.address, FOLL_GET);
 			if (*page && PageAnon(*page)) {
 				flush_anon_page(vma, *page, ksm_scan.address);
@@ -1212,6 +1249,11 @@ next_mm:
 		}
 	}
 
+	if (ksm_test_exit(mm)) {
+		ksm_scan.address = 0;
+		ksm_scan.rmap_item = list_entry(&slot->rmap_list,
+						struct rmap_item, link);
+	}
 	/*
 	 * Nuke all the rmap_items that are above this current rmap:
 	 * because there were no VM_MERGEABLE vmas with such addresses.
@@ -1226,24 +1268,29 @@ next_mm:
 		 * We've completed a full scan of all vmas, holding mmap_sem
 		 * throughout, and found no VM_MERGEABLE: so do the same as
 		 * __ksm_exit does to remove this mm from all our lists now.
+		 * This applies either when cleaning up after __ksm_exit
+		 * (but beware: we can reach here even before __ksm_exit),
+		 * or when all VM_MERGEABLE areas have been unmapped (and
+		 * mmap_sem then protects against race with MADV_MERGEABLE).
 		 */
 		hlist_del(&slot->link);
 		list_del(&slot->mm_list);
+		spin_unlock(&ksm_mmlist_lock);
+
 		free_mm_slot(slot);
 		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+		up_read(&mm->mmap_sem);
+		mmdrop(mm);
+	} else {
+		spin_unlock(&ksm_mmlist_lock);
+		up_read(&mm->mmap_sem);
 	}
-	spin_unlock(&ksm_mmlist_lock);
-	up_read(&mm->mmap_sem);
 
 	/* Repeat until we've completed scanning the whole list */
 	slot = ksm_scan.mm_slot;
 	if (slot != &ksm_mm_head)
 		goto next_mm;
 
-	/*
-	 * Bump seqnr here rather than at top, so that __ksm_exit
-	 * can skip rb_erase on unstable tree until we run again.
-	 */
 	ksm_scan.seqnr++;
 	return NULL;
 }
@@ -1368,6 +1415,7 @@ int __ksm_enter(struct mm_struct *mm)
 	spin_unlock(&ksm_mmlist_lock);
 
 	set_bit(MMF_VM_MERGEABLE, &mm->flags);
+	atomic_inc(&mm->mm_count);
 
 	if (needs_wakeup)
 		wake_up_interruptible(&ksm_thread_wait);
@@ -1375,41 +1423,45 @@ int __ksm_enter(struct mm_struct *mm)
 	return 0;
 }
 
-void __ksm_exit(struct mm_struct *mm)
+void __ksm_exit(struct mm_struct *mm,
+		struct mmu_gather **tlbp, unsigned long end)
 {
 	struct mm_slot *mm_slot;
+	int easy_to_free = 0;
 
 	/*
-	 * This process is exiting: doesn't hold and doesn't need mmap_sem;
-	 * but we do need to exclude ksmd and other exiters while we modify
-	 * the various lists and trees.
+	 * This process is exiting: if it's straightforward (as is the
+	 * case when ksmd was never running), free mm_slot immediately.
+	 * But if it's at the cursor or has rmap_items linked to it, use
+	 * mmap_sem to synchronize with any break_cows before pagetables
+	 * are freed, and leave the mm_slot on the list for ksmd to free.
+	 * Beware: ksm may already have noticed it exiting and freed the slot.
 	 */
-	mutex_lock(&ksm_thread_mutex);
+
 	spin_lock(&ksm_mmlist_lock);
 	mm_slot = get_mm_slot(mm);
-	if (!list_empty(&mm_slot->rmap_list)) {
-		spin_unlock(&ksm_mmlist_lock);
-		remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
-		spin_lock(&ksm_mmlist_lock);
-	}
-
-	if (ksm_scan.mm_slot == mm_slot) {
-		ksm_scan.mm_slot = list_entry(
-			mm_slot->mm_list.next, struct mm_slot, mm_list);
-		ksm_scan.address = 0;
-		ksm_scan.rmap_item = list_entry(
-			&ksm_scan.mm_slot->rmap_list, struct rmap_item, link);
-		if (ksm_scan.mm_slot == &ksm_mm_head)
-			ksm_scan.seqnr++;
+	if (mm_slot && ksm_scan.mm_slot != mm_slot) {
+		if (list_empty(&mm_slot->rmap_list)) {
+			hlist_del(&mm_slot->link);
+			list_del(&mm_slot->mm_list);
+			easy_to_free = 1;
+		} else {
+			list_move(&mm_slot->mm_list,
+				  &ksm_scan.mm_slot->mm_list);
+		}
 	}
-
-	hlist_del(&mm_slot->link);
-	list_del(&mm_slot->mm_list);
 	spin_unlock(&ksm_mmlist_lock);
 
-	free_mm_slot(mm_slot);
-	clear_bit(MMF_VM_MERGEABLE, &mm->flags);
-	mutex_unlock(&ksm_thread_mutex);
+	if (easy_to_free) {
+		free_mm_slot(mm_slot);
+		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
+		mmdrop(mm);
+	} else if (mm_slot) {
+		tlb_finish_mmu(*tlbp, 0, end);
+		down_write(&mm->mmap_sem);
+		up_write(&mm->mmap_sem);
+		*tlbp = tlb_gather_mmu(mm, 1);
+	}
 }
 
 #define KSM_ATTR_RO(_name) \
--- ksm8/mm/memory.c	2009-08-01 05:02:09.000000000 +0100
+++ ksm9/mm/memory.c	2009-08-02 13:50:41.000000000 +0100
@@ -2647,8 +2647,9 @@ static int do_anonymous_page(struct mm_s
 	entry = maybe_mkwrite(pte_mkdirty(entry), vma);
 
 	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
-	if (!pte_none(*page_table))
+	if (!pte_none(*page_table) || ksm_test_exit(mm))
 		goto release;
+
 	inc_mm_counter(mm, anon_rss);
 	page_add_new_anon_rmap(page, vma, address);
 	set_pte_at(mm, address, page_table, entry);
@@ -2790,7 +2791,7 @@ static int __do_fault(struct mm_struct *
 	 * handle that later.
 	 */
 	/* Only go through if we didn't race with anybody else... */
-	if (likely(pte_same(*page_table, orig_pte))) {
+	if (likely(pte_same(*page_table, orig_pte) && !ksm_test_exit(mm))) {
 		flush_icache_page(vma, page);
 		entry = mk_pte(page, vma->vm_page_prot);
 		if (flags & FAULT_FLAG_WRITE)
--- ksm8/mm/mmap.c	2009-06-25 05:18:10.000000000 +0100
+++ ksm9/mm/mmap.c	2009-08-02 13:50:41.000000000 +0100
@@ -27,6 +27,7 @@
 #include <linux/mount.h>
 #include <linux/mempolicy.h>
 #include <linux/rmap.h>
+#include <linux/ksm.h>
 #include <linux/mmu_notifier.h>
 #include <linux/perf_counter.h>
 
@@ -2114,6 +2115,14 @@ void exit_mmap(struct mm_struct *mm)
 	/* Use -1 here to ensure all VMAs in the mm are unmapped */
 	end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL);
 	vm_unacct_memory(nr_accounted);
+
+	/*
+	 * For KSM to handle OOM without deadlock when it's breaking COW in a
+	 * likely victim of the OOM killer, we must serialize with ksm_exit()
+	 * after freeing mm's pages but before freeing its page tables.
+	 */
+	ksm_exit(mm, &tlb, end);
+
 	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
 	tlb_finish_mmu(tlb, 0, end);
 
--
Date: 	Mon, 3 Aug 2009 13:19:13 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 10/12] ksm: sysfs and defaults

At present KSM is just a waste of space if you don't have CONFIG_SYSFS=y
to provide the /sys/kernel/mm/ksm files to tune and activate it.

Make KSM depend on SYSFS?  Could do, but it might be better to provide
some defaults so that KSM works out-of-the-box, ready for testers to
madvise MADV_MERGEABLE, even without SYSFS.

Though anyone serious is likely to want to retune the numbers to their
taste once they have experience; and whether these settings ever reach
2.6.32 can be discussed along the way.  

Save 1kB from tiny kernels by #ifdef'ing the SYSFS side of it.

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---

 mm/ksm.c |   26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

--- ksm9/mm/ksm.c	2009-08-02 13:50:41.000000000 +0100
+++ ksm10/mm/ksm.c	2009-08-02 13:50:48.000000000 +0100
@@ -163,18 +163,18 @@ static unsigned long ksm_pages_unshared;
 static unsigned long ksm_rmap_items;
 
 /* Limit on the number of unswappable pages used */
-static unsigned long ksm_max_kernel_pages;
+static unsigned long ksm_max_kernel_pages = 2000;
 
 /* Number of pages ksmd should scan in one batch */
-static unsigned int ksm_thread_pages_to_scan;
+static unsigned int ksm_thread_pages_to_scan = 200;
 
 /* Milliseconds ksmd should sleep between batches */
-static unsigned int ksm_thread_sleep_millisecs;
+static unsigned int ksm_thread_sleep_millisecs = 20;
 
 #define KSM_RUN_STOP	0
 #define KSM_RUN_MERGE	1
 #define KSM_RUN_UNMERGE	2
-static unsigned int ksm_run;
+static unsigned int ksm_run = KSM_RUN_MERGE;
 
 static DECLARE_WAIT_QUEUE_HEAD(ksm_thread_wait);
 static DEFINE_MUTEX(ksm_thread_mutex);
@@ -506,6 +506,10 @@ static int unmerge_ksm_pages(struct vm_a
 	return err;
 }
 
+#ifdef CONFIG_SYSFS
+/*
+ * Only called through the sysfs control interface:
+ */
 static int unmerge_and_remove_all_rmap_items(void)
 {
 	struct mm_slot *mm_slot;
@@ -563,6 +567,7 @@ error:
 	spin_unlock(&ksm_mmlist_lock);
 	return err;
 }
+#endif /* CONFIG_SYSFS */
 
 static u32 calc_checksum(struct page *page)
 {
@@ -1464,6 +1469,11 @@ void __ksm_exit(struct mm_struct *mm,
 	}
 }
 
+#ifdef CONFIG_SYSFS
+/*
+ * This all compiles without CONFIG_SYSFS, but is a waste of space.
+ */
+
 #define KSM_ATTR_RO(_name) \
 	static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
 #define KSM_ATTR(_name) \
@@ -1646,6 +1656,7 @@ static struct attribute_group ksm_attr_g
 	.attrs = ksm_attrs,
 	.name = "ksm",
 };
+#endif /* CONFIG_SYSFS */
 
 static int __init ksm_init(void)
 {
@@ -1667,16 +1678,17 @@ static int __init ksm_init(void)
 		goto out_free2;
 	}
 
+#ifdef CONFIG_SYSFS
 	err = sysfs_create_group(mm_kobj, &ksm_attr_group);
 	if (err) {
 		printk(KERN_ERR "ksm: register sysfs failed\n");
-		goto out_free3;
+		kthread_stop(ksm_thread);
+		goto out_free2;
 	}
+#endif /* CONFIG_SYSFS */
 
 	return 0;
 
-out_free3:
-	kthread_stop(ksm_thread);
 out_free2:
 	mm_slots_hash_free();
 out_free1:
--
Date: 	Mon, 3 Aug 2009 13:21:34 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 11/12] ksm: add some documentation

Add Documentation/vm/ksm.txt: how to use the Kernel Samepage Merging feature

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Cc: Michael Kerrisk <mtk.manpages at googlemail.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
---

 Documentation/vm/00-INDEX |    2 
 Documentation/vm/ksm.txt  |   89 ++++++++++++++++++++++++++++++++++++
 mm/Kconfig                |    1 
 3 files changed, 92 insertions(+)

--- ksm10/Documentation/vm/00-INDEX	2009-06-10 04:05:27.000000000 +0100
+++ ksm11/Documentation/vm/00-INDEX	2009-08-02 13:50:57.000000000 +0100
@@ -6,6 +6,8 @@ balance
 	- various information on memory balancing.
 hugetlbpage.txt
 	- a brief summary of hugetlbpage support in the Linux kernel.
+ksm.txt
+	- how to use the Kernel Samepage Merging feature.
 locking
 	- info on how locking and synchronization is done in the Linux vm code.
 numa
--- ksm10/Documentation/vm/ksm.txt	1970-01-01 01:00:00.000000000 +0100
+++ ksm11/Documentation/vm/ksm.txt	2009-08-02 13:50:57.000000000 +0100
@@ -0,0 +1,89 @@
+How to use the Kernel Samepage Merging feature
+----------------------------------------------
+
+KSM is a memory-saving de-duplication feature, enabled by CONFIG_KSM=y,
+added to the Linux kernel in 2.6.32.  See mm/ksm.c for its implementation,
+and http://lwn.net/Articles/306704/ and http://lwn.net/Articles/330589/
+
+The KSM daemon ksmd periodically scans those areas of user memory which
+have been registered with it, looking for pages of identical content which
+can be replaced by a single write-protected page (which is automatically
+copied if a process later wants to update its content).
+
+KSM was originally developed for use with KVM (where it was known as
+Kernel Shared Memory), to fit more virtual machines into physical memory,
+by sharing the data common between them.  But it can be useful to any
+application which generates many instances of the same data.
+
+KSM only merges anonymous (private) pages, never pagecache (file) pages.
+KSM's merged pages are at present locked into kernel memory for as long
+as they are shared: so cannot be swapped out like the user pages they
+replace (but swapping KSM pages should follow soon in a later release).
+
+KSM only operates on those areas of address space which an application
+has advised to be likely candidates for merging, by using the madvise(2)
+system call: int madvise(addr, length, MADV_MERGEABLE).
+
+The app may call int madvise(addr, length, MADV_UNMERGEABLE) to cancel
+that advice and restore unshared pages: whereupon KSM unmerges whatever
+it merged in that range.  Note: this unmerging call may suddenly require
+more memory than is available - possibly failing with EAGAIN, but more
+probably arousing the Out-Of-Memory killer.
+
+If KSM is not configured into the running kernel, madvise MADV_MERGEABLE
+and MADV_UNMERGEABLE simply fail with EINVAL.  If the running kernel was
+built with CONFIG_KSM=y, those calls will normally succeed: even if the
+the KSM daemon is not currently running, MADV_MERGEABLE still registers
+the range for whenever the KSM daemon is started; even if the range
+cannot contain any pages which KSM could actually merge; even if
+MADV_UNMERGEABLE is applied to a range which was never MADV_MERGEABLE.
+
+Like other madvise calls, they are intended for use on mapped areas of
+the user address space: they will report ENOMEM if the specified range
+includes unmapped gaps (though working on the intervening mapped areas),
+and might fail with EAGAIN if not enough memory for internal structures.
+
+Applications should be considerate in their use of MADV_MERGEABLE,
+restricting its use to areas likely to benefit.  KSM's scans may use
+a lot of processing power, and its kernel-resident pages are a limited
+resource.  Some installations will disable KSM for these reasons.
+
+The KSM daemon is controlled by sysfs files in /sys/kernel/mm/ksm/,
+readable by all but writable only by root:
+
+max_kernel_pages - set to maximum number of kernel pages that KSM may use
+                   e.g. "echo 2000 > /sys/kernel/mm/ksm/max_kernel_pages"
+                   Value 0 imposes no limit on the kernel pages KSM may use;
+                   but note that any process using MADV_MERGEABLE can cause
+                   KSM to allocate these pages, unswappable until it exits.
+                   Default: 2000 (chosen for demonstration purposes)
+
+pages_to_scan    - how many present pages to scan before ksmd goes to sleep
+                   e.g. "echo 200 > /sys/kernel/mm/ksm/pages_to_scan"
+                   Default: 200 (chosen for demonstration purposes)
+
+sleep_millisecs  - how many milliseconds ksmd should sleep before next scan
+                   e.g. "echo 20 > /sys/kernel/mm/ksm/sleep_millisecs"
+                   Default: 20 (chosen for demonstration purposes)
+
+run              - set 0 to stop ksmd from running but keep merged pages,
+                   set 1 to run ksmd e.g. "echo 1 > /sys/kernel/mm/ksm/run",
+                   set 2 to stop ksmd and unmerge all pages currently merged,
+                         but leave mergeable areas registered for next run
+                   Default: 1 (for immediate use by apps which register)
+
+The effectiveness of KSM and MADV_MERGEABLE is shown in /sys/kernel/mm/ksm/:
+
+pages_shared     - how many shared unswappable kernel pages KSM is using
+pages_sharing    - how many more sites are sharing them i.e. how much saved
+pages_unshared   - how many pages unique but repeatedly checked for merging
+pages_volatile   - how many pages changing too fast to be placed in a tree
+full_scans       - how many times all mergeable areas have been scanned
+
+A high ratio of pages_sharing to pages_shared indicates good sharing, but
+a high ratio of pages_unshared to pages_sharing indicates wasted effort.
+pages_volatile embraces several different kinds of activity, but a high
+proportion there would also indicate poor use of madvise MADV_MERGEABLE.
+
+Izik Eidus,
+Hugh Dickins, 30 July 2009
--- ksm10/mm/Kconfig	2009-08-01 05:02:09.000000000 +0100
+++ ksm11/mm/Kconfig	2009-08-02 13:50:57.000000000 +0100
@@ -224,6 +224,7 @@ config KSM
 	  the many instances by a single resident page with that content, so
 	  saving memory until one or another app needs to modify the content.
 	  Recommended for use with KVM, or with other duplicative applications.
+	  See Documentation/vm/ksm.txt for more information.
 
 config DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"
--
Date: 	Mon, 3 Aug 2009 13:22:53 +0100 (BST)
From: Hugh Dickins <hugh.dickins at tiscali.co.uk>
Subject: [PATCH 12/12] ksm: remove VM_MERGEABLE_FLAGS

KSM originally stood for Kernel Shared Memory: but the kernel has long
supported shared memory, and VM_SHARED and VM_MAYSHARE vmas, and KSM is
something else.  So we switched to saying "merge" instead of "share".

But Chris Wright points out that this is confusing where mmap.c merges
adjacent vmas: most especially in the name VM_MERGEABLE_FLAGS, used by
is_mergeable_vma() to let vmas be merged despite flags being different.

Call it VMA_MERGE_DESPITE_FLAGS?  Perhaps, but at present it consists
only of VM_CAN_NONLINEAR: so for now it's clearer on all sides to use
that directly, with a comment on it in is_mergeable_vma().

Signed-off-by: Hugh Dickins <hugh.dickins at tiscali.co.uk>
---
This patch got lost along the way last time: no big deal but try again.

 mm/mmap.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- ksm11/mm/mmap.c	2009-08-02 13:50:41.000000000 +0100
+++ ksm12/mm/mmap.c	2009-08-02 13:51:04.000000000 +0100
@@ -660,9 +660,6 @@ again:			remove_next = 1 + (end > next->
 	validate_mm(mm);
 }
 
-/* Flags that can be inherited from an existing mapping when merging */
-#define VM_MERGEABLE_FLAGS (VM_CAN_NONLINEAR)
-
 /*
  * If the vma has a ->close operation then the driver probably needs to release
  * per-vma resources, so we don't attempt to merge those.
@@ -670,7 +667,8 @@ again:			remove_next = 1 + (end > next->
 static inline int is_mergeable_vma(struct vm_area_struct *vma,
 			struct file *file, unsigned long vm_flags)
 {
-	if ((vma->vm_flags ^ vm_flags) & ~VM_MERGEABLE_FLAGS)
+	/* VM_CAN_NONLINEAR may get set later by f_op->mmap() */
+	if ((vma->vm_flags ^ vm_flags) & ~VM_CAN_NONLINEAR)
 		return 0;
 	if (vma->vm_file != file)
 		return 0;



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.32
retrieving revision 1.238.6.33
diff -u -p -r1.238.6.32 -r1.238.6.33
--- config-generic	5 Aug 2009 23:00:08 -0000	1.238.6.32
+++ config-generic	8 Aug 2009 18:06:03 -0000	1.238.6.33
@@ -2230,6 +2230,7 @@ CONFIG_AGP_SIS=y
 CONFIG_AGP_SWORKS=y
 CONFIG_AGP_VIA=y
 CONFIG_AGP_EFFICEON=y
+CONFIG_VGA_ARB=y
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.15
retrieving revision 1.68.6.16
diff -u -p -r1.68.6.15 -r1.68.6.16
--- config-x86-generic	5 Aug 2009 23:00:09 -0000	1.68.6.15
+++ config-x86-generic	8 Aug 2009 18:06:03 -0000	1.68.6.16
@@ -75,6 +75,7 @@ CONFIG_X86_CPU_DEBUG=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set
+
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    3 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  139 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  340 ++++----
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  981 +++++++++++++++++++++++-
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 19 files changed, 3366 insertions(+), 498 deletions(-)

Index: drm-r600-kms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-r600-kms.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
--- drm-r600-kms.patch	5 Aug 2009 23:00:15 -0000	1.1.2.2
+++ drm-r600-kms.patch	8 Aug 2009 18:06:03 -0000	1.1.2.3
@@ -1,12 +1,14 @@
-From 6599b4a047d80cd7b8715b5ad74e0735e6d4b941 Mon Sep 17 00:00:00 2001
+From 00f3a05a622d6888af3ba284e7115f3a08035a3e Mon Sep 17 00:00:00 2001
 From: Jerome Glisse <jglisse at redhat.com>
 Date: Fri, 24 Jul 2009 19:42:23 +0200
 Subject: [PATCH] radeon: add basic KMS support for r6xx & r7xx chipset.
 
 This only provide a kms drm fb device for this hw and allow X
 to run with no acceleration.
+
+Signed-off-by: Jerome Glisse <jglisse at redhat.com>
 ---
- drivers/gpu/drm/radeon/Makefile        |    2 +-
+ drivers/gpu/drm/radeon/Makefile        |    3 +-
  drivers/gpu/drm/radeon/atombios_crtc.c |    1 +
  drivers/gpu/drm/radeon/avivod.h        |   60 ++
  drivers/gpu/drm/radeon/r100.c          |   69 ++
@@ -15,18 +17,17 @@ to run with no acceleration.
  drivers/gpu/drm/radeon/r600.c          | 1243 ++++++++++++++++++++++++++++++--
  drivers/gpu/drm/radeon/r600d.h         |  349 +++++++++
  drivers/gpu/drm/radeon/radeon.h        |   51 ++-
- drivers/gpu/drm/radeon/radeon_asic.h   |  137 ++++-
+ drivers/gpu/drm/radeon/radeon_asic.h   |  139 ++++-
  drivers/gpu/drm/radeon/radeon_clocks.c |   10 +-
- drivers/gpu/drm/radeon/radeon_device.c |  338 +++++----
- drivers/gpu/drm/radeon/radeon_drv.h    |    1 +
+ drivers/gpu/drm/radeon/radeon_device.c |  340 +++++----
  drivers/gpu/drm/radeon/radeon_ring.c   |   63 +--
  drivers/gpu/drm/radeon/radeon_share.h  |   66 ++
  drivers/gpu/drm/radeon/radeon_ttm.c    |    6 +-
  drivers/gpu/drm/radeon/rs400.c         |    2 +-
  drivers/gpu/drm/radeon/rs780.c         |  102 ---
- drivers/gpu/drm/radeon/rv770.c         |  980 +++++++++++++++++++++++--
+ drivers/gpu/drm/radeon/rv770.c         |  981 ++++++++++++++++++++++++--
  drivers/gpu/drm/radeon/rv770d.h        |  340 +++++++++
- 20 files changed, 3364 insertions(+), 494 deletions(-)
+ 19 files changed, 3366 insertions(+), 497 deletions(-)
  create mode 100644 drivers/gpu/drm/radeon/avivod.h
  delete mode 100644 drivers/gpu/drm/radeon/r300.h
  create mode 100644 drivers/gpu/drm/radeon/r600d.h
@@ -34,18 +35,19 @@ to run with no acceleration.
  create mode 100644 drivers/gpu/drm/radeon/rv770d.h
 
 diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
-index 013d380..7384cad 100644
+index 013d380..308416f 100644
 --- a/drivers/gpu/drm/radeon/Makefile
 +++ b/drivers/gpu/drm/radeon/Makefile
-@@ -13,7 +13,7 @@ radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
+@@ -13,8 +13,7 @@ radeon-$(CONFIG_DRM_RADEON_KMS) += radeon_device.o radeon_kms.o \
  	radeon_encoders.o radeon_display.o radeon_cursor.o radeon_i2c.o \
  	radeon_clocks.o radeon_fb.o radeon_gem.o radeon_ring.o radeon_irq_kms.o \
  	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \
 -	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rs780.o rv770.o \
-+	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o \
- 	radeon_test.o
+-	radeon_test.o
++	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o
  
  radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
+ 
 diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
 index 74d034f..629d7c8 100644
 --- a/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -264,7 +266,7 @@ index 8486b4d..0000000
 -
 -#endif
 diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 538cd90..ae3a9e9 100644
+index 538cd90..46c9ffd 100644
 --- a/drivers/gpu/drm/radeon/r600.c
 +++ b/drivers/gpu/drm/radeon/r600.c
 @@ -25,12 +25,17 @@
@@ -618,8 +620,8 @@ index 538cd90..ae3a9e9 100644
 +	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
 +	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 +	/* Setup GPU memory space */
++	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
 +	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
-+	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
 +	if (rdev->flags & RADEON_IS_AGP) {
 +		r = radeon_agp_init(rdev);
 +		if (r)
@@ -688,25 +690,22 @@ index 538cd90..ae3a9e9 100644
 +	rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);
 +	rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
 +	return 0;
- }
- 
--void r600_vram_info(struct radeon_device *rdev)
++}
++
 +int r600_gpu_reset(struct radeon_device *rdev)
- {
--	r600_vram_get_type(rdev);
--	rdev->mc.real_vram_size = RREG32(R600_CONFIG_MEMSIZE);
--	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
++{
 +	/* FIXME: implement */
 +	return 0;
-+}
+ }
  
--	/* Could aper size report 0 ? */
--	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
--	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
+-void r600_vram_info(struct radeon_device *rdev)
 +static u32 r600_get_tile_pipe_to_backend_map(u32 num_tile_pipes,
 +					     u32 num_backends,
 +					     u32 backend_disable_mask)
-+{
+ {
+-	r600_vram_get_type(rdev);
+-	rdev->mc.real_vram_size = RREG32(R600_CONFIG_MEMSIZE);
+-	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
 +	u32 backend_map = 0;
 +	u32 enabled_backends_mask;
 +	u32 enabled_backends_count;
@@ -714,7 +713,10 @@ index 538cd90..ae3a9e9 100644
 +	u32 swizzle_pipe[R6XX_MAX_PIPES];
 +	u32 cur_backend;
 +	u32 i;
-+
+ 
+-	/* Could aper size report 0 ? */
+-	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
+-	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 +	if (num_tile_pipes > R6XX_MAX_PIPES)
 +		num_tile_pipes = R6XX_MAX_PIPES;
 +	if (num_tile_pipes < 1)
@@ -821,8 +823,8 @@ index 538cd90..ae3a9e9 100644
 +		val >>= 1;
 +	}
 +	return ret;
-+}
-+
+ }
+ 
 +void r600_gpu_init(struct radeon_device *rdev)
 +{
 +	u32 tiling_config;
@@ -1091,8 +1093,8 @@ index 538cd90..ae3a9e9 100644
 +		break;
 +	}
 +	WREG32(TC_CNTL, tmp);
- }
- 
++}
++
 +
  /*
   * Indirect registers accessor
@@ -1351,7 +1353,11 @@ index 538cd90..ae3a9e9 100644
 +		  uint64_t dst_offset,
 +		  unsigned num_pages,
 +		  struct radeon_fence *fence)
-+{
+ {
+-	WREG32(R600_PCIE_PORT_INDEX, ((reg) & 0xff));
+-	(void)RREG32(R600_PCIE_PORT_INDEX);
+-	WREG32(R600_PCIE_PORT_DATA, (v));
+-	(void)RREG32(R600_PCIE_PORT_DATA);
 +	/* FIXME: implement */
 +	return 0;
 +}
@@ -1371,11 +1377,7 @@ index 538cd90..ae3a9e9 100644
 +int r600_set_surface_reg(struct radeon_device *rdev, int reg,
 +			 uint32_t tiling_flags, uint32_t pitch,
 +			 uint32_t offset, uint32_t obj_size)
- {
--	WREG32(R600_PCIE_PORT_INDEX, ((reg) & 0xff));
--	(void)RREG32(R600_PCIE_PORT_INDEX);
--	WREG32(R600_PCIE_PORT_DATA, (v));
--	(void)RREG32(R600_PCIE_PORT_DATA);
++{
 +	/* FIXME: implement */
 +	return 0;
 +}
@@ -1933,7 +1935,7 @@ index 0000000..3337227
 +
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index b1d945b..542131c 100644
+index b1d945b..0c5c63a 100644
 --- a/drivers/gpu/drm/radeon/radeon.h
 +++ b/drivers/gpu/drm/radeon/radeon.h
 @@ -50,8 +50,8 @@
@@ -1997,20 +1999,20 @@ index b1d945b..542131c 100644
 -	unsigned		gtt_location;
 -	unsigned		gtt_size;
 -	unsigned		vram_location;
+ 	/* for some chips with <= 32MB we need to lie
+ 	 * about vram size near mc fb location */
+-	unsigned		mc_vram_size;
++	u64			mc_vram_size;
 +	u64			gtt_location;
 +	u64			gtt_size;
 +	u64			gtt_start;
 +	u64			gtt_end;
 +	u64			vram_location;
- 	/* for some chips with <= 32MB we need to lie
- 	 * about vram size near mc fb location */
--	unsigned		mc_vram_size;
-+	u64			mc_vram_size;
 +	u64			vram_start;
 +	u64			vram_end;
-+	u64			real_vram_size;
  	unsigned		vram_width;
 -	unsigned		real_vram_size;
++	u64			real_vram_size;
  	int			vram_mtrr;
  	bool			vram_is_ddr;
  };
@@ -2095,7 +2097,7 @@ index b1d945b..542131c 100644
  #define radeon_irq_process(rdev) (rdev)->asic->irq_process((rdev))
  #define radeon_fence_ring_emit(rdev, fence) (rdev)->asic->fence_ring_emit((rdev), (fence))
 diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index 9a75876..6c30d11 100644
+index 9a75876..7e9bb12 100644
 --- a/drivers/gpu/drm/radeon/radeon_asic.h
 +++ b/drivers/gpu/drm/radeon/radeon_asic.h
 @@ -58,6 +58,7 @@ int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr);
@@ -2181,15 +2183,18 @@ index 9a75876..6c30d11 100644
  	.irq_set = &rs600_irq_set,
  	.irq_process = &r100_irq_process,
  	.fence_ring_emit = &r300_fence_ring_emit,
-@@ -380,6 +401,7 @@ static struct radeon_asic rv515_asic = {
+@@ -380,7 +401,10 @@ static struct radeon_asic rv515_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
  	.cp_disable = &r100_cp_disable,
 +	.cp_commit = &r100_cp_commit,
  	.ring_start = &rv515_ring_start,
++	.ring_ib_execute = &r100_ring_ib_execute,
++	.ib_test = &r100_ib_test,
  	.irq_set = &r100_irq_set,
  	.irq_process = &r100_irq_process,
-@@ -422,7 +444,10 @@ static struct radeon_asic r520_asic = {
+ 	.fence_ring_emit = &r300_fence_ring_emit,
+@@ -422,7 +446,10 @@ static struct radeon_asic r520_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
  	.cp_disable = &r100_cp_disable,
@@ -2200,7 +2205,7 @@ index 9a75876..6c30d11 100644
  	.irq_set = &r100_irq_set,
  	.irq_process = &r100_irq_process,
  	.fence_ring_emit = &r300_fence_ring_emit,
-@@ -440,9 +465,119 @@ static struct radeon_asic r520_asic = {
+@@ -440,9 +467,119 @@ static struct radeon_asic r520_asic = {
  };
  
  /*
@@ -2343,7 +2348,7 @@ index a37cbce..152eef1 100644
  			mpll->reference_div = spll->reference_div;
  	} else {
 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index a162ade..532074e 100644
+index 9ff6dcb..d4c804d 100644
 --- a/drivers/gpu/drm/radeon/radeon_device.c
 +++ b/drivers/gpu/drm/radeon/radeon_device.c
 @@ -37,7 +37,7 @@
@@ -2364,20 +2369,20 @@ index a162ade..532074e 100644
  {
  	int i;
  
-@@ -154,16 +154,16 @@ int radeon_mc_setup(struct radeon_device *rdev)
- 		rdev->mc.vram_location = 0;
- 		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+@@ -156,16 +156,14 @@ int radeon_mc_setup(struct radeon_device *rdev)
+ 		tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
+ 		rdev->mc.gtt_location = tmp;
  	}
 -	DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
-+	DRM_INFO("radeon: VRAM %uM\n", (unsigned)(rdev->mc.real_vram_size >> 20));
++	DRM_INFO("radeon: VRAM %uM\n", (unsigned)(rdev->mc.mc_vram_size >> 20));
  	DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
 -		 rdev->mc.vram_location,
 -		 rdev->mc.vram_location + rdev->mc.mc_vram_size - 1);
+-	if (rdev->mc.real_vram_size != rdev->mc.mc_vram_size)
+-		DRM_INFO("radeon: VRAM less than aperture workaround enabled\n");
+-	DRM_INFO("radeon: GTT %uM\n", rdev->mc.gtt_size >> 20);
 +		 (unsigned)rdev->mc.vram_location,
 +		 (unsigned)(rdev->mc.vram_location + rdev->mc.mc_vram_size - 1));
- 	if (rdev->mc.real_vram_size != rdev->mc.mc_vram_size)
- 		DRM_INFO("radeon: VRAM less than aperture workaround enabled\n");
--	DRM_INFO("radeon: GTT %uM\n", rdev->mc.gtt_size >> 20);
 +	DRM_INFO("radeon: GTT %uM\n", (unsigned)(rdev->mc.gtt_size >> 20));
  	DRM_INFO("radeon: GTT from 0x%08X to 0x%08X\n",
 -		 rdev->mc.gtt_location,
@@ -2387,7 +2392,7 @@ index a162ade..532074e 100644
  	return 0;
  }
  
-@@ -203,6 +203,31 @@ static bool radeon_card_posted(struct radeon_device *rdev)
+@@ -205,6 +203,31 @@ static bool radeon_card_posted(struct radeon_device *rdev)
  
  }
  
@@ -2397,7 +2402,7 @@ index a162ade..532074e 100644
 +	if (rdev->dummy_page.page == NULL)
 +		return -ENOMEM;
 +	rdev->dummy_page.addr = pci_map_page(rdev->pdev, rdev->dummy_page.page,
-+					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
++					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);	
 +	if (!rdev->dummy_page.addr) {
 +		__free_page(rdev->dummy_page.page);
 +		rdev->dummy_page.page = NULL;
@@ -2419,7 +2424,7 @@ index a162ade..532074e 100644
  
  /*
   * Registers accessors functions.
-@@ -328,9 +353,15 @@ int radeon_asic_init(struct radeon_device *rdev)
+@@ -330,9 +353,15 @@ int radeon_asic_init(struct radeon_device *rdev)
  	case CHIP_RV635:
  	case CHIP_RV670:
  	case CHIP_RS780:
@@ -2435,7 +2440,7 @@ index a162ade..532074e 100644
  	default:
  		/* FIXME: not supported yet */
  		return -EINVAL;
-@@ -453,7 +484,7 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -455,7 +484,7 @@ int radeon_device_init(struct radeon_device *rdev,
  		       struct pci_dev *pdev,
  		       uint32_t flags)
  {
@@ -2444,7 +2449,7 @@ index a162ade..532074e 100644
  	int dma_bits;
  
  	DRM_INFO("radeon: Initializing kernel modesetting.\n");
-@@ -492,10 +523,6 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -494,10 +523,6 @@ int radeon_device_init(struct radeon_device *rdev,
  	if (r) {
  		return r;
  	}
@@ -2455,7 +2460,7 @@ index a162ade..532074e 100644
  
  	/* set DMA mask + need_dma32 flags.
  	 * PCIE - can handle 40-bits.
-@@ -526,111 +553,118 @@ int radeon_device_init(struct radeon_device *rdev,
+@@ -528,111 +553,118 @@ int radeon_device_init(struct radeon_device *rdev,
  	DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
  	DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
  
@@ -2531,7 +2536,7 @@ index a162ade..532074e 100644
 +		rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
 +				MTRR_TYPE_WRCOMB, 1);
 +		DRM_INFO("Detected VRAM RAM=%uM, BAR=%uM\n",
-+				(unsigned)(rdev->mc.real_vram_size >> 20),
++				(unsigned)(rdev->mc.mc_vram_size >> 20),
 +				(unsigned)(rdev->mc.aper_size >> 20));
 +		DRM_INFO("RAM width %dbits %cDR\n",
 +				rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
@@ -2663,7 +2668,7 @@ index a162ade..532074e 100644
  	r = radeon_modeset_init(rdev);
  	if (r) {
  		return r;
-@@ -656,26 +690,29 @@ void radeon_device_fini(struct radeon_device *rdev)
+@@ -658,26 +690,29 @@ void radeon_device_fini(struct radeon_device *rdev)
  	rdev->shutdown = true;
  	/* Order matter so becarefull if you rearrange anythings */
  	radeon_modeset_fini(rdev);
@@ -2709,7 +2714,7 @@ index a162ade..532074e 100644
  	iounmap(rdev->rmmio);
  	rdev->rmmio = NULL;
  }
-@@ -713,9 +750,12 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
+@@ -715,9 +750,12 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
  	/* wait for gpu to finish processing current batch */
  	radeon_fence_wait_last(rdev);
  
@@ -2725,7 +2730,7 @@ index a162ade..532074e 100644
  	/* evict remaining vram memory */
  	radeon_object_evict_vram(rdev);
  
-@@ -751,33 +791,37 @@ int radeon_resume_kms(struct drm_device *dev)
+@@ -753,33 +791,37 @@ int radeon_resume_kms(struct drm_device *dev)
  	if (radeon_gpu_reset(rdev)) {
  		/* FIXME: what do we want to do here ? */
  	}
@@ -2789,18 +2794,6 @@ index a162ade..532074e 100644
  	}
  out:
  	fb_set_suspend(rdev->fbdev_info, 0);
-diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 127d045..3933f82 100644
---- a/drivers/gpu/drm/radeon/radeon_drv.h
-+++ b/drivers/gpu/drm/radeon/radeon_drv.h
-@@ -143,6 +143,7 @@ enum radeon_family {
- 	CHIP_RV635,
- 	CHIP_RV670,
- 	CHIP_RS780,
-+	CHIP_RS880,
- 	CHIP_RV770,
- 	CHIP_RV730,
- 	CHIP_RV710,
 diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
 index 60d1593..37d0958 100644
 --- a/drivers/gpu/drm/radeon/radeon_ring.c
@@ -2973,7 +2966,7 @@ index 63a7735..365d4bc 100644
 +
  #endif
 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 15c3531..d2799cc 100644
+index 15c3531..d2aff30 100644
 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
 @@ -352,7 +352,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
@@ -2990,7 +2983,7 @@ index 15c3531..d2799cc 100644
  	}
  	DRM_INFO("radeon: %uM of VRAM memory ready\n",
 -		 rdev->mc.real_vram_size / (1024 * 1024));
-+		 (unsigned)(rdev->mc.real_vram_size / (1024 * 1024)));
++		 (unsigned)rdev->mc.real_vram_size / (1024 * 1024));
  	r = ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT, 0,
  			   ((rdev->mc.gtt_size) >> PAGE_SHIFT));
  	if (r) {
@@ -3125,10 +3118,10 @@ index 0affcff..0000000
 -	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 -}
 diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
-index 21d8ffd..08ce913 100644
+index 21d8ffd..3e12447 100644
 --- a/drivers/gpu/drm/radeon/rv770.c
 +++ b/drivers/gpu/drm/radeon/rv770.c
-@@ -26,99 +26,963 @@
+@@ -26,99 +26,964 @@
   *          Jerome Glisse
   */
  #include "drmP.h"
@@ -3964,7 +3957,8 @@ index 21d8ffd..08ce913 100644
 +	rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
 +	rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
 +	/* Setup GPU memory space */
-+	rdev->mc.real_vram_size = rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
++	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
++	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
 +	if (rdev->flags & RADEON_IS_AGP) {
 +		r = radeon_agp_init(rdev);
 +		if (r)
@@ -4497,5 +4491,5 @@ index 0000000..b0a4354
 +
 +#endif
 -- 
-1.6.2.5
+1.6.0.6
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.44
retrieving revision 1.1294.2.45
diff -u -p -r1.1294.2.44 -r1.1294.2.45
--- kernel.spec	5 Aug 2009 23:00:15 -0000	1.1294.2.44
+++ kernel.spec	8 Aug 2009 18:06:03 -0000	1.1294.2.45
@@ -640,6 +640,8 @@ Patch452: linux-2.6.30-no-pcspkr-modalia
 
 Patch460: linux-2.6-serial-460800.patch
 
+Patch470: die-floppy-die.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,8 +669,10 @@ Patch1518: hid-ignore-all-recent-imon-de
 
 Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
+Patch1552: linux-2.6-ksm-updates.patch
 
 # nouveau + drm fixes
+Patch1810: drm-radeon-fixes.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -678,6 +682,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
+Patch1827: drm-hush-vblank-warning.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -709,6 +714,7 @@ Patch11010: via-hwmon-temp-sensor.patch
 
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
+Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
@@ -1225,6 +1231,9 @@ ApplyPatch alsa-tell-user-that-stream-to
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 
+# stop floppy.ko from autoloading during udev...
+ApplyPatch die-floppy-die.patch
+
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
@@ -1274,13 +1283,19 @@ ApplyPatch hid-ignore-all-recent-imon-de
 
 # Add kernel KSM support
 ApplyPatch linux-2.6-ksm.patch
+ApplyPatch linux-2.6-ksm-updates.patch
 # Optimize KVM for KSM support
 ApplyPatch linux-2.6-ksm-kvm.patch
 
+# Fix block I/O errors in KVM
+ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
+
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch drm-radeon-fixes.patch
 ApplyPatch drm-r600-kms.patch
+ApplyPatch drm-hush-vblank-warning.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1793,7 +1808,12 @@ if [ `uname -i` == "x86_64" -o `uname -i
    [ -f /etc/sysconfig/kernel ]; then\
   /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
 fi}\
+%{expand:\
+%if %{with_dracut}\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --depmod --add-dracut-args --initrdfile=/boot/initrd-generic-%{KVERREL}%{?-v:.%{-v*}}.img --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%else\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%endif}\
 #if [ -x /sbin/weak-modules ]\
 #then\
 #    /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\
@@ -1953,6 +1973,33 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 08 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch to latest rebase/master and current rawhide
+
+* Fri Aug 07 2009 Justin M. Forbes <jforbes at redhat.com>
+- Apply KSM updates from upstream
+
+* Fri Aug 07 2009 Hans de Goede <hdegoede at redhat.com>
+- When building a dracut generic initrd tell new-kernel-pkg to use that
+  instead of running mkinitrd
+
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.139.rc5.git3
+- drm-r600-kms.patch - update r600 KMS
+- drm-radeon-fixes.patch - patches for queue to Linus
+
+* Thu Aug 06 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.31-0.138.rc5.git3
+- Fix kvm virtio_blk errors (#514901)
+
+* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>
+- Hush DRM vblank warnings, they're constant (and harmless) under DRI2.
+
+* Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.134.rc5.git3
+- fixup vga arb warning at startup and handover between gpus
+
+* Thu Aug 06 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.0.133.rc5.git3
+- die-floppy-die.patch: it's the 21st century, let's not rely on
+  steam powered technology.
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.132.rc5.git3
 - revert-ftrace-powerpc-snafu.patch - fix ppc build
 

linux-2.6-ppc-perfctr-oops-fix.patch:
 mpc7450-pmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6-ppc-perfctr-oops-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ppc-perfctr-oops-fix.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.2 -r1.2.2.3
--- linux-2.6-ppc-perfctr-oops-fix.patch	5 Aug 2009 23:00:17 -0000	1.2.2.2
+++ linux-2.6-ppc-perfctr-oops-fix.patch	8 Aug 2009 18:06:04 -0000	1.2.2.3
@@ -7,7 +7,7 @@ index 75ff47f..ea383c1 100644
  static int init_mpc7450_pmu(void)
  {
 -	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
-+	if (cur_cpu_spec->oprofile_cpu_type &&
++	if (!cur_cpu_spec->oprofile_cpu_type ||
 +	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
  		return -ENODEV;
  

linux-2.6-vga-arb.patch:
 drivers/gpu/Makefile     |    2 
 drivers/gpu/vga/Kconfig  |   10 
 drivers/gpu/vga/Makefile |    1 
 drivers/gpu/vga/vgaarb.c | 1206 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.c        |   44 +
 drivers/video/Kconfig    |    2 
 include/linux/pci.h      |    2 
 include/linux/vgaarb.h   |  196 +++++++
 8 files changed, 1461 insertions(+), 2 deletions(-)

Index: linux-2.6-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vga-arb.patch,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -p -r1.6.2.2 -r1.6.2.3
--- linux-2.6-vga-arb.patch	5 Aug 2009 23:00:17 -0000	1.6.2.2
+++ linux-2.6-vga-arb.patch	8 Aug 2009 18:06:04 -0000	1.6.2.3
@@ -1,4 +1,4 @@
-From a00c47b3e783fe9ebb871071d2472387451d9225 Mon Sep 17 00:00:00 2001
+From 83ec7b4c9fecfcffe396290f6e96ea5a60a59598 Mon Sep 17 00:00:00 2001
 From: Tiago Vignatti <tiago.vignatti at nokia.com>
 Date: Tue, 14 Jul 2009 15:57:29 +0300
 Subject: [PATCH] vga: implements VGA arbitration on Linux
@@ -15,18 +15,20 @@ balance pci get/put
 use the decodes count for userspace to get card
 count also if a gpu disables decodes move it to
 the next card
+do handover properly to next card
+optimise notify to only be done when something happens
 
 Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
 ---
  drivers/gpu/Makefile     |    2 +-
  drivers/gpu/vga/Kconfig  |   10 +
  drivers/gpu/vga/Makefile |    1 +
- drivers/gpu/vga/vgaarb.c | 1195 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/gpu/vga/vgaarb.c | 1206 ++++++++++++++++++++++++++++++++++++++++++++++
  drivers/pci/pci.c        |   44 ++
  drivers/video/Kconfig    |    2 +
  include/linux/pci.h      |    2 +
  include/linux/vgaarb.h   |  195 ++++++++
- 8 files changed, 1450 insertions(+), 1 deletions(-)
+ 8 files changed, 1461 insertions(+), 1 deletions(-)
  create mode 100644 drivers/gpu/vga/Kconfig
  create mode 100644 drivers/gpu/vga/Makefile
  create mode 100644 drivers/gpu/vga/vgaarb.c
@@ -64,10 +66,10 @@ index 0000000..7cc8c1e
 +obj-$(CONFIG_VGA_ARB)  += vgaarb.o
 diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
 new file mode 100644
-index 0000000..08ba44d
+index 0000000..199138f
 --- /dev/null
 +++ b/drivers/gpu/vga/vgaarb.c
-@@ -0,0 +1,1195 @@
+@@ -0,0 +1,1206 @@
 +/*
 + * vgaarb.c
 + *
@@ -476,7 +478,7 @@ index 0000000..08ba44d
 + * the arbiter's client decides if devices decodes or not legacy
 + * things.
 + */
-+static void vga_arbiter_add_pci_device(struct pci_dev *pdev)
++static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)
 +{
 +	struct vga_device *vgadev;
 +	unsigned long flags;
@@ -486,7 +488,7 @@ index 0000000..08ba44d
 +
 +	/* Only deal with VGA class devices */
 +	if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
-+		return;
++		return false;
 +
 +	/* Allocate structure */
 +	vgadev = kmalloc(sizeof(struct vga_device), GFP_KERNEL);
@@ -496,7 +498,7 @@ index 0000000..08ba44d
 +		 * just do nothing, I'm not sure there is anything saner
 +		 * to be done
 +		 */
-+		return;
++		return false;
 +	}
 +
 +	memset(vgadev, 0, sizeof(*vgadev));
@@ -559,21 +561,25 @@ index 0000000..08ba44d
 +		vga_iostate_to_str(vgadev->locks));
 +
 +	spin_unlock_irqrestore(&vga_lock, flags);
-+	return;
++	return true;
 +fail:
 +	spin_unlock_irqrestore(&vga_lock, flags);
 +	kfree(vgadev);
++	return false;
 +}
 +
-+static void vga_arbiter_del_pci_device(struct pci_dev *pdev)
++static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
 +{
 +	struct vga_device *vgadev;
 +	unsigned long flags;
++	bool ret = true;
 +
 +	spin_lock_irqsave(&vga_lock, flags);
 +	vgadev = vgadev_find(pdev);
-+	if (vgadev == NULL)
++	if (vgadev == NULL) {
++		ret = false;
 +		goto bail;
++	}
 +
 +	if (vga_default == pdev) {
 +		pci_dev_put(vga_default);
@@ -596,6 +602,7 @@ index 0000000..08ba44d
 +bail:
 +	spin_unlock_irqrestore(&vga_lock, flags);
 +	kfree(vgadev);
++	return ret;
 +}
 +
 +/* this is called with the lock */
@@ -608,18 +615,22 @@ index 0000000..08ba44d
 +	old_decodes = vgadev->decodes;
 +	vgadev->decodes = new_decodes;
 +
-+	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s\n",
++	pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s:owns=%s\n",
 +		pci_name(vgadev->pdev),
 +		vga_iostate_to_str(old_decodes),
-+		vga_iostate_to_str(vgadev->decodes));
++		vga_iostate_to_str(vgadev->decodes),
++		vga_iostate_to_str(vgadev->owns));
++
 +
 +	/* if we own the decodes we should move them along to
 +	   another card */
-+	if ((vgadev->owns & new_decodes) && (vga_count > 1)) {
-+		vgadev->owns &= new_decodes;
++	if ((vgadev->owns & old_decodes) && (vga_count > 1)) {
++		/* set us to own nothing */
++		vgadev->owns &= ~old_decodes;
 +		list_for_each_entry(new_vgadev, &vga_list, list) {
 +			if ((new_vgadev != vgadev) &&
 +			    (new_vgadev->decodes & VGA_RSRC_LEGACY_MASK)) {
++				pr_info("vgaarb: transferring owner from PCI:%s to PCI:%s\n", pci_name(vgadev->pdev), pci_name(new_vgadev->pdev));
 +				conflict = __vga_tryget(new_vgadev, VGA_RSRC_LEGACY_MASK);
 +				if (!conflict)
 +					__vga_put(new_vgadev, VGA_RSRC_LEGACY_MASK);
@@ -1209,6 +1220,7 @@ index 0000000..08ba44d
 +{
 +	struct device *dev = data;
 +	struct pci_dev *pdev = to_pci_dev(dev);
++	bool notify = false;
 +
 +	pr_devel("%s\n", __func__);
 +
@@ -1216,11 +1228,12 @@ index 0000000..08ba44d
 +	 * test this thing here, so someone needs to double check for the
 +	 * cases of hotplugable vga cards. */
 +	if (action == BUS_NOTIFY_ADD_DEVICE)
-+		vga_arbiter_add_pci_device(pdev);
++		notify = vga_arbiter_add_pci_device(pdev);
 +	else if (action == BUS_NOTIFY_DEL_DEVICE)
-+		vga_arbiter_del_pci_device(pdev);
++		notify = vga_arbiter_del_pci_device(pdev);
 +
-+	vga_arbiter_notify_clients();
++	if (notify)
++		vga_arbiter_notify_clients();
 +	return 0;
 +}
 +
@@ -1319,7 +1332,7 @@ index dbd0f94..d837606 100644
  static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
  spinlock_t resource_alignment_lock = SPIN_LOCK_UNLOCKED;
 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 8afcf08..f4ed145 100644
+index 3b54b39..a0d9ee1 100644
 --- a/drivers/video/Kconfig
 +++ b/drivers/video/Kconfig
 @@ -7,6 +7,8 @@ menu "Graphics support"
@@ -1546,5 +1559,5 @@ index 0000000..68229ce
 +
 +#endif /* LINUX_VGA_H */
 -- 
-1.5.4.1
+1.6.4
 

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   36 
 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            |   34 
 arch/x86/include/asm/xen/pci.h             |   13 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   37 
 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/ioport.c                   |   29 
 arch/x86/kernel/microcode_core.c           |    5 
 arch/x86/kernel/microcode_xen.c            |  195 +++
 arch/x86/kernel/paravirt.c                 |    1 
 arch/x86/kernel/pci-dma.c                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    4 
 arch/x86/xen/apic.c                        |   60 +
 arch/x86/xen/enlighten.c                   |   63 +
 arch/x86/xen/mmu.c                         |  475 ++++++++-
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |   86 +
 arch/x86/xen/setup.c                       |   62 +
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/pci.h                          |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   32 
 drivers/xen/Makefile                       |   18 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  155 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  315 +++++-
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/pci.h                        |    6 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   21 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 128 files changed, 9923 insertions(+), 1309 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.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.patch	15 Jul 2009 22:20:03 -0000	1.1.2.29
+++ xen.pvops.patch	8 Aug 2009 18:06:04 -0000	1.1.2.30
@@ -50,6 +50,19 @@ index 9825cd6..d972b14 100644
 +	dma_free_coherent(NULL, PAGE_SIZE<<(order), (table), virt_to_bus(table))
  
  #endif /* _ASM_X86_AGP_H */
+diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
+index 7ecba4d..df06646 100644
+--- a/arch/x86/include/asm/e820.h
++++ b/arch/x86/include/asm/e820.h
+@@ -109,6 +109,8 @@ extern void reserve_early(u64 start, u64 end, char *name);
+ extern void reserve_early_overlap_ok(u64 start, u64 end, char *name);
+ extern void free_early(u64 start, u64 end);
+ extern void early_res_to_bootmem(u64 start, u64 end);
++extern u64 early_res_next_free(u64 start);
++extern u64 early_res_next_reserved(u64 addr, u64 max);
+ 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/i387.h b/arch/x86/include/asm/i387.h
 index 175adf5..2e75292 100644
 --- a/arch/x86/include/asm/i387.h
@@ -96,10 +109,10 @@ index 7373932..c75e9eb 100644
  
  #endif /* _ASM_X86_IO_H */
 diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
-index daf866e..5881493 100644
+index 330ee80..70f5ea9 100644
 --- a/arch/x86/include/asm/io_apic.h
 +++ b/arch/x86/include/asm/io_apic.h
-@@ -169,6 +169,7 @@ extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
+@@ -170,6 +170,7 @@ extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
  extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
  
  extern void probe_nr_irqs_gsi(void);
@@ -107,7 +120,7 @@ index daf866e..5881493 100644
  
  extern int setup_ioapic_entry(int apic, int irq,
  			      struct IO_APIC_route_entry *entry,
-@@ -184,4 +185,10 @@ static inline void ioapic_init_mappings(void)	{ }
+@@ -186,4 +187,10 @@ static inline void ioapic_insert_resources(void) { }
  static inline void probe_nr_irqs_gsi(void)	{ }
  #endif
  
@@ -118,6 +131,24 @@ index daf866e..5881493 100644
 +
 +
  #endif /* _ASM_X86_IO_APIC_H */
+diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
+index ef51b50..e15fca1 100644
+--- a/arch/x86/include/asm/microcode.h
++++ b/arch/x86/include/asm/microcode.h
+@@ -55,4 +55,13 @@ static inline struct microcode_ops * __init init_amd_microcode(void)
+ }
+ #endif
+ 
++#ifdef CONFIG_MICROCODE_XEN
++extern struct microcode_ops * __init init_xen_microcode(void);
++#else
++static inline struct microcode_ops * __init init_xen_microcode(void)
++{
++	return NULL;
++}
++#endif
++
+ #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
 --- a/arch/x86/include/asm/paravirt.h
@@ -1889,7 +1920,7 @@ index 0000000..75df312
 +#endif
 +
 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
-index 018a0a4..f334014 100644
+index 018a0a4..ebc174c 100644
 --- a/arch/x86/include/asm/xen/page.h
 +++ b/arch/x86/include/asm/xen/page.h
 @@ -5,6 +5,7 @@
@@ -1900,7 +1931,7 @@ index 018a0a4..f334014 100644
  
  #include <asm/uaccess.h>
  #include <asm/page.h>
-@@ -35,6 +36,8 @@ typedef struct xpaddr {
+@@ -35,16 +36,25 @@ typedef struct xpaddr {
  #define MAX_DOMAIN_PAGES						\
      ((unsigned long)((u64)CONFIG_XEN_MAX_DOMAIN_MEMORY * 1024 * 1024 * 1024 / PAGE_SIZE))
  
@@ -1909,7 +1940,25 @@ index 018a0a4..f334014 100644
  
  extern unsigned long get_phys_to_machine(unsigned long pfn);
  extern void set_phys_to_machine(unsigned long pfn, unsigned long mfn);
-@@ -62,10 +65,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
+ 
+ static inline unsigned long pfn_to_mfn(unsigned long pfn)
+ {
++	unsigned long mfn;
++
+ 	if (xen_feature(XENFEAT_auto_translated_physmap))
+ 		return pfn;
+ 
+-	return get_phys_to_machine(pfn) & ~FOREIGN_FRAME_BIT;
++	mfn = get_phys_to_machine(pfn);
++
++	if (unlikely(mfn == INVALID_P2M_ENTRY))
++		return mfn;
++
++	return mfn & ~FOREIGN_FRAME_BIT;
+ }
+ 
+ static inline int phys_to_machine_mapping_valid(unsigned long pfn)
+@@ -62,10 +72,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
  	if (xen_feature(XENFEAT_auto_translated_physmap))
  		return mfn;
  
@@ -1921,7 +1970,7 @@ index 018a0a4..f334014 100644
  
  	pfn = 0;
  	/*
-@@ -112,13 +113,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine)
+@@ -112,13 +120,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine)
   */
  static inline unsigned long mfn_to_local_pfn(unsigned long mfn)
  {
@@ -1937,7 +1986,23 @@ index 018a0a4..f334014 100644
  	return pfn;
  }
  
-@@ -163,6 +160,7 @@ static inline pte_t __pte_ma(pteval_t x)
+@@ -143,6 +147,15 @@ static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)
+ 	return pte;
+ }
+ 
++static inline unsigned long pte_invalid_mfn(void)
++{
++	pte_t pte;
++
++	pte.pte = ((phys_addr_t)INVALID_P2M_ENTRY << PAGE_SHIFT);
++
++	return pte_mfn(pte);
++}
++
+ static inline pteval_t pte_val_ma(pte_t pte)
+ {
+ 	return pte.pte;
+@@ -163,6 +176,7 @@ static inline pte_t __pte_ma(pteval_t x)
  
  #define pgd_val_ma(x)	((x).pgd)
  
@@ -1964,6 +2029,18 @@ index 0000000..0563fc6
 +#endif
 +
 +#endif	/* _ASM_X86_XEN_PCI_H */
+diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
+index 430d5b2..96f9ecb 100644
+--- a/arch/x86/kernel/Makefile
++++ b/arch/x86/kernel/Makefile
+@@ -108,6 +108,7 @@ obj-$(CONFIG_OLPC)		+= olpc.o
+ microcode-y				:= microcode_core.o
+ microcode-$(CONFIG_MICROCODE_INTEL)	+= microcode_intel.o
+ microcode-$(CONFIG_MICROCODE_AMD)	+= microcode_amd.o
++microcode-$(CONFIG_MICROCODE_XEN)	+= microcode_xen.o
+ obj-$(CONFIG_MICROCODE)			+= microcode.o
+ 
+ obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
 index 6b8ca3a..d47c54f 100644
 --- a/arch/x86/kernel/acpi/boot.c
@@ -2030,7 +2107,7 @@ index ca93638..9eff23c 100644
  #include "sleep.h"
  
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 90b5e6e..7011798 100644
+index d2ed6c5..205e277 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -63,8 +63,10 @@
@@ -2089,7 +2166,7 @@ index 90b5e6e..7011798 100644
  
  	if (sis_apic_bug)
  		writel(reg, &io_apic->index);
-@@ -3851,6 +3872,11 @@ void __init probe_nr_irqs_gsi(void)
+@@ -3854,6 +3875,11 @@ void __init probe_nr_irqs_gsi(void)
  	printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
  }
  
@@ -2101,7 +2178,7 @@ index 90b5e6e..7011798 100644
  #ifdef CONFIG_SPARSE_IRQ
  int __init arch_probe_nr_irqs(void)
  {
-@@ -4144,6 +4170,11 @@ void __init ioapic_init_mappings(void)
+@@ -4147,6 +4173,11 @@ void __init ioapic_init_mappings(void)
  	struct resource *ioapic_res;
  	int i;
  
@@ -2404,6 +2481,47 @@ index 0000000..c4e7484
 +	    cpu_has_centaur_mcr)
 +		mtrr_if = &xen_mtrr_ops;
 +}
+diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
+index 5cb5725..1e3bd20 100644
+--- a/arch/x86/kernel/e820.c
++++ b/arch/x86/kernel/e820.c
+@@ -750,6 +750,36 @@ static int __init find_overlapped_early(u64 start, u64 end)
+ 	return i;
+ }
+ 
++u64 __init early_res_next_free(u64 addr)
++{
++	int i;
++	u64 end = addr;
++	struct early_res *r;
++
++	for (i = 0; i < MAX_EARLY_RES; i++) {
++		r = &early_res[i];
++		if (addr >= r->start && addr < r->end) {
++			end = r->end;
++			break;
++		}
++	}
++	return end;
++}
++
++u64 __init early_res_next_reserved(u64 addr, u64 max)
++{
++	int i;
++	struct early_res *r;
++	u64 next_res = max;
++
++	for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {
++		r = &early_res[i];
++		if ((r->start >= addr) && (r->start < next_res))
++			next_res = r->start;
++	}
++	return next_res;
++}
++
+ /*
+  * 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/ioport.c b/arch/x86/kernel/ioport.c
 index 99c4d30..0a421d3 100644
 --- a/arch/x86/kernel/ioport.c
@@ -2469,6 +2587,230 @@ index 99c4d30..0a421d3 100644
  
  	return 0;
  }
+diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
+index 9371448..4cb6bbd 100644
+--- a/arch/x86/kernel/microcode_core.c
++++ b/arch/x86/kernel/microcode_core.c
+@@ -81,6 +81,7 @@
+ #include <linux/fs.h>
+ #include <linux/mm.h>
+ 
++#include <asm/xen/hypervisor.h>
+ #include <asm/microcode.h>
+ #include <asm/processor.h>
+ 
+@@ -503,7 +504,9 @@ static int __init microcode_init(void)
+ 	struct cpuinfo_x86 *c = &cpu_data(0);
+ 	int error;
+ 
+-	if (c->x86_vendor == X86_VENDOR_INTEL)
++	if (xen_pv_domain())
++		microcode_ops = init_xen_microcode();
++	else if (c->x86_vendor == X86_VENDOR_INTEL)
+ 		microcode_ops = init_intel_microcode();
+ 	else if (c->x86_vendor == X86_VENDOR_AMD)
+ 		microcode_ops = init_amd_microcode();
+diff --git a/arch/x86/kernel/microcode_xen.c b/arch/x86/kernel/microcode_xen.c
+new file mode 100644
+index 0000000..ab9d4e1
+--- /dev/null
++++ b/arch/x86/kernel/microcode_xen.c
+@@ -0,0 +1,195 @@
++/*
++ * Xen microcode update driver
++ *
++ * Xen does most of the work here.  We just pass the whole blob into
++ * Xen, and it will apply it to all CPUs as appropriate.  Xen will
++ * worry about how different CPU models are actually updated.
++ */
++#include <linux/sched.h>
++#include <linux/module.h>
++#include <linux/firmware.h>
++#include <linux/vmalloc.h>
++#include <linux/uaccess.h>
++
++#include <asm/microcode.h>
++
++#include <xen/interface/platform.h>
++#include <xen/interface/xen.h>
++
++#include <asm/xen/hypercall.h>
++#include <asm/xen/hypervisor.h>
++
++MODULE_DESCRIPTION("Xen microcode update driver");
++MODULE_LICENSE("GPL");
++
++struct xen_microcode {
++	size_t len;
++	char data[0];
++};
++
++static int xen_microcode_update(int cpu)
++{
++	int err;
++	struct xen_platform_op op;
++	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
++	struct xen_microcode *uc = uci->mc;
++
++	if (uc == NULL || uc->len == 0) {
++		/*
++		 * We do all cpus at once, so we don't need to do
++		 * other cpus explicitly (besides, these vcpu numbers
++		 * have no relationship to underlying physical cpus).
++		 */
++		return 0;
++	}
++
++	op.cmd = XENPF_microcode_update;
++	set_xen_guest_handle(op.u.microcode.data, uc->data);
++	op.u.microcode.length = uc->len;
++
++	err = HYPERVISOR_dom0_op(&op);
++
++	if (err != 0)
++		printk(KERN_WARNING "microcode_xen: microcode update failed: %d\n", err);
++
++	return err;
++}
++
++static enum ucode_state xen_request_microcode_fw(int cpu, struct device *device)
++{
++	char name[30];
++	struct cpuinfo_x86 *c = &cpu_data(cpu);
++	const struct firmware *firmware;
++	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
++	enum ucode_state ret;
++	struct xen_microcode *uc;
++	size_t size;
++	int err;
++
++	if (c->x86_vendor == X86_VENDOR_INTEL) {
++		BUG_ON(cpu != raw_smp_processor_id());
++		snprintf(name, sizeof(name), "intel-ucode/%02x-%02x-%02x",
++			 c->x86, c->x86_model, c->x86_mask);
++	} else if (c->x86_vendor == X86_VENDOR_AMD) {
++		snprintf(name, sizeof(name), "amd-ucode/microcode_amd.bin");
++	} else
++		return UCODE_NFOUND;
++
++	err = request_firmware(&firmware, name, device);
++	if (err) {
++		pr_debug("microcode: data file %s load failed\n", name);
++		return UCODE_NFOUND;
++	}
++
++	/*
++	 * Only bother getting real firmware for cpu 0; the others get
++	 * dummy placeholders.
++	 */
++	if (cpu == 0)
++		size = firmware->size;
++	else
++		size = 0;
++
++	if (uci->mc != NULL) {
++		vfree(uci->mc);
++		uci->mc = NULL;
++	}
++
++	ret = UCODE_ERROR;
++	uc = vmalloc(sizeof(*uc) + size);
++	if (uc == NULL)
++		goto out;
++
++	ret = UCODE_OK;
++	uc->len = size;
++	memcpy(uc->data, firmware->data, uc->len);
++
++	uci->mc = uc;
++
++out:
++	release_firmware(firmware);
++
++	return ret;
++}
++
++static enum ucode_state xen_request_microcode_user(int cpu,
++						   const void __user *buf, size_t size)
++{
++	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
++	struct xen_microcode *uc;
++	enum ucode_state ret;
++	size_t unread;
++
++	if (cpu != 0) {
++		/* No real firmware for non-zero cpus; just store a
++		   placeholder */
++		size = 0;
++	}
++
++	if (uci->mc != NULL) {
++		vfree(uci->mc);
++		uci->mc = NULL;
++	}
++
++	ret = UCODE_ERROR;
++	uc = vmalloc(sizeof(*uc) + size);
++	if (uc == NULL)
++		goto out;
++
++	uc->len = size;
++
++	ret = UCODE_NFOUND;
++
++	/* XXX This sporadically returns uncopied bytes, so we return
++	   EFAULT.  As far as I can see, the usermode code
++	   (microcode_ctl) isn't doing anything wrong... */
++	unread = copy_from_user(uc->data, buf, size);
++
++	if (unread != 0) {
++		printk(KERN_WARNING "failed to read %zd of %zd bytes at %p -> %p\n",
++		       unread, size, buf, uc->data);
++		goto out;
++	}
++
++	ret = UCODE_OK;
++
++out:
++	if (ret == 0)
++		uci->mc = uc;
++	else
++		vfree(uc);
++
++	return ret;
++}
++
++static void xen_microcode_fini_cpu(int cpu)
++{
++	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
++
++	vfree(uci->mc);
++	uci->mc = NULL;
++}
++
++static int xen_collect_cpu_info(int cpu, struct cpu_signature *sig)
++{
++	sig->sig = 0;
++	sig->pf = 0;
++	sig->rev = 0;
++
++	return 0;
++}
++
++static struct microcode_ops microcode_xen_ops = {
++	.request_microcode_user		  = xen_request_microcode_user,
++	.request_microcode_fw             = xen_request_microcode_fw,
++	.collect_cpu_info                 = xen_collect_cpu_info,
++	.apply_microcode                  = xen_microcode_update,
++	.microcode_fini_cpu               = xen_microcode_fini_cpu,
++};
++
++struct microcode_ops * __init init_xen_microcode(void)
++{
++	if (!xen_initial_domain())
++		return NULL;
++	return &microcode_xen_ops;
++}
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
 index 70ec9b9..cef3d70 100644
 --- a/arch/x86/kernel/paravirt.c
@@ -2726,7 +3068,7 @@ index ebefb54..a28279d 100644
  }
  
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index de2cab1..3539750 100644
+index 63f32d2..86bef0f 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -87,6 +87,7 @@
@@ -2737,7 +3079,7 @@ index de2cab1..3539750 100644
  
  #include <asm/system.h>
  #include <asm/vsyscall.h>
-@@ -931,6 +932,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -944,6 +945,9 @@ void __init setup_arch(char **cmdline_p)
  
  	initmem_init(0, max_pfn);
  
@@ -2799,6 +3141,73 @@ index 5204332..22a5a6d 100644
  }
  EXPORT_SYMBOL_GPL(math_state_restore);
  
+diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
+index 3cd7711..f16903d 100644
+--- a/arch/x86/mm/init_32.c
++++ b/arch/x86/mm/init_32.c
+@@ -430,22 +430,45 @@ static int __init add_highpages_work_fn(unsigned long start_pfn,
+ {
+ 	int node_pfn;
+ 	struct page *page;
++	phys_addr_t chunk_end, chunk_max;
+ 	unsigned long final_start_pfn, final_end_pfn;
+-	struct add_highpages_data *data;
+-
+-	data = (struct add_highpages_data *)datax;
++	struct add_highpages_data *data = (struct add_highpages_data *)datax;
+ 
+ 	final_start_pfn = max(start_pfn, data->start_pfn);
+ 	final_end_pfn = min(end_pfn, data->end_pfn);
+ 	if (final_start_pfn >= final_end_pfn)
+ 		return 0;
+ 
+-	for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;
+-	     node_pfn++) {
+-		if (!pfn_valid(node_pfn))
+-			continue;
+-		page = pfn_to_page(node_pfn);
+-		add_one_highpage_init(page, node_pfn);
++	chunk_end = PFN_PHYS(final_start_pfn);
++	chunk_max = PFN_PHYS(final_end_pfn);
++
++	/*
++	 * Check for reserved areas.
++	 */
++	for (;;) {
++		phys_addr_t chunk_start;
++		chunk_start = early_res_next_free(chunk_end);
++		
++		/*
++		 * Reserved area. Just count high mem pages.
++		 */
++		for (node_pfn = PFN_DOWN(chunk_end);
++		     node_pfn < PFN_DOWN(chunk_start); node_pfn++) {
++			if (pfn_valid(node_pfn))
++				totalhigh_pages++;
++		}
++
++		if (chunk_start >= chunk_max)
++			break;
++
++		chunk_end = early_res_next_reserved(chunk_start, chunk_max);
++		for (node_pfn = PFN_DOWN(chunk_start);
++		     node_pfn < PFN_DOWN(chunk_end); node_pfn++) {
++			if (!pfn_valid(node_pfn))
++				continue;
++			page = pfn_to_page(node_pfn);
++			add_one_highpage_init(page, node_pfn);
++		}
+ 	}
+ 
+ 	return 0;
+@@ -459,7 +482,6 @@ void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
+ 
+ 	data.start_pfn = start_pfn;
+ 	data.end_pfn = end_pfn;
+-
+ 	work_with_active_regions(nid, add_highpages_work_fn, &data);
+ }
+ 
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
 index e6718bb..f03f6dc 100644
 --- a/arch/x86/mm/pat.c
@@ -2813,7 +3222,7 @@ index e6718bb..f03f6dc 100644
  
  #ifdef CONFIG_STRICT_DEVMEM
 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index 8e43bdd..e68aea6 100644
+index ed34f5e..9c58425 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
 @@ -6,6 +6,16 @@
@@ -2970,10 +3379,10 @@ index 2202b62..6a522c2 100644
  
  	if (pci_bf_sort >= pci_force_bf)
 diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
-index 0fb56db..181f9eb 100644
+index 52e62e5..373b18e 100644
 --- a/arch/x86/pci/i386.c
 +++ b/arch/x86/pci/i386.c
-@@ -275,6 +275,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
+@@ -282,6 +282,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
  		return -EINVAL;
  
  	prot = pgprot_val(vma->vm_page_prot);
@@ -3062,7 +3471,7 @@ index 0000000..1b922aa
 +}
 +
 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
-index b83e119..de662fa 100644
+index b83e119..951c924 100644
 --- a/arch/x86/xen/Kconfig
 +++ b/arch/x86/xen/Kconfig
 @@ -6,6 +6,7 @@ config XEN
@@ -3073,7 +3482,7 @@ index b83e119..de662fa 100644
  	depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS)
  	depends on X86_CMPXCHG && X86_TSC
  	help
-@@ -36,3 +37,31 @@ config XEN_DEBUG_FS
+@@ -36,3 +37,35 @@ config XEN_DEBUG_FS
  	help
  	  Enable statistics output and various tuning options in debugfs.
  	  Enabling this option may incur a significant performance overhead.
@@ -3105,6 +3514,11 @@ index b83e119..de662fa 100644
 +       help
 +         Enable support for passing PCI devices through to
 +	 unprivileged domains. (COMPLETELY UNTESTED)
++
++config MICROCODE_XEN
++       def_bool y
++       depends on XEN_DOM0 && MICROCODE
+\ No newline at end of file
 diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
 index 172438f..6d697e5 100644
 --- a/arch/x86/xen/Makefile
@@ -3185,7 +3599,7 @@ index 0000000..496f07d
 +#endif
 +}
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 0a1700a..78970be 100644
+index 0a1700a..6ba04d4 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -64,6 +64,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
@@ -3301,7 +3715,7 @@ index 0a1700a..78970be 100644
  
  	init_mm.pgd = pgd;
  
-@@ -1054,6 +1089,15 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1054,9 +1089,21 @@ asmlinkage void __init xen_start_kernel(void)
  	if (xen_feature(XENFEAT_supervisor_mode_kernel))
  		pv_info.kernel_rpl = 0;
  
@@ -3317,7 +3731,13 @@ index 0a1700a..78970be 100644
  	/* set the limit of our address space */
  	xen_reserve_top();
  
-@@ -1075,6 +1119,16 @@ asmlinkage void __init xen_start_kernel(void)
++	/* fixup p2m entries uninitialized by domain builder */
++	xen_fix_mfn_list();
++
+ #ifdef CONFIG_X86_32
+ 	/* set up basic CPUID stuff */
+ 	cpu_detect(&new_cpu_data);
+@@ -1075,6 +1122,16 @@ asmlinkage void __init xen_start_kernel(void)
  		add_preferred_console("xenboot", 0, NULL);
  		add_preferred_console("tty", 0, NULL);
  		add_preferred_console("hvc", 0, NULL);
@@ -3335,7 +3755,7 @@ index 0a1700a..78970be 100644
  
  	xen_raw_console_write("about to get started...\n");
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 4ceb285..d4c1f78 100644
+index 4ceb285..e23f89f 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
 @@ -50,7 +50,9 @@
@@ -3370,7 +3790,27 @@ index 4ceb285..d4c1f78 100644
  #ifdef CONFIG_XEN_DEBUG_FS
  
  static struct {
-@@ -315,6 +325,7 @@ unsigned long arbitrary_virt_to_mfn(void *vaddr)
+@@ -226,6 +236,19 @@ void __init xen_build_dynamic_phys_to_machine(void)
+ 	xen_build_mfn_list_list();
+ }
+ 
++/*
++ * P2M entries higher than xen_start_info->nr_pages allocated by the
++ * domain builder are uninitialized. Set them to INVALID_P2M_ENTRY.
++ */
++void __init xen_fix_mfn_list(void)
++{
++	unsigned idx;
++	unsigned long max_pfn = min(MAX_DOMAIN_PAGES, xen_start_info->nr_pages);
++
++	for (idx = p2m_index(max_pfn); idx < P2M_ENTRIES_PER_PAGE; idx++)
++		p2m_top[p2m_top_index(max_pfn)][idx] = INVALID_P2M_ENTRY;
++}
++
+ unsigned long get_phys_to_machine(unsigned long pfn)
+ {
+ 	unsigned topidx, idx;
+@@ -315,6 +338,7 @@ unsigned long arbitrary_virt_to_mfn(void *vaddr)
  
  	return PFN_DOWN(maddr.maddr);
  }
@@ -3378,7 +3818,7 @@ index 4ceb285..d4c1f78 100644
  
  xmaddr_t arbitrary_virt_to_machine(void *vaddr)
  {
-@@ -376,6 +387,34 @@ static bool xen_page_pinned(void *ptr)
+@@ -376,6 +400,34 @@ static bool xen_page_pinned(void *ptr)
  	return PagePinned(page);
  }
  
@@ -3413,7 +3853,7 @@ index 4ceb285..d4c1f78 100644
  static void xen_extend_mmu_update(const struct mmu_update *update)
  {
  	struct multicall_space mcs;
-@@ -452,6 +491,11 @@ void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags)
+@@ -452,6 +504,11 @@ void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags)
  void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
  		    pte_t *ptep, pte_t pteval)
  {
@@ -3425,7 +3865,7 @@ index 4ceb285..d4c1f78 100644
  	ADD_STATS(set_pte_at, 1);
  //	ADD_STATS(set_pte_at_pinned, xen_page_pinned(ptep));
  	ADD_STATS(set_pte_at_current, mm == current->mm);
-@@ -522,8 +566,25 @@ static pteval_t pte_pfn_to_mfn(pteval_t val)
+@@ -522,8 +579,25 @@ static pteval_t pte_pfn_to_mfn(pteval_t val)
  	return val;
  }
  
@@ -3451,7 +3891,7 @@ index 4ceb285..d4c1f78 100644
  	return pte_mfn_to_pfn(pte.pte);
  }
  PV_CALLEE_SAVE_REGS_THUNK(xen_pte_val);
-@@ -536,7 +597,22 @@ PV_CALLEE_SAVE_REGS_THUNK(xen_pgd_val);
+@@ -536,7 +610,22 @@ PV_CALLEE_SAVE_REGS_THUNK(xen_pgd_val);
  
  pte_t xen_make_pte(pteval_t pte)
  {
@@ -3475,7 +3915,7 @@ index 4ceb285..d4c1f78 100644
  	return native_make_pte(pte);
  }
  PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte);
-@@ -592,6 +668,11 @@ void xen_set_pud(pud_t *ptr, pud_t val)
+@@ -592,6 +681,11 @@ void xen_set_pud(pud_t *ptr, pud_t val)
  
  void xen_set_pte(pte_t *ptep, pte_t pte)
  {
@@ -3487,7 +3927,7 @@ index 4ceb285..d4c1f78 100644
  	ADD_STATS(pte_update, 1);
  //	ADD_STATS(pte_update_pinned, xen_page_pinned(ptep));
  	ADD_STATS(pte_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);
-@@ -608,6 +689,11 @@ void xen_set_pte(pte_t *ptep, pte_t pte)
+@@ -608,6 +702,11 @@ void xen_set_pte(pte_t *ptep, pte_t pte)
  #ifdef CONFIG_X86_PAE
  void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
  {
@@ -3499,7 +3939,7 @@ index 4ceb285..d4c1f78 100644
  	set_64bit((u64 *)ptep, native_pte_val(pte));
  }
  
-@@ -1285,6 +1371,13 @@ static void xen_flush_tlb_single(unsigned long addr)
+@@ -1285,6 +1384,13 @@ static void xen_flush_tlb_single(unsigned long addr)
  	preempt_enable();
  }
  
@@ -3513,14 +3953,27 @@ index 4ceb285..d4c1f78 100644
  static void xen_flush_tlb_others(const struct cpumask *cpus,
  				 struct mm_struct *mm, unsigned long va)
  {
-@@ -1444,10 +1537,17 @@ static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)
- #ifdef CONFIG_X86_32
- static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
+@@ -1441,13 +1547,29 @@ static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)
+ }
+ #endif
+ 
+-#ifdef CONFIG_X86_32
+-static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
++static __init pte_t filter_pte(pte_t *ptep, pte_t pte)
  {
 -	/* If there's an existing pte, then don't allow _PAGE_RW to be set */
 -	if (pte_val_ma(*ptep) & _PAGE_PRESENT)
++#ifdef CONFIG_X86_32
 +	pte_t oldpte = *ptep;
++#endif
 +
++	if ((pte_flags(pte) & _PAGE_PRESENT) &&
++	    (pte_mfn(pte) == pte_invalid_mfn())) {
++		/* Don't allow pre-balloned mappings to be set */
++		pte = __pte_ma(0);
++	}
++
++#ifdef CONFIG_X86_32
 +	if (pte_flags(oldpte) & _PAGE_PRESENT) {
 +		/* Don't allow existing IO mappings to be overridden */
 +		if (pte_flags(oldpte) & _PAGE_IOMAP)
@@ -3530,10 +3983,24 @@ index 4ceb285..d4c1f78 100644
  		pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
  			       pte_val_ma(pte));
 +	}
++#endif
  
  	return pte;
  }
-@@ -1616,6 +1716,7 @@ static void *m2v(phys_addr_t maddr)
+@@ -1456,11 +1578,10 @@ static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
+    doesn't allow RO pagetable pages to be remapped RW */
+ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte)
+ {
+-	pte = mask_rw_pte(ptep, pte);
++	pte = filter_pte(ptep, pte);
+ 
+ 	xen_set_pte(ptep, pte);
+ }
+-#endif
+ 
+ static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
+ {
+@@ -1616,6 +1737,7 @@ static void *m2v(phys_addr_t maddr)
  	return __ka(m2p(maddr));
  }
  
@@ -3541,7 +4008,7 @@ index 4ceb285..d4c1f78 100644
  static void set_page_prot(void *addr, pgprot_t prot)
  {
  	unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
-@@ -1671,6 +1772,20 @@ static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
+@@ -1671,6 +1793,20 @@ static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
  	set_page_prot(pmd, PAGE_KERNEL_RO);
  }
  
@@ -3562,7 +4029,7 @@ index 4ceb285..d4c1f78 100644
  #ifdef CONFIG_X86_64
  static void convert_pfn_mfn(void *v)
  {
-@@ -1762,6 +1877,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+@@ -1762,6 +1898,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
  					 unsigned long max_pfn)
  {
  	pmd_t *kernel_pmd;
@@ -3570,7 +4037,7 @@ index 4ceb285..d4c1f78 100644
  
  	max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->pt_base) +
  				  xen_start_info->nr_pt_frames * PAGE_SIZE +
-@@ -1773,6 +1889,20 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+@@ -1773,6 +1910,20 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
  	xen_map_identity_early(level2_kernel_pgt, max_pfn);
  
  	memcpy(swapper_pg_dir, pgd, sizeof(pgd_t) * PTRS_PER_PGD);
@@ -3591,7 +4058,7 @@ index 4ceb285..d4c1f78 100644
  	set_pgd(&swapper_pg_dir[KERNEL_PGD_BOUNDARY],
  			__pgd(__pa(level2_kernel_pgt) | _PAGE_PRESENT));
  
-@@ -1824,9 +1954,25 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
+@@ -1824,9 +1975,25 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
  		pte = pfn_pte(phys, prot);
  		break;
  
@@ -3618,7 +4085,7 @@ index 4ceb285..d4c1f78 100644
  	}
  
  	__native_set_fixmap(idx, pte);
-@@ -1841,6 +1987,29 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
+@@ -1841,6 +2008,29 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
  #endif
  }
  
@@ -3648,7 +4115,19 @@ index 4ceb285..d4c1f78 100644
  __init void xen_post_allocator_init(void)
  {
  	pv_mmu_ops.set_pte = xen_set_pte;
-@@ -1955,6 +2124,271 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
+@@ -1906,11 +2096,7 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
+ 	.kmap_atomic_pte = xen_kmap_atomic_pte,
+ #endif
+ 
+-#ifdef CONFIG_X86_64
+-	.set_pte = xen_set_pte,
+-#else
+ 	.set_pte = xen_set_pte_init,
+-#endif
+ 	.set_pte_at = xen_set_pte_at,
+ 	.set_pmd = xen_set_pmd_hyper,
+ 
+@@ -1955,6 +2141,271 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
  };
  
  
@@ -4072,7 +4551,7 @@ index 0000000..07b59fe
 +	}
 +}
 diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
-index ad0047f..2439456 100644
+index ad0047f..c0304a1 100644
 --- a/arch/x86/xen/setup.c
 +++ b/arch/x86/xen/setup.c
 @@ -19,6 +19,7 @@
@@ -4083,15 +4562,19 @@ index ad0047f..2439456 100644
  #include <xen/interface/physdev.h>
  #include <xen/features.h>
  
-@@ -36,21 +37,62 @@ extern void xen_syscall32_target(void);
+@@ -36,21 +37,63 @@ extern void xen_syscall32_target(void);
  /**
   * machine_specific_memory_setup - Hook for machine specific memory setup.
   **/
 -
  char * __init xen_memory_setup(void)
  {
- 	unsigned long max_pfn = xen_start_info->nr_pages;
-+	unsigned long long mem_end;
+-	unsigned long max_pfn = xen_start_info->nr_pages;
+-
+-	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);
++	unsigned long nrpages = min(xen_start_info->nr_pages, MAX_DOMAIN_PAGES);
++	unsigned long long mem_limit = PFN_PHYS((u64)MAX_DOMAIN_PAGES);
++	unsigned long long mem_max = 0;
 +	int rc;
 +	struct xen_memory_map memmap;
 +	/*
@@ -4103,9 +4586,6 @@ index ad0047f..2439456 100644
 +		XENMEM_machine_memory_map :
 +		XENMEM_memory_map;
 +	int i;
- 
- 	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);
-+	mem_end = PFN_PHYS((u64)max_pfn);
 +
 +	memmap.nr_entries = E820MAX;
 +	set_xen_guest_handle(memmap.buffer, map);
@@ -4114,7 +4594,7 @@ index ad0047f..2439456 100644
 +	if (rc == -ENOSYS) {
 +		memmap.nr_entries = 1;
 +		map[0].addr = 0ULL;
-+		map[0].size = mem_end;
++		map[0].size = xen_start_info->nr_pages;
 +		/* 8MB slack (to balance backend allocations). */
 +		map[0].size += 8ULL << 20;
 +		map[0].type = E820_RAM;
@@ -4128,12 +4608,15 @@ index ad0047f..2439456 100644
 +	for (i = 0; i < memmap.nr_entries; i++) {
 +		unsigned long long end = map[i].addr + map[i].size;
 +		if (map[i].type == E820_RAM) {
-+			if (map[i].addr > mem_end)
++			if (map[i].addr > mem_limit)
 +				continue;
-+			if (end > mem_end) {
-+				/* Truncate region to max_mem. */
-+				map[i].size -= end - mem_end;
++			if (end > mem_limit) {
++				/* Truncate region to mem_limit. */
++				map[i].size -= end - mem_limit;
++				end = mem_limit;
 +			}
++			if (end > mem_max)
++				mem_max = end;
 +		}
 +		if (map[i].size > 0)
 +			e820_add_region(map[i].addr, map[i].size, map[i].type);
@@ -4149,7 +4632,19 @@ index ad0047f..2439456 100644
  	 */
  	e820_add_region(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS,
  			E820_RESERVED);
-@@ -188,7 +230,5 @@ void __init xen_arch_setup(void)
+@@ -65,6 +108,11 @@ char * __init xen_memory_setup(void)
+ 		      __pa(xen_start_info->pt_base),
+ 			"XEN START INFO");
+ 
++	/*
++	 * Reserve extra memory for the balloon driver.
++	 */
++	reserve_early(nrpages * PAGE_SIZE, mem_max, "XEN BALLOON");
++
+ 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+ 
+ 	return "Xen";
+@@ -188,7 +236,5 @@ void __init xen_arch_setup(void)
  
  	pm_idle = xen_idle;
  
@@ -4257,7 +4752,7 @@ index 0000000..1cd7f4d
 +	}
 +}
 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
-index 22494fd..96f7ee0 100644
+index 22494fd..012f6fc 100644
 --- a/arch/x86/xen/xen-ops.h
 +++ b/arch/x86/xen/xen-ops.h
 @@ -29,6 +29,7 @@ void xen_setup_machphys_mapping(void);
@@ -4268,7 +4763,15 @@ index 22494fd..96f7ee0 100644
  
  void xen_post_allocator_init(void);
  
-@@ -82,6 +83,23 @@ static inline void xen_uninit_lock_cpu(int cpu)
+@@ -40,6 +41,7 @@ void xen_enable_syscall(void);
+ void xen_vcpu_restore(void);
+ 
+ void __init xen_build_dynamic_phys_to_machine(void);
++void __init xen_fix_mfn_list(void);
+ 
+ void xen_init_irq_ops(void);
+ void xen_setup_timer(int cpu);
+@@ -82,6 +84,23 @@ static inline void xen_uninit_lock_cpu(int cpu)
  }
  #endif
  
@@ -4293,7 +4796,7 @@ index 22494fd..96f7ee0 100644
     inlineable */
  #define DECL_ASM(ret, name, ...)		\
 diff --git a/block/blk-core.c b/block/blk-core.c
-index 4b45435..48804b0 100644
+index e3299a7..5410d13 100644
 --- a/block/blk-core.c
 +++ b/block/blk-core.c
 @@ -438,6 +438,7 @@ void blk_put_queue(struct request_queue *q)
@@ -4304,7 +4807,7 @@ index 4b45435..48804b0 100644
  
  void blk_cleanup_queue(struct request_queue *q)
  {
-@@ -617,6 +618,7 @@ int blk_get_queue(struct request_queue *q)
+@@ -610,6 +611,7 @@ int blk_get_queue(struct request_queue *q)
  
  	return 1;
  }
@@ -4350,7 +4853,7 @@ index db307a3..c6d845c 100644
  		return_ACPI_STATUS(status);
  	}
 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 01574a0..c57e7b2 100644
+index 42159a2..e00b83b 100644
 --- a/drivers/acpi/sleep.c
 +++ b/drivers/acpi/sleep.c
 @@ -19,6 +19,8 @@
@@ -4633,10 +5136,10 @@ index eba999f..11071ed 100644
  
  void xen_raw_printk(const char *fmt, ...)
 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index c155bd3..fb433cb 100644
+index 5f6509a..6cd6859 100644
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2756,6 +2756,7 @@ source "drivers/s390/net/Kconfig"
+@@ -2763,6 +2763,7 @@ source "drivers/s390/net/Kconfig"
  config XEN_NETDEV_FRONTEND
  	tristate "Xen network device frontend driver"
  	depends on XEN
@@ -5060,10 +5563,10 @@ index cab100a..3b1c421 100644
 +       depends on XEN_DOM0 && ACPI
 \ No newline at end of file
 diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
-index ec2a39b..386c775 100644
+index ec2a39b..7ff6d27 100644
 --- a/drivers/xen/Makefile
 +++ b/drivers/xen/Makefile
-@@ -1,9 +1,12 @@
+@@ -1,9 +1,13 @@
 -obj-y	+= grant-table.o features.o events.o manage.o
 +obj-y	+= grant-table.o features.o events.o manage.o biomerge.o
  obj-y	+= xenbus/
@@ -5075,6 +5578,7 @@ index ec2a39b..386c775 100644
 -obj-$(CONFIG_XENFS)		+= xenfs/
 -obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 \ No newline at end of file
++obj-$(CONFIG_PCI)			+= pci.o
 +obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
 +obj-$(CONFIG_XEN_XENCOMM)		+= xencomm.o
 +obj-$(CONFIG_XEN_BALLOON)		+= balloon.o
@@ -5115,10 +5619,18 @@ index 0000000..e6d3d0e
 +	return HYPERVISOR_dom0_op(&op);
 +}
 diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
-index f5bbd9e..bfe1fa3 100644
+index f5bbd9e..168e61f 100644
 --- a/drivers/xen/balloon.c
 +++ b/drivers/xen/balloon.c
-@@ -66,8 +66,6 @@ struct balloon_stats {
+@@ -43,6 +43,7 @@
+ #include <linux/mutex.h>
+ #include <linux/list.h>
+ #include <linux/sysdev.h>
++#include <linux/swap.h>
+ 
+ #include <asm/page.h>
+ #include <asm/pgalloc.h>
+@@ -66,8 +67,6 @@ struct balloon_stats {
  	/* We aim for 'current allocation' == 'target allocation'. */
  	unsigned long current_pages;
  	unsigned long target_pages;
@@ -5127,7 +5639,7 @@ index f5bbd9e..bfe1fa3 100644
  	/*
  	 * Drivers may alter the memory reservation independently, but they
  	 * must inform the balloon driver so we avoid hitting the hard limit.
-@@ -84,13 +82,6 @@ static struct sys_device balloon_sysdev;
+@@ -84,21 +83,11 @@ static struct sys_device balloon_sysdev;
  
  static int register_balloon(struct sys_device *sysdev);
  
@@ -5141,7 +5653,33 @@ index f5bbd9e..bfe1fa3 100644
  static struct balloon_stats balloon_stats;
  
  /* We increase/decrease in batches which fit in a page */
-@@ -185,7 +176,7 @@ static void balloon_alarm(unsigned long unused)
+ static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
+ 
+-/* VM /proc information for memory */
+-extern unsigned long totalram_pages;
+-
+ #ifdef CONFIG_HIGHMEM
+ extern unsigned long totalhigh_pages;
+ #define inc_totalhigh_pages() (totalhigh_pages++)
+@@ -140,6 +129,8 @@ static void balloon_append(struct page *page)
+ 		list_add(&page->lru, &ballooned_pages);
+ 		balloon_stats.balloon_low++;
+ 	}
++
++	totalram_pages--;
+ }
+ 
+ /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */
+@@ -160,6 +151,8 @@ static struct page *balloon_retrieve(void)
+ 	else
+ 		balloon_stats.balloon_low--;
+ 
++	totalram_pages++;
++
+ 	return page;
+ }
+ 
+@@ -185,7 +178,7 @@ static void balloon_alarm(unsigned long unused)
  
  static unsigned long current_target(void)
  {
@@ -5150,7 +5688,7 @@ index f5bbd9e..bfe1fa3 100644
  
  	target = min(target,
  		     balloon_stats.current_pages +
-@@ -209,7 +200,7 @@ static int increase_reservation(unsigned long nr_pages)
+@@ -209,7 +202,7 @@ static int increase_reservation(unsigned long nr_pages)
  	if (nr_pages > ARRAY_SIZE(frame_list))
  		nr_pages = ARRAY_SIZE(frame_list);
  
@@ -5159,7 +5697,7 @@ index f5bbd9e..bfe1fa3 100644
  
  	page = balloon_first_page();
  	for (i = 0; i < nr_pages; i++) {
-@@ -221,23 +212,10 @@ static int increase_reservation(unsigned long nr_pages)
+@@ -221,23 +214,10 @@ static int increase_reservation(unsigned long nr_pages)
  	set_xen_guest_handle(reservation.extent_start, frame_list);
  	reservation.nr_extents = nr_pages;
  	rc = HYPERVISOR_memory_op(XENMEM_populate_physmap, &reservation);
@@ -5185,13 +5723,13 @@ index f5bbd9e..bfe1fa3 100644
  		page = balloon_retrieve();
  		BUG_ON(page == NULL);
  
-@@ -263,13 +241,13 @@ static int increase_reservation(unsigned long nr_pages)
+@@ -263,13 +243,12 @@ static int increase_reservation(unsigned long nr_pages)
  		__free_page(page);
  	}
  
 -	balloon_stats.current_pages += nr_pages;
+-	totalram_pages = balloon_stats.current_pages;
 +	balloon_stats.current_pages += rc;
- 	totalram_pages = balloon_stats.current_pages;
  
   out:
 -	spin_unlock_irqrestore(&balloon_lock, flags);
@@ -5202,7 +5740,7 @@ index f5bbd9e..bfe1fa3 100644
  }
  
  static int decrease_reservation(unsigned long nr_pages)
-@@ -312,7 +290,7 @@ static int decrease_reservation(unsigned long nr_pages)
+@@ -312,7 +291,7 @@ static int decrease_reservation(unsigned long nr_pages)
  	kmap_flush_unused();
  	flush_tlb_all();
  
@@ -5211,9 +5749,11 @@ index f5bbd9e..bfe1fa3 100644
  
  	/* No more mappings: invalidate P2M and add to balloon. */
  	for (i = 0; i < nr_pages; i++) {
-@@ -329,7 +307,7 @@ static int decrease_reservation(unsigned long nr_pages)
+@@ -327,9 +306,8 @@ static int decrease_reservation(unsigned long nr_pages)
+ 	BUG_ON(ret != nr_pages);
+ 
  	balloon_stats.current_pages -= nr_pages;
- 	totalram_pages = balloon_stats.current_pages;
+-	totalram_pages = balloon_stats.current_pages;
  
 -	spin_unlock_irqrestore(&balloon_lock, flags);
 +	spin_unlock_irqrestore(&xen_reservation_lock, flags);
@@ -5228,7 +5768,12 @@ index f5bbd9e..bfe1fa3 100644
  	balloon_stats.target_pages = target;
  	schedule_work(&balloon_worker);
  }
-@@ -431,7 +408,6 @@ static int __init balloon_init(void)
+@@ -426,12 +403,10 @@ static int __init balloon_init(void)
+ 	pr_info("xen_balloon: Initialising balloon driver.\n");
+ 
+ 	balloon_stats.current_pages = min(xen_start_info->nr_pages, max_pfn);
+-	totalram_pages   = balloon_stats.current_pages;
+ 	balloon_stats.target_pages  = balloon_stats.current_pages;
  	balloon_stats.balloon_low   = 0;
  	balloon_stats.balloon_high  = 0;
  	balloon_stats.driver_pages  = 0UL;
@@ -5236,7 +5781,17 @@ index f5bbd9e..bfe1fa3 100644
  
  	init_timer(&balloon_timer);
  	balloon_timer.data = 0;
-@@ -464,6 +440,101 @@ static void balloon_exit(void)
+@@ -442,8 +417,7 @@ static int __init balloon_init(void)
+ 	/* Initialise the balloon with excess memory space. */
+ 	for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
+ 		page = pfn_to_page(pfn);
+-		if (!PageReserved(page))
+-			balloon_append(page);
++		balloon_append(page);
+ 	}
+ 
+ 	target_watch.callback = watch_target;
+@@ -464,6 +438,101 @@ static void balloon_exit(void)
  
  module_exit(balloon_exit);
  
@@ -5338,7 +5893,7 @@ index f5bbd9e..bfe1fa3 100644
  #define BALLOON_SHOW(name, format, args...)				\
  	static ssize_t show_##name(struct sys_device *dev,		\
  				   struct sysdev_attribute *attr,	\
-@@ -476,9 +547,6 @@ module_exit(balloon_exit);
+@@ -476,9 +545,6 @@ module_exit(balloon_exit);
  BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(balloon_stats.current_pages));
  BALLOON_SHOW(low_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_low));
  BALLOON_SHOW(high_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_high));
@@ -5348,7 +5903,7 @@ index f5bbd9e..bfe1fa3 100644
  BALLOON_SHOW(driver_kb, "%lu\n", PAGES2KB(balloon_stats.driver_pages));
  
  static ssize_t show_target_kb(struct sys_device *dev, struct sysdev_attribute *attr,
-@@ -548,7 +616,6 @@ static struct attribute *balloon_info_attrs[] = {
+@@ -548,7 +614,6 @@ static struct attribute *balloon_info_attrs[] = {
  	&attr_current_kb.attr,
  	&attr_low_kb.attr,
  	&attr_high_kb.attr,
@@ -10210,6 +10765,128 @@ index 0000000..a492288
 +	printk(KERN_CRIT "registering netback\n");
 +	(void)xenbus_register_backend(&netback);
 +}
+diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
+new file mode 100644
+index 0000000..b13e054
+--- /dev/null
++++ b/drivers/xen/pci.c
+@@ -0,0 +1,116 @@
++/*
++ * Copyright (c) 2009, Intel Corporation.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions of the GNU General Public License,
++ * version 2, as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope 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.
++ *
++ * Author: Weidong Han <weidong.han at intel.com>
++ */
++
++#include <linux/pci.h>
++#include <xen/interface/physdev.h>
++#include <asm/xen/hypercall.h>
++#include "../pci/pci.h"
++
++
++#ifdef CONFIG_PCI_IOV
++#define HANDLE_PCI_IOV	1
++#else
++#define HANDLE_PCI_IOV	0
++#endif
++
++static int xen_add_device(struct device *dev)
++{
++	int r;
++	struct pci_dev *pci_dev = to_pci_dev(dev);
++
++	if (HANDLE_PCI_IOV && pci_dev->is_virtfn) {
++		struct physdev_manage_pci_ext manage_pci_ext = {
++			.bus		= pci_dev->bus->number,
++			.devfn		= pci_dev->devfn,
++			.is_virtfn 	= 1,
++#ifdef CONFIG_PCI_IOV
++			.physfn.bus	= pci_dev->physfn->bus->number,
++			.physfn.devfn	= pci_dev->physfn->devfn,
++#endif
++		};
++
++		r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
++			&manage_pci_ext);
++	} else if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
++		struct physdev_manage_pci_ext manage_pci_ext = {
++			.bus		= pci_dev->bus->number,
++			.devfn		= pci_dev->devfn,
++			.is_extfn	= 1,
++		};
++
++		r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
++			&manage_pci_ext);
++	} else {
++		struct physdev_manage_pci manage_pci = {
++			.bus 	= pci_dev->bus->number,
++			.devfn	= pci_dev->devfn,
++		};
++
++		r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add,
++			&manage_pci);
++	}
++
++	return r;
++}
++
++static int xen_remove_device(struct device *dev)
++{
++	int r;
++	struct pci_dev *pci_dev = to_pci_dev(dev);
++	struct physdev_manage_pci manage_pci;
++
++	manage_pci.bus = pci_dev->bus->number;
++	manage_pci.devfn = pci_dev->devfn;
++
++	r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove,
++		&manage_pci);
++
++	return r;
++}
++
++static int xen_pci_notifier(struct notifier_block *nb,
++			    unsigned long action, void *data)
++{
++	struct device *dev = data;
++	int r = 0;
++
++	switch (action) {
++	case BUS_NOTIFY_ADD_DEVICE:
++		r = xen_add_device(dev);
++		break;
++	case BUS_NOTIFY_DEL_DEVICE:
++		r = xen_remove_device(dev);
++		break;
++	default:
++		break;
++	}
++
++	return r;
++}
++
++struct notifier_block device_nb = {
++	.notifier_call = xen_pci_notifier,
++};
++
++static int __init register_xen_pci_notifier(void)
++{
++	return bus_register_notifier(&pci_bus_type, &device_nb);
++}
++
++fs_initcall(register_xen_pci_notifier);
 diff --git a/drivers/xen/xenbus/Makefile b/drivers/xen/xenbus/Makefile
 index 5571f5b..8dca685 100644
 --- a/drivers/xen/xenbus/Makefile
@@ -12121,10 +12798,10 @@ index b4326b5..bad75d1 100644
  #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
  static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 2721f07..99264c3 100644
+index 35e7df1..c7277ce 100644
 --- a/include/linux/interrupt.h
 +++ b/include/linux/interrupt.h
-@@ -58,6 +58,7 @@
+@@ -59,6 +59,7 @@
  #define IRQF_PERCPU		0x00000400
  #define IRQF_NOBALANCING	0x00000800
  #define IRQF_IRQPOLL		0x00001000
@@ -12645,6 +13322,38 @@ index af36ead..eac3ce1 100644
 + */
 +extern spinlock_t xen_reservation_lock;
  #endif /* __XEN_PUBLIC_MEMORY_H__ */
+diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h
+index cd69391..7a7d007 100644
+--- a/include/xen/interface/physdev.h
++++ b/include/xen/interface/physdev.h
+@@ -106,6 +106,27 @@ struct physdev_irq {
+ 	uint32_t vector;
+ };
+ 
++#define PHYSDEVOP_manage_pci_add	15
++#define PHYSDEVOP_manage_pci_remove	16
++struct physdev_manage_pci {
++	/* IN */
++	uint8_t bus;
++	uint8_t devfn;
++};
++
++#define PHYSDEVOP_manage_pci_add_ext	20
++struct physdev_manage_pci_ext {
++	/* IN */
++	uint8_t bus;
++	uint8_t devfn;
++	unsigned is_extfn;
++	unsigned is_virtfn;
++	struct {
++		uint8_t bus;
++		uint8_t devfn;
++	} physfn;
++};
++
+ /*
+  * Argument to physdev_op_compat() hypercall. Superceded by new physdev_op()
+  * hypercall since 0x00030202.
 diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h
 new file mode 100644
 index 0000000..83e4714
@@ -13085,10 +13794,10 @@ index b9763ba..542ca7c 100644
  	int (*read_otherend_details)(struct xenbus_device *dev);
  	int (*is_ready)(struct xenbus_device *dev);
 diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 50da676..3dc4e74 100644
+index 61c679d..c077438 100644
 --- a/kernel/irq/manage.c
 +++ b/kernel/irq/manage.c
-@@ -192,7 +192,8 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc)
+@@ -200,7 +200,8 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc)
  void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
  {
  	if (suspend) {
@@ -13127,7 +13836,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 caa9268..1f29611 100644
+index d052abb..087cbf5 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)
@@ -13144,7 +13853,7 @@ index caa9268..1f29611 100644
  	if (!PageHighMem(page)) {
  		debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
  		debug_check_no_obj_freed(page_address(page),
-@@ -1025,6 +1032,13 @@ static void free_hot_cold_page(struct page *page, int cold)
+@@ -1028,6 +1035,13 @@ static void free_hot_cold_page(struct page *page, int cold)
  
  	kmemcheck_free_shadow(page, 0);
  

xen.pvops.post.patch:
 arch/x86/kernel/cpu/Makefile                 |    2 ++
 b/arch/x86/include/asm/paravirt_types.h      |    3 +++
 b/arch/x86/kernel/process_32.c               |    2 ++
 b/arch/x86/pci/common.c                      |   16 ++++++++++++++++
 drivers/pci/pci.h                            |    2 ++
 linux-2.6.29.x86_64/arch/x86/xen/Makefile    |    4 ++++
 linux-2.6.29.x86_64/arch/x86/xen/enlighten.c |    2 +-
 linux-2.6.29.x86_64/drivers/xen/Makefile     |    3 +++
 8 files changed, 33 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.18
retrieving revision 1.1.2.19
diff -u -p -r1.1.2.18 -r1.1.2.19
--- xen.pvops.post.patch	27 Jun 2009 11:05:24 -0000	1.1.2.18
+++ xen.pvops.post.patch	8 Aug 2009 18:06:06 -0000	1.1.2.19
@@ -49,7 +49,6 @@ index 2202b62..f371fe8 100644
  		pci_cache_line_size = 64 >> 2;  /* K7 & K8 */
  	else if (c->x86 > 6 && c->x86_vendor == X86_VENDOR_INTEL)
  		pci_cache_line_size = 128 >> 2;	/* P4 */
-+
 +	if (c->x86_clflush_size != (pci_cache_line_size <<2))
 +		printk(KERN_DEBUG "PCI: old code would have set cacheline "
 +			"size to %d bytes, but clflush_size = %d\n",
@@ -60,11 +59,12 @@ index 2202b62..f371fe8 100644
 +	if (c->x86_clflush_size > 0) {
 +		pci_cache_line_size = c->x86_clflush_size >> 2;
 +		printk(KERN_DEBUG "PCI: pci_cache_line_size set to %d bytes\n",
-+			pci_cache_line_size >> 2);
++			pci_cache_line_size << 2);
 +	} else {
 +		pci_cache_line_size = 32 >> 2;
 +		printk(KERN_DEBUG "PCI: Unknown cacheline size. Setting to 32 bytes\n");
 +	}
++
  }
  
  int __init pcibios_init(void)

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 ----------------
 drivers/pci/pci.h                 |    2 --
 4 files changed, 1 insertion(+), 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.14
retrieving revision 1.1.2.15
diff -u -p -r1.1.2.14 -r1.1.2.15
--- xen.pvops.pre.patch	27 Jun 2009 11:05:24 -0000	1.1.2.14
+++ xen.pvops.pre.patch	8 Aug 2009 18:06:06 -0000	1.1.2.15
@@ -2,7 +2,6 @@ temporarily revert various Fedora change
 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
 
 --- 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
@@ -64,7 +63,7 @@ index 2202b62..f371fe8 100644
 -	if (c->x86_clflush_size > 0) {
 -		pci_cache_line_size = c->x86_clflush_size >> 2;
 -		printk(KERN_DEBUG "PCI: pci_cache_line_size set to %d bytes\n",
--			pci_cache_line_size >> 2);
+-			pci_cache_line_size << 2);
 -	} else {
 -		pci_cache_line_size = 32 >> 2;
 -		printk(KERN_DEBUG "PCI: Unknown cacheline size. Setting to 32 bytes\n");



From cweyl at fedoraproject.org  Sat Aug  8 18:08:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:08:03 +0000 (UTC)
Subject: rpms/perl-Catalyst-Action-RenderView/devel
	perl-Catalyst-Action-RenderView.spec, 1.11, 1.12
Message-ID: <20090808180803.921AE11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11288

Modified Files:
	perl-Catalyst-Action-RenderView.spec 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-2
- drop req on Test::More; open RT#48537
- switch to more compact filtering (until we have perl_default_filter)
- auto-update to 0.11 (by cpan-spec-update 0.01)
- added a new br on CPAN (inc::Module::AutoInstall found)



Index: perl-Catalyst-Action-RenderView.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Action-RenderView/devel/perl-Catalyst-Action-RenderView.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Catalyst-Action-RenderView.spec	8 Aug 2009 06:04:02 -0000	1.11
+++ perl-Catalyst-Action-RenderView.spec	8 Aug 2009 18:08:03 -0000	1.12
@@ -1,7 +1,7 @@
 Name:           perl-Catalyst-Action-RenderView
 Version:        0.11
-Release:        1%{?dist}
-Summary:        Sensible default end action for view renders
+Release:        2%{?dist}
+Summary:        Sensible default end action for view rendering
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Action-RenderView/
@@ -14,6 +14,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 # core
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(CPAN)
 # cpan
 BuildRequires:  perl(Catalyst) >= 5.7
 BuildRequires:  perl(Catalyst::Runtime) >= 5.70
@@ -21,17 +22,22 @@ BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Data::Visitor) >= 0.24
 # test
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(HTTP::Request::AsCGI)
 
 # use base
 Requires:       perl(Catalyst::Action)
 
-### auto-added reqs!
-Requires:  perl(Catalyst::Runtime) >= 5.70
-Requires:  perl(Data::Visitor) >= 0.24
-Requires:  perl(MRO::Compat)
-Requires:  perl(Test::More)
+Requires:       perl(Catalyst::Runtime) >= 5.70
+Requires:       perl(Data::Visitor) >= 0.24
+Requires:       perl(MRO::Compat)
+
+# don't "provide" private Perl libs; or things from _docdir
+%global _use_internal_dependency_generator 0
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
+%global __find_provides /bin/sh -c "%{__grep} -v '%_docdir' | %{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
+%global __find_requires /bin/sh -c "%{__grep} -v '%_docdir' | %{__deploop R}"
 
 %description
 This action implements a sensible default end action, which will forward to
@@ -45,29 +51,8 @@ to force a debug screen, while in debug 
 # allow the pod syntax test to be invoked distinct from the pod coverage test
 %patch1
 
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(TestApp.*)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Catalyst-Action-RenderView-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-
-# Filter unwanted Requires:  (may as well keep rpmlint happy)
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(strict)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Catalyst-Action-RenderView-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 # correct line encoding and an errant interperter setting
-find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|; s/\r//' {} +
+find t/ -type f -exec perl -pi -e 's|^#!perl|#!%{__perl}|; s/\r//' {} +
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -97,6 +82,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-2
+- drop req on Test::More; open RT#48537
+- switch to more compact filtering (until we have perl_default_filter)
+- auto-update to 0.11 (by cpan-spec-update 0.01)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11-1
 - auto-update to 0.11 (by cpan-spec-update 0.01)
 - added a new req on perl(Catalyst::Runtime) (version 5.70)



From cweyl at fedoraproject.org  Sat Aug  8 18:31:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:31:46 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.11, 1.12
Message-ID: <20090808183146.85D5B11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16239

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-2
- add BR on parent (and open RT#48547)



Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Catalyst-Plugin-ConfigLoader.spec	8 Aug 2009 06:41:13 -0000	1.11
+++ perl-Catalyst-Plugin-ConfigLoader.spec	8 Aug 2009 18:31:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
 Version:        0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,15 +11,17 @@ BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(Test::More)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Test::More)
 # cpan
 BuildRequires:  perl(Catalyst)
 BuildRequires:  perl(Config::Any) >= 0.08
 BuildRequires:  perl(Data::Visitor) >= 0.24
 BuildRequires:  perl(MRO::Compat) >= 0.09
 # test
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(parent)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 Requires:       perl(Catalyst)
 
@@ -27,10 +29,10 @@ Requires:       perl(Catalyst)
 BuildRequires:  perl(Catalyst::Runtime) >= 5.7008
 
 ### auto-added reqs!
-Requires:  perl(Catalyst::Runtime) >= 5.7008
-Requires:  perl(Config::Any) >= 0.08
-Requires:  perl(Data::Visitor) >= 0.24
-Requires:  perl(MRO::Compat) >= 0.09
+Requires:       perl(Catalyst::Runtime) >= 5.7008
+Requires:       perl(Config::Any) >= 0.08
+Requires:       perl(Data::Visitor) >= 0.24
+Requires:       perl(MRO::Compat) >= 0.09
 
 %description
 This module will attempt to load find and load a configuration file of
@@ -66,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-2
+- add BR on parent (and open RT#48547)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
 - auto-update to 0.25 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)



From cweyl at fedoraproject.org  Sat Aug  8 18:34:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:34:13 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/devel
	perl-Catalyst-Plugin-Authentication.spec, 1.11, 1.12
Message-ID: <20090808183413.BAB8E11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16930

Modified Files:
	perl-Catalyst-Plugin-Authentication.spec 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10013-2
- auto-update to 0.10013 (by cpan-spec-update 0.01)
- added a new br on CPAN (inc::Module::AutoInstall found)



Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Catalyst-Plugin-Authentication.spec	8 Aug 2009 06:39:52 -0000	1.11
+++ perl-Catalyst-Plugin-Authentication.spec	8 Aug 2009 18:34:13 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Authentication
 Version:        0.10013
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -35,6 +35,9 @@ Requires:       perl(MRO::Compat)
 %global __find_provides /bin/sh -c "%{__grep} -v '%_docdir' | %{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}"
 %global __find_requires /bin/sh -c "%{__grep} -v '%_docdir' | %{__deploop R}"
 
+### auto-added brs!
+BuildRequires:  perl(CPAN)
+
 %description
 The authentication plugin provides generic user support for Catalyst apps.
 It is the basis for both authentication (checking the user is who they
@@ -73,6 +76,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10013-2
+- auto-update to 0.10013 (by cpan-spec-update 0.01)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10013-1
 - auto-update to 0.10013 (by cpan-spec-update 0.01)
 



From cweyl at fedoraproject.org  Sat Aug  8 18:53:05 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:53:05 +0000 (UTC)
Subject: rpms/perl-App-Cache/devel .cvsignore, 1.2, 1.3 perl-App-Cache.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090808185305.D992A11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22129

Modified Files:
	.cvsignore perl-App-Cache.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.36-1
- auto-update to 0.36 (by cpan-spec-update 0.01)
- added a new req on perl(File::Find::Rule) (version 0)
- added a new req on perl(File::HomeDir) (version 0)
- added a new req on perl(File::stat) (version 0)
- added a new req on perl(HTTP::Cookies) (version 0)
- added a new req on perl(LWP::UserAgent) (version 0)
- added a new req on perl(Path::Class) (version 0)
- added a new req on perl(Storable) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cache/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Mar 2009 20:37:58 -0000	1.2
+++ .cvsignore	8 Aug 2009 18:53:05 -0000	1.3
@@ -1 +1 @@
-App-Cache-0.35.tar.gz
+App-Cache-0.36.tar.gz


Index: perl-App-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cache/devel/perl-App-Cache.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-App-Cache.spec	26 Jul 2009 01:40:42 -0000	1.2
+++ perl-App-Cache.spec	8 Aug 2009 18:53:05 -0000	1.3
@@ -1,13 +1,13 @@
-Name:       perl-App-Cache 
-Version:    0.35 
-Release:    2%{?dist}
+Name:       perl-App-Cache
+Version:    0.36
+Release:    1%{?dist}
 # lib/App/Cache.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Easy application-level caching 
-Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz 
+Summary:    Easy application-level caching
+Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/App-Cache
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -28,6 +28,15 @@ BuildRequires: perl(Test::Pod::Coverage)
 # 'use base' strikes again...
 Requires:      perl(Class::Accessor::Chained::Fast)
 
+### auto-added reqs!
+Requires:       perl(File::Find::Rule)
+Requires:       perl(File::HomeDir)
+Requires:       perl(File::stat)
+Requires:       perl(HTTP::Cookies)
+Requires:       perl(LWP::UserAgent)
+Requires:       perl(Path::Class)
+Requires:       perl(Storable)
+
 %description
 The App::Cache module lets an application cache data locally. There are a
 few times an application would need to cache data: when it is retrieving
@@ -35,10 +44,10 @@ information from the network or when it 
 For example, the Parse::BACKPAN::Packages module downloads a file off the
 net and parses it, creating a data structure. Only then can it actually
 provide any useful information for the programmer. Parse::BACKPAN::Packages
-uses App::Cache to cache both the file download and data structures, 
+uses App::Cache to cache both the file download and data structures,
 providing much faster use when the data is cached. This module stores data
-in the home directory of the user, in a dot directory. For example, the 
-Parse::BACKPAN::Packages cache is actually stored underneath 
+in the home directory of the user, in a dot directory. For example, the
+Parse::BACKPAN::Packages cache is actually stored underneath
 "~/.parse_backpan_packages/cache/". This is so that permisssions are not a
 problem -- it is a per-user, per-application cache.
 
@@ -62,15 +71,25 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README 
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.36-1
+- auto-update to 0.36 (by cpan-spec-update 0.01)
+- added a new req on perl(File::Find::Rule) (version 0)
+- added a new req on perl(File::HomeDir) (version 0)
+- added a new req on perl(File::stat) (version 0)
+- added a new req on perl(HTTP::Cookies) (version 0)
+- added a new req on perl(LWP::UserAgent) (version 0)
+- added a new req on perl(Path::Class) (version 0)
+- added a new req on perl(Storable) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -80,4 +99,3 @@ rm -rf %{buildroot} 
 * Thu Mar 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cache/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Mar 2009 20:37:58 -0000	1.2
+++ sources	8 Aug 2009 18:53:05 -0000	1.3
@@ -1 +1 @@
-3483ed94401531d16ceab63d57b8da6e  App-Cache-0.35.tar.gz
+9ad0fbe89b953219f89057e55171cca8  App-Cache-0.36.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 18:54:55 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:54:55 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/F-11
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090808185455.A557B11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22607

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-2
- add BR on parent (and open RT#48547)



Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-11/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Plugin-ConfigLoader.spec	26 Feb 2009 12:17:25 -0000	1.8
+++ perl-Catalyst-Plugin-ConfigLoader.spec	8 Aug 2009 18:54:55 -0000	1.9
@@ -1,28 +1,39 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.22
+Version:        0.25
 Release:        2%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-ConfigLoader/
-Source0:        http://www.cpan.org/authors/id/B/BR/BRICAS/Catalyst-Plugin-ConfigLoader-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/Catalyst-Plugin-ConfigLoader-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(Test::More)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Test::More)
 # cpan
 BuildRequires:  perl(Catalyst)
-BuildRequires:  perl(Config::Any) >= 0.04
-BuildRequires:  perl(Data::Visitor) >= 0.02
+BuildRequires:  perl(Config::Any) >= 0.08
+BuildRequires:  perl(Data::Visitor) >= 0.24
 BuildRequires:  perl(MRO::Compat) >= 0.09
-# test 
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+# test
+BuildRequires:  perl(parent)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 Requires:       perl(Catalyst)
 
+### auto-added brs!
+BuildRequires:  perl(Catalyst::Runtime) >= 5.7008
+
+### auto-added reqs!
+Requires:       perl(Catalyst::Runtime) >= 5.7008
+Requires:       perl(Config::Any) >= 0.08
+Requires:       perl(Data::Visitor) >= 0.24
+Requires:       perl(MRO::Compat) >= 0.09
+
 %description
 This module will attempt to load find and load a configuration file of
 various types. Currently it supports YAML, JSON, XML, INI and Perl formats.
@@ -57,6 +68,26 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-2
+- add BR on parent (and open RT#48547)
+
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
+- auto-update to 0.25 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(Catalyst::Runtime) (version 5.7008)
+- added a new req on perl(Config::Any) (version 0.08)
+- added a new req on perl(Data::Visitor) (version 0.24)
+- added a new req on perl(MRO::Compat) (version 0.09)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.23-1
+- auto-update to 0.23 (by cpan-spec-update 0.01)
+- added a new br on perl(Catalyst::Runtime) (version 5.7008)
+- altered br on perl(Config::Any) (0.04 => 0.08)
+- altered br on perl(Data::Visitor) (0.02 => 0.24)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Jan 2009 23:16:38 -0000	1.5
+++ sources	8 Aug 2009 18:54:55 -0000	1.6
@@ -1 +1 @@
-add762f2be35c9da2b6a61b4bc367588  Catalyst-Plugin-ConfigLoader-0.22.tar.gz
+d6ad7bd4d7ae010d1e310d4de3518b9b  Catalyst-Plugin-ConfigLoader-0.25.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 18:56:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:56:24 +0000 (UTC)
Subject: rpms/perl-App-Cmd/devel .cvsignore, 1.3, 1.4 perl-App-Cmd.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090808185624.BEE9A11C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23024

Modified Files:
	.cvsignore perl-App-Cmd.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
- auto-update to 0.204 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new req on perl(Getopt::Long::Descriptive) (version 0.06)
- added a new req on perl(Module::Pluggable::Object) (version 0)
- added a new req on perl(Sub::Exporter) (version 0.975)
- added a new req on perl(Sub::Install) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Feb 2009 01:07:14 -0000	1.3
+++ .cvsignore	8 Aug 2009 18:56:24 -0000	1.4
@@ -1 +1 @@
-App-Cmd-0.203.tar.gz
+App-Cmd-0.204.tar.gz


Index: perl-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/perl-App-Cmd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-App-Cmd.spec	26 Jul 2009 01:41:05 -0000	1.6
+++ perl-App-Cmd.spec	8 Aug 2009 18:56:24 -0000	1.7
@@ -1,18 +1,17 @@
-
-Name:       perl-App-Cmd 
-Version:        0.203
-Release:        3%{?dist}
+Name:       perl-App-Cmd
+Version:    0.204
+Release:    1%{?dist}
 # see lib/App/Cmd.pm
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Write command line apps with less suffering 
-Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-%{version}.tar.gz 
+Summary:    Write command line apps with less suffering
+Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/App-Cmd
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
-BuildRequires: perl(ExtUtils::MakeMaker) 
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires: perl(Getopt::Long::Descriptive) >= 0.06
 BuildRequires: perl(IO::TieCombine) >= 1
 BuildRequires: perl(Module::Pluggable::Object)
@@ -20,6 +19,12 @@ BuildRequires: perl(Sub::Exporter) >= 0.
 BuildRequires: perl(Sub::Install)
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(Getopt::Long::Descriptive) >= 0.06
+Requires:       perl(Module::Pluggable::Object)
+Requires:       perl(Sub::Exporter) >= 0.975
+Requires:       perl(Sub::Install)
+
 %description
 App::Cmd is intended to make it easy to write complex command-line
 applications without having to think about most of the annoying things
@@ -30,7 +35,7 @@ For information on how to start using Ap
 %prep
 %setup -q -n App-Cmd-%{version}
 
-perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t
+perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 
 # make sure doc/tests don't generate provides
 # note we first filter out the bits in _docdir...
@@ -68,15 +73,23 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README t/ 
+%doc Changes LICENSE README t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
+- auto-update to 0.204 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(Getopt::Long::Descriptive) (version 0.06)
+- added a new req on perl(Module::Pluggable::Object) (version 0)
+- added a new req on perl(Sub::Exporter) (version 0.975)
+- added a new req on perl(Sub::Install) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.203-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -98,4 +111,3 @@ rm -rf %{buildroot} 
 * Mon Oct 27 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.202-0.1
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 01:07:15 -0000	1.3
+++ sources	8 Aug 2009 18:56:24 -0000	1.4
@@ -1 +1 @@
-285a338f65f062018b1f12b875d90505  App-Cmd-0.203.tar.gz
+779f2a6291f794b449767db600c40f27  App-Cmd-0.204.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 18:57:14 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 18:57:14 +0000 (UTC)
Subject: rpms/perl-App-Cache/F-11 perl-App-Cache.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090808185714.581A511C0425@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23307

Modified Files:
	perl-App-Cache.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.36-1
- auto-update to 0.36 (by cpan-spec-update 0.01)
- added a new req on perl(File::Find::Rule) (version 0)
- added a new req on perl(File::HomeDir) (version 0)
- added a new req on perl(File::stat) (version 0)
- added a new req on perl(HTTP::Cookies) (version 0)
- added a new req on perl(LWP::UserAgent) (version 0)
- added a new req on perl(Path::Class) (version 0)
- added a new req on perl(Storable) (version 0)



Index: perl-App-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cache/F-11/perl-App-Cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-App-Cache.spec	7 Mar 2009 20:37:58 -0000	1.1
+++ perl-App-Cache.spec	8 Aug 2009 18:57:13 -0000	1.2
@@ -1,13 +1,13 @@
-Name:       perl-App-Cache 
-Version:    0.35 
+Name:       perl-App-Cache
+Version:    0.36
 Release:    1%{?dist}
 # lib/App/Cache.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Easy application-level caching 
-Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz 
+Summary:    Easy application-level caching
+Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/App-Cache-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/App-Cache
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -28,6 +28,15 @@ BuildRequires: perl(Test::Pod::Coverage)
 # 'use base' strikes again...
 Requires:      perl(Class::Accessor::Chained::Fast)
 
+### auto-added reqs!
+Requires:       perl(File::Find::Rule)
+Requires:       perl(File::HomeDir)
+Requires:       perl(File::stat)
+Requires:       perl(HTTP::Cookies)
+Requires:       perl(LWP::UserAgent)
+Requires:       perl(Path::Class)
+Requires:       perl(Storable)
+
 %description
 The App::Cache module lets an application cache data locally. There are a
 few times an application would need to cache data: when it is retrieving
@@ -35,10 +44,10 @@ information from the network or when it 
 For example, the Parse::BACKPAN::Packages module downloads a file off the
 net and parses it, creating a data structure. Only then can it actually
 provide any useful information for the programmer. Parse::BACKPAN::Packages
-uses App::Cache to cache both the file download and data structures, 
+uses App::Cache to cache both the file download and data structures,
 providing much faster use when the data is cached. This module stores data
-in the home directory of the user, in a dot directory. For example, the 
-Parse::BACKPAN::Packages cache is actually stored underneath 
+in the home directory of the user, in a dot directory. For example, the
+Parse::BACKPAN::Packages cache is actually stored underneath
 "~/.parse_backpan_packages/cache/". This is so that permisssions are not a
 problem -- it is a per-user, per-application cache.
 
@@ -62,19 +71,31 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README 
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.36-1
+- auto-update to 0.36 (by cpan-spec-update 0.01)
+- added a new req on perl(File::Find::Rule) (version 0)
+- added a new req on perl(File::HomeDir) (version 0)
+- added a new req on perl(File::stat) (version 0)
+- added a new req on perl(HTTP::Cookies) (version 0)
+- added a new req on perl(LWP::UserAgent) (version 0)
+- added a new req on perl(Path::Class) (version 0)
+- added a new req on perl(Storable) (version 0)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
 - submission
 
 * Thu Mar 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cache/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Mar 2009 20:37:58 -0000	1.2
+++ sources	8 Aug 2009 18:57:14 -0000	1.3
@@ -1 +1 @@
-3483ed94401531d16ceab63d57b8da6e  App-Cache-0.35.tar.gz
+9ad0fbe89b953219f89057e55171cca8  App-Cache-0.36.tar.gz



From cweyl at fedoraproject.org  Sat Aug  8 19:11:04 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 19:11:04 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/devel
	perl-DBIx-Class-DateTime-Epoch.spec, 1.4, 1.5
Message-ID: <20090808191104.C094611C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27006

Modified Files:
	perl-DBIx-Class-DateTime-Epoch.spec 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-4
- adjust file ownership



Index: perl-DBIx-Class-DateTime-Epoch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/devel/perl-DBIx-Class-DateTime-Epoch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DBIx-Class-DateTime-Epoch.spec	26 Jul 2009 05:23:16 -0000	1.4
+++ perl-DBIx-Class-DateTime-Epoch.spec	8 Aug 2009 19:11:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-DBIx-Class-DateTime-Epoch
 Version:    0.05
-Release:    3%{?dist}
+Release:    4%{?dist}
 # lib/DBIx/Class/DateTime/Epoch.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -58,10 +58,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/DBIx/Class/*
+%{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-4
+- adjust file ownership
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sat Aug  8 19:11:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat,  8 Aug 2009 19:11:28 +0000 (UTC)
Subject: rpms/perl-App-Cmd/F-11 perl-App-Cmd.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090808191128.24E6711C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cmd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27155

Modified Files:
	perl-App-Cmd.spec sources 
Log Message:
* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
- auto-update to 0.204 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new req on perl(Getopt::Long::Descriptive) (version 0.06)
- added a new req on perl(Module::Pluggable::Object) (version 0)
- added a new req on perl(Sub::Exporter) (version 0.975)
- added a new req on perl(Sub::Install) (version 0)



Index: perl-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/F-11/perl-App-Cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-App-Cmd.spec	26 Feb 2009 11:00:28 -0000	1.5
+++ perl-App-Cmd.spec	8 Aug 2009 19:11:27 -0000	1.6
@@ -1,18 +1,17 @@
-
-Name:       perl-App-Cmd 
-Version:        0.203
-Release:        2%{?dist}
+Name:       perl-App-Cmd
+Version:    0.204
+Release:    1%{?dist}
 # see lib/App/Cmd.pm
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Write command line apps with less suffering 
-Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-%{version}.tar.gz 
+Summary:    Write command line apps with less suffering
+Source:     http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/App-Cmd
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
-BuildRequires: perl(ExtUtils::MakeMaker) 
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires: perl(Getopt::Long::Descriptive) >= 0.06
 BuildRequires: perl(IO::TieCombine) >= 1
 BuildRequires: perl(Module::Pluggable::Object)
@@ -20,6 +19,12 @@ BuildRequires: perl(Sub::Exporter) >= 0.
 BuildRequires: perl(Sub::Install)
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(Getopt::Long::Descriptive) >= 0.06
+Requires:       perl(Module::Pluggable::Object)
+Requires:       perl(Sub::Exporter) >= 0.975
+Requires:       perl(Sub::Install)
+
 %description
 App::Cmd is intended to make it easy to write complex command-line
 applications without having to think about most of the annoying things
@@ -30,7 +35,7 @@ For information on how to start using Ap
 %prep
 %setup -q -n App-Cmd-%{version}
 
-perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t
+perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 
 # make sure doc/tests don't generate provides
 # note we first filter out the bits in _docdir...
@@ -68,15 +73,26 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README t/ 
+%doc Changes LICENSE README t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
+- auto-update to 0.204 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(Getopt::Long::Descriptive) (version 0.06)
+- added a new req on perl(Module::Pluggable::Object) (version 0)
+- added a new req on perl(Sub::Exporter) (version 0.975)
+- added a new req on perl(Sub::Install) (version 0)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.203-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.203-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -95,4 +111,3 @@ rm -rf %{buildroot} 
 * Mon Oct 27 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.202-0.1
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 01:07:15 -0000	1.3
+++ sources	8 Aug 2009 19:11:28 -0000	1.4
@@ -1 +1 @@
-285a338f65f062018b1f12b875d90505  App-Cmd-0.203.tar.gz
+779f2a6291f794b449767db600c40f27  App-Cmd-0.204.tar.gz



From gemi at fedoraproject.org  Sat Aug  8 19:16:25 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 19:16:25 +0000 (UTC)
Subject: rpms/oorexx/devel .cvsignore, 1.4, 1.5 oorexx-paths.patch, 1.1,
	1.2 oorexx.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20090808191625.5084411C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/oorexx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28149

Modified Files:
	.cvsignore oorexx-paths.patch oorexx.spec sources 
Log Message:
new release 4.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Nov 2007 23:57:46 -0000	1.4
+++ .cvsignore	8 Aug 2009 19:16:25 -0000	1.5
@@ -1,2 +1,2 @@
-ooRexx-3.2.0.tar.gz
-ooRexx-3.2.0-pdf.zip
+ooRexx-4.0.0-4801.source.tar.gz
+ooRexx-4.0.0-beta-pdf.zip

oorexx-paths.patch:
 Makefile.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: oorexx-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/devel/oorexx-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oorexx-paths.patch	9 Oct 2006 20:33:13 -0000	1.1
+++ oorexx-paths.patch	8 Aug 2009 19:16:25 -0000	1.2
@@ -1,62 +1,42 @@
---- ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp.paths	2006-09-25 19:11:07.000000000 +0200
-+++ ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp	2006-09-25 19:12:09.000000000 +0200
-@@ -427,6 +427,9 @@
- //  fullname = (PSZ)string_data(imgpath);
+diff -up ooRexx-4.0.0.patched/Makefile.in.paths ooRexx-4.0.0.patched/Makefile.in
+--- ooRexx-4.0.0.patched/Makefile.in.paths	2009-08-08 18:06:40.000000000 +0200
++++ ooRexx-4.0.0.patched/Makefile.in	2009-08-08 18:09:39.000000000 +0200
+@@ -56,7 +56,7 @@
  
- //if ( imgpath && fullname )                         /* seg faultn          */
-+  if (fullname == 0) {
-+    fullname = SearchFileName((PCHAR)"/usr/share/ooRexx/" BASEIMAGE, 'P');
-+  }
-   if ( fullname != OREF_NULL )
-     image = fopen((PSZ)fullname, "rb");/* try to open the file              */
-   else
---- ooRexx-3.1.0/Makefile.in.paths	2006-09-25 19:12:21.000000000 +0200
-+++ ooRexx-3.1.0/Makefile.in	2006-09-25 19:14:15.000000000 +0200
-@@ -60,7 +60,7 @@
- top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(libdir)
  pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -415,7 +415,7 @@
- 			compile @REXXCAT@ rexx.img \
- 			stamp-h.in cscope.files cscope.out $(distdir).tar.gz
- 
--SUBDIRS = samples
-+SUBDIRS =
- DIST_SUBDIRS = samples
- 
- # This defines the current version of ooRexx
-@@ -462,7 +462,7 @@
- samples_dir = $(top_srcdir)/samples
- samples_windows_dir = $(top_srcdir)/samples/windows
- samples_unix_dir = $(top_srcdir)/samples/unix
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -631,7 +631,7 @@ build_extensions_rexutils_platform_dir =
+ build_api_platform_dir = $(api_ at ORX_PLATFORM@_dir)
+ build_os_platform_dir = $(platform_ at ORX_PLATFORM@_dir)
+ build_samples_platform_dir = $(samples_ at ORX_PLATFORM@_dir)
 -catdir = $(prefix)/bin
 +catdir = $(datadir)/ooRexx
  COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                    -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                    -DORX_CATDIR=\"$(catdir)\" \
-@@ -3170,7 +3170,7 @@
+@@ -4062,16 +4062,16 @@ install-exec-local:
  	echo $(DESTDIR) is destdir
  	echo $(prefix) is prefix
  	echo $(install_sh_PROGRAM)
 -	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img
-+	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(datadir)/ooRexx/rexx.img
++	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(catdir)/rexx.img
  	if test -z "$(GENCAT)"; then \
  		echo "No rexx.cat to install"; \
  	else \
-@@ -3181,9 +3181,9 @@
- 	$(install_sh_SCRIPT) $(rexutils_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
- 	for a in $(samples_dir)/*.rex; do \
- 		bn=`basename $$a`; \
--		$(install_sh_SCRIPT) $$a $(DESTDIR)$(prefix)/share/ooRexx/$$bn; \
-+		$(install_sh_SCRIPT) $$a $(DESTDIR)$(datadir)/ooRexx/$$bn; \
- 	done;
--	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme
-+	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(datadir)/ooRexx/readme
- 
- package:
- 	./rexx $(top_srcdir)/platform/unix/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)
+ 		$(install_sh_SCRIPT) rexx.cat $(DESTDIR)$(catdir)/rexx.cat; \
+ 	fi
+ 	$(install_sh_SCRIPT) $(build_os_platform_dir)/oorexx-config $(DESTDIR)$(prefix)/bin/oorexx-config
+-	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(prefix)/bin/rxregexp.cls
+-	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
+-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(prefix)/bin/socket.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(catdir)/rxregexp.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(catdir)/rxftp.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(catdir)/socket.cls
+ 	if test "$(ORX_SYS_STR)" != "AIX"; then \
+ 		$(install_sh_SCRIPT) $(rexxapi_server_unix_dir)/rxapid $(DESTDIR)$(prefix)/bin/rxapid; \
+ 	fi


Index: oorexx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- oorexx.spec	25 Jul 2009 20:42:31 -0000	1.12
+++ oorexx.spec	8 Aug 2009 19:16:25 -0000	1.13
@@ -1,17 +1,15 @@
 Name:           oorexx
-Version:        3.2.0
-Release:        6%{?dist}
+Version:        4.0.0
+Release:        1.4801%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
 License:        CPL
 URL:            http://www.oorexx.org
-Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}.tar.gz
-Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-pdf.zip
+Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-4801.source.tar.gz
+Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-beta-pdf.zip
 Patch0:         oorexx-paths.patch
-Patch1:         oorexx-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64 ppc64
 
 
 %description
@@ -55,10 +53,12 @@ Header files and libraries for ooRexx.
 %setup -q -n ooRexx-%{version}
 unzip -qo %{SOURCE1}
 %patch0 -p1 -b .paths
-%patch1 -p1 -b .paths
 
 
 %build
+CXXFLAGS=$(echo %optflags | sed 's/-O./-O1/g')
+CFLAGS=$(echo %optflags | sed 's/-O./-O1/g')
+export CXXFLAGS CFLAGS
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -70,8 +70,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec 
 rm -fr samples/**/.deps
 rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.csh
 rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.sh
-mv $RPM_BUILD_ROOT%{_bindir}/rxftp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
-mv $RPM_BUILD_ROOT%{_bindir}/rxregexp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/ooRexx/*
 
 # remove cruft
@@ -92,11 +90,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CPLv1.0.txt readme.pdf
+%doc CPLv1.0.txt readme.pdf CHANGES
 %{_bindir}/rexx
 %{_bindir}/rexxc
-%{_bindir}/rxdelipc
-%{_bindir}/rxmigrate
+%{_bindir}/rexximage
+%{_bindir}/rxapi
+%{_bindir}/rxapid
 %{_bindir}/rxqueue
 %{_bindir}/rxsubcom
 %{_datadir}/ooRexx
@@ -106,12 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %files docs
 %defattr(-,root,root,-)
 %doc rexxpg.pdf rexxref.pdf rxftp.pdf rxmath.pdf rxsock.pdf
-%doc samples README.txt
+%doc samples ReleaseNotes
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/rexx.h
+%{_includedir}/*
 %{_libdir}/lib*.so
 %{_bindir}/oorexx-config
 
@@ -123,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-1.4801
+- new release 4.0.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Nov 2007 23:57:46 -0000	1.4
+++ sources	8 Aug 2009 19:16:25 -0000	1.5
@@ -1,2 +1,2 @@
-4a3220466acd13028311e3498efb306a  ooRexx-3.2.0.tar.gz
-3b02f3df1cd1d65a30b0139cf137908c  ooRexx-3.2.0-pdf.zip
+ddf8bcdf09b47511b598329a5da4184a  ooRexx-4.0.0-4801.source.tar.gz
+b5029eca42a75676cca05a544dc8a55f  ooRexx-4.0.0-beta-pdf.zip



From gemi at fedoraproject.org  Sat Aug  8 19:31:57 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 19:31:57 +0000 (UTC)
Subject: rpms/oorexx/F-11 .cvsignore, 1.4, 1.5 oorexx-paths.patch, 1.1,
	1.2 oorexx.spec, 1.11, 1.12 sources, 1.4, 1.5
Message-ID: <20090808193157.F324311C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/oorexx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31501/F-11

Modified Files:
	.cvsignore oorexx-paths.patch oorexx.spec sources 
Log Message:
new release 4.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Nov 2007 23:57:46 -0000	1.4
+++ .cvsignore	8 Aug 2009 19:31:57 -0000	1.5
@@ -1,2 +1,2 @@
-ooRexx-3.2.0.tar.gz
-ooRexx-3.2.0-pdf.zip
+ooRexx-4.0.0-4801.source.tar.gz
+ooRexx-4.0.0-beta-pdf.zip

oorexx-paths.patch:
 Makefile.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: oorexx-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-11/oorexx-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oorexx-paths.patch	9 Oct 2006 20:33:13 -0000	1.1
+++ oorexx-paths.patch	8 Aug 2009 19:31:57 -0000	1.2
@@ -1,62 +1,42 @@
---- ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp.paths	2006-09-25 19:11:07.000000000 +0200
-+++ ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp	2006-09-25 19:12:09.000000000 +0200
-@@ -427,6 +427,9 @@
- //  fullname = (PSZ)string_data(imgpath);
+diff -up ooRexx-4.0.0.patched/Makefile.in.paths ooRexx-4.0.0.patched/Makefile.in
+--- ooRexx-4.0.0.patched/Makefile.in.paths	2009-08-08 18:06:40.000000000 +0200
++++ ooRexx-4.0.0.patched/Makefile.in	2009-08-08 18:09:39.000000000 +0200
+@@ -56,7 +56,7 @@
  
- //if ( imgpath && fullname )                         /* seg faultn          */
-+  if (fullname == 0) {
-+    fullname = SearchFileName((PCHAR)"/usr/share/ooRexx/" BASEIMAGE, 'P');
-+  }
-   if ( fullname != OREF_NULL )
-     image = fopen((PSZ)fullname, "rb");/* try to open the file              */
-   else
---- ooRexx-3.1.0/Makefile.in.paths	2006-09-25 19:12:21.000000000 +0200
-+++ ooRexx-3.1.0/Makefile.in	2006-09-25 19:14:15.000000000 +0200
-@@ -60,7 +60,7 @@
- top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(libdir)
  pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -415,7 +415,7 @@
- 			compile @REXXCAT@ rexx.img \
- 			stamp-h.in cscope.files cscope.out $(distdir).tar.gz
- 
--SUBDIRS = samples
-+SUBDIRS =
- DIST_SUBDIRS = samples
- 
- # This defines the current version of ooRexx
-@@ -462,7 +462,7 @@
- samples_dir = $(top_srcdir)/samples
- samples_windows_dir = $(top_srcdir)/samples/windows
- samples_unix_dir = $(top_srcdir)/samples/unix
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -631,7 +631,7 @@ build_extensions_rexutils_platform_dir =
+ build_api_platform_dir = $(api_ at ORX_PLATFORM@_dir)
+ build_os_platform_dir = $(platform_ at ORX_PLATFORM@_dir)
+ build_samples_platform_dir = $(samples_ at ORX_PLATFORM@_dir)
 -catdir = $(prefix)/bin
 +catdir = $(datadir)/ooRexx
  COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                    -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                    -DORX_CATDIR=\"$(catdir)\" \
-@@ -3170,7 +3170,7 @@
+@@ -4062,16 +4062,16 @@ install-exec-local:
  	echo $(DESTDIR) is destdir
  	echo $(prefix) is prefix
  	echo $(install_sh_PROGRAM)
 -	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img
-+	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(datadir)/ooRexx/rexx.img
++	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(catdir)/rexx.img
  	if test -z "$(GENCAT)"; then \
  		echo "No rexx.cat to install"; \
  	else \
-@@ -3181,9 +3181,9 @@
- 	$(install_sh_SCRIPT) $(rexutils_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
- 	for a in $(samples_dir)/*.rex; do \
- 		bn=`basename $$a`; \
--		$(install_sh_SCRIPT) $$a $(DESTDIR)$(prefix)/share/ooRexx/$$bn; \
-+		$(install_sh_SCRIPT) $$a $(DESTDIR)$(datadir)/ooRexx/$$bn; \
- 	done;
--	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme
-+	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(datadir)/ooRexx/readme
- 
- package:
- 	./rexx $(top_srcdir)/platform/unix/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)
+ 		$(install_sh_SCRIPT) rexx.cat $(DESTDIR)$(catdir)/rexx.cat; \
+ 	fi
+ 	$(install_sh_SCRIPT) $(build_os_platform_dir)/oorexx-config $(DESTDIR)$(prefix)/bin/oorexx-config
+-	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(prefix)/bin/rxregexp.cls
+-	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
+-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(prefix)/bin/socket.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(catdir)/rxregexp.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(catdir)/rxftp.cls
++	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(catdir)/socket.cls
+ 	if test "$(ORX_SYS_STR)" != "AIX"; then \
+ 		$(install_sh_SCRIPT) $(rexxapi_server_unix_dir)/rxapid $(DESTDIR)$(prefix)/bin/rxapid; \
+ 	fi


Index: oorexx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-11/oorexx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- oorexx.spec	26 Feb 2009 08:14:14 -0000	1.11
+++ oorexx.spec	8 Aug 2009 19:31:57 -0000	1.12
@@ -1,17 +1,15 @@
 Name:           oorexx
-Version:        3.2.0
-Release:        5%{?dist}
+Version:        4.0.0
+Release:        1.4801%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
 License:        CPL
 URL:            http://www.oorexx.org
-Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}.tar.gz
-Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-pdf.zip
+Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-4801.source.tar.gz
+Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-beta-pdf.zip
 Patch0:         oorexx-paths.patch
-Patch1:         oorexx-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64 ppc64
 
 
 %description
@@ -55,10 +53,12 @@ Header files and libraries for ooRexx.
 %setup -q -n ooRexx-%{version}
 unzip -qo %{SOURCE1}
 %patch0 -p1 -b .paths
-%patch1 -p1 -b .paths
 
 
 %build
+CXXFLAGS=$(echo %optflags | sed 's/-O./-O1/g')
+CFLAGS=$(echo %optflags | sed 's/-O./-O1/g')
+export CXXFLAGS CFLAGS
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -70,8 +70,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec 
 rm -fr samples/**/.deps
 rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.csh
 rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.sh
-mv $RPM_BUILD_ROOT%{_bindir}/rxftp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
-mv $RPM_BUILD_ROOT%{_bindir}/rxregexp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/ooRexx/*
 
 # remove cruft
@@ -92,11 +90,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CPLv1.0.txt readme.pdf
+%doc CPLv1.0.txt readme.pdf CHANGES
 %{_bindir}/rexx
 %{_bindir}/rexxc
-%{_bindir}/rxdelipc
-%{_bindir}/rxmigrate
+%{_bindir}/rexximage
+%{_bindir}/rxapi
+%{_bindir}/rxapid
 %{_bindir}/rxqueue
 %{_bindir}/rxsubcom
 %{_datadir}/ooRexx
@@ -106,12 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %files docs
 %defattr(-,root,root,-)
 %doc rexxpg.pdf rexxref.pdf rxftp.pdf rxmath.pdf rxsock.pdf
-%doc samples README.txt
+%doc samples ReleaseNotes
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/rexx.h
+%{_includedir}/*
 %{_libdir}/lib*.so
 %{_bindir}/oorexx-config
 
@@ -123,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-1.4801
+- new release 4.0.0
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Nov 2007 23:57:46 -0000	1.4
+++ sources	8 Aug 2009 19:31:57 -0000	1.5
@@ -1,2 +1,2 @@
-4a3220466acd13028311e3498efb306a  ooRexx-3.2.0.tar.gz
-3b02f3df1cd1d65a30b0139cf137908c  ooRexx-3.2.0-pdf.zip
+ddf8bcdf09b47511b598329a5da4184a  ooRexx-4.0.0-4801.source.tar.gz
+b5029eca42a75676cca05a544dc8a55f  ooRexx-4.0.0-beta-pdf.zip



From ausil at fedoraproject.org  Sat Aug  8 19:36:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  8 Aug 2009 19:36:06 +0000 (UTC)
Subject: rpms/kernel/devel config-sparc64-generic, 1.25,
	1.26 config-sparc64-smp, 1.2, 1.3 kernel.spec, 1.1704, 1.1705
Message-ID: <20090808193606.92DB911C02CB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32522

Modified Files:
	config-sparc64-generic config-sparc64-smp kernel.spec 
Log Message:
update sparc64 configs



Index: config-sparc64-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- config-sparc64-generic	18 Jun 2009 19:05:53 -0000	1.25
+++ config-sparc64-generic	8 Aug 2009 19:36:06 -0000	1.26
@@ -31,7 +31,7 @@ CONFIG_64BIT=y
 CONFIG_HUGETLB_PAGE_SIZE_4MB=y
 # CONFIG_HUGETLB_PAGE_SIZE_512K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64K is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_US3_FREQ=m
 CONFIG_US2E_FREQ=m
 CONFIG_SUN_OPENPROMFS=m
@@ -151,7 +151,7 @@ CONFIG_ATM_FORE200E_USE_TASKLET=y
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E_TX_RETRY=16
 # CONFIG_DRM_TDFX is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_SPARCSPKR=m
@@ -199,3 +199,5 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
+
+# CONFIG_KGDB is not set


Index: config-sparc64-smp
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-sparc64-smp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- config-sparc64-smp	16 Jul 2008 21:29:33 -0000	1.2
+++ config-sparc64-smp	8 Aug 2009 19:36:06 -0000	1.3
@@ -1 +1,2 @@
 CONFIG_SMP=y
+CONFIG_KGDB=y


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1704
retrieving revision 1.1705
diff -u -p -r1.1704 -r1.1705
--- kernel.spec	7 Aug 2009 19:07:39 -0000	1.1704
+++ kernel.spec	8 Aug 2009 19:36:06 -0000	1.1705
@@ -1966,6 +1966,11 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 08 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-0.141.rc5.git3
+- disable kgdb on sparc64 uni-processor kernel
+- set max cpus to 256 on sparc64
+- enable AT keyboard on sparc64
+
 * Fri Aug 07 2009 Justin M. Forbes <jforbes at redhat.com>
 - Apply KSM updates from upstream
 



From gemi at fedoraproject.org  Sat Aug  8 20:50:32 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 20:50:32 +0000 (UTC)
Subject: rpms/nyquist/devel nyqsrc303-make.patch, NONE, 1.1 .cvsignore, 1.7, 
	1.8 nyquist.spec, 1.11, 1.12 sources, 1.8,
	1.9 nyqsrc301-inc.patch, 1.2, NONE nyqsrc301-javafix.patch, 1.3, NONE
Message-ID: <20090808205032.34D1E11C0425@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19538

Modified Files:
	.cvsignore nyquist.spec sources 
Added Files:
	nyqsrc303-make.patch 
Removed Files:
	nyqsrc301-inc.patch nyqsrc301-javafix.patch 
Log Message:
new release 3.03

nyqsrc303-make.patch:
 Makefile |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

--- NEW FILE nyqsrc303-make.patch ---
diff -up nyquist/sys/unix/linux/Makefile.make nyquist/sys/unix/linux/Makefile
--- nyquist/sys/unix/linux/Makefile.make	2009-03-03 23:00:41.000000000 +0100
+++ nyquist/sys/unix/linux/Makefile	2009-08-08 22:38:23.000000000 +0200
@@ -14,8 +14,7 @@ NY = ny
 OPT = -O2
 # OPT = -g
 
-EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar \
-           bin/ser-to-osc bin/test-client
+EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar
 
 CURRENT = $(EVERYTHING)
 
@@ -46,12 +45,12 @@ jnyqide/jNyqIDE.jar: $(JAVASRC)
 	javac jnyqide/*.java
 	mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java
 	rm -rf jnyqide/jNyqIDE.jar
-	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class
+	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt
 
 # Standard list of includes (common to all unix versions)
 # Keeping portaudio and libsndfile sources local to nyquist
 INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \
-   -Inyqstk/include -Inyqstk -Iportaudio/pa_common -Iliblo -Inylsf
+   -Inyqstk/include -Inyqstk -Inylsf
 
 # system dependent stuff for linux:
 
@@ -63,28 +62,26 @@ CC = gcc
 # unless the number of channels matched the hardware
 #
 # to use ALSA:
-USE_ALSA = -DPA_USE_ALSA=1
+USE_ALSA =
 USE_OSS = 
-ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o
+ALSA_OBJECTS = 
 #
 # to use OSS:
 # USE_OSS = -DPA_USE_OSS=1
 # USE_ALSA = 
 # ALSA_OBJECTS = 
 
-LIBLO_PATH = liblo/src/.libs
-
 # to enable command line editing, use -DREADLINE. WARNING: THIS WILL 
 # DISABLE THE ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY 
 # CONTROL CHARACTERS (You will also need the readline and curses libraries)
-CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN $(OPT) $(INCL) \
+CFLAGS = -DOSC -DCMTSTUFF $(OPT) $(INCL) \
     -DHAVE_LIBPTHREAD=1 -D_FILE_OFFSET_BITS=64 \
     $(USE_OSS) $(USE_ALSA) -DSTK_NYQUIST -DUSE_VSPRINTF \
     -DHAVE_CONFIG_H
 LN = g++
 AR = ar
 # to enable command line editing, insert -lreadline -lcurses
-LFLAGS = -lm -lpthread -lasound -llo -L$(LIBLO_PATH)
+LFLAGS = -lm -lpthread -lasound -llo -lportaudio
 
 TAGS:
 	find . ( -name 
@@ -223,13 +220,8 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o 
 	nyqstk/stkinit.o nyqstk/instr.o  \
 	nyqstk/stkint.o ffts/src/fftext.o  \
 	ffts/src/fftlib.o ffts/src/matlib.o  \
-	nyqsrc/sndfnint.o nyqsrc/seqfnint.o  \
-	portaudio/pa_common/pa_front.o portaudio/pa_unix/pa_unix_hostapis.o  \
-	portaudio/pa_unix_oss/pa_unix_oss.o portaudio/pa_unix/pa_unix_util.o  \
-	portaudio/pa_common/pa_cpuload.o portaudio/pa_common/pa_allocation.o  \
-	portaudio/pa_common/pa_stream.o portaudio/pa_common/pa_converters.o  \
-	portaudio/pa_common/pa_process.o portaudio/pa_common/pa_dither.o  \
-	portaudio/pa_common/pa_trace.o sys/unix/osstuff.o  \
+	nyqsrc/sndfnint.o nyqsrc/seqfnint.o \
+	sys/unix/osstuff.o \
 	sys/unix/term.o $(ALSA_OBJECTS) 
 
 # Sound functions to add to xlisp
@@ -295,23 +287,7 @@ CMTHDRS = cmt/seqdecls.h nyqsrc/seqext.h
 bin:
 	mkdir bin
 
-liblo/config.h:
-	cd liblo; ./autogen.sh --enable-static --disable-shared
-
-$(LIBLO_PATH)/liblo.a: liblo/config.h
-	cd liblo; make
-
-bin/ser-to-osc: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/ser-to-osc/ser-to-osc.cpp \
-	      -o liblo/ser-to-osc/ser-to-osc.o
-	$(LN)  liblo/ser-to-osc/ser-to-osc.o -o bin/ser-to-osc $(LFLAGS)
-
-bin/test-client: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/test-client/test-client.c \
-	      -o liblo/test-client/test-client.o
-	$(LN) liblo/test-client/test-client.o -o bin/test-client  $(LFLAGS)
-
-$(NY): $(OBJECTS) $(LIBLO_PATH)/liblo.a
+$(NY): $(OBJECTS)
 	$(LN) $(OBJECTS) $(LFLAGS) -o $(NY)
 
 # copy appropriate system.lsp and make it read-only;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Feb 2009 21:52:35 -0000	1.7
+++ .cvsignore	8 Aug 2009 20:50:31 -0000	1.8
@@ -1 +1 @@
-nyqsrc302.zip
+nyqsrc303.zip


Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nyquist.spec	25 Jul 2009 19:45:37 -0000	1.11
+++ nyquist.spec	8 Aug 2009 20:50:32 -0000	1.12
@@ -1,17 +1,17 @@
 Name:           nyquist
-Version:        3.02
-Release:        2%{?dist}
+Version:        3.03
+Release:        1%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
 License:        BSD
 URL:            http://www-2.cs.cmu.edu/~music/music.software.html
-Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc302.zip
-Patch0:         nyqsrc231-pafix.patch
-Patch1:         nyqsrc301-inc.patch
-Patch2:         nyqsrc301-javafix.patch
+Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc303.zip
+#Patch0:         nyqsrc231-pafix.patch
+Patch3:         nyqsrc303-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
+BuildRequires:  liblo-devel
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  dos2unix
 Requires:       java-1.6.0-openjdk
@@ -27,23 +27,17 @@ on an interactive Lisp interpreter.
 
 %prep
 %setup -q -n nyquist
-%patch0 -p1 -b .pafix
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .javafix
+%patch3 -p1 -b .make
 
 # remove cvs cruft
 find -name CVS | xargs rm -fr
 # add opt flags
-sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile
 sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile
-# do not build with buggy readline support
-sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
-# build with alsa
-sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile
 # remove dos paths that cause warnings
 sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp
 # fix some permission
 find -name "*.lsp" | xargs chmod 0644
+sed -i 's|"./ny"|"ny"|' jnyqide/NyquistThread.java
 # change end-of-line
 find -name "*.htm*" \
     -or -name "*.lsp" \
@@ -53,7 +47,7 @@ find -name "*.htm*" \
 
 %build
 rm -f runtime/system.lsp
-make %{?_smp_mflags} -f sys/unix/linux/Makefile
+make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" -f sys/unix/linux/Makefile
 
 
 %install
@@ -99,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.03-1
+- new release 3.03
+- use system portaudio and liblo
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.02-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Feb 2009 21:52:35 -0000	1.8
+++ sources	8 Aug 2009 20:50:32 -0000	1.9
@@ -1 +1 @@
-ce618803273aa2851e3c6c1bd4ad050e  nyqsrc302.zip
+ed3112fe58a97fba36ba186813e8506f  nyqsrc303.zip


--- nyqsrc301-inc.patch DELETED ---


--- nyqsrc301-javafix.patch DELETED ---



From gemi at fedoraproject.org  Sat Aug  8 20:56:41 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 20:56:41 +0000 (UTC)
Subject: rpms/nyquist/devel nyquist.spec,1.12,1.13
Message-ID: <20090808205641.CB28F11C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20450

Modified Files:
	nyquist.spec 
Log Message:



Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nyquist.spec	8 Aug 2009 20:50:32 -0000	1.12
+++ nyquist.spec	8 Aug 2009 20:56:41 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nyquist
 Version:        3.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
@@ -12,6 +12,7 @@ Patch3:         nyqsrc303-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  liblo-devel
+BuildRequires:  portaudio-devel
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  dos2unix
 Requires:       java-1.6.0-openjdk



From rdieter at fedoraproject.org  Sat Aug  8 20:59:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  8 Aug 2009 20:59:28 +0000 (UTC)
Subject: rpms/qscintilla/F-11 .cvsignore, 1.8, 1.9 qscintilla.spec, 1.26,
	1.27 sources, 1.8, 1.9
Message-ID: <20090808205928.EF34411C02CB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20995

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
- QScintilla-gpl-2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2008 17:38:53 -0000	1.8
+++ .cvsignore	8 Aug 2009 20:59:28 -0000	1.9
@@ -1 +1 @@
-QScintilla-gpl-2.3.2.tar.gz
+QScintilla-gpl-2.4.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/qscintilla.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- qscintilla.spec	17 Jul 2009 12:39:17 -0000	1.26
+++ qscintilla.spec	8 Aug 2009 20:59:28 -0000	1.27
@@ -1,12 +1,12 @@
 
-%define scintilla_ver 1.76
+%define scintilla_ver 1.78
 
 # bootstrapping -python
-#define python 1
+%define python 1
 
 Name:    qscintilla
-Version: 2.3.2
-Release: 3%{?dist}.1
+Version: 2.4
+Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -19,9 +19,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 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)")}
-BuildRequires:  PyQt4-devel
+%global pyqt4_version 4.5
+BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
 %endif
 
@@ -52,7 +55,7 @@ Requires: qt4-devel 
 Summary:  QScintilla PyQt4 bindings
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: PyQt4
+Requires: PyQt4 >= %{pyqt4_version}
 %description python
 %{summary}.
 
@@ -70,9 +73,6 @@ Requires: PyQt4-devel
 
 %patch1 -p1 -b .designer-incpath-qt4
 
-# fixups to support RPM_BUILD_ROOT/DESTDIR
-sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
-
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
 find src include -type f -exec chmod 0644 {} ';'
@@ -83,15 +83,12 @@ sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTI
 
 %build
 pushd Qt4
-#sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro
 %{_qt4_qmake} qscintilla.pro
-#echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
 make %{?_smp_mflags}
 popd
 
 pushd designer-Qt4
 %{_qt4_qmake} designer.pro
-#echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
 make %{?_smp_mflags}
 popd
 
@@ -159,6 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
+- QScintilla-gpl-2.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Nov 2008 17:38:54 -0000	1.8
+++ sources	8 Aug 2009 20:59:28 -0000	1.9
@@ -1 +1 @@
-2e112d01988f2e044c43a1e7f5e1dd87  QScintilla-gpl-2.3.2.tar.gz
+dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz



From rdieter at fedoraproject.org  Sat Aug  8 21:00:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  8 Aug 2009 21:00:13 +0000 (UTC)
Subject: rpms/qscintilla/F-10 .cvsignore, 1.7, 1.8 qscintilla.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <20090808210013.F27A011C0439@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21206

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
- QScintilla-gpl-2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 Sep 2008 14:51:20 -0000	1.7
+++ .cvsignore	8 Aug 2009 21:00:13 -0000	1.8
@@ -1 +1 @@
-QScintilla-gpl-2.3.tar.gz
+QScintilla-gpl-2.4.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/qscintilla.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- qscintilla.spec	22 Sep 2008 14:51:20 -0000	1.20
+++ qscintilla.spec	8 Aug 2009 21:00:13 -0000	1.21
@@ -1,8 +1,11 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} 
-%define scintilla_ver 1.76
+
+%define scintilla_ver 1.78
+
+# bootstrapping -python
+%define python 1
 
 Name:    qscintilla
-Version: 2.3
+Version: 2.4
 Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
@@ -16,9 +19,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRequires:  qt4-devel
+
 # for -python
-BuildRequires:  PyQt4-devel
+%if 0%{?python}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global pyqt4_version 4.5
+BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
+%endif
 
 
 %description
@@ -47,7 +55,7 @@ Requires: qt4-devel 
 Summary:  QScintilla PyQt4 bindings
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: PyQt4
+Requires: PyQt4 >= %{pyqt4_version}
 %description python
 %{summary}.
 
@@ -65,9 +73,6 @@ Requires: PyQt4-devel
 
 %patch1 -p1 -b .designer-incpath-qt4
 
-# fixups to support RPM_BUILD_ROOT/DESTDIR
-sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
-
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
 find src include -type f -exec chmod 0644 {} ';'
@@ -78,18 +83,16 @@ sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTI
 
 %build
 pushd Qt4
-sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro
 %{_qt4_qmake} qscintilla.pro
-echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
 make %{?_smp_mflags}
 popd
 
 pushd designer-Qt4
 %{_qt4_qmake} designer.pro
-echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
 make %{?_smp_mflags}
 popd
 
+%if 0%{?python}
 pushd Python
 %{__python} configure.py \
             -c -j 3 \
@@ -97,6 +100,7 @@ pushd Python
             -o ../Qt4
 make %{?_smp_mflags}
 popd
+%endif
 
 
 %install
@@ -104,10 +108,12 @@ rm -rf %{buildroot}
 
 make -C Qt4 install INSTALL_ROOT=%{buildroot} 
 make -C designer-Qt4 install INSTALL_ROOT=%{buildroot}
+%if 0%{?python}
 make -C Python install DESTDIR=%{buildroot}
 
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
+%endif
 
 
 %clean
@@ -124,7 +130,7 @@ rm -rf %{buildroot}
 %doc ChangeLog NEWS README
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/libqscintilla2.so.4*
+%{_qt4_libdir}/libqscintilla2.so.5*
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
@@ -138,6 +144,7 @@ rm -rf %{buildroot}
 %{_qt4_headerdir}/Qsci/
 %{_qt4_libdir}/libqscintilla2.so
 
+%if 0%{?python}
 %files python
 %defattr(-,root,root,-)
 %{python_sitearch}/PyQt4/Qsci.so
@@ -145,9 +152,26 @@ rm -rf %{buildroot}
 %files python-devel
 %defattr(-,root,root,-)
 %{_datadir}/sip/PyQt4/Qsci/
+%endif
 
 
 %changelog
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
+- QScintilla-gpl-2.4
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.3.2-2
+- Rebuild for Python 2.6
+
+* Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.2-1
+- Qscintilla-gpl-2.3.2
+- soname bump 4->5
+
+* Mon Nov 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- Qscintilla-gpl-2.3.1
+
 * Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3-1
 - Qscintilla-gpl-2.3
 - scintilla_ver is missing (#461777)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Sep 2008 14:51:20 -0000	1.7
+++ sources	8 Aug 2009 21:00:13 -0000	1.8
@@ -1 +1 @@
-473d7793592fe96406310a2ab34e9e9b  QScintilla-gpl-2.3.tar.gz
+dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz



From scop at fedoraproject.org  Sat Aug  8 21:07:54 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:07:54 +0000 (UTC)
Subject: rpms/tetex/F-9 ptex-src-3.1.8.1.tar.bz2,1.1,NONE
Message-ID: <20090808210754.CA8E711C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tetex/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22521/F-9

Removed Files:
	ptex-src-3.1.8.1.tar.bz2 
Log Message:
Remove unused tarballs from CVS.


--- ptex-src-3.1.8.1.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:07:54 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:07:54 +0000 (UTC)
Subject: rpms/tetex/devel ptex-src-3.1.8.1.tar.bz2,1.1,NONE
Message-ID: <20090808210754.F312E11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tetex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22521/devel

Removed Files:
	ptex-src-3.1.8.1.tar.bz2 
Log Message:
Remove unused tarballs from CVS.


--- ptex-src-3.1.8.1.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:09:45 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:09:45 +0000 (UTC)
Subject: rpms/mapserver/F-11 mapserver-5.2.1.tar.gz,1.1,NONE
Message-ID: <20090808210945.BF0AB11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mapserver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22861/F-11

Removed Files:
	mapserver-5.2.1.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- mapserver-5.2.1.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:09:46 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:09:46 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver-5.2.1.tar.gz,1.1,NONE
Message-ID: <20090808210946.63AA011C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22861/devel

Removed Files:
	mapserver-5.2.1.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- mapserver-5.2.1.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:32 +0000 (UTC)
Subject: rpms/dircproxy/EL-4 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211732.06ABE11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/EL-4

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:32 +0000 (UTC)
Subject: rpms/dircproxy/F-10 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211732.3C20311C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/F-10

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:32 +0000 (UTC)
Subject: rpms/dircproxy/F-11 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211732.854FA11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/F-11

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:32 +0000 (UTC)
Subject: rpms/dircproxy/F-7 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211732.DDC3711C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/F-7

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:33 +0000 (UTC)
Subject: rpms/dircproxy/F-8 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211733.4297A11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/F-8

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:33 +0000 (UTC)
Subject: rpms/dircproxy/FC-6 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211733.BEAED11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/FC-6

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:33 +0000 (UTC)
Subject: rpms/dircproxy/F-9 dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211733.7FB9811C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/F-9

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:17:34 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:17:34 +0000 (UTC)
Subject: rpms/dircproxy/devel dircproxy-1.2.0-beta.tar.bz,1.1,NONE
Message-ID: <20090808211734.105C511C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dircproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693/devel

Removed Files:
	dircproxy-1.2.0-beta.tar.bz 
Log Message:
Remove unused tarballs from CVS.


--- dircproxy-1.2.0-beta.tar.bz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:18:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:18:26 +0000 (UTC)
Subject: rpms/cowbell/F-11 cowbell-0.3-svn34.tar.bz2,1.1,NONE
Message-ID: <20090808211826.4D1E711C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cowbell/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24929/F-11

Removed Files:
	cowbell-0.3-svn34.tar.bz2 
Log Message:
Remove unused tarballs from CVS.


--- cowbell-0.3-svn34.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:18:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:18:26 +0000 (UTC)
Subject: rpms/cowbell/devel cowbell-0.3-svn34.tar.bz2,1.1,NONE
Message-ID: <20090808211826.92DCF11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cowbell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24929/devel

Removed Files:
	cowbell-0.3-svn34.tar.bz2 
Log Message:
Remove unused tarballs from CVS.


--- cowbell-0.3-svn34.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:19:40 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:19:40 +0000 (UTC)
Subject: rpms/cowbell/F-10 .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 cowbell-0.3-svn34.tar.bz2, 1.1, NONE
Message-ID: <20090808211940.DBA3C11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cowbell/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25126

Modified Files:
	.cvsignore sources 
Removed Files:
	cowbell-0.3-svn34.tar.bz2 
Log Message:
Use actually used tarball from lookaside cache, remove it from CVS.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 May 2008 12:18:24 -0000	1.4
+++ .cvsignore	8 Aug 2009 21:19:40 -0000	1.5
@@ -1,2 +1 @@
-cowbell-0.3-0.svn34.1.fc10.src.rpm
-cowbell-0.3-0svn34.tar.bz2
+cowbell-0.3-svn34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 May 2008 12:25:44 -0000	1.5
+++ sources	8 Aug 2009 21:19:40 -0000	1.6
@@ -1 +1 @@
-6d9aa28f1afe3a30d7310b1d06b97b99  cowbell-0.3-0svn34.tar.bz2
+698af95d4b790bcc8be9e59aa595338f  cowbell-0.3-svn34.tar.bz2


--- cowbell-0.3-svn34.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:22:03 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:22:03 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0.tar.gz,1.3,NONE
Message-ID: <20090808212203.EDCCE11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25495

Removed Files:
	parted-1.9.0.tar.gz 
Log Message:
Remove tarball from CVS, it's in the lookaside cache.


--- parted-1.9.0.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:23:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:23:30 +0000 (UTC)
Subject: rpms/redhat-lsb/F-11 lsb-release-2.0.tar.gz,1.1,NONE
Message-ID: <20090808212330.2EDB211C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redhat-lsb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25688/F-11

Removed Files:
	lsb-release-2.0.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- lsb-release-2.0.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:23:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:23:30 +0000 (UTC)
Subject: rpms/redhat-lsb/devel lsb-release-2.0.tar.gz,1.1,NONE
Message-ID: <20090808212330.6860411C0381@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redhat-lsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25688/devel

Removed Files:
	lsb-release-2.0.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- lsb-release-2.0.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:23:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:23:29 +0000 (UTC)
Subject: rpms/redhat-lsb/F-10 lsb-release-2.0.tar.gz,1.1,NONE
Message-ID: <20090808212329.E32A411C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redhat-lsb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25688/F-10

Removed Files:
	lsb-release-2.0.tar.gz 
Log Message:
Remove unused tarballs from CVS.


--- lsb-release-2.0.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:26:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:26:07 +0000 (UTC)
Subject: rpms/redhat-lsb/F-7 .cvsignore, 1.8, 1.9 sources, 1.16,
	1.17 lsb-release-2.0.tar.gz, 1.1, NONE
Message-ID: <20090808212607.09AD711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redhat-lsb/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26087/F-7

Modified Files:
	.cvsignore sources 
Removed Files:
	lsb-release-2.0.tar.gz 
Log Message:
Remove LSB 2.0 tarball from CVS, it's in the lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 Nov 2006 01:17:00 -0000	1.8
+++ .cvsignore	8 Aug 2009 21:26:06 -0000	1.9
@@ -4,3 +4,4 @@ redhat-lsb-3.0-1.tar.bz2
 redhat-lsb-3.1-1.tar.bz2
 redhat-lsb-3.1-2.tar.bz2
 redhat-lsb-3.1-3.tar.bz2
+lsb-release-2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	6 Dec 2006 02:51:23 -0000	1.16
+++ sources	8 Aug 2009 21:26:06 -0000	1.17
@@ -5,3 +5,4 @@ f535414957ea3f7810b098f4ac7e4c50  redhat
 f252ed03702b93eb09e9448e48acd767  redhat-lsb-3.1-1.tar.bz2
 82fe26793fb0f6b50536842e9e2dc489  redhat-lsb-3.1-2.tar.bz2
 5a80bf847206e339203f66eac9430c4b  redhat-lsb-3.1-3.tar.bz2
+f4b50cc38065cf46e9102fd357d1eb0b  lsb-release-2.0.tar.gz


--- lsb-release-2.0.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:26:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:26:07 +0000 (UTC)
Subject: rpms/redhat-lsb/F-8 .cvsignore, 1.10, 1.11 sources, 1.18,
	1.19 lsb-release-2.0.tar.gz, 1.1, NONE
Message-ID: <20090808212607.44BDB11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redhat-lsb/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26087/F-8

Modified Files:
	.cvsignore sources 
Removed Files:
	lsb-release-2.0.tar.gz 
Log Message:
Remove LSB 2.0 tarball from CVS, it's in the lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Oct 2007 08:20:54 -0000	1.10
+++ .cvsignore	8 Aug 2009 21:26:06 -0000	1.11
@@ -6,3 +6,4 @@ redhat-lsb-3.1-2.tar.bz2
 redhat-lsb-3.1-3.tar.bz2
 redhat-lsb-3.1-4.tar.bz2
 redhat-lsb-3.1-5.tar.bz2
+lsb-release-2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-8/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Oct 2007 08:20:54 -0000	1.18
+++ sources	8 Aug 2009 21:26:07 -0000	1.19
@@ -7,3 +7,4 @@ f252ed03702b93eb09e9448e48acd767  redhat
 5a80bf847206e339203f66eac9430c4b  redhat-lsb-3.1-3.tar.bz2
 7f388b809484b42faf92004995db3239  redhat-lsb-3.1-4.tar.bz2
 12f2f2ee2e03d6c861109965326294ff  redhat-lsb-3.1-5.tar.bz2
+f4b50cc38065cf46e9102fd357d1eb0b  lsb-release-2.0.tar.gz


--- lsb-release-2.0.tar.gz DELETED ---



From scop at fedoraproject.org  Sat Aug  8 21:26:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat,  8 Aug 2009 21:26:07 +0000 (UTC)
Subject: rpms/redhat-lsb/F-9 .cvsignore, 1.10, 1.11 sources, 1.18,
	1.19 lsb-release-2.0.tar.gz, 1.1, NONE
Message-ID: <20090808212607.8075911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redhat-lsb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26087/F-9

Modified Files:
	.cvsignore sources 
Removed Files:
	lsb-release-2.0.tar.gz 
Log Message:
Remove LSB 2.0 tarball from CVS, it's in the lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Oct 2007 08:20:54 -0000	1.10
+++ .cvsignore	8 Aug 2009 21:26:07 -0000	1.11
@@ -6,3 +6,4 @@ redhat-lsb-3.1-2.tar.bz2
 redhat-lsb-3.1-3.tar.bz2
 redhat-lsb-3.1-4.tar.bz2
 redhat-lsb-3.1-5.tar.bz2
+lsb-release-2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Oct 2007 08:20:54 -0000	1.18
+++ sources	8 Aug 2009 21:26:07 -0000	1.19
@@ -7,3 +7,4 @@ f252ed03702b93eb09e9448e48acd767  redhat
 5a80bf847206e339203f66eac9430c4b  redhat-lsb-3.1-3.tar.bz2
 7f388b809484b42faf92004995db3239  redhat-lsb-3.1-4.tar.bz2
 12f2f2ee2e03d6c861109965326294ff  redhat-lsb-3.1-5.tar.bz2
+f4b50cc38065cf46e9102fd357d1eb0b  lsb-release-2.0.tar.gz


--- lsb-release-2.0.tar.gz DELETED ---



From pkgdb at fedoraproject.org  Sat Aug  8 21:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 21:37:11 +0000
Subject: [pkgdb] clamav had acl change status
Message-ID: <20090808213711.DD2DA10F8A0@bastion2.fedora.phx.redhat.com>

ensc has set the watchbugzilla acl on clamav (Fedora 10) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clamav



From pkgdb at fedoraproject.org  Sat Aug  8 21:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 21:37:12 +0000
Subject: [pkgdb] clamav had acl change status
Message-ID: <20090808213713.0706410F8A9@bastion2.fedora.phx.redhat.com>

ensc has set the watchcommits acl on clamav (Fedora 10) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clamav



From pkgdb at fedoraproject.org  Sat Aug  8 21:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 21:38:02 +0000
Subject: [pkgdb] clamav had acl change status
Message-ID: <20090808213802.77A2E10F8A9@bastion2.fedora.phx.redhat.com>

ensc has set the commit acl on clamav (Fedora 11) to Obsolete for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clamav



From pkgdb at fedoraproject.org  Sat Aug  8 21:38:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 21:38:00 +0000
Subject: [pkgdb] clamav had acl change status
Message-ID: <20090808213801.3D09D10F8A0@bastion2.fedora.phx.redhat.com>

ensc has set the commit acl on clamav (Fedora 10) to Obsolete for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clamav



From pkgdb at fedoraproject.org  Sat Aug  8 21:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 08 Aug 2009 21:38:45 +0000
Subject: [pkgdb] clamav had acl change status
Message-ID: <20090808213846.1E57D10F8B5@bastion2.fedora.phx.redhat.com>

ensc has set the commit acl on clamav (Fedora devel) to Obsolete for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clamav



From gemi at fedoraproject.org  Sat Aug  8 21:43:29 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 21:43:29 +0000 (UTC)
Subject: rpms/nyquist/devel nyqsrc303-gcc441.patch, NONE, 1.1 nyquist.spec, 
	1.13, 1.14
Message-ID: <20090808214329.788AA11C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28841

Modified Files:
	nyquist.spec 
Added Files:
	nyqsrc303-gcc441.patch 
Log Message:


nyqsrc303-gcc441.patch:
 FileRead.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE nyqsrc303-gcc441.patch ---
diff -up nyquist/nyqstk/src/FileRead.cpp.gcc441 nyquist/nyqstk/src/FileRead.cpp
--- nyquist/nyqstk/src/FileRead.cpp.gcc441	2009-08-08 15:28:53.000000000 -0600
+++ nyquist/nyqstk/src/FileRead.cpp	2009-08-08 15:29:08.000000000 -0600
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <cmath>
+#include <cstdio>
 
 using namespace Nyq;
 


Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nyquist.spec	8 Aug 2009 20:56:41 -0000	1.13
+++ nyquist.spec	8 Aug 2009 21:43:29 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nyquist
 Version:        3.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
@@ -9,6 +9,7 @@ URL:            http://www-2.cs.cmu.edu/
 Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc303.zip
 #Patch0:         nyqsrc231-pafix.patch
 Patch3:         nyqsrc303-make.patch
+Patch4:         nyqsrc303-gcc441.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  liblo-devel
@@ -29,6 +30,7 @@ on an interactive Lisp interpreter.
 %prep
 %setup -q -n nyquist
 %patch3 -p1 -b .make
+%patch4 -p1 -b .gcc441
 
 # remove cvs cruft
 find -name CVS | xargs rm -fr



From gemi at fedoraproject.org  Sat Aug  8 21:54:03 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 21:54:03 +0000 (UTC)
Subject: rpms/nyquist/F-11 nyqsrc303-gcc441.patch, NONE,
	1.1 nyqsrc303-make.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 nyquist.spec, 1.10, 1.11 sources, 1.8,
	1.9 nyqsrc301-inc.patch, 1.2, NONE nyqsrc301-javafix.patch, 1.3, NONE
Message-ID: <20090808215403.598AE11C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30543

Modified Files:
	.cvsignore nyquist.spec sources 
Added Files:
	nyqsrc303-gcc441.patch nyqsrc303-make.patch 
Removed Files:
	nyqsrc301-inc.patch nyqsrc301-javafix.patch 
Log Message:
new release 3.03

nyqsrc303-gcc441.patch:
 FileRead.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE nyqsrc303-gcc441.patch ---
diff -up nyquist/nyqstk/src/FileRead.cpp.gcc441 nyquist/nyqstk/src/FileRead.cpp
--- nyquist/nyqstk/src/FileRead.cpp.gcc441	2009-08-08 15:28:53.000000000 -0600
+++ nyquist/nyqstk/src/FileRead.cpp	2009-08-08 15:29:08.000000000 -0600
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <cmath>
+#include <cstdio>
 
 using namespace Nyq;
 

nyqsrc303-make.patch:
 Makefile |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

--- NEW FILE nyqsrc303-make.patch ---
diff -up nyquist/sys/unix/linux/Makefile.make nyquist/sys/unix/linux/Makefile
--- nyquist/sys/unix/linux/Makefile.make	2009-03-03 23:00:41.000000000 +0100
+++ nyquist/sys/unix/linux/Makefile	2009-08-08 22:38:23.000000000 +0200
@@ -14,8 +14,7 @@ NY = ny
 OPT = -O2
 # OPT = -g
 
-EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar \
-           bin/ser-to-osc bin/test-client
+EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar
 
 CURRENT = $(EVERYTHING)
 
@@ -46,12 +45,12 @@ jnyqide/jNyqIDE.jar: $(JAVASRC)
 	javac jnyqide/*.java
 	mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java
 	rm -rf jnyqide/jNyqIDE.jar
-	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class
+	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt
 
 # Standard list of includes (common to all unix versions)
 # Keeping portaudio and libsndfile sources local to nyquist
 INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \
-   -Inyqstk/include -Inyqstk -Iportaudio/pa_common -Iliblo -Inylsf
+   -Inyqstk/include -Inyqstk -Inylsf
 
 # system dependent stuff for linux:
 
@@ -63,28 +62,26 @@ CC = gcc
 # unless the number of channels matched the hardware
 #
 # to use ALSA:
-USE_ALSA = -DPA_USE_ALSA=1
+USE_ALSA =
 USE_OSS = 
-ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o
+ALSA_OBJECTS = 
 #
 # to use OSS:
 # USE_OSS = -DPA_USE_OSS=1
 # USE_ALSA = 
 # ALSA_OBJECTS = 
 
-LIBLO_PATH = liblo/src/.libs
-
 # to enable command line editing, use -DREADLINE. WARNING: THIS WILL 
 # DISABLE THE ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY 
 # CONTROL CHARACTERS (You will also need the readline and curses libraries)
-CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN $(OPT) $(INCL) \
+CFLAGS = -DOSC -DCMTSTUFF $(OPT) $(INCL) \
     -DHAVE_LIBPTHREAD=1 -D_FILE_OFFSET_BITS=64 \
     $(USE_OSS) $(USE_ALSA) -DSTK_NYQUIST -DUSE_VSPRINTF \
     -DHAVE_CONFIG_H
 LN = g++
 AR = ar
 # to enable command line editing, insert -lreadline -lcurses
-LFLAGS = -lm -lpthread -lasound -llo -L$(LIBLO_PATH)
+LFLAGS = -lm -lpthread -lasound -llo -lportaudio
 
 TAGS:
 	find . ( -name 
@@ -223,13 +220,8 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o 
 	nyqstk/stkinit.o nyqstk/instr.o  \
 	nyqstk/stkint.o ffts/src/fftext.o  \
 	ffts/src/fftlib.o ffts/src/matlib.o  \
-	nyqsrc/sndfnint.o nyqsrc/seqfnint.o  \
-	portaudio/pa_common/pa_front.o portaudio/pa_unix/pa_unix_hostapis.o  \
-	portaudio/pa_unix_oss/pa_unix_oss.o portaudio/pa_unix/pa_unix_util.o  \
-	portaudio/pa_common/pa_cpuload.o portaudio/pa_common/pa_allocation.o  \
-	portaudio/pa_common/pa_stream.o portaudio/pa_common/pa_converters.o  \
-	portaudio/pa_common/pa_process.o portaudio/pa_common/pa_dither.o  \
-	portaudio/pa_common/pa_trace.o sys/unix/osstuff.o  \
+	nyqsrc/sndfnint.o nyqsrc/seqfnint.o \
+	sys/unix/osstuff.o \
 	sys/unix/term.o $(ALSA_OBJECTS) 
 
 # Sound functions to add to xlisp
@@ -295,23 +287,7 @@ CMTHDRS = cmt/seqdecls.h nyqsrc/seqext.h
 bin:
 	mkdir bin
 
-liblo/config.h:
-	cd liblo; ./autogen.sh --enable-static --disable-shared
-
-$(LIBLO_PATH)/liblo.a: liblo/config.h
-	cd liblo; make
-
-bin/ser-to-osc: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/ser-to-osc/ser-to-osc.cpp \
-	      -o liblo/ser-to-osc/ser-to-osc.o
-	$(LN)  liblo/ser-to-osc/ser-to-osc.o -o bin/ser-to-osc $(LFLAGS)
-
-bin/test-client: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/test-client/test-client.c \
-	      -o liblo/test-client/test-client.o
-	$(LN) liblo/test-client/test-client.o -o bin/test-client  $(LFLAGS)
-
-$(NY): $(OBJECTS) $(LIBLO_PATH)/liblo.a
+$(NY): $(OBJECTS)
 	$(LN) $(OBJECTS) $(LFLAGS) -o $(NY)
 
 # copy appropriate system.lsp and make it read-only;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Feb 2009 21:52:35 -0000	1.7
+++ .cvsignore	8 Aug 2009 21:54:03 -0000	1.8
@@ -1 +1 @@
-nyqsrc302.zip
+nyqsrc303.zip


Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-11/nyquist.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nyquist.spec	26 Feb 2009 21:52:35 -0000	1.10
+++ nyquist.spec	8 Aug 2009 21:54:03 -0000	1.11
@@ -1,17 +1,19 @@
 Name:           nyquist
-Version:        3.02
+Version:        3.03
 Release:        1%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
 License:        BSD
 URL:            http://www-2.cs.cmu.edu/~music/music.software.html
-Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc302.zip
-Patch0:         nyqsrc231-pafix.patch
-Patch1:         nyqsrc301-inc.patch
-Patch2:         nyqsrc301-javafix.patch
+Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc303.zip
+#Patch0:         nyqsrc231-pafix.patch
+Patch3:         nyqsrc303-make.patch
+Patch4:         nyqsrc303-gcc441.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
+BuildRequires:  liblo-devel
+BuildRequires:  portaudio-devel
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  dos2unix
 Requires:       java-1.6.0-openjdk
@@ -27,23 +29,18 @@ on an interactive Lisp interpreter.
 
 %prep
 %setup -q -n nyquist
-%patch0 -p1 -b .pafix
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .javafix
+%patch3 -p1 -b .make
+%patch4 -p1 -b .gcc441
 
 # remove cvs cruft
 find -name CVS | xargs rm -fr
 # add opt flags
-sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile
 sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile
-# do not build with buggy readline support
-sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
-# build with alsa
-sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile
 # remove dos paths that cause warnings
 sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp
 # fix some permission
 find -name "*.lsp" | xargs chmod 0644
+sed -i 's|"./ny"|"ny"|' jnyqide/NyquistThread.java
 # change end-of-line
 find -name "*.htm*" \
     -or -name "*.lsp" \
@@ -53,7 +50,7 @@ find -name "*.htm*" \
 
 %build
 rm -f runtime/system.lsp
-make %{?_smp_mflags} -f sys/unix/linux/Makefile
+make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" -f sys/unix/linux/Makefile
 
 
 %install
@@ -99,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.03-1
+- new release 3.03
+- use system portaudio and liblo
+
 * Thu Feb 26 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.02-1
 - new release 3.02
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Feb 2009 21:52:35 -0000	1.8
+++ sources	8 Aug 2009 21:54:03 -0000	1.9
@@ -1 +1 @@
-ce618803273aa2851e3c6c1bd4ad050e  nyqsrc302.zip
+ed3112fe58a97fba36ba186813e8506f  nyqsrc303.zip


--- nyqsrc301-inc.patch DELETED ---


--- nyqsrc301-javafix.patch DELETED ---



From rdieter at fedoraproject.org  Sat Aug  8 22:06:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  8 Aug 2009 22:06:18 +0000 (UTC)
Subject: rpms/konversation/devel .cvsignore, 1.9, 1.10 konversation.spec,
	1.29, 1.30 sources, 1.9, 1.10
Message-ID: <20090808220618.626D711C02CB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.4.alpha6
- konversation-1.2-alpha6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Jul 2009 03:23:46 -0000	1.9
+++ .cvsignore	8 Aug 2009 22:06:17 -0000	1.10
@@ -1 +1 @@
-konversation-1.2-alpha4.tar.bz2
+konversation-1.2-alpha6.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- konversation.spec	25 Jul 2009 04:44:12 -0000	1.29
+++ konversation.spec	8 Aug 2009 22:06:18 -0000	1.30
@@ -1,9 +1,9 @@
 
-%define pre alpha4
+%define pre alpha6
 
 Name:           konversation
 Version:        1.2
-Release:        0.3.%{pre}%{?dist}
+Release:        0.4.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -68,14 +68,12 @@ rm -rf %{buildroot} 
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -95,6 +93,9 @@ fi
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.4.alpha6
+- konversation-1.2-alpha6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.3.alpha4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Jul 2009 03:23:46 -0000	1.9
+++ sources	8 Aug 2009 22:06:18 -0000	1.10
@@ -1 +1 @@
-0c3735663e943965689873f3de2cddd3  konversation-1.2-alpha4.tar.bz2
+1720cc7d03cfb808c666f8df9006573e  konversation-1.2-alpha6.tar.bz2



From gemi at fedoraproject.org  Sat Aug  8 22:10:17 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 22:10:17 +0000 (UTC)
Subject: rpms/nyquist/F-10 nyqsrc303-gcc441.patch, NONE,
	1.1 nyqsrc303-make.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 nyquist.spec, 1.9, 1.10 sources, 1.8,
	1.9 nyqsrc301-inc.patch, 1.2, NONE nyqsrc301-javafix.patch, 1.3, NONE
Message-ID: <20090808221017.D608B11C0439@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv588

Modified Files:
	.cvsignore nyquist.spec sources 
Added Files:
	nyqsrc303-gcc441.patch nyqsrc303-make.patch 
Removed Files:
	nyqsrc301-inc.patch nyqsrc301-javafix.patch 
Log Message:
new release 3.03


nyqsrc303-gcc441.patch:
 FileRead.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE nyqsrc303-gcc441.patch ---
diff -up nyquist/nyqstk/src/FileRead.cpp.gcc441 nyquist/nyqstk/src/FileRead.cpp
--- nyquist/nyqstk/src/FileRead.cpp.gcc441	2009-08-08 15:28:53.000000000 -0600
+++ nyquist/nyqstk/src/FileRead.cpp	2009-08-08 15:29:08.000000000 -0600
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <cmath>
+#include <cstdio>
 
 using namespace Nyq;
 

nyqsrc303-make.patch:
 Makefile |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

--- NEW FILE nyqsrc303-make.patch ---
diff -up nyquist/sys/unix/linux/Makefile.make nyquist/sys/unix/linux/Makefile
--- nyquist/sys/unix/linux/Makefile.make	2009-03-03 23:00:41.000000000 +0100
+++ nyquist/sys/unix/linux/Makefile	2009-08-08 22:38:23.000000000 +0200
@@ -14,8 +14,7 @@ NY = ny
 OPT = -O2
 # OPT = -g
 
-EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar \
-           bin/ser-to-osc bin/test-client
+EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar
 
 CURRENT = $(EVERYTHING)
 
@@ -46,12 +45,12 @@ jnyqide/jNyqIDE.jar: $(JAVASRC)
 	javac jnyqide/*.java
 	mv jnyqide/SpecialMacHandler.hidden jnyqide/SpecialMacHandler.java
 	rm -rf jnyqide/jNyqIDE.jar
-	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class
+	jar -cfm jnyqide/jNyqIDE.jar jnyqide/manifest.txt jnyqide/*.class jnyqide/*.txt
 
 # Standard list of includes (common to all unix versions)
 # Keeping portaudio and libsndfile sources local to nyquist
 INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \
-   -Inyqstk/include -Inyqstk -Iportaudio/pa_common -Iliblo -Inylsf
+   -Inyqstk/include -Inyqstk -Inylsf
 
 # system dependent stuff for linux:
 
@@ -63,28 +62,26 @@ CC = gcc
 # unless the number of channels matched the hardware
 #
 # to use ALSA:
-USE_ALSA = -DPA_USE_ALSA=1
+USE_ALSA =
 USE_OSS = 
-ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o
+ALSA_OBJECTS = 
 #
 # to use OSS:
 # USE_OSS = -DPA_USE_OSS=1
 # USE_ALSA = 
 # ALSA_OBJECTS = 
 
-LIBLO_PATH = liblo/src/.libs
-
 # to enable command line editing, use -DREADLINE. WARNING: THIS WILL 
 # DISABLE THE ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY 
 # CONTROL CHARACTERS (You will also need the readline and curses libraries)
-CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN $(OPT) $(INCL) \
+CFLAGS = -DOSC -DCMTSTUFF $(OPT) $(INCL) \
     -DHAVE_LIBPTHREAD=1 -D_FILE_OFFSET_BITS=64 \
     $(USE_OSS) $(USE_ALSA) -DSTK_NYQUIST -DUSE_VSPRINTF \
     -DHAVE_CONFIG_H
 LN = g++
 AR = ar
 # to enable command line editing, insert -lreadline -lcurses
-LFLAGS = -lm -lpthread -lasound -llo -L$(LIBLO_PATH)
+LFLAGS = -lm -lpthread -lasound -llo -lportaudio
 
 TAGS:
 	find . ( -name 
@@ -223,13 +220,8 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o 
 	nyqstk/stkinit.o nyqstk/instr.o  \
 	nyqstk/stkint.o ffts/src/fftext.o  \
 	ffts/src/fftlib.o ffts/src/matlib.o  \
-	nyqsrc/sndfnint.o nyqsrc/seqfnint.o  \
-	portaudio/pa_common/pa_front.o portaudio/pa_unix/pa_unix_hostapis.o  \
-	portaudio/pa_unix_oss/pa_unix_oss.o portaudio/pa_unix/pa_unix_util.o  \
-	portaudio/pa_common/pa_cpuload.o portaudio/pa_common/pa_allocation.o  \
-	portaudio/pa_common/pa_stream.o portaudio/pa_common/pa_converters.o  \
-	portaudio/pa_common/pa_process.o portaudio/pa_common/pa_dither.o  \
-	portaudio/pa_common/pa_trace.o sys/unix/osstuff.o  \
+	nyqsrc/sndfnint.o nyqsrc/seqfnint.o \
+	sys/unix/osstuff.o \
 	sys/unix/term.o $(ALSA_OBJECTS) 
 
 # Sound functions to add to xlisp
@@ -295,23 +287,7 @@ CMTHDRS = cmt/seqdecls.h nyqsrc/seqext.h
 bin:
 	mkdir bin
 
-liblo/config.h:
-	cd liblo; ./autogen.sh --enable-static --disable-shared
-
-$(LIBLO_PATH)/liblo.a: liblo/config.h
-	cd liblo; make
-
-bin/ser-to-osc: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/ser-to-osc/ser-to-osc.cpp \
-	      -o liblo/ser-to-osc/ser-to-osc.o
-	$(LN)  liblo/ser-to-osc/ser-to-osc.o -o bin/ser-to-osc $(LFLAGS)
-
-bin/test-client: bin $(LIBLO_PATH)/liblo.a
-	$(CC) -c $(CFLAGS) liblo/test-client/test-client.c \
-	      -o liblo/test-client/test-client.o
-	$(LN) liblo/test-client/test-client.o -o bin/test-client  $(LFLAGS)
-
-$(NY): $(OBJECTS) $(LIBLO_PATH)/liblo.a
+$(NY): $(OBJECTS)
 	$(LN) $(OBJECTS) $(LFLAGS) -o $(NY)
 
 # copy appropriate system.lsp and make it read-only;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Feb 2009 21:54:35 -0000	1.7
+++ .cvsignore	8 Aug 2009 22:10:17 -0000	1.8
@@ -1 +1 @@
-nyqsrc302.zip
+nyqsrc303.zip


Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-10/nyquist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nyquist.spec	26 Feb 2009 21:54:36 -0000	1.9
+++ nyquist.spec	8 Aug 2009 22:10:17 -0000	1.10
@@ -1,15 +1,15 @@
 Name:           nyquist
-Version:        3.02
+Version:        3.03
 Release:        1%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
 License:        BSD
 URL:            http://www-2.cs.cmu.edu/~music/music.software.html
-Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc302.zip
-Patch0:         nyqsrc231-pafix.patch
-Patch1:         nyqsrc301-inc.patch
-Patch2:         nyqsrc301-javafix.patch
+Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc303.zip
+#Patch0:         nyqsrc231-pafix.patch
+Patch3:         nyqsrc303-make.patch
+Patch4:         nyqsrc303-gcc441.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  java-1.6.0-openjdk-devel
@@ -27,23 +27,18 @@ on an interactive Lisp interpreter.
 
 %prep
 %setup -q -n nyquist
-%patch0 -p1 -b .pafix
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .javafix
+%patch3 -p1 -b .make
+%patch4 -p1 -b .gcc441
 
 # remove cvs cruft
 find -name CVS | xargs rm -fr
 # add opt flags
-sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile
 sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile
-# do not build with buggy readline support
-sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
-# build with alsa
-sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile
 # remove dos paths that cause warnings
 sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp
 # fix some permission
 find -name "*.lsp" | xargs chmod 0644
+sed -i 's|"./ny"|"ny"|' jnyqide/NyquistThread.java
 # change end-of-line
 find -name "*.htm*" \
     -or -name "*.lsp" \
@@ -53,7 +48,7 @@ find -name "*.htm*" \
 
 %build
 rm -f runtime/system.lsp
-make %{?_smp_mflags} -f sys/unix/linux/Makefile
+make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" -f sys/unix/linux/Makefile
 
 
 %install
@@ -99,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.03-1
+- new release 3.03
+- use system portaudio and liblo
+
 * Thu Feb 26 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.02-1
 - new release 3.02
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Feb 2009 21:54:36 -0000	1.8
+++ sources	8 Aug 2009 22:10:17 -0000	1.9
@@ -1 +1 @@
-ce618803273aa2851e3c6c1bd4ad050e  nyqsrc302.zip
+ed3112fe58a97fba36ba186813e8506f  nyqsrc303.zip


--- nyqsrc301-inc.patch DELETED ---


--- nyqsrc301-javafix.patch DELETED ---



From gemi at fedoraproject.org  Sat Aug  8 22:19:22 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 22:19:22 +0000 (UTC)
Subject: rpms/nyquist/F-10 nyquist.spec,1.10,1.11
Message-ID: <20090808221922.134DC11C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2760

Modified Files:
	nyquist.spec 
Log Message:



Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/F-10/nyquist.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nyquist.spec	8 Aug 2009 22:10:17 -0000	1.10
+++ nyquist.spec	8 Aug 2009 22:19:21 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nyquist
 Version:        3.03
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
@@ -12,6 +12,8 @@ Patch3:         nyqsrc303-make.patch
 Patch4:         nyqsrc303-gcc441.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
+BuildRequires:  liblo-devel
+BuildRequires:  portaudio-devel
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  dos2unix
 Requires:       java-1.6.0-openjdk



From gemi at fedoraproject.org  Sat Aug  8 22:47:31 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 22:47:31 +0000 (UTC)
Subject: rpms/ecl/devel .cvsignore, 1.6, 1.7 ecl.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <20090808224731.63DA011C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ecl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6754

Modified Files:
	.cvsignore ecl.spec sources 
Log Message:
new release 9.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Jun 2009 21:23:50 -0000	1.6
+++ .cvsignore	8 Aug 2009 22:47:30 -0000	1.7
@@ -1 +1 @@
-ecl-9.6.0.tgz
+ecl-9.8.1.tgz


Index: ecl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/devel/ecl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ecl.spec	24 Jul 2009 20:49:55 -0000	1.14
+++ ecl.spec	8 Aug 2009 22:47:30 -0000	1.15
@@ -1,23 +1,22 @@
 Name:           ecl
-Version:        9.6.1
-Release:        2%{?dist}
+Version:        9.8.1
+Release:        1%{?dist}
 Summary:        Embeddable Common-Lisp
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://ecls.sourceforge.net
-Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-9.6.0.tgz
-Patch0:         ecl-9.6.1-mp.patch
+Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-9.8.1.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel
 BuildRequires:	m4
 BuildRequires:	texinfo
 BuildRequires:  texi2html
 BuildRequires:  gmp-devel
+BuildRequires:  gc-devel
 Requires:       gcc
 Requires(post): policycoreutils /sbin/install-info
 Requires(postun): policycoreutils /sbin/install-info
-ExcludeArch:    ppc64
 
 %description
 ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp
@@ -31,7 +30,6 @@ to C, which can produce standalone execu
 
 %prep
 %setup0 -q
-%patch0 -p1
 # wrong character in texinfo file
 sed -i 's|\xc7||g' src/doc/user.txi
 # set rpath to the final path
@@ -40,9 +38,9 @@ find -name CVS | xargs rm -rf
 
 
 %build
-%configure --enable-boehm=included --enable-threads=yes --with-clx
+%configure --enable-boehm=system --enable-threads=yes --with-clx
 make
-(cd build/doc; make all)
+(cd build/doc; make all )
 
 
 %install
@@ -55,8 +53,8 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}
 find $RPM_BUILD_ROOT%{_libdir}/ecl* -name '*.lsp' | xargs chmod 0644
 
 %post
-/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
-/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || :
+#/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
+#/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || :
 /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/clx.info %{_infodir}/dir 2>/dev/null || :
@@ -65,7 +63,7 @@ find $RPM_BUILD_ROOT%{_libdir}/ecl* -nam
  
 %postun
 if [ $1 = 0 ]; then
-  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
+#  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/clx.info %{_infodir}/dir 2>/dev/null || :


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jun 2009 21:23:50 -0000	1.6
+++ sources	8 Aug 2009 22:47:30 -0000	1.7
@@ -1 +1 @@
-f9e4770f241918a744b64174c5ffbeab  ecl-9.6.0.tgz
+bf5898138747fc647b40a2e330e182a0  ecl-9.8.1.tgz



From gemi at fedoraproject.org  Sat Aug  8 22:51:43 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 22:51:43 +0000 (UTC)
Subject: rpms/ecl/devel ecl.spec,1.15,1.16
Message-ID: <20090808225143.A32C711C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ecl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7379

Modified Files:
	ecl.spec 
Log Message:



Index: ecl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/devel/ecl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ecl.spec	8 Aug 2009 22:47:30 -0000	1.15
+++ ecl.spec	8 Aug 2009 22:51:43 -0000	1.16
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 9.8.1-1
+- new release 9.8.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gemi at fedoraproject.org  Sat Aug  8 22:52:40 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 22:52:40 +0000 (UTC)
Subject: rpms/ecl/F-11 .cvsignore, 1.6, 1.7 ecl.spec, 1.13, 1.14 sources, 1.6,
	1.7
Message-ID: <20090808225240.5583611C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ecl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7484

Modified Files:
	.cvsignore ecl.spec sources 
Log Message:
new release 9.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Jun 2009 21:23:49 -0000	1.6
+++ .cvsignore	8 Aug 2009 22:52:40 -0000	1.7
@@ -1 +1 @@
-ecl-9.6.0.tgz
+ecl-9.8.1.tgz


Index: ecl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/F-11/ecl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ecl.spec	16 Jun 2009 21:23:50 -0000	1.13
+++ ecl.spec	8 Aug 2009 22:52:40 -0000	1.14
@@ -1,23 +1,22 @@
 Name:           ecl
-Version:        9.6.1
+Version:        9.8.1
 Release:        1%{?dist}
 Summary:        Embeddable Common-Lisp
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://ecls.sourceforge.net
-Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-9.6.0.tgz
-Patch0:         ecl-9.6.1-mp.patch
+Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-9.8.1.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel
 BuildRequires:	m4
 BuildRequires:	texinfo
 BuildRequires:  texi2html
 BuildRequires:  gmp-devel
+BuildRequires:  gc-devel
 Requires:       gcc
 Requires(post): policycoreutils /sbin/install-info
 Requires(postun): policycoreutils /sbin/install-info
-ExcludeArch:    ppc64
 
 %description
 ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp
@@ -31,7 +30,6 @@ to C, which can produce standalone execu
 
 %prep
 %setup0 -q
-%patch0 -p1
 # wrong character in texinfo file
 sed -i 's|\xc7||g' src/doc/user.txi
 # set rpath to the final path
@@ -40,9 +38,9 @@ find -name CVS | xargs rm -rf
 
 
 %build
-%configure --enable-boehm=included --enable-threads=yes --with-clx
+%configure --enable-boehm=system --enable-threads=yes --with-clx
 make
-(cd build/doc; make all)
+(cd build/doc; make all )
 
 
 %install
@@ -55,8 +53,8 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}
 find $RPM_BUILD_ROOT%{_libdir}/ecl* -name '*.lsp' | xargs chmod 0644
 
 %post
-/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
-/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || :
+#/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
+#/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || :
 /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/clx.info %{_infodir}/dir 2>/dev/null || :
@@ -65,7 +63,7 @@ find $RPM_BUILD_ROOT%{_libdir}/ecl* -nam
  
 %postun
 if [ $1 = 0 ]; then
-  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
+#  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/clx.info %{_infodir}/dir 2>/dev/null || :
@@ -91,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 9.8.1-1
+- new release 9.8.1
+
 * Tue Jun 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 9.6.1-1
 - new release 9.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jun 2009 21:23:50 -0000	1.6
+++ sources	8 Aug 2009 22:52:40 -0000	1.7
@@ -1 +1 @@
-f9e4770f241918a744b64174c5ffbeab  ecl-9.6.0.tgz
+bf5898138747fc647b40a2e330e182a0  ecl-9.8.1.tgz



From cwickert at fedoraproject.org  Sat Aug  8 23:20:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  8 Aug 2009 23:20:22 +0000 (UTC)
Subject: rpms/xfce4-weather-plugin/devel .cvsignore, 1.9, 1.10 sources, 1.9, 
	1.10 xfce4-weather-plugin.spec, 1.21, 1.22
Message-ID: <20090808232022.7259511C0425@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-weather-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11345

Modified Files:
	.cvsignore sources xfce4-weather-plugin.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
- Update to 0.7.3, fixes cache directory creation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Jul 2009 22:06:17 -0000	1.9
+++ .cvsignore	8 Aug 2009 23:20:21 -0000	1.10
@@ -1 +1 @@
-xfce4-weather-plugin-0.7.2.tar.bz2
+xfce4-weather-plugin-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Jul 2009 22:06:17 -0000	1.9
+++ sources	8 Aug 2009 23:20:21 -0000	1.10
@@ -1 +1 @@
-621bd474762475867232a968c77c5feb  xfce4-weather-plugin-0.7.2.tar.bz2
+b3436929dd94cdd8acc744c474cca5c4  xfce4-weather-plugin-0.7.3.tar.bz2


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xfce4-weather-plugin.spec	28 Jul 2009 22:06:17 -0000	1.21
+++ xfce4-weather-plugin.spec	8 Aug 2009 23:20:21 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		xfce4-weather-plugin
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
@@ -61,6 +61,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
+- Update to 0.7.3, fixes cache directory creation
+
 * Tue Jul 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.2-1
 - Update to 0.7.2
 - No longer contains weather.com logo, downloaded to cache at runtime (#513057)



From cwickert at fedoraproject.org  Sat Aug  8 23:22:36 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  8 Aug 2009 23:22:36 +0000 (UTC)
Subject: rpms/xfce4-weather-plugin/F-10 .cvsignore, 1.9, 1.10 sources, 1.9, 
	1.10 xfce4-weather-plugin.spec, 1.17, 1.18
Message-ID: <20090808232236.5260511C02CB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-weather-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11731/F-10

Modified Files:
	.cvsignore sources xfce4-weather-plugin.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
- Update to 0.7.3, fixes cache directory creation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Jul 2009 22:16:20 -0000	1.9
+++ .cvsignore	8 Aug 2009 23:22:35 -0000	1.10
@@ -1 +1 @@
-xfce4-weather-plugin-0.7.2.tar.bz2
+xfce4-weather-plugin-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Jul 2009 22:16:20 -0000	1.9
+++ sources	8 Aug 2009 23:22:35 -0000	1.10
@@ -1 +1 @@
-621bd474762475867232a968c77c5feb  xfce4-weather-plugin-0.7.2.tar.bz2
+b3436929dd94cdd8acc744c474cca5c4  xfce4-weather-plugin-0.7.3.tar.bz2


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/F-10/xfce4-weather-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-weather-plugin.spec	28 Jul 2009 22:16:20 -0000	1.17
+++ xfce4-weather-plugin.spec	8 Aug 2009 23:22:36 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		xfce4-weather-plugin
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
@@ -61,6 +61,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
+- Update to 0.7.3, fixes cache directory creation
+
 * Tue Jul 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.2-1
 - Update to 0.7.2
 - No longer contains weather.com logo, downloaded to cache at runtime (#513057)



From cwickert at fedoraproject.org  Sat Aug  8 23:22:36 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  8 Aug 2009 23:22:36 +0000 (UTC)
Subject: rpms/xfce4-weather-plugin/F-11 .cvsignore, 1.9, 1.10 sources, 1.9, 
	1.10 xfce4-weather-plugin.spec, 1.19, 1.20
Message-ID: <20090808232236.9856511C02CB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-weather-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11731/F-11

Modified Files:
	.cvsignore sources xfce4-weather-plugin.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
- Update to 0.7.3, fixes cache directory creation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Jul 2009 22:16:19 -0000	1.9
+++ .cvsignore	8 Aug 2009 23:22:36 -0000	1.10
@@ -1 +1 @@
-xfce4-weather-plugin-0.7.2.tar.bz2
+xfce4-weather-plugin-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Jul 2009 22:16:19 -0000	1.9
+++ sources	8 Aug 2009 23:22:36 -0000	1.10
@@ -1 +1 @@
-621bd474762475867232a968c77c5feb  xfce4-weather-plugin-0.7.2.tar.bz2
+b3436929dd94cdd8acc744c474cca5c4  xfce4-weather-plugin-0.7.3.tar.bz2


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/F-11/xfce4-weather-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-weather-plugin.spec	28 Jul 2009 22:16:19 -0000	1.19
+++ xfce4-weather-plugin.spec	8 Aug 2009 23:22:36 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		xfce4-weather-plugin
-Version:	0.7.2
+Version:	0.7.3
 Release:	1%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
@@ -61,6 +61,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.3-1
+- Update to 0.7.3, fixes cache directory creation
+
 * Tue Jul 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.7.2-1
 - Update to 0.7.2
 - No longer contains weather.com logo, downloaded to cache at runtime (#513057)



From gemi at fedoraproject.org  Sat Aug  8 23:23:15 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat,  8 Aug 2009 23:23:15 +0000 (UTC)
Subject: rpms/ecl/F-10 .cvsignore, 1.6, 1.7 ecl.spec, 1.12, 1.13 sources, 1.6,
	1.7
Message-ID: <20090808232315.3166E11C02CB@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/ecl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11856/F-10

Modified Files:
	.cvsignore ecl.spec sources 
Log Message:
new release 9.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Jun 2009 21:19:41 -0000	1.6
+++ .cvsignore	8 Aug 2009 23:23:14 -0000	1.7
@@ -1 +1 @@
-ecl-9.6.0.tgz
+ecl-9.8.1.tgz


Index: ecl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/F-10/ecl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ecl.spec	16 Jun 2009 21:19:41 -0000	1.12
+++ ecl.spec	8 Aug 2009 23:23:15 -0000	1.13
@@ -1,19 +1,19 @@
 Name:           ecl
-Version:        9.6.1
+Version:        9.8.1
 Release:        1%{?dist}
 Summary:        Embeddable Common-Lisp
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://ecls.sourceforge.net
-Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-9.6.0.tgz
-Patch0:         ecl-9.6.1-mp.patch
+Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-9.8.1.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel
 BuildRequires:	m4
 BuildRequires:	texinfo
 BuildRequires:  texi2html
 BuildRequires:  gmp-devel
+BuildRequires:  gc-devel
 Requires:       gcc
 Requires(post): policycoreutils /sbin/install-info
 Requires(postun): policycoreutils /sbin/install-info
@@ -31,7 +31,6 @@ to C, which can produce standalone execu
 
 %prep
 %setup0 -q
-%patch0 -p1
 # wrong character in texinfo file
 sed -i 's|\xc7||g' src/doc/user.txi
 # set rpath to the final path
@@ -40,9 +39,9 @@ find -name CVS | xargs rm -rf
 
 
 %build
-%configure --enable-boehm=included --enable-threads=yes --with-clx
+%configure --enable-boehm=system --enable-threads=yes --with-clx
 make
-(cd build/doc; make all)
+(cd build/doc; make all )
 
 
 %install
@@ -55,8 +54,8 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}
 find $RPM_BUILD_ROOT%{_libdir}/ecl* -name '*.lsp' | xargs chmod 0644
 
 %post
-/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
-/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || :
+#/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
+#/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || :
 /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/clx.info %{_infodir}/dir 2>/dev/null || :
@@ -65,7 +64,7 @@ find $RPM_BUILD_ROOT%{_libdir}/ecl* -nam
  
 %postun
 if [ $1 = 0 ]; then
-  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
+#  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/clx.info %{_infodir}/dir 2>/dev/null || :
@@ -91,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 9.8.1-1
+- new release 9.8.1
+
 * Tue Jun 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 9.6.1-1
 - new release 9.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ecl/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jun 2009 21:19:41 -0000	1.6
+++ sources	8 Aug 2009 23:23:15 -0000	1.7
@@ -1 +1 @@
-f9e4770f241918a744b64174c5ffbeab  ecl-9.6.0.tgz
+bf5898138747fc647b40a2e330e182a0  ecl-9.8.1.tgz



From cwickert at fedoraproject.org  Sat Aug  8 23:59:47 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  8 Aug 2009 23:59:47 +0000 (UTC)
Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xfce4-xkb-plugin.spec, 1.21, 1.22
Message-ID: <20090808235948.1422511C02CB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18126

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
- Update to 0.5.3.3 (#502878)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Nov 2008 00:50:10 -0000	1.10
+++ .cvsignore	8 Aug 2009 23:59:46 -0000	1.11
@@ -1 +1 @@
-xfce4-xkb-plugin-0.5.2.tar.gz
+xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Nov 2008 00:50:10 -0000	1.10
+++ sources	8 Aug 2009 23:59:46 -0000	1.11
@@ -1 +1 @@
-c10bf6f8809a1722354cd91db8987fd3  xfce4-xkb-plugin-0.5.2.tar.gz
+b233cc9de1cbace075eaf6e2c9a8e685  xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xfce4-xkb-plugin.spec	27 Jul 2009 07:58:43 -0000	1.21
+++ xfce4-xkb-plugin.spec	8 Aug 2009 23:59:47 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
-Version:	0.5.2
-Release:	5%{?dist}
+Version:	0.5.3.3
+Release:	1%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,7 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	libxklavier-devel >= 3.2, librsvg2-devel >= 2.18, libwnck-devel >= 2.12
-BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
 Patch0:		xxp-0.5.2-xklavier-api.patch
@@ -25,7 +25,9 @@ XF86Config file or some other way (e.g. 
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 12
 %patch0 -p1 -b .api
+%endif
 
 %build
 %configure --disable-static
@@ -33,7 +35,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"
 %find_lang %{name}
 
 %clean
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
+- Update to 0.5.3.3 (#502878)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Sun Aug  9 00:10:13 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  9 Aug 2009 00:10:13 +0000 (UTC)
Subject: rpms/xfce4-xkb-plugin/F-11 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xfce4-xkb-plugin.spec, 1.19, 1.20
Message-ID: <20090809001013.72E6D11C0439@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19756

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
- Update to 0.5.3.3 (#502878)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Nov 2008 00:50:10 -0000	1.10
+++ .cvsignore	9 Aug 2009 00:10:13 -0000	1.11
@@ -1 +1 @@
-xfce4-xkb-plugin-0.5.2.tar.gz
+xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Nov 2008 00:50:10 -0000	1.10
+++ sources	9 Aug 2009 00:10:13 -0000	1.11
@@ -1 +1 @@
-c10bf6f8809a1722354cd91db8987fd3  xfce4-xkb-plugin-0.5.2.tar.gz
+b233cc9de1cbace075eaf6e2c9a8e685  xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-11/xfce4-xkb-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-xkb-plugin.spec	26 Feb 2009 09:17:08 -0000	1.19
+++ xfce4-xkb-plugin.spec	9 Aug 2009 00:10:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
-Version:	0.5.2
-Release:	3%{?dist}
+Version:	0.5.3.3
+Release:	1%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,9 +11,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	libxklavier-devel >= 3.2, librsvg2-devel >= 2.18, libwnck-devel >= 2.12
-BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
+Patch0:		xxp-0.5.2-xklavier-api.patch
+
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
 keyboard layout, and refreshes when layout changes. The layout can be 
@@ -23,6 +25,9 @@ XF86Config file or some other way (e.g. 
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 12
+%patch0 -p1 -b .api
+%endif
 
 %build
 %configure --disable-static
@@ -30,7 +35,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"
 %find_lang %{name}
 
 %clean
@@ -46,6 +51,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
+- Update to 0.5.3.3 (#502878)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 0.5.2-4
+- xxp-0.5.2-xklavier-api.patch: Fix for new libxklavier API.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sun Aug  9 00:11:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 00:11:46 +0000 (UTC)
Subject: rpms/amarok/devel amarok-parse-lyricwiki-website.patch, NONE,
	1.1 amarok.spec, 1.158, 1.159
Message-ID: <20090809001146.D656411C02CB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20078

Modified Files:
	amarok.spec 
Added Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
- lyricwiki patch (kdebug#202366)


amarok-parse-lyricwiki-website.patch:
 main.js |   36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

--- NEW FILE amarok-parse-lyricwiki-website.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index bce329c..d2b9902 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -27,6 +27,31 @@ Importer.loadQtBinding( "qt.core" );
 Importer.loadQtBinding( "qt.xml" );
 
 xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><lyric artist=\"{artist}\" title=\"{title}\">{lyrics}</lyric>";
+newxml = "";
+
+function onFinished2( response )
+{
+    try
+    {
+        if( response.length == 0 )
+            Amarok.Lyrics.showLyricsError( "Unable to contact server - no website returned" ); // TODO: this should be i18n able
+        else
+        {
+            doc2 = new QDomDocument();
+            doc2.setContent( response );
+            textboxtext = doc2.elementsByTagName( "textarea" ).at( 0 ).toElement().text();
+            lyr = /<lyrics>(.*)<\/lyrics>/.exec(textboxtext)[1];
+            //Amarok.debug( "matched: " + lyr );
+            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( lyr ) );
+            Amarok.Lyrics.showLyrics( newxml );
+        }
+    }
+    catch( err )
+    {
+        Amarok.Lyrics.showLyricsError( "Could not retrieve lyrics: " + err );
+        Amarok.debug( "error: " + err );
+    }
+}
 
 function onFinished( dat )
 {
@@ -38,13 +63,14 @@ function onFinished( dat )
         {
             doc = new QDomDocument();
             doc.setContent( dat );
-            parsedContent = doc.elementsByTagName( "lyrics" ).at( 0 ).toElement().text();
-            parsedContent = parsedContent.replace( "<lyrics>", "" ).replace( "</lyrics>", "" ); // some lyrics have 2 lyrics in them...wtf?
             newxml = xml.replace( "{artist}", Amarok.Lyrics.escape( doc.elementsByTagName( "artist" ).at( 0 ).toElement().text() ) );
             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
-            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( parsedContent ) );
-            //Amarok.debug( "showing lyrics:" + newxml );
-            Amarok.Lyrics.showLyrics( newxml );
+            Amarok.debug( "returned URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            var url = decodeURI(doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            url = url.replace( /lyricwiki\.org\//, "lyricwiki.org/index.php?action=edit&title=" );
+            var url2 = new QUrl(url);
+            Amarok.debug( "request-2 URL: " + url2.toString() );
+            new Downloader( url2, onFinished2 );
         }
     }
     catch( err )


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- amarok.spec	24 Jul 2009 16:49:52 -0000	1.158
+++ amarok.spec	9 Aug 2009 00:11:46 -0000	1.159
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,11 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-# svn diff \
-#  svn://anonsvn.kde.org/home/kde/tags/amarok/2.0.96/amarok/  \
-#  svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/ 
-# and manually tweaked a bit to apply
-#Patch100: amarok-%{snap}svn.patch.gz
+## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=202366
+Patch100: amarok-parse-lyricwiki-website.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -69,6 +67,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyricwiki
 
 
 %build
@@ -150,6 +149,9 @@ fi
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
+- lyricwiki patch (kdebug#202366)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Sun Aug  9 00:16:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  9 Aug 2009 00:16:02 +0000 (UTC)
Subject: rpms/xfce4-xkb-plugin/F-11 xxp-0.5.2-xklavier-api.patch,NONE,1.1
Message-ID: <20090809001602.9B5E911C02CB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21597

Added Files:
	xxp-0.5.2-xklavier-api.patch 
Log Message:
add patch

xxp-0.5.2-xklavier-api.patch:
 xkb-config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xxp-0.5.2-xklavier-api.patch ---
diff -up xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c
--- xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx	2008-11-10 04:06:31.000000000 -0500
+++ xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c	2009-07-07 15:42:40.000000000 -0400
@@ -153,7 +153,7 @@ xkb_config_initialize_xkb_options (t_xkb
     config->application_map = g_hash_table_new (g_direct_hash, NULL);
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
     
     config_item = xkl_config_item_new ();
 
@@ -529,7 +529,7 @@ xkb_config_get_xkl_registry ()
     if (!config) return NULL;
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
 
     return registry;
 }



From rdieter at fedoraproject.org  Sun Aug  9 00:16:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 00:16:03 +0000 (UTC)
Subject: rpms/amarok/F-11 amarok-parse-lyricwiki-website.patch, NONE,
	1.1 amarok.spec, 1.149, 1.150
Message-ID: <20090809001603.CD54811C02CB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21617

Modified Files:
	amarok.spec 
Added Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
- lyricwiki patch (kdebug#202366)


amarok-parse-lyricwiki-website.patch:
 main.js |   36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

--- NEW FILE amarok-parse-lyricwiki-website.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index bce329c..d2b9902 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -27,6 +27,31 @@ Importer.loadQtBinding( "qt.core" );
 Importer.loadQtBinding( "qt.xml" );
 
 xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><lyric artist=\"{artist}\" title=\"{title}\">{lyrics}</lyric>";
+newxml = "";
+
+function onFinished2( response )
+{
+    try
+    {
+        if( response.length == 0 )
+            Amarok.Lyrics.showLyricsError( "Unable to contact server - no website returned" ); // TODO: this should be i18n able
+        else
+        {
+            doc2 = new QDomDocument();
+            doc2.setContent( response );
+            textboxtext = doc2.elementsByTagName( "textarea" ).at( 0 ).toElement().text();
+            lyr = /<lyrics>(.*)<\/lyrics>/.exec(textboxtext)[1];
+            //Amarok.debug( "matched: " + lyr );
+            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( lyr ) );
+            Amarok.Lyrics.showLyrics( newxml );
+        }
+    }
+    catch( err )
+    {
+        Amarok.Lyrics.showLyricsError( "Could not retrieve lyrics: " + err );
+        Amarok.debug( "error: " + err );
+    }
+}
 
 function onFinished( dat )
 {
@@ -38,13 +63,14 @@ function onFinished( dat )
         {
             doc = new QDomDocument();
             doc.setContent( dat );
-            parsedContent = doc.elementsByTagName( "lyrics" ).at( 0 ).toElement().text();
-            parsedContent = parsedContent.replace( "<lyrics>", "" ).replace( "</lyrics>", "" ); // some lyrics have 2 lyrics in them...wtf?
             newxml = xml.replace( "{artist}", Amarok.Lyrics.escape( doc.elementsByTagName( "artist" ).at( 0 ).toElement().text() ) );
             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
-            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( parsedContent ) );
-            //Amarok.debug( "showing lyrics:" + newxml );
-            Amarok.Lyrics.showLyrics( newxml );
+            Amarok.debug( "returned URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            var url = decodeURI(doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            url = url.replace( /lyricwiki\.org\//, "lyricwiki.org/index.php?action=edit&title=" );
+            var url2 = new QUrl(url);
+            Amarok.debug( "request-2 URL: " + url2.toString() );
+            new Downloader( url2, onFinished2 );
         }
     }
     catch( err )


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- amarok.spec	13 Jun 2009 23:25:03 -0000	1.149
+++ amarok.spec	9 Aug 2009 00:16:03 -0000	1.150
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 4%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,11 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-# svn diff \
-#  svn://anonsvn.kde.org/home/kde/tags/amarok/2.0.96/amarok/  \
-#  svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/ 
-# and manually tweaked a bit to apply
-#Patch100: amarok-%{snap}svn.patch.gz
+## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=202366
+Patch100: amarok-parse-lyricwiki-website.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -41,7 +39,7 @@ BuildRequires: taglib-extras-devel
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 BuildRequires: qtscriptbindings
-Requires: qtscriptbindings
+Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
 Obsoletes: amarok-devel < 1.4.9 
@@ -69,6 +67,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyricwiki
 
 
 %build
@@ -150,6 +149,15 @@ fi
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
+- lyricwiki patch (kdebug#202366)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-2
+- Requires: qtscriptbindings%%{?_isa}  (#510133)
+
 * Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-1
 - amarok-2.1.1
 



From rdieter at fedoraproject.org  Sun Aug  9 00:16:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 00:16:35 +0000 (UTC)
Subject: rpms/amarok/F-10 amarok-parse-lyricwiki-website.patch, NONE,
	1.1 amarok.spec, 1.146, 1.147
Message-ID: <20090809001635.ED03A11C02CB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21823

Modified Files:
	amarok.spec 
Added Files:
	amarok-parse-lyricwiki-website.patch 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
- lyricwiki patch (kdebug#202366)


amarok-parse-lyricwiki-website.patch:
 main.js |   36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

--- NEW FILE amarok-parse-lyricwiki-website.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index bce329c..d2b9902 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -27,6 +27,31 @@ Importer.loadQtBinding( "qt.core" );
 Importer.loadQtBinding( "qt.xml" );
 
 xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><lyric artist=\"{artist}\" title=\"{title}\">{lyrics}</lyric>";
+newxml = "";
+
+function onFinished2( response )
+{
+    try
+    {
+        if( response.length == 0 )
+            Amarok.Lyrics.showLyricsError( "Unable to contact server - no website returned" ); // TODO: this should be i18n able
+        else
+        {
+            doc2 = new QDomDocument();
+            doc2.setContent( response );
+            textboxtext = doc2.elementsByTagName( "textarea" ).at( 0 ).toElement().text();
+            lyr = /<lyrics>(.*)<\/lyrics>/.exec(textboxtext)[1];
+            //Amarok.debug( "matched: " + lyr );
+            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( lyr ) );
+            Amarok.Lyrics.showLyrics( newxml );
+        }
+    }
+    catch( err )
+    {
+        Amarok.Lyrics.showLyricsError( "Could not retrieve lyrics: " + err );
+        Amarok.debug( "error: " + err );
+    }
+}
 
 function onFinished( dat )
 {
@@ -38,13 +63,14 @@ function onFinished( dat )
         {
             doc = new QDomDocument();
             doc.setContent( dat );
-            parsedContent = doc.elementsByTagName( "lyrics" ).at( 0 ).toElement().text();
-            parsedContent = parsedContent.replace( "<lyrics>", "" ).replace( "</lyrics>", "" ); // some lyrics have 2 lyrics in them...wtf?
             newxml = xml.replace( "{artist}", Amarok.Lyrics.escape( doc.elementsByTagName( "artist" ).at( 0 ).toElement().text() ) );
             newxml = newxml.replace( "{title}", Amarok.Lyrics.escape( doc.elementsByTagName( "song" ).at( 0 ).toElement().text() ) );
-            newxml = newxml.replace( "{lyrics}", Amarok.Lyrics.escape( parsedContent ) );
-            //Amarok.debug( "showing lyrics:" + newxml );
-            Amarok.Lyrics.showLyrics( newxml );
+            Amarok.debug( "returned URL: " + doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            var url = decodeURI(doc.elementsByTagName( "url" ).at( 0 ).toElement().text());
+            url = url.replace( /lyricwiki\.org\//, "lyricwiki.org/index.php?action=edit&title=" );
+            var url2 = new QUrl(url);
+            Amarok.debug( "request-2 URL: " + url2.toString() );
+            new Downloader( url2, onFinished2 );
         }
     }
     catch( err )


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- amarok.spec	14 Jun 2009 00:08:07 -0000	1.146
+++ amarok.spec	9 Aug 2009 00:16:35 -0000	1.147
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 4%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,11 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
-# svn diff \
-#  svn://anonsvn.kde.org/home/kde/tags/amarok/2.0.96/amarok/  \
-#  svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/ 
-# and manually tweaked a bit to apply
-#Patch100: amarok-%{snap}svn.patch.gz
+## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=202366
+Patch100: amarok-parse-lyricwiki-website.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -41,7 +39,7 @@ BuildRequires: taglib-extras-devel
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 BuildRequires: qtscriptbindings
-Requires: qtscriptbindings
+Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
 Obsoletes: amarok-devel < 1.4.9 
@@ -69,6 +67,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyricwiki
 
 
 %build
@@ -150,6 +149,15 @@ fi
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
+- lyricwiki patch (kdebug#202366)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-2
+- Requires: qtscriptbindings%%{?_isa}  (#510133)
+
 * Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-1
 - amarok-2.1.1
 



From myoung at fedoraproject.org  Sun Aug  9 00:20:18 2009
From: myoung at fedoraproject.org (myoung)
Date: Sun,  9 Aug 2009 00:20:18 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1294.2.45,1.1294.2.46
Message-ID: <20090809002018.7C28011C0439@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22181

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec 
Log Message:
Don't try to build non-PAE pvops kernel for i686 because xen doesn't support it



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.45
retrieving revision 1.1294.2.46
diff -u -p -r1.1294.2.45 -r1.1294.2.46
--- kernel.spec	8 Aug 2009 18:06:03 -0000	1.1294.2.45
+++ kernel.spec	9 Aug 2009 00:20:17 -0000	1.1294.2.46
@@ -204,6 +204,7 @@ Summary: The Linux kernel
 # kernel-PAE is only built on i686.
 %ifarch i686
 %define with_pae 1
+%define with_up 0
 %else
 %define with_pae 0
 %endif
@@ -1975,6 +1976,7 @@ fi
 %changelog
 * Sat Aug 08 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops patch to latest rebase/master and current rawhide
+- tell kernel.spec not to build non-PAE kernel for i686
 
 * Fri Aug 07 2009 Justin M. Forbes <jforbes at redhat.com>
 - Apply KSM updates from upstream



From cwickert at fedoraproject.org  Sun Aug  9 00:30:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  9 Aug 2009 00:30:04 +0000 (UTC)
Subject: rpms/xfce4-xkb-plugin/F-10 xxp-0.5.2-xklavier-api.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xfce4-xkb-plugin.spec, 1.17, 1.18
Message-ID: <20090809003004.F289611C0427@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24009

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Added Files:
	xxp-0.5.2-xklavier-api.patch 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
- Update to 0.5.3.3 (#502878)


xxp-0.5.2-xklavier-api.patch:
 xkb-config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xxp-0.5.2-xklavier-api.patch ---
diff -up xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c
--- xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx	2008-11-10 04:06:31.000000000 -0500
+++ xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c	2009-07-07 15:42:40.000000000 -0400
@@ -153,7 +153,7 @@ xkb_config_initialize_xkb_options (t_xkb
     config->application_map = g_hash_table_new (g_direct_hash, NULL);
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
     
     config_item = xkl_config_item_new ();
 
@@ -529,7 +529,7 @@ xkb_config_get_xkl_registry ()
     if (!config) return NULL;
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
 
     return registry;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Nov 2008 01:11:53 -0000	1.10
+++ .cvsignore	9 Aug 2009 00:30:03 -0000	1.11
@@ -1 +1 @@
-xfce4-xkb-plugin-0.5.2.tar.gz
+xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Nov 2008 01:11:53 -0000	1.10
+++ sources	9 Aug 2009 00:30:03 -0000	1.11
@@ -1 +1 @@
-c10bf6f8809a1722354cd91db8987fd3  xfce4-xkb-plugin-0.5.2.tar.gz
+b233cc9de1cbace075eaf6e2c9a8e685  xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10/xfce4-xkb-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-xkb-plugin.spec	28 Nov 2008 01:11:53 -0000	1.17
+++ xfce4-xkb-plugin.spec	9 Aug 2009 00:30:03 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		xfce4-xkb-plugin
-Version:	0.5.2
+Version:	0.5.3.3
 Release:	1%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
@@ -11,9 +11,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	libxklavier-devel >= 3.2, librsvg2-devel >= 2.18, libwnck-devel >= 2.12
-BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
+Patch0:		xxp-0.5.2-xklavier-api.patch
+
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
 keyboard layout, and refreshes when layout changes. The layout can be 
@@ -23,6 +25,9 @@ XF86Config file or some other way (e.g. 
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 12
+%patch0 -p1 -b .api
+%endif
 
 %build
 %configure --disable-static
@@ -30,7 +35,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"
 %find_lang %{name}
 
 %clean
@@ -46,6 +51,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
+- Update to 0.5.3.3 (#502878)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 0.5.2-4
+- xxp-0.5.2-xklavier-api.patch: Fix for new libxklavier API.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2
 



From krh at fedoraproject.org  Sun Aug  9 00:53:26 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Sun,  9 Aug 2009 00:53:26 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel dri2-page-flip.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.19, 1.20
Message-ID: <20090809005326.49D5011C02CB@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-serv28330

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	dri2-page-flip.patch 
Log Message:
* Fri Aug 7 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-4
- Add dri2-page-flip.patch to enable full screen pageflipping.
  Fixes XKCD #619.


dri2-page-flip.patch:
 drmmode_display.c |  126 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    6 ++
 i830_dri.c        |   62 ++++++++++++++++++++++++--
 i830_dri.h        |    6 ++
 4 files changed, 194 insertions(+), 6 deletions(-)

--- NEW FILE dri2-page-flip.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 814743b..05541de 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <errno.h>
+#include <poll.h>
 
 #include <sys/ioctl.h>
 
@@ -43,6 +44,11 @@ typedef struct {
     uint32_t fb_id;
     drmModeResPtr mode_res;
     int cpp;
+    
+    drmEventContext event_context;
+    void *swap_data;
+    int old_fb_id;
+    int flip_count;
 } drmmode_rec, *drmmode_ptr;
 
 typedef struct {
@@ -343,6 +349,7 @@ static PixmapPtr
 drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 {
 	ScrnInfoPtr pScrn = crtc->scrn;
+	I830Ptr     pI830 = I830PTR(pScrn);
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 	unsigned long rotate_pitch;
@@ -375,12 +382,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 	if (drmmode_crtc->rotate_bo)
 		i830_set_pixmap_bo(rotate_pixmap, drmmode_crtc->rotate_bo);
 
+	pI830->shadow_present = TRUE;
+
 	return rotate_pixmap;
 }
 
 static void
 drmmode_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
 {
+	ScrnInfoPtr pScrn = crtc->scrn;
+	I830Ptr     pI830 = I830PTR(pScrn);
 	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 
@@ -398,6 +409,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *dat
 		dri_bo_unreference(drmmode_crtc->rotate_bo);
 		drmmode_crtc->rotate_bo = NULL;
 	}
+	pI830->shadow_present = FALSE;
 }
 
 static void
@@ -1085,15 +1097,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 	return FALSE;
 }
 
+Bool
+drmmode_do_pageflip(DrawablePtr pDraw, dri_bo *new_front, dri_bo *old_front,
+		    void *data)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    I830Ptr pI830 = I830PTR(pScrn);
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    drmmode_crtc_private_ptr drmmode_crtc = config->crtc[0]->driver_private;
+    drmmode_ptr drmmode = drmmode_crtc->drmmode;
+    unsigned int pitch = pScrn->displayWidth * pI830->cpp;
+    int i;
+    unsigned int crtc_id;
+
+    /*
+     * Create a new handle for the back buffer
+     */
+    drmmode->old_fb_id = drmmode->fb_id;
+    if (drmModeAddFB(drmmode->fd, pScrn->virtualX, pScrn->virtualY,
+		     pScrn->depth, pScrn->bitsPerPixel, pitch,
+		     new_front->handle, &drmmode->fb_id))
+	    goto error_out;
+
+    /*
+     * Queue flips on all enabled CRTCs
+     * Note that if/when we get per-CRTC buffers, we'll have to update this.
+     * Right now it assumes a single shared fb across all CRTCs, with the
+     * kernel fixing up the offset of each CRTC as necessary.
+     *
+     * Also, flips queued on disabled or incorrectly configured displays
+     * may never complete; this is a configuration error.
+     */
+    drmmode->flip_count = 0;
+    for (i = 0; i < config->num_crtc; i++) {
+	    xf86CrtcPtr crtc = config->crtc[i];
+
+	    if (!crtc->enabled)
+		    continue;
+
+	    drmmode_crtc = crtc->driver_private;
+	    crtc_id = drmmode_crtc->mode_crtc->crtc_id;
+	    drmmode->swap_data = data;
+	    if (drmModePageFlip(drmmode->fd, crtc_id, drmmode->fb_id, drmmode)) {
+		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			       "flip queue failed: %s\n", strerror(errno));
+		    goto error_undo;
+	    }
+	    drmmode->flip_count++;
+    }
+
+    pScrn->fbOffset = new_front->offset;
+    pI830->front_buffer->bo = new_front;
+    pI830->front_buffer->offset = new_front->offset;
+
+    return TRUE;
+
+error_undo:
+    drmModeRmFB(drmmode->fd, drmmode->fb_id);
+    drmmode->fb_id = drmmode->old_fb_id;
+
+error_out:
+    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Page flip failed: %s\n",
+	       strerror(errno));
+    return FALSE;
+}
+
 static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
 	drmmode_xf86crtc_resize
 };
 
+static void
+drmmode_page_flip_handler(int fd,
+			  unsigned int frame, 
+			  unsigned int tv_sec,
+			  unsigned int tv_usec,
+			  void *user_data)
+{
+    drmmode_ptr drmmode = user_data;
+
+    drmmode->flip_count--;
+    if (drmmode->flip_count > 0)
+	return;
+
+    drmModeRmFB(drmmode->fd, drmmode->old_fb_id);
+
+    DRI2SwapComplete(drmmode->swap_data);
+}
+
+static void
+drm_wakeup_handler(pointer data, int err, pointer p)
+{
+    drmmode_ptr drmmode = data;
+    fd_set *read_mask = p;
+
+    if (err >= 0 && FD_ISSET(drmmode->fd, read_mask))
+	drmHandleEvent(drmmode->fd, &drmmode->event_context);
+}
+
 Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
 {
 	xf86CrtcConfigPtr   xf86_config;
+	I830Ptr pI830 = I830PTR(pScrn);
 	drmmode_ptr drmmode;
-	int i;
+	unsigned int i, bad_crtc = 0;
+	int ret;
 
 	drmmode = xnfalloc(sizeof *drmmode);
 	drmmode->fd = fd;
@@ -1120,6 +1227,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
 
 	xf86InitialConfiguration(pScrn, TRUE);
 
+	/* Check for swapbuffers support */
+	ret = drmModePageFlip(drmmode->fd, bad_crtc, 1, NULL);
+	if (ret < 0 && errno == ENOENT) { /* bad CRTC or FB number */
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			   "Kernel page flipping support detected, enabling\n");
+		pI830->use_swap_buffers = TRUE;
+
+		drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
+		drmmode->event_context.page_flip_handler =
+		    drmmode_page_flip_handler;
+		AddGeneralSocket(fd);
+		RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
+					       drm_wakeup_handler,
+					       drmmode);
+	}
+
 	return TRUE;
 }
 
diff --git a/src/i830.h b/src/i830.h
index 58afe76..16e3c55 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -65,6 +65,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "sarea.h"
 #define _XF86DRI_SERVER_
 #include "dri.h"
+#include "dri2.h"
 #include "GL/glxint.h"
 #include "i830_dri.h"
 #include "intel_bufmgr.h"
@@ -395,6 +396,7 @@ typedef struct _I830Rec {
 #endif
 
    XF86ModReqInfo shadowReq; /* to test for later libshadow */
+   Bool shadow_present;
    Rotation rotation;
    void (*PointerMoved)(int, int, int);
    CreateScreenResourcesProcPtr    CreateScreenResources;
@@ -496,6 +498,8 @@ typedef struct _I830Rec {
    int drmSubFD;
    char deviceName[64];
 
+   Bool use_swap_buffers;
+
    /* Broken-out options. */
    OptionInfoPtr Options;
 
@@ -691,6 +695,8 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
 extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
 extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
 extern int drmmode_output_dpms_status(xf86OutputPtr output);
+extern Bool drmmode_do_pageflip(DrawablePtr pDraw, dri_bo *new_front,
+				dri_bo *old_front, void *data);
 extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
 
 extern Bool i830_crtc_on(xf86CrtcPtr crtc);
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 40d11e4..b34b9b7 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -45,6 +45,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/time.h>
+#include <time.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -73,11 +75,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 extern XF86ModuleData dri2ModuleData;
 #endif
 
-typedef struct {
-    PixmapPtr pPixmap;
-    unsigned int attachment;
-} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
-
 #ifndef USE_DRI2_1_1_0
 static DRI2BufferPtr
 I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
@@ -359,6 +356,54 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 
 }
 
+#if DRI2INFOREC_VERSION >= 4
+
+/*
+ * DRI2SwapBuffers should try to do a buffer swap if possible, however:
+ *   - if we're swapping buffers smaller than the screen, we have to blit
+ *   - if the back buffer doesn't match the screen depth, we have to blit
+ *   - otherwise we try to swap, and return to the caller the new front
+ *     and back buffers
+ */
+static Bool
+I830DRI2SwapBuffers(DrawablePtr pDraw,
+		    DRI2BufferPtr front, DRI2BufferPtr back, void *data)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    I830Ptr pI830 = I830PTR(pScrn);
+    I830DRI2BufferPrivatePtr front_priv, back_priv;
+    dri_bo *tmp_bo;
+    int tmp;
+
+    front_priv = front->driverPrivate;
+    back_priv = back->driverPrivate;
+
+    if (pI830->shadow_present)
+	return FALSE;
+
+    /* Swap BO names so DRI works */
+    tmp = front->name;
+    front->name = back->name;
+    back->name = tmp;
+
+    /* Swap pixmap bos */
+    dri_bo_reference(i830_get_pixmap_bo(front_priv->pPixmap));
+
+    tmp_bo = i830_get_pixmap_bo(front_priv->pPixmap);
+    i830_set_pixmap_bo(front_priv->pPixmap,
+		       i830_get_pixmap_bo(back_priv->pPixmap));
+    i830_set_pixmap_bo(back_priv->pPixmap, tmp_bo); /* should be screen */
+
+    if (front_priv->pPixmap != pScreen->GetScreenPixmap(pScreen))
+	FatalError("swapbuffers with bad front\n");
+
+    /* Page flip the full screen buffer */
+    return drmmode_do_pageflip(pDraw, i830_get_pixmap_bo(front_priv->pPixmap),
+			       i830_get_pixmap_bo(back_priv->pPixmap), data);
+}
+#endif
+
 Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
@@ -428,6 +473,13 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 # endif
 #endif
 
+#if DRI2INFOREC_VERSION >= 4
+    if (pI830->use_swap_buffers) {
+	info.version = 4;
+	info.SwapBuffers = I830DRI2SwapBuffers;
+    }
+#endif
+
     info.CopyRegion = I830DRI2CopyRegion;
 
     return DRI2ScreenInit(pScreen, &info);
diff --git a/src/i830_dri.h b/src/i830_dri.h
index bedbcbe..e35e940 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -2,6 +2,7 @@
 #ifndef _I830_DRI_H
 #define _I830_DRI_H
 
+#include "xorg-server.h"
 #include "xf86drm.h"
 #include "i830_common.h"
 
@@ -58,4 +59,9 @@ typedef struct {
    int dummy;
 } I830DRIContextRec, *I830DRIContextPtr;
 
+typedef struct {
+    PixmapPtr pPixmap;
+    unsigned int attachment;
+} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
+
 #endif


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xorg-x11-drv-intel.spec	4 Aug 2009 05:58:19 -0000	1.19
+++ xorg-x11-drv-intel.spec	9 Aug 2009 00:53:25 -0000	1.20
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -30,6 +30,7 @@ Patch4: intel-abi-fix.patch
 Patch20: intel-2.8.0-kms-get-crtc.patch
 
 Patch30: intel-chip-names.patch
+Patch40: dri2-page-flip.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -82,6 +83,7 @@ Debugging tools for Intel graphics chips
 %patch4 -p1 -b .abi
 %patch20 -p1 -b .get-crtc
 %patch30 -p1 -b .names
+%patch40 -p1 -b .flip
 
 %build
  
@@ -137,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Fri Aug 7 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-4
+- Add dri2-page-flip.patch to enable full screen pageflipping.
+  Fixes XKCD #619.
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 2.8.0-3
 - add ABI fixes for RAC removal
 



From rdieter at fedoraproject.org  Sun Aug  9 04:17:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 04:17:40 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.228,1.229
Message-ID: <20090809041740.8532711C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18853

Modified Files:
	kdepim.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- -libs: move designer plugins here
- %check: desktop-file-validate
- don't own %{_kde4_appsdir}/kconf_update/



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- kdepim.spec	30 Jul 2009 08:44:49 -0000	1.228
+++ kdepim.spec	9 Aug 2009 04:17:38 -0000	1.229
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,7 +22,7 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 
 # Upgrade path
 %if 0%{?fedora} < 12
-Requires: kdepim-runtime >= %{version}
+Requires: kdepim-runtime%{?_isa} >= %{version}
 %endif
 
 BuildRequires: akonadi-devel
@@ -73,7 +73,7 @@ Requires(hint): spambayes
 Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdepim4-devel = %{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -124,6 +124,12 @@ done
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -161,8 +167,26 @@ rm -rf %{buildroot}
 %endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
-%{_kde4_datadir}/applications/kde4/*
-%{_kde4_appsdir}/*
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/akregator/
+%{_kde4_appsdir}/kaddressbook/
+%{_kde4_appsdir}/kalarm/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kdepimwidgets/
+%{_kde4_appsdir}/kjots/
+%{_kde4_appsdir}/kleopatra/
+%{_kde4_appsdir}/kmail/
+%{_kde4_appsdir}/knode/
+%{_kde4_appsdir}/knotes/
+%{_kde4_appsdir}/konsolekalendar/
+%{_kde4_appsdir}/kontact/
+%{_kde4_appsdir}/korgac/
+%{_kde4_appsdir}/korganizer/
+%{_kde4_appsdir}/kpilot/
+%{_kde4_appsdir}/ktimetracker/
+%{_kde4_appsdir}/kwatchgnupg/
+%{_kde4_appsdir}/libkdepim/
+%{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
@@ -176,6 +200,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/kde4/plugins/designer/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -184,10 +209,14 @@ rm -rf %{buildroot}
 %if 0%{?_with_pilot_link:1}
 %exclude %{_kde4_libdir}/libkpilot_*.so
 %endif
-%{_kde4_libdir}/kde4/plugins/designer/*
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- -libs: move designer plugins here
+- %%check: desktop-file-validate
+- don't own %%{_kde4_appsdir}/kconf_update/
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Sun Aug  9 04:24:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 04:24:24 +0000 (UTC)
Subject: rpms/qscintilla/devel qscintilla.spec,1.27,1.28
Message-ID: <20090809042424.5965211C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30512

Modified Files:
	qscintilla.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
- include designer plugin in main pkg, Obsoletes: qscintilla-designer



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- qscintilla.spec	27 Jul 2009 02:34:46 -0000	1.27
+++ qscintilla.spec	9 Aug 2009 04:24:24 -0000	1.28
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -18,6 +18,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # TODO: upstream this
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
+Obsoletes: qscintilla-designer < 2.4-3
+Provides:  qscintilla-designer = %{version}-%{release}
+
 BuildRequires:  qt4-devel
 
 # for -python
@@ -34,15 +37,6 @@ QScintilla is a port of Scintilla to the
 
 %{?scintilla_ver:This version of QScintilla is based on Scintilla v%{scintilla_ver}.}
 
-
-%package designer
-Summary:  QScintilla designer plugin 
-Group:    Development/Tools
-Requires: %{name} = %{version}-%{release}
-Requires: qt4-designer
-%description designer
-%{summary}.
-
 %package devel
 Summary:  QScintilla Development Files
 Group:    Development/Libraries
@@ -131,13 +125,10 @@ rm -rf %{buildroot}
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
 %{_qt4_libdir}/libqscintilla2.so.5*
+%{_qt4_plugindir}/designer/libqscintillaplugin.so
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
-%files designer
-%defattr(-,root,root,-)
-%{_qt4_plugindir}/designer/libqscintillaplugin.so
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
@@ -156,6 +147,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
+- include designer plugin in main pkg, Obsoletes: qscintilla-designer
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sun Aug  9 04:38:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 04:38:52 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.198,1.199
Message-ID: <20090809043852.9F8ED11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32510

Modified Files:
	kdeedu.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
- -libs: move libavogadro-kalzium libcompoundviewer here
- new -marble-libs pkg



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- kdeedu.spec	2 Aug 2009 00:26:56 -0000	1.198
+++ kdeedu.spec	9 Aug 2009 04:38:50 -0000	1.199
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -92,8 +92,7 @@ Group:   System Environment/Libraries
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# libmarble
-Requires: %{name}-marble%{?_isa} = %{version}-%{release}
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -114,12 +113,12 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %package marble
 Summary: A World Atlas
 Group:   Amusements/Games
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
+# multilib, when marble-libs was introduced
+Obsoletes: %{name}-marble < 4.3.0-3
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't
-# strictly required.
-#Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
@@ -127,6 +126,13 @@ Provides:  marble = 1:0.7-%{release}
 %description marble
 %{summary}.
 
+%package marble-libs
+Summary: Runtime libraries for marble 
+Group:   System Environment/Libraries
+Requires: %{name}-marble = %{version}-%{release}
+%description marble-libs
+%{summary}.
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -297,8 +303,6 @@ rm -rf %{buildroot}
 
 # kalzium
 %{_kde4_libdir}/avogadro-kalzium/
-%{_kde4_libdir}/libavogadro-kalzium.so.*
-%{_kde4_libdir}/libcompoundviewer.so.*
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -369,10 +373,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/libkdeedu*.so.*
-%{_kde4_libdir}/libkeduvocdocument.so.*
-%{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libscience.so.*
+%{_kde4_libdir}/libavogadro-kalzium.so.0*
+%{_kde4_libdir}/libcompoundviewer.so.4*
+%{_kde4_libdir}/libkdeeduui.so.4*
+%{_kde4_libdir}/libkeduvocdocument.so.4*
+%{_kde4_libdir}/libkiten.so.4*
+%{_kde4_libdir}/libscience.so.4*
 # needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
@@ -460,6 +466,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
+- -libs: move libavogadro-kalzium libcompoundviewer here
+- new -marble-libs pkg
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - move kalziumuiwidgets.so designer plugin to -libs
 - tighten -libs deps using %%?_isa



From rdieter at fedoraproject.org  Sun Aug  9 04:43:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 04:43:42 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.229,1.230
Message-ID: <20090809044342.23D8D11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv729

Modified Files:
	kdepim.spec 
Log Message:
unpackaged files



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- kdepim.spec	9 Aug 2009 04:17:38 -0000	1.229
+++ kdepim.spec	9 Aug 2009 04:43:41 -0000	1.230
@@ -176,10 +176,12 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kjots/
 %{_kde4_appsdir}/kleopatra/
 %{_kde4_appsdir}/kmail/
+%{_kde4_appsdir}/kmailcvt/
 %{_kde4_appsdir}/knode/
 %{_kde4_appsdir}/knotes/
 %{_kde4_appsdir}/konsolekalendar/
 %{_kde4_appsdir}/kontact/
+%{_kde4_appsdir}/kontactsummary/
 %{_kde4_appsdir}/korgac/
 %{_kde4_appsdir}/korganizer/
 %{_kde4_appsdir}/kpilot/



From konradm at fedoraproject.org  Sun Aug  9 05:24:05 2009
From: konradm at fedoraproject.org (konradm)
Date: Sun,  9 Aug 2009 05:24:05 +0000 (UTC)
Subject: rpms/python-zope-event/devel import.log, NONE,
	1.1 python-zope-event.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090809052405.D806A11C00D7@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-zope-event/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-zope-event.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
python-zope-event-3_4_1-1_fc11:HEAD:python-zope-event-3.4.1-1.fc11.src.rpm:1249795346


--- NEW FILE python-zope-event.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zope-event
Version:        3.4.1
Release:        1%{?dist}
Summary:        Zope Event Publication
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://pypi.python.org/pypi/zope.event/
Source0:        http://pypi.python.org/packages/source/z/zope.event/zope.event-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  python-zope-testing
Requires:       python-zope-filesystem


%description
The zope.event package provides a simple event system. It provides
an event publishing system and a very simple event-dispatching system
on which more sophisticated event dispatching systems can be built.
(For example, a type-based event dispatching system that builds on
zope.event can be found in zope.component.)


%prep
%setup -q -n zope.event-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%check
%{__python} setup.py test

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/zope/*
%{python_sitelib}/zope.event*


%changelog
* Sun Jul 5 2009 Conrad Meyer <konrad at tylerc.org> - 3.4.1-1
- Add missing BR on python-setuptools.
- Enable testing stuff as zope-testing is in devel.

* Sun Dec 14 2008 Conrad Meyer <konrad at tylerc.org> - 3.4.0-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-event/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Jul 2009 03:40:41 -0000	1.1
+++ .cvsignore	9 Aug 2009 05:24:04 -0000	1.2
@@ -0,0 +1 @@
+zope.event-3.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-event/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Jul 2009 03:40:41 -0000	1.1
+++ sources	9 Aug 2009 05:24:04 -0000	1.2
@@ -0,0 +1 @@
+dedf8ec89b7852745accbee4aa5110e2  zope.event-3.4.1.tar.gz



From konradm at fedoraproject.org  Sun Aug  9 05:28:16 2009
From: konradm at fedoraproject.org (konradm)
Date: Sun,  9 Aug 2009 05:28:16 +0000 (UTC)
Subject: rpms/python-zc-lockfile/devel import.log, NONE,
	1.1 python-zc-lockfile.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090809052816.C2CD211C00D7@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-zc-lockfile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8216/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-zc-lockfile.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
python-zc-lockfile-1_0_0-2_fc10:HEAD:python-zc-lockfile-1.0.0-2.fc10.src.rpm:1249795610


--- NEW FILE python-zc-lockfile.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-zc-lockfile
Version:        1.0.0
Release:        2%{?dist}
Summary:        Basic Inter-Process Locks
Group:          Development/Languages
License:        ZPLv2.1
URL:            http://pypi.python.org/pypi/zc.lockfile/
Source0:        http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
BuildRequires:  python-zope-testing


%description
The zc.lockfile package provides a basic portable implementation of
interprocess locks using lock files. The purpose if not specifically
to lock files, but to simply provide locks with an implementation based
on file-locking primitives. Of course, these locks could be used to
mediate access to other files. For example, the ZODB file storage
implementation uses file locks to mediate access to file-storage
database files. The database files and lock file files are separate files.


%prep
%setup -q -n zc.lockfile-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%check
%{__python} setup.py test

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt
%{python_sitelib}/*


%changelog
* Sun Jul 5 2009 Conrad Meyer <konrad at tylerc.org> - 1.0.0-2
- Add missing BR on python-setuptools.
- Enable testing stuff as python-zope-testing is in devel.

* Mon Dec 15 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.0-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zc-lockfile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Jul 2009 03:39:58 -0000	1.1
+++ .cvsignore	9 Aug 2009 05:28:16 -0000	1.2
@@ -0,0 +1 @@
+zc.lockfile-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zc-lockfile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Jul 2009 03:39:58 -0000	1.1
+++ sources	9 Aug 2009 05:28:16 -0000	1.2
@@ -0,0 +1 @@
+6cf83766ef9935c33e240b0904c7a45e  zc.lockfile-1.0.0.tar.gz



From jnovy at fedoraproject.org  Sun Aug  9 06:09:16 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sun,  9 Aug 2009 06:09:16 +0000 (UTC)
Subject: rpms/libvorbis/F-10 r16182-CVE-2009-2663.patch, NONE,
	1.1 libvorbis.spec, 1.32, 1.33
Message-ID: <20090809060916.BB13411C00D7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libvorbis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16319

Modified Files:
	libvorbis.spec 
Added Files:
	r16182-CVE-2009-2663.patch 
Log Message:
* Sun Aug  9 2009 Jindrich Novy <jnovy at redhat.com> 1.2.0-6
- fix CVE-2009-2663 (#516259)


r16182-CVE-2009-2663.patch:
 floor1.c |   18 ++++++++++++++----
 res0.c   |    4 +++-
 2 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE r16182-CVE-2009-2663.patch ---
diff -up libvorbis-1.2.0/lib/floor1.c.r16182-CVE-2009-2663 libvorbis-1.2.0/lib/floor1.c
--- libvorbis-1.2.0/lib/floor1.c.r16182-CVE-2009-2663	2007-07-24 02:09:47.000000000 +0200
+++ libvorbis-1.2.0/lib/floor1.c	2009-08-08 21:11:18.000000000 +0200
@@ -138,6 +138,9 @@ static void floor1_pack (vorbis_info_flo
   }
 }
 
+static int icomp(const void *a,const void *b){
+  return(**(int **)a-**(int **)b);
+}
 
 static vorbis_info_floor *floor1_unpack (vorbis_info *vi,oggpack_buffer *opb){
   codec_setup_info     *ci=vi->codec_setup;
@@ -182,6 +185,17 @@ static vorbis_info_floor *floor1_unpack 
   info->postlist[0]=0;
   info->postlist[1]=1<<rangebits;
 
+  /* don't allow repeated values in post list as they'd result in
+     zero-length segments */
+  { 
+    int *sortpointer[VIF_POSIT+2];
+    for(j=0;j<count+2;j++)sortpointer[j]=info->postlist+j;
+    qsort(sortpointer,count+2,sizeof(*sortpointer),icomp);
+
+    for(j=1;j<count+2;j++)
+      if(*sortpointer[j-1]==*sortpointer[j])goto err_out;
+  }
+
   return(info);
   
  err_out:
@@ -189,10 +203,6 @@ static vorbis_info_floor *floor1_unpack 
   return(NULL);
 }
 
-static int icomp(const void *a,const void *b){
-  return(**(int **)a-**(int **)b);
-}
-
 static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd,
 				      vorbis_info_floor *in){
 
diff -up libvorbis-1.2.0/lib/res0.c.r16182-CVE-2009-2663 libvorbis-1.2.0/lib/res0.c
--- libvorbis-1.2.0/lib/res0.c.r16182-CVE-2009-2663	2009-08-08 21:07:23.000000000 +0200
+++ libvorbis-1.2.0/lib/res0.c	2009-08-08 21:07:23.000000000 +0200
@@ -220,8 +220,10 @@ vorbis_info_residue *res0_unpack(vorbis_
     info->booklist[j]=oggpack_read(opb,8);
 
   if(info->groupbook>=ci->books)goto errout;
-  for(j=0;j<acc;j++)
+  for(j=0;j<acc;j++){
     if(info->booklist[j]>=ci->books)goto errout;
+    if(ci->book_param[info->booklist[j]]->maptype==0)goto errout;
+  }
 
   /* verify the phrasebook is not specifying an impossible or
      inconsistent partitioning scheme. */


Index: libvorbis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/F-10/libvorbis.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libvorbis.spec	7 Sep 2008 14:55:05 -0000	1.32
+++ libvorbis.spec	9 Aug 2009 06:09:14 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.2.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -13,6 +13,7 @@ Patch2: r14598-CVE-2008-1420.patch
 Patch3: r14602-CVE-2008-1419.patch
 Patch4: r14602-CVE-2008-1423.patch
 Patch5: r14811.patch
+Patch6: r16182-CVE-2009-2663.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 BuildRequires: 	libogg-devel >= 2:1.1
 
@@ -44,6 +45,7 @@ needed to develop applications with Ogg 
 %patch3 -p0 -b .r14602-CVE-2008-1419
 %patch4 -p0 -b .r14602-CVE-2008-1423
 %patch5 -p0 -b .r14811
+%patch6 -p1 -b .r16182-CVE-2009-2663
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
 # link to .pdf spec rather than ship redundant copy
@@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug  9 2009 Jindrich Novy <jnovy at redhat.com> 1.2.0-6
+- fix CVE-2009-2663 (#516259)
+
 * Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> -1:1.2.0-5
 - Fix patch fuzz build failure
 



From jnovy at fedoraproject.org  Sun Aug  9 06:10:41 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Sun,  9 Aug 2009 06:10:41 +0000 (UTC)
Subject: rpms/libvorbis/F-11 r16182-CVE-2009-2663.patch, NONE,
	1.1 libvorbis.spec, 1.34, 1.35
Message-ID: <20090809061041.4500E11C0498@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libvorbis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16659

Modified Files:
	libvorbis.spec 
Added Files:
	r16182-CVE-2009-2663.patch 
Log Message:
* Sun Aug  7 2009 Jindrich Novy <jnovy at redhat.com> 1.2.0-8
- fix CVE-2009-2663 (#516259)


r16182-CVE-2009-2663.patch:
 floor1.c |   18 ++++++++++++++----
 res0.c   |    4 +++-
 2 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE r16182-CVE-2009-2663.patch ---
diff -up libvorbis-1.2.0/lib/floor1.c.r16182-CVE-2009-2663 libvorbis-1.2.0/lib/floor1.c
--- libvorbis-1.2.0/lib/floor1.c.r16182-CVE-2009-2663	2007-07-24 02:09:47.000000000 +0200
+++ libvorbis-1.2.0/lib/floor1.c	2009-08-08 21:11:18.000000000 +0200
@@ -138,6 +138,9 @@ static void floor1_pack (vorbis_info_flo
   }
 }
 
+static int icomp(const void *a,const void *b){
+  return(**(int **)a-**(int **)b);
+}
 
 static vorbis_info_floor *floor1_unpack (vorbis_info *vi,oggpack_buffer *opb){
   codec_setup_info     *ci=vi->codec_setup;
@@ -182,6 +185,17 @@ static vorbis_info_floor *floor1_unpack 
   info->postlist[0]=0;
   info->postlist[1]=1<<rangebits;
 
+  /* don't allow repeated values in post list as they'd result in
+     zero-length segments */
+  { 
+    int *sortpointer[VIF_POSIT+2];
+    for(j=0;j<count+2;j++)sortpointer[j]=info->postlist+j;
+    qsort(sortpointer,count+2,sizeof(*sortpointer),icomp);
+
+    for(j=1;j<count+2;j++)
+      if(*sortpointer[j-1]==*sortpointer[j])goto err_out;
+  }
+
   return(info);
   
  err_out:
@@ -189,10 +203,6 @@ static vorbis_info_floor *floor1_unpack 
   return(NULL);
 }
 
-static int icomp(const void *a,const void *b){
-  return(**(int **)a-**(int **)b);
-}
-
 static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd,
 				      vorbis_info_floor *in){
 
diff -up libvorbis-1.2.0/lib/res0.c.r16182-CVE-2009-2663 libvorbis-1.2.0/lib/res0.c
--- libvorbis-1.2.0/lib/res0.c.r16182-CVE-2009-2663	2009-08-08 21:07:23.000000000 +0200
+++ libvorbis-1.2.0/lib/res0.c	2009-08-08 21:07:23.000000000 +0200
@@ -220,8 +220,10 @@ vorbis_info_residue *res0_unpack(vorbis_
     info->booklist[j]=oggpack_read(opb,8);
 
   if(info->groupbook>=ci->books)goto errout;
-  for(j=0;j<acc;j++)
+  for(j=0;j<acc;j++){
     if(info->booklist[j]>=ci->books)goto errout;
+    if(ci->book_param[info->booklist[j]]->maptype==0)goto errout;
+  }
 
   /* verify the phrasebook is not specifying an impossible or
      inconsistent partitioning scheme. */


Index: libvorbis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/F-11/libvorbis.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libvorbis.spec	25 Feb 2009 19:53:06 -0000	1.34
+++ libvorbis.spec	9 Aug 2009 06:10:40 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.2.0
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -13,6 +13,7 @@ Patch2: r14598-CVE-2008-1420.patch
 Patch3: r14602-CVE-2008-1419.patch
 Patch4: r14602-CVE-2008-1423.patch
 Patch5: r14811.patch
+Patch6: r16182-CVE-2009-2663.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 BuildRequires: 	libogg-devel >= 2:1.1
 
@@ -44,6 +45,7 @@ needed to develop applications with Ogg 
 %patch3 -p0 -b .r14602-CVE-2008-1419
 %patch4 -p0 -b .r14602-CVE-2008-1423
 %patch5 -p0 -b .r14811
+%patch6 -p1 -b .r16182-CVE-2009-2663
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
 # link to .pdf spec rather than ship redundant copy
@@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug  7 2009 Jindrich Novy <jnovy at redhat.com> 1.2.0-8
+- fix CVE-2009-2663 (#516259)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From konradm at fedoraproject.org  Sun Aug  9 06:10:56 2009
From: konradm at fedoraproject.org (konradm)
Date: Sun,  9 Aug 2009 06:10:56 +0000 (UTC)
Subject: rpms/glpk/devel .cvsignore, 1.16, 1.17 glpk.spec, 1.25, 1.26 sources,
	1.16, 1.17
Message-ID: <20090809061056.D68E611C00D7@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/glpk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16718

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
* Sat Aug 8 2009 Conrad Meyer <konrad at tylerc.org> 4.39-1
- Bump to 4.39.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	15 Feb 2009 02:17:06 -0000	1.16
+++ .cvsignore	9 Aug 2009 06:10:56 -0000	1.17
@@ -1 +1 @@
-glpk-4.36.tar.gz
+glpk-4.39.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- glpk.spec	25 Jul 2009 00:26:04 -0000	1.25
+++ glpk.spec	9 Aug 2009 06:10:56 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           glpk
-Version:        4.36
-Release:        4%{?dist}
+Version:        4.39
+Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 8 2009 Conrad Meyer <konrad at tylerc.org> 4.39-1
+- Bump to 4.39.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.36-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	15 Feb 2009 02:17:06 -0000	1.16
+++ sources	9 Aug 2009 06:10:56 -0000	1.17
@@ -1 +1 @@
-18b2869763fba4e301095153df047f6b  glpk-4.36.tar.gz
+95f276ef6c94c6de1eb689f161f525f3  glpk-4.39.tar.gz



From konradm at fedoraproject.org  Sun Aug  9 06:22:45 2009
From: konradm at fedoraproject.org (konradm)
Date: Sun,  9 Aug 2009 06:22:45 +0000 (UTC)
Subject: rpms/libfplll/devel .cvsignore, 1.3, 1.4 libfplll.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090809062245.B67EA11C00D7@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/libfplll/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18645

Modified Files:
	.cvsignore libfplll.spec sources 
Log Message:
* Sat Aug 8 2009 Conrad Meyer <konrad at tylerc.org> - 3.0.12-1
- Bump to new version (3.0.12).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libfplll/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Dec 2008 02:34:00 -0000	1.3
+++ .cvsignore	9 Aug 2009 06:22:43 -0000	1.4
@@ -1 +1 @@
-libfplll-3.0.11.tar.gz
+libfplll-3.0.12.tar.gz


Index: libfplll.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfplll/devel/libfplll.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libfplll.spec	25 Jul 2009 05:37:59 -0000	1.4
+++ libfplll.spec	9 Aug 2009 06:22:44 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           libfplll
-Version:        3.0.11
-Release:        3%{?dist}
+Version:        3.0.12
+Release:        1%{?dist}
 Summary:        LLL-reduces euclidian lattices
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://perso.ens-lyon.fr/damien.stehle/english.html#software
-Source0:        http://perso.ens-lyon.fr/damien.stehle/downloads/%{name}-%{version}.tar.gz
+Source0:        http://perso.ens-lyon.fr/damien.stehle/downloads/libfplll-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gmp-devel
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 8 2009 Conrad Meyer <konrad at tylerc.org> - 3.0.12-1
+- Bump to new version (3.0.12).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libfplll/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Dec 2008 02:34:00 -0000	1.3
+++ sources	9 Aug 2009 06:22:44 -0000	1.4
@@ -1 +1 @@
-bacf48cfea58c0b9ce5e11d9e904625d  libfplll-3.0.11.tar.gz
+3b1cf0f3c4bcbe8b40da3d14c8029c58  libfplll-3.0.12.tar.gz



From ellert at fedoraproject.org  Sun Aug  9 08:47:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 08:47:33 +0000 (UTC)
Subject: rpms/grid-packaging-tools/devel grid-packaging-tools.spec, 1.4,
	1.5 import.log, 1.2, 1.3
Message-ID: <20090809084733.A51DA11C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15331/devel

Modified Files:
	grid-packaging-tools.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
- Rename config.guess script



Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/devel/grid-packaging-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- grid-packaging-tools.spec	25 Jul 2009 01:27:54 -0000	1.4
+++ grid-packaging-tools.spec	9 Aug 2009 08:47:31 -0000	1.5
@@ -1,13 +1,13 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	19%{?dist}
+Release:	20%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
 URL:		http://www.gridpackagingtools.com/
-# The maintenance of GPT has been taken over by the Globus Alliance.
-# Use the latest source tarball from their repository.
+#		Maintenance of GPT has been taken over by the Globus Alliance.
+#		Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
 #		Make perl module installation directory configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
@@ -153,6 +153,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/globus/glo
 # Remove temporary build file
 rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt_scripts_list
 
+# Rename config.guess script in order not to clash with globus-common
+mv $RPM_BUILD_ROOT%{_datadir}/globus/{config.guess,config.guess.gpt}
+sed s/config.guess/config.guess.gpt/ \
+  -i $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Localize.pm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
+- Rename config.guess script
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -190,10 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 - change name from gpt to grid-packaging-tools to avoid potential confusion
   with ubuntu's gpt package (G-Portugol)
 
-* Tue Dec  9 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
+* Tue Dec 09 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
 - Make gpt work with older automake versions
 
-* Sat Oct  4 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
+* Sat Oct 04 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
 - Add some backward compatibility
 - Make perl module directory configurable
 
@@ -202,10 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 - split the big FHS patch into several smaller ones
 - change name back gpt again
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
 - change name from gpt to grid-packaging-tools
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
 - Convert to noarch package
 
 * Tue Jun 24 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-7
@@ -222,27 +230,27 @@ rm -rf $RPM_BUILD_ROOT
 - Add dist tag to release
 - Change BuildRoot
 
-* Wed Jun  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
+* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
 - Add fix to setup dir handling
 - Restructure changelog to have versions on main line
 
 * Fri Mar 18 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-3ng
 - Add patch to fix globus_package.dtd
 
-* Tue Mar  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
+* Tue Mar 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
 - Add patch with fixes from the Globus 3.9.5 GPT release
   (Do not include the core though)
 
 * Fri May 21 2004 Anders W??n?nen <waananen at nbi.dk> - 3.2-1ng
 
-* Sun Feb  1 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
+* Sun Feb 01 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
 - Fix problem when new files are links rather than directories
 
-* Thu Jan  8 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
+* Thu Jan 08 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
 - Fix for Mandrake 9.2 - unset RPM_BUILD_ROOT before building
   Found by Jakob Langgaard Nielsen <langgard at nbi.dk>
 
-* Sat Jan  3 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
+* Sat Jan 03 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
 - Drop patches: gpt-3.0.1-dependency.patch, gpt-3.0.1-doc.patch
   since the problems involved are either solved or obsolete
 - Make /etc/profile.d relocatable
@@ -250,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use RPM Group "System Environment/Base" instead of Applications
 - Slightly change build procedure
 
-* Tue Oct  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
+* Tue Oct 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
 - Remove the now unecessary dependency cleanup introduced in 2.2.10-2ng
 - Fix some cases in the documentation
 
@@ -259,23 +267,23 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 23 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.10
 
-* Sat Jun  2 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
+* Sat Jun 02 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
 - Fix perl inconsistencies reported by Mattias Ellert
   <mattias.ellert at tsl.uu.se>
 
 * Sat May 24 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1
 - Bring back perl-Tk dependency
 
-* Mon Apr  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
+* Mon Apr 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
 
 * Tue Mar 22 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.9-1ng
 - Add bogus perl(Grid::GPT::Version) provides to help rpm
 
-* Tue Mar  4 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
+* Tue Mar 04 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
 
-* Tue Dec  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
+* Tue Dec 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
 
-* Tue Nov  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
+* Tue Nov 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
 - Remove Tk dependence for RedHat 8.0
 
 * Tue Oct 29 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.4-2ng
@@ -290,5 +298,5 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 15 2002 Anders W??n?nen <waananen at nbi.dk>
 - Use NCSA distribution instead of Globus
 
-* Mon Apr  8 2002 Anders W??n?nen <waananen at nbi.dk>
+* Mon Apr 08 2002 Anders W??n?nen <waananen at nbi.dk>
 - Initial build.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 May 2009 04:27:35 -0000	1.2
+++ import.log	9 Aug 2009 08:47:31 -0000	1.3
@@ -1,2 +1,3 @@
 grid-packaging-tools-3_2-16_fc9:HEAD:grid-packaging-tools-3.2-16.fc9.src.rpm:1237364624
 grid-packaging-tools-3_2-18_fc9:HEAD:grid-packaging-tools-3.2-18.fc9.src.rpm:1243398420
+grid-packaging-tools-3_2-20_fc11:HEAD:grid-packaging-tools-3.2-20.fc11.src.rpm:1249807590



From ellert at fedoraproject.org  Sun Aug  9 08:49:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 08:49:33 +0000 (UTC)
Subject: rpms/grid-packaging-tools/F-11 grid-packaging-tools.spec, 1.3,
	1.4 import.log, 1.2, 1.3
Message-ID: <20090809084933.0635F11C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15860/F-11

Modified Files:
	grid-packaging-tools.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
- Rename config.guess script



Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-11/grid-packaging-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- grid-packaging-tools.spec	27 May 2009 04:30:33 -0000	1.3
+++ grid-packaging-tools.spec	9 Aug 2009 08:49:32 -0000	1.4
@@ -1,13 +1,13 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	18%{?dist}
+Release:	20%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
 URL:		http://www.gridpackagingtools.com/
-# The maintenance of GPT has been taken over by the Globus Alliance.
-# Use the latest source tarball from their repository.
+#		Maintenance of GPT has been taken over by the Globus Alliance.
+#		Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
 #		Make perl module installation directory configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
@@ -153,6 +153,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/globus/glo
 # Remove temporary build file
 rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt_scripts_list
 
+# Rename config.guess script in order not to clash with globus-common
+mv $RPM_BUILD_ROOT%{_datadir}/globus/{config.guess,config.guess.gpt}
+sed s/config.guess/config.guess.gpt/ \
+  -i $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Localize.pm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
+- Rename config.guess script
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-18
 - Make GPT work with automake 1.11
 
@@ -187,10 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 - change name from gpt to grid-packaging-tools to avoid potential confusion
   with ubuntu's gpt package (G-Portugol)
 
-* Tue Dec  9 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
+* Tue Dec 09 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
 - Make gpt work with older automake versions
 
-* Sat Oct  4 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
+* Sat Oct 04 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
 - Add some backward compatibility
 - Make perl module directory configurable
 
@@ -199,10 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 - split the big FHS patch into several smaller ones
 - change name back gpt again
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
 - change name from gpt to grid-packaging-tools
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
 - Convert to noarch package
 
 * Tue Jun 24 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-7
@@ -219,27 +230,27 @@ rm -rf $RPM_BUILD_ROOT
 - Add dist tag to release
 - Change BuildRoot
 
-* Wed Jun  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
+* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
 - Add fix to setup dir handling
 - Restructure changelog to have versions on main line
 
 * Fri Mar 18 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-3ng
 - Add patch to fix globus_package.dtd
 
-* Tue Mar  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
+* Tue Mar 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
 - Add patch with fixes from the Globus 3.9.5 GPT release
   (Do not include the core though)
 
 * Fri May 21 2004 Anders W??n?nen <waananen at nbi.dk> - 3.2-1ng
 
-* Sun Feb  1 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
+* Sun Feb 01 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
 - Fix problem when new files are links rather than directories
 
-* Thu Jan  8 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
+* Thu Jan 08 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
 - Fix for Mandrake 9.2 - unset RPM_BUILD_ROOT before building
   Found by Jakob Langgaard Nielsen <langgard at nbi.dk>
 
-* Sat Jan  3 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
+* Sat Jan 03 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
 - Drop patches: gpt-3.0.1-dependency.patch, gpt-3.0.1-doc.patch
   since the problems involved are either solved or obsolete
 - Make /etc/profile.d relocatable
@@ -247,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use RPM Group "System Environment/Base" instead of Applications
 - Slightly change build procedure
 
-* Tue Oct  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
+* Tue Oct 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
 - Remove the now unecessary dependency cleanup introduced in 2.2.10-2ng
 - Fix some cases in the documentation
 
@@ -256,23 +267,23 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 23 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.10
 
-* Sat Jun  2 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
+* Sat Jun 02 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
 - Fix perl inconsistencies reported by Mattias Ellert
   <mattias.ellert at tsl.uu.se>
 
 * Sat May 24 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1
 - Bring back perl-Tk dependency
 
-* Mon Apr  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
+* Mon Apr 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
 
 * Tue Mar 22 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.9-1ng
 - Add bogus perl(Grid::GPT::Version) provides to help rpm
 
-* Tue Mar  4 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
+* Tue Mar 04 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
 
-* Tue Dec  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
+* Tue Dec 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
 
-* Tue Nov  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
+* Tue Nov 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
 - Remove Tk dependence for RedHat 8.0
 
 * Tue Oct 29 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.4-2ng
@@ -287,5 +298,5 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 15 2002 Anders W??n?nen <waananen at nbi.dk>
 - Use NCSA distribution instead of Globus
 
-* Mon Apr  8 2002 Anders W??n?nen <waananen at nbi.dk>
+* Mon Apr 08 2002 Anders W??n?nen <waananen at nbi.dk>
 - Initial build.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 May 2009 04:30:33 -0000	1.2
+++ import.log	9 Aug 2009 08:49:32 -0000	1.3
@@ -1,2 +1,3 @@
 grid-packaging-tools-3_2-16_fc9:HEAD:grid-packaging-tools-3.2-16.fc9.src.rpm:1237364624
 grid-packaging-tools-3_2-18_fc9:F-11:grid-packaging-tools-3.2-18.fc9.src.rpm:1243398601
+grid-packaging-tools-3_2-20_fc11:F-11:grid-packaging-tools-3.2-20.fc11.src.rpm:1249807717



From ellert at fedoraproject.org  Sun Aug  9 08:50:53 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 08:50:53 +0000 (UTC)
Subject: rpms/grid-packaging-tools/F-10 grid-packaging-tools.spec, 1.3,
	1.4 import.log, 1.2, 1.3
Message-ID: <20090809085053.5E33811C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16305/F-10

Modified Files:
	grid-packaging-tools.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
- Rename config.guess script



Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-10/grid-packaging-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- grid-packaging-tools.spec	27 May 2009 04:29:40 -0000	1.3
+++ grid-packaging-tools.spec	9 Aug 2009 08:50:53 -0000	1.4
@@ -1,13 +1,13 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	18%{?dist}
+Release:	20%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
 URL:		http://www.gridpackagingtools.com/
-# The maintenance of GPT has been taken over by the Globus Alliance.
-# Use the latest source tarball from their repository.
+#		Maintenance of GPT has been taken over by the Globus Alliance.
+#		Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
 #		Make perl module installation directory configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
@@ -153,6 +153,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/globus/glo
 # Remove temporary build file
 rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt_scripts_list
 
+# Rename config.guess script in order not to clash with globus-common
+mv $RPM_BUILD_ROOT%{_datadir}/globus/{config.guess,config.guess.gpt}
+sed s/config.guess/config.guess.gpt/ \
+  -i $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Localize.pm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
+- Rename config.guess script
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-18
 - Make GPT work with automake 1.11
 
@@ -187,10 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 - change name from gpt to grid-packaging-tools to avoid potential confusion
   with ubuntu's gpt package (G-Portugol)
 
-* Tue Dec  9 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
+* Tue Dec 09 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
 - Make gpt work with older automake versions
 
-* Sat Oct  4 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
+* Sat Oct 04 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
 - Add some backward compatibility
 - Make perl module directory configurable
 
@@ -199,10 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 - split the big FHS patch into several smaller ones
 - change name back gpt again
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
 - change name from gpt to grid-packaging-tools
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
 - Convert to noarch package
 
 * Tue Jun 24 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-7
@@ -219,27 +230,27 @@ rm -rf $RPM_BUILD_ROOT
 - Add dist tag to release
 - Change BuildRoot
 
-* Wed Jun  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
+* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
 - Add fix to setup dir handling
 - Restructure changelog to have versions on main line
 
 * Fri Mar 18 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-3ng
 - Add patch to fix globus_package.dtd
 
-* Tue Mar  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
+* Tue Mar 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
 - Add patch with fixes from the Globus 3.9.5 GPT release
   (Do not include the core though)
 
 * Fri May 21 2004 Anders W??n?nen <waananen at nbi.dk> - 3.2-1ng
 
-* Sun Feb  1 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
+* Sun Feb 01 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
 - Fix problem when new files are links rather than directories
 
-* Thu Jan  8 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
+* Thu Jan 08 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
 - Fix for Mandrake 9.2 - unset RPM_BUILD_ROOT before building
   Found by Jakob Langgaard Nielsen <langgard at nbi.dk>
 
-* Sat Jan  3 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
+* Sat Jan 03 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
 - Drop patches: gpt-3.0.1-dependency.patch, gpt-3.0.1-doc.patch
   since the problems involved are either solved or obsolete
 - Make /etc/profile.d relocatable
@@ -247,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use RPM Group "System Environment/Base" instead of Applications
 - Slightly change build procedure
 
-* Tue Oct  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
+* Tue Oct 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
 - Remove the now unecessary dependency cleanup introduced in 2.2.10-2ng
 - Fix some cases in the documentation
 
@@ -256,23 +267,23 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 23 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.10
 
-* Sat Jun  2 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
+* Sat Jun 02 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
 - Fix perl inconsistencies reported by Mattias Ellert
   <mattias.ellert at tsl.uu.se>
 
 * Sat May 24 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1
 - Bring back perl-Tk dependency
 
-* Mon Apr  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
+* Mon Apr 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
 
 * Tue Mar 22 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.9-1ng
 - Add bogus perl(Grid::GPT::Version) provides to help rpm
 
-* Tue Mar  4 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
+* Tue Mar 04 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
 
-* Tue Dec  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
+* Tue Dec 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
 
-* Tue Nov  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
+* Tue Nov 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
 - Remove Tk dependence for RedHat 8.0
 
 * Tue Oct 29 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.4-2ng
@@ -287,5 +298,5 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 15 2002 Anders W??n?nen <waananen at nbi.dk>
 - Use NCSA distribution instead of Globus
 
-* Mon Apr  8 2002 Anders W??n?nen <waananen at nbi.dk>
+* Mon Apr 08 2002 Anders W??n?nen <waananen at nbi.dk>
 - Initial build.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 May 2009 04:29:40 -0000	1.2
+++ import.log	9 Aug 2009 08:50:53 -0000	1.3
@@ -1,2 +1,3 @@
 grid-packaging-tools-3_2-16_fc9:F-10:grid-packaging-tools-3.2-16.fc9.src.rpm:1237369843
 grid-packaging-tools-3_2-18_fc9:F-10:grid-packaging-tools-3.2-18.fc9.src.rpm:1243398548
+grid-packaging-tools-3_2-20_fc11:F-10:grid-packaging-tools-3.2-20.fc11.src.rpm:1249807812



From ellert at fedoraproject.org  Sun Aug  9 08:52:12 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 08:52:12 +0000 (UTC)
Subject: rpms/grid-packaging-tools/EL-5 grid-packaging-tools.spec, 1.3,
	1.4 import.log, 1.2, 1.3
Message-ID: <20090809085212.582A711C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16679/EL-5

Modified Files:
	grid-packaging-tools.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
- Rename config.guess script



Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/EL-5/grid-packaging-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- grid-packaging-tools.spec	27 May 2009 04:33:04 -0000	1.3
+++ grid-packaging-tools.spec	9 Aug 2009 08:52:12 -0000	1.4
@@ -1,13 +1,13 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	18%{?dist}
+Release:	20%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
 URL:		http://www.gridpackagingtools.com/
-# The maintenance of GPT has been taken over by the Globus Alliance.
-# Use the latest source tarball from their repository.
+#		Maintenance of GPT has been taken over by the Globus Alliance.
+#		Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
 #		Make perl module installation directory configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
@@ -153,6 +153,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/globus/glo
 # Remove temporary build file
 rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt_scripts_list
 
+# Rename config.guess script in order not to clash with globus-common
+mv $RPM_BUILD_ROOT%{_datadir}/globus/{config.guess,config.guess.gpt}
+sed s/config.guess/config.guess.gpt/ \
+  -i $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Localize.pm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
+- Rename config.guess script
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-18
 - Make GPT work with automake 1.11
 
@@ -187,10 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 - change name from gpt to grid-packaging-tools to avoid potential confusion
   with ubuntu's gpt package (G-Portugol)
 
-* Tue Dec  9 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
+* Tue Dec 09 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
 - Make gpt work with older automake versions
 
-* Sat Oct  4 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
+* Sat Oct 04 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
 - Add some backward compatibility
 - Make perl module directory configurable
 
@@ -199,10 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 - split the big FHS patch into several smaller ones
 - change name back gpt again
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
 - change name from gpt to grid-packaging-tools
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
 - Convert to noarch package
 
 * Tue Jun 24 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-7
@@ -219,27 +230,27 @@ rm -rf $RPM_BUILD_ROOT
 - Add dist tag to release
 - Change BuildRoot
 
-* Wed Jun  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
+* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
 - Add fix to setup dir handling
 - Restructure changelog to have versions on main line
 
 * Fri Mar 18 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-3ng
 - Add patch to fix globus_package.dtd
 
-* Tue Mar  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
+* Tue Mar 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
 - Add patch with fixes from the Globus 3.9.5 GPT release
   (Do not include the core though)
 
 * Fri May 21 2004 Anders W??n?nen <waananen at nbi.dk> - 3.2-1ng
 
-* Sun Feb  1 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
+* Sun Feb 01 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
 - Fix problem when new files are links rather than directories
 
-* Thu Jan  8 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
+* Thu Jan 08 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
 - Fix for Mandrake 9.2 - unset RPM_BUILD_ROOT before building
   Found by Jakob Langgaard Nielsen <langgard at nbi.dk>
 
-* Sat Jan  3 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
+* Sat Jan 03 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
 - Drop patches: gpt-3.0.1-dependency.patch, gpt-3.0.1-doc.patch
   since the problems involved are either solved or obsolete
 - Make /etc/profile.d relocatable
@@ -247,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use RPM Group "System Environment/Base" instead of Applications
 - Slightly change build procedure
 
-* Tue Oct  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
+* Tue Oct 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
 - Remove the now unecessary dependency cleanup introduced in 2.2.10-2ng
 - Fix some cases in the documentation
 
@@ -256,23 +267,23 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 23 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.10
 
-* Sat Jun  2 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
+* Sat Jun 02 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
 - Fix perl inconsistencies reported by Mattias Ellert
   <mattias.ellert at tsl.uu.se>
 
 * Sat May 24 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1
 - Bring back perl-Tk dependency
 
-* Mon Apr  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
+* Mon Apr 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
 
 * Tue Mar 22 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.9-1ng
 - Add bogus perl(Grid::GPT::Version) provides to help rpm
 
-* Tue Mar  4 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
+* Tue Mar 04 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
 
-* Tue Dec  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
+* Tue Dec 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
 
-* Tue Nov  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
+* Tue Nov 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
 - Remove Tk dependence for RedHat 8.0
 
 * Tue Oct 29 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.4-2ng
@@ -287,5 +298,5 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 15 2002 Anders W??n?nen <waananen at nbi.dk>
 - Use NCSA distribution instead of Globus
 
-* Mon Apr  8 2002 Anders W??n?nen <waananen at nbi.dk>
+* Mon Apr 08 2002 Anders W??n?nen <waananen at nbi.dk>
 - Initial build.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 May 2009 04:33:04 -0000	1.2
+++ import.log	9 Aug 2009 08:52:12 -0000	1.3
@@ -1,2 +1,3 @@
 grid-packaging-tools-3_2-16_fc9:EL-5:grid-packaging-tools-3.2-16.fc9.src.rpm:1237370215
 grid-packaging-tools-3_2-18_fc9:EL-5:grid-packaging-tools-3.2-18.fc9.src.rpm:1243398752
+grid-packaging-tools-3_2-20_fc11:EL-5:grid-packaging-tools-3.2-20.fc11.src.rpm:1249807885



From ellert at fedoraproject.org  Sun Aug  9 08:53:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 08:53:08 +0000 (UTC)
Subject: rpms/grid-packaging-tools/EL-4 grid-packaging-tools.spec, 1.3,
	1.4 import.log, 1.2, 1.3
Message-ID: <20090809085308.F1F2011C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/grid-packaging-tools/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16968/EL-4

Modified Files:
	grid-packaging-tools.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
- Rename config.guess script



Index: grid-packaging-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/EL-4/grid-packaging-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- grid-packaging-tools.spec	27 May 2009 04:32:11 -0000	1.3
+++ grid-packaging-tools.spec	9 Aug 2009 08:53:08 -0000	1.4
@@ -1,13 +1,13 @@
 Name:		grid-packaging-tools
 Version:	3.2
-Release:	18%{?dist}
+Release:	20%{?dist}
 Summary:	Grid Packaging Tools (GPT)
 
 Group:		Development/Tools
 License:	NCSA
 URL:		http://www.gridpackagingtools.com/
-# The maintenance of GPT has been taken over by the Globus Alliance.
-# Use the latest source tarball from their repository.
+#		Maintenance of GPT has been taken over by the Globus Alliance.
+#		Use the latest source tarball from their repository.
 Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/gpt/gpt-%{version}globus2.tar.gz
 #		Make perl module installation directory configurable:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6229
@@ -153,6 +153,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/globus/glo
 # Remove temporary build file
 rm $RPM_BUILD_ROOT%{_datadir}/globus/gpt_scripts_list
 
+# Rename config.guess script in order not to clash with globus-common
+mv $RPM_BUILD_ROOT%{_datadir}/globus/{config.guess,config.guess.gpt}
+sed s/config.guess/config.guess.gpt/ \
+  -i $RPM_BUILD_ROOT%{perl_vendorlib}/Grid/GPT/Localize.pm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/Grid
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-20
+- Rename config.guess script
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-18
 - Make GPT work with automake 1.11
 
@@ -187,10 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 - change name from gpt to grid-packaging-tools to avoid potential confusion
   with ubuntu's gpt package (G-Portugol)
 
-* Tue Dec  9 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
+* Tue Dec 09 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-12
 - Make gpt work with older automake versions
 
-* Sat Oct  4 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
+* Sat Oct 04 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-11
 - Add some backward compatibility
 - Make perl module directory configurable
 
@@ -199,10 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 - split the big FHS patch into several smaller ones
 - change name back gpt again
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-9
 - change name from gpt to grid-packaging-tools
 
-* Wed Jul  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
+* Wed Jul 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-8
 - Convert to noarch package
 
 * Tue Jun 24 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-7
@@ -219,27 +230,27 @@ rm -rf $RPM_BUILD_ROOT
 - Add dist tag to release
 - Change BuildRoot
 
-* Wed Jun  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
+* Wed Jun 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-4ng
 - Add fix to setup dir handling
 - Restructure changelog to have versions on main line
 
 * Fri Mar 18 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-3ng
 - Add patch to fix globus_package.dtd
 
-* Tue Mar  1 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
+* Tue Mar 01 2005 Anders W??n?nen <waananen at nbi.dk> - 3.2-2ng
 - Add patch with fixes from the Globus 3.9.5 GPT release
   (Do not include the core though)
 
 * Fri May 21 2004 Anders W??n?nen <waananen at nbi.dk> - 3.2-1ng
 
-* Sun Feb  1 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
+* Sun Feb 01 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-3ng
 - Fix problem when new files are links rather than directories
 
-* Thu Jan  8 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
+* Thu Jan 08 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-2ng
 - Fix for Mandrake 9.2 - unset RPM_BUILD_ROOT before building
   Found by Jakob Langgaard Nielsen <langgard at nbi.dk>
 
-* Sat Jan  3 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
+* Sat Jan 03 2004 Anders W??n?nen <waananen at nbi.dk> - 3.1-1ng
 - Drop patches: gpt-3.0.1-dependency.patch, gpt-3.0.1-doc.patch
   since the problems involved are either solved or obsolete
 - Make /etc/profile.d relocatable
@@ -247,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use RPM Group "System Environment/Base" instead of Applications
 - Slightly change build procedure
 
-* Tue Oct  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
+* Tue Oct 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0.1-1ng
 - Remove the now unecessary dependency cleanup introduced in 2.2.10-2ng
 - Fix some cases in the documentation
 
@@ -256,23 +267,23 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 23 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.10
 
-* Sat Jun  2 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
+* Sat Jun 02 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1-2
 - Fix perl inconsistencies reported by Mattias Ellert
   <mattias.ellert at tsl.uu.se>
 
 * Sat May 24 2003 Anders W??n?nen <waananen at nbi.dk> - 3.1a1
 - Bring back perl-Tk dependency
 
-* Mon Apr  7 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
+* Mon Apr 07 2003 Anders W??n?nen <waananen at nbi.dk> - 3.0-1ng
 
 * Tue Mar 22 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.9-1ng
 - Add bogus perl(Grid::GPT::Version) provides to help rpm
 
-* Tue Mar  4 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
+* Tue Mar 04 2003 Anders W??n?nen <waananen at nbi.dk> - 2.2.8-1ng
 
-* Tue Dec  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
+* Tue Dec 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.7-1ng
 
-* Tue Nov  5 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
+* Tue Nov 05 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.5-1ng
 - Remove Tk dependence for RedHat 8.0
 
 * Tue Oct 29 2002 Anders W??n?nen <waananen at nbi.dk> - 2.2.4-2ng
@@ -287,5 +298,5 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 15 2002 Anders W??n?nen <waananen at nbi.dk>
 - Use NCSA distribution instead of Globus
 
-* Mon Apr  8 2002 Anders W??n?nen <waananen at nbi.dk>
+* Mon Apr 08 2002 Anders W??n?nen <waananen at nbi.dk>
 - Initial build.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grid-packaging-tools/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 May 2009 04:32:11 -0000	1.2
+++ import.log	9 Aug 2009 08:53:08 -0000	1.3
@@ -1,2 +1,3 @@
 grid-packaging-tools-3_2-16_fc9:EL-4:grid-packaging-tools-3.2-16.fc9.src.rpm:1237370008
 grid-packaging-tools-3_2-18_fc9:EL-4:grid-packaging-tools-3.2-18.fc9.src.rpm:1243398688
+grid-packaging-tools-3_2-20_fc11:EL-4:grid-packaging-tools-3.2-20.fc11.src.rpm:1249807957



From ellert at fedoraproject.org  Sun Aug  9 09:09:49 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 09:09:49 +0000 (UTC)
Subject: rpms/globus-common/devel globus-common-usr.patch, 1.1,
	1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
Message-ID: <20090809090949.7907C11C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20813/devel

Modified Files:
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
- Patch globus_location function to allow unset GLOBUS_LOCATION
- Put back config.guess file


globus-common-usr.patch:
 Makefile.am                         |    2 -
 library/globus_common_paths.c       |    9 +++---
 library/globus_extension.c          |   13 ++++++---
 programs/Makefile.am                |    2 -
 programs/globus-sh-exec.in          |    6 +++-
 programs/globus-version.in          |    6 +++-
 scripts/globus-hostname             |   15 +++++------
 scripts/globus-makefile-header      |   47 +++++++++++++++++-------------------
 scripts/globus-makefile-header.gpt1 |   44 +++++++++++++++------------------
 scripts/globus-sh-tools.sh          |    6 +++-
 10 files changed, 79 insertions(+), 71 deletions(-)

Index: globus-common-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/globus-common-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-common-usr.patch	7 Apr 2009 07:40:27 -0000	1.1
+++ globus-common-usr.patch	9 Aug 2009 09:09:49 -0000	1.2
@@ -1,6 +1,66 @@
+diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c
+--- globus_common-10.2.orig/library/globus_common_paths.c	2006-01-19 06:54:14.000000000 +0100
++++ globus_common-10.2/library/globus_common_paths.c	2009-08-04 16:43:07.208220052 +0200
+@@ -111,8 +111,7 @@
+     p = globus_libc_getenv(name);
+     if (!p || strlen(p)==0)
+     {
+-	globus_libc_sprintf(errmsg,_GCSL("Environment variable %s is not set"), name);
+-	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(errmsg);
++	return GLOBUS_SUCCESS;
+     }
+ 
+     *bufp = globus_libc_strdup(p);
+@@ -199,17 +198,17 @@
+     if (!deploy && (result=globus_location(&deploy)))
+ 	return result;
+ 
+-    filename = globus_malloc(strlen(deploy) +
++    filename = globus_malloc( ( deploy ? strlen(deploy) : 0 ) +
+ 			     strlen(file_location) + 1 + 1 );
+     if (!filename)
+ 	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(_GCSL("malloc error"));
+     
+     globus_libc_sprintf(filename,
+ 			"%s/%s",
+-			deploy,
++			deploy ? deploy : "",
+ 			file_location);
+ 
+-    if (!deploy_path)
++    if (!deploy_path && deploy)
+ 	globus_free(deploy);
+ 
+     fp = fopen(filename,"r");
+diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
+--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
++++ globus_common-10.2/library/globus_extension.c	2009-08-03 19:57:22.077217655 +0200
+@@ -195,14 +195,17 @@
+         
+         if(globus_location(&tmp) == GLOBUS_SUCCESS)
+         {
++            if(tmp)
++            {
+ #if defined(TARGET_ARCH_WIN32)
+-            globus_l_globus_location =
+-                globus_common_create_string("%s\\lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s\\lib", tmp);
+ #else
+-            globus_l_globus_location =
+-                globus_common_create_string("%s/lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s/lib", tmp);
+ #endif
+-            globus_free(tmp);
++                globus_free(tmp);
++            }
+         }
+         
+         initialized = GLOBUS_TRUE;
 diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
 --- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
-+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/Makefile.am	2009-08-03 12:31:55.267481653 +0200
 @@ -9,7 +9,7 @@
  	config \
  	doxygen
@@ -12,7 +72,7 @@ diff -ur globus_common-10.2.orig/Makefil
  EXTRA_DIST = \
 diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
 --- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
-+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-sh-exec.in	2009-08-03 12:31:55.268482825 +0200
 @@ -17,7 +17,11 @@
  # 
  
@@ -28,7 +88,7 @@ diff -ur globus_common-10.2.orig/program
  # This was done by the script initializer before V2.0
 diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
 --- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
-+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-version.in	2009-08-03 12:31:55.269484149 +0200
 @@ -43,7 +43,11 @@
  
  usage()
@@ -44,7 +104,7 @@ diff -ur globus_common-10.2.orig/program
      ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
 diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
 --- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
-+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/Makefile.am	2009-08-03 12:31:55.269484149 +0200
 @@ -3,7 +3,7 @@
  if ENABLE_PROGRAMS
  bin_SCRIPTS = globus-sh-exec globus-version
@@ -56,7 +116,7 @@ diff -ur globus_common-10.2.orig/program
  
 diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
 --- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-hostname	2009-08-03 12:31:55.270483512 +0200
 @@ -23,13 +23,12 @@
  # domainname
  
@@ -97,7 +157,7 @@ diff -ur globus_common-10.2.orig/scripts
    # if failed to set, use the system's hostname command
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
 --- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header	2009-08-03 12:31:55.271483490 +0200
 @@ -25,29 +25,15 @@
  
  my $gpt_path = $ENV{GPT_LOCATION};
@@ -196,7 +256,7 @@ diff -ur globus_common-10.2.orig/scripts
      {
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
 --- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2009-08-03 12:31:55.272482892 +0200
 @@ -15,18 +15,13 @@
  
  my $flavor;
@@ -282,7 +342,7 @@ diff -ur globus_common-10.2.orig/scripts
  	if(m!\S!)  
 diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
 --- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-sh-tools.sh	2009-08-03 12:31:55.273482271 +0200
 @@ -18,7 +18,11 @@
  
  if test -z "$GLOBUS_SH_VARIABLES_SET" ; then


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/globus-common.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-common.spec	25 Jul 2009 07:26:05 -0000	1.6
+++ globus-common.spec	9 Aug 2009 09:09:49 -0000	1.7
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -283,10 +283,6 @@ sed /globus-makefile-header/d \
 sed 's!/usr/bin/env perl!/usr/bin/perl!' \
   -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
 
-# Remove config.guess file (conflicts with grid-packaging-tools package)
-rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
-sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -370,6 +366,10 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
+- Patch globus_location function to allow unset GLOBUS_LOCATION
+- Put back config.guess file
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Jun 2009 15:33:32 -0000	1.5
+++ import.log	9 Aug 2009 09:09:49 -0000	1.6
@@ -3,3 +3,4 @@ globus-common-10_2-2_fc9:HEAD:globus-com
 globus-common-10_2-3_fc9:HEAD:globus-common-10.2-3.fc9.src.rpm:1240328457
 globus-common-10_2-4_fc9:HEAD:globus-common-10.2-4.fc9.src.rpm:1240864187
 globus-common-10_2-5_fc9:HEAD:globus-common-10.2-5.fc9.src.rpm:1245079989
+globus-common-10_2-7_fc11:HEAD:globus-common-10.2-7.fc11.src.rpm:1249808949



From ellert at fedoraproject.org  Sun Aug  9 09:10:41 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 09:10:41 +0000 (UTC)
Subject: rpms/globus-common/F-11 globus-common-usr.patch, 1.1,
	1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
Message-ID: <20090809091041.7A92E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21084/F-11

Modified Files:
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
- Patch globus_location function to allow unset GLOBUS_LOCATION
- Put back config.guess file


globus-common-usr.patch:
 Makefile.am                         |    2 -
 library/globus_common_paths.c       |    9 +++---
 library/globus_extension.c          |   13 ++++++---
 programs/Makefile.am                |    2 -
 programs/globus-sh-exec.in          |    6 +++-
 programs/globus-version.in          |    6 +++-
 scripts/globus-hostname             |   15 +++++------
 scripts/globus-makefile-header      |   47 +++++++++++++++++-------------------
 scripts/globus-makefile-header.gpt1 |   44 +++++++++++++++------------------
 scripts/globus-sh-tools.sh          |    6 +++-
 10 files changed, 79 insertions(+), 71 deletions(-)

Index: globus-common-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-common-usr.patch	7 Apr 2009 07:40:27 -0000	1.1
+++ globus-common-usr.patch	9 Aug 2009 09:10:41 -0000	1.2
@@ -1,6 +1,66 @@
+diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c
+--- globus_common-10.2.orig/library/globus_common_paths.c	2006-01-19 06:54:14.000000000 +0100
++++ globus_common-10.2/library/globus_common_paths.c	2009-08-04 16:43:07.208220052 +0200
+@@ -111,8 +111,7 @@
+     p = globus_libc_getenv(name);
+     if (!p || strlen(p)==0)
+     {
+-	globus_libc_sprintf(errmsg,_GCSL("Environment variable %s is not set"), name);
+-	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(errmsg);
++	return GLOBUS_SUCCESS;
+     }
+ 
+     *bufp = globus_libc_strdup(p);
+@@ -199,17 +198,17 @@
+     if (!deploy && (result=globus_location(&deploy)))
+ 	return result;
+ 
+-    filename = globus_malloc(strlen(deploy) +
++    filename = globus_malloc( ( deploy ? strlen(deploy) : 0 ) +
+ 			     strlen(file_location) + 1 + 1 );
+     if (!filename)
+ 	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(_GCSL("malloc error"));
+     
+     globus_libc_sprintf(filename,
+ 			"%s/%s",
+-			deploy,
++			deploy ? deploy : "",
+ 			file_location);
+ 
+-    if (!deploy_path)
++    if (!deploy_path && deploy)
+ 	globus_free(deploy);
+ 
+     fp = fopen(filename,"r");
+diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
+--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
++++ globus_common-10.2/library/globus_extension.c	2009-08-03 19:57:22.077217655 +0200
+@@ -195,14 +195,17 @@
+         
+         if(globus_location(&tmp) == GLOBUS_SUCCESS)
+         {
++            if(tmp)
++            {
+ #if defined(TARGET_ARCH_WIN32)
+-            globus_l_globus_location =
+-                globus_common_create_string("%s\\lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s\\lib", tmp);
+ #else
+-            globus_l_globus_location =
+-                globus_common_create_string("%s/lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s/lib", tmp);
+ #endif
+-            globus_free(tmp);
++                globus_free(tmp);
++            }
+         }
+         
+         initialized = GLOBUS_TRUE;
 diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
 --- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
-+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/Makefile.am	2009-08-03 12:31:55.267481653 +0200
 @@ -9,7 +9,7 @@
  	config \
  	doxygen
@@ -12,7 +72,7 @@ diff -ur globus_common-10.2.orig/Makefil
  EXTRA_DIST = \
 diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
 --- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
-+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-sh-exec.in	2009-08-03 12:31:55.268482825 +0200
 @@ -17,7 +17,11 @@
  # 
  
@@ -28,7 +88,7 @@ diff -ur globus_common-10.2.orig/program
  # This was done by the script initializer before V2.0
 diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
 --- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
-+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-version.in	2009-08-03 12:31:55.269484149 +0200
 @@ -43,7 +43,11 @@
  
  usage()
@@ -44,7 +104,7 @@ diff -ur globus_common-10.2.orig/program
      ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
 diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
 --- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
-+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/Makefile.am	2009-08-03 12:31:55.269484149 +0200
 @@ -3,7 +3,7 @@
  if ENABLE_PROGRAMS
  bin_SCRIPTS = globus-sh-exec globus-version
@@ -56,7 +116,7 @@ diff -ur globus_common-10.2.orig/program
  
 diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
 --- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-hostname	2009-08-03 12:31:55.270483512 +0200
 @@ -23,13 +23,12 @@
  # domainname
  
@@ -97,7 +157,7 @@ diff -ur globus_common-10.2.orig/scripts
    # if failed to set, use the system's hostname command
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
 --- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header	2009-08-03 12:31:55.271483490 +0200
 @@ -25,29 +25,15 @@
  
  my $gpt_path = $ENV{GPT_LOCATION};
@@ -196,7 +256,7 @@ diff -ur globus_common-10.2.orig/scripts
      {
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
 --- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2009-08-03 12:31:55.272482892 +0200
 @@ -15,18 +15,13 @@
  
  my $flavor;
@@ -282,7 +342,7 @@ diff -ur globus_common-10.2.orig/scripts
  	if(m!\S!)  
 diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
 --- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-sh-tools.sh	2009-08-03 12:31:55.273482271 +0200
 @@ -18,7 +18,11 @@
  
  if test -z "$GLOBUS_SH_VARIABLES_SET" ; then


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-common.spec	25 Jul 2009 07:26:13 -0000	1.6
+++ globus-common.spec	9 Aug 2009 09:10:41 -0000	1.7
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -283,10 +283,6 @@ sed /globus-makefile-header/d \
 sed 's!/usr/bin/env perl!/usr/bin/perl!' \
   -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
 
-# Remove config.guess file (conflicts with grid-packaging-tools package)
-rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
-sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -370,6 +366,10 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
+- Patch globus_location function to allow unset GLOBUS_LOCATION
+- Put back config.guess file
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Jun 2009 15:37:11 -0000	1.5
+++ import.log	9 Aug 2009 09:10:41 -0000	1.6
@@ -3,3 +3,4 @@ globus-common-10_2-2_fc9:F-11:globus-com
 globus-common-10_2-3_fc9:F-11:globus-common-10.2-3.fc9.src.rpm:1240329014
 globus-common-10_2-4_fc9:F-11:globus-common-10.2-4.fc9.src.rpm:1240864567
 globus-common-10_2-5_fc9:F-11:globus-common-10.2-5.fc9.src.rpm:1245080209
+globus-common-10_2-7_fc11:F-11:globus-common-10.2-7.fc11.src.rpm:1249809012



From ellert at fedoraproject.org  Sun Aug  9 09:11:32 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 09:11:32 +0000 (UTC)
Subject: rpms/globus-common/F-10 globus-common-usr.patch, 1.1,
	1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
Message-ID: <20090809091132.9756211C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21348/F-10

Modified Files:
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
- Patch globus_location function to allow unset GLOBUS_LOCATION
- Put back config.guess file


globus-common-usr.patch:
 Makefile.am                         |    2 -
 library/globus_common_paths.c       |    9 +++---
 library/globus_extension.c          |   13 ++++++---
 programs/Makefile.am                |    2 -
 programs/globus-sh-exec.in          |    6 +++-
 programs/globus-version.in          |    6 +++-
 scripts/globus-hostname             |   15 +++++------
 scripts/globus-makefile-header      |   47 +++++++++++++++++-------------------
 scripts/globus-makefile-header.gpt1 |   44 +++++++++++++++------------------
 scripts/globus-sh-tools.sh          |    6 +++-
 10 files changed, 79 insertions(+), 71 deletions(-)

Index: globus-common-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-common-usr.patch	7 Apr 2009 08:31:54 -0000	1.1
+++ globus-common-usr.patch	9 Aug 2009 09:11:32 -0000	1.2
@@ -1,6 +1,66 @@
+diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c
+--- globus_common-10.2.orig/library/globus_common_paths.c	2006-01-19 06:54:14.000000000 +0100
++++ globus_common-10.2/library/globus_common_paths.c	2009-08-04 16:43:07.208220052 +0200
+@@ -111,8 +111,7 @@
+     p = globus_libc_getenv(name);
+     if (!p || strlen(p)==0)
+     {
+-	globus_libc_sprintf(errmsg,_GCSL("Environment variable %s is not set"), name);
+-	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(errmsg);
++	return GLOBUS_SUCCESS;
+     }
+ 
+     *bufp = globus_libc_strdup(p);
+@@ -199,17 +198,17 @@
+     if (!deploy && (result=globus_location(&deploy)))
+ 	return result;
+ 
+-    filename = globus_malloc(strlen(deploy) +
++    filename = globus_malloc( ( deploy ? strlen(deploy) : 0 ) +
+ 			     strlen(file_location) + 1 + 1 );
+     if (!filename)
+ 	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(_GCSL("malloc error"));
+     
+     globus_libc_sprintf(filename,
+ 			"%s/%s",
+-			deploy,
++			deploy ? deploy : "",
+ 			file_location);
+ 
+-    if (!deploy_path)
++    if (!deploy_path && deploy)
+ 	globus_free(deploy);
+ 
+     fp = fopen(filename,"r");
+diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
+--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
++++ globus_common-10.2/library/globus_extension.c	2009-08-03 19:57:22.077217655 +0200
+@@ -195,14 +195,17 @@
+         
+         if(globus_location(&tmp) == GLOBUS_SUCCESS)
+         {
++            if(tmp)
++            {
+ #if defined(TARGET_ARCH_WIN32)
+-            globus_l_globus_location =
+-                globus_common_create_string("%s\\lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s\\lib", tmp);
+ #else
+-            globus_l_globus_location =
+-                globus_common_create_string("%s/lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s/lib", tmp);
+ #endif
+-            globus_free(tmp);
++                globus_free(tmp);
++            }
+         }
+         
+         initialized = GLOBUS_TRUE;
 diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
 --- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
-+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/Makefile.am	2009-08-03 12:31:55.267481653 +0200
 @@ -9,7 +9,7 @@
  	config \
  	doxygen
@@ -12,7 +72,7 @@ diff -ur globus_common-10.2.orig/Makefil
  EXTRA_DIST = \
 diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
 --- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
-+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-sh-exec.in	2009-08-03 12:31:55.268482825 +0200
 @@ -17,7 +17,11 @@
  # 
  
@@ -28,7 +88,7 @@ diff -ur globus_common-10.2.orig/program
  # This was done by the script initializer before V2.0
 diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
 --- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
-+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-version.in	2009-08-03 12:31:55.269484149 +0200
 @@ -43,7 +43,11 @@
  
  usage()
@@ -44,7 +104,7 @@ diff -ur globus_common-10.2.orig/program
      ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
 diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
 --- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
-+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/Makefile.am	2009-08-03 12:31:55.269484149 +0200
 @@ -3,7 +3,7 @@
  if ENABLE_PROGRAMS
  bin_SCRIPTS = globus-sh-exec globus-version
@@ -56,7 +116,7 @@ diff -ur globus_common-10.2.orig/program
  
 diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
 --- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-hostname	2009-08-03 12:31:55.270483512 +0200
 @@ -23,13 +23,12 @@
  # domainname
  
@@ -97,7 +157,7 @@ diff -ur globus_common-10.2.orig/scripts
    # if failed to set, use the system's hostname command
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
 --- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header	2009-08-03 12:31:55.271483490 +0200
 @@ -25,29 +25,15 @@
  
  my $gpt_path = $ENV{GPT_LOCATION};
@@ -196,7 +256,7 @@ diff -ur globus_common-10.2.orig/scripts
      {
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
 --- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2009-08-03 12:31:55.272482892 +0200
 @@ -15,18 +15,13 @@
  
  my $flavor;
@@ -282,7 +342,7 @@ diff -ur globus_common-10.2.orig/scripts
  	if(m!\S!)  
 diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
 --- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-sh-tools.sh	2009-08-03 12:31:55.273482271 +0200
 @@ -18,7 +18,11 @@
  
  if test -z "$GLOBUS_SH_VARIABLES_SET" ; then


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-common.spec	25 Jul 2009 07:26:22 -0000	1.6
+++ globus-common.spec	9 Aug 2009 09:11:32 -0000	1.7
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -283,10 +283,6 @@ sed /globus-makefile-header/d \
 sed 's!/usr/bin/env perl!/usr/bin/perl!' \
   -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
 
-# Remove config.guess file (conflicts with grid-packaging-tools package)
-rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
-sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -370,6 +366,10 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
+- Patch globus_location function to allow unset GLOBUS_LOCATION
+- Put back config.guess file
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Jun 2009 15:36:20 -0000	1.5
+++ import.log	9 Aug 2009 09:11:32 -0000	1.6
@@ -3,3 +3,4 @@ globus-common-10_2-2_fc9:F-10:globus-com
 globus-common-10_2-3_fc9:F-10:globus-common-10.2-3.fc9.src.rpm:1240328836
 globus-common-10_2-4_fc9:F-10:globus-common-10.2-4.fc9.src.rpm:1240864485
 globus-common-10_2-5_fc9:F-10:globus-common-10.2-5.fc9.src.rpm:1245080151
+globus-common-10_2-7_fc11:F-10:globus-common-10.2-7.fc11.src.rpm:1249809063



From ellert at fedoraproject.org  Sun Aug  9 09:12:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 09:12:33 +0000 (UTC)
Subject: rpms/globus-common/EL-5 globus-common-usr.patch, 1.1,
	1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
Message-ID: <20090809091233.03F5411C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21635/EL-5

Modified Files:
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
- Patch globus_location function to allow unset GLOBUS_LOCATION
- Put back config.guess file


globus-common-usr.patch:
 Makefile.am                         |    2 -
 library/globus_common_paths.c       |    9 +++---
 library/globus_extension.c          |   13 ++++++---
 programs/Makefile.am                |    2 -
 programs/globus-sh-exec.in          |    6 +++-
 programs/globus-version.in          |    6 +++-
 scripts/globus-hostname             |   15 +++++------
 scripts/globus-makefile-header      |   47 +++++++++++++++++-------------------
 scripts/globus-makefile-header.gpt1 |   44 +++++++++++++++------------------
 scripts/globus-sh-tools.sh          |    6 +++-
 10 files changed, 79 insertions(+), 71 deletions(-)

Index: globus-common-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/globus-common-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-common-usr.patch	7 Apr 2009 07:48:04 -0000	1.1
+++ globus-common-usr.patch	9 Aug 2009 09:12:32 -0000	1.2
@@ -1,6 +1,66 @@
+diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c
+--- globus_common-10.2.orig/library/globus_common_paths.c	2006-01-19 06:54:14.000000000 +0100
++++ globus_common-10.2/library/globus_common_paths.c	2009-08-04 16:43:07.208220052 +0200
+@@ -111,8 +111,7 @@
+     p = globus_libc_getenv(name);
+     if (!p || strlen(p)==0)
+     {
+-	globus_libc_sprintf(errmsg,_GCSL("Environment variable %s is not set"), name);
+-	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(errmsg);
++	return GLOBUS_SUCCESS;
+     }
+ 
+     *bufp = globus_libc_strdup(p);
+@@ -199,17 +198,17 @@
+     if (!deploy && (result=globus_location(&deploy)))
+ 	return result;
+ 
+-    filename = globus_malloc(strlen(deploy) +
++    filename = globus_malloc( ( deploy ? strlen(deploy) : 0 ) +
+ 			     strlen(file_location) + 1 + 1 );
+     if (!filename)
+ 	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(_GCSL("malloc error"));
+     
+     globus_libc_sprintf(filename,
+ 			"%s/%s",
+-			deploy,
++			deploy ? deploy : "",
+ 			file_location);
+ 
+-    if (!deploy_path)
++    if (!deploy_path && deploy)
+ 	globus_free(deploy);
+ 
+     fp = fopen(filename,"r");
+diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
+--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
++++ globus_common-10.2/library/globus_extension.c	2009-08-03 19:57:22.077217655 +0200
+@@ -195,14 +195,17 @@
+         
+         if(globus_location(&tmp) == GLOBUS_SUCCESS)
+         {
++            if(tmp)
++            {
+ #if defined(TARGET_ARCH_WIN32)
+-            globus_l_globus_location =
+-                globus_common_create_string("%s\\lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s\\lib", tmp);
+ #else
+-            globus_l_globus_location =
+-                globus_common_create_string("%s/lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s/lib", tmp);
+ #endif
+-            globus_free(tmp);
++                globus_free(tmp);
++            }
+         }
+         
+         initialized = GLOBUS_TRUE;
 diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
 --- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
-+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/Makefile.am	2009-08-03 12:31:55.267481653 +0200
 @@ -9,7 +9,7 @@
  	config \
  	doxygen
@@ -12,7 +72,7 @@ diff -ur globus_common-10.2.orig/Makefil
  EXTRA_DIST = \
 diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
 --- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
-+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-sh-exec.in	2009-08-03 12:31:55.268482825 +0200
 @@ -17,7 +17,11 @@
  # 
  
@@ -28,7 +88,7 @@ diff -ur globus_common-10.2.orig/program
  # This was done by the script initializer before V2.0
 diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
 --- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
-+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-version.in	2009-08-03 12:31:55.269484149 +0200
 @@ -43,7 +43,11 @@
  
  usage()
@@ -44,7 +104,7 @@ diff -ur globus_common-10.2.orig/program
      ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
 diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
 --- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
-+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/Makefile.am	2009-08-03 12:31:55.269484149 +0200
 @@ -3,7 +3,7 @@
  if ENABLE_PROGRAMS
  bin_SCRIPTS = globus-sh-exec globus-version
@@ -56,7 +116,7 @@ diff -ur globus_common-10.2.orig/program
  
 diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
 --- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-hostname	2009-08-03 12:31:55.270483512 +0200
 @@ -23,13 +23,12 @@
  # domainname
  
@@ -97,7 +157,7 @@ diff -ur globus_common-10.2.orig/scripts
    # if failed to set, use the system's hostname command
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
 --- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header	2009-08-03 12:31:55.271483490 +0200
 @@ -25,29 +25,15 @@
  
  my $gpt_path = $ENV{GPT_LOCATION};
@@ -196,7 +256,7 @@ diff -ur globus_common-10.2.orig/scripts
      {
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
 --- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2009-08-03 12:31:55.272482892 +0200
 @@ -15,18 +15,13 @@
  
  my $flavor;
@@ -282,7 +342,7 @@ diff -ur globus_common-10.2.orig/scripts
  	if(m!\S!)  
 diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
 --- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-sh-tools.sh	2009-08-03 12:31:55.273482271 +0200
 @@ -18,7 +18,11 @@
  
  if test -z "$GLOBUS_SH_VARIABLES_SET" ; then


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/globus-common.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-common.spec	25 Jul 2009 07:26:30 -0000	1.6
+++ globus-common.spec	9 Aug 2009 09:12:32 -0000	1.7
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -283,10 +283,6 @@ sed /globus-makefile-header/d \
 sed 's!/usr/bin/env perl!/usr/bin/perl!' \
   -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
 
-# Remove config.guess file (conflicts with grid-packaging-tools package)
-rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
-sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -370,6 +366,10 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
+- Patch globus_location function to allow unset GLOBUS_LOCATION
+- Put back config.guess file
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Jun 2009 15:39:53 -0000	1.5
+++ import.log	9 Aug 2009 09:12:32 -0000	1.6
@@ -3,3 +3,4 @@ globus-common-10_2-2_fc9:EL-5:globus-com
 globus-common-10_2-3_fc9:EL-5:globus-common-10.2-3.fc9.src.rpm:1240329334
 globus-common-10_2-4_fc9:EL-5:globus-common-10.2-4.fc9.src.rpm:1240864741
 globus-common-10_2-5_fc9:EL-5:globus-common-10.2-5.fc9.src.rpm:1245080370
+globus-common-10_2-7_fc11:EL-5:globus-common-10.2-7.fc11.src.rpm:1249809122



From ellert at fedoraproject.org  Sun Aug  9 09:13:25 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun,  9 Aug 2009 09:13:25 +0000 (UTC)
Subject: rpms/globus-common/EL-4 globus-common-usr.patch, 1.1,
	1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
Message-ID: <20090809091325.7771F11C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21892/EL-4

Modified Files:
	globus-common-usr.patch globus-common.spec import.log 
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
- Patch globus_location function to allow unset GLOBUS_LOCATION
- Put back config.guess file


globus-common-usr.patch:
 Makefile.am                         |    2 -
 library/globus_common_paths.c       |    9 +++---
 library/globus_extension.c          |   13 ++++++---
 programs/Makefile.am                |    2 -
 programs/globus-sh-exec.in          |    6 +++-
 programs/globus-version.in          |    6 +++-
 scripts/globus-hostname             |   15 +++++------
 scripts/globus-makefile-header      |   47 +++++++++++++++++-------------------
 scripts/globus-makefile-header.gpt1 |   44 +++++++++++++++------------------
 scripts/globus-sh-tools.sh          |    6 +++-
 10 files changed, 79 insertions(+), 71 deletions(-)

Index: globus-common-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/globus-common-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-common-usr.patch	7 Apr 2009 07:45:46 -0000	1.1
+++ globus-common-usr.patch	9 Aug 2009 09:13:25 -0000	1.2
@@ -1,6 +1,66 @@
+diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c
+--- globus_common-10.2.orig/library/globus_common_paths.c	2006-01-19 06:54:14.000000000 +0100
++++ globus_common-10.2/library/globus_common_paths.c	2009-08-04 16:43:07.208220052 +0200
+@@ -111,8 +111,7 @@
+     p = globus_libc_getenv(name);
+     if (!p || strlen(p)==0)
+     {
+-	globus_libc_sprintf(errmsg,_GCSL("Environment variable %s is not set"), name);
+-	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(errmsg);
++	return GLOBUS_SUCCESS;
+     }
+ 
+     *bufp = globus_libc_strdup(p);
+@@ -199,17 +198,17 @@
+     if (!deploy && (result=globus_location(&deploy)))
+ 	return result;
+ 
+-    filename = globus_malloc(strlen(deploy) +
++    filename = globus_malloc( ( deploy ? strlen(deploy) : 0 ) +
+ 			     strlen(file_location) + 1 + 1 );
+     if (!filename)
+ 	return GLOBUS_COMMON_PATH_ERROR_INSTANCE(_GCSL("malloc error"));
+     
+     globus_libc_sprintf(filename,
+ 			"%s/%s",
+-			deploy,
++			deploy ? deploy : "",
+ 			file_location);
+ 
+-    if (!deploy_path)
++    if (!deploy_path && deploy)
+ 	globus_free(deploy);
+ 
+     fp = fopen(filename,"r");
+diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
+--- globus_common-10.2.orig/library/globus_extension.c	2008-03-12 20:01:05.000000000 +0100
++++ globus_common-10.2/library/globus_extension.c	2009-08-03 19:57:22.077217655 +0200
+@@ -195,14 +195,17 @@
+         
+         if(globus_location(&tmp) == GLOBUS_SUCCESS)
+         {
++            if(tmp)
++            {
+ #if defined(TARGET_ARCH_WIN32)
+-            globus_l_globus_location =
+-                globus_common_create_string("%s\\lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s\\lib", tmp);
+ #else
+-            globus_l_globus_location =
+-                globus_common_create_string("%s/lib", tmp);
++                globus_l_globus_location =
++                    globus_common_create_string("%s/lib", tmp);
+ #endif
+-            globus_free(tmp);
++                globus_free(tmp);
++            }
+         }
+         
+         initialized = GLOBUS_TRUE;
 diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
 --- globus_common-10.2.orig/Makefile.am	2004-10-11 14:53:32.000000000 +0200
-+++ globus_common-10.2/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/Makefile.am	2009-08-03 12:31:55.267481653 +0200
 @@ -9,7 +9,7 @@
  	config \
  	doxygen
@@ -12,7 +72,7 @@ diff -ur globus_common-10.2.orig/Makefil
  EXTRA_DIST = \
 diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
 --- globus_common-10.2.orig/programs/globus-sh-exec.in	2006-01-19 06:54:19.000000000 +0100
-+++ globus_common-10.2/programs/globus-sh-exec.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-sh-exec.in	2009-08-03 12:31:55.268482825 +0200
 @@ -17,7 +17,11 @@
  # 
  
@@ -28,7 +88,7 @@ diff -ur globus_common-10.2.orig/program
  # This was done by the script initializer before V2.0
 diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
 --- globus_common-10.2.orig/programs/globus-version.in	2008-09-29 23:20:05.000000000 +0200
-+++ globus_common-10.2/programs/globus-version.in	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-version.in	2009-08-03 12:31:55.269484149 +0200
 @@ -43,7 +43,11 @@
  
  usage()
@@ -44,7 +104,7 @@ diff -ur globus_common-10.2.orig/program
      ${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
 diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
 --- globus_common-10.2.orig/programs/Makefile.am	2005-12-07 10:37:44.000000000 +0100
-+++ globus_common-10.2/programs/Makefile.am	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/Makefile.am	2009-08-03 12:31:55.269484149 +0200
 @@ -3,7 +3,7 @@
  if ENABLE_PROGRAMS
  bin_SCRIPTS = globus-sh-exec globus-version
@@ -56,7 +116,7 @@ diff -ur globus_common-10.2.orig/program
  
 diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
 --- globus_common-10.2.orig/scripts/globus-hostname	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-hostname	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-hostname	2009-08-03 12:31:55.270483512 +0200
 @@ -23,13 +23,12 @@
  # domainname
  
@@ -97,7 +157,7 @@ diff -ur globus_common-10.2.orig/scripts
    # if failed to set, use the system's hostname command
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
 --- globus_common-10.2.orig/scripts/globus-makefile-header	2008-02-20 17:03:35.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header	2009-08-03 12:31:55.271483490 +0200
 @@ -25,29 +25,15 @@
  
  my $gpt_path = $ENV{GPT_LOCATION};
@@ -196,7 +256,7 @@ diff -ur globus_common-10.2.orig/scripts
      {
 diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
 --- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1	2003-02-05 03:48:31.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header.gpt1	2009-08-03 12:31:55.272482892 +0200
 @@ -15,18 +15,13 @@
  
  my $flavor;
@@ -282,7 +342,7 @@ diff -ur globus_common-10.2.orig/scripts
  	if(m!\S!)  
 diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
 --- globus_common-10.2.orig/scripts/globus-sh-tools.sh	2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-sh-tools.sh	2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-sh-tools.sh	2009-08-03 12:31:55.273482271 +0200
 @@ -18,7 +18,11 @@
  
  if test -z "$GLOBUS_SH_VARIABLES_SET" ; then


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/globus-common.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-common.spec	25 Jul 2009 07:26:39 -0000	1.6
+++ globus-common.spec	9 Aug 2009 09:13:25 -0000	1.7
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -283,10 +283,6 @@ sed /globus-makefile-header/d \
 sed 's!/usr/bin/env perl!/usr/bin/perl!' \
   -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
 
-# Remove config.guess file (conflicts with grid-packaging-tools package)
-rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
-sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -370,6 +366,10 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
+- Patch globus_location function to allow unset GLOBUS_LOCATION
+- Put back config.guess file
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/EL-4/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Jun 2009 15:38:35 -0000	1.5
+++ import.log	9 Aug 2009 09:13:25 -0000	1.6
@@ -3,3 +3,4 @@ globus-common-10_2-2_fc9:EL-4:globus-com
 globus-common-10_2-3_fc9:EL-4:globus-common-10.2-3.fc9.src.rpm:1240329175
 globus-common-10_2-4_fc9:EL-4:globus-common-10.2-4.fc9.src.rpm:1240864659
 globus-common-10_2-5_fc9:EL-4:globus-common-10.2-5.fc9.src.rpm:1245080287
+globus-common-10_2-7_fc11:EL-4:globus-common-10.2-7.fc11.src.rpm:1249809176



From tomeu at fedoraproject.org  Sun Aug  9 09:49:55 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  9 Aug 2009 09:49:55 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore, 1.10, 1.11 gnash.spec, 1.52,
	1.53 sources, 1.10, 1.11
Message-ID: <20090809094955.D034911C00D7@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29397

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Fri Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
- merge upstream changes into the spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Mar 2009 12:24:35 -0000	1.10
+++ .cvsignore	9 Aug 2009 09:49:55 -0000	1.11
@@ -1,2 +1 @@
-gnash-0.8.5.tar.gz
-gnash-splash.swf
+gnash-0.9.0.20090807bzr11384.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gnash.spec	25 Jul 2009 00:30:31 -0000	1.52
+++ gnash.spec	9 Aug 2009 09:49:55 -0000	1.53
@@ -1,12 +1,16 @@
+%define commitid 11400
+%define alphatag 20090809bzr%{commitid}
+
 Name:           gnash
-Version:        0.8.5
-Release:        5%{?dist}
+Version:        0.9.0
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
+#Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.%{alphatag}.tar.gz
 Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop
 
@@ -36,6 +40,7 @@ BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  speex-devel
 BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  pygtk2-devel
 
 #Requires(post): scrollkeeper
 #Requires(postun): scrollkeeper
@@ -82,6 +87,20 @@ Group:     Applications/Multimedia
 %description cygnal
 Cygnal is a streaming media server that's Flash aware.
 
+%package devel
+Summary:   Gnash header files
+Group:     Applications/Multimedia
+
+%description devel
+Gnash header files can be used to write external Gnash extensions.
+
+%package widget
+Summary:   Gnash widgets for Gtk and Python
+Group:     Applications/Multimedia
+
+%description widget
+The Gnash widgets can be used to embed Gnash into any Gtk or Python-Gtk
+application.
 
 %prep
 %setup -q
@@ -108,8 +127,9 @@ mv AUTHORS.utf8 AUTHORS
   --enable-docbook --enable-ghelp --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
   --enable-cygnal \
+  --enable-sdkinstall \
+  --enable-python \
   --enable-gui=gtk,kde4,sdl,fb \
-  --with-qt4=%{_kde4_prefix} \
   --with-kde4-prefix=%{_kde4_prefix} \
   --with-kde4-lib=%{_kde4_libdir}/kde4/devel \
   --with-kde4-incl=%{_kde4_includedir}
@@ -130,19 +150,6 @@ make install install-plugins \
 rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
 # KDE 4 doesn't need the .la file anymore, thankfully
 rm $RPM_BUILD_ROOT%{_kde4_libdir}/kde4/libklashpart.la
-rm \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashamf.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashbase.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashmedia.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashnet.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashcore.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so*
-# $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashserver.so
-# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
-# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
-# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
-# $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
-# $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
 #rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
@@ -257,10 +264,10 @@ fi
 %{_bindir}/soldumper
 %{_bindir}/gnash
 %{_bindir}/gprocessor
+%{_bindir}/findmicrophones
+%{_bindir}/findwebcams
 %dir %{_libdir}/gnash
-%{_libdir}/gnash/libgnash*
-#%{_libdir}/libgnash*-*.so
-#%{_libdir}/libklash*-*.so
+%{_libdir}/gnash/*.so*
 %{_mandir}/man1/gnash.1*
 %{_mandir}/man1/dumpshm.1*
 %{_mandir}/man1/gprocessor.1*
@@ -286,10 +293,23 @@ fi
 
 %files cygnal
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/cygnalrc
 %{_bindir}/cygnal
 %{_mandir}/man1/cygnal.1*
+%{_mandir}/man1/rtmpget.1*
+
+%files devel
+%{_prefix}/include/gnash/*.h
+%{_prefix}/lib/pkgconfig/gnash.pc
+
+%files widget
+%{_prefix}/include/gnash/*.h
+%{_prefix}/lib/python*/site-packages/gtk-2.0/gnash.*
 
 %changelog
+* Fri Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
+- merge upstream changes into the spec
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Mar 2009 12:24:36 -0000	1.10
+++ sources	9 Aug 2009 09:49:55 -0000	1.11
@@ -1,2 +1 @@
-b54a72a52d2477e65d9029be572789ff  gnash-0.8.5.tar.gz
-3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf
+899b3f5e519fb1f0908a6ca66759eae3  gnash-0.9.0.20090807bzr11384.tar.gz



From tomeu at fedoraproject.org  Sun Aug  9 09:50:54 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  9 Aug 2009 09:50:54 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090809095054.4568E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29629

Modified Files:
	.cvsignore sources 
Log Message:
Upload new tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 Aug 2009 09:49:55 -0000	1.11
+++ .cvsignore	9 Aug 2009 09:50:54 -0000	1.12
@@ -1 +1 @@
-gnash-0.9.0.20090807bzr11384.tar.gz
+gnash-0.9.0.20090809bzr11400.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Aug 2009 09:49:55 -0000	1.11
+++ sources	9 Aug 2009 09:50:54 -0000	1.12
@@ -1 +1 @@
-899b3f5e519fb1f0908a6ca66759eae3  gnash-0.9.0.20090807bzr11384.tar.gz
+35b1a99c679a4604a3ec627ea21b6496  gnash-0.9.0.20090809bzr11400.tar.gz



From tomeu at fedoraproject.org  Sun Aug  9 10:09:43 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  9 Aug 2009 10:09:43 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore, 1.12, 1.13 gnash.spec, 1.53,
	1.54 sources, 1.12, 1.13
Message-ID: <20090809100943.1CE2611C00D7@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1744

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.2.20090809bzr11400
- upload the .swf file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Aug 2009 09:50:54 -0000	1.12
+++ .cvsignore	9 Aug 2009 10:09:42 -0000	1.13
@@ -1 +1,2 @@
 gnash-0.9.0.20090809bzr11400.tar.gz
+gnash-splash.swf


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnash.spec	9 Aug 2009 09:49:55 -0000	1.53
+++ gnash.spec	9 Aug 2009 10:09:42 -0000	1.54
@@ -3,7 +3,7 @@
 
 Name:           gnash
 Version:        0.9.0
-Release:        0.1.%{alphatag}%{?dist}
+Release:        0.2.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -307,7 +307,10 @@ fi
 %{_prefix}/lib/python*/site-packages/gtk-2.0/gnash.*
 
 %changelog
-* Fri Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.2.20090809bzr11400
+- upload the .swf file
+
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.1.20090809bzr11400
 - merge upstream changes into the spec
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Aug 2009 09:50:54 -0000	1.12
+++ sources	9 Aug 2009 10:09:42 -0000	1.13
@@ -1 +1,2 @@
 35b1a99c679a4604a3ec627ea21b6496  gnash-0.9.0.20090809bzr11400.tar.gz
+3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf



From hubbitus at fedoraproject.org  Sun Aug  9 10:34:24 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  9 Aug 2009 10:34:24 +0000 (UTC)
Subject: rpms/fotoxx/devel .cvsignore, 1.15, 1.16 fotoxx.spec, 1.18,
	1.19 sources, 1.15, 1.16 fotoxx-dynamically-link.patch, 1.1, NONE
Message-ID: <20090809103424.E250C11C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/fotoxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6130

Modified Files:
	.cvsignore fotoxx.spec sources 
Removed Files:
	fotoxx-dynamically-link.patch 
Log Message:
- Update to version 8.0
- Delete old patches.
- Add new man file.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	25 Feb 2009 15:13:14 -0000	1.15
+++ .cvsignore	9 Aug 2009 10:34:24 -0000	1.16
@@ -1,2 +1,2 @@
-fotoxx-6.0.tar.gz
-fotoxx-5.8.constchar.patch
+fotoxx-8.0.tar.gz
+fotoxx-8.0-mandir.patch


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/fotoxx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fotoxx.spec	24 Jul 2009 23:03:57 -0000	1.18
+++ fotoxx.spec	9 Aug 2009 10:34:24 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		fotoxx
-Version:		6.0
-Release:		4%{?dist}
+Version:		8.0
+Release:		5%{?dist}
 Summary:		Photo editor
 
 Group:		Applications/Multimedia
@@ -12,12 +12,16 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  freeimage-devel
+BuildRequires:	freeimage-devel
 Requires:		exiv2
 Requires:		printoxx
 
-Patch0:		fotoxx-5.8.constchar.patch
-Patch1:         fotoxx-dynamically-link.patch
+# Presents checked at build time
+BuildRequires:	perl-Image-ExifTool ufraw
+Requires:		perl-Image-ExifTool ufraw
+
+# No public bugtracker. Sent to author by mail 2009-08-09
+Patch0:		fotoxx-8.0-mandir.patch
 
 %description
 Fotoxx is a free open source Linux program for editing image files
@@ -25,37 +29,33 @@ from a digital camera. The goal of fotox
 needs while remaining easy to use.
 
 %prep
-%setup -q -n %{name}
-rm libfreeimage.a
-%patch0 -p1 -b .constchar
-%patch1 -p1 -b .dynamic
+%setup -q
+%patch0 -p0 -b .mandir
 
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
-make %{?_smp_mflags} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-
+make %{?_smp_mflags} PREFIX=%{_prefix}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-install -Dm 644 -p data/icons/%{name}.png  $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
+install -Dm 644 -p data/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="" \
-  --mode 644 \
-  --remove-category="Application" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-  %{SOURCE1}
-
+	--mode 644 \
+	--remove-category="Application" \
+	--dir %{buildroot}%{_datadir}/applications/ \
+	%{SOURCE1}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc doc/*
+%doc %{_mandir}/man1/%{name}.1*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}/icons/
@@ -64,6 +64,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-5
+- Update to version 8.0
+- Delete old patches.
+- Remove rm libfreeimage.a, name of dir in %%setup.
+- Replace all $RPM_BUILD_ROOT by %%{buildroot}
+- Add Patch0: fotoxx-8.0-mandir.patch
+- Add new file %%doc %%{_mandir}/man1/%%{name}.1*
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	25 Feb 2009 15:13:14 -0000	1.15
+++ sources	9 Aug 2009 10:34:24 -0000	1.16
@@ -1,2 +1,2 @@
-e86c8d39bc2e1b30ddac32c58d7d3c3a  fotoxx-6.0.tar.gz
-7e891f89b87ee5a3e8db60a8860f4221  fotoxx-5.8.constchar.patch
+66ad6298923a1593c8035ccdd122dfec  fotoxx-8.0.tar.gz
+43abca5f7838f56acd1979afc59d0b69  fotoxx-8.0-mandir.patch


--- fotoxx-dynamically-link.patch DELETED ---



From hubbitus at fedoraproject.org  Sun Aug  9 10:51:38 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  9 Aug 2009 10:51:38 +0000 (UTC)
Subject: rpms/fotoxx/devel fotoxx.spec,1.19,1.20
Message-ID: <20090809105138.A7B4A11C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/fotoxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10183

Modified Files:
	fotoxx.spec 
Log Message:
- Add R and BR: xdg-utils




Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/fotoxx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fotoxx.spec	9 Aug 2009 10:34:24 -0000	1.19
+++ fotoxx.spec	9 Aug 2009 10:51:37 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		fotoxx
 Version:		8.0
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Photo editor
 
 Group:		Applications/Multimedia
@@ -17,8 +17,8 @@ Requires:		exiv2
 Requires:		printoxx
 
 # Presents checked at build time
-BuildRequires:	perl-Image-ExifTool ufraw
-Requires:		perl-Image-ExifTool ufraw
+BuildRequires:	perl-Image-ExifTool ufraw xdg-utils
+Requires:		perl-Image-ExifTool ufraw xdg-utils
 
 # No public bugtracker. Sent to author by mail 2009-08-09
 Patch0:		fotoxx-8.0-mandir.patch
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-6
+- Add R and BR: xdg-utils
+
 * Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-5
 - Update to version 8.0
 - Delete old patches.



From tomeu at fedoraproject.org  Sun Aug  9 11:02:47 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  9 Aug 2009 11:02:47 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.54,1.55
Message-ID: <20090809110247.35F9F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12500

Modified Files:
	gnash.spec 
Log Message:
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11400
- Fix the packaging in 64bits



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- gnash.spec	9 Aug 2009 10:09:42 -0000	1.54
+++ gnash.spec	9 Aug 2009 11:02:46 -0000	1.55
@@ -1,9 +1,11 @@
 %define commitid 11400
 %define alphatag 20090809bzr%{commitid}
 
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
 Name:           gnash
 Version:        0.9.0
-Release:        0.2.%{alphatag}%{?dist}
+Release:        0.3.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -300,13 +302,16 @@ fi
 
 %files devel
 %{_prefix}/include/gnash/*.h
-%{_prefix}/lib/pkgconfig/gnash.pc
+%{_libdir}/pkgconfig/gnash.pc
 
 %files widget
 %{_prefix}/include/gnash/*.h
-%{_prefix}/lib/python*/site-packages/gtk-2.0/gnash.*
+%{python_sitelib}/*
 
 %changelog
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11400
+- Fix the packaging in 64bits
+
 * Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.2.20090809bzr11400
 - upload the .swf file
 



From hubbitus at fedoraproject.org  Sun Aug  9 11:24:37 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  9 Aug 2009 11:24:37 +0000 (UTC)
Subject: rpms/fotoxx/F-10 .cvsignore, 1.12, 1.13 fotoxx.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090809112437.9291911C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/fotoxx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17564

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
- Update to version 8.0
- Delete old patches.
- Add new man file.
- Add R and BR: xdg-utils




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	4 Jan 2009 18:07:15 -0000	1.12
+++ .cvsignore	9 Aug 2009 11:24:37 -0000	1.13
@@ -1 +1,2 @@
-fotoxx-5.8.tar.gz
+fotoxx-8.0.tar.gz
+fotoxx-8.0-mandir.patch


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-10/fotoxx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fotoxx.spec	4 Jan 2009 18:07:15 -0000	1.11
+++ fotoxx.spec	9 Aug 2009 11:24:37 -0000	1.12
@@ -1,19 +1,27 @@
-Name:           fotoxx
-Version:        5.8
-Release:        1%{?dist}
-Summary:        Photo editor 
-
-Group:          Applications/Multimedia 
-License:        GPLv2
-URL:            http://kornelix.squarespace.com/%{name}
-Source0:        http://kornelix.squarespace.com/storage/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel
-BuildRequires:  desktop-file-utils
-Requires:       exiv2
-Requires:       printoxx
+Name:		fotoxx
+Version:		8.0
+Release:		6%{?dist}
+Summary:		Photo editor
+
+Group:		Applications/Multimedia
+License:		GPLv2
+URL:			http://kornelix.squarespace.com/%{name}
+Source0:		http://kornelix.squarespace.com/storage/downloads/%{name}-%{version}.tar.gz
+Source1:		%{name}.desktop
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	gtk2-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	freeimage-devel
+Requires:		exiv2
+Requires:		printoxx
+
+# Presents checked at build time
+BuildRequires:	perl-Image-ExifTool ufraw xdg-utils
+Requires:		perl-Image-ExifTool ufraw xdg-utils
+
+# No public bugtracker. Sent to author by mail 2009-08-09
+Patch0:		fotoxx-8.0-mandir.patch
 
 %description
 Fotoxx is a free open source Linux program for editing image files
@@ -21,33 +29,33 @@ from a digital camera. The goal of fotox
 needs while remaining easy to use.
 
 %prep
-%setup -q -n %{name}
+%setup -q
+%patch0 -p0 -b .mandir
+
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
-make %{?_smp_mflags} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-
+make %{?_smp_mflags} PREFIX=%{_prefix}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-install -Dm 644 -p data/icons/%{name}.png  $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
+install -Dm 644 -p data/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="" \
-  --mode 644 \
-  --remove-category="Application" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-  %{SOURCE1}
-
+	--mode 644 \
+	--remove-category="Application" \
+	--dir %{buildroot}%{_datadir}/applications/ \
+	%{SOURCE1}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc doc/*
+%doc %{_mandir}/man1/%{name}.1*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}/icons/
@@ -56,6 +64,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-6
+- Add R and BR: xdg-utils
+
+* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-5
+- Update to version 8.0
+- Delete old patches.
+- Remove rm libfreeimage.a, name of dir in %%setup.
+- Replace all $RPM_BUILD_ROOT by %%{buildroot}
+- Add Patch0: fotoxx-8.0-mandir.patch
+- Add new file %%doc %%{_mandir}/man1/%%{name}.1*
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Dennis Gilmore <dennis at ausil.us> - 6.0-3
+- add patch to dynamically link to libfreeimage
+
+* Wed Feb 25 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 6.0-2
+- Forgot patch
+
+* Wed Feb 25 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 6.0-1
+- New version 6.0
+- Adjust Source0 url (inspired by Kevin Fenzi in fedora-devel-list: https://www.redhat.com/archives/fedora-devel-list/2009-February/msg01622.html ).
+
+* Wed Feb 25 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 5.8-2
+- Add patch0 fotoxx-5.8.constchar.patch
+- Reformat spec with tabs, remove trailing spaces.
+
 * Sun Jan  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.8-1
 - Rebuild for 5.8
 * Mon Dec  1 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Jan 2009 18:07:15 -0000	1.12
+++ sources	9 Aug 2009 11:24:37 -0000	1.13
@@ -1 +1,2 @@
-7f86e79ab79e8bf830e71930f6941b01  fotoxx-5.8.tar.gz
+66ad6298923a1593c8035ccdd122dfec  fotoxx-8.0.tar.gz
+43abca5f7838f56acd1979afc59d0b69  fotoxx-8.0-mandir.patch



From ensc at fedoraproject.org  Sun Aug  9 11:25:08 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 11:25:08 +0000 (UTC)
Subject: rpms/clamav/F-11 clamav-milter.sysv,1.3,1.4 clamav.spec,1.88,1.89
Message-ID: <20090809112508.0502C11C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17816/F-11

Modified Files:
	clamav-milter.sysv clamav.spec 
Log Message:
- disabled LocalSocket option in sample configuration
- fixed clamav-milter sysv initscript to use bash interpreter and to
  be disabled by default



Index: clamav-milter.sysv
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav-milter.sysv,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clamav-milter.sysv	11 Jun 2009 07:27:38 -0000	1.3
+++ clamav-milter.sysv	9 Aug 2009 11:25:07 -0000	1.4
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # clamav-milter Starts/stop the "clamav-milter" daemon
 #
-# chkconfig:   345 99 1
+# chkconfig:   - 99 1
 # description: A virus scanning milter
 
 # Source function library.


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- clamav.spec	11 Jun 2009 07:27:38 -0000	1.88
+++ clamav.spec	9 Aug 2009 11:25:07 -0000	1.89
@@ -21,7 +21,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.2
-Release:	%release_func 1%{?snapshot:.%snapshot}
+Release:	%release_func 2%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -321,7 +321,7 @@ mkdir -p libclamunrar{,_iface}
 
 sed -ri \
     -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \
-    -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
+    -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
     -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \
     -e 's!^#?(User ).*!\1<USER>!g' \
     -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \
@@ -666,6 +666,11 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-2
+- disabled LocalSocket option in sample configuration
+- fixed clamav-milter sysv initscript to use bash interpreter and to
+  be disabled by default
+
 * Thu Jun 11 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-1
 - updated to 0.95.2
 



From ensc at fedoraproject.org  Sun Aug  9 11:25:35 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 11:25:35 +0000 (UTC)
Subject: rpms/clamav/devel clamav-milter.sysv,1.2,1.3 clamav.spec,1.91,1.92
Message-ID: <20090809112535.C669211C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17940/devel

Modified Files:
	clamav-milter.sysv clamav.spec 
Log Message:
- modified freshclam configuration to log by syslog by default
- disabled LocalSocket option in sample configuration
- fixed clamav-milter sysv initscript to use bash interpreter and to
  be disabled by default



Index: clamav-milter.sysv
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.sysv,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clamav-milter.sysv	8 Mar 2009 12:47:20 -0000	1.2
+++ clamav-milter.sysv	9 Aug 2009 11:25:35 -0000	1.3
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # clamav-milter Starts/stop the "clamav-milter" daemon
 #
-# chkconfig:   345 99 1
+# chkconfig:   - 99 1
 # description: A virus scanning milter
 
 # Source function library.


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- clamav.spec	8 Aug 2009 13:33:12 -0000	1.91
+++ clamav.spec	9 Aug 2009 11:25:35 -0000	1.92
@@ -321,15 +321,18 @@ mkdir -p libclamunrar{,_iface}
 %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}}
 
 sed -ri \
-    -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \
-    -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
+    -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \
+    -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
     -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \
     -e 's!^#?(User ).*!\1<USER>!g' \
     -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \
     -e 's! /usr/local/share/clamav,! %homedir,!g' \
     etc/clamd.conf
 
-sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
+sed -ri \
+    -e 's!^#?(UpdateLogFile )!#\1!g;' \
+    -e 's!^#?(LogSyslog).*!\1 yes!g' \
+    -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf
 
 
 ## ------------------------------------------------------------
@@ -468,7 +471,7 @@ rm -rf "$RPM_BUILD_ROOT"
 
 ## ------------------------------------------------------------
 
-%triggerprein filesystem -- clamav-filesystem < 0.95.2-3
+%triggerprein filesystem -- clamav-filesystem < 0.96
 ## REMOVE me in F14 or F15 (added in pre F12)
 ! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { 
 	/usr/sbin/usermod  -l %username clamav || :
@@ -691,6 +694,12 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-5
+- modified freshclam configuration to log by syslog by default
+- disabled LocalSocket option in sample configuration
+- fixed clamav-milter sysv initscript to use bash interpreter and to
+  be disabled by default
+
 * Sat Aug  8 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-4
 - renamed 'clamav' user/group to 'clamupdate'
 - add the '%milteruser' user to the '%scanuser' group when the -scanner



From hubbitus at fedoraproject.org  Sun Aug  9 11:33:51 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun,  9 Aug 2009 11:33:51 +0000 (UTC)
Subject: rpms/fotoxx/F-11 .cvsignore, 1.15, 1.16 fotoxx.spec, 1.17,
	1.18 sources, 1.15, 1.16 fotoxx-dynamically-link.patch, 1.1, NONE
Message-ID: <20090809113351.078CA11C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/fotoxx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19654

Modified Files:
	.cvsignore fotoxx.spec sources 
Removed Files:
	fotoxx-dynamically-link.patch 
Log Message:
- Update to version 8.0
- Delete old patches.
- Add new man file.
- Add R and BR: xdg-utils




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	25 Feb 2009 15:13:14 -0000	1.15
+++ .cvsignore	9 Aug 2009 11:33:50 -0000	1.16
@@ -1,2 +1,2 @@
-fotoxx-6.0.tar.gz
-fotoxx-5.8.constchar.patch
+fotoxx-8.0.tar.gz
+fotoxx-8.0-mandir.patch


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-11/fotoxx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fotoxx.spec	25 Feb 2009 16:59:57 -0000	1.17
+++ fotoxx.spec	9 Aug 2009 11:33:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		fotoxx
-Version:		6.0
-Release:		3%{?dist}
+Version:		8.0
+Release:		6%{?dist}
 Summary:		Photo editor
 
 Group:		Applications/Multimedia
@@ -12,12 +12,16 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  freeimage-devel
+BuildRequires:	freeimage-devel
 Requires:		exiv2
 Requires:		printoxx
 
-Patch0:		fotoxx-5.8.constchar.patch
-Patch1:         fotoxx-dynamically-link.patch
+# Presents checked at build time
+BuildRequires:	perl-Image-ExifTool ufraw xdg-utils
+Requires:		perl-Image-ExifTool ufraw xdg-utils
+
+# No public bugtracker. Sent to author by mail 2009-08-09
+Patch0:		fotoxx-8.0-mandir.patch
 
 %description
 Fotoxx is a free open source Linux program for editing image files
@@ -25,37 +29,33 @@ from a digital camera. The goal of fotox
 needs while remaining easy to use.
 
 %prep
-%setup -q -n %{name}
-rm libfreeimage.a
-%patch0 -p1 -b .constchar
-%patch1 -p1 -b .dynamic
+%setup -q
+%patch0 -p0 -b .mandir
 
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
-make %{?_smp_mflags} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-
+make %{?_smp_mflags} PREFIX=%{_prefix}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-install -Dm 644 -p data/icons/%{name}.png  $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
+install -Dm 644 -p data/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="" \
-  --mode 644 \
-  --remove-category="Application" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-  %{SOURCE1}
-
+	--mode 644 \
+	--remove-category="Application" \
+	--dir %{buildroot}%{_datadir}/applications/ \
+	%{SOURCE1}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc doc/*
+%doc %{_mandir}/man1/%{name}.1*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}/icons/
@@ -64,6 +64,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-6
+- Add R and BR: xdg-utils
+
+* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 8.0-5
+- Update to version 8.0
+- Delete old patches.
+- Remove rm libfreeimage.a, name of dir in %%setup.
+- Replace all $RPM_BUILD_ROOT by %%{buildroot}
+- Add Patch0: fotoxx-8.0-mandir.patch
+- Add new file %%doc %%{_mandir}/man1/%%{name}.1*
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Dennis Gilmore <dennis at ausil.us> - 6.0-3
 - add patch to dynamically link to libfreeimage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	25 Feb 2009 15:13:14 -0000	1.15
+++ sources	9 Aug 2009 11:33:50 -0000	1.16
@@ -1,2 +1,2 @@
-e86c8d39bc2e1b30ddac32c58d7d3c3a  fotoxx-6.0.tar.gz
-7e891f89b87ee5a3e8db60a8860f4221  fotoxx-5.8.constchar.patch
+66ad6298923a1593c8035ccdd122dfec  fotoxx-8.0.tar.gz
+43abca5f7838f56acd1979afc59d0b69  fotoxx-8.0-mandir.patch


--- fotoxx-dynamically-link.patch DELETED ---



From gerd at fedoraproject.org  Sun Aug  9 11:45:06 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sun,  9 Aug 2009 11:45:06 +0000 (UTC)
Subject: rpms/rakudo/F-11 import.log, NONE, 1.1 rakudo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090809114506.7300511C00D7@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22578/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rakudo.spec 
Log Message:
initial package



--- NEW FILE import.log ---
rakudo-0_0_2009_07_1_4_0-3_fc11:F-11:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818177


--- NEW FILE rakudo.spec ---
%global year 2009
%global month 07
%global parrot_version 1.4.0

%define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
%define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6

ExcludeArch:ppc

Name:           rakudo
Version:        0.0.%{year}.%{month}_%{parrot_version}
Release:        3%{?dist}
Summary:        A Perl compiler on Parrot
License:        Artistic 2.0
Group:          Development/Languages
URL:            http://www.rakudo.org/

Source0:        http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{year}-%{month}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# This librarys are needed while pbc_to_exe include them
BuildRequires:  ncurses-devel
BuildRequires:  readline-devel
BuildRequires:  gmp-devel
BuildRequires:  gdbm-devel
BuildRequires:  libicu-devel

BuildRequires:  parrot >= %{parrot_version}
BuildRequires:  parrot-devel >= %{parrot_version}
BuildRequires:  parrot-tools >= %{parrot_version}

%description
Rakudo Perl 6, or just Rakudo, is a Perl 6 compiler for the Parrot virtual
machine. Rakudo is an implementation of the Perl 6 specification that runs
on the Parrot VM. More information about Perl 6 is available from:
http://perl6-projects.org

%prep
%setup -q -n %{name}-%{year}-%{month}
exit 0

%build
%{__perl} Configure.pl
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Creating man-page
%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
pod2man --section=1 --name=perl6 docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/perl6.1.gz

%check
%{?!_without_tests: make test}
exit 0

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CREDITS LICENSE README
%{_bindir}/perl6
%{parrot_dynext}/perl6_group.so
%{parrot_dynext}/perl6_ops.so
%{parrot_dynext}/perl6_ops_cg.so
%{parrot_dynext}/perl6_ops_cgp.so
%{parrot_dynext}/perl6_ops_switch.so
%{par_lang_perl6}/lib/Safe.pm
%{par_lang_perl6}/lib/Test.pm
%{par_lang_perl6}/perl6.pbc
%{_mandir}/man1/perl6.1.gz


%changelog
* Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-3
- modified source added so that shared objects will be stripped

* Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2
- Add a perl6 man page

* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-1
- Fix versioning
- use 'ExcludeArch:ppc' for now
- Provide full SourceURL
- strip binary
- first .spec file created

* Fri Jul 31 2009 wayland <wayland at wayland.id.au> 0.0.2009.07_1.4.0-1
- Tim Nelson also created an initial .spec file some things are taken from it


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	2 Aug 2009 23:32:04 -0000	1.1
+++ .cvsignore	9 Aug 2009 11:45:05 -0000	1.2
@@ -0,0 +1 @@
+rakudo-2009-07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	2 Aug 2009 23:32:04 -0000	1.1
+++ sources	9 Aug 2009 11:45:06 -0000	1.2
@@ -0,0 +1 @@
+585ae3110c4471cb860f067028762c2b  rakudo-2009-07.tar.gz



From gerd at fedoraproject.org  Sun Aug  9 11:54:30 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sun,  9 Aug 2009 11:54:30 +0000 (UTC)
Subject: rpms/rakudo/devel import.log, 1.2, 1.3 rakudo.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20090809115430.AE6A511C00D7@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24567/devel

Modified Files:
	import.log rakudo.spec sources 
Log Message:
add new source; shared libraries will now be stripped



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	5 Aug 2009 13:49:39 -0000	1.2
+++ import.log	9 Aug 2009 11:54:30 -0000	1.3
@@ -1,2 +1,3 @@
 rakudo-2009_07-3_fc11:HEAD:rakudo-2009.07-3.fc11.src.rpm:1249282522
 rakudo-0_0_2009_07_1_4_0-1_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-1.fc11.src.rpm:1249480110
+rakudo-0_0_2009_07_1_4_0-3_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818713


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rakudo.spec	6 Aug 2009 17:01:04 -0000	1.4
+++ rakudo.spec	9 Aug 2009 11:54:30 -0000	1.5
@@ -9,7 +9,7 @@ ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -52,7 +52,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 pod2man --section=1 --name=perl6 docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/perl6.1.gz
 
 %check
-make test
+%{?!_without_tests: make test}
 exit 0
 
 %clean
@@ -75,15 +75,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-2
+* Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-3
+- modified source added so that shared objects will be stripped
+
+* Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2
 - Add a perl6 man page
 
-* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07-1
+* Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-1
 - Fix versioning
 - use 'ExcludeArch:ppc' for now
 - Provide full SourceURL
-- strip binary ???
+- strip binary
 - first .spec file created
 
-* Fri Jul 31 2009 wayland <wayland at wayland.id.au> 0.0.2009.07-1
+* Fri Jul 31 2009 wayland <wayland at wayland.id.au> 0.0.2009.07_1.4.0-1
 - Tim Nelson also created an initial .spec file some things are taken from it


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Aug 2009 13:49:40 -0000	1.3
+++ sources	9 Aug 2009 11:54:30 -0000	1.4
@@ -1 +1 @@
-9ea4e8dbe344d9b916d78e13e687a9f9  rakudo-2009-07.tar.gz
+585ae3110c4471cb860f067028762c2b  rakudo-2009-07.tar.gz



From scop at fedoraproject.org  Sun Aug  9 12:09:56 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 12:09:56 +0000 (UTC)
Subject: rpms/docbook-slides/F-11 .cvsignore, 1.3, 1.4 sources, 1.5,
	1.6 docbook-slides-tests.tar.gz, 1.1, NONE
Message-ID: <20090809120956.D7D9311C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/docbook-slides/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28426/F-11

Modified Files:
	.cvsignore sources 
Removed Files:
	docbook-slides-tests.tar.gz 
Log Message:
Move tests tarball from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-slides/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 May 2007 07:58:35 -0000	1.3
+++ .cvsignore	9 Aug 2009 12:09:56 -0000	1.4
@@ -1 +1,2 @@
 docbook-slides-3.4.0.tar.gz
+docbook-slides-tests.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-slides/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Nov 2008 12:56:38 -0000	1.5
+++ sources	9 Aug 2009 12:09:56 -0000	1.6
@@ -1 +1,2 @@
 26e2083077454d7140f2b82ae3d66123  docbook-slides-3.4.0.tar.gz
+bf43a176905a4e0fc1896b99bc7fce89  docbook-slides-tests.tar.gz


--- docbook-slides-tests.tar.gz DELETED ---



From scop at fedoraproject.org  Sun Aug  9 12:09:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 12:09:57 +0000 (UTC)
Subject: rpms/docbook-slides/devel .cvsignore, 1.3, 1.4 sources, 1.5,
	1.6 docbook-slides-tests.tar.gz, 1.1, NONE
Message-ID: <20090809120957.3CB3311C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/docbook-slides/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28426/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	docbook-slides-tests.tar.gz 
Log Message:
Move tests tarball from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-slides/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 May 2007 07:58:35 -0000	1.3
+++ .cvsignore	9 Aug 2009 12:09:56 -0000	1.4
@@ -1 +1,2 @@
 docbook-slides-3.4.0.tar.gz
+docbook-slides-tests.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-slides/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Nov 2008 12:56:38 -0000	1.5
+++ sources	9 Aug 2009 12:09:57 -0000	1.6
@@ -1 +1,2 @@
 26e2083077454d7140f2b82ae3d66123  docbook-slides-3.4.0.tar.gz
+bf43a176905a4e0fc1896b99bc7fce89  docbook-slides-tests.tar.gz


--- docbook-slides-tests.tar.gz DELETED ---



From pawsa at fedoraproject.org  Sun Aug  9 12:12:23 2009
From: pawsa at fedoraproject.org (Pawel Salek)
Date: Sun,  9 Aug 2009 12:12:23 +0000 (UTC)
Subject: rpms/balsa/devel .cvsignore, 1.30, 1.31 balsa.spec, 1.53,
	1.54 sources, 1.30, 1.31
Message-ID: <20090809121223.9B66811C00D7@cvs1.fedora.phx.redhat.com>

Author: pawsa

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29220

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
update to upstream 2.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	28 May 2009 15:31:49 -0000	1.30
+++ .cvsignore	9 Aug 2009 12:12:23 -0000	1.31
@@ -1 +1 @@
-balsa-2.4.0.tar.bz2
+balsa-2.4.1.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- balsa.spec	24 Jul 2009 17:49:13 -0000	1.53
+++ balsa.spec	9 Aug 2009 12:12:23 -0000	1.54
@@ -1,8 +1,8 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell --with-gpgme
 
 Name:           balsa
-Version:        2.4.0
-Release:        2%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -107,6 +107,9 @@ fi
 
 
 %changelog
+* Sun Aug 09 2009 Pawel Salek <salek at kth.se> - 2.4.1-1
+- update to upstream 2.4.1.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	28 May 2009 15:31:49 -0000	1.30
+++ sources	9 Aug 2009 12:12:23 -0000	1.31
@@ -1 +1 @@
-47d68219a5ee768f1ebd2502a9c3c6f2  balsa-2.4.0.tar.bz2
+2ad6ebb3f058e5fbe9ec5e0f0017db28  balsa-2.4.1.tar.bz2



From pawsa at fedoraproject.org  Sun Aug  9 12:15:38 2009
From: pawsa at fedoraproject.org (Pawel Salek)
Date: Sun,  9 Aug 2009 12:15:38 +0000 (UTC)
Subject: rpms/balsa/devel balsa-2.3.28-gmime.patch, 1.1,
	NONE balsa-gmime-537507.patch, 1.2, NONE balsa-rename-open.patch,
	1.1, NONE
Message-ID: <20090809121538.9C58911C00D7@cvs1.fedora.phx.redhat.com>

Author: pawsa

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30096

Removed Files:
	balsa-2.3.28-gmime.patch balsa-gmime-537507.patch 
	balsa-rename-open.patch 
Log Message:
removing old patches.



--- balsa-2.3.28-gmime.patch DELETED ---


--- balsa-gmime-537507.patch DELETED ---


--- balsa-rename-open.patch DELETED ---



From gemi at fedoraproject.org  Sun Aug  9 12:18:28 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 12:18:28 +0000 (UTC)
Subject: rpms/oorexx/devel oorexx.spec,1.13,1.14
Message-ID: <20090809121828.8284811C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/oorexx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30738

Modified Files:
	oorexx.spec 
Log Message:
moved .so libraries to -libs


Index: oorexx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/devel/oorexx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- oorexx.spec	8 Aug 2009 19:16:25 -0000	1.13
+++ oorexx.spec	9 Aug 2009 12:18:27 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        4.0.0
-Release:        1.4801%{?dist}
+Release:        2.4801%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -111,17 +111,19 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/lib*.so
 %{_bindir}/oorexx-config
 
 
 %files libs
 %defattr(-,root,root,-)
 %doc CPLv1.0.txt
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so*
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-2.4801
+- moved .so libraries to -libs
+
 * Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-1.4801
 - new release 4.0.0
 



From lkundrak at fedoraproject.org  Sun Aug  9 12:26:35 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  9 Aug 2009 12:26:35 +0000 (UTC)
Subject: rpms/crash/devel crash-4.0-8.11-dwarf3.patch, NONE,
	1.1 crash-4.0-8.11-optflags.patch, NONE, 1.1 crash.spec, 1.33, 1.34
Message-ID: <20090809122635.824A011C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/crash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32300

Modified Files:
	crash.spec 
Added Files:
	crash-4.0-8.11-dwarf3.patch crash-4.0-8.11-optflags.patch 
Log Message:
* Sun Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 4.0.8.11-2
- Fix reading of dwarf 3 DW_AT_data_member_location
- Use proper compiler flags


crash-4.0-8.11-dwarf3.patch:
 gdb-6.1/gdb/ChangeLog    |   11 ++++++++
 gdb-6.1/gdb/dwarf2read.c |   64 ++++++++++++++++++++++++++++++++++++++++++-----
 gdb/ChangeLog            |    8 +++++
 gdb/dwarf2read.c         |   22 +++++++++++-----
 4 files changed, 92 insertions(+), 13 deletions(-)

--- NEW FILE crash-4.0-8.11-dwarf3.patch ---
commit 4809b16f7e629929a10ab8b15816b4f6f775aa82
Author: Jim Blandy <jimb at codesourcery.com>
Date:   Thu Dec 13 19:02:51 2007 +0000

commit 35fb264aa9a28b8d117df1e5a19fa3bfaf5a2cc8
Author: Jim Blandy <jimb at codesourcery.com>
Date:   Mon Dec 17 18:38:30 2007 +0000

Cherry-picked and backported these, since gdb would crash reading dwarf 3
DW_AT_data_member_location that gcc generates now.
-- Lubomir Rintel <lkundrak at v3.sk>

diff -urp gdb-6.1.orig/gdb/ChangeLog gdb-6.1/gdb/ChangeLog
--- gdb-6.1.orig/gdb/ChangeLog	2009-08-08 17:04:24.836969960 +0200
+++ gdb-6.1/gdb/ChangeLog	2009-08-08 17:00:21.682970174 +0200
@@ -1,3 +1,14 @@
+2007-12-13  Jim Blandy  <jimb at codesourcery.com>
+
+	* dwarf2read.c (attr_form_is_constant): New function.
+	(dwarf2_add_field): Use it and attr_form_is_section_offset to
+	recognize DW_AT_data_member_location attributes.  Use
+	dwarf2_get_attr_constant_value when the attribute is a constant.
+
+	* dwarf2read.c (attr_form_is_section_offset): New function.
+	(dwarf_add_member_fn, read_common_block, read_partial_die)
+	(dwarf2_symbol_mark_computed): Use it, instead of writing it out.
+
 2004-04-03  GDB Administrator  <gdbadmin at sourceware.org>
 
 	GDB 6.1 released.
diff -urp gdb-6.1.orig/gdb/dwarf2read.c gdb-6.1/gdb/dwarf2read.c
--- gdb-6.1.orig/gdb/dwarf2read.c	2009-06-30 17:31:20.000000000 +0200
+++ gdb-6.1/gdb/dwarf2read.c	2009-08-08 17:20:00.031969143 +0200
@@ -922,6 +922,10 @@ static void dwarf_decode_macros (struct 
 
 static int attr_form_is_block (struct attribute *);
 
+static int attr_form_is_section_offset (struct attribute *);
+
+static int attr_form_is_constant (struct attribute *);
+
 static void
 dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
 			     struct dwarf2_cu *cu);
@@ -2618,8 +2622,16 @@ dwarf2_add_field (struct field_info *fip
       attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
       if (attr)
 	{
-	  FIELD_BITPOS (*fp) =
-	    decode_locdesc (DW_BLOCK (attr), cu) * bits_per_byte;
+          if (attr_form_is_section_offset (attr))
+            {
+              dwarf2_complex_location_expr_complaint ();
+              FIELD_BITPOS (*fp) = 0;
+            }
+          else if (attr_form_is_constant (attr))
+            FIELD_BITPOS (*fp) = dwarf2_get_attr_constant_value (attr, 0);
+          else
+            FIELD_BITPOS (*fp) =
+              decode_locdesc (DW_BLOCK (attr), cu) * bits_per_byte;
 	}
       else
 	FIELD_BITPOS (*fp) = 0;
@@ -2939,7 +2951,7 @@ dwarf2_add_member_fn (struct field_info 
         {
           fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu) + 2;
         }
-      else if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
+      else if (attr_form_is_section_offset (attr))
         {
 	  dwarf2_complex_location_expr_complaint ();
         }
@@ -3482,7 +3494,7 @@ read_common_block (struct die_info *die,
         {
           base = decode_locdesc (DW_BLOCK (attr), cu);
         }
-      else if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
+      else if (attr_form_is_section_offset (attr))
         {
 	  dwarf2_complex_location_expr_complaint ();
         }
@@ -4392,7 +4404,7 @@ read_partial_die (struct partial_die_inf
             {
 	       part_die->locdesc = DW_BLOCK (&attr);
             }
-          else if (attr.form == DW_FORM_data4 || attr.form == DW_FORM_data8)
+          else if (attr_form_is_section_offset (&attr))
             {
 	      dwarf2_complex_location_expr_complaint ();
             }
@@ -8030,11 +8042,51 @@ attr_form_is_block (struct attribute *at
       || attr->form == DW_FORM_block);
 }
 
+/* Return non-zero if ATTR's value is a section offset (classes
+   lineptr, loclistptr, macptr or rangelistptr).  In this case,
+   you may use DW_UNSND (attr) to retrieve the offset.  */
+static int
+attr_form_is_section_offset (struct attribute *attr)
+{
+  return (attr->form == DW_FORM_data4
+          || attr->form == DW_FORM_data8);
+}
+
+
+/* Return non-zero if ATTR's value falls in the 'constant' class, or
+   zero otherwise.  When this function returns true, you can apply
+   dwarf2_get_attr_constant_value to it.
+
+   However, note that for some attributes you must check
+   attr_form_is_section_offset before using this test.  DW_FORM_data4
+   and DW_FORM_data8 are members of both the constant class, and of
+   the classes that contain offsets into other debug sections
+   (lineptr, loclistptr, macptr or rangelistptr).  The DWARF spec says
+   that, if an attribute's can be either a constant or one of the
+   section offset classes, DW_FORM_data4 and DW_FORM_data8 should be
+   taken as section offsets, not constants.  */
+static int
+attr_form_is_constant (struct attribute *attr)
+{
+  switch (attr->form)
+    {
+    case DW_FORM_sdata:
+    case DW_FORM_udata:
+    case DW_FORM_data1:
+    case DW_FORM_data2:
+    case DW_FORM_data4:
+    case DW_FORM_data8:
+      return 1;
+    default:
+      return 0;
+    }
+}
+
 static void
 dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
 			     struct dwarf2_cu *cu)
 {
-  if (attr->form == DW_FORM_data4 || attr->form == DW_FORM_data8)
+  if (attr_form_is_section_offset (attr))
     {
       struct dwarf2_loclist_baton *baton;
 
diff -urp gdb-6.1.orig/gdb/ChangeLog gdb-6.1/gdb/ChangeLog
--- gdb-6.1.orig/gdb/ChangeLog	2009-08-08 20:49:34.000000000 +0200
+++ gdb-6.1/gdb/ChangeLog	2009-08-09 13:04:25.842288308 +0200
@@ -1,3 +1,11 @@
+2007-12-17  Jim Blandy  <jimb at codesourcery.com>
+
+	* dwarf2read.c (dwarf2_add_field): Correctly scale all byte
+	offsets obtained from DW_AT_data_member_location before recording
+	them in FIELD_BITPOS (*fp).
+
+	* dwarf2read.c (attr_form_is_section_offset): Doc fixes.
+
 2007-12-13  Jim Blandy  <jimb at codesourcery.com>
 
 	* dwarf2read.c (attr_form_is_constant): New function.
diff -urp gdb-6.1.orig/gdb/dwarf2read.c gdb-6.1/gdb/dwarf2read.c
--- gdb-6.1.orig/gdb/dwarf2read.c	2009-08-08 20:49:34.000000000 +0200
+++ gdb-6.1/gdb/dwarf2read.c	2009-08-09 13:04:25.864291129 +0200
@@ -2622,16 +2622,19 @@ dwarf2_add_field (struct field_info *fip
       attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
       if (attr)
 	{
+          int byte_offset;
+
           if (attr_form_is_section_offset (attr))
             {
               dwarf2_complex_location_expr_complaint ();
-              FIELD_BITPOS (*fp) = 0;
+              byte_offset = 0;
             }
           else if (attr_form_is_constant (attr))
-            FIELD_BITPOS (*fp) = dwarf2_get_attr_constant_value (attr, 0);
+            byte_offset = dwarf2_get_attr_constant_value (attr, 0);
           else
-            FIELD_BITPOS (*fp) =
-              decode_locdesc (DW_BLOCK (attr), cu) * bits_per_byte;
+            byte_offset = decode_locdesc (DW_BLOCK (attr), cu);
+
+          FIELD_BITPOS (*fp) = byte_offset * bits_per_byte;
 	}
       else
 	FIELD_BITPOS (*fp) = 0;
@@ -8042,9 +8045,14 @@ attr_form_is_block (struct attribute *at
       || attr->form == DW_FORM_block);
 }
 
-/* Return non-zero if ATTR's value is a section offset (classes
-   lineptr, loclistptr, macptr or rangelistptr).  In this case,
-   you may use DW_UNSND (attr) to retrieve the offset.  */
+/* Return non-zero if ATTR's value is a section offset --- classes
+   lineptr, loclistptr, macptr or rangelistptr --- or zero, otherwise.
+   You may use DW_UNSND (attr) to retrieve such offsets.
+
+   Section 7.5.4, "Attribute Encodings", explains that no attribute
+   may have a value that belongs to more than one of these classes; it
+   would be ambiguous if we did, because we use the same forms for all
+   of them.  */
 static int
 attr_form_is_section_offset (struct attribute *attr)
 {

crash-4.0-8.11-optflags.patch:
 Makefile |  102 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

--- NEW FILE crash-4.0-8.11-optflags.patch ---
Use proper compiler flags as mandated by the packaging guidelines.

Lubomir Rintel <lkundrak at v3.sk>

diff -up crash-4.0-8.11/Makefile.optflags crash-4.0-8.11/Makefile
--- crash-4.0-8.11/Makefile.optflags	2009-06-30 17:31:20.000000000 +0200
+++ crash-4.0-8.11/Makefile	2009-08-09 13:21:51.025292368 +0200
@@ -224,7 +224,7 @@ GDB_FLAGS=
 # TARGET_CFLAGS will be configured automatically by configure
 TARGET_CFLAGS=
 
-CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS}
+CRASH_CFLAGS=${CFLAGS} -D${TARGET} ${TARGET_CFLAGS}
 
 TAR_FILES=${SOURCE_FILES} Makefile COPYING README .rh_rpm_package crash.8 \
 	${EXTENSION_SOURCE_FILES}
@@ -287,7 +287,7 @@ clean:
 	@(cd extensions; make --no-print-directory -i clean)
 
 make_build_data: force
-	cc -c ${CFLAGS} build_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} build_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 install:
 	/usr/bin/install ${PROGRAM} ${INSTALLDIR}
@@ -309,150 +309,150 @@ nowarn: make_configure
 	@make --no-print-directory gdb_merge
 
 main.o: ${GENERIC_HFILES} main.c
-	cc -c ${CFLAGS} main.c ${WARNING_OPTIONS} ${WARNING_ERROR} 
+	cc -c ${CRASH_CFLAGS} main.c ${WARNING_OPTIONS} ${WARNING_ERROR} 
 
 cmdline.o: ${GENERIC_HFILES} cmdline.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} cmdline.c -I${READLINE_DIRECTORY} ${WARNING_OPTIONS}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} cmdline.c -I${READLINE_DIRECTORY} ${WARNING_OPTIONS}
 
 tools.o: ${GENERIC_HFILES} tools.c
-	cc -c ${CFLAGS} tools.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} tools.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 global_data.o: ${GENERIC_HFILES} global_data.c
-	cc -c ${CFLAGS} global_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} global_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 symbols.o: ${GENERIC_HFILES} symbols.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} symbols.c -I${BFD_DIRECTORY} -I${GDB_INCLUDE_DIRECTORY} ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} symbols.c -I${BFD_DIRECTORY} -I${GDB_INCLUDE_DIRECTORY} ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 filesys.o: ${GENERIC_HFILES} filesys.c
-	cc -c ${CFLAGS} filesys.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} filesys.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 help.o: ${GENERIC_HFILES} help.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} help.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} help.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 memory.o: ${GENERIC_HFILES} memory.c
-	cc -c ${CFLAGS} memory.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} memory.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 test.o: ${GENERIC_HFILES} test.c
-	cc -c ${CFLAGS} test.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} test.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 task.o: ${GENERIC_HFILES} task.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} task.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} task.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 kernel.o: ${GENERIC_HFILES} kernel.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} kernel.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} kernel.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 gdb_interface.o: ${GENERIC_HFILES} gdb_interface.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} gdb_interface.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} gdb_interface.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 va_server.o: ${MCORE_HFILES} va_server.c
-	cc -c ${CFLAGS} va_server.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} va_server.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 va_server_v1.o: ${MCORE_HFILES} va_server_v1.c
-	cc -c ${CFLAGS} va_server_v1.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} va_server_v1.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_common.o: ${GENERIC_HFILES} ${LKCD_DUMP_HFILES} lkcd_common.c
-	cc -c ${CFLAGS} lkcd_common.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} lkcd_common.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_v1.o: ${GENERIC_HFILES} ${LKCD_DUMP_HFILES} lkcd_v1.c
-	cc -c ${CFLAGS} -DMCLX lkcd_v1.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX lkcd_v1.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_v2_v3.o: ${GENERIC_HFILES} ${LKCD_DUMP_HFILES} lkcd_v2_v3.c
-	cc -c ${CFLAGS} -DMCLX lkcd_v2_v3.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX lkcd_v2_v3.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_v5.o: ${GENERIC_HFILES} ${LKCD_DUMP_HFILES} lkcd_v5.c
-	cc -c ${CFLAGS} -DMCLX lkcd_v5.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX lkcd_v5.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_v7.o: ${GENERIC_HFILES} ${LKCD_DUMP_HFILES} lkcd_v7.c
-	cc -c ${CFLAGS} -DMCLX lkcd_v7.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX lkcd_v7.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_v8.o: ${GENERIC_HFILES} ${LKCD_DUMP_HFILES} lkcd_v8.c
-	cc -c ${CFLAGS} -DMCLX lkcd_v8.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX lkcd_v8.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 net.o: ${GENERIC_HFILES} net.c
-	cc -c ${CFLAGS} net.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} net.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 dev.o: ${GENERIC_HFILES} dev.c
-	cc -c ${CFLAGS} dev.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} dev.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 # remote.c functionality has been deprecated
 remote.o: ${GENERIC_HFILES} remote.c
-	@cc -c ${CFLAGS} remote.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	@cc -c ${CRASH_CFLAGS} remote.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 remote_daemon.o: ${GENERIC_HFILES} remote.c
-	cc -c ${CFLAGS} -DDAEMON remote.c -o remote_daemon.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DDAEMON remote.c -o remote_daemon.o ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 x86.o: ${GENERIC_HFILES} ${REDHAT_HFILES} x86.c
-	cc -c ${CFLAGS} -DMCLX x86.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX x86.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 alpha.o: ${GENERIC_HFILES} alpha.c
-	cc -c ${CFLAGS} ${GDB_FLAGS} alpha.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ${GDB_FLAGS} alpha.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 ppc.o: ${GENERIC_HFILES} ppc.c
-	cc -c ${CFLAGS} ppc.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ppc.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 ia64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} ia64.c
-	cc -c ${CFLAGS} ia64.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ia64.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 ppc64.o: ${GENERIC_HFILES} ppc64.c
-	cc -c ${CFLAGS} ppc64.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} ppc64.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 x86_64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} x86_64.c
-	cc -c ${CFLAGS} x86_64.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} x86_64.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 s390.o: ${GENERIC_HFILES} ${IBM_HFILES} s390.c
-	cc -c ${CFLAGS} s390.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} s390.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 s390x.o: ${GENERIC_HFILES} ${IBM_HFILES} s390x.c
-	cc -c ${CFLAGS} s390x.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} s390x.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 s390dbf.o: ${GENERIC_HFILES} ${IBM_HFILES} s390dbf.c
-	cc -c ${CFLAGS} s390dbf.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} s390dbf.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 s390_dump.o: ${GENERIC_HFILES} ${IBM_HFILES} s390_dump.c
-	cc -c ${CFLAGS} s390_dump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} s390_dump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 netdump.o: ${GENERIC_HFILES} ${REDHAT_HFILES} netdump.c
-	cc -c ${CFLAGS} netdump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} netdump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 netdump_daemon.o: ${GENERIC_HFILES} ${REDHAT_HFILES} netdump.c
-	cc -c ${CFLAGS} -DDAEMON netdump.c -o netdump_daemon.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DDAEMON netdump.c -o netdump_daemon.o ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 diskdump.o: ${GENERIC_HFILES} ${REDHAT_HFILES} diskdump.c
-	cc -c ${CFLAGS} diskdump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} diskdump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 xendump.o: ${GENERIC_HFILES} ${REDHAT_HFILES} xendump.c
-	cc -c ${CFLAGS} xendump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} xendump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 extensions.o: ${GENERIC_HFILES} extensions.c
-	cc -c ${CFLAGS} extensions.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} extensions.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_x86_trace.o: ${GENERIC_HFILES} ${LKCD_TRACE_HFILES} lkcd_x86_trace.c 
-	cc -c ${CFLAGS} -DREDHAT lkcd_x86_trace.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DREDHAT lkcd_x86_trace.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 unwind_x86_32_64.o: ${GENERIC_HFILES} ${UNWIND_HFILES} unwind_x86_32_64.c
-	cc -c ${CFLAGS} unwind_x86_32_64.c -o unwind_x86_32_64.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} unwind_x86_32_64.c -o unwind_x86_32_64.o ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 unwind_v1.o: ${GENERIC_HFILES} ${UNWIND_HFILES} unwind.c unwind_decoder.c
-	cc -c ${CFLAGS} -DREDHAT -DUNWIND_V1 unwind.c -o unwind_v1.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DREDHAT -DUNWIND_V1 unwind.c -o unwind_v1.o ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 unwind_v2.o: ${GENERIC_HFILES} ${UNWIND_HFILES} unwind.c unwind_decoder.c
-	cc -c ${CFLAGS} -DREDHAT -DUNWIND_V2 unwind.c -o unwind_v2.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DREDHAT -DUNWIND_V2 unwind.c -o unwind_v2.o ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 unwind_v3.o: ${GENERIC_HFILES} ${UNWIND_HFILES} unwind.c unwind_decoder.c
-	cc -c ${CFLAGS} -DREDHAT -DUNWIND_V3 unwind.c -o unwind_v3.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DREDHAT -DUNWIND_V3 unwind.c -o unwind_v3.o ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 lkcd_fix_mem.o: ${GENERIC_HFILES} ${LKCD_HFILES} lkcd_fix_mem.c
-	cc -c ${CFLAGS} -DMCLX lkcd_fix_mem.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} -DMCLX lkcd_fix_mem.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 xen_hyper.o: ${GENERIC_HFILES} xen_hyper.c
-	cc -c ${CFLAGS} xen_hyper.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} xen_hyper.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 xen_hyper_command.o: ${GENERIC_HFILES} xen_hyper_command.c
-	cc -c ${CFLAGS} xen_hyper_command.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} xen_hyper_command.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 xen_hyper_global_data.o: ${GENERIC_HFILES} xen_hyper_global_data.c
-	cc -c ${CFLAGS} xen_hyper_global_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} xen_hyper_global_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 xen_hyper_dump_tables.o: ${GENERIC_HFILES} xen_hyper_dump_tables.c
-	cc -c ${CFLAGS} xen_hyper_dump_tables.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+	cc -c ${CRASH_CFLAGS} xen_hyper_dump_tables.c ${WARNING_OPTIONS} ${WARNING_ERROR}
 
 ${PROGRAM}: force
 	@make --no-print-directory all


Index: crash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crash/devel/crash.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- crash.spec	4 Aug 2009 22:54:50 -0000	1.33
+++ crash.spec	9 Aug 2009 12:26:35 -0000	1.34
@@ -7,10 +7,12 @@
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
 Version: %{major_version}.%{minor_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Debuggers
 Source: http://people.redhat.com/anderson/crash-%{major_version}-%{minor_version}.tar.gz
+Source1: crash-4.0-8.11-dwarf3.patch
+Patch0: crash-4.0-8.11-optflags.patch
 URL: http://people.redhat.com/anderson
 ExclusiveOS: Linux
 ExclusiveArch: %{ix86} ia64 x86_64 ppc64 s390 s390x
@@ -37,9 +39,11 @@ offered by Mission Critical Linux, or th
 
 %prep
 %setup -n %{name}-%{major_version}-%{minor_version} -q
+%patch0 -p1 -b .optflags
+cat %{SOURCE1} >> gdb-6.1.patch
 
 %build
-make RPMPKG="%{version}-%{release}"
+make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -65,6 +69,10 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Sun Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 4.0.8.11-2
+- Fix reading of dwarf 3 DW_AT_data_member_location
+- Use proper compiler flags
+
 * Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 4.0.8.11-1
 - Update to later upstream release
 - Fix abuse of Revision tag



From gemi at fedoraproject.org  Sun Aug  9 12:28:44 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 12:28:44 +0000 (UTC)
Subject: rpms/oorexx/F-11 oorexx.spec,1.12,1.13
Message-ID: <20090809122844.25DD111C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/oorexx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv341/F-11

Modified Files:
	oorexx.spec 
Log Message:
moved .so libraries to -libs


Index: oorexx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-11/oorexx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- oorexx.spec	8 Aug 2009 19:31:57 -0000	1.12
+++ oorexx.spec	9 Aug 2009 12:28:43 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        4.0.0
-Release:        1.4801%{?dist}
+Release:        2.4801%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -111,17 +111,19 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/lib*.so
 %{_bindir}/oorexx-config
 
 
 %files libs
 %defattr(-,root,root,-)
 %doc CPLv1.0.txt
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so*
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-2.4801
+- moved .so libraries to -libs
+
 * Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-1.4801
 - new release 4.0.0
 



From gemi at fedoraproject.org  Sun Aug  9 12:50:12 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 12:50:12 +0000 (UTC)
Subject: rpms/oorexx/F-10 oorexx.spec,1.11,1.12
Message-ID: <20090809125012.13E9711C0494@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/oorexx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5339/F-10

Modified Files:
	oorexx.spec 
Log Message:
moved .so libraries to -libs


Index: oorexx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oorexx/F-10/oorexx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- oorexx.spec	8 Aug 2009 17:02:49 -0000	1.11
+++ oorexx.spec	9 Aug 2009 12:50:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           oorexx
 Version:        4.0.0
-Release:        1.4801%{?dist}
+Release:        2.4801%{?dist}
 Summary:        Open Object Rexx
 
 Group:          Development/Languages
@@ -10,7 +10,6 @@ Source0:        http://switch.dl.sourcef
 Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-beta-pdf.zip
 Patch0:         oorexx-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExcludeArch:    x86_64 ppc64
 
 
 %description
@@ -57,6 +56,9 @@ unzip -qo %{SOURCE1}
 
 
 %build
+CXXFLAGS=$(echo %optflags | sed 's/-O./-O1/g')
+CFLAGS=$(echo %optflags | sed 's/-O./-O1/g')
+export CXXFLAGS CFLAGS
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -109,17 +111,19 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/lib*.so
 %{_bindir}/oorexx-config
 
 
 %files libs
 %defattr(-,root,root,-)
 %doc CPLv1.0.txt
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so*
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-2.4801
+- moved .so libraries to -libs
+
 * Sat Aug  8 2009 Gerard Milmeister <gemi at bluewin.ch> - 4.0.0-1.4801
 - new release 4.0.0
 



From scop at fedoraproject.org  Sun Aug  9 13:35:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 13:35:32 +0000 (UTC)
Subject: rpms/policycoreutils/F-10 .cvsignore, 1.190, 1.191 sources, 1.195, 
	1.196 policycoreutils_man_ru2.tar.bz2, 1.1, NONE
Message-ID: <20090809133532.966A911C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/policycoreutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591/F-10

Modified Files:
	.cvsignore sources 
Removed Files:
	policycoreutils_man_ru2.tar.bz2 
Log Message:
Move man_ru2 tarballs from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-10/.cvsignore,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- .cvsignore	1 Dec 2008 20:28:00 -0000	1.190
+++ .cvsignore	9 Aug 2009 13:35:32 -0000	1.191
@@ -190,3 +190,4 @@ policycoreutils-2.0.55.tgz
 policycoreutils-2.0.56.tgz
 policycoreutils-2.0.57.tgz
 sepolgen-1.0.14.tgz
+policycoreutils_man_ru2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-10/sources,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- sources	1 Dec 2008 20:28:01 -0000	1.195
+++ sources	9 Aug 2009 13:35:32 -0000	1.196
@@ -1,2 +1,3 @@
 52b590e33e13ed8aa10610237e8fa8d7  policycoreutils-2.0.57.tgz
 df57d9d33c940c60994c6cbaa9f8e4a3  sepolgen-1.0.14.tgz
+7915287c8377b768ccae7eb6dc736783  policycoreutils_man_ru2.tar.bz2


--- policycoreutils_man_ru2.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sun Aug  9 13:35:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 13:35:32 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 .cvsignore, 1.194, 1.195 sources, 1.200, 
	1.201 policycoreutils_man_ru2.tar.bz2, 1.1, NONE
Message-ID: <20090809133532.E8EAC11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591/F-11

Modified Files:
	.cvsignore sources 
Removed Files:
	policycoreutils_man_ru2.tar.bz2 
Log Message:
Move man_ru2 tarballs from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-11/.cvsignore,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- .cvsignore	18 Feb 2009 21:54:32 -0000	1.194
+++ .cvsignore	9 Aug 2009 13:35:32 -0000	1.195
@@ -197,3 +197,4 @@ policycoreutils-2.0.61.tgz
 sepolgen-1.0.15.tgz
 policycoreutils-2.0.62.tgz
 sepolgen-1.0.16.tgz
+policycoreutils_man_ru2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-11/sources,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- sources	18 Feb 2009 21:54:40 -0000	1.200
+++ sources	9 Aug 2009 13:35:32 -0000	1.201
@@ -1,2 +1,3 @@
 7163e6b815bb45eb4f6a620cd8240690  policycoreutils-2.0.62.tgz
 e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
+7915287c8377b768ccae7eb6dc736783  policycoreutils_man_ru2.tar.bz2


--- policycoreutils_man_ru2.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sun Aug  9 13:35:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 13:35:33 +0000 (UTC)
Subject: rpms/policycoreutils/F-8 .cvsignore, 1.165, 1.166 sources, 1.174,
	1.175 policycoreutils_man_ru2.tar.bz2, 1.1, NONE
Message-ID: <20090809133533.3237A11C0439@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/policycoreutils/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591/F-8

Modified Files:
	.cvsignore sources 
Removed Files:
	policycoreutils_man_ru2.tar.bz2 
Log Message:
Move man_ru2 tarballs from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-8/.cvsignore,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- .cvsignore	15 Oct 2007 18:09:34 -0000	1.165
+++ .cvsignore	9 Aug 2009 13:35:32 -0000	1.166
@@ -163,3 +163,4 @@ policycoreutils-2.0.27.tgz
 policycoreutils-2.0.28.tgz
 policycoreutils-2.0.29.tgz
 policycoreutils-2.0.31.tgz
+policycoreutils_man_ru2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-8/sources,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- sources	22 May 2008 18:38:47 -0000	1.174
+++ sources	9 Aug 2009 13:35:33 -0000	1.175
@@ -1,2 +1,3 @@
 3fed5cd04ee67c0f86e3cc6825261819  sepolgen-1.0.11.tgz
 ca550750667febd8441a8eb498863602  policycoreutils-2.0.34.tgz
+7915287c8377b768ccae7eb6dc736783  policycoreutils_man_ru2.tar.bz2


--- policycoreutils_man_ru2.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sun Aug  9 13:35:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 13:35:33 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.198, 1.199 sources, 1.204, 
	1.205 policycoreutils_man_ru2.tar.bz2, 1.2, NONE
Message-ID: <20090809133533.C867911C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	policycoreutils_man_ru2.tar.bz2 
Log Message:
Move man_ru2 tarballs from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- .cvsignore	5 Aug 2009 19:27:53 -0000	1.198
+++ .cvsignore	9 Aug 2009 13:35:33 -0000	1.199
@@ -203,3 +203,4 @@ policycoreutils-2.0.65.tgz
 policycoreutils-2.0.67.tgz
 policycoreutils-2.0.68.tgz
 policycoreutils-2.0.70.tgz
+policycoreutils_man_ru2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/sources,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- sources	5 Aug 2009 19:27:54 -0000	1.204
+++ sources	9 Aug 2009 13:35:33 -0000	1.205
@@ -1,2 +1,3 @@
 e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
 8c4c0c43a9b6c3865e2a8b8bdd222f90  policycoreutils-2.0.70.tgz
+4c24e437f254291bc6d1378ee5a5712c  policycoreutils_man_ru2.tar.bz2


--- policycoreutils_man_ru2.tar.bz2 DELETED ---



From scop at fedoraproject.org  Sun Aug  9 13:35:33 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 13:35:33 +0000 (UTC)
Subject: rpms/policycoreutils/F-9 .cvsignore, 1.182, 1.183 sources, 1.189,
	1.190 policycoreutils_man_ru2.tar.bz2, 1.1, NONE
Message-ID: <20090809133533.838C511C043D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/policycoreutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14591/F-9

Modified Files:
	.cvsignore sources 
Removed Files:
	policycoreutils_man_ru2.tar.bz2 
Log Message:
Move man_ru2 tarballs from CVS to lookaside cache.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-9/.cvsignore,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- .cvsignore	2 Jul 2008 21:29:26 -0000	1.182
+++ .cvsignore	9 Aug 2009 13:35:33 -0000	1.183
@@ -183,3 +183,4 @@ policycoreutils-2.0.50.tgz
 sepolgen-1.0.12.tgz
 policycoreutils-2.0.51.tgz
 policycoreutils-2.0.52.tgz
+policycoreutils_man_ru2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/F-9/sources,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- sources	29 Jul 2008 19:49:47 -0000	1.189
+++ sources	9 Aug 2009 13:35:33 -0000	1.190
@@ -1,2 +1,3 @@
 b6756a012c26f414e4a5f8f438ce2188  sepolgen-1.0.13.tgz
 311e95b3374fe1993fb91a303b6675b2  policycoreutils-2.0.52.tgz
+7915287c8377b768ccae7eb6dc736783  policycoreutils_man_ru2.tar.bz2


--- policycoreutils_man_ru2.tar.bz2 DELETED ---



From tomeu at fedoraproject.org  Sun Aug  9 13:36:21 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  9 Aug 2009 13:36:21 +0000 (UTC)
Subject: rpms/gnash/devel .cvsignore, 1.13, 1.14 gnash.spec, 1.55,
	1.56 sources, 1.13, 1.14
Message-ID: <20090809133621.DF69411C00D7@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14870

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11401
- One more 64bit fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	9 Aug 2009 10:09:42 -0000	1.13
+++ .cvsignore	9 Aug 2009 13:36:21 -0000	1.14
@@ -1,2 +1,2 @@
-gnash-0.9.0.20090809bzr11400.tar.gz
+gnash-0.9.0.20090809bzr11401.tar.gz
 gnash-splash.swf


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- gnash.spec	9 Aug 2009 11:02:46 -0000	1.55
+++ gnash.spec	9 Aug 2009 13:36:21 -0000	1.56
@@ -1,4 +1,4 @@
-%define commitid 11400
+%define commitid 11401
 %define alphatag 20090809bzr%{commitid}
 
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
@@ -309,6 +309,9 @@ fi
 %{python_sitelib}/*
 
 %changelog
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11401
+- One more 64bit fix
+
 * Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11400
 - Fix the packaging in 64bits
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Aug 2009 10:09:42 -0000	1.13
+++ sources	9 Aug 2009 13:36:21 -0000	1.14
@@ -1,2 +1,2 @@
-35b1a99c679a4604a3ec627ea21b6496  gnash-0.9.0.20090809bzr11400.tar.gz
+3f22f0fa19b63f6445ce16d9b8a53135  gnash-0.9.0.20090809bzr11401.tar.gz
 3ba3f30fbcd9ac6458c7d50a33eb933e  gnash-splash.swf



From lkundrak at fedoraproject.org  Sun Aug  9 13:58:34 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  9 Aug 2009 13:58:34 +0000 (UTC)
Subject: rpms/shortrpm/F-11 .cvsignore, 1.3, 1.4 shortrpm.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090809135834.414E811C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/shortrpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19584

Modified Files:
	.cvsignore shortrpm.spec sources 
Log Message:
* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-2
- New upstream release
- Fix operation with more recent rpm config



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Apr 2009 07:07:45 -0000	1.3
+++ .cvsignore	9 Aug 2009 13:58:33 -0000	1.4
@@ -1 +1 @@
-shortrpm-1.1.tar.gz
+shortrpm-1.2.tar.gz


Index: shortrpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/shortrpm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- shortrpm.spec	29 Apr 2009 07:07:46 -0000	1.2
+++ shortrpm.spec	9 Aug 2009 13:58:33 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           shortrpm
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Short-circuit binary RPM package build
 
@@ -53,6 +53,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2-2
+- New upstream release
+- Fix operation with more recent rpm config
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.1-1
 - New upstream release
 - Fix mis-compilation with newer glibc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shortrpm/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Apr 2009 07:07:46 -0000	1.3
+++ sources	9 Aug 2009 13:58:33 -0000	1.4
@@ -1 +1 @@
-f6da9946e844dc0cd2e0146af100253f  shortrpm-1.1.tar.gz
+7b41352d1b6653c5f09dbdc2fef0b929  shortrpm-1.2.tar.gz



From rdieter at fedoraproject.org  Sun Aug  9 14:17:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 14:17:28 +0000 (UTC)
Subject: rpms/showimg/devel showimg.spec,1.29,1.30
Message-ID: <20090809141728.DEA0311C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23978

Modified Files:
	showimg.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.5-25
- FTBFS showimg-0.9.5-22.fc11 (#511576)
- disable pgsql support for f12+
- add icon/mime scriptlets
- %description/%summary: s/for KDE//



Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- showimg.spec	27 Jul 2009 04:17:27 -0000	1.29
+++ showimg.spec	9 Aug 2009 14:17:28 -0000	1.30
@@ -1,30 +1,40 @@
 Name:           showimg
 Version:        0.9.5
 Release:        24%{?dist}
-Summary:        Feature-rich image viewer for KDE
+Summary:        Feature-rich image viewer
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.jalix.org/projects/showimg
 Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 Patch0:         showimg-0.9.5-gcc43.patch
-Patch1:			showimg-0.9.5-gcc44.patch
+Patch1:		showimg-0.9.5-gcc44.patch
 # Both patches have been sent to author (rgroult [AT]?jalix [DOT]?org) on 2009/04/19
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  automake libtool
 BuildRequires:  desktop-file-utils
 BuildRequires:  kdebase3-devel
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  libkexif-devel, libexif-devel
-BuildRequires:  mysql-devel, postgresql-devel, libpqxx-devel
+BuildRequires:  mysql-devel
+## build broken with f12+'s libpqxx-3.0
+%if 0%{?fedora} > 11
+Obsoletes: %{name}-pgsql < 0.9.5-24
+%else
+BuildRequires: libpqxx-devel
+BuildConflicts: libpqxx-devel >= 3.0
+%define _enable_pgsql --enable-pgsql
+%define dt_vendir fedora
+%endif
 
-Requires(post):   /sbin/ldconfig
+Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 
 %description
-ShowImg is a feature-rich image viewer for KDE including an
+ShowImg is a feature-rich image viewer including an
 image management system. It is highly configurable and supports
 numerous image formats.
 
@@ -32,7 +42,7 @@ numerous image formats.
 %package mysql
 Summary:        MySQL plugin for the Showimg image database
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description mysql
 This is the plugin to use MySQL as the backend for Showimg's image
@@ -42,7 +52,7 @@ database
 %package pgsql
 Summary:        PostgreSQL plugin for the Showimg image database
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description pgsql
 This is the plugin to use PostgreSQL as the backend for Showimg's image
@@ -55,41 +65,60 @@ database
 %patch1 -b .gcc44
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
+# "checking for working mktime" hangs for me(f11/x86_64) -- Rex
+sed -iautofoo \
+  -e 's|autoconf\*2.5\*|autoconf\*2.5\* \| autoconf\*2.6\*|' \
+  -e 's|autoheader\*2.5\*|autoheader\*2.5\* \| autoheader\*2.6\*|' \
+  -e 's|automake\*1.9\*|automake\*1.9\* \| automake\*1.1[0-5]\*|' \
+  admin/cvs.sh
+make -f admin/Makefile.common
+
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt3.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath \
            --disable-debug \
            --disable-libkipi \
            --enable-mysql \
-           --enable-pgsql \
-           --with-pqxxlibdir=%{_libdir} \
+           %{?_enable_pgsql} %{?!_enable_pgsql:--disable-pgsql} \
            --with-kexif \
-           --with-showimgdb
-#           --enable-final \
+           -with-showimgdb
 
-make -k %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde
-desktop-file-install --vendor fedora --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category Viewer \
-  --add-category Graphics \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/%{name}.desktop
+desktop-file-install \
+  --vendor=%{?dt_vendor} --delete-original \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=Viewer \
+  --add-category=Graphics \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/showimg.desktop
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/apps/showimg/convert2png.pl
-#find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %find_lang %{name}
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,14 +128,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc showimg/AUTHORS showimg/COPYING showimg/ChangeLog showimg/NEWS showimg/README
 %{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/applications/kde/*showimg.desktop
+%{_datadir}/apps/showimg/
 %{_datadir}/apps/konqueror/servicemenus/*
-%dir %{_datadir}/apps/showimgpart/
-%{_datadir}/apps/showimgpart/showimgpart.rc
+%{_datadir}/apps/showimgpart/
 %{_datadir}/services/showimgpart.desktop
-%{_datadir}/icons/*/*/apps/*
-%{_datadir}/doc/HTML/*/%{name}
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/doc/HTML/*/showimg/
 %{_datadir}/mimelnk/image/*.desktop
 %{_libdir}/kde3/libshowimgpart.*
 %{_libdir}/libshowimgcore.*
@@ -119,12 +147,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/kde3/showimg_kexidb_mysqldriver.*
 %{_datadir}/services/showimg_kexidb_mysqldriver.desktop
 
+%if 0%{?_enable_pgsql:1}
 %files pgsql
 %{_libdir}/kde3/showimg_kexidb_pqxxsqldriver.*
 %{_datadir}/services/showimg_kexidb_pqxxsqldriver.desktop
+%endif
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.5-25
+- FTBFS showimg-0.9.5-22.fc11 (#511576)
+- disable pgsql support for f12+
+- add icon/mime scriptlets
+- %%description/%%summary: s/for KDE//
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Sun Aug  9 14:27:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 14:27:04 +0000 (UTC)
Subject: rpms/showimg/devel showimg.spec,1.30,1.31
Message-ID: <20090809142704.5E7F311C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26065

Modified Files:
	showimg.spec 
Log Message:
Release++



Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- showimg.spec	9 Aug 2009 14:17:28 -0000	1.30
+++ showimg.spec	9 Aug 2009 14:27:04 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Feature-rich image viewer
 
 Group:          Applications/Multimedia



From tomeu at fedoraproject.org  Sun Aug  9 14:37:07 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Sun,  9 Aug 2009 14:37:07 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.56,1.57
Message-ID: <20090809143707.C8C9411C00D7@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28534

Modified Files:
	gnash.spec 
Log Message:
* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.4.20090809bzr11401
- Install the python module in the sitearch dir



Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gnash.spec	9 Aug 2009 13:36:21 -0000	1.56
+++ gnash.spec	9 Aug 2009 14:37:06 -0000	1.57
@@ -1,11 +1,11 @@
 %define commitid 11401
 %define alphatag 20090809bzr%{commitid}
 
-%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:           gnash
 Version:        0.9.0
-Release:        0.3.%{alphatag}%{?dist}
+Release:        0.4.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -306,9 +306,12 @@ fi
 
 %files widget
 %{_prefix}/include/gnash/*.h
-%{python_sitelib}/*
+%{python_sitearch}/*
 
 %changelog
+* Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.4.20090809bzr11401
+- Install the python module in the sitearch dir
+
 * Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.3.20090809bzr11401
 - One more 64bit fix
 



From chkr at fedoraproject.org  Sun Aug  9 14:43:24 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  9 Aug 2009 14:43:24 +0000 (UTC)
Subject: rpms/f-spot/devel 0001-use-system-Mono.Addins-if-available.patch,
	NONE, 1.1 0001-use-the-correct-stock-icon.patch, NONE,
	1.1 0002-enhance-the-f-spot-import-script.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 f-spot.spec, 1.87, 1.88 sources, 1.20,
	1.21 f-spot-0.1.11-libdir.patch, 1.1,
	NONE f-spot-0.1.3-single.patch, 1.1,
	NONE f-spot-0.2.0-libgphoto2-port.patch, 1.1,
	NONE f-spot-0.3.2-libdir.patch, 1.1,
	NONE f-spot-0.3.5-desktop-file-validate.patch, 1.1,
	NONE f-spot-0.3.5-screensaver.patch, 1.1,
	NONE f-spot-0.4.2-GalleryExport.patch, 1.1,
	NONE f-spot-0.4.2-link_system_libs.patch, 1.1,
	NONE f-spot-0.4.4-Makefile-destdir.patch, 1.1,
	NONE f-spot-0.4.4-desktop.patch, 1.1,
	NONE f-spot-0.4.4-glib-sharp-2.12.0.patch, 1.1,
	NONE f-spot-0.4.4-gtk-deprecated.patch, 1.1,
	NONE f-spot-0.4.4-link-system-mono-addins.patch, 1.4,
	NONE gvfs-gphoto.patch, 1.1, NONE missing-icon.patch, 1.1,
	NONE x-content.patch, 1.1, NONE
Message-ID: <20090809144324.9868911C00D7@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29869

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-use-system-Mono.Addins-if-available.patch 
	0001-use-the-correct-stock-icon.patch 
	0002-enhance-the-f-spot-import-script.patch 
Removed Files:
	f-spot-0.1.11-libdir.patch f-spot-0.1.3-single.patch 
	f-spot-0.2.0-libgphoto2-port.patch f-spot-0.3.2-libdir.patch 
	f-spot-0.3.5-desktop-file-validate.patch 
	f-spot-0.3.5-screensaver.patch 
	f-spot-0.4.2-GalleryExport.patch 
	f-spot-0.4.2-link_system_libs.patch 
	f-spot-0.4.4-Makefile-destdir.patch f-spot-0.4.4-desktop.patch 
	f-spot-0.4.4-glib-sharp-2.12.0.patch 
	f-spot-0.4.4-gtk-deprecated.patch 
	f-spot-0.4.4-link-system-mono-addins.patch gvfs-gphoto.patch 
	missing-icon.patch x-content.patch 
Log Message:
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
- Update to new upstream version 0.6.0.0
- Cleanup spec file


0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE 0001-use-system-Mono.Addins-if-available.patch ---
diff --git a/Makefile.include b/Makefile.include
index efd6d72..4be9a8b 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,9 +3,6 @@
 
 ## Directories
 
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
 LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
 LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS =					\
-	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
-	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
-	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = 								\
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
diff --git a/configure.ac b/configure.ac
index e31bd27..1acaaa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
 BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
+MONO_ADDINS_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
 
 AC_SUBST(CSC_DEFINES)
 
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(MONO_ADDINS, 
+		  mono-addins >= $MONO_ADDINS_REQUIRED
+		  mono-addins-setup >= $MONO_ADDINS_REQUIRED
+		  mono-addins-gui >= $MONO_ADDINS_REQUIRED,
+[
+	DIR_ADDINS=""
+	DIR_ADDINS_ADDINS=""
+	DIR_ADDINS_SETUP=""
+	DIR_ADDINS_GUI=""
+	LINK_MONO_ADDINS="-pkg:mono-addins -pkg:mono-addins-setup -pkg:mono-addins-gui"
+],
+[
+	DIR_ADDINS="mono-addins"
+	DIR_ADDINS_ADDINS='$(top_builddir)/lib/mono-addins/Mono.Addins'
+	DIR_ADDINS_SETUP='$(top_builddir)/lib/mono-addins/Mono.Addins.Setup'
+	DIR_ADDINS_GUI='$(top_builddir)/lib/mono-addins/Mono.Addins.Gui'
+	LINK_MONO_ADDINS='-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll         \
+			  -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll    \
+			  -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll'
+])
+AC_SUBST(DIR_ADDINS)
+AC_SUBST(DIR_ADDINS_ADDINS)
+AC_SUBST(DIR_ADDINS_SETUP)
+AC_SUBST(DIR_ADDINS_GUI)
+AC_SUBST(LINK_MONO_ADDINS)
+
 dnl -- dbus-sharp: link or bundle ?
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 [
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6d69f9..d0b9a6c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
-	mono-addins			\
 	semweb				\
 	Tao
 
@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
 SUBDIRS = 				\
 	$(DIR_DBUS)			\
 	$(DIR_DBUS_GLIB)	\
+	$(DIR_ADDINS)	\
 	$(UNCONDITIONAL_SUBDIRS)
 
 DIST_SUBDIRS = 			\
 	dbus-sharp			\
 	dbus-sharp-glib		\
+	mono-addins		\
 	dpap-sharp			\
 	$(UNCONDITIONAL_SUBDIRS)
 
-- 
1.6.0.6


0001-use-the-correct-stock-icon.patch:
 ImportCommand.cs |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-use-the-correct-stock-icon.patch ---
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index d4a9e23..a47015e 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -256,7 +256,7 @@ public class ImportCommand : GladeDialog
 				}
 			} else {
 				ImportSource source = new BrowseSource (Catalog.GetString ("(No Cameras Detected)"),
-									"emblem-camera");
+									"camera-photo");
 				item = new SourceItem (source);
 				item.Activated += HandleActivated;
 				item.Sensitive = false;
-- 
1.6.0.6


0002-enhance-the-f-spot-import-script.patch:
 f-spot-import |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

--- NEW FILE 0002-enhance-the-f-spot-import-script.patch ---
diff --git a/tools/f-spot-import b/tools/f-spot-import
index 98385b1..34facc0 100755
--- a/tools/f-spot-import
+++ b/tools/f-spot-import
@@ -3,22 +3,46 @@
 udi="$1"
 #xmessage $udi
 
+# check for gvfs mount point using gphoto2
+gvfsuri=`gvfs-ls -c "$udi/"`
+if [ "${gvfsuri:0:10}" = "gphoto2://" ] ; then
+	if [ "${gvfsuri:11:4}" = "usb:" ] ; then
+		# Yield for f-spot since it wants to access the device directly
+		#
+		# Rewrite the uri to something f-spot can handle
+		#
+		bus="${gvfsuri:15:3}"
+		dev="${gvfsuri:19:3}"
+
+		uri="gphoto2:usb:$bus,$dev"
+
+		gvfs-mount --unmount-scheme gphoto2
+		f-spot --import "$uri"
+		exit
+	fi
+	# mounted via gphoto2 not using USB, stay with the plain directory
+	f-spot --import "$udi"
+	exit
+fi
+
 if [ "$udi" != "${udi#gphoto2:}" ]; then
 	# gphoto2, as passed by gvfs/nautilus
 	gvfs-mount -u "$udi" || true
 	f-spot --import "$udi"
 	exit
 fi
-mnt=${udi#file://}
-if [ "$udi" != "$mnt" ]; then
+
+if [ "$udi" != "${udi#file://}" ]; then
 	# mount point, as passed by gvfs/nautilus.
 	f-spot --import "$udi"
 	exit
 fi
+
 mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true
 if [ -n "$mount_point" ]; then
 	# USB Mass Storage camera: need to pass f-spot a mount point
 	f-spot --import "$mount_point"
+	exit
 else
 	# Some other camera try GPhoto2
 
@@ -27,4 +51,6 @@ else
 	uri=`printf gphoto2:[usb:%.3d,%.3d] $bus $dev`
 
 	f-spot --import "$uri"
+	exit
 fi
+xmessage "f-spot-import can't handle UDI: \"$udi\""
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Dec 2008 17:49:40 -0000	1.20
+++ .cvsignore	9 Aug 2009 14:43:22 -0000	1.21
@@ -1 +1 @@
-f-spot-0.5.0.3.tar.bz2
+f-spot-0.6.0.0.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- f-spot.spec	25 Jul 2009 20:14:22 -0000	1.87
+++ f-spot.spec	9 Aug 2009 14:43:23 -0000	1.88
@@ -1,18 +1,18 @@
 Name:           f-spot
-Version:        0.5.0.3
-Release:        9%{?dist}
+Version:        0.6.0.0
+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://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
+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=591223
+Patch1:         0001-use-the-correct-stock-icon.patch
 # Use system mono-addins
-Patch3:         f-spot-0.4.4-link-system-mono-addins.patch
-# fix a missing icon
-Patch4:         missing-icon.patch
+Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
-Patch5:         gvfs-gphoto.patch
+Patch3:         0002-enhance-the-f-spot-import-script.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -30,6 +30,9 @@ BuildRequires:  desktop-file-utils
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
+Requires:       hicolor-icon-theme 
+Requires:       gnome-screensaver
+Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -50,32 +53,26 @@ sorting and tagging of digital images. 
 %prep
 %setup -q
 
-# preserve timestamps
-touch -r configure.in configure.in.stamp
-
-%patch3 -p1 -b .link-system-mono-addins
-%patch4 -p1 -b .missing-icon
-%patch5 -p1 -b .gvfs-gphoto
-
-# restore timestamps
-touch -r configure.in.stamp configure.in
+%patch1 -p1 -b .missing-icon
+%patch2 -p1 -b .link-system-mono-addins
+%patch3 -p1 -b .gvfs-gphoto
 
 %build
+autoreconf -f -i
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-scrollkeeper
-make
+# parallel build broken in 0.6.0.0, try again with next release
+make # %{?_smp_mflags}
 
 
 %install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 rm -rf $RPM_BUILD_ROOT
+export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
-# Will need to be removed at some point...
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gio-sharp-unstable.pc
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll
@@ -92,37 +89,42 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 README NEWS
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome/help/f-spot
+%{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/icons/hicolor/*/*/*.svg
-%{_datadir}/f-spot
-%{_libdir}/f-spot
+%{_datadir}/f-spot/
+%{_libdir}/f-spot/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot
-# GIO is currently provided in f-spot only, so this'll need to be removed sometime in the future
-%{_libdir}/gio-sharp-unstable
+%{_datadir}/omf/f-spot/
 
 %changelog
+* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
+- Update to new upstream version 0.6.0.0
+- Cleanup spec file
+
 * Sat Jul 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-9
 - Avoid showing f-spot twice for photo imports
 - Make f-spot-import work with gvfs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Dec 2008 17:49:40 -0000	1.20
+++ sources	9 Aug 2009 14:43:24 -0000	1.21
@@ -1 +1 @@
-52db86f1dc715a3958425aa3d006c900  f-spot-0.5.0.3.tar.bz2
+9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2


--- f-spot-0.1.11-libdir.patch DELETED ---


--- f-spot-0.1.3-single.patch DELETED ---


--- f-spot-0.2.0-libgphoto2-port.patch DELETED ---


--- f-spot-0.3.2-libdir.patch DELETED ---


--- f-spot-0.3.5-desktop-file-validate.patch DELETED ---


--- f-spot-0.3.5-screensaver.patch DELETED ---


--- f-spot-0.4.2-GalleryExport.patch DELETED ---


--- f-spot-0.4.2-link_system_libs.patch DELETED ---


--- f-spot-0.4.4-Makefile-destdir.patch DELETED ---


--- f-spot-0.4.4-desktop.patch DELETED ---


--- f-spot-0.4.4-glib-sharp-2.12.0.patch DELETED ---


--- f-spot-0.4.4-gtk-deprecated.patch DELETED ---


--- f-spot-0.4.4-link-system-mono-addins.patch DELETED ---


--- gvfs-gphoto.patch DELETED ---


--- missing-icon.patch DELETED ---


--- x-content.patch DELETED ---



From gemi at fedoraproject.org  Sun Aug  9 14:54:31 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 14:54:31 +0000 (UTC)
Subject: rpms/GtkAda/devel GtkAda-gtk217.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 GtkAda.spec, 1.27, 1.28 sources, 1.6, 1.7
Message-ID: <20090809145431.6D02611C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/GtkAda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv347

Modified Files:
	.cvsignore GtkAda.spec sources 
Added Files:
	GtkAda-gtk217.patch 
Log Message:
update to 2.14.0


GtkAda-gtk217.patch:
 gtkitementry.c |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE GtkAda-gtk217.patch ---
diff -up GtkAda-2.14.0/src/gtkextra/gtkitementry.c.gtk217 GtkAda-2.14.0/src/gtkextra/gtkitementry.c
--- GtkAda-2.14.0/src/gtkextra/gtkitementry.c.gtk217	2009-08-09 07:19:21.000000000 -0600
+++ GtkAda-2.14.0/src/gtkextra/gtkitementry.c	2009-08-09 07:22:10.000000000 -0600
@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable 
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
 
-  if (new_text_length + entry->n_bytes + 1 > entry->text_size)
+  if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
     {
-      while (new_text_length + entry->n_bytes + 1 > entry->text_size)
+      while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
 	{
-	  if (entry->text_size == 0)
-	    entry->text_size = MIN_SIZE;
+	  if (entry->x_text_size == 0)
+	    entry->x_text_size = MIN_SIZE;
 	  else
 	    {
-	      if (2 * (guint)entry->text_size < MAX_SIZE &&
-		  2 * (guint)entry->text_size > entry->text_size)
-		entry->text_size *= 2;
+	      if (2 * (guint)entry->x_text_size < MAX_SIZE &&
+		  2 * (guint)entry->x_text_size > entry->x_text_size)
+		entry->x_text_size *= 2;
 	      else
 		{
-		  entry->text_size = MAX_SIZE;
-		  if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
+		  entry->x_text_size = MAX_SIZE;
+		  if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
 		    {
-		      new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
+		      new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
 		      new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
 		      n_chars = g_utf8_strlen (new_text, new_text_length);
 		    }
@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable 
 	    }
 	}
 
-      entry->text = g_realloc (entry->text, entry->text_size);
+      entry->text = g_realloc (entry->text, entry->x_text_size);
     }
 
   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
 
-  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
+  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
   memcpy (entry->text + index, new_text, new_text_length);
 
-  entry->n_bytes += new_text_length;
+  entry->x_n_bytes += new_text_length;
   entry->text_length += n_chars;
 
   /* NUL terminate for safety and convenience */
-  entry->text[entry->n_bytes] = '\0';
+  entry->text[entry->x_n_bytes] = '\0';
   
   if (entry->current_pos > *position)
     entry->current_pos += n_chars;
@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable 
       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
 
-      g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
+      g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
       entry->text_length -= (end_pos - start_pos);
-      entry->n_bytes -= (end_index - start_index);
+      entry->x_n_bytes -= (end_index - start_index);
       
       if (entry->current_pos > start_pos)
 	entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
 {
   gtk_im_context_set_surrounding (context,
                                   entry->text,
-                                  entry->n_bytes,
+                                  entry->x_n_bytes,
                                   g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
 
   return TRUE;
@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry
       
       if (entry->visible)
         {
-          g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+          g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
           g_string_insert (tmp_string, cursor_index, preedit_string);
         }
       else
@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry
           gint preedit_len_chars;
           gunichar invisible_char;
           
-          ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+          ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
           preedit_len_chars = g_utf8_strlen (preedit_string, -1);
           ch_len += preedit_len_chars;
 
@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry
     {
       if (entry->visible)
         {
-          pango_layout_set_text (layout, entry->text, entry->n_bytes);
+          pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
         }
       else
         {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Dec 2008 22:25:19 -0000	1.6
+++ .cvsignore	9 Aug 2009 14:54:31 -0000	1.7
@@ -1 +1 @@
-GtkAda-gpl-2.10.2.tgz
+GtkAda-gpl-2.14.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- GtkAda.spec	24 Jul 2009 15:31:55 -0000	1.27
+++ GtkAda.spec	9 Aug 2009 14:54:31 -0000	1.28
@@ -1,12 +1,13 @@
 Name:		GtkAda
-Version:	2.10.2
-Release:	3%{?dist}
+Version:	2.14.0
+Release:	1%{?dist}
 Summary:	Ada graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		https://libre.adacore.com/GtkAda/
 # Source is available, but requires registration
-Source:         GtkAda-gpl-2.10.2.tgz
+Source:         GtkAda-gpl-%{version}.tgz
+Patch0:         GtkAda-gtk217.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat
@@ -19,12 +20,12 @@ BuildRequires:  bonobo-activation-devel
 BuildRequires:  libbonoboui-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  texinfo-tex
 BuildRequires:	texinfo
 BuildRequires:	tetex
 BuildRequires:  tetex-dvips
-ExcludeArch:    ppc64
 
 %description
 GtkAda is an Ada graphical toolkit based on Gtk+. It allows you to
@@ -35,6 +36,9 @@ develop graphical applications in Ada us
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-gnome = %{version}-%{release}
+Requires:	%{name}-glade = %{version}-%{release}
+Requires:	%{name}-gl = %{version}-%{release}
 Requires:       perl
 Requires:       gtk2-devel
 Requires:       pkgconfig
@@ -43,6 +47,34 @@ Requires:       pkgconfig
 Development files for GtkAda.
 
 
+%package gnome
+Summary:	GNOME bindings of GtkAda
+Group:		Development/Libraries
+
+%description gnome
+%{summary}.
+
+
+%package glade
+Summary:	Glade bindings of GtkAda
+Group:		Development/Libraries
+
+%description glade
+%{summary}.
+
+
+%package gl
+Summary:	OpenGL bindings of GtkAda
+Group:		Development/Libraries
+
+%description gl
+%{summary}.
+
+
+%description devel
+Development files for GtkAda.
+
+
 %package doc
 Summary:	Documentation for GtkAda
 Group:		Documentation
@@ -53,7 +85,8 @@ Documentation for GtkAda.
 
 
 %prep
-%setup -q -n %{name}-gpl-%{version}
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .gtk217
 sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
 sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 sed -i "s|@prefix@/lib|@prefix@/%{_lib}|" projects/gtkada.pc.in
@@ -82,7 +115,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/gtkada/relo
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
+(cd docs; install -m 0644 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
 rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
@@ -97,16 +130,45 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
+%post gnome -p /sbin/ldconfig
+
+%postun gnome -p /sbin/ldconfig
+
+
+%post gl -p /sbin/ldconfig
+
+%postun gl -p /sbin/ldconfig
+
+
+%post glade -p /sbin/ldconfig
+
+%postun glade -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libgtkada-*.so.*
 %doc AUTHORS COPYING README
 
 
+%files gnome
+%defattr(-,root,root,-)
+%{_libdir}/libgnomeada-*.so.*
+
+
+%files gl
+%defattr(-,root,root,-)
+%{_libdir}/libgtkada_gl-*.so.*
+
+
+%files glade
+%defattr(-,root,root,-)
+%{_libdir}/libgtkada_glade-*.so.*
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -127,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 2.14.0-1
+- new release 2.14.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Dec 2008 22:25:19 -0000	1.6
+++ sources	9 Aug 2009 14:54:31 -0000	1.7
@@ -1 +1 @@
-cbd287fad55f7e62ff15d7fcf8db7cd4  GtkAda-gpl-2.10.2.tgz
+e43cd5d882f044a70d76cea74e6cd705  GtkAda-gpl-2.14.0.tgz



From ensc at fedoraproject.org  Sun Aug  9 14:59:32 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 14:59:32 +0000 (UTC)
Subject: rpms/kismet/devel kismet-2008-05-R1-typo.patch, 1.1,
	NONE kismet-2008-05-R1-typedef.patch, 1.1,
	NONE kismet-2008-05-R1-gcc44.patch, 1.1,
	NONE kismet-2008-05-R1-fmt.patch, 1.1,
	NONE kismet-2008-05-R1-const.patch, 1.1,
	NONE kismet-2007-01-R1-setgroups.patch, 1.1,
	NONE kismet-2006-04-R1-ssize.patch, 1.1, NONE
Message-ID: <20090809145932.714E211C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1430

Removed Files:
	kismet-2008-05-R1-typo.patch kismet-2008-05-R1-typedef.patch 
	kismet-2008-05-R1-gcc44.patch kismet-2008-05-R1-fmt.patch 
	kismet-2008-05-R1-const.patch 
	kismet-2007-01-R1-setgroups.patch 
	kismet-2006-04-R1-ssize.patch 
Log Message:
obsoleted by 2009-06-R1



--- kismet-2008-05-R1-typo.patch DELETED ---


--- kismet-2008-05-R1-typedef.patch DELETED ---


--- kismet-2008-05-R1-gcc44.patch DELETED ---


--- kismet-2008-05-R1-fmt.patch DELETED ---


--- kismet-2008-05-R1-const.patch DELETED ---


--- kismet-2007-01-R1-setgroups.patch DELETED ---


--- kismet-2006-04-R1-ssize.patch DELETED ---



From ensc at fedoraproject.org  Sun Aug  9 15:00:07 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 15:00:07 +0000 (UTC)
Subject: rpms/kismet/devel kismet_capture_wrap.c, NONE,
	1.1 kismet_capture.pam, NONE, 1.1 kismet_capture.console, NONE,
	1.1 kismet-2009-06-R1-perms.patch, NONE,
	1.1 kismet-2009-06-R1-fmt.patch, NONE,
	1.1 kismet-2009-06-R1-envp.patch, NONE, 1.1
Message-ID: <20090809150007.775C211C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1592

Added Files:
	kismet_capture_wrap.c kismet_capture.pam 
	kismet_capture.console kismet-2009-06-R1-perms.patch 
	kismet-2009-06-R1-fmt.patch kismet-2009-06-R1-envp.patch 
Log Message:
initial checkin for 2009-06-R1



--- NEW FILE kismet_capture_wrap.c ---
/*	--*- c -*--
 * Copyright (C) 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; version 3 of the License.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

#include <stdlib.h>
#include <unistd.h>

/* Hack around missing configurability of userhelper which closes all upper
 * fds */
int main(int argc, char *argv[])
{
	int	fd;

	if (argc >= 2) {
		fd = atoi(argv[1]);
		if (fd != 0) {
			if (dup2(fd, 0) < 0)
				abort();
			close(fd);
		}

		argv[1] = "0";
	}

	execv("/usr/bin/consolehelper", argv);
	abort();
}


--- NEW FILE kismet_capture.pam ---
#%PAM-1.0
auth		sufficient	pam_rootok.so
#auth		sufficient	pam_timestamp.so
auth		include		system-auth
account		required	pam_permit.so
session		required	pam_permit.so
session		optional	pam_xauth.so
#session	optional	pam_timestamp.so


--- NEW FILE kismet_capture.console ---
USER=root
PROGRAM=/usr/libexec/kismet_capture
SESSION=true
FALLBACK=false

kismet-2009-06-R1-perms.patch:
 Makefile.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE kismet-2009-06-R1-perms.patch ---
Index: kismet-2009-06-R1/Makefile.in
===================================================================
--- kismet-2009-06-R1.orig/Makefile.in
+++ kismet-2009-06-R1/Makefile.in
@@ -127,16 +127,16 @@ Makefile: Makefile.in configure
 	@-echo "'Makefile.in' or 'configure' are more current than this Makefile.  You should re-run 'configure'."
 
 binsuidinstall:
-	$(INSTALL) -o $(INSTUSR) -g $(SUIDGROUP) -m 4550 $(CS) $(BIN)/$(CS); 
+	$(INSTALL) -o $(INSTUSR) -g $(SUIDGROUP) -m 4750 $(CS) $(BIN)/$(CS); 
 	
 commoninstall:
 	mkdir -p $(ETC)
 	mkdir -p $(BIN)
 
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
 
 	mkdir -p $(MAN)/man1
 	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1

kismet-2009-06-R1-fmt.patch:
 kis_panel_network.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-06-R1-fmt.patch ---
Index: kismet-2009-06-R1/kis_panel_network.cc
===================================================================
--- kismet-2009-06-R1.orig/kis_panel_network.cc
+++ kismet-2009-06-R1/kis_panel_network.cc
@@ -2481,7 +2481,7 @@ int Kis_Netlist::PrintNetworkLine(Kis_Di
 			rofft += 4;
 		} else if (b == bcol_clients) {
 			// TODO - handle clients
-			snprintf(rline + rofft, max - rofft, "%4d", net->client_map.size());
+			snprintf(rline + rofft, max - rofft, "%4zd", net->client_map.size());
 			rofft += 4;
 		} else if (b == bcol_datasize) {
 			char dt = ' ';

kismet-2009-06-R1-envp.patch:
 ipc_remote.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-06-R1-envp.patch ---
Preserve environment when calling the kismet_capture client. We need
stuff like $DISPLAY or $XAUTHORITY to display the consolehelper dialog.

Index: kismet-2009-06-R1/ipc_remote.cc
===================================================================
--- kismet-2009-06-R1.orig/ipc_remote.cc
+++ kismet-2009-06-R1/ipc_remote.cc
@@ -323,7 +323,7 @@ int IPCRemote::SpawnIPC() {
 
 				snprintf(cmdarg[1], 4, "%d", sockpair[0]);
 
-				if (execve(cmdarg[0], cmdarg, NULL) < 0) {
+				if (execve(cmdarg[0], cmdarg, globalreg->envp) < 0) {
 					int status = errno;
 					fprintf(stderr, "Failed to exec as IPC child: %s\n", 
 							strerror(status));



From ensc at fedoraproject.org  Sun Aug  9 15:01:09 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 15:01:09 +0000 (UTC)
Subject: rpms/kismet/devel .cvsignore, 1.4, 1.5 kismet.spec, 1.23,
	1.24 lastver, 1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20090809150109.7854E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1870

Modified Files:
	.cvsignore kismet.spec lastver sources 
Log Message:
- updated to 2009-06-R1
- reworked large parts of the package due to major upstream changes:
  * there is no separate user anymore but a kismet_capture consolehelper wrapper
  * a lot of the old filesystem layout has been changed/removed
  * removed -extras subpackage; added -plugins one



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Jun 2008 17:05:08 -0000	1.4
+++ .cvsignore	9 Aug 2009 15:01:08 -0000	1.5
@@ -1,2 +1,2 @@
-kismet-2008-05-R1.tar.gz
-kismet-2008-05-R1.tar.gz.asc
+kismet-2009-06-R1.tar.gz
+kismet-2009-06-R1.tar.gz.asc


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kismet.spec	25 Jul 2009 04:38:10 -0000	1.23
+++ kismet.spec	9 Aug 2009 15:01:08 -0000	1.24
@@ -1,14 +1,6 @@
-%global _version	2008-05-R1
-
-## Fedora Extras specific customization below...
-%bcond_without       	fedora
-##
+%global _version	2009-06-R1
 
 ## {Local macros...
-%global username	kismet
-%global crontabdir	%_sysconfdir/cron.daily
-%global homedir		%_var/lib/%name
-%global logdir		%_var/log/%name
 %global cfgdir		%_sysconfdir/%name
 %global _rpmversion	0.0.%(echo %_version | tr - .)
 ## ...local macros}
@@ -18,40 +10,32 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 6
+Release:	%release_func 0
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
 Source0:	http://www.kismetwireless.net/code/%name-%_version.tar.gz
 Source1:	http://www.kismetwireless.net/code/%name-%_version.tar.gz.asc
-Source10:	tmpwatch.kismet
-Source11:	sysconfig.kismet
-Patch7:		kismet-2006-04-R1-ssize.patch
-Patch8:		kismet-2007-01-R1-setgroups.patch
-Patch13:	kismet-2008-05-R1-typedef.patch
-Patch14:	kismet-2008-05-R1-typo.patch
-Patch15:	kismet-2008-05-R1-const.patch
-Patch16:	kismet-2008-05-R1-fmt.patch
-Patch17:	kismet-2008-05-R1-gcc44.patch
+
+Source12:	kismet_capture.pam
+Source13:	kismet_capture.console
+
+Patch16:	kismet-2009-06-R1-fmt.patch
+Patch17:	kismet-2009-06-R1-perms.patch
+Patch18:	kismet-2009-06-R1-envp.patch
+
 BuildRoot:	%_tmppath/%name-%version-%release-root
-BuildRequires:		expat-devel ncurses-devel diffutils
-BuildRequires:		gmp-devel wget libpcap-devel
-BuildRequires:		ImageMagick-devel
-# should be required by ImageMagick-devel but are missing in FC4
-BuildRequires:		libtiff-devel libjpeg-devel freetype-devel
-BuildRequires:		fedora-usermgmt-devel
-BuildRequires:		dbus-devel
-Provides:		user(%username)
-Provides:		group(%username)
-Requires(missingok):	tmpwatch
-Requires(missingok):	crontabs
-Requires(pre):		%crontabdir
-Requires(postun):	%crontabdir
-%{?FE_USERADD_REQ}
+BuildRequires:	ncurses-devel diffutils
+BuildRequires:	libpcap-devel pcre-devel
+Requires:	usermode
 
+# HACK: work around https://fedorahosted.org/usermode/ticket/1
+Source50:	kismet_capture_wrap.c
+BuildRequires:	dietlibc
 
-%package extras
-Summary:	Non-core programs for 'kismet'
+
+%package plugins
+Summary:	Plugins for kismet
 Group:		Applications/Internet
 Requires:	%name = %version-%release
 
@@ -67,40 +51,27 @@ standard named networks, detecting (and 
 networks, and infering the presence of nonbeaconing networks via data
 traffic.
 
-%description extras
+%description plugins
 Kismet is an 802.11 layer2 wireless network detector, sniffer, and
 intrusion detection system. Kismet will work with any wireless card
 which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
 802.11a, and 802.11g traffic.
 
-This subpackage contains programs which provide additional functionality
-but introduce dependencies which are not needed for kismet to work.
+This subpackage contains plugins shipped by the kismet package.
 
 
 %prep
 %setup -q -n %name-%_version
-%patch7  -p1 -b .ssize
-%patch8  -p1 -b .setgroups
-%patch13 -p1 -b .typedef
-%patch14 -p1 -b .typo
-%patch15 -p1 -b .const
-%patch16 -p1 -b .fmt
-%patch17 -p0 -b .gcc44
-
-sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet
-touch --reference=%SOURCE10 tmpwatch.kismet || :	# keep timestamp
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
-sed -i -e "s!your_user_here!%username!g;
-           s!^gps=true!gps=false!;
-           s!^logtemplate=%%!logtemplate=%logdir/%%!;
-	   s!^configdir=.*!configdir=%h/!" \
-		conf/kismet.conf.in conf/kismet_drone.conf
-
-# do not strip installed binaries as it conflicts with the -debuginfo
-# mechanism
-sed -i -e "s!\(install .*\) -s !\1 !g" Makefile.in
+sed -i \
+    -e '/^ouifile=/etc/manuf/d' \
+    -e '/^ouifile=/usr/share/wireshark/wireshark/manuf/d' \
+    conf/kismet.conf.in conf/kismet_drone.conf
 
 
 %build
@@ -113,26 +84,41 @@ export LDFLAGS='-Wl,--as-needed'
 make clean
 make %{?_smp_mflags} HOME="$HOME"
 
+for i in plugin-{ptw,spectools}; do
+    make -C $i KIS_SRC_DIR=`pwd` \
+    	 CXX='%__cxx' CC='%__cc' LD='%__cxx' \
+	 CFLAGS="-I\$(KIS_SRC_DIR) -fPIC $RPM_OPT_FLAGS" \
+	 LDFLAGS="-shared -rdynamic -Wl,--as-needed"
+done
+
+
+# HACK: work around https://fedorahosted.org/usermode/ticket/1
+diet %__cc $RPM_OPT_FLAGS %SOURCE50 -o kismet_capture.wrap
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT _tmp
+
 make install	\
 	DESTDIR="$RPM_BUILD_ROOT" \
 	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
-install -d $RPM_BUILD_ROOT{%homedir,%logdir,%crontabdir,%_sysconfdir/sysconfig}
-install -p -m755 tmpwatch.kismet $RPM_BUILD_ROOT%crontabdir
-install -p -m644 %SOURCE11       $RPM_BUILD_ROOT%_sysconfdir/sysconfig/kismet
 
+for i in plugin-{ptw,spectools}; do
+    make -C $i install KIS_DEST_DIR=`pwd`/_tmp
+done
+
+install -d $RPM_BUILD_ROOT{%homedir,%crontabdir,%_libdir/kismet{,_client},%_libexecdir,%_sysconfdir/{sysconfig,pam.d,security/console.apps}}
 
-%pre
-%__fe_groupadd 12 -r %username &>/dev/null || :
-%__fe_useradd  12 -r -s /sbin/nologin -M -d %homedir		\
-	          -c 'Kismet user' -g %username %username &>/dev/null || :
+install -p -m 0644 %SOURCE12     $RPM_BUILD_ROOT%_sysconfdir/pam.d/kismet_capture
+install -p -m 0644 %SOURCE13     $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/kismet_capture
+install -p -m 0755 kismet_capture $RPM_BUILD_ROOT%_libexecdir/
 
+install -Dp -m 0755 _tmp/lib/kismet/*        $RPM_BUILD_ROOT%_libdir/kismet/
+install -Dp -m 0755 _tmp/lib/kismet_client/* $RPM_BUILD_ROOT%_libdir/kismet_client/
 
-%postun
-%__fe_userdel  %username &>/dev/null || :
-%__fe_groupdel %username &>/dev/null || :
+
+#ln -s ./consolehelper            $RPM_BUILD_ROOT%_bindir/kismet_capture
+install -p -m 0755 kismet_capture.wrap $RPM_BUILD_ROOT%_bindir/kismet_capture
 
 
 %clean
@@ -141,26 +127,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG* GPL README TODO docs
-%dir %attr(0770,root,%username) %homedir
-%dir %attr(0730,root,%username) %logdir
-%dir %attr(0750,root,%username) %cfgdir
+%doc CHANGELOG* GPL README docs
+%dir %attr(0755,root,root) %cfgdir
 %config(noreplace) %cfgdir/*
 %_bindir/kismet*
 %_datadir/kismet
 %_mandir/*/kismet*
 
-%config            %crontabdir/tmpwatch.kismet
-%config(noreplace) %_sysconfdir/sysconfig/kismet
+%dir %_libdir/kismet
+%dir %_libdir/kismet_client
+
+%_sysconfdir/pam.d/*
+%_sysconfdir/security/console.apps/*
+%_libexecdir/*
 
 
-%files extras
+%files plugins
 %defattr(-,root,root,-)
-%_bindir/gps*
-%_mandir/*/gps*
+%dir %_libdir/kismet/*.so
+%dir %_libdir/kismet_client/*.so
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.06.R1-0
+- updated to 2009-06-R1
+- reworked large parts of the package due to major upstream changes:
+  * there is no separate user anymore but a kismet_capture consolehelper wrapper
+  * a lot of the old filesystem layout has been changed/removed
+  * removed -extras subpackage; added -plugins one
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2008.05.R1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/lastver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lastver	21 Jun 2008 17:05:08 -0000	1.3
+++ lastver	9 Aug 2009 15:01:09 -0000	1.4
@@ -1 +1 @@
-2008-05-R1
+2009-06-R1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Jun 2008 17:05:08 -0000	1.5
+++ sources	9 Aug 2009 15:01:09 -0000	1.6
@@ -1,2 +1,2 @@
-6ee365d36354b4dee4945e67f8149294  kismet-2008-05-R1.tar.gz
-6976640def18c452c3b27282577a9ae9  kismet-2008-05-R1.tar.gz.asc
+8d77138020ace39f175a906dc0d3b267  kismet-2009-06-R1.tar.gz
+6eb095566baea5727a08aa269655119c  kismet-2009-06-R1.tar.gz.asc



From chkr at fedoraproject.org  Sun Aug  9 15:08:54 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  9 Aug 2009 15:08:54 +0000 (UTC)
Subject: rpms/f-spot/devel f-spot.spec,1.88,1.89
Message-ID: <20090809150854.9546411C00D7@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3510

Modified Files:
	f-spot.spec 
Log Message:
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-2
- Fix Icon Cache script in %post section



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- f-spot.spec	9 Aug 2009 14:43:23 -0000	1.88
+++ f-spot.spec	9 Aug 2009 15:08:54 -0000	1.89
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -91,10 +91,6 @@ rm -rf $RPM_BUILD_ROOT
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
 %postun
 update-desktop-database &> /dev/null ||:
 if [ $1 -eq 0 ] ; then
@@ -121,6 +117,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/omf/f-spot/
 
 %changelog
+* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-2
+- Fix Icon Cache script in %%post section
+
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
 - Update to new upstream version 0.6.0.0
 - Cleanup spec file



From ensc at fedoraproject.org  Sun Aug  9 15:10:10 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 15:10:10 +0000 (UTC)
Subject: rpms/kismet/devel kismet.spec,1.24,1.25
Message-ID: <20090809151010.88FE911C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3851

Modified Files:
	kismet.spec 
Log Message:
fixed sed expression


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kismet.spec	9 Aug 2009 15:01:08 -0000	1.24
+++ kismet.spec	9 Aug 2009 15:10:10 -0000	1.25
@@ -69,8 +69,8 @@ This subpackage contains plugins shipped
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
 sed -i \
-    -e '/^ouifile=/etc/manuf/d' \
-    -e '/^ouifile=/usr/share/wireshark/wireshark/manuf/d' \
+    -e '\!^ouifile=/etc/manuf!d' \
+    -e '\!^ouifile=/usr/share/wireshark/wireshark/manuf!d' \
     conf/kismet.conf.in conf/kismet_drone.conf
 
 



From ensc at fedoraproject.org  Sun Aug  9 15:20:18 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 15:20:18 +0000 (UTC)
Subject: rpms/kismet/devel kismet.spec,1.25,1.26
Message-ID: <20090809152018.7A19911C0494@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6370

Modified Files:
	kismet.spec 
Log Message:
added some missing BR


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- kismet.spec	9 Aug 2009 15:10:10 -0000	1.25
+++ kismet.spec	9 Aug 2009 15:20:17 -0000	1.26
@@ -27,6 +27,7 @@ Patch18:	kismet-2009-06-R1-envp.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 BuildRequires:	ncurses-devel diffutils
 BuildRequires:	libpcap-devel pcre-devel
+BuildRequires:	openssl-devel libcap-devel
 Requires:	usermode
 
 # HACK: work around https://fedorahosted.org/usermode/ticket/1



From ensc at fedoraproject.org  Sun Aug  9 15:37:46 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 15:37:46 +0000 (UTC)
Subject: rpms/kismet/devel kismet.spec,1.26,1.27
Message-ID: <20090809153746.DB3D911C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9601

Modified Files:
	kismet.spec 
Log Message:
added some missing BR; fixed ppc64 build


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- kismet.spec	9 Aug 2009 15:20:17 -0000	1.26
+++ kismet.spec	9 Aug 2009 15:37:46 -0000	1.27
@@ -27,7 +27,7 @@ Patch18:	kismet-2009-06-R1-envp.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 BuildRequires:	ncurses-devel diffutils
 BuildRequires:	libpcap-devel pcre-devel
-BuildRequires:	openssl-devel libcap-devel
+BuildRequires:	openssl-devel libcap-devel libnl-devel
 Requires:	usermode
 
 # HACK: work around https://fedorahosted.org/usermode/ticket/1
@@ -67,6 +67,8 @@ This subpackage contains plugins shipped
 %patch17 -p1
 %patch18 -p1
 
+/bin/cp -a /usr/lib/rpm/config.sub .
+
 # set our 'kismet' user, disable GPS and log into %logdir by
 # default
 sed -i \
@@ -79,7 +81,7 @@ sed -i \
 #export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
 export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
 export LDFLAGS='-Wl,--as-needed'
-%configure --enable-ipv6 --sysconfdir=%cfgdir
+%configure --sysconfdir=%cfgdir
 
 # HOME will be set to @srcdir@ which is disturbing distcc
 make clean



From chkr at fedoraproject.org  Sun Aug  9 15:42:15 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  9 Aug 2009 15:42:15 +0000 (UTC)
Subject: rpms/f-spot/F-11 0001-use-system-Mono.Addins-if-available.patch,
	NONE, 1.1 0001-use-the-correct-stock-icon.patch, NONE,
	1.1 0002-enhance-the-f-spot-import-script.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 f-spot.spec, 1.88, 1.89 sources, 1.20, 1.21
Message-ID: <20090809154215.2027211C00D7@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-serv10383

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-use-system-Mono.Addins-if-available.patch 
	0001-use-the-correct-stock-icon.patch 
	0002-enhance-the-f-spot-import-script.patch 
Log Message:
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
- Update to new upstream version 0.6.0.0
- Cleanup spec file


0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE 0001-use-system-Mono.Addins-if-available.patch ---
diff --git a/Makefile.include b/Makefile.include
index efd6d72..4be9a8b 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,9 +3,6 @@
 
 ## Directories
 
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
 LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
 LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS =					\
-	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
-	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
-	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = 								\
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
diff --git a/configure.ac b/configure.ac
index e31bd27..1acaaa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
 BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
+MONO_ADDINS_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
 
 AC_SUBST(CSC_DEFINES)
 
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(MONO_ADDINS, 
+		  mono-addins >= $MONO_ADDINS_REQUIRED
+		  mono-addins-setup >= $MONO_ADDINS_REQUIRED
+		  mono-addins-gui >= $MONO_ADDINS_REQUIRED,
+[
+	DIR_ADDINS=""
+	DIR_ADDINS_ADDINS=""
+	DIR_ADDINS_SETUP=""
+	DIR_ADDINS_GUI=""
+	LINK_MONO_ADDINS="-pkg:mono-addins -pkg:mono-addins-setup -pkg:mono-addins-gui"
+],
+[
+	DIR_ADDINS="mono-addins"
+	DIR_ADDINS_ADDINS='$(top_builddir)/lib/mono-addins/Mono.Addins'
+	DIR_ADDINS_SETUP='$(top_builddir)/lib/mono-addins/Mono.Addins.Setup'
+	DIR_ADDINS_GUI='$(top_builddir)/lib/mono-addins/Mono.Addins.Gui'
+	LINK_MONO_ADDINS='-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll         \
+			  -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll    \
+			  -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll'
+])
+AC_SUBST(DIR_ADDINS)
+AC_SUBST(DIR_ADDINS_ADDINS)
+AC_SUBST(DIR_ADDINS_SETUP)
+AC_SUBST(DIR_ADDINS_GUI)
+AC_SUBST(LINK_MONO_ADDINS)
+
 dnl -- dbus-sharp: link or bundle ?
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 [
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6d69f9..d0b9a6c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
-	mono-addins			\
 	semweb				\
 	Tao
 
@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
 SUBDIRS = 				\
 	$(DIR_DBUS)			\
 	$(DIR_DBUS_GLIB)	\
+	$(DIR_ADDINS)	\
 	$(UNCONDITIONAL_SUBDIRS)
 
 DIST_SUBDIRS = 			\
 	dbus-sharp			\
 	dbus-sharp-glib		\
+	mono-addins		\
 	dpap-sharp			\
 	$(UNCONDITIONAL_SUBDIRS)
 
-- 
1.6.0.6


0001-use-the-correct-stock-icon.patch:
 ImportCommand.cs |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-use-the-correct-stock-icon.patch ---
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index d4a9e23..a47015e 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -256,7 +256,7 @@ public class ImportCommand : GladeDialog
 				}
 			} else {
 				ImportSource source = new BrowseSource (Catalog.GetString ("(No Cameras Detected)"),
-									"emblem-camera");
+									"camera-photo");
 				item = new SourceItem (source);
 				item.Activated += HandleActivated;
 				item.Sensitive = false;
-- 
1.6.0.6


0002-enhance-the-f-spot-import-script.patch:
 f-spot-import |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

--- NEW FILE 0002-enhance-the-f-spot-import-script.patch ---
diff --git a/tools/f-spot-import b/tools/f-spot-import
index 98385b1..34facc0 100755
--- a/tools/f-spot-import
+++ b/tools/f-spot-import
@@ -3,22 +3,46 @@
 udi="$1"
 #xmessage $udi
 
+# check for gvfs mount point using gphoto2
+gvfsuri=`gvfs-ls -c "$udi/"`
+if [ "${gvfsuri:0:10}" = "gphoto2://" ] ; then
+	if [ "${gvfsuri:11:4}" = "usb:" ] ; then
+		# Yield for f-spot since it wants to access the device directly
+		#
+		# Rewrite the uri to something f-spot can handle
+		#
+		bus="${gvfsuri:15:3}"
+		dev="${gvfsuri:19:3}"
+
+		uri="gphoto2:usb:$bus,$dev"
+
+		gvfs-mount --unmount-scheme gphoto2
+		f-spot --import "$uri"
+		exit
+	fi
+	# mounted via gphoto2 not using USB, stay with the plain directory
+	f-spot --import "$udi"
+	exit
+fi
+
 if [ "$udi" != "${udi#gphoto2:}" ]; then
 	# gphoto2, as passed by gvfs/nautilus
 	gvfs-mount -u "$udi" || true
 	f-spot --import "$udi"
 	exit
 fi
-mnt=${udi#file://}
-if [ "$udi" != "$mnt" ]; then
+
+if [ "$udi" != "${udi#file://}" ]; then
 	# mount point, as passed by gvfs/nautilus.
 	f-spot --import "$udi"
 	exit
 fi
+
 mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true
 if [ -n "$mount_point" ]; then
 	# USB Mass Storage camera: need to pass f-spot a mount point
 	f-spot --import "$mount_point"
+	exit
 else
 	# Some other camera try GPhoto2
 
@@ -27,4 +51,6 @@ else
 	uri=`printf gphoto2:[usb:%.3d,%.3d] $bus $dev`
 
 	f-spot --import "$uri"
+	exit
 fi
+xmessage "f-spot-import can't handle UDI: \"$udi\""
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Dec 2008 17:49:40 -0000	1.20
+++ .cvsignore	9 Aug 2009 15:42:14 -0000	1.21
@@ -1 +1 @@
-f-spot-0.5.0.3.tar.bz2
+f-spot-0.6.0.0.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- f-spot.spec	1 Jun 2009 16:27:19 -0000	1.88
+++ f-spot.spec	9 Aug 2009 15:42:14 -0000	1.89
@@ -1,18 +1,18 @@
 Name:           f-spot
-Version:        0.5.0.3
-Release:        9%{?dist}
+Version:        0.6.0.0
+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://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
+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=591223
+Patch1:         0001-use-the-correct-stock-icon.patch
 # Use system mono-addins
-Patch3:		f-spot-0.4.4-link-system-mono-addins.patch
-# fix a missing icon
-Patch4:		missing-icon.patch
+Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
-Patch5:		gvfs-gphoto.patch
+Patch3:         0002-enhance-the-f-spot-import-script.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -22,6 +22,7 @@ BuildRequires:  gtk2-devel mono-devel li
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel gtk-sharp2-gapi
 BuildRequires:  gettext
 BuildRequires:  autoconf, automake, libtool, intltool
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  gnome-doc-utils
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  mono-addins-devel
@@ -29,6 +30,9 @@ BuildRequires:  desktop-file-utils
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
+Requires:       hicolor-icon-theme 
+Requires:       gnome-screensaver
+Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -49,32 +53,25 @@ sorting and tagging of digital images.
 %prep
 %setup -q
 
-# preserve timestamps
-touch -r configure.in configure.in.stamp
-
-%patch3 -p1 -b .link-system-mono-addins
-%patch4 -p1 -b .missing-icon
-%patch5 -p1 -b .gvfs-gphoto
-
-# restore timestamps
-touch -r configure.in.stamp configure.in
+%patch1 -p1 -b .missing-icon
+%patch2 -p1 -b .link-system-mono-addins
+%patch3 -p1 -b .gvfs-gphoto
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
+autoreconf -f -i
 %configure --disable-scrollkeeper
-make
-
+# parallel build broken in 0.6.0.0, try again with next release
+make # %{?_smp_mflags}
 
 %install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 rm -rf $RPM_BUILD_ROOT
+export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
-# Will need to be removed at some point...
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gio-sharp-unstable.pc
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll
@@ -91,37 +88,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+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 || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome/help/f-spot
+%{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/icons/hicolor/*/*/*.svg
-%{_datadir}/f-spot
-%{_libdir}/f-spot
+%{_datadir}/f-spot/
+%{_libdir}/f-spot/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot
-# GIO is currently provided in f-spot only, so this'll need to be removed sometime in the future
-%{_libdir}/gio-sharp-unstable
+%{_datadir}/omf/f-spot/
 
 %changelog
+* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
+- Update to new upstream version 0.6.0.0
+- Cleanup spec file
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.5.0.3-9
 - Build arch ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Dec 2008 17:49:40 -0000	1.20
+++ sources	9 Aug 2009 15:42:14 -0000	1.21
@@ -1 +1 @@
-52db86f1dc715a3958425aa3d006c900  f-spot-0.5.0.3.tar.bz2
+9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2



From rdieter at fedoraproject.org  Sun Aug  9 15:43:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 15:43:27 +0000 (UTC)
Subject: rpms/qscintilla/F-11 qscintilla.spec,1.27,1.28
Message-ID: <20090809154327.57F1811C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10687

Modified Files:
	qscintilla.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
- include designer plugin in main pkg, Obsoletes: qscintilla-designer



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/qscintilla.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- qscintilla.spec	8 Aug 2009 20:59:28 -0000	1.27
+++ qscintilla.spec	9 Aug 2009 15:43:27 -0000	1.28
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -18,6 +18,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # TODO: upstream this
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
+Obsoletes: qscintilla-designer < 2.4-3
+Provides:  qscintilla-designer = %{version}-%{release}
+
 BuildRequires:  qt4-devel
 
 # for -python
@@ -34,15 +37,6 @@ QScintilla is a port of Scintilla to the
 
 %{?scintilla_ver:This version of QScintilla is based on Scintilla v%{scintilla_ver}.}
 
-
-%package designer
-Summary:  QScintilla designer plugin 
-Group:    Development/Tools
-Requires: %{name} = %{version}-%{release}
-Requires: qt4-designer
-%description designer
-%{summary}.
-
 %package devel
 Summary:  QScintilla Development Files
 Group:    Development/Libraries
@@ -131,13 +125,10 @@ rm -rf %{buildroot}
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
 %{_qt4_libdir}/libqscintilla2.so.5*
+%{_qt4_plugindir}/designer/libqscintillaplugin.so
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
-%files designer
-%defattr(-,root,root,-)
-%{_qt4_plugindir}/designer/libqscintillaplugin.so
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
@@ -156,6 +147,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
+- include designer plugin in main pkg, Obsoletes: qscintilla-designer
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
 - QScintilla-gpl-2.4
 



From rdieter at fedoraproject.org  Sun Aug  9 15:44:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 15:44:43 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim.spec,1.219,1.220
Message-ID: <20090809154443.6287E11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10981

Modified Files:
	kdepim.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- -libs: move designer plugins here
- %check: desktop-file-validate
- don't own %{_kde4_appsdir}/kconf_update/



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdepim.spec	5 Aug 2009 13:06:18 -0000	1.219
+++ kdepim.spec	9 Aug 2009 15:44:43 -0000	1.220
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,7 +22,7 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 
 # Upgrade path
 %if 0%{?fedora} < 12
-Requires: kdepim-runtime >= %{version}
+Requires: kdepim-runtime%{?_isa} >= %{version}
 %endif
 
 BuildRequires: akonadi-devel
@@ -73,7 +73,7 @@ Requires(hint): spambayes
 Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdepim4-devel = %{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -124,6 +124,12 @@ done
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -161,8 +167,28 @@ rm -rf %{buildroot}
 %endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
-%{_kde4_datadir}/applications/kde4/*
-%{_kde4_appsdir}/*
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/akregator/
+%{_kde4_appsdir}/kaddressbook/
+%{_kde4_appsdir}/kalarm/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kdepimwidgets/
+%{_kde4_appsdir}/kjots/
+%{_kde4_appsdir}/kleopatra/
+%{_kde4_appsdir}/kmail/
+%{_kde4_appsdir}/kmailcvt/
+%{_kde4_appsdir}/knode/
+%{_kde4_appsdir}/knotes/
+%{_kde4_appsdir}/konsolekalendar/
+%{_kde4_appsdir}/kontact/
+%{_kde4_appsdir}/kontactsummary/
+%{_kde4_appsdir}/korgac/
+%{_kde4_appsdir}/korganizer/
+%{_kde4_appsdir}/kpilot/
+%{_kde4_appsdir}/ktimetracker/
+%{_kde4_appsdir}/kwatchgnupg/
+%{_kde4_appsdir}/libkdepim/
+%{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
@@ -176,6 +202,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/kde4/plugins/designer/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -184,10 +211,14 @@ rm -rf %{buildroot}
 %if 0%{?_with_pilot_link:1}
 %exclude %{_kde4_libdir}/libkpilot_*.so
 %endif
-%{_kde4_libdir}/kde4/plugins/designer/*
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- -libs: move designer plugins here
+- %%check: desktop-file-validate
+- don't own %%{_kde4_appsdir}/kconf_update/
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Sun Aug  9 15:46:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 15:46:56 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.179,1.180
Message-ID: <20090809154656.3B4E711C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12122

Modified Files:
	kdeedu.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
- -libs: move libavogadro-kalzium libcompoundviewer here
- new -marble-libs pkg



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- kdeedu.spec	5 Aug 2009 02:53:21 -0000	1.179
+++ kdeedu.spec	9 Aug 2009 15:46:55 -0000	1.180
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -92,8 +92,7 @@ Group:   System Environment/Libraries
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# libmarble
-Requires: %{name}-marble%{?_isa} = %{version}-%{release}
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -114,12 +113,12 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %package marble
 Summary: A World Atlas
 Group:   Amusements/Games
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
+# multilib, when marble-libs was introduced
+Obsoletes: %{name}-marble < 4.3.0-3
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't
-# strictly required.
-#Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
@@ -127,6 +126,13 @@ Provides:  marble = 1:0.7-%{release}
 %description marble
 %{summary}.
 
+%package marble-libs
+Summary: Runtime libraries for marble 
+Group:   System Environment/Libraries
+Requires: %{name}-marble = %{version}-%{release}
+%description marble-libs
+%{summary}.
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -297,8 +303,6 @@ rm -rf %{buildroot}
 
 # kalzium
 %{_kde4_libdir}/avogadro-kalzium/
-%{_kde4_libdir}/libavogadro-kalzium.so.*
-%{_kde4_libdir}/libcompoundviewer.so.*
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -369,10 +373,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/libkdeedu*.so.*
-%{_kde4_libdir}/libkeduvocdocument.so.*
-%{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libscience.so.*
+%{_kde4_libdir}/libavogadro-kalzium.so.0*
+%{_kde4_libdir}/libcompoundviewer.so.4*
+%{_kde4_libdir}/libkdeeduui.so.4*
+%{_kde4_libdir}/libkeduvocdocument.so.4*
+%{_kde4_libdir}/libkiten.so.4*
+%{_kde4_libdir}/libscience.so.4*
 # needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
@@ -460,6 +466,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
+- -libs: move libavogadro-kalzium libcompoundviewer here
+- new -marble-libs pkg
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - move kalziumuiwidgets.so designer plugin to -libs
 - tighten -libs deps using %%?_isa



From ensc at fedoraproject.org  Sun Aug  9 15:48:29 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 15:48:29 +0000 (UTC)
Subject: rpms/kismet/devel kismet.spec,1.27,1.28
Message-ID: <20090809154829.D9F5211C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494

Modified Files:
	kismet.spec 
Log Message:
- added Obsoletes: entry for old -extras subpackage


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- kismet.spec	9 Aug 2009 15:37:46 -0000	1.27
+++ kismet.spec	9 Aug 2009 15:48:29 -0000	1.28
@@ -10,7 +10,7 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 0
+Release:	%release_func 1
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
@@ -30,6 +30,8 @@ BuildRequires:	libpcap-devel pcre-devel
 BuildRequires:	openssl-devel libcap-devel libnl-devel
 Requires:	usermode
 
+Obsoletes:	kismet-extras < 0.0.2009.06.R1
+
 # HACK: work around https://fedorahosted.org/usermode/ticket/1
 Source50:	kismet_capture_wrap.c
 BuildRequires:	dietlibc
@@ -152,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.06.R1-1
+- added Obsoletes: entry for old -extras subpackage
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.06.R1-0
 - updated to 2009-06-R1
 - reworked large parts of the package due to major upstream changes:



From chitlesh at fedoraproject.org  Sun Aug  9 15:54:16 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  9 Aug 2009 15:54:16 +0000 (UTC)
Subject: rpms/ngspice/devel ngspice-rework-19.memusage_warning.patch, NONE, 
	1.1 ngspice-xcircuit_bridge.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 ngspice.spec, 1.18, 1.19 sources, 1.3,
	1.4 ngspice-18-help.patch, 1.1, NONE
Message-ID: <20090809155416.EC81211C00D7@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13819/devel

Modified Files:
	.cvsignore import.log ngspice.spec sources 
Added Files:
	ngspice-rework-19.memusage_warning.patch 
	ngspice-xcircuit_bridge.patch 
Removed Files:
	ngspice-18-help.patch 
Log Message:
rework 19 and tclspice

ngspice-rework-19.memusage_warning.patch:
 resource.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ngspice-rework-19.memusage_warning.patch ---
--- src/frontend/resource.c	2009-04-17 23:59:05.000000000 +0200
+++ resource.c	2009-08-08 20:52:02.658775378 +0200
@@ -1,7 +1,7 @@
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
-$Id: resource.c,v 1.31 2009/04/17 21:59:05 h_vogt Exp $
+$Id: resource.c,v 1.32 2009/08/08 17:38:23 pnenzi Exp $
 **********/
 
 /*
@@ -549,7 +549,7 @@
 #endif /*_WIN32_WINNT 0x0500*/
 #else
    FILE *fp;
-   char buffer[1024];
+   char buffer[2048];
    size_t bytes_read;
    char *match;
    long mem_got;

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ngspice-xcircuit_bridge.patch ---
--- src/main.c	2009-04-12 23:08:18.000000000 +0200
+++ main.c	2009-08-01 14:10:46.785485894 +0200
@@ -566,6 +566,7 @@
        "  -i, --interactive         run in interactive mode\n"
        "  -n, --no-spiceinit        don't load the local or user's config file\n"
        "  -o, --output=FILE         set the outputfile\n"
+       "  -p, --pipe                run in I/O pipe mode\n"
        "  -q, --completion          activate command completion\n"
        "  -r, --rawfile=FILE        set the rawfile output\n"             
        "  -s, --server              run spice as a server process\n"
@@ -772,6 +773,7 @@
             {"interactive", 0, 0, 'i'},
             {"no-spiceinit", 0, 0, 'n'},
             {"output", 1, 0, 'o'},
+            {"pipe", 0, 0, 'p'},
             {"completion", 0, 0, 'q'},
             {"rawfile", 1, 0, 'r'},
             {"server", 0, 0, 's'},
@@ -779,7 +781,7 @@
             {0, 0, 0, 0}
         };
 
-        c = getopt_long (argc, argv, "hvbac:ihno:qr:st:",
+        c = getopt_long (argc, argv, "hvbac:ihno:pqr:st:",
              long_options, &option_index);
         if (c == -1)
             break;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 22:45:15 -0000	1.3
+++ .cvsignore	9 Aug 2009 15:54:16 -0000	1.4
@@ -1 +1 @@
-ng-spice-rework-18.tar.gz
+ng-spice-rework-19.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Feb 2009 23:54:48 -0000	1.2
+++ import.log	9 Aug 2009 15:54:16 -0000	1.3
@@ -1,2 +1,3 @@
 ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
+ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ngspice.spec	25 Jul 2009 19:20:50 -0000	1.18
+++ ngspice.spec	9 Aug 2009 15:54:16 -0000	1.19
@@ -1,16 +1,21 @@
 Name:              ngspice
-Version:           18
-Release:           3%{?dist}
+Version:           19
+Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
 Group:             Applications/Engineering
 URL:               http://%{name}.sourceforge.net/
 
-Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            ngspice-18-help.patch
+# Ensuring interoperability with xcircuit via Tcl
+Patch0:            %{name}-xcircuit_bridge.patch
+Patch1:            %{name}-rework-19.memusage_warning.patch
+
+Requires(post):    /sbin/install-info
+Requires(preun):   /sbin/install-info
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
@@ -37,11 +42,11 @@ develop their own models for devices usi
 
 It could be used for VLSI simulations as well.
 
+
 %package doc
 Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
 Group:             Documentation
-Requires:          ngspice = %{version}
-
+Requires:          ngspice = %{version}-%{release}
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
@@ -50,52 +55,134 @@ This package contains the documentation 
 and info format.
 
 
+%package -n        tclspice
+Summary:           Tcl/Tk interface for ngspice
+Group:             Applications/Engineering
+BuildRequires:     tk-devel
+BuildRequires:     blt-devel
+
+%description -n    tclspice
+TclSpice is an improved version of Berkeley Spice designed to be used with
+the  Tcl/Tk scripting language. The project is based upon the NG-Spice source
+code base with many improvements.
+
 %prep
-%setup -q -n ng-spice-rework-%{version}
+%setup -q
 
-%patch0 -p0 -b .help
+%patch0 -p0 -b .xcircuit
+%patch1 -p0 -b .mem
+
+# make sure the examples are UTF-8...
+for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
+               examples/tclspice/tcl-testbench1/testCapa.cir \
+               examples/tclspice/tcl-testbench1/capa.cir ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
+# rpmlint warnings
+find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';'
+find src/ -type f -name "*.c" -exec chmod -x  {} ';'
+find src/ -type f -name "*.h" -exec chmod -x  {} ';'
 
-%build
 %ifarch x86_64 sparc64 ppc64 amd64
-%{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | sed \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
-> src/spinit.in
+sed -i "s|@XSPICEINIT@ codemodel @prefix@/lib|@XSPICEINIT@ codemodel %{_libdir}|" \
+src/spinit.in
 %endif
 
-#./autogen.sh
+# Fix Tclspice's examples
+sed -i \
+"s|load \"../../../src/.libs/libspice.so\"|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|load ../../../src/.libs/libspice.so|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
+examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%configure              \
-    --enable-xgraph     \
-    --enable-xspice     \
-%ifarch x86_64 sparc64 ppc64 amd64
-  --enable-libsuffix=64 \
-%endif
+%build
 
-# make in xgraph with another flag first so
-# that we can correctly use Fedora compiler flags.
-( cd xgraph ; %{__make} \
-   ADDITIONAL_INCLUDES="$RPM_OPT_FLAGS" %{?_smp_mflags} )
 
-%{__make} %{?_smp_mflags}
+# ---- Tclspice ----------------------------------------------------------------
+# Adding BLT support
+export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+
+# Make builddir for tclspice
+%{__mkdir} -p tclspice
+%{__cp} -Rl `ls . | grep -v tclspice` tclspice
+
+# Configure tclspice
+cd tclspice
+sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define NGSPICEDATADIR \"\`echo %{_libdir}/tclspice\`\"|" configure*
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --with-tcl=%{_libdir}/tcl8.5/ \
+    --libdir=%{_libdir}/tclspice
+
+%{__make}
+cd ..
+# ------------------------------------------------------------------------------
+
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --libdir=%{_libdir}
 
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-#chmod 644 src/xspice/*/*.{c,h,l,y}
-#chmod 644 src/frontend/*.{c,h}
-#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
-%{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
+# ---- Tclspice ----------------------------------------------------------------
+# Tclspice : Make install
+cd tclspice
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
+cd ..
+
+%{__rm} -rf %{buildroot}%{_libdir}/tclspice/libspice.la
+# ------------------------------------------------------------------------------
+
+
+# Ensuring that all docs are under %%{_docdir}/%%{name}-%%{version}/
+rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr doc/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr Stuarts_Poly_Notes FAQ DEVICES ANALYSES %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr AUTHORS COPYING README BUGS ChangeLog NEWS %{buildroot}%{_docdir}/%{name}-%{version}/
+
+
+# pull as debuginfo
+chmod +x %{buildroot}%{_libdir}/spice/*.cm
 
-#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+%{__rm} -rf %{buildroot}%{_datadir}/info/dir
+
+%check
+#make check
 
 
 %clean
@@ -110,31 +197,31 @@ cat src/spinit.in.ngspice | sed \
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README BUGS ChangeLog NEWS
-%{_bindir}/cmpp
-%{_bindir}/ngmakeidx
-%{_bindir}/ngmultidec
-%{_bindir}/ngnutmeg
-%{_bindir}/ngproc2mod
-%{_bindir}/ngsconvert
-%{_bindir}/%{name}
-%{_bindir}/xgraph
-%{_datadir}/ng-spice-rework/
+%{_bindir}/*
+%{_datadir}/%{name}/
 %{_libdir}/spice/
-%{_mandir}/man1/ngnutmeg.1.*
-%{_mandir}/man1/ngsconvert.1.*
-%{_mandir}/man1/ngmultidec.1.*
-%{_mandir}/man1/%{name}.1.*
-%{_mandir}/manm/xgraph.man.*
+%{_mandir}/man1/*
+
+
+%files -n tclspice
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%{_libdir}/tclspice/
 
 
 %files doc
 %defattr(-, root, root, -)
+%exclude %doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%doc %{_docdir}/%{name}-%{version}/
 %{_infodir}/ngspice.info*.*
-%doc examples/ doc/
-%doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
-%Changelog
+
+%changelog
+* Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
+- new upstream release
+- RHBZ #514484 A Long Warning Message (patched)
+- RHBZ #511695 FTBFS ngspice-18-2.fc11
+
 * Sat Feb 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-2
 - x11 windows (help and plot) fixes #RHBZ 481525
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 22:45:15 -0000	1.3
+++ sources	9 Aug 2009 15:54:16 -0000	1.4
@@ -1 +1 @@
-3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz
+52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz


--- ngspice-18-help.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Aug  9 15:55:22 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  9 Aug 2009 15:55:22 +0000 (UTC)
Subject: rpms/ngspice/F-11 ngspice-rework-19.memusage_warning.patch, NONE,
	1.1 ngspice-xcircuit_bridge.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 ngspice.spec, 1.17, 1.18 sources, 1.3,
	1.4 ngspice-18-help.patch, 1.1, NONE
Message-ID: <20090809155522.C9BDF11C00D7@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14193/F-11

Modified Files:
	.cvsignore import.log ngspice.spec sources 
Added Files:
	ngspice-rework-19.memusage_warning.patch 
	ngspice-xcircuit_bridge.patch 
Removed Files:
	ngspice-18-help.patch 
Log Message:
rework 19 and tclspice

ngspice-rework-19.memusage_warning.patch:
 resource.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ngspice-rework-19.memusage_warning.patch ---
--- src/frontend/resource.c	2009-04-17 23:59:05.000000000 +0200
+++ resource.c	2009-08-08 20:52:02.658775378 +0200
@@ -1,7 +1,7 @@
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
-$Id: resource.c,v 1.31 2009/04/17 21:59:05 h_vogt Exp $
+$Id: resource.c,v 1.32 2009/08/08 17:38:23 pnenzi Exp $
 **********/
 
 /*
@@ -549,7 +549,7 @@
 #endif /*_WIN32_WINNT 0x0500*/
 #else
    FILE *fp;
-   char buffer[1024];
+   char buffer[2048];
    size_t bytes_read;
    char *match;
    long mem_got;

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ngspice-xcircuit_bridge.patch ---
--- src/main.c	2009-04-12 23:08:18.000000000 +0200
+++ main.c	2009-08-01 14:10:46.785485894 +0200
@@ -566,6 +566,7 @@
        "  -i, --interactive         run in interactive mode\n"
        "  -n, --no-spiceinit        don't load the local or user's config file\n"
        "  -o, --output=FILE         set the outputfile\n"
+       "  -p, --pipe                run in I/O pipe mode\n"
        "  -q, --completion          activate command completion\n"
        "  -r, --rawfile=FILE        set the rawfile output\n"             
        "  -s, --server              run spice as a server process\n"
@@ -772,6 +773,7 @@
             {"interactive", 0, 0, 'i'},
             {"no-spiceinit", 0, 0, 'n'},
             {"output", 1, 0, 'o'},
+            {"pipe", 0, 0, 'p'},
             {"completion", 0, 0, 'q'},
             {"rawfile", 1, 0, 'r'},
             {"server", 0, 0, 's'},
@@ -779,7 +781,7 @@
             {0, 0, 0, 0}
         };
 
-        c = getopt_long (argc, argv, "hvbac:ihno:qr:st:",
+        c = getopt_long (argc, argv, "hvbac:ihno:pqr:st:",
              long_options, &option_index);
         if (c == -1)
             break;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 22:45:15 -0000	1.3
+++ .cvsignore	9 Aug 2009 15:55:22 -0000	1.4
@@ -1 +1 @@
-ng-spice-rework-18.tar.gz
+ng-spice-rework-19.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Feb 2009 23:54:48 -0000	1.2
+++ import.log	9 Aug 2009 15:55:22 -0000	1.3
@@ -1,2 +1,3 @@
 ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
+ngspice-19-1_fc11:F-11:ngspice-19-1.fc11.src.rpm:1249833216


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/ngspice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ngspice.spec	24 Feb 2009 21:33:27 -0000	1.17
+++ ngspice.spec	9 Aug 2009 15:55:22 -0000	1.18
@@ -1,16 +1,21 @@
 Name:              ngspice
-Version:           18
-Release:           2%{?dist}
+Version:           19
+Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
 Group:             Applications/Engineering
 URL:               http://%{name}.sourceforge.net/
 
-Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            ngspice-18-help.patch
+# Ensuring interoperability with xcircuit via Tcl
+Patch0:            %{name}-xcircuit_bridge.patch
+Patch1:            %{name}-rework-19.memusage_warning.patch
+
+Requires(post):    /sbin/install-info
+Requires(preun):   /sbin/install-info
 
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
@@ -37,11 +42,11 @@ develop their own models for devices usi
 
 It could be used for VLSI simulations as well.
 
+
 %package doc
 Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
 Group:             Documentation
-Requires:          ngspice = %{version}
-
+Requires:          ngspice = %{version}-%{release}
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
@@ -50,52 +55,134 @@ This package contains the documentation 
 and info format.
 
 
+%package -n        tclspice
+Summary:           Tcl/Tk interface for ngspice
+Group:             Applications/Engineering
+BuildRequires:     tk-devel
+BuildRequires:     blt-devel
+
+%description -n    tclspice
+TclSpice is an improved version of Berkeley Spice designed to be used with
+the  Tcl/Tk scripting language. The project is based upon the NG-Spice source
+code base with many improvements.
+
 %prep
-%setup -q -n ng-spice-rework-%{version}
+%setup -q
 
-%patch0 -p0 -b .help
+%patch0 -p0 -b .xcircuit
+%patch1 -p0 -b .mem
+
+# make sure the examples are UTF-8...
+for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
+               examples/tclspice/tcl-testbench1/testCapa.cir \
+               examples/tclspice/tcl-testbench1/capa.cir ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
+# rpmlint warnings
+find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';'
+find src/ -type f -name "*.c" -exec chmod -x  {} ';'
+find src/ -type f -name "*.h" -exec chmod -x  {} ';'
 
-%build
 %ifarch x86_64 sparc64 ppc64 amd64
-%{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | sed \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
-> src/spinit.in
+sed -i "s|@XSPICEINIT@ codemodel @prefix@/lib|@XSPICEINIT@ codemodel %{_libdir}|" \
+src/spinit.in
 %endif
 
-#./autogen.sh
+# Fix Tclspice's examples
+sed -i \
+"s|load \"../../../src/.libs/libspice.so\"|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|load ../../../src/.libs/libspice.so|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
+examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%configure              \
-    --enable-xgraph     \
-    --enable-xspice     \
-%ifarch x86_64 sparc64 ppc64 amd64
-  --enable-libsuffix=64 \
-%endif
+%build
 
-# make in xgraph with another flag first so
-# that we can correctly use Fedora compiler flags.
-( cd xgraph ; %{__make} \
-   ADDITIONAL_INCLUDES="$RPM_OPT_FLAGS" %{?_smp_mflags} )
 
-%{__make} %{?_smp_mflags}
+# ---- Tclspice ----------------------------------------------------------------
+# Adding BLT support
+export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+
+# Make builddir for tclspice
+%{__mkdir} -p tclspice
+%{__cp} -Rl `ls . | grep -v tclspice` tclspice
+
+# Configure tclspice
+cd tclspice
+sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define NGSPICEDATADIR \"\`echo %{_libdir}/tclspice\`\"|" configure*
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --with-tcl=%{_libdir}/tcl8.5/ \
+    --libdir=%{_libdir}/tclspice
+
+%{__make}
+cd ..
+# ------------------------------------------------------------------------------
+
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --libdir=%{_libdir}
 
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-#chmod 644 src/xspice/*/*.{c,h,l,y}
-#chmod 644 src/frontend/*.{c,h}
-#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
-%{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
+# ---- Tclspice ----------------------------------------------------------------
+# Tclspice : Make install
+cd tclspice
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
+cd ..
+
+%{__rm} -rf %{buildroot}%{_libdir}/tclspice/libspice.la
+# ------------------------------------------------------------------------------
+
+
+# Ensuring that all docs are under %%{_docdir}/%%{name}-%%{version}/
+rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr doc/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr Stuarts_Poly_Notes FAQ DEVICES ANALYSES %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr AUTHORS COPYING README BUGS ChangeLog NEWS %{buildroot}%{_docdir}/%{name}-%{version}/
+
+
+# pull as debuginfo
+chmod +x %{buildroot}%{_libdir}/spice/*.cm
 
-#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+%{__rm} -rf %{buildroot}%{_datadir}/info/dir
+
+%check
+#make check
 
 
 %clean
@@ -110,31 +197,31 @@ cat src/spinit.in.ngspice | sed \
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README BUGS ChangeLog NEWS
-%{_bindir}/cmpp
-%{_bindir}/ngmakeidx
-%{_bindir}/ngmultidec
-%{_bindir}/ngnutmeg
-%{_bindir}/ngproc2mod
-%{_bindir}/ngsconvert
-%{_bindir}/%{name}
-%{_bindir}/xgraph
-%{_datadir}/ng-spice-rework/
+%{_bindir}/*
+%{_datadir}/%{name}/
 %{_libdir}/spice/
-%{_mandir}/man1/ngnutmeg.1.*
-%{_mandir}/man1/ngsconvert.1.*
-%{_mandir}/man1/ngmultidec.1.*
-%{_mandir}/man1/%{name}.1.*
-%{_mandir}/manm/xgraph.man.*
+%{_mandir}/man1/*
+
+
+%files -n tclspice
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%{_libdir}/tclspice/
 
 
 %files doc
 %defattr(-, root, root, -)
+%exclude %doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%doc %{_docdir}/%{name}-%{version}/
 %{_infodir}/ngspice.info*.*
-%doc examples/ doc/
-%doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
-%Changelog
+
+%changelog
+* Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
+- new upstream release
+- RHBZ #514484 A Long Warning Message (patched)
+- RHBZ #511695 FTBFS ngspice-18-2.fc11
+
 * Sat Feb 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-2
 - x11 windows (help and plot) fixes #RHBZ 481525
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 22:45:15 -0000	1.3
+++ sources	9 Aug 2009 15:55:22 -0000	1.4
@@ -1 +1 @@
-3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz
+52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz


--- ngspice-18-help.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Aug  9 15:57:02 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  9 Aug 2009 15:57:02 +0000 (UTC)
Subject: rpms/ngspice/F-10 ngspice-rework-19.memusage_warning.patch, NONE,
	1.1 ngspice-xcircuit_bridge.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.1, 1.2 ngspice.spec, 1.15, 1.16 sources, 1.3, 1.4
Message-ID: <20090809155702.243A111C00D7@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14701/F-10

Modified Files:
	.cvsignore import.log ngspice.spec sources 
Added Files:
	ngspice-rework-19.memusage_warning.patch 
	ngspice-xcircuit_bridge.patch 
Log Message:
rework 19 and tclspice

ngspice-rework-19.memusage_warning.patch:
 resource.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ngspice-rework-19.memusage_warning.patch ---
--- src/frontend/resource.c	2009-04-17 23:59:05.000000000 +0200
+++ resource.c	2009-08-08 20:52:02.658775378 +0200
@@ -1,7 +1,7 @@
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
-$Id: resource.c,v 1.31 2009/04/17 21:59:05 h_vogt Exp $
+$Id: resource.c,v 1.32 2009/08/08 17:38:23 pnenzi Exp $
 **********/
 
 /*
@@ -549,7 +549,7 @@
 #endif /*_WIN32_WINNT 0x0500*/
 #else
    FILE *fp;
-   char buffer[1024];
+   char buffer[2048];
    size_t bytes_read;
    char *match;
    long mem_got;

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ngspice-xcircuit_bridge.patch ---
--- src/main.c	2009-04-12 23:08:18.000000000 +0200
+++ main.c	2009-08-01 14:10:46.785485894 +0200
@@ -566,6 +566,7 @@
        "  -i, --interactive         run in interactive mode\n"
        "  -n, --no-spiceinit        don't load the local or user's config file\n"
        "  -o, --output=FILE         set the outputfile\n"
+       "  -p, --pipe                run in I/O pipe mode\n"
        "  -q, --completion          activate command completion\n"
        "  -r, --rawfile=FILE        set the rawfile output\n"             
        "  -s, --server              run spice as a server process\n"
@@ -772,6 +773,7 @@
             {"interactive", 0, 0, 'i'},
             {"no-spiceinit", 0, 0, 'n'},
             {"output", 1, 0, 'o'},
+            {"pipe", 0, 0, 'p'},
             {"completion", 0, 0, 'q'},
             {"rawfile", 1, 0, 'r'},
             {"server", 0, 0, 's'},
@@ -779,7 +781,7 @@
             {0, 0, 0, 0}
         };
 
-        c = getopt_long (argc, argv, "hvbac:ihno:qr:st:",
+        c = getopt_long (argc, argv, "hvbac:ihno:pqr:st:",
              long_options, &option_index);
         if (c == -1)
             break;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 22:43:46 -0000	1.3
+++ .cvsignore	9 Aug 2009 15:57:01 -0000	1.4
@@ -1 +1 @@
-ng-spice-rework-18.tar.gz
+ng-spice-rework-19.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	11 Jan 2009 22:43:46 -0000	1.1
+++ import.log	9 Aug 2009 15:57:01 -0000	1.2
@@ -1 +1,2 @@
 ngspice-18-1_fc10:F-10:ngspice-18-1.fc10.src.rpm:1231713752
+ngspice-19-1_fc11:F-10:ngspice-19-1.fc11.src.rpm:1249833276


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/ngspice.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ngspice.spec	11 Jan 2009 22:43:46 -0000	1.15
+++ ngspice.spec	9 Aug 2009 15:57:01 -0000	1.16
@@ -1,5 +1,5 @@
 Name:              ngspice
-Version:           18
+Version:           19
 Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
@@ -7,9 +7,16 @@ License:           BSD
 Group:             Applications/Engineering
 URL:               http://%{name}.sourceforge.net/
 
-Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Ensuring interoperability with xcircuit via Tcl
+Patch0:            %{name}-xcircuit_bridge.patch
+Patch1:            %{name}-rework-19.memusage_warning.patch
+
+Requires(post):    /sbin/install-info
+Requires(preun):   /sbin/install-info
+
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -35,11 +42,11 @@ develop their own models for devices usi
 
 It could be used for VLSI simulations as well.
 
+
 %package doc
 Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
 Group:             Documentation
-Requires:          ngspice = %{version}
-
+Requires:          ngspice = %{version}-%{release}
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
@@ -48,49 +55,134 @@ This package contains the documentation 
 and info format.
 
 
+%package -n        tclspice
+Summary:           Tcl/Tk interface for ngspice
+Group:             Applications/Engineering
+BuildRequires:     tk-devel
+BuildRequires:     blt-devel
+
+%description -n    tclspice
+TclSpice is an improved version of Berkeley Spice designed to be used with
+the  Tcl/Tk scripting language. The project is based upon the NG-Spice source
+code base with many improvements.
+
 %prep
-%setup -q -n ng-spice-rework-%{version}
+%setup -q
 
+%patch0 -p0 -b .xcircuit
+%patch1 -p0 -b .mem
 
-%build
-%ifarch x86_64 sparc64 ppc64 amd64
-%{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | sed \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
-> src/spinit.in
-%endif
+# make sure the examples are UTF-8...
+for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
+               examples/tclspice/tcl-testbench1/testCapa.cir \
+               examples/tclspice/tcl-testbench1/capa.cir ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
+# rpmlint warnings
+find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';'
+find src/ -type f -name "*.c" -exec chmod -x  {} ';'
+find src/ -type f -name "*.h" -exec chmod -x  {} ';'
 
-%configure              \
-    --enable-xgraph     \
-    --enable-xspice     \
 %ifarch x86_64 sparc64 ppc64 amd64
-  --enable-libsuffix=64 \
+sed -i "s|@XSPICEINIT@ codemodel @prefix@/lib|@XSPICEINIT@ codemodel %{_libdir}|" \
+src/spinit.in
 %endif
 
-# make in xgraph with another flag first so
-# that we can correctly use Fedora compiler flags.
-( cd xgraph ; %{__make} \
-   ADDITIONAL_INCLUDES="$RPM_OPT_FLAGS" %{?_smp_mflags} )
+# Fix Tclspice's examples
+sed -i \
+"s|load \"../../../src/.libs/libspice.so\"|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|load ../../../src/.libs/libspice.so|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
+examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__make} %{?_smp_mflags}
+%build
 
 
+# ---- Tclspice ----------------------------------------------------------------
+# Adding BLT support
+export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+
+# Make builddir for tclspice
+%{__mkdir} -p tclspice
+%{__cp} -Rl `ls . | grep -v tclspice` tclspice
+
+# Configure tclspice
+cd tclspice
+sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define NGSPICEDATADIR \"\`echo %{_libdir}/tclspice\`\"|" configure*
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --with-tcl=%{_libdir}/tcl8.5/ \
+    --libdir=%{_libdir}/tclspice
+
+%{__make}
+cd ..
+# ------------------------------------------------------------------------------
+
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --libdir=%{_libdir}
+
+%{__make} %{?_smp_mflags}
+
 %install
 %{__rm} -rf %{buildroot}
-#chmod 644 src/xspice/*/*.{c,h,l,y}
-#chmod 644 src/frontend/*.{c,h}
-#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
-%{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
+# ---- Tclspice ----------------------------------------------------------------
+# Tclspice : Make install
+cd tclspice
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
+cd ..
+
+%{__rm} -rf %{buildroot}%{_libdir}/tclspice/libspice.la
+# ------------------------------------------------------------------------------
+
+
+# Ensuring that all docs are under %%{_docdir}/%%{name}-%%{version}/
+rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr doc/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr Stuarts_Poly_Notes FAQ DEVICES ANALYSES %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr AUTHORS COPYING README BUGS ChangeLog NEWS %{buildroot}%{_docdir}/%{name}-%{version}/
+
+
+# pull as debuginfo
+chmod +x %{buildroot}%{_libdir}/spice/*.cm
+
+%{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
-#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+%check
+#make check
 
 
 %clean
@@ -105,31 +197,34 @@ cat src/spinit.in.ngspice | sed \
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README BUGS ChangeLog NEWS
-%{_bindir}/cmpp
-%{_bindir}/ngmakeidx
-%{_bindir}/ngmultidec
-%{_bindir}/ngnutmeg
-%{_bindir}/ngproc2mod
-%{_bindir}/ngsconvert
-%{_bindir}/%{name}
-%{_bindir}/xgraph
-%{_datadir}/ng-spice-rework/
+%{_bindir}/*
+%{_datadir}/%{name}/
 %{_libdir}/spice/
-%{_mandir}/man1/ngnutmeg.1.*
-%{_mandir}/man1/ngsconvert.1.*
-%{_mandir}/man1/ngmultidec.1.*
-%{_mandir}/man1/%{name}.1.*
-%{_mandir}/manm/xgraph.man.*
+%{_mandir}/man1/*
+
+
+%files -n tclspice
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%{_libdir}/tclspice/
 
 
 %files doc
 %defattr(-, root, root, -)
+%exclude %doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%doc %{_docdir}/%{name}-%{version}/
 %{_infodir}/ngspice.info*.*
-%doc examples/ doc/
-%doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
-%Changelog
+
+%changelog
+* Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
+- new upstream release
+- RHBZ #514484 A Long Warning Message (patched)
+- RHBZ #511695 FTBFS ngspice-18-2.fc11
+
+* Sat Feb 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-2
+- x11 windows (help and plot) fixes #RHBZ 481525
+
 * Sat Jan 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 22:43:46 -0000	1.3
+++ sources	9 Aug 2009 15:57:01 -0000	1.4
@@ -1 +1 @@
-3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz
+52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz



From chkr at fedoraproject.org  Sun Aug  9 15:57:15 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  9 Aug 2009 15:57:15 +0000 (UTC)
Subject: rpms/f-spot/devel f-spot.spec,1.89,1.90
Message-ID: <20090809155715.B41BB11C00D7@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14830

Modified Files:
	f-spot.spec 
Log Message:
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
- Build arch ppc64.



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- f-spot.spec	9 Aug 2009 15:08:54 -0000	1.89
+++ f-spot.spec	9 Aug 2009 15:57:15 -0000	1.90
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -37,7 +37,7 @@ Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
 # Mono only available on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha 
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha 
 
 # Some compiler segfault on ia64:
 ExcludeArch: ia64
@@ -117,6 +117,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/omf/f-spot/
 
 %changelog
+* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
+- Build arch ppc64.
+
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-2
 - Fix Icon Cache script in %%post section
 



From chitlesh at fedoraproject.org  Sun Aug  9 15:58:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  9 Aug 2009 15:58:12 +0000 (UTC)
Subject: rpms/ngspice/EL-5 ngspice-rework-19.memusage_warning.patch, NONE,
	1.1 ngspice-xcircuit_bridge.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.1, 1.2 ngspice.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090809155812.9739D11C00D7@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15166/EL-5

Modified Files:
	.cvsignore import.log ngspice.spec sources 
Added Files:
	ngspice-rework-19.memusage_warning.patch 
	ngspice-xcircuit_bridge.patch 
Log Message:
rework 19 and tclspice

ngspice-rework-19.memusage_warning.patch:
 resource.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ngspice-rework-19.memusage_warning.patch ---
--- src/frontend/resource.c	2009-04-17 23:59:05.000000000 +0200
+++ resource.c	2009-08-08 20:52:02.658775378 +0200
@@ -1,7 +1,7 @@
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
-$Id: resource.c,v 1.31 2009/04/17 21:59:05 h_vogt Exp $
+$Id: resource.c,v 1.32 2009/08/08 17:38:23 pnenzi Exp $
 **********/
 
 /*
@@ -549,7 +549,7 @@
 #endif /*_WIN32_WINNT 0x0500*/
 #else
    FILE *fp;
-   char buffer[1024];
+   char buffer[2048];
    size_t bytes_read;
    char *match;
    long mem_got;

ngspice-xcircuit_bridge.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ngspice-xcircuit_bridge.patch ---
--- src/main.c	2009-04-12 23:08:18.000000000 +0200
+++ main.c	2009-08-01 14:10:46.785485894 +0200
@@ -566,6 +566,7 @@
        "  -i, --interactive         run in interactive mode\n"
        "  -n, --no-spiceinit        don't load the local or user's config file\n"
        "  -o, --output=FILE         set the outputfile\n"
+       "  -p, --pipe                run in I/O pipe mode\n"
        "  -q, --completion          activate command completion\n"
        "  -r, --rawfile=FILE        set the rawfile output\n"             
        "  -s, --server              run spice as a server process\n"
@@ -772,6 +773,7 @@
             {"interactive", 0, 0, 'i'},
             {"no-spiceinit", 0, 0, 'n'},
             {"output", 1, 0, 'o'},
+            {"pipe", 0, 0, 'p'},
             {"completion", 0, 0, 'q'},
             {"rawfile", 1, 0, 'r'},
             {"server", 0, 0, 's'},
@@ -779,7 +781,7 @@
             {0, 0, 0, 0}
         };
 
-        c = getopt_long (argc, argv, "hvbac:ihno:qr:st:",
+        c = getopt_long (argc, argv, "hvbac:ihno:pqr:st:",
              long_options, &option_index);
         if (c == -1)
             break;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 22:47:36 -0000	1.3
+++ .cvsignore	9 Aug 2009 15:58:12 -0000	1.4
@@ -1 +1 @@
-ng-spice-rework-18.tar.gz
+ng-spice-rework-19.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	11 Jan 2009 22:47:36 -0000	1.1
+++ import.log	9 Aug 2009 15:58:12 -0000	1.2
@@ -1 +1,2 @@
 ngspice-18-1_fc10:EL-5:ngspice-18-1.fc10.src.rpm:1231713953
+ngspice-19-1_fc11:EL-5:ngspice-19-1.fc11.src.rpm:1249833383


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ngspice.spec	11 Jan 2009 22:47:36 -0000	1.8
+++ ngspice.spec	9 Aug 2009 15:58:12 -0000	1.9
@@ -1,5 +1,5 @@
 Name:              ngspice
-Version:           18
+Version:           19
 Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
@@ -7,9 +7,16 @@ License:           BSD
 Group:             Applications/Engineering
 URL:               http://%{name}.sourceforge.net/
 
-Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
+Source0:           http://downloads.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Ensuring interoperability with xcircuit via Tcl
+Patch0:            %{name}-xcircuit_bridge.patch
+Patch1:            %{name}-rework-19.memusage_warning.patch
+
+Requires(post):    /sbin/install-info
+Requires(preun):   /sbin/install-info
+
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -35,11 +42,11 @@ develop their own models for devices usi
 
 It could be used for VLSI simulations as well.
 
+
 %package doc
 Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
 Group:             Documentation
-Requires:          ngspice = %{version}
-
+Requires:          ngspice = %{version}-%{release}
 Requires(post):    /sbin/install-info
 Requires(preun):   /sbin/install-info
 
@@ -48,49 +55,134 @@ This package contains the documentation 
 and info format.
 
 
+%package -n        tclspice
+Summary:           Tcl/Tk interface for ngspice
+Group:             Applications/Engineering
+BuildRequires:     tk-devel
+BuildRequires:     blt-devel
+
+%description -n    tclspice
+TclSpice is an improved version of Berkeley Spice designed to be used with
+the  Tcl/Tk scripting language. The project is based upon the NG-Spice source
+code base with many improvements.
+
 %prep
-%setup -q -n ng-spice-rework-%{version}
+%setup -q
 
+%patch0 -p0 -b .xcircuit
+%patch1 -p0 -b .mem
 
-%build
-%ifarch x86_64 sparc64 ppc64 amd64
-%{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | sed \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
-> src/spinit.in
-%endif
+# make sure the examples are UTF-8...
+for nonUTF8 in examples/tclspice/tcl-testbench4/selectfromlist.tcl \
+               examples/tclspice/tcl-testbench1/testCapa.cir \
+               examples/tclspice/tcl-testbench1/capa.cir ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
+# rpmlint warnings
+find examples/ -type f -name ".cvsignore" -exec rm -rf {} ';'
+find src/ -type f -name "*.c" -exec chmod -x  {} ';'
+find src/ -type f -name "*.h" -exec chmod -x  {} ';'
 
-%configure              \
-    --enable-xgraph     \
-    --enable-xspice     \
 %ifarch x86_64 sparc64 ppc64 amd64
-  --enable-libsuffix=64 \
+sed -i "s|@XSPICEINIT@ codemodel @prefix@/lib|@XSPICEINIT@ codemodel %{_libdir}|" \
+src/spinit.in
 %endif
 
-# make in xgraph with another flag first so
-# that we can correctly use Fedora compiler flags.
-( cd xgraph ; %{__make} \
-   ADDITIONAL_INCLUDES="$RPM_OPT_FLAGS" %{?_smp_mflags} )
+# Fix Tclspice's examples
+sed -i \
+"s|load \"../../../src/.libs/libspice.so\"|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|load ../../../src/.libs/libspice.so|lappend auto_path \"%{_libdir}/tclspice\"\npackage require spice|" \
+examples/tclspice/*/*.tcl
+sed -i \
+"s|spice::codemodel ../../src/xspice/icm/spice2poly|spice::codemodel %{_libdir}/tclspice/spice|" \
+examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
 
-%{__make} %{?_smp_mflags}
+%build
 
 
+# ---- Tclspice ----------------------------------------------------------------
+# Adding BLT support
+export CFLAGS="$CFLAGS -I%{_includedir}/blt"
+
+# Make builddir for tclspice
+%{__mkdir} -p tclspice
+%{__cp} -Rl `ls . | grep -v tclspice` tclspice
+
+# Configure tclspice
+cd tclspice
+sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define NGSPICEDATADIR \"\`echo %{_libdir}/tclspice\`\"|" configure*
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --with-tcl=%{_libdir}/tcl8.5/ \
+    --libdir=%{_libdir}/tclspice
+
+%{__make}
+cd ..
+# ------------------------------------------------------------------------------
+
+%configure \
+    --disable-xgraph \
+    --enable-xspice \
+    --enable-maintainer-mode \
+    --enable-capzerobypass \
+    --enable-cider \
+    --enable-newpred \
+    --enable-expdevices \
+    --enable-intnoise \
+    --enable-predictor \
+    --enable-numparam \
+    --enable-dot-global \
+    --enable-shared \
+    --libdir=%{_libdir}
+
+%{__make} %{?_smp_mflags}
+
 %install
 %{__rm} -rf %{buildroot}
-#chmod 644 src/xspice/*/*.{c,h,l,y}
-#chmod 644 src/frontend/*.{c,h}
-#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
-%{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
+# ---- Tclspice ----------------------------------------------------------------
+# Tclspice : Make install
+cd tclspice
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
+cd ..
+
+%{__rm} -rf %{buildroot}%{_libdir}/tclspice/libspice.la
+# ------------------------------------------------------------------------------
+
+
+# Ensuring that all docs are under %%{_docdir}/%%{name}-%%{version}/
+rm -rf   %{buildroot}%{_docdir}/%{name}-%{version}/
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr examples/ %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr doc/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr Stuarts_Poly_Notes FAQ DEVICES ANALYSES %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr AUTHORS COPYING README BUGS ChangeLog NEWS %{buildroot}%{_docdir}/%{name}-%{version}/
+
+
+# pull as debuginfo
+chmod +x %{buildroot}%{_libdir}/spice/*.cm
+
+%{__rm} -rf %{buildroot}%{_datadir}/info/dir
 
-#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+%check
+#make check
 
 
 %clean
@@ -105,31 +197,34 @@ cat src/spinit.in.ngspice | sed \
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README BUGS ChangeLog NEWS
-%{_bindir}/cmpp
-%{_bindir}/ngmakeidx
-%{_bindir}/ngmultidec
-%{_bindir}/ngnutmeg
-%{_bindir}/ngproc2mod
-%{_bindir}/ngsconvert
-%{_bindir}/%{name}
-%{_bindir}/xgraph
-%{_datadir}/ng-spice-rework/
+%{_bindir}/*
+%{_datadir}/%{name}/
 %{_libdir}/spice/
-%{_mandir}/man1/ngnutmeg.1.*
-%{_mandir}/man1/ngsconvert.1.*
-%{_mandir}/man1/ngmultidec.1.*
-%{_mandir}/man1/%{name}.1.*
-%{_mandir}/manm/xgraph.man.*
+%{_mandir}/man1/*
+
+
+%files -n tclspice
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%{_libdir}/tclspice/
 
 
 %files doc
 %defattr(-, root, root, -)
+%exclude %doc %{_docdir}/%{name}-%{version}/examples/tclspice
+%doc %{_docdir}/%{name}-%{version}/
 %{_infodir}/ngspice.info*.*
-%doc examples/ doc/
-%doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
-%Changelog
+
+%changelog
+* Sun Aug 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 19-1
+- new upstream release
+- RHBZ #514484 A Long Warning Message (patched)
+- RHBZ #511695 FTBFS ngspice-18-2.fc11
+
+* Sat Feb 21 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-2
+- x11 windows (help and plot) fixes #RHBZ 481525
+
 * Sat Jan 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Jan 2009 22:47:36 -0000	1.3
+++ sources	9 Aug 2009 15:58:12 -0000	1.4
@@ -1 +1 @@
-3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz
+52d01ef53332b8a0e58bf4f7ac7f2c42  ng-spice-rework-19.tar.gz



From heffer at fedoraproject.org  Sun Aug  9 16:01:02 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun,  9 Aug 2009 16:01:02 +0000 (UTC)
Subject: rpms/w_scan/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 w_scan.spec,
	1.5, 1.6
Message-ID: <20090809160102.8FEC711C00D7@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15965

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
- fixes 513871



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 16:18:17 -0000	1.3
+++ .cvsignore	9 Aug 2009 16:01:02 -0000	1.4
@@ -1 +1 @@
-w_scan-20090528.tar.bz2
+w_scan-20090808.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 16:18:17 -0000	1.3
+++ sources	9 Aug 2009 16:01:02 -0000	1.4
@@ -1 +1 @@
-fd17311581e3f603c12103745d95f9e7  w_scan-20090528.tar.bz2
+4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/w_scan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- w_scan.spec	27 Jul 2009 07:01:47 -0000	1.5
+++ w_scan.spec	9 Aug 2009 16:01:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           w_scan
-Version:        20090528
-Release:        3%{?dist}
+Version:        20090808
+Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
 Group:          Applications/Multimedia
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
+- fixes 513871
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090528-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From heffer at fedoraproject.org  Sun Aug  9 16:04:50 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun,  9 Aug 2009 16:04:50 +0000 (UTC)
Subject: rpms/w_scan/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 w_scan.spec,
	1.4, 1.5
Message-ID: <20090809160450.2B76F11C00D7@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-serv16907

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
- fixes 513871



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 16:20:33 -0000	1.3
+++ .cvsignore	9 Aug 2009 16:04:49 -0000	1.4
@@ -1 +1 @@
-w_scan-20090528.tar.bz2
+w_scan-20090808.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 16:20:33 -0000	1.3
+++ sources	9 Aug 2009 16:04:49 -0000	1.4
@@ -1 +1 @@
-fd17311581e3f603c12103745d95f9e7  w_scan-20090528.tar.bz2
+4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-11/w_scan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- w_scan.spec	29 Jun 2009 19:15:12 -0000	1.4
+++ w_scan.spec	9 Aug 2009 16:04:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           w_scan
-Version:        20090528
-Release:        2%{?dist}
+Version:        20090808
+Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
 Group:          Applications/Multimedia
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
+- fixes 513871
+
 * Mon Jun 29 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090528-2
 - added dos2unix BuildReq
 



From heffer at fedoraproject.org  Sun Aug  9 16:06:20 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun,  9 Aug 2009 16:06:20 +0000 (UTC)
Subject: rpms/w_scan/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 w_scan.spec,
	1.2, 1.3
Message-ID: <20090809160620.90FFC11C00D7@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-serv17328

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
- fixes 513871



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jun 2009 19:19:38 -0000	1.3
+++ .cvsignore	9 Aug 2009 16:06:19 -0000	1.4
@@ -1 +1 @@
-w_scan-20090528.tar.bz2
+w_scan-20090808.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2009 19:19:39 -0000	1.3
+++ sources	9 Aug 2009 16:06:20 -0000	1.4
@@ -1 +1 @@
-fd17311581e3f603c12103745d95f9e7  w_scan-20090528.tar.bz2
+4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/w_scan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- w_scan.spec	29 Jun 2009 19:19:39 -0000	1.2
+++ w_scan.spec	9 Aug 2009 16:06:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           w_scan
-Version:        20090528
-Release:        2%{?dist}
+Version:        20090808
+Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
 Group:          Applications/Multimedia
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
+- fixes 513871
+
 * Mon Jun 29 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090528-2
 - added dos2unix BuildReq
 



From cwickert at fedoraproject.org  Sun Aug  9 16:07:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  9 Aug 2009 16:07:55 +0000 (UTC)
Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xfce4-power-manager.spec, 1.16, 1.17
Message-ID: <20090809160755.A38FC11C00D7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17753

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-1
- Update to 0.8.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Aug 2009 16:33:21 -0000	1.12
+++ .cvsignore	9 Aug 2009 16:07:55 -0000	1.13
@@ -1 +1 @@
-xfce4-power-manager-0.8.3.tar.bz2
+xfce4-power-manager-0.8.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Aug 2009 16:33:21 -0000	1.12
+++ sources	9 Aug 2009 16:07:55 -0000	1.13
@@ -1 +1 @@
-0db6b6f5b13c8b0829c6a07b7dfdc980  xfce4-power-manager-0.8.3.tar.bz2
+f390082fffddd645e6682ccd3c338335  xfce4-power-manager-0.8.3.1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xfce4-power-manager.spec	1 Aug 2009 16:33:21 -0000	1.16
+++ xfce4-power-manager.spec	9 Aug 2009 16:07:55 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           xfce4-power-manager
-Version:        0.8.3
+Version:        0.8.3.1
 Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-1
+- Update to 0.8.3.1
+
 * Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
 - Update to 0.8.3
 



From cwickert at fedoraproject.org  Sun Aug  9 16:22:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  9 Aug 2009 16:22:00 +0000 (UTC)
Subject: rpms/xfce4-power-manager/F-11 .cvsignore, 1.10, 1.11 sources, 1.10, 
	1.11 xfce4-power-manager.spec, 1.11, 1.12
Message-ID: <20090809162200.62C0911C00D7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21269

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-1
- Update to 0.8.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Aug 2009 17:08:26 -0000	1.10
+++ .cvsignore	9 Aug 2009 16:22:00 -0000	1.11
@@ -1 +1 @@
-xfce4-power-manager-0.8.3.tar.bz2
+xfce4-power-manager-0.8.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Aug 2009 17:08:26 -0000	1.10
+++ sources	9 Aug 2009 16:22:00 -0000	1.11
@@ -1 +1 @@
-0db6b6f5b13c8b0829c6a07b7dfdc980  xfce4-power-manager-0.8.3.tar.bz2
+f390082fffddd645e6682ccd3c338335  xfce4-power-manager-0.8.3.1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xfce4-power-manager.spec	1 Aug 2009 17:08:26 -0000	1.11
+++ xfce4-power-manager.spec	9 Aug 2009 16:22:00 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           xfce4-power-manager
-Version:        0.8.3
+Version:        0.8.3.1
 Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3.1-1
+- Update to 0.8.3.1
+
 * Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
 - Update to 0.8.3
 



From gemi at fedoraproject.org  Sun Aug  9 16:32:02 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 16:32:02 +0000 (UTC)
Subject: rpms/GtkAda/F-11 .cvsignore, 1.6, 1.7 GtkAda.spec, 1.26,
	1.27 sources, 1.6, 1.7
Message-ID: <20090809163202.AEDAB11C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/GtkAda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23314

Modified Files:
	.cvsignore GtkAda.spec sources 
Log Message:
update to release 2.14.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Dec 2008 22:25:19 -0000	1.6
+++ .cvsignore	9 Aug 2009 16:32:02 -0000	1.7
@@ -1 +1 @@
-GtkAda-gpl-2.10.2.tgz
+GtkAda-gpl-2.14.0.tgz


Index: GtkAda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/F-11/GtkAda.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- GtkAda.spec	23 Feb 2009 21:22:36 -0000	1.26
+++ GtkAda.spec	9 Aug 2009 16:32:02 -0000	1.27
@@ -1,12 +1,12 @@
 Name:		GtkAda
-Version:	2.10.2
-Release:	2%{?dist}
+Version:	2.14.0
+Release:	1%{?dist}
 Summary:	Ada graphical toolkit based on Gtk+
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		https://libre.adacore.com/GtkAda/
 # Source is available, but requires registration
-Source:         GtkAda-gpl-2.10.2.tgz
+Source:         GtkAda-gpl-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat
@@ -19,12 +19,12 @@ BuildRequires:  bonobo-activation-devel
 BuildRequires:  libbonoboui-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  texinfo-tex
 BuildRequires:	texinfo
 BuildRequires:	tetex
 BuildRequires:  tetex-dvips
-ExcludeArch:    ppc64
 
 %description
 GtkAda is an Ada graphical toolkit based on Gtk+. It allows you to
@@ -35,6 +35,9 @@ develop graphical applications in Ada us
 Summary:	Development files for GtkAda
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-gnome = %{version}-%{release}
+Requires:	%{name}-glade = %{version}-%{release}
+Requires:	%{name}-gl = %{version}-%{release}
 Requires:       perl
 Requires:       gtk2-devel
 Requires:       pkgconfig
@@ -43,6 +46,34 @@ Requires:       pkgconfig
 Development files for GtkAda.
 
 
+%package gnome
+Summary:	GNOME bindings of GtkAda
+Group:		Development/Libraries
+
+%description gnome
+%{summary}.
+
+
+%package glade
+Summary:	Glade bindings of GtkAda
+Group:		Development/Libraries
+
+%description glade
+%{summary}.
+
+
+%package gl
+Summary:	OpenGL bindings of GtkAda
+Group:		Development/Libraries
+
+%description gl
+%{summary}.
+
+
+%description devel
+Development files for GtkAda.
+
+
 %package doc
 Summary:	Documentation for GtkAda
 Group:		Documentation
@@ -53,7 +84,7 @@ Documentation for GtkAda.
 
 
 %prep
-%setup -q -n %{name}-gpl-%{version}
+%setup -q -n %{name}-%{version}
 sed -i "s|\$.prefix./lib|\$(libdir)|" projects/Makefile
 sed -i "s|\$prefix/lib|%{_libdir}|" projects/generate_prj.sh
 sed -i "s|@prefix@/lib|@prefix@/%{_lib}|" projects/gtkada.pc.in
@@ -82,7 +113,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/gtkada/relo
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-(cd docs; install -m 0644 dgate.1 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
+(cd docs; install -m 0644 gate.1 gtkada-config.1 $RPM_BUILD_ROOT%{_mandir}/man1)
 
 # this conflicts with gdialog from gnome-utils
 rm -f $RPM_BUILD_ROOT%{_bindir}/gdialog
@@ -97,16 +128,45 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
+%post gnome -p /sbin/ldconfig
+
+%postun gnome -p /sbin/ldconfig
+
+
+%post gl -p /sbin/ldconfig
+
+%postun gl -p /sbin/ldconfig
+
+
+%post glade -p /sbin/ldconfig
+
+%postun glade -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libgtkada-*.so.*
 %doc AUTHORS COPYING README
 
 
+%files gnome
+%defattr(-,root,root,-)
+%{_libdir}/libgnomeada-*.so.*
+
+
+%files gl
+%defattr(-,root,root,-)
+%{_libdir}/libgtkada_gl-*.so.*
+
+
+%files glade
+%defattr(-,root,root,-)
+%{_libdir}/libgtkada_glade-*.so.*
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -127,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 2.14.0-1
+- new release 2.14.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Dec 2008 22:25:19 -0000	1.6
+++ sources	9 Aug 2009 16:32:02 -0000	1.7
@@ -1 +1 @@
-cbd287fad55f7e62ff15d7fcf8db7cd4  GtkAda-gpl-2.10.2.tgz
+e43cd5d882f044a70d76cea74e6cd705  GtkAda-gpl-2.14.0.tgz



From rdieter at fedoraproject.org  Sun Aug  9 17:07:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 17:07:01 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.199,1.200
Message-ID: <20090809170701.473BE11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30496

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
- *really* make -marble-libs



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- kdeedu.spec	9 Aug 2009 04:38:50 -0000	1.199
+++ kdeedu.spec	9 Aug 2009 17:07:01 -0000	1.200
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -416,14 +416,17 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/libmarble*.so.*
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 
+%files marble-libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -466,6 +469,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
+- *really* make -marble-libs
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
 - -libs: move libavogadro-kalzium libcompoundviewer here
 - new -marble-libs pkg



From rdieter at fedoraproject.org  Sun Aug  9 17:08:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 17:08:26 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.180,1.181
Message-ID: <20090809170826.F1F5C11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30805

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
- *really* make -marble-libs



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- kdeedu.spec	9 Aug 2009 15:46:55 -0000	1.180
+++ kdeedu.spec	9 Aug 2009 17:08:26 -0000	1.181
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -416,14 +416,17 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/libmarble*.so.*
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 
+%files marble-libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -466,6 +469,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
+- *really* make -marble-libs
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
 - -libs: move libavogadro-kalzium libcompoundviewer here
 - new -marble-libs pkg



From chkr at fedoraproject.org  Sun Aug  9 17:49:06 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  9 Aug 2009 17:49:06 +0000 (UTC)
Subject: rpms/f-spot/F-10 0001-use-system-Mono.Addins-if-available.patch,
	NONE, 1.1 0001-use-the-correct-stock-icon.patch, NONE,
	1.1 0002-enhance-the-f-spot-import-script.patch, NONE,
	1.1 f-spot-0.6.0.0-gtk-deprecated.patch, NONE, 1.1 .cvsignore,
	1.20, 1.21 f-spot.spec, 1.83, 1.84 sources, 1.20, 1.21
Message-ID: <20090809174906.9065111C00D7@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-serv5160

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-use-system-Mono.Addins-if-available.patch 
	0001-use-the-correct-stock-icon.patch 
	0002-enhance-the-f-spot-import-script.patch 
	f-spot-0.6.0.0-gtk-deprecated.patch 
Log Message:
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
- Update to new upstream version 0.6.0.0
- Cleanup spec file


0001-use-system-Mono.Addins-if-available.patch:
 Makefile.include |    7 -------
 configure.ac     |   28 ++++++++++++++++++++++++++++
 lib/Makefile.am  |    4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE 0001-use-system-Mono.Addins-if-available.patch ---
diff --git a/Makefile.include b/Makefile.include
index efd6d72..4be9a8b 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,9 +3,6 @@
 
 ## Directories
 
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
 LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
 LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-LINK_MONO_ADDINS =					\
-	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
-	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
-	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = 								\
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
diff --git a/configure.ac b/configure.ac
index e31bd27..1acaaa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
 BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
+MONO_ADDINS_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
 
 AC_SUBST(CSC_DEFINES)
 
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(MONO_ADDINS, 
+		  mono-addins >= $MONO_ADDINS_REQUIRED
+		  mono-addins-setup >= $MONO_ADDINS_REQUIRED
+		  mono-addins-gui >= $MONO_ADDINS_REQUIRED,
+[
+	DIR_ADDINS=""
+	DIR_ADDINS_ADDINS=""
+	DIR_ADDINS_SETUP=""
+	DIR_ADDINS_GUI=""
+	LINK_MONO_ADDINS="-pkg:mono-addins -pkg:mono-addins-setup -pkg:mono-addins-gui"
+],
+[
+	DIR_ADDINS="mono-addins"
+	DIR_ADDINS_ADDINS='$(top_builddir)/lib/mono-addins/Mono.Addins'
+	DIR_ADDINS_SETUP='$(top_builddir)/lib/mono-addins/Mono.Addins.Setup'
+	DIR_ADDINS_GUI='$(top_builddir)/lib/mono-addins/Mono.Addins.Gui'
+	LINK_MONO_ADDINS='-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll         \
+			  -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll    \
+			  -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll'
+])
+AC_SUBST(DIR_ADDINS)
+AC_SUBST(DIR_ADDINS_ADDINS)
+AC_SUBST(DIR_ADDINS_SETUP)
+AC_SUBST(DIR_ADDINS_GUI)
+AC_SUBST(LINK_MONO_ADDINS)
+
 dnl -- dbus-sharp: link or bundle ?
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 [
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6d69f9..d0b9a6c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
-	mono-addins			\
 	semweb				\
 	Tao
 
@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
 SUBDIRS = 				\
 	$(DIR_DBUS)			\
 	$(DIR_DBUS_GLIB)	\
+	$(DIR_ADDINS)	\
 	$(UNCONDITIONAL_SUBDIRS)
 
 DIST_SUBDIRS = 			\
 	dbus-sharp			\
 	dbus-sharp-glib		\
+	mono-addins		\
 	dpap-sharp			\
 	$(UNCONDITIONAL_SUBDIRS)
 
-- 
1.6.0.6


0001-use-the-correct-stock-icon.patch:
 ImportCommand.cs |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-use-the-correct-stock-icon.patch ---
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index d4a9e23..a47015e 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -256,7 +256,7 @@ public class ImportCommand : GladeDialog
 				}
 			} else {
 				ImportSource source = new BrowseSource (Catalog.GetString ("(No Cameras Detected)"),
-									"emblem-camera");
+									"camera-photo");
 				item = new SourceItem (source);
 				item.Activated += HandleActivated;
 				item.Sensitive = false;
-- 
1.6.0.6


0002-enhance-the-f-spot-import-script.patch:
 f-spot-import |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

--- NEW FILE 0002-enhance-the-f-spot-import-script.patch ---
diff --git a/tools/f-spot-import b/tools/f-spot-import
index 98385b1..34facc0 100755
--- a/tools/f-spot-import
+++ b/tools/f-spot-import
@@ -3,22 +3,46 @@
 udi="$1"
 #xmessage $udi
 
+# check for gvfs mount point using gphoto2
+gvfsuri=`gvfs-ls -c "$udi/"`
+if [ "${gvfsuri:0:10}" = "gphoto2://" ] ; then
+	if [ "${gvfsuri:11:4}" = "usb:" ] ; then
+		# Yield for f-spot since it wants to access the device directly
+		#
+		# Rewrite the uri to something f-spot can handle
+		#
+		bus="${gvfsuri:15:3}"
+		dev="${gvfsuri:19:3}"
+
+		uri="gphoto2:usb:$bus,$dev"
+
+		gvfs-mount --unmount-scheme gphoto2
+		f-spot --import "$uri"
+		exit
+	fi
+	# mounted via gphoto2 not using USB, stay with the plain directory
+	f-spot --import "$udi"
+	exit
+fi
+
 if [ "$udi" != "${udi#gphoto2:}" ]; then
 	# gphoto2, as passed by gvfs/nautilus
 	gvfs-mount -u "$udi" || true
 	f-spot --import "$udi"
 	exit
 fi
-mnt=${udi#file://}
-if [ "$udi" != "$mnt" ]; then
+
+if [ "$udi" != "${udi#file://}" ]; then
 	# mount point, as passed by gvfs/nautilus.
 	f-spot --import "$udi"
 	exit
 fi
+
 mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` || true
 if [ -n "$mount_point" ]; then
 	# USB Mass Storage camera: need to pass f-spot a mount point
 	f-spot --import "$mount_point"
+	exit
 else
 	# Some other camera try GPhoto2
 
@@ -27,4 +51,6 @@ else
 	uri=`printf gphoto2:[usb:%.3d,%.3d] $bus $dev`
 
 	f-spot --import "$uri"
+	exit
 fi
+xmessage "f-spot-import can't handle UDI: \"$udi\""
-- 
1.6.0.6


f-spot-0.6.0.0-gtk-deprecated.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE f-spot-0.6.0.0-gtk-deprecated.patch ---
diff -ru f-spot-0.4.4.old/libfspot/Makefile.am f-spot-0.4.4/libfspot/Makefile.am
--- f-spot-0.4.4.old/libfspot/Makefile.am	2008-07-13 20:29:28.000000000 +1200
+++ f-spot-0.4.4/lib/libfspot/Makefile.am	2008-07-13 20:30:13.000000000 +1200
@@ -2,7 +2,7 @@
 	-I $(top_srcdir)					\
 	-DLIBEOG_ETTORE_CHANGES=1				\
         -DG_LOG_DOMAIN=\"libf\"					\
-	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
+	-DG_DISABLE_DEPRECATED					\
 	-DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
 	$(F_CFLAGS)						\
 	$(EXIF_CFLAGS)						\
diff -ru f-spot-0.4.4.old/libfspot/Makefile.in f-spot-0.4.4/libfspot/Makefile.in
--- f-spot-0.4.4.old/libfspot/Makefile.in	2008-07-13 20:29:28.000000000 +1200
+++ f-spot-0.4.4/lib/libfspot/Makefile.in	2008-07-13 20:52:22.000000000 +1200
@@ -294,7 +294,7 @@
 	-I $(top_srcdir)					\
 	-DLIBEOG_ETTORE_CHANGES=1				\
         -DG_LOG_DOMAIN=\"libf\"					\
-	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
+	-DG_DISABLE_DEPRECATED					\
 	-DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
 	$(F_CFLAGS)						\
 	$(EXIF_CFLAGS)						\


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	29 Dec 2008 23:41:45 -0000	1.20
+++ .cvsignore	9 Aug 2009 17:49:04 -0000	1.21
@@ -1 +1 @@
-f-spot-0.5.0.3.tar.bz2
+f-spot-0.6.0.0.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- f-spot.spec	31 Jul 2009 15:26:37 -0000	1.83
+++ f-spot.spec	9 Aug 2009 17:49:05 -0000	1.84
@@ -1,20 +1,21 @@
 Name:           f-spot
-Version:        0.5.0.3
-Release:        5%{?dist}
+Version:        0.6.0.0
+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://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
-# I'm told this is fixed in SVN
-Patch1:		f-spot-0.4.4-gtk-deprecated.patch
-# fix a missing icon
-Patch2:		missing-icon.patch
-# unmount cameras before importing
-Patch3:		gvfs-gphoto.patch
+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=591223
+Patch1:         0001-use-the-correct-stock-icon.patch
 # Use system mono-addins
-Patch4:         f-spot-0.5.0.3-link-system-mono-addins.patch
+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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +31,9 @@ BuildRequires:  gnome-doc-utils
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  mono-addins-devel
 BuildRequires:  desktop-file-utils
+Requires:       hicolor-icon-theme 
+Requires:       gnome-screensaver
+Requires:       yelp
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
@@ -53,34 +57,27 @@ sorting and tagging of digital images. 
 %prep
 %setup -q
 
-# preserve timestamps
-touch -r configure.in configure.in.stamp
-
-%patch1 -p1 -b .gtk-deprecated
-%patch2 -p1 -b .missing-icon
+%patch1 -p1 -b .missing-icon
+%patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
-%patch4 -p1 -b .link-system-mono-addins
-
-
-# restore timestamps
-touch -r configure.in.stamp configure.in
+%patch4 -p1 -F 2 -b .gtk-deprecated
 
 %build
+autoreconf -f -i
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --disable-scrollkeeper
-make
+# parallel build broken in 0.6.0.0, try again with next release
+make # %{?_smp_mflags}
 
 
 %install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 rm -rf $RPM_BUILD_ROOT
+export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
-# Will need to be removed at some point...
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gio-sharp-unstable.pc
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll
@@ -97,37 +94,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+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 || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome/help/f-spot
+%{_datadir}/gnome/help/f-spot/
 %{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/icons/hicolor/*/*/*.svg
-%{_datadir}/f-spot
-%{_libdir}/f-spot
+%{_datadir}/f-spot/
+%{_libdir}/f-spot/
 %{_bindir}/f-spot
 %{_bindir}/f-spot-import
 %{_bindir}/f-spot-sqlite-upgrade
 %{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot
-# GIO is currently provided in f-spot only, so this'll need to be removed sometime in the future
-%{_libdir}/gio-sharp-unstable
+%{_datadir}/omf/f-spot/
 
 %changelog
+* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-1
+- Update to new upstream version 0.6.0.0
+- Cleanup spec file
+
 * Fri Jul 31 2009 Christian Krause <chkr at fedoraproject.org> - 0.5.0.3-5
 - Re-add patch to use system mono-addins (BZ #484996)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	29 Dec 2008 23:41:45 -0000	1.20
+++ sources	9 Aug 2009 17:49:05 -0000	1.21
@@ -1 +1 @@
-52db86f1dc715a3958425aa3d006c900  f-spot-0.5.0.3.tar.bz2
+9115f9df72c5fc1c82eb46b3af01e67d  f-spot-0.6.0.0.tar.bz2



From rdieter at fedoraproject.org  Sun Aug  9 18:50:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 18:50:01 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.152,1.153
Message-ID: <20090809185001.78B6C11C04DF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17064

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
- *really* make -marble-libs



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kdeedu.spec	5 Aug 2009 02:53:20 -0000	1.152
+++ kdeedu.spec	9 Aug 2009 18:50:01 -0000	1.153
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -92,8 +92,7 @@ Group:   System Environment/Libraries
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# libmarble
-Requires: %{name}-marble%{?_isa} = %{version}-%{release}
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -114,12 +113,12 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %package marble
 Summary: A World Atlas
 Group:   Amusements/Games
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
+# multilib, when marble-libs was introduced
+Obsoletes: %{name}-marble < 4.3.0-3
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't
-# strictly required.
-#Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
@@ -127,6 +126,13 @@ Provides:  marble = 1:0.7-%{release}
 %description marble
 %{summary}.
 
+%package marble-libs
+Summary: Runtime libraries for marble 
+Group:   System Environment/Libraries
+Requires: %{name}-marble = %{version}-%{release}
+%description marble-libs
+%{summary}.
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -297,8 +303,6 @@ rm -rf %{buildroot}
 
 # kalzium
 %{_kde4_libdir}/avogadro-kalzium/
-%{_kde4_libdir}/libavogadro-kalzium.so.*
-%{_kde4_libdir}/libcompoundviewer.so.*
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -369,10 +373,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/libkdeedu*.so.*
-%{_kde4_libdir}/libkeduvocdocument.so.*
-%{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libscience.so.*
+%{_kde4_libdir}/libavogadro-kalzium.so.0*
+%{_kde4_libdir}/libcompoundviewer.so.4*
+%{_kde4_libdir}/libkdeeduui.so.4*
+%{_kde4_libdir}/libkeduvocdocument.so.4*
+%{_kde4_libdir}/libkiten.so.4*
+%{_kde4_libdir}/libscience.so.4*
 # needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
@@ -410,14 +416,17 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/libmarble*.so.*
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 
+%files marble-libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -460,6 +469,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
+- *really* make -marble-libs
+
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
+- -libs: move libavogadro-kalzium libcompoundviewer here
+- new -marble-libs pkg
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - move kalziumuiwidgets.so designer plugin to -libs
 - tighten -libs deps using %%?_isa



From rdieter at fedoraproject.org  Sun Aug  9 18:51:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 18:51:20 +0000 (UTC)
Subject: rpms/qscintilla/F-10 qscintilla.spec,1.21,1.22
Message-ID: <20090809185120.4BF7611C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17448

Modified Files:
	qscintilla.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
- include designer plugin in main pkg, Obsoletes: qscintilla-designer



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/qscintilla.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- qscintilla.spec	8 Aug 2009 21:00:13 -0000	1.21
+++ qscintilla.spec	9 Aug 2009 18:51:20 -0000	1.22
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -18,6 +18,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # TODO: upstream this
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
+Obsoletes: qscintilla-designer < 2.4-3
+Provides:  qscintilla-designer = %{version}-%{release}
+
 BuildRequires:  qt4-devel
 
 # for -python
@@ -34,15 +37,6 @@ QScintilla is a port of Scintilla to the
 
 %{?scintilla_ver:This version of QScintilla is based on Scintilla v%{scintilla_ver}.}
 
-
-%package designer
-Summary:  QScintilla designer plugin 
-Group:    Development/Tools
-Requires: %{name} = %{version}-%{release}
-Requires: qt4-designer
-%description designer
-%{summary}.
-
 %package devel
 Summary:  QScintilla Development Files
 Group:    Development/Libraries
@@ -131,13 +125,10 @@ rm -rf %{buildroot}
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
 %{_qt4_libdir}/libqscintilla2.so.5*
+%{_qt4_plugindir}/designer/libqscintillaplugin.so
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
-%files designer
-%defattr(-,root,root,-)
-%{_qt4_plugindir}/designer/libqscintillaplugin.so
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
@@ -156,6 +147,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
+- include designer plugin in main pkg, Obsoletes: qscintilla-designer
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
 - QScintilla-gpl-2.4
 



From rdieter at fedoraproject.org  Sun Aug  9 18:52:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 18:52:27 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim.spec,1.213,1.214
Message-ID: <20090809185227.4ED2111C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18447

Modified Files:
	kdepim.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- -libs: move designer plugins here
- %check: desktop-file-validate
- don't own %{_kde4_appsdir}/kconf_update/



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- kdepim.spec	5 Aug 2009 13:06:17 -0000	1.213
+++ kdepim.spec	9 Aug 2009 18:52:27 -0000	1.214
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,7 +22,7 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 
 # Upgrade path
 %if 0%{?fedora} < 12
-Requires: kdepim-runtime >= %{version}
+Requires: kdepim-runtime%{?_isa} >= %{version}
 %endif
 
 BuildRequires: akonadi-devel
@@ -73,7 +73,7 @@ Requires(hint): spambayes
 Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdepim4-devel = %{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -124,6 +124,12 @@ done
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -161,8 +167,28 @@ rm -rf %{buildroot}
 %endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
-%{_kde4_datadir}/applications/kde4/*
-%{_kde4_appsdir}/*
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/akregator/
+%{_kde4_appsdir}/kaddressbook/
+%{_kde4_appsdir}/kalarm/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kdepimwidgets/
+%{_kde4_appsdir}/kjots/
+%{_kde4_appsdir}/kleopatra/
+%{_kde4_appsdir}/kmail/
+%{_kde4_appsdir}/kmailcvt/
+%{_kde4_appsdir}/knode/
+%{_kde4_appsdir}/knotes/
+%{_kde4_appsdir}/konsolekalendar/
+%{_kde4_appsdir}/kontact/
+%{_kde4_appsdir}/kontactsummary/
+%{_kde4_appsdir}/korgac/
+%{_kde4_appsdir}/korganizer/
+%{_kde4_appsdir}/kpilot/
+%{_kde4_appsdir}/ktimetracker/
+%{_kde4_appsdir}/kwatchgnupg/
+%{_kde4_appsdir}/libkdepim/
+%{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
@@ -176,6 +202,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/kde4/plugins/designer/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -184,10 +211,14 @@ rm -rf %{buildroot}
 %if 0%{?_with_pilot_link:1}
 %exclude %{_kde4_libdir}/libkpilot_*.so
 %endif
-%{_kde4_libdir}/kde4/plugins/designer/*
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- -libs: move designer plugins here
+- %%check: desktop-file-validate
+- don't own %%{_kde4_appsdir}/kconf_update/
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From kkofler at fedoraproject.org  Sun Aug  9 18:54:40 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  9 Aug 2009 18:54:40 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.57,1.58
Message-ID: <20090809185440.29C1A11C00D7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18993/devel

Modified Files:
	gnash.spec 
Log Message:
* Sun Aug 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.5.20090809bzr11401
- use %{_includedir}, not %{_prefix}/include


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gnash.spec	9 Aug 2009 14:37:06 -0000	1.57
+++ gnash.spec	9 Aug 2009 18:54:39 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.9.0
-Release:        0.4.%{alphatag}%{?dist}
+Release:        0.5.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -301,14 +301,17 @@ fi
 %{_mandir}/man1/rtmpget.1*
 
 %files devel
-%{_prefix}/include/gnash/*.h
+%{_includedir}/gnash/*.h
 %{_libdir}/pkgconfig/gnash.pc
 
 %files widget
-%{_prefix}/include/gnash/*.h
+%{_includedir}/gnash/*.h
 %{python_sitearch}/*
 
 %changelog
+* Sun Aug 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.5.20090809bzr11401
+- use %%{_includedir}, not %%{_prefix}/include
+
 * Sun Aug 09 2009 Tomeu Vizoso <tomeu at sugarlabs.org> 0.9.0-0.4.20090809bzr11401
 - Install the python module in the sitearch dir
 



From cwickert at fedoraproject.org  Sun Aug  9 19:36:03 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  9 Aug 2009 19:36:03 +0000 (UTC)
Subject: rpms/lxpanel/devel .cvsignore, 1.15, 1.16 lxpanel.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20090809193603.3120A11C00D7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28826

Modified Files:
	.cvsignore lxpanel.spec sources 
Log Message:
* Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
- Update to 0.5.3, fixes vertical panel size (#515748)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	6 Aug 2009 01:24:54 -0000	1.15
+++ .cvsignore	9 Aug 2009 19:36:02 -0000	1.16
@@ -1 +1 @@
-lxpanel-0.5.2.tar.gz
+lxpanel-0.5.3.tar.gz


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- lxpanel.spec	6 Aug 2009 01:24:54 -0000	1.25
+++ lxpanel.spec	9 Aug 2009 19:36:02 -0000	1.26
@@ -4,7 +4,7 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
+- Update to 0.5.3, fixes vertical panel size (#515748)
+
 * Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Aug 2009 01:24:54 -0000	1.15
+++ sources	9 Aug 2009 19:36:02 -0000	1.16
@@ -1 +1 @@
-b04c93877179a3c1be4a4fba4c2a0f94  lxpanel-0.5.2.tar.gz
+7203f037791fffd272f7cf50798933ae  lxpanel-0.5.3.tar.gz



From scop at fedoraproject.org  Sun Aug  9 20:16:34 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 20:16:34 +0000 (UTC)
Subject: rpms/vdr/devel vdr.spec,1.48,1.49
Message-ID: <20090809201634.C016C11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6479

Modified Files:
	vdr.spec 
Log Message:
* Sun Aug  9 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.0-27
- Make -docs noarch also when built on EL > 5.



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- vdr.spec	26 Jul 2009 14:49:40 -0000	1.48
+++ vdr.spec	9 Aug 2009 20:16:34 -0000	1.49
@@ -27,7 +27,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -137,7 +137,7 @@ Provides:       vdr-devel(api) = %{apive
 %package        docs
 Summary:        Developer documentation for VDR
 Group:          Documentation
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch:      noarch
 %endif
 
@@ -543,6 +543,9 @@ fi
 %endif # plugins
 
 %changelog
+* Sun Aug  9 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.0-27
+- Make -docs noarch also when built on EL > 5.
+
 * Sun Jul 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.0-26
 - Provide ISA qualified vdr(abi).  Plugins should depend on (versioned)
   vdr(abi)%%{?_isa} instead of just vdr(abi).



From scop at fedoraproject.org  Sun Aug  9 20:18:44 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  9 Aug 2009 20:18:44 +0000 (UTC)
Subject: rpms/vdr/F-11 vdr-1.6.0-const.diff, NONE,
	1.1 vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff, NONE,
	1.1 vdr-1.6.0-hlcutter-0.2.2-finnish.patch, NONE,
	1.1 vdr-1.6.0-kernel-2.6.29.diff, NONE,
	1.1 vdr-jumpplay-1.0-1.6.0-finnish.patch, NONE, 1.1 .cvsignore,
	1.19, 1.20 sources, 1.19, 1.20 vdr.spec, 1.43,
	1.44 vdr-1.4.7-hlcutter-0.2.0-finnish.patch, 1.1,
	NONE vdr-1.5.18-hlcutter-0.2.0.diff, 1.2,
	NONE vdr-1.6.0-gcc44.patch, 1.1,
	NONE vdr-1.6.0-remove-dvb-abi-check.patch, 1.1, NONE
Message-ID: <20090809201844.7B92211C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6913

Modified Files:
	.cvsignore sources vdr.spec 
Added Files:
	vdr-1.6.0-const.diff 
	vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff 
	vdr-1.6.0-hlcutter-0.2.2-finnish.patch 
	vdr-1.6.0-kernel-2.6.29.diff 
	vdr-jumpplay-1.0-1.6.0-finnish.patch 
Removed Files:
	vdr-1.4.7-hlcutter-0.2.0-finnish.patch 
	vdr-1.5.18-hlcutter-0.2.0.diff vdr-1.6.0-gcc44.patch 
	vdr-1.6.0-remove-dvb-abi-check.patch 
Log Message:
* Sun Aug  9 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-27
- Make -docs noarch also when built on EL > 5.

* Sun Jul 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-26
- Provide ISA qualified vdr(abi).  Plugins should depend on (versioned)
  vdr(abi)%{?_isa} instead of just vdr(abi).
- Borrow build patch for recent (broken? #483644) DVB headers from openSUSE.
- Apply epgsearch timer integration patch.
- Use %global instead of %define.

* Mon Jun 22 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-25
- Make -docs noarch when built on Fedora > 9.

* Mon Jun 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-24
- Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
- Resurrect Finnish translation for hlcutter.

* Tue Jun  9 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-23
- Apply gcc 4.4 build fix from openSUSE and upstream, hlcutter still needs work.
- Drop no longer needed DVB header workaround.

* Tue May 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-22
- Quiet usermod, avoid possible extra -v inserted to /etc/sysconfig/vdr on
  upgrades from earlier releases that used to default to /srv/vdr for video.
- Add jumpplay patch 1.0 and a Finnish translation for it.
- Update liemikuutio patch to 1.27.


vdr-1.6.0-const.diff:
 recording.c |    9 +++++----
 svdrp.c     |   13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE vdr-1.6.0-const.diff ---
Index: vdr-1.6.0/recording.c
===================================================================
--- vdr-1.6.0.orig/recording.c
+++ vdr-1.6.0/recording.c
@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, co
      Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
      Subtitle = SubtitleBuffer;
      }
-  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
-  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
+  const char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
+  const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
   if (macroTITLE || macroEPISODE) {
      name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileN
   sortBuffer = NULL;
   fileName = strdup(FileName);
   FileName += strlen(VideoDirectory) + 1;
-  char *p = strrchr(FileName, '/');
+  const char *p = strrchr(FileName, '/');
 
   name = NULL;
   info = new cRecordingInfo;
@@ -1022,7 +1022,8 @@ void cRecordings::DelByName(const char *
   if (recording) {
      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
      Del(recording, false);
-     char *ext = strrchr(recording->FileName(), '.');
+     // wtf?
+     char *ext = strrchr(const_cast<char*>(recording->FileName()), '.');
      if (ext) {
         strncpy(ext, DELEXT, strlen(ext));
         recording->fileSizeMB = DirSizeMB(recording->FileName());
Index: vdr-1.6.0/svdrp.c
===================================================================
--- vdr-1.6.0.orig/svdrp.c
+++ vdr-1.6.0/svdrp.c
@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
      char *strtok_next;
      FileName = strtok_r(p, delim, &strtok_next);
      // image type:
-     char *Extension = strrchr(FileName, '.');
+     const char *Extension = strrchr(FileName, '.');
      if (Extension) {
         if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
            Jpeg = true;
@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
      char RealFileName[PATH_MAX];
      if (FileName) {
         if (grabImageDir) {
-           cString s;
-           char *slash = strrchr(FileName, '/');
+           cString s(FileName);
+           FileName = s;
+           const char *slash = strrchr(FileName, '/');
            if (!slash) {
               s = AddDirectory(grabImageDir, FileName);
               FileName = s;
               }
            slash = strrchr(FileName, '/'); // there definitely is one
-           *slash = 0;
-           char *r = realpath(FileName, RealFileName);
-           *slash = '/';
+           cString t(s);
+           t.Truncate(slash - FileName);
+           char *r = realpath(t, RealFileName);
            if (!r) {
               LOG_ERROR_STR(FileName);
               Reply(501, "Invalid file name \"%s\"", FileName);

vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff:
 menu.c |   56 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 14 deletions(-)

--- NEW FILE vdr-1.6.0-epgsearch-exttimeredit-0.0.2.diff ---
diff -up vdr-1.6.0/menu.c~ vdr-1.6.0/menu.c
--- vdr-1.6.0/menu.c~	2009-07-25 23:38:59.000000000 +0300
+++ vdr-1.6.0/menu.c	2009-07-25 23:43:54.000000000 +0300
@@ -811,6 +811,7 @@ class cMenuTimerItem : public cOsdItem {
 private:
   cTimer *timer;
   char diskStatus;
+  void DoSet(void);
 public:
   cMenuTimerItem(cTimer *Timer);
   void SetDiskStatus(char DiskStatus);
@@ -823,7 +824,7 @@ cMenuTimerItem::cMenuTimerItem(cTimer *T
 {
   timer = Timer;
   diskStatus = ' ';
-  Set();
+  DoSet();
 }
 
 int cMenuTimerItem::Compare(const cListObject &ListObject) const
@@ -833,6 +834,18 @@ int cMenuTimerItem::Compare(const cListO
 
 void cMenuTimerItem::Set(void)
 {
+  // check for deleted timer
+  for (cTimer *t = Timers.First(); ; t = Timers.Next(t)) {
+     if (t == timer)
+       break;  // timer still there
+     if (t == NULL)
+       return; // no matching timer found
+     }
+  DoSet();
+}
+
+void cMenuTimerItem::DoSet(void)
+{
   cString day, name("");
   if (timer->WeekDays())
      day = timer->PrintDay(0, timer->WeekDays(), false);
@@ -920,8 +933,7 @@ void cTimerEntry::SetDiskStatus(char Dis
 class cMenuTimers : public cOsdMenu {
 private:
   int helpKeys;
-  eOSState Edit(void);
-  eOSState New(void);
+  eOSState Edit(bool New = false);
   eOSState Delete(void);
   eOSState OnOff(void);
   eOSState Info(void);
@@ -998,19 +1010,30 @@ eOSState cMenuTimers::OnOff(void)
   return osContinue;
 }
 
-eOSState cMenuTimers::Edit(void)
+eOSState cMenuTimers::Edit(bool New)
 {
-  if (HasSubMenu() || Count() == 0)
+  if (HasSubMenu() || (Count() == 0 && !New))
      return osContinue;
-  isyslog("editing timer %s", *CurrentTimer()->ToDescr());
-  return AddSubMenu(new cMenuEditTimer(CurrentTimer()));
-}
+  if (!New)
+     isyslog("editing timer %s", *CurrentTimer()->ToDescr());
 
-eOSState cMenuTimers::New(void)
-{
-  if (HasSubMenu())
-     return osContinue;
-  return AddSubMenu(new cMenuEditTimer(new cTimer, true));
+  // Data structure for service "Epgsearch-exttimeredit-v1.0"
+  struct Epgsearch_exttimeredit_v1_0
+  {
+    // in
+    cTimer* timer;          // pointer to the timer to edit
+    bool bNew;              // flag that indicates, if this is a new timer or an existing one
+    const cEvent* event;    // pointer to the event corresponding to this timer (may be NULL)
+    // out
+    cOsdMenu* pTimerMenu;   // pointer to the menu of results
+  } exttimeredit;
+  exttimeredit.timer = New ? (new cTimer) : CurrentTimer();
+  exttimeredit.bNew = New;
+  exttimeredit.event = exttimeredit.timer->Event();
+  if (cPluginManager::CallFirstService("Epgsearch-exttimeredit-v1.0", &exttimeredit))
+    return AddSubMenu(exttimeredit.pTimerMenu);
+
+  return AddSubMenu(new cMenuEditTimer(exttimeredit.timer, New));
 }
 
 eOSState cMenuTimers::Delete(void)
@@ -1165,7 +1188,7 @@ eOSState cMenuTimers::ProcessKey(eKeys K
        case kOk:     return Edit();
        case kRed:    actualiseDiskStatus = true;
                      state = OnOff(); break; // must go through SetHelpKeys()!
-       case kGreen:  return New();
+       case kGreen:  return Edit(true);
        case kYellow: actualiseDiskStatus = true;
                      state = Delete(); break;
        case kInfo:
@@ -1183,6 +1206,11 @@ eOSState cMenuTimers::ProcessKey(eKeys K
      actualiseDiskStatus = true;
      Display();
      }
+  if (!HasSubMenu() && Timers.Count()<Count()) {
+     // timer was deleted
+     cOsdMenu::Del(Current());
+     Display();
+     }
   if (Key != kNone)
      SetHelpKeys();
   return state;

vdr-1.6.0-hlcutter-0.2.2-finnish.patch:
 README-HLCUTTER |    6 +++---
 po/fi_FI.po     |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE vdr-1.6.0-hlcutter-0.2.2-finnish.patch ---
diff -up vdr-1.6.0/po/fi_FI.po~ vdr-1.6.0/po/fi_FI.po
--- vdr-1.6.0/po/fi_FI.po~	2008-03-23 12:31:29.000000000 +0200
+++ vdr-1.6.0/po/fi_FI.po	2009-06-15 19:07:04.000000000 +0300
@@ -743,9 +743,15 @@ msgstr "Pikatallennuksen kesto (min)"
 msgid "Setup.Recording$Max. video file size (MB)"
 msgstr "Suurin tiedostokoko (Mt)"
 
+msgid "Setup.Recording$Max. recording size (GB)"
+msgstr "Suurin tallennekoko (Gt)"
+
 msgid "Setup.Recording$Split edited files"
 msgstr "Jaottele muokatut tallenteet"
 
+msgid "Setup.Recording$Hard Link Cutter"
+msgstr "K?yt? kovia linkkej? muokkauksessa"
+
 msgid "Replay"
 msgstr "Toisto"
 
diff -up vdr-1.6.0/README-HLCUTTER~ vdr-1.6.0/README-HLCUTTER
--- vdr-1.6.0/README-HLCUTTER~	2009-06-15 19:02:59.000000000 +0300
+++ vdr-1.6.0/README-HLCUTTER	2009-06-15 19:04:04.000000000 +0300
@@ -21,7 +21,7 @@ Nevertheless the patch is still in devel
 The patch is EXPERIMENTAL for multiple /videoxx folders. The safety checks 
 should prevent data loss, but you should always carefully check the results.
 
-While editing a recording, the patch searches for any 00x.vdr files that dont
+While editing a recording, the patch searches for any 00x.vdr files that don't
 contain editing marks and would normally be copied 1:1 unmodified to the edited
 recording. In this case the current target 00x.vdr file will be aborted, and 
 the cutter process attempts to duplicate the source file as a hard link, so 
@@ -72,7 +72,7 @@ disabled, the cutter process behaves ide
 There's a //#define HARDLINK_TEST_ONLY in the videodir.c file that enables a
 test-mode that hard-links 00x.vdr_ files only, and continues the classic 
 editing. The resulting 00x.vdr and 00x.vdr_ files should be identical. If you 
-delete the un-edited recording, dont forget to delete the *.vdr_ files too, 
+delete the un-edited recording, don't forget to delete the *.vdr_ files too, 
 they will now eat real disk space.
 
 Note: 'du' displays the disk space of hard links only on first appearance, and
@@ -93,7 +93,7 @@ Version 0.1.4
   Fix: Last edit mark is not a cut-out
   Fix: Write error if link-copied file is smaller than allowed file size
   Fix: Broken index/marks if cut-in is at the start of a new file
-  Fix: Clear dangeling pointer to free'd cUnbufferedFile, 
+  Fix: Clear dangling pointer to free'd cUnbufferedFile, 
        thx to Matthias Schwarzott
 
 Version 0.1.0

vdr-1.6.0-kernel-2.6.29.diff:
 dvbdevice.c |    3 ++-
 dvbdevice.h |    3 ++-
 vdr.c       |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE vdr-1.6.0-kernel-2.6.29.diff ---
Index: vdr-1.6.0/dvbdevice.h
===================================================================
--- vdr-1.6.0.orig/dvbdevice.h
+++ vdr-1.6.0/dvbdevice.h
@@ -10,12 +10,13 @@
 #ifndef __DVBDEVICE_H
 #define __DVBDEVICE_H
 
+#include <linux/types.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/version.h>
 #include "device.h"
 #include "dvbspu.h"
 
-#if DVB_API_VERSION != 3
+#if DVB_API_VERSION != 3 && DVB_API_VERSION != 5
 #error VDR requires Linux DVB driver API version 3!
 #endif
 
Index: vdr-1.6.0/dvbdevice.c
===================================================================
--- vdr-1.6.0.orig/dvbdevice.c
+++ vdr-1.6.0/dvbdevice.c
@@ -7,9 +7,10 @@
  * $Id: dvbdevice.c 1.170 2008/02/09 16:11:44 kls Exp $
  */
 
-#include "dvbdevice.h"
 #include <errno.h>
 #include <limits.h>
+#include <stdint.h>
+#include "dvbdevice.h"
 #include <linux/videodev.h>
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
Index: vdr-1.6.0/vdr.c
===================================================================
--- vdr-1.6.0.orig/vdr.c
+++ vdr-1.6.0/vdr.c
@@ -32,6 +32,7 @@
 #include <pwd.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <linux/types.h>
 #include <sys/capability.h>
 #include <sys/prctl.h>
 #include <termios.h>

vdr-jumpplay-1.0-1.6.0-finnish.patch:
 fi_FI.po |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE vdr-jumpplay-1.0-1.6.0-finnish.patch ---
diff -up vdr-1.6.0/po/fi_FI.po~ vdr-1.6.0/po/fi_FI.po
--- vdr-1.6.0/po/fi_FI.po~	2008-03-23 12:31:29.000000000 +0200
+++ vdr-1.6.0/po/fi_FI.po	2009-05-26 23:40:29.000000000 +0300
@@ -749,6 +749,18 @@ msgstr "Jaottele muokatut tallenteet"
 msgid "Replay"
 msgstr "Toisto"
 
+msgid "Setup.Replay$Jump&Play"
+msgstr "Jatka toistoa hypyn j?lkeen"
+
+msgid "Setup.Replay$Play&Jump"
+msgstr "Ohita merkityt katkot"
+
+msgid "Setup.Replay$Pause at last mark"
+msgstr "Tauko viimeisess? merkinn?ss?"
+
+msgid "Setup.Replay$Reload marks"
+msgstr "Merkint?jen uudelleenlataus"
+
 msgid "Setup.Replay$Multi speed mode"
 msgstr "K?yt? toiston moninopeustilaa"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Apr 2009 15:27:38 -0000	1.19
+++ .cvsignore	9 Aug 2009 20:18:43 -0000	1.20
@@ -7,6 +7,8 @@ vdr-1.6.0-2.diff
 vdr-timer-info-0.5-1.5.15.diff
 vdr-1.6.0-2-ttxtsubs.patch
 vdr-1.6.0-subtitles-button.patch.gz
-vdr-1.6.0-liemikuutio-1.25.diff.gz
 vdr-1.6.0-ionice.patch.gz
 vdr-1.6.0-cap_sys_nice.patch.gz
+vdr-1.6.0-liemikuutio-1.27.diff.gz
+vdr-jumpplay-1.0-1.6.0.diff
+vdr-1.5.13-hlcutter-0.2.2.diff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Apr 2009 15:27:38 -0000	1.19
+++ sources	9 Aug 2009 20:18:43 -0000	1.20
@@ -7,6 +7,8 @@ e9b82b88c1fa21b6fa9734ca240f6192  timerc
 92ee6cdf60b795d9fbcf4fdcafe401b4  vdr-timer-info-0.5-1.5.15.diff
 ded3dacb4be2958c03a50e3064164eb8  vdr-1.6.0-2-ttxtsubs.patch
 bd3221bb080788a87b4560eb0f323f2b  vdr-1.6.0-subtitles-button.patch.gz
-122b40baef4d0c9a3e31e91b1c877e5b  vdr-1.6.0-liemikuutio-1.25.diff.gz
 bc2dbfe11e0ddbc791ceb2f659081c8c  vdr-1.6.0-ionice.patch.gz
 32004893569e9a68f17d2b4b93410ed5  vdr-1.6.0-cap_sys_nice.patch.gz
+189117c22de7932bbfa770091f5d36e0  vdr-1.6.0-liemikuutio-1.27.diff.gz
+1ff8f1a90e02b11a42218ffba18b5f26  vdr-jumpplay-1.0-1.6.0.diff
+6c3dccda1910103449984677ed0bfcf4  vdr-1.5.13-hlcutter-0.2.2.diff


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-11/vdr.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- vdr.spec	18 Apr 2009 09:07:26 -0000	1.43
+++ vdr.spec	9 Aug 2009 20:18:44 -0000	1.44
@@ -5,26 +5,29 @@
 # - ACPI wakeup handling using "svdrpsend NEXT {ABS|REL}" output for cases
 #   where the VDR box is shut down without using the shutdown script (e.g.
 #   explicit shutdown/poweroff outside of VDR, power button press etc)
+# - pause patch (causes OSD placement issues at least with unrebuilt text2skin)
+#   http://www.tolleri.net/vdr/vdr/vdr-1.6.0-2-pause-0.0.1.patch
+#   http://thread.gmane.org/gmane.linux.vdr/40188
 
 %bcond_with       docs
 %bcond_with       plugins
 
-%define varbase   %{_var}/lib/vdr
-%define videodir  %{varbase}/video
-%define vardir    %{varbase}/data
-%define plugindir %{_libdir}/vdr
-%define configdir %{_sysconfdir}/vdr
-%define datadir   %{_datadir}/vdr
-%define cachedir  %{_var}/cache/vdr
-%define rundir    %{_var}/run/vdr
-%define vdr_user  vdr
-%define vdr_group video
+%global varbase   %{_var}/lib/vdr
+%global videodir  %{varbase}/video
+%global vardir    %{varbase}/data
+%global plugindir %{_libdir}/vdr
+%global configdir %{_sysconfdir}/vdr
+%global datadir   %{_datadir}/vdr
+%global cachedir  %{_var}/cache/vdr
+%global rundir    %{_var}/run/vdr
+%global vdr_user  vdr
+%global vdr_group video
 # From APIVERSION in config.h
-%define apiver    1.6.0
+%global apiver    1.6.0
 
 Name:           vdr
 Version:        1.6.0
-Release:        21%{?dist}
+Release:        27%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -53,7 +56,7 @@ Source17:       %{name}-halt.local.sh
 Patch0:         %{name}-channel+epg.patch
 # TODO
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.25.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.27.diff.gz
 Patch3:         %{name}-1.6.0-scriptnames.patch
 Patch4:         %{name}-1.6.0-paths.patch
 Patch5:         %{name}-1.5.18-use-pkgconfig.patch
@@ -62,11 +65,10 @@ Patch6:         %{name}-1.5.18-syncearly
 # http://projects.vdr-developer.org/repositories/entry/plg-ttxtsubs/patches/vdr-1.6.0-2-ttxtsubs.patch?format=raw
 Patch7:         %{name}-1.6.0-2-ttxtsubs.patch
 Patch8:         %{name}-1.6.0-man-section.patch
-# Patch9: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
-# edited so that it applies on top of the liemikuutio patch (menu.c)
-Patch9:         %{name}-1.5.18-hlcutter-0.2.0.diff
-# TODO
-Patch10:        %{name}-1.4.7-hlcutter-0.2.0-finnish.patch
+# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
+Patch9:         http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.2.diff
+# Sent to hlcutter upstream 2009-06-15
+Patch10:        %{name}-1.6.0-hlcutter-0.2.2-finnish.patch
 # mainmenuhooks, timercmd and progressbar-support from
 # http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-0.9.24.tgz
 Patch11:        MainMenuHooks-v1_0.patch
@@ -78,11 +80,19 @@ Patch16:        %{name}-1.6.0-dxr3-subti
 Patch17:        http://toms-cafe.de/vdr/download/vdr-timer-info-0.5-1.5.15.diff
 Patch18:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-1.diff
 Patch19:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff
-Patch20:        %{name}-1.6.0-remove-dvb-abi-check.patch
+# From openSUSE's vdr-1.6.0-62.3, fixes build with (broken? #483644) dvb headers
+Patch20:        %{name}-1.6.0-kernel-2.6.29.diff
 Patch21:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz
 Patch22:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-cap_sys_nice.patch.gz
 Patch23:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ionice.patch.gz
-Patch24:        %{name}-1.6.0-gcc44.patch
+# From openSUSE's vdr-1.6.0-62.3, to fix build with gcc 4.4:
+# http://download.opensuse.org/repositories/vdr/
+Patch24:        %{name}-1.6.0-const.diff
+Patch25:        http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.6.0.diff
+Patch26:        %{name}-jumpplay-1.0-1.6.0-finnish.patch
+# http://projects.vdr-developer.org/git/?p=vdr-plugin-epgsearch.git;a=blob;f=patches/vdr.epgsearch-exttimeredit-0.0.2.diff
+# Modified so that it applies on top of our other patches
+Patch27:        %{name}-1.6.0-epgsearch-exttimeredit-0.0.2.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -102,7 +112,11 @@ Requires:       udev >= 136-1
 Requires(pre):  shadow-utils >= 2:4.1.1
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+Provides:       vdr(abi)%{?_isa} = %{apiver}
+%if "%{?_isa}" != ""
+# Deprecated backwards compatibility, plugins should depend on vdr(abi)%{?_isa}
 Provides:       vdr(abi) = %{apiver}
+%endif
 Obsoletes:      vdr-subtitles <= 0.5.0
 
 %description
@@ -123,6 +137,9 @@ Provides:       vdr-devel(api) = %{apive
 %package        docs
 Summary:        Developer documentation for VDR
 Group:          Documentation
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:      noarch
+%endif
 
 %description    docs
 %{summary}.
@@ -133,7 +150,7 @@ Group:          Applications/Multimedia
 %if %{with plugins}
 BuildRequires:  ncurses-devel
 %endif # plugins
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description    skincurses
 The skincurses plugin implements a VDR skin that works in a shell
@@ -142,7 +159,7 @@ window, using only plain text output.
 %package        sky
 Summary:        Sky Digibox plugin for VDR
 Group:          Applications/Multimedia
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 Requires:       wget
 Requires:       /usr/bin/logger
 
@@ -170,9 +187,6 @@ patch -F 0 -i debian/patches/10_livelock
 patch -F 0 -i debian/patches/11_atsc.dpatch
 echo "DEFINES += -DHAVE_ATSC" >> Makefile
 patch -F 0 -i debian/patches/19_debian_osdbase_maxitems.dpatch
-# TODO: does not apply, check upstream for a 1.6.x version:
-#       http://www.ktverkko.fi/~msmakela/software/vdr/
-#patch -F 0 -i debian/patches/opt-20_suspend.dpatch
 %patch2 -p1
 %patch3 -p1
 sed \
@@ -186,28 +200,29 @@ sed \
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
-patch -p0 -F 1 -i %{PATCH9}
-# TODO: does not apply
-#patch10 -p0
-patch -p1 -F 2 -i %{PATCH11}
+# fuzz=3 so it applies on top of liemikuutio patch (menu.c)
+%patch9 -p0 -F 3
+%patch10 -p1
+%patch11 -p1 -F 2
 # timer-info patch needs to come before timercmd patch to avoid conflicts
 %patch17 -p1
-patch -p1 -F 2 -i %{PATCH12}
+%patch12 -p1 -F 2
 %patch13 -p1
-patch -p0 -F 2 -i %{PATCH14}
+%patch14 -p0 -F 2
 %patch15 -p0
 %patch16 -p0
 %patch18 -p1
 %patch19 -p1
-%patch20 -p0
+%patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%if "%(g++ -dumpversion)" >= "4.4"
 %patch24 -p1
-%endif
+%patch25 -p1 -F 2
+%patch26 -p1
+%patch27 -p1
 
-for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
+for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.{jumpplay,timer-info} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
@@ -254,9 +269,6 @@ endif
 ifdef PLUGIN
   CFLAGS    += -fPIC
   CXXFLAGS  += -fPIC
-else
-  # https://bugzilla.redhat.com/483644
-  CXXFLAGS  += -D__KERNEL_STRICT_NAMES
 endif
 
 MANDIR       = %{_mandir}
@@ -427,7 +439,7 @@ if [ $1 -gt 1 -a -d /srv/vdr ] ; then
 
     # Continue to use /srv/vdr as the video dir for old setups
     f=%{_sysconfdir}/sysconfig/vdr
-    if ! grep -q '^\s*VDR_OPTIONS.* -v' $f ; then
+    if ! grep -q '^\s*VDR_OPTIONS.*[( ]-v' $f ; then
         sed -i -e 's|^\(\s*VDR_OPTIONS.*(\)\(.*\)|\1-v /srv/vdr \2|' $f
     fi
 
@@ -437,7 +449,7 @@ if [ $1 -gt 1 -a -d /srv/vdr ] ; then
     done
 
     # Set new home dir
-    usermod -d %{vardir} %{vdr_user}
+    usermod -d %{vardir} %{vdr_user} 2>/dev/null
 fi
 /sbin/chkconfig --add vdr || :
 
@@ -531,6 +543,33 @@ fi
 %endif # plugins
 
 %changelog
+* Sun Aug  9 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-27
+- Make -docs noarch also when built on EL > 5.
+
+* Sun Jul 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-26
+- Provide ISA qualified vdr(abi).  Plugins should depend on (versioned)
+  vdr(abi)%%{?_isa} instead of just vdr(abi).
+- Borrow build patch for recent (broken? #483644) DVB headers from openSUSE.
+- Apply epgsearch timer integration patch.
+- Use %%global instead of %%define.
+
+* Mon Jun 22 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-25
+- Make -docs noarch when built on Fedora > 9.
+
+* Mon Jun 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-24
+- Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
+- Resurrect Finnish translation for hlcutter.
+
+* Tue Jun  9 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-23
+- Apply gcc 4.4 build fix from openSUSE and upstream, hlcutter still needs work.
+- Drop no longer needed DVB header workaround.
+
+* Tue May 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-22
+- Quiet usermod, avoid possible extra -v inserted to /etc/sysconfig/vdr on
+  upgrades from earlier releases that used to default to /srv/vdr for video.
+- Add jumpplay patch 1.0 and a Finnish translation for it.
+- Update liemikuutio patch to 1.27.
+
 * Sat Apr 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.0-21
 - Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.
 


--- vdr-1.4.7-hlcutter-0.2.0-finnish.patch DELETED ---


--- vdr-1.5.18-hlcutter-0.2.0.diff DELETED ---


--- vdr-1.6.0-gcc44.patch DELETED ---


--- vdr-1.6.0-remove-dvb-abi-check.patch DELETED ---



From ensc at fedoraproject.org  Sun Aug  9 20:44:18 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 20:44:18 +0000 (UTC)
Subject: rpms/tor/devel tor-0.2.1.19-geoippath.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 lastver, 1.8, 1.9 sources, 1.17, 1.18 tor.spec, 1.34,
	1.35 tor-0.2.0.32-geoippath.patch, 1.1, NONE
Message-ID: <20090809204418.BE4BD11C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12878

Modified Files:
	.cvsignore lastver sources tor.spec 
Added Files:
	tor-0.2.1.19-geoippath.patch 
Removed Files:
	tor-0.2.0.32-geoippath.patch 
Log Message:
- updated to 0.2.1.19


tor-0.2.1.19-geoippath.patch:
 config.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tor-0.2.1.19-geoippath.patch ---
Index: tor-0.2.1.19/src/or/config.c
===================================================================
--- tor-0.2.1.19.orig/src/or/config.c
+++ tor-0.2.1.19/src/or/config.c
@@ -218,7 +218,7 @@ static config_var_t _option_vars[] = {
   V(GeoIPFile,                   FILENAME, "<default>"),
 #else
   V(GeoIPFile,                   FILENAME,
-    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
+    "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
 #endif
   OBSOLETE("Group"),
   V(HardwareAccel,               BOOL,     "0"),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Jun 2009 08:05:11 -0000	1.8
+++ .cvsignore	9 Aug 2009 20:44:18 -0000	1.9
@@ -1,2 +1,2 @@
-tor-0.2.0.35.tar.gz
-tor-0.2.0.35.tar.gz.asc
+tor-0.2.1.19.tar.gz
+tor-0.2.1.19.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/lastver,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lastver	26 Jun 2009 08:05:11 -0000	1.8
+++ lastver	9 Aug 2009 20:44:18 -0000	1.9
@@ -1 +1 @@
-0.2.0.35
+0.2.1.19


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	26 Jun 2009 08:05:11 -0000	1.17
+++ sources	9 Aug 2009 20:44:18 -0000	1.18
@@ -1,2 +1,2 @@
-d4841e1b4d54866495fd373e865b2d44  tor-0.2.0.35.tar.gz
-39b6934d8918f78aec986b9538546fa9  tor-0.2.0.35.tar.gz.asc
+2c0ca9bf5d0cfb771f4d6bec9c4360ca  tor-0.2.1.19.tar.gz
+e31326ab92b82cb0b8b1b829f637c8ef  tor-0.2.1.19.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- tor.spec	27 Jul 2009 06:07:05 -0000	1.34
+++ tor.spec	9 Aug 2009 20:44:18 -0000	1.35
@@ -12,8 +12,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.0.35
-Release:	%release_func 2
+Version:	0.2.1.19
+Release:	%release_func 0
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -31,7 +31,7 @@ Source1:	http://tor.eff.org/dist/%name-%
 Source2:	tor.logrotate
 Source3:	update-geoip
 Source4:	netfilter-ipv4.h
-Patch1:		tor-0.2.0.32-geoippath.patch
+Patch1:		tor-0.2.1.19-geoippath.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	libevent-devel openssl-devel transfig ghostscript
@@ -120,7 +120,6 @@ install -p -m0644 %SOURCE3 .
 
 sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in
 cat <<EOF >>src/config/torrc.sample.in
-Group %username
 User  %username
 EOF
 
@@ -235,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.19-0
+- updated to 0.2.1.19
+- rediffed patches
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- tor-0.2.0.32-geoippath.patch DELETED ---



From ensc at fedoraproject.org  Sun Aug  9 20:49:14 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun,  9 Aug 2009 20:49:14 +0000 (UTC)
Subject: rpms/kismet/devel kismet_capture.pam,1.1,1.2 kismet.spec,1.28,1.29
Message-ID: <20090809204914.4126B11C00D7@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13992

Modified Files:
	kismet_capture.pam kismet.spec 
Log Message:
- enhanced kismet_capture's pam configuration file



Index: kismet_capture.pam
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet_capture.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kismet_capture.pam	9 Aug 2009 15:00:06 -0000	1.1
+++ kismet_capture.pam	9 Aug 2009 20:49:13 -0000	1.2
@@ -1,8 +1,13 @@
 #%PAM-1.0
+
 auth		sufficient	pam_rootok.so
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth		sufficient	pam_wheel.so trust use_uid
+# Uncomment the following line to use cached succesful authentication attempts
 #auth		sufficient	pam_timestamp.so
 auth		include		system-auth
+
 account		required	pam_permit.so
+
 session		required	pam_permit.so
-session		optional	pam_xauth.so
 #session	optional	pam_timestamp.so


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kismet.spec	9 Aug 2009 15:48:29 -0000	1.28
+++ kismet.spec	9 Aug 2009 20:49:14 -0000	1.29
@@ -10,7 +10,7 @@
 Summary:	WLAN detector, sniffer and IDS
 Name:		kismet
 Version:	%_rpmversion
-Release:	%release_func 1
+Release:	%release_func 2
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.kismetwireless.net/
@@ -142,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %_libdir/kismet
 %dir %_libdir/kismet_client
 
-%_sysconfdir/pam.d/*
+%config(noreplace) %_sysconfdir/pam.d/*
 %_sysconfdir/security/console.apps/*
 %_libexecdir/*
 
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+- enhanced kismet_capture's pam configuration file
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2009.06.R1-1
 - added Obsoletes: entry for old -extras subpackage
 



From pkgdb at fedoraproject.org  Sun Aug  9 20:58:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 09 Aug 2009 20:58:41 +0000
Subject: [pkgdb] vdr-subtitles ownership updated
Message-ID: <20090809205841.49D8210F876@bastion2.fedora.phx.redhat.com>

Package vdr-subtitles in Fedora 7 was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-subtitles



From pkgdb at fedoraproject.org  Sun Aug  9 20:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 09 Aug 2009 20:58:47 +0000
Subject: [pkgdb] vdr-subtitles ownership updated
Message-ID: <20090809205847.D980410F89B@bastion2.fedora.phx.redhat.com>

Package vdr-subtitles in Fedora 8 was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-subtitles



From pkgdb at fedoraproject.org  Sun Aug  9 20:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 09 Aug 2009 20:58:51 +0000
Subject: [pkgdb] vdr-subtitles ownership updated
Message-ID: <20090809205852.0379910F8AF@bastion2.fedora.phx.redhat.com>

Package vdr-subtitles in Fedora 9 was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-subtitles



From pkgdb at fedoraproject.org  Sun Aug  9 20:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 09 Aug 2009 20:59:08 +0000
Subject: [pkgdb] vdr-subtitles ownership updated
Message-ID: <20090809205912.DE07E10F8C6@bastion2.fedora.phx.redhat.com>

Package vdr-subtitles in Fedora devel was orphaned by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-subtitles



From pkgdb at fedoraproject.org  Sun Aug  9 20:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 09 Aug 2009 20:59:08 +0000
Subject: [pkgdb] vdr-subtitles (un)retirement
Message-ID: <20090809205913.ED11E10F8BC@bastion2.fedora.phx.redhat.com>

Package vdr-subtitles in Fedora devel has been retired by scop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-subtitles



From gemi at fedoraproject.org  Sun Aug  9 21:39:19 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 21:39:19 +0000 (UTC)
Subject: rpms/bigloo/devel bigloo-destdir.patch, NONE, 1.1 bigloo.spec, 1.32,
	1.33 sources, 1.17, 1.18 bigloo-java-1.5.patch, 1.2,
	NONE bigloo-javaht.patch, 1.3, NONE bigloo-javassl.patch, 1.1, NONE
Message-ID: <20090809213919.AC1F111C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26504

Modified Files:
	bigloo.spec sources 
Added Files:
	bigloo-destdir.patch 
Removed Files:
	bigloo-java-1.5.patch bigloo-javaht.patch bigloo-javassl.patch 
Log Message:
new release 3.2b

bigloo-destdir.patch:
 Makefile |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE bigloo-destdir.patch ---
diff -up bigloo3.2b/bdb/Makefile.destdir bigloo3.2b/bdb/Makefile
--- bigloo3.2b/bdb/Makefile.destdir	2009-08-09 13:14:05.000000000 -0600
+++ bigloo3.2b/bdb/Makefile	2009-08-09 13:17:38.000000000 -0600
@@ -85,14 +85,14 @@ install:
            mkdir -p $(DESTDIR)$(BINDIR) && \
 	   cp $(BOOTBINDIR)/bdb $(DESTDIR)$(BINDIR) && \
 	   chmod $(BMASK) $(DESTDIR)$(BINDIR)/bdb && \
-           mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \
-	   cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \
-           chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
+           mkdir -p $(LIBDIR)/$(FILDIR) && \
+	   cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \
+           chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
         fi
 	if [ $(FILDIR) != $(BOOTLIBDIR) ]; then \
-           mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \
-	   cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \
-           chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
+           mkdir -p $(LIBDIR)/$(FILDIR) && \
+	   cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \
+           chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
         fi
 	$(MAKE) install-lib LIB=libbigloobdb_s-$(RELEASE)
 


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- bigloo.spec	24 Jul 2009 18:01:40 -0000	1.32
+++ bigloo.spec	9 Aug 2009 21:39:19 -0000	1.33
@@ -1,32 +1,30 @@
-%define _with_java 1
-
-Name:		bigloo
-Version: 	3.1b
-Release:	6%{?dist}
-Summary: 	Bigloo is compiler for the Scheme programming language
-
-Group:		Development/Languages
-License:	GPLv2+
-URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
-Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
-Patch1:         bigloo-javaht.patch
-Patch2:		bigloo-java-1.5.patch
+Name:           bigloo
+Version:        3.2b
+Release:        1%{?dist}
+Summary:        Bigloo is compiler for the Scheme programming language
+
+Group:          Development/Languages
+License:        GPLv2+
+URL:            http://www-sop.inria.fr/mimosa/fp/Bigloo
+Source:         ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}-2.tar.gz
+Patch3:	        bigloo-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	xemacs
 BuildRequires:	xemacs-el
-BuildRequires:	indent
 BuildRequires:	/sbin/install-info
+BuildRequires:	indent
+BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:	zip
-BuildRequires:  indent
-BuildRequires:  sqlite-devel
-BuildRequires:	java-1.5.0-gcj-devel
-BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  gstreamer-devel
+BuildRequires:  gc-devel
 BuildRequires:  gmp-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  indent
 BuildRequires:  openssl-devel
-Requires:	bigloo-libs = %{version}-%{release}
+BuildRequires:  sqlite-devel
+Requires:       bigloo-libs = %{version}-%{release}
 Requires:       indent
 Requires:       gmp-devel
 Requires(post):	   /sbin/install-info
@@ -80,8 +78,7 @@ XEmacs development environment for Biglo
 
 %prep
 %setup -q -n %{name}%{version}
-%patch1 -p1
-%patch2 -p1
+%patch3 -p1
 sed -i 's|bmask=755|bmask=644|' configure
 
 
@@ -89,8 +86,12 @@ sed -i 's|bmask=755|bmask=644|' configur
 %define emacslisppath %{_datadir}/emacs/site-lisp
 %define xemacslisppath %{_datadir}/xemacs/site-packages/lisp
 %define inplace `pwd`/inplace
-%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g'`"
+%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g' | sed 's/FORTIFY_SOURCE=./FORTIFY_SOURCE=0/g'`"
+%define bigloo_opt_flags_ -O2 -g -pipe -fexceptions -fstack-protector --param=ssp-buffer-size=4
+
 
+CFLAGS="%bigloo_opt_flags"
+export CFLAGS
 ./configure \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
@@ -103,13 +104,13 @@ sed -i 's|bmask=755|bmask=644|' configur
 	--native-default-backend \
 	--emacs=emacs \
 	--dotnet=no \
-	%{?_with_java: --jvm=yes} \
-	%{!?_with_java: --jvm=no} \
+	--jvm=yes \
 	--sharedbde=yes \
 	--sharedcompiler=yes \
-	--coflags=%{bigloo_opt_flags}
+	--customgc=no \
+	--coflags="$CFLAGS"
 
-sed -i 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
+sed -i 's/^EMACSBRAND.*/EMACSBRAND=emacs22/g' Makefile.config
 
 # _smp_mflags breaks the build
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
@@ -129,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
     make DESTDIR=$RPM_BUILD_ROOT install
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
-    make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=$RPM_BUILD_ROOT%{emacslisppath}/bigloo install-bee
+    make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=%{emacslisppath}/bigloo install-bee
 make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee
 
 # fix permissions
@@ -142,10 +143,10 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/*
     rm -f *.so
     mv bigloo/%{version}/*.so .
     # seems to need to be hard linked so that it is provided by the package
-    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
-    do
-        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
-    done
+#    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
+#    do
+#        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
+#    done
     (cd bigloo/%{version}; ln -sf ../../*.so .)
 )
 
@@ -226,6 +227,9 @@ fi
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.2b-1
+- new release 3.2b
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1b-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2008 19:17:25 -0000	1.17
+++ sources	9 Aug 2009 21:39:19 -0000	1.18
@@ -1 +1 @@
-1c44c3dc0f3b8953178a7918e4c442ab  bigloo3.1b.tar.gz
+48d8853e108436469ee858116b3da00d  bigloo3.2b-2.tar.gz


--- bigloo-java-1.5.patch DELETED ---


--- bigloo-javaht.patch DELETED ---


--- bigloo-javassl.patch DELETED ---



From rdieter at fedoraproject.org  Sun Aug  9 21:40:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 21:40:22 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.231,1.232
Message-ID: <20090809214022.54D5311C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26868

Modified Files:
	kdebindings.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- manually specify PYTHON_LIBRARIES (and friends) (#516386)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- kdebindings.spec	3 Aug 2009 10:25:30 -0000	1.231
+++ kdebindings.spec	9 Aug 2009 21:40:22 -0000	1.232
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -253,7 +253,9 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-%patch2 -p1 -b .fix-kpythonpluginfactory
+## Manually speciify PYTHON_LIBRARIES below in lieu of
+## a better, working, upstreamable patch
+#patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
 
@@ -262,6 +264,9 @@ Falcon plugin for the Kross archtecture 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DPYTHON_LIBRARY=%{_libdir}/libpython%{python_ver}.so.1.0 \
+  -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python_ver}.so.1.0 \
+  -DPYTHON_INCLUDE_PATH=%{_includedir}/python%{python_ver} \
   %if 0%{?csharp}
     -DENABLE_QYOTO=ON \
   %else
@@ -505,6 +510,9 @@ fi
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- manually specify PYTHON_LIBRARIES (and friends) (#516386)
+
 * Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
 - respin
 



From rdieter at fedoraproject.org  Sun Aug  9 21:43:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 21:43:53 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec,1.202,1.203
Message-ID: <20090809214353.A031111C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27900

Modified Files:
	kdebindings.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- manually specify PYTHON_LIBRARIES (and friends) (#516386)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- kdebindings.spec	5 Aug 2009 02:45:54 -0000	1.202
+++ kdebindings.spec	9 Aug 2009 21:43:53 -0000	1.203
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -253,7 +253,9 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-%patch2 -p1 -b .fix-kpythonpluginfactory
+## Manually speciify PYTHON_LIBRARIES below in lieu of
+## a better, working, upstreamable patch
+#patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
 
@@ -262,6 +264,9 @@ Falcon plugin for the Kross archtecture 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DPYTHON_LIBRARY=%{_libdir}/libpython%{python_ver}.so.1.0 \
+  -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python_ver}.so.1.0 \
+  -DPYTHON_INCLUDE_PATH=%{_includedir}/python%{python_ver} \
   %if 0%{?csharp}
     -DENABLE_QYOTO=ON \
   %else
@@ -505,6 +510,9 @@ fi
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- manually specify PYTHON_LIBRARIES (and friends) (#516386)
+
 * Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
 - respin
 



From gemi at fedoraproject.org  Sun Aug  9 22:05:39 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 22:05:39 +0000 (UTC)
Subject: rpms/bigloo/F-11 bigloo.spec, 1.31, 1.32 sources, 1.17,
	1.18 bigloo-java-1.5.patch, 1.2, NONE bigloo-javaht.patch, 1.3,
	NONE bigloo-javassl.patch, 1.1, NONE
Message-ID: <20090809220539.AF87611C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv670

Modified Files:
	bigloo.spec sources 
Removed Files:
	bigloo-java-1.5.patch bigloo-javaht.patch bigloo-javassl.patch 
Log Message:
new release 3.2b


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-11/bigloo.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- bigloo.spec	24 Feb 2009 04:37:53 -0000	1.31
+++ bigloo.spec	9 Aug 2009 22:05:39 -0000	1.32
@@ -1,32 +1,30 @@
-%define _with_java 1
-
-Name:		bigloo
-Version: 	3.1b
-Release:	5%{?dist}
-Summary: 	Bigloo is compiler for the Scheme programming language
-
-Group:		Development/Languages
-License:	GPLv2+
-URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
-Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
-Patch1:         bigloo-javaht.patch
-Patch2:		bigloo-java-1.5.patch
+Name:           bigloo
+Version:        3.2b
+Release:        1%{?dist}
+Summary:        Bigloo is compiler for the Scheme programming language
+
+Group:          Development/Languages
+License:        GPLv2+
+URL:            http://www-sop.inria.fr/mimosa/fp/Bigloo
+Source:         ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}-2.tar.gz
+Patch3:	        bigloo-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	xemacs
 BuildRequires:	xemacs-el
-BuildRequires:	indent
 BuildRequires:	/sbin/install-info
+BuildRequires:	indent
+BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:	zip
-BuildRequires:  indent
-BuildRequires:  sqlite-devel
-BuildRequires:	java-1.5.0-gcj-devel
-BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  gstreamer-devel
+BuildRequires:  gc-devel
 BuildRequires:  gmp-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  indent
 BuildRequires:  openssl-devel
-Requires:	bigloo-libs = %{version}-%{release}
+BuildRequires:  sqlite-devel
+Requires:       bigloo-libs = %{version}-%{release}
 Requires:       indent
 Requires:       gmp-devel
 Requires(post):	   /sbin/install-info
@@ -66,7 +64,7 @@ Group:		Development/Languages
 Requires:	emacs-common
 
 %description emacs
-Emacs development environment for Bigloo
+Emacs development environment for Bigloo.
 
 
 %package xemacs
@@ -75,13 +73,12 @@ Group:		Development/Languages
 Requires:	xemacs-common
 
 %description xemacs
-XEmacs development environment for Bigloo
+XEmacs development environment for Bigloo.
 
 
 %prep
 %setup -q -n %{name}%{version}
-%patch1 -p1
-%patch2 -p1
+%patch3 -p1
 sed -i 's|bmask=755|bmask=644|' configure
 
 
@@ -89,8 +86,12 @@ sed -i 's|bmask=755|bmask=644|' configur
 %define emacslisppath %{_datadir}/emacs/site-lisp
 %define xemacslisppath %{_datadir}/xemacs/site-packages/lisp
 %define inplace `pwd`/inplace
-%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g'`"
+%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g' | sed 's/FORTIFY_SOURCE=./FORTIFY_SOURCE=0/g'`"
+%define bigloo_opt_flags_ -O2 -g -pipe -fexceptions -fstack-protector --param=ssp-buffer-size=4
+
 
+CFLAGS="%bigloo_opt_flags"
+export CFLAGS
 ./configure \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
@@ -103,13 +104,13 @@ sed -i 's|bmask=755|bmask=644|' configur
 	--native-default-backend \
 	--emacs=emacs \
 	--dotnet=no \
-	%{?_with_java: --jvm=yes} \
-	%{!?_with_java: --jvm=no} \
+	--jvm=yes \
 	--sharedbde=yes \
 	--sharedcompiler=yes \
-	--coflags=%{bigloo_opt_flags}
+	--customgc=no \
+	--coflags="$CFLAGS"
 
-sed -i 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
+sed -i 's/^EMACSBRAND.*/EMACSBRAND=emacs22/g' Makefile.config
 
 # _smp_mflags breaks the build
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
@@ -129,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
     make DESTDIR=$RPM_BUILD_ROOT install
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
-    make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=$RPM_BUILD_ROOT%{emacslisppath}/bigloo install-bee
+    make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=%{emacslisppath}/bigloo install-bee
 make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee
 
 # fix permissions
@@ -142,10 +143,10 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/*
     rm -f *.so
     mv bigloo/%{version}/*.so .
     # seems to need to be hard linked so that it is provided by the package
-    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
-    do
-        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
-    done
+#    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
+#    do
+#        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
+#    done
     (cd bigloo/%{version}; ln -sf ../../*.so .)
 )
 
@@ -226,6 +227,9 @@ fi
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.2b-1
+- new release 3.2b
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1b-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2008 19:17:25 -0000	1.17
+++ sources	9 Aug 2009 22:05:39 -0000	1.18
@@ -1 +1 @@
-1c44c3dc0f3b8953178a7918e4c442ab  bigloo3.1b.tar.gz
+48d8853e108436469ee858116b3da00d  bigloo3.2b-2.tar.gz


--- bigloo-java-1.5.patch DELETED ---


--- bigloo-javaht.patch DELETED ---


--- bigloo-javassl.patch DELETED ---



From gemi at fedoraproject.org  Sun Aug  9 22:06:02 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 22:06:02 +0000 (UTC)
Subject: rpms/bigloo/F-11 bigloo-destdir.patch,NONE,1.1
Message-ID: <20090809220602.BF42F11C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv796

Added Files:
	bigloo-destdir.patch 
Log Message:


bigloo-destdir.patch:
 Makefile |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE bigloo-destdir.patch ---
diff -up bigloo3.2b/bdb/Makefile.destdir bigloo3.2b/bdb/Makefile
--- bigloo3.2b/bdb/Makefile.destdir	2009-08-09 13:14:05.000000000 -0600
+++ bigloo3.2b/bdb/Makefile	2009-08-09 13:17:38.000000000 -0600
@@ -85,14 +85,14 @@ install:
            mkdir -p $(DESTDIR)$(BINDIR) && \
 	   cp $(BOOTBINDIR)/bdb $(DESTDIR)$(BINDIR) && \
 	   chmod $(BMASK) $(DESTDIR)$(BINDIR)/bdb && \
-           mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \
-	   cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \
-           chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
+           mkdir -p $(LIBDIR)/$(FILDIR) && \
+	   cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \
+           chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
         fi
 	if [ $(FILDIR) != $(BOOTLIBDIR) ]; then \
-           mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \
-	   cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \
-           chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
+           mkdir -p $(LIBDIR)/$(FILDIR) && \
+	   cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \
+           chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
         fi
 	$(MAKE) install-lib LIB=libbigloobdb_s-$(RELEASE)
 



From gemi at fedoraproject.org  Sun Aug  9 22:08:27 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 22:08:27 +0000 (UTC)
Subject: rpms/bigloo/devel bigloo.spec,1.33,1.34
Message-ID: <20090809220827.75AEC11C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1381/devel

Modified Files:
	bigloo.spec 
Log Message:



Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- bigloo.spec	9 Aug 2009 21:39:19 -0000	1.33
+++ bigloo.spec	9 Aug 2009 22:08:27 -0000	1.34
@@ -64,7 +64,7 @@ Group:		Development/Languages
 Requires:	emacs-common
 
 %description emacs
-Emacs development environment for Bigloo
+Emacs development environment for Bigloo.
 
 
 %package xemacs
@@ -73,7 +73,7 @@ Group:		Development/Languages
 Requires:	xemacs-common
 
 %description xemacs
-XEmacs development environment for Bigloo
+XEmacs development environment for Bigloo.
 
 
 %prep



From robert at fedoraproject.org  Sun Aug  9 22:23:46 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  9 Aug 2009 22:23:46 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.40, 1.41 phpMyAdmin.spec, 1.44, 
	1.45 sources, 1.40, 1.41
Message-ID: <20090809222346.9971111C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3785/F-10

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	30 Jun 2009 11:52:59 -0000	1.40
+++ .cvsignore	9 Aug 2009 22:23:45 -0000	1.41
@@ -1 +1 @@
-phpMyAdmin-3.2.0.1-all-languages.tar.bz2
+phpMyAdmin-3.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- phpMyAdmin.spec	30 Jun 2009 11:52:59 -0000	1.44
+++ phpMyAdmin.spec	9 Aug 2009 22:23:45 -0000	1.45
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.0.1
+Version: 3.2.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Aug 10 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-1
+- Upstream released 3.2.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 30 2009 Robert Scheck <robert at fedoraproject.org> 3.2.0.1-1
 - Upstream released 3.2.0.1 (#508879)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	30 Jun 2009 11:52:59 -0000	1.40
+++ sources	9 Aug 2009 22:23:45 -0000	1.41
@@ -1 +1 @@
-e6f19a8c286697c4dccfae574cd41826  phpMyAdmin-3.2.0.1-all-languages.tar.bz2
+f6b0273cba534fefa0a1d69b78a003df  phpMyAdmin-3.2.1-all-languages.tar.bz2



From robert at fedoraproject.org  Sun Aug  9 22:23:46 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  9 Aug 2009 22:23:46 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-11 .cvsignore, 1.40, 1.41 phpMyAdmin.spec, 1.45, 
	1.46 sources, 1.40, 1.41
Message-ID: <20090809222346.A7F9911C0439@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3785/F-11

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	30 Jun 2009 11:52:59 -0000	1.40
+++ .cvsignore	9 Aug 2009 22:23:46 -0000	1.41
@@ -1 +1 @@
-phpMyAdmin-3.2.0.1-all-languages.tar.bz2
+phpMyAdmin-3.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- phpMyAdmin.spec	30 Jun 2009 11:52:59 -0000	1.45
+++ phpMyAdmin.spec	9 Aug 2009 22:23:46 -0000	1.46
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.0.1
+Version: 3.2.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Mon Aug 10 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-1
+- Upstream released 3.2.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 30 2009 Robert Scheck <robert at fedoraproject.org> 3.2.0.1-1
 - Upstream released 3.2.0.1 (#508879)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	30 Jun 2009 11:52:59 -0000	1.40
+++ sources	9 Aug 2009 22:23:46 -0000	1.41
@@ -1 +1 @@
-e6f19a8c286697c4dccfae574cd41826  phpMyAdmin-3.2.0.1-all-languages.tar.bz2
+f6b0273cba534fefa0a1d69b78a003df  phpMyAdmin-3.2.1-all-languages.tar.bz2



From robert at fedoraproject.org  Sun Aug  9 22:23:47 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun,  9 Aug 2009 22:23:47 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.40, 1.41 phpMyAdmin.spec, 1.46, 
	1.47 sources, 1.40, 1.41
Message-ID: <20090809222347.2FE4711C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3785/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	30 Jun 2009 11:53:00 -0000	1.40
+++ .cvsignore	9 Aug 2009 22:23:46 -0000	1.41
@@ -1 +1 @@
-phpMyAdmin-3.2.0.1-all-languages.tar.bz2
+phpMyAdmin-3.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- phpMyAdmin.spec	26 Jul 2009 18:38:54 -0000	1.46
+++ phpMyAdmin.spec	9 Aug 2009 22:23:46 -0000	1.47
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
-Version: 3.2.0.1
-Release: 2%{?dist}
+Version: 3.2.1
+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
+* Mon Aug 10 2009 Robert Scheck <robert at fedoraproject.org> 3.2.1-1
+- Upstream released 3.2.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	30 Jun 2009 11:53:00 -0000	1.40
+++ sources	9 Aug 2009 22:23:46 -0000	1.41
@@ -1 +1 @@
-e6f19a8c286697c4dccfae574cd41826  phpMyAdmin-3.2.0.1-all-languages.tar.bz2
+f6b0273cba534fefa0a1d69b78a003df  phpMyAdmin-3.2.1-all-languages.tar.bz2



From gemi at fedoraproject.org  Sun Aug  9 22:47:15 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun,  9 Aug 2009 22:47:15 +0000 (UTC)
Subject: rpms/bigloo/F-10 bigloo-destdir.patch, NONE, 1.1 bigloo.spec, 1.29, 
	1.30 sources, 1.17, 1.18 bigloo-java-1.5.patch, 1.2,
	NONE bigloo-javaht.patch, 1.3, NONE bigloo-javassl.patch, 1.1, NONE
Message-ID: <20090809224716.0627F11C00D7@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8099

Modified Files:
	bigloo.spec sources 
Added Files:
	bigloo-destdir.patch 
Removed Files:
	bigloo-java-1.5.patch bigloo-javaht.patch bigloo-javassl.patch 
Log Message:
update to new release 3.2b

bigloo-destdir.patch:
 Makefile |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE bigloo-destdir.patch ---
diff -up bigloo3.2b/bdb/Makefile.destdir bigloo3.2b/bdb/Makefile
--- bigloo3.2b/bdb/Makefile.destdir	2009-08-09 13:14:05.000000000 -0600
+++ bigloo3.2b/bdb/Makefile	2009-08-09 13:17:38.000000000 -0600
@@ -85,14 +85,14 @@ install:
            mkdir -p $(DESTDIR)$(BINDIR) && \
 	   cp $(BOOTBINDIR)/bdb $(DESTDIR)$(BINDIR) && \
 	   chmod $(BMASK) $(DESTDIR)$(BINDIR)/bdb && \
-           mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \
-	   cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \
-           chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
+           mkdir -p $(LIBDIR)/$(FILDIR) && \
+	   cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \
+           chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
         fi
 	if [ $(FILDIR) != $(BOOTLIBDIR) ]; then \
-           mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \
-	   cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \
-           chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
+           mkdir -p $(LIBDIR)/$(FILDIR) && \
+	   cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \
+           chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \
         fi
 	$(MAKE) install-lib LIB=libbigloobdb_s-$(RELEASE)
 


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-10/bigloo.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- bigloo.spec	1 Oct 2008 17:16:31 -0000	1.29
+++ bigloo.spec	9 Aug 2009 22:47:14 -0000	1.30
@@ -1,32 +1,30 @@
-%define _with_java 1
-
-Name:		bigloo
-Version: 	3.1b
-Release:	3%{?dist}
-Summary: 	Bigloo is compiler for the Scheme programming language
-
-Group:		Development/Languages
-License:	GPLv2+
-URL:		http://www-sop.inria.fr/mimosa/fp/Bigloo
-Source: 	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz
-Patch1:         bigloo-javaht.patch
-Patch2:		bigloo-java-1.5.patch
+Name:           bigloo
+Version:        3.2b
+Release:        1%{?dist}
+Summary:        Bigloo is compiler for the Scheme programming language
+
+Group:          Development/Languages
+License:        GPLv2+
+URL:            http://www-sop.inria.fr/mimosa/fp/Bigloo
+Source:         ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}-2.tar.gz
+Patch3:	        bigloo-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs
 BuildRequires:	emacs-el
 BuildRequires:	xemacs
 BuildRequires:	xemacs-el
-BuildRequires:	indent
 BuildRequires:	/sbin/install-info
+BuildRequires:	indent
+BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:	zip
-BuildRequires:  indent
-BuildRequires:  sqlite-devel
-BuildRequires:	java-1.5.0-gcj-devel
-BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  gstreamer-devel
+BuildRequires:  gc-devel
 BuildRequires:  gmp-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  indent
 BuildRequires:  openssl-devel
-Requires:	bigloo-libs = %{version}-%{release}
+BuildRequires:  sqlite-devel
+Requires:       bigloo-libs = %{version}-%{release}
 Requires:       indent
 Requires:       gmp-devel
 Requires(post):	   /sbin/install-info
@@ -66,7 +64,7 @@ Group:		Development/Languages
 Requires:	emacs-common
 
 %description emacs
-Emacs development environment for Bigloo
+Emacs development environment for Bigloo.
 
 
 %package xemacs
@@ -75,13 +73,12 @@ Group:		Development/Languages
 Requires:	xemacs-common
 
 %description xemacs
-XEmacs development environment for Bigloo
+XEmacs development environment for Bigloo.
 
 
 %prep
 %setup -q -n %{name}%{version}
-%patch1 -p1
-%patch2 -p1
+%patch3 -p1
 sed -i 's|bmask=755|bmask=644|' configure
 
 
@@ -89,8 +86,12 @@ sed -i 's|bmask=755|bmask=644|' configur
 %define emacslisppath %{_datadir}/emacs/site-lisp
 %define xemacslisppath %{_datadir}/xemacs/site-packages/lisp
 %define inplace `pwd`/inplace
-%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g'`"
+%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g' | sed 's/FORTIFY_SOURCE=./FORTIFY_SOURCE=0/g'`"
+%define bigloo_opt_flags_ -O2 -g -pipe -fexceptions -fstack-protector --param=ssp-buffer-size=4
+
 
+CFLAGS="%bigloo_opt_flags"
+export CFLAGS
 ./configure \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
@@ -103,13 +104,13 @@ sed -i 's|bmask=755|bmask=644|' configur
 	--native-default-backend \
 	--emacs=emacs \
 	--dotnet=no \
-	%{?_with_java: --jvm=yes} \
-	%{!?_with_java: --jvm=no} \
+	--jvm=yes \
 	--sharedbde=yes \
 	--sharedcompiler=yes \
-	--coflags=%{bigloo_opt_flags}
+	--customgc=no \
+	--coflags="$CFLAGS"
 
-sed -i 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config
+sed -i 's/^EMACSBRAND.*/EMACSBRAND=emacs22/g' Makefile.config
 
 # _smp_mflags breaks the build
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
@@ -129,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
     make DESTDIR=$RPM_BUILD_ROOT install
 env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
-    make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=$RPM_BUILD_ROOT%{emacslisppath}/bigloo install-bee
+    make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=%{emacslisppath}/bigloo install-bee
 make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee
 
 # fix permissions
@@ -142,10 +143,10 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/*
     rm -f *.so
     mv bigloo/%{version}/*.so .
     # seems to need to be hard linked so that it is provided by the package
-    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
-    do
-        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
-    done
+#    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
+#    do
+#        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
+#    done
     (cd bigloo/%{version}; ln -sf ../../*.so .)
 )
 
@@ -226,6 +227,9 @@ fi
 
 
 %changelog
+* Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.2b-1
+- new release 3.2b
+
 * Tue Sep 30 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.1b-3
 - add BR openssl-devel
 - add missing Req. gmp-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2008 19:17:25 -0000	1.17
+++ sources	9 Aug 2009 22:47:14 -0000	1.18
@@ -1 +1 @@
-1c44c3dc0f3b8953178a7918e4c442ab  bigloo3.1b.tar.gz
+48d8853e108436469ee858116b3da00d  bigloo3.2b-2.tar.gz


--- bigloo-java-1.5.patch DELETED ---


--- bigloo-javaht.patch DELETED ---


--- bigloo-javassl.patch DELETED ---



From rdieter at fedoraproject.org  Sun Aug  9 22:58:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  9 Aug 2009 22:58:17 +0000 (UTC)
Subject: rpms/kdebindings/F-10 kdebindings.spec,1.162,1.163
Message-ID: <20090809225817.C06E111C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9811

Modified Files:
	kdebindings.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- manually specify PYTHON_LIBRARIES (and friends) (#516386)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- kdebindings.spec	5 Aug 2009 02:46:55 -0000	1.162
+++ kdebindings.spec	9 Aug 2009 22:58:16 -0000	1.163
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -253,7 +253,9 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
-%patch2 -p1 -b .fix-kpythonpluginfactory
+## Manually speciify PYTHON_LIBRARIES below in lieu of
+## a better, working, upstreamable patch
+#patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
 
@@ -262,6 +264,9 @@ Falcon plugin for the Kross archtecture 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DPYTHON_LIBRARY=%{_libdir}/libpython%{python_ver}.so.1.0 \
+  -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python_ver}.so.1.0 \
+  -DPYTHON_INCLUDE_PATH=%{_includedir}/python%{python_ver} \
   %if 0%{?csharp}
     -DENABLE_QYOTO=ON \
   %else
@@ -505,6 +510,9 @@ fi
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- manually specify PYTHON_LIBRARIES (and friends) (#516386)
+
 * Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-3
 - respin
 



From pkgdb at fedoraproject.org  Sun Aug  9 23:08:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 09 Aug 2009 23:08:26 +0000
Subject: [pkgdb] kooldock: dow17fa11 has requested watchcommits
Message-ID: <20090809230826.E911F10F875@bastion2.fedora.phx.redhat.com>

dow17fa11 has requested the watchcommits acl on kooldock (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kooldock



From dchen at fedoraproject.org  Mon Aug 10 00:31:55 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 10 Aug 2009 00:31:55 +0000 (UTC)
Subject: rpms/tomoe-gtk/F-11 tomoe-gtk-0.6.0-cflags.patch, NONE,
	1.1 import.log, 1.3, 1.4 tomoe-gtk.spec, 1.7, 1.8
Message-ID: <20090810003155.8614E11C00D7@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28401/F-11

Modified Files:
	import.log tomoe-gtk.spec 
Added Files:
	tomoe-gtk-0.6.0-cflags.patch 
Log Message:
Add patch src/Makefile.am to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS

tomoe-gtk-0.6.0-cflags.patch:
 bindings/python/Makefile.am |    1 +
 src/Makefile.am             |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE tomoe-gtk-0.6.0-cflags.patch ---
diff -up ./bindings/python/Makefile.am.cflags ./bindings/python/Makefile.am
--- ./bindings/python/Makefile.am.cflags	2009-07-29 15:20:50.000000000 +1000
+++ ./bindings/python/Makefile.am	2009-07-29 15:21:05.000000000 +1000
@@ -8,6 +8,7 @@ INCLUDES =			\
 	$(PYGTK_CFLAGS)		\
 	$(GTK2_CFLAGS)		\
 	$(TOMOE_CFLAGS)		\
+	$(RPM_CFLAGS)		\
 	-I$(top_srcdir)/src	\
 	-I$(top_builddir)/src
 
diff -up ./src/Makefile.am.cflags ./src/Makefile.am
--- ./src/Makefile.am.cflags	2007-06-11 13:56:00.000000000 +1000
+++ ./src/Makefile.am	2009-07-29 15:22:22.000000000 +1000
@@ -1,7 +1,8 @@
 AM_CPPFLAGS =								\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"				\
 	-DDATADIR=\""$(datadir)"\"					\
-	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"
+	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"			\
+	$(RPM_CFLAGS)
 
 INCLUDES = $(GTK2_CFLAGS) $(TOMOE_CFLAGS) $(GUCHARMAP_CFLAGS)
 LIBS     = $(GTK2_LIBS)   $(TOMOE_LIBS)   $(GUCHARMAP_LIBS)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Jul 2009 02:19:00 -0000	1.3
+++ import.log	10 Aug 2009 00:31:55 -0000	1.4
@@ -1,3 +1,4 @@
 tomoe-gtk-0_6_0-7_fc11:F-11:tomoe-gtk-0.6.0-7.fc11.src.rpm:1242200869
 tomoe-gtk-0_6_0-8_fc11:F-11:tomoe-gtk-0.6.0-8.fc11.src.rpm:1247443864
 tomoe-gtk-0_6_0-9_fc11:F-11:tomoe-gtk-0.6.0-9.fc11.src.rpm:1247710729
+tomoe-gtk-0_6_0-11_fc11:F-11:tomoe-gtk-0.6.0-11.fc11.src.rpm:1249864298


Index: tomoe-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/F-11/tomoe-gtk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tomoe-gtk.spec	16 Jul 2009 02:19:00 -0000	1.7
+++ tomoe-gtk.spec	10 Aug 2009 00:31:55 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           tomoe-gtk
 Version:        %{tomoe_ver}
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Gtk library for tomoe for Japanese and Chinese handwritten input
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.6.0-rpath.patch
+Patch1:         %{name}-0.6.0-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       tomoe >= %{tomoe_ver}
@@ -49,7 +50,7 @@ Install this if you want to develop prog
 %prep
 %setup -q
 %patch0 -p0 -b .rpath
-
+%patch1 -p0 -b .cflags
 
 %build
 autoreconf -iv
@@ -61,7 +62,9 @@ make %{?_smp_mflags} RPM_CFLAGS="$RPM_OP
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.a
 rm $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.la
 
 %find_lang %{name}
@@ -99,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/tomoegtk.so
 
 %changelog
+* Wed Jul 29 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-11
+- Add patch src/Makefile.am to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
 - Add back autoconf, automake to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS
 



From dchen at fedoraproject.org  Mon Aug 10 00:40:33 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 10 Aug 2009 00:40:33 +0000 (UTC)
Subject: rpms/tomoe-gtk/F-10 tomoe-gtk-0.6.0-cflags.patch, NONE,
	1.1 import.log, 1.3, 1.4 tomoe-gtk.spec, 1.6, 1.7
Message-ID: <20090810004034.0899811C00D7@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe-gtk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29929/F-10

Modified Files:
	import.log tomoe-gtk.spec 
Added Files:
	tomoe-gtk-0.6.0-cflags.patch 
Log Message:
Add patch src/Makefile.am to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS

tomoe-gtk-0.6.0-cflags.patch:
 bindings/python/Makefile.am |    1 +
 src/Makefile.am             |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE tomoe-gtk-0.6.0-cflags.patch ---
diff -up ./bindings/python/Makefile.am.cflags ./bindings/python/Makefile.am
--- ./bindings/python/Makefile.am.cflags	2009-07-29 15:20:50.000000000 +1000
+++ ./bindings/python/Makefile.am	2009-07-29 15:21:05.000000000 +1000
@@ -8,6 +8,7 @@ INCLUDES =			\
 	$(PYGTK_CFLAGS)		\
 	$(GTK2_CFLAGS)		\
 	$(TOMOE_CFLAGS)		\
+	$(RPM_CFLAGS)		\
 	-I$(top_srcdir)/src	\
 	-I$(top_builddir)/src
 
diff -up ./src/Makefile.am.cflags ./src/Makefile.am
--- ./src/Makefile.am.cflags	2007-06-11 13:56:00.000000000 +1000
+++ ./src/Makefile.am	2009-07-29 15:22:22.000000000 +1000
@@ -1,7 +1,8 @@
 AM_CPPFLAGS =								\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"				\
 	-DDATADIR=\""$(datadir)"\"					\
-	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"
+	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"			\
+	$(RPM_CFLAGS)
 
 INCLUDES = $(GTK2_CFLAGS) $(TOMOE_CFLAGS) $(GUCHARMAP_CFLAGS)
 LIBS     = $(GTK2_LIBS)   $(TOMOE_LIBS)   $(GUCHARMAP_LIBS)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Jul 2009 02:22:47 -0000	1.3
+++ import.log	10 Aug 2009 00:40:33 -0000	1.4
@@ -1,3 +1,4 @@
 tomoe-gtk-0_6_0-7_fc11:F-10:tomoe-gtk-0.6.0-7.fc11.src.rpm:1242201179
 tomoe-gtk-0_6_0-8_fc11:F-10:tomoe-gtk-0.6.0-8.fc11.src.rpm:1247444168
 tomoe-gtk-0_6_0-9_fc11:F-10:tomoe-gtk-0.6.0-9.fc11.src.rpm:1247710787
+tomoe-gtk-0_6_0-11_fc11:F-10:tomoe-gtk-0.6.0-11.fc11.src.rpm:1249864820


Index: tomoe-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/F-10/tomoe-gtk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tomoe-gtk.spec	16 Jul 2009 02:22:48 -0000	1.6
+++ tomoe-gtk.spec	10 Aug 2009 00:40:33 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           tomoe-gtk
 Version:        %{tomoe_ver}
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Gtk library for tomoe for Japanese and Chinese handwritten input
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.6.0-rpath.patch
+Patch1:         %{name}-0.6.0-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       tomoe >= %{tomoe_ver}
@@ -49,7 +50,7 @@ Install this if you want to develop prog
 %prep
 %setup -q
 %patch0 -p0 -b .rpath
-
+%patch1 -p0 -b .cflags
 
 %build
 autoreconf -iv
@@ -61,7 +62,9 @@ make %{?_smp_mflags} RPM_CFLAGS="$RPM_OP
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.a
 rm $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.la
 
 %find_lang %{name}
@@ -99,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/tomoegtk.so
 
 %changelog
+* Wed Jul 29 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-11
+- Add patch src/Makefile.am to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
 - Add back autoconf, automake to fix RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS
 



From phuang at fedoraproject.org  Mon Aug 10 02:19:02 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 10 Aug 2009 02:19:02 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.21,1.22 ibus.spec,1.80,1.81
Message-ID: <20090810021902.7C85311C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15156

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch to fix numlock problem

ibus-HEAD.patch:
 bus/ibusimpl.c              |    1 -
 client/gtk2/ibusimcontext.c |   14 +++++++++++---
 src/ibuskeymap.c            |   10 ++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ibus-HEAD.patch	7 Aug 2009 06:47:16 -0000	1.21
+++ ibus-HEAD.patch	10 Aug 2009 02:19:01 -0000	1.22
@@ -1,3 +1,15 @@
+diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
+index 120277f..e841c28 100644
+--- a/bus/ibusimpl.c
++++ b/bus/ibusimpl.c
+@@ -1179,7 +1179,6 @@ bus_ibus_impl_ibus_message (BusIBusImpl     *ibus,
+     ibus_message_set_destination (message, DBUS_SERVICE_DBUS);
+ 
+     if (ibus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_CALL) {
+-        g_debug ("Member = %s", ibus_message_get_member (message));
+         for (i = 0; handlers[i].interface != NULL; i++) {
+             if (ibus_message_is_method_call (message,
+                                              handlers[i].interface,
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
 index 68a77d8..d914eae 100644
 --- a/client/gtk2/ibusimcontext.c
@@ -28,3 +40,32 @@ index 68a77d8..d914eae 100644
      }
  }
  
+diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
+index 9f59c73..b248e18 100644
+--- a/src/ibuskeymap.c
++++ b/src/ibuskeymap.c
+@@ -78,11 +78,8 @@ ibus_keymap_init (IBusKeymap *keymap)
+     gint i, j;
+ 
+     keymap->name = NULL;
+-
+-    for (i = 0; i < 256; i++) {
+-        for (j = 0; j < 5; j++) {
+-            keymap->keymap[i][j] = IBUS_VoidSymbol;
+-        }
++    for (i = 0; i < sizeof (keymap->keymap) / sizeof (guint); i++) {
++        ((guint *)keymap->keymap)[i] = IBUS_VoidSymbol;
+     }
+ }
+ 
+@@ -306,8 +303,9 @@ ibus_keymap_lookup_keysym (IBusKeymap *keymap,
+ 
+     if (keycode < 256) {
+         /* numlock */
+-        if (state & IBUS_MOD2_MASK && keymap->keymap[keycode][6] != IBUS_VoidSymbol)
++        if ((state & IBUS_MOD2_MASK) && (keymap->keymap[keycode][6] != IBUS_VoidSymbol)) {
+             return keymap->keymap[keycode][6];
++        }
+ 
+         state &= IBUS_SHIFT_MASK | IBUS_LOCK_MASK | IBUS_MOD5_MASK;
+ 


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ibus.spec	7 Aug 2009 06:47:16 -0000	1.80
+++ ibus.spec	10 Aug 2009 02:19:01 -0000	1.81
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20090807
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -228,6 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-3
+- Update ibus-HEAD.patch
+- Fix Numlock problem.
+
 * Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-2
 - Update ibus-HEAD.patch
 - Fix bug 516154.



From pkgdb at fedoraproject.org  Mon Aug 10 03:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:05:29 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090810030529.6F32310F897@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora 11 is now owned by fab

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Mon Aug 10 03:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:05:41 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090810030542.01D6610F89A@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora 10 is now owned by fab

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Mon Aug 10 03:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:05:50 +0000
Subject: [pkgdb] nopaste ownership updated
Message-ID: <20090810030550.3B84D10F89B@bastion2.fedora.phx.redhat.com>

Package nopaste in Fedora devel is now owned by fab

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From bos at fedoraproject.org  Mon Aug 10 03:43:30 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 10 Aug 2009 03:43:30 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.12,1.13
Message-ID: <20090810034330.246D111C00D7@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30611

Modified Files:
	llvm.spec 
Log Message:
Minor tweak to source file name



Index: llvm.spec
===================================================================
RCS file: /cvs/extras/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- llvm.spec	25 Jul 2009 11:11:42 -0000	1.12
+++ llvm.spec	10 Aug 2009 03:43:29 -0000	1.13
@@ -23,7 +23,7 @@ License:        NCSA
 URL:            http://llvm.org/
 Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
 %if %{?_with_gcc:1}%{!?_with_gcc:0}
-Source1:        http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz
+Source1:        http://llvm.org/releases/%{version}/llvm-gcc-%{lgcc_version}-%{version}.source.tar.gz
 %endif
 Patch0:         llvm-2.1-fix-sed.patch
 Patch1:         llvm-2.4-fix-ocaml.patch



From lkundrak at fedoraproject.org  Mon Aug 10 03:43:55 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 03:43:55 +0000 (UTC)
Subject: rpms/inkscape/devel .cvsignore, 1.17, 1.18 inkscape.spec, 1.81,
	1.82 sources, 1.23, 1.24
Message-ID: <20090810034355.99DB411C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30760

Modified Files:
	.cvsignore inkscape.spec sources 
Log Message:
* Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
- Update to a post-pre1 snapshot
- Drop upstreamed CRC32 fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	2 Mar 2009 21:27:10 -0000	1.17
+++ .cvsignore	10 Aug 2009 03:43:55 -0000	1.18
@@ -1 +1 @@
-inkscape.tar.lzma
+inkscape.tar.xz


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- inkscape.spec	25 Jul 2009 03:24:18 -0000	1.81
+++ inkscape.spec	10 Aug 2009 03:43:55 -0000	1.82
@@ -2,21 +2,20 @@
 
 Name:           inkscape
 Version:        0.47
-Release:        0.14.pre0.20090629svn%{?dist}
+Release:        0.15.pre1.20090810svn%{?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 -r21707 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 21707 inkscape
-# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
+# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22040 inkscape
+# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0:        %{name}.tar.lzma
+Source0:        %{name}.tar.xz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch1:         inkscape-20090508svn-crc32.patch
 Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -137,7 +136,6 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch1 -p1 -b .crc32
 %patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -234,6 +232,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
+- Update to a post-pre1 snapshot
+- Drop upstreamed CRC32 fix
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Jun 2009 22:27:37 -0000	1.23
+++ sources	10 Aug 2009 03:43:55 -0000	1.24
@@ -1 +1 @@
-b25bb6a0a26584aa2ef1832147151e44  inkscape.tar.lzma
+13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz



From pkgdb at fedoraproject.org  Mon Aug 10 03:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:45:01 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034504.E03A710F89A@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:45:02 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034505.6F56A10F89B@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:45:04 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034506.CFBDE10F8AF@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:45:07 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034507.BF3C710F8B5@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:02 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034602.8CD5410F89A@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:03 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034603.C063710F8AD@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:04 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034604.AF17410F8B4@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:05 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034606.38B8510F8B7@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:11 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034612.989B710F8C0@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:13 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034614.A561B10F8BF@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:14 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034615.A424710F8BD@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:16 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034617.1ED8210F8C2@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:19 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034620.9BA6F10F89A@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora 9) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:20 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034621.6B9A810F8C4@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora 9) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:23 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034624.3001810F8C7@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora 9) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:25 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034625.6BAB910F8CA@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 9) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:32 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034634.9B9D110F8D1@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 9) to Obsolete for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Mon Aug 10 03:46:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 03:46:28 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090810034631.573D210F8D2@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 9) to Awaiting Review for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From kyle at fedoraproject.org  Mon Aug 10 04:13:28 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 04:13:28 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1705,
	1.1706 linux-2.6-bluetooth-autosuspend.diff, 1.1, 1.2
Message-ID: <20090810041328.909FC11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22855

Modified Files:
	kernel.spec linux-2.6-bluetooth-autosuspend.diff 
Log Message:
* Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>
- btusb autosuspend: fix build on !CONFIG_PM by stubbing out
  suspend/resume methods.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1705
retrieving revision 1.1706
diff -u -p -r1.1705 -r1.1706
--- kernel.spec	8 Aug 2009 19:36:06 -0000	1.1705
+++ kernel.spec	10 Aug 2009 04:13:28 -0000	1.1706
@@ -1966,6 +1966,10 @@ fi
 # and build.
 
 %changelog
+* Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>
+- btusb autosuspend: fix build on !CONFIG_PM by stubbing out
+  suspend/resume methods.
+
 * Sat Aug 08 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-0.141.rc5.git3
 - disable kgdb on sparc64 uni-processor kernel
 - set max cpus to 256 on sparc64

linux-2.6-bluetooth-autosuspend.diff:
 btusb.c |  189 +++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 147 insertions(+), 42 deletions(-)

Index: linux-2.6-bluetooth-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-bluetooth-autosuspend.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-bluetooth-autosuspend.diff	18 Jul 2009 22:50:13 -0000	1.1
+++ linux-2.6-bluetooth-autosuspend.diff	10 Aug 2009 04:13:28 -0000	1.2
@@ -1,11 +1,5 @@
-commit 7ed6456e2717d641a287bf6a83c1bf80395d312c
-Author: Matthew Garrett <mjg at redhat.com>
-Date:   Sat Jul 18 23:19:10 2009 +0100
-
-    Add support for bluetooth autosuspend
-
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index e70c57e..2f4b4c6 100644
+index e70c57e..ac94f91 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -145,6 +145,7 @@ static struct usb_device_id blacklist_table[] = {
@@ -251,7 +245,12 @@ index e70c57e..2f4b4c6 100644
  
  	return 0;
  }
-@@ -947,60 +1007,100 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
+@@ -943,73 +1003,118 @@ static void btusb_disconnect(struct usb_interface *intf)
+ 	hci_free_dev(hdev);
+ }
+ 
++#ifdef CONFIG_PM
+ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
  {
  	struct btusb_data *data = usb_get_intfdata(intf);
  
@@ -378,12 +377,17 @@ index e70c57e..2f4b4c6 100644
 +	schedule_work(&data->work);
  	return 0;
  }
++#endif
  
-@@ -1011,6 +1111,7 @@ static struct usb_driver btusb_driver = {
+ static struct usb_driver btusb_driver = {
+ 	.name		= "btusb",
+ 	.probe		= btusb_probe,
+ 	.disconnect	= btusb_disconnect,
++#ifdef CONFIG_PM
  	.suspend	= btusb_suspend,
  	.resume		= btusb_resume,
- 	.id_table	= btusb_table,
 +	.supports_autosuspend = 1,
++#endif
+ 	.id_table	= btusb_table,
  };
  
- static int __init btusb_init(void)



From wtogami at fedoraproject.org  Mon Aug 10 04:26:01 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 10 Aug 2009 04:26:01 +0000 (UTC)
Subject: rpms/spamassassin/devel .cvsignore, 1.45, 1.46 sources, 1.44,
	1.45 spamassassin.spec, 1.115,
	1.116 Mail-SpamAssassin-3.3.0-missing-pre.patch, 1.1,
	NONE Mail-SpamAssassin-3.3.0-perl-bug-taint.patch, 1.1, NONE
Message-ID: <20090810042601.314A611C0344@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24944

Modified Files:
	.cvsignore sources spamassassin.spec 
Removed Files:
	Mail-SpamAssassin-3.3.0-missing-pre.patch 
	Mail-SpamAssassin-3.3.0-perl-bug-taint.patch 
Log Message:
3.3.0-alpha2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	7 Jul 2009 21:15:37 -0000	1.45
+++ .cvsignore	10 Aug 2009 04:26:00 -0000	1.46
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-3.3.0-alpha1.tar.bz2
-spamassassin-rules-791756.tar.bz2
+Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	7 Jul 2009 21:15:37 -0000	1.44
+++ sources	10 Aug 2009 04:26:00 -0000	1.45
@@ -1,2 +1,2 @@
-04141392e1f20ea4a91bb63937351c65  Mail-SpamAssassin-3.3.0-alpha1.tar.bz2
-26eaca54924365ed7db538fdbeef7b11  spamassassin-rules-791756.tar.bz2
+1b396a9df1faa22185263c7526fe6042  Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
+daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- spamassassin.spec	27 Jul 2009 04:38:13 -0000	1.115
+++ spamassassin.spec	10 Aug 2009 04:26:00 -0000	1.116
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-#%%define rhel 5
+#%%define rhel 4
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -41,14 +41,13 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename alpha1
-Release: 0.3.alpha1%{?dist}
-%define rules_ver 791756
+%define prename alpha2
+Release: 0.4.alpha2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
-Source1: spamassassin-rules-%{rules_ver}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -60,8 +59,6 @@ Source10: spamassassin-helper.sh
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-Patch100: Mail-SpamAssassin-3.3.0-missing-pre.patch
-Patch101: Mail-SpamAssassin-3.3.0-perl-bug-taint.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -121,13 +118,10 @@ To filter spam for all users, add that l
 
 %prep
 %setup -q -n Mail-SpamAssassin-%{version}
-# Default rules from separate tarball
-tar xfvj %{SOURCE1}
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch100 -p1
-%patch101 -p0
+
 # end of patches
 
 %build
@@ -167,8 +161,9 @@ find $RPM_BUILD_ROOT \( -name perllocal.
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 # Default rules from separate tarball
-mv updates_spamassassin_org/* $RPM_BUILD_ROOT%{_datadir}/spamassassin/
-rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/MIRRORED.BY
+cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+tar xfvz %{SOURCE1}
+cd -
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -234,8 +229,8 @@ fi
 exit 0
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-0.3.alpha1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.4.alpha1
+- 3.3.0-alpha2
 
 * Tue Jul 07 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.2.alpha1
 - Include default rules to prevent mass confusion and complaints.


--- Mail-SpamAssassin-3.3.0-missing-pre.patch DELETED ---


--- Mail-SpamAssassin-3.3.0-perl-bug-taint.patch DELETED ---



From wtogami at fedoraproject.org  Mon Aug 10 04:41:05 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 10 Aug 2009 04:41:05 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.116,1.117
Message-ID: <20090810044105.307F811C0344@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28134

Modified Files:
	spamassassin.spec 
Log Message:
RHEL4 is the minimum version for this RPM.
perl-Archive-Tar is required for build and runtime.



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- spamassassin.spec	10 Aug 2009 04:26:00 -0000	1.116
+++ spamassassin.spec	10 Aug 2009 04:41:05 -0000	1.117
@@ -16,15 +16,9 @@
 %endif
 
 # Define variables to use in conditionals
-%define option_archive_tar 0
 %define option_ssl 0
 %define perl_devel 0
 
-# perl-Archive-Tar (FC2+, RHEL4.6+)
-%if 0%{?fedora} > 1
-%define option_archive_tar 1
-%endif
-
 # SSL and IPv6 (FC6+, RHEL5+)
 %if 0%{?fedora} > 5
 %define option_ssl 1
@@ -42,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename alpha2
-Release: 0.4.alpha2%{?dist}
+Release: 0.5.alpha2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -80,13 +74,12 @@ Requires: perl(DB_File)
 Requires: procmail
 Requires: gnupg
 
-# Hard requirement
+# Hard requirements
 BuildRequires: perl-HTML-Parser >= 3.43
 Requires: perl-HTML-Parser >= 3.43
-
-%if %{option_archive_tar}
+BuildRequires: perl(Archive::Tar)
 Requires: perl(Archive::Tar)
-%endif
+
 %if %{option_ssl}
 # Needed for spamc/spamd SSL
 Requires: perl(IO::Socket::SSL)
@@ -229,7 +222,7 @@ fi
 exit 0
 
 %changelog
-* Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.4.alpha1
+* Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.5.alpha1
 - 3.3.0-alpha2
 
 * Tue Jul 07 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.2.alpha1



From akurtakov at fedoraproject.org  Mon Aug 10 04:48:22 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 10 Aug 2009 04:48:22 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel sources, 1.4, 1.5 get-dltk.sh, 1.3,
	1.4 eclipse-dltk.spec, 1.4, 1.5
Message-ID: <20090810044823.0364711C0344@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29386/devel

Modified Files:
	sources get-dltk.sh eclipse-dltk.spec 
Log Message:
Update to 1.0.0 final.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 May 2009 17:46:25 -0000	1.4
+++ sources	10 Aug 2009 04:48:22 -0000	1.5
@@ -1 +1 @@
-94048feceab7b9bb979df8fafa7279e7  dltk-1.0.0.tar.gz
+1a134d48b4551c3db297db66a83e8381  dltk-1.0.0.tar.gz


Index: get-dltk.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/get-dltk.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- get-dltk.sh	22 May 2009 17:46:25 -0000	1.3
+++ get-dltk.sh	10 Aug 2009 04:48:22 -0000	1.4
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="dltk"
 VERSION=1.0.0
-TAG="vS200905210941"
+TAG="vS200906171219"
 SUBPACKAGES="core ruby tcl itcl xotcl mylyn"
 
 echo "Exporting from CVS..."


Index: eclipse-dltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/eclipse-dltk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-dltk.spec	24 Jul 2009 20:52:35 -0000	1.4
+++ eclipse-dltk.spec	10 Aug 2009 04:48:22 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dltk
 Version:   1.0.0
-Release:   0.6.RC1b%{?dist}
+Release:   1%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -155,6 +155,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.dltk.mylyn-feature/rootfiles/*
 
 %changelog
+* Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.0-1
+- Update to 1.0.0 final.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.6.RC1b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Aug 10 05:06:16 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 10 Aug 2009 05:06:16 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.55, 1.56 dovecot.spec, 1.131,
	1.132 sources, 1.59, 1.60
Message-ID: <20090810050616.23C7A11C0344@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32288

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
updated to 1.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	28 Jul 2009 08:06:06 -0000	1.55
+++ .cvsignore	10 Aug 2009 05:06:15 -0000	1.56
@@ -1,4 +1,4 @@
-dovecot-1.2.2-20090728.tar.gz
-dovecot-1.2-managesieve-0.11.7.tar.gz
-dovecot-1.2.2-managesieve-0.11.7.diff.gz
-dovecot-1.2-sieve-0.1.9.tar.gz
+dovecot-1.2.3.tar.gz
+dovecot-1.2-managesieve-0.11.8.tar.gz
+dovecot-1.2.3-managesieve-0.11.8.diff.gz
+dovecot-1.2-sieve-0.1.11.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- dovecot.spec	28 Jul 2009 08:06:06 -0000	1.131
+++ dovecot.spec	10 Aug 2009 05:06:15 -0000	1.132
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.2
-Release: 1.20090728snap%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -14,13 +14,13 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.9
+%define sieve_version 0.1.11
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.7
+%define managesieve_version 0.11.8
 %define managesieve_name dovecot-1.2-managesieve
 
 URL: http://www.dovecot.org/
-Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}-20090728.tar.gz
+Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
 Source3: maildir-migration.txt
@@ -434,6 +434,19 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.3-1
+- updated: dovecot 1.2.3, managesieve 0.11.8, sieve 0.1.11
+- Mailbox names with control characters can't be created anymore.
+  Existing mailboxes can still be accessed though.
+- Allow namespace prefix to be opened as mailbox, if a mailbox
+  already exists in the root dir.
+- Maildir: dovecot-uidlist was being recreated every time a mailbox
+  was accessed, even if nothing changed.
+- listescape plugin was somewhat broken
+- ldap: Fixed hang when >128 requests were sent at once.
+- fts_squat: Fixed crashing when searching virtual mailbox.
+- imap: Fixed THREAD .. INTHREAD crashing.
+
 * Tue Jul 28 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.2-1.20090728snap
 - updated to post 1.2.2 snapshot (including post release GSSAPI fix)
 - Fixed "corrupted index cache file" errors


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	28 Jul 2009 08:06:06 -0000	1.59
+++ sources	10 Aug 2009 05:06:15 -0000	1.60
@@ -1,4 +1,4 @@
-1b8beec9fa5ba66d7ba0790191e2e2e0  dovecot-1.2.2-20090728.tar.gz
-61e84cf3749e3ec1ce1f41e918f1f0b0  dovecot-1.2-managesieve-0.11.7.tar.gz
-b971743cdce359aa0aeb24040a3750ea  dovecot-1.2.2-managesieve-0.11.7.diff.gz
-a9a9254def9e9a05105aa56a960ac7fa  dovecot-1.2-sieve-0.1.9.tar.gz
+28905211d9301022a1ed20df71ad2b08  dovecot-1.2.3.tar.gz
+8cebb8ae5aa4ace658f5abfb53357a86  dovecot-1.2-managesieve-0.11.8.tar.gz
+8753084aa9b4b9a5d85e15013ccc21af  dovecot-1.2.3-managesieve-0.11.8.diff.gz
+c9d8a8668707a831710c7fba06a3bc08  dovecot-1.2-sieve-0.1.11.tar.gz



From lkundrak at fedoraproject.org  Mon Aug 10 05:16:35 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 05:16:35 +0000 (UTC)
Subject: rpms/inkscape/F-11 import.log, NONE, 1.1 inkscape.tar.xz, NONE,
	1.1 .cvsignore, 1.17, 1.18 inkscape.spec, 1.76, 1.77 sources,
	1.23, 1.24 inkscape-20090508svn-crc32.patch, 1.1, NONE
Message-ID: <20090810051635.BB63411C0344@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2422/F-11

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	import.log inkscape.tar.xz 
Removed Files:
	inkscape-20090508svn-crc32.patch 
Log Message:
Merge from devel


--- NEW FILE import.log ---
inkscape-0_47-0_15_pre1_20090810svn_fc12:F-11:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249880790


--- NEW FILE inkscape.tar.xz ---
?7zXZ
C?????<>f'^?????7$??X\?:???"??^
??<:n????
?%?
?#3?V"0LM!&-	??_I9???Jq???0\?T?5.??v\H	\??:??????o9?l^?-? ??r???}??6?????t????v??b????T;D??
F??5????^C)?Ne???N?`/????c?u4?????K???h??a? ?!{0?O??%/????????o?&N??????4????T?
6??d?m??[?<(Z?#
?C??????e?\??H?Y)??'?&A?V1??wP?6k??f??g|????M??
?{??K^?"?u??Pc6}l?????j??Tg?,p?,<h<?????;[b????b???q?+???`tX??c?/????? a???7??jip;?????u??F?G??.?iH????vk??uXY?=???
E??T??????
r?P`????????&#?y1#?????@???????????f-??i??A??`Mn????r??l1xf?
s?????????`
??0`????as??{?6???"i??T?? ????:?On?????h?-e?I0/??HZ^??
?????;?\'qz?e?G??>??`?a???9???oi?($?8?????+?owO?!%?????q
z?????????!?@??9?K??_??Ro?ti/??f?w? (?<+???H?7?-!l?????????<??w(x=m.?????\?;?m;%4?????&??g???AlS???|??u':S?#??-??8????
???9L??L???aEp7O?)m???,?P<U?*P.6?Vp???\???G?#G??#?P???\?N???[*????t_s?????/??P?r;JD#???]?6?k??>??Hw
y???????@V??nd???<Vv????
?
?nyFZ?`?/t?Sl?!7C?????c#?cUrAb?l???f?~?????W\??D?????????O8P???r~?qG??????ofW????G????????}?}c?????D???['???I?"2?W?????|kJ$g?<Y/?T/
(?????{?}F^?????!A??Q
????U?>?j6=L^l&j?h?j'??8P????=????ts?<??S???????.????_?????:?R???????V????9?????
????!??E?a??YJ+???Vks?P7`???	|??A?R?
??O"?????:?)Q??&?4?????	???<?"???5?C?Pw??????2?~????x???T??>QK??$l7??d?r?????>?W??	??G?\?S
R?I????et\K[?k!?:?~K?m?/???t??XtJ????8 4wW???c?W????????ia9\?~?l9?????*I2f?2=??0?"2F??'??`?5<3J??H?q???vdn%
??a?I??}G?o?!v|<?????Q.m???$?F?>1?
??CH0}[???s???V:??a?????P???Ml?????^?<8??r\?J????p?P???\?{?^?6R???
e????iS???[p????????????A?v?h?9?U?'??2????;~?,?/	{??}?????????Z?&L?oU???????<.??XP??h???????0?6)??X?_|?We??T?0???\#M?A
?n?v5Z
~Qc?????4<??????2;?O????Iv???B???<;?Ig????X??{???rJ?J??S?????*
Y?B??n?b???_)-P??mOx??,9??l???	?'_?:`2ck??v????j??|K?
? ??4??9??e??'I??:?????K?????J????@????h???
??K?Z[%???MKu?%?r%L?]?NMC???~^????x??I?D??U??&?v?-NW
??????t?o??C?i?4????T?[p?2???`????
M?????o?i?iVPj??H????\??U??|?"-f#$????5??n4??+3??]	)??U??-]'?r?K???0??5}U~e?????????j?$?9r)bG??P@	?,??w???g?#_??O?#??=U|D??,????[??)jW??Y\???<"t?????[$??a?V;$?[???????????????[e??L!???Dep???]z?	?????we?QBq?3? A?l
?T?Q????Q???1??],R???8???X??|F????g?e?,
?x?H?J???h???1?h???;?SH?p??"?f?W?"??1?H???m???h??x????LW^O???-?4?K?!?r?W|??ef8.?UQ?n?Cq\?P??a?????????V?p???v^?T??]??N};^J?vvI??
?J??tL??`?\?!????r?\3?Fv?I?6??'OP0????V??p?????n?Tr???c?k?\?h	c+?????Im/.e?????B?L?"N?}a???B???;????0?8????2?[K?? ??
?{?]?'???>??b??4WrH???????\??P????1??????k???)t?Kq?%??1????-??A,?H????Z ?.??????}???3seBa?)??!g,?(???ah/?2??NsG??e??Oh8??????
i,^??!#*??
W
??]??m?.??F??M??N?E??6???;????0`??:????G{????d????@-???m=?!??Y???A?K"a???c??w?x????
?=??>???j/
???
???z??/?Q?v?qbA/V????iv&?2??u?????
?c?[?#\$?2??
???1X:Z?=????????????a??w+?????	???v??$?"?U
E???WS[c??%<?gi????'?LI0?>?:?????(6?7s??hB????.????l???3?k?????????"???_?u???p??y?|b??-.??n??????yp??H????q?fA???F??Vx???y?F???`????3?X{??~nl????S?????}??(r~??????*
??C?????]??
???5hR???t???>???9??
RC????H???0l_??r??+?D3???^?>	'p&?#???85????????++?F??j?gT??VE???V!zN??
r?A?&?Z????0?y?M?v?!+4?C?#T.?J??W6P?=bH?SdN?z?
z~?????????X[?t-fv?8??e?,W?V`H?tqC!2??????'f ???ce??NX,u0a???
)???_??????r????#??m??<R?2?6
rn??J??.v?:???????z???<W?<?Q?^M??h?=?Z??0?Z}??y????nE#?P?i?)?c?3?xK-?????_2??C???????{??????Hc?F?U9?F???
????jW?3??-?`?O??)?I?	^mb$??5 ???d
&?Oj??b11??NsA?Y=?????X??????2?2?r?a???j???J?!?
????7C]"????xiY?_'??)????b|?n????1??5FU+??_???VQ?:Q????????)[?x??$?<JP,~N????|?n???-??Pf}*E
+h		
t???]P?p?/A????p?Ah
K_?1??'BJ?C???G?<?????P?\[T~
#??cE??i??WVG?k?s???5U?Tg?f4?&?zj???w????{~PZ@?
?u9
?aw?t?????n??8[??????u|?4v'?????*P??????x?_X???????
?_0????
???
?I??t,;as!?Ec?a?2??%\????&P#??cn???_??`,K??o??.?{?A(??%?????????3?cy?wa?I?~:??L??$?E~?q??B ?}??f????S??%;<?0??Ve??e??&
?Fa???Z???_'v0?J???/??dG?@YV?V?=?4?E?*n?????f?Nn??n????tl.?T???I??]K? [???M??x??~!?U???P$????M??w?o?AI??????*?mZt?????#???Z???]E?p5?Zv?p??]9Q?|?(???W?&b??6?
?x?X?+?X??N????????k?7%DaK?_?1?)?6?]????F????[_!?g ?????DG?'???2??????B?{?a:?c????b??? ??
Lc3???=?N???? }t??n?B?C?A??P*??hf\B\?????|?#[??????i?a?F?_??????z|u?E?Y72??>??v??^<2?=??5n?????E???q(6??I?????fE?mS
??????"Ul???a??e?<?? ZF??	B?q?
??D????m?C?k&?????d????(??^p#?=x???h*t?X?fZe?T
[?????o??(B?D??=??
W[*??V??wBq|-???????k)i\????e?*]Gra??N?KR??~
???ec0KK?0???
;?????|??!`?????????$0?????s^FM!??43?CW??)b?g~Mk!?&?+?,v?-??s??{
??y?'?_?A
????:+m?0I?M??B{?n?#?$?2tNma???q?,?~?s??7??]v_|??????y
K?b?
:?????"?
	????e???-\?J?^46?X??0?-U????????L??"????^?2??.6??*YBh?yci??i?Tt??b?^n?r??"w???=(???j??S2?H-???u???????~??&<H.A?q??*xLcI?W.?l??d?`??S??????S??.8?3?b???????0???????I~[w??S	b&?7D???_?????*??cq??&a(]u`?}?;?bI????????9????m?F+k3c?j??sZ???O~Yh???2????+6	?yh*?5l??Zwd?E????G@??	??????6?#?:??FRO??Z??a?????m?Or?U?h?{B%Z0?rv???c??@?.?.+???n??Dj??Z{h7p?9?9?f??\d??Z????^???#? ?8E???pDW>?.?&??R>+???@?x(??B?V? Y??5?,_?@???????V?E??Hyq9D?
=F?i?????;]??
1?(P?n5N??O??y'???L(>?f????
(W$&?t?s?
?? ?7h??s??4?%???V?m?K?g?C??K6???????X?;1L??
??\GZ r???/????<??BT??z~???%????0?IIZ?F?_? iiH??=???i?l?????6??t?
?6????(5z?{v???O1*?p????\#?6LS????L?0??K??,u??)?|
?)K@???1?HY%;J?M????RX?F?fK?@(<?
.?]?(?@??cs?6K:R*[87??f???1

<<_?s.???)??a?????!eI???S?k
b?? ?G???zDW%R???

???YZAGrb??%?xT*8PM)tHc?.??+??i??"???wsj??K?njE
?FQv!?n?Ee??2:D??&Y??&$???fD'????]n^?tQ??nQ.?}@Q?????~??f?? ??'a.??,=????|??i?Nn?h4?%?#?VS7??tVA??y?P?CP??82^?p??[???O??$??g??????	??M?nmA?F???iE7nI??QjLKZ???3A?1`?%k	???'??a???lP???Wv/??6W?
???`FW?v???????U
?%Yo???v?wA<V?Cj?R?^??~~??j?}Yh??@~"????R???<?*??4?U]?????H????t???<??K???:V??K,B?ys??w?????4??{<????Z???6<????O?F??!I?7??*St??r<.X?, ??o??b??,??????????N???????
5E???????S5?H?l6&@hl
??}????j???up+??????X?i???
?)r?"P?Ys?c`??:s??o?l\!?A????s???Q????Bu@?1?R?Q3bb??Tbs?o?????B??8TH?????yc?t??=???????=?????]??ByRu?v?H$?'?H\b??TZ?j?? ?q??g?L?G?????45??"????!a?`OR[y??????v|?w
0Nz?,?????AL???0??2NL^}?9uHH??k????KO?z???????U?ME??$?N??-?P???w?&?)?????I?!??jT?????%??.?bqsL????*?v?
L???%%#,???Zq?oa???????O???C?T(<?(??^?6???
??????5?P?-

??%?L`????R??MZU???+???f?????r??{(??2???h???=i?j?@????s1???uIn2k?>1;?F??W???r&???1??B???
?????|???-???
c?O????4(?zQ??????KL
?`?y?e+???a?
MAZ?+??YZ?
zU??q*??V8r"???#?f?s?A????K?Z????c?SNiXXR/=??|U?@???T_!)*?????c)j at U?C+m?K??2??{?f6????
????W???M?A_3H`B??h??`??2w]l	?
??#]?@????m???M??E??F???????jj???????sz?D`?i??????G?Sf!&??L??)?????6??/{?kX??L??????
?(?
?>?p??0[???o?"?`??C??`??
<??A??c
?\?????P??0j??_???"S?jR?v+N??iK7??0s????X??t at p9?J0?4t?@?W?????w2??1!i??????[????^???h+IW?R?>?????X?1]?x_???r???'GFIs?*K?j\???g?'?|?????????A? ???CH???????j??-/PgF9I?
?:?????\???I???o?.?g??|=??????????
??PwNl?#????
?D
<?}+c????#??(???Gk?d0=?sP8??$?ahl ??e??#!:D at V8?2]?V
???k???Gh?8g?????gl?????<?W?7???#?@9jYr\?)??????.??
?(??=????
?
????t????
*S??????k???
f?M#?????AR???????N???Alg??W???R[?vd?I?????{?
???'?r???F???7?;s?I??O0P???N???(?v?GU?m?????U?,??Uq?????M?^???~?y:?I???|???K??|b???????p??{`B?4???O?1 at y???U_u??
??d??R7??G0??]}?|pr?v9???t;????Eo,??Z?m?T?E}t??????xM8??wS??'??B??;??"??a??]?r??0|;I?NT???eQ?Yw?????I??[pfQs??O
??m;?????P???????E}
?f???33????Z?AI?54M?+?(?????
?L{X'h?@S0?j+??ET?P1???H????Y?M??s????5Wy???]?'?tG_v?_?l????<?????s?y?S???????y^??8[?:??]??2??BK?????????m????_?y?My??O?#?M??;??JG?_?Cq???>?????En?O?@aMx#????????????9y\?z8#???\??h<EQ\?3???g}rD?f]R??????a?<???1/
P?s?D?ew?????R?f??vJ}??a?= x???????qV???W??^m??\|??????k5?}?V'?V?m@??_9?L???a]Qi?H,L.
q?58x???B?R2
???M???????Nn?vxJ$mry??????????/??C<??!?3?:?"5?v?o?8??dx?????~0????l??!???j7	fR??,?H?~Q???h?b???????!?._?2:??I??t??Q?-P??????UN?l!?f??/r????????
??d?*??
k^?#?B?=????r*
??????NqF?:e??uM-
dh}P???#???
????5???h[ae???u?<ng^?Z?3??ug???k??>?????Q???#??dm?????????Bam???????h?
?????	??????uKH??iQ`???"???,??W?}$i??68?o???6aRP	?????1o?????F???	???@6ON???K??t??8d?????????2>sy9??+0?????;w"??(?Xl/,?O????[?u?U?o???T$??u?'?"I?
??UgWf????
QuF??? ????yb86b?A8??x[Y?d??=?I?3k??A???p	?.????????kW`?pzlc>a?]?	?C6??N?<vQ&?Y,?7???????3U??????????	?V???cS`*
B&V????Xe?!o?o?????qAU???X??g?
??u?Wrs???)???^	??m?b??????&0????5-4??h(?g?L?????^????7BO+??????!????;?g[1?+?Vy?U?G?z????_K???%??-?????????]I!e?b???W?H???????=??G???#F???
?l%?]#V@??V?7RK??|???%o?_???b:???????&?|3????%
??<??]???/?O??????	???8???L???x???C%?v??
???i?6
V?????7????ti??\d0???;???j?j?u?"?J???B;????8j????{?Lme%???*???)???
W??????f"??
h>????????n????8FtV?-
!?y??PPo?%b7
???'#9,??*/????o;???Y?|:n???F8'??????C?Xh???%???
c??v?g?z3???4?$???C*sd8}?-/t???%1????????t??<#?;n_?z?oT&??i???|?y_?z?i????}?Is?1
>??{3=??+
k?L?????.D??MZB?'~9?G%??z?|?????s;??JRw_.???cJy?3?	_=S?/@?J+???????c?+????u?Z\q?='	???=?a5?I8??F1?4???jc????????B
?????=Z??????<?s?6)?????!x?nUB??f???f???&LZPD? D)x@,oY5?;?	???K:J5?V.??THrJ??KlWQl??U?u????E?W??8?????!??&??>??g??&?Y??????D? ?|???@???k??o*oI:8????+?`?-~???.;??1o]???K???'????`??
u}?
??t'????)vv?Z
???J?????F?Z??
R??2^???C?|/?t????$G?XI?~???y`p6??*?C
'??M8????M?.
wX?@w?>??[u?w=:?(x?5S????$i|d??????M
??v?I?d42U;z???1??]oe??*3?
?H?=Jr!?-?_F?n?A??6C??B?.??yAx???????VS?nk???.???8??bW;???#?ya??|??R?/? ???q??BJFyN[????7???Y??|???|????)?v?|2???>m???%?p6?4?;)?????[???&????A^?/??m\?<{/h????????ur?????3?8?E???=???<???,o?Y??0?w^??F?w??{???u??<??{r?a<pt?&-?S+?S??4J?!?????`?G???gw&?7??x??8?P???YU??,e?????+h????9(??5??8?*KvP?I??,??64J|6>l???4??&Z`?O3?H??r[?????i?
??
k[????????:>?E?,H????U?/s,??!??/}
?Z2?,i?`???E?h?\%F:??2?f??r?!????J??B?>x?
??\*???o??W?<	R?U?8p???g0<?G_??S??dN??U4"
?qap-???????T?=B??fA??j?`??,O??0|??6???@???I(??`t[??/x^J?t?s8???c???k ?Z(

~??????(?yZ???3?+cQZ?n????
???&&#??I?
???)???.??6$?>n??u?s_?????????n??????UA?r???????i?N@?o??8????
ay????4?+&?Dp_p???q?P!#?????7??X?"`
t)[??Xo???D<?971????????C?????F?q-????*0\
?
ci??#?X???W?,????GzB?P	???]Ww?at??{?????????\??O7=?@??,+?????>W???????5q??gm\???7?5???%??*????^???'???-?qV?????4*??<?????#??>??^<CK??I?a??C?]?r
Z5:?;????H!,9??W\2??<?x??P??8 	Y?{?;7IP?V??'?w????R?cr?+??42%???q??ik?????*??&???Mu??vi?\??Yl?]M\????/?M?????a/^????SL?^??<=	}??l??fs????8??u????#
????g?RTP??>?K
?L??pDI??~???f?????^?n????^d??!?M?BD](?
?-^P?9?~?aF???:4?"B&??8	?>?R?????[=?D??a?g???:??G?X????????FW????n??U??h??7???`?x?p?a?H????~??????:4En?9	v???9??
?Ry?$???01??O?/?+??yI??xf????5t?	I?S0??`?LB??{??Lu?]?lu?9z?S?????? T/??>4?[t??n?l?<?????
?>"?h8m?$??????{ee?AZ???7????d
???Y??N??]#`yw<?G?9z???N??XB???r??-?W????f??????!Sn?????B4y??RBh??D?;=G
?x?S??F@???f??[g??$?)r?%pkc??;?+??'?E??S<$\
???!e?+x????????+~%8??fz??o???z????RYW??r?w??w?1?i?A6???
C??nR???t??^???\ A<?'?,?~
T
*`CN???q??Z????E???@??S???????@
k???G??PU?
c??4??(??????B??YQ??O???su*?%?W??D????????Xw?j?o??p[????HP??T1? ????[)????@,#b?42,?`???~UStX)????7?y,_?]O
\z?OJ?
Z??C%?c?N^?D?+??????Z?
1)$?6CCV?Sz?-????DL????S??DV?#??g?\F3
?1???Z?1"sP=?cv3??-K?C??????7?w?
_eB7W??;?J??v?????G	??????{7(?1kq????>???}?X??-?Qf?)*?VK??L??;n?,?f{L7??"??.4x?|????I???rh??O??6SU??????]
?= ,???h???V?E???? ?-??l6#?
?'??P?hUM?????#?T?F????+q?sct?V	?<{?????O???
.X[??v???bG?>??????<M,???T??e+???j?x?=???P??7d??j,?s?M??g	?e????F??-+p<w??{??`??????y??h,??F?eo;?04?CXD?U??f????oi?)?<???PI5???D??]O?????`?????w????g0?s?U9?>????????
E??OY?J*O?mk?F?'?_???CB`??m:??Hf4|>\Oiv?r?A~V{??Z?? z??8?!j*}??!??:qR???-?i
??????VI???q R??%"?90???X?zLb??S??ZC/???z1?X
>%?c????t?U???????^w??u????z&U
?b?? k,'w3??a??-??+??n?0?j?t?5?XB?l?62s?????vk????S=<ES?)[zY?|????;??v??e??o?????????
????;?$???#????Z?D
?????E????9??-?H2w?y*c4?*W????d??v?Ma???]???:MJN??????t'?C???m$??,
???H? ?w??xK	X??W????^??Bg??2M??
???b????a??)Lb?$????^>???C`#??'???1???^?!Z???z?	
c|dO`,?s?Z?D??Law?O(???K
_????F??????b????P????I?2??C?e?x??&?
???]
?U??ES??Kc?V]Y%??????'??x??Y?
?-UK?u
???!
?4????y45??on????p??W{aI??e?X ???b????????UU6????c?YR?}?g???=?
P?Sm?4?>?gMBn>??)&\
?B?&/@?????!?C+T??NA??a???????Rh-a?E0Z/?E~M&9???Q?E]??%G
g+o*?}????P?^??rZ?V ~m?????Wz}i?%?uG<*??7???q?
<?=?
x????S	<?????????K?\z&#????????/??d??r?#	|	?Q?+??fT??<_??_4?	?{;?????I?
??=?k?????00]f??8?E????M??6a???1?F?=??L?-?"???N?|?7?
???f?:?C?????a?^+??????P???S????$????6??
v?Ez?????T'???DDb?????>????	??\Mys?$?n??j???#sN[:?V??n?q?mg????fw?M?g?%?]??/?6??"[?/??7{????f0??L?????a???X_??z???????^F??*?`@??????6?u?U;3?T{????3ba#?,????u_????
??p?w??~-?~?JP>???^K?????Pfu8????^p5h???n??,???9<CG??#f]q???>??????oZ?D3?????x?R????9?#
??????,??Euf?????f?
?:???}???Ze?{?PYF??D?o)m?
,?D)?B?6??A???H?<???6?%????M?%??:8???~v??e??.R??????Q-U?8??W%?<f?U???{8?K?^oJ#K/;?h?I\-?????k	?p??0??r??-?S???q=yG?]??4?Xp?~????<
uN:?,?@!???B?y??Hk?>?.?i^Q?+%???:???????z?+v?D??????)j?U??~???Q?????D1??d?H?!Kw??
n???g?Z??????6X??"??
?az9???U;??$?????s??2?<?7??i???t?|Z?Ns???M??f????2???????A?`??v?8b&?qiP???m7Y)?.??m??\??|b??#?(???????cd??)3k??????S???ry!o??????W?{?????[0??`?c?9b'?? 3??M?h??m-)??w[3kg??Fo?? ????????\?O???d?h??m??r???<H??yl?
??&[Q??.???
?j???>.??f!????Q???r??5#?$d?y+???kTU??8X	?4??H>z???j??XJ???p?o'? ??1\6\?-?p??i5???&?O?P?
b-?
???^??k???2???6???Sth?4?????l???X????bJZjT" ????:)?X?;@???&
2?dD?o??!?y?"??cj8?????u??.2??!O???d??#g???9????,$?J?1??:(??Q?1?????U???F2???P-??6d:?l???&x>~O?#?a/???>???:??;??>????6f??E;??/m???R??{"?
?r?pV??F-?ibGF???4??bYp???U?	?$
o??x?#l?O????^?????Y??x?z-
???P{????I/&???w5??%?x??P??)=H???]w??$?k??????>??$???C?????o|????U?l?,Py?????8|?o?h??cS2@?
????2??3@<?????$v??C?'|?{??;zW?VI?'8??8??2????'}t???????~?)hKO 
X??k????*(
8-???d?3?/????u{z?E?.???????I?!P
??j??"?????:J????????n??K??????????4=Om!?'7K?tm?l?$??O????NM?|F??A?/??L??????u??D
?r?~?*??^?1x?????`??&?pK?t[P??????}	g?(
8??Q?>l?|o????O}?<?d63??*?%tO?#Q????U.F7??U?u?X??W??ff??

??RX??I??u8??$?7v???B?????I????W_???@L7??-??????t????-.M
?Ch???8????)??Y}?????w???4?;??E;<??H9
??D???=n?(?J,????!?f??aBB???t??6??*???h??$?+?0K&/?1???ZD2??[?????8?
?? ?
74R???J??r??C?a?LVpe??????;???????&???H??D@?a?~????????[??????????J?O	???Bu?R?~?2?G?:??;??h???|03??l??????a?l$????s?9?D?????!?q(???W?[$?????F(
??6? u/G%??7b?wl???
;?jG*h???Y???|??$?L???M?d14j???O?7@?y2D??uwH6W???????U?,H?Y??$??
???:	??
G?^[??(???D%o???l?-?2????`	?????n?~	D??Zs?????z:?Su??<??V?k?4??X
??}??nL??3u;b?
?.
?????V/?Dn?g??o&m????i??yW????Gu?#???????C
??e???z?+C??^?e?\?r2?E	???t?n?20Y?&DH?1P?d?a??ik????m?dK?j??FO??}??]?1u^???`?????~Rnp????B???D??????[????}????R&?s?????????????:?z????h?@??KR?o??????????b??6??n?g??)???MI?Vug	RD?????????\?J???F??L0;h??l3?A??fT?.?#/WG\?|% ??7tu~)(Es??*#:?e????x
?4"o?%??&?.??(
?"m????M?????o>z6K) ??????Ma??h?"?O??h???????Z_????3r?P?????????n???????Q??6?^?????????p??Oq?A:?
v+???J??0?j?#
@
??G?^((??????D???w?f?qUJ?????^ ??nY&?m4_?b??Z$\?GU????A
K?????ok?
????Su??|?5g?z???,_)??????FhX?s??
F??S0;?Q??O???M1?{7#&?z*
3?RK?9XBf??H??CY?\d??k???p????N???Kg?0??&???P?%?AP?]?h??h@?O??D?R??????U??T??#`?Y?,J??E{X@?????U?/?B??b?+rZ?
?<?j 8???`???????s???b6yr?b}*?A??D??30?????
Lk?-(???.I???B??w?Z?>6_8?Lu????????0Wg???I?pk???agl?m??g????"?,?
8g&7??G???x
??:j^?.F???%v?_?%??,)???@??{f5???GX^ ???X?B?n8?
??|???????m??I?????^0??r??????????n????80g?p:>?m??9pU?u??K	? #?/5f?I!?s
<??)`M??=?W,u??????Q??t??=?ZOe+?a?I|?k?n\?????????????C?[~?)??4??;\t?~??<(???????#u?$&x?0z??{??r\
M?(.??????c??Q??lC{@l?????<?h?"?
L?
??@?_z>hM0??j:>?^r??Jy???????d9L_?F??ik??3`?xp??????+<"?^5|?a-3??nG1???lJ???!-}[?????????o??]??f6??Ni?0)c5??'?H3cfV??????????m???????(2	b?q?b?e?Y(d??????F06???O?$?B??yT??,???Z(m?? #B???????8?B??$0}??]????
R????????j???Q????????????s?F??_???5??9Wx`???%y&@?%?\??W?8???????????4???o???f??u??3y????F?N?%,??I:F?s,):??M??t?j?F?
?H}???>??@S?#
nN??
?m???<Kx???LY:??O??J?bO?b
?q*????7?5???R3`?,?*?CyI?+?'??????r?`?????1?YcH??*r]?;?r.??????3 ????????>?????i$??Y??? p?H???`19?C?????b???v?~|?!??c_V?x5?{?%???s?(v!&????}c??????pF????!?B%?3i?*?????:6??_??????EL??j?D??u ???S?+??b??Y~rB8??,gg
~?VX?????$W?HVYs??\????y	?4????U????2????GR?&{|?O???@??xf?X?in#?\Q???h?w"??.?XA???{u??=O_??jm?K?8w????S???G??L
?<7QF?}<c
i????
?nY????)5?S??|?? ???CS??l???h?K????]??HuAB,z?!R??????y=?????Ux`
J.vr?
???????a,	D??N???&??u????@??m'?>Rr@???F%??A??|m?>?w??3?{?(??8????`	*????t??R"?;????z|???J?N.?~??????F?=N_??e?Q??o???L"x??,????C???? ?????
?f??#q2?????+
??????<q:?]DtF(???i??R?C?M[l$?w?t?AH~?^??a#;>A}???:?]???5?~sx?U
p???
C?W?X???b?P??7??r??
??;??L?^1??.??
????F?r?)??H?uZOmv?O?????Y??D????&?|?d??ENjz??tM?>?2)?:ce??W?i^h????he"F,cfJ?`???N02B?J#????t?Q*??????F4O^w???R??D??LJ?????L???????i?h?(d{&1???? ?tF#?_???T?J8?*?>U?????3??<V??R??X5F???L??????????????
???]k?j`M???]?=????:1?on?1s??L???h????{?
?????e?E ?Q
???(???Zj?E5??
Kp??J3?Hu???:??w????Ue????????
?s(?g???;}:e"??? ?u3s??J-???_???5q?*?m'??
?f?????G?????p@??-1????%??zN?/O????8?
????Dqu?????L????rp???,?D?-???????0?????9?)?<F?4?%??QF'?RzyM???????t?Q?:?$???liN????dJ[?6^??????;?2??????
??
???Q??????W???7???LGr?dAp??_?z?????6?o??2(C??PN9???4?C???L4???`:T?]OxG?>??V???T??E??23MGv?V??B?
M??I?U??f?ma?1p?}??????f]^,`1??%w??N^+?[????p?V??n?Wke?y?^?b???????8??t5W???9??:I??E???M/???Y??(Z?k??m???,??Q??E^F!MF?<
??i0>???u??;???-?NE?%?$A}`???v??RD5?{?W??k4????^A???p??36,m?y????"T?????(?OU???S?G??T?????2]w???Zeikfm?L??+a???????qw??tGE??
???28????a???L??T&?H?????????+?!+y(?f?3u??_
????
??9,?
??ra??????
4~??2??#??K?ga??j???=<?m??[A	??Ge~s'?b??M?	??????,?,?P??!G?D?_?+r
??L?@-?<?M??\??6HT???|,
E??Q?9??"Y5n??~?:
v???l
A^E;?Tq????*?a?
??L???J???
W?q?{??????NY????????<Z??]w?w???}??JW??[u??????x?e????????"- at x??B??b???>_?OZ9???2?d??!?
`????"??C0,??#
??
?7????kjD????D???????&?zC/L??0<8??%$?l--mh????}m?GDr+I,Uj)??z?+???O???????s??~5+J`?	?????m? ???;8H??1~EiV2??v???V_?T??<???(P&U???>?o??????|!??E-?e??;????@{??????s??C3??"????Co:?????0N?| X?3?L>1?8??K0???l???#9? ?k??:?k?W?s?7???DROlSj??qh'?m- W(+w??????C??*?D???????#????$zz??k?^??R?*?,????3e??M???;??KC??$;5?eO???V?lMc2???I?yr1???L/q+??V??a?????0;??Z?9?
?/????b\???????
?s? ?_x??iB?f?aG??\????7]?Pw??????>??_
?n?z??l????j3?V?\????$?4???-`07>??	??U?0?R-??????8??]F'??&?W???????
Mh???-??aGG1??I
?[?1??/C??
??+?Uf]?b??d~?g?*?i?)?	??,t?wWz??*-7??Rm9?L????#???k?
2O??#?{rE????
??$?????"5*??k,?u????]C???`?F?{???!T? ?
e?gly?OsT???s?.<?-CC\???j?o???'????n??R??C??fC?&??P$??"Q?RK?????Ok??v??u???????? ???g?-zr??????|??W?B?&;lb?+^?N<ck
?F?{Pb??;??x??????#???N?fu{b:?$s??u?O??1?q???Z????J?|????j??
??A?4???? ????
??$??G*hL???s?
????~3?O?d??>2]?>?Nk?6
f??g??R??T?bQ???7?s??D??????8l]????	^[Z2?R\4?
??????\?7?LoO???#n$A$<????QV?04??]??'F??M????Z?s??bM????k5????D???? ??K%.?<+?5?w?/?w?>?????y??"'?}????3???3????&K???}?ND?{Q???)ns??c??;????eT??l?????A??n??5=?\"?D?A?D??'4<??k????p??????+k??,@=g?F^?;x?z??">?r(??+?J?~????aY??????K??}Q????I?"<z?[????f?????&?jD?u???9?}	
?Z??2{t?}???rZG?
?2???a???b	V_5????????Q}?1B?W!~'@?=hN????w?5!??-??D???0a?:??H???=??l?7E?h??q<'???(?O?,???"L1e??
???7hy??????]?%
C??@?G???k?7?a?q?????\????????hq%?M?????Z-{0PP f?W????	?
??\1?4????(????m?K ????!?q?X???OQr?3?V?0?jF?fa???M?t??b?k?F?q?????[Q?????C_p???U5????.g[?q	??X} ??2???2????y=????G?F~4?0Kc)??(m??????`?o??$?b?T?iG???S?lOz??sY??l??????zK?R??S?Z??R5&f??;?m???{????uY??????N?n????u?W??p???j=??m???\??I??[??xBk?YH??7+?]G?
??>vV??a?^&??0Q????O??d?#
+???q??XZl'??g???,??M?
??R???D?7\?x?mt_3z?&??=8?$?m????z??? ?????E???_Y?I???+u?z?y?

?]X???#?d?>???|c'+?]HG=?5???=F?j??	?}?e?Z?E+??????4???gYP?Nf(I?l???N8g>v?'???H?"H	??:z?8???????6??Lr????????t?}??/ym?lN?\?d????+?*???N?H??????CK$??`??{/?x'?
@???RU"*?X????????=ZFW?h?U??]!?W?V^D;6?????~?t???%?9?????P????e????>q$+yF_{?g?T?)?t???HCU3??[??SA???????Op?^t;vhv??1???\F???M?????S??i??
?`?_??
~??:"??Uq2?ep^???m????????????9	????}|??"???m
?b?i?t|????r?q????0???PB???vh??-?????????rQ????*M?WZ??UA?"??!s,{cS???,,6!??5?|Tg??Lp
?|??????r?l=.?v????!?%?[{?2???Gl+?p?x???f/??+&t?
??L}??,?Q
?Yl@??i???t
E??j~??x????|???f??E??*r?B?m?j?<???u??G??W????t???/I??k?? ?Z??c??l`???k???L???a?mi?~????K??6????
*?#?T??	Z?)O?[1x??Wj?P/v?_U???qG?????????.?0??j?????T2?0?^??H????????V???

???D????G[?R??".?_??0???V??JJ??=??FE\??F?[s4?
^	?u??g????5??UgGh?a????TH|??G??L??i?$ ?????]7????qq???t??
@??Ms;(???U?????.t"???NVNj>?j,?????.?P????y?.???t??#?*?R?X?O??w??H??y??/w???-??m??5?3q.q~???:??uI:x?????????I??j?????d]??l6_???yo??|????I?1k??????n?Q?U?&OE?S7??vt?Y
Q	?A<???ei???
'k(?N ?4?H???i&??R?????Y8ww??????`G~f?C?'e?P????}???%}???!?o??g?#w?8=E?N:??:?{??a ?W??^OS??_h0?d??O??,???"--?0;??r?T?<?!xTdy~???d:??o?A??P???????/?"?A
?"'??(?y
?kVj\????Zh??+d??d8
??C??"?????p??????w-=??1???8??4f?X??R??	?????	?^?7T?)E??!.??,j
Q=?V?ZA?j?{??Im????yr?n?? ?+y????????9??
a?:??????dV?U?%??C?e?k?^t??5??x?Cb6L?L???{2?d?L?&???B??w???B?V?e?N?-N?]f???J,??Q??U)???Q??q-??+R?A?%????L?????3-???Eg?.?|v)?!Ng%??Y?????????<Q??
??Z?z?z???+???yT??5_????*?d}?V?P?GZ'?=-*???????? x?!0???X(?2??G?]7??ql?sYBr
`?|>??;2???P
?c??f??S?uA'???B?7???TKP????^????????e?%??yj???y?`???|xQ
????C?67`K?a???X??B?|??[??????Z? ?1??B2yjF!???3=??3=/?O??{?U???bK?=?
??m??_%'?c?
??x??Mu?L'?R??????ft??4=?????????5L????????C????P%?(i>??/{?>????n?$?Rn?? 1???+R??t????DQ???3j????F?????????u??????d????^?H?'6??q.??m(??I(??/???ld?D??|??E?Te??!??????IO9?????L??`??E?sj?Y?Z?SL??{???1????>]-{+?|?R.?`?*[?>c?-FT:Q????T?
??"?
?5?i???;%??F???{?$?`?kGXg?]?%7V??_???????)?a??
?1z??.h?R??^|#?K?)F???3???/iG?D??.????F(?a?;?t???L??-??
?i8?*v?:??:4Ah?LU]?E???\E8????4V?|b?R0?^
?Z?
>???j$??Q????j????^B???{??
???}"?S~??*??6?I?oy?\b????\???h;?O?7??'?l'
?Y8p??W??v?}ch??)????\??	?S?P???????	S?j%(?1?l?!?{??????k??=_m/???O???"???o???P???i?.O???F??+??W?w?
?2?t?n??m5X?*;??H?rd?^\????T?????N?l+????p?????c?I?_?-?I
?(9h~u???UgAt???'?
"??4g?*?_4??6??t7??????%?&??t0???~??Qgf=??Z??>????*????3?	Z/ya?&??]K???S???x??????j??????w??????Z,Z?in<????4
??
?xT???-l??U?D?=????
?Rh??????g???e??????H?X-?K?)"W?`Y??T??H?ub
O?e??????7?w??@5I???|??C_??NF???[???O?U?????Y??F]f??C????`?`^_
??K??(6
c??H????>??;?Dn-?w@pSN??A??,?b%
q???o?HlQ??????$?????j?{?	v~?L??l?Jo??}????+g?JO?{?O??q1p?c?-???9Z?r3????????a\?+P????0???q??;???A??&t?%?I????;?9???dC??rur?5????(?<??e?=T???????Zu?F??f?6?GFQM?3?o???'>Y,???b?wR?????%????RP*?m5IMgvX??I?s??{???J??DJ?6[xR???????_???[??;??n????-?S???&f?s??C?S?\??{A???F?wL?]u????j
I?s??=?7?????f?F%?-#R??|)^?i?I???hU?
?*V???L?x?4`?B/}??Q???????v??????X?
?=
?!???mseeqd;N???M????3??]?????u???=?????$?-???&?)?>?
???XZ??*?Z=???jB??\???p?.n???JDJ?SE??Jt?s??O??-?eS???_???W?????????r?9??????7
????0??????N5???/??[o?Qc*????S?>??????)???3_?N??k?r?6I?@x	;HP??Z?w6`???N?~?y?K?^??
?????W?Z?T?,?_????LM@????<??4??b??????????H??$??uw?((;?r?~0??FHc
??fpx?MR???&????>?????2??|???fX9]^???d
?~????e?E?$*??b???sf????gT?8~E??{?Fw??"??CK?&_*w?H?W N-??s9s
?Fw?0??????m<???gf???BWw?})?~????<2w~????x[?{#?	??;?q)??|?\T,??????+F?
|??~o0f??M??|p
? ??o??hh?KB??3?v!??O?????F&]?a?H4~p?U_????o;<U??a??
*?
y? ??wG????Gz7?O???????9???K?S+?L&p?BE?^F3B???$\b
?!??=????	??M???c??????u?[N?F??~ +??rE?6v???K	G?p"}?????%t&????%?h??WR?%9??sH?TA??z???R{?P?,->???Yl].?d?~0?>?kf?}???*Q????
?3?A?}?g$?.??5mT_z=0????????K??????0##f??c???;???~?W6?$C???{???ls\
xFyg<??jh?[L??a?@n9???C?a:s8?Wel??f?W?`'i?pP??yy?p?6???h?7y????c??3V4?????<{?sV??w??*????X+??^2Yo??<?????v??U???|??L?????8?????i????OhX??????lc{??)nE???BF?(e????n+jI?y????]o??oc
????~w??WW}??`H??}?3??X$9?G??+
R5?;?????
9$??Q?2??i$Js?F???;Oc??????[g? ??2(?3?'O?2U?;<???D???.??H??h?O.?u?:??)??LF??T???!?M?]?3 o??==?1]?5?V;s!Puf	?{?_]5?j;_
?2??'11'??|UsM*??#GGh??N>?0????HI???2?|
? ??0>???^|?@?Kl?B"????5l???????E?????#???????b??^??a[EO??q??A??,@??LEB&r.?mK5??G?P?o??#??q0???@?TfT?Wf????????\YY? ??\???F?H??Q[?N??[?;%&4k?F  ????8??????Ua??????D>J??a?wK???Hwo?N?=c???G1?~?%??To9?Bt?<ID??X???)??j?+]jIXr?V?p?r?????O???LC?? ?p?w??&??R?=????iA?o?r?ez??!??z?b;???k?dn.8??wh???h?n?J?PWh5,g?^n1?y??;?!?)x?U???????d??Lm]^??sV????????)??????y&i?i????V?W??x?t????d?sHn????????'BFP
?~\????$?
h}<???9??0l?{
??l?BY3??>?=#??".?G?R?T???x??qW??F?UW?YW	u???~?S?:???AN??n??????@-;_P?p(????OM??+?$?XcM?`??E??1??T+?80lb(?r???
??
Z???~g?)????????$?3?^?`}????P????????Eyg?q??DI??QC>6s??[?W???~???[??<??M?????V?V?????????-??u???D????u ???vK??L)e??y]?^??XN?B?"c
??G0?????`
??
?TI|???0??GI??Aa?zd?G???2??v?w??????"e???A?<?<??s??O?x?4?,m\@?b5ro|?Q&?79???N?????F~_Qy? ?????$???o?
bU??/D
?<]9??;??1m??c??!??T??|?????R???l????????5t????Q&l0_:`?CmGI?(H????q?"y???B\??o0g+??M?y?K?^???+??*v\zd`?:^????=N????J??c?C(??$k????U??Q????#&?t?x=C|??Z;?H?H>???9???>???g\?I???%?Fk@????u,?H??gx?S?du???+_?YJ\3oazt65??1?d???d?????M??
?X?Ip?x"Z?U?{???w6??p?,s\`??????.???-??4??=h9j?K;????;:S?2??p?"????V<4??w"s0
 ??p?/!??'VEL????kT????]?E??\N???aL??P?????{???n?A}0?!?
?c?A
??h?b?1??l?I??&I?2?G,? H????_"?e???921j???g??D}?u??2?????]?2`c????6?????|?B?Ce?wEd??v5(?$??]?4v???k????XS????????/?)Hgb?q?l
?|)??Kc????^?d?a?
??
?L5

??'?o???X?*Y??n@?_J?????u????q?f?r8/R?????G@?????9?B??g??U"81?????????MX????})??`??o?U??1~?[?gIqP^DSH9_]?)=?Wf(??I?'?F]?N????????l?
	<??{?$?lj
q????q??#<???????K??g?v9?	?"?}??Z? ,????g/l??5????
<??Mw?
???J?!?K??wn7x??*P????A??&K????????uQ????h?!??)??v?P??W|o?????@c>C?`^L??Yh????????t?`M???4l]????????\-"ruI ?f[?J?S??:T6?Oh???????]?U?{??wq?? ?A?????z?A?I__=???????h?????0????o6?? 4?f??'?@?Kao???<??????g???????ew???"g;? oD?A????4????
1???????????&Y=?5???????
p??X????
\???w?QN?7i???M??????????y?????yS)?????N??x?
z+???L???i????DY?YT???f2?=???????$3?y???	???0,???(}T>???&????????&(K???????X?????7???7?5?\I?l???j??r?,?Vy?U=?????\???$x??>DIv?,t9K???j?dI??q??	~?~???T??_?/Y?=?????3A?`N??{???0??G[l)Xf?_??#.?????T'??e??Lb?R???K)+?VutXkmTL?#Gp?6?RC9?T?i?n:??2k?8K?O
???
?
eAGQ_Q?????gcW???*?fV???@?
TsM?4?;	Tyc?t????]???C&b,???????E?F????$|??1r?v?i?s???w???P???h\?5 ???T=?N????Z?.?AE??????$ej???&H???X? ?-???/?a2^???~%?JM'?*????????????V??????|#f???p~?'??s?f??e?q`?t????'???>;6h9??N?????E?\h?	7?~?????TB?a??V]&?K?O????0`????H??????,E???:??B>M.(?9??ls?X??u?H??-?0??]??.?\!??B???????<??.Q??.\???`;z?W??
p~????TMp???wsK;l??g?E????bc???&?uj?
???T?,??-?^??4?[????
?d
?_Q????\?'t??%'
??M?;f???BC??????v???xgx?????G#\?)??????????t{K?6?A?s?????;.?m?????????[;?L??LG<U?
?,J|?OO@`(2{?-??q??>??Q?z?V??S8?	}"A??9???L??5??
w?Q???&8?7z?S8?-??|E
???B??0P??RwrCc?R???(??#???F^??*?????u?????{D7?7a6?????;?w7?@??I?_D??c?????G?!?)?????4\u9????P??"S?u?m??&??z.???&)?AY.???Q
HOB??$?=??B?????s!XV??????Ptu?????C????:%LK???Q	?*???(?i?zV??7???{?Y????)??1????g?tR? ?bDt??GuU??Ux]???C??J??R?k?~pK%B??L??6?`?
O?????>d??H?!.zk?nh?/st?????&??s??_???????????d???????x?P4H?S??*??,?f??????j$>??h)lD?D?E?? u?MH?a??2q5?L????O
;????zt?????d3
???(pI?????an????_J? ??????Pi?????tW? $?b?tpP????1Z???>?/+???)?N???v????*q?????S??:83?
K??????9[?vx?M?D?t??@RMn??qdd?O%?7F??#?
?{?C?tr%$k???Xx@!j????e??|?h?'*????????7<??h_?-o??|?--??pL"g??z???H?????????};??Q?|P???AxE?????/????;?0%j!????[aL')??tK<C.???T????Y????[l?iW??]$??J!#eX^??]?????-???J????j)??Z?Hc????&v"m-?!a????[}V ??]?+q???NJ?&8??@?F????? ?????loY?_%x?a	m??k?<V?????~?<8/x?9g?q?????z??x??????}9??H6a?0FXW??A?^????????????p??#???$~?????E
?\?????
??a??D?e?l"
??kz8?????	????eaocP?/ ??#r??y???Nw?q??B??$]??z
QB
'
?
??????????D0?dg???
??h?p??^T0	?Qt0????K?????]	N???t%P??R?:?R&l at yP?}???}n$V?y???n?x?
?)u'?M
?S??x7??A?_C???7????t
J??f??Q?S????#&?r+??MZWVY#^?=? c?K?pV?)k????}???w???????~~?YV?<??X?L\?????Z?????????????Gp???s??[+I?SSRu?????3??k??p??E2UF??<?E?`???y?6????;R:??D??u????{}B??????????@?}?T#???.???{?WM??
T??d?O???,?????t
<??|??7C?t?O???"3?Y?R??v??R???N?o?\k??T???6iI???C?`??Av??v^M???*???VB?D?s???????)JS?!??7?+^??<[?P^????%?D?TJ?}?I????????T?????t??owoM?MuJC?UB
?Woy?^??????F???*???????u?.K!QY1??4??s?p???=????z$n???G?????S?????????pa?%<????x?l????g??]8?????Y8??~!rI?\?%?Z???~?????M\?z}ZOC?T_?h?@?vr?cr?y??
??yT?E???
??U??.?v?+?z?A???'???h????@o?????+??TXx2-48WA???q&5{o????X???oVJM?j
g??z?e??????j???????b?mKCA??;z??`"1?*K?????Z^??U?
??2D??F??P??????Et??D<4^??>>H?-??:?N???k;?????Mn???????mY#???*?[S?4?tu???X?`>J?????g&??tw??????
??
>??	:b???&?G??????~z%??=????no?%i???"v???? ??.u9?????xr ?Cg???o???Z?5???W?];?&?I?(%???,??????3?j'??
l??~`]M??6???GH}N2?W?&?b?q?_???4???U|??U*#??\?}kO???-A|?|TW?w?????R??nh5f??PQ??UsK????Z_7S3???Z???D?6 ?p'???TFiD?N?f*]mY?0????r?Us?^?????]?y????\???????f}?n?V>;:???e?vA0????
?M??F?z??w??`???\
U`?g;k-?e-????

?0
?(?<P??o?X'?-?SH???0??0G
@	?8?]?	T??`???????CB??Y???2???=?????{????H{?G[$?,???U 3???Q????q?C|F%??@ry?{?q??>7??a????I]R??
????X????6?y}?jw??)j?w??s??4??W?????@?E??7??C??&???fD?z"????`g???&?-????L??lO????
H@?????s??CW?K???c?g!??u?<n+[&?????9(KcG^|M`??Lq?}g?,-??{l|h=a???'25????\[??{?S??jv??????f???n???Z#=?N???J???9??I?tHZ???_?j%??????>??{]?????K???R???$?5.?s???Ln?????
?@+`J#?H?2:?o??^???u??????*w!?\5?1;?R??4J?????-??\?????????a??????q??nk?
????rTM?????????????j???2<???	}?O?0f??qb?#'C?bj?@???H!P??&Y#J???????T??8?|-%=)??XX???bsn?K??Nu+d|?`?z??????????
??Z?d????|????)C?5*#j????d?K?N-a?7h?>Z:??J?K&??????l?Y??*???QG???O??????.T????xBSv*? ????H????7?.
??{?|g??*1???P?2[?Y??{q???????xh?{k?gti?
??*m:??5[b? Q???<??lP?\?F1e8??u????\?,?.?T?V?+M?s???qB?!4 )??!?G?\?K???~v0%?u?HYg???/+?$	???V?1???jiK<?E???_?L?? 2???2????-?T?`?3???N??3?g8}??????/d
?6l?$?
?P?6??>?&Fc2h??&D??kE7:+??+B???	kl?2??Q/?s???*?7???1?F3??-???!
?wFh???M??n?|?? n g?????Z?C|
E???7?Wf?tr?t??~L/6???????y1??Iq/!R>???C??'c?c|???0FNY?w?s??G???n?y??S?e5`???????BO?????_?:<"_?0G=?2Z??4?Je~????B_(?U????????qa???r=?!dG????G]?????&????
|$:i;??4P?6??Gl??|??1T???7;o?k{k??
?'?M?]???Z5Z?P???Fii??i?+9%??]???6?-v?V.1~??v????gy??/?(??????j?:~???5????	??T??LO???M"????9`????B?eT????*o:???:??A?d??j???0?	`??g???O^??<????)???5??e?4
?????&Z.G?j??????^??@F?????l1!?3????????D?k??w???:??Z7?#?m?$3???s????{?\4(?\??	?????|??2<??A?C
???????*?D`-lC???Y?=K??^?>,???[@?4??H?H???cp?4A??n??f??56?Kx0fs?X#Bk??????????pi?$'iO?@??Yb?@%???0?Sypt??e??
????A??g(??????2B1?%??n?\??????Eg???H?????
h?L?R
O?-p:1(??P?3O`>??{?;?????.????V#?w??z#??A}7?
???a????I6d'??v#?z???????>?Y`{?Q?GAc:e?:*????
2Uufd?M???????5????Wdq???z?2'?a????URi at P??????+??j1??Js-B;????ya????t?G??*???l?#????.hF
Z????$??
???M-?p???m?v?f%?WCR%?_?\?????jU=??4?11<?G??
??At}?0?`?????u??w-\?
x)??Q??qN?'??	2???G(Xr????ma??w/,??_????
E?1?????????dt?\?L?y?bc???k%????G?DE5???#?? ?O??m???;P?Jw=,\W???6@(?/?
K????
?7J,?X??3??????[
???~%&{?{?
????O????=?x??|1Dr?2????s>L?=nu??(9?????\??
??g????J??'??F?4?V&???h-???u?Q?;???j?@??U?"??9??n)0%9???C?????;S?????$?+??B~soDotLm??.?????????3+@*-??Q86'??5?????=??rN?)?6???Z????r???L?????????S???K????$&??????j?????I??n=?.?8RE?l??Z*V?88?1??W??Ip6YY*K???)ZF?%Al????}???q??;??N????mrX?MV??~d
x^&??0???<]???l?4??%????D???+????E??????????j??V=???2+?<7B=Fx+???_???1??^?k??>!D????O????\?-?%?j?Mu??????9??????s?u??/??cm?????[??U??5?????/??v&??gf???;^?	j?N)?1???+?F<?N?f?k?SY??+???%??X?7?T???v<??GA???????????)??yk)"O??qj]?h????{??Ly9????]??Wq??tA_?,???p?I2A???DE33??Hf????^+&?a??r?r?V?v?{???? ???Z???N?a??,??O?&?????~?K??X_?iK{8?(#???)??X=?B???#????T?'????Mk
?????oj~?????$w?
?C|??G???????@??????$?n?????I???SH????L?i=??)??(?m)??0??.???>?jl?K?????
??????x!?r?~??K?=
9:?7T"	5???????}?l???;?8
m ?g?xa??mSdp
?^???5???r??	@,C
pG;?oV?????????E????cg??|?y?????e??[?????=g?>8??L=HJQ3?
<??
???j?
???,>#oSx???
????>[:Jc$W7?\S????@Zo???O??????????/3e?3,??(f??<???I?%?%?? T?8/?????]%1-?+*yK??? ?!?3??(???w????9???GC?????m:)>(UU???<k?]??i?T??.??????W8-?????<=W?5L?P??1?/?9JY?Rq???;??r?<????ZKi??????[ ????-??p?Nzt??C\??E?'L??^??=WB???`urt?
`u??ib?pf?
??36??tw?;?V???????cI??$???//q?2??<?[?H#???;??6??v{t}$???<??|??j:?w"??B?Hf????4???E???c?)o??a/?????a??0?9?3a?????t????}r?c??Bv?
zb?O^?1P?oUO?
?????F]???eKvL3?hXs?E?I
4??
n???v??7D<]t??????{???????\?c11??? ev?-???'
??????'??E_?1??M=qCk?o????{?F?cv??@?#?????Z
[...39931 lines suppressed...]
??????]???W?k?/???S?P??y?S??%????`?PU????[?E?O?"??JAMI??P`?H????:9???3??%\[?N?F?J(ph?XZ?<??M??Me??)
F?N?:?????*??#???@%?`??.K$??.????F????i?@?????uf??<4?	?+ ?<C?!??|m???2??3[????NCu~??RV??,c?MZ??
?k????`(?????{g$?o?Q:^^?t???E|?O??}?Ld??N??????q?????6??3?*???-?
?2??dj????????
???p??N??8?H??HG56??c=t
?t?H??
????0q?=?0?t?????J??+???
??????.?Y?w^?6?)Z?"? ? jg???7??S??lZ?j/?????D=dW?X??4?????
2?????'?	6??O?0p????<C?K 4[?2!??6?2|??????}???tB*????@}???;mL?C?Q?b???f?*?H?H???!m??G_??4hCf
??uz	?{n<*:6/?9?[]????b=Z??????S??_'EM?????d??L??+????d
???C<	????Z??
~?(?J.)
??F?wjO??|?yL?????????????????
Aw??????:oG?t????;??????%?6?YE<S???8U?(F|??????:?'/+*??v??M?=+??s???????Vz???B?L?kGIN?u????V5G?pw? ?L)^?D??<?V??8qRG????^?y??Df?[??9?Y8??~??????&???}-?V???#??	???u???W?:E??q??
0??[????m3jy??R??1GU??)?|?Y??????4??
?%G??vD??F
??%?r????S?l??????x???????@?1??????F?@??????s???
E7fZ"K6}?v^?la?7~?/
ko?kP??M??D???,??v??|????Uw):}(a?O{????	????g".z????bI?????c????`l=?N???g??D??v???;zY!?`QS?A??TtLF????U;??:+X?T???;K??M??o?????3????9]?0m]M???h??.??C?j?c?88?U?S?p??`???v?dK????Oa????E????/X^?5T???\jv??????????Up%?????<G_T???i???m])?I??$?#??????-<J?_?]?l|U???W??VrF?_???&-?o?lq?
????,r??4??\?k&LL??7?"B???2???<?U?V?????%???b?????=l	???????I9I)??y/???`???????Y??!??yp]{??GT???_???????"??%???9?YO/??Ah????|????Oa#;????y?f??$<??
7??,???W???%\?2??????????{?=r???????????86BS??????c?;%?G6T?m???(???HO?<??\?b?8*^??M
?P????	??Mu???$?'c?%?????'??cE??H?jv=?%??
#d???T
j?A?*<T_H?!?X?w???\?~?q????r??U?Z??t????s?g??
?
?	????r?w???y!t?????3p???????{!)????
s9[@
]I!Q	W??g??????????!"???;?????,}f???~p??????
??????i???\?=5CMQ??
??kX??`?C.?f?u??6<?????V6?,?\??s=?S?%?RMw]?
"?B??45?dP?x???^?????X?
????.?M?6?Sm?^???Tk??q ?T???@??/8T??6?=?p?Z????P?????J??7??J??g???Q? ?9
?gh?????v0???????	Y??/?g???r?0??????|?v??#h?????H?N?g????g7???`?E, ?6q??&????@?????v)??I|H"|*7	4?	d?boR?D????|????t7[?3?4p??n}?????Z??????N??"????o?????$*?8?Wi
Q$q-T??^?1^F?w??l:?eu?C
????3Y?
+?F:???V?}?5+?#x?V????:Q6o???km~
????M[!?"????^?<???f?
???8????s??w??p?{????p?|v
???
7WTS7G?4?C?.'??7????n?!???????h???x{?T???????mpo??q???|???????1?????D?`
?U????"?xy??B?\?H}?a#??b+????Pg????!????[0~?????,??jS??o@??r???)w>?d??x?8e5T???4b?A*?x%?';?|$:v??M????????"0,?0?D?C??<
+Q3??l??'?0???
L?/?	z>?
??????&???>???{3? m?
?v?'??F;?\K?u~>?:?2CA)Zf=Q??G??H*??
4r??+s?0?,"?r?p}??~????????oi?h|??T\?B?=?vX'??????r9F=	?A0???Iv??????/@?t"?=??|0}~??????*????D??Y?~s-o???,f???X2???>+>n
?T~~L+??w??A2r<m??HV1???E???<8?9{???P?fo=l?C??z???/*M,?UT?????x???b8??Y???>????
?/??o?a?*5Y]:???'??<hv???N?"<tr?W	(y?5?=?E|^??.?8????;???C??$?q??jt?B??O~?t???z???S??7????B?Vl?d??F??Z'R?2?^|z?y:?\?a???d?7??B??e?!?`=q}?{?f3?82? 6?~b????k?')?j?H?!y????.;?	???lpmq??9a???E??"???F??O??pO?\T&?j
????k?J?}B?kT?
????>??
?BOCSi???8???????Y?<	?e(cOZx*rd?%?t??X??+?t?9????_yx???/?w?Oo=??h???v?x????^~?n??k??????*?????h???##??w?Jo?P?Oqs?Bk??7???
?n??q?????.|???4KwG??fHX?Xq??aA0*?????S?c???<??C?? ,G?Y??uj>?????
???ZE??j
r?????f?? ?/?o???d?
???N??(??_??_? }[???.)?}???Yoc???Ao??cPBR??(?	e???.?T?
? (T?????????????o??V?o??)?N?????K?	W9?;??<????K##?n'?S?5??:ABu\?'o????P??ST&M:? a?X??J^???uY~
?H~????????Ps?]?%??h????.`?*^????????Xi????p????[2W??5?y??ML?r"????lr?\?yv3?s??W??{o{J?????D???9??????$H?OGb?o?W?I?
???x4?+?f?}9t+v?????*?DC????)????K?q?8I?+pR/?b??C{?U&?DOY?8?????j!????U???????.K4??]??o????O?????)??K???Qg??|?1/,E?Y????Nl???NZ'H2?;
h??)??}s??UO????Q?_?\??CC]????;R?)????I
??#??????[?3?????%??????{H??Ee???mY??CV???A???????>??xe??9??{\|??=M?+L???21F?u??????n~?X`?v??"?
7ah??;?m??#WfC?]?
?a????Tv??_?`?B???hg?7????0{??;?5	#?e?JZ????DB??{????"?=??y]RY?@j???S7?????&??
Z????`?H?U?]*/9?????????1y??1?
F"??]?k?8%?6s????k???jd?sC??????7???_X?b??t???	LC?
??F??SX^???u???'\*)?K????1??|??c???$=???!?G$?q??t?F????????y$???BTM?x??
?5??C9??$s=??7??????=ulG??&?Txn?4lj???lb`??????Xo4=??o??.??/k5?<???<?d????
??I?D?s.?4??/?->b?????'?????>?|_#!e??i????g5??G?????_??IY?[??~Q??t???????+l???uL2??~??PKp^w?+{ ?????)?K??P??[?F?&?
??g?uU??,????
V??w????XJ???<?L??'??	+2?????3wB?u??????q
????L???>?PE?
?b.??+?	?lm*8?%?F?????????2p?^?^?'???iY`?fo?Q?????g??u??NU??Y?/?????~<wU?&??8?i???????2?Yj?@?????@GS%V??K
???\???c??f?Ag?!,n?p???}~?l?1jD???????9??y??0aHM?mF?@???r4??I??.s ?*
?9T?U???;??b?7?`z?????????i;??W=??Rn??????????X???????~???8???y??(???z?Pw?????????????@@Q&?&
???b?@HG??\(C?dK)?[Y]???????{????@?????sNx????6[Tk??9;???????z8?
J?]
_e?e
??~?.fw????t???>=Q?.????"???u?J#n???p*4?+>??+?,Q?&g?1?4???1??F?*?5?b?+X?H????qB????6)5???o?3??Yl????q??U??[?U?2?*???W-????{??w=?m????i8B?Q6?L??#;??wT?7??	?43cM1???G?<?????>?w?????}??#?:????<?-b$QN-???R"tBs>Dj=????5*?!Jb???|???????????8
\?XDu^}7????\a}:?'?=??6????????<?ol?Yi8?|??`?G???.?*???2X ?h??^???6??M?G7????-?2)z(?a?rf?s?l?+v?$?T??i???mphc??7>???U???03\e7[?~???w?	??
%f?

s^?6Cu9#?v?QB{S?;>Q
8?.????B????T)?Zdbi? ?.
???Q?_??#?r??:???v?6x????????H?
Le??Gav?U
p!?r??????3?)^EW
?N??V?V?\2B?"?????M???5?J30?U?????????W?or????? `?t??M at wm?QyGzdA^6??
???E$??68fN}?|???H?
??4?te?gI	?410???C??"]?uR????T??Et6/?U?`??*&??V??/?	????n?}\i???7|??B?0>pN???P'?,5?rvS????????kC&??`????W?n?????
??Ji????6O[???iA??g1?,w??y???
???Jc???0?J{	W?H0??k'(?q
?}?.??
??Th????Z~??????d??pF0b??!?\??]Ni??Fe?
?i?%a??meu??~B?
'6?i7tO9*???J???2'oe??%???I? ?t(??R?y)???lf?lI???
??????kq.H??????e?Poz?+???????\`??+?????|25????PYR|Vq???A??]q1)?????????#2=|????7?FO*i?6??b ?3g?????Q?`?z,F*??O??M?3?f????U????.???(
3<o?R???@?????rB????Z|??@Y??.A"p?????*H??n?????q[y(?,???(??pe????et@??
?|???#X?j.?w??????l-d6?????!??o???5c??~???dWQ|????????@~8???!??????8BxI?m?d??R?&%[??A-??H?_??Q?Sta{??;??y?*?s?{?6????K8??(??L?	C?ON?,?`i;TH???P???????r?Bg?)c????????h_?
??yu?v?????
v C
???4?=W??Z??C?]a~??V??`R??4??vl???,??A/G?6???'??+?/????`*??O????????T??? ??)v???????}?8?D??7>????v??a?u5MG`0
Ke7<?q????E????+?'??->!N?S??R??a?
M?
?X??1??@Q?B}3,!?9?W???
???????R??8?6?$w)?F????<W?????5?
w??ViG?????f?
??S?K?? ??????Cz?Gh???&??u??+-/C$?<n??? '??x?(?????m?3$@l^x??3??G?g>
??8????^?E?k?$A,?Nf~???2?c
?"?????N*?H???N?x1\+v???	]?hC?r??R
?????6????T}H?
?o?]4??????T????u???WV???
/??hc{?*?e3??
X??:EH???P?/y??2??1??[?jr???_?????|V?\*?:???4Q???E?n?|?&????0?G7??kU?????k
?&
?
j1?
??;?$??~Am???Q7???
?h??(~h??/_c??D?k???X??*?K?K??v??r??"??~?\W??|?Qb6"?X?c????B?&o?????0p?t?j?T?+?_Gq?w?%jF?^?Y[#?k/r_?C?R?;?
???i\?0[????}?4?)?uQ[
?i??~???F?^????X?z{y?ZXKS`>A?;?XK
???R?m?IV?=l?\,?U?FR??
U?????p??z?{???I?_???P?
?_???XL????JD?????j??B? ??y2????\?F?*?????^Aps??{??@_5Zq}?=?
?~???????t:??e??C??/x?+X?/W2?=??R=???6#??8?M??.?v???Si?????,RB???[/???B????Y???p???*??B???*`?}??s?????????~'????
{?b>?4&~Ax???2>?b-?
?????*???Jm?E?b?Z]#????O?r?.?????&??)???P?????;3???v;F,??Q{%*UC?0???????UQYe??o?MD|?[?U|J??
?????6?????+"????C{f???$M7?????n?2v??R????r???-I?<??Oi???a??.K?????!({V???Ms?"??f*???c?1?
SP

???*???{?6w?I??;??bW?????? ?
???ie#Yq?"???`???K'?R???m8Z
?(?`?
g0.?V?=?F??R?2Y% ????:??j
????????>????????T?m???wsyx?0?`?
_K???#*?"?9????]?r>q&/??M#???q*.&??sX?6?`F???BYr?????hG?DE?<?s?i#????A?O)?vU?}???KZ?I?7?d????Zx?<T7?W?#e?o?}?8Q?/?ey??\)???={?v??V?8$???Zj??
D_??B?eM????u?`?N?P'g?_y3???j???}?z2]??Z/??8+???.!???6:?????????<???8?{?W???dE???@???#<W???C}???z?????n?????l,(? ?y????c??9?G?-?[?o?ymBhChh`.??-???|!!??H0?%?7Vs?A?l^R?<
????n?{r?#????w???????*?!?c;o?$t???B*???;?.?W?'??1b??????(duC?????????????????pB?N?iFX???@M??????F??????2??Ll???????	?8	?f????z??????HZxGe?=?.???????????G^??1????F.???D???+"?h
?????Rii(OQ?6
?'??GM'q*?5>?Ns$x^?}i??*
?????#???????t?x?R5?d@???5a??F?<Z?>v?#??C??Y?"?y'???2?????H~]%?k?|????m'?x???'FXz?A??????????:?Q?\???????X??m??|#%?u?n????u?	????D ???N?d??rg?O??;|F?qY??6;I(??l??
?g?? ??Y
?1?<??_/????)?4????`????c$?]?F??Ms??????????F>???7???v???V??MQ??\?1?.n?????xZ?Ey??u???t:???L??[EQl?hO?>???
?F?Q?l?}??2Zr.?ZO???,??[)?1?K???m??d"???2m?CO???rq?5?????]Atcr?fP??eMq?(n-???`=?$#
?v??~S??????>?AR}?wY~???R????Jgy/?zD??
a???6?h????U??V^???L?{
???FqK?g?"????3K?`D????8??
L?g-?n~?V>??lU?1V????~?
?P~?T??????
??
r?????=??y7????@????=? ^?1?&ZV]L??{???W?????-???8(/O>???q?9&?M???o>r??n??
?
	}??????,O]+o?????Al???8?????/??[,a?|?
??T?????,????:?L??'i?
k?{?H3g?8?D??/?HG=??????/?"???4??y????E??*fh???J????&?\AS?.|????&L?e??t;???g?t(fVs?5?!???DI
?:????=>EXCe??id???3??z%?S
????!0?c???z2?}??g,?>?l?_/P??(??4??<?
??,?v?{???????o?$r???[y?	A?6?????w????Q??^^???>:GS?
?<???w???T??????E?=+????Mvo'+??+????,?????[??rX??TUzv?k?2w?5Bn]?~m1??(??/?[??s????{3???)?v???`??4????{??!?%???@F??@?x??ot??
?v'VF???lu?E???z???? ???!F&s64	?`b??3??!????sc?5?m????~????!?j! ?z????P???)??<p<*#?}??-F??P?B???3?+???)??????d?lFa??k?|G??5?????~-?F?6???????2Fr???????x?
?8g?????3?u?6?\???^??????P???l$^5j2 ?`?.???x?:?5?Mm????#?z????
PjPVQ????i?!W????0???I???4S3&??='??????}a?y???]}@:??	y2?O?4???E"6x?J??D?I=p?n?????????!?"?fD0<?yI?>?	%<g'x-V???Ix+
??Z????Wa??x?????myB??N[,?
z??N1??6?d????}Es????9????vPN?0Cm??p?O??+}c????Q?^c?*+/#.>????A^??2?Qr?cQ???%????d?f???8??}??P???L??2ey?9???k???
?W|??SaY?<??m?H????BJcET,?{?_?M2? ??N?????i?N??,????:!.8~?N??&??!??61B????m?^w4?u??f??4e??(????(???&*~et???iG?ve??????S??F:On??iuw+B?{?c|?oL???Ov??m??>
?????f??t^?0?t?xAW- ?52!????!??#?\-??k1r???-?f???]?S{1u??(^?(z'??T??????vw???>??3d_?v??H??
SF?S0T??t?S???C???6~??????Q6????,?c????'???V?{?j?????=R???????XK?B?)?4??O?????vJ>????u(l at s? X?????1??4v?m??????"?????"(^??v?dy????c$?B9?9???_?s??B?*?Y?rL?q??,?Zq?&I?4V???Q?s??k	y$??@???d???k??Z!?|????H??VSs?3?6???????goN?f?#???[?+???L-j???N??'tu/#??=z?#??t??VdL????G?KD???{???7TP{4??|
????Yw?k?H??M8?b[5???aP???IL%???;?R?|??"?68?Q?????y?N?{#?M7?\?nh?Wd?T%yF???Z???T\?j?2?{?
????#a??ZG?t??f n???C?I??x?????cG?T?V?enc?s^eKf?h?`
w=~?V??@??TR?kY?cD
????h??$?R<?[??B*???+?~R???$I?RCV?*???W???}?R?
M?Y??N?=?? "?/?K?Zc=I?!?]<????V?C??!?????v??c??k?????;?d??1Xq????????;:??-???j?R?HZ?????RN?nu ?a??>7????
?&`E9?????????f??????;(???b?V??u????C???? $??R???yFy?%???-^?q???Bw??F&??B????a?????d?N@???4e??<?eb?4].HK?=K?~???7?Ap?#?b??$O[-??!y???^|t???|a???????b???VE?TR!U)?@?5?1?)??????e?????g????
]??pw????F?6???
U?0u?,?jYNV?91?h??8G??u?K&*-??
?????~?U??_?s8?O1??????'?w1_??=o?$
o???????`?G????|nf??#????l?Q;s??LXV|?wt~_???n:??4?e?????_n?R?7??????GR?}Z?
U?BC????;??b???k??.??P?????&??????E??7{F??3??dE]???[,??n????/?[?S?8_?U%?k.????Pr????2??-??E[pl*?"??:>????d7?L8??????+?'dv? ?$?
?5K??1???R?3*?a^rO\P?iz4?????@????(??U????"?+?6#9??Q??T??P?gR
y???+???????Xu&
?hG7??Ft?K??R??zm-~L=
?NM???????{3?	SC??v??Z?ko?$????9????Kh?6??y????O?3B?eXp1??????????'????5?_Zn?>)?cD?b??Ya???b????y'
?YV?0
e????W??~?<???-??*???N??/J!???7?.R?8>???&??[>*?%?s??????
!S??*??gEF??	??;,?%? qt??6???& E??0????|??r????9
C0?
h5?x???)??U??
??}
?*
?V?9He
a??????Z?g??\??7??e??,???{Y?Go5?z&???*I?
?)nu?K?/jt??_7
???=6_oH??1??4?8??????V?5???{sn?a?
???9=?d???={f?0???^N??D?!??8?=????p???w#?<??Y?????j_????X?9)???8?3>?????!??r\	H?a{?@	??8
m?Y?????y"eP}???P?m???"?2#??)]?9r???c?vJ%
|??'N?????
"??a6?\?????#Z?
l??^b_?_?f
??}???]???m????U???;?vE?M?W?q=??N??',??m?J(?????=<???g.?II??u)D~???Y??,N??1`??I????)(??;;???3]?lE???4
 b???'V??99r5????8??????g?????(???c??$?_M?/R????|??u?x7???????P?/,???H????z$|T?M??^^?T??????D?V?!	T??f?E??V???HS?????C
????yVI?6a"??
P???w^^W???p???'?`jth??Q4?%?t?]t?????5A^t6??7S0
????????$x???P????l??N?7i????g??}+}b??@??Z1?Fb?????S??=s?'?/}?k1??_
Iy???m?????????^J?6? X????mn????;T?/??????V??;??????????T?(?X8???@"?7??=>9?????}??????A????~?r?u?T&_????i8>?=??^1T??k?>7??=vD????????Ru?s[?
s)Y5v=xD+:Z??,K?????}*a???\? .???3??j?U?;>
??w??Q???&r????#8???Y?R?oJ??????U?N????~?u2L?F??ALG?G???j?-?V????D???`m??H^?&v?B?x"??T#??lR?f??m????{?y?{<w??re:?.??`??d??
?z?.C6I$?i???olN???A=???K; ?d??
???(???5Q?g{S?k??B??T??8?????{?,*9???
?|O??
??%??n???p`???S+U?l??AOj?/?????^$<{ew?O???%\p?Q?Xu?O???G???.?f ?
?`???=
??P?Q???`s?c??p?p??oD?c?91??,?{??3?;??N<v????90d?9k,?}?????v )???????v?????&?)??i???#?6T!??O>?!%????|?$:t:z?????*a???Y????u%0??@s?T?W??	!??H?CZ????????!?:??X?p6m?P'k$dP?l?pA????h|?!???D??????wp?0???%??4G?????R??T???_ ??G?7!??J?ex^?
?m????f5?A#Qsk\o??+?2)?????? 0?4?|IUw)?4??p???Yg?X?&q?d?Zmh3C?D????]???V?V??~??????l@?=+A?RS?Y?]?@8/????h?f?Ld]?V????X at W????N?w????????dq?(???aCY*?e????j???????v??)B?._???Ol?,h???.??.??T?.X???@?Lp??v1S9?k?	?PjJ??3w????2?_?l??AV?i?????(Jm??t?????OS?G???M?*6?6?????????x?c???N???D6!???(:???nuc?rg???Z?2????O??????3??U?<?,$????#7`0??%????"?Z/?j????:?g??f?!	??tT~e??????_XLi(2??(???8????Vy;m4?W at 6?BtA6??k.?W??Sn??ex?!f?`?\/[?/O?v4???80N???/?t+?x??7^X????$??:?D
????
?&0g/???{?-?NWY?N??-?????	?????????hSaK??Z0??aP?-?@tg??/??8??\??
[?%Dj?;D?
?8"?h\_y	??uJ???r??T?z????+?,=?Q???%`?<?~?b??Q?
??e???G?R????%?u???Y?xz??e???E?????Dd?v?+x?m#?%?|!-1????A?I????;
eP???????
y
?/???1???-0?@8?#?_m??4R@???r?7?|?ui??E?<???o???]?P_5??9??]??R?`??
??????&~
k3"?~????
?v?.O???r???u?
????g??<?f/???????+SxT??@?s?{	6.?%Z??AU???y"??E	??????G??YK^?
??r????<?mO?Fd??R?(x#s???+??YLx??R??????x?ZMi????7?/+<???=?B????m?K????/?vM?R??@?+????=?.q??~?C??PT???7?=8????-l?O?&?8~?<
?=8??'??&?5sJ???aX
\7?;????:???=W???
?u^h?B
#?)????,n&$??k?e?K?(0?g?U?0Tk3?[~??6???4T+!?y??f7??	?t??U??R
?=??}(X7^/?d??C?]???7>??X?7>?B?Jqe?F
????!??X???N?-5????:<Z?PH????3		????????aw?n??FL??F?????D+??K$*???:??|f???R???(?!??{?^?'~?????KTy?{
Gu??f??TfX?E?*w????*???	b????6??@%??a3$T
35?????t5F?????y?H?N_?]?gUv?????T?>??p,????r??????`??`????_q]?
????Z=">?ocM<HR8?3r?G??
??|?6?
?D???tS;?RzO??]?X?2???`VJ?m?????n,y"?M?)??~!?>??tz????a??????_Q?\??Q[>-<(5?6??!?M^s?|
N?????`\?????&W??L?)	U*? Y?~??j08*?F?"*???pY?p|???????a??V(O?
_??~?K?a?/F?????L??Yh7????8??Cdz`W>??7?e????????????p_?S	??A;	nJ?`b^?>1??L{?????????K
?^Y?8????`X6w??A?
?n6?'5\?
jy4iNT??1!??a?/????=+?`??#!y?]?`8+???z|n??{^s?-?#?W??=B??A/????????M9???#??h??Y?`q;Y$?-??i-a?]??o?p(???B?k?8?Kt?RU??F???yi~/?????????M??)&??>?Y'?
??u?
??????????Az??_????e?? 
x?^??);??rcE]??c???r?U??q$?U??o??!*?\????%??????Z"??h]?????&{SR?B?|?WFn?,???+??????Z??t??H??&??w?tq????3	????+?
?
Q?=_)?i??d?????p??i?.A_???/?>????_Nna,??0?n???s?p

?4?)?O?$?l~n?i?Cz?$H@????C
p6???:?????f//#?+?z~*?,??Y????????????? m5?w??U?9?z?{b&?"
????:?:`M?W?w??l[?z\?????0???l)P?{?z"??1o??????i???-??j@?|?P????*I???L???t`????/`\Z6??3M?%??ga??	???X}: ?Cs?&??N?2??k?rx?p?z?tl?I#?L??x)????M?+??>????4!3????Q??*??^??#?Cvy\\??!2?????@yHe?L??????V/??|]???"W????x
-[???e??.??'???@?????Z?o?M?!Fx????w?F??????????(z?????J??7?z??&??\????? d???`tb??nV?q??py?_???X?KH?f?$-???6?????????a??-/??A?w?A`????q??.T?&?m?M?`?O???
??????9???'B??????3%SW??l??H??????M2_|$?i??@??e\u??B@??A9????NE}	yD?^
?]tK9<?? *?	????J?D?{?N???_b5?UW????tk'??=???????????e??????5T??"??r??????????"??bW?5}?2?????????I^??????ui"??p???v????_?
hu???g?	PK???	s3??s????qI=???kB?*????????0???_E:??$???j?6K
??;????\Z???????D???W?????h?!yx?????rd???????zi`w??M?H???t?y???N2??0U?v??i???eSi?b?K?U/JT???)??!?	???K?ba???|h?e?Q[/????????s?`D{_??[?D??s??d\o?Q<y?Xd?
h????????[Cw?E?????Gt????U?i?^z?Ud????2x!???9??RV? k??[?=2???B?3??????n?bv???w???@-?d[???[?j{
*?s??yv?????????
????kl??????Ud?9??? ?????????$|?9????*?/??
?l??ar!w?X`Y
o?L?D?R(?G?^????E?D ????2?J???2>6???ZA?? |?????P??(x?2?????g)?1??^e?P<?E?L}?|???
}r???D?_?6=?
?8??=@??PV????1?{2E??irtm?S???????|??|%S0+?dM???tmg?v?????
o?
??s@?s????
??<??-L`?S|(/????H?Is?/[x??1?n)??	?<?\~???f???ay??R??T?R?"?CR???
vc?g?????-??n??o>????d??	?c??Y?B???`??r?OC
?e??	,r?GF	E???JV????????ib?pd?N	???I0???Q????6??3???E??N???#.V0??'}?e<?V
??? l?p1??d<??_!3?k??uP?JB????jsd??A????$S?5?	s???k+z???@??eEy????????f???&????u@???x??V-X???T|4???W,?g??:K8?k???N[????L??5=L0??_Z?n????c??S??L??f??TX?N???r?K%???1???
%'
?6??`(???r?!?@o?????L?
??%????????}T$ ?R??%????????_?
mI!E?=7???2????he?W????BP?^5?~??#?u?w?#????U<Y????]?t
f?????????I3?0@?N?)}????O`?Ht?F???????0????F??S??????#^?w??!????zuW,iiu???????b??S??+???*???%???0?I?s??????J????Xr???nL??'??????r'???:VP?+?????"U]???????h?Q?GO?G^B?????iX?'??|x??S;????D]?5S
?L??
?m?q??6?T??N`	??_??r'???
????,?BE??
"2$???????1Q??v????K??%?L????????[????{?
?????t?????Z ?`
???j??T??o+HR?;4?????I???On9???????=Km?????Mk?/3

?'?w?9?????DnNxP??
????
(???v#?h?3h?5_|1?d??}??K?b?YS??
c????2???????!r?I'??H?????%LX??	,"?,?????D(8?5?)"?'?u????????m.???E??#?g?w??'????????I??^?kh?p???Sb???)?C?	? x?U4?3jmE{????o!??H???U?~??I?}R"????[????*_lw??$\?r>?q??8:X?{P??m|???aX]??{??U??*`UDb?|Q?`???+?e???<???? ???U?2?gzsZlRe???\??/~]?????F1%?T????k7
~?M
?'???2?8{??t?????'?E????m?
9F?Y???
?T?q=u?S?=	?,*-????>??or?B????fd??NMe0ic_&??-Ir?
??p
??????	?@M????Pi?
F?9wtf?/??o (
b?J
?????aa?????K?:5?W???
??k^(??]\D?sLIV??u
????5?-HE[V??yU?
@,f?c??C???<(???w!i
??%z???
??????<??bA?,???e????<.k???0??`??1???@?G'?
QgzClr?r???~;kxo
?0?g????Be???5+?C?L<?K??gD??	Gv-9j???q?`??Y????????DP-UL??A<?c?v?`@???g????????????I????!?W??,??B?Y?
7????K?=Kd???????=SFW????
M?B6=?x!c?c6?8h??G{?????F?D
a?R?????E?_???k?2i????	)?u???%X??X?Fds?>???{?Q????|??E-zo)
??)j?0??^?@????*1?6??J?G???8 0???M?7E?CE9?X?zFT	???z?Q)t??@?"???%???c?\???O????
s???\(R
?oB???&?G?!?Kg??N|????@&??`??
?????c2?Rd(z??:y3m???[cG?R?2$?bSR?V??c??B??????{t@?????@?vl?Z????]??)??^??6<5\_M ???p?P??<K-??PDI+???.??????r6E??k???hl???1??b!?G???^???I??':J????h2?5??HN?c??????L(??%?]?o;C?x?%L(;?v#?Y??x??O????`?!??????
???K?R?X1yg??
?l???????D
?&???*\	?C.?yo?a?(???K???VXv??d????(???.??0K]?rb?2q???9	??l??????G????91????({Lu?-K??>???N?8?????Pr??t?+??????<t???????j?;[?s?????*???(??"??I??q
O?X???1|
H?4?????/?????P.??q?????2??????tk?U
g????*?a?$7i??C?V??J?G?uC???^I=??k$?7K?????A?F
?9??\?o-%?o?E]<?r3??Y/c? +?v5?,???"o?!?k???<??cW-????D=LVD????f7?Q{&??z???2??=?????P??????R????5C??zM%Rj+?0v9?z???)???"6?k?????w
??4???@?$t???@V?x?Sm4?(?nx???!8???G??Y???2X?=m?D?]????x*o]6Z?GA$A??@???`?T
?6n:v??
?]??:?F???S?R???ha?qoI
?F!?3fkD?A?g{
?MqQ:????x??\?Y?????i?('l>?g??xu?HY?.?2??Hg6????3J>^K?Q
???>??jEp??VPz???{?[?'???(+????p+T??????????!?A?T?^??????????L??O??O?d_?E7aNy^.?8?,_???^?Z?4{$$????^?Rq?1AoIy??????
]Onlk??+
?X?,i}E;"???G???7<m?# ????~3PP$??L%o?f??????
"??>??????7?n^??;???
?????6??Oz??/N??????m????[NB>[?x	+Nbf2"???y?3???C????????nc??????z(v?????????5r?1?3&;$?4????<KCZ#bt?,???????U?d??G?|??2i?????
Q????Q?G?j%lD?l???$Fd?i`?d|d??l???a?Gp?????oNq!????{f?n???a??_vT?Z?7r??c?f-?????Y??}???H?9CA?U????@,bD??k1+V???3'&6Y??8?@????SM??!???????
g?M\?1?
[?y??`??P???<?-?^?M?G??:?5???r???????????????[?5c?????4`?c-?W[7?????j???,H?{?.?aJ?b??????j?N??o~?\?o???r.?o??;?o?W?M:?h?????t????Q7E?le?% ?'?b\???
??;{6??N???++'?T?d?DX??????l?#l????<X?\K?7??M?2??
?
G7??U???Wow?D?64??xR????/???/??9?8EG)????G???f!????K??6?{Q????4???H?F?9????d?,???????4???%X?
??@@????R7??????rx|?D???A?
??|?vbX??<o??????(???>7d,?N?7$???3???s???Z????X'????P??????}???
 ????	?D??F??vF?????P??v?2?:&)???e????r??q<d????0?????CM?U
??K?????P+/(?L(U????,??}@?:??k???m??i???|????R?*??^????`c???????@???<yZ?l?w?|???^?????S????e????:??4?K?R???L??+l8uC?????xA?>
32!?8?8b?D??	)?u???ac?%B????#???????aB?Om?L&??Z?5?d??E<6???E????U:5?BC?MA???/D????"??%?W?????td???>??+
?/#7?!%?^VD?????@???a??I
?E?]c?A???,Lr?;??%?m/?????y?
@,??vO??????X??3J?kns??
j??E+s].??^??
q?
t?	?DM??i???B????x?,i??r??_???9???a ???h????@??R"?????????H?q?1p?C?m?,??T?????S?A}?_2?gx??S?2???????#4a????Y!6^5???3??
?x?S??f?q????jbs???(
???.?.K
?k???PU????@??[?????M??ba$F?g?o?!)?p]\?G9?
?Y??(?Fb5?/??9J?oN??6b]??W?U???o%dBC,|=!???+?3?0Jn?e????;??+?z?T2?????y>??|?fd9L????
#?}??o0???"??s??G?&???z?>????v???J??/
????	q?~????????A<:?????>??Q???lYPu^?]v???Bl?
??????h????Hc2??;q?/3I???v?v??????????????
????'?Z??
Bd?'9y?b????w{?r?F?c?%Q??h?2?<?+=J"?E??]oFecI|???????????????F- ?f?uH??????}?o*??I8)?e?
1???-??????Es??t/?<??????qq??\$?;
d?$?[????VEX??6
???Y?????Tm??t??hb?E??](?.AL;?m??znux?:?n<????/?_?J?.??k)?7?????????]??t????I?F???]J?Rn?O????
=]d?:y'?4Z?/-%??????Qv???ul?~BiE????{??WY??d0TK:D?k<?? /lY????
CUs?\????u%??U??
??k?8?????o|kXn??^??5q?a???+?V??F?? [??}C#:K?_???

?c?E?????e?F?]???}6?????I???DrD?l????S^!?1i?????&???5????*v?
N?????"?|????.?N;t?R??$G???3?P?c?>??H???	???`??^???*???Q?P???*?U1B?)?$?]C#??(?]????
 :?9???6rMU???O?M|p???F????W???e(??#?_s?0?^?'0??
???k??&????j????n%
|N3?4???U`1N?????!L???S'??60?N_q??0G/I?p?g+.?n????????????q?;pf??h?+??A^YG???????????P????,?z}?ia7+? X?h?}?\??????N=???ST*?Y??????uc)N*??6???V?????1?????K?\?2?X3?J??T?C?`?QY?	A??l ?;i!???????????g??)}??9?m????*g?O?k?1+Fd?,s5???e?]???[r?GJvz??????#Xk?g???)?q?M???X?dy?d????4?????]?X?,?<?????q??F?????-??N???d?R??Rb???%?B????UT??Q??@N??6?J?Kw?D3?
#\????????i??? ?$
S???

v?Di??%@;p???%k??P??,??"?a?t?^9??9.????????|????-?yz!????!?L?~????Qtg??Q??1Y<?+Y??Umg?]??n;?3'?6?w&Z????5&??W???k?;?
?t???1h?z??bze?f??+??????&???Cd??
?I^???B??m#?*?V;?I?*B???I?L??'?]??z^????`3e????n
?$
?jY?????:0??;d??i?wW??#f?E??k??k?q1Ty????a????3z?8
?
{?[?g??9???Y?=\???@??e??????@bE?Ke>z????A????????mA???V?<u???p~?)?zu???IH+^+???????i?????<???xh????????g?Xj?_b
WK????????x:Y??c???0??6?{??f%4???@9???W??;'?t??d?}?j??C??%???F????????????}IMJdW?<???~]F?*V??*???<Rr]??mc??@cE2?f?x???R{_???GA???D?{S??0??AE?A?d?~? ?h?Y??????!%???}M??x?I^l&?????C??
?'??w???s??????f[#?+???????M?_RP??w????[,5???gEM&??oW???Jy??w?1?(vk>\?.T???????????N??.?AN5?f??QU?????3??gM??JvR?6<?Aq?
?e???u???+??@vf?????&i9????H)+?4?V?????>K??f???a??OYl?-+kEe?K=D3dBk?J??????Z??i??[?N?J?8??+o"?1??$?g???*?s`tH=J?@??	??wq
??"?"VkLN???}?9?Q???
???Y?????????.5a?r1?W}K??d-??ex??V
c??????f??(
??4
???`??????????????V?????Ca?g_?????:??????????????nZ0?a?cY	{
?fR"s6?&b?^!cuc$F?,
????K&????^?^?????n?0&:?XR2
???ai.??A?	2??? nm@ ?.?
?	?%b6f?b???0????T??8???????????w?4}???]?#??&?c/
?/
?v?C???J?/5??o?????????/????.H0d??}?a???{???\?C???b?3
?3n??9???.?)????8Ibb?i@)yg????@??W[??l&`?p?3??Y?74???<E?A??]????;??8m??o?E?|K??Vq??
x?????H#D???PZ???Q\??k!;?bLm??????l?5????y_???v??`H<A?}??o??_U??~m?B0?????V?W??f??g6w'&?<`4M??ct/c?????Q?i?Z??9??&;Q.???ue?4?/????C]Kd3`=??m???????5@*^?Z>?????6??-u]?.???5V???~???J5? ???s???
-???Ia?????`s??YK4?????I
????????E???j+?C????O??G???u?2t"??P??6_???me-a??YTD????;%?/^???pZ????
??? ????-2?
?A?^????97?n%?X?D????????e?\X
?+??u???????????n

??????.?l?f7?`?????????????5?<$??HX;CflK)#?X?U?\???R??*??C
?s}?}(?j?????????x)cuD?$??h7??M?7?t??C?@\v????%????l
????&M?U??	!@?q??>B{Nl?
????F???????fjO??f??Gy?97_???w????^.?9?????\#+$s&??????????
???????r???o?5??xk?:???2?????*+}Rdm??$?
? rV?A?????+???&?^?l??"????
??;[???E`??M&j??&5q?6??Dot??;^??^9B?t?'????
;???+>???S?
HBw,'
?$????,??
~X
+0???&7?B???????E?]N??EJm8?`e??
$???:l
????E?]???????-???N???~????* ????g?g?!???A\???<??`=|??U???g?`
?????O?k?-??]????MF???%?;???Z??	?|%e???B????uG%Y????ck????????
???r???sR3?O????ibp?{??????f??j?7h??8P?h]??%<??0>?y-k?~??????Ty?n'?x?5?0???G??6{0W?tp?&???i?????B???m?
{9???:?]Sd?i3? ?????pJ???8_l?q??{??oj??V?d?v???^?[Vc??J?|[???9???)?t??D|??
k?V&4^?3??????x??6?	??#A_;y??Gd?e}?#??`c?9??`s???Z??8w?=MQ?Q?F5??]?.???u?J#wCK?:u8?"/????G?^p????w???u????~?????Q??????XY?J@?????S??Y
1O`S????????md?io?h2??{?h???&???\??$^J?/??{???????$??R??7???U???D??2????s.+C(?????avh???pcg	??????A?	??4;???eW=?7????-u???????C??-?TG???_?_???#"??$?? #?=??r??mYLP?gf??Jw?4N
?}??DqN{W?????????%??????|s?am?L??o?83?l[`?3qV??$???6}*??rqq???????i?$?_-bR[ ???V[|}?*????W??=?l'??,(-?=??
???SOi$????Y"???4?????~???	u??	d?R?CP?x???_?~??^t-N?e??S:?kx?????Y???tm??Z????? ??(?)??B?ls?9LUd?,"?%?B3>i??G??5???????|W
??;??
?????Ij4??
Kkm6`????QVJ>T
(???-8?,q?N??g?hOV??f????Y$?qW?=
'??V?$?d??gA+?b$ooJ??7J?y??????w???u
???)@???`K<bt?k?/??<??jc1??V*??Lp?K???H?????I??8????N????B?h?Y??q?
E??ys???9??'U??_i?@H8?B?Jq:I
c?
??8????|???u??"???V$???B?%@???[????)?
?????tm5y??g*?^K?	??q
?_?YzGS?j??x??????a??N%$f???Ho^'\ ????0!??^??e?l??|?&??7??n
Q? ???T??+??????????)???\[&:??>
=:?g~?4?7^u?i?X??]6?&???b?N6r,cX?G????u???R????<??}[%??1pT??#?eu??[PkWl????Ah??H???}?:kyab?J??E?N???U???:S?
o????D?????????????cjUV|??]???)????W'9?|?m?`5??C?hw?"??URj????*$?????u??q?Erl?=	{????el?Z}?rW??D?J``6g*C??d?R?????g\_???h????d?nc\d???W.??u???????U?yVt???d6??K??i????c??8f?Q?J??L&?????Q?UvN?	????g?????Y???L??ot???????>W?NX??*/?p?#?[?&
?x??V??"jg??,l??w?]??ru????+d???Xs?|5%?[???d?)	i??V?o??Pd57???+?????&??*?)nqx??J?o?hic??M?qz>{???|?5T??:?i?;?????t???
?	
????5?8/?q?D%\*??Fo?Z?DLh;?_Q?_?<??V?	)???Zo
????x??w??????2%???EX?a?n/?6m*?'???u???>?^???{??6?ktP??P??
w??L?9H~
?<p?????+??LXIt??-_L#?B?U?-??????????aR;?
%?:????X??lal	^}?ICC????BsB???!<[N??????)????V?o?
??KH-[?cK ?"6????
h?A?H???1?rs\?}k"?A??????$?@+???
???3?#???UT?J????*?y</@w??????j('H??)???????\?0?:?eJF??#[??.e19??y??
????|M??
h?^?c??.????????"?/e??A??2?? u3??u?/8?9+??????????
?^?L??????(
j?$	V??-??n?
??O?d????
???????'???6???I7???O\?<\??5#D??)? ?t??c?????Y?OD?h?1??
?IvJb??????#???&mhw9?[t?4?Q???_]?4?????igT???g?Vb??#
?7???\6?*????u??A??????8????z,`?u?]kL???r???)??K??A??&?1S??F?????
??????I?\#??d?n????f?'T?N6.P?:*??kV?r?
9?I?p#F??fU?g?,?k??ky?\?_c????#g?5??	
T??m??T
???0?F?Mg?????vU??,????A??)*u??Y??"n?b?'HvU???#??
?]???C????H????U?_??k?????}???j???S?R?!E?A'?#b?3???r?E?&???
?hZ?z??T?O??W-???+????S??$???9?1J?B?_???B???
???E????????C?
F?5|??????9?????WGZ?qOk=??????????~ux/W?
L??L???????D?r?
????????I?i????????U???B6,??"?i????m??
Q????p]KA:????}Jea????1"????#???n?y}oH???e??,+????y?D? ??2SG????n?k??????AV^??&??(?
o
h??K??k;??g?<"???al????wX?!??v ?y?0q??V?O?FKQ??D|bd???R???????^?k_???)?2???Qy??l???snw?|(c?)???5|?rK
K?Pq???N?"?????p$??d0??????R?P?8?B,},?8`V??z?V??\t?d??I?YY?
]-?"????`?b
F?Z_?V???????0$?????ZR30????Q?OQ
??.?l???L???????H???h(?2????3*F?N3?????|~?R?=??%??I??SH~ ?=??'wMH?4?V4?
11?T?j??"?l:)?5???(R????????ur????o???-??M??aX^???h?
}qEz?-R?{????!%^?p??3?????m??????????H?K??M#????T},?m??9}W?yIH;ri?
??1U?S???|y?F???4??k6q????872.
????(_(]?%?,-???k?:???a?n?K!Wt??`??=??u?
?^???w?m~?????X?A?oP?<?????r?S?????z<???G??????E??4??
?Tp`??ov?|?~???l????J4D
???7x$?-U?c
?3??t_??6?X??K??k???u>?>U??
?r]??tc?E?[^?/?J???.?#I"!7$?????;?
(?????	?!]??hl?1	B??(4,?a*;??@??
BM?%A??,??Bk?S?XO???$NM-ZQ?m|?O??cp?RyS]I???&?7?Q??X???5????@X?>.b?i?]????hV/??,mf???Lk?S??d4?Bl???\????o??x??L??(????8???%???<?K??P?????RA??r=z??L?#??,?X?
F??<_???8K+??Sgo1???A{?m?7q(:?j??me?g?????6t?rEL???-M??xA*x[A?y??????J????????.Bm???`
??q????M?;?Y?^
?????Y?#?RS???!.m?V??"`?^?d??p
??Q?\?&??D??V?![?W??l"???)?|& ??5?%o?3??k???yc?2
<?mi??0b?Z????t<k??????	????????$S???(??Lz????z4?@?????@????~>U!#/?N?????S*???w??wi?2?c?9%b?	?@???Wo??????;HP?&?U"9iSv????CJ?v?`^?8?s{$@??????k???w??&?5?g??G????L?????w?????
@C?x`o???^??????:??hp^?s8n?Z???1aa?`:???8???,??uY^?&?^?	W);???%??Y??p7/L["?,?l??P]Y?e?
?U,?T???PW??+?_6?*I???]??r?h????<??\?}?GC?T`???h&?`?'?9??????u?x????U?8????B[?
^bV??`???C?X???
??????QMpt?
PCfi?<?Tg??v<???H%$d*??/??4|@??glE?`??qM??G>??J?U?V&.gW7(AsG??????1&u?? ?y?v?T}j?%n??r??$7?_XP_/zV
??TC?*?d??Jn??"@?b&Bt1?*?,!?7L?U[????k???K?O?m	t?z
??9???|Ne?T"?=
??#?W??-??????a?p?x????
??G?j??YV?{??
=???Jc1???[B?_?????@?z
HO?t?j??XR??K E+?
}?	"1\?????5?>-??4???.
?N?-?M??n?;}#w????y??
?]|N???{TO?:>?"?<???H/???????5??????I??A,~6?(yb?^???5??4"??ki[???C??h???CX??H???(P?<t8??{??Y+???^q??8?b1?b_k?????f?ZmFH??`?O????$>???????Sn|?!??z?FoQ??H?p?r??h\,=???????e??N??b?@?k$3
J?y?.??h??!gV????i?Q?g?D??|??#?v???]
?5?O?g??nj?[?'?W7??(vA_?V??9g????j??e???q???|_?D?"2o????
Z?2????J?D??$??o??????U`fP?	??@4O>????Ag??????v????!?=?8??????i=???a???=,?0????????????L????c)Ku?R??l?3?u,BG??H?K3?IU??	?:????CN??P?v??9???]??????MuX?+2
?a0??w@??^?YRi??"????j?qu?t?8YoG?q4?*?{0?????u^??????H|????
??|??g? ??%?@_o[?L?
^???(|??_?(Z+??m?k?~?"????/*B?3??$?G9?8?????+[S?V?o?O????RMq?V??I?\A??, f?=?^??$N??g?>???????,?~BCr?+?,9
y???%?3?tS>???BL??a?????g	jt2?
?H?{H??QFTj??V?H??'??T???)Y?f:?????/.??FI6???{K??????X???O??T?pB?~??H?*????	??y
3n??D??V5h???????Iv?Vk?Z????=?2i??,?z9?????Y?X??|w?????#??h??($?^?C??????????Y???L.??
$cG????L??	?$z??Zdv?T=?i?S???l?~(A??	_??R)?NC?]Ki
????V=`??^?;?9?
????H???
S???*hRo?j?M+???????3'??T@[??}?S?B?A?aP????(`??????? U?b??????????"'?X?1?~????[?6??u???-T5?`??!C0??!????????c??1?F???!St?t???&Y#p>?z?_?A55W??dyAp?G???1/(W????G?L?Z<?`?v?6Fd?0?????G??KMk??vH?z8??6????
?L3z>a?	p?o@???E??n?L@?#?=?bDP??}z? m\?Xj^k;?04<?x.????w?>?p?????<?1?<
{c???b{:?EG?v??s?8? ????.?<???S???{Q^???.e?s??2a??W"O??C?????!?? >g?Q?/# ?n??g??To???????0?i4??
1?$?f?m???W????????xO@T|e? c?
#?N??"G?N?#YXFs
???0;f??
T?FD4K?U??Az{?h??
?????c[???
??7Ky????Ux?]?`?	?L?S/?=?C@?????????C{?=7??]?l??:?L$??$??Z????Er)????h?X?1&?Br???g?L??o>??	&????U?:?x?(??W~O?k????xEI??sN17j????c?+H?"y?Pd?1????z?Z?y,?????TYW@}K??Z?.zeO#^? ??`???LA??wzU%

0!C?
?/?S?{?&q??G???e
A?[?
k??#a!????W???v?y?*???2?B??^E????E$??_??\?2t?	
?Gm9??as?U'b??32@??nf???y?dXh???$8?????08?????K??,??/?????f%?d??'G;??,D^?3?????9??TXK#I??N??????%???&? b???4??$?^4????h?k???)??Z^?d??l?~q???\ztB?*?????^?'B??&????T???KQ????ooP???r??e'?4NX?)?'
??Z??	?,C?"???<?e?n/???jm?su?>??N??{6???\JG??!z?|3??`????G?S?
??-0??????\????V?:?&[???s?l??5z????n?JE?{?1?k8?
d9?hxL???z?r;???M??&c???V+?????>???U
zx??c?C?
??$???eo?F?5>t&
R?n?H?Zbz?9)#r?Qo|??cb9?:??R-?-.Z????E???Uf????s???Z???h?2??u?C???????8??~?G???P??'???DZU???"+b6?Bh?EH?m1s!??7?x???}?k=?+?}-lH??R?Q????]?X?8????:?_?Hxj??????????P%????yPz???????@???h?????C???;?so?4?A??}???j???z????]?F??????A?,7E???VA'[`?z?s|?????-????R??cI?y?
?wDM7kT4?0(!G}
??&+?7XG?F???R?"??????;??i+???
?????t?.u???A?D?|??E??*??????????????S??0????H
<z?I????E?h???Mc??&	4g??.h.????HA?v??
4?bv???:?M|7?/??Wf???	nq?????H??yyF=%3Yq'???_R?
 ??#??(??9??[?91,#??????E????Z??K`???'?Rz@\b??[
n?U???????a)h??@????:???????w?_?i??K7|?UB???!????,}??
???%??gL?]??O3#r??????&$/{?[??????+>??z???1
???????f?h??+??Au}????C???-?pX?Y?????U
?Y?Q9??r?H?M??NV6?7?y?Z???/gE??pp4?!z??sM3?!Sq;yp@
?T???/??????KErT?5??p??|?\i??/??k2=??C?2??<? ??iB???7"/???)????? s???M=? ?'??"9H2W???k?PP)???)`Z????6	?(W?_???0+??%??I[1$\L?qf?!P]??????r???^????P}3|m???W?qh,??&	?????i?=d??E?8??D:??xa\??\??\???A_p???????????p??+Oa???`?Y]gJ??yYC?;~SC????Q?8?p???[????????
 1?S$5v>?????c?Y?'5?7??
BzDE???????<`?}??0T?????5????7?r????????}??3F|T? 5??o??mHJI??????????@??}??????J????>H;m?"B???w??????????q+?nv?R?sE:?2J?h??h=?0|E?$|QD$?h
}^B<???+<?.?????????'???\????~?O`0?V???F?P?????G????.c?lM0????[i?????r?????'
Kt\??@??9?Y6!]geN?????|E??"u?K?HaA??@

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	2 Mar 2009 21:27:10 -0000	1.17
+++ .cvsignore	10 Aug 2009 05:16:34 -0000	1.18
@@ -1 +0,0 @@
-inkscape.tar.lzma


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/inkscape.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- inkscape.spec	10 Jul 2009 16:19:02 -0000	1.76
+++ inkscape.spec	10 Aug 2009 05:16:34 -0000	1.77
@@ -1,20 +1,21 @@
+%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
+
 Name:           inkscape
 Version:        0.47
-Release:        0.12.pre1.20090710svn%{?dist}
+Release:        0.15.pre1.20090810svn%{?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 -r21777 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 21777 inkscape
-# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
+# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22040 inkscape
+# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0:        %{name}.tar.lzma
+Source0:        %{name}.tar.xz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch1:         inkscape-20090508svn-crc32.patch
 Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -135,7 +136,6 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch1 -p1 -b .crc32
 %patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -232,8 +232,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.12.pre1.20090710svn
-- Update to post-pre1 snapshot
+* Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
+- Update to a post-pre1 snapshot
+- Drop upstreamed CRC32 fix
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.13.pre0.20090629svn
+- Update to a newer snapshot
 
 * Tue Jun 16 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.12.pre0.20090616svn
 - Update to post-pre0 snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	10 Jul 2009 16:19:03 -0000	1.23
+++ sources	10 Aug 2009 05:16:35 -0000	1.24
@@ -1 +0,0 @@
-09ec40bae3f08919eca1dd67aca8a014  inkscape.tar.lzma


--- inkscape-20090508svn-crc32.patch DELETED ---



From eliwap at fedoraproject.org  Mon Aug 10 05:22:38 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 10 Aug 2009 05:22:38 +0000 (UTC)
Subject: rpms/kde-plasma-translatoid/devel .cvsignore, 1.4, 1.5 import.log,
	1.4, 1.5 kde-plasma-translatoid.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090810052238.91F0C11C0344@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-translatoid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2375/devel

Modified Files:
	.cvsignore import.log kde-plasma-translatoid.spec sources 
Log Message:

Modified Files:
	devel/.cvsignore devel/import.log 
	devel/kde-plasma-translatoid.spec devel/sources 
        Update to verson 1.0
          Build Requirement Changed from kdebase-workspace-devel >= 4.2.0
            to 4.3.0
          Change icon
          Change a lot by aseigo , use KJob, nice animation during translate.
          change the structure of translatoid
          Will remove voice button, because KTTSD do the same job.
          Add estonishlanguage
          Set text color with theme color
          save your automaticaly last languages in use.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jul 2009 06:36:15 -0000	1.4
+++ .cvsignore	10 Aug 2009 05:22:38 -0000	1.5
@@ -1 +1 @@
-translatoid.0.9.tar.gz
+translatoid1.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jul 2009 06:36:15 -0000	1.4
+++ import.log	10 Aug 2009 05:22:38 -0000	1.5
@@ -2,3 +2,4 @@ kde-plasma-translatoid-0_4_1-6_fc10:HEAD
 kde-plasma-translatoid-0_6-1_fc10:HEAD:kde-plasma-translatoid-0.6-1.fc10.src.rpm:1235546474
 kde-plasma-translatoid-0_6-2_fc10:HEAD:kde-plasma-translatoid-0.6-2.fc10.src.rpm:1235628540
 kde-plasma-translatoid-0_9-1_fc11:HEAD:kde-plasma-translatoid-0.9-1.fc11.src.rpm:1246861564
+kde-plasma-translatoid-1_0-1_fc11:HEAD:kde-plasma-translatoid-1.0-1.fc11.src.rpm:1249881318


Index: kde-plasma-translatoid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/kde-plasma-translatoid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde-plasma-translatoid.spec	25 Jul 2009 04:24:02 -0000	1.5
+++ kde-plasma-translatoid.spec	10 Aug 2009 05:22:38 -0000	1.6
@@ -1,15 +1,15 @@
 Name:           kde-plasma-translatoid
-Version:        0.9
-Release:        2%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Translator Using Google Translator
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/translatoid?content=97511
-Source0:        http://www.kde-look.org/content/content-files/translatoid.%{version}.tar.gz
+Source0:        http://www.kde-look.org/content/content-files/translatoid%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext >= 0.17
 %description
 Translator plasmoid using Google Translator.
@@ -44,6 +44,14 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-translatoid.desktop
 #%{_datadir}/locale/es_ES/LC_MESSAGES/translatoid.mo
 #%{_datadir}/locale/fr_FR/LC_MESSAGES/translatoid.mo
+%{_datadir}/icons/hicolor/128x128/apps/translator.png
+%{_datadir}/icons/hicolor/16x16/apps/translator.png
+%{_datadir}/icons/hicolor/22x22/apps/translator.png
+%{_datadir}/icons/hicolor/256x256/apps/translator.png
+%{_datadir}/icons/hicolor/32x32/apps/translator.png
+%{_datadir}/icons/hicolor/48x48/apps/translator.png
+%{_datadir}/icons/hicolor/64x64/apps/translator.png
+%{_datadir}/icons/hicolor/scalable/apps/translator.svgz
 %{_datadir}/icons/kbflags/ad.png
 %{_datadir}/icons/kbflags/ae.png
 %{_datadir}/icons/kbflags/ag.png
@@ -90,6 +98,7 @@ rm -rf %{buildroot}
 %{_datadir}/icons/kbflags/cn.png
 %{_datadir}/icons/kbflags/co.png
 %{_datadir}/icons/kbflags/cr.png
+%{_datadir}/icons/kbflags/ct.png
 %{_datadir}/icons/kbflags/cu.png
 %{_datadir}/icons/kbflags/cv.png
 %{_datadir}/icons/kbflags/cy.png
@@ -207,6 +216,7 @@ rm -rf %{buildroot}
 %{_datadir}/icons/kbflags/qa.png
 %{_datadir}/icons/kbflags/re.png
 %{_datadir}/icons/kbflags/ro.png
+%{_datadir}/icons/kbflags/rs.png
 %{_datadir}/icons/kbflags/ru.png
 %{_datadir}/icons/kbflags/rw.png
 %{_datadir}/icons/kbflags/sa.png
@@ -261,8 +271,18 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug 7 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.0-1
+-1.0
+- Build Requirement Changed from kdebase-workspace-devel >= 4.2.0
+-     to 4.3.0
+- Change icon
+- Change a lot by aseigo , use KJob, nice animation during translate.
+- change the structure of translatoid
+- Will remove voice button, because KTTSD do the same job.
+- Add estonishlanguage
+- Set text color with theme color
+- save your automaticaly last languages in use.
+
 
 * Wed Feb 25 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.9-1
 -0.9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jul 2009 06:36:15 -0000	1.4
+++ sources	10 Aug 2009 05:22:38 -0000	1.5
@@ -1 +1 @@
-c41c499c8f3604a957cd2448e1344067  translatoid.0.9.tar.gz
+aaba85e1bf69dc345faff0aa8d66ecf7  translatoid1.0.tar.gz



From lkundrak at fedoraproject.org  Mon Aug 10 05:26:10 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 05:26:10 +0000 (UTC)
Subject: rpms/inkscape/F-10 import.log, NONE, 1.1 .cvsignore, 1.17,
	1.18 inkscape.spec, 1.62, 1.63 sources, 1.18,
	1.19 inkscape-20090508svn-crc32.patch, 1.1, NONE
Message-ID: <20090810052610.C450011C0344@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4270/F-10

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	import.log 
Removed Files:
	inkscape-20090508svn-crc32.patch 
Log Message:
Merge from devel


--- NEW FILE import.log ---
inkscape-0_47-0_15_pre1_20090810svn_fc12:F-10:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249881732


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Jun 2009 07:21:01 -0000	1.17
+++ .cvsignore	10 Aug 2009 05:26:10 -0000	1.18
@@ -1 +1 @@
-inkscape.tar.lzma
+inkscape.tar.xz


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- inkscape.spec	16 Jun 2009 15:59:50 -0000	1.62
+++ inkscape.spec	10 Aug 2009 05:26:10 -0000	1.63
@@ -1,20 +1,21 @@
+%global optflags -O0 -g3 -pipe -Wall -fasynchronous-unwind-tables
+
 Name:           inkscape
 Version:        0.47
-Release:        0.12.pre0.20090616svn%{?dist}
+Release:        0.15.pre1.20090810svn%{?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 -r21597 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 21597 inkscape
-# tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
+# svn export -r22040 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22040 inkscape
+# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
-Source0:        %{name}.tar.lzma
+Source0:        %{name}.tar.xz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch1:         inkscape-20090508svn-crc32.patch
 Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -135,7 +136,6 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch1 -p1 -b .crc32
 %patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -232,6 +232,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.15.pre1.20090629svn
+- Update to a post-pre1 snapshot
+- Drop upstreamed CRC32 fix
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.13.pre0.20090629svn
+- Update to a newer snapshot
+
 * Tue Jun 16 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.12.pre0.20090616svn
 - Update to post-pre0 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Jun 2009 15:59:50 -0000	1.18
+++ sources	10 Aug 2009 05:26:10 -0000	1.19
@@ -1 +1 @@
-637c3546b0d6953bcbdfee6f7c4bb8e0  inkscape.tar.lzma
+13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz


--- inkscape-20090508svn-crc32.patch DELETED ---



From eliwap at fedoraproject.org  Mon Aug 10 05:26:18 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 10 Aug 2009 05:26:18 +0000 (UTC)
Subject: rpms/kde-plasma-translatoid/F-10 .cvsignore, 1.4, 1.5 import.log,
	1.4, 1.5 kde-plasma-translatoid.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090810052618.9AFA111C0344@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-translatoid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4169/F-10

Modified Files:
	.cvsignore import.log kde-plasma-translatoid.spec sources 
Log Message:

Modified Files:
	F-10/.cvsignore F-10/import.log 
	F-10/kde-plasma-translatoid.spec F-10/sources 

Update to verions 1.0
        Build Requirement Changed from kdebase-workspace-devel >= 4.2.0
            to 4.3.0
        Change icon
        Change a lot by aseigo , use KJob, nice animation during translate.
        change the structure of translatoid
        Will remove voice button, because KTTSD do the same job.
        Add estonishlanguage
        Set text color with theme color
        save your automaticaly last languages in use.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jul 2009 06:42:07 -0000	1.4
+++ .cvsignore	10 Aug 2009 05:26:18 -0000	1.5
@@ -1 +1 @@
-translatoid.0.9.tar.gz
+translatoid1.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jul 2009 06:42:07 -0000	1.4
+++ import.log	10 Aug 2009 05:26:18 -0000	1.5
@@ -2,3 +2,4 @@ kde-plasma-translatoid-0_4_1-6_fc10:F-10
 kde-plasma-translatoid-0_6-1_fc10:F-10:kde-plasma-translatoid-0.6-1.fc10.src.rpm:1235546998
 kde-plasma-translatoid-0_6-2_fc10:F-10:kde-plasma-translatoid-0.6-2.fc10.src.rpm:1235628881
 kde-plasma-translatoid-0_9-1_fc11:F-10:kde-plasma-translatoid-0.9-1.fc11.src.rpm:1246862479
+kde-plasma-translatoid-1_0-1_fc11:F-10:kde-plasma-translatoid-1.0-1.fc11.src.rpm:1249881913


Index: kde-plasma-translatoid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-10/kde-plasma-translatoid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde-plasma-translatoid.spec	6 Jul 2009 06:42:07 -0000	1.4
+++ kde-plasma-translatoid.spec	10 Aug 2009 05:26:18 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           kde-plasma-translatoid
-Version:        0.9
+Version:        1.0
 Release:        1%{?dist}
 Summary:        Translator Using Google Translator
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/translatoid?content=97511
-Source0:        http://www.kde-look.org/content/content-files/translatoid.%{version}.tar.gz
+Source0:        http://www.kde-look.org/content/content-files/translatoid%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext >= 0.17
 %description
 Translator plasmoid using Google Translator.
@@ -44,6 +44,14 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-translatoid.desktop
 #%{_datadir}/locale/es_ES/LC_MESSAGES/translatoid.mo
 #%{_datadir}/locale/fr_FR/LC_MESSAGES/translatoid.mo
+%{_datadir}/icons/hicolor/128x128/apps/translator.png
+%{_datadir}/icons/hicolor/16x16/apps/translator.png
+%{_datadir}/icons/hicolor/22x22/apps/translator.png
+%{_datadir}/icons/hicolor/256x256/apps/translator.png
+%{_datadir}/icons/hicolor/32x32/apps/translator.png
+%{_datadir}/icons/hicolor/48x48/apps/translator.png
+%{_datadir}/icons/hicolor/64x64/apps/translator.png
+%{_datadir}/icons/hicolor/scalable/apps/translator.svgz
 %{_datadir}/icons/kbflags/ad.png
 %{_datadir}/icons/kbflags/ae.png
 %{_datadir}/icons/kbflags/ag.png
@@ -90,6 +98,7 @@ rm -rf %{buildroot}
 %{_datadir}/icons/kbflags/cn.png
 %{_datadir}/icons/kbflags/co.png
 %{_datadir}/icons/kbflags/cr.png
+%{_datadir}/icons/kbflags/ct.png
 %{_datadir}/icons/kbflags/cu.png
 %{_datadir}/icons/kbflags/cv.png
 %{_datadir}/icons/kbflags/cy.png
@@ -207,6 +216,7 @@ rm -rf %{buildroot}
 %{_datadir}/icons/kbflags/qa.png
 %{_datadir}/icons/kbflags/re.png
 %{_datadir}/icons/kbflags/ro.png
+%{_datadir}/icons/kbflags/rs.png
 %{_datadir}/icons/kbflags/ru.png
 %{_datadir}/icons/kbflags/rw.png
 %{_datadir}/icons/kbflags/sa.png
@@ -261,6 +271,19 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 7 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.0-1
+-1.0
+- Build Requirement Changed from kdebase-workspace-devel >= 4.2.0
+-     to 4.3.0
+- Change icon
+- Change a lot by aseigo , use KJob, nice animation during translate.
+- change the structure of translatoid
+- Will remove voice button, because KTTSD do the same job.
+- Add estonishlanguage
+- Set text color with theme color
+- save your automaticaly last languages in use.
+
+
 * Wed Feb 25 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.9-1
 -0.9
 - Add new flags list ! Use a plasma::treeview with a QAbstractModel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jul 2009 06:42:07 -0000	1.4
+++ sources	10 Aug 2009 05:26:18 -0000	1.5
@@ -1 +1 @@
-c41c499c8f3604a957cd2448e1344067  translatoid.0.9.tar.gz
+aaba85e1bf69dc345faff0aa8d66ecf7  translatoid1.0.tar.gz



From eliwap at fedoraproject.org  Mon Aug 10 05:28:53 2009
From: eliwap at fedoraproject.org (eliwap)
Date: Mon, 10 Aug 2009 05:28:53 +0000 (UTC)
Subject: rpms/kde-plasma-translatoid/F-11 .cvsignore, 1.4, 1.5 import.log,
	1.4, 1.5 kde-plasma-translatoid.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090810052853.D9B8211C0344@cvs1.fedora.phx.redhat.com>

Author: eliwap

Update of /cvs/pkgs/rpms/kde-plasma-translatoid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4797/F-11

Modified Files:
	.cvsignore import.log kde-plasma-translatoid.spec sources 
Log Message:

Modified Files:
	F-11/.cvsignore F-11/import.log 
	F-11/kde-plasma-translatoid.spec F-11/sources 

Update to verions 1.0
        Build Requirement Changed from kdebase-workspace-devel >= 4.2.0
            to 4.3.0
        Change icon
        Change a lot by aseigo , use KJob, nice animation during translate.
        change the structure of translatoid
        Will remove voice button, because KTTSD do the same job.
        Add estonishlanguage
        Set text color with theme color
        save your automaticaly last languages in use.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jul 2009 06:44:05 -0000	1.4
+++ .cvsignore	10 Aug 2009 05:28:53 -0000	1.5
@@ -1 +1 @@
-translatoid.0.9.tar.gz
+translatoid1.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jul 2009 06:44:06 -0000	1.4
+++ import.log	10 Aug 2009 05:28:53 -0000	1.5
@@ -2,3 +2,4 @@ kde-plasma-translatoid-0_4_1-6_fc10:HEAD
 kde-plasma-translatoid-0_6-1_fc10:HEAD:kde-plasma-translatoid-0.6-1.fc10.src.rpm:1235546474
 kde-plasma-translatoid-0_6-2_fc10:HEAD:kde-plasma-translatoid-0.6-2.fc10.src.rpm:1235628540
 kde-plasma-translatoid-0_9-1_fc11:F-11:kde-plasma-translatoid-0.9-1.fc11.src.rpm:1246862586
+kde-plasma-translatoid-1_0-1_fc11:F-11:kde-plasma-translatoid-1.0-1.fc11.src.rpm:1249882012


Index: kde-plasma-translatoid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/kde-plasma-translatoid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde-plasma-translatoid.spec	6 Jul 2009 06:44:06 -0000	1.4
+++ kde-plasma-translatoid.spec	10 Aug 2009 05:28:53 -0000	1.5
@@ -1,15 +1,15 @@
 Name:           kde-plasma-translatoid
-Version:        0.9
+Version:        1.0
 Release:        1%{?dist}
 Summary:        Translator Using Google Translator
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde-look.org/content/show.php/translatoid?content=97511
-Source0:        http://www.kde-look.org/content/content-files/translatoid.%{version}.tar.gz
+Source0:        http://www.kde-look.org/content/content-files/translatoid%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  gettext >= 0.17
 %description
 Translator plasmoid using Google Translator.
@@ -44,6 +44,14 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/plasma-applet-translatoid.desktop
 #%{_datadir}/locale/es_ES/LC_MESSAGES/translatoid.mo
 #%{_datadir}/locale/fr_FR/LC_MESSAGES/translatoid.mo
+%{_datadir}/icons/hicolor/128x128/apps/translator.png
+%{_datadir}/icons/hicolor/16x16/apps/translator.png
+%{_datadir}/icons/hicolor/22x22/apps/translator.png
+%{_datadir}/icons/hicolor/256x256/apps/translator.png
+%{_datadir}/icons/hicolor/32x32/apps/translator.png
+%{_datadir}/icons/hicolor/48x48/apps/translator.png
+%{_datadir}/icons/hicolor/64x64/apps/translator.png
+%{_datadir}/icons/hicolor/scalable/apps/translator.svgz
 %{_datadir}/icons/kbflags/ad.png
 %{_datadir}/icons/kbflags/ae.png
 %{_datadir}/icons/kbflags/ag.png
@@ -90,6 +98,7 @@ rm -rf %{buildroot}
 %{_datadir}/icons/kbflags/cn.png
 %{_datadir}/icons/kbflags/co.png
 %{_datadir}/icons/kbflags/cr.png
+%{_datadir}/icons/kbflags/ct.png
 %{_datadir}/icons/kbflags/cu.png
 %{_datadir}/icons/kbflags/cv.png
 %{_datadir}/icons/kbflags/cy.png
@@ -207,6 +216,7 @@ rm -rf %{buildroot}
 %{_datadir}/icons/kbflags/qa.png
 %{_datadir}/icons/kbflags/re.png
 %{_datadir}/icons/kbflags/ro.png
+%{_datadir}/icons/kbflags/rs.png
 %{_datadir}/icons/kbflags/ru.png
 %{_datadir}/icons/kbflags/rw.png
 %{_datadir}/icons/kbflags/sa.png
@@ -261,6 +271,19 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 7 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 1.0-1
+-1.0
+- Build Requirement Changed from kdebase-workspace-devel >= 4.2.0
+-     to 4.3.0
+- Change icon
+- Change a lot by aseigo , use KJob, nice animation during translate.
+- change the structure of translatoid
+- Will remove voice button, because KTTSD do the same job.
+- Add estonishlanguage
+- Set text color with theme color
+- save your automaticaly last languages in use.
+
+
 * Wed Feb 25 2009 Eli Wapniarski <eli at orbsky.homelinux.org> 0.9-1
 -0.9
 - Add new flags list ! Use a plasma::treeview with a QAbstractModel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-translatoid/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jul 2009 06:44:06 -0000	1.4
+++ sources	10 Aug 2009 05:28:53 -0000	1.5
@@ -1 +1 @@
-c41c499c8f3604a957cd2448e1344067  translatoid.0.9.tar.gz
+aaba85e1bf69dc345faff0aa8d66ecf7  translatoid1.0.tar.gz



From lkundrak at fedoraproject.org  Mon Aug 10 05:30:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 05:30:04 +0000 (UTC)
Subject: rpms/inkscape/F-11 .cvsignore,1.18,1.19 sources,1.24,1.25
Message-ID: <20090810053004.5A5E011C0344@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5160

Modified Files:
	.cvsignore sources 
Log Message:
inkscape.tar.xz is in lookaside now


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	10 Aug 2009 05:16:34 -0000	1.18
+++ .cvsignore	10 Aug 2009 05:30:04 -0000	1.19
@@ -0,0 +1 @@
+inkscape.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Aug 2009 05:16:35 -0000	1.24
+++ sources	10 Aug 2009 05:30:04 -0000	1.25
@@ -0,0 +1 @@
+13b4c3f101025cf89b82b1cb6f1c254c  inkscape.tar.xz



From pkgdb at fedoraproject.org  Mon Aug 10 05:32:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:32:29 +0000
Subject: [pkgdb] fupt was added for ankursinha
Message-ID: <20090810053229.6270810F897@bastion2.fedora.phx.redhat.com>

kevin has added Package fupt with summary Fedora Unity Paste tool
kevin has approved Package fupt
kevin has added a Fedora devel branch for fupt with an owner of ankursinha
kevin has approved fupt in Fedora devel
kevin has approved Package fupt
kevin has set commit to Approved for 107427 on fupt (Fedora devel)
kevin has set checkout to Approved for 107427 on fupt (Fedora devel)
kevin has set build to Approved for 107427 on fupt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fupt



From pkgdb at fedoraproject.org  Mon Aug 10 05:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:32:30 +0000
Subject: [pkgdb] fupt summary updated by kevin
Message-ID: <20090810053230.BA3B210F89C@bastion2.fedora.phx.redhat.com>

kevin set package fupt summary to Fedora Unity Paste tool

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fupt



From pkgdb at fedoraproject.org  Mon Aug 10 05:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:32:30 +0000
Subject: [pkgdb] fupt (Fedora, 10) updated by kevin
Message-ID: <20090810053230.C48A210F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for fupt
kevin has set commit to Approved for 107427 on fupt (Fedora 10)
kevin has set checkout to Approved for 107427 on fupt (Fedora 10)
kevin has set build to Approved for 107427 on fupt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fupt



From kevin at fedoraproject.org  Mon Aug 10 05:32:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:32:38 +0000 (UTC)
Subject: rpms/fupt - New directory
Message-ID: <20090810053238.1575111C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fupt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ5712/rpms/fupt

Log Message:
Directory /cvs/pkgs/rpms/fupt added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:32:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:32:38 +0000 (UTC)
Subject: rpms/fupt/devel - New directory
Message-ID: <20090810053238.39C1C11C043D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fupt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ5712/rpms/fupt/devel

Log Message:
Directory /cvs/pkgs/rpms/fupt/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:32:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:32:44 +0000 (UTC)
Subject: rpms/fupt Makefile,NONE,1.1
Message-ID: <20090810053244.261A311C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fupt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ5712/rpms/fupt

Added Files:
	Makefile 
Log Message:
Setup of module fupt


--- NEW FILE Makefile ---
# Top level Makefile for module fupt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:32:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:32:44 +0000 (UTC)
Subject: rpms/fupt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090810053244.6540811C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fupt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ5712/rpms/fupt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fupt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fupt
# $Id: Makefile,v 1.1 2009/08/10 05:32:44 kevin Exp $
NAME := fupt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 10 05:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:32:30 +0000
Subject: [pkgdb] fupt (Fedora, 10) updated by kevin
Message-ID: <20090810053230.CB53C10F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for fupt
kevin has set commit to Approved for 107427 on fupt (Fedora 11)
kevin has set checkout to Approved for 107427 on fupt (Fedora 11)
kevin has set build to Approved for 107427 on fupt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fupt



From pkgdb at fedoraproject.org  Mon Aug 10 05:33:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:33:35 +0000
Subject: [pkgdb] MiniCopier was added for hicham
Message-ID: <20090810053335.A7E6210F89B@bastion2.fedora.phx.redhat.com>

kevin has added Package MiniCopier with summary Graphical copy manager
kevin has approved Package MiniCopier
kevin has added a Fedora devel branch for MiniCopier with an owner of hicham
kevin has approved MiniCopier in Fedora devel
kevin has approved Package MiniCopier
kevin has set commit to Approved for 107427 on MiniCopier (Fedora devel)
kevin has set checkout to Approved for 107427 on MiniCopier (Fedora devel)
kevin has set build to Approved for 107427 on MiniCopier (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/MiniCopier



From pkgdb at fedoraproject.org  Mon Aug 10 05:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:33:36 +0000
Subject: [pkgdb] MiniCopier summary updated by kevin
Message-ID: <20090810053336.BFA9D10F89A@bastion2.fedora.phx.redhat.com>

kevin set package MiniCopier summary to Graphical copy manager

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/MiniCopier



From pkgdb at fedoraproject.org  Mon Aug 10 05:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:33:36 +0000
Subject: [pkgdb] MiniCopier (Fedora, 10) updated by kevin
Message-ID: <20090810053337.0DAC310F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for MiniCopier
kevin has set commit to Approved for 107427 on MiniCopier (Fedora 10)
kevin has set checkout to Approved for 107427 on MiniCopier (Fedora 10)
kevin has set build to Approved for 107427 on MiniCopier (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/MiniCopier



From kevin at fedoraproject.org  Mon Aug 10 05:33:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:33:46 +0000 (UTC)
Subject: rpms/MiniCopier/devel - New directory
Message-ID: <20090810053346.3F66B11C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MiniCopier/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD6046/rpms/MiniCopier/devel

Log Message:
Directory /cvs/pkgs/rpms/MiniCopier/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:33:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:33:46 +0000 (UTC)
Subject: rpms/MiniCopier - New directory
Message-ID: <20090810053346.1A85011C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MiniCopier
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD6046/rpms/MiniCopier

Log Message:
Directory /cvs/pkgs/rpms/MiniCopier added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:33:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:33:52 +0000 (UTC)
Subject: rpms/MiniCopier Makefile,NONE,1.1
Message-ID: <20090810053352.2E10111C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MiniCopier
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD6046/rpms/MiniCopier

Added Files:
	Makefile 
Log Message:
Setup of module MiniCopier


--- NEW FILE Makefile ---
# Top level Makefile for module MiniCopier
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 10 05:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:33:36 +0000
Subject: [pkgdb] MiniCopier (Fedora, 10) updated by kevin
Message-ID: <20090810053337.71F3010F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for MiniCopier
kevin has set commit to Approved for 107427 on MiniCopier (Fedora 11)
kevin has set checkout to Approved for 107427 on MiniCopier (Fedora 11)
kevin has set build to Approved for 107427 on MiniCopier (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/MiniCopier



From kevin at fedoraproject.org  Mon Aug 10 05:33:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:33:52 +0000 (UTC)
Subject: rpms/MiniCopier/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090810053352.5A46C11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MiniCopier/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUD6046/rpms/MiniCopier/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module MiniCopier


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: MiniCopier
# $Id: Makefile,v 1.1 2009/08/10 05:33:52 kevin Exp $
NAME := MiniCopier
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 10 05:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:34:33 +0000
Subject: [pkgdb] PgsLookAndFeel was added for hicham
Message-ID: <20090810053433.A7E8D10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package PgsLookAndFeel with summary Nice looking LookAndFeel for Swing
kevin has approved Package PgsLookAndFeel
kevin has added a Fedora devel branch for PgsLookAndFeel with an owner of hicham
kevin has approved PgsLookAndFeel in Fedora devel
kevin has approved Package PgsLookAndFeel
kevin has set commit to Approved for 107427 on PgsLookAndFeel (Fedora devel)
kevin has set checkout to Approved for 107427 on PgsLookAndFeel (Fedora devel)
kevin has set build to Approved for 107427 on PgsLookAndFeel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PgsLookAndFeel



From pkgdb at fedoraproject.org  Mon Aug 10 05:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:34:36 +0000
Subject: [pkgdb] PgsLookAndFeel summary updated by kevin
Message-ID: <20090810053436.35CD510F8AF@bastion2.fedora.phx.redhat.com>

kevin set package PgsLookAndFeel summary to Nice looking LookAndFeel for Swing

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PgsLookAndFeel



From pkgdb at fedoraproject.org  Mon Aug 10 05:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:34:36 +0000
Subject: [pkgdb] PgsLookAndFeel (Fedora, 10) updated by kevin
Message-ID: <20090810053436.4F54810F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for PgsLookAndFeel
kevin has set commit to Approved for 107427 on PgsLookAndFeel (Fedora 10)
kevin has set checkout to Approved for 107427 on PgsLookAndFeel (Fedora 10)
kevin has set build to Approved for 107427 on PgsLookAndFeel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PgsLookAndFeel



From pkgdb at fedoraproject.org  Mon Aug 10 05:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:34:36 +0000
Subject: [pkgdb] PgsLookAndFeel (Fedora, 10) updated by kevin
Message-ID: <20090810053436.6E0AF10F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for PgsLookAndFeel
kevin has set commit to Approved for 107427 on PgsLookAndFeel (Fedora 11)
kevin has set checkout to Approved for 107427 on PgsLookAndFeel (Fedora 11)
kevin has set build to Approved for 107427 on PgsLookAndFeel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PgsLookAndFeel



From kevin at fedoraproject.org  Mon Aug 10 05:34:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:34:42 +0000 (UTC)
Subject: rpms/PgsLookAndFeel - New directory
Message-ID: <20090810053442.1AC2711C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PgsLookAndFeel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLc6318/rpms/PgsLookAndFeel

Log Message:
Directory /cvs/pkgs/rpms/PgsLookAndFeel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:34:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:34:42 +0000 (UTC)
Subject: rpms/PgsLookAndFeel/devel - New directory
Message-ID: <20090810053442.4191911C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PgsLookAndFeel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLc6318/rpms/PgsLookAndFeel/devel

Log Message:
Directory /cvs/pkgs/rpms/PgsLookAndFeel/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:34:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:34:48 +0000 (UTC)
Subject: rpms/PgsLookAndFeel Makefile,NONE,1.1
Message-ID: <20090810053448.0959011C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PgsLookAndFeel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLc6318/rpms/PgsLookAndFeel

Added Files:
	Makefile 
Log Message:
Setup of module PgsLookAndFeel


--- NEW FILE Makefile ---
# Top level Makefile for module PgsLookAndFeel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:34:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:34:48 +0000 (UTC)
Subject: rpms/PgsLookAndFeel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090810053448.3FBAC11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PgsLookAndFeel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLc6318/rpms/PgsLookAndFeel/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module PgsLookAndFeel


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: PgsLookAndFeel
# $Id: Makefile,v 1.1 2009/08/10 05:34:48 kevin Exp $
NAME := PgsLookAndFeel
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 10 05:35:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:35:56 +0000
Subject: [pkgdb] gnaughty was added for cassmodiah
Message-ID: <20090810053557.8427C10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package gnaughty with summary Downloader for adult content
kevin has approved Package gnaughty
kevin has added a Fedora devel branch for gnaughty with an owner of cassmodiah
kevin has approved gnaughty in Fedora devel
kevin has approved Package gnaughty
kevin has set commit to Approved for 107427 on gnaughty (Fedora devel)
kevin has set checkout to Approved for 107427 on gnaughty (Fedora devel)
kevin has set build to Approved for 107427 on gnaughty (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnaughty



From pkgdb at fedoraproject.org  Mon Aug 10 05:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:35:58 +0000
Subject: [pkgdb] gnaughty summary updated by kevin
Message-ID: <20090810053558.D093D10F89B@bastion2.fedora.phx.redhat.com>

kevin set package gnaughty summary to Downloader for adult content

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnaughty



From kevin at fedoraproject.org  Mon Aug 10 05:36:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:36:09 +0000 (UTC)
Subject: rpms/gnaughty - New directory
Message-ID: <20090810053609.1C74C11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaughty
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseT6678/rpms/gnaughty

Log Message:
Directory /cvs/pkgs/rpms/gnaughty added to the repository




From pkgdb at fedoraproject.org  Mon Aug 10 05:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:35:58 +0000
Subject: [pkgdb] gnaughty (Fedora, 11) updated by kevin
Message-ID: <20090810053559.BCB6E10F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gnaughty
kevin has set commit to Approved for 107427 on gnaughty (Fedora 11)
kevin has set checkout to Approved for 107427 on gnaughty (Fedora 11)
kevin has set build to Approved for 107427 on gnaughty (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnaughty



From kevin at fedoraproject.org  Mon Aug 10 05:36:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:36:09 +0000 (UTC)
Subject: rpms/gnaughty/devel - New directory
Message-ID: <20090810053609.3E14611C043D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaughty/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseT6678/rpms/gnaughty/devel

Log Message:
Directory /cvs/pkgs/rpms/gnaughty/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:36:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:36:14 +0000 (UTC)
Subject: rpms/gnaughty Makefile,NONE,1.1
Message-ID: <20090810053614.F02C511C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaughty
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseT6678/rpms/gnaughty

Added Files:
	Makefile 
Log Message:
Setup of module gnaughty


--- NEW FILE Makefile ---
# Top level Makefile for module gnaughty
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:36:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:36:15 +0000 (UTC)
Subject: rpms/gnaughty/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090810053615.3B3B311C043D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaughty/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseT6678/rpms/gnaughty/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnaughty


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnaughty
# $Id: Makefile,v 1.1 2009/08/10 05:36:15 kevin Exp $
NAME := gnaughty
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 10 05:37:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:37:21 +0000
Subject: [pkgdb] mingw32-enchant was added for epienbro
Message-ID: <20090810053721.5EBF210F882@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-enchant with summary MinGW Windows Enchanting Spell Checking Library
kevin has approved Package mingw32-enchant
kevin has added a Fedora devel branch for mingw32-enchant with an owner of epienbro
kevin has approved mingw32-enchant in Fedora devel
kevin has approved Package mingw32-enchant
kevin has set commit to Approved for 107427 on mingw32-enchant (Fedora devel)
kevin has set checkout to Approved for 107427 on mingw32-enchant (Fedora devel)
kevin has set build to Approved for 107427 on mingw32-enchant (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-enchant



From pkgdb at fedoraproject.org  Mon Aug 10 05:37:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:37:23 +0000
Subject: [pkgdb] mingw32-enchant summary updated by kevin
Message-ID: <20090810053723.5948610F89C@bastion2.fedora.phx.redhat.com>

kevin set package mingw32-enchant summary to MinGW Windows Enchanting Spell Checking Library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-enchant



From kevin at fedoraproject.org  Mon Aug 10 05:37:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:37:31 +0000 (UTC)
Subject: rpms/mingw32-enchant - New directory
Message-ID: <20090810053731.18DF611C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-enchant
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiD6968/rpms/mingw32-enchant

Log Message:
Directory /cvs/pkgs/rpms/mingw32-enchant added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:37:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:37:31 +0000 (UTC)
Subject: rpms/mingw32-enchant/devel - New directory
Message-ID: <20090810053731.3893C11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-enchant/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiD6968/rpms/mingw32-enchant/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-enchant/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 10 05:37:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:37:23 +0000
Subject: [pkgdb] mingw32-enchant (Fedora, 11) updated by kevin
Message-ID: <20090810053723.633BB10F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-enchant
kevin has set commit to Approved for 107427 on mingw32-enchant (Fedora 11)
kevin has set checkout to Approved for 107427 on mingw32-enchant (Fedora 11)
kevin has set build to Approved for 107427 on mingw32-enchant (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-enchant



From kevin at fedoraproject.org  Mon Aug 10 05:37:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:37:36 +0000 (UTC)
Subject: rpms/mingw32-enchant Makefile,NONE,1.1
Message-ID: <20090810053736.EE9BA11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-enchant
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiD6968/rpms/mingw32-enchant

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-enchant


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-enchant
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:37:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:37:37 +0000 (UTC)
Subject: rpms/mingw32-enchant/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090810053737.3CEF511C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-enchant/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiD6968/rpms/mingw32-enchant/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-enchant


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-enchant
# $Id: Makefile,v 1.1 2009/08/10 05:37:37 kevin Exp $
NAME := mingw32-enchant
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 10 05:39:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:39:13 +0000
Subject: [pkgdb] openal-soft was added for linuxdonald
Message-ID: <20090810053914.0773810F882@bastion2.fedora.phx.redhat.com>

kevin has added Package openal-soft with summary Open Audio Library
kevin has approved Package openal-soft
kevin has added a Fedora devel branch for openal-soft with an owner of linuxdonald
kevin has approved openal-soft in Fedora devel
kevin has approved Package openal-soft
kevin has set commit to Approved for 107427 on openal-soft (Fedora devel)
kevin has set checkout to Approved for 107427 on openal-soft (Fedora devel)
kevin has set build to Approved for 107427 on openal-soft (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Mon Aug 10 05:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:39:15 +0000
Subject: [pkgdb] openal-soft summary updated by kevin
Message-ID: <20090810053915.6FAB810F89B@bastion2.fedora.phx.redhat.com>

kevin set package openal-soft summary to Open Audio Library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Mon Aug 10 05:41:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:41:55 +0000
Subject: [pkgdb] perl-Config-Model was added for hvad
Message-ID: <20090810054156.1541610F882@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Config-Model with summary Framework to create configuration validation tools and editors
kevin has approved Package perl-Config-Model
kevin has added a Fedora devel branch for perl-Config-Model with an owner of hvad
kevin has approved perl-Config-Model in Fedora devel
kevin has approved Package perl-Config-Model
kevin has set commit to Approved for 107427 on perl-Config-Model (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Config-Model (Fedora devel)
kevin has set build to Approved for 107427 on perl-Config-Model (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Model



From pkgdb at fedoraproject.org  Mon Aug 10 05:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:41:58 +0000
Subject: [pkgdb] perl-Config-Model summary updated by kevin
Message-ID: <20090810054158.38B0C10F89B@bastion2.fedora.phx.redhat.com>

kevin set package perl-Config-Model summary to Framework to create configuration validation tools and editors

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Model



From pkgdb at fedoraproject.org  Mon Aug 10 05:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:41:58 +0000
Subject: [pkgdb] perl-Config-Model (Fedora, 10) updated by kevin
Message-ID: <20090810054158.439B710F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Config-Model
kevin has set commit to Approved for 107427 on perl-Config-Model (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Config-Model (Fedora 10)
kevin has set build to Approved for 107427 on perl-Config-Model (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Model



From pkgdb at fedoraproject.org  Mon Aug 10 05:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:41:58 +0000
Subject: [pkgdb] perl-Config-Model (Fedora, 10) updated by kevin
Message-ID: <20090810054158.4C38110F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Config-Model
kevin has set commit to Approved for 107427 on perl-Config-Model (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Config-Model (Fedora 11)
kevin has set build to Approved for 107427 on perl-Config-Model (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Config-Model



From kevin at fedoraproject.org  Mon Aug 10 05:42:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:07 +0000 (UTC)
Subject: rpms/perl-Config-Model - New directory
Message-ID: <20090810054207.1C35811C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-Model
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCh8491/rpms/perl-Config-Model

Log Message:
Directory /cvs/pkgs/rpms/perl-Config-Model added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:42:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:07 +0000 (UTC)
Subject: rpms/perl-Config-Model/devel - New directory
Message-ID: <20090810054207.44FAC11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-Model/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCh8491/rpms/perl-Config-Model/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Config-Model/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:42:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:13 +0000 (UTC)
Subject: rpms/perl-Config-Model Makefile,NONE,1.1
Message-ID: <20090810054213.40E8811C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-Model
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCh8491/rpms/perl-Config-Model

Added Files:
	Makefile 
Log Message:
Setup of module perl-Config-Model


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Config-Model
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:42:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:13 +0000 (UTC)
Subject: rpms/perl-Config-Model/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090810054213.75B3F11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Config-Model/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCh8491/rpms/perl-Config-Model/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Config-Model


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Config-Model
# $Id: Makefile,v 1.1 2009/08/10 05:42:13 kevin Exp $
NAME := perl-Config-Model
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 10 05:42:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:27 +0000 (UTC)
Subject: rpms/openal-soft - New directory
Message-ID: <20090810054227.1997B11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openal-soft
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfK8682/rpms/openal-soft

Log Message:
Directory /cvs/pkgs/rpms/openal-soft added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:42:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:27 +0000 (UTC)
Subject: rpms/openal-soft/devel - New directory
Message-ID: <20090810054227.42C3111C043D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfK8682/rpms/openal-soft/devel

Log Message:
Directory /cvs/pkgs/rpms/openal-soft/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:42:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:33 +0000 (UTC)
Subject: rpms/openal-soft Makefile,NONE,1.1
Message-ID: <20090810054233.14FD711C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openal-soft
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfK8682/rpms/openal-soft

Added Files:
	Makefile 
Log Message:
Setup of module openal-soft


--- NEW FILE Makefile ---
# Top level Makefile for module openal-soft
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:42:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:42:33 +0000 (UTC)
Subject: rpms/openal-soft/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090810054233.4E12B11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfK8682/rpms/openal-soft/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openal-soft


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: openal-soft
# $Id: Makefile,v 1.1 2009/08/10 05:42:33 kevin Exp $
NAME := openal-soft
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 10 05:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:43:20 +0000
Subject: [pkgdb] rubygem-treetop was added for lkundrak
Message-ID: <20090810054320.CA18610F897@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-treetop with summary A Ruby-based text parsing and interpretation DSL
kevin has approved Package rubygem-treetop
kevin has added a Fedora devel branch for rubygem-treetop with an owner of lkundrak
kevin has approved rubygem-treetop in Fedora devel
kevin has approved Package rubygem-treetop
kevin has set commit to Approved for 107427 on rubygem-treetop (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-treetop (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-treetop (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-treetop



From pkgdb at fedoraproject.org  Mon Aug 10 05:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:43:22 +0000
Subject: [pkgdb] rubygem-treetop summary updated by kevin
Message-ID: <20090810054323.0A9E910F882@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-treetop summary to A Ruby-based text parsing and interpretation DSL

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-treetop



From pkgdb at fedoraproject.org  Mon Aug 10 05:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:43:22 +0000
Subject: [pkgdb] rubygem-treetop (Fedora EPEL, 5) updated by kevin
Message-ID: <20090810054323.1B8A710F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-treetop
kevin has set commit to Approved for 107427 on rubygem-treetop (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-treetop (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-treetop (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-treetop



From kevin at fedoraproject.org  Mon Aug 10 05:43:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:43:30 +0000 (UTC)
Subject: rpms/rubygem-treetop - New directory
Message-ID: <20090810054330.1877D11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-treetop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQk8868/rpms/rubygem-treetop

Log Message:
Directory /cvs/pkgs/rpms/rubygem-treetop added to the repository




From pkgdb at fedoraproject.org  Mon Aug 10 05:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 05:43:22 +0000
Subject: [pkgdb] rubygem-treetop (Fedora EPEL, 5) updated by kevin
Message-ID: <20090810054323.3E46310F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-treetop
kevin has set commit to Approved for 107427 on rubygem-treetop (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-treetop (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-treetop (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-treetop



From kevin at fedoraproject.org  Mon Aug 10 05:43:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:43:36 +0000 (UTC)
Subject: rpms/rubygem-treetop Makefile,NONE,1.1
Message-ID: <20090810054336.BE42D11C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-treetop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQk8868/rpms/rubygem-treetop

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-treetop


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-treetop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 10 05:43:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:43:30 +0000 (UTC)
Subject: rpms/rubygem-treetop/devel - New directory
Message-ID: <20090810054330.3F21711C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-treetop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQk8868/rpms/rubygem-treetop/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-treetop/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 10 05:43:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 10 Aug 2009 05:43:37 +0000 (UTC)
Subject: rpms/rubygem-treetop/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090810054337.0EC7011C0344@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-treetop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQk8868/rpms/rubygem-treetop/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-treetop


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-treetop
# $Id: Makefile,v 1.1 2009/08/10 05:43:36 kevin Exp $
NAME := rubygem-treetop
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From akurtakov at fedoraproject.org  Mon Aug 10 05:56:45 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 10 Aug 2009 05:56:45 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel sources, 1.5, 1.6 get-dltk.sh, 1.4,
	1.5 eclipse-dltk.spec, 1.5, 1.6
Message-ID: <20090810055645.D4CB711C0344@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10920/devel

Modified Files:
	sources get-dltk.sh eclipse-dltk.spec 
Log Message:
Add RSE plugin.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Aug 2009 04:48:22 -0000	1.5
+++ sources	10 Aug 2009 05:56:45 -0000	1.6
@@ -1 +1 @@
-1a134d48b4551c3db297db66a83e8381  dltk-1.0.0.tar.gz
+6560521c7e33e07967bb93260e15780c  dltk-1.0.0.tar.gz


Index: get-dltk.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/get-dltk.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- get-dltk.sh	10 Aug 2009 04:48:22 -0000	1.4
+++ get-dltk.sh	10 Aug 2009 05:56:45 -0000	1.5
@@ -2,7 +2,7 @@
 NAME="dltk"
 VERSION=1.0.0
 TAG="vS200906171219"
-SUBPACKAGES="core ruby tcl itcl xotcl mylyn"
+SUBPACKAGES="core ruby tcl itcl xotcl mylyn rse"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION


Index: eclipse-dltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/eclipse-dltk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-dltk.spec	10 Aug 2009 04:48:22 -0000	1.5
+++ eclipse-dltk.spec	10 Aug 2009 05:56:45 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dltk
 Version:   1.0.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -24,6 +24,7 @@ BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:3.5.0
 BuildRequires:    eclipse-emf >= 2.5.0
 BuildRequires:    eclipse-mylyn
+BuildRequires:    eclipse-rse
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:3.5.0
@@ -79,7 +80,16 @@ Requires:  eclipse-mylyn
 Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit
 (DLTK) projects.
 
-# TODO: Remote Projects via DSDP TM integration, Python IDE, Javascript IDE
+%package   rse
+Summary:   RSE integration for Eclipse DLTK projects
+Group:     Development/Tools
+Requires:  %{name} = %{version}-%{release}
+Requires:  eclipse-rse
+
+%description rse
+Remote Development Support via RSE for DLTK based IDEs.
+
+# TODO: Python IDE, Javascript IDE
 
 %prep
 %setup -q -n dltk-%{version}
@@ -110,6 +120,8 @@ fi
   -d "emf mylyn" 
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn \
   -d "emf mylyn" 
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.rse \
+  -d "rse"
 
 %install
 rm -rf %{buildroot}
@@ -120,6 +132,7 @@ unzip -q -d %{buildroot}%{eclipse_dropin
 unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-itcl  build/rpmBuild/org.eclipse.dltk.itcl.zip
 unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-xotcl build/rpmBuild/org.eclipse.dltk.xotcl.zip
 unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-mylyn build/rpmBuild/org.eclipse.dltk.mylyn.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-rse   build/rpmBuild/org.eclipse.dltk.rse.zip
 
 %clean
 rm -rf %{buildroot}
@@ -154,7 +167,15 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/dltk-mylyn
 %doc org.eclipse.dltk.mylyn-feature/rootfiles/*
 
+%files rse
+%defattr(-,root,root,-)
+%{eclipse_dropin}/dltk-rse
+%doc org.eclipse.dltk.rse-feature/rootfiles/*
+
 %changelog
+* Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.0-2
+- Add RSE plugin.
+
 * Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.0-1
 - Update to 1.0.0 final.
 



From phuang at fedoraproject.org  Mon Aug 10 06:13:15 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 10 Aug 2009 06:13:15 +0000 (UTC)
Subject: rpms/ibus/devel ibus-HEAD.patch,1.22,1.23 ibus.spec,1.81,1.82
Message-ID: <20090810061315.6CCB911C0344@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14033

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Fix some memory leaks

ibus-HEAD.patch:
 bus/dbusimpl.c              |    6 ------
 bus/ibusimpl.c              |    1 -
 bus/main.c                  |   14 ++++++++++++++
 client/gtk2/ibusimcontext.c |   14 +++++++++++---
 src/ibusbus.c               |    3 ---
 src/ibushotkey.c            |   32 +++++++++++++++++++-------------
 src/ibuskeymap.c            |   13 +++++--------
 src/ibuslookuptable.c       |   24 +++++++++++++-----------
 src/ibusobject.c            |   32 ++++++++++++++++++++++++++++++++
 src/ibusproperty.c          |   24 ++++++++++++++++--------
 10 files changed, 110 insertions(+), 53 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ibus-HEAD.patch	10 Aug 2009 02:19:01 -0000	1.22
+++ ibus-HEAD.patch	10 Aug 2009 06:13:13 -0000	1.23
@@ -1,3 +1,20 @@
+diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
+index 051677e..eee1630 100644
+--- a/bus/dbusimpl.c
++++ b/bus/dbusimpl.c
+@@ -1088,12 +1088,6 @@ bus_dbus_impl_dispatch_message_by_rule (BusDBusImpl     *dbus,
+ 
+     dbus_message_set_data (message, data_slot, (gpointer) TRUE, NULL);
+ 
+-#if 0
+-    if (g_strcmp0 (ibus_message_get_member (message), "ValueChanged") == 0) {
+-        g_debug ("Dispatch ValueChanged");
+-    }
+-#endif
+-
+     for (link = dbus->rules; link != NULL; link = link->next) {
+         GList *list = bus_match_rule_get_recipients (BUS_MATCH_RULE (link->data),
+                                                      message);
 diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
 index 120277f..e841c28 100644
 --- a/bus/ibusimpl.c
@@ -10,6 +27,59 @@ index 120277f..e841c28 100644
          for (i = 0; handlers[i].interface != NULL; i++) {
              if (ibus_message_is_method_call (message,
                                               handlers[i].interface,
+diff --git a/bus/main.c b/bus/main.c
+index 2e227ea..38040b1 100644
+--- a/bus/main.c
++++ b/bus/main.c
+@@ -25,6 +25,7 @@
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <locale.h>
++#include <signal.h>
+ #include "server.h"
+ #include "ibusimpl.h"
+ 
+@@ -39,6 +40,7 @@ static gchar *config = "default";
+ static gchar *desktop = "gnome";
+ static gchar *address = "";
+ gboolean g_rescan = FALSE;
++gboolean g_mempro = FALSE;
+ gboolean g_verbose = FALSE;
+ 
+ static const GOptionEntry entries[] =
+@@ -52,6 +54,7 @@ static const GOptionEntry entries[] =
+     { "address",   'a', 0, G_OPTION_ARG_STRING, &address,   "specify the address of ibus daemon.", "address" },
+     { "replace",   'r', 0, G_OPTION_ARG_NONE,   &replace,   "if there is an old ibus-daemon is running, it will be replaced.", NULL },
+     { "re-scan",   't', 0, G_OPTION_ARG_NONE,   &g_rescan,  "force to re-scan components, and re-create registry cache.", NULL },
++    { "mem-profile", 'm', 0, G_OPTION_ARG_NONE,   &g_mempro,   "enable memory profile, send SIGUSR2 to print out the memory profile.", NULL },
+     { "verbose",   'v', 0, G_OPTION_ARG_NONE,   &g_verbose,   "verbose.", NULL },
+     { NULL },
+ };
+@@ -143,6 +146,12 @@ _my_log_handler (const gchar    *log_domain,
+     }
+ }
+ 
++static void
++_sig_usr2_handler (int sig)
++{
++    g_mem_profile ();
++}
++
+ gint
+ main (gint argc, gchar **argv)
+ {
+@@ -164,6 +173,11 @@ main (gint argc, gchar **argv)
+         exit (-1);
+     }
+ 
++    if (g_mempro) {
++        g_mem_set_vtable (glib_mem_profiler_table);
++        signal (SIGUSR2, _sig_usr2_handler);
++    }
++
+     /* check uid */
+     {
+         const gchar *username = ibus_get_user_name ();
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
 index 68a77d8..d914eae 100644
 --- a/client/gtk2/ibusimcontext.c
@@ -40,13 +110,87 @@ index 68a77d8..d914eae 100644
      }
  }
  
+diff --git a/src/ibusbus.c b/src/ibusbus.c
+index b4086cd..cc06586 100644
+--- a/src/ibusbus.c
++++ b/src/ibusbus.c
+@@ -180,9 +180,6 @@ _connection_destroy_cb (IBusConnection  *connection,
+ static void
+ ibus_bus_connect (IBusBus *bus)
+ {
+-    const gchar *socket_path;
+-    struct stat buf;
+-
+     IBusBusPrivate *priv;
+     priv = IBUS_BUS_GET_PRIVATE (bus);
+ 
+diff --git a/src/ibushotkey.c b/src/ibushotkey.c
+index 6cac31f..295dea3 100644
+--- a/src/ibushotkey.c
++++ b/src/ibushotkey.c
+@@ -268,23 +268,29 @@ ibus_hotkey_profile_destroy (IBusHotkeyProfile *profile)
+     IBusHotkeyProfilePrivate *priv;
+     priv = IBUS_HOTKEY_PROFILE_GET_PRIVATE (profile);
+ 
+-    if (priv->hotkeys) {
+-        g_tree_destroy (priv->hotkeys);
+-        priv->hotkeys = NULL;
+-    }
+-
++    /* free events */
+     if (priv->events) {
+-        IBusHotkeyEvent *events, *p;
+-        p = events = (IBusHotkeyEvent *)g_array_free (priv->events, FALSE);
++        IBusHotkeyEvent **p;
++        gint i;
++        p = (IBusHotkeyEvent **)g_array_free (priv->events, FALSE);
+         priv->events = NULL;
+ 
+-        while (p->event != 0) {
+-            if (p->hotkeys)
+-                g_list_free (p->hotkeys);
+-            p ++;
++        for (i = 0; p[i] != NULL; i++) {
++            if (p[i]->event != 0) {
++                /* free the hotkeys list, but do not free data in the list
++                 * The datas will be free in g_tree_destroy
++                 * */
++                g_list_free (p[i]->hotkeys);
++            }
+         }
+-        g_free (events);
++        g_free (p);
+     }
++
++    if (priv->hotkeys) {
++        g_tree_destroy (priv->hotkeys);
++        priv->hotkeys = NULL;
++    }
++
+     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)profile);
+ }
+ 
+@@ -363,8 +369,8 @@ ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile *profile,
+ 
+     g_tree_insert (priv->hotkeys, (gpointer) hotkey, GUINT_TO_POINTER (event));
+ 
+-    gint i;
+     IBusHotkeyEvent *p = NULL;
++    gint i;
+     for ( i = 0; i < priv->events->len; i++) {
+         p = &g_array_index (priv->events, IBusHotkeyEvent, i);
+         if (p->event == event)
 diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
-index 9f59c73..b248e18 100644
+index 9f59c73..d11fac3 100644
 --- a/src/ibuskeymap.c
 +++ b/src/ibuskeymap.c
-@@ -78,11 +78,8 @@ ibus_keymap_init (IBusKeymap *keymap)
-     gint i, j;
- 
+@@ -75,14 +75,10 @@ ibus_keymap_class_init (IBusKeymapClass *klass)
+ static void
+ ibus_keymap_init (IBusKeymap *keymap)
+ {
+-    gint i, j;
+-
++    gint i;
      keymap->name = NULL;
 -
 -    for (i = 0; i < 256; i++) {
@@ -58,7 +202,7 @@ index 9f59c73..b248e18 100644
      }
  }
  
-@@ -306,8 +303,9 @@ ibus_keymap_lookup_keysym (IBusKeymap *keymap,
+@@ -306,8 +302,9 @@ ibus_keymap_lookup_keysym (IBusKeymap *keymap,
  
      if (keycode < 256) {
          /* numlock */
@@ -69,3 +213,190 @@ index 9f59c73..b248e18 100644
  
          state &= IBUS_SHIFT_MASK | IBUS_LOCK_MASK | IBUS_MOD5_MASK;
  
+diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
+index 7f82d62..324534e 100644
+--- a/src/ibuslookuptable.c
++++ b/src/ibuslookuptable.c
+@@ -86,26 +86,26 @@ ibus_lookup_table_init (IBusLookupTable *table)
+ static void
+ ibus_lookup_table_destroy (IBusLookupTable *table)
+ {
+-    IBusText **sp, **p;
++    IBusText **p;
++    gint i;
+ 
+     if (table->candidates != NULL) {
+-        p = sp = (IBusText **) g_array_free (table->candidates, FALSE);
++        p = (IBusText **) g_array_free (table->candidates, FALSE);
+         table->candidates = NULL;
+-        while (*p != NULL) {
+-            g_object_unref (*p);
+-            p ++;
++
++        for (i = 0; p[i] != NULL; i++) {
++            g_object_unref (p[i]);
+         }
+-        g_free (sp);
++        g_free (p);
+     }
+ 
+     if (table->labels != NULL) {
+-        p = sp = (IBusText **) g_array_free (table->labels, FALSE);
++        p = (IBusText **) g_array_free (table->labels, FALSE);
+         table->labels = NULL;
+-        while (*p != NULL) {
+-            g_object_unref (*p);
+-            p ++;
++        for (i = 0; p[i] != NULL; i++) {
++            g_object_unref (p[i]);
+         }
+-        g_free (sp);
++        g_free (p);
+     }
+ 
+     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *) table);
+@@ -220,6 +220,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
+         ibus_message_iter_next (&array_iter);
+ 
+         ibus_lookup_table_append_candidate (table, text);
++        g_object_unref (text);
+     }
+ 
+     ibus_message_iter_next (iter);
+@@ -235,6 +236,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
+         ibus_message_iter_next (&array_iter);
+ 
+         ibus_lookup_table_append_label (table, text);
++        g_object_unref (text);
+     }
+ 
+     ibus_message_iter_next (iter);
+diff --git a/src/ibusobject.c b/src/ibusobject.c
+index 2c2c25a..5e7ea58 100644
+--- a/src/ibusobject.c
++++ b/src/ibusobject.c
+@@ -36,6 +36,12 @@ struct _IBusObjectPrivate {
+ 
+ static guint            object_signals[LAST_SIGNAL] = { 0 };
+ 
++// #define DEBUG_MEMORY
++#ifdef DEBUG_MEMORY
++static GHashTable      *_count_table;
++static guint            _count = 0;
++#endif
++
+ /* functions prototype */
+ static void      ibus_object_class_init     (IBusObjectClass    *klass);
+ static void      ibus_object_init           (IBusObject         *obj);
+@@ -114,6 +120,10 @@ ibus_object_class_init     (IBusObjectClass *klass)
+             NULL, NULL,
+             ibus_marshal_VOID__VOID,
+             G_TYPE_NONE, 0);
++#ifdef DEBUG_MEMORY
++    _count_table = g_hash_table_new (g_direct_hash, g_direct_equal);
++#endif
++
+ }
+ 
+ static void
+@@ -123,6 +133,7 @@ ibus_object_init (IBusObject *obj)
+     priv = IBUS_OBJECT_GET_PRIVATE (obj);
+ 
+     obj->flags = 0;
++
+ }
+ 
+ 
+@@ -135,6 +146,18 @@ ibus_object_constructor (GType                   type,
+ 
+     object = parent_class->constructor (type, n ,args);
+ 
++#ifdef DEBUG_MEMORY
++    if (object != NULL) {
++        guint count;
++        _count ++;
++
++        count = GPOINTER_TO_UINT (g_hash_table_lookup (_count_table, (gpointer) type));
++        g_hash_table_replace (_count_table, (gpointer) type, GUINT_TO_POINTER (++count));
++
++        g_debug ("new %s, count = %d, all = %d", g_type_name (type), count, _count);
++    }
++#endif
++
+     return object;
+ }
+ 
+@@ -157,6 +180,15 @@ ibus_object_dispose (IBusObject *obj)
+ static void
+ ibus_object_finalize (IBusObject *obj)
+ {
++#ifdef DEBUG_MEMORY 
++    guint count;
++
++    _count --;
++    count = GPOINTER_TO_UINT (g_hash_table_lookup (_count_table, (gpointer)G_OBJECT_TYPE (obj)));
++    g_hash_table_replace (_count_table, (gpointer)G_OBJECT_TYPE (obj), GUINT_TO_POINTER (--count));
++    g_debug ("Finalize %s, count = %d, all = %d", G_OBJECT_TYPE_NAME (obj), count, _count);
++#endif
++
+     G_OBJECT_CLASS(parent_class)->finalize (G_OBJECT (obj));
+ }
+ 
+diff --git a/src/ibusproperty.c b/src/ibusproperty.c
+index 1759b94..1b70f70 100644
+--- a/src/ibusproperty.c
++++ b/src/ibusproperty.c
+@@ -97,15 +97,17 @@ ibus_property_init (IBusProperty *prop)
+     prop->sensitive = FALSE;
+     prop->visible = FALSE;
+     prop->state = 0;
++
++    prop->sub_props = NULL;
+ }
+ 
+ static void
+ ibus_property_destroy (IBusProperty *prop)
+ {
+     g_free (prop->key);
+-    g_free (prop->icon);
+-
+     prop->key = NULL;
++
++    g_free (prop->icon);
+     prop->icon = NULL;
+ 
+     if (prop->label) {
+@@ -118,6 +120,11 @@ ibus_property_destroy (IBusProperty *prop)
+         prop->tooltip = NULL;
+     }
+ 
++    if (prop->sub_props) {
++        g_object_unref (prop->sub_props);
++        prop->sub_props = NULL;
++    }
++
+     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
+ }
+ 
+@@ -427,14 +434,15 @@ ibus_prop_list_init (IBusPropList *prop_list)
+ static void
+ ibus_prop_list_destroy (IBusPropList *prop_list)
+ {
+-    IBusProperty **ps, **p;
+-    p = ps = (IBusProperty **) g_array_free (prop_list->properties, FALSE);
++    IBusProperty **p;
++    gint i;
++
++    p = (IBusProperty **) g_array_free (prop_list->properties, FALSE);
+ 
+-    while (*p != NULL) {
+-        g_object_unref (*p);
+-        p ++;
++    for (i = 0; p[i] != NULL; i++) {
++        g_object_unref (p[i]);
+     }
+-    g_free (ps);
++    g_free (p);
+ 
+     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *) prop_list);
+ }


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- ibus.spec	10 Aug 2009 02:19:01 -0000	1.81
+++ ibus.spec	10 Aug 2009 06:13:13 -0000	1.82
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20090807
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -228,9 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Mon Aug 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-3
+* Mon Aug 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-4
 - Update ibus-HEAD.patch
 - Fix Numlock problem.
+- Fix some memory leaks.
 
 * Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-2
 - Update ibus-HEAD.patch



From bojan at fedoraproject.org  Mon Aug 10 07:07:35 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 10 Aug 2009 07:07:35 +0000 (UTC)
Subject: rpms/apr/F-11 apr.spec,1.84,1.85
Message-ID: <20090810070735.516C611C0344@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22853

Modified Files:
	apr.spec 
Log Message:
Revert use of accept4(), dup3() and epoll_create1().


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/apr.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- apr.spec	6 Aug 2009 00:22:11 -0000	1.84
+++ apr.spec	10 Aug 2009 07:07:33 -0000	1.85
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -52,12 +52,6 @@ C data structures and routines.
 # does not use -lrt).
 export ac_cv_search_shm_open=no
 
-# We know we have these on new Fedoras (kernel >= 2.6.28)
-export apr_cv_epoll_create1=yes
-export apr_cv_dup3=yes
-export apr_cv_accept4=yes
-export apr_cv_sock_cloexec=yes
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
@@ -127,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-2
+- revert use of accept4(), dup3() and epoll_create1()
+
 * Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1
 - bump up to 1.3.8
 - CVE-2009-2412



From bojan at fedoraproject.org  Mon Aug 10 07:13:59 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 10 Aug 2009 07:13:59 +0000 (UTC)
Subject: rpms/apr-api-docs/F-11 apr-api-docs.spec,1.12,1.13
Message-ID: <20090810071359.C121D11C0344@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-serv24657

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.8.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/F-11/apr-api-docs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- apr-api-docs.spec	24 Jun 2009 21:53:56 -0000	1.12
+++ apr-api-docs.spec	10 Aug 2009 07:13:59 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           apr-api-docs
-Version:        1.3.5
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Mon Aug 10 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-1
+- Bump up to 1.3.8
+
 * Thu Jun 25 2009 Bojan Smojver <bojan at rexursive.com> 1.3.5-1
 - Bump up to 1.3.5
 



From bojan at fedoraproject.org  Mon Aug 10 07:16:12 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 10 Aug 2009 07:16:12 +0000 (UTC)
Subject: rpms/apr/F-11 apr.spec,1.85,1.86
Message-ID: <20090810071612.2DD1F11C0344@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24974

Modified Files:
	apr.spec 
Log Message:
Correct date.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/apr.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- apr.spec	10 Aug 2009 07:07:33 -0000	1.85
+++ apr.spec	10 Aug 2009 07:16:11 -0000	1.86
@@ -121,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Thu Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-2
+* Mon Aug 10 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-2
 - revert use of accept4(), dup3() and epoll_create1()
 
 * Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.8-1



From lkundrak at fedoraproject.org  Mon Aug 10 07:18:05 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 07:18:05 +0000 (UTC)
Subject: rpms/rubygem-treetop/devel import.log, NONE,
	1.1 rubygem-treetop.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810071805.D24E411C0344@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-treetop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25438/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-treetop.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
rubygem-treetop-1_3_0-1_fc11:HEAD:rubygem-treetop-1.3.0-1.fc11.src.rpm:1249888664


--- NEW FILE rubygem-treetop.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname treetop
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A Ruby-based text parsing and interpretation DSL
Name:           rubygem-%{gemname}
Version:        1.3.0
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://treetop.rubyforge.org/
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(polyglot) >= 0
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Treetop is a language for describing languages. It helps you analyze syntax.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force %{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
find $RPM_BUILD_ROOT%{gemdir} -name '*.rb' |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}/tt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/Rakefile
%doc %{geminstdir}/doc
%doc %{geminstdir}/examples
%doc %{geminstdir}/README
%doc %{geminstdir}/LICENSE
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Fri Jul 31 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.3.0-1
- Update to new upstream version
- Mark more documentation files as such

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-2
- Fix up documentation list
- 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> - 1.2.5-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix file permissions
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-treetop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:43:36 -0000	1.1
+++ .cvsignore	10 Aug 2009 07:18:05 -0000	1.2
@@ -0,0 +1 @@
+treetop-1.3.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-treetop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:43:36 -0000	1.1
+++ sources	10 Aug 2009 07:18:05 -0000	1.2
@@ -0,0 +1 @@
+a1fbf9629f8052eeff592d437c8b47a6  treetop-1.3.0.gem



From lkundrak at fedoraproject.org  Mon Aug 10 07:19:11 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 07:19:11 +0000 (UTC)
Subject: rpms/rubygem-treetop/F-11 import.log, NONE, 1.1 rubygem-treetop.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810071911.C3AEA11C0344@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-treetop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-treetop.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
rubygem-treetop-1_3_0-1_fc11:F-11:rubygem-treetop-1.3.0-1.fc11.src.rpm:1249888728


--- NEW FILE rubygem-treetop.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname treetop
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A Ruby-based text parsing and interpretation DSL
Name:           rubygem-%{gemname}
Version:        1.3.0
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://treetop.rubyforge.org/
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(polyglot) >= 0
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Treetop is a language for describing languages. It helps you analyze syntax.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force %{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
find $RPM_BUILD_ROOT%{gemdir} -name '*.rb' |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}/tt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/Rakefile
%doc %{geminstdir}/doc
%doc %{geminstdir}/examples
%doc %{geminstdir}/README
%doc %{geminstdir}/LICENSE
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Fri Jul 31 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.3.0-1
- Update to new upstream version
- Mark more documentation files as such

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-2
- Fix up documentation list
- 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> - 1.2.5-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix file permissions
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-treetop/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:43:36 -0000	1.1
+++ .cvsignore	10 Aug 2009 07:19:11 -0000	1.2
@@ -0,0 +1 @@
+treetop-1.3.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-treetop/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:43:36 -0000	1.1
+++ sources	10 Aug 2009 07:19:11 -0000	1.2
@@ -0,0 +1 @@
+a1fbf9629f8052eeff592d437c8b47a6  treetop-1.3.0.gem



From lkundrak at fedoraproject.org  Mon Aug 10 07:19:09 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 10 Aug 2009 07:19:09 +0000 (UTC)
Subject: rpms/rubygem-treetop/EL-5 import.log, NONE, 1.1 rubygem-treetop.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810071909.F120811C0344@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-treetop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25783/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-treetop.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
rubygem-treetop-1_3_0-1_fc11:EL-5:rubygem-treetop-1.3.0-1.fc11.src.rpm:1249888679


--- NEW FILE rubygem-treetop.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname treetop
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        A Ruby-based text parsing and interpretation DSL
Name:           rubygem-%{gemname}
Version:        1.3.0
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://treetop.rubyforge.org/
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(polyglot) >= 0
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Treetop is a language for describing languages. It helps you analyze syntax.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force %{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
find $RPM_BUILD_ROOT%{gemdir} -name '*.rb' |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}/tt
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/Rakefile
%doc %{geminstdir}/doc
%doc %{geminstdir}/examples
%doc %{geminstdir}/README
%doc %{geminstdir}/LICENSE
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Fri Jul 31 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.3.0-1
- Update to new upstream version
- Mark more documentation files as such

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-2
- Fix up documentation list
- 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> - 1.2.5-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix file permissions
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-treetop/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:43:36 -0000	1.1
+++ .cvsignore	10 Aug 2009 07:19:09 -0000	1.2
@@ -0,0 +1 @@
+treetop-1.3.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-treetop/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:43:36 -0000	1.1
+++ sources	10 Aug 2009 07:19:09 -0000	1.2
@@ -0,0 +1 @@
+a1fbf9629f8052eeff592d437c8b47a6  treetop-1.3.0.gem



From bojan at fedoraproject.org  Mon Aug 10 07:20:17 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 10 Aug 2009 07:20:17 +0000 (UTC)
Subject: rpms/apr-api-docs/F-10 apr-api-docs.spec,1.11,1.12
Message-ID: <20090810072017.0D63B11C0495@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-serv26155

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.8.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/F-10/apr-api-docs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- apr-api-docs.spec	24 Jun 2009 21:56:35 -0000	1.11
+++ apr-api-docs.spec	10 Aug 2009 07:20:16 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           apr-api-docs
-Version:        1.3.5
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Mon Aug 10 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-1
+- Bump up to 1.3.8
+
 * Thu Jun 25 2009 Bojan Smojver <bojan at rexursive.com> 1.3.5-1
 - Bump up to 1.3.5
 



From phuang at fedoraproject.org  Mon Aug 10 07:37:13 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 10 Aug 2009 07:37:13 +0000 (UTC)
Subject: rpms/ibus/F-11 ibus-HEAD.patch,1.19,1.20 ibus.spec,1.80,1.81
Message-ID: <20090810073713.8B0C811C0344@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28903

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
- Update ibus-HEAD.patch.
- Fix memory leaks.
- Update some translate
- Fix typo in src/Makefile.am
- Do not restore states when focus_in, if the engine is disabled.



ibus-HEAD.patch:
 AUTHORS               |    2 
 bus/inputcontext.c    |   45 +++----
 po/LINGUAS            |    1 
 po/da.po              |    4 
 po/vi.po              |  288 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am       |    2 
 src/ibuslookuptable.c |    2 
 src/ibusproperty.c    |    5 
 8 files changed, 325 insertions(+), 24 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus-HEAD.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ibus-HEAD.patch	31 May 2009 05:06:56 -0000	1.19
+++ ibus-HEAD.patch	10 Aug 2009 07:37:11 -0000	1.20
@@ -1 +1,446 @@
-
+diff --git a/AUTHORS b/AUTHORS
+index 24ed851..23dca12 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -45,6 +45,8 @@ te.po
+ krishna k <k.meetme at gmail.com>
+ ta.po:
+ Felix <ifelix at redhat.com>
++vi.po:
++L? Qu?c Tu?n <mr.lequoctuan at gmail.com>
+ zh_CN.po:
+ Huang Peng <shawn.p.huang at gmail.com>
+ zh_HK.po:
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index 0881581..bec08c3 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -1151,28 +1151,29 @@ bus_input_context_focus_in (BusInputContext *context)
+ 
+     if (priv->capabilities & IBUS_CAP_FOCUS) {
+         g_signal_emit (context, context_signals[FOCUS_IN], 0);
+-
+-        if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
+-            g_signal_emit (context,
+-                           context_signals[UPDATE_PREEDIT_TEXT],
+-                           0,
+-                           priv->preedit_text,
+-                           priv->preedit_cursor_pos,
+-                           priv->preedit_visible);
+-        }
+-        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
+-            g_signal_emit (context,
+-                           context_signals[UPDATE_AUXILIARY_TEXT],
+-                           0,
+-                           priv->auxiliary_text,
+-                           priv->auxiliary_visible);
+-        }
+-        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
+-            g_signal_emit (context,
+-                           context_signals[UPDATE_LOOKUP_TABLE],
+-                           0,
+-                           priv->lookup_table,
+-                           priv->lookup_table_visible);
++        if (priv->engine && priv->enabled) {
++            if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
++                g_signal_emit (context,
++                               context_signals[UPDATE_PREEDIT_TEXT],
++                               0,
++                               priv->preedit_text,
++                               priv->preedit_cursor_pos,
++                               priv->preedit_visible);
++            }
++            if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
++                g_signal_emit (context,
++                               context_signals[UPDATE_AUXILIARY_TEXT],
++                               0,
++                               priv->auxiliary_text,
++                               priv->auxiliary_visible);
++            }
++            if (priv->lookup_table_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
++                g_signal_emit (context,
++                               context_signals[UPDATE_LOOKUP_TABLE],
++                               0,
++                               priv->lookup_table,
++                               priv->lookup_table_visible);
++            }
+         }
+     }
+ }
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 9c1cecd..5385cb8 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -20,6 +20,7 @@ sr
+ sr at latin
+ ta
+ te
++vi
+ zh_CN
+ zh_HK
+ zh_TW
+diff --git a/po/da.po b/po/da.po
+index 94ac003..8b52b8b 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -8,7 +8,7 @@ msgstr ""
+ "Project-Id-Version: ibus\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2009-05-26 07:38+0800\n"
+-"PO-Revision-Date: 2009-04-06 21:47+0200\n"
++"PO-Revision-Date: 2009-06-11 17:58+0200\n"
+ "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
+ "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+ "MIME-Version: 1.0\n"
+@@ -153,6 +153,8 @@ msgid ""
+ "<small><i>The default input method is the top one in the list.\n"
+ "You may use up/down buttons to change it.</i></small>"
+ msgstr ""
++"<small><i>Standard inputmetoden er den ?verste i listen.\n"
++"Du kan bruge op/ned-knapperne for at ?ndre det.</i></small>"
+ 
+ #: ../setup/setup.glade.h:14
+ msgid "About"
+diff --git a/po/vi.po b/po/vi.po
+new file mode 100644
+index 0000000..8ecef98
+--- /dev/null
++++ b/po/vi.po
+@@ -0,0 +1,288 @@
++# Vietnamese translations for data package.
++# Copyright (C) 2009 THE data'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the data package.
++# Le Quoc Tuan <mr.lequoctuan at gmail.com>, 2009.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: data 1\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2009-05-26 07:38+0800\n"
++"PO-Revision-Date: 2009-06-12 12:41+0700\n"
++"Last-Translator: Le Quoc Tuan <mr.lequoctuan at gmail.com>\n"
++"Language-Team: Vietnamese\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"
++
++#: ../bus/ibus.desktop.in.h:1
++msgid "IBus"
++msgstr "IBus"
++
++#: ../bus/ibus.desktop.in.h:2
++#: ../ui/gtk/panel.py:97
++msgid "IBus input method framework"
++msgstr "B? g? IBus"
++
++#: ../ibus/lang.py:40
++#: ../ui/gtk/panel.py:307
++#: ../ui/gtk/panel.py:308
++#: ../ui/gtk/panel.py:309
++#: ../ui/gtk/panel.py:310
++msgid "Other"
++msgstr "Kh?c"
++
++#: ../ui/gtk/panel.py:282
++msgid "Restart"
++msgstr "Kh?i ??ng l?i"
++
++#: ../ui/gtk/panel.py:337
++msgid "No input method"
++msgstr "Kh?ng c? b? g?"
++
++#: ../ui/gtk/panel.py:383
++msgid "IBus is an intelligent input bus for Linux/Unix."
++msgstr "IBus l? m?t b? g? th?ng minh cho Linux/Unix."
++
++#: ../ui/gtk/panel.py:387
++msgid "translator-credits"
++msgstr "L? Qu?c Tu?n <mr.lequoctuan at gmail.com>"
++
++#. create input methods menu
++#: ../ui/gtk/languagebar.py:84
++msgid "Switch input method"
++msgstr "Chuy?n b? g?"
++
++#: ../setup/main.py:104
++msgid "trigger"
++msgstr "B?t/t?t"
++
++#: ../setup/main.py:114
++msgid "next input method"
++msgstr "B? g? k? ti?p"
++
++#: ../setup/main.py:124
++msgid "previous input method"
++msgstr "B? g? tr??c"
++
++#: ../setup/main.py:205
++msgid "IBus daemon is not started. Do you want to start it now?"
++msgstr "IBus daemon ch?a ???c kh?i ??ng. B?n c? mu?n kh?i ??ng n? ngay b?y gi??"
++
++#: ../setup/main.py:220
++msgid ""
++"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
++"  export GTK_IM_MODULE=ibus\n"
++"  export XMODIFIERS=@im=ibus\n"
++"  export QT_IM_MODULE=ibus"
++msgstr ""
++"IBus v?a ???c kh?i ??ng! N?u b?n kh?ng th? d?ng IBus, vui l?ng th?m nh?ng d?ng b?n d??i v?o $HOME/.bashrc, v? ??ng nh?p l?i.\n"
++"  export GTK_IM_MODULE=ibus\n"
++"  export XMODIFIERS=@im=ibus\n"
++"  export QT_IM_MODULE=ibus"
++
++#: ../setup/main.py:235
++#, python-format
++msgid "Select keyboard shortcut for %s"
++msgstr "Ch?n ph?m t?t cho %s"
++
++#: ../setup/keyboardshortcut.py:54
++msgid "Keyboard shortcuts"
++msgstr "Nh?ng ph?m t?t"
++
++#: ../setup/keyboardshortcut.py:65
++msgid "Key code:"
++msgstr "M? ph?m:"
++
++#: ../setup/keyboardshortcut.py:80
++msgid "Modifiers:"
++msgstr "Ph?m b? sung:"
++
++#: ../setup/keyboardshortcut.py:222
++msgid ""
++"Please press a key (or a key combination).\n"
++"The dialog will be closed when the key is released."
++msgstr ""
++"Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m).\n"
++"H?p tho?i n?y s? ???c ??ng l?i khi b?n th? ph?m ?n."
++
++#: ../setup/keyboardshortcut.py:224
++msgid "Please press a key (or a key combination)"
++msgstr "Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m)"
++
++#: ../setup/enginecombobox.py:99
++msgid "Select an input method"
++msgstr "Ch?n m?t b? g?"
++
++#: ../setup/setup.glade.h:1
++msgid "..."
++msgstr "..."
++
++#: ../setup/setup.glade.h:2
++msgid "<b>Font and Style</b>"
++msgstr "<b>Ph?ng v? ki?u</b>"
++
++#: ../setup/setup.glade.h:3
++msgid "<b>Keyboard Shortcuts</b>"
++msgstr "<b>Ph?m t?t</b>"
++
++#: ../setup/setup.glade.h:4
++msgid "<b>Startup</b>"
++msgstr "<b>Kh?i ??ng</b>"
++
++#: ../setup/setup.glade.h:5
++msgid ""
++"<big><b>IBus</b></big>\n"
++"<small>The intelligent input bus</small>\n"
++"Homepage: http://code.google.com/p/ibus\n"
++"\n"
++"\n"
++"\n"
++msgstr ""
++"<big><b>IBus</b></big>\n"
++"<small>B? g? th?ng minh</small>\n"
++"Trang ch?: http://code.google.com/p/ibus\n"
++"\n"
++"\n"
++"\n"
++
++#: ../setup/setup.glade.h:12
++msgid ""
++"<small><i>The default input method is the top one in the list.\n"
++"You may use up/down buttons to change it.</i></small>"
++msgstr ""
++"<small><i>B? g? m?c ??nh l? b? g? ??u ti?n trong danh s?ch.\n"
++"B?n c? th? d?ng ph?m l?n/xu?ng ?? thay ??i n?</i></small>"
++
++#: ../setup/setup.glade.h:14
++msgid "About"
++msgstr "Gi?i thi?u"
++
++#: ../setup/setup.glade.h:15
++msgid "Candidates orientation:"
++msgstr "H??ng danh s?ch t? ?ng c?:"
++
++#: ../setup/setup.glade.h:16
++msgid "Custom font:"
++msgstr "T?y bi?n ph?ng:"
++
++#: ../setup/setup.glade.h:17
++msgid "Enable or disable:"
++msgstr "B?t ho?c t?t:"
++
++#: ../setup/setup.glade.h:18
++msgid "General"
++msgstr "Chung"
++
++#: ../setup/setup.glade.h:19
++msgid ""
++"Horizontal\n"
++"Vertical"
++msgstr ""
++"Ngang\n"
++"D?c"
++
++#: ../setup/setup.glade.h:21
++#: ../setup/ibus-setup.desktop.in.h:1
++msgid "IBus Preferences"
++msgstr "T?y th?ch IBus"
++
++#: ../setup/setup.glade.h:22
++msgid "Input Methods"
++msgstr "B? g?"
++
++#: ../setup/setup.glade.h:23
++msgid ""
++"Never\n"
++"When active\n"
++"Always"
++msgstr ""
++"Kh?ng bao gi?\n"
++"Khi ho?t ??ng\n"
++"Lu?n lu?n"
++
++#: ../setup/setup.glade.h:26
++msgid "Next input method:"
++msgstr "B? g? k? ti?p:"
++
++#: ../setup/setup.glade.h:27
++msgid "Previous input method:"
++msgstr "B? g? tr??c:"
++
++#: ../setup/setup.glade.h:28
++msgid "Show language panel:"
++msgstr "Hi?n th? thanh ng?n ng?:"
++
++#: ../setup/setup.glade.h:29
++msgid "Start ibus on login"
++msgstr "Kh?i ??ng ibus khi ??ng nh?p"
++
++#: ../setup/setup.glade.h:30
++msgid "Use custom font"
++msgstr "D?ng ph?ng ch? t?y bi?n"
++
++#: ../data/ibus.schemas.in.h:1
++msgid "Auto Hide"
++msgstr "T? ??ng ?n"
++
++#: ../data/ibus.schemas.in.h:2
++msgid "Custom Font"
++msgstr "T?y bi?n ph?ng"
++
++#: ../data/ibus.schemas.in.h:3
++msgid "Custom font name for language panel"
++msgstr "T?y bi?n ph?ng cho thanh ng?n ng?"
++
++#: ../data/ibus.schemas.in.h:4
++msgid "Next Engine Hotkey"
++msgstr "Ph?m n?ng cho b? g? k? ti?p"
++
++#: ../data/ibus.schemas.in.h:5
++msgid "Next engine hotkey for switch to next input method engine"
++msgstr "Ph?m n?ng d?ng ?? chuy?n ??n b? g? k? ti?p"
++
++#: ../data/ibus.schemas.in.h:6
++msgid "Orientation of Lookup Table"
++msgstr "H??ng c?a b?ng tra c?u"
++
++#: ../data/ibus.schemas.in.h:7
++msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
++msgstr "H??ng c?a b?ng tra c?u. 0 = Ngang, 1 = D?c"
++
++#: ../data/ibus.schemas.in.h:8
++msgid "Preload Engines"
++msgstr "N?p tr??c b? g?"
++
++#: ../data/ibus.schemas.in.h:9
++msgid "Preload Engines during ibus starts up"
++msgstr "N?p tr??c b? g? trong khi kh?i ??ng ibus"
++
++#: ../data/ibus.schemas.in.h:10
++msgid "Prev Engine Hotkey"
++msgstr "Ph?m n?ng cho b? g? tr??c"
++
++#: ../data/ibus.schemas.in.h:11
++msgid "Prev engine hotkey for switch to previous input method engine"
++msgstr "Ph?m n?ng d?ng ?? chuy?n v? b? g? tr??c"
++
++#: ../data/ibus.schemas.in.h:12
++msgid "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show"
++msgstr "C?ch hi?n th? thanh ng?n ng?. 0 = Lu?n ?n, 1 = T?  ??ng ?n, 2 = Lu?n hi?n"
++
++#: ../data/ibus.schemas.in.h:13
++msgid "Trigger Hotkey"
++msgstr "Ph?m n?ng b?t/t?t"
++
++#: ../data/ibus.schemas.in.h:14
++msgid "Trigger hotkey for enable or disable input context"
++msgstr "Ph?m n?ng b?t/t?t d?ng ?? b?t ho?c t?t b? g?"
++
++#: ../data/ibus.schemas.in.h:15
++msgid "Use Custom Font"
++msgstr "D?ng ph?ng t?y bi?n"
++
++#: ../data/ibus.schemas.in.h:16
++msgid "Use custom font name for language panel"
++msgstr "D?ng ph?ng t?y bi?n cho thanh ng?n ng?"
++
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 45da441..aa96c46 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -132,7 +132,7 @@ libibus_la_LDFLAGS = \
+ 	@GOBJECT2_LIBS@ \
+ 	@GIO2_LIBS@ \
+ 	@DBUS_LIBS@ \
+-	-export-symbols-regex "ibus_.*"
++	-export-symbols-regex "ibus_.*" \
+ 	-version-info @LT_VERSION_INFO@ \
+ 	$(NULL)
+ 
+diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
+index d928898..cd5d73f 100644
+--- a/src/ibuslookuptable.c
++++ b/src/ibuslookuptable.c
+@@ -215,6 +215,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
+         g_return_val_if_fail (retval, FALSE);
+ 
+         ibus_lookup_table_append_candidate (table, text);
++        g_object_unref (text);
+     }
+ 
+     ibus_message_iter_next (iter);
+@@ -229,6 +230,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
+         g_return_val_if_fail (retval, FALSE);
+ 
+         ibus_lookup_table_append_label (table, text);
++        g_object_unref (text);
+     }
+ 
+     ibus_message_iter_next (iter);
+diff --git a/src/ibusproperty.c b/src/ibusproperty.c
+index ea5aca0..44a328e 100644
+--- a/src/ibusproperty.c
++++ b/src/ibusproperty.c
+@@ -118,6 +118,11 @@ ibus_property_destroy (IBusProperty *prop)
+         prop->tooltip = NULL;
+     }
+ 
++    if (prop->sub_props) {
++        g_object_unref (prop->sub_props);
++        prop->sub_props = NULL;
++    }
++
+     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
+ }
+ 


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ibus.spec	12 Jun 2009 06:02:53 -0000	1.80
+++ ibus.spec	10 Aug 2009 07:37:11 -0000	1.81
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090612
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -114,8 +114,8 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-# %patch0 -p1
-# ./autogen.sh --help
+%patch0 -p1
+./autogen.sh --help
 
 %build
 %configure --disable-static \
@@ -228,6 +228,13 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-2
+- Update ibus-HEAD.patch.
+- Fix memory leaks.
+- Update some translate
+- Fix typo in src/Makefile.am
+- Do not restore states when focus_in, if the engine is disabled.
+
 * Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
 - Update to Update to 1.1.0.20090612
 - Fix bug 504942 - PageUp and PageDown do not work in candidate list



From hedayat at fedoraproject.org  Mon Aug 10 07:43:41 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 10 Aug 2009 07:43:41 +0000 (UTC)
Subject: rpms/simspark/devel .cvsignore, 1.2, 1.3 simspark.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090810074341.9EAE711C0344@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30113

Modified Files:
	.cvsignore simspark.spec sources 
Log Message:
New upstream version: 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Mar 2009 06:57:31 -0000	1.2
+++ .cvsignore	10 Aug 2009 07:43:41 -0000	1.3
@@ -1 +1 @@
-simspark-0.1.tar.gz
+simspark-0.1.2.tar.gz


Index: simspark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/devel/simspark.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- simspark.spec	27 Jul 2009 04:20:58 -0000	1.3
+++ simspark.spec	10 Aug 2009 07:43:41 -0000	1.4
@@ -1,14 +1,12 @@
 Name:           simspark
-Version:        0.1
-Release:        5%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 Summary:        Spark physical simulation system
 
 Group:          Development/Libraries
 License:        GPLv2
 URL:            http://simspark.sourceforge.net
 Source0:        http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.1-cmakefix.patch
-Patch1:         %{name}-0.1-devilfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
@@ -40,8 +38,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .cmakefix
-%patch1 -p1 -b .devilfix
 
 %build
 mkdir build
@@ -86,6 +82,9 @@ rm -rf %{buildroot}
 %doc doc/devel/howtos doc/devel/manual.pdf
 
 %changelog
+* Mon Aug 10 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1.2-1
+- Updated to latest upstream release 0.1.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Mar 2009 06:57:31 -0000	1.2
+++ sources	10 Aug 2009 07:43:41 -0000	1.3
@@ -1 +1 @@
-94ef43347083d72d09ab33d89d486d55  simspark-0.1.tar.gz
+05fc85fe35e21cc7f6c7243d1743a97d  simspark-0.1.2.tar.gz



From belegdol at fedoraproject.org  Mon Aug 10 07:48:18 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Mon, 10 Aug 2009 07:48:18 +0000 (UTC)
Subject: rpms/chemical-mime-data/devel
	chemical-mime-data-0.1.94-turbomole.patch, NONE,
	1.1 chemical-mime-data.spec, 1.9, 1.10
Message-ID: <20090810074818.685C711C0344@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/chemical-mime-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31476

Modified Files:
	chemical-mime-data.spec 
Added Files:
	chemical-mime-data-0.1.94-turbomole.patch 
Log Message:
* Mon Aug 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-7
- Enabled some turbomole mimetypes (RH #501177)


chemical-mime-data-0.1.94-turbomole.patch:
 chemical-mime-database.xml.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE chemical-mime-data-0.1.94-turbomole.patch ---
diff -up chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in
--- chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole	2009-08-10 09:37:06.000000000 +0200
+++ chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in	2009-08-10 09:40:57.000000000 +0200
@@ -1290,7 +1290,7 @@
 		<specification url="http://ca.expasy.org/sprot/userman.html"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-basis" support="no">
+	<mime-type type="chemical/x-turbomole-basis" support="yes">
 		<_comment>Turbomole Basis Set File</_comment>
 		<glob pattern="basis"/>
 		<sub-class-of type="text/plain"/>
@@ -1304,7 +1304,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-control" support="no">
+	<mime-type type="chemical/x-turbomole-control" support="yes">
 		<_comment>Turbomole Control File</_comment>
 		<glob pattern="control"/>
 		<sub-class-of type="text/plain"/>
@@ -1320,7 +1320,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/node230.html"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-coord" support="no">
+	<mime-type type="chemical/x-turbomole-coord" support="yes">
 		<_comment>Turbomole Coordinate File</_comment>
 		<glob pattern="coord"/>
 		<glob pattern="*.tmol"/>
@@ -1335,7 +1335,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-grad" support="no">
+	<mime-type type="chemical/x-turbomole-grad" support="yes">
 		<_comment>Turbomole Gradient File</_comment>
 		<glob pattern="gradient"/>
 		<sub-class-of type="text/plain"/>
@@ -1383,7 +1383,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-scfmo" support="no">
+	<mime-type type="chemical/x-turbomole-scfmo" support="yes">
 		<_comment>Turbomole SCF Molecular Orbital File</_comment>
 		<acronym>MO</acronym>
 		<expanded-acronym>Molecular Orbital</expanded-acronym>
@@ -1401,7 +1401,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-vibrational" support="no">
+	<mime-type type="chemical/x-turbomole-vibrational" support="yes">
 		<_comment>Turbomole Vibrational Data File</_comment>
 		<glob pattern="???"/>
 		<sub-class-of type="text/plain"/>


Index: chemical-mime-data.spec
===================================================================
RCS file: /cvs/extras/rpms/chemical-mime-data/devel/chemical-mime-data.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- chemical-mime-data.spec	24 Jul 2009 18:53:04 -0000	1.9
+++ chemical-mime-data.spec	10 Aug 2009 07:48:18 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           chemical-mime-data
 Version:        0.1.94
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Support for chemical/* MIME types
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/chemical-mime/
 Source0:        http://dl.sourceforge.net/chemical-mime/%{name}-%{version}.tar.bz2
+Patch0:         chemical-mime-data-0.1.94-turbomole.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,6 +31,7 @@ proposed in 1995, though it seems they h
 
 %prep
 %setup -q
+%patch0 -p1 -b .turbomole
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
 sed -i -e '/^libdir/d' chemical-mime-data.pc.in
 
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-7
+- Enabled some turbomole mimetypes (RH #501177)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.94-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From belegdol at fedoraproject.org  Mon Aug 10 07:54:08 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Mon, 10 Aug 2009 07:54:08 +0000 (UTC)
Subject: rpms/chemical-mime-data/F-11
	chemical-mime-data-0.1.94-turbomole.patch, NONE,
	1.1 chemical-mime-data.spec, 1.8, 1.9
Message-ID: <20090810075408.9A5E511C0344@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/chemical-mime-data/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32540

Modified Files:
	chemical-mime-data.spec 
Added Files:
	chemical-mime-data-0.1.94-turbomole.patch 
Log Message:
* Mon Aug 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-7
- Enabled some turbomole mimetypes (RH #501177)


chemical-mime-data-0.1.94-turbomole.patch:
 chemical-mime-database.xml.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE chemical-mime-data-0.1.94-turbomole.patch ---
diff -up chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in
--- chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole	2009-08-10 09:37:06.000000000 +0200
+++ chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in	2009-08-10 09:40:57.000000000 +0200
@@ -1290,7 +1290,7 @@
 		<specification url="http://ca.expasy.org/sprot/userman.html"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-basis" support="no">
+	<mime-type type="chemical/x-turbomole-basis" support="yes">
 		<_comment>Turbomole Basis Set File</_comment>
 		<glob pattern="basis"/>
 		<sub-class-of type="text/plain"/>
@@ -1304,7 +1304,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-control" support="no">
+	<mime-type type="chemical/x-turbomole-control" support="yes">
 		<_comment>Turbomole Control File</_comment>
 		<glob pattern="control"/>
 		<sub-class-of type="text/plain"/>
@@ -1320,7 +1320,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/node230.html"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-coord" support="no">
+	<mime-type type="chemical/x-turbomole-coord" support="yes">
 		<_comment>Turbomole Coordinate File</_comment>
 		<glob pattern="coord"/>
 		<glob pattern="*.tmol"/>
@@ -1335,7 +1335,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-grad" support="no">
+	<mime-type type="chemical/x-turbomole-grad" support="yes">
 		<_comment>Turbomole Gradient File</_comment>
 		<glob pattern="gradient"/>
 		<sub-class-of type="text/plain"/>
@@ -1383,7 +1383,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-scfmo" support="no">
+	<mime-type type="chemical/x-turbomole-scfmo" support="yes">
 		<_comment>Turbomole SCF Molecular Orbital File</_comment>
 		<acronym>MO</acronym>
 		<expanded-acronym>Molecular Orbital</expanded-acronym>
@@ -1401,7 +1401,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-vibrational" support="no">
+	<mime-type type="chemical/x-turbomole-vibrational" support="yes">
 		<_comment>Turbomole Vibrational Data File</_comment>
 		<glob pattern="???"/>
 		<sub-class-of type="text/plain"/>


Index: chemical-mime-data.spec
===================================================================
RCS file: /cvs/extras/rpms/chemical-mime-data/F-11/chemical-mime-data.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- chemical-mime-data.spec	4 Mar 2009 22:25:15 -0000	1.8
+++ chemical-mime-data.spec	10 Aug 2009 07:54:08 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           chemical-mime-data
 Version:        0.1.94
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Support for chemical/* MIME types
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/chemical-mime/
 Source0:        http://dl.sourceforge.net/chemical-mime/%{name}-%{version}.tar.bz2
+Patch0:         chemical-mime-data-0.1.94-turbomole.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,6 +31,7 @@ proposed in 1995, though it seems they h
 
 %prep
 %setup -q
+%patch0 -p1 -b .turbomole
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
 sed -i -e '/^libdir/d' chemical-mime-data.pc.in
 
@@ -74,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-7
+- Enabled some turbomole mimetypes (RH #501177)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.94-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar 04 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-5
 - Dropped the KDE MIME .desktop files
 



From phuang at fedoraproject.org  Mon Aug 10 07:54:47 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Mon, 10 Aug 2009 07:54:47 +0000 (UTC)
Subject: rpms/ibus/F-10 ibus-HEAD.patch,1.2,1.3 ibus.spec,1.38,1.39
Message-ID: <20090810075447.7FC3B11C0344@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32726

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch.
Fix memory leaks.
Update some translate
Fix typo in src/Makefile.am
Do not restore states when focus_in, if the engine is disabled.


ibus-HEAD.patch:
 AUTHORS               |    2 
 bus/inputcontext.c    |   45 +++----
 po/LINGUAS            |    1 
 po/da.po              |    4 
 po/vi.po              |  288 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am       |    2 
 src/ibuslookuptable.c |    2 
 src/ibusproperty.c    |    5 
 8 files changed, 325 insertions(+), 24 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus-HEAD.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-HEAD.patch	1 Jun 2009 02:54:14 -0000	1.2
+++ ibus-HEAD.patch	10 Aug 2009 07:54:47 -0000	1.3
@@ -1 +1,446 @@
-
+diff --git a/AUTHORS b/AUTHORS
+index 24ed851..23dca12 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -45,6 +45,8 @@ te.po
+ krishna k <k.meetme at gmail.com>
+ ta.po:
+ Felix <ifelix at redhat.com>
++vi.po:
++L? Qu?c Tu?n <mr.lequoctuan at gmail.com>
+ zh_CN.po:
+ Huang Peng <shawn.p.huang at gmail.com>
+ zh_HK.po:
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index 0881581..bec08c3 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -1151,28 +1151,29 @@ bus_input_context_focus_in (BusInputContext *context)
+ 
+     if (priv->capabilities & IBUS_CAP_FOCUS) {
+         g_signal_emit (context, context_signals[FOCUS_IN], 0);
+-
+-        if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
+-            g_signal_emit (context,
+-                           context_signals[UPDATE_PREEDIT_TEXT],
+-                           0,
+-                           priv->preedit_text,
+-                           priv->preedit_cursor_pos,
+-                           priv->preedit_visible);
+-        }
+-        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
+-            g_signal_emit (context,
+-                           context_signals[UPDATE_AUXILIARY_TEXT],
+-                           0,
+-                           priv->auxiliary_text,
+-                           priv->auxiliary_visible);
+-        }
+-        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
+-            g_signal_emit (context,
+-                           context_signals[UPDATE_LOOKUP_TABLE],
+-                           0,
+-                           priv->lookup_table,
+-                           priv->lookup_table_visible);
++        if (priv->engine && priv->enabled) {
++            if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
++                g_signal_emit (context,
++                               context_signals[UPDATE_PREEDIT_TEXT],
++                               0,
++                               priv->preedit_text,
++                               priv->preedit_cursor_pos,
++                               priv->preedit_visible);
++            }
++            if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
++                g_signal_emit (context,
++                               context_signals[UPDATE_AUXILIARY_TEXT],
++                               0,
++                               priv->auxiliary_text,
++                               priv->auxiliary_visible);
++            }
++            if (priv->lookup_table_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
++                g_signal_emit (context,
++                               context_signals[UPDATE_LOOKUP_TABLE],
++                               0,
++                               priv->lookup_table,
++                               priv->lookup_table_visible);
++            }
+         }
+     }
+ }
+diff --git a/po/LINGUAS b/po/LINGUAS
+index 9c1cecd..5385cb8 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -20,6 +20,7 @@ sr
+ sr at latin
+ ta
+ te
++vi
+ zh_CN
+ zh_HK
+ zh_TW
+diff --git a/po/da.po b/po/da.po
+index 94ac003..8b52b8b 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -8,7 +8,7 @@ msgstr ""
+ "Project-Id-Version: ibus\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2009-05-26 07:38+0800\n"
+-"PO-Revision-Date: 2009-04-06 21:47+0200\n"
++"PO-Revision-Date: 2009-06-11 17:58+0200\n"
+ "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
+ "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+ "MIME-Version: 1.0\n"
+@@ -153,6 +153,8 @@ msgid ""
+ "<small><i>The default input method is the top one in the list.\n"
+ "You may use up/down buttons to change it.</i></small>"
+ msgstr ""
++"<small><i>Standard inputmetoden er den ?verste i listen.\n"
++"Du kan bruge op/ned-knapperne for at ?ndre det.</i></small>"
+ 
+ #: ../setup/setup.glade.h:14
+ msgid "About"
+diff --git a/po/vi.po b/po/vi.po
+new file mode 100644
+index 0000000..8ecef98
+--- /dev/null
++++ b/po/vi.po
+@@ -0,0 +1,288 @@
++# Vietnamese translations for data package.
++# Copyright (C) 2009 THE data'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the data package.
++# Le Quoc Tuan <mr.lequoctuan at gmail.com>, 2009.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: data 1\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2009-05-26 07:38+0800\n"
++"PO-Revision-Date: 2009-06-12 12:41+0700\n"
++"Last-Translator: Le Quoc Tuan <mr.lequoctuan at gmail.com>\n"
++"Language-Team: Vietnamese\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"
++
++#: ../bus/ibus.desktop.in.h:1
++msgid "IBus"
++msgstr "IBus"
++
++#: ../bus/ibus.desktop.in.h:2
++#: ../ui/gtk/panel.py:97
++msgid "IBus input method framework"
++msgstr "B? g? IBus"
++
++#: ../ibus/lang.py:40
++#: ../ui/gtk/panel.py:307
++#: ../ui/gtk/panel.py:308
++#: ../ui/gtk/panel.py:309
++#: ../ui/gtk/panel.py:310
++msgid "Other"
++msgstr "Kh?c"
++
++#: ../ui/gtk/panel.py:282
++msgid "Restart"
++msgstr "Kh?i ??ng l?i"
++
++#: ../ui/gtk/panel.py:337
++msgid "No input method"
++msgstr "Kh?ng c? b? g?"
++
++#: ../ui/gtk/panel.py:383
++msgid "IBus is an intelligent input bus for Linux/Unix."
++msgstr "IBus l? m?t b? g? th?ng minh cho Linux/Unix."
++
++#: ../ui/gtk/panel.py:387
++msgid "translator-credits"
++msgstr "L? Qu?c Tu?n <mr.lequoctuan at gmail.com>"
++
++#. create input methods menu
++#: ../ui/gtk/languagebar.py:84
++msgid "Switch input method"
++msgstr "Chuy?n b? g?"
++
++#: ../setup/main.py:104
++msgid "trigger"
++msgstr "B?t/t?t"
++
++#: ../setup/main.py:114
++msgid "next input method"
++msgstr "B? g? k? ti?p"
++
++#: ../setup/main.py:124
++msgid "previous input method"
++msgstr "B? g? tr??c"
++
++#: ../setup/main.py:205
++msgid "IBus daemon is not started. Do you want to start it now?"
++msgstr "IBus daemon ch?a ???c kh?i ??ng. B?n c? mu?n kh?i ??ng n? ngay b?y gi??"
++
++#: ../setup/main.py:220
++msgid ""
++"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
++"  export GTK_IM_MODULE=ibus\n"
++"  export XMODIFIERS=@im=ibus\n"
++"  export QT_IM_MODULE=ibus"
++msgstr ""
++"IBus v?a ???c kh?i ??ng! N?u b?n kh?ng th? d?ng IBus, vui l?ng th?m nh?ng d?ng b?n d??i v?o $HOME/.bashrc, v? ??ng nh?p l?i.\n"
++"  export GTK_IM_MODULE=ibus\n"
++"  export XMODIFIERS=@im=ibus\n"
++"  export QT_IM_MODULE=ibus"
++
++#: ../setup/main.py:235
++#, python-format
++msgid "Select keyboard shortcut for %s"
++msgstr "Ch?n ph?m t?t cho %s"
++
++#: ../setup/keyboardshortcut.py:54
++msgid "Keyboard shortcuts"
++msgstr "Nh?ng ph?m t?t"
++
++#: ../setup/keyboardshortcut.py:65
++msgid "Key code:"
++msgstr "M? ph?m:"
++
++#: ../setup/keyboardshortcut.py:80
++msgid "Modifiers:"
++msgstr "Ph?m b? sung:"
++
++#: ../setup/keyboardshortcut.py:222
++msgid ""
++"Please press a key (or a key combination).\n"
++"The dialog will be closed when the key is released."
++msgstr ""
++"Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m).\n"
++"H?p tho?i n?y s? ???c ??ng l?i khi b?n th? ph?m ?n."
++
++#: ../setup/keyboardshortcut.py:224
++msgid "Please press a key (or a key combination)"
++msgstr "Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m)"
++
++#: ../setup/enginecombobox.py:99
++msgid "Select an input method"
++msgstr "Ch?n m?t b? g?"
++
++#: ../setup/setup.glade.h:1
++msgid "..."
++msgstr "..."
++
++#: ../setup/setup.glade.h:2
++msgid "<b>Font and Style</b>"
++msgstr "<b>Ph?ng v? ki?u</b>"
++
++#: ../setup/setup.glade.h:3
++msgid "<b>Keyboard Shortcuts</b>"
++msgstr "<b>Ph?m t?t</b>"
++
++#: ../setup/setup.glade.h:4
++msgid "<b>Startup</b>"
++msgstr "<b>Kh?i ??ng</b>"
++
++#: ../setup/setup.glade.h:5
++msgid ""
++"<big><b>IBus</b></big>\n"
++"<small>The intelligent input bus</small>\n"
++"Homepage: http://code.google.com/p/ibus\n"
++"\n"
++"\n"
++"\n"
++msgstr ""
++"<big><b>IBus</b></big>\n"
++"<small>B? g? th?ng minh</small>\n"
++"Trang ch?: http://code.google.com/p/ibus\n"
++"\n"
++"\n"
++"\n"
++
++#: ../setup/setup.glade.h:12
++msgid ""
++"<small><i>The default input method is the top one in the list.\n"
++"You may use up/down buttons to change it.</i></small>"
++msgstr ""
++"<small><i>B? g? m?c ??nh l? b? g? ??u ti?n trong danh s?ch.\n"
++"B?n c? th? d?ng ph?m l?n/xu?ng ?? thay ??i n?</i></small>"
++
++#: ../setup/setup.glade.h:14
++msgid "About"
++msgstr "Gi?i thi?u"
++
++#: ../setup/setup.glade.h:15
++msgid "Candidates orientation:"
++msgstr "H??ng danh s?ch t? ?ng c?:"
++
++#: ../setup/setup.glade.h:16
++msgid "Custom font:"
++msgstr "T?y bi?n ph?ng:"
++
++#: ../setup/setup.glade.h:17
++msgid "Enable or disable:"
++msgstr "B?t ho?c t?t:"
++
++#: ../setup/setup.glade.h:18
++msgid "General"
++msgstr "Chung"
++
++#: ../setup/setup.glade.h:19
++msgid ""
++"Horizontal\n"
++"Vertical"
++msgstr ""
++"Ngang\n"
++"D?c"
++
++#: ../setup/setup.glade.h:21
++#: ../setup/ibus-setup.desktop.in.h:1
++msgid "IBus Preferences"
++msgstr "T?y th?ch IBus"
++
++#: ../setup/setup.glade.h:22
++msgid "Input Methods"
++msgstr "B? g?"
++
++#: ../setup/setup.glade.h:23
++msgid ""
++"Never\n"
++"When active\n"
++"Always"
++msgstr ""
++"Kh?ng bao gi?\n"
++"Khi ho?t ??ng\n"
++"Lu?n lu?n"
++
++#: ../setup/setup.glade.h:26
++msgid "Next input method:"
++msgstr "B? g? k? ti?p:"
++
++#: ../setup/setup.glade.h:27
++msgid "Previous input method:"
++msgstr "B? g? tr??c:"
++
++#: ../setup/setup.glade.h:28
++msgid "Show language panel:"
++msgstr "Hi?n th? thanh ng?n ng?:"
++
++#: ../setup/setup.glade.h:29
++msgid "Start ibus on login"
++msgstr "Kh?i ??ng ibus khi ??ng nh?p"
++
++#: ../setup/setup.glade.h:30
++msgid "Use custom font"
++msgstr "D?ng ph?ng ch? t?y bi?n"
++
++#: ../data/ibus.schemas.in.h:1
++msgid "Auto Hide"
++msgstr "T? ??ng ?n"
++
++#: ../data/ibus.schemas.in.h:2
++msgid "Custom Font"
++msgstr "T?y bi?n ph?ng"
++
++#: ../data/ibus.schemas.in.h:3
++msgid "Custom font name for language panel"
++msgstr "T?y bi?n ph?ng cho thanh ng?n ng?"
++
++#: ../data/ibus.schemas.in.h:4
++msgid "Next Engine Hotkey"
++msgstr "Ph?m n?ng cho b? g? k? ti?p"
++
++#: ../data/ibus.schemas.in.h:5
++msgid "Next engine hotkey for switch to next input method engine"
++msgstr "Ph?m n?ng d?ng ?? chuy?n ??n b? g? k? ti?p"
++
++#: ../data/ibus.schemas.in.h:6
++msgid "Orientation of Lookup Table"
++msgstr "H??ng c?a b?ng tra c?u"
++
++#: ../data/ibus.schemas.in.h:7
++msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
++msgstr "H??ng c?a b?ng tra c?u. 0 = Ngang, 1 = D?c"
++
++#: ../data/ibus.schemas.in.h:8
++msgid "Preload Engines"
++msgstr "N?p tr??c b? g?"
++
++#: ../data/ibus.schemas.in.h:9
++msgid "Preload Engines during ibus starts up"
++msgstr "N?p tr??c b? g? trong khi kh?i ??ng ibus"
++
++#: ../data/ibus.schemas.in.h:10
++msgid "Prev Engine Hotkey"
++msgstr "Ph?m n?ng cho b? g? tr??c"
++
++#: ../data/ibus.schemas.in.h:11
++msgid "Prev engine hotkey for switch to previous input method engine"
++msgstr "Ph?m n?ng d?ng ?? chuy?n v? b? g? tr??c"
++
++#: ../data/ibus.schemas.in.h:12
++msgid "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show"
++msgstr "C?ch hi?n th? thanh ng?n ng?. 0 = Lu?n ?n, 1 = T?  ??ng ?n, 2 = Lu?n hi?n"
++
++#: ../data/ibus.schemas.in.h:13
++msgid "Trigger Hotkey"
++msgstr "Ph?m n?ng b?t/t?t"
++
++#: ../data/ibus.schemas.in.h:14
++msgid "Trigger hotkey for enable or disable input context"
++msgstr "Ph?m n?ng b?t/t?t d?ng ?? b?t ho?c t?t b? g?"
++
++#: ../data/ibus.schemas.in.h:15
++msgid "Use Custom Font"
++msgstr "D?ng ph?ng t?y bi?n"
++
++#: ../data/ibus.schemas.in.h:16
++msgid "Use custom font name for language panel"
++msgstr "D?ng ph?ng t?y bi?n cho thanh ng?n ng?"
++
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 45da441..aa96c46 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -132,7 +132,7 @@ libibus_la_LDFLAGS = \
+ 	@GOBJECT2_LIBS@ \
+ 	@GIO2_LIBS@ \
+ 	@DBUS_LIBS@ \
+-	-export-symbols-regex "ibus_.*"
++	-export-symbols-regex "ibus_.*" \
+ 	-version-info @LT_VERSION_INFO@ \
+ 	$(NULL)
+ 
+diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
+index d928898..cd5d73f 100644
+--- a/src/ibuslookuptable.c
++++ b/src/ibuslookuptable.c
+@@ -215,6 +215,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
+         g_return_val_if_fail (retval, FALSE);
+ 
+         ibus_lookup_table_append_candidate (table, text);
++        g_object_unref (text);
+     }
+ 
+     ibus_message_iter_next (iter);
+@@ -229,6 +230,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
+         g_return_val_if_fail (retval, FALSE);
+ 
+         ibus_lookup_table_append_label (table, text);
++        g_object_unref (text);
+     }
+ 
+     ibus_message_iter_next (iter);
+diff --git a/src/ibusproperty.c b/src/ibusproperty.c
+index ea5aca0..44a328e 100644
+--- a/src/ibusproperty.c
++++ b/src/ibusproperty.c
+@@ -118,6 +118,11 @@ ibus_property_destroy (IBusProperty *prop)
+         prop->tooltip = NULL;
+     }
+ 
++    if (prop->sub_props) {
++        g_object_unref (prop->sub_props);
++        prop->sub_props = NULL;
++    }
++
+     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
+ }
+ 


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ibus.spec	12 Jun 2009 06:10:26 -0000	1.38
+++ ibus.spec	10 Aug 2009 07:54:47 -0000	1.39
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090612
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -114,8 +114,8 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-# %patch0 -p1
-# ./autogen.sh --help
+%patch0 -p1
+./autogen.sh --help
 
 %build
 %configure --disable-static \
@@ -228,6 +228,13 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-2
+- Update ibus-HEAD.patch.
+- Fix memory leaks.
+- Update some translate
+- Fix typo in src/Makefile.am
+- Do not restore states when focus_in, if the engine is disabled.
+
 * Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
 - Update to Update to 1.1.0.20090612
 - Fix bug 504942 - PageUp and PageDown do not work in candidate list



From belegdol at fedoraproject.org  Mon Aug 10 08:00:03 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Mon, 10 Aug 2009 08:00:03 +0000 (UTC)
Subject: rpms/chemical-mime-data/F-10
	chemical-mime-data-0.1.94-turbomole.patch, NONE,
	1.1 chemical-mime-data.spec, 1.6, 1.7
Message-ID: <20090810080003.DA06011C0498@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/chemical-mime-data/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1238

Modified Files:
	chemical-mime-data.spec 
Added Files:
	chemical-mime-data-0.1.94-turbomole.patch 
Log Message:
* Mon Aug 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-7
- Enabled some turbomole mimetypes (RH #501177)


chemical-mime-data-0.1.94-turbomole.patch:
 chemical-mime-database.xml.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE chemical-mime-data-0.1.94-turbomole.patch ---
diff -up chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in
--- chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole	2009-08-10 09:37:06.000000000 +0200
+++ chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in	2009-08-10 09:40:57.000000000 +0200
@@ -1290,7 +1290,7 @@
 		<specification url="http://ca.expasy.org/sprot/userman.html"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-basis" support="no">
+	<mime-type type="chemical/x-turbomole-basis" support="yes">
 		<_comment>Turbomole Basis Set File</_comment>
 		<glob pattern="basis"/>
 		<sub-class-of type="text/plain"/>
@@ -1304,7 +1304,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-control" support="no">
+	<mime-type type="chemical/x-turbomole-control" support="yes">
 		<_comment>Turbomole Control File</_comment>
 		<glob pattern="control"/>
 		<sub-class-of type="text/plain"/>
@@ -1320,7 +1320,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/node230.html"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-coord" support="no">
+	<mime-type type="chemical/x-turbomole-coord" support="yes">
 		<_comment>Turbomole Coordinate File</_comment>
 		<glob pattern="coord"/>
 		<glob pattern="*.tmol"/>
@@ -1335,7 +1335,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-grad" support="no">
+	<mime-type type="chemical/x-turbomole-grad" support="yes">
 		<_comment>Turbomole Gradient File</_comment>
 		<glob pattern="gradient"/>
 		<sub-class-of type="text/plain"/>
@@ -1383,7 +1383,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-scfmo" support="no">
+	<mime-type type="chemical/x-turbomole-scfmo" support="yes">
 		<_comment>Turbomole SCF Molecular Orbital File</_comment>
 		<acronym>MO</acronym>
 		<expanded-acronym>Molecular Orbital</expanded-acronym>
@@ -1401,7 +1401,7 @@
 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
 	</mime-type>
 
-	<mime-type type="chemical/x-turbomole-vibrational" support="no">
+	<mime-type type="chemical/x-turbomole-vibrational" support="yes">
 		<_comment>Turbomole Vibrational Data File</_comment>
 		<glob pattern="???"/>
 		<sub-class-of type="text/plain"/>


Index: chemical-mime-data.spec
===================================================================
RCS file: /cvs/extras/rpms/chemical-mime-data/F-10/chemical-mime-data.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chemical-mime-data.spec	26 Aug 2007 07:26:50 -0000	1.6
+++ chemical-mime-data.spec	10 Aug 2009 08:00:02 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           chemical-mime-data
 Version:        0.1.94
-Release:        3%{?dist}
+Release:        7%{?dist}
 Summary:        Support for chemical/* MIME types
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/chemical-mime/
 Source0:        http://dl.sourceforge.net/chemical-mime/%{name}-%{version}.tar.bz2
+Patch0:         chemical-mime-data-0.1.94-turbomole.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,13 +31,16 @@ proposed in 1995, though it seems they h
 
 %prep
 %setup -q
+%patch0 -p1 -b .turbomole
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
 sed -i -e '/^libdir/d' chemical-mime-data.pc.in
 
 
 %build
 %configure --disable-update-database \
            --without-gnome-mime \
-           --without-pixmaps
+           --without-pixmaps \
+           --without-kde-mime
 make %{?_smp_mflags}
 
 
@@ -68,11 +72,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-chemical.png
 %{_datadir}/icons/hicolor/scalable/mimetypes/gnome-mime-chemical.svgz
 %{_datadir}/mime/packages/chemical-mime-data.xml
-%{_datadir}/mimelnk
 %{_datadir}/pkgconfig/chemical-mime-data.pc
 
 
 %changelog
+* Mon Aug 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-7
+- Enabled some turbomole mimetypes (RH #501177)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.94-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Mar 04 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-5
+- Dropped the KDE MIME .desktop files
+
+* Mon Feb 23 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-4
+- Convert the ChangeLog to utf-8
+
 * Sun Aug 26 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.94-3
 - Adjusted License tag as per latest guidelines
 



From scop at fedoraproject.org  Mon Aug 10 08:30:42 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:30:42 +0000 (UTC)
Subject: rpms/doxygen/devel doxygen.spec,1.66,1.67
Message-ID: <20090810083043.3457311C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7604

Modified Files:
	doxygen.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.5.9-3
- Convert specfile to UTF-8.



Index: doxygen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- doxygen.spec	24 Jul 2009 20:29:51 -0000	1.66
+++ doxygen.spec	10 Aug 2009 08:30:40 -0000	1.67
@@ -6,7 +6,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 Patch1: doxygen-1.5.8-config.patch
@@ -103,6 +103,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.5.9-3
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -322,7 +325,7 @@ rm -rf %{buildroot}
 * Wed Mar 14 2001 Jeff Johnson <jbj at redhat.com>
 - update to 1.2.6
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - rebuild
 
 * Tue Dec 26 2000 Than Ngo <than at redhat.com>



From scop at fedoraproject.org  Mon Aug 10 08:32:45 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:32:45 +0000 (UTC)
Subject: rpms/enscript/devel enscript.spec,1.42,1.43
Message-ID: <20090810083245.C082F11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/enscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8059

Modified Files:
	enscript.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.4-14
- Convert specfile to UTF-8.



Index: enscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- enscript.spec	24 Jul 2009 22:11:26 -0000	1.42
+++ enscript.spec	10 Aug 2009 08:32:45 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A plain ASCII to PostScript converter.
 Name: enscript
 Version: 1.6.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: Applications/Publishing
 Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
@@ -96,6 +96,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.4-14
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -221,7 +224,7 @@ fi
 * Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
 - Bump release + rebuild.
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Feb 27 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - langify
 
 * Wed Jul 12 2000 Prospector <bugzilla at redhat.com>



From scop at fedoraproject.org  Mon Aug 10 08:34:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:34:29 +0000 (UTC)
Subject: rpms/GConf2/devel GConf2.spec,1.110,1.111
Message-ID: <20090810083429.50A6511C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8498

Modified Files:
	GConf2.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.26.2-6
- Convert specfile to UTF-8.



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- GConf2.spec	24 Jul 2009 15:10:25 -0000	1.110
+++ GConf2.spec	10 Aug 2009 08:34:29 -0000	1.111
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.26.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.26/GConf-%{version}.tar.bz2
@@ -156,6 +156,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.26.2-6
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -643,7 +646,7 @@ fi
 * Fri Jul  6 2001 Alexander Larsson <alexl at redhat.com>
 - Install the .la files in the devel package.
 
-* Fri Jul  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jul  6 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Use %%{_tmppath}
 - Move the .so files to the devel subpackage
 - langify



From scop at fedoraproject.org  Mon Aug 10 08:36:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:36:07 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.194,1.195
Message-ID: <20090810083607.3D86D11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8902

Modified Files:
	gnome-vfs2.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.24.1-7
- Convert specfile to UTF-8.



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- gnome-vfs2.spec	4 Aug 2009 09:33:53 -0000	1.194
+++ gnome-vfs2.spec	10 Aug 2009 08:36:06 -0000	1.195
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -260,6 +260,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.24.1-7
+- Convert specfile to UTF-8.
+
 * Tue Aug  4 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-6
 - Backport some upstream patches
 
@@ -1088,7 +1091,7 @@ fi
 * Sun Jul 08 2001 Havoc Pennington <hp at redhat.com>
 - add desktop VFS module hack
 
-* Fri Jul  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jul  6 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Remove Distribution and Vendor
 - Make the config files noreplace
 - Move .so links to devel subpackage



From scop at fedoraproject.org  Mon Aug 10 08:39:17 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:39:17 +0000 (UTC)
Subject: rpms/fluxbox/devel fluxbox.spec,1.34,1.35
Message-ID: <20090810083917.C696211C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fluxbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9556

Modified Files:
	fluxbox.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-5
- Convert specfile to UTF-8.



Index: fluxbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- fluxbox.spec	24 Jul 2009 22:57:44 -0000	1.34
+++ fluxbox.spec	10 Aug 2009 08:39:16 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        1.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.1-5
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -219,22 +222,22 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-2
 - Fix build for GCC 3.4.
 
-* Mon Apr 26 2004 Arnaud Ab?lard
+* Mon Apr 26 2004 Arnaud Ab??lard
 - rebuilt against Fluxbox-0.9.9
 
-* Thu Jan 16 2004 Arnaud Ab?lard
+* Thu Jan 16 2004 Arnaud Ab??lard
 - now using artwiz-aleczapka as the artwiz-fonts
 
-* Thu Jan 16 2004 Arnaud Ab?lard
+* Thu Jan 16 2004 Arnaud Ab??lard
 - fixed a bug with the artwiz fonts
 
-* Thu Jan 15 2004 Arnaud Ab?lard
+* Thu Jan 15 2004 Arnaud Ab??lard
 - rebuilt against Fluxbox-0.9.8
 
-* Sun Jan 11 2004 Arnaud Ab?lard
+* Sun Jan 11 2004 Arnaud Ab??lard
 - Added Artwiz nice fonts
 
-* Sat Jan 10 2004 Arnaud Ab?lard
+* Sat Jan 10 2004 Arnaud Ab??lard
 - rebuild against Fluxbox-0.9.7
 
 * Sat Jan 11 2003 Che



From scop at fedoraproject.org  Mon Aug 10 08:42:40 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:42:40 +0000 (UTC)
Subject: rpms/fluxconf/devel fluxconf.spec,1.15,1.16
Message-ID: <20090810084240.56B1F11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fluxconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10209

Modified Files:
	fluxconf.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.9-8
- Convert specfile to UTF-8.



Index: fluxconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fluxconf.spec	24 Jul 2009 22:57:58 -0000	1.15
+++ fluxconf.spec	10 Aug 2009 08:42:39 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		fluxconf
 Version:	0.9.9
-Release:	7%{?dist}
+Release:	8%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.9-8
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -89,5 +92,5 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
-* Tue Jan 13 2004 Arnaud Ab?lard <arny at arny.org>
+* Tue Jan 13 2004 Arnaud Ab??lard <arny at arny.org>
 - Initial release



From scop at fedoraproject.org  Mon Aug 10 08:46:42 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:46:42 +0000 (UTC)
Subject: rpms/intltool/devel intltool.spec,1.56,1.57
Message-ID: <20090810084642.D956611C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/intltool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11712

Modified Files:
	intltool.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.40.6-4
- Convert specfile to UTF-8.



Index: intltool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- intltool.spec	25 Jul 2009 03:27:46 -0000	1.56
+++ intltool.spec	10 Aug 2009 08:46:37 -0000	1.57
@@ -4,7 +4,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
 Version: 0.40.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
 Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.40.6-4
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.40.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -279,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Aug  8 2001 Jonathan Blandford <jrb at redhat.com>
 - Fix bug #45699 and #50634 by upgrading version.
 
-* Mon Jul 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - s/Copyright/License/
 - Shorter summary
 - Remove empty post/postun scripts



From scop at fedoraproject.org  Mon Aug 10 08:47:59 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 08:47:59 +0000 (UTC)
Subject: rpms/irda-utils/devel irda-utils.spec,1.35,1.36
Message-ID: <20090810084759.BEF4B11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/irda-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12029

Modified Files:
	irda-utils.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.18-9
- Convert specfile to UTF-8.



Index: irda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- irda-utils.spec	25 Jul 2009 03:36:27 -0000	1.35
+++ irda-utils.spec	10 Aug 2009 08:47:58 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         8%{?dist}
+Release:         9%{?dist}
 Url:             http://irda.sourceforge.net/
 License:         GPLv2+
 Group:           Applications/System
@@ -96,6 +96,9 @@ fi
 %doc tekram/README.tekram
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.18-9
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.18-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -259,10 +262,10 @@ fi
 - fix start priority (345 isn't right...)
 - fix condrestart
 
-* Sun Jul 23 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Sun Jul 23 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - source files from /etc/rc.d/init.d
 
-* Sun Jul 23 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Sun Jul 23 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - don't prereq /etc/init.d anymore
 - rename "rh-status"
 - use %%{_tmppath}



From hedayat at fedoraproject.org  Mon Aug 10 08:56:41 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 10 Aug 2009 08:56:41 +0000 (UTC)
Subject: rpms/simspark/devel simspark-0.1-cmakefix.patch, 1.1,
	NONE simspark-0.1-devilfix.patch, 1.1, NONE
Message-ID: <20090810085641.E34F311C0344@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13588

Removed Files:
	simspark-0.1-cmakefix.patch simspark-0.1-devilfix.patch 
Log Message:
removed obsolete patches


--- simspark-0.1-cmakefix.patch DELETED ---


--- simspark-0.1-devilfix.patch DELETED ---



From scop at fedoraproject.org  Mon Aug 10 09:09:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:09:29 +0000 (UTC)
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 
	1.41, 1.42
Message-ID: <20090810090929.A9B4511C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/jakarta-commons-digester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15597

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.7-10.3
- Convert specfile to UTF-8.



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- jakarta-commons-digester.spec	25 Jul 2009 03:49:16 -0000	1.41
+++ jakarta-commons-digester.spec	10 Aug 2009 09:09:29 -0000	1.42
@@ -48,7 +48,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        9.3%{?dist}
+Release:        10.3%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        ASL 2.0
@@ -201,6 +201,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.7-10.3
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7-9.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -276,7 +279,7 @@ fi
 * Tue Mar 25 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> - 1.4.1-2jpp
 - for jpackage-utils 1.5
 
-* Mon Mar  3 2003 Ville Skytt? <ville.skytta at iki.fi> - 1.4.1-1jpp
+* Mon Mar  3 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1.4.1-1jpp
 - Update to 1.4.1.
 - No macros in URL and SourceX tags.
 - Run unit tests during build.



From scop at fedoraproject.org  Mon Aug 10 09:11:40 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:11:40 +0000 (UTC)
Subject: rpms/jlex/devel jlex.spec,1.19,1.20
Message-ID: <20090810091140.8AC8511C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/jlex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16057

Modified Files:
	jlex.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.6-9.3
- Convert specfile to UTF-8.



Index: jlex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- jlex.spec	25 Jul 2009 04:02:43 -0000	1.19
+++ jlex.spec	10 Aug 2009 09:11:40 -0000	1.20
@@ -36,7 +36,7 @@
 
 Name:           jlex
 Version:        1.2.6
-Release:        8.3%{?dist}
+Release:        9.3%{?dist}
 Epoch:		0
 Summary:        A Lexical Analyzer Generator for Java
 License:        BSD
@@ -136,6 +136,9 @@ fi
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.6-9.3
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.6-8.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -189,7 +192,7 @@ fi
 * Wed Mar 26 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org > 1.2.6-1jpp
 - for jpackage-utils 1.5
 
-* Tue Aug 20 2002 Ville Skytt? <ville.skytta at iki.fi> 1.2.5-5jpp
+* Tue Aug 20 2002 Ville Skytt?? <ville.skytta at iki.fi> 1.2.5-5jpp
 - Use the Xalan/XSLTC version (backwards-compatible with the official one).
 - Renamed jar to jlex.jar (was JLex.jar).
 - Some spec cleanup.



From scop at fedoraproject.org  Mon Aug 10 09:12:45 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:12:45 +0000 (UTC)
Subject: rpms/joystick/devel joystick.spec,1.21,1.22
Message-ID: <20090810091245.8541711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/joystick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16318

Modified Files:
	joystick.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.2.15-25
- Convert specfile to UTF-8.



Index: joystick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joystick/devel/joystick.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- joystick.spec	25 Jul 2009 04:07:42 -0000	1.21
+++ joystick.spec	10 Aug 2009 09:12:45 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring most popular joysticks.
 Name: joystick
 Version: 1.2.15
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 ExcludeArch: s390 s390x
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.2.15-25
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.15-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -105,7 +108,7 @@ rm -rf %{buildroot}
 * Tue Jun 19 2001 Florian La Roche <Florian.LaRoche at redhat.de>
 - add ExcludeArch: s390 s390x
 
-* Fri Mar  2 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Mar  2 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - New URL and location
 - fix docs
 - Patch it to use the 2.4 input headers, so it works again



From scop at fedoraproject.org  Mon Aug 10 09:14:18 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:14:18 +0000 (UTC)
Subject: rpms/kdbg/devel kdbg.spec,1.35,1.36
Message-ID: <20090810091418.8DFE711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kdbg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16635

Modified Files:
	kdbg.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.1.1-3
- Convert specfile to UTF-8.



Index: kdbg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdbg/devel/kdbg.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- kdbg.spec	25 Jul 2009 04:21:51 -0000	1.35
+++ kdbg.spec	10 Aug 2009 09:14:18 -0000	1.36
@@ -1,7 +1,7 @@
 Name: kdbg
 Summary: A GUI for gdb, the GNU debugger, and KDE
 Version: 2.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz
 # No version specified.
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %config (noreplace) %{_datadir}/config/kdbgrc
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.1.1-3
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -205,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 - update to 1.2.1
 - use %lang
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - rebuild
 
 * Tue Dec 26 2000 Than Ngo <than at redhat.com>



From scop at fedoraproject.org  Mon Aug 10 09:15:44 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:15:44 +0000 (UTC)
Subject: rpms/lapack/devel lapack.spec,1.21,1.22
Message-ID: <20090810091544.7D7DE11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/lapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16943

Modified Files:
	lapack.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 3.1.1-7
- Convert specfile to UTF-8.



Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- lapack.spec	25 Jul 2009 04:57:16 -0000	1.21
+++ lapack.spec	10 Aug 2009 09:15:44 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -187,6 +187,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 3.1.1-7
+- Convert specfile to UTF-8.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -284,7 +287,7 @@ rm -fr ${RPM_BUILD_ROOT}
 * Sun Nov 10 2002 Jeff Johnson <jbj at redhat.com> 3.0-19
 - rebuild with x86_64.
 
-* Thu Jul 18 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-18
+* Thu Jul 18 2002 Trond Eivind Glomsr??d <teg at redhat.com> 3.0-18
 - Remove an empty man page (#63569)
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -293,44 +296,44 @@ rm -fr ${RPM_BUILD_ROOT}
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed May  1 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-15
+* Wed May  1 2002 Trond Eivind Glomsr??d <teg at redhat.com> 3.0-15
 - Rebuild
 
-* Thu Feb 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-14
+* Thu Feb 21 2002 Trond Eivind Glomsr??d <teg at redhat.com> 3.0-14
 - Rebuild
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Aug 13 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-12
+* Mon Aug 13 2001 Trond Eivind Glomsr??d <teg at redhat.com> 3.0-12
 - The man-pages for xerbla and lsame were in blas-man and lapack-man (#51605)
 
-* Fri Jun  8 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun  8 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Reenable optimization for IA64
 
-* Fri May 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri May 25 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Add all patches from the LAPACK site as of 2001-05-25
 - Use this workaround for IA64 instead
 - Remove SPARC workaround
 - Don't exclude IA64
 
-* Thu Dec 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Dec 07 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - rebuild for main distribution
 
-* Mon Nov 20 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Nov 20 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - add the LAPACK Quick Reference Guide to the docs
 - add the BLAS Quick Reference Guide to the docs
 
-* Tue Aug 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Aug 01 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - fix lack of ldconfig in postuninstall script
 
 * Mon Jul 24 2000 Prospector <prospector at redhat.com>
 - rebuilt
 
-* Mon Jul 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 10 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - updated with the latest updates (new tarfile..) from netlib 
 
-* Thu Jun 15 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jun 15 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - use %%{_mandir}
 - added some flags to work around SPARC compiler bug
 
@@ -359,12 +362,12 @@ rm -fr ${RPM_BUILD_ROOT}
 * Fri Jul 17 1998 Jeff Johnson <jbj at redhat.com>
 - repackage for powertools.
 
-* Sun Feb 15 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Feb 15 1998 Trond Eivind Glomsr??d <teg at pvv.ntnu.no>
  [lapack-2.0-9]
  - No code updates, just built with a customized rpm -
    this should make dependencies right.
 
-* Sat Feb 07 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Feb 07 1998 Trond Eivind Glomsr??d <teg at pvv.ntnu.no>
  [lapack-2.0-8]
  - Total rewrite of the spec file
  - Added my own makefiles - libs should build better,
@@ -376,16 +379,16 @@ rm -fr ${RPM_BUILD_ROOT}
    (oh - and as always: Dedicated to the girl I
    love, Eline Skirnisdottir)
 
-* Sat Dec 06 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Dec 06 1997 Trond Eivind Glomsr??d <teg at pvv.ntnu.no>
  [lapack-2.0-7]
   - added a dependency to glibc, so people don't try with libc5
 
-* Thu Nov 20 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Thu Nov 20 1997 Trond Eivind Glomsr??d <teg at pvv.ntnu.no>
   [lapack-2.0-6]
   - removed etime.c
   - compiled with egcs, and for glibc 2.0
 
-* Sun Oct 12 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Oct 12 1997 Trond Eivind Glomsr??d <teg at pvv.ntnu.no>
   [lapack-2.0-5]
   - added a changelog
   - cleaned up building of shared libs



From scop at fedoraproject.org  Mon Aug 10 09:17:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:17:29 +0000 (UTC)
Subject: rpms/libksba/devel libksba.spec,1.35,1.36
Message-ID: <20090810091729.11E6911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libksba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17831

Modified Files:
	libksba.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6-3
- Convert specfile to UTF-8.



Index: libksba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- libksba.spec	25 Jul 2009 06:01:56 -0000	1.35
+++ libksba.spec	10 Aug 2009 09:17:28 -0000	1.36
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -92,6 +92,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.6-3
+- Convert specfile to UTF-8.
+
 * 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
 
@@ -180,12 +183,12 @@ fi
 * Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.9-0.fdr.1
 - 0.9.9
 
-* Thu Mar 20 2003 Ville Skytt? <ville.skytta at iki.fi> - 0.4.7-0.fdr.1
+* Thu Mar 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.7-0.fdr.1
 - Update to 0.4.7, and to current Fedora guidelines.
 - Exclude %%{_libdir}/*.la.
 
 * Tue Feb 12 2003 Warren Togami <warren at togami.com> 0.4.6-1.fedora.3
 - temporary workaround to lib/dir conflict problem
 
-* Sat Feb  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0.4.6-1.fedora.1
+* Sat Feb  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0.4.6-1.fedora.1
 - First Fedora release.



From scop at fedoraproject.org  Mon Aug 10 09:18:34 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:18:34 +0000 (UTC)
Subject: rpms/librsvg2/devel librsvg2.spec,1.75,1.76
Message-ID: <20090810091834.A551911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/librsvg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18284

Modified Files:
	librsvg2.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.26.0-3
- Convert specfile to UTF-8.



Index: librsvg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- librsvg2.spec	25 Jul 2009 08:33:29 -0000	1.75
+++ librsvg2.spec	10 Aug 2009 09:18:34 -0000	1.76
@@ -13,7 +13,7 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.26.0-3
+- Convert specfile to UTF-8.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -431,7 +434,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jul 09 2001 Havoc Pennington <hp at redhat.com>
 - put .la file back in package 
 
-* Fri Jul  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jul  6 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Put changelog at the end
 - Move .so files to devel subpackage
 - Don't mess with ld.so.conf



From scop at fedoraproject.org  Mon Aug 10 09:19:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:19:57 +0000 (UTC)
Subject: rpms/logjam/devel logjam.spec,1.56,1.57
Message-ID: <20090810091957.591B911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18597

Modified Files:
	logjam.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:4.5.3-35
- Convert specfile to UTF-8.



Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- logjam.spec	25 Jul 2009 11:14:50 -0000	1.56
+++ logjam.spec	10 Aug 2009 09:19:57 -0000	1.57
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	34%{?dist}
+Release:	35%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -143,6 +143,9 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:4.5.3-35
+- Convert specfile to UTF-8.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -403,5 +406,5 @@ rm -rf $RPM_BUILD_ROOT
  - Added fix for James Manning, Web Links browser launch
 * Tue Feb 13 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Upgraded to add GNOME build option.
-* Sun Oct 08 2000 Alexander Gr?fe <nachtfalke at retrogra.de>
+* Sun Oct 08 2000 Alexander Gr??fe <nachtfalke at retrogra.de>
  - inital version of the RPM.



From scop at fedoraproject.org  Mon Aug 10 09:21:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:21:30 +0000 (UTC)
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.329,1.330
Message-ID: <20090810092130.5D84F11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18956

Modified Files:
	mkinitrd.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6.0.92-3
- Convert specfile to UTF-8.



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -r1.329 -r1.330
--- mkinitrd.spec	25 Jul 2009 14:36:35 -0000	1.329
+++ mkinitrd.spec	10 Aug 2009 09:21:30 -0000	1.330
@@ -3,7 +3,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6.0.92-3
+- Convert specfile to UTF-8.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.92-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -1738,7 +1741,7 @@ rm -rf $RPM_BUILD_ROOT
 - grubby statically linked against popt [55305]
 - cleaned up verbose output a bit [21791]
 
-* Tue Dec 18 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Dec 18 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Add LVM module when LVM is used
 
 * Wed Sep  5 2001 Jeremy Katz <katzj at redhat.com>



From scop at fedoraproject.org  Mon Aug 10 09:22:48 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:22:48 +0000 (UTC)
Subject: rpms/psgml/devel psgml.spec,1.23,1.24
Message-ID: <20090810092248.C5BB911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/psgml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19290

Modified Files:
	psgml.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.2.5-11
- Convert specfile to UTF-8.



Index: psgml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psgml/devel/psgml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- psgml.spec	26 Jul 2009 19:34:06 -0000	1.23
+++ psgml.spec	10 Aug 2009 09:22:48 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A GNU Emacs major mode for editing SGML documents.
 name: psgml
 Version: 1.2.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 Prereq: sgml-common
 License: GPLv2+
 Source: ftp://ftp.lysator.liu.se/pub/sgml/psgml-%{version}.tar.gz
@@ -100,6 +100,9 @@ exit 0
 %{prefix}/share/sgml/cdtd
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.2.5-11
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -183,13 +186,13 @@ exit 0
 - Search catalog and /etc/sgml/catalog too.
 - Put cdtd in /usr/share/sgml not /usr/lib/sgml.
 
-* Thu Nov 30 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Nov 30 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - use new emacs init scheme
 
 * Mon Nov 13 2000 Tim Waugh <twaugh at redhat.com>
 - autoload xml-mode (bug #20602)
 
-* Thu Oct 19 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Oct 19 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - don't try to touch the site-start.el file
 - use %%{_tmppath}
 - don't %%define %%version above the "Version: " part



From scop at fedoraproject.org  Mon Aug 10 09:23:30 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:23:30 +0000 (UTC)
Subject: rpms/psutils/devel psutils.spec,1.22,1.23
Message-ID: <20090810092330.13D7111C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/psutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19428

Modified Files:
	psutils.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.17-33
- Convert specfile to UTF-8.



Index: psutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- psutils.spec	26 Jul 2009 19:36:38 -0000	1.22
+++ psutils.spec	10 Aug 2009 09:23:29 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 32%{dist}
+Release: 33%{dist}
 License: psutils
 Group: Applications/Publishing
 Source: psutils-p17.tar.gz
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.17-33
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -214,7 +217,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added patch to compile everything cleanly
 - Some minor changes to specfile
 
-* Thu Mar 27 1997 Tomasz K?oczko <kloczek at rudy.mif.pg.gda.pl>
+* Thu Mar 27 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
   - new version:
     Patchlevel 17 had some minor bugfixes and improvements
     - Trailer information now put before %%EOF comments if no %%Trailer



From scop at fedoraproject.org  Mon Aug 10 09:24:50 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:24:50 +0000 (UTC)
Subject: rpms/rarpd/devel rarpd.spec,1.27,1.28
Message-ID: <20090810092450.9C88811C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rarpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19828

Modified Files:
	rarpd.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - ss981107-30
- Convert specfile to UTF-8.



Index: rarpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarpd/devel/rarpd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- rarpd.spec	27 Jul 2009 02:48:01 -0000	1.27
+++ rarpd.spec	10 Aug 2009 09:24:50 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The RARP daemon.
 Name: rarpd
 Version: ss981107
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
@@ -80,6 +80,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - ss981107-30
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - ss981107-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -158,7 +161,7 @@ fi
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu Mar 15 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Mar 15 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - more generic i18n (#26555)
 
 * Mon Feb  5 2001 Bernhard Rosenkraenzer <bero at redhat.com>



From linuxdonald at fedoraproject.org  Mon Aug 10 09:28:09 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Mon, 10 Aug 2009 09:28:09 +0000 (UTC)
Subject: rpms/openal-soft/devel import.log, NONE, 1.1 openal-soft.patch, NONE,
	1.1 openal-soft.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810092809.E4F8A11C0344@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19893/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log openal-soft.patch openal-soft.spec 
Log Message:



--- NEW FILE import.log ---
openal-soft-1_8_466-6_fc11:HEAD:openal-soft-1.8.466-6.fc11.src.rpm:1249896240

openal-soft.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openal-soft.patch ---
--- CMakeLists.txt	2009-06-08 07:26:31.000000000 +0200
+++ CMakeLists.txt	2009-08-08 01:11:51.000000000 +0200
@@ -391,7 +391,7 @@
 # Needed for openal.pc.in
 SET(prefix ${CMAKE_INSTALL_PREFIX})
 SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/${LIB_INSTALL_DIR}")
+SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
 SET(bindir "\${exec_prefix}/bin")
 SET(includedir "\${prefix}/include")
 SET(PACKAGE_VERSION "${LIB_VERSION}")



--- NEW FILE openal-soft.spec ---
Name:		openal-soft
Version:	1.8.466
Release:	6%{?dist}
Summary:	Open Audio Library

Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://kcat.strangesoft.net/openal.html
Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
Patch1:		openal-soft.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	alsa-lib-devel
BuildRequires:	pulseaudio-libs-devel
BuildRequires:	portaudio-devel
BuildRequires:	cmake
Obsoletes: 	openal <= 0.0.10
Provides: 	openal = %{version}

%description
OpenAL Soft is a cross-platform software implementation of the OpenAL 3D
audio API. It's built off of the open-sourced Windows version available
originally from the SVN repository at openal.org. OpenAL provides
capabilities for playing audio in a virtual 3d environment. Distance
attenuation, doppler shift, and directional sound emitters are among
the features handled by the API. More advanced effects, including air
absorption, low-pass filters, and reverb, are available through the
EFX extension. It also facilitates streaming audio, multi-channel buffers,
and audio capture.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Obsoletes: 	openal-devel <= 0.0.10
Provides: 	openal-devel = %{version}

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch1 -p0 -b .orig

%build
%cmake .
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/openal-info
%{_libdir}/libopenal.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libopenal.so
%{_libdir}/pkgconfig/openal.pc

%changelog
* Sat Aug 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-6
- Fixed license and pkgconfig problem thx goes to Christoph Wickert

* Wed Aug 05 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-5
- Fixed Obsoletes: and Provides: sections

* Tue Aug 04 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-4
- Added Obsoletes: openal <= 0.0.9 and remove Conflicts: openal-devel

* Fri Jun 26 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-3
- Fixed all warnings of rpmlint

* Fri Jun 20 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-2
- Updatet the SPEC and SRPM file because openal-soft-devel conflicts with
openal-devel

* Fri Jun 20 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-1
- Initial release for Fedora

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:42:33 -0000	1.1
+++ .cvsignore	10 Aug 2009 09:28:08 -0000	1.2
@@ -0,0 +1 @@
+openal-soft-1.8.466.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:42:33 -0000	1.1
+++ sources	10 Aug 2009 09:28:09 -0000	1.2
@@ -0,0 +1 @@
+28d500e0a6b0a7a824b509ad9eaba7be  openal-soft-1.8.466.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 09:32:06 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 09:32:06 +0000 (UTC)
Subject: rpms/talk/devel talk.spec,1.25,1.26
Message-ID: <20090810093206.CA5A811C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/talk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21267

Modified Files:
	talk.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-33.2.4
- Convert specfile to UTF-8.



Index: talk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/talk/devel/talk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- talk.spec	27 Jul 2009 05:30:52 -0000	1.25
+++ talk.spec	10 Aug 2009 09:32:06 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Talk client for one-on-one Internet chatting.
 Name: talk
 Version: 0.17
-Release: 32.2.4
+Release: 33.2.4
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-%{version}.tar.gz
@@ -88,6 +88,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) /etc/xinetd.d/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.17-33.2.4
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-32.2.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -195,7 +198,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - FHS packaging.
 - update to 0.17-pre20000412.
 
-* Tue May 23 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue May 23 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - switch to xinetd
 
 * Tue May 16 2000 Chris Evans <chris at ferret.lmh.ox.ac.uk>



From twaugh at fedoraproject.org  Mon Aug 10 09:34:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 09:34:43 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.500,1.501
Message-ID: <20090810093443.CAF5311C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21766

Modified Files:
	cups.spec 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Clear out cache files on upgrade.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- cups.spec	7 Aug 2009 11:05:11 -0000	1.500
+++ cups.spec	10 Aug 2009 09:34:43 -0000	1.501
@@ -373,7 +373,7 @@ install -m644 %{SOURCE3} \
 	 --slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz \
 	 --initscript cups
 %endif
-rm -f %{_localstatedir}/cache/cups/*
+rm -f %{_localstatedir}/cache/cups/*.ipp %{_localstatedir}/cache/cups/*.cache
 exit 0
 
 %post libs -p /sbin/ldconfig



From twaugh at fedoraproject.org  Mon Aug 10 09:35:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 09:35:19 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.495,1.496
Message-ID: <20090810093519.1957311C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21904

Modified Files:
	cups.spec 
Log Message:
* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Clear out cache files on upgrade.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- cups.spec	7 Aug 2009 11:05:58 -0000	1.495
+++ cups.spec	10 Aug 2009 09:35:18 -0000	1.496
@@ -373,7 +373,7 @@ install -m644 %{SOURCE3} \
 	 --slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz \
 	 --initscript cups
 %endif
-rm -f %{_localstatedir}/cache/cups/*
+rm -f %{_localstatedir}/cache/cups/*.ipp %{_localstatedir}/cache/cups/*.cache
 exit 0
 
 %post libs -p /sbin/ldconfig



From twaugh at fedoraproject.org  Mon Aug 10 09:37:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 09:37:16 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3284.patch,NONE,1.1 cups.spec,1.501,1.502
Message-ID: <20090810093716.6610211C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22278

Modified Files:
	cups.spec 
Added Files:
	cups-str3284.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Fixed MIME type rules for image/jpeg and image/x-bitmap
  (bug #516438, STR #3284).


cups-str3284.patch:
 mime.types |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3284.patch ---
diff -up cups-1.4rc1/conf/mime.types.str3284 cups-1.4rc1/conf/mime.types
--- cups-1.4rc1/conf/mime.types.str3284	2009-05-17 00:48:35.000000000 +0100
+++ cups-1.4rc1/conf/mime.types	2009-08-10 10:32:46.887840076 +0100
@@ -95,7 +95,7 @@ application/vnd.hp-HPGL		hpgl \
 
 image/gif			gif string(0,GIF87a) string(0,GIF89a)
 image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
+image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
@@ -114,7 +114,7 @@ image/x-sun-raster		ras string(0,<59a66a
 
 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
+image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
 ########################################################################


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -p -r1.501 -r1.502
--- cups.spec	10 Aug 2009 09:34:43 -0000	1.501
+++ cups.spec	10 Aug 2009 09:37:15 -0000	1.502
@@ -63,6 +63,7 @@ Patch35: cups-cups-get-classes.patch
 Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
+Patch39: cups-str3284.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -226,6 +227,7 @@ module. 
 %patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3277
+%patch39 -p1 -b .str3284
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -520,7 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Fixed MIME type rules for image/jpeg and image/x-bitmap
+  (bug #516438, STR #3284).
 - Clear out cache files on upgrade.
 - Require acl.
 



From twaugh at fedoraproject.org  Mon Aug 10 09:38:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 09:38:00 +0000 (UTC)
Subject: rpms/cups/devel cups-str3284.patch,NONE,1.1 cups.spec,1.496,1.497
Message-ID: <20090810093800.511CA11C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22428

Modified Files:
	cups.spec 
Added Files:
	cups-str3284.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Fixed MIME type rules for image/jpeg and image/x-bitmap
  (bug #516438, STR #3284).


cups-str3284.patch:
 mime.types |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3284.patch ---
diff -up cups-1.4rc1/conf/mime.types.str3284 cups-1.4rc1/conf/mime.types
--- cups-1.4rc1/conf/mime.types.str3284	2009-05-17 00:48:35.000000000 +0100
+++ cups-1.4rc1/conf/mime.types	2009-08-10 10:32:46.887840076 +0100
@@ -95,7 +95,7 @@ application/vnd.hp-HPGL		hpgl \
 
 image/gif			gif string(0,GIF87a) string(0,GIF89a)
 image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
+image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
@@ -114,7 +114,7 @@ image/x-sun-raster		ras string(0,<59a66a
 
 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
+image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
 ########################################################################


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- cups.spec	10 Aug 2009 09:35:18 -0000	1.496
+++ cups.spec	10 Aug 2009 09:38:00 -0000	1.497
@@ -63,6 +63,7 @@ Patch35: cups-cups-get-classes.patch
 Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
+Patch39: cups-str3284.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -226,6 +227,7 @@ module. 
 %patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3277
+%patch39 -p1 -b .str3284
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -520,7 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Fixed MIME type rules for image/jpeg and image/x-bitmap
+  (bug #516438, STR #3284).
 - Clear out cache files on upgrade.
 - Require acl.
 



From schwab at fedoraproject.org  Mon Aug 10 09:56:05 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 10 Aug 2009 09:56:05 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.279, 1.280 glibc-fedora.patch, 1.313,
	1.314 glibc.spec, 1.406, 1.407 import.log, 1.22, 1.23 sources,
	1.304, 1.305
Message-ID: <20090810095605.E92AE11C0344@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26288/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- .cvsignore	3 Aug 2009 12:10:20 -0000	1.279
+++ .cvsignore	10 Aug 2009 09:56:03 -0000	1.280
@@ -1,2 +1,2 @@
-glibc-2.10-249-g4a13776-fedora.tar.bz2
-glibc-2.10-249-g4a13776.tar.bz2
+glibc-2.10-271-gefa0569-fedora.tar.bz2
+glibc-2.10-271-gefa0569.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   35 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 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/powerpc32/____longjmp_chk.S    |    8 
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/powerpc/powerpc64/____longjmp_chk.S    |    8 
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 59 files changed, 787 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- glibc-fedora.patch	3 Aug 2009 12:10:21 -0000	1.313
+++ glibc-fedora.patch	10 Aug 2009 09:56:03 -0000	1.314
@@ -1,6 +1,6 @@
---- glibc-2.10-249-g4a13776/ChangeLog
+--- glibc-2.10-271-gefa0569/ChangeLog
 +++ glibc-2.10.90-12/ChangeLog
-@@ -267,6 +267,11 @@
+@@ -374,6 +374,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -532,6 +537,16 @@
+@@ -639,6 +644,16 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -29,7 +29,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -8930,6 +8945,13 @@
+@@ -9037,6 +9052,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -43,7 +43,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9225,6 +9247,10 @@
+@@ -9332,6 +9354,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -54,7 +54,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10482,6 +10508,15 @@
+@@ -10589,6 +10615,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -70,7 +70,7 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-249-g4a13776/ChangeLog.15
+--- glibc-2.10-271-gefa0569/ChangeLog.15
 +++ glibc-2.10.90-12/ChangeLog.15
 @@ -477,6 +477,14 @@
  
@@ -137,7 +137,7 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-249-g4a13776/ChangeLog.16
+--- glibc-2.10-271-gefa0569/ChangeLog.16
 +++ glibc-2.10.90-12/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
@@ -310,7 +310,7 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-249-g4a13776/Makeconfig
+--- glibc-2.10-271-gefa0569/Makeconfig
 +++ glibc-2.10.90-12/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
@@ -328,7 +328,7 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-249-g4a13776/csu/Makefile
+--- glibc-2.10-271-gefa0569/csu/Makefile
 +++ glibc-2.10.90-12/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
@@ -340,7 +340,7 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-249-g4a13776/csu/elf-init.c
+--- glibc-2.10-271-gefa0569/csu/elf-init.c
 +++ glibc-2.10.90-12/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -366,7 +366,7 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-249-g4a13776/debug/tst-chk1.c
+--- glibc-2.10-271-gefa0569/debug/tst-chk1.c
 +++ glibc-2.10.90-12/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -396,7 +396,7 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-249-g4a13776/elf/ldconfig.c
+--- glibc-2.10-271-gefa0569/elf/ldconfig.c
 +++ glibc-2.10.90-12/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
@@ -479,7 +479,7 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-249-g4a13776/elf/tst-stackguard1.c
+--- glibc-2.10-271-gefa0569/elf/tst-stackguard1.c
 +++ glibc-2.10.90-12/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -505,15 +505,15 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-249-g4a13776/include/bits/stdlib-ldbl.h
+--- glibc-2.10-271-gefa0569/include/bits/stdlib-ldbl.h
 +++ glibc-2.10.90-12/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-249-g4a13776/include/bits/wchar-ldbl.h
+--- glibc-2.10-271-gefa0569/include/bits/wchar-ldbl.h
 +++ glibc-2.10.90-12/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-249-g4a13776/include/features.h
+--- glibc-2.10-271-gefa0569/include/features.h
 +++ glibc-2.10.90-12/include/features.h
 @@ -299,8 +299,13 @@
  #endif
@@ -531,7 +531,7 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-249-g4a13776/intl/locale.alias
+--- glibc-2.10-271-gefa0569/intl/locale.alias
 +++ glibc-2.10.90-12/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
@@ -542,7 +542,7 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-249-g4a13776/libio/stdio.h
+--- glibc-2.10-271-gefa0569/libio/stdio.h
 +++ glibc-2.10.90-12/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
@@ -557,7 +557,7 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-249-g4a13776/locale/iso-4217.def
+--- glibc-2.10-271-gefa0569/locale/iso-4217.def
 +++ glibc-2.10.90-12/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
@@ -650,7 +650,7 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-249-g4a13776/locale/programs/locarchive.c
+--- glibc-2.10-271-gefa0569/locale/programs/locarchive.c
 +++ glibc-2.10.90-12/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
@@ -683,7 +683,7 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-249-g4a13776/localedata/Makefile
+--- glibc-2.10-271-gefa0569/localedata/Makefile
 +++ glibc-2.10.90-12/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
@@ -693,7 +693,7 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-249-g4a13776/localedata/SUPPORTED
+--- glibc-2.10-271-gefa0569/localedata/SUPPORTED
 +++ glibc-2.10.90-12/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
@@ -736,7 +736,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-249-g4a13776/localedata/locales/cy_GB
+--- glibc-2.10-271-gefa0569/localedata/locales/cy_GB
 +++ glibc-2.10.90-12/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>"
@@ -752,7 +752,7 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-249-g4a13776/localedata/locales/en_GB
+--- glibc-2.10-271-gefa0569/localedata/locales/en_GB
 +++ glibc-2.10.90-12/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>"
@@ -765,7 +765,7 @@
  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-249-g4a13776/localedata/locales/no_NO
+--- glibc-2.10-271-gefa0569/localedata/locales/no_NO
 +++ glibc-2.10.90-12/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
@@ -837,7 +837,7 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-249-g4a13776/localedata/locales/zh_TW
+--- glibc-2.10-271-gefa0569/localedata/locales/zh_TW
 +++ glibc-2.10.90-12/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
@@ -866,7 +866,7 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-249-g4a13776/malloc/mcheck.c
+--- glibc-2.10-271-gefa0569/malloc/mcheck.c
 +++ glibc-2.10.90-12/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
@@ -943,7 +943,7 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-249-g4a13776/manual/libc.texinfo
+--- glibc-2.10-271-gefa0569/manual/libc.texinfo
 +++ glibc-2.10.90-12/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
@@ -954,7 +954,7 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-249-g4a13776/misc/sys/cdefs.h
+--- glibc-2.10-271-gefa0569/misc/sys/cdefs.h
 +++ glibc-2.10.90-12/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
@@ -999,7 +999,7 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-249-g4a13776/nis/nss
+--- glibc-2.10-271-gefa0569/nis/nss
 +++ glibc-2.10.90-12/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
@@ -1007,9 +1007,9 @@
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-249-g4a13776/nptl/ChangeLog
+--- glibc-2.10-271-gefa0569/nptl/ChangeLog
 +++ glibc-2.10.90-12/nptl/ChangeLog
-@@ -3636,6 +3636,15 @@
+@@ -3666,6 +3666,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1025,7 +1025,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4372,6 +4381,11 @@
+@@ -4402,6 +4411,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1037,7 +1037,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6446,6 +6460,11 @@
+@@ -6476,6 +6490,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1049,7 +1049,7 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-249-g4a13776/nptl/Makefile
+--- glibc-2.10-271-gefa0569/nptl/Makefile
 +++ glibc-2.10.90-12/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
@@ -1083,7 +1083,7 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-249-g4a13776/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-271-gefa0569/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 +++ glibc-2.10.90-12/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
@@ -1093,7 +1093,7 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-249-g4a13776/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-271-gefa0569/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 +++ glibc-2.10.90-12/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
@@ -1102,7 +1102,7 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-249-g4a13776/nptl/tst-stackguard1.c
+--- glibc-2.10-271-gefa0569/nptl/tst-stackguard1.c
 +++ glibc-2.10.90-12/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -1128,7 +1128,7 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-249-g4a13776/nscd/nscd.conf
+--- glibc-2.10-271-gefa0569/nscd/nscd.conf
 +++ glibc-2.10.90-12/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
@@ -1139,7 +1139,7 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-249-g4a13776/nscd/nscd.init
+--- glibc-2.10-271-gefa0569/nscd/nscd.init
 +++ glibc-2.10.90-12/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
@@ -1197,7 +1197,7 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-249-g4a13776/posix/Makefile
+--- glibc-2.10-271-gefa0569/posix/Makefile
 +++ glibc-2.10.90-12/posix/Makefile
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
@@ -1219,7 +1219,7 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-249-g4a13776/posix/getconf.speclist.h
+--- glibc-2.10-271-gefa0569/posix/getconf.speclist.h
 +++ glibc-2.10.90-12/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
@@ -1261,7 +1261,7 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-249-g4a13776/streams/Makefile
+--- glibc-2.10-271-gefa0569/streams/Makefile
 +++ glibc-2.10.90-12/streams/Makefile
 @@ -21,7 +21,7 @@
  #
@@ -1272,7 +1272,7 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-249-g4a13776/sysdeps/generic/dl-cache.h
+--- glibc-2.10-271-gefa0569/sysdeps/generic/dl-cache.h
 +++ glibc-2.10.90-12/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
@@ -1289,7 +1289,7 @@
  #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-249-g4a13776/sysdeps/i386/Makefile
+--- glibc-2.10-271-gefa0569/sysdeps/i386/Makefile
 +++ glibc-2.10.90-12/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
@@ -1315,7 +1315,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-249-g4a13776/sysdeps/ia64/Makefile
+--- glibc-2.10-271-gefa0569/sysdeps/ia64/Makefile
 +++ glibc-2.10.90-12/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
@@ -1328,7 +1328,7 @@
  endif
  endif
  
---- glibc-2.10-249-g4a13776/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-271-gefa0569/sysdeps/ia64/ia64libgcc.S
 +++ glibc-2.10.90-12/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -1681,7 +1681,7 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-249-g4a13776/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-271-gefa0569/sysdeps/ia64/libgcc-compat.c
 +++ glibc-2.10.90-12/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
@@ -1768,7 +1768,7 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-249-g4a13776/sysdeps/powerpc/powerpc32/____longjmp_chk.S
+--- glibc-2.10-271-gefa0569/sysdeps/powerpc/powerpc32/____longjmp_chk.S
 +++ glibc-2.10.90-12/sysdeps/powerpc/powerpc32/____longjmp_chk.S
 @@ -49,8 +49,16 @@
  #define CHECK_SP(reg) \
@@ -1787,7 +1787,7 @@
  .Lok:
  
  #include <__longjmp-common.S>
---- glibc-2.10-249-g4a13776/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-271-gefa0569/sysdeps/powerpc/powerpc64/Makefile
 +++ glibc-2.10.90-12/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
@@ -1797,7 +1797,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-249-g4a13776/sysdeps/powerpc/powerpc64/____longjmp_chk.S
+--- glibc-2.10-271-gefa0569/sysdeps/powerpc/powerpc64/____longjmp_chk.S
 +++ glibc-2.10.90-12/sysdeps/powerpc/powerpc64/____longjmp_chk.S
 @@ -32,8 +32,16 @@
  #define CHECK_SP(reg) \
@@ -1816,7 +1816,7 @@
  .Lok:
  
  #include <__longjmp-common.S>
---- glibc-2.10-249-g4a13776/sysdeps/unix/nice.c
+--- glibc-2.10-271-gefa0569/sysdeps/unix/nice.c
 +++ glibc-2.10.90-12/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
@@ -1832,7 +1832,7 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/check_pf.c
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
@@ -1849,7 +1849,7 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/dl-osinfo.h
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -1898,7 +1898,7 @@
      }
    else
  #endif
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/futimesat.c
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
@@ -1942,7 +1942,7 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/i386/clone.S
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
@@ -1962,7 +1962,7 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/i386/dl-cache.h
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
@@ -2024,7 +2024,7 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
@@ -2058,7 +2058,7 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2066,7 +2066,7 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2074,12 +2074,12 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 +++ glibc-2.10.90-12/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-249-g4a13776/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/netlinkaccess.h
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
@@ -2106,7 +2106,7 @@
  
  struct netlink_res
  {
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/paths.h
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
@@ -2117,7 +2117,7 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/tcsetattr.c
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
@@ -2164,7 +2164,7 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-249-g4a13776/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/x86_64/clone.S
 +++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
@@ -2184,7 +2184,7 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-249-g4a13776/timezone/zic.c
+--- glibc-2.10-271-gefa0569/timezone/zic.c
 +++ glibc-2.10.90-12/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- glibc.spec	3 Aug 2009 12:10:21 -0000	1.406
+++ glibc.spec	10 Aug 2009 09:56:04 -0000	1.407
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-249-g4a13776
+%define glibcsrcdir glibc-2.10-271-gefa0569
 %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: 12
+Release: 13
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -533,17 +533,6 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/d
 cp -a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.a \
   $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/*_p.a
-# Now strip debugging info from static libraries
-pushd $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
-for i in *.a; do
-  if [ -f $i ]; then
-    case "$i" in
-    *_p.a) ;;
-    *) strip -g -R .comment $i ;;
-    esac
-  fi
-done
-popd
 
 # rquota.x and rquota.h are now provided by quota
 rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
@@ -885,7 +874,7 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/ldcon
 %triggerin common -p /usr/sbin/tzdata-update -- tzdata
 
 %post devel
-/sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
 
 %pre headers
 # this used to be a link and it is causing nightmares now
@@ -895,7 +884,7 @@ fi
 
 %preun devel
 if [ "$1" = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir || :
+  /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %post utils -p /sbin/ldconfig
@@ -1037,6 +1026,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Aug 10 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-13
+- Update from master.
+  - fix rehashing of unique symbols (#515677)
+- Fix spurious messages with --excludedocs (#515948)
+
 * Mon Aug  3 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-12
 - Update from master.
   - fix fortify failure with longjmp from alternate stack (#512103)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- import.log	3 Aug 2009 12:10:21 -0000	1.22
+++ import.log	10 Aug 2009 09:56:04 -0000	1.23
@@ -20,3 +20,4 @@ glibc-2_10_90-9:HEAD:glibc-2.10.90-9.src
 glibc-2_10_90-10:HEAD:glibc-2.10.90-10.src.rpm:1248773458
 glibc-2_10_90-11:HEAD:glibc-2.10.90-11.src.rpm:1248961080
 glibc-2_10_90-12:HEAD:glibc-2.10.90-12.src.rpm:1249300698
+glibc-2_10_90-13:HEAD:glibc-2.10.90-13.src.rpm:1249897909


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- sources	3 Aug 2009 12:10:21 -0000	1.304
+++ sources	10 Aug 2009 09:56:04 -0000	1.305
@@ -1,2 +1,2 @@
-7cede3287354c69ce39cb51a5c93cd75  glibc-2.10-249-g4a13776-fedora.tar.bz2
-85ed0429bef20d29d0a7b17d33930f82  glibc-2.10-249-g4a13776.tar.bz2
+86e8369c526f7d5db7d49f934809e2ae  glibc-2.10-271-gefa0569-fedora.tar.bz2
+2a91b24cc1d16c795b50fe8f03853765  glibc-2.10-271-gefa0569.tar.bz2



From hedayat at fedoraproject.org  Mon Aug 10 09:57:05 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 10 Aug 2009 09:57:05 +0000 (UTC)
Subject: rpms/simspark/F-11 .cvsignore, 1.2, 1.3 simspark.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090810095705.C9F1411C0344@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26595

Modified Files:
	.cvsignore simspark.spec sources 
Log Message:
New upstream version: 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Mar 2009 06:57:31 -0000	1.2
+++ .cvsignore	10 Aug 2009 09:57:05 -0000	1.3
@@ -1 +1 @@
-simspark-0.1.tar.gz
+simspark-0.1.2.tar.gz


Index: simspark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-11/simspark.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- simspark.spec	22 Mar 2009 06:57:31 -0000	1.1
+++ simspark.spec	10 Aug 2009 09:57:05 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           simspark
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 Summary:        Spark physical simulation system
 
 Group:          Development/Libraries
 License:        GPLv2
 URL:            http://simspark.sourceforge.net
 Source0:        http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.1-cmakefix.patch
-Patch1:         %{name}-0.1-devilfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
@@ -40,8 +38,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .cmakefix
-%patch1 -p1 -b .devilfix
 
 %build
 mkdir build
@@ -86,6 +82,9 @@ rm -rf %{buildroot}
 %doc doc/devel/howtos doc/devel/manual.pdf
 
 %changelog
+* Mon Aug 10 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1.2-1
+- Updated to latest upstream release 0.1.2
+
 * Wed Mar 18 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1-3
 - fixed lib directory variable for cmake
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Mar 2009 06:57:31 -0000	1.2
+++ sources	10 Aug 2009 09:57:05 -0000	1.3
@@ -1 +1 @@
-94ef43347083d72d09ab33d89d486d55  simspark-0.1.tar.gz
+05fc85fe35e21cc7f6c7243d1743a97d  simspark-0.1.2.tar.gz



From hedayat at fedoraproject.org  Mon Aug 10 10:00:29 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 10 Aug 2009 10:00:29 +0000 (UTC)
Subject: rpms/simspark/F-10 .cvsignore, 1.1, 1.2 simspark.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090810100029.3376C11C0494@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27216

Modified Files:
	.cvsignore simspark.spec sources 
Log Message:
New upstream version: 0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Mar 2009 05:39:47 -0000	1.1
+++ .cvsignore	10 Aug 2009 10:00:28 -0000	1.2
@@ -0,0 +1 @@
+simspark-0.1.2.tar.gz


Index: simspark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-10/simspark.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- simspark.spec	22 Mar 2009 07:02:19 -0000	1.1
+++ simspark.spec	10 Aug 2009 10:00:28 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           simspark
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.1.2
+Release:        1%{?dist}
 Summary:        Spark physical simulation system
 
 Group:          Development/Libraries
 License:        GPLv2
 URL:            http://simspark.sourceforge.net
 Source0:        http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.1-cmakefix.patch
-Patch1:         %{name}-0.1-devilfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
@@ -40,8 +38,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .cmakefix
-%patch1 -p1 -b .devilfix
 
 %build
 mkdir build
@@ -86,6 +82,9 @@ rm -rf %{buildroot}
 %doc doc/devel/howtos doc/devel/manual.pdf
 
 %changelog
+* Mon Aug 10 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1.2-1
+- Updated to latest upstream release 0.1.2
+
 * Wed Mar 18 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1-3
 - fixed lib directory variable for cmake
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Mar 2009 07:02:19 -0000	1.2
+++ sources	10 Aug 2009 10:00:28 -0000	1.3
@@ -1 +1 @@
-94ef43347083d72d09ab33d89d486d55  simspark-0.1.tar.gz
+05fc85fe35e21cc7f6c7243d1743a97d  simspark-0.1.2.tar.gz



From hedayat at fedoraproject.org  Mon Aug 10 10:01:36 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 10 Aug 2009 10:01:36 +0000 (UTC)
Subject: rpms/simspark/F-10 simspark-0.1-cmakefix.patch, 1.1,
	NONE simspark-0.1-devilfix.patch, 1.1, NONE
Message-ID: <20090810100136.DC18911C0344@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27470

Removed Files:
	simspark-0.1-cmakefix.patch simspark-0.1-devilfix.patch 
Log Message:
removing patches


--- simspark-0.1-cmakefix.patch DELETED ---


--- simspark-0.1-devilfix.patch DELETED ---



From hedayat at fedoraproject.org  Mon Aug 10 10:02:37 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Mon, 10 Aug 2009 10:02:37 +0000 (UTC)
Subject: rpms/simspark/F-11 simspark-0.1-cmakefix.patch, 1.1,
	NONE simspark-0.1-devilfix.patch, 1.1, NONE
Message-ID: <20090810100237.7EAEF11C0344@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27634

Removed Files:
	simspark-0.1-cmakefix.patch simspark-0.1-devilfix.patch 
Log Message:
removing patches


--- simspark-0.1-cmakefix.patch DELETED ---


--- simspark-0.1-devilfix.patch DELETED ---



From mnowak at fedoraproject.org  Mon Aug 10 10:05:28 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Mon, 10 Aug 2009 10:05:28 +0000 (UTC)
Subject: rpms/libev/devel .cvsignore, 1.8, 1.9 import.log, 1.9,
	1.10 libev.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20090810100528.B51D211C0344@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28410/devel

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Jul 2009 20:44:56 -0000	1.8
+++ .cvsignore	10 Aug 2009 10:05:28 -0000	1.9
@@ -1 +1 @@
-libev-3.7.tar.gz
+libev-3.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	17 Jul 2009 20:44:56 -0000	1.9
+++ import.log	10 Aug 2009 10:05:28 -0000	1.10
@@ -7,3 +7,4 @@ libev-3_6-1_fc11:HEAD:libev-3.6-1.fc11.s
 libev-3_60-1_fc11:HEAD:libev-3.60-1.fc11.src.rpm:1246282750
 libev-3_70-1_fc11:HEAD:libev-3.70-1.fc11.src.rpm:1247825976
 libev-3_70-2_fc11:HEAD:libev-3.70-2.fc11.src.rpm:1247863439
+libev-3_80-1_fc11:HEAD:libev-3.80-1.fc11.src.rpm:1249898792


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/libev.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libev.spec	25 Jul 2009 05:35:06 -0000	1.11
+++ libev.spec	10 Aug 2009 10:05:28 -0000	1.12
@@ -1,8 +1,8 @@
-%define version_upstream 3.7
+%define version_upstream 3.8
 
 Name:		libev
-Version:	3.70
-Release:	3%{?dist}
+Version:	3.80
+Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
 Group:		System Environment/Libraries
@@ -12,7 +12,7 @@ Source0:	http://dist.schmorp.de/libev/At
 Source1:	%{name}.pc.in
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	automake17
+BuildRequires:	automake libtool
 
 %description
 Libev is modelled (very losely) after libevent and the Event perl
@@ -38,8 +38,8 @@ featureful. And also smaller. Developmen
 cp -p %{SOURCE1} .
 sed -i.pkgconfig -e 's|Makefile|Makefile libev.pc|' configure.ac configure
 sed -i.pkgconfig -e 's|lib_LTLIBRARIES|pkgconfigdir = $(libdir)/pkgconfig\n\npkgconfig_DATA = libev.pc\n\nlib_LTLIBRARIES|' Makefile.am Makefile.in
-automake-1.7
-#touch -r
+aclocal
+automake
 
 
 %build
@@ -85,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 10 2009 Michal Nowak <mnowak at redhat.com> - 3.80-1
+- 3.8
+- always use the most recent automake
+- BuildRequires now libtool
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.70-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Jul 2009 20:44:57 -0000	1.8
+++ sources	10 Aug 2009 10:05:28 -0000	1.9
@@ -1 +1 @@
-8ad575ba379e3304b9b8b7e60a4ac0e0  libev-3.7.tar.gz
+4897453c077056769777d43e5495ded1  libev-3.8.tar.gz



From scop at fedoraproject.org  Mon Aug 10 10:06:01 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:06:01 +0000 (UTC)
Subject: rpms/sip/devel sip.spec,1.63,1.64
Message-ID: <20090810100601.1BFDA11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28636

Modified Files:
	sip.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 4.8.2-2
- Convert specfile to UTF-8.



Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sip.spec	28 Jul 2009 12:55:58 -0000	1.63
+++ sip.spec	10 Aug 2009 10:06:00 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
 License: Python
 Group: Development/Tools
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 4.8.2-2
+- Convert specfile to UTF-8.
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.8.2-1
 - sip-4.8.2
 
@@ -330,7 +333,7 @@ rm -rf %{buildroot}
 * Mon Jul 23 2001 Than Ngo <than at redhat.com>
 - fix build dependency (bug #49698)
 
-* Mon Jul 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - s/Copyright/License/
 - Make devel subpackage depend on main
 



From scop at fedoraproject.org  Mon Aug 10 10:07:08 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:07:08 +0000 (UTC)
Subject: rpms/splint/devel splint.spec,1.13,1.14
Message-ID: <20090810100708.D1E2711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/splint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28953

Modified Files:
	splint.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 3.1.2-5
- Convert specfile to UTF-8.



Index: splint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/splint/devel/splint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- splint.spec	27 Jul 2009 04:41:40 -0000	1.13
+++ splint.spec	10 Aug 2009 10:07:08 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 3.1.2-5
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -140,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
 - Bump release + rebuild.
 
-* Thu Feb 15 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Feb 15 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - <time.h> fix
 
 * Mon Dec 11 2000 Bill Nottingham <notting at redhat.com>



From scop at fedoraproject.org  Mon Aug 10 10:10:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:10:15 +0000 (UTC)
Subject: rpms/switchdesk/devel switchdesk.spec,1.43,1.44
Message-ID: <20090810101015.3FE6C11C0494@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/switchdesk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29633

Modified Files:
	switchdesk.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.9-4.3
- Convert specfile to UTF-8.



Index: switchdesk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/switchdesk/devel/switchdesk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- switchdesk.spec	27 Jul 2009 05:13:50 -0000	1.43
+++ switchdesk.spec	10 Aug 2009 10:10:15 -0000	1.44
@@ -2,7 +2,7 @@
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
 Version: 4.0.9
-Release: %{_release}%{?dist}.2
+Release: %{_release}%{?dist}.3
 Source: %{name}-%{version}-%{_release}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.9-4.3
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.9-4.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -227,13 +230,13 @@ rm -rf %{buildroot}
 * Tue Apr 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.9.8-2
 - Rebuild
 
-* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.9.8-1
+* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 3.9.8-1
 - Update translations
 
 * Tue Aug 28 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.9.7-1
 - Fix i18n (Patch from kmaraas at online.no, #52717)
 
-* Tue Aug 28 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.9.6-1
+* Tue Aug 28 2001 Trond Eivind Glomsr??d <teg at redhat.com> 3.9.6-1
 - Translation update
 
 * Mon Mar 19 2001 Tim Powers <timp at redhat.com>
@@ -246,7 +249,7 @@ rm -rf %{buildroot}
 * Thu Mar  8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
 - Remove dependency on kdesupport, we don't actually use it
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - rebuild
 - add buildprereqs
 



From scop at fedoraproject.org  Mon Aug 10 10:11:20 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:11:20 +0000 (UTC)
Subject: rpms/system-config-kickstart/devel system-config-kickstart.spec,
	1.82, 1.83
Message-ID: <20090810101120.2C00F11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/system-config-kickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29901

Modified Files:
	system-config-kickstart.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.8.1-2
- Convert specfile to UTF-8.



Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- system-config-kickstart.spec	29 Jul 2009 03:15:30 -0000	1.82
+++ system-config-kickstart.spec	10 Aug 2009 10:11:20 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files
 Name: system-config-kickstart
 Version: 2.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
@@ -68,6 +68,9 @@ fi
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.8.1-2
+- Convert specfile to UTF-8.
+
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> - 2.8.1-1
 - Change the skipx blurb to make more sense (#493835).
 - Update to using python-meh for exception handling instead of rhpl.
@@ -662,7 +665,7 @@ fi
 * Mon May 13 2002 Brent Fox <bfox at redhat.com> 2.0-8
 - Fixed bug #64835 to make UK keyboard 'uk' not 'gb'
 
-* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.0-7
+* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 2.0-7
 - Update translations
 
 * Thu Apr 11 2002 Brent Fox <bfox at redhat.com>



From pkgdb at fedoraproject.org  Mon Aug 10 10:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 10:12:02 +0000
Subject: [pkgdb] ghex ownership updated
Message-ID: <20090810101202.A2BC210F897@bastion2.fedora.phx.redhat.com>

Package ghex in Fedora devel is now owned by dodji

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Mon Aug 10 10:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 10:12:13 +0000
Subject: [pkgdb] ghex ownership updated
Message-ID: <20090810101214.2A6AF10F8AF@bastion2.fedora.phx.redhat.com>

Package ghex in Fedora 11 is now owned by dodji

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Mon Aug 10 10:12:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 10:12:17 +0000
Subject: [pkgdb] ghex ownership updated
Message-ID: <20090810101217.C6BD210F8B5@bastion2.fedora.phx.redhat.com>

Package ghex in Fedora 10 is now owned by dodji

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From scop at fedoraproject.org  Mon Aug 10 10:13:22 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:13:22 +0000 (UTC)
Subject: rpms/velocity/devel velocity.spec,1.27,1.28
Message-ID: <20090810101322.9374011C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30406

Modified Files:
	velocity.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4-10.4
- Convert specfile to UTF-8.



Index: velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- velocity.spec	27 Jul 2009 06:49:50 -0000	1.27
+++ velocity.spec	10 Aug 2009 10:13:22 -0000	1.28
@@ -37,7 +37,7 @@
 
 Name:           velocity
 Version:        1.4
-Release:        9.4%{?dist}
+Release:        10.4%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
@@ -287,6 +287,9 @@ fi
 #%endif
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4-10.4
+- Convert specfile to UTF-8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.4-9.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -377,7 +380,7 @@ fi
 - Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
   build problems.
 
-* Sun May 25 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:1.3.1-2jpp
+* Sun May 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-2jpp
 - Add Epochs to dependencies.
 - Add explicit defattrs.
 - Add non-versioned javadoc symlinks.



From scop at fedoraproject.org  Mon Aug 10 10:15:41 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:15:41 +0000 (UTC)
Subject: rpms/werken-xpath/devel werken-xpath.spec,1.10,1.11
Message-ID: <20090810101541.EFD7011C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/werken-xpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30919

Modified Files:
	werken-xpath.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.9.4-4.beta.12.3
- Convert specfile to UTF-8.



Index: werken-xpath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/werken-xpath/devel/werken-xpath.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- werken-xpath.spec	27 Jul 2009 07:10:39 -0000	1.10
+++ werken-xpath.spec	10 Aug 2009 10:15:41 -0000	1.11
@@ -38,7 +38,7 @@
 
 Name:           werken-xpath
 Version:        0.9.4
-Release:        3.beta.12.3
+Release:        4.beta.12.3
 Epoch:          0
 Summary:        XPath implementation using JDOM
 # Worth noting that this ASL 1.1 has slightly different wording.
@@ -201,6 +201,9 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.9.4-4.beta.12.3
+- Convert specfile to UTF-8.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.9.4-3.beta.12.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -242,7 +245,7 @@ fi
 * Thu Jan 22 2004 David Walluck <david at anti-microsoft.org> 0:0.9.4-0.beta.8jpp
 - use oldjdom
 
-* Sun May 25 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:0.9.4-0.beta.7jpp
+* Sun May 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.9.4-0.beta.7jpp
 - Add Epochs to dependencies.
 - Add non-versioned javadoc symlinks.
 - Add Distribution tag.
@@ -250,7 +253,7 @@ fi
 * Fri May 23 2003 Richard Bullington-McGuire <rbulling at pkrinternet.com> - 0.9.4-0.beta.6jpp
 - Reworked spec file for JPackage 1.5 release
 
-* Sun Mar  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0.9.4-0.beta.5jpp
+* Sun Mar  2 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.4-0.beta.5jpp
 - Fix Group, License and Distribution tags.
 - Patched to work with recent JDOM versions.
 - Run unit tests during build.



From scop at fedoraproject.org  Mon Aug 10 10:16:49 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:16:49 +0000 (UTC)
Subject: rpms/yp-tools/devel yp-tools.spec,1.27,1.28
Message-ID: <20090810101649.8022711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/yp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224

Modified Files:
	yp-tools.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.9-8
- Convert specfile to UTF-8.



Index: yp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yp-tools/devel/yp-tools.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- yp-tools.spec	27 Jul 2009 08:55:27 -0000	1.27
+++ yp-tools.spec	10 Aug 2009 10:16:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
 Version: 2.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/yp
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.9-8
+- Convert specfile to UTF-8.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -144,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
 - Bump release + rebuild.
 
-* Mon Feb 26 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Feb 26 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - langify
 
 * Wed Sep 27 2000 Florian La Roche <Florian.LaRoche at redhat.de>



From jreznik at fedoraproject.org  Mon Aug 10 10:19:36 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 10 Aug 2009 10:19:36 +0000 (UTC)
Subject: rpms/kdesvn/devel .cvsignore, 1.30, 1.31 kdesvn.spec, 1.58,
	1.59 sources, 1.29, 1.30
Message-ID: <20090810101936.773B911C0344@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdesvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31965

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
- Update to 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	16 Jul 2009 21:47:20 -0000	1.30
+++ .cvsignore	10 Aug 2009 10:19:36 -0000	1.31
@@ -1 +1 @@
-kdesvn-1.3.2.tar.bz2
+kdesvn-1.4.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- kdesvn.spec	25 Jul 2009 04:29:44 -0000	1.58
+++ kdesvn.spec	10 Aug 2009 10:19:36 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           kdesvn
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
 Group:          Development/Tools
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
+- Update to 1.4.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	16 Jul 2009 21:47:20 -0000	1.29
+++ sources	10 Aug 2009 10:19:36 -0000	1.30
@@ -1 +1 @@
-5a1687130df00f878c96e55265b3c654  kdesvn-1.3.2.tar.bz2
+e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2



From markmc at fedoraproject.org  Mon Aug 10 10:24:13 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 10 Aug 2009 10:24:13 +0000 (UTC)
Subject: rpms/libvirt/devel
	libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch, NONE,
	1.1 libvirt.spec, 1.164, 1.165
Message-ID: <20090810102413.146A711C0344@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv925

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch 
Log Message:
* Mon Aug 10 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-3
- Don't fail to start network if ipv6 modules is not loaded


libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch:
 network_driver.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch ---
From: Mark McLoughlin <markmc at redhat.com>
Subject: [PATCH] Handle kernels with no ipv6 support

If the ipv6 kernel module is not loaded, then we get this when starting
a virtual network:

  libvir: Network Config error :
  cannot enable /proc/sys/net/ipv6/conf/virbr0/disable_ipv6:
  No such file or directory

If disable_ipv6 is not present, we should just merrily continue on our
way.

* src/network_driver.c: make networkDisableIPV6() not fail if the kernel
  has no ipv6 support
---
 src/network_driver.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/network_driver.c b/src/network_driver.c
index eaea454..84910ab 100644
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -801,6 +801,12 @@ static int networkDisableIPV6(virConnectPtr conn,
         goto cleanup;
     }
 
+    if (access(field, W_OK) < 0 && errno == ENOENT) {
+        VIR_DEBUG("ipv6 appears to already be disabled on %s", network->def->bridge);
+        ret = 0;
+        goto cleanup;
+    }
+
     if (virFileWriteStr(field, "1") < 0) {
         virReportSystemError(conn, errno,
                              _("cannot enable %s"), field);
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- libvirt.spec	6 Aug 2009 15:01:49 -0000	1.164
+++ libvirt.spec	10 Aug 2009 10:24:12 -0000	1.165
@@ -78,7 +78,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -86,6 +86,9 @@ Source: libvirt-%{version}.tar.gz
 # Make sure qemu can access kernel/initrd (bug #516034)
 Patch01: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
 
+# Don't fail to start network if ipv6 modules is not loaded
+Patch02: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
+
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
 Patch200: libvirt-0.6.4-svirt-sound.patch
@@ -256,6 +259,7 @@ of recent versions of Linux (and other O
 %setup -q
 
 %patch01 -p1
+%patch02 -p1
 
 %patch200 -p0
 
@@ -617,6 +621,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 10 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-3
+- Don't fail to start network if ipv6 modules is not loaded
+
 * Thu Aug  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-2
 - Make sure qemu can access kernel/initrd (bug #516034)
 - Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)



From rhughes at fedoraproject.org  Mon Aug 10 10:27:03 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 10 Aug 2009 10:27:03 +0000 (UTC)
Subject: rpms/DeviceKit-power/F-11 .cvsignore, 1.12,
	1.13 DeviceKit-power.spec, 1.16, 1.17 sources, 1.13,
	1.14 DeviceKit-power-007-make-suspend-sync.patch, 1.1, NONE
Message-ID: <20090810102703.A295A11C0344@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1596

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Removed Files:
	DeviceKit-power-007-make-suspend-sync.patch 
Log Message:
* Mon Aug 10 2009 Richard Hughes  <rhughes at redhat.com> - 010-0.3.20090810git
- Update to a git snapshot
- Should fix detection of some UPS devices
- Do not stop polling if the battery status is guessed
- Fixes #513014



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Jul 2009 15:54:09 -0000	1.12
+++ .cvsignore	10 Aug 2009 10:27:03 -0000	1.13
@@ -1 +1 @@
-DeviceKit-power-010-20090721.tar.gz
+DeviceKit-power-010-20090810.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-11/DeviceKit-power.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- DeviceKit-power.spec	21 Jul 2009 19:51:47 -0000	1.16
+++ DeviceKit-power.spec	10 Aug 2009 10:27:03 -0000	1.17
@@ -4,12 +4,12 @@
 %define DeviceKit_version       002
 %define polkit_version          0.8
 %define parted_version          1.8.8
-%define alphatag                20090721
+%define alphatag                20090810
 
 Summary: Power Management Service
 Name: DeviceKit-power
 Version: 010
-Release: 0.2.%{?alphatag}git%{?dist}
+Release: 0.3.%{?alphatag}git%{?dist}
 #Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -113,6 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug 10 2009 Richard Hughes  <rhughes at redhat.com> - 010-0.3.20090810git
+- Update to a git snapshot
+- Should fix detection of some UPS devices
+- Do not stop polling if the battery status is guessed
+- Fixes #513014
+
 * Tue Jul 21 2009 Richard Hughes  <rhughes at redhat.com> - 010-0.2.20090721git
 - Update to todays git snapshot which detects hibernate properly, and may
   fix battery refreshing when the power state is changed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Jul 2009 19:51:47 -0000	1.13
+++ sources	10 Aug 2009 10:27:03 -0000	1.14
@@ -1 +1 @@
-cee884a47ba13cc1df027d88a1d43582  DeviceKit-power-010-20090721.tar.gz
+9f5a982b9dd4311386833a9935688c8b  DeviceKit-power-010-20090810.tar.gz


--- DeviceKit-power-007-make-suspend-sync.patch DELETED ---



From npajkovs at fedoraproject.org  Mon Aug 10 10:30:47 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 10 Aug 2009 10:30:47 +0000 (UTC)
Subject: rpms/tcl/devel tcl-8.5.7-sigabrt.patch,NONE,1.1 tcl.spec,1.92,1.93
Message-ID: <20090810103047.1079A11C0494@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/tcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2340

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.5.7-sigabrt.patch 
Log Message:
Enable SELinix policy for libtcl and fix sigabort bug

tcl-8.5.7-sigabrt.patch:
 tclTrace.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tcl-8.5.7-sigabrt.patch ---
diff -ruNp tcl8.5.7/generic/tclTrace.c tcl8.5.7-master/generic/tclTrace.c
--- tcl8.5.7/generic/tclTrace.c	2008-10-08 16:52:39.000000000 +0200
+++ tcl8.5.7-master/generic/tclTrace.c	2009-08-06 09:43:03.000000000 +0200
@@ -909,7 +909,8 @@ TraceVariableObjCmd(
 	    }
 	    ctvarPtr->traceCmdInfo.length = length;
 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
-	    strcpy(ctvarPtr->traceCmdInfo.command, command);
+	    //strcpy(ctvarPtr->traceCmdInfo.command, command);
+        memcpy(ctvarPtr->traceCmdInfo.command, command, length );
 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
 	    ctvarPtr->traceInfo.clientData = (ClientData)
 		    &ctvarPtr->traceCmdInfo;


Index: tcl.spec
===================================================================
RCS file: /cvs/extras/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- tcl.spec	28 Jul 2009 10:55:00 -0000	1.92
+++ tcl.spec	10 Aug 2009 10:30:46 -0000	1.93
@@ -5,7 +5,7 @@
 Summary: Tool Command Language, pronounced tickle
 Name: tcl
 Version: %{vers}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: TCL
 Group: Development/Languages
@@ -19,7 +19,7 @@ Provides: tcl-tcldict = %{vers}
 Patch0: tcl-8.5.1-autopath.patch
 Patch1: tcl-8.5.0-conf.patch
 Patch2: tcl-8.5.0-hidden.patch
-Patch3: pic.patch
+Patch3: tcl-8.5.7-sigabrt.patch
 
 %if %sdt
 BuildRequires: systemtap-sdt-devel
@@ -57,7 +57,7 @@ chmod -x generic/tclThreadAlloc.c
 %patch0 -p1 -b .autopath
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .hidden
-%patch3 -p1 -b .next_pic
+%patch3 -p1 -b .sigabrt
 
 %build
 pushd unix
@@ -67,7 +67,8 @@ autoconf
 --enable-dtrace \
 %endif
 --disable-threads \
---enable-symbols
+--enable-symbols \
+--enable-shared
 
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
@@ -111,10 +112,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{nam
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-#SELinux policy reloc problem with libtcl8.5.so
-chcon -t textrel_shlib_t $RPM_BUILD_ROOT%{_libdir}/lib%{name}%{majorver}.so
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -140,6 +138,10 @@ chcon -t textrel_shlib_t $RPM_BUILD_ROOT
 %{_libdir}/%{name}8.5/%{name}Config.sh
 
 %changelog
+* Mon Aug 10 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 1:8.5.7-4
+- Enable SEPolicy for libtcl. 
+- fix sigabort
+
 * Tue Jul 28 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 1:8.5.7-3
 - 513997 fixed. SELinux policy problem with libtcl8.5.so
 



From markmc at fedoraproject.org  Mon Aug 10 10:32:29 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 10 Aug 2009 10:32:29 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.165,1.166
Message-ID: <20090810103229.26B0E11C0344@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2708

Modified Files:
	libvirt.spec 
Log Message:
Add bz number 516497 for reference



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- libvirt.spec	10 Aug 2009 10:24:12 -0000	1.165
+++ libvirt.spec	10 Aug 2009 10:32:28 -0000	1.166
@@ -86,7 +86,7 @@ Source: libvirt-%{version}.tar.gz
 # Make sure qemu can access kernel/initrd (bug #516034)
 Patch01: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
 
-# Don't fail to start network if ipv6 modules is not loaded
+# Don't fail to start network if ipv6 modules is not loaded (bug #516497)
 Patch02: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
 
 # Temporary hack till PulseAudio autostart problems are sorted
@@ -622,7 +622,7 @@ fi
 
 %changelog
 * Mon Aug 10 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-3
-- Don't fail to start network if ipv6 modules is not loaded
+- Don't fail to start network if ipv6 modules is not loaded (#516497)
 
 * Thu Aug  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-2
 - Make sure qemu can access kernel/initrd (bug #516034)



From scop at fedoraproject.org  Mon Aug 10 10:38:05 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:38:05 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.58,1.59
Message-ID: <20090810103805.D91DF11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3988

Modified Files:
	gnash.spec 
Log Message:
Point to upstream bz2 tarball in commented out Source0.


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- gnash.spec	9 Aug 2009 18:54:39 -0000	1.58
+++ gnash.spec	10 Aug 2009 10:38:05 -0000	1.59
@@ -11,7 +11,7 @@ Summary:        GNU flash movie player
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-#Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
+#Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
 Source0:        %{name}-%{version}.%{alphatag}.tar.gz
 Source1:        http://www.getgnash.org/gnash-splash.swf
 Source2:        gnash.desktop



From scop at fedoraproject.org  Mon Aug 10 10:42:16 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:42:16 +0000 (UTC)
Subject: rpms/vdr-wapd/devel vdr-wapd.spec,1.10,1.11
Message-ID: <20090810104216.E84C611C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-wapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4854

Modified Files:
	vdr-wapd.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.9-8.patch1
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-wapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-wapd/devel/vdr-wapd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- vdr-wapd.spec	27 Jul 2009 06:48:23 -0000	1.10
+++ vdr-wapd.spec	10 Aug 2009 10:42:16 -0000	1.11
@@ -1,14 +1,14 @@
 # TODO: should be proxy friendlier by using relative URLs!
 
-%define pname     wapd
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
+%global pname     wapd
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global configdir %(vdr-config --configdir  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)
 
 Name:           vdr-%{pname}
 Version:        0.9
-Release:        7.patch1%{?dist}
+Release:        8.patch1%{?dist}
 Summary:        WAP remote control interface for VDR
 
 Group:          Applications/Multimedia
@@ -25,7 +25,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  vdr-devel >= 1.4.4
 BuildRequires:  gawk
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 The wapd plugin enables VDR to be remotely controlled using a WML interface
@@ -73,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.9-8.patch1
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-7.patch1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Mon Aug 10 10:44:55 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:44:55 +0000 (UTC)
Subject: rpms/vdr-ttxtsubs/devel vdr-ttxtsubs.spec,1.12,1.13
Message-ID: <20090810104455.AF94E11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-ttxtsubs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5399

Modified Files:
	vdr-ttxtsubs.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-3
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-ttxtsubs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/vdr-ttxtsubs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- vdr-ttxtsubs.spec	27 Jul 2009 06:47:58 -0000	1.12
+++ vdr-ttxtsubs.spec	10 Aug 2009 10:44:55 -0000	1.13
@@ -1,12 +1,12 @@
-%define pname     ttxtsubs
-%define vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     ttxtsubs
+%global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
 Version:        0.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 Group:          Applications/Multimedia
@@ -18,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 This VDR plugin implements displaying, recording and replaying
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.9-3
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Aug 10 10:45:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 10:45:40 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3285.patch,NONE,1.1 cups.spec,1.502,1.503
Message-ID: <20090810104540.ED17411C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5618

Modified Files:
	cups.spec 
Added Files:
	cups-str3285.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Fixed cupsGetNamedDest() so it does not fall back to the default
  printer when a destination has been named (bug #516439, STR #3285).


cups-str3285.patch:
 dest.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3285.patch ---
diff -up cups-1.4rc1/cups/dest.c.str3285 cups-1.4rc1/cups/dest.c
--- cups-1.4rc1/cups/dest.c.str3285	2009-08-10 11:32:08.397714492 +0100
+++ cups-1.4rc1/cups/dest.c	2009-08-10 11:32:14.143839210 +0100
@@ -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 != NULL)
       return (NULL);
 
    /*
@@ -557,7 +557,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
     * configuration file does not exist.  Find out the real default.
     */
 
-    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
+    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, NULL, 0, &dest))
       return (NULL);
   }
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -p -r1.502 -r1.503
--- cups.spec	10 Aug 2009 09:37:15 -0000	1.502
+++ cups.spec	10 Aug 2009 10:45:40 -0000	1.503
@@ -64,6 +64,7 @@ Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
+Patch40: cups-str3285.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -228,6 +229,7 @@ module. 
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
+%patch40 -p1 -b .str3285
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -523,6 +525,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Fixed cupsGetNamedDest() so it does not fall back to the default
+  printer when a destination has been named (bug #516439, STR #3285).
 - Fixed MIME type rules for image/jpeg and image/x-bitmap
   (bug #516438, STR #3284).
 - Clear out cache files on upgrade.



From scop at fedoraproject.org  Mon Aug 10 10:46:20 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:46:20 +0000 (UTC)
Subject: rpms/vdr-sudoku/devel vdr-sudoku.spec,1.17,1.18
Message-ID: <20090810104620.E879911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-sudoku/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5757

Modified Files:
	vdr-sudoku.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.4-4
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-sudoku.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/vdr-sudoku.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vdr-sudoku.spec	27 Jul 2009 06:47:32 -0000	1.17
+++ vdr-sudoku.spec	10 Aug 2009 10:46:20 -0000	1.18
@@ -1,12 +1,12 @@
-%define pname     sudoku
-%define vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     sudoku
+%global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
 Version:        0.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Sudoku plugin for VDR
 
 Group:          Amusements/Games
@@ -19,7 +19,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  vdr-devel >= 1.3.47
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 This is a VDR plugin to generate and solve number place puzzles, so
@@ -81,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.4-4
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Aug 10 10:47:04 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 10:47:04 +0000 (UTC)
Subject: rpms/cups/devel cups-str3285.patch,NONE,1.1 cups.spec,1.497,1.498
Message-ID: <20090810104704.4312E11C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6000

Modified Files:
	cups.spec 
Added Files:
	cups-str3285.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Fixed cupsGetNamedDest() so it does not fall back to the default
  printer when a destination has been named (bug #516439, STR #3285).


cups-str3285.patch:
 dest.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3285.patch ---
diff -up cups-1.4rc1/cups/dest.c.str3285 cups-1.4rc1/cups/dest.c
--- cups-1.4rc1/cups/dest.c.str3285	2009-08-10 11:32:08.397714492 +0100
+++ cups-1.4rc1/cups/dest.c	2009-08-10 11:32:14.143839210 +0100
@@ -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 != NULL)
       return (NULL);
 
    /*
@@ -557,7 +557,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
     * configuration file does not exist.  Find out the real default.
     */
 
-    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
+    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, NULL, 0, &dest))
       return (NULL);
   }
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- cups.spec	10 Aug 2009 09:38:00 -0000	1.497
+++ cups.spec	10 Aug 2009 10:47:04 -0000	1.498
@@ -64,6 +64,7 @@ Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
+Patch40: cups-str3285.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -228,6 +229,7 @@ module. 
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
+%patch40 -p1 -b .str3285
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -523,6 +525,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Fixed cupsGetNamedDest() so it does not fall back to the default
+  printer when a destination has been named (bug #516439, STR #3285).
 - Fixed MIME type rules for image/jpeg and image/x-bitmap
   (bug #516438, STR #3284).
 - Clear out cache files on upgrade.



From sergiopr at fedoraproject.org  Mon Aug 10 10:48:24 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Mon, 10 Aug 2009 10:48:24 +0000 (UTC)
Subject: rpms/loki-lib/devel .cvsignore, 1.2, 1.3 loki-lib.spec, 1.7,
	1.8 sources, 1.2, 1.3 loki-gcc43.patch, 1.1,
	NONE loki-makefile-test-parallel.patch, 1.1,
	NONE loki-makefile-test.patch, 1.1, NONE loki-makefile.patch,
	1.1, NONE
Message-ID: <20090810104824.8CCE011C0344@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/loki-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6328

Modified Files:
	.cvsignore loki-lib.spec sources 
Removed Files:
	loki-gcc43.patch loki-makefile-test-parallel.patch 
	loki-makefile-test.patch loki-makefile.patch 
Log Message:
* Thu Aug 06 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-2
- Sources uploaded
- All patches removed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jul 2007 19:36:26 -0000	1.2
+++ .cvsignore	10 Aug 2009 10:48:24 -0000	1.3
@@ -1 +1 @@
-loki-0.1.6.tar.gz
+loki-0.1.7.tar.gz


Index: loki-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/devel/loki-lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- loki-lib.spec	4 Aug 2009 16:52:42 -0000	1.7
+++ loki-lib.spec	10 Aug 2009 10:48:24 -0000	1.8
@@ -2,13 +2,13 @@
 %define majorversion 0
 Name: %{upname}-lib
 Version: 0.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Loki C++ Library of design patterns and idioms
 
 Group: Development/Libraries
 License: MIT
 URL: http://sourceforge.net/projects/loki-lib
-Source0: http://prdownloads.sourceforge.net/loki-lib/%{upname}-%{version}.tar.bz2
+Source0: http://prdownloads.sourceforge.net/loki-lib/%{upname}-%{version}.tar.gz
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/ldconfig
@@ -40,7 +40,7 @@ rm doc/html/installdox
 iconv -f ISO88591 -t utf8 CHANGES -o CHANGES
 
 %build
-make %{?_smp_mflags} CXXFLAGS="%{optflags}" LDLIBS="-lstdc++ -lc" build-shared
+make %{?_smp_mflags} CXXFLAGS="%{optflags}" build-static build-shared
 (cd lib && ln -s lib%{upname}.so.%{version} lib%{upname}.so)
 (cd lib && ln -s lib%{upname}.so.%{version} lib%{upname}.so.%{majorversion})
 
@@ -51,7 +51,7 @@ mkdir -p %{buildroot}%{_libdir}
 cp -a lib/lib%{upname}.* %{buildroot}%{_libdir}
 
 %check
-make %{?_smp_mflags} CXXFLAGS="%{optflags}" -C test
+make %{?_smp_mflags} CXXFLAGS="%{optflags}" check
 
 %clean
 rm -rf %{buildroot}
@@ -70,12 +70,17 @@ rm -rf %{buildroot}
 %doc CHANGES
 %{_includedir}/*
 %{_libdir}/*.so
+%exclude %{_libdir}/*.a
 
 %files doc
 %defattr(-,root,root,-)
 %doc doc/html doc/flex doc/yasli
 
 %changelog
+* Thu Aug 06 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-2
+- Sources uploaded
+- All patches removed
+
 * Mon Jul 27 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.7-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jul 2007 19:36:26 -0000	1.2
+++ sources	10 Aug 2009 10:48:24 -0000	1.3
@@ -1 +1 @@
-319ca3012a4290dcc27db621cf365f71  loki-0.1.6.tar.gz
+005d79581fbe888ceabd65d46c99c8b1  loki-0.1.7.tar.gz


--- loki-gcc43.patch DELETED ---


--- loki-makefile-test-parallel.patch DELETED ---


--- loki-makefile-test.patch DELETED ---


--- loki-makefile.patch DELETED ---



From scop at fedoraproject.org  Mon Aug 10 10:48:59 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:48:59 +0000 (UTC)
Subject: rpms/vdr-remote/devel vdr-remote.spec,1.4,1.5
Message-ID: <20090810104859.B05C711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-remote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6472

Modified Files:
	vdr-remote.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-8
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-remote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-remote/devel/vdr-remote.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vdr-remote.spec	27 Jul 2009 06:46:28 -0000	1.4
+++ vdr-remote.spec	10 Aug 2009 10:48:59 -0000	1.5
@@ -1,11 +1,11 @@
-%define pname     remote
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%define vdr_group %(vdr-config --group      2>/dev/null || echo ERROR)
+%global pname     remote
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global vdr_group %(vdr-config --group      2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
 Version:        0.4.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extended remote control plugin for VDR
 
 Group:          Applications/Multimedia
@@ -22,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  vdr-devel >= 1.3.47
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 Requires:       udev
 
 %description
@@ -92,27 +92,31 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-8
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-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.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu Oct 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-5
+* Thu Oct 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-5
 - First Fedora build (#466974).
 - Add specfile comments about patch statuses.
 - Prune pre-0.4.0 %%changelog entries.
 
-* Sat Oct 25 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-4
+* Sat Oct 25 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-4
 - Use ATTRS, not SYSFS in example udev rules.
 
-* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-3
+* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-3
 - Fix install of localizations when built with 1.6.x.
 - Add example udev rules file, improve sysconfig snippet docs.
 
 * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.0-2
 - rebuild
 
-* Tue Apr  8 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-1
+* Tue Apr  8 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.0-1
 - 0.4.0.
 - Build for VDR 1.6.0.



From scop at fedoraproject.org  Mon Aug 10 10:51:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:51:15 +0000 (UTC)
Subject: rpms/vdr-osdteletext/devel vdr-osdteletext.spec,1.16,1.17
Message-ID: <20090810105115.806F511C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-osdteletext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7718

Modified Files:
	vdr-osdteletext.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-3
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vdr-osdteletext.spec	27 Jul 2009 06:46:14 -0000	1.16
+++ vdr-osdteletext.spec	10 Aug 2009 10:51:15 -0000	1.17
@@ -1,12 +1,12 @@
-%define pname     osdteletext
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define cachedir  %(vdr-config --cachedir   2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
+%global pname     osdteletext
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global cachedir  %(vdr-config --cachedir   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)
 
 Name:           vdr-%{pname}
 Version:        0.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
@@ -18,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 The OSD teletext plugin displays teletext directly on VDR's on-screen
@@ -71,43 +71,47 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-3
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jun  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-1
+* Thu Jun  4 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.3-1
 - Update to 0.8.3.
 
-* Tue May 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.2-1
+* Tue May 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.2-1
 - Update to 0.8.2.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Jan 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.1-1
+* Sun Jan 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.1-1
 - 0.8.1.
 - Trim pre-Fedora %%changelog entries.
 
-* Sun Dec 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.7.0-1
+* Sun Dec 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.7.0-1
 - 0.7.0.
 
-* Sun Dec 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.6.0-1
+* Sun Dec 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.6.0-1
 - 0.6.0 (new community upstream), patches applied upstream.
 
-* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-31
+* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-31
 - Apply VDR 1.5+ patch from e-tobi.net Debian package.
 - Build for VDR 1.6.0.
 
-* Sat Feb 16 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-30
+* Sat Feb 16 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-30
 - Rebuild.
 
-* Wed Aug 22 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-29
+* Wed Aug 22 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-29
 - BuildRequires: gawk for extracting APIVERSION.
 
-* Tue Aug  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-28
+* Tue Aug  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-28
 - License: GPLv2+
 
-* Sun Jan  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-27
+* Sun Jan  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-27
 - Rebuild for VDR 1.4.5.
 
-* Sun Nov 12 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-26
+* Sun Nov 12 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-26
 - First FE build.



From jreznik at fedoraproject.org  Mon Aug 10 10:51:35 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 10 Aug 2009 10:51:35 +0000 (UTC)
Subject: rpms/kdesvn/F-11 .cvsignore, 1.29, 1.30 kdesvn.spec, 1.56,
	1.57 sources, 1.28, 1.29
Message-ID: <20090810105135.A4F9111C0344@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdesvn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7742

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
- Update to 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	24 Apr 2009 16:48:16 -0000	1.29
+++ .cvsignore	10 Aug 2009 10:51:35 -0000	1.30
@@ -1 +1 @@
-kdesvn-1.3.0.tar.bz2
+kdesvn-1.4.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/kdesvn.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- kdesvn.spec	24 Apr 2009 16:48:16 -0000	1.56
+++ kdesvn.spec	10 Aug 2009 10:51:35 -0000	1.57
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.3.0
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
+- Update to 1.4.0
+
 * Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
 - Update to 1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	24 Apr 2009 16:48:16 -0000	1.28
+++ sources	10 Aug 2009 10:51:35 -0000	1.29
@@ -1 +1 @@
-141f0be28086fd3e031a2d9dcac3479d  kdesvn-1.3.0.tar.bz2
+e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 10:53:43 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 10:53:43 +0000 (UTC)
Subject: rpms/vdr-femon/devel vdr-femon.spec,1.21,1.22
Message-ID: <20090810105343.2BB1A11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-femon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8311

Modified Files:
	vdr-femon.spec 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-3
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-femon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/vdr-femon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- vdr-femon.spec	27 Jul 2009 06:45:59 -0000	1.21
+++ vdr-femon.spec	10 Aug 2009 10:53:42 -0000	1.22
@@ -1,10 +1,10 @@
-%define pname     femon
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     femon
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
 Version:        1.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DVB frontend status monitor plugin for VDR
 
 Group:          Applications/Multimedia
@@ -16,7 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 DVB frontend status monitor is a plugin that displays some signal
@@ -61,34 +61,38 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-3
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun Jun 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-1
+* Sun Jun 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.7-1
 - Update to 1.6.7.
 - Trim pre-1.6.0 %%changelog entries.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Jan  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.6-1
+* Wed Jan  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.6-1
 - 1.6.6.
 
-* Wed Dec 17 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.5-1
+* Wed Dec 17 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.5-1
 - 1.6.5.
 
-* Sun Nov 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.4-1
+* Sun Nov 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.4-1
 - 1.6.4.
 
-* Mon Nov 10 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.3-1
+* Mon Nov 10 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.3-1
 - 1.6.3.
 
-* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.2-1
+* Tue Oct 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.2-1
 - 1.6.2.
 
-* Sun Jun 22 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.1-1
+* Sun Jun 22 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.1-1
 - 1.6.1.
 
-* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.0-1
+* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.6.0-1
 - 1.6.0.
 - Build for VDR 1.6.0.



From mcrha at fedoraproject.org  Mon Aug 10 10:54:54 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 10 Aug 2009 10:54:54 +0000 (UTC)
Subject: rpms/evolution-mapi/devel .cvsignore, 1.11, 1.12 evolution-mapi.spec,
	1.15, 1.16 sources, 1.11, 1.12
Message-ID: <20090810105454.8B49211C0344@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8571

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Log Message:
* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 0.27.90-1
- Update to 0.27.90




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Jul 2009 18:41:12 -0000	1.11
+++ .cvsignore	10 Aug 2009 10:54:54 -0000	1.12
@@ -1 +1 @@
-evolution-mapi-0.27.5.tar.bz2
+evolution-mapi-0.27.90.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- evolution-mapi.spec	28 Jul 2009 10:12:04 -0000	1.15
+++ evolution-mapi.spec	10 Aug 2009 10:54:54 -0000	1.16
@@ -11,8 +11,8 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.27.5
-Release: 2%{?dist}
+Version: 0.27.90
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 0.27.90-1
+- Update to 0.27.90
+
 * Tue Jul 28 2009 Milan Crha <mcrha at redhat.com> - 0.27.5-2
 - Add new libebookbackendmapigal.so to a list of installed files.
 - Bump requirement of evolution and evolution-data-server to 2.27.5.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Jul 2009 18:41:12 -0000	1.11
+++ sources	10 Aug 2009 10:54:54 -0000	1.12
@@ -1 +1 @@
-b85ab0d834579f3d42c1513e227d3583  evolution-mapi-0.27.5.tar.bz2
+7ed859e1519af29cfbe9a8cdbb4723ef  evolution-mapi-0.27.90.tar.bz2



From jreznik at fedoraproject.org  Mon Aug 10 10:55:07 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 10 Aug 2009 10:55:07 +0000 (UTC)
Subject: rpms/kdesvn/F-10 .cvsignore, 1.27, 1.28 kdesvn.spec, 1.51,
	1.52 sources, 1.27, 1.28
Message-ID: <20090810105507.2CA7511C0344@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdesvn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8629

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
- Update to 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	24 Apr 2009 16:48:16 -0000	1.27
+++ .cvsignore	10 Aug 2009 10:55:06 -0000	1.28
@@ -1 +1 @@
-kdesvn-1.3.0.tar.bz2
+kdesvn-1.4.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/kdesvn.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- kdesvn.spec	24 Apr 2009 16:48:16 -0000	1.51
+++ kdesvn.spec	10 Aug 2009 10:55:07 -0000	1.52
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.3.0
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
+- Update to 1.4.0
+
 * Fri Apr 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
 - Update to 1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	24 Apr 2009 16:48:16 -0000	1.27
+++ sources	10 Aug 2009 10:55:07 -0000	1.28
@@ -1 +1 @@
-141f0be28086fd3e031a2d9dcac3479d  kdesvn-1.3.0.tar.bz2
+e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2



From victorv at fedoraproject.org  Mon Aug 10 11:06:07 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Mon, 10 Aug 2009 11:06:07 +0000 (UTC)
Subject: rpms/netbeans-javaparser/devel .cvsignore, 1.3, 1.4 import.log, 1.1,
	1.2 netbeans-javaparser.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090810110607.92F8A11C0344@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-javaparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10453/devel

Modified Files:
	.cvsignore import.log netbeans-javaparser.spec sources 
Log Message:
Re-base for NetBeans 6.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Jan 2009 15:55:12 -0000	1.3
+++ .cvsignore	10 Aug 2009 11:06:07 -0000	1.4
@@ -1 +1 @@
-nb-javac-6.5.tar.gz
+nb-javac-6.7.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Aug 2008 11:08:36 -0000	1.1
+++ import.log	10 Aug 2009 11:06:07 -0000	1.2
@@ -1 +1,2 @@
 netbeans-javaparser-6_1-2_fc10:HEAD:netbeans-javaparser-6.1-2.fc10.src.rpm:1220008091
+netbeans-javaparser-6_7_1-1_fc12:HEAD:netbeans-javaparser-6.7.1-1.fc12.src.rpm:1249902689


Index: netbeans-javaparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/netbeans-javaparser.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netbeans-javaparser.spec	25 Jul 2009 18:01:47 -0000	1.4
+++ netbeans-javaparser.spec	10 Aug 2009 11:06:07 -0000	1.5
@@ -2,8 +2,8 @@
 %define __jar_repack %{nil}
 
 Name:           netbeans-javaparser
-Version:        6.5
-Release:        3%{?dist}
+Version:        6.7.1
+Release:        1%{?dist}
 Summary:        NetBeans Java Parser
 License:        GPLv2 with exceptions
 Url:            http://java.netbeans.org/javaparser/
@@ -12,8 +12,8 @@ Group:          Development/Libraries
 # following commands to generate the tarball:
 # hg clone http://hg.netbeans.org/main/nb-javac/
 # cd nb-javac/
-# hg update -r release65_base
-# tar -czvf ../nb-javac-6.5.tar.gz .
+# hg update -r 17cd0b404436
+# tar -czvf ../nb-javac-6.7.1.tar.gz .
 Source0:        nb-javac-%{version}.tar.gz
 
 BuildRequires:  ant
@@ -26,7 +26,6 @@ Requires:       jpackage-utils
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Provides:       libnb-javaparser-java = 6.1
 
 %description
 Java parser to analyse Java source files inside of the NetBeans IDE
@@ -34,24 +33,24 @@ Java parser to analyse Java source files
 %prep
 %setup -q -c
 # remove all binary libs
-find . -name "*.jar" -exec %{__rm} -f {} \;
+find . -name "*.jar" -exec %__rm -f {} \;
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
-ant -f make/netbeans/nb-javac/build.xml jar
+%ant -f make/netbeans/nb-javac/build.xml jar
 
 %install
-%{__rm} -fr %{buildroot}
+%__rm -fr %{buildroot}
 
 # jar
-%{__install} -d -m 755 %{buildroot}%{_javadir}
-%{__install} -m 644 make/netbeans/nb-javac/dist/javac-api.jar %{buildroot}%{_javadir}/%{name}-api-%{version}.jar
-%{__ln_s} %{name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar
-%{__install} -m 644 make/netbeans/nb-javac/dist/javac-impl.jar %{buildroot}%{_javadir}/%{name}-impl-%{version}.jar
-%{__ln_s} %{name}-impl-%{version}.jar %{buildroot}%{_javadir}/%{name}-impl.jar
+%__install -d -m 755 %{buildroot}%{_javadir}
+%__install -m 644 make/netbeans/nb-javac/dist/javac-api.jar %{buildroot}%{_javadir}/%{name}-api-%{version}.jar
+%__ln_s %{name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar
+%__install -m 644 make/netbeans/nb-javac/dist/javac-impl.jar %{buildroot}%{_javadir}/%{name}-impl-%{version}.jar
+%__ln_s %{name}-impl-%{version}.jar %{buildroot}%{_javadir}/%{name}-impl.jar
 
 %clean
-%{__rm} -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -60,11 +59,8 @@ ant -f make/netbeans/nb-javac/build.xml 
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Dec 24 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
+- re-base 6.7.1
 
 * Wed Dec 24 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.5-1
 - New vesion of sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Jan 2009 15:55:12 -0000	1.3
+++ sources	10 Aug 2009 11:06:07 -0000	1.4
@@ -1 +1 @@
-2e899df9e15daffe0f3eb18ff9041907  nb-javac-6.5.tar.gz
+46227fb35a1120fd9f53b8c4a28fe4e8  nb-javac-6.7.1.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 10 11:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:08:51 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810110851.1A8F510F882@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:08:52 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810110852.62C4810F89A@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:08:53 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810110853.71AC810F8B4@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:08:54 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810110854.4950E10F8B7@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:08:58 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810110859.02AD810F8BB@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:08:59 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810110859.AA0EA10F8BE@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:00 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810110901.2839910F8C3@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:00 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810110901.4D38B10F8C4@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:02 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810110902.E460810F8C2@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:03 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810110903.E1F2110F872@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:05 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810110905.3922B10F8CD@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:24 +0000
Subject: [pkgdb] jna: konradm has requested commit
Message-ID: <20090810110924.9B22B10F897@bastion2.fedora.phx.redhat.com>

konradm has requested the commit acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:25 +0000
Subject: [pkgdb] jna: konradm has requested watchcommits
Message-ID: <20090810110926.5593310F8D0@bastion2.fedora.phx.redhat.com>

konradm has requested the watchcommits acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:26 +0000
Subject: [pkgdb] jna: konradm has requested watchbugzilla
Message-ID: <20090810110927.3902F10F8AF@bastion2.fedora.phx.redhat.com>

konradm has requested the watchbugzilla acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:28 +0000
Subject: [pkgdb] jna: konradm has requested approveacls
Message-ID: <20090810110929.55E8F10F8D5@bastion2.fedora.phx.redhat.com>

konradm has requested the approveacls acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:29 +0000
Subject: [pkgdb] jna: konradm has requested commit
Message-ID: <20090810110929.C523610F8B4@bastion2.fedora.phx.redhat.com>

konradm has requested the commit acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:30 +0000
Subject: [pkgdb] jna: konradm has requested watchcommits
Message-ID: <20090810110930.A8E5110F8D9@bastion2.fedora.phx.redhat.com>

konradm has requested the watchcommits acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:31 +0000
Subject: [pkgdb] jna: konradm has requested watchbugzilla
Message-ID: <20090810110931.7F23010F8DA@bastion2.fedora.phx.redhat.com>

konradm has requested the watchbugzilla acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:33 +0000
Subject: [pkgdb] jna: konradm has requested watchbugzilla
Message-ID: <20090810110933.416B810F8DC@bastion2.fedora.phx.redhat.com>

konradm has requested the watchbugzilla acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:33 +0000
Subject: [pkgdb] jna: konradm has requested watchcommits
Message-ID: <20090810110933.C250C10F8DF@bastion2.fedora.phx.redhat.com>

konradm has requested the watchcommits acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:34 +0000
Subject: [pkgdb] jna: konradm has requested commit
Message-ID: <20090810110941.8FD2910F8B6@bastion2.fedora.phx.redhat.com>

konradm has requested the commit acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:09:35 +0000
Subject: [pkgdb] jna: konradm has requested approveacls
Message-ID: <20090810110939.54CE210F8E7@bastion2.fedora.phx.redhat.com>

konradm has requested the approveacls acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:23 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810111024.9543510F8C6@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:27 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810111028.528C010F8C1@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:27 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810111028.5E7D910F8E0@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:25 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810111027.42D4010F8C2@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:29 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810111030.06DFE10F8C3@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:32 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810111032.A269010F8E6@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:33 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810111033.2714210F8EE@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:35 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810111035.2D79010F8F3@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:40 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810111041.5E41810F8CE@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:41 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810111041.D2BBC10F8FB@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:43 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810111043.C521810F8FF@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:42 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810111043.A5A7D10F8FD@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:47 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810111047.6D5AA10F8FC@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:47 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810111048.006B310F904@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:48 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810111048.ABFA710F908@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:50 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810111050.442D310F90B@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:52 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810111052.A024910F911@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:52 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810111052.73E9810F910@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:53 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810111053.9536D10F916@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:53 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810111054.4C42210F919@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:55 +0000
Subject: [pkgdb] jna: konradm has given up watchbugzilla
Message-ID: <20090810111055.9060A10F89B@bastion2.fedora.phx.redhat.com>

konradm has given up the watchbugzilla acl on jna (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:55 +0000
Subject: [pkgdb] jna: konradm has given up watchcommits
Message-ID: <20090810111056.26AC610F91D@bastion2.fedora.phx.redhat.com>

konradm has given up the watchcommits acl on jna (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:56 +0000
Subject: [pkgdb] jna: konradm has given up commit
Message-ID: <20090810111057.B9E3110F923@bastion2.fedora.phx.redhat.com>

konradm has given up the commit acl on jna (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From pkgdb at fedoraproject.org  Mon Aug 10 11:10:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 11:10:58 +0000
Subject: [pkgdb] jna: konradm has given up approveacls
Message-ID: <20090810111058.E52C210F8D2@bastion2.fedora.phx.redhat.com>

konradm has given up the approveacls acl on jna (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jna



From nhorman at fedoraproject.org  Mon Aug 10 11:16:59 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 10 Aug 2009 11:16:59 +0000 (UTC)
Subject: rpms/numactl/devel numactl-2.0.3-nodes_allowed_list_obo.patch, NONE,
	1.1 numactl.spec, 1.62, 1.63
Message-ID: <20090810111659.29EF911C0344@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/numactl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12371

Modified Files:
	numactl.spec 
Added Files:
	numactl-2.0.3-nodes_allowed_list_obo.patch 
Log Message:
Resolves: bz 516223

numactl-2.0.3-nodes_allowed_list_obo.patch:
 libnuma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE numactl-2.0.3-nodes_allowed_list_obo.patch ---
diff -up numactl-2.0.3/libnuma.c.orig numactl-2.0.3/libnuma.c
--- numactl-2.0.3/libnuma.c.orig	2009-08-10 07:02:12.000000000 -0400
+++ numactl-2.0.3/libnuma.c	2009-08-10 07:02:39.000000000 -0400
@@ -464,7 +464,7 @@ set_thread_constraints(void)
 			nodes_allowed_list = malloc(strlen(buffer)-18);
 			strncpy(nodes_allowed_list, buffer + 19,
 				strlen(buffer) - 19);
-			nodes_allowed_list[strlen(nodes_allowed_list)-1] = '\0';
+			nodes_allowed_list[strlen(buffer)-19] = '\0';
 		}
 	}
 	fclose(f);


Index: numactl.spec
===================================================================
RCS file: /cvs/extras/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- numactl.spec	25 Jul 2009 19:41:12 -0000	1.62
+++ numactl.spec	10 Aug 2009 11:16:58 -0000	1.63
@@ -1,7 +1,7 @@
 Name:		numactl
 Summary:	Library for tuning for Non Uniform Memory Access machines
 Version:	2.0.3
-Release:	5%{dist} 
+Release:	6%{dist} 
 License:	LGPLv2/GPLv2
 Group: 		System Environment/Base
 URL:		ftp://oss.sgi.com/www/projects/libnuma/download
@@ -10,6 +10,7 @@ Buildroot:	%{_tmppath}/%{name}-buildroot
 
 Patch0: numactl-2.0.3-rc3-distance_parsing.patch
 Patch1: numactl-2.0.3-rc3-no-nodes-warning.patch
+Patch2: numactl-2.0.3-nodes_allowed_list_obo.patch
 
 ExcludeArch: s390 s390x
 
@@ -30,6 +31,7 @@ Provides development headers for numa li
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -I."
@@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 10 2009 Neil Horman <nhorman at redhat.com> - 2.0.3-6
+- Fix obo in nodes_allowed_list strncpy (bz 516223)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Mon Aug 10 11:18:41 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 11:18:41 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.59,
	1.60 java-1.6.0-openjdk.spec, 1.132, 1.133 sources, 1.66, 1.67
Message-ID: <20090810111841.924B711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12748

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.6.0-29.b16
- Use bzipped java-access-bridge tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	29 May 2009 13:58:39 -0000	1.59
+++ .cvsignore	10 Aug 2009 11:18:41 -0000	1.60
@@ -1,8 +1,8 @@
 mauve_tests
-java-access-bridge-1.23.0.tar.gz
 mauve-2008-10-22.tar.gz
 netbeans-profiler-visualvm_release65_mod.tar.gz
 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 visualvm-111-src.tar.gz
 hotspot.tar.gz
 icedtea6-1.5.tar.gz
+java-access-bridge-1.23.0.tar.bz2


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- java-1.6.0-openjdk.spec	5 Aug 2009 14:08:13 -0000	1.132
+++ java-1.6.0-openjdk.spec	10 Aug 2009 11:18:41 -0000	1.133
@@ -137,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 28.%{openjdkver}%{?dist}
+Release: 29.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -155,7 +155,7 @@ License:  GPLv2 with exceptions
 URL:      http://icedtea.classpath.org/
 Source0:  %{url}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz
 Source1:  %{fedorazip}
-Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
+Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
 Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
@@ -972,6 +972,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.6.0-29.b16
+- Use bzipped java-access-bridge tarball.
+
 * Tue Aug  4 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-28.b16
 - Updated java-1.6.0-openjdk-netx.patch, and renamed to
 java-1.6.0-openjdk-netxandplugin.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	29 May 2009 13:58:39 -0000	1.66
+++ sources	10 Aug 2009 11:18:41 -0000	1.67
@@ -1,8 +1,8 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
-1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
 547db20e170c2a2566a56455b196aef7  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
 dbd7aca5544d1aeebf0eadd45d29d08e  hotspot.tar.gz
 a67303675a53781c4e42bdb02ec78e40  icedtea6-1.5.tar.gz
+c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 11:23:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 11:23:26 +0000 (UTC)
Subject: rpms/anjuta/devel .cvsignore, 1.21, 1.22 anjuta.spec, 1.82,
	1.83 sources, 1.21, 1.22
Message-ID: <20090810112326.8E4C611C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14396

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:2.27.3.0-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	14 Jul 2009 05:29:40 -0000	1.21
+++ .cvsignore	10 Aug 2009 11:23:26 -0000	1.22
@@ -1 +1 @@
-anjuta-2.27.3.0.tar.gz
+anjuta-2.27.3.0.tar.bz2


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- anjuta.spec	24 Jul 2009 16:53:04 -0000	1.82
+++ anjuta.spec	10 Aug 2009 11:23:26 -0000	1.83
@@ -2,11 +2,11 @@ Summary:	A GNOME development IDE for C/C
 Name:		anjuta
 Epoch:		1
 Version:	2.27.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.27/%{name}-%{version}.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.27/%{name}-%{version}.tar.bz2
 
 # http://bugzilla.gnome.org/575147
 Patch0:		%{name}-%{version}-class-gen-templates.patch
@@ -330,6 +330,9 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:2.27.3.0-3
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.27.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	14 Jul 2009 05:29:40 -0000	1.21
+++ sources	10 Aug 2009 11:23:26 -0000	1.22
@@ -1 +1 @@
-79931581f77c42e7468a3ee20fc275bd  anjuta-2.27.3.0.tar.gz
+cd2c1e1cc6ad44d55c6fd6e76a6fd5f9  anjuta-2.27.3.0.tar.bz2



From mso at fedoraproject.org  Mon Aug 10 11:25:59 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon, 10 Aug 2009 11:25:59 +0000 (UTC)
Subject: rpms/libass/F-10 .cvsignore, 1.2, 1.3 libass.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090810112559.A2DA611C0344@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/libass/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14775/F-10

Modified Files:
	.cvsignore libass.spec sources 
Log Message:


New release. 

API changes, soname bump, new upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libass/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 17:56:28 -0000	1.2
+++ .cvsignore	10 Aug 2009 11:25:59 -0000	1.3
@@ -1 +1 @@
-libass-0.9.6.tar.bz2
+libass-0.9.7.tar.bz2


Index: libass.spec
===================================================================
RCS file: /cvs/extras/rpms/libass/F-10/libass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libass.spec	31 Jul 2009 10:04:01 -0000	1.2
+++ libass.spec	10 Aug 2009 11:25:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libass
-Version:        0.9.6
-Release:        3%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        Portable library for SSA/ASS subtitles rendering
 
 Group:          System Environment/Libraries
@@ -32,7 +32,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -65,7 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libass.pc
 
 %changelog
-* Martin Sourada <mso at fedoraproject.org>
+* Mon Aug 10 2009 Martin Sourada <mso at fedoraproject.org> - 0.9.7-1
+- New upstream release
 - Upstream changed from sourceforge to code.google
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libass/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Mar 2009 17:56:28 -0000	1.2
+++ sources	10 Aug 2009 11:25:59 -0000	1.3
@@ -1 +1 @@
-58d9fa08eedc27edae05b53288025370  libass-0.9.6.tar.bz2
+28b0de58dec54ca75c3195ddda46ee3d  libass-0.9.7.tar.bz2



From mso at fedoraproject.org  Mon Aug 10 11:25:59 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon, 10 Aug 2009 11:25:59 +0000 (UTC)
Subject: rpms/libass/F-11 .cvsignore, 1.2, 1.3 libass.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090810112559.CED4611C0344@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/libass/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14775/F-11

Modified Files:
	.cvsignore libass.spec sources 
Log Message:


New release. 

API changes, soname bump, new upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libass/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 17:52:39 -0000	1.2
+++ .cvsignore	10 Aug 2009 11:25:59 -0000	1.3
@@ -1 +1 @@
-libass-0.9.6.tar.bz2
+libass-0.9.7.tar.bz2


Index: libass.spec
===================================================================
RCS file: /cvs/extras/rpms/libass/F-11/libass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libass.spec	31 Jul 2009 10:04:02 -0000	1.2
+++ libass.spec	10 Aug 2009 11:25:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libass
-Version:        0.9.6
-Release:        3%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        Portable library for SSA/ASS subtitles rendering
 
 Group:          System Environment/Libraries
@@ -32,7 +32,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -65,7 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libass.pc
 
 %changelog
-* Martin Sourada <mso at fedoraproject.org>
+* Mon Aug 10 2009 Martin Sourada <mso at fedoraproject.org> - 0.9.7-1
+- New upstream release
 - Upstream changed from sourceforge to code.google
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libass/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Mar 2009 17:52:39 -0000	1.2
+++ sources	10 Aug 2009 11:25:59 -0000	1.3
@@ -1 +1 @@
-58d9fa08eedc27edae05b53288025370  libass-0.9.6.tar.bz2
+28b0de58dec54ca75c3195ddda46ee3d  libass-0.9.7.tar.bz2



From mso at fedoraproject.org  Mon Aug 10 11:26:00 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Mon, 10 Aug 2009 11:26:00 +0000 (UTC)
Subject: rpms/libass/devel .cvsignore, 1.2, 1.3 libass.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090810112600.0EF0B11C0344@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/libass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14775/devel

Modified Files:
	.cvsignore libass.spec sources 
Log Message:


New release. 

API changes, soname bump, new upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libass/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 17:52:39 -0000	1.2
+++ .cvsignore	10 Aug 2009 11:25:59 -0000	1.3
@@ -1 +1 @@
-libass-0.9.6.tar.bz2
+libass-0.9.7.tar.bz2


Index: libass.spec
===================================================================
RCS file: /cvs/extras/rpms/libass/devel/libass.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libass.spec	31 Jul 2009 10:04:03 -0000	1.3
+++ libass.spec	10 Aug 2009 11:25:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libass
-Version:        0.9.6
-Release:        3%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        Portable library for SSA/ASS subtitles rendering
 
 Group:          System Environment/Libraries
@@ -32,7 +32,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -65,7 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libass.pc
 
 %changelog
-* Martin Sourada <mso at fedoraproject.org>
+* Mon Aug 10 2009 Martin Sourada <mso at fedoraproject.org> - 0.9.7-1
+- New upstream release
 - Upstream changed from sourceforge to code.google
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libass/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Mar 2009 17:52:39 -0000	1.2
+++ sources	10 Aug 2009 11:25:59 -0000	1.3
@@ -1 +1 @@
-58d9fa08eedc27edae05b53288025370  libass-0.9.6.tar.bz2
+28b0de58dec54ca75c3195ddda46ee3d  libass-0.9.7.tar.bz2



From kkofler at fedoraproject.org  Mon Aug 10 11:26:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 10 Aug 2009 11:26:21 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.59,1.60
Message-ID: <20090810112621.E2D9A11C0344@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15002/devel

Modified Files:
	gnash.spec 
Log Message:
* Mon Aug 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.6.20090809bzr11401
- don't package headers in -widget, only in -devel (no duplicate files)
- own %{_includedir}/gnash/ in -devel
- add missing %defattr for -devel and -widget
- make -devel and -widget require the main package (with exact VR)
- fix -devel group and description
- rename gnash-widget to python-gnash as per the naming guidelines


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gnash.spec	10 Aug 2009 10:38:05 -0000	1.59
+++ gnash.spec	10 Aug 2009 11:26:21 -0000	1.60
@@ -5,7 +5,7 @@
 
 Name:           gnash
 Version:        0.9.0
-Release:        0.5.%{alphatag}%{?dist}
+Release:        0.6.%{alphatag}%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -91,17 +91,20 @@ Cygnal is a streaming media server that'
 
 %package devel
 Summary:   Gnash header files
-Group:     Applications/Multimedia
+Requires:  %{name} = %{version}-%{release}
+Group:     Development/Libraries
 
 %description devel
-Gnash header files can be used to write external Gnash extensions.
+Gnash header files can be used to write external Gnash extensions or to embed
+the Gnash GTK+ widget into a C/C++ application.
 
-%package widget
-Summary:   Gnash widgets for Gtk and Python
+%package -n python-gnash
+Summary:   Gnash Python bindings
+Requires:  %{name} = %{version}-%{release}
 Group:     Applications/Multimedia
 
 %description widget
-The Gnash widgets can be used to embed Gnash into any Gtk or Python-Gtk
+Python bindings for the Gnash widget. Can be used to embed Gnash into any PyGTK
 application.
 
 %prep
@@ -301,14 +304,23 @@ fi
 %{_mandir}/man1/rtmpget.1*
 
 %files devel
-%{_includedir}/gnash/*.h
+%defattr(-,root,root,-)
+%{_includedir}/gnash/
 %{_libdir}/pkgconfig/gnash.pc
 
 %files widget
-%{_includedir}/gnash/*.h
+%defattr(-,root,root,-)
 %{python_sitearch}/*
 
 %changelog
+* Mon Aug 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.6.20090809bzr11401
+- don't package headers in -widget, only in -devel (no duplicate files)
+- own %%{_includedir}/gnash/ in -devel
+- add missing %%defattr for -devel and -widget
+- make -devel and -widget require the main package (with exact VR)
+- fix -devel group and description
+- rename gnash-widget to python-gnash as per the naming guidelines
+
 * Sun Aug 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.0-0.5.20090809bzr11401
 - use %%{_includedir}, not %%{_prefix}/include
 



From kkofler at fedoraproject.org  Mon Aug 10 11:27:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 10 Aug 2009 11:27:21 +0000 (UTC)
Subject: rpms/gnash/devel gnash.spec,1.60,1.61
Message-ID: <20090810112721.1E12A11C0344@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15261/devel

Modified Files:
	gnash.spec 
Log Message:
Complete the -widget rename.


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gnash.spec	10 Aug 2009 11:26:21 -0000	1.60
+++ gnash.spec	10 Aug 2009 11:27:20 -0000	1.61
@@ -103,7 +103,7 @@ Summary:   Gnash Python bindings
 Requires:  %{name} = %{version}-%{release}
 Group:     Applications/Multimedia
 
-%description widget
+%description -n python-gnash
 Python bindings for the Gnash widget. Can be used to embed Gnash into any PyGTK
 application.
 
@@ -308,7 +308,7 @@ fi
 %{_includedir}/gnash/
 %{_libdir}/pkgconfig/gnash.pc
 
-%files widget
+%files -n python-gnash
 %defattr(-,root,root,-)
 %{python_sitearch}/*
 



From scop at fedoraproject.org  Mon Aug 10 11:28:55 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 11:28:55 +0000 (UTC)
Subject: rpms/archimedes/devel .cvsignore, 1.3, 1.4 archimedes.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <20090810112855.6774311C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/archimedes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15600

Modified Files:
	.cvsignore archimedes.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.0-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/archimedes/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Nov 2008 18:58:43 -0000	1.3
+++ .cvsignore	10 Aug 2009 11:28:55 -0000	1.4
@@ -1 +1 @@
-archimedes-0.8.0.tar.gz
+archimedes-0.8.0.tar.bz2


Index: archimedes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archimedes/devel/archimedes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- archimedes.spec	24 Jul 2009 17:01:58 -0000	1.8
+++ archimedes.spec	10 Aug 2009 11:28:55 -0000	1.9
@@ -1,11 +1,11 @@
 Summary:	2D Quantum Monte Carlo simulator for semiconductor devices
 Name:		archimedes
 Version:	0.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv3+
 Group:		Applications/Engineering
 URL:		http://www.gnu.org/software/archimedes/
-Source0:	ftp://ftp.gnu.org/gnu/archimedes/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.gnu.org/gnu/archimedes/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.0-4
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/archimedes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Nov 2008 18:58:43 -0000	1.3
+++ sources	10 Aug 2009 11:28:55 -0000	1.4
@@ -1 +1 @@
-5e086b224161d51edea5d1165a630466  archimedes-0.8.0.tar.gz
+991c5f2db2fea54680add3a3eb808f8e  archimedes-0.8.0.tar.bz2



From rjones at fedoraproject.org  Mon Aug 10 11:38:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 10 Aug 2009 11:38:33 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.52,1.53
Message-ID: <20090810113833.3007311C0344@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17241/F-11

Modified Files:
	libguestfs.spec 
Log Message:
Updated %check section with current build status.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- libguestfs.spec	6 Aug 2009 17:50:56 -0000	1.52
+++ libguestfs.spec	10 Aug 2009 11:38:32 -0000	1.53
@@ -336,7 +336,9 @@ export LIBGUESTFS_DEBUG=1
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
+#                                 (WORKAROUND ENABLED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
+# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM
 
 #%ifarch x86_64
 #make check



From rjones at fedoraproject.org  Mon Aug 10 11:38:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 10 Aug 2009 11:38:33 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.88,1.89
Message-ID: <20090810113833.48AF011C0344@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17241/devel

Modified Files:
	libguestfs.spec 
Log Message:
Updated %check section with current build status.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- libguestfs.spec	7 Aug 2009 09:14:48 -0000	1.88
+++ libguestfs.spec	10 Aug 2009 11:38:33 -0000	1.89
@@ -350,10 +350,11 @@ export LIBGUESTFS_DEBUG=1
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
 #                                 (WORKAROUND ENABLED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
+# 516543   ?            F-12   qemu-kvm segfaults when run inside a VM
 
-%ifarch x86_64
-make check
-%endif
+#%ifarch x86_64
+#make check
+#%endif
 
 
 %install



From airlied at fedoraproject.org  Mon Aug 10 11:39:55 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 10 Aug 2009 11:39:55 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.466,1.467
Message-ID: <20090810113955.ECAB711C0344@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17516

Modified Files:
	xorg-x11-server.spec 
Log Message:
attempts at static so far



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- xorg-x11-server.spec	7 Aug 2009 11:37:15 -0000	1.466
+++ xorg-x11-server.spec	10 Aug 2009 11:39:55 -0000	1.467
@@ -286,13 +286,20 @@ BuildArch: noarch
 %description source
 Xserver source code needed to build VNC server (Xvnc)
 
-%package -n libxf86config-devel
+%package -n libxf86config-static-devel
 Summary: Xorg configuration parser library development files
 Group: Development/Libraries
 Requires: xorg-x11-server-devel = %{version}-%{release}
+Provides: libxf86config-static
 
-%description -n libxf86config-devel
-Xorg configuration parser library development files
+Requires: xorg-x11-server-Xorg > 1.6.99-29
+Provides: libxf86config = %{version}-%{release}
+Obsoletes: libxf86config < 1.6.99-29
+Provides: libxf86config-devel = %{version}-%{release}
+Obsoletes: libxf86config-devel < 1.6.99-29
+
+%description -n libxf86config-static-devel
+Xorg configuration parser library development files (static library)
 
 %prep
 %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
@@ -508,11 +515,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{xserver_source_dir}
 
-%files -n libxf86config-devel
+%files -n libxf86config-static-devel
 %defattr(-, root, root, -)
 %{_libdir}/libxf86config.a
 
-
 %changelog
 * Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-30.20090807
 - goddamit: reapply picify libxf86config.a hopefully



From scop at fedoraproject.org  Mon Aug 10 11:50:17 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 11:50:17 +0000 (UTC)
Subject: rpms/autogen/devel .cvsignore, 1.6, 1.7 autogen.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090810115017.7104811C0494@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/autogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19358

Modified Files:
	.cvsignore autogen.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 5.9.4-7
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/autogen/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Feb 2008 02:55:24 -0000	1.6
+++ .cvsignore	10 Aug 2009 11:50:17 -0000	1.7
@@ -1 +1 @@
-autogen-5.9.4.tar.gz
+autogen-5.9.4.tar.bz2


Index: autogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autogen/devel/autogen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- autogen.spec	24 Jul 2009 17:37:30 -0000	1.13
+++ autogen.spec	10 Aug 2009 11:50:17 -0000	1.14
@@ -1,13 +1,13 @@
 Summary:	Automated text file generator
 Name:		autogen
 Version:	5.9.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 # Some files are licensed under GPLv2+.
 # We redistribute them under GPLv3+.
 License:	GPLv3+
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/autogen/
-Source0:	ftp://ftp.gnu.org/gnu/autogen/rel5.9.4/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.gnu.org/gnu/autogen/rel5.9.4/%{name}-%{version}.tar.bz2
 
 Patch0:		%{name}-%{version}-autoopts-config.patch
 Patch1:		%{name}-%{version}-pkgconfig.patch
@@ -163,6 +163,9 @@ fi
 %{_includedir}/autoopts/usage-txt.h
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 5.9.4-7
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/autogen/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Feb 2008 02:55:24 -0000	1.6
+++ sources	10 Aug 2009 11:50:17 -0000	1.7
@@ -1 +1 @@
-3739b9f1539e852c16e3b91c0a11797f  autogen-5.9.4.tar.gz
+cd447b063675625b915546204f59db4b  autogen-5.9.4.tar.bz2



From varekova at fedoraproject.org  Mon Aug 10 11:50:32 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 11:50:32 +0000 (UTC)
Subject: rpms/aspell/devel aspell.spec,1.47,1.48
Message-ID: <20090810115032.C862611C0494@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19372

Modified Files:
	aspell.spec 
Log Message:

fix installation with --excludedocs option (#515911)



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- aspell.spec	24 Jul 2009 17:11:33 -0000	1.47
+++ aspell.spec	10 Aug 2009 11:50:32 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: A spelling checker
 Name: aspell
 Version: 0.60.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 12
 License: LGPLv2 and MIT
 Group: Applications/Text
@@ -76,22 +76,30 @@ chmod 644 ${RPM_BUILD_ROOT}%{_bindir}/as
 
 %find_lang %{name}
 
-%post   
+%post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). "  || : 
+if [ -f %{_infodir}/tar.info.gz ]; then
+    /sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). "  || : 
+fi
 
 %post        devel
-/sbin/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir --entry="* Aspell-dev: (aspell-dev). " || :
+if [ -f %{_infodir}/tar.info.gz ]; then
+    /sbin/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir --entry="* Aspell-dev: (aspell-dev). " || :
+fi
 
-%preun 
+%preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/aspell.info.gz %{_infodir}/dir 
+    if [ -f %{_infodir}/aspell.info.gz ]; then
+        /sbin/install-info --delete %{_infodir}/aspell.info.gz %{_infodir}/dir || :
+    fi
 fi
 exit 0
 
 %preun       devel
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/aspell-dev.info.gz %{_infodir}/dir 
+    if [ -f %{_infodir}/aspell.info.gz ]; then
+        /sbin/install-info --delete %{_infodir}/aspell-dev.info.gz %{_infodir}/dir || :
+    fi
 fi
 exit 0
 
@@ -130,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Mon Aug 10 2009 Ivana Varekova <varekova at redhat.com> - 12:0.60.6-7
+- fix installation with --excludedocs option (#515911)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12:0.60.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Mon Aug 10 11:54:39 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 11:54:39 +0000 (UTC)
Subject: rpms/aspell/devel aspell.spec,1.48,1.49
Message-ID: <20090810115439.3252611C0344@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/aspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20790

Modified Files:
	aspell.spec 
Log Message:
fix typo 



Index: aspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- aspell.spec	10 Aug 2009 11:50:32 -0000	1.48
+++ aspell.spec	10 Aug 2009 11:54:38 -0000	1.49
@@ -78,12 +78,12 @@ chmod 644 ${RPM_BUILD_ROOT}%{_bindir}/as
 
 %post
 /sbin/ldconfig
-if [ -f %{_infodir}/tar.info.gz ]; then
+if [ -f %{_infodir}/aspell.info.gz ]; then
     /sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). "  || : 
 fi
 
 %post        devel
-if [ -f %{_infodir}/tar.info.gz ]; then
+if [ -f %{_infodir}/aspell.info.gz ]; then
     /sbin/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir --entry="* Aspell-dev: (aspell-dev). " || :
 fi
 



From scop at fedoraproject.org  Mon Aug 10 12:10:16 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 12:10:16 +0000 (UTC)
Subject: rpms/avr-gdb/devel .cvsignore, 1.2, 1.3 avr-gdb.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <20090810121016.819AA11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/avr-gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23415

Modified Files:
	.cvsignore avr-gdb.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 6.6-11
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avr-gdb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jun 2007 20:28:07 -0000	1.2
+++ .cvsignore	10 Aug 2009 12:10:16 -0000	1.3
@@ -1 +1 @@
-gdb-6.6.tar.gz
+gdb-6.6.tar.bz2


Index: avr-gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avr-gdb/devel/avr-gdb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- avr-gdb.spec	24 Jul 2009 17:42:26 -0000	1.10
+++ avr-gdb.spec	10 Aug 2009 12:10:16 -0000	1.11
@@ -2,12 +2,12 @@
 
 Name:           %{target}-gdb
 Version:        6.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        GDB for (remote) debugging %{target} binaries
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://sources.redhat.com/gdb/
-Source0:        http://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.gz
+Source0:        http://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.bz2
 Source1:        README.fedora
 Patch0:         binutils-2.16.1-open.patch
 Patch1:         gdb-6.6-open.patch
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 6.6-11
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avr-gdb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jun 2007 20:28:07 -0000	1.2
+++ sources	10 Aug 2009 12:10:16 -0000	1.3
@@ -1 +1 @@
-18be4e7a1ac713bda93d00fee20bbef8  gdb-6.6.tar.gz
+a4df41d28dd514d64e8ccbfe125fd9a6  gdb-6.6.tar.bz2



From varekova at fedoraproject.org  Mon Aug 10 12:16:42 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 12:16:42 +0000 (UTC)
Subject: rpms/gmp/devel gmp.spec,1.63,1.64
Message-ID: <20090810121642.5597D11C0344@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24511

Modified Files:
	gmp.spec 
Log Message:
- fix installation with --excludedocs option (#515947)



Index: gmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gmp.spec	25 Jul 2009 00:28:59 -0000	1.63
+++ gmp.spec	10 Aug 2009 12:16:42 -0000	1.64
@@ -6,7 +6,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source2: gmp.h
@@ -188,12 +188,16 @@ cd ..
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gmp.info.gz %{_infodir}/dir
+if [ -f %{_infodir}/gmp.info.gz ]; then
+    /sbin/install-info %{_infodir}/gmp.info.gz %{_infodir}/dir || :
+fi
 exit 0
 
 %preun devel
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/gmp.info.gz %{_infodir}/dir
+    if [ -f %{_infodir}/gmp.info.gz ]; then
+        /sbin/install-info --delete %{_infodir}/gmp.info.gz %{_infodir}/dir || :
+    fi
 fi
 exit 0
 
@@ -228,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ivana Varekova <varekova at redhat.com> 4.3.1-5
+- fix installation with --excludedocs option (#515947)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Mon Aug 10 12:28:35 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 12:28:35 +0000 (UTC)
Subject: rpms/bigboard/devel .cvsignore, 1.45, 1.46 bigboard.spec, 1.78,
	1.79 sources, 1.46, 1.47
Message-ID: <20090810122835.270FA11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27392

Modified Files:
	.cvsignore bigboard.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.6.4-13
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	28 Oct 2008 22:12:57 -0000	1.45
+++ .cvsignore	10 Aug 2009 12:28:34 -0000	1.46
@@ -1,7 +1 @@
-bigboard-0.5.31.tar.gz
-bigboard-0.5.34.tar.bz2
-bigboard-0.6.0.tar.gz
-bigboard-0.6.1.tar.gz
-bigboard-0.6.2.tar.gz
-bigboard-0.6.3.tar.gz
-bigboard-0.6.4.tar.gz
+bigboard-0.6.4.tar.bz2


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- bigboard.spec	31 Jul 2009 12:53:06 -0000	1.78
+++ bigboard.spec	10 Aug 2009 12:28:34 -0000	1.79
@@ -3,13 +3,13 @@
 
 Name:           bigboard
 Version:        0.6.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://mugshot.org/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/bigboard/0.6/bigboard-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/bigboard/0.6/bigboard-%{version}.tar.bz2
 # This patch is Fedora-specific
 Patch0:         bigboard-default-fedora-theme.patch
 # Patch for libempathy api changes
@@ -128,6 +128,9 @@ gconftool-2 --makefile-install-rule \
 killall -HUP gconfd-2 || :
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.6.4-13
+- Use bzipped upstream tarball.
+
 * Fri Jul 31 2009 Caolan McNamara <caolanm at redhat.com> - 0.6.4-12
 - Rebuild for new libempathy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	28 Oct 2008 22:12:57 -0000	1.46
+++ sources	10 Aug 2009 12:28:34 -0000	1.47
@@ -1 +1 @@
-115ccfe4ce436aa66d8db1b2af8406b0  bigboard-0.6.4.tar.gz
+37a618000cf6d17bccd1ee8857d1f564  bigboard-0.6.4.tar.bz2



From jcollie at fedoraproject.org  Mon Aug 10 12:32:43 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 10 Aug 2009 12:32:43 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore, 1.14, 1.15 gnonlin.spec, 1.26,
	1.27 sources, 1.14, 1.15
Message-ID: <20090810123243.5C18511C0344@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Wed Aug  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.11.3-0.1
- Update to latest prerelease.
- Clean up some rpmlint warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Jul 2009 13:33:12 -0000	1.14
+++ .cvsignore	10 Aug 2009 12:32:43 -0000	1.15
@@ -1 +1 @@
-gnonlin-0.10.11.2.tar.gz
+gnonlin-0.10.11.3.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gnonlin.spec	25 Jul 2009 00:53:08 -0000	1.26
+++ gnonlin.spec	10 Aug 2009 12:32:43 -0000	1.27
@@ -1,22 +1,23 @@
-%define		gst_req			0.10.9
-%define		gst_plugins_base_req	0.10.4
+%define         gst_req                 0.10.24
+%define         gst_plugins_base_req    0.10.24
 
-Name: 		gnonlin
-Version: 	0.10.11.2
-Release:	0.2%{?dist}
-Summary: 	GStreamer extension library for non-linear editing
-
-Group: 		System Environment/Libraries
-License: 	LGPLv2+
-URL:		http://gnonlin.sourceforge.net/
-Source:		http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.gz
+Name:           gnonlin
+Version:        0.10.11.3
+Release:        0.1%{?dist}
+Summary:        GStreamer extension library for non-linear editing
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://gnonlin.sourceforge.net/
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req}
-BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
+BuildRequires:  gstreamer-devel >= %{gst_req}
+BuildRequires:  gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
 
-Requires:	gstreamer-plugins-base >= %{gst_plugins_base_req}
-Obsoletes:	gnonlin-devel
+Requires:       gstreamer-plugins-base >= %{gst_plugins_base_req}
+Obsoletes:      gnonlin-devel < %{version}-%{release}
+Provides:       gnonlin-devel = %{version}-%{release}
 
 %description
 Gnonlin is a library built on top of GStreamer (http://gstreamer.net)
@@ -44,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Wed Aug  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.11.3-0.1
+- Update to latest prerelease.
+- Clean up some rpmlint warnings
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.11.2-0.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -150,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 - remove gst-register
 - rm %%{_libdir}/gstreamer-0.10/libgnl.la after install
 - -devel package owns %%{_includedir}/gnl
-- avoid %makeinstall
+- avoid %%makeinstall
 - remove aclocal and autoconf from %%prep
 
 * Mon Jan 23 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Jul 2009 13:33:13 -0000	1.14
+++ sources	10 Aug 2009 12:32:43 -0000	1.15
@@ -1 +1 @@
-20a99e4c1798c849963aa0025318a6c5  gnonlin-0.10.11.2.tar.gz
+5da63a33aedf8e4723741068031135a1  gnonlin-0.10.11.3.tar.bz2



From jnovy at fedoraproject.org  Mon Aug 10 12:35:17 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 10 Aug 2009 12:35:17 +0000 (UTC)
Subject: rpms/libgphoto2/devel libgphoto2.udev-136.patch, NONE,
	1.1 libgphoto2.spec, 1.22, 1.23
Message-ID: <20090810123517.B16BC11C0344@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28866

Modified Files:
	libgphoto2.spec 
Added Files:
	libgphoto2.udev-136.patch 
Log Message:
* Sun Aug 09 2009 David Zeuthen <davidz at redhat.com> 2.4.6-3
- Add patch from http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874
  and generate generic udev rules for device identification (ID_GPHOTO2* properties)


libgphoto2.udev-136.patch:
 print-camera-list.c |   40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

--- NEW FILE libgphoto2.udev-136.patch ---
--- libgphoto2-2.4.6/packaging/generic/print-camera-list.c	2009-03-23 08:56:56.000000000 +0100
+++ /home/martin/ubuntu/tmp/libgphoto2-2.4.6/packaging/generic/print-camera-list.c	2009-06-04 18:12:33.000000000 +0200
@@ -366,12 +366,14 @@
 
 typedef enum {
 		UDEV_PRE_0_98 = 0,
-		UDEV_0_98 = 1
+		UDEV_0_98 = 1,
+		UDEV_136 = 2
 } udev_version_t;
 
 static const StringFlagItem udev_version_t_map[] = {
 	{ "pre-0.98", UDEV_PRE_0_98 },
 	{ "0.98", UDEV_0_98 },
+	{ "136", UDEV_136 },
 	{ NULL, 0 }
 };
 
@@ -399,13 +401,20 @@
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
 		/* UDEV_0_98 */
 		"SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
+		/* UDEV_136 */
+		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
+		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n\n"
 	};
 	static const char * const usbcam_strings[] = {
 		/* UDEV_PRE_0_98 */
-		"SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ",
+		"SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\"",
 		/* UDEV_0_98 */
-		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ",
+		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\"",
+		/* UDEV_136 */
+		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"proprietary\""
 	};
 	udev_persistent_data_t *pdata;
 	pdata = calloc(1, sizeof(udev_persistent_data_t));
@@ -444,7 +453,8 @@
 	    && pdata->mode == NULL 
 	    && pdata->group == NULL 
 	    && pdata->owner == NULL 
-	    && pdata->script == NULL) {
+	    && pdata->script == NULL
+	    && pdata->version <= UDEV_0_98) {
 		FATAL("Either <script> or <mode,group,owner> parameters must be given.");
 	}
 	if ((pdata->script != NULL) && (pdata->mode != NULL 
@@ -547,7 +557,11 @@
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) {
-			printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\", ", class, subclass, proto);
+			if (pdata->version == UDEV_136) {
+				printf("ENV{ID_USB_INTERFACES}==\"*:%02d%02d%02d:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\"", class, subclass, proto);
+			} else {
+				printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\"", class, subclass, proto);
+			}
 			has_valid_rule = 1;
 		} else {
 			if (class == 666) {
@@ -568,6 +582,9 @@
 		}
 	}
 	if (has_valid_rule != 0) {
+		if (pdata->script != NULL || pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL)
+			printf(", ");
+
 		if (pdata->script != NULL) {
 			printf("RUN+=\"%s\"\n", pdata->script);
 		} else if (pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) {
@@ -589,7 +606,8 @@
 			printf("\n");
 		} else {
 			printf("\n");
-			FATAL("udev_camera_func(): illegal branch");
+			if (pdata->version < UDEV_136)
+				FATAL("udev_camera_func(): illegal branch");
 		}
 	}
 	return 0;
@@ -1118,12 +1136,16 @@
 	 fdi_device_end_func
 	},
 	{"udev-rules",
-	 "udev rules file either for pre-0.98 or 0.98 and later",
-	 "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
+	 "udev rules file",
+	 "For modes \"pre-0.98\" and \"0.98\" (and later), put it into\n"
+	 "        /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
 	 "        or add script to run. This rule files also uses the\n"
 	 "        check-ptp-camera script included in libgphoto2 source. Either put it to\n"
 	 "        /lib/udev/check-ptp-camera or adjust the path in the generated rules file.\n"
-	 "        If you give a script parameter, the mode, owner, group parameters will be ignored.",
+	 "        If you give a script parameter, the mode, owner, group parameters will be ignored.\n"
+	 "        For mode \"136\" put it into /lib/udev/rules.d/40-libgphoto2.rules;\n"
+	 "        you can still use mode/owner/group, but the preferred mode of operation\n"
+	 "        is to use udev-extras for dynamic access permissions.\n",
 	 "[script <PATH_TO_SCRIPT>|version <version>|mode <mode>|owner <owner>|group <group>]*",
 	 udev_begin_func, 
 	 udev_camera_func,

 	  	 


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libgphoto2.spec	25 Jul 2009 05:49:09 -0000	1.22
+++ libgphoto2.spec	10 Aug 2009 12:35:17 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,6 +11,7 @@ Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: libgphoto2.udev-136.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 .udev136
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -107,6 +109,14 @@ export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 $RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list hal-fdi | \
 grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+
+# Output udev rules for device identification; this is used by GVfs gphoto2
+# backend and others.
+#
+# Btw, since it's /lib/udev, never e.g. /lib64/udev, we hardcode the path
+#
+mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d
+$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
 popd
 
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
@@ -132,6 +142,7 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_libdir}/libgphoto2/*/*.so
 %{_libdir}/*.so.*
 %{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+/lib/udev/rules.d/40-libgphoto2.rules
 %{_libdir}/udev/check-ptp-camera
 %{_libdir}/udev/check-mtp-device
 
@@ -151,6 +162,10 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 09 2009 David Zeuthen <davidz at redhat.com> 2.4.6-3
+- Add patch from http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874
+  and generate generic udev rules for device identification (ID_GPHOTO2* properties)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Mon Aug 10 12:47:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 10 Aug 2009 12:47:06 +0000 (UTC)
Subject: rpms/icu4j/devel icu4j.spec,1.19,1.20
Message-ID: <20090810124706.14A8211C0344@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30947/devel

Modified Files:
	icu4j.spec 
Log Message:
Update qualifier to the Eclipse 3.5.0 release.


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- icu4j.spec	25 Jul 2009 03:08:36 -0000	1.19
+++ icu4j.spec	10 Aug 2009 12:47:05 -0000	1.20
@@ -50,7 +50,7 @@
 
 Name:           icu4j
 Version:        4.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        International Components for Unicode for Java
 License:        MIT and EPL 
@@ -143,7 +143,7 @@ sed --in-place "s:/usr/lib:%{_libdir}:g"
 %ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
   -Declipse.basews=gtk -Declipse.baseos=linux \
   -Declipse.basearch=%{eclipse_arch} \
-  -Dicu4j.eclipse.build.version.string=4.0.1.v20090109 \
+  -Dicu4j.eclipse.build.version.string=4.0.1.v20090415 \
   jar docs eclipsePDEBuild
 %endif
 
@@ -191,6 +191,9 @@ unzip -qq -d %{buildroot}/%{eclipse_base
 %endif
 
 %changelog
+* Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1:4.0.1-3
+- Update qualifier to the Eclipse 3.5.0 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Aug 10 12:50:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:50:06 +0000
Subject: [pkgdb] libjingle ownership updated
Message-ID: <20090810125006.B827C10F882@bastion2.fedora.phx.redhat.com>

Package libjingle in Fedora OLPC 2 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libjingle



From pkgdb at fedoraproject.org  Mon Aug 10 12:51:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:51:08 +0000
Subject: [pkgdb] djvulibre ownership updated
Message-ID: <20090810125108.4A8C410F880@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora OLPC 2 was orphaned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Mon Aug 10 12:51:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:51:08 +0000
Subject: [pkgdb] djvulibre (un)retirement
Message-ID: <20090810125108.6A72410F897@bastion2.fedora.phx.redhat.com>

Package djvulibre in Fedora OLPC 2 has been retired by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Mon Aug 10 12:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:53:14 +0000
Subject: [pkgdb] mux ownership updated
Message-ID: <20090810125314.D15D810F880@bastion2.fedora.phx.redhat.com>

Package mux in Fedora 10 was orphaned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mux



From pkgdb at fedoraproject.org  Mon Aug 10 12:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:53:14 +0000
Subject: [pkgdb] mux (un)retirement
Message-ID: <20090810125314.E601110F897@bastion2.fedora.phx.redhat.com>

Package mux in Fedora 10 has been retired by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mux



From pkgdb at fedoraproject.org  Mon Aug 10 12:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:53:16 +0000
Subject: [pkgdb] mux ownership updated
Message-ID: <20090810125316.8FDF610F89B@bastion2.fedora.phx.redhat.com>

Package mux in Fedora 11 was orphaned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mux



From pkgdb at fedoraproject.org  Mon Aug 10 12:53:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:53:19 +0000
Subject: [pkgdb] mux (un)retirement
Message-ID: <20090810125319.5BCAE10F8B5@bastion2.fedora.phx.redhat.com>

Package mux in Fedora devel has been retired by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mux



From pkgdb at fedoraproject.org  Mon Aug 10 12:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:53:16 +0000
Subject: [pkgdb] mux (un)retirement
Message-ID: <20090810125316.9780B10F8AD@bastion2.fedora.phx.redhat.com>

Package mux in Fedora 11 has been retired by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mux



From pkgdb at fedoraproject.org  Mon Aug 10 12:53:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:53:19 +0000
Subject: [pkgdb] mux ownership updated
Message-ID: <20090810125319.4E41F10F8B2@bastion2.fedora.phx.redhat.com>

Package mux in Fedora devel was orphaned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mux



From pkgdb at fedoraproject.org  Mon Aug 10 12:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:54:09 +0000
Subject: [pkgdb] telepathy-stream-engine (un)retirement
Message-ID: <20090810125409.1F05A10F8B4@bastion2.fedora.phx.redhat.com>

Package telepathy-stream-engine in Fedora OLPC 2 has been retired by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-stream-engine



From pkgdb at fedoraproject.org  Mon Aug 10 12:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 12:54:09 +0000
Subject: [pkgdb] telepathy-stream-engine ownership updated
Message-ID: <20090810125409.169E710F8AD@bastion2.fedora.phx.redhat.com>

Package telepathy-stream-engine in Fedora OLPC 2 is now owned by bpepple

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-stream-engine



From scop at fedoraproject.org  Mon Aug 10 13:14:06 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 13:14:06 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.42, 1.43 bluez.spec, 1.86,
	1.87 sources, 1.42, 1.43
Message-ID: <20090810131406.715D411C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3609

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.47-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	2 Aug 2009 00:44:12 -0000	1.42
+++ .cvsignore	10 Aug 2009 13:14:06 -0000	1.43
@@ -1 +1 @@
-bluez-4.47.tar.gz
+bluez-4.47.tar.bz2


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- bluez.spec	5 Aug 2009 10:08:53 -0000	1.86
+++ bluez.spec	10 Aug 2009 13:14:06 -0000	1.87
@@ -1,10 +1,10 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.47
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
-Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
+Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
 Source1: bluetooth.init
 Source3: dund.init
 Source4: dund.conf
@@ -268,6 +268,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.47-3
+- Use bzipped upstream tarball.
+
 * Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 4.47-2
 - Remove hid2hci calls, they're in udev now
 - Work-around udev bug, bluetoothd wasn't getting enabled


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	2 Aug 2009 00:44:13 -0000	1.42
+++ sources	10 Aug 2009 13:14:06 -0000	1.43
@@ -1 +1 @@
-b54a199004b578ec5652014a5e62aeaa  bluez-4.47.tar.gz
+528b6abe52ff5301290c066baaed1097  bluez-4.47.tar.bz2



From jkratoch at fedoraproject.org  Mon Aug 10 13:22:52 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 10 Aug 2009 13:22:52 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.33, 1.34 gdb-6.3-pie-20050110.patch,
	1.17, 
	1.18 gdb-6.6-buildid-locate.patch, 1.23, 1.24 gdb-archer.patch,
	1.19, 1.20 gdb.spec, 1.369, 1.370 sources, 1.32, 1.33
Message-ID: <20090810132252.0C82E11C0344@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5077

Modified Files:
	.cvsignore gdb-6.3-pie-20050110.patch 
	gdb-6.6-buildid-locate.patch gdb-archer.patch gdb.spec sources 
Log Message:
* Mon Aug 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090810-1
- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090810
- archer-jankratochvil-fedora12 commit: 93ec16e6f5000dd64d433d86674e820ed0f35b72



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	4 Aug 2009 05:37:27 -0000	1.33
+++ .cvsignore	10 Aug 2009 13:22:51 -0000	1.34
@@ -1 +1 @@
-gdb-6.8.50.20090803.tar.bz2
+gdb-6.8.50.20090810.tar.bz2

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infrun.c      |    4 
 objfiles.c    |   14 +
 solib-svr4.c  |  474 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 14 files changed, 610 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gdb-6.3-pie-20050110.patch	4 Aug 2009 05:37:27 -0000	1.17
+++ gdb-6.3-pie-20050110.patch	10 Aug 2009 13:22:51 -0000	1.18
@@ -26,10 +26,10 @@
 
 	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
 
-Index: gdb-6.8.50.20090803/gdb/amd64-tdep.c
+Index: gdb-6.8.50.20090809/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/amd64-tdep.c	2009-08-03 21:39:38.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/amd64-tdep.c	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/amd64-tdep.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/amd64-tdep.c	2009-08-10 14:59:58.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -138,10 +138,10 @@ Index: gdb-6.8.50.20090803/gdb/amd64-tde
    return pc;
  }
  
-Index: gdb-6.8.50.20090803/gdb/auxv.c
+Index: gdb-6.8.50.20090809/gdb/auxv.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/auxv.c	2009-08-03 21:39:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/auxv.c	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/auxv.c	2009-08-10 14:59:58.000000000 +0200
 @@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
@@ -230,10 +230,10 @@ Index: gdb-6.8.50.20090803/gdb/auxv.c
  	break;
      }
  
-Index: gdb-6.8.50.20090803/gdb/auxv.h
+Index: gdb-6.8.50.20090809/gdb/auxv.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/auxv.h	2009-08-03 21:39:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/auxv.h	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/auxv.h	2009-08-10 14:59:58.000000000 +0200
 @@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -251,10 +251,10 @@ Index: gdb-6.8.50.20090803/gdb/auxv.h
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
-Index: gdb-6.8.50.20090803/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090809/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/dwarf2read.c	2009-08-03 21:39:39.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/dwarf2read.c	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/dwarf2read.c	2009-08-10 14:59:28.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/dwarf2read.c	2009-08-10 14:59:58.000000000 +0200
 @@ -1659,7 +1659,7 @@ dwarf2_build_psymtabs (struct objfile *o
    dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
    dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
@@ -264,10 +264,10 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
-Index: gdb-6.8.50.20090803/gdb/elfread.c
+Index: gdb-6.8.50.20090809/gdb/elfread.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/elfread.c	2009-08-03 21:39:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/elfread.c	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/elfread.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/elfread.c	2009-08-10 14:59:58.000000000 +0200
 @@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
@@ -277,10 +277,10 @@ Index: gdb-6.8.50.20090803/gdb/elfread.c
      {
        init_psymbol_list (objfile, 0);
        mainline = 0;
-Index: gdb-6.8.50.20090803/gdb/infrun.c
+Index: gdb-6.8.50.20090809/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/infrun.c	2009-08-03 21:39:38.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/infrun.c	2009-08-04 06:04:25.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/infrun.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/infrun.c	2009-08-10 14:59:58.000000000 +0200
 @@ -3531,6 +3531,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
@@ -292,10 +292,10 @@ Index: gdb-6.8.50.20090803/gdb/infrun.c
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-Index: gdb-6.8.50.20090803/gdb/objfiles.c
+Index: gdb-6.8.50.20090809/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/objfiles.c	2009-08-03 21:39:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/objfiles.c	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/objfiles.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/objfiles.c	2009-08-10 14:59:58.000000000 +0200
 @@ -52,6 +52,9 @@
  #include "exec.h"
  #include "observer.h"
@@ -324,7 +324,7 @@ Index: gdb-6.8.50.20090803/gdb/objfiles.
    if (symfile_objfile == NULL)
      return 0;
  
-@@ -475,6 +486,9 @@ free_objfile (struct objfile *objfile)
+@@ -465,6 +476,9 @@ free_objfile (struct objfile *objfile)
    if (objfile == symfile_objfile)
      symfile_objfile = NULL;
  
@@ -334,10 +334,10 @@ Index: gdb-6.8.50.20090803/gdb/objfiles.
    /* Before the symbol table code was redone to make it easier to
       selectively load and remove information particular to a specific
       linkage unit, gdb used to do these things whenever the monolithic
-Index: gdb-6.8.50.20090803/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090809/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/solib-svr4.c	2009-08-03 21:39:38.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/solib-svr4.c	2009-08-03 21:41:49.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/solib-svr4.c	2009-08-10 14:56:11.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/solib-svr4.c	2009-08-10 14:59:58.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
@@ -999,10 +999,10 @@ Index: gdb-6.8.50.20090803/gdb/solib-svr
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8.50.20090803/gdb/solib.c
+Index: gdb-6.8.50.20090809/gdb/solib.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/solib.c	2009-08-03 21:39:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/solib.c	2009-08-04 05:57:36.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/solib.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/solib.c	2009-08-10 15:07:13.000000000 +0200
 @@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
@@ -1021,35 +1021,7 @@ Index: gdb-6.8.50.20090803/gdb/solib.c
  /*
  
     GLOBAL FUNCTION
-@@ -428,10 +432,23 @@ free_so (struct so_list *so)
-       
-   if (so->abfd)
-     {
--      bfd_filename = bfd_get_filename (so->abfd);
--      if (! bfd_close (so->abfd))
--	warning (_("cannot close \"%s\": %s"),
--		 bfd_filename, bfd_errmsg (bfd_get_error ()));
-+      struct objfile *objfile;
-+
-+      ALL_OBJFILES (objfile)
-+	if (objfile->obfd == so->abfd)
-+	  {
-+	    gdb_assert (objfile->flags & OBJF_KEEPBFD);
-+	    objfile->flags &= ~OBJF_KEEPBFD;
-+	    break;
-+	  }
-+
-+      if (!objfile)
-+	{
-+	  bfd_filename = bfd_get_filename (so->abfd);
-+	  if (! bfd_close (so->abfd))
-+	    warning (_("cannot close \"%s\": %s"),
-+		     bfd_filename, bfd_errmsg (bfd_get_error ()));
-+	}
-     }
- 
-   if (bfd_filename)
-@@ -458,15 +475,40 @@ symbol_add_stub (struct so_list *so, int
+@@ -449,14 +453,38 @@ symbol_add_stub (struct so_list *so, int
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
      {
@@ -1075,25 +1047,22 @@ Index: gdb-6.8.50.20090803/gdb/solib.c
    sap = build_section_addr_info_from_section_table (so->sections,
                                                      so->sections_end);
  
--  so->objfile = symbol_file_add_from_bfd (so->abfd, flags,
--					  sap, OBJF_SHARED | OBJF_KEEPBFD);
+-  so->objfile = symbol_file_add_from_bfd (so->abfd, flags, sap, OBJF_SHARED);
 +  if (so->main)
 +    {
 +      if (debug_solib)
 +        fprintf_unfiltered (gdb_stdlog,
 +			    "symbol_add_stub: adding symbols for main\n");
-+      so->objfile = symbol_file_add_from_bfd (so->abfd, (flags & ~SYMFILE_VERBOSE) | SYMFILE_MAINLINE,
-+					      sap, OBJF_KEEPBFD);
++      so->objfile = symbol_file_add_from_bfd (so->abfd, (flags & ~SYMFILE_VERBOSE) | SYMFILE_MAINLINE, sap, 0);
 +      so->main_relocated = 1;
 +    }
 +  else
-+    so->objfile = symbol_file_add_from_bfd (so->abfd, flags,
-+					    sap, OBJF_SHARED | OBJF_KEEPBFD);
++    so->objfile = symbol_file_add_from_bfd (so->abfd, flags, sap, OBJF_SHARED);
 +
-   free_section_addr_info (sap);
- 
-   return;
-@@ -606,6 +648,10 @@ update_solib_list (int from_tty, struct 
+   p_refcount = xmalloc (sizeof (*p_refcount));
+   *p_refcount = 2;  /* Both solib and objfile refer to this abfd.  */
+   so->abfd->usrdata = p_refcount;
+@@ -600,6 +628,10 @@ update_solib_list (int from_tty, struct 
  	    }
  	  else
  	    {
@@ -1104,7 +1073,7 @@ Index: gdb-6.8.50.20090803/gdb/solib.c
  	      if (! strcmp (gdb->so_original_name, i->so_original_name))
  		break;	      
  	    }
-@@ -660,18 +706,7 @@ update_solib_list (int from_tty, struct 
+@@ -654,18 +686,7 @@ update_solib_list (int from_tty, struct 
        /* Fill in the rest of each of the `struct so_list' nodes.  */
        for (i = inferior; i; i = i->next)
  	{
@@ -1124,7 +1093,7 @@ Index: gdb-6.8.50.20090803/gdb/solib.c
  
  	  /* Notify any observer that the shared object has been
               loaded now that we've added it to GDB's tables.  */
-@@ -781,6 +816,32 @@ solib_add (char *pattern, int from_tty, 
+@@ -775,6 +796,32 @@ solib_add (char *pattern, int from_tty, 
    }
  }
  
@@ -1157,7 +1126,7 @@ Index: gdb-6.8.50.20090803/gdb/solib.c
  
  /*
  
-@@ -1134,4 +1195,12 @@ This takes precedence over the environme
+@@ -1128,4 +1175,12 @@ This takes precedence over the environme
  				     reload_shared_libraries,
  				     show_solib_search_path,
  				     &setlist, &showlist);
@@ -1170,10 +1139,10 @@ Index: gdb-6.8.50.20090803/gdb/solib.c
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8.50.20090803/gdb/solist.h
+Index: gdb-6.8.50.20090809/gdb/solist.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/solist.h	2009-08-03 21:39:08.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/solist.h	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/solist.h	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/solist.h	2009-08-10 14:59:58.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1194,10 +1163,10 @@ Index: gdb-6.8.50.20090803/gdb/solist.h
 +extern int debug_solib;
 +
  #endif
-Index: gdb-6.8.50.20090803/gdb/symfile-mem.c
+Index: gdb-6.8.50.20090809/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile-mem.c	2009-08-03 21:39:38.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile-mem.c	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/symfile-mem.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/symfile-mem.c	2009-08-10 14:59:58.000000000 +0200
 @@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
  	++i;
        }
@@ -1207,10 +1176,10 @@ Index: gdb-6.8.50.20090803/gdb/symfile-m
                                     sai, OBJF_SHARED);
  
    /* This might change our ideas about frames already looked at.  */
-Index: gdb-6.8.50.20090803/gdb/symfile.c
+Index: gdb-6.8.50.20090809/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile.c	2009-08-03 21:39:38.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile.c	2009-08-04 06:02:45.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/symfile.c	2009-08-10 14:59:28.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/symfile.c	2009-08-10 14:59:58.000000000 +0200
 @@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
@@ -1290,7 +1259,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
    free_all_objfiles ();
  
-@@ -3380,6 +3389,8 @@ reread_symbols (void)
+@@ -3387,6 +3396,8 @@ reread_symbols (void)
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
@@ -1299,10 +1268,10 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-Index: gdb-6.8.50.20090803/gdb/target.h
+Index: gdb-6.8.50.20090809/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/target.h	2009-08-03 21:39:39.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/target.h	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/target.h	2009-08-10 14:59:28.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/target.h	2009-08-10 14:59:58.000000000 +0200
 @@ -524,7 +524,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
@@ -1312,10 +1281,10 @@ Index: gdb-6.8.50.20090803/gdb/target.h
  
      /* Search SEARCH_SPACE_LEN bytes beginning at START_ADDR for the
         sequence of bytes in PATTERN with length PATTERN_LEN.
-Index: gdb-6.8.50.20090803/gdb/symfile.h
+Index: gdb-6.8.50.20090809/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile.h	2009-08-03 21:39:38.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile.h	2009-08-03 21:39:39.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/symfile.h	2009-08-10 14:59:28.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/symfile.h	2009-08-10 14:59:58.000000000 +0200
 @@ -229,7 +229,13 @@ enum symfile_add_flags
      SYMFILE_MAINLINE = 1 << 2,
  

gdb-6.6-buildid-locate.patch:
 corelow.c                    |   61 ++++
 doc/gdb.texinfo              |   21 +
 solib-svr4.c                 |   30 +-
 symfile.c                    |  638 +++++++++++++++++++++++++++++++++++++++----
 symfile.h                    |    7 
 testsuite/lib/gdb.exp        |   10 
 testsuite/lib/mi-support.exp |   10 
 7 files changed, 723 insertions(+), 54 deletions(-)

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gdb-6.6-buildid-locate.patch	4 Aug 2009 05:37:28 -0000	1.23
+++ gdb-6.6-buildid-locate.patch	10 Aug 2009 13:22:51 -0000	1.24
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090803/gdb/corelow.c
+Index: gdb-6.8.50.20090809/gdb/corelow.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/corelow.c	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/corelow.c	2009-08-10 14:56:11.000000000 +0200
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -89,10 +89,10 @@ Index: gdb-6.8.50.20090803/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-6.8.50.20090803/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090809/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/doc/gdb.texinfo	2009-08-04 06:31:59.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/doc/gdb.texinfo	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/doc/gdb.texinfo	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/doc/gdb.texinfo	2009-08-10 14:56:11.000000000 +0200
 @@ -13733,6 +13733,27 @@ information files.
  
  @end table
@@ -121,10 +121,10 @@ Index: gdb-6.8.50.20090803/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.50.20090803/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090809/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/solib-svr4.c	2009-08-04 06:29:47.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/solib-svr4.c	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/solib-svr4.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/solib-svr4.c	2009-08-10 14:56:11.000000000 +0200
 @@ -1101,9 +1101,33 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
@@ -162,10 +162,10 @@ Index: gdb-6.8.50.20090803/gdb/solib-svr
  	    }
  	  xfree (buffer);
  
-Index: gdb-6.8.50.20090803/gdb/symfile.c
+Index: gdb-6.8.50.20090809/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile.c	2009-08-04 06:31:58.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile.c	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/symfile.c	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/symfile.c	2009-08-10 14:58:53.000000000 +0200
 @@ -55,6 +55,7 @@
  #include "elf-bfd.h"
  #include "solib.h"
@@ -174,7 +174,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -1193,16 +1194,65 @@ symbol_file_clear (int from_tty)
+@@ -1195,16 +1196,65 @@ symbol_file_clear (int from_tty)
      printf_unfiltered (_("No symbol file now.\n"));
  }
  
@@ -242,7 +242,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  {
    struct build_id *retval;
  
-@@ -1218,6 +1268,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -1220,6 +1270,348 @@ build_id_bfd_get (bfd *abfd)
    return retval;
  }
  
@@ -591,7 +591,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value.  */
  
  static int
-@@ -1235,7 +1627,7 @@ build_id_verify (const char *filename, s
+@@ -1237,7 +1629,7 @@ build_id_verify (const char *filename, s
    if (abfd == NULL)
      return 0;
  
@@ -600,7 +600,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1254,8 +1646,9 @@ build_id_verify (const char *filename, s
+@@ -1256,8 +1648,9 @@ build_id_verify (const char *filename, s
    return retval;
  }
  
@@ -612,7 +612,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  {
    char *link, *s, *retval = NULL;
    gdb_byte *data = build_id->data;
-@@ -1263,7 +1656,9 @@ build_id_to_debug_filename (struct build
+@@ -1265,7 +1658,9 @@ build_id_to_debug_filename (struct build
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
    link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
@@ -623,7 +623,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
    s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
    if (size > 0)
      {
-@@ -1274,12 +1669,14 @@ build_id_to_debug_filename (struct build
+@@ -1276,12 +1671,14 @@ build_id_to_debug_filename (struct build
      *s++ = '/';
    while (size-- > 0)
      s += sprintf (s, "%02x", (unsigned) *data++);
@@ -640,7 +640,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1287,9 +1684,150 @@ build_id_to_debug_filename (struct build
+@@ -1289,9 +1686,150 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -649,9 +649,9 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
 +  else
 +    xfree (link);
 +
-+  return retval;
-+}
-+
+   return retval;
+ }
+ 
 +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
 +     Try to install the hash file ...
 +   avoidance.  */
@@ -674,9 +674,9 @@ Index: gdb-6.8.50.20090803/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)
 +{
@@ -791,7 +791,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1372,32 +1910,36 @@ static char *
+@@ -1374,32 +1912,36 @@ static char *
  find_separate_debug_file (struct objfile *objfile)
  {
    asection *sect;
@@ -836,7 +836,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1405,7 +1947,7 @@ find_separate_debug_file (struct objfile
+@@ -1407,7 +1949,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.  */
@@ -845,18 +845,18 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  
    dir = xstrdup (objfile->name);
  
-@@ -1421,23 +1963,19 @@ find_separate_debug_file (struct objfile
-   gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
-   dir[i+1] = '\0';
+@@ -1429,24 +1971,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
--                      + strlen (dir)
+-                      + i
 -                      + strlen (DEBUG_SUBDIRECTORY)
 -                      + strlen ("/")
 -                      + strlen (basename)
 -                      + 1);
 +  debugfile = xmalloc (strlen (debug_file_directory) + 1
-+		       + strlen (dir)
++		       + i
 +		       + strlen (DEBUG_SUBDIRECTORY)
 +		       + strlen ("/")
 +		       + strlen (basename)
@@ -870,39 +870,42 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
 -    {
 -      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);
-@@ -1446,11 +1984,7 @@ find_separate_debug_file (struct objfile
+@@ -1455,12 +1992,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);
-@@ -1459,11 +1993,7 @@ find_separate_debug_file (struct objfile
+@@ -1469,12 +2001,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.  */
-@@ -1478,20 +2008,18 @@ find_separate_debug_file (struct objfile
+@@ -1488,21 +2015,18 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, basename);
  
        if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -910,17 +913,17 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
 -	  xfree (canon_name);
 -	  xfree (basename);
 -	  xfree (dir);
+-	  xfree (canon_name);
 -	  return xstrdup (debugfile);
 -	}
-+        goto cleanup_return_debugfile;
++	goto cleanup_return_debugfile;
      }
--  
+   
 -  if (canon_name)
 -    xfree (canon_name);
- 
 +  debugfile = NULL;
 +  debug_print_missing (objfile->name, build_id_filename);
-+
+ 
 +cleanup_return_debugfile:
 +  xfree (build_id_filename);
 +  xfree (canon_name);
@@ -931,7 +934,7 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
  }
  
  
-@@ -4243,4 +4771,16 @@ Show printing of symbol loading messages
+@@ -4254,4 +4778,16 @@ Show printing of symbol loading messages
                             NULL,
                             NULL,
                             &setprintlist, &showprintlist);
@@ -948,10 +951,10 @@ Index: gdb-6.8.50.20090803/gdb/symfile.c
 +
 +  observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-6.8.50.20090803/gdb/symfile.h
+Index: gdb-6.8.50.20090809/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/symfile.h	2009-08-04 06:29:47.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/symfile.h	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/symfile.h	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/symfile.h	2009-08-10 14:56:11.000000000 +0200
 @@ -388,6 +388,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);
@@ -966,10 +969,10 @@ Index: gdb-6.8.50.20090803/gdb/symfile.h
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
-Index: gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.50.20090809/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/gdb.exp	2009-08-04 06:29:47.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/lib/gdb.exp	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/testsuite/lib/gdb.exp	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/testsuite/lib/gdb.exp	2009-08-10 14:56:11.000000000 +0200
 @@ -1248,6 +1248,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
@@ -987,10 +990,10 @@ Index: gdb-6.8.50.20090803/gdb/testsuite
      return 0;
  }
  
-Index: gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp
+Index: gdb-6.8.50.20090809/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/testsuite/lib/mi-support.exp	2009-08-04 06:29:47.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/testsuite/lib/mi-support.exp	2009-08-04 06:32:12.000000000 +0200
+--- gdb-6.8.50.20090809.orig/gdb/testsuite/lib/mi-support.exp	2009-08-10 00:50:30.000000000 +0200
++++ gdb-6.8.50.20090809/gdb/testsuite/lib/mi-support.exp	2009-08-10 14:56:11.000000000 +0200
 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } {
  	    }
      	}

gdb-archer.patch:
 bfd/coff-stgo32.c                                            |   97 
 bfd/coffcode.h                                               |    5 
 bfd/libcoff-in.h                                             |    3 
 bfd/libcoff.h                                                |    3 
 gdb/Makefile.in                                              |   95 
 gdb/NEWS                                                     |    7 
 gdb/ada-lang.c                                               |   43 
 gdb/block.c                                                  |   23 
 gdb/block.h                                                  |    2 
 gdb/breakpoint.c                                             |  102 
 gdb/breakpoint.h                                             |    3 
 gdb/c-exp.y                                                  |  252 +
 gdb/c-lang.c                                                 |    6 
 gdb/c-typeprint.c                                            |   47 
 gdb/cli/cli-cmds.c                                           |   72 
 gdb/coffread.c                                               |    3 
 gdb/config.in                                                |    8 
 gdb/config/i386/nm-i386.h                                    |  125 
 gdb/config/i386/nm-linux64.h                                 |   54 
 gdb/config/mips/nm-irix5.h                                   |   44 
 gdb/configure                                                |   79 
 gdb/configure.ac                                             |   47 
 gdb/cp-name-parser.y                                         |    5 
 gdb/cp-namespace.c                                           |  223 +
 gdb/cp-support.c                                             |   88 
 gdb/cp-support.h                                             |   59 
 gdb/dbxread.c                                                |    1 
 gdb/doc/gdb.texinfo                                          |  504 +++
 gdb/doc/gdbint.texinfo                                       |   62 
 gdb/doc/observer.texi                                        |   14 
 gdb/dwarf2-frame.c                                           |   28 
 gdb/dwarf2-frame.h                                           |    4 
 gdb/dwarf2expr.c                                             |   86 
 gdb/dwarf2expr.h                                             |   68 
 gdb/dwarf2loc.c                                              |  356 ++
 gdb/dwarf2loc.h                                              |    6 
 gdb/dwarf2read.c                                             | 1540 +++++++----
 gdb/elfread.c                                                |   11 
 gdb/eval.c                                                   |  170 +
 gdb/expression.h                                             |   11 
 gdb/f-exp.y                                                  |    4 
 gdb/f-lang.c                                                 |  413 --
 gdb/f-lang.h                                                 |   38 
 gdb/f-typeprint.c                                            |   36 
 gdb/f-valprint.c                                             |  267 -
 gdb/findcmd.c                                                |  111 
 gdb/findvar.c                                                |  126 
 gdb/frame.c                                                  |   19 
 gdb/frame.h                                                  |    5 
 gdb/gdbinit.in                                               |   10 
 gdb/gdbserver/linux-i386-low.c                               |  210 +
 gdb/gdbserver/linux-x86-64-low.c                             |  184 +
 gdb/gdbthread.h                                              |    3 
 gdb/gdbtypes.c                                               |  596 +++-
 gdb/gdbtypes.h                                               |  140 -
 gdb/gnu-v3-abi.c                                             |   18 
 gdb/gnulib/Makefile.in                                       |    4 
 gdb/jv-lang.c                                                |    1 
 gdb/language.h                                               |    1 
 gdb/linespec.c                                               |   62 
 gdb/m2-lang.c                                                |    1 
 gdb/machoread.c                                              |    1 
 gdb/main.c                                                   |   80 
 gdb/maint.c                                                  |    8 
 gdb/mdebugread.c                                             |    2 
 gdb/mi/mi-cmd-var.c                                          |  115 
 gdb/mi/mi-cmds.c                                             |    2 
 gdb/mi/mi-cmds.h                                             |    2 
 gdb/mi/mi-main.c                                             |    5 
 gdb/mipsread.c                                               |    1 
 gdb/objfiles.c                                               |   27 
 gdb/objfiles.h                                               |   21 
 gdb/parse.c                                                  |  154 +
 gdb/parser-defs.h                                            |   25 
 gdb/printcmd.c                                               |   90 
 gdb/python/lib/gdb/FrameIterator.py                          |   33 
 gdb/python/lib/gdb/FrameWrapper.py                           |  112 
 gdb/python/lib/gdb/__init__.py                               |   19 
 gdb/python/lib/gdb/backtrace.py                              |   42 
 gdb/python/lib/gdb/command/__init__.py                       |    1 
 gdb/python/lib/gdb/command/alias.py                          |   59 
 gdb/python/lib/gdb/command/backtrace.py                      |  106 
 gdb/python/lib/gdb/command/ignore_errors.py                  |   37 
 gdb/python/lib/gdb/command/pahole.py                         |   75 
 gdb/python/lib/gdb/command/require.py                        |   57 
 gdb/python/lib/gdb/command/save_breakpoints.py               |   65 
 gdb/python/lib/gdb/command/upto.py                           |  129 
 gdb/python/lib/gdb/function/__init__.py                      |    1 
 gdb/python/lib/gdb/function/caller_is.py                     |   58 
 gdb/python/lib/gdb/function/in_scope.py                      |   47 
 gdb/python/python-block.c                                    |  265 +
 gdb/python/python-breakpoint.c                               |  665 ++++
 gdb/python/python-cmd.c                                      |   17 
 gdb/python/python-frame.c                                    |  116 
 gdb/python/python-hooks.c                                    |   50 
 gdb/python/python-inferior.c                                 |  926 ++++++
 gdb/python/python-infthread.c                                |  285 ++
 gdb/python/python-internal.h                                 |   69 
 gdb/python/python-membuf.c                                   |  268 +
 gdb/python/python-param.c                                    |  606 ++++
 gdb/python/python-prettyprint.c                              |   21 
 gdb/python/python-symbol.c                                   |  336 ++
 gdb/python/python-symtab.c                                   |  322 ++
 gdb/python/python-type.c                                     |  170 -
 gdb/python/python-utils.c                                    |   46 
 gdb/python/python-value.c                                    |  123 
 gdb/python/python.c                                          |  384 ++
 gdb/python/python.h                                          |    8 
 gdb/scm-lang.c                                               |    1 
 gdb/scm-valprint.c                                           |    4 
 gdb/solib-darwin.c                                           |    1 
 gdb/solib-spu.c                                              |    7 
 gdb/solib-svr4.c                                             |    4 
 gdb/solib.c                                                  |    3 
 gdb/solist.h                                                 |    2 
 gdb/somread.c                                                |    1 
 gdb/spu-tdep.c                                               |    2 
 gdb/stabsread.c                                              |    4 
 gdb/stack.c                                                  |   38 
 gdb/symfile.c                                                |   55 
 gdb/symfile.h                                                |   12 
 gdb/symmisc.c                                                |    4 
 gdb/symtab.c                                                 |  316 +-
 gdb/symtab.h                                                 |   17 
 gdb/target.h                                                 |   22 
 gdb/testsuite/ChangeLog                                      |   97 
 gdb/testsuite/gdb.arch/powerpc-power7.exp                    |  175 +
 gdb/testsuite/gdb.arch/powerpc-power7.s                      |  107 
 gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S              |  455 +++
 gdb/testsuite/gdb.arch/x86_64-vla-typedef.c                  |   43 
 gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp                |   64 
 gdb/testsuite/gdb.base/arrayidx.c                            |    7 
 gdb/testsuite/gdb.base/arrayidx.exp                          |   10 
 gdb/testsuite/gdb.base/help.exp                              |    2 
 gdb/testsuite/gdb.base/lineno-makeup-func.c                  |   21 
 gdb/testsuite/gdb.base/lineno-makeup.c                       |   35 
 gdb/testsuite/gdb.base/lineno-makeup.exp                     |   78 
 gdb/testsuite/gdb.base/macscp.exp                            |    8 
 gdb/testsuite/gdb.base/radix.exp                             |    7 
 gdb/testsuite/gdb.base/valgrind-attach.c                     |   28 
 gdb/testsuite/gdb.base/valgrind-attach.exp                   |   94 
 gdb/testsuite/gdb.base/valgrind-attach.sh                    |   20 
 gdb/testsuite/gdb.base/vla-overflow.c                        |   30 
 gdb/testsuite/gdb.base/vla-overflow.exp                      |  108 
 gdb/testsuite/gdb.base/vla.c                                 |   55 
 gdb/testsuite/gdb.base/vla.exp                               |   62 
 gdb/testsuite/gdb.cp/cp-relocate.exp                         |    6 
 gdb/testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 gdb/testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 gdb/testsuite/gdb.cp/expand-sals.exp                         |    2 
 gdb/testsuite/gdb.cp/member-ptr.cc                           |   17 
 gdb/testsuite/gdb.cp/member-ptr.exp                          |   34 
 gdb/testsuite/gdb.cp/namespace-multiple-imports.cc           |   20 
 gdb/testsuite/gdb.cp/namespace-multiple-imports.exp          |   49 
 gdb/testsuite/gdb.cp/namespace-nested-imports.cc             |   36 
 gdb/testsuite/gdb.cp/namespace-nested-imports.exp            |   57 
 gdb/testsuite/gdb.cp/namespace-no-imports.cc                 |   37 
 gdb/testsuite/gdb.cp/namespace-no-imports.exp                |   76 
 gdb/testsuite/gdb.cp/namespace-recursive.cc                  |   16 
 gdb/testsuite/gdb.cp/namespace-recursive.exp                 |   53 
 gdb/testsuite/gdb.cp/namespace-using.cc                      |  128 
 gdb/testsuite/gdb.cp/namespace-using.exp                     |  130 
 gdb/testsuite/gdb.cp/namespace.exp                           |   23 
 gdb/testsuite/gdb.cp/overload.exp                            |    8 
 gdb/testsuite/gdb.cp/ovldbreak.exp                           |   46 
 gdb/testsuite/gdb.cp/shadowing.cc                            |   48 
 gdb/testsuite/gdb.cp/shadowing.exp                           |   91 
 gdb/testsuite/gdb.dwarf2/dw2-stripped.c                      |   42 
 gdb/testsuite/gdb.dwarf2/dw2-stripped.exp                    |   79 
 gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S   |   83 
 gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp |   37 
 gdb/testsuite/gdb.fortran/common-block.exp                   |  101 
 gdb/testsuite/gdb.fortran/common-block.f90                   |   67 
 gdb/testsuite/gdb.fortran/dwarf-stride.exp                   |   42 
 gdb/testsuite/gdb.fortran/dwarf-stride.f90                   |   40 
 gdb/testsuite/gdb.fortran/dynamic.exp                        |  158 +
 gdb/testsuite/gdb.fortran/dynamic.f90                        |   98 
 gdb/testsuite/gdb.fortran/logical.exp                        |   44 
 gdb/testsuite/gdb.fortran/logical.f90                        |   33 
 gdb/testsuite/gdb.fortran/string.exp                         |   72 
 gdb/testsuite/gdb.fortran/string.f90                         |   37 
 gdb/testsuite/gdb.gdb/selftest.exp                           |    4 
 gdb/testsuite/gdb.mi/gdb701.exp                              |    2 
 gdb/testsuite/gdb.mi/mi-var-display.exp                      |    4 
 gdb/testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 gdb/testsuite/gdb.opt/array-from-register-func.c             |   22 
 gdb/testsuite/gdb.opt/array-from-register.c                  |   28 
 gdb/testsuite/gdb.opt/array-from-register.exp                |   33 
 gdb/testsuite/gdb.python/Makefile.in                         |    2 
 gdb/testsuite/gdb.python/python-cmd.exp                      |   27 
 gdb/testsuite/gdb.python/python-frame.exp                    |   48 
 gdb/testsuite/gdb.python/python-function.exp                 |   27 
 gdb/testsuite/gdb.python/python-inferior.c                   |   49 
 gdb/testsuite/gdb.python/python-inferior.exp                 |  201 +
 gdb/testsuite/gdb.python/python-infthread.c                  |   14 
 gdb/testsuite/gdb.python/python-infthread.exp                |   58 
 gdb/testsuite/gdb.python/python-mi.exp                       |   96 
 gdb/testsuite/gdb.python/python-prettyprint.c                |   13 
 gdb/testsuite/gdb.python/python-prettyprint.exp              |   11 
 gdb/testsuite/gdb.python/python-prettyprint.py               |   12 
 gdb/testsuite/gdb.python/python-template.exp                 |   25 
 gdb/testsuite/gdb.python/python-value.exp                    |   68 
 gdb/testsuite/gdb.python/python.exp                          |   27 
 gdb/testsuite/lib/cp-support.exp                             |    3 
 gdb/testsuite/lib/gdb.exp                                    |    1 
 gdb/testsuite/lib/mi-support.exp                             |   86 
 gdb/testsuite/lib/python-support.exp                         |   53 
 gdb/thread.c                                                 |   18 
 gdb/top.c                                                    |    1 
 gdb/typeprint.c                                              |   14 
 gdb/typeprint.h                                              |    3 
 gdb/ui-file.c                                                |   20 
 gdb/ui-file.h                                                |    6 
 gdb/utils.c                                                  |    7 
 gdb/valarith.c                                               |   45 
 gdb/valops.c                                                 |  254 +
 gdb/valprint.c                                               |    3 
 gdb/value.c                                                  |  211 +
 gdb/value.h                                                  |   12 
 gdb/varobj.c                                                 |  731 +++--
 gdb/varobj.h                                                 |   32 
 gdb/xcoffread.c                                              |    1 
 include/coff/go32exe.h                                       |    6 
 include/coff/internal.h                                      |   13 
 224 files changed, 16278 insertions(+), 2683 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.19 -r 1.20 gdb-archer.patchIndex: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gdb-archer.patch	4 Aug 2009 05:37:28 -0000	1.19
+++ gdb-archer.patch	10 Aug 2009 13:22:51 -0000	1.20
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 0222cb1f4ddd1eda32965e464cb60b1e44e110b2
+commit 93ec16e6f5000dd64d433d86674e820ed0f35b72
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -10,12 +10,289 @@ archer-tromey-delayed-symfile
 archer-tromey-dw-op-value
 archer-jankratochvil-vla
 archer-jankratochvil-misc
-archer-jankratochvil-expr-cumulative
-	archer-keiths-expr-cumulative
-archer-jankratochvil-python
-	archer-tromey-python
+archer-keiths-expr-cumulative
+archer-tromey-python
 
 
+diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
+index b8928be..8bf7667 100644
+--- a/bfd/coff-stgo32.c
++++ b/bfd/coff-stgo32.c
+@@ -102,9 +102,6 @@ static bfd_boolean
+ 
+ #include "coff-i386.c"
+ 
+-/* I hold in the usrdata the stub.  */
+-#define bfd_coff_go32stub bfd_usrdata
+-
+ /* This macro is used, because I cannot assume the endianess of the
+    host system.  */
+ #define _H(index) (H_GET_16 (abfd, (header+index*2)))
+@@ -112,7 +109,7 @@ static bfd_boolean
+ /* These bytes are a 2048-byte DOS executable, which loads the COFF
+    image into memory and then runs it. It is called 'stub'.  */
+ 
+-static const unsigned char stub_bytes[STUBSIZE] =
++static const unsigned char stub_bytes[GO32_STUBSIZE] =
+ {
+ #include "go32stub.h"
+ };
+@@ -120,7 +117,7 @@ static const unsigned char stub_bytes[STUBSIZE] =
+ /*
+    I have not commented each swap function below, because the
+    technique is in any function the same. For the ...in function,
+-   all the pointers are adjusted by adding STUBSIZE and for the
++   all the pointers are adjusted by adding GO32_STUBSIZE and for the
+    ...out function, it is subtracted first and after calling the
+    standard swap function it is reset to the old value.  */
+ 
+@@ -132,25 +129,20 @@ static const unsigned char stub_bytes[STUBSIZE] =
+ 
+ static void
+ adjust_filehdr_in_post  (abfd, src, dst)
+-     bfd *abfd;
++     bfd *abfd ATTRIBUTE_UNUSED;
+      PTR src;
+      PTR dst;
+ {
+   FILHDR *filehdr_src = (FILHDR *) src;
+   struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
+ 
+-  ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
++  ADJUST_VAL (filehdr_dst->f_symptr, GO32_STUBSIZE);
+ 
+-  /* Save now the stub to be used later.  */
+-  bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, (bfd_size_type) STUBSIZE);
+-
+-  /* Since this function returns no status, I do not set here
+-     any bfd_error_...
+-     That means, before the use of bfd_coff_go32stub (), this value
+-     should be checked if it is != NULL.  */
+-  if (bfd_coff_go32stub (abfd) == NULL)
+-    return;
+-  memcpy (bfd_coff_go32stub (abfd), filehdr_src->stub, STUBSIZE);
++  /* Save now the stub to be used later.  Put the stub data to FILEHDR_DST
++     first as coff_data (abfd) still does not exist.  It may not even be ever
++     created as we are just checking the file format of ABFD.  */
++  memcpy (filehdr_dst->go32stub, filehdr_src->stub, GO32_STUBSIZE);
++  filehdr_dst->f_flags |= F_GO32STUB;
+ }
+ 
+ static void
+@@ -166,13 +158,13 @@ adjust_filehdr_out_pre  (abfd, in, out)
+   create_go32_stub (abfd);
+ 
+   /* Copy the stub to the file header.  */
+-  if (bfd_coff_go32stub (abfd) != NULL)
+-    memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
++  if (coff_data (abfd)->go32stub != NULL)
++    memcpy (filehdr_out->stub, coff_data (abfd)->go32stub, GO32_STUBSIZE);
+   else
+     /* Use the default.  */
+-    memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
++    memcpy (filehdr_out->stub, stub_bytes, GO32_STUBSIZE);
+ 
+-  ADJUST_VAL (filehdr_in->f_symptr, -STUBSIZE);
++  ADJUST_VAL (filehdr_in->f_symptr, -GO32_STUBSIZE);
+ }
+ 
+ static void
+@@ -183,7 +175,7 @@ adjust_filehdr_out_post  (abfd, in, out)
+ {
+   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+   /* Undo the above change.  */
+-  ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
++  ADJUST_VAL (filehdr_in->f_symptr, GO32_STUBSIZE);
+ }
+ 
+ static void
+@@ -194,9 +186,9 @@ adjust_scnhdr_in_post  (abfd, ext, in)
+ {
+   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+ 
+-  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
+-  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
+-  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);
+ }
+ 
+ static void
+@@ -207,9 +199,9 @@ adjust_scnhdr_out_pre  (abfd, in, out)
+ {
+   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+ 
+-  ADJUST_VAL (scnhdr_int->s_scnptr, -STUBSIZE);
+-  ADJUST_VAL (scnhdr_int->s_relptr, -STUBSIZE);
+-  ADJUST_VAL (scnhdr_int->s_lnnoptr, -STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_scnptr, -GO32_STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_relptr, -GO32_STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_lnnoptr, -GO32_STUBSIZE);
+ }
+ 
+ static void
+@@ -220,9 +212,9 @@ adjust_scnhdr_out_post (abfd, in, out)
+ {
+   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+ 
+-  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
+-  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
+-  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
++  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);
+ }
+ 
+ static void
+@@ -239,7 +231,7 @@ adjust_aux_in_post  (abfd, ext1, type, class, indx, numaux, in1)
+ 
+   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+     {
+-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
++      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
+     }
+ }
+ 
+@@ -257,7 +249,7 @@ adjust_aux_out_pre  (abfd, inp, type, class, indx, numaux, extp)
+ 
+   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+     {
+-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -STUBSIZE);
++      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -GO32_STUBSIZE);
+     }
+ }
+ 
+@@ -275,7 +267,7 @@ adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
+ 
+   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+     {
+-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
++      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
+     }
+ }
+ 
+@@ -296,7 +288,7 @@ create_go32_stub (abfd)
+      bfd *abfd;
+ {
+   /* Do it only once.  */
+-  if (bfd_coff_go32stub (abfd) == NULL)
++  if (coff_data (abfd)->go32stub == NULL)
+     {
+       char *stub;
+       struct stat st;
+@@ -362,32 +354,32 @@ create_go32_stub (abfd)
+ 	  goto stub_end;
+ 	}
+       /* Now we found a correct stub (hopefully).  */
[...4682 lines suppressed...]
+       else
+ 	{
+ 	  tmp_var->obj_name = xstrdup (var->obj_name);
++	  tmp_var->from = var->from;
++	  tmp_var->to = var->to;
+ 	  varobj_delete (var, NULL, 0);
  
-@@ -3173,6 +3287,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+ 	  install_variable (tmp_var);
+@@ -3173,6 +3365,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -25316,7 +26286,7 @@ index 4a94988..9bfc130 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3190,48 +3317,110 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3190,48 +3395,110 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }
@@ -25454,8 +26424,12 @@ index 4a94988..9bfc130 100644
  	  tmp_var->obj_name = xstrdup (var->obj_name);
  	  varobj_delete (var, NULL, 0);
  	  install_variable (tmp_var);
-@@ -3243,12 +3432,61 @@ varobj_invalidate_iter (struct varobj *var, void *unused)
-     var->root->is_valid = 0;
+@@ -3239,16 +3506,64 @@ varobj_invalidate_iter (struct varobj *var, void *unused)
+       else
+ 	var->root->is_valid = 0;
+     }
+-  else /* locals must be invalidated.  */
+-    var->root->is_valid = 0;
  }
  
 -/* Invalidate the varobjs that are tied to locals and re-create the ones that
@@ -25467,8 +26441,7 @@ index 4a94988..9bfc130 100644
 -varobj_invalidate (void)
 +static void 
 +varobj_invalidate (struct objfile *objfile)
- {
--  all_root_varobjs (varobj_invalidate_iter, NULL);
++{
 +  /* Check all the VAROBJs, even non-root ones.  Child VAROBJs can reference
 +     types from other OBJFILEs through TYPE_IS_OPAQUE resolutions by
 +     check_typedef.  */
@@ -25495,7 +26468,8 @@ index 4a94988..9bfc130 100644
 +
 +static void
 +varobj_revalidate_for_objfile (struct objfile *objfile)
-+{
+ {
+-  all_root_varobjs (varobj_invalidate_iter, NULL);
 +  varobj_revalidate ();
 +}
 +

@@ -25517,29 +26491,58 @@ index 4a94988..9bfc130 100644
 +			    show_varobjdebug,
 +			    &setlist, &showlist);
 +
++
 +  observer_attach_objfile_unloading (varobj_invalidate );
 +  observer_attach_objfile_unloaded (varobj_revalidate);
 +  observer_attach_new_objfile (varobj_revalidate_for_objfile);
 +  observer_attach_mark_used (varobj_types_mark_used);
  }
 diff --git a/gdb/varobj.h b/gdb/varobj.h
-index 7297243..aabd743 100644
+index 7297243..fbe2f2f 100644
 --- a/gdb/varobj.h
 +++ b/gdb/varobj.h
-@@ -112,6 +112,12 @@ extern void varobj_set_frozen (struct varobj *var, int frozen);
+@@ -78,6 +78,12 @@ typedef struct varobj_update_result_t
+      new value of varobj is already computed and installed, or has to
+      be yet installed.  Don't use this outside varobj.c */
+   int value_installed;  
++
++  /* This will be non-NULL when new children were added to the varobj.
++     It lists the new children (which must necessarily come at the end
++     of the child list) added during an update.  The caller is
++     responsible for freeing this vector.  */
++  VEC (varobj_p) *new;
+ } varobj_update_result;
+ 
+ DEF_VEC_O (varobj_update_result);
+@@ -112,13 +118,24 @@ extern void varobj_set_frozen (struct varobj *var, int frozen);
  
  extern int varobj_get_frozen (struct varobj *var);
  
-+extern void varobj_get_child_range (struct varobj *var,
-+				    VEC (varobj_p) *children,
-+				    int *from, int *to);
++extern void varobj_get_child_range (struct varobj *var, int *from, int *to);
 +
 +extern void varobj_set_child_range (struct varobj *var, int from, int to);
 +
  extern char *varobj_get_display_hint (struct varobj *var);
  
  extern int varobj_get_num_children (struct varobj *var);
-@@ -143,12 +149,13 @@ extern void all_root_varobjs (void (*func) (struct varobj *var, void *data),
+ 
+-/* Return the list of children of VAR.  The returned vector
+-   should not be modified in any way.  */
+-extern VEC (varobj_p)* varobj_list_children (struct varobj *var);
++/* Return the list of children of VAR.  The returned vector should not
++   be modified in any way.  FROM and TO are in/out parameters
++   indicating the range of children to return.  If either *FROM or *TO
++   is less than zero on entry, then all children will be returned.  On
++   return, *FROM and *TO will be updated to indicate the real range
++   that was returned.  The resulting VEC will contain at least the
++   children from *FROM to just before *TO; it might contain more
++   children, depending on whether any more were available.  */
++extern VEC (varobj_p)* varobj_list_children (struct varobj *var,
++					     int *from, int *to);
+ 
+ extern char *varobj_get_type (struct varobj *var);
+ 
+@@ -143,12 +160,15 @@ extern void all_root_varobjs (void (*func) (struct varobj *var, void *data),
  extern VEC(varobj_update_result) *varobj_update (struct varobj **varp, 
  						 int explicit);
  
@@ -25554,6 +26557,8 @@ index 7297243..aabd743 100644
 +varobj_set_visualizer (struct varobj *var, const char *visualizer);
 +
 +extern void varobj_enable_pretty_printing (void);
++
++extern int varobj_has_more (struct varobj *var, int to);
  
  #endif /* VAROBJ_H */
 diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
@@ -25568,3 +26573,68 @@ index c56ab86..dacf913 100644
    xcoff_symfile_finish,		/* sym_finish: finished with file, cleanup */
    xcoff_symfile_offsets,	/* sym_offsets: xlate offsets ext->int form */
    default_symfile_segments,	/* sym_segments: Get segment information from
+diff --git a/include/coff/go32exe.h b/include/coff/go32exe.h
+index c85da0c..2248ff2 100644
+--- a/include/coff/go32exe.h
++++ b/include/coff/go32exe.h
+@@ -16,11 +16,9 @@
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+ 
+-#define STUBSIZE 2048
+-
+ struct external_filehdr_go32_exe
+   {
+-    char stub[STUBSIZE];/* the stub to load the image	*/
++    char stub[GO32_STUBSIZE]; /* the stub to load the image */
+ 			/* the standard COFF header     */
+     char f_magic[2];	/* magic number			*/
+     char f_nscns[2];	/* number of sections		*/
+@@ -34,4 +32,4 @@ struct external_filehdr_go32_exe
+ #undef FILHDR
+ #define	FILHDR	struct external_filehdr_go32_exe
+ #undef FILHSZ
+-#define	FILHSZ	STUBSIZE+20
++#define	FILHSZ	GO32_STUBSIZE+20
+diff --git a/include/coff/internal.h b/include/coff/internal.h
+index c5d6cd1..36d03eb 100644
+--- a/include/coff/internal.h
++++ b/include/coff/internal.h
+@@ -58,10 +58,19 @@ struct internal_extra_pe_filehdr
+   bfd_vma  nt_signature;   	/* required NT signature, 0x4550 */ 
+ };
+ 
++#define GO32_STUBSIZE 2048
++
+ struct internal_filehdr
+ {
+   struct internal_extra_pe_filehdr pe;
+ 
++  /* coff-stgo32 EXE stub header before BFD tdata has been allocated.
++     Its data is kept in INTERNAL_FILEHDR.GO32STUB afterwards.
++     
++     F_GO32STUB is set iff go32stub contains a valid data.  Artifical headers
++     created in BFD have no pre-set go32stub.  */
++  char go32stub[GO32_STUBSIZE];
++
+   /* Standard coff internal info.  */
+   unsigned short f_magic;	/* magic number			*/
+   unsigned short f_nscns;	/* number of sections		*/
+@@ -84,7 +93,8 @@ struct internal_filehdr
+  	F_AR32W		file is 32-bit big-endian
+  	F_DYNLOAD	rs/6000 aix: dynamically loadable w/imports & exports
+  	F_SHROBJ	rs/6000 aix: file is a shared object
+-        F_DLL           PE format DLL.  */
++	F_DLL           PE format DLL
++	F_GO32STUB      Field go32stub contains valid data.  */
+ 
+ #define	F_RELFLG	(0x0001)
+ #define	F_EXEC		(0x0002)
+@@ -96,6 +106,7 @@ struct internal_filehdr
+ #define	F_DYNLOAD	(0x1000)
+ #define	F_SHROBJ	(0x2000)
+ #define F_DLL           (0x2000)
++#define F_GO32STUB      (0x4000)
+ 
+ /* Extra structure which is used in the optional header.  */
+ typedef struct _IMAGE_DATA_DIRECTORY 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- gdb.spec	4 Aug 2009 07:03:44 -0000	1.369
+++ gdb.spec	10 Aug 2009 13:22:51 -0000	1.370
@@ -10,7 +10,7 @@ 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.50.20090803
+Version: 6.8.50.20090810
 
 # 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.
@@ -217,8 +217,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.20090803 snapshot fixups.
-#Patch232: gdb-6.8.50.20090803-upstream.patch
+# Backported post gdb-6.8.50.20090810 snapshot fixups.
+#Patch232: gdb-6.8.50.20090810-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -825,6 +825,10 @@ fi
 %endif
 
 %changelog
+* Mon Aug 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090810-1
+- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090810
+- archer-jankratochvil-fedora12 commit: 93ec16e6f5000dd64d433d86674e820ed0f35b72
+
 * Tue Aug  4 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090803-2
 - Drop the bundled libstdc++ python - it should be packaged on its own now.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	4 Aug 2009 05:37:29 -0000	1.32
+++ sources	10 Aug 2009 13:22:51 -0000	1.33
@@ -1 +1 @@
-f120526b72a3dfd29e9f06a562e34aa1  gdb-6.8.50.20090803.tar.bz2
+b4549498345849458464c8fe2503a37c  gdb-6.8.50.20090810.tar.bz2



From varekova at fedoraproject.org  Mon Aug 10 13:24:25 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 13:24:25 +0000 (UTC)
Subject: rpms/mpfr/devel mpfr.spec,1.14,1.15
Message-ID: <20090810132425.6239C11C0344@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/mpfr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6175

Modified Files:
	mpfr.spec 
Log Message:
- fix installation with --excludedocs option (#515958)



Index: mpfr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/mpfr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mpfr.spec	25 Jul 2009 15:13:23 -0000	1.14
+++ mpfr.spec	10 Aug 2009 13:24:25 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
 Version: 2.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.mpfr.org/
 Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.bz2
 License: LGPLv2+ and GPLv2+ and GFDL
@@ -61,11 +61,15 @@ make %{?_smp_mflags} check
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/mpfr.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/mpfr.info.gz ]; then
+    /sbin/install-info %{_infodir}/mpfr.info.gz %{_infodir}/dir || :
+fi
 
 %preun devel
 if [ "$1" = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/mpfr.info.gz %{_infodir}/dir || :
+    if [ -f %{_infodir}/mpfr.info.gz ]; then
+	/sbin/install-info --delete %{_infodir}/mpfr.info.gz %{_infodir}/dir || :
+    fi
 fi
 
 %clean
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/mpfr.info*
 
 %changelog
+* Mon Aug 10 2009 Ivana Varekova <varekova redhat com> 2.4.1-3
+- fix installation with --excludedocs option (#515958)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Mon Aug 10 13:25:18 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 13:25:18 +0000 (UTC)
Subject: rpms/cflow/devel .cvsignore, 1.2, 1.3 cflow.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <20090810132518.9AA7011C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cflow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6450

Modified Files:
	.cvsignore cflow.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-5
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cflow/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 May 2008 20:13:23 -0000	1.2
+++ .cvsignore	10 Aug 2009 13:25:18 -0000	1.3
@@ -1 +1 @@
-cflow-1.2.tar.gz
+cflow-1.2.tar.bz2


Index: cflow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cflow/devel/cflow.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cflow.spec	24 Jul 2009 18:50:13 -0000	1.3
+++ cflow.spec	10 Aug 2009 13:25:18 -0000	1.4
@@ -1,11 +1,11 @@
 Summary:         Analyzes C files charting control flow within the program
 Name:            cflow
 Version:         1.2
-Release:         4%{?dist}
+Release:         5%{?dist}
 License:         GPLv2+
 Group:           Development/Languages
 URL:             http://www.gnu.org/software/cflow/
-Source0:         http://ftp.gnu.org/gnu/cflow/%{name}-%{version}.tar.gz
+Source0:         http://ftp.gnu.org/gnu/cflow/%{name}-%{version}.tar.bz2
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # to install lisp files
 BuildRequires:   emacs
@@ -56,6 +56,9 @@ fi
 %{_datadir}/emacs/site-lisp/%{name}-mode.el
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-5
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cflow/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 May 2008 20:13:23 -0000	1.2
+++ sources	10 Aug 2009 13:25:18 -0000	1.3
@@ -1 +1 @@
-e0ef18aef99d1e7115b0b50d361ac6f7  cflow-1.2.tar.gz
+860fc15fe9e9aaf42930af5191c518a7  cflow-1.2.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 13:37:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 13:37:10 +0000 (UTC)
Subject: rpms/cluster-glue/devel .cvsignore, 1.2, 1.3 cluster-glue.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090810133710.1783511C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8872

Modified Files:
	.cvsignore cluster-glue.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-0.8.75cab275433e.hg
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 06:49:37 -0000	1.2
+++ .cvsignore	10 Aug 2009 13:37:09 -0000	1.3
@@ -1 +1 @@
-75cab275433e.tar.gz
+75cab275433e.tar.bz2


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cluster-glue.spec	5 Aug 2009 11:00:07 -0000	1.3
+++ cluster-glue.spec	10 Aug 2009 13:37:09 -0000	1.4
@@ -13,11 +13,11 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}7%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}8%{?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.gz
+Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
 
 ## Setup/build bits
 
@@ -165,6 +165,9 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-0.8.75cab275433e.hg
+- Use bzipped upstream tarball.
+
 * Tue Jul  28 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.7.75cab275433e.hg
 - Add a leading zero to the revision when alphatag is used
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 06:49:37 -0000	1.2
+++ sources	10 Aug 2009 13:37:09 -0000	1.3
@@ -1 +1 @@
-a9aba6ae59030a148dd95bfea163852c  75cab275433e.tar.gz
+1b472f73e6c570f0169edc7d53094470  75cab275433e.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 13:41:16 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 13:41:16 +0000 (UTC)
Subject: rpms/CodeAnalyst-gui/devel .cvsignore, 1.3, 1.4 CodeAnalyst-gui.spec,
	1.11, 1.12 sources, 1.3, 1.4
Message-ID: <20090810134116.E782D11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/CodeAnalyst-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9634

Modified Files:
	.cvsignore CodeAnalyst-gui.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.8.54-19
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Jul 2009 19:55:05 -0000	1.3
+++ .cvsignore	10 Aug 2009 13:41:16 -0000	1.4
@@ -1 +1 @@
-CodeAnalyst-gui-2.8.54.tar.gz
+CodeAnalyst-gui-2.8.54.tar.bz2


Index: CodeAnalyst-gui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/CodeAnalyst-gui.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- CodeAnalyst-gui.spec	24 Jul 2009 15:04:49 -0000	1.11
+++ CodeAnalyst-gui.spec	10 Aug 2009 13:41:16 -0000	1.12
@@ -1,12 +1,12 @@
 Summary:       CodeAnalyst is a Performance Analysis Suite for AMD-based System
 Name:          CodeAnalyst-gui
 Version:       2.8.54
-Release:       18%{?dist}
+Release:       19%{?dist}
 License:       GPLv2
 Group:         Development/System
 URL:           http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux
 
-Source0:       http://ftp-developer.amd.com/user/ssuthiku/Releases/%{name}-%{version}.tar.gz 
+Source0:       http://ftp-developer.amd.com/user/ssuthiku/Releases/%{name}-%{version}.tar.bz2
 Source1:       CodeAnalyst-gui.desktop
 Source2:       DiffAnalyst-gui.desktop
 
@@ -161,6 +161,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.8.54-19
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.54-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jul 2009 19:55:05 -0000	1.3
+++ sources	10 Aug 2009 13:41:16 -0000	1.4
@@ -1 +1 @@
-ebd48e2c8498d45bfcc774d54dfdf789  CodeAnalyst-gui-2.8.54.tar.gz
+4e4806a14b98b1f748d455f927dcb2f7  CodeAnalyst-gui-2.8.54.tar.bz2



From caolanm at fedoraproject.org  Mon Aug 10 13:53:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 10 Aug 2009 13:53:09 +0000 (UTC)
Subject: rpms/hunspell-fo/devel .cvsignore, 1.6, 1.7 hunspell-fo.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <20090810135309.B076611C0344@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-fo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11742

Modified Files:
	.cvsignore hunspell-fo.spec sources 
Log Message:
a .bz2 is available


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 May 2009 11:27:38 -0000	1.6
+++ .cvsignore	10 Aug 2009 13:53:09 -0000	1.7
@@ -1 +1 @@
-myspell-fo-0.2.36.tar.gz
+myspell-fo-0.2.36.tar.bz2


Index: hunspell-fo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/hunspell-fo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hunspell-fo.spec	25 Jul 2009 02:25:48 -0000	1.8
+++ hunspell-fo.spec	10 Aug 2009 13:53:09 -0000	1.9
@@ -1,8 +1,8 @@
 Name: hunspell-fo
 Summary: Faroese hunspell dictionaries
 Version: 0.2.36
-Release: 3%{?dist}
-Source: http://fo.speling.org/filer/myspell-fo-%{version}.tar.gz
+Release: 4%{?dist}
+Source: http://fo.speling.org/filer/myspell-fo-%{version}.tar.bz2
 Group: Applications/Text
 URL: http://fo.speling.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Aug 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.2.36-4
+- .gz -> .bz2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.36-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fo/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 May 2009 11:27:38 -0000	1.6
+++ sources	10 Aug 2009 13:53:09 -0000	1.7
@@ -1 +1 @@
-8ab30bb93d8aa7b349c299b06ef86985  myspell-fo-0.2.36.tar.gz
+29a2a6f1b85f3b957497763957a8755f  myspell-fo-0.2.36.tar.bz2



From varekova at fedoraproject.org  Mon Aug 10 13:54:41 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 13:54:41 +0000 (UTC)
Subject: rpms/gnuplot/devel gnuplot.spec,1.71,1.72
Message-ID: <20090810135441.82BAF11C0344@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12712

Modified Files:
	gnuplot.spec 
Log Message:
- fix installation with --excludedocs option (#515963)



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- gnuplot.spec	25 Jul 2009 00:58:50 -0000	1.71
+++ gnuplot.spec	10 Aug 2009 13:54:41 -0000	1.72
@@ -17,7 +17,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
@@ -172,7 +172,9 @@ install -p -m 755 ./src/gnuplot-minimal 
 %{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-wx 60
 
 %post common
-/sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
+if [ -f %{_infodir}/gnuplot.info ]; then
+    /sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
+fi
 
 %posttrans minimal
 %{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-minimal 40
@@ -184,7 +186,9 @@ fi
 
 %preun common
 if [ $1 = 0 ] ; then # last uninstall
-   /sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
+    if [ -f %{_infodir}/gnuplot.info ]; then
+	/sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
+    fi
 fi
 
 %preun minimal
@@ -242,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
 
 %changelog
+* Mon Aug 10 2009 Ivana Varekova <varekova redhat com> 4.2.5-6
+- fix installation with --excludedocs option (#515963)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Mon Aug 10 13:55:46 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 10 Aug 2009 13:55:46 +0000 (UTC)
Subject: rpms/filesystem/devel iso_3166.sed, NONE, 1.1 iso_639.sed, NONE,
	1.1 filesystem.spec, 1.62, 1.63
Message-ID: <20090810135546.3F4C111C0344@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12986

Modified Files:
	filesystem.spec 
Added Files:
	iso_3166.sed iso_639.sed 
Log Message:
iso_codes package no longer provides tab files, do generate them on fly with sed (thanks D. Tardon)


--- NEW FILE iso_3166.sed ---
1,/<iso_3166_entries/b

# on each new iso-code process the current one
\!\(<iso_3166_entry\|</iso_3166_entries>\)!{
    x
    s/^$//
    # we are on the first iso-code--nothing to process here
    t
    # process and write to output
    s/\s\+/ /g
    s/<iso_3166_entry//
    s!/\s*>!!
    # use '%' as a separator of parsed and unparsed input
    s/\(.*\)alpha_2_code="\([^"]\+\)"\(.*\)/\2 % \1 \3/
    s/\([^%]\+\)%\(.*\)alpha_3_code="\([^"]\+\)"\(.*\)/\1% \2 \4/
    #  clear subst. memory for the next t
    t clear
    :clear
    s/\([^%]\+\)%\(.*\)numeric_code="\([^"]\+\)"\(.*\)/\1% \2 \4/
    t name
    # no 3166 code--write xx
    s/%/\tXX %/
    :name
    s/\([^%]\+\)%\(.*\)name="\([^"]\+\)"\(.*\)/\1\t\3/
    s/ \t/\t/g
    p
    b
    :noout
}

H


--- NEW FILE iso_639.sed ---
1,/<iso_639_entries/b

# on each new iso-code process the current one
\!\(<iso_639_entry\|</iso_639_entries>\)!{
    x
    s/^$//
    # we are on the first iso-code--nothing to process here
    t
    # process and write to output
    s/\s\+/ /g
    s/<iso_639_entry//
    s!/\s*>!!
    # use '%' as a separator of parsed and unparsed input
    s/\(.*\)iso_639_2T_code="\([^"]\+\)"\(.*\)/\2 % \1 \3/
    s/\([^%]\+\)%\(.*\)iso_639_2B_code="\([^"]\+\)"\(.*\)/\1\t\3 % \2 \4/
    #  clear subst. memory for the next t
    t clear
    :clear
    s/\([^%]\+\)%\(.*\)iso_639_1_code="\([^"]\+\)"\(.*\)/\1\t\3 % \2 \4/
    t name
    # no 639-1 code--write xx
    s/%/\tXX %/
    :name
    s/\([^%]\+\)%\(.*\)name="\([^"]\+\)"\(.*\)/\1\t\3/
    s/ \t/\t/g
    p
    b
    :noout
}

H


Index: filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- filesystem.spec	5 Aug 2009 10:12:20 -0000	1.62
+++ filesystem.spec	10 Aug 2009 13:55:46 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.28
+Version: 2.4.29
 Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
@@ -8,6 +8,8 @@ Group: System Environment/Base
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Raw source1 URL: https://fedorahosted.org/filesystem/browser/lang-exceptions?format=raw
 Source1: https://fedorahosted.org/filesystem/browser/lang-exceptions
+Source2: iso_639.sed
+Source3: iso_3166.sed
 Requires(Pre): setup >= 2.5.4-1
 BuildRequires: iso-codes
 
@@ -31,6 +33,8 @@ rm -f $RPM_BUILD_DIR/filelist
 %install
 rm -rf %{buildroot}
 mkdir %{buildroot}
+install -p -c -m755 %SOURCE2 %{buildroot}/iso_639.sed
+install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
 
 cd %{buildroot}
 
@@ -44,7 +48,12 @@ mkdir -p mnt/{floppy,cdrom} \
 ln -snf ../var/tmp usr/tmp
 ln -snf spool/mail var/mail
 
-grep -v "^$" /usr/share/iso-codes/iso_639.tab | grep -v "^#" | while read a b c d ; do
+sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \
+  >%{buildroot}/iso_639.tab
+sed -n -f %{buildroot}/iso_3166.sed /usr/share/xml/iso-codes/iso_3166.xml \
+  >%{buildroot}/iso_3166.tab
+
+grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
     [[ "$d" =~ "^Reserved" ]] && continue
     [[ "$d" =~ "^No linguistic" ]] && continue
 
@@ -66,17 +75,21 @@ cat %{SOURCE1} | grep -v "^#" | grep -v 
 
     # If the locality is not official, skip it
     if [ -n "$locality" ]; then
-        grep -q "^$locality" /usr/share/iso-codes/iso_3166.tab || continue
+        grep -q "^$locality" %{buildroot}/iso_3166.tab || continue
     fi
     # If the locale is not official and not special, skip it
     if [ -z "$special" ]; then
         egrep -q "[[:space:]]${locale%_*}[[:space:]]" \
-           /usr/share/iso-codes/iso_639.tab || continue
+           %{buildroot}/iso_639.tab || continue
     fi
     echo "%lang(${locale})	/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/filelist
     echo "%lang(${locale})  %ghost %config(missingok) /usr/share/man/${loc}" >> $RPM_BUILD_DIR/filelist
 done
 
+rm -f %{buildroot}/iso_639.tab
+rm -f %{buildroot}/iso_639.sed
+rm -f %{buildroot}/iso_3166.tab
+rm -f %{buildroot}/iso_3166.sed
 
 cat $RPM_BUILD_DIR/filelist | grep "locale" | while read a b ; do
     mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
@@ -167,6 +180,10 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Mon Aug 10 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.29-1
+- iso_codes package no longer provides tab files, do generate
+  them on fly with sed (thanks D. Tardon)
+
 * Wed Aug 05 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.28-1
 - Provide/obsolete pm-utils-filesystem, own dirs for pm-utils
   hooks(#515362)



From varekova at fedoraproject.org  Mon Aug 10 14:04:28 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 14:04:28 +0000 (UTC)
Subject: rpms/gnuplot/devel gnuplot.spec,1.72,1.73
Message-ID: <20090810140428.1B2A111C0344@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14556

Modified Files:
	gnuplot.spec 
Log Message:
add suffix to if test



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- gnuplot.spec	10 Aug 2009 13:54:41 -0000	1.72
+++ gnuplot.spec	10 Aug 2009 14:04:27 -0000	1.73
@@ -172,7 +172,7 @@ install -p -m 755 ./src/gnuplot-minimal 
 %{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-wx 60
 
 %post common
-if [ -f %{_infodir}/gnuplot.info ]; then
+if [ -f %{_infodir}/gnuplot.info* ]; then
     /sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
 fi
 
@@ -186,7 +186,7 @@ fi
 
 %preun common
 if [ $1 = 0 ] ; then # last uninstall
-    if [ -f %{_infodir}/gnuplot.info ]; then
+    if [ -f %{_infodir}/gnuplot.info* ]; then
 	/sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
     fi
 fi



From nhorman at fedoraproject.org  Mon Aug 10 14:06:26 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 10 Aug 2009 14:06:26 +0000 (UTC)
Subject: rpms/numactl/devel numactl-2.0.3-dso-destructor.patch, NONE,
	1.1 numactl.spec, 1.63, 1.64
Message-ID: <20090810140626.9A2F111C0344@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/numactl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14976

Modified Files:
	numactl.spec 
Added Files:
	numactl-2.0.3-dso-destructor.patch 
Log Message:
Resolves: bz 516227

numactl-2.0.3-dso-destructor.patch:
 Makefile  |    2 +-
 libnuma.c |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE numactl-2.0.3-dso-destructor.patch ---
diff -up numactl-2.0.3/libnuma.c.orig numactl-2.0.3/libnuma.c
--- numactl-2.0.3/libnuma.c.orig	2009-08-10 09:59:24.000000000 -0400
+++ numactl-2.0.3/libnuma.c	2009-08-10 10:00:40.000000000 -0400
@@ -95,6 +95,19 @@ numa_init(void)
 	memset(&numa_no_nodes, 0, sizeof(numa_no_nodes));
 }
 
+void
+numa_fini(void)
+{
+	if (numa_all_cpus_ptr)
+		numa_bitmask_free(numa_all_cpus_ptr);
+	if (numa_all_nodes_ptr)
+		numa_bitmask_free(numa_all_nodes_ptr);
+	if (numa_no_nodes_ptr)
+		numa_bitmask_free(numa_no_nodes_ptr);
+	if (nodes_allowed_list)
+		free(nodes_allowed_list);
+}
+
 /*
  * The following bitmask declarations, bitmask_*() routines, and associated
  * _setbit() and _getbit() routines are:
diff -up numactl-2.0.3/Makefile.orig numactl-2.0.3/Makefile
--- numactl-2.0.3/Makefile.orig	2009-06-10 08:30:03.000000000 -0400
+++ numactl-2.0.3/Makefile	2009-08-10 10:00:00.000000000 -0400
@@ -81,7 +81,7 @@ stream_main.o: stream_main.c
 libnuma.so.1: versions.ldscript
 
 libnuma.so.1: libnuma.o syscall.o distance.o
-	${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -o libnuma.so.1 $(filter-out versions.ldscript,$^)
+	${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^)
 
 libnuma.so: libnuma.so.1
 	ln -sf libnuma.so.1 libnuma.so


Index: numactl.spec
===================================================================
RCS file: /cvs/extras/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- numactl.spec	10 Aug 2009 11:16:58 -0000	1.63
+++ numactl.spec	10 Aug 2009 14:06:26 -0000	1.64
@@ -1,7 +1,7 @@
 Name:		numactl
 Summary:	Library for tuning for Non Uniform Memory Access machines
 Version:	2.0.3
-Release:	6%{dist} 
+Release:	7%{dist} 
 License:	LGPLv2/GPLv2
 Group: 		System Environment/Base
 URL:		ftp://oss.sgi.com/www/projects/libnuma/download
@@ -11,6 +11,7 @@ Buildroot:	%{_tmppath}/%{name}-buildroot
 Patch0: numactl-2.0.3-rc3-distance_parsing.patch
 Patch1: numactl-2.0.3-rc3-no-nodes-warning.patch
 Patch2: numactl-2.0.3-nodes_allowed_list_obo.patch
+Patch3: numactl-2.0.3-dso-destructor.patch
 
 ExcludeArch: s390 s390x
 
@@ -32,6 +33,7 @@ Provides development headers for numa li
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -I."
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 10 2009 Neil Horman <nhorman at redhat.com> - 2.0.3-7
+- Add destructor to libnuma.so to free allocated memory (bz 516227)
+
 * Mon Aug 10 2009 Neil Horman <nhorman at redhat.com> - 2.0.3-6
 - Fix obo in nodes_allowed_list strncpy (bz 516223)
 



From twaugh at fedoraproject.org  Mon Aug 10 14:13:31 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 14:13:31 +0000 (UTC)
Subject: rpms/cups/F-11 cups-libusb.rules,1.1,1.2 cups.spec,1.503,1.504
Message-ID: <20090810141332.0401311C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16375

Modified Files:
	cups-libusb.rules cups.spec 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Fixed udev rules file to avoid DEVTYPE warning messages.



Index: cups-libusb.rules
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-libusb.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-libusb.rules	6 Aug 2009 13:21:18 -0000	1.1
+++ cups-libusb.rules	10 Aug 2009 14:13:31 -0000	1.2
@@ -3,4 +3,4 @@
 # support.
 ACTION=="add", SUBSYSTEM=="usb", \
   ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
-  DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"
+  RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -p -r1.503 -r1.504
--- cups.spec	10 Aug 2009 10:45:40 -0000	1.503
+++ cups.spec	10 Aug 2009 14:13:31 -0000	1.504
@@ -525,6 +525,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Fixed udev rules file to avoid DEVTYPE warning messages.
 - Fixed cupsGetNamedDest() so it does not fall back to the default
   printer when a destination has been named (bug #516439, STR #3285).
 - Fixed MIME type rules for image/jpeg and image/x-bitmap



From twaugh at fedoraproject.org  Mon Aug 10 14:14:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 14:14:08 +0000 (UTC)
Subject: rpms/cups/devel cups-libusb.rules,1.1,1.2 cups.spec,1.498,1.499
Message-ID: <20090810141408.3F67E11C0344@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16520

Modified Files:
	cups-libusb.rules cups.spec 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Fixed udev rules file to avoid DEVTYPE warning messages.



Index: cups-libusb.rules
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-libusb.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-libusb.rules	6 Aug 2009 13:21:22 -0000	1.1
+++ cups-libusb.rules	10 Aug 2009 14:14:08 -0000	1.2
@@ -3,4 +3,4 @@
 # support.
 ACTION=="add", SUBSYSTEM=="usb", \
   ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
-  DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"
+  RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -p -r1.498 -r1.499
--- cups.spec	10 Aug 2009 10:47:04 -0000	1.498
+++ cups.spec	10 Aug 2009 14:14:08 -0000	1.499
@@ -525,6 +525,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Fixed udev rules file to avoid DEVTYPE warning messages.
 - Fixed cupsGetNamedDest() so it does not fall back to the default
   printer when a destination has been named (bug #516439, STR #3285).
 - Fixed MIME type rules for image/jpeg and image/x-bitmap



From caolanm at fedoraproject.org  Mon Aug 10 14:18:24 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 10 Aug 2009 14:18:24 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch,
	1.3, 1.4
Message-ID: <20090810141824.9EA8A11C0344@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17304

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
fix dmake bustage, round 3

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |    6 ++++--
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 expand.c         |    4 +++-
 make.c           |   15 ++++++++++-----
 7 files changed, 37 insertions(+), 18 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	8 Aug 2009 09:04:29 -0000	1.3
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 14:18:24 -0000	1.4
@@ -10,6 +10,16 @@ diff -ru dmake.orig/rulparse.c dmake/rul
  
  #ifdef DBUG
  	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
+@@ -915,7 +915,8 @@
+ 
+ 	    if( *name == '\'' && name[len-1]=='\'' ){
+ 	       name[len-1] = '\0';
+-	       strcpy(name,name+1);
++	       len = strlen(name+1)+1;
++	       memmove(name,name+1,len);
+ 	       /* add indirect prerequisite */
+ 	       _add_indirect_prereq( cur );
+ 	    }
 diff -ru dmake.orig/dag.c dmake/dag.c
 --- dmake.orig/dag.c	2009-08-07 20:18:31.000000000 +0100
 +++ dmake/dag.c	2009-08-07 20:30:59.000000000 +0100
@@ -159,3 +169,17 @@ diff -ru dmake.orig/path.c dmake/path.c
  	 p = n;
        }
        /* Look for an escape sequence and replace it by it's corresponding
+--- dmake.orig/expand.c	2009-08-10 15:02:31.000000000 +0100
++++ dmake/expand.c	2009-08-10 15:02:36.000000000 +0100
+@@ -727,8 +727,10 @@
+ 	      done = !lev;
+ 	      break;
+             } else {
++	      size_t len;
+ 	      s[1] = ' ';
+-	      strcpy( s, s+1 );
++	      len = strlen(s+1)+1;
++	      memmove( s, s+1, len );
+ 	    }
+ 	    /*FALLTHRU*/
+ 	 case ' ':



From dwmw2 at fedoraproject.org  Mon Aug 10 14:21:09 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 10 Aug 2009 14:21:09 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-die-closed-source-bios-muppets-die.patch, 
	NONE, 1.1 linux-2.6-intel-iommu-updates.patch, NONE,
	1.1 config-x86-generic, 1.86, 1.87 config-x86_64-generic, 1.88,
	1.89 kernel.spec, 1.1706, 1.1707
Message-ID: <20090810142109.AA4AF11C0344@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17907

Modified Files:
	config-x86-generic config-x86_64-generic kernel.spec 
Added Files:
	linux-2.6-die-closed-source-bios-muppets-die.patch 
	linux-2.6-intel-iommu-updates.patch 
Log Message:
Updates and workarounds for Intel IOMMU; re-enable it

linux-2.6-die-closed-source-bios-muppets-die.patch:
 pci-quirks.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6-die-closed-source-bios-muppets-die.patch ---
>From iommu-bounces at lists.linux-foundation.org Mon Aug  3 11:42:21 2009
Return-path: <iommu-bounces at lists.linux-foundation.org>
Envelope-to: dwmw2 at twosheds.infradead.org
Delivery-date: Mon, 03 Aug 2009 11:42:21 +0000
Received: from bombadil.infradead.org
 ([2001:4830:2446:ff00:214:51ff:fe65:c65c]) by twosheds.infradead.org with
 esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MXvvp-00015t-LN for
 dwmw2 at twosheds.infradead.org; Mon, 03 Aug 2009 11:42:21 +0000
Received: from smtp1.linux-foundation.org ([140.211.169.13]) by
 bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id
 1MXvvk-00078a-3q; Mon, 03 Aug 2009 11:42:20 +0000
Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by
 smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id
 n73Bf3qH007400; Mon, 3 Aug 2009 04:41:33 -0700
Received: from bombadil.infradead.org (bombadil.infradead.org
 [18.85.46.34]) by smtp1.linux-foundation.org
 (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n73BeU5T007358
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for
 <iommu at lists.linux-foundation.org>; Mon, 3 Aug 2009 04:40:32 -0700
Received: from macbook.infradead.org ([2001:8b0:10b:1:216:eaff:fe05:bbb8])
 by bombadil.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux)) id
 1MXvu1-000759-Lm; Mon, 03 Aug 2009 11:40:30 +0000
Subject: [PATCH] Work around BIOS bugs by quiescing USB controllers earlier
From: David Woodhouse <dwmw2 at infradead.org>
To: "linux-usb at vger.kernel.org" <linux-usb at vger.kernel.org>
Date: Mon, 03 Aug 2009 12:40:27 +0100
Message-Id: <1249299627.14968.1.camel at macbook.infradead.org>
Mime-Version: 1.0
X-Mailer: Evolution 2.26.3 (2.26.3-1.fc11) 
X-SRS-Rewrite: SMTP reverse-path rewritten from <dwmw2 at infradead.org> by
 bombadil.infradead.org See http://www.infradead.org/rpr.html
Received-SPF: pass (localhost is always allowed.)
X-Spam-Status: No, hits=-5.585 required=5
 tests=AWL,BAYES_00,OSDL_HEADER_SUBJECT_BRACKETED,PATCH_SUBJECT_OSDL
X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__
X-MIMEDefang-Filter: lf$Revision: 1.188 $
X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21
Cc: iommu at lists.linux-foundation.org
X-BeenThere: iommu at lists.linux-foundation.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Development issues for Linux IOMMU support
 <iommu.lists.linux-foundation.org>
List-Unsubscribe:
 <https://lists.linux-foundation.org/mailman/listinfo/iommu>, 
 <mailto:iommu-request at lists.linux-foundation.org?subject=unsubscribe>
List-Archive: <http://lists.linux-foundation.org/pipermail/iommu>
List-Post: <mailto:iommu at lists.linux-foundation.org>
List-Help: <mailto:iommu-request at lists.linux-foundation.org?subject=help>
List-Subscribe:
 <https://lists.linux-foundation.org/mailman/listinfo/iommu>,
 <mailto:iommu-request at lists.linux-foundation.org?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Sender: iommu-bounces at lists.linux-foundation.org
Errors-To: iommu-bounces at lists.linux-foundation.org
X-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at baythorne.infradead.org/
Content-Transfer-Encoding: 8bit

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>
---
Is this reasonable? At first glance, it looks like everything we do here
is perfectly OK to be done earlier.

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 83b5f9c..7708886 100644
@@ -475,4 +478,4 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
 	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
 		quirk_usb_handoff_xhci(pdev);
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);


-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse at intel.com                              Intel Corporation

_______________________________________________
iommu mailing list
iommu at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/iommu

linux-2.6-intel-iommu-updates.patch:
 arch/x86/kernel/pci-dma.c     |    4 
 arch/x86/kernel/pci-swiotlb.c |    5 
 drivers/pci/dmar.c            |   22 +++
 drivers/pci/intel-iommu.c     |  243 +++++++++++++++++++-----------------------
 drivers/pci/iova.c            |   16 --
 include/linux/iova.h          |    1 
 6 files changed, 135 insertions(+), 156 deletions(-)

--- NEW FILE linux-2.6-intel-iommu-updates.patch ---
commit 5fe60f4e5871b64e687229199fafd4ef13cd0886
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sun Aug 9 10:53:41 2009 +0100

    intel-iommu: make domain_add_dev_info() call domain_context_mapping()
    
    All callers of the former were also calling the latter, in one order or
    the other, and failing to correctly clean up if the second returned
    failure.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit a131bc185528331451a93db6c50a7d2070376a61
Merge: 19943b0 ff1649f
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Aug 8 11:25:28 2009 +0100

    Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
    
    Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
    no longer trip over bugs which were already fixed (sorry, Horms).

commit 19943b0e30b05d42e494ae6fef78156ebc8c637e
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Aug 4 16:19:20 2009 +0100

    intel-iommu: Unify hardware and software passthrough support
    
    This makes the hardware passthrough mode work a lot more like the
    software version, so that the behaviour of a kernel with 'iommu=pt'
    is the same whether the hardware supports passthrough or not.
    
    In particular:
     - We use a single si_domain for the pass-through devices.
     - 32-bit devices can be taken out of the pass-through domain so that
       they don't have to use swiotlb.
     - Devices will work again after being removed from a KVM guest.
     - A potential oops on OOM (in init_context_pass_through()) is fixed.
    
    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

    iommu=pt is a valid early param
    
    This avoids a "Malformed early option 'iommu'" warning on boot when
    trying to use pass-through mode.
    
    Signed-off-by: Alex Williamson <alex.williamson at hp.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 86f4d0123b1fddb47d35b9a893f8c0b94bf89abe
Author: Dan Carpenter <error27 at gmail.com>
Date:   Sun Jul 19 14:47:45 2009 +0300

    intel-iommu: double kfree()
    
    g_iommus is freed after we "goto error;".
    
    Found by smatch (http://repo.or.cz/w/smatch.git).
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 0db9b7aebb6a1c2bba2d0636ae0b1f9ef729c827
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Jul 14 02:01:57 2009 +0100

    intel-iommu: Kill pointless intel_unmap_single() function
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit acea0018a24b794e32afea4f3be4230c58f2f8e3
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Jul 14 01:55:11 2009 +0100

    intel-iommu: Defer the iotlb flush and iova free for intel_unmap_sg() too.
    
    I see no reason why we did this _only_ in intel_unmap_page().
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 3d39cecc4841e8d4c4abdb401d10180f5faaded0
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Jul 8 15:23:30 2009 +0100

    intel-iommu: Remove superfluous iova_alloc_lock from IOVA code
    
    We only ever obtain this lock immediately before the iova_rbtree_lock,
    and release it immediately after the iova_rbtree_lock. So ditch it and
    just use iova_rbtree_lock.
    
    [v2: Remove the lockdep bits this time too]
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 147202aa772329a02c6e80bc2b7a6b8dd3deac0b
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Jul 7 19:43:20 2009 +0100

    intel-iommu: Speed up map routines by using cached domain ASAP
    
    We did before, in the end -- but it was at the bottom of a long stack of
    functions. Add an inline wrapper get_valid_domain_for_dev() which will
    use the cached one _first_ and only make the out-of-line call if it's
    not already set.
    
    This takes the average time taken for a 1-page intel_map_sg() from 5961
    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/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 6af96ee..1e66b18 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -71,9 +71,8 @@ void __init pci_swiotlb_init(void)
 {
 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
 #ifdef CONFIG_X86_64
-	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
-		iommu_pass_through)
-	       swiotlb = 1;
+	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
+		swiotlb = 1;
 #endif
 	if (swiotlb_force)
 		swiotlb = 1;
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 7b287cb..380b60e 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -632,20 +632,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 +676,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 +686,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;
 }
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 2314ad7..09606e9 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)
  * 	2. It maps to each iommu if successful.
  *	3. Each iommu mapps to this domain if successful.
  */
-struct dmar_domain *si_domain;
+static struct dmar_domain *si_domain;
+static int hw_pass_through = 1;
 
 /* 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,
 }
 
 static struct iova_domain reserved_iova_list;
-static struct lock_class_key reserved_alloc_key;
 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)
 
 	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
-	lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
-		&reserved_alloc_key);
 	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,
 	struct dmar_domain *domain;
 	int ret;
 
-	printk(KERN_INFO
-	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
-	       pci_name(pdev), start, end);
-
 	domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
 	if (!domain)
 		return -ENOMEM;
 
+	/* For _hardware_ passthrough, don't bother. But for software
+	   passthrough, we do it anyway -- it may indicate a memory
+	   range which is reserved in E820, so which didn't get set
+	   up to start with in si_domain */
+	if (domain == si_domain && hw_pass_through) {
+		printk("Ignoring identity map for HW passthrough device %s [0x%Lx - 0x%Lx]\n",
+		       pci_name(pdev), start, end);
+		return 0;
+	}
+
+	printk(KERN_INFO
+	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
+	       pci_name(pdev), start, end);
+
 	ret = iommu_domain_identity_map(domain, start, end);
 	if (ret)
 		goto error;
@@ -2016,23 +2024,6 @@ static inline void iommu_prepare_isa(void)
 }
 #endif /* !CONFIG_DMAR_FLPY_WA */
 
-/* Initialize each context entry as pass through.*/
-static int __init init_context_pass_through(void)
-{
-	struct pci_dev *pdev = NULL;
-	struct dmar_domain *domain;
-	int ret;
-
-	for_each_pci_dev(pdev) {
-		domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
-		ret = domain_context_mapping(domain, pdev,
-					     CONTEXT_TT_PASS_THROUGH);
-		if (ret)
-			return ret;
-	}
-	return 0;
-}
-
 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,
 
 }
 
-static int si_domain_init(void)
+static int si_domain_init(int hw)
 {
 	struct dmar_drhd_unit *drhd;
 	struct intel_iommu *iommu;
@@ -2074,6 +2065,9 @@ static int si_domain_init(void)
 
 	si_domain->flags = DOMAIN_FLAG_STATIC_IDENTITY;
 
+	if (hw)
+		return 0;
+
 	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)
 }
 
 static int domain_add_dev_info(struct dmar_domain *domain,
-				  struct pci_dev *pdev)
+			       struct pci_dev *pdev,
+			       int translation)
 {
 	struct device_domain_info *info;
 	unsigned long flags;
+	int ret;
 
 	info = alloc_devinfo_mem();
 	if (!info)
 		return -ENOMEM;
 
+	ret = domain_context_mapping(domain, pdev, translation);
+	if (ret) {
+		free_devinfo_mem(info);
+		return ret;
+	}
+
 	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)
 	return 1;
 }
 
-static int iommu_prepare_static_identity_mapping(void)
+static int iommu_prepare_static_identity_mapping(int hw)
 {
 	struct pci_dev *pdev = NULL;
 	int ret;
 
-	ret = si_domain_init();
+	ret = si_domain_init(hw);
 	if (ret)
 		return -EFAULT;
 
 	for_each_pci_dev(pdev) {
 		if (iommu_should_identity_map(pdev, 1)) {
-			printk(KERN_INFO "IOMMU: identity mapping for device %s\n",
-			       pci_name(pdev));
+			printk(KERN_INFO "IOMMU: %s identity mapping for device %s\n",
+			       hw ? "hardware" : "software", pci_name(pdev));
 
-			ret = domain_context_mapping(si_domain, pdev,
+			ret = domain_add_dev_info(si_domain, pdev,
+						     hw ? CONTEXT_TT_PASS_THROUGH :
 						     CONTEXT_TT_MULTI_LEVEL);
 			if (ret)
 				return ret;
-			ret = domain_add_dev_info(si_domain, pdev);
-			if (ret)
-				return ret;
 		}
 	}
 
@@ -2199,14 +2199,6 @@ int __init init_dmars(void)
 	struct pci_dev *pdev;
 	struct intel_iommu *iommu;
 	int i, ret;
-	int pass_through = 1;
-
-	/*
-	 * In case pass through can not be enabled, iommu tries to use identity
-	 * mapping.
-	 */
-	if (iommu_pass_through)
-		iommu_identity_mapping = 1;
 
 	/*
 	 * for each drhd
@@ -2234,7 +2226,6 @@ int __init init_dmars(void)
 	deferred_flush = kzalloc(g_num_of_iommus *
 		sizeof(struct deferred_flush_tables), GFP_KERNEL);
 	if (!deferred_flush) {
-		kfree(g_iommus);
 		ret = -ENOMEM;
 		goto error;
 	}
@@ -2261,14 +2252,8 @@ int __init init_dmars(void)
 			goto error;
 		}
 		if (!ecap_pass_through(iommu->ecap))
-			pass_through = 0;
+			hw_pass_through = 0;
 	}
-	if (iommu_pass_through)
-		if (!pass_through) {
-			printk(KERN_INFO
-			       "Pass Through is not supported by hardware.\n");
-			iommu_pass_through = 0;
-		}
 
 	/*
 	 * Start from the sane iommu hardware state.
@@ -2323,64 +2308,57 @@ int __init init_dmars(void)
 		}
 	}
 
+	if (iommu_pass_through)
+		iommu_identity_mapping = 1;
+#ifdef CONFIG_DMAR_BROKEN_GFX_WA
+	else
+		iommu_identity_mapping = 2;
+#endif
 	/*
-	 * If pass through is set and enabled, context entries of all pci
-	 * devices are intialized by pass through translation type.
+	 * If pass through is not set or not enabled, setup context entries for
+	 * identity mappings for rmrr, gfx, and isa and may fall back to static
+	 * identity mapping if iommu_identity_mapping is set.
 	 */
-	if (iommu_pass_through) {
-		ret = init_context_pass_through();
+	if (iommu_identity_mapping) {
+		ret = iommu_prepare_static_identity_mapping(hw_pass_through);
 		if (ret) {
-			printk(KERN_ERR "IOMMU: Pass through init failed.\n");
-			iommu_pass_through = 0;
+			printk(KERN_CRIT "Failed to setup IOMMU pass-through\n");
+			goto error;
 		}
 	}
-
 	/*
-	 * If pass through is not set or not enabled, setup context entries for
-	 * identity mappings for rmrr, gfx, and isa and may fall back to static
-	 * identity mapping if iommu_identity_mapping is set.
+	 * For each rmrr
+	 *   for each dev attached to rmrr
+	 *   do
+	 *     locate drhd for dev, alloc domain for dev
+	 *     allocate free domain
+	 *     allocate page table entries for rmrr
+	 *     if context not allocated for bus
+	 *           allocate and init context
+	 *           set present in root table for this bus
+	 *     init context with domain, translation etc
+	 *    endfor
+	 * endfor
 	 */
-	if (!iommu_pass_through) {
-#ifdef CONFIG_DMAR_BROKEN_GFX_WA
-		if (!iommu_identity_mapping)
-			iommu_identity_mapping = 2;
-#endif
-		if (iommu_identity_mapping)
-			iommu_prepare_static_identity_mapping();
-		/*
-		 * For each rmrr
-		 *   for each dev attached to rmrr
-		 *   do
-		 *     locate drhd for dev, alloc domain for dev
-		 *     allocate free domain
-		 *     allocate page table entries for rmrr
-		 *     if context not allocated for bus
-		 *           allocate and init context
-		 *           set present in root table for this bus
-		 *     init context with domain, translation etc
-		 *    endfor
-		 * endfor
-		 */
-		printk(KERN_INFO "IOMMU: Setting RMRR:\n");
-		for_each_rmrr_units(rmrr) {
-			for (i = 0; i < rmrr->devices_cnt; i++) {
-				pdev = rmrr->devices[i];
-				/*
-				 * some BIOS lists non-exist devices in DMAR
-				 * table.
-				 */
-				if (!pdev)
-					continue;
-				ret = iommu_prepare_rmrr_dev(rmrr, pdev);
-				if (ret)
-					printk(KERN_ERR
-				 "IOMMU: mapping reserved region failed\n");
-			}
+	printk(KERN_INFO "IOMMU: Setting RMRR:\n");
+	for_each_rmrr_units(rmrr) {
+		for (i = 0; i < rmrr->devices_cnt; i++) {
+			pdev = rmrr->devices[i];
+			/*
+			 * some BIOS lists non-exist devices in DMAR
+			 * table.
+			 */
+			if (!pdev)
+				continue;
+			ret = iommu_prepare_rmrr_dev(rmrr, pdev);
+			if (ret)
+				printk(KERN_ERR
+				       "IOMMU: mapping reserved region failed\n");
 		}
-
-		iommu_prepare_isa();
 	}
 
+	iommu_prepare_isa();
+
 	/*
 	 * for each drhd
 	 *   enable fault log
@@ -2454,8 +2432,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
 	return iova;
 }
 
-static struct dmar_domain *
-get_valid_domain_for_dev(struct pci_dev *pdev)
+static struct dmar_domain *__get_valid_domain_for_dev(struct pci_dev *pdev)
 {
 	struct dmar_domain *domain;
 	int ret;
@@ -2483,6 +2460,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
 	return domain;
 }
 
+static inline struct dmar_domain *get_valid_domain_for_dev(struct pci_dev *dev)
+{
+	struct device_domain_info *info;
+
+	/* No lock here, assumes no domain exit in normal case */
+	info = dev->dev.archdata.iommu;
+	if (likely(info))
+		return info->domain;
+
+	return __get_valid_domain_for_dev(dev);
+}
+
 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)
 		 */
 		if (iommu_should_identity_map(pdev, 0)) {
 			int ret;
-			ret = domain_add_dev_info(si_domain, pdev);
-			if (ret)
-				return 0;
-			ret = domain_context_mapping(si_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
+			ret = domain_add_dev_info(si_domain, pdev,
+						  hw_pass_through ?
+						  CONTEXT_TT_PASS_THROUGH :
+						  CONTEXT_TT_MULTI_LEVEL);
 			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,
 	}
 }
 
-static void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,
-			       int dir)
-{
-	intel_unmap_page(dev, dev_addr, size, dir, NULL);
-}
-
 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,
 	size = PAGE_ALIGN(size);
 	order = get_order(size);
 
-	intel_unmap_single(hwdev, dma_handle, size, DMA_BIDIRECTIONAL);
+	intel_unmap_page(hwdev, dma_handle, size, DMA_BIDIRECTIONAL, NULL);
 	free_pages((unsigned long)vaddr, order);
 }
 
@@ -2807,11 +2790,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
 	/* free page tables */
 	dma_pte_free_pagetable(domain, start_pfn, last_pfn);
 
-	iommu_flush_iotlb_psi(iommu, domain->id, start_pfn,
-			      (last_pfn - start_pfn + 1));
-
-	/* free iova */
-	__free_iova(&domain->iovad, iova);
+	if (intel_iommu_strict) {
+		iommu_flush_iotlb_psi(iommu, domain->id, start_pfn,
+				      last_pfn - start_pfn + 1);
+		/* free iova */
+		__free_iova(&domain->iovad, iova);
+	} else {
+		add_unmap(domain, iova);
+		/*
+		 * queue up the release of the unmap to save the 1/6th of the
+		 * cpu used up by the iotlb flush operation...
+		 */
+	}
 }
 
 static int intel_nontranslate_map_sg(struct device *hddev,
@@ -3194,7 +3184,7 @@ int __init intel_iommu_init(void)
 	 * Check the need for DMA-remapping initialization now.
 	 * Above initialization will also be used by Interrupt-remapping.
 	 */
-	if (no_iommu || (swiotlb && !iommu_pass_through) || dmar_disabled)
+	if (no_iommu || swiotlb || dmar_disabled)
 		return -ENODEV;
 
 	iommu_init_mempool();
@@ -3214,14 +3204,7 @@ int __init intel_iommu_init(void)
 
 	init_timer(&unmap_timer);
 	force_iommu = 1;
-
-	if (!iommu_pass_through) {
-		printk(KERN_INFO
-		       "Multi-level page-table translation for DMAR.\n");
-		dma_ops = &intel_dma_ops;
-	} else
-		printk(KERN_INFO
-		       "DMAR: Pass through translation for DMAR.\n");
+	dma_ops = &intel_dma_ops;
 
 	init_iommu_sysfs();
 
@@ -3504,7 +3487,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
 	struct intel_iommu *iommu;
 	int addr_width;
 	u64 end;
-	int ret;
 
 	/* 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,
 		return -EFAULT;
 	}
 
-	ret = domain_add_dev_info(dmar_domain, pdev);
-	if (ret)
-		return ret;
-
-	ret = domain_context_mapping(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
-	return ret;
+	return domain_add_dev_info(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
 }
 
 static void intel_iommu_detach_device(struct iommu_domain *domain,
diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
index 46dd440..7914951 100644
--- a/drivers/pci/iova.c
+++ b/drivers/pci/iova.c
@@ -22,7 +22,6 @@
 void
 init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)
 {
-	spin_lock_init(&iovad->iova_alloc_lock);
 	spin_lock_init(&iovad->iova_rbtree_lock);
 	iovad->rbroot = RB_ROOT;
 	iovad->cached32_node = NULL;
@@ -205,7 +204,6 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
 	unsigned long limit_pfn,
 	bool size_aligned)
 {
-	unsigned long flags;
 	struct iova *new_iova;
 	int ret;
 
@@ -219,11 +217,9 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
 	if (size_aligned)
 		size = __roundup_pow_of_two(size);
 
-	spin_lock_irqsave(&iovad->iova_alloc_lock, flags);
 	ret = __alloc_and_insert_iova_range(iovad, size, limit_pfn,
 			new_iova, size_aligned);
 
-	spin_unlock_irqrestore(&iovad->iova_alloc_lock, flags);
 	if (ret) {
 		free_iova_mem(new_iova);
 		return NULL;
@@ -381,8 +377,7 @@ reserve_iova(struct iova_domain *iovad,
 	struct iova *iova;
 	unsigned int overlap = 0;
 
-	spin_lock_irqsave(&iovad->iova_alloc_lock, flags);
-	spin_lock(&iovad->iova_rbtree_lock);
+	spin_lock_irqsave(&iovad->iova_rbtree_lock, flags);
 	for (node = rb_first(&iovad->rbroot); node; node = rb_next(node)) {
 		if (__is_range_overlap(node, pfn_lo, pfn_hi)) {
 			iova = container_of(node, struct iova, node);
@@ -402,8 +397,7 @@ reserve_iova(struct iova_domain *iovad,
 	iova = __insert_new_range(iovad, pfn_lo, pfn_hi);
 finish:
 
-	spin_unlock(&iovad->iova_rbtree_lock);
-	spin_unlock_irqrestore(&iovad->iova_alloc_lock, flags);
+	spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags);
 	return iova;
 }
 
@@ -420,8 +414,7 @@ copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
 	unsigned long flags;
 	struct rb_node *node;
 
-	spin_lock_irqsave(&from->iova_alloc_lock, flags);
-	spin_lock(&from->iova_rbtree_lock);
+	spin_lock_irqsave(&from->iova_rbtree_lock, flags);
 	for (node = rb_first(&from->rbroot); node; node = rb_next(node)) {
 		struct iova *iova = container_of(node, struct iova, node);
 		struct iova *new_iova;
@@ -430,6 +423,5 @@ copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
 			printk(KERN_ERR "Reserve iova range %lx@%lx failed\n",
 				iova->pfn_lo, iova->pfn_lo);
 	}
-	spin_unlock(&from->iova_rbtree_lock);
-	spin_unlock_irqrestore(&from->iova_alloc_lock, flags);
+	spin_unlock_irqrestore(&from->iova_rbtree_lock, flags);
 }
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 228f6c9..76a0759 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -28,7 +28,6 @@ struct iova {
 
 /* holds all the iova translations for a domain */
 struct iova_domain {
-	spinlock_t	iova_alloc_lock;/* Lock to protect iova  allocation */
 	spinlock_t	iova_rbtree_lock; /* Lock to protect update of rbtree */
 	struct rb_root	rbroot;		/* iova domain rbtree root */
 	struct rb_node	*cached32_node; /* Save last alloced node */


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- config-x86-generic	23 Jul 2009 17:45:33 -0000	1.86
+++ config-x86-generic	10 Aug 2009 14:21:08 -0000	1.87
@@ -96,7 +96,7 @@ CONFIG_FB_EFI=y
 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_DEFAULT_ON=y
 
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- config-x86_64-generic	23 Jul 2009 17:45:33 -0000	1.88
+++ config-x86_64-generic	10 Aug 2009 14:21:09 -0000	1.89
@@ -36,7 +36,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_DEFAULT_ON=y
 
 CONFIG_KEXEC_JUMP=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1706
retrieving revision 1.1707
diff -u -p -r1.1706 -r1.1707
--- kernel.spec	10 Aug 2009 04:13:28 -0000	1.1706
+++ kernel.spec	10 Aug 2009 14:21:09 -0000	1.1707
@@ -606,6 +606,10 @@ Patch30: sched-introduce-SCHED_RESET_ON_
 
 Patch41: linux-2.6-sysrq-c.patch
 
+# Intel IOMMU fixes/workarounds
+Patch100: linux-2.6-die-closed-source-bios-muppets-die.patch
+Patch101: linux-2.6-intel-iommu-updates.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -1138,6 +1142,16 @@ ApplyPatch via-hwmon-temp-sensor.patch
 ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
 #
+# Intel IOMMU
+#
+# Quiesce USB host controllers before setting up the IOMMU
+ApplyPatch linux-2.6-die-closed-source-bios-muppets-die.patch
+# Some performance fixes, unify hardware/software passthrough support, and 
+# most importantly: notice when the BIOS points us to a region that returns
+# all 0xFF, and claims that there's an IOMMU there.
+ApplyPatch linux-2.6-intel-iommu-updates.patch
+
+#
 # PowerPC
 #
 ### NOT (YET) UPSTREAM:
@@ -1966,6 +1980,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 10 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Merge latest Intel IOMMU fixes and BIOS workarounds, re-enable by default.
+
 * Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>
 - btusb autosuspend: fix build on !CONFIG_PM by stubbing out
   suspend/resume methods.



From veillard at fedoraproject.org  Mon Aug 10 14:21:33 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 14:21:33 +0000 (UTC)
Subject: rpms/libxml2/devel libxml2-2.7.3-ficora-parse.patch, NONE,
	1.1 libxml2.spec, 1.71, 1.72
Message-ID: <20090810142133.5D1BC11C0424@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17928

Modified Files:
	libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- libxml2.spec	25 Jul 2009 08:59:00 -0000	1.71
+++ libxml2.spec	10 Aug 2009 14:21:33 -0000	1.72
@@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: libxml2-2.7.3-ficora-parse.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -67,6 +68,7 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -141,6 +143,9 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-4.fc11
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Aug 10 14:22:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:22:40 +0000
Subject: [pkgdb] xorg-x11-drv-fbdev: glisse has requested watchcommits
Message-ID: <20090810142240.6431D10F897@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-drv-fbdev (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-fbdev



From veillard at fedoraproject.org  Mon Aug 10 14:23:29 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 14:23:29 +0000 (UTC)
Subject: rpms/libxml2/devel libxml2.spec,1.72,1.73
Message-ID: <20090810142329.0E33311C0424@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18328

Modified Files:
	libxml2.spec 
Log Message:
tiny changelog cleanup, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- libxml2.spec	10 Aug 2009 14:21:33 -0000	1.72
+++ libxml2.spec	10 Aug 2009 14:23:28 -0000	1.73
@@ -143,7 +143,7 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
-* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-4.fc11
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-4
 - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-3



From veillard at fedoraproject.org  Mon Aug 10 14:24:11 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 14:24:11 +0000 (UTC)
Subject: rpms/libxml2/devel libxml2.spec,1.73,1.74
Message-ID: <20090810142411.AB16C11C0424@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18562

Modified Files:
	libxml2.spec 
Log Message:
Forgot to bump release, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- libxml2.spec	10 Aug 2009 14:23:28 -0000	1.73
+++ libxml2.spec	10 Aug 2009 14:24:11 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.7.3
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 10 14:24:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:24:23 +0000
Subject: [pkgdb] xorg-x11-drivers: glisse has requested watchcommits
Message-ID: <20090810142424.08E5B10F89A@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-drivers (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drivers



From pkgdb at fedoraproject.org  Mon Aug 10 14:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:24:41 +0000
Subject: [pkgdb] xorg-x11-apps: glisse has requested watchcommits
Message-ID: <20090810142442.574F410F89A@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-apps (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-apps



From pkgdb at fedoraproject.org  Mon Aug 10 14:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:25:04 +0000
Subject: [pkgdb] xorg-x11-docs: glisse has requested watchcommits
Message-ID: <20090810142504.B55B410F8B2@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-docs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-docs



From pkgdb at fedoraproject.org  Mon Aug 10 14:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:25:15 +0000
Subject: [pkgdb] xorg-x11-server: glisse has requested watchcommits
Message-ID: <20090810142515.5701410F89A@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-server (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server



From pkgdb at fedoraproject.org  Mon Aug 10 14:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:25:27 +0000
Subject: [pkgdb] xorg-x11-server-utils: glisse has requested watchcommits
Message-ID: <20090810142528.4168210F8AF@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-server-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server-utils



From dwmw2 at fedoraproject.org  Mon Aug 10 14:25:40 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 10 Aug 2009 14:25:40 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-die-closed-source-bios-muppets-die.patch, 1.1, 1.2
Message-ID: <20090810142540.2D67211C0344@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19650

Modified Files:
	linux-2.6-die-closed-source-bios-muppets-die.patch 
Log Message:
fix patch

linux-2.6-die-closed-source-bios-muppets-die.patch:
 pci-quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-die-closed-source-bios-muppets-die.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-die-closed-source-bios-muppets-die.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-die-closed-source-bios-muppets-die.patch	10 Aug 2009 14:21:09 -0000	1.1
+++ linux-2.6-die-closed-source-bios-muppets-die.patch	10 Aug 2009 14:25:40 -0000	1.2
@@ -1,61 +1,9 @@
-From iommu-bounces at lists.linux-foundation.org Mon Aug  3 11:42:21 2009
-Return-path: <iommu-bounces at lists.linux-foundation.org>
-Envelope-to: dwmw2 at twosheds.infradead.org
-Delivery-date: Mon, 03 Aug 2009 11:42:21 +0000
-Received: from bombadil.infradead.org
- ([2001:4830:2446:ff00:214:51ff:fe65:c65c]) by twosheds.infradead.org with
- esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MXvvp-00015t-LN for
- dwmw2 at twosheds.infradead.org; Mon, 03 Aug 2009 11:42:21 +0000
-Received: from smtp1.linux-foundation.org ([140.211.169.13]) by
- bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id
- 1MXvvk-00078a-3q; Mon, 03 Aug 2009 11:42:20 +0000
-Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by
- smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id
- n73Bf3qH007400; Mon, 3 Aug 2009 04:41:33 -0700
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [18.85.46.34]) by smtp1.linux-foundation.org
- (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n73BeU5T007358
- (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for
- <iommu at lists.linux-foundation.org>; Mon, 3 Aug 2009 04:40:32 -0700
-Received: from macbook.infradead.org ([2001:8b0:10b:1:216:eaff:fe05:bbb8])
- by bombadil.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux)) id
- 1MXvu1-000759-Lm; Mon, 03 Aug 2009 11:40:30 +0000
 Subject: [PATCH] Work around BIOS bugs by quiescing USB controllers earlier
 From: David Woodhouse <dwmw2 at infradead.org>
 To: "linux-usb at vger.kernel.org" <linux-usb at vger.kernel.org>
 Date: Mon, 03 Aug 2009 12:40:27 +0100
 Message-Id: <1249299627.14968.1.camel at macbook.infradead.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.26.3 (2.26.3-1.fc11) 
-X-SRS-Rewrite: SMTP reverse-path rewritten from <dwmw2 at infradead.org> by
- bombadil.infradead.org See http://www.infradead.org/rpr.html
-Received-SPF: pass (localhost is always allowed.)
-X-Spam-Status: No, hits=-5.585 required=5
- tests=AWL,BAYES_00,OSDL_HEADER_SUBJECT_BRACKETED,PATCH_SUBJECT_OSDL
-X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__
-X-MIMEDefang-Filter: lf$Revision$
-X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21
 Cc: iommu at lists.linux-foundation.org
-X-BeenThere: iommu at lists.linux-foundation.org
-X-Mailman-Version: 2.1.9
-Precedence: list
-List-Id: Development issues for Linux IOMMU support
- <iommu.lists.linux-foundation.org>
-List-Unsubscribe:
- <https://lists.linux-foundation.org/mailman/listinfo/iommu>, 
- <mailto:iommu-request at lists.linux-foundation.org?subject=unsubscribe>
-List-Archive: <http://lists.linux-foundation.org/pipermail/iommu>
-List-Post: <mailto:iommu at lists.linux-foundation.org>
-List-Help: <mailto:iommu-request at lists.linux-foundation.org?subject=help>
-List-Subscribe:
- <https://lists.linux-foundation.org/mailman/listinfo/iommu>,
- <mailto:iommu-request at lists.linux-foundation.org?subject=subscribe>
-Content-Type: text/plain; charset="us-ascii"
-Sender: iommu-bounces at lists.linux-foundation.org
-Errors-To: iommu-bounces at lists.linux-foundation.org
-X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2 at baythorne.infradead.org/
-Content-Transfer-Encoding: 8bit
 
 We are seeing a number of crashes in SMM, when VT-d is enabled while
 'Legacy USB support' is enabled in various BIOSes.
@@ -87,20 +35,12 @@ Is this reasonable? At first glance, it 
 is perfectly OK to be done earlier.
 
 diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
-index 83b5f9c..7708886 100644
-@@ -475,4 +478,4 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
+index 83b5f9c..23cf3bd 100644
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -475,4 +475,4 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
  	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
  		quirk_usb_handoff_xhci(pdev);
  }
 -DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
 +DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
-
-
--- 
-David Woodhouse                            Open Source Technology Centre
-David.Woodhouse at intel.com                              Intel Corporation
-
-_______________________________________________
-iommu mailing list
-iommu at lists.linux-foundation.org
-https://lists.linux-foundation.org/mailman/listinfo/iommu



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:00 +0000
Subject: [pkgdb] xorg-x11-proto-devel: glisse has requested watchcommits
Message-ID: <20090810142602.70A6510F89A@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-proto-devel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-proto-devel



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:12 +0000
Subject: [pkgdb] xorg-x11-font-utils: glisse has requested watchcommits
Message-ID: <20090810142612.46D8910F8B4@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-font-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-font-utils



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:19 +0000
Subject: [pkgdb] xorg-x11-fonts: glisse has requested watchcommits
Message-ID: <20090810142619.BC31410F8B6@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-fonts



From veillard at fedoraproject.org  Mon Aug 10 14:26:28 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 14:26:28 +0000 (UTC)
Subject: rpms/libxml2/F-11 libxml2-2.7.3-ficora-parse.patch, NONE,
	1.1 libxml2.spec, 1.70, 1.71
Message-ID: <20090810142628.2C3F511C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19746

Modified Files:
	libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/libxml2.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- libxml2.spec	25 Feb 2009 20:10:22 -0000	1.70
+++ libxml2.spec	10 Aug 2009 14:26:28 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.7.3
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: libxml2-2.7.3-ficora-parse.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -67,6 +68,7 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -141,6 +143,9 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-3
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:30 +0000
Subject: [pkgdb] xorg-x11-resutils: glisse has requested watchcommits
Message-ID: <20090810142630.8416C10F8B9@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-resutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-resutils



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:37 +0000
Subject: [pkgdb] xorg-x11-util-macros: glisse has requested watchcommits
Message-ID: <20090810142638.A36F410F8B5@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-util-macros (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-util-macros



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:46 +0000
Subject: [pkgdb] xorg-x11-utils: glisse has requested watchcommits
Message-ID: <20090810142647.187B410F8B6@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-utils



From pkgdb at fedoraproject.org  Mon Aug 10 14:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:26:55 +0000
Subject: [pkgdb] xorg-x11-xauth: glisse has requested watchcommits
Message-ID: <20090810142655.B398B10F8BC@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-xauth (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-xauth



From pkgdb at fedoraproject.org  Mon Aug 10 14:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:27:02 +0000
Subject: [pkgdb] xorg-x11-xbitmaps: glisse has requested watchcommits
Message-ID: <20090810142704.35FF610F8AD@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-xbitmaps (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-xbitmaps



From pkgdb at fedoraproject.org  Mon Aug 10 14:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:27:09 +0000
Subject: [pkgdb] xorg-x11-xdm: glisse has requested watchcommits
Message-ID: <20090810142709.C94AC10F8C2@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-xdm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-xdm



From pkgdb at fedoraproject.org  Mon Aug 10 14:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:27:17 +0000
Subject: [pkgdb] xorg-x11-drv-ati: glisse has requested watchcommits
Message-ID: <20090810142720.069F710F8C4@bastion2.fedora.phx.redhat.com>

glisse has requested the watchcommits acl on xorg-x11-drv-ati (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-ati



From veillard at fedoraproject.org  Mon Aug 10 14:31:30 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 14:31:30 +0000 (UTC)
Subject: rpms/libxml2/F-10 libxml2-2.7.3-ficora-parse.patch, NONE,
	1.1 libxml2.spec, 1.63, 1.64
Message-ID: <20090810143130.7C90011C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20958

Modified Files:
	libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/libxml2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- libxml2.spec	19 Jan 2009 08:40:05 -0000	1.63
+++ libxml2.spec	10 Aug 2009 14:31:30 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.7.3
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -9,9 +9,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: libxml2-2.7.3-ficora-parse.patch
 
 %description
-This library allows to manipulate XML files. It includes support 
+This library allows to manipulate XML files. It includes support
 to read, modify and write XML and HTML files. There is DTDs support
 this includes parsing and validation even with complex DtDs, either
 at parse time or later once the document has been modified. The output
@@ -30,7 +31,7 @@ Requires: pkgconfig
 
 %description devel
 Libraries, include files, etc you can use to develop XML applications.
-This library allows to manipulate XML files. It includes support 
+This library allows to manipulate XML files. It includes support
 to read, modify and write XML and HTML files. There is DTDs support
 this includes parsing and validation even with complex DtDs, either
 at parse time or later once the document has been modified. The output
@@ -59,7 +60,7 @@ The libxml2-python package contains a mo
 written in the Python programming language to use the interface
 supplied by the libxml2 library to manipulate XML files.
 
-This library allows to manipulate XML files. It includes support 
+This library allows to manipulate XML files. It includes support
 to read, modify and write XML and HTML files. There is DTDs support
 this includes parsing and validation even with complex DTDs, either
 at parse time or later once the document has been modified.
@@ -67,6 +68,7 @@ at parse time or later once the document
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -141,6 +143,9 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-2
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Mon Jan 19 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-1.fc10
 - new release 2.7.3
 - limit default max size of text nodes



From pkgdb at fedoraproject.org  Mon Aug 10 14:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:34:54 +0000
Subject: [pkgdb] znc: silfreed has requested watchbugzilla
Message-ID: <20090810143454.7DFBF10F89C@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:34:58 +0000
Subject: [pkgdb] znc: silfreed has requested commit
Message-ID: <20090810143458.44DF510F8B9@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:00 +0000
Subject: [pkgdb] znc: silfreed has requested watchcommits
Message-ID: <20090810143501.F405110F8BB@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:07 +0000
Subject: [pkgdb] znc: silfreed has requested watchcommits
Message-ID: <20090810143510.B6DC710F8C0@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:05 +0000
Subject: [pkgdb] znc: silfreed has requested watchbugzilla
Message-ID: <20090810143510.5090F10F8C2@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:08 +0000
Subject: [pkgdb] znc: silfreed has requested commit
Message-ID: <20090810143511.E928110F8C7@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:13 +0000
Subject: [pkgdb] znc: silfreed has requested watchcommits
Message-ID: <20090810143516.043E910F8D1@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:18 +0000
Subject: [pkgdb] znc: silfreed has requested watchbugzilla
Message-ID: <20090810143519.8A7D310F89A@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:15 +0000
Subject: [pkgdb] znc: silfreed has requested commit
Message-ID: <20090810143517.C92CF10F897@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:12 +0000
Subject: [pkgdb] znc: silfreed has requested watchbugzilla
Message-ID: <20090810143514.C6A9910F8CC@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:19 +0000
Subject: [pkgdb] znc: silfreed has requested watchcommits
Message-ID: <20090810143522.BD17010F8D7@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:21 +0000
Subject: [pkgdb] znc: silfreed has requested commit
Message-ID: <20090810143522.E416010F8D8@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:25 +0000
Subject: [pkgdb] znc: silfreed has requested watchcommits
Message-ID: <20090810143526.0C97810F8E3@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:23 +0000
Subject: [pkgdb] znc: silfreed has requested watchbugzilla
Message-ID: <20090810143524.AC69410F8CE@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:26 +0000
Subject: [pkgdb] znc: silfreed has requested commit
Message-ID: <20090810143527.512DE10F8D4@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:33 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchbugzilla
Message-ID: <20090810143533.5233E10F8DC@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc-extra (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:34 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchcommits
Message-ID: <20090810143535.6862410F8DA@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc-extra (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:36 +0000
Subject: [pkgdb] znc-extra: silfreed has requested commit
Message-ID: <20090810143536.8CA3610F8E0@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc-extra (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:40 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchbugzilla
Message-ID: <20090810143541.0C0B110F8E6@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc-extra (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:42 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchcommits
Message-ID: <20090810143542.7FBC710F8E9@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc-extra (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:43 +0000
Subject: [pkgdb] znc-extra: silfreed has requested commit
Message-ID: <20090810143543.DE06410F8EE@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc-extra (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:47 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchbugzilla
Message-ID: <20090810143549.25EB110F8FA@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc-extra (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:48 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchcommits
Message-ID: <20090810143550.16F3E10F8B9@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc-extra (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:50 +0000
Subject: [pkgdb] znc-extra: silfreed has requested commit
Message-ID: <20090810143552.19C1D10F8FE@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc-extra (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:57 +0000
Subject: [pkgdb] znc-extra: silfreed has requested commit
Message-ID: <20090810143559.6FC9510F8C5@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc-extra (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:54 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchcommits
Message-ID: <20090810143555.6776F10F904@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc-extra (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:52 +0000
Subject: [pkgdb] znc-extra: silfreed has requested commit
Message-ID: <20090810143554.6614210F901@bastion2.fedora.phx.redhat.com>

silfreed has requested the commit acl on znc-extra (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:58 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchcommits
Message-ID: <20090810143600.5064310F8F1@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on znc-extra (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:35:55 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchbugzilla
Message-ID: <20090810143557.2761910F90B@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc-extra (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Mon Aug 10 14:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:36:00 +0000
Subject: [pkgdb] znc-extra: silfreed has requested watchbugzilla
Message-ID: <20090810143601.D37C310F910@bastion2.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on znc-extra (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From akurtakov at fedoraproject.org  Mon Aug 10 14:41:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 10 Aug 2009 14:41:35 +0000 (UTC)
Subject: rpms/eclipse-subclipse/devel .cvsignore, 1.9,
	1.10 subclipse-fetch.sh, 
	1.2, 1.3 eclipse-subclipse-1.6.0-dependencies.patch, 1.1,
	1.2 sources, 1.9, 1.10 eclipse-subclipse.spec, 1.33, 1.34
Message-ID: <20090810144135.9104111C0344@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22935/devel

Modified Files:
	.cvsignore subclipse-fetch.sh 
	eclipse-subclipse-1.6.0-dependencies.patch sources 
	eclipse-subclipse.spec 
Log Message:
Update to upstream 1.6.4.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	27 Jul 2009 07:02:53 -0000	1.9
+++ .cvsignore	10 Aug 2009 14:41:35 -0000	1.10
@@ -1,2 +1,3 @@
 subclipse-1.6.0.tgz
 subclipse-1.6.2.tgz
+subclipse-1.6.4.tgz


Index: subclipse-fetch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/subclipse-fetch.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- subclipse-fetch.sh	27 Jul 2009 07:02:54 -0000	1.2
+++ subclipse-fetch.sh	10 Aug 2009 14:41:35 -0000	1.3
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=1.6.2
+VERSION=1.6.4
 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
 rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win32
 tar -czf subclipse-$VERSION.tgz subclipse-$VERSION

eclipse-subclipse-1.6.0-dependencies.patch:
 org.tigris.subversion.clientadapter.javahl.feature/feature.xml  |    6 +++---
 org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF |    3 +++
 org.tigris.subversion.clientadapter.javahl/build.properties     |    7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

Index: eclipse-subclipse-1.6.0-dependencies.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/eclipse-subclipse-1.6.0-dependencies.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-subclipse-1.6.0-dependencies.patch	6 Apr 2009 15:09:47 -0000	1.1
+++ eclipse-subclipse-1.6.0-dependencies.patch	10 Aug 2009 14:41:35 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/build.properties subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/build.properties
---- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/build.properties	2007-08-21 21:29:01.000000000 -0400
-+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/build.properties	2009-04-06 10:22:46.000000000 -0430
+--- subclipse-1.6.4.original/org.tigris.subversion.clientadapter.javahl/build.properties	2007-08-21 21:29:01.000000000 -0400
++++ subclipse-1.6.4/org.tigris.subversion.clientadapter.javahl/build.properties	2009-04-06 10:22:46.000000000 -0430
 @@ -1,5 +1,5 @@
 -source.. = src/
 -output.. = bin/
@@ -16,12 +16,12 @@ diff -Naur subclipse-1.6.0.original/org.
 -               svn.gif
 +               svn.gif,\
 +               svn-javahl.jar
-diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
---- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-23 15:51:38.000000000 -0430
-+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-04-06 10:22:46.000000000 -0430
-@@ -8,6 +8,9 @@
+diff -Naur subclipse-1.6.4.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
+--- subclipse-1.6.4.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-23 15:51:38.000000000 -0430
++++ subclipse-1.6.4/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-04-06 10:22:46.000000000 -0430
+@@ -10,6 +10,9 @@
  Require-Bundle: org.eclipse.core.runtime,
-  org.tigris.subversion.clientadapter;bundle-version="[1.6.0,1.7.0)"
+  org.tigris.subversion.clientadapter;bundle-version="[1.6.4,1.7.0)"
  Eclipse-LazyStart: true
 +Bundle-ClassPath: clientadapter-javahl.jar,
 + svn-javahl.jar,
@@ -29,10 +29,10 @@ diff -Naur subclipse-1.6.0.original/org.
  Export-Package: org.tigris.subversion.javahl,
   org.tigris.subversion.svnclientadapter.javahl
  Bundle-RequiredExecutionEnvironment: J2SE-1.4
-diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml
---- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-23 15:51:38.000000000 -0430
-+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-04-06 10:22:46.000000000 -0430
-@@ -33,14 +33,14 @@
+diff -Naur subclipse-1.6.4original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml
+--- subclipse-1.6.4.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-23 15:51:38.000000000 -0430
++++ subclipse-1.6.4/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-04-06 10:22:46.000000000 -0430
+@@ -33,15 +33,15 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
@@ -43,6 +43,7 @@ diff -Naur subclipse-1.6.0.original/org.
 +<!--   <plugin
           id="org.tigris.subversion.clientadapter.javahl.win32"
           os="win32"
+          arch="x86"
           download-size="0"
           install-size="0"
           version="0.0.0"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Jul 2009 07:02:54 -0000	1.9
+++ sources	10 Aug 2009 14:41:35 -0000	1.10
@@ -1 +1 @@
-38c7ed1bc28266b06a55674617227234  subclipse-1.6.2.tgz
+bf1c5a0a2cb4741881817614672a330c  subclipse-1.6.4.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- eclipse-subclipse.spec	27 Jul 2009 07:02:54 -0000	1.33
+++ eclipse-subclipse.spec	10 Aug 2009 14:41:35 -0000	1.34
@@ -1,11 +1,11 @@
 %define eclipse_name       eclipse
 %define eclipse_base       %{_libdir}/%{eclipse_name}
 %define install_loc        %{_datadir}/eclipse/dropins
-%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.6.0.1
+%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.6.4
 
 
 Name:           eclipse-subclipse
-Version:        1.6.2
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.4-1
+- Update to upstream 1.6.4.
+
 * Mon Jul 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.2-1
 - Update to upstream 1.6.2.
 



From scop at fedoraproject.org  Mon Aug 10 14:43:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 14:43:04 +0000 (UTC)
Subject: rpms/conduit/devel .cvsignore, 1.12, 1.13 conduit.spec, 1.31,
	1.32 sources, 1.12, 1.13
Message-ID: <20090810144304.8277D11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/conduit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23407

Modified Files:
	.cvsignore conduit.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.16-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Jul 2009 04:02:01 -0000	1.12
+++ .cvsignore	10 Aug 2009 14:43:04 -0000	1.13
@@ -1 +1 @@
-conduit-0.3.16.tar.gz
+conduit-0.3.16.tar.bz2


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/conduit.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- conduit.spec	24 Jul 2009 19:24:41 -0000	1.31
+++ conduit.spec	10 Aug 2009 14:43:04 -0000	1.32
@@ -2,13 +2,13 @@
 
 Name:           conduit
 Version:        0.3.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A synchronization solution for GNOME
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.conduit-project.org/
-Source0:        http://download.gnome.org/sources/conduit/0.3/%{name}-%{version}.tar.gz
+Source0:        http://download.gnome.org/sources/conduit/0.3/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.16-3
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Jul 2009 04:02:01 -0000	1.12
+++ sources	10 Aug 2009 14:43:04 -0000	1.13
@@ -1 +1 @@
-6fd4acb11256d5b77cca01bb7c58159b  conduit-0.3.16.tar.gz
+d119686a5f9ce7c01ef1ab74089b9410  conduit-0.3.16.tar.bz2



From notting at fedoraproject.org  Mon Aug 10 14:43:25 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 10 Aug 2009 14:43:25 +0000 (UTC)
Subject: common cvs-import.sh,1.33,1.34
Message-ID: <20090810144325.B17B711C0344@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23296

Modified Files:
	cvs-import.sh 
Log Message:
Add more file types to the 'upload' list. (#1592, <ville.syktta at iki.fi>)



Index: cvs-import.sh
===================================================================
RCS file: /cvs/extras/common/cvs-import.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- cvs-import.sh	24 Aug 2008 21:50:55 -0000	1.33
+++ cvs-import.sh	10 Aug 2009 14:43:25 -0000	1.34
@@ -272,8 +272,8 @@ for _f in $FILES ; do
     pushd ${BRANCH} >/dev/null
     if [ "$add_file" = "yes" ] ; then
 	case $f in 
-	    *.tar | *gz | *.bz2 | *.lzma | *.Z | *.zip | \
-	    *.ttf | *.bin | *.tbz | *.tbz2 | *.pdf | *.rpm | \
+	    *.tar | *gz | *.bz2 | *.bz | *.lzma | *.xz | *.Z | *.zip | \
+	    *.ttf | *.bin | *.tbz | *.tbz2 | *.tlz | *.txz | *.pdf | *.rpm | \
 	    *.jar | *.war | *.db | *.cpio | *.jisp | *.egg | *.gem )
 		UPLOADFILES="$UPLOADFILES $f"
 		if [ -n "$(grep $f sources 2>/dev/null)" ] ; then



From notting at fedoraproject.org  Mon Aug 10 14:45:16 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 10 Aug 2009 14:45:16 +0000 (UTC)
Subject: common Makefile.common,1.131,1.132
Message-ID: <20090810144516.52B4611C0344@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24029

Modified Files:
	Makefile.common 
Log Message:
Fix indentation (#1593, <tmz at fedoraproject.org>)



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- Makefile.common	6 Jul 2009 14:48:15 -0000	1.131
+++ Makefile.common	10 Aug 2009 14:45:16 -0000	1.132
@@ -619,7 +619,7 @@ help:
 	@echo "	install			Local test rpmbuild install"
 	@echo "	compile-short		Local test rpmbuild short-circuit compile"
 	@echo "	install-short		Local test rpmbuild short-circuit install"
-	@echo " lint			Run rpmlint against local build output"
+	@echo "	lint			Run rpmlint against local build output"
 	@echo "	export			Create clean export in \"cvs-$(TAG)\""
 	@echo "	check			Check test srpm preps on all archs"
 	@echo "	srpm			Create a srpm"



From twaugh at fedoraproject.org  Mon Aug 10 14:50:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 14:50:16 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3279.patch,NONE,1.1 cups.spec,1.504,1.505
Message-ID: <20090810145016.7C73511C0492@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023

Modified Files:
	cups.spec 
Added Files:
	cups-str3279.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Fixed ppds.dat handling of drv files (bug #515027, STR #3279).


cups-str3279.patch:
 cups-driverd.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE cups-str3279.patch ---
diff -up cups-1.4rc1/scheduler/cups-driverd.cxx.str3279 cups-1.4rc1/scheduler/cups-driverd.cxx
--- cups-1.4rc1/scheduler/cups-driverd.cxx.str3279	2009-06-08 23:00:14.000000000 +0100
+++ cups-1.4rc1/scheduler/cups-driverd.cxx	2009-08-10 15:48:26.255839804 +0100
@@ -1493,12 +1493,16 @@ load_ppds(const char *d,		/* I - Actual 
 	ppd->record.size == dent->fileinfo.st_size &&
 	ppd->record.mtime == dent->fileinfo.st_mtime)
     {
-      do
+      /* Rewind to the beginning of this run. */
+      while ((ppd = (ppd_info_t *)cupsArrayPrev(PPDsByName)) != NULL &&
+	     !strcmp(ppd->record.filename, name))
+	;
+
+      while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
+	     !strcmp(ppd->record.filename, name))
       {
         ppd->found = 1;
       }
-      while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
-	     !strcmp(ppd->record.filename, name));
 
       continue;
     }
@@ -1929,7 +1933,7 @@ load_drv(const char  *filename,		/* I - 
   * Add a dummy entry for the file...
   */
 
-  add_ppd(filename, filename, "", "", "", "", "", "", mtime, size, 0,
+  add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0,
           PPD_TYPE_DRV, "drv");
   ChangedPPD = 1;
 
@@ -1988,7 +1992,7 @@ load_drv(const char  *filename,		/* I - 
       {
         product_found = true;
 
-	add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+	add_ppd(name, uri, "en", d->manufacturer->value, make_model,
 		device_id ? device_id->value->value : "",
 		product->value->value,
 		ps_version ? ps_version->value->value : "(3010) 0",
@@ -1996,7 +2000,7 @@ load_drv(const char  *filename,		/* I - 
       }
 
     if (!product_found)
-      add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+      add_ppd(name, uri, "en", d->manufacturer->value, make_model,
 	      device_id ? device_id->value->value : "",
 	      d->model_name->value,
 	      ps_version ? ps_version->value->value : "(3010) 0",


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- cups.spec	10 Aug 2009 14:13:31 -0000	1.504
+++ cups.spec	10 Aug 2009 14:50:16 -0000	1.505
@@ -65,6 +65,7 @@ Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
+Patch41: cups-str3279.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -230,6 +231,7 @@ module. 
 %patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
+%patch41 -p1 -b .str3279
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -525,6 +527,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Fixed ppds.dat handling of drv files (bug #515027, STR #3279).
 - Fixed udev rules file to avoid DEVTYPE warning messages.
 - Fixed cupsGetNamedDest() so it does not fall back to the default
   printer when a destination has been named (bug #516439, STR #3285).



From varekova at fedoraproject.org  Mon Aug 10 14:51:10 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 10 Aug 2009 14:51:10 +0000 (UTC)
Subject: rpms/gsl/devel gsl.spec,1.50,1.51
Message-ID: <20090810145110.8C5EC11C0344@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25230

Modified Files:
	gsl.spec 
Log Message:
- fix installation with --excludedocs option (#515971)



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gsl.spec	25 Jul 2009 01:33:28 -0000	1.50
+++ gsl.spec	10 Aug 2009 14:51:10 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnu.org/software/gsl/
 Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.10-lib64.patch
@@ -63,11 +63,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gsl-ref.info %{_infodir}/dir || :
+if [ -f %{_infodir}/gsl-ref.info* ]; then
+    /sbin/install-info %{_infodir}/gsl-ref.info %{_infodir}/dir || :
+fi
 
-%preun devel 
+%preun devel
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/gsl-ref.info %{_infodir}/dir || :
+    if [ -f %{_infodir}/gsl-ref.info* ]; then
+	/sbin/install-info --delete %{_infodir}/gsl-ref.info %{_infodir}/dir || :
+    fi
 fi
 
 %clean
@@ -100,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Mon Aug 10 2009 Ivana Varekova <varekova redhat com> - 1.12-5
+- fix installation with --excludedocs option (#515971)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Aug 10 14:51:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 14:51:15 +0000 (UTC)
Subject: rpms/cups/devel cups-str3279.patch,NONE,1.1 cups.spec,1.499,1.500
Message-ID: <20090810145115.EFA6711C043D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25327

Modified Files:
	cups.spec 
Added Files:
	cups-str3279.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
- Fixed ppds.dat handling of drv files (bug #515027, STR #3279).


cups-str3279.patch:
 cups-driverd.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE cups-str3279.patch ---
diff -up cups-1.4rc1/scheduler/cups-driverd.cxx.str3279 cups-1.4rc1/scheduler/cups-driverd.cxx
--- cups-1.4rc1/scheduler/cups-driverd.cxx.str3279	2009-06-08 23:00:14.000000000 +0100
+++ cups-1.4rc1/scheduler/cups-driverd.cxx	2009-08-10 15:48:26.255839804 +0100
@@ -1493,12 +1493,16 @@ load_ppds(const char *d,		/* I - Actual 
 	ppd->record.size == dent->fileinfo.st_size &&
 	ppd->record.mtime == dent->fileinfo.st_mtime)
     {
-      do
+      /* Rewind to the beginning of this run. */
+      while ((ppd = (ppd_info_t *)cupsArrayPrev(PPDsByName)) != NULL &&
+	     !strcmp(ppd->record.filename, name))
+	;
+
+      while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
+	     !strcmp(ppd->record.filename, name))
       {
         ppd->found = 1;
       }
-      while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
-	     !strcmp(ppd->record.filename, name));
 
       continue;
     }
@@ -1929,7 +1933,7 @@ load_drv(const char  *filename,		/* I - 
   * Add a dummy entry for the file...
   */
 
-  add_ppd(filename, filename, "", "", "", "", "", "", mtime, size, 0,
+  add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0,
           PPD_TYPE_DRV, "drv");
   ChangedPPD = 1;
 
@@ -1988,7 +1992,7 @@ load_drv(const char  *filename,		/* I - 
       {
         product_found = true;
 
-	add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+	add_ppd(name, uri, "en", d->manufacturer->value, make_model,
 		device_id ? device_id->value->value : "",
 		product->value->value,
 		ps_version ? ps_version->value->value : "(3010) 0",
@@ -1996,7 +2000,7 @@ load_drv(const char  *filename,		/* I - 
       }
 
     if (!product_found)
-      add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+      add_ppd(name, uri, "en", d->manufacturer->value, make_model,
 	      device_id ? device_id->value->value : "",
 	      d->model_name->value,
 	      ps_version ? ps_version->value->value : "(3010) 0",


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- cups.spec	10 Aug 2009 14:14:08 -0000	1.499
+++ cups.spec	10 Aug 2009 14:51:15 -0000	1.500
@@ -65,6 +65,7 @@ Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
+Patch41: cups-str3279.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -230,6 +231,7 @@ module. 
 %patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
+%patch41 -p1 -b .str3279
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -525,6 +527,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
+- Fixed ppds.dat handling of drv files (bug #515027, STR #3279).
 - Fixed udev rules file to avoid DEVTYPE warning messages.
 - Fixed cupsGetNamedDest() so it does not fall back to the default
   printer when a destination has been named (bug #516439, STR #3285).



From scop at fedoraproject.org  Mon Aug 10 14:51:25 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 14:51:25 +0000 (UTC)
Subject: rpms/cylindrix/devel .cvsignore, 1.2, 1.3 cylindrix.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <20090810145125.6369D11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cylindrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25426

Modified Files:
	.cvsignore cylindrix.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-11
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cylindrix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jun 2008 12:30:51 -0000	1.2
+++ .cvsignore	10 Aug 2009 14:51:25 -0000	1.3
@@ -1 +1 @@
-cylindrix-1.0.tar.gz
+cylindrix-1.0.tar.bz2


Index: cylindrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cylindrix/devel/cylindrix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cylindrix.spec	24 Jul 2009 19:54:06 -0000	1.7
+++ cylindrix.spec	10 Aug 2009 14:51:25 -0000	1.8
@@ -1,12 +1,12 @@
 Name: cylindrix
 Version:  1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: A 3 degrees of freedom combat game
 
 Group: Amusements/Games 
 License: LGPLv2        
 URL: http://www.hardgeus.com/cylindrix/
-Source0: http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.gz
+Source0: http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.bz2
 Source1: cylindrix.desktop
 Source2: cylindrix.png
 Source3: cylindrix.sh
@@ -48,10 +48,6 @@ is worth a try.
 %configure
 make CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 
-rm -rf */CVS
-rm -rf */*/CVS
-rm -rf */*/*/CVS
-
 %install
 rm -rf %{buildroot}
 
@@ -110,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-11
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cylindrix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jun 2008 12:30:51 -0000	1.2
+++ sources	10 Aug 2009 14:51:25 -0000	1.3
@@ -1 +1 @@
-914cf70b0a95f4a36cfdfde7edbaa240  cylindrix-1.0.tar.gz
+973921b1c6f4662a8472ba630a237043  cylindrix-1.0.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 14:53:52 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 14:53:52 +0000 (UTC)
Subject: rpms/deletemail/devel .cvsignore, 1.2, 1.3 deletemail.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090810145352.8601011C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/deletemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25972

Modified Files:
	.cvsignore deletemail.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deletemail/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Feb 2009 07:04:15 -0000	1.2
+++ .cvsignore	10 Aug 2009 14:53:52 -0000	1.3
@@ -1 +1 @@
-deletemail-0.5.tar.gz
+deletemail-0.5.tar.bz2


Index: deletemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deletemail/devel/deletemail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- deletemail.spec	24 Jul 2009 20:08:24 -0000	1.3
+++ deletemail.spec	10 Aug 2009 14:53:52 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           deletemail
 Version:        0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A non-interactive tool for deleting mails
 
 Group:          Applications/Internet
 License:        MIT
 URL:            http://www.jhweiss.de/software/deletemail.html
-Source0:        ftp://ftp.jhweiss.de/pub/users/weiss/%{name}/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.jhweiss.de/pub/users/weiss/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5-4
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deletemail/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Feb 2009 07:04:15 -0000	1.2
+++ sources	10 Aug 2009 14:53:52 -0000	1.3
@@ -1 +1 @@
-7e547ab09b5fa56b59cd84032ed287ba  deletemail-0.5.tar.gz
+d25b1f564e71fc8bdfb8f70da4333d01  deletemail-0.5.tar.bz2



From mcrha at fedoraproject.org  Mon Aug 10 14:55:24 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 10 Aug 2009 14:55:24 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.99, 1.100 gtkhtml3.spec, 1.156,
	1.157 sources, 1.99, 1.100
Message-ID: <20090810145524.E798711C0344@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26365

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 3.27.90-1.fc12
- Update to 3.27.90




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore	27 Jul 2009 14:52:37 -0000	1.99
+++ .cvsignore	10 Aug 2009 14:55:24 -0000	1.100
@@ -1 +1 @@
-gtkhtml-3.27.5.tar.bz2
+gtkhtml-3.27.90.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- gtkhtml3.spec	27 Jul 2009 14:52:37 -0000	1.156
+++ gtkhtml3.spec	10 Aug 2009 14:55:24 -0000	1.157
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.27.5
+Version: 3.27.90
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 3.27.90-1.fc12
+- Update to 3.27.90
+
 * Mon Jul 27 2009 Milan Crha <mcrha at redhat.com> - 3.27.5-1.fc12
 - Update to 3.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources	27 Jul 2009 14:52:37 -0000	1.99
+++ sources	10 Aug 2009 14:55:24 -0000	1.100
@@ -1 +1 @@
-93d8517c7fe9d5ef2e705be41fa73c2e  gtkhtml-3.27.5.tar.bz2
+6e17cf6415852dbc7bbc44a362dfa7ac  gtkhtml-3.27.90.tar.bz2



From ruben at fedoraproject.org  Mon Aug 10 14:55:55 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 10 Aug 2009 14:55:55 +0000 (UTC)
Subject: rpms/pdns-recursor/devel pdns-recursor-fixsysconfdir.patch, 1.3,
	1.4 pdns-recursor.spec, 1.13, 1.14
Message-ID: <20090810145555.D977111C0344@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26747

Modified Files:
	pdns-recursor.spec 
Added Files:
	pdns-recursor-fixsysconfdir.patch 
Log Message:
* Mon Aug 10 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-2
- Re-add accidently dropped patch (#516562)


pdns-recursor-fixsysconfdir.patch:
 config.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: pdns-recursor-fixsysconfdir.patch
===================================================================
RCS file: pdns-recursor-fixsysconfdir.patch
diff -N pdns-recursor-fixsysconfdir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pdns-recursor-fixsysconfdir.patch	10 Aug 2009 14:55:55 -0000	1.4
@@ -0,0 +1,8 @@
+--- pdns-recursor-3.1.4/config.h.fixsysconfdir	2007-01-01 16:03:47.000000000 +0100
++++ pdns-recursor-3.1.4/config.h	2007-01-01 16:04:00.000000000 +0100
+@@ -1,4 +1,4 @@
+-#define SYSCONFDIR "/etc/powerdns/" 
++#define SYSCONFDIR "/etc/pdns-recursor/" 
+ #define LOCALSTATEDIR "/var/run/" 
+ #define VERSION "3.1.4"
+ #define RECURSOR


Index: pdns-recursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/pdns-recursor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pdns-recursor.spec	3 Aug 2009 12:20:46 -0000	1.13
+++ pdns-recursor.spec	10 Aug 2009 14:55:55 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:		Modern, advanced and high performance recursing/non authoritative nameserver
 Name:			pdns-recursor
 Version:		3.1.7.1
-Release:		1%{?dist}
+Release:		2%{?dist}
 Group:			System Environment/Daemons
 License:		GPLv2
 URL:			http://powerdns.com
@@ -10,6 +10,7 @@ Source0:		http://downloads.powerdns.com/
 Source1:		pdns-recursor.init	
 
 Patch0:			pdns-recursor-fixmakefile.patch
+Patch1:			pdns-recursor-fixsysconfdir.patch
 
 Provides:		powerdns-recursor = %{version}-%{release}
 BuildRequires:		boost-devel, lua-devel
@@ -23,6 +24,7 @@ package if you need a dns cache for your
 %prep
 %setup -q
 %patch0 -p1 -b .fixmakefile
+%patch1 -p1 -b .fixsysconfdir
 
 %build
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -74,6 +76,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-2
+- Re-add accidently dropped patch (#516562)
+
 * Mon Aug 03 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-1
 - Upstream released new version
 - Drop patches included upstream



From scop at fedoraproject.org  Mon Aug 10 14:58:02 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 14:58:02 +0000 (UTC)
Subject: rpms/doodle/devel .cvsignore, 1.3, 1.4 doodle.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <20090810145802.6708E11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/doodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27825

Modified Files:
	.cvsignore doodle.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.6.7-5
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/doodle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Dec 2007 17:11:20 -0000	1.3
+++ .cvsignore	10 Aug 2009 14:58:02 -0000	1.4
@@ -1 +1 @@
-doodle-0.6.7.tar.gz
+doodle-0.6.7.tar.bz2


Index: doodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/doodle/devel/doodle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- doodle.spec	24 Jul 2009 20:27:57 -0000	1.6
+++ doodle.spec	10 Aug 2009 14:58:02 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           doodle
 Version:        0.6.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Doodle is a tool to quickly search the documents on a computer
 
 Group:          Applications/File
 License:        GPLv2+
 URL:            http://gnunet.org/doodle/
-Source0:        http://gnunet.org/doodle/download/%{name}-%{version}.tar.gz
+Source0:        http://gnunet.org/doodle/download/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libextractor-devel gettext gamin-devel
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.6.7-5
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/doodle/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Dec 2007 17:11:20 -0000	1.3
+++ sources	10 Aug 2009 14:58:02 -0000	1.4
@@ -1 +1 @@
-99296fcdb0b577a05c79d398224126e9  doodle-0.6.7.tar.gz
+cea83796e163ea3effd16247065af3b3  doodle-0.6.7.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 10 14:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:59:49 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810145949.DA20A10F897@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora devel) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 14:59:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:59:52 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810145952.B9C7910F89C@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 14:59:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:59:54 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810145954.DC48610F8B5@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 14:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 14:59:57 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810145957.7914B10F8BA@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora devel) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:00 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150000.754EB10F8BD@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:05 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150005.B469C10F8C0@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora devel) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:06 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150007.3228C10F8C3@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora devel) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:17 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150018.942A610F89B@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora devel) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:21 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150022.1756310F8C8@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora 9) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:24 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150026.6E53C10F8AD@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora 9) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:25 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150027.0939410F8D3@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora 9) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:30 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150031.2035710F8CF@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora 9) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:42 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150042.52A2C10F8BB@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:42 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150042.666BF10F8D5@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora 10) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:43 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150043.94E8910F8D9@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:46 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150046.6C04B10F8DE@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora 10) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:50 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150051.36E6610F8E2@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:55 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150055.A681210F8E5@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora 10) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:00:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:00:58 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150100.1526510F8C0@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:06 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150106.D7FAF10F8F2@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora 10) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:06 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150107.5688F10F8FD@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:15 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150117.A6B1A10F90E@bastion2.fedora.phx.redhat.com>

mclasen has set the watchbugzilla acl on system-config-lvm (Fedora 11) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:22 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150124.69F3E10F89C@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:30 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150131.C4A8E10F929@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on system-config-lvm (Fedora 11) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:31 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150132.E245F10F92F@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:30 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150132.6129110F923@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:35 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150138.D3B7610F931@bastion2.fedora.phx.redhat.com>

mclasen has set the approveacls acl on system-config-lvm (Fedora 11) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:01:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:01:36 +0000
Subject: [pkgdb] system-config-lvm had acl change status
Message-ID: <20090810150138.C064510F8AF@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on system-config-lvm (Fedora 11) to Approved for marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From scop at fedoraproject.org  Mon Aug 10 15:02:00 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 15:02:00 +0000 (UTC)
Subject: rpms/dosfstools/devel .cvsignore, 1.8, 1.9 dosfstools.spec, 1.38,
	1.39 sources, 1.8, 1.9
Message-ID: <20090810150200.E2D6411C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28785

Modified Files:
	.cvsignore dosfstools.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0.1-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Jan 2009 10:37:23 -0000	1.8
+++ .cvsignore	10 Aug 2009 15:02:00 -0000	1.9
@@ -1 +1 @@
-dosfstools-3.0.1.tar.gz
+dosfstools-3.0.1.tar.bz2


Index: dosfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- dosfstools.spec	24 Jul 2009 20:28:54 -0000	1.38
+++ dosfstools.spec	10 Aug 2009 15:02:00 -0000	1.39
@@ -1,10 +1,10 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/System
-Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.gz
+Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
 URL: http://www.daniel-baumann.ch/software/dosfstools/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: mkdosfs-ygg
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0.1-6
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dosfstools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Jan 2009 10:37:23 -0000	1.8
+++ sources	10 Aug 2009 15:02:00 -0000	1.9
@@ -1 +1 @@
-0b76d1359919fba3bdc4db74a2e3b0f6  dosfstools-3.0.1.tar.gz
+b8ed17de873367a1782f85c661563411  dosfstools-3.0.1.tar.bz2



From mcrha at fedoraproject.org  Mon Aug 10 15:06:01 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 10 Aug 2009 15:06:01 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.111,
	1.112 evolution-data-server-1.11.5-fix-64bit-acinclude.patch,
	1.1, 1.2 evolution-data-server.spec, 1.269, 1.270 sources, 1.111,
	1.112
Message-ID: <20090810150601.A662E11C0344@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29722

Modified Files:
	.cvsignore 
	evolution-data-server-1.11.5-fix-64bit-acinclude.patch 
	evolution-data-server.spec sources 
Log Message:
* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
- Update to 2.27.90




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- .cvsignore	27 Jul 2009 15:15:46 -0000	1.111
+++ .cvsignore	10 Aug 2009 15:06:00 -0000	1.112
@@ -1 +1 @@
-evolution-data-server-2.27.5.tar.bz2
+evolution-data-server-2.27.90.tar.bz2

evolution-data-server-1.11.5-fix-64bit-acinclude.patch:
 acinclude.m4 |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

Index: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-1.11.5-fix-64bit-acinclude.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- evolution-data-server-1.11.5-fix-64bit-acinclude.patch	17 Jul 2007 15:21:30 -0000	1.1
+++ evolution-data-server-1.11.5-fix-64bit-acinclude.patch	10 Aug 2009 15:06:00 -0000	1.2
@@ -1,9 +1,10 @@
---- evolution-data-server-1.11.5/acinclude.m4.fix-64bit-acinclude	2007-07-17 10:45:02.000000000 -0400
-+++ evolution-data-server-1.11.5/acinclude.m4	2007-07-17 10:45:15.000000000 -0400
-@@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
- 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
- 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
- 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+diff -up evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude evolution-data-server-2.27.90/acinclude.m4
+--- evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude	2009-08-10 13:05:37.000000000 +0200
++++ evolution-data-server-2.27.90/acinclude.m4	2009-08-10 17:03:16.000000000 +0200
+@@ -43,6 +43,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+ 		[AS_HELP_STRING([--with-static-ldap],
+ 		[Link LDAP support statically into evolution])])
+ 	AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
 +
 +	AC_MSG_CHECKING(for multilib subdirectory)
 +	if test "$GCC" = "yes" ; then
@@ -19,7 +20,7 @@
  	case $ac_cv_with_openldap in
  	no|"")
  		with_openldap=no
-@@ -44,7 +56,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+@@ -53,7 +65,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
  	*)
  		with_openldap=$ac_cv_with_openldap
  		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
@@ -28,8 +29,8 @@
  		;;
  	esac
  
-@@ -80,20 +92,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
- 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
+@@ -89,20 +101,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+ 		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
  		AC_CHECK_LIB(lber, ber_get_tag, [
  			if test "$with_static_ldap" = "yes"; then
 -				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- evolution-data-server.spec	27 Jul 2009 15:15:46 -0000	1.269
+++ evolution-data-server.spec	10 Aug 2009 15:06:01 -0000	1.270
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.27.5
+Version: 2.27.90
 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 Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
+- Update to 2.27.90
+
 * Mon Jul 27 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-1.fc12
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	27 Jul 2009 15:15:46 -0000	1.111
+++ sources	10 Aug 2009 15:06:01 -0000	1.112
@@ -1 +1 @@
-fe5bb420060dc71a9884bf052163e901  evolution-data-server-2.27.5.tar.bz2
+526cce784d1d8ede8ca1c1fec4d25739  evolution-data-server-2.27.90.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:29 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested commit
Message-ID: <20090810150630.2FFDB10F8C6@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:30 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchcommits
Message-ID: <20090810150630.EE22510F8EB@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:32 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchbugzilla
Message-ID: <20090810150633.27B4410F8F1@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:53 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchcommits
Message-ID: <20090810150654.B266E10F8CE@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:53 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchbugzilla
Message-ID: <20090810150655.73A0D10F908@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:57 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchbugzilla
Message-ID: <20090810150658.B2FA210F8CC@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on mingw32-libxml2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:06:58 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchcommits
Message-ID: <20090810150700.31F6910F90D@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on mingw32-libxml2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:07:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:07:35 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested commit
Message-ID: <20090810150735.E008210F8BF@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From ruben at fedoraproject.org  Mon Aug 10 15:07:53 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 10 Aug 2009 15:07:53 +0000 (UTC)
Subject: rpms/pdns-recursor/devel pdns-recursor-fixsysconfdir.patch,1.4,1.5
Message-ID: <20090810150753.D6B9911C0344@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30220

Modified Files:
	pdns-recursor-fixsysconfdir.patch 
Log Message:
Rediff failing patch


pdns-recursor-fixsysconfdir.patch:
 config.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: pdns-recursor-fixsysconfdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/devel/pdns-recursor-fixsysconfdir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pdns-recursor-fixsysconfdir.patch	10 Aug 2009 14:55:55 -0000	1.4
+++ pdns-recursor-fixsysconfdir.patch	10 Aug 2009 15:07:53 -0000	1.5
@@ -1,8 +1,9 @@
---- pdns-recursor-3.1.4/config.h.fixsysconfdir	2007-01-01 16:03:47.000000000 +0100
-+++ pdns-recursor-3.1.4/config.h	2007-01-01 16:04:00.000000000 +0100
+diff -up pdns-recursor-3.1.7.1/config.h.orig pdns-recursor-3.1.7.1/config.h
+--- pdns-recursor-3.1.7.1/config.h.orig	2009-08-10 17:02:39.000000000 +0200
++++ pdns-recursor-3.1.7.1/config.h	2009-08-10 17:02:50.000000000 +0200
 @@ -1,4 +1,4 @@
 -#define SYSCONFDIR "/etc/powerdns/" 
 +#define SYSCONFDIR "/etc/pdns-recursor/" 
  #define LOCALSTATEDIR "/var/run/" 
- #define VERSION "3.1.4"
+ #define VERSION "3.1.7.1"
  #define RECURSOR



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:12 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150817.4F9FD10F8C4@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on mingw32-libxml2 (Fedora devel) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:15 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150818.88F2410F916@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on mingw32-libxml2 (Fedora devel) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:19 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150822.09B0B10F8DF@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on mingw32-libxml2 (Fedora devel) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:27 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150831.456FC10F8EA@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on mingw32-libxml2 (Fedora 10) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:28 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150832.4E3FA10F924@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on mingw32-libxml2 (Fedora 10) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:25 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150830.0B0E910F91D@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on mingw32-libxml2 (Fedora 10) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:34 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150835.62EB510F90F@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on mingw32-libxml2 (Fedora 11) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:36 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150837.5EF8C10F91B@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on mingw32-libxml2 (Fedora 11) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:08:37 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810150838.B831210F92A@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on mingw32-libxml2 (Fedora 11) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:09:31 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchbugzilla
Message-ID: <20090810150937.5FA0610F8EF@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on mingw32-libxml2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:09:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:09:32 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested watchcommits
Message-ID: <20090810150937.9F10B10F8F0@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on mingw32-libxml2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:09:34 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested commit
Message-ID: <20090810150941.81C8810F922@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on mingw32-libxml2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:10:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:10:07 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810151008.3F93E10F8F9@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on mingw32-libxml2 (Fedora EPEL 5) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:10:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:10:09 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810151009.A2BD710F92E@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on mingw32-libxml2 (Fedora EPEL 5) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Aug 10 15:10:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:10:10 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090810151011.3F1A710F936@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on mingw32-libxml2 (Fedora EPEL 5) to Approved for veillard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From mcrha at fedoraproject.org  Mon Aug 10 15:11:04 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 10 Aug 2009 15:11:04 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.118, 1.119 evolution.spec, 1.408,
	1.409 sources, 1.118, 1.119
Message-ID: <20090810151104.4FE5B11C0344@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30962

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
- Update to 2.27.90




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	27 Jul 2009 16:13:14 -0000	1.118
+++ .cvsignore	10 Aug 2009 15:11:03 -0000	1.119
@@ -1 +1 @@
-evolution-2.27.5.tar.bz2
+evolution-2.27.90.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- evolution.spec	28 Jul 2009 17:15:44 -0000	1.408
+++ evolution.spec	10 Aug 2009 15:11:04 -0000	1.409
@@ -5,7 +5,7 @@
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
 %define gtk2_version 2.14.0
-%define gtkhtml_version 3.25.3
+%define gtkhtml_version 3.27.90
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libbonobo_version 2.20.3
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.5
-Release: 3%{?dist}
+Version: 2.27.90
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -693,6 +693,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-3.fc12
 - Enable pst-import plugin (RH bug #493049)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- sources	27 Jul 2009 16:13:15 -0000	1.118
+++ sources	10 Aug 2009 15:11:04 -0000	1.119
@@ -1 +1 @@
-d8af57356e5dd818a419b9b5042f24d7  evolution-2.27.5.tar.bz2
+4c42df966be237cf5043943af3e7faa8  evolution-2.27.90.tar.bz2



From mcrha at fedoraproject.org  Mon Aug 10 15:13:23 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 10 Aug 2009 15:13:23 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.46,
	1.47 evolution-exchange.spec, 1.67, 1.68 sources, 1.46, 1.47
Message-ID: <20090810151323.91A2111C0344@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31505

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
- Update to 2.27.90




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	27 Jul 2009 16:52:42 -0000	1.46
+++ .cvsignore	10 Aug 2009 15:13:23 -0000	1.47
@@ -1 +1 @@
-evolution-exchange-2.27.5.tar.bz2
+evolution-exchange-2.27.90.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- evolution-exchange.spec	27 Jul 2009 16:52:42 -0000	1.67
+++ evolution-exchange.spec	10 Aug 2009 15:13:23 -0000	1.68
@@ -17,7 +17,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.27.5
+Version: 2.27.90
 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 Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
+- Update to 2.27.90
+
 * Mon Jul 27 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-1.fc12
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	27 Jul 2009 16:52:42 -0000	1.46
+++ sources	10 Aug 2009 15:13:23 -0000	1.47
@@ -1 +1 @@
-cec89cc72c2ce60dc2ce87aa6cbd4893  evolution-exchange-2.27.5.tar.bz2
+4d20afa1028c1246bbc3fa839871dfd7  evolution-exchange-2.27.90.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 15:17:37 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 15:17:37 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.25, 1.26 pixman.spec, 1.40,
	1.41 sources, 1.27, 1.28
Message-ID: <20090810151737.7B97D11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32421

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15.18-3
- Use bzipped upstream tarball.
- Fix URL.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	21 Jul 2009 11:36:10 -0000	1.25
+++ .cvsignore	10 Aug 2009 15:17:37 -0000	1.26
@@ -1,11 +1 @@
-pixman-0.13.2.tar.gz
-pixman-0.14.0.tar.gz
-pixman-0.15.2.tar.gz
-pixman-0.15.4.tar.gz
-pixman-0.15.6.tar.gz
-pixman-0.15.8.tar.gz
-pixman-0.15.10.tar.gz
-pixman-0.15.12.tar.gz
-pixman-0.15.14.tar.gz
-pixman-0.15.16.tar.gz
-pixman-0.15.18.tar.gz
+pixman-0.15.18.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- pixman.spec	26 Jul 2009 18:50:54 -0000	1.40
+++ pixman.spec	10 Aug 2009 15:17:37 -0000	1.41
@@ -3,16 +3,16 @@
 
 Name:           pixman
 Version:        0.15.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+URL:            http://cgit.freedesktop.org/pixman/
 # To make git snapshots:
 # ./make-pixman-snapshot.sh %{?gitrev}
 # if no revision specified, makes a new one from HEAD.
-Source0:        http://www.cairographics.org/releases/pixman-%{version}.tar.gz
+Source0:        http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15.18-3
+- Use bzipped upstream tarball.
+- Fix URL.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	21 Jul 2009 11:36:10 -0000	1.27
+++ sources	10 Aug 2009 15:17:37 -0000	1.28
@@ -1,3 +1 @@
-bfbb075dd60402e86528add13f8e27ad  pixman-0.15.14.tar.gz
-831b846d23e7b90abd56b4f614101542  pixman-0.15.16.tar.gz
-9b60fe7623621b546b76777b8b7d2490  pixman-0.15.18.tar.gz
+87d256db0440e579f113cd4fb67cbfb0  pixman-0.15.18.tar.bz2



From ruben at fedoraproject.org  Mon Aug 10 15:19:16 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 10 Aug 2009 15:19:16 +0000 (UTC)
Subject: rpms/pdns-recursor/F-11 pdns-recursor-fixsysconfdir.patch, 1.3,
	1.4 pdns-recursor.spec, 1.12, 1.13
Message-ID: <20090810151916.A5BF511C0344@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns-recursor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv366

Modified Files:
	pdns-recursor.spec 
Added Files:
	pdns-recursor-fixsysconfdir.patch 
Log Message:
* Mon Aug 10 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-2
- Re-add accidently dropped patch (#516562)


pdns-recursor-fixsysconfdir.patch:
 config.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: pdns-recursor-fixsysconfdir.patch
===================================================================
RCS file: pdns-recursor-fixsysconfdir.patch
diff -N pdns-recursor-fixsysconfdir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pdns-recursor-fixsysconfdir.patch	10 Aug 2009 15:19:16 -0000	1.4
@@ -0,0 +1,9 @@
+diff -up pdns-recursor-3.1.7.1/config.h.orig pdns-recursor-3.1.7.1/config.h
+--- pdns-recursor-3.1.7.1/config.h.orig	2009-08-10 17:02:39.000000000 +0200
++++ pdns-recursor-3.1.7.1/config.h	2009-08-10 17:02:50.000000000 +0200
+@@ -1,4 +1,4 @@
+-#define SYSCONFDIR "/etc/powerdns/" 
++#define SYSCONFDIR "/etc/pdns-recursor/" 
+ #define LOCALSTATEDIR "/var/run/" 
+ #define VERSION "3.1.7.1"
+ #define RECURSOR


Index: pdns-recursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns-recursor/F-11/pdns-recursor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pdns-recursor.spec	3 Aug 2009 14:27:50 -0000	1.12
+++ pdns-recursor.spec	10 Aug 2009 15:19:16 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:		Modern, advanced and high performance recursing/non authoritative nameserver
 Name:			pdns-recursor
 Version:		3.1.7.1
-Release:		1%{?dist}
+Release:		2%{?dist}
 Group:			System Environment/Daemons
 License:		GPLv2
 URL:			http://powerdns.com
@@ -10,6 +10,7 @@ Source0:		http://downloads.powerdns.com/
 Source1:		pdns-recursor.init	
 
 Patch0:			pdns-recursor-fixmakefile.patch
+Patch1:			pdns-recursor-fixsysconfdir.patch
 
 Provides:		powerdns-recursor = %{version}-%{release}
 BuildRequires:		boost-devel, lua-devel
@@ -23,6 +24,7 @@ package if you need a dns cache for your
 %prep
 %setup -q
 %patch0 -p1 -b .fixmakefile
+%patch1 -p1 -b .fixsysconfdir
 
 %build
 LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua OPTFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -74,6 +76,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-2
+- Re-add accidently dropped patch (#516562)
+
 * Mon Aug 03 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 3.1.7.1-1
 - Upstream released new version
 - Drop patches included upstream



From pkgdb at fedoraproject.org  Mon Aug 10 15:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:24:47 +0000
Subject: [pkgdb] system-config-lvm (Fedora, devel) updated by notting
Message-ID: <20090810152447.54C9610F89B@bastion2.fedora.phx.redhat.com>

notting changed owner of system-config-lvm in Fedora devel to marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From scop at fedoraproject.org  Mon Aug 10 15:25:06 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 15:25:06 +0000 (UTC)
Subject: rpms/cylindrix/devel cylindrix.spec,1.8,1.9
Message-ID: <20090810152506.13FC411C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cylindrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1808

Modified Files:
	cylindrix.spec 
Log Message:
Fix unpack directory.


Index: cylindrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cylindrix/devel/cylindrix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cylindrix.spec	10 Aug 2009 14:51:25 -0000	1.8
+++ cylindrix.spec	10 Aug 2009 15:25:05 -0000	1.9
@@ -35,7 +35,7 @@ of their reflexes or have beaten Spectre
 is worth a try.
 
 %prep
-%setup -qn cylindrix
+%setup -q
 
 %patch0 -p0
 %patch1 -p0



From pkgdb at fedoraproject.org  Mon Aug 10 15:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:25:58 +0000
Subject: [pkgdb] system-config-lvm (Fedora, 10) updated by notting
Message-ID: <20090810152559.080AE10F89A@bastion2.fedora.phx.redhat.com>

notting changed owner of system-config-lvm in Fedora 10 to marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From pkgdb at fedoraproject.org  Mon Aug 10 15:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:25:58 +0000
Subject: [pkgdb] system-config-lvm (Fedora, 10) updated by notting
Message-ID: <20090810152559.B810B10F8AF@bastion2.fedora.phx.redhat.com>

notting changed owner of system-config-lvm in Fedora 11 to marx

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-lvm



From dwalsh at fedoraproject.org  Mon Aug 10 15:26:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 10 Aug 2009 15:26:45 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.425,
	1.426 policycoreutils.spec, 1.617, 1.618
Message-ID: <20090810152645.5DB1811C0344@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2544

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 2.0.70-2
- Don't warn if the user did not specify the exclude if root can not stat file system


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 restorecond/Makefile                        |   20 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  399 +++-------------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  220 +++++++++++++++
 restorecond/walk.c                          |   30 ++
 restorecond/watch.c                         |  346 ++++++++++++++++++++++++
 scripts/Makefile                            |    3 
 scripts/sandbox                             |  139 +++++++++
 scripts/sandbox.8                           |   22 +
 scripts/sandbox.py                          |   67 ++++
 semanage/semanage                           |   59 +++-
 semanage/semanage.8                         |    2 
 semanage/seobject.py                        |  283 +++++++++++++------
 setfiles/setfiles.c                         |   10 
 19 files changed, 1172 insertions(+), 466 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -p -r1.425 -r1.426
--- policycoreutils-rhat.patch	5 Aug 2009 19:27:53 -0000	1.425
+++ policycoreutils-rhat.patch	10 Aug 2009 15:26:43 -0000	1.426
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.68/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.70/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.68/Makefile	2009-07-29 09:34:07.000000000 -0400
++++ policycoreutils-2.0.70/Makefile	2009-08-05 15:24:16.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.68/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.70/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/Makefile	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/Makefile	2009-08-05 15:24:16.000000000 -0400
 @@ -2,16 +2,23 @@
  PREFIX ?= ${DESTDIR}/usr
  SBINDIR ?= $(PREFIX)/sbin
@@ -51,16 +51,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.68/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.70/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/org.selinux.Restorecond.service	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/org.selinux.Restorecond.service	2009-08-05 15:24:16.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.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.68/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.70/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/restorecond.c	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/restorecond.c	2009-08-05 15:24:16.000000000 -0400
 @@ -48,294 +48,37 @@
  #include <signal.h>
  #include <string.h>
@@ -529,9 +529,9 @@ diff --exclude-from=exclude --exclude=se
  }
 +
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.68/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.70/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.68/restorecond/restorecond.conf	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/restorecond.conf	2009-08-05 15:24:16.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -542,9 +542,9 @@ diff --exclude-from=exclude --exclude=se
  /root/.ssh/*
 -
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.68/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.70/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/restorecond.desktop	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/restorecond.desktop	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -553,9 +553,9 @@ diff --exclude-from=exclude --exclude=se
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.68/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.70/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.68/restorecond/restorecond.h	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/restorecond.h	2009-08-05 15:24:16.000000000 -0400
 @@ -24,7 +24,22 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -581,15 +581,15 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.68/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.70/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/restorecond_user.conf	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/restorecond_user.conf	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.68/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.70/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/user.c	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/user.c	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,220 @@
 +/*
 + * restorecond
@@ -811,9 +811,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.68/restorecond/walk.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.70/restorecond/walk.c
 --- nsapolicycoreutils/restorecond/walk.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/walk.c	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/walk.c	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,30 @@
 +#define _XOPEN_SOURCE 500
 +#include <ftw.h>
@@ -845,9 +845,9 @@ diff --exclude-from=exclude --exclude=se
 +    printf("Total Dirs %d\n",ctr);
 +    exit(EXIT_SUCCESS);
 +}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.68/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.70/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/restorecond/watch.c	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/restorecond/watch.c	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,346 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1195,9 +1195,9 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.68/scripts/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.70/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.68/scripts/Makefile	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/scripts/Makefile	2009-08-05 15:24:16.000000000 -0400
 @@ -5,11 +5,12 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1212,9 +1212,9 @@ diff --exclude-from=exclude --exclude=se
  	install -m 755 fixfiles $(DESTDIR)/sbin
  	install -m 755 genhomedircon  $(SBINDIR)
  	-mkdir -p $(MANDIR)/man8
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.68/scripts/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.70/scripts/sandbox
 --- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/scripts/sandbox	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/scripts/sandbox	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
@@ -1355,9 +1355,9 @@ diff --exclude-from=exclude --exclude=se
 +        error_exit(error.args[1])
 +        
 +    sys.exit(rc)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.68/scripts/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.70/scripts/sandbox.8
 --- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/scripts/sandbox.8	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/scripts/sandbox.8	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,22 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1381,9 +1381,9 @@ diff --exclude-from=exclude --exclude=se
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.68/scripts/sandbox.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.70/scripts/sandbox.py
 --- nsapolicycoreutils/scripts/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.68/scripts/sandbox.py	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/scripts/sandbox.py	2009-08-05 15:24:16.000000000 -0400
 @@ -0,0 +1,67 @@
 +#!/usr/bin/python
 +import os, sys, getopt, socket, random, fcntl
@@ -1452,9 +1452,9 @@ diff --exclude-from=exclude --exclude=se
 +    mount(mount_src, filecon)
 +    umount(filecon)
 +os.execvp(cmds[0], cmds)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.68/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.70/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.68/semanage/semanage	2009-07-29 09:34:44.000000000 -0400
++++ policycoreutils-2.0.70/semanage/semanage	2009-08-05 15:24:16.000000000 -0400
 @@ -44,16 +44,17 @@
                 text = _("""
  semanage [ -S store ] -i [ input_file | - ]
@@ -1633,9 +1633,9 @@ diff --exclude-from=exclude --exclude=se
  
  			elif object == "node":
  				OBJECT.delete(target, mask, proto)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.68/semanage/semanage.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.70/semanage/semanage.8
 --- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.68/semanage/semanage.8	2009-07-29 09:30:07.000000000 -0400
++++ policycoreutils-2.0.70/semanage/semanage.8	2009-08-05 15:24:16.000000000 -0400
 @@ -21,6 +21,8 @@
  .br
  .B semanage permissive \-{a|d} type
@@ -1645,9 +1645,9 @@ diff --exclude-from=exclude --exclude=se
  .B semanage translation \-{a|d|m} [\-T] level
  .P
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.68/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.70/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.68/semanage/seobject.py	2009-07-29 09:35:07.000000000 -0400
++++ policycoreutils-2.0.70/semanage/seobject.py	2009-08-05 15:24:16.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 
@@ -2427,3 +2427,44 @@ diff --exclude-from=exclude --exclude=se
  		if use_file:
                         ddict = self.get_all(locallist)
                         keys = ddict.keys()
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.70/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-08-05 15:10:56.000000000 -0400
++++ policycoreutils-2.0.70/setfiles/setfiles.c	2009-08-10 11:06:54.000000000 -0400
+@@ -234,7 +234,7 @@
+ 	fl_head = NULL;
+ }
+ 
+-static int add_exclude(const char *directory)
++static int add_exclude(const char *directory, int warn)
+ {
+ 	struct stat sb;
+ 	size_t len = 0;
+@@ -244,8 +244,8 @@
+ 		return 1;
+ 	}
+ 	if (lstat(directory, &sb)) {
+-		fprintf(stderr, "Can't stat directory \"%s\", %s.\n",
+-			directory, strerror(errno));
++		if (warn) fprintf(stderr, "Can't stat directory \"%s\", %s.\n",
++				directory, strerror(errno));
+ 		return 0;
+ 	}
+ 	if ((sb.st_mode & S_IFDIR) == 0) {
+@@ -727,7 +727,7 @@
+ 
+ 		/* exclude mount points without the seclabel option */
+ 		if (!found)
+-			add_exclude(mount_info[1]);
++			add_exclude(mount_info[1], 0);
+ 	}
+ 
+ 	free(buf);
+@@ -840,7 +840,7 @@
+ 			}
+ 		case 'e':
+ 			remove_exclude(optarg);
+-			if (add_exclude(optarg))
++			if (add_exclude(optarg, 1))
+ 				exit(1);
+ 			break;
+ 		case 'f':


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -p -r1.617 -r1.618
--- policycoreutils.spec	5 Aug 2009 19:27:54 -0000	1.617
+++ policycoreutils.spec	10 Aug 2009 15:26:45 -0000	1.618
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.70
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -266,6 +266,9 @@ else
 fi
 
 %changelog
+* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 2.0.70-2
+- Don't warn if the user did not specify the exclude if root can not stat file system
+
 * Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.70-1
 - Update to upstream
 	* Modify restorecon to only call realpath() on user-supplied pathnames



From pbrobinson at fedoraproject.org  Mon Aug 10 15:28:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 10 Aug 2009 15:28:59 +0000 (UTC)
Subject: rpms/ifuse/devel .cvsignore, 1.4, 1.5 ifuse.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20090810152859.9617D11C0344@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3954

Modified Files:
	.cvsignore ifuse.spec sources 
Log Message:
- Update to 0.9.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 May 2009 16:42:20 -0000	1.4
+++ .cvsignore	10 Aug 2009 15:28:59 -0000	1.5
@@ -1 +1 @@
-ifuse-0.9.1.tar.bz2
+ifuse-0.9.3.tar.bz2


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ifuse.spec	25 Jul 2009 03:15:17 -0000	1.5
+++ ifuse.spec	10 Aug 2009 15:28:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name:          ifuse
-Version:       0.9.1
-Release:       2%{?dist}
+Version:       0.9.3
+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
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
+- Update to 0.9.3 release
+
 * 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/ifuse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 May 2009 16:42:20 -0000	1.4
+++ sources	10 Aug 2009 15:28:59 -0000	1.5
@@ -1 +1 @@
-a00d8e6e20baaf271cb84f3a353ff70b  ifuse-0.9.1.tar.bz2
+dfb627493132d7ca63feaf96bf5cb6a5  ifuse-0.9.3.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug 10 15:31:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 10 Aug 2009 15:31:59 +0000 (UTC)
Subject: rpms/libiphone/devel .cvsignore, 1.5, 1.6 libiphone.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20090810153159.D4F5B11C0344@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4636

Modified Files:
	.cvsignore libiphone.spec sources 
Log Message:
- Update to 0.9.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 May 2009 16:38:38 -0000	1.5
+++ .cvsignore	10 Aug 2009 15:31:59 -0000	1.6
@@ -1 +1 @@
-libiphone-0.9.1.tar.bz2
+libiphone-0.9.3.tar.bz2


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libiphone.spec	25 Jul 2009 05:59:05 -0000	1.14
+++ libiphone.spec	10 Aug 2009 15:31:59 -0000	1.15
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libiphone
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -20,6 +20,7 @@ BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: python-devel
 BuildRequires: swig
+BuildRequires: usbmuxd-devel
 
 %description
 libiphone is a library for connecting to Apple's iPhone or iPod touch devices
@@ -47,15 +48,21 @@ Python bindings for libiphone.
 
 %build
 %configure --disable-static
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libiphone.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -64,9 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LESSER README
+%{_bindir}/iphone*
 %{_libdir}/libiphone.so.0
 %{_libdir}/libiphone.so.0.0.0
-%{_sysconfdir}/udev/rules.d/89-libiphone.rules
 %{_datadir}/hal/fdi/information/20thirdparty/31-apple-mobile-device.fdi
 
 %files devel
@@ -80,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libiphone/
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
+- Update to 0.9.3 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 May 2009 16:38:38 -0000	1.6
+++ sources	10 Aug 2009 15:31:59 -0000	1.7
@@ -1 +1 @@
-862c7763fc47593c473293ae18a80fb2  libiphone-0.9.1.tar.bz2
+ce729c31b6b760dac94cbf8f84e09667  libiphone-0.9.3.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 10 15:07:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 15:07:00 +0000
Subject: [pkgdb] mingw32-libxml2: veillard has requested commit
Message-ID: <20090810150703.8644010F912@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on mingw32-libxml2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From caolanm at fedoraproject.org  Mon Aug 10 15:33:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 10 Aug 2009 15:33:18 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch,
	1.4, 1.5
Message-ID: <20090810153318.5296011C0344@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4965

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
fourth round of dmake fixes

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |   20 +++++++++++++++-----
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 expand.c         |    4 +++-
 make.c           |   15 ++++++++++-----
 7 files changed, 48 insertions(+), 21 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 14:18:24 -0000	1.4
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 15:33:17 -0000	1.5
@@ -47,26 +47,68 @@ diff -ru dmake.orig/dag.c dmake/dag.c
 diff -ru dmake.orig/expand.c dmake/expand.c
 --- dmake.orig/expand.c	2009-08-07 20:18:34.000000000 +0100
 +++ dmake/expand.c	2009-08-07 20:42:40.000000000 +0100
-@@ -365,7 +365,8 @@
-       if( (e = Basename(s)) != s) {
- 	 if( !(mod & DIRECTORY_FLAG) ) {
- 	    /* Move the basename to the start. */
--	    strcpy(s, e);
-+	    size_t len = strlen(e)+1;
-+	    memmove(s, e, len);
+@@ -230,6 +230,7 @@
+ char *tok;
+ {
+    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
++      size_t len;
+       switch( tok[1] ) {
+ 	 case 'a' : *tok = 0x07; break;
+ 	 case 'b' : *tok = '\b'; break;
+@@ -246,13 +247,15 @@
+ 	    register int j = 0;
+ 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
+ 	       j = (j << 3) + (tok[1] - '0');
+-	       strcpy( tok+1, tok+2 );
++	       len = strlen(tok+2)+1;
++	       memmove( tok+1, tok+2, len );
+ 	    }
+ 	    j = (j << 3) + (tok[1] - '0');
+ 	    *tok = j;
  	 }
- 	 else
- 	    s = e;
-@@ -382,7 +383,8 @@
- 
-       if( !(mod & FILE_FLAG) ) {
- 	 /* Move the suffix to the start. */
--	 strcpy( s, e );
-+	 size_t len = strlen(e)+1;
-+	 memmove( s, e, len );
        }
-       else
- 	 s = e;
+-      strcpy( tok+1, tok+2 );
++      len = strlen(tok+2)+1;
++      memmove( tok+1, tok+2, len );
+    }
+ }
+ 
+@@ -727,8 +730,10 @@
+ 	      done = !lev;
+ 	      break;
+             } else {
++              size_t len;
+ 	      s[1] = ' ';
+-	      strcpy( s, s+1 );
++              len = strlen(s+1)+1;
++	      memmove( s, s+1, len );
+ 	    }
+ 	    /*FALLTHRU*/
+ 	 case ' ':
+@@ -837,8 +842,10 @@
+        * converted them to a real space. Let's verify this. */
+       for( p=s; *p && *p != edelim && *p; p++ ) {
+ 	if( p[0] == '\\' && p[1] == '\n' ) {
++	  size_t len;
+ 	  p[1] = ' ';
+-	  strcpy( p, p+1 );
++	  len = strlen(p+1)+1;
++	  memmove( p, p+1, len );
+ 	}
+       }
+       if( !*p )
+@@ -1122,7 +1129,10 @@
+       *flag = 1;
+       res   = Expand( start );
+ 
+-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
++      if( (t = DmStrSpn( res, " \t" )) != res ) {
++          size_t len = strlen(t)+1;
++          memmove( res, t, len );
++      }
+    }
+ 
+    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
 diff -ru dmake.orig/getinp.c dmake/getinp.c
 --- dmake.orig/getinp.c	2009-08-07 20:18:31.000000000 +0100
 +++ dmake/getinp.c	2009-08-07 20:27:08.000000000 +0100



From hadess at fedoraproject.org  Mon Aug 10 15:34:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 10 Aug 2009 15:34:42 +0000 (UTC)
Subject: rpms/control-center/devel .cvsignore, 1.91, 1.92 control-center.spec,
	1.463, 1.464 sources, 1.94, 1.95
Message-ID: <20090810153442.2EBBD11C0344@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5257

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-5
- Fix a lost mnemonic



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	16 Jul 2009 01:23:51 -0000	1.91
+++ .cvsignore	10 Aug 2009 15:34:41 -0000	1.92
@@ -1 +1 @@
-finger-icons.tar
+gnome-control-center-2.27.5.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- control-center.spec	3 Aug 2009 15:51:44 -0000	1.463
+++ control-center.spec	10 Aug 2009 15:34:41 -0000	1.464
@@ -22,14 +22,13 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.27.4
-Release: 5%{?dist}
+Version: 2.27.5
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 Source: http://download.gnome.org/sources/gnome-control-center/2.27/gnome-control-center-%{version}.tar.bz2
 Source1: org.gnome.control-center.defaultbackground.policy
-Source2: finger-icons.tar
 
 Patch3: control-center-2.19.3-no-gnome-common.patch
 # http://bugzilla.gnome.org/536531
@@ -194,9 +193,6 @@ utilities.
 %patch7 -p1 -b .make-default
 %patch37 -p1 -b .polkit1
 
-# fingerprint icons went missing in 2.27.4
-tar -C capplets/about-me/icons -xf %{SOURCE2}
-
 autoreconf -f -i
 
 %build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	16 Jul 2009 01:23:52 -0000	1.94
+++ sources	10 Aug 2009 15:34:42 -0000	1.95
@@ -1,2 +1 @@
-885a27b95857235ba95d034e25ae0a67  finger-icons.tar
-2a94b5ba300f9c731195bf734f59adec  gnome-control-center-2.27.4.tar.bz2
+ee1c62f934a1f89aadfe8bdb33cec99a  gnome-control-center-2.27.5.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 15:35:02 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 15:35:02 +0000 (UTC)
Subject: rpms/emacs/devel .cvsignore, 1.27, 1.28 emacs.spec, 1.131,
	1.132 sources, 1.29, 1.30
Message-ID: <20090810153502.0D95A11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5402

Modified Files:
	.cvsignore emacs.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:23.1-2
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	31 Jul 2009 13:15:48 -0000	1.27
+++ .cvsignore	10 Aug 2009 15:35:01 -0000	1.28
@@ -1 +1 @@
-emacs-23.1.tar.gz
+emacs-23.1.tar.bz2


Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- emacs.spec	31 Jul 2009 13:15:48 -0000	1.131
+++ emacs.spec	10 Aug 2009 15:35:01 -0000	1.132
@@ -4,11 +4,11 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
-Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2
 Source1: emacs.desktop
 Source3: dotemacs.el
 Source4: site-start.el
@@ -369,6 +369,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:23.1-2
+- Use bzipped upstream tarball.
+
 * Fri Jul 31 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-1
 - new upstream version 23.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	31 Jul 2009 13:15:48 -0000	1.29
+++ sources	10 Aug 2009 15:35:01 -0000	1.30
@@ -1 +1 @@
-a620d4452769d04ad8864d662f34f8dd  emacs-23.1.tar.gz
+17f7f0ba68a0432d58fa69d05a2225be  emacs-23.1.tar.bz2



From dwmw2 at fedoraproject.org  Mon Aug 10 15:42:58 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 10 Aug 2009 15:42:58 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1707,1.1708
Message-ID: <20090810154258.DBA9811C0344@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6837

Modified Files:
	kernel.spec 
Log Message:
add version to changelog


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1707
retrieving revision 1.1708
diff -u -p -r1.1707 -r1.1708
--- kernel.spec	10 Aug 2009 14:21:09 -0000	1.1707
+++ kernel.spec	10 Aug 2009 15:42:58 -0000	1.1708
@@ -1980,7 +1980,7 @@ fi
 # and build.
 
 %changelog
-* Mon Aug 10 2009 David Woodhouse <David.Woodhouse at intel.com>
+* Mon Aug 10 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.145.rc5.git3
 - Merge latest Intel IOMMU fixes and BIOS workarounds, re-enable by default.
 
 * Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>



From jortel at fedoraproject.org  Mon Aug 10 16:03:16 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:03:16 +0000 (UTC)
Subject: rpms/chameleon/devel chameleon.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810160316.ACF3E11C0344@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10970/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chameleon.spec import.log 
Log Message:
Initial package import.



--- NEW FILE chameleon.spec ---
Summary: Common schema transformation tool
Name: chameleon
Version: 0.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/c/h/%{name}/%{name}-%{version}.tar.gz
License: LGPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: python >= 2.3
Requires: python >= 2.3 python-ply
Url: https://fedorahosted.org/chameleon

%description
Chameleon is a common to database specific schema transformation tool.

%define chameleon_home %{_datadir}/chameleon

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{chameleon_home}
cp -p chameleon/*.py $RPM_BUILD_ROOT/%{chameleon_home}
install -m 0755 chameleon.bin $RPM_BUILD_ROOT/%{_bindir}/chameleon

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{chameleon_home}
%{chameleon_home}/*
%{_bindir}/chameleon

%doc LICENSE

%changelog
* Tue Jul 21 2009 jortel <jortel at redhat.com> - 0.2-1
- Fix number precision.
* Mon Jul 13 2009 jortel <jortel at redhat.com> - 0.1-7
- Replace hard coded "/usr/share" with %%{_datadir} and use cp -p to preserve permissions.
- Add BuildRequires python.
* Wed May 20 2009 jortel <jortel at redhat.com> - 0.1-6
- Rename to meet packaging guidelines.
* Tue May 5 2009 jortel <jortel at redhat.com> - 0.1-5
- Reduce output and refactor main.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-4
- Fix noparallel and logging.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-3
- Add include handling.
* Wed Apr 29 2009 jortel <jortel at redhat.com> - 0.1-2
- Fix optimizer bug.
* Tue Apr 28 2009 jortel <jortel at redhat.com> - 0.1-1
- 0.1


--- NEW FILE import.log ---
chameleon-0_2-1_fc10:HEAD:chameleon-0.2-1.fc10.src.rpm:1249920138


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chameleon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Aug 2009 20:05:08 -0000	1.1
+++ .cvsignore	10 Aug 2009 16:03:15 -0000	1.2
@@ -0,0 +1 @@
+chameleon-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chameleon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:05:08 -0000	1.1
+++ sources	10 Aug 2009 16:03:16 -0000	1.2
@@ -0,0 +1 @@
+ac6b154af827504dd29b7572ffe51e76  chameleon-0.2.tar.gz



From mhlavink at fedoraproject.org  Mon Aug 10 16:04:58 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 10 Aug 2009 16:04:58 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot-sieve-0.1.11.patch, NONE,
	1.1 dovecot.spec, 1.132, 1.133
Message-ID: <20090810160458.4923411C0344@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11345

Modified Files:
	dovecot.spec 
Added Files:
	dovecot-sieve-0.1.11.patch 
Log Message:
fix dovecot-sive build script


dovecot-sieve-0.1.11.patch:
 sieve-filter.1 |  151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

--- NEW FILE dovecot-sieve-0.1.11.patch ---
diff -up dovecot-1.2-sieve-0.1.11/doc/man/sieve-filter.1.devnull dovecot-1.2-sieve-0.1.11/doc/man/sieve-filter.1
--- /dev/null	2009-08-10 16:08:33.895265368 +0200
+++ dovecot-1.2-sieve-0.1.11/doc/man/sieve-filter.1	2009-08-10 16:08:02.899248904 +0200
@@ -0,0 +1,151 @@
+.TH "SIEVE-FILTER" "1" "5 August 2009"
+.SH NAME
+sieve-filter \- Sieve mailbox filter tool for the Dovecot secure IMAP server
+.PP
+\fBWARNING: \fRThis tool is not finished and should \fB*NOT*\fR be used, unless you feel like testing newly developed
+features! The behavior described in this manual page represents the design and not necessarily what the tool currently implements.
+
+.SH SYNOPSIS
+sieve-filter [\fIoptions\fR] \fIscript-file\fR \fIsource-location\fR \fIsource-mailbox\fR [\fIinbox-namespace\fR [\fInamespace\fR ...]]
+.TP
+\fInamepace\fR = [prefix=]location[;option=value,option=value,...]
+.TP
+[FIXME: what would be the easiest way to specify a filter operation without always needing to
+delve into the complexity of namespaces]
+
+.SH DESCRIPTION
+.PP
+The \fBsieve-filter\fP command is part of the Sieve implementation for the Dovecot secure 
+IMAP server. Sieve (RFC 5228) is a simple and highly extensible language for filtering 
+e-mail messages. It can be implemented for any type of mail access protocol, mail 
+architecture and operating system. The language cannot execute external programs and in 
+its basic form it does not provide the means to cause infinite loops, making it suitable 
+for running securely on mail servers where mail users have no permission run arbitrary programs.
+.PP
+The Sieve language was originally meant for filtering messages upon delivery. However, there are
+occasions when it is desirable to filter messages that are already stored in a mailbox, for
+instance when a bug in a Sieve script caused many messages to be delivered incorrectly.
+Using the sieve-filter tool it is possible to apply a Sieve script on all messages in a particular
+mailbox, making it possible to delete messages, to store them in a different folder and to change
+the assigned IMAP flags and keywords. Attempts to send messages to the outside world are ignored by default
+for obvious reasons, but, using the proper command line options, it is possible to capture outgoing
+mail as well. 
+.PP
+The command has three mandatory arguments: the \fIscript-file\fP argument, which specifies the path of the
+Sieve script, the \fIsource-location\fP argument, which specifies the mail storage of the source mailbox 
+(e.g. `maildir:~/Maildir'), and the \fIsource-mailbox\fP argument, which specifies the name of the source 
+mailbox within the specified mail storage (e.g. `INBOX.Spam'). 
+.PP
+This tool does not (yet) use Dovecot's configuration file to obtain information on namespaces and the
+location of mailboxes. Therefore, any used namespaces need to be specified on the command line. These
+specifications directly follow the \fIsource-mailbox\fP parameter. The first specified namespace will
+be the INBOX namespace.
+.PP
+If no namespaces are defined on the commandline, the source-location is used as the default mail store
+where the INBOX is located. This means that the keep action could operate on the folder the message
+originates from. In this case the message remains untouched and it is not duplicated, but IMAP flags and
+keywords can be evaluated and changed with the imap4flags extension . If namespaces are defined explicitly, 
+the source location is available as a namespace with prefix `#src/'. 
+.PP
+If no options are specified, the sieve-filter command runs in a simulation mode in which it only 
+prints what would be performed, without actually doing anything. Use the \fB-e\fP option to activate
+true script execution. Also, the source mailbox is opened read-only by default, so that the source mailbox
+remains unchanged. Use the \fB-W\fP to allow changes in the source mailbox. 
+
+.SH CAUTION
+Although this is a very useful tool, it can also be very destructive when used improperly. A small 
+bug in your Sieve script in combination with the wrong command line options could cause it to 
+discard (many) more e-mails than it was supposed to. Therefore, users are advised to read this manual
+carefully and to use the simulation mode first to check what the script will do. 
+.PP
+\fBMAKING A BACKUP IS IMPERATIVE FOR ANY IMPORTANT MAIL!\fP
+.PP
+By default, it will open the source mailbox in a read-only mode, such that it will not delete any of your
+e-mails. However, it can still litter other mailboxes with spurious copies of your e-mails if your
+Sieve script decides to do so.
+
+.SH OPTIONS
+.TP 
+\fB-D\fP \fIsource-action\fP
+By default, the sieve-filter command does not delete the messages from the source mailbox. This means that
+a copy operation is executed by default and the source mailbox is not altered. The \fIsource-action\fP
+parameter of the \fB-D\fP option can take four different values:
+.RS 7
+.TP 
+\fBkeep\fP (default)
+Keep messages in source folder. If \fB-W\fR is specified and the source mailbox is the destination of
+a keep or fileinto action, flags can be changed by the Sieve script. Messages are never duplicated in the
+source mailbox.
+.TP 
+\fBflag\fP
+Flag messages as \\DELETED.
+.TP 
+\fBmove\fP [\fIfolder\fP]
+Move messages to the indicated \fIfolder\fP.
+.TP 
+\fBexpunge\fP
+Expunge messages, meaning that these are removed irreversibly when the tool finishes filtering.
+.PP
+Note that values other than `keep' have no effect, unless the \fB-W\fP option is specified as well.
+.RE
+.TP
+\fB-e\fP
+Turns on execution mode. By default, the sieve-filter command runs in simulation mode in which it 
+changes nothing, meaning that no mailbox is altered in any way and no actions are performed. It only
+prints what would be done. Using this option the sieve-filter command becomes active and performs the 
+requested actions.
+.TP
+\fB-f\fP \fIenvelope-sender\fP
+The envelope sender or return path. This is what Sieve's envelope test will compare to when the 
+"from" envelope part is requested. Also, this is where response messages are sent to. 
+.TP
+\fB-m\fP \fIdefault-mailbox\fP
+The mailbox within the default namespace where the keep action stores the message. This is "INBOX"
+by default.
+.TP
+\fB-Q\fP \fImail-command\fP
+Send outgoing e-mail through the specified program. By default, the sieve-filter command ignores 
+Sieve actions such as redirect, reject, vacation and notify, but using this option outgoing messages
+can be fed to the \fBstdin\fP of an external shell command. This option has no effect in simulation
+mode, Unless you really know what you are doing, \fBDO NOT USE THIS TO FEED MAIL TO SENDMAIL!\f.
+.TP
+\fB-r\fP \fIrecipient-address\fP
+The envelope recipient address. This is what Sieve's envelope test will compare to when the "to"
+envelope part is requested. Some tests and actions will also use this as the owner's e-mail address.
+.TP
+\fB-S\fP \fIscript-file\fP
+Specify additional scripts to be executed before the main script. Multiple \fB-s\fP arguments are
+allowed and the specified scripts are executed sequentially in the order specified at the command
+line.
+.TP
+\fB-W\fP
+Enables write access to the source mailbox. This allows deleting the messages from the source mailbox
+and changing the assigned IMAP flags and keywords. 
+.TP
+\fB-x\fP "\fIextension extension ...\fP"
+Set the available extensions. The parameter is a space-separated list of the active extensions. By
+prepending the extension identifiers with \fB+\fP or \fB-\fP, extensions can be included or excluded
+relative to the default set of extensions. If no extensions have a \fB+\fP or \fB-\fP prefix, only 
+those extensions that are explicitly listed will be enabled. Unknown extensions are ignored and a 
+warning is produced. By default, all supported extensions are available, except for deprecated extensions 
+or those that are still under development.
+
+For example \fB-x\fP "+imapflags -enotify" will enable the deprecated imapflags extension along with all
+extensions that are available by default, except for the enotify extension.
+
+.SH EXAMPLES
+
+.TP
+[...]
+
+.SH AUTHOR
+.PP
+The Sieve implementation for Dovecot was written by Stephan Bosch <stephan at rename-it.nl>.
+.PP
+Dovecot was written by Timo Sirainen <tss at iki.fi>.
+
+.SH "SEE ALSO"
+.BR sievec (1),
+.BR sieved (1),
+.BR sieve-test (1)
+


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- dovecot.spec	10 Aug 2009 05:06:15 -0000	1.132
+++ dovecot.spec	10 Aug 2009 16:04:58 -0000	1.133
@@ -38,6 +38,9 @@ Patch1: dovecot-1.1-default-settings.pat
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
+#temporary for dovecot-sieve 0.1.11 only
+Patch4: dovecot-sieve-0.1.11.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -171,6 +174,7 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 
 %if %{build_sieve}
 %setup -q -D -T -a 8
+%patch4 -p0 -b .devnull
 %endif
 
 %if %{build_managesieve}
@@ -379,6 +383,7 @@ fi
 %{_bindir}/sieve-test
 %{_bindir}/sievec
 %{_bindir}/sieved
+%{_mandir}/man1/sieve-filter.1.gz
 %{_mandir}/man1/sieve-test.1.gz
 %{_mandir}/man1/sievec.1.gz
 %{_mandir}/man1/sieved.1.gz



From jortel at fedoraproject.org  Mon Aug 10 16:10:31 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:10:31 +0000 (UTC)
Subject: rpms/chameleon push.sh,NONE,1.1
Message-ID: <20090810161031.EE1EC11C0344@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12229

Added Files:
	push.sh 
Log Message:
add script for pushing to releases


--- NEW FILE push.sh ---
branches="F-10 F-11 EL-4 EL-5"
files="devel/chameleon.spec devel/sources"

echo "Update the branches"

for branch in $branches
do
  echo "update branch $branch"
  cp -v $files $branch
done

echo "Commit updates in branches"

cvs commit

echo "Tag branches"

for branch in $branches
do
  echo "tagging branch $branch"
  cd $branch
  make tag
  cd ../
done

echo "Build branches"

for branch in $branches
do
  echo "building branch $branch"
  cd $branch
  make build
  cd ../
done



From jortel at fedoraproject.org  Mon Aug 10 16:12:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:12:27 +0000 (UTC)
Subject: rpms/chameleon/EL-4 sources,1.1,1.2
Message-ID: <20090810161227.900ED11C0344@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12436/EL-4

Modified Files:
	sources 
Log Message:
Initial package release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chameleon/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:05:08 -0000	1.1
+++ sources	10 Aug 2009 16:12:27 -0000	1.2
@@ -0,0 +1 @@
+ac6b154af827504dd29b7572ffe51e76  chameleon-0.2.tar.gz



From jortel at fedoraproject.org  Mon Aug 10 16:12:28 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:12:28 +0000 (UTC)
Subject: rpms/chameleon/F-11 sources,1.1,1.2
Message-ID: <20090810161228.18CC311C0344@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12436/F-11

Modified Files:
	sources 
Log Message:
Initial package release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chameleon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:05:08 -0000	1.1
+++ sources	10 Aug 2009 16:12:27 -0000	1.2
@@ -0,0 +1 @@
+ac6b154af827504dd29b7572ffe51e76  chameleon-0.2.tar.gz



From jortel at fedoraproject.org  Mon Aug 10 16:12:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:12:27 +0000 (UTC)
Subject: rpms/chameleon/EL-5 sources,1.1,1.2
Message-ID: <20090810161227.B60C311C0424@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12436/EL-5

Modified Files:
	sources 
Log Message:
Initial package release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chameleon/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:05:08 -0000	1.1
+++ sources	10 Aug 2009 16:12:27 -0000	1.2
@@ -0,0 +1 @@
+ac6b154af827504dd29b7572ffe51e76  chameleon-0.2.tar.gz



From jortel at fedoraproject.org  Mon Aug 10 16:12:27 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:12:27 +0000 (UTC)
Subject: rpms/chameleon/F-10 sources,1.1,1.2
Message-ID: <20090810161227.DACE411C043B@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12436/F-10

Modified Files:
	sources 
Log Message:
Initial package release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chameleon/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Aug 2009 20:05:08 -0000	1.1
+++ sources	10 Aug 2009 16:12:27 -0000	1.2
@@ -0,0 +1 @@
+ac6b154af827504dd29b7572ffe51e76  chameleon-0.2.tar.gz



From hadess at fedoraproject.org  Mon Aug 10 16:14:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 10 Aug 2009 16:14:29 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.464,
	1.465 gnome-control-center-2.25.2-passwd.patch, 1.2,
	1.3 no-tweaks.patch, 1.1, 1.2 fix-appearance-capplet.patch, 1.2, NONE
Message-ID: <20090810161429.57D9511C0344@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094

Modified Files:
	control-center.spec gnome-control-center-2.25.2-passwd.patch 
	no-tweaks.patch 
Removed Files:
	fix-appearance-capplet.patch 
Log Message:
Update a few patches to apply correctly


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- control-center.spec	10 Aug 2009 15:34:41 -0000	1.464
+++ control-center.spec	10 Aug 2009 16:14:28 -0000	1.465
@@ -50,9 +50,6 @@ Patch33: notification-theme.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=536531
 Patch37: polkit1.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=588166
-Patch43: fix-appearance-capplet.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=588729
 Patch45: mnemonic.patch
 
@@ -181,7 +178,6 @@ utilities.
 %patch22 -p0 -b .slab-icon-names
 %patch30 -p1 -b .default-layout-toggle
 %patch33 -p1 -b .notification-theme
-%patch43 -p1 -b .fix-appearance-capplet
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 

gnome-control-center-2.25.2-passwd.patch:
 gnome-about-me.c |   44 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

Index: gnome-control-center-2.25.2-passwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-passwd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-control-center-2.25.2-passwd.patch	4 Dec 2008 18:54:50 -0000	1.2
+++ gnome-control-center-2.25.2-passwd.patch	10 Aug 2009 16:14:29 -0000	1.3
@@ -1,7 +1,8 @@
-diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.passwd gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.passwd	2008-12-01 08:32:12.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c	2008-12-04 12:54:24.000000000 -0500
-@@ -39,7 +39,6 @@
+diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
+index 8119c3c..b7fe5d8 100644
+--- a/capplets/about-me/gnome-about-me.c
++++ b/capplets/about-me/gnome-about-me.c
+@@ -40,7 +40,6 @@
  #endif
  
  #include "e-image-chooser.h"
@@ -9,20 +10,20 @@ diff -up gnome-control-center-2.25.2/cap
  #include "gnome-about-me-fingerprint.h"
  #include "marshal.h"
  
-@@ -883,10 +882,7 @@ about_me_button_clicked_cb (GtkDialog *d
+@@ -861,10 +860,7 @@ about_me_button_clicked_cb (GtkDialog *dialog, gint response_id, GnomeAboutMe *m
  static void
  about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
  {
--	GladeXML *dialog;
+-	GtkBuilder *dialog;
 -
 -	dialog = me->dialog;
 -	gnome_about_me_password (GTK_WINDOW (WID ("about-me-dialog")));
-+        g_spawn_command_line_async ("/usr/bin/userpasswd", NULL);
++	g_spawn_command_line_async ("/usr/bin/userpasswd", NULL);
  }
  
  static void
-@@ -906,10 +902,7 @@ about_me_setup_dialog (void)
- 	GladeXML     *dialog;
+@@ -884,10 +880,7 @@ about_me_setup_dialog (void)
+ 	GtkBuilder   *dialog;
  	GError 	     *error = NULL;
  	GList        *chain;
 -
@@ -33,7 +34,7 @@ diff -up gnome-control-center-2.25.2/cap
  
  	me = g_new0 (GnomeAboutMe, 1);
  
-@@ -978,34 +971,14 @@ about_me_setup_dialog (void)
+@@ -959,34 +952,14 @@ about_me_setup_dialog (void)
  		about_me_setup_email (me);
  	}
  
@@ -71,7 +72,7 @@ diff -up gnome-control-center-2.25.2/cap
  
  	gtk_label_set_markup (GTK_LABEL (widget), str);
  	g_free (str);
-@@ -1013,14 +986,9 @@ about_me_setup_dialog (void)
+@@ -994,14 +967,9 @@ about_me_setup_dialog (void)
  	widget = WID ("login");
  	gtk_label_set_text (GTK_LABEL (widget), me->login);
  

no-tweaks.patch:
 Makefile.am                   |    3 
 appearance/Makefile.am        |    2 
 appearance/appearance-main.c  |    1 
 appearance/data/appearance.ui |  359 ------------------------------------------
 4 files changed, 1 insertion(+), 364 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- no-tweaks.patch	30 Jul 2009 04:10:43 -0000	1.1
+++ no-tweaks.patch	10 Aug 2009 16:14:29 -0000	1.2
@@ -1,6 +1,34 @@
-diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.4/capplets/appearance/appearance-main.c
---- gnome-control-center-2.27.4/capplets/appearance/appearance-main.c.no-tweaks	2009-07-29 23:41:20.056750275 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/appearance-main.c	2009-07-29 23:41:38.919750322 -0400
+diff --git a/capplets/Makefile.am b/capplets/Makefile.am
+index d88c1d3..e30d861 100644
+--- a/capplets/Makefile.am
++++ b/capplets/Makefile.am
+@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
+ 	keybindings		\
+ 	keyboard		\
+ 	mouse			\
+-	network			\
+-	windows
++	network
+ 
+ SUBDIRS = $(always_built_SUBDIRS)
+ 
+diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
+index 226e4ec..b940d73 100644
+--- a/capplets/appearance/Makefile.am
++++ b/capplets/appearance/Makefile.am
+@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
+ 	appearance-themes.h \
+ 	appearance-style.c \
+ 	appearance-style.h \
+-	appearance-ui.c \
+-	appearance-ui.h \
+ 	gedit-message-area.c \
+ 	gedit-message-area.h \
+ 	gnome-wp-info.c \
+diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
+index 369af02..86e4957 100644
+--- a/capplets/appearance/appearance-main.c
++++ b/capplets/appearance/appearance-main.c
 @@ -172,7 +172,6 @@ main (int argc, char **argv)
    desktop_init (data, (const gchar **) wallpaper_files);
    g_strfreev (wallpaper_files);
@@ -9,10 +37,11 @@ diff -up gnome-control-center-2.27.4/cap
  
    /* prepare the main window */
    w = appearance_capplet_get_widget (data, "appearance_window");
-diff -up gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui
---- gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.no-tweaks	2009-07-29 23:50:02.189755937 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui	2009-07-29 23:51:04.979750545 -0400
-@@ -1494,361 +1494,6 @@
+diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
+index a68894e..0270d4b 100644
+--- a/capplets/appearance/data/appearance.ui
++++ b/capplets/appearance/data/appearance.ui
+@@ -1506,365 +1506,6 @@
                  <property name="tab_fill">False</property>
                </packing>
              </child>
@@ -29,8 +58,10 @@ diff -up gnome-control-center-2.27.4/cap
 -                      <object class="GtkLabel" id="label35">
 -                        <property name="visible">True</property>
 -                        <property name="xalign">0</property>
--                        <property name="label" translatable="yes">&lt;b&gt;Menus and Toolbars&lt;/b&gt;</property>
--                        <property name="use_markup">True</property>
+-                        <property name="label" translatable="yes">Menus and Toolbars</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
 -                      </object>
 -                      <packing>
 -                        <property name="expand">False</property>
@@ -157,8 +188,10 @@ diff -up gnome-control-center-2.27.4/cap
 -                      <object class="GtkLabel" id="label38">
 -                        <property name="visible">True</property>
 -                        <property name="xalign">0</property>
--                        <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
--                        <property name="use_markup">True</property>
+-                        <property name="label" translatable="yes">Preview</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
 -                      </object>
 -                      <packing>
 -                        <property name="expand">False</property>
@@ -374,28 +407,3 @@ diff -up gnome-control-center-2.27.4/cap
            </object>
            <packing>
              <property name="position">1</property>
-diff -up gnome-control-center-2.27.4/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.4/capplets/appearance/Makefile.am
---- gnome-control-center-2.27.4/capplets/appearance/Makefile.am.no-tweaks	2009-07-29 23:40:35.174501065 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/Makefile.am	2009-07-29 23:40:51.076500481 -0400
-@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
- 	appearance-themes.h \
- 	appearance-style.c \
- 	appearance-style.h \
--	appearance-ui.c \
--	appearance-ui.h \
- 	gedit-message-area.c \
- 	gedit-message-area.h \
- 	gnome-wp-info.c \
-diff -up gnome-control-center-2.27.4/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.4/capplets/Makefile.am
---- gnome-control-center-2.27.4/capplets/Makefile.am.no-tweaks	2009-07-29 23:39:52.413505115 -0400
-+++ gnome-control-center-2.27.4/capplets/Makefile.am	2009-07-29 23:40:01.297501055 -0400
-@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
- 	keybindings		\
- 	keyboard		\
- 	mouse			\
--	network			\
--	windows
-+	network
- 
- SUBDIRS = $(always_built_SUBDIRS)
- 


--- fix-appearance-capplet.patch DELETED ---



From scop at fedoraproject.org  Mon Aug 10 16:16:02 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 16:16:02 +0000 (UTC)
Subject: rpms/eggdrop/devel .cvsignore, 1.5, 1.6 eggdrop.spec, 1.24,
	1.25 sources, 1.5, 1.6
Message-ID: <20090810161602.F08E011C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/eggdrop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13496

Modified Files:
	.cvsignore eggdrop.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.19-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eggdrop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Apr 2008 18:16:57 -0000	1.5
+++ .cvsignore	10 Aug 2009 16:16:02 -0000	1.6
@@ -1 +1 @@
-eggdrop1.6.19.tar.gz
+eggdrop1.6.19.tar.bz2


Index: eggdrop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eggdrop/devel/eggdrop.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- eggdrop.spec	24 Jul 2009 21:55:40 -0000	1.24
+++ eggdrop.spec	10 Aug 2009 16:16:02 -0000	1.25
@@ -1,11 +1,11 @@
 Summary:	The world's most popular Open Source IRC bot
 Name:		eggdrop
 Version:	1.6.19
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://www.eggheads.org/
-Source:		ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.gz
+Source:		ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
 Patch0:		eggdrop-1.6.19-conf.patch
 Patch1:		eggdrop-1.6.17-langdir.patch
 Patch2:		eggdrop-1.6.19-no_libdns.patch
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.19-6
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.19-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eggdrop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Apr 2008 18:16:57 -0000	1.5
+++ sources	10 Aug 2009 16:16:02 -0000	1.6
@@ -1 +1 @@
-4d89a901e95f0f9937f4ffac783d55d8  eggdrop1.6.19.tar.gz
+b706bbe4fdd05964e0ea0cd920f28539  eggdrop1.6.19.tar.bz2



From veillard at fedoraproject.org  Mon Aug 10 16:16:23 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 16:16:23 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel libxml2-2.7.3-ficora-parse.patch, NONE, 
	1.1 mingw32-libxml2.spec, 1.6, 1.7
Message-ID: <20090810161623.6BBB611C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13514

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-libxml2.spec	25 Jul 2009 14:26:09 -0000	1.6
+++ mingw32-libxml2.spec	10 Aug 2009 16:16:23 -0000	1.7
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
+Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
@@ -54,6 +55,8 @@ Static version of the MinGW Windows XML 
 %prep
 %setup -q -n libxml2-%{version}
 
+%patch1 -p1
+
 %patch1000 -p1
 %patch1001 -p0
 
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libxml2.a
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-3
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From veillard at fedoraproject.org  Mon Aug 10 16:17:22 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 16:17:22 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel mingw32-libxml2.spec,1.7,1.8
Message-ID: <20090810161722.42EBD11C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13862

Modified Files:
	mingw32-libxml2.spec 
Log Message:
Forgot to bump the release... Daniel



Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-libxml2.spec	10 Aug 2009 16:16:23 -0000	1.7
+++ mingw32-libxml2.spec	10 Aug 2009 16:17:22 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT



From jortel at fedoraproject.org  Mon Aug 10 16:18:19 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:18:19 +0000 (UTC)
Subject: rpms/chameleon/EL-4 chameleon.spec,NONE,1.1
Message-ID: <20090810161819.1A62811C0344@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14109/EL-4

Added Files:
	chameleon.spec 
Log Message:
update branches


--- NEW FILE chameleon.spec ---
Summary: Common schema transformation tool
Name: chameleon
Version: 0.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/c/h/%{name}/%{name}-%{version}.tar.gz
License: LGPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: python >= 2.3
Requires: python >= 2.3 python-ply
Url: https://fedorahosted.org/chameleon

%description
Chameleon is a common to database specific schema transformation tool.

%define chameleon_home %{_datadir}/chameleon

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{chameleon_home}
cp -p chameleon/*.py $RPM_BUILD_ROOT/%{chameleon_home}
install -m 0755 chameleon.bin $RPM_BUILD_ROOT/%{_bindir}/chameleon

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{chameleon_home}
%{chameleon_home}/*
%{_bindir}/chameleon

%doc LICENSE

%changelog
* Tue Jul 21 2009 jortel <jortel at redhat.com> - 0.2-1
- Fix number precision.
* Mon Jul 13 2009 jortel <jortel at redhat.com> - 0.1-7
- Replace hard coded "/usr/share" with %%{_datadir} and use cp -p to preserve permissions.
- Add BuildRequires python.
* Wed May 20 2009 jortel <jortel at redhat.com> - 0.1-6
- Rename to meet packaging guidelines.
* Tue May 5 2009 jortel <jortel at redhat.com> - 0.1-5
- Reduce output and refactor main.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-4
- Fix noparallel and logging.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-3
- Add include handling.
* Wed Apr 29 2009 jortel <jortel at redhat.com> - 0.1-2
- Fix optimizer bug.
* Tue Apr 28 2009 jortel <jortel at redhat.com> - 0.1-1
- 0.1



From jortel at fedoraproject.org  Mon Aug 10 16:18:19 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:18:19 +0000 (UTC)
Subject: rpms/chameleon/F-11 chameleon.spec,NONE,1.1
Message-ID: <20090810161819.A06BF11C0424@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14109/F-11

Added Files:
	chameleon.spec 
Log Message:
update branches


--- NEW FILE chameleon.spec ---
Summary: Common schema transformation tool
Name: chameleon
Version: 0.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/c/h/%{name}/%{name}-%{version}.tar.gz
License: LGPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: python >= 2.3
Requires: python >= 2.3 python-ply
Url: https://fedorahosted.org/chameleon

%description
Chameleon is a common to database specific schema transformation tool.

%define chameleon_home %{_datadir}/chameleon

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{chameleon_home}
cp -p chameleon/*.py $RPM_BUILD_ROOT/%{chameleon_home}
install -m 0755 chameleon.bin $RPM_BUILD_ROOT/%{_bindir}/chameleon

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{chameleon_home}
%{chameleon_home}/*
%{_bindir}/chameleon

%doc LICENSE

%changelog
* Tue Jul 21 2009 jortel <jortel at redhat.com> - 0.2-1
- Fix number precision.
* Mon Jul 13 2009 jortel <jortel at redhat.com> - 0.1-7
- Replace hard coded "/usr/share" with %%{_datadir} and use cp -p to preserve permissions.
- Add BuildRequires python.
* Wed May 20 2009 jortel <jortel at redhat.com> - 0.1-6
- Rename to meet packaging guidelines.
* Tue May 5 2009 jortel <jortel at redhat.com> - 0.1-5
- Reduce output and refactor main.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-4
- Fix noparallel and logging.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-3
- Add include handling.
* Wed Apr 29 2009 jortel <jortel at redhat.com> - 0.1-2
- Fix optimizer bug.
* Tue Apr 28 2009 jortel <jortel at redhat.com> - 0.1-1
- 0.1



From jortel at fedoraproject.org  Mon Aug 10 16:18:19 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:18:19 +0000 (UTC)
Subject: rpms/chameleon/F-10 chameleon.spec,NONE,1.1
Message-ID: <20090810161819.75D8311C0424@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14109/F-10

Added Files:
	chameleon.spec 
Log Message:
update branches


--- NEW FILE chameleon.spec ---
Summary: Common schema transformation tool
Name: chameleon
Version: 0.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/c/h/%{name}/%{name}-%{version}.tar.gz
License: LGPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: python >= 2.3
Requires: python >= 2.3 python-ply
Url: https://fedorahosted.org/chameleon

%description
Chameleon is a common to database specific schema transformation tool.

%define chameleon_home %{_datadir}/chameleon

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{chameleon_home}
cp -p chameleon/*.py $RPM_BUILD_ROOT/%{chameleon_home}
install -m 0755 chameleon.bin $RPM_BUILD_ROOT/%{_bindir}/chameleon

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{chameleon_home}
%{chameleon_home}/*
%{_bindir}/chameleon

%doc LICENSE

%changelog
* Tue Jul 21 2009 jortel <jortel at redhat.com> - 0.2-1
- Fix number precision.
* Mon Jul 13 2009 jortel <jortel at redhat.com> - 0.1-7
- Replace hard coded "/usr/share" with %%{_datadir} and use cp -p to preserve permissions.
- Add BuildRequires python.
* Wed May 20 2009 jortel <jortel at redhat.com> - 0.1-6
- Rename to meet packaging guidelines.
* Tue May 5 2009 jortel <jortel at redhat.com> - 0.1-5
- Reduce output and refactor main.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-4
- Fix noparallel and logging.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-3
- Add include handling.
* Wed Apr 29 2009 jortel <jortel at redhat.com> - 0.1-2
- Fix optimizer bug.
* Tue Apr 28 2009 jortel <jortel at redhat.com> - 0.1-1
- 0.1



From jortel at fedoraproject.org  Mon Aug 10 16:18:19 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 10 Aug 2009 16:18:19 +0000 (UTC)
Subject: rpms/chameleon/EL-5 chameleon.spec,NONE,1.1
Message-ID: <20090810161819.472F711C0344@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/chameleon/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14109/EL-5

Added Files:
	chameleon.spec 
Log Message:
update branches


--- NEW FILE chameleon.spec ---
Summary: Common schema transformation tool
Name: chameleon
Version: 0.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/c/h/%{name}/%{name}-%{version}.tar.gz
License: LGPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: python >= 2.3
Requires: python >= 2.3 python-ply
Url: https://fedorahosted.org/chameleon

%description
Chameleon is a common to database specific schema transformation tool.

%define chameleon_home %{_datadir}/chameleon

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{chameleon_home}
cp -p chameleon/*.py $RPM_BUILD_ROOT/%{chameleon_home}
install -m 0755 chameleon.bin $RPM_BUILD_ROOT/%{_bindir}/chameleon

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{chameleon_home}
%{chameleon_home}/*
%{_bindir}/chameleon

%doc LICENSE

%changelog
* Tue Jul 21 2009 jortel <jortel at redhat.com> - 0.2-1
- Fix number precision.
* Mon Jul 13 2009 jortel <jortel at redhat.com> - 0.1-7
- Replace hard coded "/usr/share" with %%{_datadir} and use cp -p to preserve permissions.
- Add BuildRequires python.
* Wed May 20 2009 jortel <jortel at redhat.com> - 0.1-6
- Rename to meet packaging guidelines.
* Tue May 5 2009 jortel <jortel at redhat.com> - 0.1-5
- Reduce output and refactor main.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-4
- Fix noparallel and logging.
* Mon May 4 2009 jortel <jortel at redhat.com> - 0.1-3
- Add include handling.
* Wed Apr 29 2009 jortel <jortel at redhat.com> - 0.1-2
- Fix optimizer bug.
* Tue Apr 28 2009 jortel <jortel at redhat.com> - 0.1-1
- 0.1



From maxamillion at fedoraproject.org  Mon Aug 10 16:28:17 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 10 Aug 2009 16:28:17 +0000 (UTC)
Subject: rpms/dc3dd/devel dc3dd.spec,1.3,1.4
Message-ID: <20090810162817.0E1BF11C0344@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/dc3dd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15987

Modified Files:
	dc3dd.spec 
Log Message:
Fixed Source0 as reported: https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html




Index: dc3dd.spec
===================================================================
RCS file: /cvs/extras/rpms/dc3dd/devel/dc3dd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dc3dd.spec	24 Jul 2009 20:04:26 -0000	1.3
+++ dc3dd.spec	10 Aug 2009 16:28:16 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           dc3dd
 Version:        6.12.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Patched version of GNU dd for use in computer forensics
 
 Group:          Applications/Editors
 License:        GPLv2+ and GPLv3+
 URL:            http://dc3dd.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 BuildRequires:  gettext
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Mon Aug 10 2009 Adam Miller <maxamillion [AT] gmail.com> - 6.12.3-3
+- Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.12.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Mon Aug 10 16:31:22 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 10 Aug 2009 16:31:22 +0000 (UTC)
Subject: rpms/mash/devel mash.spec,1.56,1.57
Message-ID: <20090810163122.96E8511C0344@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17351

Modified Files:
	mash.spec 
Log Message:
fix url


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- mash.spec	24 Jul 2009 14:09:37 -0000	1.56
+++ mash.spec	10 Aug 2009 16:31:22 -0000	1.57
@@ -6,8 +6,8 @@ Release:        2%{?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-nodelta.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji



From veillard at fedoraproject.org  Mon Aug 10 16:32:40 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 16:32:40 +0000 (UTC)
Subject: rpms/mingw32-libxml2/F-10 libxml2-2.7.3-ficora-parse.patch, NONE,
	1.1 mingw32-libxml2.spec, 1.1, 1.2
Message-ID: <20090810163240.3637611C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/mingw32-libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-10/mingw32-libxml2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-libxml2.spec	28 Jan 2009 11:50:26 -0000	1.1
+++ mingw32-libxml2.spec	10 Aug 2009 16:32:40 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
+Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
@@ -44,6 +45,8 @@ MinGW Windows libxml2 XML processing lib
 %prep
 %setup -q -n libxml2-%{version}
 
+%patch1 -p1
+
 %patch1000 -p1
 
 # Patched configure.in, so rebuild configure.
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.2-7
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-6
 - Rerun autoreconf after patching configure.in (Erik van Pienbroek).
 - Rebuild libtool for Rawhide / libtool 2.



From veillard at fedoraproject.org  Mon Aug 10 16:32:42 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 16:32:42 +0000 (UTC)
Subject: rpms/mingw32-libxml2/F-11 libxml2-2.7.3-ficora-parse.patch, NONE,
	1.1 mingw32-libxml2.spec, 1.5, 1.6
Message-ID: <20090810163242.8ACE211C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/mingw32-libxml2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17625

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/mingw32-libxml2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-libxml2.spec	4 May 2009 14:52:52 -0000	1.5
+++ mingw32-libxml2.spec	10 Aug 2009 16:32:42 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
+Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
@@ -54,6 +55,8 @@ Static version of the MinGW Windows XML 
 %prep
 %setup -q -n libxml2-%{version}
 
+%patch1 -p1
+
 %patch1000 -p1
 %patch1001 -p0
 
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libxml2.a
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-2
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Mon May  4 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.3-1
 - Update to 2.7.3
 



From mschwendt at fedoraproject.org  Mon Aug 10 16:34:25 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 10 Aug 2009 16:34:25 +0000 (UTC)
Subject: rpms/geeqie/devel geeqie.spec,1.23,1.24
Message-ID: <20090810163425.C655C11C0344@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18282

Modified Files:
	geeqie.spec 
Log Message:
use downloads.sf.net instead of dl.sf.net (timeouts)


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- geeqie.spec	24 Jul 2009 23:49:18 -0000	1.23
+++ geeqie.spec	10 Aug 2009 16:34:25 -0000	1.24
@@ -8,7 +8,7 @@ License: GPLv3
 Group: User Interface/X
 # svn + autogen
 #Source: geeqie-1.0alpha2-svn-1341.tgz
-Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
+Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel



From maxamillion at fedoraproject.org  Mon Aug 10 16:36:30 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 10 Aug 2009 16:36:30 +0000 (UTC)
Subject: rpms/shed/devel shed.spec,1.7,1.8
Message-ID: <20090810163630.F193511C0344@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/shed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18479

Modified Files:
	shed.spec 
Log Message:
Fixed source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html




Index: shed.spec
===================================================================
RCS file: /cvs/extras/rpms/shed/devel/shed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- shed.spec	27 Jul 2009 04:16:29 -0000	1.7
+++ shed.spec	10 Aug 2009 16:36:30 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           shed
 Version:        1.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Easy to use hex editor
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://shed.sourceforge.net/
-Source0:        http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/shed/%{name}-%{version}.tar.gz
 Patch0:         shed-1.15-makefile_in.patch
 Patch1:         shed-1.15-configure_cflags.patch
 
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-5
+- Fixed Source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Aug 10 16:45:22 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 10 Aug 2009 16:45:22 +0000 (UTC)
Subject: rpms/python-tpg/devel python-tpg.spec,1.15,1.16
Message-ID: <20090810164522.B559011C0344@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20596

Modified Files:
	python-tpg.spec 
Log Message:
Fixed source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html




Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-tpg.spec	26 Jul 2009 23:15:52 -0000	1.15
+++ python-tpg.spec	10 Aug 2009 16:45:22 -0000	1.16
@@ -10,7 +10,7 @@ Summary:        A Python "toy parser gen
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://christophe.delord.free.fr/tpg/index.html
-Source0:        http://christophe.delord.free.fr/soft/tpg/%{srcname}-%{version}.tar.gz
+Source0:        http://christophe.delord.free.fr/tpg/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/TPG-%{version}-py*.egg-info
 
 %changelog
+* Mon Aug 10 2009 Adam Miller <maxamillion [AT] gmail.com>
+- Fixed source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Mon Aug 10 16:46:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 10 Aug 2009 16:46:16 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.3.1-comborender.patch, 
	NONE, 1.1 kdebase-runtime-4.3.1-kcmlocalecrash.patch, NONE,
	1.1 kdebase-runtime.spec, 1.92, 1.93
Message-ID: <20090810164616.DD17C11C0344@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-serv20805/F-10

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
backport 2 kdebase-runtime bugfixes from the 4.3 branch


kdebase-runtime-4.3.1-comborender.patch:
 oxygen.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdebase-runtime-4.3.1-comborender.patch ---
Index: kstyles/oxygen/oxygen.cpp
===================================================================
--- kstyles/oxygen/oxygen.cpp	(revision 1008049)
+++ kstyles/oxygen/oxygen.cpp	(revision 1008050)
@@ -322,6 +322,7 @@
                 p->setClipRegion(rbOpt->rect);
                 p->drawRect(rbOpt->rect.adjusted(0,0,-1,-1));
                 p->restore();
+                return;
             }
             break;
         }
@@ -354,6 +355,7 @@
                                  cb->palette, cb->state & State_Enabled, cb->currentText);
                 }
                 p->restore();
+                return;
             }
             break;
         }

kdebase-runtime-4.3.1-kcmlocalecrash.patch:
 kcmlocale.cpp |   24 +++++++++++++++++-------
 kcmlocale.h   |    1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-kcmlocalecrash.patch ---
Index: kcontrol/locale/kcmlocale.h
===================================================================
--- kcontrol/locale/kcmlocale.h	(revision 1008860)
+++ kcontrol/locale/kcmlocale.h	(revision 1008861)
@@ -66,6 +66,7 @@
 private:
   enum Direction {Up,Down};
   void languageMove(Direction direcition);
+  int selectedRow() const;
 
 
   // NOTE: we need to mantain our own language list instead of using KLocale's
Index: kcontrol/locale/kcmlocale.cpp
===================================================================
--- kcontrol/locale/kcmlocale.cpp	(revision 1008860)
+++ kcontrol/locale/kcmlocale.cpp	(revision 1008861)
@@ -101,9 +101,19 @@
     m_languageList = configGroup.readEntry("Language").split(':',QString::SkipEmptyParts);
 }
 
+int KLocaleConfig::selectedRow() const
+{
+    QList<QListWidgetItem *>selectedItems = m_languages->selectedItems();
+
+    if ( selectedItems.isEmpty() ) {
+        return -1;
+    }
+    return m_languages->row( selectedItems.at(0) );
+}
+
 void KLocaleConfig::slotAddLanguage(const QString & code)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
   if ( pos < 0 )
     pos = 0;
 
@@ -126,7 +136,7 @@
 
 void KLocaleConfig::slotRemoveLanguage()
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   if (pos != -1)
   {
@@ -142,7 +152,7 @@
 
 void KLocaleConfig::languageMove(Direction direcition)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   QStringList::Iterator it1 = m_languageList.begin() + pos - 1*(direcition==Up);
   QStringList::Iterator it2 = m_languageList.begin() + pos + 1*(direcition==Down);
@@ -194,10 +204,10 @@
 
 void KLocaleConfig::slotCheckButtons()
 {
-  languageRemove->setEnabled( m_languages->currentRow() != -1 && m_languages->count() > 1 );
-  m_upButton->setEnabled( m_languages->currentRow() > 0 );
-  m_downButton->setEnabled( m_languages->currentRow() != -1 &&
-                            m_languages->currentRow() < (signed)(m_languages->count() - 1) );
+  languageRemove->setEnabled( selectedRow() != -1 && m_languages->count() > 1 );
+  m_upButton->setEnabled( selectedRow() > 0 );
+  m_downButton->setEnabled( selectedRow() != -1 &&
+                            selectedRow() < (signed)(m_languages->count() - 1) );
 }
 
 void KLocaleConfig::slotLocaleChanged()


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kdebase-runtime.spec	5 Aug 2009 00:18:17 -0000	1.92
+++ kdebase-runtime.spec	10 Aug 2009 16:46:16 -0000	1.93
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,6 +23,10 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
+# http://websvn.kde.org/?view=rev&revision=1008050
+Patch5:        kdebase-runtime-4.3.1-comborender.patch
+#?http://websvn.kde.org/?view=rev&revision=1008861
+Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -96,6 +100,8 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p0 -b .comborender
+%patch6 -p0 -b .kcmlocalecrash
 
 %build
 mkdir -p %{_target_platform}
@@ -215,6 +221,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
+- fix Locale control module crashing when dragging languages around (kdebug:201578)
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - respin
 



From ltinkl at fedoraproject.org  Mon Aug 10 16:46:17 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 10 Aug 2009 16:46:17 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime-4.3.1-comborender.patch, 
	NONE, 1.1 kdebase-runtime-4.3.1-kcmlocalecrash.patch, NONE,
	1.1 kdebase-runtime.spec, 1.115, 1.116
Message-ID: <20090810164617.24FBA11C0344@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-serv20805/F-11

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
backport 2 kdebase-runtime bugfixes from the 4.3 branch


kdebase-runtime-4.3.1-comborender.patch:
 oxygen.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdebase-runtime-4.3.1-comborender.patch ---
Index: kstyles/oxygen/oxygen.cpp
===================================================================
--- kstyles/oxygen/oxygen.cpp	(revision 1008049)
+++ kstyles/oxygen/oxygen.cpp	(revision 1008050)
@@ -322,6 +322,7 @@
                 p->setClipRegion(rbOpt->rect);
                 p->drawRect(rbOpt->rect.adjusted(0,0,-1,-1));
                 p->restore();
+                return;
             }
             break;
         }
@@ -354,6 +355,7 @@
                                  cb->palette, cb->state & State_Enabled, cb->currentText);
                 }
                 p->restore();
+                return;
             }
             break;
         }

kdebase-runtime-4.3.1-kcmlocalecrash.patch:
 kcmlocale.cpp |   24 +++++++++++++++++-------
 kcmlocale.h   |    1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-kcmlocalecrash.patch ---
Index: kcontrol/locale/kcmlocale.h
===================================================================
--- kcontrol/locale/kcmlocale.h	(revision 1008860)
+++ kcontrol/locale/kcmlocale.h	(revision 1008861)
@@ -66,6 +66,7 @@
 private:
   enum Direction {Up,Down};
   void languageMove(Direction direcition);
+  int selectedRow() const;
 
 
   // NOTE: we need to mantain our own language list instead of using KLocale's
Index: kcontrol/locale/kcmlocale.cpp
===================================================================
--- kcontrol/locale/kcmlocale.cpp	(revision 1008860)
+++ kcontrol/locale/kcmlocale.cpp	(revision 1008861)
@@ -101,9 +101,19 @@
     m_languageList = configGroup.readEntry("Language").split(':',QString::SkipEmptyParts);
 }
 
+int KLocaleConfig::selectedRow() const
+{
+    QList<QListWidgetItem *>selectedItems = m_languages->selectedItems();
+
+    if ( selectedItems.isEmpty() ) {
+        return -1;
+    }
+    return m_languages->row( selectedItems.at(0) );
+}
+
 void KLocaleConfig::slotAddLanguage(const QString & code)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
   if ( pos < 0 )
     pos = 0;
 
@@ -126,7 +136,7 @@
 
 void KLocaleConfig::slotRemoveLanguage()
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   if (pos != -1)
   {
@@ -142,7 +152,7 @@
 
 void KLocaleConfig::languageMove(Direction direcition)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   QStringList::Iterator it1 = m_languageList.begin() + pos - 1*(direcition==Up);
   QStringList::Iterator it2 = m_languageList.begin() + pos + 1*(direcition==Down);
@@ -194,10 +204,10 @@
 
 void KLocaleConfig::slotCheckButtons()
 {
-  languageRemove->setEnabled( m_languages->currentRow() != -1 && m_languages->count() > 1 );
-  m_upButton->setEnabled( m_languages->currentRow() > 0 );
-  m_downButton->setEnabled( m_languages->currentRow() != -1 &&
-                            m_languages->currentRow() < (signed)(m_languages->count() - 1) );
+  languageRemove->setEnabled( selectedRow() != -1 && m_languages->count() > 1 );
+  m_upButton->setEnabled( selectedRow() > 0 );
+  m_downButton->setEnabled( selectedRow() != -1 &&
+                            selectedRow() < (signed)(m_languages->count() - 1) );
 }
 
 void KLocaleConfig::slotLocaleChanged()


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- kdebase-runtime.spec	5 Aug 2009 00:17:29 -0000	1.115
+++ kdebase-runtime.spec	10 Aug 2009 16:46:17 -0000	1.116
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,6 +23,10 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
+# http://websvn.kde.org/?view=rev&revision=1008050
+Patch5:        kdebase-runtime-4.3.1-comborender.patch
+#?http://websvn.kde.org/?view=rev&revision=1008861
+Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -96,6 +100,8 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p0 -b .comborender
+%patch6 -p0 -b .kcmlocalecrash
 
 %build
 mkdir -p %{_target_platform}
@@ -215,6 +221,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
+- fix Locale control module crashing when dragging languages around (kdebug:201578)
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - respin
 



From ltinkl at fedoraproject.org  Mon Aug 10 16:46:17 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 10 Aug 2009 16:46:17 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.3.1-comborender.patch, 
	NONE, 1.1 kdebase-runtime-4.3.1-kcmlocalecrash.patch, NONE,
	1.1 kdebase-runtime.spec, 1.133, 1.134
Message-ID: <20090810164617.6829411C0344@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20805/devel

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
backport 2 kdebase-runtime bugfixes from the 4.3 branch


kdebase-runtime-4.3.1-comborender.patch:
 oxygen.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdebase-runtime-4.3.1-comborender.patch ---
Index: kstyles/oxygen/oxygen.cpp
===================================================================
--- kstyles/oxygen/oxygen.cpp	(revision 1008049)
+++ kstyles/oxygen/oxygen.cpp	(revision 1008050)
@@ -322,6 +322,7 @@
                 p->setClipRegion(rbOpt->rect);
                 p->drawRect(rbOpt->rect.adjusted(0,0,-1,-1));
                 p->restore();
+                return;
             }
             break;
         }
@@ -354,6 +355,7 @@
                                  cb->palette, cb->state & State_Enabled, cb->currentText);
                 }
                 p->restore();
+                return;
             }
             break;
         }

kdebase-runtime-4.3.1-kcmlocalecrash.patch:
 kcmlocale.cpp |   24 +++++++++++++++++-------
 kcmlocale.h   |    1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-kcmlocalecrash.patch ---
Index: kcontrol/locale/kcmlocale.h
===================================================================
--- kcontrol/locale/kcmlocale.h	(revision 1008860)
+++ kcontrol/locale/kcmlocale.h	(revision 1008861)
@@ -66,6 +66,7 @@
 private:
   enum Direction {Up,Down};
   void languageMove(Direction direcition);
+  int selectedRow() const;
 
 
   // NOTE: we need to mantain our own language list instead of using KLocale's
Index: kcontrol/locale/kcmlocale.cpp
===================================================================
--- kcontrol/locale/kcmlocale.cpp	(revision 1008860)
+++ kcontrol/locale/kcmlocale.cpp	(revision 1008861)
@@ -101,9 +101,19 @@
     m_languageList = configGroup.readEntry("Language").split(':',QString::SkipEmptyParts);
 }
 
+int KLocaleConfig::selectedRow() const
+{
+    QList<QListWidgetItem *>selectedItems = m_languages->selectedItems();
+
+    if ( selectedItems.isEmpty() ) {
+        return -1;
+    }
+    return m_languages->row( selectedItems.at(0) );
+}
+
 void KLocaleConfig::slotAddLanguage(const QString & code)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
   if ( pos < 0 )
     pos = 0;
 
@@ -126,7 +136,7 @@
 
 void KLocaleConfig::slotRemoveLanguage()
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   if (pos != -1)
   {
@@ -142,7 +152,7 @@
 
 void KLocaleConfig::languageMove(Direction direcition)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   QStringList::Iterator it1 = m_languageList.begin() + pos - 1*(direcition==Up);
   QStringList::Iterator it2 = m_languageList.begin() + pos + 1*(direcition==Down);
@@ -194,10 +204,10 @@
 
 void KLocaleConfig::slotCheckButtons()
 {
-  languageRemove->setEnabled( m_languages->currentRow() != -1 && m_languages->count() > 1 );
-  m_upButton->setEnabled( m_languages->currentRow() > 0 );
-  m_downButton->setEnabled( m_languages->currentRow() != -1 &&
-                            m_languages->currentRow() < (signed)(m_languages->count() - 1) );
+  languageRemove->setEnabled( selectedRow() != -1 && m_languages->count() > 1 );
+  m_upButton->setEnabled( selectedRow() > 0 );
+  m_downButton->setEnabled( selectedRow() != -1 &&
+                            selectedRow() < (signed)(m_languages->count() - 1) );
 }
 
 void KLocaleConfig::slotLocaleChanged()


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kdebase-runtime.spec	4 Aug 2009 10:00:10 -0000	1.133
+++ kdebase-runtime.spec	10 Aug 2009 16:46:17 -0000	1.134
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,6 +23,10 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
+# http://websvn.kde.org/?view=rev&revision=1008050
+Patch5:        kdebase-runtime-4.3.1-comborender.patch
+#?http://websvn.kde.org/?view=rev&revision=1008861
+Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -96,6 +100,8 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p0 -b .comborender
+%patch6 -p0 -b .kcmlocalecrash
 
 %build
 mkdir -p %{_target_platform}
@@ -215,6 +221,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
+- fix Locale control module crashing when dragging languages around (kdebug:201578)
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - respin
 



From iarnell at fedoraproject.org  Mon Aug 10 16:50:00 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 10 Aug 2009 16:50:00 +0000 (UTC)
Subject: rpms/perl-Lexical-Persistence/devel .cvsignore, 1.2,
	1.3 perl-Lexical-Persistence.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090810165000.19EB011C0344@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Lexical-Persistence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21928

Modified Files:
	.cvsignore perl-Lexical-Persistence.spec sources 
Log Message:
* Mon Aug 10 2009 Iain Arnell <iarnell at gmail.com> 1.01-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Apr 2009 19:29:41 -0000	1.2
+++ .cvsignore	10 Aug 2009 16:49:59 -0000	1.3
@@ -1 +1 @@
-Lexical-Persistence-0.98.tar.gz
+Lexical-Persistence-1.01.tar.gz


Index: perl-Lexical-Persistence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/devel/perl-Lexical-Persistence.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Lexical-Persistence.spec	26 Jul 2009 08:56:42 -0000	1.2
+++ perl-Lexical-Persistence.spec	10 Aug 2009 16:49:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Lexical-Persistence
-Version:        0.98
-Release:        2%{?dist}
+Version:        1.01
+Release:        1%{?dist}
 Summary:        Persistent lexical variable values for arbitrary calls
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 10 2009 Iain Arnell <iarnell at gmail.com> 1.01-1
+- update to latest upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Lexical-Persistence/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Apr 2009 19:29:41 -0000	1.2
+++ sources	10 Aug 2009 16:49:59 -0000	1.3
@@ -1 +1 @@
-d01cb510432a1ccba61d4b02520f99e4  Lexical-Persistence-0.98.tar.gz
+7ee0629d4454c2c48716bdbd1c5761d6  Lexical-Persistence-1.01.tar.gz



From maxamillion at fedoraproject.org  Mon Aug 10 16:52:04 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 10 Aug 2009 16:52:04 +0000 (UTC)
Subject: rpms/oggvideotools/devel oggvideotools.spec,1.9,1.10
Message-ID: <20090810165204.4271D11C0344@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/oggvideotools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21833

Modified Files:
	oggvideotools.spec 
Log Message:
Fixed source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html




Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/oggvideotools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- oggvideotools.spec	25 Jul 2009 20:37:20 -0000	1.9
+++ oggvideotools.spec	10 Aug 2009 16:52:04 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           oggvideotools
 Version:        0.7b
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Toolbox for manipulating Ogg video files
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://dev.streamnik.de/oggvideotools.html
-Source0:        http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/project/oggvideotools/oggvideotools/oggvideotools-0.7b/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel SDL-devel
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Mon Aug 10 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.7b-3
+- Fixed source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxamillion at fedoraproject.org  Mon Aug 10 16:53:32 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Mon, 10 Aug 2009 16:53:32 +0000 (UTC)
Subject: rpms/python-tpg/devel python-tpg.spec,1.16,1.17
Message-ID: <20090810165332.653AD11C0344@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22731

Modified Files:
	python-tpg.spec 
Log Message:
Fixed release number




Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-tpg.spec	10 Aug 2009 16:45:22 -0000	1.16
+++ python-tpg.spec	10 Aug 2009 16:53:32 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:           python-tpg
 Version:        3.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/TPG-%{version}-py*.egg-info
 
 %changelog
-* Mon Aug 10 2009 Adam Miller <maxamillion [AT] gmail.com>
+* Mon Aug 10 2009 Adam Miller <maxamillion [AT] gmail.com> - 3.1.2-6
 - Fixed source0 as per https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-5



From veillard at fedoraproject.org  Mon Aug 10 16:53:41 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 10 Aug 2009 16:53:41 +0000 (UTC)
Subject: rpms/mingw32-libxml2/EL-5 libxml2-2.7.3-ficora-parse.patch, NONE,
	1.1 mingw32-libxml2.spec, 1.1, 1.2
Message-ID: <20090810165341.66CB211C0344@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/mingw32-libxml2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22450

Modified Files:
	mingw32-libxml2.spec 
Added Files:
	libxml2-2.7.3-ficora-parse.patch 
Log Message:
- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
Daniel


libxml2-2.7.3-ficora-parse.patch:
 parser.c |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 12 deletions(-)

--- NEW FILE libxml2-2.7.3-ficora-parse.patch ---
diff --git a/parser.c b/parser.c
index a476060..b404722 100644
--- a/parser.c
+++ b/parser.c
@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	if (name == NULL) {
 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 			   "Name expected in NOTATION declaration\n");
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	tmp = ret;
 	while (tmp != NULL) {
@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
 	}
 	if (tmp == NULL) {
 	    cur = xmlCreateEnumeration(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
     } while (RAW == '|');
     if (RAW != ')') {
 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+	return(NULL);
     }
     NEXT;
     return(ret);
@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
 	    cur = xmlCreateEnumeration(name);
 	    if (!xmlDictOwns(ctxt->dict, name))
 		xmlFree(name);
-	    if (cur == NULL) return(ret);
+	    if (cur == NULL) {
+                xmlFreeEnumeration(ret);
+                return(NULL);
+            }
 	    if (last == NULL) ret = last = cur;
 	    else {
 		last->next = cur;
@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
- * xmlParseElementChildrenContentDecl:
+ * xmlParseElementChildrenContentDeclPriv:
  * @ctxt:  an XML parser context
  * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
  *
  * parse the declaration for a Mixed Element content
  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
  * Returns the tree of xmlElementContentPtr describing the element 
  *          hierarchy.
  */
-xmlElementContentPtr
-xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
+static xmlElementContentPtr
+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
+                                       int depth) {
     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
     const xmlChar *elem;
     xmlChar type = 0;
 
+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
+        (depth >  2048)) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
+                          depth);
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
-        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                           depth + 1);
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
-	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
+                                                          depth + 1);
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseName(ctxt);
@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 }
 
 /**
+ *
+ * xmlParseElementChildrenContentDecl:
+ * @ctxt:  an XML parser context
+ * @inputchk:  the input used for the current entity, needed for boundary checks
+ * @depth: the level of recursion
+ *
+ * parse the declaration for a Mixed Element content
+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
+ *
+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
+ *
+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+ *
+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
+ *
+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
+ *
+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+ * TODO Parameter-entity replacement text must be properly nested
+ *	with parenthesized groups. That is to say, if either of the
+ *	opening or closing parentheses in a choice, seq, or Mixed
+ *	construct is contained in the replacement text for a parameter
+ *	entity, both must be contained in the same replacement text. For
+ *	interoperability, if a parameter-entity reference appears in a
+ *	choice, seq, or Mixed construct, its replacement text should not
+ *	be empty, and neither the first nor last non-blank character of
+ *	the replacement text should be a connector (| or ,).
+ *
+ * Returns the tree of xmlElementContentPtr describing the element 
+ *          hierarchy.
+ */
+xmlElementContentPtr
+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
+    /* stub left for API/ABI compat */
+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
+}
+
+/**
  * xmlParseElementContentDecl:
  * @ctxt:  an XML parser context
  * @name:  the name of the element being defined.
@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
 	res = XML_ELEMENT_TYPE_MIXED;
     } else {
-        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
 	res = XML_ELEMENT_TYPE_ELEMENT;
     }
     SKIP_BLANKS;


Index: mingw32-libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/EL-5/mingw32-libxml2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-libxml2.spec	28 Jan 2009 11:50:30 -0000	1.1
+++ mingw32-libxml2.spec	10 Aug 2009 16:53:41 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
+Patch1:         libxml2-2.7.3-ficora-parse.patch
 
 # MinGW-specific patches.
 Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
@@ -44,6 +45,8 @@ MinGW Windows libxml2 XML processing lib
 %prep
 %setup -q -n libxml2-%{version}
 
+%patch1 -p1
+
 %patch1000 -p1
 
 # Patched configure.in, so rebuild configure.
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Daniel Veillard <veillard at redhat.com> - 2.7.2-7
+- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416
+
 * Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-6
 - Rerun autoreconf after patching configure.in (Erik van Pienbroek).
 - Rebuild libtool for Rawhide / libtool 2.



From mclasen at fedoraproject.org  Mon Aug 10 17:05:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 17:05:23 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.142,1.143
Message-ID: <20090810170523.128AE11C0344@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25301

Modified Files:
	gvfs.spec 
Log Message:
1.3.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- gvfs.spec	7 Aug 2009 12:55:52 -0000	1.142
+++ gvfs.spec	10 Aug 2009 17:05:22 -0000	1.143
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.3.3
-Release: 3%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,18 +34,9 @@ BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch1: gvfs-archive-integration.patch
-# gedit crashed with SIGSEGV in strlen()
-# https://bugzilla.gnome.org/show_bug.cgi?id=589915
-Patch2: gvfs-1.3.4-output-stream-callback-arg.patch
-# smb url don't work in the run application dialog
-# http://bugzilla.gnome.org/show_bug.cgi?id=573994
-Patch3: gvfs-1.3.4-smb-browse-fake-content-type.patch
 # Bad mount prefix stripping in g_daemon_file_get_path()
 # http://bugzilla.gnome.org/show_bug.cgi?id=590862
 Patch4: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
-# gvfsd-sftp crashed with SIGSEGV in strlen()
-# http://bugzilla.gnome.org/show_bug.cgi?id=589434
-Patch5: gvfs-1.3.4-bug-589434-sftp-choices-segfault.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=497631
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
@@ -134,10 +125,7 @@ media players (Media Transfer Protocol) 
 %prep
 %setup -q
 %patch1 -p1 -b .archive-integration
-%patch2 -p1 -b .gedit-segfault
-%patch3 -p1 -b .smb-fake-content-type
 %patch4 -p1 -b .mount-prefix
-%patch5 -p1 -b .sftp-choices-segfault
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 
@@ -286,6 +274,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.4-1
+- Update to 1.3.4
+
 * Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.3-3
 - Fix bad mount prefix stripping (part of #509612)
 - Fix gvfsd-sftp segfault when asking a question



From pkgdb at fedoraproject.org  Mon Aug 10 17:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 17:09:22 +0000
Subject: [pkgdb] boo: palango has requested watchbugzilla
Message-ID: <20090810170922.B1CC810F882@bastion2.fedora.phx.redhat.com>

palango has requested the watchbugzilla acl on boo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/boo



From pkgdb at fedoraproject.org  Mon Aug 10 17:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 17:09:25 +0000
Subject: [pkgdb] boo: palango has requested watchcommits
Message-ID: <20090810170925.6474810F89B@bastion2.fedora.phx.redhat.com>

palango has requested the watchcommits acl on boo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/boo



From mclasen at fedoraproject.org  Mon Aug 10 17:09:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 17:09:44 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore,1.44,1.45 sources,1.44,1.45
Message-ID: <20090810170944.3620711C0344@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26374

Modified Files:
	.cvsignore sources 
Log Message:
new source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	29 Jul 2009 18:39:21 -0000	1.44
+++ .cvsignore	10 Aug 2009 17:09:43 -0000	1.45
@@ -1 +1 @@
-gvfs-1.3.3.tar.bz2
+gvfs-1.3.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	29 Jul 2009 18:39:22 -0000	1.44
+++ sources	10 Aug 2009 17:09:44 -0000	1.45
@@ -1 +1 @@
-2f1c65dcde8fc4d0603e11a8ec3fc178  gvfs-1.3.3.tar.bz2
+4c9b83c873a3757dde0052bafcebb7dc  gvfs-1.3.4.tar.bz2



From jjames at fedoraproject.org  Mon Aug 10 17:09:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 10 Aug 2009 17:09:49 +0000 (UTC)
Subject: rpms/findbugs-contrib/F-11 findbugs-contrib.spec,1.2,1.3
Message-ID: <20090810170949.175DF11C0424@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26350/F-11

Modified Files:
	findbugs-contrib.spec 
Log Message:
Fix broken source file URLs.



Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-11/findbugs-contrib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findbugs-contrib.spec	6 Jun 2009 04:29:04 -0000	1.2
+++ findbugs-contrib.spec	10 Aug 2009 17:09:48 -0000	1.3
@@ -12,7 +12,7 @@ Summary:        Extra findbugs detectors
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://fb-contrib.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/fb-contrib-src-%{version}.zip
+Source0:        http://downloads.sourceforge.net/fb-contrib/fb-contrib-src-%{version}.zip
 # 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/.



From jjames at fedoraproject.org  Mon Aug 10 17:09:48 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 10 Aug 2009 17:09:48 +0000 (UTC)
Subject: rpms/findbugs-contrib/F-10 findbugs-contrib.spec,1.2,1.3
Message-ID: <20090810170948.DF91111C0344@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26350/F-10

Modified Files:
	findbugs-contrib.spec 
Log Message:
Fix broken source file URLs.



Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-10/findbugs-contrib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findbugs-contrib.spec	6 Jun 2009 04:29:04 -0000	1.2
+++ findbugs-contrib.spec	10 Aug 2009 17:09:48 -0000	1.3
@@ -12,7 +12,7 @@ Summary:        Extra findbugs detectors
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://fb-contrib.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/fb-contrib-src-%{version}.zip
+Source0:        http://downloads.sourceforge.net/fb-contrib/fb-contrib-src-%{version}.zip
 # 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/.



From pkgdb at fedoraproject.org  Mon Aug 10 17:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 17:09:25 +0000
Subject: [pkgdb] boo: palango has requested commit
Message-ID: <20090810170926.289B910F89C@bastion2.fedora.phx.redhat.com>

palango has requested the commit acl on boo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/boo



From jjames at fedoraproject.org  Mon Aug 10 17:09:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 10 Aug 2009 17:09:49 +0000 (UTC)
Subject: rpms/findbugs-contrib/devel findbugs-contrib.spec,1.3,1.4
Message-ID: <20090810170949.5039B11C043B@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26350/devel

Modified Files:
	findbugs-contrib.spec 
Log Message:
Fix broken source file URLs.



Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/findbugs-contrib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- findbugs-contrib.spec	24 Jul 2009 22:46:58 -0000	1.3
+++ findbugs-contrib.spec	10 Aug 2009 17:09:49 -0000	1.4
@@ -12,7 +12,7 @@ Summary:        Extra findbugs detectors
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://fb-contrib.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/fb-contrib-src-%{version}.zip
+Source0:        http://downloads.sourceforge.net/fb-contrib/fb-contrib-src-%{version}.zip
 # 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/.



From behdad at fedoraproject.org  Mon Aug 10 17:16:11 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 17:16:11 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.90, 1.91 pango.spec, 1.164,
	1.165 sources, 1.91, 1.92
Message-ID: <20090810171611.D652811C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27616

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-1
- Update to 1.25.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	22 Jul 2009 16:27:07 -0000	1.90
+++ .cvsignore	10 Aug 2009 17:16:11 -0000	1.91
@@ -1 +1 @@
-pango-1.24.5.tar.bz2
+pango-1.25.1.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- pango.spec	22 Jul 2009 16:27:07 -0000	1.164
+++ pango.spec	10 Aug 2009 17:16:11 -0000	1.165
@@ -2,17 +2,17 @@
 %define glib2_version %{glib2_base_version}-1
 %define pkgconfig_version 0.12
 %define freetype_version 2.1.3-3
-%define fontconfig_version 2.0
+%define fontconfig_version 2.7
 %define cairo_version 1.7.6
 %define libthai_version 0.1.9
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.24.5
+Version: 1.25.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/pango/1.24/pango-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -225,6 +225,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-1
+- Update to 1.25.1
+
 * Wed Jul 22 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.24.5-1
 - Update to 1.24.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	22 Jul 2009 16:27:07 -0000	1.91
+++ sources	10 Aug 2009 17:16:11 -0000	1.92
@@ -1 +1 @@
-815416a452e9cccc172fed9862401f37  pango-1.24.5.tar.bz2
+3bf29f8ac93e87b8719795f703e6e97d  pango-1.25.1.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 17:18:58 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 17:18:58 +0000 (UTC)
Subject: rpms/epic/devel .cvsignore, 1.6, 1.7 epic.spec, 1.33, 1.34 sources, 
	1.8, 1.9
Message-ID: <20090810171858.5FFEA11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/epic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28410

Modified Files:
	.cvsignore epic.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4:2.10-5
- Use bzipped upstream help tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Nov 2008 11:55:36 -0000	1.6
+++ .cvsignore	10 Aug 2009 17:18:57 -0000	1.7
@@ -1,5 +1,4 @@
 epic4-1.0.1.tar.bz2
-epic4-help-current.tar.gz
 sf-1.35.irc.gz
 sf-bitchx-scheme.irc.gz
 sf-eggsandham-scheme.irc.gz
@@ -9,3 +8,4 @@ epic4-2.2.tar.bz2
 epic4-2.4.tar.bz2
 epic4-2.6.tar.bz2
 epic4-2.10.tar.bz2
+epic4-help-current.tar.bz2


Index: epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/epic.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- epic.spec	24 Jul 2009 22:13:07 -0000	1.33
+++ epic.spec	10 Aug 2009 17:18:58 -0000	1.34
@@ -1,14 +1,14 @@
 Summary: An ircII chat client
 Name: epic
 Version: 2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 4
 # The entire source code is Freely redistributable without restriction except some
 # files (notably, glob.c, and compat.c) may contain some source covered by BSD
 License: Freely redistributable without restriction and BSD
 Group: Applications/Communications
 Source0: ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-%{version}.tar.bz2
-Source1: ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-help-current.tar.gz
+Source1: ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-help-current.tar.bz2
 Source2: epic.wmconfig
 Source3: ircII.servers
 Source4: http://prdownloads.sourceforge.net/splitfire/sf-1.35.irc.gz
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/epic/help/*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4:2.10-5
+- Use bzipped upstream help tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:2.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Nov 2008 11:55:36 -0000	1.8
+++ sources	10 Aug 2009 17:18:58 -0000	1.9
@@ -3,5 +3,5 @@
 dd75ad70b46b331b008d976880899233  sf-eggsandham-scheme.irc.gz
 3a7151f0b2913964eb5e38b6c1a2697d  sf-light-scheme.irc.gz
 90c9dc5fc9f372843f8a0732fba61eb1  sf-perry-scheme.irc.gz
-9888d1af465ca72bf9a02487264071a5  epic4-help-current.tar.gz
 92789d75f12882696817865ea072e44a  epic4-2.10.tar.bz2
+b28872ca9234650eda6842ffc3425849  epic4-help-current.tar.bz2



From mtasaka at fedoraproject.org  Mon Aug 10 17:20:26 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 10 Aug 2009 17:20:26 +0000 (UTC)
Subject: rpms/wkf/devel sources,1.2,1.3 wkf.spec,1.6,1.7
Message-ID: <20090810172026.B459D11C0344@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wkf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28752

Modified Files:
	sources wkf.spec 
Log Message:
* Tue Aug 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.11-6.respin1
- Source changed, rebuild



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wkf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Dec 2007 18:31:45 -0000	1.2
+++ sources	10 Aug 2009 17:20:26 -0000	1.3
@@ -1 +1 @@
-a48f7744d1fbbcdad45ce877cfc6e0f3  wkf-1.3.11.tar.bz2
+f63b392eab49a338f9b2cefd0b3ec25b  wkf-1.3.11.tar.bz2


Index: wkf.spec
===================================================================
RCS file: /cvs/extras/rpms/wkf/devel/wkf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- wkf.spec	24 Jul 2009 20:01:52 -0000	1.6
+++ wkf.spec	10 Aug 2009 17:20:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		wkf
 Version:	1.3.11
-Release:	5%{?dist}
+Release:	6.respin1%{?dist}
 Summary:	Japanese Kanji code converting filter
 
 Group:		System Environment/Libraries
@@ -107,6 +107,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -n
 
 
 %changelog
+* Tue Aug 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.11-6.respin1
+- Source changed, rebuild
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.11-5
 - F-12: Mass rebuild
 



From scop at fedoraproject.org  Mon Aug 10 17:22:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 17:22:15 +0000 (UTC)
Subject: rpms/ewl/devel .cvsignore,1.2,1.3 ewl.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090810172215.B5A4E11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ewl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191

Modified Files:
	.cvsignore ewl.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.2.042-11
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ewl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Jul 2009 22:30:54 -0000	1.2
+++ .cvsignore	10 Aug 2009 17:22:15 -0000	1.3
@@ -1 +1 @@
-ewl-0.5.2.042.tar.gz
+ewl-0.5.2.042.tar.bz2


Index: ewl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ewl/devel/ewl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ewl.spec	24 Jul 2009 22:24:27 -0000	1.2
+++ ewl.spec	10 Aug 2009 17:22:15 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		ewl
 Version:	0.5.2.042
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Enlightenment Widget Library
 
 Group:		System Environment/Libraries
 License:	MIT with advertising
 URL:		http://www.enlightenment.org/
-Source0:	http://download.enlightenment.org/snapshots/2008-01-25/%{name}-%{version}.tar.gz
+Source0:	http://download.enlightenment.org/snapshots/2008-01-25/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	zlib-devel, curl-devel, openssl-devel
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/examples
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.2.042-11
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2.042-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ewl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jul 2009 22:30:54 -0000	1.2
+++ sources	10 Aug 2009 17:22:15 -0000	1.3
@@ -1 +1 @@
-385082d91eb112671a5c64af295da91d  ewl-0.5.2.042.tar.gz
+c25a57cdee3e58b016ad8ad5e0767902  ewl-0.5.2.042.tar.bz2



From hvad at fedoraproject.org  Mon Aug 10 17:27:15 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 10 Aug 2009 17:27:15 +0000 (UTC)
Subject: rpms/perl-Config-Model/F-11 import.log, NONE,
	1.1 perl-Config-Model.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090810172715.9154B11C0344@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Config-Model/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30209/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Config-Model.spec 
Log Message:



--- NEW FILE import.log ---
perl-Config-Model-0_638-4_fc10:F-11:perl-Config-Model-0.638-4.fc10.src.rpm:1249327931


--- NEW FILE perl-Config-Model.spec ---
Name:           perl-Config-Model
Version:        0.638
Release:        4%{?dist}
Summary:        Framework to create configuration validation tools and editors
License:        LGPLv2+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-Model/
Source0:        http://www.cpan.org/authors/id/D/DD/DDUMONT/Config-Model-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Carp::Assert::More)
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(Exception::Class)
BuildRequires:  perl(Log::Log4perl) >= 1.11
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Parse::RecDescent) >= 1.90.0
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Warn) >= 0.11
BuildRequires:  perl(Test::Pod) 
Requires:       perl(Carp::Assert::More)
Requires:       perl(Config::Tiny)
Requires:       perl(Exception::Class)
Requires:       perl(Log::Log4perl) >= 1.11
Requires:       perl(Parse::RecDescent) >= 1.90.0
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Using Config::Model, a typical configuration validation tool will be made
of 3 parts :
1. The user interface
2. The validation engine which is in charge of validating all the
configuration information provided by the user.
3. The storage facility that store the configuration information

%prep
%setup -q -n Config-Model-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog config-edit examples LICENSE README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
/usr/bin/config-edit

%changelog
* Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.638-4
- Modify license.

* Sat Aug 08 2009 David Hannequin david.hannequin at gmail.com 0.638-3
- Add missing build require.

* Sun Aug 02 2009 David Hannequin david.hannequin at gmail.com 0.638-2
- Fix wrong path.

* Fri Jul 31 2009 David Hannequin <david.hannequin at gmail.com> 0.638-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:42:13 -0000	1.1
+++ .cvsignore	10 Aug 2009 17:27:15 -0000	1.2
@@ -0,0 +1 @@
+Config-Model-0.638.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:42:13 -0000	1.1
+++ sources	10 Aug 2009 17:27:15 -0000	1.2
@@ -0,0 +1 @@
+1d2051aa5eed763b14191027bc10cc84  Config-Model-0.638.tar.gz



From lmacken at fedoraproject.org  Mon Aug 10 17:31:07 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 17:31:07 +0000 (UTC)
Subject: rpms/python-tw-jquery/F-11 python-tw-jquery.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810173107.C6D7A11C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-jquery/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31830

Modified Files:
	.cvsignore sources 
Added Files:
	python-tw-jquery.spec 
Log Message:
Initial commit


--- NEW FILE python-tw-jquery.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-tw-jquery
Version:        0.9.5
Release:        1%{?dist}
Summary:        ToscaWidgets wrapping for jQuery

Group:          Development/Languages
License:        MIT
URL:            http://toscawidgets.org
Source0:        http://pypi.python.org/packages/source/t/tw.jquery/tw.jquery-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
Requires:       python-toscawidgets >= 0.9.3
Requires:       python-tw-forms

%description
ToscaWidgets wrapping for jQuery

%prep
%setup -q -n tw.jquery-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*



%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.9.5-1
- Latest upstream release

* Thu Jun 18 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.5-1
- Latest upstream release, with various module cleanups

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.4-1
- Latest upstream release, which includes the license

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.3-1
- Latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.2-1
- Update to 0.9.4.2
- Require python-tw-forms

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9.1-0.1.dev20081021
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:32:46 -0000	1.1
+++ .cvsignore	10 Aug 2009 17:31:07 -0000	1.2
@@ -0,0 +1 @@
+tw.jquery-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:32:46 -0000	1.1
+++ sources	10 Aug 2009 17:31:07 -0000	1.2
@@ -0,0 +1 @@
+26a12f557d154465203ae920ae66f437  tw.jquery-0.9.5.tar.gz



From hvad at fedoraproject.org  Mon Aug 10 17:33:10 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 10 Aug 2009 17:33:10 +0000 (UTC)
Subject: rpms/perl-Config-Model/F-10 import.log, NONE,
	1.1 perl-Config-Model.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090810173310.814F411C0344@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Config-Model/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32265/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Config-Model.spec 
Log Message:



--- NEW FILE import.log ---
perl-Config-Model-0_638-4_fc10:F-10:perl-Config-Model-0.638-4.fc10.src.rpm:1249328210


--- NEW FILE perl-Config-Model.spec ---
Name:           perl-Config-Model
Version:        0.638
Release:        4%{?dist}
Summary:        Framework to create configuration validation tools and editors
License:        LGPLv2+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-Model/
Source0:        http://www.cpan.org/authors/id/D/DD/DDUMONT/Config-Model-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Carp::Assert::More)
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(Exception::Class)
BuildRequires:  perl(Log::Log4perl) >= 1.11
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Parse::RecDescent) >= 1.90.0
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Warn) >= 0.11
BuildRequires:  perl(Test::Pod) 
Requires:       perl(Carp::Assert::More)
Requires:       perl(Config::Tiny)
Requires:       perl(Exception::Class)
Requires:       perl(Log::Log4perl) >= 1.11
Requires:       perl(Parse::RecDescent) >= 1.90.0
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Using Config::Model, a typical configuration validation tool will be made
of 3 parts :
1. The user interface
2. The validation engine which is in charge of validating all the
configuration information provided by the user.
3. The storage facility that store the configuration information

%prep
%setup -q -n Config-Model-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog config-edit examples LICENSE README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
/usr/bin/config-edit

%changelog
* Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.638-4
- Modify license.

* Sat Aug 08 2009 David Hannequin david.hannequin at gmail.com 0.638-3
- Add missing build require.

* Sun Aug 02 2009 David Hannequin david.hannequin at gmail.com 0.638-2
- Fix wrong path.

* Fri Jul 31 2009 David Hannequin <david.hannequin at gmail.com> 0.638-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:42:13 -0000	1.1
+++ .cvsignore	10 Aug 2009 17:33:10 -0000	1.2
@@ -0,0 +1 @@
+Config-Model-0.638.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:42:13 -0000	1.1
+++ sources	10 Aug 2009 17:33:10 -0000	1.2
@@ -0,0 +1 @@
+1d2051aa5eed763b14191027bc10cc84  Config-Model-0.638.tar.gz



From behdad at fedoraproject.org  Mon Aug 10 17:33:35 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 17:33:35 +0000 (UTC)
Subject: rpms/pango/devel pango-1.25.1-no-hb-main.patch, NONE, 1.1 pango.spec,
	1.165, 1.166
Message-ID: <20090810173335.3552511C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32507

Modified Files:
	pango.spec 
Added Files:
	pango-1.25.1-no-hb-main.patch 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-2 
- Add pango-1.25.1-no-hb-main.patch to fix build on x86-64 


pango-1.25.1-no-hb-main.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pango-1.25.1-no-hb-main.patch ---
diff -up pango-1.25.1/pango/opentype/Makefile.in.no-hb-main pango-1.25.1/pango/opentype/Makefile.in
--- pango-1.25.1/pango/opentype/Makefile.in.no-hb-main	2009-08-10 13:29:37.000000000 -0400
+++ pango-1.25.1/pango/opentype/Makefile.in	2009-08-10 13:29:14.000000000 -0400
@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = main$(EXEEXT)
+#noinst_PROGRAMS = main$(EXEEXT)
 subdir = pango/opentype
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	COPYING TODO


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- pango.spec	10 Aug 2009 17:16:11 -0000	1.165
+++ pango.spec	10 Aug 2009 17:33:35 -0000	1.166
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -37,6 +37,7 @@ BuildRequires: gtk-doc
 
 # Look for pango.modules in an arch-specific directory
 Patch0: pango-1.21.4-lib64.patch
+Patch1: pango-1.25.1-no-hb-main.patch
 
 %description
 Pango is a library for laying out and rendering of text, with an emphasis
@@ -72,6 +73,7 @@ for the pango package.
 %setup -q -n pango-%{version}
 
 %patch0 -p1 -b .lib64
+%patch1 -p1 -b .no-hb-main
 
 %build
 
@@ -225,6 +227,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-2
+- Add pango-1.25.1-no-hb-main.patch to fix build on x86-64
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-1
 - Update to 1.25.1
 



From lmacken at fedoraproject.org  Mon Aug 10 17:37:54 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 17:37:54 +0000 (UTC)
Subject: rpms/python-tw-jquery/F-10 python-tw-jquery.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810173754.092A711C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-jquery/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1191

Modified Files:
	.cvsignore sources 
Added Files:
	python-tw-jquery.spec 
Log Message:
Initial commit of python-tw-jquery for F-10


--- NEW FILE python-tw-jquery.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-tw-jquery
Version:        0.9.5
Release:        1%{?dist}
Summary:        ToscaWidgets wrapping for jQuery

Group:          Development/Languages
License:        MIT
URL:            http://toscawidgets.org
Source0:        http://pypi.python.org/packages/source/t/tw.jquery/tw.jquery-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
Requires:       python-toscawidgets >= 0.9.3
Requires:       python-tw-forms

%description
ToscaWidgets wrapping for jQuery

%prep
%setup -q -n tw.jquery-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*



%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.9.5-1
- Latest upstream release

* Thu Jun 18 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.5-1
- Latest upstream release, with various module cleanups

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.4-1
- Latest upstream release, which includes the license

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.3-1
- Latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.2-1
- Update to 0.9.4.2
- Require python-tw-forms

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9.1-0.1.dev20081021
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:32:46 -0000	1.1
+++ .cvsignore	10 Aug 2009 17:37:53 -0000	1.2
@@ -0,0 +1 @@
+tw.jquery-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:32:46 -0000	1.1
+++ sources	10 Aug 2009 17:37:53 -0000	1.2
@@ -0,0 +1 @@
+26a12f557d154465203ae920ae66f437  tw.jquery-0.9.5.tar.gz



From hvad at fedoraproject.org  Mon Aug 10 17:38:29 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 10 Aug 2009 17:38:29 +0000 (UTC)
Subject: rpms/perl-Config-Model/devel import.log, NONE,
	1.1 perl-Config-Model.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090810173829.EEDAE11C0344@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Config-Model/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1368/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Config-Model.spec 
Log Message:



--- NEW FILE import.log ---
perl-Config-Model-0_638-4_fc10:HEAD:perl-Config-Model-0.638-4.fc10.src.rpm:1249328598


--- NEW FILE perl-Config-Model.spec ---
Name:           perl-Config-Model
Version:        0.638
Release:        4%{?dist}
Summary:        Framework to create configuration validation tools and editors
License:        LGPLv2+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Config-Model/
Source0:        http://www.cpan.org/authors/id/D/DD/DDUMONT/Config-Model-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Carp::Assert::More)
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(Exception::Class)
BuildRequires:  perl(Log::Log4perl) >= 1.11
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Parse::RecDescent) >= 1.90.0
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Warn) >= 0.11
BuildRequires:  perl(Test::Pod) 
Requires:       perl(Carp::Assert::More)
Requires:       perl(Config::Tiny)
Requires:       perl(Exception::Class)
Requires:       perl(Log::Log4perl) >= 1.11
Requires:       perl(Parse::RecDescent) >= 1.90.0
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Using Config::Model, a typical configuration validation tool will be made
of 3 parts :
1. The user interface
2. The validation engine which is in charge of validating all the
configuration information provided by the user.
3. The storage facility that store the configuration information

%prep
%setup -q -n Config-Model-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog config-edit examples LICENSE README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_mandir}/man1/*
/usr/bin/config-edit

%changelog
* Sun Aug 09 2009 David Hannequin david.hannequin at gmail.com 0.638-4
- Modify license.

* Sat Aug 08 2009 David Hannequin david.hannequin at gmail.com 0.638-3
- Add missing build require.

* Sun Aug 02 2009 David Hannequin david.hannequin at gmail.com 0.638-2
- Fix wrong path.

* Fri Jul 31 2009 David Hannequin <david.hannequin at gmail.com> 0.638-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:42:13 -0000	1.1
+++ .cvsignore	10 Aug 2009 17:38:29 -0000	1.2
@@ -0,0 +1 @@
+Config-Model-0.638.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-Model/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:42:13 -0000	1.1
+++ sources	10 Aug 2009 17:38:29 -0000	1.2
@@ -0,0 +1 @@
+1d2051aa5eed763b14191027bc10cc84  Config-Model-0.638.tar.gz



From lmacken at fedoraproject.org  Mon Aug 10 17:43:14 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 17:43:14 +0000 (UTC)
Subject: rpms/python-tw-jquery/EL-5 python-tw-jquery.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810174314.B079F11C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-jquery/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2464

Modified Files:
	.cvsignore sources 
Added Files:
	python-tw-jquery.spec 
Log Message:
Initial commit of python-tw-jquery for EL-5


--- NEW FILE python-tw-jquery.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-tw-jquery
Version:        0.9.5
Release:        1%{?dist}
Summary:        ToscaWidgets wrapping for jQuery

Group:          Development/Languages
License:        MIT
URL:            http://toscawidgets.org
Source0:        http://pypi.python.org/packages/source/t/tw.jquery/tw.jquery-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
Requires:       python-toscawidgets >= 0.9.3
Requires:       python-tw-forms

%description
ToscaWidgets wrapping for jQuery

%prep
%setup -q -n tw.jquery-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*



%changelog
* Fri Jul 31 2009 Luke Macken <lmacken at redhat.com> - 0.9.5-1
- Latest upstream release

* Thu Jun 18 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.5-1
- Latest upstream release, with various module cleanups

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.4-1
- Latest upstream release, which includes the license

* Tue Jun 02 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.3-1
- Latest upstream release

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.4.2-1
- Update to 0.9.4.2
- Require python-tw-forms

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9.1-0.1.dev20081021
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:32:46 -0000	1.1
+++ .cvsignore	10 Aug 2009 17:43:14 -0000	1.2
@@ -0,0 +1 @@
+tw.jquery-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-jquery/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:32:46 -0000	1.1
+++ sources	10 Aug 2009 17:43:14 -0000	1.2
@@ -0,0 +1 @@
+26a12f557d154465203ae920ae66f437  tw.jquery-0.9.5.tar.gz



From scop at fedoraproject.org  Mon Aug 10 17:43:51 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 17:43:51 +0000 (UTC)
Subject: rpms/ccache/devel 06_md.diff, NONE, 1.1 ccache.spec, 1.24,
	1.25 ccache-2.4-md.patch, 1.1, NONE
Message-ID: <20090810174351.CEF6411C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2683

Modified Files:
	ccache.spec 
Added Files:
	06_md.diff 
Removed Files:
	ccache-2.4-md.patch 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4-16
- Switch #438201 patch URL to Debian patch tracking (original is MIA).


06_md.diff:
 ccache.c |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

--- NEW FILE 06_md.diff ---

diff --git a/ccache.c b/ccache.c
index 64c979b..843929f 100644
--- a/ccache.c
+++ b/ccache.c
@@ -647,6 +647,13 @@ static void process_args(int argc, char **argv)
 	int found_S_opt = 0;
 	struct stat st;
 	char *e;
+	/* is gcc being asked to output dependencies? */
+	int generating_dependencies = 0;
+	/* is the dependency makefile name overridden with -MF? */
+	int dependency_filename_specified = 0;
+	/* is the dependency makefile target name specified with -MQ or -MF? */
+	int dependency_target_specified = 0;
+
 
 	stripped_args = args_init(0, NULL);
 
@@ -725,6 +732,18 @@ static void process_args(int argc, char **argv)
 			continue;
 		}
 
+		/* These options require special handling, because they
+		   behave differently with gcc -E, when the output
+		   file is not specified. */
+
+		if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
+			generating_dependencies = 1;
+		} else if (strcmp(argv[i], "-MF") == 0) {
+			dependency_filename_specified = 1;
+		} else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
+			dependency_target_specified = 1;
+		}
+
 		/* options that take an argument */
 		{
 			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
@@ -837,6 +856,41 @@ static void process_args(int argc, char **argv)
 		p[2] = 0;
 	}
 
+	/* If dependencies are generated, configure the preprocessor */
+
+	if (generating_dependencies && output_file) {
+		if (!dependency_filename_specified) {
+			char *default_depfile_name = x_strdup(output_file);
+			char *p = strrchr(default_depfile_name, '.');
+
+			if (p) {
+				if (strlen(p) < 2) {
+					stats_update(STATS_ARGS);
+					failed();
+					return;
+				}
+				*p = 0;
+			}
+			else  {
+				int len = p - default_depfile_name;
+				
+				p = x_malloc(len + 3);
+				strncpy(default_depfile_name, p, len - 1);
+				free(default_depfile_name);
+				default_depfile_name = p;
+			}
+
+			strcat(default_depfile_name, ".d");
+			args_add(stripped_args, "-MF");
+			args_add(stripped_args, default_depfile_name);
+		}
+
+		if (!dependency_target_specified) {
+			args_add(stripped_args, "-MT");
+			args_add(stripped_args, output_file);
+		}
+	}
+
 	/* cope with -o /dev/null */
 	if (strcmp(output_file,"/dev/null") != 0 && stat(output_file, &st) == 0 && !S_ISREG(st.st_mode)) {
 		cc_log("Not a regular file %s\n", output_file);



Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ccache.spec	24 Jul 2009 18:41:35 -0000	1.24
+++ ccache.spec	10 Aug 2009 17:43:51 -0000	1.25
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -19,7 +19,7 @@ Patch0:         %{name}-html-links.patch
 Patch1:         %{name}-2.4-coverage-231462.patch
 Patch2:         %{name}-2.4-hardlink-doc.patch
 Patch3:         %{name}-2.4-noHOME-315441.patch
-Patch4:         http://darkircop.org/ccache/ccache-2.4-md.patch
+Patch4:         http://patch-tracking.debian.net/patch/series/dl/ccache/2.4-17/06_md.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -102,86 +102,89 @@ done
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4-16
+- Switch #438201 patch URL to Debian patch tracking (original is MIA).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Mar 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.4-13
+* Wed Mar 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.4-13
 - Apply patch to fix path to saved dependency files (#438201).
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.4-12
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.4-12
 - Rebuild.
 
-* Tue Oct  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-11
+* Tue Oct  2 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-11
 - Apply upstream fix for problems when $HOME is not set (#315441).
 
-* Wed Aug 22 2007 Ville Skytt? <ville.skytta at iki.fi>
+* Wed Aug 22 2007 Ville Skytt? <ville.skytta at iki.fi>
 - Fix URL to upstream tarball.
 
-* Sun Aug 19 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-10
+* Sun Aug 19 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-10
 - License: GPLv2+
 - Make compiler symlinks relative.
 - Make profile.d scripts noreplace.
 
-* Mon Jul 30 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-9
+* Mon Jul 30 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-9
 - Use shared cache dir for users in the ccache group by default
   (#247760, based on Andy Shevchenko's work).
 - Fix outdated hardlink info in cache sharing docs.
 - Add auto-symlink support for avr-gcc(-c++) and arm-gp2x-linux-gcc(-c++).
 - Make triggers always exit with a zero exit status.
 
-* Thu Mar 15 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-8
+* Thu Mar 15 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.4-8
 - Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage
   (upstream CVS and Matt Fago, #231462).
 
-* Fri Nov 10 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.4-7
+* Fri Nov 10 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.4-7
 - Require coreutils for triggers (#215030).
 
-* Wed Aug  9 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.4-6
+* Wed Aug  9 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.
 
-* Tue May 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.4-5
+* Tue May 16 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.4-5
 - Add auto-symlink support for g++-libstdc++-so_7.
 
-* Sat Nov 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.4-4
+* Sat Nov 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.4-4
 - Drop "bin" from compiler symlink path.
 - Make profile.d snippets non-executable (#35714).
 
-* Sun May  1 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.4-3
+* Sun May  1 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.4-3
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
 - rebuilt
 
-* Sun Sep 26 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
+* Sun Sep 26 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
 - Update to 2.4.
 - Add symlinking support for gcc4 and gcc4-c++.
 - Move the ccache executable to %%{_bindir}.
 - Include more docs.
 
-* Fri Jun 25 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
+* Fri Jun 25 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
 - Add support for gcc33 and g++33.
 
-* Thu Jun 10 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.4
+* Thu Jun 10 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.4
 - Fix hardcoded lib path in profile.d scriptlets (bug 1558).
 
-* Mon May  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.3
+* Mon May  3 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.3
 - Add support for gcc34 and g++34, and
   %%{_target_cpu}-%%{_vendor}-%%{_target_os}-* variants.
 
-* Thu Nov 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
+* Thu Nov 13 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
 - Add overriding symlinks for gcc-ssa and g++-ssa (bug 963).
 
-* Tue Nov 11 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.1
+* Tue Nov 11 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.3-0.fdr.1
 - Update to 2.3.
 - Implement triggers to keep list of "aliased" compilers up to date on the fly.
 - Add gcc32 and a bunch of legacy packages to the list of overridden compilers.
 
-* Sat Aug  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.2-0.fdr.6
+* Sat Aug  2 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.2-0.fdr.6
 - Add c++ to the list of overridden compilers (bug 548).
 - Own everything including dirs under %%{_libdir}/ccache (bug 529).
 - %%{buildroot} -> $RPM_BUILD_ROOT.


--- ccache-2.4-md.patch DELETED ---



From silfreed at fedoraproject.org  Mon Aug 10 17:45:05 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 10 Aug 2009 17:45:05 +0000 (UTC)
Subject: rpms/pytrainer/devel .cvsignore, 1.5, 1.6 pytrainer.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20090810174505.4624211C0344@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3023

Modified Files:
	.cvsignore pytrainer.spec sources 
Log Message:
* Mon Aug 10 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.8-1
- updating to 1.6.0.8
- Rotating log file support added
- Translations reviewed and added script to facilitate them
- Several improvements to Wordpress extension
- Changed potential problems when dealing with date objects using MySQL as DB
- Removing redundant calls improving graphical performance
- Optimizing xml files parsing when retrieving data from them



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Mar 2009 15:04:48 -0000	1.5
+++ .cvsignore	10 Aug 2009 17:45:05 -0000	1.6
@@ -1 +1 @@
-pytrainer-1.6.0.7.tar.gz
+pytrainer-1.6.0.8.tar.gz


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/pytrainer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pytrainer.spec	27 Jul 2009 01:35:56 -0000	1.14
+++ pytrainer.spec	10 Aug 2009 17:45:05 -0000	1.15
@@ -3,15 +3,16 @@
 %define gecko_ver 1.9
 
 Name: pytrainer
-Version: 1.6.0.7
-Release: 2%{?dist}
+Version: 1.6.0.8
+Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
 License: GPLv2+
-URL: http://pytrainer.e-oss.net/
-Source0: http://www.e-oss.net/descargas/pytrainer/%{name}-%{version}.tar.gz
+URL: https://sourceforge.net/projects/pytrainer/
+Source0: http://downloads.sourceforge.net/project/pytrainer/%{name}/PyTrainer%20%{version}/%{name}-%{version}.tar.gz
 Source1: pytrainer.sh
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -73,6 +74,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.8-1
+- updating to 1.6.0.8
+- Rotating log file support added
+- Translations reviewed and added script to facilitate them
+- Several improvements to Wordpress extension
+- Changed potential problems when dealing with date objects using MySQL as DB
+- Removing redundant calls improving graphical performance
+- Optimizing xml files parsing when retrieving data from them
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Mar 2009 15:04:48 -0000	1.5
+++ sources	10 Aug 2009 17:45:05 -0000	1.6
@@ -1 +1 @@
-7b4fd27ee6191ae1e54336a5fc411e2b  pytrainer-1.6.0.7.tar.gz
+ccbf8e4acd89249e47a520a55f0af674  pytrainer-1.6.0.8.tar.gz



From orion at fedoraproject.org  Mon Aug 10 17:47:11 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 17:47:11 +0000 (UTC)
Subject: rpms/R-car/devel R-car.spec,1.7,1.8
Message-ID: <20090810174711.CFD1A11C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-car/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3526

Modified Files:
	R-car.spec 
Log Message:
* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-8
- Update to 1.2-14



Index: R-car.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/R-car.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- R-car.spec	24 Jul 2009 16:11:55 -0000	1.7
+++ R-car.spec	10 Aug 2009 17:47:11 -0000	1.8
@@ -1,10 +1,10 @@
 %define packname car
 # Note that some R packages do not use packrel
-%define packrel 12
+%define packrel 14
 
 Name:             R-%{packname}
 Version:          1.2
-Release:          7%{?dist}
+Release:          8%{?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
+* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-8
+- Update to 1.2-14
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Mon Aug 10 17:47:44 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 17:47:44 +0000 (UTC)
Subject: rpms/expect/devel .cvsignore, 1.5, 1.6 expect.spec, 1.30,
	1.31 sources, 1.7, 1.8
Message-ID: <20090810174744.EC17F11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/expect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3707

Modified Files:
	.cvsignore expect.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 5.43.0-19
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Jun 2008 12:33:00 -0000	1.5
+++ .cvsignore	10 Aug 2009 17:47:44 -0000	1.6
@@ -1,3 +1,2 @@
-expect-5.42.1.tar.gz
-expect-5.43.0.tar.gz
 config.sub
+expect-5.43.0.tar.bz2


Index: expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/expect.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- expect.spec	24 Jul 2009 22:26:43 -0000	1.30
+++ expect.spec	10 Aug 2009 17:47:44 -0000	1.31
@@ -5,11 +5,11 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: Public Domain
 Group: Development/Languages
 URL: http://expect.nist.gov/
-Source: http://expect.nist.gov/src/%{name}-%{version}.tar.gz
+Source: http://expect.nist.gov/src/%{name}-%{version}.tar.bz2
 Source1: config.sub
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: tcl-devel tk-devel autoconf automake libXft-devel
@@ -157,6 +157,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 5.43.0-19
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.43.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Jun 2008 12:33:00 -0000	1.7
+++ sources	10 Aug 2009 17:47:44 -0000	1.8
@@ -1,2 +1,2 @@
-230400129630335b3060a42f66fec11d  expect-5.43.0.tar.gz
 d2ef2acafb72e8f3f3029d30e2a8e228  config.sub
+e6aaab98967f6410099b40f2b3ddebb4  expect-5.43.0.tar.bz2



From orion at fedoraproject.org  Mon Aug 10 17:52:45 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 17:52:45 +0000 (UTC)
Subject: rpms/R-car/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090810175245.A24F611C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-car/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4762

Modified Files:
	.cvsignore sources 
Log Message:
Upload the source dummy.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Mar 2009 17:32:00 -0000	1.6
+++ .cvsignore	10 Aug 2009 17:52:44 -0000	1.7
@@ -1 +1 @@
-car_1.2-12.tar.gz
+car_1.2-14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Mar 2009 17:32:00 -0000	1.6
+++ sources	10 Aug 2009 17:52:44 -0000	1.7
@@ -1 +1 @@
-4de76f868158724ed3f9a94fe5156505  car_1.2-12.tar.gz
+4b60b3639c92e368bb9183ce3228c6ff  car_1.2-14.tar.gz



From silfreed at fedoraproject.org  Mon Aug 10 17:53:38 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 10 Aug 2009 17:53:38 +0000 (UTC)
Subject: rpms/pytrainer/F-11 .cvsignore, 1.5, 1.6 pytrainer.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <20090810175338.6F9E511C0344@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5118

Modified Files:
	.cvsignore pytrainer.spec sources 
Log Message:
* Mon Aug 10 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.8-1
- updating to 1.6.0.8
- Rotating log file support added
- Translations reviewed and added script to facilitate them
- Several improvements to Wordpress extension
- Changed potential problems when dealing with date objects using MySQL as DB
- Removing redundant calls improving graphical performance
- Optimizing xml files parsing when retrieving data from them



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Mar 2009 15:04:48 -0000	1.5
+++ .cvsignore	10 Aug 2009 17:53:38 -0000	1.6
@@ -1 +1 @@
-pytrainer-1.6.0.7.tar.gz
+pytrainer-1.6.0.8.tar.gz


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-11/pytrainer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pytrainer.spec	31 Mar 2009 15:05:56 -0000	1.13
+++ pytrainer.spec	10 Aug 2009 17:53:38 -0000	1.14
@@ -3,15 +3,16 @@
 %define gecko_ver 1.9
 
 Name: pytrainer
-Version: 1.6.0.7
+Version: 1.6.0.8
 Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
 License: GPLv2+
-URL: http://pytrainer.e-oss.net/
-Source0: http://www.e-oss.net/descargas/pytrainer/%{name}-%{version}.tar.gz
+URL: https://sourceforge.net/projects/pytrainer/
+Source0: http://downloads.sourceforge.net/project/pytrainer/%{name}/PyTrainer%20%{version}/%{name}-%{version}.tar.gz
 Source1: pytrainer.sh
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -73,6 +74,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.8-1
+- updating to 1.6.0.8
+- Rotating log file support added
+- Translations reviewed and added script to facilitate them
+- Several improvements to Wordpress extension
+- Changed potential problems when dealing with date objects using MySQL as DB
+- Removing redundant calls improving graphical performance
+- Optimizing xml files parsing when retrieving data from them
+
 * Tue Mar 31 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.7-1
 - updating to 1.6.0.7
 - includes patch to use sqlite3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Mar 2009 15:04:48 -0000	1.5
+++ sources	10 Aug 2009 17:53:38 -0000	1.6
@@ -1 +1 @@
-7b4fd27ee6191ae1e54336a5fc411e2b  pytrainer-1.6.0.7.tar.gz
+ccbf8e4acd89249e47a520a55f0af674  pytrainer-1.6.0.8.tar.gz



From lmacken at fedoraproject.org  Mon Aug 10 17:53:52 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 17:53:52 +0000 (UTC)
Subject: rpms/python-repoze-who-testutil/F-11
	python-repoze-who-testutil-setuptools.patch, NONE,
	1.1 python-repoze-who-testutil.spec, 1.1, 1.2
Message-ID: <20090810175352.97E1511C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-who-testutil/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5247

Modified Files:
	python-repoze-who-testutil.spec 
Added Files:
	python-repoze-who-testutil-setuptools.patch 
Log Message:
Patch the setup.py to use our own setuptools package

python-repoze-who-testutil-setuptools.patch:
 setup.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE python-repoze-who-testutil-setuptools.patch ---
--- setup.py.orig	2009-06-05 07:45:24.000000000 -0400
+++ setup.py	2009-06-05 07:45:28.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-testutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-who-testutil/F-11/python-repoze-who-testutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-who-testutil.spec	27 May 2009 15:39:53 -0000	1.1
+++ python-repoze-who-testutil.spec	10 Aug 2009 17:53:52 -0000	1.2
@@ -10,6 +10,8 @@ License:	BSD
 URL:		http://code.gustavonarea.net/repoze.who-testutil/
 Source0:	http://pypi.python.org/packages/source/r/repoze.who-testutil/repoze.who-testutil-%{version}%{rcver}.tar.gz
 Source1:	http://repoze.org/LICENSE.txt
+Patch0:     %{name}-setuptools.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
@@ -32,6 +34,7 @@ method changes.
 %prep
 %setup -q -n repoze.who-testutil-%{version}%{rcver}
 cp %{SOURCE1} .
+%patch0 -p0 -b .setuptools
 
 %build
 %{__python} setup.py build
@@ -53,6 +56,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.3.rc1
+- Patch the setup.py to use our own setuptools package
+
 * Wed May 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.2.rc1
 - include license copy
 



From lmacken at fedoraproject.org  Mon Aug 10 17:54:20 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 17:54:20 +0000 (UTC)
Subject: rpms/python-repoze-who-testutil/F-11
	python-repoze-who-testutil.spec, 1.2, 1.3
Message-ID: <20090810175420.5CC7311C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-who-testutil/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5502

Modified Files:
	python-repoze-who-testutil.spec 
Log Message:
Bump the rev


Index: python-repoze-who-testutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-who-testutil/F-11/python-repoze-who-testutil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-repoze-who-testutil.spec	10 Aug 2009 17:53:52 -0000	1.2
+++ python-repoze-who-testutil.spec	10 Aug 2009 17:54:20 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		python-repoze-who-testutil
 Version:	1.0
-Release:	0.2.%{rcver}%{?dist}
+Release:	0.3.%{rcver}%{?dist}
 Summary:	Test utilities for repoze.who-powered applications
 Group:		Development/Languages
 License:	BSD



From orion at fedoraproject.org  Mon Aug 10 17:54:42 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 17:54:42 +0000 (UTC)
Subject: rpms/R-lmtest/devel .cvsignore, 1.3, 1.4 R-lmtest.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090810175442.F158411C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-lmtest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5645

Modified Files:
	.cvsignore R-lmtest.spec sources 
Log Message:
* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> 0.9-6
- Update to 0.9-24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-lmtest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Feb 2009 18:01:34 -0000	1.3
+++ .cvsignore	10 Aug 2009 17:54:42 -0000	1.4
@@ -1 +1 @@
-lmtest_0.9-23.tar.gz
+lmtest_0.9-24.tar.gz


Index: R-lmtest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-lmtest/devel/R-lmtest.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-lmtest.spec	24 Jul 2009 16:12:35 -0000	1.4
+++ R-lmtest.spec	10 Aug 2009 17:54:42 -0000	1.5
@@ -1,11 +1,11 @@
 # This is the CRAN/Bioconductor name
 %define packname lmtest
 # Note that some R packages do not use packrel
-%define packrel 23
+%define packrel 24
 
 Name:             R-%{packname}
 Version:          0.9
-Release:          5%{?dist}
+Release:          6%{?dist}
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
 License:          GPLv2
 URL:              http://cran.r-project.org/web/packages/lmtest/index.html
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> 0.9-6
+- Update to 0.9-24
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-lmtest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Feb 2009 18:01:34 -0000	1.3
+++ sources	10 Aug 2009 17:54:42 -0000	1.4
@@ -1 +1 @@
-0b85c1660b177e0c1d94c07197f3e174  lmtest_0.9-23.tar.gz
+3a794dbb4e2dc738f62062d48ac30edb  lmtest_0.9-24.tar.gz



From silfreed at fedoraproject.org  Mon Aug 10 17:54:52 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Mon, 10 Aug 2009 17:54:52 +0000 (UTC)
Subject: rpms/pytrainer/F-10 .cvsignore, 1.5, 1.6 pytrainer.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090810175452.BAC6E11C0344@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/pytrainer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5812

Modified Files:
	.cvsignore pytrainer.spec sources 
Log Message:
* Mon Aug 10 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.8-1
- updating to 1.6.0.8
- Rotating log file support added
- Translations reviewed and added script to facilitate them
- Several improvements to Wordpress extension
- Changed potential problems when dealing with date objects using MySQL as DB
- Removing redundant calls improving graphical performance
- Optimizing xml files parsing when retrieving data from them



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Mar 2009 15:07:48 -0000	1.5
+++ .cvsignore	10 Aug 2009 17:54:52 -0000	1.6
@@ -1 +1 @@
-pytrainer-1.6.0.7.tar.gz
+pytrainer-1.6.0.8.tar.gz


Index: pytrainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-10/pytrainer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pytrainer.spec	31 Mar 2009 15:07:48 -0000	1.10
+++ pytrainer.spec	10 Aug 2009 17:54:52 -0000	1.11
@@ -3,15 +3,16 @@
 %define gecko_ver 1.9
 
 Name: pytrainer
-Version: 1.6.0.7
+Version: 1.6.0.8
 Release: 1%{?dist}
 Summary: A tool to log all your sport excursions
 
 Group: Development/Languages
 License: GPLv2+
-URL: http://pytrainer.e-oss.net/
-Source0: http://www.e-oss.net/descargas/pytrainer/%{name}-%{version}.tar.gz
+URL: https://sourceforge.net/projects/pytrainer/
+Source0: http://downloads.sourceforge.net/project/pytrainer/%{name}/PyTrainer%20%{version}/%{name}-%{version}.tar.gz
 Source1: pytrainer.sh
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -73,6 +74,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.8-1
+- updating to 1.6.0.8
+- Rotating log file support added
+- Translations reviewed and added script to facilitate them
+- Several improvements to Wordpress extension
+- Changed potential problems when dealing with date objects using MySQL as DB
+- Removing redundant calls improving graphical performance
+- Optimizing xml files parsing when retrieving data from them
+
 * Tue Mar 31 2009 Douglas E. Warner <silfreed at silfreed.net> 1.6.0.7-1
 - updating to 1.6.0.7
 - includes patch to use sqlite3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pytrainer/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Mar 2009 15:07:48 -0000	1.5
+++ sources	10 Aug 2009 17:54:52 -0000	1.6
@@ -1 +1 @@
-7b4fd27ee6191ae1e54336a5fc411e2b  pytrainer-1.6.0.7.tar.gz
+ccbf8e4acd89249e47a520a55f0af674  pytrainer-1.6.0.8.tar.gz



From ajax at fedoraproject.org  Mon Aug 10 17:55:50 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 10 Aug 2009 17:55:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel intel-2.8.0-lvds-first.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.20, 1.21
Message-ID: <20090810175550.06AE911C0344@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-serv6076

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.8.0-lvds-first.patch 
Log Message:
* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 2.8.0-5
- intel-2.8.0-lvds-first.patch: Put LVDS outputs first in the list in KMS to
  match old UMS behaviour.


intel-2.8.0-lvds-first.patch:
 drmmode_display.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE intel-2.8.0-lvds-first.patch ---
diff -up xf86-video-intel-2.8.0/src/drmmode_display.c.jx xf86-video-intel-2.8.0/src/drmmode_display.c
--- xf86-video-intel-2.8.0/src/drmmode_display.c.jx	2009-07-28 14:10:36.000000000 -0400
+++ xf86-video-intel-2.8.0/src/drmmode_display.c	2009-07-28 14:20:10.000000000 -0400
@@ -1131,7 +1131,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
 {
 	xf86CrtcConfigPtr   xf86_config;
 	drmmode_ptr drmmode;
-	int i;
+	int i, lvds = -1;
 
 	drmmode = xnfalloc(sizeof *drmmode);
 	drmmode->fd = fd;
@@ -1153,8 +1153,21 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
 		drmmode_crtc_init(pScrn, drmmode, i);
 
+        /* do LVDS first */
+        for (i = 0; i < drmmode->mode_res->count_connectors; i++) {
+                drmModeConnectorPtr koutput =
+                    drmModeGetConnector(drmmode->fd,
+                                        drmmode->mode_res->connectors[i]);
+                if (koutput->connector_type == DRM_MODE_CONNECTOR_LVDS) {
+                        drmmode_output_init(pScrn, drmmode, i);
+                        lvds = i;
+                }
+                drmModeFreeConnector(koutput);
+        }
+
 	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
-		drmmode_output_init(pScrn, drmmode, i);
+                if (i != lvds)
+		        drmmode_output_init(pScrn, drmmode, i);
 
 	xf86InitialConfiguration(pScrn, TRUE);
 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-drv-intel.spec	9 Aug 2009 00:53:25 -0000	1.20
+++ xorg-x11-drv-intel.spec	10 Aug 2009 17:55:49 -0000	1.21
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -28,6 +28,7 @@ Patch4: intel-abi-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
+Patch21: intel-2.8.0-lvds-first.patch
 
 Patch30: intel-chip-names.patch
 Patch40: dri2-page-flip.patch
@@ -82,6 +83,7 @@ Debugging tools for Intel graphics chips
 %patch3 -p1 -b .xext
 %patch4 -p1 -b .abi
 %patch20 -p1 -b .get-crtc
+%patch21 -p1 -b .lvds-first
 %patch30 -p1 -b .names
 %patch40 -p1 -b .flip
 
@@ -139,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 2.8.0-5
+- intel-2.8.0-lvds-first.patch: Put LVDS outputs first in the list in KMS to
+  match old UMS behaviour.
+
 * Fri Aug 7 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-4
 - Add dri2-page-flip.patch to enable full screen pageflipping.
   Fixes XKCD #619.



From orion at fedoraproject.org  Mon Aug 10 17:56:27 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 17:56:27 +0000 (UTC)
Subject: rpms/R-multcomp/devel .cvsignore, 1.10, 1.11 R-multcomp.spec, 1.15, 
	1.16 sources, 1.10, 1.11
Message-ID: <20090810175627.D7CB711C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6349

Modified Files:
	.cvsignore R-multcomp.spec sources 
Log Message:
* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
- Update to 1.1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Mar 2009 17:40:43 -0000	1.10
+++ .cvsignore	10 Aug 2009 17:56:27 -0000	1.11
@@ -1 +1 @@
-multcomp_1.0-7.tar.gz
+multcomp_1.1-1.tar.gz


Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- R-multcomp.spec	24 Jul 2009 16:13:32 -0000	1.15
+++ R-multcomp.spec	10 Aug 2009 17:56:27 -0000	1.16
@@ -1,10 +1,10 @@
 %define packname multcomp
-%define packrel  7
+%define packrel  1
 
 Summary:	Simultaneous inference for general linear hypotheses R Package
 Name:		R-%{packname}
-Version:	1.0
-Release:	6%{?dist}
+Version:	1.1
+Release:	1%{?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
+* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
+- Update to 1.1-1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Mar 2009 17:40:43 -0000	1.10
+++ sources	10 Aug 2009 17:56:27 -0000	1.11
@@ -1 +1 @@
-e333a277a6ecfa5415f6bb8d292c7015  multcomp_1.0-7.tar.gz
+3d89c1c5475f16e0ab08aee84dc6eb86  multcomp_1.1-1.tar.gz



From scop at fedoraproject.org  Mon Aug 10 17:59:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 17:59:29 +0000 (UTC)
Subject: rpms/fspy/devel .cvsignore, 1.2, 1.3 fspy.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20090810175929.A5F2711C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/fspy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7064

Modified Files:
	.cvsignore fspy.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.1.0-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fspy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jan 2009 21:28:10 -0000	1.2
+++ .cvsignore	10 Aug 2009 17:59:29 -0000	1.3
@@ -1 +1 @@
-fspy-0.1.0.tar.gz
+fspy-0.1.0.tar.bz2


Index: fspy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fspy/devel/fspy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fspy.spec	24 Jul 2009 23:15:26 -0000	1.4
+++ fspy.spec	10 Aug 2009 17:59:29 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           fspy
 Version:        0.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Filesystem activity monitoring utility
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://mytty.org/fspy/
-Source0:        http://mytty.org/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://mytty.org/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.1.0-6
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fspy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jan 2009 21:28:10 -0000	1.2
+++ sources	10 Aug 2009 17:59:29 -0000	1.3
@@ -1 +1 @@
-9af2d7b8231efdf5330016cdfc759d31  fspy-0.1.0.tar.gz
+76e4d57b6dd8773d6e5b4b597a85efd0  fspy-0.1.0.tar.bz2



From orion at fedoraproject.org  Mon Aug 10 18:00:11 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 18:00:11 +0000 (UTC)
Subject: rpms/R-systemfit/devel .cvsignore, 1.7, 1.8 R-systemfit.spec, 1.13, 
	1.14 sources, 1.8, 1.9
Message-ID: <20090810180011.994BD11C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-systemfit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435

Modified Files:
	.cvsignore R-systemfit.spec sources 
Log Message:
* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
- Update to 1.1-4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-systemfit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Mar 2009 17:19:45 -0000	1.7
+++ .cvsignore	10 Aug 2009 18:00:11 -0000	1.8
@@ -1 +1 @@
-systemfit_1.0-9.tar.gz
+systemfit_1.1-4.tar.gz


Index: R-systemfit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- R-systemfit.spec	24 Jul 2009 16:15:33 -0000	1.13
+++ R-systemfit.spec	10 Aug 2009 18:00:11 -0000	1.14
@@ -1,14 +1,14 @@
 %define packname systemfit
-%define packrel 9
+%define packrel 4
 
 Summary:        Simultaneous Equation Estimation R Package
 Name:		R-%{packname}
-Version:	1.0
-Release:	7%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 Source0:	http://r-forge.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
-URL:		http://www.systemfit.org/
+URL:		http://r-forge.r-project.org/projects/systemfit/
 BuildRequires:	R-devel, R-Matrix, R-car, R-lmtest, tex(latex)
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
+- Update to 1.1-4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-systemfit/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	10 Mar 2009 17:19:46 -0000	1.8
+++ sources	10 Aug 2009 18:00:11 -0000	1.9
@@ -1 +1 @@
-20f89d25df346d1191f3bb20d0d90e3b  systemfit_1.0-9.tar.gz
+774ed2acd96089a265951e80f43f848b  systemfit_1.1-4.tar.gz



From lmacken at fedoraproject.org  Mon Aug 10 18:00:52 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 18:00:52 +0000 (UTC)
Subject: rpms/python-repoze-who-testutil/F-10
	python-repoze-who-testutil-setuptools.patch, NONE,
	1.1 python-repoze-who-testutil.spec, 1.1, 1.2
Message-ID: <20090810180052.5536711C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-who-testutil/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7745

Modified Files:
	python-repoze-who-testutil.spec 
Added Files:
	python-repoze-who-testutil-setuptools.patch 
Log Message:
Patch the setup.py to use our own setuptools package

python-repoze-who-testutil-setuptools.patch:
 setup.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE python-repoze-who-testutil-setuptools.patch ---
--- setup.py.orig	2009-06-05 07:45:24.000000000 -0400
+++ setup.py	2009-06-05 07:45:28.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-testutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-who-testutil/F-10/python-repoze-who-testutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-who-testutil.spec	27 May 2009 15:39:53 -0000	1.1
+++ python-repoze-who-testutil.spec	10 Aug 2009 18:00:52 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:		python-repoze-who-testutil
 Version:	1.0
-Release:	0.2.%{rcver}%{?dist}
+Release:	0.3.%{rcver}%{?dist}
 Summary:	Test utilities for repoze.who-powered applications
 Group:		Development/Languages
 License:	BSD
 URL:		http://code.gustavonarea.net/repoze.who-testutil/
 Source0:	http://pypi.python.org/packages/source/r/repoze.who-testutil/repoze.who-testutil-%{version}%{rcver}.tar.gz
 Source1:	http://repoze.org/LICENSE.txt
+Patch0:     %{name}-setuptools.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
@@ -32,6 +34,7 @@ method changes.
 %prep
 %setup -q -n repoze.who-testutil-%{version}%{rcver}
 cp %{SOURCE1} .
+%patch0 -p0 -b .setuptools
 
 %build
 %{__python} setup.py build
@@ -53,6 +56,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.3.rc1
+- Patch the setup.py to use our own setuptools package
+
 * Wed May 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.2.rc1
 - include license copy
 



From behdad at fedoraproject.org  Mon Aug 10 18:01:48 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 18:01:48 +0000 (UTC)
Subject: rpms/pango/devel pango-1.25.1-cxx.patch, NONE, 1.1 pango.spec, 1.166,
	1.167 pango-1.25.1-no-hb-main.patch, 1.1, NONE
Message-ID: <20090810180148.9A6D611C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8636

Modified Files:
	pango.spec 
Added Files:
	pango-1.25.1-cxx.patch 
Removed Files:
	pango-1.25.1-no-hb-main.patch 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-3 
- Remove pango-1.25.1-no-hb-main.patch 
- Add pango-1.25.1-cxx.patch 
- Hopefully builds this time 


pango-1.25.1-cxx.patch:
 Makefile.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE pango-1.25.1-cxx.patch ---
diff -up pango-1.25.1/pango/opentype/Makefile.in.cxx pango-1.25.1/pango/opentype/Makefile.in
--- pango-1.25.1/pango/opentype/Makefile.in.cxx	2009-08-10 13:58:16.000000000 -0400
+++ pango-1.25.1/pango/opentype/Makefile.in	2009-08-10 13:57:47.000000000 -0400
@@ -105,7 +105,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = $(CC) -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align
+CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -264,6 +264,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
+
+# The following warning options are useful for debugging: -Wpadded -Wcast-align
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 noinst_LTLIBRARIES = libharfbuzz.la
 HBSOURCES = \
 	hb-blob.c \


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- pango.spec	10 Aug 2009 17:33:35 -0000	1.166
+++ pango.spec	10 Aug 2009 18:01:48 -0000	1.167
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -37,7 +37,7 @@ BuildRequires: gtk-doc
 
 # Look for pango.modules in an arch-specific directory
 Patch0: pango-1.21.4-lib64.patch
-Patch1: pango-1.25.1-no-hb-main.patch
+Patch1: pango-1.25.1-cxx.patch
 
 %description
 Pango is a library for laying out and rendering of text, with an emphasis
@@ -73,7 +73,7 @@ for the pango package.
 %setup -q -n pango-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .no-hb-main
+%patch1 -p1 -b .cxx
 
 %build
 
@@ -227,6 +227,11 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-3
+- Remove pango-1.25.1-no-hb-main.patch
+- Add pango-1.25.1-cxx.patch
+- Hopefully builds this time
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-2
 - Add pango-1.25.1-no-hb-main.patch to fix build on x86-64
 


--- pango-1.25.1-no-hb-main.patch DELETED ---



From adamwill at fedoraproject.org  Mon Aug 10 18:04:26 2009
From: adamwill at fedoraproject.org (Adam Williamson)
Date: Mon, 10 Aug 2009 18:04:26 +0000 (UTC)
Subject: rpms/congruity/F-10 .cvsignore, 1.2, 1.3 congruity.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090810180426.097CC11C0344@cvs1.fedora.phx.redhat.com>

Author: adamwill

Update of /cvs/pkgs/rpms/congruity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9125

Modified Files:
	.cvsignore congruity.spec sources 
Log Message:
- new release 13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jul 2009 02:41:08 -0000	1.2
+++ .cvsignore	10 Aug 2009 18:04:25 -0000	1.3
@@ -1 +1 @@
-congruity-12.tar.bz2
+congruity-13.tar.bz2


Index: congruity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/F-10/congruity.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- congruity.spec	15 Jul 2009 02:41:08 -0000	1.1
+++ congruity.spec	10 Aug 2009 18:04:25 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		congruity
-Version:	12
+Version:	13
 Release:	1%{?dist}
 Summary:	Application to program Logitech Harmony universal remote controls
 
@@ -53,6 +53,12 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Thu Aug 06 2009 Adam Williamson <awilliam at redhat.com> - 13-1
+- new release 13
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 18 2009 Adam Williamson <awilliam at redhat.com> - 12-1
 - new release 12
 - upstream now includes the .desktop file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jul 2009 02:41:08 -0000	1.2
+++ sources	10 Aug 2009 18:04:25 -0000	1.3
@@ -1 +1 @@
-f9bffabe843372a299dddda66576608a  congruity-12.tar.bz2
+39006bf88433c65224ea01e15b9a04df  congruity-13.tar.bz2



From lmacken at fedoraproject.org  Mon Aug 10 18:06:49 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 18:06:49 +0000 (UTC)
Subject: rpms/python-repoze-who-testutil/EL-5
	python-repoze-who-testutil-setuptools.patch, NONE,
	1.1 python-repoze-who-testutil.spec, 1.1, 1.2
Message-ID: <20090810180649.CD56711C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-who-testutil/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9686

Modified Files:
	python-repoze-who-testutil.spec 
Added Files:
	python-repoze-who-testutil-setuptools.patch 
Log Message:
Patch the setup.py to use our own setuptools package

python-repoze-who-testutil-setuptools.patch:
 setup.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE python-repoze-who-testutil-setuptools.patch ---
--- setup.py.orig	2009-06-05 07:45:24.000000000 -0400
+++ setup.py	2009-06-05 07:45:28.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-testutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-who-testutil/EL-5/python-repoze-who-testutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-who-testutil.spec	27 May 2009 15:39:53 -0000	1.1
+++ python-repoze-who-testutil.spec	10 Aug 2009 18:06:49 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:		python-repoze-who-testutil
 Version:	1.0
-Release:	0.2.%{rcver}%{?dist}
+Release:	0.3.%{rcver}%{?dist}
 Summary:	Test utilities for repoze.who-powered applications
 Group:		Development/Languages
 License:	BSD
 URL:		http://code.gustavonarea.net/repoze.who-testutil/
 Source0:	http://pypi.python.org/packages/source/r/repoze.who-testutil/repoze.who-testutil-%{version}%{rcver}.tar.gz
 Source1:	http://repoze.org/LICENSE.txt
+Patch0:     %{name}-setuptools.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
@@ -32,6 +34,7 @@ method changes.
 %prep
 %setup -q -n repoze.who-testutil-%{version}%{rcver}
 cp %{SOURCE1} .
+%patch0 -p0 -b .setuptools
 
 %build
 %{__python} setup.py build
@@ -53,6 +56,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.3.rc1
+- Patch the setup.py to use our own setuptools package
+
 * Wed May 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.2.rc1
 - include license copy
 



From adamwill at fedoraproject.org  Mon Aug 10 18:07:03 2009
From: adamwill at fedoraproject.org (Adam Williamson)
Date: Mon, 10 Aug 2009 18:07:03 +0000 (UTC)
Subject: rpms/congruity/F-11 .cvsignore, 1.2, 1.3 congruity.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090810180703.B423411C0344@cvs1.fedora.phx.redhat.com>

Author: adamwill

Update of /cvs/pkgs/rpms/congruity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9799

Modified Files:
	.cvsignore congruity.spec sources 
Log Message:
- new release 13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jul 2009 02:43:11 -0000	1.2
+++ .cvsignore	10 Aug 2009 18:07:03 -0000	1.3
@@ -1 +1 @@
-congruity-12.tar.bz2
+congruity-13.tar.bz2


Index: congruity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/F-11/congruity.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- congruity.spec	15 Jul 2009 02:43:11 -0000	1.1
+++ congruity.spec	10 Aug 2009 18:07:03 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		congruity
-Version:	12
+Version:	13
 Release:	1%{?dist}
 Summary:	Application to program Logitech Harmony universal remote controls
 
@@ -53,6 +53,12 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Thu Aug 06 2009 Adam Williamson <awilliam at redhat.com> - 13-1
+- new release 13
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 18 2009 Adam Williamson <awilliam at redhat.com> - 12-1
 - new release 12
 - upstream now includes the .desktop file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/congruity/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jul 2009 02:43:11 -0000	1.2
+++ sources	10 Aug 2009 18:07:03 -0000	1.3
@@ -1 +1 @@
-f9bffabe843372a299dddda66576608a  congruity-12.tar.bz2
+39006bf88433c65224ea01e15b9a04df  congruity-13.tar.bz2



From orion at fedoraproject.org  Mon Aug 10 18:09:20 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 18:09:20 +0000 (UTC)
Subject: rpms/R-multcomp/devel R-multcomp.spec,1.16,1.17
Message-ID: <20090810180920.4FE4C11C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10215

Modified Files:
	R-multcomp.spec 
Log Message:
svn commit temp file no longer in tarball



Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- R-multcomp.spec	10 Aug 2009 17:56:27 -0000	1.16
+++ R-multcomp.spec	10 Aug 2009 18:09:20 -0000	1.17
@@ -27,7 +27,6 @@ linear, generalized linear, linear mixed
 
 %prep
 %setup -q -c -n %{packname}
-rm multcomp/inst/svn-commit.tmp
 
 
 %build



From mschwendt at fedoraproject.org  Mon Aug 10 18:13:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 10 Aug 2009 18:13:26 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.28,1.29
Message-ID: <20090810181326.59AEF11C0344@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11032

Modified Files:
	rc-modified 
Log Message:
openSUSE repo metadata contains dependency rpm:entry tags without an epoch attribute, so we need to assume either no Epoch or Epoch 0 - and for that the 'else' is missing here


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rc-modified	10 Jul 2009 18:01:26 -0000	1.28
+++ rc-modified	10 Aug 2009 18:13:25 -0000	1.29
@@ -94,6 +94,8 @@
         val = ''
         if e is not None:
             val = '%s:%s' % (e, v)
+        else:
+            val = '%s' % v
     
         if r is not None:
             val = '%s-%s' % (val, r)



From orion at fedoraproject.org  Mon Aug 10 18:16:29 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 18:16:29 +0000 (UTC)
Subject: rpms/R-multcomp/devel R-multcomp.spec,1.17,1.18
Message-ID: <20090810181629.5F1C011C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11567

Modified Files:
	R-multcomp.spec 
Log Message:
Ships NEWS file



Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- R-multcomp.spec	10 Aug 2009 18:09:20 -0000	1.17
+++ R-multcomp.spec	10 Aug 2009 18:16:29 -0000	1.18
@@ -71,6 +71,7 @@ rm -rf %{buildroot}
 %doc %{_datadir}/R/library/%{packname}/CHANGES 
 %doc %{_datadir}/R/library/%{packname}/CITATION 
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION 
+%doc %{_datadir}/R/library/%{packname}/NEWS 
 %{_datadir}/R/library/%{packname}/CONTENTS
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE



From scop at fedoraproject.org  Mon Aug 10 18:16:49 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 18:16:49 +0000 (UTC)
Subject: rpms/gajim/devel .cvsignore, 1.15, 1.16 gajim.spec, 1.34,
	1.35 sources, 1.15, 1.16
Message-ID: <20090810181649.7849911C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gajim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11745

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.12.3-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Jul 2009 04:29:02 -0000	1.15
+++ .cvsignore	10 Aug 2009 18:16:49 -0000	1.16
@@ -1 +1 @@
-gajim-0.12.3.tar.gz
+gajim-0.12.3.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gajim.spec	24 Jul 2009 23:26:19 -0000	1.34
+++ gajim.spec	10 Aug 2009 18:16:49 -0000	1.35
@@ -3,11 +3,11 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 Version:	0.12.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.12.3-3
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Jul 2009 04:29:02 -0000	1.15
+++ sources	10 Aug 2009 18:16:49 -0000	1.16
@@ -1 +1 @@
-088ebbcd8cb4242452831bee5de70639  gajim-0.12.3.tar.gz
+fe799c0645b8f021dc2cb147ae144156  gajim-0.12.3.tar.bz2



From dwalsh at fedoraproject.org  Mon Aug 10 18:22:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 10 Aug 2009 18:22:11 +0000 (UTC)
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.49,
	1.50 modules-minimum.conf, 1.25, 1.26 modules-mls.conf, 1.56,
	1.57 modules-targeted.conf, 1.134, 1.135 policy-F12.patch, 1.48,
	1.49 selinux-policy.spec, 1.893, 1.894
Message-ID: <20090810182211.8A62211C0344@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12737

Modified Files:
	booleans-targeted.conf modules-minimum.conf modules-mls.conf 
	modules-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-9
- Add kdump policy for Miroslav Grepl
- Turn off execstack boolean



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- booleans-targeted.conf	7 Aug 2009 19:36:54 -0000	1.49
+++ booleans-targeted.conf	10 Aug 2009 18:22:10 -0000	1.50
@@ -8,7 +8,7 @@ allow_execmod = false
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = true
+allow_execstack = false
 
 # Allow ftpd to read cifs directories.
 # 


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- modules-minimum.conf	30 Jul 2009 04:09:13 -0000	1.25
+++ modules-minimum.conf	10 Aug 2009 18:22:10 -0000	1.26
@@ -671,6 +671,20 @@ jabber = module
 # 
 java = module
 
+# Layer: system
+# Module: kdump
+#
+# kdump is kernel crash dumping mechanism
+# 
+kdump = module
+
+# Layer: apps
+# Module: kdumpgui
+#
+# system-config-kdump policy
+# 
+kdumpgui = module
+
 # Layer: services
 # Module: kerberos
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- modules-mls.conf	30 Jul 2009 04:09:13 -0000	1.56
+++ modules-mls.conf	10 Aug 2009 18:22:10 -0000	1.57
@@ -650,6 +650,20 @@ jabber = module
 # 
 java = module
 
+# Layer: system
+# Module: kdump
+#
+# kdump is kernel crash dumping mechanism
+# 
+kdump = module
+
+# Layer: apps
+# Module: kdumpgui
+#
+# system-config-kdump policy
+# 
+kdumpgui = module
+
 # Layer: services
 # Module: kerberos
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- modules-targeted.conf	30 Jul 2009 04:09:13 -0000	1.134
+++ modules-targeted.conf	10 Aug 2009 18:22:10 -0000	1.135
@@ -671,6 +671,20 @@ jabber = module
 # 
 java = module
 
+# Layer: system
+# Module: kdump
+#
+# kdump is kernel crash dumping mechanism
+# 
+kdump = module
+
+# Layer: apps
+# Module: kdumpgui
+#
+# system-config-kdump policy
+# 
+kdumpgui = module
+
 # Layer: services
 # Module: kerberos
 #

policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    3 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   61 
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   21 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   28 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    5 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   20 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/terminal.fc                  |    1 
 policy/modules/kernel/terminal.if                  |   40 
 policy/modules/roles/guest.te                      |    8 
 policy/modules/roles/staff.te                      |  123 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |   11 
 policy/modules/services/cups.te                    |   23 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   25 
 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               |   53 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   45 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   46 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   22 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   80 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  108 +
 policy/modules/services/virt.te                    |  264 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  171 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   77 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1303 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 300 files changed, 13187 insertions(+), 2602 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- policy-F12.patch	7 Aug 2009 11:51:54 -0000	1.48
+++ policy-F12.patch	10 Aug 2009 18:22:10 -0000	1.49
@@ -1922,6 +1922,86 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.fc serefpolicy-3.6.26/policy/modules/apps/kdumpgui.fc
+--- nsaserefpolicy/policy/modules/apps/kdumpgui.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/apps/kdumpgui.fc	2009-08-10 09:44:30.000000000 -0400
+@@ -0,0 +1,2 @@
++
++/usr/share/system-config-kdump/system-config-kdump-backend.py -- gen_context(system_u:object_r:kdumpgui_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.if serefpolicy-3.6.26/policy/modules/apps/kdumpgui.if
+--- nsaserefpolicy/policy/modules/apps/kdumpgui.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/apps/kdumpgui.if	2009-08-10 09:44:30.000000000 -0400
+@@ -0,0 +1,2 @@
++## <summary>system-config-kdump policy</summary>
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.te serefpolicy-3.6.26/policy/modules/apps/kdumpgui.te
+--- nsaserefpolicy/policy/modules/apps/kdumpgui.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/apps/kdumpgui.te	2009-08-10 09:44:30.000000000 -0400
+@@ -0,0 +1,64 @@
++policy_module(kdumpgui,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type kdumpgui_t;
++type kdumpgui_exec_t;
++
++dbus_system_domain(kdumpgui_t, kdumpgui_exec_t)
++
++######################################
++#
++# system-config-kdump local policy
++#
++
++allow kdumpgui_t self:capability { net_admin sys_rawio };
++allow kdumpgui_t self:fifo_file rw_fifo_file_perms;
++
++allow kdumpgui_t self:netlink_kobject_uevent_socket create_socket_perms;
++
++kdump_manage_etc(kdumpgui_t)
++kdump_domtrans(kdumpgui_t)
++kdump_initrc_domtrans(kdumpgui_t)
++
++corecmd_exec_bin(kdumpgui_t)
++corecmd_exec_shell(kdumpgui_t)
++consoletype_exec(kdumpgui_t)
++
++kernel_read_system_state(kdumpgui_t)
++kernel_read_network_state(kdumpgui_t)
++
++storage_raw_read_fixed_disk(kdumpgui_t)
++storage_raw_write_fixed_disk(kdumpgui_t)
++
++dev_dontaudit_getattr_all_chr_files(kdumpgui_t)
++dev_read_sysfs(kdumpgui_t)
++
++# for blkid.tab
++files_manage_etc_runtime_files(kdumpgui_t)
++files_etc_filetrans_etc_runtime(kdumpgui_t, file)
++
++files_manage_boot_files(kdumpgui_t)
++files_manage_boot_symlinks(kdumpgui_t)
++# Needed for running chkconfig
++files_manage_etc_symlinks(kdumpgui_t)
++
++auth_use_nsswitch(kdumpgui_t)
++
++miscfiles_read_localization(kdumpgui_t)
++
++dontaudit_init_read_all_script_files(kdumpgui_t)
++
++optional_policy(`
++        dev_rw_lvm_control(kdumpgui_t)
++')
++
++optional_policy(`
++        policykit_dbus_chat(kdumpgui_t)
++')
++
++permissive kdumpgui_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.6.26/policy/modules/apps/livecd.fc
 --- nsaserefpolicy/policy/modules/apps/livecd.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.26/policy/modules/apps/livecd.fc	2009-07-30 15:33:08.000000000 -0400
@@ -4362,7 +4442,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.26/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-03 06:30:19.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-10 10:05:44.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -4944,7 +5024,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.26/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/files.if	2009-08-05 17:20:50.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/files.if	2009-08-10 11:51:27.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5374,7 +5454,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.26/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if	2009-08-07 07:36:43.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if	2009-08-10 11:43:18.000000000 -0400
 @@ -1807,7 +1807,7 @@
  	')
  
@@ -5880,7 +5960,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.26/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/roles/sysadm.te	2009-08-06 07:59:15.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/roles/sysadm.te	2009-08-10 10:28:13.000000000 -0400
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -5890,7 +5970,15 @@ diff -b -B --ignore-all-space --exclude-
  
  ifndef(`enable_mls',`
  	userdom_security_admin_template(sysadm_t, sysadm_r)
-@@ -70,7 +70,6 @@
+@@ -35,6 +35,7 @@
+ ubac_fd_exempt(sysadm_t)
+ 
+ init_exec(sysadm_t)
++init_exec_script_files(sysadm_t)
+ 
+ # Add/remove user home directories
+ userdom_manage_user_home_dirs(sysadm_t)
+@@ -70,7 +71,6 @@
  	apache_run_helper(sysadm_t, sysadm_r)
  	#apache_run_all_scripts(sysadm_t, sysadm_r)
  	#apache_domtrans_sys_script(sysadm_t)
@@ -5898,7 +5986,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -87,10 +86,6 @@
+@@ -87,10 +87,6 @@
  ')
  
  optional_policy(`
@@ -5909,7 +5997,7 @@ diff -b -B --ignore-all-space --exclude-
  	backup_run(sysadm_t, sysadm_r)
  ')
  
-@@ -99,18 +94,10 @@
+@@ -99,18 +95,10 @@
  ')
  
  optional_policy(`
@@ -5928,7 +6016,7 @@ diff -b -B --ignore-all-space --exclude-
  	certwatch_run(sysadm_t, sysadm_r)
  ')
  
-@@ -127,7 +114,7 @@
+@@ -127,7 +115,7 @@
  ')
  
  optional_policy(`
@@ -5937,7 +6025,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -135,10 +122,6 @@
+@@ -135,10 +123,6 @@
  ')
  
  optional_policy(`
@@ -5948,7 +6036,7 @@ diff -b -B --ignore-all-space --exclude-
  	dcc_run_cdcc(sysadm_t, sysadm_r)
  	dcc_run_client(sysadm_t, sysadm_r)
  	dcc_run_dbclean(sysadm_t, sysadm_r)
-@@ -166,10 +149,6 @@
+@@ -166,10 +150,6 @@
  ')
  
  optional_policy(`
@@ -5959,7 +6047,7 @@ diff -b -B --ignore-all-space --exclude-
  	firstboot_run(sysadm_t, sysadm_r)
  ')
  
-@@ -178,22 +157,6 @@
+@@ -178,22 +158,6 @@
  ')
  
  optional_policy(`
@@ -5982,7 +6070,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_run(sysadm_t, sysadm_r)
  ')
  
-@@ -205,6 +168,8 @@
+@@ -205,6 +169,8 @@
  	ipsec_stream_connect(sysadm_t)
  	# for lsof
  	ipsec_getattr_key_sockets(sysadm_t)
@@ -5991,7 +6079,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,11 +177,7 @@
+@@ -212,11 +178,7 @@
  ')
  
  optional_policy(`
@@ -6004,7 +6092,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -228,10 +189,6 @@
+@@ -228,10 +190,6 @@
  ')
  
  optional_policy(`
@@ -6015,7 +6103,7 @@ diff -b -B --ignore-all-space --exclude-
  	logrotate_run(sysadm_t, sysadm_r)
  ')
  
-@@ -255,14 +212,6 @@
+@@ -255,14 +213,6 @@
  ')
  
  optional_policy(`
@@ -6030,7 +6118,7 @@ diff -b -B --ignore-all-space --exclude-
  	mta_role(sysadm_r, sysadm_t)
  ')
  
-@@ -290,11 +239,6 @@
+@@ -290,11 +240,6 @@
  ')
  
  optional_policy(`
@@ -6042,7 +6130,7 @@ diff -b -B --ignore-all-space --exclude-
  	pcmcia_run_cardctl(sysadm_t, sysadm_r)
  ')
  
-@@ -308,7 +252,7 @@
+@@ -308,7 +253,7 @@
  ')
  
  optional_policy(`
@@ -6051,7 +6139,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -320,10 +264,6 @@
+@@ -320,10 +265,6 @@
  ')
  
  optional_policy(`
@@ -6062,7 +6150,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
-@@ -332,10 +272,6 @@
+@@ -332,10 +273,6 @@
  ')
  
  optional_policy(`
@@ -6073,7 +6161,7 @@ diff -b -B --ignore-all-space --exclude-
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +281,6 @@
+@@ -345,10 +282,6 @@
  ')
  
  optional_policy(`
@@ -6084,7 +6172,7 @@ diff -b -B --ignore-all-space --exclude-
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +290,15 @@
+@@ -358,35 +291,15 @@
  ')
  
  optional_policy(`
@@ -6120,7 +6208,7 @@ diff -b -B --ignore-all-space --exclude-
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +306,10 @@
+@@ -394,18 +307,10 @@
  ')
  
  optional_policy(`
@@ -6139,7 +6227,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,17 +322,13 @@
+@@ -418,17 +323,13 @@
  ')
  
  optional_policy(`
@@ -6158,7 +6246,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -440,13 +340,12 @@
+@@ -440,13 +341,12 @@
  ')
  
  optional_policy(`
@@ -7578,7 +7666,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.26/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/apache.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/apache.if	2009-08-10 10:52:44.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8967,7 +9055,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.if serefpolicy-3.6.26/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/consolekit.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/consolekit.if	2009-08-10 13:11:45.000000000 -0400
 @@ -57,3 +57,23 @@
  	read_files_pattern($1, consolekit_log_t, consolekit_log_t)
  	files_search_pids($1)
@@ -9786,19 +9874,23 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.26/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/cups.fc	2009-08-07 07:43:48.000000000 -0400
-@@ -13,7 +13,9 @@
++++ serefpolicy-3.6.26/policy/modules/services/cups.fc	2009-08-10 13:19:57.000000000 -0400
+@@ -13,10 +13,14 @@
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
  
--/etc/hp(/.*)?			gen_context(system_u:object_r:hplip_etc_t,s0)
 +/etc/cups/interfaces(/.*)?	gen_context(system_u:object_r:cupsd_interface_t,s0)
 +
-+/etc/hp(/.*)?			gen_context(system_u:object_r:hplip_var_lib_t,s0)
+ /etc/hp(/.*)?			gen_context(system_u:object_r:hplip_etc_t,s0)
  
  /etc/printcap.* 	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
-@@ -52,6 +54,8 @@
++/lib/udev/udev-configure-printer --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
++
+ /opt/gutenprint/ppds(/.*)? 	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ 
+ /usr/bin/cups-config-daemon --	gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+@@ -52,6 +56,8 @@
  /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  
@@ -9807,7 +9899,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
  /var/log/turboprint.*		gen_context(system_u:object_r:cupsd_log_t,s0)
  
-@@ -62,3 +67,8 @@
+@@ -62,3 +69,8 @@
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/run/ptal-mlcd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
  /var/turboprint(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
@@ -9818,7 +9910,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.26/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/cups.te	2009-08-07 07:43:13.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/cups.te	2009-08-10 13:25:05.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -9829,23 +9921,24 @@ diff -b -B --ignore-all-space --exclude-
  type cupsd_rw_etc_t;
  files_config_file(cupsd_rw_etc_t)
  
-@@ -64,12 +67,12 @@
+@@ -64,11 +67,14 @@
  # For CUPS to run as a backend
  cups_backend(hplip_t, hplip_exec_t)
  
--type hplip_etc_t;
--files_config_file(hplip_etc_t)
--
- type hplip_tmp_t;
- files_tmp_file(hplip_tmp_t)
++type hplip_tmp_t;
++files_tmp_file(hplip_tmp_t)
++
+ type hplip_etc_t;
+ files_config_file(hplip_etc_t)
  
-+type hplip_var_lib_t alias hplip_etc_t;
+-type hplip_tmp_t;
+-files_tmp_file(hplip_tmp_t)
++type hplip_var_lib_t;
 +files_type(hplip_var_lib_t)
-+
+ 
  type hplip_var_run_t;
  files_pid_file(hplip_var_run_t)
- 
-@@ -116,6 +119,9 @@
+@@ -116,6 +122,9 @@
  read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t)
  files_search_etc(cupsd_t)
  
@@ -9855,16 +9948,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
-@@ -146,7 +152,7 @@
- 
- allow cupsd_t hplip_t:process { signal sigkill };
- 
--read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
-+read_files_pattern(cupsd_t, hplip_var_lib_t, hplip_var_lib_t)
- 
- allow cupsd_t hplip_var_run_t:file read_file_perms;
- 
-@@ -250,6 +256,7 @@
+@@ -250,6 +259,7 @@
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
  miscfiles_read_fonts(cupsd_t)
@@ -9872,16 +9956,7 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
-@@ -360,7 +367,7 @@
- 
- domtrans_pattern(cupsd_config_t, hplip_exec_t, hplip_t)
- 
--read_files_pattern(cupsd_config_t, hplip_etc_t, hplip_etc_t)
-+read_files_pattern(cupsd_config_t, hplip_var_lib_t, hplip_var_lib_t)
- 
- kernel_read_system_state(cupsd_config_t)
- kernel_read_all_sysctls(cupsd_config_t)
-@@ -419,6 +426,10 @@
+@@ -419,6 +429,10 @@
  ')
  
  optional_policy(`
@@ -9892,7 +9967,7 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
  ')
  
-@@ -542,6 +553,8 @@
+@@ -542,6 +556,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 })
  
@@ -9901,19 +9976,16 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -596,9 +609,9 @@
- 
- cups_stream_connect(hplip_t)
- 
--allow hplip_t hplip_etc_t:dir list_dir_perms;
--read_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
--read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
-+allow hplip_t hplip_var_lib_t:dir list_dir_perms;
-+read_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
-+read_lnk_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
+@@ -601,6 +617,9 @@
+ read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
++manage_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
++manage_lnk_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
++
  manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
+ files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.26/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/cvs.te	2009-07-30 15:33:08.000000000 -0400
@@ -10185,7 +10257,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.26/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-07 07:49:12.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-10 11:51:36.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)
@@ -10215,20 +10287,26 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(devicekit_disk_t, devicekit_tmp_t, devicekit_tmp_t)
  manage_files_pattern(devicekit_disk_t, devicekit_tmp_t, devicekit_tmp_t)
-@@ -72,6 +78,7 @@
+@@ -71,7 +77,9 @@
+ manage_files_pattern(devicekit_disk_t, devicekit_var_lib_t, devicekit_var_lib_t)
  files_var_lib_filetrans(devicekit_disk_t, devicekit_var_lib_t, dir)
  
++kernel_read_fs_sysctls(devicekit_disk_t)
  kernel_read_software_raid_state(devicekit_disk_t)
 +kernel_read_system_state(devicekit_disk_t)
  kernel_setsched(devicekit_disk_t)
  
  corecmd_exec_bin(devicekit_disk_t)
-@@ -79,21 +86,26 @@
+@@ -79,21 +87,30 @@
  dev_rw_sysfs(devicekit_disk_t)
  dev_read_urand(devicekit_disk_t)
  dev_getattr_usbfs_dirs(devicekit_disk_t)
 +dev_manage_generic_files(devicekit_disk_t)
  
++domain_read_all_domains_state(devicekit_disk_t)
++
++files_getattr_all_mountpoints(devicekit_disk_t)
++files_getattr_all_files(devicekit_disk_t)
  files_manage_mnt_dirs(devicekit_disk_t)
  files_read_etc_files(devicekit_disk_t)
  files_read_etc_runtime_files(devicekit_disk_t)
@@ -10251,7 +10329,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(devicekit_disk_t)
  
  miscfiles_read_localization(devicekit_disk_t)
-@@ -110,6 +122,7 @@
+@@ -110,6 +127,7 @@
  ')
  
  optional_policy(`
@@ -10259,7 +10337,7 @@ 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 +147,28 @@
+@@ -134,14 +152,28 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
@@ -10289,7 +10367,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 +178,7 @@
+@@ -151,6 +183,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -10297,7 +10375,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +187,7 @@
+@@ -159,6 +192,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -10305,7 +10383,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,6 +196,8 @@
+@@ -167,6 +201,8 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -10314,7 +10392,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_all_terms(devicekit_power_t)
  
  auth_use_nsswitch(devicekit_power_t)
-@@ -180,8 +211,11 @@
+@@ -180,8 +216,11 @@
  ')
  
  optional_policy(`
@@ -10327,7 +10405,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +237,23 @@
+@@ -203,17 +242,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -11677,7 +11755,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.26/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/networkmanager.te	2009-08-05 08:04:33.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/networkmanager.te	2009-08-10 11:32:36.000000000 -0400
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -12734,7 +12812,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.26/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-07 06:11:40.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-10 10:24:17.000000000 -0400
 @@ -38,9 +38,10 @@
  
  allow policykit_t self:capability { setgid setuid };
@@ -12748,7 +12826,7 @@ diff -b -B --ignore-all-space --exclude-
  
  policykit_domtrans_auth(policykit_t)
  
-@@ -62,14 +63,25 @@
+@@ -62,13 +63,25 @@
  files_read_etc_files(policykit_t)
  files_read_usr_files(policykit_t)
  
@@ -12762,7 +12840,8 @@ diff -b -B --ignore-all-space --exclude-
  
 +userdom_getattr_all_users(policykit_t)
  userdom_read_all_users_state(policykit_t)
- 
++userdom_dontaudit_search_admin_dir(policykit_t)
++
 +optional_policy(`
 +	dbus_system_domain(policykit_t, policykit_exec_t)
 +
@@ -12770,11 +12849,10 @@ diff -b -B --ignore-all-space --exclude-
 +		consolekit_dbus_chat(policykit_t)
 +	')
 +')
-+
+ 
  ########################################
  #
- # polkit_auth local policy
-@@ -77,12 +89,15 @@
+@@ -77,12 +90,15 @@
  
  allow policykit_auth_t self:capability setgid;
  allow policykit_auth_t self:process getattr;
@@ -12792,7 +12870,7 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -95,7 +110,10 @@
+@@ -95,7 +111,10 @@
  files_read_etc_files(policykit_auth_t)
  files_read_usr_files(policykit_auth_t)
  
@@ -12803,7 +12881,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(policykit_auth_t)
  
-@@ -104,6 +122,7 @@
+@@ -104,6 +123,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -12811,7 +12889,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -116,6 +135,13 @@
+@@ -116,6 +136,13 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -12825,7 +12903,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -123,7 +149,8 @@
+@@ -123,7 +150,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -12835,7 +12913,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;
  
-@@ -153,9 +180,12 @@
+@@ -153,9 +181,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -12849,7 +12927,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -167,7 +197,8 @@
+@@ -167,7 +198,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -19231,7 +19309,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.if serefpolicy-3.6.26/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/init.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/init.if	2009-08-10 10:27:53.000000000 -0400
 @@ -174,6 +174,7 @@
  	role system_r types $1;
  
@@ -19318,7 +19396,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -646,19 +679,39 @@
+@@ -646,23 +679,43 @@
  #
  interface(`init_domtrans_script',`
  	gen_require(`
@@ -19339,11 +19417,11 @@ diff -b -B --ignore-all-space --exclude-
  	ifdef(`enable_mls',`
 -		range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
 +		range_transition $1 init_script_file_type:process s0 - mls_systemhigh;
-+	')
-+')
-+
-+########################################
-+## <summary>
+ 	')
+ ')
+ 
+ ########################################
+ ## <summary>
 +##	Execute a file in a bin directory
 +##	in the initrc_t domain 
 +## </summary>
@@ -19356,13 +19434,42 @@ diff -b -B --ignore-all-space --exclude-
 +interface(`init_bin_domtrans_spec',`
 +	gen_require(`
 +		type initrc_t;
- 	')
++	')
 +
 +	corecmd_bin_domtrans($1, initrc_t)
++')
++
++########################################
++## <summary>
+ ##	Execute a init script in a specified domain.
+ ## </summary>
+ ## <desc>
+@@ -904,6 +957,24 @@
+ 	allow $1 init_script_file_type:file read_file_perms;
  ')
  
++#######################################
++## <summary>
++##      Dontaudit read all init script files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`dontaudit_init_read_all_script_files',`
++        gen_require(`
++                attribute init_script_file_type;
++        ')
++
++        dontaudit $1 init_script_file_type:file read_file_perms;
++')
++
  ########################################
-@@ -1291,6 +1344,25 @@
+ ## <summary>
+ ##	Execute all init scripts in the caller domain.
+@@ -1291,6 +1362,25 @@
  
  ########################################
  ## <summary>
@@ -19388,7 +19495,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create files in a init script
  ##	temporary data directory.
  ## </summary>
-@@ -1521,3 +1593,51 @@
+@@ -1521,3 +1611,51 @@
  	')
  	corenet_udp_recvfrom_labeled($1, daemon)
  ')
@@ -19442,7 +19549,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.26/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-07-30 09:44:08.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-05 07:18:15.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-10 13:12:20.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -19490,7 +19597,15 @@ diff -b -B --ignore-all-space --exclude-
  
  # For /var/run/shutdown.pid.
  allow init_t init_var_run_t:file manage_file_perms;
-@@ -167,6 +182,8 @@
+@@ -140,6 +155,7 @@
+ files_dontaudit_rw_root_files(init_t)
+ files_dontaudit_rw_root_chr_files(init_t)
+ 
++fs_list_inotifyfs(init_t)
+ # cjp: this may be related to /dev/log
+ fs_write_ramfs_sockets(init_t)
+ 
+@@ -167,6 +183,8 @@
  
  miscfiles_read_localization(init_t)
  
@@ -19499,10 +19614,14 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_gentoo',`
  	allow init_t self:process { getcap setcap };
  ')
-@@ -189,6 +206,14 @@
+@@ -189,6 +207,18 @@
  ')
  
  optional_policy(`
++	consolekit_read_log(init_t)
++')
++
++optional_policy(`
 +	# /var/run/dovecot/login/ssl-parameters.dat is a hard link to
 +	# /var/lib/dovecot/ssl-parameters.dat and init tries to clean up
 +	# the directory. But we do not want to allow this.
@@ -19514,7 +19633,7 @@ diff -b -B --ignore-all-space --exclude-
  	nscd_socket_use(init_t)
  ')
  
-@@ -202,9 +227,10 @@
+@@ -202,9 +232,10 @@
  #
  
  allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
@@ -19526,7 +19645,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow IPC with self
  allow initrc_t self:unix_dgram_socket create_socket_perms;
-@@ -217,7 +243,8 @@
+@@ -217,7 +248,8 @@
  term_create_pty(initrc_t, initrc_devpts_t)
  
  # Going to single user mode
@@ -19536,7 +19655,7 @@ diff -b -B --ignore-all-space --exclude-
  
  can_exec(initrc_t, init_script_file_type)
  
-@@ -230,10 +257,16 @@
+@@ -230,10 +262,16 @@
  
  allow initrc_t initrc_var_run_t:file manage_file_perms;
  files_pid_filetrans(initrc_t, initrc_var_run_t, file)
@@ -19555,7 +19674,7 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_filetrans(initrc_t, initrc_tmp_t, { file dir })
  
  init_write_initctl(initrc_t)
-@@ -249,8 +282,12 @@
+@@ -249,8 +287,12 @@
  kernel_rw_all_sysctls(initrc_t)
  # for lsof which is used by alsa shutdown:
  kernel_dontaudit_getattr_message_if(initrc_t)
@@ -19568,7 +19687,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
-@@ -270,17 +307,22 @@
+@@ -270,17 +312,22 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -19592,7 +19711,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_register_binary_executable_type(initrc_t)
  # rhgb-console writes to ramfs
  fs_write_ramfs_pipes(initrc_t)
-@@ -328,7 +370,7 @@
+@@ -328,7 +375,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -19601,7 +19720,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:
-@@ -343,14 +385,15 @@
+@@ -343,14 +390,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -19619,7 +19738,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)
-@@ -366,7 +409,9 @@
+@@ -366,7 +414,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -19629,7 +19748,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)
-@@ -423,8 +468,6 @@
+@@ -423,8 +473,6 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -19638,7 +19757,7 @@ 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)
-@@ -451,11 +494,9 @@
+@@ -451,11 +499,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -19651,7 +19770,7 @@ diff -b -B --ignore-all-space --exclude-
  	# These seem to be from the initrd
  	# during device initialization:
  	dev_create_generic_dirs(initrc_t)
-@@ -465,6 +506,7 @@
+@@ -465,6 +511,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -19659,7 +19778,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
-@@ -498,6 +540,7 @@
+@@ -498,6 +545,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -19667,7 +19786,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -516,6 +559,33 @@
+@@ -516,6 +564,33 @@
  	')
  ')
  
@@ -19701,7 +19820,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +640,10 @@
+@@ -570,6 +645,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -19712,7 +19831,7 @@ diff -b -B --ignore-all-space --exclude-
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +665,10 @@
+@@ -591,6 +670,10 @@
  ')
  
  optional_policy(`
@@ -19723,7 +19842,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,20 +725,20 @@
+@@ -647,20 +730,20 @@
  ')
  
  optional_policy(`
@@ -19750,7 +19869,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -669,6 +747,7 @@
+@@ -669,6 +752,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -19758,7 +19877,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -697,7 +776,6 @@
+@@ -697,7 +781,6 @@
  ')
  
  optional_policy(`
@@ -19766,7 +19885,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -719,8 +797,6 @@
+@@ -719,8 +802,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -19775,7 +19894,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -733,10 +809,12 @@
+@@ -733,10 +814,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -19788,7 +19907,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +832,11 @@
+@@ -754,6 +837,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -19800,7 +19919,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -765,6 +848,13 @@
+@@ -765,6 +853,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -19814,7 +19933,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -790,3 +880,31 @@
+@@ -790,3 +885,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -20104,9 +20223,178 @@ diff -b -B --ignore-all-space --exclude-
  
 -sysnet_dns_name_resolve(iscsid_t)
 +miscfiles_read_localization(iscsid_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/kdump.fc serefpolicy-3.6.26/policy/modules/system/kdump.fc
+--- nsaserefpolicy/policy/modules/system/kdump.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/system/kdump.fc	2009-08-10 09:44:25.000000000 -0400
+@@ -0,0 +1,8 @@
++
++/etc/rc\.d/init\.d/kdump        --      gen_context(system_u:object_r:kdump_initrc_exec_t,s0)
++
++/sbin/kdump                     --      gen_context(system_u:object_r:kdump_exec_t,s0)
++/sbin/kexec                     --      gen_context(system_u:object_r:kdump_exec_t,s0)
++
++/etc/kdump\.conf                --      gen_context(system_u:object_r:kdump_etc_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/kdump.if serefpolicy-3.6.26/policy/modules/system/kdump.if
+--- nsaserefpolicy/policy/modules/system/kdump.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/system/kdump.if	2009-08-10 09:47:15.000000000 -0400
+@@ -0,0 +1,111 @@
++## <summary>kdump is kernel crash dumping mechanism</summary>
++
++######################################
++## <summary>
++##      Execute kdump in the kdump domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`kdump_domtrans',`
++        gen_require(`
++                type kdump_t, kdump_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1, kdump_exec_t, kdump_t)
++')
++
++#######################################
++## <summary>
++##      Execute kdump in the kdump domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`kdump_initrc_domtrans',`
++        gen_require(`
++                type kdump_initrc_exec_t;
++        ')
++
++        init_labeled_script_domtrans($1, kdump_initrc_exec_t)
++')
++
++#####################################
++## <summary>
++##      Read kdump configuration file.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`kdump_read_etc',`
++        gen_require(`
++                type kdump_etc_t;
++        ')
++
++        files_search_etc($1)
++        read_files_pattern($1, kdump_etc_t, kdump_etc_t)
++')
++
++####################################
++## <summary>
++##      Manage kdump configuration file.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`kdump_manage_etc',`
++        gen_require(`
++                type kdump_etc_t;
++        ')
++
++        files_search_etc($1)
++        manage_files_pattern($1, kdump_etc_t, kdump_etc_t)
++')
++
++######################################
++## <summary>
++##      All of the rules required to administrate 
++##      an kdump environment
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++## <param name="role">
++##      <summary>
++##      The role to be allowed to manage the kdump domain.
++##      </summary>
++## </param>
++## <rolecap/>
++#
++interface(`kdump_admin',`
++        gen_require(`
++                type kdump_t,kdump_etc_t;
++                type kdump_initrc_exec_t;
++        ')
++
++        allow $1 kdump_t:process { ptrace signal_perms };
++        ps_process_pattern($1, kdump_t)
++
++        init_labeled_script_domtrans($1, kdump_initrc_exec_t)
++        domain_system_change_exemption($1)
++        role_transition $2 kdump_initrc_exec_t system_r;
++        allow $2 system_r;
++
++        files_search_etc($1)
++        admin_pattern($1, kdump_etc_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/kdump.te serefpolicy-3.6.26/policy/modules/system/kdump.te
+--- nsaserefpolicy/policy/modules/system/kdump.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/system/kdump.te	2009-08-10 09:44:25.000000000 -0400
+@@ -0,0 +1,38 @@
++policy_module(kdump,1.0.0)
++
++#######################################
++#
++# Declarations
++#
++
++type kdump_t;
++type kdump_exec_t;
++init_system_domain(kdump_t, kdump_exec_t)
++
++type kdump_etc_t;
++files_config_file(kdump_etc_t)
++
++type kdump_initrc_exec_t;
++init_script_file(kdump_initrc_exec_t)
++
++#####################################
++#
++# kdump local policy
++#
++
++allow kdump_t self:capability { sys_boot dac_override };
++
++read_files_pattern(kdump_t, kdump_etc_t, kdump_etc_t)
++
++files_read_etc_runtime_files(kdump_t)
++files_read_kernel_img(kdump_t)
++
++kernel_read_system_state(kdump_t)
++
++dev_read_framebuffer(kdump_t)
++dev_read_sysfs(kdump_t)
++
++term_use_console(kdump_t)
++
++permissive kdump_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.26/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/libraries.fc	2009-08-03 07:56:50.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/libraries.fc	2009-08-10 11:54:48.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -20156,7 +20444,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/(.*/)?java/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
-@@ -115,27 +120,29 @@
+@@ -115,27 +120,30 @@
  
  /usr/(.*/)?nvidia/.+\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -20168,6 +20456,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib64/vlc/codec/librealvideo_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib64/vlc/codec/libdmo_plugin\.so	   --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib64/vlc/codec/librealaudio_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
  /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -20194,7 +20483,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/(local/)?.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:lib_t,s0)
  /usr/(local/)?lib(64)?/wine/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -143,11 +150,8 @@
+@@ -143,11 +151,8 @@
  /usr/NX/lib/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/NX/lib/libjpeg\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -20206,7 +20495,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/drivers/nvidia_drv\.o -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -168,12 +172,12 @@
+@@ -168,12 +173,12 @@
  
  # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
@@ -20221,7 +20510,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib/maxima/[^/]+/binary-gcl/maxima	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/mozilla/plugins/libvlcplugin\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/nx/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -185,15 +189,10 @@
+@@ -185,15 +190,10 @@
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -20238,7 +20527,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -228,31 +227,17 @@
+@@ -228,31 +228,17 @@
  /usr/lib(64)?/ladspa/sc3_1427\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/sc4_1882\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/se4_1883\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -20274,7 +20563,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -268,6 +253,9 @@
+@@ -268,6 +254,9 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -20284,7 +20573,7 @@ diff -b -B --ignore-all-space --exclude-
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -292,6 +280,8 @@
+@@ -292,6 +281,8 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -20293,7 +20582,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -304,10 +294,92 @@
+@@ -304,10 +295,91 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -20330,6 +20619,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/opt/(.*/)?oracle/(.*/)?libnnz.*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libnnz11.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
 +
 +/opt/matlab.*\.so(\.[^/]*)*		gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/matlab.*\.so(\.[^/]*)*		gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -20344,8 +20635,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/lib(64)?/midori/.*\.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)
@@ -20367,7 +20656,6 @@ diff -b -B --ignore-all-space --exclude-
 +/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)?/libxvidcore\.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)
 +/usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -20927,7 +21215,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.26/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/mount.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/mount.te	2009-08-10 10:06:05.000000000 -0400
 @@ -18,8 +18,12 @@
  init_system_domain(mount_t, mount_exec_t)
  role system_r types mount_t;
@@ -20965,7 +21253,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow mount_t mount_loopback_t:file read_file_perms;
  
-@@ -47,12 +59,25 @@
+@@ -47,12 +59,26 @@
  
  files_tmp_filetrans(mount_t, mount_tmp_t, { file dir })
  
@@ -20988,10 +21276,11 @@ diff -b -B --ignore-all-space --exclude-
  dev_list_all_dev_nodes(mount_t)
 +dev_read_usbfs(mount_t)
 +dev_read_rand(mount_t)
++dev_read_sysfs(mount_t)
  dev_rw_lvm_control(mount_t)
  dev_dontaudit_getattr_all_chr_files(mount_t)
  dev_dontaudit_getattr_memory_dev(mount_t)
-@@ -62,16 +87,19 @@
+@@ -62,16 +88,19 @@
  storage_raw_write_fixed_disk(mount_t)
  storage_raw_read_removable_device(mount_t)
  storage_raw_write_removable_device(mount_t)
@@ -21014,7 +21303,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_all_terms(mount_t)
  
-@@ -79,6 +107,7 @@
+@@ -79,6 +108,7 @@
  corecmd_exec_bin(mount_t)
  
  domain_use_interactive_fds(mount_t)
@@ -21022,7 +21311,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_search_all(mount_t)
  files_read_etc_files(mount_t)
-@@ -87,7 +116,7 @@
+@@ -87,7 +117,7 @@
  files_mounton_all_mountpoints(mount_t)
  files_unmount_rootfs(mount_t)
  # These rules need to be generalized.  Only admin, initrc should have it:
@@ -21031,7 +21320,7 @@ diff -b -B --ignore-all-space --exclude-
  files_mount_all_file_type_fs(mount_t)
  files_unmount_all_file_type_fs(mount_t)
  # for when /etc/mtab loses its type
-@@ -100,6 +129,8 @@
+@@ -100,6 +130,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -21040,7 +21329,7 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(mount_t)
  
-@@ -116,6 +147,7 @@
+@@ -116,6 +148,7 @@
  seutil_read_config(mount_t)
  
  userdom_use_all_users_fds(mount_t)
@@ -21048,7 +21337,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-@@ -131,9 +163,13 @@
+@@ -131,9 +164,13 @@
  	')
  ')
  
@@ -21063,7 +21352,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_mounton_non_security(mount_t)
  ')
  
-@@ -164,6 +200,8 @@
+@@ -164,6 +201,8 @@
  	fs_search_rpc(mount_t)
  
  	rpc_stub(mount_t)
@@ -21072,7 +21361,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -171,6 +209,21 @@
+@@ -171,6 +210,21 @@
  ')
  
  optional_policy(`
@@ -21094,7 +21383,7 @@ diff -b -B --ignore-all-space --exclude-
  	ifdef(`hide_broken_symptoms',`
  		# for a bug in the X server
  		rhgb_dontaudit_rw_stream_sockets(mount_t)
-@@ -178,6 +231,11 @@
+@@ -178,6 +232,11 @@
  	')
  ')
  
@@ -21106,7 +21395,7 @@ diff -b -B --ignore-all-space --exclude-
  # for kernel package installation
  optional_policy(`
  	rpm_rw_pipes(mount_t)
-@@ -185,6 +243,7 @@
+@@ -185,6 +244,7 @@
  
  optional_policy(`
  	samba_domtrans_smbmount(mount_t)
@@ -21114,7 +21403,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -194,5 +253,8 @@
+@@ -194,5 +254,8 @@
  
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t, file)
@@ -22302,7 +22591,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.te serefpolicy-3.6.26/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-08-10 10:36:14.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;
@@ -22361,7 +22650,7 @@ diff -b -B --ignore-all-space --exclude-
  	brctl_domtrans(udev_t)
  ')
  
-@@ -202,6 +212,10 @@
+@@ -202,14 +212,27 @@
  ')
  
  optional_policy(`
@@ -22372,7 +22661,12 @@ diff -b -B --ignore-all-space --exclude-
  	consoletype_exec(udev_t)
  ')
  
-@@ -210,6 +224,11 @@
+ optional_policy(`
++	cups_domtrans_config(udev_t)
++')
++
++optional_policy(`
+ 	dbus_system_bus_client(udev_t)
  ')
  
  optional_policy(`
@@ -22384,7 +22678,7 @@ diff -b -B --ignore-all-space --exclude-
  	lvm_domtrans(udev_t)
  ')
  
-@@ -219,6 +238,7 @@
+@@ -219,6 +242,7 @@
  
  optional_policy(`
  	hal_dgram_send(udev_t)
@@ -22392,7 +22686,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -228,6 +248,10 @@
+@@ -228,6 +252,10 @@
  ')
  
  optional_policy(`
@@ -22403,7 +22697,7 @@ diff -b -B --ignore-all-space --exclude-
  	openct_read_pid_files(udev_t)
  	openct_domtrans(udev_t)
  ')
-@@ -242,6 +266,10 @@
+@@ -242,6 +270,10 @@
  ')
  
  optional_policy(`
@@ -23181,7 +23475,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.26/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-07 06:43:58.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-10 11:36:42.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -23619,9 +23913,11 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -512,181 +519,192 @@
+@@ -511,182 +518,194 @@
+ 	# 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 };
++	allow $1_t self:netlink_kobject_uevent_socket create_socket_perms;
  
 -	allow $1_t unpriv_userdomain:fd use;
 +	allow $1_usertype unpriv_userdomain:fd use;
@@ -23888,7 +24184,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -714,13 +732,26 @@
+@@ -714,13 +733,26 @@
  
  	userdom_base_user_template($1)
  
@@ -23920,7 +24216,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -738,70 +769,71 @@
+@@ -738,70 +770,71 @@
  
  	allow $1_t self:context contains;
  
@@ -24025,7 +24321,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -838,6 +870,28 @@
+@@ -838,6 +871,28 @@
  	# Local policy
  	#
  
@@ -24054,7 +24350,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -868,7 +922,10 @@
+@@ -868,7 +923,10 @@
  
  	userdom_restricted_user_template($1)
  
@@ -24066,7 +24362,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -876,14 +933,19 @@
+@@ -876,14 +934,19 @@
  	#
  
  	auth_role($1_r, $1_t)
@@ -24091,7 +24387,7 @@ diff -b -B --ignore-all-space --exclude-
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -891,28 +953,47 @@
+@@ -891,28 +954,47 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -24146,7 +24442,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -946,8 +1027,8 @@
+@@ -946,8 +1028,8 @@
  	# Declarations
  	#
  
@@ -24156,7 +24452,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -956,11 +1037,12 @@
+@@ -956,11 +1038,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -24171,7 +24467,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,36 +1060,53 @@
+@@ -978,36 +1061,53 @@
  		')
  	')
  
@@ -24239,7 +24535,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1042,7 +1141,7 @@
+@@ -1042,7 +1142,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -24248,7 +24544,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1150,7 @@
+@@ -1051,8 +1151,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -24258,7 +24554,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1173,8 @@
+@@ -1075,7 +1174,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -24268,7 +24564,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1190,7 @@
+@@ -1091,6 +1191,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -24276,7 +24572,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1198,6 @@
+@@ -1098,8 +1199,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -24285,7 +24581,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)
-@@ -1154,20 +1252,6 @@
+@@ -1154,20 +1253,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -24306,7 +24602,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1297,7 @@
+@@ -1213,6 +1298,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -24314,7 +24610,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1363,15 @@
+@@ -1278,11 +1364,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -24330,7 +24626,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1463,13 @@
+@@ -1374,12 +1464,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -24345,7 +24641,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1502,14 @@
+@@ -1412,6 +1503,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -24360,7 +24656,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1525,11 @@
+@@ -1427,9 +1526,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -24372,7 +24668,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1586,25 @@
+@@ -1486,6 +1587,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -24398,7 +24694,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1679,8 @@
+@@ -1560,6 +1680,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -24407,7 +24703,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1774,7 @@
+@@ -1653,6 +1775,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -24415,7 +24711,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)
  ')
-@@ -1780,19 +1902,32 @@
+@@ -1780,19 +1903,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -24455,7 +24751,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1962,7 @@
+@@ -1827,6 +1963,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -24463,7 +24759,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2510,7 @@
+@@ -2374,7 +2511,7 @@
  
  ########################################
  ## <summary>
@@ -24472,7 +24768,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2864,32 @@
+@@ -2728,11 +2865,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -24507,7 +24803,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3017,25 @@
+@@ -2860,7 +3018,25 @@
  		type user_tmp_t;
  	')
  
@@ -24534,7 +24830,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3072,7 @@
+@@ -2897,6 +3073,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -24542,7 +24838,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3203,501 @@
+@@ -3027,3 +3204,501 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -p -r1.893 -r1.894
--- selinux-policy.spec	7 Aug 2009 19:36:54 -0000	1.893
+++ selinux-policy.spec	10 Aug 2009 18:22:10 -0000	1.894
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,10 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-9
+- Add kdump policy for Miroslav Grepl
+- Turn off execstack boolean
+
 * Fri Aug 7 2009 Bill Nottingham <notting at redhat.com> 3.6.26-8
 - Turn on execstack on a temporary basis (#512845)
 



From jwilson at fedoraproject.org  Mon Aug 10 18:32:33 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 10 Aug 2009 18:32:33 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1679.2.3,
	1.1679.2.4 linux-2.6.29-lirc.patch, 1.10, 1.10.2.1
Message-ID: <20090810183233.14BE911C0344@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15432

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec linux-2.6.29-lirc.patch 
Log Message:
* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.4
- Add tunable pad threshold support to lirc_imon
- Blacklist all iMON devices in usbhid driver so lirc_imon can bind
- Add new device ID to lirc_mceusb (#512483)
- Enable IR transceiver on the HD PVR



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.3
retrieving revision 1.1679.2.4
diff -u -p -r1.1679.2.3 -r1.1679.2.4
--- kernel.spec	29 Jul 2009 19:17:24 -0000	1.1679.2.3
+++ kernel.spec	10 Aug 2009 18:32:32 -0000	1.1679.2.4
@@ -695,6 +695,8 @@ Patch800: linux-2.6-crash-driver.patch
 Patch1000: linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
 
 Patch1515: linux-2.6.29-lirc.patch
+Patch1517: hdpvr-ir-enable.patch
+Patch1518: hid-ignore-all-recent-imon-devices.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
@@ -1420,6 +1422,7 @@ ApplyPatch linux-2.6-neigh_-fix-state-tr
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
+ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
@@ -1485,6 +1488,7 @@ ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch hdpvr-ir-enable.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -2127,6 +2131,12 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.4
+- Add tunable pad threshold support to lirc_imon
+- Blacklist all iMON devices in usbhid driver so lirc_imon can bind
+- Add new device ID to lirc_mceusb (#512483)
+- Enable IR transceiver on the HD PVR
+
 * Wed Jul 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-217.2.3
 - Don't optimize away NULL pointer tests where pointer is used before the test.
   (CVE-2009-1897)

linux-2.6.29-lirc.patch:
 Kconfig            |  112 ++
 Makefile           |   20 
 lirc.h             |  100 ++
 lirc_bt829.c       |  383 ++++++++
 lirc_dev.c         |  851 +++++++++++++++++++
 lirc_dev.h         |  184 ++++
 lirc_i2c.c         |  649 ++++++++++++++
 lirc_igorplugusb.c |  556 ++++++++++++
 lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 lirc_it87.c        |  986 ++++++++++++++++++++++
 lirc_it87.h        |  116 ++
 lirc_ite8709.c     |  539 ++++++++++++
 lirc_mceusb.c      | 1225 ++++++++++++++++++++++++++++
 lirc_parallel.c    |  709 ++++++++++++++++
 lirc_parallel.h    |   26 
 lirc_sasem.c       |  931 +++++++++++++++++++++
 lirc_serial.c      | 1316 ++++++++++++++++++++++++++++++
 lirc_sir.c         | 1283 +++++++++++++++++++++++++++++
 lirc_streamzap.c   |  777 +++++++++++++++++
 lirc_ttusbir.c     |  397 +++++++++
 lirc_zilog.c       | 1374 +++++++++++++++++++++++++++++++
 21 files changed, 14832 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.10 -r 1.10.2.1 linux-2.6.29-lirc.patchIndex: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-lirc.patch,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -p -r1.10 -r1.10.2.1
--- linux-2.6.29-lirc.patch	30 Jun 2009 04:59:08 -0000	1.10
+++ linux-2.6.29-lirc.patch	10 Aug 2009 18:32:32 -0000	1.10.2.1
@@ -2,87 +2,40 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
-Refreshed 20090630
+Refreshed 20090910
 
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
- MAINTAINERS                           |    9 +
- drivers/input/Kconfig                 |    2 +
- drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  118 ++
- drivers/input/lirc/Makefile           |   21 +
+ drivers/input/lirc/Kconfig            |  112 ++
+ drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
  drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
- drivers/input/lirc/lirc_i2c.c         |  649 +++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
- drivers/input/lirc/lirc_imon.c        | 2057 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
+ drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ 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      |  749 ++++++++++++
- drivers/input/lirc/lirc_mceusb2.c     | 1105 ++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ 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         | 1294 +++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
- drivers/input/lirc/lirc_zilog.c       | 1384 ++++++++++++++++++++++
- 25 files changed, 15261 insertions(+), 0 deletions(-)
+ 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   |  777 +++++++++++
+ drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
+ drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
+ 21 files changed, 14832 insertions(+), 0 deletions(-)
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 59fd2d1..ad1b16c 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2749,6 +2749,15 @@ W:	http://www.pasemi.com/
- L:	linuxppc-dev at ozlabs.org
- S:	Supported
- 
-+LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
-+P:	Jarod Wilson
-+M:	jarod at redhat.com
-+P:	Christoph Bartelmus
-+M:	lirc at bartelmus.de
-+W:	http://www.lirc.org/
-+L:	lirc-list at lists.sourceforge.net
-+S:	Maintained
-+
- LINUX SECURITY MODULE (LSM) FRAMEWORK
- P:	Chris Wright
- M:	chrisw at sous-sol.org
-diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
-index 5f9d860..2ba0904 100644
---- a/drivers/input/Kconfig
-+++ b/drivers/input/Kconfig
-@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
- 
- source "drivers/input/touchscreen/Kconfig"
- 
-+source "drivers/input/lirc/Kconfig"
-+
- source "drivers/input/misc/Kconfig"
- 
- endif
-diff --git a/drivers/input/Makefile b/drivers/input/Makefile
-index 4c9c745..99e2b5e 100644
---- a/drivers/input/Makefile
-+++ b/drivers/input/Makefile
-@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
- obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
- 
- obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
-+
-+obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..0482bb9
+index 0000000..6ef8622
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,112 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -139,16 +92,10 @@ index 0000000..0482bb9
 +	  Driver for the ITE8709 IR Receiver
 +
 +config LIRC_MCEUSB
-+	tristate "Microsoft Media Center Ed. Receiver, v1"
-+	depends on LIRC_DEV && USB
-+	help
-+	  Driver for the Microsoft Media Center Ed. Receiver, v1
-+
-+config LIRC_MCEUSB2
-+	tristate "Microsoft Media Center Ed. Receiver, v2"
++	tristate "Windows Media Center Ed. USB IR Transceiver"
 +	depends on LIRC_DEV && USB
 +	help
-+	  Driver for the Microsoft Media Center Ed. Receiver, v2
++	  Driver for Windows Media Center Ed. USB IR Transceivers
 +
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
@@ -203,10 +150,10 @@ index 0000000..0482bb9
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..a22df78
+index 0000000..7b1386e
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,20 @@
 +# Makefile for the lirc drivers.
 +#
 +
@@ -220,7 +167,6 @@ index 0000000..a22df78
 +obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
 +obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
-+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
 +obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 +obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 +obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
@@ -725,7 +671,7 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..a5d5c89
+index 0000000..0510b4e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,851 @@
@@ -802,7 +748,7 @@ index 0000000..a5d5c89
 +	struct cdev cdev;
 +};
 +
-+static DEFINE_MUTEX(driver_lock);
++static DEFINE_MUTEX(lirc_dev_lock);
 +
 +static struct irctl *irctls[MAX_IRCTL_DEVICES];
 +
@@ -998,7 +944,7 @@ index 0000000..a5d5c89
 +		goto out;
 +	}
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	minor = d->minor;
 +
@@ -1087,7 +1033,7 @@ index 0000000..a5d5c89
 +		goto out_sysfs;
 +
 +	ir->attached = 1;
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	dprintk("lirc_dev: driver %s registered at minor number = %d\n",
 +		ir->d.name, ir->d.minor);
@@ -1096,7 +1042,7 @@ index 0000000..a5d5c89
 +out_sysfs:
 +	device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
 +out_lock:
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +out:
 +	return err;
[...2491 lines suppressed...]
 +
 +static int io = LIRC_PORT;
 +static int irq = LIRC_IRQ;
@@ -11750,7 +11310,6 @@ index 0000000..6c64072
 +static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue);
 +
 +static DEFINE_SPINLOCK(hardware_lock);
-+static DEFINE_SPINLOCK(dev_lock);
 +
 +static int rx_buf[RBUF_LEN];
 +static unsigned int rx_tail, rx_head;
@@ -11767,8 +11326,6 @@ index 0000000..6c64072
 +/* SECTION: Prototypes */
 +
 +/* Communication with user-space */
-+static int lirc_open(struct inode *inode, struct file *file);
-+static int lirc_close(struct inode *inode, struct file *file);
 +static unsigned int lirc_poll(struct file *file, poll_table *wait);
 +static ssize_t lirc_read(struct file *file, char *buf, size_t count,
 +		loff_t *ppos);
@@ -11828,22 +11385,6 @@ index 0000000..6c64072
 +
 +/* SECTION: Communication with user-space */
 +
-+static int lirc_open(struct inode *inode, struct file *file)
-+{
-+	spin_lock(&dev_lock);
-+	if (module_refcount(THIS_MODULE)) {
-+		spin_unlock(&dev_lock);
-+		return -EBUSY;
-+	}
-+	spin_unlock(&dev_lock);
-+	return 0;
-+}
-+
-+static int lirc_close(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
 +static unsigned int lirc_poll(struct file *file, poll_table *wait)
 +{
 +	poll_wait(file, &lirc_read_queue, wait);
@@ -12058,8 +11599,8 @@ index 0000000..6c64072
 +	.write		= lirc_write,
 +	.poll		= lirc_poll,
 +	.ioctl		= lirc_ioctl,
-+	.open		= lirc_open,
-+	.release	= lirc_close,
++	.open		= lirc_dev_fop_open,
++	.release	= lirc_dev_fop_close,
 +};
 +
 +static int set_use_inc(void *data)
@@ -14069,10 +13610,10 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..049c3da
+index 0000000..c532399
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1384 @@
+@@ -0,0 +1,1374 @@
 +/*
 + * i2c IR lirc driver for devices with zilog IR processors
 + *
@@ -15163,18 +14704,26 @@ index 0000000..049c3da
 +};
 +
 +static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
-+static int ir_detach(struct i2c_client *client);
-+static int ir_probe(struct i2c_adapter *adap);
++static int ir_remove(struct i2c_client *client);
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 +
++static const struct i2c_device_id ir_transceiver_id[] = {
++	/* Generic entry for any IR transceiver */
++	{ "ir_video", 0 },
++	/* IR device specific entries could be added here */
++	{ }
++};
++
 +static struct i2c_driver driver = {
 +	.driver = {
 +		.owner	= THIS_MODULE,
 +		.name	= "i2c ir driver",
 +	},
-+	.attach_adapter	= ir_probe,
-+	.detach_client	= ir_detach,
++	.probe		= ir_probe,
++	.remove		= ir_remove,
 +	.command	= ir_command,
++	.id_table	= ir_transceiver_id,
 +};
 +
 +static struct i2c_client client_template = {
@@ -15195,20 +14744,8 @@ index 0000000..049c3da
 +
 +static int i2c_attach(struct i2c_client *client, struct IR *ir)
 +{
-+	int ret;
-+
 +	i2c_set_clientdata(client, ir);
 +
-+	ret = i2c_attach_client(client);
-+	if (ret != 0) {
-+		client->addr = 0;
-+		return ret;
-+	}
-+	if (!i2c_use_client(client)) {
-+		i2c_detach_client(client);
-+		client->addr = 0;
-+		return -EFAULT;
-+	}
 +	++ir->devs;
 +	return 0;
 +}
@@ -15309,13 +14846,13 @@ index 0000000..049c3da
 +err:
 +	/* undo everything, hopefully... */
 +	if (ir->c_rx.addr)
-+		ir_detach(&ir->c_rx);
++		ir_remove(&ir->c_rx);
 +	if (ir->c_tx.addr)
-+		ir_detach(&ir->c_tx);
++		ir_remove(&ir->c_tx);
 +	return ret;
 +}
 +
-+static int ir_detach(struct i2c_client *client)
++static int ir_remove(struct i2c_client *client)
 +{
 +	struct IR *ir = i2c_get_clientdata(client);
 +	mutex_lock(&ir->lock);
@@ -15336,21 +14873,17 @@ index 0000000..049c3da
 +			ir->t_notify2 = NULL;
 +		}
 +
-+		/* unregister device */
-+		i2c_detach_client(&ir->c_rx);
-+	} else if (client == &ir->c_tx) {
-+		i2c_detach_client(&ir->c_tx);
 +	} else {
 +		mutex_unlock(&ir->lock);
-+		zilog_error("ir_detach: detached from something we didn't "
-+			    "attach to\n");
++		zilog_error("%s: detached from something we didn't "
++			    "attach to\n", __func__);
 +		return -ENODEV;
 +	}
 +
 +	--ir->devs;
 +	if (ir->devs < 0) {
 +		mutex_unlock(&ir->lock);
-+		zilog_error("ir_detach: invalid device count\n");
++		zilog_error("%s: invalid device count\n", __func__);
 +		return -ENODEV;
 +	} else if (ir->devs == 0) {
 +		/* unregister lirc driver */
@@ -15369,11 +14902,10 @@ index 0000000..049c3da
 +	return 0;
 +}
 +
-+static int ir_probe(struct i2c_adapter *adap)
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 +{
-+	struct i2c_client c;
++	struct i2c_adapter *adap = client->adapter;
 +	char buf;
-+	memset(&c, 0, sizeof(c));
 +
 +	if (adap->id == I2C_HW_B_BT848 ||
 +#ifdef I2C_HW_B_HDPVR
@@ -15386,11 +14918,10 @@ index 0000000..049c3da
 +		 * The external IR receiver is at i2c address 0x71.
 +		 * The IR transmitter is at 0x70.
 +		 */
-+		c.adapter = adap;
-+		c.addr = 0x70;
++		client->addr = 0x70;
 +
 +		if (!disable_rx) {
-+			if (i2c_master_recv(&c, &buf, 1) == 1)
++			if (i2c_master_recv(client, &buf, 1) == 1)
 +				have_rx = 1;
 +			dprintk("probe 0x70 @ %s: %s\n",
 +				adap->name,
@@ -15398,8 +14929,8 @@ index 0000000..049c3da
 +		}
 +
 +		if (!disable_tx) {
-+			c.addr = 0x71;
-+			if (i2c_master_recv(&c, &buf, 1) == 1)
++			client->addr = 0x71;
++			if (i2c_master_recv(client, &buf, 1) == 1)
 +				have_tx = 1;
 +			dprintk("probe 0x71 @ %s: %s\n",
 +				adap->name,



From jwilson at fedoraproject.org  Mon Aug 10 18:33:00 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 10 Aug 2009 18:33:00 +0000 (UTC)
Subject: rpms/kernel/F-11 hdpvr-ir-enable.patch, NONE,
	1.1.2.1 hid-ignore-all-recent-imon-devices.patch, NONE, 1.1.2.1
Message-ID: <20090810183300.CE85211C0344@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15611

Added Files:
      Tag: private-fedora-11-2_6_29_6
	hdpvr-ir-enable.patch hid-ignore-all-recent-imon-devices.patch 
Log Message:
add the patches, duh.

hdpvr-ir-enable.patch:
 hdpvr-core.c |    3 +--
 hdpvr-i2c.c  |   36 +++++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE hdpvr-ir-enable.patch ---
>From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request

---
 drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
 drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index 188bd5a..878d1e5 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
 	}
 
 #ifdef CONFIG_I2C
-	/* until i2c is working properly */
-	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
+	retval = hdpvr_register_i2c_adapter(dev);
 	if (retval < 0) {
 		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
 		goto error;
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index c4b5d15..1c01b6c 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -22,7 +22,7 @@
 #define REQTYPE_I2C_WRITE_STATT	0xd0
 
 static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
-			  char *data, int len)
+			  char *data, int len, int bus)
 {
 	int ret;
 	char *buf = kmalloc(len, GFP_KERNEL);
@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
 	ret = usb_control_msg(dev->udev,
 			      usb_rcvctrlpipe(dev->udev, 0),
 			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
-			      0x100|addr, 0, buf, len, 1000);
+			      bus<<8 | addr, 0, buf, len, 1000);
 
 	if (ret == len) {
 		memcpy(data, buf, len);
@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
 }
 
 static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
-			   char *data, int len)
+			   char *data, int len, int bus)
 {
 	int ret;
 	char *buf = kmalloc(len, GFP_KERNEL);
@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
 	ret = usb_control_msg(dev->udev,
 			      usb_sndctrlpipe(dev->udev, 0),
 			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
-			      0x100|addr, 0, buf, len, 1000);
+			      bus<<8 | addr, 0, buf, len, 1000);
 
 	if (ret < 0)
 		goto error;
 
 	ret = usb_control_msg(dev->udev,
 			      usb_rcvctrlpipe(dev->udev, 0),
-			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
+			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
 			      0, 0, buf, 2, 1000);
 
 	if (ret == 2)
@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
 
 		if (msgs[i].flags & I2C_M_RD)
 			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
-						msgs[i].len);
+						msgs[i].len, 1);
 		else
 			retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
-						 msgs[i].len);
+						 msgs[i].len, 1);
 	}
 
 	mutex_unlock(&dev->i2c_mutex);
@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
 	.functionality = hdpvr_functionality,
 };
 
+static int hdpvr_activate_ir(struct hdpvr_device *dev)
+{
+	char buffer[8];
+
+	mutex_lock(&dev->i2c_mutex);
+
+	hdpvr_i2c_read(dev, 0x54, buffer, 1, 0);
+
+	buffer[0] = 0;
+	buffer[1] = 0x8;
+	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
+
+	buffer[1] = 0x18;
+	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
+
+	mutex_unlock(&dev->i2c_mutex);
+	return 0;
+}
+
+
 int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
 {
 	struct i2c_adapter *i2c_adap;
@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
 	if (i2c_adap == NULL)
 		goto error;
 
+	hdpvr_activate_ir(dev);
+
 	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
 		sizeof(i2c_adap->name));
 	i2c_adap->algo  = &hdpvr_algo;

hid-ignore-all-recent-imon-devices.patch:
 hid-core.c |   10 +++++-----
 hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

--- NEW FILE hid-ignore-all-recent-imon-devices.patch ---
[PATCH] hid: ignore all recent SoundGraph iMON devices

After some inspection of the Windows iMON driver, several additional
device IDs were added to the lirc_imon driver. At least a few of these
have been seen in the wild, and require manual quirking to keep the
usbhid driver from binding to them. Rather than list out every single
device, ignore the entire device ID range, 0x0034 - 0x0046. Some of
these may not advertise themselves as HID devices, but no harm done to
such devices anyway.

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 drivers/hid/hid-core.c |   10 +++++-----
 drivers/hid/hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5eb10c2..18bf803 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1623,11 +1623,6 @@ static const struct hid_device_id hid_ignore_list[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
@@ -1694,6 +1689,11 @@ static bool hid_ignore(struct hid_device *hdev)
 				hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)
 			return true;
 		break;
+	case USB_VENDOR_ID_SOUNDGRAPH:
+		if (hdev->product >= USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST &&
+		    hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST)
+			return true;
+		break;
 	}
 
 	if (hdev->type == HID_TYPE_USBMOUSE &&
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6301010..989a3ba 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -376,11 +376,8 @@
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
 
 #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST	0x0034
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST	0x0046
 
 #define USB_VENDOR_ID_SUN		0x0430
 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab



From tibbs at fedoraproject.org  Mon Aug 10 18:38:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 10 Aug 2009 18:38:57 +0000 (UTC)
Subject: rpms/horde/devel horde.spec,1.14,1.15
Message-ID: <20090810183857.96D0A11C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/horde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061

Modified Files:
	horde.spec 
Log Message:
* Mon Aug 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 3.3.4-2
- Fix Source0: URL.



Index: horde.spec
===================================================================
RCS file: /cvs/extras/rpms/horde/devel/horde.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- horde.spec	4 Aug 2009 07:06:00 -0000	1.14
+++ horde.spec	10 Aug 2009 18:38:57 -0000	1.15
@@ -1,9 +1,9 @@
 Name:		horde
 Version:	3.3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The common framework for all Horde applications
 
-Source0:	ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
+Source0:	ftp://ftp.horde.org/pub/horde/horde-%{version}.tar.gz
 Source1:	registry.php
 Group:		Applications/Internet
 License:	LGPLv2+
@@ -254,6 +254,9 @@ rm -rf %{buildroot}
 %doc README.Fedora
 
 %changelog
+* Mon Aug 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 3.3.4-2
+- Fix Source0: URL.
+
 * Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.4-1
 - Upgrade to 3.3.4
 



From ksyz at fedoraproject.org  Mon Aug 10 18:39:20 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 10 Aug 2009 18:39:20 +0000 (UTC)
Subject: rpms/perl-Flickr-API/devel import.log, NONE,
	1.1 perl-Flickr-API.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810183920.0B07411C0344@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-API/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16989/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Flickr-API.spec 
Log Message:
Initial import of perl-Flickr-API




--- NEW FILE import.log ---
perl-Flickr-API-1_02-1_fc11:HEAD:perl-Flickr-API-1.02-1.fc11.src.rpm:1249929387


--- NEW FILE perl-Flickr-API.spec ---
Name:           perl-Flickr-API
Version:        1.02
Release:        1%{?dist}
Summary:        Perl interface to the Flickr API
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Flickr-API/
Source0:        http://www.cpan.org/authors/id/I/IA/IAMCAL/Flickr-API-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Request)
BuildRequires:  perl(HTTP::Response)
BuildRequires:  perl(LWP::UserAgent)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(URI) >= 1.18
BuildRequires:  perl(XML::Parser::Lite::Tree) >= 0.06
Requires:       perl(URI) >= 1.18
Requires:       perl(XML::Parser::Lite::Tree) >= 0.06
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A simple interface for using the Flickr API.

%prep
%setup -q -n Flickr-API-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 1 2009 Michal Ingeli <mi at v3.sk> - 1.02-1
- Update to newer version with fixed license
- Cleaned up requires

* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> - 1.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:29:37 -0000	1.1
+++ .cvsignore	10 Aug 2009 18:39:19 -0000	1.2
@@ -0,0 +1 @@
+Flickr-API-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:29:37 -0000	1.1
+++ sources	10 Aug 2009 18:39:19 -0000	1.2
@@ -0,0 +1 @@
+18ba0d0ea8e6ea1a911f5b2bb84adc0a  Flickr-API-1.02.tar.gz



From tibbs at fedoraproject.org  Mon Aug 10 18:42:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 10 Aug 2009 18:42:40 +0000 (UTC)
Subject: rpms/imp/devel imp.spec,1.11,1.12
Message-ID: <20090810184240.A1E2311C0344@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/imp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17988

Modified Files:
	imp.spec 
Log Message:
* Mon Aug 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.3.4-2
- Fix Source0: URL.



Index: imp.spec
===================================================================
RCS file: /cvs/extras/rpms/imp/devel/imp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- imp.spec	4 Aug 2009 07:04:15 -0000	1.11
+++ imp.spec	10 Aug 2009 18:42:40 -0000	1.12
@@ -1,9 +1,9 @@
 Name:		imp
 Version:	4.3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Internet Messaging Program: webmail access to IMAP/POP3 accounts
 
-Source0:	ftp://ftp.horde.org/pub/%{name}/tarballs/%{name}-h3-%{version}.tar.gz
+Source0:	ftp://ftp.horde.org/pub/%{name}/%{name}-h3-%{version}.tar.gz
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.horde.org/
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 %{_datadir}/horde/%{name}
 
 %changelog
+* Mon Aug 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.3.4-2
+- Fix Source0: URL.
+
 * Tue Aug 4 2009 Nick Bebout <nb at fedoraproject.org> - 4.3.4-1
 - Upgrade to 4.3.4
 



From ksyz at fedoraproject.org  Mon Aug 10 18:47:20 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 10 Aug 2009 18:47:20 +0000 (UTC)
Subject: rpms/perl-Flickr-API/EL-5 import.log, NONE, 1.1 perl-Flickr-API.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810184720.3A0FB11C0344@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-API/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18883/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Flickr-API.spec 
Log Message:
Initial import of perl-Flickr-API




--- NEW FILE import.log ---
perl-Flickr-API-1_02-1_fc11:EL-5:perl-Flickr-API-1.02-1.fc11.src.rpm:1249929929


--- NEW FILE perl-Flickr-API.spec ---
Name:           perl-Flickr-API
Version:        1.02
Release:        1%{?dist}
Summary:        Perl interface to the Flickr API
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Flickr-API/
Source0:        http://www.cpan.org/authors/id/I/IA/IAMCAL/Flickr-API-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Request)
BuildRequires:  perl(HTTP::Response)
BuildRequires:  perl(LWP::UserAgent)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(URI) >= 1.18
BuildRequires:  perl(XML::Parser::Lite::Tree) >= 0.06
Requires:       perl(URI) >= 1.18
Requires:       perl(XML::Parser::Lite::Tree) >= 0.06
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A simple interface for using the Flickr API.

%prep
%setup -q -n Flickr-API-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 1 2009 Michal Ingeli <mi at v3.sk> - 1.02-1
- Update to newer version with fixed license
- Cleaned up requires

* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> - 1.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:29:37 -0000	1.1
+++ .cvsignore	10 Aug 2009 18:47:19 -0000	1.2
@@ -0,0 +1 @@
+Flickr-API-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:29:37 -0000	1.1
+++ sources	10 Aug 2009 18:47:20 -0000	1.2
@@ -0,0 +1 @@
+18ba0d0ea8e6ea1a911f5b2bb84adc0a  Flickr-API-1.02.tar.gz



From ksyz at fedoraproject.org  Mon Aug 10 18:49:26 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 10 Aug 2009 18:49:26 +0000 (UTC)
Subject: rpms/perl-Flickr-API/F-11 import.log, NONE, 1.1 perl-Flickr-API.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090810184926.987AB11C0344@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-API/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19598/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Flickr-API.spec 
Log Message:
Initial import of perl-Flickr-API




--- NEW FILE import.log ---
perl-Flickr-API-1_02-1_fc11:F-11:perl-Flickr-API-1.02-1.fc11.src.rpm:1249930043


--- NEW FILE perl-Flickr-API.spec ---
Name:           perl-Flickr-API
Version:        1.02
Release:        1%{?dist}
Summary:        Perl interface to the Flickr API
License:        Artistic 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Flickr-API/
Source0:        http://www.cpan.org/authors/id/I/IA/IAMCAL/Flickr-API-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTTP::Request)
BuildRequires:  perl(HTTP::Response)
BuildRequires:  perl(LWP::UserAgent)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(URI) >= 1.18
BuildRequires:  perl(XML::Parser::Lite::Tree) >= 0.06
Requires:       perl(URI) >= 1.18
Requires:       perl(XML::Parser::Lite::Tree) >= 0.06
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A simple interface for using the Flickr API.

%prep
%setup -q -n Flickr-API-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sun Aug 1 2009 Michal Ingeli <mi at v3.sk> - 1.02-1
- Update to newer version with fixed license
- Cleaned up requires

* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> - 1.01-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 20:29:37 -0000	1.1
+++ .cvsignore	10 Aug 2009 18:49:26 -0000	1.2
@@ -0,0 +1 @@
+Flickr-API-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-API/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 20:29:37 -0000	1.1
+++ sources	10 Aug 2009 18:49:26 -0000	1.2
@@ -0,0 +1 @@
+18ba0d0ea8e6ea1a911f5b2bb84adc0a  Flickr-API-1.02.tar.gz



From knol at fedoraproject.org  Mon Aug 10 18:51:17 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 18:51:17 +0000 (UTC)
Subject: rpms/getmail/F-11 .cvsignore, 1.9, 1.10 getmail.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <20090810185117.A4D2911C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20058

Modified Files:
	.cvsignore getmail.spec sources 
Log Message:
Update to 4.11.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Jul 2009 07:22:15 -0000	1.9
+++ .cvsignore	10 Aug 2009 18:51:17 -0000	1.10
@@ -1 +1 @@
-getmail-4.9.2.tar.gz
+getmail-4.11.0.tar.gz


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-11/getmail.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- getmail.spec	18 Jul 2009 07:22:15 -0000	1.10
+++ getmail.spec	10 Aug 2009 18:51:17 -0000	1.11
@@ -55,10 +55,7 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Sat Jul 18 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1
-- Update to release 4.9.2
-
-* Thu Apr 09 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.0-1
+* Thu Apr 09 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1
 - Update to release 4.9.0
 
 * Mon Nov 10 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Jul 2009 07:22:15 -0000	1.10
+++ sources	10 Aug 2009 18:51:17 -0000	1.11
@@ -1 +1 @@
-cbb2ef7bf12e2b6b4b748a73979e67a4  getmail-4.9.2.tar.gz
+bec537bd9f6677f8296d4396a54ed611  getmail-4.11.0.tar.gz



From knol at fedoraproject.org  Mon Aug 10 18:52:19 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 18:52:19 +0000 (UTC)
Subject: rpms/getmail/F-11 getmail.spec,1.11,1.12
Message-ID: <20090810185219.E6ACA11C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20257

Modified Files:
	getmail.spec 
Log Message:
Update to 4.11.0


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-11/getmail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- getmail.spec	10 Aug 2009 18:51:17 -0000	1.11
+++ getmail.spec	10 Aug 2009 18:52:19 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
-Version: 4.9.2
+Version: 4.11.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -55,7 +55,13 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Thu Apr 09 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1
+* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-1
+- update to release 4.11.0
+
+* Sat Jul 18 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1
+- Update to release 4.9.2
+
+* Thu Apr 09 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.0-1
 - Update to release 4.9.0
 
 * Mon Nov 10 2008 Dean Mander <knolderpoor at gmail.com> - 4.8.4-1



From orion at fedoraproject.org  Mon Aug 10 18:58:11 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 10 Aug 2009 18:58:11 +0000 (UTC)
Subject: rpms/R-systemfit/devel R-systemfit.spec,1.14,1.15
Message-ID: <20090810185811.E9D2611C0344@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-systemfit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21298

Modified Files:
	R-systemfit.spec 
Log Message:
Ships NEWS and NAMESPACE



Index: R-systemfit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-systemfit/devel/R-systemfit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- R-systemfit.spec	10 Aug 2009 18:00:11 -0000	1.14
+++ R-systemfit.spec	10 Aug 2009 18:58:11 -0000	1.15
@@ -69,10 +69,12 @@ rm -rf %{buildroot}
 %doc %{_datadir}/R/library/%{packname}/html
 %doc %{_datadir}/R/library/%{packname}/man
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION
+%doc %{_datadir}/R/library/%{packname}/NEWS
 %{_datadir}/R/library/%{packname}/CITATION
 %{_datadir}/R/library/%{packname}/CONTENTS
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/Meta
+%{_datadir}/R/library/%{packname}/NAMESPACE
 %{_datadir}/R/library/%{packname}/R
 %{_datadir}/R/library/%{packname}/R-ex
 %{_datadir}/R/library/%{packname}/data



From lmacken at fedoraproject.org  Mon Aug 10 18:58:52 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 18:58:52 +0000 (UTC)
Subject: rpms/python-repoze-what/devel python-repoze-what-release.patch, NONE,
	1.1 python-repoze-what.spec, 1.3, 1.4
Message-ID: <20090810185852.C549F11C0344@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-serv21590

Modified Files:
	python-repoze-what.spec 
Added Files:
	python-repoze-what-release.patch 
Log Message:
Get the test suite working

python-repoze-what-release.patch:
 release.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE python-repoze-what-release.patch ---
--- repoze/what/release.py.orig	2009-08-10 10:36:03.000000000 -0400
+++ repoze/what/release.py	2009-08-10 10:36:40.000000000 -0400
@@ -24,10 +24,7 @@
 
 import os
 
-_here = os.path.abspath(os.path.dirname(__file__))
-_root = os.path.dirname(os.path.dirname(_here))
-
-version = open(os.path.join(_root, 'VERSION.txt')).readline().rstrip()
+version = '$VERSION' 
 
 # The major version: If version=='3.0.2rc4', the major version is int(3).
 major_version = int(version.split('.')[0])


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/devel/python-repoze-what.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-repoze-what.spec	26 Jul 2009 20:59:48 -0000	1.3
+++ python-repoze-what.spec	10 Aug 2009 18:58:52 -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
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://pypi.python.org/pypi/repoze.what
 Source0:        http://pypi.python.org/packages/source/r/repoze.what/repoze.what-%{version}.tar.gz
 Patch0:         %{name}-setup.patch
+Patch1:         %{name}-release.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,8 @@ This package contains documentation for 
 %prep
 %setup -q -n repoze.what-%{version}
 %patch0 -b .setup
+%patch1 -b .release
+%{__sed} -i -e 's|$VERSION|%{version}|' repoze/what/release.py
 
 
 %build
@@ -67,9 +70,8 @@ This package contains documentation for 
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# Needs repoze.who-testutil
-#%check
-#PYTHONPATH=`pwd` nosetests
+%check
+PYTHONPATH=`pwd` nosetests
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
+- Get the test suite working
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kyle at fedoraproject.org  Mon Aug 10 19:04:31 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:04:31 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-x86-delay-tsc-barrier.patch, 1.2,
	1.3 kernel.spec, 1.1686, 1.1687
Message-ID: <20090810190431.A6A8911C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23288

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-delay-tsc-barrier.patch 
Log Message:
linux-2.6-x86-delay-tsc-barrier.patch

linux-2.6-x86-delay-tsc-barrier.patch:
 delay.c |    3 +++
 1 file changed, 3 insertions(+)

Index: linux-2.6-x86-delay-tsc-barrier.patch
===================================================================
RCS file: linux-2.6-x86-delay-tsc-barrier.patch
diff -N linux-2.6-x86-delay-tsc-barrier.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86-delay-tsc-barrier.patch	10 Aug 2009 19:04:31 -0000	1.3
@@ -0,0 +1,69 @@
+From: Pallipadi, Venkatesh <venkatesh.pallipadi at intel.com>
+Date: Thu, 25 Jun 2009 23:44:31 +0000 (-0700)
+Subject: x86, delay: tsc based udelay should have rdtsc_barrier
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e888d7facd1f1460a638151036d15b6cfb3ccc74
+
+x86, delay: tsc based udelay should have rdtsc_barrier
+
+delay_tsc needs rdtsc_barrier to provide proper delay.
+
+Output from a test driver using hpet to cross check delay
+provided by udelay().
+
+Before:
+[   86.794363] Expected delay 5us actual 4679ns
+[   87.154362] Expected delay 5us actual 698ns
+[   87.514162] Expected delay 5us actual 4539ns
+[   88.653716] Expected delay 5us actual 4539ns
+[   94.664106] Expected delay 10us actual 9638ns
+[   95.049351] Expected delay 10us actual 10126ns
+[   95.416110] Expected delay 10us actual 9568ns
+[   95.799216] Expected delay 10us actual 9638ns
+[  103.624104] Expected delay 10us actual 9707ns
+[  104.020619] Expected delay 10us actual 768ns
+[  104.419951] Expected delay 10us actual 9707ns
+
+After:
+[   50.983320] Expected delay 5us actual 5587ns
+[   51.261807] Expected delay 5us actual 5587ns
+[   51.565715] Expected delay 5us actual 5657ns
+[   51.861171] Expected delay 5us actual 5587ns
+[   52.164704] Expected delay 5us actual 5726ns
+[   52.487457] Expected delay 5us actual 5657ns
+[   52.789338] Expected delay 5us actual 5726ns
+[   57.119680] Expected delay 10us actual 10755ns
+[   57.893997] Expected delay 10us actual 10615ns
+[   58.261287] Expected delay 10us actual 10755ns
+[   58.620505] Expected delay 10us actual 10825ns
+[   58.941035] Expected delay 10us actual 10755ns
+[   59.320903] Expected delay 10us actual 10615ns
+[   61.306311] Expected delay 10us actual 10755ns
+[   61.520542] Expected delay 10us actual 10615ns
+
+Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
+Signed-off-by: H. Peter Anvin <hpa at zytor.com>
+---
+
+diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
+index f456860..ff485d3 100644
+--- a/arch/x86/lib/delay.c
++++ b/arch/x86/lib/delay.c
+@@ -55,8 +55,10 @@ static void delay_tsc(unsigned long loops)
+ 
+ 	preempt_disable();
+ 	cpu = smp_processor_id();
++	rdtsc_barrier();
+ 	rdtscl(bclock);
+ 	for (;;) {
++		rdtsc_barrier();
+ 		rdtscl(now);
+ 		if ((now - bclock) >= loops)
+ 			break;
+@@ -78,6 +80,7 @@ static void delay_tsc(unsigned long loops)
+ 		if (unlikely(cpu != smp_processor_id())) {
+ 			loops -= (now - bclock);
+ 			cpu = smp_processor_id();
++			rdtsc_barrier();
+ 			rdtscl(bclock);
+ 		}
+ 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1686
retrieving revision 1.1687
diff -u -p -r1.1686 -r1.1687
--- kernel.spec	5 Aug 2009 16:07:43 -0000	1.1686
+++ kernel.spec	10 Aug 2009 19:04:31 -0000	1.1687
@@ -683,6 +683,7 @@ Patch11050: via-padlock-40-nano-ecb.patc
 Patch11060: via-padlock-50-nano-cbc.patch
 Patch11070: via-rng-enable-64bit.patch
 Patch11080: via-sdmmc.patch
+Patch11081: linux-2.6-x86-delay-tsc-barrier.patch
 
 # Commit a44a4a006b860476881ec0098c36584036e1cb91 fron net-next-2.6.git
 Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
@@ -1090,11 +1091,13 @@ ApplyPatch linux-2.6-hotfixes.patch
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
 
+# VM patches
+
+# iommu patches
+
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
-ApplyPatch linux-2.6-missing-rfc2465-stats.patch
-
 # Architecture patches
 # x86(-64)
 ApplyPatch linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
@@ -1106,6 +1109,7 @@ ApplyPatch via-padlock-40-nano-ecb.patch
 ApplyPatch via-padlock-50-nano-cbc.patch
 ApplyPatch via-rng-enable-64bit.patch
 ApplyPatch via-sdmmc.patch
+ApplyPatch linux-2.6-x86-delay-tsc-barrier.patch
 
 # Export xfrm[4|6] gc_thresh values to sysctl
 ApplyPatch linux-2.6-xfrm-export-gc_thresh.patch
@@ -1140,12 +1144,12 @@ ApplyPatch linux-2.6-execshield.patch
 #
 
 # ext4
-#ApplyPatch linux-2.6-ext4-prealloc-fixes.patch
 
 # xfs
 
 # btrfs
-#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
+
+# ecryptfs
 
 # USB
 
@@ -1166,10 +1170,6 @@ ApplyPatch linux-2.6-debug-always-inline
 #
 # disable message signaled interrupts
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-# update the pciehp driver
-#ApplyPatch linux-2.6-pciehp-update.patch
-# default to enabling passively listening for hotplug events
-#ApplyPatch linux-2.6-defaults-pciehp.patch
 
 #
 # SCSI Bits.
@@ -1181,6 +1181,14 @@ ApplyPatch linux-2.6-defaults-alsa-hda-b
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
+#
+ApplyPatch linux-2.6-missing-rfc2465-stats.patch
+
+# neigh: fix state transition INCOMPLETE->FAILED via Netlink request
+ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
+
+# add ich9 lan
+ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1205,27 +1213,18 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
 
 # Changes to upstream defaults.
 
-
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# rt2x00: back-port activity LED init patches
-#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
-
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
-# neigh: fix state transition INCOMPLETE->FAILED via Netlink request
-ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
-ApplyPatch linux-2.6-e1000-ich9.patch
-
 ApplyPatch agp-set_memory_ucwb.patch
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
@@ -1835,6 +1834,10 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
+- Patch sync-up with F-11-2.6.29.y:
+ - linux-2.6-x86-delay-tsc-barrier.patch
+
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.
 - Drop now-unneeded upstream reverts.



From lmacken at fedoraproject.org  Mon Aug 10 19:04:40 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 19:04:40 +0000 (UTC)
Subject: rpms/python-repoze-what/F-11 python-repoze-what-release.patch, NONE,
	1.1 python-repoze-what.spec, 1.2, 1.3
Message-ID: <20090810190440.BC9E511C0344@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-serv23352

Modified Files:
	python-repoze-what.spec 
Added Files:
	python-repoze-what-release.patch 
Log Message:
Get the test suite running

python-repoze-what-release.patch:
 release.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE python-repoze-what-release.patch ---
--- repoze/what/release.py.orig	2009-08-10 10:36:03.000000000 -0400
+++ repoze/what/release.py	2009-08-10 10:36:40.000000000 -0400
@@ -24,10 +24,7 @@
 
 import os
 
-_here = os.path.abspath(os.path.dirname(__file__))
-_root = os.path.dirname(os.path.dirname(_here))
-
-version = open(os.path.join(_root, 'VERSION.txt')).readline().rstrip()
+version = '$VERSION' 
 
 # The major version: If version=='3.0.2rc4', the major version is int(3).
 major_version = int(version.split('.')[0])


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/F-11/python-repoze-what.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-repoze-what.spec	8 Jul 2009 02:33:54 -0000	1.2
+++ python-repoze-what.spec	10 Aug 2009 19:04:40 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://pypi.python.org/pypi/repoze.what
 Source0:        http://pypi.python.org/packages/source/r/repoze.what/repoze.what-%{version}.tar.gz
 Patch0:         %{name}-setup.patch
+Patch1:         %{name}-release.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,7 +57,8 @@ This package contains documentation for 
 %prep
 %setup -q -n repoze.what-%{version}
 %patch0 -b .setup
-
+%patch1 -b .release
+%{__sed} -i -e 's|$VERSION|%{version}|' repoze/what/release.py
 
 %build
 %{__python} setup.py build
@@ -67,16 +69,15 @@ This package contains documentation for 
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# Needs repoze.who-testutil
-#%check
-#PYTHONPATH=`pwd` nosetests
+%check
+PYTHONPATH=`pwd` nosetests
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt
+%doc README.txt VERSION.txt
 %{python_sitelib}/
 
 %files docs
@@ -84,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-3
+- Get the test suite working
+
 * Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-2
 - Fix the dependency in the docs subpackage
 



From kyle at fedoraproject.org  Mon Aug 10 19:07:34 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:07:34 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-fs-cifs-fix-port-numbers.patch, 1.2,
	1.3 kernel.spec, 1.1687, 1.1688
Message-ID: <20090810190734.A448011C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24023

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-cifs-fix-port-numbers.patch 
Log Message:
linux-2.6-fs-cifs-fix-port-numbers.patch

linux-2.6-fs-cifs-fix-port-numbers.patch:
 connect.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-fs-cifs-fix-port-numbers.patch
===================================================================
RCS file: linux-2.6-fs-cifs-fix-port-numbers.patch
diff -N linux-2.6-fs-cifs-fix-port-numbers.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-fs-cifs-fix-port-numbers.patch	10 Aug 2009 19:07:34 -0000	1.3
@@ -0,0 +1,33 @@
+From: Simo Leone <simo at archlinux.org>
+Date: Thu, 25 Jun 2009 02:44:43 +0000 (+0000)
+Subject: [CIFS] Copy struct *after* setting the port, instead of before.
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6debdbc0ba6253ac519cd5a3d22e30f1f9f1dd12
+
+[CIFS] Copy struct *after* setting the port, instead of before.
+
+Acked-by: Jeff Layton <jlayton at redhat.com>
+Signed-off-by: Simo Leone <simo at archlinux.org>
+Signed-off-by: Steve French <sfrench at us.ibm.com>
+---
+
+diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
+index a581cfa..12c2cf6 100644
+--- a/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
+@@ -1496,14 +1496,14 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
+ 		cFYI(1, ("attempting ipv6 connect"));
+ 		/* BB should we allow ipv6 on port 139? */
+ 		/* other OS never observed in Wild doing 139 with v6 */
++		sin_server6->sin6_port = htons(volume_info->port);
+ 		memcpy(&tcp_ses->addr.sockAddr6, sin_server6,
+ 			sizeof(struct sockaddr_in6));
+-		sin_server6->sin6_port = htons(volume_info->port);
+ 		rc = ipv6_connect(tcp_ses);
+ 	} else {
++		sin_server->sin_port = htons(volume_info->port);
+ 		memcpy(&tcp_ses->addr.sockAddr, sin_server,
+ 			sizeof(struct sockaddr_in));
+-		sin_server->sin_port = htons(volume_info->port);
+ 		rc = ipv4_connect(tcp_ses);
+ 	}
+ 	if (rc < 0) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1687
retrieving revision 1.1688
diff -u -p -r1.1687 -r1.1688
--- kernel.spec	10 Aug 2009 19:04:31 -0000	1.1687
+++ kernel.spec	10 Aug 2009 19:07:34 -0000	1.1688
@@ -668,7 +668,7 @@ Patch2901: linux-2.6-v4l-dvb-experimenta
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
 # fs fixes
-Patch3000: linux-2.6-btrfs-experimental-branch.patch
+Patch3000: linux-2.6-fs-cifs-fix-port-numbers.patch
 
 #snmp fixes
 Patch10000: linux-2.6-missing-rfc2465-stats.patch
@@ -1151,6 +1151,12 @@ ApplyPatch linux-2.6-execshield.patch
 
 # ecryptfs
 
+# nfs
+
+# cifs
+# fix cifs mount option "port=" (#506574)
+ApplyPatch linux-2.6-fs-cifs-fix-port-numbers.patch
+
 # USB
 
 # ACPI
@@ -1837,6 +1843,7 @@ fi
 * Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch
+ - linux-2.6-fs-cifs-fix-port-numbers.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From lmacken at fedoraproject.org  Mon Aug 10 19:09:43 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 19:09:43 +0000 (UTC)
Subject: rpms/python-repoze-what/F-10 python-repoze-what-release.patch, NONE,
	1.1 python-repoze-what.spec, 1.2, 1.3
Message-ID: <20090810190943.2283911C0344@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24388

Modified Files:
	python-repoze-what.spec 
Added Files:
	python-repoze-what-release.patch 
Log Message:
Get the test suite running

python-repoze-what-release.patch:
 release.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE python-repoze-what-release.patch ---
--- repoze/what/release.py.orig	2009-08-10 10:36:03.000000000 -0400
+++ repoze/what/release.py	2009-08-10 10:36:40.000000000 -0400
@@ -24,10 +24,7 @@
 
 import os
 
-_here = os.path.abspath(os.path.dirname(__file__))
-_root = os.path.dirname(os.path.dirname(_here))
-
-version = open(os.path.join(_root, 'VERSION.txt')).readline().rstrip()
+version = '$VERSION' 
 
 # The major version: If version=='3.0.2rc4', the major version is int(3).
 major_version = int(version.split('.')[0])


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/F-10/python-repoze-what.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-repoze-what.spec	8 Jul 2009 02:33:09 -0000	1.2
+++ python-repoze-what.spec	10 Aug 2009 19:09:42 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://pypi.python.org/pypi/repoze.what
 Source0:        http://pypi.python.org/packages/source/r/repoze.what/repoze.what-%{version}.tar.gz
 Patch0:         %{name}-setup.patch
+Patch1:         %{name}-release.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,7 +57,8 @@ This package contains documentation for 
 %prep
 %setup -q -n repoze.what-%{version}
 %patch0 -b .setup
-
+%patch1 -b .release
+%{__sed} -i -e 's|$VERSION|%{version}|' repoze/what/release.py
 
 %build
 %{__python} setup.py build
@@ -67,16 +69,15 @@ This package contains documentation for 
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# Needs repoze.who-testutil
-#%check
-#PYTHONPATH=`pwd` nosetests
+%check
+PYTHONPATH=`pwd` nosetests
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt
+%doc README.txt VERSION.txt
 %{python_sitelib}/
 
 %files docs
@@ -84,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-3
+- Get the test suite working
+
 * Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-2
 - Fix the dependency in the docs subpackage
 



From kyle at fedoraproject.org  Mon Aug 10 19:11:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:11:07 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-kvm-skip-pit-check.patch, 1.2,
	1.3 kernel.spec, 1.1688, 1.1689
Message-ID: <20090810191107.C580E11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24746

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-skip-pit-check.patch 
Log Message:
linux-2.6-kvm-skip-pit-check.patch

linux-2.6-kvm-skip-pit-check.patch:
 kvm.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux-2.6-kvm-skip-pit-check.patch
===================================================================
RCS file: linux-2.6-kvm-skip-pit-check.patch
diff -N linux-2.6-kvm-skip-pit-check.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-kvm-skip-pit-check.patch	10 Aug 2009 19:11:07 -0000	1.3
@@ -0,0 +1,34 @@
+commit 5bffffc113f91918292283e3819dadd4ca964423
+Author: Marcelo Tosatti <mtosatti at redhat.com>
+Date:   Wed Feb 11 22:45:42 2009 -0200
+
+    KVM: x86: paravirt skip pit-through-ioapic boot check
+    
+    Skip the test which checks if the PIT is properly routed when
+    using the IOAPIC, aimed at buggy hardware.
+    
+    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
+    Signed-off-by: Avi Kivity <avi at redhat.com>
+
+diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
+index 478bca9..eecfc92 100644
+--- a/arch/x86/kernel/kvm.c
++++ b/arch/x86/kernel/kvm.c
+@@ -27,6 +27,7 @@
+ #include <linux/mm.h>
+ #include <linux/highmem.h>
+ #include <linux/hardirq.h>
++#include <asm/timer.h>
+ 
+ #define MMU_QUEUE_SIZE 1024
+ 
+@@ -237,6 +238,9 @@ static void paravirt_ops_setup(void)
+ 		pv_mmu_ops.lazy_mode.enter = kvm_enter_lazy_mmu;
+ 		pv_mmu_ops.lazy_mode.leave = kvm_leave_lazy_mmu;
+ 	}
++#ifdef CONFIG_X86_IO_APIC
++	no_timer_check = 1;
++#endif
+ }
+ 
+ void __init kvm_guest_init(void)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1688
retrieving revision 1.1689
diff -u -p -r1.1688 -r1.1689
--- kernel.spec	10 Aug 2009 19:07:34 -0000	1.1688
+++ kernel.spec	10 Aug 2009 19:11:07 -0000	1.1689
@@ -687,6 +687,9 @@ Patch11081: linux-2.6-x86-delay-tsc-barr
 
 # Commit a44a4a006b860476881ec0098c36584036e1cb91 fron net-next-2.6.git
 Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
+
+Patch13000: linux-2.6-kvm-skip-pit-check.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1255,6 +1258,11 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+# kvm
+ApplyPatch linux-2.6-kvm-skip-pit-check.patch
+
+# xen
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1844,6 +1852,7 @@ fi
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch
  - linux-2.6-fs-cifs-fix-port-numbers.patch
+ - linux-2.6-kvm-skip-pit-check.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From behdad at fedoraproject.org  Mon Aug 10 19:13:57 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 19:13:57 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.167,1.168
Message-ID: <20090810191357.1E8FB11C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25282

Modified Files:
	pango.spec 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-4 
- Remove -fexceptions from RPM_OPT_FLAGS 
- Hopefully builds this time 



Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- pango.spec	10 Aug 2009 18:01:48 -0000	1.167
+++ pango.spec	10 Aug 2009 19:13:56 -0000	1.168
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -77,6 +77,8 @@ for the pango package.
 
 %build
 
+# We try hard to not link to libstdc++, this flag doesn't help
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-fexceptions/}
 %configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc
 make
 
@@ -227,6 +229,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-4
+- Remove -fexceptions from RPM_OPT_FLAGS
+- Hopefully builds this time
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-3
 - Remove pango-1.25.1-no-hb-main.patch
 - Add pango-1.25.1-cxx.patch



From lmacken at fedoraproject.org  Mon Aug 10 19:14:17 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 10 Aug 2009 19:14:17 +0000 (UTC)
Subject: rpms/python-repoze-what/EL-5 python-repoze-what-release.patch, NONE,
	1.1 python-repoze-what.spec, 1.2, 1.3
Message-ID: <20090810191417.A92F311C0344@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-serv25453

Modified Files:
	python-repoze-what.spec 
Added Files:
	python-repoze-what-release.patch 
Log Message:
Get the test suite running

python-repoze-what-release.patch:
 release.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE python-repoze-what-release.patch ---
--- repoze/what/release.py.orig	2009-08-10 10:36:03.000000000 -0400
+++ repoze/what/release.py	2009-08-10 10:36:40.000000000 -0400
@@ -24,10 +24,7 @@
 
 import os
 
-_here = os.path.abspath(os.path.dirname(__file__))
-_root = os.path.dirname(os.path.dirname(_here))
-
-version = open(os.path.join(_root, 'VERSION.txt')).readline().rstrip()
+version = '$VERSION' 
 
 # The major version: If version=='3.0.2rc4', the major version is int(3).
 major_version = int(version.split('.')[0])


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/EL-5/python-repoze-what.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-repoze-what.spec	8 Jul 2009 02:32:24 -0000	1.2
+++ python-repoze-what.spec	10 Aug 2009 19:14:17 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -10,6 +10,7 @@ License:        BSD
 URL:            http://pypi.python.org/pypi/repoze.what
 Source0:        http://pypi.python.org/packages/source/r/repoze.what/repoze.what-%{version}.tar.gz
 Patch0:         %{name}-setup.patch
+Patch1:         %{name}-release.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,7 +57,8 @@ This package contains documentation for 
 %prep
 %setup -q -n repoze.what-%{version}
 %patch0 -b .setup
-
+%patch1 -b .release
+%{__sed} -i -e 's|$VERSION|%{version}|' repoze/what/release.py
 
 %build
 %{__python} setup.py build
@@ -67,16 +69,15 @@ This package contains documentation for 
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# Needs repoze.who-testutil
-#%check
-#PYTHONPATH=`pwd` nosetests
+%check
+PYTHONPATH=`pwd` nosetests
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt
+%doc README.txt VERSION.txt
 %{python_sitelib}/
 
 %files docs
@@ -84,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-3
+- Get the test suite working
+
 * Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-2
 - Fix the dependency in the docs subpackage
 



From scop at fedoraproject.org  Mon Aug 10 19:21:00 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 19:21:00 +0000 (UTC)
Subject: rpms/gaupol/devel .cvsignore, 1.4, 1.5 gaupol.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090810192100.0798B11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26716

Modified Files:
	.cvsignore gaupol.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 May 2009 17:35:55 -0000	1.4
+++ .cvsignore	10 Aug 2009 19:20:59 -0000	1.5
@@ -1 +1 @@
-gaupol-0.15.tar.gz
+gaupol-0.15.tar.bz2


Index: gaupol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/gaupol.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gaupol.spec	2 Aug 2009 19:04:26 -0000	1.7
+++ gaupol.spec	10 Aug 2009 19:20:59 -0000	1.8
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
 Version:	0.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://home.gna.org/gaupol
-Source0:	http://download.gna.org/gaupol/%{version}/%{name}-%{version}.tar.gz
+Source0:	http://download.gna.org/gaupol/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15-4
+- Use bzipped upstream tarball.
+
 * Sun Aug 02 2009 Lucian Langa <cooly at gnome.eu.org> - 0.15-3
 - do not remove required file (b.g.o #590537)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	18 May 2009 17:35:55 -0000	1.4
+++ sources	10 Aug 2009 19:20:59 -0000	1.5
@@ -1 +1 @@
-af9c6d248e5ba8e4c0459243eccea4c3  gaupol-0.15.tar.gz
+99cc98964bf82087eb84d61b53b10098  gaupol-0.15.tar.bz2



From behdad at fedoraproject.org  Mon Aug 10 19:22:36 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 19:22:36 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.168,1.169
Message-ID: <20090810192236.0D7A011C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27073

Modified Files:
	pango.spec 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-5 
- Remove -fexceptions from CXXFLAGS actually 
- Hopefully builds this time 



Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- pango.spec	10 Aug 2009 19:13:56 -0000	1.168
+++ pango.spec	10 Aug 2009 19:22:35 -0000	1.169
@@ -2,14 +2,14 @@
 %define glib2_version %{glib2_base_version}-1
 %define pkgconfig_version 0.12
 %define freetype_version 2.1.3-3
-%define fontconfig_version 2.7
+%define fontconfig_version 2.6
 %define cairo_version 1.7.6
 %define libthai_version 0.1.9
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -78,7 +78,7 @@ for the pango package.
 %build
 
 # We try hard to not link to libstdc++, this flag doesn't help
-RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-fexceptions/}
+CXXFLAGS=${CXXFLAGS/-fexceptions/}
 %configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc
 make
 
@@ -229,6 +229,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-5
+- Remove -fexceptions from CXXFLAGS actually
+- Hopefully builds this time
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-4
 - Remove -fexceptions from RPM_OPT_FLAGS
 - Hopefully builds this time



From kyle at fedoraproject.org  Mon Aug 10 19:23:30 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:23:30 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6.29-xen-disable-gbpages.patch, 1.2,
	1.3 kernel.spec, 1.1689, 1.1690
Message-ID: <20090810192330.954CA11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27337

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.29-xen-disable-gbpages.patch 
Log Message:
linux-2.6.29-xen-disable-gbpages.patch

linux-2.6.29-xen-disable-gbpages.patch:
 enlighten.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.29-xen-disable-gbpages.patch
===================================================================
RCS file: linux-2.6.29-xen-disable-gbpages.patch
diff -N linux-2.6.29-xen-disable-gbpages.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.29-xen-disable-gbpages.patch	10 Aug 2009 19:23:30 -0000	1.3
@@ -0,0 +1,14 @@
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index f09e8c3..9a93a7b 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -185,7 +185,8 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
+ 	if (*ax == 1) {
+ 		maskecx = cpuid_leaf1_ecx_mask;
+ 		maskedx = cpuid_leaf1_edx_mask;
+-	}
++	} else if (*ax == 0x80000001)
++		maskedx = ~((1 << (X86_FEATURE_GBPAGES&31))); /* disable GB pages */
+ 
+ 	asm(XEN_EMULATE_PREFIX "cpuid"
+ 		: "=a" (*ax),


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1689
retrieving revision 1.1690
diff -u -p -r1.1689 -r1.1690
--- kernel.spec	10 Aug 2009 19:11:07 -0000	1.1689
+++ kernel.spec	10 Aug 2009 19:23:30 -0000	1.1690
@@ -689,6 +689,7 @@ Patch11081: linux-2.6-x86-delay-tsc-barr
 Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
 
 Patch13000: linux-2.6-kvm-skip-pit-check.patch
+Patch13001: linux-2.6.29-xen-disable-gbpages.patch
 
 %endif
 
@@ -1262,6 +1263,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 
 # xen
+ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1853,6 +1855,7 @@ fi
  - linux-2.6-x86-delay-tsc-barrier.patch
  - linux-2.6-fs-cifs-fix-port-numbers.patch
  - linux-2.6-kvm-skip-pit-check.patch
+ - linux-2.6.29-xen-disable-gbpages.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From kyle at fedoraproject.org  Mon Aug 10 19:25:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:25:52 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch, 1.2,
	1.3 kernel.spec, 1.1690, 1.1691
Message-ID: <20090810192552.EBAFA11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27866

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch 
Log Message:
linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch

linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch:
 virtio_blk.c |    3 +++
 1 file changed, 3 insertions(+)

Index: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
===================================================================
RCS file: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
diff -N linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch	10 Aug 2009 19:25:52 -0000	1.3
@@ -0,0 +1,33 @@
+From: Christoph Hellwig <hch at lst.de>
+Date: Sat, 18 Jul 2009 03:47:45 +0000 (-0600)
+Subject: virtio_blk: don't bounce highmem requests
+X-Git-Tag: v2.6.31-rc4~33^2~3
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4eff3cae9c9809720c636e64bc72f212258e0bd5
+
+virtio_blk: don't bounce highmem requests
+
+By default a block driver bounces highmem requests, but virtio-blk is
+perfectly fine with any request that fit into it's 64 bit addressing scheme,
+mapped in the kernel virtual space or not.
+
+Besides improving performance on highmem systems this also makes the
+reproducible oops in __bounce_end_io go away (but hiding the real cause).
+
+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 43db3ea..4c47859 100644
+--- a/drivers/block/virtio_blk.c
++++ b/drivers/block/virtio_blk.c
+@@ -360,6 +360,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
+ 	blk_queue_max_phys_segments(vblk->disk->queue, vblk->sg_elems-2);
+ 	blk_queue_max_hw_segments(vblk->disk->queue, vblk->sg_elems-2);
+ 
++	/* No need to bounce any requests */
++	blk_queue_bounce_limit(vblk->disk->queue, BLK_BOUNCE_ANY);
++
+ 	/* No real sector limit. */
+ 	blk_queue_max_sectors(vblk->disk->queue, -1U);
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1690
retrieving revision 1.1691
diff -u -p -r1.1690 -r1.1691
--- kernel.spec	10 Aug 2009 19:23:30 -0000	1.1690
+++ kernel.spec	10 Aug 2009 19:25:52 -0000	1.1691
@@ -690,6 +690,7 @@ Patch12000: linux-2.6-xfrm-export-gc_thr
 
 Patch13000: linux-2.6-kvm-skip-pit-check.patch
 Patch13001: linux-2.6.29-xen-disable-gbpages.patch
+Patch13002: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
 %endif
 
@@ -1265,6 +1266,9 @@ ApplyPatch linux-2.6-kvm-skip-pit-check.
 # xen
 ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
 
+# v12n
+ApplyPatch linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1856,6 +1860,7 @@ fi
  - linux-2.6-fs-cifs-fix-port-numbers.patch
  - linux-2.6-kvm-skip-pit-check.patch
  - linux-2.6.29-xen-disable-gbpages.patch
+ - linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From limb at fedoraproject.org  Mon Aug 10 19:26:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 10 Aug 2009 19:26:38 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.29,1.30
Message-ID: <20090810192638.BC6A111C0344@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28049

Modified Files:
	bacula.spec 
Log Message:
Dropped user/group removal per guidelines.
Added -common dep to traymonitor.




Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- bacula.spec	31 Jul 2009 13:07:38 -0000	1.29
+++ bacula.spec	10 Aug 2009 19:26:38 -0000	1.30
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 3.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -307,6 +307,7 @@ certain scripted checks.
 %package traymonitor
 Summary: Bacula monitor for the Gnome and KDE system tray
 Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
 
 %description traymonitor
 Bacula is a set of programs that allow you to manage the backup,
@@ -694,8 +695,9 @@ fi
 
 
 %postun common
-test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
+Dropped due to Guidelines
+#test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
+#test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
 
 
 %post storage-mysql
@@ -1003,6 +1005,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Jon Ciesla <limb at jcomserv.net - 3.0.2-3
+- Dropped user/group removal per guidelines.
+- Added -common dep to traymonitor.
+
 * Thu Jul 30 2009 Jon Ciesla <limb at jcomserv.net - 3.0.2-2
 - gnome-console consolehelper correction. BZ 426790.
 - add tray-monitor to consolehelper. BZ 426790



From limb at fedoraproject.org  Mon Aug 10 19:28:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 10 Aug 2009 19:28:35 +0000 (UTC)
Subject: rpms/bacula/F-11 bacula.spec,1.28,1.29
Message-ID: <20090810192835.6475311C0344@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28375

Modified Files:
	bacula.spec 
Log Message:
Dropped user/group removal per guidelines.
Added -common dep to traymonitor.




Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-11/bacula.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- bacula.spec	31 Jul 2009 14:12:41 -0000	1.28
+++ bacula.spec	10 Aug 2009 19:28:35 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -307,6 +307,7 @@ certain scripted checks.
 %package traymonitor
 Summary: Bacula monitor for the Gnome and KDE system tray
 Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
 
 %description traymonitor
 Bacula is a set of programs that allow you to manage the backup,
@@ -690,8 +691,8 @@ fi
 
 
 %postun common
-test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
+#test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
+#test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
 
 
 %post storage-mysql
@@ -996,6 +997,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-6
+- Dropped user/group removal per guidelines.
+- Added -common dep to traymonitor.
+
 * Thu Jul 30 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-5
 - gnome-console consolehelper correction. BZ 426790.
 - add tray-monitor to consolehelper. BZ 426790



From knol at fedoraproject.org  Mon Aug 10 19:29:43 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 19:29:43 +0000 (UTC)
Subject: rpms/getmail/F-10 .cvsignore, 1.9, 1.10 getmail.spec, 1.8,
	1.9 sources, 1.10, 1.11
Message-ID: <20090810192943.7D98811C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28640

Modified Files:
	.cvsignore getmail.spec sources 
Log Message:
Update to 4.11.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Jul 2009 07:18:18 -0000	1.9
+++ .cvsignore	10 Aug 2009 19:29:43 -0000	1.10
@@ -1 +1 @@
-getmail-4.9.2.tar.gz
+getmail-4.11.0.tar.gz


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/getmail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- getmail.spec	18 Jul 2009 07:18:19 -0000	1.8
+++ getmail.spec	10 Aug 2009 19:29:43 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
-Version: 4.9.2
+Version: 4.11.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -55,6 +55,9 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
+* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-1
+- update to release 4.11.0
+
 * Sat Jul 18 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1
 - Update to release 4.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Jul 2009 07:18:19 -0000	1.10
+++ sources	10 Aug 2009 19:29:43 -0000	1.11
@@ -1 +1 @@
-cbb2ef7bf12e2b6b4b748a73979e67a4  getmail-4.9.2.tar.gz
+bec537bd9f6677f8296d4396a54ed611  getmail-4.11.0.tar.gz



From pbrobinson at fedoraproject.org  Mon Aug 10 19:30:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 10 Aug 2009 19:30:30 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.10,1.11
Message-ID: <20090810193030.481C911C0344@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28937

Modified Files:
	mojito.spec 
Log Message:
- fix source url


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mojito.spec	7 Aug 2009 11:58:44 -0000	1.10
+++ mojito.spec	10 Aug 2009 19:30:30 -0000	1.11
@@ -6,7 +6,7 @@ Summary:        A social network data ag
 Group:          Applications/Internet
 License:        LGPLv2.1
 URL:            http://moblin.org/projects/mojito
-Source0:        http://moblin.org/sites/all/files/%{name}-%{version}.tar.bz2
+Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -58,7 +58,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} V=1
 
 #Remove libtool archives and static libs.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'



From scop at fedoraproject.org  Mon Aug 10 19:31:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 19:31:36 +0000 (UTC)
Subject: rpms/geany-plugins/devel .cvsignore, 1.2, 1.3 geany-plugins.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090810193136.C673C11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/geany-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29179

Modified Files:
	.cvsignore geany-plugins.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-5
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Jul 2009 19:45:29 -0000	1.2
+++ .cvsignore	10 Aug 2009 19:31:36 -0000	1.3
@@ -1 +1 @@
-geany-plugins-0.17.1.tar.gz
+geany-plugins-0.17.1.tar.bz2


Index: geany-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/geany-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- geany-plugins.spec	31 Jul 2009 19:45:29 -0000	1.1
+++ geany-plugins.spec	10 Aug 2009 19:31:36 -0000	1.2
@@ -3,13 +3,13 @@
 
 Name:           geany-plugins
 Version:        0.17.1
-Release:        4%{?dist}
+Release:        5%{?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
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-5
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-4
 - write BuildRequires at the beginning of this file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jul 2009 19:45:29 -0000	1.2
+++ sources	10 Aug 2009 19:31:36 -0000	1.3
@@ -1 +1 @@
-9587a8d8680c73833c7c55b9e1fd58aa  geany-plugins-0.17.1.tar.gz
+cf69cdb50917609915240f5d2ba4e2d7  geany-plugins-0.17.1.tar.bz2



From behdad at fedoraproject.org  Mon Aug 10 19:31:43 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 19:31:43 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.169,1.170
Message-ID: <20090810193143.86C6C11C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29201

Modified Files:
	pango.spec 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-6 
- One more try 



Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- pango.spec	10 Aug 2009 19:22:35 -0000	1.169
+++ pango.spec	10 Aug 2009 19:31:43 -0000	1.170
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -77,9 +77,8 @@ for the pango package.
 
 %build
 
-# We try hard to not link to libstdc++, this flag doesn't help
-CXXFLAGS=${CXXFLAGS/-fexceptions/}
-%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc
+# We try hard to not link to libstdc++
+%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc CXXFLAGS=${CXXFLAGS/-fexceptions/}
 make
 
 %install
@@ -229,6 +228,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-6
+- One more try
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-5
 - Remove -fexceptions from CXXFLAGS actually
 - Hopefully builds this time



From kyle at fedoraproject.org  Mon Aug 10 19:32:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:32:52 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-drivers-char-low-latency-removal.patch,
	1.3, 1.4 kernel.spec, 1.1691, 1.1692
Message-ID: <20090810193252.3F7CA11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29575

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-drivers-char-low-latency-removal.patch 
Log Message:
linux-2.6-drivers-char-low-latency-removal.patch

linux-2.6-drivers-char-low-latency-removal.patch:
 mxser.c  |    2 --
 nozomi.c |    2 --
 2 files changed, 4 deletions(-)

Index: linux-2.6-drivers-char-low-latency-removal.patch
===================================================================
RCS file: linux-2.6-drivers-char-low-latency-removal.patch
diff -N linux-2.6-drivers-char-low-latency-removal.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-drivers-char-low-latency-removal.patch	10 Aug 2009 19:32:52 -0000	1.4
@@ -0,0 +1,29 @@
+From: Chuck Ebbert <cebbert at redhat.com>
+Remove low_latency flag setting from nozomi and mxser drivers
+
+The kernel oopses if this flag is set.
+
+Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
+
+--- linux-2.6.30.noarch.orig/drivers/char/nozomi.c
++++ linux-2.6.30.noarch/drivers/char/nozomi.c
+@@ -1591,8 +1591,6 @@ static int ntty_open(struct tty_struct *
+ 
+ 	/* Enable interrupt downlink for channel */
+ 	if (port->port.count == 1) {
+-		/* FIXME: is this needed now ? */
+-		tty->low_latency = 1;
+ 		tty->driver_data = port;
+ 		tty_port_tty_set(&port->port, tty);
+ 		DBG1("open: %d", port->token_dl);
+--- linux-2.6.30.noarch.orig/drivers/char/mxser.c
++++ linux-2.6.30.noarch/drivers/char/mxser.c
+@@ -1048,8 +1048,6 @@ static int mxser_open(struct tty_struct 
+ 	if (retval)
+ 		return retval;
+ 
+-	/* unmark here for very high baud rate (ex. 921600 bps) used */
+-	tty->low_latency = 1;
+ 	return 0;
+ }
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1691
retrieving revision 1.1692
diff -u -p -r1.1691 -r1.1692
--- kernel.spec	10 Aug 2009 19:25:52 -0000	1.1691
+++ kernel.spec	10 Aug 2009 19:32:51 -0000	1.1692
@@ -621,6 +621,7 @@ Patch450: linux-2.6-input-kill-stupid-me
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 
 Patch460: linux-2.6-serial-460800.patch
+Patch461: linux-2.6-drivers-char-low-latency-removal.patch
 
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1211,6 +1212,9 @@ ApplyPatch linux-2.6-input-fix-toshiba-h
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
+# fix oops in nozomi drver (#507005) plus two others
+ApplyPatch linux-2.6-drivers-char-low-latency-removal.patch
+
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
@@ -1861,6 +1865,7 @@ fi
  - linux-2.6-kvm-skip-pit-check.patch
  - linux-2.6.29-xen-disable-gbpages.patch
  - linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
+ - linux-2.6-drivers-char-low-latency-removal.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From behdad at fedoraproject.org  Mon Aug 10 19:33:00 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 10 Aug 2009 19:33:00 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.170,1.171
Message-ID: <20090810193300.375DB11C0344@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29605

Modified Files:
	pango.spec 
Log Message:
* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-7 
- Yes, I am stupid. 



Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- pango.spec	10 Aug 2009 19:31:43 -0000	1.170
+++ pango.spec	10 Aug 2009 19:33:00 -0000	1.171
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -78,7 +78,7 @@ for the pango package.
 %build
 
 # We try hard to not link to libstdc++
-%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc CXXFLAGS=${CXXFLAGS/-fexceptions/}
+%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc CXXFLAGS="${CXXFLAGS/-fexceptions/}"
 make
 
 %install
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-7
+- Yes, I am stupid.
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-6
 - One more try
 



From lucilanga at fedoraproject.org  Mon Aug 10 19:35:21 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 10 Aug 2009 19:35:21 +0000 (UTC)
Subject: rpms/xastir/devel xastir.spec,1.20,1.21
Message-ID: <20090810193521.9E15E11C0344@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30736

Modified Files:
	xastir.spec 
Log Message:
* 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


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xastir.spec	27 Jul 2009 07:35:06 -0000	1.20
+++ xastir.spec	10 Aug 2009 19:35:21 -0000	1.21
@@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Re
 Name:    xastir
 Epoch:   1
 Version: 1.9.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -16,7 +16,7 @@ Requires: wget
 BuildRequires: wget, lesstif-devel, libXt-devel, festival, ImageMagick-devel
 BuildRequires: dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel
 BuildRequires: python-devel, shapelib-devel, gpsman, gdal-devel, db4-devel
-BuildRequires: desktop-file-utils, xorg-x11-utils
+BuildRequires: desktop-file-utils, xorg-x11-apps
 
 %description
 Xastir is a graphical application that interfaces HAM radio
@@ -84,6 +84,9 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* 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
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kyle at fedoraproject.org  Mon Aug 10 19:35:43 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:35:43 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-serial-add-txen-test-param.patch, 1.2,
	1.3 kernel.spec, 1.1692, 1.1693
Message-ID: <20090810193543.E071F11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30901

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-serial-add-txen-test-param.patch 
Log Message:
linux-2.6-serial-add-txen-test-param.patch

linux-2.6-serial-add-txen-test-param.patch:
 8250.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: linux-2.6-serial-add-txen-test-param.patch
===================================================================
RCS file: linux-2.6-serial-add-txen-test-param.patch
diff -N linux-2.6-serial-add-txen-test-param.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-serial-add-txen-test-param.patch	10 Aug 2009 19:35:43 -0000	1.3
@@ -0,0 +1,32 @@
+diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
+index a0127e9..19ba194 100644
+--- a/drivers/serial/8250.c
++++ b/drivers/serial/8250.c
+@@ -64,6 +64,8 @@ static int serial_index(struct uart_port *port)
+ 	return (serial8250_reg.minor - 64) + port->line;
+ }
+ 
++static unsigned int skip_txen_test; /* force skip of txen test at init time */
++
+ /*
+  * Debugging.
+  */
+@@ -2101,7 +2103,7 @@ static int serial8250_startup(struct uart_port *port)
+ 	   is variable. So, let's just don't test if we receive
+ 	   TX irq. This way, we'll never enable UART_BUG_TXEN.
+ 	 */
+-	if (up->port.flags & UPF_NO_TXEN_TEST)
++	if (skip_txen_test || up->port.flags & UPF_NO_TXEN_TEST)
+ 		goto dont_test_tx_en;
+ 
+ 	/*
+@@ -3235,6 +3237,9 @@ MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
+ module_param(nr_uarts, uint, 0644);
+ MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
+ 
++module_param(skip_txen_test, uint, 0644);
++MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
++
+ #ifdef CONFIG_SERIAL_8250_RSA
+ module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444);
+ MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -p -r1.1692 -r1.1693
--- kernel.spec	10 Aug 2009 19:32:51 -0000	1.1692
+++ kernel.spec	10 Aug 2009 19:35:43 -0000	1.1693
@@ -622,6 +622,7 @@ Patch451: linux-2.6-input-fix-toshiba-ho
 
 Patch460: linux-2.6-serial-460800.patch
 Patch461: linux-2.6-drivers-char-low-latency-removal.patch
+Patch462: linux-2.6-serial-add-txen-test-param.patch
 
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1211,9 +1212,10 @@ ApplyPatch linux-2.6-input-fix-toshiba-h
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
-
 # fix oops in nozomi drver (#507005) plus two others
 ApplyPatch linux-2.6-drivers-char-low-latency-removal.patch
+# let users skip the TXEN bug test
+ApplyPatch linux-2.6-serial-add-txen-test-param.patch
 
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
@@ -1866,6 +1868,7 @@ fi
  - linux-2.6.29-xen-disable-gbpages.patch
  - linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
  - linux-2.6-drivers-char-low-latency-removal.patch
+ - linux-2.6-serial-add-txen-test-param.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From scop at fedoraproject.org  Mon Aug 10 19:35:59 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 19:35:59 +0000 (UTC)
Subject: rpms/gedit-plugins/devel .cvsignore, 1.5, 1.6 gedit-plugins.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090810193559.ABBCA11C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gedit-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30961

Modified Files:
	.cvsignore gedit-plugins.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.26.1-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Apr 2009 14:22:54 -0000	1.5
+++ .cvsignore	10 Aug 2009 19:35:59 -0000	1.6
@@ -1 +1 @@
-gedit-plugins-2.26.1.tar.gz
+gedit-plugins-2.26.1.tar.bz2


Index: gedit-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/gedit-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gedit-plugins.spec	24 Jul 2009 23:48:32 -0000	1.10
+++ gedit-plugins.spec	10 Aug 2009 19:35:59 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           gedit-plugins
 Version:        2.26.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins 
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.26/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.26/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gedit-devel
@@ -91,6 +91,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.26.1-3
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-plugins/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Apr 2009 14:22:54 -0000	1.5
+++ sources	10 Aug 2009 19:35:59 -0000	1.6
@@ -1 +1 @@
-f16f21dbf39ac31d7d43f4ee881e86cb  gedit-plugins-2.26.1.tar.gz
+69fd19d6b32ceb9d4888d39633259ebe  gedit-plugins-2.26.1.tar.bz2



From kyle at fedoraproject.org  Mon Aug 10 19:38:33 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:38:33 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-input-wacom-bluetooth.patch, 1.2,
	1.3 kernel.spec, 1.1693, 1.1694
Message-ID: <20090810193833.63BBA11C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31485

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-input-wacom-bluetooth.patch 
Log Message:
linux-2.6-input-wacom-bluetooth.patch

linux-2.6-input-wacom-bluetooth.patch:
 Kconfig     |    7 +
 Makefile    |    1 
 hid-core.c  |    1 
 hid-ids.h   |    1 
 hid-wacom.c |  261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 270 insertions(+), 1 deletion(-)

Index: linux-2.6-input-wacom-bluetooth.patch
===================================================================
RCS file: linux-2.6-input-wacom-bluetooth.patch
diff -N linux-2.6-input-wacom-bluetooth.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-input-wacom-bluetooth.patch	10 Aug 2009 19:38:33 -0000	1.3
@@ -0,0 +1,348 @@
+>From 99074a7cf9622837af84d330e07bdb46307c254f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 16 Mar 2009 23:36:54 +0000
+Subject: [PATCH] Wacom Graphire Bluetooth driver
+
+Signed-off-by: Bastien Nocera <hadess at hadess.net>
+
+Based on the work by Andrew Zabolotny, an HID driver for the Bluetooth
+Wacom tablet. This is required as it uses a slightly different
+protocols from what's currently support by the drivers/input/wacom*
+driver, and those only support USB.
+
+A user-space patch is required to activate mode 2 of the Wacom tablet,
+as hidp does not support hid_output_raw_report.
+---
+ drivers/hid/Kconfig     |    7 ++
+ drivers/hid/Makefile    |    1 +
+ drivers/hid/hid-core.c  |    1 +
+ drivers/hid/hid-ids.h   |    1 +
+ drivers/hid/hid-wacom.c |  260 +++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 270 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/hid/hid-wacom.c
+
+diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
+index e85c8fe..f3244e3 100644
+--- a/drivers/hid/Kconfig
++++ b/drivers/hid/Kconfig
+@@ -261,6 +261,13 @@ config THRUSTMASTER_FF
+ 	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
+ 	  a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.
+ 
++config HID_WACOM
++	tristate "Wacom Bluetooth devices support" if EMBEDDED
++	depends on BT_HIDP
++	default !EMBEDDED
++	---help---
++	Support for Wacom Graphire Bluetooth tablet.
++
+ config ZEROPLUS_FF
+ 	tristate "Zeroplus based game controller support"
+ 	depends on USB_HID
+diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
+index fbd021f..410b302 100644
+--- a/drivers/hid/Makefile
++++ b/drivers/hid/Makefile
+@@ -41,6 +41,7 @@ obj-$(CONFIG_GREENASIA_FF)	+= hid-gaff.o
+ obj-$(CONFIG_THRUSTMASTER_FF)	+= hid-tmff.o
+ obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o
+ obj-$(CONFIG_ZEROPLUS_FF)	+= hid-zpff.o
++obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o
+ 
+ obj-$(CONFIG_USB_HID)		+= usbhid/
+ obj-$(CONFIG_USB_MOUSE)		+= usbhid/
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 1cc9674..d134f5d 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1305,6 +1305,7 @@ static const struct hid_device_id hid_blacklist[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
+ 
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 8851197..e8f96c2 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -400,6 +400,7 @@
+ #define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006
+ 
+ #define USB_VENDOR_ID_WACOM		0x056a
++#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81
+ 
+ #define USB_VENDOR_ID_WISEGROUP		0x0925
+ #define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101
+diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
+new file mode 100644
+index 0000000..67c8c3a
+--- /dev/null
++++ b/drivers/hid/hid-wacom.c
+@@ -0,0 +1,260 @@
++/*
++ *  Bluetooth Wacom Tablet support
++ *
++ *  Copyright (c) 1999 Andreas Gal
++ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech at suse.cz>
++ *  Copyright (c) 2005 Michael Haboustak <mike- at cinci.rr.com> for Concept2, Inc
++ *  Copyright (c) 2006-2007 Jiri Kosina
++ *  Copyright (c) 2007 Paul Walmsley
++ *  Copyright (c) 2008 Jiri Slaby <jirislaby at gmail.com>
++ *  Copyright (c) 2006 Andrew Zabolotny <zap at homelink.ru>
++ *  Copyright (c) 2009 Bastien Nocera <hadess at hadess.net>
++ */
++
++/*
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the Free
++ * Software Foundation; either version 2 of the License, or (at your option)
++ * any later version.
++ */
++
++#include <linux/device.h>
++#include <linux/hid.h>
++#include <linux/module.h>
++
++#include "hid-ids.h"
++
++struct wacom_data {
++	__u16 tool;
++	unsigned char butstate;
++};
++
++static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report,
++		u8 *raw_data, int size)
++{
++	struct wacom_data *wdata = hid_get_drvdata(hdev);
++	struct hid_input *hidinput;
++	struct input_dev *input;
++	unsigned char *data = (unsigned char *) raw_data;
++	int tool, x, y, rw;
++
++	if (!(hdev->claimed & HID_CLAIMED_INPUT))
++		return 0;
++
++	tool = 0;
++	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
++	input = hidinput->input;
++
++	/* Check if this is a tablet report */
++	if (data[0] != 0x03)
++		return 0;
++
++	/* Get X & Y positions */
++	x = le16_to_cpu(*(__le16 *) &data[2]);
++	y = le16_to_cpu(*(__le16 *) &data[4]);
++
++	/* Get current tool identifier */
++	if (data[1] & 0x90) { /* If pen is in the in/active area */
++		switch ((data[1] >> 5) & 3) {
++		case 0:	/* Pen */
++			tool = BTN_TOOL_PEN;
++			break;
++
++		case 1: /* Rubber */
++			tool = BTN_TOOL_RUBBER;
++			break;
++
++		case 2: /* Mouse with wheel */
++		case 3: /* Mouse without wheel */
++			tool = BTN_TOOL_MOUSE;
++			break;
++		}
++
++		/* Reset tool if out of active tablet area */
++		if (!(data[1] & 0x10))
++			tool = 0;
++	}
++
++	/* If tool changed, notify input subsystem */
++	if (wdata->tool != tool) {
++		if (wdata->tool) {
++			/* Completely reset old tool state */
++			if (wdata->tool == BTN_TOOL_MOUSE) {
++				input_report_key(input, BTN_LEFT, 0);
++				input_report_key(input, BTN_RIGHT, 0);
++				input_report_key(input, BTN_MIDDLE, 0);
++				input_report_abs(input, ABS_DISTANCE,
++						input->absmax[ABS_DISTANCE]);
++			} else {
++				input_report_key(input, BTN_TOUCH, 0);
++				input_report_key(input, BTN_STYLUS, 0);
++				input_report_key(input, BTN_STYLUS2, 0);
++				input_report_abs(input, ABS_PRESSURE, 0);
++			}
++			input_report_key(input, wdata->tool, 0);
++			input_sync(input);
++		}
++		wdata->tool = tool;
++		if (tool)
++			input_report_key(input, tool, 1);
++	}
++
++	if (tool) {
++		input_report_abs(input, ABS_X, x);
++		input_report_abs(input, ABS_Y, y);
++
++		switch ((data[1] >> 5) & 3) {
++		case 2: /* Mouse with wheel */
++			input_report_key(input, BTN_MIDDLE, data[1] & 0x04);
++			rw = (data[6] & 0x01) ? -1 :
++				(data[6] & 0x02) ? 1 : 0;
++			input_report_rel(input, REL_WHEEL, rw);
++			/* fall through */
++
++		case 3: /* Mouse without wheel */
++			input_report_key(input, BTN_LEFT, data[1] & 0x01);
++			input_report_key(input, BTN_RIGHT, data[1] & 0x02);
++			/* Compute distance between mouse and tablet */
++			rw = 44 - (data[6] >> 2);
++			if (rw < 0)
++				rw = 0;
++			else if (rw > 31)
++				rw = 31;
++			input_report_abs(input, ABS_DISTANCE, rw);
++			break;
++
++		default:
++			input_report_abs(input, ABS_PRESSURE,
++					data[6] | (((__u16) (data[1] & 0x08)) << 5));
++			input_report_key(input, BTN_TOUCH, data[1] & 0x01);
++			input_report_key(input, BTN_STYLUS, data[1] & 0x02);
++			input_report_key(input, BTN_STYLUS2, (tool == BTN_TOOL_PEN) && data[1] & 0x04);
++			break;
++		}
++
++		input_sync(input);
++	}
++
++	/* Report the state of the two buttons at the top of the tablet
++	 * as two extra fingerpad keys (buttons 4 & 5). */
++	rw = data[7] & 0x03;
++	if (rw != wdata->butstate) {
++		wdata->butstate = rw;
++		input_report_key(input, BTN_0, rw & 0x02);
++		input_report_key(input, BTN_1, rw & 0x01);
++		input_event(input, EV_MSC, MSC_SERIAL, 0xf0);
++		input_sync(input);
++	}
++
++	return 1;
++}
++
++static int wacom_probe(struct hid_device *hdev,
++		const struct hid_device_id *id)
++{
++	struct hid_input *hidinput;
++	struct input_dev *input;
++	struct wacom_data *wdata;
++	int ret;
++
++	wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);
++	if (wdata == NULL) {
++		dev_err(&hdev->dev, "can't alloc wacom descriptor\n");
++		return -ENOMEM;
++	}
++
++	hid_set_drvdata(hdev, wdata);
++
++	ret = hid_parse(hdev);
++	if (ret) {
++		dev_err(&hdev->dev, "parse failed\n");
++		goto err_free;
++	}
++
++	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
++	if (ret) {
++		dev_err(&hdev->dev, "hw start failed\n");
++		goto err_free;
++	}
++
++	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
++	input = hidinput->input;
++
++	/* Basics */
++	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);
++	input->absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) |
++		BIT(ABS_PRESSURE) | BIT(ABS_DISTANCE);
++	input->relbit[0] |= BIT(REL_WHEEL);
++	set_bit(BTN_TOOL_PEN, input->keybit);
++	set_bit(BTN_TOUCH, input->keybit);
++	set_bit(BTN_STYLUS, input->keybit);
++	set_bit(BTN_STYLUS2, input->keybit);
++	set_bit(BTN_LEFT, input->keybit);
++	set_bit(BTN_RIGHT, input->keybit);
++	set_bit(BTN_MIDDLE, input->keybit);
++
++	/* Pad */
++	input->evbit[0] |= BIT(EV_MSC);
++	input->mscbit[0] |= BIT(MSC_SERIAL);
++
++	/* Distance, rubber and mouse */
++	input->absbit[0] |= BIT(ABS_DISTANCE);
++	set_bit(BTN_TOOL_RUBBER, input->keybit);
++	set_bit(BTN_TOOL_MOUSE, input->keybit);
++
++	input->absmax[ABS_PRESSURE] = 511;
++	input->absmax[ABS_DISTANCE] = 32;
++
++	input->absmax[ABS_X] = 16704;
++	input->absmax[ABS_Y] = 12064;
++	input->absfuzz[ABS_X] = 4;
++	input->absfuzz[ABS_Y] = 4;
++
++	return 0;
++err_free:
++	kfree(wdata);
++	return ret;
++}
++
++static void wacom_remove(struct hid_device *hdev)
++{
++	hid_hw_stop(hdev);
++	kfree(hid_get_drvdata(hdev));
++}
++
++static const struct hid_device_id wacom_devices[] = {
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
++
++	{ }
++};
++MODULE_DEVICE_TABLE(hid, wacom_devices);
++
++static struct hid_driver wacom_driver = {
++	.name = "wacom",
++	.id_table = wacom_devices,
++	.probe = wacom_probe,
++	.remove = wacom_remove,
++	.raw_event = wacom_raw_event,
++};
++
++static int wacom_init(void)
++{
++	int ret;
++
++	ret = hid_register_driver(&wacom_driver);
++	if (ret)
++		printk(KERN_ERR "can't register wacom driver\n");
++	printk(KERN_ERR "wacom driver registered\n");
++	return ret;
++}
++
++static void wacom_exit(void)
++{
++	hid_unregister_driver(&wacom_driver);
++}
++
++module_init(wacom_init);
++module_exit(wacom_exit);
++MODULE_LICENSE("GPL");
++
++HID_COMPAT_LOAD_DRIVER(wacom);
+-- 
+1.6.2
+
+
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1693
retrieving revision 1.1694
diff -u -p -r1.1693 -r1.1694
--- kernel.spec	10 Aug 2009 19:35:43 -0000	1.1693
+++ kernel.spec	10 Aug 2009 19:38:32 -0000	1.1694
@@ -619,6 +619,7 @@ Patch390: linux-2.6-defaults-acpi-video.
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
+Patch452: linux-2.6-input-wacom-bluetooth.patch
 
 Patch460: linux-2.6-serial-460800.patch
 Patch461: linux-2.6-drivers-char-low-latency-removal.patch
@@ -1210,6 +1211,9 @@ ApplyPatch linux-2.6-input-kill-stupid-m
 # Get away from having to poll Toshibas
 ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
+# HID: add support for Bluetooth Wacom pads
+ApplyPatch linux-2.6-input-wacom-bluetooth.patch
+
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 # fix oops in nozomi drver (#507005) plus two others
@@ -1869,6 +1873,7 @@ fi
  - linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
  - linux-2.6-drivers-char-low-latency-removal.patch
  - linux-2.6-serial-add-txen-test-param.patch
+ - linux-2.6-input-wacom-bluetooth.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From scop at fedoraproject.org  Mon Aug 10 19:46:01 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 19:46:01 +0000 (UTC)
Subject: rpms/gget/devel .cvsignore, 1.2, 1.3 gget.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090810194601.119F211C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv465

Modified Files:
	.cvsignore gget.spec sources 
Log Message:
* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.4-11
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gget/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Feb 2009 19:11:55 -0000	1.2
+++ .cvsignore	10 Aug 2009 19:46:00 -0000	1.3
@@ -1 +1 @@
-gget-0.0.4.tar.gz
+gget-0.0.4.tar.bz2


Index: gget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gget/devel/gget.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gget.spec	25 Jul 2009 00:01:41 -0000	1.2
+++ gget.spec	10 Aug 2009 19:46:00 -0000	1.3
@@ -5,12 +5,12 @@
 
 Name:           gget
 Version:        0.0.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Download Manager for the GNOME desktop
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://live.gnome.org/GGet
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gget/0.0/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gget/0.0/%{name}-%{version}.tar.bz2
 # Detects Epiphany 2.26/2.25 for rawhide
 # http://bugzilla.gnome.org/show_bug.cgi?id=572602
 Patch0:         gget-0.0.4-epiphany.patch
@@ -113,6 +113,9 @@ update-mime-database %{_datadir}/mime &>
 %{_libdir}/epiphany/*/extensions/gget*
 
 %changelog
+* Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.0.4-11
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gget/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Feb 2009 19:11:55 -0000	1.2
+++ sources	10 Aug 2009 19:46:00 -0000	1.3
@@ -1 +1 @@
-914d2d51186f6d24237409e59f8f9cde  gget-0.0.4.tar.gz
+fb997cac66287c18da74bb7b6d6a07e9  gget-0.0.4.tar.bz2



From kyle at fedoraproject.org  Mon Aug 10 19:46:37 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:46:37 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1694,
	1.1695 linux-2.6-debug-nmi-timeout.patch, 1.4,
	1.5 linux-2.6-debug-taint-vm.patch, 1.23, 1.24
Message-ID: <20090810194637.2C5C611C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv656

Modified Files:
	kernel.spec linux-2.6-debug-nmi-timeout.patch 
	linux-2.6-debug-taint-vm.patch 
Log Message:
fix debug-taint-vm and debug-nmi-timeout


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -p -r1.1694 -r1.1695
--- kernel.spec	10 Aug 2009 19:38:32 -0000	1.1694
+++ kernel.spec	10 Aug 2009 19:46:36 -0000	1.1695
@@ -1173,8 +1173,8 @@ ApplyPatch linux-2.6-acpi-video-dos.patc
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
-#ApplyPatch linux-2.6-debug-nmi-timeout.patch
-#ApplyPatch linux-2.6-debug-taint-vm.patch
+ApplyPatch linux-2.6-debug-nmi-timeout.patch
+ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-spinlock-taint.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch

linux-2.6-debug-nmi-timeout.patch:
 arch/x86/kernel/apic/nmi.c |    2 +-
 lib/Kconfig.debug          |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-nmi-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-debug-nmi-timeout.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-debug-nmi-timeout.patch	15 Jul 2008 13:51:23 -0000	1.4
+++ linux-2.6-debug-nmi-timeout.patch	10 Aug 2009 19:46:36 -0000	1.5
@@ -1,6 +1,8 @@
---- linux-2.6.26.noarch/arch/x86/kernel/nmi.c~	2008-07-14 20:31:14.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/nmi.c	2008-07-14 20:31:38.000000000 -0400
-@@ -416,7 +416,7 @@ nmi_watchdog_tick(struct pt_regs *regs, 
+diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
+index ce4fbfa..2bd9e51 100644
+--- a/arch/x86/kernel/apic/nmi.c
++++ b/arch/x86/kernel/apic/nmi.c
+@@ -436,7 +436,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
  		 * wait a few IRQs (5 seconds) before doing the oops ...
  		 */
  		local_inc(&__get_cpu_var(alert_counter));
@@ -9,9 +11,11 @@
  			/*
  			 * die_nmi will return ONLY if NOTIFY_STOP happens..
  			 */
---- linux-2.6.21.noarch/lib/Kconfig.debug~	2007-07-06 17:05:46.000000000 -0400
-+++ linux-2.6.21.noarch/lib/Kconfig.debug	2007-07-06 17:06:07.000000000 -0400
-@@ -126,6 +126,14 @@ config SCHEDSTATS
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index 3be4b7c..ba45afd 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -245,6 +245,14 @@ config SCHEDSTATS
  	  application, you can say N to avoid the very slight overhead
  	  this adds.
  

linux-2.6-debug-taint-vm.patch:
 kernel/panic.c  |    3 ++-
 mm/page_alloc.c |    5 +++--
 mm/slab.c       |    8 ++++----
 mm/slub.c       |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- linux-2.6-debug-taint-vm.patch	15 Jan 2009 07:38:39 -0000	1.23
+++ linux-2.6-debug-taint-vm.patch	10 Aug 2009 19:46:36 -0000	1.24
@@ -1,28 +1,26 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 2a2ff36..361d852 100644
+index 984b3ec..0b4ea72 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -194,6 +194,7 @@ const char *print_tainted(void)
- 		snprintf(buf, sizeof(buf), "Not tainted");
- 	return(buf);
+@@ -199,6 +199,7 @@ const char *print_tainted(void)
+ 
+ 	return buf;
  }
 +EXPORT_SYMBOL(print_tainted);
  
  int test_taint(unsigned flag)
  {
-@@ -334,8 +335,8 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
- 	sprint_symbol(function, caller);
+@@ -350,7 +351,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
+ 	const char *board;
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
--		line, function);
-+	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
-+		line, function, print_tainted());
+-	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
++	printk(KERN_WARNING "WARNING: at %s:%d %pS() (%s)\n", file, line, caller, print_tainted());
  	board = dmi_get_system_info(DMI_PRODUCT_NAME);
  	if (board)
  		printk(KERN_WARNING "Hardware name: %s\n", board);
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 5675b30..ae3e7ff 100644
+index 480907c..add80e2 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -250,9 +250,10 @@ static void bad_page(struct page *page)
@@ -39,10 +37,10 @@ index 5675b30..ae3e7ff 100644
  	dump_stack();
  out:
 diff --git a/mm/slab.c b/mm/slab.c
-index ddc41f3..bf54397 100644
+index 021d69f..f25d4c3 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
+@@ -1867,8 +1867,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -53,7 +51,7 @@ index ddc41f3..bf54397 100644
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2930,8 +2930,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2939,8 +2939,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -65,10 +63,10 @@ index ddc41f3..bf54397 100644
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 6392ae5..4f6acce 100644
+index 253016d..d23af85 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -431,7 +431,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");



From kyle at fedoraproject.org  Mon Aug 10 19:53:18 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:53:18 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1695,
	1.1696 linux-2.6-selinux-mprotect-checks.patch, 1.8,
	1.9 linux-2.6-sparc-selinux-mprotect-checks.patch, 1.2, NONE
Message-ID: <20090810195318.EF5C911C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1931

Modified Files:
	kernel.spec linux-2.6-selinux-mprotect-checks.patch 
Removed Files:
	linux-2.6-sparc-selinux-mprotect-checks.patch 
Log Message:
fix up selinux-mprotect-checks patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1695
retrieving revision 1.1696
diff -u -p -r1.1695 -r1.1696
--- kernel.spec	10 Aug 2009 19:46:36 -0000	1.1695
+++ kernel.spec	10 Aug 2009 19:53:18 -0000	1.1696
@@ -1228,9 +1228,8 @@ ApplyPatch linux-2.6-silence-noise.patch
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
 # Fix the SELinux mprotect checks on executable mappings
-#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
-# Fix SELinux for sparc
-#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
+#  (but it's broken on sparc... sigh)
+ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 
 # Changes to upstream defaults.
 

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- linux-2.6-selinux-mprotect-checks.patch	29 Dec 2008 02:48:00 -0000	1.8
+++ linux-2.6-selinux-mprotect-checks.patch	10 Aug 2009 19:53:18 -0000	1.9
@@ -5,37 +5,25 @@ ie, Fedora has a new enough toolchain, a
 the ifdefs.  Other distros don't/haven't, and this patch would break them
 if pushed upstream.
 
---- linux-2.6.26.noarch/security/selinux/hooks.c~	2008-09-25 14:11:17.000000000 -0400
-+++ linux-2.6.26.noarch/security/selinux/hooks.c	2008-09-25 14:12:17.000000000 -0400
-@@ -3018,7 +3018,6 @@ static int file_map_prot_check(struct fi
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index 2fcad7c..012c753 100644
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -2999,7 +2999,7 @@ static int file_map_prot_check(struct file *file, unsigned long prot, int shared
  	const struct cred *cred = current_cred();
  	int rc = 0;
  
 -#ifndef CONFIG_PPC32
++#ifndef CONFIG_SPARC
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -3029,7 +3028,6 @@ static int file_map_prot_check(struct fi
- 		if (rc)
- 			goto error;
- 	}
--#endif
- 
- 	if (file) {
- 		/* read access is always possible with a mapping */
-@@ -3024,7 +3022,6 @@ static int selinux_file_mprotect(struct 
+@@ -3059,7 +3059,7 @@ static int selinux_file_mprotect(struct vm_area_struct *vma,
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
 -#ifndef CONFIG_PPC32
++#ifndef CONFIG_SPARC
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
- 		rc = 0;
+ 		int rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -3049,7 +3046,6 @@ static int selinux_file_mprotect(struct 
- 		if (rc)
- 			return rc;
- 	}
--#endif
- 
- 	return file_map_prot_check(vma->vm_file, prot, vma->vm_flags&VM_SHARED);
- }


--- linux-2.6-sparc-selinux-mprotect-checks.patch DELETED ---



From kyle at fedoraproject.org  Mon Aug 10 19:54:25 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 19:54:25 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1696,1.1697
Message-ID: <20090810195425.7481511C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2163

Modified Files:
	kernel.spec 
Log Message:
oops, nuke sparc-selinux-mprotect patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1696
retrieving revision 1.1697
diff -u -p -r1.1696 -r1.1697
--- kernel.spec	10 Aug 2009 19:53:18 -0000	1.1696
+++ kernel.spec	10 Aug 2009 19:54:25 -0000	1.1697
@@ -628,7 +628,6 @@ Patch462: linux-2.6-serial-add-txen-test
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
-Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch



From vpv at fedoraproject.org  Mon Aug 10 19:54:40 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 10 Aug 2009 19:54:40 +0000 (UTC)
Subject: rpms/mozvoikko/devel .cvsignore, 1.4, 1.5 mozvoikko.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <20090810195440.D579F11C0344@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2241

Modified Files:
	.cvsignore mozvoikko.spec sources 
Log Message:
* Mon Aug 10 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-1
- Update to 1.0.
- Use "official" upstream source, the RC sources have been removed. 
- This is mostly a cosmetic change, no code was changed, only the XML file
  defining the extension version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Feb 2009 19:27:47 -0000	1.4
+++ .cvsignore	10 Aug 2009 19:54:40 -0000	1.5
@@ -1 +1 @@
-mozvoikko-0.9.7rc1.tar.gz
+mozvoikko-1.0.tar.gz


Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mozvoikko.spec	6 Aug 2009 16:29:03 -0000	1.14
+++ mozvoikko.spec	10 Aug 2009 19:54:40 -0000	1.15
@@ -1,9 +1,3 @@
-# Note: The newest stable upstream release of mozvoikko is 1.0, but there were
-# no code changes compared to 0.9.7rc1, only changes to the application
-# version limits in install.rdf. For this packaged xulrunner-based version
-# the Makefile.xulrunner edits the maxVersions to *, so there is no reason to
-# update this package to 1.0.
-
 # For the xulrunner unstable requires
 %define gecko_ver 1.9.1.2
 # These come from install.rdf
@@ -17,16 +11,16 @@
 %endif
 
 Name:           mozvoikko
-Version:        0.9.7
-Release:        0.8.rc1%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net
 # Usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
+#Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
 # 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For xulrunner unstable
@@ -75,6 +69,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-1
+- Update to 1.0.
+- Use "official" upstream source, the RC sources have been removed. 
+- This is mostly a cosmetic change, no code was changed, only the XML file
+  defining the extension version.
+
 * Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.8.rc1
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Feb 2009 19:27:47 -0000	1.4
+++ sources	10 Aug 2009 19:54:40 -0000	1.5
@@ -1 +1 @@
-463481733eb994678f1e82719a6bb137  mozvoikko-0.9.7rc1.tar.gz
+c1b607e54186ea208d95cd1cb79f9e33  mozvoikko-1.0.tar.gz



From vpv at fedoraproject.org  Mon Aug 10 20:02:51 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 10 Aug 2009 20:02:51 +0000 (UTC)
Subject: rpms/openoffice.org-voikko/devel .cvsignore, 1.10,
	1.11 openoffice.org-voikko.spec, 1.22, 1.23 sources, 1.10, 1.11
Message-ID: <20090810200251.2612E11C0344@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3785

Modified Files:
	.cvsignore openoffice.org-voikko.spec sources 
Log Message:
* Mon Aug 10 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-1
- Update source URL to "official" upstream and bump version accordingly.
- The tarball is the same as in RC2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	13 Apr 2009 12:34:44 -0000	1.10
+++ .cvsignore	10 Aug 2009 20:02:50 -0000	1.11
@@ -1 +1 @@
-openoffice.org-voikko-3.1rc2.tar.gz
+openoffice.org-voikko-3.1.tar.gz


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- openoffice.org-voikko.spec	25 Jul 2009 20:51:19 -0000	1.22
+++ openoffice.org-voikko.spec	10 Aug 2009 20:02:50 -0000	1.23
@@ -1,18 +1,15 @@
-# Note: openoffice.org-voikko 3.1 rc2 was released as stable, there is no need
-# to do an update to openoffice.org-voikko 3.1, even the cheksums in the
-# tarballs match.
 Name:           openoffice.org-voikko
 Version:        3.1 
-Release:        0.3.rc2%{?dist}
+Release:        1%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
-#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}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:    openoffice.org-sdk >= 1:3.1.0
@@ -87,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-1
+- Update source URL to "official" upstream and bump version accordingly.
+- The tarball is the same as in RC2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-0.3.rc2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	13 Apr 2009 12:34:44 -0000	1.10
+++ sources	10 Aug 2009 20:02:50 -0000	1.11
@@ -1 +1 @@
-8dda075fa199fe9cd0f6b5ec1f2ff46e  openoffice.org-voikko-3.1rc2.tar.gz
+8dda075fa199fe9cd0f6b5ec1f2ff46e  openoffice.org-voikko-3.1.tar.gz



From limb at fedoraproject.org  Mon Aug 10 20:07:36 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 10 Aug 2009 20:07:36 +0000 (UTC)
Subject: rpms/bacula/F-10 bacula.spec,1.17,1.18
Message-ID: <20090810200736.82ED511C0344@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5294

Modified Files:
	bacula.spec 
Log Message:
Dropped user/group removal per guidelines.
Added -common dep to traymonitor.




Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-10/bacula.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- bacula.spec	31 Jul 2009 14:40:10 -0000	1.17
+++ bacula.spec	10 Aug 2009 20:07:36 -0000	1.18
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -307,6 +307,7 @@ certain scripted checks.
 %package traymonitor
 Summary: Bacula monitor for the Gnome and KDE system tray
 Group: System Environment/Daemons
+Requires: bacula-common = %{version}-%{release}
 
 %description traymonitor
 Bacula is a set of programs that allow you to manage the backup,
@@ -690,8 +691,8 @@ fi
 
 
 %postun common
-test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
+#test "$1" != 0 || /usr/sbin/fedora-userdel  bacula &>/dev/null || :
+#test "$1" != 0 || /usr/sbin/fedora-groupdel bacula &>/dev/null || :
 
 
 %post storage-mysql
@@ -996,6 +997,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-6
+- Dropped user/group removal per guidelines.
+- Added -common dep to traymonitor.
+
 * Thu Jul 30 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-5
 - gnome-console consolehelper correction. BZ 426790.
 - add tray-monitor to consolehelper. BZ 426790



From kyle at fedoraproject.org  Mon Aug 10 20:18:35 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 20:18:35 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-defaults-saner-vm-settings.patch, 1.2,
	1.3 linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch,
	1.3, 1.4 linux-2.6-mm-lru-evict-streaming-io-pages-first.patch, 1.3, 
	1.4 linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch,
	1.2, 1.3 kernel.spec, 1.1697, 1.1698
Message-ID: <20090810201835.1621611C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6750

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-defaults-saner-vm-settings.patch 
	linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch 
	linux-2.6-mm-lru-evict-streaming-io-pages-first.patch 
	linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch 
Log Message:
sync up vm tweaks

linux-2.6-defaults-saner-vm-settings.patch:
 vmscan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-defaults-saner-vm-settings.patch
===================================================================
RCS file: linux-2.6-defaults-saner-vm-settings.patch
diff -N linux-2.6-defaults-saner-vm-settings.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-defaults-saner-vm-settings.patch	10 Aug 2009 20:18:34 -0000	1.3
@@ -0,0 +1,13 @@
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index 3fce32b..09c804c 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -127,7 +127,7 @@ struct scan_control {
+ /*
+  * From 0 .. 100.  Higher means more swappy.
+  */
+-int vm_swappiness = 60;
++int vm_swappiness = 40;
+ long vm_total_pages;	/* The total number of pages which the VM controls */
+ 
+ static LIST_HEAD(shrinker_list);

linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch:
 vmscan.c |   33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

Index: linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
===================================================================
RCS file: linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
diff -N linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch	10 Aug 2009 20:18:34 -0000	1.4
@@ -0,0 +1,90 @@
+vmscan: make mapped executable pages the first class citizen
+
+Protect referenced PROT_EXEC mapped pages from being deactivated.
+
+PROT_EXEC(or its internal presentation VM_EXEC) pages normally belong to some
+currently running executables and their linked libraries, they shall really be
+cached aggressively to provide good user experiences.
+
+CC: Elladan <elladan at eskimo.com>
+CC: Nick Piggin <npiggin at suse.de>
+CC: Johannes Weiner <hannes at cmpxchg.org>
+CC: Christoph Lameter <cl at linux-foundation.org>
+CC: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
+Acked-by: Peter Zijlstra <peterz at infradead.org>
+Acked-by: Rik van Riel <riel at redhat.com>
+Signed-off-by: Wu Fengguang <fengguang.wu at intel.com>
+---
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index f322f31..3fce32b 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -1228,6 +1228,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 	unsigned long pgscanned;
+ 	unsigned long vm_flags;
+ 	LIST_HEAD(l_hold);	/* The pages which were snipped off */
++	LIST_HEAD(l_active);
+ 	LIST_HEAD(l_inactive);
+ 	struct page *page;
+ 	struct pagevec pvec;
+@@ -1267,8 +1268,13 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 
+ 		/* page_referenced clears PageReferenced */
+ 		if (page_mapping_inuse(page) &&
+-		    page_referenced(page, 0, sc->mem_cgroup, &vm_flags))
++		    page_referenced(page, 0, sc->mem_cgroup, &vm_flags)) {
+ 			pgmoved++;
++			if ((vm_flags & VM_EXEC) && !PageAnon(page)) {
++				list_add(&page->lru, &l_active);
++				continue;
++			}
++		}
+ 
+ 		list_add(&page->lru, &l_inactive);
+ 	}
+@@ -1277,7 +1283,6 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 	 * Move the pages to the [file or anon] inactive list.
+ 	 */
+ 	pagevec_init(&pvec, 1);
+-	lru = LRU_BASE + file * LRU_FILE;
+ 
+ 	spin_lock_irq(&zone->lru_lock);
+ 	/*
+@@ -1289,6 +1294,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 	reclaim_stat->recent_rotated[!!file] += pgmoved;
+ 
+ 	pgmoved = 0;
++	lru = LRU_BASE + file * LRU_FILE;
+ 	while (!list_empty(&l_inactive)) {
+ 		page = lru_to_page(&l_inactive);
+ 		prefetchw_prev_lru_page(page, &l_inactive, flags);
+@@ -1315,6 +1321,29 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 	pgdeactivate += pgmoved;
+ 	__count_zone_vm_events(PGREFILL, zone, pgscanned);
+ 	__count_vm_events(PGDEACTIVATE, pgdeactivate);
++
++	pgmoved = 0;  /* count pages moved back to active list */
++	lru = LRU_ACTIVE + file * LRU_FILE;
++	while (!list_empty(&l_active)) {
++		page = lru_to_page(&l_active);
++		prefetchw_prev_lru_page(page, &l_active, flags);
++		VM_BUG_ON(PageLRU(page));
++		SetPageLRU(page);
++		VM_BUG_ON(!PageActive(page));
++
++		list_move(&page->lru, &zone->lru[lru].list);
++		mem_cgroup_add_lru_list(page, lru);
++		pgmoved++;
++		if (!pagevec_add(&pvec, page)) {
++			spin_unlock_irq(&zone->lru_lock);
++			if (buffer_heads_over_limit)
++				pagevec_strip(&pvec);
++			__pagevec_release(&pvec);
++			spin_lock_irq(&zone->lru_lock);
++		}
++	}
++	__mod_zone_page_state(zone, NR_LRU_BASE + lru, pgmoved);
++
+ 	spin_unlock_irq(&zone->lru_lock);
+ 	if (buffer_heads_over_limit)
+ 		pagevec_strip(&pvec);

linux-2.6-mm-lru-evict-streaming-io-pages-first.patch:
 include/linux/memcontrol.h |    7 +++++++
 mm/memcontrol.c            |   11 +++++++++++
 mm/vmscan.c                |   38 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 1 deletion(-)

Index: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
===================================================================
RCS file: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
diff -N linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-mm-lru-evict-streaming-io-pages-first.patch	10 Aug 2009 20:18:34 -0000	1.4
@@ -0,0 +1,119 @@
+When the file LRU lists are dominated by streaming IO pages,
+evict those pages first, before considering evicting other
+pages.
+
+This should be safe from deadlocks or performance problems
+because only three things can happen to an inactive file page:
+1) referenced twice and promoted to the active list
+2) evicted by the pageout code
+3) under IO, after which it will get evicted or promoted
+
+The pages freed in this way can either be reused for streaming
+IO, or allocated for something else. If the pages are used for
+streaming IO, this pageout pattern continues. Otherwise, we will
+fall back to the normal pageout pattern.
+
+Signed-off-by: Rik van Riel <riel redhat com>
+
+---
+diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
+index 25b9ca9..45add35 100644
+--- a/include/linux/memcontrol.h
++++ b/include/linux/memcontrol.h
+@@ -94,6 +94,7 @@ extern void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem,
+ extern void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem,
+ 							int priority);
+ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg);
++int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg);
+ unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg,
+ 				       struct zone *zone,
+ 				       enum lru_list lru);
+@@ -239,6 +240,12 @@ mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg)
+ 	return 1;
+ }
+ 
++static inline int
++mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg)
++{
++	return 1;
++}
++
+ static inline unsigned long
+ mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, struct zone *zone,
+ 			 enum lru_list lru)
+diff --git a/mm/memcontrol.c b/mm/memcontrol.c
+index 78eb855..f4e9f51 100644
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -570,6 +570,17 @@ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg)
+ 	return 0;
+ }
+ 
++int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg)
++{
++	unsigned long active;
++	unsigned long inactive;
++
++	inactive = mem_cgroup_get_all_zonestat(memcg, LRU_INACTIVE_FILE);
++	active = mem_cgroup_get_all_zonestat(memcg, LRU_ACTIVE_FILE);
++
++	return (active > inactive);
++}
++
+ unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg,
+ 				       struct zone *zone,
+ 				       enum lru_list lru)
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index b3e39b5..3584da9 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -1350,12 +1350,48 @@ static int inactive_anon_is_low(struct zone *zone, struct scan_control *sc)
+ 	return low;
+ }
+ 
++static int inactive_file_is_low_global(struct zone *zone)
++{
++	unsigned long active, inactive;
++
++	active = zone_page_state(zone, NR_ACTIVE_FILE);
++	inactive = zone_page_state(zone, NR_INACTIVE_FILE);
++
++	return (active > inactive);
++}
++
++/**
++ * inactive_file_is_low - check if file pages need to be deactivated
++ * @zone: zone to check
++ * @sc:   scan control of this context
++ *
++ * When the system is doing streaming IO, memory pressure here
++ * ensures that active file pages get deactivated, until more
++ * than half of the file pages are on the inactive list.
++ *
++ * Once we get to that situation, protect the system's working
++ * set from being evicted by disabling active file page aging.
++ *
++ * This uses a different ratio than the anonymous pages, because
++ * the page cache uses a use-once replacement algorithm.
++ */
++static int inactive_file_is_low(struct zone *zone, struct scan_control *sc)
++{
++	int low;
++
++	if (scanning_global_lru(sc))
++		low = inactive_file_is_low_global(zone);
++	else
++		low = mem_cgroup_inactive_file_is_low(sc->mem_cgroup);
++	return low;
++}
++
+ static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
+ 	struct zone *zone, struct scan_control *sc, int priority)
+ {
+ 	int file = is_file_lru(lru);
+ 
+-	if (lru == LRU_ACTIVE_FILE) {
++	if (lru == LRU_ACTIVE_FILE && inactive_file_is_low(zone, sc)) {
+ 		shrink_active_list(nr_to_scan, zone, sc, priority, file);
+ 		return 0;
+ 	}

linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch:
 include/linux/rmap.h |    5 +++--
 mm/rmap.c            |   30 +++++++++++++++++++++---------
 mm/vmscan.c          |    7 +++++--
 3 files changed, 29 insertions(+), 13 deletions(-)

Index: linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
===================================================================
RCS file: linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
diff -N linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch	10 Aug 2009 20:18:34 -0000	1.3
@@ -0,0 +1,169 @@
+vmscan: report vm_flags in page_referenced()
+
+This enables more informed reclaim heuristics, eg. to protect executable
+file pages more aggressively.
+
+Signed-off-by: Wu Fengguang <fengguang.wu at intel.com>
+---
+diff --git a/include/linux/rmap.h b/include/linux/rmap.h
+index b35bc0e..4e1c961 100644
+--- a/include/linux/rmap.h
++++ b/include/linux/rmap.h
+@@ -83,7 +83,8 @@ static inline void page_dup_rmap(struct page *page, struct vm_area_struct *vma,
+ /*
+  * Called from mm/vmscan.c to handle paging out
+  */
+-int page_referenced(struct page *, int is_locked, struct mem_cgroup *cnt);
++int page_referenced(struct page *, int is_locked,
++			struct mem_cgroup *cnt, unsigned long *vm_flags);
+ int try_to_unmap(struct page *, int ignore_refs);
+ 
+ /*
+@@ -124,7 +125,7 @@ static inline int try_to_munlock(struct page *page)
+ #define anon_vma_prepare(vma)	(0)
+ #define anon_vma_link(vma)	do {} while (0)
+ 
+-#define page_referenced(page,l,cnt) TestClearPageReferenced(page)
++#define page_referenced(page, locked, cnt, flags) TestClearPageReferenced(page)
+ #define try_to_unmap(page, refs) SWAP_FAIL
+ 
+ static inline int page_mkclean(struct page *page)
+diff --git a/mm/rmap.c b/mm/rmap.c
+index 23122af..831d2cc 100644
+--- a/mm/rmap.c
++++ b/mm/rmap.c
+@@ -333,7 +333,8 @@ static int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma)
+  * repeatedly from either page_referenced_anon or page_referenced_file.
+  */
+ static int page_referenced_one(struct page *page,
+-	struct vm_area_struct *vma, unsigned int *mapcount)
++			       struct vm_area_struct *vma,
++			       unsigned int *mapcount)
+ {
+ 	struct mm_struct *mm = vma->vm_mm;
+ 	unsigned long address;
+@@ -385,7 +386,8 @@ out:
+ }
+ 
+ static int page_referenced_anon(struct page *page,
+-				struct mem_cgroup *mem_cont)
++				struct mem_cgroup *mem_cont,
++				unsigned long *vm_flags)
+ {
+ 	unsigned int mapcount;
+ 	struct anon_vma *anon_vma;
+@@ -406,6 +408,7 @@ static int page_referenced_anon(struct page *page,
+ 		if (mem_cont && !mm_match_cgroup(vma->vm_mm, mem_cont))
+ 			continue;
+ 		referenced += page_referenced_one(page, vma, &mapcount);
++		*vm_flags |= vma->vm_flags;
+ 		if (!mapcount)
+ 			break;
+ 	}
+@@ -418,6 +421,7 @@ static int page_referenced_anon(struct page *page,
+  * page_referenced_file - referenced check for object-based rmap
+  * @page: the page we're checking references on.
+  * @mem_cont: target memory controller
++ * @vm_flags: collect the encountered vma->vm_flags
+  *
+  * For an object-based mapped page, find all the places it is mapped and
+  * check/clear the referenced flag.  This is done by following the page->mapping
+@@ -427,7 +431,8 @@ static int page_referenced_anon(struct page *page,
+  * This function is only called from page_referenced for object-based pages.
+  */
+ static int page_referenced_file(struct page *page,
+-				struct mem_cgroup *mem_cont)
++				struct mem_cgroup *mem_cont,
++				unsigned long *vm_flags)
+ {
+ 	unsigned int mapcount;
+ 	struct address_space *mapping = page->mapping;
+@@ -468,6 +473,7 @@ static int page_referenced_file(struct page *page,
+ 		if (mem_cont && !mm_match_cgroup(vma->vm_mm, mem_cont))
+ 			continue;
+ 		referenced += page_referenced_one(page, vma, &mapcount);
++		*vm_flags |= vma->vm_flags;
+ 		if (!mapcount)
+ 			break;
+ 	}
+@@ -481,29 +487,35 @@ static int page_referenced_file(struct page *page,
+  * @page: the page to test
+  * @is_locked: caller holds lock on the page
+  * @mem_cont: target memory controller
++ * @vm_flags: collect the encountered vma->vm_flags
+  *
+  * Quick test_and_clear_referenced for all mappings to a page,
+  * returns the number of ptes which referenced the page.
+  */
+-int page_referenced(struct page *page, int is_locked,
+-			struct mem_cgroup *mem_cont)
++int page_referenced(struct page *page,
++		    int is_locked,
++		    struct mem_cgroup *mem_cont,
++		    unsigned long *vm_flags)
+ {
+ 	int referenced = 0;
+ 
+ 	if (TestClearPageReferenced(page))
+ 		referenced++;
+ 
++	*vm_flags = 0;
+ 	if (page_mapped(page) && page->mapping) {
+ 		if (PageAnon(page))
+-			referenced += page_referenced_anon(page, mem_cont);
++			referenced += page_referenced_anon(page, mem_cont,
++								vm_flags);
+ 		else if (is_locked)
+-			referenced += page_referenced_file(page, mem_cont);
++			referenced += page_referenced_file(page, mem_cont,
++								vm_flags);
+ 		else if (!trylock_page(page))
+ 			referenced++;
+ 		else {
+ 			if (page->mapping)
+-				referenced +=
+-					page_referenced_file(page, mem_cont);
++				referenced += page_referenced_file(page,
++							mem_cont, vm_flags);
+ 			unlock_page(page);
+ 		}
+ 	}
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index 3584da9..f322f31 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -593,6 +593,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
+ 	struct pagevec freed_pvec;
+ 	int pgactivate = 0;
+ 	unsigned long nr_reclaimed = 0;
++	unsigned long vm_flags;
+ 
+ 	cond_resched();
+ 
+@@ -643,7 +644,8 @@ static unsigned long shrink_page_list(struct list_head *page_list,
+ 				goto keep_locked;
+ 		}
+ 
+-		referenced = page_referenced(page, 1, sc->mem_cgroup);
++		referenced = page_referenced(page, 1,
++						sc->mem_cgroup, &vm_flags);
+ 		/* In active use or really unfreeable?  Activate it. */
+ 		if (sc->order <= PAGE_ALLOC_COSTLY_ORDER &&
+ 					referenced && page_mapping_inuse(page))
+@@ -1224,6 +1226,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 	unsigned long pgmoved;
+ 	int pgdeactivate = 0;
+ 	unsigned long pgscanned;
++	unsigned long vm_flags;
+ 	LIST_HEAD(l_hold);	/* The pages which were snipped off */
+ 	LIST_HEAD(l_inactive);
+ 	struct page *page;
+@@ -1264,7 +1267,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
+ 
+ 		/* page_referenced clears PageReferenced */
+ 		if (page_mapping_inuse(page) &&
+-		    page_referenced(page, 0, sc->mem_cgroup))
++		    page_referenced(page, 0, sc->mem_cgroup, &vm_flags))
+ 			pgmoved++;
+ 
+ 		list_add(&page->lru, &l_inactive);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1697
retrieving revision 1.1698
diff -u -p -r1.1697 -r1.1698
--- kernel.spec	10 Aug 2009 19:54:25 -0000	1.1697
+++ kernel.spec	10 Aug 2009 20:18:34 -0000	1.1698
@@ -595,6 +595,11 @@ Patch22: linux-2.6-utrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch80: linux-2.6-defaults-saner-vm-settings.patch
+Patch81: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
+Patch82: linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
+Patch83: linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -1098,7 +1103,11 @@ ApplyPatch linux-2.6-hotfixes.patch
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
 
-# VM patches
+# mm patches
+ApplyPatch linux-2.6-defaults-saner-vm-settings.patch
+ApplyPatch linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
+ApplyPatch linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
+ApplyPatch linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
 
 # iommu patches
 
@@ -1872,6 +1881,10 @@ fi
  - linux-2.6-drivers-char-low-latency-removal.patch
  - linux-2.6-serial-add-txen-test-param.patch
  - linux-2.6-input-wacom-bluetooth.patch
+ - linux-2.6-defaults-saner-vm-settings.patch
+ - linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
+ - linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
+ - linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.



From jwilson at fedoraproject.org  Mon Aug 10 20:19:23 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 10 Aug 2009 20:19:23 +0000 (UTC)
Subject: rpms/kernel/F-11 hdpvr-ir-enable.patch, 1.1,
	1.2 hid-ignore-all-recent-imon-devices.patch, 1.1,
	1.2 kernel.spec, 1.1698, 1.1699 linux-2.6.29-lirc.patch, 1.11, 1.12
Message-ID: <20090810201923.B19A711C0344@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6882

Modified Files:
	kernel.spec linux-2.6.29-lirc.patch 
Added Files:
	hdpvr-ir-enable.patch hid-ignore-all-recent-imon-devices.patch 
Log Message:
* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
- Add tunable pad threshold support to lirc_imon
- Blacklist all iMON devices in usbhid driver so lirc_imon can bind
- Add new device ID to lirc_mceusb (#512483)
- Enable IR transceiver on the HD PVR


hdpvr-ir-enable.patch:
 hdpvr-core.c |    3 +--
 hdpvr-i2c.c  |   36 +++++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: hdpvr-ir-enable.patch
diff -N hdpvr-ir-enable.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdpvr-ir-enable.patch	10 Aug 2009 20:19:22 -0000	1.2
@@ -0,0 +1,118 @@
+From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
+
+---
+ drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
+ 2 files changed, 30 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
+index 188bd5a..878d1e5 100644
+--- a/drivers/media/video/hdpvr/hdpvr-core.c
++++ b/drivers/media/video/hdpvr/hdpvr-core.c
+@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
+ 	}
+ 
+ #ifdef CONFIG_I2C
+-	/* until i2c is working properly */
+-	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
++	retval = hdpvr_register_i2c_adapter(dev);
+ 	if (retval < 0) {
+ 		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
+ 		goto error;
+diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
+index c4b5d15..1c01b6c 100644
+--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
++++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
+@@ -22,7 +22,7 @@
+ #define REQTYPE_I2C_WRITE_STATT	0xd0
+ 
+ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+-			  char *data, int len)
++			  char *data, int len, int bus)
+ {
+ 	int ret;
+ 	char *buf = kmalloc(len, GFP_KERNEL);
+@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_rcvctrlpipe(dev->udev, 0),
+ 			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
+-			      0x100|addr, 0, buf, len, 1000);
++			      bus<<8 | addr, 0, buf, len, 1000);
+ 
+ 	if (ret == len) {
+ 		memcpy(data, buf, len);
+@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+ }
+ 
+ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+-			   char *data, int len)
++			   char *data, int len, int bus)
+ {
+ 	int ret;
+ 	char *buf = kmalloc(len, GFP_KERNEL);
+@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_sndctrlpipe(dev->udev, 0),
+ 			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
+-			      0x100|addr, 0, buf, len, 1000);
++			      bus<<8 | addr, 0, buf, len, 1000);
+ 
+ 	if (ret < 0)
+ 		goto error;
+ 
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_rcvctrlpipe(dev->udev, 0),
+-			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
++			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
+ 			      0, 0, buf, 2, 1000);
+ 
+ 	if (ret == 2)
+@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+ 
+ 		if (msgs[i].flags & I2C_M_RD)
+ 			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
+-						msgs[i].len);
++						msgs[i].len, 1);
+ 		else
+ 			retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
+-						 msgs[i].len);
++						 msgs[i].len, 1);
+ 	}
+ 
+ 	mutex_unlock(&dev->i2c_mutex);
+@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
+ 	.functionality = hdpvr_functionality,
+ };
+ 
++static int hdpvr_activate_ir(struct hdpvr_device *dev)
++{
++	char buffer[8];
++
++	mutex_lock(&dev->i2c_mutex);
++
++	hdpvr_i2c_read(dev, 0x54, buffer, 1, 0);
++
++	buffer[0] = 0;
++	buffer[1] = 0x8;
++	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
++
++	buffer[1] = 0x18;
++	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
++
++	mutex_unlock(&dev->i2c_mutex);
++	return 0;
++}
++
++
+ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ {
+ 	struct i2c_adapter *i2c_adap;
+@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ 	if (i2c_adap == NULL)
+ 		goto error;
+ 
++	hdpvr_activate_ir(dev);
++
+ 	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
+ 		sizeof(i2c_adap->name));
+ 	i2c_adap->algo  = &hdpvr_algo;

hid-ignore-all-recent-imon-devices.patch:
 hid-core.c |   10 +++++-----
 hid-ids.h  |    7 ++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

Index: hid-ignore-all-recent-imon-devices.patch
===================================================================
RCS file: hid-ignore-all-recent-imon-devices.patch
diff -N hid-ignore-all-recent-imon-devices.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hid-ignore-all-recent-imon-devices.patch	10 Aug 2009 20:19:22 -0000	1.2
@@ -0,0 +1,63 @@
+[PATCH] hid: ignore all recent SoundGraph iMON devices
+
+After some inspection of the Windows iMON driver, several additional
+device IDs were added to the lirc_imon driver. At least a few of these
+have been seen in the wild, and require manual quirking to keep the
+usbhid driver from binding to them. Rather than list out every single
+device, ignore the entire device ID range, 0x0034 - 0x0046. Some of
+these may not advertise themselves as HID devices, but no harm done to
+such devices anyway.
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+---
+ drivers/hid/hid-core.c |   10 +++++-----
+ drivers/hid/hid-ids.h  |    7 ++-----
+ 2 files changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 5eb10c2..18bf803 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1623,11 +1623,6 @@ static const struct hid_device_id hid_ignore_list[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
+@@ -1694,6 +1689,11 @@ static bool hid_ignore(struct hid_device *hdev)
+ 				hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)
+ 			return true;
+ 		break;
++	case USB_VENDOR_ID_SOUNDGRAPH:
++		if (hdev->product >= USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST &&
++		    hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST)
++			return true;
++		break;
+ 	}
+ 
+ 	if (hdev->type == HID_TYPE_USBMOUSE &&
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 6301010..989a3ba 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -376,11 +376,8 @@
+ #define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268
+ 
+ #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
+-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
+-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
+-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
+-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
+-#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
++#define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST	0x0034
++#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST	0x0046
+ 
+ #define USB_VENDOR_ID_SUN		0x0430
+ #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1698
retrieving revision 1.1699
diff -u -p -r1.1698 -r1.1699
--- kernel.spec	10 Aug 2009 20:18:34 -0000	1.1698
+++ kernel.spec	10 Aug 2009 20:19:23 -0000	1.1699
@@ -647,6 +647,8 @@ Patch800: linux-2.6-crash-driver.patch
 Patch1000: linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
 
 Patch1515: linux-2.6.29-lirc.patch
+Patch1517: hid-ignore-all-recent-imon-devices.patch
+Patch1518: hdpvr-ir-enable.patch
 
 Patch1700: agp-set_memory_ucwb.patch
 # nouveau + drm fixes
@@ -1871,6 +1873,12 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
+- Add tunable pad threshold support to lirc_imon
+- Blacklist all iMON devices in usbhid driver so lirc_imon can bind
+- Add new device ID to lirc_mceusb (#512483)
+- Enable IR transceiver on the HD PVR
+
 * Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch

linux-2.6.29-lirc.patch:
 Kconfig            |  112 ++
 Makefile           |   20 
 lirc.h             |  100 ++
 lirc_bt829.c       |  383 ++++++++
 lirc_dev.c         |  851 +++++++++++++++++++
 lirc_dev.h         |  184 ++++
 lirc_i2c.c         |  649 ++++++++++++++
 lirc_igorplugusb.c |  556 ++++++++++++
 lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 lirc_it87.c        |  986 ++++++++++++++++++++++
 lirc_it87.h        |  116 ++
 lirc_ite8709.c     |  539 ++++++++++++
 lirc_mceusb.c      | 1225 ++++++++++++++++++++++++++++
 lirc_parallel.c    |  709 ++++++++++++++++
 lirc_parallel.h    |   26 
 lirc_sasem.c       |  931 +++++++++++++++++++++
 lirc_serial.c      | 1316 ++++++++++++++++++++++++++++++
 lirc_sir.c         | 1283 +++++++++++++++++++++++++++++
 lirc_streamzap.c   |  777 +++++++++++++++++
 lirc_ttusbir.c     |  397 +++++++++
 lirc_zilog.c       | 1374 +++++++++++++++++++++++++++++++
 21 files changed, 14832 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.11 -r 1.12 linux-2.6.29-lirc.patchIndex: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-lirc.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- linux-2.6.29-lirc.patch	25 Jul 2009 04:09:30 -0000	1.11
+++ linux-2.6.29-lirc.patch	10 Aug 2009 20:19:23 -0000	1.12
@@ -2,85 +2,40 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
+Refreshed 20090910
+
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
- MAINTAINERS                           |    9 +
- drivers/input/Kconfig                 |    2 +
- drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  118 ++
- drivers/input/lirc/Makefile           |   21 +
+ drivers/input/lirc/Kconfig            |  112 ++
+ drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
  drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  849 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
- drivers/input/lirc/lirc_i2c.c         |  649 +++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
- drivers/input/lirc/lirc_imon.c        | 2043 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
+ drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ 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      |  749 ++++++++++++
- drivers/input/lirc/lirc_mceusb2.c     | 1103 ++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ 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         | 1294 +++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
- drivers/input/lirc/lirc_zilog.c       | 1384 ++++++++++++++++++++++
- 25 files changed, 15243 insertions(+), 0 deletions(-)
+ 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   |  777 +++++++++++
+ drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
+ drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
+ 21 files changed, 14832 insertions(+), 0 deletions(-)
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 59fd2d1..ad1b16c 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2749,6 +2749,15 @@ W:	http://www.pasemi.com/
- L:	linuxppc-dev at ozlabs.org
- S:	Supported
- 
-+LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
-+P:	Jarod Wilson
-+M:	jarod at redhat.com
-+P:	Christoph Bartelmus
-+M:	lirc at bartelmus.de
-+W:	http://www.lirc.org/
-+L:	lirc-list at lists.sourceforge.net
-+S:	Maintained
-+
- LINUX SECURITY MODULE (LSM) FRAMEWORK
- P:	Chris Wright
- M:	chrisw at sous-sol.org
-diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
-index 5f9d860..2ba0904 100644
---- a/drivers/input/Kconfig
-+++ b/drivers/input/Kconfig
-@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
- 
- source "drivers/input/touchscreen/Kconfig"
- 
-+source "drivers/input/lirc/Kconfig"
-+
- source "drivers/input/misc/Kconfig"
- 
- endif
-diff --git a/drivers/input/Makefile b/drivers/input/Makefile
-index 4c9c745..99e2b5e 100644
---- a/drivers/input/Makefile
-+++ b/drivers/input/Makefile
-@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
- obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
- 
- obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
-+
-+obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..0482bb9
+index 0000000..6ef8622
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,112 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -137,16 +92,10 @@ index 0000000..0482bb9
 +	  Driver for the ITE8709 IR Receiver
 +
 +config LIRC_MCEUSB
-+	tristate "Microsoft Media Center Ed. Receiver, v1"
-+	depends on LIRC_DEV && USB
-+	help
-+	  Driver for the Microsoft Media Center Ed. Receiver, v1
-+
-+config LIRC_MCEUSB2
-+	tristate "Microsoft Media Center Ed. Receiver, v2"
++	tristate "Windows Media Center Ed. USB IR Transceiver"
 +	depends on LIRC_DEV && USB
 +	help
-+	  Driver for the Microsoft Media Center Ed. Receiver, v2
++	  Driver for Windows Media Center Ed. USB IR Transceivers
 +
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
@@ -201,10 +150,10 @@ index 0000000..0482bb9
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..a22df78
+index 0000000..7b1386e
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,20 @@
 +# Makefile for the lirc drivers.
 +#
 +
@@ -218,7 +167,6 @@ index 0000000..a22df78
 +obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
 +obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
-+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
 +obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 +obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 +obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
@@ -723,10 +671,10 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..8848d8e
+index 0000000..0510b4e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,849 @@
+@@ -0,0 +1,851 @@
 +/*
 + * LIRC base driver
 + *
@@ -800,7 +748,7 @@ index 0000000..8848d8e
 +	struct cdev cdev;
 +};
 +
-+static DEFINE_MUTEX(driver_lock);
++static DEFINE_MUTEX(lirc_dev_lock);
 +
 +static struct irctl *irctls[MAX_IRCTL_DEVICES];
 +
@@ -812,6 +760,7 @@ index 0000000..8848d8e
 + */
 +static void init_irctl(struct irctl *ir)
 +{
++	dprintk(LOGHEAD "initializing irctl\n", ir->d.name, ir->d.minor);
 +	mutex_init(&ir->buffer_lock);
 +	ir->d.minor = NOPLUG;
 +}
@@ -914,7 +863,7 @@ index 0000000..8848d8e
 +		cdev_init(&ir->cdev, &fops);
 +		ir->cdev.owner = THIS_MODULE;
 +	}
-+	kobject_set_name(&ir->cdev.kobj, "lircv%d", d->minor);
++	kobject_set_name(&ir->cdev.kobj, "lirc%d", d->minor);
 +
 +	retval = cdev_add(&ir->cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
 +	if (retval)
@@ -995,7 +944,7 @@ index 0000000..8848d8e
 +		goto out;
 +	}
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
[...2619 lines suppressed...]
 +
 +static int io = LIRC_PORT;
 +static int irq = LIRC_IRQ;
@@ -11730,7 +11310,6 @@ index 0000000..6c64072
 +static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue);
 +
 +static DEFINE_SPINLOCK(hardware_lock);
-+static DEFINE_SPINLOCK(dev_lock);
 +
 +static int rx_buf[RBUF_LEN];
 +static unsigned int rx_tail, rx_head;
@@ -11747,8 +11326,6 @@ index 0000000..6c64072
 +/* SECTION: Prototypes */
 +
 +/* Communication with user-space */
-+static int lirc_open(struct inode *inode, struct file *file);
-+static int lirc_close(struct inode *inode, struct file *file);
 +static unsigned int lirc_poll(struct file *file, poll_table *wait);
 +static ssize_t lirc_read(struct file *file, char *buf, size_t count,
 +		loff_t *ppos);
@@ -11808,22 +11385,6 @@ index 0000000..6c64072
 +
 +/* SECTION: Communication with user-space */
 +
-+static int lirc_open(struct inode *inode, struct file *file)
-+{
-+	spin_lock(&dev_lock);
-+	if (module_refcount(THIS_MODULE)) {
-+		spin_unlock(&dev_lock);
-+		return -EBUSY;
-+	}
-+	spin_unlock(&dev_lock);
-+	return 0;
-+}
-+
-+static int lirc_close(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
 +static unsigned int lirc_poll(struct file *file, poll_table *wait)
 +{
 +	poll_wait(file, &lirc_read_queue, wait);
@@ -12038,8 +11599,8 @@ index 0000000..6c64072
 +	.write		= lirc_write,
 +	.poll		= lirc_poll,
 +	.ioctl		= lirc_ioctl,
-+	.open		= lirc_open,
-+	.release	= lirc_close,
++	.open		= lirc_dev_fop_open,
++	.release	= lirc_dev_fop_close,
 +};
 +
 +static int set_use_inc(void *data)
@@ -14049,10 +13610,10 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..049c3da
+index 0000000..c532399
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1384 @@
+@@ -0,0 +1,1374 @@
 +/*
 + * i2c IR lirc driver for devices with zilog IR processors
 + *
@@ -15143,18 +14704,26 @@ index 0000000..049c3da
 +};
 +
 +static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
-+static int ir_detach(struct i2c_client *client);
-+static int ir_probe(struct i2c_adapter *adap);
++static int ir_remove(struct i2c_client *client);
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 +
++static const struct i2c_device_id ir_transceiver_id[] = {
++	/* Generic entry for any IR transceiver */
++	{ "ir_video", 0 },
++	/* IR device specific entries could be added here */
++	{ }
++};
++
 +static struct i2c_driver driver = {
 +	.driver = {
 +		.owner	= THIS_MODULE,
 +		.name	= "i2c ir driver",
 +	},
-+	.attach_adapter	= ir_probe,
-+	.detach_client	= ir_detach,
++	.probe		= ir_probe,
++	.remove		= ir_remove,
 +	.command	= ir_command,
++	.id_table	= ir_transceiver_id,
 +};
 +
 +static struct i2c_client client_template = {
@@ -15175,20 +14744,8 @@ index 0000000..049c3da
 +
 +static int i2c_attach(struct i2c_client *client, struct IR *ir)
 +{
-+	int ret;
-+
 +	i2c_set_clientdata(client, ir);
 +
-+	ret = i2c_attach_client(client);
-+	if (ret != 0) {
-+		client->addr = 0;
-+		return ret;
-+	}
-+	if (!i2c_use_client(client)) {
-+		i2c_detach_client(client);
-+		client->addr = 0;
-+		return -EFAULT;
-+	}
 +	++ir->devs;
 +	return 0;
 +}
@@ -15289,13 +14846,13 @@ index 0000000..049c3da
 +err:
 +	/* undo everything, hopefully... */
 +	if (ir->c_rx.addr)
-+		ir_detach(&ir->c_rx);
++		ir_remove(&ir->c_rx);
 +	if (ir->c_tx.addr)
-+		ir_detach(&ir->c_tx);
++		ir_remove(&ir->c_tx);
 +	return ret;
 +}
 +
-+static int ir_detach(struct i2c_client *client)
++static int ir_remove(struct i2c_client *client)
 +{
 +	struct IR *ir = i2c_get_clientdata(client);
 +	mutex_lock(&ir->lock);
@@ -15316,21 +14873,17 @@ index 0000000..049c3da
 +			ir->t_notify2 = NULL;
 +		}
 +
-+		/* unregister device */
-+		i2c_detach_client(&ir->c_rx);
-+	} else if (client == &ir->c_tx) {
-+		i2c_detach_client(&ir->c_tx);
 +	} else {
 +		mutex_unlock(&ir->lock);
-+		zilog_error("ir_detach: detached from something we didn't "
-+			    "attach to\n");
++		zilog_error("%s: detached from something we didn't "
++			    "attach to\n", __func__);
 +		return -ENODEV;
 +	}
 +
 +	--ir->devs;
 +	if (ir->devs < 0) {
 +		mutex_unlock(&ir->lock);
-+		zilog_error("ir_detach: invalid device count\n");
++		zilog_error("%s: invalid device count\n", __func__);
 +		return -ENODEV;
 +	} else if (ir->devs == 0) {
 +		/* unregister lirc driver */
@@ -15349,11 +14902,10 @@ index 0000000..049c3da
 +	return 0;
 +}
 +
-+static int ir_probe(struct i2c_adapter *adap)
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 +{
-+	struct i2c_client c;
++	struct i2c_adapter *adap = client->adapter;
 +	char buf;
-+	memset(&c, 0, sizeof(c));
 +
 +	if (adap->id == I2C_HW_B_BT848 ||
 +#ifdef I2C_HW_B_HDPVR
@@ -15366,11 +14918,10 @@ index 0000000..049c3da
 +		 * The external IR receiver is at i2c address 0x71.
 +		 * The IR transmitter is at 0x70.
 +		 */
-+		c.adapter = adap;
-+		c.addr = 0x70;
++		client->addr = 0x70;
 +
 +		if (!disable_rx) {
-+			if (i2c_master_recv(&c, &buf, 1) == 1)
++			if (i2c_master_recv(client, &buf, 1) == 1)
 +				have_rx = 1;
 +			dprintk("probe 0x70 @ %s: %s\n",
 +				adap->name,
@@ -15378,8 +14929,8 @@ index 0000000..049c3da
 +		}
 +
 +		if (!disable_tx) {
-+			c.addr = 0x71;
-+			if (i2c_master_recv(&c, &buf, 1) == 1)
++			client->addr = 0x71;
++			if (i2c_master_recv(client, &buf, 1) == 1)
 +				have_tx = 1;
 +			dprintk("probe 0x71 @ %s: %s\n",
 +				adap->name,



From steve at fedoraproject.org  Mon Aug 10 20:22:19 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Mon, 10 Aug 2009 20:22:19 +0000 (UTC)
Subject: rpms/amavisd-new/devel amavisd-snmp.init, NONE, 1.1 .cvsignore, 1.12,
	1.13 amavisd-conf.patch, 1.7, 1.8 amavisd-new.spec, 1.26,
	1.27 sources, 1.12, 1.13
Message-ID: <20090810202219.47E8211C0344@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/amavisd-new/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7257

Modified Files:
	.cvsignore amavisd-conf.patch amavisd-new.spec sources 
Added Files:
	amavisd-snmp.init 
Log Message:
Update to 2.6.4.
Make a snmp sub-package for amavisd-snmp-subagent.



--- NEW FILE amavisd-snmp.init ---
#!/bin/sh
#
# amavisd-snmp:        Init script for amavisd-snmp-subagent
#
# chkconfig: - 79 31
# description: Exports amavisd SNMP data
# pidfile: /var/run/amavisd-snmp-subagent.pid

# Source function library.
. /etc/init.d/functions

RETVAL=0

start() {
    echo -n $"Starting amavisd-snmp-subagent: "
    [ $RETVAL -eq 0 ] && { daemon amavisd-snmp-subagent -P /var/run/amavisd-snmp-subagent.pid; RETVAL=$?; };
    [ $RETVAL -eq 0 ] && { touch /var/lock/subsys/amavisd-snmp-subagent; RETVAL=$?; };
    [ $RETVAL -eq 0 ] && echo_success || echo_failure
    echo
}

stop() {
    echo -n $"Shutting down amavisd-snmp-subagent: "
    kill $( cat /var/run/amavisd-snmp-subagent.pid ) || RETVAL=1
    [ $RETVAL -eq 0 ] && { rm -f /var/lock/subsys/amavisd-snmp-subagent; RETVAL=$?; };
    [ $RETVAL -eq 0 ] && echo_success || echo_failure
    echo
}

restart() {
    stop
    start
}

# See how we were called.
case "$1" in
    start)
        start
        ;;

    stop)
        stop
        ;;

    status)
        status amavisd-snmp-subagent
        ;;

    reload)
	restart
	;;

    restart)
	restart
        ;;

    condrestart)
        [ -f /var/lock/subsys/amavisd-snmp-subagent ] && restart || :
        ;;

    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
        exit 1
esac

exit $RETVAL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Dec 2008 17:03:45 -0000	1.12
+++ .cvsignore	10 Aug 2009 20:22:18 -0000	1.13
@@ -1 +1 @@
-amavisd-new-2.6.2.tar.gz
+amavisd-new-2.6.4.tar.gz

amavisd-conf.patch:
 amavisd.conf |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-conf.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- amavisd-conf.patch	1 Mar 2009 18:38:53 -0000	1.7
+++ amavisd-conf.patch	10 Aug 2009 20:22:19 -0000	1.8
@@ -1,5 +1,5 @@
---- amavisd-new-2.6.2/amavisd.conf	2008-12-15 01:50:03.000000000 +0100
-+++ amavisd-new-2.6.2/amavisd.conf.conf	2009-03-01 19:11:48.000000000 +0100
+--- amavisd-new-2.6.4/amavisd.conf.orig	2009-06-25 07:38:47.000000000 -0500
++++ amavisd-new-2.6.4/amavisd.conf	2009-08-10 14:28:13.000000000 -0500
 @@ -15,25 +15,25 @@
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  
@@ -70,11 +70,11 @@
  # ### http://www.clamav.net/
 -# ['ClamAV-clamd',
 -#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
--#   qr/\bOK$/, qr/\bFOUND$/,
+-#   qr/\bOK$/m, qr/\bFOUND$/m,
 -#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 +['ClamAV-clamd',
 +  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
-+  qr/\bOK$/, qr/\bFOUND$/,
++  qr/\bOK$/m, qr/\bFOUND$/m,
 +  qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
  # # NOTE: run clamd under the same user as amavisd, or run it under its own
  # #   uid such as clamav, add user clamav to the amavis group, and then add


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- amavisd-new.spec	24 Jul 2009 16:50:06 -0000	1.26
+++ amavisd-new.spec	10 Aug 2009 20:22:19 -0000	1.27
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.6.2
-Release:        4%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.6.4
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -15,6 +15,7 @@ Source3:        amavis-clamd.sysconfig
 Source4:        README.fedora
 Source5:        README.quarantine
 Source6:        amavisd.cron
+Source7:        amavisd-snmp.init
 Patch0:         amavisd-conf.patch
 Patch1:         amavisd-init.patch
 Patch2:         amavisd-condrestart.patch
@@ -78,6 +79,15 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 BuildArch:      noarch
 
+%package snmp
+Group:          Applications/System
+Summary:        Exports amavisd SNMP data
+Requires:       %{name} = %{version}-%{release}
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+
 %description
 amavisd-new is a high-performance and reliable interface between mailer
 (MTA) and one or more content checkers: virus scanners, and/or
@@ -86,6 +96,18 @@ reliability, portability and maintainabi
 or LMTP, or by using helper programs. No timing gaps exist in the design
 which could cause a mail loss.
 
+%description snmp
+This package contains the program amavisd-snmp-subagent, which can be
+used as a SNMP AgentX, exporting amavisd statistical counters database
+(snmp.db) as well as a child process status database (nanny.db) to a
+SNMP daemon supporting the AgentX protocol (RFC 2741), such as NET-SNMP.
+
+It is similar to combined existing utility programs amavisd-agent and
+amavisd-nanny, but instead of writing results as text to stdout, it
+exports data to a SNMP server running on a host (same or remote), making
+them available to SNMP clients (such a Cacti or mrtg) for monitoring or
+alerting purposes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:-%{prerelease}}
 %patch0 -p1
@@ -102,7 +124,7 @@ sed -i -e 's,/var/amavis/amavisd.sock\>,
 rm -rf "$RPM_BUILD_ROOT"
 
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m755 amavisd $RPM_BUILD_ROOT%{_sbindir}/
+install -m755 amavisd{,-snmp-subagent} $RPM_BUILD_ROOT%{_sbindir}/
 ( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.amavisd )
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -111,6 +133,7 @@ install -m755 amavisd-{agent,nanny,relea
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 install -m755 amavisd_init.sh $RPM_BUILD_ROOT%{_initrddir}/amavisd
 install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/clamd.amavisd
+install -m755 %{SOURCE7} $RPM_BUILD_ROOT%{_initrddir}/amavisd-snmp
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/amavisd
 install -m644 amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amavisd/
@@ -144,12 +167,22 @@ if [ "$1" = 0 ]; then
     /sbin/chkconfig --del clamd.amavisd || :
 fi
 
+%preun snmp
+if [ "$1" = 0 ]; then
+    /sbin/service amavisd-snmp stop 2>/dev/null || :
+    /sbin/chkconfig --del amavisd-snmp || :
+fi
+
 %post
 /sbin/chkconfig --add clamd.amavisd || :
 /sbin/service clamd.amavisd condrestart || :
 /sbin/chkconfig --add amavisd || :
 /sbin/service amavisd condrestart || :
 
+%post snmp
+/sbin/chkconfig --add amavisd-snmp || :
+/sbin/service amavisd-snmp condrestart || :
+
 %files
 %defattr(-,root,root)
 %doc AAAREADME.first LDAP.schema LICENSE RELEASE_NOTES TODO
@@ -171,7 +204,16 @@ fi
 %dir %attr(755,amavis,amavis) /var/run/amavisd
 %ghost /var/spool/amavisd/clamd.sock
 
+%files snmp
+%defattr(-,root,root)
+%attr(755,root,root) %{_initrddir}/amavisd-snmp
+%{_sbindir}/amavisd-snmp-subagent
+
 %changelog
+* Mon Aug 10 2009 Steven Pritchard <steve at kspei.com> 2.6.4-1
+- Update to 2.6.4.
+- Make a snmp sub-package for amavisd-snmp-subagent.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amavisd-new/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Dec 2008 17:03:45 -0000	1.12
+++ sources	10 Aug 2009 20:22:19 -0000	1.13
@@ -1 +1 @@
-0b3b0ef8771af8e4a950e7381d42adbd  amavisd-new-2.6.2.tar.gz
+03d31657f14cd64c1cb38786214234b4  amavisd-new-2.6.4.tar.gz



From musuruan at fedoraproject.org  Mon Aug 10 20:25:40 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Mon, 10 Aug 2009 20:25:40 +0000 (UTC)
Subject: rpms/hatari/devel hatari.spec,1.13,1.14
Message-ID: <20090810202540.3F01011C0344@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7831

Modified Files:
	hatari.spec 
Log Message:
* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
- updated Source0 URL



Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/hatari.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- hatari.spec	25 Jul 2009 02:03:10 -0000	1.13
+++ hatari.spec	10 Aug 2009 20:25:39 -0000	1.14
@@ -1,12 +1,12 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
 Version: 1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
 URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://prdownload.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 Source1: hatari.png
 Source2: hatari.desktop
 Source3: hatari-README.tos
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
+- updated Source0 URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From musuruan at fedoraproject.org  Mon Aug 10 20:27:04 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Mon, 10 Aug 2009 20:27:04 +0000 (UTC)
Subject: rpms/hatari/F-11 hatari.spec,1.12,1.13
Message-ID: <20090810202704.6A9F611C0344@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8082

Modified Files:
	hatari.spec 
Log Message:
* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
- updated Source0 URL



Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/hatari.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hatari.spec	25 Feb 2009 03:28:22 -0000	1.12
+++ hatari.spec	10 Aug 2009 20:27:04 -0000	1.13
@@ -1,12 +1,12 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
 URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://prdownload.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 Source1: hatari.png
 Source2: hatari.desktop
 Source3: hatari-README.tos
@@ -110,6 +110,12 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
+- updated Source0 URL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From musuruan at fedoraproject.org  Mon Aug 10 20:28:40 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Mon, 10 Aug 2009 20:28:40 +0000 (UTC)
Subject: rpms/hatari/F-10 hatari.spec,1.11,1.12
Message-ID: <20090810202840.C6E3211C0344@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8389

Modified Files:
	hatari.spec 
Log Message:
* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
- updated Source0 URL



Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/hatari.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hatari.spec	25 Jan 2009 21:00:32 -0000	1.11
+++ hatari.spec	10 Aug 2009 20:28:40 -0000	1.12
@@ -1,12 +1,12 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
 URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://prdownload.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 Source1: hatari.png
 Source2: hatari.desktop
 Source3: hatari-README.tos
@@ -110,6 +110,15 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
+- updated Source0 URL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
 - updated to upstream 1.2.0
 - dropped no longer needed hmsa tool patch



From mclasen at fedoraproject.org  Mon Aug 10 20:29:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 20:29:45 +0000 (UTC)
Subject: rpms/epiphany/devel clear-button.patch, NONE, 1.1 epiphany.spec,
	1.237, 1.238
Message-ID: <20090810202945.4D56611C0344@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8602

Modified Files:
	epiphany.spec 
Added Files:
	clear-button.patch 
Log Message:
Fix a mnemonic mishap


clear-button.patch:
 ephy-history-window.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE clear-button.patch ---
diff -up epiphany-2.27.5/src/ephy-history-window.c.clear-button epiphany-2.27.5/src/ephy-history-window.c
--- epiphany-2.27.5/src/ephy-history-window.c.clear-button	2009-08-10 16:24:43.891160277 -0400
+++ epiphany-2.27.5/src/ephy-history-window.c	2009-08-10 16:25:08.598912677 -0400
@@ -245,6 +245,7 @@ confirmation_dialog_construct (EphyHisto
 				     GTK_WINDOW (dialog));
 	
 	button = gtk_button_new_with_label (_("Cl_ear"));
+	gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
 	image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image (GTK_BUTTON (button), image);
 	/* don't show the image! see bug #307818 */


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- epiphany.spec	28 Jul 2009 17:25:42 -0000	1.237
+++ epiphany.spec	10 Aug 2009 20:29:45 -0000	1.238
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.27.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -51,6 +51,7 @@ BuildRequires: libsoup-devel
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
 Patch2: epiphany-2.18.1-default-bookmarks.patch
+Patch3: clear-button.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -96,6 +97,8 @@ Install epiphany-devel if you want to wr
 
 %patch0 -p1 -b .homepage
 %patch2 -p1 -b .default-bookmarks
+%patch3 -p1 -b .clear-button
+
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
 pref("general.useragent.vendor", "Fedora");
@@ -243,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
+- Fix a mnemonic mishap
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 



From jwilson at fedoraproject.org  Mon Aug 10 20:30:11 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 10 Aug 2009 20:30:11 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1708,
	1.1709 linux-2.6.31-lirc.patch, 1.3, 1.4
Message-ID: <20090810203011.30E1211C0344@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8694

Modified Files:
	kernel.spec linux-2.6.31-lirc.patch 
Log Message:
* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
- Add new device ID to lirc_mceusb (#512483)
- Fix some lockdep false positives
- Add support for setting and enabling iMON clock via sysfs
- Add tunable pad threshold support to lirc_imon
- Add new pseudo-IR protocl to lirc_imon for universals w/o a pad
- Fix mouse device support on older iMON devices



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1708
retrieving revision 1.1709
diff -u -p -r1.1708 -r1.1709
--- kernel.spec	10 Aug 2009 15:42:58 -0000	1.1708
+++ kernel.spec	10 Aug 2009 20:30:10 -0000	1.1709
@@ -1980,6 +1980,14 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
+- Add new device ID to lirc_mceusb (#512483)
+- Fix some lockdep false positives
+- Add support for setting and enabling iMON clock via sysfs
+- Add tunable pad threshold support to lirc_imon
+- Add new pseudo-IR protocl to lirc_imon for universals w/o a pad
+- Fix mouse device support on older iMON devices
+
 * Mon Aug 10 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.145.rc5.git3
 - Merge latest Intel IOMMU fixes and BIOS workarounds, re-enable by default.
 

linux-2.6.31-lirc.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  112 +
 drivers/input/lirc/Makefile           |   20 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2298 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 24 files changed, 14733 insertions(+)

Index: linux-2.6.31-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.31-lirc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6.31-lirc.patch	31 Jul 2009 01:00:04 -0000	1.3
+++ linux-2.6.31-lirc.patch	10 Aug 2009 20:30:10 -0000	1.4
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Tuesday, July 7, 2009
+Last updated: Monday, August 10, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -14,30 +14,30 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
  drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
- drivers/input/lirc/lirc_i2c.c         |  537 +++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
- drivers/input/lirc/lirc_imon.c        | 2062 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
+ drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ 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      | 1223 +++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  709 +++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ 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         | 1294 +++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
- drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++++
- 24 files changed, 14506 insertions(+), 0 deletions(-)
+ 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   |  777 +++++++++++
+ drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
+ drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
+ 24 files changed, 14733 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 381190c..fc79bdf 100644
+index b1114cf..eb86f8e 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3632,6 +3632,15 @@ W:	http://www.pasemi.com/
+@@ -3122,6 +3122,15 @@ W:	http://www.pasemi.com/
  L:	linuxppc-dev at ozlabs.org
  S:	Supported
  
@@ -717,7 +717,7 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..a5d5c89
+index 0000000..0510b4e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,851 @@
@@ -794,7 +794,7 @@ index 0000000..a5d5c89
 +	struct cdev cdev;
 +};
 +
-+static DEFINE_MUTEX(driver_lock);
++static DEFINE_MUTEX(lirc_dev_lock);
 +
 +static struct irctl *irctls[MAX_IRCTL_DEVICES];
 +
@@ -990,7 +990,7 @@ index 0000000..a5d5c89
 +		goto out;
 +	}
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	minor = d->minor;
 +
@@ -1079,7 +1079,7 @@ index 0000000..a5d5c89
 +		goto out_sysfs;
 +
 +	ir->attached = 1;
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	dprintk("lirc_dev: driver %s registered at minor number = %d\n",
 +		ir->d.name, ir->d.minor);
@@ -1088,7 +1088,7 @@ index 0000000..a5d5c89
 +out_sysfs:
 +	device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
 +out_lock:
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +out:
 +	return err;
 +}
@@ -1107,12 +1107,12 @@ index 0000000..a5d5c89
 +
 +	ir = irctls[minor];
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	if (ir->d.minor != minor) {
 +		printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
 +		       "minor (%d) device not registered!", minor);
-+		mutex_unlock(&driver_lock);
++		mutex_unlock(&lirc_dev_lock);
 +		return -ENOENT;
 +	}
 +
@@ -1140,7 +1140,7 @@ index 0000000..a5d5c89
 +		irctls[minor] = NULL;
 +	}
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return 0;
 +}
@@ -1157,7 +1157,7 @@ index 0000000..a5d5c89
 +		return -ENODEV;
 +	}
 +
-+	if (mutex_lock_interruptible(&driver_lock))
++	if (mutex_lock_interruptible(&lirc_dev_lock))
 +		return -ERESTARTSYS;
 +
 +	ir = irctls[iminor(inode)];
@@ -1203,7 +1203,7 @@ index 0000000..a5d5c89
 +		dprintk(LOGHEAD "open result = %d\n", ir->d.name, ir->d.minor,
 +			retval);
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return retval;
 +}
@@ -1215,7 +1215,7 @@ index 0000000..a5d5c89
 +
 +	dprintk(LOGHEAD "close called\n", ir->d.name, ir->d.minor);
 +
-+	WARN_ON(mutex_lock_killable(&driver_lock));
++	WARN_ON(mutex_lock_killable(&lirc_dev_lock));
 +
 +	--ir->open;
 +	if (ir->attached) {
@@ -1227,7 +1227,7 @@ index 0000000..a5d5c89
 +		kfree(ir);
 +	}
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return 0;
 +}
@@ -1764,7 +1764,7 @@ index 0000000..8eeffa2
 +#endif
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
-index 0000000..5a7f9d0
+index 0000000..e27d937
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_i2c.c
 @@ -0,0 +1,537 @@
@@ -2122,8 +2122,8 @@ index 0000000..5a7f9d0
 +	.owner		= THIS_MODULE,
 +};
 +
-+static int ir_remove(struct i2c_client *client);
 +static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
++static int ir_remove(struct i2c_client *client);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 +
 +static const struct i2c_device_id ir_receiver_id[] = {
@@ -2140,8 +2140,8 @@ index 0000000..5a7f9d0
 +	},
 +	.probe		= ir_probe,
 +	.remove		= ir_remove,
-+	.command	= ir_command,
 +	.id_table	= ir_receiver_id,
++	.command	= ir_command,
 +};
 +
 +static void pcf_probe(struct i2c_client *client, struct IR *ir)
@@ -2869,10 +2869,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..83e4101
+index 0000000..3c87d94
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2062 @@
+@@ -0,0 +1,2298 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -2922,6 +2922,8 @@ index 0000000..83e4101
 +
 +#define BIT_DURATION	250	/* each bit received is 250us */
 +
++#define IMON_CLOCK_ENABLE_PACKETS	2
++
 +#define dprintk(fmt, args...)						\
 +	do {								\
 +		if (debug)						\
@@ -3008,7 +3010,7 @@ index 0000000..83e4101
 +	int ir_protocol;		/* iMON or MCE (RC6) IR protocol? */
 +	struct input_dev *mouse;	/* input device for iMON PAD remote */
 +	struct input_dev *touch;	/* input device for touchscreen */
-+	int has_touchscreen;		/* touchscreen present? */
++	int display_type;		/* store the display type */
 +	int pad_mouse;			/* toggle kbd(0)/mouse(1) mode */
 +	int touch_x;			/* x coordinate on touchscreen */
 +	int touch_y;			/* y coordinate on touchscreen */
@@ -3038,8 +3040,9 @@ index 0000000..83e4101
 +};
 +
 +enum {
-+	IMON_IR_PROTOCOL_IMON = 0,
-+	IMON_IR_PROTOCOL_MCE  = 1,
++	IMON_IR_PROTOCOL_IMON       = 0,
++	IMON_IR_PROTOCOL_MCE        = 1,
++	IMON_IR_PROTOCOL_IMON_NOPAD = 2,
 +};
 +/*
 + * USB Device ID for iMON USB Control Boards
@@ -3236,7 +3239,7 @@ index 0000000..83e4101
 +/* lcd, vfd, vga or none? should be auto-detected, but can be overridden... */
 +static int display_type;
 +
-+/* IR protocol: native iMON or Windows MCE (RC-6) */
++/* IR protocol: native iMON, Windows MCE (RC-6), or iMON w/o PAD stabilize */
 +static int ir_protocol;
 +
 +/*
@@ -3245,6 +3248,9 @@ index 0000000..83e4101
 + */
 +static int nomouse;
 +
++/* threshold at which a pad push registers as an arrow key in kbd mode */
++static int pad_thresh;
++
 +
 +/***  M O D U L E   C O D E ***/
 +
@@ -3260,10 +3266,15 @@ index 0000000..83e4101
 +		 "1=vfd, 2=lcd, 3=vga, 4=none (default: autodetect)");
 +module_param(ir_protocol, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(ir_protocol, "Which IR protocol to use. 0=native iMON, "
-+		 "1=Windows Media Center Ed. (RC-6) (default: native iMON)");
++		 "1=Windows Media Center Ed. (RC-6), 2=iMON w/o PAD stabilize "
++		 "(default: native iMON)");
 +module_param(nomouse, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(nomouse, "Disable mouse input device mode when IR device is "
 +		 "open. 0=don't disable, 1=disable. (default: don't disable)");
++module_param(pad_thresh, int, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(pad_thresh, "Threshold at which a pad push registers as an "
++		 "arrow key in kbd mode (default 80 on newer devices, 15 on "
++		 "older devices)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -3481,21 +3492,105 @@ index 0000000..83e4101
 +		return -ENODEV;
 +	}
 +
-+	mutex_lock(&context->lock);
-+
 +	if (!context->dev_present_intf0) {
 +		err("%s: no iMON device present", __func__);
-+		retval = -ENODEV;
-+		goto exit;
++		return -ENODEV;
 +	}
 +
 +	memcpy(context->usb_tx_buf, packet, sizeof(packet));
 +	retval = send_packet(context);
 +
-+exit:
-+	mutex_unlock(&context->lock);
++	return retval;
++}
++
++/**
++ * Sends packets to setup and show clock on iMON display
++ *
++ * Arguments: year - last 2 digits of year, month - 1..12,
++ * day - 1..31, dow - day of the week (0-Sun...6-Sat),
++ * hour - 0..23, minute - 0..59, second - 0..59
++ */
++static int send_set_imon_clock(struct imon_context *context,
++			       unsigned int year, unsigned int month,
++			       unsigned int day, unsigned int dow,
++			       unsigned int hour, unsigned int minute,
++			       unsigned int second)
++{
++	unsigned char clock_enable_pkt[IMON_CLOCK_ENABLE_PACKETS][8];
++	int retval = 0;
++	int i;
++
++	if (!context) {
++		err("%s: no context for device", __func__);
++		return -ENODEV;
++	}
++
++	switch(context->display_type) {
++	case IMON_DISPLAY_TYPE_LCD:
++		clock_enable_pkt[0][0] = 0x80;
++		clock_enable_pkt[0][1] = year;
++		clock_enable_pkt[0][2] = month-1;
++		clock_enable_pkt[0][3] = day;
++		clock_enable_pkt[0][4] = hour;
++		clock_enable_pkt[0][5] = minute;
++		clock_enable_pkt[0][6] = second;
++
++		clock_enable_pkt[1][0] = 0x80;
++		clock_enable_pkt[1][1] = 0;
++		clock_enable_pkt[1][2] = 0;
++		clock_enable_pkt[1][3] = 0;
++		clock_enable_pkt[1][4] = 0;
++		clock_enable_pkt[1][5] = 0;
++		clock_enable_pkt[1][6] = 0;
++
++		if (context->ffdc_dev) {
++			clock_enable_pkt[0][7] = 0x50;
++			clock_enable_pkt[1][7] = 0x51;
++		} else {
++			clock_enable_pkt[0][7] = 0x88;
++			clock_enable_pkt[1][7] = 0x8a;
++		}
++
++		break;
++
++	case IMON_DISPLAY_TYPE_VFD:
++		clock_enable_pkt[0][0] = year;
++		clock_enable_pkt[0][1] = month-1;
++		clock_enable_pkt[0][2] = day;
++		clock_enable_pkt[0][3] = dow;
++		clock_enable_pkt[0][4] = hour;
++		clock_enable_pkt[0][5] = minute;
++		clock_enable_pkt[0][6] = second;
++		clock_enable_pkt[0][7] = 0x40;
++
++		clock_enable_pkt[1][0] = 0;
++		clock_enable_pkt[1][1] = 0;
++		clock_enable_pkt[1][2] = 1;
++		clock_enable_pkt[1][3] = 0;
++		clock_enable_pkt[1][4] = 0;
++		clock_enable_pkt[1][5] = 0;
++		clock_enable_pkt[1][6] = 0;
++		clock_enable_pkt[1][7] = 0x42;
++
++		break;
++
++	default:
++		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);
++		if (retval) {
++			err("%s: send_packet failed for packet %d",
++			    __func__, i);
++			break;
++		}
++	}
 +
 +	return retval;
++
 +}
 +
 +/**
@@ -3551,16 +3646,104 @@ index 0000000..83e4101
 +	return count;
 +}
 +
++/**
++ * sysfs functions to control internal imon clock
++ */
++static ssize_t show_imon_clock(struct device *d,
++			       struct device_attribute *attr, char *buf)
++{
++	struct imon_context *context = dev_get_drvdata(d);
++	size_t len;
++
++	if (!context)
++		return -ENODEV;
++
++	mutex_lock(&context->lock);
++
++	if (!context->display_supported) {
++		len = snprintf(buf, PAGE_SIZE, "Not supported.");
++	} else {
++		len = snprintf(buf, PAGE_SIZE,
++			"To set the clock on your iMON display:\n"
++			"# date \"+%%y %%m %%d %%w %%H %%M %%S\" > imon_clock\n"
++			"%s", context->display_isopen ?
++			"\nNOTE: imon device must be closed\n" : "");
++	}
++
++	mutex_unlock(&context->lock);
++
++	return len;
++}
++
++static ssize_t store_imon_clock(struct device *d,
++				struct device_attribute *attr,
++				const char *buf, size_t count)
++{
++	struct imon_context *context = dev_get_drvdata(d);
++	ssize_t retval;
++	unsigned int year, month, day, dow, hour, minute, second;
++
++	if (!context)
++		return -ENODEV;
++
++	mutex_lock(&context->lock);
++
++	if (!context->display_supported) {
++		retval = -ENODEV;
++		goto exit;
++	} else if (context->display_isopen) {
++		retval = -EBUSY;
++		goto exit;
++	}
++
++	if (sscanf(buf, "%u %u %u %u %u %u %u",	&year, &month, &day, &dow,
++		   &hour, &minute, &second) != 7) {
++		retval = -EINVAL;
++		goto exit;
++	}
++
++	if ((month < 1 || month > 12) ||
++	    (day < 1 || day > 31) || (dow > 6) ||
++	    (hour > 23) || (minute > 59) || (second > 59)) {
++		retval = -EINVAL;
++		goto exit;
++	}
++
++	retval = send_set_imon_clock(context, year, month, day, dow,
++				     hour, minute, second);
++	if (retval)
++		goto exit;
++
++	retval = count;
++exit:
++	mutex_unlock(&context->lock);
++
++	return retval;
++}
++
++
++static DEVICE_ATTR(imon_clock, S_IWUSR | S_IRUGO, show_imon_clock,
++		   store_imon_clock);
++
 +static DEVICE_ATTR(associate_remote, S_IWUSR | S_IRUGO, show_associate_remote,
 +		   store_associate_remote);
 +
-+static struct attribute *imon_sysfs_entries[] = {
++static struct attribute *imon_display_sysfs_entries[] = {
++	&dev_attr_imon_clock.attr,
++	NULL
++};
++
++static struct attribute_group imon_display_attribute_group = {
++	.attrs = imon_display_sysfs_entries
++};
++
++static struct attribute *imon_rf_sysfs_entries[] = {
 +	&dev_attr_associate_remote.attr,
 +	NULL
 +};
 +
-+static struct attribute_group imon_attribute_group = {
-+	.attrs = imon_sysfs_entries
++static struct attribute_group imon_rf_attribute_group = {
++	.attrs = imon_rf_sysfs_entries
 +};
 +
 +/**
@@ -3743,12 +3926,15 @@ index 0000000..83e4101
 +	unsigned char ir_proto_packet[] =
 +		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
 +
-+	/* not supported on devices that don't do onboard decoding */
-+	if (!context->ir_onboard_decode)
-+		return;
-+
 +	switch (ir_protocol) {
 +	case IMON_IR_PROTOCOL_MCE:
++		/* MCE proto not supported on devices without tx control */
++		if (!context->tx_control) {
++			printk(KERN_INFO "%s: MCE IR protocol not supported on "
++			       "this device, using iMON protocol\n", __func__);
++			context->ir_protocol = IMON_IR_PROTOCOL_IMON;
++			return;
++		}
 +		dprintk("Configuring IR receiver for MCE protocol\n");
 +		ir_proto_packet[0] = 0x01;
 +		context->ir_protocol = IMON_IR_PROTOCOL_MCE;
@@ -3758,10 +3944,16 @@ index 0000000..83e4101
 +		/* ir_proto_packet[0] = 0x00; // already the default */
 +		context->ir_protocol = IMON_IR_PROTOCOL_IMON;
 +		break;
++	case IMON_IR_PROTOCOL_IMON_NOPAD:
++		dprintk("Configuring IR receiver for iMON protocol without "
++			"PAD stabilize function enabled\n");
++		/* ir_proto_packet[0] = 0x00; // already the default */
++		context->ir_protocol = IMON_IR_PROTOCOL_IMON_NOPAD;
++		break;
 +	default:
 +		printk(KERN_INFO "%s: unknown IR protocol specified, will "
 +		       "just default to iMON protocol\n", __func__);
-+		context->ir_protocol = IMON_IR_PROTOCOL_MCE;
++		context->ir_protocol = IMON_IR_PROTOCOL_IMON;
 +		break;
 +	}
 +	memcpy(context->usb_tx_buf, &ir_proto_packet,
@@ -3891,12 +4083,14 @@ index 0000000..83e4101
 +}
 +
 +/**
-+ * The directional pad is overly sensitive in keyboard mode, so we do some
-+ * interesting contortions to make it less touchy.
++ * The directional pad behaves a bit differently, depending on whether this is
++ * one of the older ffdc devices or a newer device. Newer devices appear to
++ * have a higher resolution matrix for more precise mouse movement, but it
++ * makes things overly sensitive in keyboard mode, so we do some interesting
++ * contortions to make it less touchy. Older devices run through the same
++ * routine with shorter timeout and a smaller threshold.
 + */
-+#define IMON_PAD_TIMEOUT	1000	/* in msecs */
-+#define IMON_PAD_THRESHOLD	80	/* 160x160 square */
-+static int stabilize(int a, int b)
++static int stabilize(int a, int b, u16 timeout, u16 threshold)
 +{
 +	struct timeval ct;
 +	static struct timeval prev_time = {0, 0};
@@ -3920,7 +4114,7 @@ index 0000000..83e4101
 +
 +	prev_time = ct;
 +
-+	if (abs(x) > IMON_PAD_THRESHOLD || abs(y) > IMON_PAD_THRESHOLD) {
++	if (abs(x) > threshold || abs(y) > threshold) {
 +		if (abs(y) > abs(x))
 +			result = (y > 0) ? 0x7F : 0x80;
 +		else
@@ -3935,21 +4129,21 @@ index 0000000..83e4101
 +			if (hits > 3) {
 +				switch (result) {
 +				case 0x7F:
-+					y = 17 * IMON_PAD_THRESHOLD / 30;
++					y = 17 * threshold / 30;
 +					break;
 +				case 0x80:
-+					y -= 17 * IMON_PAD_THRESHOLD / 30;
++					y -= 17 * threshold / 30;
 +					break;
 +				case 0x7F00:
-+					x = 17 * IMON_PAD_THRESHOLD / 30;
++					x = 17 * threshold / 30;
 +					break;
 +				case 0x8000:
-+					x -= 17 * IMON_PAD_THRESHOLD / 30;
++					x -= 17 * threshold / 30;
 +					break;
 +				}
 +			}
 +
-+			if (hits == 2 && msec_hit < IMON_PAD_TIMEOUT) {
++			if (hits == 2 && msec_hit < timeout) {
 +				result = 0;
 +				hits = 1;
 +			}
@@ -3974,20 +4168,21 @@ index 0000000..83e4101
 +	char rel_x = 0x00, rel_y = 0x00;
 +	int octet, bit;
 +	unsigned char mask;
-+	int i, chunk_num, dir;
++	int i, chunk_num;
 +	int ts_input = 0;
 +	int mouse_input;
++	int right_shift = 1;
++	int dir = 0;
++	u16 timeout, threshold;
 +	struct input_dev *mouse = NULL;
 +	struct input_dev *touch = NULL;
 +	const unsigned char toggle_button1[] = { 0x29, 0x91, 0x15, 0xb7 };
 +	const unsigned char toggle_button2[] = { 0x29, 0x91, 0x35, 0xb7 };
 +	const unsigned char ch_up[]   = { 0x28, 0x93, 0x95, 0xb7 };
 +	const unsigned char ch_down[] = { 0x28, 0x87, 0x95, 0xb7 };
-+	const unsigned char btn_left[]  = { 0x68, 0x83, 0x01, 0xb7 };
-+	const unsigned char btn_right[] = { 0x68, 0x84, 0x81, 0xb7 };
 +
 +	mouse = context->mouse;
-+	if (context->has_touchscreen)
++	if (context->display_type == IMON_DISPLAY_TYPE_VGA)
 +		touch = context->touch;
 +
 +	/* keyboard/mouse mode toggle button */
@@ -4005,8 +4200,8 @@ index 0000000..83e4101
 +	}
 +
 +	/* send touchscreen events through input subsystem if touchpad data */
-+	if (context->has_touchscreen && len == 8 &&
-+	    (buf[6] == 0x14 || buf[6] == 0x03) && buf[7] == 0x86) {
++	if (context->display_type == IMON_DISPLAY_TYPE_VGA && len == 8 &&
++	    buf[7] == 0x86) {
 +		if (touch == NULL) {
 +			printk(KERN_WARNING "%s: touchscreen input device is "
 +			       "NULL!\n", __func__);
@@ -4028,31 +4223,30 @@ index 0000000..83e4101
 +			mouse_input = 1;
 +			rel_x = buf[2];
 +			rel_y = buf[3];
-+		/* 0xffdc iMON PAD input */
++			right_shift = 1;
++		/* 0xffdc iMON PAD or mouse button input */
 +		} else if (context->ffdc_dev && (buf[0] & 0x40) &&
 +			   !((buf[1] & 0x01) || ((buf[1] >> 2) & 0x01))) {
 +			mouse_input = 1;
 +			rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 |
 +				(buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6;
 +			if (buf[0] & 0x02)
-+				rel_x |= ~0x11;
++				rel_x |= ~0x0f;
 +			rel_x = rel_x + rel_x / 2;
 +			rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 |
 +				(buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6;
 +			if (buf[0] & 0x01)
-+				rel_y |= ~0x11;
++				rel_y |= ~0x0f;
 +			rel_y = rel_y + rel_y / 2;
-+		/* 0xffdc mouse buttons */
-+		} else if (context->ffdc_dev && !memcmp(buf, btn_left, 4)) {
-+			mouse_input = 1;
-+			buf[1] = 0x01;
-+		} else if (context->ffdc_dev && !memcmp(buf, btn_right, 4)) {
-+			mouse_input = 1;
-+			buf[1] = 0x02;
++			right_shift = 2;
 +		/* ch+/- buttons, which we use for an emulated scroll wheel */
-+		} else if (!memcmp(buf, ch_up, 4) || !memcmp(buf, ch_down, 4))
++		} else if (!memcmp(buf, ch_up, 4)) {
 +			mouse_input = 1;
-+		else
++			dir = 1;
++		} else if (!memcmp(buf, ch_down, 4)) {
++			mouse_input = 1;
++			dir = -1;
++		} else
 +			mouse_input = 0;
 +
 +		if (mouse_input) {
@@ -4062,18 +4256,12 @@ index 0000000..83e4101
 +				return;
 +			}
 +			dprintk("sending mouse data via input subsystem\n");
-+			if (!memcmp(buf, ch_up, 4))
-+				dir = 1;
-+			else if (!memcmp(buf, ch_down, 4))
-+				dir = -1;
-+			else
-+				dir = 0;
 +
 +			if (dir == 0) {
 +				input_report_key(mouse, BTN_LEFT,
 +						 buf[1] & 0x01);
 +				input_report_key(mouse, BTN_RIGHT,
-+						 buf[1] >> 1 & 0x01);
++						 buf[1] >> right_shift & 0x01);
 +				input_report_rel(mouse, REL_X, rel_x);
 +				input_report_rel(mouse, REL_Y, rel_y);
 +			} else
@@ -4098,6 +4286,9 @@ index 0000000..83e4101
 +		/* first, pad to 8 bytes so it conforms with everything else */
 +		buf[5] = buf[6] = buf[7] = 0;
 +		len = 8;
++		timeout = 500;	/* in msecs */
++		/* (2*threshold) x (2*threshold) square */
++		threshold = pad_thresh ? pad_thresh : 80;
 +		rel_x = buf[2];
 +		rel_y = buf[3];
 +
@@ -4111,12 +4302,23 @@ index 0000000..83e4101
 +		 * diagonals, it has a tendancy to jump back and forth, so lets
 +		 * try to ignore when they get too close
 +		 */
-+		if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
-+			dir = stabilize((int)rel_x, (int)rel_y);
-+			if (!dir)
-+				return;
-+			buf[2] = dir & 0xFF;
-+			buf[3] = (dir >> 8) & 0xFF;
++		if (context->ir_protocol == IMON_IR_PROTOCOL_IMON) {
++			if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
++				dir = stabilize((int)rel_x, (int)rel_y,
++						timeout, threshold);
++				if (!dir)
++					return;
++				buf[2] = dir & 0xFF;
++				buf[3] = (dir >> 8) & 0xFF;
++			}
++		} else {
++			if (abs(rel_y) > abs(rel_x)) {
++				buf[2] = (rel_y > 0) ? 0x7F : 0x80;
++				buf[3] = 0;
++			} else {
++				buf[2] = 0;
++				buf[3] = (rel_x > 0) ? 0x7F : 0x80;
++			}
 +		}
 +
 +	} else if ((len == 8) && (buf[0] & 0x40) &&
@@ -4134,6 +4336,9 @@ index 0000000..83e4101
 +		 * 0x01007F00, ..., so one can use the normal imon-pad config
 +		 * from the remotes dir.
 +		 */
++		timeout = 10;	/* in msecs */
++		/* (2*threshold) x (2*threshold) square */
++		threshold = pad_thresh ? pad_thresh : 15;
 +
 +		/* buf[1] is x */
 +		rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 |
@@ -4149,11 +4354,22 @@ index 0000000..83e4101
 +		buf[0] = 0x01;
 +		buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0;
 +
-+		dir = stabilize((int)rel_x, (int)rel_y);
-+		if (!dir)
-+			return;
-+		buf[2] = dir & 0xFF;
-+		buf[3] = (dir >> 8) & 0xFF;
++		if (context->ir_protocol == IMON_IR_PROTOCOL_IMON) {
++			dir = stabilize((int)rel_x, (int)rel_y,
++					timeout, threshold);
++			if (!dir)
++				return;
++			buf[2] = dir & 0xFF;
++			buf[3] = (dir >> 8) & 0xFF;
++		} else {
++			if (abs(rel_y) > abs(rel_x)) {
++				buf[2] = (rel_y > 0) ? 0x7F : 0x80;
++				buf[3] = 0;
++			} else {
++				buf[2] = 0;
++				buf[3] = (rel_x > 0) ? 0x7F : 0x80;
++			}
++		}
 +
 +	} else if (ts_input) {
 +		/*
@@ -4276,7 +4492,7 @@ index 0000000..83e4101
 +	struct imon_context *context = (struct imon_context *)data;
 +	struct input_dev *touch;
 +
-+	if (!context->has_touchscreen)
++	if (!context->display_type == IMON_DISPLAY_TYPE_VGA)
 +		return;
 +
 +	touch = context->touch;
@@ -4387,24 +4603,41 @@ index 0000000..83e4101
 +	int alloc_status = 0;
 +	int vfd_proto_6p = 0;
 +	int ir_onboard_decode = 0;
-+	int has_touchscreen = 0;
 +	int buf_chunk_size = BUF_CHUNK_SIZE;
 +	int code_length;
 +	int tx_control = 0;
 +	struct imon_context *context = NULL;
 +	struct imon_context *first_if_context = NULL;
-+	int i;
++	int i, sysfs_err;
++	int configured_display_type = IMON_DISPLAY_TYPE_VFD;
 +	u16 vendor, product;
 +	const unsigned char fp_packet[] = { 0x40, 0x00, 0x00, 0x00,
 +					    0x00, 0x00, 0x00, 0x88 };
 +
 +	/*
++	 * Try to auto-detect the type of display if the user hasn't set
++	 * it by hand via the display_type modparam. Default is VFD.
++	 */
++	if (display_type == IMON_DISPLAY_TYPE_AUTO) {
++		if (usb_match_id(interface, lcd_device_list))
++			configured_display_type = IMON_DISPLAY_TYPE_LCD;
++		else if (usb_match_id(interface, imon_touchscreen_list))
++			configured_display_type = IMON_DISPLAY_TYPE_VGA;
++		else if (usb_match_id(interface, ir_only_list))
++			configured_display_type = IMON_DISPLAY_TYPE_NONE;
++		else
++			configured_display_type = IMON_DISPLAY_TYPE_VFD;
++	} else {
++		configured_display_type = display_type;
++		dprintk("%s: overriding display type to %d via modparam\n",
++			__func__, display_type);
++	}
++
++	/*
 +	 * If it's the LCD, as opposed to the VFD, we just need to replace
 +	 * the "write" file op.
 +	 */
-+	if ((display_type == IMON_DISPLAY_TYPE_AUTO &&
-+	     usb_match_id(interface, lcd_device_list)) ||
-+	    display_type == IMON_DISPLAY_TYPE_LCD)
++	if (configured_display_type == IMON_DISPLAY_TYPE_LCD)
 +		display_fops.write = &lcd_write;
 +
 +	/*
@@ -4480,9 +4713,7 @@ index 0000000..83e4101
 +	 * that SoundGraph recycles device IDs between devices both with
 +	 * and without... :\
 +	 */
-+	if ((display_type == IMON_DISPLAY_TYPE_AUTO &&
-+	     usb_match_id(interface, ir_only_list)) ||
-+	    display_type == IMON_DISPLAY_TYPE_NONE) {
++	if (configured_display_type == IMON_DISPLAY_TYPE_NONE) {
 +		display_ep_found = 0;
 +		dprintk("%s: device has no display\n", __func__);
 +	}
@@ -4491,11 +4722,8 @@ index 0000000..83e4101
 +	 * iMON Touch devices have a VGA touchscreen, but no "display", as
 +	 * that refers to e.g. /dev/lcd0 (a character device LCD or VFD).
 +	 */
-+	if ((display_type == IMON_DISPLAY_TYPE_AUTO &&
-+	     usb_match_id(interface, imon_touchscreen_list)) ||
-+	    display_type == IMON_DISPLAY_TYPE_VGA) {
++	if (configured_display_type == IMON_DISPLAY_TYPE_VGA) {
 +		display_ep_found = 0;
-+		has_touchscreen = 1;
 +		dprintk("%s: iMON Touch device found\n", __func__);
 +	}
 +
@@ -4636,7 +4864,7 @@ index 0000000..83e4101
 +		if (product == 0xffdc)
 +			context->ffdc_dev = 1;
 +
-+		context->has_touchscreen = has_touchscreen;
++		context->display_type = configured_display_type;
 +
 +		context->mouse = input_allocate_device();
 +
@@ -4689,7 +4917,7 @@ index 0000000..83e4101
 +		context->rx_endpoint_intf1 = rx_endpoint;
 +		context->rx_urb_intf1 = rx_urb;
 +
-+		if (context->has_touchscreen) {
++		if (context->display_type == IMON_DISPLAY_TYPE_VGA) {
 +			context->touch = input_allocate_device();
 +
 +			snprintf(context->name_touch,
@@ -4745,17 +4973,23 @@ index 0000000..83e4101
 +
 +	/* RF products *also* use 0xffdc... sigh... */
 +	if (context->ffdc_dev) {
-+		int err;
-+
-+		err = sysfs_create_group(&interface->dev.kobj,
-+					 &imon_attribute_group);
-+		if (err)
-+			err("%s: Could not create sysfs entries(%d)",
-+			    __func__, err);
++		sysfs_err = sysfs_create_group(&interface->dev.kobj,
++					       &imon_rf_attribute_group);
++		if (sysfs_err)
++			err("%s: Could not create RF sysfs entries(%d)",
++			    __func__, sysfs_err);
 +	}
 +
 +	if (context->display_supported && ifnum == 0) {
 +		dprintk("%s: Registering iMON display with sysfs\n", __func__);
++
++		/* set up sysfs entry for built-in clock */
++		sysfs_err = sysfs_create_group(&interface->dev.kobj,
++					       &imon_display_attribute_group);
++		if (sysfs_err)
++			err("%s: Could not create display sysfs entries(%d)",
++			    __func__, sysfs_err);
++
 +		if (usb_register_dev(interface, &imon_class)) {
 +			/* Not a fatal error, so ignore */
 +			printk(KERN_INFO "%s: could not get a minor number for "
@@ -4830,7 +5064,9 @@ index 0000000..83e4101
 +	 * hasn't been called
 +	 */
 +	sysfs_remove_group(&interface->dev.kobj,
-+			   &imon_attribute_group);
++			   &imon_display_attribute_group);
++	sysfs_remove_group(&interface->dev.kobj,
++			   &imon_rf_attribute_group);
 +
 +	usb_set_intfdata(interface, NULL);
 +
@@ -4849,7 +5085,7 @@ index 0000000..83e4101
 +	} else {
 +		context->dev_present_intf1 = 0;
 +		usb_kill_urb(context->rx_urb_intf1);
-+		if (context->has_touchscreen)
++		if (context->display_type == IMON_DISPLAY_TYPE_VGA)
 +			input_unregister_device(context->touch);
 +	}
 +
@@ -6596,10 +6832,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..840d0e1
+index 0000000..58dfdd5
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1223 @@
+@@ -0,0 +1,1225 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -6783,6 +7019,8 @@ index 0000000..840d0e1
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
 +	/* Formosa Industrial Computing / Beanbag Emulation Device */
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
++	/* Formosa Industrial Computing AIM IR605/A */
++	{ USB_DEVICE(VENDOR_FORMOSA, 0xe03c) },
 +	/* Fintek eHome Infrared Transceiver */
 +	{ USB_DEVICE(VENDOR_FINTEK, 0x0602) },
 +	/* Fintek eHome Infrared Transceiver (in the AOpen MP45) */
@@ -10831,10 +11069,10 @@ 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..6c64072
+index 0000000..b497642
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sir.c
-@@ -0,0 +1,1294 @@
+@@ -0,0 +1,1283 @@
 +/*
 + * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
 + *
@@ -10979,8 +11217,16 @@ index 0000000..6c64072
 +#define LIRC_IRQ 4
 +#endif
 +#ifndef LIRC_PORT
++/* for external dongles, default to com1 */
++#if defined(LIRC_SIR_ACTISYS_ACT200L) || \
++    defined(LIRC_SIR_ACTISYS_ACT220L) || \
++    defined(LIRC_SIR_TEKRAM)
++#define LIRC_PORT 0x3f8
++#else
++/* onboard sir ports are typically com3 */
 +#define LIRC_PORT 0x3e8
 +#endif
++#endif
 +
 +static int io = LIRC_PORT;
 +static int irq = LIRC_IRQ;
@@ -10998,7 +11244,6 @@ index 0000000..6c64072
 +static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue);
 +
 +static DEFINE_SPINLOCK(hardware_lock);
-+static DEFINE_SPINLOCK(dev_lock);
 +
 +static int rx_buf[RBUF_LEN];
 +static unsigned int rx_tail, rx_head;
@@ -11015,8 +11260,6 @@ index 0000000..6c64072
 +/* SECTION: Prototypes */
 +
 +/* Communication with user-space */
-+static int lirc_open(struct inode *inode, struct file *file);
-+static int lirc_close(struct inode *inode, struct file *file);
 +static unsigned int lirc_poll(struct file *file, poll_table *wait);
 +static ssize_t lirc_read(struct file *file, char *buf, size_t count,
 +		loff_t *ppos);
@@ -11076,22 +11319,6 @@ index 0000000..6c64072
 +
 +/* SECTION: Communication with user-space */
 +
-+static int lirc_open(struct inode *inode, struct file *file)
-+{
-+	spin_lock(&dev_lock);
-+	if (module_refcount(THIS_MODULE)) {
-+		spin_unlock(&dev_lock);
-+		return -EBUSY;
-+	}
-+	spin_unlock(&dev_lock);
-+	return 0;
-+}
-+
-+static int lirc_close(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
 +static unsigned int lirc_poll(struct file *file, poll_table *wait)
 +{
 +	poll_wait(file, &lirc_read_queue, wait);
@@ -11306,8 +11533,8 @@ index 0000000..6c64072
 +	.write		= lirc_write,
 +	.poll		= lirc_poll,
 +	.ioctl		= lirc_ioctl,
-+	.open		= lirc_open,
-+	.release	= lirc_close,
++	.open		= lirc_dev_fop_open,
++	.release	= lirc_dev_fop_close,
 +};
 +
 +static int set_use_inc(void *data)
@@ -13317,7 +13544,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..a06e6de
+index 0000000..c532399
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1374 @@



From kyle at fedoraproject.org  Mon Aug 10 20:38:05 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 20:38:05 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-mm-lru-evict-streaming-io-pages-first.patch, 1.4, 1.5
Message-ID: <20090810203805.0824311C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10310

Modified Files:
	linux-2.6-mm-lru-evict-streaming-io-pages-first.patch 
Log Message:
mm junk: oops, forgot second patch from git

linux-2.6-mm-lru-evict-streaming-io-pages-first.patch:
 include/linux/memcontrol.h |    7 +++++++
 mm/memcontrol.c            |   11 +++++++++++
 mm/vmscan.c                |   38 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 1 deletion(-)

Index: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-mm-lru-evict-streaming-io-pages-first.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-mm-lru-evict-streaming-io-pages-first.patch	10 Aug 2009 20:18:34 -0000	1.4
+++ linux-2.6-mm-lru-evict-streaming-io-pages-first.patch	10 Aug 2009 20:38:04 -0000	1.5
@@ -54,8 +54,8 @@ index 78eb855..f4e9f51 100644
 +	unsigned long active;
 +	unsigned long inactive;
 +
-+	inactive = mem_cgroup_get_all_zonestat(memcg, LRU_INACTIVE_FILE);
-+	active = mem_cgroup_get_all_zonestat(memcg, LRU_ACTIVE_FILE);
++	inactive = mem_cgroup_get_local_zonestat(memcg, LRU_INACTIVE_FILE);
++	active = mem_cgroup_get_local_zonestat(memcg, LRU_ACTIVE_FILE);
 +
 +	return (active > inactive);
 +}



From kyle at fedoraproject.org  Mon Aug 10 20:49:42 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 10 Aug 2009 20:49:42 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-utrace-ftrace.patch, 1.3, 1.4 kernel.spec,
	1.1699, 1.1700 linux-2.6-tracehook.patch, 1.10,
	1.11 linux-2.6-utrace.patch, 1.112, 1.113
Message-ID: <20090810204942.B3E5211C0344@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11473

Modified Files:
	kernel.spec linux-2.6-tracehook.patch linux-2.6-utrace.patch 
Added Files:
	linux-2.6-utrace-ftrace.patch 
Log Message:
utrace & tracehook rebase, utrace-ftrace build fixes

linux-2.6-utrace-ftrace.patch:
 include/linux/processtrace.h |   41 ++
 kernel/trace/Kconfig         |    9 
 kernel/trace/Makefile        |    1 
 kernel/trace/trace.h         |    9 
 kernel/trace/trace_process.c |  599 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 658 insertions(+), 1 deletion(-)

Index: linux-2.6-utrace-ftrace.patch
===================================================================
RCS file: linux-2.6-utrace-ftrace.patch
diff -N linux-2.6-utrace-ftrace.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-utrace-ftrace.patch	10 Aug 2009 20:49:41 -0000	1.4
@@ -0,0 +1,766 @@
+utrace-based ftrace "process" engine, v2
+
+This is v2 of the prototype utrace-ftrace interface.  This code is
+based on Roland McGrath's utrace API, which provides programmatic
+hooks to the in-tree tracehook layer.  This new patch interfaces many
+of those events to ftrace, as configured by a small number of debugfs
+controls.  Here's the /debugfs/tracing/process_trace_README:
+
+process event tracer mini-HOWTO
+
+1. Select process hierarchy to monitor.  Other processes will be
+completely unaffected.  Leave at 0 for system-wide tracing.
+%  echo NNN > process_follow_pid
+
+2. Determine which process event traces are potentially desired.
+syscall and signal tracing slow down monitored processes.
+%  echo 0 > process_trace_{syscalls,signals,lifecycle}
+
+3. Add any final uid- or taskcomm-based filtering.  Non-matching
+processes will skip trace messages, but will still be slowed.
+%  echo NNN > process_trace_uid_filter # -1: unrestricted
+%  echo ls > process_trace_taskcomm_filter # empty: unrestricted
+
+4. Start tracing.
+%  echo process > current_tracer
+
+5. Examine trace.
+%  cat trace
+
+6. Stop tracing.
+%  echo nop > current_tracer
+
+Signed-off-by: Frank Ch. Eigler <fche at redhat.com>
+---
+diff --git a/include/linux/processtrace.h b/include/linux/processtrace.h
+new file mode 100644
+index 0000000..f2b7d94
+--- /dev/null
++++ b/include/linux/processtrace.h
+@@ -0,0 +1,41 @@
++#ifndef PROCESSTRACE_H
++#define PROCESSTRACE_H
++
++#include <linux/types.h>
++#include <linux/list.h>
++
++struct process_trace_entry {
++	unsigned char opcode;	/* one of _UTRACE_EVENT_* */
++	char comm[TASK_COMM_LEN]; /* XXX: should be in/via trace_entry */
++	union {
++		struct {
++			pid_t child;
++			unsigned long flags;
++		} trace_clone;
++		struct {
++			long code;
++		} trace_exit;
++		struct {
++		} trace_exec;
++		struct {
++			int si_signo;
++			int si_errno;
++			int si_code;
++		} trace_signal;
++		struct {
++			long callno;
++			unsigned long args[6];
++		} trace_syscall_entry;
++		struct {
++			long rc;
++			long error;
++		} trace_syscall_exit;
++	};
++};
++
++/* in kernel/trace/trace_process.c */
++
++extern void enable_process_trace(void);
++extern void disable_process_trace(void);
++
++#endif /* PROCESSTRACE_H */
+diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
+index 417d198..4b412e3 100644
+--- a/kernel/trace/Kconfig
++++ b/kernel/trace/Kconfig
+@@ -189,6 +189,15 @@ config FTRACE_SYSCALLS
+ 	help
+ 	  Basic tracer to catch the syscall entry and exit events.
+ 
++config PROCESS_TRACER
++	bool "Trace process events via utrace"
++	depends on DEBUG_KERNEL
++	select TRACING
++	select UTRACE
++	help
++	  This tracer provides trace records from process events
++	  accessible to utrace: lifecycle, system calls, and signals.
++
+ config BOOT_TRACER
+ 	bool "Trace boot initcalls"
+ 	select TRACING
+diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
+index 2630f51..c043a50 100644
+--- a/kernel/trace/Makefile
++++ b/kernel/trace/Makefile
+@@ -46,5 +46,6 @@ obj-$(CONFIG_EVENT_TRACER) += trace_export.o
+ obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o
+ obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o
+ obj-$(CONFIG_EVENT_TRACER) += trace_events_filter.o
++obj-$(CONFIG_PROCESS_TRACER) += trace_process.o
+ 
+ libftrace-y := ftrace.o
+diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
+index e685ac2..323b174 100644
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -7,6 +7,7 @@
+ #include <linux/clocksource.h>
+ #include <linux/ring_buffer.h>
+ #include <linux/mmiotrace.h>
++#include <linux/processtrace.h>
+ #include <linux/ftrace.h>
+ #include <trace/boot.h>
+ #include <trace/kmemtrace.h>
+@@ -37,6 +38,7 @@ enum trace_type {
+ 	TRACE_KMEM_FREE,
+ 	TRACE_POWER,
+ 	TRACE_BLK,
++        TRACE_PROCESS,
+ 
+ 	__TRACE_LAST_TYPE,
+ };
+@@ -218,6 +220,10 @@ struct syscall_trace_exit {
+ 	unsigned long		ret;
+ };
+ 
++struct trace_process {
++	struct trace_entry		ent;
++	struct process_trace_entry	event;
++};
+ 
+ /*
+  * trace_flag_type is an enumeration that holds different
+@@ -327,15 +333,16 @@ extern void __ftrace_bad_type(void);
+ 		IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,	\
+ 			  TRACE_GRAPH_RET);		\
+ 		IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\
+-		IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
+ 		IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry,	\
+ 			  TRACE_KMEM_ALLOC);	\
+ 		IF_ASSIGN(var, ent, struct kmemtrace_free_entry,	\
+ 			  TRACE_KMEM_FREE);	\
++		IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
+ 		IF_ASSIGN(var, ent, struct syscall_trace_enter,		\
+ 			  TRACE_SYSCALL_ENTER);				\
+ 		IF_ASSIGN(var, ent, struct syscall_trace_exit,		\
+ 			  TRACE_SYSCALL_EXIT);				\
++		IF_ASSIGN(var, ent, struct trace_process, TRACE_PROCESS); \
+ 		__ftrace_bad_type();					\
+ 	} while (0)
+ 
+diff --git a/kernel/trace/trace_process.c b/kernel/trace/trace_process.c
+new file mode 100644
+index 0000000..e877f95
+--- /dev/null
++++ b/kernel/trace/trace_process.c
+@@ -0,0 +1,599 @@
++/*
++ * utrace-based process event tracing
++ * Copyright (C) 2009 Red Hat Inc.
++ * By Frank Ch. Eigler <fche at redhat.com>
++ *
++ * Based on mmio ftrace engine by Pekka Paalanen
++ * and utrace-syscall-tracing prototype by Ananth Mavinakayanahalli
++ */
++
++/* #define DEBUG 1 */
++
++#include <linux/kernel.h>
++#include <linux/utrace.h>
++#include <linux/uaccess.h>
++#include <linux/debugfs.h>
++#include <asm/syscall.h>
++
++#include "trace.h"
++#include "trace_output.h"
++
++/* A process must match these filters in order to be traced. */
++static char trace_taskcomm_filter[TASK_COMM_LEN]; /* \0: unrestricted */
++static u32 trace_taskuid_filter = -1; /* -1: unrestricted */
++static u32 trace_lifecycle_p = 1;
++static u32 trace_syscalls_p = 1;
++static u32 trace_signals_p = 1;
++
++/* A process must be a direct child of given pid in order to be
++   followed. */
++static u32 process_follow_pid; /* 0: unrestricted/systemwide */
++
++/* XXX: lock the above? */
++
++
++/* trace data collection */
++
++static struct trace_array *process_trace_array;
++
++static void process_reset_data(struct trace_array *tr)
++{
++	pr_debug("in %s\n", __func__);
++	tracing_reset_online_cpus(tr);
++}
++
++static int process_trace_init(struct trace_array *tr)
++{
++	pr_debug("in %s\n", __func__);
++	process_trace_array = tr;
++	process_reset_data(tr);
++	enable_process_trace();
++	return 0;
++}
++
++static void process_trace_reset(struct trace_array *tr)
++{
++	pr_debug("in %s\n", __func__);
++	disable_process_trace();
++	process_reset_data(tr);
++	process_trace_array = NULL;
++}
++
++static void process_trace_start(struct trace_array *tr)
++{
++	pr_debug("in %s\n", __func__);
++	process_reset_data(tr);
++}
++
++static void __trace_processtrace(struct trace_array *tr,
++				struct trace_array_cpu *data,
++				struct process_trace_entry *ent)
++{
++	struct ring_buffer_event *event;
++	struct trace_process *entry;
++
++	event	= ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
++	if (!event)
++		return;
++	entry	= ring_buffer_event_data(event);
++	tracing_generic_entry_update(&entry->ent, 0, preempt_count());
++	entry->ent.type			= TRACE_PROCESS;
++	strlcpy(ent->comm, current->comm, TASK_COMM_LEN);
++	entry->event			= *ent;
++	ring_buffer_unlock_commit(tr->buffer, event);
++
++	trace_wake_up();
++}
++
++void process_trace(struct process_trace_entry *ent)
++{
++	struct trace_array *tr = process_trace_array;
++	struct trace_array_cpu *data;
++
++	preempt_disable();
++	data = tr->data[smp_processor_id()];
++	__trace_processtrace(tr, data, ent);
++	preempt_enable();
++}
++
++
++/* trace data rendering */
++
++static void process_pipe_open(struct trace_iterator *iter)
++{
++	struct trace_seq *s = &iter->seq;
++	pr_debug("in %s\n", __func__);
++	trace_seq_printf(s, "VERSION 200901\n");
++}
++
++static void process_close(struct trace_iterator *iter)
++{
++	iter->private = NULL;
++}
++
++static ssize_t process_read(struct trace_iterator *iter, struct file *filp,
++				char __user *ubuf, size_t cnt, loff_t *ppos)
++{
++	ssize_t ret;
++	struct trace_seq *s = &iter->seq;
++	ret = trace_seq_to_user(s, ubuf, cnt);
++	return (ret == -EBUSY) ? 0 : ret;
++}
++
++static enum print_line_t process_print(struct trace_iterator *iter)
++{
++	struct trace_entry *entry = iter->ent;
++	struct trace_process *field;
++	struct trace_seq *s	= &iter->seq;
++	unsigned long long t	= ns2usecs(iter->ts);
++	unsigned long usec_rem	= do_div(t, 1000000ULL);
++	unsigned secs		= (unsigned long)t;
++	int ret = 1;
++
++	trace_assign_type(field, entry);
++
++	/* XXX: If print_lat_fmt() were not static, we wouldn't have
++	   to duplicate this. */
++	trace_seq_printf(s, "%16s %5d %9lu.%06ld ",
++			 field->event.comm,
++			 entry->pid,
++			 secs,
++			 usec_rem);
++
++	switch (field->event.opcode) {
++	case _UTRACE_EVENT_CLONE:
++		ret = trace_seq_printf(s, "fork %d flags 0x%lx\n",
++				       field->event.trace_clone.child,
++				       field->event.trace_clone.flags);
++		break;
++	case _UTRACE_EVENT_EXEC:
++		ret = trace_seq_printf(s, "exec\n");
++		break;
++	case _UTRACE_EVENT_EXIT:
++		ret = trace_seq_printf(s, "exit %ld\n",
++				       field->event.trace_exit.code);
++		break;
++	case _UTRACE_EVENT_SIGNAL:
++		ret = trace_seq_printf(s, "signal %d errno %d code 0x%x\n",
++				       field->event.trace_signal.si_signo,
++				       field->event.trace_signal.si_errno,
++				       field->event.trace_signal.si_code);
++		break;
++	case _UTRACE_EVENT_SYSCALL_ENTRY:
++		ret = trace_seq_printf(s, "syscall %ld [0x%lx 0x%lx 0x%lx"
++					  " 0x%lx 0x%lx 0x%lx]\n",
++				      field->event.trace_syscall_entry.callno,
++				      field->event.trace_syscall_entry.args[0],
++				      field->event.trace_syscall_entry.args[1],
++				      field->event.trace_syscall_entry.args[2],
++				      field->event.trace_syscall_entry.args[3],
++				      field->event.trace_syscall_entry.args[4],
++				      field->event.trace_syscall_entry.args[5]);
++		break;
++	case _UTRACE_EVENT_SYSCALL_EXIT:
++		ret = trace_seq_printf(s, "syscall rc %ld error %ld\n",
++				       field->event.trace_syscall_exit.rc,
++				       field->event.trace_syscall_exit.error);
++		break;
++	default:
++		ret = trace_seq_printf(s, "process code %d?\n",
++				       field->event.opcode);
++		break;
++	}
++	if (ret)
++		return TRACE_TYPE_HANDLED;
++	return TRACE_TYPE_HANDLED;
++}
++
++
++static enum print_line_t process_print_line(struct trace_iterator *iter)
++{
++	switch (iter->ent->type) {
++	case TRACE_PROCESS:
++		return process_print(iter);
++	default:
++		return TRACE_TYPE_HANDLED; /* ignore unknown entries */
++	}
++}
++
++static struct tracer process_tracer = {
++	.name		= "process",
++	.init		= process_trace_init,
++	.reset		= process_trace_reset,
++	.start		= process_trace_start,
++	.pipe_open	= process_pipe_open,
++	.close		= process_close,
++	.read		= process_read,
++	.print_line	= process_print_line,
++};
++
++
++
++/* utrace backend */
++
++/* Should tracing apply to given task?	Compare against filter
++   values. */
++static int trace_test(struct task_struct *tsk)
++{
++	if (trace_taskcomm_filter[0]
++	    && strncmp(trace_taskcomm_filter, tsk->comm, TASK_COMM_LEN))
++		return 0;
++
++	if (trace_taskuid_filter != (u32)-1
++	    && trace_taskuid_filter != task_uid(tsk))
++		return 0;
++
++	return 1;
++}
++
++
++static const struct utrace_engine_ops process_trace_ops;
++
++static void process_trace_tryattach(struct task_struct *tsk)
++{
++	struct utrace_engine *engine;
++
++	pr_debug("in %s\n", __func__);
++	engine = utrace_attach_task(tsk,
++				    UTRACE_ATTACH_CREATE |
++				    UTRACE_ATTACH_EXCLUSIVE,
++				    &process_trace_ops, NULL);
++	if (IS_ERR(engine) || (engine == NULL)) {
++		pr_warning("utrace_attach_task %d (rc %p)\n",
++			   tsk->pid, engine);
++	} else {
++		int rc;
++
++		/* We always hook cost-free events. */
++		unsigned long events =
++			UTRACE_EVENT(CLONE) |
++			UTRACE_EVENT(EXEC) |
++			UTRACE_EVENT(EXIT);
++
++		/* Penalizing events are individually controlled, so that
++		   utrace doesn't even take the monitored threads off their
++		   fast paths, nor bother call our callbacks. */
++		if (trace_syscalls_p)
++			events |= UTRACE_EVENT_SYSCALL;
++		if (trace_signals_p)
++			events |= UTRACE_EVENT_SIGNAL_ALL;
++
++		rc = utrace_set_events(tsk, engine, events);
++		if (rc == -EINPROGRESS)
++			rc = utrace_barrier(tsk, engine);
++		if (rc)
++			pr_warning("utrace_set_events/barrier rc %d\n", rc);
++
++		utrace_engine_put(engine);
++		pr_debug("attached in %s to %s(%d)\n", __func__,
++			 tsk->comm, tsk->pid);
++	}
++}
++
++
++u32 process_trace_report_clone(enum utrace_resume_action action,
++			       struct utrace_engine *engine,
++			       struct task_struct *parent,
++			       unsigned long clone_flags,
++			       struct task_struct *child)
++{
++	if (trace_lifecycle_p && trace_test(parent)) {
++		struct process_trace_entry ent;
++		ent.opcode = _UTRACE_EVENT_CLONE;
++		ent.trace_clone.child = child->pid;
++		ent.trace_clone.flags = clone_flags;
++		process_trace(&ent);
++	}
++
++	process_trace_tryattach(child);
++
++	return UTRACE_RESUME;
++}
++
++
++u32 process_trace_report_syscall_entry(u32 action,
++				       struct utrace_engine *engine,
++				       struct task_struct *task,
++				       struct pt_regs *regs)
++{
++	if (trace_syscalls_p && trace_test(task)) {
++		struct process_trace_entry ent;
++		ent.opcode = _UTRACE_EVENT_SYSCALL_ENTRY;
++		ent.trace_syscall_entry.callno = syscall_get_nr(task, regs);
++		syscall_get_arguments(task, regs, 0, 6,
++				      ent.trace_syscall_entry.args);
++		process_trace(&ent);
++	}
++
++	return UTRACE_RESUME;
++}
++
++
++u32 process_trace_report_syscall_exit(enum utrace_resume_action action,
++				   struct utrace_engine *engine,
++				   struct task_struct *task,
++				   struct pt_regs *regs)
++{
++	if (trace_syscalls_p && trace_test(task)) {
++		struct process_trace_entry ent;
++		ent.opcode = _UTRACE_EVENT_SYSCALL_EXIT;
++		ent.trace_syscall_exit.rc =
++			syscall_get_return_value(task, regs);
++		ent.trace_syscall_exit.error = syscall_get_error(task, regs);
++		process_trace(&ent);
++	}
++
++	return UTRACE_RESUME;
++}
++
++
++u32 process_trace_report_exec(enum utrace_resume_action action,
++			      struct utrace_engine *engine,
++			      struct task_struct *task,
++			      const struct linux_binfmt *fmt,
++			      const struct linux_binprm *bprm,
++			      struct pt_regs *regs)
++{
++	if (trace_lifecycle_p && trace_test(task)) {
++		struct process_trace_entry ent;
++		ent.opcode = _UTRACE_EVENT_EXEC;
++		process_trace(&ent);
++	}
++
++	/* We're already attached; no need for a new tryattach. */
++
++	return UTRACE_RESUME;
++}
++
++
++u32 process_trace_report_signal(u32 action,
++				struct utrace_engine *engine,
++				struct task_struct *task,
++				struct pt_regs *regs,
++				siginfo_t *info,
++				const struct k_sigaction *orig_ka,
++				struct k_sigaction *return_ka)
++{
++	if (trace_signals_p && trace_test(task)) {
++		struct process_trace_entry ent;
++		ent.opcode = _UTRACE_EVENT_SIGNAL;
++		ent.trace_signal.si_signo = info->si_signo;
++		ent.trace_signal.si_errno = info->si_errno;
++		ent.trace_signal.si_code = info->si_code;
++		process_trace(&ent);
++	}
++
++	/* We're already attached, so no need for a new tryattach. */
++
++	return UTRACE_RESUME | utrace_signal_action(action);
++}
++
++
++u32 process_trace_report_exit(enum utrace_resume_action action,
++			      struct utrace_engine *engine,
++			      struct task_struct *task,
++			      long orig_code, long *code)
++{
++	if (trace_lifecycle_p && trace_test(task)) {
++		struct process_trace_entry ent;
++		ent.opcode = _UTRACE_EVENT_EXIT;
++		ent.trace_exit.code = orig_code;
++		process_trace(&ent);
++	}
++
++	/* There is no need to explicitly attach or detach here. */
++
++	return UTRACE_RESUME;
++}
++
++
++void enable_process_trace()
++{
++	struct task_struct *grp, *tsk;
++
++	pr_debug("in %s\n", __func__);
++	rcu_read_lock();
++	do_each_thread(grp, tsk) {
++		/* Skip over kernel threads. */
++		if (tsk->flags & PF_KTHREAD)
++			continue;
++
++		if (process_follow_pid) {
++			if (tsk->tgid == process_follow_pid ||
++			    tsk->parent->tgid == process_follow_pid)
++				process_trace_tryattach(tsk);
++		} else {
++			process_trace_tryattach(tsk);
++		}
++	} while_each_thread(grp, tsk);
++	rcu_read_unlock();
++}
++
++void disable_process_trace()
++{
++	struct utrace_engine *engine;
++	struct task_struct *grp, *tsk;
++	int rc;
++
++	pr_debug("in %s\n", __func__);
++	rcu_read_lock();
++	do_each_thread(grp, tsk) {
++		/* Find matching engine, if any.  Returns -ENOENT for
++		   unattached threads. */
++		engine = utrace_attach_task(tsk, UTRACE_ATTACH_MATCH_OPS,
++					    &process_trace_ops, 0);
++		if (IS_ERR(engine)) {
++			if (PTR_ERR(engine) != -ENOENT)
++				pr_warning("utrace_attach_task %d (rc %ld)\n",
++					   tsk->pid, -PTR_ERR(engine));
++		} else if (engine == NULL) {
++			pr_warning("utrace_attach_task %d (null engine)\n",
++				   tsk->pid);
++		} else {
++			/* Found one of our own engines.  Detach.  */
++			rc = utrace_control(tsk, engine, UTRACE_DETACH);
++			switch (rc) {
++			case 0:		    /* success */
++				break;
++			case -ESRCH:	    /* REAP callback already begun */
++			case -EALREADY:	    /* DEATH callback already begun */
++				break;
++			default:
++				rc = -rc;
++				pr_warning("utrace_detach %d (rc %d)\n",
++					   tsk->pid, rc);
++				break;
++			}
++			utrace_engine_put(engine);
++			pr_debug("detached in %s from %s(%d)\n", __func__,
++				 tsk->comm, tsk->pid);
++		}
++	} while_each_thread(grp, tsk);
++	rcu_read_unlock();
++}
++
++
++static const struct utrace_engine_ops process_trace_ops = {
++	.report_clone = process_trace_report_clone,
++	.report_exec = process_trace_report_exec,
++	.report_exit = process_trace_report_exit,
++	.report_signal = process_trace_report_signal,
++	.report_syscall_entry = process_trace_report_syscall_entry,
++	.report_syscall_exit = process_trace_report_syscall_exit,
++};
++
++
++
++/* control interfaces */
++
++
++static ssize_t
++trace_taskcomm_filter_read(struct file *filp, char __user *ubuf,
++			   size_t cnt, loff_t *ppos)
++{
++	return simple_read_from_buffer(ubuf, cnt, ppos,
++				       trace_taskcomm_filter, TASK_COMM_LEN);
++}
++
++
++static ssize_t
++trace_taskcomm_filter_write(struct file *filp, const char __user *ubuf,
++			    size_t cnt, loff_t *fpos)
++{
++	char *end;
++
++	if (cnt > TASK_COMM_LEN)
++		cnt = TASK_COMM_LEN;
++
++	if (copy_from_user(trace_taskcomm_filter, ubuf, cnt))
++		return -EFAULT;
++
++	/* Cut from the first nil or newline. */
++	trace_taskcomm_filter[cnt] = '\0';
++	end = strchr(trace_taskcomm_filter, '\n');
++	if (end)
++		*end = '\0';
++
++	*fpos += cnt;
++	return cnt;
++}
++
++
++static const struct file_operations trace_taskcomm_filter_fops = {
++	.open		= tracing_open_generic,
++	.read		= trace_taskcomm_filter_read,
++	.write		= trace_taskcomm_filter_write,
++};
++
++
++
++static char README_text[] =
++	"process event tracer mini-HOWTO\n"
++	"\n"
++	"1. Select process hierarchy to monitor.  Other processes will be\n"
++	"   completely unaffected.  Leave at 0 for system-wide tracing.\n"
++	"#  echo NNN > process_follow_pid\n"
++	"\n"
++	"2. Determine which process event traces are potentially desired.\n"
++	"   syscall and signal tracing slow down monitored processes.\n"
++	"#  echo 0 > process_trace_{syscalls,signals,lifecycle}\n"
++	"\n"
++	"3. Add any final uid- or taskcomm-based filtering.  Non-matching\n"
++	"   processes will skip trace messages, but will still be slowed.\n"
++	"#  echo NNN > process_trace_uid_filter # -1: unrestricted \n"
++	"#  echo ls > process_trace_taskcomm_filter # empty: unrestricted\n"
++	"\n"
++	"4. Start tracing.\n"
++	"#  echo process > current_tracer\n"
++	"\n"
++	"5. Examine trace.\n"
++	"#  cat trace\n"
++	"\n"
++	"6. Stop tracing.\n"
++	"#  echo nop > current_tracer\n"
++	;
++
++static struct debugfs_blob_wrapper README_blob = {
++	.data = README_text,
++	.size = sizeof(README_text),
++};
++
++
++static __init int init_process_trace(void)
++{
++	struct dentry *d_tracer;
++	struct dentry *entry;
++
++	d_tracer = tracing_init_dentry();
++
++	entry = debugfs_create_blob("process_trace_README", 0444, d_tracer,
++				    &README_blob);
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_trace_README' entry\n");
++
++	/* Control for scoping process following. */
++	entry = debugfs_create_u32("process_follow_pid", 0644, d_tracer,
++				   &process_follow_pid);
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_follow_pid' entry\n");
++
++	/* Process-level filters */
++	entry = debugfs_create_file("process_trace_taskcomm_filter", 0644,
++				    d_tracer, NULL,
++				    &trace_taskcomm_filter_fops);
++	/* XXX: it'd be nice to have a read/write debugfs_create_blob. */
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_trace_taskcomm_filter' entry\n");
++
++	entry = debugfs_create_u32("process_trace_uid_filter", 0644, d_tracer,
++				   &trace_taskuid_filter);
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_trace_uid_filter' entry\n");
++
++	/* Event-level filters. */
++	entry = debugfs_create_u32("process_trace_lifecycle", 0644, d_tracer,
++				   &trace_lifecycle_p);
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_trace_lifecycle' entry\n");
++
++	entry = debugfs_create_u32("process_trace_syscalls", 0644, d_tracer,
++				   &trace_syscalls_p);
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_trace_syscalls' entry\n");
++
++	entry = debugfs_create_u32("process_trace_signals", 0644, d_tracer,
++				   &trace_signals_p);
++	if (!entry)
++		pr_warning("Could not create debugfs "
++			   "'process_trace_signals' entry\n");
++
++	return register_tracer(&process_tracer);
++}
++
++device_initcall(init_process_trace);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1699
retrieving revision 1.1700
diff -u -p -r1.1699 -r1.1700
--- kernel.spec	10 Aug 2009 20:19:23 -0000	1.1699
+++ kernel.spec	10 Aug 2009 20:49:41 -0000	1.1700
@@ -592,6 +592,7 @@ Patch20: linux-2.6-hotfixes.patch
 
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
+Patch23: linux-2.6-utrace-ftrace.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
@@ -1104,6 +1105,7 @@ ApplyPatch linux-2.6-hotfixes.patch
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
+ApplyPatch linux-2.6-utrace-ftrace.patch
 
 # mm patches
 ApplyPatch linux-2.6-defaults-saner-vm-settings.patch
@@ -1873,12 +1875,6 @@ fi
 # and build.
 
 %changelog
-* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
-- Add tunable pad threshold support to lirc_imon
-- Blacklist all iMON devices in usbhid driver so lirc_imon can bind
-- Add new device ID to lirc_mceusb (#512483)
-- Enable IR transceiver on the HD PVR
-
 * Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch
@@ -1893,6 +1889,15 @@ fi
  - linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
  - linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
  - linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
+ - linux-2.6-utrace.patch
+ - linux-2.6-utrace-ftrace.patch
+ - linux-2.6-tracehook.patch
+
+* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
+- Add tunable pad threshold support to lirc_imon
+- Blacklist all iMON devices in usbhid driver so lirc_imon can bind
+- Add new device ID to lirc_mceusb (#512483)
+- Enable IR transceiver on the HD PVR
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.

linux-2.6-tracehook.patch:
 include/linux/tracehook.h |   25 ++++++++++------
 kernel/signal.c           |   69 +++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 43 deletions(-)

Index: linux-2.6-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-tracehook.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- linux-2.6-tracehook.patch	25 Jul 2009 04:09:27 -0000	1.10
+++ linux-2.6-tracehook.patch	10 Aug 2009 20:49:41 -0000	1.11
@@ -14,12 +14,8 @@ readability to fold it in.
 
 Signed-off-by: Roland McGrath <roland at redhat.com>
 ---
- include/linux/tracehook.h |   25 ++++++++++------
- kernel/signal.c           |   69 +++++++++++++++++++++++----------------------
- 2 files changed, 51 insertions(+), 43 deletions(-)
-
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index c7aa154..4ec4821 100644  
+index eb96603..6a168b9 100644
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -1,7 +1,7 @@
@@ -31,7 +27,7 @@ index c7aa154..4ec4821 100644  
   *
   * This copyrighted material is made available to anyone wishing to use,
   * modify, copy, or redistribute it subject to the terms and conditions
-@@ -464,22 +464,29 @@ static inline int tracehook_get_signal(s
+@@ -463,22 +463,29 @@ static inline int tracehook_get_signal(struct task_struct *task,
  
  /**
   * tracehook_notify_jctl - report about job control stop/continue
@@ -70,10 +66,10 @@ index c7aa154..4ec4821 100644  
  
  #define DEATH_REAP			-1
 diff --git a/kernel/signal.c b/kernel/signal.c
-index d803473..424eff2 100644  
+index d803473..424eff2 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -702,7 +702,7 @@ static int prepare_signal(int sig, struc
+@@ -702,7 +702,7 @@ static int prepare_signal(int sig, struct task_struct *p, int from_ancestor_ns)
  
  		if (why) {
  			/*
@@ -174,7 +170,7 @@ index d803473..424eff2 100644  
  		goto relock;
  	}
  
-@@ -1979,14 +1980,14 @@ void exit_signals(struct task_struct *ts
+@@ -1979,14 +1980,14 @@ void exit_signals(struct task_struct *tsk)
  	if (unlikely(tsk->signal->group_stop_count) &&
  			!--tsk->signal->group_stop_count) {
  		tsk->signal->flags = SIGNAL_STOP_STOPPED;

linux-2.6-utrace.patch:
 Documentation/DocBook/Makefile    |    2 
 Documentation/DocBook/utrace.tmpl |  590 +++++++++
 fs/proc/array.c                   |    3 
 include/linux/init_task.h         |    1 
 include/linux/sched.h             |    6 
 include/linux/tracehook.h         |   61 
 include/linux/utrace.h            |  692 +++++++++++
 include/linux/utrace_struct.h     |   58 
 init/Kconfig                      |    9 
 kernel/Makefile                   |    1 
 kernel/ptrace.c                   |   18 
 kernel/utrace.c                   | 2357 ++++++++++++++++++++++++++++++++++++++
 12 files changed, 3795 insertions(+), 3 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-utrace.patch,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- linux-2.6-utrace.patch	25 Jul 2009 04:09:27 -0000	1.112
+++ linux-2.6-utrace.patch	10 Aug 2009 20:49:41 -0000	1.113
@@ -25,22 +25,8 @@ the utrace API.
 
 Signed-off-by: Roland McGrath <roland at redhat.com>
 ---
- Documentation/DocBook/Makefile    |    2 +-
- Documentation/DocBook/utrace.tmpl |  590 ++++++++++
- fs/proc/array.c                   |    3 +
- include/linux/init_task.h         |    1 +
- include/linux/sched.h             |    6 +
- include/linux/tracehook.h         |   61 +-
- include/linux/utrace.h            |  692 +++++++++++
- include/linux/utrace_struct.h     |   58 +
- init/Kconfig                      |    9 +
- kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |   18 +-
- kernel/utrace.c                   | 2357 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3795 insertions(+), 3 deletions(-)
-
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index b1eb661..02851f6 100644  
+index b1eb661..02851f6 100644
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
@@ -54,7 +40,7 @@ index b1eb661..02851f6 100644  
  	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index ...6cc58a1 100644  
+index 0000000..6cc58a1
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
 @@ -0,0 +1,590 @@
@@ -649,7 +635,7 @@ index ...6cc58a1 100644  
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 725a650..e299a63 100644  
+index 725a650..e299a63 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -82,6 +82,7 @@
@@ -660,7 +646,7 @@ index 725a650..e299a63 100644  
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -188,6 +189,8 @@ static inline void task_state(struct seq
+@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
  		cred->uid, cred->euid, cred->suid, cred->fsuid,
  		cred->gid, cred->egid, cred->sgid, cred->fsgid);
  
@@ -670,7 +656,7 @@ index 725a650..e299a63 100644  
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index d87247d..0d0b55d 100644  
+index d87247d..0d0b55d 100644
 --- a/include/linux/init_task.h
 +++ b/include/linux/init_task.h
 @@ -170,6 +170,7 @@ extern struct cred init_cred;
@@ -682,7 +668,7 @@ index d87247d..0d0b55d 100644  
  	INIT_TRACE_IRQFLAGS						\
  	INIT_LOCKDEP							\
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index b4c38bc..30db106 100644  
+index 03c6c36..fd11331 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -59,6 +59,7 @@ struct sched_param {
@@ -706,7 +692,7 @@ index b4c38bc..30db106 100644  
     	u32 parent_exec_id;
     	u32 self_exec_id;
 diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 4ec4821..a7de30f 100644  
+index 6a168b9..d59e159 100644
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -726,7 +712,7 @@ index 4ec4821..a7de30f 100644  
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall
+@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
  static inline __must_check int tracehook_report_syscall_entry(
  	struct pt_regs *regs)
  {
@@ -736,7 +722,7 @@ index 4ec4821..a7de30f 100644  
  	ptrace_report_syscall(regs);
  	return 0;
  }
-@@ -134,6 +140,8 @@ static inline __must_check int tracehook
+@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry(
   */
  static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
  {
@@ -745,7 +731,7 @@ index 4ec4821..a7de30f 100644  
  	ptrace_report_syscall(regs);
  }
  
-@@ -194,6 +202,8 @@ static inline void tracehook_report_exec
+@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
  					 struct linux_binprm *bprm,
  					 struct pt_regs *regs)
  {
@@ -754,7 +740,7 @@ index 4ec4821..a7de30f 100644  
  	if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) &&
  	    unlikely(task_ptrace(current) & PT_PTRACED))
  		send_sig(SIGTRAP, current, 0);
-@@ -211,6 +221,8 @@ static inline void tracehook_report_exec
+@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
   */
  static inline void tracehook_report_exit(long *exit_code)
  {
@@ -763,7 +749,7 @@ index 4ec4821..a7de30f 100644  
  	ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code);
  }
  
-@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clon
+@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags)
  static inline void tracehook_finish_clone(struct task_struct *child,
  					  unsigned long clone_flags, int trace)
  {
@@ -771,7 +757,7 @@ index 4ec4821..a7de30f 100644  
  	ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
  }
  
-@@ -280,6 +293,8 @@ static inline void tracehook_report_clon
+@@ -278,6 +291,8 @@ static inline void tracehook_report_clone(struct pt_regs *regs,
  					  unsigned long clone_flags,
  					  pid_t pid, struct task_struct *child)
  {
@@ -780,7 +766,7 @@ index 4ec4821..a7de30f 100644  
  	if (unlikely(task_ptrace(child))) {
  		/*
  		 * It doesn't matter who attached/attaching to this
-@@ -311,6 +326,9 @@ static inline void tracehook_report_clon
+@@ -310,6 +325,9 @@ static inline void tracehook_report_clone_complete(int trace,
  						   pid_t pid,
  						   struct task_struct *child)
  {
@@ -790,7 +776,7 @@ index 4ec4821..a7de30f 100644  
  	if (unlikely(trace))
  		ptrace_event(0, trace, pid);
  }
-@@ -345,6 +363,7 @@ static inline void tracehook_report_vfor
+@@ -344,6 +362,7 @@ static inline void tracehook_report_vfork_done(struct task_struct *child,
   */
  static inline void tracehook_prepare_release_task(struct task_struct *task)
  {
@@ -798,7 +784,7 @@ index 4ec4821..a7de30f 100644  
  }
  
  /**
-@@ -359,6 +378,7 @@ static inline void tracehook_prepare_rel
+@@ -358,6 +377,7 @@ static inline void tracehook_prepare_release_task(struct task_struct *task)
  static inline void tracehook_finish_release_task(struct task_struct *task)
  {
  	ptrace_release_task(task);
@@ -806,7 +792,7 @@ index 4ec4821..a7de30f 100644  
  }
  
  /**
-@@ -380,6 +400,8 @@ static inline void tracehook_signal_hand
+@@ -379,6 +399,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
  					    const struct k_sigaction *ka,
  					    struct pt_regs *regs, int stepping)
  {
@@ -815,7 +801,7 @@ index 4ec4821..a7de30f 100644  
  	if (stepping)
  		ptrace_notify(SIGTRAP);
  }
-@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand
+@@ -396,6 +418,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
  static inline int tracehook_consider_ignored_signal(struct task_struct *task,
  						    int sig)
  {
@@ -824,7 +810,7 @@ index 4ec4821..a7de30f 100644  
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign
+@@ -415,6 +439,9 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
  static inline int tracehook_consider_fatal_signal(struct task_struct *task,
  						  int sig)
  {
@@ -834,7 +820,7 @@ index 4ec4821..a7de30f 100644  
  	return (task_ptrace(task) & PT_PTRACED) != 0;
  }
  
-@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat
+@@ -429,6 +456,8 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
   */
  static inline int tracehook_force_sigpending(void)
  {
@@ -843,7 +829,7 @@ index 4ec4821..a7de30f 100644  
  	return 0;
  }
  
-@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s
+@@ -458,6 +487,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
  				       siginfo_t *info,
  				       struct k_sigaction *return_ka)
  {
@@ -852,7 +838,7 @@ index 4ec4821..a7de30f 100644  
  	return 0;
  }
  
-@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s
+@@ -485,6 +516,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
   */
  static inline int tracehook_notify_jctl(int notify, int why)
  {
@@ -861,7 +847,7 @@ index 4ec4821..a7de30f 100644  
  	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
  }
  
-@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(
+@@ -508,6 +541,8 @@ static inline int tracehook_notify_jctl(int notify, int why)
  static inline int tracehook_notify_death(struct task_struct *task,
  					 void **death_cookie, int group_dead)
  {
@@ -870,7 +856,7 @@ index 4ec4821..a7de30f 100644  
  	if (task_detached(task))
  		return task->ptrace ? SIGCHLD : DEATH_REAP;
  
-@@ -545,6 +580,20 @@ static inline void tracehook_report_deat
+@@ -544,6 +579,20 @@ static inline void tracehook_report_death(struct task_struct *task,
  					  int signal, void *death_cookie,
  					  int group_dead)
  {
@@ -891,7 +877,7 @@ index 4ec4821..a7de30f 100644  
  }
  
  #ifdef TIF_NOTIFY_RESUME
-@@ -574,10 +623,20 @@ static inline void set_notify_resume(str
+@@ -573,10 +622,20 @@ static inline void set_notify_resume(struct task_struct *task)
   * asynchronously, this will be called again before we return to
   * user mode.
   *
@@ -915,7 +901,7 @@ index 4ec4821..a7de30f 100644  
  
 diff --git a/include/linux/utrace.h b/include/linux/utrace.h
 new file mode 100644
-index ...f877ec6 100644  
+index 0000000..f877ec6
 --- /dev/null
 +++ b/include/linux/utrace.h
 @@ -0,0 +1,692 @@
@@ -1613,7 +1599,7 @@ index ...f877ec6 100644  
 +#endif	/* linux/utrace.h */
 diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h
 new file mode 100644
-index ...aba7e09 100644  
+index 0000000..aba7e09
 --- /dev/null
 +++ b/include/linux/utrace_struct.h
 @@ -0,0 +1,58 @@
@@ -1676,7 +1662,7 @@ index ...aba7e09 100644  
 +
 +#endif	/* linux/utrace_struct.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 7be4d38..a6987df 100644  
+index 7be4d38..a6987df 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
 @@ -1149,6 +1149,15 @@ config STOP_MACHINE
@@ -1696,7 +1682,7 @@ index 7be4d38..a6987df 100644  
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 4242366..a79634e 100644  
+index 4242366..a79634e 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1708,7 +1694,7 @@ index 4242366..a79634e 100644  
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 0692ab5..1d33e9c 100644  
+index 42c3178..3ac97b9 100644
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1719,7 +1705,7 @@ index 0692ab5..1d33e9c 100644  
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/audit.h>
-@@ -174,6 +175,14 @@ bool ptrace_may_access(struct task_struc
+@@ -174,6 +175,14 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
  	return !err;
  }
  
@@ -1746,7 +1732,7 @@ index 0692ab5..1d33e9c 100644  
  	if (!task->mm)
  		goto bad;
  	/* the same process cannot be attached many times */
-@@ -588,7 +602,9 @@ int ptrace_traceme(void)
+@@ -590,7 +604,9 @@ int ptrace_traceme(void)
  	 */
  repeat:
  	task_lock(current);
@@ -1759,7 +1745,7 @@ index 0692ab5..1d33e9c 100644  
  		 */
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...74b5fc5 100644  
+index 0000000..74b5fc5
 --- /dev/null
 +++ b/kernel/utrace.c
 @@ -0,0 +1,2357 @@



From knol at fedoraproject.org  Mon Aug 10 20:49:56 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 20:49:56 +0000 (UTC)
Subject: rpms/getmail/F-10 getmail.spec,1.9,1.10
Message-ID: <20090810204956.1607111C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11558

Modified Files:
	getmail.spec 
Log Message:
Update to 4.11.0-2


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/F-10/getmail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- getmail.spec	10 Aug 2009 19:29:43 -0000	1.9
+++ getmail.spec	10 Aug 2009 20:49:55 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
 Version: 4.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://pyropus.ca/software/getmail/
@@ -55,7 +55,7 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-1
+* 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



From knol at fedoraproject.org  Mon Aug 10 21:04:01 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 21:04:01 +0000 (UTC)
Subject: rpms/getmail/devel getmail.spec,1.11,1.12
Message-ID: <20090810210401.7225411C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13460

Modified Files:
	getmail.spec 
Log Message:
Update to 4.11.0-1


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/getmail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- getmail.spec	24 Jul 2009 23:54:32 -0000	1.11
+++ getmail.spec	10 Aug 2009 21:04:01 -0000	1.12
@@ -2,8 +2,8 @@
 
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
-Version: 4.9.2
-Release: 2%{?dist}
+Version: 4.11.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://pyropus.ca/software/getmail/
@@ -55,8 +55,8 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-1
+- update to release 4.11.0
 
 * Sat Jul 18 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1
 - Update to release 4.9.2



From knol at fedoraproject.org  Mon Aug 10 21:11:59 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 21:11:59 +0000 (UTC)
Subject: rpms/getmail/devel getmail.spec,1.12,1.13
Message-ID: <20090810211159.D660D11C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15049

Modified Files:
	getmail.spec 
Log Message:
Update to 4.11.0-2


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/getmail.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- getmail.spec	10 Aug 2009 21:04:01 -0000	1.12
+++ getmail.spec	10 Aug 2009 21:11:59 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
 Version: 4.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://pyropus.ca/software/getmail/
@@ -55,7 +55,7 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-1
+* 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



From mclasen at fedoraproject.org  Mon Aug 10 21:12:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 21:12:19 +0000 (UTC)
Subject: rpms/atk/devel .cvsignore, 1.40, 1.41 atk.spec, 1.64, 1.65 sources, 
	1.40, 1.41
Message-ID: <20090810211219.2FA3F11C0344@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15137

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	3 Dec 2008 05:28:14 -0000	1.40
+++ .cvsignore	10 Aug 2009 21:12:18 -0000	1.41
@@ -1 +1 @@
-atk-1.25.2.tar.bz2
+atk-1.27.90.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/atk.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- atk.spec	24 Jul 2009 17:29:04 -0000	1.64
+++ atk.spec	10 Aug 2009 21:12:18 -0000	1.65
@@ -2,13 +2,13 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.25.2
-Release: 3%{?dist}
+Version: 1.27.90
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.25/atk-%{version}.tar.bz2 
+Source: http://download.gnome.org/sources/atk/1.27/atk-%{version}.tar.bz2
 URL: http://developer.gnome.org/projects/gap/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-doc-utils
 BuildRequires: gettext
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 1.27.90-1
+- Update to 2.27.90
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atk/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	3 Dec 2008 05:28:14 -0000	1.40
+++ sources	10 Aug 2009 21:12:19 -0000	1.41
@@ -1 +1 @@
-93a775ae90820abf04590aae293cc904  atk-1.25.2.tar.bz2
+8906c67d015cc90e2e70a341d0752a6f  atk-1.27.90.tar.bz2



From notting at fedoraproject.org  Mon Aug 10 21:13:34 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 10 Aug 2009 21:13:34 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.166, 1.167 initscripts.spec,
	1.196, 1.197 sources, 1.185, 1.186
Message-ID: <20090810211334.8D7C911C0344@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15350

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.97-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- .cvsignore	3 Aug 2009 21:10:21 -0000	1.166
+++ .cvsignore	10 Aug 2009 21:13:34 -0000	1.167
@@ -1 +1 @@
-initscripts-8.96.tar.bz2
+initscripts-8.97.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- initscripts.spec	3 Aug 2009 21:10:21 -0000	1.196
+++ initscripts.spec	10 Aug 2009 21:13:34 -0000	1.197
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.96
+Version: 8.97
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -251,6 +251,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Mon Aug 10 2009 Bill Nottingham <notting at redhat.com> - 8.97-1
+- ipcalc: fix IPv6 address checking (#516319)
+- ifup-aliases: fix syntax error from earlier cleanups. (#515612, <jik at kamens.brookline.ma.us>)
+- translation updates: nb
+- rc.sysinit: remove useless call to pam_console_apply
+
 * Mon Aug  3 2009 Bill Nottingham <notting at redhat.com> - 8.96-1
 - fix up upstart rules for s390(x). (#515222)
 - leave ChangeLog in the tarball only. (#515012)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- sources	3 Aug 2009 21:10:21 -0000	1.185
+++ sources	10 Aug 2009 21:13:34 -0000	1.186
@@ -1 +1 @@
-569af6fd0a1a3988a9e60963eeacaaa2  initscripts-8.96.tar.bz2
+24b32543443055f6e1374496bfda5187  initscripts-8.97.tar.bz2



From knol at fedoraproject.org  Mon Aug 10 21:15:11 2009
From: knol at fedoraproject.org (knol)
Date: Mon, 10 Aug 2009 21:15:11 +0000 (UTC)
Subject: rpms/getmail/devel .cvsignore,1.9,1.10 sources,1.10,1.11
Message-ID: <20090810211511.0D5DF11C0344@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15554

Modified Files:
	.cvsignore sources 
Log Message:
Update to 4.11.0-2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 Jul 2009 07:15:41 -0000	1.9
+++ .cvsignore	10 Aug 2009 21:15:10 -0000	1.10
@@ -1 +1 @@
-getmail-4.9.2.tar.gz
+getmail-4.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Jul 2009 07:15:42 -0000	1.10
+++ sources	10 Aug 2009 21:15:10 -0000	1.11
@@ -1 +1 @@
-cbb2ef7bf12e2b6b4b748a73979e67a4  getmail-4.9.2.tar.gz
+bec537bd9f6677f8296d4396a54ed611  getmail-4.11.0.tar.gz



From mclasen at fedoraproject.org  Mon Aug 10 21:18:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 21:18:49 +0000 (UTC)
Subject: rpms/libgnome/devel .cvsignore, 1.49, 1.50 libgnome.spec, 1.150,
	1.151 sources, 1.49, 1.50
Message-ID: <20090810211849.51F1011C0344@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15878

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.27.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	17 Mar 2009 15:29:19 -0000	1.49
+++ .cvsignore	10 Aug 2009 21:18:49 -0000	1.50
@@ -1 +1 @@
-libgnome-2.26.0.tar.bz2
+libgnome-2.27.5.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- libgnome.spec	5 Aug 2009 22:11:20 -0000	1.150
+++ libgnome.spec	10 Aug 2009 21:18:49 -0000	1.151
@@ -13,10 +13,10 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.26.0
-Release: 8%{?dist}
+Version: 2.27.5
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/libgnome/2.26/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/libgnome/2.27/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -60,9 +60,6 @@ Patch8: im-setting.patch
 
 Patch9: libgnome-2.24.1-default-noblink.patch
 
-# backport from upstream
-Patch10: less-icons.patch
-
 %description
 
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -114,7 +111,6 @@ if you just want to use the GNOME deskto
 %patch7 -p1 -b .default-sound-effects
 %patch8 -p1 -b .im-setting
 %patch9 -p1 -b .default-noblink
-%patch10 -p1 -b .less-icons
 
 %build
 %configure --disable-gtk-doc --disable-static --disable-esd
@@ -203,6 +199,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
+- Update to 2.27.5
+
 * Wed Aug  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-8
 - Default to Clearlooks GTK+ theme
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnome/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	17 Mar 2009 15:29:19 -0000	1.49
+++ sources	10 Aug 2009 21:18:49 -0000	1.50
@@ -1 +1 @@
-a5634fe9ddc54bbb726cbaaa35abc0b9  libgnome-2.26.0.tar.bz2
+1a1ef6f9ff54210da6c764520ecadaf7  libgnome-2.27.5.tar.bz2



From myoung at fedoraproject.org  Mon Aug 10 21:22:21 2009
From: myoung at fedoraproject.org (myoung)
Date: Mon, 10 Aug 2009 21:22:21 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-die-closed-source-bios-muppets-die.patch, 
	NONE, 1.2.2.2 linux-2.6-intel-iommu-updates.patch, NONE,
	1.1.2.2 config-sparc64-generic, 1.21.6.4,
	1.21.6.5 config-sparc64-smp, 1.2.16.2,
	1.2.16.3 config-x86-generic, 1.68.6.16,
	1.68.6.17 config-x86_64-generic, 1.68.2.14,
	1.68.2.15 kernel.spec, 1.1294.2.46,
	1.1294.2.47 linux-2.6-bluetooth-autosuspend.diff, 1.1.6.2,
	1.1.6.3 linux-2.6.31-lirc.patch, 1.2.2.3,
	1.2.2.4 xen.pvops.post.patch, 1.1.2.19,
	1.1.2.20 xen.pvops.pre.patch, 1.1.2.15, 1.1.2.16
Message-ID: <20090810212221.1CE2911C0344@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16116

Modified Files:
      Tag: private-myoung-dom0-branch
	config-sparc64-generic config-sparc64-smp config-x86-generic 
	config-x86_64-generic kernel.spec 
	linux-2.6-bluetooth-autosuspend.diff linux-2.6.31-lirc.patch 
	xen.pvops.post.patch xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	linux-2.6-die-closed-source-bios-muppets-die.patch 
	linux-2.6-intel-iommu-updates.patch 
Log Message:
for pvops temporarily disable CONFIG_CC_STACKPROTECTOR for x86_64 again
and also dracut


linux-2.6-die-closed-source-bios-muppets-die.patch:
 pci-quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-die-closed-source-bios-muppets-die.patch ---
Subject: [PATCH] Work around BIOS bugs by quiescing USB controllers earlier
From: David Woodhouse <dwmw2 at infradead.org>
To: "linux-usb at vger.kernel.org" <linux-usb at vger.kernel.org>
Date: Mon, 03 Aug 2009 12:40:27 +0100
Message-Id: <1249299627.14968.1.camel at macbook.infradead.org>
Cc: iommu at lists.linux-foundation.org

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>
---
Is this reasonable? At first glance, it looks like everything we do here
is perfectly OK to be done earlier.

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 83b5f9c..23cf3bd 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -475,4 +475,4 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
 	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
 		quirk_usb_handoff_xhci(pdev);
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);

linux-2.6-intel-iommu-updates.patch:
 arch/x86/kernel/pci-dma.c     |    4 
 arch/x86/kernel/pci-swiotlb.c |    5 
 drivers/pci/dmar.c            |   22 +++
 drivers/pci/intel-iommu.c     |  243 +++++++++++++++++++-----------------------
 drivers/pci/iova.c            |   16 --
 include/linux/iova.h          |    1 
 6 files changed, 135 insertions(+), 156 deletions(-)

--- NEW FILE linux-2.6-intel-iommu-updates.patch ---
commit 5fe60f4e5871b64e687229199fafd4ef13cd0886
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sun Aug 9 10:53:41 2009 +0100

    intel-iommu: make domain_add_dev_info() call domain_context_mapping()
    
    All callers of the former were also calling the latter, in one order or
    the other, and failing to correctly clean up if the second returned
    failure.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit a131bc185528331451a93db6c50a7d2070376a61
Merge: 19943b0 ff1649f
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Aug 8 11:25:28 2009 +0100

    Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
    
    Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
    no longer trip over bugs which were already fixed (sorry, Horms).

commit 19943b0e30b05d42e494ae6fef78156ebc8c637e
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Aug 4 16:19:20 2009 +0100

    intel-iommu: Unify hardware and software passthrough support
    
    This makes the hardware passthrough mode work a lot more like the
    software version, so that the behaviour of a kernel with 'iommu=pt'
    is the same whether the hardware supports passthrough or not.
    
    In particular:
     - We use a single si_domain for the pass-through devices.
     - 32-bit devices can be taken out of the pass-through domain so that
       they don't have to use swiotlb.
     - Devices will work again after being removed from a KVM guest.
     - A potential oops on OOM (in init_context_pass_through()) is fixed.
    
    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

    iommu=pt is a valid early param
    
    This avoids a "Malformed early option 'iommu'" warning on boot when
    trying to use pass-through mode.
    
    Signed-off-by: Alex Williamson <alex.williamson at hp.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 86f4d0123b1fddb47d35b9a893f8c0b94bf89abe
Author: Dan Carpenter <error27 at gmail.com>
Date:   Sun Jul 19 14:47:45 2009 +0300

    intel-iommu: double kfree()
    
    g_iommus is freed after we "goto error;".
    
    Found by smatch (http://repo.or.cz/w/smatch.git).
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 0db9b7aebb6a1c2bba2d0636ae0b1f9ef729c827
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Jul 14 02:01:57 2009 +0100

    intel-iommu: Kill pointless intel_unmap_single() function
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit acea0018a24b794e32afea4f3be4230c58f2f8e3
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Jul 14 01:55:11 2009 +0100

    intel-iommu: Defer the iotlb flush and iova free for intel_unmap_sg() too.
    
    I see no reason why we did this _only_ in intel_unmap_page().
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 3d39cecc4841e8d4c4abdb401d10180f5faaded0
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Jul 8 15:23:30 2009 +0100

    intel-iommu: Remove superfluous iova_alloc_lock from IOVA code
    
    We only ever obtain this lock immediately before the iova_rbtree_lock,
    and release it immediately after the iova_rbtree_lock. So ditch it and
    just use iova_rbtree_lock.
    
    [v2: Remove the lockdep bits this time too]
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit 147202aa772329a02c6e80bc2b7a6b8dd3deac0b
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Tue Jul 7 19:43:20 2009 +0100

    intel-iommu: Speed up map routines by using cached domain ASAP
    
    We did before, in the end -- but it was at the bottom of a long stack of
    functions. Add an inline wrapper get_valid_domain_for_dev() which will
    use the cached one _first_ and only make the out-of-line call if it's
    not already set.
    
    This takes the average time taken for a 1-page intel_map_sg() from 5961
    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/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 6af96ee..1e66b18 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -71,9 +71,8 @@ void __init pci_swiotlb_init(void)
 {
 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
 #ifdef CONFIG_X86_64
-	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
-		iommu_pass_through)
-	       swiotlb = 1;
+	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
+		swiotlb = 1;
 #endif
 	if (swiotlb_force)
 		swiotlb = 1;
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 7b287cb..380b60e 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -632,20 +632,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 +676,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 +686,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;
 }
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 2314ad7..09606e9 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)
  * 	2. It maps to each iommu if successful.
  *	3. Each iommu mapps to this domain if successful.
  */
-struct dmar_domain *si_domain;
+static struct dmar_domain *si_domain;
+static int hw_pass_through = 1;
 
 /* 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,
 }
 
 static struct iova_domain reserved_iova_list;
-static struct lock_class_key reserved_alloc_key;
 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)
 
 	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
-	lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
-		&reserved_alloc_key);
 	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,
 	struct dmar_domain *domain;
 	int ret;
 
-	printk(KERN_INFO
-	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
-	       pci_name(pdev), start, end);
-
 	domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
 	if (!domain)
 		return -ENOMEM;
 
+	/* For _hardware_ passthrough, don't bother. But for software
+	   passthrough, we do it anyway -- it may indicate a memory
+	   range which is reserved in E820, so which didn't get set
+	   up to start with in si_domain */
+	if (domain == si_domain && hw_pass_through) {
+		printk("Ignoring identity map for HW passthrough device %s [0x%Lx - 0x%Lx]\n",
+		       pci_name(pdev), start, end);
+		return 0;
+	}
+
+	printk(KERN_INFO
+	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
+	       pci_name(pdev), start, end);
+
 	ret = iommu_domain_identity_map(domain, start, end);
 	if (ret)
 		goto error;
@@ -2016,23 +2024,6 @@ static inline void iommu_prepare_isa(void)
 }
 #endif /* !CONFIG_DMAR_FLPY_WA */
 
-/* Initialize each context entry as pass through.*/
-static int __init init_context_pass_through(void)
-{
-	struct pci_dev *pdev = NULL;
-	struct dmar_domain *domain;
-	int ret;
-
-	for_each_pci_dev(pdev) {
-		domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
-		ret = domain_context_mapping(domain, pdev,
-					     CONTEXT_TT_PASS_THROUGH);
-		if (ret)
-			return ret;
-	}
-	return 0;
-}
-
 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,
 
 }
 
-static int si_domain_init(void)
+static int si_domain_init(int hw)
 {
 	struct dmar_drhd_unit *drhd;
 	struct intel_iommu *iommu;
@@ -2074,6 +2065,9 @@ static int si_domain_init(void)
 
 	si_domain->flags = DOMAIN_FLAG_STATIC_IDENTITY;
 
+	if (hw)
+		return 0;
+
 	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)
 }
 
 static int domain_add_dev_info(struct dmar_domain *domain,
-				  struct pci_dev *pdev)
+			       struct pci_dev *pdev,
+			       int translation)
 {
 	struct device_domain_info *info;
 	unsigned long flags;
+	int ret;
 
 	info = alloc_devinfo_mem();
 	if (!info)
 		return -ENOMEM;
 
+	ret = domain_context_mapping(domain, pdev, translation);
+	if (ret) {
+		free_devinfo_mem(info);
+		return ret;
+	}
+
 	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)
 	return 1;
 }
 
-static int iommu_prepare_static_identity_mapping(void)
+static int iommu_prepare_static_identity_mapping(int hw)
 {
 	struct pci_dev *pdev = NULL;
 	int ret;
 
-	ret = si_domain_init();
+	ret = si_domain_init(hw);
 	if (ret)
 		return -EFAULT;
 
 	for_each_pci_dev(pdev) {
 		if (iommu_should_identity_map(pdev, 1)) {
-			printk(KERN_INFO "IOMMU: identity mapping for device %s\n",
-			       pci_name(pdev));
+			printk(KERN_INFO "IOMMU: %s identity mapping for device %s\n",
+			       hw ? "hardware" : "software", pci_name(pdev));
 
-			ret = domain_context_mapping(si_domain, pdev,
+			ret = domain_add_dev_info(si_domain, pdev,
+						     hw ? CONTEXT_TT_PASS_THROUGH :
 						     CONTEXT_TT_MULTI_LEVEL);
 			if (ret)
 				return ret;
-			ret = domain_add_dev_info(si_domain, pdev);
-			if (ret)
-				return ret;
 		}
 	}
 
@@ -2199,14 +2199,6 @@ int __init init_dmars(void)
 	struct pci_dev *pdev;
 	struct intel_iommu *iommu;
 	int i, ret;
-	int pass_through = 1;
-
-	/*
-	 * In case pass through can not be enabled, iommu tries to use identity
-	 * mapping.
-	 */
-	if (iommu_pass_through)
-		iommu_identity_mapping = 1;
 
 	/*
 	 * for each drhd
@@ -2234,7 +2226,6 @@ int __init init_dmars(void)
 	deferred_flush = kzalloc(g_num_of_iommus *
 		sizeof(struct deferred_flush_tables), GFP_KERNEL);
 	if (!deferred_flush) {
-		kfree(g_iommus);
 		ret = -ENOMEM;
 		goto error;
 	}
@@ -2261,14 +2252,8 @@ int __init init_dmars(void)
 			goto error;
 		}
 		if (!ecap_pass_through(iommu->ecap))
-			pass_through = 0;
+			hw_pass_through = 0;
 	}
-	if (iommu_pass_through)
-		if (!pass_through) {
-			printk(KERN_INFO
-			       "Pass Through is not supported by hardware.\n");
-			iommu_pass_through = 0;
-		}
 
 	/*
 	 * Start from the sane iommu hardware state.
@@ -2323,64 +2308,57 @@ int __init init_dmars(void)
 		}
 	}
 
+	if (iommu_pass_through)
+		iommu_identity_mapping = 1;
+#ifdef CONFIG_DMAR_BROKEN_GFX_WA
+	else
+		iommu_identity_mapping = 2;
+#endif
 	/*
-	 * If pass through is set and enabled, context entries of all pci
-	 * devices are intialized by pass through translation type.
+	 * If pass through is not set or not enabled, setup context entries for
+	 * identity mappings for rmrr, gfx, and isa and may fall back to static
+	 * identity mapping if iommu_identity_mapping is set.
 	 */
-	if (iommu_pass_through) {
-		ret = init_context_pass_through();
+	if (iommu_identity_mapping) {
+		ret = iommu_prepare_static_identity_mapping(hw_pass_through);
 		if (ret) {
-			printk(KERN_ERR "IOMMU: Pass through init failed.\n");
-			iommu_pass_through = 0;
+			printk(KERN_CRIT "Failed to setup IOMMU pass-through\n");
+			goto error;
 		}
 	}
-
 	/*
-	 * If pass through is not set or not enabled, setup context entries for
-	 * identity mappings for rmrr, gfx, and isa and may fall back to static
-	 * identity mapping if iommu_identity_mapping is set.
+	 * For each rmrr
+	 *   for each dev attached to rmrr
+	 *   do
+	 *     locate drhd for dev, alloc domain for dev
+	 *     allocate free domain
+	 *     allocate page table entries for rmrr
+	 *     if context not allocated for bus
+	 *           allocate and init context
+	 *           set present in root table for this bus
+	 *     init context with domain, translation etc
+	 *    endfor
+	 * endfor
 	 */
-	if (!iommu_pass_through) {
-#ifdef CONFIG_DMAR_BROKEN_GFX_WA
-		if (!iommu_identity_mapping)
-			iommu_identity_mapping = 2;
-#endif
-		if (iommu_identity_mapping)
-			iommu_prepare_static_identity_mapping();
-		/*
-		 * For each rmrr
-		 *   for each dev attached to rmrr
-		 *   do
-		 *     locate drhd for dev, alloc domain for dev
-		 *     allocate free domain
-		 *     allocate page table entries for rmrr
-		 *     if context not allocated for bus
-		 *           allocate and init context
-		 *           set present in root table for this bus
-		 *     init context with domain, translation etc
-		 *    endfor
-		 * endfor
-		 */
-		printk(KERN_INFO "IOMMU: Setting RMRR:\n");
-		for_each_rmrr_units(rmrr) {
-			for (i = 0; i < rmrr->devices_cnt; i++) {
-				pdev = rmrr->devices[i];
-				/*
-				 * some BIOS lists non-exist devices in DMAR
-				 * table.
-				 */
-				if (!pdev)
-					continue;
-				ret = iommu_prepare_rmrr_dev(rmrr, pdev);
-				if (ret)
-					printk(KERN_ERR
-				 "IOMMU: mapping reserved region failed\n");
-			}
+	printk(KERN_INFO "IOMMU: Setting RMRR:\n");
+	for_each_rmrr_units(rmrr) {
+		for (i = 0; i < rmrr->devices_cnt; i++) {
+			pdev = rmrr->devices[i];
+			/*
+			 * some BIOS lists non-exist devices in DMAR
+			 * table.
+			 */
+			if (!pdev)
+				continue;
+			ret = iommu_prepare_rmrr_dev(rmrr, pdev);
+			if (ret)
+				printk(KERN_ERR
+				       "IOMMU: mapping reserved region failed\n");
 		}
-
-		iommu_prepare_isa();
 	}
 
+	iommu_prepare_isa();
+
 	/*
 	 * for each drhd
 	 *   enable fault log
@@ -2454,8 +2432,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
 	return iova;
 }
 
-static struct dmar_domain *
-get_valid_domain_for_dev(struct pci_dev *pdev)
+static struct dmar_domain *__get_valid_domain_for_dev(struct pci_dev *pdev)
 {
 	struct dmar_domain *domain;
 	int ret;
@@ -2483,6 +2460,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
 	return domain;
 }
 
+static inline struct dmar_domain *get_valid_domain_for_dev(struct pci_dev *dev)
+{
+	struct device_domain_info *info;
+
+	/* No lock here, assumes no domain exit in normal case */
+	info = dev->dev.archdata.iommu;
+	if (likely(info))
+		return info->domain;
+
+	return __get_valid_domain_for_dev(dev);
+}
+
 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)
 		 */
 		if (iommu_should_identity_map(pdev, 0)) {
 			int ret;
-			ret = domain_add_dev_info(si_domain, pdev);
-			if (ret)
-				return 0;
-			ret = domain_context_mapping(si_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
+			ret = domain_add_dev_info(si_domain, pdev,
+						  hw_pass_through ?
+						  CONTEXT_TT_PASS_THROUGH :
+						  CONTEXT_TT_MULTI_LEVEL);
 			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,
 	}
 }
 
-static void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,
-			       int dir)
-{
-	intel_unmap_page(dev, dev_addr, size, dir, NULL);
-}
-
 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,
 	size = PAGE_ALIGN(size);
 	order = get_order(size);
 
-	intel_unmap_single(hwdev, dma_handle, size, DMA_BIDIRECTIONAL);
+	intel_unmap_page(hwdev, dma_handle, size, DMA_BIDIRECTIONAL, NULL);
 	free_pages((unsigned long)vaddr, order);
 }
 
@@ -2807,11 +2790,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
 	/* free page tables */
 	dma_pte_free_pagetable(domain, start_pfn, last_pfn);
 
-	iommu_flush_iotlb_psi(iommu, domain->id, start_pfn,
-			      (last_pfn - start_pfn + 1));
-
-	/* free iova */
-	__free_iova(&domain->iovad, iova);
+	if (intel_iommu_strict) {
+		iommu_flush_iotlb_psi(iommu, domain->id, start_pfn,
+				      last_pfn - start_pfn + 1);
+		/* free iova */
+		__free_iova(&domain->iovad, iova);
+	} else {
+		add_unmap(domain, iova);
+		/*
+		 * queue up the release of the unmap to save the 1/6th of the
+		 * cpu used up by the iotlb flush operation...
+		 */
+	}
 }
 
 static int intel_nontranslate_map_sg(struct device *hddev,
@@ -3194,7 +3184,7 @@ int __init intel_iommu_init(void)
 	 * Check the need for DMA-remapping initialization now.
 	 * Above initialization will also be used by Interrupt-remapping.
 	 */
-	if (no_iommu || (swiotlb && !iommu_pass_through) || dmar_disabled)
+	if (no_iommu || swiotlb || dmar_disabled)
 		return -ENODEV;
 
 	iommu_init_mempool();
@@ -3214,14 +3204,7 @@ int __init intel_iommu_init(void)
 
 	init_timer(&unmap_timer);
 	force_iommu = 1;
-
-	if (!iommu_pass_through) {
-		printk(KERN_INFO
-		       "Multi-level page-table translation for DMAR.\n");
-		dma_ops = &intel_dma_ops;
-	} else
-		printk(KERN_INFO
-		       "DMAR: Pass through translation for DMAR.\n");
+	dma_ops = &intel_dma_ops;
 
 	init_iommu_sysfs();
 
@@ -3504,7 +3487,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
 	struct intel_iommu *iommu;
 	int addr_width;
 	u64 end;
-	int ret;
 
 	/* 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,
 		return -EFAULT;
 	}
 
-	ret = domain_add_dev_info(dmar_domain, pdev);
-	if (ret)
-		return ret;
-
-	ret = domain_context_mapping(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
-	return ret;
+	return domain_add_dev_info(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
 }
 
 static void intel_iommu_detach_device(struct iommu_domain *domain,
diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
index 46dd440..7914951 100644
--- a/drivers/pci/iova.c
+++ b/drivers/pci/iova.c
@@ -22,7 +22,6 @@
 void
 init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)
 {
-	spin_lock_init(&iovad->iova_alloc_lock);
 	spin_lock_init(&iovad->iova_rbtree_lock);
 	iovad->rbroot = RB_ROOT;
 	iovad->cached32_node = NULL;
@@ -205,7 +204,6 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
 	unsigned long limit_pfn,
 	bool size_aligned)
 {
-	unsigned long flags;
 	struct iova *new_iova;
 	int ret;
 
@@ -219,11 +217,9 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
 	if (size_aligned)
 		size = __roundup_pow_of_two(size);
 
-	spin_lock_irqsave(&iovad->iova_alloc_lock, flags);
 	ret = __alloc_and_insert_iova_range(iovad, size, limit_pfn,
 			new_iova, size_aligned);
 
-	spin_unlock_irqrestore(&iovad->iova_alloc_lock, flags);
 	if (ret) {
 		free_iova_mem(new_iova);
 		return NULL;
@@ -381,8 +377,7 @@ reserve_iova(struct iova_domain *iovad,
 	struct iova *iova;
 	unsigned int overlap = 0;
 
-	spin_lock_irqsave(&iovad->iova_alloc_lock, flags);
-	spin_lock(&iovad->iova_rbtree_lock);
+	spin_lock_irqsave(&iovad->iova_rbtree_lock, flags);
 	for (node = rb_first(&iovad->rbroot); node; node = rb_next(node)) {
 		if (__is_range_overlap(node, pfn_lo, pfn_hi)) {
 			iova = container_of(node, struct iova, node);
@@ -402,8 +397,7 @@ reserve_iova(struct iova_domain *iovad,
 	iova = __insert_new_range(iovad, pfn_lo, pfn_hi);
 finish:
 
-	spin_unlock(&iovad->iova_rbtree_lock);
-	spin_unlock_irqrestore(&iovad->iova_alloc_lock, flags);
+	spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags);
 	return iova;
 }
 
@@ -420,8 +414,7 @@ copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
 	unsigned long flags;
 	struct rb_node *node;
 
-	spin_lock_irqsave(&from->iova_alloc_lock, flags);
-	spin_lock(&from->iova_rbtree_lock);
+	spin_lock_irqsave(&from->iova_rbtree_lock, flags);
 	for (node = rb_first(&from->rbroot); node; node = rb_next(node)) {
 		struct iova *iova = container_of(node, struct iova, node);
 		struct iova *new_iova;
@@ -430,6 +423,5 @@ copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
 			printk(KERN_ERR "Reserve iova range %lx@%lx failed\n",
 				iova->pfn_lo, iova->pfn_lo);
 	}
-	spin_unlock(&from->iova_rbtree_lock);
-	spin_unlock_irqrestore(&from->iova_alloc_lock, flags);
+	spin_unlock_irqrestore(&from->iova_rbtree_lock, flags);
 }
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 228f6c9..76a0759 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -28,7 +28,6 @@ struct iova {
 
 /* holds all the iova translations for a domain */
 struct iova_domain {
-	spinlock_t	iova_alloc_lock;/* Lock to protect iova  allocation */
 	spinlock_t	iova_rbtree_lock; /* Lock to protect update of rbtree */
 	struct rb_root	rbroot;		/* iova domain rbtree root */
 	struct rb_node	*cached32_node; /* Save last alloced node */


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.21.6.4
retrieving revision 1.21.6.5
diff -u -p -r1.21.6.4 -r1.21.6.5
--- config-sparc64-generic	27 Jun 2009 11:05:10 -0000	1.21.6.4
+++ config-sparc64-generic	10 Aug 2009 21:22:18 -0000	1.21.6.5
@@ -31,7 +31,7 @@ CONFIG_64BIT=y
 CONFIG_HUGETLB_PAGE_SIZE_4MB=y
 # CONFIG_HUGETLB_PAGE_SIZE_512K is not set
 # CONFIG_HUGETLB_PAGE_SIZE_64K is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_US3_FREQ=m
 CONFIG_US2E_FREQ=m
 CONFIG_SUN_OPENPROMFS=m
@@ -151,7 +151,7 @@ CONFIG_ATM_FORE200E_USE_TASKLET=y
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E_TX_RETRY=16
 # CONFIG_DRM_TDFX is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_SPARCSPKR=m
@@ -199,3 +199,5 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
+
+# CONFIG_KGDB is not set


Index: config-sparc64-smp
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-smp,v
retrieving revision 1.2.16.2
retrieving revision 1.2.16.3
diff -u -p -r1.2.16.2 -r1.2.16.3
--- config-sparc64-smp	24 Apr 2009 22:27:04 -0000	1.2.16.2
+++ config-sparc64-smp	10 Aug 2009 21:22:18 -0000	1.2.16.3
@@ -1 +1,2 @@
 CONFIG_SMP=y
+CONFIG_KGDB=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.16
retrieving revision 1.68.6.17
diff -u -p -r1.68.6.16 -r1.68.6.17
--- config-x86-generic	8 Aug 2009 18:06:03 -0000	1.68.6.16
+++ config-x86-generic	10 Aug 2009 21:22:18 -0000	1.68.6.17
@@ -96,7 +96,7 @@ CONFIG_FB_EFI=y
 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_DEFAULT_ON=y
 
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.14
retrieving revision 1.68.2.15
diff -u -p -r1.68.2.14 -r1.68.2.15
--- config-x86_64-generic	5 Aug 2009 23:00:10 -0000	1.68.2.14
+++ config-x86_64-generic	10 Aug 2009 21:22:18 -0000	1.68.2.15
@@ -36,7 +36,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_DEFAULT_ON=y
 
 CONFIG_KEXEC_JUMP=y
 
@@ -243,7 +243,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_CS5535 is not set
 
-CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_CC_STACKPROTECTOR_ALL is not set
 
 CONFIG_SGI_IOC4=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.46
retrieving revision 1.1294.2.47
diff -u -p -r1.1294.2.46 -r1.1294.2.47
--- kernel.spec	9 Aug 2009 00:20:17 -0000	1.1294.2.46
+++ kernel.spec	10 Aug 2009 21:22:18 -0000	1.1294.2.47
@@ -103,6 +103,7 @@ Summary: The Linux kernel
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
 # dracut initrd-generic
 %define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
+%define with_dracut 0
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
@@ -608,6 +609,10 @@ Patch30: sched-introduce-SCHED_RESET_ON_
 
 Patch41: linux-2.6-sysrq-c.patch
 
+# Intel IOMMU fixes/workarounds
+Patch100: linux-2.6-die-closed-source-bios-muppets-die.patch
+Patch101: linux-2.6-intel-iommu-updates.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -1143,6 +1148,16 @@ ApplyPatch via-hwmon-temp-sensor.patch
 ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
 #
+# Intel IOMMU
+#
+# Quiesce USB host controllers before setting up the IOMMU
+ApplyPatch linux-2.6-die-closed-source-bios-muppets-die.patch
+# Some performance fixes, unify hardware/software passthrough support, and 
+# most importantly: notice when the BIOS points us to a region that returns
+# all 0xFF, and claims that there's an IOMMU there.
+ApplyPatch linux-2.6-intel-iommu-updates.patch
+
+#
 # PowerPC
 #
 ### NOT (YET) UPSTREAM:
@@ -1974,6 +1989,31 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 10 2009 Michael Young <m.a.young at durham.ac.uk>
+- disable CONFIG_CC_STACKPROTECTOR for x86_64 again (the workaround
+  needs revising)
+- disable dracut until the issue with livecd is fixed
+
+* Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
+- Add new device ID to lirc_mceusb (#512483)
+- Fix some lockdep false positives
+- Add support for setting and enabling iMON clock via sysfs
+- Add tunable pad threshold support to lirc_imon
+- Add new pseudo-IR protocl to lirc_imon for universals w/o a pad
+- Fix mouse device support on older iMON devices
+
+* Mon Aug 10 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.145.rc5.git3
+- Merge latest Intel IOMMU fixes and BIOS workarounds, re-enable by default.
+
+* Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>
+- btusb autosuspend: fix build on !CONFIG_PM by stubbing out
+  suspend/resume methods.
+
+* Sat Aug 08 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-0.141.rc5.git3
+- disable kgdb on sparc64 uni-processor kernel
+- set max cpus to 256 on sparc64
+- enable AT keyboard on sparc64
+
 * Sat Aug 08 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops patch to latest rebase/master and current rawhide
 - tell kernel.spec not to build non-PAE kernel for i686

linux-2.6-bluetooth-autosuspend.diff:
 btusb.c |  189 +++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 147 insertions(+), 42 deletions(-)

Index: linux-2.6-bluetooth-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-bluetooth-autosuspend.diff,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -u -p -r1.1.6.2 -r1.1.6.3
--- linux-2.6-bluetooth-autosuspend.diff	5 Aug 2009 23:00:16 -0000	1.1.6.2
+++ linux-2.6-bluetooth-autosuspend.diff	10 Aug 2009 21:22:19 -0000	1.1.6.3
@@ -1,11 +1,5 @@
-commit 7ed6456e2717d641a287bf6a83c1bf80395d312c
-Author: Matthew Garrett <mjg at redhat.com>
-Date:   Sat Jul 18 23:19:10 2009 +0100
-
-    Add support for bluetooth autosuspend
-
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index e70c57e..2f4b4c6 100644
+index e70c57e..ac94f91 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -145,6 +145,7 @@ static struct usb_device_id blacklist_table[] = {
@@ -251,7 +245,12 @@ index e70c57e..2f4b4c6 100644
  
  	return 0;
  }
-@@ -947,60 +1007,100 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
+@@ -943,73 +1003,118 @@ static void btusb_disconnect(struct usb_interface *intf)
+ 	hci_free_dev(hdev);
+ }
+ 
++#ifdef CONFIG_PM
+ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
  {
  	struct btusb_data *data = usb_get_intfdata(intf);
  
@@ -378,12 +377,17 @@ index e70c57e..2f4b4c6 100644
 +	schedule_work(&data->work);
  	return 0;
  }
++#endif
  
-@@ -1011,6 +1111,7 @@ static struct usb_driver btusb_driver = {
+ static struct usb_driver btusb_driver = {
+ 	.name		= "btusb",
+ 	.probe		= btusb_probe,
+ 	.disconnect	= btusb_disconnect,
++#ifdef CONFIG_PM
  	.suspend	= btusb_suspend,
  	.resume		= btusb_resume,
- 	.id_table	= btusb_table,
 +	.supports_autosuspend = 1,
++#endif
+ 	.id_table	= btusb_table,
  };
  
- static int __init btusb_init(void)

linux-2.6.31-lirc.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  112 +
 drivers/input/lirc/Makefile           |   20 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2298 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 24 files changed, 14733 insertions(+)

Index: linux-2.6.31-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.31-lirc.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
--- linux-2.6.31-lirc.patch	5 Aug 2009 23:00:17 -0000	1.2.2.3
+++ linux-2.6.31-lirc.patch	10 Aug 2009 21:22:19 -0000	1.2.2.4
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Tuesday, July 7, 2009
+Last updated: Monday, August 10, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -14,30 +14,30 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
  drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
- drivers/input/lirc/lirc_i2c.c         |  537 +++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
- drivers/input/lirc/lirc_imon.c        | 2062 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
+ drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ 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      | 1223 +++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  709 +++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ 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         | 1294 +++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
- drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++++
- 24 files changed, 14506 insertions(+), 0 deletions(-)
+ 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   |  777 +++++++++++
+ drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
+ drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
+ 24 files changed, 14733 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 381190c..fc79bdf 100644
+index b1114cf..eb86f8e 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3632,6 +3632,15 @@ W:	http://www.pasemi.com/
+@@ -3122,6 +3122,15 @@ W:	http://www.pasemi.com/
  L:	linuxppc-dev at ozlabs.org
  S:	Supported
  
@@ -717,7 +717,7 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..a5d5c89
+index 0000000..0510b4e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,851 @@
@@ -794,7 +794,7 @@ index 0000000..a5d5c89
 +	struct cdev cdev;
 +};
 +
-+static DEFINE_MUTEX(driver_lock);
++static DEFINE_MUTEX(lirc_dev_lock);
 +
 +static struct irctl *irctls[MAX_IRCTL_DEVICES];
 +
@@ -990,7 +990,7 @@ index 0000000..a5d5c89
 +		goto out;
 +	}
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	minor = d->minor;
 +
@@ -1079,7 +1079,7 @@ index 0000000..a5d5c89
 +		goto out_sysfs;
 +
 +	ir->attached = 1;
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	dprintk("lirc_dev: driver %s registered at minor number = %d\n",
 +		ir->d.name, ir->d.minor);
@@ -1088,7 +1088,7 @@ index 0000000..a5d5c89
 +out_sysfs:
 +	device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
 +out_lock:
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +out:
 +	return err;
 +}
@@ -1107,12 +1107,12 @@ index 0000000..a5d5c89
 +
 +	ir = irctls[minor];
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	if (ir->d.minor != minor) {
 +		printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
 +		       "minor (%d) device not registered!", minor);
-+		mutex_unlock(&driver_lock);
++		mutex_unlock(&lirc_dev_lock);
 +		return -ENOENT;
 +	}
 +
@@ -1140,7 +1140,7 @@ index 0000000..a5d5c89
 +		irctls[minor] = NULL;
 +	}
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return 0;
 +}
@@ -1157,7 +1157,7 @@ index 0000000..a5d5c89
 +		return -ENODEV;
 +	}
 +
-+	if (mutex_lock_interruptible(&driver_lock))
++	if (mutex_lock_interruptible(&lirc_dev_lock))
 +		return -ERESTARTSYS;
 +
 +	ir = irctls[iminor(inode)];
@@ -1203,7 +1203,7 @@ index 0000000..a5d5c89
 +		dprintk(LOGHEAD "open result = %d\n", ir->d.name, ir->d.minor,
 +			retval);
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return retval;
 +}
@@ -1215,7 +1215,7 @@ index 0000000..a5d5c89
 +
 +	dprintk(LOGHEAD "close called\n", ir->d.name, ir->d.minor);
 +
-+	WARN_ON(mutex_lock_killable(&driver_lock));
++	WARN_ON(mutex_lock_killable(&lirc_dev_lock));
 +
 +	--ir->open;
 +	if (ir->attached) {
@@ -1227,7 +1227,7 @@ index 0000000..a5d5c89
 +		kfree(ir);
 +	}
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return 0;
 +}
@@ -1764,7 +1764,7 @@ index 0000000..8eeffa2
 +#endif
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
-index 0000000..5a7f9d0
+index 0000000..e27d937
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_i2c.c
 @@ -0,0 +1,537 @@
@@ -2122,8 +2122,8 @@ index 0000000..5a7f9d0
 +	.owner		= THIS_MODULE,
 +};
 +
-+static int ir_remove(struct i2c_client *client);
 +static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
++static int ir_remove(struct i2c_client *client);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 +
 +static const struct i2c_device_id ir_receiver_id[] = {
@@ -2140,8 +2140,8 @@ index 0000000..5a7f9d0
 +	},
 +	.probe		= ir_probe,
 +	.remove		= ir_remove,
-+	.command	= ir_command,
 +	.id_table	= ir_receiver_id,
++	.command	= ir_command,
 +};
 +
 +static void pcf_probe(struct i2c_client *client, struct IR *ir)
@@ -2869,10 +2869,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..83e4101
+index 0000000..3c87d94
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2062 @@
+@@ -0,0 +1,2298 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -2922,6 +2922,8 @@ index 0000000..83e4101
 +
 +#define BIT_DURATION	250	/* each bit received is 250us */
 +
++#define IMON_CLOCK_ENABLE_PACKETS	2
++
 +#define dprintk(fmt, args...)						\
 +	do {								\
 +		if (debug)						\
@@ -3008,7 +3010,7 @@ index 0000000..83e4101
 +	int ir_protocol;		/* iMON or MCE (RC6) IR protocol? */
 +	struct input_dev *mouse;	/* input device for iMON PAD remote */
 +	struct input_dev *touch;	/* input device for touchscreen */
-+	int has_touchscreen;		/* touchscreen present? */
++	int display_type;		/* store the display type */
 +	int pad_mouse;			/* toggle kbd(0)/mouse(1) mode */
 +	int touch_x;			/* x coordinate on touchscreen */
 +	int touch_y;			/* y coordinate on touchscreen */
@@ -3038,8 +3040,9 @@ index 0000000..83e4101
 +};
 +
 +enum {
-+	IMON_IR_PROTOCOL_IMON = 0,
-+	IMON_IR_PROTOCOL_MCE  = 1,
++	IMON_IR_PROTOCOL_IMON       = 0,
++	IMON_IR_PROTOCOL_MCE        = 1,
++	IMON_IR_PROTOCOL_IMON_NOPAD = 2,
 +};
 +/*
 + * USB Device ID for iMON USB Control Boards
@@ -3236,7 +3239,7 @@ index 0000000..83e4101
 +/* lcd, vfd, vga or none? should be auto-detected, but can be overridden... */
 +static int display_type;
 +
-+/* IR protocol: native iMON or Windows MCE (RC-6) */
++/* IR protocol: native iMON, Windows MCE (RC-6), or iMON w/o PAD stabilize */
 +static int ir_protocol;
 +
 +/*
@@ -3245,6 +3248,9 @@ index 0000000..83e4101
 + */
 +static int nomouse;
 +
++/* threshold at which a pad push registers as an arrow key in kbd mode */
++static int pad_thresh;
++
 +
 +/***  M O D U L E   C O D E ***/
 +
@@ -3260,10 +3266,15 @@ index 0000000..83e4101
 +		 "1=vfd, 2=lcd, 3=vga, 4=none (default: autodetect)");
 +module_param(ir_protocol, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(ir_protocol, "Which IR protocol to use. 0=native iMON, "
-+		 "1=Windows Media Center Ed. (RC-6) (default: native iMON)");
++		 "1=Windows Media Center Ed. (RC-6), 2=iMON w/o PAD stabilize "
++		 "(default: native iMON)");
 +module_param(nomouse, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(nomouse, "Disable mouse input device mode when IR device is "
 +		 "open. 0=don't disable, 1=disable. (default: don't disable)");
++module_param(pad_thresh, int, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(pad_thresh, "Threshold at which a pad push registers as an "
++		 "arrow key in kbd mode (default 80 on newer devices, 15 on "
++		 "older devices)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -3481,21 +3492,105 @@ index 0000000..83e4101
 +		return -ENODEV;
 +	}
 +
-+	mutex_lock(&context->lock);
-+
 +	if (!context->dev_present_intf0) {
 +		err("%s: no iMON device present", __func__);
-+		retval = -ENODEV;
-+		goto exit;
++		return -ENODEV;
 +	}
 +
 +	memcpy(context->usb_tx_buf, packet, sizeof(packet));
 +	retval = send_packet(context);
 +
-+exit:
-+	mutex_unlock(&context->lock);
++	return retval;
++}
++
++/**
++ * Sends packets to setup and show clock on iMON display
++ *
++ * Arguments: year - last 2 digits of year, month - 1..12,
++ * day - 1..31, dow - day of the week (0-Sun...6-Sat),
++ * hour - 0..23, minute - 0..59, second - 0..59
++ */
++static int send_set_imon_clock(struct imon_context *context,
++			       unsigned int year, unsigned int month,
++			       unsigned int day, unsigned int dow,
++			       unsigned int hour, unsigned int minute,
++			       unsigned int second)
++{
++	unsigned char clock_enable_pkt[IMON_CLOCK_ENABLE_PACKETS][8];
++	int retval = 0;
++	int i;
++
++	if (!context) {
++		err("%s: no context for device", __func__);
++		return -ENODEV;
++	}
++
++	switch(context->display_type) {
++	case IMON_DISPLAY_TYPE_LCD:
++		clock_enable_pkt[0][0] = 0x80;
++		clock_enable_pkt[0][1] = year;
++		clock_enable_pkt[0][2] = month-1;
++		clock_enable_pkt[0][3] = day;
++		clock_enable_pkt[0][4] = hour;
++		clock_enable_pkt[0][5] = minute;
++		clock_enable_pkt[0][6] = second;
++
++		clock_enable_pkt[1][0] = 0x80;
++		clock_enable_pkt[1][1] = 0;
++		clock_enable_pkt[1][2] = 0;
++		clock_enable_pkt[1][3] = 0;
++		clock_enable_pkt[1][4] = 0;
++		clock_enable_pkt[1][5] = 0;
++		clock_enable_pkt[1][6] = 0;
++
++		if (context->ffdc_dev) {
++			clock_enable_pkt[0][7] = 0x50;
++			clock_enable_pkt[1][7] = 0x51;
++		} else {
++			clock_enable_pkt[0][7] = 0x88;
++			clock_enable_pkt[1][7] = 0x8a;
++		}
++
++		break;
++
++	case IMON_DISPLAY_TYPE_VFD:
++		clock_enable_pkt[0][0] = year;
++		clock_enable_pkt[0][1] = month-1;
++		clock_enable_pkt[0][2] = day;
++		clock_enable_pkt[0][3] = dow;
++		clock_enable_pkt[0][4] = hour;
++		clock_enable_pkt[0][5] = minute;
++		clock_enable_pkt[0][6] = second;
++		clock_enable_pkt[0][7] = 0x40;
++
++		clock_enable_pkt[1][0] = 0;
++		clock_enable_pkt[1][1] = 0;
++		clock_enable_pkt[1][2] = 1;
++		clock_enable_pkt[1][3] = 0;
++		clock_enable_pkt[1][4] = 0;
++		clock_enable_pkt[1][5] = 0;
++		clock_enable_pkt[1][6] = 0;
++		clock_enable_pkt[1][7] = 0x42;
++
++		break;
++
++	default:
++		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);
++		if (retval) {
++			err("%s: send_packet failed for packet %d",
++			    __func__, i);
++			break;
++		}
++	}
 +
 +	return retval;
++
 +}
 +
 +/**
@@ -3551,16 +3646,104 @@ index 0000000..83e4101
 +	return count;
 +}
 +
++/**
++ * sysfs functions to control internal imon clock
++ */
++static ssize_t show_imon_clock(struct device *d,
++			       struct device_attribute *attr, char *buf)
++{
++	struct imon_context *context = dev_get_drvdata(d);
++	size_t len;
++
++	if (!context)
++		return -ENODEV;
++
++	mutex_lock(&context->lock);
++
++	if (!context->display_supported) {
++		len = snprintf(buf, PAGE_SIZE, "Not supported.");
++	} else {
++		len = snprintf(buf, PAGE_SIZE,
++			"To set the clock on your iMON display:\n"
++			"# date \"+%%y %%m %%d %%w %%H %%M %%S\" > imon_clock\n"
++			"%s", context->display_isopen ?
++			"\nNOTE: imon device must be closed\n" : "");
++	}
++
++	mutex_unlock(&context->lock);
++
++	return len;
++}
++
++static ssize_t store_imon_clock(struct device *d,
++				struct device_attribute *attr,
++				const char *buf, size_t count)
++{
++	struct imon_context *context = dev_get_drvdata(d);
++	ssize_t retval;
++	unsigned int year, month, day, dow, hour, minute, second;
++
++	if (!context)
++		return -ENODEV;
++
++	mutex_lock(&context->lock);
++
++	if (!context->display_supported) {
++		retval = -ENODEV;
++		goto exit;
++	} else if (context->display_isopen) {
++		retval = -EBUSY;
++		goto exit;
++	}
++
++	if (sscanf(buf, "%u %u %u %u %u %u %u",	&year, &month, &day, &dow,
++		   &hour, &minute, &second) != 7) {
++		retval = -EINVAL;
++		goto exit;
++	}
++
++	if ((month < 1 || month > 12) ||
++	    (day < 1 || day > 31) || (dow > 6) ||
++	    (hour > 23) || (minute > 59) || (second > 59)) {
++		retval = -EINVAL;
++		goto exit;
++	}
++
++	retval = send_set_imon_clock(context, year, month, day, dow,
++				     hour, minute, second);
++	if (retval)
++		goto exit;
++
++	retval = count;
++exit:
++	mutex_unlock(&context->lock);
++
++	return retval;
++}
++
++
++static DEVICE_ATTR(imon_clock, S_IWUSR | S_IRUGO, show_imon_clock,
++		   store_imon_clock);
++
 +static DEVICE_ATTR(associate_remote, S_IWUSR | S_IRUGO, show_associate_remote,
 +		   store_associate_remote);
 +
-+static struct attribute *imon_sysfs_entries[] = {
++static struct attribute *imon_display_sysfs_entries[] = {
++	&dev_attr_imon_clock.attr,
++	NULL
++};
++
++static struct attribute_group imon_display_attribute_group = {
++	.attrs = imon_display_sysfs_entries
++};
++
++static struct attribute *imon_rf_sysfs_entries[] = {
 +	&dev_attr_associate_remote.attr,
 +	NULL
 +};
 +
-+static struct attribute_group imon_attribute_group = {
-+	.attrs = imon_sysfs_entries
++static struct attribute_group imon_rf_attribute_group = {
++	.attrs = imon_rf_sysfs_entries
 +};
 +
 +/**
@@ -3743,12 +3926,15 @@ index 0000000..83e4101
 +	unsigned char ir_proto_packet[] =
 +		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
 +
-+	/* not supported on devices that don't do onboard decoding */
-+	if (!context->ir_onboard_decode)
-+		return;
-+
 +	switch (ir_protocol) {
 +	case IMON_IR_PROTOCOL_MCE:
++		/* MCE proto not supported on devices without tx control */
++		if (!context->tx_control) {
++			printk(KERN_INFO "%s: MCE IR protocol not supported on "
++			       "this device, using iMON protocol\n", __func__);
++			context->ir_protocol = IMON_IR_PROTOCOL_IMON;
++			return;
++		}
 +		dprintk("Configuring IR receiver for MCE protocol\n");
 +		ir_proto_packet[0] = 0x01;
 +		context->ir_protocol = IMON_IR_PROTOCOL_MCE;
@@ -3758,10 +3944,16 @@ index 0000000..83e4101
 +		/* ir_proto_packet[0] = 0x00; // already the default */
 +		context->ir_protocol = IMON_IR_PROTOCOL_IMON;
 +		break;
++	case IMON_IR_PROTOCOL_IMON_NOPAD:
++		dprintk("Configuring IR receiver for iMON protocol without "
++			"PAD stabilize function enabled\n");
++		/* ir_proto_packet[0] = 0x00; // already the default */
++		context->ir_protocol = IMON_IR_PROTOCOL_IMON_NOPAD;
++		break;
 +	default:
 +		printk(KERN_INFO "%s: unknown IR protocol specified, will "
 +		       "just default to iMON protocol\n", __func__);
-+		context->ir_protocol = IMON_IR_PROTOCOL_MCE;
++		context->ir_protocol = IMON_IR_PROTOCOL_IMON;
 +		break;
 +	}
 +	memcpy(context->usb_tx_buf, &ir_proto_packet,
@@ -3891,12 +4083,14 @@ index 0000000..83e4101
 +}
 +
 +/**
-+ * The directional pad is overly sensitive in keyboard mode, so we do some
-+ * interesting contortions to make it less touchy.
++ * The directional pad behaves a bit differently, depending on whether this is
++ * one of the older ffdc devices or a newer device. Newer devices appear to
++ * have a higher resolution matrix for more precise mouse movement, but it
++ * makes things overly sensitive in keyboard mode, so we do some interesting
++ * contortions to make it less touchy. Older devices run through the same
++ * routine with shorter timeout and a smaller threshold.
 + */
-+#define IMON_PAD_TIMEOUT	1000	/* in msecs */
-+#define IMON_PAD_THRESHOLD	80	/* 160x160 square */
-+static int stabilize(int a, int b)
++static int stabilize(int a, int b, u16 timeout, u16 threshold)
 +{
 +	struct timeval ct;
 +	static struct timeval prev_time = {0, 0};
@@ -3920,7 +4114,7 @@ index 0000000..83e4101
 +
 +	prev_time = ct;
 +
-+	if (abs(x) > IMON_PAD_THRESHOLD || abs(y) > IMON_PAD_THRESHOLD) {
++	if (abs(x) > threshold || abs(y) > threshold) {
 +		if (abs(y) > abs(x))
 +			result = (y > 0) ? 0x7F : 0x80;
 +		else
@@ -3935,21 +4129,21 @@ index 0000000..83e4101
 +			if (hits > 3) {
 +				switch (result) {
 +				case 0x7F:
-+					y = 17 * IMON_PAD_THRESHOLD / 30;
++					y = 17 * threshold / 30;
 +					break;
 +				case 0x80:
-+					y -= 17 * IMON_PAD_THRESHOLD / 30;
++					y -= 17 * threshold / 30;
 +					break;
 +				case 0x7F00:
-+					x = 17 * IMON_PAD_THRESHOLD / 30;
++					x = 17 * threshold / 30;
 +					break;
 +				case 0x8000:
-+					x -= 17 * IMON_PAD_THRESHOLD / 30;
++					x -= 17 * threshold / 30;
 +					break;
 +				}
 +			}
 +
-+			if (hits == 2 && msec_hit < IMON_PAD_TIMEOUT) {
++			if (hits == 2 && msec_hit < timeout) {
 +				result = 0;
 +				hits = 1;
 +			}
@@ -3974,20 +4168,21 @@ index 0000000..83e4101
 +	char rel_x = 0x00, rel_y = 0x00;
 +	int octet, bit;
 +	unsigned char mask;
-+	int i, chunk_num, dir;
++	int i, chunk_num;
 +	int ts_input = 0;
 +	int mouse_input;
++	int right_shift = 1;
++	int dir = 0;
++	u16 timeout, threshold;
 +	struct input_dev *mouse = NULL;
 +	struct input_dev *touch = NULL;
 +	const unsigned char toggle_button1[] = { 0x29, 0x91, 0x15, 0xb7 };
 +	const unsigned char toggle_button2[] = { 0x29, 0x91, 0x35, 0xb7 };
 +	const unsigned char ch_up[]   = { 0x28, 0x93, 0x95, 0xb7 };
 +	const unsigned char ch_down[] = { 0x28, 0x87, 0x95, 0xb7 };
-+	const unsigned char btn_left[]  = { 0x68, 0x83, 0x01, 0xb7 };
-+	const unsigned char btn_right[] = { 0x68, 0x84, 0x81, 0xb7 };
 +
 +	mouse = context->mouse;
-+	if (context->has_touchscreen)
++	if (context->display_type == IMON_DISPLAY_TYPE_VGA)
 +		touch = context->touch;
 +
 +	/* keyboard/mouse mode toggle button */
@@ -4005,8 +4200,8 @@ index 0000000..83e4101
 +	}
 +
 +	/* send touchscreen events through input subsystem if touchpad data */
-+	if (context->has_touchscreen && len == 8 &&
-+	    (buf[6] == 0x14 || buf[6] == 0x03) && buf[7] == 0x86) {
++	if (context->display_type == IMON_DISPLAY_TYPE_VGA && len == 8 &&
++	    buf[7] == 0x86) {
 +		if (touch == NULL) {
 +			printk(KERN_WARNING "%s: touchscreen input device is "
 +			       "NULL!\n", __func__);
@@ -4028,31 +4223,30 @@ index 0000000..83e4101
 +			mouse_input = 1;
 +			rel_x = buf[2];
 +			rel_y = buf[3];
-+		/* 0xffdc iMON PAD input */
++			right_shift = 1;
++		/* 0xffdc iMON PAD or mouse button input */
 +		} else if (context->ffdc_dev && (buf[0] & 0x40) &&
 +			   !((buf[1] & 0x01) || ((buf[1] >> 2) & 0x01))) {
 +			mouse_input = 1;
 +			rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 |
 +				(buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6;
 +			if (buf[0] & 0x02)
-+				rel_x |= ~0x11;
++				rel_x |= ~0x0f;
 +			rel_x = rel_x + rel_x / 2;
 +			rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 |
 +				(buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6;
 +			if (buf[0] & 0x01)
-+				rel_y |= ~0x11;
++				rel_y |= ~0x0f;
 +			rel_y = rel_y + rel_y / 2;
-+		/* 0xffdc mouse buttons */
-+		} else if (context->ffdc_dev && !memcmp(buf, btn_left, 4)) {
-+			mouse_input = 1;
-+			buf[1] = 0x01;
-+		} else if (context->ffdc_dev && !memcmp(buf, btn_right, 4)) {
-+			mouse_input = 1;
-+			buf[1] = 0x02;
++			right_shift = 2;
 +		/* ch+/- buttons, which we use for an emulated scroll wheel */
-+		} else if (!memcmp(buf, ch_up, 4) || !memcmp(buf, ch_down, 4))
++		} else if (!memcmp(buf, ch_up, 4)) {
 +			mouse_input = 1;
-+		else
++			dir = 1;
++		} else if (!memcmp(buf, ch_down, 4)) {
++			mouse_input = 1;
++			dir = -1;
++		} else
 +			mouse_input = 0;
 +
 +		if (mouse_input) {
@@ -4062,18 +4256,12 @@ index 0000000..83e4101
 +				return;
 +			}
 +			dprintk("sending mouse data via input subsystem\n");
-+			if (!memcmp(buf, ch_up, 4))
-+				dir = 1;
-+			else if (!memcmp(buf, ch_down, 4))
-+				dir = -1;
-+			else
-+				dir = 0;
 +
 +			if (dir == 0) {
 +				input_report_key(mouse, BTN_LEFT,
 +						 buf[1] & 0x01);
 +				input_report_key(mouse, BTN_RIGHT,
-+						 buf[1] >> 1 & 0x01);
++						 buf[1] >> right_shift & 0x01);
 +				input_report_rel(mouse, REL_X, rel_x);
 +				input_report_rel(mouse, REL_Y, rel_y);
 +			} else
@@ -4098,6 +4286,9 @@ index 0000000..83e4101
 +		/* first, pad to 8 bytes so it conforms with everything else */
 +		buf[5] = buf[6] = buf[7] = 0;
 +		len = 8;
++		timeout = 500;	/* in msecs */
++		/* (2*threshold) x (2*threshold) square */
++		threshold = pad_thresh ? pad_thresh : 80;
 +		rel_x = buf[2];
 +		rel_y = buf[3];
 +
@@ -4111,12 +4302,23 @@ index 0000000..83e4101
 +		 * diagonals, it has a tendancy to jump back and forth, so lets
 +		 * try to ignore when they get too close
 +		 */
-+		if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
-+			dir = stabilize((int)rel_x, (int)rel_y);
-+			if (!dir)
-+				return;
-+			buf[2] = dir & 0xFF;
-+			buf[3] = (dir >> 8) & 0xFF;
++		if (context->ir_protocol == IMON_IR_PROTOCOL_IMON) {
++			if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
++				dir = stabilize((int)rel_x, (int)rel_y,
++						timeout, threshold);
++				if (!dir)
++					return;
++				buf[2] = dir & 0xFF;
++				buf[3] = (dir >> 8) & 0xFF;
++			}
++		} else {
++			if (abs(rel_y) > abs(rel_x)) {
++				buf[2] = (rel_y > 0) ? 0x7F : 0x80;
++				buf[3] = 0;
++			} else {
++				buf[2] = 0;
++				buf[3] = (rel_x > 0) ? 0x7F : 0x80;
++			}
 +		}
 +
 +	} else if ((len == 8) && (buf[0] & 0x40) &&
@@ -4134,6 +4336,9 @@ index 0000000..83e4101
 +		 * 0x01007F00, ..., so one can use the normal imon-pad config
 +		 * from the remotes dir.
 +		 */
++		timeout = 10;	/* in msecs */
++		/* (2*threshold) x (2*threshold) square */
++		threshold = pad_thresh ? pad_thresh : 15;
 +
 +		/* buf[1] is x */
 +		rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 |
@@ -4149,11 +4354,22 @@ index 0000000..83e4101
 +		buf[0] = 0x01;
 +		buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0;
 +
-+		dir = stabilize((int)rel_x, (int)rel_y);
-+		if (!dir)
-+			return;
-+		buf[2] = dir & 0xFF;
-+		buf[3] = (dir >> 8) & 0xFF;
++		if (context->ir_protocol == IMON_IR_PROTOCOL_IMON) {
++			dir = stabilize((int)rel_x, (int)rel_y,
++					timeout, threshold);
++			if (!dir)
++				return;
++			buf[2] = dir & 0xFF;
++			buf[3] = (dir >> 8) & 0xFF;
++		} else {
++			if (abs(rel_y) > abs(rel_x)) {
++				buf[2] = (rel_y > 0) ? 0x7F : 0x80;
++				buf[3] = 0;
++			} else {
++				buf[2] = 0;
++				buf[3] = (rel_x > 0) ? 0x7F : 0x80;
++			}
++		}
 +
 +	} else if (ts_input) {
 +		/*
@@ -4276,7 +4492,7 @@ index 0000000..83e4101
 +	struct imon_context *context = (struct imon_context *)data;
 +	struct input_dev *touch;
 +
-+	if (!context->has_touchscreen)
++	if (!context->display_type == IMON_DISPLAY_TYPE_VGA)
 +		return;
 +
 +	touch = context->touch;
@@ -4387,24 +4603,41 @@ index 0000000..83e4101
 +	int alloc_status = 0;
 +	int vfd_proto_6p = 0;
 +	int ir_onboard_decode = 0;
-+	int has_touchscreen = 0;
 +	int buf_chunk_size = BUF_CHUNK_SIZE;
 +	int code_length;
 +	int tx_control = 0;
 +	struct imon_context *context = NULL;
 +	struct imon_context *first_if_context = NULL;
-+	int i;
++	int i, sysfs_err;
++	int configured_display_type = IMON_DISPLAY_TYPE_VFD;
 +	u16 vendor, product;
 +	const unsigned char fp_packet[] = { 0x40, 0x00, 0x00, 0x00,
 +					    0x00, 0x00, 0x00, 0x88 };
 +
 +	/*
++	 * Try to auto-detect the type of display if the user hasn't set
++	 * it by hand via the display_type modparam. Default is VFD.
++	 */
++	if (display_type == IMON_DISPLAY_TYPE_AUTO) {
++		if (usb_match_id(interface, lcd_device_list))
++			configured_display_type = IMON_DISPLAY_TYPE_LCD;
++		else if (usb_match_id(interface, imon_touchscreen_list))
++			configured_display_type = IMON_DISPLAY_TYPE_VGA;
++		else if (usb_match_id(interface, ir_only_list))
++			configured_display_type = IMON_DISPLAY_TYPE_NONE;
++		else
++			configured_display_type = IMON_DISPLAY_TYPE_VFD;
++	} else {
++		configured_display_type = display_type;
++		dprintk("%s: overriding display type to %d via modparam\n",
++			__func__, display_type);
++	}
++
++	/*
 +	 * If it's the LCD, as opposed to the VFD, we just need to replace
 +	 * the "write" file op.
 +	 */
-+	if ((display_type == IMON_DISPLAY_TYPE_AUTO &&
-+	     usb_match_id(interface, lcd_device_list)) ||
-+	    display_type == IMON_DISPLAY_TYPE_LCD)
++	if (configured_display_type == IMON_DISPLAY_TYPE_LCD)
 +		display_fops.write = &lcd_write;
 +
 +	/*
@@ -4480,9 +4713,7 @@ index 0000000..83e4101
 +	 * that SoundGraph recycles device IDs between devices both with
 +	 * and without... :\
 +	 */
-+	if ((display_type == IMON_DISPLAY_TYPE_AUTO &&
-+	     usb_match_id(interface, ir_only_list)) ||
-+	    display_type == IMON_DISPLAY_TYPE_NONE) {
++	if (configured_display_type == IMON_DISPLAY_TYPE_NONE) {
 +		display_ep_found = 0;
 +		dprintk("%s: device has no display\n", __func__);
 +	}
@@ -4491,11 +4722,8 @@ index 0000000..83e4101
 +	 * iMON Touch devices have a VGA touchscreen, but no "display", as
 +	 * that refers to e.g. /dev/lcd0 (a character device LCD or VFD).
 +	 */
-+	if ((display_type == IMON_DISPLAY_TYPE_AUTO &&
-+	     usb_match_id(interface, imon_touchscreen_list)) ||
-+	    display_type == IMON_DISPLAY_TYPE_VGA) {
++	if (configured_display_type == IMON_DISPLAY_TYPE_VGA) {
 +		display_ep_found = 0;
-+		has_touchscreen = 1;
 +		dprintk("%s: iMON Touch device found\n", __func__);
 +	}
 +
@@ -4636,7 +4864,7 @@ index 0000000..83e4101
 +		if (product == 0xffdc)
 +			context->ffdc_dev = 1;
 +
-+		context->has_touchscreen = has_touchscreen;
++		context->display_type = configured_display_type;
 +
 +		context->mouse = input_allocate_device();
 +
@@ -4689,7 +4917,7 @@ index 0000000..83e4101
 +		context->rx_endpoint_intf1 = rx_endpoint;
 +		context->rx_urb_intf1 = rx_urb;
 +
-+		if (context->has_touchscreen) {
++		if (context->display_type == IMON_DISPLAY_TYPE_VGA) {
 +			context->touch = input_allocate_device();
 +
 +			snprintf(context->name_touch,
@@ -4745,17 +4973,23 @@ index 0000000..83e4101
 +
 +	/* RF products *also* use 0xffdc... sigh... */
 +	if (context->ffdc_dev) {
-+		int err;
-+
-+		err = sysfs_create_group(&interface->dev.kobj,
-+					 &imon_attribute_group);
-+		if (err)
-+			err("%s: Could not create sysfs entries(%d)",
-+			    __func__, err);
++		sysfs_err = sysfs_create_group(&interface->dev.kobj,
++					       &imon_rf_attribute_group);
++		if (sysfs_err)
++			err("%s: Could not create RF sysfs entries(%d)",
++			    __func__, sysfs_err);
 +	}
 +
 +	if (context->display_supported && ifnum == 0) {
 +		dprintk("%s: Registering iMON display with sysfs\n", __func__);
++
++		/* set up sysfs entry for built-in clock */
++		sysfs_err = sysfs_create_group(&interface->dev.kobj,
++					       &imon_display_attribute_group);
++		if (sysfs_err)
++			err("%s: Could not create display sysfs entries(%d)",
++			    __func__, sysfs_err);
++
 +		if (usb_register_dev(interface, &imon_class)) {
 +			/* Not a fatal error, so ignore */
 +			printk(KERN_INFO "%s: could not get a minor number for "
@@ -4830,7 +5064,9 @@ index 0000000..83e4101
 +	 * hasn't been called
 +	 */
 +	sysfs_remove_group(&interface->dev.kobj,
-+			   &imon_attribute_group);
++			   &imon_display_attribute_group);
++	sysfs_remove_group(&interface->dev.kobj,
++			   &imon_rf_attribute_group);
 +
 +	usb_set_intfdata(interface, NULL);
 +
@@ -4849,7 +5085,7 @@ index 0000000..83e4101
 +	} else {
 +		context->dev_present_intf1 = 0;
 +		usb_kill_urb(context->rx_urb_intf1);
-+		if (context->has_touchscreen)
++		if (context->display_type == IMON_DISPLAY_TYPE_VGA)
 +			input_unregister_device(context->touch);
 +	}
 +
@@ -6596,10 +6832,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..840d0e1
+index 0000000..58dfdd5
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1223 @@
+@@ -0,0 +1,1225 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -6783,6 +7019,8 @@ index 0000000..840d0e1
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
 +	/* Formosa Industrial Computing / Beanbag Emulation Device */
 +	{ USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
++	/* Formosa Industrial Computing AIM IR605/A */
++	{ USB_DEVICE(VENDOR_FORMOSA, 0xe03c) },
 +	/* Fintek eHome Infrared Transceiver */
 +	{ USB_DEVICE(VENDOR_FINTEK, 0x0602) },
 +	/* Fintek eHome Infrared Transceiver (in the AOpen MP45) */
@@ -10831,10 +11069,10 @@ 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..6c64072
+index 0000000..b497642
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sir.c
-@@ -0,0 +1,1294 @@
+@@ -0,0 +1,1283 @@
 +/*
 + * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
 + *
@@ -10979,8 +11217,16 @@ index 0000000..6c64072
 +#define LIRC_IRQ 4
 +#endif
 +#ifndef LIRC_PORT
++/* for external dongles, default to com1 */
++#if defined(LIRC_SIR_ACTISYS_ACT200L) || \
++    defined(LIRC_SIR_ACTISYS_ACT220L) || \
++    defined(LIRC_SIR_TEKRAM)
++#define LIRC_PORT 0x3f8
++#else
++/* onboard sir ports are typically com3 */
 +#define LIRC_PORT 0x3e8
 +#endif
++#endif
 +
 +static int io = LIRC_PORT;
 +static int irq = LIRC_IRQ;
@@ -10998,7 +11244,6 @@ index 0000000..6c64072
 +static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue);
 +
 +static DEFINE_SPINLOCK(hardware_lock);
-+static DEFINE_SPINLOCK(dev_lock);
 +
 +static int rx_buf[RBUF_LEN];
 +static unsigned int rx_tail, rx_head;
@@ -11015,8 +11260,6 @@ index 0000000..6c64072
 +/* SECTION: Prototypes */
 +
 +/* Communication with user-space */
-+static int lirc_open(struct inode *inode, struct file *file);
-+static int lirc_close(struct inode *inode, struct file *file);
 +static unsigned int lirc_poll(struct file *file, poll_table *wait);
 +static ssize_t lirc_read(struct file *file, char *buf, size_t count,
 +		loff_t *ppos);
@@ -11076,22 +11319,6 @@ index 0000000..6c64072
 +
 +/* SECTION: Communication with user-space */
 +
-+static int lirc_open(struct inode *inode, struct file *file)
-+{
-+	spin_lock(&dev_lock);
-+	if (module_refcount(THIS_MODULE)) {
-+		spin_unlock(&dev_lock);
-+		return -EBUSY;
-+	}
-+	spin_unlock(&dev_lock);
-+	return 0;
-+}
-+
-+static int lirc_close(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
 +static unsigned int lirc_poll(struct file *file, poll_table *wait)
 +{
 +	poll_wait(file, &lirc_read_queue, wait);
@@ -11306,8 +11533,8 @@ index 0000000..6c64072
 +	.write		= lirc_write,
 +	.poll		= lirc_poll,
 +	.ioctl		= lirc_ioctl,
-+	.open		= lirc_open,
-+	.release	= lirc_close,
++	.open		= lirc_dev_fop_open,
++	.release	= lirc_dev_fop_close,
 +};
 +
 +static int set_use_inc(void *data)
@@ -13317,7 +13544,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..a06e6de
+index 0000000..c532399
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1374 @@

xen.pvops.post.patch:
 arch/x86/kernel/cpu/Makefile                 |    2 ++
 b/arch/x86/include/asm/paravirt_types.h      |    3 +++
 b/arch/x86/kernel/pci-swiotlb.c              |    5 ++---
 b/arch/x86/kernel/process_32.c               |    2 ++
 b/arch/x86/pci/common.c                      |   16 ++++++++++++++++
 drivers/pci/pci.h                            |    2 ++
 linux-2.6.29.x86_64/arch/x86/xen/Makefile    |    4 ++++
 linux-2.6.29.x86_64/arch/x86/xen/enlighten.c |    2 +-
 linux-2.6.29.x86_64/drivers/xen/Makefile     |    3 +++
 9 files changed, 35 insertions(+), 4 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -p -r1.1.2.19 -r1.1.2.20
--- xen.pvops.post.patch	8 Aug 2009 18:06:06 -0000	1.1.2.19
+++ xen.pvops.post.patch	10 Aug 2009 21:22:20 -0000	1.1.2.20
@@ -68,6 +68,22 @@ index 2202b62..f371fe8 100644
  }
  
  int __init pcibios_init(void)
+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
++++ b/arch/x86/kernel/pci-swiotlb.c
+@@ -71,9 +71,8 @@ void __init pci_swiotlb_init(void)
+ {
+ 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
+ #ifdef CONFIG_X86_64
+-	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
+-		iommu_pass_through)
+-	       swiotlb = 1;
++	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
++		swiotlb = 1;
+ #endif
+ 	if (xen_wants_swiotlb())
+ 		swiotlb = 1;
 --- linux-2.6.29.x86_64/arch/x86/xen/Makefile.orig	2009-04-24 22:54:26.000000000 +0100
 +++ linux-2.6.29.x86_64/arch/x86/xen/Makefile	2009-04-26 16:46:57.000000000 +0100
 @@ -4,6 +4,10 @@

xen.pvops.pre.patch:
 b/arch/x86/include/asm/paravirt.h |    3 ---
 b/arch/x86/kernel/pci-swiotlb.c   |    5 +++--
 b/arch/x86/kernel/process_32.c    |    3 +--
 b/arch/x86/pci/common.c           |   16 ----------------
 drivers/pci/pci.h                 |    2 --
 5 files changed, 4 insertions(+), 25 deletions(-)

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -p -r1.1.2.15 -r1.1.2.16
--- xen.pvops.pre.patch	8 Aug 2009 18:06:06 -0000	1.1.2.15
+++ xen.pvops.pre.patch	10 Aug 2009 21:22:20 -0000	1.1.2.16
@@ -2,6 +2,8 @@ temporarily revert various Fedora change
 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-intel-iommu-updates.patch - arch/x86/kernel/pci-swiotlb.c
+linux-2.6-pci-cacheline-sizing.patch - arch/x86/pci/common.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
@@ -72,3 +74,19 @@ index 2202b62..f371fe8 100644
  	pcibios_resource_survey();
  
  	if (pci_bf_sort >= pci_force_bf)
+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
++++ b/arch/x86/kernel/pci-swiotlb.c
+@@ -71,8 +71,9 @@ void __init pci_swiotlb_init(void)
+ {
+ 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
+ #ifdef CONFIG_X86_64
+-	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
+-		swiotlb = 1;
++	if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
++		iommu_pass_through)
++	       swiotlb = 1;
+ #endif
+ 	if (swiotlb_force)
+ 		swiotlb = 1;



From twaugh at fedoraproject.org  Mon Aug 10 21:29:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 10 Aug 2009 21:29:16 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-getdevices.patch, NONE,
	1.1 system-config-printer.spec, 1.272, 1.273
Message-ID: <20090810212916.5A8A011C0344@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-serv17021

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-getdevices.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
- Added patch for cupspk DevicesGet method call.


system-config-printer-getdevices.patch:
 cupspk.py |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-getdevices.patch ---
diff -up system-config-printer-1.1.11/cupspk.py.getdevices system-config-printer-1.1.11/cupspk.py
--- system-config-printer-1.1.11/cupspk.py.getdevices	2009-08-05 11:33:24.000000000 +0100
+++ system-config-printer-1.1.11/cupspk.py	2009-08-07 18:05:45.528421465 +0100
@@ -300,7 +300,53 @@ class Connection:
 #    getPPDs
 #    getServerPPD
 #    getDocument
-#    getDevices
+
+
+    def getDevices(self, *args, **kwds):
+        use_pycups = False
+        pk_args = ()
+
+        result = self._call_with_pk_and_fallback(use_pycups,
+                                                 'DevicesGet', pk_args,
+                                                 self._connection.getDevices,
+                                                 *args, **kwds)
+
+        result_str = {}
+        if result != None:
+            for i in result.keys():
+                if type(i) == dbus.String:
+                    result_str[str(i)] = str(result[i])
+                else:
+                    result_str[i] = result[i]
+
+        # cups-pk-helper returns all devices in one dictionary.
+        # Keys of different devices are distinguished by ':n' postfix.
+
+        devices = {}
+        n = 0
+        postfix = ':' + str (n)
+        device_keys = [x for x in result_str.keys() if x.endswith(postfix)]
+        while len (device_keys) > 0:
+
+            device_uri = None
+            device_dict = {}
+            for i in device_keys:
+                key = i[:len(i)-len(postfix)]
+                if key != 'device-uri':
+                    device_dict[key] = result_str[i]
+                else:
+                    device_uri = result_str[i]
+
+            if device_uri != None:
+                devices[device_uri] = device_dict
+
+            n += 1
+            postfix = ':' + str (n)
+            device_keys = [x for x in result_str.keys() if x.endswith(postfix)]
+
+        return devices
+
+
 #    getJobs
 #    getJobAttributes
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- system-config-printer.spec	7 Aug 2009 17:26:31 -0000	1.272
+++ system-config-printer.spec	10 Aug 2009 21:29:16 -0000	1.273
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-getdevices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -62,6 +63,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .getdevices
 
 %build
 %configure
@@ -164,6 +166,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
+- Added patch for cupspk DevicesGet method call.
+
 * Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
 - 1.1.11:
   - Several udev-configure-printer fixes.



From scop at fedoraproject.org  Mon Aug 10 21:29:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 21:29:32 +0000 (UTC)
Subject: rpms/giggle/devel .cvsignore, 1.7, 1.8 giggle.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20090810212932.61C5611C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/giggle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17085

Modified Files:
	.cvsignore giggle.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.91-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Apr 2009 20:40:51 -0000	1.7
+++ .cvsignore	10 Aug 2009 21:29:32 -0000	1.8
@@ -1 +1 @@
-giggle-0.4.91.tar.gz
+giggle-0.4.91.tar.bz2


Index: giggle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/giggle.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- giggle.spec	25 Jul 2009 00:09:28 -0000	1.16
+++ giggle.spec	10 Aug 2009 21:29:32 -0000	1.17
@@ -1,12 +1,12 @@
 Name:          giggle
 Version:       0.4.91
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       A Gtk frontend to git
 
 Group:         Development/Tools
 License:       GPLv2+
 URL:           http://live.gnome.org/giggle
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/giggle/0.4/%{name}-%{version}.tar.gz
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/giggle/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: intltool
@@ -99,6 +99,9 @@ fi
 %{_includedir}/giggle/
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.4.91-3
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/giggle/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Apr 2009 20:40:51 -0000	1.7
+++ sources	10 Aug 2009 21:29:32 -0000	1.8
@@ -1 +1 @@
-ea88213fa3c9cbf5c571dd17b0e430ea  giggle-0.4.91.tar.gz
+0f7acd58dcaec1ed7e0668d434b50997  giggle-0.4.91.tar.bz2



From mclasen at fedoraproject.org  Mon Aug 10 21:30:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 21:30:12 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.25, 1.26 brasero.spec, 1.57,
	1.58 sources, 1.25, 1.26
Message-ID: <20090810213012.6E01011C0498@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17236

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	28 Jul 2009 04:21:12 -0000	1.25
+++ .cvsignore	10 Aug 2009 21:30:12 -0000	1.26
@@ -1 +1 @@
-brasero-2.27.5.tar.bz2
+brasero-2.27.90.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- brasero.spec	3 Aug 2009 22:49:31 -0000	1.57
+++ brasero.spec	10 Aug 2009 21:30:12 -0000	1.58
@@ -1,6 +1,6 @@
 Name:      brasero
-Version:   2.27.5
-Release:   2%{?dist}
+Version:   2.27.90
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -205,6 +205,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Fix a nautilus segfault when burning  
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	28 Jul 2009 04:21:12 -0000	1.25
+++ sources	10 Aug 2009 21:30:12 -0000	1.26
@@ -1 +1 @@
-f995c48b2826e7ed83623889d8914799  brasero-2.27.5.tar.bz2
+e4fa8381d3fbbc869ac4fb5da853fda2  brasero-2.27.90.tar.bz2



From mclasen at fedoraproject.org  Mon Aug 10 21:37:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 21:37:30 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.55, 1.56 orca.spec, 1.91, 1.92 sources,
	1.56, 1.57
Message-ID: <20090810213730.B459611C0344@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18613

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	28 Jul 2009 15:29:13 -0000	1.55
+++ .cvsignore	10 Aug 2009 21:37:30 -0000	1.56
@@ -1 +1 @@
-orca-2.27.5.tar.bz2
+orca-2.27.90.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- orca.spec	28 Jul 2009 17:05:00 -0000	1.91
+++ orca.spec	10 Aug 2009 21:37:30 -0000	1.92
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.27.5
+Version:	2.27.90
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -104,6 +104,9 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	28 Jul 2009 15:29:13 -0000	1.56
+++ sources	10 Aug 2009 21:37:30 -0000	1.57
@@ -1 +1 @@
-2fe5b820ef12ae08608029760c097712  orca-2.27.5.tar.bz2
+87e039760fbd5df9fccab4bc21328f6a  orca-2.27.90.tar.bz2



From mclasen at fedoraproject.org  Mon Aug 10 21:40:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 10 Aug 2009 21:40:41 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.58,1.59
Message-ID: <20090810214041.9BDB211C0498@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18886

Modified Files:
	brasero.spec 
Log Message:
drop obsolete patch



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- brasero.spec	10 Aug 2009 21:30:12 -0000	1.58
+++ brasero.spec	10 Aug 2009 21:40:41 -0000	1.59
@@ -8,8 +8,6 @@ URL:       http://www.gnome.org/projects
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:    nautilus-segfault.patch
-
 BuildRequires:  glib2-devel >= 2.15.6
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
@@ -87,7 +85,6 @@ developing brasero applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nautilus-segfault
 
 
 %build



From pkgdb at fedoraproject.org  Mon Aug 10 21:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 21:59:09 +0000
Subject: [pkgdb] libprelude: wolfy has requested watchcommits
Message-ID: <20090810215914.55ABE10F8B9@bastion2.fedora.phx.redhat.com>

wolfy has requested the watchcommits acl on libprelude (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libprelude



From pkgdb at fedoraproject.org  Mon Aug 10 21:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 10 Aug 2009 21:59:10 +0000
Subject: [pkgdb] libprelude: wolfy has requested watchbugzilla
Message-ID: <20090810215915.1790F10F8AD@bastion2.fedora.phx.redhat.com>

wolfy has requested the watchbugzilla acl on libprelude (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libprelude



From jkeating at fedoraproject.org  Mon Aug 10 22:02:36 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 10 Aug 2009 22:02:36 +0000 (UTC)
Subject: rpms/pungi/devel .cvsignore, 1.66, 1.67 import.log, 1.17,
	1.18 pungi.spec, 1.74, 1.75 sources, 1.69, 1.70
Message-ID: <20090810220236.A170811C0344@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/pungi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20842/devel

Modified Files:
	.cvsignore import.log pungi.spec sources 
Log Message:
Import new build.  Overwrite releng auto build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	21 May 2009 17:42:08 -0000	1.66
+++ .cvsignore	10 Aug 2009 22:02:36 -0000	1.67
@@ -1 +1 @@
-pungi-2.0.16.tar.bz2
+pungi-2.0.17.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	21 May 2009 17:42:08 -0000	1.17
+++ import.log	10 Aug 2009 22:02:36 -0000	1.18
@@ -15,3 +15,4 @@ pungi-2_0_13-1_fc11:HEAD:pungi-2.0.13-1.
 pungi-2_0_14-1_fc11:HEAD:pungi-2.0.14-1.fc11.src.rpm:1239664741
 pungi-2_0_15-1_fc11:HEAD:pungi-2.0.15-1.fc11.src.rpm:1242758222
 pungi-2_0_16-1_fc11:HEAD:pungi-2.0.16-1.fc11.src.rpm:1242927301
+pungi-2_0_17-1_fc11:HEAD:pungi-2.0.17-1.fc11.src.rpm:1249941703


Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- pungi.spec	26 Jul 2009 19:39:35 -0000	1.74
+++ pungi.spec	10 Aug 2009 22:02:36 -0000	1.75
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.16
-Release:        2%{?dist}
+Version:        2.0.17
+Release:        1%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
@@ -56,8 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 10 2009 Jesse Keating <jkeating at redhat.com> - 2.0.17-1
+- Fix pkgorder to not conflict with yum internals.
+- Remove dead code from splittree
 
 * Thu May 21 2009 Jesse Keating <jkeating at redhat.com> - 2.0.16-1
 - Fix boot.iso being on DVD images


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	21 May 2009 17:42:09 -0000	1.69
+++ sources	10 Aug 2009 22:02:36 -0000	1.70
@@ -1 +1 @@
-dcee82689f8948da747ce370d684aa71  pungi-2.0.16.tar.bz2
+ddda59bb1eaaa9ae82818c0d598ba340  pungi-2.0.17.tar.bz2



From scop at fedoraproject.org  Mon Aug 10 22:15:58 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 10 Aug 2009 22:15:58 +0000 (UTC)
Subject: rpms/gsh/devel .cvsignore,1.2,1.3 gsh.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090810221558.EACA611C0344@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22969

Modified Files:
	.cvsignore gsh.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3-8
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsh/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jan 2009 15:07:34 -0000	1.2
+++ .cvsignore	10 Aug 2009 22:15:57 -0000	1.3
@@ -1 +1 @@
-gsh-0.3.tar.gz
+gsh-0.3.tar.bz2


Index: gsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsh/devel/gsh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gsh.spec	25 Jul 2009 01:32:46 -0000	1.3
+++ gsh.spec	10 Aug 2009 22:15:57 -0000	1.4
@@ -2,10 +2,10 @@
 
 Name:           gsh
 Version:        0.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Group Shell - aggregate several remote shells into one
 URL:            http://guichaz.free.fr/gsh/
-Source0:        http://guichaz.free.fr/gsh/files/%{name}-%{version}.tar.gz
+Source0:        http://guichaz.free.fr/gsh/files/%{name}-%{version}.tar.bz2
 License:        GPLv2+
 Group:          Applications/Internet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING NEWS README
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3-8
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jan 2009 15:07:34 -0000	1.2
+++ sources	10 Aug 2009 22:15:57 -0000	1.3
@@ -1 +1 @@
-6b925fe21bb84606b47a9a29d1eb88fb  gsh-0.3.tar.gz
+e15fbc254f9e8bcb4eb44071d846de98  gsh-0.3.tar.bz2



From gemi at fedoraproject.org  Mon Aug 10 22:43:21 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Mon, 10 Aug 2009 22:43:21 +0000 (UTC)
Subject: rpms/erlang/devel .cvsignore, 1.13, 1.14 erlang.spec, 1.40,
	1.41 sources, 1.13, 1.14
Message-ID: <20090810224321.E5D4C11C0344@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27040

Modified Files:
	.cvsignore erlang.spec sources 
Log Message:
new release R13B



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	1 Mar 2009 15:22:27 -0000	1.13
+++ .cvsignore	10 Aug 2009 22:43:20 -0000	1.14
@@ -1,3 +1,3 @@
-otp_src_R12B-5.tar.gz
-otp_doc_html_R12B-5.tar.gz
-otp_doc_man_R12B-5.tar.gz
+otp_src_R13B01.tar.gz
+otp_doc_html_R13B01.tar.gz
+otp_doc_man_R13B01.tar.gz


Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- erlang.spec	24 Jul 2009 22:15:28 -0000	1.40
+++ erlang.spec	10 Aug 2009 22:43:20 -0000	1.41
@@ -1,34 +1,34 @@
-%define ver R12B
-%define rel 6
+%define ver R13B
+%define rel 01
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.7%{?dist}
+Release:        %{rel}.1%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
 License:        ERPL
 URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz
-Source1:	http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz
-Source2:	http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz
-Patch0:		otp-links.patch
-Patch1:		otp-install.patch
-Patch2:		otp-rpath.patch
-Patch3:         otp-sslrpath.patch
+Source:         http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz
+Source1:        http://www.erlang.org/download/otp_doc_html_%{ver}%{rel}.tar.gz
+Source2:        http://www.erlang.org/download/otp_doc_man_%{ver}%{rel}.tar.gz
+Patch0:         otp-links.patch
+Patch1:         otp-install.patch
+Patch2:         otp-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:  unixODBC-devel
+BuildRequires:  wxGTK-devel
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
 BuildRequires:  gd-devel
-BuildRequires:	java-1.5.0-gcj-devel
+BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:  flex
 BuildRequires:	m4
 
-Requires:	tk
+Requires:       tk
 
 %description 
 Erlang is a general-purpose programming language and runtime
@@ -46,20 +46,19 @@ Documentation for Erlang.
 
 
 %prep
-%setup -q -n otp_src_%{ver}-%{rel}
+%setup -q -n otp_src_%{ver}%{rel}
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
 %patch2 -p1 -b .rpath
-#%patch3 -p1 -b .sslrpath
 
 # enable dynamic linking for ssl
 sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure
-sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile
+#sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile
 # fix for newer glibc version
 sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c
 # use gcc -shared instead of ld
-sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in
-sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in
+#sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in
+#sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in
 
 
 
@@ -88,6 +87,7 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang -n
 mkdir -p erlang_doc
 tar -C erlang_doc -zxf %{SOURCE1}
 tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2}
+gzip $RPM_BUILD_ROOT/%{_libdir}/erlang/man/man*/*
 
 # make links to binaries
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Gerard Milmeister <gemi at bluewin.ch> - R13B-01.1
+- update to R13B01
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - R12B-6.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Mar 2009 15:22:27 -0000	1.13
+++ sources	10 Aug 2009 22:43:20 -0000	1.14
@@ -1,3 +1,3 @@
-3751ea3fea669d2b25c67eeb883734bb  otp_src_R12B-5.tar.gz
-fb0c5454bbd865e881b6712295f6d41f  otp_doc_html_R12B-5.tar.gz
-6231cb172847040395cc34b20781aa3b  otp_doc_man_R12B-5.tar.gz
+b3db581de6c13e1ec93d74e54a7b4231  otp_src_R13B01.tar.gz
+42cb55bbfa5dc071fd56034615072f7a  otp_doc_html_R13B01.tar.gz
+fa8f96159bd9a88aa2fb9e4d79d7affe  otp_doc_man_R13B01.tar.gz



From makowski at fedoraproject.org  Mon Aug 10 22:44:03 2009
From: makowski at fedoraproject.org (Philippe Makowski)
Date: Mon, 10 Aug 2009 22:44:03 +0000 (UTC)
Subject: rpms/firebird/devel firebird-edit-fix.patch, NONE, 1.1 firebird.spec,
	1.8, 1.9
Message-ID: <20090810224403.8120F11C0344@cvs1.fedora.phx.redhat.com>

Author: makowski

Update of /cvs/pkgs/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27196

Modified Files:
	firebird.spec 
Added Files:
	firebird-edit-fix.patch 
Log Message:
* Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
- build it against system edit lib
- set correct setuid for Classic lock manager
- set correct permission for /var/run/firebird


firebird-edit-fix.patch:
 builds/posix/make.defaults |    2 +-
 configure.in               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE firebird-edit-fix.patch ---
diff -Naur Firebird-2.1.1.17910-0/builds/posix/make.defaults Firebird-2.1.1.17910-0.oden/builds/posix/make.defaults
--- Firebird-2.1.1.17910-0/builds/posix/make.defaults	2008-05-27 05:26:39.000000000 -0400
+++ Firebird-2.1.1.17910-0.oden/builds/posix/make.defaults	2008-07-18 09:54:40.000000000 -0400
@@ -230,7 +230,7 @@
 
 ifeq ($(EDITLINE_FLG),Y)
   ifeq ($(STD_EDITLINE), true)
-	LIBEDITLINE := -leditline
+	LIBEDITLINE := -ledit
   else
 	LIBEDITLINE := $(LIB)/libeditline.a
   endif
diff -Naur Firebird-2.1.1.17910-0/configure.in Firebird-2.1.1.17910-0.oden/configure.in
--- Firebird-2.1.1.17910-0/configure.in	2008-05-27 05:26:28.000000000 -0400
+++ Firebird-2.1.1.17910-0.oden/configure.in	2008-07-18 09:54:25.000000000 -0400
@@ -399,7 +399,7 @@
 # not need editline in default libs, but need to test for its presence
 saveLIBS=$LIBS
 if test "$STD_EDITLINE" = "true"; then
-  AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
+  AC_CHECK_LIB(edit, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
 fi
 LIBS=$saveLIBS



Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- firebird.spec	8 Aug 2009 17:29:18 -0000	1.8
+++ firebird.spec	10 Aug 2009 22:44:03 -0000	1.9
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -19,7 +19,7 @@ Source1:	firebird-logrotate
 Source2:	README.Fedora
 
 Patch0:		firebird-mcpu-to-mtune.patch
-#Patch1:		firebird-2.1.2-doc.patch
+Patch1:		firebird-edit-fix.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
@@ -32,6 +32,7 @@ BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	libicu-devel
+BuildRequires:	libedit-devel
 BuildRequires:	gcc-c++
 
 Requires:	%{name}-arch = %{version}-%{release}
@@ -129,7 +130,7 @@ Multi-process, local client libraries fo
 iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/README.intl					-o	./doc/README.intl
 # backport patch
 %patch2
-#%patch1
+%patch1 -p1
 %patch0
 %patch3
 %patch4
@@ -150,13 +151,9 @@ export LDFLAGS='-m32'
 
 %ifarch	ppc64
 autoreconf -vfi
-%configure --prefix=%{fbroot}	\
-		--with-system-icu	
-%else
-./autogen.sh	--prefix=%{fbroot}	\
-		--with-system-icu		
 %endif
-
+NOCONFIGURE=1 ./autogen.sh
+%configure --prefix=%{fbroot} --with-system-icu --with-system-editline
 %ifarch	sparc64 
 sed	"s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@"	-i	./gen/make.platform	
 %endif
@@ -180,14 +177,8 @@ cd ..
 # superserver
 %ifarch	ppc64
 autoreconf -vfi
-%configure --prefix=%{fbroot}	\
-		--enable-superserver	\
-		--with-system-icu	
-%else
-./autogen.sh	--prefix=%{fbroot}	\
-		--enable-superserver	\
-		--with-system-icu	
 %endif
+%configure --prefix=%{fbroot} --with-system-icu --with-system-editline --enable-superserver
 		
 %ifarch	sparc64 
 sed	"s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@"	-i	./gen/make.platform	
@@ -258,18 +249,18 @@ cd	%{buildroot}
 major2=`echo %{major} | sed 's|\.[0-9]*$||'`
 major1=`echo ${major2} | sed 's|\.[0-9]*$||'` 
 cd	%{buildroot}%{fbroot}/lib/
-ln	-s	%{fbroot}/lib/libfbembed.so.%{major}	libfbembed.so.%{major2} 
-ln	-s	%{fbroot}/lib/libfbembed.so.%{major2} 	libfbembed.so
-ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libfbclient.so.%{major1} 
-ln	-s	%{fbroot}/lib/libfbclient.so.%{major1}	libfbclient.so
+ln	-s	%{fbroot}/lib/libfbembed.so.%{major}	libfbembed.so.${major2} 
+ln	-s	%{fbroot}/lib/libfbembed.so.${major2} 	libfbembed.so
+ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libfbclient.so.${major1} 
+ln	-s	%{fbroot}/lib/libfbclient.so.${major1}	libfbclient.so
 cd	%{buildroot}
 
 cd	%{buildroot}%{_libdir}
 ln	-s	%{fbroot}/lib/libfbembed.so	libfbembed.so
-ln	-s	%{fbroot}/lib/libfbembed.so.%{major2}	libfbembed.so.%{major2}
+ln	-s	%{fbroot}/lib/libfbembed.so.${major2}	libfbembed.so.${major2}
 ln	-s	%{fbroot}/lib/libfbembed.so.%{major}	libfbembed.so.%{major}
 ln	-s	%{fbroot}/lib/libfbclient.so	libfbclient.so
-ln	-s	%{fbroot}/lib/libfbclient.so.%{major1}	libfbclient.so.%{major1}
+ln	-s	%{fbroot}/lib/libfbclient.so.${major1}	libfbclient.so.${major1}
 ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libfbclient.so.%{major}
 ln	-s	%{fbroot}/lib/libfbclient.so.%{major}	libgds.so.0
 ln	-s	%{fbroot}/lib/libfbclient.so	libgds.so
@@ -444,7 +435,7 @@ fi
 %{_bindir}/gfix
 %{_bindir}/nbackup
 %{_bindir}/gstat-fb
-%dir %attr(0755,%{name},%{name}) %{_var}/run/%{name}
+%dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
 %defattr(0755,root,root,0755)
 %{fbroot}/run
 
@@ -500,7 +491,6 @@ fi
 %dir %{fbroot}/bin-classic
 %dir %{fbroot}/UDF-classic
 %defattr(0755,root,root,0755)
-%{fbroot}/bin-classic/*
 %{fbroot}/bin-classic/changeDBAPassword.sh
 %{fbroot}/bin-classic/changeGdsLibraryCompatibleLink.sh
 %{fbroot}/bin-classic/changeRunUser.sh
@@ -543,8 +533,10 @@ fi
 
 
 %changelog
-* Sat Aug 08 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-3
+* Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
+- build it against system edit lib
 - set correct setuid for Classic lock manager
+- set correct permission for /var/run/firebird
 
 * Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
 - rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)



From jkeating at fedoraproject.org  Mon Aug 10 23:09:23 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 10 Aug 2009 23:09:23 +0000 (UTC)
Subject: common Makefile.common,1.132,1.133
Message-ID: <20090810230924.18A5C11C0344@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29275

Modified Files:
	Makefile.common 
Log Message:
Add a tag-request target for use with fedora-hosted



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- Makefile.common	10 Aug 2009 14:45:16 -0000	1.132
+++ Makefile.common	10 Aug 2009 23:09:22 -0000	1.133
@@ -156,6 +156,7 @@ WGET	?= $(shell if test -f /usr/bin/wget
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
 BUILD_CLIENT ?= $(shell which koji 2>/dev/null)
 BODHI_CLIENT ?= $(shell which bodhi 2>/dev/null)
+FEDORAHOSTED ?= $(shell which fedora-hosted 2>/dev/null)
 
 # RPM with all the overrides in place; you can override this in your
 # .cvspkgsrc also, to use a default rpm setup
@@ -510,6 +511,33 @@ endif
 
 update: bodhi
 
+tag-request: build-check $(COMMON_DIR)/branches
+	@if [ ! -x "$(FEDORAHOSTED)" ]; then echo "Must have fedora-packager installed"; exit 1; fi
+	@echo -e "\
+# Tag target (default is target of the CVS branch)\n\
+target=$(TARGET)\n\n\
+# Description of your tag request\n\
+notes=Here is where you give a description of what you want to change,\n\
+rational for why the change is important enough to break the freeze,\n\
+impact of not accepting the change, and what testing has been done.\n\
+Or if this is a tag request for updates, just the info about the updates.\
+" > fedora-hosted.template
+	@sed -e '/^#/d' < fedora-hosted.template > fedora-hosted.template.orig
+	@if [ -z "$$EDITOR" ]; then vi fedora-hosted.template; else $$EDITOR fedora-hosted.template; fi
+	@if [ -n "`sed -e '/^#/d' < fedora-hosted.template | diff fedora-hosted.template.orig -`" ]; then \
+		target=`grep '^target=' fedora-hosted.template | sed -e 's/target=//'` \
+		component=`echo $(TARGET) |grep -q epel && echo "epel" || echo "koji"`\
+		descript="{{{\
+`grep -v -e '^target=' -e '^#' fedora-hosted.template | sed -e 's/notes=//'`"; \
+		$(FEDORAHOSTED) -u $(USER) -P rel-eng new-ticket -s \
+			"Tag request $(NAME)-$(VERSION)-$(RELEASE) for $$target" \
+			-C $$component -d "$$descript"; \
+	else \
+		echo "Tag request aborted!"; \
+	fi
+	@rm -f fedora-hosted.template{,.orig}
+
+
 cvsurl:
 	@echo '$(CVS_URL)'
 
@@ -654,6 +682,7 @@ help:
 	@echo "	unused-fedora-patches   Print Fedora patches not used by Patch and/or ApplyPatch directives"
 	@echo "	gimmespec		Print the name of the specfile"
 	@echo "	update			Submit $(NAME)-$(VERSION)-$(RELEASE) as an update for $(BRANCH)"
+	@echo "	tag-request		Submit $(NAME)-$(VERSION)-$(RELEASE) as an tag-request for $(BRANCH)"
 	@echo
 	@echo "For bug reports or patch submissions, please use the issue tracker at:"
 	@echo "https://fedorahosted.org/fedora-infrastructure"



From bpepple at fedoraproject.org  Mon Aug 10 23:15:08 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 10 Aug 2009 23:15:08 +0000 (UTC)
Subject: rpms/SDL_image/devel .cvsignore, 1.5, 1.6 SDL_image.spec, 1.19,
	1.20 sources, 1.5, 1.6 SDL_image-IMG_lbm.patch, 1.1,
	NONE SDL_image-buffer-overflow.patch, 1.1, NONE
Message-ID: <20090810231508.7C5E811C0344@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/SDL_image/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30503

Modified Files:
	.cvsignore SDL_image.spec sources 
Removed Files:
	SDL_image-IMG_lbm.patch SDL_image-buffer-overflow.patch 
Log Message:
* Sun Aug  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-1
- Update to 1.2.7.
- Drop IMG_lbm patch.  Fixed upstream.
- Drop buffer overflow patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_image/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Jul 2007 23:22:52 -0000	1.5
+++ .cvsignore	10 Aug 2009 23:15:07 -0000	1.6
@@ -1 +1 @@
-SDL_image-1.2.6.tar.gz
+SDL_image-1.2.7.tar.gz


Index: SDL_image.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_image/devel/SDL_image.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- SDL_image.spec	24 Jul 2009 16:18:39 -0000	1.19
+++ SDL_image.spec	10 Aug 2009 23:15:08 -0000	1.20
@@ -1,14 +1,12 @@
 Name:		SDL_image
-Version:	1.2.6
-Release:	8%{?dist}
+Version:	1.2.7
+Release:	1%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://www.libsdl.org/projects/SDL_image/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
-Patch0:		%{name}-buffer-overflow.patch
-Patch1:		%{name}-IMG_lbm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	SDL-devel >= 1.2.10
@@ -38,8 +36,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p2 -b .overflow
-%patch1 -p2 -b .ilbm
+
 
 %build
 # XCF support is crashy in 1.2.4
@@ -85,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-1
+- Update to 1.2.7.
+- Drop IMG_lbm patch.  Fixed upstream.
+- Drop buffer overflow patch.  Fixed upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_image/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Jul 2007 23:22:52 -0000	1.5
+++ sources	10 Aug 2009 23:15:08 -0000	1.6
@@ -1 +1 @@
-b866dc4f647517bdaf57f6ffdefd013e  SDL_image-1.2.6.tar.gz
+a729ff61f74f0a45ec7fe36354cf938e  SDL_image-1.2.7.tar.gz


--- SDL_image-IMG_lbm.patch DELETED ---


--- SDL_image-buffer-overflow.patch DELETED ---



From salimma at fedoraproject.org  Mon Aug 10 23:21:23 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 10 Aug 2009 23:21:23 +0000 (UTC)
Subject: rpms/deskbar-applet/devel deskbar-applet.spec, 1.83,
	1.84 deskbar-applet-2.26.0-gapplet.patch, 1.1,
	NONE deskbar-applet-2.26.0-py_sitearch.patch, 1.1,
	NONE deskbar-applet-2.26.0-urlopener.patch, 1.1, NONE
Message-ID: <20090810232123.6E01611C0344@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31298

Modified Files:
	deskbar-applet.spec 
Removed Files:
	deskbar-applet-2.26.0-gapplet.patch 
	deskbar-applet-2.26.0-py_sitearch.patch 
	deskbar-applet-2.26.0-urlopener.patch 
Log Message:
* Mon Aug 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.27.90-1
- Update to 2.27.90



Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- deskbar-applet.spec	24 Jul 2009 20:09:50 -0000	1.83
+++ deskbar-applet.spec	10 Aug 2009 23:21:23 -0000	1.84
@@ -1,21 +1,20 @@
 %{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+%{!?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:           deskbar-applet
-Version:        2.26.0
-Release:        4%{?dist}
+Version:        2.27.90
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://live.gnome.org/DeskbarApplet
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.26/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.27/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         %{name}-2.26.0-gapplet.patch
-Patch1:         %{name}-2.26.0-py_sitearch.patch
-Patch2:         %{name}-2.26.0-urlopener.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
 BuildRequires:  libSM-devel gnome-python2-applet desktop-file-utils
@@ -39,13 +38,19 @@ Seaches are handled by a series of plugi
 interface to manage these plugins to provide you with the search results that
 fit your needs.
 
+
+%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 -b .gapplet
-# http://bugzilla.gnome.org/show_activity.cgi?id=578803
-%patch1 -p1 -b .py_sitearch
-# http://bugzilla.gnome.org/show_bug.cgi?id=577649
-%patch2 -p0 -b .urlopener
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -100,18 +105,25 @@ touch --no-create %{_datadir}/icons/hico
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_libdir}/%{name}
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
-%{_libdir}/pkgconfig/%{name}.pc
+%{python_sitelib}/deskbar
 %{python_sitearch}/deskbar
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/omf/deskbar/
 %{_datadir}/gnome/help/deskbar/
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/%{name}.pc
+
 
 %changelog
+* Mon Aug 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.27.90-1
+- Update to 2.27.90
+
 * 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
 


--- deskbar-applet-2.26.0-gapplet.patch DELETED ---


--- deskbar-applet-2.26.0-py_sitearch.patch DELETED ---


--- deskbar-applet-2.26.0-urlopener.patch DELETED ---



From salimma at fedoraproject.org  Mon Aug 10 23:25:01 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 10 Aug 2009 23:25:01 +0000 (UTC)
Subject: rpms/deskbar-applet/devel .cvsignore,1.45,1.46 sources,1.45,1.46
Message-ID: <20090810232501.E15FC11C0344@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31824

Modified Files:
	.cvsignore sources 
Log Message:
Commit updated source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	8 Apr 2009 13:53:37 -0000	1.45
+++ .cvsignore	10 Aug 2009 23:25:01 -0000	1.46
@@ -1 +1 @@
-deskbar-applet-2.26.0.tar.bz2
+deskbar-applet-2.27.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	8 Apr 2009 13:53:37 -0000	1.45
+++ sources	10 Aug 2009 23:25:01 -0000	1.46
@@ -1 +1 @@
-168044d1312bf30e71f2ed587d2bffb6  deskbar-applet-2.26.0.tar.bz2
+2cdc54a8fcee09fcd3f3860df6224e3c  deskbar-applet-2.27.90.tar.bz2



From apevec at fedoraproject.org  Mon Aug 10 23:41:40 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Mon, 10 Aug 2009 23:41:40 +0000 (UTC)
Subject: rpms/collectd/F-11 .cvsignore, 1.7,
	1.8 collectd-4.5.1-configure-OpenIPMI.patch, 1.1,
	1.2 collectd.spec, 1.18, 1.19 sources, 1.7,
	1.8 collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, 1.2, NONE
Message-ID: <20090810234140.D66DD11C0344@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2448

Modified Files:
	.cvsignore collectd-4.5.1-configure-OpenIPMI.patch 
	collectd.spec sources 
Removed Files:
	collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch 
Log Message:
* Tue Aug 11 2009 Alan Pevec <apevec at redhat.com> 4.5.4-1
- New upstream version 4.5.4
  http://collectd.org/news.shtml#news66
- drop collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Mar 2009 23:43:02 -0000	1.7
+++ .cvsignore	10 Aug 2009 23:41:40 -0000	1.8
@@ -1 +1 @@
-collectd-4.5.3.tar.bz2
+collectd-4.5.4.tar.bz2

collectd-4.5.1-configure-OpenIPMI.patch:
 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: collectd-4.5.1-configure-OpenIPMI.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-11/collectd-4.5.1-configure-OpenIPMI.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- collectd-4.5.1-configure-OpenIPMI.patch	30 Nov 2008 11:44:01 -0000	1.1
+++ collectd-4.5.1-configure-OpenIPMI.patch	10 Aug 2009 23:41:40 -0000	1.2
@@ -1,29 +1,29 @@
---- configure.ORIG	2008-10-16 22:43:28.000000000 +0200
-+++ configure	2008-11-30 11:30:53.000000000 +0100
-@@ -36831,7 +36831,7 @@
+--- configure.orig	2009-05-09 14:00:51.000000000 +0200
++++ configure	2009-08-11 01:29:42.000000000 +0200
+@@ -39191,7 +39191,7 @@
  then
- 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
- echo $ECHO_N "checking for libOpenIPMIpthread... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
+ $as_echo_n "checking for libOpenIPMIpthread... " >&6; }
 -	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
-+	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
++ 	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
  	if test "$?" != "0"
  	then
  		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
-@@ -36844,7 +36844,7 @@
+@@ -39204,7 +39204,7 @@
  then
- 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
- echo $ECHO_N "checking for libOpenIPMIpthread CFLAGS... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
+ $as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; }
 -	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
-+	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
++ 	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
  	if test "$?" = "0"
  	then
  		with_libopenipmipthread_cflags="$temp_result"
-@@ -36860,7 +36860,7 @@
+@@ -39220,7 +39220,7 @@
  then
- 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
- echo $ECHO_N "checking for libOpenIPMIpthread LDFLAGS... $ECHO_C" >&6; }
+ 	{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
+ $as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; }
 -	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
-+	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
++ 	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
  	if test "$?" = "0"
  	then
  		with_libopenipmipthread_ldflags="$temp_result"


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-11/collectd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- collectd.spec	3 Mar 2009 15:26:08 -0000	1.18
+++ collectd.spec	10 Aug 2009 23:41:40 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.5.3
-Release: 2%{?dist}
+Version: 4.5.4
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -10,8 +10,6 @@ Source: http://collectd.org/files/%{name
 Patch0: %{name}-4.5.1-include-collectd.d.patch
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
 Patch1: %{name}-4.5.1-configure-OpenIPMI.patch
-# posted upstream
-Patch2: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -153,7 +151,6 @@ This plugin collects information from vi
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -410,6 +407,11 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Alan Pevec <apevec at redhat.com> 4.5.4-1
+- New upstream version 4.5.4
+  http://collectd.org/news.shtml#news66
+- drop collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
+
 * Tue Mar 03 2009 Alan Pevec <apevec at redhat.com> 4.5.3-2
 - patch for strict-aliasing issue in liboping.c
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Mar 2009 23:43:02 -0000	1.7
+++ sources	10 Aug 2009 23:41:40 -0000	1.8
@@ -1 +1 @@
-f368200c4bedd64baba46094906e81ee  collectd-4.5.3.tar.bz2
+b59500d1346c16a63ba10cbc6c0cf7df  collectd-4.5.4.tar.bz2


--- collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch DELETED ---



From salimma at fedoraproject.org  Mon Aug 10 23:53:36 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 10 Aug 2009 23:53:36 +0000 (UTC)
Subject: rpms/deskbar-applet/devel deskbar-applet-2.27.90-py_sitearch.patch, 
	NONE, 1.1 deskbar-applet.spec, 1.84, 1.85
Message-ID: <20090810235336.C9A6911C0344@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3870

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-2.27.90-py_sitearch.patch 
Log Message:
* Mon Aug 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.27.90-2
- Updated site-packages location patch


deskbar-applet-2.27.90-py_sitearch.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE deskbar-applet-2.27.90-py_sitearch.patch ---
--- deskbar-applet-2.27.90/configure.py_sitearch	2009-08-10 14:38:43.000000000 -0400
+++ deskbar-applet-2.27.90/configure	2009-08-10 19:47:00.633150935 -0400
@@ -14756,7 +14756,7 @@
      else
        py_prefix_arg=",prefix='$prefix'"
      fi
-     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
+     am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- deskbar-applet.spec	10 Aug 2009 23:21:23 -0000	1.84
+++ deskbar-applet.spec	10 Aug 2009 23:53:36 -0000	1.85
@@ -4,7 +4,7 @@
 
 Name:           deskbar-applet
 Version:        2.27.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -13,6 +13,7 @@ URL:            http://live.gnome.org/De
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.27/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
+Patch0:         deskbar-applet-2.27.90-py_sitearch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
@@ -51,6 +52,8 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+# http://bugzilla.gnome.org/show_bug.cgi?id=579499
+%patch0 -p1 -b .py_sitearch
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -108,7 +111,6 @@ touch --no-create %{_datadir}/icons/hico
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_libdir}/%{name}
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
-%{python_sitelib}/deskbar
 %{python_sitearch}/deskbar
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -121,6 +123,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Mon Aug 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.27.90-2
+- Updated site-packages location patch
+
 * Mon Aug 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.27.90-1
 - Update to 2.27.90
 



From bojan at fedoraproject.org  Mon Aug 10 23:53:45 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 10 Aug 2009 23:53:45 +0000 (UTC)
Subject: rpms/viewvc/F-10 viewvc-allow-tar.patch, NONE, 1.1 viewvc.spec, 1.13,
	1.14
Message-ID: <20090810235345.4E28111C0344@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3915

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-allow-tar.patch 
Log Message:
Attempt to fix allow_tar.
Patch by Patrick Monnerat.

viewvc-allow-tar.patch:
 popen.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE viewvc-allow-tar.patch ---
--- lib/popen.py	2009-05-07 08:56:47.000000000 +0200
+++ lib/popen.py.regtread	2009-07-30 20:03:16.000000000 +0200
@@ -307,9 +307,13 @@
   def __init__(self, srcfd, destfile):
     self.srcfd = srcfd
     self.destfile = destfile
+    self.server = destfile.server.self()
     threading.Thread.__init__(self)
 
   def run(self):
+    ts = hasattr(sapi.server, 'registerThread')
+    if ts:
+      sapi.server.registerThread(self.server)
     try:
       while 1:
         s = os.read(self.srcfd, 1024)
@@ -318,6 +322,8 @@
         self.destfile.write(s)
     finally:
       os.close(self.srcfd)
+      if ts:
+        sapi.server.unregisterThread()
 
 class _pipe:
   "Wrapper for a file which can wait() on a child process at close time."


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/viewvc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- viewvc.spec	7 May 2009 06:52:16 -0000	1.13
+++ viewvc.spec	10 Aug 2009 23:53:45 -0000	1.14
@@ -17,7 +17,7 @@
 
 Name:           viewvc
 Version:        1.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -27,6 +27,7 @@ Source0:        http://www.viewvc.org/%{
 Source1:        viewvc.conf
 Source2:        README.httpd
 Patch0:         viewvc-temp-location.patch
+Patch1:         viewvc-allow-tar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -66,6 +67,7 @@ with decent performance when run under A
 %prep
 %setup -q
 %patch0 -p0 -b .temp-location
+%patch1 -p0 -b .allow-tar
 
 %build
 
@@ -147,6 +149,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-2
+- fix allow_tar
+- patch by Patrick Monnerat
+
 * Thu May  7 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-1
 - Bump up to 1.0.8
 



From ajax at fedoraproject.org  Tue Aug 11 00:02:08 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 11 Aug 2009 00:02:08 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.467,1.468
Message-ID: <20090811000208.9C74611C0344@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5158

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 1.6.99-31.20090807
- Move libxf86config.a back to -server-devel
- xserver-1.6.99-show-ugly-cursor.patch: Un-suppress the initial root cursor
  hiding until we figure out what's wrong with gtk in anaconda.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- xorg-x11-server.spec	10 Aug 2009 11:39:55 -0000	1.467
+++ xorg-x11-server.spec	11 Aug 2009 00:02:08 -0000	1.468
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   30.%{gitdate}%{?dist}
+Release:   31.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,6 +82,8 @@ Patch6029: xserver-1.6.1-proc-cmdline.pa
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
+# ajax, please fix me
+Patch9000: xserver-1.6.99-show-ugly-cursor.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -270,6 +272,12 @@ Requires: xorg-x11-proto-devel
 Requires: pkgconfig pixman-devel libpciaccess-devel
 # Virtual provide for transition.  Delete me someday.
 Provides: xorg-x11-server-sdk = %{version}-%{release}
+# XXX doublecheck me
+Provides: libxf86config = %{version}-%{release}
+Obsoletes: libxf86config < 1.6.99-29
+Provides: libxf86config-devel = %{version}-%{release}
+Obsoletes: libxf86config-devel < 1.6.99-29
+
 
 %description devel
 The SDK package provides the developmental files which are necessary for
@@ -286,21 +294,6 @@ BuildArch: noarch
 %description source
 Xserver source code needed to build VNC server (Xvnc)
 
-%package -n libxf86config-static-devel
-Summary: Xorg configuration parser library development files
-Group: Development/Libraries
-Requires: xorg-x11-server-devel = %{version}-%{release}
-Provides: libxf86config-static
-
-Requires: xorg-x11-server-Xorg > 1.6.99-29
-Provides: libxf86config = %{version}-%{release}
-Obsoletes: libxf86config < 1.6.99-29
-Provides: libxf86config-devel = %{version}-%{release}
-Obsoletes: libxf86config-devel < 1.6.99-29
-
-%description -n libxf86config-static-devel
-Xorg configuration parser library development files (static library)
-
 %prep
 %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
@@ -508,6 +501,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/xorg
 %{sdkdir}/*.h
 %{_datadir}/aclocal/xorg-server.m4
+%{_libdir}/libxf86config.a
 %endif
 
 
@@ -515,11 +509,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{xserver_source_dir}
 
-%files -n libxf86config-static-devel
-%defattr(-, root, root, -)
-%{_libdir}/libxf86config.a
-
 %changelog
+* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 1.6.99-31.20090807
+- Move libxf86config.a back to -server-devel
+- xserver-1.6.99-show-ugly-cursor.patch: Un-suppress the initial root cursor
+  hiding until we figure out what's wrong with gtk in anaconda.
+
 * Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-30.20090807
 - goddamit: reapply picify libxf86config.a hopefully
 



From jkeating at fedoraproject.org  Tue Aug 11 00:03:51 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 11 Aug 2009 00:03:51 +0000 (UTC)
Subject: rpms/email2trac/devel email2trac.spec,1.5,1.6
Message-ID: <20090811000351.ABECC11C0344@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/email2trac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5556

Modified Files:
	email2trac.spec 
Log Message:
* Mon Aug 10 2009 Jesse Keating <jkeating at redhat.com> - 0.80-1
- New upstream release



Index: email2trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/email2trac/devel/email2trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- email2trac.spec	24 Jul 2009 22:06:33 -0000	1.5
+++ email2trac.spec	11 Aug 2009 00:03:51 -0000	1.6
@@ -1,8 +1,8 @@
 # This spec file was derived from the upstream .spec file written by
 # Jon Topper <jon at topper dot me dot uk>
 Name:           email2trac
-Version:        0.13
-Release:        6%{?dist}
+Version:        0.80
+Release:        1%{?dist}
 Summary:        Utilities for converting emails to trac tickets
 
 Group:          Applications/Internet
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 10 2009 Jesse Keating <jkeating at redhat.com> - 0.80-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From habig at fedoraproject.org  Tue Aug 11 00:04:53 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Tue, 11 Aug 2009 00:04:53 +0000 (UTC)
Subject: rpms/yum-cron/devel .cvsignore, 1.9, 1.10 import.log, 1.1,
	1.2 sources, 1.9, 1.10 yum-cron.spec, 1.13, 1.14
Message-ID: <20090811000453.6891711C0344@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5729/devel

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
Add ability to check for stale locks to the cron scripts.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Dec 2008 23:08:39 -0000	1.9
+++ .cvsignore	11 Aug 2009 00:04:53 -0000	1.10
@@ -1 +1 @@
-yum-cron-0.8.3.tar.gz
+yum-cron-0.8.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2008 23:08:39 -0000	1.1
+++ import.log	11 Aug 2009 00:04:53 -0000	1.2
@@ -1 +1,2 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Dec 2008 23:08:39 -0000	1.9
+++ sources	11 Aug 2009 00:04:53 -0000	1.10
@@ -1 +1 @@
-e0f8aba0a21739cf1120e5096cd28fad  yum-cron-0.8.3.tar.gz
+c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- yum-cron.spec	27 Jul 2009 08:57:11 -0000	1.13
+++ yum-cron.spec	11 Aug 2009 00:04:53 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.3
-Release: 3%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -91,8 +91,8 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Aug 5 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-1
+- deal with stale lockdirs
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From ajax at fedoraproject.org  Tue Aug 11 00:07:45 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 11 Aug 2009 00:07:45 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-show-ugly-cursor.patch,
	NONE, 1.1
Message-ID: <20090811000745.CBAF711C0344@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6300

Added Files:
	xserver-1.6.99-show-ugly-cursor.patch 
Log Message:
* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 1.6.99-31.20090807
- Move libxf86config.a back to -server-devel
- xserver-1.6.99-show-ugly-cursor.patch: Un-suppress the initial root cursor
  hiding until we figure out what's wrong with gtk in anaconda.


xserver-1.6.99-show-ugly-cursor.patch:
 cursor.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE xserver-1.6.99-show-ugly-cursor.patch ---
>From 33856dc328da576bbb96602df93e7e35ad36bd01 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 10 Aug 2009 19:59:25 -0400
Subject: [PATCH] un-suppress the initial root cursor momentarily

---
 xfixes/cursor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index acc703a..f88476a 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -134,7 +134,7 @@ typedef struct _CursorScreen {
 #define Unwrap(as,s,elt,backup)	(((backup) = (s)->elt), (s)->elt = (as)->elt)
 
 /* The cursor doesn't show up until the first XDefineCursor() */
-static Bool CursorVisible = FALSE;
+static Bool CursorVisible = TRUE;
 
 Bool EnableCursor = TRUE;
 
-- 
1.6.2.2




From bpepple at fedoraproject.org  Tue Aug 11 00:08:56 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 11 Aug 2009 00:08:56 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.49, 1.50 sources, 1.49,
	1.50 telepathy-gabble.spec, 1.60, 1.61
Message-ID: <20090811000856.00A7511C0344@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Sun Aug  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.32-1
- Update to 0.7.32.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	22 Jul 2009 17:57:41 -0000	1.49
+++ .cvsignore	11 Aug 2009 00:08:55 -0000	1.50
@@ -1 +1 @@
-telepathy-gabble-0.7.31.tar.gz
+telepathy-gabble-0.7.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	22 Jul 2009 17:57:42 -0000	1.49
+++ sources	11 Aug 2009 00:08:55 -0000	1.50
@@ -1 +1 @@
-d7e1b9fa3eeff23f3d425c721e850e4c  telepathy-gabble-0.7.31.tar.gz
+9341e04d213129dbb797cda9f2fe60c0  telepathy-gabble-0.7.32.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- telepathy-gabble.spec	27 Jul 2009 05:43:57 -0000	1.60
+++ telepathy-gabble.spec	11 Aug 2009 00:08:55 -0000	1.61
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
-Version:        0.7.31
-Release:        2%{?dist}
+Version:        0.7.32
+Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.32-1
+- Update to 0.7.32.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.31-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tbreeds at fedoraproject.org  Tue Aug 11 00:45:05 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Tue, 11 Aug 2009 00:45:05 +0000 (UTC)
Subject: rpms/yaboot/F-10 yaboot-1.3.14-no-birecs.patch, NONE,
	1.1 yaboot.spec, 1.57, 1.58
Message-ID: <20090811004505.0D12511C0344@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10372

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-no-birecs.patch 
Log Message:
Backport the no birecs patch from F-11/rawhide uptil a better solution is available upstream.



yaboot-1.3.14-no-birecs.patch:
 yaboot.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE yaboot-1.3.14-no-birecs.patch ---
--- yaboot-1.3.14/second/yaboot.c~	2009-06-07 08:57:58.000000000 +0100
+++ yaboot-1.3.14/second/yaboot.c	2009-06-07 09:02:03.000000000 +0100
@@ -1243,7 +1243,7 @@ yaboot_text_ui(void)
 	  flush_icache_range ((long)loadinfo.base, (long)loadinfo.base+loadinfo.memsize);
 	  DEBUG_F(" done\n");
 
-	  if (flat_vmlinux) {
+	  if (0 && flat_vmlinux) {
 	       /*
 	        * Fill new boot infos (only if booting a vmlinux).
 	        *


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-10/yaboot.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- yaboot.spec	29 Jan 2009 14:48:38 -0000	1.57
+++ yaboot.spec	11 Aug 2009 00:45:04 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -25,6 +25,7 @@ Patch29: yaboot-1.3.14-baseaddr.patch
 Patch30: yaboot-1.3.14-fix-bootonce-nvram.patch 
 Patch31: yaboot-1.3.14-bigger-max-token.patch
 Patch32: yaboot-relocatable-kernel.patch
+Patch33: yaboot-1.3.14-no-birecs.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -60,6 +61,7 @@ yaboot can also bootload IBM pSeries mac
 %patch30 -p1 -b .bootonce
 %patch31 -p1 -b .maxtoken
 %patch32 -p1 -b .relocatable
+%patch33 -p1 -b .nobirecs
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -95,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Tue Aug 11 2009 tony at bakeyournoodle.com - 1.3.14-10
+- Backported the "no birecs" patch from F-11, rawhide.  See below for details:
+  https://www.redhat.com/archives/fedora-kernel-list/2009-June/msg00002.html
+  http://lists.ozlabs.org/pipermail/linuxppc-dev/2009-August/074571.html
+
 * Thu Jan 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-9
 - Add patch to handle relocatable kernels
   Resolves: #483041



From bpepple at fedoraproject.org  Tue Aug 11 00:45:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 11 Aug 2009 00:45:45 +0000 (UTC)
Subject: rpms/telepathy-farsight/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 telepathy-farsight.spec, 1.6, 1.7
Message-ID: <20090811004545.E495911C0344@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10568

Modified Files:
	.cvsignore sources telepathy-farsight.spec 
Log Message:
* Thu Aug  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.8-1
- Update to 0.0.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 May 2009 13:08:42 -0000	1.4
+++ .cvsignore	11 Aug 2009 00:45:45 -0000	1.5
@@ -1 +1 @@
-telepathy-farsight-0.0.7.tar.gz
+telepathy-farsight-0.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 May 2009 13:08:42 -0000	1.4
+++ sources	11 Aug 2009 00:45:45 -0000	1.5
@@ -1 +1 @@
-882c9630ab28706d34d7d6d1060d43f0  telepathy-farsight-0.0.7.tar.gz
+dbb982402a1a4b0c2051a7071685a0f0  telepathy-farsight-0.0.8.tar.gz


Index: telepathy-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/telepathy-farsight.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- telepathy-farsight.spec	27 Jul 2009 05:43:22 -0000	1.6
+++ telepathy-farsight.spec	11 Aug 2009 00:45:45 -0000	1.7
@@ -2,11 +2,11 @@
 
 %define dbus_ver        0.60
 %define tp_glib_ver     0.7.26
-%define farsight2_ver   0.0.9
+%define farsight2_ver   0.0.14
 
 Name:           telepathy-farsight
-Version:        0.0.7
-Release:        2%{?dist}
+Version:        0.0.8
+Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming channels
 
 Group:          System Environment/Libraries
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Aug  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.8-1
+- Update to 0.0.8.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Aug 11 01:23:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 01:23:42 +0000 (UTC)
Subject: rpms/mathml-fonts/devel dead.package, NONE, 1.1 .cvsignore, 1.5,
	NONE find_symbol_font.sh, 1.3, NONE mathml-fonts.spec, 1.17,
	NONE sources, 1.5, NONE
Message-ID: <20090811012342.9B21211C0049@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/mathml-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14682

Added Files:
	dead.package 
Removed Files:
	.cvsignore find_symbol_font.sh mathml-fonts.spec sources 
Log Message:
EOL'd by lyx (lyx-fonts-compat)



--- NEW FILE dead.package ---
EOL'd by lyx (lyx-fonts-compat)


--- .cvsignore DELETED ---


--- find_symbol_font.sh DELETED ---


--- mathml-fonts.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Tue Aug 11 01:31:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 01:31:04 +0000
Subject: [pkgdb] zikula: pfrields has requested commit
Message-ID: <20090811013105.0B6BD10F899@bastion2.fedora.phx.redhat.com>

pfrields has requested the commit acl on zikula (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 01:31:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 01:31:12 +0000
Subject: [pkgdb] zikula: pfrields has requested commit
Message-ID: <20090811013112.6847B10F89B@bastion2.fedora.phx.redhat.com>

pfrields has requested the commit acl on zikula (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 01:31:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 01:31:16 +0000
Subject: [pkgdb] zikula: pfrields has requested commit
Message-ID: <20090811013116.ED21210F8B0@bastion2.fedora.phx.redhat.com>

pfrields has requested the commit acl on zikula (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 01:31:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 01:31:25 +0000
Subject: [pkgdb] zikula: pfrields has requested commit
Message-ID: <20090811013126.118C810F880@bastion2.fedora.phx.redhat.com>

pfrields has requested the commit acl on zikula (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From phuang at fedoraproject.org  Tue Aug 11 02:53:40 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 11 Aug 2009 02:53:40 +0000 (UTC)
Subject: rpms/ibus/F-11 ibus.spec,1.81,1.82
Message-ID: <20090811025341.0D98B11C0097@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464

Modified Files:
	ibus.spec 
Log Message:
Only execute automake to avoid the snapshot date changing


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- ibus.spec	10 Aug 2009 07:37:11 -0000	1.81
+++ ibus.spec	11 Aug 2009 02:53:40 -0000	1.82
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090612
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -115,7 +115,9 @@ The ibus-devel-docs package contains dev
 %prep
 %setup -q
 %patch0 -p1
-./autogen.sh --help
+# ./autogen.sh --help
+aclocal -I m4
+automake
 
 %build
 %configure --disable-static \
@@ -228,6 +230,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-3
+- Do not execute autogen.sh to avoid the snapshot date changing.
+
 * Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-2
 - Update ibus-HEAD.patch.
 - Fix memory leaks.



From dcantrel at fedoraproject.org  Tue Aug 11 03:08:38 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 11 Aug 2009 03:08:38 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.654, 1.655 anaconda.spec, 1.804, 
	1.805 sources, 1.788, 1.789
Message-ID: <20090811030838.381F711C0097@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26980

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Aug 10 2009 David Cantrell <dcantrell at redhat.com> - 12.12-1
- Honor network config boot params for CD-booted ks installs (#433214)
  (dcantrell)
- Include ipcalc command in all initrd.img files, not just s390 (#516084)
  (dcantrell)
- Don't to unmount /mnt/source unless something's mounted there (#516304).
  (clumens)
- Honor nodmraid commandline option (#499733) (hdegoede)
- Don't try to multipath CD devices. (#516362) (pjones)
- booty: Do not strip the trailing p from a devicename like
  mapper/isw_Vol0_tmp (hdegoede)
- booty: isw_Vol0_Stripe is not a disk isw_Vol0_Stri with an e part
  (#505205) (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -p -r1.654 -r1.655
--- .cvsignore	7 Aug 2009 19:46:20 -0000	1.654
+++ .cvsignore	11 Aug 2009 03:08:37 -0000	1.655
@@ -1,2 +1 @@
-anaconda-12.10.tar.bz2
-anaconda-12.11.tar.bz2
+anaconda-12.12.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -p -r1.804 -r1.805
--- anaconda.spec	7 Aug 2009 19:46:20 -0000	1.804
+++ anaconda.spec	11 Aug 2009 03:08:37 -0000	1.805
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.11
+Version: 12.12
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -209,6 +209,20 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Aug 10 2009 David Cantrell <dcantrell at redhat.com> - 12.12-1
+- Honor network config boot params for CD-booted ks installs (#433214)
+  (dcantrell)
+- Include ipcalc command in all initrd.img files, not just s390 (#516084)
+  (dcantrell)
+- Don't to unmount /mnt/source unless something's mounted there (#516304).
+  (clumens)
+- Honor nodmraid commandline option (#499733) (hdegoede)
+- Don't try to multipath CD devices. (#516362) (pjones)
+- booty: Do not strip the trailing p from a devicename like
+  mapper/isw_Vol0_tmp (hdegoede)
+- booty: isw_Vol0_Stripe is not a disk isw_Vol0_Stri with an e part
+  (#505205) (hdegoede)
+
 * Fri Aug 07 2009 Chris Lumens <clumens at redhat.com> - 12.11-1
 - upd-instroot: Inspect gtkrc for cursor theme (ajax)
 - Support NFS repos in kickstart (#495620, #507093). (clumens)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -p -r1.788 -r1.789
--- sources	7 Aug 2009 19:46:20 -0000	1.788
+++ sources	11 Aug 2009 03:08:37 -0000	1.789
@@ -1 +1 @@
-274210a4a4d6ebdd786af6095b25ed10  anaconda-12.11.tar.bz2
+21cea7f8a3365f0e928de0637d81b98d  anaconda-12.12.tar.bz2



From phuang at fedoraproject.org  Tue Aug 11 03:14:52 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 11 Aug 2009 03:14:52 +0000 (UTC)
Subject: rpms/ibus/F-10 ibus.spec,1.39,1.40
Message-ID: <20090811031452.9D67111C0097@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27774

Modified Files:
	ibus.spec 
Log Message:
Do not execute autogen.sh to avoid the snapshot date changing


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ibus.spec	10 Aug 2009 07:54:47 -0000	1.39
+++ ibus.spec	11 Aug 2009 03:14:52 -0000	1.40
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.1.0.20090612
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -115,7 +115,9 @@ The ibus-devel-docs package contains dev
 %prep
 %setup -q
 %patch0 -p1
-./autogen.sh --help
+# ./autogen.sh --help
+aclocal -I m4
+automake
 
 %build
 %configure --disable-static \
@@ -228,6 +230,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-3
+- Do not execute autogen.sh to avoid the snapshot date changing.
+
 * Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-2
 - Update ibus-HEAD.patch.
 - Fix memory leaks.



From hicham at fedoraproject.org  Tue Aug 11 03:16:24 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Tue, 11 Aug 2009 03:16:24 +0000 (UTC)
Subject: rpms/PgsLookAndFeel/devel LICENSE.txt, NONE,
	1.1 PgsLookAndFeel-PlafOptions.java.patch, NONE,
	1.1 PgsLookAndFeel-build.xml.patch, NONE,
	1.1 PgsLookAndFeel.spec, NONE, 1.1 README.txt, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811031624.DC79B11C0097@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/PgsLookAndFeel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28725/devel

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE.txt PgsLookAndFeel-PlafOptions.java.patch 
	PgsLookAndFeel-build.xml.patch PgsLookAndFeel.spec README.txt 
	import.log 
Log Message:



--- NEW FILE LICENSE.txt ---
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright 2006 Patrick Gotthardt

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
PgsLookAndFeel-PlafOptions.java.patch:
 PlafOptions.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PgsLookAndFeel-PlafOptions.java.patch ---
diff -up pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java.orig pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java
--- pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java.orig	2009-08-05 20:42:25.513705293 +0100
+++ pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java	2009-08-05 20:42:59.053705086 +0100
@@ -255,7 +255,7 @@ public class PlafOptions {
 
 	public static void enableJideFastGradient() {
 		// verify usage of jidesoft's SwingUtilities
-		com.jidesoft.utils.Lm.verifyLicense("Patrick Gotthardt", "PgsLookAndFeel", "aW6dEcgCQMkW4e:OGYJCDdPATGYEiLo2");
+//		com.jidesoft.utils.Lm.verifyLicense("Patrick Gotthardt", "PgsLookAndFeel", "aW6dEcgCQMkW4e:OGYJCDdPATGYEiLo2");
 
 		fastGradient = true;
 	}

PgsLookAndFeel-build.xml.patch:
 build.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE PgsLookAndFeel-build.xml.patch ---
diff -up pgslookandfeel/build.xml.orig pgslookandfeel/build.xml
--- pgslookandfeel/build.xml.orig	2009-08-06 15:41:00.293584645 +0100
+++ pgslookandfeel/build.xml	2009-08-06 15:48:54.149586283 +0100
@@ -4,8 +4,8 @@
 	<property name="src.dir" value="src"/>
 	<property name="dest.dir" value="classes"/>
 	<property name="jar.dir" value="jar"/>
-	<property name="lib.dir" value="lib"/>
-	<property name="class.path" value="%CLASSPATH%;${dest.dir};${lib.dir}/laf-plugin.jar;${lib.dir}/jide-common-pgslaf.jar"/>
+	<property name="lib.dir" value="/usr/share/java"/>
+	<property name="class.path" value="%CLASSPATH%;${dest.dir};${lib.dir}/laf-plugin.jar;${lib.dir}/jide-oss.jar"/>
 	
 	<target name="init">
 		<mkdir dir="${dest.dir}"/>
@@ -19,7 +19,7 @@
 	<target name="pack" depends="init, compile">
 		<unjar src="${lib.dir}/laf-plugin.jar" dest="${dest.dir}/"/>
 		<jar compress="true" jarfile="${jar.dir}/PgsLookAndFeel.jar" basedir="${dest.dir}" />
-		<unjar src="${lib.dir}/jide-common-pgslaf.jar" dest="${dest.dir}"/>
+		<unjar src="${lib.dir}/jide-oss.jar" dest="${dest.dir}"/>
 		<jar compress="true" jarfile="${jar.dir}/PgsLookAndFeel-jide.jar" basedir="${dest.dir}" />
 	</target>
 	


--- NEW FILE PgsLookAndFeel.spec ---
Name:		PgsLookAndFeel
Version:	1.1
Release:	4.20090805cvs%{?dist}
Summary:	Nice looking LookAndFeel for Swing
License:	ASL 2.0
Group:		Development/Libraries
URL:		https://pgslookandfeel.dev.java.net/

#This is a cvs snapshot, to get this tarball :
#if you don't have an account in https://www.dev.java.net, create an account via https://www.dev.java.net/servlets/Join
#otherwise set the cvs root and login : cvs -d :pserver:username at cvs.dev.java.net:/cvs login
#then to checkout the project source repository : cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout pgslookandfeel
#this information was taken from https://www.dev.java.net/servlets/ProjectSource
#create the tarball : tar -cjvf PgsLookAndFeel-1.1.tar.bz2 pgslookandfeel

Source0:	%{name}-%{version}.tar.bz2
#Source1: LICENSE file, taken from upstream binary tarball
Source1:	LICENSE.txt
#Source2: README file, taken from upstream binary tarball
Source2:	README.txt

#Patch0: disable checking for a license of jide, since we are using an oss one
Patch0:		PgsLookAndFeel-PlafOptions.java.patch
#Patch1: use the system libraries instead of the provided ones
Patch1:		PgsLookAndFeel-build.xml.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant
BuildRequires:	laf-plugin
BuildRequires:	jide-oss

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0
Requires:	laf-plugin

%description
The PgsLookAndFeel is a nice looking LookAndFeel for Swing.

It aims be a very modern cross-platform LookAndFeel with
nice features and much interaction for users.

%package javadoc
Summary:	User documentation for PgsLookAndFeel
Group:		Documentation
Requires:	%{name} = %{version}

%description javadoc
User documentation for %{name}.

%prep
%setup -q -n pgslookandfeel
%patch0 -p1
%patch1 -p1
#remove any existing compiled classes and jars
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;

#remove CVS files and directories
rm -rf `find -name 'CVS'`

install -p -m 644 %{SOURCE1} .
install -p -m 644 %{SOURCE2} .

# copy resources (build.xml is missing this ...)
install -dm 755 classes/com/pagosoft/plaf/icons
cp -p src/com/pagosoft/plaf/icons/*.png \
	classes/com/pagosoft/plaf/icons
cp -p src/com/pagosoft/plaf/*.properties \
	classes/com/pagosoft/plaf

%build
%ant

%install
rm -rf %{buildroot}
install -D -p -m 644 jar/%{name}.jar \
	%{buildroot}%{_javadir}/%{name}-%{version}.jar
install -D -p -m 644 jar/%{name}-jide.jar \
	%{buildroot}%{_javadir}/%{name}-jide-%{version}.jar

install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p www/* %{buildroot}%{_javadocdir}/%{name}

pushd %{buildroot}%{_javadir}
	for jar in *-%{version}*; do
		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
	done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc *.txt
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Thu Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-4.20090805cvs
- Rebuild against jide-oss.

* Wed Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-3.20090805cvs
- Fixed javadoc directory path.

* Wed Jul 22 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-2.20090721cvs
- Spec cleanup ( https://bugzilla.redhat.com/show_bug.cgi?id=513119#c1 )

* Tue Jul 21 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-1.20090721cvs
- Initial package for Fedora


--- NEW FILE README.txt ---
PgsLookAndFeel - 1.1 Final 1
---------------------------------------------------

The PgsLookAndFeel is a modern LookAndFeel for Java/Swing. It can be used in a wide range of applications. It uses low saturated colors to drive attention of the user to the actual application and to make the user feel comfortable even when using an application for multiple hours.

Compatibility
---------------------------------------------------
I decided to rewrite parts of the UI in a way that might not be compatible with all themes. Actually only the minority of the standard themes are still working. All others look worse than before. Your own themes might not be working in PgsLookAndFeel 1.1 anymore.
This is the price I had to pay for the much improved look of the working themes. The other themes need to be improved and maybe I need to change a few internal things to support those themes as well.
All of the enhanced features of PgsLookAndFeel (like html-display-fix and wheel-scrolling tabbed panes) are now disabled by default. If you want to leave your application unchanged when the next release comes out (probably version 1.2), do not enable them. All of these features will be removed (most likely).

Working themes
----------------------------------------------------
This list is really short. I've applied the changes with focus on the SilverTheme, so this is the best-looking theme now and has become the default theme as by this release.
The ThemeFactory.GRAY theme seems to be working fine, too. Other themes are suffering from some minor visual problems. If you want to use them, you must fix them by yourself (I'd be glad if you could send me your patched versions so I can integrate them into the final/next version)

Lookahead
-----------------------------------------------------
My time is very rare at the moment so do not expect new features or versions to come out too soon. Doesn't mean this project has been abandoned, just that I must spend my time on other projects.

Unsupported components
-----------------------------------------------------
This is a section that really bugs me. If nobody contributes the missing components, these will probably be part of version 1.2.
- JSpinner
- JInternalFrame
Note: "unsupported" in this context means that it is using pure MetalLookAndFeel.

License
-----------------------------------------------------
Version 1.1 will be the last version to be released under terms of Apache Software License 2. Later versions will use the BSD-license (for compatibility with GPL).

Usage
----------------------------------------------------
To use PgsLookAndFeel in your application you have to include the following line in your startup code (before you initialize any Swing components):
	PlafOptions.setAsLookAndFeel();
If you absolutly must you can add the code at any place in your code and update the UI later on:
	PlafOptions.updateAllUIs();
But  please note that PgsLookAndFeel has not been tuned towards "hot-switching" the L&F or even the current theme. There might be problems if you switch the L&F while your application is running. Later versions will correct this issue.

If you'd like to use a different theme you'll need to call
	PlafOptions.setTheme(yourTheme);
before calling setAsLookAndFeel.
The standard theme is the SilverTheme, located at com.pagosoft.plaf.themes.SilverTheme.

Note: All of the above examples assume that you have imported the com.pagosoft.plaf.PlafOptions class.

Updating to 1.1
-----------------------------------------------------
Please remove all code that changes these settings:
- Antialiasing (will be removed on all platforms but Mustang where it is applied by default)
- HTML Display Fix (buggy, will be removed)
- Wheel Tab (buggy, will be removed)
- all "Style"-settings (will be removed)
- pgs.properties (will be removed and rewritten for 2.0)

Changes since 1.1
------------------------------------------------------
- popup menu for text components now working properly.

------------------------------------------------------

Thank you for trying PgsLookAndFeel 1.1 Final. If you find any bugs, please let me know through the bug-tracker, mailing list or just drop me a private mail (patrick at pagosoft.com).
- Patrick Gotthardt


--- NEW FILE import.log ---
PgsLookAndFeel-1_1-4_20090805cvs_fc11:HEAD:PgsLookAndFeel-1.1-4.20090805cvs.fc11.src.rpm:1249960385


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PgsLookAndFeel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:34:48 -0000	1.1
+++ .cvsignore	11 Aug 2009 03:16:24 -0000	1.2
@@ -0,0 +1 @@
+PgsLookAndFeel-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PgsLookAndFeel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:34:48 -0000	1.1
+++ sources	11 Aug 2009 03:16:24 -0000	1.2
@@ -0,0 +1 @@
+88a536bf16baede503996707023fe860  PgsLookAndFeel-1.1.tar.bz2



From hicham at fedoraproject.org  Tue Aug 11 03:17:40 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Tue, 11 Aug 2009 03:17:40 +0000 (UTC)
Subject: rpms/PgsLookAndFeel/F-11 LICENSE.txt, NONE,
	1.1 PgsLookAndFeel-PlafOptions.java.patch, NONE,
	1.1 PgsLookAndFeel-build.xml.patch, NONE,
	1.1 PgsLookAndFeel.spec, NONE, 1.1 README.txt, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811031740.422B211C0097@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/PgsLookAndFeel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29063/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE.txt PgsLookAndFeel-PlafOptions.java.patch 
	PgsLookAndFeel-build.xml.patch PgsLookAndFeel.spec README.txt 
	import.log 
Log Message:



--- NEW FILE LICENSE.txt ---
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright 2006 Patrick Gotthardt

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
PgsLookAndFeel-PlafOptions.java.patch:
 PlafOptions.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PgsLookAndFeel-PlafOptions.java.patch ---
diff -up pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java.orig pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java
--- pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java.orig	2009-08-05 20:42:25.513705293 +0100
+++ pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java	2009-08-05 20:42:59.053705086 +0100
@@ -255,7 +255,7 @@ public class PlafOptions {
 
 	public static void enableJideFastGradient() {
 		// verify usage of jidesoft's SwingUtilities
-		com.jidesoft.utils.Lm.verifyLicense("Patrick Gotthardt", "PgsLookAndFeel", "aW6dEcgCQMkW4e:OGYJCDdPATGYEiLo2");
+//		com.jidesoft.utils.Lm.verifyLicense("Patrick Gotthardt", "PgsLookAndFeel", "aW6dEcgCQMkW4e:OGYJCDdPATGYEiLo2");
 
 		fastGradient = true;
 	}

PgsLookAndFeel-build.xml.patch:
 build.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE PgsLookAndFeel-build.xml.patch ---
diff -up pgslookandfeel/build.xml.orig pgslookandfeel/build.xml
--- pgslookandfeel/build.xml.orig	2009-08-06 15:41:00.293584645 +0100
+++ pgslookandfeel/build.xml	2009-08-06 15:48:54.149586283 +0100
@@ -4,8 +4,8 @@
 	<property name="src.dir" value="src"/>
 	<property name="dest.dir" value="classes"/>
 	<property name="jar.dir" value="jar"/>
-	<property name="lib.dir" value="lib"/>
-	<property name="class.path" value="%CLASSPATH%;${dest.dir};${lib.dir}/laf-plugin.jar;${lib.dir}/jide-common-pgslaf.jar"/>
+	<property name="lib.dir" value="/usr/share/java"/>
+	<property name="class.path" value="%CLASSPATH%;${dest.dir};${lib.dir}/laf-plugin.jar;${lib.dir}/jide-oss.jar"/>
 	
 	<target name="init">
 		<mkdir dir="${dest.dir}"/>
@@ -19,7 +19,7 @@
 	<target name="pack" depends="init, compile">
 		<unjar src="${lib.dir}/laf-plugin.jar" dest="${dest.dir}/"/>
 		<jar compress="true" jarfile="${jar.dir}/PgsLookAndFeel.jar" basedir="${dest.dir}" />
-		<unjar src="${lib.dir}/jide-common-pgslaf.jar" dest="${dest.dir}"/>
+		<unjar src="${lib.dir}/jide-oss.jar" dest="${dest.dir}"/>
 		<jar compress="true" jarfile="${jar.dir}/PgsLookAndFeel-jide.jar" basedir="${dest.dir}" />
 	</target>
 	


--- NEW FILE PgsLookAndFeel.spec ---
Name:		PgsLookAndFeel
Version:	1.1
Release:	4.20090805cvs%{?dist}
Summary:	Nice looking LookAndFeel for Swing
License:	ASL 2.0
Group:		Development/Libraries
URL:		https://pgslookandfeel.dev.java.net/

#This is a cvs snapshot, to get this tarball :
#if you don't have an account in https://www.dev.java.net, create an account via https://www.dev.java.net/servlets/Join
#otherwise set the cvs root and login : cvs -d :pserver:username at cvs.dev.java.net:/cvs login
#then to checkout the project source repository : cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout pgslookandfeel
#this information was taken from https://www.dev.java.net/servlets/ProjectSource
#create the tarball : tar -cjvf PgsLookAndFeel-1.1.tar.bz2 pgslookandfeel

Source0:	%{name}-%{version}.tar.bz2
#Source1: LICENSE file, taken from upstream binary tarball
Source1:	LICENSE.txt
#Source2: README file, taken from upstream binary tarball
Source2:	README.txt

#Patch0: disable checking for a license of jide, since we are using an oss one
Patch0:		PgsLookAndFeel-PlafOptions.java.patch
#Patch1: use the system libraries instead of the provided ones
Patch1:		PgsLookAndFeel-build.xml.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant
BuildRequires:	laf-plugin
BuildRequires:	jide-oss

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0
Requires:	laf-plugin

%description
The PgsLookAndFeel is a nice looking LookAndFeel for Swing.

It aims be a very modern cross-platform LookAndFeel with
nice features and much interaction for users.

%package javadoc
Summary:	User documentation for PgsLookAndFeel
Group:		Documentation
Requires:	%{name} = %{version}

%description javadoc
User documentation for %{name}.

%prep
%setup -q -n pgslookandfeel
%patch0 -p1
%patch1 -p1
#remove any existing compiled classes and jars
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;

#remove CVS files and directories
rm -rf `find -name 'CVS'`

install -p -m 644 %{SOURCE1} .
install -p -m 644 %{SOURCE2} .

# copy resources (build.xml is missing this ...)
install -dm 755 classes/com/pagosoft/plaf/icons
cp -p src/com/pagosoft/plaf/icons/*.png \
	classes/com/pagosoft/plaf/icons
cp -p src/com/pagosoft/plaf/*.properties \
	classes/com/pagosoft/plaf

%build
%ant

%install
rm -rf %{buildroot}
install -D -p -m 644 jar/%{name}.jar \
	%{buildroot}%{_javadir}/%{name}-%{version}.jar
install -D -p -m 644 jar/%{name}-jide.jar \
	%{buildroot}%{_javadir}/%{name}-jide-%{version}.jar

install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p www/* %{buildroot}%{_javadocdir}/%{name}

pushd %{buildroot}%{_javadir}
	for jar in *-%{version}*; do
		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
	done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc *.txt
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Thu Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-4.20090805cvs
- Rebuild against jide-oss.

* Wed Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-3.20090805cvs
- Fixed javadoc directory path.

* Wed Jul 22 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-2.20090721cvs
- Spec cleanup ( https://bugzilla.redhat.com/show_bug.cgi?id=513119#c1 )

* Tue Jul 21 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-1.20090721cvs
- Initial package for Fedora


--- NEW FILE README.txt ---
PgsLookAndFeel - 1.1 Final 1
---------------------------------------------------

The PgsLookAndFeel is a modern LookAndFeel for Java/Swing. It can be used in a wide range of applications. It uses low saturated colors to drive attention of the user to the actual application and to make the user feel comfortable even when using an application for multiple hours.

Compatibility
---------------------------------------------------
I decided to rewrite parts of the UI in a way that might not be compatible with all themes. Actually only the minority of the standard themes are still working. All others look worse than before. Your own themes might not be working in PgsLookAndFeel 1.1 anymore.
This is the price I had to pay for the much improved look of the working themes. The other themes need to be improved and maybe I need to change a few internal things to support those themes as well.
All of the enhanced features of PgsLookAndFeel (like html-display-fix and wheel-scrolling tabbed panes) are now disabled by default. If you want to leave your application unchanged when the next release comes out (probably version 1.2), do not enable them. All of these features will be removed (most likely).

Working themes
----------------------------------------------------
This list is really short. I've applied the changes with focus on the SilverTheme, so this is the best-looking theme now and has become the default theme as by this release.
The ThemeFactory.GRAY theme seems to be working fine, too. Other themes are suffering from some minor visual problems. If you want to use them, you must fix them by yourself (I'd be glad if you could send me your patched versions so I can integrate them into the final/next version)

Lookahead
-----------------------------------------------------
My time is very rare at the moment so do not expect new features or versions to come out too soon. Doesn't mean this project has been abandoned, just that I must spend my time on other projects.

Unsupported components
-----------------------------------------------------
This is a section that really bugs me. If nobody contributes the missing components, these will probably be part of version 1.2.
- JSpinner
- JInternalFrame
Note: "unsupported" in this context means that it is using pure MetalLookAndFeel.

License
-----------------------------------------------------
Version 1.1 will be the last version to be released under terms of Apache Software License 2. Later versions will use the BSD-license (for compatibility with GPL).

Usage
----------------------------------------------------
To use PgsLookAndFeel in your application you have to include the following line in your startup code (before you initialize any Swing components):
	PlafOptions.setAsLookAndFeel();
If you absolutly must you can add the code at any place in your code and update the UI later on:
	PlafOptions.updateAllUIs();
But  please note that PgsLookAndFeel has not been tuned towards "hot-switching" the L&F or even the current theme. There might be problems if you switch the L&F while your application is running. Later versions will correct this issue.

If you'd like to use a different theme you'll need to call
	PlafOptions.setTheme(yourTheme);
before calling setAsLookAndFeel.
The standard theme is the SilverTheme, located at com.pagosoft.plaf.themes.SilverTheme.

Note: All of the above examples assume that you have imported the com.pagosoft.plaf.PlafOptions class.

Updating to 1.1
-----------------------------------------------------
Please remove all code that changes these settings:
- Antialiasing (will be removed on all platforms but Mustang where it is applied by default)
- HTML Display Fix (buggy, will be removed)
- Wheel Tab (buggy, will be removed)
- all "Style"-settings (will be removed)
- pgs.properties (will be removed and rewritten for 2.0)

Changes since 1.1
------------------------------------------------------
- popup menu for text components now working properly.

------------------------------------------------------

Thank you for trying PgsLookAndFeel 1.1 Final. If you find any bugs, please let me know through the bug-tracker, mailing list or just drop me a private mail (patrick at pagosoft.com).
- Patrick Gotthardt


--- NEW FILE import.log ---
PgsLookAndFeel-1_1-4_20090805cvs_fc11:F-11:PgsLookAndFeel-1.1-4.20090805cvs.fc11.src.rpm:1249960617


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PgsLookAndFeel/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:34:48 -0000	1.1
+++ .cvsignore	11 Aug 2009 03:17:39 -0000	1.2
@@ -0,0 +1 @@
+PgsLookAndFeel-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PgsLookAndFeel/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:34:48 -0000	1.1
+++ sources	11 Aug 2009 03:17:40 -0000	1.2
@@ -0,0 +1 @@
+88a536bf16baede503996707023fe860  PgsLookAndFeel-1.1.tar.bz2



From bojan at fedoraproject.org  Tue Aug 11 03:21:21 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 03:21:21 +0000 (UTC)
Subject: rpms/viewvc/devel viewvc-lexer-mimetypes.py, NONE, 1.1 viewvc.spec, 
	1.18, 1.19
Message-ID: <20090811032121.726BF11C0097@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29670

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-lexer-mimetypes.py 
Log Message:
Install and populate mimetypes.conf.


--- NEW FILE viewvc-lexer-mimetypes.py ---
#!/usr/bin/python

import sys
import re
from pygments.lexers import get_all_lexers

for fullname, names, exts, mimetype in get_all_lexers():
  if len(exts) > len(mimetype):
    for j in range(len(mimetype)):
      for i in range(len(exts)):
        if re.match('\*\.',exts[i]):
          if i == 0:
            print mimetype[j],
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
          else:
            print exts[i][2:],
          if i == len(exts)-1:
            print
  else:
    for i in range(len(mimetype)):
      if len(exts) > i:
        if re.match('\*\.',exts[i]):
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            print mimetype[i],
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
            print
          else:
            print mimetype[i], exts[i][2:]


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- viewvc.spec	27 Jul 2009 06:52:23 -0000	1.18
+++ viewvc.spec	11 Aug 2009 03:21:21 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -11,13 +11,14 @@ URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
+Source3:        viewvc-lexer-mimetypes.py 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
 Conflicts:      selinux-policy < 2.5.10-2
 
 BuildArch:      noarch
-BuildRequires:  python-devel >= 2.0
+BuildRequires:  python-devel >= 2.0, python-pygments
 Requires:       webserver, rcs, diffutils
 Requires:       subversion >= 1.2
 Requires:       cvsgraph
@@ -79,6 +80,10 @@ with decent performance when run under A
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
+%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
+%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf
+
+%{SOURCE3} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
 
 # Install Apache configuration and README
 %{__sed} -e s,__datadir__,%{_datadir}, \
@@ -113,6 +118,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.1-3
+- install mimetypes.conf
+- populate mimetypes.conf with what pygments understands
+
 * 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
 



From hicham at fedoraproject.org  Tue Aug 11 03:24:24 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Tue, 11 Aug 2009 03:24:24 +0000 (UTC)
Subject: rpms/PgsLookAndFeel/F-10 LICENSE.txt, NONE,
	1.1 PgsLookAndFeel-PlafOptions.java.patch, NONE,
	1.1 PgsLookAndFeel-build.xml.patch, NONE,
	1.1 PgsLookAndFeel.spec, NONE, 1.1 README.txt, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811032424.BCE0E11C0097@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/PgsLookAndFeel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29861/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE.txt PgsLookAndFeel-PlafOptions.java.patch 
	PgsLookAndFeel-build.xml.patch PgsLookAndFeel.spec README.txt 
	import.log 
Log Message:



--- NEW FILE LICENSE.txt ---
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright 2006 Patrick Gotthardt

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
PgsLookAndFeel-PlafOptions.java.patch:
 PlafOptions.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PgsLookAndFeel-PlafOptions.java.patch ---
diff -up pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java.orig pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java
--- pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java.orig	2009-08-05 20:42:25.513705293 +0100
+++ pgslookandfeel/src/com/pagosoft/plaf/PlafOptions.java	2009-08-05 20:42:59.053705086 +0100
@@ -255,7 +255,7 @@ public class PlafOptions {
 
 	public static void enableJideFastGradient() {
 		// verify usage of jidesoft's SwingUtilities
-		com.jidesoft.utils.Lm.verifyLicense("Patrick Gotthardt", "PgsLookAndFeel", "aW6dEcgCQMkW4e:OGYJCDdPATGYEiLo2");
+//		com.jidesoft.utils.Lm.verifyLicense("Patrick Gotthardt", "PgsLookAndFeel", "aW6dEcgCQMkW4e:OGYJCDdPATGYEiLo2");
 
 		fastGradient = true;
 	}

PgsLookAndFeel-build.xml.patch:
 build.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE PgsLookAndFeel-build.xml.patch ---
diff -up pgslookandfeel/build.xml.orig pgslookandfeel/build.xml
--- pgslookandfeel/build.xml.orig	2009-08-06 15:41:00.293584645 +0100
+++ pgslookandfeel/build.xml	2009-08-06 15:48:54.149586283 +0100
@@ -4,8 +4,8 @@
 	<property name="src.dir" value="src"/>
 	<property name="dest.dir" value="classes"/>
 	<property name="jar.dir" value="jar"/>
-	<property name="lib.dir" value="lib"/>
-	<property name="class.path" value="%CLASSPATH%;${dest.dir};${lib.dir}/laf-plugin.jar;${lib.dir}/jide-common-pgslaf.jar"/>
+	<property name="lib.dir" value="/usr/share/java"/>
+	<property name="class.path" value="%CLASSPATH%;${dest.dir};${lib.dir}/laf-plugin.jar;${lib.dir}/jide-oss.jar"/>
 	
 	<target name="init">
 		<mkdir dir="${dest.dir}"/>
@@ -19,7 +19,7 @@
 	<target name="pack" depends="init, compile">
 		<unjar src="${lib.dir}/laf-plugin.jar" dest="${dest.dir}/"/>
 		<jar compress="true" jarfile="${jar.dir}/PgsLookAndFeel.jar" basedir="${dest.dir}" />
-		<unjar src="${lib.dir}/jide-common-pgslaf.jar" dest="${dest.dir}"/>
+		<unjar src="${lib.dir}/jide-oss.jar" dest="${dest.dir}"/>
 		<jar compress="true" jarfile="${jar.dir}/PgsLookAndFeel-jide.jar" basedir="${dest.dir}" />
 	</target>
 	


--- NEW FILE PgsLookAndFeel.spec ---
Name:		PgsLookAndFeel
Version:	1.1
Release:	4.20090805cvs%{?dist}
Summary:	Nice looking LookAndFeel for Swing
License:	ASL 2.0
Group:		Development/Libraries
URL:		https://pgslookandfeel.dev.java.net/

#This is a cvs snapshot, to get this tarball :
#if you don't have an account in https://www.dev.java.net, create an account via https://www.dev.java.net/servlets/Join
#otherwise set the cvs root and login : cvs -d :pserver:username at cvs.dev.java.net:/cvs login
#then to checkout the project source repository : cvs -d :pserver:username at cvs.dev.java.net:/cvs checkout pgslookandfeel
#this information was taken from https://www.dev.java.net/servlets/ProjectSource
#create the tarball : tar -cjvf PgsLookAndFeel-1.1.tar.bz2 pgslookandfeel

Source0:	%{name}-%{version}.tar.bz2
#Source1: LICENSE file, taken from upstream binary tarball
Source1:	LICENSE.txt
#Source2: README file, taken from upstream binary tarball
Source2:	README.txt

#Patch0: disable checking for a license of jide, since we are using an oss one
Patch0:		PgsLookAndFeel-PlafOptions.java.patch
#Patch1: use the system libraries instead of the provided ones
Patch1:		PgsLookAndFeel-build.xml.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant
BuildRequires:	laf-plugin
BuildRequires:	jide-oss

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0
Requires:	laf-plugin

%description
The PgsLookAndFeel is a nice looking LookAndFeel for Swing.

It aims be a very modern cross-platform LookAndFeel with
nice features and much interaction for users.

%package javadoc
Summary:	User documentation for PgsLookAndFeel
Group:		Documentation
Requires:	%{name} = %{version}

%description javadoc
User documentation for %{name}.

%prep
%setup -q -n pgslookandfeel
%patch0 -p1
%patch1 -p1
#remove any existing compiled classes and jars
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;

#remove CVS files and directories
rm -rf `find -name 'CVS'`

install -p -m 644 %{SOURCE1} .
install -p -m 644 %{SOURCE2} .

# copy resources (build.xml is missing this ...)
install -dm 755 classes/com/pagosoft/plaf/icons
cp -p src/com/pagosoft/plaf/icons/*.png \
	classes/com/pagosoft/plaf/icons
cp -p src/com/pagosoft/plaf/*.properties \
	classes/com/pagosoft/plaf

%build
%ant

%install
rm -rf %{buildroot}
install -D -p -m 644 jar/%{name}.jar \
	%{buildroot}%{_javadir}/%{name}-%{version}.jar
install -D -p -m 644 jar/%{name}-jide.jar \
	%{buildroot}%{_javadir}/%{name}-jide-%{version}.jar

install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p www/* %{buildroot}%{_javadocdir}/%{name}

pushd %{buildroot}%{_javadir}
	for jar in *-%{version}*; do
		ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
	done
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc *.txt
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Thu Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-4.20090805cvs
- Rebuild against jide-oss.

* Wed Aug 05 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-3.20090805cvs
- Fixed javadoc directory path.

* Wed Jul 22 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-2.20090721cvs
- Spec cleanup ( https://bugzilla.redhat.com/show_bug.cgi?id=513119#c1 )

* Tue Jul 21 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 1.1-1.20090721cvs
- Initial package for Fedora


--- NEW FILE README.txt ---
PgsLookAndFeel - 1.1 Final 1
---------------------------------------------------

The PgsLookAndFeel is a modern LookAndFeel for Java/Swing. It can be used in a wide range of applications. It uses low saturated colors to drive attention of the user to the actual application and to make the user feel comfortable even when using an application for multiple hours.

Compatibility
---------------------------------------------------
I decided to rewrite parts of the UI in a way that might not be compatible with all themes. Actually only the minority of the standard themes are still working. All others look worse than before. Your own themes might not be working in PgsLookAndFeel 1.1 anymore.
This is the price I had to pay for the much improved look of the working themes. The other themes need to be improved and maybe I need to change a few internal things to support those themes as well.
All of the enhanced features of PgsLookAndFeel (like html-display-fix and wheel-scrolling tabbed panes) are now disabled by default. If you want to leave your application unchanged when the next release comes out (probably version 1.2), do not enable them. All of these features will be removed (most likely).

Working themes
----------------------------------------------------
This list is really short. I've applied the changes with focus on the SilverTheme, so this is the best-looking theme now and has become the default theme as by this release.
The ThemeFactory.GRAY theme seems to be working fine, too. Other themes are suffering from some minor visual problems. If you want to use them, you must fix them by yourself (I'd be glad if you could send me your patched versions so I can integrate them into the final/next version)

Lookahead
-----------------------------------------------------
My time is very rare at the moment so do not expect new features or versions to come out too soon. Doesn't mean this project has been abandoned, just that I must spend my time on other projects.

Unsupported components
-----------------------------------------------------
This is a section that really bugs me. If nobody contributes the missing components, these will probably be part of version 1.2.
- JSpinner
- JInternalFrame
Note: "unsupported" in this context means that it is using pure MetalLookAndFeel.

License
-----------------------------------------------------
Version 1.1 will be the last version to be released under terms of Apache Software License 2. Later versions will use the BSD-license (for compatibility with GPL).

Usage
----------------------------------------------------
To use PgsLookAndFeel in your application you have to include the following line in your startup code (before you initialize any Swing components):
	PlafOptions.setAsLookAndFeel();
If you absolutly must you can add the code at any place in your code and update the UI later on:
	PlafOptions.updateAllUIs();
But  please note that PgsLookAndFeel has not been tuned towards "hot-switching" the L&F or even the current theme. There might be problems if you switch the L&F while your application is running. Later versions will correct this issue.

If you'd like to use a different theme you'll need to call
	PlafOptions.setTheme(yourTheme);
before calling setAsLookAndFeel.
The standard theme is the SilverTheme, located at com.pagosoft.plaf.themes.SilverTheme.

Note: All of the above examples assume that you have imported the com.pagosoft.plaf.PlafOptions class.

Updating to 1.1
-----------------------------------------------------
Please remove all code that changes these settings:
- Antialiasing (will be removed on all platforms but Mustang where it is applied by default)
- HTML Display Fix (buggy, will be removed)
- Wheel Tab (buggy, will be removed)
- all "Style"-settings (will be removed)
- pgs.properties (will be removed and rewritten for 2.0)

Changes since 1.1
------------------------------------------------------
- popup menu for text components now working properly.

------------------------------------------------------

Thank you for trying PgsLookAndFeel 1.1 Final. If you find any bugs, please let me know through the bug-tracker, mailing list or just drop me a private mail (patrick at pagosoft.com).
- Patrick Gotthardt


--- NEW FILE import.log ---
PgsLookAndFeel-1_1-4_20090805cvs_fc11:F-10:PgsLookAndFeel-1.1-4.20090805cvs.fc11.src.rpm:1249960861


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PgsLookAndFeel/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:34:48 -0000	1.1
+++ .cvsignore	11 Aug 2009 03:24:24 -0000	1.2
@@ -0,0 +1 @@
+PgsLookAndFeel-1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PgsLookAndFeel/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:34:48 -0000	1.1
+++ sources	11 Aug 2009 03:24:24 -0000	1.2
@@ -0,0 +1 @@
+88a536bf16baede503996707023fe860  PgsLookAndFeel-1.1.tar.bz2



From bojan at fedoraproject.org  Tue Aug 11 03:26:33 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 03:26:33 +0000 (UTC)
Subject: rpms/viewvc/F-11 viewvc-lexer-mimetypes.py, NONE, 1.1 viewvc.spec, 
	1.17, 1.18
Message-ID: <20090811032633.E6F7F11C0097@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30391

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-lexer-mimetypes.py 
Log Message:
Install and populate mimetypes.conf.


--- NEW FILE viewvc-lexer-mimetypes.py ---
#!/usr/bin/python

import sys
import re
from pygments.lexers import get_all_lexers

for fullname, names, exts, mimetype in get_all_lexers():
  if len(exts) > len(mimetype):
    for j in range(len(mimetype)):
      for i in range(len(exts)):
        if re.match('\*\.',exts[i]):
          if i == 0:
            print mimetype[j],
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
          else:
            print exts[i][2:],
          if i == len(exts)-1:
            print
  else:
    for i in range(len(mimetype)):
      if len(exts) > i:
        if re.match('\*\.',exts[i]):
          if re.search('\[[0-9]+\]',exts[i]):
            s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
            e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
            print mimetype[i],
            for k in range(s,e):
              print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
            print
          else:
            print mimetype[i], exts[i][2:]


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- viewvc.spec	3 Jun 2009 21:36:31 -0000	1.17
+++ viewvc.spec	11 Aug 2009 03:26:33 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -11,13 +11,14 @@ URL:            http://www.viewvc.org/
 Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
+Source3:        viewvc-lexer-mimetypes.py 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
 Conflicts:      selinux-policy < 2.5.10-2
 
 BuildArch:      noarch
-BuildRequires:  python-devel >= 2.0
+BuildRequires:  python-devel >= 2.0, python-pygments
 Requires:       webserver, rcs, diffutils
 Requires:       subversion >= 1.2
 Requires:       cvsgraph
@@ -79,6 +80,10 @@ with decent performance when run under A
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 %{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
 %{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
+%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
+%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf
+
+%{SOURCE3} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
 
 # Install Apache configuration and README
 %{__sed} -e s,__datadir__,%{_datadir}, \
@@ -113,6 +118,10 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.1-2
+- install mimetypes.conf
+- populate mimetypes.conf with what pygments understands
+
 * Thu Jun  4 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.1-1
 - Bump up to 1.1.1
 



From mclasen at fedoraproject.org  Tue Aug 11 03:34:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 03:34:05 +0000 (UTC)
Subject: rpms/orca/devel orca.spec,1.92,1.93
Message-ID: <20090811033405.CF7FA11C0097@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31067

Modified Files:
	orca.spec 
Log Message:
fix build



Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- orca.spec	10 Aug 2009 21:37:30 -0000	1.92
+++ orca.spec	11 Aug 2009 03:34:05 -0000	1.93
@@ -40,6 +40,7 @@ BuildRequires:	gettext
 BuildRequires:	intltool
 BuildRequires:  gnome-python2-bonobo
 BuildRequires:  gnome-python2-libwnck
+BuildRequires:  gnome-python2-gconf
 Obsoletes:	gnopernicus
 Provides:	gnopernicus
 
@@ -48,6 +49,7 @@ Requires:	control-center >= %{control_ce
 Requires:	at-spi-python
 Requires:	gnome-python2-bonobo
 Requires:	gnome-python2-libwnck
+Requires:       gnome-python2-gconf
 Requires:	gnome-python2-gnome
 Requires:	gnome-speech
 



From oget at fedoraproject.org  Tue Aug 11 03:41:11 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 11 Aug 2009 03:41:11 +0000 (UTC)
Subject: rpms/frescobaldi/devel .cvsignore, 1.6, 1.7 frescobaldi.spec, 1.7, 
	1.8 sources, 1.6, 1.7
Message-ID: <20090811034111.1888211C0097@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31843

Modified Files:
	.cvsignore frescobaldi.spec sources 
Log Message:
* Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
- New upstream version
- No need to rebuild .mo and .png files per new guidelines



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Jul 2009 17:37:06 -0000	1.6
+++ .cvsignore	11 Aug 2009 03:41:10 -0000	1.7
@@ -1 +1 @@
-frescobaldi-0.7.12.tar.gz
+frescobaldi-0.7.13.tar.gz


Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/frescobaldi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- frescobaldi.spec	6 Aug 2009 03:07:14 -0000	1.7
+++ frescobaldi.spec	11 Aug 2009 03:41:10 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           frescobaldi
-Version:        0.7.12
-Release:        3%{?dist}
+Version:        0.7.13
+Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
 # python/hyphenator.py is LGPLv2+
@@ -55,10 +55,6 @@ yet lightweight and easy to use. It feat
 %prep
 %setup -q
 
-# We want to build everything from source
-rm -f po/*.mo
-rm -f pics/*.png
-
 %build
 %{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
 make %{?_smp_mflags} VERBOSE=1 
@@ -123,6 +119,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
+- New upstream version
+- No need to rebuild .mo and .png files per new guidelines
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-3
 - Update the .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Jul 2009 17:37:06 -0000	1.6
+++ sources	11 Aug 2009 03:41:10 -0000	1.7
@@ -1 +1 @@
-245724430f80085b1ed8ad87535beef7  frescobaldi-0.7.12.tar.gz
+320a7e8b7112d4f370de4a745cdca922  frescobaldi-0.7.13.tar.gz



From oget at fedoraproject.org  Tue Aug 11 03:42:15 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 11 Aug 2009 03:42:15 +0000 (UTC)
Subject: rpms/frescobaldi/F-11 .cvsignore, 1.6, 1.7 frescobaldi.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090811034215.72B9211C0097@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32073

Modified Files:
	.cvsignore frescobaldi.spec sources 
Log Message:
* Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
- New upstream version
- No need to rebuild .mo and .png files per new guidelines



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Jul 2009 17:38:22 -0000	1.6
+++ .cvsignore	11 Aug 2009 03:42:15 -0000	1.7
@@ -1 +1 @@
-frescobaldi-0.7.12.tar.gz
+frescobaldi-0.7.13.tar.gz


Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-11/frescobaldi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- frescobaldi.spec	6 Jul 2009 17:38:22 -0000	1.5
+++ frescobaldi.spec	11 Aug 2009 03:42:15 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           frescobaldi
-Version:        0.7.12
+Version:        0.7.13
 Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
@@ -55,10 +55,6 @@ yet lightweight and easy to use. It feat
 %prep
 %setup -q
 
-# We want to build everything from source
-rm -f po/*.mo
-rm -f pics/*.png
-
 %build
 %{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
 make %{?_smp_mflags} VERBOSE=1 
@@ -88,6 +84,7 @@ desktop-file-install                    
    --dir=%{buildroot}%{_datadir}/applications                \
    --remove-category=Application                             \
    --add-category=AudioVideo                                 \
+   --add-category=X-Notation                                 \
    --delete-original                                         \
    %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
@@ -122,6 +119,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
+- New upstream version
+- No need to rebuild .mo and .png files per new guidelines
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-3
+- Update the .desktop file
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Jul 2009 17:38:22 -0000	1.6
+++ sources	11 Aug 2009 03:42:15 -0000	1.7
@@ -1 +1 @@
-245724430f80085b1ed8ad87535beef7  frescobaldi-0.7.12.tar.gz
+320a7e8b7112d4f370de4a745cdca922  frescobaldi-0.7.13.tar.gz



From oget at fedoraproject.org  Tue Aug 11 03:43:02 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 11 Aug 2009 03:43:02 +0000 (UTC)
Subject: rpms/frescobaldi/F-10 .cvsignore, 1.6, 1.7 frescobaldi.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090811034302.0CF3A11C0097@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/frescobaldi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32265

Modified Files:
	.cvsignore frescobaldi.spec sources 
Log Message:
* Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
- New upstream version
- No need to rebuild .mo and .png files per new guidelines



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Jul 2009 17:39:29 -0000	1.6
+++ .cvsignore	11 Aug 2009 03:43:01 -0000	1.7
@@ -1 +1 @@
-frescobaldi-0.7.12.tar.gz
+frescobaldi-0.7.13.tar.gz


Index: frescobaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/frescobaldi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- frescobaldi.spec	6 Jul 2009 17:39:29 -0000	1.5
+++ frescobaldi.spec	11 Aug 2009 03:43:01 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           frescobaldi
-Version:        0.7.12
+Version:        0.7.13
 Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
@@ -55,10 +55,6 @@ yet lightweight and easy to use. It feat
 %prep
 %setup -q
 
-# We want to build everything from source
-rm -f po/*.mo
-rm -f pics/*.png
-
 %build
 %{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
 make %{?_smp_mflags} VERBOSE=1 
@@ -88,6 +84,7 @@ desktop-file-install                    
    --dir=%{buildroot}%{_datadir}/applications                \
    --remove-category=Application                             \
    --add-category=AudioVideo                                 \
+   --add-category=X-Notation                                 \
    --delete-original                                         \
    %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
@@ -122,6 +119,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/kde4/apps/%{name}/
 
 %changelog
+* Mon Aug 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.13-1
+- New upstream version
+- No need to rebuild .mo and .png files per new guidelines
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-3
+- Update the .desktop file
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.7.12-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frescobaldi/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Jul 2009 17:39:29 -0000	1.6
+++ sources	11 Aug 2009 03:43:01 -0000	1.7
@@ -1 +1 @@
-245724430f80085b1ed8ad87535beef7  frescobaldi-0.7.12.tar.gz
+320a7e8b7112d4f370de4a745cdca922  frescobaldi-0.7.13.tar.gz



From bojan at fedoraproject.org  Tue Aug 11 03:45:38 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 03:45:38 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.28,1.29
Message-ID: <20090811034538.4026611C0097@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32628

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.4.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- subversion-api-docs.spec	27 Jul 2009 04:57:56 -0000	1.28
+++ subversion-api-docs.spec	11 Aug 2009 03:45:38 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
-Version:        1.6.3
-Release:        2%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-1
+- bump up to 1.6.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Aug 11 03:46:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 03:46:07 +0000 (UTC)
Subject: rpms/orca/devel orca.spec,1.93,1.94
Message-ID: <20090811034607.3F48A11C0097@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32718

Modified Files:
	orca.spec 
Log Message:
fix BRs



Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- orca.spec	11 Aug 2009 03:34:05 -0000	1.93
+++ orca.spec	11 Aug 2009 03:46:07 -0000	1.94
@@ -41,6 +41,7 @@ BuildRequires:	intltool
 BuildRequires:  gnome-python2-bonobo
 BuildRequires:  gnome-python2-libwnck
 BuildRequires:  gnome-python2-gconf
+BuildRequires:  at-spi-python
 Obsoletes:	gnopernicus
 Provides:	gnopernicus
 



From bojan at fedoraproject.org  Tue Aug 11 03:46:47 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 03:46:47 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-11 subversion-api-docs.spec,1.26,1.27
Message-ID: <20090811034647.B8F7411C0097@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-serv1167

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.4.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-11/subversion-api-docs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- subversion-api-docs.spec	28 May 2009 22:02:02 -0000	1.26
+++ subversion-api-docs.spec	11 Aug 2009 03:46:47 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           subversion-api-docs
-Version:        1.6.2
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        Subversion API documentation
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-1
+- bump up to 1.6.4
+
 * Fri May 29 2009 Bojan Smojver <bojan at rexursive.com> 1.6.2-1
 - bump up to 1.6.2
 



From pkgdb at fedoraproject.org  Tue Aug 11 03:46:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:46:45 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested commit
Message-ID: <20090811034646.31E5410F880@bastion2.fedora.phx.redhat.com>

fujiwara has requested the commit acl on ibus-anthy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:47:16 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested watchcommits
Message-ID: <20090811034719.4390110F880@bastion2.fedora.phx.redhat.com>

fujiwara has requested the watchcommits acl on ibus-anthy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:48:19 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested approveacls
Message-ID: <20090811034819.506A110F880@bastion2.fedora.phx.redhat.com>

fujiwara has requested the approveacls acl on ibus-anthy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:49:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:49:01 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested watchcommits
Message-ID: <20090811034902.54B3410F880@bastion2.fedora.phx.redhat.com>

fujiwara has requested the watchcommits acl on ibus-anthy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:49:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:49:05 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested commit
Message-ID: <20090811034905.8C76710F89C@bastion2.fedora.phx.redhat.com>

fujiwara has requested the commit acl on ibus-anthy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:49:10 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested approveacls
Message-ID: <20090811034910.D656410F8B2@bastion2.fedora.phx.redhat.com>

fujiwara has requested the approveacls acl on ibus-anthy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From deji at fedoraproject.org  Tue Aug 11 03:49:11 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 03:49:11 +0000 (UTC)
Subject: rpms/gparted/devel .cvsignore, 1.22, 1.23 gparted.spec, 1.53,
	1.54 sources, 1.22, 1.23
Message-ID: <20090811034911.69FFF11C0097@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1560

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	10 May 2009 23:18:25 -0000	1.22
+++ .cvsignore	11 Aug 2009 03:49:10 -0000	1.23
@@ -1 +1 @@
-gparted-0.4.5.tar.bz2
+gparted-0.4.6.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gparted.spec	25 Jul 2009 01:06:25 -0000	1.53
+++ gparted.spec	11 Aug 2009 03:49:11 -0000	1.54
@@ -1,7 +1,7 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.4.5
-Release:	3%{?dist}.1
+Version:	0.4.6
+Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
@@ -89,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.6-1
+- New upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	10 May 2009 23:18:25 -0000	1.22
+++ sources	11 Aug 2009 03:49:11 -0000	1.23
@@ -1 +1 @@
-d3c7034fb843c2769e59c77d6f4f890a  gparted-0.4.5.tar.bz2
+f070f83d6f66aa3c56896735b7bb0d23  gparted-0.4.6.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 03:49:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:49:30 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested watchcommits
Message-ID: <20090811034930.C484E10F899@bastion2.fedora.phx.redhat.com>

fujiwara has requested the watchcommits acl on ibus-anthy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:49:32 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested commit
Message-ID: <20090811034932.CDC8E10F8B6@bastion2.fedora.phx.redhat.com>

fujiwara has requested the commit acl on ibus-anthy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:49:35 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested approveacls
Message-ID: <20090811034935.7158710F8BA@bastion2.fedora.phx.redhat.com>

fujiwara has requested the approveacls acl on ibus-anthy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:51:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:51:01 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has requested watchbugzilla
Message-ID: <20090811035101.6C89C10F89B@bastion2.fedora.phx.redhat.com>

fujiwara has requested the watchbugzilla acl on ibus-anthy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 03:51:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 03:51:04 +0000
Subject: [pkgdb] ibus-anthy: fujiwara has given up watchbugzilla
Message-ID: <20090811035105.2CA7710F89C@bastion2.fedora.phx.redhat.com>

fujiwara has given up the watchbugzilla acl on ibus-anthy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From bojan at fedoraproject.org  Tue Aug 11 03:53:07 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 03:53:07 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-10 subversion-api-docs.spec,1.20,1.21
Message-ID: <20090811035307.E4AC011C0097@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2071

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.4.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-10/subversion-api-docs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- subversion-api-docs.spec	28 May 2009 22:06:41 -0000	1.20
+++ subversion-api-docs.spec	11 Aug 2009 03:53:07 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           subversion-api-docs
-Version:        1.6.2
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        Subversion API documentation
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-1
+- bump up to 1.6.4
+
 * Fri May 29 2009 Bojan Smojver <bojan at rexursive.com> 1.6.2-1
 - bump up to 1.6.2
 



From mclasen at fedoraproject.org  Tue Aug 11 04:01:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:01:54 +0000 (UTC)
Subject: rpms/orca/devel orca.spec,1.94,1.95
Message-ID: <20090811040154.1D71811C0097@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2546

Modified Files:
	orca.spec 
Log Message:
more BRs



Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- orca.spec	11 Aug 2009 03:46:07 -0000	1.94
+++ orca.spec	11 Aug 2009 04:01:53 -0000	1.95
@@ -42,6 +42,7 @@ BuildRequires:  gnome-python2-bonobo
 BuildRequires:  gnome-python2-libwnck
 BuildRequires:  gnome-python2-gconf
 BuildRequires:  at-spi-python
+BuildRequires:  dbus-python
 Obsoletes:	gnopernicus
 Provides:	gnopernicus
 



From pnemade at fedoraproject.org  Tue Aug 11 04:04:03 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 11 Aug 2009 04:04:03 +0000 (UTC)
Subject: rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.18,1.19
Message-ID: <20090811040403.0815911C0347@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/fonts-ISO8859-2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19009

Modified Files:
	fonts-ISO8859-2.spec 
Log Message:
* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-22
- Fixed for Source Audit 2009-08-10




Index: fonts-ISO8859-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fonts-ISO8859-2.spec	24 Jul 2009 23:00:10 -0000	1.18
+++ fonts-ISO8859-2.spec	11 Aug 2009 04:04:02 -0000	1.19
@@ -1,5 +1,3 @@
-%define include_ulT1mo	0
-
 %define ISONAME ISO8859-2
 
 %define __mkfontdir umask 133;mkfontdir
@@ -9,12 +7,10 @@
 
 Name: fonts-%{ISONAME}
 Version: 1.0
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: MIT
-Source: http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
-%if %{include_ulT1mo}
-Source1: http://www.intersoft.cz/linux/fonts/ulT1mo-beta-1.0.tar.gz
-%endif
+# Upstream url http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz is dead now.
+Source: ISO8859-2-bdf.tar.gz
 
 Patch0: XFree86-ISO8859-2-1.0-redhat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,43 +62,24 @@ were taken from the Internet or CDs.
 
 
 %prep
-%if %{include_ulT1mo}
-%setup -c -q -a 1
-%else
 %setup -c -q
-%endif
 
 %patch0 -p1 -b .redhat
 
 %build
 make all
-%if %{include_ulT1mo}
-make all -C ulT1mo-beta-1.0
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 DSTFONT=$RPM_BUILD_ROOT/usr/share/fonts/%{ISONAME}
 make install PREFIX=$RPM_BUILD_ROOT \
 	FONTDIR=$DSTFONT
-%if %{include_ulT1mo}
-mkdir -p $DSTFONT/Type1/{afm,pfm}
-(
-	cd ulT1mo-beta-1.0 ;
-	install -m 644 *.pfb fonts.{alias,dir,scale} $DSTFONT/Type1
-	install -m 644 afm/*.afm $DSTFONT/Type1/afm
-	install -m 644 pfm/*.pfm $DSTFONT/Type1/pfm
-)
-%endif
 
 # Install catalogue symlink
 mkdir -p $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{fontdir}/misc $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2
 ln -sf %{fontdir}/75dpi $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-75dpi
 ln -sf %{fontdir}/100dpi $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-100dpi
-%if %{include_ulT1mo}
-ln -sf %{fontdir}/Type1 $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-Type1
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,12 +99,6 @@ rm -rf $RPM_BUILD_ROOT
     %__mkfontdir /usr/share/fonts/%{ISONAME}/100dpi
 } &> /dev/null || :
 
-%if %{include_ulT1mo}
-%post Type1
-{
-    %__mkfontdir /usr/share/fonts/%{ISONAME}/Type1
-} &> /dev/null || :
-%endif
 
 %files
 %defattr(-,root,root)
@@ -158,23 +129,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{catalogue}
 %{catalogue}/fonts-ISO8859-2-100dpi
 
-%if %{include_ulT1mo}
-%files Type1
-%defattr(-,root,root)
-%dir /usr/share/fonts/%{ISONAME}/Type1
-%dir /usr/share/fonts/%{ISONAME}/Type1/afm
-%dir /usr/share/fonts/%{ISONAME}/Type1/pfm
-/usr/share/fonts/%{ISONAME}/Type1/afm/*
-/usr/share/fonts/%{ISONAME}/Type1/*.pfb
-/usr/share/fonts/%{ISONAME}/Type1/pfm/*
-%config(noreplace) %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.alias
-%verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.scale
-%ghost %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.dir
-%dir %{catalogue}
-%{catalogue}/fonts-ISO8859-2-Type1
-%endif
-
 %changelog
+* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-22
+- Fixed for Source Audit 2009-08-10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Tue Aug 11 04:04:31 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 11 Aug 2009 04:04:31 +0000 (UTC)
Subject: rpms/mash/devel mash-f12key.patch,NONE,1.1 mash.spec,1.57,1.58
Message-ID: <20090811040431.666AB11C0347@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24079

Modified Files:
	mash.spec 
Added Files:
	mash-f12key.patch 
Log Message:
Add F12 key.


mash-f12key.patch:
 rawhide.mash |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mash-f12key.patch ---
commit 190201a52d9067e276f9e71ca5a68a338b4d8917
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Aug 10 15:32:18 2009 -0400

    Add F12 key.

diff --git a/configs/rawhide.mash b/configs/rawhide.mash
index 124de62..6a68ef8 100644
--- a/configs/rawhide.mash
+++ b/configs/rawhide.mash
@@ -10,7 +10,7 @@ multilib_method = devel
 tag = dist-rawhide
 inherit = True
 strict_keys = False
-keys = D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+keys = 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
 repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/
 repoviewtitle = "Fedora Rawhide - %(arch)s"
 arches = i386 x86_64 ppc ppc64


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- mash.spec	10 Aug 2009 16:31:22 -0000	1.57
+++ mash.spec	11 Aug 2009 04:04:31 -0000	1.58
@@ -2,13 +2,14 @@
 
 Name:           mash
 Version:        0.5.8
-Release:        2%{?dist}
+Release:        3%{?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,6 +24,7 @@ any multlib RPMs that are necessary.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* 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
 



From pnemade at fedoraproject.org  Tue Aug 11 04:06:15 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 11 Aug 2009 04:06:15 +0000 (UTC)
Subject: rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.19,1.20
Message-ID: <20090811040615.EB79B11C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/fonts-ISO8859-2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20062

Modified Files:
	fonts-ISO8859-2.spec 
Log Message:
- Remove long time unspported option include_ulT1mo



Index: fonts-ISO8859-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fonts-ISO8859-2.spec	11 Aug 2009 04:04:02 -0000	1.19
+++ fonts-ISO8859-2.spec	11 Aug 2009 04:06:15 -0000	1.20
@@ -47,19 +47,6 @@ Requires: mkfontdir
 This package includes Central European (ISO8859-2) fonts, in 100 dpi
 resolution, for the X Window System.
 
-%if %{include_ulT1mo}
-%package Type1
-Group: User Interface/X
-Summary: Type 1 scalable Central European language (ISO8859-2) fonts for X.
-Requires: mkfontdir
-
-%description Type1
-This package contains Central European Type 1 fonts for the X Window System.
-This set of fonts is known as the ulT1mo (or ultimo) collection.  All of the
-included fonts are copyrighted to their authors and freeware.  Original fonts
-were taken from the Internet or CDs.
-%endif
-
 
 %prep
 %setup -c -q



From mclasen at fedoraproject.org  Tue Aug 11 04:06:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:06:50 +0000 (UTC)
Subject: rpms/brasero/devel brasero.spec,1.59,1.60
Message-ID: <20090811040650.B245211C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13216

Modified Files:
	brasero.spec 
Log Message:
fix file lists



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- brasero.spec	10 Aug 2009 21:40:41 -0000	1.59
+++ brasero.spec	11 Aug 2009 04:06:50 -0000	1.60
@@ -194,7 +194,8 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/brasero
+%doc %{_datadir}/gtk-doc/html/libbrasero-media
+%doc %{_datadir}/gtk-doc/html/libbrasero-burn
 %doc ChangeLog
 %{_includedir}/brasero
 %{_libdir}/*.so



From mclasen at fedoraproject.org  Tue Aug 11 04:12:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:12:55 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.30, 1.31 seahorse.spec, 1.77,
	1.78 sources, 1.32, 1.33
Message-ID: <20090811041255.2F35D11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23960

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	28 Jul 2009 04:42:46 -0000	1.30
+++ .cvsignore	11 Aug 2009 04:12:54 -0000	1.31
@@ -1 +1 @@
-seahorse-2.27.5.tar.bz2
+seahorse-2.27.90.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- seahorse.spec	6 Aug 2009 04:18:59 -0000	1.77
+++ seahorse.spec	11 Aug 2009 04:12:54 -0000	1.78
@@ -1,6 +1,6 @@
 Name: 		seahorse
-Version: 	2.27.5
-Release:        2%{?dist}
+Version: 	2.27.90
+Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -9,8 +9,6 @@ License:        GPLv2+ and LGPLv2+
 URL:            http://projects.gnome.org/seahorse/
 Source:         http://download.gnome.org/sources/seahorse/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# from upstream
-Patch0:		password-tab.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -61,7 +59,6 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
-%patch0 -p1 -b .password-tab
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -166,6 +163,9 @@ fi
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Thu Aug  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Bring the password tab back
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	28 Jul 2009 04:42:47 -0000	1.32
+++ sources	11 Aug 2009 04:12:54 -0000	1.33
@@ -1 +1 @@
-229fd5cd7209d64c9abf4c609715f05c  seahorse-2.27.5.tar.bz2
+f93e734d5d778ff19585696ccce65458  seahorse-2.27.90.tar.bz2



From airlied at fedoraproject.org  Tue Aug 11 04:13:13 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 11 Aug 2009 04:13:13 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-git-e94c7c42ce.patch, NONE,
	1.1 xorg-x11-server.spec, 1.468,
	1.469 xserver-1.6.99-vga-arb.patch, 1.5, 1.6
Message-ID: <20090811041313.3B7BB11C00D7@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24069

Modified Files:
	xorg-x11-server.spec xserver-1.6.99-vga-arb.patch 
Added Files:
	xserver-1.6.99-git-e94c7c42ce.patch 
Log Message:
* Tue Aug 11 2009 Dave Airlie <airlied at redhat.com> 1.6.99-32.20090807
- update to latest -git for EXA fixes


xserver-1.6.99-git-e94c7c42ce.patch:
 configure.ac              |    2 
 exa/exa.c                 |    2 
 exa/exa_migration_mixed.c |   41 ++++++++++---------
 exa/exa_mixed.c           |   44 +++++++++++----------
 mi/mieq.c                 |   95 +++++++++++++++++++++++++---------------------
 5 files changed, 99 insertions(+), 85 deletions(-)

--- NEW FILE xserver-1.6.99-git-e94c7c42ce.patch ---
>From 1dd898dc07dadbb2f115bbb177bb52d05bea2df3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 3 Aug 2009 14:09:32 +1000
Subject: TO git xserver-1.6.99-git-e94c7c42ce.patch

---
diff --git a/configure.ac b/configure.ac
index f19b6fe..69d6abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,7 +709,7 @@ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
 REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.15] [kbproto >= 1.0.3]"
-REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.14]"
+REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.14]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
 dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
diff --git a/exa/exa.c b/exa/exa.c
index c8fe12e..483e3b4 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -336,7 +336,7 @@ ExaDoPrepareAccess(DrawablePtr pDrawable, int index)
     if (!offscreen) {
 	/* Do we need to allocate our system buffer? */
 	if ((pExaScr->info->flags & EXA_HANDLES_PIXMAPS) && (pExaScr->info->flags & EXA_MIXED_PIXMAPS)) {
-	    if (!pExaPixmap->sys_ptr) {
+	    if (!pExaPixmap->sys_ptr && !exaPixmapIsPinned(pPixmap)) {
 		pExaPixmap->sys_ptr = malloc(pExaPixmap->sys_pitch * pDrawable->height);
 		if (!pExaPixmap->sys_ptr)
 		    FatalError("EXA: malloc failed for size %d bytes\n", pExaPixmap->sys_pitch * pDrawable->height);
diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index 915bed9..ed0cc14 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -32,32 +32,37 @@
 #include "exa.h"
 
 static void
-exaUploadFallback(PixmapPtr pPixmap, CARD8 *src, int src_pitch,
-	      CARD8 *dst, int dst_pitch)
- {
+exaUploadFallback(PixmapPtr pPixmap, CARD8 *src, int src_pitch)
+{
     ExaPixmapPriv(pPixmap);
     RegionPtr damage = DamageRegion (pExaPixmap->pDamage);
-    int i, cpp = pPixmap->drawable.bitsPerPixel / 8;
-    int bytes, nbox;
+    GCPtr pGC = GetScratchGC (pPixmap->drawable.depth,
+		pPixmap->drawable.pScreen);
+    int nbox, cpp = pPixmap->drawable.bitsPerPixel / 8;
+    DamagePtr backup = pExaPixmap->pDamage;
     BoxPtr pbox;
+    CARD8 *src2;
+
+    /* We don't want damage optimisations. */
+    pExaPixmap->pDamage = NULL;
+    ValidateGC (&pPixmap->drawable, pGC);
 
     pbox = REGION_RECTS(damage);
     nbox = REGION_NUM_RECTS(damage);
 
     while (nbox--) {
-	bytes = (pbox->x2 - pbox->x1) * cpp;
+	src2 = src + pbox->y1 * src_pitch + pbox->x1 * cpp;
 
-	src += pbox->y1 * src_pitch + pbox->x1 * cpp;
-	dst += pbox->y1 * dst_pitch + pbox->x1 * cpp;
-
-	for (i = pbox->y2 - pbox->y1; i; i--) {
-	    memcpy (dst, src, bytes);
-	    src += src_pitch;
-	    dst += dst_pitch;
-	}
+	ExaCheckPutImage(&pPixmap->drawable, pGC,
+	    pPixmap->drawable.depth, pbox->x1, pbox->y1,
+	    pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 0,
+	    ZPixmap, (char*) src2);
 
 	pbox++;
     }
+
+    FreeScratchGC (pGC);
+    pExaPixmap->pDamage = backup;
 }
 
 void
@@ -99,7 +104,8 @@ exaCreateDriverPixmap_mixed(PixmapPtr pPixmap)
 	return;
 
     pExaPixmap->offscreen = TRUE;
-    pExaPixmap->sys_ptr = NULL;
+    pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr = NULL;
+    pExaPixmap->sys_pitch = pPixmap->devKind = 0;
 
     pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
     (*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0,
@@ -130,10 +136,7 @@ exaCreateDriverPixmap_mixed(PixmapPtr pPixmap)
     goto finish;
 
 fallback:
-    ExaDoPrepareAccess(&pPixmap->drawable, EXA_PREPARE_DEST);
-    exaUploadFallback(pPixmap, sys_buffer, sys_pitch, pPixmap->devPrivate.ptr,
-	exaGetPixmapPitch(pPixmap));
-    exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_DEST);
+    exaUploadFallback(pPixmap, sys_buffer, sys_pitch);
 
 finish:
     free(sys_buffer);
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 47fa6d4..7ba62ea 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -82,12 +82,12 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
     datasize = h * paddedWidth;
 
     /* We will allocate the system pixmap later if needed. */
+    pPixmap->devPrivate.ptr = NULL;
     pExaPixmap->sys_ptr = NULL;
     pExaPixmap->sys_pitch = paddedWidth;
 
     pExaPixmap->area = NULL;
     pExaPixmap->offscreen = FALSE;
-    pExaPixmap->score = EXA_PIXMAP_SCORE_INIT;
     pExaPixmap->fb_ptr = NULL;
     pExaPixmap->pDamage = NULL;
 
@@ -95,19 +95,19 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
     exaSetAccelBlock(pExaScr, pExaPixmap,
 	w, h, bpp);
 
+    /* Avoid freeing sys_ptr. */
+    pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
+
+    (*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0,
+				    paddedWidth, NULL);
+
+    /* We want to be able to transfer the pixmap to driver memory later on. */
+    pExaPixmap->score = EXA_PIXMAP_SCORE_INIT;
+
     /* A scratch pixmap will become a driver pixmap right away. */
     if (!w || !h) {
 	exaCreateDriverPixmap_mixed(pPixmap);
     } else {
-	/* Avoid freeing sys_ptr. */
-	pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
-
-	(*pScreen->ModifyPixmapHeader)(pPixmap, w, h, 0, 0,
-					paddedWidth, NULL);
-
-	/* We want to be able to copy the pixmap to driver memory later on. */
-	pExaPixmap->score = EXA_PIXMAP_SCORE_INIT;
-
 	/* Set up damage tracking */
 	pExaPixmap->pDamage = DamageCreate (NULL, NULL,
 					    DamageReportNone, TRUE,
@@ -145,20 +145,22 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
     pExaPixmap = ExaGetPixmapPriv(pPixmap);
 
     if (pExaPixmap) {
-        if (pPixData) {
-	    if (!exaPixmapIsPinned(pPixmap)) {
-		free(pExaPixmap->sys_ptr);
-
-		/* We no longer need this. */
-		if (pExaPixmap->pDamage) {
-		    DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
-		    DamageDestroy(pExaPixmap->pDamage);
-		    pExaPixmap->pDamage = NULL;
-		}
+	if (!exaPixmapIsPinned(pPixmap)) {
+	    free(pExaPixmap->sys_ptr);
+	    pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr = NULL;
+	    pExaPixmap->sys_pitch = pPixmap->devKind = 0;
+
+	    /* We no longer need this. */
+	    if (pExaPixmap->pDamage) {
+		DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
+		DamageDestroy(pExaPixmap->pDamage);
+		pExaPixmap->pDamage = NULL;
 	    }
-            pExaPixmap->sys_ptr = pPixData;
 	}
 
+        if (pPixData)
+            pExaPixmap->sys_ptr = pPixData;
+
         if (devKind > 0)
             pExaPixmap->sys_pitch = devKind;
 
diff --git a/mi/mieq.c b/mi/mieq.c
index 6ec2dba..1b81e4d 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -159,26 +159,26 @@ mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e)
 
     if (isMotion && isMotion == miEventQueue.lastMotion &&
         oldtail != miEventQueue.head) {
-	oldtail = (oldtail - 1) % QUEUE_SIZE;
+        oldtail = (oldtail - 1) % QUEUE_SIZE;
     }
     else {
-	static int stuck = 0;
-	/* Toss events which come in late.  Usually this means your server's
+        static int stuck = 0;
+        /* Toss events which come in late.  Usually this means your server's
          * stuck in an infinite loop somewhere, but SIGIO is still getting
          * handled. */
-	if (((oldtail + 1) % QUEUE_SIZE) == miEventQueue.head) {
-	    if (!stuck) {
+        if (((oldtail + 1) % QUEUE_SIZE) == miEventQueue.head) {
+            if (!stuck) {
                 ErrorF("[mi] EQ overflowing. The server is probably stuck "
                         "in an infinite loop.\n");
-		xorg_backtrace();
-		stuck = 1;
-	    }
+                xorg_backtrace();
+                stuck = 1;
+            }
 #ifdef XQUARTZ
-	    pthread_mutex_unlock(&miEventQueueMutex);
+            pthread_mutex_unlock(&miEventQueueMutex);
 #endif
-	    return;
+	        return;
         }
-	stuck = 0;
+        stuck = 0;
     }
 
     evlen = e->any.length;
@@ -225,7 +225,7 @@ mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX)
 #endif
     EnqueueScreen(pDev) = pScreen;
     if (fromDIX)
-	DequeueScreen(pDev) = pScreen;
+        DequeueScreen(pDev) = pScreen;
 #ifdef XQUARTZ
     pthread_mutex_unlock(&miEventQueueMutex);
 #endif
@@ -267,8 +267,8 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent* event)
             event->device.deviceid = dev->id;
             break;
 #if XFreeXDGA
-	case ET_DGAEvent:
-	    break;
+        case ET_DGAEvent:
+            break;
 #endif
         case ET_RawKeyPress:
         case ET_RawKeyRelease:
@@ -367,39 +367,48 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
     /* Custom event handler */
     handler = miEventQueue.handlers[event->any.type];
 
-    if (dev && screen && screen != DequeueScreen(dev) && !handler) {
-        /* Assumption - screen switching can only occur on motion events. */
-        DequeueScreen(dev) = screen;
-        x = event->device.root_x;
-        y = event->device.root_y;
-        NewCurrentScreen (dev, DequeueScreen(dev), x, y);
+    switch (event->any.type) {
+        /* Catch events that include valuator information and check if they
+         * are changing the screen */
+        case ET_Motion:
+        case ET_KeyPress:
+        case ET_KeyRelease:
+        case ET_ButtonPress:
+        case ET_ButtonRelease:
+            if (dev && screen && screen != DequeueScreen(dev) && !handler) {
+                DequeueScreen(dev) = screen;
+                x = event->device.root_x;
+                y = event->device.root_y;
+                NewCurrentScreen (dev, DequeueScreen(dev), x, y);
+            }
+            break;
+        default:
+            break;
     }
-    else {
-        master = CopyGetMasterEvent(dev, event, &mevent);
+    master = CopyGetMasterEvent(dev, event, &mevent);
 
-        if (master)
-            master->u.lastSlave = dev;
+    if (master)
+        master->u.lastSlave = dev;
 
-        /* If someone's registered a custom event handler, let them
-         * steal it. */
-        if (handler)
-        {
-            int screenNum = dev && DequeueScreen(dev) ? DequeueScreen(dev)->myNum : (screen ? screen->myNum : 0);
-            handler(screenNum, event, dev);
-            /* Check for the SD's master in case the device got detached
-             * during event processing */
-            if (master && dev->u.master)
-                handler(screenNum, &mevent, master);
-        } else
-        {
-            /* process slave first, then master */
-            dev->public.processInputProc(event, dev);
+    /* If someone's registered a custom event handler, let them
+     * steal it. */
+    if (handler)
+    {
+        int screenNum = dev && DequeueScreen(dev) ? DequeueScreen(dev)->myNum : (screen ? screen->myNum : 0);
+        handler(screenNum, event, dev);
+        /* Check for the SD's master in case the device got detached
+         * during event processing */
+        if (master && dev->u.master)
+            handler(screenNum, &mevent, master);
+    } else
+    {
+        /* process slave first, then master */
+        dev->public.processInputProc(event, dev);
 
-            /* Check for the SD's master in case the device got detached
-             * during event processing */
-            if (master && dev->u.master)
-                master->public.processInputProc(&mevent, master);
-        }
+        /* Check for the SD's master in case the device got detached
+         * during event processing */
+        if (master && dev->u.master)
+            master->public.processInputProc(&mevent, master);
     }
 }
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- xorg-x11-server.spec	11 Aug 2009 00:02:08 -0000	1.468
+++ xorg-x11-server.spec	11 Aug 2009 04:13:12 -0000	1.469
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   31.%{gitdate}%{?dist}
+Release:   32.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -46,6 +46,7 @@ Source20:  http://svn.exactcode.de/t2/tr
 Source30: find-provides
 #define __find_provides {nil}
 
+Patch0: xserver-1.6.99-git-e94c7c42ce.patch
 Patch5: xserver-1.4.99-pic-libxf86config.patch
 Patch10: xserver-1.6.99-linkmap.patch
 
@@ -510,6 +511,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Aug 11 2009 Dave Airlie <airlied at redhat.com> 1.6.99-32.20090807
+- update to latest -git for EXA fixes
+
 * Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 1.6.99-31.20090807
 - Move libxf86config.a back to -server-devel
 - xserver-1.6.99-show-ugly-cursor.patch: Un-suppress the initial root cursor

xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1151 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1522 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xserver-1.6.99-vga-arb.patch	5 Aug 2009 17:55:58 -0000	1.5
+++ xserver-1.6.99-vga-arb.patch	11 Aug 2009 04:13:13 -0000	1.6
@@ -267,7 +267,7 @@ index 0000000..13802cd
 +#include "pciaccess.h"
 +
 +#ifdef DEBUG
-+#error no, really, you don't want to do this
++#error "no, really, you dont want to do this"
 +#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
 +#define DPRINT(x) ErrorF(x "\n");
 +#else



From mclasen at fedoraproject.org  Tue Aug 11 04:14:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:14:31 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.63, 1.64 gnome-keyring.spec, 
	1.127, 1.128 sources, 1.63, 1.64
Message-ID: <20090811041431.928D211C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24297

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	28 Jul 2009 04:07:16 -0000	1.63
+++ .cvsignore	11 Aug 2009 04:14:31 -0000	1.64
@@ -1 +1 @@
-gnome-keyring-2.27.5.tar.bz2
+gnome-keyring-2.27.90.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- gnome-keyring.spec	28 Jul 2009 04:07:16 -0000	1.127
+++ gnome-keyring.spec	11 Aug 2009 04:14:31 -0000	1.128
@@ -7,7 +7,7 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.27.5
+Version: 2.27.90
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -141,6 +141,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	28 Jul 2009 04:07:16 -0000	1.63
+++ sources	11 Aug 2009 04:14:31 -0000	1.64
@@ -1 +1 @@
-51f0cba377ca864c20e88b0aab44f6c3  gnome-keyring-2.27.5.tar.bz2
+0734f60d9f0eb3667244cdcf6b4b44fe  gnome-keyring-2.27.90.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 04:20:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:20:47 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.84, 1.85 epiphany.spec, 1.238,
	1.239 sources, 1.87, 1.88
Message-ID: <20090811042047.4F5D111C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25635

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	28 Jul 2009 17:25:42 -0000	1.84
+++ .cvsignore	11 Aug 2009 04:20:47 -0000	1.85
@@ -1 +1 @@
-epiphany-2.27.5.tar.bz2
+epiphany-2.27.90.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- epiphany.spec	10 Aug 2009 20:29:45 -0000	1.238
+++ epiphany.spec	11 Aug 2009 04:20:47 -0000	1.239
@@ -7,8 +7,8 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.27.5
-Release: 2%{?dist}
+Version: 2.27.90
+Release: 1%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Fix a mnemonic mishap
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	28 Jul 2009 17:25:42 -0000	1.87
+++ sources	11 Aug 2009 04:20:47 -0000	1.88
@@ -1 +1 @@
-3120755f874853e69f9f501bbd4da1ba  epiphany-2.27.5.tar.bz2
+afdba03b15e6e4e40b5e46edc592d847  epiphany-2.27.90.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 04:22:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:22:35 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.80, 1.81 gnome-themes.spec,
	1.144, 1.145 sources, 1.85, 1.86
Message-ID: <20090811042235.57B9511C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25921

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	14 Jul 2009 03:48:01 -0000	1.80
+++ .cvsignore	11 Aug 2009 04:22:35 -0000	1.81
@@ -1 +1 @@
-gnome-themes-2.27.4.tar.bz2
+gnome-themes-2.27.90.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- gnome-themes.spec	25 Jul 2009 00:48:59 -0000	1.144
+++ gnome-themes.spec	11 Aug 2009 04:22:35 -0000	1.145
@@ -1,7 +1,7 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.27.4
-Release:2%{?dist}
+Version: 2.27.90
+Release:1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.27/%{name}-%{version}.tar.bz2
 License: LGPLv2 and GPLv2
@@ -97,6 +97,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Tue Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	14 Jul 2009 03:48:02 -0000	1.85
+++ sources	11 Aug 2009 04:22:35 -0000	1.86
@@ -1 +1 @@
-05b17f77d7c9837260637e59148574d0  gnome-themes-2.27.4.tar.bz2
+08d107578b73f037c7abee2b0069df39  gnome-themes-2.27.90.tar.bz2



From deji at fedoraproject.org  Tue Aug 11 04:25:18 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 04:25:18 +0000 (UTC)
Subject: rpms/referencer/devel .cvsignore, 1.9,
	1.10 referencer-pythondir.patch, 
	1.4, 1.5 referencer.spec, 1.22, 1.23 sources, 1.9,
	1.10 referencer-gcc44.patch, 1.1,
	NONE referencer-gconf-changes.patch, 1.1, NONE
Message-ID: <20090811042518.38A1A11C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26337

Modified Files:
	.cvsignore referencer-pythondir.patch referencer.spec sources 
Removed Files:
	referencer-gcc44.patch referencer-gconf-changes.patch 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Nov 2008 03:49:21 -0000	1.9
+++ .cvsignore	11 Aug 2009 04:25:17 -0000	1.10
@@ -1 +1 @@
-referencer-1.1.5.tar.gz
+referencer-1.1.6.tar.gz

referencer-pythondir.patch:
 plugins/Makefile.am |    2 +-
 plugins/Makefile.in |    2 +-
 src/Makefile.am     |    2 +-
 src/Makefile.in     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: referencer-pythondir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer-pythondir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- referencer-pythondir.patch	30 Aug 2008 12:28:14 -0000	1.4
+++ referencer-pythondir.patch	11 Aug 2009 04:25:17 -0000	1.5
@@ -1,24 +1,16 @@
---- plugins/Makefile.am	2008-01-06 03:20:29.000000000 -0500
-+++ plugins/Makefile.am.new	2008-02-08 23:41:52.000000000 -0500
-@@ -1,4 +1,4 @@
--plugindir   = $(pkglibdir)
-+plugindir   = $(pkgpythondir)
- plugin_DATA = pubmed.py lyx.py lyx.png
- 
- EXTRA_DIST =	\
---- plugins/Makefile.in	2008-02-07 14:42:32.000000000 -0500
-+++ plugins/Makefile.in.new	2008-02-08 23:41:27.000000000 -0500
-@@ -206,7 +206,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
+--- src/Makefile.in	2009-06-21 07:48:43.000000000 -0400
++++ src/Makefile.in.new	2009-08-10 23:59:37.850193070 -0400
+@@ -224,7 +224,7 @@
  top_srcdir = @top_srcdir@
--plugindir = $(pkglibdir)
-+plugindir = $(pkgpythondir)
- plugin_DATA = pubmed.py lyx.py lyx.png
- EXTRA_DIST = \
- 	$(plugin_DATA)
---- src/Makefile.am	2008-04-19 11:41:31.000000000 -0400
-+++ src/Makefile.am.new	2008-05-22 19:16:59.000000000 -0400
+ INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+-	-DPLUGINDIR=\""$(pkglibdir)"\" $(am__append_1)
++	-DPLUGINDIR=\""$(pkgpythondir)"\" $(am__append_1)
+ LDADD = $(DEPS_LIBS) $(top_builddir)/libbibutils/libbibutils.a \
+ 	$(am__append_2)
+ referencer_SOURCES = \
+--- src/Makefile.am	2008-08-03 07:30:57.000000000 -0400
++++ src/Makefile.am.new	2009-08-11 00:11:16.559479119 -0400
 @@ -4,7 +4,7 @@
  
  INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
@@ -28,14 +20,22 @@
  
  LDADD = \
  	$(DEPS_LIBS) \
---- src/Makefile.in	2008-04-19 11:50:45.000000000 -0400
-+++ src/Makefile.in.new	2008-05-22 19:19:31.000000000 -0400
-@@ -240,7 +240,7 @@
+--- plugins/Makefile.in	2009-06-21 07:48:43.000000000 -0400
++++ plugins/Makefile.in.new	2009-08-10 23:56:07.516477865 -0400
+@@ -190,7 +190,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
- 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
--	-DPLUGINDIR=\""$(pkglibdir)"\" $(am__append_1)
-+	-DPLUGINDIR=\""$(pkgpythondir)"\" $(am__append_1)
- LDADD = $(DEPS_LIBS) $(top_builddir)/libbibutils/libbibutils.a \
- 	$(am__append_2)
- referencer_SOURCES = \
+-plugindir = $(pkglibdir)
++plugindir = $(pkgpythondir)
+ plugin_DATA = pubmed.py lyx.py lyx.png
+ EXTRA_DIST = \
+ 	$(plugin_DATA)
+--- plugins/Makefile.am	2008-04-16 14:35:19.000000000 -0400
++++ plugins/Makefile.am.new	2009-08-11 00:13:22.200227273 -0400
+@@ -1,4 +1,4 @@
+-plugindir   = $(pkglibdir)
++plugindir   = $(pkgpythondir)
+ plugin_DATA = pubmed.py lyx.py lyx.png
+ 
+ EXTRA_DIST =	\


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- referencer.spec	27 Jul 2009 02:56:02 -0000	1.22
+++ referencer.spec	11 Aug 2009 04:25:17 -0000	1.23
@@ -2,15 +2,13 @@
 
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
-Version:	1.1.5
-Release:	8%{?dist}
+Version:	1.1.6
+Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
 Patch0:		referencer-pythondir.patch
-Patch1:		referencer-gcc44.patch
-Patch2:		referencer-gconf-changes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-glib-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++ python-devel
@@ -26,8 +24,6 @@ import from BibTeX, Reference Manager an
 %prep
 %setup -q
 %patch0 -p0 -b .pyt
-%patch1 -p0 -b .gcc44
-%patch2 -p0 -b .gconf
 
 %build
 %configure --disable-update-mime-database
@@ -81,6 +77,9 @@ update-mime-database %{_datadir}/mime &>
 %{python_sitelib}/referencer/
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.6-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Nov 2008 03:49:22 -0000	1.9
+++ sources	11 Aug 2009 04:25:17 -0000	1.10
@@ -1 +1 @@
-b9eb84b01171882e0cbae516ef9dbc97  referencer-1.1.5.tar.gz
+2a165464a67437b4231f57b6d04ce54b  referencer-1.1.6.tar.gz


--- referencer-gcc44.patch DELETED ---


--- referencer-gconf-changes.patch DELETED ---



From mclasen at fedoraproject.org  Tue Aug 11 04:27:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:27:21 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.6, 1.7 libchamplain.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090811042721.5E52E11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26417

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
0.3.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 02:33:41 -0000	1.6
+++ .cvsignore	11 Aug 2009 04:27:20 -0000	1.7
@@ -1 +1 @@
-libchamplain-0.3.6.tar.bz2
+libchamplain-0.3.90.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libchamplain.spec	4 Aug 2009 02:33:41 -0000	1.7
+++ libchamplain.spec	11 Aug 2009 04:27:21 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.3.6
+Version:	0.3.90
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -132,7 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %changelog
-* Mon Aug  3 2009 <atthias clasen <mclasen at redhat.com> - 0.3.6-1
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.90-1
+- Update to 0.3.90
+
+* Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.6-1
 - Update to 0.3.6
 
 * Sat Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 02:33:41 -0000	1.6
+++ sources	11 Aug 2009 04:27:21 -0000	1.7
@@ -1 +1 @@
-238adac0a63591338116f59aba1c09aa  libchamplain-0.3.6.tar.bz2
+7a09721b41cba2947bdc9ab4216e34a9  libchamplain-0.3.90.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 04:28:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:28:44 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.25, 1.26 mousetweaks.spec, 1.32,
	1.33 sources, 1.25, 1.26
Message-ID: <20090811042844.DDACB11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26652

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	28 Jul 2009 04:32:07 -0000	1.25
+++ .cvsignore	11 Aug 2009 04:28:44 -0000	1.26
@@ -1 +1 @@
-mousetweaks-2.27.5.tar.bz2
+mousetweaks-2.27.90.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mousetweaks.spec	28 Jul 2009 04:32:07 -0000	1.32
+++ mousetweaks.spec	11 Aug 2009 04:28:44 -0000	1.33
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.27.5
+Version:	2.27.90
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -108,6 +108,9 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	28 Jul 2009 04:32:07 -0000	1.25
+++ sources	11 Aug 2009 04:28:44 -0000	1.26
@@ -1 +1 @@
-08bd61efa64841033ec0ced96d39611c  mousetweaks-2.27.5.tar.bz2
+7efc79e4f3cba91ceda99b33bca6b11d  mousetweaks-2.27.90.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 04:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:29:24 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811042924.3BDBD10F876@bastion2.fedora.phx.redhat.com>

petersen has set the watchcommits acl on ibus-anthy (Fedora devel) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 04:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:29:29 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811042929.E3E2910F89B@bastion2.fedora.phx.redhat.com>

petersen has set the commit acl on ibus-anthy (Fedora devel) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 04:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:29:48 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811042949.46BD010F876@bastion2.fedora.phx.redhat.com>

petersen has set the watchbugzilla acl on ibus-anthy (Fedora devel) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From deji at fedoraproject.org  Tue Aug 11 04:30:32 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 04:30:32 +0000 (UTC)
Subject: rpms/gparted/F-11 .cvsignore, 1.22, 1.23 gparted.spec, 1.50,
	1.51 sources, 1.22, 1.23
Message-ID: <20090811043032.3971F11C043C@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gparted/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27163

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	10 May 2009 23:28:00 -0000	1.22
+++ .cvsignore	11 Aug 2009 04:30:31 -0000	1.23
@@ -1 +1 @@
-gparted-0.4.5.tar.bz2
+gparted-0.4.6.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/F-11/gparted.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gparted.spec	10 May 2009 23:28:01 -0000	1.50
+++ gparted.spec	11 Aug 2009 04:30:32 -0000	1.51
@@ -1,6 +1,6 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.4.5
+Version:	0.4.6
 Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
@@ -89,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.6-1
+- New upstream version
+
 * Sat May 09 2009 Deji Akingunola <dakingun at gmail.com> - 0.4.5-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	10 May 2009 23:28:01 -0000	1.22
+++ sources	11 Aug 2009 04:30:32 -0000	1.23
@@ -1 +1 @@
-d3c7034fb843c2769e59c77d6f4f890a  gparted-0.4.5.tar.bz2
+f070f83d6f66aa3c56896735b7bb0d23  gparted-0.4.6.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 04:31:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:31:24 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.93, 1.94 gedit.spec, 1.200,
	1.201 sources, 1.95, 1.96
Message-ID: <20090811043124.4ED7811C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27383

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.27.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	28 Jul 2009 04:55:15 -0000	1.93
+++ .cvsignore	11 Aug 2009 04:31:24 -0000	1.94
@@ -1 +1 @@
-gedit-2.27.3.tar.bz2
+gedit-2.27.4.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- gedit.spec	28 Jul 2009 05:06:58 -0000	1.200
+++ gedit.spec	11 Aug 2009 04:31:24 -0000	1.201
@@ -17,7 +17,7 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.27.3
+Version: 	2.27.4
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.4-1
+- Update to 2.27.4
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.3-1
 - Update to 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	28 Jul 2009 04:55:15 -0000	1.95
+++ sources	11 Aug 2009 04:31:24 -0000	1.96
@@ -1 +1 @@
-1ef74d1e49a36c1eb53cfcd5695d2d8e  gedit-2.27.3.tar.bz2
+4797c4f48806f91b4770a5278ffa3d1e  gedit-2.27.4.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 04:37:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:37:41 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.42, 1.43 gok.spec, 1.84, 1.85 sources, 
	1.42, 1.43
Message-ID: <20090811043741.7979A11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28155

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	28 Jul 2009 17:07:52 -0000	1.42
+++ .cvsignore	11 Aug 2009 04:37:41 -0000	1.43
@@ -1 +1 @@
-gok-2.27.5.tar.bz2
+gok-2.27.90.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- gok.spec	28 Jul 2009 17:07:52 -0000	1.84
+++ gok.spec	11 Aug 2009 04:37:41 -0000	1.85
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.27.5
+Version: 2.27.90
 Release: 1%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
@@ -150,6 +150,9 @@ scrollkeeper-update -q
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	28 Jul 2009 17:07:52 -0000	1.42
+++ sources	11 Aug 2009 04:37:41 -0000	1.43
@@ -1 +1 @@
-9ae756cb0410d650c72f47b1cc3a7be9  gok-2.27.5.tar.bz2
+827dcdc41807a51e6cd106189fa4b26a  gok-2.27.90.tar.bz2



From deji at fedoraproject.org  Tue Aug 11 04:38:44 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 04:38:44 +0000 (UTC)
Subject: rpms/referencer/F-11 .cvsignore, 1.9,
	1.10 referencer-pythondir.patch, 
	1.4, 1.5 referencer.spec, 1.21, 1.22 sources, 1.9,
	1.10 referencer-gcc44.patch, 1.1,
	NONE referencer-gconf-changes.patch, 1.1, NONE
Message-ID: <20090811043844.AACB511C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28400

Modified Files:
	.cvsignore referencer-pythondir.patch referencer.spec sources 
Removed Files:
	referencer-gcc44.patch referencer-gconf-changes.patch 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.6-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Nov 2008 03:49:21 -0000	1.9
+++ .cvsignore	11 Aug 2009 04:38:44 -0000	1.10
@@ -1 +1 @@
-referencer-1.1.5.tar.gz
+referencer-1.1.6.tar.gz

referencer-pythondir.patch:
 plugins/Makefile.am |    2 +-
 plugins/Makefile.in |    2 +-
 src/Makefile.am     |    2 +-
 src/Makefile.in     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: referencer-pythondir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-11/referencer-pythondir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- referencer-pythondir.patch	30 Aug 2008 12:28:14 -0000	1.4
+++ referencer-pythondir.patch	11 Aug 2009 04:38:44 -0000	1.5
@@ -1,24 +1,16 @@
---- plugins/Makefile.am	2008-01-06 03:20:29.000000000 -0500
-+++ plugins/Makefile.am.new	2008-02-08 23:41:52.000000000 -0500
-@@ -1,4 +1,4 @@
--plugindir   = $(pkglibdir)
-+plugindir   = $(pkgpythondir)
- plugin_DATA = pubmed.py lyx.py lyx.png
- 
- EXTRA_DIST =	\
---- plugins/Makefile.in	2008-02-07 14:42:32.000000000 -0500
-+++ plugins/Makefile.in.new	2008-02-08 23:41:27.000000000 -0500
-@@ -206,7 +206,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
+--- src/Makefile.in	2009-06-21 07:48:43.000000000 -0400
++++ src/Makefile.in.new	2009-08-10 23:59:37.850193070 -0400
+@@ -224,7 +224,7 @@
  top_srcdir = @top_srcdir@
--plugindir = $(pkglibdir)
-+plugindir = $(pkgpythondir)
- plugin_DATA = pubmed.py lyx.py lyx.png
- EXTRA_DIST = \
- 	$(plugin_DATA)
---- src/Makefile.am	2008-04-19 11:41:31.000000000 -0400
-+++ src/Makefile.am.new	2008-05-22 19:16:59.000000000 -0400
+ INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+-	-DPLUGINDIR=\""$(pkglibdir)"\" $(am__append_1)
++	-DPLUGINDIR=\""$(pkgpythondir)"\" $(am__append_1)
+ LDADD = $(DEPS_LIBS) $(top_builddir)/libbibutils/libbibutils.a \
+ 	$(am__append_2)
+ referencer_SOURCES = \
+--- src/Makefile.am	2008-08-03 07:30:57.000000000 -0400
++++ src/Makefile.am.new	2009-08-11 00:11:16.559479119 -0400
 @@ -4,7 +4,7 @@
  
  INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
@@ -28,14 +20,22 @@
  
  LDADD = \
  	$(DEPS_LIBS) \
---- src/Makefile.in	2008-04-19 11:50:45.000000000 -0400
-+++ src/Makefile.in.new	2008-05-22 19:19:31.000000000 -0400
-@@ -240,7 +240,7 @@
+--- plugins/Makefile.in	2009-06-21 07:48:43.000000000 -0400
++++ plugins/Makefile.in.new	2009-08-10 23:56:07.516477865 -0400
+@@ -190,7 +190,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- INCLUDES = -DDATADIR=\""$(pkgdatadir)"\" \
- 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
--	-DPLUGINDIR=\""$(pkglibdir)"\" $(am__append_1)
-+	-DPLUGINDIR=\""$(pkgpythondir)"\" $(am__append_1)
- LDADD = $(DEPS_LIBS) $(top_builddir)/libbibutils/libbibutils.a \
- 	$(am__append_2)
- referencer_SOURCES = \
+-plugindir = $(pkglibdir)
++plugindir = $(pkgpythondir)
+ plugin_DATA = pubmed.py lyx.py lyx.png
+ EXTRA_DIST = \
+ 	$(plugin_DATA)
+--- plugins/Makefile.am	2008-04-16 14:35:19.000000000 -0400
++++ plugins/Makefile.am.new	2009-08-11 00:13:22.200227273 -0400
+@@ -1,4 +1,4 @@
+-plugindir   = $(pkglibdir)
++plugindir   = $(pkgpythondir)
+ plugin_DATA = pubmed.py lyx.py lyx.png
+ 
+ EXTRA_DIST =	\


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-11/referencer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- referencer.spec	29 Jun 2009 01:47:28 -0000	1.21
+++ referencer.spec	11 Aug 2009 04:38:44 -0000	1.22
@@ -2,15 +2,13 @@
 
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
-Version:	1.1.5
-Release:	7%{?dist}
+Version:	1.1.6
+Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
 Patch0:		referencer-pythondir.patch
-Patch1:		referencer-gcc44.patch
-Patch2:		referencer-gconf-changes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-glib-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++ python-devel
@@ -26,8 +24,6 @@ import from BibTeX, Reference Manager an
 %prep
 %setup -q
 %patch0 -p0 -b .pyt
-%patch1 -p0 -b .gcc44
-%patch2 -p0 -b .gconf
 
 %build
 %configure --disable-update-mime-database
@@ -81,6 +77,9 @@ update-mime-database %{_datadir}/mime &>
 %{python_sitelib}/referencer/
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.6-1
+- New upstream version
+
 * Sun Jun 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.5-7
 - Fix gconf key lookup if GConf disabledplugin key is not set (Denis Leroy, Fedora bug #508011)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Nov 2008 03:49:22 -0000	1.9
+++ sources	11 Aug 2009 04:38:44 -0000	1.10
@@ -1 +1 @@
-b9eb84b01171882e0cbae516ef9dbc97  referencer-1.1.5.tar.gz
+2a165464a67437b4231f57b6d04ce54b  referencer-1.1.6.tar.gz


--- referencer-gcc44.patch DELETED ---


--- referencer-gconf-changes.patch DELETED ---



From pnemade at fedoraproject.org  Tue Aug 11 04:39:43 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 11 Aug 2009 04:39:43 +0000 (UTC)
Subject: rpms/fontmatrix/devel fontmatrix.spec,1.19,1.20 sources,1.12,1.13
Message-ID: <20090811043943.BEB6111C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/fontmatrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28581

Modified Files:
	fontmatrix.spec sources 
Log Message:
* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 0.6.99-2.r1073
- update to svn revision 1073
- Fix Source Audit 2009-08-10




Index: fontmatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/fontmatrix.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fontmatrix.spec	4 Aug 2009 06:52:56 -0000	1.19
+++ fontmatrix.spec	11 Aug 2009 04:39:43 -0000	1.20
@@ -1,9 +1,9 @@
-%define svnrev 1072
+%define svnrev 1073
 
 Name: fontmatrix
 Summary: A fonts manager
 Version: 0.6.99
-Release: 1.r%{svnrev}%{?dist}
+Release: 2.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -13,7 +13,8 @@ Group: User Interface/X
 #####  $ cmake ../fontmatrix                                                    #####  
 #####  $ make package_source                                                    ##### 
 URL: http://www.fontmatrix.net/
-Source: http://www.fontmatrix.net/archives/%{name}-%{version}-Source.tar.gz
+## Official stable releases can be downloaded from http://www.fontmatrix.net/archives/
+Source: %{name}-%{version}-Source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: qt-devel freetype-devel 
 BuildRequires: desktop-file-utils cmake python-devel
@@ -77,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 0.6.99-2.r1073
+- update to svn revision 1073
+- Fix Source Audit 2009-08-10
+
 * Tue Aug 04 2009 Parag <pnemade at redhat.com> - 0.6.99-1.r1072
 - update to svn revision 1072
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	4 Aug 2009 06:52:56 -0000	1.12
+++ sources	11 Aug 2009 04:39:43 -0000	1.13
@@ -1 +1 @@
-c6f772586bd3b988e42b4b4d55e053df  fontmatrix-0.6.99-Source.tar.gz
+3184a944e38e034a3c7a6e1eadc47951  fontmatrix-0.6.99-Source.tar.gz



From mclasen at fedoraproject.org  Tue Aug 11 04:43:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:43:44 +0000 (UTC)
Subject: rpms/libchamplain/devel libchamplain.spec,1.8,1.9
Message-ID: <20090811044344.75A9811C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29085

Modified Files:
	libchamplain.spec 
Log Message:
Fix spec



Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libchamplain.spec	11 Aug 2009 04:27:21 -0000	1.8
+++ libchamplain.spec	11 Aug 2009 04:43:44 -0000	1.9
@@ -79,7 +79,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.3.so.3.0.0
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.3.0.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From deji at fedoraproject.org  Tue Aug 11 04:46:25 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 04:46:25 +0000 (UTC)
Subject: rpms/xiphos/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xiphos.spec,
	1.2, 1.3
Message-ID: <20090811044625.64DE211C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29408

Modified Files:
	.cvsignore sources xiphos.spec 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 01:25:50 -0000	1.2
+++ .cvsignore	11 Aug 2009 04:46:25 -0000	1.3
@@ -1 +1 @@
-xiphos-3.1.tar.gz
+xiphos-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 01:25:51 -0000	1.2
+++ sources	11 Aug 2009 04:46:25 -0000	1.3
@@ -1 +1 @@
-6ba1c80362ccce30e86d21b775511995  xiphos-3.1.tar.gz
+a968d57375f46ef1cae4a153600616a9  xiphos-3.1.1.tar.gz


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/xiphos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xiphos.spec	27 Jul 2009 08:06:25 -0000	1.2
+++ xiphos.spec	11 Aug 2009 04:46:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xiphos 
-Version:	3.1
-Release:	2%{?dist}
+Version:	3.1.1
+Release:	1%{?dist}
 Summary:	Bible study and research tool
 
 Group:		Applications/Text
@@ -77,6 +77,9 @@ scrollkeeper-update -q || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
+- New upstream version
+
 * 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 pravins at fedoraproject.org  Tue Aug 11 04:49:18 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Tue, 11 Aug 2009 04:49:18 +0000 (UTC)
Subject: rpms/lohit-fonts/devel lohit-fonts.spec,1.15,1.16
Message-ID: <20090811044918.2707411C00D7@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30542

Modified Files:
	lohit-fonts.spec 
Log Message:
* Tue Aug 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-3
- updated source url



Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- lohit-fonts.spec	4 Aug 2009 06:49:40 -0000	1.15
+++ lohit-fonts.spec	11 Aug 2009 04:49:17 -0000	1.16
@@ -8,13 +8,13 @@ Languages.
 
 Name:           %{fontname}-fonts
 Version:        2.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Indian truetype/opentype fonts
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source:        http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-%{version}.tar.gz
+Source:        http://pravins.fedorapeople.org/lohit/lohit-fonts-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -267,6 +267,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-3
+- updated source url
+
 * Tue Aug 04 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-2
 - updated summary for Hindi font package bug 514443
 



From mclasen at fedoraproject.org  Tue Aug 11 04:49:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:49:59 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.53, 1.54 libsoup.spec, 1.97,
	1.98 sources, 1.53, 1.54
Message-ID: <20090811044959.E67C811C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30649

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	28 Jul 2009 04:16:43 -0000	1.53
+++ .cvsignore	11 Aug 2009 04:49:59 -0000	1.54
@@ -1 +1 @@
-libsoup-2.27.5.tar.bz2
+libsoup-2.27.90.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- libsoup.spec	28 Jul 2009 04:16:43 -0000	1.97
+++ libsoup.spec	11 Aug 2009 04:49:59 -0000	1.98
@@ -1,9 +1,9 @@
-%define glib2_version 2.15.3
+%define glib2_version 2.21.3
 
 ### Abstract ###
 
 Name: libsoup
-Version: 2.27.5
+Version: 2.27.90
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	28 Jul 2009 04:16:43 -0000	1.53
+++ sources	11 Aug 2009 04:49:59 -0000	1.54
@@ -1 +1 @@
-3ae21aec88358a88b5552388446eb62e  libsoup-2.27.5.tar.bz2
+5bad95448a9ea59ca590567c41854fbb  libsoup-2.27.90.tar.bz2



From tbreeds at fedoraproject.org  Tue Aug 11 04:51:53 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Tue, 11 Aug 2009 04:51:53 +0000 (UTC)
Subject: rpms/libtopology/devel libtopology.spec,1.4,1.5
Message-ID: <20090811045153.3E65E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/libtopology/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30878

Modified Files:
	libtopology.spec 
Log Message:
Fix FTBS related to doxygen only sometimes creating FreeSans.ttf.



Index: libtopology.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtopology/devel/libtopology.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libtopology.spec	25 Jul 2009 08:47:24 -0000	1.4
+++ libtopology.spec	11 Aug 2009 04:51:53 -0000	1.5
@@ -1,6 +1,6 @@
 name:		libtopology
 Version:	0.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	CPU Topology library
 
 Group:		System Environment/Libraries
@@ -44,7 +44,7 @@ cp -p COPYING README %{buildroot}/%{_def
 cp -p programs/*.c %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/.
 cp -p include/compat.h %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/examples/.
 # We shouldn't package fonts.  They're not required.
-rm doc/generated/latex/FreeSans.ttf
+[ -e doc/generated/latex/FreeSans.ttf ] && rm doc/generated/latex/FreeSans.ttf 
 cp -pr doc/generated/* %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/doc/.
 
 %clean
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_defaultdocdir}/%{name}-%{version}/doc
 
 %changelog
+* Tue Aug 11 2009 tony at bakeyournoodle.com - 0.3-7
+- Fix FTBS problem (#511641)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Aug 11 04:52:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:52:23 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.32, 1.33 cheese.spec, 1.57,
	1.58 sources, 1.32, 1.33
Message-ID: <20090811045223.8735711C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31181

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	28 Jul 2009 04:04:42 -0000	1.32
+++ .cvsignore	11 Aug 2009 04:52:23 -0000	1.33
@@ -1 +1 @@
-cheese-2.27.5.tar.bz2
+cheese-2.27.90.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- cheese.spec	28 Jul 2009 04:04:42 -0000	1.57
+++ cheese.spec	11 Aug 2009 04:52:23 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.27.5
+Version:        2.27.90
 Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
@@ -123,6 +123,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	28 Jul 2009 04:04:42 -0000	1.32
+++ sources	11 Aug 2009 04:52:23 -0000	1.33
@@ -1 +1 @@
-b484ec16704538f4afffe6593a596fa7  cheese-2.27.5.tar.bz2
+3b30e2dba1e5e2c08c71a5b9734b6f27  cheese-2.27.90.tar.bz2



From bruno at fedoraproject.org  Tue Aug 11 04:53:08 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Tue, 11 Aug 2009 04:53:08 +0000 (UTC)
Subject: rpms/colossus/devel .cvsignore, 1.4, 1.5 colossus.spec, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090811045308.9FCB611C00D7@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31193/devel

Modified Files:
	.cvsignore colossus.spec import.log sources 
Log Message:
Rebase to new public build which amoung others things includes using a real
version number for the release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Jul 2009 21:21:36 -0000	1.4
+++ .cvsignore	11 Aug 2009 04:53:08 -0000	1.5
@@ -1 +1 @@
-colossus-20090726-4462.tar.gz
+colossus-20090810-4482.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- colossus.spec	26 Jul 2009 21:21:36 -0000	1.4
+++ colossus.spec	11 Aug 2009 04:53:08 -0000	1.5
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4462
-%define         revdate    20090726
-Version:        0
-Release:        0.5.%{revdate}svn%{rev}%{?dist}
+%define         rev        4482
+%define         revdate    20090810
+Version:        0.9.0
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -73,6 +73,7 @@ echo "libs.dir=%{_javadir}" > local_buil
 # Tell colossus some build info that the game will display
 mkdir -p build/ant/classes/META-INF
 cat <<EOF > build/ant/classes/META-INF/build.properties
+release.version=%{version}
 svn.revision.max-with-flags=%{rev}
 build.timestamp=%{revdate}
 username=rpmbuild
@@ -178,6 +179,10 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
+- New public build.
+- Upstream is now using real version numbers.
+
 * Sun Jul 26 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.5.20090726svn4462
 - Just when I thought it would be safe to rebase, a new public test build was released
 - Details at http://colossus.sourceforge.net/public-testing/docs/RecentChangesDetails.html


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 Jul 2009 21:21:36 -0000	1.3
+++ import.log	11 Aug 2009 04:53:08 -0000	1.4
@@ -1,3 +1,4 @@
 colossus-0-0_2_20090710svn4432_fc11:HEAD:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247453817
 colossus-0-0_4_20090725svn4454_fc11:HEAD:colossus-0-0.4.20090725svn4454.fc11.src.rpm:1248590656
 colossus-0-0_5_20090726svn4462_fc11:HEAD:colossus-0-0.5.20090726svn4462.fc11.src.rpm:1248643266
+colossus-0_9_0-1_20090810svn4482_fc11:HEAD:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249966312


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Jul 2009 21:21:36 -0000	1.4
+++ sources	11 Aug 2009 04:53:08 -0000	1.5
@@ -1 +1 @@
-a382f017f1d9ec76d401ad40ff2d92f3  colossus-20090726-4462.tar.gz
+22fcc30b7dd9af6b8e01d99db4125b74  colossus-20090810-4482.tar.gz



From mclasen at fedoraproject.org  Tue Aug 11 04:55:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:55:56 +0000 (UTC)
Subject: rpms/zenity/devel .cvsignore, 1.29, 1.30 sources, 1.31,
	1.32 zenity.spec, 1.53, 1.54
Message-ID: <20090811045556.1DACE11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/zenity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31751

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	17 Mar 2009 02:56:09 -0000	1.29
+++ .cvsignore	11 Aug 2009 04:55:55 -0000	1.30
@@ -1 +1 @@
-zenity-2.26.0.tar.bz2
+zenity-2.27.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	17 Mar 2009 02:56:09 -0000	1.31
+++ sources	11 Aug 2009 04:55:55 -0000	1.32
@@ -1 +1 @@
-6660ce6dac0a6ca495a0e954cb6b40a2  zenity-2.26.0.tar.bz2
+2245c6f836e61d0115a826648d85758b  zenity-2.27.90.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- zenity.spec	27 Jul 2009 08:59:56 -0000	1.53
+++ zenity.spec	11 Aug 2009 04:55:55 -0000	1.54
@@ -1,11 +1,11 @@
 Name:		zenity
-Version:	2.26.0
-Release:	2%{?dist}
+Version:	2.27.90
+Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://directory.fsf.org/zenity.html
-Source:		http://download.gnome.org/sources/zenity/2.26/zenity-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/zenity/2.27/zenity-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,6 +90,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dcantrel at fedoraproject.org  Tue Aug 11 04:57:41 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 11 Aug 2009 04:57:41 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.655, 1.656 anaconda.spec, 1.805, 
	1.806 sources, 1.789, 1.790
Message-ID: <20090811045741.DF70011C00D7@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32112

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Aug 10 2009 David Cantrell <dcantrell at redhat.com> - 12.13-1
- Fix syntax error in identifyMultipaths() (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -p -r1.655 -r1.656
--- .cvsignore	11 Aug 2009 03:08:37 -0000	1.655
+++ .cvsignore	11 Aug 2009 04:57:41 -0000	1.656
@@ -1 +1 @@
-anaconda-12.12.tar.bz2
+anaconda-12.13.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -p -r1.805 -r1.806
--- anaconda.spec	11 Aug 2009 03:08:37 -0000	1.805
+++ anaconda.spec	11 Aug 2009 04:57:41 -0000	1.806
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.12
+Version: 12.13
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -209,6 +209,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Aug 10 2009 David Cantrell <dcantrell at redhat.com> - 12.13-1
+- Fix syntax error in identifyMultipaths() (dcantrell)
+
 * Mon Aug 10 2009 David Cantrell <dcantrell at redhat.com> - 12.12-1
 - Honor network config boot params for CD-booted ks installs (#433214)
   (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -p -r1.789 -r1.790
--- sources	11 Aug 2009 03:08:37 -0000	1.789
+++ sources	11 Aug 2009 04:57:41 -0000	1.790
@@ -1 +1 @@
-21cea7f8a3365f0e928de0637d81b98d  anaconda-12.12.tar.bz2
+5fcbf356ea84061d5c8bc58058d50f50  anaconda-12.13.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 04:58:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 04:58:02 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.89, 1.90 file-roller.spec,
	1.151, 1.152 sources, 1.89, 1.90
Message-ID: <20090811045802.62AFA11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32162

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	28 Jul 2009 04:25:27 -0000	1.89
+++ .cvsignore	11 Aug 2009 04:58:02 -0000	1.90
@@ -1 +1 @@
-file-roller-2.27.3.tar.bz2
+file-roller-2.27.90.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- file-roller.spec	28 Jul 2009 04:25:27 -0000	1.151
+++ file-roller.spec	11 Aug 2009 04:58:02 -0000	1.152
@@ -10,7 +10,7 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.27.3
+Version:	2.27.90
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -128,6 +128,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> 2.27.3-1
 - Update to 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	28 Jul 2009 04:25:27 -0000	1.89
+++ sources	11 Aug 2009 04:58:02 -0000	1.90
@@ -1 +1 @@
-d4032f199e1eaf4025440f083dd1f521  file-roller-2.27.3.tar.bz2
+db1518ae05a998de0dc4be8819fe1a71  file-roller-2.27.90.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 04:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:59:26 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811045926.6C38B10F899@bastion2.fedora.phx.redhat.com>

phuang has set the watchcommits acl on ibus-anthy (Fedora 10) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 04:59:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:59:33 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811045934.9426910F8B1@bastion2.fedora.phx.redhat.com>

phuang has set the watchcommits acl on ibus-anthy (Fedora 11) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 04:59:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:59:27 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811045927.BA13110F89F@bastion2.fedora.phx.redhat.com>

phuang has set the commit acl on ibus-anthy (Fedora 10) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From pkgdb at fedoraproject.org  Tue Aug 11 04:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 04:59:36 +0000
Subject: [pkgdb] ibus-anthy had acl change status
Message-ID: <20090811045937.4E42610F8B6@bastion2.fedora.phx.redhat.com>

phuang has set the commit acl on ibus-anthy (Fedora 11) to Approved for fujiwara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-anthy



From mclasen at fedoraproject.org  Tue Aug 11 05:00:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 05:00:20 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.47, 1.48 sources, 1.47,
	1.48 tomboy.spec, 1.120, 1.121
Message-ID: <20090811050020.2AC7D11C048B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32591

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.15.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	28 Jul 2009 14:23:16 -0000	1.47
+++ .cvsignore	11 Aug 2009 05:00:19 -0000	1.48
@@ -1 +1 @@
-tomboy-0.15.4.tar.bz2
+tomboy-0.15.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	28 Jul 2009 14:23:16 -0000	1.47
+++ sources	11 Aug 2009 05:00:19 -0000	1.48
@@ -1 +1 @@
-301c5940d48f886d681008f6ee6dd599  tomboy-0.15.4.tar.bz2
+832178964083828fd7af045d09b4355c  tomboy-0.15.5.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- tomboy.spec	28 Jul 2009 14:23:16 -0000	1.120
+++ tomboy.spec	11 Aug 2009 05:00:19 -0000	1.121
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        0.15.4
+Version:        0.15.5
 Release: 	1%{?dist}
 Summary:        Note-taking application
 
@@ -141,6 +141,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.5-1
+- Update to 0.15.5
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.4-1
 - Update to 0.15.4
 



From pkgdb at fedoraproject.org  Tue Aug 11 05:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:00:45 +0000
Subject: [pkgdb] perl-IO-Async was added for kwizart
Message-ID: <20090811050045.E13A310F89B@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-IO-Async with summary A collection of modules that implement asynchronous filehandle IO
kevin has approved Package perl-IO-Async
kevin has added a Fedora devel branch for perl-IO-Async with an owner of kwizart
kevin has approved perl-IO-Async in Fedora devel
kevin has approved Package perl-IO-Async
kevin has set commit to Approved for 107427 on perl-IO-Async (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-IO-Async (Fedora devel)
kevin has set build to Approved for 107427 on perl-IO-Async (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-Async



From pkgdb at fedoraproject.org  Tue Aug 11 05:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:00:48 +0000
Subject: [pkgdb] perl-IO-Async summary updated by kevin
Message-ID: <20090811050048.F284C10F89F@bastion2.fedora.phx.redhat.com>

kevin set package perl-IO-Async summary to A collection of modules that implement asynchronous filehandle IO

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-Async



From pkgdb at fedoraproject.org  Tue Aug 11 05:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:00:48 +0000
Subject: [pkgdb] perl-IO-Async (Fedora EPEL, 5) updated by kevin
Message-ID: <20090811050050.23EB810F8AD@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-IO-Async (Fedora devel) for perl-sig
kevin approved watchcommits on perl-IO-Async (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-Async



From pkgdb at fedoraproject.org  Tue Aug 11 05:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:00:48 +0000
Subject: [pkgdb] perl-IO-Async (Fedora EPEL, 5) updated by kevin
Message-ID: <20090811050049.46A8010F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-IO-Async
kevin has set commit to Approved for 107427 on perl-IO-Async (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-IO-Async (Fedora 10)
kevin has set build to Approved for 107427 on perl-IO-Async (Fedora 10)
kevin approved watchbugzilla on perl-IO-Async (Fedora 10) for perl-sig
kevin approved watchcommits on perl-IO-Async (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-Async



From pkgdb at fedoraproject.org  Tue Aug 11 05:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:00:48 +0000
Subject: [pkgdb] perl-IO-Async (Fedora EPEL, 5) updated by kevin
Message-ID: <20090811050050.D8FB510F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-IO-Async
kevin has set commit to Approved for 107427 on perl-IO-Async (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-IO-Async (Fedora 11)
kevin has set build to Approved for 107427 on perl-IO-Async (Fedora 11)
kevin approved watchbugzilla on perl-IO-Async (Fedora 11) for perl-sig
kevin approved watchcommits on perl-IO-Async (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-Async



From kevin at fedoraproject.org  Tue Aug 11 05:00:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:00:55 +0000 (UTC)
Subject: rpms/perl-IO-Async - New directory
Message-ID: <20090811050055.12CA611C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IO-Async
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslpQ306/rpms/perl-IO-Async

Log Message:
Directory /cvs/pkgs/rpms/perl-IO-Async added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:00:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:00:55 +0000 (UTC)
Subject: rpms/perl-IO-Async/devel - New directory
Message-ID: <20090811050055.3532311C0347@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IO-Async/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslpQ306/rpms/perl-IO-Async/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-IO-Async/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug 11 05:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:00:48 +0000
Subject: [pkgdb] perl-IO-Async (Fedora EPEL, 5) updated by kevin
Message-ID: <20090811050052.3992E10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-IO-Async
kevin has set commit to Approved for 107427 on perl-IO-Async (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-IO-Async (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-IO-Async (Fedora EPEL 5)
kevin approved watchbugzilla on perl-IO-Async (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-IO-Async (Fedora EPEL 5) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IO-Async



From kevin at fedoraproject.org  Tue Aug 11 05:01:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:01:02 +0000 (UTC)
Subject: rpms/perl-IO-Async/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090811050102.2351B11C0347@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IO-Async/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslpQ306/rpms/perl-IO-Async/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IO-Async


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-IO-Async
# $Id: Makefile,v 1.1 2009/08/11 05:01:01 kevin Exp $
NAME := perl-IO-Async
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 11 05:01:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:01:01 +0000 (UTC)
Subject: rpms/perl-IO-Async Makefile,NONE,1.1
Message-ID: <20090811050101.9FA5911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-IO-Async
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvslpQ306/rpms/perl-IO-Async

Added Files:
	Makefile 
Log Message:
Setup of module perl-IO-Async


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IO-Async
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tbreeds at fedoraproject.org  Tue Aug 11 05:01:48 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Tue, 11 Aug 2009 05:01:48 +0000 (UTC)
Subject: rpms/libtopology/devel libtopology.spec,1.5,1.6
Message-ID: <20090811050148.9F28711C00D7@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/libtopology/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv629

Modified Files:
	libtopology.spec 
Log Message:
Split documentation into (noarch) subpackage



Index: libtopology.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtopology/devel/libtopology.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libtopology.spec	11 Aug 2009 04:51:53 -0000	1.5
+++ libtopology.spec	11 Aug 2009 05:01:48 -0000	1.6
@@ -18,11 +18,20 @@ systems.
 Summary:	CPU Topology library development package
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-BuildRequires:	doxygen
 
 %description devel
 Development package for libtopology.
 
+%package doc
+Summary:	CPU Topology library documentation package
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+BuildRequires:	doxygen
+BuildArch:	noarch
+
+%description doc
+Documentation and sample programs for libtopology.
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -64,6 +73,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_includedir}/topology.h
 %{_libdir}/libtopology.so
+
+%files doc 
+%defattr(-,root,root,-)
 %{_defaultdocdir}/%{name}-%{version}/README
 %{_defaultdocdir}/%{name}-%{version}/examples/
 %{_defaultdocdir}/%{name}-%{version}/doc
@@ -71,6 +83,7 @@ rm -rf %{buildroot}
 %changelog
 * Tue Aug 11 2009 tony at bakeyournoodle.com - 0.3-7
 - Fix FTBS problem (#511641)
+- Also split documentation into (noarch) subpackage
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kevin at fedoraproject.org  Tue Aug 11 05:03:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:03:34 +0000 (UTC)
Subject: rpms/system-config-audit - New directory
Message-ID: <20090811050334.19DC411C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-config-audit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscKN964/rpms/system-config-audit

Log Message:
Directory /cvs/pkgs/rpms/system-config-audit added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:03:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:03:34 +0000 (UTC)
Subject: rpms/system-config-audit/devel - New directory
Message-ID: <20090811050334.4EB2A11C043D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-config-audit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscKN964/rpms/system-config-audit/devel

Log Message:
Directory /cvs/pkgs/rpms/system-config-audit/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug 11 05:03:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:03:24 +0000
Subject: [pkgdb] system-config-audit was added for mitr
Message-ID: <20090811050325.4C54F10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package system-config-audit with summary Utility for editing audit configuration
kevin has approved Package system-config-audit
kevin has added a Fedora devel branch for system-config-audit with an owner of mitr
kevin has approved system-config-audit in Fedora devel
kevin has approved Package system-config-audit
kevin has set commit to Approved for 107427 on system-config-audit (Fedora devel)
kevin has set checkout to Approved for 107427 on system-config-audit (Fedora devel)
kevin has set build to Approved for 107427 on system-config-audit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-audit



From pkgdb at fedoraproject.org  Tue Aug 11 05:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:03:26 +0000
Subject: [pkgdb] system-config-audit summary updated by kevin
Message-ID: <20090811050326.F1F5010F89C@bastion2.fedora.phx.redhat.com>

kevin set package system-config-audit summary to Utility for editing audit configuration

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/system-config-audit



From deji at fedoraproject.org  Tue Aug 11 05:03:27 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 05:03:27 +0000 (UTC)
Subject: rpms/tokyocabinet/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 tokyocabinet-fedora.patch, 1.4, 1.5 tokyocabinet.spec, 1.13, 1.14
Message-ID: <20090811050327.08E7011C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv929

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.30-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Jun 2009 20:07:24 -0000	1.11
+++ .cvsignore	11 Aug 2009 05:03:26 -0000	1.12
@@ -1 +1 @@
-tokyocabinet-1.4.23.tar.gz
+tokyocabinet-1.4.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Jun 2009 20:07:24 -0000	1.11
+++ sources	11 Aug 2009 05:03:26 -0000	1.12
@@ -1 +1 @@
-518f93305a99589301155ce3c4178f17  tokyocabinet-1.4.23.tar.gz
+9db239bf12c7a76f068a4e38b5575ee7  tokyocabinet-1.4.30.tar.gz

tokyocabinet-fedora.patch:
 Makefile.in        |    4 ++--
 configure.in       |   17 +++--------------
 tokyocabinet.pc.in |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet-fedora.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tokyocabinet-fedora.patch	3 Jun 2009 20:07:24 -0000	1.4
+++ tokyocabinet-fedora.patch	11 Aug 2009 05:03:26 -0000	1.5
@@ -1,5 +1,5 @@
---- configure.in	2009-05-24 06:05:36.000000000 -0400
-+++ configure.in.new	2009-06-03 15:54:39.866804792 -0400
+--- configure.in	2009-07-13 05:07:17.000000000 -0400
++++ configure.in.new	2009-08-11 00:51:08.209442295 -0400
 @@ -31,26 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
@@ -30,21 +30,21 @@
  #================================================================
  # Options
  #================================================================
---- Makefile.in	2009-05-15 06:38:57.000000000 -0400
-+++ Makefile.in.new	2009-06-03 15:56:18.156616847 -0400
+--- Makefile.in	2009-06-23 23:21:16.000000000 -0400
++++ Makefile.in.new	2009-08-11 00:52:59.612477308 -0400
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
  LIBS = @LIBS@
 -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
 -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
-+LDENV = 
++LDENV =
 +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
  POSTCMD = @MYPOSTCMD@
  
  
 --- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
-+++ tokyocabinet.pc.in.new	2009-06-03 15:57:04.980613948 -0400
++++ tokyocabinet.pc.in.new	2009-08-11 00:53:45.092479716 -0400
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tokyocabinet.spec	27 Jul 2009 06:04:24 -0000	1.13
+++ tokyocabinet.spec	11 Aug 2009 05:03:26 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.4.23
-Release:	2%{?dist}
+Version:	1.4.30
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL:		http://tokyocabinet.sourceforge.net/
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %doc doc/*
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.30-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kevin at fedoraproject.org  Tue Aug 11 05:03:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:03:40 +0000 (UTC)
Subject: rpms/system-config-audit Makefile,NONE,1.1
Message-ID: <20090811050340.04F5311C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-config-audit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscKN964/rpms/system-config-audit

Added Files:
	Makefile 
Log Message:
Setup of module system-config-audit


--- NEW FILE Makefile ---
# Top level Makefile for module system-config-audit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 11 05:03:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:03:40 +0000 (UTC)
Subject: rpms/system-config-audit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090811050340.38D6011C0347@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-config-audit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscKN964/rpms/system-config-audit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module system-config-audit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: system-config-audit
# $Id: Makefile,v 1.1 2009/08/11 05:03:40 kevin Exp $
NAME := system-config-audit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 11 05:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:06:39 +0000
Subject: [pkgdb] ibus-qt was added for phuang
Message-ID: <20090811050640.2088710F880@bastion2.fedora.phx.redhat.com>

kevin has added Package ibus-qt with summary The qt support tools for ibus
kevin has approved Package ibus-qt
kevin has added a Fedora devel branch for ibus-qt with an owner of phuang
kevin has approved ibus-qt in Fedora devel
kevin has approved Package ibus-qt
kevin has set commit to Approved for 107427 on ibus-qt (Fedora devel)
kevin has set checkout to Approved for 107427 on ibus-qt (Fedora devel)
kevin has set build to Approved for 107427 on ibus-qt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-qt



From pkgdb at fedoraproject.org  Tue Aug 11 05:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:06:41 +0000
Subject: [pkgdb] ibus-qt summary updated by kevin
Message-ID: <20090811050641.AFBC510F89B@bastion2.fedora.phx.redhat.com>

kevin set package ibus-qt summary to The qt support tools for ibus

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-qt



From pkgdb at fedoraproject.org  Tue Aug 11 05:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:06:41 +0000
Subject: [pkgdb] ibus-qt (Fedora, 10) updated by kevin
Message-ID: <20090811050641.D862D10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ibus-qt
kevin has set commit to Approved for 107427 on ibus-qt (Fedora 10)
kevin has set checkout to Approved for 107427 on ibus-qt (Fedora 10)
kevin has set build to Approved for 107427 on ibus-qt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-qt



From kevin at fedoraproject.org  Tue Aug 11 05:06:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:06:52 +0000 (UTC)
Subject: rpms/ibus-qt - New directory
Message-ID: <20090811050652.194B911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-qt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVc1510/rpms/ibus-qt

Log Message:
Directory /cvs/pkgs/rpms/ibus-qt added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:06:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:06:52 +0000 (UTC)
Subject: rpms/ibus-qt/devel - New directory
Message-ID: <20090811050652.3FA3D11C0347@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVc1510/rpms/ibus-qt/devel

Log Message:
Directory /cvs/pkgs/rpms/ibus-qt/devel added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:06:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:06:58 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090811050658.CDFD711C0347@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVc1510/rpms/ibus-qt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ibus-qt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ibus-qt
# $Id: Makefile,v 1.1 2009/08/11 05:06:58 kevin Exp $
NAME := ibus-qt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 11 05:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:06:41 +0000
Subject: [pkgdb] ibus-qt (Fedora, 10) updated by kevin
Message-ID: <20090811050642.51C9610F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ibus-qt
kevin has set commit to Approved for 107427 on ibus-qt (Fedora 11)
kevin has set checkout to Approved for 107427 on ibus-qt (Fedora 11)
kevin has set build to Approved for 107427 on ibus-qt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ibus-qt



From kevin at fedoraproject.org  Tue Aug 11 05:06:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:06:58 +0000 (UTC)
Subject: rpms/ibus-qt Makefile,NONE,1.1
Message-ID: <20090811050658.A292111C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ibus-qt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVc1510/rpms/ibus-qt

Added Files:
	Makefile 
Log Message:
Setup of module ibus-qt


--- NEW FILE Makefile ---
# Top level Makefile for module ibus-qt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From deji at fedoraproject.org  Tue Aug 11 05:08:09 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 05:08:09 +0000 (UTC)
Subject: rpms/referencer/devel referencer.spec,1.23,1.24
Message-ID: <20090811050809.3530B11C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1763

Modified Files:
	referencer.spec 
Log Message:
Add gnome-doc-utils as BR



Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- referencer.spec	11 Aug 2009 04:25:17 -0000	1.23
+++ referencer.spec	11 Aug 2009 05:08:09 -0000	1.24
@@ -13,7 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	poppler-glib-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++ python-devel
 BuildRequires:	gettext perl(XML::Parser)
-BuildRequires:	desktop-file-utils intltool
+BuildRequires:	desktop-file-utils intltool gnome-doc-utils
 
 %description
 Referencer is a Gnome application to organise documents or references, and



From mclasen at fedoraproject.org  Tue Aug 11 05:08:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 05:08:27 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.20, 1.21 hamster-applet.spec,
	1.29, 1.30 sources, 1.20, 1.21
Message-ID: <20090811050827.0D8EE11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1793

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	28 Jul 2009 15:26:45 -0000	1.20
+++ .cvsignore	11 Aug 2009 05:08:26 -0000	1.21
@@ -1 +1 @@
-hamster-applet-2.27.5.tar.bz2
+hamster-applet-2.27.90.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- hamster-applet.spec	28 Jul 2009 15:26:45 -0000	1.29
+++ hamster-applet.spec	11 Aug 2009 05:08:26 -0000	1.30
@@ -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.27.5
+Version:        2.27.90
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at fredhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Mads Villadsen <maxx at krakoa.dk> - 2.27.5-1
 - Update to latest development release
 - Better autocomplete


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	28 Jul 2009 15:26:45 -0000	1.20
+++ sources	11 Aug 2009 05:08:26 -0000	1.21
@@ -1 +1 @@
-d3db82455579337325797d497c47405f  hamster-applet-2.27.5.tar.bz2
+901d5f7cd7bead6871efea3a4ab2ccd5  hamster-applet-2.27.90.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 05:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:08:51 +0000
Subject: [pkgdb] hunspell-mos was added for caolanm
Message-ID: <20090811050853.DA8DD10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-mos with summary Mossi hunspell dictionaries
kevin has approved Package hunspell-mos
kevin has added a Fedora devel branch for hunspell-mos with an owner of caolanm
kevin has approved hunspell-mos in Fedora devel
kevin has approved Package hunspell-mos
kevin has set commit to Approved for 107427 on hunspell-mos (Fedora devel)
kevin has set checkout to Approved for 107427 on hunspell-mos (Fedora devel)
kevin has set build to Approved for 107427 on hunspell-mos (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-mos



From kevin at fedoraproject.org  Tue Aug 11 05:09:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:09:04 +0000 (UTC)
Subject: rpms/hunspell-mos - New directory
Message-ID: <20090811050904.1CFC811C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-mos
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAc2033/rpms/hunspell-mos

Log Message:
Directory /cvs/pkgs/rpms/hunspell-mos added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:09:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:09:04 +0000 (UTC)
Subject: rpms/hunspell-mos/devel - New directory
Message-ID: <20090811050904.462A711C043B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-mos/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAc2033/rpms/hunspell-mos/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-mos/devel added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:09:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:09:09 +0000 (UTC)
Subject: rpms/hunspell-mos Makefile,NONE,1.1
Message-ID: <20090811050909.E124811C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-mos
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAc2033/rpms/hunspell-mos

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-mos


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-mos
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 11 05:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:08:53 +0000
Subject: [pkgdb] hunspell-mos summary updated by kevin
Message-ID: <20090811050858.D61AB10F8AD@bastion2.fedora.phx.redhat.com>

kevin set package hunspell-mos summary to Mossi hunspell dictionaries

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-mos



From kevin at fedoraproject.org  Tue Aug 11 05:09:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:09:10 +0000 (UTC)
Subject: rpms/hunspell-mos/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090811050910.17F3611C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-mos/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAc2033/rpms/hunspell-mos/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-mos


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-mos
# $Id: Makefile,v 1.1 2009/08/11 05:09:09 kevin Exp $
NAME := hunspell-mos
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 11 05:09:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:09:57 +0000
Subject: [pkgdb] vdr-epgsearch was added for scop
Message-ID: <20090811050957.8096C10F89B@bastion2.fedora.phx.redhat.com>

kevin has added Package vdr-epgsearch with summary Powerful schedules menu replacement plugin for VDR
kevin has approved Package vdr-epgsearch
kevin has added a Fedora devel branch for vdr-epgsearch with an owner of scop
kevin has approved vdr-epgsearch in Fedora devel
kevin has approved Package vdr-epgsearch
kevin has set commit to Approved for 107427 on vdr-epgsearch (Fedora devel)
kevin has set checkout to Approved for 107427 on vdr-epgsearch (Fedora devel)
kevin has set build to Approved for 107427 on vdr-epgsearch (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-epgsearch



From mclasen at fedoraproject.org  Tue Aug 11 05:09:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 05:09:59 +0000 (UTC)
Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.32,
	1.33
Message-ID: <20090811050959.47B8F11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-open-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2157

Modified Files:
	nautilus-open-terminal.spec 
Log Message:
0.17



Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- nautilus-open-terminal.spec	25 Jul 2009 15:47:24 -0000	1.32
+++ nautilus-open-terminal.spec	11 Aug 2009 05:09:59 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           nautilus-open-terminal
-Version:        0.13
+Version:        0.17
 Release:	2%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
@@ -61,6 +61,9 @@ gconftool-2 \
 %{_libdir}/nautilus/extensions-2.0/*.so*
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.17-1
+- Update to 0.17
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug 11 05:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:10:00 +0000
Subject: [pkgdb] vdr-epgsearch summary updated by kevin
Message-ID: <20090811051000.3B53B10F8B1@bastion2.fedora.phx.redhat.com>

kevin set package vdr-epgsearch summary to Powerful schedules menu replacement plugin for VDR

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-epgsearch



From pkgdb at fedoraproject.org  Tue Aug 11 05:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:10:00 +0000
Subject: [pkgdb] vdr-epgsearch (Fedora, 11) updated by kevin
Message-ID: <20090811051000.4AED910F8B4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on vdr-epgsearch (Fedora devel) for vpv
kevin approved watchcommits on vdr-epgsearch (Fedora devel) for vpv
kevin approved commit on vdr-epgsearch (Fedora devel) for vpv
kevin approved build on vdr-epgsearch (Fedora devel) for vpv
kevin approved approveacls on vdr-epgsearch (Fedora devel) for vpv

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-epgsearch



From kevin at fedoraproject.org  Tue Aug 11 05:10:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:10:09 +0000 (UTC)
Subject: rpms/vdr-epgsearch/devel - New directory
Message-ID: <20090811051009.36E4211C04F1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdr-epgsearch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM2209/rpms/vdr-epgsearch/devel

Log Message:
Directory /cvs/pkgs/rpms/vdr-epgsearch/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug 11 05:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:10:00 +0000
Subject: [pkgdb] vdr-epgsearch (Fedora, 11) updated by kevin
Message-ID: <20090811051000.5D22510F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vdr-epgsearch
kevin has set commit to Approved for 107427 on vdr-epgsearch (Fedora 11)
kevin has set checkout to Approved for 107427 on vdr-epgsearch (Fedora 11)
kevin has set build to Approved for 107427 on vdr-epgsearch (Fedora 11)
kevin approved watchbugzilla on vdr-epgsearch (Fedora 11) for vpv
kevin approved watchcommits on vdr-epgsearch (Fedora 11) for vpv
kevin approved commit on vdr-epgsearch (Fedora 11) for vpv
kevin approved build on vdr-epgsearch (Fedora 11) for vpv
kevin approved approveacls on vdr-epgsearch (Fedora 11) for vpv

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vdr-epgsearch



From kevin at fedoraproject.org  Tue Aug 11 05:10:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:10:09 +0000 (UTC)
Subject: rpms/vdr-epgsearch - New directory
Message-ID: <20090811051009.17F7411C04DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdr-epgsearch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM2209/rpms/vdr-epgsearch

Log Message:
Directory /cvs/pkgs/rpms/vdr-epgsearch added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:10:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:10:14 +0000 (UTC)
Subject: rpms/vdr-epgsearch Makefile,NONE,1.1
Message-ID: <20090811051014.9949911C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdr-epgsearch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM2209/rpms/vdr-epgsearch

Added Files:
	Makefile 
Log Message:
Setup of module vdr-epgsearch


--- NEW FILE Makefile ---
# Top level Makefile for module vdr-epgsearch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 11 05:10:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:10:14 +0000 (UTC)
Subject: rpms/vdr-epgsearch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090811051014.E87BC11C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vdr-epgsearch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshM2209/rpms/vdr-epgsearch/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr-epgsearch


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vdr-epgsearch
# $Id: Makefile,v 1.1 2009/08/11 05:10:14 kevin Exp $
NAME := vdr-epgsearch
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 11 05:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:11:58 +0000
Subject: [pkgdb] usbmuxd was added for pbrobinson
Message-ID: <20090811051158.5055410F880@bastion2.fedora.phx.redhat.com>

kevin has added Package usbmuxd with summary Daemon for communicating with Apple's iPod Touch and iPhone
kevin has approved Package usbmuxd
kevin has added a Fedora devel branch for usbmuxd with an owner of pbrobinson
kevin has approved usbmuxd in Fedora devel
kevin has approved Package usbmuxd
kevin has set commit to Approved for 107427 on usbmuxd (Fedora devel)
kevin has set checkout to Approved for 107427 on usbmuxd (Fedora devel)
kevin has set build to Approved for 107427 on usbmuxd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/usbmuxd



From pkgdb at fedoraproject.org  Tue Aug 11 05:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:12:00 +0000
Subject: [pkgdb] usbmuxd summary updated by kevin
Message-ID: <20090811051200.C375710F89B@bastion2.fedora.phx.redhat.com>

kevin set package usbmuxd summary to Daemon for communicating with Apple's iPod Touch and iPhone

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/usbmuxd



From pkgdb at fedoraproject.org  Tue Aug 11 05:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:12:00 +0000
Subject: [pkgdb] usbmuxd (Fedora, 10) updated by kevin
Message-ID: <20090811051201.24E0D10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for usbmuxd
kevin has set commit to Approved for 107427 on usbmuxd (Fedora 10)
kevin has set checkout to Approved for 107427 on usbmuxd (Fedora 10)
kevin has set build to Approved for 107427 on usbmuxd (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/usbmuxd



From pkgdb at fedoraproject.org  Tue Aug 11 05:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:12:00 +0000
Subject: [pkgdb] usbmuxd (Fedora, 10) updated by kevin
Message-ID: <20090811051201.6BE6C10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for usbmuxd
kevin has set commit to Approved for 107427 on usbmuxd (Fedora 11)
kevin has set checkout to Approved for 107427 on usbmuxd (Fedora 11)
kevin has set build to Approved for 107427 on usbmuxd (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/usbmuxd



From kevin at fedoraproject.org  Tue Aug 11 05:13:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:13:02 +0000 (UTC)
Subject: rpms/usbmuxd - New directory
Message-ID: <20090811051302.1FAED11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbmuxd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPF2716/rpms/usbmuxd

Log Message:
Directory /cvs/pkgs/rpms/usbmuxd added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:13:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:13:02 +0000 (UTC)
Subject: rpms/usbmuxd/devel - New directory
Message-ID: <20090811051302.4310511C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPF2716/rpms/usbmuxd/devel

Log Message:
Directory /cvs/pkgs/rpms/usbmuxd/devel added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:13:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:13:07 +0000 (UTC)
Subject: rpms/usbmuxd Makefile,NONE,1.1
Message-ID: <20090811051307.B33C711C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbmuxd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPF2716/rpms/usbmuxd

Added Files:
	Makefile 
Log Message:
Setup of module usbmuxd


--- NEW FILE Makefile ---
# Top level Makefile for module usbmuxd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 11 05:13:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:13:08 +0000 (UTC)
Subject: rpms/usbmuxd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090811051308.122A411C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPF2716/rpms/usbmuxd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module usbmuxd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: usbmuxd
# $Id: Makefile,v 1.1 2009/08/11 05:13:07 kevin Exp $
NAME := usbmuxd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From jgarzik at fedoraproject.org  Tue Aug 11 05:14:21 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 11 Aug 2009 05:14:21 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090811051421.7DE9511C00D7@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3054

Modified Files:
	chunkd.spec sources 
Log Message:
update to latest upstream, which fixes bugs preventing ppc/ppc64 build


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- chunkd.spec	8 Aug 2009 07:11:21 -0000	1.8
+++ chunkd.spec	11 Aug 2009 05:14:21 -0000	1.9
@@ -1,13 +1,13 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.9.g68cabfe7%{?dist}
+Release:	0.10.g6456a2cc%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 68cabfe72a315a062126eaf405dfe2c186e04f99
+# pulled from upstream git, commit 6456a2cc90b8b81f4e2ab23a87776e5ec8e8c76d
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
@@ -18,9 +18,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	libevent-devel glib2-devel openssl-devel zlib-devel
 BuildRequires:	libxml2-devel procps cld cld-devel
 
-# ugly and embarrassing!  pkg build fails on big endian
-ExcludeArch:	ppc ppc64
-
 %description
 Single-node data storage daemon for cloud computing.
 
@@ -98,6 +95,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Aug 11 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.10.g6456a2cc
+- update source to commit 6456a2cc90b8b81f4e2ab23a87776e5ec8e8c76d
+
 * Sat Aug  8 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.9.g68cabfe7
 - update source to commit 68cabfe72a315a062126eaf405dfe2c186e04f99
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Aug 2009 07:11:21 -0000	1.6
+++ sources	11 Aug 2009 05:14:21 -0000	1.7
@@ -1 +1 @@
-515902d4dbf4b3f040b87f36b28ccdad  chunkd-0.4git.tar.gz
+3a5af079ce9471df948945ce8d54e6a9  chunkd-0.4git.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 11 05:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:14:30 +0000
Subject: [pkgdb] shutter was added for liangsuilong
Message-ID: <20090811051430.C888810F876@bastion2.fedora.phx.redhat.com>

kevin has added Package shutter with summary Shutter is a GTK+ 2.0 screenshot application written in perl
kevin has approved Package shutter
kevin has added a Fedora devel branch for shutter with an owner of liangsuilong
kevin has approved shutter in Fedora devel
kevin has approved Package shutter
kevin has set commit to Approved for 107427 on shutter (Fedora devel)
kevin has set checkout to Approved for 107427 on shutter (Fedora devel)
kevin has set build to Approved for 107427 on shutter (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shutter



From pkgdb at fedoraproject.org  Tue Aug 11 05:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:14:32 +0000
Subject: [pkgdb] shutter summary updated by kevin
Message-ID: <20090811051432.138B510F89A@bastion2.fedora.phx.redhat.com>

kevin set package shutter summary to Shutter is a GTK+ 2.0 screenshot application written in perl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shutter



From pkgdb at fedoraproject.org  Tue Aug 11 05:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:14:32 +0000
Subject: [pkgdb] shutter (Fedora, 10) updated by kevin
Message-ID: <20090811051432.2AD2910F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for shutter
kevin has set commit to Approved for 107427 on shutter (Fedora 11)
kevin has set checkout to Approved for 107427 on shutter (Fedora 11)
kevin has set build to Approved for 107427 on shutter (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shutter



From pkgdb at fedoraproject.org  Tue Aug 11 05:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:14:32 +0000
Subject: [pkgdb] shutter (Fedora, 10) updated by kevin
Message-ID: <20090811051432.1DB1E10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for shutter
kevin has set commit to Approved for 107427 on shutter (Fedora 10)
kevin has set checkout to Approved for 107427 on shutter (Fedora 10)
kevin has set build to Approved for 107427 on shutter (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shutter



From kevin at fedoraproject.org  Tue Aug 11 05:14:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:14:40 +0000 (UTC)
Subject: rpms/shutter - New directory
Message-ID: <20090811051440.1B74611C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shutter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDY3165/rpms/shutter

Log Message:
Directory /cvs/pkgs/rpms/shutter added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:14:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:14:40 +0000 (UTC)
Subject: rpms/shutter/devel - New directory
Message-ID: <20090811051440.436AC11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shutter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDY3165/rpms/shutter/devel

Log Message:
Directory /cvs/pkgs/rpms/shutter/devel added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:14:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:14:46 +0000 (UTC)
Subject: rpms/shutter Makefile,NONE,1.1
Message-ID: <20090811051446.8B54611C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shutter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDY3165/rpms/shutter

Added Files:
	Makefile 
Log Message:
Setup of module shutter


--- NEW FILE Makefile ---
# Top level Makefile for module shutter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 11 05:14:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:14:46 +0000 (UTC)
Subject: rpms/shutter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090811051446.C03BE11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shutter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDY3165/rpms/shutter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shutter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shutter
# $Id: Makefile,v 1.1 2009/08/11 05:14:46 kevin Exp $
NAME := shutter
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 11 05:15:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:15:24 +0000
Subject: [pkgdb] perl-latest was added for iarnell
Message-ID: <20090811051524.2CF6410F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-latest with summary Use the latest Perl features
kevin has approved Package perl-latest
kevin has added a Fedora devel branch for perl-latest with an owner of iarnell
kevin has approved perl-latest in Fedora devel
kevin has approved Package perl-latest
kevin has set commit to Approved for 107427 on perl-latest (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-latest (Fedora devel)
kevin has set build to Approved for 107427 on perl-latest (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-latest



From pkgdb at fedoraproject.org  Tue Aug 11 05:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:15:25 +0000
Subject: [pkgdb] perl-latest summary updated by kevin
Message-ID: <20090811051526.0E0F310F8AD@bastion2.fedora.phx.redhat.com>

kevin set package perl-latest summary to Use the latest Perl features

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-latest



From pkgdb at fedoraproject.org  Tue Aug 11 05:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:15:25 +0000
Subject: [pkgdb] perl-latest (Fedora, 10) updated by kevin
Message-ID: <20090811051526.1939B10F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-latest
kevin has set commit to Approved for 107427 on perl-latest (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-latest (Fedora 10)
kevin has set build to Approved for 107427 on perl-latest (Fedora 10)
kevin approved watchbugzilla on perl-latest (Fedora 10) for perl-sig
kevin approved watchcommits on perl-latest (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-latest



From pkgdb at fedoraproject.org  Tue Aug 11 05:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:15:25 +0000
Subject: [pkgdb] perl-latest (Fedora, 10) updated by kevin
Message-ID: <20090811051526.2946B10F8B6@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-latest (Fedora devel) for perl-sig
kevin approved watchcommits on perl-latest (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-latest



From kevin at fedoraproject.org  Tue Aug 11 05:15:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:15:32 +0000 (UTC)
Subject: rpms/perl-latest - New directory
Message-ID: <20090811051532.1714911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-latest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspa3417/rpms/perl-latest

Log Message:
Directory /cvs/pkgs/rpms/perl-latest added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:15:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:15:32 +0000 (UTC)
Subject: rpms/perl-latest/devel - New directory
Message-ID: <20090811051532.386D411C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-latest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspa3417/rpms/perl-latest/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-latest/devel added to the repository




From pkgdb at fedoraproject.org  Tue Aug 11 05:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:15:25 +0000
Subject: [pkgdb] perl-latest (Fedora, 10) updated by kevin
Message-ID: <20090811051526.401BE10F8BC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-latest
kevin has set commit to Approved for 107427 on perl-latest (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-latest (Fedora 11)
kevin has set build to Approved for 107427 on perl-latest (Fedora 11)
kevin approved watchbugzilla on perl-latest (Fedora 11) for perl-sig
kevin approved watchcommits on perl-latest (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-latest



From kevin at fedoraproject.org  Tue Aug 11 05:15:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:15:38 +0000 (UTC)
Subject: rpms/perl-latest Makefile,NONE,1.1
Message-ID: <20090811051538.73B6D11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-latest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspa3417/rpms/perl-latest

Added Files:
	Makefile 
Log Message:
Setup of module perl-latest


--- NEW FILE Makefile ---
# Top level Makefile for module perl-latest
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 11 05:15:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:15:38 +0000 (UTC)
Subject: rpms/perl-latest/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090811051538.AFD8111C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-latest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspa3417/rpms/perl-latest/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-latest


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-latest
# $Id: Makefile,v 1.1 2009/08/11 05:15:38 kevin Exp $
NAME := perl-latest
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 11 05:16:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:16:17 +0000
Subject: [pkgdb] gnome-colors-icon-theme was added for mnowak
Message-ID: <20090811051618.0511B10F8AF@bastion2.fedora.phx.redhat.com>

kevin has added Package gnome-colors-icon-theme with summary GNOME-Colors icon theme
kevin has approved Package gnome-colors-icon-theme
kevin has added a Fedora devel branch for gnome-colors-icon-theme with an owner of mnowak
kevin has approved gnome-colors-icon-theme in Fedora devel
kevin has approved Package gnome-colors-icon-theme
kevin has set commit to Approved for 107427 on gnome-colors-icon-theme (Fedora devel)
kevin has set checkout to Approved for 107427 on gnome-colors-icon-theme (Fedora devel)
kevin has set build to Approved for 107427 on gnome-colors-icon-theme (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-colors-icon-theme



From pkgdb at fedoraproject.org  Tue Aug 11 05:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:16:19 +0000
Subject: [pkgdb] gnome-colors-icon-theme summary updated by kevin
Message-ID: <20090811051619.4FDCC10F8B1@bastion2.fedora.phx.redhat.com>

kevin set package gnome-colors-icon-theme summary to GNOME-Colors icon theme

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-colors-icon-theme



From pkgdb at fedoraproject.org  Tue Aug 11 05:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:16:19 +0000
Subject: [pkgdb] gnome-colors-icon-theme (Fedora, 11) updated by kevin
Message-ID: <20090811051619.625AB10F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gnome-colors-icon-theme
kevin has set commit to Approved for 107427 on gnome-colors-icon-theme (Fedora 11)
kevin has set checkout to Approved for 107427 on gnome-colors-icon-theme (Fedora 11)
kevin has set build to Approved for 107427 on gnome-colors-icon-theme (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-colors-icon-theme



From kevin at fedoraproject.org  Tue Aug 11 05:16:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:16:32 +0000 (UTC)
Subject: rpms/gnome-colors-icon-theme - New directory
Message-ID: <20090811051632.1901211C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-colors-icon-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskC3665/rpms/gnome-colors-icon-theme

Log Message:
Directory /cvs/pkgs/rpms/gnome-colors-icon-theme added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:16:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:16:32 +0000 (UTC)
Subject: rpms/gnome-colors-icon-theme/devel - New directory
Message-ID: <20090811051632.4542711C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-colors-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskC3665/rpms/gnome-colors-icon-theme/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-colors-icon-theme/devel added to the repository




From kevin at fedoraproject.org  Tue Aug 11 05:16:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:16:38 +0000 (UTC)
Subject: rpms/gnome-colors-icon-theme Makefile,NONE,1.1
Message-ID: <20090811051638.5579911C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-colors-icon-theme
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskC3665/rpms/gnome-colors-icon-theme

Added Files:
	Makefile 
Log Message:
Setup of module gnome-colors-icon-theme


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-colors-icon-theme
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Aug 11 05:16:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 05:16:38 +0000 (UTC)
Subject: rpms/gnome-colors-icon-theme/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090811051638.7E7D911C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-colors-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvskC3665/rpms/gnome-colors-icon-theme/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-colors-icon-theme


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-colors-icon-theme
# $Id: Makefile,v 1.1 2009/08/11 05:16:38 kevin Exp $
NAME := gnome-colors-icon-theme
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mclasen at fedoraproject.org  Tue Aug 11 05:17:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 05:17:31 +0000 (UTC)
Subject: rpms/nautilus-open-terminal/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10
Message-ID: <20090811051731.83F4C11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-open-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3922

Modified Files:
	.cvsignore sources 
Log Message:
new source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Jul 2009 11:59:32 -0000	1.9
+++ .cvsignore	11 Aug 2009 05:17:31 -0000	1.10
@@ -1 +1 @@
-nautilus-open-terminal-0.13.tar.bz2
+nautilus-open-terminal-0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Jul 2009 11:59:32 -0000	1.9
+++ sources	11 Aug 2009 05:17:31 -0000	1.10
@@ -1 +1 @@
-412d61dc1a6c70235afd3735476f3401  nautilus-open-terminal-0.13.tar.bz2
+944115a2a05e62db02ed719b9133a354  nautilus-open-terminal-0.17.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 05:19:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 05:19:21 +0000
Subject: [pkgdb] libprelude (Fedora EPEL, 5) updated by kevin
Message-ID: <20090811051921.9A14310F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libprelude
kevin has set commit to Approved for 107427 on libprelude (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on libprelude (Fedora EPEL 5)
kevin has set build to Approved for 107427 on libprelude (Fedora EPEL 5)
kevin changed owner of libprelude in Fedora EPEL 5 to wolfy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libprelude



From deji at fedoraproject.org  Tue Aug 11 05:20:10 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 05:20:10 +0000 (UTC)
Subject: rpms/file-browser-applet/devel .cvsignore, 1.7,
	1.8 file-browser-applet.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090811052010.9C66511C0489@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/file-browser-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5062

Modified Files:
	.cvsignore file-browser-applet.spec sources 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.4-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 May 2009 14:27:48 -0000	1.7
+++ .cvsignore	11 Aug 2009 05:20:10 -0000	1.8
@@ -1 +1 @@
-file-browser-applet-0.6.2.tar.gz
+file-browser-applet-0.6.4.tar.gz


Index: file-browser-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/file-browser-applet.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- file-browser-applet.spec	24 Jul 2009 22:44:47 -0000	1.10
+++ file-browser-applet.spec	11 Aug 2009 05:20:10 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		file-browser-applet
-Version:	0.6.2
-Release:	2%{?dist}
+Version:	0.6.4
+Release:	1%{?dist}
 Summary:	File Browser Applet for the GNOME Panel
 Group:		User Interface/Desktops
 License:	GPLv2+
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_sysconfdir}/gconf/schemas/file-browser-applet.schemas
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.4-1
+- New upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-browser-applet/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 May 2009 14:27:48 -0000	1.7
+++ sources	11 Aug 2009 05:20:10 -0000	1.8
@@ -1 +1 @@
-67e1fd248a74342b6a0ca416a4d66541  file-browser-applet-0.6.2.tar.gz
+3874795cf8c02b0749a0b09c7466f677  file-browser-applet-0.6.4.tar.gz



From phuang at fedoraproject.org  Tue Aug 11 05:26:10 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 11 Aug 2009 05:26:10 +0000 (UTC)
Subject: rpms/ibus-qt/devel ibus-qt.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811052610.4F6C911C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5894/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-qt.spec import.log 
Log Message:
Import ibus-qt



--- NEW FILE ibus-qt.spec ---
Name:       ibus-qt
Version:    1.2.0.20090728
Release:    1%{?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:  qt-devel >= 4.5
BuildRequires:  dbus-devel >= 1.2
BuildRequires:  cmake
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
/sbin/ldconfig

%postun
/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,-)
%{_libdir}/libibus-qt.so

%changelog
* Mon Jul 27 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090728-1
- The first version.


--- NEW FILE import.log ---
ibus-qt-1_2_0_20090728-1_fc11:HEAD:ibus-qt-1.2.0.20090728-1.fc11.src.rpm:1249968444


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.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	11 Aug 2009 05:26:10 -0000	1.2
@@ -0,0 +1 @@
+ibus-qt-1.2.0.20090728-Source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/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	11 Aug 2009 05:26:10 -0000	1.2
@@ -0,0 +1 @@
+b9167035bd6abb40de35fa4e4f83fcca  ibus-qt-1.2.0.20090728-Source.tar.gz



From mclasen at fedoraproject.org  Tue Aug 11 05:28:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 05:28:23 +0000 (UTC)
Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.33,
	1.34
Message-ID: <20090811052823.C052F11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-open-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6212

Modified Files:
	nautilus-open-terminal.spec 
Log Message:
drop patches



Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- nautilus-open-terminal.spec	11 Aug 2009 05:09:59 -0000	1.33
+++ nautilus-open-terminal.spec	11 Aug 2009 05:28:23 -0000	1.34
@@ -7,8 +7,6 @@ Group:          User Interface/Desktops
 License:       	GPLv2+
 URL:            http://download.gnome.org/sources/%{name}/
 Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		nautilus-open-terminal-0.12-eelheader.patch
-Patch1:		nautilus-open-terminal-0.13-header+vars.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnome-desktop-devel
@@ -24,8 +22,6 @@ Terminal" option for nautilus users who 
 
 %prep
 %setup -q
-%patch0 -p1 -b .eelheader
-%patch1 -p1 -b .headervars
 libtoolize --force --copy
 autoreconf
 



From phuang at fedoraproject.org  Tue Aug 11 05:29:43 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Tue, 11 Aug 2009 05:29:43 +0000 (UTC)
Subject: rpms/ibus-qt/devel ibus-qt.spec,1.1,1.2
Message-ID: <20090811052943.B37AA11C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6482

Modified Files:
	ibus-qt.spec 
Log Message:
Fix rpmlint warning


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-qt.spec	11 Aug 2009 05:26:10 -0000	1.1
+++ ibus-qt.spec	11 Aug 2009 05:29:43 -0000	1.2
@@ -43,11 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 # %find_lang %{name}
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From deji at fedoraproject.org  Tue Aug 11 05:30:12 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 05:30:12 +0000 (UTC)
Subject: rpms/referencer/devel referencer.spec,1.24,1.25
Message-ID: <20090811053012.EDE9311C048B@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6575

Modified Files:
	referencer.spec 
Log Message:
Fix Filelist



Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- referencer.spec	11 Aug 2009 05:08:09 -0000	1.24
+++ referencer.spec	11 Aug 2009 05:30:12 -0000	1.25
@@ -14,6 +14,9 @@ BuildRequires:	poppler-glib-devel libgno
 BuildRequires:	boost-devel gcc-c++ python-devel
 BuildRequires:	gettext perl(XML::Parser)
 BuildRequires:	desktop-file-utils intltool gnome-doc-utils
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Referencer is a Gnome application to organise documents or references, and
@@ -51,6 +54,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
 update-desktop-database &> /dev/null ||:
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -61,6 +66,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+scrollkeeper-update -q || :
+
 update-desktop-database &> /dev/null ||:
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -74,6 +81,10 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/mime/packages/referencer.xml
 %{_datadir}/pixmaps/referencer.svg
 %{_datadir}/referencer/
+%{_datadir}/gnome/help/referencer-plugins/
+%{_datadir}/gnome/help/referencer/
+%{_datadir}/omf/referencer-plugins/
+%{_datadir}/omf/referencer/
 %{python_sitelib}/referencer/
 
 %changelog



From tbreeds at fedoraproject.org  Tue Aug 11 05:33:02 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Tue, 11 Aug 2009 05:33:02 +0000 (UTC)
Subject: rpms/libtopology/F-11 libtopology.spec,1.3,1.4
Message-ID: <20090811053302.6DACE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/libtopology/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7003

Modified Files:
	libtopology.spec 
Log Message:
Split documentation into (noarch) subpackage



Index: libtopology.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtopology/F-11/libtopology.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libtopology.spec	25 Feb 2009 19:31:00 -0000	1.3
+++ libtopology.spec	11 Aug 2009 05:33:02 -0000	1.4
@@ -1,6 +1,6 @@
 name:		libtopology
 Version:	0.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	CPU Topology library
 
 Group:		System Environment/Libraries
@@ -18,11 +18,20 @@ systems.
 Summary:	CPU Topology library development package
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-BuildRequires:	doxygen
 
 %description devel
 Development package for libtopology.
 
+%package doc
+Summary:	CPU Topology library documentation package
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+BuildRequires:	doxygen
+BuildArch:	noarch
+
+%description doc
+Documentation and sample programs for libtopology.
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -64,11 +73,17 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_includedir}/topology.h
 %{_libdir}/libtopology.so
+
+%files doc 
+%defattr(-,root,root,-)
 %{_defaultdocdir}/%{name}-%{version}/README
 %{_defaultdocdir}/%{name}-%{version}/examples/
 %{_defaultdocdir}/%{name}-%{version}/doc
 
 %changelog
+* Tue Aug 11 2009 Tony Breeds <tony at bakeyournoodle.com> 0.3-6
+- Split the docs into a noarch subpackage
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Tue Aug 11 05:33:57 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 11 Aug 2009 05:33:57 +0000 (UTC)
Subject: rpms/dovecot/F-11 dovecot-sieve-0.1.11.patch, NONE, 1.1 .cvsignore, 
	1.63, 1.64 dovecot.spec, 1.137, 1.138 sources, 1.66, 1.67
Message-ID: <20090811053357.4CCB911C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7199

Modified Files:
	.cvsignore dovecot.spec sources 
Added Files:
	dovecot-sieve-0.1.11.patch 
Log Message:
updated to 1.2.3


dovecot-sieve-0.1.11.patch:
 sieve-filter.1 |  151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

--- NEW FILE dovecot-sieve-0.1.11.patch ---
diff -up dovecot-1.2-sieve-0.1.11/doc/man/sieve-filter.1.devnull dovecot-1.2-sieve-0.1.11/doc/man/sieve-filter.1
--- /dev/null	2009-08-10 16:08:33.895265368 +0200
+++ dovecot-1.2-sieve-0.1.11/doc/man/sieve-filter.1	2009-08-10 16:08:02.899248904 +0200
@@ -0,0 +1,151 @@
+.TH "SIEVE-FILTER" "1" "5 August 2009"
+.SH NAME
+sieve-filter \- Sieve mailbox filter tool for the Dovecot secure IMAP server
+.PP
+\fBWARNING: \fRThis tool is not finished and should \fB*NOT*\fR be used, unless you feel like testing newly developed
+features! The behavior described in this manual page represents the design and not necessarily what the tool currently implements.
+
+.SH SYNOPSIS
+sieve-filter [\fIoptions\fR] \fIscript-file\fR \fIsource-location\fR \fIsource-mailbox\fR [\fIinbox-namespace\fR [\fInamespace\fR ...]]
+.TP
+\fInamepace\fR = [prefix=]location[;option=value,option=value,...]
+.TP
+[FIXME: what would be the easiest way to specify a filter operation without always needing to
+delve into the complexity of namespaces]
+
+.SH DESCRIPTION
+.PP
+The \fBsieve-filter\fP command is part of the Sieve implementation for the Dovecot secure 
+IMAP server. Sieve (RFC 5228) is a simple and highly extensible language for filtering 
+e-mail messages. It can be implemented for any type of mail access protocol, mail 
+architecture and operating system. The language cannot execute external programs and in 
+its basic form it does not provide the means to cause infinite loops, making it suitable 
+for running securely on mail servers where mail users have no permission run arbitrary programs.
+.PP
+The Sieve language was originally meant for filtering messages upon delivery. However, there are
+occasions when it is desirable to filter messages that are already stored in a mailbox, for
+instance when a bug in a Sieve script caused many messages to be delivered incorrectly.
+Using the sieve-filter tool it is possible to apply a Sieve script on all messages in a particular
+mailbox, making it possible to delete messages, to store them in a different folder and to change
+the assigned IMAP flags and keywords. Attempts to send messages to the outside world are ignored by default
+for obvious reasons, but, using the proper command line options, it is possible to capture outgoing
+mail as well. 
+.PP
+The command has three mandatory arguments: the \fIscript-file\fP argument, which specifies the path of the
+Sieve script, the \fIsource-location\fP argument, which specifies the mail storage of the source mailbox 
+(e.g. `maildir:~/Maildir'), and the \fIsource-mailbox\fP argument, which specifies the name of the source 
+mailbox within the specified mail storage (e.g. `INBOX.Spam'). 
+.PP
+This tool does not (yet) use Dovecot's configuration file to obtain information on namespaces and the
+location of mailboxes. Therefore, any used namespaces need to be specified on the command line. These
+specifications directly follow the \fIsource-mailbox\fP parameter. The first specified namespace will
+be the INBOX namespace.
+.PP
+If no namespaces are defined on the commandline, the source-location is used as the default mail store
+where the INBOX is located. This means that the keep action could operate on the folder the message
+originates from. In this case the message remains untouched and it is not duplicated, but IMAP flags and
+keywords can be evaluated and changed with the imap4flags extension . If namespaces are defined explicitly, 
+the source location is available as a namespace with prefix `#src/'. 
+.PP
+If no options are specified, the sieve-filter command runs in a simulation mode in which it only 
+prints what would be performed, without actually doing anything. Use the \fB-e\fP option to activate
+true script execution. Also, the source mailbox is opened read-only by default, so that the source mailbox
+remains unchanged. Use the \fB-W\fP to allow changes in the source mailbox. 
+
+.SH CAUTION
+Although this is a very useful tool, it can also be very destructive when used improperly. A small 
+bug in your Sieve script in combination with the wrong command line options could cause it to 
+discard (many) more e-mails than it was supposed to. Therefore, users are advised to read this manual
+carefully and to use the simulation mode first to check what the script will do. 
+.PP
+\fBMAKING A BACKUP IS IMPERATIVE FOR ANY IMPORTANT MAIL!\fP
+.PP
+By default, it will open the source mailbox in a read-only mode, such that it will not delete any of your
+e-mails. However, it can still litter other mailboxes with spurious copies of your e-mails if your
+Sieve script decides to do so.
+
+.SH OPTIONS
+.TP 
+\fB-D\fP \fIsource-action\fP
+By default, the sieve-filter command does not delete the messages from the source mailbox. This means that
+a copy operation is executed by default and the source mailbox is not altered. The \fIsource-action\fP
+parameter of the \fB-D\fP option can take four different values:
+.RS 7
+.TP 
+\fBkeep\fP (default)
+Keep messages in source folder. If \fB-W\fR is specified and the source mailbox is the destination of
+a keep or fileinto action, flags can be changed by the Sieve script. Messages are never duplicated in the
+source mailbox.
+.TP 
+\fBflag\fP
+Flag messages as \\DELETED.
+.TP 
+\fBmove\fP [\fIfolder\fP]
+Move messages to the indicated \fIfolder\fP.
+.TP 
+\fBexpunge\fP
+Expunge messages, meaning that these are removed irreversibly when the tool finishes filtering.
+.PP
+Note that values other than `keep' have no effect, unless the \fB-W\fP option is specified as well.
+.RE
+.TP
+\fB-e\fP
+Turns on execution mode. By default, the sieve-filter command runs in simulation mode in which it 
+changes nothing, meaning that no mailbox is altered in any way and no actions are performed. It only
+prints what would be done. Using this option the sieve-filter command becomes active and performs the 
+requested actions.
+.TP
+\fB-f\fP \fIenvelope-sender\fP
+The envelope sender or return path. This is what Sieve's envelope test will compare to when the 
+"from" envelope part is requested. Also, this is where response messages are sent to. 
+.TP
+\fB-m\fP \fIdefault-mailbox\fP
+The mailbox within the default namespace where the keep action stores the message. This is "INBOX"
+by default.
+.TP
+\fB-Q\fP \fImail-command\fP
+Send outgoing e-mail through the specified program. By default, the sieve-filter command ignores 
+Sieve actions such as redirect, reject, vacation and notify, but using this option outgoing messages
+can be fed to the \fBstdin\fP of an external shell command. This option has no effect in simulation
+mode, Unless you really know what you are doing, \fBDO NOT USE THIS TO FEED MAIL TO SENDMAIL!\f.
+.TP
+\fB-r\fP \fIrecipient-address\fP
+The envelope recipient address. This is what Sieve's envelope test will compare to when the "to"
+envelope part is requested. Some tests and actions will also use this as the owner's e-mail address.
+.TP
+\fB-S\fP \fIscript-file\fP
+Specify additional scripts to be executed before the main script. Multiple \fB-s\fP arguments are
+allowed and the specified scripts are executed sequentially in the order specified at the command
+line.
+.TP
+\fB-W\fP
+Enables write access to the source mailbox. This allows deleting the messages from the source mailbox
+and changing the assigned IMAP flags and keywords. 
+.TP
+\fB-x\fP "\fIextension extension ...\fP"
+Set the available extensions. The parameter is a space-separated list of the active extensions. By
+prepending the extension identifiers with \fB+\fP or \fB-\fP, extensions can be included or excluded
+relative to the default set of extensions. If no extensions have a \fB+\fP or \fB-\fP prefix, only 
+those extensions that are explicitly listed will be enabled. Unknown extensions are ignored and a 
+warning is produced. By default, all supported extensions are available, except for deprecated extensions 
+or those that are still under development.
+
+For example \fB-x\fP "+imapflags -enotify" will enable the deprecated imapflags extension along with all
+extensions that are available by default, except for the enotify extension.
+
+.SH EXAMPLES
+
+.TP
+[...]
+
+.SH AUTHOR
+.PP
+The Sieve implementation for Dovecot was written by Stephan Bosch <stephan at rename-it.nl>.
+.PP
+Dovecot was written by Timo Sirainen <tss at iki.fi>.
+
+.SH "SEE ALSO"
+.BR sievec (1),
+.BR sieved (1),
+.BR sieve-test (1)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	28 Jul 2009 08:02:19 -0000	1.63
+++ .cvsignore	11 Aug 2009 05:33:57 -0000	1.64
@@ -1,4 +1,4 @@
-dovecot-1.2.2-20090728.tar.gz
-dovecot-1.2-managesieve-0.11.7.tar.gz
-dovecot-1.2.2-managesieve-0.11.7.diff.gz
-dovecot-1.2-sieve-0.1.9.tar.gz
+dovecot-1.2.3.tar.gz
+dovecot-1.2-managesieve-0.11.8.tar.gz
+dovecot-1.2.3-managesieve-0.11.8.diff.gz
+dovecot-1.2-sieve-0.1.11.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- dovecot.spec	28 Jul 2009 08:02:19 -0000	1.137
+++ dovecot.spec	11 Aug 2009 05:33:57 -0000	1.138
@@ -1,8 +1,8 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.2.2
-Release: 1.20090728snap%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -14,13 +14,13 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.9
+%define sieve_version 0.1.11
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.7
+%define managesieve_version 0.11.8
 %define managesieve_name dovecot-1.2-managesieve
 
 URL: http://www.dovecot.org/
-Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}-20090728.tar.gz
+Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
 Source3: maildir-migration.txt
@@ -38,6 +38,9 @@ Patch1: dovecot-1.1-default-settings.pat
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
+#temporary for dovecot-sieve 0.1.11 only
+Patch4: dovecot-sieve-0.1.11.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -171,6 +174,7 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 
 %if %{build_sieve}
 %setup -q -D -T -a 8
+%patch4 -p0 -b .devnull
 %endif
 
 %if %{build_managesieve}
@@ -379,6 +383,7 @@ fi
 %{_bindir}/sieve-test
 %{_bindir}/sievec
 %{_bindir}/sieved
+%{_mandir}/man1/sieve-filter.1.gz
 %{_mandir}/man1/sieve-test.1.gz
 %{_mandir}/man1/sievec.1.gz
 %{_mandir}/man1/sieved.1.gz
@@ -434,6 +439,19 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.3-1
+- updated: dovecot 1.2.3, managesieve 0.11.8, sieve 0.1.11
+- Mailbox names with control characters can't be created anymore.
+  Existing mailboxes can still be accessed though.
+- Allow namespace prefix to be opened as mailbox, if a mailbox
+  already exists in the root dir.
+- Maildir: dovecot-uidlist was being recreated every time a mailbox
+  was accessed, even if nothing changed.
+- listescape plugin was somewhat broken
+- ldap: Fixed hang when >128 requests were sent at once.
+- fts_squat: Fixed crashing when searching virtual mailbox.
+- imap: Fixed THREAD .. INTHREAD crashing.
+
 * Tue Jul 28 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.2-1.20090728snap
 - updated to post 1.2.2 snapshot (including post release GSSAPI fix)
 - Fixed "corrupted index cache file" errors


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	28 Jul 2009 08:02:19 -0000	1.66
+++ sources	11 Aug 2009 05:33:57 -0000	1.67
@@ -1,4 +1,4 @@
-1b8beec9fa5ba66d7ba0790191e2e2e0  dovecot-1.2.2-20090728.tar.gz
-61e84cf3749e3ec1ce1f41e918f1f0b0  dovecot-1.2-managesieve-0.11.7.tar.gz
-b971743cdce359aa0aeb24040a3750ea  dovecot-1.2.2-managesieve-0.11.7.diff.gz
-a9a9254def9e9a05105aa56a960ac7fa  dovecot-1.2-sieve-0.1.9.tar.gz
+28905211d9301022a1ed20df71ad2b08  dovecot-1.2.3.tar.gz
+8cebb8ae5aa4ace658f5abfb53357a86  dovecot-1.2-managesieve-0.11.8.tar.gz
+8753084aa9b4b9a5d85e15013ccc21af  dovecot-1.2.3-managesieve-0.11.8.diff.gz
+c9d8a8668707a831710c7fba06a3bc08  dovecot-1.2-sieve-0.1.11.tar.gz



From bruno at fedoraproject.org  Tue Aug 11 05:47:57 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Tue, 11 Aug 2009 05:47:57 +0000 (UTC)
Subject: rpms/colossus/F-10 .cvsignore, 1.2, 1.3 colossus.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090811054757.3735411C00D7@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8884/F-10

Modified Files:
	.cvsignore colossus.spec import.log sources 
Log Message:
Initial load into F10.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jul 2009 03:18:19 -0000	1.2
+++ .cvsignore	11 Aug 2009 05:47:55 -0000	1.3
@@ -1 +1 @@
-colossus-20090710-4432.tar.gz
+colossus-20090810-4482.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colossus.spec	13 Jul 2009 03:18:19 -0000	1.1
+++ colossus.spec	11 Aug 2009 05:47:55 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4432
-%define         revdate    20090710
-Version:        0
-Release:        0.2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4482
+%define         revdate    20090810
+Version:        0.9.0
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -73,6 +73,7 @@ echo "libs.dir=%{_javadir}" > local_buil
 # Tell colossus some build info that the game will display
 mkdir -p build/ant/classes/META-INF
 cat <<EOF > build/ant/classes/META-INF/build.properties
+release.version=%{version}
 svn.revision.max-with-flags=%{rev}
 build.timestamp=%{revdate}
 username=rpmbuild
@@ -178,6 +179,23 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
+- New public build.
+- Upstream is now using real version numbers.
+
+* Sun Jul 26 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.5.20090726svn4462
+- Just when I thought it would be safe to rebase, a new public test build was released
+- Details at http://colossus.sourceforge.net/public-testing/docs/RecentChangesDetails.html
+- Rebase to 4462
+
+* Sat Jul 25 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.4.20090725svn4454
+- Fix for off by one roll, movement roll in master board header
+- Rebase to 4454
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090710svn4432
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+
 * Sun Jul 12 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.2.20090710svn4432
 - A couple of final spec file tweaks based on comments from my sponsor
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Jul 2009 03:18:19 -0000	1.1
+++ import.log	11 Aug 2009 05:47:56 -0000	1.2
@@ -1 +1,2 @@
 colossus-0-0_2_20090710svn4432_fc11:F-10:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247454273
+colossus-0_9_0-1_20090810svn4482_fc11:F-10:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249969651


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jul 2009 03:18:19 -0000	1.2
+++ sources	11 Aug 2009 05:47:56 -0000	1.3
@@ -1 +1 @@
-4bc5d55868e775581d3ef8f281886059  colossus-20090710-4432.tar.gz
+22fcc30b7dd9af6b8e01d99db4125b74  colossus-20090810-4482.tar.gz



From bruno at fedoraproject.org  Tue Aug 11 05:48:59 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Tue, 11 Aug 2009 05:48:59 +0000 (UTC)
Subject: rpms/colossus/F-11 .cvsignore, 1.2, 1.3 colossus.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090811054859.3D6AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9118/F-11

Modified Files:
	.cvsignore colossus.spec import.log sources 
Log Message:
Initial load into F11.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Jul 2009 03:03:24 -0000	1.2
+++ .cvsignore	11 Aug 2009 05:48:58 -0000	1.3
@@ -1 +1 @@
-colossus-20090710-4432.tar.gz
+colossus-20090810-4482.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colossus.spec	13 Jul 2009 03:03:24 -0000	1.1
+++ colossus.spec	11 Aug 2009 05:48:58 -0000	1.2
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4432
-%define         revdate    20090710
-Version:        0
-Release:        0.2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4482
+%define         revdate    20090810
+Version:        0.9.0
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -73,6 +73,7 @@ echo "libs.dir=%{_javadir}" > local_buil
 # Tell colossus some build info that the game will display
 mkdir -p build/ant/classes/META-INF
 cat <<EOF > build/ant/classes/META-INF/build.properties
+release.version=%{version}
 svn.revision.max-with-flags=%{rev}
 build.timestamp=%{revdate}
 username=rpmbuild
@@ -178,6 +179,23 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
+- New public build.
+- Upstream is now using real version numbers.
+
+* Sun Jul 26 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.5.20090726svn4462
+- Just when I thought it would be safe to rebase, a new public test build was released
+- Details at http://colossus.sourceforge.net/public-testing/docs/RecentChangesDetails.html
+- Rebase to 4462
+
+* Sat Jul 25 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.4.20090725svn4454
+- Fix for off by one roll, movement roll in master board header
+- Rebase to 4454
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20090710svn4432
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+
 * Sun Jul 12 2009 Bruno Wolff III <bruno at wolff.to> - 0-0.2.20090710svn4432
 - A couple of final spec file tweaks based on comments from my sponsor
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Jul 2009 03:03:24 -0000	1.1
+++ import.log	11 Aug 2009 05:48:58 -0000	1.2
@@ -1 +1,2 @@
 colossus-0-0_2_20090710svn4432_fc11:F-11:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247454127
+colossus-0_9_0-1_20090810svn4482_fc11:F-11:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249969718


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Jul 2009 03:03:24 -0000	1.2
+++ sources	11 Aug 2009 05:48:59 -0000	1.3
@@ -1 +1 @@
-4bc5d55868e775581d3ef8f281886059  colossus-20090710-4432.tar.gz
+22fcc30b7dd9af6b8e01d99db4125b74  colossus-20090810-4482.tar.gz



From bskeggs at fedoraproject.org  Tue Aug 11 05:49:53 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 11 Aug 2009 05:49:53 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.43, 1.44 kernel.spec, 1.1709,
	1.1710
Message-ID: <20090811054953.D8E3611C00D7@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9831

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: various cleanups and fixes + more sanity checking in dma paths



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   30 
 drivers/gpu/drm/Makefile                    |    1 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5053 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  227 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  573 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  622 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  515 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  593 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   57 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   92 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  161 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  146 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  370 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1131 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   53 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  971 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  754 
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1018 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  431 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  246 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  116 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1143 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_display.c      |  250 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  291 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_output.c       |  797 +
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  819 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  284 
 drivers/gpu/drm/nouveau/nv50_display.c      |  849 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  264 
 drivers/gpu/drm/nouveau/nvreg.h             |  503 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/nouveau_drm.h                   |  214 
 75 files changed, 54082 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.43 -r 1.44 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- drm-nouveau.patch	5 Aug 2009 05:54:37 -0000	1.43
+++ drm-nouveau.patch	11 Aug 2009 05:49:52 -0000	1.44
@@ -105,7 +105,7 @@ index 6246e3f..436e2fe 100644
  		if (map->type == _DRM_REGISTERS)
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..a04127f
+index 0000000..2ba1e45
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,27 @@
@@ -114,7 +114,7 @@ index 0000000..a04127f
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 +
 +ccflags-y := -Iinclude/drm
-+nouveau-y := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
++nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
 +             nouveau_object.o nouveau_irq.o nouveau_notifier.o \
 +             nouveau_sgdma.o nouveau_dma.o \
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
@@ -299,10 +299,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..defc0c8
+index 0000000..c828c2e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5056 @@
+@@ -0,0 +1,5053 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -3511,9 +3511,6 @@ index 0000000..defc0c8
 +	return 0;
 +}
 +
-+extern int nouveau_uscript_lvds;
-+extern int nouveau_uscript_tmds;
-+
 +int
 +nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent,
 +			       int pxclk)
@@ -5594,10 +5591,10 @@ index 0000000..24fc305
 +#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..d59ffc4
+index 0000000..a7b2a61
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -0,0 +1,557 @@
+@@ -0,0 +1,573 @@
 +/*
 + * Copyright 2007 Dave Airlied
 + * All Rights Reserved.
@@ -5672,6 +5669,22 @@ index 0000000..d59ffc4
 +	if (!nvbo->mappable && (flags & TTM_PL_FLAG_VRAM))
 +		flags |= TTM_PL_FLAG_PRIV0;
 +
++	/* Some of the tile_flags have a periodic structure of 24*4096 bytes, 
++	 * align to to that as well as the page size. Overallocate memory to 
++	 * avoid corruption of other buffer objects.
++	 */
++	switch (tile_flags) {
++		case 0x1800:
++		case 0x2800:
++		case 0x4800:
++		case 0x7a00:
++			size += 6*4096;
++			align = 2*24*4096;
++			break;
++		default:
++			break;
++	}
++
 +	align >>= PAGE_SHIFT;
 +
 +	size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1);
@@ -6783,12 +6796,533 @@ index 0000000..e2b78d2
 +
 +	return outclk;
 +}
+diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
+new file mode 100644
+index 0000000..2429c7f
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
+@@ -0,0 +1,515 @@
++/*
++ * Copyright 2005-2006 Stephane Marchesin
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#include "drmP.h"
++#include "drm.h"
++#include "nouveau_drv.h"
++#include "nouveau_drm.h"
++#include "nouveau_dma.h"
++
++static int
++nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
++{
++	struct drm_device *dev = chan->dev;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nouveau_bo *pb = chan->pushbuf_bo;
++	struct nouveau_gpuobj *pushbuf = NULL;
++	uint32_t start = pb->bo.mem.mm_node->start << PAGE_SHIFT;
++	uint32_t size = pb->bo.mem.size;
++	int ret;
++
++	if (pb->bo.mem.mem_type == TTM_PL_TT) {
++		ret = nouveau_gpuobj_gart_dma_new(chan, start, size,
++						  NV_DMA_ACCESS_RO,
++						  &pushbuf,
++						  &chan->pushbuf_base);
++	} else
++	if (dev_priv->card_type != NV_04) {
++		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
++					     start, size, NV_DMA_ACCESS_RO,
++					     NV_DMA_TARGET_VIDMEM, &pushbuf);
++		chan->pushbuf_base = 0;
++	} else {
++		/* NV04 cmdbuf hack, from original ddx.. not sure of it's
++		 * exact reason for existing :)  PCI access to cmdbuf in
++		 * VRAM.
++		 */
++		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
++					     start +
++					       drm_get_resource_start(dev, 1),
++					     size, NV_DMA_ACCESS_RO,
++					     NV_DMA_TARGET_PCI, &pushbuf);
++		chan->pushbuf_base = 0;
++	}
++
++	ret = nouveau_gpuobj_ref_add(dev, chan, 0, pushbuf, &chan->pushbuf);
++	if (ret) {
++		NV_ERROR(dev, "Error referencing pushbuf ctxdma: %d\n", ret);
++		if (pushbuf != dev_priv->gart_info.sg_ctxdma)
++			nouveau_gpuobj_del(dev, &pushbuf);
++		return ret;
++	}
++
++	return 0;
++}
++
++static struct nouveau_bo *
++nouveau_channel_user_pushbuf_alloc(struct drm_device *dev)
++{
++	struct nouveau_bo *pushbuf = NULL;
++	int location, ret;
++
++	if (nouveau_vram_pushbuf)
++		location = TTM_PL_FLAG_VRAM;
++	else
++		location = TTM_PL_FLAG_TT;
++
++	ret = nouveau_bo_new(dev, NULL, 65536, 0, location, 0, 0x0000, false,
++			     true, &pushbuf);
++	if (ret) {
++		NV_ERROR(dev, "error allocating DMA push buffer: %d\n", ret);
++		return NULL;
++	}
++
++	ret = nouveau_bo_pin(pushbuf, location);
++	if (ret) {
++		NV_ERROR(dev, "error pinning DMA push buffer: %d\n", ret);
++		nouveau_bo_ref(NULL, &pushbuf);
++		return NULL;
++	}
++
++	return pushbuf;
++}
++
++/* allocates and initializes a fifo for user space consumption */
[...2820 lines suppressed...]
 +	nv_wo32(dev, ctx, (0x2744/4)+9, 0xbf800000);
 +
-+/*
-+write32 #1 block at +0x00742e34 NV_PRAMIN.GRCTX0+0x2714 of 4 (0x4) elements:
-++0x00742e34: 00000000 3f800000 00000000 00000000
-+*/
 +	nv_wo32(dev, ctx, (0x2714/4)+1, 0x3f800000);
 +
-+/*
-+write32 #1 block at +0x00742e94 NV_PRAMIN.GRCTX0+0x2774 of 4 (0x4) elements:
-++0x00742e94: 00000000 00000000 00000000 00000000
-+write32 #1 block at +0x00743804 NV_PRAMIN.GRCTX0+0x30e4 of 4 (0x4) elements:
-++0x00743804: 00000000 00000000 00000000 00000000
-+write32 #1 block at +0x007437a4 NV_PRAMIN.GRCTX0+0x3084 of 8 (0x8) elements:
-++0x007437a4: 00000000 00000000 000fe000 00000000 00000000 00000000 00000000 00000000
-+*/
 +	nv_wo32(dev, ctx, (0x3084/4)+2, 0x000fe000);
 +
-+/*
-+write32 #1 block at +0x007437d4 NV_PRAMIN.GRCTX0+0x30b4 of 4 (0x4) elements:
-++0x007437d4: 00000000 00000000 00000000 00000000
-+write32 #1 block at +0x00743824 NV_PRAMIN.GRCTX0+0x3104 of 4 (0x4) elements:
-++0x00743824: 00000000 000003f8 00000000 00000000
-+*/
 +	nv_wo32(dev, ctx, (0x3104/4)+1, 0x000003f8);
 +
-+/* write32 #1 NV_PRAMIN.GRCTX0+0x3468 <- 0x002fe000 */
 +	nv_wo32(dev, ctx, 0x3468/4, 0x002fe000);
 +
-+/*
-+write32 #1 block at +0x00743ba4 NV_PRAMIN.GRCTX0+0x3484 of 8 (0x8) elements:
-++0x00743ba4: 001c527c 001c527c 001c527c 001c527c 001c527c 001c527c 001c527c 001c527c
-+*/
 +	for (i=0; i<8; ++i)
 +		nv_wo32(dev, ctx, (0x3484/4)+i, 0x001c527c);
 +}
@@ -24799,27 +24636,6 @@ index 0000000..3a1b9e6
 +		nv_wr32(dev, 0x400754, nv_rd32(dev, NV04_PFB_CFG1));
 +	}
 +
-+#if 0
-+	nv_wr32(dev, 0x400820, 0);
-+	nv_wr32(dev, 0x400824, 0);
-+	nv_wr32(dev, 0x400864, vramsz-1);
-+	nv_wr32(dev, 0x400868, vramsz-1);
-+
-+	nv_wr32(dev, 0x400B20, 0x00000000);
-+	nv_wr32(dev, 0x400B04, 0xFFFFFFFF);
-+
-+	/* per-context state, doesn't belong here */
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) & 0x0007ff00;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) | 0x00020100;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMAX, 0x7fff);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMAX, 0x7fff);
-+#endif
-+
 +	return 0;
 +}
 +
@@ -24934,10 +24750,10 @@ index 0000000..fae4246
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/nv40_fifo.c
 new file mode 100644
-index 0000000..61b7832
+index 0000000..6b5fdcc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_fifo.c
-@@ -0,0 +1,222 @@
+@@ -0,0 +1,223 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -25154,7 +24970,8 @@ index 0000000..61b7832
 +{
 +	int ret;
 +
-+	if ((ret = nouveau_fifo_init(dev)))
++	ret = nv04_fifo_init(dev);
++	if (ret)
 +		return ret;
 +
 +	nv_wr32(dev, NV04_PFIFO_DMA_TIMESLICE, 0x2101ffff);
@@ -27415,10 +27232,10 @@ index 0000000..2a3495e
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..b169f9b
+index 0000000..99f24a3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,811 @@
+@@ -0,0 +1,819 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -27519,7 +27336,7 @@ index 0000000..b169f9b
 +	struct drm_device *dev = crtc->base.dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_channel *evo = dev_priv->evo;
-+	int index = crtc->index;
++	int index = crtc->index, ret;
 +
 +	NV_DEBUG(dev, "index %d\n", crtc->index);
 +	NV_DEBUG(dev, "%s\n", blanked ? "blanked" : "unblanked");
@@ -27527,7 +27344,11 @@ index 0000000..b169f9b
 +	if (blanked) {
 +		crtc->cursor.hide(crtc, false);
 +
-+		RING_SPACE(evo, dev_priv->chipset != 0x50 ? 7 : 5);
++		ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 7 : 5);
++		if (ret) {
++			NV_ERROR(dev, "no space while blanking crtc\n");
++			return ret;
++		}
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, CLUT_MODE), 2);
 +		OUT_RING  (evo, NV50_EVO_CRTC_CLUT_MODE_BLANK);
 +		OUT_RING  (evo, 0);
@@ -27545,7 +27366,11 @@ index 0000000..b169f9b
 +		else
 +			crtc->cursor.hide(crtc, false);
 +
-+		RING_SPACE(evo, dev_priv->chipset != 0x50 ? 10 : 8);
++		ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 10 : 8);
++		if (ret) {
++			NV_ERROR(dev, "no space while unblanking crtc\n");
++			return ret;
++		}
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, CLUT_MODE), 2);
 +		OUT_RING  (evo, crtc->lut.depth == 8 ?
 +				NV50_EVO_CRTC_CLUT_MODE_OFF :
@@ -28232,10 +28057,10 @@ index 0000000..b169f9b
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
 new file mode 100644
-index 0000000..a3bed39
+index 0000000..0ef825e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,151 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -28279,7 +28104,7 @@ index 0000000..a3bed39
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 4 : 2);
++	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 4 : 2) + update * 2);
 +	if (ret) {
 +		NV_ERROR(dev, "no space while unhiding cursor\n");
 +		return;
@@ -28293,7 +28118,6 @@ index 0000000..a3bed39
 +	OUT_RING  (evo, NV50_EVO_CRTC_CURSOR_CTRL_SHOW);
 +
 +	if (update) {
-+		RING_SPACE(evo, 2);
 +		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
 +		OUT_RING  (evo, 0);
 +		FIRE_RING (evo);
@@ -28311,7 +28135,7 @@ index 0000000..a3bed39
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 4 : 2);
++	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 4 : 2) + update * 2);
 +	if (ret) {
 +		NV_ERROR(dev, "no space while hiding cursor\n");
 +		return;
@@ -28324,7 +28148,6 @@ index 0000000..a3bed39
 +	}
 +
 +	if (update) {
-+		RING_SPACE(evo, 2);
 +		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
 +		OUT_RING  (evo, 0);
 +		FIRE_RING (evo);
@@ -29969,7 +29792,7 @@ index 0000000..d7af9ed
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..071a2f3
+index 0000000..c4c45f2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
 @@ -0,0 +1,475 @@
@@ -30251,7 +30074,7 @@ index 0000000..071a2f3
 +	nv_wo32(dev, ramfc, 0x10/4, chan->pushbuf_base);
 +	nv_wo32(dev, ramfc, 0x48/4, chan->pushbuf->instance >> 4);
 +	nv_wo32(dev, ramfc, 0x80/4, (0xc << 24) | (chan->ramht->instance >> 4));
-+	nv_wo32(dev, ramfc, 0x3c/4, 0x000f0078); /* fetch? */
++	nv_wo32(dev, ramfc, 0x3c/4, 0x00086078);
 +	nv_wo32(dev, ramfc, 0x44/4, 0x2101ffff);
 +	nv_wo32(dev, ramfc, 0x60/4, 0x7fffffff);
 +	nv_wo32(dev, ramfc, 0x40/4, 0x00000000);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1709
retrieving revision 1.1710
diff -u -p -r1.1709 -r1.1710
--- kernel.spec	10 Aug 2009 20:30:10 -0000	1.1709
+++ kernel.spec	11 Aug 2009 05:49:53 -0000	1.1710
@@ -1980,6 +1980,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: various cleanups and fixes + more sanity checking in dma paths
+
 * Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com>
 - Add new device ID to lirc_mceusb (#512483)
 - Fix some lockdep false positives



From bskeggs at fedoraproject.org  Tue Aug 11 05:56:21 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 11 Aug 2009 05:56:21 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.39,
	1.40 nouveau-bicubic-2x.patch, 1.6,
	1.7 nouveau-multiple-xserver.patch, 1.8,
	1.9 nouveau-transition-hack.patch, 1.9, 1.10 sources, 1.40,
	1.41 xorg-x11-drv-nouveau.spec, 1.49, 1.50
Message-ID: <20090811055621.8739711C00D7@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10738

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-3.20090810git85b1c86
- wfb fixes, driver pixmaps enabled by default




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	5 Aug 2009 06:00:25 -0000	1.39
+++ .cvsignore	11 Aug 2009 05:56:20 -0000	1.40
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090805git712064e.tar.bz2
+xf86-video-nouveau-0.0.15-20090810git85b1c86.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/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-bicubic-2x.patch	5 Aug 2009 06:00:26 -0000	1.6
+++ nouveau-bicubic-2x.patch	11 Aug 2009 05:56:20 -0000	1.7
@@ -1,4 +1,4 @@
-From 23a7cd9fcfc2fdc589e86321d96c2c886fd46991 Mon Sep 17 00:00:00 2001
+From 58dffb9cb3dc7a59de6f75d585eade46379fe3f0 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 3/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-multiple-xserver.patch	5 Aug 2009 06:00:26 -0000	1.8
+++ nouveau-multiple-xserver.patch	11 Aug 2009 05:56:20 -0000	1.9
@@ -1,4 +1,4 @@
-From c8327229aa73e2b946d0c1e61f25911f7dd3644b Mon Sep 17 00:00:00 2001
+From c0f1f35be5e2060793a2f63bd2da8ffce5300842 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 62cba05..06023e2 100644
+index 75ec6ab..92a7e2c 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-transition-hack.patch	5 Aug 2009 06:00:26 -0000	1.9
+++ nouveau-transition-hack.patch	11 Aug 2009 05:56:21 -0000	1.10
@@ -1,4 +1,4 @@
-From e0b897898184f96a9a8ef8d583b612ea63dbd92b Mon Sep 17 00:00:00 2001
+From b6008818340b477344f5e4420c6e95e21ce8c8bd Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	5 Aug 2009 06:00:26 -0000	1.40
+++ sources	11 Aug 2009 05:56:21 -0000	1.41
@@ -1 +1 @@
-fbae58a5c8b661a84f96b1d6989a6de3  xf86-video-nouveau-0.0.15-20090805git712064e.tar.bz2
+fb94b12b8909f306d12244cddcd814ac  xf86-video-nouveau-0.0.15-20090810git85b1c86.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-drv-nouveau.spec	5 Aug 2009 06:00:26 -0000	1.49
+++ xorg-x11-drv-nouveau.spec	11 Aug 2009 05:56:21 -0000	1.50
@@ -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 20090805
-%define git_version 712064e
+%define gitdate 20090810
+%define git_version 85b1c86
 
 %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:   2.%{snapshot}%{?dist}
+Release:   3.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,13 +31,13 @@ Source0:   %{tarfile}
 ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
-BuildRequires: xorg-x11-server-devel >= 1.6.99
+BuildRequires: xorg-x11-server-devel >= 1.6.99-29
 BuildRequires: libdrm-devel >= 2.4.12-0.4
 BuildRequires: mesa-libGL-devel
 BuildRequires: kernel-headers >= 2.6.31
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg >= 1.6.99
+Requires:  xorg-x11-server-Xorg >= 1.6.99-29
 Requires:  libdrm >= 2.4.12-0.4
 Requires:  kernel-drm-nouveau = 15
 
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-3.20090810git85b1c86
+- wfb fixes, driver pixmaps enabled by default
+
 * Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-2.20090803git712064e
 - dri2 fixes, no wfb without kms, non-kms fb resize fixes, other misc fixes
 



From airlied at fedoraproject.org  Tue Aug 11 06:00:17 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 11 Aug 2009 06:00:17 +0000 (UTC)
Subject: rpms/pyxf86config/devel pyxf86config.spec,1.55,1.56
Message-ID: <20090811060017.81D5411C0489@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/pyxf86config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11328

Modified Files:
	pyxf86config.spec 
Log Message:
update spec



Index: pyxf86config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- pyxf86config.spec	7 Aug 2009 05:50:47 -0000	1.55
+++ pyxf86config.spec	11 Aug 2009 06:00:17 -0000	1.56
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 BuildRequires: python-devel
-BuildRequires: libxf86config-devel >= 1.6.99-29
+BuildRequires: libxf86config-devel >= 1.6.99-31
 
 ExcludeArch: s390 s390x
 



From jgarzik at fedoraproject.org  Tue Aug 11 06:03:00 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Tue, 11 Aug 2009 06:03:00 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.12,1.13 sources,1.9,1.10
Message-ID: <20090811060300.A032211C00D7@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11760

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cld.spec	8 Aug 2009 06:47:32 -0000	1.12
+++ cld.spec	11 Aug 2009 06:03:00 -0000	1.13
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.12.g85e14281%{?dist}
+Release:	0.14.g8c350253%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 85e14281e1638ed8417c71beab0ba9361a9f0d2d
+# pulled from upstream git, commit 8c3502530c8061ffdaf892e9529abceecfee8dcf
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Aug 11 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.14.g8c350253
+- update to commit 8c3502530c8061ffdaf892e9529abceecfee8dcf
+
 * Sat Aug  8 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.12.g85e14281
 - update to commit 85e14281e1638ed8417c71beab0ba9361a9f0d2d
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Aug 2009 06:47:32 -0000	1.9
+++ sources	11 Aug 2009 06:03:00 -0000	1.10
@@ -1 +1 @@
-b19b35eb82a894f6117c87af9a47bd65  cld-0.2git.tar.gz
+5fb5d8b5540c297935cb5ab984594020  cld-0.2git.tar.gz



From varekova at fedoraproject.org  Tue Aug 11 06:15:11 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 11 Aug 2009 06:15:11 +0000 (UTC)
Subject: rpms/gzip/devel gzip.spec,1.48,1.49
Message-ID: <20090811061511.DA81D11C00D7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13076

Modified Files:
	gzip.spec 
Log Message:
- fix installation with --excludedocs option (#515975)



Index: gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gzip.spec	25 Jul 2009 01:58:49 -0000	1.48
+++ gzip.spec	11 Aug 2009 06:15:10 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 # info pages are under GFDL license
 License: GPLv2 and GFDL
 Group: Applications/File
@@ -73,11 +73,15 @@ rm -f ${RPM_BUILD_ROOT}/bin/uncompress
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/gzip.info* ]; then
+    /sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/gzip.info.gz %{_infodir}/dir || :
+    if [ -f %{_infodir}/gzip.info* ]; then
+        /sbin/install-info --delete %{_infodir}/gzip.info.gz %{_infodir}/dir || :
+    fi
 fi
 
 %files
@@ -89,6 +93,9 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Tue Aug 11 2009 Ivana Varekova <varekova redhat com> - 1.3.12-11
+- fix installation with --excludedocs option (#515975)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pnemade at fedoraproject.org  Tue Aug 11 06:31:25 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 11 Aug 2009 06:31:25 +0000 (UTC)
Subject: rpms/hunspell-ne/devel hunspell-ne.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20090811063125.5502011C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hunspell-ne/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15609

Modified Files:
	hunspell-ne.spec sources 
Log Message:
* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 20080425-1
- Update to next upstream release




Index: hunspell-ne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ne/devel/hunspell-ne.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hunspell-ne.spec	25 Jul 2009 02:35:45 -0000	1.4
+++ hunspell-ne.spec	11 Aug 2009 06:31:23 -0000	1.5
@@ -1,12 +1,11 @@
 Name: hunspell-ne
 Summary: Nepali hunspell dictionaries
-Version: 20061217
-Release: 5%{?dist}
+Version: 20080425
+Release: 1%{?dist}
 Source: http://nepalinux.org/downloads/ne_NP_dict.zip
 Group: Applications/Text
 URL: http://nepalinux.org/downloads
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-##License version can be found at http://www.openoffice.org/issues/show_bug.cgi?id=70512
 License: LGPLv2
 BuildArch: noarch
 
@@ -43,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 20080425-1
+- Update to next upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20061217-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ne/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jan 2008 05:05:39 -0000	1.2
+++ sources	11 Aug 2009 06:31:23 -0000	1.3
@@ -1 +1 @@
-9e3890e558b107d3e9296108f8d0b571  ne_NP_dict.zip
+cfb00708085445afe58d6972bc9a22e8  ne_NP_dict.zip



From liangsuilong at fedoraproject.org  Tue Aug 11 06:35:00 2009
From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=)
Date: Tue, 11 Aug 2009 06:35:00 +0000 (UTC)
Subject: rpms/shutter/F-11 import.log, NONE, 1.1 shutter.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811063500.8471111C00D7@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16112/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shutter.spec 
Log Message:
Liang Suilong's Update


--- NEW FILE import.log ---
shutter-0_80_1-1_fc11:F-11:shutter-0.80.1-1.fc11.src.rpm:1249972437


--- NEW FILE shutter.spec ---
#%define  ppa_version ppa6
Name:		shutter
Version:	0.80.1
Release:	1%{?dist}
Summary:	GTK+ 2.0 screenshot application written in perl
Group:		Applications/Multimedia
License:	GPL+ or Artistic
URL:		http://shutter-project.org
Source0:	http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{version}.tar.gz
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	desktop-file-utils
Requires:	gnome-web-photo, gtklp
Requires:	perl(Gtk2::ImageView)
Requires:	perl(X11::Protocol)

%description
Shutter is a GTK+ 2.0 screenshot application written in perl.
Shutter covers all features of common command line tools like
scrot or import and adds reasonable new features combined
with a comfortable GUI using the GTK+ 2.0 framework


%prep
%setup -q -n %{name}-%{version}
rm -rf share/app-install/
rm -rf share/shutter/resources/po/
rm -rf share/shutter/resources/modules/{File,Net,Proc,Sort,X11}
rm -rf share/doc

%build

%install
rm -rf $RPM_BUILD_ROOT
# executable and data
install -d -m 0755 -p $RPM_BUILD_ROOT%{_bindir}
install -d -m 0755 -p $RPM_BUILD_ROOT%{_datadir}
cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/
cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/

desktop-file-install --delete-original \
  --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \
  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
%find_lang %{name}-plugins
cat %{name}-plugins.lang >> %{name}.lang

%post
update-desktop-database %{_datadir}/applications &>/dev/null || :


%postun
update-desktop-database %{_datadir}/applications &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/pixmaps/


%changelog
* Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
- Updrade to shutter-0.80.1

* Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-5
- Update %%install script

* Wed Jul 29 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-4
- Update %%install script

* Mon Jul 20 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-3
- Add perl(X11::Protocol) as require

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-2
- Upstream to shutter-0.80 Final GA

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-1.ppa6
- Upstream to shutter-0.80~ppa6
- Update the SPEC file

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-3.ppa4
- Remove share/shutter/resources/pofiles/
- Remove share/shutter/resources/modules/File
- Remove share/shutter/resources/pofiles/Proc

* Wed Apr 15 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-2.ppa4
- Add a desktop-file-utils as BuildRequires

* Wed Apr 15 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-2.ppa3
- Add a desktop-file-utils as BuildRequires

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-1
- Upstream to 0.70.2

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.1-1
- Upstream to 0.70.1

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70-1
- Upstream to 0.70

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.64-2
- Add several Requires so that advanced functions can run.
- Fix the authoritie of install path.

* Fri Jan 02 2009 bbbush <bbbush.yuan at gmail.com> - 0.64-1
- update to 0.64, clean up spec

* Mon Dec 29 2008 Liang Suilong <liangsuilong at gmail.com> - 0.63-3
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:14:46 -0000	1.1
+++ .cvsignore	11 Aug 2009 06:34:59 -0000	1.2
@@ -0,0 +1 @@
+shutter-0.80.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:14:46 -0000	1.1
+++ sources	11 Aug 2009 06:35:00 -0000	1.2
@@ -0,0 +1 @@
+fe328193f496847f0a563f294eed0b1f  shutter-0.80.1.tar.gz



From liangsuilong at fedoraproject.org  Tue Aug 11 06:44:41 2009
From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=)
Date: Tue, 11 Aug 2009 06:44:41 +0000 (UTC)
Subject: rpms/shutter/F-10 import.log, NONE, 1.1 shutter.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811064441.C873711C00D7@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17261/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shutter.spec 
Log Message:
Liang Suilong's Update


--- NEW FILE import.log ---
shutter-0_80_1-1_fc11:F-10:shutter-0.80.1-1.fc11.src.rpm:1249973017


--- NEW FILE shutter.spec ---
#%define  ppa_version ppa6
Name:		shutter
Version:	0.80.1
Release:	1%{?dist}
Summary:	GTK+ 2.0 screenshot application written in perl
Group:		Applications/Multimedia
License:	GPL+ or Artistic
URL:		http://shutter-project.org
Source0:	http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{version}.tar.gz
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	desktop-file-utils
Requires:	gnome-web-photo, gtklp
Requires:	perl(Gtk2::ImageView)
Requires:	perl(X11::Protocol)

%description
Shutter is a GTK+ 2.0 screenshot application written in perl.
Shutter covers all features of common command line tools like
scrot or import and adds reasonable new features combined
with a comfortable GUI using the GTK+ 2.0 framework


%prep
%setup -q -n %{name}-%{version}
rm -rf share/app-install/
rm -rf share/shutter/resources/po/
rm -rf share/shutter/resources/modules/{File,Net,Proc,Sort,X11}
rm -rf share/doc

%build

%install
rm -rf $RPM_BUILD_ROOT
# executable and data
install -d -m 0755 -p $RPM_BUILD_ROOT%{_bindir}
install -d -m 0755 -p $RPM_BUILD_ROOT%{_datadir}
cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/
cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/

desktop-file-install --delete-original \
  --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \
  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
%find_lang %{name}-plugins
cat %{name}-plugins.lang >> %{name}.lang

%post
update-desktop-database %{_datadir}/applications &>/dev/null || :


%postun
update-desktop-database %{_datadir}/applications &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/pixmaps/


%changelog
* Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
- Updrade to shutter-0.80.1

* Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-5
- Update %%install script

* Wed Jul 29 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-4
- Update %%install script

* Mon Jul 20 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-3
- Add perl(X11::Protocol) as require

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-2
- Upstream to shutter-0.80 Final GA

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-1.ppa6
- Upstream to shutter-0.80~ppa6
- Update the SPEC file

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-3.ppa4
- Remove share/shutter/resources/pofiles/
- Remove share/shutter/resources/modules/File
- Remove share/shutter/resources/pofiles/Proc

* Wed Apr 15 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-2.ppa4
- Add a desktop-file-utils as BuildRequires

* Wed Apr 15 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-2.ppa3
- Add a desktop-file-utils as BuildRequires

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-1
- Upstream to 0.70.2

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.1-1
- Upstream to 0.70.1

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70-1
- Upstream to 0.70

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.64-2
- Add several Requires so that advanced functions can run.
- Fix the authoritie of install path.

* Fri Jan 02 2009 bbbush <bbbush.yuan at gmail.com> - 0.64-1
- update to 0.64, clean up spec

* Mon Dec 29 2008 Liang Suilong <liangsuilong at gmail.com> - 0.63-3
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:14:46 -0000	1.1
+++ .cvsignore	11 Aug 2009 06:44:40 -0000	1.2
@@ -0,0 +1 @@
+shutter-0.80.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:14:46 -0000	1.1
+++ sources	11 Aug 2009 06:44:40 -0000	1.2
@@ -0,0 +1 @@
+fe328193f496847f0a563f294eed0b1f  shutter-0.80.1.tar.gz



From liangsuilong at fedoraproject.org  Tue Aug 11 06:57:40 2009
From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=)
Date: Tue, 11 Aug 2009 06:57:40 +0000 (UTC)
Subject: rpms/shutter/devel import.log, NONE, 1.1 shutter.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811065740.A5DC411C00D7@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19641/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shutter.spec 
Log Message:
Liang Suilong's Update


--- NEW FILE import.log ---
shutter-0_80_1-1_fc11:HEAD:shutter-0.80.1-1.fc11.src.rpm:1249973799


--- NEW FILE shutter.spec ---
#%define  ppa_version ppa6
Name:		shutter
Version:	0.80.1
Release:	1%{?dist}
Summary:	GTK+ 2.0 screenshot application written in perl
Group:		Applications/Multimedia
License:	GPL+ or Artistic
URL:		http://shutter-project.org
Source0:	http://shutter-project.org/wp-content/uploads/releases/tars/%{name}-%{version}.tar.gz
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	desktop-file-utils
Requires:	gnome-web-photo, gtklp
Requires:	perl(Gtk2::ImageView)
Requires:	perl(X11::Protocol)

%description
Shutter is a GTK+ 2.0 screenshot application written in perl.
Shutter covers all features of common command line tools like
scrot or import and adds reasonable new features combined
with a comfortable GUI using the GTK+ 2.0 framework


%prep
%setup -q -n %{name}-%{version}
rm -rf share/app-install/
rm -rf share/shutter/resources/po/
rm -rf share/shutter/resources/modules/{File,Net,Proc,Sort,X11}
rm -rf share/doc

%build

%install
rm -rf $RPM_BUILD_ROOT
# executable and data
install -d -m 0755 -p $RPM_BUILD_ROOT%{_bindir}
install -d -m 0755 -p $RPM_BUILD_ROOT%{_datadir}
cp -pfr bin/* $RPM_BUILD_ROOT%{_bindir}/
cp -pfr share/* $RPM_BUILD_ROOT%{_datadir}/

desktop-file-install --delete-original \
  --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \
  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}.desktop

%find_lang %{name}
%find_lang %{name}-plugins
cat %{name}-plugins.lang >> %{name}.lang

%post
update-desktop-database %{_datadir}/applications &>/dev/null || :


%postun
update-desktop-database %{_datadir}/applications &>/dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/pixmaps/


%changelog
* Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
- Updrade to shutter-0.80.1

* Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-5
- Update %%install script

* Wed Jul 29 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-4
- Update %%install script

* Mon Jul 20 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-3
- Add perl(X11::Protocol) as require

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-2
- Upstream to shutter-0.80 Final GA

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80-1.ppa6
- Upstream to shutter-0.80~ppa6
- Update the SPEC file

* Thu Jun 25 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-3.ppa4
- Remove share/shutter/resources/pofiles/
- Remove share/shutter/resources/modules/File
- Remove share/shutter/resources/pofiles/Proc

* Wed Apr 15 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-2.ppa4
- Add a desktop-file-utils as BuildRequires

* Wed Apr 15 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-2.ppa3
- Add a desktop-file-utils as BuildRequires

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.2-1
- Upstream to 0.70.2

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70.1-1
- Upstream to 0.70.1

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.70-1
- Upstream to 0.70

* Sun Jan 18 2009 Liang Suilong <liangsuilong at gmail.com> - 0.64-2
- Add several Requires so that advanced functions can run.
- Fix the authoritie of install path.

* Fri Jan 02 2009 bbbush <bbbush.yuan at gmail.com> - 0.64-1
- update to 0.64, clean up spec

* Mon Dec 29 2008 Liang Suilong <liangsuilong at gmail.com> - 0.63-3
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:14:46 -0000	1.1
+++ .cvsignore	11 Aug 2009 06:57:40 -0000	1.2
@@ -0,0 +1 @@
+shutter-0.80.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:14:46 -0000	1.1
+++ sources	11 Aug 2009 06:57:40 -0000	1.2
@@ -0,0 +1 @@
+fe328193f496847f0a563f294eed0b1f  shutter-0.80.1.tar.gz



From varekova at fedoraproject.org  Tue Aug 11 07:03:20 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 11 Aug 2009 07:03:20 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages-3.22-gai.conf.patch, NONE,
	1.1 man-pages.spec, 1.118, 1.119
Message-ID: <20090811070320.9403211C00D7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20343

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-3.22-gai.conf.patch 
Log Message:
- fix gai.conf an page (#515347)


man-pages-3.22-gai.conf.patch:
 gai.conf.5 |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE man-pages-3.22-gai.conf.patch ---
diff -up man-pages-3.22/man5/gai.conf.5.pom man-pages-3.22/man5/gai.conf.5
--- man-pages-3.22/man5/gai.conf.5.pom	2006-05-15 10:18:05.000000000 +0200
+++ man-pages-3.22/man5/gai.conf.5	2009-08-11 08:55:22.000000000 +0200
@@ -51,7 +51,7 @@ value.
 .TP
 \fBprecedence\fR \fInetmask\fR \fIprecedence\fR
 This  keyword is similar to \fBlabel\fR but instead the value is added
-to the precendence table as specified in RFC 3484.  Once again, the
+to the precedence table as specified in RFC 3484.  Once again, the
 presence of a single \fBprecedence\fR line in the configuration file
 causes the default table to not be used.
 
@@ -74,11 +74,11 @@ label  ::/0          1
 label  2002::/16     2
 label ::/96          3
 label ::ffff:0:0/96  4
-precendence  ::1/128       50
-precendence  ::/0          40
-precendence  2002::/16     30
-precendence ::/96          20
-precendence ::ffff:0:0/96  10
+precedence  ::1/128       50
+precedence  ::/0          40
+precedence  2002::/16     30
+precedence ::/96          20
+precedence ::ffff:0:0/96  10
 
 
 .SH FILES


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- man-pages.spec	27 Jul 2009 11:51:25 -0000	1.118
+++ man-pages.spec	11 Aug 2009 07:03:20 -0000	1.119
@@ -28,6 +28,7 @@ Patch49: man-pages-2.63-getent.patch
 Patch50: man-pages-2.63-iconv.patch
 Patch53: man-pages-2.78-stream.patch
 Patch54: man-pages-2.80-malloc_h.patch
+Patch55: man-pages-3.22-gai.conf.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -54,6 +55,7 @@ rmdir man-pages-posix-%{posix_version}-%
 %patch50 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
 
 ### And now remove those we are not going to use:
 
@@ -124,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> - 3.22-4
+- fix gai.conf an page (#515347)
+
 * Mon Jul 27 2009 Ivana Varekova <varekova at redhat.com> - 3.22-3
 - update to 3.22
 



From pnemade at fedoraproject.org  Tue Aug 11 07:04:22 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 11 Aug 2009 07:04:22 +0000 (UTC)
Subject: rpms/madan-fonts/devel madan-fonts.spec,1.5,1.6
Message-ID: <20090811070422.70A0D11C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/madan-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20519

Modified Files:
	madan-fonts.spec 
Log Message:
* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-11
- Fix source audit 2009-08-10




Index: madan-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/madan-fonts/devel/madan-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- madan-fonts.spec	25 Jul 2009 11:38:12 -0000	1.5
+++ madan-fonts.spec	11 Aug 2009 07:04:21 -0000	1.6
@@ -3,13 +3,14 @@
 
 Name: %{fontname}-fonts
 Version: 1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Font for Nepali language
 Group: User Interface/X
 # No version specified.
 License: GPL+
+# upstream link is dead. While I work on new release lets fix this for now.
 URL: http://madanpuraskar.org/
-Source: http://madanpuraskar.org/detail_guide/fonts/Madan.ttf
+Source: Madan.ttf
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fontpackages-devel
@@ -38,6 +39,9 @@ rm -rf %{buildroot}
 %_font_pkg  *.ttf
 
 %changelog
+* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-11
+- Fix source audit 2009-08-10
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Tue Aug 11 07:05:08 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 11 Aug 2009 07:05:08 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages.spec,1.119,1.120
Message-ID: <20090811070508.C0FCD11C00D7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20637

Modified Files:
	man-pages.spec 
Log Message:
fix release number



Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- man-pages.spec	11 Aug 2009 07:03:20 -0000	1.119
+++ man-pages.spec	11 Aug 2009 07:05:07 -0000	1.120
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.22
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/



From kwizart at fedoraproject.org  Tue Aug 11 07:17:04 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 11 Aug 2009 07:17:04 +0000 (UTC)
Subject: rpms/perl-IO-Async/devel import.log, NONE, 1.1 perl-IO-Async.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811071704.A9B8E11C00D7@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22281/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-IO-Async.spec 
Log Message:
Initial import for devel



--- NEW FILE import.log ---
perl-IO-Async-0_22-1_fc11:HEAD:perl-IO-Async-0.22-1.fc11.src.rpm:1249974999


--- NEW FILE perl-IO-Async.spec ---
Name:           perl-IO-Async
Version:        0.22
Release:        1%{?dist}
Summary:        A collection of modules that implement asynchronous filehandle IO

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/IO-Async/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/IO-Async-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Heap)
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Refcount)
BuildRequires:  perl(Socket::GetAddrInfo) >= 0.08
BuildRequires:  perl(Async::MergePoint)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A collection of modules that implement asynchronous filehandle IO

%prep
%setup -q -n IO-Async-%{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 {} ';'


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Mon Jul 20 2009 kwizart < kwizart at gmail.com > - 0.22-1
- Update to 0.22

* Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.21-1
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:01:01 -0000	1.1
+++ .cvsignore	11 Aug 2009 07:17:03 -0000	1.2
@@ -0,0 +1 @@
+IO-Async-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:01:02 -0000	1.1
+++ sources	11 Aug 2009 07:17:03 -0000	1.2
@@ -0,0 +1 @@
+92cfc798a468e32aa1bd3d85ef1029e1  IO-Async-0.22.tar.gz



From kwizart at fedoraproject.org  Tue Aug 11 07:19:03 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 11 Aug 2009 07:19:03 +0000 (UTC)
Subject: rpms/perl-IO-Async/devel perl-IO-Async.spec,1.1,1.2
Message-ID: <20090811071904.06FB711C00D7@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533

Modified Files:
	perl-IO-Async.spec 
Log Message:
Add missing BR



Index: perl-IO-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/perl-IO-Async.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-IO-Async.spec	11 Aug 2009 07:17:03 -0000	1.1
+++ perl-IO-Async.spec	11 Aug 2009 07:19:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-IO-Async
 Version:        0.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of modules that implement asynchronous filehandle IO
 
 Group:          Development/Libraries
@@ -14,6 +14,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(Heap)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Refcount)
 BuildRequires:  perl(Socket::GetAddrInfo) >= 0.08
 BuildRequires:  perl(Async::MergePoint)
@@ -53,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 kwizart < kwizart at gmail.com > - 0.22-2
+- Add Missing BR
+
 * Mon Jul 20 2009 kwizart < kwizart at gmail.com > - 0.22-1
 - Update to 0.22
 



From kwizart at fedoraproject.org  Tue Aug 11 07:20:59 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 11 Aug 2009 07:20:59 +0000 (UTC)
Subject: rpms/perl-IO-Async/F-11 perl-IO-Async.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090811072059.65C9611C00D7@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22813

Modified Files:
	sources 
Added Files:
	perl-IO-Async.spec 
Log Message:
Initial import for F-11



--- NEW FILE perl-IO-Async.spec ---
Name:           perl-IO-Async
Version:        0.22
Release:        2%{?dist}
Summary:        A collection of modules that implement asynchronous filehandle IO

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/IO-Async/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/IO-Async-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Heap)
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Refcount)
BuildRequires:  perl(Socket::GetAddrInfo) >= 0.08
BuildRequires:  perl(Async::MergePoint)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A collection of modules that implement asynchronous filehandle IO

%prep
%setup -q -n IO-Async-%{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 {} ';'


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Tue Aug 11 2009 kwizart < kwizart at gmail.com > - 0.22-2
- Add Missing BR

* Mon Jul 20 2009 kwizart < kwizart at gmail.com > - 0.22-1
- Update to 0.22

* Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.21-1
- Initial spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:01:02 -0000	1.1
+++ sources	11 Aug 2009 07:20:59 -0000	1.2
@@ -0,0 +1 @@
+92cfc798a468e32aa1bd3d85ef1029e1  IO-Async-0.22.tar.gz



From kwizart at fedoraproject.org  Tue Aug 11 07:22:07 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 11 Aug 2009 07:22:07 +0000 (UTC)
Subject: rpms/perl-IO-Async/F-10 perl-IO-Async.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090811072207.B03DB11C00D7@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23078

Modified Files:
	sources 
Added Files:
	perl-IO-Async.spec 
Log Message:
Initial import for F-10



--- NEW FILE perl-IO-Async.spec ---
Name:           perl-IO-Async
Version:        0.22
Release:        2%{?dist}
Summary:        A collection of modules that implement asynchronous filehandle IO

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/IO-Async/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/IO-Async-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Heap)
BuildRequires:  perl(Test::Exception)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Refcount)
BuildRequires:  perl(Socket::GetAddrInfo) >= 0.08
BuildRequires:  perl(Async::MergePoint)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A collection of modules that implement asynchronous filehandle IO

%prep
%setup -q -n IO-Async-%{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 {} ';'


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Tue Aug 11 2009 kwizart < kwizart at gmail.com > - 0.22-2
- Add Missing BR

* Mon Jul 20 2009 kwizart < kwizart at gmail.com > - 0.22-1
- Update to 0.22

* Thu Jul  9 2009 kwizart < kwizart at gmail.com > - 0.21-1
- Initial spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:01:02 -0000	1.1
+++ sources	11 Aug 2009 07:22:07 -0000	1.2
@@ -0,0 +1 @@
+92cfc798a468e32aa1bd3d85ef1029e1  IO-Async-0.22.tar.gz



From mnowak at fedoraproject.org  Tue Aug 11 07:33:33 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 11 Aug 2009 07:33:33 +0000 (UTC)
Subject: rpms/gnome-colors-icon-theme/devel gnome-colors-icon-theme.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811073333.1F84311C00D7@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/gnome-colors-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24894/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-colors-icon-theme.spec import.log 
Log Message:
5.3



--- NEW FILE gnome-colors-icon-theme.spec ---
%define real_name gnome-colors

Summary: GNOME-Colors icon theme
Name: gnome-colors-icon-theme
Version: 5.3
Release: 1%{?dist}
Url: http://code.google.com/p/gnome-colors
Source0: http://%{real_name}.googlecode.com/files/%{real_name}-src-%{version}.tar.gz
License: GPLv2
BuildArch: noarch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gnome-icon-theme
BuildRequires: icon-naming-utils >= 0.8.7
BuildRequires: inkscape
BuildRequires: ImageMagick

%description
The GNOME-Colors is a project that aims to make the GNOME desktop as 
elegant, consistent and colorful as possible.

The current goal is to allow full color customization of themes, icons, 
GDM logins and splash screens. There are already seven full color-schemes 
available; Brave (Blue), Human (Orange), Wine (Red), Noble (Purple), Wise 
(Green), Dust (Chocolate) and Illustrious (Pink). An unlimited amount of 
color variations can be rebuilt and recolored from source, so users need 
not stick to the officially supported color palettes.

GNOME-Colors is mostly inspired/based on Tango, GNOME, Elementary, 
Tango-Generator and many other open-source projects. More information 
can be found in the AUTHORS file.


%prep
%setup -q -c %{real_name}--icon-theme-%{version}


%build
# change name from GNOME -> GNOME-Colors
rename 'gnome' '%{real_name}' themes/*
sed -i -e 's/GNOME/GNOME-Colors/' themes/*
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post
for dir in /usr/share/icons/*; do
  if test -d "$dir"; then
    if test -f "$dir/index.theme"; then
      /usr/bin/gtk-update-icon-cache --quiet "$dir" || :
    fi
  fi
done


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog
%{_datadir}/icons/gnome-colors-common/
%{_datadir}/icons/gnome-colors-brave/
%{_datadir}/icons/gnome-colors-carbonite/
%{_datadir}/icons/gnome-colors-dust/
%{_datadir}/icons/gnome-colors-human/
%{_datadir}/icons/gnome-colors-illustrious/
%{_datadir}/icons/gnome-colors-noble/
%{_datadir}/icons/gnome-colors-tribute/
%{_datadir}/icons/gnome-colors-wine/
%{_datadir}/icons/gnome-colors-wise/

%changelog
* Tue Aug  4 2009 Michal Nowak <mnowak at redhat.com> - 5.3-1
- 5.3
- Requires: gnome-icon-theme

* Mon Aug  3 2009 Michal Nowak <mnowak at redhat.com> - 5.2.2-1
- initial packaging



--- NEW FILE import.log ---
gnome-colors-icon-theme-5_3-1_fc11:HEAD:gnome-colors-icon-theme-5.3-1.fc11.src.rpm:1249976035


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-colors-icon-theme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:16:38 -0000	1.1
+++ .cvsignore	11 Aug 2009 07:33:32 -0000	1.2
@@ -0,0 +1 @@
+gnome-colors-src-5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-colors-icon-theme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:16:38 -0000	1.1
+++ sources	11 Aug 2009 07:33:32 -0000	1.2
@@ -0,0 +1 @@
+e5b33e067ebfcabafcf8737e2bdb5bcc  gnome-colors-src-5.3.tar.gz



From mnowak at fedoraproject.org  Tue Aug 11 07:34:49 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 11 Aug 2009 07:34:49 +0000 (UTC)
Subject: rpms/gnome-colors-icon-theme/F-11 gnome-colors-icon-theme.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811073449.E033011C00D7@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/gnome-colors-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25164/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-colors-icon-theme.spec import.log 
Log Message:
5.3



--- NEW FILE gnome-colors-icon-theme.spec ---
%define real_name gnome-colors

Summary: GNOME-Colors icon theme
Name: gnome-colors-icon-theme
Version: 5.3
Release: 1%{?dist}
Url: http://code.google.com/p/gnome-colors
Source0: http://%{real_name}.googlecode.com/files/%{real_name}-src-%{version}.tar.gz
License: GPLv2
BuildArch: noarch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gnome-icon-theme
BuildRequires: icon-naming-utils >= 0.8.7
BuildRequires: inkscape
BuildRequires: ImageMagick

%description
The GNOME-Colors is a project that aims to make the GNOME desktop as 
elegant, consistent and colorful as possible.

The current goal is to allow full color customization of themes, icons, 
GDM logins and splash screens. There are already seven full color-schemes 
available; Brave (Blue), Human (Orange), Wine (Red), Noble (Purple), Wise 
(Green), Dust (Chocolate) and Illustrious (Pink). An unlimited amount of 
color variations can be rebuilt and recolored from source, so users need 
not stick to the officially supported color palettes.

GNOME-Colors is mostly inspired/based on Tango, GNOME, Elementary, 
Tango-Generator and many other open-source projects. More information 
can be found in the AUTHORS file.


%prep
%setup -q -c %{real_name}--icon-theme-%{version}


%build
# change name from GNOME -> GNOME-Colors
rename 'gnome' '%{real_name}' themes/*
sed -i -e 's/GNOME/GNOME-Colors/' themes/*
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post
for dir in /usr/share/icons/*; do
  if test -d "$dir"; then
    if test -f "$dir/index.theme"; then
      /usr/bin/gtk-update-icon-cache --quiet "$dir" || :
    fi
  fi
done


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog
%{_datadir}/icons/gnome-colors-common/
%{_datadir}/icons/gnome-colors-brave/
%{_datadir}/icons/gnome-colors-carbonite/
%{_datadir}/icons/gnome-colors-dust/
%{_datadir}/icons/gnome-colors-human/
%{_datadir}/icons/gnome-colors-illustrious/
%{_datadir}/icons/gnome-colors-noble/
%{_datadir}/icons/gnome-colors-tribute/
%{_datadir}/icons/gnome-colors-wine/
%{_datadir}/icons/gnome-colors-wise/

%changelog
* Tue Aug  4 2009 Michal Nowak <mnowak at redhat.com> - 5.3-1
- 5.3
- Requires: gnome-icon-theme

* Mon Aug  3 2009 Michal Nowak <mnowak at redhat.com> - 5.2.2-1
- initial packaging



--- NEW FILE import.log ---
gnome-colors-icon-theme-5_3-1_fc11:F-11:gnome-colors-icon-theme-5.3-1.fc11.src.rpm:1249976183


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-colors-icon-theme/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:16:38 -0000	1.1
+++ .cvsignore	11 Aug 2009 07:34:49 -0000	1.2
@@ -0,0 +1 @@
+gnome-colors-src-5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-colors-icon-theme/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:16:38 -0000	1.1
+++ sources	11 Aug 2009 07:34:49 -0000	1.2
@@ -0,0 +1 @@
+e5b33e067ebfcabafcf8737e2bdb5bcc  gnome-colors-src-5.3.tar.gz



From mschwendt at fedoraproject.org  Tue Aug 11 07:35:28 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 11 Aug 2009 07:35:28 +0000 (UTC)
Subject: extras-repoclosure rc-modified,1.29,1.30
Message-ID: <20090811073528.B231A11C00D7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25342

Modified Files:
	rc-modified 
Log Message:
val init not needed anymore with complete if/else


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rc-modified	10 Aug 2009 18:13:25 -0000	1.29
+++ rc-modified	11 Aug 2009 07:35:28 -0000	1.30
@@ -91,7 +91,6 @@
         if v is None:
             return None
     
-        val = ''
         if e is not None:
             val = '%s:%s' % (e, v)
         else:



From hadess at fedoraproject.org  Tue Aug 11 07:41:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 07:41:22 +0000 (UTC)
Subject: rpms/mobile-broadband-provider-info/devel
	mobile-broadband-provider-info.spec, 1.3, 1.4
Message-ID: <20090811074122.6B5DB11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/mobile-broadband-provider-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26231

Modified Files:
	mobile-broadband-provider-info.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.20090707-3
- Add -devel sub-package with pkg-config file (#511318)



Index: mobile-broadband-provider-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/devel/mobile-broadband-provider-info.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mobile-broadband-provider-info.spec	25 Jul 2009 14:40:45 -0000	1.3
+++ mobile-broadband-provider-info.spec	11 Aug 2009 07:41:22 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Mobile broadband provider database
 Name: mobile-broadband-provider-info
 Version: 1.%{upstream_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 #
 # Source from git://git.gnome.org/mobile-broadband-provider-info
 # tarball built with:
@@ -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,15 @@ 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
+* 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
 



From cweyl at fedoraproject.org  Tue Aug 11 07:41:53 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:41:53 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/devel .cvsignore, 1.3,
	1.4 perl-MooseX-Storage.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090811074153.9A27F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Storage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26417

Modified Files:
	.cvsignore perl-MooseX-Storage.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- auto-update to 0.21 (by cpan-spec-update 0.01)
- added a new req on perl(Moose) (version 0.39)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Jun 2009 04:33:56 -0000	1.3
+++ .cvsignore	11 Aug 2009 07:41:53 -0000	1.4
@@ -1 +1 @@
-MooseX-Storage-0.18.tar.gz
+MooseX-Storage-0.21.tar.gz


Index: perl-MooseX-Storage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/devel/perl-MooseX-Storage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-MooseX-Storage.spec	26 Jul 2009 11:31:34 -0000	1.4
+++ perl-MooseX-Storage.spec	11 Aug 2009 07:41:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Storage
-Version:    0.18
-Release:    3%{?dist}
+Version:    0.21
+Release:    1%{?dist}
 # lib/MooseX/Storage.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -41,9 +41,12 @@ BuildRequires: perl(Test::JSON)
 # testing, until RHBZ#495401 is resolved
 BuildRequires: perl(YAML)
 BuildRequires: perl(YAML::Syck)
-# until bundled M::I is updated
+# auto_install()
 BuildRequires: perl(CPAN)
 
+### auto-added reqs!
+Requires:       perl(Moose) >= 0.39
+
 %description
 MooseX::Storage is a serialization framework for Moose, it provides a
 very flexible and highly pluggable way to serialize Moose classes to a
@@ -85,6 +88,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
+- auto-update to 0.21 (by cpan-spec-update 0.01)
+- added a new req on perl(Moose) (version 0.39)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Jun 2009 04:33:56 -0000	1.3
+++ sources	11 Aug 2009 07:41:53 -0000	1.4
@@ -1 +1 @@
-680fca0f63f7910fed8c52805bc579e2  MooseX-Storage-0.18.tar.gz
+ddc11e02464e68cbdac09adff88fe9ce  MooseX-Storage-0.21.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:45:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:45:08 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/devel .cvsignore, 1.2,
	1.3 perl-CSS-Minifier-XS.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090811074508.9820C11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier-XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26975

Modified Files:
	.cvsignore perl-CSS-Minifier-XS.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- auto-update to 0.04 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Apr 2009 21:01:06 -0000	1.2
+++ .cvsignore	11 Aug 2009 07:45:08 -0000	1.3
@@ -1 +1 @@
-CSS-Minifier-XS-0.03.tar.gz
+CSS-Minifier-XS-0.04.tar.gz


Index: perl-CSS-Minifier-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/devel/perl-CSS-Minifier-XS.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CSS-Minifier-XS.spec	26 Jul 2009 04:03:11 -0000	1.2
+++ perl-CSS-Minifier-XS.spec	11 Aug 2009 07:45:08 -0000	1.3
@@ -1,13 +1,13 @@
-Name:       perl-CSS-Minifier-XS 
-Version:    0.03 
-Release:    2%{?dist}
+Name:       perl-CSS-Minifier-XS
+Version:    0.04
+Release:    1%{?dist}
 # lib/CSS/Minifier/XS.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    XS based CSS minifier 
-Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz 
+Summary:    XS based CSS minifier
+Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/CSS-Minifier-XS
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -51,16 +51,19 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README 
+%doc Changes README
 %{perl_vendorarch}/*
 %exclude %dir %{perl_vendorarch}/auto
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
+- auto-update to 0.04 (by cpan-spec-update 0.01)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -70,4 +73,3 @@ rm -rf %{buildroot} 
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 21:01:06 -0000	1.2
+++ sources	11 Aug 2009 07:45:08 -0000	1.3
@@ -1 +1 @@
-31522fe802f1dbfbc7e079ab8b70df76  CSS-Minifier-XS-0.03.tar.gz
+44cbafa17d0ddd7a5e554392cc850c0d  CSS-Minifier-XS-0.04.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:46:28 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:46:28 +0000 (UTC)
Subject: rpms/perl-MooseX-Storage/F-11 sources,1.2,1.3
Message-ID: <20090811074628.3115411C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Storage/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27306

Modified Files:
	sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
- auto-update to 0.21 (by cpan-spec-update 0.01)
- added a new req on perl(Moose) (version 0.39)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Storage/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jun 2009 15:12:13 -0000	1.2
+++ sources	11 Aug 2009 07:46:28 -0000	1.3
@@ -1 +1 @@
-680fca0f63f7910fed8c52805bc579e2  MooseX-Storage-0.18.tar.gz
+ddc11e02464e68cbdac09adff88fe9ce  MooseX-Storage-0.21.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:47:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:47:24 +0000 (UTC)
Subject: rpms/perl-FCGI-ProcManager/devel .cvsignore, 1.2,
	1.3 perl-FCGI-ProcManager.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090811074724.C13EE11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-FCGI-ProcManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27606

Modified Files:
	.cvsignore perl-FCGI-ProcManager.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
- auto-update to 0.19 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-FCGI-ProcManager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Feb 2009 21:16:00 -0000	1.2
+++ .cvsignore	11 Aug 2009 07:47:24 -0000	1.3
@@ -1 +1 @@
-FCGI-ProcManager-0.18.tar.gz
+FCGI-ProcManager-0.19.tar.gz


Index: perl-FCGI-ProcManager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FCGI-ProcManager/devel/perl-FCGI-ProcManager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-FCGI-ProcManager.spec	26 Jul 2009 05:56:44 -0000	1.3
+++ perl-FCGI-ProcManager.spec	11 Aug 2009 07:47:24 -0000	1.4
@@ -1,13 +1,13 @@
-Name:       perl-FCGI-ProcManager 
-Version:    0.18 
-Release:    3%{?dist}
+Name:       perl-FCGI-ProcManager
+Version:    0.19
+Release:    1%{?dist}
 # ProcManager.pm -> LGPLv2, LGPLv3
 License:    LGPLv2+
 Group:      Development/Libraries
-Summary:    A FastCGI process manager 
-Source:     http://search.cpan.org/CPAN/authors/id/G/GB/GBJK/FCGI-ProcManager-%{version}.tar.gz 
+Summary:    A FastCGI process manager
+Source:     http://search.cpan.org/CPAN/authors/id/G/GB/GBJK/FCGI-ProcManager-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/FCGI-ProcManager
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -16,7 +16,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Test)
 
 %description
-FCGI::ProcManager is used to serve as a FastCGI process manager. By 
+FCGI::ProcManager is used to serve as a FastCGI process manager. By
 reimplementing it in perl, developers can more finely tune performance
 in their web applications, and can take advantage of copy-on-write
 semantics prevalent in UNIX kernel process management.
@@ -42,15 +42,18 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README ChangeLog COPYING 
+%doc README ChangeLog COPYING
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
+- auto-update to 0.19 (by cpan-spec-update 0.01)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -63,4 +66,3 @@ rm -rf %{buildroot} 
 * Sat Feb 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-FCGI-ProcManager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Feb 2009 21:16:01 -0000	1.2
+++ sources	11 Aug 2009 07:47:24 -0000	1.3
@@ -1 +1 @@
-223f75818b1bc2f06c3c95c096b9a708  FCGI-ProcManager-0.18.tar.gz
+85b4eb5203f0adbf14bed39a258b9a59  FCGI-ProcManager-0.19.tar.gz



From pbrobinson at fedoraproject.org  Tue Aug 11 07:48:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 07:48:21 +0000 (UTC)
Subject: rpms/usbmuxd/devel import.log, NONE, 1.1 usbmuxd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811074821.0175211C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27147/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log usbmuxd.spec 
Log Message:
- Initial import



--- NEW FILE import.log ---
usbmuxd-0_1_4-1_fc11:HEAD:usbmuxd-0.1.4-1.fc11.src.rpm:1249976628


--- NEW FILE usbmuxd.spec ---
Name:		usbmuxd
Version:	0.1.4
Release:	1%{?dist}
Summary:	Daemon for communicating with Apple's iPod Touch and iPhone

Group:		Applications/System
License:	GPLv2+ and LGPLv2+
URL:		http://cgit.pims.selfip.net/usbmuxd/
Source0:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libusb-devel
BuildRequires:	automake autoconf libtool

%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
simultaneously.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: usbmuxd = %{version}-%{release}
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

%build
%configure --enable-static=no
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}

# 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

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING
/lib/udev/rules.d/85-usbmuxd.rules
%{_bindir}/iproxy
%{_libdir}/libusbmuxd.so.*
%{_sbindir}/usbmuxd

%files devel
%defattr(-,root,root,-)
%doc README.devel
%{_includedir}/*.h
%{_libdir}/libusbmuxd.so
%{_libdir}/pkgconfig/libusbmuxd.pc

%changelog
* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
- Update to 0.1.4

* Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.3-1
- Update to 0.1.3, review input

* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
- Update to 0.1.2

* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:13:07 -0000	1.1
+++ .cvsignore	11 Aug 2009 07:48:20 -0000	1.2
@@ -0,0 +1 @@
+usbmuxd-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:13:07 -0000	1.1
+++ sources	11 Aug 2009 07:48:20 -0000	1.2
@@ -0,0 +1 @@
+bc57116f092a922653ba472177f082f0  usbmuxd-0.1.4.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:52:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:52:02 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/devel .cvsignore, 1.6,
	1.7 perl-Git-CPAN-Patch.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090811075202.E372011C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28332

Modified Files:
	.cvsignore perl-Git-CPAN-Patch.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-1
- auto-update to 0.2.0 (by cpan-spec-update 0.01)
- added a new req on perl(CPANPLUS) (version 0)
- added a new req on perl(Module::Build) (version 0)
- added a new req on perl(Parse::BACKPAN::Packages) (version 0)
- added a new req on perl(Pod::Usage) (version 0)
- added a new req on perl(autodie) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jun 2009 05:37:12 -0000	1.6
+++ .cvsignore	11 Aug 2009 07:52:02 -0000	1.7
@@ -1 +1 @@
-Git-CPAN-Patch-0.1.7.tar.gz
+Git-CPAN-Patch-0.2.0.tar.gz


Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Git-CPAN-Patch.spec	26 Jul 2009 06:16:12 -0000	1.5
+++ perl-Git-CPAN-Patch.spec	11 Aug 2009 07:52:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.1.7
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -18,6 +18,15 @@ BuildRequires:  perl(Pod::Usage)
 # testing
 BuildRequires:  perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(CPANPLUS)
+Requires:       perl(Module::Build)
+Requires:       perl(Parse::BACKPAN::Packages)
+Requires:       perl(Pod::Usage)
+Requires:       perl(autodie)
+
+Requires:       git-cpan-patch = %{version}-%{release}
+
 %description
 Git::CPAN::Patch provides a suite of git commands aimed at making trivially
 easy the process of grabbing any distribution off CPAN, stuffing it in a
@@ -72,10 +81,18 @@ rm -rf %{buildroot}
 %files -n git-cpan-patch
 %defattr(-,root,root,-)
 %doc Changes README
-%{_bindir}/*
+%{_libexecdir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-1
+- auto-update to 0.2.0 (by cpan-spec-update 0.01)
+- added a new req on perl(CPANPLUS) (version 0)
+- added a new req on perl(Module::Build) (version 0)
+- added a new req on perl(Parse::BACKPAN::Packages) (version 0)
+- added a new req on perl(Pod::Usage) (version 0)
+- added a new req on perl(autodie) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jun 2009 05:37:12 -0000	1.6
+++ sources	11 Aug 2009 07:52:02 -0000	1.7
@@ -1 +1 @@
-d474e79d76497950eb2fdcfd9f957b06  Git-CPAN-Patch-0.1.7.tar.gz
+058d90fcde4516d8ed7b1def3fad0610  Git-CPAN-Patch-0.2.0.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:52:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:52:54 +0000 (UTC)
Subject: rpms/perl-FCGI-ProcManager/F-11 perl-FCGI-ProcManager.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090811075254.A1EA811C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-FCGI-ProcManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28706

Modified Files:
	perl-FCGI-ProcManager.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
- auto-update to 0.19 (by cpan-spec-update 0.01)



Index: perl-FCGI-ProcManager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FCGI-ProcManager/F-11/perl-FCGI-ProcManager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-FCGI-ProcManager.spec	26 Feb 2009 16:02:03 -0000	1.2
+++ perl-FCGI-ProcManager.spec	11 Aug 2009 07:52:54 -0000	1.3
@@ -1,13 +1,13 @@
-Name:       perl-FCGI-ProcManager 
-Version:    0.18 
-Release:    2%{?dist}
+Name:       perl-FCGI-ProcManager
+Version:    0.19
+Release:    1%{?dist}
 # ProcManager.pm -> LGPLv2, LGPLv3
 License:    LGPLv2+
 Group:      Development/Libraries
-Summary:    A FastCGI process manager 
-Source:     http://search.cpan.org/CPAN/authors/id/G/GB/GBJK/FCGI-ProcManager-%{version}.tar.gz 
+Summary:    A FastCGI process manager
+Source:     http://search.cpan.org/CPAN/authors/id/G/GB/GBJK/FCGI-ProcManager-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/FCGI-ProcManager
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -16,7 +16,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Test)
 
 %description
-FCGI::ProcManager is used to serve as a FastCGI process manager. By 
+FCGI::ProcManager is used to serve as a FastCGI process manager. By
 reimplementing it in perl, developers can more finely tune performance
 in their web applications, and can take advantage of copy-on-write
 semantics prevalent in UNIX kernel process management.
@@ -42,15 +42,21 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README ChangeLog COPYING 
+%doc README ChangeLog COPYING
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.19-1
+- auto-update to 0.19 (by cpan-spec-update 0.01)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -60,4 +66,3 @@ rm -rf %{buildroot} 
 * Sat Feb 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-FCGI-ProcManager/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Feb 2009 21:16:01 -0000	1.2
+++ sources	11 Aug 2009 07:52:54 -0000	1.3
@@ -1 +1 @@
-223f75818b1bc2f06c3c95c096b9a708  FCGI-ProcManager-0.18.tar.gz
+85b4eb5203f0adbf14bed39a258b9a59  FCGI-ProcManager-0.19.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:53:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:53:23 +0000 (UTC)
Subject: rpms/perl-CSS-Minifier-XS/F-11 perl-CSS-Minifier-XS.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090811075323.613B511C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Minifier-XS/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29168

Modified Files:
	perl-CSS-Minifier-XS.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- auto-update to 0.04 (by cpan-spec-update 0.01)



Index: perl-CSS-Minifier-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/F-11/perl-CSS-Minifier-XS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CSS-Minifier-XS.spec	12 Apr 2009 21:01:06 -0000	1.1
+++ perl-CSS-Minifier-XS.spec	11 Aug 2009 07:53:23 -0000	1.2
@@ -1,13 +1,13 @@
-Name:       perl-CSS-Minifier-XS 
-Version:    0.03 
+Name:       perl-CSS-Minifier-XS
+Version:    0.04
 Release:    1%{?dist}
 # lib/CSS/Minifier/XS.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    XS based CSS minifier 
-Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz 
+Summary:    XS based CSS minifier
+Source:     http://search.cpan.org/CPAN/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/CSS-Minifier-XS
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -51,20 +51,25 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README 
+%doc Changes README
 %{perl_vendorarch}/*
 %exclude %dir %{perl_vendorarch}/auto
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
+- auto-update to 0.04 (by cpan-spec-update 0.01)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
 - update for submission
 
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Minifier-XS/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 21:01:06 -0000	1.2
+++ sources	11 Aug 2009 07:53:23 -0000	1.3
@@ -1 +1 @@
-31522fe802f1dbfbc7e079ab8b70df76  CSS-Minifier-XS-0.03.tar.gz
+44cbafa17d0ddd7a5e554392cc850c0d  CSS-Minifier-XS-0.04.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:54:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:54:25 +0000 (UTC)
Subject: rpms/perl-File-ChangeNotify/devel .cvsignore, 1.2,
	1.3 perl-File-ChangeNotify.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090811075425.1631A11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-File-ChangeNotify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29666

Modified Files:
	.cvsignore perl-File-ChangeNotify.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
- auto-update to 0.07 (by cpan-spec-update 0.01)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(Class::MOP) (version 0)
- added a new req on perl(File::Find) (version 0)
- added a new req on perl(File::Spec) (version 0)
- added a new req on perl(Module::Pluggable::Object) (version 0)
- added a new req on perl(Moose) (version 0)
- added a new req on perl(MooseX::Params::Validate) (version 0.08)
- added a new req on perl(MooseX::SemiAffordanceAccessor) (version 0)
- added a new req on perl(Time::HiRes) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ChangeNotify/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Jun 2009 04:53:44 -0000	1.2
+++ .cvsignore	11 Aug 2009 07:54:24 -0000	1.3
@@ -1 +1 @@
-File-ChangeNotify-0.06.tar.gz
+File-ChangeNotify-0.07.tar.gz


Index: perl-File-ChangeNotify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ChangeNotify/devel/perl-File-ChangeNotify.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-File-ChangeNotify.spec	26 Jul 2009 05:58:04 -0000	1.2
+++ perl-File-ChangeNotify.spec	11 Aug 2009 07:54:24 -0000	1.3
@@ -1,17 +1,17 @@
-Name:       perl-File-ChangeNotify 
-Version:    0.06 
-Release:    2%{?dist}
+Name:       perl-File-ChangeNotify
+Version:    0.07
+Release:    1%{?dist}
 # lib/File/ChangeNotify.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Event.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher/Default.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher/Inotify.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Watch for changes to files, cross-platform style 
-Source:     http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-ChangeNotify-%{version}.tar.gz 
+Summary:    Watch for changes to files, cross-platform style
+Source:     http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-ChangeNotify-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/File-ChangeNotify
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 BuildRequires: perl(Carp)
@@ -29,6 +29,17 @@ BuildRequires: perl(MooseX::SemiAffordan
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Time::HiRes)
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(Class::MOP)
+Requires:       perl(File::Find)
+Requires:       perl(File::Spec)
+Requires:       perl(Module::Pluggable::Object)
+Requires:       perl(Moose)
+Requires:       perl(MooseX::Params::Validate) >= 0.08
+Requires:       perl(MooseX::SemiAffordanceAccessor)
+Requires:       perl(Time::HiRes)
+
 %description
 Watch for changes to files, easily, cleanly, and across different platforms.
 
@@ -53,15 +64,27 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README 
+%doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
+- auto-update to 0.07 (by cpan-spec-update 0.01)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Class::MOP) (version 0)
+- added a new req on perl(File::Find) (version 0)
+- added a new req on perl(File::Spec) (version 0)
+- added a new req on perl(Module::Pluggable::Object) (version 0)
+- added a new req on perl(Moose) (version 0)
+- added a new req on perl(MooseX::Params::Validate) (version 0.08)
+- added a new req on perl(MooseX::SemiAffordanceAccessor) (version 0)
+- added a new req on perl(Time::HiRes) (version 0)
+
 * 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
 
@@ -71,4 +94,3 @@ rm -rf %{buildroot} 
 * Sun Jun 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ChangeNotify/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jun 2009 04:53:44 -0000	1.2
+++ sources	11 Aug 2009 07:54:24 -0000	1.3
@@ -1 +1 @@
-87f970acdfce7fbacba63aa3746b4cfb  File-ChangeNotify-0.06.tar.gz
+1459d99d91420d14d75bb5d000aa3aa2  File-ChangeNotify-0.07.tar.gz



From caolanm at fedoraproject.org  Tue Aug 11 07:54:34 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 11 Aug 2009 07:54:34 +0000 (UTC)
Subject: rpms/hunspell-mos/devel hunspell-mos.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811075434.05AEF11C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-mos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29602/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-mos.spec import.log 
Log Message:



--- NEW FILE hunspell-mos.spec ---
Name: hunspell-mos
Summary: Mossi hunspell dictionaries
%define upstreamid 20090806
Version: 0.%{upstreamid}
Release: 1%{?dist}
Group: Applications/Text
Source: http://www.abcburkina.net/ancien/documents/lingu/DicoMoore.zip
URL: http://www.abcburkina.net/content/view/377/48/lang,fr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3
BuildArch: noarch
Requires: hunspell

%description
Mossi hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p mos_BF.* $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc lgpl-3.0.txt
%{_datadir}/myspell/*

%changelog
* Fri Aug 07 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090806-1
- initial version


--- NEW FILE import.log ---
hunspell-mos-0_20090806-1_fc11:HEAD:hunspell-mos-0.20090806-1.fc11.src.rpm:1249977154


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-mos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:09:09 -0000	1.1
+++ .cvsignore	11 Aug 2009 07:54:33 -0000	1.2
@@ -0,0 +1 @@
+DicoMoore.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-mos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:09:10 -0000	1.1
+++ sources	11 Aug 2009 07:54:33 -0000	1.2
@@ -0,0 +1 @@
+ec2b52328653f9c854ea7b6c49e652e8  DicoMoore.zip



From cweyl at fedoraproject.org  Tue Aug 11 07:56:27 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:56:27 +0000 (UTC)
Subject: rpms/perl-JSON-Any/devel .cvsignore, 1.3, 1.4 perl-JSON-Any.spec,
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090811075627.AD00F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON-Any/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30101

Modified Files:
	.cvsignore perl-JSON-Any.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.21-1
- auto-update to 1.21 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- altered br on perl(Test::More) (0.62 => 0.42)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Carp) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-Any/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Feb 2009 16:15:32 -0000	1.3
+++ .cvsignore	11 Aug 2009 07:56:27 -0000	1.4
@@ -1 +1 @@
-JSON-Any-1.19.tar.gz
+JSON-Any-1.21.tar.gz


Index: perl-JSON-Any.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-Any/devel/perl-JSON-Any.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-JSON-Any.spec	26 Jul 2009 08:50:15 -0000	1.8
+++ perl-JSON-Any.spec	11 Aug 2009 07:56:27 -0000	1.9
@@ -1,36 +1,42 @@
 Name:           perl-JSON-Any
-Version:        1.19
-Release:        4%{?dist}
+Version:        1.21
+Release:        1%{?dist}
 Summary:        A meta-module to make working with JSON easier
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/JSON-Any/
-Source0:        http://www.cpan.org/authors/id/P/PE/PERIGRIN/JSON-Any-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/JSON-Any-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-Patch0:         with_older_json.patch 
+Patch0:         with_older_json.patch
 
-# JSON::XS is fastest, so we require it 
+# JSON::XS is fastest, so we require it
 Requires:       perl(JSON::XS)
 
 # core
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 # testing
-BuildRequires:  perl(Test::More) >= 0.62
+BuildRequires:  perl(Test::More) >= 0.42
 BuildRequires:  perl(JSON::XS)   >= 1.52
 # optional tests -- JSON::Any can handle any of the following to actually do
 # the JSON parsing.  We use JSON::XS above, as it's both already in Fedora and
 # the fastest of the following.  As other JSON modules are added to Fedora,
 # we'll uncomment the tests below.
-BuildRequires:  perl(JSON)       
+BuildRequires:  perl(JSON)
 #BuildRequires:  perl(JSON::DWIM)
 #BuildRequires:  perl(JSON::PC)
-BuildRequires:  perl(JSON::Syck) 
+BuildRequires:  perl(JSON::Syck)
 
 
+### auto-added reqs!
+Requires:       perl(Carp)
+
+### auto-added brs!
+BuildRequires:  perl(CPAN)
+
 %description
 JSON::Any provides a coherent API to bring together the various JSON modules
 currently on CPAN.
@@ -72,6 +78,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.21-1
+- auto-update to 1.21 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- altered br on perl(Test::More) (0.62 => 0.42)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+- added a new req on perl(Carp) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-Any/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Feb 2009 16:15:32 -0000	1.3
+++ sources	11 Aug 2009 07:56:27 -0000	1.4
@@ -1 +1 @@
-ee042534bed96496586660d1bed1bad3  JSON-Any-1.19.tar.gz
+3e5d6f943b03c2c0c688be1295719c09  JSON-Any-1.21.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 07:59:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 07:59:17 +0000 (UTC)
Subject: rpms/perl-local-lib/devel .cvsignore, 1.4, 1.5 perl-local-lib.spec, 
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090811075917.F0F4011C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-local-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30567

Modified Files:
	.cvsignore perl-local-lib.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004004-1
- auto-update to 1.004004 (by cpan-spec-update 0.01)
- added a new br on perl(ExtUtils::Install) (version 1.43)
- added a new req on perl(CPAN) (version 1.80)
- added a new req on perl(ExtUtils::CBuilder) (version 0)
- added a new req on perl(ExtUtils::Install) (version 1.43)
- added a new req on perl(ExtUtils::MakeMaker) (version 6.31)
- added a new req on perl(ExtUtils::ParseXS) (version 0)
- added a new req on perl(Module::Build) (version 0.28)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jun 2009 05:17:55 -0000	1.4
+++ .cvsignore	11 Aug 2009 07:59:17 -0000	1.5
@@ -1 +1 @@
-local-lib-1.004001.tar.gz
+local-lib-1.004004.tar.gz


Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/perl-local-lib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-local-lib.spec	26 Jul 2009 17:47:45 -0000	1.4
+++ perl-local-lib.spec	11 Aug 2009 07:59:17 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       perl-local-lib
-Version:    1.004001
-Release:    2%{?dist}
+Version:    1.004004
+Release:    1%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -19,6 +19,17 @@ BuildRequires: perl(Module::Build) >= 0.
 # testing...
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(CPAN) >= 1.80
+Requires:       perl(ExtUtils::CBuilder)
+Requires:       perl(ExtUtils::Install) >= 1.43
+Requires:       perl(ExtUtils::MakeMaker) >= 6.31
+Requires:       perl(ExtUtils::ParseXS)
+Requires:       perl(Module::Build) >= 0.28
+
+### auto-added brs!
+BuildRequires:  perl(ExtUtils::Install) >= 1.43
+
 %description
 This module provides a quick, convenient way of bootstrapping a user-
 local Perl module library located within the user's home directory. It
@@ -63,6 +74,16 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004004-1
+- auto-update to 1.004004 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::Install) (version 1.43)
+- added a new req on perl(CPAN) (version 1.80)
+- added a new req on perl(ExtUtils::CBuilder) (version 0)
+- added a new req on perl(ExtUtils::Install) (version 1.43)
+- added a new req on perl(ExtUtils::MakeMaker) (version 6.31)
+- added a new req on perl(ExtUtils::ParseXS) (version 0)
+- added a new req on perl(Module::Build) (version 0.28)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.004001-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jun 2009 05:17:55 -0000	1.4
+++ sources	11 Aug 2009 07:59:17 -0000	1.5
@@ -1 +1 @@
-9b579a39e5e88ef5723c395f83f7c8e4  local-lib-1.004001.tar.gz
+119be92d2d55b8234d9609287725b290  local-lib-1.004004.tar.gz



From twaugh at fedoraproject.org  Tue Aug 11 08:04:38 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 11 Aug 2009 08:04:38 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3287.patch,NONE,1.1 cups.spec,1.505,1.506
Message-ID: <20090811080438.3428C11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31675

Modified Files:
	cups.spec 
Added Files:
	cups-str3287.patch 
Log Message:
* Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).


cups-str3287.patch:
 adminutil.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3287.patch ---
diff -up cups-1.4rc1/cups/adminutil.c.str3287 cups-1.4rc1/cups/adminutil.c
--- cups-1.4rc1/cups/adminutil.c.str3287	2009-06-05 22:38:52.000000000 +0100
+++ cups-1.4rc1/cups/adminutil.c	2009-08-11 09:02:12.677703681 +0100
@@ -1594,7 +1594,7 @@ _cupsAdminSetServerSettings(
 	  {
 	    cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
 
-	    if (!localp)
+	    if (!localp || localp[0] == '\0')
 	      localp = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
 
 	    cupsFilePrintf(temp, "BrowseLocalProtocols %s\n", localp);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -p -r1.505 -r1.506
--- cups.spec	10 Aug 2009 14:50:16 -0000	1.505
+++ cups.spec	11 Aug 2009 08:04:37 -0000	1.506
@@ -66,6 +66,7 @@ Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
+Patch42: cups-str3287.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -232,6 +233,7 @@ module. 
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
+%patch42 -p1 -b .str3287
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -526,7 +528,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+* Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).
 - Fixed ppds.dat handling of drv files (bug #515027, STR #3279).
 - Fixed udev rules file to avoid DEVTYPE warning messages.
 - Fixed cupsGetNamedDest() so it does not fall back to the default



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:42 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080742.1EF3810F899@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:42 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080743.2899010F89C@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:44 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080744.380FC10F8AD@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:44 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080745.081B410F8B1@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:46 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080746.7CADB10F8B4@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:47 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080747.5BCF810F8B7@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:47 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080747.F2EBC10F8BA@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:49 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080749.3C90210F89B@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:51 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080751.9AFC310F8BD@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:52 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080752.BC42210F8BF@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:52 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080752.E449C10F8C3@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:53 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080753.75F1A10F8C5@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:55 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080755.42C1310F8C8@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:55 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080755.F1F4510F8CC@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:57 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080757.66E6410F8CE@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:07:58 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080758.14D9510F89C@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:00 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080800.2BE3C10F8D4@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:00 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080800.DE7DD10F89F@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:01 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080801.AA8E310F8D9@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:05 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080805.3DD4210F8DD@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:02 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080802.D618010F8B0@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:05 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080805.7F64D10F8E0@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:06 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080806.92F5D10F8E3@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:07 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080807.B246110F8E6@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:09 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080809.DBE5010F8E8@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:10 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080810.A7EBA10F8EA@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:11 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080811.751BE10F8ED@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:12 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080812.683C310F8F1@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:14 +0000
Subject: [pkgdb] aqsis: denis has given up watchbugzilla
Message-ID: <20090811080814.25C5D10F8B2@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on aqsis (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:15 +0000
Subject: [pkgdb] aqsis: denis has given up commit
Message-ID: <20090811080815.A536610F8F5@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on aqsis (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:14 +0000
Subject: [pkgdb] aqsis: denis has given up watchcommits
Message-ID: <20090811080815.0528610F8F2@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on aqsis (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Tue Aug 11 08:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:08:16 +0000
Subject: [pkgdb] aqsis: denis has given up approveacls
Message-ID: <20090811080816.D174A10F8FB@bastion2.fedora.phx.redhat.com>

denis has given up the approveacls acl on aqsis (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqsis



From cweyl at fedoraproject.org  Tue Aug 11 08:08:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 08:08:56 +0000 (UTC)
Subject: rpms/perl-POE-Test-Loops/devel .cvsignore, 1.2,
	1.3 perl-POE-Test-Loops.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090811080856.ADEBA11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Test-Loops/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32341

Modified Files:
	.cvsignore perl-POE-Test-Loops.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.021-1
- auto-update to 1.021 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Apr 2009 18:52:54 -0000	1.2
+++ .cvsignore	11 Aug 2009 08:08:56 -0000	1.3
@@ -1 +1 @@
-POE-Test-Loops-1.005.tar.gz
+POE-Test-Loops-1.021.tar.gz


Index: perl-POE-Test-Loops.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/perl-POE-Test-Loops.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-POE-Test-Loops.spec	26 Jul 2009 14:02:20 -0000	1.2
+++ perl-POE-Test-Loops.spec	11 Aug 2009 08:08:56 -0000	1.3
@@ -1,13 +1,13 @@
-Name:       perl-POE-Test-Loops 
-Version:    1.005 
-Release:    2%{?dist}
+Name:       perl-POE-Test-Loops
+Version:    1.021
+Release:    1%{?dist}
 # META.yml, bin/poe-gen-tests -> perl
 License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Reusable tests for POE::Loop authors 
-Source:     http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Test-Loops-%{version}.tar.gz 
+Summary:    Reusable tests for POE::Loop authors
+Source:     http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Test-Loops-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/POE-Test-Loops
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -57,17 +57,20 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README 
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 %{_bindir}/poe-gen-tests
 %{_mandir}/man1/poe-gen-tests.1.gz
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.021-1
+- auto-update to 1.021 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.005-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -77,4 +80,3 @@ rm -rf %{buildroot} 
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.005-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Test-Loops/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 18:52:54 -0000	1.2
+++ sources	11 Aug 2009 08:08:56 -0000	1.3
@@ -1 +1 @@
-a075c590ef3024293377678088ebfe50  POE-Test-Loops-1.005.tar.gz
+1a77a4d9891fd5bed316fad45131e766  POE-Test-Loops-1.021.tar.gz



From cweyl at fedoraproject.org  Tue Aug 11 08:11:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 08:11:26 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/devel .cvsignore, 1.3,
	1.4 perl-Text-SimpleTable.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20090811081126.5E5FC11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Text-SimpleTable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv389

Modified Files:
	.cvsignore perl-Text-SimpleTable.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
- auto-update to 2.0 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Sep 2008 02:36:53 -0000	1.3
+++ .cvsignore	11 Aug 2009 08:11:25 -0000	1.4
@@ -1 +1 @@
-Text-SimpleTable-0.05.tar.gz
+Text-SimpleTable-2.0.tar.gz


Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Text-SimpleTable.spec	26 Jul 2009 17:10:12 -0000	1.8
+++ perl-Text-SimpleTable.spec	11 Aug 2009 08:11:26 -0000	1.9
@@ -1,13 +1,13 @@
 %define _default_patch_fuzz 2
 
 Name:           perl-Text-SimpleTable
-Version:        0.05
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Text-SimpleTable/
-Source0:        http://www.cpan.org/authors/id/S/SR/SRI/Text-SimpleTable-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/K/KR/KRAIH/Text-SimpleTable-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
+- auto-update to 2.0 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Sep 2008 02:36:53 -0000	1.3
+++ sources	11 Aug 2009 08:11:26 -0000	1.4
@@ -1 +1 @@
-90f884fec82f85df903ad7934b5351a6  Text-SimpleTable-0.05.tar.gz
+b57b6e60b5ee3cd5209d4bad510d0d2d  Text-SimpleTable-2.0.tar.gz



From twaugh at fedoraproject.org  Tue Aug 11 08:12:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 11 Aug 2009 08:12:19 +0000 (UTC)
Subject: rpms/cups/devel cups-str3287.patch,NONE,1.1 cups.spec,1.500,1.501
Message-ID: <20090811081219.B5C3D11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv554

Modified Files:
	cups.spec 
Added Files:
	cups-str3287.patch 
Log Message:
* Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).


cups-str3287.patch:
 adminutil.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3287.patch ---
diff -up cups-1.4rc1/cups/adminutil.c.str3287 cups-1.4rc1/cups/adminutil.c
--- cups-1.4rc1/cups/adminutil.c.str3287	2009-06-05 22:38:52.000000000 +0100
+++ cups-1.4rc1/cups/adminutil.c	2009-08-11 09:02:12.677703681 +0100
@@ -1594,7 +1594,7 @@ _cupsAdminSetServerSettings(
 	  {
 	    cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
 
-	    if (!localp)
+	    if (!localp || localp[0] == '\0')
 	      localp = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
 
 	    cupsFilePrintf(temp, "BrowseLocalProtocols %s\n", localp);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- cups.spec	10 Aug 2009 14:51:15 -0000	1.500
+++ cups.spec	11 Aug 2009 08:12:19 -0000	1.501
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.14%{?dist}
+Release: 0.%{pre}.15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -66,6 +66,7 @@ Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
+Patch42: cups-str3287.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -232,6 +233,7 @@ module. 
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
+%patch42 -p1 -b .str3287
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -526,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).
+
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.14
 - Fixed ppds.dat handling of drv files (bug #515027, STR #3279).
 - Fixed udev rules file to avoid DEVTYPE warning messages.



From scop at fedoraproject.org  Tue Aug 11 08:15:52 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 08:15:52 +0000 (UTC)
Subject: rpms/gtk-vnc/devel .cvsignore, 1.9, 1.10 gtk-vnc.spec, 1.35,
	1.36 sources, 1.11, 1.12
Message-ID: <20090811081552.D5D4011C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1029

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.8-10
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Dec 2008 19:57:47 -0000	1.9
+++ .cvsignore	11 Aug 2009 08:15:52 -0000	1.10
@@ -1,3 +1,3 @@
 .build*.log
 *.rpm
-gtk-vnc-0.3.8.tar.gz
+gtk-vnc-0.3.8.tar.bz2


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gtk-vnc.spec	25 Jul 2009 01:42:33 -0000	1.35
+++ gtk-vnc.spec	11 Aug 2009 08:15:52 -0000	1.36
@@ -7,10 +7,10 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
 Patch1: %{name}-%{version}-relative-mouse.patch
 Patch2: %{name}-%{version}-sasl-auth.patch
 Patch3: %{name}-%{version}-sasl-auth-tunnel.patch
@@ -138,6 +138,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.8-10
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Dec 2008 19:57:47 -0000	1.11
+++ sources	11 Aug 2009 08:15:52 -0000	1.12
@@ -1 +1 @@
-72869a1a63ec972bdca7ad12898f2689  gtk-vnc-0.3.8.tar.gz
+7c7b07a868568206acd3f6e9e4d18ba1  gtk-vnc-0.3.8.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:13 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811082013.EB8CC10F876@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:14 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811082014.78A6410F89B@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:15 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811082015.7124510F8AD@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:18 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811082019.E34F510F880@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:20 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811082022.16FFD10F8BD@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:19 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811082020.C50F110F8BB@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:24 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811082025.4B9DE10F8C0@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:25 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811082026.8519A10F8C3@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:20:23 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811082024.AD27D10F8BF@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From scop at fedoraproject.org  Tue Aug 11 08:24:05 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 08:24:05 +0000 (UTC)
Subject: rpms/vdr-epgsearch/devel import.log, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-fedora.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-finnish.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-mansect.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-regexinc.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-regexlib.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-sendmail.patch, NONE,
	1.1 vdr-epgsearch-conflictcheckonly.conf, NONE,
	1.1 vdr-epgsearch-epgsearchonly.conf, NONE,
	1.1 vdr-epgsearch-quickepgsearch.conf, NONE,
	1.1 vdr-epgsearch.conf, NONE, 1.1 vdr-epgsearch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811082405.5012D11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-epgsearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2813/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 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 
	vdr-epgsearch-conflictcheckonly.conf 
	vdr-epgsearch-epgsearchonly.conf 
	vdr-epgsearch-quickepgsearch.conf vdr-epgsearch.conf 
	vdr-epgsearch.spec 
Log Message:
Initial import (#515351).


--- NEW FILE import.log ---
vdr-epgsearch-0_9_25-0_3_beta14_fc10:HEAD:vdr-epgsearch-0.9.25-0.3.beta14.fc10.src.rpm:1249979022

vdr-epgsearch-0.9.25.beta14-fedora.patch:
 Makefile       |   10 +++++-----
 docsrc2man.sh  |    3 ++-
 epgsearch.c    |   20 ++++++++++----------
 epgsearchcfg.c |    2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-fedora.patch ---
diff -up epgsearch-0.9.25.beta14/docsrc2man.sh~ epgsearch-0.9.25.beta14/docsrc2man.sh
--- epgsearch-0.9.25.beta14/docsrc2man.sh~	2009-01-06 21:15:50.000000000 +0200
+++ epgsearch-0.9.25.beta14/docsrc2man.sh	2009-08-03 22:30:23.000000000 +0300
@@ -35,10 +35,11 @@ for LANGUAGE in $(ls "$DOCSRC"/); do
 	done
 
 	rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null
-	gzip -f man/$LANGUAGE/*.[0-9]
 
 done
 
+exit 0
+
 echo
 
 for LANGUAGE in $(ls "$DOCSRC"/); do
diff -up epgsearch-0.9.25.beta14/epgsearch.c~ epgsearch-0.9.25.beta14/epgsearch.c
--- epgsearch-0.9.25.beta14/epgsearch.c~	2009-06-14 12:39:46.000000000 +0300
+++ epgsearch-0.9.25.beta14/epgsearch.c	2009-08-03 22:44:58.000000000 +0300
@@ -82,7 +82,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)
 {
@@ -444,15 +444,15 @@ 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"));
+   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");
 
    cSearchTimerThread::Init(this);    
    cSwitchTimerThread::Init();    
diff -up epgsearch-0.9.25.beta14/epgsearchcfg.c~ epgsearch-0.9.25.beta14/epgsearchcfg.c
--- epgsearch-0.9.25.beta14/epgsearchcfg.c~	2009-01-29 19:51:53.000000000 +0200
+++ epgsearch-0.9.25.beta14/epgsearchcfg.c	2009-08-03 22:30:32.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;
diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-06-14 16:03:59.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-08-03 22:30:23.000000000 +0300
@@ -268,11 +268,11 @@ install-doc:
 	@mkdir -p $(MANDIR)/de/man1
 	@mkdir -p $(MANDIR)/de/man5
 
-	@cp man/en/*1.gz $(MANDIR)/man1/
-	@cp man/en/*4.gz $(MANDIR)/man4/
-	@cp man/en/*5.gz $(MANDIR)/man5/
-	@cp man/de/*1.gz $(MANDIR)/de/man1/
-	@cp man/de/*5.gz $(MANDIR)/de/man5/
+	@cp man/en/*1 $(MANDIR)/man1/
+	@cp man/en/*4 $(MANDIR)/man4/
+	@cp man/en/*5 $(MANDIR)/man5/
+	@cp man/de/*1 $(MANDIR)/de/man1/
+	@cp man/de/*5 $(MANDIR)/de/man5/
 clean:
 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot $(PODIR)/*~
 	@-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* *~ createcats createcats.o pod2*.tmp

vdr-epgsearch-0.9.25.beta14-finnish.patch:
 fi_FI.po |   42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-finnish.patch ---
>From 52c1027bbc2b1c3c2a9f435d7558065110e7b7a9 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sun, 19 Jul 2009 23:31:28 +0300
Subject: [PATCH] Finnish translation improvements.

---
 po/fi_FI.po |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/po/fi_FI.po b/po/fi_FI.po
index a0799c2..4c7e21e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,9 +11,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
-"PO-Revision-Date: 2007-08-14 20:21+0200\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe at cc.hut.fi>\n"
-"Language-Team: <vdr at linuxtv.org>\n"
+"PO-Revision-Date: 2009-07-19 23:22+0200\n"
+"Last-Translator: Ville Skytt?? <ville.skytta at iki.fi>\n"
+"Language-Team:  <vdr at linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,14 +167,14 @@ msgid "Help$Choose between 'Overview - Now' and 'Schedule' as start menu when th
 msgstr "Valitsee oletusn??yt??ksi joko t??m??nhetkisen yleiskatsauksen tai valitun kanavan ohjelmiston."
 
 msgid "Ok key"
-msgstr "'OK' n??pp??in"
+msgstr "OK-n??pp??in"
 
 msgid ""
 "Help$Choose here the behaviour of key 'Ok'. You can use it to display the summary or to switch to the corresponding channel.\n"
 "Note: the functionality of key 'blue' (Switch/Info/Search) depends on this setting."
 msgstr ""
-"Valitse toiminto 'OK' n??pp??imelle: n??yt?? ohjelman tiedot tai vaihda kyseiselle kanavalle.\n"
-"Huomioi: sinisen n??pp??imen toiminto (Vaihda/Tiedot/Hae) riippuu t??st?? asetuksesta"
+"Valitse toiminto OK-n??pp??imelle: n??yt?? ohjelman tiedot tai vaihda kyseiselle kanavalle.\n"
+"Huomioi: sinisen n??pp??imen toiminto (Vaihda/Tiedot/Hae) riippuu t??st?? asetuksesta."
 
 msgid "Red key"
 msgstr "Punainen n??pp??in"
@@ -184,7 +184,7 @@ msgid ""
 "(Can be toggled with key '0')"
 msgstr ""
 "Valitsee oletustoiminnon ('Tallenna' tai 'Komennot') punaiselle n??pp??imelle.\n"
-"Punaisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla '0' n??pp??int??."
+"Punaisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla n??pp??int?? 0."
 
 msgid "Blue key"
 msgstr "Sininen n??pp??in"
@@ -194,7 +194,7 @@ msgid ""
 "(Can be toggled with key '0')"
 msgstr ""
 "Valitsee oletustoiminnon ('Valitse' tai 'Etsi') siniselle n??pp??imelle.\n"
-"Sinisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla '0' n??pp??int??."
+"Sinisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla n??pp??int?? 0."
 
 msgid "Show progress in 'Now'"
 msgstr "N??yt?? aikajana 'Nyt'-sivulla"
@@ -214,7 +214,7 @@ msgid ""
 "\n"
 "(To completely define your own menu look please inspect the MANUAL)"
 msgstr ""
-"N??ytt???? kanavien numeroinnin t??m??nhetkisess?? yleiskatsaksessa.\n"
+"N??ytt???? kanavien numeroinnin t??m??nhetkisess?? yleiskatsauksessa.\n"
 "\n"
 "Lis??tietoja valikon muokkauksesta l??ytyy MANUAL-tiedostosta."
 
@@ -222,7 +222,7 @@ msgid "Show channel separators"
 msgstr "N??yt?? kanavaerottimet"
 
 msgid "Help$Display VDR channel groups as separators between your channels in 'Overview - Now'."
-msgstr "N??ytt???? erottimet yleiskatsauksessa kanavaville."
+msgstr "N??ytt???? erottimet yleiskatsauksessa kanaville."
 
 msgid "Show day separators"
 msgstr "N??yt?? p??iv??erottimet"
@@ -252,7 +252,7 @@ msgid "Show channels without EPG"
 msgstr "N??yt?? ohjelmaoppaattomat kanavat"
 
 msgid "Help$Choose 'yes' here if you want to display channels without EPG in 'Overview - Now'. 'Ok' on these entries switches the channel."
-msgstr "N??ytt???? t??m??nhetkisess?? yleiskatsauksessa my??skin kanavat, joilta ei l??ydy ohjelmatietoja. Voit vaihtaa t??ll??iselle kanavalle 'OK' n??pp??imell??."
+msgstr "N??ytt???? t??m??nhetkisess?? yleiskatsauksessa my??skin kanavat, joilta ei l??ydy ohjelmatietoja. Voit vaihtaa t??llaiselle kanavalle OK-n??pp??imell??."
 
 msgid "Time interval for FRew/FFwd [min]"
 msgstr "Oletusaikasiirtym?? [min]"
@@ -264,13 +264,13 @@ msgid ""
 msgstr ""
 "Valitsee ohjelmaoppaan oletusaikasiirtym??n pikakelausn??pp??imille.\n"
 "\n"
-"Jos sinulla ei ole kyseisi?? n??pp??imi?? k??yt??ss??si, voit asettaa kyseiset toiminnot vihre??lle ja keltaiselle n??pp??imelle painamalla '0' n??pp??int??."
+"Jos sinulla ei ole kyseisi?? n??pp??imi?? k??yt??ss??si, voit asettaa kyseiset toiminnot vihre??lle ja keltaiselle n??pp??imelle painamalla n??pp??int?? 0."
 
 msgid "Toggle Green/Yellow"
 msgstr "K??yt?? aikasiirtym???? v??rin??pp??imill??"
 
 msgid "Help$Specify if green and yellow shall also be switched when pressing '0'."
-msgstr "M????rittelee vaihdetaanko vihre??n ja keltaisen n??pp??imen toimintoja painamalla '0' n??pp??int??."
+msgstr "M????rittelee vaihdetaanko vihre??n ja keltaisen n??pp??imen toimintoja painamalla n??pp??int?? 0."
 
 msgid "Show favorites menu"
 msgstr "N??yt?? suosikkivalikko"
@@ -321,7 +321,7 @@ msgstr ""
 "- hakemiston m????ritys\n"
 "- vapaasti m????ritelt??v??t viikonp??iv??t toistuville ajastimille\n"
 "- jakson nimen t??ydennys\n"
-"- erilaisten EPG-muuttujien tuki (kts. MANUAL-tiedostosta)"
+"- erilaisten EPG-muuttujien tuki (ks. MANUAL-tiedostosta)"
 
 msgid "Default recording dir"
 msgstr "Oletushakemisto tallenteille"
@@ -545,13 +545,13 @@ msgid "Auth user"
 msgstr "SMTP-k??ytt??j??tunnus"
 
 msgid "Help$Specify the auth user, if this account needs authentication for SMTP."
-msgstr "M????rittelee k??ytt??j??tunnuksen, jos SMTP-palvelimelle pit???? autentikoida."
+msgstr "M????rittelee k??ytt??j??tunnuksen, jos SMTP-palvelimelle pit???? autentikoitua."
 
 msgid "Auth password"
 msgstr "SMTP-salasana"
 
 msgid "Help$Specify the auth password, if this account needs authentication for SMTP."
-msgstr "M????rittelee salasanan, jos SMTP-palvelimelle pit???? autentikoida."
+msgstr "M????rittelee salasanan, jos SMTP-palvelimelle pit???? autentikoitua."
 
 msgid "Mail account check failed!"
 msgstr "S??hk??postilaatikon tarkistus ep??onnistui!"
@@ -1102,16 +1102,16 @@ msgid "less"
 msgstr "pienempi"
 
 msgid "less or equal"
-msgstr "pienempi tai yht??suuri"
+msgstr "pienempi tai yht?? suuri"
 
 msgid "greater"
 msgstr "suurempi"
 
 msgid "greater or equal"
-msgstr "suurempi tai yht??suuri"
+msgstr "suurempi tai yht?? suuri"
 
 msgid "equal"
-msgstr "yht??suuri"
+msgstr "yht?? suuri"
 
 msgid "not equal"
 msgstr "erisuuri"
@@ -1150,7 +1150,7 @@ msgid "Edit$Delete template?"
 msgstr "Poistetaanko mallipohja?"
 
 msgid "Overwrite existing entries?"
-msgstr "Kirjoitetaanko olemassaolevan p????lle?"
+msgstr "Kirjoitetaanko olemassa olevan p????lle?"
 
 msgid "Edit entry"
 msgstr "Muokkaa valintaa"
@@ -1217,4 +1217,3 @@ msgstr "%02ldh"
 msgid "in %02ldm"
 msgstr "%02ldm"
 
-
-- 
1.6.0.6


vdr-epgsearch-0.9.25.beta14-mansect.patch:
 docsrc2man.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-mansect.patch ---
diff -up epgsearch-0.9.25.beta14/docsrc2man.sh~ epgsearch-0.9.25.beta14/docsrc2man.sh
--- epgsearch-0.9.25.beta14/docsrc2man.sh~	2009-01-06 21:15:50.000000000 +0200
+++ epgsearch-0.9.25.beta14/docsrc2man.sh	2009-07-18 23:53:19.000000000 +0300
@@ -26,7 +26,9 @@ for LANGUAGE in $(ls "$DOCSRC"/); do
 
 	for i in "$DOCSRC"/$LANGUAGE/*.txt; do
 		echo -ne "create man page: ($LANGUAGE) $(basename "$i" ".txt")..."
-		pod2man -c "Epgsearch Version $VERSION" -n "$(echo "$(basename "$i")" | sed -e 's/\.[0-9]\..*$//')" --section=5 "$i" >"man/$LANGUAGE/$(basename "$i" ".txt")"
+		name=$(echo "$(basename "$i")" | sed -e 's/\.[0-9]\..*$//')
+		sect=$(echo "$i" | sed -e 's/.*\.\([0-9]\)\.txt/\1/')
+		pod2man -c "Epgsearch Version $VERSION" -n "$name" --section="$sect" "$i" >"man/$LANGUAGE/$(basename "$i" ".txt")"
 		if [ $? -eq 0 ]; then
 			echo " done."
 		else

vdr-epgsearch-0.9.25.beta14-regexinc.patch:
 Makefile         |    1 +
 blacklist.c      |    5 -----
 epgsearchext.c   |    5 -----
 epgsearchtools.c |    2 ++
 4 files changed, 3 insertions(+), 10 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-regexinc.patch ---
diff -up epgsearch-0.9.25.beta14/blacklist.c~ epgsearch-0.9.25.beta14/blacklist.c
--- epgsearch-0.9.25.beta14/blacklist.c~	2009-01-29 19:51:53.000000000 +0200
+++ epgsearch-0.9.25.beta14/blacklist.c	2009-07-18 23:18:59.000000000 +0300
@@ -32,11 +32,6 @@ The project's page is at http://winni.vd
 #include "menu_searchedit.h"
 #include "menu_searchresults.h"
 #include <math.h>
-#ifdef HAVE_PCREPOSIX
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
 
 cBlacklists Blacklists;
 
diff -up epgsearch-0.9.25.beta14/epgsearchext.c~ epgsearch-0.9.25.beta14/epgsearchext.c
--- epgsearch-0.9.25.beta14/epgsearchext.c~	2009-06-23 21:10:54.000000000 +0300
+++ epgsearch-0.9.25.beta14/epgsearchext.c	2009-07-18 23:17:29.000000000 +0300
@@ -38,11 +38,6 @@ The project's page is at http://winni.vd
 #include "uservars.h"
 #include "blacklist.h"
 #include <math.h>
-#ifdef HAVE_PCREPOSIX
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
 
 cSearchExts SearchExts;
 cSearchExts SearchTemplates;
diff -up epgsearch-0.9.25.beta14/epgsearchtools.c~ epgsearch-0.9.25.beta14/epgsearchtools.c
--- epgsearch-0.9.25.beta14/epgsearchtools.c~	2009-07-04 21:29:51.000000000 +0300
+++ epgsearch-0.9.25.beta14/epgsearchtools.c	2009-07-18 23:18:29.000000000 +0300
@@ -44,6 +44,8 @@ The project's page is at http://winni.vd
 
 #ifdef HAVE_PCREPOSIX
 #include <pcreposix.h>
+#elif defined(HAVE_LIBTRE)
+#include <tre/regex.h>
 #else
 #include <regex.h>
 #endif
diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-07-19 00:10:52.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-07-19 00:22:58.000000000 +0300
@@ -140,6 +140,7 @@ else ifeq ($(USE_REGEXLIB), tre)
 LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
 #LIBS += -L/usr/lib -ltre
 DEFINES += -DHAVE_LIBTRE
+INCLUDE += $(shell pkg-config --cflags tre)
 endif
 
 ifdef USE_PINPLUGIN

vdr-epgsearch-0.9.25.beta14-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.beta14-regexlib.patch ---
diff -up epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt~ epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt
--- epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt~	2009-01-29 19:59:10.000000000 +0200
+++ epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt	2009-07-18 23:22:23.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.beta14/INSTALL~ epgsearch-0.9.25.beta14/INSTALL
--- epgsearch-0.9.25.beta14/INSTALL~	2009-01-06 21:15:59.000000000 +0200
+++ epgsearch-0.9.25.beta14/INSTALL	2009-07-18 23:20:39.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.beta14/INSTALL.DE~ epgsearch-0.9.25.beta14/INSTALL.DE
--- epgsearch-0.9.25.beta14/INSTALL.DE~	2009-01-06 21:16:00.000000000 +0200
+++ epgsearch-0.9.25.beta14/INSTALL.DE	2009-07-18 23:21:35.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.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-06-14 16:03:59.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-07-18 23:35:17.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.
 
@@ -72,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
@@ -128,14 +131,12 @@
 
 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 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

vdr-epgsearch-0.9.25.beta14-sendmail.patch:
 Makefile |   18 +++++++++++++-----
 mail.c   |    6 +++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-sendmail.patch ---
diff -up epgsearch-0.9.25.beta14/mail.c~ epgsearch-0.9.25.beta14/mail.c
--- epgsearch-0.9.25.beta14/mail.c~	2009-03-23 20:10:43.000000000 +0200
+++ epgsearch-0.9.25.beta14/mail.c	2009-07-18 23:32:29.000000000 +0300
@@ -31,6 +31,10 @@ The project's page is at http://winni.vd
 #include "epgsearchtools.h"
 #include "uservars.h"
 
+#ifndef SENDMAIL
+#define SENDMAIL "/usr/sbin/sendmail"
+#endif
+
 extern bool isUTF8;
 using namespace std;
 
@@ -130,7 +134,7 @@ bool cMailNotifier::SendMailViaSendmail(
 {
     char mailcmd[256];
     const char* mailargs = "%s -i -FVDR -oem  %s";
-    const char* mailproc = "/usr/lib/sendmail";
+    const char* mailproc = SENDMAIL;
     FILE* mail;
     
     string to = EPGSearchConfig.MailAddressTo; 
diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-06-14 16:03:59.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-07-18 23:35:17.000000000 +0300
@@ -42,6 +38,10 @@ ifndef AUTOCONFIG
 
 endif
 
+### the sendmail executable to use when epgsearch is configured to use the
+### sendmail method for sending mail
+SENDMAIL = /usr/sbin/sendmail
+
 ###
 ### CONFIG END
 ### do not edit below this line if you don't know what you do ;-)
@@ -118,11 +117,15 @@ PACKAGE = vdr-$(ARCHIVE)
 INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 #INCLUDES += -I$(VDRDIR)/include
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-DEFINES1 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"'
-DEFINES2 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN2)"'
-DEFINES3 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN3)"'
-DEFINES4 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN4)"'
+EPGSEARCH_DEFINES += -D_GNU_SOURCE
+ifneq ($(SENDMAIL),)
+EPGSEARCH_DEFINES += -DSENDMAIL='"$(SENDMAIL)"'
+endif
+DEFINES += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES1 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"'
+DEFINES2 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN2)"'
+DEFINES3 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN3)"'
+DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"'
 
 ### The object files (add further files here):
 


--- NEW FILE vdr-epgsearch-conflictcheckonly.conf ---
# Configuration snippet for vdr-conflictcheckonly                    -*- sh -*-
#
# Add command line options to pass to the conflictcheckonly plugin to
# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED.

PLUGIN_ENABLED=false
PLUGIN_OPTIONS=""


--- NEW FILE vdr-epgsearch-epgsearchonly.conf ---
# Configuration snippet for vdr-epgsearchonly                        -*- sh -*-
#
# Add command line options to pass to the epgsearchonly plugin to
# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED.

PLUGIN_ENABLED=false
PLUGIN_OPTIONS=""


--- NEW FILE vdr-epgsearch-quickepgsearch.conf ---
# Configuration snippet for vdr-quickepgsearch                       -*- sh -*-
#
# Add command line options to pass to the quickepgsearch plugin to
# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED.

PLUGIN_ENABLED=false
PLUGIN_OPTIONS=""


--- NEW FILE vdr-epgsearch.conf ---
# Configuration snippet for vdr-epgsearch                            -*- sh -*-
#
# Add command line options to pass to the epgsearch plugin to PLUGIN_OPTIONS,
# see the epgsearch(1) man page for information about available options.

PLUGIN_OPTIONS="-l /var/log/vdr/epgsearch.log"


--- NEW FILE vdr-epgsearch.spec ---
%global pname     epgsearch
%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%global configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
%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

Name:           vdr-%{pname}
Version:        0.9.25
Release:        0.3.%{beta}%{?dist}
Summary:        Powerful schedules menu replacement plugin for VDR

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://winni.vdr-developer.org/epgsearch/
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
# 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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel
BuildRequires:  gettext
BuildRequires:  /usr/bin/pod2man
Requires:       vdr(abi)%{?_isa} = %{apiver}

%description
This plugin provides a powerful a replacement for VDR's default
schedules menu entry.  It looks like the standard schedules menu, but
adds several functions, such as additional commands for EPG entries,
reusable queries which can be used as dynamic "search timers" etc.


%prep
%setup -q -n %{pname}-%{version}.%{beta}
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
done

chmod -x scripts/*


%build
make %{?_smp_mflags} AUTOCONFIG= LIBDIR=. LOCALEDIR=./locale \
    VDRDIR=%{_libdir}/vdr all
./docsrc2man.sh


%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-*.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}

install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
install -Dpm 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/epgsearchonly.conf
install -Dpm 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/conflictcheckonly.conf
install -Dpm 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/quickepgsearch.conf

install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/epgsearch/conf.d

install -dm 755 $RPM_BUILD_ROOT%{vardir}/epgsearch

install -Dpm 755 createcats $RPM_BUILD_ROOT%{_bindir}/createcats

make install-doc MANDIR=$RPM_BUILD_ROOT%{_mandir}

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale

%find_lang %{name} --all-name --with-man


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING HISTORY conf/ scripts/
%lang(de) %doc HISTORY.DE
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf
%{_bindir}/createcats
%{plugindir}/libvdr-*.so.%{apiver}
%{_mandir}/man[145]/*.[145]*
%defattr(-,%{vdr_user},root,-)
%config(noreplace) %{configdir}/plugins/epgsearch/
%config(noreplace) %{vardir}/epgsearch/
%defattr(-,root,root,-)


%changelog
* 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.
- Require ISA qualified vdr(abi).
- 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
- 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.
- Patch to make sure correct regex headers are used and clean up unused ones.
- Patch to make path to sendmail executable settable at build time.
- 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
- Update to 0.9.25.beta14; gcc 4.3 patch no longer needed.
- Build with PCRE and TRE support.
- Use %%global instead of %%define.
- Specfile cleanups.

* Sun Sep 07 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.24-0.3
- Add gcc 4.3 patch from e-tobi

* Sun May 05 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.24-0.2
- New stable release

* Sun Apr 20 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.24-0.1.beta27
- New beta
- Handle VDR 1.6 style i18n
- Update license

* 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
- 0.9.22.

* 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
- 0.9.20.

* 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
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:10:14 -0000	1.1
+++ .cvsignore	11 Aug 2009 08:24:04 -0000	1.2
@@ -0,0 +1 @@
+vdr-epgsearch-0.9.25.beta14.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:10:14 -0000	1.1
+++ sources	11 Aug 2009 08:24:04 -0000	1.2
@@ -0,0 +1 @@
+ea83d6066cb0ffd67b1896aca58d5dc8  vdr-epgsearch-0.9.25.beta14.tgz



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:08 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082408.B7FAE10F89C@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora devel) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:10 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082411.0A31A10F89B@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora devel) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:16 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082416.55EFA10F89F@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora devel) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:17 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082418.0231810F8B2@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora devel) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:19 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082421.0512110F876@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora devel) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:21 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082423.4667510F8B6@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora devel) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:24 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082425.E50A210F8B8@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 7) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:26 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082427.6AE0910F8B9@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 7) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:28 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082428.E711E10F8BC@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 7) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:31 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082433.2562410F8C4@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 8) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:37 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082439.859A710F89B@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 8) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:38 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082440.0F73210F8C6@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 8) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:41 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082441.D957B10F8CD@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 8) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:41 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082441.7AC7210F8C3@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 8) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:45 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082446.2409110F8B0@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 9) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:42 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082443.4C11D10F8AD@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 8) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:45 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082447.3C77310F8D5@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 9) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:46 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082447.3E9F510F8D7@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 9) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:47 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082448.2AB0D10F8DA@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 9) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:48 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082448.DDDE410F8DD@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 9) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:50 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082451.59EA710F8B2@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 9) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:52 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082453.00BED10F8D1@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 10) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:57 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082457.3451710F8E0@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 10) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:57 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082457.CCB8210F8E2@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 10) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:59 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082500.3201010F8E5@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 10) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:24:59 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082500.4520310F8E7@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 10) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:25:02 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082502.9305F10F8EB@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 10) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:25:04 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082505.134F210F8EE@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 11) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:25:05 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082505.618E010F8F1@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 11) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:25:05 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082505.8E61010F8F3@bastion2.fedora.phx.redhat.com>

denis has set the commit acl on grig (Fedora 11) to Approved for bjensen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:25:06 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082507.0CED310F8FB@bastion2.fedora.phx.redhat.com>

denis has set the watchcommits acl on grig (Fedora 11) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:25:07 +0000
Subject: [pkgdb] grig had acl change status
Message-ID: <20090811082507.7538B10F8FE@bastion2.fedora.phx.redhat.com>

denis has set the watchbugzilla acl on grig (Fedora 11) to Approved for sconklin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:11 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082611.3D9B310F89B@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:13 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082613.DD51E10F8B0@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 1 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:16 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082616.E66B810F8C1@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:19 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082619.A588910F8C6@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:22 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082622.5470810F8C8@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:24 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082624.BE64F10F8CB@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:27 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082627.52A0E10F8CA@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora EPEL 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:30 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082630.5AF9610F8CD@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora EPEL 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Tue Aug 11 08:26:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:26:37 +0000
Subject: [pkgdb] inkscape ownership updated
Message-ID: <20090811082638.88B0310F8D3@bastion2.fedora.phx.redhat.com>

Package inkscape in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/inkscape



From npajkovs at fedoraproject.org  Tue Aug 11 08:02:52 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Tue, 11 Aug 2009 08:02:52 +0000 (UTC)
Subject: rpms/tk/devel tk.spec,1.63,1.64
Message-ID: <20090811080252.DEED211C00D7@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/tk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31212

Modified Files:
	tk.spec 
Log Message:
Fix Source0 url


Index: tk.spec
===================================================================
RCS file: /cvs/extras/rpms/tk/devel/tk.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- tk.spec	22 Jul 2009 15:22:44 -0000	1.63
+++ tk.spec	11 Aug 2009 08:02:52 -0000	1.64
@@ -4,12 +4,12 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
 URL: http://tcl.sourceforge.net
-Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
+Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: tcl = %{epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 1:8.5.7-2
+- Fix Source0 url
+
 * Wed Jul 22 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 1:8.5.7-1
 - update to 8.5.7
 



From cweyl at fedoraproject.org  Tue Aug 11 08:02:58 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 11 Aug 2009 08:02:58 +0000 (UTC)
Subject: rpms/perl-Package-Generator/devel .cvsignore, 1.3,
	1.4 perl-Package-Generator.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090811080258.3BBB711C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Package-Generator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31244

Modified Files:
	.cvsignore perl-Package-Generator.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.103-1
- auto-update to 0.103 (by cpan-spec-update 0.01)
- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Package-Generator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Jan 2008 00:38:53 -0000	1.3
+++ .cvsignore	11 Aug 2009 08:02:57 -0000	1.4
@@ -1 +1 @@
-Package-Generator-0.102.tar.gz
+Package-Generator-0.103.tar.gz


Index: perl-Package-Generator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Package-Generator/devel/perl-Package-Generator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Package-Generator.spec	26 Jul 2009 14:03:42 -0000	1.6
+++ perl-Package-Generator.spec	11 Aug 2009 08:02:58 -0000	1.7
@@ -1,19 +1,22 @@
 Name:           perl-Package-Generator
-Version:        0.102
-Release:        4%{?dist}
+Version:        0.103
+Release:        1%{?dist}
 Summary:        Generate new packages quickly and easily
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Package-Generator/
-Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Package-Generator-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Package-Generator-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# for testing...
-BuildRequires:  perl(Test::Pod::Coverage), perl(Test::Pod), perl(Params::Util)
-BuildRequires:  perl(Test::More), perl(Scalar::Util)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Params::Util)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Test::More)
 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module lets you quickly and easily construct new packages. It gives
@@ -49,6 +52,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.103-1
+- auto-update to 0.103 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.102-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Package-Generator/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Jan 2008 00:38:53 -0000	1.3
+++ sources	11 Aug 2009 08:02:58 -0000	1.4
@@ -1 +1 @@
-2e8a2249ac9672f8de03a329ea44de7f  Package-Generator-0.102.tar.gz
+16cfb1693978960fcde88e57d627b2e0  Package-Generator-0.103.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 11 08:34:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:34:20 +0000
Subject: [pkgdb] sg3_utils: denis has given up commit
Message-ID: <20090811083421.0C8EC10F89C@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on sg3_utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From pkgdb at fedoraproject.org  Tue Aug 11 08:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:34:21 +0000
Subject: [pkgdb] sg3_utils: denis has given up commit
Message-ID: <20090811083421.CFCAA10F8B2@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on sg3_utils (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From pkgdb at fedoraproject.org  Tue Aug 11 08:34:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:34:23 +0000
Subject: [pkgdb] sg3_utils: denis has given up commit
Message-ID: <20090811083424.AB19010F8B5@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on sg3_utils (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From pkgdb at fedoraproject.org  Tue Aug 11 08:34:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:34:26 +0000
Subject: [pkgdb] sg3_utils: denis has given up commit
Message-ID: <20090811083426.5F73C10F8B8@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on sg3_utils (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From pkgdb at fedoraproject.org  Tue Aug 11 08:34:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:34:28 +0000
Subject: [pkgdb] sg3_utils: denis has given up commit
Message-ID: <20090811083429.0D1EF10F8BB@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on sg3_utils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From pkgdb at fedoraproject.org  Tue Aug 11 08:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:34:30 +0000
Subject: [pkgdb] sg3_utils: denis has given up commit
Message-ID: <20090811083431.54BA410F8BF@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on sg3_utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:04 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811083904.3072010F876@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:04 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811083905.27B4310F89B@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:04 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811083905.2E26010F89C@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:08 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811083908.6A6AB10F8B1@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:09 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811083909.B374F10F8B7@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:09 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811083911.5CEB510F8BA@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:12 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811083913.1B1B810F8BD@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:13 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811083913.CC45C10F8C0@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:14 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811083914.DC9C710F8C3@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:18 +0000
Subject: [pkgdb] ghex: denis has given up watchbugzilla
Message-ID: <20090811083919.03D0810F8C7@bastion2.fedora.phx.redhat.com>

denis has given up the watchbugzilla acl on ghex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:18 +0000
Subject: [pkgdb] ghex: denis has given up watchcommits
Message-ID: <20090811083919.3DB9310F8C8@bastion2.fedora.phx.redhat.com>

denis has given up the watchcommits acl on ghex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pkgdb at fedoraproject.org  Tue Aug 11 08:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:39:19 +0000
Subject: [pkgdb] ghex: denis has given up commit
Message-ID: <20090811083920.1C37010F8CB@bastion2.fedora.phx.redhat.com>

denis has given up the commit acl on ghex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghex



From pbrobinson at fedoraproject.org  Tue Aug 11 08:45:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 08:45:32 +0000 (UTC)
Subject: rpms/usbmuxd/F-11 usbmuxd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090811084532.0B00311C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6054

Modified Files:
	.cvsignore sources 
Added Files:
	usbmuxd.spec 
Log Message:
-initial import


--- NEW FILE usbmuxd.spec ---
Name:		usbmuxd
Version:	0.1.4
Release:	1%{?dist}
Summary:	Daemon for communicating with Apple's iPod Touch and iPhone

Group:		Applications/System
License:	GPLv2+ and LGPLv2+
URL:		http://cgit.pims.selfip.net/usbmuxd/
Source0:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libusb-devel
BuildRequires:	automake autoconf libtool

%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
simultaneously.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: usbmuxd = %{version}-%{release}
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

%build
%configure --enable-static=no
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}

# 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

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING
/lib/udev/rules.d/85-usbmuxd.rules
%{_bindir}/iproxy
%{_libdir}/libusbmuxd.so.*
%{_sbindir}/usbmuxd

%files devel
%defattr(-,root,root,-)
%doc README.devel
%{_includedir}/*.h
%{_libdir}/libusbmuxd.so
%{_libdir}/pkgconfig/libusbmuxd.pc

%changelog
* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
- Update to 0.1.4

* Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.3-1
- Update to 0.1.3, review input

* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
- Update to 0.1.2

* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:13:07 -0000	1.1
+++ .cvsignore	11 Aug 2009 08:45:31 -0000	1.2
@@ -0,0 +1 @@
+usbmuxd-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:13:07 -0000	1.1
+++ sources	11 Aug 2009 08:45:31 -0000	1.2
@@ -0,0 +1 @@
+bc57116f092a922653ba472177f082f0  usbmuxd-0.1.4.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 11 08:46:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:46:35 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811084635.8ACFB10F876@bastion2.fedora.phx.redhat.com>

Package dates in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:46:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:46:39 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811084639.B505110F899@bastion2.fedora.phx.redhat.com>

Package dates in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:46:42 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811084642.4ED7D10F800@bastion2.fedora.phx.redhat.com>

Package dates in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:46:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:46:43 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811084643.EA49E10F89C@bastion2.fedora.phx.redhat.com>

Package dates in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pbrobinson at fedoraproject.org  Tue Aug 11 08:46:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 08:46:59 +0000 (UTC)
Subject: rpms/usbmuxd/F-10 usbmuxd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090811084659.33E8611C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6340

Modified Files:
	.cvsignore sources 
Added Files:
	usbmuxd.spec 
Log Message:
-initial import


--- NEW FILE usbmuxd.spec ---
Name:		usbmuxd
Version:	0.1.4
Release:	1%{?dist}
Summary:	Daemon for communicating with Apple's iPod Touch and iPhone

Group:		Applications/System
License:	GPLv2+ and LGPLv2+
URL:		http://cgit.pims.selfip.net/usbmuxd/
Source0:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libusb-devel
BuildRequires:	automake autoconf libtool

%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
simultaneously.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: usbmuxd = %{version}-%{release}
Requires: pkgconfig

%description devel
Files for development with %{name}.

%prep
%setup -q

%build
%configure --enable-static=no
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}

# 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

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING
/lib/udev/rules.d/85-usbmuxd.rules
%{_bindir}/iproxy
%{_libdir}/libusbmuxd.so.*
%{_sbindir}/usbmuxd

%files devel
%defattr(-,root,root,-)
%doc README.devel
%{_includedir}/*.h
%{_libdir}/libusbmuxd.so
%{_libdir}/pkgconfig/libusbmuxd.pc

%changelog
* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
- Update to 0.1.4

* Tue Aug  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.3-1
- Update to 0.1.3, review input

* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
- Update to 0.1.2

* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:13:07 -0000	1.1
+++ .cvsignore	11 Aug 2009 08:46:58 -0000	1.2
@@ -0,0 +1 @@
+usbmuxd-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:13:07 -0000	1.1
+++ sources	11 Aug 2009 08:46:59 -0000	1.2
@@ -0,0 +1 @@
+bc57116f092a922653ba472177f082f0  usbmuxd-0.1.4.tar.gz



From hadess at fedoraproject.org  Tue Aug 11 08:47:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 08:47:40 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel
	0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch, NONE,
	1.1 gnome-bluetooth.spec, 1.85, 1.86
Message-ID: <20090811084740.261A111C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6483

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-3
- Don't crash when exiting the wizard


0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch:
 bluetooth-plugin-manager.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch ---
>From 3aa146fe46f994fcb0a8c431cfbd1d38a83a68f6 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 09:40:45 +0100
Subject: [PATCH] =?utf-8?q?Bug=20590874=20=E2=80=93=20crash=20in=20Bluetooth:=20adding=20a=20bluetooth=20NAP=20phone?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Don't unload plugins, fixes crashes on exit when the plugins
register GObject types.
---
 lib/bluetooth-plugin-manager.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/bluetooth-plugin-manager.c b/lib/bluetooth-plugin-manager.c
index c8db9ef..ab1751c 100644
--- a/lib/bluetooth-plugin-manager.c
+++ b/lib/bluetooth-plugin-manager.c
@@ -101,7 +101,9 @@ bluetooth_plugin_manager_cleanup (void)
 	for (l = plugin_list; l != NULL; l = l->next) {
 		GbtPlugin *p = l->data;
 
-		g_module_close (p->module);
+		/* Disabled as it causes crashes when plugins use
+		 * the GObject type system */
+		/* g_module_close (p->module); */
 		g_free (p);
 	}
 	g_list_free (plugin_list);
-- 
1.6.2.5



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- gnome-bluetooth.spec	6 Aug 2009 09:34:40 -0000	1.85
+++ gnome-bluetooth.spec	11 Aug 2009 08:47:39 -0000	1.86
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -9,6 +9,8 @@ URL:		http://live.gnome.org/GnomeBluetoo
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Patch0:		0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
+
 BuildRequires:	gtk2-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	dbus-glib-devel
@@ -61,6 +63,7 @@ for writing applications that require a 
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
+%patch0 -p1 -b .nm-crasher
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -190,6 +193,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-3
+- Don't crash when exiting the wizard
+
 * Thu Aug 06 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-2
 - Remove requirement on the main package from -libs, and move
   the icons from the main package to the -libs sub-package (#515845)



From pkgdb at fedoraproject.org  Tue Aug 11 08:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:48:35 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084835.B1EED10F880@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora devel is now owned by mmahut

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:48:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:48:38 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084838.C23F310F89A@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:48:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:48:55 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084856.296C410F8B2@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:48:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:48:53 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084853.E08AD10F89F@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:48:51 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084851.A162510F876@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:48:57 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084857.50E2610F880@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:03 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084903.8402110F800@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:05 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084905.DE98410F8B5@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 9 is now owned by mmahut

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:09 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084909.C0BC810F8B1@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 11 is now owned by mmahut

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:07 +0000
Subject: [pkgdb] gpredict ownership updated
Message-ID: <20090811084908.8567F10F876@bastion2.fedora.phx.redhat.com>

Package gpredict in Fedora 10 is now owned by mmahut

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpredict



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:51 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811084951.660E210F880@bastion2.fedora.phx.redhat.com>

Package grig in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:53 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811084953.B47D210F89B@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:49:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:49:57 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811084957.7083810F89F@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:50:00 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811085000.CA87F10F8B1@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:50:03 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811085004.7179210F800@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:50:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:50:06 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811085006.6F7D010F8B8@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:50:11 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811085011.BB01B10F8BC@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:20 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085121.9AADE10F899@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:18 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085119.22A8A10F89C@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:23 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085123.5F9CD10F876@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:25 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085125.9FFAD10F8BA@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:29 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085130.371CA10F89A@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora EPEL 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:31 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085132.0C0CE10F89B@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora EPEL 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:27 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085127.6E57310F8C1@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:33 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085134.009F610F8C8@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:37 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085138.342CF10F8C9@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:45 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085145.EC34410F8B2@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:35 +0000
Subject: [pkgdb] plotutils ownership updated
Message-ID: <20090811085136.EF1BB10F8CC@bastion2.fedora.phx.redhat.com>

Package plotutils in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plotutils



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:48 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085148.43A4D10F800@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:51:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:51:43 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085143.A26FF10F8BE@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:04 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085204.B97AF10F8AD@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:06 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085206.85CE010F89A@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:08 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085209.15B0410F8AF@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:10 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085211.02C5F10F8B4@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora EPEL 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:14 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085214.3601210F8B6@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora EPEL 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:15 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085216.0B7BD10F8B8@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:18 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085218.4558710F8C4@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:19 +0000
Subject: [pkgdb] pstoedit ownership updated
Message-ID: <20090811085219.C067B10F8C3@bastion2.fedora.phx.redhat.com>

Package pstoedit in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pstoedit



From mgrepl at fedoraproject.org  Tue Aug 11 08:52:45 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 11 Aug 2009 08:52:45 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.40,
	1.41 selinux-policy.spec, 1.895, 1.896
Message-ID: <20090811085245.B30C311C00D7@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-serv7290

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow polkit_auth_t to getattr of all persistent filesystems



policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    4 
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/sudo.if              |    4 
 modules/admin/usermanage.te        |    1 
 modules/apps/calamaris.te          |    4 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/screen.if             |    1 
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |    9 +
 modules/kernel/corenetwork.te.in   |    4 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |   12 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.fc           |    2 
 modules/services/cups.te           |   21 ++
 modules/services/dbus.if           |    4 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |    8 -
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    3 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   29 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   41 +++++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    6 
 modules/system/userdomain.if       |   28 ++-
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 126 files changed, 2040 insertions(+), 640 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- policy-20090521.patch	5 Aug 2009 21:49:50 -0000	1.40
+++ policy-20090521.patch	11 Aug 2009 08:52:45 -0000	1.41
@@ -2157,10 +2157,79 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(system_cronjob_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.12/policy/modules/services/cups.fc
+--- nsaserefpolicy/policy/modules/services/cups.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/cups.fc	2009-08-11 09:45:17.000000000 +0200
+@@ -53,6 +53,8 @@
+ /var/lib/cups/certs	-d	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ /var/lib/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ 
++/var/lib/hp(/.*)?               gen_context(system_u:object_r:hplip_var_lib_t,s0)
++
+ /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
+ /var/log/turboprint.*		gen_context(system_u:object_r:cupsd_log_t,s0)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.12/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-04 13:01:36.000000000 +0200
-@@ -733,6 +733,8 @@
++++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-11 09:44:51.000000000 +0200
+@@ -59,12 +59,13 @@
+ init_daemon_domain(hplip_t, hplip_exec_t)
+ # For CUPS to run as a backend
+ cups_backend(hplip_t, hplip_exec_t)
+-domtrans_pattern(cupsd_config_t, hplip_exec_t, hplip_t)
+-read_files_pattern(cupsd_config_t, hplip_etc_t, hplip_etc_t)
+ 
+ type hplip_etc_t;
+ files_config_file(hplip_etc_t)
+ 
++type hplip_var_lib_t;
++files_type(hplip_var_lib_t)
++
+ type hplip_var_run_t;
+ files_pid_file(hplip_var_run_t)
+ 
+@@ -163,6 +164,9 @@
+ files_pid_filetrans(cupsd_t, cupsd_var_run_t, file)
+ 
+ allow cupsd_t hplip_t:process {signal sigkill };
++
++read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
++
+ allow cupsd_t hplip_var_run_t:file read_file_perms;
+ 
+ stream_connect_pattern(cupsd_t, ptal_var_run_t, ptal_var_run_t, ptal_t)
+@@ -376,6 +380,10 @@
+ manage_files_pattern(cupsd_config_t, cupsd_config_var_run_t, cupsd_config_var_run_t)
+ files_pid_filetrans(cupsd_config_t, cupsd_config_var_run_t, file)
+ 
++domtrans_pattern(cupsd_config_t, hplip_exec_t, hplip_t)
++ 
++read_files_pattern(cupsd_config_t, hplip_etc_t, hplip_etc_t)
++
+ kernel_read_system_state(cupsd_config_t)
+ kernel_read_all_sysctls(cupsd_config_t)
+ 
+@@ -574,9 +582,8 @@
+ read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
+ files_search_etc(hplip_t)
+ 
+-fs_rw_anon_inodefs_files(hplip_t)
+-
+-read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
++manage_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
++manage_lnk_files_pattern(hplip_t, hplip_var_lib_t, hplip_var_lib_t)
+ 
+ manage_fifo_files_pattern(hplip_t, hplip_tmp_t, hplip_tmp_t)
+ files_tmp_filetrans(hplip_t, hplip_tmp_t, fifo_file )
+@@ -615,6 +622,7 @@
+ 
+ fs_getattr_all_fs(hplip_t)
+ fs_search_auto_mountpoints(hplip_t)
++fs_rw_anon_inodefs_files(hplip_t)
+ 
+ # for python
+ corecmd_exec_bin(hplip_t)
+@@ -733,6 +741,8 @@
  files_read_etc_files(cups_pdf_t)
  files_read_usr_files(cups_pdf_t)
  
@@ -2169,7 +2238,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  auth_use_nsswitch(cups_pdf_t)
-@@ -746,6 +748,7 @@
+@@ -746,6 +756,7 @@
  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 })
  
@@ -3092,7 +3161,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.6.12/policy/modules/services/polkit.te
 --- nsaserefpolicy/policy/modules/services/polkit.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/polkit.te	2009-07-28 14:10:06.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/polkit.te	2009-08-07 12:21:31.000000000 +0200
 @@ -72,6 +72,7 @@
  manage_files_pattern(polkit_t, polkit_var_run_t, polkit_var_run_t)
  files_pid_filetrans(polkit_t, polkit_var_run_t, { file dir })
@@ -3101,6 +3170,15 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_all_users_state(polkit_t)
  
  optional_policy(`
+@@ -99,6 +100,8 @@
+ 
+ domain_use_interactive_fds(polkit_auth_t)
+ 
++fs_getattr_all_fs(polkit_auth_t)
++
+ files_read_etc_files(polkit_auth_t)
+ files_read_usr_files(polkit_auth_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.12/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/postfix.if	2009-07-31 13:05:32.000000000 +0200
@@ -4755,6 +4833,17 @@ diff -b -B --ignore-all-space --exclude-
  
  ifdef(`distro_redhat',`
  /etc/sysconfig/clock	--	gen_context(system_u:object_r:locale_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.12/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/mount.te	2009-08-11 10:04:04.000000000 +0200
+@@ -72,6 +72,7 @@
+ dev_list_all_dev_nodes(mount_t)
+ dev_read_usbfs(mount_t)
+ dev_read_rand(mount_t)
++dev_read_sysfs(mount_t)  
+ dev_rw_lvm_control(mount_t)
+ dev_dontaudit_getattr_all_chr_files(mount_t)
+ dev_dontaudit_getattr_memory_dev(mount_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-07-17 09:43:41.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -p -r1.895 -r1.896
--- selinux-policy.spec	5 Aug 2009 21:49:50 -0000	1.895
+++ selinux-policy.spec	11 Aug 2009 08:52:45 -0000	1.896
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 74%{?dist}
+Release: 75%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 11 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-75
+- Allow polkit_auth_t to getattr of all persistent filesystems
+
 * Wed Aug 5 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-74
 - Allow svirt images to create sock_file in svirt_var_run_t
 



From hadess at fedoraproject.org  Tue Aug 11 08:52:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 08:52:18 +0000 (UTC)
Subject: rpms/NetworkManager/devel
	0001-bluetooth-fix-device-capability-checking-need-NAP.patch,
	NONE, 1.1 NetworkManager.spec, 1.281, 1.282
Message-ID: <20090811085218.AEE8911C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7178

Modified Files:
	NetworkManager.spec 
Added Files:
	0001-bluetooth-fix-device-capability-checking-need-NAP.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.7.995-2.git20090804
- Add patch to fix service detection on phones


0001-bluetooth-fix-device-capability-checking-need-NAP.patch:
 network-manager-applet.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-bluetooth-fix-device-capability-checking-need-NAP.patch ---
>From 4dee9abe1d000d0fc266924949ea7b97e025d7f7 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Fri, 7 Aug 2009 10:01:50 -0500
Subject: [PATCH 1/3] bluetooth: fix device capability checking (need NAP not PANU)

The remote device (which is what we're checking) needs to provide
the NAP service (meaning it can bridge packets to the cellular
network), not the PANU service.
---
 src/gnome-bluetooth/network-manager-applet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gnome-bluetooth/network-manager-applet.c b/src/gnome-bluetooth/network-manager-applet.c
index 3cdd5b5..58f5b9c 100644
--- a/src/gnome-bluetooth/network-manager-applet.c
+++ b/src/gnome-bluetooth/network-manager-applet.c
@@ -45,7 +45,7 @@ has_config_widget (const char *bdaddr, const char **uuids)
 
 	for (i = 0; uuids && uuids[i] != NULL; i++) {
 		g_message ("has_config_widget %s %s", bdaddr, uuids[i]);
-		if (g_str_equal (uuids[i], "PANU"))
+		if (g_str_equal (uuids[i], "NAP"))
 			return TRUE;
 	}
 	return FALSE;
-- 
1.6.2.5



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- NetworkManager.spec	4 Aug 2009 20:02:07 -0000	1.281
+++ NetworkManager.spec	11 Aug 2009 08:52:18 -0000	1.282
@@ -15,7 +15,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.995
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -25,6 +25,7 @@ Source1: network-manager-applet-%{versio
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
+Patch3: 0001-bluetooth-fix-device-capability-checking-need-NAP.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -145,6 +146,7 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .bt-detection
 
 %build
 
@@ -323,6 +325,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.7.995-2.git20090804
+- Add patch to fix service detection on phones
+
 * Tue Aug  4 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-1.git20090804
 - nm: IPv6 support for manual & router-advertisement modes
 



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:48 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085248.7968F10F8C2@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:52 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085252.96D4D10F89C@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:53 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085253.85D7C10F8C9@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:55 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085255.F2DF710F800@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:57 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085257.286B510F8C6@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:52:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:52:58 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085258.4D74810F8CD@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:00 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085300.BFEA610F876@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:02 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085302.6105710F8D2@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:03 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085303.7ED7F10F8D3@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:05 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811085306.34D8A10F8D5@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:13 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811085313.D3EBA10F8B1@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:15 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811085315.42E3010F8B5@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:16 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811085316.44ACC10F8D9@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:17 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811085317.65FAC10F8DB@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:21 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811085321.68F9610F8DE@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From pkgdb at fedoraproject.org  Tue Aug 11 08:53:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:53:22 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811085323.5546110F8E1@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From mschwendt at fedoraproject.org  Tue Aug 11 08:53:55 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 11 Aug 2009 08:53:55 +0000 (UTC)
Subject: extras-repoclosure Mailer.py,1.3,1.4
Message-ID: <20090811085355.9179A11C00D7@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7521

Modified Files:
	Mailer.py 
Log Message:



Index: Mailer.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/Mailer.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Mailer.py	4 Aug 2009 09:52:55 -0000	1.3
+++ Mailer.py	11 Aug 2009 08:53:55 -0000	1.4
@@ -113,4 +113,4 @@
             slicedbody = body[start:end]
             self._mail(fromaddr,toaddrs,replytoaddr,subjectmodified,slicedbody)
             curpart += 1
-
+        return {}



From pkgdb at fedoraproject.org  Tue Aug 11 08:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:55:33 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811085534.19C9510F8D4@bastion2.fedora.phx.redhat.com>

Package dates in Fedora devel is now owned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:55:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:55:51 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811085553.7861D10F8BA@bastion2.fedora.phx.redhat.com>

Package dates in Fedora 11 is now owned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:55:54 +0000
Subject: [pkgdb] dates (un)retirement
Message-ID: <20090811085555.77D9F10F8BC@bastion2.fedora.phx.redhat.com>

Package dates in Fedora 9 has been retired by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:55:46 +0000
Subject: [pkgdb] dates ownership updated
Message-ID: <20090811085548.6C79410F8B6@bastion2.fedora.phx.redhat.com>

Package dates in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dates



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:10 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085610.45E9810F8D7@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:11 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085612.1FCFF10F800@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:08 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085609.169BF10F8DA@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:14 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085614.93EB310F8BD@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:23 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085626.1635210F8BF@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:18 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085618.A361C10F89C@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:22 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085623.1B0FC10F899@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:20 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085620.7B29E10F8E2@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From pkgdb at fedoraproject.org  Tue Aug 11 08:56:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 08:56:16 +0000
Subject: [pkgdb] k3d ownership updated
Message-ID: <20090811085616.3434310F8D6@bastion2.fedora.phx.redhat.com>

Package k3d in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/k3d



From mcrha at fedoraproject.org  Tue Aug 11 09:02:28 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue, 11 Aug 2009 09:02:28 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.409,1.410
Message-ID: <20090811090228.9271D11C00D7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9207

Modified Files:
	evolution.spec 
Log Message:
* Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-2.fc12
- Build requires gnome-desktop-devel >= 2.26




Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- evolution.spec	10 Aug 2009 15:11:04 -0000	1.409
+++ evolution.spec	11 Aug 2009 09:02:28 -0000	1.410
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -106,6 +106,7 @@ BuildRequires: libbonobo-devel >= %{libb
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: gnome-desktop-devel >= 2.26
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool >= 1.5
@@ -693,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-2.fc12
+- Build requires gnome-desktop-devel >= 2.26
+
 * Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
 - Update to 2.27.90
 



From pkgdb at fedoraproject.org  Tue Aug 11 09:05:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:05:43 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811090543.CF67810F880@bastion2.fedora.phx.redhat.com>

Package grig in Fedora devel is now owned by lucilanga

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From mnowak at fedoraproject.org  Tue Aug 11 09:06:00 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 11 Aug 2009 09:06:00 +0000 (UTC)
Subject: rpms/libev/F-11 .cvsignore, 1.7, 1.8 import.log, 1.7, 1.8 libev.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090811090600.D748A11C00D7@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9797/F-11

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.70



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Jun 2009 11:47:45 -0000	1.7
+++ .cvsignore	11 Aug 2009 09:06:00 -0000	1.8
@@ -1 +1 @@
-libev-3.6.tar.gz
+libev-3.7.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-11/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	29 Jun 2009 13:54:16 -0000	1.7
+++ import.log	11 Aug 2009 09:06:00 -0000	1.8
@@ -5,3 +5,4 @@ libev-3_52-1_fc10:HEAD:libev-3.52-1.fc10
 libev-3_53-1_fc11:HEAD:libev-3.53-1.fc11.src.rpm:1237457716
 libev-3_6-1_fc11:F-11:libev-3.6-1.fc11.src.rpm:1246276049
 libev-3_60-1_fc11:F-11:libev-3.60-1.fc11.src.rpm:1246283667
+libev-3_70-1_fc11:F-11:libev-3.70-1.fc11.src.rpm:1249981638


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-11/libev.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libev.spec	29 Jun 2009 13:54:16 -0000	1.8
+++ libev.spec	11 Aug 2009 09:06:00 -0000	1.9
@@ -1,7 +1,7 @@
-%define version_upstream 3.6
+%define version_upstream 3.7
 
 Name:		libev
-Version:	3.60
+Version:	3.70
 Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
@@ -72,7 +72,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}.so.3
+%{_libdir}/%{name}.so.3.0.0
 %{_mandir}/man?/*
 
 
@@ -84,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Michal Nowak <mnowak at redhat.com> - 3.70-1
+- v3.7
+- list libev soname explicitly
+
 * Mon Jun 29 2009 Michal Nowak <mnowak at redhat.com> - 3.60-1
 - previous version was called "3.6" but this is broken update
   path wrt version "3.53" -- thus bumping to "3.60"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Jun 2009 11:47:46 -0000	1.7
+++ sources	11 Aug 2009 09:06:00 -0000	1.8
@@ -1 +1 @@
-40901d8d679cae4e42a15f5146bcf6a1  libev-3.6.tar.gz
+e4636b100c575f0be8497e57cf43e879  libev-3.7.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 11 09:05:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:05:57 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811090557.B8D7010F89A@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 10 is now owned by lucilanga

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From pkgdb at fedoraproject.org  Tue Aug 11 09:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:06:02 +0000
Subject: [pkgdb] grig ownership updated
Message-ID: <20090811090602.BE70F10F8B0@bastion2.fedora.phx.redhat.com>

Package grig in Fedora 11 is now owned by lucilanga

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grig



From hadess at fedoraproject.org  Tue Aug 11 09:06:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 09:06:39 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.282,1.283
Message-ID: <20090811090639.0A10111C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9996

Modified Files:
	NetworkManager.spec 
Log Message:
fix patch application


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- NetworkManager.spec	11 Aug 2009 08:52:18 -0000	1.282
+++ NetworkManager.spec	11 Aug 2009 09:06:38 -0000	1.283
@@ -146,7 +146,9 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+pushd network-manager-applet-*/
 %patch3 -p1 -b .bt-detection
+popd
 
 %build
 



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:25 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090925.DC0E410F876@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:25 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090926.1797610F899@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora devel has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:29 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090929.1900C10F89B@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:29 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090929.39B8910F89F@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 2 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:31 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090931.A6FB710F8AF@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:31 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090931.E6E7110F8B1@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 3 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:33 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090933.A725610F8B4@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:33 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090933.D5D3010F8B6@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 4 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:35 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090935.B9BD410F8B8@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:35 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090936.8BEED10F800@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 5 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:37 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090937.4CCAE10F8BB@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:39 +0000
Subject: [pkgdb] libgnomeuimm20 ownership updated
Message-ID: <20090811090939.ABA2910F876@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:37 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090937.6311510F8BD@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 9 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:09:39 +0000
Subject: [pkgdb] libgnomeuimm20 (un)retirement
Message-ID: <20090811090939.EEAE010F8C0@bastion2.fedora.phx.redhat.com>

Package libgnomeuimm20 in Fedora 10 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomeuimm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:30 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091030.5BAFC10F8B2@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:30 +0000
Subject: [pkgdb] libgnomemm20 (un)retirement
Message-ID: <20090811091030.8E05810F8B4@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora devel has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:32 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091032.C61F110F8B9@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:34 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091035.49B2610F8B8@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:36 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091036.7156F10F876@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:38 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091038.BA22C10F8B6@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:41 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091041.144C510F8BD@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:41 +0000
Subject: [pkgdb] libgnomemm20 (un)retirement
Message-ID: <20090811091041.2D83A10F8C2@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 9 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:43 +0000
Subject: [pkgdb] libgnomemm20 ownership updated
Message-ID: <20090811091043.13F8010F8C6@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:10:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:10:43 +0000
Subject: [pkgdb] libgnomemm20 (un)retirement
Message-ID: <20090811091043.28C4C10F8C8@bastion2.fedora.phx.redhat.com>

Package libgnomemm20 in Fedora 10 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomemm20



From hadess at fedoraproject.org  Tue Aug 11 09:11:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 09:11:04 +0000 (UTC)
Subject: rpms/gvfs/devel 0001-Add-AFC-backend.patch, NONE, 1.1 gvfs.spec,
	1.143, 1.144
Message-ID: <20090811091104.2402D11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10792

Modified Files:
	gvfs.spec 
Added Files:
	0001-Add-AFC-backend.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-2
- Add AFC backend


0001-Add-AFC-backend.patch:
 configure.ac                                            |   26 
 daemon/Makefile.am                                      |   23 
 daemon/afc.mount.in                                     |    7 
 daemon/gvfsbackendafc.c                                 | 1226 ++++++++++++++++
 daemon/gvfsbackendafc.h                                 |   37 
 monitor/Makefile.am                                     |    6 
 monitor/afc/Makefile.am                                 |   49 
 monitor/afc/afc.monitor                                 |    5 
 monitor/afc/afcvolume.c                                 |  336 ++++
 monitor/afc/afcvolume.h                                 |   44 
 monitor/afc/afcvolumemonitor.c                          |  215 ++
 monitor/afc/afcvolumemonitor.h                          |   39 
 monitor/afc/afcvolumemonitordaemon.c                    |   31 
 monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in |    5 
 14 files changed, 2046 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-AFC-backend.patch ---
>From 1ba08909cdc395c14116d7cdf0f8f3442ba5e4c0 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 6 Aug 2009 22:55:47 +0100
Subject: [PATCH] Add AFC backend

Add a backend based on libiphone to access data on Apple's iPhone,
and iPod Touch.

Code by:
Patrick Walton <pcwalton at cs.ucla.edu>
Martin Szulecki <opensuse at sukimashita.com>
Nikias Bassen <nikias at gmx.li>
Bastien Nocera <hadess at hadess.net>
---
 configure.ac                                       |   26 +-
 daemon/Makefile.am                                 |   23 +
 daemon/afc.mount.in                                |    7 +
 daemon/gvfsbackendafc.c                            | 1226 ++++++++++++++++++++
 daemon/gvfsbackendafc.h                            |   37 +
 monitor/Makefile.am                                |    6 +-
 monitor/afc/Makefile.am                            |   49 +
 monitor/afc/afc.monitor                            |    5 +
 monitor/afc/afcvolume.c                            |  336 ++++++
 monitor/afc/afcvolume.h                            |   44 +
 monitor/afc/afcvolumemonitor.c                     |  215 ++++
 monitor/afc/afcvolumemonitor.h                     |   39 +
 monitor/afc/afcvolumemonitordaemon.c               |   31 +
 .../org.gtk.Private.AfcVolumeMonitor.service.in    |    4 +
 14 files changed, 2046 insertions(+), 2 deletions(-)
 create mode 100644 daemon/afc.mount.in
 create mode 100644 daemon/gvfsbackendafc.c
 create mode 100644 daemon/gvfsbackendafc.h
 create mode 100644 monitor/afc/Makefile.am
 create mode 100644 monitor/afc/afc.monitor
 create mode 100644 monitor/afc/afcvolume.c
 create mode 100644 monitor/afc/afcvolume.h
 create mode 100644 monitor/afc/afcvolumemonitor.c
 create mode 100644 monitor/afc/afcvolumemonitor.h
 create mode 100644 monitor/afc/afcvolumemonitordaemon.c
 create mode 100644 monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in

diff --git a/configure.ac b/configure.ac
index 7f1ec16..4675ae9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,6 +324,28 @@ AC_SUBST(CDDA_CFLAGS)
 
 AM_CONDITIONAL(USE_CDDA, [test "$msg_cdda" = "yes"])
 
+dnl *************************************************
+dnl *** Check if we should build with AFC backend ***
+dnl *************************************************
+AC_ARG_ENABLE(afc, [  --disable-afc           build without AFC backend])
+msg_afc=no
+AFC_LIBS=
+AFC_CFLAGS=
+
+if test "x$enable_afc" != "xno" -a "x$msg_gudev" = "xyes" ; then
+  PKG_CHECK_EXISTS(libiphone-1.0 >= 0.9.2, msg_afc=yes)
+
+  if test "x$msg_afc" = "xyes"; then
+    PKG_CHECK_MODULES(AFC, libiphone-1.0 gudev-1.0)
+    AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
+  fi
+fi
+
+AC_SUBST(AFC_LIBS)
+AC_SUBST(AFC_CFLAGS)
+
+AM_CONDITIONAL(USE_AFC, [test "$msg_afc" = "yes"])
+
 dnl *****************************************************
 dnl *** Check if we should build with obexftp backend ***
 dnl *****************************************************
@@ -695,6 +717,7 @@ monitor/proxy/Makefile
 monitor/hal/Makefile
 monitor/gdu/Makefile
 monitor/gphoto2/Makefile
+monitor/afc/Makefile
 gconf/Makefile
 programs/Makefile
 test/Makefile
@@ -712,7 +735,8 @@ echo "
 	FUSE support:                 $msg_fuse
         CDDA support:                 $msg_cdda
         Gphoto2 support:              $msg_gphoto2
-	archive support:	      $msg_archive
+	archive support:              $msg_archive
+	AFC support:                  $msg_afc
         GConf support:                $msg_gconf
         DNS-SD support:               $msg_avahi
 	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 733fa41..4c9e4af 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -101,6 +101,12 @@ mount_DATA += archive.mount
 libexec_PROGRAMS += gvfsd-archive
 endif
 
+mount_in_files += afc.mount.in
+if USE_AFC
+mount_DATA += afc.mount
+libexec_PROGRAMS += gvfsd-afc
+endif
+
 EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
 
 DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -433,3 +439,20 @@ gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS)
 if HAVE_AVAHI
 gvfsd_dav_LDADD += $(top_builddir)/common/libgvfscommon-dnssd.la
 endif
+
+gvfsd_afc_SOURCES = \
+	gvfsbackendafc.c gvfsbackendafc.h \
+	daemon-main.c daemon-main.h \
+	daemon-main-generic.c
+
+gvfsd_afc_CPPFLAGS = \
+	-DBACKEND_HEADER=gvfsbackendafc.h \
+	-DDEFAULT_BACKEND_TYPE=afc \
+	-DMAX_JOB_THREADS=1 \
+	$(AFC_CFLAGS) \
+	-DBACKEND_TYPES='"afc", G_VFS_TYPE_BACKEND_AFC,'
+
+gvfsd_afc_LDADD = \
+	$(libraries) \
+	$(AFC_LIBS)
+
diff --git a/daemon/afc.mount.in b/daemon/afc.mount.in
new file mode 100644
index 0000000..727d833
--- /dev/null
+++ b/daemon/afc.mount.in
@@ -0,0 +1,7 @@
+[Mount]
+Type=afc
+Exec=@libexecdir@/gvfsd-afc
+AutoMount=false
+Scheme=afc
+DefaultPort=1
+
diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
new file mode 100644
index 0000000..97d0a22
--- /dev/null
+++ b/daemon/gvfsbackendafc.c
@@ -0,0 +1,1226 @@
+/*
+ * gvfs/daemon/gvfsbackendafc.c
+ *
+ * Copyright (c) 2008 Patrick Walton <pcwalton at cs.ucla.edu>
+ */
+
+#include <config.h>
+
+#include <limits.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <glib/gi18n.h>
+#include <errno.h>
+
+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
+#include <gudev/gudev.h>
+
+#include <libiphone/libiphone.h>
+#include <libiphone/lockdown.h>
+#include <libiphone/afc.h>
+
+#include "gvfsbackendafc.h"
+#include "gvfsjobopenforread.h"
+#include "gvfsjobread.h"
+#include "gvfsjobseekread.h"
+#include "gvfsjobopenforwrite.h"
+#include "gvfsjobwrite.h"
+#include "gvfsjobseekwrite.h"
+#include "gvfsjobsetdisplayname.h"
+#include "gvfsjobqueryinfo.h"
+#include "gvfsjobqueryfsinfo.h"
+#include "gvfsjobqueryattributes.h"
+#include "gvfsjobenumerate.h"
+#include "gvfsdaemonprotocol.h"
+#include "gvfsdaemonutils.h"
+
+#define G_VFS_BACKEND_AFC_MAX_FILE_SIZE G_MAXINT64
+int g_blocksize = 4096; /* assume this is the default block size */
+
+struct _GVfsBackendAfc {
+  GVfsBackend backend;
+
+  GUdevClient *client;
+
+  char uuid[41];
+  char *service;
[...1811 lines suppressed...]
+g_vfs_afc_volume_monitor_constructor (GType type, guint ncps,
+                                      GObjectConstructParam *cps)
+{
+  GVfsAfcVolumeMonitor *self;
+  GList *devices, *l;
+  const gchar * const subsystems[] = { "usb_endpoint", NULL };
+
+  /* Boilerplate code to chain from parent. */
+  self = G_VFS_AFC_VOLUME_MONITOR((*G_OBJECT_CLASS(g_vfs_afc_volume_monitor_parent_class)->constructor)(type, ncps, cps));
+
+  self->client = g_udev_client_new (subsystems);
+  g_signal_connect (G_OBJECT (self->client), "uevent",
+                    G_CALLBACK (g_vfs_afc_monitor_uevent), self);
+
+  self->volumes = NULL;
+
+  devices = g_udev_client_query_by_subsystem (self->client, subsystems[0]);
+  for (l = devices; l != NULL; l = l->next)
+    {
+      GUdevDevice *device = l->data;
+      g_vfs_afc_monitor_uevent (self->client, "add", device, self);
+      g_object_unref (device);
+    }
+  g_list_free (devices);
+
+  g_print ("Volume monitor alive\n");
+
+  return G_OBJECT(self);
+}
+
+static void
+list_free (GList *objects)
+{
+  g_list_foreach (objects, (GFunc)g_object_unref, NULL);
+  g_list_free (objects);
+}
+
+static void
+g_vfs_afc_volume_monitor_finalize (GObject *_self)
+{
+  GVfsAfcVolumeMonitor *self;
+
+  self = G_VFS_AFC_VOLUME_MONITOR(_self);
+
+  if (self->volumes)
+    list_free (self->volumes);
+
+  if (self->client)
+    {
+      g_object_unref (self->client);
+      self->client = NULL;
+    }
+
+  if (G_OBJECT_CLASS(g_vfs_afc_volume_monitor_parent_class)->finalize)
+    (*G_OBJECT_CLASS(g_vfs_afc_volume_monitor_parent_class)->finalize)( G_OBJECT(self));
+}
+
+static GList *
+g_vfs_afc_volume_monitor_get_volumes (GVolumeMonitor *_self)
+{
+  GVfsAfcVolumeMonitor *self;
+  GList *l;
+
+  self = G_VFS_AFC_VOLUME_MONITOR (_self);
+
+  l = g_list_copy (self->volumes);
+  g_list_foreach (l, (GFunc)g_object_ref, NULL);
+
+  return l;
+}
+
+static gboolean
+g_vfs_afc_volume_monitor_is_supported (void)
+{
+  return TRUE;
+}
+
+static void
+g_vfs_afc_volume_monitor_class_init (GVfsAfcVolumeMonitorClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GVolumeMonitorClass *monitor_class = G_VOLUME_MONITOR_CLASS(klass);
+
+  gobject_class->constructor = g_vfs_afc_volume_monitor_constructor;
+  gobject_class->finalize = g_vfs_afc_volume_monitor_finalize;
+
+  monitor_class->get_volumes = g_vfs_afc_volume_monitor_get_volumes;
+  monitor_class->is_supported = g_vfs_afc_volume_monitor_is_supported;
+}
+
+static void
+g_vfs_afc_volume_monitor_init(GVfsAfcVolumeMonitor *self)
+{
+}
+
+GVolumeMonitor *
+g_vfs_afc_volume_monitor_new (void)
+{
+  return G_VOLUME_MONITOR(g_object_new (G_VFS_TYPE_AFC_VOLUME_MONITOR,
+                                        NULL));
+}
+
+/*
+ * vim: sw=2 ts=8 cindent expandtab cinoptions=f0,>4,n2,{2,(0,^-2,t0 ai
+ */
diff --git a/monitor/afc/afcvolumemonitor.h b/monitor/afc/afcvolumemonitor.h
new file mode 100644
index 0000000..0bd5f32
--- /dev/null
+++ b/monitor/afc/afcvolumemonitor.h
@@ -0,0 +1,39 @@
+/*
+ * gvfs/monitor/afc/afc-volume-monitor.h
+ *
+ * Copyright (c) 2008 Patrick Walton <pcwalton at ucla.edu>
+ */
+
+#ifndef AFC_VOLUME_MONITOR_H
+#define AFC_VOLUME_MONITOR_H
+
+#include <glib-object.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define G_VFS_TYPE_AFC_VOLUME_MONITOR   (g_vfs_afc_volume_monitor_get_type())
+#define G_VFS_AFC_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST((o), G_VFS_TYPE_AFC_VOLUME_MONITOR, GVfsAfcVolumeMonitor))
+#define G_VFS_AFC_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_AFC_VOLUME_MONITOR, GVfsAfcVolumeMonitorClass))
+#define G_VFS_IS_AFC_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), G_VFS_TYPE_AFC_VOLUME_MONITOR))
+#define G_VFS_IS_AFC_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), G_VFS_TYPE_AFC_VOLUME_MONITOR))
+#define G_VFS_AFC_VOLUME_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), G_VFS_TYPE_AFC_VOLUME_MONITOR, GVfsAfcVolumeMonitorClass))
+
+typedef struct _GVfsAfcVolumeMonitor GVfsAfcVolumeMonitor;
+typedef struct _GVfsAfcVolumeMonitorClass GVfsAfcVolumeMonitorClass;
+
+struct _GVfsAfcVolumeMonitorClass {
+  GVolumeMonitorClass parent_class;
+};
+
+GType g_vfs_afc_volume_monitor_get_type (void) G_GNUC_CONST;
+
+GVolumeMonitor *g_vfs_afc_volume_monitor_new (void);
+
+G_END_DECLS
+
+#endif /* AFC_VOLUME_MONITOR_H */
+
+/*
+ * vim: sw=2 ts=8 cindent expandtab cinoptions=f0,>4,n2,{2,(0,^-2,t0 ai
+ */
diff --git a/monitor/afc/afcvolumemonitordaemon.c b/monitor/afc/afcvolumemonitordaemon.c
new file mode 100644
index 0000000..9c24a34
--- /dev/null
+++ b/monitor/afc/afcvolumemonitordaemon.c
@@ -0,0 +1,31 @@
+/*
+ * gvfs/monitor/afc/afc-volume-monitor-daemon.c
+ *
+ * Copyright (c) 2008-2009 Patrick Walton <pcwalton at ucla.edu>
+ * Copyright (c) 2009 Martin Szulecki <opensuse at sukimashita.com>
+ */
+
+#include <config.h>
+
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <gmodule.h>
+#include <gio/gio.h>
+
+#include <gvfsproxyvolumemonitordaemon.h>
+
+#include "afcvolumemonitor.h"
+
+int
+main (int argc, char *argv[])
+{
+  g_vfs_proxy_volume_monitor_daemon_init ();
+  return g_vfs_proxy_volume_monitor_daemon_main (argc,
+                                                 argv,
+                                                 "org.gtk.Private.AfcVolumeMonitor",
+                                                 G_VFS_TYPE_AFC_VOLUME_MONITOR);
+}
+
+/*
+ * vim: sw=2 ts=8 cindent expandtab cinoptions=f0,>4,n2,{2,(0,^-2,t0 ai
+ */
diff --git a/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in b/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in
new file mode 100644
index 0000000..4e6bd33
--- /dev/null
+++ b/monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gtk.Private.AfcVolumeMonitor
+Exec=@libexecdir@/gvfs-afc-volume-monitor
+
-- 
1.6.2.5



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- gvfs.spec	10 Aug 2009 17:05:22 -0000	1.143
+++ gvfs.spec	11 Aug 2009 09:11:04 -0000	1.144
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -41,7 +41,8 @@ Patch4: gvfs-1.3.4-dont-strip-mount-pref
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
 Patch9: gvfs-1.2.3-sftp-40sec-timeout.patch
-
+# http://bugzilla.gnome.org/show_bug.cgi?id=591005
+Patch10: 0001-Add-AFC-backend.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -119,7 +120,16 @@ This package provides support for readin
 PTP based cameras (Picture Transfer Protocol) and MTP based
 media players (Media Transfer Protocol) to applications using gvfs.
 
+%package afc
+Summary: AFC support for gvfs
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: usbmuxd
+BuildRequires: libiphone-devel >= 0.9.2 libgudev-devel
 
+%description afc
+This package provides support for reading files on Apple iPhones and
+and iPod Touches to applications using gvfs.
 
 
 %prep
@@ -128,6 +138,7 @@ media players (Media Transfer Protocol) 
 %patch4 -p1 -b .mount-prefix
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
+%patch10 -p1 -b .afc
 
 %build
 
@@ -272,8 +283,18 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor
 
+%files afc
+%defattr(-, root, root, -)
+%{_libexecdir}/gvfsd-afc
+%{_datadir}/gvfs/mounts/afc.mount
+%{_libexecdir}/gvfs-afc-volume-monitor
+%{_datadir}/dbus-1/services/org.gtk.Private.AFCVolumeMonitor.service
+%{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-2
+- Add AFC backend
+
 * Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.4-1
 - Update to 1.3.4
 



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:08 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091208.9B9D510F8C1@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:06 +0000
Subject: [pkgdb] libgnomecanvasmm20 (un)retirement
Message-ID: <20090811091208.679F910F89F@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora devel has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:06 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091206.DB9B110F8C0@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:09 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091209.C42BF10F8C2@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:11 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091211.D62D810F89B@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:12 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091213.0353C10F8C6@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:16 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091217.165B210F800@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:16 +0000
Subject: [pkgdb] libgnomecanvasmm20 (un)retirement
Message-ID: <20090811091218.8D8F010F8CA@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 9 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:18 +0000
Subject: [pkgdb] libgnomecanvasmm20 (un)retirement
Message-ID: <20090811091220.D778010F8D1@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 10 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:18 +0000
Subject: [pkgdb] libgnomecanvasmm20 ownership updated
Message-ID: <20090811091219.6007C10F8B0@bastion2.fedora.phx.redhat.com>

Package libgnomecanvasmm20 in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libgnomecanvasmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:41 +0000
Subject: [pkgdb] libglademm20 (un)retirement
Message-ID: <20090811091242.D068910F8B5@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora devel has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:41 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091241.D910C10F8B7@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:43 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091243.7EEBA10F89C@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:44 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091244.EB43F10F8B2@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:46 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091247.404D510F876@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:51 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091251.6C3C310F8D6@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:48 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091248.3FD1010F8CD@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:51 +0000
Subject: [pkgdb] libglademm20 (un)retirement
Message-ID: <20090811091252.6955B10F8B8@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 9 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:53 +0000
Subject: [pkgdb] libglademm20 ownership updated
Message-ID: <20090811091253.1DDF910F8BA@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:12:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:12:53 +0000
Subject: [pkgdb] libglademm20 (un)retirement
Message-ID: <20090811091253.4165610F8D3@bastion2.fedora.phx.redhat.com>

Package libglademm20 in Fedora 10 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libglademm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:24 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091324.44F4E10F8C2@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:25 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091325.7806110F8C5@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:27 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091327.CE58D10F800@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:28 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091328.E263F10F8CB@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:31 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091331.48B6710F8D8@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:32 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091332.A413710F8DB@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:31 +0000
Subject: [pkgdb] gtkmm20 (un)retirement
Message-ID: <20090811091331.7BBA010F8D9@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 9 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:32 +0000
Subject: [pkgdb] gtkmm20 (un)retirement
Message-ID: <20090811091333.078D210F8DC@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 10 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:34 +0000
Subject: [pkgdb] gtkmm20 ownership updated
Message-ID: <20090811091334.85FF510F8CE@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:13:34 +0000
Subject: [pkgdb] gtkmm20 (un)retirement
Message-ID: <20090811091335.4FA1510F8DF@bastion2.fedora.phx.redhat.com>

Package gtkmm20 in Fedora 11 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:26 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091426.22CB910F8B1@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 2 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:27 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091427.9768510F8B4@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 3 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:29 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091429.ABC6610F8B7@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:33 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091433.A77B810F8CF@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:31 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091431.A941010F8BC@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:33 +0000
Subject: [pkgdb] gconfmm20 (un)retirement
Message-ID: <20090811091434.C28CE10F8BA@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 9 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:35 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091435.42D8710F8D5@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:35 +0000
Subject: [pkgdb] gconfmm20 (un)retirement
Message-ID: <20090811091435.E0AF710F8CD@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 10 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:36 +0000
Subject: [pkgdb] gconfmm20 ownership updated
Message-ID: <20090811091436.6F67410F8D6@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:14:36 +0000
Subject: [pkgdb] gconfmm20 (un)retirement
Message-ID: <20090811091436.7F7CE10F8E4@bastion2.fedora.phx.redhat.com>

Package gconfmm20 in Fedora 11 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gconfmm20



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:02 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091602.8574D10F8AD@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:03 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091603.EDAC710F8C8@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:05 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091605.4852A10F8B0@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 4 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:06 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091606.94AF910F8CB@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:08 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091608.69F5310F8D1@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:09 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091609.DDF3010F8B6@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 8 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:11 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091611.AD12410F8B4@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:13 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091613.35DEA10F8DA@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 10 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:16:14 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811091615.04EF010F8DD@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From adrian at fedoraproject.org  Tue Aug 11 09:18:21 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 11 Aug 2009 09:18:21 +0000 (UTC)
Subject: rpms/wordpress/devel changeset_r11798.diff, NONE, 1.1 wordpress.spec,
	1.33, 1.34
Message-ID: <20090811091821.8258E11C00D7@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11812

Modified Files:
	wordpress.spec 
Added Files:
	changeset_r11798.diff 
Log Message:
* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
- another security update to fix "Remote admin reset password":
  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


changeset_r11798.diff:
 wp-login.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE changeset_r11798.diff ---
Index: /branches/2.8/wp-login.php
===================================================================
--- /branches/2.8/wp-login.php (revision 11514)
+++ /branches/2.8/wp-login.php (revision 11798)
@@ -188,5 +188,5 @@
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) )
+	if ( empty( $key ) || is_array( $key ) )
 		return new WP_Error('invalid_key', __('Invalid key'));
 


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- wordpress.spec	3 Aug 2009 19:04:22 -0000	1.33
+++ wordpress.spec	11 Aug 2009 09:18:21 -0000	1.34
@@ -3,7 +3,7 @@ URL: http://www.wordpress.org
 Name: wordpress
 Version: 2.8.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,6 +11,7 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
+Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -18,6 +19,7 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
+%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
@@ -77,6 +79,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
+- another security update to fix "Remote admin reset password":
+  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html
+
 * Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
 - updated to 2.8.3 for security fixes
 



From pbrobinson at fedoraproject.org  Tue Aug 11 09:18:42 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 09:18:42 +0000 (UTC)
Subject: rpms/sugar-journal/devel dead.package, NONE, 1.1 .cvsignore, 1.5,
	NONE sources, 1.5, NONE sugar-journal.spec, 1.11, NONE
Message-ID: <20090811091842.ED0AB11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-journal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11880

Added Files:
	dead.package 
Removed Files:
	.cvsignore sources sugar-journal.spec 
Log Message:
This package is dead


--- NEW FILE dead.package ---
This package is now dead. The functionality has been merged into the main 'sguar' package since sugar 0.84.


--- .cvsignore DELETED ---


--- sources DELETED ---


--- sugar-journal.spec DELETED ---



From pbrobinson at fedoraproject.org  Tue Aug 11 09:21:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 09:21:50 +0000 (UTC)
Subject: rpms/sugar-journal/F-11 dead.package, NONE, 1.1 .cvsignore, 1.5,
	NONE sources, 1.5, NONE sugar-journal.spec, 1.10, NONE
Message-ID: <20090811092150.0BA2811C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/sugar-journal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12354

Added Files:
	dead.package 
Removed Files:
	.cvsignore sources sugar-journal.spec 
Log Message:
This package is dead


--- NEW FILE dead.package ---
This package is now dead. The functionality has been merged into the main 'sguar' package since sugar 0.84.


--- .cvsignore DELETED ---


--- sources DELETED ---


--- sugar-journal.spec DELETED ---



From till at fedoraproject.org  Tue Aug 11 09:28:52 2009
From: till at fedoraproject.org (Till Maas)
Date: Tue, 11 Aug 2009 09:28:52 +0000 (UTC)
Subject: rpms/python-flup/devel .cvsignore, 1.2, 1.3 python-flup.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <20090811092852.3A28111C00D7@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/python-flup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14106

Modified Files:
	.cvsignore python-flup.spec sources 
Log Message:
* Tue Aug 11 2009 Till Maas <opensource at till.name> - 1.0.2-1
- Update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-flup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Oct 2007 19:14:35 -0000	1.2
+++ .cvsignore	11 Aug 2009 09:28:52 -0000	1.3
@@ -1 +1 @@
-flup-1.0.tar.gz
+flup-1.0.2.tar.gz


Index: python-flup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-flup/devel/python-flup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-flup.spec	26 Jul 2009 20:23:56 -0000	1.4
+++ python-flup.spec	11 Aug 2009 09:28:52 -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-flup
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Random assortment of WSGI servers for python
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Till Maas <opensource at till.name> - 1.0.2-1
+- Update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-flup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Oct 2007 19:14:35 -0000	1.2
+++ sources	11 Aug 2009 09:28:52 -0000	1.3
@@ -1 +1 @@
-530801fe835fd9a680457e443eb95578  flup-1.0.tar.gz
+24dad7edc5ada31dddd49456ee8d5254  flup-1.0.2.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 11 09:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:32:42 +0000
Subject: [pkgdb] ghasher ownership updated
Message-ID: <20090811093242.955AA10F880@bastion2.fedora.phx.redhat.com>

Package ghasher in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghasher



From pkgdb at fedoraproject.org  Tue Aug 11 09:34:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:34:11 +0000
Subject: [pkgdb] gimmage ownership updated
Message-ID: <20090811093411.6CD0E10F89A@bastion2.fedora.phx.redhat.com>

Package gimmage in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gimmage



From pkgdb at fedoraproject.org  Tue Aug 11 09:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:34:29 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090811093429.DBCB010F880@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Tue Aug 11 09:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:37:18 +0000
Subject: [pkgdb] gcdmaster ownership updated
Message-ID: <20090811093718.3A3C610F800@bastion2.fedora.phx.redhat.com>

Package gcdmaster in Fedora 11 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gcdmaster



From pkgdb at fedoraproject.org  Tue Aug 11 09:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:37:18 +0000
Subject: [pkgdb] gcdmaster (un)retirement
Message-ID: <20090811093718.6E41310F880@bastion2.fedora.phx.redhat.com>

Package gcdmaster in Fedora 11 has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gcdmaster



From pkgdb at fedoraproject.org  Tue Aug 11 09:38:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:38:27 +0000
Subject: [pkgdb] gnome-python2-gda ownership updated
Message-ID: <20090811093828.04CB710F876@bastion2.fedora.phx.redhat.com>

Package gnome-python2-gda in Fedora devel was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2-gda



From pkgdb at fedoraproject.org  Tue Aug 11 09:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:38:28 +0000
Subject: [pkgdb] gnome-python2-gda (un)retirement
Message-ID: <20090811093828.7930010F800@bastion2.fedora.phx.redhat.com>

Package gnome-python2-gda in Fedora devel has been retired by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2-gda



From pkgdb at fedoraproject.org  Tue Aug 11 09:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:38:38 +0000
Subject: [pkgdb] gnome-python2-gda ownership updated
Message-ID: <20090811093838.E0FAA10F899@bastion2.fedora.phx.redhat.com>

Package gnome-python2-gda in Fedora 7 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2-gda



From pkgdb at fedoraproject.org  Tue Aug 11 09:38:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:38:40 +0000
Subject: [pkgdb] gnome-python2-gda ownership updated
Message-ID: <20090811093842.05FC910F876@bastion2.fedora.phx.redhat.com>

Package gnome-python2-gda in Fedora 5 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2-gda



From pkgdb at fedoraproject.org  Tue Aug 11 09:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:38:42 +0000
Subject: [pkgdb] gnome-python2-gda ownership updated
Message-ID: <20090811093843.AC38710F8B0@bastion2.fedora.phx.redhat.com>

Package gnome-python2-gda in Fedora 6 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2-gda



From pkgdb at fedoraproject.org  Tue Aug 11 09:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 09:38:44 +0000
Subject: [pkgdb] gnome-python2-gda ownership updated
Message-ID: <20090811093845.7402210F89F@bastion2.fedora.phx.redhat.com>

Package gnome-python2-gda in Fedora 9 was orphaned by denis

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-python2-gda



From scop at fedoraproject.org  Tue Aug 11 09:39:38 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 09:39:38 +0000 (UTC)
Subject: rpms/vdr-epgsearch/F-11 vdr-epgsearch-0.9.25.beta14-fedora.patch,
	NONE, 1.1 vdr-epgsearch-0.9.25.beta14-finnish.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-mansect.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-regexinc.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-regexlib.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta14-sendmail.patch, NONE,
	1.1 vdr-epgsearch-conflictcheckonly.conf, NONE,
	1.1 vdr-epgsearch-epgsearchonly.conf, NONE,
	1.1 vdr-epgsearch-quickepgsearch.conf, NONE,
	1.1 vdr-epgsearch.conf, NONE, 1.1 vdr-epgsearch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811093938.517C811C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-epgsearch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15449/F-11

Modified Files:
	.cvsignore sources 
Added 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 
	vdr-epgsearch-conflictcheckonly.conf 
	vdr-epgsearch-epgsearchonly.conf 
	vdr-epgsearch-quickepgsearch.conf vdr-epgsearch.conf 
	vdr-epgsearch.spec 
Log Message:
Initial F-11 import (#515351).

vdr-epgsearch-0.9.25.beta14-fedora.patch:
 Makefile       |   10 +++++-----
 docsrc2man.sh  |    3 ++-
 epgsearch.c    |   20 ++++++++++----------
 epgsearchcfg.c |    2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-fedora.patch ---
diff -up epgsearch-0.9.25.beta14/docsrc2man.sh~ epgsearch-0.9.25.beta14/docsrc2man.sh
--- epgsearch-0.9.25.beta14/docsrc2man.sh~	2009-01-06 21:15:50.000000000 +0200
+++ epgsearch-0.9.25.beta14/docsrc2man.sh	2009-08-03 22:30:23.000000000 +0300
@@ -35,10 +35,11 @@ for LANGUAGE in $(ls "$DOCSRC"/); do
 	done
 
 	rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null
-	gzip -f man/$LANGUAGE/*.[0-9]
 
 done
 
+exit 0
+
 echo
 
 for LANGUAGE in $(ls "$DOCSRC"/); do
diff -up epgsearch-0.9.25.beta14/epgsearch.c~ epgsearch-0.9.25.beta14/epgsearch.c
--- epgsearch-0.9.25.beta14/epgsearch.c~	2009-06-14 12:39:46.000000000 +0300
+++ epgsearch-0.9.25.beta14/epgsearch.c	2009-08-03 22:44:58.000000000 +0300
@@ -82,7 +82,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)
 {
@@ -444,15 +444,15 @@ 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"));
+   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");
 
    cSearchTimerThread::Init(this);    
    cSwitchTimerThread::Init();    
diff -up epgsearch-0.9.25.beta14/epgsearchcfg.c~ epgsearch-0.9.25.beta14/epgsearchcfg.c
--- epgsearch-0.9.25.beta14/epgsearchcfg.c~	2009-01-29 19:51:53.000000000 +0200
+++ epgsearch-0.9.25.beta14/epgsearchcfg.c	2009-08-03 22:30:32.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;
diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-06-14 16:03:59.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-08-03 22:30:23.000000000 +0300
@@ -268,11 +268,11 @@ install-doc:
 	@mkdir -p $(MANDIR)/de/man1
 	@mkdir -p $(MANDIR)/de/man5
 
-	@cp man/en/*1.gz $(MANDIR)/man1/
-	@cp man/en/*4.gz $(MANDIR)/man4/
-	@cp man/en/*5.gz $(MANDIR)/man5/
-	@cp man/de/*1.gz $(MANDIR)/de/man1/
-	@cp man/de/*5.gz $(MANDIR)/de/man5/
+	@cp man/en/*1 $(MANDIR)/man1/
+	@cp man/en/*4 $(MANDIR)/man4/
+	@cp man/en/*5 $(MANDIR)/man5/
+	@cp man/de/*1 $(MANDIR)/de/man1/
+	@cp man/de/*5 $(MANDIR)/de/man5/
 clean:
 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot $(PODIR)/*~
 	@-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* *~ createcats createcats.o pod2*.tmp

vdr-epgsearch-0.9.25.beta14-finnish.patch:
 fi_FI.po |   42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-finnish.patch ---
>From 52c1027bbc2b1c3c2a9f435d7558065110e7b7a9 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sun, 19 Jul 2009 23:31:28 +0300
Subject: [PATCH] Finnish translation improvements.

---
 po/fi_FI.po |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/po/fi_FI.po b/po/fi_FI.po
index a0799c2..4c7e21e 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,9 +11,9 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
-"PO-Revision-Date: 2007-08-14 20:21+0200\n"
-"Last-Translator: Rolf Ahrenberg <rahrenbe at cc.hut.fi>\n"
-"Language-Team: <vdr at linuxtv.org>\n"
+"PO-Revision-Date: 2009-07-19 23:22+0200\n"
+"Last-Translator: Ville Skytt?? <ville.skytta at iki.fi>\n"
+"Language-Team:  <vdr at linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,14 +167,14 @@ msgid "Help$Choose between 'Overview - Now' and 'Schedule' as start menu when th
 msgstr "Valitsee oletusn??yt??ksi joko t??m??nhetkisen yleiskatsauksen tai valitun kanavan ohjelmiston."
 
 msgid "Ok key"
-msgstr "'OK' n??pp??in"
+msgstr "OK-n??pp??in"
 
 msgid ""
 "Help$Choose here the behaviour of key 'Ok'. You can use it to display the summary or to switch to the corresponding channel.\n"
 "Note: the functionality of key 'blue' (Switch/Info/Search) depends on this setting."
 msgstr ""
-"Valitse toiminto 'OK' n??pp??imelle: n??yt?? ohjelman tiedot tai vaihda kyseiselle kanavalle.\n"
-"Huomioi: sinisen n??pp??imen toiminto (Vaihda/Tiedot/Hae) riippuu t??st?? asetuksesta"
+"Valitse toiminto OK-n??pp??imelle: n??yt?? ohjelman tiedot tai vaihda kyseiselle kanavalle.\n"
+"Huomioi: sinisen n??pp??imen toiminto (Vaihda/Tiedot/Hae) riippuu t??st?? asetuksesta."
 
 msgid "Red key"
 msgstr "Punainen n??pp??in"
@@ -184,7 +184,7 @@ msgid ""
 "(Can be toggled with key '0')"
 msgstr ""
 "Valitsee oletustoiminnon ('Tallenna' tai 'Komennot') punaiselle n??pp??imelle.\n"
-"Punaisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla '0' n??pp??int??."
+"Punaisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla n??pp??int?? 0."
 
 msgid "Blue key"
 msgstr "Sininen n??pp??in"
@@ -194,7 +194,7 @@ msgid ""
 "(Can be toggled with key '0')"
 msgstr ""
 "Valitsee oletustoiminnon ('Valitse' tai 'Etsi') siniselle n??pp??imelle.\n"
-"Sinisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla '0' n??pp??int??."
+"Sinisen n??pp??imen toimintoa voidaan vaihtaa my??s lennossa painamalla n??pp??int?? 0."
 
 msgid "Show progress in 'Now'"
 msgstr "N??yt?? aikajana 'Nyt'-sivulla"
@@ -214,7 +214,7 @@ msgid ""
 "\n"
 "(To completely define your own menu look please inspect the MANUAL)"
 msgstr ""
-"N??ytt???? kanavien numeroinnin t??m??nhetkisess?? yleiskatsaksessa.\n"
+"N??ytt???? kanavien numeroinnin t??m??nhetkisess?? yleiskatsauksessa.\n"
 "\n"
 "Lis??tietoja valikon muokkauksesta l??ytyy MANUAL-tiedostosta."
 
@@ -222,7 +222,7 @@ msgid "Show channel separators"
 msgstr "N??yt?? kanavaerottimet"
 
 msgid "Help$Display VDR channel groups as separators between your channels in 'Overview - Now'."
-msgstr "N??ytt???? erottimet yleiskatsauksessa kanavaville."
+msgstr "N??ytt???? erottimet yleiskatsauksessa kanaville."
 
 msgid "Show day separators"
 msgstr "N??yt?? p??iv??erottimet"
@@ -252,7 +252,7 @@ msgid "Show channels without EPG"
 msgstr "N??yt?? ohjelmaoppaattomat kanavat"
 
 msgid "Help$Choose 'yes' here if you want to display channels without EPG in 'Overview - Now'. 'Ok' on these entries switches the channel."
-msgstr "N??ytt???? t??m??nhetkisess?? yleiskatsauksessa my??skin kanavat, joilta ei l??ydy ohjelmatietoja. Voit vaihtaa t??ll??iselle kanavalle 'OK' n??pp??imell??."
+msgstr "N??ytt???? t??m??nhetkisess?? yleiskatsauksessa my??skin kanavat, joilta ei l??ydy ohjelmatietoja. Voit vaihtaa t??llaiselle kanavalle OK-n??pp??imell??."
 
 msgid "Time interval for FRew/FFwd [min]"
 msgstr "Oletusaikasiirtym?? [min]"
@@ -264,13 +264,13 @@ msgid ""
 msgstr ""
 "Valitsee ohjelmaoppaan oletusaikasiirtym??n pikakelausn??pp??imille.\n"
 "\n"
-"Jos sinulla ei ole kyseisi?? n??pp??imi?? k??yt??ss??si, voit asettaa kyseiset toiminnot vihre??lle ja keltaiselle n??pp??imelle painamalla '0' n??pp??int??."
+"Jos sinulla ei ole kyseisi?? n??pp??imi?? k??yt??ss??si, voit asettaa kyseiset toiminnot vihre??lle ja keltaiselle n??pp??imelle painamalla n??pp??int?? 0."
 
 msgid "Toggle Green/Yellow"
 msgstr "K??yt?? aikasiirtym???? v??rin??pp??imill??"
 
 msgid "Help$Specify if green and yellow shall also be switched when pressing '0'."
-msgstr "M????rittelee vaihdetaanko vihre??n ja keltaisen n??pp??imen toimintoja painamalla '0' n??pp??int??."
+msgstr "M????rittelee vaihdetaanko vihre??n ja keltaisen n??pp??imen toimintoja painamalla n??pp??int?? 0."
 
 msgid "Show favorites menu"
 msgstr "N??yt?? suosikkivalikko"
@@ -321,7 +321,7 @@ msgstr ""
 "- hakemiston m????ritys\n"
 "- vapaasti m????ritelt??v??t viikonp??iv??t toistuville ajastimille\n"
 "- jakson nimen t??ydennys\n"
-"- erilaisten EPG-muuttujien tuki (kts. MANUAL-tiedostosta)"
+"- erilaisten EPG-muuttujien tuki (ks. MANUAL-tiedostosta)"
 
 msgid "Default recording dir"
 msgstr "Oletushakemisto tallenteille"
@@ -545,13 +545,13 @@ msgid "Auth user"
 msgstr "SMTP-k??ytt??j??tunnus"
 
 msgid "Help$Specify the auth user, if this account needs authentication for SMTP."
-msgstr "M????rittelee k??ytt??j??tunnuksen, jos SMTP-palvelimelle pit???? autentikoida."
+msgstr "M????rittelee k??ytt??j??tunnuksen, jos SMTP-palvelimelle pit???? autentikoitua."
 
 msgid "Auth password"
 msgstr "SMTP-salasana"
 
 msgid "Help$Specify the auth password, if this account needs authentication for SMTP."
-msgstr "M????rittelee salasanan, jos SMTP-palvelimelle pit???? autentikoida."
+msgstr "M????rittelee salasanan, jos SMTP-palvelimelle pit???? autentikoitua."
 
 msgid "Mail account check failed!"
 msgstr "S??hk??postilaatikon tarkistus ep??onnistui!"
@@ -1102,16 +1102,16 @@ msgid "less"
 msgstr "pienempi"
 
 msgid "less or equal"
-msgstr "pienempi tai yht??suuri"
+msgstr "pienempi tai yht?? suuri"
 
 msgid "greater"
 msgstr "suurempi"
 
 msgid "greater or equal"
-msgstr "suurempi tai yht??suuri"
+msgstr "suurempi tai yht?? suuri"
 
 msgid "equal"
-msgstr "yht??suuri"
+msgstr "yht?? suuri"
 
 msgid "not equal"
 msgstr "erisuuri"
@@ -1150,7 +1150,7 @@ msgid "Edit$Delete template?"
 msgstr "Poistetaanko mallipohja?"
 
 msgid "Overwrite existing entries?"
-msgstr "Kirjoitetaanko olemassaolevan p????lle?"
+msgstr "Kirjoitetaanko olemassa olevan p????lle?"
 
 msgid "Edit entry"
 msgstr "Muokkaa valintaa"
@@ -1217,4 +1217,3 @@ msgstr "%02ldh"
 msgid "in %02ldm"
 msgstr "%02ldm"
 
-
-- 
1.6.0.6


vdr-epgsearch-0.9.25.beta14-mansect.patch:
 docsrc2man.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-mansect.patch ---
diff -up epgsearch-0.9.25.beta14/docsrc2man.sh~ epgsearch-0.9.25.beta14/docsrc2man.sh
--- epgsearch-0.9.25.beta14/docsrc2man.sh~	2009-01-06 21:15:50.000000000 +0200
+++ epgsearch-0.9.25.beta14/docsrc2man.sh	2009-07-18 23:53:19.000000000 +0300
@@ -26,7 +26,9 @@ for LANGUAGE in $(ls "$DOCSRC"/); do
 
 	for i in "$DOCSRC"/$LANGUAGE/*.txt; do
 		echo -ne "create man page: ($LANGUAGE) $(basename "$i" ".txt")..."
-		pod2man -c "Epgsearch Version $VERSION" -n "$(echo "$(basename "$i")" | sed -e 's/\.[0-9]\..*$//')" --section=5 "$i" >"man/$LANGUAGE/$(basename "$i" ".txt")"
+		name=$(echo "$(basename "$i")" | sed -e 's/\.[0-9]\..*$//')
+		sect=$(echo "$i" | sed -e 's/.*\.\([0-9]\)\.txt/\1/')
+		pod2man -c "Epgsearch Version $VERSION" -n "$name" --section="$sect" "$i" >"man/$LANGUAGE/$(basename "$i" ".txt")"
 		if [ $? -eq 0 ]; then
 			echo " done."
 		else

vdr-epgsearch-0.9.25.beta14-regexinc.patch:
 Makefile         |    1 +
 blacklist.c      |    5 -----
 epgsearchext.c   |    5 -----
 epgsearchtools.c |    2 ++
 4 files changed, 3 insertions(+), 10 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-regexinc.patch ---
diff -up epgsearch-0.9.25.beta14/blacklist.c~ epgsearch-0.9.25.beta14/blacklist.c
--- epgsearch-0.9.25.beta14/blacklist.c~	2009-01-29 19:51:53.000000000 +0200
+++ epgsearch-0.9.25.beta14/blacklist.c	2009-07-18 23:18:59.000000000 +0300
@@ -32,11 +32,6 @@ The project's page is at http://winni.vd
 #include "menu_searchedit.h"
 #include "menu_searchresults.h"
 #include <math.h>
-#ifdef HAVE_PCREPOSIX
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
 
 cBlacklists Blacklists;
 
diff -up epgsearch-0.9.25.beta14/epgsearchext.c~ epgsearch-0.9.25.beta14/epgsearchext.c
--- epgsearch-0.9.25.beta14/epgsearchext.c~	2009-06-23 21:10:54.000000000 +0300
+++ epgsearch-0.9.25.beta14/epgsearchext.c	2009-07-18 23:17:29.000000000 +0300
@@ -38,11 +38,6 @@ The project's page is at http://winni.vd
 #include "uservars.h"
 #include "blacklist.h"
 #include <math.h>
-#ifdef HAVE_PCREPOSIX
-#include <pcreposix.h>
-#else
-#include <regex.h>
-#endif
 
 cSearchExts SearchExts;
 cSearchExts SearchTemplates;
diff -up epgsearch-0.9.25.beta14/epgsearchtools.c~ epgsearch-0.9.25.beta14/epgsearchtools.c
--- epgsearch-0.9.25.beta14/epgsearchtools.c~	2009-07-04 21:29:51.000000000 +0300
+++ epgsearch-0.9.25.beta14/epgsearchtools.c	2009-07-18 23:18:29.000000000 +0300
@@ -44,6 +44,8 @@ The project's page is at http://winni.vd
 
 #ifdef HAVE_PCREPOSIX
 #include <pcreposix.h>
+#elif defined(HAVE_LIBTRE)
+#include <tre/regex.h>
 #else
 #include <regex.h>
 #endif
diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-07-19 00:10:52.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-07-19 00:22:58.000000000 +0300
@@ -140,6 +140,7 @@ else ifeq ($(USE_REGEXLIB), tre)
 LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
 #LIBS += -L/usr/lib -ltre
 DEFINES += -DHAVE_LIBTRE
+INCLUDE += $(shell pkg-config --cflags tre)
 endif
 
 ifdef USE_PINPLUGIN

vdr-epgsearch-0.9.25.beta14-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.beta14-regexlib.patch ---
diff -up epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt~ epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt
--- epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt~	2009-01-29 19:59:10.000000000 +0200
+++ epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt	2009-07-18 23:22:23.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.beta14/INSTALL~ epgsearch-0.9.25.beta14/INSTALL
--- epgsearch-0.9.25.beta14/INSTALL~	2009-01-06 21:15:59.000000000 +0200
+++ epgsearch-0.9.25.beta14/INSTALL	2009-07-18 23:20:39.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.beta14/INSTALL.DE~ epgsearch-0.9.25.beta14/INSTALL.DE
--- epgsearch-0.9.25.beta14/INSTALL.DE~	2009-01-06 21:16:00.000000000 +0200
+++ epgsearch-0.9.25.beta14/INSTALL.DE	2009-07-18 23:21:35.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.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-06-14 16:03:59.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-07-18 23:35:17.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.
 
@@ -72,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
@@ -128,14 +131,12 @@
 
 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 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

vdr-epgsearch-0.9.25.beta14-sendmail.patch:
 Makefile |   18 +++++++++++++-----
 mail.c   |    6 +++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta14-sendmail.patch ---
diff -up epgsearch-0.9.25.beta14/mail.c~ epgsearch-0.9.25.beta14/mail.c
--- epgsearch-0.9.25.beta14/mail.c~	2009-03-23 20:10:43.000000000 +0200
+++ epgsearch-0.9.25.beta14/mail.c	2009-07-18 23:32:29.000000000 +0300
@@ -31,6 +31,10 @@ The project's page is at http://winni.vd
 #include "epgsearchtools.h"
 #include "uservars.h"
 
+#ifndef SENDMAIL
+#define SENDMAIL "/usr/sbin/sendmail"
+#endif
+
 extern bool isUTF8;
 using namespace std;
 
@@ -130,7 +134,7 @@ bool cMailNotifier::SendMailViaSendmail(
 {
     char mailcmd[256];
     const char* mailargs = "%s -i -FVDR -oem  %s";
-    const char* mailproc = "/usr/lib/sendmail";
+    const char* mailproc = SENDMAIL;
     FILE* mail;
     
     string to = EPGSearchConfig.MailAddressTo; 
diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile
--- epgsearch-0.9.25.beta14/Makefile~	2009-06-14 16:03:59.000000000 +0300
+++ epgsearch-0.9.25.beta14/Makefile	2009-07-18 23:35:17.000000000 +0300
@@ -42,6 +38,10 @@ ifndef AUTOCONFIG
 
 endif
 
+### the sendmail executable to use when epgsearch is configured to use the
+### sendmail method for sending mail
+SENDMAIL = /usr/sbin/sendmail
+
 ###
 ### CONFIG END
 ### do not edit below this line if you don't know what you do ;-)
@@ -118,11 +117,15 @@ PACKAGE = vdr-$(ARCHIVE)
 INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 #INCLUDES += -I$(VDRDIR)/include
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-DEFINES1 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"'
-DEFINES2 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN2)"'
-DEFINES3 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN3)"'
-DEFINES4 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN4)"'
+EPGSEARCH_DEFINES += -D_GNU_SOURCE
+ifneq ($(SENDMAIL),)
+EPGSEARCH_DEFINES += -DSENDMAIL='"$(SENDMAIL)"'
+endif
+DEFINES += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES1 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"'
+DEFINES2 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN2)"'
+DEFINES3 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN3)"'
+DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"'
 
 ### The object files (add further files here):
 


--- NEW FILE vdr-epgsearch-conflictcheckonly.conf ---
# Configuration snippet for vdr-conflictcheckonly                    -*- sh -*-
#
# Add command line options to pass to the conflictcheckonly plugin to
# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED.

PLUGIN_ENABLED=false
PLUGIN_OPTIONS=""


--- NEW FILE vdr-epgsearch-epgsearchonly.conf ---
# Configuration snippet for vdr-epgsearchonly                        -*- sh -*-
#
# Add command line options to pass to the epgsearchonly plugin to
# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED.

PLUGIN_ENABLED=false
PLUGIN_OPTIONS=""


--- NEW FILE vdr-epgsearch-quickepgsearch.conf ---
# Configuration snippet for vdr-quickepgsearch                       -*- sh -*-
#
# Add command line options to pass to the quickepgsearch plugin to
# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED.

PLUGIN_ENABLED=false
PLUGIN_OPTIONS=""


--- NEW FILE vdr-epgsearch.conf ---
# Configuration snippet for vdr-epgsearch                            -*- sh -*-
#
# Add command line options to pass to the epgsearch plugin to PLUGIN_OPTIONS,
# see the epgsearch(1) man page for information about available options.

PLUGIN_OPTIONS="-l /var/log/vdr/epgsearch.log"


--- NEW FILE vdr-epgsearch.spec ---
%global pname     epgsearch
%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%global configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
%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

Name:           vdr-%{pname}
Version:        0.9.25
Release:        0.3.%{beta}%{?dist}
Summary:        Powerful schedules menu replacement plugin for VDR

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://winni.vdr-developer.org/epgsearch/
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
# 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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel
BuildRequires:  gettext
BuildRequires:  /usr/bin/pod2man
Requires:       vdr(abi)%{?_isa} = %{apiver}

%description
This plugin provides a powerful a replacement for VDR's default
schedules menu entry.  It looks like the standard schedules menu, but
adds several functions, such as additional commands for EPG entries,
reusable queries which can be used as dynamic "search timers" etc.


%prep
%setup -q -n %{pname}-%{version}.%{beta}
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
done

chmod -x scripts/*


%build
make %{?_smp_mflags} AUTOCONFIG= LIBDIR=. LOCALEDIR=./locale \
    VDRDIR=%{_libdir}/vdr all
./docsrc2man.sh


%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-*.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}

install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
install -Dpm 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/epgsearchonly.conf
install -Dpm 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/conflictcheckonly.conf
install -Dpm 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/quickepgsearch.conf

install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/epgsearch/conf.d

install -dm 755 $RPM_BUILD_ROOT%{vardir}/epgsearch

install -Dpm 755 createcats $RPM_BUILD_ROOT%{_bindir}/createcats

make install-doc MANDIR=$RPM_BUILD_ROOT%{_mandir}

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale

%find_lang %{name} --all-name --with-man


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING HISTORY conf/ scripts/
%lang(de) %doc HISTORY.DE
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf
%{_bindir}/createcats
%{plugindir}/libvdr-*.so.%{apiver}
%{_mandir}/man[145]/*.[145]*
%defattr(-,%{vdr_user},root,-)
%config(noreplace) %{configdir}/plugins/epgsearch/
%config(noreplace) %{vardir}/epgsearch/
%defattr(-,root,root,-)


%changelog
* 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.
- Require ISA qualified vdr(abi).
- 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
- 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.
- Patch to make sure correct regex headers are used and clean up unused ones.
- Patch to make path to sendmail executable settable at build time.
- 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
- Update to 0.9.25.beta14; gcc 4.3 patch no longer needed.
- Build with PCRE and TRE support.
- Use %%global instead of %%define.
- Specfile cleanups.

* Sun Sep 07 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.24-0.3
- Add gcc 4.3 patch from e-tobi

* Sun May 05 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.24-0.2
- New stable release

* Sun Apr 20 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.24-0.1.beta27
- New beta
- Handle VDR 1.6 style i18n
- Update license

* 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
- 0.9.22.

* 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
- 0.9.20.

* 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
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:10:14 -0000	1.1
+++ .cvsignore	11 Aug 2009 09:39:37 -0000	1.2
@@ -0,0 +1 @@
+vdr-epgsearch-0.9.25.beta14.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:10:14 -0000	1.1
+++ sources	11 Aug 2009 09:39:37 -0000	1.2
@@ -0,0 +1 @@
+ea83d6066cb0ffd67b1896aca58d5dc8  vdr-epgsearch-0.9.25.beta14.tgz



From scop at fedoraproject.org  Tue Aug 11 09:42:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 09:42:29 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.77,1.78
Message-ID: <20090811094229.C3A6B11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15990

Modified Files:
	comps-f12.xml.in 
Log Message:
+vdr-epgsearch


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- comps-f12.xml.in	7 Aug 2009 15:17:53 -0000	1.77
+++ comps-f12.xml.in	11 Aug 2009 09:42:29 -0000	1.78
@@ -5027,6 +5027,7 @@
       <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-osdteletext</packagereq>
       <packagereq type="optional">vdr-remote</packagereq>
       <packagereq type="optional">vdr-skins</packagereq>



From knol at fedoraproject.org  Tue Aug 11 10:01:32 2009
From: knol at fedoraproject.org (knol)
Date: Tue, 11 Aug 2009 10:01:32 +0000 (UTC)
Subject: rpms/getmail/devel getmail.spec,1.13,1.14
Message-ID: <20090811100132.9E6EC11C00D7@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20057

Modified Files:
	getmail.spec 
Log Message:
4.11.0-3


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/getmail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- getmail.spec	10 Aug 2009 21:11:59 -0000	1.13
+++ getmail.spec	11 Aug 2009 10:01:32 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
 Version: 4.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://pyropus.ca/software/getmail/
@@ -55,7 +55,7 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-2
+* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-3
 - update to release 4.11.0
 
 * Sat Jul 18 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1



From mcrha at fedoraproject.org  Tue Aug 11 10:07:43 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue, 11 Aug 2009 10:07:43 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.410,1.411
Message-ID: <20090811100743.BC95411C00D7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21269

Modified Files:
	evolution.spec 
Log Message:
- Build requires gnome-desktop-devel >= 2.26
- New library libevolution-cal-shared.so
(trying to get back to 2.27.90-1)



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- evolution.spec	11 Aug 2009 09:02:28 -0000	1.410
+++ evolution.spec	11 Aug 2009 10:07:43 -0000	1.411
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.27.90
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -641,6 +641,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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-cal-shared.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
@@ -694,11 +695,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-2.fc12
-- Build requires gnome-desktop-devel >= 2.26
-
-* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
+* Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
 - Update to 2.27.90
+- Build requires gnome-desktop-devel >= 2.26
+- New library libevolution-cal-shared.so
 
 * Tue Jul 28 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-3.fc12
 - Enable pst-import plugin (RH bug #493049)



From varekova at fedoraproject.org  Tue Aug 11 10:10:38 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 11 Aug 2009 10:10:38 +0000 (UTC)
Subject: rpms/man/devel man-1.6f-makewhatis_use.patch, NONE, 1.1 man.spec,
	1.82, 1.83
Message-ID: <20090811101038.99A3D11C048B@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21202

Modified Files:
	man.spec 
Added Files:
	man-1.6f-makewhatis_use.patch 
Log Message:

- fix makewhatis format bug (#513553)


man-1.6f-makewhatis_use.patch:
 makewhatis.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-1.6f-makewhatis_use.patch ---
diff -up man-1.6f/src/makewhatis.sh.use man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.use	2009-08-11 09:21:11.000000000 +0200
+++ man-1.6f/src/makewhatis.sh	2009-08-11 09:26:40.000000000 +0200
@@ -257,7 +257,7 @@ do
 			 match(filename,"\\.z$") || match(filename,"\\.gz$");
 	      if (!use_zcat)
 		use_bzcat = match(filename,"\\.bz2");
-              if(!use_bzcat)
+              if(!use_bzcat && !use_zcat)
                 use_lzcat = match(filename,"\\.lzma");
               if (use_zcat || use_bzcat || use_lzcat ) {
 		filename_no_gz = substr(filename, 0, RSTART - 1);


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- man.spec	25 Jul 2009 11:42:28 -0000	1.82
+++ man.spec	11 Aug 2009 10:10:38 -0000	1.83
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -38,6 +38,7 @@ Patch34: man-1.6f-lang_C.patch
 Patch35: man-1.6f-makewhatis_whis.patch
 Patch36: man-1.6f-makewhatis_update.patch
 Patch37: man-1.6f-makewhatis_perf.patch
+Patch38: man-1.6f-makewhatis_use.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -82,6 +83,7 @@ primary way to find documentation on a L
 %patch35 -p1 -b .whis
 %patch36 -p1 -b .update
 %patch37 -p1 -b .perf
+%patch38 -p1 -b .use
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -265,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-22
+- fix makewhatis format bug (#513553)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6f-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mcrha at fedoraproject.org  Tue Aug 11 10:16:20 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Tue, 11 Aug 2009 10:16:20 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.411,1.412
Message-ID: <20090811101620.D858E11C00D7@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22426

Modified Files:
	evolution.spec 
Log Message:
hrm, cannot go back with a tag, thus using 2.27.90-2



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- evolution.spec	11 Aug 2009 10:07:43 -0000	1.411
+++ evolution.spec	11 Aug 2009 10:16:20 -0000	1.412
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -695,11 +695,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
-- Update to 2.27.90
+* Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-2.fc12
 - Build requires gnome-desktop-devel >= 2.26
 - New library libevolution-cal-shared.so
 
+* Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Milan Crha <mcrha at redhat.com> - 2.27.5-3.fc12
 - Enable pst-import plugin (RH bug #493049)
 



From adrian at fedoraproject.org  Tue Aug 11 10:28:11 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 11 Aug 2009 10:28:11 +0000 (UTC)
Subject: rpms/wordpress/F-11 changeset_r11798.diff, NONE, 1.1 wordpress.spec,
	1.31, 1.32
Message-ID: <20090811102811.2F26A11C00D7@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24548

Modified Files:
	wordpress.spec 
Added Files:
	changeset_r11798.diff 
Log Message:
* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
- another security update to fix "Remote admin reset password":
  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


changeset_r11798.diff:
 wp-login.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE changeset_r11798.diff ---
Index: /branches/2.8/wp-login.php
===================================================================
--- /branches/2.8/wp-login.php (revision 11514)
+++ /branches/2.8/wp-login.php (revision 11798)
@@ -188,5 +188,5 @@
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) )
+	if ( empty( $key ) || is_array( $key ) )
 		return new WP_Error('invalid_key', __('Invalid key'));
 


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/wordpress.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wordpress.spec	5 Aug 2009 07:45:37 -0000	1.31
+++ wordpress.spec	11 Aug 2009 10:28:10 -0000	1.32
@@ -3,7 +3,7 @@ URL: http://www.wordpress.org
 Name: wordpress
 Version: 2.8.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,6 +11,7 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
+Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -18,6 +19,7 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
+%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
@@ -77,6 +79,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
+- another security update to fix "Remote admin reset password":
+  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html
+
 * Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
 - updated to 2.8.3 for security fixes
 



From scop at fedoraproject.org  Tue Aug 11 11:07:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 11:07:04 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.52,
	1.53 gnome-packagekit.spec, 1.95, 1.96 sources, 1.53, 1.54
Message-ID: <20090811110704.60FC211C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30319

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.5-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	3 Aug 2009 12:33:33 -0000	1.52
+++ .cvsignore	11 Aug 2009 11:07:02 -0000	1.53
@@ -1 +1 @@
-gnome-packagekit-2.27.5.tar.gz
+gnome-packagekit-2.27.5.tar.bz2


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- gnome-packagekit.spec	3 Aug 2009 15:16:08 -0000	1.95
+++ gnome-packagekit.spec	11 Aug 2009 11:07:02 -0000	1.96
@@ -16,12 +16,12 @@ Summary:   Session applications to manag
 Name:      gnome-packagekit
 Version:   2.27.5
 #Release:   0.1.%{?alphatag}git%{?dist}
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}.tar.gz
-#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}.tar.bz2
+#Source0:   http://download.gnome.org/sources/gnome-packagekit/2.27/%{name}-%{version}-%{?alphatag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
@@ -221,6 +221,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.5-3
+- Use bzipped upstream tarball.
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-2
 - Move the gpk-log and gpk-repo menu shortcuts to the gnome-packagekit-extra
   subpackage to reduce menu polution on the live cd.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	3 Aug 2009 12:33:33 -0000	1.53
+++ sources	11 Aug 2009 11:07:03 -0000	1.54
@@ -1 +1 @@
-06f0f9538918987210211ed239c41fee  gnome-packagekit-2.27.5.tar.gz
+5df9afc494e7e83fa8cfc7335e550a7c  gnome-packagekit-2.27.5.tar.bz2



From scop at fedoraproject.org  Tue Aug 11 11:18:28 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 11:18:28 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.65,
	1.66 gnome-power-manager.spec, 1.171, 1.172 sources, 1.66, 1.67
Message-ID: <20090811111828.C560611C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31975

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.5-2
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	3 Aug 2009 12:23:02 -0000	1.65
+++ .cvsignore	11 Aug 2009 11:18:28 -0000	1.66
@@ -1 +1 @@
-gnome-power-manager-2.27.5.tar.gz
+gnome-power-manager-2.27.5.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- gnome-power-manager.spec	3 Aug 2009 12:23:02 -0000	1.171
+++ gnome-power-manager.spec	11 Aug 2009 11:18:28 -0000	1.172
@@ -5,12 +5,12 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.27.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
-#Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.bz2
+#Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
@@ -181,6 +181,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.5-2
+- Use bzipped upstream tarball.
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	3 Aug 2009 12:23:02 -0000	1.66
+++ sources	11 Aug 2009 11:18:28 -0000	1.67
@@ -1 +1 @@
-59a935ed21dbeecd330f1549b37024df  gnome-power-manager-2.27.5.tar.gz
+2a987ee22fb611a575eff73baea12b4c  gnome-power-manager-2.27.5.tar.bz2



From hadess at fedoraproject.org  Tue Aug 11 11:38:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 11:38:35 +0000 (UTC)
Subject: rpms/bluez/F-11
	0001-Don-t-abort-cups-backend-on-property-change.patch, NONE,
	1.1 0002-Actually-read-the-CreateDevice-reply.patch, NONE,
	1.1 bluez.spec, 1.68, 1.69
Message-ID: <20090811113835.A0E9311C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3168

Modified Files:
	bluez.spec 
Added Files:
	0001-Don-t-abort-cups-backend-on-property-change.patch 
	0002-Actually-read-the-CreateDevice-reply.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-4
- Fix cups discovery the first time we discover a device


0001-Don-t-abort-cups-backend-on-property-change.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Don-t-abort-cups-backend-on-property-change.patch ---
>From 35ffd5a6dafd7e38c7d8c9502608314a44919302 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 12:23:39 +0100
Subject: [PATCH 1/2] Don't abort cups backend on property change

Make sure the cups backend doesn't abort when trying to
access a property that's not Discovering.
---
 cups/main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index 2fbfe7e..9c24734 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -506,6 +506,9 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *me
 
 		dbus_message_iter_init(message, &iter);
 		dbus_message_iter_get_basic(&iter, &name);
+		if (name == NULL ||
+		    strcmp(name, "Discovering") != 0)
+		    	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 		dbus_message_iter_next(&iter);
 		dbus_message_iter_recurse(&iter, &value_iter);
 		dbus_message_iter_get_basic(&value_iter, &discovering);
-- 
1.6.2.5


0002-Actually-read-the-CreateDevice-reply.patch:
 main.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0002-Actually-read-the-CreateDevice-reply.patch ---
>From b29e1cb433454391da92720c3ff87373d9d60500 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 12:24:58 +0100
Subject: [PATCH 2/2] Actually read the CreateDevice reply

Fixes aborts when the printer isn't a known device.
---
 cups/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index 9c24734..ba9864f 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -371,9 +371,9 @@ static void remote_device_found(const char *adapter, const char *bdaddr, const c
 
 		if (!reply)
 			return;
-	} else {
-		if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE)
-			return;
+	}
+	if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE) {
+		return;
 	}
 
 	id = device_get_ieee1284_id(adapter, object_path);
-- 
1.6.2.5



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- bluez.spec	3 Aug 2009 14:08:48 -0000	1.68
+++ bluez.spec	11 Aug 2009 11:38:34 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -17,6 +17,8 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=507572
 Patch5: cups-less-errors.patch
+Patch6: 0001-Don-t-abort-cups-backend-on-property-change.patch
+Patch7: 0002-Actually-read-the-CreateDevice-reply.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -107,6 +109,8 @@ use in Bluetooth applications.
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cups-less-errors
+%patch6 -p1
+%patch7 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -201,6 +205,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-4
+- Fix cups discovery the first time we discover a device
+
 * Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-3
 - Fix hid2hci rules location
 



From mmaslano at fedoraproject.org  Tue Aug 11 11:39:08 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 11 Aug 2009 11:39:08 +0000 (UTC)
Subject: rpms/perl-JavaScript-Beautifier/devel .cvsignore, 1.2,
	1.3 perl-JavaScript-Beautifier.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090811113908.3630011C00D7@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351

Modified Files:
	.cvsignore perl-JavaScript-Beautifier.spec sources 
Log Message:
* Tue Aug 11 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.13-1
- fix source url, update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 May 2009 07:19:32 -0000	1.2
+++ .cvsignore	11 Aug 2009 11:39:07 -0000	1.3
@@ -1 +1 @@
-JavaScript-Beautifier-0.04.tar.gz
+JavaScript-Beautifier-0.13.tar.gz


Index: perl-JavaScript-Beautifier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel/perl-JavaScript-Beautifier.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-JavaScript-Beautifier.spec	26 Jul 2009 08:51:12 -0000	1.2
+++ perl-JavaScript-Beautifier.spec	11 Aug 2009 11:39:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-JavaScript-Beautifier
-Version:        0.04
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Beautify Javascript (beautifier for javascript)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -14,8 +14,8 @@ BuildRequires:  dos2unix
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This module is mostly a Perl-rewrite of http://github.com/einars/js-
-beautify/tree/master/beautify.js
+This module is mostly a Perl-rewrite of
+http://github.com/einars/js-beautify/tree/master/beautify.js
 
 %prep
 %setup -q -n JavaScript-Beautifier-%{version}
@@ -44,9 +44,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
+%{_bindir}/js_beautify.pl
+%{_mandir}/man1/js_beautify.pl.1.gz
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.13-1
+- fix source url, update
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-JavaScript-Beautifier/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2009 07:19:32 -0000	1.2
+++ sources	11 Aug 2009 11:39:08 -0000	1.3
@@ -1 +1 @@
-327dfecd8ad2d5cb69cbf5bd14774c31  JavaScript-Beautifier-0.04.tar.gz
+0617ed34b6c1ba10ccbe1472bf807d61  JavaScript-Beautifier-0.13.tar.gz



From tmraz at fedoraproject.org  Tue Aug 11 11:39:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 11 Aug 2009 11:39:13 +0000 (UTC)
Subject: rpms/pcsc-tools/devel pcsc-tools-1.4.15.tar.gz.asc, NONE,
	1.1 .cvsignore, 1.13, 1.14 pcsc-tools.spec, 1.17, 1.18 sources,
	1.13, 1.14 pcsc-tools-1.4.14.tar.gz.asc, 1.1, NONE
Message-ID: <20090811113913.966A711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pcsc-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3389

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Added Files:
	pcsc-tools-1.4.15.tar.gz.asc 
Removed Files:
	pcsc-tools-1.4.14.tar.gz.asc 
Log Message:
* Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.15-1
- upgrade to a latest upstream version



--- NEW FILE pcsc-tools-1.4.15.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAklnCpIACgkQP0qKj+B/HPlQ/QCfagPShWLqVQwYNLddq5wIoc4F
Q50AnjKThJpN70PVimmwDGEgUc0mHW4r
=5IrM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	5 Jun 2008 13:48:07 -0000	1.13
+++ .cvsignore	11 Aug 2009 11:39:13 -0000	1.14
@@ -1 +1 @@
-pcsc-tools-1.4.14.tar.gz
+pcsc-tools-1.4.15.tar.gz


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-tools/devel/pcsc-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pcsc-tools.spec	25 Jul 2009 23:23:28 -0000	1.17
+++ pcsc-tools.spec	11 Aug 2009 11:39:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           pcsc-tools
-Version:        1.4.14
-Release:        3%{?dist}
+Version:        1.4.15
+Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
 Group:          Development/Tools
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.15-1
+- upgrade to a latest upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	5 Jun 2008 13:48:07 -0000	1.13
+++ sources	11 Aug 2009 11:39:13 -0000	1.14
@@ -1 +1 @@
-12f3c39b4e0c30fa8abf7875d3914944  pcsc-tools-1.4.14.tar.gz
+e09d9cc7851f3f0c9e6d412568ea7104  pcsc-tools-1.4.15.tar.gz


--- pcsc-tools-1.4.14.tar.gz.asc DELETED ---



From hadess at fedoraproject.org  Tue Aug 11 11:39:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 11:39:34 +0000 (UTC)
Subject: rpms/bluez/devel
	0001-Don-t-abort-cups-backend-on-property-change.patch, NONE,
	1.1 0002-Actually-read-the-CreateDevice-reply.patch, NONE,
	1.1 bluez.spec, 1.87, 1.88
Message-ID: <20090811113934.BB0DC11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3577

Modified Files:
	bluez.spec 
Added Files:
	0001-Don-t-abort-cups-backend-on-property-change.patch 
	0002-Actually-read-the-CreateDevice-reply.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.47-4
- Fix cups discovery the first time we discover a device


0001-Don-t-abort-cups-backend-on-property-change.patch:
 main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Don-t-abort-cups-backend-on-property-change.patch ---
>From 35ffd5a6dafd7e38c7d8c9502608314a44919302 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 12:23:39 +0100
Subject: [PATCH 1/2] Don't abort cups backend on property change

Make sure the cups backend doesn't abort when trying to
access a property that's not Discovering.
---
 cups/main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index 2fbfe7e..9c24734 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -506,6 +506,9 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *me
 
 		dbus_message_iter_init(message, &iter);
 		dbus_message_iter_get_basic(&iter, &name);
+		if (name == NULL ||
+		    strcmp(name, "Discovering") != 0)
+		    	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 		dbus_message_iter_next(&iter);
 		dbus_message_iter_recurse(&iter, &value_iter);
 		dbus_message_iter_get_basic(&value_iter, &discovering);
-- 
1.6.2.5


0002-Actually-read-the-CreateDevice-reply.patch:
 main.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0002-Actually-read-the-CreateDevice-reply.patch ---
>From b29e1cb433454391da92720c3ff87373d9d60500 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 12:24:58 +0100
Subject: [PATCH 2/2] Actually read the CreateDevice reply

Fixes aborts when the printer isn't a known device.
---
 cups/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index 9c24734..ba9864f 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -371,9 +371,9 @@ static void remote_device_found(const char *adapter, const char *bdaddr, const c
 
 		if (!reply)
 			return;
-	} else {
-		if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE)
-			return;
+	}
+	if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE) {
+		return;
 	}
 
 	id = device_get_ieee1284_id(adapter, object_path);
-- 
1.6.2.5



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- bluez.spec	10 Aug 2009 13:14:06 -0000	1.87
+++ bluez.spec	11 Aug 2009 11:39:34 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.47
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
@@ -23,6 +23,8 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
+Patch6: 0001-Don-t-abort-cups-backend-on-property-change.patch
+Patch7: 0002-Actually-read-the-CreateDevice-reply.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -129,6 +131,8 @@ This includes hidd, dund and pand.
 %patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cable-pairing
+%patch6 -p1
+%patch7 -p1
 
 %build
 libtoolize -f -c
@@ -268,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.47-4
+- Fix cups discovery the first time we discover a device
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.47-3
 - Use bzipped upstream tarball.
 



From scop at fedoraproject.org  Tue Aug 11 11:50:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 11:50:10 +0000 (UTC)
Subject: rpms/hal/devel .cvsignore, 1.64, 1.65 hal.spec, 1.205, 1.206 sources,
	1.66, 1.67
Message-ID: <20090811115010.6B75411C0489@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5399

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.13-8
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	27 Jul 2009 16:45:47 -0000	1.64
+++ .cvsignore	11 Aug 2009 11:50:10 -0000	1.65
@@ -1 +1 @@
-hal-0.5.13.tar.gz
+hal-0.5.13.tar.bz2


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- hal.spec	30 Jul 2009 03:20:00 -0000	1.205
+++ hal.spec	11 Aug 2009 11:50:10 -0000	1.206
@@ -26,10 +26,10 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.13
-Release: 7%{?dist}
+Release: 8%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
 
 # OLPC specific, not upstream as is a hack until OFW lands
@@ -282,6 +282,9 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.13-8
+- Use bzipped upstream tarball.
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.5.13-7
 - Grant root access to devices
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	27 Jul 2009 16:45:47 -0000	1.66
+++ sources	11 Aug 2009 11:50:10 -0000	1.67
@@ -1 +1 @@
-46ecc5d2e5bd964fb78099688f01bb6a  hal-0.5.13.tar.gz
+43440854e04abdd29509ddc00c9c3fb1  hal-0.5.13.tar.bz2



From tmraz at fedoraproject.org  Tue Aug 11 11:50:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 11 Aug 2009 11:50:50 +0000 (UTC)
Subject: rpms/pam/devel pam.spec,1.200,1.201
Message-ID: <20090811115050.6B7D711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5542

Modified Files:
	pam.spec 
Log Message:
- fix source URLs



Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- pam.spec	27 Jul 2009 15:23:22 -0000	1.200
+++ pam.spec	11 Aug 2009 11:50:50 -0000	1.201
@@ -9,8 +9,8 @@ Release: 3%{?dist}
 # pam_rhosts_auth module is BSD with advertising
 License: BSD and GPLv2+ and BSD with advertising
 Group: System Environment/Base
-Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/beta/Linux-PAM-%{version}.tar.bz2
-Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/beta/Linux-PAM-%{version}.tar.bz2.sign
+Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2
+Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign
 Source2: https://fedorahosted.org/releases/p/a/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2
 Source5: other.pamd
 Source6: system-auth.pamd



From adrian at fedoraproject.org  Tue Aug 11 11:55:22 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 11 Aug 2009 11:55:22 +0000 (UTC)
Subject: rpms/wordpress/EL-5 changeset_r11798.diff, NONE, 1.1 wordpress.spec,
	1.30, 1.31
Message-ID: <20090811115522.5AADF11C00D7@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6622

Modified Files:
	wordpress.spec 
Added Files:
	changeset_r11798.diff 
Log Message:
* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
- another security update to fix "Remote admin reset password":
  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


changeset_r11798.diff:
 wp-login.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE changeset_r11798.diff ---
Index: /branches/2.8/wp-login.php
===================================================================
--- /branches/2.8/wp-login.php (revision 11514)
+++ /branches/2.8/wp-login.php (revision 11798)
@@ -188,5 +188,5 @@
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) )
+	if ( empty( $key ) || is_array( $key ) )
 		return new WP_Error('invalid_key', __('Invalid key'));
 


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/wordpress.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- wordpress.spec	5 Aug 2009 07:46:30 -0000	1.30
+++ wordpress.spec	11 Aug 2009 11:55:22 -0000	1.31
@@ -3,7 +3,7 @@ URL: http://www.wordpress.org
 Name: wordpress
 Version: 2.8.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,6 +11,7 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
+Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -18,6 +19,7 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
+%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
@@ -77,6 +79,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
+- another security update to fix "Remote admin reset password":
+  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html
+
 * Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
 - updated to 2.8.3 for security fixes
 



From varekova at fedoraproject.org  Tue Aug 11 11:56:43 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 11 Aug 2009 11:56:43 +0000 (UTC)
Subject: rpms/logwatch/devel logwatch-7.3.6-named5.patch, NONE,
	1.1 logwatch.spec, 1.117, 1.118
Message-ID: <20090811115643.BEBE711C00D7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6597

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-named5.patch 
Log Message:
 - parse a few unmatched entries in named script (#513853)


logwatch-7.3.6-named5.patch:
 named |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-named5.patch ---
diff -up logwatch-7.3.6/scripts/services/named.pom logwatch-7.3.6/scripts/services/named
--- logwatch-7.3.6/scripts/services/named.pom	2009-08-11 09:42:27.000000000 +0200
+++ logwatch-7.3.6/scripts/services/named	2009-08-11 13:36:47.000000000 +0200
@@ -183,7 +183,14 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /.*: unexpected end of input/) or
       ($ThisLine =~ /too many timeouts resolving '.*' .*: disabling EDNS/) or
       ($ThisLine =~ /too many timeouts resolving '.*' .*: reducing the advertised EDNS UDP packet size to .* octets/) or
-      ($ThisLine =~ /reloading zones succeeded/)
+      ($ThisLine =~ /reloading zones succeeded/) or
+      ($ThisLine =~ /success resolving '.*' \(in '.*'?\) after disabling EDNS/) or
+      ($ThisLine =~ /success resolving '.*' \(in '.*'?\) after reducing the advertised EDNS UDP packet size to 512 octets/) or
+      ($ThisLine =~ /the working directory is not writable/) or
+      ($ThisLine =~ /using default UDP\/IPv[46] port range: \[[0-9]*, [0-9]*\]/) or
+      ($ThisLine =~ /adjusted limit on open files from [0-9]* to [0-9]*/) or
+      ($ThisLine =~ /using up to [0-9]* sockets/) or
+      ($ThisLine =~ /built with/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
       # Don't care about these...


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- logwatch.spec	25 Jul 2009 11:15:57 -0000	1.117
+++ logwatch.spec	11 Aug 2009 11:56:43 -0000	1.118
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 47%{?dist}
+Release: 48%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -53,6 +53,7 @@ Patch53: logwatch-7.3.6-sshd2.patch
 Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
 Patch56: logwatch-7.3.6-cron_conf.patch
+Patch57: logwatch-7.3.6-named5.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +114,7 @@ of the package on many systems.
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch57 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -236,10 +238,13 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-48
+- parse a few unmatched entries in named script (#513853)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.3.6-47
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Jul  7 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-16
+* Tue Jul  7 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-46
 - fix cron script
 
 * Thu Jul  2 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-45



From scop at fedoraproject.org  Tue Aug 11 12:02:45 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 12:02:45 +0000 (UTC)
Subject: rpms/highlight/devel .cvsignore, 1.25, 1.26 highlight.spec, 1.46,
	1.47 sources, 1.26, 1.27
Message-ID: <20090811120245.8B27B11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8563

Modified Files:
	.cvsignore highlight.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.10-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	29 Jun 2009 16:25:31 -0000	1.25
+++ .cvsignore	11 Aug 2009 12:02:45 -0000	1.26
@@ -1 +1 @@
-highlight-2.10.tar.gz
+highlight-2.10.tar.bz2


Index: highlight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- highlight.spec	25 Jul 2009 02:09:50 -0000	1.46
+++ highlight.spec	11 Aug 2009 12:02:45 -0000	1.47
@@ -1,13 +1,13 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
 BuildRequires:	qt-devel >= 4.4
 BuildRequires:	desktop-file-utils
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.10-4
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Jun 2009 16:25:31 -0000	1.26
+++ sources	11 Aug 2009 12:02:45 -0000	1.27
@@ -1 +1 @@
-34d2b41df0974f871215ad0343f63efe  highlight-2.10.tar.gz
+cdb28be381d99ab24d11174082c0a4fa  highlight-2.10.tar.bz2



From scop at fedoraproject.org  Tue Aug 11 12:03:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 12:03:07 +0000 (UTC)
Subject: rpms/icon-naming-utils/devel .cvsignore, 1.5,
	1.6 icon-naming-utils.spec, 1.20, 1.21 sources, 1.12, 1.13
Message-ID: <20090811120307.4BE4611C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/icon-naming-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8684

Modified Files:
	.cvsignore icon-naming-utils.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.90-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icon-naming-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Feb 2009 05:50:00 -0000	1.5
+++ .cvsignore	11 Aug 2009 12:03:06 -0000	1.6
@@ -1 +1 @@
-icon-naming-utils-0.8.90.tar.gz
+icon-naming-utils-0.8.90.tar.bz2


Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- icon-naming-utils.spec	25 Jul 2009 03:07:49 -0000	1.20
+++ icon-naming-utils.spec	11 Aug 2009 12:03:07 -0000	1.21
@@ -1,13 +1,13 @@
 Name:           icon-naming-utils
 Version:        0.8.90
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
 Group:          Development/Tools
 License:        GPLv2
 BuildArch:	noarch
 URL:            http://tango.freedesktop.org/Standard_Icon_Naming_Specification
-Source0:        http://tango.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0:        http://tango.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(XML::Simple)
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.90-4
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.90-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Feb 2009 05:50:00 -0000	1.12
+++ sources	11 Aug 2009 12:03:07 -0000	1.13
@@ -1 +1 @@
-2c5c7a418e5eb3268f65e21993277fba  icon-naming-utils-0.8.90.tar.gz
+dd8108b56130b9eedc4042df634efa66  icon-naming-utils-0.8.90.tar.bz2



From tmraz at fedoraproject.org  Tue Aug 11 11:48:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 11 Aug 2009 11:48:31 +0000 (UTC)
Subject: rpms/galculator/devel galculator.spec,1.18,1.19
Message-ID: <20090811114831.D81D911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/galculator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4986

Modified Files:
	galculator.spec 
Log Message:
- fix source url



Index: galculator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- galculator.spec	24 Jul 2009 23:27:06 -0000	1.18
+++ galculator.spec	11 Aug 2009 11:48:31 -0000	1.19
@@ -6,7 +6,7 @@ Summary:        GTK 2 based scientific c
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
+Source0:        http://prdownloads.sourceforge.net/galculator/galculator-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From scop at fedoraproject.org  Tue Aug 11 12:09:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 12:09:32 +0000 (UTC)
Subject: rpms/irssi/devel .cvsignore, 1.11, 1.12 irssi.spec, 1.41,
	1.42 sources, 1.11, 1.12
Message-ID: <20090811120932.23BDF11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/irssi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9733

Modified Files:
	.cvsignore irssi.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.14-2
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Aug 2009 10:14:53 -0000	1.11
+++ .cvsignore	11 Aug 2009 12:09:31 -0000	1.12
@@ -1 +1 @@
-irssi-0.8.14.tar.gz
+irssi-0.8.14.tar.bz2


Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- irssi.spec	3 Aug 2009 10:14:54 -0000	1.41
+++ irssi.spec	11 Aug 2009 12:09:31 -0000	1.42
@@ -3,12 +3,12 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/irssi-%{version}.tar.gz
+Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 Source1:	irssi-config.h
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.14-2
+- Use bzipped upstream tarball.
+
 * Mon Aug  3 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.14-1
 - Upstream release 0.8.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Aug 2009 10:14:54 -0000	1.11
+++ sources	11 Aug 2009 12:09:31 -0000	1.12
@@ -1 +1 @@
-7d9437f53209a61af4fe4c9c5528ffa7  irssi-0.8.14.tar.gz
+00efe7638dd596d5930dfa2aeae87b3a  irssi-0.8.14.tar.bz2



From tmraz at fedoraproject.org  Tue Aug 11 11:54:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 11 Aug 2009 11:54:08 +0000 (UTC)
Subject: rpms/fipscheck/devel fipscheck.spec,1.6,1.7
Message-ID: <20090811115408.8D20D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fipscheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6137

Modified Files:
	fipscheck.spec 
Log Message:
- point URLs to fedorahosted



Index: fipscheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fipscheck/devel/fipscheck.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fipscheck.spec	24 Jul 2009 22:48:02 -0000	1.6
+++ fipscheck.spec	11 Aug 2009 11:54:08 -0000	1.7
@@ -6,8 +6,8 @@ License:	BSD
 Group:		System Environment/Libraries
 # This is a Red Hat maintained package which is specific to
 # our distribution.
-URL:		http://people.redhat.com/tmraz/fipscheck
-Source0:	http://people.redhat.com/tmraz/fipscheck/%{name}-%{version}.tar.bz2
+URL:		http://fedorahosted.org/fipscheck/
+Source0:	http://fedorahosted.org/releases/f/i/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 



From mmaslano at fedoraproject.org  Tue Aug 11 12:15:06 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 11 Aug 2009 12:15:06 +0000 (UTC)
Subject: rpms/perl-Capture-Tiny/devel .cvsignore, 1.2,
	1.3 perl-Capture-Tiny.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090811121506.65EE811C00D7@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Capture-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10616

Modified Files:
	.cvsignore perl-Capture-Tiny.spec sources 
Log Message:
* Tue Aug 11 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.06-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 08:58:51 -0000	1.2
+++ .cvsignore	11 Aug 2009 12:15:05 -0000	1.3
@@ -1 +1 @@
-Capture-Tiny-0.05.tar.gz
+Capture-Tiny-0.06.tar.gz


Index: perl-Capture-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/devel/perl-Capture-Tiny.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Capture-Tiny.spec	26 Jul 2009 04:06:57 -0000	1.2
+++ perl-Capture-Tiny.spec	11 Aug 2009 12:15:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Capture-Tiny
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Capture STDOUT and STDERR from Perl, XS or external programs
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.06-1
+- update
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Capture-Tiny/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 08:58:51 -0000	1.2
+++ sources	11 Aug 2009 12:15:05 -0000	1.3
@@ -1 +1 @@
-e242915f57878465ef0b947eaf2e0b5c  Capture-Tiny-0.05.tar.gz
+653963c3855ea57ccabc5642ff407f7f  Capture-Tiny-0.06.tar.gz



From atkac at fedoraproject.org  Tue Aug 11 12:22:50 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 11 Aug 2009 12:22:50 +0000 (UTC)
Subject: rpms/swig/devel swig.spec,1.49,1.50
Message-ID: <20090811122250.1CF9D11C00D7@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/swig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12067

Modified Files:
	swig.spec 
Log Message:
- correct source URL



Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/devel/swig.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- swig.spec	3 Aug 2009 14:06:29 -0000	1.49
+++ swig.spec	11 Aug 2009 12:22:49 -0000	1.50
@@ -4,11 +4,11 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.39
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
-Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
 Patch1: swig-1.3.23-pylib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Doc Examples
 
 %changelog
+* Tue Aug 11 2009 Adam Tkac <atkac redhat com> 1.3.39-4
+- correct source URL
+
 * Mon Aug 03 2009 Adam Tkac <atkac redhat com> 1.3.39-3
 - rebuilt
 



From scop at fedoraproject.org  Tue Aug 11 12:24:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 12:24:32 +0000 (UTC)
Subject: rpms/kiosktool/devel .cvsignore, 1.2, 1.3 kiosktool.spec, 1.14,
	1.15 sources, 1.2, 1.3
Message-ID: <20090811122432.D99AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kiosktool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12439

Modified Files:
	.cvsignore kiosktool.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-13
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kiosktool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 15:35:37 -0000	1.2
+++ .cvsignore	11 Aug 2009 12:24:32 -0000	1.3
@@ -1 +1 @@
-kiosktool-1.0.tar.gz
+kiosktool-1.0.tar.bz2


Index: kiosktool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kiosktool/devel/kiosktool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- kiosktool.spec	25 Jul 2009 04:37:53 -0000	1.14
+++ kiosktool.spec	11 Aug 2009 12:24:32 -0000	1.15
@@ -2,12 +2,12 @@
 Summary: KIOSK administration tool for KDE
 Name:	 kiosktool
 Version: 1.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: GPLv2
 Group:	 System Environment/Base
 URL:	 http://extragear.kde.org/apps/kiosktool/
-Source:	 ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin/kiosktool-%{version}.tar.gz
+Source:	 ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin/kiosktool-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # empty defaults
@@ -94,6 +94,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-13
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kiosktool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2005 15:35:37 -0000	1.2
+++ sources	11 Aug 2009 12:24:32 -0000	1.3
@@ -1 +1 @@
-e23e4a52dfe09d03e8649364f91a818a  kiosktool-1.0.tar.gz
+1576cdaa3cff93255fd5d7f6835b07e2  kiosktool-1.0.tar.bz2



From scop at fedoraproject.org  Tue Aug 11 12:26:05 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 12:26:05 +0000 (UTC)
Subject: rpms/libgdbus/devel .cvsignore, 1.2, 1.3 libgdbus.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090811122605.1B56411C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libgdbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12754

Modified Files:
	.cvsignore libgdbus.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.2-5
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdbus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2008 11:34:30 -0000	1.2
+++ .cvsignore	11 Aug 2009 12:26:04 -0000	1.3
@@ -1 +1 @@
-libgdbus-0.2.tar.gz
+libgdbus-0.2.tar.bz2


Index: libgdbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdbus/devel/libgdbus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libgdbus.spec	25 Jul 2009 05:41:50 -0000	1.3
+++ libgdbus.spec	11 Aug 2009 12:26:04 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           libgdbus
 Version:        0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for simple D-Bus integration with GLib
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.bluez.org/
-Source0:        http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
+Source0:        http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.2-5
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdbus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2008 11:34:31 -0000	1.2
+++ sources	11 Aug 2009 12:26:04 -0000	1.3
@@ -1 +1 @@
-f51d19564bdf77af1c132c2a38643fe4  libgdbus-0.2.tar.gz
+775a41347751d0b0169d6bace03c1361  libgdbus-0.2.tar.bz2



From scop at fedoraproject.org  Tue Aug 11 12:26:43 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 12:26:43 +0000 (UTC)
Subject: rpms/KoboDeluxe/devel .cvsignore, 1.5, 1.6 KoboDeluxe.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090811122643.03C1B11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/KoboDeluxe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12926

Modified Files:
	.cvsignore KoboDeluxe.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-7
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/KoboDeluxe/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Dec 2007 09:58:15 -0000	1.5
+++ .cvsignore	11 Aug 2009 12:26:42 -0000	1.6
@@ -1 +1 @@
-KoboDeluxe-0.5.1.tar.gz
+KoboDeluxe-0.5.1.tar.bz2


Index: KoboDeluxe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/KoboDeluxe/devel/KoboDeluxe.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- KoboDeluxe.spec	24 Jul 2009 15:35:06 -0000	1.10
+++ KoboDeluxe.spec	11 Aug 2009 12:26:42 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           KoboDeluxe
 Version:        0.5.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        3'rd person scrolling 2D shooter
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://olofson.net/kobodl/
-Source0:        http://olofson.net/kobodl/download/%{name}-%{version}.tar.gz
+Source0:        http://olofson.net/kobodl/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.png
 Source2:        %{name}.desktop
 Patch1:         KoboDeluxe-defaults.patch
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.1-7
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/KoboDeluxe/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Dec 2007 09:58:15 -0000	1.5
+++ sources	11 Aug 2009 12:26:42 -0000	1.6
@@ -1 +1 @@
-cf765559461213d651c7be042507b767  KoboDeluxe-0.5.1.tar.gz
+cb5dcdaf07ccad18a921058138dedc4a  KoboDeluxe-0.5.1.tar.bz2



From atkac at fedoraproject.org  Tue Aug 11 12:35:09 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 11 Aug 2009 12:35:09 +0000 (UTC)
Subject: rpms/mtools/devel mtools.spec,1.45,1.46
Message-ID: <20090811123509.F2BC311C00D7@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15031

Modified Files:
	mtools.spec 
Log Message:
- correct source URL



Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- mtools.spec	25 Jul 2009 15:19:53 -0000	1.45
+++ mtools.spec	11 Aug 2009 12:35:09 -0000	1.46
@@ -1,10 +1,10 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
 Version: 4.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
-Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
+Source0: ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.bz2
 Url: http://mtools.linux.lu/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: mtools-3.9.6-config.patch
@@ -67,6 +67,9 @@ fi
 %{_infodir}/%{name}.info.gz
 
 %changelog
+* Tue Aug 11 2009 Adam Tkac <atkac redhat com> 4.0.10-3
+- correct source URL
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Tue Aug 11 12:41:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 11 Aug 2009 12:41:05 +0000 (UTC)
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.39,1.40
Message-ID: <20090811124105.614F711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16242

Modified Files:
	libgcrypt.spec 
Log Message:
* Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-8
- fix warning when installed with --excludedocs (#515961)



Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- libgcrypt.spec	25 Jul 2009 05:40:56 -0000	1.39
+++ libgcrypt.spec	11 Aug 2009 12:41:05 -0000	1.40
@@ -1,6 +1,6 @@
 Name: libgcrypt
 Version: 1.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: libgcrypt-%{version}-hobbled.tar.bz2
 # The original libgcrypt sources now contain potentially patented ECC
 # cipher support. We have to remove it in the tarball we ship with
@@ -120,11 +120,12 @@ rm -fr $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gcrypt.info.gz %{_infodir}/dir
+[ -f %{_infodir}/gcrypt.info.gz ] && \
+    /sbin/install-info %{_infodir}/gcrypt.info.gz %{_infodir}/dir
 exit 0
 
 %preun devel
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gcrypt.info.gz ]; then
     /sbin/install-info --delete %{_infodir}/gcrypt.info.gz %{_infodir}/dir
 fi
 exit 0
@@ -147,6 +148,9 @@ exit 0
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-8
+- fix warning when installed with --excludedocs (#515961)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mitr at fedoraproject.org  Tue Aug 11 12:41:05 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 11 Aug 2009 12:41:05 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto-0.20-gcc_macros.patch, NONE,
	1.1 m2crypto-0.20-merge.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 m2crypto.spec, 1.55, 1.56 sources, 1.11,
	1.12 m2crypto-0.18-gcc_macros.patch, 1.1,
	NONE m2crypto-0.19.1-close-HTTPResponse.patch, 1.1,
	NONE m2crypto-0.19.1-locking.patch, 1.1,
	NONE m2crypto-0.19.1-no-dns-in-altname.patch, 1.1,
	NONE m2crypto-0.19.1-ssl-selector.patch, 1.1, NONE
Message-ID: <20090811124105.3748211C00D7@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16226

Modified Files:
	.cvsignore m2crypto.spec sources 
Added Files:
	m2crypto-0.20-gcc_macros.patch m2crypto-0.20-merge.patch 
Removed Files:
	m2crypto-0.18-gcc_macros.patch 
	m2crypto-0.19.1-close-HTTPResponse.patch 
	m2crypto-0.19.1-locking.patch 
	m2crypto-0.19.1-no-dns-in-altname.patch 
	m2crypto-0.19.1-ssl-selector.patch 
Log Message:
* Tue Aug 11 2009 Miloslav Trma? <mitr at volny.cz> - 0.20-1
- Update to m2crypto-0.20
- Fix incorrect merge in HTTPS CONNNECT proxy support


m2crypto-0.20-gcc_macros.patch:
 _m2crypto.i |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE m2crypto-0.20-gcc_macros.patch ---
diff -up M2Crypto-0.20/SWIG/_m2crypto.i.gcc_macros M2Crypto-0.20/SWIG/_m2crypto.i
--- M2Crypto-0.20/SWIG/_m2crypto.i.gcc_macros	2009-08-11 05:05:22.000000000 +0200
+++ M2Crypto-0.20/SWIG/_m2crypto.i	2009-08-11 13:24:52.943706097 +0200
@@ -4,6 +4,7 @@
  * Portions created by Open Source Applications Foundation (OSAF) are
  * Copyright (C) 2004-2006 OSAF. All Rights Reserved.
  */
+%import "gcc_macros.h"
 
 %module(threads=1) _m2crypto
 /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.

m2crypto-0.20-merge.patch:
 httpslib.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE m2crypto-0.20-merge.patch ---
diff -up M2Crypto-0.20/M2Crypto/httpslib.py.merge M2Crypto-0.20/M2Crypto/httpslib.py
--- M2Crypto-0.20/M2Crypto/httpslib.py.merge	2009-08-11 13:38:10.538989545 +0200
+++ M2Crypto-0.20/M2Crypto/httpslib.py	2009-08-11 13:46:59.310956095 +0200
@@ -4,7 +4,7 @@ Copyright (c) 1999-2004 Ng Pheng Siong. 
 
 import string, sys
 import socket
-from urlparse import urlsplit
+from urlparse import urlsplit, urlunsplit
 import base64
 
 from httplib import *
@@ -122,7 +122,7 @@ class ProxyHTTPSConnection(HTTPSConnecti
     def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
         #putrequest is called before connect, so can interpret url and get
         #real host/port to be used to make CONNECT request to proxy
-        proto, netloc, path, query, fraqment = urlsplit(url)
+        proto, netloc, path, query, fragment = urlsplit(url)
         if not proto:
             raise ValueError, "unknown URL type: %s" % url
         
@@ -144,6 +144,7 @@ class ProxyHTTPSConnection(HTTPSConnecti
 
         self._real_host = host
         self._real_port = int(port)
+        rest = urlunsplit((None, None, path, query, fragment))
         HTTPSConnection.putrequest(self, method, rest, skip_host, skip_accept_encoding)
 
     def putheader(self, header, value):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Oct 2008 13:17:09 -0000	1.11
+++ .cvsignore	11 Aug 2009 12:41:04 -0000	1.12
@@ -1 +1 @@
-M2Crypto-0.19.1.tar.gz
+M2Crypto-0.20.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- m2crypto.spec	25 Jul 2009 11:35:53 -0000	1.55
+++ m2crypto.spec	11 Aug 2009 12:41:04 -0000	1.56
@@ -5,22 +5,15 @@
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
-Version: 0.19.1
-Release: 10
+Version: 0.20
+Release: 1
 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
 # This is only precautionary, it does fix anything - not sent upstream
-Patch1: m2crypto-0.18-gcc_macros.patch
-# https://bugzilla.osafoundation.org/show_bug.cgi?id=12718
-Patch2: m2crypto-0.19.1-close-HTTPResponse.patch
-# Half in upstream SVN
-# Half is https://bugzilla.osafoundation.org/show_bug.cgi?id=12760
-Patch3: m2crypto-0.19.1-ssl-selector.patch
-# https://bugzilla.osafoundation.org/show_bug.cgi?id=9605
-Patch4: m2crypto-0.19.1-no-dns-in-altname.patch
-# https://bugzilla.osafoundation.org/show_bug.cgi?id=12847
-Patch5: m2crypto-0.19.1-locking.patch
+Patch1: m2crypto-0.20-gcc_macros.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=12857
+Patch2: m2crypto-0.20-merge.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -36,10 +29,7 @@ This package allows you to call OpenSSL 
 %setup -q -n M2Crypto-%{version}
 %patch0 -p1
 %patch1 -p1 -b .gcc_macros
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
+%patch2 -p1 -b .merge
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -102,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Tue Aug 11 2009 Miloslav Trma? <mitr at volny.cz> - 0.20-1
+- Update to m2crypto-0.20
+- Fix incorrect merge in HTTPS CONNNECT proxy support
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Oct 2008 13:17:09 -0000	1.11
+++ sources	11 Aug 2009 12:41:04 -0000	1.12
@@ -1 +1 @@
-c92286fdf0a75f017e72122c2832d5ff  M2Crypto-0.19.1.tar.gz
+43a4d958a6c892a37ca02ffcc650b66b  M2Crypto-0.20.tar.gz


--- m2crypto-0.18-gcc_macros.patch DELETED ---


--- m2crypto-0.19.1-close-HTTPResponse.patch DELETED ---


--- m2crypto-0.19.1-locking.patch DELETED ---


--- m2crypto-0.19.1-no-dns-in-altname.patch DELETED ---


--- m2crypto-0.19.1-ssl-selector.patch DELETED ---



From lkundrak at fedoraproject.org  Tue Aug 11 12:41:52 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 11 Aug 2009 12:41:52 +0000 (UTC)
Subject: rpms/grep/devel grep.spec,1.77,1.78
Message-ID: <20090811124152.C071A11C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/grep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16589

Modified Files:
	grep.spec 
Log Message:
* Tue Aug 11 2009 Lubomir Rintel <lkundrak at v3.sk> 2.5.3-6
- Silence possible scriptlets errors



Index: grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grep/devel/grep.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- grep.spec	25 Jul 2009 01:25:35 -0000	1.77
+++ grep.spec	11 Aug 2009 12:41:52 -0000	1.78
@@ -3,7 +3,7 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.5.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
@@ -58,9 +58,11 @@ make check ||:
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
+exec >/dev/null 2>&1
 /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz || :
 
 %preun
+exec >/dev/null 2>&1
 if [ $1 = 0 ]; then
 	/sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/grep.info.gz || :
 fi
@@ -74,6 +76,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 11 2009 Lubomir Rintel <lkundrak at v3.sk> 2.5.3-6
+- Silence possible scriptlets errors
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atkac at fedoraproject.org  Tue Aug 11 12:44:32 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 11 Aug 2009 12:44:32 +0000 (UTC)
Subject: rpms/rsh/devel rsh.spec,1.51,1.52
Message-ID: <20090811124432.C865F11C00D7@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/rsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17147

Modified Files:
	rsh.spec 
Log Message:
- remove URL from rexec source, it is no longer publicly available



Index: rsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- rsh.spec	27 Jul 2009 03:15:23 -0000	1.51
+++ rsh.spec	11 Aug 2009 12:44:32 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -16,7 +16,7 @@ Source: ftp://ftp.uk.linux.org/pub/linux
 Source1: rexec.pam
 Source2: rlogin.pam
 Source3: rsh.pam
-Source4: http://www.tc.cornell.edu/~sadd/rexec-1.5.tar.gz
+Source4: rexec-1.5.tar.gz
 Source5: rsh-xinetd
 Source6: rlogin-xinetd
 Source7: rexec-xinetd
@@ -194,6 +194,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Aug 11 2009 Adam Tkac <atkac redhat com> 0.17-56
+- remove URL from rexec source, it is no longer publicly available
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-55
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From madko at fedoraproject.org  Tue Aug 11 12:45:08 2009
From: madko at fedoraproject.org (madko)
Date: Tue, 11 Aug 2009 12:45:08 +0000 (UTC)
Subject: rpms/purple-msn-pecan/devel .cvsignore, 1.3,
	1.4 purple-msn-pecan.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090811124508.0D5B211C00D7@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17245

Modified Files:
	.cvsignore purple-msn-pecan.spec sources 
Log Message:
Update to 0.1.0-rc1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Mar 2009 18:03:04 -0000	1.3
+++ .cvsignore	11 Aug 2009 12:45:07 -0000	1.4
@@ -1 +1 @@
-msn-pecan-0.0.18.tar.bz2
+msn-pecan-0.1.0-rc1.tar.bz2


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/purple-msn-pecan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- purple-msn-pecan.spec	26 Jul 2009 19:41:35 -0000	1.5
+++ purple-msn-pecan.spec	11 Aug 2009 12:45:07 -0000	1.6
@@ -1,14 +1,13 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
-Version:	0.0.18
-Release:	3%{?dist}
+Version:	0.1.0
+Release:	0.1.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
-Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
-Patch0:		purple-msn-pecan-0.0.18_ru-po.patch
+Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,8 +39,7 @@ Other features:
 
 
 %prep
-%setup -q -n %{realname}-%{version}
-%patch0 -p0 -b ru-po.rej
+%setup -q -n %{realname}-%{version}-rc1
 
 
 %build
@@ -67,11 +65,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f libmsn-pecan.lang
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING TODO README COPYRIGHT ChangeLog
+%doc AUTHORS COPYING TODO README pidgin-copyright ChangeLog
 %{_libdir}/purple-2/libmsn-pecan.so
 
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
+- Update to 0.1.0-rc1.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Mar 2009 18:03:05 -0000	1.3
+++ sources	11 Aug 2009 12:45:07 -0000	1.4
@@ -1 +1 @@
-8e8a6effbea87bad70610d14a01a4429  msn-pecan-0.0.18.tar.bz2
+67686d16ff1cb7410a374c231931512d  msn-pecan-0.1.0-rc1.tar.bz2



From varekova at fedoraproject.org  Tue Aug 11 12:47:55 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 11 Aug 2009 12:47:55 +0000 (UTC)
Subject: rpms/logwatch/F-11 logwatch-7.3.6-named5.patch, NONE,
	1.1 logwatch.spec, 1.113, 1.114
Message-ID: <20090811124755.86C6E11C00D7@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18064

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-named5.patch 
Log Message:
 - parse a few unmatched entries in named script (#513853)


logwatch-7.3.6-named5.patch:
 named |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.6-named5.patch ---
diff -up logwatch-7.3.6/scripts/services/named.pom logwatch-7.3.6/scripts/services/named
--- logwatch-7.3.6/scripts/services/named.pom	2009-08-11 09:42:27.000000000 +0200
+++ logwatch-7.3.6/scripts/services/named	2009-08-11 13:36:47.000000000 +0200
@@ -183,7 +183,14 @@ while (defined($ThisLine = <STDIN>)) {
       ($ThisLine =~ /.*: unexpected end of input/) or
       ($ThisLine =~ /too many timeouts resolving '.*' .*: disabling EDNS/) or
       ($ThisLine =~ /too many timeouts resolving '.*' .*: reducing the advertised EDNS UDP packet size to .* octets/) or
-      ($ThisLine =~ /reloading zones succeeded/)
+      ($ThisLine =~ /reloading zones succeeded/) or
+      ($ThisLine =~ /success resolving '.*' \(in '.*'?\) after disabling EDNS/) or
+      ($ThisLine =~ /success resolving '.*' \(in '.*'?\) after reducing the advertised EDNS UDP packet size to 512 octets/) or
+      ($ThisLine =~ /the working directory is not writable/) or
+      ($ThisLine =~ /using default UDP\/IPv[46] port range: \[[0-9]*, [0-9]*\]/) or
+      ($ThisLine =~ /adjusted limit on open files from [0-9]* to [0-9]*/) or
+      ($ThisLine =~ /using up to [0-9]* sockets/) or
+      ($ThisLine =~ /built with/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
       # Don't care about these...


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-11/logwatch.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- logwatch.spec	15 Jun 2009 09:18:21 -0000	1.113
+++ logwatch.spec	11 Aug 2009 12:47:55 -0000	1.114
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -52,6 +52,7 @@ Patch52: logwatch-7.3.6-smartd.patch
 Patch53: logwatch-7.3.6-sshd2.patch
 Patch54: logwatch-7.3.6-exim2.patch
 Patch55: logwatch-7.3.6-removeservice.patch
+Patch56: logwatch-7.3.6-named5.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,6 +112,7 @@ of the package on many systems.
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
+%patch56 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -222,6 +224,9 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-44
+- parse a few unmatched entries in named script (#513853)
+
 * Mon Jun 15 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-43
 - fix removeservice script - to decrease the number of.
   perl instances running simultaneously



From nphilipp at fedoraproject.org  Tue Aug 11 12:53:50 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 11 Aug 2009 12:53:50 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.78, 1.79 sources,
	1.91, 1.92 system-config-services.spec, 1.93, 1.94
Message-ID: <20090811125350.7E23111C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19087

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.34



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	14 Apr 2009 16:48:22 -0000	1.78
+++ .cvsignore	11 Aug 2009 12:53:49 -0000	1.79
@@ -1 +1 @@
-system-config-services-0.99.33.tar.bz2
+system-config-services-0.99.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	14 Apr 2009 16:48:22 -0000	1.91
+++ sources	11 Aug 2009 12:53:50 -0000	1.92
@@ -1 +1 @@
-84b42b577d558e84dbfb34da3b6f6430  system-config-services-0.99.33.tar.bz2
+f4726b434ec23571233c2b039be35529  system-config-services-0.99.34.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- system-config-services.spec	27 Jul 2009 05:25:35 -0000	1.93
+++ system-config-services.spec	11 Aug 2009 12:53:50 -0000	1.94
@@ -3,10 +3,10 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.33
-Release: 2%{?dist}
+Version: 0.99.34
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
 BuildArch: noarch
@@ -93,8 +93,15 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.33-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.34-1
+- avoid unnecessary recursions (#504964)
+- fix DeprecationWarning in dbus mechanism
+
+* Wed Jun 10 2009 Nils Philippsen <nils at redhat.com>
+- improve xinetd service description text (#441258)
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.33-1
 - pick up updated translations



From nphilipp at fedoraproject.org  Tue Aug 11 12:55:03 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 11 Aug 2009 12:55:03 +0000 (UTC)
Subject: rpms/system-config-services/F-11 .cvsignore, 1.78, 1.79 sources,
	1.91, 1.92 system-config-services.spec, 1.92, 1.93
Message-ID: <20090811125503.BD34511C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19386

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.34



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-11/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	14 Apr 2009 16:48:22 -0000	1.78
+++ .cvsignore	11 Aug 2009 12:55:03 -0000	1.79
@@ -1 +1 @@
-system-config-services-0.99.33.tar.bz2
+system-config-services-0.99.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-11/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	14 Apr 2009 16:48:22 -0000	1.91
+++ sources	11 Aug 2009 12:55:03 -0000	1.92
@@ -1 +1 @@
-84b42b577d558e84dbfb34da3b6f6430  system-config-services-0.99.33.tar.bz2
+f4726b434ec23571233c2b039be35529  system-config-services-0.99.34.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-11/system-config-services.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- system-config-services.spec	14 Apr 2009 16:48:22 -0000	1.92
+++ system-config-services.spec	11 Aug 2009 12:55:03 -0000	1.93
@@ -3,10 +3,10 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.33
+Version: 0.99.34
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
 BuildArch: noarch
@@ -93,6 +93,16 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.34-1
+- avoid unnecessary recursions (#504964)
+- fix DeprecationWarning in dbus mechanism
+
+* Wed Jun 10 2009 Nils Philippsen <nils at redhat.com>
+- improve xinetd service description text (#441258)
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
+
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.33-1
 - pick up updated translations
 



From rdieter at fedoraproject.org  Tue Aug 11 12:57:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 12:57:06 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.262,1.263 comps-f12.xml.in,1.78,1.79
Message-ID: <20090811125706.31D0F11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19790

Modified Files:
	comps-f10.xml.in comps-f12.xml.in 
Log Message:
rename kde-l10n-Bengali to kde-l10n-Bengali-India (per bug #493563)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- comps-f10.xml.in	5 Aug 2009 15:05:25 -0000	1.262
+++ comps-f10.xml.in	11 Aug 2009 12:57:05 -0000	1.263
@@ -3030,7 +3030,13 @@
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
-      <packagereq type="optional">kdeartwork-extras</packagereq>
+      <packagereq type="optional">kdeartwork-screensavers</packagereq>
+      <packagereq type="optional">kdeartwork-sounds</packagereq>
+      <packagereq type="optional">kdeartwork-wallpapers</packagereq>
+      <packagereq type="optional">kdebase-workspace-googlegadgets</packagereq>
+      <packagereq type="optional">kdebase-workspace-python-applet</packagereq>
+      <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
+      <packagereq type="optional">kdeclassic-icon-theme</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- comps-f12.xml.in	11 Aug 2009 09:42:29 -0000	1.78
+++ comps-f12.xml.in	11 Aug 2009 12:57:05 -0000	1.79
@@ -142,7 +142,7 @@
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali</packagereq>
+      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -455,7 +455,7 @@
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali</packagereq>
+      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>
       <packagereq type="default">iok</packagereq>



From atkac at fedoraproject.org  Tue Aug 11 12:58:18 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 11 Aug 2009 12:58:18 +0000 (UTC)
Subject: rpms/xdelta/devel xdelta.spec,1.30,1.31
Message-ID: <20090811125818.06D2F11C00D7@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/xdelta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20138

Modified Files:
	xdelta.spec 
Log Message:
- update source + project URLs



Index: xdelta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xdelta.spec	27 Jul 2009 07:42:24 -0000	1.30
+++ xdelta.spec	11 Aug 2009 12:58:17 -0000	1.31
@@ -1,15 +1,15 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
 Version: 1.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Development/Tools
-Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
+Source0: http://xdelta.googlecode.com/files/xdelta-%{version}.tar.gz
 Patch1: xdelta-1.1.3-aclocal.patch
 Patch3: xdelta-1.1.3-edsio.patch
 Patch4: xdelta-1.1.4-glib2.patch
 Patch6: xdelta-1.1.3-pkgconfig.patch
-Url: http://sourceforge.net/projects/xdelta/
+Url: http://xdelta.org/
 BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59, pkgconfig
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug 11 2009 Adam Tkac <atkac redhat com> 1.1.4-7
+- update source + project URLs
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Aug 11 12:58:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 12:58:50 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.144,1.145
Message-ID: <20090811125850.3662E11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20295

Modified Files:
	gvfs.spec 
Log Message:
Fix filelist for AFC backend


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- gvfs.spec	11 Aug 2009 09:11:04 -0000	1.144
+++ gvfs.spec	11 Aug 2009 12:58:49 -0000	1.145
@@ -288,7 +288,7 @@ update-desktop-database &> /dev/null ||:
 %{_libexecdir}/gvfsd-afc
 %{_datadir}/gvfs/mounts/afc.mount
 %{_libexecdir}/gvfs-afc-volume-monitor
-%{_datadir}/dbus-1/services/org.gtk.Private.AFCVolumeMonitor.service
+%{_datadir}/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog



From scop at fedoraproject.org  Tue Aug 11 11:54:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 11:54:26 +0000 (UTC)
Subject: rpms/hatools/devel .cvsignore, 1.2, 1.3 hatools.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090811115426.C3E0A11C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hatools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6363

Modified Files:
	.cvsignore hatools.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.00-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Feb 2009 15:35:25 -0000	1.2
+++ .cvsignore	11 Aug 2009 11:54:26 -0000	1.3
@@ -1 +1 @@
-hatools-2.00.tar.gz
+hatools-2.00.tar.bz2


Index: hatools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatools/devel/hatools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hatools.spec	25 Jul 2009 02:03:25 -0000	1.3
+++ hatools.spec	11 Aug 2009 11:54:26 -0000	1.4
@@ -1,12 +1,12 @@
 Name:		hatools
 Version:	2.00
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Improved shell scripting in High Availability environment
 
 Group:		System Environment/Base
 License:	GPLv2+
 URL:		http://fatalmind.com/software/hatools/
-Source0:	http://fatalmind.com/software/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://fatalmind.com/software/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.00-4
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Feb 2009 15:35:25 -0000	1.2
+++ sources	11 Aug 2009 11:54:26 -0000	1.3
@@ -1 +1 @@
-ba137a37f6725076c7d2c729cbccf4a5  hatools-2.00.tar.gz
+bd6776d8d8cf18d6ff38e229f1d5e52e  hatools-2.00.tar.bz2



From hadess at fedoraproject.org  Tue Aug 11 11:48:56 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 11:48:56 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel 61-gnome-bluetooth-rfkill.rules, NONE,
	1.1 gnome-bluetooth.spec, 1.86, 1.87
Message-ID: <20090811114856.A5C6211C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5135

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	61-gnome-bluetooth-rfkill.rules 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-4
- Add udev rules to access /dev/rfkill (#514798)



--- NEW FILE 61-gnome-bluetooth-rfkill.rules ---
# Get access to /dev/rfkill for users
# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
KERNEL=="rfkill", ENV{ACL_MANAGE}="1"


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- gnome-bluetooth.spec	11 Aug 2009 08:47:39 -0000	1.86
+++ gnome-bluetooth.spec	11 Aug 2009 11:48:56 -0000	1.87
@@ -1,12 +1,13 @@
 Name:		gnome-bluetooth
 Version:	2.27.9
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/GnomeBluetooth
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
+Source1:	61-gnome-bluetooth-rfkill.rules
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Patch0:		0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
@@ -87,6 +88,8 @@ desktop-file-install --vendor=""				\
 	--dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/	\
 	$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 
+install -m0644 -D %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
+
 # gnome-bluetooth2 is the name for the gettext domain,
 # gnome-bluetooth is the name in the docs
 %find_lang gnome-bluetooth2
@@ -177,6 +180,7 @@ fi
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-bluetooth/
 %{_mandir}/man1/*
+/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
 
 %files libs
 %defattr(-,root,root,-)
@@ -193,6 +197,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-4
+- Add udev rules to access /dev/rfkill (#514798)
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-3
 - Don't crash when exiting the wizard
 



From adrian at fedoraproject.org  Tue Aug 11 11:53:52 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 11 Aug 2009 11:53:52 +0000 (UTC)
Subject: rpms/wordpress/F-10 changeset_r11798.diff, NONE, 1.1 wordpress.spec,
	1.31, 1.32
Message-ID: <20090811115353.16C0A11C00D7@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6163

Modified Files:
	wordpress.spec 
Added Files:
	changeset_r11798.diff 
Log Message:
* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
- another security update to fix "Remote admin reset password":
  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


changeset_r11798.diff:
 wp-login.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE changeset_r11798.diff ---
Index: /branches/2.8/wp-login.php
===================================================================
--- /branches/2.8/wp-login.php (revision 11514)
+++ /branches/2.8/wp-login.php (revision 11798)
@@ -188,5 +188,5 @@
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) )
+	if ( empty( $key ) || is_array( $key ) )
 		return new WP_Error('invalid_key', __('Invalid key'));
 


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/wordpress.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wordpress.spec	5 Aug 2009 07:45:54 -0000	1.31
+++ wordpress.spec	11 Aug 2009 11:53:52 -0000	1.32
@@ -3,7 +3,7 @@ URL: http://www.wordpress.org
 Name: wordpress
 Version: 2.8.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,6 +11,7 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
+Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -18,6 +19,7 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
+%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
@@ -77,6 +79,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
+- another security update to fix "Remote admin reset password":
+  http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html
+
 * Mon Aug 03 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-1
 - updated to 2.8.3 for security fixes
 



From victorv at fedoraproject.org  Tue Aug 11 12:59:58 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Tue, 11 Aug 2009 12:59:58 +0000 (UTC)
Subject: rpms/ini4j/devel ini4j-0.4.1-build.xml, NONE, 1.1 .cvsignore, 1.2, 
	1.3 import.log, 1.1, 1.2 ini4j.spec, 1.4, 1.5 sources, 1.2,
	1.3 ini4j-0.3.2-pom.xml.patch, 1.1, NONE
Message-ID: <20090811125958.3DF8011C00D7@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/ini4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20186/devel

Modified Files:
	.cvsignore import.log ini4j.spec sources 
Added Files:
	ini4j-0.4.1-build.xml 
Removed Files:
	ini4j-0.3.2-pom.xml.patch 
Log Message:
Re-base to version 0.4.1. Ant is used instead of Maven to build software.



--- NEW FILE ini4j-0.4.1-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="build" name="ini4j">
  <description>
    Build script for [ini4j] library.
  </description>

<!-- config ============================================================== -->
  <!-- general project attributes -->
  <property name="artifactVersion" value="0.4.1"/>
  <property name="build.app.name" value="ini4j-${artifactVersion}"/>
  <!-- directory locations -->
  <property name="build.dst" value="${basedir}/build"/>
  <property name="build.src" value="${basedir}/src/"/>
  <property name="build.dist" value="${basedir}/dist"/>

  <property name="build.dst.classes" value="${build.dst}/classes"/>
  <property name="build.dst.doc"     value="${build.dst}/doc"/>

  <!-- development tools -->
  <property name="build.servlet.jar" value="/path/to/servlet.jar"/>
  <property name="build.jetty.jar" value="/path/to/jetty.jar"/>
  <!-- compiler options -->
  <property name="build.compile.debug" value="true"/>
  <property name="build.compile.deprecation" value="false"/>
  <property name="build.compile.optimize" value="true"/>
  <property name="build.compile.version" value="1.5"/>
  <property name="build.compile.lint" value="-Xlint:unchecked"/>

<!-- clean =============================================================== -->
<target name="clean" description="Delete old build directory">
    <delete dir="${build.dst}"/>
    <delete dir="${build.dist}"/>
</target>

<!-- prepare ============================================================= -->
<target name="prepare" description="Prepare build">
    <path id="build.classpath">
        <pathelement location="${build.dst.classes}"/>
        <pathelement path="${java.class.path}"/>                
        <pathelement location="${build.servlet.jar}"/>
        <pathelement location="${build.jetty.jar}"/>
    </path>

    <mkdir dir="${build.dst}"/>
    <mkdir dir="${build.dist}"/>
    <mkdir dir="${build.dst.doc}"/>
</target>

<!-- compile ============================================================= -->
<target name="compile" depends="prepare" description="Compile Java sources">
    <mkdir dir="${build.dst.classes}"/>

    <javac
        classpathref="build.classpath"
        debug="${build.compile.debug}"
        deprecation="${build.compile.deprecation}"
        optimize="${build.compile.optimize}"
        source="${build.compile.version}"
        destdir="${build.dst.classes}">        
        <src path="${build.src}"/>               
        <compilerarg value="${build.compile.lint}"/>
    </javac>

    <!-- copy resources -->
    <copy todir="${build.dst.classes}">
      <fileset dir="${build.src}" excludes="**/*.java **/*.html **/*.xml **/*.ini"/>
    </copy>  
</target>

<!-- javadoc ============================================================= -->
<target name="javadoc" depends="compile" description="Create Javadoc">
     <javadoc
        source="${build.compile.version}"
        linksource="yes"
        access="protected"
        locale="en_US"
        encoding="ISO-8859-1"
        docencoding="ISO-8859-1"
        noqualifier="java.*:javax.*:org.ini4j.*"
        destdir="${build.dst.doc}/api"
        windowtitle="[ini4j] API documentation">

        <fileset dir="${build.src}">
          <include name="**/*.java"/>
        </fileset>
        <doctitle>[ini4j] API documentation</doctitle>
        <header>&lt;b&gt;[ini4j]&lt;/b&gt;</header>
        <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
        <classpath refid="build.classpath"/>
    </javadoc>
</target>

<!-- build =============================================================== -->
<target name="build" depends="compile" description="Build jar distribution files">
  <jar destfile="${build.dist}/${build.app.name}.jar">
    <fileset dir="${build.dst.classes}" excludes="**/*Test* **/*Sample* **/*Run* **/META-INF/**" />
  </jar>
</target>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Sep 2008 22:27:49 -0000	1.2
+++ .cvsignore	11 Aug 2009 12:59:57 -0000	1.3
@@ -1 +1 @@
-ini4j-0.3.2-src.zip
+ini4j-0.4.1-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Sep 2008 22:27:49 -0000	1.1
+++ import.log	11 Aug 2009 12:59:57 -0000	1.2
@@ -1 +1,2 @@
 ini4j-0_3_2-4_fc10:HEAD:ini4j-0.3.2-4.fc10.src.rpm:1220480845
+ini4j-0_4_1-1_fc12:HEAD:ini4j-0.4.1-1.fc12.src.rpm:1249995867


Index: ini4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/ini4j.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ini4j.spec	25 Jul 2009 03:22:32 -0000	1.4
+++ ini4j.spec	11 Aug 2009 12:59:58 -0000	1.5
@@ -1,6 +1,12 @@
+# Prevent brp-java-repack-jars from being run.
+%global __jar_repack %{nil}
+
+%global servlet_jar %{_javadir}/servlet.jar
+%global jetty_jar %{_javadir}/jetty/jetty.jar
+
 Name:           ini4j
-Version:        0.3.2
-Release:        7%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Java API for handling files in Windows .ini format
 
 Group:          Development/Libraries
@@ -8,51 +14,21 @@ License:        ASL 2.0
 URL:            http://www.ini4j.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.zip
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:         %{name}-%{version}-pom.xml.patch
-
+Source2:        %{name}-%{version}-build.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-# Recommended by http://fedoraproject.org/wiki/Packaging/Java
+# See http://ini4j.sourceforge.net/dependencies.html
 BuildRequires:  jpackage-utils
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-release
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
-# Additionally defined in the pom.xml
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-antrun
-
-# See http://www.ini4j.org/dependencies.html
-# These dependencies are required to compile the application:
+BuildRequires:  ant
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  maven2 >= 2.0.4
-BuildRequires:  tomcat5 >= 5.5
 BuildRequires:  tomcat5-servlet-2.4-api >= 5.5
-# These dependencies are only required to compile unit tests for the application:
-# BuildRequires:  jetty >= 4.2.2
-# BuildRequires:  junit >= 3.8.2
-# BuildRequires:  easymock >= 2.3
-# BuildRequires:  easymockclassextension >= 2.3
-# BuildRequires:  cglib-nodep >= 2.1_3
-# These dependencies are only required to run unit tests for the application:
-# Requires:  jetty >= 4.2.2
-# Requires:  junit >= 3.8.2
-# Requires:  easymock >= 2.3
-# Requires:  easymockclassextension >= 2.3
-# Requires:  cglib-nodep >= 2.1_3
-# These dependencies should be provided by default when using the library:
-Requires:  tomcat5-servlet-2.4-api >= 5.5
+BuildRequires:  jetty >= 4.2.2
 
 Requires:       jpackage-utils
 Requires:       java >= 1:1.6.0
-
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
+Requires:       tomcat5-servlet-2.4-api >= 5.5
 
 %description
 The [ini4j] is a simple Java API for handling configuration files in Windows 
@@ -73,56 +49,36 @@ This package contains the API documentat
 %setup -q
 
 cp -a %{SOURCE1} ./LICENSE-2.0.txt
+cp -a %{SOURCE2} ./build.xml
 
 find . -type f \( -iname "*.jar" -o -iname "*.class" \) | xargs -t %{__rm} -f
 
-%patch0 -p1 -b .sav
-
 # remove test sources
 %{__rm} -rf src/test
 # remove site sources
 %{__rm} -rf src/site
 
-
 %build
 
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-%{__mkdir_p} $MAVEN_REPO_LOCAL
-
-mvn-jpp \
--Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-install javadoc:javadoc
+%ant -Dbuild.servlet.jar=%{servlet_jar} -Dbuild.jetty.jar=%(jetty_jar) build javadoc
 
 %install
 %{__rm} -rf %{buildroot}
 
 # JAR
 %{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%{__cp} -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar %{name}.jar)
 
 # Javadoc
 %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
-%{__cp} -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%{__install} -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-%{__install} -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
-
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+%{__cp} -rp build/doc/api/* %{buildroot}%{_javadocdir}/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %defattr(-,root,root,-)
-%{_datadir}/maven2/poms
-%{_mavendepmapfragdir}
 %{_javadir}/*
 %doc LICENSE-2.0.txt src/main/java/org/ini4j/package.html
 
@@ -132,35 +88,6 @@ install javadoc:javadoc
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Mar 02 2009 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-6
-- BR tomcat5, because tomcat-tomcat-parent.pom is required
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Aug 27 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-4
-- Versionless symbolic link to the jar is added
-- Redundant user-defined macro for the poms directory is removed
-- Description is formatted
-- The LICENSE file added
-
-* Thu Aug 21 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-3
-- Ability to switch on the alternative implementations is removed
-- The %%{__install} macro is used everywhere instead of the install command
-- All macroses reflecting a folders layout of the project are removed
-- Explicit scriptlet dependencies for /bin/sh are removed
-- Owning of /etc/maven/fragments/ini4j is removed
-
-* Fri Aug 15 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-2
-- Documentation added
-- Appropriate values of Group Tags are chosen from the official list
-- The /etc/maven/fragments/ini4j file is attributed as a config(noreplace)
-
-* Fri Jun 06 2008 Victor Vasilyev <victor.vasilyev at sun.com> 0.3.2-1
-- Initial version.
-  The spec provides target jar and javadoc, but 
-  it doesn't provide tests and site that are 
-  also defined in the original project.
+* Sat Aug 08 2009 Victor Vasilyev <victor.vasilyev at sun.com> 0.4.1-1
+- Re-base for the version 0.4.1
+- Ant instead of Maven


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Sep 2008 22:27:49 -0000	1.2
+++ sources	11 Aug 2009 12:59:58 -0000	1.3
@@ -1 +1 @@
-2c499f245b1668b51dd09e894f62b484  ini4j-0.3.2-src.zip
+73f7c4a5f010d5b968425b8415132eb1  ini4j-0.4.1-src.zip


--- ini4j-0.3.2-pom.xml.patch DELETED ---



From veillard at fedoraproject.org  Tue Aug 11 13:02:03 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 11 Aug 2009 13:02:03 +0000 (UTC)
Subject: rpms/xmlsec1/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xmlsec1.spec, 1.35, 1.36
Message-ID: <20090811130203.D78B611C00D7@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/xmlsec1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20934

Modified Files:
	.cvsignore sources xmlsec1.spec 
Log Message:
update to new upstream release 1.2.12
includes fix for CVE-2009-0217
cleanup spec file
daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Jul 2008 12:30:22 -0000	1.9
+++ .cvsignore	11 Aug 2009 13:02:03 -0000	1.10
@@ -3,3 +3,4 @@ xmlsec1-1.2.7.tar.gz
 xmlsec1-1.2.8.tar.gz
 xmlsec1-1.2.9.tar.gz
 xmlsec1-1.2.11.tar.gz
+xmlsec1-1.2.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Jul 2008 12:30:22 -0000	1.9
+++ sources	11 Aug 2009 13:02:03 -0000	1.10
@@ -1 +1 @@
-5652d44eec1375a399a6c61f5f6091f1  xmlsec1-1.2.11.tar.gz
+195d042623bcc2e1668ab8370de6dc2a  xmlsec1-1.2.12.tar.gz


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xmlsec1.spec	27 Jul 2009 08:12:43 -0000	1.35
+++ xmlsec1.spec	11 Aug 2009 13:02:03 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
-Version: 1.2.11
-Release: 4
+Version: 1.2.12
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -22,7 +22,7 @@ standards "XML Digital Signature" and "X
 %package devel
 Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support.
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl-devel >= 0.9.6
@@ -36,7 +36,7 @@ Signatures and XML Encryption support.
 %package openssl
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 Requires: openssl >= 0.9.6
@@ -55,9 +55,9 @@ for the xmlsec library
 %package openssl-devel
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-openssl = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-openssl = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl >= 0.9.6
@@ -69,7 +69,7 @@ Libraries, includes, etc. for developing
 %package gnutls
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 Requires: libgcrypt >= 1.2.0
@@ -90,9 +90,9 @@ for the xmlsec library
 %package gnutls-devel
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-openssl = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-openssl = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: libgcrypt >= 1.2.0
@@ -106,7 +106,7 @@ Libraries, includes, etc. for developing
 %package nss
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.4.24
 Requires: libxslt >= 1.0.20
 Requires: nss >= 3.2
@@ -121,9 +121,9 @@ for the xmlsec library
 %package nss-devel
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-nss = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-nss = %{version}-%{release}
 Requires: libxml2-devel >= 2.4.24
 Requires: libxslt-devel >= 1.0.20
 Requires: nss-devel >= 3.2
@@ -137,11 +137,6 @@ Libraries, includes, etc. for developing
 
 %build
 %configure
-#
-# Note: it seems that this may break on older version of Red Hat,
-#       and that replacing the following line with just "make" can
-#       fix the problem
-#
 make
 
 # positively ugly but only sane way to get around #192756
@@ -151,11 +146,10 @@ sed 's+/lib64+/$archlib+g' < xmlsec1-con
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/include/xmlsec1
-mkdir -p $RPM_BUILD_ROOT/usr/lib
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 
 %makeinstall
-#make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -238,6 +232,11 @@ rm -fr %{buildroot}
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Tue Aug 11 2009 Daniel Veillard <veillard at redhat.com> - 1.2.12-1
+- update to new upstream release 1.2.12
+- includes fix for CVE-2009-0217
+- cleanup spec file
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Tue Aug 11 12:55:50 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 11 Aug 2009 12:55:50 +0000 (UTC)
Subject: rpms/system-config-services/F-10 .cvsignore, 1.74, 1.75 sources,
	1.87, 1.88 system-config-services.spec, 1.88, 1.89
Message-ID: <20090811125550.84A7011C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19558

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.34



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-10/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	20 Nov 2008 10:35:42 -0000	1.74
+++ .cvsignore	11 Aug 2009 12:55:50 -0000	1.75
@@ -1 +1 @@
-system-config-services-0.99.28.tar.bz2
+system-config-services-0.99.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-10/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	20 Nov 2008 10:35:42 -0000	1.87
+++ sources	11 Aug 2009 12:55:50 -0000	1.88
@@ -1 +1 @@
-2cf3515e3590d40f167fc01ef335354a  system-config-services-0.99.28.tar.bz2
+f4726b434ec23571233c2b039be35529  system-config-services-0.99.34.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-10/system-config-services.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- system-config-services.spec	10 Dec 2008 13:53:40 -0000	1.88
+++ system-config-services.spec	11 Aug 2009 12:55:50 -0000	1.89
@@ -1,41 +1,22 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
-# Command line configurables
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
-%bcond_without rarian_compat
-%else
-%bcond_with rarian_compat
-%endif
-
-Summary: system-config-services is an initscript and xinetd configuration utility
+Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.28
-Release: 3%{?dist}
-URL: http://fedoraproject.org/wiki/SystemConfig/services
-# We are upstream, thus the source is only available from within this source
-# package.
-Source0: %{name}-%{version}.tar.bz2
-Patch0: system-config-services-0.99.28-dbus.patch
+Version: 0.99.34
+Release: 1%{?dist}
+URL: http://fedorahosted.org/%{name}
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
 BuildRequires: python-devel
+BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: sed
 BuildRequires: desktop-file-utils
-BuildRequires: perl(XML::Parser)
-BuildRequires: gettext
-BuildRequires: gnome-doc-utils
-BuildRequires: docbook-dtds
-%if %{with rarian_compat}
-BuildRequires: rarian-compat
-%else
-BuildRequires: scrollkeeper
-%endif
 Requires: chkconfig
 Requires: gamin-python
 Requires: hicolor-icon-theme
@@ -47,9 +28,15 @@ Requires: dbus-python
 Requires: python-slip >= 0.1.11
 Requires: python-slip-dbus >= 0.1.15
 Requires: python-slip-gtk
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: PolicyKit-authentication-agent
+%else
 Requires: PolicyKit-gnome
+%endif
 Obsoletes: serviceconf <= 0.8.1
 Obsoletes: redhat-config-services <= 0.8.5
+Obsoletes: system-config-services < 0.99.29
+Conflicts: system-config-services < 0.99.29
 
 %description
 system-config-services is a utility which allows you to configure which services
@@ -57,7 +44,6 @@ should be enabled on your machine.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus
 
 %build
 make %{?_smp_mflags}
@@ -91,8 +77,6 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%doc %{_datadir}/omf/system-config-services
-%doc %{_datadir}/gnome/help/system-config-services
 %{_sbindir}/*
 %{_bindir}/*
 %{_datadir}/applications/system-config-services.desktop
@@ -109,12 +93,38 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
-* Wed Dec 10 2008 Nils Philippsen <nils at redhat.com> - 0.99.28-3
-- allow root to send dbus signals (#475203)
+* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.34-1
+- avoid unnecessary recursions (#504964)
+- fix DeprecationWarning in dbus mechanism
 
-* Tue Dec 09 2008 Nils Philippsen <nils at redhat.com> - 0.99.28-2
+* Wed Jun 10 2009 Nils Philippsen <nils at redhat.com>
+- improve xinetd service description text (#441258)
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
+
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 0.99.33-1
+- pick up updated translations
+
+* Mon Mar 01 2009 Nils Philippsen <nils at redhat.com> - 0.99.32-1
+- require PolicyKit-authentication-agent from F-11 on (#487200)
+
+* Thu Feb 19 2009 Nils Philippsen <nils at redhat.com> - 0.99.31-1
+- don't traceback on chkconfig errors (#467871)
+
+* Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> - 0.99.30-1
+- fix typo in Source0 URL
+
+* Tue Dec 09 2008 Nils Philippsen <nils at redhat.com>
 - allow anyone to invoke dbus methods (#475203)
 
+* Fri Nov 28 2008 Nils Philippsen <nils at redhat.com> - 0.99.29-1
+- split off documentation
+- remove obsolete build requirement perl(XML::Parser)
+
+* Mon Nov 24 2008 Nils Philippsen <nils at redhat.com>
+- improve summary
+
 * Thu Nov 20 2008 Nils Philippsen <nils at redhat.com> - 0.99.28-1
 - improve fixing runlevels hookable set updates
 - pick up updated translations



From mitr at fedoraproject.org  Tue Aug 11 13:07:33 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 11 Aug 2009 13:07:33 +0000 (UTC)
Subject: rpms/system-config-audit/devel import.log, NONE,
	1.1 system-config-audit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090811130733.B68E611C00D7@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-serv22674/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log system-config-audit.spec 
Log Message:
Import system-config-audit



--- NEW FILE import.log ---
system-config-audit-0_4_11-2:HEAD:system-config-audit-0.4.11-2.src.rpm:1249995963


--- NEW FILE system-config-audit.spec ---
Summary: Utility for editing audit configuration
Name: system-config-audit
Version: 0.4.11
Release: 2
License: GPLv2
Group: Applications/System
URL: https://fedorahosted.org/system-config-audit/
Source0: https://fedorahosted.org/releases/s/y/system-config-audit/system-config-audit-%{version}.tar.bz2
Requires: pygtk2-libglade, usermode, usermode-gtk
BuildRequires: audit-libs-devel, desktop-file-utils, gettext, intltool
BuildRequires: python-devel

%description
This package provides a GUI that allows the user to configure the Linux
audit subsystem.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
make install-fedora DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-validate \
	$RPM_BUILD_ROOT/%{_datadir}/applications/system-config-audit.desktop

%find_lang system-config-audit

%clean
rm -rf $RPM_BUILD_ROOT

%files -f system-config-audit.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/system-config-audit
%{_datadir}/applications/system-config-audit.desktop
%{_datadir}/system-config-audit
%{_libexecdir}/system-config-audit-server-real
%{_libexecdir}/system-config-audit-server
%config(noreplace) %{_sysconfdir}/pam.d/system-config-audit-server
%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server

%changelog
* Thu Jul 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.11-2
- Expand %%description.

* Wed Jul 29 2009 Miloslav Trma? <mitr at volny.cz> - 0.4.11-1
- Separate from audit.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:03:40 -0000	1.1
+++ .cvsignore	11 Aug 2009 13:07:33 -0000	1.2
@@ -0,0 +1 @@
+system-config-audit-0.4.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:03:40 -0000	1.1
+++ sources	11 Aug 2009 13:07:33 -0000	1.2
@@ -0,0 +1 @@
+2f47c6549b6adee06126243ec2162cb9  system-config-audit-0.4.11.tar.bz2



From pbrobinson at fedoraproject.org  Tue Aug 11 13:10:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 13:10:11 +0000 (UTC)
Subject: rpms/libiphone/F-11 .cvsignore, 1.5, 1.6 libiphone.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090811131011.5446011C048B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23285

Modified Files:
	.cvsignore libiphone.spec sources 
Log Message:
- Update to 0.9.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 May 2009 09:20:51 -0000	1.5
+++ .cvsignore	11 Aug 2009 13:10:10 -0000	1.6
@@ -1 +1 @@
-libiphone-0.9.1.tar.bz2
+libiphone-0.9.3.tar.bz2


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-11/libiphone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libiphone.spec	13 May 2009 09:20:51 -0000	1.12
+++ libiphone.spec	11 Aug 2009 13:10:11 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libiphone
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -20,6 +20,7 @@ BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: python-devel
 BuildRequires: swig
+BuildRequires: usbmuxd-devel
 
 %description
 libiphone is a library for connecting to Apple's iPhone or iPod touch devices
@@ -47,15 +48,21 @@ Python bindings for libiphone.
 
 %build
 %configure --disable-static
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libiphone.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -64,9 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LESSER README
+%{_bindir}/iphone*
 %{_libdir}/libiphone.so.0
 %{_libdir}/libiphone.so.0.0.0
-%{_sysconfdir}/udev/rules.d/89-libiphone.rules
 %{_datadir}/hal/fdi/information/20thirdparty/31-apple-mobile-device.fdi
 
 %files devel
@@ -80,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libiphone/
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
+- Update to 0.9.3 release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.1-2
 - Add new build reqs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 May 2009 09:20:51 -0000	1.6
+++ sources	11 Aug 2009 13:10:11 -0000	1.7
@@ -1 +1 @@
-862c7763fc47593c473293ae18a80fb2  libiphone-0.9.1.tar.bz2
+ce729c31b6b760dac94cbf8f84e09667  libiphone-0.9.3.tar.bz2



From mitr at fedoraproject.org  Tue Aug 11 13:11:01 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Tue, 11 Aug 2009 13:11:01 +0000 (UTC)
Subject: rpms/system-config-audit/devel import.log,1.1,NONE
Message-ID: <20090811131101.DF8C511C00D7@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-serv23497

Removed Files:
	import.log 
Log Message:
Remove import.log



--- import.log DELETED ---



From bruno at fedoraproject.org  Tue Aug 11 13:11:17 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Tue, 11 Aug 2009 13:11:17 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.263,1.264 comps-f11.xml.in,1.281,1.282
Message-ID: <20090811131117.984B711C00D7@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23209

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
Add new package, colossus, to games group for F10 and F11.
colossus has just been pushed to updates-testing on F10 and F11.




Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- comps-f10.xml.in	11 Aug 2009 12:57:05 -0000	1.263
+++ comps-f10.xml.in	11 Aug 2009 13:11:16 -0000	1.264
@@ -1691,6 +1691,7 @@
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">clonekeen</packagereq>
       <packagereq type="optional">coco-coq</packagereq>
+      <packagereq type="optional">colossus</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
       <packagereq type="optional">CriticalMass</packagereq>
       <packagereq type="optional">crossfire</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- comps-f11.xml.in	6 Aug 2009 21:41:32 -0000	1.281
+++ comps-f11.xml.in	11 Aug 2009 13:11:17 -0000	1.282
@@ -2032,6 +2032,7 @@
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">clonekeen</packagereq>
       <packagereq type="optional">coco-coq</packagereq>
+      <packagereq type="optional">colossus</packagereq>
       <packagereq type="optional">crack-attack</packagereq>
       <packagereq type="optional">CriticalMass</packagereq>
       <packagereq type="optional">crossfire</packagereq>



From veillard at fedoraproject.org  Tue Aug 11 13:11:12 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 11 Aug 2009 13:11:12 +0000 (UTC)
Subject: rpms/xmlsec1/F-11 sources,1.9,1.10 xmlsec1.spec,1.34,1.35
Message-ID: <20090811131112.2A7AA11C00D7@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/xmlsec1/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23508

Modified Files:
	sources xmlsec1.spec 
Log Message:
update to new upstream release 1.2.12
includes fix for CVE-2009-0217
cleanup spec file
Daniel



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Jul 2008 12:30:22 -0000	1.9
+++ sources	11 Aug 2009 13:11:11 -0000	1.10
@@ -1 +1 @@
-5652d44eec1375a399a6c61f5f6091f1  xmlsec1-1.2.11.tar.gz
+195d042623bcc2e1668ab8370de6dc2a  xmlsec1-1.2.12.tar.gz


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/F-11/xmlsec1.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xmlsec1.spec	26 Feb 2009 10:05:24 -0000	1.34
+++ xmlsec1.spec	11 Aug 2009 13:11:12 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
-Version: 1.2.11
-Release: 3
+Version: 1.2.12
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -22,7 +22,7 @@ standards "XML Digital Signature" and "X
 %package devel
 Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support.
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl-devel >= 0.9.6
@@ -36,7 +36,7 @@ Signatures and XML Encryption support.
 %package openssl
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 Requires: openssl >= 0.9.6
@@ -55,9 +55,9 @@ for the xmlsec library
 %package openssl-devel
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-openssl = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-openssl = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl >= 0.9.6
@@ -69,7 +69,7 @@ Libraries, includes, etc. for developing
 %package gnutls
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 Requires: libgcrypt >= 1.2.0
@@ -90,9 +90,9 @@ for the xmlsec library
 %package gnutls-devel
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-openssl = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-openssl = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: libgcrypt >= 1.2.0
@@ -106,7 +106,7 @@ Libraries, includes, etc. for developing
 %package nss
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.4.24
 Requires: libxslt >= 1.0.20
 Requires: nss >= 3.2
@@ -121,9 +121,9 @@ for the xmlsec library
 %package nss-devel
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-nss = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-nss = %{version}-%{release}
 Requires: libxml2-devel >= 2.4.24
 Requires: libxslt-devel >= 1.0.20
 Requires: nss-devel >= 3.2
@@ -137,11 +137,6 @@ Libraries, includes, etc. for developing
 
 %build
 %configure
-#
-# Note: it seems that this may break on older version of Red Hat,
-#       and that replacing the following line with just "make" can
-#       fix the problem
-#
 make
 
 # positively ugly but only sane way to get around #192756
@@ -151,11 +146,10 @@ sed 's+/lib64+/$archlib+g' < xmlsec1-con
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/include/xmlsec1
-mkdir -p $RPM_BUILD_ROOT/usr/lib
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 
 %makeinstall
-#make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -238,6 +232,11 @@ rm -fr %{buildroot}
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Tue Aug 11 2009 Daniel Veillard <veillard at redhat.com> - 1.2.12-1
+- update to new upstream release 1.2.12
+- includes fix for CVE-2009-0217
+- cleanup spec file
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Tue Aug 11 13:12:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 13:12:31 +0000 (UTC)
Subject: rpms/libiphone/F-10 .cvsignore, 1.2, 1.3 libiphone.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090811131231.00C6111C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23850

Modified Files:
	.cvsignore libiphone.spec sources 
Log Message:
- Update to 0.9.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 09:19:45 -0000	1.2
+++ .cvsignore	11 Aug 2009 13:12:30 -0000	1.3
@@ -1 +1 @@
-libiphone-0.9.1.tar.bz2
+libiphone-0.9.3.tar.bz2


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/libiphone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libiphone.spec	13 May 2009 09:19:45 -0000	1.6
+++ libiphone.spec	11 Aug 2009 13:12:30 -0000	1.7
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libiphone
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -20,6 +20,7 @@ BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: python-devel
 BuildRequires: swig
+BuildRequires: usbmuxd-devel
 
 %description
 libiphone is a library for connecting to Apple's iPhone or iPod touch devices
@@ -47,15 +48,21 @@ Python bindings for libiphone.
 
 %build
 %configure --disable-static
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libiphone.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -64,9 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LESSER README
+%{_bindir}/iphone*
 %{_libdir}/libiphone.so.0
 %{_libdir}/libiphone.so.0.0.0
-%{_sysconfdir}/udev/rules.d/89-libiphone.rules
 %{_datadir}/hal/fdi/information/20thirdparty/31-apple-mobile-device.fdi
 
 %files devel
@@ -80,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libiphone/
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
+- Update to 0.9.3 release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.1-2
 - Add new build reqs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 May 2009 09:19:46 -0000	1.5
+++ sources	11 Aug 2009 13:12:30 -0000	1.6
@@ -1 +1 @@
-862c7763fc47593c473293ae18a80fb2  libiphone-0.9.1.tar.bz2
+ce729c31b6b760dac94cbf8f84e09667  libiphone-0.9.3.tar.bz2



From veillard at fedoraproject.org  Tue Aug 11 13:13:45 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue, 11 Aug 2009 13:13:45 +0000 (UTC)
Subject: rpms/xmlsec1/F-10 sources,1.9,1.10 xmlsec1.spec,1.32,1.33
Message-ID: <20090811131345.B53C811C00D7@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/xmlsec1/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24094

Modified Files:
	sources xmlsec1.spec 
Log Message:
update to new upstream release 1.2.12
includes fix for CVE-2009-0217
cleanup spec file
Daniel



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Jul 2008 12:30:22 -0000	1.9
+++ sources	11 Aug 2009 13:13:45 -0000	1.10
@@ -1 +1 @@
-5652d44eec1375a399a6c61f5f6091f1  xmlsec1-1.2.11.tar.gz
+195d042623bcc2e1668ab8370de6dc2a  xmlsec1-1.2.12.tar.gz


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/F-10/xmlsec1.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- xmlsec1.spec	11 Jul 2008 12:38:57 -0000	1.32
+++ xmlsec1.spec	11 Aug 2009 13:13:45 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
-Version: 1.2.11
-Release: 1
+Version: 1.2.12
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -22,7 +22,7 @@ standards "XML Digital Signature" and "X
 %package devel
 Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support.
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl-devel >= 0.9.6
@@ -36,7 +36,7 @@ Signatures and XML Encryption support.
 %package openssl
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 Requires: openssl >= 0.9.6
@@ -55,9 +55,9 @@ for the xmlsec library
 %package openssl-devel
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-openssl = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-openssl = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl >= 0.9.6
@@ -69,7 +69,7 @@ Libraries, includes, etc. for developing
 %package gnutls
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 Requires: libgcrypt >= 1.2.0
@@ -90,9 +90,9 @@ for the xmlsec library
 %package gnutls-devel
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-openssl = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-openssl = %{version}-%{release}
 Requires: libxml2-devel >= 2.6.0
 Requires: libxslt-devel >= 1.1.0
 Requires: libgcrypt >= 1.2.0
@@ -106,7 +106,7 @@ Libraries, includes, etc. for developing
 %package nss
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
+Requires: xmlsec1 = %{version}-%{release}
 Requires: libxml2 >= 2.4.24
 Requires: libxslt >= 1.0.20
 Requires: nss >= 3.2
@@ -121,9 +121,9 @@ for the xmlsec library
 %package nss-devel
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}
-Requires: xmlsec1-devel = %{version}
-Requires: xmlsec1-nss = %{version}
+Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-nss = %{version}-%{release}
 Requires: libxml2-devel >= 2.4.24
 Requires: libxslt-devel >= 1.0.20
 Requires: nss-devel >= 3.2
@@ -137,11 +137,6 @@ Libraries, includes, etc. for developing
 
 %build
 %configure
-#
-# Note: it seems that this may break on older version of Red Hat,
-#       and that replacing the following line with just "make" can
-#       fix the problem
-#
 make
 
 # positively ugly but only sane way to get around #192756
@@ -151,11 +146,10 @@ sed 's+/lib64+/$archlib+g' < xmlsec1-con
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/include/xmlsec1
-mkdir -p $RPM_BUILD_ROOT/usr/lib
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 
 %makeinstall
-#make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -238,6 +232,11 @@ rm -fr %{buildroot}
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Tue Aug 11 2009 Daniel Veillard <veillard at redhat.com> - 1.2.12-1
+- update to new upstream release 1.2.12
+- includes fix for CVE-2009-0217
+- cleanup spec file
+
 * Fri Jul 11 2008 Daniel Veillard <veillard at redhat.com> - 1.2.11-1
 - update to new upstream release 1.2.11
 - rebuild for gnutls update



From victorv at fedoraproject.org  Tue Aug 11 13:14:49 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Tue, 11 Aug 2009 13:14:49 +0000 (UTC)
Subject: rpms/ini4j/devel import.log,1.2,1.3 ini4j.spec,1.5,1.6
Message-ID: <20090811131449.7BEC311C00D7@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/ini4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24345/devel

Modified Files:
	import.log ini4j.spec 
Log Message:
Syntax is corrected



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Aug 2009 12:59:57 -0000	1.2
+++ import.log	11 Aug 2009 13:14:48 -0000	1.3
@@ -1,2 +1,3 @@
 ini4j-0_3_2-4_fc10:HEAD:ini4j-0.3.2-4.fc10.src.rpm:1220480845
 ini4j-0_4_1-1_fc12:HEAD:ini4j-0.4.1-1.fc12.src.rpm:1249995867
+ini4j-0_4_1-2_fc12:HEAD:ini4j-0.4.1-2.fc12.src.rpm:1249996819


Index: ini4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ini4j/devel/ini4j.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ini4j.spec	11 Aug 2009 12:59:58 -0000	1.5
+++ ini4j.spec	11 Aug 2009 13:14:49 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           ini4j
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java API for handling files in Windows .ini format
 
 Group:          Development/Libraries
@@ -60,7 +60,7 @@ find . -type f \( -iname "*.jar" -o -ina
 
 %build
 
-%ant -Dbuild.servlet.jar=%{servlet_jar} -Dbuild.jetty.jar=%(jetty_jar) build javadoc
+%ant -Dbuild.servlet.jar=%{servlet_jar} -Dbuild.jetty.jar=%{jetty_jar} build javadoc
 
 %install
 %{__rm} -rf %{buildroot}
@@ -88,6 +88,8 @@ find . -type f \( -iname "*.jar" -o -ina
 
 
 %changelog
+* Tue Aug 11 2009 Victor Vasilyev <victor.vasilyev at sun.com> 0.4.1-2
+- Syntax is corrected
 * Sat Aug 08 2009 Victor Vasilyev <victor.vasilyev at sun.com> 0.4.1-1
 - Re-base for the version 0.4.1
 - Ant instead of Maven



From ultrafredde at fedoraproject.org  Tue Aug 11 13:16:47 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Tue, 11 Aug 2009 13:16:47 +0000 (UTC)
Subject: rpms/task/F-10 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 sources,
	1.4, 1.5 task.spec, 1.3, 1.4
Message-ID: <20090811131647.8C02111C00D7@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24839/F-10

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Jun 2009 12:09:20 -0000	1.3
+++ .cvsignore	11 Aug 2009 13:16:46 -0000	1.4
@@ -1 +1 @@
-task-1.7.1.tar.gz
+task-1.8.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Jun 2009 16:15:21 -0000	1.3
+++ import.log	11 Aug 2009 13:16:47 -0000	1.4
@@ -1,3 +1,4 @@
 task-1_7_0-2_fc10:F-10:task-1.7.0-2.fc10.src.rpm:1243416007
 task-1_7_1-1_fc10:F-10:task-1.7.1-1.fc10.src.rpm:1244549329
 task-1_7_1-2_fc10:F-10:task-1.7.1-2.fc10.src.rpm:1244564097
+task-1_8_0-1_fc10:F-10:task-1.8.0-1.fc10.src.rpm:1249996577


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Jun 2009 16:15:22 -0000	1.4
+++ sources	11 Aug 2009 13:16:47 -0000	1.5
@@ -1 +1 @@
-393baac71ab282d567e1fe4a66cae5bb  task-1.7.1.tar.gz
+a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/task.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- task.spec	9 Jun 2009 16:15:22 -0000	1.3
+++ task.spec	11 Aug 2009 13:16:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           task
-Version:        1.7.1
-Release:        2%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -12,13 +12,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ncurses-devel
 
 %description
-Task is a command-line to do list manager. It is
-scope-limited to GTD functionality and features:
-tags, colorful tabular output, reports and graphs,
-lots of commands, low-level api, abbreviations for
-all commands and options, multiuser file locking,
-recurring tasks. Task is based on ideas presented
-in the todo.sh script found on: http://todotxt.org
+Task is a command-line to do list manager. It has
+support for GTD functionality and includes the
+following features: tags, colorful tabular output,
+reports and graphs, lots of manipulation commands,
+low-level API, abbreviations for all commands and
+options, multiuser file locking, recurring tasks.
 
 %prep
 %setup -q
@@ -32,7 +31,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -m 644 -T scripts/bash/task_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,13 +40,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh
+%doc AUTHORS ChangeLog COPYING NEWS README scripts i18n
 %{_bindir}/task
 %{_mandir}/man1/task.1.gz
 %{_mandir}/man5/taskrc.5.gz
+%{_mandir}/man5/task-tutorial.5.gz
+%config(noreplace) %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
+  Intial RPM for task release 1.8.0
+* Mon Jul 13 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta3-1
+  Intial RPM for task beta release 1.8.0.beta3
+* Wed Jul 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta2-1
+  Intial RPM for task beta release 1.8.0.beta2
+* 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.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1



From hadess at fedoraproject.org  Tue Aug 11 13:17:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 13:17:10 +0000 (UTC)
Subject: rpms/bluez/devel 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch,
	NONE, 1.1 0002-Mark-Bluetooth-printers-as-being-local.patch, NONE,
	1.1 bluez.spec, 1.88, 1.89
Message-ID: <20090811131710.AC3FC11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24987

Modified Files:
	bluez.spec 
Added Files:
	0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch 
	0002-Mark-Bluetooth-printers-as-being-local.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.47-5
- More upstream CUPS fixes


0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch:
 bluetooth.conf |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch ---
>From b2d24735492e6a71f3441720940ac55c33fa0838 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter at gmail.com>
Date: Tue, 11 Aug 2009 14:04:05 +0100
Subject: [PATCH 1/2] Allow lp (CUPS) to talk to bluetoothd

CUPS runs its backend helpers as the "lp" user, so we should
allow CUPS to talk to bluetoothd to enumerate printers.
---
 src/bluetooth.conf |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/bluetooth.conf b/src/bluetooth.conf
index c047623..315009c 100644
--- a/src/bluetooth.conf
+++ b/src/bluetooth.conf
@@ -17,6 +17,12 @@
     <allow send_destination="org.bluez"/>
   </policy>
 
+  <!-- allow users of lp group (printing subsystem) to 
+       communicate with bluetoothd -->
+  <policy group="lp">
+    <allow send_destination="org.bluez"/>
+  </policy>
+
   <policy context="default">
     <deny send_destination="org.bluez"/>
   </policy>
-- 
1.6.2.5


0002-Mark-Bluetooth-printers-as-being-local.patch:
 main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0002-Mark-Bluetooth-printers-as-being-local.patch ---
>From d96004d65132a7934308ded8010c5f819013157a Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter at gmail.com>
Date: Tue, 11 Aug 2009 14:06:59 +0100
Subject: [PATCH 2/2] Mark Bluetooth printers as being local

For discovery purposes. Also add a better label for the printer,
and append "(Bluetooth") to the "unique" name.
---
 cups/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index ba9864f..bb15c9c 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -226,7 +226,7 @@ static void print_printer_details(const char *name, const char *bdaddr, const ch
 		 bdaddr[9], bdaddr[10],
 		 bdaddr[12], bdaddr[13],
 		 bdaddr[15], bdaddr[16]);
-	printf("network %s \"Unknown\" \"%s (Bluetooth)\"", uri, escaped);
+	printf("direct %s \"%s\" \"%s (Bluetooth)\"", uri, escaped, escaped);
 	if (id != NULL)
 		printf(" \"%s\"\n", id);
 	else
-- 
1.6.2.5



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- bluez.spec	11 Aug 2009 11:39:34 -0000	1.88
+++ bluez.spec	11 Aug 2009 13:17:10 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.47
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
@@ -23,8 +23,12 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
 Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3108
 Patch6: 0001-Don-t-abort-cups-backend-on-property-change.patch
 Patch7: 0002-Actually-read-the-CreateDevice-reply.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3106/focus=3114
+Patch8: 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch
+Patch9: 0002-Mark-Bluetooth-printers-as-being-local.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -133,6 +137,8 @@ This includes hidd, dund and pand.
 %patch5 -p1 -b .cable-pairing
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 libtoolize -f -c
@@ -272,6 +278,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.47-5
+- More upstream CUPS fixes
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.47-4
 - Fix cups discovery the first time we discover a device
 



From pbrobinson at fedoraproject.org  Tue Aug 11 13:19:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 13:19:33 +0000 (UTC)
Subject: rpms/ifuse/F-11 .cvsignore, 1.4, 1.5 ifuse.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090811131933.47C2611C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25484

Modified Files:
	.cvsignore ifuse.spec sources 
Log Message:
- Update to 0.9.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 May 2009 09:28:23 -0000	1.4
+++ .cvsignore	11 Aug 2009 13:19:32 -0000	1.5
@@ -1 +1 @@
-ifuse-0.9.1.tar.bz2
+ifuse-0.9.3.tar.bz2


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-11/ifuse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ifuse.spec	13 May 2009 09:28:23 -0000	1.4
+++ ifuse.spec	11 Aug 2009 13:19:33 -0000	1.5
@@ -1,5 +1,5 @@
 Name:          ifuse
-Version:       0.9.1
+Version:       0.9.3
 Release:       1%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
@@ -38,6 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
+- Update to 0.9.3 release
+
+* 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
+
 * Tue May 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.1-1
 - Update to official 0.9.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 May 2009 09:28:23 -0000	1.4
+++ sources	11 Aug 2009 13:19:33 -0000	1.5
@@ -1 +1 @@
-a00d8e6e20baaf271cb84f3a353ff70b  ifuse-0.9.1.tar.bz2
+dfb627493132d7ca63feaf96bf5cb6a5  ifuse-0.9.3.tar.bz2



From pbrobinson at fedoraproject.org  Tue Aug 11 13:20:48 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 13:20:48 +0000 (UTC)
Subject: rpms/ifuse/F-10 .cvsignore, 1.2, 1.3 ifuse.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20090811132048.8E54311C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25796

Modified Files:
	.cvsignore ifuse.spec sources 
Log Message:
- Update to 0.9.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2009 09:29:26 -0000	1.2
+++ .cvsignore	11 Aug 2009 13:20:47 -0000	1.3
@@ -1 +1 @@
-ifuse-0.9.1.tar.bz2
+ifuse-0.9.3.tar.bz2


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/ifuse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ifuse.spec	18 May 2009 22:15:58 -0000	1.6
+++ ifuse.spec	11 Aug 2009 13:20:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          ifuse
-Version:       0.9.1
-Release:       3%{?dist}
+Version:       0.9.3
+Release:       1%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -13,14 +13,6 @@ Requires:      hal
 BuildRequires: glib2-devel
 BuildRequires: fuse-devel
 BuildRequires: libiphone-devel
-BuildRequires: libplist-devel
-BuildRequires: libxml2-devel
-BuildRequires: libusb-devel
-BuildRequires: libtasn1-devel
-BuildRequires: glib2-devel
-BuildRequires: gnutls-devel
-BuildRequires: python-devel
-BuildRequires: swig
 
 %description
 A fuse filesystem for mounting iPhone and iPod touch devices
@@ -46,11 +38,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
-* Mon May 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.1-3
-- Add a few more
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
+- Update to 0.9.3 release
 
-* Mon May 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.1-2
-- Add dep not pulled in by pkgconfig
+* 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
 
 * Tue May 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.1-1
 - Update to official 0.9.1 release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 May 2009 09:29:26 -0000	1.4
+++ sources	11 Aug 2009 13:20:48 -0000	1.5
@@ -1 +1 @@
-a00d8e6e20baaf271cb84f3a353ff70b  ifuse-0.9.1.tar.bz2
+dfb627493132d7ca63feaf96bf5cb6a5  ifuse-0.9.3.tar.bz2



From madko at fedoraproject.org  Tue Aug 11 13:24:43 2009
From: madko at fedoraproject.org (madko)
Date: Tue, 11 Aug 2009 13:24:43 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-10 .cvsignore, 1.3,
	1.4 purple-msn-pecan.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090811132443.5E33511C00D7@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26410

Modified Files:
	.cvsignore purple-msn-pecan.spec sources 
Log Message:
Update to 0.1.0-rc1.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Mar 2009 18:42:10 -0000	1.3
+++ .cvsignore	11 Aug 2009 13:24:42 -0000	1.4
@@ -1 +1 @@
-msn-pecan-0.0.18.tar.bz2
+msn-pecan-0.1.0-rc1.tar.bz2


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/purple-msn-pecan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- purple-msn-pecan.spec	8 Mar 2009 18:42:11 -0000	1.2
+++ purple-msn-pecan.spec	11 Aug 2009 13:24:43 -0000	1.3
@@ -1,14 +1,13 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
-Version:	0.0.18
-Release:	2%{?dist}
+Version:	0.1.0
+Release:	0.1.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
-Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
-Patch0:		purple-msn-pecan-0.0.18_ru-po.patch
+Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,8 +39,7 @@ Other features:
 
 
 %prep
-%setup -q -n %{realname}-%{version}
-%patch0 -p0 -b ru-po.rej
+%setup -q -n %{realname}-%{version}-rc1
 
 
 %build
@@ -67,11 +65,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f libmsn-pecan.lang
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING TODO README COPYRIGHT ChangeLog
+%doc AUTHORS COPYING TODO README pidgin-copyright ChangeLog
 %{_libdir}/purple-2/libmsn-pecan.so
 
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
+- Update to 0.1.0-rc1.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar  8 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.18-2
 - Up-to-date description
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Mar 2009 18:42:11 -0000	1.3
+++ sources	11 Aug 2009 13:24:43 -0000	1.4
@@ -1 +1 @@
-8e8a6effbea87bad70610d14a01a4429  msn-pecan-0.0.18.tar.bz2
+67686d16ff1cb7410a374c231931512d  msn-pecan-0.1.0-rc1.tar.bz2



From ultrafredde at fedoraproject.org  Tue Aug 11 13:25:02 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Tue, 11 Aug 2009 13:25:02 +0000 (UTC)
Subject: rpms/task/F-11 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 sources,
	1.4, 1.5 task.spec, 1.3, 1.4
Message-ID: <20090811132502.C765511C00D7@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26596/F-11

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Jun 2009 12:19:21 -0000	1.3
+++ .cvsignore	11 Aug 2009 13:25:02 -0000	1.4
@@ -1 +1 @@
-task-1.7.1.tar.gz
+task-1.8.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Jun 2009 16:26:25 -0000	1.3
+++ import.log	11 Aug 2009 13:25:02 -0000	1.4
@@ -1,3 +1,4 @@
 task-1_7_0-2_fc10:F-11:task-1.7.0-2.fc10.src.rpm:1243416155
 task-1_7_1-1_fc10:F-11:task-1.7.1-1.fc10.src.rpm:1244549924
 task-1_7_1-2_fc10:F-11:task-1.7.1-2.fc10.src.rpm:1244564752
+task-1_8_0-1_fc10:F-11:task-1.8.0-1.fc10.src.rpm:1249997080


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Jun 2009 16:26:25 -0000	1.4
+++ sources	11 Aug 2009 13:25:02 -0000	1.5
@@ -1 +1 @@
-393baac71ab282d567e1fe4a66cae5bb  task-1.7.1.tar.gz
+a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/task.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- task.spec	9 Jun 2009 16:26:25 -0000	1.3
+++ task.spec	11 Aug 2009 13:25:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           task
-Version:        1.7.1
-Release:        2%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -12,13 +12,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ncurses-devel
 
 %description
-Task is a command-line to do list manager. It is
-scope-limited to GTD functionality and features:
-tags, colorful tabular output, reports and graphs,
-lots of commands, low-level api, abbreviations for
-all commands and options, multiuser file locking,
-recurring tasks. Task is based on ideas presented
-in the todo.sh script found on: http://todotxt.org
+Task is a command-line to do list manager. It has
+support for GTD functionality and includes the
+following features: tags, colorful tabular output,
+reports and graphs, lots of manipulation commands,
+low-level API, abbreviations for all commands and
+options, multiuser file locking, recurring tasks.
 
 %prep
 %setup -q
@@ -32,7 +31,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -m 644 -T scripts/bash/task_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,13 +40,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh
+%doc AUTHORS ChangeLog COPYING NEWS README scripts i18n
 %{_bindir}/task
 %{_mandir}/man1/task.1.gz
 %{_mandir}/man5/taskrc.5.gz
+%{_mandir}/man5/task-tutorial.5.gz
+%config(noreplace) %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
+  Intial RPM for task release 1.8.0
+* Mon Jul 13 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta3-1
+  Intial RPM for task beta release 1.8.0.beta3
+* Wed Jul 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta2-1
+  Intial RPM for task beta release 1.8.0.beta2
+* 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.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1



From madko at fedoraproject.org  Tue Aug 11 13:33:06 2009
From: madko at fedoraproject.org (madko)
Date: Tue, 11 Aug 2009 13:33:06 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-11 .cvsignore, 1.3,
	1.4 purple-msn-pecan.spec, 
	1.4, 1.5 sources, 1.3, 1.4 purple-msn-pecan-0.0.18_ru-po.patch,
	1.1, NONE
Message-ID: <20090811133306.A6C2911C00D7@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27658

Modified Files:
	.cvsignore purple-msn-pecan.spec sources 
Removed Files:
	purple-msn-pecan-0.0.18_ru-po.patch 
Log Message:
Update to 0.1.0-rc1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Mar 2009 18:03:04 -0000	1.3
+++ .cvsignore	11 Aug 2009 13:33:05 -0000	1.4
@@ -1 +1 @@
-msn-pecan-0.0.18.tar.bz2
+msn-pecan-0.1.0-rc1.tar.bz2


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-11/purple-msn-pecan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- purple-msn-pecan.spec	8 Mar 2009 18:22:48 -0000	1.4
+++ purple-msn-pecan.spec	11 Aug 2009 13:33:06 -0000	1.5
@@ -1,14 +1,13 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
-Version:	0.0.18
-Release:	2%{?dist}
+Version:	0.1.0
+Release:	0.1.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
-Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
-Patch0:		purple-msn-pecan-0.0.18_ru-po.patch
+Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,8 +39,7 @@ Other features:
 
 
 %prep
-%setup -q -n %{realname}-%{version}
-%patch0 -p0 -b ru-po.rej
+%setup -q -n %{realname}-%{version}-rc1
 
 
 %build
@@ -67,11 +65,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f libmsn-pecan.lang
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING TODO README COPYRIGHT ChangeLog
+%doc AUTHORS COPYING TODO README pidgin-copyright ChangeLog
 %{_libdir}/purple-2/libmsn-pecan.so
 
 
 %changelog
+* Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
+- Update to 0.1.0-rc1.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar  8 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.18-2
 - Up-to-date description
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Mar 2009 18:03:05 -0000	1.3
+++ sources	11 Aug 2009 13:33:06 -0000	1.4
@@ -1 +1 @@
-8e8a6effbea87bad70610d14a01a4429  msn-pecan-0.0.18.tar.bz2
+67686d16ff1cb7410a374c231931512d  msn-pecan-0.1.0-rc1.tar.bz2


--- purple-msn-pecan-0.0.18_ru-po.patch DELETED ---



From ultrafredde at fedoraproject.org  Tue Aug 11 13:35:12 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Tue, 11 Aug 2009 13:35:12 +0000 (UTC)
Subject: rpms/task/devel .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 sources,
	1.4, 1.5 task.spec, 1.4, 1.5
Message-ID: <20090811133512.9700611C00D7@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28798/devel

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Jun 2009 12:44:16 -0000	1.3
+++ .cvsignore	11 Aug 2009 13:35:11 -0000	1.4
@@ -1 +1 @@
-task-1.7.1.tar.gz
+task-1.8.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Jun 2009 16:38:36 -0000	1.3
+++ import.log	11 Aug 2009 13:35:12 -0000	1.4
@@ -1,3 +1,4 @@
 task-1_7_0-2_fc10:HEAD:task-1.7.0-2.fc10.src.rpm:1243415776
 task-1_7_1-1_fc10:HEAD:task-1.7.1-1.fc10.src.rpm:1244551419
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Jun 2009 16:38:36 -0000	1.4
+++ sources	11 Aug 2009 13:35:12 -0000	1.5
@@ -1 +1 @@
-393baac71ab282d567e1fe4a66cae5bb  task-1.7.1.tar.gz
+a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/task.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- task.spec	27 Jul 2009 05:32:08 -0000	1.4
+++ task.spec	11 Aug 2009 13:35:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           task
-Version:        1.7.1
-Release:        3%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -12,13 +12,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  ncurses-devel
 
 %description
-Task is a command-line to do list manager. It is
-scope-limited to GTD functionality and features:
-tags, colorful tabular output, reports and graphs,
-lots of commands, low-level api, abbreviations for
-all commands and options, multiuser file locking,
-recurring tasks. Task is based on ideas presented
-in the todo.sh script found on: http://todotxt.org
+Task is a command-line to do list manager. It has
+support for GTD functionality and includes the
+following features: tags, colorful tabular output,
+reports and graphs, lots of manipulation commands,
+low-level API, abbreviations for all commands and
+options, multiuser file locking, recurring tasks.
 
 %prep
 %setup -q
@@ -32,7 +31,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -m 644 -T scripts/bash/task_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,16 +40,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh
+%doc AUTHORS ChangeLog COPYING NEWS README scripts i18n
 %{_bindir}/task
 %{_mandir}/man1/task.1.gz
 %{_mandir}/man5/taskrc.5.gz
+%{_mandir}/man5/task-tutorial.5.gz
+%config(noreplace) %{_sysconfdir}/bash_completion.d
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
+* Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
+  Intial RPM for task release 1.8.0
+* Mon Jul 13 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta3-1
+  Intial RPM for task beta release 1.8.0.beta3
+* Wed Jul 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta2-1
+  Intial RPM for task beta release 1.8.0.beta2
+* 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.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1



From twaugh at fedoraproject.org  Tue Aug 11 13:36:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 11 Aug 2009 13:36:24 +0000 (UTC)
Subject: rpms/diffutils/devel diffutils.spec,1.30,1.31
Message-ID: <20090811133624.900E111C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/diffutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29038

Modified Files:
	diffutils.spec 
Log Message:
* Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 2.8.1-25
- Only try to install the info file if it exists so that package
  installation does not fail with --excludedocs (bug #515919).



Index: diffutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffutils/devel/diffutils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- diffutils.spec	24 Jul 2009 20:16:25 -0000	1.30
+++ diffutils.spec	11 Aug 2009 13:36:24 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities
 Name: diffutils
 Version: 2.8.1
-Release: 24%{?dist}
+Release: 25%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
@@ -59,7 +59,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %find_lang %{name}
 
 %post
-/sbin/install-info %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff).                 The GNU diff."
+if [ -f %{_infodir}/diff.info.gz ]; then
+  /sbin/install-info %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff).                 The GNU diff."
+fi
 exit 0
 
 %preun
@@ -79,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/diff.info*gz
 
 %changelog
+* Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 2.8.1-25
+- Only try to install the info file if it exists so that package
+  installation does not fail with --excludedocs (bug #515919).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From npajkovs at fedoraproject.org  Tue Aug 11 13:39:05 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Tue, 11 Aug 2009 13:39:05 +0000 (UTC)
Subject: rpms/cdrkit/devel cdrkit-1.1.9-root_option.patch, NONE,
	1.1 cdrkit.spec, 1.28, 1.29
Message-ID: <20090811133905.C6D2711C00D7@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/cdrkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29515

Modified Files:
	cdrkit.spec 
Added Files:
	cdrkit-1.1.9-root_option.patch 
Log Message:
genisoimage: fix string overflow breakage when using the -root

cdrkit-1.1.9-root_option.patch:
 genisoimage.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cdrkit-1.1.9-root_option.patch ---
--- cdrkit-1.1.9/genisoimage/genisoimage.c	2009-08-11 13:45:42.491887853 +0200
+++ cdrkit-1.1.9-master/genisoimage/genisoimage.c	2009-08-11 15:10:23.382014864 +0200
@@ -3117,8 +3117,10 @@ if (check_session == 0)
 			if (reloc_root != NULL) {
 				strcpy(graft_point, reloc_root);
 				len = strlen(graft_point);
-				if (graft_point[len] != '/')
+				if (graft_point[len] != '/'){
 					graft_point[len++] = '/';
+                    graft_point[len] = '\0';
+                }
 			} else {
 				len = 0;
 			}


Index: cdrkit.spec
===================================================================
RCS file: /cvs/extras/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- cdrkit.spec	24 Jul 2009 18:45:53 -0000	1.28
+++ cdrkit.spec	11 Aug 2009 13:39:05 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.9
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -12,6 +12,8 @@ Patch2: cdrkit-1.1.9-efi-boot.patch
 Patch3: cdrkit-1.1.9-types.patch
 Patch4: cdrkit-1.1.9-no_mp3.patch
 Patch5: cdrkit-1.1.9-buffer_overflow.patch
+Patch6: cdrkit-1.1.9-rr_joliet.patch
+Patch7: cdrkit-1.1.9-root_option.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
 
@@ -86,6 +88,8 @@ rates. Icedax can also be used as a CD p
 %patch3 -p1 -b .types
 %patch4 -p1 -b .no_mp3
 %patch5 -p1 -b .buffer_overflow
+%patch6 -p1 -b .rr_joliet
+%patch7 -p1 -b .root_option
 
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
 find doc -type f -print0 | xargs -0 chmod a-x 
@@ -99,10 +103,8 @@ export CXXFLAGS="$CFLAGS"
 export FFLAGS="$CFLAGS"
 cmake .. \
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
-        --debug-output \
-        --trace
-make VERBOSE=2 %{?_smp_mflags}
+        -DBUILD_SHARED_LIBS:BOOL=ON
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -230,6 +232,9 @@ fi
 %{_mandir}/man1/dirsplit.*
 
 %changelog
+* Tue Aug 11 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.1.9-10
+- fix #508449. fix string overflow breakage when using the -root
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rrakus at fedoraproject.org  Tue Aug 11 13:40:07 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 11 Aug 2009 13:40:07 +0000 (UTC)
Subject: rpms/indent/devel indent.spec,1.37,1.38
Message-ID: <20090811134007.161C411C048B@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/indent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29791

Modified Files:
	indent.spec 
Log Message:
Don't print errors in post and preun sections (#515935)


Index: indent.spec
===================================================================
RCS file: /cvs/extras/rpms/indent/devel/indent.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- indent.spec	25 Jul 2009 03:21:32 -0000	1.37
+++ indent.spec	11 Aug 2009 13:40:06 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: A GNU program for formatting C code
 Name: indent
 Version: 2.2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://indent.isidore-it.eu/beautify.html
@@ -54,11 +54,11 @@ echo ====================TESTING END====
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent).				Program to format source code." || :
+/sbin/install-info %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent).				Program to format source code." >/dev/null 2>&1 || :
 
 %preun
 if [ "$1" = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent).				Program to format source code." || :
+	/sbin/install-info --delete %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent).				Program to format source code." >/dev/null 2>&1 || :
 fi
 
 %files -f %{name}.lang
@@ -70,6 +70,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Roman Rakus <rrakus at redhat.com> - 2.2.10-5
+- Don't print errors in post and preun sections (#515935)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From madko at fedoraproject.org  Tue Aug 11 13:42:53 2009
From: madko at fedoraproject.org (madko)
Date: Tue, 11 Aug 2009 13:42:53 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-10 purple-msn-pecan-0.0.18_ru-po.patch, 1.1,
	NONE
Message-ID: <20090811134253.82E5111C00D7@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30255

Removed Files:
	purple-msn-pecan-0.0.18_ru-po.patch 
Log Message:
Removing obsolete russian patch



--- purple-msn-pecan-0.0.18_ru-po.patch DELETED ---



From npajkovs at fedoraproject.org  Tue Aug 11 13:43:13 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Tue, 11 Aug 2009 13:43:13 +0000 (UTC)
Subject: rpms/cdrkit/devel cdrkit.spec,1.29,1.30
Message-ID: <20090811134313.ECBB311C00D7@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/cdrkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30350

Modified Files:
	cdrkit.spec 
Log Message:
comment patch which is not ready


Index: cdrkit.spec
===================================================================
RCS file: /cvs/extras/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- cdrkit.spec	11 Aug 2009 13:39:05 -0000	1.29
+++ cdrkit.spec	11 Aug 2009 13:43:13 -0000	1.30
@@ -12,7 +12,7 @@ Patch2: cdrkit-1.1.9-efi-boot.patch
 Patch3: cdrkit-1.1.9-types.patch
 Patch4: cdrkit-1.1.9-no_mp3.patch
 Patch5: cdrkit-1.1.9-buffer_overflow.patch
-Patch6: cdrkit-1.1.9-rr_joliet.patch
+#Patch6: cdrkit-1.1.9-rr_joliet.patch
 Patch7: cdrkit-1.1.9-root_option.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@@ -88,7 +88,7 @@ rates. Icedax can also be used as a CD p
 %patch3 -p1 -b .types
 %patch4 -p1 -b .no_mp3
 %patch5 -p1 -b .buffer_overflow
-%patch6 -p1 -b .rr_joliet
+#%patch6 -p1 -b .rr_joliet
 %patch7 -p1 -b .root_option
 
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'



From berrange at fedoraproject.org  Tue Aug 11 13:49:35 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Tue, 11 Aug 2009 13:49:35 +0000 (UTC)
Subject: rpms/gtk-vnc/devel .cvsignore, 1.10, 1.11 gtk-vnc.spec, 1.36,
	1.37 sources, 1.12, 1.13
Message-ID: <20090811134935.96E5311C00D7@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31399

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Log Message:
Update to 0.3.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Aug 2009 08:15:52 -0000	1.10
+++ .cvsignore	11 Aug 2009 13:49:34 -0000	1.11
@@ -1,3 +1,3 @@
 .build*.log
 *.rpm
-gtk-vnc-0.3.8.tar.bz2
+gtk-vnc-0.3.9.tar.bz2


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gtk-vnc.spec	11 Aug 2009 08:15:52 -0000	1.36
+++ gtk-vnc.spec	11 Aug 2009 13:49:35 -0000	1.37
@@ -6,20 +6,15 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.8
-Release: 10%{?dist}
+Version: 0.3.9
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
-Patch1: %{name}-%{version}-relative-mouse.patch
-Patch2: %{name}-%{version}-sasl-auth.patch
-Patch3: %{name}-%{version}-sasl-auth-tunnel.patch
-Patch4: %{name}-%{version}-ungrab.patch
-Patch5: %{name}-%{version}-ungrab-2.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
-BuildRequires: gnutls-devel gtkglext-devel cyrus-sasl-devel
+BuildRequires: gnutls-devel cyrus-sasl-devel
 %if %{with_plugin}
 %if 0%{?fedora} > 8
 BuildRequires: xulrunner-devel
@@ -27,8 +22,6 @@ BuildRequires: xulrunner-devel
 BuildRequires: firefox-devel
 %endif
 %endif
-# Temp hack for Patch2
-BuildRequires: automake autoconf libtool
 
 %description
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -74,19 +67,8 @@ browsers.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
-# Temp hack for patch2
-libtoolize --copy --force
-aclocal -I gnulib/m4
-autoheader
-automake --add-missing --copy
-autoconf
 %if %{with_plugin}
 %configure --enable-plugin=yes
 %else
@@ -138,6 +120,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 11 2009 Daniel P. Berrange <berrange at redhat.com> - 0.3.9-1
+- Update to 0.3.9 release
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.8-10
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 08:15:52 -0000	1.12
+++ sources	11 Aug 2009 13:49:35 -0000	1.13
@@ -1 +1 @@
-7c7b07a868568206acd3f6e9e4d18ba1  gtk-vnc-0.3.8.tar.bz2
+18cbf50b393fea57b691987e5ea62259  gtk-vnc-0.3.9.tar.bz2



From karlik at fedoraproject.org  Tue Aug 11 13:51:31 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Tue, 11 Aug 2009 13:51:31 +0000 (UTC)
Subject: rpms/warzone2100/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 warzone2100.spec, 1.26, 1.27
Message-ID: <20090811135131.24CC611C00D7@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31722/devel

Modified Files:
	.cvsignore sources warzone2100.spec 
Log Message:
Update to v2.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	19 Mar 2009 20:30:21 -0000	1.16
+++ .cvsignore	11 Aug 2009 13:51:30 -0000	1.17
@@ -1 +1,2 @@
-warzone2100-2.1.2.tar.bz2
+warzone2100-2.2.1.tar.bz2
+sequences.wz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	19 Mar 2009 20:30:21 -0000	1.16
+++ sources	11 Aug 2009 13:51:30 -0000	1.17
@@ -1 +1,2 @@
-4b4ea830e3d7449b679a4952b335675e  warzone2100-2.1.2.tar.bz2
+d0040c5c4d6c919903d637b66aa2ad0a  warzone2100-2.2.1.tar.bz2
+6fa4d723d4019552cddf51d7ec8fb78c  sequences.wz


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/warzone2100.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- warzone2100.spec	27 Jul 2009 07:02:50 -0000	1.26
+++ warzone2100.spec	11 Aug 2009 13:51:30 -0000	1.27
@@ -1,12 +1,13 @@
 Name:           warzone2100
-Version:        2.1.2
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 Group:          Amusements/Games
 License:        GPLv2+ and CC-BY-SA
 URL:            http://wz2100.net/
 Source0:        http://download.gna.org/warzone/releases/2.1/%{name}-%{version}.tar.bz2
+Source1:        http://guide.wz2100.net/files/sequences.wz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
@@ -14,7 +15,6 @@ BuildRequires: libjpeg-devel libpng-deve
 BuildRequires: quesoglc-devel popt-devel gettext
 BuildRequires: automake >= 1.8
 BuildRequires: desktop-file-utils
-Obsoletes:     warzone2100-data
 
 %description
 Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and
@@ -23,6 +23,15 @@ game's source code was liberated on Dece
 (see COPYING in this directory for details). Soon after that, the Warzone 2100
 ReDev project was formed to take care of its future.
 
+%package sequences
+Summary:        Video file for %{name}
+Group:          Amusements/Games
+Provides:       warzone2100-data
+Requires:       %{name}
+
+%description sequences
+Video file for %{name}
+
 %prep
 %setup -q
 
@@ -39,19 +48,29 @@ desktop-file-install --vendor="fedora"  
         $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/warzone2100
+%{_bindir}/%{name}
 %{_datadir}/icons/warzone*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/warzone2100
+%{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/sequences.wz
 %doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README
 
+%files sequences
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/sequences.wz
+
 %changelog
+* Tue Aug 11 2009 Karol Trzcionka <karlikt at gmail.com> - 2.2.1-1
+- Update to v2.2.1
+- Add sequences subpackage
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From karlik at fedoraproject.org  Tue Aug 11 13:51:30 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Tue, 11 Aug 2009 13:51:30 +0000 (UTC)
Subject: rpms/warzone2100/F-11 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 warzone2100.spec, 1.25, 1.26
Message-ID: <20090811135130.D6DFC11C00D7@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31722/F-11

Modified Files:
	.cvsignore sources warzone2100.spec 
Log Message:
Update to v2.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	19 Mar 2009 20:30:21 -0000	1.16
+++ .cvsignore	11 Aug 2009 13:51:30 -0000	1.17
@@ -1 +1,2 @@
-warzone2100-2.1.2.tar.bz2
+warzone2100-2.2.1.tar.bz2
+sequences.wz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	19 Mar 2009 20:30:21 -0000	1.16
+++ sources	11 Aug 2009 13:51:30 -0000	1.17
@@ -1 +1,2 @@
-4b4ea830e3d7449b679a4952b335675e  warzone2100-2.1.2.tar.bz2
+d0040c5c4d6c919903d637b66aa2ad0a  warzone2100-2.2.1.tar.bz2
+6fa4d723d4019552cddf51d7ec8fb78c  sequences.wz


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/F-11/warzone2100.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- warzone2100.spec	19 Mar 2009 20:30:21 -0000	1.25
+++ warzone2100.spec	11 Aug 2009 13:51:30 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           warzone2100
-Version:        2.1.2
+Version:        2.2.1
 Release:        1%{?dist}
 Summary:        Innovative 3D real-time strategy
 
@@ -7,6 +7,7 @@ Group:          Amusements/Games
 License:        GPLv2+ and CC-BY-SA
 URL:            http://wz2100.net/
 Source0:        http://download.gna.org/warzone/releases/2.1/%{name}-%{version}.tar.bz2
+Source1:        http://guide.wz2100.net/files/sequences.wz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
@@ -14,7 +15,6 @@ BuildRequires: libjpeg-devel libpng-deve
 BuildRequires: quesoglc-devel popt-devel gettext
 BuildRequires: automake >= 1.8
 BuildRequires: desktop-file-utils
-Obsoletes:     warzone2100-data
 
 %description
 Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and
@@ -23,6 +23,15 @@ game's source code was liberated on Dece
 (see COPYING in this directory for details). Soon after that, the Warzone 2100
 ReDev project was formed to take care of its future.
 
+%package sequences
+Summary:        Video file for %{name}
+Group:          Amusements/Games
+Provides:       warzone2100-data
+Requires:       %{name}
+
+%description sequences
+Video file for %{name}
+
 %prep
 %setup -q
 
@@ -39,19 +48,29 @@ desktop-file-install --vendor="fedora"  
         $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/warzone2100
+%{_bindir}/%{name}
 %{_datadir}/icons/warzone*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/warzone2100
+%{_datadir}/%{name}
+%exclude %{_datadir}/%{name}/sequences.wz
 %doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README
 
+%files sequences
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/sequences.wz
+
 %changelog
+* Tue Aug 11 2009 Karol Trzcionka <karlikt at gmail.com> - 2.2.1-1
+- Update to v2.2.1
+- Add sequences subpackage
+
 * Thu Mar 19 2009 Karol Trzcionka <karlikt at gmail.com> - 2.1.2-1
 - Update to v2.1.2
 



From pghmcfc at fedoraproject.org  Tue Aug 11 13:52:57 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 11 Aug 2009 13:52:57 +0000 (UTC)
Subject: rpms/spamass-milter/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 spamass-milter.spec, 1.21, 1.22
Message-ID: <20090811135257.4656911C00D7@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/spamass-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31952

Modified Files:
	.cvsignore sources spamass-milter.spec 
Log Message:
Switch to bzipped source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Apr 2006 13:10:15 -0000	1.3
+++ .cvsignore	11 Aug 2009 13:52:56 -0000	1.4
@@ -1 +1 @@
-spamass-milter-0.3.1.tar.gz
+spamass-milter-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Apr 2006 13:10:15 -0000	1.3
+++ sources	11 Aug 2009 13:52:57 -0000	1.4
@@ -1 +1 @@
-ca6bf6a9c88db74a6bfea41f499c0ba6  spamass-milter-0.3.1.tar.gz
+5f3a441de032c7c044cbb7b922311f1b  spamass-milter-0.3.1.tar.bz2


Index: spamass-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamass-milter/devel/spamass-milter.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- spamass-milter.spec	27 Jul 2009 04:38:01 -0000	1.21
+++ spamass-milter.spec	11 Aug 2009 13:52:57 -0000	1.22
@@ -1,11 +1,11 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
-Source0:	http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz
+Source0:	http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.bz2
 Source1:	spamass-milter-wrapper
 Source2:	spamass-milter.sysv
 Source3:	spamass-milter.sysconfig
@@ -123,7 +123,10 @@ fi
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-15
+* Tue Aug 11 2009 Paul Howarth <paul at city-fan.org> 0.3.1-16
+- Switch to bzipped source tarball
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.3.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Fri Apr 24 2009 Paul Howarth <paul at city-fan.org> 0.3.1-14
@@ -145,7 +148,7 @@ fi
 - Fix scriptlet deps to ensure that sa-milt user exists before we attempt to
   add it to the postfix group
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-11
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.3.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Fri Feb 13 2009 Paul Howarth <paul at city-fan.org> 0.3.1-10



From hadess at fedoraproject.org  Tue Aug 11 13:57:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 13:57:03 +0000 (UTC)
Subject: rpms/bluez/F-11 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch, NONE,
	1.1 0002-Mark-Bluetooth-printers-as-being-local.patch, NONE,
	1.1 bluez.spec, 1.69, 1.70
Message-ID: <20090811135703.D8AD511C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32666

Modified Files:
	bluez.spec 
Added Files:
	0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch 
	0002-Mark-Bluetooth-printers-as-being-local.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-5
- More upstream CUPS fixes


0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch:
 bluetooth.conf |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch ---
>From b2d24735492e6a71f3441720940ac55c33fa0838 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter at gmail.com>
Date: Tue, 11 Aug 2009 14:04:05 +0100
Subject: [PATCH 1/2] Allow lp (CUPS) to talk to bluetoothd

CUPS runs its backend helpers as the "lp" user, so we should
allow CUPS to talk to bluetoothd to enumerate printers.
---
 src/bluetooth.conf |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/bluetooth.conf b/src/bluetooth.conf
index c047623..315009c 100644
--- a/src/bluetooth.conf
+++ b/src/bluetooth.conf
@@ -17,6 +17,12 @@
     <allow send_destination="org.bluez"/>
   </policy>
 
+  <!-- allow users of lp group (printing subsystem) to 
+       communicate with bluetoothd -->
+  <policy group="lp">
+    <allow send_destination="org.bluez"/>
+  </policy>
+
   <policy context="default">
     <deny send_destination="org.bluez"/>
   </policy>
-- 
1.6.2.5


0002-Mark-Bluetooth-printers-as-being-local.patch:
 main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0002-Mark-Bluetooth-printers-as-being-local.patch ---
>From d96004d65132a7934308ded8010c5f819013157a Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter at gmail.com>
Date: Tue, 11 Aug 2009 14:06:59 +0100
Subject: [PATCH 2/2] Mark Bluetooth printers as being local

For discovery purposes. Also add a better label for the printer,
and append "(Bluetooth") to the "unique" name.
---
 cups/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cups/main.c b/cups/main.c
index ba9864f..bb15c9c 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -226,7 +226,7 @@ static void print_printer_details(const char *name, const char *bdaddr, const ch
 		 bdaddr[9], bdaddr[10],
 		 bdaddr[12], bdaddr[13],
 		 bdaddr[15], bdaddr[16]);
-	printf("network %s \"Unknown\" \"%s (Bluetooth)\"", uri, escaped);
+	printf("direct %s \"%s\" \"%s (Bluetooth)\"", uri, escaped, escaped);
 	if (id != NULL)
 		printf(" \"%s\"\n", id);
 	else
-- 
1.6.2.5



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- bluez.spec	11 Aug 2009 11:38:34 -0000	1.69
+++ bluez.spec	11 Aug 2009 13:57:02 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -17,8 +17,12 @@ Patch3: bluez-activate-wacom-mode2.patch
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=507572
 Patch5: cups-less-errors.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3108
 Patch6: 0001-Don-t-abort-cups-backend-on-property-change.patch
 Patch7: 0002-Actually-read-the-CreateDevice-reply.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/3106/focus=3114
+Patch8: 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch
+Patch9: 0002-Mark-Bluetooth-printers-as-being-local.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -111,6 +115,8 @@ use in Bluetooth applications.
 %patch5 -p1 -b .cups-less-errors
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -205,6 +211,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-5
+- More upstream CUPS fixes
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.42-4
 - Fix cups discovery the first time we discover a device
 



From caolanm at fedoraproject.org  Tue Aug 11 14:00:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 11 Aug 2009 14:00:00 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1978,1.1979
Message-ID: <20090811140000.0B29F11C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv712

Modified Files:
	openoffice.org.spec 
Log Message:
track new location of evolocal.odb


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -p -r1.1978 -r1.1979
--- openoffice.org.spec	7 Aug 2009 11:06:39 -0000	1.1978
+++ openoffice.org.spec	11 Aug 2009 13:59:59 -0000	1.1979
@@ -42,7 +42,7 @@ Group:		Applications/Productivity
 URL:		http://www.openoffice.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{ooo_base_name}.tar.bz2
-Source1:	http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/src/evolocal.odb
+Source1:	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/src/evolocal.odb
 Source2:	http://people.redhat.com/caolanm/templates/Tigert-templates.tar.gz
 Source3:	documentation.openoffice.org-templates.tar.gz
 Source4:	http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz



From xhorak at fedoraproject.org  Tue Aug 11 14:01:20 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 11 Aug 2009 14:01:20 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird.spec,1.34,1.35
Message-ID: <20090811140120.5BDE111C00D7@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv927

Modified Files:
	sunbird.spec 
Log Message:
Rebuild against new TB


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sunbird.spec	3 Aug 2009 15:43:09 -0000	1.34
+++ sunbird.spec	11 Aug 2009 14:01:19 -0000	1.35
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.8.20090513hg%{?dist}
+Release:        0.9.20090513hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -73,8 +73,8 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-2.3.b3pre
-Requires:       thunderbird < 3.0-3.6.b4
+#Requires:       thunderbird >= 3.0-2.3.b3pre
+Requires:       thunderbird = 3.0-3.8.b3
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -299,6 +299,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.8.20090513hg
+- Rebuild against new Thunderbird
+
 * Mon Aug  3 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.7.20090513hg
 - Rebuild against new Thunderbird
 



From spot at fedoraproject.org  Tue Aug 11 14:06:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 14:06:10 +0000 (UTC)
Subject: rpms/R-abind/devel R-abind.spec,1.4,1.5
Message-ID: <20090811140610.9285811C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-abind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2408

Modified Files:
	R-abind.spec 
Log Message:
fix versioning


Index: R-abind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-abind/devel/R-abind.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-abind.spec	24 Jul 2009 16:10:43 -0000	1.4
+++ R-abind.spec	11 Aug 2009 14:06:09 -0000	1.5
@@ -1,21 +1,21 @@
-%define packname  abind
-%define packrel   0
+%global packname  abind
+%global packver   1.1
+%global packrel   0
 
 Name:             R-%{packname}
-Version:          1.1 
-Release:          4%{?dist}
+Version:          %{packver}.%{packrel}
+Release:          5%{?dist}
 Summary:          Combine multi-dimensional arrays
-
 Group:            Applications/Productivity
 License:          LGPLv2+
-URL:              http://cran.r-project.org/src/contrib/Descriptions/abind.html
-Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
+URL:              http://cran.r-project.org/web/packages/abind/index.html
+Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.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 >= 2.5.0
 
 %description
@@ -64,6 +64,9 @@ test -d %{packname}/src && (cd %{packnam
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.0-5
+- fix versioning
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmachata at fedoraproject.org  Tue Aug 11 14:09:32 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Tue, 11 Aug 2009 14:09:32 +0000 (UTC)
Subject: rpms/make/devel make.spec,1.48,1.49
Message-ID: <20090811140932.5259B11C00D7@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/make/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2877

Modified Files:
	make.spec 
Log Message:
- Fix installation with --excludedocs
- Resolves: #515917
- Change previous ChangeLog entry, it turned out that that commit actually did resolve the mentioned bug.



Index: make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/make/devel/make.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- make.spec	31 Jul 2009 11:48:15 -0000	1.48
+++ make.spec	11 Aug 2009 14:09:31 -0000	1.49
@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -65,11 +65,15 @@ echo ============END TESTING===========
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make).                 The GNU make utility." || :
+if [ -f %{_infodir}/make.info.gz ]; then # for --excludedocs
+   /sbin/install-info %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make).                 The GNU make utility." || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make).                 The GNU make utility." || :
+   if [ -f %{_infodir}/make.info.gz ]; then # for --excludedocs
+      /sbin/install-info --delete %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make).                 The GNU make utility." || :
+   fi
 fi
 
 %files  -f %{name}.lang
@@ -80,9 +84,12 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Tue Aug 11 2009 Petr Machata <pmachata at redhat.com> - 1:3.81-18
+- Fix installation with --excludedocs
+- Resolves: #515917
+
 * Fri Jul 31 2009 Petr Machata <pmachata at redhat.com> - 1:3.81-17
-- Replace the use of strcpy on overlapping areas with memmove.  It's
-  possible that this ...
+- Replace the use of strcpy on overlapping areas with memmove
 - Resolves: #514721
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.81-16



From atkac at fedoraproject.org  Tue Aug 11 14:11:13 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 11 Aug 2009 14:11:13 +0000 (UTC)
Subject: rpms/mtools/devel mtools.spec,1.46,1.47
Message-ID: <20090811141113.2144211C00D7@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3432

Modified Files:
	mtools.spec 
Log Message:
- fix installation with --excludedocs (#515932)



Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- mtools.spec	11 Aug 2009 12:35:09 -0000	1.46
+++ mtools.spec	11 Aug 2009 14:11:12 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
 Version: 4.0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.bz2
@@ -51,22 +51,29 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir.gz
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :;
+if [ -f %{_infodir}/mtools.info ]; then
+    /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :;
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :;
+    if [ -f %{_infodir}/mtools.info ]; then
+        /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :;
+    fi
 fi
 
 %files
 %defattr(-,root,root)
 %config(noreplace) /etc/mtools.conf
 %doc COPYING README Release.notes
-/usr/bin/*
+%{_bindir}/*
 %{_mandir}/*/*
-%{_infodir}/%{name}.info.gz
+%{_infodir}/mtools.info*
 
 %changelog
+* Tue Aug 11 2009 Adam Tkac <atkac redhat com> 4.0.10-4
+- fix installation with --excludedocs (#515932)
+
 * Tue Aug 11 2009 Adam Tkac <atkac redhat com> 4.0.10-3
 - correct source URL
 



From mlichvar at fedoraproject.org  Tue Aug 11 14:25:30 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 11 Aug 2009 14:25:30 +0000 (UTC)
Subject: rpms/slib/devel .cvsignore, 1.6, 1.7 slib.spec, 1.18, 1.19 sources, 
	1.6, 1.7 slib-3b1-guile.patch, 1.1, NONE
Message-ID: <20090811142530.256DB11C00D7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/slib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5332

Modified Files:
	.cvsignore slib.spec sources 
Removed Files:
	slib-3b1-guile.patch 
Log Message:
- update to 3b2
- suppress install-info errors



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slib/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Feb 2008 14:39:50 -0000	1.6
+++ .cvsignore	11 Aug 2009 14:25:28 -0000	1.7
@@ -1 +1 @@
-slib-3b1.zip
+slib-3b2.zip


Index: slib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slib/devel/slib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- slib.spec	27 Jul 2009 04:26:53 -0000	1.18
+++ slib.spec	11 Aug 2009 14:25:28 -0000	1.19
@@ -1,12 +1,11 @@
 Summary:      Platform independent library for scheme
 Name:         slib
-Version:      3b1
-Release:      3%{?dist}
+Version:      3b2
+Release:      1%{?dist}
 License:      SLIB
 Group:        Development/Languages
 BuildArch:    noarch
 Source0:      http://swiss.csail.mit.edu/ftpdir/scm/slib-%{version}.zip
-Patch1:       slib-3b1-guile.patch
 URL:          http://swissnet.ai.mit.edu/~jaffer/SLIB.html
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -22,7 +21,6 @@ implementation, user, or directory.
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1 -b .guile
 sed -r -i "s,/usr/(local/)?lib/slib,%{_datadir}/slib,g" *.init
 
 %build
@@ -38,12 +36,12 @@ install -m644 slib.info $RPM_BUILD_ROOT%
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/slib.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/slib.info.gz %{_infodir}/dir &> /dev/null
 :
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/slib.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/slib.info.gz %{_infodir}/dir &> /dev/null
 fi
 :
 
@@ -55,6 +53,10 @@ fi
 %{_infodir}/slib.*
 
 %changelog
+* Tue Aug 11 2009 Miroslav Lichvar <mlichvar at redhat.com> 3b2-1
+- update to 3b2
+- suppress install-info errors
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3b1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Feb 2008 14:39:50 -0000	1.6
+++ sources	11 Aug 2009 14:25:28 -0000	1.7
@@ -1 +1 @@
-9622df4aba2fde24eeb4456d97c5add1  slib-3b1.zip
+2f3a6ece49afb1e7db3bce7af039eaaa  slib-3b2.zip


--- slib-3b1-guile.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Aug 11 14:30:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 14:30:58 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.1-kmail-saveAttachments.patch, NONE,
	1.1 kdepim.spec, 1.220, 1.221
Message-ID: <20090811143058.A676F11C0347@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6487/F-11

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
an attempt to fix #496988 -  kmail default save dir regression


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.1-kmail-saveAttachments.patch ---
Index: kmail/kmcommands.cpp
===================================================================
--- kmail/kmcommands.cpp	(revision 1010021)
+++ kmail/kmcommands.cpp	(working copy)
@@ -2412,7 +2412,11 @@
   KUrl url, dirUrl;
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
-    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
+    QString dummy;
+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
+    if ( !startUrl.isValid() || startUrl.isEmpty() )
+      startUrl = KUrl( KGlobalSettings::documentPath() );
+    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                    parentWidget(),
                                                    i18n( "Save Attachments To" ) );
     if ( !dirUrl.isValid() ) {


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdepim.spec	9 Aug 2009 15:44:43 -0000	1.220
+++ kdepim.spec	11 Aug 2009 14:30:58 -0000	1.221
@@ -6,13 +6,15 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=496988
+Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +94,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %prep
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
+%patch1 -p0 -b .kmail-saveAttachments
 
 # omit conflict with oxygen-icons, working on a better long-term fix with
 # oxygen folk to get all the icons/temporary stuff out of kdepim
@@ -214,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix kmail default save dir regression (#496988)
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - -libs: move designer plugins here
 - %%check: desktop-file-validate



From ltinkl at fedoraproject.org  Tue Aug 11 14:30:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 14:30:58 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.1-kmail-saveAttachments.patch, NONE,
	1.1 kdepim.spec, 1.214, 1.215
Message-ID: <20090811143058.75A2A11C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6487/F-10

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
an attempt to fix #496988 -  kmail default save dir regression


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.1-kmail-saveAttachments.patch ---
Index: kmail/kmcommands.cpp
===================================================================
--- kmail/kmcommands.cpp	(revision 1010021)
+++ kmail/kmcommands.cpp	(working copy)
@@ -2412,7 +2412,11 @@
   KUrl url, dirUrl;
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
-    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
+    QString dummy;
+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
+    if ( !startUrl.isValid() || startUrl.isEmpty() )
+      startUrl = KUrl( KGlobalSettings::documentPath() );
+    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                    parentWidget(),
                                                    i18n( "Save Attachments To" ) );
     if ( !dirUrl.isValid() ) {


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- kdepim.spec	9 Aug 2009 18:52:27 -0000	1.214
+++ kdepim.spec	11 Aug 2009 14:30:58 -0000	1.215
@@ -6,13 +6,15 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=496988
+Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +94,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %prep
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
+%patch1 -p0 -b .kmail-saveAttachments
 
 # omit conflict with oxygen-icons, working on a better long-term fix with
 # oxygen folk to get all the icons/temporary stuff out of kdepim
@@ -214,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix kmail default save dir regression (#496988)
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - -libs: move designer plugins here
 - %%check: desktop-file-validate



From ltinkl at fedoraproject.org  Tue Aug 11 14:30:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 14:30:58 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.1-kmail-saveAttachments.patch, NONE,
	1.1 kdepim.spec, 1.230, 1.231
Message-ID: <20090811143058.F0EE411C043B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6487/devel

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
an attempt to fix #496988 -  kmail default save dir regression


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-4.3.1-kmail-saveAttachments.patch ---
Index: kmail/kmcommands.cpp
===================================================================
--- kmail/kmcommands.cpp	(revision 1010021)
+++ kmail/kmcommands.cpp	(working copy)
@@ -2412,7 +2412,11 @@
   KUrl url, dirUrl;
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
-    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
+    QString dummy;
+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
+    if ( !startUrl.isValid() || startUrl.isEmpty() )
+      startUrl = KUrl( KGlobalSettings::documentPath() );
+    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                    parentWidget(),
                                                    i18n( "Save Attachments To" ) );
     if ( !dirUrl.isValid() ) {


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- kdepim.spec	9 Aug 2009 04:43:41 -0000	1.230
+++ kdepim.spec	11 Aug 2009 14:30:58 -0000	1.231
@@ -6,13 +6,15 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=496988
+Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +94,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %prep
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
+%patch1 -p0 -b .kmail-saveAttachments
 
 # omit conflict with oxygen-icons, working on a better long-term fix with
 # oxygen folk to get all the icons/temporary stuff out of kdepim
@@ -214,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix kmail default save dir regression (#496988)
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - -libs: move designer plugins here
 - %%check: desktop-file-validate



From tmraz at fedoraproject.org  Tue Aug 11 14:38:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 11 Aug 2009 14:38:10 +0000 (UTC)
Subject: rpms/libtasn1/devel libtasn1-2.3.tar.gz.sig, NONE, 1.1 .cvsignore,
	1.8, 1.9 libtasn1.spec, 1.32, 1.33 sources, 1.18, 1.19
Message-ID: <20090811143810.B567411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libtasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8388

Modified Files:
	.cvsignore libtasn1.spec sources 
Added Files:
	libtasn1-2.3.tar.gz.sig 
Log Message:
* Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> - 2.3-1
- updated to new upstream version
- fix warnings when installed with --excludedocs (#515950)



--- NEW FILE libtasn1-2.3.tar.gz.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iOoEAAECADQFAkpws0stFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz
QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvFDoE/jYOF94SjgQDZ2JuLKiQbTRVuLG6
FXvMLP16hFnXidI6LjEcqDNdnU9FHajoflSJVwjXCy6OVkxKWGmenjL0EWcfjFdZ
KTe/wOyNGLlugn/8jh/ZS53oaoOsGO97hccbd8V+3hCM+hWNTvsp3esvNjagoHNn
NeAB9l6zt8YIvO3YhbSKrUv2ci6PDxgoZBMANsVfd8e1rMotBq5Daf8wxUc=
=vw7Y
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 May 2009 12:05:28 -0000	1.8
+++ .cvsignore	11 Aug 2009 14:38:08 -0000	1.9
@@ -1,2 +1 @@
-libtasn1-2.2.tar.gz
-libtasn1-2.2.tar.gz.sig
+libtasn1-2.3.tar.gz


Index: libtasn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libtasn1.spec	25 Jul 2009 08:44:07 -0000	1.32
+++ libtasn1.spec	11 Aug 2009 14:38:08 -0000	1.33
@@ -2,15 +2,15 @@
 
 Summary:	The ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	2.2
-Release: 	%release_func 2
+Version:	2.3
+Release: 	%release_func 1
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+
 License: 	GPLv3+ and LGPLv2+
 Group:		System Environment/Libraries
-URL:		http://www.gnu.org/software/gnutls/download.html
-Source0:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz
-Source1:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz.sig
+URL:		http://www.gnu.org/software/libtasn1/
+Source0:	http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz
+Source1:	http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	bison, pkgconfig
 %ifarch %ix86 x86_64 ppc ppc64
@@ -89,13 +89,13 @@ rm -rf "$RPM_BUILD_ROOT"
 
 
 %post devel
-/sbin/install-info --info-dir=%_infodir %_infodir/%name.info || :
+test -f %_infodir/%name.info.gz && \
+	/sbin/install-info --info-dir=%_infodir %_infodir/%name.info || :
 
 %preun devel
-test "$1" != 0 ||
+test "$1" = 0 -a -f %_infodir/%name.info.gz && \
 	/sbin/install-info --info-dir=%_infodir --delete %_infodir/%name.info || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc doc/TODO doc/*.pdf
@@ -117,6 +117,10 @@ test "$1" != 0 ||
 
 
 %changelog
+* Tue Aug 11 2009 Tomas Mraz <tmraz at redhat.com> - 2.3-1
+- updated to new upstream version
+- fix warnings when installed with --excludedocs (#515950)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	29 May 2009 12:05:28 -0000	1.18
+++ sources	11 Aug 2009 14:38:08 -0000	1.19
@@ -1,2 +1 @@
-14cc361500d2e768a8a6ec538ce3fecb  libtasn1-2.2.tar.gz
-ff9a3423d22789296793b315fd008d87  libtasn1-2.2.tar.gz.sig
+4f0918cf8fe8b2b4ba189938772d1dd2  libtasn1-2.3.tar.gz



From behdad at fedoraproject.org  Tue Aug 11 14:41:17 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 11 Aug 2009 14:41:17 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.91, 1.92 pango.spec, 1.171,
	1.172 sources, 1.92, 1.93 pango-1.25.1-cxx.patch, 1.1, NONE
Message-ID: <20090811144117.E569611C00D7@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8963

Modified Files:
	.cvsignore pango.spec sources 
Removed Files:
	pango-1.25.1-cxx.patch 
Log Message:
* Tue Aug 11 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.2-1 
- 1.25.2 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	10 Aug 2009 17:16:11 -0000	1.91
+++ .cvsignore	11 Aug 2009 14:41:17 -0000	1.92
@@ -1 +1 @@
-pango-1.25.1.tar.bz2
+pango-1.25.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- pango.spec	10 Aug 2009 19:33:00 -0000	1.171
+++ pango.spec	11 Aug 2009 14:41:17 -0000	1.172
@@ -8,8 +8,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.25.1
-Release: 7%{?dist}
+Version: 1.25.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -37,7 +37,6 @@ BuildRequires: gtk-doc
 
 # Look for pango.modules in an arch-specific directory
 Patch0: pango-1.21.4-lib64.patch
-Patch1: pango-1.25.1-cxx.patch
 
 %description
 Pango is a library for laying out and rendering of text, with an emphasis
@@ -73,7 +72,6 @@ for the pango package.
 %setup -q -n pango-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .cxx
 
 %build
 
@@ -228,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.2-1
+- 1.25.2
+
 * Mon Aug 10 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.1-7
 - Yes, I am stupid.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	10 Aug 2009 17:16:11 -0000	1.92
+++ sources	11 Aug 2009 14:41:17 -0000	1.93
@@ -1 +1 @@
-3bf29f8ac93e87b8719795f703e6e97d  pango-1.25.1.tar.bz2
+22cc2affdb660049932b16b61c76214a  pango-1.25.2.tar.bz2


--- pango-1.25.1-cxx.patch DELETED ---



From victorv at fedoraproject.org  Tue Aug 11 14:42:20 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Tue, 11 Aug 2009 14:42:20 +0000 (UTC)
Subject: rpms/netbeans-svnclientadapter/devel
	svnClientAdapter-1.6.0-build.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.1, 1.2 netbeans-svnclientadapter.spec, 1.4,
	1.5 sources, 1.3, 1.4 svnClientAdapter-1.4.0-build.patch, 1.1, NONE
Message-ID: <20090811144220.A518211C00D7@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-svnclientadapter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8751/devel

Modified Files:
	.cvsignore import.log netbeans-svnclientadapter.spec sources 
Added Files:
	svnClientAdapter-1.6.0-build.patch 
Removed Files:
	svnClientAdapter-1.4.0-build.patch 
Log Message:
Adapt the svnClientAdapter, version 1.6.0, revision 4383 to the NetBeans 6.7.1


svnClientAdapter-1.6.0-build.patch:
 build.xml |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

--- NEW FILE svnClientAdapter-1.6.0-build.patch ---
diff -Nur -x '*.orig' -x '*~' libnb-svnclientadapter-java-6.7/build.xml libnb-svnclientadapter-java-6.7.new/build.xml
--- libnb-svnclientadapter-java-6.7/build.xml	2009-07-13 13:50:39.000000000 +0400
+++ libnb-svnclientadapter-java-6.7.new/build.xml	2009-07-13 13:52:01.000000000 +0400
@@ -32,12 +32,6 @@
     <depend srcDir="${src.javahl.dir}"
             destDir="${build.classes.dir}"
             cache="${build.cache.dir}"/>
-    <depend srcDir="${src.svnkit.dir}"
-            destDir="${build.classes.dir}"
-            cache="${build.cache.dir}"/>
-    <depend srcDir="${src.cmdline.dir}"
-            destDir="${build.classes.dir}"
-            cache="${build.cache.dir}"/>
     <javac srcdir="${src.main.dir}"
            destdir="${build.classes.dir}"
            debug="${debug}"
@@ -54,22 +48,7 @@
            includes="**"
 		   classpathref="project.classpath">
     </javac>
-    <javac srcdir="${src.svnkit.dir}"
-           destdir="${build.classes.dir}"
-           debug="${debug}"
-		   source="${targetJvm}"    	
-		   target="${targetJvm}"    	
-           includes="**"
-		   classpathref="project.classpath">
-    </javac>
-    <javac srcdir="${src.cmdline.dir}"
-           destdir="${build.classes.dir}"
-           debug="${debug}"
-		   source="${targetJvm}"    	
-		   target="${targetJvm}"    	
-           includes="**"
-		   classpathref="project.classpath">
-    </javac>
+
     <copy todir="${build.classes.dir}">
       <fileset dir="${src.main.dir}">
         <exclude name="**/*.java"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Jan 2009 17:14:41 -0000	1.3
+++ .cvsignore	11 Aug 2009 14:42:19 -0000	1.4
@@ -1 +1 @@
-svnClientAdapter-1.4.0.tar.gz
+svnClientAdapter-1.6.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2008 12:21:23 -0000	1.1
+++ import.log	11 Aug 2009 14:42:20 -0000	1.2
@@ -1 +1,2 @@
 netbeans-svnclientadapter-6_1-3_fc10:HEAD:netbeans-svnclientadapter-6.1-3.fc10.src.rpm:1218543570
+netbeans-svnclientadapter-6_7_1-1_fc12:HEAD:netbeans-svnclientadapter-6.7.1-1.fc12.src.rpm:1250001946


Index: netbeans-svnclientadapter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/netbeans-svnclientadapter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netbeans-svnclientadapter.spec	25 Jul 2009 18:02:51 -0000	1.4
+++ netbeans-svnclientadapter.spec	11 Aug 2009 14:42:20 -0000	1.5
@@ -1,26 +1,30 @@
-%define nb_            netbeans
-%define nb_org         %{nb_}.org
-%define nb_ver         6.5
+# Prevent brp-java-repack-jars from being run.
+%global __jar_repack %{nil}
+
+%global nb_            netbeans
+%global nb_org         %{nb_}.org
+%global nb_ver         6.7.1
+
+%global svnCA          svnClientAdapter
+%global svnCA_ver      1.6.0
 
 Name:           %{nb_}-svnclientadapter
 Version:        %{nb_ver}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Subversion Client Adapter
 
 License:        ASL 2.0
 Url:            http://subclipse.tigris.org/svnClientAdapter.html
 Group:          Development/Libraries
 
-%define svnCA_ver      1.4.0
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn --username guest co \
-#     http://subclipse.tigris.org/svn/subclipse/tags/subclipse/%{svnCA_ver}/svnClientAdapter \
-#     svnClientAdapter
-# tar -czvf svnClientAdapter-%{svnCA_ver}.tar.gz svnClientAdapter
-Source0:        svnClientAdapter-%{svnCA_ver}.tar.gz
-
-Patch0:         svnClientAdapter-%{svnCA_ver}-build.patch
+# svn export --force --username guest -r4383 \
+#     http://subclipse.tigris.org/svn/subclipse/trunk/svnClientAdapter/ \
+#     svnClientAdapter-1.6.0
+# tar -czvf svnClientAdapter-1.6.0.tar.gz svnClientAdapter-1.6.0
+Source0:        %{svnCA}-%{svnCA_ver}.tar.gz
+Patch0:         %{svnCA}-%{svnCA_ver}-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -30,27 +34,24 @@ BuildRequires:  ant-nodeps
 BuildRequires:  ant-junit
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
-BuildRequires:  subversion-javahl >= 1.5.0
+BuildRequires:  subversion-javahl
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils
-Requires:       subversion >= 1.4.5
-
-Provides:       libnb-svnClientAdapter = 6.1
+Requires:       subversion
 
 %description
 SVNClientAdapter is a high-level Java API for Subversion.
 
 %prep
-%setup -q -n svnClientAdapter
+%setup -q -n %{svnCA}-%{svnCA_ver}
 
 # remove all binary libs
 find . -name "*.jar" -exec %{__rm} -f {} \;
 
 %patch0 -p1 -b .sav
 
-%{__ln_s} -f %{_javadir}//svnkit-javahl.jar lib/svnjavahl.jar
-
+%{__ln_s} -f %{_javadir}/svnkit-javahl.jar lib/svnjavahl.jar
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
@@ -72,51 +73,6 @@ ant -verbose svnClientAdapter.jar
 %{_javadir}/*
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Dec 23 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.5-1
-- Adapt to NetBeans 6.5
-- Change URL tag
-- Use the original upstream's vcs (version 1.4.0)
-
-* Fri Aug  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 6.1-3
-- Use the preferred method to package docs.
-- Remove Distribution tag.
-
-* Fri Aug 08 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-2
-- java-devel & jpackage-utils are added as the build requirements
-- jpackage-utils is added as the run-time requirement
-- An appropriate value of Group Tag is chosen from the official list
-- Both license.txt and readme.txt are added as the package documentation
-
-* Mon Jul 14 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-1
-- Upgrade to version 6.1 (6.0.1 sources are used)
-- Change BuldRoot
-- Bootstrap into Fedora
-
-* Thu Jan 24 2008 Jaroslav Tulach <jtulach at mandriva.org> 6.0.1-1mdv2008.1
-+ Revision: 157642
-- Upgrade to version 6.0.1
-
-  + Olivier Blin <oblin at mandriva.com>
-    - restore BuildRoot
-
-  + Thierry Vignaud <tvignaud at mandriva.com>
-    - kill re-definition of %%buildroot on Pixel's request
-
-* Sun Dec 16 2007 Anssi Hannula <anssi at mandriva.org> 0:6.0-3mdv2008.1
-+ Revision: 120971
-- buildrequire java-rpmbuild, i.e. build with icedtea on x86(_64)
-
-* Mon Dec 10 2007 Jaroslav Tulach <jtulach at mandriva.org> 0:6.0-2mdv2008.1
-+ Revision: 116985
-- Using pristine sources from svn repository rev. 3087, plus a modification patch
-
-* Thu Dec 06 2007 Jaroslav Tulach <jtulach at mandriva.org> 0:6.0-1mdv2008.1
-+ Revision: 115856
-- create libnb-svnClientAdapter
+* Tue Aug 11 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
+- Adapt version 1.6.0 to NetBeans 6.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Jan 2009 17:14:41 -0000	1.3
+++ sources	11 Aug 2009 14:42:20 -0000	1.4
@@ -1 +1 @@
-ba0e7ad0dd90e3c8193b1f1f3e4c10f2  svnClientAdapter-1.4.0.tar.gz
+dece54633ab9a93fe7b99378d78e7f1c  svnClientAdapter-1.6.0.tar.gz


--- svnClientAdapter-1.4.0-build.patch DELETED ---



From tbzatek at fedoraproject.org  Tue Aug 11 14:42:39 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 11 Aug 2009 14:42:39 +0000 (UTC)
Subject: rpms/sabayon/devel .cvsignore, 1.21,
	1.22 sabayon-lockdown-save.patch, 
	1.1, 1.2 sabayon.spec, 1.61, 1.62 sources, 1.21,
	1.22 sabayon-2.12.3-xnestbug.patch, 1.1,
	NONE sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch, 1.1,
	NONE sabayon-2.25.0-profile-save.patch, 1.1, NONE sabayon.pam,
	1.1, NONE xephyr.patch, 1.2, NONE
Message-ID: <20090811144239.038E611C00D7@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9328

Modified Files:
	.cvsignore sabayon-lockdown-save.patch sabayon.spec sources 
Removed Files:
	sabayon-2.12.3-xnestbug.patch 
	sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch 
	sabayon-2.25.0-profile-save.patch sabayon.pam xephyr.patch 
Log Message:
* Tue Aug 11 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.0-1
- Update to 2.27.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	20 Mar 2009 16:36:10 -0000	1.21
+++ .cvsignore	11 Aug 2009 14:42:37 -0000	1.22
@@ -1 +1 @@
-sabayon-2.25.0.tar.bz2
+sabayon-2.27.0.tar.bz2

sabayon-lockdown-save.patch:
 config.py.in |   26 +++++++++++++++++++++++++-
 storage.py   |    4 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

Index: sabayon-lockdown-save.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon-lockdown-save.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sabayon-lockdown-save.patch	10 Sep 2008 13:17:56 -0000	1.1
+++ sabayon-lockdown-save.patch	11 Aug 2009 14:42:38 -0000	1.2
@@ -1,8 +1,51 @@
-Index: lib/storage.py
-===================================================================
---- lib/storage.py	(revision 1010)
-+++ lib/storage.py	(working copy)
-@@ -601,7 +601,7 @@
+diff -up sabayon-2.27.0/lib/config.py.in.gconfsave sabayon-2.27.0/lib/config.py.in
+--- sabayon-2.27.0/lib/config.py.in.gconfsave	2009-08-10 19:21:07.000000000 +0200
++++ sabayon-2.27.0/lib/config.py.in	2009-08-11 16:12:01.000000000 +0200
+@@ -105,6 +105,8 @@ FILES_TO_IGNORE = [
+ DIRECTORIES_TO_IGNORE = [
+     ".beagle",
+     ".cache",
++    ".ccache",
++    ".dbus",
+     ".fontconfig",
+     ".gconf",
+     ".gconf.xml.defaults",
+@@ -114,8 +116,30 @@ DIRECTORIES_TO_IGNORE = [
+     ".gstreamer-0.8",
+     ".gstreamer-0.10",
+     ".gvfs",
++    ".local/share/tracker",
++    ".metacity/sessions",
++    ".profile_cache",
++    ".pulse",
++    ".thumbnails",
++    ".wapi",
++    ".Trash"
++]
++
++#
++# Directories which we don't want to add when saving profile
++# 
++DIRECTORIES_TO_IGNORE_PROFILE = [
++    ".beagle",
++    ".cache",
++    ".ccache",
++    ".dbus",
++    ".fontconfig",
++    ".gconfd",
++    ".gstreamer-0.8",
++    ".gstreamer-0.10",
++    ".gvfs",
++    ".local/share/tracker",
+     ".metacity/sessions",
+-    ".nautilus/metafiles",
+     ".profile_cache",
+     ".pulse",
+     ".thumbnails",
+diff -up sabayon-2.27.0/lib/storage.py.gconfsave sabayon-2.27.0/lib/storage.py
+--- sabayon-2.27.0/lib/storage.py.gconfsave	2009-04-16 22:30:39.000000000 +0200
++++ sabayon-2.27.0/lib/storage.py	2009-08-11 15:27:54.000000000 +0200
+@@ -601,7 +601,7 @@ class ProfileStorage:
                          # We need to stop if we are recursing inside a ignored 
                          # directory.
                          if util.should_ignore_dir (homedir, 
@@ -11,7 +54,7 @@ Index: lib/storage.py
                              dprint ("Not going inside %s as it is an ignored directory.", path)
                          else:
                              zip_directory (save_zip,
-@@ -613,7 +613,7 @@
+@@ -613,7 +613,7 @@ class ProfileStorage:
                          if os.path.join (name, f) in zip_filelist:
                              dprint ("Not adding %s to zipfile since it is already in the file", os.path.join (name, f))
                          elif util.should_ignore_file (homedir, 
@@ -20,34 +63,3 @@ Index: lib/storage.py
                              dprint ("Not adding %s to zipfile since it is a ignored file", os.path.join (name, f))
                          else:
                              zip_filelist.append(os.path.join(name, f))
-Index: lib/config.py.in
-===================================================================
---- lib/config.py.in	(revision 1010)
-+++ lib/config.py.in	(working copy)
-@@ -121,6 +121,26 @@
- ]
- 
- #
-+# Directories which we don't want to add when saving profile
-+# 
-+DIRECTORIES_TO_IGNORE_PROFILE = [
-+    ".beagle",
-+    ".cache",
-+    ".fontconfig",
-+    ".gconf.xml.mandatory",
-+    ".gconf.xml.mandatory-alt",
-+    ".gconfd",
-+    ".gstreamer-0.8",
-+    ".gstreamer-0.10",
-+    ".metacity/sessions",
-+    ".nautilus/metafiles",
-+    ".profile_cache",
-+    ".thumbnails",
-+    ".wapi",
-+    ".Trash"
-+]
-+
-+#
- # GConf keys which we don't want to see change notifications for
- #
- GCONF_KEYS_TO_IGNORE = [


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sabayon.spec	27 Jul 2009 03:44:21 -0000	1.61
+++ sabayon.spec	11 Aug 2009 14:42:38 -0000	1.62
@@ -1,5 +1,5 @@
 %define gtk2_version 2.6.0
-%define pygtk2_version 2.5.3-2
+%define pygtk2_version 2.15.0
 %define gnome_python2_version 2.6.0-5
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -7,32 +7,23 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.25.0
-Release: 4%{?dist}
+Version: 2.27.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.22/sabayon-%{version}.tar.bz2
-Source2: sabayon.pam
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.27/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Xnest crashes unless we disable the Composite extension
-Patch1:  xephyr.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486218 
 Patch3:  selinux.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=551535
 Patch4:  sabayon-lockdown-save.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=576440
-Patch5:  sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=542604
-Patch7:  sabayon-2.25.0-profile-save.patch
-
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -53,7 +44,7 @@ BuildRequires: libXt-devel
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: usermode
-BuildRequires: xorg-x11-server-Xnest
+BuildRequires: xorg-x11-server-Xephyr
 # Needed to pick up the right Xsession file
 BuildRequires: xorg-x11-xinit
 
@@ -82,8 +73,7 @@ graphical tools which a sysadmin use to 
 Summary:  The parts of sabayon needed on the client systems
 Group:    Applications/System
 
-# Requires: xorg-x11-server-Xephyr
-Requires: xorg-x11-server-Xnest
+Requires: xorg-x11-server-Xephyr
 Requires: shadow-utils
 Requires: gamin-python
 Requires: python-ldap
@@ -100,15 +90,9 @@ that need to be installed on the client 
 
 %prep
 %setup -q
-# More modern pam file
-cp %{SOURCE2} admin-tool/
 
-# %patch1 -p1 -b .xephyr
-# -- temporarily disabled: https://bugzilla.gnome.org/show_bug.cgi?id=576447
 %patch3 -p1 -b .selinux
-%patch4 -p0 -b .gconfsave
-%patch5 -p1 -b .xauth
-%patch7 -p1 -b .profile
+%patch4 -p1 -b .gconfsave
 
 
 %build
@@ -298,6 +282,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Aug 11 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.0-1
+- Update to 2.27.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	20 Mar 2009 16:36:11 -0000	1.21
+++ sources	11 Aug 2009 14:42:38 -0000	1.22
@@ -1 +1 @@
-f994116c9b9194dafc0a3ec358125f8e  sabayon-2.25.0.tar.bz2
+6595e9dfeead14ad1ce73b63e62cd499  sabayon-2.27.0.tar.bz2


--- sabayon-2.12.3-xnestbug.patch DELETED ---


--- sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch DELETED ---


--- sabayon-2.25.0-profile-save.patch DELETED ---


--- sabayon.pam DELETED ---


--- xephyr.patch DELETED ---



From jkratoch at fedoraproject.org  Tue Aug 11 14:42:47 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 11 Aug 2009 14:42:47 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.34, 1.35 gdb-6.3-pie-20050110.patch,
	1.18, 1.19 gdb-6.5-bz216711-clone-is-outermost.patch, 1.4,
	1.5 gdb-archer.patch, 1.20, 1.21 gdb.spec, 1.370, 1.371 sources,
	1.33, 1.34
Message-ID: <20090811144247.909F311C00D7@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9272

Modified Files:
	.cvsignore gdb-6.3-pie-20050110.patch 
	gdb-6.5-bz216711-clone-is-outermost.patch gdb-archer.patch 
	gdb.spec sources 
Log Message:
* Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-1
- Support constant DW_AT_data_member_location by GCC PR debug/40659 (BZ 515377).
- Fix .spec URL.
- archer-jankratochvil-fedora12 commit: 81de3c6abae4f7e3738aa9bcc0ab2f8725cce252



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	10 Aug 2009 13:22:51 -0000	1.34
+++ .cvsignore	11 Aug 2009 14:42:46 -0000	1.35
@@ -1 +1 @@
-gdb-6.8.50.20090810.tar.bz2
+gdb-6.8.50.20090811.tar.bz2

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infrun.c      |    4 
 objfiles.c    |   14 +
 solib-svr4.c  |  474 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 14 files changed, 610 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gdb-6.3-pie-20050110.patch	10 Aug 2009 13:22:51 -0000	1.18
+++ gdb-6.3-pie-20050110.patch	11 Aug 2009 14:42:46 -0000	1.19
@@ -1021,7 +1021,7 @@ Index: gdb-6.8.50.20090809/gdb/solib.c
  /*
  
     GLOBAL FUNCTION
-@@ -449,14 +453,38 @@ symbol_add_stub (struct so_list *so, int
+@@ -453,14 +453,38 @@ symbol_add_stub (struct so_list *so, int
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
      {
@@ -1061,7 +1061,7 @@ Index: gdb-6.8.50.20090809/gdb/solib.c
 +
    p_refcount = xmalloc (sizeof (*p_refcount));
    *p_refcount = 2;  /* Both solib and objfile refer to this abfd.  */
-   so->abfd->usrdata = p_refcount;
+   bfd_usrdata (so->abfd) = p_refcount;
 @@ -600,6 +628,10 @@ update_solib_list (int from_tty, struct 
  	    }
  	  else

gdb-6.5-bz216711-clone-is-outermost.patch:
 gdb-6.8.50.20090802/gdb/amd64-linux-tdep.c                      |   76 ++++++++++
 gdb-6.8.50.20090802/gdb/amd64-tdep.c                            |    5 
 gdb-6.8.50.20090802/gdb/testsuite/gdb.threads/bt-clone-stop.c   |   39 +++++
 gdb-6.8.50.20090802/gdb/testsuite/gdb.threads/bt-clone-stop.exp |   61 ++++++++
 gdb-6.8.50.20090811/gdb/i386-tdep.c                             |    3 
 gdb-6.8.50.20090811/gdb/i386-tdep.h                             |    3 
 6 files changed, 187 insertions(+)

Index: gdb-6.5-bz216711-clone-is-outermost.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz216711-clone-is-outermost.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.5-bz216711-clone-is-outermost.patch	4 Aug 2009 05:37:28 -0000	1.4
+++ gdb-6.5-bz216711-clone-is-outermost.patch	11 Aug 2009 14:42:46 -0000	1.5
@@ -138,28 +138,24 @@ Index: gdb-6.8.50.20090802/gdb/amd64-tde
    (*this_id) = frame_id_build (cache->base + 16, cache->pc);
  }
  
-Index: gdb-6.8.50.20090802/gdb/i386-tdep.c
-===================================================================
---- gdb-6.8.50.20090802.orig/gdb/i386-tdep.c	2009-07-12 19:46:21.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/i386-tdep.c	2009-08-03 15:50:08.000000000 +0200
-@@ -5307,6 +5307,9 @@ i386_gdbarch_init (struct gdbarch_info i
+--- gdb-6.8.50.20090811/gdb/i386-tdep.c.orig	2009-08-10 05:02:39.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/i386-tdep.c	2009-08-11 16:33:51.000000000 +0200
+@@ -5432,6 +5432,9 @@ i386_gdbarch_init (struct gdbarch_info i
    tdep->sc_pc_offset = -1;
    tdep->sc_sp_offset = -1;
  
 +  /* Unwinding stops on i386 automatically.  */
 +  tdep->outermost_frame_p = NULL;
 +
+   tdep->record_regmap = i386_record_regmap;
+ 
    /* The format used for `long double' on almost all i386 targets is
-      the i387 extended floating-point format.  In fact, of all targets
-      in the GCC 2.95 tree, only OSF/1 does it different, and insists
-Index: gdb-6.8.50.20090802/gdb/i386-tdep.h
-===================================================================
---- gdb-6.8.50.20090802.orig/gdb/i386-tdep.h	2009-07-02 19:25:54.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/i386-tdep.h	2009-08-03 15:50:29.000000000 +0200
-@@ -115,6 +115,9 @@ struct gdbarch_tdep
-   int (*i386_intx80_record) (struct regcache *regcache);
-   /* Parse sysenter args.  */
+--- gdb-6.8.50.20090811/gdb/i386-tdep.h.orig	2009-08-10 05:02:39.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/i386-tdep.h	2009-08-11 16:34:08.000000000 +0200
+@@ -120,6 +120,9 @@ struct gdbarch_tdep
    int (*i386_sysenter_record) (struct regcache *regcache);
+   /* Parse syscall args.  */
+   int (*i386_syscall_record) (struct regcache *regcache);
 +
 +  /* Detect OS dependent outermost frames; such as `clone'.  */
 +  int (*outermost_frame_p) (struct frame_info *this_frame);

gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 block.c                                                  |   23 
 block.h                                                  |    2 
 breakpoint.c                                             |  102 
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 ++
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  223 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   59 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |   14 
 dwarf2-frame.c                                           |   28 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  356 ++-
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1538 +++++++++------
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  413 ----
 f-lang.h                                                 |   38 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 -
 findvar.c                                                |  126 -
 frame.c                                                  |   19 
 frame.h                                                  |    5 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 ++
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 +++++
 gdbtypes.h                                               |  140 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  115 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   27 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 ++++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 +
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 +++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 +++
 python/python-symtab.c                                   |  322 +++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |  123 +
 python/python.c                                          |  384 +++
 python/python.h                                          |    8 
 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                                                |   55 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  316 +--
 symtab.h                                                 |   17 
 target.h                                                 |   22 
 testsuite/ChangeLog                                      |   97 
 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.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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                  |   16 
 testsuite/gdb.cp/namespace-recursive.exp                 |   53 
 testsuite/gdb.cp/namespace-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 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-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                        |  158 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/string.exp                         |   72 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   96 
 testsuite/gdb.python/python-prettyprint.c                |   13 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   86 
 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                                                 |  254 ++
 valprint.c                                               |    3 
 value.c                                                  |  211 +-
 value.h                                                  |   12 
 varobj.c                                                 |  731 +++++--
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 218 files changed, 16173 insertions(+), 2659 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gdb-archer.patch	10 Aug 2009 13:22:51 -0000	1.20
+++ gdb-archer.patch	11 Aug 2009 14:42:46 -0000	1.21
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 93ec16e6f5000dd64d433d86674e820ed0f35b72
+commit 81de3c6abae4f7e3738aa9bcc0ab2f8725cce252
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -14,285 +14,6 @@ archer-keiths-expr-cumulative
 archer-tromey-python
 
 
-diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
-index b8928be..8bf7667 100644
---- a/bfd/coff-stgo32.c
-+++ b/bfd/coff-stgo32.c
-@@ -102,9 +102,6 @@ static bfd_boolean
- 
- #include "coff-i386.c"
- 
--/* I hold in the usrdata the stub.  */
--#define bfd_coff_go32stub bfd_usrdata
--
- /* This macro is used, because I cannot assume the endianess of the
-    host system.  */
- #define _H(index) (H_GET_16 (abfd, (header+index*2)))
-@@ -112,7 +109,7 @@ static bfd_boolean
- /* These bytes are a 2048-byte DOS executable, which loads the COFF
-    image into memory and then runs it. It is called 'stub'.  */
- 
--static const unsigned char stub_bytes[STUBSIZE] =
-+static const unsigned char stub_bytes[GO32_STUBSIZE] =
- {
- #include "go32stub.h"
- };
-@@ -120,7 +117,7 @@ static const unsigned char stub_bytes[STUBSIZE] =
- /*
-    I have not commented each swap function below, because the
-    technique is in any function the same. For the ...in function,
--   all the pointers are adjusted by adding STUBSIZE and for the
-+   all the pointers are adjusted by adding GO32_STUBSIZE and for the
-    ...out function, it is subtracted first and after calling the
-    standard swap function it is reset to the old value.  */
- 
-@@ -132,25 +129,20 @@ static const unsigned char stub_bytes[STUBSIZE] =
- 
- static void
- adjust_filehdr_in_post  (abfd, src, dst)
--     bfd *abfd;
-+     bfd *abfd ATTRIBUTE_UNUSED;
-      PTR src;
-      PTR dst;
- {
-   FILHDR *filehdr_src = (FILHDR *) src;
-   struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
- 
--  ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
-+  ADJUST_VAL (filehdr_dst->f_symptr, GO32_STUBSIZE);
- 
--  /* Save now the stub to be used later.  */
--  bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, (bfd_size_type) STUBSIZE);
--
--  /* Since this function returns no status, I do not set here
--     any bfd_error_...
--     That means, before the use of bfd_coff_go32stub (), this value
--     should be checked if it is != NULL.  */
--  if (bfd_coff_go32stub (abfd) == NULL)
--    return;
--  memcpy (bfd_coff_go32stub (abfd), filehdr_src->stub, STUBSIZE);
-+  /* Save now the stub to be used later.  Put the stub data to FILEHDR_DST
-+     first as coff_data (abfd) still does not exist.  It may not even be ever
-+     created as we are just checking the file format of ABFD.  */
-+  memcpy (filehdr_dst->go32stub, filehdr_src->stub, GO32_STUBSIZE);
-+  filehdr_dst->f_flags |= F_GO32STUB;
- }
- 
- static void
-@@ -166,13 +158,13 @@ adjust_filehdr_out_pre  (abfd, in, out)
-   create_go32_stub (abfd);
- 
-   /* Copy the stub to the file header.  */
--  if (bfd_coff_go32stub (abfd) != NULL)
--    memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
-+  if (coff_data (abfd)->go32stub != NULL)
-+    memcpy (filehdr_out->stub, coff_data (abfd)->go32stub, GO32_STUBSIZE);
-   else
-     /* Use the default.  */
--    memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
-+    memcpy (filehdr_out->stub, stub_bytes, GO32_STUBSIZE);
- 
--  ADJUST_VAL (filehdr_in->f_symptr, -STUBSIZE);
-+  ADJUST_VAL (filehdr_in->f_symptr, -GO32_STUBSIZE);
- }
- 
- static void
-@@ -183,7 +175,7 @@ adjust_filehdr_out_post  (abfd, in, out)
- {
-   struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
-   /* Undo the above change.  */
--  ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
-+  ADJUST_VAL (filehdr_in->f_symptr, GO32_STUBSIZE);
- }
- 
- static void
-@@ -194,9 +186,9 @@ adjust_scnhdr_in_post  (abfd, ext, in)
- {
-   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
- 
--  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
--  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
--  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);
- }
- 
- static void
-@@ -207,9 +199,9 @@ adjust_scnhdr_out_pre  (abfd, in, out)
- {
-   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
- 
--  ADJUST_VAL (scnhdr_int->s_scnptr, -STUBSIZE);
--  ADJUST_VAL (scnhdr_int->s_relptr, -STUBSIZE);
--  ADJUST_VAL (scnhdr_int->s_lnnoptr, -STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_scnptr, -GO32_STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_relptr, -GO32_STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_lnnoptr, -GO32_STUBSIZE);
- }
- 
- static void
-@@ -220,9 +212,9 @@ adjust_scnhdr_out_post (abfd, in, out)
- {
-   struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
- 
--  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
--  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
--  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
-+  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);
- }
- 
- static void
-@@ -239,7 +231,7 @@ adjust_aux_in_post  (abfd, ext1, type, class, indx, numaux, in1)
- 
-   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-     {
--      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
-+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
-     }
- }
- 
-@@ -257,7 +249,7 @@ adjust_aux_out_pre  (abfd, inp, type, class, indx, numaux, extp)
- 
-   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-     {
--      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -STUBSIZE);
-+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -GO32_STUBSIZE);
-     }
- }
- 
-@@ -275,7 +267,7 @@ adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
- 
-   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-     {
--      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
-+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
-     }
- }
- 
-@@ -296,7 +288,7 @@ create_go32_stub (abfd)
-      bfd *abfd;
- {
-   /* Do it only once.  */
--  if (bfd_coff_go32stub (abfd) == NULL)
-+  if (coff_data (abfd)->go32stub == NULL)
-     {
-       char *stub;
-       struct stat st;
-@@ -362,32 +354,32 @@ create_go32_stub (abfd)
- 	  goto stub_end;
- 	}
-       /* Now we found a correct stub (hopefully).  */
--      bfd_coff_go32stub (abfd)
-+      coff_data (abfd)->go32stub
- 	= (PTR) bfd_alloc (abfd, (bfd_size_type) coff_start);
--      if (bfd_coff_go32stub (abfd) == NULL)
-+      if (coff_data (abfd)->go32stub == NULL)
- 	{
- 	  close (f);
- 	  return;
- 	}
-       lseek (f, 0L, SEEK_SET);
--      if ((unsigned long) read (f, bfd_coff_go32stub (abfd), coff_start)
-+      if ((unsigned long) read (f, coff_data (abfd)->go32stub, coff_start)
- 	  != coff_start)
- 	{
--	  bfd_release (abfd, bfd_coff_go32stub (abfd));
--	  bfd_coff_go32stub (abfd) = NULL;
-+	  bfd_release (abfd, coff_data (abfd)->go32stub);
-+	  coff_data (abfd)->go32stub = NULL;
- 	}
-       close (f);
-     }
- stub_end:
-   /* There was something wrong above, so use now the standard builtin
-      stub.  */
--  if (bfd_coff_go32stub (abfd) == NULL)
-+  if (coff_data (abfd)->go32stub == NULL)
-     {
--      bfd_coff_go32stub (abfd)
--	= (PTR) bfd_alloc (abfd, (bfd_size_type) STUBSIZE);
--      if (bfd_coff_go32stub (abfd) == NULL)
-+      coff_data (abfd)->go32stub
-+	= (PTR) bfd_alloc (abfd, (bfd_size_type) GO32_STUBSIZE);
-+      if (coff_data (abfd)->go32stub == NULL)
- 	return;
--      memcpy (bfd_coff_go32stub (abfd), stub_bytes, STUBSIZE);
-+      memcpy (coff_data (abfd)->go32stub, stub_bytes, GO32_STUBSIZE);
-     }
- }
- 
-@@ -403,13 +395,20 @@ go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
-   if (ibfd->xvec != obfd->xvec)
-     return TRUE;
- 
--  /* Check if both have a valid stub.  */
--  if (bfd_coff_go32stub (ibfd) == NULL
--      || bfd_coff_go32stub (obfd) == NULL)
-+  /* Check if we have a source stub.  */
-+  if (coff_data (ibfd)->go32stub == NULL)
-     return TRUE;
- 
-+  /* As adjust_filehdr_out_pre may get called only after this function,
-+     optionally allocate the output stub.  */
-+  if (coff_data (obfd)->go32stub == NULL)
-+    coff_data (obfd)->go32stub = (PTR) bfd_alloc (obfd,
-+						(bfd_size_type) GO32_STUBSIZE);
-+
-   /* Now copy the stub.  */
--  memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
-+  if (coff_data (obfd)->go32stub != NULL)
-+    memcpy (coff_data (obfd)->go32stub, coff_data (ibfd)->go32stub,
-+	    GO32_STUBSIZE);
- 
-   return TRUE;
- }
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 4b748b4..1cc860a 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -1992,6 +1992,11 @@ coff_mkobject_hook (bfd * abfd,
-     abfd->flags |= HAS_DEBUG;
- #endif
- 
-+  if ((internal_f->f_flags & F_GO32STUB) != 0)
-+    coff->go32stub = (char *) bfd_alloc (abfd, (bfd_size_type) GO32_STUBSIZE);
-+  if (coff->go32stub != NULL)
-+    memcpy (coff->go32stub, internal_f->go32stub, GO32_STUBSIZE);
-+
-   return coff;
- }
- #endif
-diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
-index 16b6c7b..f3108ee 100644
---- a/bfd/libcoff-in.h
-+++ b/bfd/libcoff-in.h
-@@ -106,6 +106,9 @@ typedef struct coff_tdata
-      used by ARM code.  */
-   flagword flags;
- 
-+  /* coff-stgo32 EXE stub header after BFD tdata has been allocated.  Its data
-+     is kept in internal_filehdr.go32stub beforehand.  */
-+  char *go32stub;
- } coff_data_type;
- 
- /* Tdata for pe image files.  */
-diff --git a/bfd/libcoff.h b/bfd/libcoff.h
-index a4ab405..4bb43f3 100644
---- a/bfd/libcoff.h
-+++ b/bfd/libcoff.h
-@@ -110,6 +110,9 @@ typedef struct coff_tdata
-      used by ARM code.  */
-   flagword flags;
- 
-+  /* coff-stgo32 EXE stub header after BFD tdata has been allocated.  Its data
-+     is kept in internal_filehdr.go32stub beforehand.  */
-+  char *go32stub;
- } coff_data_type;
- 
- /* Tdata for pe image files.  */
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
 index ccc4db8..496c9f2 100644
 --- a/gdb/Makefile.in
@@ -4392,7 +4113,7 @@ index 0bfcfca..01018d6 100644
  
  #endif /* dwarf2loc.h */
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 445bab8..51699bb 100644
+index 445bab8..65556c9 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -1,8 +1,7 @@
@@ -4534,23 +4255,17 @@ index 445bab8..51699bb 100644
  static void read_module (struct die_info *die, struct dwarf2_cu *cu);
  
  static void read_import_statement (struct die_info *die, struct dwarf2_cu *);
-@@ -1078,7 +1101,14 @@ static int is_ref_attr (struct attribute *);
+@@ -1078,7 +1101,8 @@ static int is_ref_attr (struct attribute *);
  
  static unsigned int dwarf2_get_ref_die_offset (struct attribute *);
  
 -static int dwarf2_get_attr_constant_value (struct attribute *, int);
-+enum get_attr_constant_value
-+  {
-+    dwarf2_attr_unknown,
-+    dwarf2_attr_const,
-+    dwarf2_attr_block
-+  };
-+static enum get_attr_constant_value get_attr_constant_value
-+  (struct attribute *attr, int *val_return);
++static CORE_ADDR dwarf2_get_attr_constant_value (struct attribute *, CORE_ADDR,
++					   struct dwarf2_cu *);
  
  static struct die_info *follow_die_ref_or_sig (struct die_info *,
  					       struct attribute *,
-@@ -1150,6 +1180,9 @@ static void age_cached_comp_units (void);
+@@ -1150,6 +1174,9 @@ static void age_cached_comp_units (void);
  
  static void free_one_cached_comp_unit (void *);
  
@@ -4560,7 +4275,7 @@ index 445bab8..51699bb 100644
  static struct type *set_die_type (struct die_info *, struct type *,
  				  struct dwarf2_cu *);
  
-@@ -1169,22 +1202,31 @@ static void dwarf2_clear_marks (struct dwarf2_per_cu_data *);
+@@ -1169,22 +1196,31 @@ static void dwarf2_clear_marks (struct dwarf2_per_cu_data *);
  
  static struct type *get_die_type (struct die_info *die, struct dwarf2_cu *cu);
  
@@ -4601,7 +4316,7 @@ index 445bab8..51699bb 100644
  }
  
  /* When loading sections, we can either look for ".<name>", or for
-@@ -1277,10 +1319,13 @@ dwarf2_locate_sections (bfd *abfd, asection *sectp, void *ignore_ptr)
+@@ -1277,10 +1313,13 @@ dwarf2_locate_sections (bfd *abfd, asection *sectp, void *ignore_ptr)
  }
  
  /* Decompress a section that was compressed using zlib.  Store the
@@ -4617,7 +4332,7 @@ index 445bab8..51699bb 100644
                           gdb_byte **outbuf, bfd_size_type *outsize)
  {
    bfd *abfd = objfile->obfd;
-@@ -1297,6 +1342,7 @@ zlib_decompress_section (struct objfile *objfile, asection *sectp,
+@@ -1297,6 +1336,7 @@ zlib_decompress_section (struct objfile *objfile, asection *sectp,
    z_stream strm;
    int rc;
    int header_size = 12;
@@ -4625,7 +4340,7 @@ index 445bab8..51699bb 100644
  
    if (bfd_seek (abfd, sectp->filepos, SEEK_SET) != 0
        || bfd_bread (compressed_buffer, compressed_size, abfd) != compressed_size)
-@@ -1326,8 +1372,13 @@ zlib_decompress_section (struct objfile *objfile, asection *sectp,
+@@ -1326,8 +1366,13 @@ zlib_decompress_section (struct objfile *objfile, asection *sectp,
    strm.avail_in = compressed_size - header_size;
    strm.next_in = (Bytef*) compressed_buffer + header_size;
    strm.avail_out = uncompressed_size;
@@ -4641,7 +4356,7 @@ index 445bab8..51699bb 100644
    rc = inflateInit (&strm);
    while (strm.avail_in > 0)
      {
-@@ -1348,26 +1399,136 @@ zlib_decompress_section (struct objfile *objfile, asection *sectp,
+@@ -1348,26 +1393,136 @@ zlib_decompress_section (struct objfile *objfile, asection *sectp,
      error (_("Dwarf Error: concluding DWARF uncompression in '%s': %d"),
             bfd_get_filename (abfd), rc);
  
@@ -4783,7 +4498,7 @@ index 445bab8..51699bb 100644
  
    if (info->asection == NULL || info->size == 0)
      return;
-@@ -1380,7 +1541,7 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
+@@ -1380,7 +1535,7 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
        /* Upon decompression, update the buffer and its size.  */
        if (strncmp (header, "ZLIB", sizeof (header)) == 0)
          {
@@ -4792,7 +4507,7 @@ index 445bab8..51699bb 100644
  				   &info->size);
            return;
          }
-@@ -1403,7 +1564,7 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
+@@ -1403,7 +1558,7 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
  
        if (retbuf != MAP_FAILED)
  	{
@@ -4801,7 +4516,7 @@ index 445bab8..51699bb 100644
  	  info->buffer = retbuf + (sectp->filepos & (pagesize - 1)) ;
  	  return;
  	}
-@@ -1411,8 +1572,15 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
+@@ -1411,8 +1566,15 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
  #endif
  
    /* If we get here, we are a normal, not-compressed section.  */
@@ -4819,7 +4534,7 @@ index 445bab8..51699bb 100644
  
    /* When debugging .o files, we may need to apply relocations; see
       http://sourceware.org/ml/gdb-patches/2002-04/msg00136.html .
-@@ -1421,6 +1589,8 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
+@@ -1421,6 +1583,8 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
    retbuf = symfile_relocate_debug_section (abfd, sectp, buf);
    if (retbuf != NULL)
      {
@@ -4828,7 +4543,7 @@ index 445bab8..51699bb 100644
        info->buffer = retbuf;
        return;
      }
-@@ -1429,6 +1599,19 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
+@@ -1429,6 +1593,19 @@ dwarf2_read_section (struct objfile *objfile, struct dwarf2_section_info *info)
        || bfd_bread (buf, info->size, abfd) != info->size)
      error (_("Dwarf Error: Can't read DWARF data from '%s'"),
  	   bfd_get_filename (abfd));
@@ -4848,7 +4563,7 @@ index 445bab8..51699bb 100644
  }
  
  /* Fill in SECTP, BUFP and SIZEP with section info, given OBJFILE and
-@@ -1666,11 +1849,7 @@ dwarf2_create_include_psymtab (char *name, struct partial_symtab *pst,
+@@ -1666,11 +1843,7 @@ dwarf2_create_include_psymtab (char *name, struct partial_symtab *pst,
  
  /* Read the Line Number Program data and extract the list of files
     included by the source file represented by PST.  Build an include
@@ -4861,7 +4576,7 @@ index 445bab8..51699bb 100644
  
  static void
  dwarf2_build_include_psymtabs (struct dwarf2_cu *cu,
-@@ -1812,6 +1991,37 @@ lookup_signatured_type (struct objfile *objfile, ULONGEST sig)
+@@ -1812,6 +1985,37 @@ lookup_signatured_type (struct objfile *objfile, ULONGEST sig)
    return entry;
  }
  
@@ -4899,7 +4614,7 @@ index 445bab8..51699bb 100644
  /* Subroutine of process_type_comp_unit and dwarf2_build_psymtabs_hard
     to combine the common parts.
     Process a compilation unit for a psymtab.
-@@ -1878,7 +2088,7 @@ process_psymtab_comp_unit (struct objfile *objfile,
+@@ -1878,7 +2082,7 @@ process_psymtab_comp_unit (struct objfile *objfile,
      }
  
    /* Set the language we're debugging.  */
@@ -4908,7 +4623,7 @@ index 445bab8..51699bb 100644
  
    /* Allocate a new partial symbol table structure.  */
    pst = start_psymtab_common (objfile, objfile->section_offsets,
-@@ -1929,8 +2139,8 @@ process_psymtab_comp_unit (struct objfile *objfile,
+@@ -1929,8 +2133,8 @@ process_psymtab_comp_unit (struct objfile *objfile,
      }
    else if (comp_unit_die.has_pc_info
  	   && comp_unit_die.lowpc < comp_unit_die.highpc)
@@ -4919,7 +4634,7 @@ index 445bab8..51699bb 100644
      addrmap_set_empty (objfile->psymtabs_addrmap,
  		       comp_unit_die.lowpc + baseaddr,
  		       comp_unit_die.highpc + baseaddr - 1, pst);
-@@ -2361,7 +2571,7 @@ partial_die_parent_scope (struct partial_die_info *pdi,
+@@ -2361,7 +2565,7 @@ partial_die_parent_scope (struct partial_die_info *pdi,
  	 ignoring them.  */
        complaint (&symfile_complaints,
  		 _("unhandled containing DIE tag %d for DIE at %d"),
@@ -4928,7 +4643,7 @@ index 445bab8..51699bb 100644
        parent->scope = grandparent_scope;
      }
  
-@@ -2376,12 +2586,22 @@ partial_die_full_name (struct partial_die_info *pdi,
+@@ -2376,12 +2580,22 @@ partial_die_full_name (struct partial_die_info *pdi,
  		       struct dwarf2_cu *cu)
  {
    char *parent_scope;
@@ -4955,7 +4670,7 @@ index 445bab8..51699bb 100644
  }
  
  static void
-@@ -2397,12 +2617,9 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
+@@ -2397,12 +2611,9 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -4971,7 +4686,7 @@ index 445bab8..51699bb 100644
  
    if (actual_name == NULL)
      actual_name = pdi->name;
-@@ -2534,22 +2751,6 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
+@@ -2534,22 +2745,6 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
        break;
      }
  
@@ -4994,7 +4709,7 @@ index 445bab8..51699bb 100644
    if (built_actual_name)
      xfree (actual_name);
  }
-@@ -2559,9 +2760,9 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
+@@ -2559,9 +2754,9 @@ add_partial_symbol (struct partial_die_info *pdi, struct dwarf2_cu *cu)
     name listed in the die.  */
  
  static int
@@ -5006,7 +4721,7 @@ index 445bab8..51699bb 100644
      {
      case DW_TAG_namespace:
      case DW_TAG_typedef:
-@@ -2571,7 +2772,23 @@ pdi_needs_namespace (enum dwarf_tag tag)
+@@ -2571,7 +2766,23 @@ pdi_needs_namespace (enum dwarf_tag tag)
      case DW_TAG_union_type:
      case DW_TAG_enumeration_type:
      case DW_TAG_enumerator:
@@ -5030,7 +4745,7 @@ index 445bab8..51699bb 100644
      default:
        return 0;
      }
-@@ -2700,27 +2917,6 @@ guess_structure_name (struct partial_die_info *struct_pdi,
+@@ -2700,27 +2911,6 @@ guess_structure_name (struct partial_die_info *struct_pdi,
  
        if (real_pdi->die_parent != NULL)
  	return;
@@ -5058,7 +4773,7 @@ index 445bab8..51699bb 100644
      }
  }
  
-@@ -3170,7 +3366,6 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
+@@ -3170,7 +3360,6 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
    CORE_ADDR lowpc, highpc;
    struct symtab *symtab;
    struct cleanup *back_to;
@@ -5066,7 +4781,7 @@ index 445bab8..51699bb 100644
    CORE_ADDR baseaddr;
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
-@@ -3180,30 +3375,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
+@@ -3180,30 +3369,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
  
    cu->list_in_scope = &file_symbols;
  
@@ -5098,7 +4813,7 @@ index 445bab8..51699bb 100644
  
    /* Do line number decoding in read_file_scope () */
    process_die (cu->dies, cu);
-@@ -3234,6 +3406,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
+@@ -3234,6 +3400,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
  static void
  process_die (struct die_info *die, struct dwarf2_cu *cu)
  {
@@ -5106,7 +4821,7 @@ index 445bab8..51699bb 100644
    switch (die->tag)
      {
      case DW_TAG_padding:
-@@ -3312,42 +3485,69 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3312,42 +3479,69 @@ 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
@@ -5198,7 +4913,7 @@ index 445bab8..51699bb 100644
  
  static void
  read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
-@@ -3356,9 +3556,15 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3356,9 +3550,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;
@@ -5216,7 +4931,7 @@ index 445bab8..51699bb 100644
    import_attr = dwarf2_attr (die, DW_AT_import, cu);
    if (import_attr == NULL)
      {
-@@ -3406,29 +3612,45 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3406,29 +3606,45 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
        return;
      }
  
@@ -5275,7 +4990,7 @@ index 445bab8..51699bb 100644
  }
  
  static void
-@@ -3676,7 +3898,7 @@ unsigned_int_compar (const void *ap, const void *bp)
+@@ -3676,7 +3892,7 @@ unsigned_int_compar (const void *ap, const void *bp)
  
    return (a > b) - (b > a);
  }
@@ -5284,7 +4999,7 @@ index 445bab8..51699bb 100644
  /* DW_AT_abstract_origin inherits whole DIEs (not just their attributes).
     Inherit only the children of the DW_AT_abstract_origin DIE not being already
     referenced by DW_AT_abstract_origin from the children of the current DIE.  */
-@@ -3697,6 +3919,14 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3697,6 +3913,14 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
    struct attribute *attr;
  
    attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
@@ -5299,7 +5014,7 @@ index 445bab8..51699bb 100644
    if (!attr)
      return;
  
-@@ -3795,6 +4025,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3795,6 +4019,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
    char *name;
    CORE_ADDR baseaddr;
    struct block *block;
@@ -5307,7 +5022,7 @@ index 445bab8..51699bb 100644
    int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
  
    if (inlined_func)
-@@ -3813,13 +4044,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3813,13 +4038,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -5334,7 +5049,7 @@ index 445bab8..51699bb 100644
    lowpc += baseaddr;
    highpc += baseaddr;
  
-@@ -3846,14 +4087,12 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3846,14 +4081,12 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  
    cu->list_in_scope = &local_symbols;
  
@@ -5354,7 +5069,7 @@ index 445bab8..51699bb 100644
      }
  
    inherit_abstract_dies (die, cu);
-@@ -3905,7 +4144,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3905,7 +4138,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.  */
@@ -5363,7 +5078,7 @@ index 445bab8..51699bb 100644
      return;
    lowpc += baseaddr;
    highpc += baseaddr;
-@@ -3922,7 +4161,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3922,7 +4155,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
      }
    new = pop_context ();
  
@@ -5372,7 +5087,7 @@ index 445bab8..51699bb 100644
      {
        struct block *block
          = finish_block (0, &local_symbols, new->old_blocks, new->start_addr,
-@@ -4077,7 +4316,8 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
+@@ -4077,7 +4310,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,
@@ -5382,7 +5097,7 @@ index 445bab8..51699bb 100644
  {
    struct attribute *attr;
    CORE_ADDR low = 0;
-@@ -4105,7 +4345,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
+@@ -4105,7 +4339,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.  */
@@ -5391,7 +5106,7 @@ index 445bab8..51699bb 100644
  	    return 0;
  	  /* Found discontinuous range of addresses.  */
  	  ret = -1;
-@@ -4144,7 +4384,7 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
+@@ -4144,7 +4378,7 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
    CORE_ADDR low, high;
    struct die_info *child = die->child;
  
@@ -5400,7 +5115,7 @@ index 445bab8..51699bb 100644
      {
        *lowpc = min (*lowpc, low);
        *highpc = max (*highpc, high);
-@@ -4181,7 +4421,7 @@ get_scope_pc_bounds (struct die_info *die,
+@@ -4181,7 +4415,7 @@ get_scope_pc_bounds (struct die_info *die,
    CORE_ADDR best_high = (CORE_ADDR) 0;
    CORE_ADDR current_low, current_high;
  
@@ -5409,21 +5124,31 @@ index 445bab8..51699bb 100644
      {
        best_low = current_low;
        best_high = current_high;
-@@ -4393,7 +4633,12 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
-               byte_offset = 0;
-             }
-           else if (attr_form_is_constant (attr))
+@@ -4384,21 +4618,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+       /* Get bit offset of field.  */
+       attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
+       if (attr)
+-	{
+-          int byte_offset;
+-
+-          if (attr_form_is_section_offset (attr))
+-            {
+-              dwarf2_complex_location_expr_complaint ();
+-              byte_offset = 0;
+-            }
+-          else if (attr_form_is_constant (attr))
 -            byte_offset = dwarf2_get_attr_constant_value (attr, 0);
-+            {
-+	      enum get_attr_constant_value type;
-+	      
-+	      type = get_attr_constant_value (attr, &byte_offset);
-+	      gdb_assert (type == dwarf2_attr_const);
-+	    }
-           else
-             byte_offset = decode_locdesc (DW_BLOCK (attr), cu);
- 
-@@ -4476,7 +4721,11 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+-          else
+-            byte_offset = decode_locdesc (DW_BLOCK (attr), cu);
+-
+-          SET_FIELD_BITPOS (*fp, byte_offset * bits_per_byte);
+-	}
++	SET_FIELD_BITPOS (*fp, dwarf2_get_attr_constant_value (attr, 0, cu)
++			       * bits_per_byte);
+       attr = dwarf2_attr (die, DW_AT_bit_offset, cu);
+       if (attr)
+ 	{
+@@ -4476,7 +4697,11 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
        if (fieldname == NULL)
  	return;
  
@@ -5436,7 +5161,16 @@ index 445bab8..51699bb 100644
        physname = dwarf2_linkage_name (die, cu);
  
        /* The name is already allocated along with this objfile, so we don't
-@@ -4607,7 +4856,11 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4490,7 +4715,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+       /* C++ base class field.  */
+       attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
+       if (attr)
+-	SET_FIELD_BITPOS (*fp, decode_locdesc (DW_BLOCK (attr), cu)
++	SET_FIELD_BITPOS (*fp, dwarf2_get_attr_constant_value (attr, 0, cu)
+ 			       * bits_per_byte);
+       FIELD_BITSIZE (*fp) = 0;
+       FIELD_TYPE (*fp) = die_type (die, cu);
+@@ -4607,7 +4832,11 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
    if (fieldname == NULL)
      return;
  
@@ -5449,7 +5183,7 @@ index 445bab8..51699bb 100644
    physname = dwarf2_linkage_name (die, cu);
  
    /* Look up member function name in fieldlist.  */
-@@ -4652,7 +4905,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4652,7 +4881,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 : "";
@@ -5458,7 +5192,31 @@ index 445bab8..51699bb 100644
    this_type = read_type_die (die, cu);
    if (this_type && TYPE_CODE (this_type) == TYPE_CODE_FUNC)
      {
-@@ -4836,7 +5089,7 @@ quirk_gcc_member_function_pointer (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4709,22 +4938,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+   /* Get index in virtual function table if it is a virtual member function.  */
+   attr = dwarf2_attr (die, DW_AT_vtable_elem_location, cu);
+   if (attr)
+-    {
+-      /* Support the .debug_loc offsets */
+-      if (attr_form_is_block (attr))
+-        {
+-          fnp->voffset = decode_locdesc (DW_BLOCK (attr), cu) + 2;
+-        }
+-      else if (attr_form_is_section_offset (attr))
+-        {
+-	  dwarf2_complex_location_expr_complaint ();
+-        }
+-      else
+-        {
+-	  dwarf2_invalid_attrib_class_complaint ("DW_AT_vtable_elem_location",
+-						 fieldname);
+-        }
+-   }
++    fnp->voffset = dwarf2_get_attr_constant_value (attr, -2, cu) + 2;
+ }
+ 
+ /* Create the vector of member function fields, and attach it to the type.  */
+@@ -4836,7 +5050,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));
@@ -5467,7 +5225,7 @@ index 445bab8..51699bb 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));
-@@ -4889,7 +5142,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4889,7 +5103,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
        return set_die_type (die, type, cu);
      }
  
@@ -5476,7 +5234,7 @@ index 445bab8..51699bb 100644
    INIT_CPLUS_SPECIFIC (type);
  
    name = dwarf2_name (die, cu);
-@@ -4898,14 +5151,18 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4898,14 +5112,18 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
        if (cu->language == language_cplus
  	  || cu->language == language_java)
  	{
@@ -5498,7 +5256,7 @@ index 445bab8..51699bb 100644
  	}
      }
  
-@@ -5115,7 +5372,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5115,7 +5333,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
        return set_die_type (die, type, cu);
      }
  
@@ -5507,7 +5265,7 @@ index 445bab8..51699bb 100644
  
    TYPE_CODE (type) = TYPE_CODE_ENUM;
    name = dwarf2_full_name (die, cu);
-@@ -5143,51 +5400,6 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5143,51 +5361,6 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
    return set_die_type (die, type, cu);
  }
  
@@ -5559,7 +5317,7 @@ index 445bab8..51699bb 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.
-@@ -5265,6 +5477,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5265,6 +5438,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
    new_symbol (die, this_type, cu);
  }
  
@@ -5589,7 +5347,7 @@ index 445bab8..51699bb 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.  */
-@@ -5278,7 +5513,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5278,7 +5474,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;
@@ -5598,7 +5356,7 @@ index 445bab8..51699bb 100644
    struct cleanup *back_to;
    char *name;
  
-@@ -5325,16 +5560,11 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5325,16 +5521,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)
@@ -5620,7 +5378,7 @@ index 445bab8..51699bb 100644
  
    /* Understand Dwarf2 support for vector types (like they occur on
       the PowerPC w/ AltiVec).  Gcc just adds another attribute to the
-@@ -5401,12 +5631,14 @@ read_set_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5401,49 +5592,83 @@ read_set_type (struct die_info *die, struct dwarf2_cu *cu)
    return set_die_type (die, set_type, cu);
  }
  
@@ -5637,8 +5395,26 @@ index 445bab8..51699bb 100644
    struct attribute *attr;
    struct symbol *sym;
    CORE_ADDR base = (CORE_ADDR) 0;
-@@ -5431,10 +5663,40 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
-     }
+ 
+   attr = dwarf2_attr (die, DW_AT_location, cu);
+   if (attr)
+-    {
+-      /* Support the .debug_loc offsets */
+-      if (attr_form_is_block (attr))
+-        {
+-          base = decode_locdesc (DW_BLOCK (attr), cu);
+-        }
+-      else if (attr_form_is_section_offset (attr))
+-        {
+-	  dwarf2_complex_location_expr_complaint ();
+-        }
+-      else
+-        {
+-	  dwarf2_invalid_attrib_class_complaint ("DW_AT_location",
+-						 "common block member");
+-        }
+-    }
++    base = dwarf2_get_attr_constant_value (attr, 0, cu);
    if (die->child != NULL)
      {
 +      struct objfile *objfile = cu->objfile;
@@ -5653,9 +5429,9 @@ index 445bab8..51699bb 100644
 +      /* Artificial type to be used only by `info common'.  */
 +      TYPE_NAME (type) = "<common>";
 +
-+      child_die = die->child;
-+      while (child_die && child_die->tag)
-+	{
+       child_die = die->child;
+       while (child_die && child_die->tag)
+ 	{
 +	  TYPE_NFIELDS (type)++;
 +	  child_die = sibling_die (child_die);
 +	}
@@ -5667,9 +5443,9 @@ index 445bab8..51699bb 100644
 +				     * TYPE_NFIELDS (type));
 +      
 +      field = TYPE_FIELDS (type);
-       child_die = die->child;
-       while (child_die && child_die->tag)
- 	{
++      child_die = die->child;
++      while (child_die && child_die->tag)
++	{
 +	  /* Create the symbol in the DW_TAG_common_block block in the current
 +	     symbol scope.  */
  	  sym = new_symbol (child_die, NULL, cu);
@@ -5678,8 +5454,9 @@ index 445bab8..51699bb 100644
  	  attr = dwarf2_attr (child_die, DW_AT_data_member_location, cu);
  	  if (attr)
  	    {
-@@ -5442,8 +5704,25 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
- 		base + decode_locdesc (DW_BLOCK (attr), cu);
+ 	      SYMBOL_VALUE_ADDRESS (sym) =
+-		base + decode_locdesc (DW_BLOCK (attr), cu);
++		base + dwarf2_get_attr_constant_value (attr, 0, cu);
  	      add_symbol_to_list (sym, &global_symbols);
  	    }
 +
@@ -5704,7 +5481,7 @@ index 445bab8..51699bb 100644
      }
  }
  
-@@ -5511,7 +5790,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5511,7 +5736,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
        if (is_anonymous)
  	{
  	  const char *previous_prefix = determine_prefix (die, cu);
@@ -5713,7 +5490,7 @@ index 445bab8..51699bb 100644
  	}
      }
  
-@@ -5705,29 +5984,95 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5705,29 +5930,93 @@ 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;
@@ -5734,92 +5511,86 @@ index 445bab8..51699bb 100644
 -  if (attr)
 -    {
 -      length = DW_UNSND (attr);
--    }
--  else
--    {
--      /* check for the DW_AT_byte_size attribute */
-+  switch (get_attr_constant_value (attr, &length))
++  if (attr && attr_form_is_block (attr))
 +    {
-+    case dwarf2_attr_const:
-+      /* We currently do not support a constant address where the location
-+	 should be read from - DWARF2_ATTR_BLOCK is expected instead.  See
-+	 DWARF for the DW_AT_STRING_LENGTH vs. DW_AT_BYTE_SIZE difference.  */
-+      /* PASSTHRU */
-+    case dwarf2_attr_unknown:
++      /* Security check for a size overflow.  */
++      if (DW_BLOCK (attr)->size + 2 < DW_BLOCK (attr)->size)
++	TYPE_HIGH_BOUND (range_type) = 1;
++      /* Extend the DWARF block by a new DW_OP_deref/DW_OP_deref_size
++	 instruction as DW_AT_string_length specifies the length location, not
++	 its value.  */
++      else
++	{
++	  struct dwarf2_locexpr_baton *length_baton;
++	  struct attribute *size_attr;
++
++	  length_baton = obstack_alloc (&cu->comp_unit_obstack,
++					sizeof (*length_baton));
++	  length_baton->per_cu = cu->per_cu;
++	  length_baton->data = obstack_alloc (&cu->comp_unit_obstack,
++					      DW_BLOCK (attr)->size + 2);
++	  memcpy (length_baton->data, DW_BLOCK (attr)->data,
++		  DW_BLOCK (attr)->size);
++
++	  /* DW_AT_BYTE_SIZE existing together with DW_AT_STRING_LENGTH
++	     specifies the size of an integer to fetch.  */
++
++	  size_attr = dwarf2_attr (die, DW_AT_byte_size, cu);
++	  if (size_attr)
++	    {
++	      length_baton->size = DW_BLOCK (attr)->size + 2;
++	      length_baton->data[DW_BLOCK (attr)->size] = DW_OP_deref_size;
++	      length_baton->data[DW_BLOCK (attr)->size + 1]
++							 = DW_UNSND (size_attr);
++	      if (length_baton->data[DW_BLOCK (attr)->size + 1]
++		  != DW_UNSND (size_attr))
++		complaint (&symfile_complaints,
++			   _("DW_AT_string_length's DW_AT_byte_size integer "
++			     "exceeds the byte size storage"));
++	    }
++	  else
++	    {
++	      length_baton->size = DW_BLOCK (attr)->size + 1;
++	      length_baton->data[DW_BLOCK (attr)->size] = DW_OP_deref;
++	    }
++
++	  TYPE_RANGE_BOUND_SET_DWARF_BLOCK (range_type, 1);
++	  TYPE_FIELD_DWARF_BLOCK (range_type, 1) = length_baton;
++	  TYPE_DYNAMIC (range_type) = 1;
++	}
+     }
+   else
+     {
+-      /* check for the DW_AT_byte_size attribute */
++      if (attr && attr_form_is_constant (attr))
++	{
++	  /* We currently do not support a constant address where the location
++	     should be read from - attr_form_is_block is expected instead.  See
++	     DWARF for the DW_AT_STRING_LENGTH vs. DW_AT_BYTE_SIZE difference.
++	     */
++	  /* PASSTHRU */
++	}
++
        attr = dwarf2_attr (die, DW_AT_byte_size, cu);
 -      if (attr)
 -        {
 -          length = DW_UNSND (attr);
 -        }
--      else
--        {
--          length = 1;
--        }
-+      switch (get_attr_constant_value (attr, &length))
++      if (attr && attr_form_is_block (attr))
 +	{
-+	case dwarf2_attr_unknown:
-+	  length = 1;
-+	  /* PASSTHRU */
-+	case dwarf2_attr_const:
-+	  TYPE_HIGH_BOUND (range_type) = length;
-+	  break;
-+	case dwarf2_attr_block:
 +	  TYPE_RANGE_BOUND_SET_DWARF_BLOCK (range_type, 1);
 +	  TYPE_FIELD_DWARF_BLOCK (range_type, 1) =
 +					dwarf2_attr_to_locexpr_baton (attr, cu);
 +	  TYPE_DYNAMIC (range_type) = 1;
-+	  break;
-+	}
-+      break;
-+    case dwarf2_attr_block:
-+      /* Security check for a size overflow.  */
-+      if (DW_BLOCK (attr)->size + 2 < DW_BLOCK (attr)->size)
-+	{
-+	  TYPE_HIGH_BOUND (range_type) = 1;
-+	  break;
 +	}
-+      /* Extend the DWARF block by a new DW_OP_deref/DW_OP_deref_size
-+	 instruction as DW_AT_string_length specifies the length location, not
-+	 its value.  */
-+      {
-+	struct dwarf2_locexpr_baton *length_baton;
-+	struct attribute *size_attr;
-+
-+	length_baton = obstack_alloc (&cu->comp_unit_obstack,
-+				      sizeof (*length_baton));
-+	length_baton->per_cu = cu->per_cu;
-+	length_baton->data = obstack_alloc (&cu->comp_unit_obstack,
-+					    DW_BLOCK (attr)->size + 2);
-+	memcpy (length_baton->data, DW_BLOCK (attr)->data,
-+		DW_BLOCK (attr)->size);
-+
-+	/* DW_AT_BYTE_SIZE existing together with DW_AT_STRING_LENGTH specifies
-+	   the size of an integer to fetch.  */
-+
-+	size_attr = dwarf2_attr (die, DW_AT_byte_size, cu);
-+	if (size_attr)
-+	  {
-+	    length_baton->size = DW_BLOCK (attr)->size + 2;
-+	    length_baton->data[DW_BLOCK (attr)->size] = DW_OP_deref_size;
-+	    length_baton->data[DW_BLOCK (attr)->size + 1]
-+							 = DW_UNSND (size_attr);
-+	    if (length_baton->data[DW_BLOCK (attr)->size + 1]
-+	        != DW_UNSND (size_attr))
-+	      complaint (&symfile_complaints,
-+	                 _("DW_AT_string_length's DW_AT_byte_size integer "
-+			   "exceeds the byte size storage"));
-+	  }
-+	else
-+	  {
-+	    length_baton->size = DW_BLOCK (attr)->size + 1;
-+	    length_baton->data[DW_BLOCK (attr)->size] = DW_OP_deref;
-+	  }
-+
-+	TYPE_RANGE_BOUND_SET_DWARF_BLOCK (range_type, 1);
-+	TYPE_FIELD_DWARF_BLOCK (range_type, 1) = length_baton;
-+	TYPE_DYNAMIC (range_type) = 1;
-+      }
-+      break;
++      else if (attr && attr_form_is_constant (attr))
++	TYPE_HIGH_BOUND (range_type) = dwarf2_get_attr_constant_value (attr, 0,
++								       cu);
+       else
+-        {
+-          length = 1;
+-        }
++	TYPE_HIGH_BOUND (range_type) = 1;
      }
  
 -  index_type = objfile_type (objfile)->builtin_int;
@@ -5827,7 +5598,7 @@ index 445bab8..51699bb 100644
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -5822,7 +6167,6 @@ static struct type *
+@@ -5822,7 +6111,6 @@ static struct type *
  read_typedef (struct die_info *die, struct dwarf2_cu *cu)
  {
    struct objfile *objfile = cu->objfile;
@@ -5835,18 +5606,17 @@ index 445bab8..51699bb 100644
    const char *name = NULL;
    struct type *this_type;
  
-@@ -5930,8 +6274,8 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5930,8 +6218,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *base_type;
    struct type *range_type;
    struct attribute *attr;
 -  int low = 0;
 -  int high = -1;
-+  int low, high, byte_stride_int;
-+  enum get_attr_constant_value high_type;
++  int low;
    char *name;
    
    base_type = die_type (die, cu);
-@@ -5944,42 +6288,90 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5944,42 +6231,91 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  		     0, NULL, cu->objfile);
      }
  
@@ -5864,34 +5634,36 @@ index 445bab8..51699bb 100644
    attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
 -  if (attr)
 -    low = dwarf2_get_attr_constant_value (attr, 0);
-+  switch (get_attr_constant_value (attr, &low))
++  if (attr && attr_form_is_block (attr))
 +    {
-+    case dwarf2_attr_unknown:
-+      if (cu->language == language_fortran)
-+	{
-+	  /* FORTRAN implies a lower bound of 1, if not given.  */
-+	  low = 1;
-+	}
-+      else
-+        {
-+	  /* According to DWARF we should assume the value 0 only for
-+	     LANGUAGE_C and LANGUAGE_CPLUS.  */
-+	  low = 0;
-+	}
-+      /* PASSTHRU */
-+    case dwarf2_attr_const:
-+      TYPE_LOW_BOUND (range_type) = low;
-+      if (low >= 0)
-+	TYPE_UNSIGNED (range_type) = 1;
-+      break;
-+    case dwarf2_attr_block:
 +      TYPE_RANGE_BOUND_SET_DWARF_BLOCK (range_type, 0);
 +      TYPE_FIELD_DWARF_BLOCK (range_type, 0) = dwarf2_attr_to_locexpr_baton
 +								     (attr, cu);
 +      TYPE_DYNAMIC (range_type) = 1;
 +      /* For setting a default if DW_AT_UPPER_BOUND would be missing.  */
 +      low = 0;
-+      break;
++    }
++  else
++    {
++      if (attr && attr_form_is_constant (attr))
++	low = dwarf2_get_attr_constant_value (attr, 0, cu);
++      else
++	{
++	  if (cu->language == language_fortran)
++	    {
++	      /* FORTRAN implies a lower bound of 1, if not given.  */
++	      low = 1;
++	    }
++	  else
++	    {
++	      /* According to DWARF we should assume the value 0 only for
++		 LANGUAGE_C and LANGUAGE_CPLUS.  */
++	      low = 0;
++	    }
++	}
++      TYPE_LOW_BOUND (range_type) = low;
++      if (low >= 0)
++	TYPE_UNSIGNED (range_type) = 1;
 +    }
  
    attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
@@ -5912,62 +5684,60 @@ index 445bab8..51699bb 100644
 -             the lower bound we've computed above.  */
 -          high = low - 1;
 -        }
--      else
--        high = dwarf2_get_attr_constant_value (attr, 1);
-+  high_type = get_attr_constant_value (attr, &high);
-+  if (high_type == dwarf2_attr_unknown)
++  if (!attr || (!attr_form_is_block (attr) && !attr_form_is_constant (attr)))
 +    {
 +      attr = dwarf2_attr (die, DW_AT_count, cu);
-+      high_type = get_attr_constant_value (attr, &high);
 +      /* It does not hurt but it is needlessly ineffective in check_typedef.  */
-+      if (high_type != dwarf2_attr_unknown)
++      if (attr && (attr_form_is_block (attr) || attr_form_is_constant (attr)))
 +      	{
 +	  TYPE_RANGE_HIGH_BOUND_IS_COUNT (range_type) = 1;
 +	  TYPE_DYNAMIC (range_type) = 1;
 +	}
 +      /* Pass it now as the regular DW_AT_upper_bound.  */
 +    }
-+  switch (high_type)
++
++  if (attr && attr_form_is_block (attr))
 +    {
-+    case dwarf2_attr_unknown:
-+      TYPE_RANGE_UPPER_BOUND_IS_UNDEFINED (range_type) = 1;
-+      high = low - 1;
-+      /* PASSTHRU */
-+    case dwarf2_attr_const:
-+      TYPE_HIGH_BOUND (range_type) = high;
-+      break;
-+    case dwarf2_attr_block:
 +      TYPE_RANGE_BOUND_SET_DWARF_BLOCK (range_type, 1);
 +      TYPE_FIELD_DWARF_BLOCK (range_type, 1) = dwarf2_attr_to_locexpr_baton
 +								     (attr, cu);
 +      TYPE_DYNAMIC (range_type) = 1;
-+      break;
++    }
++  else
++    {
++      if (attr && attr_form_is_constant (attr))
++	TYPE_HIGH_BOUND (range_type) = dwarf2_get_attr_constant_value (attr, 0,
++								       cu);
+       else
+-        high = dwarf2_get_attr_constant_value (attr, 1);
++	{
++	  TYPE_RANGE_UPPER_BOUND_IS_UNDEFINED (range_type) = 1;
++	  TYPE_HIGH_BOUND (range_type) = low - 1;
++	}
      }
  
 -  range_type = create_range_type (NULL, base_type, low, high);
 +  /* DW_AT_bit_stride is currently unsupported as we count in bytes.  */
 +  attr = dwarf2_attr (die, DW_AT_byte_stride, cu);
-+  switch (get_attr_constant_value (attr, &byte_stride_int))
++  if (attr && attr_form_is_block (attr))
 +    {
-+    case dwarf2_attr_unknown:
-+      break;
-+    case dwarf2_attr_const:
-+      if (byte_stride_int == 0)
-+	complaint (&symfile_complaints,
-+		   _("Found DW_AT_byte_stride with unsupported value 0"));
-+      TYPE_BYTE_STRIDE (range_type) = byte_stride_int;
-+      break;
-+    case dwarf2_attr_block:
 +      TYPE_RANGE_BOUND_SET_DWARF_BLOCK (range_type, 2);
 +      TYPE_FIELD_DWARF_BLOCK (range_type, 2) = dwarf2_attr_to_locexpr_baton
 +								     (attr, cu);
 +      TYPE_DYNAMIC (range_type) = 1;
-+      break;
++    }
++  else if (attr && attr_form_is_constant (attr))
++    {
++      TYPE_BYTE_STRIDE (range_type) = dwarf2_get_attr_constant_value (attr, 0,
++								      cu);
++      if (TYPE_BYTE_STRIDE (range_type) == 0)
++	complaint (&symfile_complaints,
++		   _("Found DW_AT_byte_stride with unsupported value 0"));
 +    }
  
    name = dwarf2_name (die, cu);
    if (name)
-@@ -6670,9 +7062,6 @@ read_partial_die (struct partial_die_info *part_die,
+@@ -6670,9 +7006,6 @@ read_partial_die (struct partial_die_info *part_die,
  	  if (part_die->dirname == NULL)
  	    part_die->dirname = DW_STRING (&attr);
  	  break;
@@ -5977,7 +5747,7 @@ index 445bab8..51699bb 100644
  	case DW_AT_low_pc:
  	  has_low_pc_attr = 1;
  	  part_die->lowpc = DW_ADDR (&attr);
-@@ -6744,10 +7133,10 @@ read_partial_die (struct partial_die_info *part_die,
+@@ -6744,10 +7077,10 @@ read_partial_die (struct partial_die_info *part_die,
  	  else
  	    part_die->sibling = buffer + dwarf2_get_ref_die_offset (&attr);
  	  break;
@@ -5992,7 +5762,7 @@ index 445bab8..51699bb 100644
          case DW_AT_byte_size:
            part_die->has_byte_size = 1;
            break;
-@@ -6789,13 +7178,6 @@ read_partial_die (struct partial_die_info *part_die,
+@@ -6789,13 +7122,6 @@ read_partial_die (struct partial_die_info *part_die,
  	  || dwarf2_per_objfile->has_section_at_zero))
      part_die->has_pc_info = 1;
  
@@ -6006,7 +5776,7 @@ index 445bab8..51699bb 100644
    return info_ptr;
  }
  
-@@ -6904,7 +7286,8 @@ fixup_partial_die (struct partial_die_info *part_die,
+@@ -6904,7 +7230,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.  */
  
@@ -6016,7 +5786,7 @@ index 445bab8..51699bb 100644
      {
        struct partial_die_info *spec_die;
  
-@@ -8244,10 +8627,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
+@@ -8244,10 +8571,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
@@ -6031,7 +5801,7 @@ index 445bab8..51699bb 100644
  }
  
  /* Given a pointer to a DWARF information entry, figure out if we need
-@@ -8269,21 +8654,24 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8269,21 +8598,24 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -6063,7 +5833,7 @@ index 445bab8..51699bb 100644
  
        /* Default assumptions.
           Use the passed type or decode it from the die.  */
-@@ -8381,7 +8769,15 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8381,7 +8713,15 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  if (attr)
  	    {
  	      var_decode_location (attr, sym, cu);
@@ -6079,7 +5849,7 @@ index 445bab8..51699bb 100644
  	      if (attr2 && (DW_UNSND (attr2) != 0))
  		add_symbol_to_list (sym, &global_symbols);
  	      else
-@@ -8513,7 +8909,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8513,7 +8853,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:
@@ -6088,7 +5858,7 @@ index 445bab8..51699bb 100644
  	  attr = dwarf2_attr (die, DW_AT_const_value, cu);
  	  if (attr)
  	    {
-@@ -8537,6 +8933,11 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8537,6 +8877,11 @@ 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;
@@ -6100,7 +5870,7 @@ index 445bab8..51699bb 100644
  	default:
  	  /* Not a tag we recognize.  Hopefully we aren't processing
  	     trash data, but since we must specifically ignore things
-@@ -8550,8 +8951,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8550,8 +8895,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
@@ -6110,7 +5880,7 @@ index 445bab8..51699bb 100644
  	cp_scan_for_anonymous_namespaces (sym);
      }
    return (sym);
-@@ -8808,6 +9208,9 @@ read_type_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8808,6 +9152,9 @@ read_type_die (struct die_info *die, struct dwarf2_cu *cu)
        break;
      }
  
@@ -6120,7 +5890,7 @@ index 445bab8..51699bb 100644
    return this_type;
  }
  
-@@ -8889,10 +9292,97 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8889,10 +9236,97 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
  	     So it does not need a prefix.  */
  	  return "";
        default:
@@ -6219,14 +5989,18 @@ index 445bab8..51699bb 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,
-@@ -8948,14 +9438,75 @@ static char *
+@@ -8948,14 +9382,75 @@ static char *
  dwarf2_linkage_name (struct die_info *die, struct dwarf2_cu *cu)
  {
    struct attribute *attr;
 +  char *name;
 +
 +  name = dwarf2_name (die, cu);
-+
+ 
+-  attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
+-  if (attr && DW_STRING (attr))
+-    return DW_STRING (attr);
+-  return dwarf2_name (die, cu);
 +  /* These are the only languages we know how to qualify names in.  */
 +  if (cu->language != language_cplus
 +      && cu->language != language_java)
@@ -6255,11 +6029,7 @@ index 445bab8..51699bb 100644
 +	  && die->tag == DW_TAG_subprogram)
 +	{
 +	  struct type *type = read_type_die (die, cu);
- 
--  attr = dwarf2_attr (die, DW_AT_MIPS_linkage_name, cu);
--  if (attr && DW_STRING (attr))
--    return DW_STRING (attr);
--  return dwarf2_name (die, cu);
++
 +	  c_type_print_args (type, buf, 0, cu->language);
 +
 +	  if (cu->language == language_java)
@@ -6300,58 +6070,32 @@ index 445bab8..51699bb 100644
  
  static char *
  dwarf2_canonicalize_name (char *name, struct dwarf2_cu *cu,
-@@ -10181,26 +10732,35 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
+@@ -10181,11 +10676,12 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
    return 0;
  }
  
 -/* Return the constant value held by the given attribute.  Return -1
--   if the value held by the attribute is not constant.  */
-+/* (*val_return) is filled only if returning dwarf2_attr_const.  */
++/* Return the constant value held by the given attribute.  Return DEFAULT_VALUE
+    if the value held by the attribute is not constant.  */
  
 -static int
 -dwarf2_get_attr_constant_value (struct attribute *attr, int default_value)
-+static enum get_attr_constant_value
-+get_attr_constant_value (struct attribute *attr, int *val_return)
++static CORE_ADDR
++dwarf2_get_attr_constant_value (struct attribute *attr, CORE_ADDR default_value,
++				struct dwarf2_cu *cu)
  {
-+  if (attr == NULL)
-+    return dwarf2_attr_unknown;
    if (attr->form == DW_FORM_sdata)
--    return DW_SND (attr);
--  else if (attr->form == DW_FORM_udata
--           || attr->form == DW_FORM_data1
--           || attr->form == DW_FORM_data2
--           || attr->form == DW_FORM_data4
--           || attr->form == DW_FORM_data8)
--    return DW_UNSND (attr);
--  else
+     return DW_SND (attr);
+@@ -10195,6 +10691,8 @@ dwarf2_get_attr_constant_value (struct attribute *attr, int default_value)
+            || attr->form == DW_FORM_data4
+            || attr->form == DW_FORM_data8)
+     return DW_UNSND (attr);
++  else if (attr_form_is_block (attr))
++    return decode_locdesc (DW_BLOCK (attr), cu);
+   else
      {
--      complaint (&symfile_complaints, _("Attribute value is not a constant (%s)"),
--                 dwarf_form_name (attr->form));
--      return default_value;
-+      *val_return = DW_SND (attr);
-+      return dwarf2_attr_const;
-     }
-+  if (attr->form == DW_FORM_udata
-+      || attr->form == DW_FORM_data1
-+      || attr->form == DW_FORM_data2
-+      || attr->form == DW_FORM_data4
-+      || attr->form == DW_FORM_data8)
-+    {
-+      *val_return = DW_UNSND (attr);
-+      return dwarf2_attr_const;
-+    }
-+  if (attr->form == DW_FORM_block
-+      || attr->form == DW_FORM_block1
-+      || attr->form == DW_FORM_block2
-+      || attr->form == DW_FORM_block4)
-+    return dwarf2_attr_block;
-+  complaint (&symfile_complaints, _("Attribute value is not a constant (%s)"),
-+             dwarf_form_name (attr->form));
-+  return dwarf2_attr_unknown;
- }
- 
- /* THIS_CU has a reference to PER_CU.  If necessary, load the new compilation
-@@ -10990,8 +11550,6 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+       complaint (&symfile_complaints, _("Attribute value is not a constant (%s)"),
+@@ -10990,8 +11488,6 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
  {
    gdb_byte *mac_ptr, *mac_end;
    struct macro_source_file *current_file = 0;
@@ -6360,7 +6104,7 @@ index 445bab8..51699bb 100644
  
    if (dwarf2_per_objfile->macinfo.buffer == NULL)
      {
-@@ -10999,29 +11557,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -10999,29 +11495,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
        return;
      }
  
@@ -6395,7 +6139,7 @@ index 445bab8..51699bb 100644
          }
  
        macinfo_type = read_1_byte (abfd, mac_ptr);
-@@ -11032,92 +11580,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11032,92 +11518,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
            /* A zero macinfo type indicates the end of the macro
               information.  */
          case 0:
@@ -6489,7 +6233,7 @@ index 445bab8..51699bb 100644
  
          case DW_MACINFO_define:
          case DW_MACINFO_undef:
-@@ -11132,31 +11595,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11132,31 +11533,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
              mac_ptr += bytes_read;
  
              if (! current_file)
@@ -6532,7 +6276,7 @@ index 445bab8..51699bb 100644
            }
            break;
  
-@@ -11170,22 +11621,9 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11170,22 +11559,9 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
              file = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
              mac_ptr += bytes_read;
  
@@ -6558,7 +6302,7 @@ index 445bab8..51699bb 100644
            }
            break;
  
-@@ -11239,7 +11677,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11239,7 +11615,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
            }
            break;
          }
@@ -6567,16 +6311,7 @@ index 445bab8..51699bb 100644
  }
  
  /* Check if the attribute's form is a DW_FORM_block*
-@@ -11272,7 +11710,7 @@ attr_form_is_section_offset (struct attribute *attr)
- 
- /* Return non-zero if ATTR's value falls in the 'constant' class, or
-    zero otherwise.  When this function returns true, you can apply
--   dwarf2_get_attr_constant_value to it.
-+   get_attr_constant_value to it.
- 
-    However, note that for some attributes you must check
-    attr_form_is_section_offset before using this test.  DW_FORM_data4
-@@ -11299,6 +11737,34 @@ attr_form_is_constant (struct attribute *attr)
+@@ -11299,6 +11675,34 @@ attr_form_is_constant (struct attribute *attr)
      }
  }
  
@@ -6611,7 +6346,7 @@ index 445bab8..51699bb 100644
  static void
  dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
  			     struct dwarf2_cu *cu)
-@@ -11328,35 +11794,25 @@ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
+@@ -11328,35 +11732,25 @@ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
        SYMBOL_COMPUTED_OPS (sym) = &dwarf2_loclist_funcs;
        SYMBOL_LOCATION_BATON (sym) = baton;
      }
@@ -6662,7 +6397,7 @@ index 445bab8..51699bb 100644
      }
  }
  
-@@ -11644,6 +12100,31 @@ offset_and_type_eq (const void *item_lhs, const void *item_rhs)
+@@ -11644,6 +12038,31 @@ offset_and_type_eq (const void *item_lhs, const void *item_rhs)
    return ofs_lhs->offset == ofs_rhs->offset;
  }
  
@@ -6694,7 +6429,7 @@ index 445bab8..51699bb 100644
  /* Set the type associated with DIE to TYPE.  Save it in CU's hash
     table if necessary.  For convenience, return TYPE.  */
  
-@@ -11652,6 +12133,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -11652,6 +12071,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  {
    struct dwarf2_offset_and_type **slot, ofs;
  
@@ -6703,7 +6438,7 @@ index 445bab8..51699bb 100644
    if (cu->type_hash == NULL)
      {
        gdb_assert (cu->per_cu != NULL);
-@@ -11794,23 +12277,13 @@ show_dwarf2_cmd (char *args, int from_tty)
+@@ -11794,23 +12215,13 @@ show_dwarf2_cmd (char *args, int from_tty)
    cmd_show_list (show_dwarf2_cmdlist, from_tty, "");
  }
  
@@ -6731,7 +6466,7 @@ index 445bab8..51699bb 100644
  }
  
  /* munmap debug sections for OBJFILE, if necessary.  */
-@@ -11819,15 +12292,15 @@ static void
+@@ -11819,15 +12230,15 @@ static void
  dwarf2_per_objfile_cleanup (struct objfile *objfile, void *d)
  {
    struct dwarf2_per_objfile *data = d;
@@ -6756,7 +6491,7 @@ index 445bab8..51699bb 100644
  }
  
  void _initialize_dwarf2_read (void);
-@@ -11835,6 +12308,7 @@ void _initialize_dwarf2_read (void);
+@@ -11835,6 +12246,7 @@ void _initialize_dwarf2_read (void);
  void
  _initialize_dwarf2_read (void)
  {
@@ -10715,7 +10450,7 @@ index a84003f..924c1c5 100644
    default_symfile_offsets,	/* sym_offsets: dummy FIXME til implem sym reloc */
    default_symfile_segments,	/* sym_segments: Get segment information from
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index 43c5174..5ad4f8d 100644
+index 586f5d0..a4bf719 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
 @@ -432,10 +432,9 @@ free_objfile (struct objfile *objfile)
@@ -17501,10 +17236,10 @@ index cc3319a..d0d4702 100644
        if ((gdb_output_sym == NULL) || (gdb_output_len_sym == NULL))
  	ret = -1;
 diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
-index 97cc29c..f655956 100644
+index 8b96a6f..9428d92 100644
 --- a/gdb/solib-darwin.c
 +++ b/gdb/solib-darwin.c
-@@ -401,7 +401,6 @@ darwin_relocate_section_addresses (struct so_list *so,
+@@ -389,7 +389,6 @@ darwin_relocate_section_addresses (struct so_list *so,
  static struct symbol *
  darwin_lookup_lib_symbol (const struct objfile *objfile,
  			  const char *name,
@@ -17557,7 +17292,7 @@ index 6cfaa85..68aadc0 100644
  
  extern initialize_file_ftype _initialize_svr4_solib; /* -Wmissing-prototypes */
 diff --git a/gdb/solib.c b/gdb/solib.c
-index 564a55c..8c75b81 100644
+index aad2d59..def02f8 100644
 --- a/gdb/solib.c
 +++ b/gdb/solib.c
 @@ -1066,13 +1066,12 @@ show_auto_solib_add (struct ui_file *file, int from_tty,
@@ -17699,7 +17434,7 @@ index 1c37801..594eb16 100644
  	  print_variable_and_value (NULL, sym, frame, stream, 4 * num_tabs);
  	  break;
 diff --git a/gdb/symfile.c b/gdb/symfile.c
-index 4bdab91..e8c0236 100644
+index c182faa..8b971fb 100644
 --- a/gdb/symfile.c
 +++ b/gdb/symfile.c
 @@ -52,7 +52,6 @@
@@ -17793,7 +17528,7 @@ index 4bdab91..e8c0236 100644
    if (from_tty)
      printf_unfiltered (_("No symbol file now.\n"));
  }
-@@ -2346,7 +2369,7 @@ reread_symbols (void)
+@@ -2349,7 +2372,7 @@ reread_symbols (void)
  
  	      /* Remove any references to this objfile in the global
  		 value lists.  */
@@ -17802,7 +17537,7 @@ index 4bdab91..e8c0236 100644
  
  	      /* Nuke all the state that we will re-read.  Much of the following
  	         code which sets things to NULL really is necessary to tell
-@@ -2434,13 +2457,15 @@ reread_symbols (void)
+@@ -2437,13 +2460,15 @@ reread_symbols (void)
  	         zero is OK since dbxread.c also does what it needs to do if
  	         objfile->global_psymbols.size is 0.  */
  	      (*objfile->sf->sym_read) (objfile, 0);
@@ -17819,7 +17554,7 @@ index 4bdab91..e8c0236 100644
  	      /* We're done reading the symbol file; finish off complaints.  */
  	      clear_complaints (&symfile_complaints, 0, 1);
  
-@@ -2449,6 +2474,9 @@ reread_symbols (void)
+@@ -2452,6 +2477,9 @@ reread_symbols (void)
  
  	      reinit_frame_cache ();
  
@@ -17829,7 +17564,7 @@ index 4bdab91..e8c0236 100644
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
-@@ -2738,7 +2766,7 @@ allocate_symtab (char *filename, struct objfile *objfile)
+@@ -2741,7 +2769,7 @@ allocate_symtab (char *filename, struct objfile *objfile)
  }
  
  struct partial_symtab *
@@ -17838,7 +17573,7 @@ index 4bdab91..e8c0236 100644
  {
    struct partial_symtab *psymtab;
  
-@@ -2829,10 +2857,6 @@ clear_symtab_users (void)
+@@ -2832,10 +2860,6 @@ clear_symtab_users (void)
       between expressions and which ought to be reset each time.  */
    expression_context_block = NULL;
    innermost_block = NULL;
@@ -17849,7 +17584,7 @@ index 4bdab91..e8c0236 100644
  }
  
  static void
-@@ -3052,7 +3076,8 @@ again2:
+@@ -3055,7 +3079,8 @@ again2:
  
  struct partial_symtab *
  start_psymtab_common (struct objfile *objfile,
@@ -26573,68 +26308,3 @@ index c56ab86..dacf913 100644
    xcoff_symfile_finish,		/* sym_finish: finished with file, cleanup */
    xcoff_symfile_offsets,	/* sym_offsets: xlate offsets ext->int form */
    default_symfile_segments,	/* sym_segments: Get segment information from
-diff --git a/include/coff/go32exe.h b/include/coff/go32exe.h
-index c85da0c..2248ff2 100644
---- a/include/coff/go32exe.h
-+++ b/include/coff/go32exe.h
-@@ -16,11 +16,9 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
- 
--#define STUBSIZE 2048
--
- struct external_filehdr_go32_exe
-   {
--    char stub[STUBSIZE];/* the stub to load the image	*/
-+    char stub[GO32_STUBSIZE]; /* the stub to load the image */
- 			/* the standard COFF header     */
-     char f_magic[2];	/* magic number			*/
-     char f_nscns[2];	/* number of sections		*/
-@@ -34,4 +32,4 @@ struct external_filehdr_go32_exe
- #undef FILHDR
- #define	FILHDR	struct external_filehdr_go32_exe
- #undef FILHSZ
--#define	FILHSZ	STUBSIZE+20
-+#define	FILHSZ	GO32_STUBSIZE+20
-diff --git a/include/coff/internal.h b/include/coff/internal.h
-index c5d6cd1..36d03eb 100644
---- a/include/coff/internal.h
-+++ b/include/coff/internal.h
-@@ -58,10 +58,19 @@ struct internal_extra_pe_filehdr
-   bfd_vma  nt_signature;   	/* required NT signature, 0x4550 */ 
- };
- 
-+#define GO32_STUBSIZE 2048
-+
- struct internal_filehdr
- {
-   struct internal_extra_pe_filehdr pe;
- 
-+  /* coff-stgo32 EXE stub header before BFD tdata has been allocated.
-+     Its data is kept in INTERNAL_FILEHDR.GO32STUB afterwards.
-+     
-+     F_GO32STUB is set iff go32stub contains a valid data.  Artifical headers
-+     created in BFD have no pre-set go32stub.  */
-+  char go32stub[GO32_STUBSIZE];
-+
-   /* Standard coff internal info.  */
-   unsigned short f_magic;	/* magic number			*/
-   unsigned short f_nscns;	/* number of sections		*/
-@@ -84,7 +93,8 @@ struct internal_filehdr
-  	F_AR32W		file is 32-bit big-endian
-  	F_DYNLOAD	rs/6000 aix: dynamically loadable w/imports & exports
-  	F_SHROBJ	rs/6000 aix: file is a shared object
--        F_DLL           PE format DLL.  */
-+	F_DLL           PE format DLL
-+	F_GO32STUB      Field go32stub contains valid data.  */
- 
- #define	F_RELFLG	(0x0001)
- #define	F_EXEC		(0x0002)
-@@ -96,6 +106,7 @@ struct internal_filehdr
- #define	F_DYNLOAD	(0x1000)
- #define	F_SHROBJ	(0x2000)
- #define F_DLL           (0x2000)
-+#define F_GO32STUB      (0x4000)
- 
- /* Extra structure which is used in the optional header.  */
- typedef struct _IMAGE_DATA_DIRECTORY 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- gdb.spec	10 Aug 2009 13:22:51 -0000	1.370
+++ gdb.spec	11 Aug 2009 14:42:47 -0000	1.371
@@ -10,15 +10,15 @@ 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.50.20090810
+Version: 6.8.50.20090811
 
 # 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
-Source: ftp://sourceware.org/pub/gdb/releases/gdb-%{version}.tar.bz2
+Source: ftp://sourceware.org/pub/gdb/snapshots/current/gdb-%{version}.tar.bz2
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://gnu.org/software/gdb/
 
@@ -217,8 +217,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.20090810 snapshot fixups.
-#Patch232: gdb-6.8.50.20090810-upstream.patch
+# Backported post gdb-6.8.50.20090811 snapshot fixups.
+#Patch232: gdb-6.8.50.20090811-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -825,7 +825,12 @@ fi
 %endif
 
 %changelog
-* Mon Aug 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090810-1
+* Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-1
+- Support constant DW_AT_data_member_location by GCC PR debug/40659 (BZ 515377).
+- Fix .spec URL.
+- archer-jankratochvil-fedora12 commit: 81de3c6abae4f7e3738aa9bcc0ab2f8725cce252
+
+* Mon Aug 10 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090810-2
 - Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090810
 - archer-jankratochvil-fedora12 commit: 93ec16e6f5000dd64d433d86674e820ed0f35b72
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	10 Aug 2009 13:22:51 -0000	1.33
+++ sources	11 Aug 2009 14:42:47 -0000	1.34
@@ -1 +1 @@
-b4549498345849458464c8fe2503a37c  gdb-6.8.50.20090810.tar.bz2
+f3e0cfce127982d0f14777188d8fa4c5  gdb-6.8.50.20090811.tar.bz2



From rrakus at fedoraproject.org  Tue Aug 11 14:44:02 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 11 Aug 2009 14:44:02 +0000 (UTC)
Subject: rpms/time/devel time.spec,1.26,1.27
Message-ID: <20090811144402.304CB11C00D7@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/time/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9786

Modified Files:
	time.spec 
Log Message:
Don't print errors in post and preun sections (#515936)


Index: time.spec
===================================================================
RCS file: /cvs/extras/rpms/time/devel/time.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- time.spec	27 Jul 2009 05:57:50 -0000	1.26
+++ time.spec	11 Aug 2009 14:44:01 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A GNU utility for monitoring a program's use of system resources
 Name: time
 Version: 1.7
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPLv2+
 Group: Applications/System
 Url: http://www.gnu.org/software/time/
@@ -36,12 +36,12 @@ rm -rf %{buildroot}
 
 %post
 /sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \
-    --entry="* time: (time).        GNU time Utility" || :
+    --entry="* time: (time).        GNU time Utility" >/dev/null 2>&1 || :
 
 %preun
 if [ "$1" = 0 ]; then
     /sbin/install-info --delete %{_infodir}/time.info.gz %{_infodir}/dir \
-    --entry="* time: (time).        GNU time Utility" || :
+    --entry="* time: (time).        GNU time Utility" >/dev/null 2>&1 || :
 fi
 
 %files
@@ -51,6 +51,9 @@ fi
 %{_infodir}/time.info*
 
 %changelog
+* Tue Aug 11 2009 Roman Rakus <rrakus at redhat.com> - 1.7-37
+- Don't print errors in post and preun sections (#515936)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From iarnell at fedoraproject.org  Tue Aug 11 14:44:05 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 11 Aug 2009 14:44:05 +0000 (UTC)
Subject: rpms/perl-latest/F-10 perl-latest.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090811144405.7D11511C00D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-latest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9767/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-latest.spec 
Log Message:
initial import


--- NEW FILE perl-latest.spec ---
Name:           perl-latest
Version:        0.03
Release:        1%{?dist}
Summary:        Use the latest Perl features
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/latest/
Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/latest-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(version)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Shake out any obscure problems that might result from your code being used by a
program that requires the latest Perl version.

%prep
%setup -q -n latest-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Aug 08 2009 Iain Arnell 0.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:15:38 -0000	1.1
+++ .cvsignore	11 Aug 2009 14:44:05 -0000	1.2
@@ -0,0 +1 @@
+latest-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:15:38 -0000	1.1
+++ sources	11 Aug 2009 14:44:05 -0000	1.2
@@ -0,0 +1 @@
+3e130f1917c22a0a2c31a20abba285bb  latest-0.03.tar.gz



From iarnell at fedoraproject.org  Tue Aug 11 14:44:05 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 11 Aug 2009 14:44:05 +0000 (UTC)
Subject: rpms/perl-latest/F-11 perl-latest.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090811144405.C0FFD11C00D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-latest/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9767/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-latest.spec 
Log Message:
initial import


--- NEW FILE perl-latest.spec ---
Name:           perl-latest
Version:        0.03
Release:        1%{?dist}
Summary:        Use the latest Perl features
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/latest/
Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/latest-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(version)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Shake out any obscure problems that might result from your code being used by a
program that requires the latest Perl version.

%prep
%setup -q -n latest-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Aug 08 2009 Iain Arnell 0.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:15:38 -0000	1.1
+++ .cvsignore	11 Aug 2009 14:44:05 -0000	1.2
@@ -0,0 +1 @@
+latest-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:15:38 -0000	1.1
+++ sources	11 Aug 2009 14:44:05 -0000	1.2
@@ -0,0 +1 @@
+3e130f1917c22a0a2c31a20abba285bb  latest-0.03.tar.gz



From iarnell at fedoraproject.org  Tue Aug 11 14:44:06 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 11 Aug 2009 14:44:06 +0000 (UTC)
Subject: rpms/perl-latest/devel perl-latest.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090811144406.1ADCB11C00D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-latest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9767/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-latest.spec 
Log Message:
initial import


--- NEW FILE perl-latest.spec ---
Name:           perl-latest
Version:        0.03
Release:        1%{?dist}
Summary:        Use the latest Perl features
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/latest/
Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/latest-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(version)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Shake out any obscure problems that might result from your code being used by a
program that requires the latest Perl version.

%prep
%setup -q -n latest-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Aug 08 2009 Iain Arnell 0.03-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:15:38 -0000	1.1
+++ .cvsignore	11 Aug 2009 14:44:05 -0000	1.2
@@ -0,0 +1 @@
+latest-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-latest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:15:38 -0000	1.1
+++ sources	11 Aug 2009 14:44:05 -0000	1.2
@@ -0,0 +1 @@
+3e130f1917c22a0a2c31a20abba285bb  latest-0.03.tar.gz



From dwalsh at fedoraproject.org  Tue Aug 11 14:47:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 11 Aug 2009 14:47:51 +0000 (UTC)
Subject: rpms/setools/devel setools-python.patch, NONE, 1.1 setools.spec,
	1.91, 1.92
Message-ID: <20090811144751.47CF411C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10649

Modified Files:
	setools.spec 
Added Files:
	setools-python.patch 
Log Message:
* Tue Aug 11 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-4
- Add python bindings for sesearch and seinfo


setools-python.patch:
 Makefile.am                |    2 
 Makefile.in                |    4 
 configure.ac               |    6 
 python/Makefile.am         |    2 
 python/Makefile.in         |  715 +++++++++++++++++++++++++++++++++++++++++++++
 python/setools/Makefile.am |   24 +
 python/setools/Makefile.in |  539 +++++++++++++++++++++++++++++++++
 python/setools/__init__.py |   49 +++
 python/setools/seinfo.c    |  649 ++++++++++++++++++++++++++++++++++++++++
 python/setools/sesearch.c  |  477 ++++++++++++++++++++++++++++++
 python/setools/setup.py    |   10 
 11 files changed, 2473 insertions(+), 4 deletions(-)

--- NEW FILE setools-python.patch ---
diff -up setools-3.3.6/configure.ac.python setools-3.3.6/configure.ac
--- setools-3.3.6/configure.ac.python	2009-08-10 15:24:55.000000000 -0400
+++ setools-3.3.6/configure.ac	2009-08-10 15:24:59.000000000 -0400
@@ -216,6 +216,9 @@ if test "x${enable_jswig}" = xyes; then
    do_swigify_java=yes
    do_swigify=yes
 fi
+
+AM_PATH_PYTHON(2.6)
+
 AC_ARG_ENABLE(swig-python,
               AC_HELP_STRING([--enable-swig-python],
                              [build SWIG interfaces for Python]),
@@ -224,7 +227,6 @@ if test "x${enable_pyswig}" = xyes; then
    if test ${do_swigify} = no; then
       AC_PROG_SWIG(1.3.28)
    fi
-   AM_PATH_PYTHON(2.3)
    SWIG_PYTHON
    do_swigify_python=yes
    do_swigify=yes
@@ -873,6 +875,8 @@ AC_CONFIG_FILES([Makefile VERSION \
                  sediff/Makefile \
                  man/Makefile \
                  debian/Makefile \
+   		 python/Makefile \
+   		 python/setools/Makefile \
                  packages/Makefile packages/rpm/Makefile \
                  packages/libqpol.pc packages/libapol.pc packages/libpoldiff.pc packages/libseaudit.pc packages/libsefs.pc])
 
diff -up setools-3.3.6/Makefile.am.python setools-3.3.6/Makefile.am
--- setools-3.3.6/Makefile.am.python	2009-08-10 15:23:45.000000000 -0400
+++ setools-3.3.6/Makefile.am	2009-08-10 15:23:50.000000000 -0400
@@ -10,7 +10,7 @@ if BUILD_GUI
 endif
 # sediffx is also built conditionally, from sediffx/Makefile.am
 
-SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI)
+SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python
 
 #old indent opts
 #INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc
diff -up setools-3.3.6/Makefile.in.python setools-3.3.6/Makefile.in
--- setools-3.3.6/Makefile.in.python	2009-08-10 15:24:17.000000000 -0400
+++ setools-3.3.6/Makefile.in	2009-08-10 15:25:59.000000000 -0400
@@ -79,7 +79,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds \
-	sechecker sediff man packages debian apol seaudit
+	sechecker sediff man packages debian apol seaudit python
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -384,7 +384,7 @@ AUTOMAKE_OPTIONS = dist-bzip2
 @BUILD_APOL_TRUE at MAYBE_APOL = apol
 @BUILD_GUI_TRUE at MAYBE_GUI = seaudit
 # sediffx is also built conditionally, from sediffx/Makefile.am
-SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI)
+SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python
 
 #old indent opts
 #INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc
diff -up setools-3.3.6/python/Makefile.am.python setools-3.3.6/python/Makefile.am
--- setools-3.3.6/python/Makefile.am.python	2009-08-11 09:57:16.000000000 -0400
+++ setools-3.3.6/python/Makefile.am	2009-08-10 15:23:25.000000000 -0400
@@ -0,0 +1,2 @@
+SUBDIRS = setools
+
diff -up setools-3.3.6/python/Makefile.in.python setools-3.3.6/python/Makefile.in
--- setools-3.3.6/python/Makefile.in.python	2009-08-11 09:57:20.000000000 -0400
+++ setools-3.3.6/python/Makefile.in	2009-08-10 15:25:58.000000000 -0400
@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = python
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \
+	$(top_srcdir)/m4/ac_java_options.m4 \
+	$(top_srcdir)/m4/ac_pkg_swig.m4 \
+	$(top_srcdir)/m4/ac_prog_jar.m4 \
+	$(top_srcdir)/m4/ac_prog_java.m4 \
+	$(top_srcdir)/m4/ac_prog_java_works.m4 \
+	$(top_srcdir)/m4/ac_prog_javac.m4 \
+	$(top_srcdir)/m4/ac_prog_javac_works.m4 \
+	$(top_srcdir)/m4/ac_python_devel.m4 $(top_srcdir)/m4/c.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/swig_python.m4 $(top_srcdir)/m4/tcl.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+APOL_CFLAGS = @APOL_CFLAGS@
+APOL_LIB_FLAG = @APOL_LIB_FLAG@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BWIDGET_DESTDIR = @BWIDGET_DESTDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUNIT_LIB_FLAG = @CUNIT_LIB_FLAG@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH = @CYGPATH@
+CYGPATH_W = @CYGPATH_W@
+DEBUGCFLAGS = @DEBUGCFLAGS@
+DEBUGCXXFLAGS = @DEBUGCXXFLAGS@
+DEBUGJFLAGS = @DEBUGJFLAGS@
[...2161 lines suppressed...]
+
+PyObject* sesearch(bool allow,
+             bool neverallow, 
+             bool auditallow,
+             bool dontaudit,
+             const char *src_name,
+             const char *tgt_name,
+             const char *class_name,
+             const char *permlist
+             )
+{
+	options_t cmd_opts;
+	int rt = -1;
+	PyObject *output = NULL;
+	
+	apol_policy_t *policy = NULL;
+	apol_vector_t *v = NULL;
+	apol_policy_path_t *pol_path = NULL;
+	apol_vector_t *mod_paths = NULL;
+	apol_policy_path_type_e path_type = APOL_POLICY_PATH_TYPE_MONOLITHIC;
+	
+	memset(&cmd_opts, 0, sizeof(cmd_opts));
+	cmd_opts.indirect = true;
+	cmd_opts.allow = allow;
+	cmd_opts.nallow = neverallow;
+	cmd_opts.auditallow = auditallow;
+	cmd_opts.dontaudit = dontaudit;
+	if (src_name)
+		cmd_opts.src_name = strdup(src_name);
+	if (tgt_name)
+		cmd_opts.tgt_name = strdup(tgt_name);
+	if (class_name)
+		cmd_opts.class_name = strdup(class_name);
+	if (permlist){
+		cmd_opts.perm_vector = apol_vector_create(free);
+		cmd_opts.permlist = strdup(permlist);
+	}
+	int pol_opt = 0;
+	if (!(cmd_opts.nallow || cmd_opts.all))
+		pol_opt |= QPOL_POLICY_OPTION_NO_NEVERALLOWS;
+	
+    
+	rt = qpol_default_policy_find(&policy_file);
+	if (rt) {
+		PyErr_SetString(PyExc_RuntimeError,"No default policy found.");
+		return NULL;
+	}
+	pol_opt |= QPOL_POLICY_OPTION_MATCH_SYSTEM;
+	
+	if (apol_file_is_policy_path_list(policy_file) > 0) {
+		pol_path = apol_policy_path_create_from_file(policy_file);
+		if (!pol_path) {
+			free(policy_file);
+			PyErr_SetString(PyExc_RuntimeError,"invalid policy list");
+			return NULL;
+		}
+	}
+
+	if (!pol_path)
+		pol_path = apol_policy_path_create(path_type, policy_file, mod_paths);
+	if (!pol_path) {
+		free(policy_file);
+		PyErr_SetString(PyExc_RuntimeError,strerror(ENOMEM));
+		return NULL;
+	}
+	free(policy_file);
+	apol_vector_destroy(&mod_paths);
+	
+	policy = apol_policy_create_from_policy_path(pol_path, pol_opt, NULL, NULL);
+	if (!policy) {
+		apol_policy_path_destroy(&pol_path);
+		PyErr_SetString(PyExc_RuntimeError,strerror(errno));
+		return NULL;
+	}
+	/* handle regex for class name */
+	if (cmd_opts.useregex && cmd_opts.class_name != NULL) {
+		cmd_opts.class_vector = apol_vector_create(NULL);
+		apol_vector_t *qpol_matching_classes = NULL;
+		apol_class_query_t *regex_match_query = apol_class_query_create();
+		apol_class_query_set_regex(policy, regex_match_query, 1);
+		apol_class_query_set_class(policy, regex_match_query, cmd_opts.class_name);
+		if (apol_class_get_by_query(policy, regex_match_query, &qpol_matching_classes)) {
+			apol_class_query_destroy(&regex_match_query);
+			PyErr_SetString(PyExc_RuntimeError,"Query failed");
+			goto cleanup;
+		}
+		const qpol_class_t *class = NULL;
+		size_t i;
+		for (i = 0; i < apol_vector_get_size(qpol_matching_classes); ++i) {
+			const char *class_name;
+			class = apol_vector_get_element(qpol_matching_classes, i);
+			if (!class)
+				break;
+			qpol_class_get_name(apol_policy_get_qpol(policy), class, &class_name);
+			apol_vector_append(cmd_opts.class_vector, (void *)class_name);
+		}
+		if (!apol_vector_get_size(qpol_matching_classes)) {
+			apol_vector_destroy(&qpol_matching_classes);
+			apol_class_query_destroy(&regex_match_query);
+			PyErr_SetString(PyExc_RuntimeError,"No classes match expression");
+			goto cleanup;
+		}
+		apol_vector_destroy(&qpol_matching_classes);
+		apol_class_query_destroy(&regex_match_query);
+	}
+
+	if (!cmd_opts.semantic && qpol_policy_has_capability(apol_policy_get_qpol(policy), QPOL_CAP_SYN_RULES)) {
+		if (qpol_policy_build_syn_rule_table(apol_policy_get_qpol(policy))) {
+			apol_policy_destroy(&policy);
+			PyErr_SetString(PyExc_RuntimeError,"Query failed");
+			goto cleanup;
+		}
+	}
+
+	/* if syntactic rules are not available always do semantic search */
+	if (!qpol_policy_has_capability(apol_policy_get_qpol(policy), QPOL_CAP_SYN_RULES)) {
+		cmd_opts.semantic = 1;
+	}
+
+	/* supress line numbers if doing semantic search or not available */
+	if (cmd_opts.semantic || !qpol_policy_has_capability(apol_policy_get_qpol(policy), QPOL_CAP_LINE_NUMBERS)) {
+		cmd_opts.lineno = 0;
+	}
+	if (perform_av_query(policy, &cmd_opts, &v)) {
+		goto cleanup;
+	}
+	if (v) {
+		output =  get_av_results(policy, &cmd_opts, v);
+	}
+	apol_vector_destroy(&v);
+      cleanup:
+	apol_policy_destroy(&policy);
+	apol_policy_path_destroy(&pol_path);
+	free(cmd_opts.src_name);
+	free(cmd_opts.tgt_name);
+	free(cmd_opts.class_name);
+	free(cmd_opts.permlist);
+	free(cmd_opts.bool_name);
+	free(cmd_opts.src_role_name);
+	free(cmd_opts.tgt_role_name);
+	apol_vector_destroy(&cmd_opts.perm_vector);
+	apol_vector_destroy(&cmd_opts.class_vector);
+	
+	return output;
+}
+static int Dict_ContainsInt(PyObject *dict, const char *key){
+    PyObject *item = PyDict_GetItemString(dict, key);
+    if (item)
+        return PyInt_AsLong(item);
+    return false;
+}
+
+static const char *Dict_ContainsString(PyObject *dict, const char *key){
+    PyObject *item = PyDict_GetItemString(dict, key);
+    if (item)
+        return PyString_AsString(item);
+    return NULL;
+}
+
+PyObject *wrap_sesearch(PyObject *self, PyObject *args){
+    PyObject *dict;
+    if (!PyArg_ParseTuple(args, "O", &dict))
+        return NULL;
+    int allow = Dict_ContainsInt(dict, "allow");
+    int neverallow = Dict_ContainsInt(dict, "neverallow");
+    int auditallow = Dict_ContainsInt(dict, "auditallow");
+    int dontaudit = Dict_ContainsInt(dict, "dontaudit"); 
+   
+    const char *src_name = Dict_ContainsString(dict, "scontext");
+    const char *tgt_name = Dict_ContainsString(dict, "tcontext");
+    const char *class_name = Dict_ContainsString(dict, "class");
+    const char *permlist = Dict_ContainsString(dict, "permlist");
+    
+    return Py_BuildValue("O",sesearch(allow, neverallow, auditallow, dontaudit, src_name, tgt_name, class_name, permlist));
+
+}
+
+static PyMethodDef methods[] = {
+    {"sesearch", (PyCFunction) wrap_sesearch, METH_VARARGS},
+    {NULL, NULL, 0, NULL}
+};
+
+void init_sesearch(){
+    PyObject *m;
+    m = Py_InitModule("_sesearch", methods);
+}
diff -up setools-3.3.6/python/setools/setup.py.python setools-3.3.6/python/setools/setup.py
--- setools-3.3.6/python/setools/setup.py.python	2009-08-11 09:56:15.000000000 -0400
+++ setools-3.3.6/python/setools/setup.py	2009-08-10 15:23:25.000000000 -0400
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+# Author: Thomas Liu <tliu at redhat.com>
+
+from distutils.core import setup, Extension
+extension_sesearch = Extension("setools._sesearch", [ "sesearch.c"], libraries=["apol", "qpol"] )
+extension_seinfo = Extension("setools._seinfo", [ "seinfo.c"], libraries=["apol", "qpol"] )
+
+setup(name = "setools", version="1.0", description="Python setools bindings", author="Thomas Liu", author_email="tliu at redhat.com", ext_modules=[extension_sesearch, extension_seinfo], packages=["setools"])
+


Index: setools.spec
===================================================================
RCS file: /cvs/extras/rpms/setools/devel/setools.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- setools.spec	28 Jul 2009 13:43:02 -0000	1.91
+++ setools.spec	11 Aug 2009 14:47:50 -0000	1.92
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -15,6 +15,7 @@ Source2: apol.desktop
 Source3: seaudit.desktop
 Source4: sediffx.desktop
 Patch1: setools-qpol.patch
+Patch2: setools-python.patch
 Summary: Policy analysis tools for SELinux
 Group: System Environment/Base
 Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} setools-gui = %{version}-%{release} setools-console = %{version}-%{release}
@@ -187,6 +188,7 @@ This package includes the following grap
 %prep
 %setup -q
 %patch1 -p 1 -b .qpol
+%patch2 -p 1 -b .python
 
 %build
 %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
@@ -346,6 +348,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Tue Aug 11 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-4
+- Add python bindings for sesearch and seinfo
+
 * Tue Jul 28 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-3
 - Fix qpol install of include files
 



From spot at fedoraproject.org  Tue Aug 11 14:57:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 14:57:26 +0000 (UTC)
Subject: rpms/R-acepack/devel R-acepack.spec,1.5,1.6
Message-ID: <20090811145726.1122811C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-acepack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12146

Modified Files:
	R-acepack.spec 
Log Message:
fix versioning


Index: R-acepack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-acepack/devel/R-acepack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-acepack.spec	24 Jul 2009 16:10:59 -0000	1.5
+++ R-acepack.spec	11 Aug 2009 14:57:25 -0000	1.6
@@ -1,21 +1,22 @@
-%define packname  acepack
-%define packrel   2.2
+%global packname  acepack
+%global packver   1.3
+%global packrel   2.2
 
 Name:             R-%{packname}
-Version:          1.3
-Release:          6%{?dist}
+Version:          %{packver}.%{packrel}
+Release:          7%{?dist}
 Summary:          ACE and AVAS methods for choosing regression transformations
 
 Group:            Applications/Productivity
 License:          Public Domain and MIT
-URL:              http://cran.r-project.org/src/contrib/Descriptions/acepack.html
-Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
+URL:              http://cran.r-project.org/web/packages/acepack/index.html
+Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.tar.gz
 Source1:          ace-copyright.txt
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:         R
-Requires(post):   R
-Requires(postun): R
+Requires:         R-core
+Requires(post):   R-core
+Requires(postun): R-core
 BuildRequires:    R-devel >= 2.5.0, gcc-gfortran
 
 %description
@@ -65,6 +66,9 @@ test -d %{packname}/src && (cd %{packnam
 %{_libdir}/R/library/%{packname}/help
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.2.2-7
+- fix versioning
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rrakus at fedoraproject.org  Tue Aug 11 15:00:43 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 11 Aug 2009 15:00:43 +0000 (UTC)
Subject: rpms/gperf/devel gperf.spec,1.31,1.32
Message-ID: <20090811150043.3F10C11C043B@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/gperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12672

Modified Files:
	gperf.spec 
Log Message:
Don't print errors in post and preun sections (#515942)


Index: gperf.spec
===================================================================
RCS file: /cvs/extras/rpms/gperf/devel/gperf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gperf.spec	25 Jul 2009 01:06:43 -0000	1.31
+++ gperf.spec	11 Aug 2009 15:00:42 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A perfect hash function generator
 Name: gperf
 Version: 3.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Source: ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
 Group: Development/Tools
@@ -36,12 +36,12 @@ rm -rf $RPM_BUILD_ROOT{%{_mandir}/{dvi,h
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/gperf.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/gperf.info.gz %{_infodir}/dir >/dev/null 2>&1 || :
 exit 0
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/gperf.info.gz %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/gperf.info.gz %{_infodir}/dir >/dev/null 2>&1|| :
 fi
 exit 0
 
@@ -53,6 +53,9 @@ exit 0
 %{_infodir}/gperf.info*
 
 %changelog
+* Tue Aug 11 2009 Roman Rakus <rrakus at redhat.com> - 3.0.3-9
+- Don't print errors in post and preun sections (#515942)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Tue Aug 11 15:01:38 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 11 Aug 2009 15:01:38 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.79, 1.80 sources,
	1.92, 1.93 system-config-services.spec, 1.94, 1.95
Message-ID: <20090811150138.C3D2011C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12894

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.35



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	11 Aug 2009 12:53:49 -0000	1.79
+++ .cvsignore	11 Aug 2009 15:01:38 -0000	1.80
@@ -1 +1 @@
-system-config-services-0.99.34.tar.bz2
+system-config-services-0.99.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	11 Aug 2009 12:53:50 -0000	1.92
+++ sources	11 Aug 2009 15:01:38 -0000	1.93
@@ -1 +1 @@
-f4726b434ec23571233c2b039be35529  system-config-services-0.99.34.tar.bz2
+5b3b801a303432ea88f9417d7a347818  system-config-services-0.99.35.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- system-config-services.spec	11 Aug 2009 12:53:50 -0000	1.94
+++ system-config-services.spec	11 Aug 2009 15:01:38 -0000	1.95
@@ -3,7 +3,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.34
+Version: 0.99.35
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.35-1
+- use "chkconfig --type ..." if available (#467871)
+
 * Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.34-1
 - avoid unnecessary recursions (#504964)
 - fix DeprecationWarning in dbus mechanism



From nphilipp at fedoraproject.org  Tue Aug 11 15:02:20 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 11 Aug 2009 15:02:20 +0000 (UTC)
Subject: rpms/system-config-services/F-11 .cvsignore, 1.79, 1.80 sources,
	1.92, 1.93 system-config-services.spec, 1.93, 1.94
Message-ID: <20090811150220.9463911C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13041

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.35



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-11/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	11 Aug 2009 12:55:03 -0000	1.79
+++ .cvsignore	11 Aug 2009 15:02:20 -0000	1.80
@@ -1 +1 @@
-system-config-services-0.99.34.tar.bz2
+system-config-services-0.99.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-11/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	11 Aug 2009 12:55:03 -0000	1.92
+++ sources	11 Aug 2009 15:02:20 -0000	1.93
@@ -1 +1 @@
-f4726b434ec23571233c2b039be35529  system-config-services-0.99.34.tar.bz2
+5b3b801a303432ea88f9417d7a347818  system-config-services-0.99.35.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-11/system-config-services.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- system-config-services.spec	11 Aug 2009 12:55:03 -0000	1.93
+++ system-config-services.spec	11 Aug 2009 15:02:20 -0000	1.94
@@ -3,7 +3,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.34
+Version: 0.99.35
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.35-1
+- use "chkconfig --type ..." if available (#467871)
+
 * Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.34-1
 - avoid unnecessary recursions (#504964)
 - fix DeprecationWarning in dbus mechanism



From nphilipp at fedoraproject.org  Tue Aug 11 15:03:01 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 11 Aug 2009 15:03:01 +0000 (UTC)
Subject: rpms/system-config-services/F-10 .cvsignore, 1.75, 1.76 sources,
	1.88, 1.89 system-config-services.spec, 1.89, 1.90
Message-ID: <20090811150301.33E7111C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13141

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.35



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-10/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	11 Aug 2009 12:55:50 -0000	1.75
+++ .cvsignore	11 Aug 2009 15:03:00 -0000	1.76
@@ -1 +1 @@
-system-config-services-0.99.34.tar.bz2
+system-config-services-0.99.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-10/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	11 Aug 2009 12:55:50 -0000	1.88
+++ sources	11 Aug 2009 15:03:00 -0000	1.89
@@ -1 +1 @@
-f4726b434ec23571233c2b039be35529  system-config-services-0.99.34.tar.bz2
+5b3b801a303432ea88f9417d7a347818  system-config-services-0.99.35.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/F-10/system-config-services.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- system-config-services.spec	11 Aug 2009 12:55:50 -0000	1.89
+++ system-config-services.spec	11 Aug 2009 15:03:00 -0000	1.90
@@ -3,7 +3,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.34
+Version: 0.99.35
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.35-1
+- use "chkconfig --type ..." if available (#467871)
+
 * Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.34-1
 - avoid unnecessary recursions (#504964)
 - fix DeprecationWarning in dbus mechanism



From jwrdegoede at fedoraproject.org  Tue Aug 11 15:04:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 11 Aug 2009 15:04:12 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel
	0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch,
	NONE, 1.1 gst-plugins-good-0.10.15-v4l2-no-framerate.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.99, 1.100
Message-ID: <20090811150412.C140811C00D7@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13420

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch 
	gst-plugins-good-0.10.15-v4l2-no-framerate.patch 
Log Message:
* Tue Aug 11 2009 Hans de Goede <hdegoede at redhat.com> 0.10.15-6
- Fix usage of webcamdrivers which do not implement VIDIOC_G_PARM (#467961)
- Include "Fix FLAC seeking" patch from F-11 package (#515886)


0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch:
 gstflacdec.c |   36 +++++++++++++++++++++++++++++++-----
 gstflacdec.h |    3 ++-
 2 files changed, 33 insertions(+), 6 deletions(-)

--- NEW FILE 0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch ---
>From ee98c0f1d06e5f401218f88b96e39e33f0d2c7aa Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller at collabora.co.uk>
Date: Tue, 21 Jul 2009 19:46:55 +0100
Subject: [PATCH] flacdec: fix intermittent FLAC__STREAM_DECODER_ABORTED errors when seeking

When seeking in a local flac file (ie. operating pull-based), the decoder
would often just error out after the loop function sees a DECODER_ABORTED
status. This, however, is the read callback's way of telling our loop
function that pull_range failed and streaming should stop, in this case
because of the flush-start event that the seek handler pushed upstream
from the seeking thread. Handle this slightly better by storing the last
flow return from pull_range, so the loop function can evaluate it properly
when it encounters a DECODER_ABORTED and take the right action.

Fixes #578612.
---
 ext/flac/gstflacdec.c |   36 +++++++++++++++++++++++++++++++-----
 ext/flac/gstflacdec.h |    2 ++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 3f9c75f..4d04702 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -773,15 +773,25 @@ static FLAC__StreamDecoderReadStatus
 gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder,
     FLAC__byte buffer[], size_t * bytes, void *client_data)
 {
+  GstFlowReturn flow;
   GstFlacDec *flacdec;
-
   GstBuffer *buf;
 
   flacdec = GST_FLAC_DEC (client_data);
 
-  if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes,
-          &buf) != GST_FLOW_OK)
-    return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+  flow = gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, &buf);
+
+  GST_PAD_STREAM_LOCK (flacdec->sinkpad);
+  flacdec->pull_flow = flow;
+  GST_PAD_STREAM_UNLOCK (flacdec->sinkpad);
+
+  if (G_UNLIKELY (flow != GST_FLOW_OK)) {
+    GST_INFO_OBJECT (flacdec, "pull_range flow: %s", gst_flow_get_name (flow));
+    if (flow == GST_FLOW_UNEXPECTED)
+      return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+    else
+      return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+  }
 
   GST_DEBUG_OBJECT (flacdec, "Read %d bytes at %" G_GUINT64_FORMAT,
       GST_BUFFER_SIZE (buf), flacdec->offset);
@@ -1152,9 +1162,23 @@ analyze_state:
       goto eos_and_pause;
     }
 
+      /* gst_flac_dec_read_seekable() returned ABORTED */
+    case FLAC__STREAM_DECODER_ABORTED:
+    {
+      GST_INFO_OBJECT (flacdec, "read aborted: last pull_range flow = %s",
+          gst_flow_get_name (flacdec->pull_flow));
+      if (!GST_FLOW_IS_FATAL (flacdec->pull_flow)) {
+        /* it seems we need to flush the decoder here to reset the decoder
+         * state after the abort for FLAC__stream_decoder_seek_absolute()
+         * to work properly */
+        GST_DEBUG_OBJECT (flacdec, "flushing decoder to reset decoder state");
+        FLAC__stream_decoder_flush (flacdec->seekable_decoder);
+        goto pause;
+      }
+      /* fall through */
+    }
     case FLAC__STREAM_DECODER_OGG_ERROR:
     case FLAC__STREAM_DECODER_SEEK_ERROR:
-    case FLAC__STREAM_DECODER_ABORTED:
     case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
     case FLAC__STREAM_DECODER_UNINITIALIZED:
     default:{
@@ -1782,8 +1806,10 @@ gst_flac_dec_handle_seek_event (GstFlacDec * flacdec, GstEvent * event)
    * callbacks that need to behave differently when seeking */
   flacdec->seeking = TRUE;
 
+  GST_LOG_OBJECT (flacdec, "calling seek_absolute");
   seek_ok = FLAC__stream_decoder_seek_absolute (flacdec->seekable_decoder,
       flacdec->segment.last_stop);
+  GST_LOG_OBJECT (flacdec, "done with seek_absolute, seek_ok=%d", seek_ok);
 
   flacdec->seeking = FALSE;
 
diff --git a/ext/flac/gstflacdec.h b/ext/flac/gstflacdec.h
index a9daf3e..e6a76bb 100644
--- a/ext/flac/gstflacdec.h
+++ b/ext/flac/gstflacdec.h
@@ -74,6 +74,8 @@ struct _GstFlacDec {
   GstEvent      *start_segment;
   GstTagList    *tags;
 
+  GstFlowReturn  pull_flow;   /* last flow from pull_range */ /* STREAM_LOCK */
+
   GstFlowReturn  last_flow;   /* the last flow return received from either
                                * gst_pad_push or gst_pad_buffer_alloc */
 
-- 
1.6.3.3


gst-plugins-good-0.10.15-v4l2-no-framerate.patch:
 gstv4l2src.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE gst-plugins-good-0.10.15-v4l2-no-framerate.patch ---
diff -up gst-plugins-good-0.10.15/sys/v4l2/gstv4l2src.c.foo gst-plugins-good-0.10.15/sys/v4l2/gstv4l2src.c
--- gst-plugins-good-0.10.15/sys/v4l2/gstv4l2src.c.foo	2009-05-12 02:00:07.000000000 +0200
+++ gst-plugins-good-0.10.15/sys/v4l2/gstv4l2src.c	2009-08-11 16:13:20.000000000 +0200
@@ -1371,20 +1371,21 @@ gst_v4l2src_create (GstPushSrc * src, Gs
     GST_OBJECT_UNLOCK (v4l2src);
 
     if (clock) {
-      GstClockTime latency;
-
       /* the time now is the time of the clock minus the base time */
       timestamp = gst_clock_get_time (clock) - timestamp;
       gst_object_unref (clock);
 
-      latency =
-          gst_util_uint64_scale_int (GST_SECOND, v4l2src->fps_d,
-          v4l2src->fps_n);
+      /* if we have a framerate adjust timestamp for frame latency */
+      if (v4l2src->fps_n > 0 && v4l2src->fps_d > 0) {
+        GstClockTime latency =
+           gst_util_uint64_scale_int (GST_SECOND, v4l2src->fps_d,
+           v4l2src->fps_n);
 
-      if (timestamp > latency)
-        timestamp -= latency;
-      else
-        timestamp = 0;
+        if (timestamp > latency)
+          timestamp -= latency;
+        else
+          timestamp = 0;
+      }
     }
 
     /* FIXME: use the timestamp from the buffer itself! */


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gstreamer-plugins-good.spec	25 Jul 2009 01:37:06 -0000	1.99
+++ gstreamer-plugins-good.spec	11 Aug 2009 15:04:12 -0000	1.100
@@ -6,13 +6,15 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.15
-Release:  	5%{?dist}
+Release:  	6%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
 License: 	LGPLv2+
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
+Patch1:         gst-plugins-good-0.10.15-v4l2-no-framerate.patch
+Patch2:         0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: 	%{gstreamer} >= %{_gst}
@@ -106,6 +108,8 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
+%patch1 -p1 -b .v4l2
+%patch2 -p1 -b .flac
 libtoolize -f
 autoreconf
 
@@ -271,6 +275,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Tue Aug 11 2009 Hans de Goede <hdegoede at redhat.com> 0.10.15-6
+- Fix usage of webcamdrivers which do not implement VIDIOC_G_PARM (#467961)
+- Include "Fix FLAC seeking" patch from F-11 package (#515886)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Aug 11 15:09:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 15:09:15 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.232,1.233
Message-ID: <20090811150915.1755911C043B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14999/devel

Modified Files:
	kdebindings.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
- BR: qscintilla-devel >= 2.4



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- kdebindings.spec	9 Aug 2009 21:40:22 -0000	1.232
+++ kdebindings.spec	11 Aug 2009 15:09:14 -0000	1.233
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -63,7 +63,7 @@ BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
 %if 0%{?fedora} > 8
-BuildRequires:  qscintilla-devel >= 2.2
+BuildRequires:  qscintilla-devel >= 2.4
 %endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
@@ -510,6 +510,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
+- BR: qscintilla-devel >= 2.4
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - manually specify PYTHON_LIBRARIES (and friends) (#516386)
 



From rdieter at fedoraproject.org  Tue Aug 11 15:09:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 15:09:14 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec,1.203,1.204
Message-ID: <20090811150914.C31F411C0347@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14999/F-11

Modified Files:
	kdebindings.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
- BR: qscintilla-devel >= 2.4



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- kdebindings.spec	9 Aug 2009 21:43:53 -0000	1.203
+++ kdebindings.spec	11 Aug 2009 15:09:14 -0000	1.204
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -63,7 +63,7 @@ BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
 %if 0%{?fedora} > 8
-BuildRequires:  qscintilla-devel >= 2.2
+BuildRequires:  qscintilla-devel >= 2.4
 %endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
@@ -510,6 +510,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
+- BR: qscintilla-devel >= 2.4
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - manually specify PYTHON_LIBRARIES (and friends) (#516386)
 



From rdieter at fedoraproject.org  Tue Aug 11 15:09:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 15:09:14 +0000 (UTC)
Subject: rpms/kdebindings/F-10 kdebindings.spec,1.163,1.164
Message-ID: <20090811150914.9E04711C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14999/F-10

Modified Files:
	kdebindings.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
- BR: qscintilla-devel >= 2.4



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- kdebindings.spec	9 Aug 2009 22:58:16 -0000	1.163
+++ kdebindings.spec	11 Aug 2009 15:09:14 -0000	1.164
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -63,7 +63,7 @@ BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
 %if 0%{?fedora} > 8
-BuildRequires:  qscintilla-devel >= 2.2
+BuildRequires:  qscintilla-devel >= 2.4
 %endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
@@ -510,6 +510,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
+- BR: qscintilla-devel >= 2.4
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - manually specify PYTHON_LIBRARIES (and friends) (#516386)
 



From ltinkl at fedoraproject.org  Tue Aug 11 15:14:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 15:14:16 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.1-kmail-saveAttachments.patch,1.1,1.2
Message-ID: <20090811151416.90CA811C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15861/F-10

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
somehow forgot the include :/


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 14:30:57 -0000	1.1
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 15:14:16 -0000	1.2
@@ -1,8 +1,16 @@
-Index: kmail/kmcommands.cpp
+Index: kmcommands.cpp
 ===================================================================
---- kmail/kmcommands.cpp	(revision 1010021)
-+++ kmail/kmcommands.cpp	(working copy)
-@@ -2412,7 +2412,11 @@
+--- kmcommands.cpp	(revision 1010021)
++++ kmcommands.cpp	(working copy)
+@@ -54,6 +54,7 @@
+ #include <kdbusservicestarter.h>
+ #include <kdebug.h>
+ #include <kfiledialog.h>
++#include <kfilewidget.h>
+ #include <kabc/stdaddressbook.h>
+ #include <kabc/addresseelist.h>
+ #include <klocale.h>
+@@ -2412,7 +2413,11 @@
    KUrl url, dirUrl;
    if ( mAttachmentMap.count() > 1 ) {
      // get the dir



From ltinkl at fedoraproject.org  Tue Aug 11 15:14:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 15:14:16 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.1-kmail-saveAttachments.patch,1.1,1.2
Message-ID: <20090811151416.D608711C043B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15861/devel

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
somehow forgot the include :/


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 14:30:58 -0000	1.1
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 15:14:16 -0000	1.2
@@ -1,8 +1,16 @@
-Index: kmail/kmcommands.cpp
+Index: kmcommands.cpp
 ===================================================================
---- kmail/kmcommands.cpp	(revision 1010021)
-+++ kmail/kmcommands.cpp	(working copy)
-@@ -2412,7 +2412,11 @@
+--- kmcommands.cpp	(revision 1010021)
++++ kmcommands.cpp	(working copy)
+@@ -54,6 +54,7 @@
+ #include <kdbusservicestarter.h>
+ #include <kdebug.h>
+ #include <kfiledialog.h>
++#include <kfilewidget.h>
+ #include <kabc/stdaddressbook.h>
+ #include <kabc/addresseelist.h>
+ #include <klocale.h>
+@@ -2412,7 +2413,11 @@
    KUrl url, dirUrl;
    if ( mAttachmentMap.count() > 1 ) {
      // get the dir



From ltinkl at fedoraproject.org  Tue Aug 11 15:14:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 15:14:16 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.1-kmail-saveAttachments.patch,1.1,1.2
Message-ID: <20090811151416.A789211C0347@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15861/F-11

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
somehow forgot the include :/


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 14:30:58 -0000	1.1
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 15:14:16 -0000	1.2
@@ -1,8 +1,16 @@
-Index: kmail/kmcommands.cpp
+Index: kmcommands.cpp
 ===================================================================
---- kmail/kmcommands.cpp	(revision 1010021)
-+++ kmail/kmcommands.cpp	(working copy)
-@@ -2412,7 +2412,11 @@
+--- kmcommands.cpp	(revision 1010021)
++++ kmcommands.cpp	(working copy)
+@@ -54,6 +54,7 @@
+ #include <kdbusservicestarter.h>
+ #include <kdebug.h>
+ #include <kfiledialog.h>
++#include <kfilewidget.h>
+ #include <kabc/stdaddressbook.h>
+ #include <kabc/addresseelist.h>
+ #include <klocale.h>
+@@ -2412,7 +2413,11 @@
    KUrl url, dirUrl;
    if ( mAttachmentMap.count() > 1 ) {
      // get the dir



From pkgdb at fedoraproject.org  Tue Aug 11 15:17:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:17:00 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811151701.BA0AB10F89A@bastion2.fedora.phx.redhat.com>

ke4qqq has set the approveacls acl on zikula (Fedora 11) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From rdieter at fedoraproject.org  Tue Aug 11 15:17:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 15:17:10 +0000 (UTC)
Subject: rpms/konversation/devel konversation.spec,1.30,1.31
Message-ID: <20090811151710.AEC3011C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16293

Modified Files:
	konversation.spec 
Log Message:
drop (experimental) from %%description



Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- konversation.spec	8 Aug 2009 22:06:18 -0000	1.30
+++ konversation.spec	11 Aug 2009 15:17:10 -0000	1.31
@@ -21,7 +21,7 @@ BuildRequires:  phonon-devel
 %description
 A simple and easy to use IRC client with support for
 strikeout; multi-channel joins; away / unaway messages;
-ignore list functionality; (experimental) support for foreign
+ignore list functionality; support for foreign
 language characters; auto-connect to server; optional timestamps
 to chat windows; configurable background colors and much more
 



From pkgdb at fedoraproject.org  Tue Aug 11 15:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:17:04 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811151706.A7F7310F8AF@bastion2.fedora.phx.redhat.com>

ke4qqq has set the approveacls acl on zikula (Fedora EPEL 5) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 15:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:17:14 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811151714.4FB5B10F8B2@bastion2.fedora.phx.redhat.com>

ke4qqq has set the approveacls acl on zikula (Fedora 10) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 15:18:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:18:07 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811151807.D2E6E10F89C@bastion2.fedora.phx.redhat.com>

ke4qqq has set the approveacls acl on zikula (Fedora devel) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From hadess at fedoraproject.org  Tue Aug 11 15:19:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 15:19:10 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.145,1.146
Message-ID: <20090811151910.208F411C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16816

Modified Files:
	gvfs.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-3
- libgudev-devel is required for the gphoto2 monitor



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- gvfs.spec	11 Aug 2009 12:58:49 -0000	1.145
+++ gvfs.spec	11 Aug 2009 15:19:09 -0000	1.146
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -13,6 +13,7 @@ BuildRequires: dbus-glib-devel
 BuildRequires: /usr/bin/ssh
 BuildRequires: libcdio-devel >= 0.78.2
 BuildRequires: hal-devel >= 0.5.10
+BuildRequires: libgudev-devel
 BuildRequires: libsoup-devel >= 2.25.2
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: gnome-keyring-devel
@@ -125,7 +126,7 @@ Summary: AFC support for gvfs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: usbmuxd
-BuildRequires: libiphone-devel >= 0.9.2 libgudev-devel
+BuildRequires: libiphone-devel >= 0.9.2
 
 %description afc
 This package provides support for reading files on Apple iPhones and
@@ -292,6 +293,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-3
+- libgudev-devel is required for the gphoto2 monitor
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-2
 - Add AFC backend
 



From wolfy at fedoraproject.org  Tue Aug 11 15:21:14 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Tue, 11 Aug 2009 15:21:14 +0000 (UTC)
Subject: rpms/libprelude/EL-5 .cvsignore, 1.4, 1.5 libprelude.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090811152114.E11A411C043B@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/libprelude/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17174

Modified Files:
	.cvsignore libprelude.spec sources 
Log Message:
initial EL-5 version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Feb 2007 15:57:37 -0000	1.4
+++ .cvsignore	11 Aug 2009 15:21:14 -0000	1.5
@@ -1 +1 @@
-libprelude-0.9.13.tar.gz
+libprelude-0.9.24.tar.gz


Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/EL-5/libprelude.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libprelude.spec	20 Feb 2007 14:37:33 -0000	1.6
+++ libprelude.spec	11 Aug 2009 15:21:14 -0000	1.7
@@ -1,29 +1,29 @@
 %{!?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)")}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+
 
 Name:		libprelude
-Version:	0.9.13
-Release:	1%{?dist}
+Version:	0.9.24
+Release:	3%{?dist}
 Summary:	The prelude library        
-
 Group:		System Environment/Libraries 
-License:	GPL
+License:	GPLv2+
 URL:		http://prelude-ids.org/
-Source0:	http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz
+Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gnutls-devel, python-devel 
+BuildRequires:	gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
+BuildRequires:	swig chrpath 
 
 %description
-The Prelude Library is a collection of generic functions providing
-communication between the Prelude Hybrid IDS suite components. It
-provides a convenient interface for sending alerts to Prelude
-Manager with transparent SSL, failover and replication support,
-asynchronous events and timer interfaces, an abstracted
-configuration API (hooking at the commandline, the configuration
-line, or wide configuration, available from the Manager), and a
-generic plugin API. It allows you to easily turn your favorite
-security program into a Prelude sensor.
+Libprelude is a library that guarantees secure connections between
+all sensors and the Prelude Manager. Libprelude provides an 
+Application Programming Interface (API) for the communication with
+Prelude sub-systems, it supplies the necessary functionality for
+generating and emitting IDMEF events with Prelude and automates the
+saving and re-transmission of data in times of temporary interruption
+of one of the components of the system.
 
 %package devel
 Summary: 	Header files and libraries for libprelude development
@@ -32,19 +32,10 @@ Requires: 	libprelude = %{version}-%{rel
 
 %description devel
 Libraries, include files, etc you can use to develop Prelude IDS
-sensors using the Prelude Library. The Prelude Library is a
-collection of generic functions providing communication between
-the Prelude Hybrid IDS suite componentst It provides a convenient
-interface for sending alerts to Prelude Manager with transparent
-SSL, failover and replication support, asynchronous events and
-timer interfaces, an abstracted configuration API (hooking at the
-commandline, the configuration line, or wide configuration,
-available from the Manager), and a generic plugin API. It allows
-you to easily turn your favorite security program into a Prelude
-sensor.
+sensors using the Prelude Library.
 
 %package python
-Summary:	Header files and libraries for libprelude development
+Summary:	Python bindings for libprelude
 Group:		System Environment/Libraries
 Requires:	libprelude = %{version}-%{release}
 
@@ -52,24 +43,42 @@ Requires:	libprelude = %{version}-%{rele
 Python bindings for libprelude.
 
 %package perl
-Summary:	Header files and libraries for libprelude development
+Summary:	Perl bindings for libprelude
 Group:		System Environment/Libraries
+%if 0%{?rhel} <= 5
+BuildRequires:	perl
+%else
+BuildRequires:	perl-devel
+%endif
 Requires:	libprelude = %{version}-%{release}
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Perl bindings for libprelude.
 
+%package ruby
+Summary:	Ruby bindings for libprelude
+Group:		System Environment/Libraries
+Requires:	libprelude = %{version}-%{release}
+Requires:	ruby(abi) = 1.8
+
+%description ruby
+Ruby bindings for libprelude.
+
 %prep
 %setup -q
 
-
 %build
 %configure	--disable-static \
-		--with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html 
+		--with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
+		--with-perl-installdirs=vendor \
+		--enable-easy-bindings
 
 # removing rpath
 sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile.in
-make 
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
+make %{?_smp_mflags} 
 
 %install
 rm -rf %{buildroot}
@@ -77,14 +86,19 @@ mkdir -p %{buildroot}%{_defaultdocdir}/%
 mkdir -p %{buildroot}%{perl_vendorarch}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
 cp -p AUTHORS ChangeLog README NEWS COPYING LICENSE.README HACKING.README \
-%{buildroot}%{_defaultdocdir}/%{name}-%{version}
-mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch}
+	%{buildroot}%{_defaultdocdir}/%{name}-%{version}
 rm -f %{buildroot}/%{_libdir}/libprelude.la
-rm -f %{buildroot}%{python_sitelib}/auto/.packlist
-rm -f %{buildroot}%{python_sitelib}/auto/Prelude.bs
-rm -f %{buildroot}%{perl_vendorarch}/auto/Prelude/.packlist
-rm -f %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.bs
-rm -f %{buildroot}%{perl_archlib}/perllocal.pod
+chmod 755 %{buildroot}%{python_sitearch}/_prelude.so
+find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{ruby_sitearch}/PreludeEasy.la
+chmod +w %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.so
+chrpath -d %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.so
+chmod -w %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.so
+
+# Fix time stamp for both 32 and 64 bit libraries
+touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/*
 
 %clean
 rm -rf %{buildroot}
@@ -95,8 +109,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%{_bindir}/prelude-admin
 %{_bindir}/prelude-adduser
 %{_libdir}/*.so.*
+%{_mandir}/man1/prelude-admin.1.gz
 %config(noreplace) %{_sysconfdir}/*
 %{_localstatedir}/spool/*
 %dir %{_defaultdocdir}/%{name}-%{version}/
@@ -106,20 +122,112 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_bindir}/libprelude-config
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/libprelude.pc
 %dir %{_includedir}/libprelude/
 %{_includedir}/libprelude/*
 %{_datadir}/aclocal/libprelude.m4
 
 %files python
+%defattr(-,root,root)
 %{python_sitearch}/*
 
 %files perl
 %defattr(0755,root,root)
-%attr(0644,root,root) %{perl_vendorarch}/Prelude.pm
-%{perl_vendorarch}/auto/*
+%attr(0644,root,root) %{perl_vendorarch}/Prelude*.pm
+%{perl_vendorarch}/auto/Prelude*/
 
+%files ruby
+%defattr(-,root,root)
+%{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sat Aug 8 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.24-3
+- adjust to build in EL-5
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 09 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.24-1
+- New upstream release
+
+* Mon Jun 08 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.23-1
+- New upstream release
+
+* Wed Apr 29 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.22-1
+- New upstream release
+
+* Fri Apr 03 2009 Steve Grubb <sgrubb at redhat.com> 0.9.21.2-9
+- remove check section, doesn't work on anything except x86 anyways
+
+* Fri Mar 13 2009 Karsten Hopp <karsten at redhat.com> 0.9.21.2-8
+- don't buildrequire valgrind on s390x, similar to ppc
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.21.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-6
+- Rebuild for MySQL 5.1.30
+
+* Fri Dec 05 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-5
+- Rebuild _again_ for Python 2.6
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9.21.2-4
+- Include /usr/include/libpreludecpp directory.
+
+* Tue Dec 02 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-3
+- Disable %check target
+- Rebuild for Python 2.6
+
+* Mon Oct 13 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-1
+- New upstream bugfix release
+
+* Mon Oct 06 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21.1-1
+- New upstream bugfix release
+- resolves: #465228 - prelude-admin is looking for tls.conf in /usr
+
+* Fri Sep 19 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21-1
+- New upstream bugfix release
+
+* Tue Sep 09 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.2-1
+- New upstream bugfix release
+
+* Fri Sep 05 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20.1-1
+- New upstream bugfix release
+- Get rid of rpath and enable test suite except on PPC
+
+* Wed Sep 03 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.20-1
+- New upstream release
+
+* Tue Aug 05 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.19-1
+- New upstream release with ruby bindings
+
+* Mon Jul 21 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.18.1-1
+- New upstream version
+
+* Fri Jul 04 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.17.2-1
+- Update to latest upstream and update perl bindings generation (#453932)
+
+* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 0.9.17.1-2
+- fixed build of perl bindings
+
+* Tue Jun 24 2008 Steve Grubb <sgrubb at redhat.com>
+- rebuild for new gnutls
+
+* Fri May 02 2008 Steve Grubb <sgrubb at redhat.com> 0.9.17.1-1
+- New upstream version
+
+* Thu Apr 24 2008 Steve Grubb <sgrubb at redhat.com> 0.9.17-1
+- New upstream version
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.16.2-2
+- Autorebuild for GCC 4.3
+
+* Wed Jan 23 2008 Steve Grubb <sgrubb at redhat.com> 0.9.16.2-1
+- New upstream version
+
+* Mon Jan 14 2008 Steve Grubb <sgrubb at redhat.com> 0.9.16.1-1
+- moved to new upstream version 0.9.16.1
+
 * Tue Feb 20 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.13-1
 - moved to new upstream version 0.9.13-1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Feb 2007 15:57:37 -0000	1.4
+++ sources	11 Aug 2009 15:21:14 -0000	1.5
@@ -1 +1 @@
-10c356bcd13f9a8ddacddd33eb555aa4  libprelude-0.9.13.tar.gz
+f38ab003f16391a0e397568cddfbf169  libprelude-0.9.24.tar.gz



From s4504kr at fedoraproject.org  Tue Aug 11 15:21:45 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 11 Aug 2009 15:21:45 +0000 (UTC)
Subject: rpms/kaya/F-11 kaya.spec,1.8,1.9
Message-ID: <20090811152145.D2F6711C00D7@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/kaya/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17332

Modified Files:
	kaya.spec 
Log Message:
Rebuild agains ghc-editline


Index: kaya.spec
===================================================================
RCS file: /cvs/extras/rpms/kaya/F-11/kaya.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kaya.spec	29 Jul 2009 17:12:17 -0000	1.8
+++ kaya.spec	11 Aug 2009 15:21:45 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:		kaya
 Version:	0.5.2
-Release:	4%{?dist}.1
+Release:	4%{?dist}.2
 Summary:	A Statically typed, imperative programming-language
 
 Group:		Development/Languages
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/ docs/
 
 %changelog
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-4.2
+- Rebuild
+
 * Wed Jul 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-4.1
 - Uploading forgotten sources
 



From wolfy at fedoraproject.org  Tue Aug 11 15:23:48 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Tue, 11 Aug 2009 15:23:48 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.47,1.48
Message-ID: <20090811152348.E680111C00D7@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17689

Modified Files:
	libprelude.spec 
Log Message:
adjust perl build requires for RHEL <= 5



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- libprelude.spec	25 Jul 2009 08:28:32 -0000	1.47
+++ libprelude.spec	11 Aug 2009 15:23:48 -0000	1.48
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.24
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -45,7 +45,11 @@ Python bindings for libprelude.
 %package perl
 Summary:	Perl bindings for libprelude
 Group:		System Environment/Libraries
+%if 0%{?rhel} <= 5
+BuildRequires:	perl
+%else
 BuildRequires:	perl-devel
+%endif
 Requires:	libprelude = %{version}-%{release}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -137,6 +141,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sat Aug 8 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.9.24-3
+- adjust to build in EL-5
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pjones at fedoraproject.org  Tue Aug 11 15:29:50 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue, 11 Aug 2009 15:29:50 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-relocatable-kernel-on-x86_64-uefi.patch, 
	NONE, 1.1 grub.spec, 1.104, 1.105
Message-ID: <20090811152950.D9EDF11C00D7@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18749

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-relocatable-kernel-on-x86_64-uefi.patch 
Log Message:
* Tue Aug 11 2009 Peter Jones <pjones at redhat.com> - 0.97-58
- Dynamically choose load address for bzimage on 64-bit UEFI.


grub-0.97-relocatable-kernel-on-x86_64-uefi.patch:
 efimm.c               |   39 +++++++++++++++++++++++++++++++++++++++
 grub/efi/efi.h        |    1 +
 grub/x86_64/linux.h   |    1 -
 x86_64/loader/linux.c |   14 ++++++++++++--
 4 files changed, 52 insertions(+), 3 deletions(-)

--- NEW FILE grub-0.97-relocatable-kernel-on-x86_64-uefi.patch ---
>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(-)

diff --git a/efi/efimm.c b/efi/efimm.c
index d14b630..3b790d5 100644
--- a/efi/efimm.c
+++ b/efi/efimm.c
@@ -78,6 +78,45 @@ grub_efi_free_pool (void *buffer)
   Call_Service_1(b->free_pool, buffer);
 }
 
+void *
+grub_efi_allocate_anypages(grub_efi_uintn_t pages)
+{
+  grub_efi_boot_services_t *b;
+  grub_efi_status_t status;
+  grub_efi_physical_address_t address;
+
+  b = grub_efi_system_table->boot_services;
+  status = Call_Service_4 (b->allocate_pages,
+			    GRUB_EFI_ALLOCATE_ANY_PAGES,
+			    GRUB_EFI_LOADER_DATA,
+			    pages,
+			    &address);
+  if (status != GRUB_EFI_SUCCESS)
+  	return 0;
+
+  if (allocated_pages)
+     {
+       unsigned i;
+ 
+       for (i = 0; i < MAX_ALLOCATED_PAGES; i++)
+ 	if (allocated_pages[i].addr == 0)
+        {
+              allocated_pages[i].addr = address;
+              allocated_pages[i].num_pages = pages;
+              break;
+        }
+ 
+       if (i == MAX_ALLOCATED_PAGES)
+        {
+           grub_printf ("too many page allocations");
+           return NULL;
+        }
+     }
+ 
+  return (void *) ((grub_addr_t) address);
+
+}
+
 /* 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);
 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);
+void *grub_efi_allocate_anypages (grub_efi_uintn_t pages);
 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 @@
 static unsigned long linux_mem_size;
 static int loaded;
 static void *real_mode_mem;
+static void *prot_mode_mem;
 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)
 
   /* Initialize the memory pointers with NULL for convenience.  */
   real_mode_mem = 0;
+  prot_mode_mem = 0;
   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)
       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)
 
   grub_seek ((setup_sects << SECTOR_BITS) + SECTOR_SIZE);
   len = prot_size;
-  if (grub_read ((char *) GRUB_LINUX_BZIMAGE_ADDR, len) != len)
+  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



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- grub.spec	27 Jul 2009 15:39:35 -0000	1.104
+++ grub.spec	11 Aug 2009 15:29:50 -0000	1.105
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 57%{?dist}
+Release: 58%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -46,6 +46,7 @@ Patch17: grub-fix-memory-corruption.patc
 Patch18: grub-ext4-support.patch
 Patch19: grub-0.97-xfs-writable-strings.patch
 Patch20: grub-0.97-partitionable-md.patch
+Patch21: grub-0.97-relocatable-kernel-on-x86_64-uefi.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -76,6 +77,7 @@ systems.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 autoreconf
@@ -137,6 +139,9 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Tue Aug 11 2009 Peter Jones <pjones at redhat.com> - 0.97-58
+- Dynamically choose load address for bzimage on 64-bit UEFI.
+
 * Mon Jul 27 2009 Hans de Goede <hdegoede at redhat.com> - 0.97-57
 - Fix building with new rpm (with auto buildroot cleaning)
 - Update Exclusive arch for F-12 i586 -> i686 change



From pkgdb at fedoraproject.org  Tue Aug 11 15:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:32:23 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811153223.D662610F880@bastion2.fedora.phx.redhat.com>

ke4qqq has set the commit acl on zikula (Fedora 11) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 15:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:32:27 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811153228.1C87D10F89B@bastion2.fedora.phx.redhat.com>

ke4qqq has set the commit acl on zikula (Fedora EPEL 5) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 15:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:32:34 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811153234.74C3510F8AD@bastion2.fedora.phx.redhat.com>

ke4qqq has set the commit acl on zikula (Fedora 10) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From pkgdb at fedoraproject.org  Tue Aug 11 15:32:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 15:32:36 +0000
Subject: [pkgdb] zikula had acl change status
Message-ID: <20090811153240.B1A2F10F8AF@bastion2.fedora.phx.redhat.com>

ke4qqq has set the commit acl on zikula (Fedora devel) to Approved for pfrields

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula



From hadess at fedoraproject.org  Tue Aug 11 15:10:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 15:10:06 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel
	0001-Fix-keyboard-not-working-in-the-properties-window.patch,
	NONE, 1.1 gnome-bluetooth.spec, 1.87, 1.88
Message-ID: <20090811151006.870B911C048B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15284

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	0001-Fix-keyboard-not-working-in-the-properties-window.patch 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-5
- Fix the friendly name not being editable (#516801)


0001-Fix-keyboard-not-working-in-the-properties-window.patch:
 main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-keyboard-not-working-in-the-properties-window.patch ---
>From b95f581c6b8b10ef6369f009e8dc88ab75db99ee Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 16:03:03 +0100
Subject: [PATCH] Fix keyboard not working in the properties window

Wrong prototype for the key-press-event callback.
---
 properties/main.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/properties/main.c b/properties/main.c
index 4cf435b..7a93026 100644
--- a/properties/main.c
+++ b/properties/main.c
@@ -51,7 +51,7 @@ static gboolean delete_callback(GtkWidget *window, GdkEvent *event,
 	return FALSE;
 }
 
-static void
+static gboolean
 keypress_callback (GtkWidget *window,
 		   GdkEventKey *key,
 		   gpointer user_data)
@@ -61,6 +61,8 @@ keypress_callback (GtkWidget *window,
 
 		gtk_main_quit();
 	}
+
+	return FALSE;
 }
 
 static void close_callback(GtkWidget *button, gpointer user_data)
-- 
1.6.2.5



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- gnome-bluetooth.spec	11 Aug 2009 11:48:56 -0000	1.87
+++ gnome-bluetooth.spec	11 Aug 2009 15:10:06 -0000	1.88
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -11,6 +11,8 @@ Source1:	61-gnome-bluetooth-rfkill.rules
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Patch0:		0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=516801
+Patch1:		0001-Fix-keyboard-not-working-in-the-properties-window.patch
 
 BuildRequires:	gtk2-devel
 BuildRequires:	GConf2-devel
@@ -65,6 +67,7 @@ for writing applications that require a 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
 %patch0 -p1 -b .nm-crasher
+%patch1 -p1 -b .kbd
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -197,6 +200,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-5
+- Fix the friendly name not being editable (#516801)
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.9-4
 - Add udev rules to access /dev/rfkill (#514798)
 



From s4504kr at fedoraproject.org  Tue Aug 11 15:36:13 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 11 Aug 2009 15:36:13 +0000 (UTC)
Subject: rpms/kaya/F-10 kaya-0.5.2-conf.patch, NONE, 1.1 kaya.spec, 1.3,
	1.4 sources, 1.3, 1.4 kaya-0.5.0-conf.patch, 1.1, NONE
Message-ID: <20090811153613.B46C511C00D7@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/kaya/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19754

Modified Files:
	kaya.spec sources 
Added Files:
	kaya-0.5.2-conf.patch 
Removed Files:
	kaya-0.5.0-conf.patch 
Log Message:
New upstream release

kaya-0.5.2-conf.patch:
 configure.ac       |    3 ++-
 stdlib/Makefile.in |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kaya-0.5.2-conf.patch ---
diff -up kaya-0.5.2/configure.ac.orig kaya-0.5.2/configure.ac
--- kaya-0.5.2/configure.ac.orig	2009-04-12 12:02:24.000000000 +0200
+++ kaya-0.5.2/configure.ac	2009-07-09 19:11:20.000000000 +0200
@@ -248,7 +248,7 @@ PGINC=""
 AC_ARG_DISABLE([postgres],
 	AS_HELP_STRING([--disable-postgres],
 	[Disable Postgres database support]),
-	[AC_CHECK_HEADER([postgresql/libpq-fe.h],[PGINC="-I/usr/include/postgresql"])
+	[AC_CHECK_HEADER([libpq-fe.h],[PGINC="-I/usr/include"])
 	AC_CHECK_LIB(pq, PQconnectdb, 
 		[PGSTUB=""
 	         PGMAN="PostgresDB.libs"
@@ -275,6 +275,7 @@ AC_ARG_DISABLE([mysql],
 	AS_HELP_STRING([--disable-mysql],
 	[Disable MySQL database support]),
 [AC_CHECK_HEADER([mysql/mysql.h])
+LIBS="$LIBS -L${libdir}/mysql"
 AC_CHECK_LIB(mysqlclient, mysql_init, 
 	[AC_MSG_NOTICE([Found libmysqlclient, is it recent enough?])
 	 AC_CHECK_LIB(mysqlclient, mysql_stmt_init, 
diff -up kaya-0.5.2/stdlib/Makefile.in.orig kaya-0.5.2/stdlib/Makefile.in
--- kaya-0.5.2/stdlib/Makefile.in.orig	2009-04-12 12:02:24.000000000 +0200
+++ kaya-0.5.2/stdlib/Makefile.in	2009-07-09 19:15:23.000000000 +0200
@@ -87,7 +87,7 @@ Mime.o: Binary.ki Strings.ki IO.ki Regex
 Compress.o: Binary.ki zlib_glue.h Strings.ki Regex.ki
 Reflect.o: Builtins.ki Prelude.ki
 Pickle.o: Prelude.ki Binary.ki Reflect.ki Strings.ki Parse.ki
-Plugins.o: dl.h
+Plugins.o: dl.h Array.ki Regex.ki
 KayaDoc.o: ElementTree.ki Strings.ki HTMLDocument.ki Time.ki Regex.ki
 ElementTreeData.o: Dict.ki
 ElementTree.o: XMLentities.ki ElementTreeData.ki Regex.ki


Index: kaya.spec
===================================================================
RCS file: /cvs/extras/rpms/kaya/F-10/kaya.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kaya.spec	4 Aug 2008 16:25:45 -0000	1.3
+++ kaya.spec	11 Aug 2009 15:36:13 -0000	1.4
@@ -3,7 +3,7 @@
 %define debug_package %{nil}
 
 Name:		kaya
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	A Statically typed, imperative programming-language
 
@@ -12,7 +12,7 @@ License:	GPLv2+ and LGPLv2+
 URL:		http://kayalang.org
 Source0:	http://kayalang.org/src/%{name}-%{version}.tgz
 Patch1:		kaya-0.5.1-tst.patch
-Patch2:		kaya-0.5.0-conf.patch
+Patch2:		kaya-0.5.2-conf.patch
 
 #
 # ghc is not supported on alpha and ppc64
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/ docs/
 
 %changelog
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-1
+- New upstream release
+
 * Mon Aug  4 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.5.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaya/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Aug 2008 16:25:45 -0000	1.3
+++ sources	11 Aug 2009 15:36:13 -0000	1.4
@@ -1 +1 @@
-74b56a819ac29f59f8a2ace065784f32  kaya-0.5.1.tgz
+df844dc5982b576f5dc11e0e3805d49c  kaya-0.5.2.tgz


--- kaya-0.5.0-conf.patch DELETED ---



From sdz at fedoraproject.org  Tue Aug 11 15:42:40 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Tue, 11 Aug 2009 15:42:40 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.282,1.283 comps-f12.xml.in,1.79,1.80
Message-ID: <20090811154240.835F311C00D7@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21285

Modified Files:
	comps-f11.xml.in comps-f12.xml.in 
Log Message:
add gdm to sugar-desktop and mark only fructose activities as default



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- comps-f11.xml.in	11 Aug 2009 13:11:17 -0000	1.282
+++ comps-f11.xml.in	11 Aug 2009 15:42:40 -0000	1.283
@@ -5003,22 +5003,24 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">sugar</packagereq>
+      <packagereq type="default">etoys</packagereq>
+      <packagereq type="default">gdm</packagereq>
       <packagereq type="default">sugar-browse</packagereq>
       <packagereq type="default">sugar-calculator</packagereq>
       <packagereq type="default">sugar-chat</packagereq>
-      <packagereq type="default">sugar-finance</packagereq>
-      <packagereq type="default">sugar-help</packagereq>
       <packagereq type="default">sugar-imageviewer</packagereq>
       <packagereq type="default">sugar-jukebox</packagereq>
       <packagereq type="default">sugar-log</packagereq>
-      <packagereq type="default">sugar-moon</packagereq>
       <packagereq type="default">sugar-pippy</packagereq>
       <packagereq type="default">sugar-read</packagereq>
       <packagereq type="default">sugar-terminal</packagereq>
       <packagereq type="default">sugar-turtleart</packagereq>
       <packagereq type="default">sugar-write</packagereq>
-      <packagereq type="default">sugar-xoirc</packagereq>
-      <packagereq type="default">sugar-xomail</packagereq>
+      <packagereq type="optional">sugar-finance</packagereq>
+      <packagereq type="optional">sugar-help</packagereq>
+      <packagereq type="optional">sugar-moon</packagereq>
+      <packagereq type="optional">sugar-xoirc</packagereq>
+      <packagereq type="optional">sugar-xomail</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- comps-f12.xml.in	11 Aug 2009 12:57:05 -0000	1.79
+++ comps-f12.xml.in	11 Aug 2009 15:42:40 -0000	1.80
@@ -5136,22 +5136,24 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">sugar</packagereq>
+      <packagereq type="default">etoys</packagereq>
+      <packagereq type="default">gdm</packagereq>
       <packagereq type="default">sugar-browse</packagereq>
       <packagereq type="default">sugar-calculator</packagereq>
       <packagereq type="default">sugar-chat</packagereq>
-      <packagereq type="default">sugar-finance</packagereq>
-      <packagereq type="default">sugar-help</packagereq>
       <packagereq type="default">sugar-imageviewer</packagereq>
       <packagereq type="default">sugar-jukebox</packagereq>
       <packagereq type="default">sugar-log</packagereq>
-      <packagereq type="default">sugar-moon</packagereq>
       <packagereq type="default">sugar-pippy</packagereq>
       <packagereq type="default">sugar-read</packagereq>
       <packagereq type="default">sugar-terminal</packagereq>
       <packagereq type="default">sugar-turtleart</packagereq>
       <packagereq type="default">sugar-write</packagereq>
-      <packagereq type="default">sugar-xoirc</packagereq>
-      <packagereq type="default">sugar-xomail</packagereq>
+      <packagereq type="optional">sugar-finance</packagereq>
+      <packagereq type="optional">sugar-help</packagereq>
+      <packagereq type="optional">sugar-moon</packagereq>
+      <packagereq type="optional">sugar-xoirc</packagereq>
+      <packagereq type="optional">sugar-xomail</packagereq>
     </packagelist>
   </group>
   <group>



From jnovy at fedoraproject.org  Tue Aug 11 15:50:48 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 11 Aug 2009 15:50:48 +0000 (UTC)
Subject: rpms/texi2html/devel texi2html.spec,1.21,1.22
Message-ID: <20090811155048.DA23311C00D7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texi2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22516

Modified Files:
	texi2html.spec 
Log Message:
* Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 1.82-5
- don't complain if installing with --excludedocs (#516010)



Index: texi2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- texi2html.spec	27 Jul 2009 05:51:51 -0000	1.21
+++ texi2html.spec	11 Aug 2009 15:50:48 -0000	1.22
@@ -1,6 +1,6 @@
 Name: texi2html
 Version: 1.82
-Release: 4%{?dist}
+Release: 5%{?dist}
 # GPLv2+ is for the code
 # OFSFDL (Old FSF Documentation License) for the documentation
 # CC-BY-SA or GPLv2 for the images
@@ -49,11 +49,11 @@ make check
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir > /dev/null 2>&1 || :
 
 %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 2>&1 || :
 fi
 
 %files
@@ -74,6 +74,9 @@ fi
 %dir %{_sysconfdir}/texinfo
 
 %changelog
+* Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 1.82-5
+- don't complain if installing with --excludedocs (#516010)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.82-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From s4504kr at fedoraproject.org  Tue Aug 11 15:52:03 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 11 Aug 2009 15:52:03 +0000 (UTC)
Subject: rpms/kaya/F-10 kaya.spec,1.4,1.5 kaya-0.5.1-tst.patch,1.1,NONE
Message-ID: <20090811155203.560BB11C00D7@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/kaya/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22795

Modified Files:
	kaya.spec 
Removed Files:
	kaya-0.5.1-tst.patch 
Log Message:
remove unecessary patch


Index: kaya.spec
===================================================================
RCS file: /cvs/extras/rpms/kaya/F-10/kaya.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kaya.spec	11 Aug 2009 15:36:13 -0000	1.4
+++ kaya.spec	11 Aug 2009 15:52:03 -0000	1.5
@@ -4,15 +4,14 @@
 
 Name:		kaya
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Statically typed, imperative programming-language
 
 Group:		Development/Languages
 License:	GPLv2+ and LGPLv2+
 URL:		http://kayalang.org
 Source0:	http://kayalang.org/src/%{name}-%{version}.tgz
-Patch1:		kaya-0.5.1-tst.patch
-Patch2:		kaya-0.5.2-conf.patch
+Patch1:		kaya-0.5.2-conf.patch
 
 #
 # ghc is not supported on alpha and ppc64
@@ -51,7 +50,6 @@ Additional you may find samples for this
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1 
 
 %build
 autoconf
@@ -95,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/ docs/
 
 %changelog
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.5.2-2
+- Remove kaya-0.5.1-tst.patch
+
 * Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-1
 - New upstream release
 


--- kaya-0.5.1-tst.patch DELETED ---



From jnovy at fedoraproject.org  Tue Aug 11 15:52:59 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 11 Aug 2009 15:52:59 +0000 (UTC)
Subject: rpms/libmikmod/devel libmikmod.spec,1.9,1.10
Message-ID: <20090811155259.B507811C00D7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23009

Modified Files:
	libmikmod.spec 
Log Message:
* Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-6.beta2
- don't complain if installing with --excludedocs (#515953)
- add missing requires



Index: libmikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/devel/libmikmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libmikmod.spec	25 Jul 2009 06:05:33 -0000	1.9
+++ libmikmod.spec	11 Aug 2009 15:52:59 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 5.beta2%{?dist}
+Release: 6.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +24,8 @@ XM, ULT and IT.
 Group: Development/Libraries
 Summary: Header files and documentation for compiling mikmod applications
 Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
 Provides: mikmod-devel = 3.2.2-4
 Obsoletes: mikmod-devel < 3.2.2-4
 
@@ -56,13 +58,13 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 
 %post devel
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/mikmod.info %{_infodir}/dir || :
+[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/mikmod.info %{_infodir}/dir > /dev/null 2>&1 || :
 
 %postun -p /sbin/ldconfig
 
 %postun devel
 if [ $1 = 0 ] ; then
-	[ -x /sbin/install-info ] && /sbin/install-info  --delete %{_infodir}/mikmod.info %{_infodir}/dir || :
+	[ -x /sbin/install-info ] && /sbin/install-info  --delete %{_infodir}/mikmod.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %files
@@ -80,6 +82,10 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-6.beta2
+- don't complain if installing with --excludedocs (#515953)
+- add missing requires
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-5.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ksyz at fedoraproject.org  Tue Aug 11 15:57:20 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Tue, 11 Aug 2009 15:57:20 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/F-11 import.log, NONE,
	1.1 perl-Flickr-Upload.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090811155720.96D4E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23806/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Flickr-Upload.spec 
Log Message:
Initial import of perl-Flickr-Upload




--- NEW FILE import.log ---
perl-Flickr-Upload-1_32-1_fc11:F-11:perl-Flickr-Upload-1.32-1.fc11.src.rpm:1250006140


--- NEW FILE perl-Flickr-Upload.spec ---
Name:           perl-Flickr-Upload
Version:        1.32
Release:        1%{?dist}
Summary:        Flickr.com upload module and script
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Flickr-Upload/
Source0:        http://www.cpan.org/authors/id/C/CP/CPB/Flickr-Upload-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Flickr::API) >= 0.07
BuildRequires:  perl(HTTP::Request::Common) >= 1
BuildRequires:  perl(LWP::UserAgent) >= 1
BuildRequires:  perl(XML::Parser::Lite::Tree) >= 0.03
Requires:       perl(Flickr::API) >= 0.07
Requires:       perl(HTTP::Request::Common) >= 1
Requires:       perl(LWP::UserAgent) >= 1
Requires:       perl(XML::Parser::Lite::Tree) >= 0.03
Requires:       perl(Term::ProgressBar) >= 2.09
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module and script for uploading images to flickr.com web gallery.

%prep
%setup -q -n Flickr-Upload-%{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 ChangeLog README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/flickr_upload
%{_mandir}/man1/flickr_upload.1.gz


%changelog
* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> 1.32-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:59 -0000	1.1
+++ .cvsignore	11 Aug 2009 15:57:19 -0000	1.2
@@ -0,0 +1 @@
+Flickr-Upload-1.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:30:00 -0000	1.1
+++ sources	11 Aug 2009 15:57:20 -0000	1.2
@@ -0,0 +1 @@
+15bbfe5cf0160915f7f51a9868704086  Flickr-Upload-1.32.tar.gz



From ksyz at fedoraproject.org  Tue Aug 11 15:58:39 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Tue, 11 Aug 2009 15:58:39 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/devel import.log, NONE,
	1.1 perl-Flickr-Upload.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090811155839.AB35711C00D7@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24095/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Flickr-Upload.spec 
Log Message:
Initial import of perl-Flickr-Upload




--- NEW FILE import.log ---
perl-Flickr-Upload-1_32-1_fc11:HEAD:perl-Flickr-Upload-1.32-1.fc11.src.rpm:1250006212


--- NEW FILE perl-Flickr-Upload.spec ---
Name:           perl-Flickr-Upload
Version:        1.32
Release:        1%{?dist}
Summary:        Flickr.com upload module and script
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Flickr-Upload/
Source0:        http://www.cpan.org/authors/id/C/CP/CPB/Flickr-Upload-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Flickr::API) >= 0.07
BuildRequires:  perl(HTTP::Request::Common) >= 1
BuildRequires:  perl(LWP::UserAgent) >= 1
BuildRequires:  perl(XML::Parser::Lite::Tree) >= 0.03
Requires:       perl(Flickr::API) >= 0.07
Requires:       perl(HTTP::Request::Common) >= 1
Requires:       perl(LWP::UserAgent) >= 1
Requires:       perl(XML::Parser::Lite::Tree) >= 0.03
Requires:       perl(Term::ProgressBar) >= 2.09
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module and script for uploading images to flickr.com web gallery.

%prep
%setup -q -n Flickr-Upload-%{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 ChangeLog README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%{_bindir}/flickr_upload
%{_mandir}/man1/flickr_upload.1.gz


%changelog
* Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> 1.32-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Aug 2009 21:29:59 -0000	1.1
+++ .cvsignore	11 Aug 2009 15:58:39 -0000	1.2
@@ -0,0 +1 @@
+Flickr-Upload-1.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Aug 2009 21:30:00 -0000	1.1
+++ sources	11 Aug 2009 15:58:39 -0000	1.2
@@ -0,0 +1 @@
+15bbfe5cf0160915f7f51a9868704086  Flickr-Upload-1.32.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 16:12:06 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:12:06 +0000 (UTC)
Subject: rpms/konq-plugins/devel .cvsignore, 1.10, 1.11 konq-plugins.spec,
	1.28, 1.29 sources, 1.11, 1.12
Message-ID: <20090811161206.1C74F11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26895

Modified Files:
	.cvsignore konq-plugins.spec sources 
Log Message:
* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
* KDE 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	8 May 2009 14:45:55 -0000	1.10
+++ .cvsignore	11 Aug 2009 16:12:05 -0000	1.11
@@ -1 +1 @@
-konq-plugins-4.2.3.tar.bz2
+konq-plugins-4.3.0.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- konq-plugins.spec	25 Jul 2009 04:43:57 -0000	1.28
+++ konq-plugins.spec	11 Aug 2009 16:12:05 -0000	1.29
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.3
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -97,7 +97,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB README
+%doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
 %{_kde4_appsdir}/akregator/
@@ -121,11 +121,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %lang(it) %{_kde4_docdir}/HTML/it/konq-plugins/
 %lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins/
 %lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins/
+%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/konq-plugins/
 %lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins/
 %lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins/
 
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
+* KDE 4.3.0
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	8 May 2009 14:45:56 -0000	1.11
+++ sources	11 Aug 2009 16:12:05 -0000	1.12
@@ -1 +1 @@
-4290fa1c92671031aa97c122b09d8c13  konq-plugins-4.2.3.tar.bz2
+527d61a6774aee7c053c48b5842db4fb  konq-plugins-4.3.0.tar.bz2



From hadess at fedoraproject.org  Tue Aug 11 16:23:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 16:23:15 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.146,1.147
Message-ID: <20090811162315.9360F11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28311

Modified Files:
	gvfs.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-4
- Fix crash on startup for the afc volume monitor



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- gvfs.spec	11 Aug 2009 15:19:09 -0000	1.146
+++ gvfs.spec	11 Aug 2009 16:23:14 -0000	1.147
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -44,6 +44,7 @@ Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 Patch9: gvfs-1.2.3-sftp-40sec-timeout.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
 Patch10: 0001-Add-AFC-backend.patch
+Patch11: 0001-Revert-part-of-the-excessive-function-culling.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -140,6 +141,7 @@ and iPod Touches to applications using g
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 %patch10 -p1 -b .afc
+%patch11 -p1 -b .afc-crasher
 
 %build
 
@@ -293,6 +295,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-4
+- Fix crash on startup for the afc volume monitor
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-3
 - libgudev-devel is required for the gphoto2 monitor
 



From rdieter at fedoraproject.org  Tue Aug 11 16:25:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 16:25:13 +0000 (UTC)
Subject: rpms/konversation/F-11 .cvsignore, 1.7, 1.8 konversation.spec, 1.25,
	1.26 sources, 1.7, 1.8 konversation-1.1-amarok2.patch, 1.1, NONE
Message-ID: <20090811162513.7C5F411C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28637

Modified Files:
	.cvsignore konversation.spec sources 
Removed Files:
	konversation-1.1-amarok2.patch 
Log Message:
sync w/devel for konv-1.2 goodness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Aug 2008 14:20:05 -0000	1.7
+++ .cvsignore	11 Aug 2009 16:25:13 -0000	1.8
@@ -1 +1 @@
-konversation-1.1.tar.bz2
+konversation-1.2-alpha6.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- konversation.spec	2 Mar 2009 19:13:17 -0000	1.25
+++ konversation.spec	11 Aug 2009 16:25:13 -0000	1.26
@@ -1,107 +1,116 @@
+
+%define pre alpha6
+
 Name:           konversation
-Version:        1.1
-Release:        6%{?dist}
+Version:        1.2
+Release:        0.5.%{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}.tar.bz2
+URL:            http://konversation.kde.org/
+Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream patches
-Patch1: konversation-1.1-amarok2.patch
-
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-%if 0%{?fedora} > 8 
-BuildRequires:  kdelibs3-devel
-%define vendor_path kde
-%else
-BuildRequires:  kdelibs-devel
-BuildRequires:  libutempter-devel
-%define vendor_pre fedora
-%define vendor_prefix -%{vendor_pre} 
-%endif
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdepimlibs-devel
+BuildRequires:  phonon-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
+Requires: kdelibs4 >= %{kde4_version}
 
 %description
 A simple and easy to use IRC client with support for
 strikeout; multi-channel joins; away / unaway messages;
-ignore list functionality; (experimental) support for foreign
+ignore list functionality; support for foreign
 language characters; auto-connect to server; optional timestamps
 to chat windows; configurable background colors and much more
 
-%prep
-%setup -q -n %{name}-%{version}
 
-%patch1 -p1 -b .amarok2
+%prep
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-final
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-desktop-file-install \
---dir="$RPM_BUILD_ROOT%{_datadir}/applications/%{?vendor_path}" \
---vendor="%{?vendor_pre}" \
---delete-original \
-$RPM_BUILD_ROOT%{_datadir}/applications/kde/konversation.desktop
 
 ## File lists
 # locale's
-%find_lang %{name} || touch %{name}.lang
+%find_lang %{name}
 # HTML
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
    lang=$(basename $lang_dir)
-   echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
+   echo "%lang($lang) %doc ${HTML_DIR}/${lang}/*" >> %{name}.lang
 done
 fi
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/konversation.desktop
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files  -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO 
-%{_bindir}/konversation
-%{_datadir}/applications/%{?vendor_path}/%{?vendor_prefix}konversation.desktop
-%{_datadir}/apps/kconf_update/*
-%{_datadir}/apps/konversation
-%{_datadir}/config.kcfg/konversation.kcfg
-%{_datadir}/icons/crystalsvg/*/actions/*
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/services/konvirc.protocol
-%{_datadir}/services/konvirc6.protocol
+%{_kde4_bindir}/konversation
+%{_kde4_datadir}/applications/kde4/konversation.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_appsdir}/konversation/
+%{_kde4_appsdir}/kconf_update/konversation*
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.5.alpha6
+- add min kdelibs4 version
+
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.4.alpha6
+- konversation-1.2-alpha6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.3.alpha4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.2.alpha4
+- konversation-1.2-alpha4
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.1.alpha3
+- konversation-1.2-alpha3
+- optimize scriptlets
+
 * Mon Mar 02 2009 Dennis gilmore <dennis at ausil.us> - 1.1-6
 - make Patch and %%patch use the same number
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Aug 2008 14:20:05 -0000	1.7
+++ sources	11 Aug 2009 16:25:13 -0000	1.8
@@ -1 +1 @@
-0d38a16747ab4f6549863de385cb551c  konversation-1.1.tar.bz2
+1720cc7d03cfb808c666f8df9006573e  konversation-1.2-alpha6.tar.bz2


--- konversation-1.1-amarok2.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Aug 11 16:28:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 16:28:22 +0000 (UTC)
Subject: rpms/mutter/devel .cvsignore, 1.2, 1.3 mutter.spec, 1.4, 1.5 sources,
	1.2, 1.3 mutter-clutter-1.0-2.patch, 1.1,
	NONE mutter-clutter1.0.patch, 1.1,
	NONE mutter-pluginmanager.patch, 1.1, NONE
Message-ID: <20090811162822.95DE811C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29303

Modified Files:
	.cvsignore mutter.spec sources 
Removed Files:
	mutter-clutter-1.0-2.patch mutter-clutter1.0.patch 
	mutter-pluginmanager.patch 
Log Message:
- New upstream 2.27.2 release. Drop upstreamed patches.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jul 2009 16:53:14 -0000	1.2
+++ .cvsignore	11 Aug 2009 16:28:22 -0000	1.3
@@ -1 +1 @@
-mutter-2.27.1.tar.bz2
+mutter-2.27.2.tar.bz2


Index: mutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mutter.spec	29 Jul 2009 20:43:30 -0000	1.4
+++ mutter.spec	11 Aug 2009 16:28:22 -0000	1.5
@@ -1,15 +1,12 @@
 Name:           mutter
-Version:        2.27.1
-Release:        5%{?dist}
+Version:        2.27.2
+Release:        1%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://git.gnome.org/cgit/mutter
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
-Patch0:		mutter-pluginmanager.patch
-Patch1:		mutter-clutter1.0.patch
-Patch2:		mutter-clutter-1.0-2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
@@ -71,9 +68,6 @@ utilities for testing Metacity/Mutter th
 
 %prep
 %setup -q
-%patch0 -p1 -b .pluginmanager
-%patch1 -p1 -b .clutter1
-%patch2 -p1 -b .clutter2
 
 %build
 autoreconf
@@ -161,6 +155,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Tue Aug 11 2009 Peter Robinson <pbrobinson at gmail.com> 2.27.2-1
+- New upstream 2.27.2 release. Drop upstreamed patches.
+
 * Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> 2.27.1-5
 - Add upstream patches for clutter 1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 16:53:14 -0000	1.2
+++ sources	11 Aug 2009 16:28:22 -0000	1.3
@@ -1 +1 @@
-973f59241bb1554bc046bd0ac4aea564  mutter-2.27.1.tar.bz2
+9b7e9ffcb14e90c9f31c973383a1a432  mutter-2.27.2.tar.bz2


--- mutter-clutter-1.0-2.patch DELETED ---


--- mutter-clutter1.0.patch DELETED ---


--- mutter-pluginmanager.patch DELETED ---



From jnovy at fedoraproject.org  Tue Aug 11 16:28:54 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue, 11 Aug 2009 16:28:54 +0000 (UTC)
Subject: rpms/texi2html/devel texi2html.spec,1.22,1.23
Message-ID: <20090811162854.076A911C00D7@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texi2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29491

Modified Files:
	texi2html.spec 
Log Message:
* Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 1.82-5
- don't complain if installing with --excludedocs (#516010)
- disable tests for now



Index: texi2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- texi2html.spec	11 Aug 2009 15:50:48 -0000	1.22
+++ texi2html.spec	11 Aug 2009 16:28:53 -0000	1.23
@@ -43,7 +43,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/texinfo $RPM_BUILD_ROOT%{_sysconfdir}/texinfo
 
 %check
-make check
+#make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +76,7 @@ fi
 %changelog
 * Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 1.82-5
 - don't complain if installing with --excludedocs (#516010)
+- disable tests for now
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.82-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rdieter at fedoraproject.org  Tue Aug 11 16:11:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 16:11:07 +0000 (UTC)
Subject: rpms/konversation/devel konversation.spec,1.31,1.32
Message-ID: <20090811161107.6DFB811C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26643

Modified Files:
	konversation.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.5.alpha6
- add min kdelibs4 version



Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- konversation.spec	11 Aug 2009 15:17:10 -0000	1.31
+++ konversation.spec	11 Aug 2009 16:11:07 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:           konversation
 Version:        1.2
-Release:        0.4.%{pre}%{?dist}
+Release:        0.5.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -18,6 +18,9 @@ BuildRequires:  kdelibs4-devel
 BuildRequires:  kdepimlibs-devel
 BuildRequires:  phonon-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
+Requires: kdelibs4 >= %{kde4_version}
+
 %description
 A simple and easy to use IRC client with support for
 strikeout; multi-channel joins; away / unaway messages;
@@ -48,7 +51,7 @@ make install/fast DESTDIR=%{buildroot} -
 
 ## File lists
 # locale's
-%find_lang %{name} || touch %{name}.lang
+%find_lang %{name}
 # HTML
 HTML_DIR=$(kde4-config --expandvars --install html)
 if [ -d %{buildroot}${HTML_DIR} ]; then
@@ -80,7 +83,6 @@ if [ $1 -eq 0 ] ; then
 fi
 
 
-
 %files  -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO 
@@ -93,6 +95,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.5.alpha6
+- add min kdelibs4 version
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.4.alpha6
 - konversation-1.2-alpha6
 



From spot at fedoraproject.org  Tue Aug 11 16:36:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 16:36:10 +0000 (UTC)
Subject: rpms/R-biglm/devel .cvsignore, 1.2, 1.3 R-biglm.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090811163610.4C4A011C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-biglm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31061

Modified Files:
	.cvsignore R-biglm.spec sources 
Log Message:
update to 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-biglm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Jul 2008 21:13:18 -0000	1.2
+++ .cvsignore	11 Aug 2009 16:36:09 -0000	1.3
@@ -1 +1 @@
-biglm_0.4.tar.gz
+biglm_0.7.tar.gz


Index: R-biglm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-biglm/devel/R-biglm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-biglm.spec	24 Jul 2009 16:11:28 -0000	1.3
+++ R-biglm.spec	11 Aug 2009 16:36:10 -0000	1.4
@@ -1,8 +1,8 @@
 %define packname  biglm
 
 Name:             R-%{packname}
-Version:          0.4
-Release:          3%{?dist}
+Version:          0.7
+Release:          1%{?dist}
 Summary:          Bounded memory linear and generalized linear models
 
 Group:            Applications/Productivity
@@ -12,10 +12,10 @@ 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)
 
-Requires:         R
-Requires(post):   R
-Requires(postun): R
-BuildRequires:    R-devel, tetex-latex
+Requires:         R-core, R-DBI, R-RSQLite, R-RODBC
+Requires(post):   R-core
+Requires(postun): R-core
+BuildRequires:    R-devel, tetex-latex, R-DBI, R-RSQLite, R-RODBC
 
 %description
 Regression for data too large to fit in memory.
@@ -62,6 +62,9 @@ test -d %{packname}/src && (cd %{packnam
 %{_libdir}/R/library/%{packname}/libs/
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7-1
+- update to 0.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-biglm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jul 2008 21:13:18 -0000	1.2
+++ sources	11 Aug 2009 16:36:10 -0000	1.3
@@ -1 +1 @@
-c5d6797ec7b446dfeedf913d52771bea  biglm_0.4.tar.gz
+6ec9d1267f83fa5e44dbf4bb1669754e  biglm_0.7.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 16:39:52 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:39:52 +0000 (UTC)
Subject: rpms/konq-plugins/F-10 .cvsignore, 1.9, 1.10 konq-plugins.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090811163952.7701711C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31904/F-10

Modified Files:
	.cvsignore konq-plugins.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 18:42:44 -0000	1.9
+++ .cvsignore	11 Aug 2009 16:39:52 -0000	1.10
@@ -1 +1 @@
-konq-plugins-4.2.4.tar.bz2
+konq-plugins-4.3.0.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/konq-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- konq-plugins.spec	3 Jun 2009 18:42:44 -0000	1.18
+++ konq-plugins.spec	11 Aug 2009 16:39:52 -0000	1.19
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
@@ -97,7 +97,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB README
+%doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
 %{_kde4_appsdir}/akregator/
@@ -121,11 +121,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %lang(it) %{_kde4_docdir}/HTML/it/konq-plugins/
 %lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins/
 %lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins/
+%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/konq-plugins/
 %lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins/
 %lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins/
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Jun 2009 18:42:44 -0000	1.12
+++ sources	11 Aug 2009 16:39:52 -0000	1.13
@@ -1 +1 @@
-bd98ccbf535023b87b14e928c5b2fe5d  konq-plugins-4.2.4.tar.bz2
+527d61a6774aee7c053c48b5842db4fb  konq-plugins-4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 16:39:52 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:39:52 +0000 (UTC)
Subject: rpms/konq-plugins/F-11 .cvsignore, 1.11, 1.12 konq-plugins.spec,
	1.28, 1.29 sources, 1.12, 1.13
Message-ID: <20090811163952.CD49C11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/konq-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31904/F-11

Modified Files:
	.cvsignore konq-plugins.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Jun 2009 18:42:44 -0000	1.11
+++ .cvsignore	11 Aug 2009 16:39:52 -0000	1.12
@@ -1 +1 @@
-konq-plugins-4.2.4.tar.bz2
+konq-plugins-4.3.0.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-11/konq-plugins.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- konq-plugins.spec	3 Jun 2009 18:42:44 -0000	1.28
+++ konq-plugins.spec	11 Aug 2009 16:39:52 -0000	1.29
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
@@ -97,7 +97,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB README
+%doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
 %{_kde4_appsdir}/akregator/
@@ -121,11 +121,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %lang(it) %{_kde4_docdir}/HTML/it/konq-plugins/
 %lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins/
 %lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins/
+%lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR/konq-plugins/
 %lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins/
 %lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins/
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Jun 2009 18:42:44 -0000	1.12
+++ sources	11 Aug 2009 16:39:52 -0000	1.13
@@ -1 +1 @@
-bd98ccbf535023b87b14e928c5b2fe5d  konq-plugins-4.2.4.tar.bz2
+527d61a6774aee7c053c48b5842db4fb  konq-plugins-4.3.0.tar.bz2



From spot at fedoraproject.org  Tue Aug 11 16:41:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 16:41:14 +0000 (UTC)
Subject: rpms/R-bigmemory/devel .cvsignore, 1.2, 1.3 R-bigmemory.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <20090811164114.97A0011C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-bigmemory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv379

Modified Files:
	.cvsignore R-bigmemory.spec sources 
Log Message:
update to 3.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-bigmemory/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Nov 2008 15:44:29 -0000	1.2
+++ .cvsignore	11 Aug 2009 16:41:14 -0000	1.3
@@ -1 +1 @@
-bigmemory_2.3.tar.gz
+bigmemory_3.10.tar.gz


Index: R-bigmemory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-bigmemory/devel/R-bigmemory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-bigmemory.spec	24 Jul 2009 16:11:41 -0000	1.5
+++ R-bigmemory.spec	11 Aug 2009 16:41:14 -0000	1.6
@@ -1,8 +1,8 @@
-%define packname  bigmemory
+%global packname  bigmemory
 
 Name:             R-%{packname}
-Version:          2.3
-Release:          5%{?dist}.1
+Version:          3.10
+Release:          1%{?dist}
 Summary:          Manage massive matrices in R using C++, with support for shared memory
 
 Group:            Applications/Productivity
@@ -11,9 +11,9 @@ 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)
 
-Requires:         R, texlive-latex
-Requires(post):   R
-Requires(postun): R
+Requires:         R-core, texlive-latex
+Requires(post):   R-core
+Requires(postun): R-core
 BuildRequires:    R-devel >= 2.5.0, R-biglm, R-nws
 # Hangs trying to check the examples in the test suite, not endian clean?
 # https://bugzilla.redhat.com/show_bug.cgi?id=471422
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/libs/
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.10-1
+- update to 3.10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-bigmemory/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Nov 2008 15:44:29 -0000	1.2
+++ sources	11 Aug 2009 16:41:14 -0000	1.3
@@ -1 +1 @@
-b8ec41cf60c279da1c48b6c52c742d21  bigmemory_2.3.tar.gz
+286c872cb9582b442a5583e407a39447  bigmemory_3.10.tar.gz



From epienbro at fedoraproject.org  Tue Aug 11 16:30:35 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 11 Aug 2009 16:30:35 +0000 (UTC)
Subject: rpms/mingw32-enchant/F-11 compile-resources, NONE,
	1.1 enchant-1.5.0-abi12160.searchdirs.patch, NONE,
	1.1 enchant-1.5.0-abi12173.leaks.patch, NONE,
	1.1 enchant-1.5.0-abi12174.fixbadmatch.patch, NONE,
	1.1 enchant-mingw-compile-fix.patch, NONE,
	1.1 mingw32-enchant.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090811163035.D1DF311C043B@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-enchant/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29927/F-11

Modified Files:
	sources 
Added Files:
	compile-resources enchant-1.5.0-abi12160.searchdirs.patch 
	enchant-1.5.0-abi12173.leaks.patch 
	enchant-1.5.0-abi12174.fixbadmatch.patch 
	enchant-mingw-compile-fix.patch mingw32-enchant.spec 
Log Message:
Initial import



--- NEW FILE compile-resources ---
#!/bin/sh

# Script to compile a resource file for a DLL if there is a .rc file
# for it. The resource source file is supposed to contain a version
# info section, that uses the string BUILDNUMBER as the least
# significant part of the version numbers. This script replaces that
# string with a "build number" before compiling the binary resource
# file. The build number is kept between builds in a "stamp" file, and
# incremented each time. (If there is no stamp file, build number 0 is
# used.) The intention is that only the "official" maintainer of a DLL
# keeps such a stamp file, and thus the DLLs he releases have
# increasing version number resources, which can be used by an
# installer program to decide whether to replace an existing DLL with
# the same name.

# This is just my (tml at iki.fi) idea, if somebody comes up with a
# better way to generate version number resources, don't hesitate to
# suggest.

# The command line arguments are:
# $1: the name of the .rc file to check
# $2: the name of the resource object file to produce, if the rc file exists

# Check if we have a resource file for this DLL.
rcfile=$1
resfile=$2
if [ -f $rcfile ]; then
    # Check if we have a build number stamp file.
    basename=`basename $rcfile .rc`
    if [ -f $basename-build.stamp ]; then
	read number <$basename-build.stamp
	buildnumber=$[number]
	echo Build number $buildnumber
	rm -rf $basename-build.stamp
    else
	echo Using zero as build number
        buildnumber=0
    fi

    m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc &&
	${WINDRES-windres} $$.rc $resfile &&
	rm $$.rc
else
    # Return failure
    exit 1
fi

enchant-1.5.0-abi12160.searchdirs.patch:
 enchant.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE enchant-1.5.0-abi12160.searchdirs.patch ---
diff -ru enchant-1.5.0.orig/src/enchant.c enchant-1.5.0/src/enchant.c
--- enchant-1.5.0.orig/src/enchant.c	2009-06-22 11:53:16.000000000 +0100
+++ enchant-1.5.0/src/enchant.c	2009-06-22 11:53:39.000000000 +0100
@@ -232,6 +232,9 @@
 	if (module_dir)
 		module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir);
 
+#if defined(ENCHANT_GLOBAL_MODULE_DIR)
+	module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
+#else
 	/* Dynamically locate library and search for modules relative to it. */
 	prefix = enchant_get_prefix_dir();
 	if(prefix)
@@ -240,9 +243,6 @@
 			g_free(prefix);
 			module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir);
 		}
-
-#if defined(ENCHANT_GLOBAL_MODULE_DIR)
-	module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
 #endif
 
 	return module_dirs;

enchant-1.5.0-abi12173.leaks.patch:
 src/enchant.c          |    6 +++++-
 tests/enchant-ispell.c |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE enchant-1.5.0-abi12173.leaks.patch ---
diff -ru enchant-1.4.2.orig/src/enchant.c enchant-1.4.2/src/enchant.c
--- enchant-1.4.2.orig/src/enchant.c	2009-06-29 17:47:11.000000000 +0100
+++ enchant-1.4.2/src/enchant.c	2009-06-29 20:46:17.000000000 +0100
@@ -1543,11 +1544,13 @@
 	EnchantDict *dict;
 	EnchantProvider *owner;
 	EnchantSession *session;
+	EnchantDictPrivateData *enchant_dict_private_data;
 	
 	g_return_if_fail (data);
 	
 	dict = (EnchantDict *) data;
-	session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session;
+	enchant_dict_private_data = (EnchantDictPrivateData*)dict->enchant_private_data;
+	session = enchant_dict_private_data->session;
 	owner = session->provider;
 	
 	if (owner && owner->dispose_dict) 
@@ -1555,6 +1558,8 @@
 	else if(session->is_pwl)
 		g_free (dict);
 
+	g_free(enchant_dict_private_data);
+
 	enchant_session_destroy (session);
 }
 
diff -ru enchant-1.4.2.orig/tests/enchant-ispell.c enchant-1.4.2/tests/enchant-ispell.c
--- enchant-1.4.2.orig/tests/enchant-ispell.c	2009-06-29 17:47:11.000000000 +0100
+++ enchant-1.4.2/tests/enchant-ispell.c	2009-06-29 20:45:29.000000000 +0100
@@ -431,6 +431,8 @@
 					do_mode_a (out, dict, word, pos, lineCount);
 				else if (mode == MODE_L)
 					do_mode_l (out, dict, word, lineCount);
+
+				g_string_free(word, TRUE);
 			}
 			if (token_ptr)
 				g_slist_free (token_ptr);
@@ -446,8 +448,6 @@
 	enchant_broker_free_dict (broker, dict);
 	enchant_broker_free (broker);
 
-	if (word)
-		g_string_free (word, TRUE);
 	g_string_free (str, TRUE);
 
 	return 0;

enchant-1.5.0-abi12174.fixbadmatch.patch:
 myspell_checker.cpp |   32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

--- NEW FILE enchant-1.5.0-abi12174.fixbadmatch.patch ---
diff -ru enchant-1.4.2.orig/src/myspell/myspell_checker.cpp enchant-1.4.2/src/myspell/myspell_checker.cpp
--- enchant-1.4.2.orig/src/myspell/myspell_checker.cpp	2009-06-29 17:04:41.000000000 +0100
+++ enchant-1.4.2/src/myspell/myspell_checker.cpp	2009-06-29 17:25:40.000000000 +0100
@@ -341,6 +341,27 @@
     return g_file_test(aff.c_str(), G_FILE_TEST_EXISTS) != 0;
 }
 
+static bool is_plausible_dict_for_tag(const char *dir_entry, const char *tag)
+{
+    const char *dic_suffix = ".dic";
+    size_t dic_suffix_len = strlen(dic_suffix);
+    size_t dir_entry_len = strlen(dir_entry);
+    size_t tag_len = strlen(tag);
+
+    if (dir_entry_len - dic_suffix_len < tag_len)
+        return false;
+    if (strcmp(dir_entry+dir_entry_len-dic_suffix_len, dic_suffix) != 0)
+        return false;
+    if (strncmp (dir_entry, tag, tag_len) != 0)
+        return false;
+    //e.g. requested dict for "fi",
+    //reject "fil_PH.dic"
+    //allow "fi-FOO.dic", "fi_FOO.dic", "fi.dic", etc.
+    if (!ispunct(dir_entry[tag_len]))
+        return false;
+    return true;
+}
+
 static char *
 myspell_request_dictionary (EnchantBroker * broker, const char * tag) 
 {
@@ -364,14 +385,13 @@
 		if (dir) {
 			const char *dir_entry;
 			while ((dir_entry = g_dir_read_name (dir)) != NULL) {
-				if (strncmp (dir_entry, tag, strlen(tag)) == 0 &&
-				    strstr (dir_entry, ".dic") != NULL) {
+				if (is_plausible_dict_for_tag(dir_entry, tag)) {
 					char *dict = g_build_filename (dirs[i].c_str(), 
 								       dir_entry, NULL);
-                    if(s_hasCorrespondingAffFile(dict)){
-			                    g_dir_close (dir);
-					    return dict;
-                    }
+					if(s_hasCorrespondingAffFile(dict)){
+						g_dir_close (dir);
+						return dict;
+					}
 				}
 			}
 

enchant-mingw-compile-fix.patch:
 myspell_checker.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE enchant-mingw-compile-fix.patch ---
--- src/myspell/myspell_checker.cpp.orig	2009-05-23 11:44:14.000000000 +0200
+++ src/myspell/myspell_checker.cpp	2009-08-08 11:53:11.648688871 +0200
@@ -38,6 +38,12 @@
 #include "enchant.h"
 #include "enchant-provider.h"
 
+#ifdef WIN32
+/* The above #include caused a macro to be defined which
+ * causes a compile error later on. Work around this */
+#undef near
+#endif
+
 /* built against hunspell 1.2.2 on 2008-04-12 */
 
 #ifdef HUNSPELL_STATIC


--- NEW FILE mingw32-enchant.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}

Summary:       MinGW Windows Enchanting Spell Checking Library
Name:          mingw32-enchant
Version:       1.5.0
Release:       2%{?dist}
Group:         System Environment/Libraries
License:       LGPLv2+
Source0:       http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
Source1:       compile-resources
URL:           http://www.abisource.com/
BuildRoot:     %{_tmppath}/%{name}-%{version}-root

BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-glib2 >= 2.6.0
BuildRequires: mingw32-hunspell
BuildRequires: m4
BuildArch:     noarch

Requires:      pkgconfig

Patch0:        enchant-mingw-compile-fix.patch

Patch10:       enchant-1.5.0-abi12160.searchdirs.patch
Patch11:       enchant-1.5.0-abi12173.leaks.patch
Patch12:       enchant-1.5.0-abi12174.fixbadmatch.patch


%description
A library that wraps other spell checking backends.

This is the MinGW build of enchant


%package static
Summary:        Static version of the MinGW Windows enchant library
Requires:       %{name} = %{version}-%{release}
Group:          Development/Libraries

%description static
Static version of the MinGW Windows enchant spell checking library.


%prep
%setup -qn "enchant-%{version}"

# There's a file missing from the tarball
# http://www.abisource.com/viewvc/enchant/trunk/compile-resource?revision=21303
cp %{SOURCE1} compile-resource
chmod 755 compile-resource

# Fix for a conflict between Hunspell and windef.h
# http://www.abisource.com/viewvc?view=rev&revision=26532
%patch0 -p0 -b .near

#http://bugzilla.abisource.com/show_bug.cgi?id=12160
%patch10 -p1 -b .searchdirs
#http://bugzilla.abisource.com/show_bug.cgi?id=12173
%patch11 -p1 -b .leaks
#http://bugzilla.abisource.com/show_bug.cgi?id=12174
%patch12 -p1 -b .fixbadmatch


%build
%{_mingw32_configure}   \
    --disable-ispell    \
    --disable-hspell    \
    --disable-aspell    \
    --enable-static     \
    --enable-shared
make
# When using make -j4 (which is the case with Koji) the following compile error occurs:
# /bin/sh ../libtool --tag=CC   --mode=link i686-pc-mingw32-gcc  -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -mms-bitfields -no-undefined -export-dynamic -avoid-version   -o libenchant.la -rpath /usr/i686-pc-mingw32/sys-root/mingw/lib prefix.lo enchant.lo pwl.lo -L/usr/i686-pc-mingw32/sys-root/mingw/lib -lgmodule-2.0 -lglib-2.0 -lintl   enchant-win32res.lo 
# libtool: link: `enchant-win32res.lo' is not a valid libtool object
#
# I haven't been able to find the exact cause yet so 'make %{?_smp_mflags}' has been disabled for now


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Drop the man-pages
rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB README
%{_mingw32_bindir}/enchant-lsmod.exe
%{_mingw32_bindir}/enchant.exe
%{_mingw32_bindir}/libenchant.dll
%{_mingw32_includedir}/enchant/
%dir %{_mingw32_libdir}/enchant/
%{_mingw32_libdir}/enchant/libenchant_myspell.dll
%{_mingw32_libdir}/enchant/libenchant_myspell.dll.a
%{_mingw32_libdir}/enchant/libenchant_myspell.la
%{_mingw32_libdir}/libenchant.dll.a
%{_mingw32_libdir}/libenchant.la
%{_mingw32_libdir}/pkgconfig/enchant.pc
%{_mingw32_datadir}/enchant/

%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/libenchant.a
%{_mingw32_libdir}/enchant/libenchant_myspell.a


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Sun Aug  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-2
- Dropped BR: autoconf libtool
- Added BR: m4
- Use 'rm -rf $RPM_BUILDROOT' in the %%clean phase
- Fixed a 'strange-permission' rpmlint warning
- Moved the file %%{_mingw32_libdir}/enchant/libenchant_myspell.a to
  the -static subpackage
- Use a more verbose %%files list
- Added a Requires: pkgconfig to the main package
- Added patches from the native enchant package
- Dropped another patch which isn't necessary anymore

* Sat Aug  8 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-1
- Update to version 1.5.0
- Drop upstreamed patch
- Don't use 'make %%{?_smp_mflags}' as this causes a compile failure in Koji

* Mon May 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.2-6
- Ported the native package to have MinGW support
- Dropped the epoch as this is a new package
- Fixed %%defattr line

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Jul 26 2008 Michael Schwendt <mschwendt at fedoraproject.org> 1:1.4.2-4
- Rebuild for ABI-incompatible hunspell-1.2.4.2-2.fc10

* Thu Jul 10 2008 Marc Maurer <uwog at abisource.com> 1:1.4.2-3
- Fix 426712: don't build static libs (patch from Michael Schwendt)

* Wed May 21 2008 Marc Maurer <uwog at abisource.com> 1:1.4.2-2
- Rebuild

* Wed May 21 2008 Marc Maurer <uwog at abisource.com> 1:1.4.2-1
- New upstream release
- Add voikko support in an enchant-voikko package
- Bump glib-devel BR to 2.6.0

* Fri Feb 08 2008 Caolan McNamara <caolanm at redhat.com> 1:1.3.0-4.fc9
- minor cockup

* Sat Jan 26 2008 Caolan McNamara <caolanm at redhat.com> 1:1.3.0-3.fc9
- Resolves: rhbz#426402 use system hunspell not internal one and 
  split out aspell backend.
- See: rhbz#430354 hspell backend disabled until pic issue fixed

* Wed Dec 19 2007 Caolan McNamara <caolanm at redhat.com> 1:1.3.0-2.fc9
- tell enchant where the myspell dictionaries are

* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 1:1.3.0-1.fc6
- Update to 1.3.0

* Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-3.fc6
- Rebuild for FC6

* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc6
- Rebuild

* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc6
- Package the data dir as well (bug 188516)
- New upstream version
- Add hspell requirement/support

* Tue Feb 14 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-2.fc5
- Rebuild for Fedora Extras 5

* Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-1.fc5
- Update to 1.2.2

* Mon Jan 30 2006 Marc Maurer <uwog at abisource.com> 1:1.2.1-1.fc5
- Update to 1.2.1
- Drop glib Require

* Sat Oct 22 2005 Marc Maurer <uwog at abisource.com> 1:1.2.0-1.fc5
- Update to 1.2.0

* Wed Oct  5 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-4.fc5
- Add dist flag to the release number

* Mon Apr  4 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-3
- make in %%build
- disable bad buildroot rpaths in libs, don't use %%makeinstall
- require %%{epoch} of main package in -devel package (Fridrich Strba)

* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-2
- add dep glib2-devel for pkgconfig in -devel package
- include %%{_libdir}/enchant dir in main package
- make -devel package require exact VR of main package
- use -p /sbin/ldconfig in scriptlets

* Mon Mar 28 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-1
- update to 1.1.6
- drop the manpage patch (RH#145010#)
- fix version numbers in the spec changelog

* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-3
- rebuild with gcc4

* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-2
- RH#145010# misformatted manpage

* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-1
- initial fedora import

* Sun Aug 24 2003 Rui Miguel Seabra <rms at 1407.org>
- update spec to current stat of affairs
- building from source rpm is now aware of --with and --without flags:
- --without aspell --without ispell --without myspell --with uspell

* Wed Jul 16 2003 Rui Miguel Seabra <rms at 1407.org>
- take advantage of environment rpm macros

* Sun Jul 13 2003 Dom Lachowicz <cinamod at hotmail.com>
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-enchant/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:37:37 -0000	1.1
+++ sources	11 Aug 2009 16:30:35 -0000	1.2
@@ -0,0 +1 @@
+7dfaed14e142b4a0004b770c9568ed02  enchant-1.5.0.tar.gz



From epienbro at fedoraproject.org  Tue Aug 11 16:30:36 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 11 Aug 2009 16:30:36 +0000 (UTC)
Subject: rpms/mingw32-enchant/devel compile-resources, NONE,
	1.1 enchant-1.5.0-abi12160.searchdirs.patch, NONE,
	1.1 enchant-1.5.0-abi12173.leaks.patch, NONE,
	1.1 enchant-1.5.0-abi12174.fixbadmatch.patch, NONE,
	1.1 enchant-mingw-compile-fix.patch, NONE,
	1.1 mingw32-enchant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090811163036.33A3111C043B@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-enchant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29927/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compile-resources enchant-1.5.0-abi12160.searchdirs.patch 
	enchant-1.5.0-abi12173.leaks.patch 
	enchant-1.5.0-abi12174.fixbadmatch.patch 
	enchant-mingw-compile-fix.patch mingw32-enchant.spec 
Log Message:
Initial import



--- NEW FILE compile-resources ---
#!/bin/sh

# Script to compile a resource file for a DLL if there is a .rc file
# for it. The resource source file is supposed to contain a version
# info section, that uses the string BUILDNUMBER as the least
# significant part of the version numbers. This script replaces that
# string with a "build number" before compiling the binary resource
# file. The build number is kept between builds in a "stamp" file, and
# incremented each time. (If there is no stamp file, build number 0 is
# used.) The intention is that only the "official" maintainer of a DLL
# keeps such a stamp file, and thus the DLLs he releases have
# increasing version number resources, which can be used by an
# installer program to decide whether to replace an existing DLL with
# the same name.

# This is just my (tml at iki.fi) idea, if somebody comes up with a
# better way to generate version number resources, don't hesitate to
# suggest.

# The command line arguments are:
# $1: the name of the .rc file to check
# $2: the name of the resource object file to produce, if the rc file exists

# Check if we have a resource file for this DLL.
rcfile=$1
resfile=$2
if [ -f $rcfile ]; then
    # Check if we have a build number stamp file.
    basename=`basename $rcfile .rc`
    if [ -f $basename-build.stamp ]; then
	read number <$basename-build.stamp
	buildnumber=$[number]
	echo Build number $buildnumber
	rm -rf $basename-build.stamp
    else
	echo Using zero as build number
        buildnumber=0
    fi

    m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc &&
	${WINDRES-windres} $$.rc $resfile &&
	rm $$.rc
else
    # Return failure
    exit 1
fi

enchant-1.5.0-abi12160.searchdirs.patch:
 enchant.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE enchant-1.5.0-abi12160.searchdirs.patch ---
diff -ru enchant-1.5.0.orig/src/enchant.c enchant-1.5.0/src/enchant.c
--- enchant-1.5.0.orig/src/enchant.c	2009-06-22 11:53:16.000000000 +0100
+++ enchant-1.5.0/src/enchant.c	2009-06-22 11:53:39.000000000 +0100
@@ -232,6 +232,9 @@
 	if (module_dir)
 		module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir);
 
+#if defined(ENCHANT_GLOBAL_MODULE_DIR)
+	module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
+#else
 	/* Dynamically locate library and search for modules relative to it. */
 	prefix = enchant_get_prefix_dir();
 	if(prefix)
@@ -240,9 +243,6 @@
 			g_free(prefix);
 			module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir);
 		}
-
-#if defined(ENCHANT_GLOBAL_MODULE_DIR)
-	module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
 #endif
 
 	return module_dirs;

enchant-1.5.0-abi12173.leaks.patch:
 src/enchant.c          |    6 +++++-
 tests/enchant-ispell.c |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE enchant-1.5.0-abi12173.leaks.patch ---
diff -ru enchant-1.4.2.orig/src/enchant.c enchant-1.4.2/src/enchant.c
--- enchant-1.4.2.orig/src/enchant.c	2009-06-29 17:47:11.000000000 +0100
+++ enchant-1.4.2/src/enchant.c	2009-06-29 20:46:17.000000000 +0100
@@ -1543,11 +1544,13 @@
 	EnchantDict *dict;
 	EnchantProvider *owner;
 	EnchantSession *session;
+	EnchantDictPrivateData *enchant_dict_private_data;
 	
 	g_return_if_fail (data);
 	
 	dict = (EnchantDict *) data;
-	session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session;
+	enchant_dict_private_data = (EnchantDictPrivateData*)dict->enchant_private_data;
+	session = enchant_dict_private_data->session;
 	owner = session->provider;
 	
 	if (owner && owner->dispose_dict) 
@@ -1555,6 +1558,8 @@
 	else if(session->is_pwl)
 		g_free (dict);
 
+	g_free(enchant_dict_private_data);
+
 	enchant_session_destroy (session);
 }
 
diff -ru enchant-1.4.2.orig/tests/enchant-ispell.c enchant-1.4.2/tests/enchant-ispell.c
--- enchant-1.4.2.orig/tests/enchant-ispell.c	2009-06-29 17:47:11.000000000 +0100
+++ enchant-1.4.2/tests/enchant-ispell.c	2009-06-29 20:45:29.000000000 +0100
@@ -431,6 +431,8 @@
 					do_mode_a (out, dict, word, pos, lineCount);
 				else if (mode == MODE_L)
 					do_mode_l (out, dict, word, lineCount);
+
+				g_string_free(word, TRUE);
 			}
 			if (token_ptr)
 				g_slist_free (token_ptr);
@@ -446,8 +448,6 @@
 	enchant_broker_free_dict (broker, dict);
 	enchant_broker_free (broker);
 
-	if (word)
-		g_string_free (word, TRUE);
 	g_string_free (str, TRUE);
 
 	return 0;

enchant-1.5.0-abi12174.fixbadmatch.patch:
 myspell_checker.cpp |   32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

--- NEW FILE enchant-1.5.0-abi12174.fixbadmatch.patch ---
diff -ru enchant-1.4.2.orig/src/myspell/myspell_checker.cpp enchant-1.4.2/src/myspell/myspell_checker.cpp
--- enchant-1.4.2.orig/src/myspell/myspell_checker.cpp	2009-06-29 17:04:41.000000000 +0100
+++ enchant-1.4.2/src/myspell/myspell_checker.cpp	2009-06-29 17:25:40.000000000 +0100
@@ -341,6 +341,27 @@
     return g_file_test(aff.c_str(), G_FILE_TEST_EXISTS) != 0;
 }
 
+static bool is_plausible_dict_for_tag(const char *dir_entry, const char *tag)
+{
+    const char *dic_suffix = ".dic";
+    size_t dic_suffix_len = strlen(dic_suffix);
+    size_t dir_entry_len = strlen(dir_entry);
+    size_t tag_len = strlen(tag);
+
+    if (dir_entry_len - dic_suffix_len < tag_len)
+        return false;
+    if (strcmp(dir_entry+dir_entry_len-dic_suffix_len, dic_suffix) != 0)
+        return false;
+    if (strncmp (dir_entry, tag, tag_len) != 0)
+        return false;
+    //e.g. requested dict for "fi",
+    //reject "fil_PH.dic"
+    //allow "fi-FOO.dic", "fi_FOO.dic", "fi.dic", etc.
+    if (!ispunct(dir_entry[tag_len]))
+        return false;
+    return true;
+}
+
 static char *
 myspell_request_dictionary (EnchantBroker * broker, const char * tag) 
 {
@@ -364,14 +385,13 @@
 		if (dir) {
 			const char *dir_entry;
 			while ((dir_entry = g_dir_read_name (dir)) != NULL) {
-				if (strncmp (dir_entry, tag, strlen(tag)) == 0 &&
-				    strstr (dir_entry, ".dic") != NULL) {
+				if (is_plausible_dict_for_tag(dir_entry, tag)) {
 					char *dict = g_build_filename (dirs[i].c_str(), 
 								       dir_entry, NULL);
-                    if(s_hasCorrespondingAffFile(dict)){
-			                    g_dir_close (dir);
-					    return dict;
-                    }
+					if(s_hasCorrespondingAffFile(dict)){
+						g_dir_close (dir);
+						return dict;
+					}
 				}
 			}
 

enchant-mingw-compile-fix.patch:
 myspell_checker.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE enchant-mingw-compile-fix.patch ---
--- src/myspell/myspell_checker.cpp.orig	2009-05-23 11:44:14.000000000 +0200
+++ src/myspell/myspell_checker.cpp	2009-08-08 11:53:11.648688871 +0200
@@ -38,6 +38,12 @@
 #include "enchant.h"
 #include "enchant-provider.h"
 
+#ifdef WIN32
+/* The above #include caused a macro to be defined which
+ * causes a compile error later on. Work around this */
+#undef near
+#endif
+
 /* built against hunspell 1.2.2 on 2008-04-12 */
 
 #ifdef HUNSPELL_STATIC


--- NEW FILE mingw32-enchant.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}

Summary:       MinGW Windows Enchanting Spell Checking Library
Name:          mingw32-enchant
Version:       1.5.0
Release:       2%{?dist}
Group:         System Environment/Libraries
License:       LGPLv2+
Source0:       http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
Source1:       compile-resources
URL:           http://www.abisource.com/
BuildRoot:     %{_tmppath}/%{name}-%{version}-root

BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-glib2 >= 2.6.0
BuildRequires: mingw32-hunspell
BuildRequires: m4
BuildArch:     noarch

Requires:      pkgconfig

Patch0:        enchant-mingw-compile-fix.patch

Patch10:       enchant-1.5.0-abi12160.searchdirs.patch
Patch11:       enchant-1.5.0-abi12173.leaks.patch
Patch12:       enchant-1.5.0-abi12174.fixbadmatch.patch


%description
A library that wraps other spell checking backends.

This is the MinGW build of enchant


%package static
Summary:        Static version of the MinGW Windows enchant library
Requires:       %{name} = %{version}-%{release}
Group:          Development/Libraries

%description static
Static version of the MinGW Windows enchant spell checking library.


%prep
%setup -qn "enchant-%{version}"

# There's a file missing from the tarball
# http://www.abisource.com/viewvc/enchant/trunk/compile-resource?revision=21303
cp %{SOURCE1} compile-resource
chmod 755 compile-resource

# Fix for a conflict between Hunspell and windef.h
# http://www.abisource.com/viewvc?view=rev&revision=26532
%patch0 -p0 -b .near

#http://bugzilla.abisource.com/show_bug.cgi?id=12160
%patch10 -p1 -b .searchdirs
#http://bugzilla.abisource.com/show_bug.cgi?id=12173
%patch11 -p1 -b .leaks
#http://bugzilla.abisource.com/show_bug.cgi?id=12174
%patch12 -p1 -b .fixbadmatch


%build
%{_mingw32_configure}   \
    --disable-ispell    \
    --disable-hspell    \
    --disable-aspell    \
    --enable-static     \
    --enable-shared
make
# When using make -j4 (which is the case with Koji) the following compile error occurs:
# /bin/sh ../libtool --tag=CC   --mode=link i686-pc-mingw32-gcc  -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -mms-bitfields -no-undefined -export-dynamic -avoid-version   -o libenchant.la -rpath /usr/i686-pc-mingw32/sys-root/mingw/lib prefix.lo enchant.lo pwl.lo -L/usr/i686-pc-mingw32/sys-root/mingw/lib -lgmodule-2.0 -lglib-2.0 -lintl   enchant-win32res.lo 
# libtool: link: `enchant-win32res.lo' is not a valid libtool object
#
# I haven't been able to find the exact cause yet so 'make %{?_smp_mflags}' has been disabled for now


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Drop the man-pages
rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB README
%{_mingw32_bindir}/enchant-lsmod.exe
%{_mingw32_bindir}/enchant.exe
%{_mingw32_bindir}/libenchant.dll
%{_mingw32_includedir}/enchant/
%dir %{_mingw32_libdir}/enchant/
%{_mingw32_libdir}/enchant/libenchant_myspell.dll
%{_mingw32_libdir}/enchant/libenchant_myspell.dll.a
%{_mingw32_libdir}/enchant/libenchant_myspell.la
%{_mingw32_libdir}/libenchant.dll.a
%{_mingw32_libdir}/libenchant.la
%{_mingw32_libdir}/pkgconfig/enchant.pc
%{_mingw32_datadir}/enchant/

%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/libenchant.a
%{_mingw32_libdir}/enchant/libenchant_myspell.a


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Sun Aug  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-2
- Dropped BR: autoconf libtool
- Added BR: m4
- Use 'rm -rf $RPM_BUILDROOT' in the %%clean phase
- Fixed a 'strange-permission' rpmlint warning
- Moved the file %%{_mingw32_libdir}/enchant/libenchant_myspell.a to
  the -static subpackage
- Use a more verbose %%files list
- Added a Requires: pkgconfig to the main package
- Added patches from the native enchant package
- Dropped another patch which isn't necessary anymore

* Sat Aug  8 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-1
- Update to version 1.5.0
- Drop upstreamed patch
- Don't use 'make %%{?_smp_mflags}' as this causes a compile failure in Koji

* Mon May 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.2-6
- Ported the native package to have MinGW support
- Dropped the epoch as this is a new package
- Fixed %%defattr line

* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Jul 26 2008 Michael Schwendt <mschwendt at fedoraproject.org> 1:1.4.2-4
- Rebuild for ABI-incompatible hunspell-1.2.4.2-2.fc10

* Thu Jul 10 2008 Marc Maurer <uwog at abisource.com> 1:1.4.2-3
- Fix 426712: don't build static libs (patch from Michael Schwendt)

* Wed May 21 2008 Marc Maurer <uwog at abisource.com> 1:1.4.2-2
- Rebuild

* Wed May 21 2008 Marc Maurer <uwog at abisource.com> 1:1.4.2-1
- New upstream release
- Add voikko support in an enchant-voikko package
- Bump glib-devel BR to 2.6.0

* Fri Feb 08 2008 Caolan McNamara <caolanm at redhat.com> 1:1.3.0-4.fc9
- minor cockup

* Sat Jan 26 2008 Caolan McNamara <caolanm at redhat.com> 1:1.3.0-3.fc9
- Resolves: rhbz#426402 use system hunspell not internal one and 
  split out aspell backend.
- See: rhbz#430354 hspell backend disabled until pic issue fixed

* Wed Dec 19 2007 Caolan McNamara <caolanm at redhat.com> 1:1.3.0-2.fc9
- tell enchant where the myspell dictionaries are

* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> 1:1.3.0-1.fc6
- Update to 1.3.0

* Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-3.fc6
- Rebuild for FC6

* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc6
- Rebuild

* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc6
- Package the data dir as well (bug 188516)
- New upstream version
- Add hspell requirement/support

* Tue Feb 14 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-2.fc5
- Rebuild for Fedora Extras 5

* Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-1.fc5
- Update to 1.2.2

* Mon Jan 30 2006 Marc Maurer <uwog at abisource.com> 1:1.2.1-1.fc5
- Update to 1.2.1
- Drop glib Require

* Sat Oct 22 2005 Marc Maurer <uwog at abisource.com> 1:1.2.0-1.fc5
- Update to 1.2.0

* Wed Oct  5 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-4.fc5
- Add dist flag to the release number

* Mon Apr  4 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-3
- make in %%build
- disable bad buildroot rpaths in libs, don't use %%makeinstall
- require %%{epoch} of main package in -devel package (Fridrich Strba)

* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1:1.1.6-2
- add dep glib2-devel for pkgconfig in -devel package
- include %%{_libdir}/enchant dir in main package
- make -devel package require exact VR of main package
- use -p /sbin/ldconfig in scriptlets

* Mon Mar 28 2005 Marc Maurer <uwog at abisource.com> 1:1.1.6-1
- update to 1.1.6
- drop the manpage patch (RH#145010#)
- fix version numbers in the spec changelog

* Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-3
- rebuild with gcc4

* Fri Jan 14 2005 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-2
- RH#145010# misformatted manpage

* Mon Dec 20 2004 Caolan McNamara <caolanm at redhat.com> 1:1.1.5-1
- initial fedora import

* Sun Aug 24 2003 Rui Miguel Seabra <rms at 1407.org>
- update spec to current stat of affairs
- building from source rpm is now aware of --with and --without flags:
- --without aspell --without ispell --without myspell --with uspell

* Wed Jul 16 2003 Rui Miguel Seabra <rms at 1407.org>
- take advantage of environment rpm macros

* Sun Jul 13 2003 Dom Lachowicz <cinamod at hotmail.com>
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-enchant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:37:37 -0000	1.1
+++ .cvsignore	11 Aug 2009 16:30:35 -0000	1.2
@@ -0,0 +1 @@
+enchant-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-enchant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:37:37 -0000	1.1
+++ sources	11 Aug 2009 16:30:36 -0000	1.2
@@ -0,0 +1 @@
+7dfaed14e142b4a0004b770c9568ed02  enchant-1.5.0.tar.gz



From akurtakov at fedoraproject.org  Tue Aug 11 16:44:00 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 11 Aug 2009 16:44:00 +0000 (UTC)
Subject: rpms/eclipse/devel sources,1.76,1.77 eclipse.spec,1.656,1.657
Message-ID: <20090811164400.CE9B411C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv872/devel

Modified Files:
	sources eclipse.spec 
Log Message:
- Fix sources url.
- Make it use system icu4j and sat4j.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	6 Aug 2009 15:57:33 -0000	1.76
+++ sources	11 Aug 2009 16:43:59 -0000	1.77
@@ -1,8 +1,5 @@
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-3e031f11b0de3f15b00233deec2b19f3  eclipse-3.4.2-testframework.tar.bz2
-1c3bb4e384cbc5f4e2b7275238a010f7  eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
-047b352b07b04f7f8e96afb81e69862c  eclipse-build-generatedScripts.tar.bz2
-fed4220be8e4db0743365cfadac65d2e  eclipse-build-R0_0_2_1.tar.gz
+a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -p -r1.656 -r1.657
--- eclipse.spec	7 Aug 2009 16:21:31 -0000	1.656
+++ eclipse.spec	11 Aug 2009 16:44:00 -0000	1.657
@@ -12,6 +12,7 @@ Epoch:  1
 %define eclipse_micro   0
 %define swtver          3.5.0.v3550
 %define initialize      1
+%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
@@ -29,15 +30,13 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.35%{?dist}
+Release:        0.4.0%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        eclipse-build-R0_0_2_1.tar.gz
-Source1:        eclipse-I20090611-1540-fetched-src.tar.bz2
+Source0:        %{download_url}eclipse-build-R0_3_0.tar.gz
+Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
 Source2:        %{name}.desktop
-Source3:        eclipse-build-generatedScripts.tar.bz2
-#Source3:        eclipse.in
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
@@ -168,7 +167,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 4.0.1
+BuildRequires:  icu4j-eclipse >= 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
@@ -192,7 +191,7 @@ BuildRequires: lucene-contrib >= 2.3.1-3
 BuildRequires: regexp
 BuildRequires: junit >= 3.8.1-3jpp
 BuildRequires: junit4
-BuildRequires: sat4j >= 2.1.0
+BuildRequires: sat4j >= 2.1.0-1
 BuildRequires: objectweb-asm
 
 %description
@@ -223,7 +222,7 @@ Requires:       %{name}-swt = %{epoch}:%
 # 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 >= 4.0.1
+Requires:       icu4j-eclipse >= 4.0.1-3
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -249,7 +248,7 @@ 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
+Requires: sat4j >= 2.1.0-1
 Provides: eclipse-cvs-client = 1:%{version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 
@@ -293,9 +292,8 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-R0_0_2_1
+%setup -q -n eclipse-build-R0_3_0
 cp %{SOURCE1} .
-cp %{SOURCE3} .
 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
@@ -484,9 +482,9 @@ done
 popd
 
 # Symlinks
-#rm plugins/org.sat4j*
-#ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
-#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
+rm plugins/org.sat4j*
+ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
 
 ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -542,9 +540,9 @@ rm plugins/com.jcraft.jsch_*.jar
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
 
 # link to the icu4j stuff
-#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-#rm plugins/com.ibm.icu_*.jar
-#ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
+ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+rm plugins/com.ibm.icu_*.jar
+ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -650,8 +648,6 @@ tar jxf %{SOURCE20}
 
 # Test framework
 tar jxf %{SOURCE30}
-# TODO regenerate testframework once 3.5 is out
-#pushd %{name}-%{version}-testframework
 pushd %{name}-%{version}-testframework
 %patch41
 pushd org.eclipse.test
@@ -1118,9 +1114,9 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVER
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 
 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
-#ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
+rm plugins/org.sat4j*
+ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
+ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
 
 ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
   sed 's/org.objectweb.asm_//')
@@ -1175,8 +1171,8 @@ rm plugins/com.jcraft.jsch_$JSCHVERSION
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
 
 # link to the icu4j stuff
-#ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-#rm plugins/com.ibm.icu_*.jar
+ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
+rm plugins/com.ibm.icu_*.jar
 
 # link to lucene
 LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
@@ -1301,7 +1297,6 @@ fi
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -1493,6 +1488,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Aug 11 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.4.0
+- Fix sources url.
+- Make it use system icu4j and sat4j.
+
 * Fri Aug 7 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.35
 - Another missing ppc64 fragment.
 



From ltinkl at fedoraproject.org  Tue Aug 11 16:45:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 16:45:26 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.1-kmail-saveAttachments.patch,1.2,1.3
Message-ID: <20090811164526.6EBD811C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv861/F-10

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
doh


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 15:14:16 -0000	1.2
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 16:45:26 -0000	1.3
@@ -1,7 +1,7 @@
-Index: kmcommands.cpp
+Index: kmail/kmcommands.cpp
 ===================================================================
---- kmcommands.cpp	(revision 1010021)
-+++ kmcommands.cpp	(working copy)
+--- kmail/kmcommands.cpp	(revision 1010021)
++++ kmail/kmcommands.cpp	(working copy)
 @@ -54,6 +54,7 @@
  #include <kdbusservicestarter.h>
  #include <kdebug.h>



From ltinkl at fedoraproject.org  Tue Aug 11 16:45:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 16:45:26 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.1-kmail-saveAttachments.patch,1.2,1.3
Message-ID: <20090811164526.A95D811C0347@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv861/F-11

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
doh


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 15:14:16 -0000	1.2
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 16:45:26 -0000	1.3
@@ -1,7 +1,7 @@
-Index: kmcommands.cpp
+Index: kmail/kmcommands.cpp
 ===================================================================
---- kmcommands.cpp	(revision 1010021)
-+++ kmcommands.cpp	(working copy)
+--- kmail/kmcommands.cpp	(revision 1010021)
++++ kmail/kmcommands.cpp	(working copy)
 @@ -54,6 +54,7 @@
  #include <kdbusservicestarter.h>
  #include <kdebug.h>



From ltinkl at fedoraproject.org  Tue Aug 11 16:45:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 16:45:26 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.1-kmail-saveAttachments.patch,1.2,1.3
Message-ID: <20090811164526.D3F2A11C043C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv861/devel

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
doh


kdepim-4.3.1-kmail-saveAttachments.patch:
 kmcommands.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 15:14:16 -0000	1.2
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 16:45:26 -0000	1.3
@@ -1,7 +1,7 @@
-Index: kmcommands.cpp
+Index: kmail/kmcommands.cpp
 ===================================================================
---- kmcommands.cpp	(revision 1010021)
-+++ kmcommands.cpp	(working copy)
+--- kmail/kmcommands.cpp	(revision 1010021)
++++ kmail/kmcommands.cpp	(working copy)
 @@ -54,6 +54,7 @@
  #include <kdbusservicestarter.h>
  #include <kdebug.h>



From spot at fedoraproject.org  Tue Aug 11 16:45:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 16:45:24 +0000 (UTC)
Subject: rpms/R-hdf5/devel R-hdf5.spec,1.14,1.15
Message-ID: <20090811164524.1B64511C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-hdf5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1099

Modified Files:
	R-hdf5.spec 
Log Message:
update spec file


Index: R-hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hdf5/devel/R-hdf5.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- R-hdf5.spec	24 Jul 2009 16:12:08 -0000	1.14
+++ R-hdf5.spec	11 Aug 2009 16:45:23 -0000	1.15
@@ -1,18 +1,17 @@
-%define packrel  0
-%define packname hdf5
+%global packname hdf5
 
 Name: R-%{packname}
 Version: 1.6.9
-Release: 2%{?dist}
+Release: 3%{?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, tex(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
 Requires: hdf5
 
 %description
@@ -50,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.9-3
+- update spec file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Tue Aug 11 16:46:10 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 11 Aug 2009 16:46:10 +0000 (UTC)
Subject: rpms/eclipse/devel .cvsignore,1.59,1.60
Message-ID: <20090811164610.45E8A11C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1391/devel

Modified Files:
	.cvsignore 
Log Message:
Ignore eclipse-build-R0_3_0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	3 Aug 2009 15:29:56 -0000	1.59
+++ .cvsignore	11 Aug 2009 16:46:10 -0000	1.60
@@ -12,3 +12,4 @@ eclipse-I20090611-1540-fetched-src.tar.b
 eclipse-3.5.0-testframework.tar.bz2
 eclipse-build-generatedScripts.tar.bz2
 eclipse-build-R0_0_2_1.tar.gz
+eclipse-build-R0_3_0.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 16:48:27 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:48:27 +0000 (UTC)
Subject: rpms/kcoloredit/devel kcoloredit.spec,1.18,1.19
Message-ID: <20090811164827.90DE511C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kcoloredit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1862

Modified Files:
	kcoloredit.spec 
Log Message:
remove /usr/share/doc/HTML/en/kcoloredit listed twice


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/kcoloredit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- kcoloredit.spec	4 Aug 2009 15:09:00 -0000	1.18
+++ kcoloredit.spec	11 Aug 2009 16:48:27 -0000	1.19
@@ -80,7 +80,6 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_bindir}/kcoloredit
 %{_kde4_appsdir}/kcoloredit/
 %{_kde4_datadir}/applications/kde4/kcoloredit.desktop
-%{_kde4_docdir}/HTML/en/kcoloredit/
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog



From svahl at fedoraproject.org  Tue Aug 11 16:50:11 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:50:11 +0000 (UTC)
Subject: rpms/kcoloredit/F-10 .cvsignore, 1.10, 1.11 kcoloredit.spec, 1.15, 
	1.16 sources, 1.11, 1.12
Message-ID: <20090811165011.8142411C0489@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kcoloredit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2122/F-10

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Jun 2009 12:43:30 -0000	1.10
+++ .cvsignore	11 Aug 2009 16:50:11 -0000	1.11
@@ -1 +1,2 @@
 kcoloredit-2.0.0-kde4.2.4.tar.bz2
+kcoloredit-2.0.0-kde4.3.0.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-10/kcoloredit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kcoloredit.spec	10 Jun 2009 12:43:30 -0000	1.15
+++ kcoloredit.spec	11 Aug 2009 16:50:11 -0000	1.16
@@ -4,7 +4,7 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        A color palette Editor
 
@@ -80,10 +80,15 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_bindir}/kcoloredit
 %{_kde4_appsdir}/kcoloredit/
 %{_kde4_datadir}/applications/kde4/kcoloredit.desktop
-%{_kde4_docdir}/HTML/en/kcoloredit/
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 4.2.4-1
 - 4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Jun 2009 12:43:30 -0000	1.11
+++ sources	11 Aug 2009 16:50:11 -0000	1.12
@@ -1 +1 @@
-b9ca32c6ec24c935d94bc909861ae10f  kcoloredit-2.0.0-kde4.2.4.tar.bz2
+4d4c7809dd3275299ff31cdfb784ddab  kcoloredit-2.0.0-kde4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 16:50:11 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:50:11 +0000 (UTC)
Subject: rpms/kcoloredit/F-11 .cvsignore, 1.11, 1.12 kcoloredit.spec, 1.16, 
	1.17 sources, 1.12, 1.13
Message-ID: <20090811165011.9A80C11C04DB@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kcoloredit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2122/F-11

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Jun 2009 12:43:30 -0000	1.11
+++ .cvsignore	11 Aug 2009 16:50:11 -0000	1.12
@@ -1 +1,2 @@
 kcoloredit-2.0.0-kde4.2.4.tar.bz2
+kcoloredit-2.0.0-kde4.3.0.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-11/kcoloredit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kcoloredit.spec	10 Jun 2009 12:43:30 -0000	1.16
+++ kcoloredit.spec	11 Aug 2009 16:50:11 -0000	1.17
@@ -4,7 +4,7 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        A color palette Editor
 
@@ -80,10 +80,15 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_bindir}/kcoloredit
 %{_kde4_appsdir}/kcoloredit/
 %{_kde4_datadir}/applications/kde4/kcoloredit.desktop
-%{_kde4_docdir}/HTML/en/kcoloredit/
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 4.2.4-1
 - 4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Jun 2009 12:43:30 -0000	1.12
+++ sources	11 Aug 2009 16:50:11 -0000	1.13
@@ -1 +1 @@
-b9ca32c6ec24c935d94bc909861ae10f  kcoloredit-2.0.0-kde4.2.4.tar.bz2
+4d4c7809dd3275299ff31cdfb784ddab  kcoloredit-2.0.0-kde4.3.0.tar.bz2



From kevin at fedoraproject.org  Tue Aug 11 16:53:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 11 Aug 2009 16:53:21 +0000 (UTC)
Subject: rpms/cnetworkmanager/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 cnetworkmanager.spec, 1.2,
	1.3 cnetworkmanager-0.8.4-docs.patch, 1.1, NONE
Message-ID: <20090811165321.4FB8B11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cnetworkmanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2852

Modified Files:
	sources .cvsignore cnetworkmanager.spec 
Removed Files:
	cnetworkmanager-0.8.4-docs.patch 
Log Message:
Update to 0.21



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 May 2009 04:32:01 -0000	1.2
+++ sources	11 Aug 2009 16:53:21 -0000	1.3
@@ -1 +1 @@
-8f3eccaeff900cd68e19785f13c813ab  cnetworkmanager-0.8.4.tar.gz
+97720bdecfc2e308f90095aed11fefae  cnetworkmanager-0.21.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 May 2009 04:32:01 -0000	1.2
+++ .cvsignore	11 Aug 2009 16:53:21 -0000	1.3
@@ -1 +1 @@
-cnetworkmanager-0.8.4.tar.gz
+cnetworkmanager-0.21.tar.gz


Index: cnetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/devel/cnetworkmanager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cnetworkmanager.spec	24 Jul 2009 19:11:29 -0000	1.2
+++ cnetworkmanager.spec	11 Aug 2009 16:53:21 -0000	1.3
@@ -1,13 +1,14 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary:        Command-line client for NetworkManager
 Name:           cnetworkmanager
-Version:        0.8.4
-Release:        3%{?dist}
+Version:        0.21
+Release:        1%{?dist}
 License:        GPLv2+ and Public Domain
 Url:            http://vidner.net/martin/software/cnetworkmanager/
 Source0:        http://vidner.net/martin/software/cnetworkmanager/%{name}-%{version}.tar.gz
-Patch0:         cnetworkmanager-0.8.4-docs.patch
 Group:          Applications/Communications
-BuildRequires:  python
+BuildRequires:  python-devel
 Requires:       dbus-python
 Requires:       pygobject2
 Requires:       NetworkManager
@@ -21,16 +22,13 @@ to supplement or replace the GUI applets
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-make PREFIX=%{_prefix}
+python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} sysconfdir=%{_sysconfdir}
-
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/cnetworkmanager/pbkdf2.py
+python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT --prefix=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,13 +37,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc COPYING NEWS README
 %{_bindir}/cnetworkmanager
-%dir %{_datadir}/cnetworkmanager
-%{_datadir}/cnetworkmanager/cnetworkmanager
-%{_datadir}/cnetworkmanager/pbkdf2.py*
+%{python_sitelib}/networkmanager
+%{python_sitelib}/dbusclient
 %{_sysconfdir}/dbus-1/system.d/cnetworkmanager.conf
-%{_sysconfdir}/dbus-1/system.d/cnetworkmanager-06.conf
+%{python_sitelib}/cnetworkmanager-*egg-info
 
 %changelog
+* Tue Aug 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.21-1
+- Update to 0.21
+
+* Sat Aug 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.20-1
+- Update to 0.20
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- cnetworkmanager-0.8.4-docs.patch DELETED ---



From svahl at fedoraproject.org  Tue Aug 11 16:58:52 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 16:58:52 +0000 (UTC)
Subject: rpms/kiconedit/devel kiconedit.spec,1.21,1.22
Message-ID: <20090811165852.E302B11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kiconedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3764

Modified Files:
	kiconedit.spec 
Log Message:
added COPYING.DOC to %doc


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/kiconedit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kiconedit.spec	4 Aug 2009 15:23:05 -0000	1.21
+++ kiconedit.spec	11 Aug 2009 16:58:52 -0000	1.22
@@ -80,7 +80,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING COPYING.DOC NEWS
 %{_kde4_bindir}/kiconedit
 %{_kde4_appsdir}/kiconedit/
 %{_kde4_datadir}/applications/kde4/kiconedit.desktop



From pkgdb at fedoraproject.org  Tue Aug 11 17:04:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 17:04:30 +0000
Subject: [pkgdb] libprelude had acl change status
Message-ID: <20090811170431.02FA210F880@bastion2.fedora.phx.redhat.com>

sgrubb has set the watchbugzilla acl on libprelude (Fedora devel) to Approved for wolfy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libprelude



From svahl at fedoraproject.org  Tue Aug 11 17:04:32 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 17:04:32 +0000 (UTC)
Subject: rpms/kgrab/F-10 .cvsignore, 1.8, 1.9 kgrab.spec, 1.15, 1.16 sources,
	1.9, 1.10
Message-ID: <20090811170432.9A40711C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4621/F-10

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Jun 2009 13:14:37 -0000	1.8
+++ .cvsignore	11 Aug 2009 17:04:32 -0000	1.9
@@ -1 +1,2 @@
 kgrab-0.1.1-kde4.2.4.tar.bz2
+kgrab-0.1.1-kde4.3.0.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-10/kgrab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kgrab.spec	10 Jun 2009 13:14:37 -0000	1.15
+++ kgrab.spec	11 Aug 2009 17:04:32 -0000	1.16
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.2.4
+%define kdeversion 4.3.0
 
 Name:           kgrab
 Version:        0.1.1
-Release:        16%{?dist}
+Release:        18%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,12 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 0.1.1-18
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.1.1-16
 - 4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Jun 2009 13:14:37 -0000	1.9
+++ sources	11 Aug 2009 17:04:32 -0000	1.10
@@ -1 +1 @@
-18a140e145451e077d9568100d583086  kgrab-0.1.1-kde4.2.4.tar.bz2
+199d59f03900236c0dbc771d617b49f6  kgrab-0.1.1-kde4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 17:04:32 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 17:04:32 +0000 (UTC)
Subject: rpms/kgrab/F-11 .cvsignore, 1.9, 1.10 kgrab.spec, 1.18, 1.19 sources,
	1.9, 1.10
Message-ID: <20090811170432.C796711C0347@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kgrab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4621/F-11

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	10 Jun 2009 13:14:37 -0000	1.9
+++ .cvsignore	11 Aug 2009 17:04:32 -0000	1.10
@@ -1 +1,2 @@
 kgrab-0.1.1-kde4.2.4.tar.bz2
+kgrab-0.1.1-kde4.3.0.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-11/kgrab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- kgrab.spec	10 Jun 2009 13:14:37 -0000	1.18
+++ kgrab.spec	11 Aug 2009 17:04:32 -0000	1.19
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.2.4
+%define kdeversion 4.3.0
 
 Name:           kgrab
 Version:        0.1.1
-Release:        16%{?dist}
+Release:        18%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,12 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 0.1.1-18
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 10 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.1.1-16
 - 4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Jun 2009 13:14:37 -0000	1.9
+++ sources	11 Aug 2009 17:04:32 -0000	1.10
@@ -1 +1 @@
-18a140e145451e077d9568100d583086  kgrab-0.1.1-kde4.2.4.tar.bz2
+199d59f03900236c0dbc771d617b49f6  kgrab-0.1.1-kde4.3.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 11 17:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 17:04:33 +0000
Subject: [pkgdb] libprelude had acl change status
Message-ID: <20090811170436.E5ABC10F89F@bastion2.fedora.phx.redhat.com>

sgrubb has set the watchcommits acl on libprelude (Fedora devel) to Approved for wolfy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libprelude



From smilner at fedoraproject.org  Tue Aug 11 17:08:51 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 11 Aug 2009 17:08:51 +0000 (UTC)
Subject: rpms/pipestat/devel .cvsignore, 1.2, 1.3 pipestat.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090811170851.85A1711C00D7@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5341

Modified Files:
	.cvsignore pipestat.spec sources 
Log Message:
Updated for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 13:41:09 -0000	1.2
+++ .cvsignore	11 Aug 2009 17:08:51 -0000	1.3
@@ -1 +1 @@
-pipestat-0.2.tar.gz
+pipestat-0.3.0.tar.gz


Index: pipestat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/pipestat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pipestat.spec	7 Aug 2009 13:50:11 -0000	1.2
+++ pipestat.spec	11 Aug 2009 17:08:51 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pipestat
-Version:        0.2
-Release:        2%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Watches data flowing over an anonymous pipe
 
 Group:          Applications/System
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
+- Updated for upstream release.
+
 * Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-2
 - Fixed description.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 13:41:09 -0000	1.2
+++ sources	11 Aug 2009 17:08:51 -0000	1.3
@@ -1 +1 @@
-5be7ee30c24196d8935065db7a764d36  pipestat-0.2.tar.gz
+c4bbfc99b9fd06b6fcf7ad1ec924cafa  pipestat-0.3.0.tar.gz



From spot at fedoraproject.org  Tue Aug 11 17:15:37 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 17:15:37 +0000 (UTC)
Subject: rpms/R-RODBC/devel .cvsignore, 1.2, 1.3 R-RODBC.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090811171537.7393B11C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-RODBC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7018

Modified Files:
	.cvsignore R-RODBC.spec sources 
Log Message:
update to 1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-RODBC/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Mar 2009 22:27:28 -0000	1.2
+++ .cvsignore	11 Aug 2009 17:15:37 -0000	1.3
@@ -1 +1 @@
-RODBC_1.2-5.tar.gz
+RODBC_1.3-0.tar.gz


Index: R-RODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RODBC/devel/R-RODBC.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-RODBC.spec	24 Jul 2009 16:09:41 -0000	1.2
+++ R-RODBC.spec	11 Aug 2009 17:15:37 -0000	1.3
@@ -1,21 +1,22 @@
-%define packname  RODBC
-%define packver   5
+%global packname  RODBC
+%global packver   1.3
+%global packrel   0
 
 Name:             R-%{packname}
-Version:          1.2
-Release:          3%{?dist}
+Version:          %{packver}.%{packrel}
+Release:          1%{?dist}
 Summary:          An ODBC database interface for R
 
 Group:            Applications/Productivity
 License:          GPLv2+ and (GPLv2 or GPLv3)
 URL:              http://cran.r-project.org/web/packages/RODBC/
-Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packver}.tar.gz
+Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R-core, R-stats, R-utils
 Requires(post):   R-core
 Requires(postun): R-core
-BuildRequires:    R-devel, tetex-latex, unixODBC-devel
+BuildRequires:    R-devel, tetex-latex, unixODBC-devel, texinfo-tex
 
 %description
 An ODBC database interface for R.
@@ -25,12 +26,13 @@ An ODBC database interface for R.
 %build
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_libdir}/R/library
 %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library 
 # Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-%{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/RODBC/doc/Makefile
 
 %check
 %{_bindir}/R CMD check %{packname}
@@ -52,8 +54,12 @@ test -d %{packname}/src && (cd %{packnam
 %doc %{_libdir}/R/library/%{packname}/man
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/COPYING
-%doc %{_libdir}/R/library/%{packname}/README
 %doc %{_libdir}/R/library/%{packname}/LICENCE
+%dir %{_libdir}/R/library/%{packname}/doc/
+%doc %{_libdir}/R/library/%{packname}/doc/index.html
+%doc %{_libdir}/R/library/%{packname}/doc/RODBC.*
+%dir %{_libdir}/R/library/%{packname}/po/
+%lang(en) %{_libdir}/R/library/%{packname}/po/en*/
 %{_libdir}/R/library/%{packname}/CONTENTS
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/NAMESPACE
@@ -65,6 +71,9 @@ test -d %{packname}/src && (cd %{packnam
 %{_libdir}/R/library/%{packname}/tests.R
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.0-1
+- Update to 1.3-0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RODBC/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Mar 2009 22:27:28 -0000	1.2
+++ sources	11 Aug 2009 17:15:37 -0000	1.3
@@ -1 +1 @@
-71df612ce546a790dbfa6991ae0a9885  RODBC_1.2-5.tar.gz
+5d8f193351bedea8e96f42950ccf1e0e  RODBC_1.3-0.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 17:15:44 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 17:15:44 +0000 (UTC)
Subject: rpms/kiconedit/F-11 .cvsignore, 1.11, 1.12 kiconedit.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <20090811171544.4407D11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kiconedit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052/F-11

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Jun 2009 13:30:02 -0000	1.11
+++ .cvsignore	11 Aug 2009 17:15:44 -0000	1.12
@@ -1 +1,2 @@
 kiconedit-4.2.4.tar.bz2
+kiconedit-4.3.0.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-11/kiconedit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kiconedit.spec	10 Jun 2009 13:30:02 -0000	1.19
+++ kiconedit.spec	11 Aug 2009 17:15:44 -0000	1.20
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        An icon editor
 
@@ -80,7 +80,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING COPYING.DOC NEWS
 %{_kde4_bindir}/kiconedit
 %{_kde4_appsdir}/kiconedit/
 %{_kde4_datadir}/applications/kde4/kiconedit.desktop
@@ -88,6 +88,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 10 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.2.4-1
 - 4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Jun 2009 13:30:02 -0000	1.12
+++ sources	11 Aug 2009 17:15:44 -0000	1.13
@@ -1 +1 @@
-41ff4b12be1c9cef996804599b6c932f  kiconedit-4.2.4.tar.bz2
+b01877aa6da21b50f0550c43c6b86cfe  kiconedit-4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 17:15:43 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 17:15:43 +0000 (UTC)
Subject: rpms/kiconedit/F-10 .cvsignore, 1.10, 1.11 kiconedit.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <20090811171543.E12ED11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kiconedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052/F-10

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Jun 2009 13:30:02 -0000	1.10
+++ .cvsignore	11 Aug 2009 17:15:43 -0000	1.11
@@ -1 +1,2 @@
 kiconedit-4.2.4.tar.bz2
+kiconedit-4.3.0.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-10/kiconedit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kiconedit.spec	10 Jun 2009 13:30:02 -0000	1.15
+++ kiconedit.spec	11 Aug 2009 17:15:43 -0000	1.16
@@ -1,7 +1,7 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.2.4
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        An icon editor
 
@@ -80,7 +80,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING COPYING.DOC NEWS
 %{_kde4_bindir}/kiconedit
 %{_kde4_appsdir}/kiconedit/
 %{_kde4_datadir}/applications/kde4/kiconedit.desktop
@@ -88,6 +88,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 10 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.2.4-1
 - 4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Jun 2009 13:30:02 -0000	1.11
+++ sources	11 Aug 2009 17:15:43 -0000	1.12
@@ -1 +1 @@
-41ff4b12be1c9cef996804599b6c932f  kiconedit-4.2.4.tar.bz2
+b01877aa6da21b50f0550c43c6b86cfe  kiconedit-4.3.0.tar.bz2



From dwalsh at fedoraproject.org  Tue Aug 11 17:16:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 11 Aug 2009 17:16:27 +0000 (UTC)
Subject: rpms/setools/devel setools-qpol.patch,1.1,1.2
Message-ID: <20090811171627.614A611C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7301

Modified Files:
	setools-qpol.patch 
Log Message:
* Tue Aug 11 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-4
- Add python bindings for sesearch and seinfo


setools-qpol.patch:
 libqpol/include/qpol/Makefile.am   |    2 +-
 libseaudit/swig/python/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: setools-qpol.patch
===================================================================
RCS file: /cvs/extras/rpms/setools/devel/setools-qpol.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- setools-qpol.patch	28 Jul 2009 13:43:02 -0000	1.1
+++ setools-qpol.patch	11 Aug 2009 17:16:27 -0000	1.2
@@ -10,3 +10,15 @@ diff -up setools-3.3.6/libqpol/include/q
  	policy.h \
  	policy_extend.h \
  	portcon_query.h \
+diff -up setools-3.3.6/libseaudit/swig/python/Makefile.am~ setools-3.3.6/libseaudit/swig/python/Makefile.am
+--- setools-3.3.6/libseaudit/swig/python/Makefile.am~	2007-08-02 17:16:33.000000000 -0400
++++ setools-3.3.6/libseaudit/swig/python/Makefile.am	2009-08-11 12:40:39.000000000 -0400
+@@ -10,7 +10,7 @@ BUILT_SOURCES = seaudit_wrap.c
+ 
+ AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
+ 	@QPOL_CFLAGS@ @APOL_CFLAGS@ -I$(top_builddir) -fpic \
+-	-I$(top_srcdir)/libseaudit/include -D__attribute__\(x\)=''
++	-I$(top_srcdir)/libseaudit/include
+ AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@ \
+ 	@APOL_LIB_FLAG@ @QPOL_LIB_FLAG@ @SEAUDIT_LIB_FLAG@ @XML_LIBS@
+ DEPENDENCIES = $(top_builddir)/libqpol/src/libqpol.so \



From smilner at fedoraproject.org  Tue Aug 11 17:18:46 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 11 Aug 2009 17:18:46 +0000 (UTC)
Subject: rpms/pipestat/F-11 import.log, NONE, 1.1 pipestat.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811171846.183DD11C00D7@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7870/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pipestat.spec 
Log Message:
Import to F11.



--- NEW FILE import.log ---
pipestat-0_3_0-1_fc12:F-11:pipestat-0.3.0-1.fc12.src.rpm:1250011102


--- NEW FILE pipestat.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pipestat
Version:        0.3.0
Release:        1%{?dist}
Summary:        Watches data flowing over an anonymous pipe

Group:          Applications/System
License:        GPLv3+
URL:            http://code.google.com/p/pipestat/
Source0:        http://pipestat.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Simple python script to watch data flowing over an anonymous pipe
on shell consoles.

%prep
%setup -q


%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 AUTHORS COPYING LICENSE
%{python_sitelib}/*
%{_bindir}/pipestat


%changelog
* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
- Updated for upstream release.

* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-2
- Fixed description.

* Mon Aug  3 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-1
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:48:35 -0000	1.1
+++ .cvsignore	11 Aug 2009 17:18:45 -0000	1.2
@@ -0,0 +1 @@
+pipestat-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:48:35 -0000	1.1
+++ sources	11 Aug 2009 17:18:45 -0000	1.2
@@ -0,0 +1 @@
+c4bbfc99b9fd06b6fcf7ad1ec924cafa  pipestat-0.3.0.tar.gz



From smilner at fedoraproject.org  Tue Aug 11 17:21:22 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 11 Aug 2009 17:21:22 +0000 (UTC)
Subject: rpms/pipestat/F-10 import.log, NONE, 1.1 pipestat.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811172123.0C3F911C00D7@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8457/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pipestat.spec 
Log Message:
Import into F10.



--- NEW FILE import.log ---
pipestat-0_3_0-1_fc12:F-10:pipestat-0.3.0-1.fc12.src.rpm:1250011255


--- NEW FILE pipestat.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pipestat
Version:        0.3.0
Release:        1%{?dist}
Summary:        Watches data flowing over an anonymous pipe

Group:          Applications/System
License:        GPLv3+
URL:            http://code.google.com/p/pipestat/
Source0:        http://pipestat.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Simple python script to watch data flowing over an anonymous pipe
on shell consoles.

%prep
%setup -q


%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 AUTHORS COPYING LICENSE
%{python_sitelib}/*
%{_bindir}/pipestat


%changelog
* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
- Updated for upstream release.

* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-2
- Fixed description.

* Mon Aug  3 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-1
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:48:35 -0000	1.1
+++ .cvsignore	11 Aug 2009 17:21:22 -0000	1.2
@@ -0,0 +1 @@
+pipestat-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:48:35 -0000	1.1
+++ sources	11 Aug 2009 17:21:22 -0000	1.2
@@ -0,0 +1 @@
+c4bbfc99b9fd06b6fcf7ad1ec924cafa  pipestat-0.3.0.tar.gz



From smilner at fedoraproject.org  Tue Aug 11 17:23:31 2009
From: smilner at fedoraproject.org (smilner)
Date: Tue, 11 Aug 2009 17:23:31 +0000 (UTC)
Subject: rpms/pipestat/EL-5 import.log, NONE, 1.1 pipestat.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090811172331.AC49211C00D7@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8956/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pipestat.spec 
Log Message:
Import into EL5.



--- NEW FILE import.log ---
pipestat-0_3_0-1_fc12:EL-5:pipestat-0.3.0-1.fc12.src.rpm:1250011380


--- NEW FILE pipestat.spec ---
# sitelib for noarch packages
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pipestat
Version:        0.3.0
Release:        1%{?dist}
Summary:        Watches data flowing over an anonymous pipe

Group:          Applications/System
License:        GPLv3+
URL:            http://code.google.com/p/pipestat/
Source0:        http://pipestat.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools

%description
Simple python script to watch data flowing over an anonymous pipe
on shell consoles.

%prep
%setup -q


%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 AUTHORS COPYING LICENSE
%{python_sitelib}/*
%{_bindir}/pipestat


%changelog
* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
- Updated for upstream release.

* Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-2
- Fixed description.

* Mon Aug  3 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.2-1
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Aug 2009 16:48:35 -0000	1.1
+++ .cvsignore	11 Aug 2009 17:23:31 -0000	1.2
@@ -0,0 +1 @@
+pipestat-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Aug 2009 16:48:35 -0000	1.1
+++ sources	11 Aug 2009 17:23:31 -0000	1.2
@@ -0,0 +1 @@
+c4bbfc99b9fd06b6fcf7ad1ec924cafa  pipestat-0.3.0.tar.gz



From hadess at fedoraproject.org  Tue Aug 11 17:25:56 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 17:25:56 +0000 (UTC)
Subject: rpms/gvfs/devel
	0001-Revert-part-of-the-excessive-function-culling.patch, NONE, 1.1
Message-ID: <20090811172556.33C5A11C00D7@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9406

Added Files:
	0001-Revert-part-of-the-excessive-function-culling.patch 
Log Message:
Add missing patch

0001-Revert-part-of-the-excessive-function-culling.patch:
 afcvolumemonitor.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Revert-part-of-the-excessive-function-culling.patch ---
>From 8b926f38fe60569de6ddcddf3e19ef0ee3fbad8a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 11 Aug 2009 17:19:31 +0100
Subject: [PATCH] Revert part of the excessive function culling

---
 monitor/afc/afc-volume-monitor.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
index ee491d5..faa384d 100644
--- a/monitor/afc/afcvolumemonitor.c
+++ b/monitor/afc/afcvolumemonitor.c
@@ -166,6 +166,12 @@ g_vfs_afc_volume_monitor_finalize (GObject *_self)
 }
 
 static GList *
+g_vfs_afc_volume_monitor_get_mounts (GVolumeMonitor *_self)
+{
+  return NULL;
+}
+
+static GList *
 g_vfs_afc_volume_monitor_get_volumes (GVolumeMonitor *_self)
 {
   GVfsAfcVolumeMonitor *self;
@@ -179,6 +185,12 @@ g_vfs_afc_volume_monitor_get_volumes (GVolumeMonitor *_self)
   return l;
 }
 
+static GList *
+g_vfs_afc_volume_monitor_get_connected_drives (GVolumeMonitor *_self)
+{
+  return NULL;
+}
+
 static gboolean
 g_vfs_afc_volume_monitor_is_supported (void)
 {
@@ -194,7 +206,9 @@ g_vfs_afc_volume_monitor_class_init (GVfsAfcVolumeMonitorClass * klass)
   gobject_class->constructor = g_vfs_afc_volume_monitor_constructor;
   gobject_class->finalize = g_vfs_afc_volume_monitor_finalize;
 
+  monitor_class->get_mounts = g_vfs_afc_volume_monitor_get_mounts;
   monitor_class->get_volumes = g_vfs_afc_volume_monitor_get_volumes;
+  monitor_class->get_connected_drives = g_vfs_afc_volume_monitor_get_connected_drives;
   monitor_class->is_supported = g_vfs_afc_volume_monitor_is_supported;
 }
 
-- 
1.6.2.5




From rdieter at fedoraproject.org  Tue Aug 11 17:43:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 17:43:51 +0000 (UTC)
Subject: rpms/qscintilla/devel qscintilla.spec,1.28,1.29
Message-ID: <20090811174351.BA14211C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924

Modified Files:
	qscintilla.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
- -python-devel: make noarch, drop dep on -python



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- qscintilla.spec	9 Aug 2009 04:24:24 -0000	1.28
+++ qscintilla.spec	11 Aug 2009 17:43:51 -0000	1.29
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -56,8 +56,13 @@ Requires: PyQt4 >= %{pyqt4_version}
 %package python-devel
 Summary:  Development files for QScintilla PyQt4 bindings 
 Group:    Development/Libraries
-Requires: %{name}-python = %{version}-%{release}
 Requires: PyQt4-devel
+%if 0%{?fedora} > 9
+BuildArch: noarch
+# when noarch landed
+Obsoletes: qscintilla-python-devel < 2.4-4
+%endif
+
 %description python-devel
 %{summary}.
 
@@ -147,6 +152,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
+- -python-devel: make noarch, drop dep on -python
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
 - include designer plugin in main pkg, Obsoletes: qscintilla-designer
 



From rdieter at fedoraproject.org  Tue Aug 11 17:45:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 17:45:58 +0000 (UTC)
Subject: rpms/qscintilla/F-11 qscintilla.spec,1.28,1.29
Message-ID: <20090811174558.13FE411C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13291

Modified Files:
	qscintilla.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
- -python-devel: make noarch, drop dep on -python



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/qscintilla.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- qscintilla.spec	9 Aug 2009 15:43:27 -0000	1.28
+++ qscintilla.spec	11 Aug 2009 17:45:57 -0000	1.29
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -56,8 +56,13 @@ Requires: PyQt4 >= %{pyqt4_version}
 %package python-devel
 Summary:  Development files for QScintilla PyQt4 bindings 
 Group:    Development/Libraries
-Requires: %{name}-python = %{version}-%{release}
 Requires: PyQt4-devel
+%if 0%{?fedora} > 9
+BuildArch: noarch
+# when noarch landed
+Obsoletes: qscintilla-python-devel < 2.4-4
+%endif
+
 %description python-devel
 %{summary}.
 
@@ -147,6 +152,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
+- -python-devel: make noarch, drop dep on -python
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
 - include designer plugin in main pkg, Obsoletes: qscintilla-designer
 



From rdieter at fedoraproject.org  Tue Aug 11 17:46:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 17:46:46 +0000 (UTC)
Subject: rpms/qscintilla/F-10 qscintilla.spec,1.22,1.23
Message-ID: <20090811174646.7FF9311C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13528

Modified Files:
	qscintilla.spec 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
- -python-devel: make noarch, drop dep on -python



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/qscintilla.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- qscintilla.spec	9 Aug 2009 18:51:20 -0000	1.22
+++ qscintilla.spec	11 Aug 2009 17:46:46 -0000	1.23
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -56,8 +56,13 @@ Requires: PyQt4 >= %{pyqt4_version}
 %package python-devel
 Summary:  Development files for QScintilla PyQt4 bindings 
 Group:    Development/Libraries
-Requires: %{name}-python = %{version}-%{release}
 Requires: PyQt4-devel
+%if 0%{?fedora} > 9
+BuildArch: noarch
+# when noarch landed
+Obsoletes: qscintilla-python-devel < 2.4-4
+%endif
+
 %description python-devel
 %{summary}.
 
@@ -147,6 +152,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
+- -python-devel: make noarch, drop dep on -python
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
 - include designer plugin in main pkg, Obsoletes: qscintilla-designer
 



From dwalsh at fedoraproject.org  Tue Aug 11 17:47:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 11 Aug 2009 17:47:17 +0000 (UTC)
Subject: rpms/setools/devel setools.spec,1.92,1.93
Message-ID: <20090811174717.C979811C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13705

Modified Files:
	setools.spec 
Log Message:
* Tue Aug 11 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-4
- Add python bindings for sesearch and seinfo



Index: setools.spec
===================================================================
RCS file: /cvs/extras/rpms/setools/devel/setools.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- setools.spec	11 Aug 2009 14:47:50 -0000	1.92
+++ setools.spec	11 Aug 2009 17:47:17 -0000	1.93
@@ -254,6 +254,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %ifarch x86_64 ppc64 sparc64 s390x
 %{pkg_py_arch}/
 %endif
+%{python_sitearch}/sesearch*.egg-info
 
 %files libs-java
 %defattr(-,root,root,-)



From rstrode at fedoraproject.org  Tue Aug 11 17:56:50 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 11 Aug 2009 17:56:50 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.135,1.136 sources,1.56,1.57
Message-ID: <20090811175650.1789511C00D7@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15593

Modified Files:
	plymouth.spec sources 
Log Message:
- Update to 0.7.0



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- plymouth.spec	26 Jul 2009 18:58:47 -0000	1.135
+++ plymouth.spec	11 Aug 2009 17:56:49 -0000	1.136
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.0
-Release: 0.2010.05.15.1%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -204,6 +204,30 @@ This package contains the "charge" boot 
 Plymouth. It features the shadowy hull of a Fedora logo charge up and
 and finally burst into full form.
 
+%package plugin-script
+Summary: Plymouth "script" plugin
+Group: System Environment/Base
+Requires: %{name}-libs = %{version}-%{release}
+BuildRequires: libpng-devel
+
+%description plugin-script
+This package contains the "script" boot splash plugin for
+Plymouth. It features an extensible, scriptable boot splash
+language that simplifies the process of designing custom
+boot splash themes.
+
+%package theme-script
+Summary: Plymouth "Script" plugin
+Group: System Environment/Base
+Requires: %{name}-plugin-script = %{version}-%{release}
+Requires(post): %{_sbindir}/plymouth-set-default-theme
+Provides: plymouth(system-theme) = %{version}-%{release}
+
+%description theme-script
+This package contains the "script" boot splash theme for
+Plymouth. It it is a simple example theme the uses the "script"
+plugin.
+
 %prep
 %setup -q
 
@@ -406,10 +430,23 @@ fi
 %{_datadir}/plymouth/themes/charge/*.png
 %{_datadir}/plymouth/themes/charge/charge.plymouth
 
+%files plugin-script
+%defattr(-, root, root)
+%{_libdir}/plymouth/script.so
+
+%files theme-script
+%defattr(-, root, root)
+%{_datadir}/plymouth/themes/script/*.png
+%{_datadir}/plymouth/themes/script/script.script
+%{_datadir}/plymouth/themes/script/script.plymouth
+
 %files system-theme
 %defattr(-, root, root)
 
 %changelog
+* Tue Aug 11 2009 Ray Strode <rstrode at redhat.com> 0.7.0-1
+- Update to 0.7.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-0.2010.05.15.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	15 May 2009 17:28:13 -0000	1.56
+++ sources	11 Aug 2009 17:56:49 -0000	1.57
@@ -1 +1 @@
-fbfa86838e536feeffead95dbdeffe93  plymouth-0.7.0.tar.bz2
+f0b305c05129f3fd70de6583ed9cb9a4  plymouth-0.7.0.tar.bz2



From sseago at fedoraproject.org  Tue Aug 11 17:59:37 2009
From: sseago at fedoraproject.org (Scott Seago)
Date: Tue, 11 Aug 2009 17:59:37 +0000 (UTC)
Subject: rpms/ovirt-server/devel ovirt-server.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090811175937.E1F8611C00D7@cvs1.fedora.phx.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/ovirt-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16139

Modified Files:
	ovirt-server.spec sources 
Log Message:
final 0.100 upstream release


Index: ovirt-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovirt-server/devel/ovirt-server.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ovirt-server.spec	27 Jul 2009 13:24:33 -0000	1.3
+++ ovirt-server.spec	11 Aug 2009 17:59:37 -0000	1.4
@@ -5,10 +5,8 @@
 Summary: The oVirt Server Suite
 Name: ovirt-server
 Version: 0.100
-Release: 3%{?dist}%{?extra_release}
-# full source URL will be added with the next oVirt release. This is a pre-release
-# code drop to make sure we get the package approved by f12 feature freeze.
-Source0: %{name}-%{version}.tar.gz
+Release: 4%{?dist}%{?extra_release}
+Source0: http://ovirt.org/files/%{name}-%{version}.tar.gz
 #Entire source code is GPL except for vendor/plugins/will_paginate and
 #vendor/plugins/betternestedset, which are MIT, and
 #public/javascripts/jquery.*, which is both MIT and GPL, and
@@ -152,6 +150,7 @@ touch %{buildroot}%{_localstatedir}/log/
 %{__cp} -a %{pbuild}/scripts/ovirt-vm2node %{buildroot}%{_bindir}
 %{__cp} -a %{pbuild}/scripts/ovirt-reindex-search %{buildroot}%{_sbindir}
 %{__cp} -a %{pbuild}/scripts/ovirt-update-search %{buildroot}%{_sbindir}
+%{__cp} -a %{pbuild}/scripts/ovirt_ctl %{buildroot}%{_sbindir}
 %{__rm} -rf %{buildroot}%{app_root}/tmp
 %{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp
 %{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp
@@ -225,6 +224,7 @@ fi
 %{_sbindir}/ovirt-update-search
 %{_bindir}/ovirt-add-host
 %{_bindir}/ovirt-vm2node
+%{_sbindir}/ovirt_ctl
 %{_initrddir}/ovirt-host-browser
 %{_initrddir}/ovirt-host-register
 %{_initrddir}/ovirt-db-omatic
@@ -262,6 +262,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Scott Seago <sseago at redhat.com> - 0.100-4
+- Final 0.100 upstream release
+
 * Mon Jul 27 2009 Scott Seago <sseago at redhat.com> - 0.100-3
 - Removed ovirt-docs dep
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovirt-server/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 18:14:17 -0000	1.2
+++ sources	11 Aug 2009 17:59:37 -0000	1.3
@@ -1 +1 @@
-1528b87eaa393fa87d459d076c96c853  ovirt-server-0.100.tar.gz
+9c6f0866c4c685d4beb784922119ba68  ovirt-server-0.100.tar.gz



From jkratoch at fedoraproject.org  Tue Aug 11 18:07:06 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 11 Aug 2009 18:07:06 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch,1.21,1.22 gdb.spec,1.371,1.372
Message-ID: <20090811180707.0160211C00D7@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17314

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-2
- archer-jankratochvil-fedora12 commit: 93f5e942bdcdcc376ece452c309bedabae71def9
- Fix "can't compute CFA for this frame" (by Tom Tromey, BZ 516627).


gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 block.c                                                  |   23 
 block.h                                                  |    2 
 breakpoint.c                                             |  102 
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 ++
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  223 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   59 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |   14 
 dwarf2-frame.c                                           |   33 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |  102 
 dwarf2expr.h                                             |   70 
 dwarf2loc.c                                              |  361 +++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1538 +++++++++------
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  413 ----
 f-lang.h                                                 |   38 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 -
 findvar.c                                                |  126 -
 frame.c                                                  |   17 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 ++
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 +++++
 gdbtypes.h                                               |  140 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  115 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   27 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 ++++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 +
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 +++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 +++
 python/python-symtab.c                                   |  322 +++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |  123 +
 python/python.c                                          |  384 +++
 python/python.h                                          |    8 
 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                                                |   55 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  316 +--
 symtab.h                                                 |   17 
 target.h                                                 |   22 
 testsuite/ChangeLog                                      |   97 
 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.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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                  |   16 
 testsuite/gdb.cp/namespace-recursive.exp                 |   53 
 testsuite/gdb.cp/namespace-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 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/callframecfa.S                      |  309 +++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 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                        |  158 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/string.exp                         |   72 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   96 
 testsuite/gdb.python/python-prettyprint.c                |   13 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   86 
 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                                                 |  254 ++
 valprint.c                                               |    3 
 value.c                                                  |  211 +-
 value.h                                                  |   12 
 varobj.c                                                 |  731 +++++--
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 220 files changed, 16562 insertions(+), 2661 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gdb-archer.patch	11 Aug 2009 14:42:46 -0000	1.21
+++ gdb-archer.patch	11 Aug 2009 18:07:06 -0000	1.22
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 81de3c6abae4f7e3738aa9bcc0ab2f8725cce252
+commit 93f5e942bdcdcc376ece452c309bedabae71def9
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -3246,7 +3246,7 @@ index 4984f31..4bbbe4e 100644
  This observer is used for internal testing.  Do not use.  
  See testsuite/gdb.gdb/observer.exp.
 diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
-index 0f6da40..c1c162e 100644
+index 0f6da40..fc70309 100644
 --- a/gdb/dwarf2-frame.c
 +++ b/gdb/dwarf2-frame.c
 @@ -38,6 +38,7 @@
@@ -3271,7 +3271,18 @@ index 0f6da40..c1c162e 100644
  no_get_tls_address (void *baton, CORE_ADDR offset)
  {
    internal_error (__FILE__, __LINE__,
-@@ -360,14 +368,16 @@ execute_stack_op (gdb_byte *exp, ULONGEST len, int addr_size,
+@@ -352,24 +360,29 @@ execute_stack_op (gdb_byte *exp, ULONGEST len, int addr_size,
+ {
+   struct dwarf_expr_context *ctx;
+   CORE_ADDR result;
++  struct cleanup *old_chain;
+ 
+   ctx = new_dwarf_expr_context ();
++  old_chain = make_cleanup_free_dwarf_expr_context (ctx);
++
+   ctx->gdbarch = get_frame_arch (this_frame);
+   ctx->addr_size = addr_size;
+   ctx->baton = this_frame;
    ctx->read_reg = read_reg;
    ctx->read_mem = read_mem;
    ctx->get_frame_base = no_get_frame_base;
@@ -3287,9 +3298,12 @@ index 0f6da40..c1c162e 100644
      result = read_reg (this_frame, result);
 +  /* FIXME */
  
-   free_dwarf_expr_context (ctx);
+-  free_dwarf_expr_context (ctx);
++  do_cleanups (old_chain);
  
-@@ -1247,6 +1257,14 @@ dwarf2_frame_base_sniffer (struct frame_info *this_frame)
+   return result;
+ }
+@@ -1247,6 +1260,14 @@ dwarf2_frame_base_sniffer (struct frame_info *this_frame)
  
    return NULL;
  }
@@ -3297,14 +3311,14 @@ index 0f6da40..c1c162e 100644
 +CORE_ADDR
 +dwarf2_frame_cfa (struct frame_info *this_frame)
 +{
-+  if (! frame_base_is (this_frame, &dwarf2_frame_base))
++  if (! frame_unwinder_is (this_frame, &dwarf2_frame_unwind))
 +    error (_("can't compute CFA for this frame"));
-+  return get_frame_base_address (this_frame);
++  return get_frame_base (this_frame);
 +}
  

  const struct objfile_data *dwarf2_frame_objfile_data;
  
-@@ -1536,6 +1554,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
+@@ -1536,6 +1557,14 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
        CORE_ADDR offset;
        CORE_ADDR seek_pc;
  
@@ -3333,10 +3347,33 @@ index b203661..dd03d59 100644
 +
  #endif /* dwarf2-frame.h */
 diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
-index 8dbf976..aec7b92 100644
+index 8dbf976..228eae7 100644
 --- a/gdb/dwarf2expr.c
 +++ b/gdb/dwarf2expr.c
-@@ -109,8 +109,7 @@ dwarf_expr_fetch (struct dwarf_expr_context *ctx, int n)
+@@ -61,6 +61,22 @@ free_dwarf_expr_context (struct dwarf_expr_context *ctx)
+   xfree (ctx);
+ }
+ 
++/* Helper for make_cleanup_free_dwarf_expr_context.  */
++
++static void
++free_dwarf_expr_context_cleanup (void *arg)
++{
++  free_dwarf_expr_context (arg);
++}
++
++/* Return a cleanup that calls free_dwarf_expr_context.  */
++
++struct cleanup *
++make_cleanup_free_dwarf_expr_context (struct dwarf_expr_context *ctx)
++{
++  return make_cleanup (free_dwarf_expr_context_cleanup, ctx);
++}
++
+ /* Expand the memory allocated to CTX's stack to contain at least
+    NEED more elements than are currently used.  */
+ 
+@@ -109,8 +125,7 @@ dwarf_expr_fetch (struct dwarf_expr_context *ctx, int n)
  
  /* Add a new piece to CTX's piece list.  */
  static void
@@ -3346,7 +3383,7 @@ index 8dbf976..aec7b92 100644
  {
    struct dwarf_expr_piece *p;
  
-@@ -125,9 +124,15 @@ add_piece (struct dwarf_expr_context *ctx,
+@@ -125,9 +140,15 @@ add_piece (struct dwarf_expr_context *ctx,
                             * sizeof (struct dwarf_expr_piece));
  
    p = &ctx->pieces[ctx->num_pieces - 1];
@@ -3364,7 +3401,7 @@ index 8dbf976..aec7b92 100644
  }
  
  /* Evaluate the expression at ADDR (LEN bytes long) using the context
-@@ -271,6 +276,21 @@ signed_address_type (struct gdbarch *gdbarch, int addr_size)
+@@ -271,6 +292,21 @@ signed_address_type (struct gdbarch *gdbarch, int addr_size)
      }
  }
  

@@ -3386,7 +3423,7 @@ index 8dbf976..aec7b92 100644
  /* The engine for the expression evaluator.  Using the context in CTX,
     evaluate the expression between OP_PTR and OP_END.  */
  
-@@ -279,8 +299,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -279,8 +315,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  		  gdb_byte *op_ptr, gdb_byte *op_end)
  {
    enum bfd_endian byte_order = gdbarch_byte_order (ctx->gdbarch);
@@ -3396,7 +3433,7 @@ index 8dbf976..aec7b92 100644
    ctx->initialized = 1;  /* Default is initialized.  */
  
    if (ctx->recursion_depth > ctx->max_recursion_depth)
-@@ -420,20 +439,36 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -420,20 +455,36 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  		   "used either alone or in conjuction with DW_OP_piece."));
  
  	  result = op - DW_OP_reg0;
@@ -3439,7 +3476,7 @@ index 8dbf976..aec7b92 100644
  	case DW_OP_breg0:
  	case DW_OP_breg1:
  	case DW_OP_breg2:
-@@ -498,11 +533,12 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -498,11 +549,12 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  	    (ctx->get_frame_base) (ctx->baton, &datastart, &datalen);
  	    dwarf_expr_eval (ctx, datastart, datalen);
  	    result = dwarf_expr_fetch (ctx, 0);
@@ -3454,7 +3491,7 @@ index 8dbf976..aec7b92 100644
  	  }
  	  break;
  	case DW_OP_dup:
-@@ -700,6 +736,10 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -700,6 +752,10 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  	  }
  	  break;
  
@@ -3465,7 +3502,7 @@ index 8dbf976..aec7b92 100644
  	case DW_OP_GNU_push_tls_address:
  	  /* Variable is at a constant offset in the thread-local
  	  storage block into the objfile for the current thread and
-@@ -738,12 +778,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -738,12 +794,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  
              /* Record the piece.  */
              op_ptr = read_uleb128 (op_ptr, op_end, &size);
@@ -3484,7 +3521,7 @@ index 8dbf976..aec7b92 100644
            }
            goto no_push;
  
-@@ -755,6 +796,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
+@@ -755,6 +812,13 @@ execute_stack_op (struct dwarf_expr_context *ctx,
  	  ctx->initialized = 0;
  	  goto no_push;
  
@@ -3499,7 +3536,7 @@ index 8dbf976..aec7b92 100644
  	  error (_("Unhandled dwarf expression opcode 0x%x"), op);
  	}
 diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h
-index 7047922..232208d 100644
+index 7047922..597c2de 100644
 --- a/gdb/dwarf2expr.h
 +++ b/gdb/dwarf2expr.h
 @@ -23,6 +23,19 @@
@@ -3621,8 +3658,17 @@ index 7047922..232208d 100644
  
    /* The length of the piece, in bytes.  */
    ULONGEST size;
+@@ -131,6 +159,8 @@ struct dwarf_expr_piece
+ 
+ struct dwarf_expr_context *new_dwarf_expr_context (void);
+ void free_dwarf_expr_context (struct dwarf_expr_context *ctx);
++struct cleanup *
++    make_cleanup_free_dwarf_expr_context (struct dwarf_expr_context *ctx);
+ 
+ void dwarf_expr_push (struct dwarf_expr_context *ctx, CORE_ADDR value);
+ void dwarf_expr_pop (struct dwarf_expr_context *ctx);
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 071b5ac..07bb8ba 100644
+index 071b5ac..7b2e488 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
 @@ -36,6 +36,7 @@
@@ -4004,7 +4050,20 @@ index 071b5ac..07bb8ba 100644
  /* Thread-local accesses do require a frame.  */
  static CORE_ADDR
  needs_frame_tls_address (void *baton, CORE_ADDR offset)
-@@ -356,11 +567,12 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
+@@ -346,21 +557,25 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
+   struct needs_frame_baton baton;
+   struct dwarf_expr_context *ctx;
+   int in_reg;
++  struct cleanup *old_chain;
+ 
+   baton.needs_frame = 0;
+ 
+   ctx = new_dwarf_expr_context ();
++  old_chain = make_cleanup_free_dwarf_expr_context (ctx);
++
+   ctx->gdbarch = get_objfile_arch (dwarf2_per_cu_objfile (per_cu));
+   ctx->addr_size = dwarf2_per_cu_addr_size (per_cu);
+   ctx->baton = &baton;
    ctx->read_reg = needs_frame_read_reg;
    ctx->read_mem = needs_frame_read_mem;
    ctx->get_frame_base = needs_frame_frame_base;
@@ -4018,7 +4077,7 @@ index 071b5ac..07bb8ba 100644
  
    if (ctx->num_pieces > 0)
      {
-@@ -369,7 +581,7 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
+@@ -369,11 +584,11 @@ dwarf2_loc_desc_needs_frame (gdb_byte *data, unsigned short size,
        /* If the location has several pieces, and any of them are in
           registers, then we will need a frame to fetch them from.  */
        for (i = 0; i < ctx->num_pieces; i++)
@@ -4027,7 +4086,12 @@ index 071b5ac..07bb8ba 100644
            in_reg = 1;
      }
  
-@@ -601,7 +813,7 @@ static int
+-  free_dwarf_expr_context (ctx);
++  do_cleanups (old_chain);
+ 
+   return baton.needs_frame || in_reg;
+ }
+@@ -601,7 +816,7 @@ static int
  loclist_describe_location (struct symbol *symbol, struct ui_file *stream)
  {
    /* FIXME: Could print the entire list of locations.  */
@@ -4036,7 +4100,7 @@ index 071b5ac..07bb8ba 100644
    return 1;
  }
  
-@@ -617,16 +829,56 @@ loclist_tracepoint_var_ref (struct symbol *symbol, struct gdbarch *gdbarch,
+@@ -617,16 +832,56 @@ loclist_tracepoint_var_ref (struct symbol *symbol, struct gdbarch *gdbarch,
  
    data = find_location_expression (dlbaton, &size, ax->scope);
    if (data == NULL)
@@ -8250,7 +8314,7 @@ index 8c027c9..d201f76 100644
    else
      {
 diff --git a/gdb/frame.c b/gdb/frame.c
-index 67e0607..1eb7f9d 100644
+index 67e0607..49c3013 100644
 --- a/gdb/frame.c
 +++ b/gdb/frame.c
 @@ -1109,6 +1109,14 @@ has_stack_frames (void)
@@ -8268,7 +8332,7 @@ index 67e0607..1eb7f9d 100644
    /* Don't try to read from a dead thread.  */
    if (is_exited (inferior_ptid))
      return 0;
-@@ -1843,6 +1851,17 @@ get_frame_args_address (struct frame_info *fi)
+@@ -1843,6 +1851,15 @@ get_frame_args_address (struct frame_info *fi)
    return fi->base->this_args (fi, &fi->base_cache);
  }
  
@@ -8276,28 +8340,27 @@ index 67e0607..1eb7f9d 100644
 +   otherwise.  */
 +
 +int
-+frame_base_is (struct frame_info *fi, const struct frame_base *base)
++frame_unwinder_is (struct frame_info *fi, const struct frame_unwind *unwinder)
 +{
-+  if (fi->base == NULL)
-+    fi->base = frame_base_find_by_frame (fi);
-+  return fi->base == base;
++  return fi->unwind == unwinder;
 +}
 +
  /* Level of the selected frame: 0 for innermost, 1 for its caller, ...
     or -1 for a NULL frame.  */
  
 diff --git a/gdb/frame.h b/gdb/frame.h
-index febef5c..09bf628 100644
+index febef5c..611c6d3 100644
 --- a/gdb/frame.h
 +++ b/gdb/frame.h
-@@ -696,4 +696,9 @@ extern struct frame_info *deprecated_safe_get_selected_frame (void);
+@@ -696,4 +696,10 @@ extern struct frame_info *deprecated_safe_get_selected_frame (void);
  
  extern struct frame_info *create_new_frame (CORE_ADDR base, CORE_ADDR pc);
  
-+/* Return true if the frame base for frame FI is BASE; false
++/* Return true if the frame unwinder for frame FI is UNWINDER; false
 +   otherwise.  */
 +
-+extern int frame_base_is (struct frame_info *fi, const struct frame_base *base);
++extern int frame_unwinder_is (struct frame_info *fi,
++			      const struct frame_unwind *unwinder);
 +
  #endif /* !defined (FRAME_H)  */
 diff --git a/gdb/gdbinit.in b/gdb/gdbinit.in
@@ -21677,6 +21740,382 @@ index 0000000..6922eed
 +if [test_compiler_info gcc-4-3-*] then { setup_xfail *-*-* }
 +
 +gdb_test "print x" "= 11" "Print imported namespace x"
+diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.S b/gdb/testsuite/gdb.dwarf2/callframecfa.S
+new file mode 100644
+index 0000000..6d0421a
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/callframecfa.S
+@@ -0,0 +1,309 @@
++/*
++   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/>.
++ */
++
++/* This was compiled from a trivial program just to test the
++   DW_OP_call_frame_cfa operator:
++
++    int func (int arg) {
++      return arg + 23;
++    }
++
++    int main(int argc, char *argv[]) {
++      func (77);
++    }
++*/
++
++	.file	"q.c"
++	.section	.debug_abbrev,"", at progbits
++.Ldebug_abbrev0:
++	.section	.debug_info,"", at progbits
++.Ldebug_info0:
++	.section	.debug_line,"", at progbits
++.Ldebug_line0:
++	.text
++.Ltext0:
++.globl func
++	.type	func, @function
++func:
++.LFB0:
++	.file 1 "q.c"
++	.loc 1 2 0
++	.cfi_startproc
++	pushl	%ebp
++	.cfi_def_cfa_offset 8
++	movl	%esp, %ebp
++	.cfi_offset 5, -8
++	.cfi_def_cfa_register 5
++	.loc 1 3 0
++	movl	8(%ebp), %eax
++	addl	$23, %eax
++	.loc 1 4 0
++	popl	%ebp
++	.cfi_restore 5
++	.cfi_def_cfa 4, 4
++	ret
++	.cfi_endproc
++.LFE0:
++	.size	func, .-func
++.globl _start
++	.type	_start, @function
++_start:
++.LFB1:
++	.loc 1 6 0
++	.cfi_startproc
++	pushl	%ebp
++	.cfi_def_cfa_offset 8
++	movl	%esp, %ebp
++	.cfi_offset 5, -8
++	.cfi_def_cfa_register 5
++	subl	$4, %esp
++	.loc 1 7 0
++	movl	$77, (%esp)
++	call	func
++	.loc 1 8 0
++	leave
++	.cfi_restore 5
++	.cfi_def_cfa 4, 4
++	ret
++	.cfi_endproc
++.LFE1:
++	.size	_start, .-_start
++.Letext0:
++	.section	.debug_info
++	.long	0x9e
++	.value	0x3
++	.long	.Ldebug_abbrev0
++	.byte	0x4
++	.uleb128 0x1
++	.long	.LASF5
++	.byte	0x1
++	.string	"q.c"
++	.long	.LASF6
++	.long	.Ltext0
++	.long	.Letext0
++	.long	.Ldebug_line0
++	.uleb128 0x2
++	.byte	0x1
++	.long	.LASF0
++	.byte	0x1
++	.byte	0x1
++	.byte	0x1
++	.long	0x4f
++	.long	.LFB0
++	.long	.LFE0
++	.byte	0x1
++	.byte	0x9c
++	.long	0x4f
++	.uleb128 0x3
++	.string	"arg"
++	.byte	0x1
++	.byte	0x1
++	.long	0x4f
++	.byte	0x2
++	.byte	0x91
++	.sleb128 0
++	.byte	0x0
++	.uleb128 0x4
++	.byte	0x4
++	.byte	0x5
++	.string	"int"
++	.uleb128 0x2
++	.byte	0x1
++	.long	.LASF1
++	.byte	0x1
++	.byte	0x6
++	.byte	0x1
++	.long	0x4f
++	.long	.LFB1
++	.long	.LFE1
++	.byte	0x1
++	.byte	0x9c
++	.long	0x8e
++	.uleb128 0x5
++	.long	.LASF2
++	.byte	0x1
++	.byte	0x6
++	.long	0x4f
++	.byte	0x2
++	.byte	0x91
++	.sleb128 0
++	.uleb128 0x5
++	.long	.LASF3
++	.byte	0x1
++	.byte	0x6
++	.long	0x8e
++	.byte	0x2
++	.byte	0x91
++	.sleb128 4
++	.byte	0x0
++	.uleb128 0x6
++	.byte	0x4
++	.long	0x94
++	.uleb128 0x6
++	.byte	0x4
++	.long	0x9a
++	.uleb128 0x7
++	.byte	0x1
++	.byte	0x6
++	.long	.LASF4
++	.byte	0x0
++	.section	.debug_abbrev
++	.uleb128 0x1
++	.uleb128 0x11
++	.byte	0x1
++	.uleb128 0x25
++	.uleb128 0xe
++	.uleb128 0x13
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x1b
++	.uleb128 0xe
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x10
++	.uleb128 0x6
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x2
++	.uleb128 0x2e
++	.byte	0x1
++	.uleb128 0x3f
++	.uleb128 0xc
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x27
++	.uleb128 0xc
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x11
++	.uleb128 0x1
++	.uleb128 0x12
++	.uleb128 0x1
++	.uleb128 0x40
++	.uleb128 0xa
++	.uleb128 0x1
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x5
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0x8
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x4
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0x8
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x5
++	.uleb128 0x5
++	.byte	0x0
++	.uleb128 0x3
++	.uleb128 0xe
++	.uleb128 0x3a
++	.uleb128 0xb
++	.uleb128 0x3b
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.uleb128 0x2
++	.uleb128 0xa
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x6
++	.uleb128 0xf
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x49
++	.uleb128 0x13
++	.byte	0x0
++	.byte	0x0
++	.uleb128 0x7
++	.uleb128 0x24
++	.byte	0x0
++	.uleb128 0xb
++	.uleb128 0xb
++	.uleb128 0x3e
++	.uleb128 0xb
++	.uleb128 0x3
++	.uleb128 0xe
++	.byte	0x0
++	.byte	0x0
++	.byte	0x0
++	.section	.debug_pubnames,"", at progbits
++	.long	0x20
++	.value	0x2
++	.long	.Ldebug_info0
++	.long	0xa2
++	.long	0x25
++	.string	"func"
++	.long	0x56
++	.string	"main"
++	.long	0x0
++	.section	.debug_aranges,"", at progbits
++	.long	0x1c
++	.value	0x2
++	.long	.Ldebug_info0
++	.byte	0x4
++	.byte	0x0
++	.value	0x0
++	.value	0x0
++	.long	.Ltext0
++	.long	.Letext0-.Ltext0
++	.long	0x0
++	.long	0x0
++	.section	.debug_str,"MS", at progbits,1
++.LASF5:
++	.string	"GNU C 4.5.0 20090810 (experimental) [trunk revision 150633]"
++.LASF2:
++	.string	"argc"
++.LASF6:
++	.string	"/tmp"
++.LASF0:
++	.string	"func"
++.LASF3:
++	.string	"argv"
++.LASF1:
++	.string	"main"
++.LASF4:
++	.string	"char"
++	.ident	"GCC: (GNU) 4.5.0 20090810 (experimental) [trunk revision 150633]"
++	.section	.note.GNU-stack,"", at progbits
+diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
+new file mode 100644
+index 0000000..00d67fc
+--- /dev/null
++++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
+@@ -0,0 +1,55 @@
++# Copyright 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Test DW_OP_call_frame_cfa.
++
++# This test can only be run on targets which support DWARF-2 and use gas.
++# For now pick a sampling of likely targets.
++if {![istarget *-*-linux*]
++    && ![istarget *-*-gnu*]
++    && ![istarget *-*-elf*]
++    && ![istarget *-*-openbsd*]
++    && ![istarget arm-*-eabi*]
++    && ![istarget powerpc-*-eabi*]} {
++    return 0  
++}
++# This test can only be run on x86 targets.
++if {![istarget i?86-*]} {
++    return 0  
++}
++
++set testfile "callframecfa"
++set srcfile ${testfile}.S
++set binfile ${objdir}/${subdir}/${testfile}.x
++
++if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
++       [list {additional_flags=-nostdlib}]] != "" } {
++    return -1
++}
++
++gdb_exit
++gdb_start
++gdb_reinitialize_dir $srcdir/$subdir
++gdb_load ${binfile}
++
++gdb_test "break *func" "Breakpoint 1.*" "set breakpoint for call-frame-cfa"
++gdb_test "run" "" "run for call-frame-cfa"
++gdb_test "display arg" "arg = 77" "set display for call-frame-cfa"
++
++# We know how many instructions are in the function.  Note that we
++# can't handle the "ret" instruction due to the epilogue unwinder.
++for {set i 1} {$i < 5} {incr i} {
++    gdb_test "si" "arg = 77" "step $i for call-frame-cfa"
++}
 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stripped.c b/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 new file mode 100644
 index 0000000..1f02d90


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- gdb.spec	11 Aug 2009 14:42:47 -0000	1.371
+++ gdb.spec	11 Aug 2009 18:07:06 -0000	1.372
@@ -14,7 +14,7 @@ Version: 6.8.50.20090811
 
 # 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
@@ -825,6 +825,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-2
+- archer-jankratochvil-fedora12 commit: 93f5e942bdcdcc376ece452c309bedabae71def9
+- Fix "can't compute CFA for this frame" (by Tom Tromey, BZ 516627).
+
 * Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-1
 - Support constant DW_AT_data_member_location by GCC PR debug/40659 (BZ 515377).
 - Fix .spec URL.



From s4504kr at fedoraproject.org  Tue Aug 11 18:08:52 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 11 Aug 2009 18:08:52 +0000 (UTC)
Subject: rpms/freealut/devel freealut.spec,1.14,1.15
Message-ID: <20090811180852.16B6D11C00D7@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/pkgs/rpms/freealut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17676

Modified Files:
	freealut.spec 
Log Message:
Build agains openal-soft


Index: freealut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freealut/devel/freealut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- freealut.spec	24 Jul 2009 23:05:46 -0000	1.14
+++ freealut.spec	11 Aug 2009 18:08:51 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           freealut
 Version:        1.1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Implementation of OpenAL's ALUT standard
 
 Group:          System Environment/Libraries
@@ -11,7 +11,7 @@ Patch0:         freealut-openal.patch
 Patch1:         freealut-multiarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  openal-devel
+BuildRequires:  openal-soft-devel
 BuildRequires:  libtool
 
 %description
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/freealut.pc
 
 %changelog
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.1.0-10
+- Build agains openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From fkooman at fedoraproject.org  Tue Aug 11 18:14:59 2009
From: fkooman at fedoraproject.org (=?utf-8?q?Fran=C3=A7ois_Kooman?=)
Date: Tue, 11 Aug 2009 18:14:59 +0000 (UTC)
Subject: rpms/dumpasn1/devel .cvsignore, 1.4, 1.5 dumpasn1.spec, 1.14,
	1.15 sources, 1.11, 1.12 change_byte_to_char.diff, 1.1, NONE
Message-ID: <20090811181459.9ED1611C00D7@cvs1.fedora.phx.redhat.com>

Author: fkooman

Update of /cvs/pkgs/rpms/dumpasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19291

Modified Files:
	.cvsignore dumpasn1.spec sources 
Removed Files:
	change_byte_to_char.diff 
Log Message:
* Tue Aug 11 2009 Fran?ois Kooman <fkooman at tuxed.net> - 20090318-4
- upstream changed source file in place, update
- remove patch which is no longer required




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Aug 2008 09:56:33 -0000	1.4
+++ .cvsignore	11 Aug 2009 18:14:59 -0000	1.5
@@ -1,2 +1,3 @@
 dumpasn1.c
 dumpasn1.cfg
+dumpasn1.1


Index: dumpasn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/dumpasn1.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dumpasn1.spec	24 Jul 2009 20:38:04 -0000	1.14
+++ dumpasn1.spec	11 Aug 2009 18:14:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           dumpasn1
 Version:        20090318
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ASN.1 object dump utility
 
 Group:          Development/Tools
@@ -12,9 +12,6 @@ Source0:        http://www.cs.auckland.a
 Source1:        http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg
 # man page extracted from http://ftp.debian.org/debian/pool/main/d/dumpasn1/dumpasn1_20030222-1.diff.gz
 Source2:        dumpasn1.1
-# somehow "char" got replaced by "BYTE" in 20090318, reverting back to char 
-# makes it compile again, probably because of wide char support
-Patch0:         change_byte_to_char.diff 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -28,7 +25,6 @@ formats.
 %prep
 %setup -q -c -T
 install -pm 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} .
-%patch0
 sed -i -e 's|/etc/dumpasn1/|%{_sysconfdir}/dumpasn1/|' dumpasn1.{c,1}
 
 %build
@@ -55,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Fran?ois Kooman <fkooman at tuxed.net> - 20090318-4
+- upstream changed source file in place, update
+- remove patch which is no longer required
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090318-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dumpasn1/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Jul 2009 18:01:40 -0000	1.11
+++ sources	11 Aug 2009 18:14:59 -0000	1.12
@@ -1,2 +1,3 @@
-b25f4feca205915b4ba3587b9355d47c  dumpasn1.c
+3b8a1eb0d30d422817be0f38bdb271c6  dumpasn1.c
 81a057e27e8584001d93d2852dc4f096  dumpasn1.cfg
+ed16a714c3abe387122c6870f1c8aa49  dumpasn1.1


--- change_byte_to_char.diff DELETED ---



From s4504kr at fedoraproject.org  Tue Aug 11 18:17:32 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 11 Aug 2009 18:17:32 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.123,1.124
Message-ID: <20090811181732.5BDF611C00D7@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19822

Modified Files:
	blender.spec 
Log Message:
Build agains new freealut release


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- blender.spec	3 Aug 2009 17:49:47 -0000	1.123
+++ blender.spec	11 Aug 2009 18:17:32 -0000	1.124
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49a
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -244,6 +244,9 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Tue Aug 11 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.49a-6
+- Build again neu freealut relase (openalut-soft)
+
 * Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-5
 - Revoke using of system FTGL library
 



From mclasen at fedoraproject.org  Tue Aug 11 18:18:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 18:18:11 +0000 (UTC)
Subject: rpms/gtk2/devel set-cursor.patch,NONE,1.1 gtk2.spec,1.393,1.394
Message-ID: <20090811181811.D68C811C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19961

Modified Files:
	gtk2.spec 
Added Files:
	set-cursor.patch 
Log Message:
fix setting root cursors


set-cursor.patch:
 gdkwindow.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE set-cursor.patch ---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 0b8b84b..90ebfc5 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7108,7 +7108,10 @@ gdk_window_set_cursor (GdkWindow *window,
       if (cursor)
 	private->cursor = gdk_cursor_ref (cursor);
 
-      if (_gdk_window_event_parent_of (window, display->pointer_info.window_under_pointer))
+      if (private->window_type == GDK_WINDOW_ROOT ||
+          private->window_type == GDK_WINDOW_FOREIGN)
+        GDK_WINDOW_IMPL_GET_IFACE (private->impl)->set_cursor (window, cursor);
+      else if (_gdk_window_event_parent_of (window, display->pointer_info.window_under_pointer))
 	update_cursor (display);
 
       g_object_notify (G_OBJECT (window), "cursor");


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- gtk2.spec	7 Aug 2009 05:34:22 -0000	1.393
+++ gtk2.spec	11 Aug 2009 18:18:11 -0000	1.394
@@ -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.17/gtk+-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch1: default_printer.patch
 
 Patch2: gdm-background.patch
+Patch3: set-cursor.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -144,6 +145,7 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch1 -p0 -b .default-printer
 %patch2 -p1 -b .gdm-background
+%patch3 -p1 -b .set-cursor
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -388,6 +390,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-6
+- Fix setting root cursors
+
 * Fri Aug  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-5
 - Fix gdm background drawing
 



From akurtakov at fedoraproject.org  Tue Aug 11 18:22:39 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 11 Aug 2009 18:22:39 +0000 (UTC)
Subject: rpms/jdepend/devel jdepend.spec, 1.24, 1.25 sources, 1.3,
	1.4 .cvsignore, 1.4, 1.5
Message-ID: <20090811182239.3FBE711C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jdepend/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20922/devel

Modified Files:
	jdepend.spec sources .cvsignore 
Log Message:
- Update to upstream 2.9.
- Drop gcj support.


Index: jdepend.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jdepend/devel/jdepend.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- jdepend.spec	25 Jul 2009 03:58:47 -0000	1.24
+++ jdepend.spec	11 Aug 2009 18:22:38 -0000	1.25
@@ -28,33 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define section		free
-
 Name:		jdepend
-Version:	2.6
-Release:	9.4%{?dist}
+Version:	2.9
+Release:	1%{?dist}
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        BSD
-Url:            http://www.clarkware.com/
+URL:            http://www.clarkware.com/
 Group:          Development/Libraries/Java
-Source0:        %{url}software/%{name}-%{version}-RHCLEAN.zip
+Source0:        %{url}software/%{name}-%{version}.zip
 BuildRequires:  ant
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 JDepend traverses a set of Java class and source file directories and
 generates design quality metrics for each Java package. JDepend allows
@@ -94,69 +80,37 @@ ant jar javadoc
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-rm -rf docs/api
+cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm -rf build/docs/api
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
-fi
-
-
 %files
 %defattr(-,root,root)
 %doc README LICENSE docs
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jdepend-2.6.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Tue Aug 11 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.9-1
+- Update to upstream 2.9.
+- Drop gcj support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.6-9.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jdepend/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jun 2005 08:40:04 -0000	1.3
+++ sources	11 Aug 2009 18:22:39 -0000	1.4
@@ -1 +1 @@
-e1e40d1ac2de67c46f9a4f8ef4652cf5  jdepend-2.6-RHCLEAN.zip
+4e979c0dda766ba1dd719905ca975c7b  jdepend-2.9.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jdepend/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 08:40:04 -0000	1.4
+++ .cvsignore	11 Aug 2009 18:22:39 -0000	1.5
@@ -3,3 +3,4 @@ jdepend-2.6
 noarch
 *.src.rpm
 
+jdepend-2.9.zip



From clumens at fedoraproject.org  Tue Aug 11 18:24:17 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue, 11 Aug 2009 18:24:17 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.112, 1.113 pykickstart.spec,
	1.123, 1.124 sources, 1.122, 1.123
Message-ID: <20090811182417.BFC8911C00D7@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21400

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- .cvsignore	29 Jul 2009 02:58:58 -0000	1.112
+++ .cvsignore	11 Aug 2009 18:24:17 -0000	1.113
@@ -46,3 +46,4 @@ pykickstart-1.56.tar.gz
 pykickstart-1.57.tar.gz
 pykickstart-1.58.tar.gz
 pykickstart-1.59.tar.gz
+pykickstart-1.60.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- pykickstart.spec	29 Jul 2009 02:58:58 -0000	1.123
+++ pykickstart.spec	11 Aug 2009 18:24:17 -0000	1.124
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.59
+Version: 1.60
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Tue Aug 11 2009 Chris Lumens <clumens at redhat.com> - 1.60-1
+- Put quotes around the repo's name (Marc.Herbert at gmail.com).
+- Make duplicate entries warnings, not errors (#516338).
+
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> - 1.59-1
 - Handle a few more places where a urlgrabber error could happen (#512951).
 - Error out if the same partition/repo/network is defined twice (#512956).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	29 Jul 2009 02:58:58 -0000	1.122
+++ sources	11 Aug 2009 18:24:17 -0000	1.123
@@ -1 +1 @@
-635c391a8f5bf1e781f101311db76990  pykickstart-1.59.tar.gz
+5115b52ffcf6038ac13afa970187384d  pykickstart-1.60.tar.gz



From sseago at fedoraproject.org  Tue Aug 11 18:25:58 2009
From: sseago at fedoraproject.org (Scott Seago)
Date: Tue, 11 Aug 2009 18:25:58 +0000 (UTC)
Subject: rpms/ovirt-server/F-11 ovirt-server.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090811182558.2913511C00D7@cvs1.fedora.phx.redhat.com>

Author: sseago

Update of /cvs/pkgs/rpms/ovirt-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21724

Modified Files:
	ovirt-server.spec sources 
Log Message:
final 0.100 upstream release


Index: ovirt-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovirt-server/F-11/ovirt-server.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ovirt-server.spec	27 Jul 2009 13:57:27 -0000	1.2
+++ ovirt-server.spec	11 Aug 2009 18:25:57 -0000	1.3
@@ -5,10 +5,8 @@
 Summary: The oVirt Server Suite
 Name: ovirt-server
 Version: 0.100
-Release: 3%{?dist}%{?extra_release}
-# full source URL will be added with the next oVirt release. This is a pre-release
-# code drop to make sure we get the package approved by f12 feature freeze.
-Source0: %{name}-%{version}.tar.gz
+Release: 4%{?dist}%{?extra_release}
+Source0: http://ovirt.org/files/%{name}-%{version}.tar.gz
 #Entire source code is GPL except for vendor/plugins/will_paginate and
 #vendor/plugins/betternestedset, which are MIT, and
 #public/javascripts/jquery.*, which is both MIT and GPL, and
@@ -152,6 +150,7 @@ touch %{buildroot}%{_localstatedir}/log/
 %{__cp} -a %{pbuild}/scripts/ovirt-vm2node %{buildroot}%{_bindir}
 %{__cp} -a %{pbuild}/scripts/ovirt-reindex-search %{buildroot}%{_sbindir}
 %{__cp} -a %{pbuild}/scripts/ovirt-update-search %{buildroot}%{_sbindir}
+%{__cp} -a %{pbuild}/scripts/ovirt_ctl %{buildroot}%{_sbindir}
 %{__rm} -rf %{buildroot}%{app_root}/tmp
 %{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp
 %{__ln_s} %{_localstatedir}/lib/%{name}/tmp %{buildroot}%{app_root}/tmp
@@ -225,6 +224,7 @@ fi
 %{_sbindir}/ovirt-update-search
 %{_bindir}/ovirt-add-host
 %{_bindir}/ovirt-vm2node
+%{_sbindir}/ovirt_ctl
 %{_initrddir}/ovirt-host-browser
 %{_initrddir}/ovirt-host-register
 %{_initrddir}/ovirt-db-omatic
@@ -262,6 +262,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Scott Seago <sseago at redhat.com> - 0.100-4
+- Final 0.100 upstream release
+
 * Mon Jul 27 2009 Scott Seago <sseago at redhat.com> - 0.100-3
 - Removed ovirt-docs dep
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovirt-server/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 18:16:33 -0000	1.2
+++ sources	11 Aug 2009 18:25:57 -0000	1.3
@@ -1 +1 @@
-1528b87eaa393fa87d459d076c96c853  ovirt-server-0.100.tar.gz
+9c6f0866c4c685d4beb784922119ba68  ovirt-server-0.100.tar.gz



From ajax at fedoraproject.org  Tue Aug 11 18:27:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 11 Aug 2009 18:27:34 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel make-git-snapshot.sh, 1.8,
	1.9 xorg-x11-server.spec, 1.469,
	1.470 xserver-1.6.99-show-ugly-cursor.patch, 1.1, NONE
Message-ID: <20090811182734.B161E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22096

Modified Files:
	make-git-snapshot.sh xorg-x11-server.spec 
Removed Files:
	xserver-1.6.99-show-ugly-cursor.patch 
Log Message:
* Tue Aug 11 2009 Adam Jackson <ajax at redhat.com> 1.6.99-33.20090807
- xserver-1.6.99-show-ugly-cursor.patch: Drop, gtk bug found.



Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/make-git-snapshot.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- make-git-snapshot.sh	19 Jun 2009 07:03:32 -0000	1.8
+++ make-git-snapshot.sh	11 Aug 2009 18:27:34 -0000	1.9
@@ -13,5 +13,5 @@ fi
 git log | head -1 | awk '{ print $2 }' > ../commitid
 git repack -a -d
 cd ..
-tar jcf $DIRNAME.tar.bz2 $DIRNAME
+tar cf - $DIRNAME | xz -c9 > $DIRNAME.tar.xz
 rm -rf $DIRNAME


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -p -r1.469 -r1.470
--- xorg-x11-server.spec	11 Aug 2009 04:13:12 -0000	1.469
+++ xorg-x11-server.spec	11 Aug 2009 18:27:34 -0000	1.470
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   32.%{gitdate}%{?dist}
+Release:   33.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -83,9 +83,6 @@ Patch6029: xserver-1.6.1-proc-cmdline.pa
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
-# ajax, please fix me
-Patch9000: xserver-1.6.99-show-ugly-cursor.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -511,6 +508,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Aug 11 2009 Adam Jackson <ajax at redhat.com> 1.6.99-33.20090807
+- xserver-1.6.99-show-ugly-cursor.patch: Drop, gtk bug found.
+
 * Tue Aug 11 2009 Dave Airlie <airlied at redhat.com> 1.6.99-32.20090807
 - update to latest -git for EXA fixes
 


--- xserver-1.6.99-show-ugly-cursor.patch DELETED ---



From clumens at fedoraproject.org  Tue Aug 11 18:27:49 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue, 11 Aug 2009 18:27:49 +0000 (UTC)
Subject: rpms/firstboot/devel .cvsignore, 1.99, 1.100 firstboot.spec, 1.135, 
	1.136 sources, 1.129, 1.130
Message-ID: <20090811182749.70E9211C00D7@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22203

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore	29 Jul 2009 03:28:16 -0000	1.99
+++ .cvsignore	11 Aug 2009 18:27:49 -0000	1.100
@@ -71,3 +71,4 @@ firstboot-1.103.tar.bz2
 firstboot-1.104.tar.bz2
 firstboot-1.105.tar.bz2
 firstboot-1.107.tar.bz2
+firstboot-1.108.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- firstboot.spec	29 Jul 2009 03:28:16 -0000	1.135
+++ firstboot.spec	11 Aug 2009 18:27:49 -0000	1.136
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 1.107
+Version: 1.108
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -16,9 +16,11 @@ ExclusiveOS: Linux
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: python-devel, python-setuptools-devel
-Requires: metacity, pygtk2, rhpl, python
+Requires: metacity, pygtk2, python
 Requires: setuptool, libuser-python, system-config-users, system-config-date
 Requires: authconfig-gtk, python-meh
+Requires: system-config-keyboard
+Requires: python-ethtool
 Requires(post): chkconfig
 
 %define debug_package %{nil}
@@ -71,6 +73,12 @@ fi
 %{_datadir}/firstboot/themes/default/*
 
 %changelog
+* Tue Aug 11 2009 Chris Lumens <clumens at redhat.com> 1.108-1
+- Move python-meh initialization to after we have gtk imported (#515419).
+- Do @VERSION@ substitution on progs/firstboot.
+- Switch to using system-config-keyboard for the keyboard bits (katzj).
+- Stop using rhpl.ethtool (katzj).
+
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> 1.107-1
 - Convert to using python-meh.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	29 Jul 2009 03:28:16 -0000	1.129
+++ sources	11 Aug 2009 18:27:49 -0000	1.130
@@ -1 +1 @@
-071afbd2d63204a2c5aa8fbbf5407f8f  firstboot-1.107.tar.bz2
+335f9855f49de44300f64f8482dc0e9a  firstboot-1.108.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 11 18:29:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 11 Aug 2009 18:29:17 +0000 (UTC)
Subject: rpms/gtk2/devel set-cursor.patch,1.1,1.2
Message-ID: <20090811182917.066F111C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22463

Modified Files:
	set-cursor.patch 
Log Message:
fix patch


set-cursor.patch:
 gdkwindow.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: set-cursor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/set-cursor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- set-cursor.patch	11 Aug 2009 18:18:11 -0000	1.1
+++ set-cursor.patch	11 Aug 2009 18:29:16 -0000	1.2
@@ -1,8 +1,7 @@
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index 0b8b84b..90ebfc5 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -7108,7 +7108,10 @@ gdk_window_set_cursor (GdkWindow *window,
+diff -up gtk+-2.17.6/gdk/gdkwindow.c.set-cursor gtk+-2.17.6/gdk/gdkwindow.c
+--- gtk+-2.17.6/gdk/gdkwindow.c.set-cursor	2009-08-11 14:26:41.041772299 -0400
++++ gtk+-2.17.6/gdk/gdkwindow.c	2009-08-11 14:27:40.703522466 -0400
+@@ -6982,7 +6982,10 @@ gdk_window_set_cursor (GdkWindow *window
        if (cursor)
  	private->cursor = gdk_cursor_ref (cursor);
  
@@ -12,5 +11,5 @@ index 0b8b84b..90ebfc5 100644
 +        GDK_WINDOW_IMPL_GET_IFACE (private->impl)->set_cursor (window, cursor);
 +      else if (_gdk_window_event_parent_of (window, display->pointer_info.window_under_pointer))
  	update_cursor (display);
- 
-       g_object_notify (G_OBJECT (window), "cursor");
+     }
+ }



From ssp at fedoraproject.org  Tue Aug 11 18:33:04 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Tue, 11 Aug 2009 18:33:04 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.26, 1.27 pixman.spec, 1.41,
	1.42 sources, 1.28, 1.29
Message-ID: <20090811183304.97D8111C00D7@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23098

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
Pixman 0.15.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	10 Aug 2009 15:17:37 -0000	1.26
+++ .cvsignore	11 Aug 2009 18:33:04 -0000	1.27
@@ -1 +1,3 @@
 pixman-0.15.18.tar.bz2
+pixman-0.15.20.tar.gz
+pixman-0.15.20.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- pixman.spec	10 Aug 2009 15:17:37 -0000	1.41
+++ pixman.spec	11 Aug 2009 18:33:04 -0000	1.42
@@ -2,8 +2,8 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.15.18
-Release:        3%{?dist}
+Version:        0.15.20
+Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Mon Aug 11 2009 Soren Sandmann <ssp at redhat.com> - 0.15.20-1
+- pixman 0.15.20
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15.18-3
 - Use bzipped upstream tarball.
 - Fix URL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	10 Aug 2009 15:17:37 -0000	1.28
+++ sources	11 Aug 2009 18:33:04 -0000	1.29
@@ -1 +1,3 @@
 87d256db0440e579f113cd4fb67cbfb0  pixman-0.15.18.tar.bz2
+613c95e7ddc8069b7aa2708f93219b7d  pixman-0.15.20.tar.gz
+8cca7bdf45bd3c31cf95ecea0f05bddc  pixman-0.15.20.tar.bz2



From dwalsh at fedoraproject.org  Tue Aug 11 18:44:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 11 Aug 2009 18:44:15 +0000 (UTC)
Subject: rpms/setools/devel setools.spec,1.93,1.94
Message-ID: <20090811184415.6033411C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25363

Modified Files:
	setools.spec 
Log Message:
* Tue Aug 11 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-4
- Add python bindings for sesearch and seinfo



Index: setools.spec
===================================================================
RCS file: /cvs/extras/rpms/setools/devel/setools.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- setools.spec	11 Aug 2009 17:47:17 -0000	1.93
+++ setools.spec	11 Aug 2009 18:44:15 -0000	1.94
@@ -254,7 +254,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %ifarch x86_64 ppc64 sparc64 s390x
 %{pkg_py_arch}/
 %endif
-%{python_sitearch}/sesearch*.egg-info
+%{python_sitearch}/setools*.egg-info
 
 %files libs-java
 %defattr(-,root,root,-)



From myoung at fedoraproject.org  Tue Aug 11 18:55:24 2009
From: myoung at fedoraproject.org (myoung)
Date: Tue, 11 Aug 2009 18:55:24 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.8.6.14, 1.8.6.15 kernel.spec,
	1.1294.2.47, 1.1294.2.48 xen.pvops.patch, 1.1.2.30, 1.1.2.31
Message-ID: <20090811185524.1AC1211C00D7@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26682

Modified Files:
      Tag: private-myoung-dom0-branch
	drm-nouveau.patch kernel.spec xen.pvops.patch 
Log Message:
Apply pvops update from rebase/master


drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   30 
 drivers/gpu/drm/Makefile                    |    1 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5053 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  227 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  573 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  622 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  515 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  593 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   57 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   92 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  161 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  146 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  370 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1131 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   53 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  971 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  754 
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1018 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  431 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  246 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  116 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1143 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_display.c      |  250 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  291 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_output.c       |  797 +
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  819 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  284 
 drivers/gpu/drm/nouveau/nv50_display.c      |  849 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  264 
 drivers/gpu/drm/nouveau/nvreg.h             |  503 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/nouveau_drm.h                   |  214 
 75 files changed, 54082 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.14 -r 1.8.6.15 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.14
retrieving revision 1.8.6.15
diff -u -p -r1.8.6.14 -r1.8.6.15
--- drm-nouveau.patch	5 Aug 2009 23:00:12 -0000	1.8.6.14
+++ drm-nouveau.patch	11 Aug 2009 18:55:08 -0000	1.8.6.15
@@ -105,7 +105,7 @@ index 6246e3f..436e2fe 100644
  		if (map->type == _DRM_REGISTERS)
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..a04127f
+index 0000000..2ba1e45
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,27 @@
@@ -114,7 +114,7 @@ index 0000000..a04127f
 +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 +
 +ccflags-y := -Iinclude/drm
-+nouveau-y := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
++nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
 +             nouveau_object.o nouveau_irq.o nouveau_notifier.o \
 +             nouveau_sgdma.o nouveau_dma.o \
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
@@ -299,10 +299,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..defc0c8
+index 0000000..c828c2e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5056 @@
+@@ -0,0 +1,5053 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -3511,9 +3511,6 @@ index 0000000..defc0c8
 +	return 0;
 +}
 +
-+extern int nouveau_uscript_lvds;
-+extern int nouveau_uscript_tmds;
-+
 +int
 +nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent,
 +			       int pxclk)
@@ -5594,10 +5591,10 @@ index 0000000..24fc305
 +#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..d59ffc4
+index 0000000..a7b2a61
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -0,0 +1,557 @@
+@@ -0,0 +1,573 @@
 +/*
 + * Copyright 2007 Dave Airlied
 + * All Rights Reserved.
@@ -5672,6 +5669,22 @@ index 0000000..d59ffc4
 +	if (!nvbo->mappable && (flags & TTM_PL_FLAG_VRAM))
 +		flags |= TTM_PL_FLAG_PRIV0;
 +
++	/* Some of the tile_flags have a periodic structure of 24*4096 bytes, 
++	 * align to to that as well as the page size. Overallocate memory to 
++	 * avoid corruption of other buffer objects.
++	 */
++	switch (tile_flags) {
++		case 0x1800:
++		case 0x2800:
++		case 0x4800:
++		case 0x7a00:
++			size += 6*4096;
++			align = 2*24*4096;
++			break;
++		default:
++			break;
++	}
++
 +	align >>= PAGE_SHIFT;
 +
 +	size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1);
@@ -6783,12 +6796,533 @@ index 0000000..e2b78d2
 +
 +	return outclk;
 +}
+diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
+new file mode 100644
+index 0000000..2429c7f
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
+@@ -0,0 +1,515 @@
++/*
++ * Copyright 2005-2006 Stephane Marchesin
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the next
++ * paragraph) shall be included in all copies or substantial portions of the
++ * Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#include "drmP.h"
++#include "drm.h"
++#include "nouveau_drv.h"
++#include "nouveau_drm.h"
++#include "nouveau_dma.h"
++
++static int
++nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
++{
++	struct drm_device *dev = chan->dev;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nouveau_bo *pb = chan->pushbuf_bo;
++	struct nouveau_gpuobj *pushbuf = NULL;
++	uint32_t start = pb->bo.mem.mm_node->start << PAGE_SHIFT;
++	uint32_t size = pb->bo.mem.size;
++	int ret;
++
++	if (pb->bo.mem.mem_type == TTM_PL_TT) {
++		ret = nouveau_gpuobj_gart_dma_new(chan, start, size,
++						  NV_DMA_ACCESS_RO,
++						  &pushbuf,
++						  &chan->pushbuf_base);
++	} else
++	if (dev_priv->card_type != NV_04) {
++		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
++					     start, size, NV_DMA_ACCESS_RO,
++					     NV_DMA_TARGET_VIDMEM, &pushbuf);
++		chan->pushbuf_base = 0;
++	} else {
++		/* NV04 cmdbuf hack, from original ddx.. not sure of it's
++		 * exact reason for existing :)  PCI access to cmdbuf in
++		 * VRAM.
++		 */
++		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
++					     start +
++					       drm_get_resource_start(dev, 1),
++					     size, NV_DMA_ACCESS_RO,
++					     NV_DMA_TARGET_PCI, &pushbuf);
++		chan->pushbuf_base = 0;
++	}
++
++	ret = nouveau_gpuobj_ref_add(dev, chan, 0, pushbuf, &chan->pushbuf);
++	if (ret) {
++		NV_ERROR(dev, "Error referencing pushbuf ctxdma: %d\n", ret);
++		if (pushbuf != dev_priv->gart_info.sg_ctxdma)
++			nouveau_gpuobj_del(dev, &pushbuf);
++		return ret;
++	}
++
++	return 0;
++}
++
++static struct nouveau_bo *
++nouveau_channel_user_pushbuf_alloc(struct drm_device *dev)
++{
++	struct nouveau_bo *pushbuf = NULL;
++	int location, ret;
++
++	if (nouveau_vram_pushbuf)
++		location = TTM_PL_FLAG_VRAM;
++	else
++		location = TTM_PL_FLAG_TT;
++
++	ret = nouveau_bo_new(dev, NULL, 65536, 0, location, 0, 0x0000, false,
++			     true, &pushbuf);
++	if (ret) {
++		NV_ERROR(dev, "error allocating DMA push buffer: %d\n", ret);
++		return NULL;
++	}
++
++	ret = nouveau_bo_pin(pushbuf, location);
++	if (ret) {
++		NV_ERROR(dev, "error pinning DMA push buffer: %d\n", ret);
++		nouveau_bo_ref(NULL, &pushbuf);
++		return NULL;
++	}
++
++	return pushbuf;
++}
++
++/* allocates and initializes a fifo for user space consumption */
[...2820 lines suppressed...]
 +	nv_wo32(dev, ctx, (0x2744/4)+9, 0xbf800000);
 +
-+/*
-+write32 #1 block at +0x00742e34 NV_PRAMIN.GRCTX0+0x2714 of 4 (0x4) elements:
-++0x00742e34: 00000000 3f800000 00000000 00000000
-+*/
 +	nv_wo32(dev, ctx, (0x2714/4)+1, 0x3f800000);
 +
-+/*
-+write32 #1 block at +0x00742e94 NV_PRAMIN.GRCTX0+0x2774 of 4 (0x4) elements:
-++0x00742e94: 00000000 00000000 00000000 00000000
-+write32 #1 block at +0x00743804 NV_PRAMIN.GRCTX0+0x30e4 of 4 (0x4) elements:
-++0x00743804: 00000000 00000000 00000000 00000000
-+write32 #1 block at +0x007437a4 NV_PRAMIN.GRCTX0+0x3084 of 8 (0x8) elements:
-++0x007437a4: 00000000 00000000 000fe000 00000000 00000000 00000000 00000000 00000000
-+*/
 +	nv_wo32(dev, ctx, (0x3084/4)+2, 0x000fe000);
 +
-+/*
-+write32 #1 block at +0x007437d4 NV_PRAMIN.GRCTX0+0x30b4 of 4 (0x4) elements:
-++0x007437d4: 00000000 00000000 00000000 00000000
-+write32 #1 block at +0x00743824 NV_PRAMIN.GRCTX0+0x3104 of 4 (0x4) elements:
-++0x00743824: 00000000 000003f8 00000000 00000000
-+*/
 +	nv_wo32(dev, ctx, (0x3104/4)+1, 0x000003f8);
 +
-+/* write32 #1 NV_PRAMIN.GRCTX0+0x3468 <- 0x002fe000 */
 +	nv_wo32(dev, ctx, 0x3468/4, 0x002fe000);
 +
-+/*
-+write32 #1 block at +0x00743ba4 NV_PRAMIN.GRCTX0+0x3484 of 8 (0x8) elements:
-++0x00743ba4: 001c527c 001c527c 001c527c 001c527c 001c527c 001c527c 001c527c 001c527c
-+*/
 +	for (i=0; i<8; ++i)
 +		nv_wo32(dev, ctx, (0x3484/4)+i, 0x001c527c);
 +}
@@ -24799,27 +24636,6 @@ index 0000000..3a1b9e6
 +		nv_wr32(dev, 0x400754, nv_rd32(dev, NV04_PFB_CFG1));
 +	}
 +
-+#if 0
-+	nv_wr32(dev, 0x400820, 0);
-+	nv_wr32(dev, 0x400824, 0);
-+	nv_wr32(dev, 0x400864, vramsz-1);
-+	nv_wr32(dev, 0x400868, vramsz-1);
-+
-+	nv_wr32(dev, 0x400B20, 0x00000000);
-+	nv_wr32(dev, 0x400B04, 0xFFFFFFFF);
-+
-+	/* per-context state, doesn't belong here */
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) & 0x0007ff00;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+	tmp = nv_rd32(dev, NV10_PGRAPH_SURFACE) | 0x00020100;
-+	nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
-+
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMIN, 0);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_XMAX, 0x7fff);
-+	nv_wr32(dev, NV03_PGRAPH_ABS_UCLIP_YMAX, 0x7fff);
-+#endif
-+
 +	return 0;
 +}
 +
@@ -24934,10 +24750,10 @@ index 0000000..fae4246
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/nv40_fifo.c
 new file mode 100644
-index 0000000..61b7832
+index 0000000..6b5fdcc
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv40_fifo.c
-@@ -0,0 +1,222 @@
+@@ -0,0 +1,223 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -25154,7 +24970,8 @@ index 0000000..61b7832
 +{
 +	int ret;
 +
-+	if ((ret = nouveau_fifo_init(dev)))
++	ret = nv04_fifo_init(dev);
++	if (ret)
 +		return ret;
 +
 +	nv_wr32(dev, NV04_PFIFO_DMA_TIMESLICE, 0x2101ffff);
@@ -27415,10 +27232,10 @@ index 0000000..2a3495e
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..b169f9b
+index 0000000..99f24a3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,811 @@
+@@ -0,0 +1,819 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -27519,7 +27336,7 @@ index 0000000..b169f9b
 +	struct drm_device *dev = crtc->base.dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_channel *evo = dev_priv->evo;
-+	int index = crtc->index;
++	int index = crtc->index, ret;
 +
 +	NV_DEBUG(dev, "index %d\n", crtc->index);
 +	NV_DEBUG(dev, "%s\n", blanked ? "blanked" : "unblanked");
@@ -27527,7 +27344,11 @@ index 0000000..b169f9b
 +	if (blanked) {
 +		crtc->cursor.hide(crtc, false);
 +
-+		RING_SPACE(evo, dev_priv->chipset != 0x50 ? 7 : 5);
++		ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 7 : 5);
++		if (ret) {
++			NV_ERROR(dev, "no space while blanking crtc\n");
++			return ret;
++		}
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, CLUT_MODE), 2);
 +		OUT_RING  (evo, NV50_EVO_CRTC_CLUT_MODE_BLANK);
 +		OUT_RING  (evo, 0);
@@ -27545,7 +27366,11 @@ index 0000000..b169f9b
 +		else
 +			crtc->cursor.hide(crtc, false);
 +
-+		RING_SPACE(evo, dev_priv->chipset != 0x50 ? 10 : 8);
++		ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 10 : 8);
++		if (ret) {
++			NV_ERROR(dev, "no space while unblanking crtc\n");
++			return ret;
++		}
 +		BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, CLUT_MODE), 2);
 +		OUT_RING  (evo, crtc->lut.depth == 8 ?
 +				NV50_EVO_CRTC_CLUT_MODE_OFF :
@@ -28232,10 +28057,10 @@ index 0000000..b169f9b
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
 new file mode 100644
-index 0000000..a3bed39
+index 0000000..0ef825e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,151 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -28279,7 +28104,7 @@ index 0000000..a3bed39
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 4 : 2);
++	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 4 : 2) + update * 2);
 +	if (ret) {
 +		NV_ERROR(dev, "no space while unhiding cursor\n");
 +		return;
@@ -28293,7 +28118,6 @@ index 0000000..a3bed39
 +	OUT_RING  (evo, NV50_EVO_CRTC_CURSOR_CTRL_SHOW);
 +
 +	if (update) {
-+		RING_SPACE(evo, 2);
 +		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
 +		OUT_RING  (evo, 0);
 +		FIRE_RING (evo);
@@ -28311,7 +28135,7 @@ index 0000000..a3bed39
 +
 +	NV_DEBUG(dev, "\n");
 +
-+	ret = RING_SPACE(evo, dev_priv->chipset != 0x50 ? 4 : 2);
++	ret = RING_SPACE(evo, (dev_priv->chipset != 0x50 ? 4 : 2) + update * 2);
 +	if (ret) {
 +		NV_ERROR(dev, "no space while hiding cursor\n");
 +		return;
@@ -28324,7 +28148,6 @@ index 0000000..a3bed39
 +	}
 +
 +	if (update) {
-+		RING_SPACE(evo, 2);
 +		BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
 +		OUT_RING  (evo, 0);
 +		FIRE_RING (evo);
@@ -29969,7 +29792,7 @@ index 0000000..d7af9ed
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..071a2f3
+index 0000000..c4c45f2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
 @@ -0,0 +1,475 @@
@@ -30251,7 +30074,7 @@ index 0000000..071a2f3
 +	nv_wo32(dev, ramfc, 0x10/4, chan->pushbuf_base);
 +	nv_wo32(dev, ramfc, 0x48/4, chan->pushbuf->instance >> 4);
 +	nv_wo32(dev, ramfc, 0x80/4, (0xc << 24) | (chan->ramht->instance >> 4));
-+	nv_wo32(dev, ramfc, 0x3c/4, 0x000f0078); /* fetch? */
++	nv_wo32(dev, ramfc, 0x3c/4, 0x00086078);
 +	nv_wo32(dev, ramfc, 0x44/4, 0x2101ffff);
 +	nv_wo32(dev, ramfc, 0x60/4, 0x7fffffff);
 +	nv_wo32(dev, ramfc, 0x40/4, 0x00000000);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.47
retrieving revision 1.1294.2.48
diff -u -p -r1.1294.2.47 -r1.1294.2.48
--- kernel.spec	10 Aug 2009 21:22:18 -0000	1.1294.2.47
+++ kernel.spec	11 Aug 2009 18:55:10 -0000	1.1294.2.48
@@ -1989,6 +1989,14 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Michael Young <m.a.young at durham.ac.uk>
+- CONFIG_CC_STACKPROTECTOR was probably innocent but leave it off
+  a bit longer just in case
+- add rebase/master update
+
+* Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: various cleanups and fixes + more sanity checking in dma paths
+
 * Mon Aug 10 2009 Michael Young <m.a.young at durham.ac.uk>
 - disable CONFIG_CC_STACKPROTECTOR for x86_64 again (the workaround
   needs revising)

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   36 
 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            |   34 
 arch/x86/include/asm/xen/pci.h             |   13 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   37 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    4 
 arch/x86/xen/apic.c                        |   60 +
 arch/x86/xen/enlighten.c                   |   63 +
 arch/x86/xen/mmu.c                         |  475 ++++++++-
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |   86 +
 arch/x86/xen/setup.c                       |   62 +
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/pci.h                          |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   32 
 drivers/xen/Makefile                       |   18 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  155 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  315 +++++-
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/pci.h                        |    6 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   21 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 128 files changed, 9928 insertions(+), 1309 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -p -r1.1.2.30 -r1.1.2.31
--- xen.pvops.patch	8 Aug 2009 18:06:04 -0000	1.1.2.30
+++ xen.pvops.patch	11 Aug 2009 18:55:10 -0000	1.1.2.31
@@ -2612,10 +2612,10 @@ index 9371448..4cb6bbd 100644
  		microcode_ops = init_amd_microcode();
 diff --git a/arch/x86/kernel/microcode_xen.c b/arch/x86/kernel/microcode_xen.c
 new file mode 100644
-index 0000000..ab9d4e1
+index 0000000..397cba1
 --- /dev/null
 +++ b/arch/x86/kernel/microcode_xen.c
-@@ -0,0 +1,195 @@
+@@ -0,0 +1,200 @@
 +/*
 + * Xen microcode update driver
 + *
@@ -2684,14 +2684,19 @@ index 0000000..ab9d4e1
 +	size_t size;
 +	int err;
 +
-+	if (c->x86_vendor == X86_VENDOR_INTEL) {
-+		BUG_ON(cpu != raw_smp_processor_id());
++	switch (c->x86_vendor) {
++	case X86_VENDOR_INTEL:
 +		snprintf(name, sizeof(name), "intel-ucode/%02x-%02x-%02x",
 +			 c->x86, c->x86_model, c->x86_mask);
-+	} else if (c->x86_vendor == X86_VENDOR_AMD) {
++		break;
++
++	case X86_VENDOR_AMD:
 +		snprintf(name, sizeof(name), "amd-ucode/microcode_amd.bin");
-+	} else
++		break;
++
++	default:
 +		return UCODE_NFOUND;
++	}
 +
 +	err = request_firmware(&firmware, name, device);
 +	if (err) {



From victorv at fedoraproject.org  Tue Aug 11 19:02:44 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Tue, 11 Aug 2009 19:02:44 +0000 (UTC)
Subject: rpms/netbeans-svnclientadapter/devel import.log, 1.2,
	1.3 netbeans-svnclientadapter.spec, 1.5,
	1.6 svnClientAdapter-1.6.0-build.patch, 1.1, 1.2
Message-ID: <20090811190244.6D13911C00D7@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-svnclientadapter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27741/devel

Modified Files:
	import.log netbeans-svnclientadapter.spec 
	svnClientAdapter-1.6.0-build.patch 
Log Message:
Fix the svn-javahl.jar name and its location by the new patch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Aug 2009 14:42:20 -0000	1.2
+++ import.log	11 Aug 2009 19:02:44 -0000	1.3
@@ -1,2 +1,3 @@
 netbeans-svnclientadapter-6_1-3_fc10:HEAD:netbeans-svnclientadapter-6.1-3.fc10.src.rpm:1218543570
 netbeans-svnclientadapter-6_7_1-1_fc12:HEAD:netbeans-svnclientadapter-6.7.1-1.fc12.src.rpm:1250001946
+netbeans-svnclientadapter-6_7_1-2_fc12:HEAD:netbeans-svnclientadapter-6.7.1-2.fc12.src.rpm:1250017628


Index: netbeans-svnclientadapter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/netbeans-svnclientadapter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netbeans-svnclientadapter.spec	11 Aug 2009 14:42:20 -0000	1.5
+++ netbeans-svnclientadapter.spec	11 Aug 2009 19:02:44 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           %{nb_}-svnclientadapter
 Version:        %{nb_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Client Adapter
 
 License:        ASL 2.0
@@ -73,6 +73,8 @@ ant -verbose svnClientAdapter.jar
 %{_javadir}/*
 
 %changelog
+* Tue Aug 11 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-2
+- Fix the svn-javahl.jar name and its location
 * Tue Aug 11 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
 - Adapt version 1.6.0 to NetBeans 6.7.1
 

svnClientAdapter-1.6.0-build.patch:
 build.properties |    8 ++++----
 build.xml        |    6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

Index: svnClientAdapter-1.6.0-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/svnClientAdapter-1.6.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- svnClientAdapter-1.6.0-build.patch	11 Aug 2009 14:42:20 -0000	1.1
+++ svnClientAdapter-1.6.0-build.patch	11 Aug 2009 19:02:44 -0000	1.2
@@ -1,40 +1,61 @@
-diff -Nur -x '*.orig' -x '*~' libnb-svnclientadapter-java-6.7/build.xml libnb-svnclientadapter-java-6.7.new/build.xml
---- libnb-svnclientadapter-java-6.7/build.xml	2009-07-13 13:50:39.000000000 +0400
-+++ libnb-svnclientadapter-java-6.7.new/build.xml	2009-07-13 13:52:01.000000000 +0400
-@@ -32,12 +32,6 @@
+diff -Nur svnClientAdapter-1.6.0/build.properties svnClientAdapter-1.6.0.new/build.properties
+--- svnClientAdapter-1.6.0/build.properties	2007-08-27 18:37:03.000000000 +0400
++++ svnClientAdapter-1.6.0.new/build.properties	2009-08-11 22:50:17.000000000 +0400
+@@ -34,10 +34,10 @@
+ # -----------------------------------------------------------------------------
+ # all jar needed
+ # -----------------------------------------------------------------------------
+-lib.dir=lib
+-svnjavahl.jar=${lib.dir}/svnjavahl.jar
+-svnkit.jar=${lib.dir}/svnkit.jar
+-ganymed.jar=${lib.dir}/ganymed.jar
++lib.dir=/usr/share/java
++svnjavahl.jar=${lib.dir}/svn-javahl.jar
++#svnkit.jar=${lib.dir}/svnkit.jar
++#ganymed.jar=${lib.dir}/ganymed.jar
+ 
+ # -----------------------------------------------------------------------------
+ # JavaHL win32 lib dir
+diff -Nur svnClientAdapter-1.6.0/build.xml svnClientAdapter-1.6.0.new/build.xml
+--- svnClientAdapter-1.6.0/build.xml	2007-08-27 18:37:03.000000000 +0400
++++ svnClientAdapter-1.6.0.new/build.xml	2009-08-11 20:06:01.000000000 +0400
+@@ -32,12 +32,14 @@
      <depend srcDir="${src.javahl.dir}"
              destDir="${build.classes.dir}"
              cache="${build.cache.dir}"/>
--    <depend srcDir="${src.svnkit.dir}"
--            destDir="${build.classes.dir}"
--            cache="${build.cache.dir}"/>
--    <depend srcDir="${src.cmdline.dir}"
--            destDir="${build.classes.dir}"
--            cache="${build.cache.dir}"/>
++<!--
+     <depend srcDir="${src.svnkit.dir}"
+             destDir="${build.classes.dir}"
+             cache="${build.cache.dir}"/>
+     <depend srcDir="${src.cmdline.dir}"
+             destDir="${build.classes.dir}"
+             cache="${build.cache.dir}"/>
++-->
      <javac srcdir="${src.main.dir}"
             destdir="${build.classes.dir}"
             debug="${debug}"
-@@ -54,22 +48,7 @@
+@@ -54,6 +56,7 @@
+            includes="**"
+ 		   classpathref="project.classpath">
+     </javac>
++<!--
+     <javac srcdir="${src.svnkit.dir}"
+            destdir="${build.classes.dir}"
+            debug="${debug}"
+@@ -62,6 +65,8 @@
+            includes="**"
+ 		   classpathref="project.classpath">
+     </javac>
++-->
++<!--
+     <javac srcdir="${src.cmdline.dir}"
+            destdir="${build.classes.dir}"
+            debug="${debug}"
+@@ -70,6 +75,7 @@
             includes="**"
  		   classpathref="project.classpath">
      </javac>
--    <javac srcdir="${src.svnkit.dir}"
--           destdir="${build.classes.dir}"
--           debug="${debug}"
--		   source="${targetJvm}"    	
--		   target="${targetJvm}"    	
--           includes="**"
--		   classpathref="project.classpath">
--    </javac>
--    <javac srcdir="${src.cmdline.dir}"
--           destdir="${build.classes.dir}"
--           debug="${debug}"
--		   source="${targetJvm}"    	
--		   target="${targetJvm}"    	
--           includes="**"
--		   classpathref="project.classpath">
--    </javac>
-+
++-->
      <copy todir="${build.classes.dir}">
        <fileset dir="${src.main.dir}">
          <exclude name="**/*.java"/>



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:24 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested watchbugzilla
Message-ID: <20090811190425.59F8A10F899@bastion2.fedora.phx.redhat.com>

svahl has requested the watchbugzilla acl on kopete-cryptography (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:34 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested watchcommits
Message-ID: <20090811190434.731C310F8AF@bastion2.fedora.phx.redhat.com>

svahl has requested the watchcommits acl on kopete-cryptography (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:35 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested commit
Message-ID: <20090811190435.D1D5A10F8B7@bastion2.fedora.phx.redhat.com>

svahl has requested the commit acl on kopete-cryptography (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:45 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested watchbugzilla
Message-ID: <20090811190445.890EE10F899@bastion2.fedora.phx.redhat.com>

svahl has requested the watchbugzilla acl on kopete-cryptography (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:47 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested commit
Message-ID: <20090811190447.45DFE10F8C0@bastion2.fedora.phx.redhat.com>

svahl has requested the commit acl on kopete-cryptography (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:51 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested watchcommits
Message-ID: <20090811190451.A021C10F89F@bastion2.fedora.phx.redhat.com>

svahl has requested the watchcommits acl on kopete-cryptography (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:56 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested watchbugzilla
Message-ID: <20090811190456.3C20C10F8C9@bastion2.fedora.phx.redhat.com>

svahl has requested the watchbugzilla acl on kopete-cryptography (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:04:59 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested watchcommits
Message-ID: <20090811190459.A081010F8CF@bastion2.fedora.phx.redhat.com>

svahl has requested the watchcommits acl on kopete-cryptography (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:05:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:05:02 +0000
Subject: [pkgdb] kopete-cryptography: svahl has requested commit
Message-ID: <20090811190502.8580910F8B4@bastion2.fedora.phx.redhat.com>

svahl has requested the commit acl on kopete-cryptography (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:22 +0000
Subject: [pkgdb] skanlite: svahl has requested watchbugzilla
Message-ID: <20090811190822.BBE2B10F89C@bastion2.fedora.phx.redhat.com>

svahl has requested the watchbugzilla acl on skanlite (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:23 +0000
Subject: [pkgdb] skanlite: svahl has requested watchcommits
Message-ID: <20090811190823.4CEBE10F8AF@bastion2.fedora.phx.redhat.com>

svahl has requested the watchcommits acl on skanlite (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:25 +0000
Subject: [pkgdb] skanlite: svahl has requested commit
Message-ID: <20090811190825.3179910F8B5@bastion2.fedora.phx.redhat.com>

svahl has requested the commit acl on skanlite (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From limb at fedoraproject.org  Tue Aug 11 19:08:29 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 11 Aug 2009 19:08:29 +0000 (UTC)
Subject: rpms/ddd/devel ddd.spec,1.14,1.15
Message-ID: <20090811190829.CB7CE11C00D7@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28962

Modified Files:
	ddd.spec 
Log Message:
fix source



Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ddd.spec	24 Jul 2009 20:06:04 -0000	1.14
+++ ddd.spec	11 Aug 2009 19:08:29 -0000	1.15
@@ -1,14 +1,14 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
 Version: 3.3.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Source0: http://dl.sf.net/ddd/ddd-%{version}.tar.gz
 #For rc:
-Source0: ftp://alpha.gnu.org/gnu/ddd/ddd-3.3.12-rc1.tar.gz
+Source0: ftp://alpha.gnu.org/gnu/ddd/ddd-3.3.12.tar.gz
 Source1: ddd.desktop
 Source2: ddd.png
 Patch1: ddd-3.3.11-lang.patch
@@ -100,6 +100,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Tue Aug 10 2009 Jon Ciesla <limb at jcomserv.net> - 3.3.12-4
+- Fix source.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:30 +0000
Subject: [pkgdb] skanlite: svahl has requested watchcommits
Message-ID: <20090811190830.7DE8F10F8B8@bastion2.fedora.phx.redhat.com>

svahl has requested the watchcommits acl on skanlite (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:32 +0000
Subject: [pkgdb] skanlite: svahl has requested commit
Message-ID: <20090811190832.517A010F8BB@bastion2.fedora.phx.redhat.com>

svahl has requested the commit acl on skanlite (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:36 +0000
Subject: [pkgdb] skanlite: svahl has requested watchbugzilla
Message-ID: <20090811190836.37E3C10F8BD@bastion2.fedora.phx.redhat.com>

svahl has requested the watchbugzilla acl on skanlite (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:40 +0000
Subject: [pkgdb] skanlite: svahl has requested watchbugzilla
Message-ID: <20090811190840.58FEE10F8BE@bastion2.fedora.phx.redhat.com>

svahl has requested the watchbugzilla acl on skanlite (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:42 +0000
Subject: [pkgdb] skanlite: svahl has requested watchcommits
Message-ID: <20090811190842.5222E10F8C0@bastion2.fedora.phx.redhat.com>

svahl has requested the watchcommits acl on skanlite (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:08:47 +0000
Subject: [pkgdb] skanlite: svahl has requested commit
Message-ID: <20090811190847.84D0D10F8C1@bastion2.fedora.phx.redhat.com>

svahl has requested the commit acl on skanlite (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From limb at fedoraproject.org  Tue Aug 11 19:14:25 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 11 Aug 2009 19:14:25 +0000 (UTC)
Subject: rpms/ddd/devel ddd.spec,1.15,1.16
Message-ID: <20090811191425.E0D2111C00D7@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30329

Modified Files:
	ddd.spec 
Log Message:
Oops.



Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ddd.spec	11 Aug 2009 19:08:29 -0000	1.15
+++ ddd.spec	11 Aug 2009 19:14:25 -0000	1.16
@@ -41,7 +41,7 @@ manual, extensive help on the Motif user
 interface with full editing, history and completion capabilities.
 
 %prep
-%setup -qn ddd-%{version}-rc1
+%setup -qn ddd-%{version}
 %patch1 -p1 -b .lang
 #%patch2 -p1 -b .xprint
 %patch3 -p1 -b .htmlview



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:43 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191844.07EAA10F89B@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kopete-cryptography (Fedora devel) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:44 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191844.5678410F8B2@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kopete-cryptography (Fedora devel) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:45 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191846.3A07B10F8B9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kopete-cryptography (Fedora devel) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:48 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191849.05DF610F8C0@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kopete-cryptography (Fedora 10) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:49 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191849.47FA910F8C7@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kopete-cryptography (Fedora 10) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:50 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191851.2DD8B10F8CE@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kopete-cryptography (Fedora 10) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:53 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191853.A239510F8D6@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kopete-cryptography (Fedora 11) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:54 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191854.55FF010F8DB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kopete-cryptography (Fedora 11) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From pkgdb at fedoraproject.org  Tue Aug 11 19:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:18:54 +0000
Subject: [pkgdb] kopete-cryptography had acl change status
Message-ID: <20090811191854.7615110F8E2@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kopete-cryptography (Fedora 11) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kopete-cryptography



From kyle at fedoraproject.org  Tue Aug 11 19:20:08 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 11 Aug 2009 19:20:08 +0000 (UTC)
Subject: rpms/kernel/devel config-x86-generic, 1.87,
	1.87.2.1 config-x86_64-generic, 1.89, 1.89.2.1 kernel.spec,
	1.1708, 1.1708.2.1
Message-ID: <20090811192008.AA83411C0489@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31813

Modified Files:
      Tag: private-f12-2_6_31_rc5
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
- private-f12-2_6_31_rc5: Revert LZMA change for alpha.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.87
retrieving revision 1.87.2.1
diff -u -p -r1.87 -r1.87.2.1
--- config-x86-generic	10 Aug 2009 14:21:08 -0000	1.87
+++ config-x86-generic	11 Aug 2009 19:20:08 -0000	1.87.2.1
@@ -1,6 +1,6 @@
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 #
 # Processor type and features


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.89
retrieving revision 1.89.2.1
diff -u -p -r1.89 -r1.89.2.1
--- config-x86_64-generic	10 Aug 2009 14:21:09 -0000	1.89
+++ config-x86_64-generic	11 Aug 2009 19:20:08 -0000	1.89.2.1
@@ -1,6 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_UID16=y
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1708
retrieving revision 1.1708.2.1
diff -u -p -r1.1708 -r1.1708.2.1
--- kernel.spec	10 Aug 2009 15:42:58 -0000	1.1708
+++ kernel.spec	11 Aug 2009 19:20:08 -0000	1.1708.2.1
@@ -1980,6 +1980,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
+- private-f12-2_6_31_rc5: Revert LZMA change for alpha.
+
 * Mon Aug 10 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.145.rc5.git3
 - Merge latest Intel IOMMU fixes and BIOS workarounds, re-enable by default.
 



From limb at fedoraproject.org  Tue Aug 11 19:22:51 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 11 Aug 2009 19:22:51 +0000 (UTC)
Subject: rpms/ddd/devel ddd.spec,1.16,1.17
Message-ID: <20090811192251.689E811C00D7@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32350

Modified Files:
	ddd.spec 
Log Message:
Frack.



Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ddd.spec	11 Aug 2009 19:14:25 -0000	1.16
+++ ddd.spec	11 Aug 2009 19:22:51 -0000	1.17
@@ -88,13 +88,13 @@ touch --no-create %{_datadir}/icons/hico
 %doc INSTALL NEWS PROBLEMS README TIPS doc/ddd-paper.*
 %{_bindir}/ddd
 %{_datadir}/applications/*.desktop
-%dir %{_datadir}/%{name}-%{version}-rc1
-%dir %{_datadir}/%{name}-%{version}-rc1/ddd
-%{_datadir}/%{name}-%{version}-rc1/COPYING
-%{_datadir}/%{name}-%{version}-rc1/NEWS
-%config(noreplace) %{_datadir}/%{name}-%{version}-rc1/ddd/Ddd
-%{_datadir}/%{name}-%{version}-rc1/themes/
-%{_datadir}/%{name}-%{version}-rc1/vsllib/
+%dir %{_datadir}/%{name}-%{version}
+%dir %{_datadir}/%{name}-%{version}/ddd
+%{_datadir}/%{name}-%{version}/COPYING
+%{_datadir}/%{name}-%{version}/NEWS
+%config(noreplace) %{_datadir}/%{name}-%{version}/ddd/Ddd
+%{_datadir}/%{name}-%{version}/themes/
+%{_datadir}/%{name}-%{version}/vsllib/
 %{_datadir}/icons/hicolor/48x48/apps/ddd.png
 %{_infodir}/ddd*
 %{_mandir}/man1/ddd.1*



From bochecha at fedoraproject.org  Tue Aug 11 19:23:46 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Tue, 11 Aug 2009 19:23:46 +0000 (UTC)
Subject: rpms/adonthell/devel .cvsignore, 1.2, 1.3 adonthell.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090811192346.2FB8311C00D7@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/adonthell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32469

Modified Files:
	.cvsignore adonthell.spec sources 
Log Message:
* Tue Aug 11 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.5-0.8
- Upstream changed source URL.
- Added defattr for -doc subpackage.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/adonthell/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Jun 2008 19:35:58 -0000	1.2
+++ .cvsignore	11 Aug 2009 19:23:46 -0000	1.3
@@ -1 +1 @@
-adonthell-0.3.5.tar.gz
+adonthell-src-0.3.5.tar.gz


Index: adonthell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/adonthell/devel/adonthell.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- adonthell.spec	24 Jul 2009 16:36:22 -0000	1.5
+++ adonthell.spec	11 Aug 2009 19:23:46 -0000	1.6
@@ -2,13 +2,13 @@
 
 Name:           adonthell
 Version:        0.3.5
-Release:        0.7%{?dist}
+Release:        0.8%{?dist}
 Summary:        A 2D graphical RPG game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://adonthell.linuxgames.com/
-Source0:        http://download.savannah.gnu.org/releases/adonthell/adonthell-0.3.5.tar.gz
+Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-src-%{version}.tar.gz
 ## Submitted upstream, will be in next release
 # https://savannah.nongnu.org/bugs/index.php?25737
 Patch0:         %{name}-gcc44.patch
@@ -78,10 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %files doc
+%defattr(-,root,root,-)
 %doc doc/devel/html
 
 
 %changelog
+* Tue Aug 11 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.5-0.8
+- Upstream changed source URL.
+- Added defattr for -doc subpackage.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-0.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/adonthell/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jun 2008 19:35:58 -0000	1.2
+++ sources	11 Aug 2009 19:23:46 -0000	1.3
@@ -1 +1 @@
-64a344b1ed8a7808d7adafa337120a00  adonthell-0.3.5.tar.gz
+64a344b1ed8a7808d7adafa337120a00  adonthell-src-0.3.5.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 19:31:33 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 19:31:33 +0000 (UTC)
Subject: rpms/kopete-cryptography/F-10 .cvsignore, 1.3,
	1.4 kopete-cryptography.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090811193133.B3DD811C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kopete-cryptography/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1370/F-10

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 May 2009 15:31:16 -0000	1.3
+++ .cvsignore	11 Aug 2009 19:31:33 -0000	1.4
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.2.3.tar.bz2
+kopete-cryptography-1.3.0-kde4.3.0.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-10/kopete-cryptography.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kopete-cryptography.spec	11 May 2009 15:31:16 -0000	1.5
+++ kopete-cryptography.spec	11 Aug 2009 19:31:33 -0000	1.6
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion 4.2.3
+%define kdeversion 4.3.0
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        9%{?dist}
+Release:        12%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -78,6 +78,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.3.0-12
+- 1.3.0-kde4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-10
+- 1.3.0-kde4.2.4
+
 * Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-9
 - 1.3.0-kde4.2.3
 - cleanup docdir/HTML ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 May 2009 15:31:16 -0000	1.3
+++ sources	11 Aug 2009 19:31:33 -0000	1.4
@@ -1 +1 @@
-d0b911472504f19a90ac40dbb6786ec7  kopete-cryptography-1.3.0-kde4.2.3.tar.bz2
+ea214f8749208130bde77a18814106bc  kopete-cryptography-1.3.0-kde4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 19:31:33 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 19:31:33 +0000 (UTC)
Subject: rpms/kopete-cryptography/F-11 .cvsignore, 1.4,
	1.5 kopete-cryptography.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090811193133.E398A11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kopete-cryptography/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1370/F-11

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 May 2009 14:53:24 -0000	1.4
+++ .cvsignore	11 Aug 2009 19:31:33 -0000	1.5
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.2.3.tar.bz2
+kopete-cryptography-1.3.0-kde4.3.0.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-11/kopete-cryptography.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kopete-cryptography.spec	11 May 2009 15:14:28 -0000	1.8
+++ kopete-cryptography.spec	11 Aug 2009 19:31:33 -0000	1.9
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion 4.2.3
+%define kdeversion 4.3.0
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        9%{?dist}
+Release:        12%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -78,6 +78,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.3.0-12
+- 1.3.0-kde4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-10
+- 1.3.0-kde4.2.4
+
 * Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-9
 - 1.3.0-kde4.2.3
 - cleanup docdir/HTML ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 May 2009 14:53:24 -0000	1.4
+++ sources	11 Aug 2009 19:31:33 -0000	1.5
@@ -1 +1 @@
-d0b911472504f19a90ac40dbb6786ec7  kopete-cryptography-1.3.0-kde4.2.3.tar.bz2
+ea214f8749208130bde77a18814106bc  kopete-cryptography-1.3.0-kde4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 19:31:34 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 19:31:34 +0000 (UTC)
Subject: rpms/kopete-cryptography/devel .cvsignore, 1.5,
	1.6 kopete-cryptography.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090811193134.1953511C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/kopete-cryptography/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1370/devel

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Jul 2009 01:16:49 -0000	1.5
+++ .cvsignore	11 Aug 2009 19:31:33 -0000	1.6
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.2.4.tar.bz2
+kopete-cryptography-1.3.0-kde4.3.0.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/kopete-cryptography.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kopete-cryptography.spec	25 Jul 2009 04:44:27 -0000	1.10
+++ kopete-cryptography.spec	11 Aug 2009 19:31:33 -0000	1.11
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion 4.2.4
+%define kdeversion 4.3.0
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.3.0-12
+- 1.3.0-kde4.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Jul 2009 01:16:49 -0000	1.5
+++ sources	11 Aug 2009 19:31:33 -0000	1.6
@@ -1 +1 @@
-e9a87c0f83a0cf676c408e3ac91f8958  kopete-cryptography-1.3.0-kde4.2.4.tar.bz2
+ea214f8749208130bde77a18814106bc  kopete-cryptography-1.3.0-kde4.3.0.tar.bz2



From ltinkl at fedoraproject.org  Tue Aug 11 19:39:31 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 19:39:31 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.1-kmail-saveAttachments.patch,1.3,1.4
Message-ID: <20090811193931.CD67011C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2500/F-10

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
third time's a charm, or so Rex once said :)


kdepim-4.3.1-kmail-saveAttachments.patch:
 CMakeLists.txt |    1 +
 kmcommands.cpp |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 16:45:26 -0000	1.3
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 19:39:31 -0000	1.4
@@ -16,10 +16,22 @@ Index: kmail/kmcommands.cpp
      // get the dir
 -    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
 +    QString dummy;
-+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
++    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), dummy );
 +    if ( !startUrl.isValid() || startUrl.isEmpty() )
 +      startUrl = KUrl( KGlobalSettings::documentPath() );
 +    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                     parentWidget(),
                                                     i18n( "Save Attachments To" ) );
      if ( !dirUrl.isValid() ) {
+Index: kmail/CMakeLists.txt
+===================================================================
+--- kmail/CMakeLists.txt	(revision 1010021)
++++ kmail/CMakeLists.txt	(working copy)
+@@ -371,6 +371,7 @@
+   kpgp
+   kdepim
+   ${KDE4_KIO_LIBS}
++  ${KDE4_KFILE_LIBS}
+   ${KDEPIMLIBS_KABC_LIBS}
+   ${KDEPIMLIBS_KPIMUTILS_LIBS}
+   ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}



From ltinkl at fedoraproject.org  Tue Aug 11 19:39:32 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 19:39:32 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.1-kmail-saveAttachments.patch,1.3,1.4
Message-ID: <20090811193932.0906111C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2500/F-11

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
third time's a charm, or so Rex once said :)


kdepim-4.3.1-kmail-saveAttachments.patch:
 CMakeLists.txt |    1 +
 kmcommands.cpp |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 16:45:26 -0000	1.3
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 19:39:31 -0000	1.4
@@ -16,10 +16,22 @@ Index: kmail/kmcommands.cpp
      // get the dir
 -    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
 +    QString dummy;
-+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
++    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), dummy );
 +    if ( !startUrl.isValid() || startUrl.isEmpty() )
 +      startUrl = KUrl( KGlobalSettings::documentPath() );
 +    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                     parentWidget(),
                                                     i18n( "Save Attachments To" ) );
      if ( !dirUrl.isValid() ) {
+Index: kmail/CMakeLists.txt
+===================================================================
+--- kmail/CMakeLists.txt	(revision 1010021)
++++ kmail/CMakeLists.txt	(working copy)
+@@ -371,6 +371,7 @@
+   kpgp
+   kdepim
+   ${KDE4_KIO_LIBS}
++  ${KDE4_KFILE_LIBS}
+   ${KDEPIMLIBS_KABC_LIBS}
+   ${KDEPIMLIBS_KPIMUTILS_LIBS}
+   ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}



From ltinkl at fedoraproject.org  Tue Aug 11 19:39:32 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 11 Aug 2009 19:39:32 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.1-kmail-saveAttachments.patch,1.3,1.4
Message-ID: <20090811193932.2D68211C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2500/devel

Modified Files:
	kdepim-4.3.1-kmail-saveAttachments.patch 
Log Message:
third time's a charm, or so Rex once said :)


kdepim-4.3.1-kmail-saveAttachments.patch:
 CMakeLists.txt |    1 +
 kmcommands.cpp |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Index: kdepim-4.3.1-kmail-saveAttachments.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim-4.3.1-kmail-saveAttachments.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 16:45:26 -0000	1.3
+++ kdepim-4.3.1-kmail-saveAttachments.patch	11 Aug 2009 19:39:31 -0000	1.4
@@ -16,10 +16,22 @@ Index: kmail/kmcommands.cpp
      // get the dir
 -    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
 +    QString dummy;
-+    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
++    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), dummy );
 +    if ( !startUrl.isValid() || startUrl.isEmpty() )
 +      startUrl = KUrl( KGlobalSettings::documentPath() );
 +    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
                                                     parentWidget(),
                                                     i18n( "Save Attachments To" ) );
      if ( !dirUrl.isValid() ) {
+Index: kmail/CMakeLists.txt
+===================================================================
+--- kmail/CMakeLists.txt	(revision 1010021)
++++ kmail/CMakeLists.txt	(working copy)
+@@ -371,6 +371,7 @@
+   kpgp
+   kdepim
+   ${KDE4_KIO_LIBS}
++  ${KDE4_KFILE_LIBS}
+   ${KDEPIMLIBS_KABC_LIBS}
+   ${KDEPIMLIBS_KPIMUTILS_LIBS}
+   ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:02 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194302.2ECD210F89C@bastion2.fedora.phx.redhat.com>

slankes has set the watchbugzilla acl on skanlite (Fedora devel) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:07 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194307.3EEC910F8AD@bastion2.fedora.phx.redhat.com>

slankes has set the commit acl on skanlite (Fedora devel) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:04 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194304.F26AA10F89B@bastion2.fedora.phx.redhat.com>

slankes has set the watchcommits acl on skanlite (Fedora devel) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:10 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194310.EA43D10F8B2@bastion2.fedora.phx.redhat.com>

slankes has set the watchbugzilla acl on skanlite (Fedora 10) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:13 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194313.1221610F8B6@bastion2.fedora.phx.redhat.com>

slankes has set the watchcommits acl on skanlite (Fedora 10) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:15 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194315.1E6D510F8B7@bastion2.fedora.phx.redhat.com>

slankes has set the commit acl on skanlite (Fedora 10) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:25 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194325.16F2310F8BB@bastion2.fedora.phx.redhat.com>

slankes has set the watchcommits acl on skanlite (Fedora 11) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:19 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194320.048D910F89C@bastion2.fedora.phx.redhat.com>

slankes has set the watchbugzilla acl on skanlite (Fedora 11) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From pkgdb at fedoraproject.org  Tue Aug 11 19:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 19:43:27 +0000
Subject: [pkgdb] skanlite had acl change status
Message-ID: <20090811194327.A445110F89F@bastion2.fedora.phx.redhat.com>

slankes has set the commit acl on skanlite (Fedora 11) to Approved for svahl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/skanlite



From svahl at fedoraproject.org  Tue Aug 11 19:54:41 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 19:54:41 +0000 (UTC)
Subject: rpms/skanlite/F-10 .cvsignore, 1.2, 1.3 skanlite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090811195441.6FF4B11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/skanlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5884/F-10

Modified Files:
	.cvsignore skanlite.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 20:38:31 -0000	1.2
+++ .cvsignore	11 Aug 2009 19:54:41 -0000	1.3
@@ -1 +1 @@
-skanlite-0.3-kde4.2.4.tar.bz2
+skanlite-0.3-kde4.3.0.tar.bz2


Index: skanlite.spec
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-10/skanlite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skanlite.spec	1 Jul 2009 20:38:31 -0000	1.1
+++ skanlite.spec	11 Aug 2009 19:54:41 -0000	1.2
@@ -1,8 +1,8 @@
-%global kdeversion 4.2.4
+%global kdeversion 4.3.0
 
 Name:           skanlite
 Version:        0.3
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -55,6 +55,12 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.3-4
+- KDE 4.3.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 23 2009 Sven Lankes <sven at lank.es> - 0.3-2
 - SPEC-Fixes from review
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 20:38:31 -0000	1.2
+++ sources	11 Aug 2009 19:54:41 -0000	1.3
@@ -1 +1 @@
-4cd852d5be3c27a0ac9002c704b019bb  skanlite-0.3-kde4.2.4.tar.bz2
+cf72ef82553627e21406084a12e9b5eb  skanlite-0.3-kde4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 19:54:41 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 19:54:41 +0000 (UTC)
Subject: rpms/skanlite/F-11 .cvsignore, 1.2, 1.3 skanlite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090811195441.AA36911C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/skanlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5884/F-11

Modified Files:
	.cvsignore skanlite.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 20:37:01 -0000	1.2
+++ .cvsignore	11 Aug 2009 19:54:41 -0000	1.3
@@ -1 +1 @@
-skanlite-0.3-kde4.2.4.tar.bz2
+skanlite-0.3-kde4.3.0.tar.bz2


Index: skanlite.spec
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-11/skanlite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skanlite.spec	1 Jul 2009 20:37:01 -0000	1.1
+++ skanlite.spec	11 Aug 2009 19:54:41 -0000	1.2
@@ -1,8 +1,8 @@
-%global kdeversion 4.2.4
+%global kdeversion 4.3.0
 
 Name:           skanlite
 Version:        0.3
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -55,6 +55,12 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.3-4
+- KDE 4.3.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 23 2009 Sven Lankes <sven at lank.es> - 0.3-2
 - SPEC-Fixes from review
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skanlite/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 20:37:01 -0000	1.2
+++ sources	11 Aug 2009 19:54:41 -0000	1.3
@@ -1 +1 @@
-4cd852d5be3c27a0ac9002c704b019bb  skanlite-0.3-kde4.2.4.tar.bz2
+cf72ef82553627e21406084a12e9b5eb  skanlite-0.3-kde4.3.0.tar.bz2



From svahl at fedoraproject.org  Tue Aug 11 19:54:41 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 19:54:41 +0000 (UTC)
Subject: rpms/skanlite/devel .cvsignore, 1.2, 1.3 skanlite.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090811195441.F011D11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/skanlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5884/devel

Modified Files:
	.cvsignore skanlite.spec sources 
Log Message:
KDE 4.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/skanlite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 20:29:41 -0000	1.2
+++ .cvsignore	11 Aug 2009 19:54:41 -0000	1.3
@@ -1 +1 @@
-skanlite-0.3-kde4.2.4.tar.bz2
+skanlite-0.3-kde4.3.0.tar.bz2


Index: skanlite.spec
===================================================================
RCS file: /cvs/extras/rpms/skanlite/devel/skanlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- skanlite.spec	27 Jul 2009 04:24:26 -0000	1.2
+++ skanlite.spec	11 Aug 2009 19:54:41 -0000	1.3
@@ -1,8 +1,8 @@
-%global kdeversion 4.2.4
+%global kdeversion 4.3.0
 
 Name:           skanlite
 Version:        0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight scanning program
 Group:          Applications/Productivity
 # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> - 0.3-4
+- KDE 4.3.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/skanlite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 20:29:41 -0000	1.2
+++ sources	11 Aug 2009 19:54:41 -0000	1.3
@@ -1 +1 @@
-4cd852d5be3c27a0ac9002c704b019bb  skanlite-0.3-kde4.2.4.tar.bz2
+cf72ef82553627e21406084a12e9b5eb  skanlite-0.3-kde4.3.0.tar.bz2



From karlik at fedoraproject.org  Tue Aug 11 19:58:03 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Tue, 11 Aug 2009 19:58:03 +0000 (UTC)
Subject: rpms/warzone2100/devel warzone2100.spec,1.27,1.28
Message-ID: <20090811195803.7E16A11C00D7@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6395

Modified Files:
	warzone2100.spec 
Log Message:
Fix BRs


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/warzone2100.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- warzone2100.spec	11 Aug 2009 13:51:30 -0000	1.27
+++ warzone2100.spec	11 Aug 2009 19:58:03 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           warzone2100
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 Group:          Amusements/Games
@@ -11,8 +11,8 @@ Source1:        http://guide.wz2100.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
-BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel
-BuildRequires: quesoglc-devel popt-devel gettext
+BuildRequires: libpng-devel libogg-devel libvorbis-devel
+BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel
 BuildRequires: automake >= 1.8
 BuildRequires: desktop-file-utils
 
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/sequences.wz
 
 %changelog
+* Tue Aug 11 2009 Karol Trzcionka <karlikt at gmail.com> - 2.2.1-2
+- Fix BuildRequires
+
 * Tue Aug 11 2009 Karol Trzcionka <karlikt at gmail.com> - 2.2.1-1
 - Update to v2.2.1
 - Add sequences subpackage



From nhorman at fedoraproject.org  Tue Aug 11 20:07:22 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 11 Aug 2009 20:07:22 +0000 (UTC)
Subject: rpms/kexec-tools/devel kdump.init, 1.23, 1.24 kexec-tools.spec,
	1.148, 1.149 sources, 1.20, 1.21
Message-ID: <20090811200722.754B811C00D7@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7786

Modified Files:
	kdump.init kexec-tools.spec sources 
Log Message:
Updating dracut files for adv conf


Index: kdump.init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kdump.init	31 Jul 2009 14:39:28 -0000	1.23
+++ kdump.init	11 Aug 2009 20:07:22 -0000	1.24
@@ -60,7 +60,7 @@ function check_config()
 		then
 			MKDUMPRD=$DRACUT_CMD
 		else
-			MKDUMPRD="dracut -c /etc/kdump-adv-conf/initramfs.conf"
+			MKDUMPRD="dracut -f -c /etc/kdump-adv-conf/initramfs.conf"
 		fi
 		# We always rebuild here, since it takes longer
 		# to figure out if anything has changed
@@ -111,7 +111,7 @@ function check_config()
 	   [ "$kernel_time" -gt "$image_time" ]; then
 		echo "Detected $KDUMP_CONFIG_FILE or $kdump_kernel change"
 		echo "Rebuilding $kdump_initrd"
-		$MKDUMPRD -d -f $kdump_initrd $kdump_kver
+		$MKDUMPRD $kdump_initrd $kdump_kver
 		if [ $? != 0 ]; then
 			echo "Failed to run mkdumprd"
 			$LOGGER "mkdumprd: failed to make kdump initrd"


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kexec-tools.spec	29 Jul 2009 19:34:47 -0000	1.148
+++ kexec-tools.spec	11 Aug 2009 20:07:22 -0000	1.149
@@ -28,7 +28,7 @@ Source100: dracut-files.tbz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): coreutils chkconfig sed zlib 
-Requires: busybox >= 1.2.0
+Requires: busybox >= 1.2.0, dracut
 BuildRequires: dash 
 BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel 
 BuildRequires: pkgconfig intltool gettext 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	29 Jul 2009 19:34:47 -0000	1.20
+++ sources	11 Aug 2009 20:07:22 -0000	1.21
@@ -1,4 +1,4 @@
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 190f8878aa7e7b63a96fde5d59538eec  makedumpfile-1.3.3.tar.gz
-95149c97537d0fb65eda72f4e53a0316  dracut-files.tbz2
+925dc7a5121fbb8eab854375d7ea4d1d  dracut-files.tbz2



From nhorman at fedoraproject.org  Tue Aug 11 20:07:23 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 11 Aug 2009 20:07:23 +0000 (UTC)
Subject: rpms/kexec-tools/devel/kdump_sample_manifests manifest.localrootfs, 
	1.4, 1.5
Message-ID: <20090811200723.2C4C811C00D7@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/kdump_sample_manifests
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7786/kdump_sample_manifests

Modified Files:
	manifest.localrootfs 
Log Message:
Updating dracut files for adv conf


Index: manifest.localrootfs
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump_sample_manifests/manifest.localrootfs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- manifest.localrootfs	29 Jul 2009 19:34:48 -0000	1.4
+++ manifest.localrootfs	11 Aug 2009 20:07:23 -0000	1.5
@@ -6,4 +6,4 @@
 #########################################################
 
 
-dracutmodules="base crypt lvm kernel-modules rootfs-block udev-rules"
+dracutmodules="base kdumpbase crypt lvm kernel-modules rootfs-block udev-rules"



From nhorman at fedoraproject.org  Tue Aug 11 20:07:23 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Tue, 11 Aug 2009 20:07:23 +0000 (UTC)
Subject: rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase install, 1.1,
	1.2 check, 1.1, NONE dracut-lib.sh, 1.1, NONE initqueue, 1.1,
	NONE parse-blacklist.sh, 1.1, NONE parse-root-opts.sh, 1.1,
	NONE selinux-loadpolicy.sh, 1.1, NONE
Message-ID: <20090811200723.009EF11C00D7@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7786/kdump_dracut_modules/99kdumpbase

Modified Files:
	install 
Removed Files:
	check dracut-lib.sh initqueue parse-blacklist.sh 
	parse-root-opts.sh selinux-loadpolicy.sh 
Log Message:
Updating dracut files for adv conf


Index: install
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase/install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- install	29 Jul 2009 19:34:48 -0000	1.1
+++ install	11 Aug 2009 20:07:22 -0000	1.2
@@ -1,23 +1,3 @@
 #!/bin/bash
-dracut_install mount mknod mkdir modprobe pidof sleep chroot \
-    sed ls flock cp mv dmesg rm ln
-if [ ! -e "${initdir}/bin/sh" ]; then
-    dracut_install bash
-    (ln -s bash "${initdir}/bin/sh" || :)
-fi
-# install our scripts and hooks
+rm -f $initdir/init
 inst "/etc/kdump-adv-conf/init" "/init"
-inst "$moddir/initqueue" "/sbin/initqueue"
-mkdir -p ${initdir}/initqueue
-mkdir -p ${initdir}/tmp
-# Bail out if switch_root does not exist
-if which switch_root >/dev/null 2>&1; then
-    dracut_install switch_root 
-else
-    inst "$moddir/switch_root" "/sbin/switch_root" \
-	|| derror "Failed to install switch_root"
-fi
-inst "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
-inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
-inst_hook cmdline 20 "$moddir/parse-blacklist.sh"
-inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"


--- check DELETED ---


--- dracut-lib.sh DELETED ---


--- initqueue DELETED ---


--- parse-blacklist.sh DELETED ---


--- parse-root-opts.sh DELETED ---


--- selinux-loadpolicy.sh DELETED ---



From jkeating at fedoraproject.org  Tue Aug 11 20:11:47 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 11 Aug 2009 20:11:47 +0000 (UTC)
Subject: rpms/cryptix/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE cryptix-jdk15-compatibility.patch, 1.1,
	NONE cryptix.build.script, 1.1, NONE cryptix.spec, 1.15,
	NONE sources, 1.3, NONE
Message-ID: <20090811201147.14F2211C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/cryptix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8478

Added Files:
	dead.package 
Removed Files:
	Makefile cryptix-jdk15-compatibility.patch 
	cryptix.build.script cryptix.spec sources 
Log Message:
kill it with fire


--- NEW FILE dead.package ---
Retired


--- Makefile DELETED ---


--- cryptix-jdk15-compatibility.patch DELETED ---


--- cryptix.build.script DELETED ---


--- cryptix.spec DELETED ---


--- sources DELETED ---



From jkeating at fedoraproject.org  Tue Aug 11 20:11:59 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 11 Aug 2009 20:11:59 +0000 (UTC)
Subject: rpms/cryptix-asn1/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE cryptix-asn1.build.script, 1.2, NONE cryptix-asn1.spec,
	1.14, NONE sources, 1.3, NONE
Message-ID: <20090811201159.0D8F211C00D7@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/cryptix-asn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8585

Added Files:
	dead.package 
Removed Files:
	Makefile cryptix-asn1.build.script cryptix-asn1.spec sources 
Log Message:
kill it with fire


--- NEW FILE dead.package ---
Retired


--- Makefile DELETED ---


--- cryptix-asn1.build.script DELETED ---


--- cryptix-asn1.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Tue Aug 11 20:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 20:13:25 +0000
Subject: [pkgdb] cryptix (un)retirement
Message-ID: <20090811201325.F1F3B10F880@bastion2.fedora.phx.redhat.com>

Package cryptix in Fedora devel has been retired by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cryptix



From pkgdb at fedoraproject.org  Tue Aug 11 20:14:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 20:14:12 +0000
Subject: [pkgdb] cryptix-asn1 ownership updated
Message-ID: <20090811201412.9A28410F89B@bastion2.fedora.phx.redhat.com>

Package cryptix-asn1 in Fedora devel was orphaned by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cryptix-asn1



From pkgdb at fedoraproject.org  Tue Aug 11 20:14:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 11 Aug 2009 20:14:12 +0000
Subject: [pkgdb] cryptix-asn1 (un)retirement
Message-ID: <20090811201412.A449C10F89F@bastion2.fedora.phx.redhat.com>

Package cryptix-asn1 in Fedora devel has been retired by jkeating

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cryptix-asn1



From deji at fedoraproject.org  Tue Aug 11 20:22:18 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 20:22:18 +0000 (UTC)
Subject: rpms/referencer/F-11 referencer.spec,1.22,1.23
Message-ID: <20090811202218.891E311C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/referencer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10309

Modified Files:
	referencer.spec 
Log Message:
Update spec for new (build) dependencies



Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/F-11/referencer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- referencer.spec	11 Aug 2009 04:38:44 -0000	1.22
+++ referencer.spec	11 Aug 2009 20:22:18 -0000	1.23
@@ -13,7 +13,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	poppler-glib-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++ python-devel
 BuildRequires:	gettext perl(XML::Parser)
-BuildRequires:	desktop-file-utils intltool
+BuildRequires:	desktop-file-utils intltool gnome-doc-utils
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Referencer is a Gnome application to organise documents or references, and
@@ -51,6 +54,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
 update-desktop-database &> /dev/null ||:
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -61,6 +66,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+scrollkeeper-update -q || :
+
 update-desktop-database &> /dev/null ||:
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -74,6 +81,10 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/mime/packages/referencer.xml
 %{_datadir}/pixmaps/referencer.svg
 %{_datadir}/referencer/
+%{_datadir}/gnome/help/referencer-plugins/
+%{_datadir}/gnome/help/referencer/
+%{_datadir}/omf/referencer-plugins/
+%{_datadir}/omf/referencer/
 %{python_sitelib}/referencer/
 
 %changelog



From till at fedoraproject.org  Tue Aug 11 20:27:21 2009
From: till at fedoraproject.org (Till Maas)
Date: Tue, 11 Aug 2009 20:27:21 +0000 (UTC)
Subject: rpms/lzip/F-11 lzip.spec,1.4,1.5
Message-ID: <20090811202721.EBF9D11C043B@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/lzip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10883

Modified Files:
	lzip.spec 
Log Message:
* Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.7-2
- Exclude lzdiff & lzgrep, they will become part of zutils:
  http://www.nongnu.org/lzip/zutils.html
  and fixes a conflict with xz-lzma-compat: Red Hat Bugzilla #515502
- Use globbing for all manpages



Index: lzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lzip/F-11/lzip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lzip.spec	28 Jul 2009 09:16:35 -0000	1.4
+++ lzip.spec	11 Aug 2009 20:27:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lzip
 Version:        1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LZMA compressor with integrity checking
 
 Group:          Applications/File
@@ -59,18 +59,24 @@ fi
 %defattr(-,root,root,-)
 # TODO is currently empty
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/lzdiff
-%{_bindir}/lzgrep
+%exclude %{_bindir}/lzdiff
+%exclude %{_bindir}/lzgrep
 %{_bindir}/lzip
 %{_bindir}/lziprecover
 %{_infodir}/lzip.info*
-%{_mandir}/man1/lzdiff.1.gz
-%{_mandir}/man1/lzgrep.1.gz
+%exclude %{_mandir}/man1/lzdiff.1*
+%exclude %{_mandir}/man1/lzgrep.1*
 %{_mandir}/man1/lzip.1*
-%{_mandir}/man1/lziprecover.1.gz
+%{_mandir}/man1/lziprecover.1*
 
 
 %changelog
+* Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.7-2
+- Exclude lzdiff & lzgrep, they will become part of zutils:
+  http://www.nongnu.org/lzip/zutils.html
+  and fixes a conflict with xz-lzma-compat: Red Hat Bugzilla #515502
+- Use globbing for all manpages
+
 * Tue Jul 28 2009 Till Maas <opensource at till.name> - 1.7-1
 - Update to latest stable upstream
 - remove upstreamed patch



From deji at fedoraproject.org  Tue Aug 11 20:34:57 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 20:34:57 +0000 (UTC)
Subject: rpms/xiphos/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xiphos.spec,
	1.1, 1.2
Message-ID: <20090811203457.53B4911C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11601

Modified Files:
	.cvsignore sources xiphos.spec 
Log Message:
* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 01:30:29 -0000	1.2
+++ .cvsignore	11 Aug 2009 20:34:57 -0000	1.3
@@ -1 +1 @@
-xiphos-3.1.tar.gz
+xiphos-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 01:30:29 -0000	1.2
+++ sources	11 Aug 2009 20:34:57 -0000	1.3
@@ -1 +1 @@
-6ba1c80362ccce30e86d21b775511995  xiphos-3.1.tar.gz
+a968d57375f46ef1cae4a153600616a9  xiphos-3.1.1.tar.gz


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/F-11/xiphos.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xiphos.spec	9 Jun 2009 01:30:29 -0000	1.1
+++ xiphos.spec	11 Aug 2009 20:34:57 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		xiphos 
-Version:	3.1
+Version:	3.1.1
 Release:	1%{?dist}
 Summary:	Bible study and research tool
 
@@ -77,6 +77,9 @@ scrollkeeper-update -q || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
+- New upstream version
+
 * Sun May 18 2009 Deji Akingunola <dakingun at gmail.com> - 3.1-1
 - Update to the 3.1 release
 



From deji at fedoraproject.org  Tue Aug 11 20:43:50 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 20:43:50 +0000 (UTC)
Subject: rpms/xiphos/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xiphos.spec,
	1.1, 1.2
Message-ID: <20090811204350.1F03911C00D7@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12302

Modified Files:
	.cvsignore sources xiphos.spec 
Log Message:
* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jun 2009 01:32:06 -0000	1.2
+++ .cvsignore	11 Aug 2009 20:43:49 -0000	1.3
@@ -1 +1 @@
-xiphos-3.1.tar.gz
+xiphos-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jun 2009 01:32:06 -0000	1.2
+++ sources	11 Aug 2009 20:43:49 -0000	1.3
@@ -1 +1 @@
-6ba1c80362ccce30e86d21b775511995  xiphos-3.1.tar.gz
+a968d57375f46ef1cae4a153600616a9  xiphos-3.1.1.tar.gz


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/F-10/xiphos.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xiphos.spec	9 Jun 2009 01:32:06 -0000	1.1
+++ xiphos.spec	11 Aug 2009 20:43:49 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		xiphos 
-Version:	3.1
+Version:	3.1.1
 Release:	1%{?dist}
 Summary:	Bible study and research tool
 
@@ -77,6 +77,9 @@ scrollkeeper-update -q || :
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
+- New upstream version
+
 * Sun May 18 2009 Deji Akingunola <dakingun at gmail.com> - 3.1-1
 - Update to the 3.1 release
 



From karlik at fedoraproject.org  Tue Aug 11 20:48:31 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Tue, 11 Aug 2009 20:48:31 +0000 (UTC)
Subject: rpms/warzone2100/F-11 warzone2100.spec,1.26,1.27
Message-ID: <20090811204831.6029E11C00D7@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13512

Modified Files:
	warzone2100.spec 
Log Message:
Fix BRs


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/F-11/warzone2100.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- warzone2100.spec	11 Aug 2009 13:51:30 -0000	1.26
+++ warzone2100.spec	11 Aug 2009 20:48:31 -0000	1.27
@@ -11,8 +11,8 @@ Source1:        http://guide.wz2100.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
-BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel
-BuildRequires: quesoglc-devel popt-devel gettext
+BuildRequires: libpng-devel libogg-devel libvorbis-devel
+BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel
 BuildRequires: automake >= 1.8
 BuildRequires: desktop-file-utils
 



From rdieter at fedoraproject.org  Tue Aug 11 20:52:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 11 Aug 2009 20:52:47 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel
	constantine-mosaico-metadata.desktop, NONE,
	1.1 constantine-underwater-mosaic-metadata.desktop, NONE,
	1.1 constantine-backgrounds.spec, 1.1, 1.2
Message-ID: <20090811205247.3306511C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14288

Modified Files:
	constantine-backgrounds.spec 
Added Files:
	constantine-mosaico-metadata.desktop 
	constantine-underwater-mosaic-metadata.desktop 
Log Message:
* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 11.90.1-2
- -kde subpkg, CamelCase themes (with feeling)



--- NEW FILE constantine-mosaico-metadata.desktop ---
[Desktop Entry]
Name=Constantine Mosaico
X-KDE-PluginInfo-Name=Constantine_Mosaico
X-KDE-PluginInfo-Author=Fedora Project
X-KDE-PluginInfo-Email=fedora-kde at lists.fedoraproject.org
X-KDE-PluginInfo-License=CC-BY-SA


--- NEW FILE constantine-underwater-mosaic-metadata.desktop ---
[Desktop Entry]
Name=Constantine Underwater Mosaic
X-KDE-PluginInfo-Name=Constantine_Underwater_Mosaic
X-KDE-PluginInfo-Author=Fedora Project
X-KDE-PluginInfo-Email=fedora-kde at lists.fedoraproject.org
X-KDE-PluginInfo-License=CC-BY-SA


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- constantine-backgrounds.spec	4 Aug 2009 22:37:09 -0000	1.1
+++ constantine-backgrounds.spec	11 Aug 2009 20:52:46 -0000	1.2
@@ -1,16 +1,23 @@
 Name:           constantine-backgrounds
 Version:        11.90.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
 License:        CC-BY-SA
 URL:            https://fedoraproject.org/wiki/F12_Artwork
 Source0:        https://fedorahosted.org/releases/f/e/fedora-design/%{name}-%{version}.tar.lzma
+# include these here for now, will get into contstantine-backgrounds
+# upstream asap.
+Source1:        constantine-mosaico-metadata.desktop
+Source2:        constantine-underwater-mosaic-metadata.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
+# for %%_kde4_* macros
+BuildRequires:	kde-filesystem
+
 %description
 This package contains desktop backgrounds for the Constantine theme.
 
@@ -21,6 +28,26 @@ Group:          Applications/Multimedia
 %description    extras
 This package contains aditional desktop backgrounds for the Constantine theme.
 
+%package        kde 
+Summary:        Constantine Wallpapers for KDE 
+Group:          Applications/Multimedia
+Obsoletes:      constantine-kde-theme <= 11.90.0
+Requires:       %{name} = %{version}-%{release} 
+Requires:       kde-filesystem
+
+%description    kde 
+This package contains KDE desktop wallpapers for the Constantine theme.
+
+
+## FIXME/TODO
+%package        extras-kde
+Summary:        Extra Constantine Wallpapers for KDE 
+Group:          Applications/Multimedia
+
+%description    extras-kde
+This package contains aditional KDE desktop wallpapers for the Constantine theme.
+
+
 
 %prep
 %setup -q
@@ -31,26 +58,93 @@ This package contains aditional desktop 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 # prepare the dir structure
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/default
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/default/standard
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/default/wide
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/extras
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/extras/standard
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine/extras/wide
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/constantine
 
 # copy the images and xml files
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/default \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/extras \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/constantine
+cp -a default \
+        $RPM_BUILD_ROOT%{_datadir}/backgrounds/constantine/
+cp -a extras \
+        $RPM_BUILD_ROOT%{_datadir}/backgrounds/constantine/
         
 # copy metadata xml files
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-constantine.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-constantine-extras.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+install -p -m644 -D desktop-backgrounds-constantine.xml \
+        $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml
+install -p -m644 -D desktop-backgrounds-constantine-extras.xml \
+        $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine-extras.xml
+
+## KDE bits
+# constantine-mosaico
+mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Mosaico/contents/images
+install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Mosaico/metadata.desktop
+(cd $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Mosaico/contents/images
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 640x480.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 800x480.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 800x600.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1024x600.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1024x768.png
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1152x720.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1152x864.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1200x900.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1280x720.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1280x768.png
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1280x800.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1280x960.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1280x1024.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1366x768.png
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1440x900.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1440x1080.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1600x1200.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1600x1280.png
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1680x1050.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1920x1080.png
+ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1920x1200.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1920x1440.png
+ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 2048x1536.png
+)
+
+# constantine-underwater-mosaic
+mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/contents/images
+install -p -D -m644 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/metadata.desktop
+(cd $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/contents/images
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 640x480.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 800x480.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 800x600.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1024x600.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1024x768.png
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1152x720.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1152x864.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1200x900.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1280x720.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1280x768.png
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1280x800.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1280x960.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1280x1024.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1366x768.png
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1440x900.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1440x1080.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1600x1200.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1600x1280.png
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1680x1050.png
+# That one's not really 8:5, but it's the closest...
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1920x1080.png
+ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1920x1200.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1920x1440.png
+ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 2048x1536.png
+)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,8 +164,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/constantine/extras
 %{_datadir}/gnome-background-properties/desktop-backgrounds-constantine-extras.xml
 
+%files kde
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/Constantine_Mosaico/
+%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/
+
+#files extras-kde
+#defattr(-,root,root,-)
+
 
 %changelog
+* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 11.90.1-2
+- -kde subpkg, CamelCase themes (with feeling)
+
 * Wed Aug 05 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.1-1
 - Move Constantin Statue from extras to default per frequent requests
 



From svahl at fedoraproject.org  Tue Aug 11 20:53:54 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 20:53:54 +0000 (UTC)
Subject: rpms/roxterm/F-10 .cvsignore, 1.16, 1.17 roxterm.spec, 1.14,
	1.15 sources, 1.16, 1.17
Message-ID: <20090811205354.EB01411C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14536/F-10

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
Update to new upstream release: 1.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	13 May 2009 09:25:52 -0000	1.16
+++ .cvsignore	11 Aug 2009 20:53:54 -0000	1.17
@@ -1 +1 @@
-roxterm-1.14.2.tar.gz
+roxterm-1.15.2.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-10/roxterm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- roxterm.spec	13 May 2009 09:25:52 -0000	1.14
+++ roxterm.spec	11 Aug 2009 20:53:54 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.14.2
+Version:        1.15.2
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,15 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.15.2-1
+- new upstream release: 1.15.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.14.2-2
+- Rebuilt for libvte SONAME bump
+
 * Thu Apr 16 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.2-1
 - new upstream version: 1.14.2
 - fix help link


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 May 2009 09:25:52 -0000	1.16
+++ sources	11 Aug 2009 20:53:54 -0000	1.17
@@ -1 +1 @@
-22b2696ecd7cd977a0c00e791a4451b8  roxterm-1.14.2.tar.gz
+c4988ce844b702a77f3609c623107e53  roxterm-1.15.2.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 20:53:55 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 20:53:55 +0000 (UTC)
Subject: rpms/roxterm/F-11 .cvsignore, 1.16, 1.17 roxterm.spec, 1.15,
	1.16 sources, 1.16, 1.17
Message-ID: <20090811205355.33A9F11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14536/F-11

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
Update to new upstream release: 1.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	13 May 2009 09:25:52 -0000	1.16
+++ .cvsignore	11 Aug 2009 20:53:54 -0000	1.17
@@ -1 +1 @@
-roxterm-1.14.2.tar.gz
+roxterm-1.15.2.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-11/roxterm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- roxterm.spec	13 May 2009 09:25:52 -0000	1.15
+++ roxterm.spec	11 Aug 2009 20:53:55 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           roxterm
-Version:        1.14.2
+Version:        1.15.2
 Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
@@ -72,6 +72,15 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.15.2-1
+- new upstream release: 1.15.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.14.2-2
+- Rebuilt for libvte SONAME bump
+
 * Thu Apr 16 2009 Sebastian Vahl <fedora at deadbabylon.de> - 1.14.2-1
 - new upstream version: 1.14.2
 - fix help link


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 May 2009 09:25:52 -0000	1.16
+++ sources	11 Aug 2009 20:53:55 -0000	1.17
@@ -1 +1 @@
-22b2696ecd7cd977a0c00e791a4451b8  roxterm-1.14.2.tar.gz
+c4988ce844b702a77f3609c623107e53  roxterm-1.15.2.tar.gz



From svahl at fedoraproject.org  Tue Aug 11 20:53:55 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Tue, 11 Aug 2009 20:53:55 +0000 (UTC)
Subject: rpms/roxterm/devel .cvsignore, 1.16, 1.17 roxterm.spec, 1.17,
	1.18 sources, 1.16, 1.17
Message-ID: <20090811205355.6716F11C00D7@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/roxterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14536/devel

Modified Files:
	.cvsignore roxterm.spec sources 
Log Message:
Update to new upstream release: 1.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	16 Apr 2009 21:11:18 -0000	1.16
+++ .cvsignore	11 Aug 2009 20:53:55 -0000	1.17
@@ -1 +1 @@
-roxterm-1.14.2.tar.gz
+roxterm-1.15.2.tar.gz


Index: roxterm.spec
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/roxterm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- roxterm.spec	27 Jul 2009 03:09:23 -0000	1.17
+++ roxterm.spec	11 Aug 2009 20:53:55 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           roxterm
-Version:        1.14.2
-Release:        3%{?dist}
+Version:        1.15.2
+Release:        1%{?dist}
 Summary:        A fast terminal emulator
 
 Group:          User Interface/X
@@ -72,6 +72,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 1.15.2-1
+- new upstream release: 1.15.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roxterm/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	16 Apr 2009 21:11:19 -0000	1.16
+++ sources	11 Aug 2009 20:53:55 -0000	1.17
@@ -1 +1 @@
-22b2696ecd7cd977a0c00e791a4451b8  roxterm-1.14.2.tar.gz
+c4988ce844b702a77f3609c623107e53  roxterm-1.15.2.tar.gz



From spot at fedoraproject.org  Tue Aug 11 20:54:43 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 20:54:43 +0000 (UTC)
Subject: rpms/esperanza/devel esperanza-0.4.0-gitfixes20090811.patch, NONE, 
	1.1 esperanza.spec, 1.2, 1.3
Message-ID: <20090811205443.304E011C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/esperanza/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14758

Modified Files:
	esperanza.spec 
Added Files:
	esperanza-0.4.0-gitfixes20090811.patch 
Log Message:
update for xmms 0.6

esperanza-0.4.0-gitfixes20090811.patch:
 esperanza-0.4.0/src/ui/growl.cpp                          |only
 esperanza-0.4.0/src/ui/growl.h                            |only
 esperanza-0.4.0/src/ui/mac_growl.h                        |only
 esperanza-0.4.0/src/ui/mac_growl.mm                       |only
 esperanza-0.4.0/src/ui/panebrowserview.cpp                |only
 esperanza-0.4.0/src/ui/panebrowserview.h                  |only
 esperanza/src/dialogs/equalizer/equalizerdialog.cpp       |    6 +++--
 esperanza/src/dialogs/lastfm/lastfm.cpp                   |   10 +++------
 esperanza/src/dialogs/lastfm/lastfm.h                     |    2 -
 esperanza/src/dialogs/medialibdialog/medialibdialog.cpp   |    8 ++++---
 esperanza/src/dialogs/streamingdialog/streamingdialog.cpp |   14 +++++++------
 esperanza/src/lib/collectioninfomodel.cpp                 |    8 ++++---
 esperanza/src/lib/collectionmodel.cpp                     |   11 ++++++----
 esperanza/src/lib/collectionmodel.h                       |    2 -
 esperanza/src/lib/misc.cpp                                |    2 -
 esperanza/src/lib/playlistmodel.cpp                       |   15 +++++++-------
 esperanza/src/lib/playlistmodel.h                         |    2 -
 esperanza/src/lib/xclient.cpp                             |    8 +++----
 18 files changed, 49 insertions(+), 39 deletions(-)

--- NEW FILE esperanza-0.4.0-gitfixes20090811.patch ---
diff -urP esperanza-0.4.0/src/dialogs/equalizer/equalizerdialog.cpp esperanza/src/dialogs/equalizer/equalizerdialog.cpp
--- esperanza-0.4.0/src/dialogs/equalizer/equalizerdialog.cpp	2009-08-11 16:38:06.055368203 -0400
+++ esperanza/src/dialogs/equalizer/equalizerdialog.cpp	2009-08-11 16:37:14.347236289 -0400
@@ -149,8 +149,10 @@
 {
 	bool effects = false;
 	
-	for (dl.first (); dl.isValid (); ++dl) {
-		Xmms::Dict d = *dl;
+	Xmms::List< Xmms::Dict >::const_iterator it_end = dl.end();
+	for (Xmms::List< Xmms::Dict >::const_iterator it = dl.begin();
+	     it != it_end; ++it) {
+		Xmms::Dict d = *it;
 		if (d.contains ("shortname")) {
 			if (d.get<std::string> ("shortname") == "equalizer") {
 				effects = true;
diff -urP esperanza-0.4.0/src/dialogs/lastfm/lastfm.cpp esperanza/src/dialogs/lastfm/lastfm.cpp
--- esperanza-0.4.0/src/dialogs/lastfm/lastfm.cpp	2009-08-11 16:38:06.062361134 -0400
+++ esperanza/src/dialogs/lastfm/lastfm.cpp	2009-08-11 16:37:14.352236158 -0400
@@ -31,6 +31,8 @@
 #include <QCursor>
 #include <QDesktopServices>
 
+#include <algorithm>
+
 #define LASTFM_SEARCH_URL "http://www.last.fm/music/?m=artists&q=%1"
 #define MUSICBRAINZ_URL   "http://musicbrainz.org/artist/%1.html"
 
@@ -257,13 +259,9 @@
 }
 
 bool
-LastFmDialog::num_reply (Xmms::List<unsigned int> const &list, const QString &artist)
+LastFmDialog::num_reply (Xmms::List<int> const &list, const QString &artist)
 {
-    int num = 0;
-    /* we have to loop the list inorder to get the lenght :-( */
-	for (list.first (); list.isValid (); ++list) {
-		num ++;
-	}
+	int num = std::distance(list.begin(), list.end());
 	
 	if (num == 0) {
 		return false;
diff -urP esperanza-0.4.0/src/dialogs/lastfm/lastfm.h esperanza/src/dialogs/lastfm/lastfm.h
--- esperanza-0.4.0/src/dialogs/lastfm/lastfm.h	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/dialogs/lastfm/lastfm.h	2009-08-11 16:37:14.352236158 -0400
@@ -61,7 +61,7 @@
 		QProgressBar *m_pb;
 		QLabel *m_pl;
 
-        bool num_reply (Xmms::List<unsigned int> const &list, const QString &artist);
+		bool num_reply (Xmms::List<int> const &list, const QString &artist);
 
 		QString m_current_artist;
 
diff -urP esperanza-0.4.0/src/dialogs/medialibdialog/medialibdialog.cpp esperanza/src/dialogs/medialibdialog/medialibdialog.cpp
--- esperanza-0.4.0/src/dialogs/medialibdialog/medialibdialog.cpp	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/dialogs/medialibdialog/medialibdialog.cpp	2009-08-11 16:37:14.353236215 -0400
@@ -194,10 +194,12 @@
 {
 	QStringList compl_list;
 
-	for (list.first (); list.isValid (); ++ list) {
+	Xmms::List <Xmms::Dict>::const_iterator it_end = list.end();
+	for (Xmms::List <Xmms::Dict>::const_iterator it = list.begin();
+	     it != it_end; ++ it) {
 		/* This seems to happen if a album is "" */
-		if ((*list).contains (m_currentsel)) {
-			QString qs = XClient::stdToQ ((*list).get<std::string> (m_currentsel));
+		if (it->contains (m_currentsel)) {
+			QString qs = XClient::stdToQ (it->get<std::string> (m_currentsel));
 			compl_list.append (qs);
 		}
 	}
diff -urP esperanza-0.4.0/src/dialogs/streamingdialog/streamingdialog.cpp esperanza/src/dialogs/streamingdialog/streamingdialog.cpp
--- esperanza-0.4.0/src/dialogs/streamingdialog/streamingdialog.cpp	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/dialogs/streamingdialog/streamingdialog.cpp	2009-08-11 16:37:14.360236339 -0400
@@ -400,12 +400,14 @@
 bool
 StreamingBookmarks::handle_list (const Xmms::List<std::string> &list)
 {
-    bool r = false;
-    for (list.first (); list.isValid (); ++list) {
-        if (*list == "_esperanza_bookmarks") {
-            r = true;
-            break;
-        }
+	bool r = false;
+	Xmms::List<std::string>::const_iterator it_end = list.end();
+	for (Xmms::List<std::string>::const_iterator it = list.begin();
+	     it != it_end; ++it) {
+		if (*it == "_esperanza_bookmarks") {
+			r = true;
+			break;
+		}
 	}
 
 	if (!r) {
diff -urP esperanza-0.4.0/src/lib/collectioninfomodel.cpp esperanza/src/lib/collectioninfomodel.cpp
--- esperanza-0.4.0/src/lib/collectioninfomodel.cpp	2009-08-11 16:38:06.066361504 -0400
+++ esperanza/src/lib/collectioninfomodel.cpp	2009-08-11 16:37:14.362236245 -0400
@@ -49,12 +49,14 @@
 {
     /* convert the first entry in the list to get the headers */
 	QList < QHash < QString, QVariant > > l;
-	for (list.first (); list.isValid (); ++list) {
-	    QHash<QString, QVariant> h = XClient::convert_dict (*list);
+	Xmms::List<Xmms::Dict>::const_iterator it_end = list.end();
+	for (Xmms::List<Xmms::Dict>::const_iterator it = list.begin();
+	     it != it_end; ++it) {
+		QHash<QString, QVariant> h = XClient::convert_dict (*it);
 		l.append (h);
 	}
 	set_data (l);
-	
+
 	return true;
 }
 
diff -urP esperanza-0.4.0/src/lib/collectionmodel.cpp esperanza/src/lib/collectionmodel.cpp
--- esperanza-0.4.0/src/lib/collectionmodel.cpp	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/collectionmodel.cpp	2009-08-11 16:37:14.362236245 -0400
@@ -74,20 +74,23 @@
 }
 
 bool
-CollectionModel::id_list_get (Xmms::List<unsigned int> const &list)
+CollectionModel::id_list_get (Xmms::List<int> const &list)
 {
 	beginRemoveRows (QModelIndex (), 0, m_plist.size ());
 	m_plist.clear ();
 	endRemoveRows ();
 
 	int i = 0;
-	for (list.first (); list.isValid (); ++list) {
+	Xmms::List<int>::const_iterator it_end = list.end();
+	for (Xmms::List<int>::const_iterator it = list.begin();
+	     it != it_end; ++it) {
 		i ++;
 	}
 
 	beginInsertRows (QModelIndex (), 0, i);
-	for (list.first (); list.isValid (); ++list) {
-		m_plist.append (*list);
+	for (Xmms::List<int>::const_iterator it = list.begin();
+	     it != it_end; ++it) {
+		m_plist.append (*it);
 	}
 	endInsertRows ();
 	
diff -urP esperanza-0.4.0/src/lib/collectionmodel.h esperanza/src/lib/collectionmodel.h
--- esperanza-0.4.0/src/lib/collectionmodel.h	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/collectionmodel.h	2009-08-11 16:37:14.362236245 -0400
@@ -57,7 +57,7 @@
 	private:
 		XClient *m_client;
 
-		bool id_list_get (Xmms::List<unsigned int> const &);
+		bool id_list_get (Xmms::List<int> const &);
 		bool collptr_get (Xmms::Coll::Coll const &);
 
 		QList<unsigned int> m_plist;
diff -urP esperanza-0.4.0/src/lib/misc.cpp esperanza/src/lib/misc.cpp
--- esperanza-0.4.0/src/lib/misc.cpp	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/misc.cpp	2009-08-11 16:37:14.363236163 -0400
@@ -60,7 +60,7 @@
 			goto browser;
 		} else {
 			QErrorMessage *err = new QErrorMessage (parent);
-			err->showMessage ("Your XMMS_PATH enviroment sucks. Fix it and restart the Application");
+			err->showMessage ("Your XMMS_PATH environment sucks. Fix it and restart the Application");
 			err->exec ();
 			return false;
 		}
diff -urP esperanza-0.4.0/src/lib/playlistmodel.cpp esperanza/src/lib/playlistmodel.cpp
--- esperanza-0.4.0/src/lib/playlistmodel.cpp	2009-08-11 16:38:06.067363866 -0400
+++ esperanza/src/lib/playlistmodel.cpp	2009-08-11 16:37:14.363236163 -0400
@@ -25,6 +25,8 @@
 #include <QUrl>
 #include <QFileInfo>
 
+#include <algorithm>
+
 #include "playlistmodel.h"
 
 // Used to check for Protocolversion at compiletime
@@ -223,19 +225,18 @@
 }
 
 bool
-PlaylistModel::handle_list (const Xmms::List< unsigned int > &list)
+PlaylistModel::handle_list (const Xmms::List< int > &list)
 {
 	beginRemoveRows (QModelIndex (), 0, m_plist.size ());
 	m_plist.clear ();
 	endRemoveRows ();
 
-	int i = 0;
-	for (list.first (); list.isValid (); ++list) {
-		i ++;
-	}
+	Xmms::List< int >::const_iterator it_end = list.end();
+	int i = std::distance(list.begin(), it_end);
 	beginInsertRows (QModelIndex (), 0, i);
-	for (list.first (); list.isValid (); ++list) {
-		m_plist.append (*list);
+	for (Xmms::List< int >::const_iterator it = list.begin();
+	     it != it_end; ++it) {
+		m_plist.append (*it);
 	}
 
 	endInsertRows ();
diff -urP esperanza-0.4.0/src/lib/playlistmodel.h esperanza/src/lib/playlistmodel.h
--- esperanza-0.4.0/src/lib/playlistmodel.h	2009-08-11 16:38:06.068361479 -0400
+++ esperanza/src/lib/playlistmodel.h	2009-08-11 16:37:14.363236163 -0400
@@ -126,7 +126,7 @@
 		void entry_changed (uint32_t);
 
 	private:
-		bool handle_list (const Xmms::List< unsigned int > &list);
+		bool handle_list (const Xmms::List< int > &list);
 		bool handle_change (const Xmms::Dict &chg);
 #if (XMMS_IPC_PROTOCOL_VERSION > 10)
 		bool handle_update_pos (const Xmms::Dict &pos);
diff -urP esperanza-0.4.0/src/lib/xclient.cpp esperanza/src/lib/xclient.cpp
--- esperanza-0.4.0/src/lib/xclient.cpp	2007-08-13 06:00:40.000000000 -0400
+++ esperanza/src/lib/xclient.cpp	2009-08-11 16:37:14.364241458 -0400
@@ -179,13 +179,13 @@
 		QString val;
 		if (key == "url") {
 			/* This really is wrong ...*/
-			char *c = const_cast<char *>(xmmsc_result_decode_url (NULL, boost::get< std::string >(value).c_str ()));
-			val = QString::fromUtf8 (c);
+			//char *c = const_cast<char *>(xmmsc_result_decode_url (NULL, boost::get< std::string >(value).c_str ()));
+            std::string c(Xmms::decodeUrl(boost::get< std::string >(value)));
+			val = QString::fromStdString (c);
 			val = val.mid (val.lastIndexOf ("/") + 1);
 			if (val.isEmpty ()) {
-				val = QString::fromUtf8 (c);
+				val = QString::fromStdString (c);
 			}
-			free (c);
 		} else {
 			val = QString::fromUtf8 (boost::get< std::string > (value).c_str ());
 		}
Only in esperanza-0.4.0/src/ui: growl.cpp
Only in esperanza-0.4.0/src/ui: growl.h
Only in esperanza-0.4.0/src/ui: mac_growl.h
Only in esperanza-0.4.0/src/ui: mac_growl.mm
Only in esperanza-0.4.0/src/ui: panebrowserview.cpp
Only in esperanza-0.4.0/src/ui: panebrowserview.h


Index: esperanza.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esperanza/devel/esperanza.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- esperanza.spec	24 Jul 2009 22:18:50 -0000	1.2
+++ esperanza.spec	11 Aug 2009 20:54:43 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		esperanza
 Summary: 	A graphical audio player
 Version:	0.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source0:	http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz
@@ -9,9 +9,10 @@ Source1:	%{name}.desktop
 # Derived from the included image in data/images
 Source2:	%{name}.png
 Patch0:		esperanza-0.4.0-gitfixes20081204.patch
+Patch1:		esperanza-0.4.0-gitfixes20090811.patch
 URL:		http://wiki.xmms2.xmms.se/wiki/Client:Esperanza
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xmms2-devel, qt-devel
+BuildRequires:	xmms2-devel >= 0.6, qt-devel
 BuildRequires:	desktop-file-utils
 
 %description
@@ -21,6 +22,7 @@ It has a sleek, uncomplicated UI, and su
 %prep
 %setup -q
 %patch0 -p1 -b .gitfixes
+%patch1 -p1 -b .moregit
 # Don't need exec perms here
 chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel*
 
@@ -56,6 +58,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-4
+- sync up with latest git to support new xmms 0.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Tue Aug 11 20:55:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 20:55:26 +0000 (UTC)
Subject: rpms/gxmms2/devel .cvsignore, 1.2, 1.3 gxmms2.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090811205526.2C1C611C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gxmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14922

Modified Files:
	.cvsignore gxmms2.spec sources 
Log Message:
update for xmms 0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gxmms2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Dec 2008 16:30:25 -0000	1.2
+++ .cvsignore	11 Aug 2009 20:55:25 -0000	1.3
@@ -1 +1 @@
-gxmms2-0.7.0.tar.gz
+gxmms2-20090811git.tar.bz2


Index: gxmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmms2/devel/gxmms2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gxmms2.spec	25 Jul 2009 01:58:05 -0000	1.3
+++ gxmms2.spec	11 Aug 2009 20:55:26 -0000	1.4
@@ -1,14 +1,19 @@
 Name:		gxmms2
 Summary: 	A graphical audio player
 Version:	0.7.0
-Release:	4%{?dist}
+Release:	5.20090811git%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
-Source0:	http://wejp.k.vu/projects/xmms2/%{name}-%{version}.tar.gz
+# No stable release supports xmms 0.6 yet
+# Support is in git though.
+# git clone git://git.xmms.se/xmms2/gxmms2.git
+# tar cvfj gxmms2-20090811git.tar.bz2 gxmms2
+# Source0:	http://wejp.k.vu/projects/xmms2/%{name}-%{version}.tar.gz
+Source0:	%{name}-20090811git.tar.bz2
 Source1:	%{name}.desktop
 URL:		http://wejp.k.vu/projects/xmms2/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xmms2-devel, gtk2-devel, pango-devel, atk-devel
+BuildRequires:	xmms2-devel >= 0.6, gtk2-devel, pango-devel, atk-devel
 BuildRequires:	desktop-file-utils
 
 %description
@@ -29,7 +34,7 @@ opens a menu with two items for opening 
 library window.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 sed -i 's|/lib/|/%{_lib}/|g' Makefile
 
 %build
@@ -63,6 +68,9 @@ rm -rf %{buildroot}
 %{_libdir}/gkrellm2/plugins/gkrellxmms2.so
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.0-5.20090811git
+- update to git checkout to support xmms 0.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxmms2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Dec 2008 16:30:25 -0000	1.2
+++ sources	11 Aug 2009 20:55:26 -0000	1.3
@@ -1 +1 @@
-5419a977d75e33f201fa63f5c5d196a6  gxmms2-0.7.0.tar.gz
+109552529b8b39b70b9b0465e39c55e8  gxmms2-20090811git.tar.bz2



From pjones at fedoraproject.org  Tue Aug 11 20:56:12 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue, 11 Aug 2009 20:56:12 +0000 (UTC)
Subject: rpms/gnu-efi/devel gnu-efi.spec,1.33,1.34
Message-ID: <20090811205612.D06F711C00D7@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/gnu-efi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15138

Modified Files:
	gnu-efi.spec 
Log Message:
* Tue Aug 11 2009 Peter Jones <pjones at redhat.com> - 3.0e-9
- Change ExclusiveArch to reflect arch changes in repos.



Index: gnu-efi.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gnu-efi.spec	25 Jul 2009 00:53:49 -0000	1.33
+++ gnu-efi.spec	11 Aug 2009 20:56:12 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
 Version: 3.0e
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Development/System
 License: GPLv2+
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
@@ -13,7 +13,7 @@ Patch3: gnu-efi-3.0d-unwrap.patch
 Patch4: gnu-efi-3.0d-uefi_wrap.patch
 Patch5: gnu-efi-3.0d-uefi_wrap_call10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i586 x86_64 ia64
+ExclusiveArch: i686 x86_64 ia64
 
 %define debug_package %{nil}
 
@@ -59,6 +59,9 @@ rm -rf %{buildroot}
 %{_libdir}/*
 
 %changelog
+* Tue Aug 11 2009 Peter Jones <pjones at redhat.com> - 3.0e-9
+- Change ExclusiveArch to reflect arch changes in repos.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0e-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pjones at fedoraproject.org  Tue Aug 11 20:56:44 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Tue, 11 Aug 2009 20:56:44 +0000 (UTC)
Subject: rpms/grub/devel grub.spec,1.105,1.106
Message-ID: <20090811205644.18DE511C00D7@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15331

Modified Files:
	grub.spec 
Log Message:
Update gnu-efi dep.



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- grub.spec	11 Aug 2009 15:29:50 -0000	1.105
+++ grub.spec	11 Aug 2009 20:56:43 -0000	1.106
@@ -8,7 +8,7 @@ License: GPLv2+
 ExclusiveArch: i686 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
 BuildRequires: autoconf /usr/lib/crt1.o automake
-BuildRequires: gnu-efi >= 3.0e-7
+BuildRequires: gnu-efi >= 3.0e-9
 BuildRequires: glibc-static
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info



From spot at fedoraproject.org  Tue Aug 11 20:56:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 20:56:39 +0000 (UTC)
Subject: rpms/lxmusic/devel lxmusic-0.3.0-no-tools-menu.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lxmusic.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090811205639.41D6511C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lxmusic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15308

Modified Files:
	.cvsignore lxmusic.spec sources 
Added Files:
	lxmusic-0.3.0-no-tools-menu.patch 
Log Message:
update to 3.0 for xmms 0.6

lxmusic-0.3.0-no-tools-menu.patch:
 lxmusic.ui.glade |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE lxmusic-0.3.0-no-tools-menu.patch ---
diff -up lxmusic-0.3.0/data/lxmusic.ui.glade.BAD lxmusic-0.3.0/data/lxmusic.ui.glade
--- lxmusic-0.3.0/data/lxmusic.ui.glade.BAD	2009-08-11 16:20:39.915240510 -0400
+++ lxmusic-0.3.0/data/lxmusic.ui.glade	2009-08-11 16:21:02.868240450 -0400
@@ -180,12 +180,6 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="tools_mi">
-            <property name="name">tools_mi</property>
-            <property name="label" translatable="yes">_Tools</property>
-          </object>
-        </child>
-        <child>
           <object class="GtkAction" id="help_mi">
             <property name="name">help_mi</property>
             <property name="label" translatable="yes">_Help</property>
@@ -230,7 +224,6 @@
         <menu action="view_mi">
           <menuitem action="show_pl"/>
         </menu>
-        <menuitem action="tools_mi"/>
         <menu action="help_mi">
           <menuitem action="about_mi"/>
         </menu>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Apr 2009 10:08:56 -0000	1.2
+++ .cvsignore	11 Aug 2009 20:56:39 -0000	1.3
@@ -1 +1 @@
-lxmusic-0.2.3.tar.gz
+lxmusic-0.3.0.tar.gz


Index: lxmusic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/lxmusic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxmusic.spec	25 Jul 2009 11:31:16 -0000	1.3
+++ lxmusic.spec	11 Aug 2009 20:56:39 -0000	1.4
@@ -1,18 +1,18 @@
 Name:           lxmusic
-Version:        0.2.3
-Release:        4%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-Patch0:         lxmusic-0.2.3-no-tools-menu.patch
+Patch0:         lxmusic-0.3.0-no-tools-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.5 
-BuildRequires:  desktop-file-utils gettext intltool
-Requires:       xmms2 >= 0.5
+BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6
+BuildRequires:  desktop-file-utils gettext intltool libnotify-devel
+Requires:       xmms2 >= 0.6
 
 %description
 LXMusic is a very simple gtk+ XMMS2 client written in pure C. It has very few 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-1
+- update to 0.3.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmusic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2009 10:08:56 -0000	1.2
+++ sources	11 Aug 2009 20:56:39 -0000	1.3
@@ -1 +1 @@
-10d6fbbb7053afd338c0e0674f09949e  lxmusic-0.2.3.tar.gz
+bb197a65d66f315fdc24c9f727dc53e2  lxmusic-0.3.0.tar.gz



From spot at fedoraproject.org  Tue Aug 11 20:58:19 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 20:58:19 +0000 (UTC)
Subject: rpms/xmms2/devel
	xmms2-0.6DrMattDestruction-moresaneversioning.patch, 
	NONE, 1.1 xmms2-0.6DrMattDestruction-pulse-output-default.patch,
	NONE, 1.1 xmms2-0.6DrMattDestruction-use-libdir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xmms2.spec, 1.6, 1.7
Message-ID: <20090811205819.E864C11C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15725

Modified Files:
	.cvsignore sources xmms2.spec 
Added Files:
	xmms2-0.6DrMattDestruction-moresaneversioning.patch 
	xmms2-0.6DrMattDestruction-pulse-output-default.patch 
	xmms2-0.6DrMattDestruction-use-libdir.patch 
Log Message:
update to 0.6

xmms2-0.6DrMattDestruction-moresaneversioning.patch:
 wscript |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE xmms2-0.6DrMattDestruction-moresaneversioning.patch ---
diff -up xmms2-0.6DrMattDestruction/wscript.versionsanity xmms2-0.6DrMattDestruction/wscript
--- xmms2-0.6DrMattDestruction/wscript.versionsanity	2009-08-11 14:00:44.013247917 -0400
+++ xmms2-0.6DrMattDestruction/wscript	2009-08-11 14:01:48.446370522 -0400
@@ -23,7 +23,7 @@ import Build
 import Configure
 from logging import fatal, warning
 
-BASEVERSION="0.6 DrMattDestruction"
+BASEVERSION="0.6"
 APPNAME='xmms2'
 
 srcdir='.'
@@ -269,14 +269,15 @@ def configure(conf):
 
     nam,changed = gittools.get_info()
     conf.check_message("git commit id", "", True, nam)
-    if Options.options.customversion:
-        conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
-    else:
-        dirty=""
-        if changed:
-            dirty="-dirty"
-        conf.check_message("uncommitted changes", "", bool(changed))
-        conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
+    ## if Options.options.customversion:
+    ##    conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
+    ## else:
+    ##     dirty=""
+    ##     if changed:
+    ##         dirty="-dirty"
+    ##     conf.check_message("uncommitted changes", "", bool(changed))
+    ##     conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
+    conf.env["VERSION"] = BASEVERSION
 
     ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
     ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']

xmms2-0.6DrMattDestruction-pulse-output-default.patch:
 wscript |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xmms2-0.6DrMattDestruction-pulse-output-default.patch ---
diff -up xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript.BAD xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript
--- xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript.BAD	2009-08-11 13:58:27.922241908 -0400
+++ xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript	2009-08-11 13:58:32.982243043 -0400
@@ -7,4 +7,4 @@ def plugin_configure(conf):
 
 configure, build = plugin("pulse", configure=plugin_configure,
                           source=["pulse.c", "backend.c"],
-                          output_prio=25, libs=["pulse"])
+                          output_prio=45, libs=["pulse"])

xmms2-0.6DrMattDestruction-use-libdir.patch:
 src/include/xmms/wscript   |    3 +--
 wafadmin/Tools/ccroot.py   |    2 +-
 wafadmin/Tools/gnu_dirs.py |    2 +-
 wafadmin/Tools/libtool.py  |    4 ++--
 waftools/tool.py           |    2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE xmms2-0.6DrMattDestruction-use-libdir.patch ---
diff -up xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD xmms2-0.6DrMattDestruction/src/include/xmms/wscript
--- xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD	2009-08-11 15:17:57.020242949 -0400
+++ xmms2-0.6DrMattDestruction/src/include/xmms/wscript	2009-08-11 15:18:04.940381687 -0400
@@ -15,8 +15,7 @@ def configure(conf):
 
     defs = {}
 
-    defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'],
-                                     'lib', 'xmms2')
+    defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2')
     defs['BINDIR']    = conf.env['BINDIR']
     defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'],
                                      'share', 'xmms2')
diff -up xmms2-0.6DrMattDestruction/waftools/tool.py.BAD xmms2-0.6DrMattDestruction/waftools/tool.py
--- xmms2-0.6DrMattDestruction/waftools/tool.py.BAD	2009-08-11 15:28:30.157242468 -0400
+++ xmms2-0.6DrMattDestruction/waftools/tool.py	2009-08-11 15:28:45.251245035 -0400
@@ -6,5 +6,5 @@ def add_install_flag(bld, obj):
 
     if env['explicit_install_name']:
         libname = obj.env["shlib_PATTERN"] % obj.target
-        insname = os.path.join(obj.env["PREFIX"], 'lib', libname)
+        insname = os.path.join(obj.env["LIBDIR"], libname)
         obj.env.append_unique("LINKFLAGS", '-install_name ' + insname)
diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py
--- xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD	2009-08-11 15:33:10.276383650 -0400
+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py	2009-08-11 15:33:33.646236480 -0400
@@ -45,7 +45,7 @@ def fakelibtool_build(task):
 	fu("current=0\n")
 	fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n")
 	fu("dlopen=''\ndlpreopen=''\n")
-	fu("libdir='%s/lib'\n" % env['PREFIX'])
+	fu("libdir='%s'\n" % env['LIBDIR'])
 	dest.close()
 	return 0
 
@@ -75,7 +75,7 @@ def apply_link_libtool(self):
 		self.latask = latask
 
 	if Options.commands['install'] or Options.commands['uninstall']:
-		Build.bld.install_files('PREFIX', 'lib', linktask.outputs[0].abspath(self.env), self.env)
+		Build.bld.install_files('LIBDIR', linktask.outputs[0].abspath(self.env), self.env)
 
 @taskgen
 @feature("libtool")
diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py
--- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD	2009-08-11 15:35:28.864257981 -0400
+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py	2009-08-11 15:35:36.165270276 -0400
@@ -127,7 +127,7 @@ def vars_target_cprogram(self):
 @feature('cstaticlib', 'dstaticlib', 'cshlib', 'dshlib')
 @before('apply_core')
 def vars_target_cstaticlib(self):
-	self.default_install_path = '${PREFIX}/lib'
+	self.default_install_path = '${LIBDIR}'
 	if sys.platform in ['win32', 'cygwin']:
 		# on win32, libraries need the execute bit, else we
 		# get 'permission denied' when using them (issue 283)
diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py
--- xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD	2009-08-11 15:35:49.334273249 -0400
+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py	2009-08-11 15:36:35.058242288 -0400
@@ -39,7 +39,7 @@ libexecdir, program executables, $(EXEC_
 sysconfdir, read-only single-machine data, $(PREFIX)/etc
 sharedstatedir, modifiable architecture-independent data, $(PREFIX)/com
 localstatedir, modifiable single-machine data, $(PREFIX)/var
-libdir, object code libraries, $(EXEC_PREFIX)/lib
+libdir, object code libraries, $(LIBDIR)
 includedir, C header files, $(PREFIX)/include
 oldincludedir, C header files for non-gcc, /usr/include
 datarootdir, read-only arch.-independent data root, $(PREFIX)/share


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Dec 2008 22:49:52 -0000	1.2
+++ .cvsignore	11 Aug 2009 20:58:19 -0000	1.3
@@ -1 +1 @@
-xmms2-0.5DrLecter-clean.tar.bz2
+xmms2-0.6DrMattDestruction-clean.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2008 22:49:52 -0000	1.2
+++ sources	11 Aug 2009 20:58:19 -0000	1.3
@@ -1 +1 @@
-b615fd8396ea5469d618081c2dd802ff  xmms2-0.5DrLecter-clean.tar.bz2
+2e73303e6ec81d52d8927b9023793e4c  xmms2-0.6DrMattDestruction-clean.tar.bz2


Index: xmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xmms2.spec	27 Jul 2009 08:19:03 -0000	1.6
+++ xmms2.spec	11 Aug 2009 20:58:19 -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)")}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?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"] ')}
 
-%define codename DrLecter
+%global codename DrMattDestruction
 
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
-Version:		0.5
-Release:		7%{?dist}
+Version:		0.6
+Release:		1%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -14,18 +14,14 @@ Group:			Applications/Multimedia
 # Cleaning it is simple, just rm -rf src/plugins/mp4
 Source0:		%{name}-%{version}%{codename}-clean.tar.bz2
 Source1:		xmms2-client-launcher.sh
-# From upstream git (Compilation fixes)
-Patch0:			xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch
 # Use libdir properly for Fedora multilib
-Patch1:			xmms2-0.5DrLecter-use-libdir.patch
+Patch1:			xmms2-0.6DrMattDestruction-use-libdir.patch
 # Set default output to pulse
-Patch2:			xmms2-0.5DrLecter-pulse-output-default.patch
-# From upstream git (fix speex)
-Patch3:			xmms2-devel.git-054a12d54325820c8d31e482193007af0ed15be3.patch
+Patch2:			xmms2-0.6DrMattDestruction-pulse-output-default.patch
 # Don't add extra CFLAGS, we're smart enough, thanks.
 Patch4:			xmms2-0.5DrLecter-no-O0.patch
 # More sane versioning
-Patch5:			xmms2-0.5DrLecter-moresaneversioning.patch
+Patch5:			xmms2-0.6DrMattDestruction-moresaneversioning.patch
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		sqlite-devel, flac-devel, libofa-devel
@@ -36,6 +32,7 @@ BuildRequires:		libao-devel, libshout-de
 BuildRequires:		perl-devel, boost-devel, pulseaudio-libs-devel, avahi-glib-devel
 BuildRequires:		libmodplug-devel, ecore-devel, gamin-devel
 BuildRequires:		avahi-compat-libdns_sd-devel, doxygen
+BuildRequires:		libvisual-devel, wavpack-devel
 
 %description
 XMMS2 is an audio framework, but it is not a general multimedia player - it 
@@ -51,7 +48,7 @@ client (such as gxmms2 or esperanza).
 %package devel
 Summary:	Development libraries and headers for XMMS2
 Group:		Development/Libraries
-Requires:	glib2-devel, qt-devel, boost-devel
+Requires:	glib2-devel, boost-devel
 Requires:	pkgconfig
 Requires:	%{name} = %{version}-%{release}
 
@@ -94,12 +91,20 @@ Requires:	ruby(abi) = 1.8
 %description ruby
 Ruby bindings for XMMS2.
 
+%package -n nyxmms2
+Summary:	Commandline client for XMMS2
+Group:		Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+
+%description -n nyxmms2
+nyxmms2 is the new official commandline client for XMMS2. It can be run in
+either shell-mode (if started without arguments), or in inline-mode where
+it executes the command passed as argument directly.
+
 %prep
 %setup -q -n %{name}-%{version}%{codename}
-%patch0 -p1 -b .compilefix
 %patch1 -p1 -b .plugins-use-libdir
 %patch2 -p1 -b .default-output-pulse
-%patch3 -p1 -b .fix-speex
 %patch4 -p1 -b .noO0
 %patch5 -p1 -b .versionsanity
 
@@ -111,10 +116,12 @@ WAFADMIN_FILES=`find wafadmin/ -type f`
 for i in $WAFADMIN_FILES; do
 	sed -i 's|/usr/lib|%{_libdir}|g' $i
 done
+sed -i 's|"lib"|"%{_lib}"|g' wscript
 
 %build
 export CFLAGS="%{optflags}"
 export CPPFLAGS="%{optflags}"
+export LIBDIR="%{_libdir}"
 ./waf configure --prefix=%{_prefix} --with-libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
 ./waf build -v %{?_smp_mflags}
 # make the docs
@@ -122,6 +129,7 @@ doxygen
 
 %install
 rm -rf %{buildroot}
+export LIBDIR="%{_libdir}"
 ./waf install --destdir=%{buildroot} --prefix=%{_prefix} --with-libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
 
 # exec flags for debuginfo
@@ -150,6 +158,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL README TODO
 %{_bindir}/%{name}*
+%{_bindir}/vistest*
 %{_libdir}/libxmmsclient*.so.*
 %{_libdir}/%{name}
 %{_mandir}/man1/%{name}*
@@ -179,7 +188,15 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{ruby_sitearch}/xmmsclient*
 
+%files -n nyxmms2
+%defattr(-,root,root,-)
+%{_bindir}/nyxmms2
+%{_mandir}/man1/nyxmms2.*
+
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-1
+- update to 0.6
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Tue Aug 11 21:09:15 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 21:09:15 +0000 (UTC)
Subject: rpms/xmms2/devel xmms2.spec,1.7,1.8
Message-ID: <20090811210915.C4E4B11C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17354

Modified Files:
	xmms2.spec 
Log Message:
BuildRequires: SDL-devel


Index: xmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xmms2.spec	11 Aug 2009 20:58:19 -0000	1.7
+++ xmms2.spec	11 Aug 2009 21:09:15 -0000	1.8
@@ -6,7 +6,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.6
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -32,7 +32,7 @@ BuildRequires:		libao-devel, libshout-de
 BuildRequires:		perl-devel, boost-devel, pulseaudio-libs-devel, avahi-glib-devel
 BuildRequires:		libmodplug-devel, ecore-devel, gamin-devel
 BuildRequires:		avahi-compat-libdns_sd-devel, doxygen
-BuildRequires:		libvisual-devel, wavpack-devel
+BuildRequires:		libvisual-devel, wavpack-devel, SDL-devel
 
 %description
 XMMS2 is an audio framework, but it is not a general multimedia player - it 
@@ -194,6 +194,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/nyxmms2.*
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-2
+- BuildRequires: SDL-devel
+
 * Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-1
 - update to 0.6
 



From jkratoch at fedoraproject.org  Tue Aug 11 21:15:13 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 11 Aug 2009 21:15:13 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.3-pie-20050110.patch, 1.19,
	1.20 gdb-archer.patch, 1.22, 1.23 gdb.spec, 1.372, 1.373
Message-ID: <20090811211513.B3FFB11C0492@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18183

Modified Files:
	gdb-6.3-pie-20050110.patch gdb-archer.patch gdb.spec 
Log Message:
* Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-3
- archer-jankratochvil-fedora12 commit: 2888fafe63889757c6fd27ccc2f25661d43fd1a4
- Drop archer-jankratochvil-vla VAROBJ invalidate/revalidate split to fix
  regressions against FSF GDB HEAD.


gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infrun.c      |    4 
 objfiles.c    |   14 +
 solib-svr4.c  |  474 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 14 files changed, 610 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gdb-6.3-pie-20050110.patch	11 Aug 2009 14:42:46 -0000	1.19
+++ gdb-6.3-pie-20050110.patch	11 Aug 2009 21:15:12 -0000	1.20
@@ -26,10 +26,10 @@
 
 	Fix scan_dyntag() for binaries provided by valgrind (BZ 460319).
 
-Index: gdb-6.8.50.20090809/gdb/amd64-tdep.c
+Index: gdb-6.8.50.20090811/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/amd64-tdep.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/amd64-tdep.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/amd64-tdep.c	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/amd64-tdep.c	2009-08-11 23:12:34.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -138,10 +138,10 @@ Index: gdb-6.8.50.20090809/gdb/amd64-tde
    return pc;
  }
  
-Index: gdb-6.8.50.20090809/gdb/auxv.c
+Index: gdb-6.8.50.20090811/gdb/auxv.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/auxv.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/auxv.c	2009-08-11 23:12:34.000000000 +0200
 @@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
@@ -230,10 +230,10 @@ Index: gdb-6.8.50.20090809/gdb/auxv.c
  	break;
      }
  
-Index: gdb-6.8.50.20090809/gdb/auxv.h
+Index: gdb-6.8.50.20090811/gdb/auxv.h
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/auxv.h	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/auxv.h	2009-08-11 23:12:34.000000000 +0200
 @@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -251,11 +251,11 @@ Index: gdb-6.8.50.20090809/gdb/auxv.h
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
-Index: gdb-6.8.50.20090809/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/dwarf2read.c	2009-08-10 14:59:28.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/dwarf2read.c	2009-08-10 14:59:58.000000000 +0200
-@@ -1659,7 +1659,7 @@ dwarf2_build_psymtabs (struct objfile *o
+--- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-11 23:12:34.000000000 +0200
+@@ -1653,7 +1653,7 @@ dwarf2_build_psymtabs (struct objfile *o
    dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
    dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
  
@@ -264,10 +264,10 @@ Index: gdb-6.8.50.20090809/gdb/dwarf2rea
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
-Index: gdb-6.8.50.20090809/gdb/elfread.c
+Index: gdb-6.8.50.20090811/gdb/elfread.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/elfread.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/elfread.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/elfread.c	2009-08-11 23:12:31.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/elfread.c	2009-08-11 23:12:34.000000000 +0200
 @@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
@@ -277,10 +277,10 @@ Index: gdb-6.8.50.20090809/gdb/elfread.c
      {
        init_psymbol_list (objfile, 0);
        mainline = 0;
-Index: gdb-6.8.50.20090809/gdb/infrun.c
+Index: gdb-6.8.50.20090811/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/infrun.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/infrun.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/infrun.c	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/infrun.c	2009-08-11 23:12:34.000000000 +0200
 @@ -3531,6 +3531,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
@@ -292,13 +292,13 @@ Index: gdb-6.8.50.20090809/gdb/infrun.c
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-Index: gdb-6.8.50.20090809/gdb/objfiles.c
+Index: gdb-6.8.50.20090811/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/objfiles.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/objfiles.c	2009-08-10 14:59:58.000000000 +0200
-@@ -52,6 +52,9 @@
+--- gdb-6.8.50.20090811.orig/gdb/objfiles.c	2009-08-11 23:12:31.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/objfiles.c	2009-08-11 23:12:51.000000000 +0200
+@@ -51,6 +51,9 @@
+ #include "arch-utils.h"
  #include "exec.h"
- #include "observer.h"
  
 +#include "auxv.h"
 +#include "elf/common.h"
@@ -306,7 +306,7 @@ Index: gdb-6.8.50.20090809/gdb/objfiles.
  /* Prototypes for local functions */
  
  static void objfile_alloc_data (struct objfile *objfile);
-@@ -279,9 +282,17 @@ init_entry_point_info (struct objfile *o
+@@ -278,9 +281,17 @@ init_entry_point_info (struct objfile *o
  CORE_ADDR
  entry_point_address (void)
  {
@@ -334,10 +334,10 @@ Index: gdb-6.8.50.20090809/gdb/objfiles.
    /* Before the symbol table code was redone to make it easier to
       selectively load and remove information particular to a specific
       linkage unit, gdb used to do these things whenever the monolithic
-Index: gdb-6.8.50.20090809/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090811/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/solib-svr4.c	2009-08-10 14:56:11.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/solib-svr4.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/solib-svr4.c	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/solib-svr4.c	2009-08-11 23:12:34.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
@@ -999,10 +999,10 @@ Index: gdb-6.8.50.20090809/gdb/solib-svr
 +  add_info ("linkmap", info_linkmap_command,
 +	    "Display the inferior's linkmap.");
  }
-Index: gdb-6.8.50.20090809/gdb/solib.c
+Index: gdb-6.8.50.20090811/gdb/solib.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/solib.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/solib.c	2009-08-10 15:07:13.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/solib.c	2009-08-11 23:12:31.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/solib.c	2009-08-11 23:12:34.000000000 +0200
 @@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
@@ -1021,7 +1021,7 @@ Index: gdb-6.8.50.20090809/gdb/solib.c
  /*
  
     GLOBAL FUNCTION
-@@ -453,14 +453,38 @@ symbol_add_stub (struct so_list *so, int
+@@ -449,14 +453,38 @@ symbol_add_stub (struct so_list *so, int
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
      {
@@ -1139,10 +1139,10 @@ Index: gdb-6.8.50.20090809/gdb/solib.c
 +			   NULL, NULL,
 +			   &setdebuglist, &showdebuglist);
  }
-Index: gdb-6.8.50.20090809/gdb/solist.h
+Index: gdb-6.8.50.20090811/gdb/solist.h
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/solist.h	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/solist.h	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/solist.h	2009-08-11 23:12:31.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/solist.h	2009-08-11 23:12:34.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1163,10 +1163,10 @@ Index: gdb-6.8.50.20090809/gdb/solist.h
 +extern int debug_solib;
 +
  #endif
-Index: gdb-6.8.50.20090809/gdb/symfile-mem.c
+Index: gdb-6.8.50.20090811/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/symfile-mem.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/symfile-mem.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/symfile-mem.c	2009-08-11 23:12:31.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile-mem.c	2009-08-11 23:12:34.000000000 +0200
 @@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
  	++i;
        }
@@ -1176,10 +1176,10 @@ Index: gdb-6.8.50.20090809/gdb/symfile-m
                                     sai, OBJF_SHARED);
  
    /* This might change our ideas about frames already looked at.  */
-Index: gdb-6.8.50.20090809/gdb/symfile.c
+Index: gdb-6.8.50.20090811/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/symfile.c	2009-08-10 14:59:28.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/symfile.c	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/symfile.c	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile.c	2009-08-11 23:12:34.000000000 +0200
 @@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
@@ -1188,7 +1188,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  #include "observer.h"
  #include "exec.h"
  #include "parser-defs.h"
-@@ -785,7 +786,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -786,7 +787,7 @@ syms_from_objfile (struct objfile *objfi
  
    /* Now either addrs or offsets is non-zero.  */
  
@@ -1197,7 +1197,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
      {
        /* We will modify the main symbol table, make sure that all its users
           will be cleaned up if an error occurs during symbol reading.  */
-@@ -813,7 +814,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -814,7 +815,7 @@ syms_from_objfile (struct objfile *objfi
  
       We no longer warn if the lowest section is not a text segment (as
       happens for the PA64 port.  */
@@ -1206,7 +1206,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
      {
        asection *lower_sect;
        asection *sect;
-@@ -896,7 +897,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -897,7 +898,7 @@ syms_from_objfile (struct objfile *objfi
        init_objfile_sect_indices (objfile);
      }
  
@@ -1215,7 +1215,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    /* Discard cleanups as symbol reading was successful.  */
  
-@@ -915,17 +916,22 @@ new_symfile_objfile (struct objfile *obj
+@@ -916,17 +917,22 @@ new_symfile_objfile (struct objfile *obj
    /* If this is the main symbol file we have to clean up all users of the
       old main symbol file. Otherwise it is sufficient to fixup all the
       breakpoints that may have been redefined by this symbol file.  */
@@ -1240,7 +1240,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    /* We're done reading the symbol file; finish off complaints.  */
    clear_complaints (&symfile_complaints, 0, add_flags & SYMFILE_VERBOSE);
-@@ -982,7 +988,7 @@ symbol_file_add_with_addrs_or_offsets (b
+@@ -980,7 +986,7 @@ symbol_file_add_with_addrs_or_offsets (b
    /* Give user a chance to burp if we'd be
       interactively wiping out any existing symbols.  */
  
@@ -1249,7 +1249,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
        && (have_full_symbols () || have_partial_symbols ())
        && from_tty
        && (have_full_symbols () || have_partial_symbols ())
-@@ -1183,6 +1189,9 @@ symbol_file_clear (int from_tty)
+@@ -1181,6 +1187,9 @@ symbol_file_clear (int from_tty)
  		    symfile_objfile->name)
  	  : !query (_("Discard symbol table? "))))
      error (_("Not confirmed."));
@@ -1259,7 +1259,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    free_all_objfiles ();
  
-@@ -3387,6 +3396,8 @@ reread_symbols (void)
+@@ -3385,6 +3394,8 @@ reread_symbols (void)
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
@@ -1268,10 +1268,10 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-Index: gdb-6.8.50.20090809/gdb/target.h
+Index: gdb-6.8.50.20090811/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/target.h	2009-08-10 14:59:28.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/target.h	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/target.h	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/target.h	2009-08-11 23:12:34.000000000 +0200
 @@ -524,7 +524,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
@@ -1281,10 +1281,10 @@ Index: gdb-6.8.50.20090809/gdb/target.h
  
      /* Search SEARCH_SPACE_LEN bytes beginning at START_ADDR for the
         sequence of bytes in PATTERN with length PATTERN_LEN.
-Index: gdb-6.8.50.20090809/gdb/symfile.h
+Index: gdb-6.8.50.20090811/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/symfile.h	2009-08-10 14:59:28.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/symfile.h	2009-08-10 14:59:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/symfile.h	2009-08-11 23:12:32.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile.h	2009-08-11 23:12:34.000000000 +0200
 @@ -229,7 +229,13 @@ enum symfile_add_flags
      SYMFILE_MAINLINE = 1 << 2,
  

gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 block.c                                                  |   23 
 block.h                                                  |    2 
 breakpoint.c                                             |  102 
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 ++
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  223 +-
 cp-support.c                                             |   88 
 cp-support.h                                             |   59 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   33 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |  102 
 dwarf2expr.h                                             |   70 
 dwarf2loc.c                                              |  361 +++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1538 +++++++++------
 elfread.c                                                |   11 
 eval.c                                                   |  170 +
 expression.h                                             |   11 
 f-exp.y                                                  |    4 
 f-lang.c                                                 |  413 ----
 f-lang.h                                                 |   38 
 f-typeprint.c                                            |   36 
 f-valprint.c                                             |  267 --
 findcmd.c                                                |  111 -
 findvar.c                                                |  126 -
 frame.c                                                  |   17 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 ++
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 +++++
 gdbtypes.h                                               |  140 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  115 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 ++++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 +
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 +++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 +++
 python/python-symtab.c                                   |  322 +++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |  123 +
 python/python.c                                          |  384 +++
 python/python.h                                          |    8 
 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                                                |   42 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  316 +--
 symtab.h                                                 |   17 
 target.h                                                 |   22 
 testsuite/ChangeLog                                      |   97 
 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.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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                  |   16 
 testsuite/gdb.cp/namespace-recursive.exp                 |   53 
 testsuite/gdb.cp/namespace-using.cc                      |  128 +
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 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/callframecfa.S                      |  309 +++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 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                        |  158 +
 testsuite/gdb.fortran/dynamic.f90                        |   98 
 testsuite/gdb.fortran/logical.exp                        |   44 
 testsuite/gdb.fortran/logical.f90                        |   33 
 testsuite/gdb.fortran/string.exp                         |   72 
 testsuite/gdb.fortran/string.f90                         |   37 
 testsuite/gdb.gdb/selftest.exp                           |    4 
 testsuite/gdb.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   96 
 testsuite/gdb.python/python-prettyprint.c                |   13 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   86 
 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                                                 |  254 ++
 valprint.c                                               |    3 
 value.c                                                  |  208 +-
 value.h                                                  |   10 
 varobj.c                                                 |  587 ++++-
 varobj.h                                                 |   30 
 xcoffread.c                                              |    1 
 220 files changed, 16434 insertions(+), 2610 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gdb-archer.patch	11 Aug 2009 18:07:06 -0000	1.22
+++ gdb-archer.patch	11 Aug 2009 21:15:13 -0000	1.23
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 93f5e942bdcdcc376ece452c309bedabae71def9
+commit 2888fafe63889757c6fd27ccc2f25661d43fd1a4
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -3214,26 +3214,10 @@ index b1c0452..da24b98 100644
  
  @node Language Support
 diff --git a/gdb/doc/observer.texi b/gdb/doc/observer.texi
-index 4984f31..4bbbe4e 100644
+index 4984f31..fcf1b5d 100644
 --- a/gdb/doc/observer.texi
 +++ b/gdb/doc/observer.texi
-@@ -130,6 +130,15 @@ Called with @var{objfile} equal to @code{NULL} to indicate
- previously loaded symbol table data has now been invalidated.
- @end deftypefun
- 
-+ at deftypefun void objfile_unloading (struct objfile *@var{objfile})
-+The file specified by @var{objfile} is going to be removed from @value{GDBN}.
-+ at end deftypefun
-+
-+ at deftypefun void objfile_unloaded (void)
-+Removal of @var{objfile} started by @code{objfile_unloading} finished and
-+ at var{objfile} is no longer known to @value{GDBN}.
-+ at end deftypefun
-+
- @deftypefun void new_thread (struct thread_info *@var{t})
- The thread specified by @var{t} has been created.
- @end deftypefun
-@@ -206,6 +215,11 @@ Either @value{GDBN} detached from the inferior, or the inferior
+@@ -206,6 +206,11 @@ Either @value{GDBN} detached from the inferior, or the inferior
  exited.  The argument @var{pid} identifies the inferior.
  @end deftypefun
  
@@ -10513,23 +10497,17 @@ index a84003f..924c1c5 100644
    default_symfile_offsets,	/* sym_offsets: dummy FIXME til implem sym reloc */
    default_symfile_segments,	/* sym_segments: Get segment information from
 diff --git a/gdb/objfiles.c b/gdb/objfiles.c
-index 586f5d0..a4bf719 100644
+index 586f5d0..6d0451c 100644
 --- a/gdb/objfiles.c
 +++ b/gdb/objfiles.c
-@@ -432,10 +432,9 @@ free_objfile (struct objfile *objfile)
- 	 doesn't reference it.  */
-       objfile->separate_debug_objfile_backlink->separate_debug_objfile = NULL;
-     }
--  
--  /* Remove any references to this objfile in the global value
--     lists.  */
--  preserve_values (objfile);
-+
-+  /* Remove any references to this objfile in the global value lists.  */
-+  observer_notify_objfile_unloading (objfile);
+@@ -50,7 +50,6 @@
+ #include "addrmap.h"
+ #include "arch-utils.h"
+ #include "exec.h"
+-#include "observer.h"
+ 
+ /* Prototypes for local functions */
  
-   /* First do any symbol file specific actions required when we are
-      finished with a particular symbol file.  Note that if the objfile
 @@ -458,12 +457,14 @@ free_objfile (struct objfile *objfile)
  
    unlink_objfile (objfile);
@@ -10842,7 +10820,7 @@ index cbda9c3..a07e6f2 100644
 +
  #endif /* PARSER_DEFS_H */
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index 5d8b936..49c575d 100644
+index 5d8b936..fb0a455 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
 @@ -46,7 +46,6 @@
@@ -10939,13 +10917,11 @@ index 5d8b936..49c575d 100644
  /* display_chain items point to blocks and expressions.  Some expressions in
     turn may point to symbols.
     Both symbols and blocks are obstack_alloc'd on objfile_stack, and are
-@@ -1851,20 +1827,18 @@ display_uses_solib_p (const struct display *d,
-    an item by re-parsing .exp_string field in the new execution context.  */
- 
+@@ -1853,18 +1829,20 @@ display_uses_solib_p (const struct display *d,
  static void
--clear_dangling_display_expressions (struct so_list *solib)
-+clear_dangling_display_expressions (struct objfile *objfile)
+ clear_dangling_display_expressions (struct so_list *solib)
  {
++  struct objfile *objfile = solib->objfile;
    struct display *d;
 -  struct objfile *objfile = NULL;
  
@@ -10958,6 +10934,9 @@ index 5d8b936..49c575d 100644
 -	  d->block = NULL;
 -	}
 -    }
++  if (objfile == NULL)
++    return;
++
 +  for (d = display_chain; d != NULL; d = d->next)
 +    if (block_objfile (d->block) == objfile
 +	|| (d->exp && exp_uses_objfile (d->exp, objfile)))
@@ -10969,16 +10948,7 @@ index 5d8b936..49c575d 100644
  }
  

  
-@@ -2593,7 +2567,7 @@ _initialize_printcmd (void)
- 
-   current_display_number = -1;
- 
--  observer_attach_solib_unloaded (clear_dangling_display_expressions);
-+  observer_attach_objfile_unloading (clear_dangling_display_expressions);
- 
-   add_info ("address", address_info,
- 	    _("Describe where symbol SYM is stored."));
-@@ -2749,4 +2723,6 @@ Show printing of source filename and line number with <symbol>."), NULL,
+@@ -2749,4 +2727,6 @@ Show printing of source filename and line number with <symbol>."), NULL,
  			   NULL,
  			   show_print_symbol_filename,
  			   &setprintlist, &showprintlist);
@@ -17497,26 +17467,13 @@ index 1c37801..594eb16 100644
  	  print_variable_and_value (NULL, sym, frame, stream, 4 * num_tabs);
  	  break;
 diff --git a/gdb/symfile.c b/gdb/symfile.c
-index c182faa..8b971fb 100644
+index c182faa..550d06a 100644
 --- a/gdb/symfile.c
 +++ b/gdb/symfile.c
-@@ -52,7 +52,6 @@
- #include "observer.h"
- #include "exec.h"
- #include "parser-defs.h"
--#include "varobj.h"
- #include "elf-bfd.h"
- #include "solib.h"
- #include "remote.h"
-@@ -926,6 +925,20 @@ new_symfile_objfile (struct objfile *objfile, int add_flags)
- 
-   /* We're done reading the symbol file; finish off complaints.  */
+@@ -928,6 +928,17 @@ new_symfile_objfile (struct objfile *objfile, int add_flags)
    clear_complaints (&symfile_complaints, 0, add_flags & SYMFILE_VERBOSE);
-+
-+  /* We have finished unloading of OBJFILE.  */
-+  observer_notify_objfile_unloaded ();
-+}
-+
+ }
+ 
 +/* A helper function which returns true if OBJFILE has any debug
 +   symbols, and false otherwise.  */
 +static int
@@ -17526,10 +17483,12 @@ index c182faa..8b971fb 100644
 +	  || (objfile->separate_debug_objfile
 +	      && (objfile->separate_debug_objfile->psymtabs
 +		  || objfile->separate_debug_objfile->quick_addrmap)));
- }
- 
++}
++
  /* Process a symbol file, as either the main file or as a dynamically
-@@ -965,13 +978,16 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
+    loaded file.
+ 
+@@ -965,13 +976,16 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
    /* Give user a chance to burp if we'd be
       interactively wiping out any existing symbols.  */
  
@@ -17548,7 +17507,7 @@ index c182faa..8b971fb 100644
    discard_cleanups (my_cleanups);
  
    if (addrs)
-@@ -1007,6 +1023,8 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
+@@ -1007,6 +1021,8 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
  
    if ((flags & OBJF_READNOW) || readnow_symbol_files)
      {
@@ -17557,7 +17516,7 @@ index c182faa..8b971fb 100644
        if ((from_tty || info_verbose) && print_symbol_loading)
  	{
  	  printf_unfiltered (_("expanding to full symbols..."));
-@@ -1025,7 +1043,7 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
+@@ -1025,7 +1041,7 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
    /* If the file has its own symbol tables it has no separate debug info.
       `.dynsym'/`.symtab' go to MSYMBOLS, `.debug_info' goes to SYMTABS/PSYMTABS.
       `.gnu_debuglink' may no longer be present with `.note.gnu.build-id'.  */
@@ -17566,7 +17525,7 @@ index c182faa..8b971fb 100644
      debugfile = find_separate_debug_file (objfile);
    if (debugfile)
      {
-@@ -1049,8 +1067,11 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
+@@ -1049,8 +1065,11 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
        xfree (debugfile);
      }
  
@@ -17580,7 +17539,7 @@ index c182faa..8b971fb 100644
      {
        wrap_here ("");
        printf_unfiltered (_("(no debugging symbols found)"));
-@@ -1166,7 +1187,9 @@ symbol_file_clear (int from_tty)
+@@ -1166,7 +1185,9 @@ symbol_file_clear (int from_tty)
       descriptors as well.  */
    no_shared_libraries (NULL, from_tty);
  
@@ -17591,16 +17550,7 @@ index c182faa..8b971fb 100644
    if (from_tty)
      printf_unfiltered (_("No symbol file now.\n"));
  }
-@@ -2349,7 +2372,7 @@ reread_symbols (void)
- 
- 	      /* Remove any references to this objfile in the global
- 		 value lists.  */
--	      preserve_values (objfile);
-+	      observer_notify_objfile_unloading (objfile);
- 
- 	      /* Nuke all the state that we will re-read.  Much of the following
- 	         code which sets things to NULL really is necessary to tell
-@@ -2437,13 +2460,15 @@ reread_symbols (void)
+@@ -2437,13 +2458,15 @@ reread_symbols (void)
  	         zero is OK since dbxread.c also does what it needs to do if
  	         objfile->global_psymbols.size is 0.  */
  	      (*objfile->sf->sym_read) (objfile, 0);
@@ -17617,17 +17567,7 @@ index c182faa..8b971fb 100644
  	      /* We're done reading the symbol file; finish off complaints.  */
  	      clear_complaints (&symfile_complaints, 0, 1);
  
-@@ -2452,6 +2477,9 @@ reread_symbols (void)
- 
- 	      reinit_frame_cache ();
- 
-+	      /* We have finished reloading of OBJFILE.  */
-+	      observer_notify_objfile_unloaded ();
-+
- 	      /* Discard cleanups as symbol reading was successful.  */
- 	      discard_cleanups (old_cleanups);
- 
-@@ -2741,7 +2769,7 @@ allocate_symtab (char *filename, struct objfile *objfile)
+@@ -2741,7 +2764,7 @@ allocate_symtab (char *filename, struct objfile *objfile)
  }
  
  struct partial_symtab *
@@ -17636,18 +17576,7 @@ index c182faa..8b971fb 100644
  {
    struct partial_symtab *psymtab;
  
-@@ -2832,10 +2860,6 @@ clear_symtab_users (void)
-      between expressions and which ought to be reset each time.  */
-   expression_context_block = NULL;
-   innermost_block = NULL;
--
--  /* Varobj may refer to old symbols, perform a cleanup.  */
--  varobj_invalidate ();
--
- }
- 
- static void
-@@ -3055,7 +3079,8 @@ again2:
+@@ -3055,7 +3078,8 @@ again2:
  
  struct partial_symtab *
  start_psymtab_common (struct objfile *objfile,
@@ -25201,7 +25130,7 @@ index cbb5d94..cf35bf0 100644
  	  ++reps;
  	  ++rep1;
 diff --git a/gdb/value.c b/gdb/value.c
-index 65a5aa9..c943781 100644
+index 65a5aa9..fa39d3d 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
 @@ -37,8 +37,10 @@
@@ -25467,15 +25396,6 @@ index 65a5aa9..c943781 100644
        break;
  
      case INTERNALVAR_VALUE:
-@@ -1469,7 +1551,7 @@ preserve_one_internalvar (struct internalvar *var, struct objfile *objfile,
-    this objfile's types, and the convenience variables will be adjusted to
-    use the new global types.  */
- 
--void
-+static void
- preserve_values (struct objfile *objfile)
- {
-   htab_t copied_types;
 @@ -1490,8 +1572,7 @@ preserve_values (struct objfile *objfile)
    for (var = internalvars; var; var = var->next)
      preserve_one_internalvar (var, objfile, copied_types);
@@ -25567,18 +25487,17 @@ index 65a5aa9..c943781 100644
  /* Create a value representing a pointer of type TYPE to the address
     ADDR.  */
  struct value *
-@@ -2342,4 +2476,9 @@ VARIABLE is already initialized."));
+@@ -2342,4 +2476,8 @@ VARIABLE is already initialized."));
    add_prefix_cmd ("function", no_class, function_command, _("\
  Placeholder command for showing help on convenience functions."),
  		  &functionlist, "function ", 0, &cmdlist);
 +
 +  make_final_cleanup (value_history_cleanup, NULL);
 +
-+  observer_attach_objfile_unloading (preserve_values);
 +  observer_attach_mark_used (value_types_mark_used);
  }
 diff --git a/gdb/value.h b/gdb/value.h
-index 29ad783..ee8440b 100644
+index 29ad783..c357d80 100644
 --- a/gdb/value.h
 +++ b/gdb/value.h
 @@ -344,11 +344,16 @@ extern LONGEST unpack_field_as_long (struct type *type,
@@ -25606,13 +25525,7 @@ index 29ad783..ee8440b 100644
  					  int want_address,
  					  enum noside noside);
  
-@@ -658,12 +664,12 @@ extern void typedef_print (struct type *type, struct symbol *news,
- 
- extern char *internalvar_name (struct internalvar *var);
- 
--extern void preserve_values (struct objfile *);
--
- /* From values.c */
+@@ -664,6 +670,8 @@ extern void preserve_values (struct objfile *);
  
  extern struct value *value_copy (struct value *);
  
@@ -25621,7 +25534,7 @@ index 29ad783..ee8440b 100644
  /* From valops.c */
  
  extern struct value *varying_to_slice (struct value *);
-@@ -681,7 +687,7 @@ extern struct value *value_allocate_space_in_inferior (int);
+@@ -681,7 +689,7 @@ extern struct value *value_allocate_space_in_inferior (int);
  extern struct value *value_of_local (const char *name, int complain);
  
  extern struct value *value_subscripted_rvalue (struct value *array,
@@ -25631,10 +25544,10 @@ index 29ad783..ee8440b 100644
  /* User function handler.  */
  
 diff --git a/gdb/varobj.c b/gdb/varobj.c
-index 4a94988..34333fb 100644
+index 4a94988..f2654f0 100644
 --- a/gdb/varobj.c
 +++ b/gdb/varobj.c
-@@ -26,14 +26,18 @@
+@@ -26,9 +26,12 @@
  #include "gdbcmd.h"
  #include "block.h"
  #include "valprint.h"
@@ -25647,13 +25560,7 @@ index 4a94988..34333fb 100644
  
  #include "varobj.h"
  #include "vec.h"
- #include "gdbthread.h"
- #include "inferior.h"
-+#include "observer.h"
- 
- #if HAVE_PYTHON
- #include "python/python.h"
-@@ -59,6 +63,15 @@ char *varobj_format_string[] =
+@@ -59,6 +62,15 @@ char *varobj_format_string[] =
  /* String representations of gdb's known languages */
  char *varobj_language_string[] = { "unknown", "C", "C++", "Java" };
  
@@ -25669,7 +25576,7 @@ index 4a94988..34333fb 100644
  /* Data structures */
  
  /* Every root variable has one of these structures saved in its
-@@ -173,9 +186,31 @@ struct varobj
+@@ -173,9 +185,31 @@ struct varobj
       frozen.  */
    int not_fetched;
  
@@ -25701,7 +25608,7 @@ index 4a94988..34333fb 100644
  };
  
  struct cpstack
-@@ -221,6 +256,8 @@ static void free_variable (struct varobj *var);
+@@ -221,6 +255,8 @@ static void free_variable (struct varobj *var);
  
  static struct cleanup *make_cleanup_free_variable (struct varobj *var);
  
@@ -25710,7 +25617,7 @@ index 4a94988..34333fb 100644
  static struct type *get_type (struct varobj *var);
  
  static struct type *get_value_type (struct varobj *var);
-@@ -236,8 +273,6 @@ static char *cppop (struct cpstack **pstack);
+@@ -236,8 +272,6 @@ static char *cppop (struct cpstack **pstack);
  static int install_new_value (struct varobj *var, struct value *value, 
  			      int initial);
  
@@ -25719,7 +25626,7 @@ index 4a94988..34333fb 100644
  /* Language-specific routines. */
  
  static enum varobj_languages variable_language (struct varobj *var);
-@@ -450,6 +485,8 @@ is_root_p (struct varobj *var)
+@@ -450,6 +484,8 @@ is_root_p (struct varobj *var)
  struct cleanup *
  varobj_ensure_python_env (struct varobj *var)
  {
@@ -25728,7 +25635,7 @@ index 4a94988..34333fb 100644
    return ensure_python_env (var->root->exp->gdbarch,
  			    var->root->exp->language_defn);
  }
-@@ -614,9 +651,9 @@ varobj_create (char *objname,
+@@ -614,9 +650,9 @@ varobj_create (char *objname,
  	  do_cleanups (old_chain);
  	  return NULL;
  	}
@@ -25739,7 +25646,7 @@ index 4a94988..34333fb 100644
    discard_cleanups (old_chain);
    return var;
  }
-@@ -731,15 +768,8 @@ instantiate_pretty_printer (PyObject *constructor, struct value *value)
+@@ -731,15 +767,8 @@ instantiate_pretty_printer (PyObject *constructor, struct value *value)
  #if HAVE_PYTHON
    PyObject *val_obj = NULL; 
    PyObject *printer;
@@ -25755,7 +25662,7 @@ index 4a94988..34333fb 100644
    if (! val_obj)
      return NULL;
  
-@@ -792,7 +822,12 @@ varobj_get_display_hint (struct varobj *var)
+@@ -792,7 +821,12 @@ varobj_get_display_hint (struct varobj *var)
    char *result = NULL;
  
  #if HAVE_PYTHON
@@ -25769,7 +25676,7 @@ index 4a94988..34333fb 100644
  
    if (var->pretty_printer)
      result = gdbpy_get_display_hint (var->pretty_printer);
-@@ -803,6 +838,17 @@ varobj_get_display_hint (struct varobj *var)
+@@ -803,6 +837,17 @@ varobj_get_display_hint (struct varobj *var)
    return result;
  }
  
@@ -25787,7 +25694,7 @@ index 4a94988..34333fb 100644
  /* If the variable object is bound to a specific thread, that
     is its evaluation can always be done in context of a frame
     inside that thread, returns GDB id of the thread -- which
-@@ -835,22 +881,73 @@ varobj_get_frozen (struct varobj *var)
+@@ -835,22 +880,73 @@ varobj_get_frozen (struct varobj *var)
    return var->frozen;
  }
  
@@ -25869,7 +25776,7 @@ index 4a94988..34333fb 100644
    PyObject *printer = var->pretty_printer;
  
    back_to = varobj_ensure_python_env (var);
-@@ -862,96 +959,103 @@ update_dynamic_varobj_children (struct varobj *var,
+@@ -862,96 +958,103 @@ update_dynamic_varobj_children (struct varobj *var,
        return 0;
      }
  
@@ -25884,26 +25791,26 @@ index 4a94988..34333fb 100644
 -    }
 +      children = PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
 +					     NULL);
- 
--  make_cleanup_py_decref (children);
++
 +      if (!children)
 +	{
 +	  gdbpy_print_stack ();
 +	  error (_("Null value returned for children"));
 +	}
  
+-  make_cleanup_py_decref (children);
++      make_cleanup_py_decref (children);
+ 
 -  if (!PyIter_Check (children))
 -    error (_("Returned value is not iterable"));
-+      make_cleanup_py_decref (children);
++      if (!PyIter_Check (children))
++	error (_("Returned value is not iterable"));
  
 -  iterator = PyObject_GetIter (children);
 -  if (!iterator)
 -    {
 -      gdbpy_print_stack ();
 -      error (_("Could not get children iterator"));
-+      if (!PyIter_Check (children))
-+	error (_("Returned value is not iterable"));
-+
 +      Py_XDECREF (var->child_iter);
 +      var->child_iter = PyObject_GetIter (children);
 +      if (!var->child_iter)
@@ -26037,7 +25944,7 @@ index 4a94988..34333fb 100644
    return 1;
  #else
    gdb_assert (0 && "should never be called if Python is not enabled");
-@@ -964,8 +1068,7 @@ varobj_get_num_children (struct varobj *var)
+@@ -964,8 +1067,7 @@ varobj_get_num_children (struct varobj *var)
    if (var->num_children == -1)
      {
        int changed;
@@ -26047,7 +25954,7 @@ index 4a94988..34333fb 100644
  	var->num_children = number_of_children (var);
      }
  
-@@ -976,7 +1079,7 @@ varobj_get_num_children (struct varobj *var)
+@@ -976,7 +1078,7 @@ varobj_get_num_children (struct varobj *var)
     the return code is the number of such children or -1 on error */
  
  VEC (varobj_p)*
@@ -26056,7 +25963,7 @@ index 4a94988..34333fb 100644
  {
    struct varobj *child;
    char *name;
-@@ -988,8 +1091,12 @@ varobj_list_children (struct varobj *var)
+@@ -988,8 +1090,12 @@ varobj_list_children (struct varobj *var)
        /* This, in theory, can result in the number of children changing without
  	 frontend noticing.  But well, calling -var-list-children on the same
  	 varobj twice is not something a sane frontend would do.  */
@@ -26071,7 +25978,7 @@ index 4a94988..34333fb 100644
  
    if (var->num_children == -1)
      var->num_children = number_of_children (var);
-@@ -1015,10 +1122,10 @@ varobj_list_children (struct varobj *var)
+@@ -1015,10 +1121,10 @@ varobj_list_children (struct varobj *var)
  	  name = name_of_child (var, i);
  	  existing = create_child (var, i, name);
  	  VEC_replace (varobj_p, var->children, i, existing);
@@ -26083,7 +25990,7 @@ index 4a94988..34333fb 100644
    return var->children;
  }
  
-@@ -1029,7 +1136,6 @@ varobj_add_child (struct varobj *var, const char *name, struct value *value)
+@@ -1029,7 +1135,6 @@ varobj_add_child (struct varobj *var, const char *name, struct value *value)
  					VEC_length (varobj_p, var->children), 
  					name, value);
    VEC_safe_push (varobj_p, var->children, v);
@@ -26091,7 +25998,7 @@ index 4a94988..34333fb 100644
    return v;
  }
  
-@@ -1168,6 +1274,115 @@ varobj_set_value (struct varobj *var, char *expression)
+@@ -1168,6 +1273,115 @@ varobj_set_value (struct varobj *var, char *expression)
    return 1;
  }
  
@@ -26207,7 +26114,7 @@ index 4a94988..34333fb 100644
  /* Assign a new value to a variable object.  If INITIAL is non-zero,
     this is the first assignement after the variable object was just
     created, or changed type.  In that case, just assign the value 
-@@ -1274,7 +1489,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1274,7 +1488,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
  	{
  	  changed = 1;
  	}
@@ -26216,7 +26123,7 @@ index 4a94988..34333fb 100644
  	{
  	  /* Try to compare the values.  That requires that both
  	     values are non-lazy.  */
-@@ -1328,65 +1543,32 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1328,65 +1542,32 @@ install_new_value (struct varobj *var, struct value *value, int initial)
      var->not_fetched = 0;
    var->updated = 0;
  
@@ -26299,7 +26206,7 @@ index 4a94988..34333fb 100644
  }
  
  void 
-@@ -1404,31 +1586,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
+@@ -1404,31 +1585,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
    make_cleanup_py_decref (globals);
  
    constructor = PyRun_String (visualizer, Py_eval_input, globals, globals);
@@ -26312,9 +26219,9 @@ index 4a94988..34333fb 100644
 -    }
 -  else
 -    pretty_printer = instantiate_pretty_printer (constructor, var->value);
--
--  Py_XDECREF (constructor);
  
+-  Py_XDECREF (constructor);
+-
 -  if (! pretty_printer)
 +  if (! constructor)
      {
@@ -26337,7 +26244,7 @@ index 4a94988..34333fb 100644
  
    do_cleanups (back_to);
  #else
-@@ -1543,7 +1713,7 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+@@ -1543,7 +1712,7 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
  	 UI, so we need not bother getting it.  */
        if (v->pretty_printer)
  	{
@@ -26346,7 +26253,7 @@ index 4a94988..34333fb 100644
  	  int i, children_changed;
  	  varobj_p tmp;
  
-@@ -1555,28 +1725,28 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+@@ -1555,28 +1724,28 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
  
  	  /* If update_dynamic_varobj_children returns 0, then we have
  	     a non-conforming pretty-printer, so we skip it.  */
@@ -26387,7 +26294,7 @@ index 4a94988..34333fb 100644
  	      continue;
  	    }
  	}
-@@ -1864,7 +2034,12 @@ new_variable (void)
+@@ -1864,7 +2033,12 @@ new_variable (void)
    var->frozen = 0;
    var->not_fetched = 0;
    var->children_requested = 0;
@@ -26400,7 +26307,7 @@ index 4a94988..34333fb 100644
  
    return var;
  }
-@@ -1894,7 +2069,10 @@ free_variable (struct varobj *var)
+@@ -1894,7 +2068,10 @@ free_variable (struct varobj *var)
    if (var->pretty_printer)
      {
        struct cleanup *cleanup = varobj_ensure_python_env (var);
@@ -26412,7 +26319,7 @@ index 4a94988..34333fb 100644
        do_cleanups (cleanup);
      }
  #endif
-@@ -1927,6 +2105,18 @@ make_cleanup_free_variable (struct varobj *var)
+@@ -1927,6 +2104,18 @@ make_cleanup_free_variable (struct varobj *var)
    return make_cleanup (do_free_variable_cleanup, var);
  }
  
@@ -26431,7 +26338,7 @@ index 4a94988..34333fb 100644
  /* This returns the type of the variable. It also skips past typedefs
     to return the real type of the variable.
  
-@@ -2141,6 +2331,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
+@@ -2141,6 +2330,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
        else
  	{
  	  tmp_var->obj_name = xstrdup (var->obj_name);
@@ -26440,7 +26347,7 @@ index 4a94988..34333fb 100644
  	  varobj_delete (var, NULL, 0);
  
  	  install_variable (tmp_var);
-@@ -3173,6 +3365,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+@@ -3173,6 +3364,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -26460,41 +26367,26 @@ index 4a94988..34333fb 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3190,48 +3395,110 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3190,6 +3394,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }
--

--extern void _initialize_varobj (void);
--void
--_initialize_varobj (void)
 +
 +/* Helper for varobj_types_mark_used.  Call type_mark_used for any TYPEs
 +   referenced from this VAR.  */
 +
 +static void
 +varobj_types_mark_used_iter (struct varobj *var, void *unused)
- {
--  int sizeof_table = sizeof (struct vlist *) * VAROBJ_TABLE_SIZE;
++{
 +  /* Even FLOATING or IS_INVALID VARs with non-NULL TYPE references will
 +     free them in free_variable.  Still EXP may also reference TYPEs
 +     but these belong to SYMBOLs which should be always associated with
 +     an OBJFILE (and therefore not useful to be type_mark_used).  */
- 
--  varobj_table = xmalloc (sizeof_table);
--  memset (varobj_table, 0, sizeof_table);
++
 +  type_mark_used (var->type);
 +  if (var->value)
 +    type_mark_used (value_type (var->value));
- 
--  add_setshow_zinteger_cmd ("debugvarobj", class_maintenance,
--			    &varobjdebug, _("\
--Set varobj debugging."), _("\
--Show varobj debugging."), _("\
--When non-zero, varobj debugging is enabled."),
--			    NULL,
--			    show_varobjdebug,
--			    &setlist, &showlist);
++
 +  /* Check VAROBJROOTs only once during the varobj_types_mark_used pass.  */
 +
 +  if (var->root->rootvar == var)
@@ -26502,177 +26394,25 @@ index 4a94988..34333fb 100644
 +      if (var->root->exp)
 +	exp_types_mark_used (var->root->exp);
 +    }
- }
- 
--/* Invalidate varobj VAR if it is tied to locals and re-create it if it is
--   defined on globals.  It is a helper for varobj_invalidate.  */
-+/* Call type_mark_used for any TYPEs referenced from this GDB source file.  */
- 
- static void
--varobj_invalidate_iter (struct varobj *var, void *unused)
-+varobj_types_mark_used (void)
- {
--  /* Floating varobjs are reparsed on each stop, so we don't care if the
--     presently parsed expression refers to something that's gone.  */
--  if (var->root->floating)
--    return;
-+  /* Check all the VAROBJs, even non-root ones.  Child VAROBJs can reference
-+     types from other OBJFILEs through TYPE_IS_OPAQUE resolutions by
-+     check_typedef.  Such types references will not be interconnected into the
-+     same TYPE_GROUP.  */
-+
-+  all_varobjs (varobj_types_mark_used_iter, NULL);
 +}
 +
-+/* Invalidate VAR if it is tied to the specified OBJFILE.  Call this function
-+   before you start removing OBJFILE.
-+
-+   Call varobj_revalidate_iter after the OBJFILE update get finished.
-+
-+   Invalidated varobjs will be always printed in_scope="invalid".  */
-+
-+static void
-+varobj_invalidate_iter (struct varobj *var, void *objfile_voidp)
-+{
-+  struct objfile *objfile = objfile_voidp;
-+
-+  /* Check VAROBJROOTs only once during the varobj_invalidate pass.  */
-+
-+  if (var->root->rootvar == var)
-+    {
-+      /* Check even FLOATING VAROBJROOTs as their data will be still checked
-+	 during varobj_update by varobj_get_type.  */
-+
-+      if (var->root->is_valid
-+	  && block_objfile (var->root->valid_block) == objfile)
-+	var->root->is_valid = 0;
-+
-+      if (var->root->exp && exp_uses_objfile (var->root->exp, objfile))
-+	{
-+	  var->root->is_valid = 0;
-+
-+	  /* No one touches EXP for !IS_VALID varobj.  */
-+	  xfree (var->root->exp);
-+	  var->root->exp = NULL;
-+	}
-+    }
-+
-+  if (var->type && TYPE_OBJFILE (var->type) == objfile)
-+    {
-+      var->root->is_valid = 0;
-+
-+      var->type = NULL;
-+    }
-+
-+  if (var->value && TYPE_OBJFILE (value_type (var->value)) == objfile)
-+    {
-+      var->root->is_valid = 0;
-+
-+      value_free (var->value);
-+      var->value = NULL;
-+    }
-+}
-+
-+/* Recreate any global varobjs possibly previously invalidated.  If the
-+   expressions are no longer evaluatable set/keep the VAR invalid.  */
++/* Call type_mark_used for any TYPEs referenced from this GDB source file.  */
 +
 +static void
-+varobj_revalidate_iter (struct varobj *var, void *unused)
-+{
-+  /* Global VAR must be re-evaluated.  */
- 
--  /* global var must be re-evaluated.  */     
-   if (var->root->valid_block == NULL)
-     {
-       struct varobj *tmp_var;
- 
-       /* Try to create a varobj with same expression.  If we succeed
- 	 replace the old varobj, otherwise invalidate it.  */
--      tmp_var = varobj_create (NULL, var->name, (CORE_ADDR) 0,
--			       USE_CURRENT_FRAME);
--      if (tmp_var != NULL) 
--	{ 
-+      tmp_var = varobj_create (NULL, var->name, 0, USE_CURRENT_FRAME);
-+      if (tmp_var != NULL)
-+	{
- 	  tmp_var->obj_name = xstrdup (var->obj_name);
- 	  varobj_delete (var, NULL, 0);
- 	  install_variable (tmp_var);
-@@ -3239,16 +3506,64 @@ varobj_invalidate_iter (struct varobj *var, void *unused)
-       else
- 	var->root->is_valid = 0;
-     }
--  else /* locals must be invalidated.  */
--    var->root->is_valid = 0;
- }
- 
--/* Invalidate the varobjs that are tied to locals and re-create the ones that
--   are defined on globals.
--   Invalidated varobjs will be always printed in_scope="invalid".  */
-+/* Call varobj_invalidate_iter for all the VAROBJs.  */
- 
--void 
--varobj_invalidate (void)
-+static void 
-+varobj_invalidate (struct objfile *objfile)
++varobj_types_mark_used (void)
 +{
 +  /* Check all the VAROBJs, even non-root ones.  Child VAROBJs can reference
 +     types from other OBJFILEs through TYPE_IS_OPAQUE resolutions by
-+     check_typedef.  */
-+
-+  all_varobjs (varobj_invalidate_iter, objfile);
-+}
-+
-+/* Call varobj_revalidate_iter for all the root VAROBJs.  */
-+
-+static void 
-+varobj_revalidate (void)
-+{
-+  /* Check only root VAROBJs.  Any successful revalidation will replace the
-+     whole VAROBJs tree starting with root VAROBJs and its children get created
-+     later on-demand.  So there is no point trying to revalidate the child
-+     VAROBJs.  */
-+
-+  all_root_varobjs (varobj_revalidate_iter, NULL);
-+}
-+
-+/* Call varobj_revalidate just providing a different function prototype.
-+   Currently existing VAROBJs may become valid or change with new symbols
-+   loaded.  */
++     check_typedef.  Such types references will not be interconnected into the
++     same TYPE_GROUP.  */
 +
-+static void
-+varobj_revalidate_for_objfile (struct objfile *objfile)
- {
--  all_root_varobjs (varobj_invalidate_iter, NULL);
-+  varobj_revalidate ();
++  all_varobjs (varobj_types_mark_used_iter, NULL);
 +}
-+

-+extern void _initialize_varobj (void);
-+void
-+_initialize_varobj (void)
-+{
-+  int sizeof_table = sizeof (struct vlist *) * VAROBJ_TABLE_SIZE;
-+
-+  varobj_table = xmalloc (sizeof_table);
-+  memset (varobj_table, 0, sizeof_table);
-+
-+  add_setshow_zinteger_cmd ("debugvarobj", class_maintenance,
-+			    &varobjdebug, _("\
-+Set varobj debugging."), _("\
-+Show varobj debugging."), _("\
-+When non-zero, varobj debugging is enabled."),
-+			    NULL,
-+			    show_varobjdebug,
-+			    &setlist, &showlist);
-+
-+
-+  observer_attach_objfile_unloading (varobj_invalidate );
-+  observer_attach_objfile_unloaded (varobj_revalidate);
-+  observer_attach_new_objfile (varobj_revalidate_for_objfile);
-+  observer_attach_mark_used (varobj_types_mark_used);
- }
+ 

+ extern void _initialize_varobj (void);
+ void
 diff --git a/gdb/varobj.h b/gdb/varobj.h
-index 7297243..fbe2f2f 100644
+index 7297243..0744cc3 100644
 --- a/gdb/varobj.h
 +++ b/gdb/varobj.h
 @@ -78,6 +78,12 @@ typedef struct varobj_update_result_t
@@ -26716,13 +26456,7 @@ index 7297243..fbe2f2f 100644
  
  extern char *varobj_get_type (struct varobj *var);
  
-@@ -143,12 +160,15 @@ extern void all_root_varobjs (void (*func) (struct varobj *var, void *data),
- extern VEC(varobj_update_result) *varobj_update (struct varobj **varp, 
- 						 int explicit);
- 
--extern void varobj_invalidate (void);
--
- extern int varobj_editable_p (struct varobj *var);
+@@ -149,6 +166,11 @@ extern int varobj_editable_p (struct varobj *var);
  
  extern int varobj_floating_p (struct varobj *var);
  


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- gdb.spec	11 Aug 2009 18:07:06 -0000	1.372
+++ gdb.spec	11 Aug 2009 21:15:13 -0000	1.373
@@ -14,7 +14,7 @@ Version: 6.8.50.20090811
 
 # 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
@@ -825,6 +825,11 @@ fi
 %endif
 
 %changelog
+* Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-3
+- archer-jankratochvil-fedora12 commit: 2888fafe63889757c6fd27ccc2f25661d43fd1a4
+- Drop archer-jankratochvil-vla VAROBJ invalidate/revalidate split to fix
+  regressions against FSF GDB HEAD.
+
 * Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-2
 - archer-jankratochvil-fedora12 commit: 93f5e942bdcdcc376ece452c309bedabae71def9
 - Fix "can't compute CFA for this frame" (by Tom Tromey, BZ 516627).



From akurtakov at fedoraproject.org  Tue Aug 11 21:16:02 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 11 Aug 2009 21:16:02 +0000 (UTC)
Subject: rpms/eclipse-birt/devel .cvsignore, 1.4, 1.5 eclipse-birt.spec, 1.6,
	1.7 birt-remove-smil.patch, 1.1, 1.2 sources, 1.4, 1.5
Message-ID: <20090811211602.DCEB911C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-birt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18388/devel

Modified Files:
	.cvsignore eclipse-birt.spec birt-remove-smil.patch sources 
Log Message:
Update to 2.5.0 final.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 May 2009 07:02:46 -0000	1.4
+++ .cvsignore	11 Aug 2009 21:16:02 -0000	1.5
@@ -1,3 +1,4 @@
 birt-source-2_3_1.zip
 birt-source-2_3_2.zip
 birt-source-2.5M7.zip
+birt-source-2_5_0.zip


Index: eclipse-birt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/eclipse-birt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-birt.spec	24 Jul 2009 20:51:09 -0000	1.6
+++ eclipse-birt.spec	11 Aug 2009 21:16:02 -0000	1.7
@@ -1,16 +1,16 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global rhinoqualifier        v20080214
+%global rhinoqualifier        v20090608
 
 Name:      eclipse-birt
 Version:   2.5  
-Release:   0.2.M7%{?dist}
+Release:   1%{?dist}
 Summary:   Eclipse-based reporting system
 Group:     System Environment/Libraries
 License:   EPL
 URL:       http://www.eclipse.org/birt/
 
-Source0:   http://download.eclipse.org/birt/downloads/drops/M-R1-2.5M7-200905061338/birt-source-2.5M7.zip
+Source0:   http://mirrors.xmission.com/eclipse/birt/downloads/drops/R-R1-2_5_0-200906180630/birt-source-2_5_0.zip
 # smil in Fedora is merged in xml-commons-apis-ext.jar, reflecting upstream changes
 Patch0:    birt-remove-smil.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,7 +94,7 @@ popd
 %{eclipse_base}/buildscripts/pdebuild -f org.mozilla.rhino \
                        -a "-DforceContextQualifier=%{rhinoqualifier}"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.birt.chart \
-                       -d "emf gef dtp-enablement-oda dtp-connectivity dtp-modelbase" \
+                       -d "emf gef dtp-enablement dtp-connectivity dtp-modelbase dtp-sqldevtools" \
                        -o `pwd`/orbitDeps -v
 
 %install
@@ -103,7 +103,7 @@ install -d -m 755 %{buildroot}%{eclipse_
 unzip -q -d %{buildroot}%{eclipse_dropin}/birt build/rpmBuild/org.eclipse.birt.chart.zip
 unzip -q -d %{buildroot}%{eclipse_dropin}/rhino build/rpmBuild/org.mozilla.rhino.zip
 
-pushd %{buildroot}%{eclipse_dropin}/rhino/eclipse/plugins/org.mozilla.rhino_1.6.7.%{rhinoqualifier}/lib
+pushd %{buildroot}%{eclipse_dropin}/rhino/eclipse/plugins/org.mozilla.rhino_1.7.1.%{rhinoqualifier}/lib
 rm -fr js.jar
 ln -s ../../../../../../../java/js.jar
 popd
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 %doc features/org.eclipse.birt/epl-v10.html
 
 %changelog
+* Wed Aug 12 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-1
+- Update to 2.5.0 final.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-0.2.M7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

birt-remove-smil.patch:
 org.eclipse.birt.chart.runtime/feature.xml |    7 -------
 org.eclipse.birt.chart/feature.xml         |    7 -------
 2 files changed, 14 deletions(-)

Index: birt-remove-smil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/birt-remove-smil.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- birt-remove-smil.patch	16 Feb 2009 09:52:02 -0000	1.1
+++ birt-remove-smil.patch	11 Aug 2009 21:16:02 -0000	1.2
@@ -14,3 +14,19 @@
           id="org.w3c.dom.svg"
           download-size="0"
           install-size="0"
+--- features/org.eclipse.birt.chart/feature.xml.orig	2009-06-09 10:37:12.000000000 +0300
++++ features/org.eclipse.birt.chart/feature.xml	2009-08-11 21:38:42.149411511 +0300
+@@ -205,13 +205,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.w3c.dom.smil"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.w3c.dom.svg"
+          download-size="0"
+          install-size="0"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-birt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 May 2009 07:02:47 -0000	1.4
+++ sources	11 Aug 2009 21:16:02 -0000	1.5
@@ -1 +1 @@
-b49f5d8f3c6f09aa867a3a2d13205bdf  birt-source-2.5M7.zip
+4ac20c9fccfe9bb6b9ca3bead1bb3964  birt-source-2_5_0.zip



From rayvd at fedoraproject.org  Tue Aug 11 21:17:47 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 11 Aug 2009 21:17:47 +0000 (UTC)
Subject: rpms/pymssql/EL-5 .cvsignore, 1.3, 1.4 pymssql.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090811211747.8A53411C006D@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19286

Modified Files:
	.cvsignore pymssql.spec sources 
Log Message:
Updated to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Apr 2009 21:15:04 -0000	1.3
+++ .cvsignore	11 Aug 2009 21:17:47 -0000	1.4
@@ -1 +1 @@
-pymssql-1.0.1.tar.gz
+pymssql-1.0.2.tar.gz


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/pymssql.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pymssql.spec	9 Apr 2009 21:42:38 -0000	1.5
+++ pymssql.spec	11 Aug 2009 21:17:47 -0000	1.6
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -39,6 +39,9 @@ DB-API 2.0 Specification.
 %{python_sitearch}/*
 
 %changelog
+* Tue Aug 11 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.2-1
+- Updated to 1.0.2
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
 - De-versioned Build Requirements to work around 
   https://fedorahosted.org/fedora-infrastructure/ticket/1202


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Apr 2009 21:15:04 -0000	1.3
+++ sources	11 Aug 2009 21:17:47 -0000	1.4
@@ -1 +1 @@
-afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz
+04dc4aa591acacbc8f183daeea21b690  pymssql-1.0.2.tar.gz



From rayvd at fedoraproject.org  Tue Aug 11 21:19:35 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 11 Aug 2009 21:19:35 +0000 (UTC)
Subject: rpms/pymssql/devel pymssql.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <20090811211935.B5A9411C006D@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19755

Modified Files:
	pymssql.spec sources 
Log Message:
Updated to 1.0.2


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/devel/pymssql.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pymssql.spec	26 Jul 2009 19:55:15 -0000	1.6
+++ pymssql.spec	11 Aug 2009 21:19:35 -0000	1.7
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        1.0.1
-Release:        3%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -39,8 +39,8 @@ DB-API 2.0 Specification.
 %{python_sitearch}/*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 11 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.2-1
+- Updated to 1.0.2
 
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
 - De-versioned Build Requirements to work around 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Apr 2009 21:20:39 -0000	1.3
+++ sources	11 Aug 2009 21:19:35 -0000	1.4
@@ -1 +1 @@
-afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz
+04dc4aa591acacbc8f183daeea21b690  pymssql-1.0.2.tar.gz



From rayvd at fedoraproject.org  Tue Aug 11 21:22:26 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 11 Aug 2009 21:22:26 +0000 (UTC)
Subject: rpms/pymssql/F-11 pymssql.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090811212226.7601011C006D@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20321

Modified Files:
	pymssql.spec sources 
Log Message:
Updated to 1.0.2


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-11/pymssql.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pymssql.spec	9 Apr 2009 21:50:49 -0000	1.5
+++ pymssql.spec	11 Aug 2009 21:22:26 -0000	1.6
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pymssql
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -39,6 +39,9 @@ DB-API 2.0 Specification.
 %{python_sitearch}/*
 
 %changelog
+* Tue Aug 11 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.2-1
+- Updated to 1.0.2
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
 - De-versioned Build Requirements to work around 
   https://fedorahosted.org/fedora-infrastructure/ticket/1202


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Apr 2009 21:20:39 -0000	1.3
+++ sources	11 Aug 2009 21:22:26 -0000	1.4
@@ -1 +1 @@
-afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz
+04dc4aa591acacbc8f183daeea21b690  pymssql-1.0.2.tar.gz



From rayvd at fedoraproject.org  Tue Aug 11 21:23:13 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Tue, 11 Aug 2009 21:23:13 +0000 (UTC)
Subject: rpms/pymssql/F-10 pymssql.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090811212313.B678011C006D@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/pymssql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20524

Modified Files:
	pymssql.spec sources 
Log Message:
Updated to 1.0.2


Index: pymssql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-10/pymssql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pymssql.spec	9 Apr 2009 21:51:26 -0000	1.3
+++ pymssql.spec	11 Aug 2009 21:23:13 -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:           pymssql
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        A simple database interface to MS-SQL for Python
 Group:          Development/Languages
 License:        LGPLv2+
@@ -39,6 +39,9 @@ DB-API 2.0 Specification.
 %{python_sitearch}/*
 
 %changelog
+* Tue Aug 11 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.2-1
+- Updated to 1.0.2
+
 * Thu Apr 09 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 1.0.1-2
 - De-versioned Build Requirements to work around 
   https://fedorahosted.org/fedora-infrastructure/ticket/1202


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymssql/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Apr 2009 21:18:59 -0000	1.3
+++ sources	11 Aug 2009 21:23:13 -0000	1.4
@@ -1 +1 @@
-afadab7642b35c0492fa2ef08ed551bd  pymssql-1.0.1.tar.gz
+04dc4aa591acacbc8f183daeea21b690  pymssql-1.0.2.tar.gz



From jjames at fedoraproject.org  Tue Aug 11 21:28:47 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 11 Aug 2009 21:28:47 +0000 (UTC)
Subject: rpms/gcl/devel 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 .cvsignore, 1.4, 1.5 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.spec, 1.37,
	1.38 sources, 1.6, 1.7
Message-ID: <20090811212847.715EE11C006D@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21116/devel

Modified Files:
	.cvsignore gcl-2.6.8-alloca.patch gcl-2.6.8-extension.patch 
	gcl-2.6.8-infrastructure.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:
* 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
- Add -plt patch to fix reading of PLT info
- Add -ellipsis patch to eliminate nondeterministic behavior
- Use xz payloads instead of bz2
- Minor spec file cleanups


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",4) || memcmp(b," .iplt",5)) && !i)
       continue;
     if (*b=='\r' || *b=='\n') {
       i=0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Jan 2009 20:54:32 -0000	1.4
+++ .cvsignore	11 Aug 2009 21:28:46 -0000	1.5
@@ -1,2 +1,2 @@
-gcl-2.6.8.tar.bz2
-gcl-2.6.8-info.tar.bz2
+gcl-2.6.8.tar.xz
+gcl-2.6.8-info.tar.xz

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/devel/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	11 Aug 2009 21:28:46 -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/devel/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	11 Aug 2009 21:28:46 -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/devel/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	11 Aug 2009 21:28:46 -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
++


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gcl.spec	24 Jul 2009 23:36:31 -0000	1.37
+++ gcl.spec	11 Aug 2009 21:28:46 -0000	1.38
@@ -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,14 +37,15 @@ 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
-#   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
-Source0:        gcl-%{version}.tar.bz2
+#     -r Version_2_6_8pre -D 2009-07-02 -d gcl-2.6.8 gcl
+#   tar cvf gcl-2.6.8.tar gcl-2.6.8
+#   xz gcl-2.6.8.tar
+Source0:        gcl-%{version}.tar.xz
 Source1:        gcl.el
 # This is some info files that are needed for the DESCRIBE function to do
 # something useful.  These files are present in CVS HEAD (i.e., the upcoming
 # 2.7.0 release), but are missing in the 2.6 branch.
-Source2:        gcl-2.6.8-info.tar.bz2
+Source2:        gcl-2.6.8-info.tar.xz
 # This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
 # sigprocmask API instead of the deprecated sigblock API.
 Patch0:         gcl-2.6.8-sigprocmask-linux.patch
@@ -96,6 +97,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 has not yet been sent upstream.  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
+# 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 +204,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 +365,14 @@ fi
 
 
 %changelog
+* 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
+- Add -plt patch to fix reading of PLT info
+- Add -ellipsis patch to eliminate nondeterministic behavior
+- Use xz payloads instead of bz2
+- Minor spec file cleanups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.8-0.4.20090303cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Apr 2009 16:17:14 -0000	1.6
+++ sources	11 Aug 2009 21:28:46 -0000	1.7
@@ -1,2 +1,2 @@
-ead10281e7dff246c686c410b29caad6  gcl-2.6.8.tar.bz2
-70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2
+e795acac8df3f475d1ba82fc380deb4e  gcl-2.6.8.tar.xz
+b965d4ea561a9c3e019c65be69fcfb1e  gcl-2.6.8-info.tar.xz



From spot at fedoraproject.org  Tue Aug 11 21:30:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 11 Aug 2009 21:30:56 +0000 (UTC)
Subject: rpms/xmms2/devel xmms2.spec,1.8,1.9
Message-ID: <20090811213056.4868811C006D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21472

Modified Files:
	xmms2.spec 
Log Message:
more missing BR


Index: xmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xmms2.spec	11 Aug 2009 21:09:15 -0000	1.8
+++ xmms2.spec	11 Aug 2009 21:30:56 -0000	1.9
@@ -6,7 +6,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.6
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -33,6 +33,7 @@ BuildRequires:		perl-devel, boost-devel,
 BuildRequires:		libmodplug-devel, ecore-devel, gamin-devel
 BuildRequires:		avahi-compat-libdns_sd-devel, doxygen
 BuildRequires:		libvisual-devel, wavpack-devel, SDL-devel
+BuildRequires:		glib2-devel, readline-devel, ncurses-devel
 
 %description
 XMMS2 is an audio framework, but it is not a general multimedia player - it 
@@ -194,6 +195,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/nyxmms2.*
 
 %changelog
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-3
+- BuildRequires: glib2-devel, readline-devel, ncurses-devel
+
 * Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-2
 - BuildRequires: SDL-devel
 



From deji at fedoraproject.org  Tue Aug 11 21:31:26 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 21:31:26 +0000 (UTC)
Subject: rpms/mpich2/devel .cvsignore, 1.6, 1.7 mpich2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090811213126.4DC1D11C006D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21665

Modified Files:
	.cvsignore mpich2.spec sources 
Log Message:
* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jul 2009 16:38:18 -0000	1.6
+++ .cvsignore	11 Aug 2009 21:31:26 -0000	1.7
@@ -1 +1 @@
-mpich2-1.1.1.tar.gz
+mpich2-1.1.1p1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mpich2.spec	25 Jul 2009 15:13:45 -0000	1.10
+++ mpich2.spec	11 Aug 2009 21:31:26 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1.1
-Release:	2%{?dist}
+Version:	1.1.1p1
+Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -288,6 +288,9 @@ fi
 %{_mandir}/man4/*.gz
 
 %changelog
+* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
+- New upstream version
+
 * Sat Jul 25 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/mpich2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jul 2009 16:38:18 -0000	1.6
+++ sources	11 Aug 2009 21:31:26 -0000	1.7
@@ -1 +1 @@
-01bffc9233411495c973d52c8ee15bf9  mpich2-1.1.1.tar.gz
+cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz



From dwalsh at fedoraproject.org  Tue Aug 11 21:36:41 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 11 Aug 2009 21:36:41 +0000 (UTC)
Subject: rpms/setools/devel setools-python.patch,1.1,1.2
Message-ID: <20090811213641.10BC811C006D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22326

Modified Files:
	setools-python.patch 
Log Message:
* Tue Aug 11 2009 Dan Walsh <dwalsh at redhat.com> 3.3.6-4
- Add python bindings for sesearch and seinfo


setools-python.patch:
 Makefile.am                |    2 
 Makefile.in                |    4 
 configure.ac               |    6 
 python/Makefile.am         |    1 
 python/Makefile.in         |  715 +++++++++++++++++++++++++++++++++++++++++++++
 python/setools/Makefile.am |   36 ++
 python/setools/Makefile.in |  549 ++++++++++++++++++++++++++++++++++
 python/setools/__init__.py |   49 +++
 python/setools/seinfo.c    |  649 ++++++++++++++++++++++++++++++++++++++++
 python/setools/sesearch.c  |  477 ++++++++++++++++++++++++++++++
 python/setools/setup.py    |   25 +
 11 files changed, 2509 insertions(+), 4 deletions(-)

Index: setools-python.patch
===================================================================
RCS file: /cvs/extras/rpms/setools/devel/setools-python.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- setools-python.patch	11 Aug 2009 14:47:50 -0000	1.1
+++ setools-python.patch	11 Aug 2009 21:36:40 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up setools-3.3.6/configure.ac.python setools-3.3.6/configure.ac
---- setools-3.3.6/configure.ac.python	2009-08-10 15:24:55.000000000 -0400
-+++ setools-3.3.6/configure.ac	2009-08-10 15:24:59.000000000 -0400
+--- setools-3.3.6/configure.ac.python	2009-07-22 14:07:35.000000000 -0400
++++ setools-3.3.6/configure.ac	2009-08-11 13:15:57.000000000 -0400
 @@ -216,6 +216,9 @@ if test "x${enable_jswig}" = xyes; then
     do_swigify_java=yes
     do_swigify=yes
@@ -29,8 +29,8 @@ diff -up setools-3.3.6/configure.ac.pyth
                   packages/libqpol.pc packages/libapol.pc packages/libpoldiff.pc packages/libseaudit.pc packages/libsefs.pc])
  
 diff -up setools-3.3.6/Makefile.am.python setools-3.3.6/Makefile.am
---- setools-3.3.6/Makefile.am.python	2009-08-10 15:23:45.000000000 -0400
-+++ setools-3.3.6/Makefile.am	2009-08-10 15:23:50.000000000 -0400
+--- setools-3.3.6/Makefile.am.python	2008-02-22 14:06:28.000000000 -0500
++++ setools-3.3.6/Makefile.am	2009-08-11 13:15:57.000000000 -0400
 @@ -10,7 +10,7 @@ if BUILD_GUI
  endif
  # sediffx is also built conditionally, from sediffx/Makefile.am
@@ -41,8 +41,8 @@ diff -up setools-3.3.6/Makefile.am.pytho
  #old indent opts
  #INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc
 diff -up setools-3.3.6/Makefile.in.python setools-3.3.6/Makefile.in
---- setools-3.3.6/Makefile.in.python	2009-08-10 15:24:17.000000000 -0400
-+++ setools-3.3.6/Makefile.in	2009-08-10 15:25:59.000000000 -0400
+--- setools-3.3.6/Makefile.in.python	2009-07-22 14:08:36.000000000 -0400
++++ setools-3.3.6/Makefile.in	2009-08-11 15:14:56.000000000 -0400
 @@ -79,7 +79,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
  ETAGS = etags
  CTAGS = ctags
@@ -61,15 +61,14 @@ diff -up setools-3.3.6/Makefile.in.pytho
  
  #old indent opts
  #INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc
-diff -up setools-3.3.6/python/Makefile.am.python setools-3.3.6/python/Makefile.am
---- setools-3.3.6/python/Makefile.am.python	2009-08-11 09:57:16.000000000 -0400
-+++ setools-3.3.6/python/Makefile.am	2009-08-10 15:23:25.000000000 -0400
-@@ -0,0 +1,2 @@
+diff -up /dev/null setools-3.3.6/python/Makefile.am
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/Makefile.am	2009-08-11 15:12:36.000000000 -0400
+@@ -0,0 +1 @@
 +SUBDIRS = setools
-+
-diff -up setools-3.3.6/python/Makefile.in.python setools-3.3.6/python/Makefile.in
---- setools-3.3.6/python/Makefile.in.python	2009-08-11 09:57:20.000000000 -0400
-+++ setools-3.3.6/python/Makefile.in	2009-08-10 15:25:58.000000000 -0400
+diff -up /dev/null setools-3.3.6/python/Makefile.in
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/Makefile.in	2009-08-11 15:14:56.000000000 -0400
 @@ -0,0 +1,715 @@
 +# Makefile.in generated by automake 1.11 from Makefile.am.
 +# @configure_input@
@@ -786,9 +785,9 @@ diff -up setools-3.3.6/python/Makefile.i
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -up setools-3.3.6/python/setools/__init__.py.python setools-3.3.6/python/setools/__init__.py
---- setools-3.3.6/python/setools/__init__.py.python	2009-08-11 09:56:37.000000000 -0400
-+++ setools-3.3.6/python/setools/__init__.py	2009-08-10 17:28:48.000000000 -0400
+diff -up /dev/null setools-3.3.6/python/setools/__init__.py
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/setools/__init__.py	2009-08-11 13:15:57.000000000 -0400
 @@ -0,0 +1,49 @@
 +#!/usr/bin/env python
 +
@@ -839,10 +838,10 @@ diff -up setools-3.3.6/python/setools/__
 +def seinfo(setype, name=None):
 +    dict_list = _seinfo.seinfo(setype, name)
 +    return dict_list
-diff -up setools-3.3.6/python/setools/Makefile.am.python setools-3.3.6/python/setools/Makefile.am
---- setools-3.3.6/python/setools/Makefile.am.python	2009-08-11 09:56:25.000000000 -0400
-+++ setools-3.3.6/python/setools/Makefile.am	2009-08-10 15:23:25.000000000 -0400
-@@ -0,0 +1,24 @@
+diff -up /dev/null setools-3.3.6/python/setools/Makefile.am
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/setools/Makefile.am	2009-08-11 17:17:15.000000000 -0400
+@@ -0,0 +1,36 @@
 +EXTRA_DIST =				\
 +	sesearch.c			\
 +	seinfo.c			\
@@ -850,12 +849,24 @@ diff -up setools-3.3.6/python/setools/Ma
 +	setup.py			\
 +	$(NULL)
 +
++AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
++	@QPOL_CFLAGS@ @APOL_CFLAGS@
++AM_CXXFLAGS = @DEBUGCXXFLAGS@ @WARNCXXFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
++	@QPOL_CFLAGS@ @APOL_CFLAGS@ @SEFS_CFLAGS@
++AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@
++
++LDADD = @SELINUX_LIB_FLAG@ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
++DEPENDENCIES = $(top_builddir)/libapol/src/libapol.so $(top_builddir)/libqpol/src/libqpol.so
 +all-am: python-build
 +
++seinfo_SOURCES = seinfo.c
++
++sesearch_SOURCES = sesearch.c
++
 +python-build: sesearch.c seinfo.c
 +	@mkdir -p setools
 +	@cp __init__.py setools
-+	$(PYTHON) setup.py build
++	LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build
 +
 +install-exec-hook:
 +	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
@@ -867,10 +878,10 @@ diff -up setools-3.3.6/python/setools/Ma
 +	$(PYTHON) setup.py clean -a 
 +	rm -f *~
 +
-diff -up setools-3.3.6/python/setools/Makefile.in.python setools-3.3.6/python/setools/Makefile.in
---- setools-3.3.6/python/setools/Makefile.in.python	2009-08-11 09:56:30.000000000 -0400
-+++ setools-3.3.6/python/setools/Makefile.in	2009-08-10 15:25:58.000000000 -0400
-@@ -0,0 +1,539 @@
+diff -up /dev/null setools-3.3.6/python/setools/Makefile.in
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/setools/Makefile.in	2009-08-11 17:17:18.000000000 -0400
+@@ -0,0 +1,549 @@
 +# Makefile.in generated by automake 1.11 from Makefile.am.
 +# @configure_input@
 +
@@ -1202,6 +1213,17 @@ diff -up setools-3.3.6/python/setools/Ma
 +	setup.py			\
 +	$(NULL)
 +
++AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
++	@QPOL_CFLAGS@ @APOL_CFLAGS@
++
++AM_CXXFLAGS = @DEBUGCXXFLAGS@ @WARNCXXFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
++	@QPOL_CFLAGS@ @APOL_CFLAGS@ @SEFS_CFLAGS@
++
++AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@
++LDADD = @SELINUX_LIB_FLAG@ @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
++DEPENDENCIES = $(top_builddir)/libapol/src/libapol.so $(top_builddir)/libqpol/src/libqpol.so
++seinfo_SOURCES = seinfo.c
++sesearch_SOURCES = sesearch.c
 +all: all-am
 +
 +.SUFFIXES:
@@ -1389,13 +1411,12 @@ diff -up setools-3.3.6/python/setools/Ma
 +	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 +	ps ps-am uninstall uninstall-am uninstall-hook
 +
-+
 +all-am: python-build
 +
 +python-build: sesearch.c seinfo.c
 +	@mkdir -p setools
 +	@cp __init__.py setools
-+	$(PYTHON) setup.py build
++	LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build
 +
 +install-exec-hook:
 +	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
@@ -1410,9 +1431,9 @@ diff -up setools-3.3.6/python/setools/Ma
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -up setools-3.3.6/python/setools/seinfo.c.python setools-3.3.6/python/setools/seinfo.c
---- setools-3.3.6/python/setools/seinfo.c.python	2009-08-11 09:56:01.000000000 -0400
-+++ setools-3.3.6/python/setools/seinfo.c	2009-08-11 09:45:32.000000000 -0400
+diff -up /dev/null setools-3.3.6/python/setools/seinfo.c
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/setools/seinfo.c	2009-08-11 16:31:05.000000000 -0400
 @@ -0,0 +1,649 @@
 +/**
 + *  @file
@@ -2063,9 +2084,9 @@ diff -up setools-3.3.6/python/setools/se
 +    PyModule_AddIntConstant(m, "TYPE", TYPE);
 +    PyModule_AddIntConstant(m, "USER", USER);
 +}
-diff -up setools-3.3.6/python/setools/sesearch.c.python setools-3.3.6/python/setools/sesearch.c
---- setools-3.3.6/python/setools/sesearch.c.python	2009-08-11 09:56:08.000000000 -0400
-+++ setools-3.3.6/python/setools/sesearch.c	2009-08-11 09:46:26.000000000 -0400
+diff -up /dev/null setools-3.3.6/python/setools/sesearch.c
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/setools/sesearch.c	2009-08-11 16:31:05.000000000 -0400
 @@ -0,0 +1,477 @@
 +// Author: Thomas Liu <tliu at redhat.com>
 +
@@ -2544,17 +2565,32 @@ diff -up setools-3.3.6/python/setools/se
 +    PyObject *m;
 +    m = Py_InitModule("_sesearch", methods);
 +}
-diff -up setools-3.3.6/python/setools/setup.py.python setools-3.3.6/python/setools/setup.py
---- setools-3.3.6/python/setools/setup.py.python	2009-08-11 09:56:15.000000000 -0400
-+++ setools-3.3.6/python/setools/setup.py	2009-08-10 15:23:25.000000000 -0400
-@@ -0,0 +1,10 @@
+diff -up /dev/null setools-3.3.6/python/setools/setup.py
+--- /dev/null	2009-08-08 15:30:39.325298375 -0400
++++ setools-3.3.6/python/setools/setup.py	2009-08-11 17:29:42.000000000 -0400
+@@ -0,0 +1,25 @@
 +#!/usr/bin/env python
 +
 +# Author: Thomas Liu <tliu at redhat.com>
-+
++import os
 +from distutils.core import setup, Extension
-+extension_sesearch = Extension("setools._sesearch", [ "sesearch.c"], libraries=["apol", "qpol"] )
-+extension_seinfo = Extension("setools._seinfo", [ "seinfo.c"], libraries=["apol", "qpol"] )
++LIBS=["apol", "qpol"]
 +
-+setup(name = "setools", version="1.0", description="Python setools bindings", author="Thomas Liu", author_email="tliu at redhat.com", ext_modules=[extension_sesearch, extension_seinfo], packages=["setools"])
++try:
++    inc=os.getenv("INCLUDES").split(" ")    
++    INCLUDES=map(lambda x: x[2:], inc)
++    LIBDIRS=map(lambda x: "/".join(x.split("/")[:-1]), os.getenv("LIBS").split())
++except:
++    INCLUDES=""
++    LIBDIRS=""
++
++extension_sesearch = Extension("setools._sesearch", [ "sesearch.c"])
++extension_sesearch.include_dirs=INCLUDES
++extension_sesearch.libraries=LIBS
++extension_sesearch.library_dirs=LIBDIRS
++extension_seinfo = Extension("setools._seinfo", [ "seinfo.c"])
++extension_seinfo.include_dirs=INCLUDES
++extension_seinfo.libraries=LIBS
++extension_seinfo.library_dirs=LIBDIRS
 +
++setup(name = "setools", version="1.0", description="Python setools bindings", author="Thomas Liu", author_email="tliu at redhat.com", ext_modules=[extension_sesearch, extension_seinfo], packages=["setools"])



From pbrobinson at fedoraproject.org  Tue Aug 11 21:40:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 21:40:03 +0000 (UTC)
Subject: rpms/ifuse/F-10 ifuse.spec,1.7,1.8
Message-ID: <20090811214004.01EA111C048B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22696

Modified Files:
	ifuse.spec 
Log Message:
- Add a missing dependency


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/ifuse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ifuse.spec	11 Aug 2009 13:20:48 -0000	1.7
+++ ifuse.spec	11 Aug 2009 21:40:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          ifuse
 Version:       0.9.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -13,6 +13,7 @@ Requires:      hal
 BuildRequires: glib2-devel
 BuildRequires: fuse-devel
 BuildRequires: libiphone-devel
+BuildRequires: libplist-devel
 
 %description
 A fuse filesystem for mounting iPhone and iPod touch devices
@@ -38,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-2
+- Add a missing dependency
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
 - Update to 0.9.3 release
 



From hadess at fedoraproject.org  Tue Aug 11 21:41:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 21:41:59 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel totem-pl-parser.spec,1.41,1.42
Message-ID: <20090811214159.DE1A711C006D@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-serv22970

Modified Files:
	totem-pl-parser.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-3
- Fix URL



Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- totem-pl-parser.spec	27 Jul 2009 06:08:47 -0000	1.41
+++ totem-pl-parser.spec	11 Aug 2009 21:41:59 -0000	1.42
@@ -1,12 +1,12 @@
 Name:		totem-pl-parser
 Version:	2.27.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 Url:		http://www.gnome.org/projects/totem/
-Source0:	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:	totem-plparser
 
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-3
+- Fix URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Aug 11 21:42:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 21:42:33 +0000 (UTC)
Subject: rpms/gnome-lirc-properties/devel gnome-lirc-properties.spec, 1.20, 
	1.21
Message-ID: <20090811214233.DFE7711C006D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23082

Modified Files:
	gnome-lirc-properties.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.3.1-6
- Fix source URL



Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gnome-lirc-properties.spec	25 Jul 2009 00:41:00 -0000	1.20
+++ gnome-lirc-properties.spec	11 Aug 2009 21:42:33 -0000	1.21
@@ -7,13 +7,13 @@
 
 Name:		gnome-lirc-properties
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
 License:	GPLv2+
 URL:		http://svn.gnome.org/svn/gnome-lirc-properties/trunk
-Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-lirc-properties/0.2/%{name}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-lirc-properties/0.3/%{name}-%{version}.tar.gz
 # http://bugzilla.gnome.org/show_bug.cgi?id=530359 and blockers
 # http://bugzilla.gnome.org/show_bug.cgi?id=540897
 # and We have the patches in a 0.8.3 version in Fedora
@@ -105,6 +105,9 @@ fi
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.3.1-6
+- Fix source URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Aug 11 21:44:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 21:44:01 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.55,1.56
Message-ID: <20090811214401.4F81711C006D@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-serv23283

Modified Files:
	gnome-user-share.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.26.0-5
- Fix source URL



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- gnome-user-share.spec	25 Jul 2009 00:49:57 -0000	1.55
+++ gnome-user-share.spec	11 Aug 2009 21:44:01 -0000	1.56
@@ -1,11 +1,11 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.26.0
-Release: 4%{?dist}
+Release: 5%{?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.26/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
 
@@ -123,6 +123,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.26.0-5
+- Fix source URL
+
 * 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  Tue Aug 11 21:46:43 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 21:46:43 +0000 (UTC)
Subject: rpms/viewvc/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 viewvc.spec, 1.19, 1.20
Message-ID: <20090811214643.37F7A11C006D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23823

Modified Files:
	.cvsignore sources viewvc.spec 
Log Message:
Bump up to 1.1.2.
Two security fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 21:28:50 -0000	1.9
+++ .cvsignore	11 Aug 2009 21:46:43 -0000	1.10
@@ -1 +1 @@
-viewvc-1.1.1.tar.gz
+viewvc-1.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 21:28:50 -0000	1.9
+++ sources	11 Aug 2009 21:46:43 -0000	1.10
@@ -1 +1 @@
-73f8455e8ddd3d08201ab1533a408554  viewvc-1.1.1.tar.gz
+8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- viewvc.spec	11 Aug 2009 03:21:21 -0000	1.19
+++ viewvc.spec	11 Aug 2009 21:46:43 -0000	1.20
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.1
-Release:        3%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,11 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
+- bump up to 1.1.2
+- security fix: validate the 'view' parameter to avoid XSS attack
+- security fix: avoid printing illegal parameter names and values
+
 * Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.1-3
 - install mimetypes.conf
 - populate mimetypes.conf with what pygments understands



From hadess at fedoraproject.org  Tue Aug 11 21:46:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 21:46:42 +0000 (UTC)
Subject: rpms/libgdata/devel libgdata.spec,1.5,1.6
Message-ID: <20090811214642.9D4D011C006D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23807

Modified Files:
	libgdata.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-3
- Fix source URL



Index: libgdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdata/devel/libgdata.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libgdata.spec	25 Jul 2009 05:41:38 -0000	1.5
+++ libgdata.spec	11 Aug 2009 21:46:42 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           libgdata
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for the GData protocol
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/libgdata
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel libsoup-devel libxml2-devel gtk-doc intltool
@@ -69,6 +69,9 @@ cd gdata/tests
 %{_datadir}/gtk-doc/html/gdata/
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-3
+- Fix source URL
+
 * 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 hadess at fedoraproject.org  Tue Aug 11 21:48:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 11 Aug 2009 21:48:06 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.248,1.249
Message-ID: <20090811214806.5AAA611C006D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24955

Modified Files:
	totem.spec 
Log Message:
* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
- Fix source URL



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- totem.spec	4 Aug 2009 14:42:51 -0000	1.248
+++ totem.spec	11 Aug 2009 21:48:06 -0000	1.249
@@ -6,11 +6,11 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
-Source0: http://download.gnome.org/sources/totem/2.25/totem-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/totem/2.27/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -376,6 +376,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
+- Fix source URL
+
 * Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-3
 - Remove gnome-themes dependency, use gnome-icon-theme instead
 



From bojan at fedoraproject.org  Tue Aug 11 21:53:15 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 21:53:15 +0000 (UTC)
Subject: rpms/viewvc/F-11 sources,1.9,1.10 viewvc.spec,1.18,1.19
Message-ID: <20090811215315.66F0A11C006D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25965

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.1.2.
Two security fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 21:36:31 -0000	1.9
+++ sources	11 Aug 2009 21:53:15 -0000	1.10
@@ -1 +1 @@
-73f8455e8ddd3d08201ab1533a408554  viewvc-1.1.1.tar.gz
+8f14fc2f58f4e87b835500ae20d8d631  viewvc-1.1.2.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- viewvc.spec	11 Aug 2009 03:26:33 -0000	1.18
+++ viewvc.spec	11 Aug 2009 21:53:15 -0000	1.19
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,11 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
+- bump up to 1.1.2
+- security fix: validate the 'view' parameter to avoid XSS attack
+- security fix: avoid printing illegal parameter names and values
+
 * Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.1-2
 - install mimetypes.conf
 - populate mimetypes.conf with what pygments understands



From pbrobinson at fedoraproject.org  Tue Aug 11 21:53:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 21:53:26 +0000 (UTC)
Subject: rpms/ifuse/F-10 ifuse.spec,1.8,1.9
Message-ID: <20090811215326.0C3B711C006D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26008

Modified Files:
	ifuse.spec 
Log Message:
- and a few more


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/ifuse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ifuse.spec	11 Aug 2009 21:40:03 -0000	1.8
+++ ifuse.spec	11 Aug 2009 21:53:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          ifuse
 Version:       0.9.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -14,6 +14,13 @@ BuildRequires: glib2-devel
 BuildRequires: fuse-devel
 BuildRequires: libiphone-devel
 BuildRequires: libplist-devel
+BuildRequires: libxml2-devel
+BuildRequires: libusb-devel
+BuildRequires: libtasn1-devel
+BuildRequires: glib2-devel
+BuildRequires: gnutls-devel
+BuildRequires: python-devel
+BuildRequires: swig
 
 %description
 A fuse filesystem for mounting iPhone and iPod touch devices
@@ -39,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
+- And a few more 
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-2
 - Add a missing dependency
 



From eparis at fedoraproject.org  Tue Aug 11 21:55:35 2009
From: eparis at fedoraproject.org (Eric Paris)
Date: Tue, 11 Aug 2009 21:55:35 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.315, 1.316 kernel.spec, 1.1710, 
	1.1711
Message-ID: <20090811215535.E658B11C006D@cvs1.fedora.phx.redhat.com>

Author: eparis

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26426

Modified Files:
	config-generic kernel.spec 
Log Message:
* Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
- Enable config IMA



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- config-generic	31 Jul 2009 01:00:04 -0000	1.315
+++ config-generic	11 Aug 2009 21:55:35 -0000	1.316
@@ -3987,7 +3987,10 @@ CONFIG_FCOE_FNIC=m
 
 CONFIG_NOP_USB_XCEIV=m
 
-# CONFIG_IMA is not set
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_AUDIT=y
+CONFIG_IMA_LSM_RULES=y
 
 # CONFIG_PAGE_POISONING is not set
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1710
retrieving revision 1.1711
diff -u -p -r1.1710 -r1.1711
--- kernel.spec	11 Aug 2009 05:49:53 -0000	1.1710
+++ kernel.spec	11 Aug 2009 21:55:35 -0000	1.1711
@@ -1980,6 +1980,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
+- Enable config IMA
+
 * Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: various cleanups and fixes + more sanity checking in dma paths
 



From bojan at fedoraproject.org  Tue Aug 11 21:56:32 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 21:56:32 +0000 (UTC)
Subject: rpms/viewvc/F-10 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 viewvc.spec,
	1.14, 1.15
Message-ID: <20090811215632.9E22411C006D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26595

Modified Files:
	.cvsignore sources viewvc.spec 
Log Message:
Bump up to 1.0.9.
Two security fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 May 2009 06:52:16 -0000	1.7
+++ .cvsignore	11 Aug 2009 21:56:32 -0000	1.8
@@ -1 +1 @@
-viewvc-1.0.8.tar.gz
+viewvc-1.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 May 2009 06:52:16 -0000	1.7
+++ sources	11 Aug 2009 21:56:32 -0000	1.8
@@ -1 +1 @@
-2070392e6f9ce537f7f1b2daf9c7a216  viewvc-1.0.8.tar.gz
+5aa48bb866f65bfcf32aa0cd581bf7d3  viewvc-1.0.9.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/viewvc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- viewvc.spec	10 Aug 2009 23:53:45 -0000	1.14
+++ viewvc.spec	11 Aug 2009 21:56:32 -0000	1.15
@@ -16,8 +16,8 @@
 
 
 Name:           viewvc
-Version:        1.0.8
-Release:        2%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -149,6 +149,11 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.9-1
+- bump up to 1.0.9
+- security fix: validate the 'view' parameter to avoid XSS attack
+- security fix: avoid printing illegal parameter names and values
+
 * Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-2
 - fix allow_tar
 - patch by Patrick Monnerat



From marx at fedoraproject.org  Tue Aug 11 21:58:08 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Tue, 11 Aug 2009 21:58:08 +0000 (UTC)
Subject: rpms/system-config-lvm/devel .cvsignore, 1.23, 1.24 sources, 1.25, 
	1.26 system-config-lvm.spec, 1.36, 1.37
Message-ID: <20090811215808.8A7FF11C006D@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26809

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
system-config-lvm 1.1.6-1

New version from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	8 Apr 2008 19:55:40 -0000	1.23
+++ .cvsignore	11 Aug 2009 21:58:08 -0000	1.24
@@ -1 +1 @@
-system-config-lvm-1.1.4.tar.gz
+system-config-lvm-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	8 Apr 2008 19:55:40 -0000	1.25
+++ sources	11 Aug 2009 21:58:08 -0000	1.26
@@ -1 +1 @@
-c561f2698dde15ec853faa18cef3adab  system-config-lvm-1.1.4.tar.gz
+55102c6f0e19e1558df6ca5f903823ee  system-config-lvm-1.1.6.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- system-config-lvm.spec	27 Jul 2009 05:23:52 -0000	1.36
+++ system-config-lvm.spec	11 Aug 2009 21:58:08 -0000	1.37
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.4
-Release: 7%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -61,6 +61,13 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Tue Aug 11 2009 Marek Grac <mgrac at redhat.com> - 1.1.6-1
+- Updated translations for Spanish and Polish (transifex)
+- Resolves: #494127 - system-config-lvm crashes on lvs with corelog
+- Resolves: #475997 - crashed with 'IndexError: list index out of range'
+- Resolves: #432065 - Add ext4 and xfs functionality
+- Resolves: #447886, #466812 - minor l10n problems
+ 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Tue Aug 11 21:59:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 11 Aug 2009 21:59:58 +0000 (UTC)
Subject: rpms/ifuse/F-10 ifuse.spec,1.9,1.10
Message-ID: <20090811215958.B911711C006D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27092

Modified Files:
	ifuse.spec 
Log Message:
- And one more for luck


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/F-10/ifuse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ifuse.spec	11 Aug 2009 21:53:25 -0000	1.9
+++ ifuse.spec	11 Aug 2009 21:59:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          ifuse
 Version:       0.9.3
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -21,6 +21,7 @@ BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: python-devel
 BuildRequires: swig
+BuildRequires: usbmuxd-devel
 
 %description
 A fuse filesystem for mounting iPhone and iPod touch devices
@@ -46,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-4
+- And one more for luck
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
 - And a few more 
 



From scop at fedoraproject.org  Tue Aug 11 22:01:31 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 11 Aug 2009 22:01:31 +0000 (UTC)
Subject: rpms/abcde/devel abcde-2.3.99.8-config.patch, NONE, 1.1 .cvsignore, 
	1.11, 1.12 abcde.spec, 1.21, 1.22 abcde_2.3.99.7-1ubuntu1.diff,
	1.1, 1.2 sources, 1.11, 1.12 abcde-2.3.99.7-config.patch, 1.1, NONE
Message-ID: <20090811220131.DE1B611C006D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27462

Modified Files:
	.cvsignore abcde.spec abcde_2.3.99.7-1ubuntu1.diff sources 
Added Files:
	abcde-2.3.99.8-config.patch 
Removed Files:
	abcde-2.3.99.7-config.patch 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.8-1
- Update to 2.3.99.8 (#516886).


abcde-2.3.99.8-config.patch:
 README     |    4 ++--
 abcde      |    2 +-
 abcde.1    |    6 +++---
 abcde.conf |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE abcde-2.3.99.8-config.patch ---
diff -up abcde-2.3.99.8/abcde~ abcde-2.3.99.8/abcde
--- abcde-2.3.99.8/abcde~	2009-07-26 20:28:29.000000000 +0300
+++ abcde-2.3.99.8/abcde	2009-08-12 00:47:00.000000000 +0300
@@ -3008,7 +3008,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.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1
--- abcde-2.3.99.8/abcde.1~	2009-07-26 14:36:02.000000000 +0300
+++ abcde-2.3.99.8/abcde.1	2009-08-12 00:47:02.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),
@@ -574,7 +574,7 @@ An HTTP retrieval program: wget, fetch (
 .BR cdparanoia (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.3.99.8/abcde.conf~ abcde-2.3.99.8/abcde.conf
--- abcde-2.3.99.8/abcde.conf~	2009-07-26 14:46:44.000000000 +0300
+++ abcde-2.3.99.8/abcde.conf	2009-08-12 00:47:04.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.3.99.8/README~ abcde-2.3.99.8/README
--- abcde-2.3.99.8/README~	2009-07-26 14:46:44.000000000 +0300
+++ abcde-2.3.99.8/README	2009-08-12 00:46:53.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:
 * 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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Jul 2009 20:53:59 -0000	1.11
+++ .cvsignore	11 Aug 2009 22:01:31 -0000	1.12
@@ -1 +1 @@
-abcde_2.3.99.7.orig.tar.gz
+abcde_2.3.99.8.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- abcde.spec	27 Jul 2009 20:53:59 -0000	1.21
+++ abcde.spec	11 Aug 2009 22:01:31 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.99.7
+Version:        2.3.99.8
 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.7-config.patch
+Patch0:         %{name}-2.3.99.8-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,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Update to 2.3.99.7 (#513795); wget and usage patches applied upstream.
 - Patch to improve CDDB track info handling.

abcde_2.3.99.7-1ubuntu1.diff:
 abcde |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Index: abcde_2.3.99.7-1ubuntu1.diff
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde_2.3.99.7-1ubuntu1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abcde_2.3.99.7-1ubuntu1.diff	27 Jul 2009 20:53:59 -0000	1.1
+++ abcde_2.3.99.7-1ubuntu1.diff	11 Aug 2009 22:01:31 -0000	1.2
@@ -25,35 +25,3 @@
  					$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"
  					
  				else
-@@ -3291,14 +3292,17 @@
- else
- 	while [ $# -gt 0 ]; do
- 		# Range parsing code courtesy of Vincent Ho
--		RSTART=$(echo $1 | cut -f1 -d-)
--		REND=$(echo $1 | cut -f2 -d-)
--		if [ "$RSTART" = "$REND" ]; then
--			NEWTRACKS="$RSTART"
-+		# Cleaned up to use shell built-ins by Charles Steinkuehler
-+		if [ "${1#*[^0-9-]}" != "$1" ]; then
-+			log error "syntax error while processing track numbers"
- 		else
--			NEWTRACKS=$(f_seq_line $RSTART $REND)
-+			RSTART=${1%%-*}
-+			REND=${1##*-}
-+			while [ ${RSTART:=1} -le ${REND:=0} ] ; do
-+				TRACKQUEUE="$TRACKQUEUE $RSTART"
-+				RSTART=$(( $RSTART + 1 ))
-+			done
- 		fi
--		TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
- 		shift
- 	done
- fi
-@@ -3594,6 +3598,7 @@
- 		FLACENCODER="$FLAC"	
- 		if [ "$DOREPLAYGAIN" = "y" ]; then
- 			FLACENCODEROPTS="${FLACENCODEROPTS} --replay-gain"
-+		fi
- 		# FLAC streams can be encapsulated on a Ogg transport layer
- 		if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then
- 			log error "FLAC on an Ogg container is not yet supported"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Jul 2009 20:53:59 -0000	1.11
+++ sources	11 Aug 2009 22:01:31 -0000	1.12
@@ -1 +1 @@
-a0baa57edecf40c8423eac7e36d06882  abcde_2.3.99.7.orig.tar.gz
+981fd4bfd6938bb6a1130f6193bffb00  abcde_2.3.99.8.orig.tar.gz


--- abcde-2.3.99.7-config.patch DELETED ---



From jkeating at fedoraproject.org  Tue Aug 11 22:03:50 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 11 Aug 2009 22:03:50 +0000 (UTC)
Subject: common Makefile.common,1.133,1.134
Message-ID: <20090811220350.94C1811C006D@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27894

Modified Files:
	Makefile.common 
Log Message:
Mention the version of fedora-packager one needs for fedora-hosted



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- Makefile.common	10 Aug 2009 23:09:22 -0000	1.133
+++ Makefile.common	11 Aug 2009 22:03:50 -0000	1.134
@@ -512,7 +512,7 @@ endif
 update: bodhi
 
 tag-request: build-check $(COMMON_DIR)/branches
-	@if [ ! -x "$(FEDORAHOSTED)" ]; then echo "Must have fedora-packager installed"; exit 1; fi
+	@if [ ! -x "$(FEDORAHOSTED)" ]; then echo "Must have fedora-packager > 0.3.8 installed"; exit 1; fi
 	@echo -e "\
 # Tag target (default is target of the CVS branch)\n\
 target=$(TARGET)\n\n\



From mbarnes at fedoraproject.org  Tue Aug 11 22:08:34 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 11 Aug 2009 22:08:34 +0000 (UTC)
Subject: rpms/pygobject2/devel .cvsignore, 1.23, 1.24 pygobject2.spec, 1.54, 
	1.55 sources, 1.23, 1.24
Message-ID: <20090811220834.2588B11C006D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28499

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:

* Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.19.0-1.fc12
- Update to 2.19.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	25 May 2009 15:10:39 -0000	1.23
+++ .cvsignore	11 Aug 2009 22:08:33 -0000	1.24
@@ -1 +1 @@
-pygobject-2.18.0.tar.bz2
+pygobject-2.19.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- pygobject2.spec	26 Jul 2009 19:50:00 -0000	1.54
+++ pygobject2.spec	11 Aug 2009 22:08:33 -0000	1.55
@@ -1,8 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.18.0
-%define glib2_version           2.16.0
-%define python2_version         2.3.5
+# Last updated for version 2.19.0
+%define glib2_version                  2.16.0
+%define gobject_introspection_version  0.6.3
+%define python2_version                2.3.5
 
 # XXX Disable this and use "make <my-real-arch>" instead of
 #     "make local" when building locally to avoid avoid the
@@ -13,8 +14,8 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.18.0
-Release: 2%{?dist}
+Version: 2.19.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -26,6 +27,7 @@ Source: pygobject-%{version}.tar.bz2
 
 BuildRequires: automake
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 BuildRequires: libtool
 BuildRequires: python2-devel >= %{python2_version}
 
@@ -47,6 +49,7 @@ Requires: %{name} = %{version}-%{release
 Requires: %{name}-codegen = %{version}-%{release}
 Requires: %{name}-doc = %{version}-%{release}
 Requires: glib2-devel
+Requires: gobject-introspection-devel
 Requires: pkgconfig
 
 %description devel
@@ -94,6 +97,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %defattr(755, root, root, 755)
 %{python_sitearch}/gtk-2.0/gio
+%{python_sitearch}/gtk-2.0/girepository
 %{python_sitearch}/gtk-2.0/glib
 %{python_sitearch}/gtk-2.0/gobject
 
@@ -109,6 +113,7 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_datadir}/pygobject
 %dir %{_includedir}/pygtk-2.0
 %{_datadir}/pygobject/2.0/defs
+%{_includedir}/pygobject/bank.h
 %{_includedir}/pygtk-2.0/pyglib.h
 %{_includedir}/pygtk-2.0/pygobject.h
 %{_libdir}/pkgconfig/pygobject-2.0.pc
@@ -119,6 +124,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.19.0-1.fc12
+- Update to 2.19.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.18.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 May 2009 15:10:39 -0000	1.23
+++ sources	11 Aug 2009 22:08:33 -0000	1.24
@@ -1 +1 @@
-522b813219a6ad14b85b25d953b08727  pygobject-2.18.0.tar.bz2
+ef918a6c1ce5edf027ba8d3d28b6ed0c  pygobject-2.19.0.tar.bz2



From deji at fedoraproject.org  Tue Aug 11 22:18:51 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 22:18:51 +0000 (UTC)
Subject: rpms/mpich2/F-11 .cvsignore, 1.5, 1.6 mpich2.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <20090811221852.0E87611C006D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30333

Modified Files:
	.cvsignore mpich2.spec sources 
Log Message:
* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Jul 2009 19:04:40 -0000	1.5
+++ .cvsignore	11 Aug 2009 22:18:51 -0000	1.6
@@ -1 +1 @@
-mpich2-1.1.1.tar.gz
+mpich2-1.1.1p1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-11/mpich2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mpich2.spec	22 Jul 2009 19:04:40 -0000	1.6
+++ mpich2.spec	11 Aug 2009 22:18:51 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1.1
+Version:	1.1.1p1
 Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
@@ -288,6 +288,9 @@ fi
 %{_mandir}/man4/*.gz
 
 %changelog
+* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
+- New upstream version
+
 * Wed Jul 22 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1-1
 - Update to 1.1.1
 - Remove (and obsolete) the -libs subpackage, it is not necessary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jul 2009 19:04:40 -0000	1.5
+++ sources	11 Aug 2009 22:18:51 -0000	1.6
@@ -1 +1 @@
-01bffc9233411495c973d52c8ee15bf9  mpich2-1.1.1.tar.gz
+cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz



From bojan at fedoraproject.org  Tue Aug 11 22:25:23 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 22:25:23 +0000 (UTC)
Subject: rpms/viewvc/EL-5 sources,1.7,1.8 viewvc.spec,1.7,1.8
Message-ID: <20090811222523.BD61911C006D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31427

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.0.9.
Two security fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 May 2009 06:56:29 -0000	1.7
+++ sources	11 Aug 2009 22:25:23 -0000	1.8
@@ -1 +1 @@
-2070392e6f9ce537f7f1b2daf9c7a216  viewvc-1.0.8.tar.gz
+5aa48bb866f65bfcf32aa0cd581bf7d3  viewvc-1.0.9.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/viewvc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- viewvc.spec	7 May 2009 06:56:29 -0000	1.7
+++ viewvc.spec	11 Aug 2009 22:25:23 -0000	1.8
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.8
+Version:        1.0.9
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -126,6 +126,11 @@ This version only supports CVS repositor
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.9-1
+- bump up to 1.0.9
+- security fix: validate the 'view' parameter to avoid XSS attack
+- security fix: avoid printing illegal parameter names and values
+
 * Thu May  7 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-1
 - Bump up to 1.0.8
 



From bojan at fedoraproject.org  Tue Aug 11 22:26:33 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue, 11 Aug 2009 22:26:33 +0000 (UTC)
Subject: rpms/viewvc/EL-4 sources,1.7,1.8 viewvc.spec,1.12,1.13
Message-ID: <20090811222633.C82C311C006D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31650

Modified Files:
	sources viewvc.spec 
Log Message:
Bump up to 1.0.9.
Two security fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 May 2009 06:58:40 -0000	1.7
+++ sources	11 Aug 2009 22:26:33 -0000	1.8
@@ -1 +1 @@
-2070392e6f9ce537f7f1b2daf9c7a216  viewvc-1.0.8.tar.gz
+5aa48bb866f65bfcf32aa0cd581bf7d3  viewvc-1.0.9.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-4/viewvc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- viewvc.spec	7 May 2009 06:58:40 -0000	1.12
+++ viewvc.spec	11 Aug 2009 22:26:33 -0000	1.13
@@ -16,7 +16,7 @@
 
 
 Name:           viewvc
-Version:        1.0.8
+Version:        1.0.9
 Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
@@ -133,6 +133,11 @@ This version only supports CVS repositor
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.9-1
+- bump up to 1.0.9
+- security fix: validate the 'view' parameter to avoid XSS attack
+- security fix: avoid printing illegal parameter names and values
+
 * Thu May  7 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.8-1
 - Bump up to 1.0.8
 



From victorv at fedoraproject.org  Tue Aug 11 22:30:23 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Tue, 11 Aug 2009 22:30:23 +0000 (UTC)
Subject: rpms/netbeans-resolver/devel netbeans-resolver-6.7.1-nb.patch, NONE,
	1.1 netbeans-resolver-6.7.1-resolver.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 import.log, 1.1, 1.2 netbeans-resolver.spec, 1.3,
	1.4 sources, 1.2, 1.3 netbeans-resolver-6.1.patch, 1.1, NONE
Message-ID: <20090811223023.64D8411C00D7@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32198/devel

Modified Files:
	.cvsignore import.log netbeans-resolver.spec sources 
Added Files:
	netbeans-resolver-6.7.1-nb.patch 
	netbeans-resolver-6.7.1-resolver.patch 
Removed Files:
	netbeans-resolver-6.1.patch 
Log Message:
Patching for the NetBeans 6.7.1


netbeans-resolver-6.7.1-nb.patch:
 NbCatalogManager.java        |  840 +++++++++++++++++++++++++++++++++++++++++++
 tools/NbCatalogResolver.java |  316 ++++++++++++++++
 2 files changed, 1156 insertions(+)

--- NEW FILE netbeans-resolver-6.7.1-nb.patch ---
Index: libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/NbCatalogManager.java
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/NbCatalogManager.java	2009-01-30 23:02:32.000000000 +0100
@@ -0,0 +1,840 @@
+// CatalogManager.java - Access CatalogManager.properties
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xml.resolver;
+
+import java.io.InputStream;
+
+import java.net.URL;
+import java.net.MalformedURLException;
+
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.xml.resolver.helpers.Debug;
+import org.apache.xml.resolver.helpers.BootstrapResolver;
+import org.apache.xml.resolver.Catalog;
+
+/**
+ * CatalogManager provides an interface to the catalog properties.
+ *
+ * <p>Properties can come from two places: from system properties or
+ * from a <i>CatalogManager.properties</i> file. This class provides a transparent
+ * interface to both, with system properties preferred over property file values.</p>
+ *
+ * <p>The following table summarizes the properties:</p>
+ *
+ * <table border="1">
+ * <thead>
+ * <tr>
+ * <td>System Property</td>
+ * <td>CatalogManager.properties<br/>Property</td>
+ * <td>Description</td>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <td>xml.catalog.ignoreMissing</td>
+ * <td>&#160;</td>
+ * <td>If true, a missing <i>CatalogManager.properties</i> file or missing properties
+ * within that file will not generate warning messages. See also the
+ * <i>ignoreMissingProperties</i> method.</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>xml.catalog.files</td>
+ * <td>catalogs</td>
+ * <td>The <emph>semicolon-delimited</emph> list of catalog files.</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>&#160;</td>
+ * <td>relative-catalogs</td>
+ * <td>If false, relative catalog URIs are made absolute with respect to the base URI of
+ * the <i>CatalogManager.properties</i> file. This setting only applies to catalog
+ * URIs obtained from the <i>catalogs</i> property <emph>in the</emph>
+ * <i>CatalogManager.properties</i> file</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>xml.catalog.verbosity</td>
+ * <td>verbosity</td>
+ * <td>If non-zero, the Catalog classes will print informative and debugging messages.
+ * The higher the number, the more messages.</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>xml.catalog.prefer</td>
+ * <td>prefer</td>
+ * <td>Which identifier is preferred, "public" or "system"?</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>xml.catalog.staticCatalog</td>
+ * <td>static-catalog</td>
+ * <td>Should a single catalog be constructed for all parsing, or should a different
+ * catalog be created for each parser?</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>xml.catalog.allowPI</td>
+ * <td>allow-oasis-xml-catalog-pi</td>
+ * <td>If the source document contains "oasis-xml-catalog" processing instructions,
+ * should they be used?</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>xml.catalog.className</td>
+ * <td>catalog-class-name</td>
+ * <td>If you're using the convenience classes
+ * <tt>org.apache.xml.resolver.tools.*</tt>), this setting
+ * allows you to specify an alternate class name to use for the underlying
+ * catalog.</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ *
+ * @see Catalog
+ *
+ * @author Norman Walsh
+ * <a href="mailto:Norman.Walsh at Sun.COM">Norman.Walsh at Sun.COM</a>
+ *
+ * @version 1.0
+ */
+
+public class NbCatalogManager extends CatalogManager {
+  private static String pFiles         = "xml.catalog.files";
+  private static String pVerbosity     = "xml.catalog.verbosity";
+  private static String pPrefer        = "xml.catalog.prefer";
+  private static String pStatic        = "xml.catalog.staticCatalog";
+  private static String pAllowPI       = "xml.catalog.allowPI";
+  private static String pClassname     = "xml.catalog.className";
+  private static String pIgnoreMissing = "xml.catalog.ignoreMissing";
+
+  /** A static CatalogManager instance for sharing */
+  private static NbCatalogManager staticManager = new NbCatalogManager();
+
+  /** The bootstrap resolver to use when loading XML Catalogs. */
+  private BootstrapResolver bResolver = new BootstrapResolver();
+
+  /** Flag to ignore missing property files and/or properties */
+  private boolean ignoreMissingProperties
+    = (System.getProperty(pIgnoreMissing) != null
+       || System.getProperty(pFiles) != null);
+
+  /** Holds the resources after they are loaded from the file. */
+  private ResourceBundle resources;
+
+  /** The name of the CatalogManager properties file. */
+  private String propertyFile = "CatalogManager.properties";
+
+  /** The location of the propertyFile */
+  private URL propertyFileURI = null;
+
+  /** Default catalog files list. */
+  private String defaultCatalogFiles = "./xcatalog";
+
+  /** Current catalog files list. */
+  private String catalogFiles = null;
+
+  /** Did the catalogFiles come from the properties file? */
+  private boolean fromPropertiesFile = false;
+
+  /** Default verbosity level if there is no property setting for it. */
+  private int defaultVerbosity = 1;
+
+  /** Current verbosity level. */
+  private Integer verbosity = null;
+
+  /** Default preference setting. */
+  private boolean defaultPreferPublic = true;
+
+  /** Current preference setting. */
+  private Boolean preferPublic = null;
+
+  /** Default setting of the static catalog flag. */
+  private boolean defaultUseStaticCatalog = true;
+
+  /** Current setting of the static catalog flag. */
+  private Boolean useStaticCatalog = null;
+
+  /** The static catalog used by this manager. */
+  private static Catalog staticCatalog = null;
+
+  /** Default setting of the oasisXMLCatalogPI flag. */
+  private boolean defaultOasisXMLCatalogPI = true;
+
+  /** Current setting of the oasisXMLCatalogPI flag. */
+  private Boolean oasisXMLCatalogPI = null;
+
+  /** Default setting of the relativeCatalogs flag. */
+  private boolean defaultRelativeCatalogs = true;
+
+  /** Current setting of the relativeCatalogs flag. */
+  private Boolean relativeCatalogs = null;
+
+  /** Current catalog class name. */
+  private String catalogClassName = null;
+
+  /** The manager's debug object. Used for printing debugging messages.
+   *
+   * <p>This field is public so that objects that have access to this
+   * CatalogManager can use this debug object.</p>
+   */
+  public Debug debug = null;
+
+  /** Constructor. */
+  public NbCatalogManager() {
+    debug = new Debug();
+    // Note that we don't setDebug() here; we do that lazily. Either the
+    // user will set it explicitly, or we'll do it automagically if they
+    // read from the propertyFile for some other reason. That way, there's
+    // no attempt to read from the file before the caller has had a chance
+    // to avoid it.
+  }
+
+  /**
+   * Constructor that specifies an explicit property file.
+   * @param propertyFile path to poperty file (e.g. com/resources/CatalogManager).
+   * <code>null</code> means that no property file is consulted at all.
+   */
+  public NbCatalogManager(String propertyFile) {
+    this.propertyFile = propertyFile;
+
+    debug = new Debug();
+    // Note that we don't setDebug() here; we do that lazily. Either the
+    // user will set it explicitly, or we'll do it automagically if they
+    // read from the propertyFile for some other reason. That way, there's
+    // no attempt to read from the file before the caller has had a chance
+    // to avoid it.
+  }
+
+  /** Set the bootstrap resolver.*/
+  public void setBootstrapResolver(BootstrapResolver resolver) {
+    bResolver = resolver;
+  }
+
+  /** Get the bootstrap resolver.*/
+  public BootstrapResolver getBootstrapResolver() {
+    return bResolver;
+  }
+
+  /**
+   * Load the properties from the propertyFile and build the
+   * resources from it.
+   */
+  private synchronized void readProperties() {
+      if (propertyFile == null) return;
+    try {
+      propertyFileURI = NbCatalogManager.class.getResource("/"+propertyFile);
+      InputStream in =
+	NbCatalogManager.class.getResourceAsStream("/"+propertyFile);
+      if (in==null) {
+	if (!ignoreMissingProperties) {
+        debug.message(2, "Cannot find "+propertyFile);
+	  // there's no reason to give this warning more than once
+	  ignoreMissingProperties = true;
+	}
+	return;
+      }
+      resources = new PropertyResourceBundle(in);
+    } catch (MissingResourceException mre) {
+      if (!ignoreMissingProperties) {
+	System.err.println("Cannot read "+propertyFile);
+      }
+    } catch (java.io.IOException e) {
+      if (!ignoreMissingProperties) {
+	System.err.println("Failure trying to read "+propertyFile);
+      }
+    }
+
+    // This is a bit of a hack. After we've successfully read the properties,
+    // use them to set the default debug level, if the user hasn't already set
+    // the default debug level.
+    if (verbosity == null) {
+      try {
+	String verbStr = resources.getString("verbosity");
+	int verb = Integer.parseInt(verbStr.trim());
+	debug.setDebug(verb);
+	verbosity = new Integer(verb);
+      } catch (Exception e) {
+	// nop
+      }
+    }
+  }
+
+  /**
+   * Allow access to the static CatalogManager
+   */
+  public static CatalogManager getStaticManager() {
+    return staticManager;
+  }
+
+  /**
+   * How are missing properties handled?
+   *
+   * <p>If true, missing or unreadable property files will
+   * not be reported. Otherwise, a message will be sent to System.err.
+   * </p>
+   */
+  public boolean getIgnoreMissingProperties() {
+    return ignoreMissingProperties;
+  }
+
+  /**
+   * How should missing properties be handled?
+   *
+   * <p>If ignore is true, missing or unreadable property files will
+   * not be reported. Otherwise, a message will be sent to System.err.
+   * </p>
+   */
+  public void setIgnoreMissingProperties(boolean ignore) {
+    ignoreMissingProperties = ignore;
+  }
+
+  /**
+   * How are missing properties handled?
+   *
+   * <p>If ignore is true, missing or unreadable property files will
+   * not be reported. Otherwise, a message will be sent to System.err.
+   * </p>
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public void ignoreMissingProperties(boolean ignore) {
+    setIgnoreMissingProperties(ignore);
+  }
+
+  /**
+   * Obtain the verbosity setting from the properties.
+   *
+   * @return The verbosity level from the propertyFile or the
+   * defaultVerbosity.
+   */
+  private int queryVerbosity () {
+    String defaultVerbStr = Integer.toString(defaultVerbosity);
+
+    String verbStr = System.getProperty(pVerbosity);
+
+    if (verbStr == null) {
+      if (resources==null) readProperties();
+      if (resources != null) {
+	try {
+	  verbStr = resources.getString("verbosity");
+	} catch (MissingResourceException e) {
+	  verbStr = defaultVerbStr;
+	}
+      } else {
+	verbStr = defaultVerbStr;
+      }
+    }
+
+    int verb = defaultVerbosity;
+
+    try {
+      verb = Integer.parseInt(verbStr.trim());
+    } catch (Exception e) {
+      System.err.println("Cannot parse verbosity: \"" + verbStr + "\"");
+    }
+
+    // This is a bit of a hack. After we've successfully got the verbosity,
+    // we have to use it to set the default debug level,
+    // if the user hasn't already set the default debug level.
+    if (verbosity == null) {
+      debug.setDebug(verb);
+      verbosity = new Integer(verb);
+    }
+
+    return verb;
+  }
+
+  /**
+   * What is the current verbosity?
+   */
+  public int getVerbosity() {
+    if (verbosity == null) {
+      verbosity = new Integer(queryVerbosity());
+    }
+
+    return verbosity.intValue();
+  }
+
+  /**
+   * Set the current verbosity.
+   */
+  public void setVerbosity (int verbosity) {
+    this.verbosity = new Integer(verbosity);
+    debug.setDebug(verbosity);
+  }
+
+  /**
+   * What is the current verbosity?
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public int verbosity () {
+    return getVerbosity();
+  }
+
+  /**
+   * Obtain the relativeCatalogs setting from the properties.
+   *
+   * @return The relativeCatalogs setting from the propertyFile or the
+   * defaultRelativeCatalogs.
+   */
+  private boolean queryRelativeCatalogs () {
+    if (resources==null) readProperties();
+
+    if (resources==null) return defaultRelativeCatalogs;
+
+    try {
+      String allow = resources.getString("relative-catalogs");
+      return (allow.equalsIgnoreCase("true")
+	      || allow.equalsIgnoreCase("yes")
+	      || allow.equalsIgnoreCase("1"));
+    } catch (MissingResourceException e) {
+      return defaultRelativeCatalogs;
+    }
+  }
+
+  /**
+   * Get the relativeCatalogs setting.
+   *
+   * <p>This property is used when the catalogFiles property is
+   * interrogated. If true, then relative catalog entry file names
+   * are returned. If false, relative catalog entry file names are
+   * made absolute with respect to the properties file before returning
+   * them.</p>
+   *
+   * <p>This property <emph>only applies</emph> when the catalog files
+   * come from a properties file. If they come from a system property or
+   * the default list, they are never considered relative. (What would
+   * they be relative to?)</p>
+   *
+   * <p>In the properties, a value of 'yes', 'true', or '1' is considered
+   * true, anything else is false.</p>
+   *
+   * @return The relativeCatalogs setting from the propertyFile or the
+   * defaultRelativeCatalogs.
+   */
+  public boolean getRelativeCatalogs () {
+    if (relativeCatalogs == null) {
+      relativeCatalogs = new Boolean(queryRelativeCatalogs());
+    }
+
+    return relativeCatalogs.booleanValue();
+  }
+
+  /**
+   * Set the relativeCatalogs setting.
+   *
+   * @see #getRelativeCatalogs()
+   */
+  public void setRelativeCatalogs (boolean relative) {
+    relativeCatalogs = new Boolean(relative);
+  }
+
+  /**
+   * Get the relativeCatalogs setting.
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public boolean relativeCatalogs () {
+    return getRelativeCatalogs();
+  }
+
+  /**
+   * Obtain the list of catalog files from the properties.
+   *
+   * @return A semicolon delimited list of catlog file URIs
+   */
+  private String queryCatalogFiles () {
+    String catalogList = System.getProperty(pFiles);
+    fromPropertiesFile = false;
+
+    if (catalogList == null) {
+      if (resources == null) readProperties();
+      if (resources != null) {
+	try {
+	  catalogList = resources.getString("catalogs");
+	  fromPropertiesFile = true;
+	} catch (MissingResourceException e) {
+	  System.err.println(propertyFile + ": catalogs not found.");
+	  catalogList = null;
+	}
+      }
+    }
+
+    if (catalogList == null) {
+      catalogList = defaultCatalogFiles;
+    }
+
+    return catalogList;
+  }
+
+  /**
+   * Return the current list of catalog files.
+   *
+   * @return A vector of the catalog file names or null if no catalogs
+   * are available in the properties.
+   */
+  public Vector getCatalogFiles() {
+    if (catalogFiles == null) {
+      catalogFiles = queryCatalogFiles();
+    }
+
+    StringTokenizer files = new StringTokenizer(catalogFiles, ";");
+    Vector catalogs = new Vector();
+    while (files.hasMoreTokens()) {
+      String catalogFile = files.nextToken();
+      URL absURI = null;
+
+      if (fromPropertiesFile && !relativeCatalogs()) {
+	try {
+	  absURI = new URL(propertyFileURI, catalogFile);
+	  catalogFile = absURI.toString();
+	} catch (MalformedURLException mue) {
+	  absURI = null;
+	}
+      }
+
+      catalogs.add(catalogFile);
+    }
+
+    return catalogs;
+  }
+
+  /**
+   * Set the list of catalog files.
+   */
+  public void setCatalogFiles(String fileList) {
+    catalogFiles = fileList;
+    fromPropertiesFile = false;
+  }
+
+  /**
+   * Return the current list of catalog files.
+   *
+   * @return A vector of the catalog file names or null if no catalogs
+   * are available in the properties.
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public Vector catalogFiles() {
+    return getCatalogFiles();
+  }
+
+  /**
+   * Obtain the preferPublic setting from the properties.
+   *
+   * <p>In the properties, a value of 'public' is true,
+   * anything else is false.</p>
+   *
+   * @return True if prefer is public or the
+   * defaultPreferSetting.
+   */
+  private boolean queryPreferPublic () {
+    String prefer = System.getProperty(pPrefer);
+
+    if (prefer == null) {
+      if (resources==null) readProperties();
+      if (resources==null) return defaultPreferPublic;
+      try {
+	prefer = resources.getString("prefer");
+      } catch (MissingResourceException e) {
+	return defaultPreferPublic;
+      }
+    }
+
+    if (prefer == null) {
+      return defaultPreferPublic;
+    }
+
+    return (prefer.equalsIgnoreCase("public"));
+  }
+
+  /**
+   * Return the current prefer public setting.
+   *
+   * @return True if public identifiers are preferred.
+   */
+  public boolean getPreferPublic () {
+    if (preferPublic == null) {
+      preferPublic = new Boolean(queryPreferPublic());
+    }
+    return preferPublic.booleanValue();
+  }
+
+  /**
+   * Set the prefer public setting.
+   */
+  public void setPreferPublic (boolean preferPublic) {
+    this.preferPublic = new Boolean(preferPublic);
+  }
+
+  /**
+   * Return the current prefer public setting.
+   *
+   * @return True if public identifiers are preferred.
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public boolean preferPublic () {
+    return getPreferPublic();
+  }
+
+  /**
+   * Obtain the static-catalog setting from the properties.
+   *
+   * <p>In the properties, a value of 'yes', 'true', or '1' is considered
+   * true, anything else is false.</p>
+   *
+   * @return The static-catalog setting from the propertyFile or the
+   * defaultUseStaticCatalog.
+   */
+  private boolean queryUseStaticCatalog () {
+    String staticCatalog = System.getProperty(pStatic);
+
+    if (staticCatalog == null) {
+      if (resources==null) readProperties();
+      if (resources==null) return defaultUseStaticCatalog;
+      try {
+	staticCatalog = resources.getString("static-catalog");
+      } catch (MissingResourceException e) {
+	return defaultUseStaticCatalog;
+      }
+    }
+
+    if (staticCatalog == null) {
+      return defaultUseStaticCatalog;
+    }
+
+    return (staticCatalog.equalsIgnoreCase("true")
+	    || staticCatalog.equalsIgnoreCase("yes")
+	    || staticCatalog.equalsIgnoreCase("1"));
+  }
+
+  /**
+   * Get the current use static catalog setting.
+   */
+  public boolean getUseStaticCatalog() {
+    if (useStaticCatalog == null) {
+      useStaticCatalog = new Boolean(queryUseStaticCatalog());
+    }
+
+    return useStaticCatalog.booleanValue();
+  }
+
+  /**
+   * Set the use static catalog setting.
+   */
+  public void setUseStaticCatalog(boolean useStatic) {
+    useStaticCatalog = new Boolean(useStatic);
+  }
+
+  /**
+   * Get the current use static catalog setting.
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public boolean staticCatalog() {
+    return getUseStaticCatalog();
+  }
+
+  /**
+   * Get a new catalog instance.
+   *
+   * This method always returns a new instance of the underlying catalog class.
+   */
+  public Catalog getPrivateCatalog() {
+    Catalog catalog = staticCatalog;
+
+    if (useStaticCatalog == null) {
+      useStaticCatalog = new Boolean(getUseStaticCatalog());
+    }
+
+    if (catalog == null || !useStaticCatalog.booleanValue()) {
+
+      try {
+	String catalogClassName = getCatalogClassName();
+
+	if (catalogClassName == null) {
+	  catalog = new Catalog();
+	} else {
+	  try {
+	    catalog = (Catalog) Class.forName(catalogClassName).newInstance();
+	  } catch (ClassNotFoundException cnfe) {
+	    debug.message(1,"Catalog class named '"
+			  + catalogClassName
+			  + "' could not be found. Using default.");
+	    catalog = new Catalog();
+	  } catch (ClassCastException cnfe) {
+	    debug.message(1,"Class named '"
+			  + catalogClassName
+			  + "' is not a Catalog. Using default.");
+	    catalog = new Catalog();
+	  }
+	}
+
+	catalog.setCatalogManager(this);
+	catalog.setupReaders();
+	catalog.loadSystemCatalogs();
+      } catch (Exception ex) {
+	ex.printStackTrace();
+      }
+
+      if (useStaticCatalog.booleanValue()) {
+	staticCatalog = catalog;
+      }
+    }
+
+    return catalog;
+  }
+
+  /**
+   * Get a catalog instance.
+   *
+   * If this manager uses static catalogs, the same static catalog will
+   * always be returned. Otherwise a new catalog will be returned.
+   */
+  public Catalog getCatalog() {
+    Catalog catalog = staticCatalog;
+
+    if (useStaticCatalog == null) {
+      useStaticCatalog = new Boolean(getUseStaticCatalog());
+    }
+
+    if (catalog == null || !useStaticCatalog.booleanValue()) {
+      catalog = getPrivateCatalog();
+      if (useStaticCatalog.booleanValue()) {
+	staticCatalog = catalog;
+      }
+    }
+
+    return catalog;
+  }
+
+  /**
+   * <p>Obtain the oasisXMLCatalogPI setting from the properties.</p>
+   *
+   * <p>In the properties, a value of 'yes', 'true', or '1' is considered
+   * true, anything else is false.</p>
+   *
+   * @return The oasisXMLCatalogPI setting from the propertyFile or the
+   * defaultOasisXMLCatalogPI.
+   */
+  public boolean queryAllowOasisXMLCatalogPI () {
+    String allow = System.getProperty(pAllowPI);
+
+    if (allow == null) {
+      if (resources==null) readProperties();
+      if (resources==null) return defaultOasisXMLCatalogPI;
+      try {
+	allow = resources.getString("allow-oasis-xml-catalog-pi");
+      } catch (MissingResourceException e) {
+	return defaultOasisXMLCatalogPI;
+      }
+    }
+
+    if (allow == null) {
+      return defaultOasisXMLCatalogPI;
+    }
+
+    return (allow.equalsIgnoreCase("true")
+	    || allow.equalsIgnoreCase("yes")
+	    || allow.equalsIgnoreCase("1"));
+  }
+
+  /**
+   * Get the current XML Catalog PI setting.
+   */
+  public boolean getAllowOasisXMLCatalogPI () {
+    if (oasisXMLCatalogPI == null) {
+      oasisXMLCatalogPI = new Boolean(queryAllowOasisXMLCatalogPI());
+    }
+
+    return oasisXMLCatalogPI.booleanValue();
+  }
+
+  /**
+   * Set the XML Catalog PI setting
+   */
+  public void setAllowOasisXMLCatalogPI(boolean allowPI) {
+    oasisXMLCatalogPI = new Boolean(allowPI);
+  }
+
+  /**
+   * Get the current XML Catalog PI setting.
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public boolean allowOasisXMLCatalogPI() {
+    return getAllowOasisXMLCatalogPI();
+  }
+
+  /**
+   * Obtain the Catalog class name setting from the properties.
+   *
+   */
+  public String queryCatalogClassName () {
+    String className = System.getProperty(pClassname);
+
+    if (className == null) {
+      if (resources==null) readProperties();
+      if (resources==null) return null;
+      try {
+	return resources.getString("catalog-class-name");
+      } catch (MissingResourceException e) {
+	return null;
+      }
+    }
+
+    return className;
+  }
+
+  /**
+   * Get the current Catalog class name.
+   */
+  public String getCatalogClassName() {
+    if (catalogClassName == null) {
+      catalogClassName = queryCatalogClassName();
+    }
+
+    return catalogClassName;
+  }
+
+  /**
+   * Set the Catalog class name.
+   */
+  public void setCatalogClassName(String className) {
+    catalogClassName = className;
+  }
+
+  /**
+   * Get the current Catalog class name.
+   *
+   * @deprecated No longer static; use get/set methods.
+   */
+  public String catalogClassName() {
+    return getCatalogClassName();
+  }
+}
Index: libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/tools/NbCatalogResolver.java
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ libxml-commons-resolver1.1-java-1.2/src/org/apache/xml/resolver/tools/NbCatalogResolver.java	2009-01-30 23:02:49.000000000 +0100
@@ -0,0 +1,316 @@
+// CatalogResolver.java - A SAX EntityResolver/JAXP URI Resolver
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xml.resolver.tools;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.InputSource;
+import org.xml.sax.EntityResolver;
+
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.TransformerException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.xml.resolver.Catalog;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.NbCatalogManager;
+import org.apache.xml.resolver.helpers.FileURL;
+
+/**
+ * A SAX EntityResolver/JAXP URIResolver that uses catalogs.
+ *
+ * <p>This class implements both a SAX EntityResolver and a JAXP URIResolver.
+ * </p>
+ *
+ * <p>This resolver understands OASIS TR9401 catalogs, XCatalogs, and the
+ * current working draft of the OASIS Entity Resolution Technical
+ * Committee specification.</p>
+ *
+ * @see Catalog
+ * @see org.xml.sax.EntityResolver
+ * @see javax.xml.transform.URIResolver
+ *
+ * @author Norman Walsh
+ * <a href="mailto:Norman.Walsh at Sun.COM">Norman.Walsh at Sun.COM</a>
+ *
+ * @version 1.0
+ */
+public class NbCatalogResolver implements EntityResolver, URIResolver {
+  /** Make the parser Namespace aware? */
+  public boolean namespaceAware = true;
+
+  /** Make the parser validating? */
+  public boolean validating = false;
+
+  /** The underlying catalog */
+  private Catalog catalog = null;
+
+  /** The catalog manager */
+  private CatalogManager catalogManager = NbCatalogManager.getStaticManager();
+
+  /** Constructor */
+  public NbCatalogResolver() {
+    initializeCatalogs(false);
+  }
+
+  /** Constructor */
+  public NbCatalogResolver(boolean privateCatalog) {
+    initializeCatalogs(privateCatalog);
+  }
+
+  /** Constructor */
+  public NbCatalogResolver(NbCatalogManager manager) {
+    catalogManager = manager;
+    initializeCatalogs(!catalogManager.getUseStaticCatalog());
+  }
+
+  /** Initialize catalog */
+  private void initializeCatalogs(boolean privateCatalog) {
+    catalog = catalogManager.getCatalog();
+  }
+
+  /** Return the underlying catalog */
+  public Catalog getCatalog() {
+    return catalog;
+  }
+
+  /**
+   * Implements the guts of the <code>resolveEntity</code> method
+   * for the SAX interface.
+   *
+   * <p>Presented with an optional public identifier and a system
+   * identifier, this function attempts to locate a mapping in the
+   * catalogs.</p>
+   *
+   * <p>If such a mapping is found, it is returned.  If no mapping is
+   * found, null is returned.</p>
+   *
+   * @param publicId  The public identifier for the entity in question.
+   * This may be null.
+   *
+   * @param systemId  The system identifier for the entity in question.
+   * XML requires a system identifier on all external entities, so this
+   * value is always specified.
+   *
+   * @return The resolved identifier (a URI reference).
+   */
+  public String getResolvedEntity (String publicId, String systemId) {
+    String resolved = null;
+
+    if (catalog == null) {
+      catalogManager.debug.message(1, "Catalog resolution attempted with null catalog; ignored");
+      return null;
+    }
+
+    if (systemId != null) {
+      try {
+	resolved = catalog.resolveSystem(systemId);
+      } catch (MalformedURLException me) {
+	catalogManager.debug.message(1, "Malformed URL exception trying to resolve",
+		      publicId);
+	resolved = null;
+      } catch (IOException ie) {
+	catalogManager.debug.message(1, "I/O exception trying to resolve", publicId);
+	resolved = null;
+      }
+    }
+
+    if (resolved == null) {
+      if (publicId != null) {
+	try {
+	  resolved = catalog.resolvePublic(publicId, systemId);
+	} catch (MalformedURLException me) {
+	  catalogManager.debug.message(1, "Malformed URL exception trying to resolve",
+			publicId);
+	} catch (IOException ie) {
+	  catalogManager.debug.message(1, "I/O exception trying to resolve", publicId);
+	}
+      }
+
+      if (resolved != null) {
+	catalogManager.debug.message(2, "Resolved public", publicId, resolved);
+      }
+    } else {
+      catalogManager.debug.message(2, "Resolved system", systemId, resolved);
+    }
+
+    return resolved;
+  }
+
+  /**
+   * Implements the <code>resolveEntity</code> method
+   * for the SAX interface.
+   *
+   * <p>Presented with an optional public identifier and a system
+   * identifier, this function attempts to locate a mapping in the
+   * catalogs.</p>
+   *
+   * <p>If such a mapping is found, the resolver attempts to open
+   * the mapped value as an InputSource and return it. Exceptions are
+   * ignored and null is returned if the mapped value cannot be opened
+   * as an input source.</p>
+   *
+   * <p>If no mapping is found (or an error occurs attempting to open
+   * the mapped value as an input source), null is returned and the system
+   * will use the specified system identifier as if no entityResolver
+   * was specified.</p>
+   *
+   * @param publicId  The public identifier for the entity in question.
+   * This may be null.
+   *
+   * @param systemId  The system identifier for the entity in question.
+   * XML requires a system identifier on all external entities, so this
+   * value is always specified.
+   *
+   * @return An InputSource for the mapped identifier, or null.
+   */
+  public InputSource resolveEntity (String publicId, String systemId) {
+    String resolved = getResolvedEntity(publicId, systemId);
+
+    if (resolved != null) {
+      InputSource iSource = new InputSource(resolved);
+      iSource.setPublicId(publicId);
+      return iSource;
+    }
+
+    return null;
+  }
+  /** JAXP URIResolver API */
+  public Source resolve(String href, String base)
+    throws TransformerException {
+
+    String uri = href;
+    String fragment = null;
+    int hashPos = href.indexOf("#");
+    if (hashPos >= 0) {
+      uri = href.substring(0, hashPos);
+      fragment = href.substring(hashPos+1);
+    }
+
+    String result = null;
+
+    try {
+      result = catalog.resolveURI(href);
+    } catch (Exception e) {
+      // nop;
+    }
+
+    if (result == null) {
+      try {
+	URL url = null;
+
+	if (base==null) {
+	  url = new URL(uri);
+	  result = url.toString();
+	} else {
+	  URL baseURL = new URL(base);
+	  url = (href.length()==0 ? baseURL : new URL(baseURL, uri));
+	  result = url.toString();
+	}
+      } catch (java.net.MalformedURLException mue) {
+	// try to make an absolute URI from the current base
+	String absBase = makeAbsolute(base);
+	if (!absBase.equals(base)) {
+	  // don't bother if the absBase isn't different!
+	  return resolve(href, absBase);
+	} else {
+	  throw new TransformerException("Malformed URL "
+					 + href + "(base " + base + ")",
+					 mue);
+	}
+      }
+    }
+
+    catalogManager.debug.message(2, "Resolved URI", href, result);
+
+    SAXSource source = new SAXSource();
+    source.setInputSource(new InputSource(result));
+    setEntityResolver(source);
+    return source;
+  }
+
+  /**
+   * <p>Establish an entityResolver for newly resolved URIs.</p>
+   *
+   * <p>This is called from the URIResolver to set an EntityResolver
+   * on the SAX parser to be used for new XML documents that are
+   * encountered as a result of the document() function, xsl:import,
+   * or xsl:include.  This is done because the XSLT processor calls
+   * out to the SAXParserFactory itself to create a new SAXParser to
+   * parse the new document.  The new parser does not automatically
+   * inherit the EntityResolver of the original (although arguably
+   * it should).  See below:</p>
+   *
+   * <tt>"If an application wants to set the ErrorHandler or
+   * EntityResolver for an XMLReader used during a transformation,
+   * it should use a URIResolver to return the SAXSource which
+   * provides (with getXMLReader) a reference to the XMLReader"</tt>
+   *
+   * <p>...quoted from page 118 of the Java API for XML
+   * Processing 1.1 specification</p>
+   *
+   */
+  private void setEntityResolver(SAXSource source) throws TransformerException {
+    XMLReader reader = source.getXMLReader();
+    if (reader == null) {
+      SAXParserFactory spFactory = SAXParserFactory.newInstance();
+      spFactory.setNamespaceAware(true);
+      try {
+	reader = spFactory.newSAXParser().getXMLReader();
+      }
+      catch (ParserConfigurationException ex) {
+	throw new TransformerException(ex);
+      }
+      catch (SAXException ex) {
+	throw new TransformerException(ex);
+      }
+    }
+    reader.setEntityResolver(this);
+    source.setXMLReader(reader);
+  }
+
+  /** Attempt to construct an absolute URI */
+  private String makeAbsolute(String uri) {
+    if (uri == null) {
+      uri = "";
+    }
+
+    try {
+      URL url = new URL(uri);
+      return url.toString();
+    } catch (MalformedURLException mue) {
+      try {
+	URL fileURL = FileURL.makeURL(uri);
+	return fileURL.toString();
+      } catch (MalformedURLException mue2) {
+	// bail
+	return uri;
+      }
+    }
+  }
+}

netbeans-resolver-6.7.1-resolver.patch:
 resolver.xml                                           |    2 -
 src/org/apache/xml/resolver/Catalog.java               |   18 ++++++++++++
 src/org/apache/xml/resolver/CatalogManager.java        |   13 ++++++---
 src/org/apache/xml/resolver/tools/CatalogResolver.java |   24 -----------------
 4 files changed, 28 insertions(+), 29 deletions(-)

--- NEW FILE netbeans-resolver-6.7.1-resolver.patch ---
diff -Nur xml-commons-resolver-1.2/resolver.xml xml-commons-resolver-1.2.new/resolver.xml
--- xml-commons-resolver-1.2/resolver.xml	2006-11-20 15:23:08.000000000 +0300
+++ xml-commons-resolver-1.2.new/resolver.xml	2009-08-12 01:21:03.000000000 +0400
@@ -88,7 +88,7 @@
 
    <echo message="Compiling..." />
 
-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" optimize="true" deprecation="true" verbose="false">
+   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="true" optimize="true" deprecation="true" verbose="false"  source="1.4" >
      <!-- <classpath> not needed since Ant already supplies these Sep-03 -sc -->
      <include name="${resolver.subdir}/*.java"/>
      <include name="${resolver.subdir}/helpers/*.java"/>
diff -Nur xml-commons-resolver-1.2/src/org/apache/xml/resolver/Catalog.java xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/Catalog.java
--- xml-commons-resolver-1.2/src/org/apache/xml/resolver/Catalog.java	2006-11-20 15:23:08.000000000 +0300
+++ xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/Catalog.java	2009-08-12 01:44:32.000000000 +0400
@@ -27,6 +27,7 @@
 import java.io.DataInputStream;
 
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.Hashtable;
 import java.util.Vector;
 
@@ -1167,6 +1168,23 @@
   }
 
 
+   /**
+    * Return all registered public IDs.
+    */
+   public Iterator getPublicIDs() {
+       Vector v = new Vector();
+       Enumeration enum = catalogEntries.elements();
+
+       while (enum.hasMoreElements()) {
+         CatalogEntry e = (CatalogEntry) enum.nextElement();
+         if (e.getEntryType() == PUBLIC) {
+             v.add(e.getEntryArg(0));
+         }
+       }
+       return v.iterator();
+  }
+
+
   /**
    * Return the applicable DOCTYPE system identifier.
    *
diff -Nur xml-commons-resolver-1.2/src/org/apache/xml/resolver/CatalogManager.java xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/CatalogManager.java
--- xml-commons-resolver-1.2/src/org/apache/xml/resolver/CatalogManager.java	2006-11-20 15:23:08.000000000 +0300
+++ xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/CatalogManager.java	2009-08-12 01:50:54.000000000 +0400
@@ -212,7 +212,11 @@
     // to avoid it.
   }
 
-  /** Constructor that specifies an explicit property file. */
+  /**
+   * Constructor that specifies an explicit property file.
+   * @param propertyFile path to poperty file (e.g. com/resources/CatalogManager).
+   * <code>null</code> means that no property file is consulted at all.
+   */
   public CatalogManager(String propertyFile) {
     this.propertyFile = propertyFile;
 
@@ -239,14 +243,15 @@
    * resources from it.
    */
   private synchronized void readProperties() {
-    try {
+     if (propertyFile == null) return;
+     try {
       propertyFileURI = CatalogManager.class.getResource("/"+propertyFile);
       InputStream in =
 	CatalogManager.class.getResourceAsStream("/"+propertyFile);
       if (in==null) {
 	if (!ignoreMissingProperties) {
-	  System.err.println("Cannot find "+propertyFile);
-	  // there's no reason to give this warning more than once
+	  debug.message(2, "Cannot find "+propertyFile);
+ 	  // there's no reason to give this warning more than once
 	  ignoreMissingProperties = true;
 	}
 	return;
diff -Nur xml-commons-resolver-1.2/src/org/apache/xml/resolver/tools/CatalogResolver.java xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/tools/CatalogResolver.java
--- xml-commons-resolver-1.2/src/org/apache/xml/resolver/tools/CatalogResolver.java	2006-11-20 15:23:08.000000000 +0300
+++ xml-commons-resolver-1.2.new/src/org/apache/xml/resolver/tools/CatalogResolver.java	2009-08-12 01:53:48.000000000 +0400
@@ -192,33 +192,9 @@
     String resolved = getResolvedEntity(publicId, systemId);
 
     if (resolved != null) {
-      try {
 	InputSource iSource = new InputSource(resolved);
 	iSource.setPublicId(publicId);
-
-	// Ideally this method would not attempt to open the
-	// InputStream, but there is a bug (in Xerces, at least)
-	// that causes the parser to mistakenly open the wrong
-	// system identifier if the returned InputSource does
-	// not have a byteStream.
-	//
-	// It could be argued that we still shouldn't do this here,
-	// but since the purpose of calling the entityResolver is
-	// almost certainly to open the input stream, it seems to
-	// do little harm.
-	//
-	URL url = new URL(resolved);
-	InputStream iStream = url.openStream();
-	iSource.setByteStream(iStream);
-
 	return iSource;
-      } catch (Exception e) {
-	catalogManager.debug.message(1,
-				     "Failed to create InputSource ("
-				     + e.toString()
-				     + ")", resolved);
-	return null;
-      }
     }
 
     return null;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Sep 2008 17:24:33 -0000	1.2
+++ .cvsignore	11 Aug 2009 22:30:22 -0000	1.3
@@ -1 +1 @@
-xml-commons-resolver-1.1.zip
+xml-commons-resolver-1.2.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Sep 2008 17:24:33 -0000	1.1
+++ import.log	11 Aug 2009 22:30:22 -0000	1.2
@@ -1 +1,2 @@
 netbeans-resolver-6_1-5_fc10:HEAD:netbeans-resolver-6.1-5.fc10.src.rpm:1220635445
+netbeans-resolver-6_7_1-1_fc12:HEAD:netbeans-resolver-6.7.1-1.fc12.src.rpm:1250030152


Index: netbeans-resolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/netbeans-resolver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netbeans-resolver.spec	25 Jul 2009 18:02:36 -0000	1.3
+++ netbeans-resolver.spec	11 Aug 2009 22:30:23 -0000	1.4
@@ -1,9 +1,9 @@
-%define patched_resolver_ver 1.1
+%define patched_resolver_ver 1.2
 %define patched_resolver xml-commons-resolver-%{patched_resolver_ver}
 
 Name:    netbeans-resolver
-Version: 6.1
-Release: 7%{?dist}
+Version: 6.7.1
+Release: 1%{?dist}
 Summary: Resolver subproject of xml-commons patched for NetBeans
 
 Group:   Development/Libraries
@@ -13,7 +13,8 @@ URL:     http://xml.apache.org/commons/
 Source0: http://www.apache.org/dist/xml/commons/%{patched_resolver}.zip
 
 # see http://hg.netbeans._org/main/file/721f72486327/o.apache.xml.resolver/external/readme.txt
-Patch0: %{name}-%{version}.patch
+Patch0: %{name}-%{version}-nb.patch
+Patch1: %{name}-%{version}-resolver.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -37,6 +38,7 @@ find . -name "*.jar" -exec rm -f {} \;
 %{__rm} -rf docs
 
 %patch0 -p1 -b .sav
+%patch1 -p1 -b .sav
 
 dos2unix -k KEYS
 dos2unix -k LICENSE.resolver.txt
@@ -60,6 +62,9 @@ dos2unix -k LICENSE.resolver.txt
 %doc LICENSE.resolver.txt KEYS
 
 %changelog
+* Wed Aug 12 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
+- Patching for the NetBeans 6.7.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Sep 2008 17:24:33 -0000	1.2
+++ sources	11 Aug 2009 22:30:23 -0000	1.3
@@ -1 +1 @@
-3843a1350ee040c1f68074e6878b4fb1  xml-commons-resolver-1.1.zip
+e1016770401dc0a8207f9358878e3c84  xml-commons-resolver-1.2.zip


--- netbeans-resolver-6.1.patch DELETED ---



From apevec at fedoraproject.org  Tue Aug 11 22:34:15 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Tue, 11 Aug 2009 22:34:15 +0000 (UTC)
Subject: rpms/collectd/F-11 collectd-4.5.4-fix-condrestart.patch, NONE,
	1.1 collectd-4.5.4-libvirt-reconnect.patch, NONE,
	1.1 collectd.spec, 1.19, 1.20
Message-ID: <20090811223416.09DC711C006D@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32714

Modified Files:
	collectd.spec 
Added Files:
	collectd-4.5.4-fix-condrestart.patch 
	collectd-4.5.4-libvirt-reconnect.patch 
Log Message:
* Wed Aug 12 2009 Alan Pevec <apevec at redhat.com> 4.5.4-2
- fix condrestart: on upgrade collectd is not restarted, bz# 516273
- collectd does not re-connect to libvirtd, bz# 480997



collectd-4.5.4-fix-condrestart.patch:
 init.d-collectd |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE collectd-4.5.4-fix-condrestart.patch ---
--- contrib/fedora/init.d-collectd.orig	2009-08-11 01:50:15.000000000 +0200
+++ contrib/fedora/init.d-collectd	2009-08-11 01:51:10.000000000 +0200
@@ -54,7 +54,7 @@
 	start
 	;;
   condrestart)
-	[ -f /var/lock/subsys/$prog ] && restart || :
+	[ -f /var/lock/subsys/$prog ] && stop && start || :
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"

collectd-4.5.4-libvirt-reconnect.patch:
 libvirt.c |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

--- NEW FILE collectd-4.5.4-libvirt-reconnect.patch ---
--- a/src/libvirt.c	2009-08-11 23:27:35.000000000 +0200
+++ b/src/libvirt.c	2009-08-12 00:14:58.000000000 +0200
@@ -49,6 +49,8 @@
 
 /* Connection. */
 static virConnectPtr conn = 0;
+static char *conn_string = NULL;
+static int conn_count = 0;
 
 /* Seconds between list refreshes, 0 disables completely. */
 static int interval = 60;
@@ -153,14 +155,14 @@
         il_interface_devices = ignorelist_create (1);
 
     if (strcasecmp (key, "Connection") == 0) {
-        if (conn != 0) {
+        if (conn_count++ != 0) {
             ERROR ("Connection may only be given once in config file");
             return 1;
         }
-        conn = virConnectOpenReadOnly (value);
-        if (!conn) {
-            VIRT_ERROR (NULL, "connection failed");
-            return 1;
+        conn_string = strdup(value);
+        if (conn_string == NULL) {
+            ERROR ("libvirt plugin: Connection strdup failed.");
+            return -1;
         }
         return 0;
     }
@@ -253,10 +255,11 @@
     int i;
 
     if (conn == NULL) {
-        ERROR ("libvirt plugin: Not connected. Use Connection in "
-                "config file to supply connection URI.  For more information "
-                "see <http://libvirt.org/uri.html>");
-        return -1;
+        conn = virConnectOpenReadOnly (conn_string);
+	if (conn == NULL) {
+	    ERROR ("libvirt plugin: Not connected.");
+	    return -1;
+	}
     }
 
     time (&t);
@@ -264,8 +267,12 @@
     /* Need to refresh domain or device lists? */
     if ((last_refresh == (time_t) 0) ||
             ((interval > 0) && ((last_refresh + interval) <= t))) {
-        if (refresh_lists () != 0)
+        if (refresh_lists () != 0) {
+            if (conn != NULL)
+                virConnectClose (conn);
+            conn = NULL;
             return -1;
+        }
         last_refresh = t;
     }
 


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-11/collectd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- collectd.spec	10 Aug 2009 23:41:40 -0000	1.19
+++ collectd.spec	11 Aug 2009 22:34:15 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -10,6 +10,10 @@ Source: http://collectd.org/files/%{name
 Patch0: %{name}-4.5.1-include-collectd.d.patch
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
 Patch1: %{name}-4.5.1-configure-OpenIPMI.patch
+# bug 516273 on upgrade collectd is not restarted
+Patch2: %{name}-%{version}-fix-condrestart.patch
+# bug 480997 collectd does not re-connect to libvirtd
+Patch3: %{name}-%{version}-libvirt-reconnect.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -151,6 +155,8 @@ This plugin collects information from vi
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
+%patch3 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -407,6 +413,10 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Alan Pevec <apevec at redhat.com> 4.5.4-2
+- fix condrestart: on upgrade collectd is not restarted, bz# 516273
+- collectd does not re-connect to libvirtd, bz# 480997
+
 * Tue Aug 11 2009 Alan Pevec <apevec at redhat.com> 4.5.4-1
 - New upstream version 4.5.4
   http://collectd.org/news.shtml#news66



From deji at fedoraproject.org  Tue Aug 11 22:36:11 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 11 Aug 2009 22:36:11 +0000 (UTC)
Subject: rpms/mpich2/F-10 .cvsignore, 1.5, 1.6 mpich2.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <20090811223611.8551711C006D@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv627

Modified Files:
	.cvsignore mpich2.spec sources 
Log Message:
* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Jul 2009 19:08:25 -0000	1.5
+++ .cvsignore	11 Aug 2009 22:36:10 -0000	1.6
@@ -1 +1 @@
-mpich2-1.1.1.tar.gz
+mpich2-1.1.1p1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/mpich2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mpich2.spec	22 Jul 2009 19:08:25 -0000	1.7
+++ mpich2.spec	11 Aug 2009 22:36:11 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1.1
+Version:	1.1.1p1
 Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
@@ -288,6 +288,9 @@ fi
 %{_mandir}/man4/*.gz
 
 %changelog
+* Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
+- New upstream version
+
 * Wed Jul 22 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1-1
 - Update to 1.1.1
 - Remove (and obsolete) the -libs subpackage, it is not necessary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jul 2009 19:08:25 -0000	1.5
+++ sources	11 Aug 2009 22:36:11 -0000	1.6
@@ -1 +1 @@
-01bffc9233411495c973d52c8ee15bf9  mpich2-1.1.1.tar.gz
+cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz



From marx at fedoraproject.org  Tue Aug 11 22:40:42 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Tue, 11 Aug 2009 22:40:42 +0000 (UTC)
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.37,1.38
Message-ID: <20090811224042.3100D11C048B@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1213

Modified Files:
	system-config-lvm.spec 
Log Message:
new build needed



Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- system-config-lvm.spec	11 Aug 2009 21:58:08 -0000	1.37
+++ system-config-lvm.spec	11 Aug 2009 22:40:41 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
 Version: 1.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -61,7 +61,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
-* Tue Aug 11 2009 Marek Grac <mgrac at redhat.com> - 1.1.6-1
+* Tue Aug 11 2009 Marek Grac <mgrac at redhat.com> - 1.1.6-2
 - Updated translations for Spanish and Polish (transifex)
 - Resolves: #494127 - system-config-lvm crashes on lvs with corelog
 - Resolves: #475997 - crashed with 'IndexError: list index out of range'



From dwalsh at fedoraproject.org  Tue Aug 11 23:05:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 11 Aug 2009 23:05:54 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.29,
	1.30 setroubleshoot-plugins.spec, 1.34, 1.35 sources, 1.30, 1.31
Message-ID: <20090811230554.5B16711C006D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4337

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Aug 11 2009  <dwalsh at redhat.com> - 2.1.13-1
	- Change priority on restorecon and leaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	30 Jul 2009 20:09:45 -0000	1.29
+++ .cvsignore	11 Aug 2009 23:05:52 -0000	1.30
@@ -19,3 +19,4 @@ setroubleshoot-plugins-2.1.8.tar.gz
 setroubleshoot-plugins-2.1.9.tar.gz
 setroubleshoot-plugins-2.1.11.tar.gz
 setroubleshoot-plugins-2.1.12.tar.gz
+setroubleshoot-plugins-2.1.13.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- setroubleshoot-plugins.spec	30 Jul 2009 20:09:45 -0000	1.34
+++ setroubleshoot-plugins.spec	11 Aug 2009 23:05:52 -0000	1.35
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.12
+Version: 2.1.13
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Aug 11 2009  <dwalsh at redhat.com> - 2.1.13-1
+	- Change priority on restorecon and leaks
+
 * Thu Jul 30 2009  <dwalsh at redhat.com> - 2.1.12-1
 - Add leaks.py and tftpd_write_content.py plugin
 - Check execmod protection


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	30 Jul 2009 20:09:45 -0000	1.30
+++ sources	11 Aug 2009 23:05:52 -0000	1.31
@@ -1 +1 @@
-e8d87268ae6abc651613223c969c324b  setroubleshoot-plugins-2.1.12.tar.gz
+6a88b1991336d3a2a9ce1258e2f2739c  setroubleshoot-plugins-2.1.13.tar.gz



From kyle at fedoraproject.org  Tue Aug 11 23:36:41 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 11 Aug 2009 23:36:41 +0000 (UTC)
Subject: rpms/kernel/devel config-x86-generic, 1.86,
	1.86.6.1 config-x86_64-generic, 1.88, 1.88.6.1 kernel.spec,
	1.1688, 1.1688.2.1
Message-ID: <20090811233641.CDA1711C006D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8349

Modified Files:
      Tag: private-f12-2_6_31_rc5-forreals
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
- private-f12-2_6_31_rc5-forreals: LZMA. off. for real.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.86
retrieving revision 1.86.6.1
diff -u -p -r1.86 -r1.86.6.1
--- config-x86-generic	23 Jul 2009 17:45:33 -0000	1.86
+++ config-x86-generic	11 Aug 2009 23:36:40 -0000	1.86.6.1
@@ -1,6 +1,6 @@
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 #
 # Processor type and features


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.88
retrieving revision 1.88.6.1
diff -u -p -r1.88 -r1.88.6.1
--- config-x86_64-generic	23 Jul 2009 17:45:33 -0000	1.88
+++ config-x86_64-generic	11 Aug 2009 23:36:41 -0000	1.88.6.1
@@ -1,6 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_UID16=y
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1688
retrieving revision 1.1688.2.1
diff -u -p -r1.1688 -r1.1688.2.1
--- kernel.spec	4 Aug 2009 06:46:47 -0000	1.1688
+++ kernel.spec	11 Aug 2009 23:36:41 -0000	1.1688.2.1
@@ -1944,6 +1944,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
+- private-f12-2_6_31_rc5-forreals: LZMA. off. for real.
+
 * Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: more code share between nv50/<nv50 kms, bug fixes
 



From kyle at fedoraproject.org  Tue Aug 11 23:49:54 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 11 Aug 2009 23:49:54 +0000 (UTC)
Subject: rpms/kernel/devel config-x86-generic, 1.86,
	1.86.8.1 config-x86_64-generic, 1.88, 1.88.8.1 kernel.spec,
	1.1688, 1.1688.4.1
Message-ID: <20090811234954.8BD5A11C006D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10192

Modified Files:
      Tag: private-f12-2_6_31_rc5-imeanit
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
- private-f12-2_6_31_rc5-imeanit: LZMA. OFF. I MEAN IT.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.86
retrieving revision 1.86.8.1
diff -u -p -r1.86 -r1.86.8.1
--- config-x86-generic	23 Jul 2009 17:45:33 -0000	1.86
+++ config-x86-generic	11 Aug 2009 23:49:54 -0000	1.86.8.1
@@ -1,6 +1,6 @@
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 #
 # Processor type and features


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.88
retrieving revision 1.88.8.1
diff -u -p -r1.88 -r1.88.8.1
--- config-x86_64-generic	23 Jul 2009 17:45:33 -0000	1.88
+++ config-x86_64-generic	11 Aug 2009 23:49:54 -0000	1.88.8.1
@@ -1,6 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_UID16=y
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1688
retrieving revision 1.1688.4.1
diff -u -p -r1.1688 -r1.1688.4.1
--- kernel.spec	4 Aug 2009 06:46:47 -0000	1.1688
+++ kernel.spec	11 Aug 2009 23:49:54 -0000	1.1688.4.1
@@ -1944,6 +1944,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
+- private-f12-2_6_31_rc5-imeanit: LZMA. OFF. I MEAN IT.
+
 * Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: more code share between nv50/<nv50 kms, bug fixes
 



From mjg59 at fedoraproject.org  Wed Aug 12 00:50:20 2009
From: mjg59 at fedoraproject.org (Matthew Garrett)
Date: Wed, 12 Aug 2009 00:50:20 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-pat-fix.patch, NONE, 1.1.2.1 kernel.spec,
	1.1688.4.1, 1.1688.4.2
Message-ID: <20090812005020.20DE711C0489@cvs1.fedora.phx.redhat.com>

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19701

Modified Files:
      Tag: private-f12-2_6_31_rc5-imeanit
	kernel.spec 
Added Files:
      Tag: private-f12-2_6_31_rc5-imeanit
	linux-2.6-pat-fix.patch 
Log Message:
* Wed Aug 12 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-pat-fix.patch - fix potential memory corruption in KMS


linux-2.6-pat-fix.patch:
 pageattr.c |   30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

--- NEW FILE linux-2.6-pat-fix.patch ---
commit 8523acfe40efc1a8d3da8f473ca67cb195b06f0c
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Mon Aug 3 09:25:45 2009 +0200

    x86: Fix CPA memtype reserving in the set_pages_array*() cases
    
    The code was incorrectly reserving memtypes using the page
    virtual address instead of the physical address. Furthermore,
    the code was not ignoring highmem pages as it ought to.
    
    ( upstream does not pass in highmem pages yet - but upcoming
      graphics code will do it and there's no reason to not handle
      this properly in the CPA APIs.)
    
    Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=13884
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
    Acked-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Cc: <stable at kernel.org>
    Cc: dri-devel at lists.sourceforge.net
    Cc: venkatesh.pallipadi at intel.com
    LKML-Reference: <1249284345-7654-1-git-send-email-thellstrom at vmware.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 895d90e..7e600c1 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -591,9 +591,12 @@ static int __change_page_attr(struct cpa_data *cpa, int primary)
 	unsigned int level;
 	pte_t *kpte, old_pte;
 
-	if (cpa->flags & CPA_PAGES_ARRAY)
-		address = (unsigned long)page_address(cpa->pages[cpa->curpage]);
-	else if (cpa->flags & CPA_ARRAY)
+	if (cpa->flags & CPA_PAGES_ARRAY) {
+		struct page *page = cpa->pages[cpa->curpage];
+		if (unlikely(PageHighMem(page)))
+			return 0;
+		address = (unsigned long)page_address(page);
+	} else if (cpa->flags & CPA_ARRAY)
 		address = cpa->vaddr[cpa->curpage];
 	else
 		address = *cpa->vaddr;
@@ -697,9 +700,12 @@ static int cpa_process_alias(struct cpa_data *cpa)
 	 * No need to redo, when the primary call touched the direct
 	 * mapping already:
 	 */
-	if (cpa->flags & CPA_PAGES_ARRAY)
-		vaddr = (unsigned long)page_address(cpa->pages[cpa->curpage]);
-	else if (cpa->flags & CPA_ARRAY)
+	if (cpa->flags & CPA_PAGES_ARRAY) {
+		struct page *page = cpa->pages[cpa->curpage];
+		if (unlikely(PageHighMem(page)))
+			return 0;
+		vaddr = (unsigned long)page_address(page);
+	} else if (cpa->flags & CPA_ARRAY)
 		vaddr = cpa->vaddr[cpa->curpage];
 	else
 		vaddr = *cpa->vaddr;
@@ -1122,7 +1128,9 @@ int set_pages_array_uc(struct page **pages, int addrinarray)
 	int free_idx;
 
 	for (i = 0; i < addrinarray; i++) {
-		start = (unsigned long)page_address(pages[i]);
+		if (PageHighMem(pages[i]))
+			continue;
+		start = page_to_pfn(pages[i]) << PAGE_SHIFT;
 		end = start + PAGE_SIZE;
 		if (reserve_memtype(start, end, _PAGE_CACHE_UC_MINUS, NULL))
 			goto err_out;
@@ -1135,7 +1143,9 @@ int set_pages_array_uc(struct page **pages, int addrinarray)
 err_out:
 	free_idx = i;
 	for (i = 0; i < free_idx; i++) {
-		start = (unsigned long)page_address(pages[i]);
+		if (PageHighMem(pages[i]))
+			continue;
+		start = page_to_pfn(pages[i]) << PAGE_SHIFT;
 		end = start + PAGE_SIZE;
 		free_memtype(start, end);
 	}
@@ -1164,7 +1174,9 @@ int set_pages_array_wb(struct page **pages, int addrinarray)
 		return retval;
 
 	for (i = 0; i < addrinarray; i++) {
-		start = (unsigned long)page_address(pages[i]);
+		if (PageHighMem(pages[i]))
+			continue;
+		start = page_to_pfn(pages[i]) << PAGE_SHIFT;
 		end = start + PAGE_SIZE;
 		free_memtype(start, end);
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1688.4.1
retrieving revision 1.1688.4.2
diff -u -p -r1.1688.4.1 -r1.1688.4.2
--- kernel.spec	11 Aug 2009 23:49:54 -0000	1.1688.4.1
+++ kernel.spec	12 Aug 2009 00:50:19 -0000	1.1688.4.2
@@ -708,6 +708,9 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12000: linux-2.6-x86-set_memory_wc-fixes.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 
+# patches already upstream
+Patch12100: linux-2.6-pat-fix.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1130,6 +1133,8 @@ ApplyPatch via-hwmon-temp-sensor.patch
 ApplyPatch linux-2.6-x86-set_memory_wc-fixes.patch
 ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
+ApplyPatch linux-2.6-pat-fix.patch
+
 #
 # PowerPC
 #
@@ -1944,6 +1949,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Matthew Garrett <mjg at redhat.com>
+- linux-2.6-pat-fix.patch - fix potential memory corruption in KMS
+
 * Tue Aug 11 2009 Kyle McMartin <kyle at redhat.com>
 - private-f12-2_6_31_rc5-imeanit: LZMA. OFF. I MEAN IT.
 



From jcollie at fedoraproject.org  Wed Aug 12 01:46:22 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 12 Aug 2009 01:46:22 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore, 1.15, 1.16 gnonlin.spec, 1.27,
	1.28 sources, 1.15, 1.16
Message-ID: <20090812014622.648BF11C006D@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12-1
- Update to 0.10.12 "Lots of people on the clothesline"
-
- Features of this release
-     
-       * New property for faster composition updates
-       * Speedups
-       * various fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	10 Aug 2009 12:32:43 -0000	1.15
+++ .cvsignore	12 Aug 2009 01:46:22 -0000	1.16
@@ -1 +1 @@
-gnonlin-0.10.11.3.tar.bz2
+gnonlin-0.10.12.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gnonlin.spec	10 Aug 2009 12:32:43 -0000	1.27
+++ gnonlin.spec	12 Aug 2009 01:46:22 -0000	1.28
@@ -2,14 +2,14 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.11.3
-Release:        0.1%{?dist}
+Version:        0.10.12
+Release:        1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gnonlin.sourceforge.net/
-Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= %{gst_req}
@@ -45,6 +45,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12-1
+- Update to 0.10.12 "Lots of people on the clothesline"
+-
+- Features of this release
+-     
+-       * New property for faster composition updates
+-       * Speedups
+-       * various fixes
+
 * Wed Aug  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.11.3-0.1
 - Update to latest prerelease.
 - Clean up some rpmlint warnings


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	10 Aug 2009 12:32:43 -0000	1.15
+++ sources	12 Aug 2009 01:46:22 -0000	1.16
@@ -1 +1 @@
-5da63a33aedf8e4723741068031135a1  gnonlin-0.10.11.3.tar.bz2
+4d9ec131333362535c956a73b6693c57  gnonlin-0.10.12.tar.bz2



From jcollie at fedoraproject.org  Wed Aug 12 01:54:07 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 12 Aug 2009 01:54:07 +0000 (UTC)
Subject: rpms/gnonlin/F-11 .cvsignore, 1.14, 1.15 gnonlin.spec, 1.25,
	1.26 sources, 1.14, 1.15
Message-ID: <20090812015407.ABCA811C006D@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29367

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12-1
- Update to 0.10.12 "Lots of people on the clothesline"
-
- Features of this release
-     
-       * New property for faster composition updates
-       * Speedups
-       * various fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	28 Jul 2009 15:59:28 -0000	1.14
+++ .cvsignore	12 Aug 2009 01:54:07 -0000	1.15
@@ -1 +1 @@
-gnonlin-0.10.11.2.tar.gz
+gnonlin-0.10.12.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/gnonlin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gnonlin.spec	28 Jul 2009 15:59:28 -0000	1.25
+++ gnonlin.spec	12 Aug 2009 01:54:07 -0000	1.26
@@ -1,22 +1,23 @@
-%define		gst_req			0.10.9
-%define		gst_plugins_base_req	0.10.4
+%define         gst_req                 0.10.24
+%define         gst_plugins_base_req    0.10.24
 
-Name: 		gnonlin
-Version: 	0.10.11.2
-Release:	0.2%{?dist}
-Summary: 	GStreamer extension library for non-linear editing
-
-Group: 		System Environment/Libraries
-License: 	LGPLv2+
-URL:		http://gnonlin.sourceforge.net/
-Source:		http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.gz
+Name:           gnonlin
+Version:        0.10.12
+Release:        1%{?dist}
+Summary:        GStreamer extension library for non-linear editing
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://gnonlin.sourceforge.net/
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req}
-BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
+BuildRequires:  gstreamer-devel >= %{gst_req}
+BuildRequires:  gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
 
-Requires:	gstreamer-plugins-base >= %{gst_plugins_base_req}
-Obsoletes:	gnonlin-devel
+Requires:       gstreamer-plugins-base >= %{gst_plugins_base_req}
+Obsoletes:      gnonlin-devel < %{version}-%{release}
+Provides:       gnonlin-devel = %{version}-%{release}
 
 %description
 Gnonlin is a library built on top of GStreamer (http://gstreamer.net)
@@ -44,6 +45,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12-1
+- Update to 0.10.12 "Lots of people on the clothesline"
+-
+- Features of this release
+-     
+-       * New property for faster composition updates
+-       * Speedups
+-       * various fixes
+
+* Wed Aug  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.11.3-0.1
+- Update to latest prerelease.
+- Clean up some rpmlint warnings
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.11.2-0.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -150,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT
 - remove gst-register
 - rm %%{_libdir}/gstreamer-0.10/libgnl.la after install
 - -devel package owns %%{_includedir}/gnl
-- avoid %makeinstall
+- avoid %%makeinstall
 - remove aclocal and autoconf from %%prep
 
 * Mon Jan 23 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	28 Jul 2009 15:59:28 -0000	1.14
+++ sources	12 Aug 2009 01:54:07 -0000	1.15
@@ -1 +1 @@
-20a99e4c1798c849963aa0025318a6c5  gnonlin-0.10.11.2.tar.gz
+4d9ec131333362535c956a73b6693c57  gnonlin-0.10.12.tar.bz2



From phuang at fedoraproject.org  Wed Aug 12 01:54:42 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 12 Aug 2009 01:54:42 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.38, 1.39 ibus-HEAD.patch, 1.23,
	1.24 ibus.spec, 1.82, 1.83 sources, 1.43, 1.44
Message-ID: <20090812015442.CD63C11C006D@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30151

Modified Files:
	.cvsignore ibus-HEAD.patch ibus.spec sources 
Log Message:
Update to 1.2.0.20090812


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	7 Aug 2009 06:05:58 -0000	1.38
+++ .cvsignore	12 Aug 2009 01:54:42 -0000	1.39
@@ -1 +1 @@
-ibus-1.2.0.20090807.tar.gz
+ibus-1.2.0.20090812.tar.gz

ibus-HEAD.patch:
 0 files changed

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ibus-HEAD.patch	10 Aug 2009 06:13:13 -0000	1.23
+++ ibus-HEAD.patch	12 Aug 2009 01:54:42 -0000	1.24
@@ -1,402 +1 @@
-diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
-index 051677e..eee1630 100644
---- a/bus/dbusimpl.c
-+++ b/bus/dbusimpl.c
-@@ -1088,12 +1088,6 @@ bus_dbus_impl_dispatch_message_by_rule (BusDBusImpl     *dbus,
- 
-     dbus_message_set_data (message, data_slot, (gpointer) TRUE, NULL);
- 
--#if 0
--    if (g_strcmp0 (ibus_message_get_member (message), "ValueChanged") == 0) {
--        g_debug ("Dispatch ValueChanged");
--    }
--#endif
--
-     for (link = dbus->rules; link != NULL; link = link->next) {
-         GList *list = bus_match_rule_get_recipients (BUS_MATCH_RULE (link->data),
-                                                      message);
-diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
-index 120277f..e841c28 100644
---- a/bus/ibusimpl.c
-+++ b/bus/ibusimpl.c
-@@ -1179,7 +1179,6 @@ bus_ibus_impl_ibus_message (BusIBusImpl     *ibus,
-     ibus_message_set_destination (message, DBUS_SERVICE_DBUS);
- 
-     if (ibus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_CALL) {
--        g_debug ("Member = %s", ibus_message_get_member (message));
-         for (i = 0; handlers[i].interface != NULL; i++) {
-             if (ibus_message_is_method_call (message,
-                                              handlers[i].interface,
-diff --git a/bus/main.c b/bus/main.c
-index 2e227ea..38040b1 100644
---- a/bus/main.c
-+++ b/bus/main.c
-@@ -25,6 +25,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <locale.h>
-+#include <signal.h>
- #include "server.h"
- #include "ibusimpl.h"
- 
-@@ -39,6 +40,7 @@ static gchar *config = "default";
- static gchar *desktop = "gnome";
- static gchar *address = "";
- gboolean g_rescan = FALSE;
-+gboolean g_mempro = FALSE;
- gboolean g_verbose = FALSE;
- 
- static const GOptionEntry entries[] =
-@@ -52,6 +54,7 @@ static const GOptionEntry entries[] =
-     { "address",   'a', 0, G_OPTION_ARG_STRING, &address,   "specify the address of ibus daemon.", "address" },
-     { "replace",   'r', 0, G_OPTION_ARG_NONE,   &replace,   "if there is an old ibus-daemon is running, it will be replaced.", NULL },
-     { "re-scan",   't', 0, G_OPTION_ARG_NONE,   &g_rescan,  "force to re-scan components, and re-create registry cache.", NULL },
-+    { "mem-profile", 'm', 0, G_OPTION_ARG_NONE,   &g_mempro,   "enable memory profile, send SIGUSR2 to print out the memory profile.", NULL },
-     { "verbose",   'v', 0, G_OPTION_ARG_NONE,   &g_verbose,   "verbose.", NULL },
-     { NULL },
- };
-@@ -143,6 +146,12 @@ _my_log_handler (const gchar    *log_domain,
-     }
- }
- 
-+static void
-+_sig_usr2_handler (int sig)
-+{
-+    g_mem_profile ();
-+}
-+
- gint
- main (gint argc, gchar **argv)
- {
-@@ -164,6 +173,11 @@ main (gint argc, gchar **argv)
-         exit (-1);
-     }
- 
-+    if (g_mempro) {
-+        g_mem_set_vtable (glib_mem_profiler_table);
-+        signal (SIGUSR2, _sig_usr2_handler);
-+    }
-+
-     /* check uid */
-     {
-         const gchar *username = ibus_get_user_name ();
-diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index 68a77d8..d914eae 100644
---- a/client/gtk2/ibusimcontext.c
-+++ b/client/gtk2/ibusimcontext.c
-@@ -774,14 +774,22 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
-     ibusimcontext->preedit_visible = visible;
- 
-     if (ibusimcontext->preedit_visible) {
--        if (flag)
-+        if (flag) {
-+            /* invisible => visible */
-             g_signal_emit (ibusimcontext, _signal_preedit_start_id, 0);
-+        }
-         g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
-     }
-     else {
--        g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
--        if (flag)
-+        if (flag) {
-+            /* visible => invisible */
-+            g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
-             g_signal_emit (ibusimcontext, _signal_preedit_end_id, 0);
-+        }
-+        else {
-+            /* still invisible */
-+            /* do nothing */
-+        }
-     }
- }
- 
-diff --git a/src/ibusbus.c b/src/ibusbus.c
-index b4086cd..cc06586 100644
---- a/src/ibusbus.c
-+++ b/src/ibusbus.c
-@@ -180,9 +180,6 @@ _connection_destroy_cb (IBusConnection  *connection,
- static void
- ibus_bus_connect (IBusBus *bus)
- {
--    const gchar *socket_path;
--    struct stat buf;
--
-     IBusBusPrivate *priv;
-     priv = IBUS_BUS_GET_PRIVATE (bus);
- 
-diff --git a/src/ibushotkey.c b/src/ibushotkey.c
-index 6cac31f..295dea3 100644
---- a/src/ibushotkey.c
-+++ b/src/ibushotkey.c
-@@ -268,23 +268,29 @@ ibus_hotkey_profile_destroy (IBusHotkeyProfile *profile)
-     IBusHotkeyProfilePrivate *priv;
-     priv = IBUS_HOTKEY_PROFILE_GET_PRIVATE (profile);
- 
--    if (priv->hotkeys) {
--        g_tree_destroy (priv->hotkeys);
--        priv->hotkeys = NULL;
--    }
--
-+    /* free events */
-     if (priv->events) {
--        IBusHotkeyEvent *events, *p;
--        p = events = (IBusHotkeyEvent *)g_array_free (priv->events, FALSE);
-+        IBusHotkeyEvent **p;
-+        gint i;
-+        p = (IBusHotkeyEvent **)g_array_free (priv->events, FALSE);
-         priv->events = NULL;
- 
--        while (p->event != 0) {
--            if (p->hotkeys)
--                g_list_free (p->hotkeys);
--            p ++;
-+        for (i = 0; p[i] != NULL; i++) {
-+            if (p[i]->event != 0) {
-+                /* free the hotkeys list, but do not free data in the list
-+                 * The datas will be free in g_tree_destroy
-+                 * */
-+                g_list_free (p[i]->hotkeys);
-+            }
-         }
--        g_free (events);
-+        g_free (p);
-     }
-+
-+    if (priv->hotkeys) {
-+        g_tree_destroy (priv->hotkeys);
-+        priv->hotkeys = NULL;
-+    }
-+
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)profile);
- }
- 
-@@ -363,8 +369,8 @@ ibus_hotkey_profile_add_hotkey (IBusHotkeyProfile *profile,
- 
-     g_tree_insert (priv->hotkeys, (gpointer) hotkey, GUINT_TO_POINTER (event));
- 
--    gint i;
-     IBusHotkeyEvent *p = NULL;
-+    gint i;
-     for ( i = 0; i < priv->events->len; i++) {
-         p = &g_array_index (priv->events, IBusHotkeyEvent, i);
-         if (p->event == event)
-diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
-index 9f59c73..d11fac3 100644
---- a/src/ibuskeymap.c
-+++ b/src/ibuskeymap.c
-@@ -75,14 +75,10 @@ ibus_keymap_class_init (IBusKeymapClass *klass)
- static void
- ibus_keymap_init (IBusKeymap *keymap)
- {
--    gint i, j;
--
-+    gint i;
-     keymap->name = NULL;
--
--    for (i = 0; i < 256; i++) {
--        for (j = 0; j < 5; j++) {
--            keymap->keymap[i][j] = IBUS_VoidSymbol;
--        }
-+    for (i = 0; i < sizeof (keymap->keymap) / sizeof (guint); i++) {
-+        ((guint *)keymap->keymap)[i] = IBUS_VoidSymbol;
-     }
- }
- 
-@@ -306,8 +302,9 @@ ibus_keymap_lookup_keysym (IBusKeymap *keymap,
- 
-     if (keycode < 256) {
-         /* numlock */
--        if (state & IBUS_MOD2_MASK && keymap->keymap[keycode][6] != IBUS_VoidSymbol)
-+        if ((state & IBUS_MOD2_MASK) && (keymap->keymap[keycode][6] != IBUS_VoidSymbol)) {
-             return keymap->keymap[keycode][6];
-+        }
- 
-         state &= IBUS_SHIFT_MASK | IBUS_LOCK_MASK | IBUS_MOD5_MASK;
- 
-diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
-index 7f82d62..324534e 100644
---- a/src/ibuslookuptable.c
-+++ b/src/ibuslookuptable.c
-@@ -86,26 +86,26 @@ ibus_lookup_table_init (IBusLookupTable *table)
- static void
- ibus_lookup_table_destroy (IBusLookupTable *table)
- {
--    IBusText **sp, **p;
-+    IBusText **p;
-+    gint i;
- 
-     if (table->candidates != NULL) {
--        p = sp = (IBusText **) g_array_free (table->candidates, FALSE);
-+        p = (IBusText **) g_array_free (table->candidates, FALSE);
-         table->candidates = NULL;
--        while (*p != NULL) {
--            g_object_unref (*p);
--            p ++;
-+
-+        for (i = 0; p[i] != NULL; i++) {
-+            g_object_unref (p[i]);
-         }
--        g_free (sp);
-+        g_free (p);
-     }
- 
-     if (table->labels != NULL) {
--        p = sp = (IBusText **) g_array_free (table->labels, FALSE);
-+        p = (IBusText **) g_array_free (table->labels, FALSE);
-         table->labels = NULL;
--        while (*p != NULL) {
--            g_object_unref (*p);
--            p ++;
-+        for (i = 0; p[i] != NULL; i++) {
-+            g_object_unref (p[i]);
-         }
--        g_free (sp);
-+        g_free (p);
-     }
- 
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *) table);
-@@ -220,6 +220,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         ibus_message_iter_next (&array_iter);
- 
-         ibus_lookup_table_append_candidate (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-@@ -235,6 +236,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         ibus_message_iter_next (&array_iter);
- 
-         ibus_lookup_table_append_label (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-diff --git a/src/ibusobject.c b/src/ibusobject.c
-index 2c2c25a..5e7ea58 100644
---- a/src/ibusobject.c
-+++ b/src/ibusobject.c
-@@ -36,6 +36,12 @@ struct _IBusObjectPrivate {
- 
- static guint            object_signals[LAST_SIGNAL] = { 0 };
- 
-+// #define DEBUG_MEMORY
-+#ifdef DEBUG_MEMORY
-+static GHashTable      *_count_table;
-+static guint            _count = 0;
-+#endif
-+
- /* functions prototype */
- static void      ibus_object_class_init     (IBusObjectClass    *klass);
- static void      ibus_object_init           (IBusObject         *obj);
-@@ -114,6 +120,10 @@ ibus_object_class_init     (IBusObjectClass *klass)
-             NULL, NULL,
-             ibus_marshal_VOID__VOID,
-             G_TYPE_NONE, 0);
-+#ifdef DEBUG_MEMORY
-+    _count_table = g_hash_table_new (g_direct_hash, g_direct_equal);
-+#endif
-+
- }
- 
- static void
-@@ -123,6 +133,7 @@ ibus_object_init (IBusObject *obj)
-     priv = IBUS_OBJECT_GET_PRIVATE (obj);
- 
-     obj->flags = 0;
-+
- }
- 
- 
-@@ -135,6 +146,18 @@ ibus_object_constructor (GType                   type,
- 
-     object = parent_class->constructor (type, n ,args);
- 
-+#ifdef DEBUG_MEMORY
-+    if (object != NULL) {
-+        guint count;
-+        _count ++;
-+
-+        count = GPOINTER_TO_UINT (g_hash_table_lookup (_count_table, (gpointer) type));
-+        g_hash_table_replace (_count_table, (gpointer) type, GUINT_TO_POINTER (++count));
-+
-+        g_debug ("new %s, count = %d, all = %d", g_type_name (type), count, _count);
-+    }
-+#endif
-+
-     return object;
- }
- 
-@@ -157,6 +180,15 @@ ibus_object_dispose (IBusObject *obj)
- static void
- ibus_object_finalize (IBusObject *obj)
- {
-+#ifdef DEBUG_MEMORY 
-+    guint count;
-+
-+    _count --;
-+    count = GPOINTER_TO_UINT (g_hash_table_lookup (_count_table, (gpointer)G_OBJECT_TYPE (obj)));
-+    g_hash_table_replace (_count_table, (gpointer)G_OBJECT_TYPE (obj), GUINT_TO_POINTER (--count));
-+    g_debug ("Finalize %s, count = %d, all = %d", G_OBJECT_TYPE_NAME (obj), count, _count);
-+#endif
-+
-     G_OBJECT_CLASS(parent_class)->finalize (G_OBJECT (obj));
- }
- 
-diff --git a/src/ibusproperty.c b/src/ibusproperty.c
-index 1759b94..1b70f70 100644
---- a/src/ibusproperty.c
-+++ b/src/ibusproperty.c
-@@ -97,15 +97,17 @@ ibus_property_init (IBusProperty *prop)
-     prop->sensitive = FALSE;
-     prop->visible = FALSE;
-     prop->state = 0;
-+
-+    prop->sub_props = NULL;
- }
- 
- static void
- ibus_property_destroy (IBusProperty *prop)
- {
-     g_free (prop->key);
--    g_free (prop->icon);
--
-     prop->key = NULL;
-+
-+    g_free (prop->icon);
-     prop->icon = NULL;
- 
-     if (prop->label) {
-@@ -118,6 +120,11 @@ ibus_property_destroy (IBusProperty *prop)
-         prop->tooltip = NULL;
-     }
- 
-+    if (prop->sub_props) {
-+        g_object_unref (prop->sub_props);
-+        prop->sub_props = NULL;
-+    }
-+
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
- }
- 
-@@ -427,14 +434,15 @@ ibus_prop_list_init (IBusPropList *prop_list)
- static void
- ibus_prop_list_destroy (IBusPropList *prop_list)
- {
--    IBusProperty **ps, **p;
--    p = ps = (IBusProperty **) g_array_free (prop_list->properties, FALSE);
-+    IBusProperty **p;
-+    gint i;
-+
-+    p = (IBusProperty **) g_array_free (prop_list->properties, FALSE);
- 
--    while (*p != NULL) {
--        g_object_unref (*p);
--        p ++;
-+    for (i = 0; p[i] != NULL; i++) {
-+        g_object_unref (p[i]);
-     }
--    g_free (ps);
-+    g_free (p);
- 
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *) prop_list);
- }
+


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- ibus.spec	10 Aug 2009 06:13:13 -0000	1.82
+++ ibus.spec	12 Aug 2009 01:54:42 -0000	1.83
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090807
-Release:    4%{?dist}
+Version:    1.2.0.20090812
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -114,8 +114,7 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-%patch0 -p1
-# ./autogen.sh --help
+# %patch0 -p1
 
 %build
 %configure --disable-static \
@@ -228,6 +227,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Aug 12 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090812-1
+- Update to 1.2.0.20090812
+
 * Mon Aug 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-4
 - Update ibus-HEAD.patch
 - Fix Numlock problem.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	7 Aug 2009 06:05:59 -0000	1.43
+++ sources	12 Aug 2009 01:54:42 -0000	1.44
@@ -1 +1 @@
-e8f54de7ab4e423036bef67b5b602872  ibus-1.2.0.20090807.tar.gz
+5b50f05b00355ae74a85f572339fb7c1  ibus-1.2.0.20090812.tar.gz



From mbarnes at fedoraproject.org  Wed Aug 12 02:08:38 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 12 Aug 2009 02:08:38 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.12,
	1.116.2.13 evolution.spec, 
	1.394.2.22, 1.394.2.23 sources, 1.116.2.16, 1.116.2.17
Message-ID: <20090812020838.C92B511C006D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32144

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-2.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit 26072c8.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.12
retrieving revision 1.116.2.13
diff -u -p -r1.116.2.12 -r1.116.2.13
--- .cvsignore	28 Jul 2009 16:19:05 -0000	1.116.2.12
+++ .cvsignore	12 Aug 2009 02:08:38 -0000	1.116.2.13
@@ -1 +1 @@
-evolution-2.27.5-kill-bonobo-2c4510e.tar.bz2
+evolution-2.27.90-kill-bonobo-26072c8.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.22
retrieving revision 1.394.2.23
diff -u -p -r1.394.2.22 -r1.394.2.23
--- evolution.spec	31 Jul 2009 19:38:34 -0000	1.394.2.22
+++ evolution.spec	12 Aug 2009 02:08:38 -0000	1.394.2.23
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 2c4510e
+%define hash 26072c8
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.5
-Release: 3.kb.1%{?dist}
+Version: 2.27.90
+Release: 2.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-2.kb.1.fc12
+- Snapshot of "kill-bonobo" branch at commit 26072c8.
+
 * Fri Jul 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.5-3.kb.1.fc12
 - Rebuild to keep N-V-R ahead of Rawhide.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.16
retrieving revision 1.116.2.17
diff -u -p -r1.116.2.16 -r1.116.2.17
--- sources	28 Jul 2009 16:19:05 -0000	1.116.2.16
+++ sources	12 Aug 2009 02:08:38 -0000	1.116.2.17
@@ -1 +1 @@
-26a5fd8aaf48812b2120b7d856af92ed  evolution-2.27.5-kill-bonobo-2c4510e.tar.bz2
+8713138264a2a82b8a749ebb26ba2f06  evolution-2.27.90-kill-bonobo-26072c8.tar.bz2



From ausil at fedoraproject.org  Wed Aug 12 02:27:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 12 Aug 2009 02:27:23 +0000 (UTC)
Subject: rpms/kernel/devel Makefile.config, 1.71, 1.72 config-sparc64-generic,
	1.26, 1.27 kernel.spec, 1.1711, 1.1712 config-sparc64-smp, 1.3, NONE
Message-ID: <20090812022723.9C36C11C00D0@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3365

Modified Files:
	Makefile.config config-sparc64-generic kernel.spec 
Removed Files:
	config-sparc64-smp 
Log Message:
disable building -smp and -perf on sparc64



Index: Makefile.config
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- Makefile.config	20 Jul 2009 16:43:59 -0000	1.71
+++ Makefile.config	12 Aug 2009 02:27:23 -0000	1.72
@@ -10,7 +10,7 @@ CONFIGFILES	= \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config $(CFG)-arm.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
-	$(CFG)-sparc64.config $(CFG)-sparc64-smp.config \
+	$(CFG)-sparc64.config  \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ia64.config
 
@@ -80,9 +80,6 @@ kernel-$(VERSION)-x86_64.config: /dev/nu
 kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-sparc64-smp.config: config-sparc64-smp temp-sparc64-generic
-	perl merge.pl $^ sparc64 > $@
-
 kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic
 	perl merge.pl $^ sparc64 > $@
 


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- config-sparc64-generic	8 Aug 2009 19:36:06 -0000	1.26
+++ config-sparc64-generic	12 Aug 2009 02:27:23 -0000	1.27
@@ -1,4 +1,4 @@
-# CONFIG_SMP is not set
+CONFIG_SMP=y
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
 CONFIG_SECCOMP=y
@@ -199,5 +199,3 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
-
-# CONFIG_KGDB is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -p -r1.1711 -r1.1712
--- kernel.spec	11 Aug 2009 21:55:35 -0000	1.1711
+++ kernel.spec	12 Aug 2009 02:27:23 -0000	1.1712
@@ -78,7 +78,7 @@ Summary: The Linux kernel
 #
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
-# kernel-smp (only valid for ppc 32-bit, sparc64)
+# kernel-smp (only valid for ppc 32-bit)
 %define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
 # kernel-kdump
 %define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
@@ -230,8 +230,8 @@ Summary: The Linux kernel
 
 # Overrides for generic default options
 
-# only ppc and sparc64 need separate smp kernels
-%ifnarch ppc sparc64 alphaev56
+# only ppc and alphav56 need separate smp kernels
+%ifnarch ppc alphaev56
 %define with_smp 0
 %endif
 
@@ -317,6 +317,7 @@ Summary: The Linux kernel
 %define make_target image
 %define kernel_image arch/sparc/boot/image
 %define image_install_path boot
+%define with_perftool 0
 %endif
 
 %ifarch ppc
@@ -537,7 +538,6 @@ Source60: config-ia64-generic
 Source70: config-s390x
 
 Source90: config-sparc64-generic
-Source91: config-sparc64-smp
 
 Source100: config-arm
 
@@ -1980,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Dennis Gilmore <dennis at ausil.us> - 2.6.31-0.149.rc5.git3
+- disable building the -smp kernel on sparc64
+- disable building kernel-perf on sparc64 syscalls not supported
+
 * Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
 - Enable config IMA
 


--- config-sparc64-smp DELETED ---



From bojan at fedoraproject.org  Wed Aug 12 03:01:28 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 12 Aug 2009 03:01:28 +0000 (UTC)
Subject: rpms/viewvc/devel viewvc.spec,1.20,1.21
Message-ID: <20090812030128.5C18611C00D0@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9315

Modified Files:
	viewvc.spec 
Log Message:
Fix replacement of varius config variables.


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- viewvc.spec	11 Aug 2009 21:46:43 -0000	1.20
+++ viewvc.spec	12 Aug 2009 03:01:28 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -69,10 +69,10 @@ with decent performance when run under A
 
 # Fix paths in configuration
 %{__perl} -pi \
-  -e 's|^template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
-  -e 's|^#docroot = .*|docroot = /viewvc-static|;' \
-  -e 's|^cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
-  -e 's|^use_cvsgraph = .*|use_cvsgraph = 1|;' \
+  -e 's|^#* *template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
+  -e 's|^#* *docroot = .*|docroot = /viewvc-static|;' \
+  -e 's|^#* *cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+  -e 's|^#* *use_cvsgraph = .*|use_cvsgraph = 1|;' \
   %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 
 # Install config to sysconf directory
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
+- fix replacement of varius config variables
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
 - bump up to 1.1.2
 - security fix: validate the 'view' parameter to avoid XSS attack



From bojan at fedoraproject.org  Wed Aug 12 03:02:21 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 12 Aug 2009 03:02:21 +0000 (UTC)
Subject: rpms/viewvc/F-11 viewvc.spec,1.19,1.20
Message-ID: <20090812030221.0557611C00D0@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9514

Modified Files:
	viewvc.spec 
Log Message:
Fix replacement of varius config variables.


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- viewvc.spec	11 Aug 2009 21:53:15 -0000	1.19
+++ viewvc.spec	12 Aug 2009 03:02:20 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -69,10 +69,10 @@ with decent performance when run under A
 
 # Fix paths in configuration
 %{__perl} -pi \
-  -e 's|^template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
-  -e 's|^#docroot = .*|docroot = /viewvc-static|;' \
-  -e 's|^cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
-  -e 's|^use_cvsgraph = .*|use_cvsgraph = 1|;' \
+  -e 's|^#* *template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
+  -e 's|^#* *docroot = .*|docroot = /viewvc-static|;' \
+  -e 's|^#* *cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+  -e 's|^#* *use_cvsgraph = .*|use_cvsgraph = 1|;' \
   %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
 
 # Install config to sysconf directory
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
+- fix replacement of varius config variables
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
 - bump up to 1.1.2
 - security fix: validate the 'view' parameter to avoid XSS attack



From bojan at fedoraproject.org  Wed Aug 12 03:05:17 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 12 Aug 2009 03:05:17 +0000 (UTC)
Subject: rpms/viewvc/devel viewvc.spec,1.21,1.22
Message-ID: <20090812030517.6692D11C00D0@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10019

Modified Files:
	viewvc.spec 
Log Message:
Fix spelling.


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- viewvc.spec	12 Aug 2009 03:01:28 -0000	1.21
+++ viewvc.spec	12 Aug 2009 03:05:17 -0000	1.22
@@ -119,7 +119,7 @@ with decent performance when run under A
 
 %changelog
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
-- fix replacement of varius config variables
+- fix replacement of various config variables
 
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
 - bump up to 1.1.2



From bojan at fedoraproject.org  Wed Aug 12 03:05:26 2009
From: bojan at fedoraproject.org (bojan)
Date: Wed, 12 Aug 2009 03:05:26 +0000 (UTC)
Subject: rpms/viewvc/F-11 viewvc.spec,1.20,1.21
Message-ID: <20090812030526.3AB1011C00D0@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10065

Modified Files:
	viewvc.spec 
Log Message:
Fix spelling.


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- viewvc.spec	12 Aug 2009 03:02:20 -0000	1.20
+++ viewvc.spec	12 Aug 2009 03:05:26 -0000	1.21
@@ -119,7 +119,7 @@ with decent performance when run under A
 
 %changelog
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
-- fix replacement of varius config variables
+- fix replacement of various config variables
 
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
 - bump up to 1.1.2



From mbarnes at fedoraproject.org  Wed Aug 12 03:16:48 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 12 Aug 2009 03:16:48 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.23,1.394.2.24
Message-ID: <20090812031648.C448611C00D0@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11697

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:

* Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-2.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit 26072c8.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.23
retrieving revision 1.394.2.24
diff -u -p -r1.394.2.23 -r1.394.2.24
--- evolution.spec	12 Aug 2009 02:08:38 -0000	1.394.2.23
+++ evolution.spec	12 Aug 2009 03:16:48 -0000	1.394.2.24
@@ -4,6 +4,7 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
+%define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
@@ -99,6 +100,7 @@ BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
+BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc



From mclasen at fedoraproject.org  Wed Aug 12 03:12:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 03:12:02 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.111, 1.112 gtk2.spec, 1.394,
	1.395 sources, 1.120, 1.121
Message-ID: <20090812031202.E310811C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11044

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.17.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- .cvsignore	25 Jul 2009 04:11:11 -0000	1.111
+++ .cvsignore	12 Aug 2009 03:12:02 -0000	1.112
@@ -1 +1 @@
-gtk+-2.17.6.tar.bz2
+gtk+-2.17.7.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- gtk2.spec	11 Aug 2009 18:18:11 -0000	1.394
+++ gtk2.spec	12 Aug 2009 03:12:02 -0000	1.395
@@ -11,13 +11,13 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.6
+%define base_version 2.17.7
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -28,10 +28,7 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
-Patch1: default_printer.patch
-
-Patch2: gdm-background.patch
-Patch3: set-cursor.patch
+# Patch1: default_printer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -143,9 +140,7 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p0 -b .default-printer
-%patch2 -p1 -b .gdm-background
-%patch3 -p1 -b .set-cursor
+# %patch1 -p0 -b .default-printer
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -390,6 +385,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.7-1
+- 2.17.7
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-6
 - Fix setting root cursors
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	25 Jul 2009 04:11:11 -0000	1.120
+++ sources	12 Aug 2009 03:12:02 -0000	1.121
@@ -1 +1 @@
-6e812cfed1caae289705876d84f2be79  gtk+-2.17.6.tar.bz2
+94a359d5929a1306bb3267a02f9707d0  gtk+-2.17.7.tar.bz2



From mclasen at fedoraproject.org  Wed Aug 12 03:26:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 03:26:40 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.64, 1.65 gcalctool.spec, 1.95,
	1.96 sources, 1.65, 1.66
Message-ID: <20090812032640.92B4011C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13696

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	28 Jul 2009 04:23:51 -0000	1.64
+++ .cvsignore	12 Aug 2009 03:26:40 -0000	1.65
@@ -1 +1 @@
-gcalctool-5.27.5.tar.bz2
+gcalctool-5.27.90.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- gcalctool.spec	28 Jul 2009 04:23:51 -0000	1.95
+++ gcalctool.spec	12 Aug 2009 03:26:40 -0000	1.96
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.27.5
+Version:        5.27.90
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.90-1
+- Update to 5.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.5-1
 - Update to 5.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	28 Jul 2009 04:23:51 -0000	1.65
+++ sources	12 Aug 2009 03:26:40 -0000	1.66
@@ -1 +1 @@
-abaaedfdba2f5905d9c57ae73105b84f  gcalctool-5.27.5.tar.bz2
+483bad0a53fb15f142fa82204ce118af  gcalctool-5.27.90.tar.bz2



From gavin at fedoraproject.org  Wed Aug 12 03:36:10 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Wed, 12 Aug 2009 03:36:10 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.4, 1.5 etoys.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20090812033610.5A71711C00D0@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15208

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2229



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jun 2009 00:53:38 -0000	1.4
+++ .cvsignore	12 Aug 2009 03:36:10 -0000	1.5
@@ -1 +1 @@
-etoys-4.0.2212.tar.gz
+etoys-4.0.2229.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- etoys.spec	24 Jul 2009 22:20:38 -0000	1.5
+++ etoys.spec	12 Aug 2009 03:36:10 -0000	1.6
@@ -1,6 +1,6 @@
 %define name    etoys
-%define version 4.0.2212
-%define release 2%{?dist}
+%define version 4.0.2229
+%define release 1%{?dist}
 %define source  %{name}-%{version}
 
 Name:           %{name}
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Aug 11 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2229-1
+- pulled in latest upstream release 4.0.2229
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2212-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jun 2009 00:53:38 -0000	1.4
+++ sources	12 Aug 2009 03:36:10 -0000	1.5
@@ -1 +1 @@
-3eeb43af8c6bc0a30b46739707e27259  etoys-4.0.2212.tar.gz
+0f0e543c44b9e1b1e1fce763db04b9f6  etoys-4.0.2229.tar.gz



From mclasen at fedoraproject.org  Wed Aug 12 03:30:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 03:30:04 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.49, 1.50 sources, 1.49, 1.50 vino.spec,
	1.103, 1.104
Message-ID: <20090812033004.4489311C0489@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14515

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	28 Jul 2009 04:28:56 -0000	1.49
+++ .cvsignore	12 Aug 2009 03:30:04 -0000	1.50
@@ -1 +1 @@
-vino-2.27.5.tar.bz2
+vino-2.27.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	28 Jul 2009 04:28:56 -0000	1.49
+++ sources	12 Aug 2009 03:30:04 -0000	1.50
@@ -1 +1 @@
-070c96efa0337c8d92f6d84ec876e74c  vino-2.27.5.tar.bz2
+9279cf89bfceeab8fe8cae515e6a5232  vino-2.27.90.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- vino.spec	4 Aug 2009 04:14:54 -0000	1.103
+++ vino.spec	12 Aug 2009 03:30:04 -0000	1.104
@@ -9,8 +9,8 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.27.5
-Release: 2%{?dist}
+Version: 2.27.90
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.27/%{name}-%{version}.tar.bz2
 
@@ -129,6 +129,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Enable telepathy
 



From mclasen at fedoraproject.org  Wed Aug 12 03:20:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 03:20:08 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.65, 1.66 evince.spec, 1.167,
	1.168 sources, 1.64, 1.65
Message-ID: <20090812032008.0A77211C048B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12221

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	14 Jul 2009 03:19:33 -0000	1.65
+++ .cvsignore	12 Aug 2009 03:20:07 -0000	1.66
@@ -1 +1 @@
-evince-2.27.4.tar.bz2
+evince-2.27.90.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- evince.spec	24 Jul 2009 22:21:48 -0000	1.167
+++ evince.spec	12 Aug 2009 03:20:07 -0000	1.168
@@ -5,8 +5,8 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.27.4
-Release:	2%{?dist}
+Version:	2.27.90
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -257,6 +257,9 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	14 Jul 2009 03:19:33 -0000	1.64
+++ sources	12 Aug 2009 03:20:07 -0000	1.65
@@ -1 +1 @@
-bfd1488d0c8d41d9c54bc2b69946bb65  evince-2.27.4.tar.bz2
+94d998e7e2facf68bd1bc78d032248ba  evince-2.27.90.tar.bz2



From gavin at fedoraproject.org  Wed Aug 12 03:43:49 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Wed, 12 Aug 2009 03:43:49 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.4, 1.5 etoys.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090812034349.9FB3A11C00D0@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16577

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2229



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jun 2009 01:06:10 -0000	1.4
+++ .cvsignore	12 Aug 2009 03:43:49 -0000	1.5
@@ -1 +1 @@
-etoys-4.0.2212.tar.gz
+etoys-4.0.2229.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- etoys.spec	3 Jun 2009 01:06:10 -0000	1.4
+++ etoys.spec	12 Aug 2009 03:43:49 -0000	1.5
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2212
+%define version 4.0.2229
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Aug 11 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2229-1
+- pulled in latest upstream release 4.0.2229
+
 * Tue Jun  2 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2212-1
 - pulled in latest upstream release 4.0.2212
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jun 2009 01:06:10 -0000	1.4
+++ sources	12 Aug 2009 03:43:49 -0000	1.5
@@ -1 +1 @@
-3eeb43af8c6bc0a30b46739707e27259  etoys-4.0.2212.tar.gz
+0f0e543c44b9e1b1e1fce763db04b9f6  etoys-4.0.2229.tar.gz



From mclasen at fedoraproject.org  Wed Aug 12 03:35:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 03:35:48 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 vinagre.spec, 1.49, 1.50
Message-ID: <20090812033548.BA2B711C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15520

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	28 Jul 2009 16:22:09 -0000	1.26
+++ .cvsignore	12 Aug 2009 03:35:48 -0000	1.27
@@ -1 +1 @@
-vinagre-2.27.5.tar.bz2
+vinagre-2.27.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	28 Jul 2009 16:22:10 -0000	1.26
+++ sources	12 Aug 2009 03:35:48 -0000	1.27
@@ -1 +1 @@
-3ff63eda28860133467cba92f797d94e  vinagre-2.27.5.tar.bz2
+2f4211f05632924386bad3e3c351e4a4  vinagre-2.27.90.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- vinagre.spec	4 Aug 2009 10:29:41 -0000	1.49
+++ vinagre.spec	12 Aug 2009 03:35:48 -0000	1.50
@@ -1,6 +1,6 @@
 Name:		vinagre
-Version:	2.27.5
-Release:	2%{?dist}
+Version:	2.27.90
+Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
 Group:		Applications/System
@@ -157,6 +157,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- 2.27.90
+
 * Tue Aug 04 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
 - Fix pkg-config requires
 



From gavin at fedoraproject.org  Wed Aug 12 03:51:17 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Wed, 12 Aug 2009 03:51:17 +0000 (UTC)
Subject: rpms/etoys/F-10 .cvsignore, 1.4, 1.5 etoys.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090812035117.E4A3E11C00D0@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17857

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2229



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jun 2009 01:10:15 -0000	1.4
+++ .cvsignore	12 Aug 2009 03:51:17 -0000	1.5
@@ -1 +1 @@
-etoys-4.0.2212.tar.gz
+etoys-4.0.2229.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/etoys.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- etoys.spec	3 Jun 2009 01:10:15 -0000	1.3
+++ etoys.spec	12 Aug 2009 03:51:17 -0000	1.4
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2212
+%define version 4.0.2229
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Aug 11 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2229-1
+- pulled in latest upstream release 4.0.2229
+
 * Tue Jun  2 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2212-1
 - pulled in latest upstream release 4.0.2212
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jun 2009 01:10:15 -0000	1.4
+++ sources	12 Aug 2009 03:51:17 -0000	1.5
@@ -1 +1 @@
-3eeb43af8c6bc0a30b46739707e27259  etoys-4.0.2212.tar.gz
+0f0e543c44b9e1b1e1fce763db04b9f6  etoys-4.0.2229.tar.gz



From mclasen at fedoraproject.org  Wed Aug 12 04:01:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 04:01:55 +0000 (UTC)
Subject: rpms/vinagre/devel vinagre.spec,1.50,1.51
Message-ID: <20090812040155.E4B1E11C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20105

Modified Files:
	vinagre.spec 
Log Message:
fix file lists



Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- vinagre.spec	12 Aug 2009 03:35:48 -0000	1.50
+++ vinagre.spec	12 Aug 2009 04:01:55 -0000	1.51
@@ -16,7 +16,6 @@ BuildRequires:	gtk2-devel >= 2.12.0
 BuildRequires:	GConf2-devel >= 2.16.0
 BuildRequires:	avahi-ui-devel >= 0.6.18
 BuildRequires:	avahi-gobject-devel >= 0.6.18
-BuildRequires:	libglade2-devel >= 2.6.0
 BuildRequires:	gettext intltool
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-keyring-devel
@@ -134,7 +133,6 @@ fi
 %{_sysconfdir}/gconf/schemas/vinagre.schemas
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/vinagre-plugin.png
 %{_datadir}/mime/packages/vinagre-mime.xml
 %{_datadir}/%{name}/
 %{_libdir}/bonobo/servers/GNOME_VinagreApplet.server
@@ -145,7 +143,7 @@ fi
 %{_libdir}/vinagre-1/plugin-loaders/*.so
 %{_libdir}/vinagre-1/plugins/*.so
 %{_libdir}/vinagre-1/plugins/*.vinagre-plugin
-%{_datadir}/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.x_vnc.service
+%{_datadir}/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
 
 
 %doc %{_mandir}/man1/vinagre.1.gz



From deji at fedoraproject.org  Wed Aug 12 04:27:52 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Wed, 12 Aug 2009 04:27:52 +0000 (UTC)
Subject: rpms/atlas/devel atlas.spec,1.26,1.27
Message-ID: <20090812042752.0EBF111C01EA@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11493

Modified Files:
	atlas.spec 
Log Message:
* Wed Aug 13 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-8
- Revert the last change, it doesn't solve the problem. 



Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- atlas.spec	4 Aug 2009 22:28:34 -0000	1.26
+++ atlas.spec	12 Aug 2009 04:27:51 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -35,20 +35,12 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	%name-header = %version-%release
+Obsoletes:	%name-header = %version-%release
 
 %description devel
-This package contains the shared and static libraries for development
+This package contains the libraries and headers for development
 with ATLAS (Automatically Tuned Linear Algebra Software).
 
-%package header
-Summary:	atlas header files
-Group:		Development/Libraries
-BuildArch:	noarch
-
-%description header
-This package contains the header files for for development with ATLAS.
-
 %define types base
 
 %if "%{?enable_native_atlas}" == "0"
@@ -76,12 +68,12 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Requires:	%name-header = %version-%release
+Obsoletes:	%name-header = %version-%release
 Obsoletes:	%{name}-3dnow-devel < 3.7
 Provides:	%{name}-3dnow-devel = %{version}-%{release}
 
 %description sse-devel
-This package contains shared and static versions of the ATLAS
+This package contains headers and shared and static versions of the ATLAS
 (Automatically Tuned Linear Algebra Software) libraries compiled with
 optimizations for the SSE(1) extensions to the ix86 architecture.
 
@@ -101,7 +93,7 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Requires:	%name-header = %version-%release
+Obsoletes:	%name-header = %version-%release
 Obsoletes:	%{name}-devel < 3.7
 Provides:	%{name}-devel = %{version}-%{release}
 
@@ -123,7 +115,7 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
-Requires:	%name-header = %version-%release
+Obsoletes:	%name-header = %version-%release
 
 %description sse3-devel
 This package contains shared and static versions of the ATLAS
@@ -224,6 +216,8 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %else
 
@@ -251,6 +245,8 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse/*.so
 %{_libdir}/atlas-sse/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %files sse2
 %defattr(-,root,root,-)
@@ -268,6 +264,8 @@ rm -rf %{buildroot}
 %{_libdir}/atlas-sse2/*.a
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
+%{_includedir}/atlas
+%{_includedir}/*.h
 
 %files sse3
 %defattr(-,root,root,-)
@@ -281,15 +279,15 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse3/*.so
 %{_libdir}/atlas-sse3/*.a
-
-%endif
-
-%files header
-%defattr(-,root,root,-)
 %{_includedir}/atlas
 %{_includedir}/*.h
 
+%endif
+
 %changelog
+* Wed Aug 13 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-8
+- Revert the last change, it doesn't solve the problem. 
+
 * Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-7
 - Create a -header subpackage to avoid multilib conflicts (BZ#508565). 
 



From hicham at fedoraproject.org  Wed Aug 12 05:12:00 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Wed, 12 Aug 2009 05:12:00 +0000 (UTC)
Subject: rpms/MiniCopier/devel MiniCopier-Configuration.java.patch, NONE,
	1.1 MiniCopier-MainFrame.java.patch, NONE,
	1.1 MiniCopier-Manifest.txt.patch, NONE,
	1.1 MiniCopier-MiniCopier.sh.patch, NONE,
	1.1 MiniCopier-build.xml.patch, NONE,
	1.1 MiniCopier-configuration.ini.patch, NONE,
	1.1 MiniCopier.desktop, NONE, 1.1 MiniCopier.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090812051200.B9DC211C01EA@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19394/devel

Modified Files:
	.cvsignore sources 
Added Files:
	MiniCopier-Configuration.java.patch 
	MiniCopier-MainFrame.java.patch MiniCopier-Manifest.txt.patch 
	MiniCopier-MiniCopier.sh.patch MiniCopier-build.xml.patch 
	MiniCopier-configuration.ini.patch MiniCopier.desktop 
	MiniCopier.spec import.log 
Log Message:


MiniCopier-Configuration.java.patch:
 Configuration.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE MiniCopier-Configuration.java.patch ---
diff -up MiniCopier-source/src/minicopier/Configuration.java.orig MiniCopier-source/src/minicopier/Configuration.java
--- MiniCopier-source/src/minicopier/Configuration.java.orig	2009-07-19 22:50:02.633753707 +0100
+++ MiniCopier-source/src/minicopier/Configuration.java	2009-07-19 23:57:56.626753659 +0100
@@ -24,7 +24,7 @@ import java.io.*;
 
 public class Configuration {
 	
-	private static final String configName = "configuration.ini";
+	private static final String configName = System.getProperty("user.home")+"/.MiniCopier/configuration.ini";
 	
 	public static String language;
 	
@@ -141,6 +141,9 @@ public class Configuration {
 		String toWrite;
 		
 		try {
+			Runtime rt = Runtime.getRuntime();
+			Process proc = rt.exec("mkdir " + System.getProperty("user.home") + "/.MiniCopier");
+			int exitVal = proc.waitFor();
 			writer = new PrintWriter (new OutputStreamWriter (new FileOutputStream (configName)));
 			while ((toWrite=buf.readLine())!=null){
 				writer.println(toWrite);

MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE MiniCopier-MainFrame.java.patch ---
diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
--- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		this.setIconImage(imageFromJar("img/icon.jpg"));
 		//this.setUndecorated(true);
+
+		Toolkit tk = Toolkit.getDefaultToolkit();
+    		Dimension screenSize = tk.getScreenSize();
+    		int screenHeight = screenSize.height;
+    		int screenWidth = screenSize.width;
+    		setSize(screenWidth / 2, screenHeight / 2);
+    		setLocation(screenWidth / 4, screenHeight / 4);
 		
 		this.supPanel = new SupPanel(this);
 		

MiniCopier-Manifest.txt.patch:
 Manifest.txt |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE MiniCopier-Manifest.txt.patch ---
diff -up MiniCopier-source/Manifest.txt.orig MiniCopier-source/Manifest.txt
--- MiniCopier-source/Manifest.txt.orig	2009-07-19 22:18:03.171752042 +0100
+++ MiniCopier-source/Manifest.txt	2009-07-20 00:25:58.625753349 +0100
@@ -1,3 +1,2 @@
 Main-Class: minicopier.Copier
-Class-Path: lib/PgsLookAndFeel.jar
 

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-MiniCopier.sh.patch ---
diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
--- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+cd /usr/share/java
 echo "Launching MiniCopier..."
 java -jar MiniCopier.jar $*
 echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-build.xml.patch ---
diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
--- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
@@ -2,7 +2,7 @@
 
 <property name="src" location="src"/>
 <property name="bin" location="class"/>
-<property name="lib" location="lib"/>
+<property name="lib" location="/usr/share/java"/>
 
 
 <target name="prepare" description="directory creation">

MiniCopier-configuration.ini.patch:
 configuration.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-configuration.ini.patch ---
diff -up MiniCopier-source/src/minicopier/configuration.ini.orig MiniCopier-source/src/minicopier/configuration.ini
--- MiniCopier-source/src/minicopier/configuration.ini.orig	2009-07-20 00:02:12.767753926 +0100
+++ MiniCopier-source/src/minicopier/configuration.ini	2009-07-20 00:03:01.606753894 +0100
@@ -10,7 +10,7 @@ alwaysontop=true
 
 #Look and Feel
 #You can try with : "pgs","native","metal"
-lnf=pgs
+lnf=native
 
 #Collision default action
 #"ask","cancel","overwrite","overwrite_older","resume"


--- NEW FILE MiniCopier.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=MiniCopier
GenericName=MiniCopier
Comment=Powerful graphic copy manager
Exec=MiniCopier
Icon=MiniCopier
Terminal=false
Type=Application
Categories=Utility;
StartupNotify=false
X-Desktop-File-Install-Version=0.15


--- NEW FILE MiniCopier.spec ---
Name:		MiniCopier
Version:	0.4
Release:	3%{?dist}
Summary:	Graphical copy manager
Group:		Applications/File
License:	GPLv2+
URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant
BuildRequires:	desktop-file-utils
BuildRequires:	PgsLookAndFeel

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0
Requires:	PgsLookAndFeel

Source1:	MiniCopier.desktop

#Patch0: remove classpath from manifest
Patch0:		%{name}-Manifest.txt.patch
#Patch1: change configuration file path to ~/.MiniCopier
Patch1:		%{name}-Configuration.java.patch
#Patch2: fix startup directory
Patch2:		%{name}-MiniCopier.sh.patch
#Patch3: start the application with native GTK LookAndFeel by default
Patch3:		%{name}-configuration.ini.patch
#Patch4: start the application centered on the screen
Patch4:		%{name}-MainFrame.java.patch
#Patch5: fix the lib directory path where the jar required for the build is expected to be
Patch5:		%{name}-build.xml.patch

%description
MiniCopier is a graphical copy manager. It provides more comfort and control
over files copy operations, than basic OS functions.

Features

    * processing of the transfers one after the other
    * add new tranfers to the queue while a copy is already being processed
    * dynamic management of the queue of remaining transfers
    * pause a copy
    * skip current transfer to proceed to the next one
    * resume a copy at the exact point where it failed (no need to start over)
    * choose another name for the target if a file already exists
    * can follow or ignore symbolic links (Unix systems only)
    * set a default behaviour if target file already exists
    * storage of the failed transfers into a list

%package javadoc
Summary:	Javadocs for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils
BuildArch:	noarch

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -n %{name}-source
%ant clean
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1

%build
%ant jar doc

%install
rm -rf %{buildroot}
install -D -p -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p javadoc/* %{buildroot}%{_javadocdir}/%{name}
install -D -p -m 644 class/img/icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -p -m 755 %{name}.sh %{buildroot}%{_bindir}/%{name}

desktop-file-install					\
--dir=%{buildroot}%{_datadir}/applications		\
%{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%doc LICENSE README
%{_javadocdir}/%{name}


%changelog
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
- Removed version from the jar.
- Spec cleanup.

* Wed Jul 22 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-2
- Removed PkgLookAndFeel.jar
- Fixed the License tag
- Added patch to center the main window on the screen.

* Sun Jul 19 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-1
- Initial package for Fedora.



--- NEW FILE import.log ---
MiniCopier-0_4-3_fc11:HEAD:MiniCopier-0.4-3.fc11.src.rpm:1250053633


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:33:52 -0000	1.1
+++ .cvsignore	12 Aug 2009 05:12:00 -0000	1.2
@@ -0,0 +1 @@
+MiniCopier-source.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:33:52 -0000	1.1
+++ sources	12 Aug 2009 05:12:00 -0000	1.2
@@ -0,0 +1 @@
+2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar



From hicham at fedoraproject.org  Wed Aug 12 05:20:31 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Wed, 12 Aug 2009 05:20:31 +0000 (UTC)
Subject: rpms/MiniCopier/F-11 MiniCopier-Configuration.java.patch, NONE,
	1.1 MiniCopier-MainFrame.java.patch, NONE,
	1.1 MiniCopier-Manifest.txt.patch, NONE,
	1.1 MiniCopier-MiniCopier.sh.patch, NONE,
	1.1 MiniCopier-build.xml.patch, NONE,
	1.1 MiniCopier-configuration.ini.patch, NONE,
	1.1 MiniCopier.desktop, NONE, 1.1 MiniCopier.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090812052031.3A8A011C0489@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21463/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	MiniCopier-Configuration.java.patch 
	MiniCopier-MainFrame.java.patch MiniCopier-Manifest.txt.patch 
	MiniCopier-MiniCopier.sh.patch MiniCopier-build.xml.patch 
	MiniCopier-configuration.ini.patch MiniCopier.desktop 
	MiniCopier.spec import.log 
Log Message:


MiniCopier-Configuration.java.patch:
 Configuration.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE MiniCopier-Configuration.java.patch ---
diff -up MiniCopier-source/src/minicopier/Configuration.java.orig MiniCopier-source/src/minicopier/Configuration.java
--- MiniCopier-source/src/minicopier/Configuration.java.orig	2009-07-19 22:50:02.633753707 +0100
+++ MiniCopier-source/src/minicopier/Configuration.java	2009-07-19 23:57:56.626753659 +0100
@@ -24,7 +24,7 @@ import java.io.*;
 
 public class Configuration {
 	
-	private static final String configName = "configuration.ini";
+	private static final String configName = System.getProperty("user.home")+"/.MiniCopier/configuration.ini";
 	
 	public static String language;
 	
@@ -141,6 +141,9 @@ public class Configuration {
 		String toWrite;
 		
 		try {
+			Runtime rt = Runtime.getRuntime();
+			Process proc = rt.exec("mkdir " + System.getProperty("user.home") + "/.MiniCopier");
+			int exitVal = proc.waitFor();
 			writer = new PrintWriter (new OutputStreamWriter (new FileOutputStream (configName)));
 			while ((toWrite=buf.readLine())!=null){
 				writer.println(toWrite);

MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE MiniCopier-MainFrame.java.patch ---
diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
--- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		this.setIconImage(imageFromJar("img/icon.jpg"));
 		//this.setUndecorated(true);
+
+		Toolkit tk = Toolkit.getDefaultToolkit();
+    		Dimension screenSize = tk.getScreenSize();
+    		int screenHeight = screenSize.height;
+    		int screenWidth = screenSize.width;
+    		setSize(screenWidth / 2, screenHeight / 2);
+    		setLocation(screenWidth / 4, screenHeight / 4);
 		
 		this.supPanel = new SupPanel(this);
 		

MiniCopier-Manifest.txt.patch:
 Manifest.txt |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE MiniCopier-Manifest.txt.patch ---
diff -up MiniCopier-source/Manifest.txt.orig MiniCopier-source/Manifest.txt
--- MiniCopier-source/Manifest.txt.orig	2009-07-19 22:18:03.171752042 +0100
+++ MiniCopier-source/Manifest.txt	2009-07-20 00:25:58.625753349 +0100
@@ -1,3 +1,2 @@
 Main-Class: minicopier.Copier
-Class-Path: lib/PgsLookAndFeel.jar
 

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-MiniCopier.sh.patch ---
diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
--- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+cd /usr/share/java
 echo "Launching MiniCopier..."
 java -jar MiniCopier.jar $*
 echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-build.xml.patch ---
diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
--- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
@@ -2,7 +2,7 @@
 
 <property name="src" location="src"/>
 <property name="bin" location="class"/>
-<property name="lib" location="lib"/>
+<property name="lib" location="/usr/share/java"/>
 
 
 <target name="prepare" description="directory creation">

MiniCopier-configuration.ini.patch:
 configuration.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-configuration.ini.patch ---
diff -up MiniCopier-source/src/minicopier/configuration.ini.orig MiniCopier-source/src/minicopier/configuration.ini
--- MiniCopier-source/src/minicopier/configuration.ini.orig	2009-07-20 00:02:12.767753926 +0100
+++ MiniCopier-source/src/minicopier/configuration.ini	2009-07-20 00:03:01.606753894 +0100
@@ -10,7 +10,7 @@ alwaysontop=true
 
 #Look and Feel
 #You can try with : "pgs","native","metal"
-lnf=pgs
+lnf=native
 
 #Collision default action
 #"ask","cancel","overwrite","overwrite_older","resume"


--- NEW FILE MiniCopier.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=MiniCopier
GenericName=MiniCopier
Comment=Powerful graphic copy manager
Exec=MiniCopier
Icon=MiniCopier
Terminal=false
Type=Application
Categories=Utility;
StartupNotify=false
X-Desktop-File-Install-Version=0.15


--- NEW FILE MiniCopier.spec ---
Name:		MiniCopier
Version:	0.4
Release:	3%{?dist}
Summary:	Graphical copy manager
Group:		Applications/File
License:	GPLv2+
URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant
BuildRequires:	desktop-file-utils
BuildRequires:	PgsLookAndFeel

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0
Requires:	PgsLookAndFeel

Source1:	MiniCopier.desktop

#Patch0: remove classpath from manifest
Patch0:		%{name}-Manifest.txt.patch
#Patch1: change configuration file path to ~/.MiniCopier
Patch1:		%{name}-Configuration.java.patch
#Patch2: fix startup directory
Patch2:		%{name}-MiniCopier.sh.patch
#Patch3: start the application with native GTK LookAndFeel by default
Patch3:		%{name}-configuration.ini.patch
#Patch4: start the application centered on the screen
Patch4:		%{name}-MainFrame.java.patch
#Patch5: fix the lib directory path where the jar required for the build is expected to be
Patch5:		%{name}-build.xml.patch

%description
MiniCopier is a graphical copy manager. It provides more comfort and control
over files copy operations, than basic OS functions.

Features

    * processing of the transfers one after the other
    * add new tranfers to the queue while a copy is already being processed
    * dynamic management of the queue of remaining transfers
    * pause a copy
    * skip current transfer to proceed to the next one
    * resume a copy at the exact point where it failed (no need to start over)
    * choose another name for the target if a file already exists
    * can follow or ignore symbolic links (Unix systems only)
    * set a default behaviour if target file already exists
    * storage of the failed transfers into a list

%package javadoc
Summary:	Javadocs for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils
BuildArch:	noarch

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -n %{name}-source
%ant clean
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1

%build
%ant jar doc

%install
rm -rf %{buildroot}
install -D -p -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p javadoc/* %{buildroot}%{_javadocdir}/%{name}
install -D -p -m 644 class/img/icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -p -m 755 %{name}.sh %{buildroot}%{_bindir}/%{name}

desktop-file-install					\
--dir=%{buildroot}%{_datadir}/applications		\
%{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%doc LICENSE README
%{_javadocdir}/%{name}


%changelog
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
- Removed version from the jar.
- Spec cleanup.

* Wed Jul 22 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-2
- Removed PkgLookAndFeel.jar
- Fixed the License tag
- Added patch to center the main window on the screen.

* Sun Jul 19 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-1
- Initial package for Fedora.



--- NEW FILE import.log ---
MiniCopier-0_4-3_fc11:F-11:MiniCopier-0.4-3.fc11.src.rpm:1250054341


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:33:52 -0000	1.1
+++ .cvsignore	12 Aug 2009 05:20:30 -0000	1.2
@@ -0,0 +1 @@
+MiniCopier-source.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:33:52 -0000	1.1
+++ sources	12 Aug 2009 05:20:31 -0000	1.2
@@ -0,0 +1 @@
+2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar



From hicham at fedoraproject.org  Wed Aug 12 05:21:42 2009
From: hicham at fedoraproject.org (Hicham HAOUARI)
Date: Wed, 12 Aug 2009 05:21:42 +0000 (UTC)
Subject: rpms/MiniCopier/F-10 MiniCopier-Configuration.java.patch, NONE,
	1.1 MiniCopier-MainFrame.java.patch, NONE,
	1.1 MiniCopier-Manifest.txt.patch, NONE,
	1.1 MiniCopier-MiniCopier.sh.patch, NONE,
	1.1 MiniCopier-build.xml.patch, NONE,
	1.1 MiniCopier-configuration.ini.patch, NONE,
	1.1 MiniCopier.desktop, NONE, 1.1 MiniCopier.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090812052142.6ECCA11C01EA@cvs1.fedora.phx.redhat.com>

Author: hicham

Update of /cvs/pkgs/rpms/MiniCopier/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21926/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	MiniCopier-Configuration.java.patch 
	MiniCopier-MainFrame.java.patch MiniCopier-Manifest.txt.patch 
	MiniCopier-MiniCopier.sh.patch MiniCopier-build.xml.patch 
	MiniCopier-configuration.ini.patch MiniCopier.desktop 
	MiniCopier.spec import.log 
Log Message:


MiniCopier-Configuration.java.patch:
 Configuration.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE MiniCopier-Configuration.java.patch ---
diff -up MiniCopier-source/src/minicopier/Configuration.java.orig MiniCopier-source/src/minicopier/Configuration.java
--- MiniCopier-source/src/minicopier/Configuration.java.orig	2009-07-19 22:50:02.633753707 +0100
+++ MiniCopier-source/src/minicopier/Configuration.java	2009-07-19 23:57:56.626753659 +0100
@@ -24,7 +24,7 @@ import java.io.*;
 
 public class Configuration {
 	
-	private static final String configName = "configuration.ini";
+	private static final String configName = System.getProperty("user.home")+"/.MiniCopier/configuration.ini";
 	
 	public static String language;
 	
@@ -141,6 +141,9 @@ public class Configuration {
 		String toWrite;
 		
 		try {
+			Runtime rt = Runtime.getRuntime();
+			Process proc = rt.exec("mkdir " + System.getProperty("user.home") + "/.MiniCopier");
+			int exitVal = proc.waitFor();
 			writer = new PrintWriter (new OutputStreamWriter (new FileOutputStream (configName)));
 			while ((toWrite=buf.readLine())!=null){
 				writer.println(toWrite);

MiniCopier-MainFrame.java.patch:
 MainFrame.java |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE MiniCopier-MainFrame.java.patch ---
diff -up MiniCopier-source/src/minicopier/gui/MainFrame.java.orig MiniCopier-source/src/minicopier/gui/MainFrame.java
--- MiniCopier-source/src/minicopier/gui/MainFrame.java.orig	2009-07-22 03:18:14.705153248 +0100
+++ MiniCopier-source/src/minicopier/gui/MainFrame.java	2009-07-22 03:19:02.347154242 +0100
@@ -85,6 +85,13 @@ public class MainFrame extends JFrame{
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		this.setIconImage(imageFromJar("img/icon.jpg"));
 		//this.setUndecorated(true);
+
+		Toolkit tk = Toolkit.getDefaultToolkit();
+    		Dimension screenSize = tk.getScreenSize();
+    		int screenHeight = screenSize.height;
+    		int screenWidth = screenSize.width;
+    		setSize(screenWidth / 2, screenHeight / 2);
+    		setLocation(screenWidth / 4, screenHeight / 4);
 		
 		this.supPanel = new SupPanel(this);
 		

MiniCopier-Manifest.txt.patch:
 Manifest.txt |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE MiniCopier-Manifest.txt.patch ---
diff -up MiniCopier-source/Manifest.txt.orig MiniCopier-source/Manifest.txt
--- MiniCopier-source/Manifest.txt.orig	2009-07-19 22:18:03.171752042 +0100
+++ MiniCopier-source/Manifest.txt	2009-07-20 00:25:58.625753349 +0100
@@ -1,3 +1,2 @@
 Main-Class: minicopier.Copier
-Class-Path: lib/PgsLookAndFeel.jar
 

MiniCopier-MiniCopier.sh.patch:
 MiniCopier.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-MiniCopier.sh.patch ---
diff -up MiniCopier-source/MiniCopier.sh.orig MiniCopier-source/MiniCopier.sh
--- MiniCopier-source/MiniCopier.sh.orig	2009-07-19 22:39:58.805753849 +0100
+++ MiniCopier-source/MiniCopier.sh	2009-07-19 23:05:33.488753936 +0100
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+cd /usr/share/java
 echo "Launching MiniCopier..."
 java -jar MiniCopier.jar $*
 echo "MiniCopier terminated."

MiniCopier-build.xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-build.xml.patch ---
diff -up MiniCopier-source/build.xml.orig MiniCopier-source/build.xml
--- MiniCopier-source/build.xml.orig	2009-08-07 20:52:09.856524471 +0100
+++ MiniCopier-source/build.xml	2009-08-07 20:53:59.638525369 +0100
@@ -2,7 +2,7 @@
 
 <property name="src" location="src"/>
 <property name="bin" location="class"/>
-<property name="lib" location="lib"/>
+<property name="lib" location="/usr/share/java"/>
 
 
 <target name="prepare" description="directory creation">

MiniCopier-configuration.ini.patch:
 configuration.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MiniCopier-configuration.ini.patch ---
diff -up MiniCopier-source/src/minicopier/configuration.ini.orig MiniCopier-source/src/minicopier/configuration.ini
--- MiniCopier-source/src/minicopier/configuration.ini.orig	2009-07-20 00:02:12.767753926 +0100
+++ MiniCopier-source/src/minicopier/configuration.ini	2009-07-20 00:03:01.606753894 +0100
@@ -10,7 +10,7 @@ alwaysontop=true
 
 #Look and Feel
 #You can try with : "pgs","native","metal"
-lnf=pgs
+lnf=native
 
 #Collision default action
 #"ask","cancel","overwrite","overwrite_older","resume"


--- NEW FILE MiniCopier.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=MiniCopier
GenericName=MiniCopier
Comment=Powerful graphic copy manager
Exec=MiniCopier
Icon=MiniCopier
Terminal=false
Type=Application
Categories=Utility;
StartupNotify=false
X-Desktop-File-Install-Version=0.15


--- NEW FILE MiniCopier.spec ---
Name:		MiniCopier
Version:	0.4
Release:	3%{?dist}
Summary:	Graphical copy manager
Group:		Applications/File
License:	GPLv2+
URL:		http://a.courreges.free.fr/projets/minicopier/minicopier-en.php
Source0:	http://a.courreges.free.fr/projets/minicopier/releases/%{name}-source.tar
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	jpackage-utils
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	ant
BuildRequires:	desktop-file-utils
BuildRequires:	PgsLookAndFeel

Requires:	jpackage-utils
Requires:	java >= 1:1.6.0
Requires:	PgsLookAndFeel

Source1:	MiniCopier.desktop

#Patch0: remove classpath from manifest
Patch0:		%{name}-Manifest.txt.patch
#Patch1: change configuration file path to ~/.MiniCopier
Patch1:		%{name}-Configuration.java.patch
#Patch2: fix startup directory
Patch2:		%{name}-MiniCopier.sh.patch
#Patch3: start the application with native GTK LookAndFeel by default
Patch3:		%{name}-configuration.ini.patch
#Patch4: start the application centered on the screen
Patch4:		%{name}-MainFrame.java.patch
#Patch5: fix the lib directory path where the jar required for the build is expected to be
Patch5:		%{name}-build.xml.patch

%description
MiniCopier is a graphical copy manager. It provides more comfort and control
over files copy operations, than basic OS functions.

Features

    * processing of the transfers one after the other
    * add new tranfers to the queue while a copy is already being processed
    * dynamic management of the queue of remaining transfers
    * pause a copy
    * skip current transfer to proceed to the next one
    * resume a copy at the exact point where it failed (no need to start over)
    * choose another name for the target if a file already exists
    * can follow or ignore symbolic links (Unix systems only)
    * set a default behaviour if target file already exists
    * storage of the failed transfers into a list

%package javadoc
Summary:	Javadocs for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}
Requires:	jpackage-utils
BuildArch:	noarch

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -n %{name}-source
%ant clean
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1

%build
%ant jar doc

%install
rm -rf %{buildroot}
install -D -p -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -rf -p javadoc/* %{buildroot}%{_javadocdir}/%{name}
install -D -p -m 644 class/img/icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -p -m 755 %{name}.sh %{buildroot}%{_bindir}/%{name}

desktop-file-install					\
--dir=%{buildroot}%{_datadir}/applications		\
%{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_javadir}/%{name}.jar

%files javadoc
%defattr(-,root,root,-)
%doc LICENSE README
%{_javadocdir}/%{name}


%changelog
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-3
- Removed version from the jar.
- Spec cleanup.

* Wed Jul 22 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-2
- Removed PkgLookAndFeel.jar
- Fixed the License tag
- Added patch to center the main window on the screen.

* Sun Jul 19 2009 Hicham HAOUARI <hicham.haouari at gmail.com> 0.4-1
- Initial package for Fedora.



--- NEW FILE import.log ---
MiniCopier-0_4-3_fc11:F-10:MiniCopier-0.4-3.fc11.src.rpm:1250054452


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:33:52 -0000	1.1
+++ .cvsignore	12 Aug 2009 05:21:42 -0000	1.2
@@ -0,0 +1 @@
+MiniCopier-source.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MiniCopier/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:33:52 -0000	1.1
+++ sources	12 Aug 2009 05:21:42 -0000	1.2
@@ -0,0 +1 @@
+2c6d694c3b42979696c6bc69bbceb474  MiniCopier-source.tar



From pravins at fedoraproject.org  Wed Aug 12 06:47:38 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 12 Aug 2009 06:47:38 +0000 (UTC)
Subject: rpms/lohit-fonts/devel .cvsignore, 1.11, 1.12 lohit-fonts.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <20090812064739.1075D11C01EA@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1645

Modified Files:
	.cvsignore lohit-fonts.spec sources 
Log Message:
* Wed Aug 12 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.1-1
- upstream new release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Aug 2009 05:10:43 -0000	1.11
+++ .cvsignore	12 Aug 2009 06:47:37 -0000	1.12
@@ -1,2 +1,3 @@
 lohit-fonts-2.3.8.tar.gz
 lohit-fonts-2.4.0.tar.gz
+lohit-fonts-2.4.1.tar.gz


Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- lohit-fonts.spec	11 Aug 2009 04:49:17 -0000	1.16
+++ lohit-fonts.spec	12 Aug 2009 06:47:37 -0000	1.17
@@ -7,14 +7,14 @@ Languages.
 
 
 Name:           %{fontname}-fonts
-Version:        2.4.0
-Release:        3%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 Summary:        Free Indian truetype/opentype fonts
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source:        http://pravins.fedorapeople.org/lohit/lohit-fonts-%{version}.tar.gz
+Source:         https://fedorahosted.org/releases/l/o/lohit/lohit-fonts-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -261,12 +261,15 @@ rm -fr %{buildroot}
 
 %files common
 %defattr(0644,root,root,0755)
-%doc COPYING README AUTHORS ChangeLog
+%doc COPYING README AUTHORS ChangeLog COPYRIGHT
 
 %dir %{_fontdir}
 
 
 %changelog
+* Wed Aug 12 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.1-1
+- upstream new release
+
 * Tue Aug 11 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.0-3
 - updated source url
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Aug 2009 05:10:43 -0000	1.11
+++ sources	12 Aug 2009 06:47:37 -0000	1.12
@@ -1 +1 @@
-a729f805c323308ab2c728c8e6fa72c0  lohit-fonts-2.4.0.tar.gz
+d2dccfceed0d38cbf5bf6fb31836f7f7  lohit-fonts-2.4.1.tar.gz



From jfch2222 at fedoraproject.org  Wed Aug 12 07:14:51 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 12 Aug 2009 07:14:51 +0000 (UTC)
Subject: rpms/iwak/F-11 iwak.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090812071451.761A511C01EA@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/iwak/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4818

Modified Files:
	iwak.spec sources 
Log Message:
Change location of fingerprints, allow alternate location



Index: iwak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwak/F-11/iwak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iwak.spec	24 Jul 2009 04:45:31 -0000	1.1
+++ iwak.spec	12 Aug 2009 07:14:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		iwak
-Version:	2.4
-Release:	2%{?dist}
+Version:	2.5
+Release:	1%{?dist}
 Summary:	Detect the openssh keys affected by CVE-2008-0166 among authorized_keys
 
 Group:		Applications/Internet
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/iwak
 
 %changelog
+* Wed Aug 12 2009 Jan F. Chadima <jchadima at redhat.com> - 2.5-1
+- Change location of fingerprints, allow alternate location
+
 * Thu Jul 23 2009 Jan F. Chadima <jchadima at redhat.com> - 2.4-2
 - Spec file tweaking
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwak/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Jul 2009 04:45:31 -0000	1.2
+++ sources	12 Aug 2009 07:14:49 -0000	1.3
@@ -1 +1 @@
-95b23918350091abd5b2a3dd91fb9372  iwak-2.4.tgz
+0600723b99747c414e556ae980d2d310  iwak-2.5.tgz



From jfch2222 at fedoraproject.org  Wed Aug 12 07:27:03 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 12 Aug 2009 07:27:03 +0000 (UTC)
Subject: rpms/iwak/F-10 iwak.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090812072703.E620D11C01EA@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/iwak/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6130

Modified Files:
	iwak.spec sources 
Log Message:
Change location of fingerprints, allow alternate location



Index: iwak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iwak/F-10/iwak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iwak.spec	24 Jul 2009 04:47:35 -0000	1.1
+++ iwak.spec	12 Aug 2009 07:27:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		iwak
-Version:	2.4
-Release:	2%{?dist}
+Version:	2.5
+Release:	1%{?dist}
 Summary:	Detect the openssh keys affected by CVE-2008-0166 among authorized_keys
 
 Group:		Applications/Internet
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/iwak
 
 %changelog
+* Wed Aug 12 2009 Jan F. Chadima <jchadima at redhat.com> - 2.5-1
+- Change location of fingerprints, allow alternate location
+
 * Thu Jul 23 2009 Jan F. Chadima <jchadima at redhat.com> - 2.4-2
 - Spec file tweaking
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iwak/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Jul 2009 04:47:35 -0000	1.2
+++ sources	12 Aug 2009 07:27:03 -0000	1.3
@@ -1 +1 @@
-95b23918350091abd5b2a3dd91fb9372  iwak-2.4.tgz
+0600723b99747c414e556ae980d2d310  iwak-2.5.tgz



From npajkovs at fedoraproject.org  Wed Aug 12 08:28:18 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Wed, 12 Aug 2009 08:28:18 +0000 (UTC)
Subject: rpms/cdrkit/F-11 cdrkit-1.1.9-buffer_overflow.patch, NONE,
	1.1 cdrkit-1.1.9-root_option.patch, NONE, 1.1 cdrkit.spec, 1.26, 1.27
Message-ID: <20090812082819.1FF1311C01EA@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/cdrkit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14825

Modified Files:
	cdrkit.spec 
Added Files:
	cdrkit-1.1.9-buffer_overflow.patch 
	cdrkit-1.1.9-root_option.patch 
Log Message:
fix two buffer overflows

cdrkit-1.1.9-buffer_overflow.patch:
 scsi_cdr.c |   36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

--- NEW FILE cdrkit-1.1.9-buffer_overflow.patch ---
diff -ru origin-1.1.9/wodim/scsi_cdr.c master-1.1.9/wodim/scsi_cdr.c
--- origin-1.1.9/wodim/scsi_cdr.c	2008-02-25 12:14:07.000000000 +0100
+++ master-1.1.9/wodim/scsi_cdr.c	2009-07-16 12:01:29.000000000 +0200
@@ -2181,26 +2181,30 @@
 		if (inq->add_len == 0) {
 			if (usalp->dev == DEV_UNKNOWN && got_inquiry) {
 				usalp->dev = DEV_ACB5500;
-				strcpy(inq->vendor_info,
-					"ADAPTEC ACB-5500        FAKE");
+				strncpy(inq->vendor_info, "ADAPTEC ", 8);
+				strncpy(inq->prod_ident,"ACB-5500        ", 16);
+				strncpy(inq->prod_revision, "FAKE", 4);
 
 			} else switch (usalp->dev) {
-
 				case DEV_ACB40X0:
-					strcpy(inq->vendor_info,
-							"ADAPTEC ACB-40X0        FAKE");
+					strncpy(inq->vendor_info, "ADAPTEC ", 8);
+					strncpy(inq->prod_ident, "ACB-40X0        ",16);
+					strncpy(inq->prod_revision, "FAKE", 4);
 					break;
 				case DEV_ACB4000:
-					strcpy(inq->vendor_info,
-							"ADAPTEC ACB-4000        FAKE");
+					strncpy(inq->vendor_info, "ADAPTEC ",8);
+					strncpy(inq->prod_ident, "ACB-4000        ",16);
+					strncpy(inq->prod_revision, "FAKE",4);
 					break;
 				case DEV_ACB4010:
-					strcpy(inq->vendor_info,
-							"ADAPTEC ACB-4010        FAKE");
+					strncpy(inq->vendor_info, "ADAPTEC ",8);
+					strncpy(inq->prod_ident, "ACB-4010        ",16);
+					strncpy(inq->prod_revision, "FAKE",4);
 					break;
 				case DEV_ACB4070:
-					strcpy(inq->vendor_info,
-							"ADAPTEC ACB-4070        FAKE");
+					strncpy(inq->vendor_info,"ADAPTEC ",8);
+					strncpy(inq->prod_ident, "ACB-4070        ", 16);
+					strncpy(inq->prod_revision, "FAKE",4 );
 					break;
 			}
 		} else if (inq->add_len < 31) {
@@ -2230,14 +2234,16 @@
 
 	case INQ_SEQD:
 		if (usalp->dev == DEV_SC4000) {
-			strcpy(inq->vendor_info,
-				"SYSGEN  SC4000          FAKE");
+			strncpy(inq->vendor_info,"SYSGEN  ",8);
+			strncpy(inq->prod_ident, "SC4000          ",16);
+			strncpy(inq->prod_revision, "FAKE",4);
 		} else if (inq->add_len == 0 &&
 					inq->removable &&
 						inq->ansi_version == 1) {
 			usalp->dev = DEV_MT02;
-			strcpy(inq->vendor_info,
-				"EMULEX  MT02            FAKE");
+			strncpy(inq->vendor_info,"EMULEX  ",8);
+			strncpy(inq->prod_ident, "MT02            ",16);
+			strncpy(inq->prod_revision, "FAKE",4);
 		}
 		break;
 

cdrkit-1.1.9-root_option.patch:
 genisoimage.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cdrkit-1.1.9-root_option.patch ---
--- cdrkit-1.1.9/genisoimage/genisoimage.c	2009-08-11 13:45:42.491887853 +0200
+++ cdrkit-1.1.9-master/genisoimage/genisoimage.c	2009-08-11 15:10:23.382014864 +0200
@@ -3117,8 +3117,10 @@ if (check_session == 0)
 			if (reloc_root != NULL) {
 				strcpy(graft_point, reloc_root);
 				len = strlen(graft_point);
-				if (graft_point[len] != '/')
+				if (graft_point[len] != '/'){
 					graft_point[len++] = '/';
+                    graft_point[len] = '\0';
+                }
 			} else {
 				len = 0;
 			}


Index: cdrkit.spec
===================================================================
RCS file: /cvs/extras/rpms/cdrkit/F-11/cdrkit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cdrkit.spec	16 Jul 2009 16:03:22 -0000	1.26
+++ cdrkit.spec	12 Aug 2009 08:28:17 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.9
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -10,6 +10,8 @@ Source: http://cdrkit.org/releases/cdrki
 Patch1: cdrkit-1.1.8-werror.patch
 Patch2: cdrkit-1.1.9-efi-boot.patch
 Patch3: cdrkit-1.1.9-types.patch
+Patch4: cdrkit-1.1.9-buffer_overflow.patch
+Patch5: cdrkit-1.1.9-root_option.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
 
@@ -70,13 +72,16 @@ Recording formats include stereo/mono, 8
 rates. Icedax can also be used as a CD player.
 
 %prep
-%setup -q 
+%setup -q
 %patch1 -p1 -b .werror
 %patch2 -p1 -b .efi
 %patch3 -p1 -b .getline
+%patch4 -p1 -b .buffer_overflow
+%patch5 -p1 -b .root_option
+
 
 find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
-find doc -type f -print0 | xargs -0 chmod a-x 
+find doc -type f -print0 | xargs -0 chmod a-x
 
 
 %build
@@ -123,7 +128,7 @@ fi
 		%{_mandir}/man1/wodim.1.gz \
 	--slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \
 	--slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \
-		%{_mandir}/man1/readom.1.gz 
+		%{_mandir}/man1/readom.1.gz
 
 %preun -n wodim
 if [ $1 = 0 ]; then
@@ -155,7 +160,7 @@ fi
 %{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
 		%{_bindir}/icedax 50 \
 	--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
-		%{_mandir}/man1/icedax.1.gz 
+		%{_mandir}/man1/icedax.1.gz
 
 %preun -n icedax
 if [ $1 = 0 ]; then
@@ -211,6 +216,10 @@ fi
 %{_mandir}/man1/readmult.*
 
 %changelog
+* Wed Aug 12 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.1.9-6
+- fix #508449. fix string overflow breakage when using the -root
+- fix buffer overflow
+
 * Thu Jul 16 2009 Nikola Pajkovsky <npajkovs at redhat.com> 1.1.9-5
 - icedax require vorbis-tools
 



From rhughes at fedoraproject.org  Wed Aug 12 08:54:31 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 12 Aug 2009 08:54:31 +0000 (UTC)
Subject: rpms/hal/F-11 hal-fix-segfault-in-mdraid.patch, NONE, 1.1 hal.spec, 
	1.191, 1.192
Message-ID: <20090812085431.821F611C01EA@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/hal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18350

Modified Files:
	hal.spec 
Added Files:
	hal-fix-segfault-in-mdraid.patch 
Log Message:
* Wed Aug 12 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-29.20090226git
- Backport a commit from git master to fix mdraid detection.
- Fixes #507782


hal-fix-segfault-in-mdraid.patch:
 blockdev.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE hal-fix-segfault-in-mdraid.patch ---
commit 141ca8cd7b768ddefa1bfaa563cbef4337e32b7c
Author: Martin Poole <mpoole at redhat.com>
Date:   Wed Jul 29 14:20:45 2009 +0100

    Fix a segfault in the mdraid code -- see rh#507782 for more info
    
    Signed-off-by: Richard Hughes <richard at hughsie.com>

diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index 69ba026..7b47431 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -878,7 +878,7 @@ error:
 }
 
 
-void
+
 hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_file, gboolean is_partition,
 				  HalDevice *parent, void *end_token)
 {
@@ -893,6 +893,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
         gboolean is_md_device;
 	gboolean is_cciss_device;
         int md_number;
+	char tc;
 
 	is_device_mapper = FALSE;
         is_fakevolume = FALSE;
@@ -911,7 +912,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
 		HAL_INFO (("Handling %s as fakevolume - sysfs_path_real=%s", device_file, sysfs_path_real));
 		is_fakevolume = TRUE;
 		sysfs_path_real = hal_util_get_parent_path (sysfs_path);
-        } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d", &md_number) == 1) {
+        } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d%c", &md_number, &tc) == 1) {
 		HAL_INFO (("Handling %s as MD device", device_file));
                 is_md_device = TRUE;
 		sysfs_path_real = g_strdup (sysfs_path);


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-11/hal.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- hal.spec	3 Aug 2009 14:37:20 -0000	1.191
+++ hal.spec	12 Aug 2009 08:54:31 -0000	1.192
@@ -28,7 +28,7 @@ Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.12
 #Release: 14%{?dist}
-Release: 28.%{?alphatag}%{?dist}
+Release: 29.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.bz2
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
@@ -54,6 +54,9 @@ Patch9: hal-KVM-evdev.patch
 # upstream, f710e0fda727d102291a44d1ce153ea22eac6c3e
 Patch10: hal-0.5.12-fix-imebus-devices.patch
 
+# upstream, 141ca8cd7b768ddefa1bfaa563cbef4337e32b7c
+Patch11: hal-fix-segfault-in-mdraid.patch
+
 License: AFL or GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -151,6 +154,7 @@ API docs for HAL.
 %patch8 -p1 -b .fix-udev
 %patch9 -p1 -b .kvm-evdev
 %patch10 -p1 -b .ehea-devices
+%patch11 -p1 -b .fix-mdraid
 
 %build
 %configure                                  \
@@ -302,6 +306,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Wed Aug 12 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-29.20090226git
+- Backport a commit from git master to fix mdraid detection.
+- Fixes #507782
+
 * Mon Aug 03 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-28.20090226git
 - Actually apply the patch from the last commit.
 - Fixes #496820



From svahl at fedoraproject.org  Wed Aug 12 09:18:13 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed, 12 Aug 2009 09:18:13 +0000 (UTC)
Subject: rpms/polyester/F-10 .cvsignore, 1.6, 1.7 polyester.spec, 1.9,
	1.10 sources, 1.6, 1.7 polyester-1.95-cmake.patch, 1.1, NONE
Message-ID: <20090812091813.6FCAA11C01EA@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21663/F-10

Modified Files:
	.cvsignore polyester.spec sources 
Removed Files:
	polyester-1.95-cmake.patch 
Log Message:
new upstream release: 2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Feb 2008 11:26:19 -0000	1.6
+++ .cvsignore	12 Aug 2009 09:18:13 -0000	1.7
@@ -1 +1 @@
-polyester-1.9.0.tar.gz
+polyester-2.0.0.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-10/polyester.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- polyester.spec	3 Apr 2008 18:58:43 -0000	1.9
+++ polyester.spec	12 Aug 2009 09:18:13 -0000	1.10
@@ -1,17 +1,12 @@
-# upstream has changed it's versioning. Former
-# version was 1.95. Use this for the beta versions
-%define  tarball_version 1.9.0
-
 Name:           polyester
-Version:        2.0
-Release:        0.3.beta1%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        A style for KDE 4
 
 Group:          User Interface/Desktops
 License:        LGPLv2
 URL:            http://www.kde-look.org/content/show.php?content=27968
-Source0:        http://www.notmart.org/files/polyester-%{tarball_version}.tar.gz
-Patch0:         polyester-1.95-cmake.patch
+Source0:        http://www.notmart.org/files/polyester-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -27,9 +22,7 @@ simplicity.
 
 
 %prep
-%setup -qn polyester-%{tarball_version}
-
-%patch0 -p1 -b .cmake
+%setup -q
 
 %build
 
@@ -63,6 +56,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kstyle/themes/polyester.themerc
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 2.0.0-1
+- new upstream release: 2.0.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.5.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.4.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0-0.3.beta1
 - rebuild (again) for the fixed %%{_kde4_buildtype}
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Feb 2008 11:26:19 -0000	1.6
+++ sources	12 Aug 2009 09:18:13 -0000	1.7
@@ -1 +1 @@
-a02ca26c05851847c746bcf41e3dbead  polyester-1.9.0.tar.gz
+3794023d4068cbca7b847d5316050c25  polyester-2.0.0.tar.bz2


--- polyester-1.95-cmake.patch DELETED ---



From svahl at fedoraproject.org  Wed Aug 12 09:18:13 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed, 12 Aug 2009 09:18:13 +0000 (UTC)
Subject: rpms/polyester/F-11 .cvsignore, 1.6, 1.7 polyester.spec, 1.10,
	1.11 sources, 1.6, 1.7 polyester-1.95-cmake.patch, 1.1, NONE
Message-ID: <20090812091813.AA37B11C01EA@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21663/F-11

Modified Files:
	.cvsignore polyester.spec sources 
Removed Files:
	polyester-1.95-cmake.patch 
Log Message:
new upstream release: 2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Feb 2008 11:26:19 -0000	1.6
+++ .cvsignore	12 Aug 2009 09:18:13 -0000	1.7
@@ -1 +1 @@
-polyester-1.9.0.tar.gz
+polyester-2.0.0.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-11/polyester.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- polyester.spec	27 Feb 2009 01:29:47 -0000	1.10
+++ polyester.spec	12 Aug 2009 09:18:13 -0000	1.11
@@ -1,17 +1,12 @@
-# upstream has changed it's versioning. Former
-# version was 1.95. Use this for the beta versions
-%define  tarball_version 1.9.0
-
 Name:           polyester
-Version:        2.0
-Release:        0.4.beta1%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        A style for KDE 4
 
 Group:          User Interface/Desktops
 License:        LGPLv2
 URL:            http://www.kde-look.org/content/show.php?content=27968
-Source0:        http://www.notmart.org/files/polyester-%{tarball_version}.tar.gz
-Patch0:         polyester-1.95-cmake.patch
+Source0:        http://www.notmart.org/files/polyester-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -27,9 +22,7 @@ simplicity.
 
 
 %prep
-%setup -qn polyester-%{tarball_version}
-
-%patch0 -p1 -b .cmake
+%setup -q
 
 %build
 
@@ -63,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kstyle/themes/polyester.themerc
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 2.0.0-1
+- new upstream release: 2.0.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.5.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.4.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Feb 2008 11:26:19 -0000	1.6
+++ sources	12 Aug 2009 09:18:13 -0000	1.7
@@ -1 +1 @@
-a02ca26c05851847c746bcf41e3dbead  polyester-1.9.0.tar.gz
+3794023d4068cbca7b847d5316050c25  polyester-2.0.0.tar.bz2


--- polyester-1.95-cmake.patch DELETED ---



From svahl at fedoraproject.org  Wed Aug 12 09:18:13 2009
From: svahl at fedoraproject.org (Sebastian Vahl)
Date: Wed, 12 Aug 2009 09:18:13 +0000 (UTC)
Subject: rpms/polyester/devel .cvsignore, 1.6, 1.7 polyester.spec, 1.11,
	1.12 sources, 1.6, 1.7 polyester-1.95-cmake.patch, 1.1, NONE
Message-ID: <20090812091813.EB51F11C01EA@cvs1.fedora.phx.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/polyester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21663/devel

Modified Files:
	.cvsignore polyester.spec sources 
Removed Files:
	polyester-1.95-cmake.patch 
Log Message:
new upstream release: 2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyester/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Feb 2008 11:26:19 -0000	1.6
+++ .cvsignore	12 Aug 2009 09:18:13 -0000	1.7
@@ -1 +1 @@
-polyester-1.9.0.tar.gz
+polyester-2.0.0.tar.bz2


Index: polyester.spec
===================================================================
RCS file: /cvs/extras/rpms/polyester/devel/polyester.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- polyester.spec	26 Jul 2009 19:08:56 -0000	1.11
+++ polyester.spec	12 Aug 2009 09:18:13 -0000	1.12
@@ -1,17 +1,12 @@
-# upstream has changed it's versioning. Former
-# version was 1.95. Use this for the beta versions
-%define  tarball_version 1.9.0
-
 Name:           polyester
-Version:        2.0
-Release:        0.5.beta1%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        A style for KDE 4
 
 Group:          User Interface/Desktops
 License:        LGPLv2
 URL:            http://www.kde-look.org/content/show.php?content=27968
-Source0:        http://www.notmart.org/files/polyester-%{tarball_version}.tar.gz
-Patch0:         polyester-1.95-cmake.patch
+Source0:        http://www.notmart.org/files/polyester-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -27,9 +22,7 @@ simplicity.
 
 
 %prep
-%setup -qn polyester-%{tarball_version}
-
-%patch0 -p1 -b .cmake
+%setup -q
 
 %build
 
@@ -63,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kstyle/themes/polyester.themerc
 
 %changelog
+* Tue Aug 11 2009 Sebastian Vahl <svahl at fedoraproject.org> - 2.0.0-1
+- new upstream release: 2.0.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.5.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyester/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Feb 2008 11:26:19 -0000	1.6
+++ sources	12 Aug 2009 09:18:13 -0000	1.7
@@ -1 +1 @@
-a02ca26c05851847c746bcf41e3dbead  polyester-1.9.0.tar.gz
+3794023d4068cbca7b847d5316050c25  polyester-2.0.0.tar.bz2


--- polyester-1.95-cmake.patch DELETED ---



From rjones at fedoraproject.org  Wed Aug 12 09:56:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 12 Aug 2009 09:56:47 +0000 (UTC)
Subject: rpms/emacs-common-tuareg/F-11 emacs-common-tuareg.spec,1.6,1.7
Message-ID: <20090812095647.B8DC511C01EA@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/emacs-common-tuareg/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26638/F-11

Modified Files:
	emacs-common-tuareg.spec 
Log Message:
Improve description (RHBZ#516997).


Index: emacs-common-tuareg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-tuareg/F-11/emacs-common-tuareg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- emacs-common-tuareg.spec	24 Feb 2009 14:42:02 -0000	1.6
+++ emacs-common-tuareg.spec	12 Aug 2009 09:56:47 -0000	1.7
@@ -30,7 +30,7 @@
 
 Name:           emacs-common-%{pkg}
 Version:        1.45.6
-Release:        7%{?dist}
+Release:        7%{?dist}.1
 Summary:        Emacs and XEmacs mode for editing ocaml
 
 Group:          Development/Libraries
@@ -52,9 +52,10 @@ Requires:       ocaml-emacs
 
 
 %description
-%{pkgname} is an add-on package for GNU Emacs and XEmacs for
-editing OCaml source files.  It is much better than the
-default mode included in Emacs or the one provided by INRIA.
+Tuareg is an OCaml mode for GNU Emacs and XEmacs.  It handles
+automatic indentation of Objective Caml and Caml Light code.  Key
+parts of the code are highlighted using Font-Lock.  Support to run an
+interactive Caml toplevel and debbuger is provided.
 
 This package contains the common files.  Install emacs-%{pkg} to get
 the complete package.
@@ -67,8 +68,12 @@ Requires:       emacs(bin) >= %{emacs_ve
 Requires:       emacs-common-%{pkg} = %{version}-%{release}
 
 %description -n emacs-%{pkg}
-This package contains the byte compiled elisp packages to run
-%{pkgname} with GNU Emacs.
+Tuareg is an OCaml mode for GNU Emacs and XEmacs.  It handles
+automatic indentation of Objective Caml and Caml Light code.  Key
+parts of the code are highlighted using Font-Lock.  Support to run an
+interactive Caml toplevel and debbuger is provided.
+
+Install this package if you need to edit OCaml code in Emacs.
 
 
 %package -n emacs-%{pkg}-el
@@ -90,8 +95,12 @@ Requires:       xemacs(bin) >= %{xemacs_
 Requires:       emacs-common-%{pkg} = %{version}-%{release}
 
 %description -n xemacs-%{pkg}
-This package contains the byte compiled elisp packages to use
-%{pkgname} with XEmacs.
+Tuareg is an OCaml mode for GNU Emacs and XEmacs.  It handles
+automatic indentation of Objective Caml and Caml Light code.  Key
+parts of the code are highlighted using Font-Lock.  Support to run an
+interactive Caml toplevel and debbuger is provided.
+
+Install this package if you need to edit OCaml code in XEmacs.
 
 
 %package -n xemacs-%{pkg}-el
@@ -173,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-7.fc11.1
+- Improve description (RHBZ#516997).
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Aug 12 09:56:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 12 Aug 2009 09:56:47 +0000 (UTC)
Subject: rpms/emacs-common-tuareg/devel emacs-common-tuareg.spec,1.7,1.8
Message-ID: <20090812095647.DAF4411C02C6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/emacs-common-tuareg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26638/devel

Modified Files:
	emacs-common-tuareg.spec 
Log Message:
Improve description (RHBZ#516997).


Index: emacs-common-tuareg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-tuareg/devel/emacs-common-tuareg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- emacs-common-tuareg.spec	24 Jul 2009 22:04:07 -0000	1.7
+++ emacs-common-tuareg.spec	12 Aug 2009 09:56:47 -0000	1.8
@@ -30,7 +30,7 @@
 
 Name:           emacs-common-%{pkg}
 Version:        1.45.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Emacs and XEmacs mode for editing ocaml
 
 Group:          Development/Libraries
@@ -52,9 +52,10 @@ Requires:       ocaml-emacs
 
 
 %description
-%{pkgname} is an add-on package for GNU Emacs and XEmacs for
-editing OCaml source files.  It is much better than the
-default mode included in Emacs or the one provided by INRIA.
+Tuareg is an OCaml mode for GNU Emacs and XEmacs.  It handles
+automatic indentation of Objective Caml and Caml Light code.  Key
+parts of the code are highlighted using Font-Lock.  Support to run an
+interactive Caml toplevel and debbuger is provided.
 
 This package contains the common files.  Install emacs-%{pkg} to get
 the complete package.
@@ -67,8 +68,12 @@ Requires:       emacs(bin) >= %{emacs_ve
 Requires:       emacs-common-%{pkg} = %{version}-%{release}
 
 %description -n emacs-%{pkg}
-This package contains the byte compiled elisp packages to run
-%{pkgname} with GNU Emacs.
+Tuareg is an OCaml mode for GNU Emacs and XEmacs.  It handles
+automatic indentation of Objective Caml and Caml Light code.  Key
+parts of the code are highlighted using Font-Lock.  Support to run an
+interactive Caml toplevel and debbuger is provided.
+
+Install this package if you need to edit OCaml code in Emacs.
 
 
 %package -n emacs-%{pkg}-el
@@ -90,8 +95,12 @@ Requires:       xemacs(bin) >= %{xemacs_
 Requires:       emacs-common-%{pkg} = %{version}-%{release}
 
 %description -n xemacs-%{pkg}
-This package contains the byte compiled elisp packages to use
-%{pkgname} with XEmacs.
+Tuareg is an OCaml mode for GNU Emacs and XEmacs.  It handles
+automatic indentation of Objective Caml and Caml Light code.  Key
+parts of the code are highlighted using Font-Lock.  Support to run an
+interactive Caml toplevel and debbuger is provided.
+
+Install this package if you need to edit OCaml code in XEmacs.
 
 
 %package -n xemacs-%{pkg}-el
@@ -173,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-9
+- Improve description (RHBZ#516997).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mbarnes at fedoraproject.org  Wed Aug 12 10:37:44 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 12 Aug 2009 10:37:44 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.24,1.394.2.25
Message-ID: <20090812103744.BD9AD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv507

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.24
retrieving revision 1.394.2.25
diff -u -p -r1.394.2.24 -r1.394.2.25
--- evolution.spec	12 Aug 2009 03:16:48 -0000	1.394.2.24
+++ evolution.spec	12 Aug 2009 10:37:43 -0000	1.394.2.25
@@ -463,6 +463,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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.*
@@ -628,6 +629,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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



From paragn at fedoraproject.org  Wed Aug 12 10:46:13 2009
From: paragn at fedoraproject.org (paragn)
Date: Wed, 12 Aug 2009 10:46:13 +0000 (UTC)
Subject: rpms/libXau/devel libXau.spec,1.29,1.30
Message-ID: <20090812104613.E739711C01EA@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2478

Modified Files:
	libXau.spec 
Log Message:
* Wed Aug 12 2009 Parag <paragn at fedoraproject.org> 1.0.4-8
- Merge review cleanups. (#226063)




Index: libXau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXau.spec	25 Jul 2009 05:09:50 -0000	1.29
+++ libXau.spec	12 Aug 2009 10:46:13 -0000	1.30
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXau runtime library
+Summary: Sample Authorization Protocol for X
 Name: libXau
 Version: 1.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,16 +9,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-Patch0: xau-1.0.4-local.patch
+#Patch0: xau-1.0.4-local.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 
 %description
-X.Org X11 libXau runtime library
+This is a very simple mechanism for providing individual access to an X Window
+System display.It uses existing core protocol and library hooks for specifying
+authorization data in the connection setup block to restrict use of the display
+to only those clients that show that they know a server-specific key 
+called a "magic cookie".
 
 %package devel
-Summary: X.Org X11 libXau development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
@@ -40,7 +44,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
@@ -66,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug 12 2009 Parag <paragn at fedoraproject.org> 1.0.4-8
+- Merge review cleanups. (#226063)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stransky at fedoraproject.org  Wed Aug 12 10:49:32 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 12 Aug 2009 10:49:32 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.172,1.173
Message-ID: <20090812104932.E146F11C01EA@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3007

Modified Files:
	xulrunner.spec 
Log Message:
Added fix from #516118 - Headers not C89


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- xulrunner.spec	6 Aug 2009 14:05:50 -0000	1.172
+++ xulrunner.spec	12 Aug 2009 10:49:32 -0000	1.173
@@ -12,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -251,7 +251,7 @@ function install_file() {
 genheader=$*
 mv ${genheader}.h ${genheader}%{mozbits}.h
 cat > ${genheader}.h << EOF
-// This file exists to fix multilib conflicts
+/* This file exists to fix multilib conflicts */
 #if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__)
 #include "${genheader}64.h"
 #else
@@ -451,6 +451,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug 12 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-3
+- Added fix from #516118 - Headers not C89
+
 * Mon Aug 6 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-2
 - Rebuilt
 



From pkgdb at fedoraproject.org  Wed Aug 12 11:07:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 11:07:40 +0000
Subject: [pkgdb] exim: mlichvar has requested watchcommits
Message-ID: <20090812110741.310E110F80B@bastion2.fedora.phx.redhat.com>

mlichvar has requested the watchcommits acl on exim (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/exim



From pkgdb at fedoraproject.org  Wed Aug 12 11:07:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 11:07:41 +0000
Subject: [pkgdb] exim: mlichvar has requested watchbugzilla
Message-ID: <20090812110741.B9CC210F841@bastion2.fedora.phx.redhat.com>

mlichvar has requested the watchbugzilla acl on exim (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/exim



From pkgdb at fedoraproject.org  Wed Aug 12 11:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 11:07:58 +0000
Subject: [pkgdb] exim: mlichvar has requested commit
Message-ID: <20090812110801.ACF6410F800@bastion2.fedora.phx.redhat.com>

mlichvar has requested the commit acl on exim (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/exim



From jgranado at fedoraproject.org  Wed Aug 12 11:08:28 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Wed, 12 Aug 2009 11:08:28 +0000 (UTC)
Subject: rpms/parted/devel parted.spec,1.143,1.144
Message-ID: <20090812110828.B31FD11C01EA@cvs1.fedora.phx.redhat.com>

Author: jgranado

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5799

Modified Files:
	parted.spec 
Log Message:
Make install with exclude docs work without an error message.



Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- parted.spec	29 Jul 2009 08:04:50 -0000	1.143
+++ parted.spec	12 Aug 2009 11:08:28 -0000	1.144
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -103,7 +103,9 @@ popd
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/parted.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/parted.info.gz ]; then
+    /sbin/install-info %{_infodir}/parted.info.gz %{_infodir}/dir || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -129,6 +131,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Wed Aug 12 2009 Joel Granados <jgranado at redhat.com> - 1.9.0-10
+- Make install with exclude docs work without an error message.
+
 * Wed Jul 29 2009 Joel Granados <jgranado at redhat.com> - 1.9.0-9
 - Add parenthesis where needed (#511907)
 



From dwmw2 at fedoraproject.org  Wed Aug 12 11:08:58 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 12 Aug 2009 11:08:58 +0000 (UTC)
Subject: rpms/exim/devel exim-tidydb.sh,NONE,1.1 exim.spec,1.58,1.59
Message-ID: <20090812110858.79F4D11C01EA@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6050

Modified Files:
	exim.spec 
Added Files:
	exim-tidydb.sh 
Log Message:
Various small fixes



--- NEW FILE exim-tidydb.sh ---
#!/bin/bash

SPOOLDIR=/var/spool/exim

cd $SPOOLDIR/db
for a in retry misc wait-* callout ratelimit; do
    [ -r "$a" ] || continue
    [ "${a%%.lockfile}" = "$a" ] || continue
    /usr/sbin/exim_tidydb $SPOOLDIR $a >/dev/null
done


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- exim.spec	24 Jul 2009 22:25:29 -0000	1.58
+++ exim.spec	12 Aug 2009 11:08:58 -0000	1.59
@@ -29,6 +29,7 @@ Source: ftp://ftp.exim.org/pub/exim/exim
 Source2: exim.init
 Source3: exim.sysconfig
 Source4: exim.logrotate
+Source5: exim-tidydb.sh
 Source11: exim.pam
 %if 0%{?buildsa}
 Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz
@@ -53,11 +54,15 @@ Patch23: exim-4.67-smarthost-config.patc
 Patch24: exim-4.69-dynlookup.patch
 Patch25: exim-4.69-dynlookup-config.patch
 
+Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
-BuildRequires: lynx pcre-devel sqlite-devel tcp_wrappers-devel
-BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel mysql-devel postgresql-devel
+%if 0%{?buildsa}
+BuildRequires: lynx
+%endif
+BuildRequires: pcre-devel sqlite-devel tcp_wrappers-devel cyrus-sasl-devel
+BuildRequires: openldap-devel openssl-devel mysql-devel postgresql-devel
 BuildRequires: libXaw-devel libXmu-devel libXext-devel libX11-devel libSM-devel
 BuildRequires: libICE-devel libXpm-devel libXt-devel perl(ExtUtils::Embed)
 
@@ -269,6 +274,9 @@ install %SOURCE2 $RPM_BUILD_ROOT%{_initr
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -m 0644 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/exim
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m 0755 %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/exim-tidydb
+
 %if 0%{?buildsa}
 # install sa
 cd sa-exim*
@@ -303,6 +311,9 @@ EOF
 ln -sf clamd $RPM_BUILD_ROOT/usr/sbin/clamd.exim
 
 mkdir -p $RPM_BUILD_ROOT%{_var}/run/clamd.exim
+mkdir -p $RPM_BUILD_ROOT%{_var}/log
+touch $RPM_BUILD_ROOT%{_var}/log/clamd.exim
+
 %endif
 
 # Set up the greylist subpackage
@@ -430,6 +441,7 @@ fi
 %{_sysconfdir}/rc.d/init.d/exim
 %config(noreplace) %{_sysconfdir}/logrotate.d/exim
 %config(noreplace) %{_sysconfdir}/pam.d/exim
+%{_sysconfdir}/cron.daily/exim-tidydb
 
 %doc ACKNOWLEDGMENTS LICENCE NOTICE README.UPDATING README 
 %doc doc util/unknownuser.sh
@@ -461,6 +473,8 @@ fi
 
 %if 0%{?buildclam}
 %post clamav
+/bin/touch %{_var}/log/clamd.exim
+/bin/chown exim.exim %{_var}log/clamd.exim
 /sbin/chkconfig --add clamd.exim
 
 %preun clamav
@@ -478,6 +492,7 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
 %config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
 %attr(0750,exim,exim) %dir %{_var}/run/clamd.exim
+%ghost %attr(0644,exim,exim) %{_var}/log/clamd.exim
 %endif
 
 %files greylist
@@ -488,6 +503,12 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-13
+- Cope with lack of /etc/sysconfig/network (#506330)
+- Require /etc/pki/tls/ directories
+- Provide exim-tidydb cron job (#481426)
+- Provide clamd.exim log file (#452358)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.69-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Wed Aug 12 11:10:19 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 12 Aug 2009 11:10:19 +0000 (UTC)
Subject: rpms/bisho/devel .cvsignore, 1.2, 1.3 bisho.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20090812111019.DFCFE11C048B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7043

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- New upstream 0.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Aug 2009 09:44:46 -0000	1.2
+++ .cvsignore	12 Aug 2009 11:10:19 -0000	1.3
@@ -1 +1 @@
-bisho-0.10.7.tar.bz2
+bisho-0.11.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bisho.spec	8 Aug 2009 09:44:46 -0000	1.1
+++ bisho.spec	12 Aug 2009 11:10:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bisho
-Version:        0.10.7
-Release:        3%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-1
+- New upstream 0.11 release
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.7-3
 - Further updates from review request
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Aug 2009 09:44:46 -0000	1.2
+++ sources	12 Aug 2009 11:10:19 -0000	1.3
@@ -1 +1 @@
-738c409b1a6757bc1f2e71447f7133f3  bisho-0.10.7.tar.bz2
+068810a307169019f48398046652aea0  bisho-0.11.tar.bz2



From dwmw2 at fedoraproject.org  Wed Aug 12 11:11:29 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 12 Aug 2009 11:11:29 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.59,1.60
Message-ID: <20090812111129.5357011C01EA@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7321

Modified Files:
	exim.spec 
Log Message:
bump release


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- exim.spec	12 Aug 2009 11:08:58 -0000	1.59
+++ exim.spec	12 Aug 2009 11:11:29 -0000	1.60
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons



From pkgdb at fedoraproject.org  Wed Aug 12 11:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 11:14:31 +0000
Subject: [pkgdb] exim had acl change status
Message-ID: <20090812111432.525D410F80B@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchbugzilla acl on exim (Fedora devel) to Approved for mlichvar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/exim



From pkgdb at fedoraproject.org  Wed Aug 12 11:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 11:14:32 +0000
Subject: [pkgdb] exim had acl change status
Message-ID: <20090812111432.531AF10F841@bastion2.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on exim (Fedora devel) to Approved for mlichvar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/exim



From pkgdb at fedoraproject.org  Wed Aug 12 11:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 11:14:33 +0000
Subject: [pkgdb] exim had acl change status
Message-ID: <20090812111433.6DA0010F872@bastion2.fedora.phx.redhat.com>

dwmw2 has set the commit acl on exim (Fedora devel) to Approved for mlichvar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/exim



From tagoh at fedoraproject.org  Wed Aug 12 11:31:42 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 12 Aug 2009 11:31:42 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.14, 1.15 imsettings.spec, 1.31, 
	1.32 sources, 1.13, 1.14 imsettings-immodule-conf.patch, 1.1, NONE
Message-ID: <20090812113142.9A8ED11C01EA@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9882

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	imsettings-immodule-conf.patch 
Log Message:
* Wed Aug 12 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.0-1
- New upstream release.
  - Pop up an error if failed to invoke IM. (#497946)
  - Fix the duplicate recommendation message issue. (#514852)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	7 Apr 2009 12:15:09 -0000	1.14
+++ .cvsignore	12 Aug 2009 11:31:42 -0000	1.15
@@ -13,3 +13,4 @@ imsettings-0.105.1.tar.bz2
 imsettings-0.106.0.tar.bz2
 imsettings-0.106.1.tar.bz2
 imsettings-0.106.2.tar.bz2
+imsettings-0.107.0.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- imsettings.spec	25 Jul 2009 03:19:50 -0000	1.31
+++ imsettings.spec	12 Aug 2009 11:31:42 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	0.106.2
-Release:	4%{?dist}
+Version:	0.107.0
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,7 +16,6 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
-Patch2:		imsettings-immodule-conf.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -83,7 +82,6 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
-%patch2 -p0 -b .2-immodule
 
 %build
 %configure	\
@@ -203,6 +201,14 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.0-1
+- New upstream release.
+  - Pop up an error if failed to invoke IM. (#497946)
+  - Fix the duplicate recommendation message issue. (#514852)
+
+* Thu Jul 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-5
+- Support immodule only configuration file.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.106.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Apr 2009 12:15:09 -0000	1.13
+++ sources	12 Aug 2009 11:31:42 -0000	1.14
@@ -1 +1 @@
-d7f713a1b0d621aae7f5cc4b72f08c6e  imsettings-0.106.2.tar.bz2
+484f82e665e68dd33619f46912be9067  imsettings-0.107.0.tar.bz2


--- imsettings-immodule-conf.patch DELETED ---



From mgieseki at fedoraproject.org  Wed Aug 12 11:36:53 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed, 12 Aug 2009 11:36:53 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 dvisvgm.spec,1.1,1.2
Message-ID: <20090812113653.7CC0F11C01EA@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10592

Modified Files:
	dvisvgm.spec 
Log Message:
adapted BuildRequires and Requires to RH5 tetex packages


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/dvisvgm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dvisvgm.spec	5 Aug 2009 10:04:39 -0000	1.1
+++ dvisvgm.spec	12 Aug 2009 11:36:53 -0000	1.2
@@ -13,8 +13,8 @@ Patch0:         dvisvgm-0.8.1-potrace.pa
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
-Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript
+BuildRequires:  automake tetex-fonts freetype-devel potrace-devel zlib-devel 
+Requires:       tetex tetex-dvips tetex-fonts ghostscript
 
 %description
 dvisvgm is a command line utility that converts DVI files, as created by 



From ltinkl at fedoraproject.org  Wed Aug 12 11:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 12 Aug 2009 11:41:26 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.3.1-fish.patch, NONE,
	1.1 kdebase-runtime.spec, 1.93, 1.94
Message-ID: <20090812114126.9765311C01EA@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-serv11815/F-10

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-fish.patch 
Log Message:
unbreak fish KIO slave :o)


kdebase-runtime-4.3.1-fish.patch:
 fish.cpp |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-fish.patch ---
Index: kioslave/fish/fish.cpp
===================================================================
--- kioslave/fish/fish.cpp	(revision 1010372)
+++ kioslave/fish/fish.cpp	(working copy)
@@ -518,8 +518,7 @@
             myDebug( << "select failed, rc: " << rc << ", error: " << strerror(errno) << endl);
             return true;
         }
-        while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	{
+        if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
             if (outBuf) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
             else rc = 0;
             if (rc >= 0) outBufPos += rc;
@@ -536,8 +535,7 @@
                 outBufLen = 0;
             }
         }
-        if (FD_ISSET(childFd,&rfds)) 
-	{
+        else if (FD_ISSET(childFd,&rfds)) {
             rc = ::read(childFd,buf+offset,32768-offset);
             if (rc > 0) {
                 int noff = establishConnection(buf,rc+offset);
@@ -1445,19 +1443,13 @@
                 shutdownConnection();
                 return;
             }
-	    // We first write the complete buffer, including all newlines.
-	    // Do: send command and newlines, expect response then
-	    // Do not: send commands, expect response, send newlines, expect response on newlines
-	    // Newlines do not trigger a response.
-            while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	    {
+            if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
 #else
-            while (outBufPos >= 0) 
-	    {
+            if (outBufPos >= 0) {
 #endif
 #if 0
                 QString debug = QString::fromLatin1(outBuf+outBufPos,outBufLen-outBufPos);
-                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug << endl);
+                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
 #endif
 #ifndef Q_WS_WIN
                 if (outBufLen-outBufPos > 0) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
@@ -1487,10 +1479,10 @@
                 }
             }
 #ifndef Q_WS_WIN
-            if (FD_ISSET(childFd,&rfds)) {
+            else if (FD_ISSET(childFd,&rfds)) {
                 rc = ::read(childFd,buf+offset,32768-offset);
 #else
-            if (childPid->waitForReadyRead(1000)) {
+            else if (childPid->waitForReadyRead(1000)) {
                 rc = childPid->read(buf+offset,32768-offset);
 #endif
                 //myDebug( << "read " << rc << " bytes" << endl);


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kdebase-runtime.spec	10 Aug 2009 16:46:16 -0000	1.93
+++ kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.94
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -27,6 +27,8 @@ Patch4:        kdebase-runtime-4.3.0-nep
 Patch5:        kdebase-runtime-4.3.1-comborender.patch
 #?http://websvn.kde.org/?view=rev&revision=1008861
 Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
+#?https://bugzilla.redhat.com/show_bug.cgi?id=516416
+Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -102,6 +104,7 @@ BuildArch: noarch
 %patch4 -p1 -b .nepomuk-autostart
 %patch5 -p0 -b .comborender
 %patch6 -p0 -b .kcmlocalecrash
+%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}
@@ -221,6 +224,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- unbreak fish kioslave protocol (#516416)
+
 * Mon Aug 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
 - fix Locale control module crashing when dragging languages around (kdebug:201578)



From ltinkl at fedoraproject.org  Wed Aug 12 11:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 12 Aug 2009 11:41:26 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime-4.3.1-fish.patch, NONE,
	1.1 kdebase-runtime.spec, 1.116, 1.117
Message-ID: <20090812114126.AC00B11C02C6@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-serv11815/F-11

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-fish.patch 
Log Message:
unbreak fish KIO slave :o)


kdebase-runtime-4.3.1-fish.patch:
 fish.cpp |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-fish.patch ---
Index: kioslave/fish/fish.cpp
===================================================================
--- kioslave/fish/fish.cpp	(revision 1010372)
+++ kioslave/fish/fish.cpp	(working copy)
@@ -518,8 +518,7 @@
             myDebug( << "select failed, rc: " << rc << ", error: " << strerror(errno) << endl);
             return true;
         }
-        while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	{
+        if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
             if (outBuf) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
             else rc = 0;
             if (rc >= 0) outBufPos += rc;
@@ -536,8 +535,7 @@
                 outBufLen = 0;
             }
         }
-        if (FD_ISSET(childFd,&rfds)) 
-	{
+        else if (FD_ISSET(childFd,&rfds)) {
             rc = ::read(childFd,buf+offset,32768-offset);
             if (rc > 0) {
                 int noff = establishConnection(buf,rc+offset);
@@ -1445,19 +1443,13 @@
                 shutdownConnection();
                 return;
             }
-	    // We first write the complete buffer, including all newlines.
-	    // Do: send command and newlines, expect response then
-	    // Do not: send commands, expect response, send newlines, expect response on newlines
-	    // Newlines do not trigger a response.
-            while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	    {
+            if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
 #else
-            while (outBufPos >= 0) 
-	    {
+            if (outBufPos >= 0) {
 #endif
 #if 0
                 QString debug = QString::fromLatin1(outBuf+outBufPos,outBufLen-outBufPos);
-                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug << endl);
+                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
 #endif
 #ifndef Q_WS_WIN
                 if (outBufLen-outBufPos > 0) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
@@ -1487,10 +1479,10 @@
                 }
             }
 #ifndef Q_WS_WIN
-            if (FD_ISSET(childFd,&rfds)) {
+            else if (FD_ISSET(childFd,&rfds)) {
                 rc = ::read(childFd,buf+offset,32768-offset);
 #else
-            if (childPid->waitForReadyRead(1000)) {
+            else if (childPid->waitForReadyRead(1000)) {
                 rc = childPid->read(buf+offset,32768-offset);
 #endif
                 //myDebug( << "read " << rc << " bytes" << endl);


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- kdebase-runtime.spec	10 Aug 2009 16:46:17 -0000	1.116
+++ kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.117
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -27,6 +27,8 @@ Patch4:        kdebase-runtime-4.3.0-nep
 Patch5:        kdebase-runtime-4.3.1-comborender.patch
 #?http://websvn.kde.org/?view=rev&revision=1008861
 Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
+#?https://bugzilla.redhat.com/show_bug.cgi?id=516416
+Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -102,6 +104,7 @@ BuildArch: noarch
 %patch4 -p1 -b .nepomuk-autostart
 %patch5 -p0 -b .comborender
 %patch6 -p0 -b .kcmlocalecrash
+%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}
@@ -221,6 +224,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- unbreak fish kioslave protocol (#516416)
+
 * Mon Aug 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
 - fix Locale control module crashing when dragging languages around (kdebug:201578)



From ltinkl at fedoraproject.org  Wed Aug 12 11:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 12 Aug 2009 11:41:26 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.3.1-fish.patch, NONE, 
	1.1 kdebase-runtime.spec, 1.134, 1.135
Message-ID: <20090812114126.DE50111C01EA@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11815/devel

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-fish.patch 
Log Message:
unbreak fish KIO slave :o)


kdebase-runtime-4.3.1-fish.patch:
 fish.cpp |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-fish.patch ---
Index: kioslave/fish/fish.cpp
===================================================================
--- kioslave/fish/fish.cpp	(revision 1010372)
+++ kioslave/fish/fish.cpp	(working copy)
@@ -518,8 +518,7 @@
             myDebug( << "select failed, rc: " << rc << ", error: " << strerror(errno) << endl);
             return true;
         }
-        while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	{
+        if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
             if (outBuf) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
             else rc = 0;
             if (rc >= 0) outBufPos += rc;
@@ -536,8 +535,7 @@
                 outBufLen = 0;
             }
         }
-        if (FD_ISSET(childFd,&rfds)) 
-	{
+        else if (FD_ISSET(childFd,&rfds)) {
             rc = ::read(childFd,buf+offset,32768-offset);
             if (rc > 0) {
                 int noff = establishConnection(buf,rc+offset);
@@ -1445,19 +1443,13 @@
                 shutdownConnection();
                 return;
             }
-	    // We first write the complete buffer, including all newlines.
-	    // Do: send command and newlines, expect response then
-	    // Do not: send commands, expect response, send newlines, expect response on newlines
-	    // Newlines do not trigger a response.
-            while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	    {
+            if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
 #else
-            while (outBufPos >= 0) 
-	    {
+            if (outBufPos >= 0) {
 #endif
 #if 0
                 QString debug = QString::fromLatin1(outBuf+outBufPos,outBufLen-outBufPos);
-                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug << endl);
+                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
 #endif
 #ifndef Q_WS_WIN
                 if (outBufLen-outBufPos > 0) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
@@ -1487,10 +1479,10 @@
                 }
             }
 #ifndef Q_WS_WIN
-            if (FD_ISSET(childFd,&rfds)) {
+            else if (FD_ISSET(childFd,&rfds)) {
                 rc = ::read(childFd,buf+offset,32768-offset);
 #else
-            if (childPid->waitForReadyRead(1000)) {
+            else if (childPid->waitForReadyRead(1000)) {
                 rc = childPid->read(buf+offset,32768-offset);
 #endif
                 //myDebug( << "read " << rc << " bytes" << endl);


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kdebase-runtime.spec	10 Aug 2009 16:46:17 -0000	1.134
+++ kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.135
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -27,6 +27,8 @@ Patch4:        kdebase-runtime-4.3.0-nep
 Patch5:        kdebase-runtime-4.3.1-comborender.patch
 #?http://websvn.kde.org/?view=rev&revision=1008861
 Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
+#?https://bugzilla.redhat.com/show_bug.cgi?id=516416
+Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -102,6 +104,7 @@ BuildArch: noarch
 %patch4 -p1 -b .nepomuk-autostart
 %patch5 -p0 -b .comborender
 %patch6 -p0 -b .kcmlocalecrash
+%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}
@@ -221,6 +224,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- unbreak fish kioslave protocol (#516416)
+
 * Mon Aug 10 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
 - fix Locale control module crashing when dragging languages around (kdebug:201578)



From twaugh at fedoraproject.org  Wed Aug 12 12:20:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 12 Aug 2009 12:20:26 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.216,1.217
Message-ID: <20090812122026.9F8B811C0489@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17974

Modified Files:
	hplip.spec 
Log Message:
* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-3
- The python-reportlab dependency was in the wrong sub-package.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- hplip.spec	6 Aug 2009 13:02:19 -0000	1.216
+++ hplip.spec	12 Aug 2009 12:20:26 -0000	1.217
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -58,6 +58,7 @@ Group: Applications/System
 License: BSD
 Requires: PyQt
 Requires: PyQt4
+Requires: python-reportlab
 Requires(post): desktop-file-utils >= 0.2.92
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
@@ -71,7 +72,6 @@ Group: Applications/Publishing
 License: BSD
 Epoch: %{hpijs_epoch}
 Requires: %{name}-libs = %{version}-%{release}
-Requires: python-reportlab
 Requires: net-snmp
 Requires: cupsddk-drivers
 
@@ -310,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-3
+- The python-reportlab dependency was in the wrong sub-package.
+
 * Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-2
 - Removed access_control.grant_group line from HAL fdi file.
 



From jstanley at fedoraproject.org  Wed Aug 12 12:20:47 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Wed, 12 Aug 2009 12:20:47 +0000 (UTC)
Subject: rpms/trac-customfieldadmin-plugin/F-10 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 trac-customfieldadmin-plugin.spec, 1.3, 1.4
Message-ID: <20090812122047.2B57911C01EA@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18014

Modified Files:
	.cvsignore sources trac-customfieldadmin-plugin.spec 
Log Message:
Update to new upstream, fix various packaging bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Jul 2009 22:35:15 -0000	1.2
+++ .cvsignore	12 Aug 2009 12:20:46 -0000	1.3
@@ -1 +1 @@
-trac-customfieldadminplugin-0.10.svn5073.tar.gz
+trac-customfieldadminplugin-0.10.svn5253.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jul 2009 22:35:17 -0000	1.2
+++ sources	12 Aug 2009 12:20:47 -0000	1.3
@@ -1 +1 @@
-0c551244396c6725bb301ece9964ad57  trac-customfieldadminplugin-0.10.svn5073.tar.gz
+c3a63a9dc8668f3204c64937cb6b28ac  trac-customfieldadminplugin-0.10.svn5253.tar.gz


Index: trac-customfieldadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10/trac-customfieldadmin-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- trac-customfieldadmin-plugin.spec	1 Aug 2009 19:02:31 -0000	1.3
+++ trac-customfieldadmin-plugin.spec	12 Aug 2009 12:20:47 -0000	1.4
@@ -2,16 +2,16 @@
 
 Name:           trac-customfieldadmin-plugin
 Version:        0.1
-Release:        0.3.svn5073%{?dist}
+Release:        0.4.svn5073%{?dist}
 Summary:        Expose ticket custom fields via the web admin interface
 
 Group:          Applications/Internet
 # BSD license derived from metadata in setup.py
 License:        BSD
-URL:            http://trac-hacks.org/wiki/PrivateTicketsPlugin
-# Produce via 'svn export -r5073 http://trac-hacks.org/svn/customfieldadminplugin/0.10 customfieldadminplugin-0.10'
-# tar -czvf trac-customfieldadminplugin-0.10.svn5073.tar.gz customfieldadminplugin-0.10
-Source0:        trac-customfieldadminplugin-0.10.svn5073.tar.gz
+URL:            http://trac-hacks.org/wiki/CustomFieldAdminPlugin
+# Produce via 'svn export -r5253 http://trac-hacks.org/svn/customfieldadminplugin/0.10 customfieldadminplugin-0.10'
+# tar -czvf trac-customfieldadminplugin-0.10.svn5253.tar.gz customfieldadminplugin-0.10
+Source0:        trac-customfieldadminplugin-0.10.svn5253.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,10 +29,10 @@ instead of directly editing trac.ini
 
 
 %build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py build
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 12 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.4.svn5253
+- Update to latest upstream, fix packaging bugs
+
 * Sat Aug 01 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.3.svn5073
 - Correct broken dep (sorry this took so long....)
 



From pbrobinson at fedoraproject.org  Wed Aug 12 12:22:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 12 Aug 2009 12:22:21 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.2,1.3
Message-ID: <20090812122221.8AB9511C01EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18360

Modified Files:
	bisho.spec 
Log Message:
- add unique-devel buildreq


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bisho.spec	12 Aug 2009 11:10:19 -0000	1.2
+++ bisho.spec	12 Aug 2009 12:22:21 -0000	1.3
@@ -15,6 +15,7 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: mojito-devel
 BuildRequires: rest-devel
+BuildRequires: unique-devel
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 BuildRequires: gettext



From jstanley at fedoraproject.org  Wed Aug 12 12:24:17 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Wed, 12 Aug 2009 12:24:17 +0000 (UTC)
Subject: rpms/trac-customfieldadmin-plugin/F-10
	trac-customfieldadmin-plugin.spec, 1.4, 1.5
Message-ID: <20090812122417.A888511C01EA@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18586

Modified Files:
	trac-customfieldadmin-plugin.spec 
Log Message:
Fix Release



Index: trac-customfieldadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/F-10/trac-customfieldadmin-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trac-customfieldadmin-plugin.spec	12 Aug 2009 12:20:47 -0000	1.4
+++ trac-customfieldadmin-plugin.spec	12 Aug 2009 12:24:17 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           trac-customfieldadmin-plugin
 Version:        0.1
-Release:        0.4.svn5073%{?dist}
+Release:        0.5.svn5253%{?dist}
 Summary:        Expose ticket custom fields via the web admin interface
 
 Group:          Applications/Internet
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 12 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.5.svn5253
+- Actually correct Release field (had old SVN checkout, never built)
+
 * Wed Aug 12 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.4.svn5253
 - Update to latest upstream, fix packaging bugs
 



From jstanley at fedoraproject.org  Wed Aug 12 12:37:03 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Wed, 12 Aug 2009 12:37:03 +0000 (UTC)
Subject: rpms/trac-customfieldadmin-plugin/devel
	trac-customfieldadmin-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090812123703.7943511C01EA@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-customfieldadmin-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20062

Modified Files:
	.cvsignore sources 
Added Files:
	trac-customfieldadmin-plugin.spec 
Log Message:
Initial import for devel (F10 has been around for awhile)



--- NEW FILE trac-customfieldadmin-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           trac-customfieldadmin-plugin
Version:        0.2
Release:        0.1.svn5253%{?dist}
Summary:        Expose ticket custom fields via the web admin interface

Group:          Applications/Internet
# BSD license derived from metadata in setup.py
License:        BSD
URL:            http://trac-hacks.org/wiki/CustomFieldAdminPlugin
# Produce via 'svn export -r5253 http://trac-hacks.org/svn/customfieldadminplugin/0.11 customfieldadminplugin-0.11'
# tar -czvf trac-customfieldadminplugin-0.11.svn5253.tar.gz customfieldadminplugin-0.11
Source0:        trac-customfieldadminplugin-0.11.svn5253.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools
Requires:       trac >= 0.11

%description
A trac plugin to expose custom ticket fields via the admin web interface,
instead of directly editing trac.ini

%prep
%setup -q -n customfieldadminplugin-0.11


%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,-)
%{python_sitelib}/*

%changelog
* Wed Aug 12 2009 Jon Stanley <jonstanley at gmail.com> - 0.2-0.1.svn5253
- Initial package for Trac 0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Jul 2009 02:36:43 -0000	1.1
+++ .cvsignore	12 Aug 2009 12:37:03 -0000	1.2
@@ -0,0 +1 @@
+trac-customfieldadminplugin-0.11.svn5253.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Jul 2009 02:36:43 -0000	1.1
+++ sources	12 Aug 2009 12:37:03 -0000	1.2
@@ -0,0 +1 @@
+cf7f9d5e38ca0d44496a223f3d092427  trac-customfieldadminplugin-0.11.svn5253.tar.gz



From pghmcfc at fedoraproject.org  Wed Aug 12 12:52:53 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 12 Aug 2009 12:52:53 +0000 (UTC)
Subject: rpms/libxml/F-10 libxml-1.8.17-CAN-2004-0110.patch, NONE,
	1.1 libxml-1.8.17-ficora-245608.patch, NONE, 1.1 libxml.spec,
	1.11, 1.12
Message-ID: <20090812125253.EE5A211C01EA@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22633/F-10

Modified Files:
	libxml.spec 
Added Files:
	libxml-1.8.17-CAN-2004-0110.patch 
	libxml-1.8.17-ficora-245608.patch 
Log Message:
Add security patches from EL-3:

- add patch for CAN-2004-0110 and CAN-2004-0989 (#139090)
  (arbitrary code execution via a long URL)

- add patch for CVE-2009-2414 and CVE-2009-2416 (#515195, #515205)
  (CVE-2009-2414: stack consumption DoS vulnerabilities)
  (CVE-2009-2416: use-after-free DoS vulnerabilities)



libxml-1.8.17-CAN-2004-0110.patch:
 nanoftp.c.orig  |   30 ++++-!!!!!!!!!!!!!!!!!!!!!!!!!
 nanohttp.c.orig |   17 -!!!!!!!!!!!!!!!!
 2 files changed, 4 insertions(+), 2 deletions(-), 41 modifications(!)

--- NEW FILE libxml-1.8.17-CAN-2004-0110.patch ---
*** libxml-1.8.17/nanoftp.c.orig	2004-11-17 16:05:18.000000000 +0100
--- libxml-1.8.17/nanoftp.c	2004-11-17 16:22:03.000000000 +0100
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 221,227 ****
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
--- 221,227 ----
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 231,240 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
--- 231,240 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 258,269 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 258,269 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 301,307 ****
      if (ctxt->hostname == NULL)
  	return(-1);
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->protocol, buf))
--- 301,307 ----
      if (ctxt->hostname == NULL)
  	return(-1);
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->protocol, buf))
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 312,322 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0)
  	return(-1);
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->hostname, buf))
--- 312,322 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
  	return(-1);
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->hostname, buf))
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 348,359 ****
  	ctxt->path = NULL;
      }
  
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 348,359 ----
  	ctxt->path = NULL;
      }
  
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoFTPScanProxy(const char *URL) {
*** 393,399 ****
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
--- 393,399 ----
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
*************** xmlNanoFTPScanProxy(const char *URL) {
*** 402,411 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
--- 402,411 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
*************** xmlNanoFTPConnect(void *ctx) {
*** 827,832 ****
--- 827,836 ----
  	hp = gethostbyname(ctxt->hostname);
      if (hp == NULL)
          return(-1);
+     if (hp->h_length >
+         sizeof(((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr)) {
+         return(-1);
+     }
  
      /*
       * Prepare the socket
*** libxml-1.8.17/nanohttp.c.orig	2004-11-17 16:05:31.000000000 +0100
--- libxml-1.8.17/nanohttp.c	2004-11-17 16:26:18.000000000 +0100
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 177,183 ****
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
--- 177,183 ----
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) || (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 187,196 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
--- 187,196 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 214,225 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 214,225 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanProxy(const char *URL) {
*** 258,264 ****
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
--- 258,264 ----
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
*************** xmlNanoHTTPScanProxy(const char *URL) {
*** 267,276 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
--- 267,276 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);

libxml-1.8.17-ficora-245608.patch:
 parser.c |   38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE libxml-1.8.17-ficora-245608.patch ---
--- parser.c.orig	2001-09-14 16:09:41.000000000 +0200
+++ parser.c	2009-08-03 17:02:24.000000000 +0200
@@ -5164,11 +5164,15 @@ xmlParseNotationType(xmlParserCtxtPtr ct
 		                 "Name expected in NOTATION declaration\n");
 	    ctxt->wellFormed = 0;
 	    ctxt->disableSAX = 1;
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	cur = xmlCreateEnumeration(name);
 	xmlFree(name);
-	if (cur == NULL) return(ret);
+	if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
 	if (last == NULL) ret = last = cur;
 	else {
 	    last->next = cur;
@@ -5183,9 +5187,8 @@ xmlParseNotationType(xmlParserCtxtPtr ct
 	                     "')' required to finish NOTATION declaration\n");
 	ctxt->wellFormed = 0;
 	ctxt->disableSAX = 1;
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
     return(ret);
@@ -5232,11 +5235,15 @@ xmlParseEnumerationType(xmlParserCtxtPtr
 		                 "NmToken expected in ATTLIST enumeration\n");
 	    ctxt->wellFormed = 0;
 	    ctxt->disableSAX = 1;
-	    return(ret);
+            xmlFreeEnumeration(ret);
+            return(NULL);
 	}
 	cur = xmlCreateEnumeration(name);
 	xmlFree(name);
-	if (cur == NULL) return(ret);
+	if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
 	if (last == NULL) ret = last = cur;
 	else {
 	    last->next = cur;
@@ -5251,7 +5258,8 @@ xmlParseEnumerationType(xmlParserCtxtPtr
 	                     "')' required to finish ATTLIST enumeration\n");
 	ctxt->wellFormed = 0;
 	ctxt->disableSAX = 1;
-	return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
     return(ret);
@@ -5715,13 +5723,25 @@ xmlParseElementChildrenContentDecl
     xmlChar *elem;
     xmlChar type = 0;
 
+    if (ctxt->depth > 128) {
+        ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_FINISHED;
+        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+            ctxt->sax->error(ctxt->userData, 
+                "xmlParseElementChildrenContentDecl : depth %d too deep\n",
+                             ctxt->depth);
+        ctxt->wellFormed = 0;
+        ctxt->disableSAX = 1;
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
+        ctxt->depth++;
         cur = ret = xmlParseElementChildrenContentDecl(ctxt);
+        ctxt->depth--;
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5865,7 +5885,9 @@ xmlParseElementChildrenContentDecl
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
+            ctxt->depth++;
 	    last = xmlParseElementChildrenContentDecl(ctxt);
+            ctxt->depth--;
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseNameComplex(ctxt);


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/F-10/libxml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libxml.spec	21 Apr 2009 12:22:51 -0000	1.11
+++ libxml.spec	12 Aug 2009 12:52:53 -0000	1.12
@@ -2,15 +2,17 @@ Name:		libxml
 Summary:	Old XML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	22%{?dist}
+Release:	24%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
 Source:		ftp://xmlsoft.org/libxml/old/libxml-%{version}.tar.gz
-Patch0:		libxml-1.8.17-open-mode.patch
-Patch1:		libxml-1.8.17-multiarch.patch
-Patch2:		libxml-1.8.17-declarations.patch
-Patch3:		libxml-1.8.17-ppc64-config.patch
+Patch0:		libxml-1.8.17-CAN-2004-0110.patch
+Patch1:		libxml-1.8.17-ficora-245608.patch
+Patch10:	libxml-1.8.17-open-mode.patch
+Patch11:	libxml-1.8.17-multiarch.patch
+Patch12:	libxml-1.8.17-declarations.patch
+Patch13:	libxml-1.8.17-ppc64-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,10 +28,27 @@ Libraries, includes, etc. to build old l
 
 %prep
 %setup -q
+
+# fix CAN-2004-0110 & CAN-2004-0989 (arbitrary code execution via a long URL)
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .decl
-%patch3 -p1
+
+# fix CVE-2009-2414 (stack consumption DoS vulnerabilities)
+# fix CVE-2009-2416 (use-after-free DoS vulnerabilities)
+%patch1 -p0
+
+# open() with O_CREAT must have 3 arguments
+%patch10 -p1
+
+# make xml-config script arch-independent for multiarch compatibility
+%patch11 -p1
+
+# silence warnings about implicit function declarations
+%patch12 -p1 -b .decl
+
+# fix ppc64 builds
+%patch13 -p1
+
+# recode ChangeLog as UTF-8
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 %{__mv} -f ChangeLog.utf-8 ChangeLog
 
@@ -71,10 +90,18 @@ fi
 %exclude %{_libdir}/libxml.la
 
 %changelog
+* Wed Aug 12 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-24
+- renumber existing patches to free up low-numbered patches for EL-3 patches
+- add patch for CAN-2004-0110 and CAN-2004-0989 (#139090)
+- add patch for CVE-2009-2414 and CVE-2009-2416 (#515195, #515205)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.8.17-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-22
 - rebuild for %%{_isa} provides/requires
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-21
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.8.17-21
 - rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed May 21 2008 Paul Howarth <paul at city-fan.org> 1:1.8.17-20



From pghmcfc at fedoraproject.org  Wed Aug 12 12:52:54 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 12 Aug 2009 12:52:54 +0000 (UTC)
Subject: rpms/libxml/F-11 libxml-1.8.17-CAN-2004-0110.patch, NONE,
	1.1 libxml-1.8.17-ficora-245608.patch, NONE, 1.1 libxml.spec,
	1.12, 1.13
Message-ID: <20090812125254.459B511C01EA@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22633/F-11

Modified Files:
	libxml.spec 
Added Files:
	libxml-1.8.17-CAN-2004-0110.patch 
	libxml-1.8.17-ficora-245608.patch 
Log Message:
Add security patches from EL-3:

- add patch for CAN-2004-0110 and CAN-2004-0989 (#139090)
  (arbitrary code execution via a long URL)

- add patch for CVE-2009-2414 and CVE-2009-2416 (#515195, #515205)
  (CVE-2009-2414: stack consumption DoS vulnerabilities)
  (CVE-2009-2416: use-after-free DoS vulnerabilities)



libxml-1.8.17-CAN-2004-0110.patch:
 nanoftp.c.orig  |   30 ++++-!!!!!!!!!!!!!!!!!!!!!!!!!
 nanohttp.c.orig |   17 -!!!!!!!!!!!!!!!!
 2 files changed, 4 insertions(+), 2 deletions(-), 41 modifications(!)

--- NEW FILE libxml-1.8.17-CAN-2004-0110.patch ---
*** libxml-1.8.17/nanoftp.c.orig	2004-11-17 16:05:18.000000000 +0100
--- libxml-1.8.17/nanoftp.c	2004-11-17 16:22:03.000000000 +0100
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 221,227 ****
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
--- 221,227 ----
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 231,240 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
--- 231,240 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 258,269 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 258,269 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 301,307 ****
      if (ctxt->hostname == NULL)
  	return(-1);
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->protocol, buf))
--- 301,307 ----
      if (ctxt->hostname == NULL)
  	return(-1);
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->protocol, buf))
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 312,322 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0)
  	return(-1);
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->hostname, buf))
--- 312,322 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
  	return(-1);
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->hostname, buf))
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 348,359 ****
  	ctxt->path = NULL;
      }
  
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 348,359 ----
  	ctxt->path = NULL;
      }
  
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoFTPScanProxy(const char *URL) {
*** 393,399 ****
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
--- 393,399 ----
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
*************** xmlNanoFTPScanProxy(const char *URL) {
*** 402,411 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
--- 402,411 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
*************** xmlNanoFTPConnect(void *ctx) {
*** 827,832 ****
--- 827,836 ----
  	hp = gethostbyname(ctxt->hostname);
      if (hp == NULL)
          return(-1);
+     if (hp->h_length >
+         sizeof(((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr)) {
+         return(-1);
+     }
  
      /*
       * Prepare the socket
*** libxml-1.8.17/nanohttp.c.orig	2004-11-17 16:05:31.000000000 +0100
--- libxml-1.8.17/nanohttp.c	2004-11-17 16:26:18.000000000 +0100
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 177,183 ****
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
--- 177,183 ----
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) || (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 187,196 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
--- 187,196 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 214,225 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 214,225 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanProxy(const char *URL) {
*** 258,264 ****
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
--- 258,264 ----
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
*************** xmlNanoHTTPScanProxy(const char *URL) {
*** 267,276 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
--- 267,276 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);

libxml-1.8.17-ficora-245608.patch:
 parser.c |   38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE libxml-1.8.17-ficora-245608.patch ---
--- parser.c.orig	2001-09-14 16:09:41.000000000 +0200
+++ parser.c	2009-08-03 17:02:24.000000000 +0200
@@ -5164,11 +5164,15 @@ xmlParseNotationType(xmlParserCtxtPtr ct
 		                 "Name expected in NOTATION declaration\n");
 	    ctxt->wellFormed = 0;
 	    ctxt->disableSAX = 1;
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	cur = xmlCreateEnumeration(name);
 	xmlFree(name);
-	if (cur == NULL) return(ret);
+	if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
 	if (last == NULL) ret = last = cur;
 	else {
 	    last->next = cur;
@@ -5183,9 +5187,8 @@ xmlParseNotationType(xmlParserCtxtPtr ct
 	                     "')' required to finish NOTATION declaration\n");
 	ctxt->wellFormed = 0;
 	ctxt->disableSAX = 1;
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
     return(ret);
@@ -5232,11 +5235,15 @@ xmlParseEnumerationType(xmlParserCtxtPtr
 		                 "NmToken expected in ATTLIST enumeration\n");
 	    ctxt->wellFormed = 0;
 	    ctxt->disableSAX = 1;
-	    return(ret);
+            xmlFreeEnumeration(ret);
+            return(NULL);
 	}
 	cur = xmlCreateEnumeration(name);
 	xmlFree(name);
-	if (cur == NULL) return(ret);
+	if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
 	if (last == NULL) ret = last = cur;
 	else {
 	    last->next = cur;
@@ -5251,7 +5258,8 @@ xmlParseEnumerationType(xmlParserCtxtPtr
 	                     "')' required to finish ATTLIST enumeration\n");
 	ctxt->wellFormed = 0;
 	ctxt->disableSAX = 1;
-	return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
     return(ret);
@@ -5715,13 +5723,25 @@ xmlParseElementChildrenContentDecl
     xmlChar *elem;
     xmlChar type = 0;
 
+    if (ctxt->depth > 128) {
+        ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_FINISHED;
+        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+            ctxt->sax->error(ctxt->userData, 
+                "xmlParseElementChildrenContentDecl : depth %d too deep\n",
+                             ctxt->depth);
+        ctxt->wellFormed = 0;
+        ctxt->disableSAX = 1;
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
+        ctxt->depth++;
         cur = ret = xmlParseElementChildrenContentDecl(ctxt);
+        ctxt->depth--;
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5865,7 +5885,9 @@ xmlParseElementChildrenContentDecl
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
+            ctxt->depth++;
 	    last = xmlParseElementChildrenContentDecl(ctxt);
+            ctxt->depth--;
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseNameComplex(ctxt);


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/F-11/libxml.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libxml.spec	21 Apr 2009 12:14:11 -0000	1.12
+++ libxml.spec	12 Aug 2009 12:52:54 -0000	1.13
@@ -2,15 +2,17 @@ Name:		libxml
 Summary:	Old XML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	22%{?dist}
+Release:	24%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
 Source:		ftp://xmlsoft.org/libxml/old/libxml-%{version}.tar.gz
-Patch0:		libxml-1.8.17-open-mode.patch
-Patch1:		libxml-1.8.17-multiarch.patch
-Patch2:		libxml-1.8.17-declarations.patch
-Patch3:		libxml-1.8.17-ppc64-config.patch
+Patch0:		libxml-1.8.17-CAN-2004-0110.patch
+Patch1:		libxml-1.8.17-ficora-245608.patch
+Patch10:	libxml-1.8.17-open-mode.patch
+Patch11:	libxml-1.8.17-multiarch.patch
+Patch12:	libxml-1.8.17-declarations.patch
+Patch13:	libxml-1.8.17-ppc64-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,10 +28,27 @@ Libraries, includes, etc. to build old l
 
 %prep
 %setup -q
+
+# fix CAN-2004-0110 & CAN-2004-0989 (arbitrary code execution via a long URL)
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .decl
-%patch3 -p1
+
+# fix CVE-2009-2414 (stack consumption DoS vulnerabilities)
+# fix CVE-2009-2416 (use-after-free DoS vulnerabilities)
+%patch1 -p0
+
+# open() with O_CREAT must have 3 arguments
+%patch10 -p1
+
+# make xml-config script arch-independent for multiarch compatibility
+%patch11 -p1
+
+# silence warnings about implicit function declarations
+%patch12 -p1 -b .decl
+
+# fix ppc64 builds
+%patch13 -p1
+
+# recode ChangeLog as UTF-8
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 %{__mv} -f ChangeLog.utf-8 ChangeLog
 
@@ -71,10 +90,18 @@ fi
 %exclude %{_libdir}/libxml.la
 
 %changelog
+* Wed Aug 12 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-24
+- renumber existing patches to free up low-numbered patches for EL-3 patches
+- add patch for CAN-2004-0110 and CAN-2004-0989 (#139090)
+- add patch for CVE-2009-2414 and CVE-2009-2416 (#515195, #515205)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.8.17-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-22
 - rebuild for %%{_isa} provides/requires
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-21
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.8.17-21
 - rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed May 21 2008 Paul Howarth <paul at city-fan.org> 1:1.8.17-20



From pghmcfc at fedoraproject.org  Wed Aug 12 12:52:54 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 12 Aug 2009 12:52:54 +0000 (UTC)
Subject: rpms/libxml/devel libxml-1.8.17-CAN-2004-0110.patch, NONE,
	1.1 libxml-1.8.17-ficora-245608.patch, NONE, 1.1 libxml.spec,
	1.13, 1.14
Message-ID: <20090812125254.75DD811C01EA@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22633/devel

Modified Files:
	libxml.spec 
Added Files:
	libxml-1.8.17-CAN-2004-0110.patch 
	libxml-1.8.17-ficora-245608.patch 
Log Message:
Add security patches from EL-3:

- add patch for CAN-2004-0110 and CAN-2004-0989 (#139090)
  (arbitrary code execution via a long URL)

- add patch for CVE-2009-2414 and CVE-2009-2416 (#515195, #515205)
  (CVE-2009-2414: stack consumption DoS vulnerabilities)
  (CVE-2009-2416: use-after-free DoS vulnerabilities)



libxml-1.8.17-CAN-2004-0110.patch:
 nanoftp.c.orig  |   30 ++++-!!!!!!!!!!!!!!!!!!!!!!!!!
 nanohttp.c.orig |   17 -!!!!!!!!!!!!!!!!
 2 files changed, 4 insertions(+), 2 deletions(-), 41 modifications(!)

--- NEW FILE libxml-1.8.17-CAN-2004-0110.patch ---
*** libxml-1.8.17/nanoftp.c.orig	2004-11-17 16:05:18.000000000 +0100
--- libxml-1.8.17/nanoftp.c	2004-11-17 16:22:03.000000000 +0100
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 221,227 ****
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
--- 221,227 ----
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 231,240 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
--- 231,240 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
*************** xmlNanoFTPScanURL(void *ctx, const char 
*** 258,269 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 258,269 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 301,307 ****
      if (ctxt->hostname == NULL)
  	return(-1);
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->protocol, buf))
--- 301,307 ----
      if (ctxt->hostname == NULL)
  	return(-1);
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->protocol, buf))
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 312,322 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0)
  	return(-1);
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->hostname, buf))
--- 312,322 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
  	return(-1);
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    if (strcmp(ctxt->hostname, buf))
*************** xmlNanoFTPUpdateURL(void *ctx, const cha
*** 348,359 ****
  	ctxt->path = NULL;
      }
  
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 348,359 ----
  	ctxt->path = NULL;
      }
  
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoFTPScanProxy(const char *URL) {
*** 393,399 ****
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
--- 393,399 ----
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
*************** xmlNanoFTPScanProxy(const char *URL) {
*** 402,411 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
--- 402,411 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
*************** xmlNanoFTPConnect(void *ctx) {
*** 827,832 ****
--- 827,836 ----
  	hp = gethostbyname(ctxt->hostname);
      if (hp == NULL)
          return(-1);
+     if (hp->h_length >
+         sizeof(((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr)) {
+         return(-1);
+     }
  
      /*
       * Prepare the socket
*** libxml-1.8.17/nanohttp.c.orig	2004-11-17 16:05:31.000000000 +0100
--- libxml-1.8.17/nanohttp.c	2004-11-17 16:26:18.000000000 +0100
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 177,183 ****
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
--- 177,183 ----
      }
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) || (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    ctxt->protocol = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 187,196 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
--- 187,196 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    ctxt->hostname = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ct
*** 214,225 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) 
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while (*cur != 0)
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
--- 214,225 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090))
          ctxt->path = xmlMemStrdup("/");
      else {
          index = 0;
          buf[index] = 0;
! 	while ((*cur != 0) && (index < 4090))
  	    buf[index++] = *cur++;
  	buf[index] = 0;
  	ctxt->path = xmlMemStrdup(buf);
*************** xmlNanoHTTPScanProxy(const char *URL) {
*** 258,264 ****
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while (*cur != 0) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
--- 258,264 ----
  #endif
      if (URL == NULL) return;
      buf[index] = 0;
!     while ((*cur != 0) && (index < 4090)) {
          if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
  	    buf[index] = 0;
  	    index = 0;
*************** xmlNanoHTTPScanProxy(const char *URL) {
*** 267,276 ****
  	}
  	buf[index++] = *cur++;
      }
!     if (*cur == 0) return;
  
      buf[index] = 0;
!     while (1) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);
--- 267,276 ----
  	}
  	buf[index++] = *cur++;
      }
!     if ((*cur == 0) || (index >= 4090)) return;
  
      buf[index] = 0;
!     while (index < 4090) {
          if (cur[0] == ':') {
  	    buf[index] = 0;
  	    proxy = xmlMemStrdup(buf);

libxml-1.8.17-ficora-245608.patch:
 parser.c |   38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE libxml-1.8.17-ficora-245608.patch ---
--- parser.c.orig	2001-09-14 16:09:41.000000000 +0200
+++ parser.c	2009-08-03 17:02:24.000000000 +0200
@@ -5164,11 +5164,15 @@ xmlParseNotationType(xmlParserCtxtPtr ct
 		                 "Name expected in NOTATION declaration\n");
 	    ctxt->wellFormed = 0;
 	    ctxt->disableSAX = 1;
-	    return(ret);
+            xmlFreeEnumeration(ret);
+	    return(NULL);
 	}
 	cur = xmlCreateEnumeration(name);
 	xmlFree(name);
-	if (cur == NULL) return(ret);
+	if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
 	if (last == NULL) ret = last = cur;
 	else {
 	    last->next = cur;
@@ -5183,9 +5187,8 @@ xmlParseNotationType(xmlParserCtxtPtr ct
 	                     "')' required to finish NOTATION declaration\n");
 	ctxt->wellFormed = 0;
 	ctxt->disableSAX = 1;
-	if ((last != NULL) && (last != ret))
-	    xmlFreeEnumeration(last);
-	return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
     return(ret);
@@ -5232,11 +5235,15 @@ xmlParseEnumerationType(xmlParserCtxtPtr
 		                 "NmToken expected in ATTLIST enumeration\n");
 	    ctxt->wellFormed = 0;
 	    ctxt->disableSAX = 1;
-	    return(ret);
+            xmlFreeEnumeration(ret);
+            return(NULL);
 	}
 	cur = xmlCreateEnumeration(name);
 	xmlFree(name);
-	if (cur == NULL) return(ret);
+	if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
 	if (last == NULL) ret = last = cur;
 	else {
 	    last->next = cur;
@@ -5251,7 +5258,8 @@ xmlParseEnumerationType(xmlParserCtxtPtr
 	                     "')' required to finish ATTLIST enumeration\n");
 	ctxt->wellFormed = 0;
 	ctxt->disableSAX = 1;
-	return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
     return(ret);
@@ -5715,13 +5723,25 @@ xmlParseElementChildrenContentDecl
     xmlChar *elem;
     xmlChar type = 0;
 
+    if (ctxt->depth > 128) {
+        ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_FINISHED;
+        if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+            ctxt->sax->error(ctxt->userData, 
+                "xmlParseElementChildrenContentDecl : depth %d too deep\n",
+                             ctxt->depth);
+        ctxt->wellFormed = 0;
+        ctxt->disableSAX = 1;
+	return(NULL);
+    }
     SKIP_BLANKS;
     GROW;
     if (RAW == '(') {
         /* Recurse on first child */
 	NEXT;
 	SKIP_BLANKS;
+        ctxt->depth++;
         cur = ret = xmlParseElementChildrenContentDecl(ctxt);
+        ctxt->depth--;
 	SKIP_BLANKS;
 	GROW;
     } else {
@@ -5865,7 +5885,9 @@ xmlParseElementChildrenContentDecl
 	    /* Recurse on second child */
 	    NEXT;
 	    SKIP_BLANKS;
+            ctxt->depth++;
 	    last = xmlParseElementChildrenContentDecl(ctxt);
+            ctxt->depth--;
 	    SKIP_BLANKS;
 	} else {
 	    elem = xmlParseNameComplex(ctxt);


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/devel/libxml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libxml.spec	25 Jul 2009 08:58:29 -0000	1.13
+++ libxml.spec	12 Aug 2009 12:52:54 -0000	1.14
@@ -2,15 +2,17 @@ Name:		libxml
 Summary:	Old XML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	23%{?dist}
+Release:	24%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
 Source:		ftp://xmlsoft.org/libxml/old/libxml-%{version}.tar.gz
-Patch0:		libxml-1.8.17-open-mode.patch
-Patch1:		libxml-1.8.17-multiarch.patch
-Patch2:		libxml-1.8.17-declarations.patch
-Patch3:		libxml-1.8.17-ppc64-config.patch
+Patch0:		libxml-1.8.17-CAN-2004-0110.patch
+Patch1:		libxml-1.8.17-ficora-245608.patch
+Patch10:	libxml-1.8.17-open-mode.patch
+Patch11:	libxml-1.8.17-multiarch.patch
+Patch12:	libxml-1.8.17-declarations.patch
+Patch13:	libxml-1.8.17-ppc64-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,10 +28,27 @@ Libraries, includes, etc. to build old l
 
 %prep
 %setup -q
+
+# fix CAN-2004-0110 & CAN-2004-0989 (arbitrary code execution via a long URL)
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .decl
-%patch3 -p1
+
+# fix CVE-2009-2414 (stack consumption DoS vulnerabilities)
+# fix CVE-2009-2416 (use-after-free DoS vulnerabilities)
+%patch1 -p0
+
+# open() with O_CREAT must have 3 arguments
+%patch10 -p1
+
+# make xml-config script arch-independent for multiarch compatibility
+%patch11 -p1
+
+# silence warnings about implicit function declarations
+%patch12 -p1 -b .decl
+
+# fix ppc64 builds
+%patch13 -p1
+
+# recode ChangeLog as UTF-8
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 %{__mv} -f ChangeLog.utf-8 ChangeLog
 
@@ -71,13 +90,18 @@ fi
 %exclude %{_libdir}/libxml.la
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-23
+* Wed Aug 12 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-24
+- renumber existing patches to free up low-numbered patches for EL-3 patches
+- add patch for CAN-2004-0110 and CAN-2004-0989 (#139090)
+- add patch for CVE-2009-2414 and CVE-2009-2416 (#515195, #515205)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.8.17-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:1.8.17-22
 - rebuild for %%{_isa} provides/requires
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.17-21
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.8.17-21
 - rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed May 21 2008 Paul Howarth <paul at city-fan.org> 1:1.8.17-20



From mgieseki at fedoraproject.org  Wed Aug 12 13:11:00 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Wed, 12 Aug 2009 13:11:00 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 dvisvgm.spec,1.2,1.3
Message-ID: <20090812131100.B9B9F11C01EA@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24941

Modified Files:
	dvisvgm.spec 
Log Message:
bumped release number


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/dvisvgm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dvisvgm.spec	12 Aug 2009 11:36:53 -0000	1.2
+++ dvisvgm.spec	12 Aug 2009 13:11:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dvisvgm
 Version:        0.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5
+- adapted Requires and BuildRequires to RH5
+
 * Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
 - removed bundled potrace library in prep section
 



From ksyz at fedoraproject.org  Wed Aug 12 13:28:04 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Wed, 12 Aug 2009 13:28:04 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/devel perl-Flickr-Upload-remotetests.patch, 
	NONE, 1.1 perl-Flickr-Upload.spec, 1.1, 1.2
Message-ID: <20090812132804.F1B5611C01EA@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27755

Modified Files:
	perl-Flickr-Upload.spec 
Added Files:
	perl-Flickr-Upload-remotetests.patch 
Log Message:
* Wed Aug 12 2009 Michal Ingeli <mi at v3.sk> 1.32-2
- Added missing buildrequire for Test::Simple
- Removed test that interact with api.flickr.com


perl-Flickr-Upload-remotetests.patch:
 async.t      |    2 +-
 failupload.t |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE perl-Flickr-Upload-remotetests.patch ---
diff -ru t/async.t t/async.t
--- t/async.t	2008-06-18 22:33:37.000000000 +0200
+++ t/async.t	2009-08-12 13:49:12.000000000 +0200
@@ -1,4 +1,4 @@
-use Test::More qw(no_plan);
+use Test::More skip_all => 'Calling home';
 BEGIN { use_ok('Flickr::Upload') };
 
 my $api_key = '8dcf37880da64acfe8e30bb1091376b7';
diff -ru t/failupload.t t/failupload.t
--- t/failupload.t	2008-06-18 01:05:16.000000000 +0200
+++ t/failupload.t	2009-08-12 13:49:12.000000000 +0200
@@ -1,4 +1,4 @@
-use Test::More qw(no_plan);
+use Test::More skip_all => 'Calling home';
 BEGIN { use_ok('Flickr::Upload') };
 
 my $api_key = '8dcf37880da64acfe8e30bb1091376b7';


Index: perl-Flickr-Upload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/devel/perl-Flickr-Upload.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Flickr-Upload.spec	11 Aug 2009 15:58:39 -0000	1.1
+++ perl-Flickr-Upload.spec	12 Aug 2009 13:28:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Flickr-Upload
 Version:        1.32
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flickr.com upload module and script
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,6 +8,7 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/C/CP/CPB/Flickr-Upload-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(Test::Simple)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Flickr::API) >= 0.07
 BuildRequires:  perl(HTTP::Request::Common) >= 1
@@ -19,12 +20,14 @@ Requires:       perl(LWP::UserAgent) >= 
 Requires:       perl(XML::Parser::Lite::Tree) >= 0.03
 Requires:       perl(Term::ProgressBar) >= 2.09
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Patch0: 	perl-Flickr-Upload-remotetests.patch
 
 %description
 Module and script for uploading images to flickr.com web gallery.
 
 %prep
 %setup -q -n Flickr-Upload-%{version}
+%patch0 -p0 -b .remotetests
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -56,5 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Michal Ingeli <mi at v3.sk> 1.32-2
+- Added missing buildrequire for Test::Simple
+- Removed test that interact with api.flickr.com
+
 * Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> 1.32-1
 - Specfile autogenerated by cpanspec 1.77.



From jeckersb at fedoraproject.org  Wed Aug 12 13:32:36 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Wed, 12 Aug 2009 13:32:36 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.9, 1.10 python-netaddr.spec,
	1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20090812133236.E181A11C01EA@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28536

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
Upstream release 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Jun 2009 02:46:30 -0000	1.9
+++ .cvsignore	12 Aug 2009 13:32:36 -0000	1.10
@@ -1 +1 @@
-netaddr-0.6.3.tar.gz
+netaddr-0.7.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- python-netaddr.spec	26 Jul 2009 20:43:28 -0000	1.14
+++ python-netaddr.spec	12 Aug 2009 13:32:36 -0000	1.15
@@ -3,8 +3,8 @@
 #====================================================================#
 
 Name:           python-netaddr
-Version:        0.6.3
-Release:        3%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
 Group:          Development/Libraries
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 John Eckersberg <jeckersb at redhat.com> - 0.7-1
+- Upstream release 0.7
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Jun 2009 02:46:30 -0000	1.9
+++ sources	12 Aug 2009 13:32:36 -0000	1.10
@@ -1 +1 @@
-0a74be72c9e241ddd7fdab077a053904  netaddr-0.6.3.tar.gz
+55827ec4397f6e25919bcc5aa6bd0f71  netaddr-0.7.tar.gz



From ksyz at fedoraproject.org  Wed Aug 12 13:45:58 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Wed, 12 Aug 2009 13:45:58 +0000 (UTC)
Subject: rpms/perl-Flickr-Upload/F-11 perl-Flickr-Upload-remotetests.patch, 
	NONE, 1.1 perl-Flickr-Upload.spec, 1.1, 1.2
Message-ID: <20090812134558.49B8511C01EA@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/perl-Flickr-Upload/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30917

Modified Files:
	perl-Flickr-Upload.spec 
Added Files:
	perl-Flickr-Upload-remotetests.patch 
Log Message:
* Wed Aug 12 2009 Michal Ingeli <mi at v3.sk> 1.32-2
- Added missing buildrequire for Test::Simple
- Removed test that interact with api.flickr.com


perl-Flickr-Upload-remotetests.patch:
 async.t      |    2 +-
 failupload.t |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE perl-Flickr-Upload-remotetests.patch ---
diff -ru t/async.t t/async.t
--- t/async.t	2008-06-18 22:33:37.000000000 +0200
+++ t/async.t	2009-08-12 13:49:12.000000000 +0200
@@ -1,4 +1,4 @@
-use Test::More qw(no_plan);
+use Test::More skip_all => 'Calling home';
 BEGIN { use_ok('Flickr::Upload') };
 
 my $api_key = '8dcf37880da64acfe8e30bb1091376b7';
diff -ru t/failupload.t t/failupload.t
--- t/failupload.t	2008-06-18 01:05:16.000000000 +0200
+++ t/failupload.t	2009-08-12 13:49:12.000000000 +0200
@@ -1,4 +1,4 @@
-use Test::More qw(no_plan);
+use Test::More skip_all => 'Calling home';
 BEGIN { use_ok('Flickr::Upload') };
 
 my $api_key = '8dcf37880da64acfe8e30bb1091376b7';


Index: perl-Flickr-Upload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Flickr-Upload/F-11/perl-Flickr-Upload.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Flickr-Upload.spec	11 Aug 2009 15:57:20 -0000	1.1
+++ perl-Flickr-Upload.spec	12 Aug 2009 13:45:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Flickr-Upload
 Version:        1.32
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flickr.com upload module and script
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,6 +8,7 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/C/CP/CPB/Flickr-Upload-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(Test::Simple)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Flickr::API) >= 0.07
 BuildRequires:  perl(HTTP::Request::Common) >= 1
@@ -19,12 +20,14 @@ Requires:       perl(LWP::UserAgent) >= 
 Requires:       perl(XML::Parser::Lite::Tree) >= 0.03
 Requires:       perl(Term::ProgressBar) >= 2.09
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Patch0: 	perl-Flickr-Upload-remotetests.patch
 
 %description
 Module and script for uploading images to flickr.com web gallery.
 
 %prep
 %setup -q -n Flickr-Upload-%{version}
+%patch0 -p0 -b .remotetests
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -56,5 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Michal Ingeli <mi at v3.sk> 1.32-2
+- Added missing buildrequire for Test::Simple
+- Removed test that interact with api.flickr.com
+
 * Sun Jun 21 2009 Michal Ingeli <mi at v3.sk> 1.32-1
 - Specfile autogenerated by cpanspec 1.77.



From dwmw2 at fedoraproject.org  Wed Aug 12 13:54:32 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 12 Aug 2009 13:54:32 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.60,1.61
Message-ID: <20090812135432.5016311C01EA@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31902

Modified Files:
	exim.spec 
Log Message:
require openssl for post


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- exim.spec	12 Aug 2009 11:11:29 -0000	1.60
+++ exim.spec	12 Aug 2009 13:54:32 -0000	1.61
@@ -12,14 +12,14 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: MTA smtpd smtpdaemon server(smtp) /usr/bin/newaliases
 Provides: /usr/sbin/sendmail /usr/bin/mailq /usr/bin/rmail
-Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
+Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives openssl
 Requires(preun): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
 Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd
 %if 0%{?buildclam}
@@ -503,6 +503,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Require openssl for %post
+
 * Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-13
 - Cope with lack of /etc/sysconfig/network (#506330)
 - Require /etc/pki/tls/ directories



From pbrobinson at fedoraproject.org  Wed Aug 12 14:01:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 12 Aug 2009 14:01:17 +0000 (UTC)
Subject: rpms/dates/devel .cvsignore, 1.9, 1.10 dates.spec, 1.18,
	1.19 sources, 1.9, 1.10 dates-0.4.6-config.patch, 1.1, NONE
Message-ID: <20090812140117.AAA1F11C01EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dates/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv317

Modified Files:
	.cvsignore dates.spec sources 
Removed Files:
	dates-0.4.6-config.patch 
Log Message:
- New upstream 0.4.8 release. Some spec file cleanups.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dates/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 May 2008 09:43:31 -0000	1.9
+++ .cvsignore	12 Aug 2009 14:01:17 -0000	1.10
@@ -1 +1 @@
-dates-0.4.6.tar.gz
+dates-0.4.8.tar.gz


Index: dates.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dates/devel/dates.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- dates.spec	24 Jul 2009 19:58:40 -0000	1.18
+++ dates.spec	12 Aug 2009 14:01:17 -0000	1.19
@@ -1,43 +1,32 @@
 Name:			dates
-Version:		0.4.6
-Release:		4%{?dist}
+Version:		0.4.8
+Release:		1%{?dist}
 Summary:		Small, lightweight calendar
 
 Group:			Applications/Productivity
 License:		GPLv2+
 URL:			http://pimlico-project.org/dates.html
 Source0:		http://pimlico-project.org/sources/%{name}/%{name}-%{version}.tar.gz
-Patch0:			%{name}-0.4.6-config.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):		/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
-
 BuildRequires:  	gtk2-devel
-BuildRequires:		evolution-data-server-devel >= 1.2.0
+BuildRequires:		evolution-data-server-devel
 BuildRequires:		desktop-file-utils intltool gettext
 
-Obsoletes:		%{name}-devel <= 0.4.4
-
-
 %description
 Dates is a small, lightweight calendar that uses Evolution Data Server as a
 backend. Dates features an innovative, unified, zooming view and is designed
 for use on primarily hand-held devices. It features both a ?vanilla? GTK
 user interface and tailored support for the Nokia 770 maemo interface.
 
-
 %prep
 %setup -q
-%patch0 -p1
-
 
 %build
 %configure --disable-debug
 make %{?_smp_mflags} 
 sed -i 's/SingleInstance/X-SingleInstance/' data/%{name}.desktop
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -48,38 +37,34 @@ desktop-file-install --vendor fedora --d
 
 %find_lang Dates
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-/sbin/ldconfig
-
+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
-/sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f Dates.lang
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog
-%{_mandir}/man*/*
+%doc COPYING NEWS README
+%doc %{_mandir}/man1/dates.1.gz
 %{_datadir}/icons/hicolor/*/apps/dates.*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_bindir}/%{name}
 
-
 %changelog
+* Wed Aug 12 2009 Peter Robinson <pbrobinson at gmail.com> - 0.4.8-1
+- New upstream 0.4.8 release. Some spec file cleanups.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dates/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 May 2008 09:43:31 -0000	1.9
+++ sources	12 Aug 2009 14:01:17 -0000	1.10
@@ -1 +1 @@
-27f51157253966676e99b539c24d2c68  dates-0.4.6.tar.gz
+b403d18de47018321333bcf994dbe1b0  dates-0.4.8.tar.gz


--- dates-0.4.6-config.patch DELETED ---



From s4504kr at fedoraproject.org  Wed Aug 12 14:08:02 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 12 Aug 2009 14:08:02 +0000 (UTC)
Subject: rpms/suck/devel suck.spec,1.22,1.23
Message-ID: <20090812140802.B01D211C01EA@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1191

Modified Files:
	suck.spec 
Log Message:
Rebuild for new openssl release


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- suck.spec	27 Jul 2009 04:58:07 -0000	1.22
+++ suck.spec	12 Aug 2009 14:08:02 -0000	1.23
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 26%{?dist}
+Release: 27%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/news/suck.d/
 
 %changelog
+* Wed Aug 12 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-27
+- Rebuild for new openssl release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.2-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Wed Aug 12 14:12:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 12 Aug 2009 14:12:10 +0000 (UTC)
Subject: rpms/dates/F-11 .cvsignore, 1.9, 1.10 dates.spec, 1.17, 1.18 sources,
	1.9, 1.10 dates-0.4.6-config.patch, 1.1, NONE
Message-ID: <20090812141210.AB31E11C01EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dates/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1748

Modified Files:
	.cvsignore dates.spec sources 
Removed Files:
	dates-0.4.6-config.patch 
Log Message:
- New upstream 0.4.8 release. Some spec file cleanups.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dates/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 May 2008 09:43:31 -0000	1.9
+++ .cvsignore	12 Aug 2009 14:12:10 -0000	1.10
@@ -1 +1 @@
-dates-0.4.6.tar.gz
+dates-0.4.8.tar.gz


Index: dates.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dates/F-11/dates.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- dates.spec	26 Feb 2009 22:45:36 -0000	1.17
+++ dates.spec	12 Aug 2009 14:12:10 -0000	1.18
@@ -1,43 +1,32 @@
 Name:			dates
-Version:		0.4.6
-Release:		3%{?dist}
+Version:		0.4.8
+Release:		1%{?dist}
 Summary:		Small, lightweight calendar
 
 Group:			Applications/Productivity
 License:		GPLv2+
 URL:			http://pimlico-project.org/dates.html
 Source0:		http://pimlico-project.org/sources/%{name}/%{name}-%{version}.tar.gz
-Patch0:			%{name}-0.4.6-config.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):		/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
-
 BuildRequires:  	gtk2-devel
-BuildRequires:		evolution-data-server-devel >= 1.2.0
+BuildRequires:		evolution-data-server-devel
 BuildRequires:		desktop-file-utils intltool gettext
 
-Obsoletes:		%{name}-devel <= 0.4.4
-
-
 %description
 Dates is a small, lightweight calendar that uses Evolution Data Server as a
 backend. Dates features an innovative, unified, zooming view and is designed
 for use on primarily hand-held devices. It features both a ?vanilla? GTK
 user interface and tailored support for the Nokia 770 maemo interface.
 
-
 %prep
 %setup -q
-%patch0 -p1
-
 
 %build
 %configure --disable-debug
 make %{?_smp_mflags} 
 sed -i 's/SingleInstance/X-SingleInstance/' data/%{name}.desktop
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -48,38 +37,37 @@ desktop-file-install --vendor fedora --d
 
 %find_lang Dates
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-/sbin/ldconfig
-
+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
-/sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f Dates.lang
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog
-%{_mandir}/man*/*
+%doc COPYING NEWS README
+%doc %{_mandir}/man1/dates.1.gz
 %{_datadir}/icons/hicolor/*/apps/dates.*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_bindir}/%{name}
 
-
 %changelog
+* Wed Aug 12 2009 Peter Robinson <pbrobinson at gmail.com> - 0.4.8-1
+- New upstream 0.4.8 release. Some spec file cleanups.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Feb 27 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.6-3
 - Fixed build failure.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dates/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 May 2008 09:43:31 -0000	1.9
+++ sources	12 Aug 2009 14:12:10 -0000	1.10
@@ -1 +1 @@
-27f51157253966676e99b539c24d2c68  dates-0.4.6.tar.gz
+b403d18de47018321333bcf994dbe1b0  dates-0.4.8.tar.gz


--- dates-0.4.6-config.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Aug 12 14:14:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 12 Aug 2009 14:14:55 +0000 (UTC)
Subject: rpms/dates/F-10 .cvsignore, 1.9, 1.10 dates.spec, 1.15, 1.16 sources,
	1.9, 1.10
Message-ID: <20090812141455.8528811C01EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dates/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2798

Modified Files:
	.cvsignore dates.spec sources 
Log Message:
- New upstream 0.4.8 release. Some spec file cleanups.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dates/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 May 2008 09:43:31 -0000	1.9
+++ .cvsignore	12 Aug 2009 14:14:55 -0000	1.10
@@ -1 +1 @@
-dates-0.4.6.tar.gz
+dates-0.4.8.tar.gz


Index: dates.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dates/F-10/dates.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dates.spec	16 May 2008 09:43:31 -0000	1.15
+++ dates.spec	12 Aug 2009 14:14:55 -0000	1.16
@@ -1,5 +1,5 @@
 Name:			dates
-Version:		0.4.6
+Version:		0.4.8
 Release:		1%{?dist}
 Summary:		Small, lightweight calendar
 
@@ -9,33 +9,24 @@ URL:			http://pimlico-project.org/dates.
 Source0:		http://pimlico-project.org/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):		/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
-
 BuildRequires:  	gtk2-devel
-BuildRequires:		evolution-data-server-devel >= 1.2.0
+BuildRequires:		evolution-data-server-devel
 BuildRequires:		desktop-file-utils intltool gettext
 
-Obsoletes:		%{name}-devel <= 0.4.4
-
-
 %description
 Dates is a small, lightweight calendar that uses Evolution Data Server as a
 backend. Dates features an innovative, unified, zooming view and is designed
 for use on primarily hand-held devices. It features both a ?vanilla? GTK
 user interface and tailored support for the Nokia 770 maemo interface.
 
-
 %prep
 %setup -q
 
-
 %build
 %configure --disable-debug
 make %{?_smp_mflags} 
 sed -i 's/SingleInstance/X-SingleInstance/' data/%{name}.desktop
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -46,38 +37,43 @@ desktop-file-install --vendor fedora --d
 
 %find_lang Dates
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-/sbin/ldconfig
-
+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
-/sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f Dates.lang
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog
-%{_mandir}/man*/*
+%doc COPYING NEWS README
+%doc %{_mandir}/man1/dates.1.gz
 %{_datadir}/icons/hicolor/*/apps/dates.*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_bindir}/%{name}
 
-
 %changelog
+* Wed Aug 12 2009 Peter Robinson <pbrobinson at gmail.com> - 0.4.8-1
+- New upstream 0.4.8 release. Some spec file cleanups.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Feb 27 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.6-3
+- Fixed build failure.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri May 16 2008 Denis Leroy <denis at poolshark.org> - 0.4.6-1
 - Update to upstream 0.4.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dates/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 May 2008 09:43:31 -0000	1.9
+++ sources	12 Aug 2009 14:14:55 -0000	1.10
@@ -1 +1 @@
-27f51157253966676e99b539c24d2c68  dates-0.4.6.tar.gz
+b403d18de47018321333bcf994dbe1b0  dates-0.4.8.tar.gz



From mclasen at fedoraproject.org  Wed Aug 12 14:30:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 14:30:36 +0000 (UTC)
Subject: rpms/intltool/devel .cvsignore, 1.30, 1.31 intltool.spec, 1.57,
	1.58 sources, 1.30, 1.31
Message-ID: <20090812143037.02CD011C02CB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/intltool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858

Modified Files:
	.cvsignore intltool.spec sources 
Log Message:
0.41.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	16 Mar 2009 04:07:00 -0000	1.30
+++ .cvsignore	12 Aug 2009 14:30:36 -0000	1.31
@@ -1 +1 @@
-intltool-0.40.6.tar.bz2
+intltool-0.41.0.tar.gz


Index: intltool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- intltool.spec	10 Aug 2009 08:46:37 -0000	1.57
+++ intltool.spec	12 Aug 2009 14:30:36 -0000	1.58
@@ -3,11 +3,11 @@
 
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
-Version: 0.40.6
-Release: 4%{?dist}
+Version: 0.41.0
+Release: 1%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
-Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2
+Source: http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-%{version}.tar.gz
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Wed Aug 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.41.0-1
+- Update to 0.41.0
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.40.6-4
 - Convert specfile to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	16 Mar 2009 04:07:00 -0000	1.30
+++ sources	12 Aug 2009 14:30:36 -0000	1.31
@@ -1 +1 @@
-69bc0353323112f42ad4f9cf351bc3e5  intltool-0.40.6.tar.bz2
+8a6e4afd3fc93637dcd70e36ab899364  intltool-0.41.0.tar.gz



From jkratoch at fedoraproject.org  Wed Aug 12 14:36:09 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Wed, 12 Aug 2009 14:36:09 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.6-step-thread-exit.patch, 1.5,
	1.6 gdb-6.3-inheritancetest-20050726.patch, 1.1,
	1.2 gdb-6.3-pie-20050110.patch, 1.20,
	1.21 gdb-6.6-scheduler_locking-step-is-default.patch, 1.2,
	1.3 gdb.spec, 1.373, 1.374
Message-ID: <20090812143609.DCAB711C01EA@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5609

Modified Files:
	gdb-6.3-inheritancetest-20050726.patch 
	gdb-6.3-pie-20050110.patch 
	gdb-6.6-scheduler_locking-step-is-default.patch gdb.spec 
Added Files:
	gdb-6.6-step-thread-exit.patch 
Log Message:
* Wed Aug 12 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-4
- Fix minor regressions introduced by the rebase from F-11 (6.8.50.20090302).


gdb-6.6-step-thread-exit.patch:
 linux-nat.c |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

Index: gdb-6.6-step-thread-exit.patch
===================================================================
RCS file: gdb-6.6-step-thread-exit.patch
diff -N gdb-6.6-step-thread-exit.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb-6.6-step-thread-exit.patch	12 Aug 2009 14:36:09 -0000	1.6
@@ -0,0 +1,60 @@
+Index: gdb-6.8.50.20090811/gdb/linux-nat.c
+===================================================================
+--- gdb-6.8.50.20090811.orig/gdb/linux-nat.c	2009-08-12 07:21:20.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/linux-nat.c	2009-08-12 08:11:25.000000000 +0200
+@@ -1656,16 +1656,18 @@ resume_set_callback (struct lwp_info *lp
+ 
+ static void
+ linux_nat_resume (struct target_ops *ops,
+-		  ptid_t ptid, int step, enum target_signal signo)
++		  ptid_t ptid, int step_int, enum target_signal signo)
+ {
+   sigset_t prev_mask;
+   struct lwp_info *lp;
+   int resume_many;
++  enum resume_step step = step_int;
+ 
+   if (debug_linux_nat)
+     fprintf_unfiltered (gdb_stdlog,
+ 			"LLR: Preparing to %s %s, %s, inferior_ptid %s\n",
+-			step ? "step" : "resume",
++			(step == RESUME_STEP_NEEDED
++			 ? "needed" : (step ? "step" : "resume")),
+ 			target_pid_to_str (ptid),
+ 			signo ? strsignal (signo) : "0",
+ 			target_pid_to_str (inferior_ptid));
+@@ -2625,10 +2627,34 @@ linux_nat_filter_event (int lwpid, int s
+ 
+       if (num_lwps (GET_PID (lp->ptid)) > 1)
+        {
++	enum resume_step step = lp->step;
++	pid_t pid = GET_PID (lp->ptid);
++
+ 	 /* If there is at least one more LWP, then the exit signal
+ 	    was not the end of the debugged application and should be
+ 	    ignored.  */
+ 	 exit_lwp (lp);
++
++	if (step == RESUME_STEP_USER)
++	  {
++	    /* Now stop the closest LWP's ...  */
++	    lp = find_lwp_pid (pid_to_ptid (pid));
++	    if (!lp)
++	      lp = lwp_list;
++	    gdb_assert (lp != NULL);
++	    errno = 0;
++	    ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0,
++		    (void *) (unsigned long) SIGSTOP);
++	    if (debug_linux_nat)
++	      fprintf_unfiltered (gdb_stdlog,
++				  "PTRACE_CONT %s, 0, 0 (%s)\n",
++				  target_pid_to_str (lp->ptid),
++				  errno ? safe_strerror (errno)
++					: "OK");
++	    /* Avoid the silent `delayed SIGSTOP' handling.  */
++	    lp->signalled = 0;
++	  }
++
+ 	 return NULL;
+        }
+     }

gdb-6.3-inheritancetest-20050726.patch:
 b146835.cc  |   32 ++++++++++++++++++++++++++++++++
 b146835.exp |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 b146835.h   |   36 ++++++++++++++++++++++++++++++++++++
 b146835b.cc |   11 +++++++++++
 4 files changed, 133 insertions(+)

Index: gdb-6.3-inheritancetest-20050726.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-inheritancetest-20050726.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-6.3-inheritancetest-20050726.patch	26 Jul 2005 21:29:05 -0000	1.1
+++ gdb-6.3-inheritancetest-20050726.patch	12 Aug 2009 14:36:09 -0000	1.2
@@ -5,8 +5,10 @@
 	* gdb.cp/b146835b.cc: Ditto.
 	* gdb.cp/b146835.h: Ditto.
 
---- gdb-6.3/gdb/testsuite/gdb.cp/b146835b.cc.fix3	2005-07-26 16:47:12.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835b.cc	2005-07-26 16:53:31.000000000 -0400
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc	2009-08-12 06:07:50.000000000 +0200
 @@ -0,0 +1,11 @@
 +#include "b146835.h"
 +
@@ -19,8 +21,10 @@
 +void A::funcD (class E *e, class D *d) {}
 +void A::funcE (E *e, D *d) {}
 +void A::funcF (unsigned long x, D *d) {}
---- gdb-6.3/gdb/testsuite/gdb.cp/b146835.cc.fix3	2005-07-26 16:47:20.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.cc	2005-07-26 16:46:50.000000000 -0400
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc	2009-08-12 06:07:50.000000000 +0200
 @@ -0,0 +1,32 @@
 +#include "b146835.h"
 +#include <iostream>
@@ -54,9 +58,11 @@
 +   f.foo();
 +}
 +
---- gdb-6.3/gdb/testsuite/gdb.cp/b146835.exp.fix3	2005-07-26 16:47:26.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.exp	2005-07-26 16:46:50.000000000 -0400
-@@ -0,0 +1,55 @@
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp	2009-08-12 06:58:28.000000000 +0200
+@@ -0,0 +1,54 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005 Free Software Foundation, Inc.
@@ -110,10 +116,11 @@
 +gdb_continue_to_breakpoint "First line foo"
 +
 +# Verify that we can access the inherited member d
-+gdb_test "p d" ".*(struct D \*.).*0x0" "Verify inherited member d accessible"
-+
---- gdb-6.3/gdb/testsuite/gdb.cp/b146835.h.fix3	2005-07-26 16:47:36.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.cp/b146835.h	2005-07-26 16:53:18.000000000 -0400
++gdb_test "p d" " = \\(D \\*\\) *0x0" "Verify inherited member d accessible"
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.h	2009-08-12 06:07:50.000000000 +0200
 @@ -0,0 +1,36 @@
 +
 +class A {

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    |   14 +
 solib-svr4.c  |  475 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 solib.c       |   83 ++++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 ++
 symfile.h     |    8 
 target.h      |    2 
 16 files changed, 616 insertions(+), 111 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gdb-6.3-pie-20050110.patch	11 Aug 2009 21:15:12 -0000	1.20
+++ gdb-6.3-pie-20050110.patch	12 Aug 2009 14:36:09 -0000	1.21
@@ -28,8 +28,8 @@
 
 Index: gdb-6.8.50.20090811/gdb/amd64-tdep.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/amd64-tdep.c	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/amd64-tdep.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/amd64-tdep.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/amd64-tdep.c	2009-08-12 06:18:15.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -140,8 +140,8 @@ Index: gdb-6.8.50.20090811/gdb/amd64-tde
  
 Index: gdb-6.8.50.20090811/gdb/auxv.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/auxv.c	2009-07-02 19:25:52.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/auxv.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/auxv.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/auxv.c	2009-08-12 06:18:15.000000000 +0200
 @@ -78,7 +78,7 @@ procfs_xfer_auxv (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  static int
@@ -232,8 +232,8 @@ Index: gdb-6.8.50.20090811/gdb/auxv.c
  
 Index: gdb-6.8.50.20090811/gdb/auxv.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/auxv.h	2009-06-07 21:07:08.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/auxv.h	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/auxv.h	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/auxv.h	2009-08-12 06:18:15.000000000 +0200
 @@ -31,14 +31,14 @@
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
@@ -253,8 +253,8 @@ Index: gdb-6.8.50.20090811/gdb/auxv.h
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
 Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-12 06:18:15.000000000 +0200
 @@ -1653,7 +1653,7 @@ dwarf2_build_psymtabs (struct objfile *o
    dwarf2_read_section (objfile, &dwarf2_per_objfile->eh_frame);
    dwarf2_read_section (objfile, &dwarf2_per_objfile->frame);
@@ -266,8 +266,8 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2rea
      {
 Index: gdb-6.8.50.20090811/gdb/elfread.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/elfread.c	2009-08-11 23:12:31.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/elfread.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/elfread.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/elfread.c	2009-08-12 06:18:15.000000000 +0200
 @@ -681,7 +681,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
@@ -279,8 +279,8 @@ Index: gdb-6.8.50.20090811/gdb/elfread.c
        mainline = 0;
 Index: gdb-6.8.50.20090811/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/infrun.c	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/infrun.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/infrun.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/infrun.c	2009-08-12 06:18:15.000000000 +0200
 @@ -3531,6 +3531,10 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
@@ -294,8 +294,8 @@ Index: gdb-6.8.50.20090811/gdb/infrun.c
  	     and place breakpoints in initializer routines for
 Index: gdb-6.8.50.20090811/gdb/objfiles.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/objfiles.c	2009-08-11 23:12:31.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/objfiles.c	2009-08-11 23:12:51.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/objfiles.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/objfiles.c	2009-08-12 06:18:15.000000000 +0200
 @@ -51,6 +51,9 @@
  #include "arch-utils.h"
  #include "exec.h"
@@ -336,8 +336,8 @@ Index: gdb-6.8.50.20090811/gdb/objfiles.
       linkage unit, gdb used to do these things whenever the monolithic
 Index: gdb-6.8.50.20090811/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/solib-svr4.c	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/solib-svr4.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/solib-svr4.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/solib-svr4.c	2009-08-12 06:36:58.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "exec.h"
  #include "auxv.h"
@@ -905,16 +905,17 @@ Index: gdb-6.8.50.20090811/gdb/solib-svr
  	  xfree (interp_name);
  	  return 1;
  	}
-@@ -1753,6 +2022,8 @@ svr4_solib_create_inferior_hook (void)
+@@ -1753,6 +2022,9 @@ svr4_solib_create_inferior_hook (void)
    while (tp->stop_signal != TARGET_SIGNAL_TRAP);
    inf->stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
 +
-+  disable_breakpoints_before_startup ();
++  if (bfd_get_start_address (exec_bfd) != entry_point_address ())
++    disable_breakpoints_before_startup ();
  }
  
  static void
-@@ -1929,6 +2200,76 @@ svr4_lp64_fetch_link_map_offsets (void)
+@@ -1929,6 +2201,76 @@ svr4_lp64_fetch_link_map_offsets (void)
  
    return lmp;
  }
@@ -991,7 +992,7 @@ Index: gdb-6.8.50.20090811/gdb/solib-svr
  

  
  struct target_so_ops svr4_so_ops;
-@@ -1969,4 +2310,7 @@ _initialize_svr4_solib (void)
+@@ -1969,4 +2311,7 @@ _initialize_svr4_solib (void)
    svr4_so_ops.same = svr4_same;
  
    observer_attach_inferior_exit (solib_svr4_inferior_exit);
@@ -1001,8 +1002,8 @@ Index: gdb-6.8.50.20090811/gdb/solib-svr
  }
 Index: gdb-6.8.50.20090811/gdb/solib.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/solib.c	2009-08-11 23:12:31.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/solib.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/solib.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/solib.c	2009-08-12 06:18:15.000000000 +0200
 @@ -81,6 +81,8 @@ set_solib_ops (struct gdbarch *gdbarch, 
  
  /* external data declarations */
@@ -1141,8 +1142,8 @@ Index: gdb-6.8.50.20090811/gdb/solib.c
  }
 Index: gdb-6.8.50.20090811/gdb/solist.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/solist.h	2009-08-11 23:12:31.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/solist.h	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/solist.h	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/solist.h	2009-08-12 06:18:15.000000000 +0200
 @@ -61,6 +61,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -1165,8 +1166,8 @@ Index: gdb-6.8.50.20090811/gdb/solist.h
  #endif
 Index: gdb-6.8.50.20090811/gdb/symfile-mem.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/symfile-mem.c	2009-08-11 23:12:31.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/symfile-mem.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/symfile-mem.c	2009-08-12 06:13:20.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile-mem.c	2009-08-12 06:18:15.000000000 +0200
 @@ -115,7 +115,7 @@ symbol_file_add_from_memory (struct bfd 
  	++i;
        }
@@ -1178,8 +1179,8 @@ Index: gdb-6.8.50.20090811/gdb/symfile-m
    /* This might change our ideas about frames already looked at.  */
 Index: gdb-6.8.50.20090811/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/symfile.c	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/symfile.c	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/symfile.c	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile.c	2009-08-12 06:18:15.000000000 +0200
 @@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
@@ -1270,8 +1271,8 @@ Index: gdb-6.8.50.20090811/gdb/symfile.c
  	         again now.  */
 Index: gdb-6.8.50.20090811/gdb/target.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/target.h	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/target.h	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/target.h	2009-08-12 06:18:03.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/target.h	2009-08-12 06:18:15.000000000 +0200
 @@ -524,7 +524,7 @@ struct target_ops
         Return -1 if there is insufficient buffer for a whole entry.
         Return 1 if an entry was read into *TYPEP and *VALP.  */
@@ -1283,8 +1284,8 @@ Index: gdb-6.8.50.20090811/gdb/target.h
         sequence of bytes in PATTERN with length PATTERN_LEN.
 Index: gdb-6.8.50.20090811/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/symfile.h	2009-08-11 23:12:32.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/symfile.h	2009-08-11 23:12:34.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/symfile.h	2009-08-12 06:13:20.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile.h	2009-08-12 06:18:15.000000000 +0200
 @@ -229,7 +229,13 @@ enum symfile_add_flags
      SYMFILE_MAINLINE = 1 << 2,
  
@@ -1300,3 +1301,29 @@ Index: gdb-6.8.50.20090811/gdb/symfile.h
    };
  
  extern void syms_from_objfile (struct objfile *,
+Index: gdb-6.8.50.20090811/gdb/infcmd.c
+===================================================================
+--- gdb-6.8.50.20090811.orig/gdb/infcmd.c	2009-08-12 06:09:14.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/infcmd.c	2009-08-12 06:47:58.000000000 +0200
+@@ -2276,6 +2276,9 @@ attach_command_post_wait (char *args, in
+ 
+   post_create_inferior (&current_target, from_tty);
+ 
++  /* Undo the disable from post_create_inferior.  */
++  enable_breakpoints_after_startup ();
++
+   /* Install inferior's terminal modes.  */
+   target_terminal_inferior ();
+ 
+Index: gdb-6.8.50.20090811/gdb/linux-tdep.c
+===================================================================
+--- gdb-6.8.50.20090811.orig/gdb/linux-tdep.c	2009-08-04 22:41:13.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/linux-tdep.c	2009-08-12 06:43:27.000000000 +0200
+@@ -163,5 +163,7 @@ in this session.\n"));
+ void
+ _initialize_linux_tdep (void)
+ {
++#if 0 /* gdb-6.3-pie-20050110.patch */
+   observer_attach_executable_changed (check_is_pie_binary);
++#endif
+ }

gdb-6.6-scheduler_locking-step-is-default.patch:
 infrun.c                         |    2 +-
 testsuite/gdb.mi/mi-cli.exp      |    2 +-
 testsuite/gdb.mi/mi-console.exp  |    3 +++
 testsuite/gdb.mi/mi2-console.exp |    3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

Index: gdb-6.6-scheduler_locking-step-is-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-scheduler_locking-step-is-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdb-6.6-scheduler_locking-step-is-default.patch	14 Dec 2008 14:05:16 -0000	1.2
+++ gdb-6.6-scheduler_locking-step-is-default.patch	12 Aug 2009 14:36:09 -0000	1.3
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20081128/gdb/infrun.c
+Index: gdb-6.8.50.20090811/gdb/infrun.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/infrun.c	2008-12-09 15:56:16.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/infrun.c	2008-12-09 15:56:59.000000000 +0100
-@@ -931,7 +931,7 @@ static const char *scheduler_enums[] = {
+--- gdb-6.8.50.20090811.orig/gdb/infrun.c	2009-08-12 06:56:29.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/infrun.c	2009-08-12 07:13:08.000000000 +0200
+@@ -1075,7 +1075,7 @@ static const char *scheduler_enums[] = {
    schedlock_step,
    NULL
  };
@@ -11,10 +11,10 @@ Index: gdb-6.8.50.20081128/gdb/infrun.c
  static void
  show_scheduler_mode (struct ui_file *file, int from_tty,
  		     struct cmd_list_element *c, const char *value)
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.mi/mi-console.exp
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.mi/mi-console.exp
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.mi/mi-console.exp	2008-08-06 14:52:08.000000000 +0200
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.mi/mi-console.exp	2008-12-09 15:59:34.000000000 +0100
+--- gdb-6.8.50.20090811.orig/gdb/testsuite/gdb.mi/mi-console.exp	2009-08-12 06:56:29.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.mi/mi-console.exp	2009-08-12 06:58:45.000000000 +0200
 @@ -47,6 +47,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/
  
  mi_run_to_main
@@ -25,10 +25,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
  # Next over the hello() call which will produce lots of output
  mi_gdb_test "220-exec-next" \
  	    "220\\^running(\r\n\\*running,thread-id=\"all\")?" \
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.mi/mi2-console.exp
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.mi/mi2-console.exp
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.mi/mi2-console.exp	2008-08-06 14:52:08.000000000 +0200
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.mi/mi2-console.exp	2008-12-09 16:00:33.000000000 +0100
+--- gdb-6.8.50.20090811.orig/gdb/testsuite/gdb.mi/mi2-console.exp	2009-08-12 06:56:29.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.mi/mi2-console.exp	2009-08-12 06:58:45.000000000 +0200
 @@ -47,6 +47,9 @@ if  { [gdb_compile "${srcdir}/${subdir}/
  
  mi_run_to_main
@@ -39,3 +39,16 @@ Index: gdb-6.8.50.20081128/gdb/testsuite
  # Next over the hello() call which will produce lots of output
  send_gdb "220-exec-next\n"
  gdb_expect {
+Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.mi/mi-cli.exp
+===================================================================
+--- gdb-6.8.50.20090811.orig/gdb/testsuite/gdb.mi/mi-cli.exp	2009-06-09 19:12:42.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/testsuite/gdb.mi/mi-cli.exp	2009-08-12 07:13:32.000000000 +0200
+@@ -173,7 +173,7 @@ mi_execute_to "exec-continue" "breakpoin
+ # Test that the token is output even for CLI commands
+ # Also test that *stopped includes frame information.
+ mi_gdb_test "34 next" \
+-    ".*34\\\^running.*\\*running,thread-id=\"all\"" \
++    ".*34\\\^running.*\\*running,thread-id=\"1\"" \
+     "34 next: run"
+ 
+ if {!$async} {


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- gdb.spec	11 Aug 2009 21:15:13 -0000	1.373
+++ gdb.spec	12 Aug 2009 14:36:09 -0000	1.374
@@ -14,7 +14,7 @@ Version: 6.8.50.20090811
 
 # 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
@@ -109,6 +109,7 @@ Patch136: gdb-6.3-test-movedir-20050125.
 Patch140: gdb-6.3-gcore-thread-20050204.patch
 
 # Stop while intentionally stepping and the thread exit is met.
+Patch141: gdb-6.6-step-thread-exit.patch
 Patch259: gdb-6.3-step-thread-exit-20050211-test.patch
 
 # Prevent gdb from being pushed into background
@@ -465,6 +466,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch133 -p1
 %patch136 -p1
 %patch140 -p1
+%patch141 -p1
 %patch259 -p1
 %patch142 -p1
 %patch145 -p1
@@ -825,6 +827,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 12 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-4
+- Fix minor regressions introduced by the rebase from F-11 (6.8.50.20090302).
+
 * Tue Aug 11 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-3
 - archer-jankratochvil-fedora12 commit: 2888fafe63889757c6fd27ccc2f25661d43fd1a4
 - Drop archer-jankratochvil-vla VAROBJ invalidate/revalidate split to fix



From mclasen at fedoraproject.org  Wed Aug 12 14:44:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 14:44:57 +0000 (UTC)
Subject: rpms/intltool/devel intltool.spec,1.58,1.59
Message-ID: <20090812144457.18BF211C01EA@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/intltool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7250

Modified Files:
	intltool.spec 
Log Message:
Fix file list



Index: intltool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- intltool.spec	12 Aug 2009 14:30:36 -0000	1.58
+++ intltool.spec	12 Aug 2009 14:44:56 -0000	1.59
@@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING README
 %{_bindir}/*
 %{_datadir}/intltool
 %{_datadir}/aclocal/*



From slankes at fedoraproject.org  Wed Aug 12 14:52:29 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed, 12 Aug 2009 14:52:29 +0000 (UTC)
Subject: rpms/merkaartor/devel .cvsignore, 1.8, 1.9 merkaartor.spec, 1.14,
	1.15 sources, 1.8, 1.9 merkaartor-noqgtkstyle.patch, 1.2, NONE
Message-ID: <20090812145229.B99DF11C01EA@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8371

Modified Files:
	.cvsignore merkaartor.spec sources 
Removed Files:
	merkaartor-noqgtkstyle.patch 
Log Message:
* Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
- 0.14
- Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Jul 2009 20:41:51 -0000	1.8
+++ .cvsignore	12 Aug 2009 14:52:29 -0000	1.9
@@ -1 +1 @@
-merkaartor-0.14-pre2.tar.bz2
+merkaartor-0.14.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- merkaartor.spec	25 Jul 2009 12:03:58 -0000	1.14
+++ merkaartor.spec	12 Aug 2009 14:52:29 -0000	1.15
@@ -1,13 +1,12 @@
 Name:           merkaartor
 Version:        0.14
-Release:        0.2.pre2%{?dist}
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}-pre2.tar.bz2
-Patch0:         merkaartor-noqgtkstyle.patch
+Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -23,8 +22,8 @@ It has some unique features like anti-al
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q -n merkaartor-0.14-pre2 
-%patch0 -p0
+%setup -q -n merkaartor-0.14 
+find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
 lrelease-qt4 src/src.pro
@@ -59,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
+- 0.14
+- Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-0.2.pre2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Jul 2009 20:41:51 -0000	1.8
+++ sources	12 Aug 2009 14:52:29 -0000	1.9
@@ -1 +1 @@
-c814d97a0b9d7b1a96e40d31dbe77242  merkaartor-0.14-pre2.tar.bz2
+61e01855f4fc99d0cb5bf1696534f5a0  merkaartor-0.14.tar.bz2


--- merkaartor-noqgtkstyle.patch DELETED ---



From twaugh at fedoraproject.org  Wed Aug 12 15:01:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 12 Aug 2009 15:01:03 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.214,1.215
Message-ID: <20090812150103.AAA6D11C01EA@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9309

Modified Files:
	hplip.spec 
Log Message:
* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-3
- The python-reportlab dependency was in the wrong sub-package.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- hplip.spec	6 Aug 2009 13:01:55 -0000	1.214
+++ hplip.spec	12 Aug 2009 15:01:03 -0000	1.215
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -58,6 +58,7 @@ Group: Applications/System
 License: BSD
 Requires: PyQt
 Requires: PyQt4
+Requires: python-reportlab
 Requires(post): desktop-file-utils >= 0.2.92
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
@@ -71,7 +72,6 @@ Group: Applications/Publishing
 License: BSD
 Epoch: %{hpijs_epoch}
 Requires: %{name}-libs = %{version}-%{release}
-Requires: python-reportlab
 Requires: net-snmp
 Requires: cupsddk-drivers
 
@@ -310,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-3
+- The python-reportlab dependency was in the wrong sub-package.
+
 * Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-2
 - Removed access_control.grant_group line from HAL fdi file.
 



From overholt at fedoraproject.org  Wed Aug 12 15:03:11 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 12 Aug 2009 15:03:11 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.130,1.131
Message-ID: <20090812150311.40F0D11C01EA@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9593/devel

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-8
- Remove shipping of content.xml.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- eclipse-cdt.spec	29 Jul 2009 22:24:08 -0000	1.130
+++ eclipse-cdt.spec	12 Aug 2009 15:03:10 -0000	1.131
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -395,7 +395,6 @@ org.eclipse.equinox.p2.metadata.generato
 -vmargs \
 -Duser.home=$homedir
 
-mv repo/content.xml .
 rm -rf repo
 popd
 
@@ -418,7 +417,6 @@ org.eclipse.equinox.p2.metadata.generato
 -vmargs \
 -Duser.home=$homedir
 
-mv repo/content.xml .
 rm -rf repo
 popd
 
@@ -441,7 +439,6 @@ org.eclipse.equinox.p2.metadata.generato
 -vmargs \
 -Duser.home=$homedir
 
-mv repo/content.xml .
 rm -rf repo
 popd
 
@@ -510,6 +507,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-8
+- Remove shipping of content.xml.
+
 * Wed Jul 29 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-7
 - Resolves #514629
 



From pkgdb at fedoraproject.org  Wed Aug 12 15:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:06:47 +0000
Subject: [pkgdb] eclipse-cdt: akurtakov has requested watchcommits
Message-ID: <20090812150648.10B9110F80A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on eclipse-cdt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From pkgdb at fedoraproject.org  Wed Aug 12 15:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:06:48 +0000
Subject: [pkgdb] eclipse-cdt: akurtakov has requested watchbugzilla
Message-ID: <20090812150648.D164F10F881@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on eclipse-cdt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From pkgdb at fedoraproject.org  Wed Aug 12 15:06:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:06:50 +0000
Subject: [pkgdb] eclipse-cdt: akurtakov has requested commit
Message-ID: <20090812150651.BA8B310F899@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on eclipse-cdt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From linville at fedoraproject.org  Wed Aug 12 15:26:51 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 12 Aug 2009 15:26:51 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-iwlwifi_-fix-TX-queue-race.patch, NONE, 
	1.1 kernel.spec, 1.1700, 1.1701
Message-ID: <20090812152651.E6A1611C01EA@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13433

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwlwifi_-fix-TX-queue-race.patch 
Log Message:
iwlwifi: fix TX queue race

linux-2.6-iwlwifi_-fix-TX-queue-race.patch:
 iwl-tx.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-iwlwifi_-fix-TX-queue-race.patch ---
commit 3995bd9332a51b626237d6671cfeb7235e6c1305
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Fri Jul 24 11:13:14 2009 -0700

    iwlwifi: fix TX queue race
    
    I had a problem on 4965 hardware (well, probably other hardware too,
    but others don't survive my stress testing right now, unfortunately)
    where the driver was sending invalid commands to the device, but no
    such thing could be seen from the driver's point of view. I could
    reproduce this fairly easily by sending multiple TCP streams with
    iperf on different TIDs, though sometimes a single iperf stream was
    sufficient. It even happened with a single core, but I have forced
    preemption turned on.
    
    The culprit was a queue overrun, where we advanced the queue's write
    pointer over the read pointer. After careful analysis I've come to
    the conclusion that the cause is a race condition between iwlwifi
    and mac80211.
    
    mac80211, of course, checks whether the queue is stopped, before
    transmitting a frame. This effectively looks like this:
    
            lock(queues)
            if (stopped(queue)) {
                    unlock(queues)
                    return busy;
    	}
            unlock(queues)
            ...             <-- this place will be important
    			    there is some more code here
            drv_tx(frame)
    
    The driver, on the other hand, can stop and start queues, which does
    
            lock(queues)
            mark_running/stopped(queue)
            unlock(queues)
    
    	[if marked running: wake up tasklet to send pending frames]
    
    Now, however, once the driver starts the queue, mac80211 can see that
    and end up at the marked place above, at which point for some reason the
    driver seems to stop the queue again (I don't understand that) and then
    we end up transmitting while the queue is actually full.
    
    Now, this shouldn't actually matter much, but for some reason I've seen
    it happen multiple times in a row and the queue actually overflows, at
    which point the queue bites itself in the tail and things go completely
    wrong.
    
    This patch fixes this by just dropping the packet should this have
    happened, and making the lock in iwlwifi cover everything so iwlwifi
    can't race against itself (dropping the lock there might make it more
    likely, but it did seem to happen without that too).
    
    Since we can't hold the lock across drv_tx() above, I see no way to fix
    this in mac80211, but I also don't understand why I haven't seen this
    before -- maybe I just never stress tested it this badly.
    
    With this patch, the device has survived many minutes of simultanously
    sending two iperf streams on different TIDs with combined throughput
    of about 60 Mbps.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 9bbeec9..5febb31 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -720,8 +720,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 		goto drop_unlock;
 	}
 
-	spin_unlock_irqrestore(&priv->lock, flags);
-
 	hdr_len = ieee80211_hdrlen(fc);
 
 	/* Find (or create) index into station table for destination station */
@@ -729,7 +727,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 	if (sta_id == IWL_INVALID_STATION) {
 		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 			       hdr->addr1);
-		goto drop;
+		goto drop_unlock;
 	}
 
 	IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
@@ -750,14 +748,17 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 			txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
 			swq_id = iwl_virtual_agg_queue_num(swq_id, txq_id);
 		}
-		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 	}
 
 	txq = &priv->txq[txq_id];
 	q = &txq->q;
 	txq->swq_id = swq_id;
 
-	spin_lock_irqsave(&priv->lock, flags);
+	if (unlikely(iwl_queue_space(q) < q->high_mark))
+		goto drop_unlock;
+
+	if (ieee80211_is_data_qos(fc))
+		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 
 	/* Set up driver data for this TFD */
 	memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
@@ -902,7 +903,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
 drop_unlock:
 	spin_unlock_irqrestore(&priv->lock, flags);
-drop:
 	return -1;
 }
 EXPORT_SYMBOL(iwl_tx_skb);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1700
retrieving revision 1.1701
diff -u -p -r1.1700 -r1.1701
--- kernel.spec	10 Aug 2009 20:49:41 -0000	1.1700
+++ kernel.spec	12 Aug 2009 15:26:50 -0000	1.1701
@@ -642,6 +642,7 @@ Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
+Patch682: linux-2.6-iwlwifi_-fix-TX-queue-race.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -1251,6 +1252,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 
+# iwlwifi: fix TX queue race
+ApplyPatch linux-2.6-iwlwifi_-fix-TX-queue-race.patch
+
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -1875,6 +1879,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 John W. Linville <linville at redhat.com>
+- iwlwifi: fix TX queue race
+
 * Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch



From tsmetana at fedoraproject.org  Wed Aug 12 15:29:54 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Wed, 12 Aug 2009 15:29:54 +0000 (UTC)
Subject: rpms/gnomebaker/devel gnomebaker-0.6.4-mimetype.patch, NONE,
	1.1 gnomebaker.spec, 1.19, 1.20
Message-ID: <20090812152954.0B4A211C01EA@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13867

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.4-mimetype.patch 
Log Message:
* Wed Aug 12 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-4
- fix #506397 - missing MimeType entry in .desktop file


gnomebaker-0.6.4-mimetype.patch:
 gnomebaker.desktop.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnomebaker-0.6.4-mimetype.patch ---
diff -up gnomebaker-0.6.4/gnomebaker.desktop.in.mimetype gnomebaker-0.6.4/gnomebaker.desktop.in
--- gnomebaker-0.6.4/gnomebaker.desktop.in.mimetype	2009-08-12 17:25:03.000000000 +0200
+++ gnomebaker-0.6.4/gnomebaker.desktop.in	2009-08-12 17:25:11.000000000 +0200
@@ -17,4 +17,4 @@ X-MultipleArgs=false
 Type=Application
 Categories=AudioVideo;DiscBurning;
 StartupNotify=true
-
+MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;application/x-brasero;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnomebaker.spec	25 Jul 2009 00:52:00 -0000	1.19
+++ gnomebaker.spec	12 Aug 2009 15:29:53 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -27,6 +27,7 @@ Requires:	gstreamer-plugins-good >= 0.10
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+Patch0: gnomebaker-0.6.4-mimetype.patch
 
 %description
 CD/DVD burner designed for the GNOME desktop.
@@ -34,6 +35,7 @@ CD/DVD burner designed for the GNOME des
 
 %prep
 %setup -q
+%patch0 -p1 -b .mimetype
 chmod 644 AUTHORS TODO
 
 
@@ -84,6 +86,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Aug 12 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-4
+- fix #506397 - missing MimeType entry in .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tsmetana at fedoraproject.org  Wed Aug 12 15:32:43 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Wed, 12 Aug 2009 15:32:43 +0000 (UTC)
Subject: rpms/gnomebaker/devel gnomebaker-0.6.4-mimetype.patch,1.1,1.2
Message-ID: <20090812153243.3AE7211C01EA@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14276

Modified Files:
	gnomebaker-0.6.4-mimetype.patch 
Log Message:
remove the brasero entry from the mime patch

gnomebaker-0.6.4-mimetype.patch:
 gnomebaker.desktop.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: gnomebaker-0.6.4-mimetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker-0.6.4-mimetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnomebaker-0.6.4-mimetype.patch	12 Aug 2009 15:29:53 -0000	1.1
+++ gnomebaker-0.6.4-mimetype.patch	12 Aug 2009 15:32:42 -0000	1.2
@@ -6,4 +6,4 @@ diff -up gnomebaker-0.6.4/gnomebaker.des
  Categories=AudioVideo;DiscBurning;
  StartupNotify=true
 -
-+MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;application/x-brasero;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
++MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;



From bretm at fedoraproject.org  Wed Aug 12 15:42:25 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed, 12 Aug 2009 15:42:25 +0000 (UTC)
Subject: rpms/wordpress-mu/devel wordpress-mu.spec,1.9,1.10
Message-ID: <20090812154225.994A911C01EA@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15914

Modified Files:
	wordpress-mu.spec 
Log Message:
update to 2.8.4a, includes security fixes


Index: wordpress-mu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/devel/wordpress-mu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- wordpress-mu.spec	4 Aug 2009 17:37:06 -0000	1.9
+++ wordpress-mu.spec	12 Aug 2009 15:42:25 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: WordPress-MU multi-user blogging software
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
-Version: 2.8.2
+Version: 2.8.4a
 Release: 1%{?dist}
 Group: Applications/Publishing
 License: GPLv2
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
+* Wed Aug 12 2009 Bret McMillan <bretm at redhat.com> - 2.8.4a-1
+- Update to WordPress MU 2.8.4a; several security fixes included
+
 * Fri Jul 31 2009 Bret McMillan <bretm at redhat.com> - 2.8.2-1
 - Update to WordPress MU 2.8.2
 



From bretm at fedoraproject.org  Wed Aug 12 15:44:58 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed, 12 Aug 2009 15:44:58 +0000 (UTC)
Subject: rpms/wordpress-mu/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090812154458.EC9D511C01EA@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16331

Modified Files:
	.cvsignore sources 
Log Message:
2.8.4a sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Jul 2009 17:53:16 -0000	1.5
+++ .cvsignore	12 Aug 2009 15:44:58 -0000	1.6
@@ -1,2 +1,3 @@
 wordpress-mu-2.7.tar.gz
 wordpress-mu-2.8.2.tar.gz
+wordpress-mu-2.8.4a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Jul 2009 17:53:16 -0000	1.5
+++ sources	12 Aug 2009 15:44:58 -0000	1.6
@@ -1,2 +1,3 @@
 b7d119c663833a3fe00d30224530447e  wordpress-mu-2.7.tar.gz
 5b412d16fdcc590698af565aa50d046c  wordpress-mu-2.8.2.tar.gz
+72dcdfaa60ede87d320b479579028d5e  wordpress-mu-2.8.4a.tar.gz



From tsmetana at fedoraproject.org  Wed Aug 12 15:45:25 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Wed, 12 Aug 2009 15:45:25 +0000 (UTC)
Subject: rpms/gnomebaker/F-11 gnomebaker-0.6.4-mimetype.patch, NONE,
	1.1 gnomebaker.spec, 1.18, 1.19
Message-ID: <20090812154525.ACD2511C01EA@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16484

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.4-mimetype.patch 
Log Message:
* Wed Aug 12 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-3
- fix #506397 - missing MimeType entry in .desktop file


gnomebaker-0.6.4-mimetype.patch:
 gnomebaker.desktop.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnomebaker-0.6.4-mimetype.patch ---
diff -up gnomebaker-0.6.4/gnomebaker.desktop.in.mimetype gnomebaker-0.6.4/gnomebaker.desktop.in
--- gnomebaker-0.6.4/gnomebaker.desktop.in.mimetype	2009-08-12 17:25:03.000000000 +0200
+++ gnomebaker-0.6.4/gnomebaker.desktop.in	2009-08-12 17:25:11.000000000 +0200
@@ -17,4 +17,4 @@ X-MultipleArgs=false
 Type=Application
 Categories=AudioVideo;DiscBurning;
 StartupNotify=true
-
+MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-11/gnomebaker.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gnomebaker.spec	24 Feb 2009 23:44:57 -0000	1.18
+++ gnomebaker.spec	12 Aug 2009 15:45:25 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -27,6 +27,7 @@ Requires:	gstreamer-plugins-good >= 0.10
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+Patch0: gnomebaker-0.6.4-mimetype.patch
 
 %description
 CD/DVD burner designed for the GNOME desktop.
@@ -34,6 +35,7 @@ CD/DVD burner designed for the GNOME des
 
 %prep
 %setup -q
+%patch0 -p1 -b .mimetype
 chmod 644 AUTHORS TODO
 
 
@@ -84,6 +86,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Aug 12 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-3
+- fix #506397 - missing MimeType entry in .desktop file
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:24 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154726.11E5D10F8B2@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on yap (Fedora 9) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:25 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154726.6A17410F8B0@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on yap (Fedora 9) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:27 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154727.DE13210F800@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on yap (Fedora 9) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:35 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154735.7141D10F841@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on yap (Fedora 10) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:36 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154736.26B4210F8B6@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on yap (Fedora 10) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From scop at fedoraproject.org  Wed Aug 12 15:47:38 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 15:47:38 +0000 (UTC)
Subject: rpms/parted/devel .cvsignore, 1.33, 1.34 parted.spec, 1.144,
	1.145 sources, 1.39, 1.40
Message-ID: <20090812154738.7A13D11C01EA@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17597

Modified Files:
	.cvsignore parted.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.0-11
- Use xz compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	10 Jul 2009 13:16:24 -0000	1.33
+++ .cvsignore	12 Aug 2009 15:47:38 -0000	1.34
@@ -1 +1 @@
-parted-1.9.0.tar.gz
+parted-1.9.0.tar.xz


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- parted.spec	12 Aug 2009 11:08:28 -0000	1.144
+++ parted.spec	12 Aug 2009 15:47:38 -0000	1.145
@@ -4,12 +4,12 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
 
-Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Patch1:  %{name}-1.9.0-appletv-support.patch
 Patch2:  %{name}-1.9.0-extended-mbr.patch
 Patch3:  %{name}-1.9.0-noheaders.patch
@@ -131,6 +131,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.0-11
+- Use xz compressed upstream tarball.
+
 * Wed Aug 12 2009 Joel Granados <jgranado at redhat.com> - 1.9.0-10
 - Make install with exclude docs work without an error message.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	23 Jul 2009 21:59:41 -0000	1.39
+++ sources	12 Aug 2009 15:47:38 -0000	1.40
@@ -1 +1 @@
-055305bc7bcf472ce38f9abf69a9d94d  parted-1.9.0.tar.gz
+a9ffa9b69f0b6099b75c32a03bb12f7f  parted-1.9.0.tar.xz



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:39 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154739.81F1710F8BB@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on yap (Fedora 10) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:43 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154743.D3B2510F8C1@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on yap (Fedora 11) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:42 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154742.D0A1110F8BE@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on yap (Fedora 11) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:45 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154745.D243410F8C4@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on yap (Fedora 11) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:53 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154755.1644810F8CD@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on yap (Fedora devel) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:53 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154754.3C6F610F8D9@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on yap (Fedora devel) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From pkgdb at fedoraproject.org  Wed Aug 12 15:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:47:55 +0000
Subject: [pkgdb] yap had acl change status
Message-ID: <20090812154756.C2CBB10F8C9@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on yap (Fedora devel) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yap



From liquidat at fedoraproject.org  Wed Aug 12 15:50:17 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 12 Aug 2009 15:50:17 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.30, 1.31 ktorrent.spec, 1.101,
	1.102 sources, 1.30, 1.31
Message-ID: <20090812155017.EF92111C0489@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to ktorrent 3.2.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	3 Jun 2009 16:22:57 -0000	1.30
+++ .cvsignore	12 Aug 2009 15:50:17 -0000	1.31
@@ -1 +1 @@
-ktorrent-3.2.2.tar.bz2
+ktorrent-3.2.3.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- ktorrent.spec	25 Jul 2009 04:50:35 -0000	1.101
+++ ktorrent.spec	12 Aug 2009 15:50:17 -0000	1.102
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.2
-Release:        4%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
+- ktorrent-3.2.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	3 Jun 2009 16:22:57 -0000	1.30
+++ sources	12 Aug 2009 15:50:17 -0000	1.31
@@ -1 +1 @@
-409fc30dcb0d72fa3a6d3c3719db4199  ktorrent-3.2.2.tar.bz2
+5c65b9e30107b922f025650887e4dee7  ktorrent-3.2.3.tar.bz2



From alikins at fedoraproject.org  Wed Aug 12 15:50:46 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 15:50:46 +0000 (UTC)
Subject: rpms/certmaster/F-11 .cvsignore, 1.6, 1.7 certmaster.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20090812155046.E3A4711C0489@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18291

Modified Files:
	.cvsignore certmaster.spec sources 
Log Message:
certmaster-0.25-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Dec 2008 21:58:46 -0000	1.6
+++ .cvsignore	12 Aug 2009 15:50:46 -0000	1.7
@@ -3,3 +3,4 @@ certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
 certmaster-0.23.tar.gz
 certmaster-0.24.tar.gz
+certmaster-0.25.tar.gz


Index: certmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-11/certmaster.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- certmaster.spec	24 Feb 2009 07:03:40 -0000	1.8
+++ certmaster.spec	12 Aug 2009 15:50:46 -0000	1.9
@@ -16,8 +16,8 @@
 
 Summary: Remote certificate distribution framework
 Name: certmaster
-Version: 0.24 
-Release: 6%{?dist}
+Version: 0.25 
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -62,6 +62,11 @@ certmaster is a easy mechanism for distr
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/sign/post/certmaster-sync
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/remove/post/certmaster-sync
+touch $RPM_BUILD_ROOT/var/log/certmaster/certmaster.log
+touch $RPM_BUILD_ROOT/var/log/certmaster/audit.log
+
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -74,6 +79,7 @@ rm -fr $RPM_BUILD_ROOT
 %{_bindir}/certmaster
 %{_bindir}/certmaster-request
 %{_bindir}/certmaster-ca
+%{_bindir}/certmaster-sync
 /etc/init.d/certmaster
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -83,8 +89,16 @@ rm -fr $RPM_BUILD_ROOT
 %config(noreplace) /etc/logrotate.d/certmaster_rotate
 %dir %{python_sitelib}/certmaster
 %{python_sitelib}/certmaster/*.py*
+
 %dir /var/log/certmaster
-%dir /var/lib/certmaster
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/certmaster.log
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/audit.log
+
+%attr(600,root,root) %dir /var/lib/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/certs
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/csrs
+%dir /var/lib/certmaster/peers
 %dir /var/lib/certmaster/triggers/sign/
 %dir /var/lib/certmaster/triggers/sign/pre
 %dir /var/lib/certmaster/triggers/sign/post
@@ -94,6 +108,8 @@ rm -fr $RPM_BUILD_ROOT
 %dir /var/lib/certmaster/triggers/remove/
 %dir /var/lib/certmaster/triggers/remove/pre
 %dir /var/lib/certmaster/triggers/remove/post
+/var/lib/certmaster/triggers/sign/post/certmaster-sync
+/var/lib/certmaster/triggers/remove/post/certmaster-sync
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 
@@ -115,6 +131,9 @@ else
    done
 fi
 exit 0
+# fix perms on log files
+chmod 600 /var/log/certmaster/certmaster.log
+chmod 600 /var/log/certmaster/audit.log
 
 %preun
 if [ "$1" = 0 ] ; then
@@ -130,8 +149,10 @@ fi
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue May 26 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/lib/certmaster/certmaster* to spec and set perms
+- add /var/log/certmaster/certmaster.log,audit.log to spec
+  and set perms
 
 * Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24.5
 - remove version file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Feb 2009 16:39:43 -0000	1.8
+++ sources	12 Aug 2009 15:50:46 -0000	1.9
@@ -3,3 +3,4 @@ d661004b7eb0c7b43f57f0a510232bd2  certma
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
 884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz
 7b7e2af1adcd19e29ac36cd373b12c7a  certmaster-0.24.tar.gz
+83d6115f2cff4af18e150274602c71c1  certmaster-0.25.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:10 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155110.D16DC10F7C4@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on pl (Fedora devel) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:12 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155112.EE71F10F881@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on pl (Fedora devel) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:11 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155111.B1BA910F848@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on pl (Fedora devel) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:26 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155126.97C1F10F89F@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on pl (Fedora 9) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:27 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155128.D3A0610F842@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on pl (Fedora 9) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:29 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155130.3303510F8B0@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on pl (Fedora 9) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:33 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155134.5C39610F8B4@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on pl (Fedora 10) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:35 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155139.C913110F8BD@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on pl (Fedora 10) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:40 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155142.29EF910F882@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on pl (Fedora 11) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:34 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155139.3930610F8BB@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on pl (Fedora 10) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:40 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155142.0F56D10F8C2@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on pl (Fedora 11) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From pkgdb at fedoraproject.org  Wed Aug 12 15:51:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:51:42 +0000
Subject: [pkgdb] pl had acl change status
Message-ID: <20090812155142.9A11D10F8C6@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on pl (Fedora 11) to Approved for bagnara

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pl



From scop at fedoraproject.org  Wed Aug 12 15:53:25 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 15:53:25 +0000 (UTC)
Subject: rpms/texinfo/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 texinfo.spec, 1.62, 1.63
Message-ID: <20090812155325.8A1ED11C02C6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/texinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18945

Modified Files:
	.cvsignore sources texinfo.spec 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.13a-6
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texinfo/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	20 Nov 2008 10:31:59 -0000	1.14
+++ .cvsignore	12 Aug 2009 15:53:25 -0000	1.15
@@ -1,8 +1,2 @@
-texinfo-4.7.tar.bz2
-texinfo-4.8.tar.bz2
-texinfo-4.9.tar.bz2
-texinfo-4.11.tar.bz2
-texinfo-4.12.tar.gz
-texinfo-4.12.tar.gz.sig
-texinfo-4.13a.tar.gz
-texinfo-4.13a.tar.gz.sig
+texinfo-4.13a.tar.lzma
+texinfo-4.13a.tar.lzma.sig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texinfo/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	20 Nov 2008 10:31:59 -0000	1.14
+++ sources	12 Aug 2009 15:53:25 -0000	1.15
@@ -1,2 +1,2 @@
-71ba711519209b5fb583fed2b3d86fcb  texinfo-4.13a.tar.gz
-db2ca82c831684cd7cef181234017c46  texinfo-4.13a.tar.gz.sig
+20b37e49464bd72df4c6cfba33340f87  texinfo-4.13a.tar.lzma
+40486b49736e745e49281a78728e943a  texinfo-4.13a.tar.lzma.sig


Index: texinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- texinfo.spec	5 Aug 2009 14:17:22 -0000	1.62
+++ texinfo.spec	12 Aug 2009 15:53:25 -0000	1.63
@@ -3,11 +3,11 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
-Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.lzma
 Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.12-zlib.patch
@@ -146,6 +146,9 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.13a-6
+- Use lzma compressed upstream tarball.
+
 * Wed Aug  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-5
 - Fix changelog entry and rebuild
 



From rdieter at fedoraproject.org  Wed Aug 12 15:54:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 12 Aug 2009 15:54:07 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec, 1.80, 1.81 sources, 1.59,
	1.60
Message-ID: <20090812155407.DB07711C043B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19124

Modified Files:
	kde-settings.spec sources 
Log Message:
* Wed Aug 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-3
- kdm/ksplash: use default/air until constantine-themed bits land
- plasma-desktop-appletsrc: constantine slideshow
- pulseaudio: drop hard-coded pa-related phonon bits



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- kde-settings.spec	7 Aug 2009 18:22:52 -0000	1.80
+++ kde-settings.spec	12 Aug 2009 15:54:07 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: 2
+Release: 3
 
 Group:   System Environment/Base
 License: Public Domain
@@ -22,8 +22,8 @@ Requires: pam
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
-# theme for kdm, KSplash, wallpaper
-Requires: leonidas-kde-theme
+# for wallpaper
+Requires: constantine-backgrounds-kde 
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -37,8 +37,7 @@ Obsoletes: kde-config < %{version}-%{rel
 Summary: Configuration files for kdm
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
-# leonidas theme for KDM
-Requires: leonidas-kde-theme
+#Requires: constantine-kdm-theme
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
@@ -56,8 +55,8 @@ Requires: pulseaudio
 Requires: pulseaudio-module-x11
 ## kde3
 Requires: alsa-plugins-pulseaudio
-## kde4
-Requires: xine-lib-pulseaudio
+## kde4, not hard-coded, let phonon-backend deps pull in the right stuff
+#Requires: gstreamer-plugins-pulseaudio
 %description pulseaudio
 %{summary}.
 
@@ -108,7 +107,7 @@ touch --no-create %{_datadir}/kde-settin
 # kdm v3 themes don't work (#444730)
 # this hack assumes %_datadir != %_kde4_datadir
 (grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/leonidas|" \
+ sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/oxygen-air|" \
  %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
 
@@ -151,6 +150,11 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Aug 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-3
+- kdm/ksplash: use default/air until constantine-themed bits land
+- plasma-desktop-appletsrc: constantine slideshow
+- pulseaudio: drop hard-coded pa-related phonon bits
+
 * Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-2
 - add default plasmarc, plasma-desktop-appletrc (#516263)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	7 Aug 2009 18:22:52 -0000	1.59
+++ sources	12 Aug 2009 15:54:07 -0000	1.60
@@ -1 +0,0 @@
-aaec4b24db35726824a330c8092c9335  kde-settings-4.3-2.tar.bz2



From alikins at fedoraproject.org  Wed Aug 12 15:54:23 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 15:54:23 +0000 (UTC)
Subject: rpms/certmaster/F-10 .cvsignore, 1.6, 1.7 certmaster.spec, 1.5,
	1.6 sources, 1.7, 1.8
Message-ID: <20090812155423.9D68B11C00D5@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18922

Modified Files:
	.cvsignore certmaster.spec sources 
Log Message:
certmaster-0.25-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Dec 2008 20:51:33 -0000	1.6
+++ .cvsignore	12 Aug 2009 15:54:23 -0000	1.7
@@ -3,3 +3,4 @@ certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
 certmaster-0.23.tar.gz
 certmaster-0.24.tar.gz
+certmaster-0.25.tar.gz


Index: certmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-10/certmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- certmaster.spec	17 Dec 2008 20:47:59 -0000	1.5
+++ certmaster.spec	12 Aug 2009 15:54:23 -0000	1.6
@@ -1,31 +1,53 @@
 
+
+# We can run on Rhel 3'ish systems, but only if python2.3 is installed 
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
+
+
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 
+
 Summary: Remote certificate distribution framework
 Name: certmaster
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25 
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: https://fedorahosted.org/certmaster
+
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-BuildRequires: python-devel
+%endif
+
+# NOTE: if you 
+BuildRequires: %{python}-devel
 %if %is_suse
 BuildRequires: gettext-devel
 %else
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
+%if 0%{?rhel} >= 5
 BuildRequires: python-setuptools
 %endif
 %endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-Url: https://fedorahosted.org/certmaster
+%endif
+
+
 
 %description
 
@@ -40,18 +62,24 @@ certmaster is a easy mechanism for distr
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/sign/post/certmaster-sync
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/remove/post/certmaster-sync
+touch $RPM_BUILD_ROOT/var/log/certmaster/certmaster.log
+touch $RPM_BUILD_ROOT/var/log/certmaster/audit.log
+
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}"  >= "2.5"
 %{python_sitelib}/certmaster*.egg-info
 %endif
 %{_bindir}/certmaster
 %{_bindir}/certmaster-request
 %{_bindir}/certmaster-ca
+%{_bindir}/certmaster-sync
 /etc/init.d/certmaster
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -61,8 +89,16 @@ rm -fr $RPM_BUILD_ROOT
 %config(noreplace) /etc/logrotate.d/certmaster_rotate
 %dir %{python_sitelib}/certmaster
 %{python_sitelib}/certmaster/*.py*
+
 %dir /var/log/certmaster
-%dir /var/lib/certmaster
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/certmaster.log
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/audit.log
+
+%attr(600,root,root) %dir /var/lib/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/certs
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/csrs
+%dir /var/lib/certmaster/peers
 %dir /var/lib/certmaster/triggers/sign/
 %dir /var/lib/certmaster/triggers/sign/pre
 %dir /var/lib/certmaster/triggers/sign/post
@@ -72,6 +108,8 @@ rm -fr $RPM_BUILD_ROOT
 %dir /var/lib/certmaster/triggers/remove/
 %dir /var/lib/certmaster/triggers/remove/pre
 %dir /var/lib/certmaster/triggers/remove/post
+/var/lib/certmaster/triggers/sign/post/certmaster-sync
+/var/lib/certmaster/triggers/remove/post/certmaster-sync
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 
@@ -93,6 +131,9 @@ else
    done
 fi
 exit 0
+# fix perms on log files
+chmod 600 /var/log/certmaster/certmaster.log
+chmod 600 /var/log/certmaster/audit.log
 
 %preun
 if [ "$1" = 0 ] ; then
@@ -108,6 +149,27 @@ fi
 
 
 %changelog
+* Tue May 26 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/lib/certmaster/certmaster* to spec and set perms
+- add /var/log/certmaster/certmaster.log,audit.log to spec
+  and set perms
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24.5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+  do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3x1
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
 * Mon Dec 12 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
 - add missing dirs as per bz#473633
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Dec 2008 20:51:33 -0000	1.7
+++ sources	12 Aug 2009 15:54:23 -0000	1.8
@@ -3,3 +3,4 @@ d661004b7eb0c7b43f57f0a510232bd2  certma
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
 884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz
 8a21725c88947133c2cc04b1fd21305e  certmaster-0.24.tar.gz
+83d6115f2cff4af18e150274602c71c1  certmaster-0.25.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 12 15:56:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:56:08 +0000
Subject: [pkgdb] eclipse-cdt had acl change status
Message-ID: <20090812155608.AB36210F848@bastion2.fedora.phx.redhat.com>

jjohnstn has set the watchbugzilla acl on eclipse-cdt (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From pkgdb at fedoraproject.org  Wed Aug 12 15:56:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:56:10 +0000
Subject: [pkgdb] eclipse-cdt had acl change status
Message-ID: <20090812155611.5BFFB10F890@bastion2.fedora.phx.redhat.com>

jjohnstn has set the watchcommits acl on eclipse-cdt (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From pkgdb at fedoraproject.org  Wed Aug 12 15:56:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 15:56:12 +0000
Subject: [pkgdb] eclipse-cdt had acl change status
Message-ID: <20090812155613.85D8210F841@bastion2.fedora.phx.redhat.com>

jjohnstn has set the commit acl on eclipse-cdt (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-cdt



From rdieter at fedoraproject.org  Wed Aug 12 15:56:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 12 Aug 2009 15:56:34 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore,1.58,1.59 sources,1.60,1.61
Message-ID: <20090812155634.4872011C00D5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19662

Modified Files:
	.cvsignore sources 
Log Message:
import sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	7 Aug 2009 18:22:52 -0000	1.58
+++ .cvsignore	12 Aug 2009 15:56:34 -0000	1.59
@@ -1 +1 @@
-kde-settings-4.3-2.tar.bz2
+kde-settings-4.3-3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	12 Aug 2009 15:54:07 -0000	1.60
+++ sources	12 Aug 2009 15:56:34 -0000	1.61
@@ -0,0 +1 @@
+a562632cf4f56e3e7992fafc421450d5  kde-settings-4.3-3.tar.bz2



From bretm at fedoraproject.org  Wed Aug 12 15:57:07 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed, 12 Aug 2009 15:57:07 +0000 (UTC)
Subject: rpms/wordpress-mu/EL-5 wordpress-mu.spec,1.9,1.10
Message-ID: <20090812155707.511FF11C00D5@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19885

Modified Files:
	wordpress-mu.spec 
Log Message:
update to 2.8.4a, includes security fixes


Index: wordpress-mu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/EL-5/wordpress-mu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- wordpress-mu.spec	30 Jul 2009 16:40:58 -0000	1.9
+++ wordpress-mu.spec	12 Aug 2009 15:57:07 -0000	1.10
@@ -1,15 +1,13 @@
 Summary: WordPress-MU multi-user blogging software
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
-Version: 2.7
-Release: 8%{?dist}
+Version: 2.8.4a
+Release: 1%{?dist}
 Group: Applications/Publishing
 License: GPLv2
 Source0: %{name}-%{version}.tar.gz
 Source1: wordpress-mu-httpd-conf
 Source2: README.fedora.wordpress-mu
-Patch0: cve-2009-2334.patch
-Patch1: 2.8.2-commentor-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
@@ -20,8 +18,6 @@ one instance to serve multiple users.
 
 %prep
 %setup -q -n wordpress-mu
-%patch0 -p1 -b .patch1
-%patch1 -p1 -b .patch2
 
 # disable-wordpress-core-update, updates are always installed via rpm
 #
@@ -92,6 +88,7 @@ rm -rf %{buildroot}
 %{_datadir}/wordpress-mu/wp-mail.php
 %{_datadir}/wordpress-mu/wp-pass.php
 %{_datadir}/wordpress-mu/wp-rdf.php
+%{_datadir}/wordpress-mu/wp-register.php
 %{_datadir}/wordpress-mu/wp-rss.php
 %{_datadir}/wordpress-mu/wp-rss2.php
 %{_datadir}/wordpress-mu/wp-settings.php
@@ -102,7 +99,10 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
-* Thu Jul 30 2009 Bret McMillan <bretm at koom> - 2.7-8
+* Wed Aug 12 2009 Bret McMillan <bretm at redhat.com> - 2.8.4a-1
+- Update to version 2.8.4a for security fixes
+
+* Thu Jul 30 2009 Bret McMillan <bretm at redhat.com> - 2.7-8
 - fix backported for 2.8.2 comment author XSS vulnerability
 
 * Fri Jul 10 2009 Bret McMillan <bretm at redhat.com> - 2.7-6



From bretm at fedoraproject.org  Wed Aug 12 15:57:48 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed, 12 Aug 2009 15:57:48 +0000 (UTC)
Subject: rpms/wordpress-mu/EL-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090812155748.3D08611C00D5@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20138

Modified Files:
	.cvsignore sources 
Log Message:
update to 2.8.4a sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Feb 2009 19:30:57 -0000	1.4
+++ .cvsignore	12 Aug 2009 15:57:48 -0000	1.5
@@ -1 +1,2 @@
 wordpress-mu-2.7.tar.gz
+wordpress-mu-2.8.4a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Feb 2009 19:30:57 -0000	1.4
+++ sources	12 Aug 2009 15:57:48 -0000	1.5
@@ -1 +1,2 @@
 b7d119c663833a3fe00d30224530447e  wordpress-mu-2.7.tar.gz
+72dcdfaa60ede87d320b479579028d5e  wordpress-mu-2.8.4a.tar.gz



From scop at fedoraproject.org  Wed Aug 12 15:57:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 15:57:36 +0000 (UTC)
Subject: rpms/subversion/devel subversion-1.6.4.tar.bz2.asc, NONE,
	1.1 .cvsignore, 1.34, 1.35 sources, 1.41, 1.42 subversion.spec,
	1.148, 1.149 upstream, 1.27, 1.28
Message-ID: <20090812155736.2938111C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20015

Modified Files:
	.cvsignore sources subversion.spec upstream 
Added Files:
	subversion-1.6.4.tar.bz2.asc 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.4-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



--- NEW FILE subversion-1.6.4.tar.bz2.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp3xLQACgkQCwOubk4kUXxp8wCdEk4skjDqre08fEuF/bc+n05d
WQIAoNzA2nVuza0td20YjDqXbX2lW7GG
=BEAB
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4nzUACgkQ5dMCc/WdJfBwZACgpAcORwz5rnbUpMacRRNZ7cNw
v98AoPBo/9ULXBt4dPn021pjsLxgyUw3
=FLdA
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4k/kACgkQokEGqRcG/W5gdACguMlg/4QUAAsh811ffgM6upmt
qA0AoLd1R8UXEqnozKjGPuzljtEDBolg
=HVCk
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp5RxAACgkQ9o1G+2zNQDhMiwCgh8xaAhXxyp6/YHf2onxWEiXb
hR8AmgKuMuBS+R8XDZaoLDx+i0o+XCHX
=57CQ
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)

iEYEABECAAYFAkp7AzwACgkQ/P1jBZgh97LPSACfV0Q1NEW7uilPCGyED7n3urqU
VPIAnjJVMYpb6aG10C9ymDj0LiucKOi9
=jGlb
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	7 Aug 2009 07:39:56 -0000	1.34
+++ .cvsignore	12 Aug 2009 15:57:35 -0000	1.35
@@ -1 +1 @@
-subversion-1.6.4.tar.gz
+subversion-1.6.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	7 Aug 2009 07:39:56 -0000	1.41
+++ sources	12 Aug 2009 15:57:35 -0000	1.42
@@ -1 +1 @@
-9649be6c47b7d915dce75a1198900c25  subversion-1.6.4.tar.gz
+11e3fa838c9a558cadc378f2807572e2  subversion-1.6.4.tar.bz2


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- subversion.spec	7 Aug 2009 07:39:56 -0000	1.148
+++ subversion.spec	12 Aug 2009 15:57:35 -0000	1.149
@@ -15,11 +15,11 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
-Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz
+Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
@@ -325,6 +325,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.4-3
+- Use bzipped upstream tarball.
+
 * Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
 - update to 1.6.4
 


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/upstream,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- upstream	7 Aug 2009 07:39:56 -0000	1.27
+++ upstream	12 Aug 2009 15:57:36 -0000	1.28
@@ -1 +1 @@
-subversion-1.6.4.tar.gz
+subversion-1.6.4.tar.bz2



From ajax at fedoraproject.org  Wed Aug 12 15:58:26 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 12 Aug 2009 15:58:26 +0000 (UTC)
Subject: rpms/kernel/devel drm-intel-next.patch, 1.8, 1.9 kernel.spec, 1.1712,
	1.1713
Message-ID: <20090812155826.3CA7511C00D5@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20330

Modified Files:
	drm-intel-next.patch kernel.spec 
Log Message:
* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com>
- Update drm-intel-next patch


drm-intel-next.patch:
 i915_dma.c         |   15 -
 i915_drv.h         |    4 
 i915_gem.c         |    4 
 i915_gem_debugfs.c |    2 
 i915_irq.c         |  235 +++++++++++-----
 i915_reg.h         |   45 +++
 i915_suspend.c     |    2 
 intel_bios.c       |   40 ++
 intel_bios.h       |   45 +++
 intel_crt.c        |   12 
 intel_display.c    |  759 +++++++++++++++++++++++++++++++++++------------------
 intel_dp.c         |  216 +++++++++++++--
 intel_drv.h        |    3 
 intel_hdmi.c       |   64 ----
 intel_lvds.c       |   12 
 intel_sdvo.c       |  254 ++++++++++++-----
 intel_tv.c         |   22 +
 17 files changed, 1221 insertions(+), 513 deletions(-)

Index: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- drm-intel-next.patch	3 Aug 2009 18:24:04 -0000	1.8
+++ drm-intel-next.patch	12 Aug 2009 15:58:25 -0000	1.9
@@ -1,5 +1,59 @@
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 8c47831..50d1f78 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1186,6 +1186,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 	if (ret)
+ 		goto out_iomapfree;
+ 
++	dev_priv->wq = create_workqueue("i915");
++	if (dev_priv->wq == NULL) {
++		DRM_ERROR("Failed to create our workqueue.\n");
++		ret = -ENOMEM;
++		goto out_iomapfree;
++	}
++
+ 	/* enable GEM by default */
+ 	dev_priv->has_gem = 1;
+ 
+@@ -1211,7 +1218,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 	if (!I915_NEED_GFX_HWS(dev)) {
+ 		ret = i915_init_phys_hws(dev);
+ 		if (ret != 0)
+-			goto out_iomapfree;
++			goto out_workqueue_free;
+ 	}
+ 
+ 	i915_get_mem_freq(dev);
+@@ -1245,7 +1252,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 		ret = i915_load_modeset_init(dev, prealloc_size, agp_size);
+ 		if (ret < 0) {
+ 			DRM_ERROR("failed to init modeset\n");
+-			goto out_rmmap;
++			goto out_workqueue_free;
+ 		}
+ 	}
+ 
+@@ -1256,6 +1263,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 
+ 	return 0;
+ 
++out_workqueue_free:
++	destroy_workqueue(dev_priv->wq);
+ out_iomapfree:
+ 	io_mapping_free(dev_priv->mm.gtt_mapping);
+ out_rmmap:
+@@ -1269,6 +1278,8 @@ int i915_driver_unload(struct drm_device *dev)
+ {
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
+ 
++	destroy_workqueue(dev_priv->wq);
++
+ 	io_mapping_free(dev_priv->mm.gtt_mapping);
+ 	if (dev_priv->mm.gtt_mtrr >= 0) {
+ 		mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d087528..5f3a259 100644
+index d087528..7537f57 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -219,6 +219,7 @@ typedef struct drm_i915_private {
@@ -10,15 +64,16 @@ index d087528..5f3a259 100644
  	int lvds_ssc_freq;
  
  	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
-@@ -229,6 +230,7 @@ typedef struct drm_i915_private {
+@@ -229,6 +230,8 @@ typedef struct drm_i915_private {
  
  	spinlock_t error_lock;
  	struct drm_i915_error_state *first_error;
 +	struct work_struct error_work;
++	struct workqueue_struct *wq;
  
  	/* Register state */
  	u8 saveLBB;
-@@ -888,6 +890,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -888,6 +891,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  						      IS_I915GM(dev)))
  #define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
  #define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
@@ -26,6 +81,28 @@ index d087528..5f3a259 100644
  #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev))
  /* dsparb controlled by hw only */
  #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index 5bf4203..140bee1 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -1570,7 +1570,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
+ 	}
+ 
+ 	if (was_empty && !dev_priv->mm.suspended)
+-		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
++		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
+ 	return seqno;
+ }
+ 
+@@ -1719,7 +1719,7 @@ i915_gem_retire_work_handler(struct work_struct *work)
+ 	i915_gem_retire_requests(dev);
+ 	if (!dev_priv->mm.suspended &&
+ 	    !list_empty(&dev_priv->mm.request_list))
+-		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
++		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
+ 	mutex_unlock(&dev->struct_mutex);
+ }
+ 
 diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
 index 9a44bfc..cb3b974 100644
 --- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
@@ -40,7 +117,7 @@ index 9a44bfc..cb3b974 100644
  	seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
  	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ba23a6..f340b3f 100644
+index 7ba23a6..83aee80 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -290,6 +290,35 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
@@ -211,7 +288,7 @@ index 7ba23a6..f340b3f 100644
 +		I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
 +	}
 +
-+	schedule_work(&dev_priv->error_work);
++	queue_work(dev_priv->wq, &dev_priv->error_work);
 +}
 +
  irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
@@ -227,7 +304,15 @@ index 7ba23a6..f340b3f 100644
  		/*
  		 * Clear the PIPE(A|B)STAT regs before the IIR
  		 */
-@@ -409,80 +566,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -403,86 +560,13 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ 			DRM_DEBUG("hotplug event received, stat 0x%08x\n",
+ 				  hotplug_status);
+ 			if (hotplug_status & dev_priv->hotplug_supported_mask)
+-				schedule_work(&dev_priv->hotplug_work);
++				queue_work(dev_priv->wq,
++					   &dev_priv->hotplug_work);
+ 
+ 			I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
  			I915_READ(PORT_HOTPLUG_STAT);
  		}
  
@@ -308,7 +393,7 @@ index 7ba23a6..f340b3f 100644
  		I915_WRITE(IIR, iir);
  		new_iir = I915_READ(IIR); /* Flush posted writes */
  
-@@ -830,6 +913,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -830,6 +914,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
  	atomic_set(&dev_priv->irq_received, 0);
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
@@ -412,6 +497,19 @@ index 6c08584..2955083 100644
 +#define PCH_DPD_AUX_CH_DATA5	0xe4324
 +
  #endif /* _I915_REG_H_ */
+diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
+index 9e1d16e..1d04e19 100644
+--- a/drivers/gpu/drm/i915/i915_suspend.c
++++ b/drivers/gpu/drm/i915/i915_suspend.c
+@@ -598,7 +598,7 @@ int i915_restore_state(struct drm_device *dev)
+ 
+ 	for (i = 0; i < 16; i++) {
+ 		I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]);
+-		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]);
++		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i]);
+ 	}
+ 	for (i = 0; i < 3; i++)
+ 		I915_WRITE(SWF30 + (i << 2), dev_priv->saveSWF2[i]);
 diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
 index 7cc4471..300aee3 100644
 --- a/drivers/gpu/drm/i915/intel_bios.c


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1712
retrieving revision 1.1713
diff -u -p -r1.1712 -r1.1713
--- kernel.spec	12 Aug 2009 02:27:23 -0000	1.1712
+++ kernel.spec	12 Aug 2009 15:58:25 -0000	1.1713
@@ -681,7 +681,7 @@ Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-03
+# anholt's tree as of 2009-08-12
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
@@ -1980,6 +1980,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com>
+- Update drm-intel-next patch
+
 * Tue Aug 11 2009 Dennis Gilmore <dennis at ausil.us> - 2.6.31-0.149.rc5.git3
 - disable building the -smp kernel on sparc64
 - disable building kernel-perf on sparc64 syscalls not supported



From scop at fedoraproject.org  Wed Aug 12 16:00:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 16:00:36 +0000 (UTC)
Subject: rpms/autoconf/devel .cvsignore, 1.12, 1.13 autoconf.spec, 1.56,
	1.57 sources, 1.12, 1.13
Message-ID: <20090812160036.1727611C0346@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20881

Modified Files:
	.cvsignore autoconf.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.63-4
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/autoconf/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Sep 2008 16:18:28 -0000	1.12
+++ .cvsignore	12 Aug 2009 16:00:35 -0000	1.13
@@ -1 +1 @@
-autoconf-2.63.tar.bz2
+autoconf-2.63.tar.lzma


Index: autoconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- autoconf.spec	24 Jul 2009 17:35:59 -0000	1.56
+++ autoconf.spec	12 Aug 2009 16:00:35 -0000	1.57
@@ -1,10 +1,10 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.63
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
-Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
+Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.lzma
 Source1:    filter-provides-automake.sh
 Source2:    filter-requires-automake.sh
 URL:        http://www.gnu.org/software/autoconf/
@@ -79,6 +79,9 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.63-4
+- Use lzma compressed upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.63-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/autoconf/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Sep 2008 16:18:28 -0000	1.12
+++ sources	12 Aug 2009 16:00:35 -0000	1.13
@@ -1 +1 @@
-7565809ed801bb5726da0631ceab3699  autoconf-2.63.tar.bz2
+670b25f8b42118d2313f7593d9d89fda  autoconf-2.63.tar.lzma



From overholt at fedoraproject.org  Wed Aug 12 16:00:58 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 12 Aug 2009 16:00:58 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.131,1.132
Message-ID: <20090812160058.54AD411C00D5@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21017/devel

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-9
- Use launcher jar to run metadata generator instead of eclipse binary.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- eclipse-cdt.spec	12 Aug 2009 15:03:10 -0000	1.131
+++ eclipse-cdt.spec	12 Aug 2009 16:00:57 -0000	1.132
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -325,6 +325,10 @@ rm -rf ${RPM_BUILD_ROOT}
 mkdir -p home
 homedir=$(cd home > /dev/null && pwd)
 
+LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
+  | grep org.eclipse.equinox.launcher_)
+LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
+
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 mylynInstallDir=${installDir}-mylyn
 sdkInstallDir=${installDir}-sdk
@@ -378,8 +382,7 @@ rm -rf $installDir/eclipse/plugins/org.e
 
 # Generate p2 metadata for CDT
 pushd $installDir/eclipse
-eclipse \
--nosplash \
+java -jar $LAUNCHER \
 -application \
 org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
@@ -400,8 +403,7 @@ popd
 
 # Generate p2 metadata for CDT Mylyn Bridge
 pushd $mylynInstallDir/eclipse
-eclipse \
--nosplash \
+java -jar $LAUNCHER \
 -application \
 org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
@@ -422,8 +424,7 @@ popd
 
 # Generate p2 metadata for CDT SDK
 pushd $sdkInstallDir/eclipse
-eclipse \
--nosplash \
+java -jar $LAUNCHER \
 -application \
 org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
@@ -507,6 +508,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-9
+- Use launcher jar to run metadata generator instead of eclipse binary.
+
 * Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-8
 - Remove shipping of content.xml.
 



From liquidat at fedoraproject.org  Wed Aug 12 16:10:53 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 12 Aug 2009 16:10:53 +0000 (UTC)
Subject: rpms/ktorrent/F-11 .cvsignore, 1.30, 1.31 ktorrent.spec, 1.97,
	1.98 sources, 1.30, 1.31
Message-ID: <20090812161053.0937111C00D5@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22759

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to ktorrent-3.2.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	3 Jun 2009 16:51:59 -0000	1.30
+++ .cvsignore	12 Aug 2009 16:10:52 -0000	1.31
@@ -1 +1 @@
-ktorrent-3.2.2.tar.bz2
+ktorrent-3.2.3.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ktorrent.spec	3 Jun 2009 16:51:59 -0000	1.97
+++ ktorrent.spec	12 Aug 2009 16:10:52 -0000	1.98
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.2
-Release:        2%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -50,7 +50,8 @@ The headers and libraries used for devel
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
-  -DWITH_SYSTEM_GEOIP=1 \
+  -DWITH_SYSTEM_GEOIP:BOOL=ON \
+  -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF \
   ..
 popd
 
@@ -127,6 +128,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
+- ktorrent-3.2.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.2-3
+- don't use internal flags (prefer those provided by kdebase-runtime-flags)
+
 * Wed Jun 03 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.2-2
 - ktorrent-3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	3 Jun 2009 16:51:59 -0000	1.30
+++ sources	12 Aug 2009 16:10:52 -0000	1.31
@@ -1 +1 @@
-409fc30dcb0d72fa3a6d3c3719db4199  ktorrent-3.2.2.tar.bz2
+5c65b9e30107b922f025650887e4dee7  ktorrent-3.2.3.tar.bz2



From liquidat at fedoraproject.org  Wed Aug 12 16:15:24 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 12 Aug 2009 16:15:24 +0000 (UTC)
Subject: rpms/ktorrent/F-10 .cvsignore, 1.29, 1.30 ktorrent.spec, 1.88,
	1.89 sources, 1.29, 1.30
Message-ID: <20090812161524.1887F11C00D5@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23479

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to ktorrent-3.2.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	3 Jun 2009 16:56:00 -0000	1.29
+++ .cvsignore	12 Aug 2009 16:15:23 -0000	1.30
@@ -1 +1 @@
-ktorrent-3.2.2.tar.bz2
+ktorrent-3.2.3.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- ktorrent.spec	3 Jun 2009 16:56:00 -0000	1.88
+++ ktorrent.spec	12 Aug 2009 16:15:23 -0000	1.89
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.2
-Release:        2%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -50,7 +50,8 @@ The headers and libraries used for devel
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
-  -DWITH_SYSTEM_GEOIP=1 \
+  -DWITH_SYSTEM_GEOIP:BOOL=ON \
+  -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF \
   ..
 popd
 
@@ -127,6 +128,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
+- ktorrent-3.2.3
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.2-3
+- don't use internal flags (prefer those provided by kdebase-runtime-flags)
+
 * Wed Jun 03 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.2-2
 - ktorrent-3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	3 Jun 2009 16:56:00 -0000	1.29
+++ sources	12 Aug 2009 16:15:23 -0000	1.30
@@ -1 +1 @@
-409fc30dcb0d72fa3a6d3c3719db4199  ktorrent-3.2.2.tar.bz2
+5c65b9e30107b922f025650887e4dee7  ktorrent-3.2.3.tar.bz2



From cwickert at fedoraproject.org  Wed Aug 12 16:23:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 12 Aug 2009 16:23:02 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.283,1.284 comps-f10.xml.in,1.264,1.265
Message-ID: <20090812162302.8A32011C00D5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25349

Modified Files:
	comps-f11.xml.in comps-f10.xml.in 
Log Message:
add gnome-applet-cpufire


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- comps-f11.xml.in	11 Aug 2009 15:42:40 -0000	1.283
+++ comps-f11.xml.in	12 Aug 2009 16:23:02 -0000	1.284
@@ -2386,6 +2386,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-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- comps-f10.xml.in	11 Aug 2009 13:11:16 -0000	1.264
+++ comps-f10.xml.in	12 Aug 2009 16:23:02 -0000	1.265
@@ -2026,6 +2026,7 @@
       <packagereq type="optional">gmrun</packagereq>
       <packagereq type="optional">gnochm</packagereq>
       <packagereq type="optional">gnome-applet-alarm-clock</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 thm at fedoraproject.org  Wed Aug 12 16:29:32 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 12 Aug 2009 16:29:32 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.25, 1.26 ikiwiki.spec, 1.28,
	1.29 import.log, 1.25, 1.26 sources, 1.25, 1.26
Message-ID: <20090812162932.4CD2B11C00D5@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26400/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.141592.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	17 Jul 2009 20:40:54 -0000	1.25
+++ .cvsignore	12 Aug 2009 16:29:32 -0000	1.26
@@ -1 +1 @@
-ikiwiki_3.1415.tar.gz
+ikiwiki_3.141592.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ikiwiki.spec	25 Jul 2009 03:16:11 -0000	1.28
+++ ikiwiki.spec	12 Aug 2009 16:29:32 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           ikiwiki
-Version:        3.1415
-Release:        2%{?dist}
+Version:        3.141592
+Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
@@ -22,6 +22,7 @@ BuildRequires:  perl(CGI::FormBuilder)
 BuildRequires:  perl(CGI::Session)
 BuildRequires:  perl(File::MimeInfo)
 BuildRequires:  gettext
+BuildRequires:  po4a
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -143,6 +144,10 @@ meta-wrapper in this package.
 
 
 %changelog
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.141592-1
+- Update to 3.141592.
+- po4a is needed now.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1415-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- import.log	17 Jul 2009 20:40:54 -0000	1.25
+++ import.log	12 Aug 2009 16:29:32 -0000	1.26
@@ -23,3 +23,4 @@ ikiwiki-3_11-1_fc11:HEAD:ikiwiki-3.11-1.
 ikiwiki-3_12-1_fc11:HEAD:ikiwiki-3.12-1.fc11.src.rpm:1242421749
 ikiwiki-3_14-1_fc11:HEAD:ikiwiki-3.14-1.fc11.src.rpm:1244756213
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	17 Jul 2009 20:40:54 -0000	1.25
+++ sources	12 Aug 2009 16:29:32 -0000	1.26
@@ -1 +1 @@
-db35d8f3c526b80648a3d34316d6a5f3  ikiwiki_3.1415.tar.gz
+de1daa180835615da9ac494837a51d9d  ikiwiki_3.141592.tar.gz



From mclasen at fedoraproject.org  Wed Aug 12 16:37:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 16:37:40 +0000 (UTC)
Subject: rpms/intltool/F-11 intltool.spec,1.54,1.55 sources,1.30,1.31
Message-ID: <20090812163740.E905811C00D5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/intltool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27824

Modified Files:
	intltool.spec sources 
Log Message:
0.4.10



Index: intltool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/F-11/intltool.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- intltool.spec	16 Mar 2009 04:07:00 -0000	1.54
+++ intltool.spec	12 Aug 2009 16:37:40 -0000	1.55
@@ -3,11 +3,11 @@
 
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
-Version: 0.40.6
+Version: 0.41.0
 Release: 1%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
-Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2
+Source: http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-%{version}.tar.gz
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -32,7 +32,7 @@ them in the po files.
 %build
 %configure
 
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -44,13 +44,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING README
 %{_bindir}/*
 %{_datadir}/intltool
 %{_datadir}/aclocal/*
 %{_mandir}/man*/*
 
 %changelog
+* Wed Aug 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.41.0-1
+- Update to 0.41.0
+- Convert specfile to UTF-8.
+
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 0.40.6-1
 - Update to 0.40.6
 
@@ -270,7 +274,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Aug  8 2001 Jonathan Blandford <jrb at redhat.com>
 - Fix bug #45699 and #50634 by upgrading version.
 
-* Mon Jul 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - s/Copyright/License/
 - Shorter summary
 - Remove empty post/postun scripts


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	16 Mar 2009 04:07:00 -0000	1.30
+++ sources	12 Aug 2009 16:37:40 -0000	1.31
@@ -1 +1 @@
-69bc0353323112f42ad4f9cf351bc3e5  intltool-0.40.6.tar.bz2
+8a6e4afd3fc93637dcd70e36ab899364  intltool-0.41.0.tar.gz



From thm at fedoraproject.org  Wed Aug 12 16:37:42 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 12 Aug 2009 16:37:42 +0000 (UTC)
Subject: rpms/ikiwiki/F-11 .cvsignore, 1.24, 1.25 ikiwiki.spec, 1.26,
	1.27 import.log, 1.24, 1.25 sources, 1.24, 1.25
Message-ID: <20090812163742.BAFD811C00D5@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27847/F-11

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.141592.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	17 Jul 2009 20:49:21 -0000	1.24
+++ .cvsignore	12 Aug 2009 16:37:42 -0000	1.25
@@ -1 +1 @@
-ikiwiki_3.1415.tar.gz
+ikiwiki_3.141592.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/ikiwiki.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ikiwiki.spec	17 Jul 2009 20:49:21 -0000	1.26
+++ ikiwiki.spec	12 Aug 2009 16:37:42 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.1415
+Version:        3.141592
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -22,6 +22,7 @@ BuildRequires:  perl(CGI::FormBuilder)
 BuildRequires:  perl(CGI::Session)
 BuildRequires:  perl(File::MimeInfo)
 BuildRequires:  gettext
+BuildRequires:  po4a
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -143,6 +144,13 @@ meta-wrapper in this package.
 
 
 %changelog
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.141592-1
+- Update to 3.141592.
+- po4a is needed now.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1415-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.1415-1
 - Update to 3.1415.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- import.log	17 Jul 2009 20:49:21 -0000	1.24
+++ import.log	12 Aug 2009 16:37:42 -0000	1.25
@@ -22,3 +22,4 @@ ikiwiki-3_10-1_fc10:F-11:ikiwiki-3.10-1.
 ikiwiki-3_11-1_fc11:F-11:ikiwiki-3.11-1.fc11.src.rpm:1241508996
 ikiwiki-3_12-1_fc11:F-11:ikiwiki-3.12-1.fc11.src.rpm:1242422225
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	17 Jul 2009 20:49:21 -0000	1.24
+++ sources	12 Aug 2009 16:37:42 -0000	1.25
@@ -1 +1 @@
-db35d8f3c526b80648a3d34316d6a5f3  ikiwiki_3.1415.tar.gz
+de1daa180835615da9ac494837a51d9d  ikiwiki_3.141592.tar.gz



From kyle at fedoraproject.org  Wed Aug 12 16:49:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 12 Aug 2009 16:49:53 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-dont-frob-i2c.patch, 1.2,
	1.3 drm-i915-enable-mchbar.patch, 1.2,
	1.3 drm-intel-gem-use-dma32-on-pae.patch, 1.2,
	1.3 drm-intel-gen3-fb-hack.patch, 1.2,
	1.3 drm-intel-hdmi-edid-fix.patch, 1.2,
	1.3 drm-intel-tv-fix.patch, 1.2,
	1.3 drm-modesetting-radeon-fixes.patch, 1.2,
	1.3 drm-pnp-add-resource-range-checker.patch, 1.2,
	1.3 drm-radeon-cs-oops-fix.patch, 1.3,
	1.4 drm-radeon-new-pciids.patch, 1.2,
	1.3 drm-i915-resume-force-mode.patch, 1.2,
	1.3 drm-intel-big-hammer.patch, 1.1,
	1.2 drm-modesetting-radeon.patch, 1.83,
	1.84 drm-no-gem-on-i8xx.patch, 1.3, 1.4 drm-nouveau.patch, 1.60,
	1.61 kernel.spec, 1.1701, 1.1702
Message-ID: <20090812164953.4FE8711C00D5@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30605

Modified Files:
	drm-i915-resume-force-mode.patch drm-intel-big-hammer.patch 
	drm-modesetting-radeon.patch drm-no-gem-on-i8xx.patch 
	drm-nouveau.patch kernel.spec 
Added Files:
	drm-dont-frob-i2c.patch drm-i915-enable-mchbar.patch 
	drm-intel-gem-use-dma32-on-pae.patch 
	drm-intel-gen3-fb-hack.patch drm-intel-hdmi-edid-fix.patch 
	drm-intel-tv-fix.patch drm-modesetting-radeon-fixes.patch 
	drm-pnp-add-resource-range-checker.patch 
	drm-radeon-cs-oops-fix.patch drm-radeon-new-pciids.patch 
Log Message:
* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
- DRM patch sync-up with F-11-2.6.29.y, ABI probably isn't right yet though...
 - drm-modesetting-radeon.patch
 - drm-nouveau.patch
 - drm-no-gem-on-i8xx.patch
 - drm-i915-resume-force-mode.patch
 - drm-intel-big-hammer.patch
 - drm-intel-gen3-fb-hack.patch
 - drm-intel-hdmi-edid-fix.patch
 - drm-modesetting-radeon-fixes.patch
 - drm-radeon-new-pciids.patch
 - drm-dont-frob-i2c.patch
 - drm-intel-tv-fix.patch
 - drm-radeon-cs-oops-fix.patch
 - drm-pnp-add-resource-range-checker.patch
 - drm-i915-enable-mchbar.patch
- The rest were merged upstream.


drm-dont-frob-i2c.patch:
 drm_edid.c |   74 -------------------------------------------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

Index: drm-dont-frob-i2c.patch
===================================================================
RCS file: drm-dont-frob-i2c.patch
diff -N drm-dont-frob-i2c.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-dont-frob-i2c.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,91 @@
+diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
+index 6f6b264..801a0d0 100644
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -589,85 +589,13 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
+ }
+ EXPORT_SYMBOL(drm_do_probe_ddc_edid);
+ 
+-/**
+- * Get EDID information.
+- *
+- * \param adapter : i2c device adaptor.
+- * \param buf     : EDID data buffer to be filled
+- * \param len     : EDID data buffer length
+- * \return 0 on success or -1 on failure.
+- *
+- * Initialize DDC, then fetch EDID information
+- * by calling drm_do_probe_ddc_edid function.
+- */
+-static int drm_ddc_read(struct i2c_adapter *adapter,
+-			unsigned char *buf, int len)
+-{
+-	struct i2c_algo_bit_data *algo_data = adapter->algo_data;
+-	int i, j;
+-	int ret = -1;
+-
+-	algo_data->setscl(algo_data->data, 1);
+-
+-	for (i = 0; i < 1; i++) {
+-		/* For some old monitors we need the
+-		 * following process to initialize/stop DDC
+-		 */
+-		algo_data->setsda(algo_data->data, 1);
+-		msleep(13);
+-
+-		algo_data->setscl(algo_data->data, 1);
+-		for (j = 0; j < 5; j++) {
+-			msleep(10);
+-			if (algo_data->getscl(algo_data->data))
+-				break;
+-		}
+-		if (j == 5)
+-			continue;
+-
+-		algo_data->setsda(algo_data->data, 0);
+-		msleep(15);
+-		algo_data->setscl(algo_data->data, 0);
+-		msleep(15);
+-		algo_data->setsda(algo_data->data, 1);
+-		msleep(15);
+-
+-		/* Do the real work */
+-		ret = drm_do_probe_ddc_edid(adapter, buf, len);
+-		algo_data->setsda(algo_data->data, 0);
+-		algo_data->setscl(algo_data->data, 0);
+-		msleep(15);
+-
+-		algo_data->setscl(algo_data->data, 1);
+-		for (j = 0; j < 10; j++) {
+-			msleep(10);
+-			if (algo_data->getscl(algo_data->data))
+-				break;
+-		}
+-
+-		algo_data->setsda(algo_data->data, 1);
+-		msleep(15);
+-		algo_data->setscl(algo_data->data, 0);
+-		algo_data->setsda(algo_data->data, 0);
+-		if (ret == 0)
+-			break;
+-	}
+-	/* Release the DDC lines when done or the Apple Cinema HD display
+-	 * will switch off
+-	 */
+-	algo_data->setsda(algo_data->data, 1);
+-	algo_data->setscl(algo_data->data, 1);
+-
+-	return ret;
+-}
+-
+ static int drm_ddc_read_edid(struct drm_connector *connector,
+ 			     struct i2c_adapter *adapter,
+ 			     char *buf, int len)
+ {
+ 	int ret;
+ 
+-	ret = drm_ddc_read(adapter, buf, len);
++	ret = drm_do_probe_ddc_edid(adapter, buf, len);
+ 	if (ret != 0) {
+ 		dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
+ 			 drm_get_connector_name(connector));

drm-i915-enable-mchbar.patch:
 i915_drv.h        |    2 
 i915_gem_tiling.c |  145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

Index: drm-i915-enable-mchbar.patch
===================================================================
RCS file: drm-i915-enable-mchbar.patch
diff -N drm-i915-enable-mchbar.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-i915-enable-mchbar.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,197 @@
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
+index dcf5257..defe8a0 100644
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -143,6 +143,8 @@ typedef struct drm_i915_private {
+ 	drm_local_map_t hws_map;
+ 	struct drm_gem_object *hws_obj;
+ 
++	struct resource mch_res;
++
+ 	unsigned int cpp;
+ 	int back_offset;
+ 	int front_offset;
+diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
+index 540dd33..975b967 100644
+--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
++++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
+@@ -25,6 +25,8 @@
+  *
+  */
+ 
++#include <linux/acpi.h>
++#include <linux/pnp.h>
+ #include "linux/string.h"
+ #include "linux/bitops.h"
+ #include "drmP.h"
+@@ -81,6 +83,143 @@
+  * to match what the GPU expects.
+  */
+ 
++#define MCHBAR_I915 0x44
++#define MCHBAR_I965 0x48
++#define MCHBAR_SIZE (4*4096)
++
++#define DEVEN_REG 0x54
++#define   DEVEN_MCHBAR_EN (1 << 28)
++
++/* Allocate space for the MCH regs if needed, return nonzero on error */
++static int
++intel_alloc_mchbar_resource(struct drm_device *dev)
++{
++	struct pci_dev *bridge_dev;
++	drm_i915_private_t *dev_priv = dev->dev_private;
++	int reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915;
++	u32 temp_lo, temp_hi = 0;
++	u64 mchbar_addr;
++	int ret = 0;
++
++	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
++	if (!bridge_dev) {
++		DRM_DEBUG("no bridge dev?!\n");
++		ret = -ENODEV;
++		goto out;
++	}
++
++	if (IS_I965G(dev))
++		pci_read_config_dword(bridge_dev, reg + 4, &temp_hi);
++	pci_read_config_dword(bridge_dev, reg, &temp_lo);
++	mchbar_addr = ((u64)temp_hi << 32) | temp_lo;
++
++	/* If ACPI doesn't have it, assume we need to allocate it ourselves */
++	if (mchbar_addr &&
++	    pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) {
++		ret = 0;
++		goto out_put;
++	}
++
++	/* Get some space for it */
++	ret = pci_bus_alloc_resource(bridge_dev->bus, &dev_priv->mch_res,
++				     MCHBAR_SIZE, MCHBAR_SIZE,
++				     PCIBIOS_MIN_MEM,
++				     0,   pcibios_align_resource,
++				     bridge_dev);
++	if (ret) {
++		DRM_DEBUG("failed bus alloc: %d\n", ret);
++		dev_priv->mch_res.start = 0;
++		goto out_put;
++	}
++
++	if (IS_I965G(dev))
++		pci_write_config_dword(bridge_dev, reg + 4,
++				       upper_32_bits(dev_priv->mch_res.start));
++
++	pci_write_config_dword(bridge_dev, reg,
++			       lower_32_bits(dev_priv->mch_res.start));
++out_put:
++	pci_dev_put(bridge_dev);
++out:
++	return ret;
++}
++
++/* Setup MCHBAR if possible, return true if we should disable it again */
++static bool
++intel_setup_mchbar(struct drm_device *dev)
++{
++	struct pci_dev *bridge_dev;
++	int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915;
++	u32 temp;
++	bool need_disable = false, enabled;
++
++	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
++	if (!bridge_dev) {
++		DRM_DEBUG("no bridge dev?!\n");
++		goto out;
++	}
++
++	if (IS_I915G(dev) || IS_I915GM(dev)) {
++		pci_read_config_dword(bridge_dev, DEVEN_REG, &temp);
++		enabled = !!(temp & DEVEN_MCHBAR_EN);
++	} else {
++		pci_read_config_dword(bridge_dev, mchbar_reg, &temp);
++		enabled = temp & 1;
++	}
++
++	/* If it's already enabled, don't have to do anything */
++	if (enabled)
++		goto out_put;
++
++	if (intel_alloc_mchbar_resource(dev))
++		goto out_put;
++
++	need_disable = true;
++
++	/* Space is allocated or reserved, so enable it. */
++	if (IS_I915G(dev) || IS_I915GM(dev)) {
++		pci_write_config_dword(bridge_dev, DEVEN_REG,
++				       temp | DEVEN_MCHBAR_EN);
++	} else {
++		pci_read_config_dword(bridge_dev, mchbar_reg, &temp);
++		pci_write_config_dword(bridge_dev, mchbar_reg, temp | 1);
++	}
++out_put:
++	pci_dev_put(bridge_dev);
++out:
++	return need_disable;
++}
++
++static void
++intel_teardown_mchbar(struct drm_device *dev, bool disable)
++{
++	drm_i915_private_t *dev_priv = dev->dev_private;
++	struct pci_dev *bridge_dev;
++	int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915;
++	u32 temp;
++
++	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
++	if (!bridge_dev) {
++		DRM_DEBUG("no bridge dev?!\n");
++		return;
++	}
++
++	if (disable) {
++		if (IS_I915G(dev) || IS_I915GM(dev)) {
++			pci_read_config_dword(bridge_dev, DEVEN_REG, &temp);
++			temp &= ~DEVEN_MCHBAR_EN;
++			pci_write_config_dword(bridge_dev, DEVEN_REG, temp);
++		} else {
++			pci_read_config_dword(bridge_dev, mchbar_reg, &temp);
++			temp &= ~1;
++			pci_write_config_dword(bridge_dev, mchbar_reg, temp);
++		}
++	}
++
++	if (dev_priv->mch_res.start)
++		release_resource(&dev_priv->mch_res);
++}
++
+ /**
+  * Detects bit 6 swizzling of address lookup between IGD access and CPU
+  * access through main memory.
+@@ -91,6 +230,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
+ 	drm_i915_private_t *dev_priv = dev->dev_private;
+ 	uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
+ 	uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
++	bool need_disable;
+ 
+ 	if (!IS_I9XX(dev)) {
+ 		/* As far as we know, the 865 doesn't have these bit 6
+@@ -101,6 +241,9 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
+ 	} else if (IS_MOBILE(dev)) {
+ 		uint32_t dcc;
+ 
++		/* Try to make sure MCHBAR is enabled before poking at it */
++		need_disable = intel_setup_mchbar(dev);
++
+ 		/* On mobile 9xx chipsets, channel interleave by the CPU is
+ 		 * determined by DCC.  For single-channel, neither the CPU
+ 		 * nor the GPU do swizzling.  For dual channel interleaved,
+@@ -140,6 +283,8 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
+ 			swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
+ 			swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
+ 		}
++
++		intel_teardown_mchbar(dev, need_disable);
+ 	} else {
+ 		/* The 965, G33, and newer, have a very flexible memory
+ 		 * configuration.  It will enable dual-channel mode

drm-intel-gem-use-dma32-on-pae.patch:
 drivers/gpu/drm/drm_gem.c       |    3 +++
 drivers/gpu/drm/i915/i915_dma.c |    8 ++++----
 include/drm/drmP.h              |    1 +
 mm/shmem.c                      |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

Index: drm-intel-gem-use-dma32-on-pae.patch
===================================================================
RCS file: drm-intel-gem-use-dma32-on-pae.patch
diff -N drm-intel-gem-use-dma32-on-pae.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-gem-use-dma32-on-pae.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,66 @@
+commit 91346b5fc75a8a0418e3393244e3d0750400af87
+Author: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date:   Wed Aug 12 12:15:51 2009 -0400
+
+    drm-intel-gem-use-dma32-on-pae.patch
+
+diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
+index dee9b40..96eff54 100644
+--- a/drivers/gpu/drm/drm_gem.c
++++ b/drivers/gpu/drm/drm_gem.c
+@@ -142,6 +142,9 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
+ 		return NULL;
+ 	}
+ 
++	if (dev->gem_flags)
++		mapping_set_gfp_mask(obj->filp->f_mapping, dev->gem_flags);
++
+ 	kref_init(&obj->refcount);
+ 	kref_init(&obj->handlecount);
+ 	obj->size = size;
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 4560b8d..5da31e7 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1145,12 +1145,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 	}
+ 
+ #ifdef CONFIG_HIGHMEM64G
+-	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
+-	dev_priv->has_gem = 0;
+-#else
++	/* set default allocation flags */
++	dev->gem_flags = GFP_USER | GFP_DMA32;
++#endif
++
+ 	/* enable GEM by default, except on I8xx */
+ 	dev_priv->has_gem = !IS_8XX(dev) ? 1 : 0;
+-#endif
+ 
+ 	dev->driver->get_vblank_counter = i915_get_vblank_counter;
+ 	if (IS_GM45(dev))
+diff --git a/include/drm/drmP.h b/include/drm/drmP.h
+index fb93588..b8dae8a 100644
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -1043,6 +1043,7 @@ struct drm_device {
+ 	uint32_t gtt_total;
+ 	uint32_t invalidate_domains;    /* domains pending invalidation */
+ 	uint32_t flush_domains;         /* domains pending flush */
++	gfp_t gem_flags;		/* object allocation flags */
+ 	/*@} */
+ };
+ 
+diff --git a/mm/shmem.c b/mm/shmem.c
+index b25f95c..e615887 100644
+--- a/mm/shmem.c
++++ b/mm/shmem.c
+@@ -1241,7 +1241,7 @@ repeat:
+ 		 * Try to preload while we can wait, to not make a habit of
+ 		 * draining atomic reserves; but don't latch on to this cpu.
+ 		 */
+-		error = radix_tree_preload(gfp & ~__GFP_HIGHMEM);
++		error = radix_tree_preload(gfp & ~(__GFP_HIGHMEM|__GFP_DMA32));
+ 		if (error)
+ 			goto failed;
+ 		radix_tree_preload_end();

drm-intel-gen3-fb-hack.patch:
 intel_display.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: drm-intel-gen3-fb-hack.patch
===================================================================
RCS file: drm-intel-gen3-fb-hack.patch
diff -N drm-intel-gen3-fb-hack.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-gen3-fb-hack.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,15 @@
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index d0ac174..e4b7257 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -2067,8 +2067,8 @@ void intel_modeset_init(struct drm_device *dev)
+ 		dev->mode_config.max_width = 8192;
+ 		dev->mode_config.max_height = 8192;
+ 	} else {
+-		dev->mode_config.max_width = 2048;
+-		dev->mode_config.max_height = 2048;
++		dev->mode_config.max_width = 4096;
++		dev->mode_config.max_height = 4096;
+ 	}
+ 
+ 	/* set memory base */

drm-intel-hdmi-edid-fix.patch:
 intel_sdvo.c |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

Index: drm-intel-hdmi-edid-fix.patch
===================================================================
RCS file: drm-intel-hdmi-edid-fix.patch
diff -N drm-intel-hdmi-edid-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-hdmi-edid-fix.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,103 @@
+diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
+index 3093b4d..1324fda 100644
+--- a/drivers/gpu/drm/i915/intel_sdvo.c
++++ b/drivers/gpu/drm/i915/intel_sdvo.c
+@@ -30,6 +30,7 @@
+ #include "drmP.h"
+ #include "drm.h"
+ #include "drm_crtc.h"
++#include "drm_edid.h"
+ #include "intel_drv.h"
+ #include "i915_drm.h"
+ #include "i915_drv.h"
+@@ -1399,12 +1400,89 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
+ 		return connector_status_disconnected;
+ }
+ 
++#define MAX_EDID_EXT_NUM 4
++/**
++ * This function will fetch EDID by switch ddc bus, instead of drm_get_edid
++ * function.
++ */
++static struct edid *intel_sdvo_hdmi_get_edid(struct intel_output *intel_output)
++{
++	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
++	struct edid *edid;
++	int ret = 0;
++
++	edid = kmalloc(EDID_LENGTH * (MAX_EDID_EXT_NUM + 1),
++		       GFP_KERNEL);
++
++	if (edid == NULL) {
++		DRM_DEBUG("Failed to allocated EDID for SDVO HDMI\n");
++		goto end;
++	}
++
++	/* Read first EDID block */
++	ret = drm_do_probe_ddc_edid(&intel_output->ddc_bus->adapter,
++				    (unsigned char *)edid, EDID_LENGTH);
++	if (ret != 0) {
++		DRM_DEBUG("Failed to read basic EDID for SDVO HDMI\n");
++		goto clean_up;
++	}
++
++	/* There are EDID extensions to be read */
++	if (edid->extensions != 0) {
++		int edid_ext_num = edid->extensions;
++
++		if (edid_ext_num > MAX_EDID_EXT_NUM) {
++			DRM_DEBUG("The number of extensions(%d) is "
++				  "over max (%d), actually read number (%d)\n",
++				  edid_ext_num, MAX_EDID_EXT_NUM,
++				  MAX_EDID_EXT_NUM);
++		}
++		/* set the bus switch and get the modes */
++		intel_sdvo_set_control_bus_switch(intel_output,
++						  sdvo_priv->ddc_bus);
++		/* Read EDID including extensions too */
++		ret = drm_do_probe_ddc_edid(&intel_output->ddc_bus->adapter,
++					    (unsigned char *)edid,
++					    EDID_LENGTH * (edid_ext_num + 1));
++		if (ret != 0) {
++			DRM_DEBUG("Failed to read EDID EXT for SDVO HDMI\n");
++			goto clean_up;
++		}
++	}
++	goto end;
++
++clean_up:
++	kfree(edid);
++	edid = NULL;
++end:
++	return edid;
++}
++
++static void intel_sdvo_hdmi_ddc_get_modes(struct intel_output *intel_output)
++{
++	struct edid *edid;
++
++	edid = intel_sdvo_hdmi_get_edid(intel_output);
++	if (edid != NULL) {
++		drm_mode_connector_update_edid_property(&intel_output->base,
++							edid);
++		drm_add_edid_modes(&intel_output->base, edid);
++		kfree(edid);
++	}
++}
++
+ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
+ {
+ 	struct intel_output *intel_output = to_intel_output(connector);
++	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
+ 
+ 	/* set the bus switch and get the modes */
+-	intel_ddc_get_modes(intel_output);
++	intel_sdvo_set_control_bus_switch(intel_output,
++					  sdvo_priv->ddc_bus);
++	if (sdvo_priv->is_hdmi == true)
++		intel_sdvo_hdmi_ddc_get_modes(intel_output);
++	else
++		intel_ddc_get_modes(intel_output);
+ 
+ #if 0
+ 	struct drm_device *dev = encoder->dev;

drm-intel-tv-fix.patch:
 intel_display.c |    2 ++
 1 file changed, 2 insertions(+)

Index: drm-intel-tv-fix.patch
===================================================================
RCS file: drm-intel-tv-fix.patch
diff -N drm-intel-tv-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-intel-tv-fix.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,20 @@
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index e4b7257..60cc21a 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -1596,6 +1596,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_output *intel_output,
+ 	}
+ 
+ 	encoder->crtc = crtc;
++	intel_output->base.encoder = encoder;
+ 	intel_output->load_detect_temp = true;
+ 
+ 	intel_crtc = to_intel_crtc(crtc);
+@@ -1631,6 +1632,7 @@ void intel_release_load_detect_pipe(struct intel_output *intel_output, int dpms_
+ 
+ 	if (intel_output->load_detect_temp) {
+ 		encoder->crtc = NULL;
++		intel_output->base.encoder = NULL;
+ 		intel_output->load_detect_temp = false;
+ 		crtc->enabled = drm_helper_crtc_in_use(crtc);
+ 		drm_helper_disable_unused_functions(dev);

drm-modesetting-radeon-fixes.patch:
 drm_page_alloc.c    |    1 +
 drm_ttm.c           |   15 ++++-----------
 radeon/radeon_cp.c  |   11 +----------
 radeon/radeon_drv.h |    2 ++
 radeon/radeon_gem.c |   22 +++++++++++++++-------
 radeon/radeon_pm.c  |    3 +++
 6 files changed, 26 insertions(+), 28 deletions(-)

Index: drm-modesetting-radeon-fixes.patch
===================================================================
RCS file: drm-modesetting-radeon-fixes.patch
diff -N drm-modesetting-radeon-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-modesetting-radeon-fixes.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -0,0 +1,170 @@
+diff --git a/drivers/gpu/drm/drm_page_alloc.c b/drivers/gpu/drm/drm_page_alloc.c
+index fad6ae3..73a3c6d 100644
+--- a/drivers/gpu/drm/drm_page_alloc.c
++++ b/drivers/gpu/drm/drm_page_alloc.c
+@@ -78,6 +78,7 @@ int drm_add_pages_locked(int num_pages, int cached)
+ #else
+ 			map_page_into_agp(page);
+ #endif
++			drm_clflush_pages(&page, 1);
+ 			list_add(&page->lru, &uncached_free_list);
+ 			drm_page_alloc_data.total_uncached_pages++;
+ 			drm_page_alloc_data.uncached_pages_in_list++;
+diff --git a/drivers/gpu/drm/drm_ttm.c b/drivers/gpu/drm/drm_ttm.c
+index ae64a83..dbc0cb3 100644
+--- a/drivers/gpu/drm/drm_ttm.c
++++ b/drivers/gpu/drm/drm_ttm.c
+@@ -89,21 +89,14 @@ static struct page *drm_ttm_alloc_page(struct drm_ttm *ttm, int cached)
+  * Change caching policy for the linear kernel map
+  * for range of pages in a ttm.
+  */
+-static int drm_ttm_set_caching(struct drm_ttm *ttm, int noncached, int alloc_cached)
++static int drm_ttm_set_caching(struct drm_ttm *ttm, int noncached)
+ {
+ 	int i;
+ 	struct page **cur_page;
+-	int ret;
+ 
+ 	if ((ttm->page_flags & DRM_TTM_PAGE_UNCACHED) == noncached)
+ 		return 0;
+ 
+-	{
+-		ret = drm_ttm_populate(ttm, alloc_cached);
+-		if (ret != 0)
+-			return ret;
+-	}
+-
+ 	if (noncached)
+ 		drm_clflush_pages(ttm->pages, ttm->num_pages);
+ 
+@@ -196,7 +189,7 @@ int drm_ttm_destroy(struct drm_ttm *ttm)
+ 	if (ttm->pages) {
+ 		if (ttm->page_flags & DRM_TTM_PAGE_USER) {
+ 			if (ttm->page_flags & DRM_TTM_PAGE_UNCACHED)
+-				drm_ttm_set_caching(ttm, 0, 0);
++				drm_ttm_set_caching(ttm, 0);
+ 
+ 			drm_ttm_free_user_pages(ttm);
+ 		} else
+@@ -404,7 +397,7 @@ void drm_ttm_fixup_caching(struct drm_ttm *ttm)
+ 		struct drm_ttm_backend *be = ttm->be;
+ 		if (be->func->needs_ub_cache_adjust(be))
+ 			if (ttm->page_flags & DRM_TTM_PAGE_ALLOC_CACHED)
+-				drm_ttm_set_caching(ttm, 0, 1);
++				drm_ttm_set_caching(ttm, 0);
+ 		ttm->state = ttm_unbound;
+ 	}
+ }
+@@ -452,7 +445,7 @@ int drm_ttm_bind(struct drm_ttm *ttm, struct drm_bo_mem_reg *bo_mem)
+ 	be = ttm->be;
+ 
+ 	if ((ttm->state == ttm_unbound || ttm->state == ttm_unpopulated) && !cached)
+-		drm_ttm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED, cached);
++		drm_ttm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED);
+ 	else if ((bo_mem->flags & DRM_BO_FLAG_CACHED_MAPPED) &&
+ 		   bo_driver->ttm_cache_flush)
+ 		bo_driver->ttm_cache_flush(ttm);
+diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
+index 179d408..2d18df9 100644
+--- a/drivers/gpu/drm/radeon/radeon_cp.c
++++ b/drivers/gpu/drm/radeon/radeon_cp.c
+@@ -2722,16 +2722,7 @@ int radeon_modeset_cp_resume(struct drm_device *dev)
+ 	drm_radeon_private_t *dev_priv = dev->dev_private;
+ 
+ 	radeon_do_wait_for_idle(dev_priv);
+-#if __OS_HAS_AGP
+-	if (dev_priv->flags & RADEON_IS_AGP) {
+-		/* Turn off PCI GART */
+-		radeon_set_pcigart(dev_priv, 0);
+-	} else
+-#endif
+-	{
+-		/* Turn on PCI GART */
+-		radeon_set_pcigart(dev_priv, 1);
+-	}
++	radeon_gart_start(dev);
+ 	radeon_gart_flush(dev);
+ 
+ 	radeon_cp_load_microcode(dev_priv);
+diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
+index e3498a4..6a69864 100644
+--- a/drivers/gpu/drm/radeon/radeon_drv.h
++++ b/drivers/gpu/drm/radeon/radeon_drv.h
+@@ -2253,6 +2253,7 @@ extern int radeon_init_mem_type(struct drm_device * dev, uint32_t type,
+ extern int radeon_move(struct drm_buffer_object * bo,
+ 		       int evict, int no_wait, struct drm_bo_mem_reg * new_mem);
+ 
++extern void radeon_gart_start(struct drm_device *drm);
+ extern void radeon_gart_flush(struct drm_device *dev);
+ extern uint64_t radeon_evict_flags(struct drm_buffer_object *bo);
+ 
+@@ -2330,6 +2331,7 @@ struct drm_gem_object *radeon_gem_object_alloc(struct drm_device *dev, int size,
+ 					       int initial_domain, bool discardable);
+ int radeon_modeset_init(struct drm_device *dev);
+ void radeon_modeset_cleanup(struct drm_device *dev);
++int radeon_modeset_agp_init(struct drm_device *dev);
+ extern u32 RADEON_READ_MCIND(drm_radeon_private_t *dev_priv, int addr);
+ void radeon_read_agp_location(drm_radeon_private_t *dev_priv, u32 *agp_lo, u32 *agp_hi);
+ void radeon_write_fb_location(drm_radeon_private_t *dev_priv, u32 fb_loc);
+diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
+index cb96470..4bfc316 100644
+--- a/drivers/gpu/drm/radeon/radeon_gem.c
++++ b/drivers/gpu/drm/radeon/radeon_gem.c
+@@ -563,8 +563,16 @@ static int radeon_gart_init(struct drm_device *dev)
+ 		dev_priv->gart_info.addr = dev_priv->gart_info.table_handle->vaddr;
+ 		dev_priv->gart_info.bus_addr = dev_priv->gart_info.table_handle->busaddr;
+ 	}
++
++	radeon_gart_start(dev);
+ 	
+-	/* gart values setup - start the GART */
++	return 0;
++}
++
++/* gart values setup - start the GART */
++void radeon_gart_start(struct drm_device *dev) {
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++
+ 	if (dev_priv->flags & RADEON_IS_AGP) {
+ 		radeon_set_pcigart(dev_priv, 0);
+ 		/* enable AGP GART bits */
+@@ -581,8 +589,6 @@ static int radeon_gart_init(struct drm_device *dev)
+ 	} else {
+ 		radeon_set_pcigart(dev_priv, 1);
+ 	}
+-		
+-	return 0;
+ }
+ 
+ int radeon_alloc_gart_objects(struct drm_device *dev)
+@@ -1024,10 +1030,12 @@ int radeon_modeset_agp_init(struct drm_device *dev)
+ 	struct radeon_agpmode_quirk *p = radeon_agpmode_quirk_list;
+ 
+ 	/* Acquire AGP. */
+-	ret = drm_agp_acquire(dev);
+-	if (ret) {
+-		DRM_ERROR("Unable to acquire AGP: %d\n", ret);
+-		return ret;
++	if (!dev->agp->acquired) { /* don't need to repeat on resume */
++		ret = drm_agp_acquire(dev);
++		if (ret) {
++			DRM_ERROR("Unable to acquire AGP: %d\n", ret);
++			return ret;
++		}
+ 	}
+ 
+ 	ret = drm_agp_info(dev, &info);
+diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
+index 5a57056..684b7ca 100644
+--- a/drivers/gpu/drm/radeon/radeon_pm.c
++++ b/drivers/gpu/drm/radeon/radeon_pm.c
+@@ -156,6 +156,9 @@ int radeon_resume(struct drm_device *dev)
+ 	/* Turn on bus mastering -todo fix properly */
+ 	radeon_enable_bm(dev_priv);
+ 
++	if (dev_priv->flags & RADEON_IS_AGP)
++		radeon_modeset_agp_init(dev);
++
+ 	if (dev_priv->flags & RADEON_IS_PCIE) {
+ 		memcpy_toio(dev_priv->mm.pcie_table.kmap.virtual, dev_priv->mm.pcie_table_backup, dev_priv->gart_info.table_size);
+ 	}

drm-pnp-add-resource-range-checker.patch:
 drivers/pnp/resource.c |   18 ++++++++++++++++++
 include/linux/pnp.h    |    2 ++
 2 files changed, 20 insertions(+)

Index: drm-pnp-add-resource-range-checker.patch
===================================================================
RCS file: drm-pnp-add-resource-range-checker.patch
diff -N drm-pnp-add-resource-range-checker.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-pnp-add-resource-range-checker.patch	12 Aug 2009 16:49:51 -0000	1.3
@@ -0,0 +1,49 @@
+diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
+index f604061..ba97654 100644
+--- a/drivers/pnp/resource.c
++++ b/drivers/pnp/resource.c
+@@ -638,6 +638,24 @@ int pnp_possible_config(struct pnp_dev *dev, int type, resource_size_t start,
+ }
+ EXPORT_SYMBOL(pnp_possible_config);
+ 
++int pnp_range_reserved(resource_size_t start, resource_size_t end)
++{
++	struct pnp_dev *dev;
++	struct pnp_resource *pnp_res;
++	resource_size_t *dev_start, *dev_end;
++
++	pnp_for_each_dev(dev) {
++		list_for_each_entry(pnp_res, &dev->resources, list) {
++			dev_start = &pnp_res->res.start;
++			dev_end   = &pnp_res->res.end;
++			if (ranged_conflict(&start, &end, dev_start, dev_end))
++				return 1;
++		}
++	}
++	return 0;
++}
++EXPORT_SYMBOL(pnp_range_reserved);
++
+ /* format is: pnp_reserve_irq=irq1[,irq2] .... */
+ static int __init pnp_setup_reserve_irq(char *str)
+ {
+diff --git a/include/linux/pnp.h b/include/linux/pnp.h
+index ca3c887..b063c73 100644
+--- a/include/linux/pnp.h
++++ b/include/linux/pnp.h
+@@ -446,6 +446,7 @@ int pnp_start_dev(struct pnp_dev *dev);
+ int pnp_stop_dev(struct pnp_dev *dev);
+ int pnp_activate_dev(struct pnp_dev *dev);
+ int pnp_disable_dev(struct pnp_dev *dev);
++int pnp_range_reserved(resource_size_t start, resource_size_t end);
+ 
+ /* protocol helpers */
+ int pnp_is_active(struct pnp_dev *dev);
+@@ -476,6 +477,7 @@ static inline int pnp_start_dev(struct pnp_dev *dev) { return -ENODEV; }
+ static inline int pnp_stop_dev(struct pnp_dev *dev) { return -ENODEV; }
+ static inline int pnp_activate_dev(struct pnp_dev *dev) { return -ENODEV; }
+ static inline int pnp_disable_dev(struct pnp_dev *dev) { return -ENODEV; }
++static inline int pnp_range_reserved(resource_size_t start, resource_size_t end) { return 0;}
+ 
+ /* protocol helpers */
+ static inline int pnp_is_active(struct pnp_dev *dev) { return 0; }

drm-radeon-cs-oops-fix.patch:
 radeon_cs.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: drm-radeon-cs-oops-fix.patch
===================================================================
RCS file: drm-radeon-cs-oops-fix.patch
diff -N drm-radeon-cs-oops-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-radeon-cs-oops-fix.patch	12 Aug 2009 16:49:51 -0000	1.4
@@ -0,0 +1,38 @@
+diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
+index 1152552..3307387 100644
+--- a/drivers/gpu/drm/radeon/radeon_cs.c
++++ b/drivers/gpu/drm/radeon/radeon_cs.c
+@@ -41,22 +41,27 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *fpriv)
+ 	long size;
+ 	int r, i;
+ 
++	if (dev_priv == NULL) {
++		DRM_ERROR("called with no initialization\n");
++		return -EINVAL;
++	}
++
++	if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
++		DRM_ERROR("CS ioctl called without modesetting\n");
++		return -EINVAL;
++	}
++
+ 	mutex_lock(&dev_priv->cs.cs_mutex);
+ 	/* set command stream id to 0 which is fake id */
+ 	cs_id = 0;
+ 	cs->cs_id = cs_id;
+ 
+-	if (dev_priv == NULL) {
+-		DRM_ERROR("called with no initialization\n");
+-		mutex_unlock(&dev_priv->cs.cs_mutex);
+-		return -EINVAL;
+-	}
++
+ 	if (!cs->num_chunks) {
+ 		mutex_unlock(&dev_priv->cs.cs_mutex);
+ 		return 0;
+ 	}
+ 
+-
+ 	chunk_array = drm_calloc(cs->num_chunks, sizeof(uint64_t), DRM_MEM_DRIVER);
+ 	if (!chunk_array) {
+ 		mutex_unlock(&dev_priv->cs.cs_mutex);

drm-radeon-new-pciids.patch:
 drivers/gpu/drm/radeon/r600_cp.c    |   42 +++++++++++++++++++++++++++++++-----
 drivers/gpu/drm/radeon/radeon_drv.h |    1 
 include/drm/drm_pciids.h            |    7 ++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

Index: drm-radeon-new-pciids.patch
===================================================================
RCS file: drm-radeon-new-pciids.patch
diff -N drm-radeon-new-pciids.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-radeon-new-pciids.patch	12 Aug 2009 16:49:51 -0000	1.3
@@ -0,0 +1,133 @@
+diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
+index c3f12e6..cbbfbbf 100644
+--- a/drivers/gpu/drm/radeon/r600_cp.c
++++ b/drivers/gpu/drm/radeon/r600_cp.c
+@@ -478,26 +478,27 @@ static void r700_cp_load_microcode(drm_radeon_private_t *dev_priv)
+ 
+ 	if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV770)) {
+ 		RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
+-		DRM_INFO("Loading RV770 PFP Microcode\n");
++		DRM_INFO("Loading RV770/RV790 PFP Microcode\n");
+ 		for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
+ 			RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV770_pfp_microcode[i]);
+ 		RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
+ 
+ 		RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+-		DRM_INFO("Loading RV770 CP Microcode\n");
++		DRM_INFO("Loading RV770/RV790 CP Microcode\n");
+ 		for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
+ 			RADEON_WRITE(R600_CP_ME_RAM_DATA, RV770_cp_microcode[i]);
+ 		RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+ 
+-	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV730)) {
++	} else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV730) ||
++		   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV740)) {
+ 		RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
+-		DRM_INFO("Loading RV730 PFP Microcode\n");
++		DRM_INFO("Loading RV730/RV740 PFP Microcode\n");
+ 		for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
+ 			RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV730_pfp_microcode[i]);
+ 		RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
+ 
+ 		RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+-		DRM_INFO("Loading RV730 CP Microcode\n");
++		DRM_INFO("Loading RV730/RV740 CP Microcode\n");
+ 		for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
+ 			RADEON_WRITE(R600_CP_ME_RAM_DATA, RV730_cp_microcode[i]);
+ 		RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
+@@ -1324,6 +1325,10 @@ static void r700_gfx_init(struct drm_device *dev,
+ 		dev_priv->r700_sc_prim_fifo_size = 0xf9;
+ 		dev_priv->r700_sc_hiz_tile_fifo_size = 0x30;
+ 		dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130;
++		if (dev_priv->r600_sx_max_export_pos_size > 16) {
++			dev_priv->r600_sx_max_export_pos_size -= 16;
++			dev_priv->r600_sx_max_export_smx_size += 16;
++		}
+ 		break;
+ 	case CHIP_RV710:
+ 		dev_priv->r600_max_pipes = 2;
+@@ -1345,6 +1350,31 @@ static void r700_gfx_init(struct drm_device *dev,
+ 		dev_priv->r700_sc_hiz_tile_fifo_size = 0x30;
+ 		dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130;
+ 		break;
++	case CHIP_RV740:
++		dev_priv->r600_max_pipes = 4;
++		dev_priv->r600_max_tile_pipes = 4;
++		dev_priv->r600_max_simds = 8;
++		dev_priv->r600_max_backends = 4;
++		dev_priv->r600_max_gprs = 256;
++		dev_priv->r600_max_threads = 248;
++		dev_priv->r600_max_stack_entries = 512;
++		dev_priv->r600_max_hw_contexts = 8;
++		dev_priv->r600_max_gs_threads = 16 * 2;
++		dev_priv->r600_sx_max_export_size = 256;
++		dev_priv->r600_sx_max_export_pos_size = 32;
++		dev_priv->r600_sx_max_export_smx_size = 224;
++		dev_priv->r600_sq_num_cf_insts = 2;
++
++		dev_priv->r700_sx_num_of_sets = 7;
++		dev_priv->r700_sc_prim_fifo_size = 0x100;
++		dev_priv->r700_sc_hiz_tile_fifo_size = 0x30;
++		dev_priv->r700_sc_earlyz_tile_fifo_fize = 0x130;
++
++		if (dev_priv->r600_sx_max_export_pos_size > 16) {
++			dev_priv->r600_sx_max_export_pos_size -= 16;
++			dev_priv->r600_sx_max_export_smx_size += 16;
++		}
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -1493,6 +1523,7 @@ static void r700_gfx_init(struct drm_device *dev,
+ 		break;
+ 	case CHIP_RV730:
+ 	case CHIP_RV710:
++	case CHIP_RV740:
+ 	default:
+ 		sq_ms_fifo_sizes |= R600_FETCH_FIFO_HIWATER(0x4);
+ 		break;
+@@ -1569,6 +1600,7 @@ static void r700_gfx_init(struct drm_device *dev,
+ 	switch (dev_priv->flags & RADEON_FAMILY_MASK) {
+ 	case CHIP_RV770:
+ 	case CHIP_RV730:
++	case CHIP_RV740:
+ 		gs_prim_buffer_depth = 384;
+ 		break;
+ 	case CHIP_RV710:
+diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
+index 6a69864..07913ec 100644
+--- a/drivers/gpu/drm/radeon/radeon_drv.h
++++ b/drivers/gpu/drm/radeon/radeon_drv.h
+@@ -148,6 +148,7 @@ enum radeon_family {
+ 	CHIP_RV770,
+ 	CHIP_RV730,
+ 	CHIP_RV710,
++	CHIP_RV740,
+ 	CHIP_LAST,
+ };
+ 
+diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
+index fc55db7..71bfec9 100644
+--- a/include/drm/drm_pciids.h
++++ b/include/drm/drm_pciids.h
+@@ -254,6 +254,11 @@
+ 	{0x1002, 0x940A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x940B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x940F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R600|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x94A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV740|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x94A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV740|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x94B1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV740|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x94B3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV740|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x94B5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV740|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x9441, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x9442, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+@@ -268,6 +273,8 @@
+ 	{0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x9460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
++	{0x1002, 0x9462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x946B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+ 	{0x1002, 0x947A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

drm-i915-resume-force-mode.patch:
 i915_suspend.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: drm-i915-resume-force-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-i915-resume-force-mode.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-i915-resume-force-mode.patch	26 Mar 2009 18:46:43 -0000	1.2
+++ drm-i915-resume-force-mode.patch	12 Aug 2009 16:49:49 -0000	1.3
@@ -1,7 +1,7 @@
-http://lists.freedesktop.org/archives/intel-gfx/2009-February/001313.html
-
---- a/drivers/gpu/drm/i915/i915_suspend.c.orig	2009-02-18 22:59:19.000000000 -0500
-+++ b/drivers/gpu/drm/i915/i915_suspend.c	2009-02-18 22:59:58.000000000 -0500
+diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
+index ce8a213..7e90be3 100644
+--- a/drivers/gpu/drm/i915/i915_suspend.c
++++ b/drivers/gpu/drm/i915/i915_suspend.c
 @@ -28,6 +28,7 @@
  #include "drm.h"
  #include "i915_drm.h"
@@ -10,41 +10,13 @@ http://lists.freedesktop.org/archives/in
  
  static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
  {
-@@ -519,6 +520,8 @@
- 
- 	i915_restore_vga(dev);
- 
-+	drm_helper_resume_force_mode(dev);
-+
- 	return 0;
- }
- 
-From f5192bce8be69e5b33d7579bc282fef4d673e2c1 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak at v3.sk>
-Date: Sun, 15 Mar 2009 13:55:55 +0100
-Subject: [PATCH] Fix i915 nomodeset NULL deref. during PM resume
-
-drm_helper_resume_force_mode() would crash while attempting to
-iterate through crtc_list, which is uninitialized when is modesetting
-disabled.
----
- drivers/gpu/drm/i915/i915_suspend.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
-index ef5fb6e..b138032 100644
---- a/drivers/gpu/drm/i915/i915_suspend.c
-+++ b/drivers/gpu/drm/i915/i915_suspend.c
-@@ -520,7 +520,8 @@ int i915_restore_state(struct drm_device *dev)
+@@ -532,6 +533,9 @@ int i915_restore_state(struct drm_device *dev)
  
  	i915_restore_vga(dev);
  
--	drm_helper_resume_force_mode(dev);
 +	if (drm_core_check_feature(dev, DRIVER_MODESET))
 +		drm_helper_resume_force_mode(dev);
- 
++
  	return 0;
  }
--- 
-1.6.2
-
+ 

drm-intel-big-hammer.patch:
 i915_gem.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: drm-intel-big-hammer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-intel-big-hammer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-intel-big-hammer.patch	11 Mar 2009 22:45:01 -0000	1.1
+++ drm-intel-big-hammer.patch	12 Aug 2009 16:49:49 -0000	1.2
@@ -1,13 +1,13 @@
 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 37427e4..08af9db 100644
+index 39f5c65..eec945a 100644
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -2553,6 +2553,11 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
+@@ -3253,6 +3253,11 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
  
  	mutex_lock(&dev->struct_mutex);
  
 +	/* We don't get the flushing right for these chipsets, use the
-+	 * big hamer for now to avoid random crashiness. */
++	 * big hammer for now to avoid random crashiness. */
 +	if (IS_I855(dev) || IS_I865G(dev))
 +		wbinvd();
 +

drm-modesetting-radeon.patch:
 arch/x86/mm/pat.c                               |    1 
 drivers/gpu/drm/Kconfig                         |   11 
 drivers/gpu/drm/Makefile                        |    3 
 drivers/gpu/drm/ati_pcigart.c                   |  267 +
 drivers/gpu/drm/drm_agpsupport.c                |  171 
 drivers/gpu/drm/drm_bo.c                        | 2161 +++++++++
 drivers/gpu/drm/drm_bo_move.c                   |  709 +++
 drivers/gpu/drm/drm_bufs.c                      |   12 
 drivers/gpu/drm/drm_crtc.c                      |    2 
 drivers/gpu/drm/drm_crtc_helper.c               |   29 
 drivers/gpu/drm/drm_debugfs.c                   |    1 
 drivers/gpu/drm/drm_dma.c                       |    2 
 drivers/gpu/drm/drm_drv.c                       |   29 
 drivers/gpu/drm/drm_fence.c                     |  540 ++
 drivers/gpu/drm/drm_fops.c                      |    5 
 drivers/gpu/drm/drm_info.c                      |    8 
 drivers/gpu/drm/drm_memory.c                    |  107 
 drivers/gpu/drm/drm_page_alloc.c                |  171 
 drivers/gpu/drm/drm_page_alloc.h                |   33 
 drivers/gpu/drm/drm_stub.c                      |   18 
 drivers/gpu/drm/drm_ttm.c                       |  476 ++
 drivers/gpu/drm/drm_vm.c                        |  208 
 drivers/gpu/drm/i915/i915_irq.c                 |    3 
 drivers/gpu/drm/i915/intel_display.c            |   22 
 drivers/gpu/drm/radeon/Makefile                 |    6 
 drivers/gpu/drm/radeon/ObjectID.h               |  518 ++
 drivers/gpu/drm/radeon/atom-bits.h              |   48 
 drivers/gpu/drm/radeon/atom-names.h             |  100 
 drivers/gpu/drm/radeon/atom-types.h             |   42 
 drivers/gpu/drm/radeon/atom.c                   | 1141 +++++
 drivers/gpu/drm/radeon/atom.h                   |  150 
 drivers/gpu/drm/radeon/atombios.h               | 5025 ++++++++++++++++++++++
 drivers/gpu/drm/radeon/atombios_crtc.c          |  629 ++
 drivers/gpu/drm/radeon/r300_cmdbuf.c            |  153 
 drivers/gpu/drm/radeon/r300_reg.h               |   16 
 drivers/gpu/drm/radeon/r600_cp.c                |    2 
 drivers/gpu/drm/radeon/radeon_atombios.c        | 1050 ++++
 drivers/gpu/drm/radeon/radeon_buffer.c          |  473 ++
 drivers/gpu/drm/radeon/radeon_combios.c         | 1768 +++++++
 drivers/gpu/drm/radeon/radeon_connectors.c      |  610 ++
 drivers/gpu/drm/radeon/radeon_cp.c              | 1546 ++++++
 drivers/gpu/drm/radeon/radeon_cs.c              |  684 +++
 drivers/gpu/drm/radeon/radeon_cursor.c          |  264 +
 drivers/gpu/drm/radeon/radeon_display.c         |  670 ++
 drivers/gpu/drm/radeon/radeon_drv.c             |  139 
 drivers/gpu/drm/radeon/radeon_drv.h             |  500 +-
 drivers/gpu/drm/radeon/radeon_encoders.c        | 1716 +++++++
 drivers/gpu/drm/radeon/radeon_fb.c              |  934 ++++
 drivers/gpu/drm/radeon/radeon_fence.c           |   99 
 drivers/gpu/drm/radeon/radeon_fixed.h           |   53 
 drivers/gpu/drm/radeon/radeon_gem.c             | 1578 +++++++
 drivers/gpu/drm/radeon/radeon_gem_debugfs.c     |  179 
 drivers/gpu/drm/radeon/radeon_i2c.c             |  205 
 drivers/gpu/drm/radeon/radeon_irq.c             |   64 
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c     | 1602 +++++++
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1284 +++++
 drivers/gpu/drm/radeon/radeon_mem.c             |    2 
 drivers/gpu/drm/radeon/radeon_mode.h            |  398 +
 drivers/gpu/drm/radeon/radeon_pm.c              |  263 +
 drivers/gpu/drm/radeon/radeon_reg.h             | 5364 ++++++++++++++++++++++++
 drivers/gpu/drm/radeon/radeon_state.c           |   73 
 include/drm/drm.h                               |    1 
 include/drm/drmP.h                              |   96 
 include/drm/drm_crtc_helper.h                   |    2 
 include/drm/drm_objects.h                       |  913 ++++
 include/drm/radeon_drm.h                        |  130 
 66 files changed, 35057 insertions(+), 422 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.83 -r 1.84 drm-modesetting-radeon.patchIndex: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- drm-modesetting-radeon.patch	25 Jul 2009 04:09:19 -0000	1.83
+++ drm-modesetting-radeon.patch	12 Aug 2009 16:49:49 -0000	1.84
@@ -1,1755 +1,5 @@
-commit dea27f6e83efabdc3e37bc5a91d29d6dab893853
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Mar 18 17:07:07 2009 +1000
-
-    radeon: fixup encoder oops due to wrong ordering on init calls
-
-commit 4a90f1edefee2cba39d135f2866e1bacc1ac647e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Mar 19 00:16:00 2009 +1000
-
-    drm/ttm: re-org the whole cached/uncached allocator yet again.
-    
-    This removes the allocator type, and instead tracks when pages
-    were allocated from which pool and frees them back into that pool
-
-commit c8ae93fa4ac69112f4fc16477f73e0a98bba2765
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Mar 15 18:26:42 2009 +1000
-
-    ttm: prefetch pages on pagefault
-
-commit f4df0e7870378ec40c268b95fb4b5d13533095fd
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Mar 16 03:52:13 2009 -0400
-
-    radeon: make sure to free connector priv when done
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 96d923793eb924750b26e8ab2a4264131e17cd5b
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Mar 16 03:36:16 2009 -0400
-
-    radeon: fix combios asic init
-    
-    - igp chips don't have asic_init3/4 or ram reset tables
-    - write out the detected ram size to the CONFIG_MEMSIZE register
-    - some r1xx chips require ram detection rather than reading size
-      from bios tables
-    - asic_init5 table isn't needed
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 68f14af742eda9fd28c920776ce5396e304f8a82
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Mar 16 03:16:35 2009 -0400
-
-    radeon: rework bios scratch regsiter handling
-    
-    split bios scratch reg handling into 3 functions:
-    
-    - connected/active
-    - crtc to encoder mapping
-    - encoder dpms state
-    
-    Hook the functions in at the appropriate places in
-    the driver. DVI-I is a bit messy since we need to know
-    digital vs analog so we have to update the scratch regs
-    twice: once in detect() and again after we know digital/analog
-    in get_modes().
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 3ba04861b4d399a7c6e21f0a7279d5f087fc4a8c
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Sat Mar 14 16:43:14 2009 -0400
-
-    radeon: rework combios encoder/connector setup
-    
-    - along the same lines as atom
-    - re-enable atom and legacy paths for r4xx cards
-    - remove bios_connector struct
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 2ed15179f72e66a020a7f318cc4c3fa57865e4ba
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Mar 12 16:02:01 2009 -0400
-
-    radeon: fix misleading messages
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit cb917ec2b585f5ac873ab2e6938da9a3b730c0a1
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Mar 12 14:27:06 2009 -0400
-
-    atom: fix up encoder routines to deal with connector setup
-    
-    often times the links or lanes used are dependant on the
-    connector rather than the encoder.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit abe11890fc272189712f2e6268a8751e25b7b7b5
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Mar 12 13:43:03 2009 -0400
-
-    atom: re-enable quirks
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 6a45dbd73c14735711f1803e8a3dd1063b7b3021
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Mar 12 13:21:32 2009 -0400
-
-    object table: don't add ddc for tv/cv
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 6fb018a3740510f140bcd5b6b89904e9d3167811
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Mar 12 13:10:50 2009 -0400
-
-    radeon: major restructuring of atom output/connector setup
-    
-    - add connectors and encoders while parsing the bios tables.
-    - pull in fixed up object header parsing for r6xx+
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 034267381be779a1bbdb5f6f97c1471fb8538a04
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Mar 4 13:02:26 2009 -0500
-
-    RS600 doesn't have DFP quirk in connector table
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit b7936094db13c736e4bee7494c2b99a8e5ced042
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Mar 5 16:37:57 2009 -0500
-
-    R6xx/R7xx: don't mess with RADEON_HOST_PATH_CNTL
-    
-    these chips don't have this reg at this location.
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit a1fdbf2f4de3988f5e3319ee9f267f7b27e8fc6e
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Mar 11 16:50:19 2009 -0400
-
-    radeon: make sure to free enc_priv when done
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit d54586a52852497d82f322c536515d223697fdf4
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Mar 11 15:43:16 2009 -0400
-
-    radeon: restructure encoders
-    
-    move encoder specific data into encoder specific structs
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 0215044d42faded71b8591a79550c0bf04908458
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Wed Mar 11 11:23:16 2009 -0400
-
-    radeon: atom modesetting updates
-    
-    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-
-commit 121d45a2e9562836138c658224def839bb166f68
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Mar 12 11:39:05 2009 +1000
-
-    drm/radeon: Don't try to use agp symbols if we don't have AGP
-    
-    The radeon_buffer.c addition that gets pulled into the DRM driver as
-    part of Kernel Mode Setting (even if you disable KMS for the Radeon
-    driver) was assuming that it was safe to use symbols from the AGP code,
-    but that isn't safe on platforms where __OS_HAS_AGP is 0. Such as
-    sparc64. :)
-    
-    This patch gets the code building again. It probably should go into the
-    actual kms patch, but if you would prefer this go as a separate patch, I
-    can apply it. With this, we can get rawhide building for sparc64, so I'm
-    eager to see it applied in one way or another.
-    
-    Signed-off-by: Tom "spot" Callaway <tcallawa at redhat.com>
-
-commit 36bbbdea9a2e77c1d1da7504bc5f03267d0e0d6c
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Thu Mar 12 10:58:05 2009 +1000
-
-    radeon: fixup the IB getting routine
-    
-    This makes the IB get routine a lot smarter and hopefully
[...6099 lines suppressed...]
-+#define DRM_IOCTL_RADEON_GEM_PWRITE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
-+#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
-+#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
-+#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+
++/* KMS */
++#define DRM_IOCTL_RADEON_GEM_INFO	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
++#define DRM_IOCTL_RADEON_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
++#define DRM_IOCTL_RADEON_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
++#define DRM_IOCTL_RADEON_GEM_PREAD	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
++#define DRM_IOCTL_RADEON_GEM_PWRITE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
++#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
++#define DRM_IOCTL_RADEON_GEM_WAIT_IDLE	DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle) 
++#define DRM_IOCTL_RADEON_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++#define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
 +
+ 
  typedef struct drm_radeon_init {
  	enum {
- 		RADEON_INIT_CP = 0x01,
-@@ -680,6 +713,8 @@ typedef struct drm_radeon_indirect {
+@@ -682,6 +703,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-+#define RADEON_PARAM_KERNEL_MM             16
-+#define RADEON_PARAM_DEVICE_ID		   17
++#define RADEON_PARAM_DEVICE_ID             16
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -734,6 +769,7 @@ typedef struct drm_radeon_setparam {
- #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
- #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
- #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-+#define RADEON_SETPARAM_MM_INIT 7               /* DDX wants memory manager but has no modesetting */
- /* 1.14: Clients can allocate/free a surface
-  */
- typedef struct drm_radeon_surface_alloc {
-@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free {
+@@ -751,4 +773,112 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
-+#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
-+#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
-+#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
++/*
++ * Kernel modesetting world below.
++ */
++#define RADEON_GEM_DOMAIN_CPU		0x1
++#define RADEON_GEM_DOMAIN_GTT		0x2
++#define RADEON_GEM_DOMAIN_VRAM		0x4
 +
-+/* return to userspace start/size of gtt and vram apertures */
 +struct drm_radeon_gem_info {
-+	uint64_t gart_start;
-+	uint64_t gart_size;
-+	uint64_t vram_start;
-+	uint64_t vram_size;
-+	uint64_t vram_visible;
++	uint64_t	gart_size;
++	uint64_t	vram_size;
++	uint64_t	vram_visible;
 +};
 +
++#define RADEON_GEM_NO_BACKING_STORE 1
++
 +struct drm_radeon_gem_create {
-+	uint64_t size;
-+	uint64_t alignment;
-+	uint32_t handle;
-+	uint32_t initial_domain; // to allow VRAM to be created
-+	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
-+	// pretty much front/back/depth don't need it - other things do
++	uint64_t	size;
++	uint64_t	alignment;
++	uint32_t	handle;
++	uint32_t	initial_domain;
++	uint32_t	flags;
 +};
 +
 +struct drm_radeon_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
++	uint32_t	handle;
++	uint32_t	pad;
++	uint64_t	offset;
++	uint64_t	size;
++	uint64_t	addr_ptr;
 +};
 +
 +struct drm_radeon_gem_set_domain {
-+	uint32_t handle;
-+	uint32_t read_domains;
-+	uint32_t write_domain;
++	uint32_t	handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
 +};
 +
-+struct drm_radeon_gem_wait_rendering {
-+	uint32_t handle;
-+};
-+
-+struct drm_radeon_gem_pin {
-+	uint32_t handle;
-+	uint32_t pin_domain;
-+	uint64_t alignment;
-+	uint64_t offset;
-+};
-+
-+struct drm_radeon_gem_unpin {
-+	uint32_t handle;
-+	uint32_t pad;
++struct drm_radeon_gem_wait_idle {
++	uint32_t	handle;
++	uint32_t	pad;
 +};
 +
 +struct drm_radeon_gem_busy {
-+	uint32_t handle;
-+	uint32_t busy;
++	uint32_t	handle;
++	uint32_t	busy;
 +};
 +
 +struct drm_radeon_gem_pread {
@@ -38670,7 +37375,8 @@ index 937a275..f716e0a 100644
 +	/** Length of data to read */
 +	uint64_t size;
 +	/** Pointer to write the data into. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
 +struct drm_radeon_gem_pwrite {
@@ -38682,28 +37388,43 @@ index 937a275..f716e0a 100644
 +	/** Length of data to write */
 +	uint64_t size;
 +	/** Pointer to read the data from. */
-+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
++	/* void *, but pointers are not 32/64 compatible */
++	uint64_t data_ptr;
 +};
 +
-+
-+/* New interface which obsolete all previous interface.
-+ */
-+#define RADEON_CHUNK_ID_RELOCS 0x01
-+#define RADEON_CHUNK_ID_IB     0x02
-+#define RADEON_CHUNK_ID_OLD 0xff
++#define RADEON_CHUNK_ID_RELOCS	0x01
++#define RADEON_CHUNK_ID_IB	0x02
 +
 +struct drm_radeon_cs_chunk {
-+	uint32_t chunk_id;
-+	uint32_t length_dw;
-+	uint64_t chunk_data;
++	uint32_t		chunk_id;
++	uint32_t		length_dw;
++	uint64_t		chunk_data;
 +};
 +
-+struct drm_radeon_cs {
-+	uint32_t	num_chunks;
-+	uint32_t        cs_id;
-+	uint64_t	chunks; /* this points to uint64_t * which point to
-+				   cs chunks */
++struct drm_radeon_cs_reloc {
++	uint32_t		handle;
++	uint32_t		read_domains;
++	uint32_t		write_domain;
++	uint32_t		flags;
 +};
 +
++struct drm_radeon_cs {
++	uint32_t		num_chunks;
++	uint32_t		cs_id;
++	/* this points to uint64_t * which point to cs chunks */
++	uint64_t		chunks;
++	/* updates to the limits after this CS ioctl */
++	uint64_t		gart_limit;
++	uint64_t		vram_limit;
++};
++
++#define RADEON_INFO_DEVICE_ID		0x00
++#define RADEON_INFO_NUM_GB_PIPES	0x01
++
++struct drm_radeon_info {
++	uint32_t		request;
++	uint32_t		pad;
++	uint64_t		value;
++};
 +
  #endif

drm-no-gem-on-i8xx.patch:
 i915_dma.c |    4 ++--
 i915_drv.h |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

Index: drm-no-gem-on-i8xx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-no-gem-on-i8xx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drm-no-gem-on-i8xx.patch	25 Jul 2009 04:09:21 -0000	1.3
+++ drm-no-gem-on-i8xx.patch	12 Aug 2009 16:49:50 -0000	1.4
@@ -1,28 +1,28 @@
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index cc0adb4..9303063 100644
+index 0ccb63e..4560b8d 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1108,8 +1108,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1148,8 +1148,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
  	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
  	dev_priv->has_gem = 0;
  #else
 -	/* enable GEM by default */
 -	dev_priv->has_gem = 1;
 +	/* enable GEM by default, except on I8xx */
-+	dev_priv->has_gem = !IS_I8XX(dev) ? 1 : 0;
++	dev_priv->has_gem = !IS_8XX(dev) ? 1 : 0;
  #endif
  
- 	i915_gem_load(dev);
+ 	dev->driver->get_vblank_counter = i915_get_vblank_counter;
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index a70bf77..84664fe 100644
+index c431fa5..dcf5257 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -750,6 +750,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -770,6 +770,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  #define IS_I855(dev) ((dev)->pci_device == 0x3582)
  #define IS_I865G(dev) ((dev)->pci_device == 0x2572)
  
-+#define IS_I8XX(dev)	(IS_I830(dev) || IS_845G(dev) || IS_I85X(dev) ||	\
-+				IS_I855(dev) || IS_I865G(dev))
++#define IS_I8XX(dev) (IS_I830(dev) || IS_I845G(dev) || IS_I85X(dev) ||	\
++			IS_I855(dev))
 +
  #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
  #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                         |   15 
 drivers/gpu/drm/Makefile                        |    1 
 drivers/gpu/drm/drm_bufs.c                      |   28 
 drivers/gpu/drm/drm_fence.c                     |    2 
 drivers/gpu/drm/drm_gem.c                       |   50 
 drivers/gpu/drm/nouveau/Makefile                |   24 
 drivers/gpu/drm/nouveau/nouveau_backlight.c     |  152 
 drivers/gpu/drm/nouveau/nouveau_bios.c          | 4852 +++++
 drivers/gpu/drm/nouveau/nouveau_bios.h          |  223 
 drivers/gpu/drm/nouveau/nouveau_bo.c            |  415 
 drivers/gpu/drm/nouveau/nouveau_calc.c          |  622 
 drivers/gpu/drm/nouveau/nouveau_connector.h     |   51 
 drivers/gpu/drm/nouveau/nouveau_crtc.h          |   74 
 drivers/gpu/drm/nouveau/nouveau_display.c       |  114 
 drivers/gpu/drm/nouveau/nouveau_dma.c           |  209 
 drivers/gpu/drm/nouveau/nouveau_dma.h           |  107 
 drivers/gpu/drm/nouveau/nouveau_drv.c           |  194 
 drivers/gpu/drm/nouveau/nouveau_drv.h           |  836 
 drivers/gpu/drm/nouveau/nouveau_encoder.h       |   46 
 drivers/gpu/drm/nouveau/nouveau_fb.h            |   44 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c         |  946 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h         |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c         |  126 
 drivers/gpu/drm/nouveau/nouveau_fifo.c          |  692 
 drivers/gpu/drm/nouveau/nouveau_gem.c           |  729 
 drivers/gpu/drm/nouveau/nouveau_hw.c            | 1019 +
 drivers/gpu/drm/nouveau/nouveau_hw.h            |  530 
 drivers/gpu/drm/nouveau/nouveau_i2c.c           |  222 
 drivers/gpu/drm/nouveau/nouveau_i2c.h           |   46 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c         |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c           |  592 
 drivers/gpu/drm/nouveau/nouveau_mem.c           | 1073 +
 drivers/gpu/drm/nouveau/nouveau_notifier.c      |  176 
 drivers/gpu/drm/nouveau/nouveau_object.c        | 1236 +
 drivers/gpu/drm/nouveau/nouveau_reg.h           |  854 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c         |  340 
 drivers/gpu/drm/nouveau/nouveau_state.c         | 1043 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.c        |  190 
 drivers/gpu/drm/nouveau/nouveau_swmthd.h        |   33 
 drivers/gpu/drm/nouveau/nv04_fb.c               |   21 
 drivers/gpu/drm/nouveau/nv04_fifo.c             |  144 
 drivers/gpu/drm/nouveau/nv04_graph.c            |  521 
 drivers/gpu/drm/nouveau/nv04_instmem.c          |  190 
 drivers/gpu/drm/nouveau/nv04_mc.c               |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c            |   50 
 drivers/gpu/drm/nouveau/nv10_fb.c               |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c             |  175 
 drivers/gpu/drm/nouveau/nv10_graph.c            |  912 +
 drivers/gpu/drm/nouveau/nv20_graph.c            |  907 +
 drivers/gpu/drm/nouveau/nv40_fb.c               |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c             |  216 
 drivers/gpu/drm/nouveau/nv40_graph.c            | 2179 ++
 drivers/gpu/drm/nouveau/nv40_mc.c               |   38 
 drivers/gpu/drm/nouveau/nv50_connector.c        |  491 
 drivers/gpu/drm/nouveau/nv50_crtc.c             |  810 
 drivers/gpu/drm/nouveau/nv50_cursor.c           |  144 
 drivers/gpu/drm/nouveau/nv50_dac.c              |  288 
 drivers/gpu/drm/nouveau/nv50_display.c          |  637 
 drivers/gpu/drm/nouveau/nv50_display.h          |   44 
 drivers/gpu/drm/nouveau/nv50_display_commands.h |  195 
 drivers/gpu/drm/nouveau/nv50_fbcon.c            |  222 
 drivers/gpu/drm/nouveau/nv50_fifo.c             |  343 
 drivers/gpu/drm/nouveau/nv50_graph.c            |  336 
 drivers/gpu/drm/nouveau/nv50_grctx.h            |20935 ++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c          |  382 
 drivers/gpu/drm/nouveau/nv50_mc.c               |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c              |  303 
 drivers/gpu/drm/nouveau/nvreg.h                 |  495 
 include/drm/Kbuild                              |    1 
 include/drm/drmP.h                              |    2 
 include/drm/nouveau_drm.h                       |  299 
 71 files changed, 49410 insertions(+), 42 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.60 -r 1.61 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- drm-nouveau.patch	25 Jul 2009 04:09:21 -0000	1.60
+++ drm-nouveau.patch	12 Aug 2009 16:49:50 -0000	1.61
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index a74980b..36582ff 100644
+index f8d5074..3ada5e4 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -133,3 +133,18 @@ config DRM_SAVAGE
+@@ -140,3 +140,18 @@ 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.
@@ -32,7 +32,7 @@ index d6788df..97aa0c8 100644
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
  
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 4d2161f..ac503e2 100644
+index 07e0c51..9ac171c 100644
 --- a/drivers/gpu/drm/drm_bufs.c
 +++ b/drivers/gpu/drm/drm_bufs.c
 @@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
@@ -80,7 +80,7 @@ index 4d2161f..ac503e2 100644
  
  static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
  			  unsigned long user_token, int hashed_handle, int shm)
-@@ -349,7 +335,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
+@@ -357,7 +343,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
  	/* We do it here so that dev->struct_mutex protects the increment */
  	user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle :
  		map->offset;
@@ -103,7 +103,7 @@ index f1c386c..fd62fd9 100644
  	if (mask & ~fence->type) {
  		DRM_ERROR("Wait trying to extend fence type"
 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index c1173d8..2e4e667 100644
+index 4984aa8..dee9b40 100644
 --- a/drivers/gpu/drm/drm_gem.c
 +++ b/drivers/gpu/drm/drm_gem.c
 @@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
@@ -185,58 +185,9 @@ index c1173d8..2e4e667 100644
  	mutex_lock(&dev->struct_mutex);
  	drm_gem_object_unreference(obj);
  	mutex_unlock(&dev->struct_mutex);
-diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 5d45cbf..e3b0a76 100644
---- a/drivers/gpu/drm/drm_stub.c
-+++ b/drivers/gpu/drm/drm_stub.c
-@@ -406,14 +406,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
- 	if (dev->driver->load) {
- 		ret = dev->driver->load(dev, ent->driver_data);
- 		if (ret)
--			goto err_g3;
-+			goto err_g4;
- 	}
- 
-         /* setup the grouping for the legacy output */
- 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
- 		ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group);
- 		if (ret)
--			goto err_g3;
-+			goto err_g4;
- 	}
- 
- 	list_add_tail(&dev->driver_item, &driver->device_list);
-@@ -424,8 +424,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
- 
- 	return 0;
- 
--err_g3:
-+err_g4:
- 	drm_put_minor(&dev->primary);
-+err_g3:
-+	if (drm_core_check_feature(dev, DRIVER_MODESET))
-+		drm_put_minor(&dev->control);
- err_g2:
- 	pci_disable_device(pdev);
- err_g1:
-@@ -507,11 +510,11 @@ void drm_put_dev(struct drm_device *dev)
- 		dev->agp = NULL;
- 	}
- 
--	drm_ht_remove(&dev->map_hash);
--	drm_ctxbitmap_cleanup(dev);
--
- 	list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
- 		drm_rmmap(dev, r_list->map);
-+	drm_ht_remove(&dev->map_hash);
-+
-+	drm_ctxbitmap_cleanup(dev);
- 
- 	if (drm_core_check_feature(dev, DRIVER_MODESET))
- 		drm_put_minor(&dev->control);
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..12af41b
+index 0000000..06483d0
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,24 @@
@@ -249,8 +200,8 @@ index 0000000..12af41b
 +             nouveau_object.o nouveau_irq.o nouveau_notifier.o \
 +             nouveau_swmthd.o nouveau_sgdma.o nouveau_dma.o \
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o \
-+             nouveau_bios.o nouveau_display.o nouveau_fbcon.o \
-+	     nouveau_backlight.o \
++             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
++	     nouveau_display.o nouveau_fbcon.o nouveau_backlight.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -259,17 +210,17 @@ index 0000000..12af41b
 +             nv40_graph.o nv50_graph.o \
 +             nv04_instmem.o nv50_instmem.o \
 +             nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
-+             nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o
++             nv50_cursor.o nv50_display.o nv50_fbcon.o
 +
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +
 +obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
 diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
 new file mode 100644
-index 0000000..3fc521e
+index 0000000..e3d354f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,152 @@
 +/*
 + * Copyright (C) 2009 Red Hat <mjg at redhat.com>
 + *
@@ -312,7 +263,6 @@ index 0000000..3fc521e
 +static int nv40_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = (nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16;
 +
 +	return val;
@@ -321,7 +271,6 @@ index 0000000..3fc521e
 +static int nv40_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +	int reg = nv_rd32(NV40_PMC_BACKLIGHT);
 +
@@ -340,7 +289,6 @@ index 0000000..3fc521e
 +static int nv50_get_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +
 +	return nv_rd32(NV50_PDISPLAY_BACKLIGHT);
 +}
@@ -348,7 +296,6 @@ index 0000000..3fc521e
 +static int nv50_set_intensity(struct backlight_device *bd)
 +{
 +	struct drm_device *dev = bl_get_data(bd);
-+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int val = bd->props.brightness;
 +
 +	nv_wr32(NV50_PDISPLAY_BACKLIGHT, val | NV50_PDISPLAY_BACKLIGHT_ENABLE);
@@ -428,45 +375,66 @@ index 0000000..3fc521e
 +}	
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
 new file mode 100644
-index 0000000..bcbedb7
+index 0000000..d63baf3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,854 @@
+@@ -0,0 +1,4852 @@
 +/*
-+ * Copyright (C) 2005-2006 Erik Waling
-+ * Copyright (C) 2006 Stephane Marchesin
-+ * Copyright (C) 2007-2008 Stuart Bennett
-+ * Copyright (C) 2008 Maarten Maathuis.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
++ * Copyright 2005-2006 Erik Waling
++ * Copyright 2006 Stephane Marchesin
++ * Copyright 2007-2009 Stuart Bennett
 + *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial
[...22285 lines suppressed...]
++#	define NV_PRAMDAC_CU_START_POS_Y			31:16
++#define NV_RAMDAC_NV10_CURSYNC				0x00680404
++
++#define NV_PRAMDAC_NVPLL_COEFF				0x00680500
++#define NV_PRAMDAC_MPLL_COEFF				0x00680504
++#define NV_PRAMDAC_VPLL_COEFF				0x00680508
++#	define NV30_RAMDAC_ENABLE_VCO2				(8 << 4)
++
++#define NV_PRAMDAC_PLL_COEFF_SELECT			0x0068050c
++#	define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE		(4 << 0)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_MPLL	(1 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_VPLL	(2 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_NVPLL	(4 << 8)
++#	define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2		(8 << 8)
++#	define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB2	(1 << 28)
++#	define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2		(2 << 28)
++
++#define NV_PRAMDAC_PLL_SETUP_CONTROL			0x00680510
++#define NV_RAMDAC_VPLL2					0x00680520
++#define NV_PRAMDAC_SEL_CLK				0x00680524
++#define NV_RAMDAC_DITHER_NV11				0x00680528
++#define NV_PRAMDAC_DACCLK				0x0068052c
++#	define NV_PRAMDAC_DACCLK_SEL_DACCLK			(1 << 0)
++
++#define NV_RAMDAC_NVPLL_B				0x00680570
++#define NV_RAMDAC_MPLL_B				0x00680574
++#define NV_RAMDAC_VPLL_B				0x00680578
++#define NV_RAMDAC_VPLL2_B				0x0068057c
++#	define NV31_RAMDAC_ENABLE_VCO2				(8 << 28)
++#define NV_PRAMDAC_580					0x00680580
++#	define NV_RAMDAC_580_VPLL1_ACTIVE			(1 << 8)
++#	define NV_RAMDAC_580_VPLL2_ACTIVE			(1 << 28)
++
++#define NV_PRAMDAC_GENERAL_CONTROL			0x00680600
++#define NV_PRAMDAC_TEST_CONTROL				0x00680608
++#	define NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED	(1 << 12)
++#	define NV_PRAMDAC_TEST_CONTROL_PWRDWN_DAC_OFF		(1 << 16)
++#	define NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI		(1 << 28)
++#define NV_PRAMDAC_TESTPOINT_DATA			0x00680610
++#	define NV_PRAMDAC_TESTPOINT_DATA_NOTBLANK		(8 << 28)
++#define NV_PRAMDAC_630					0x00680630
++#define NV_PRAMDAC_634					0x00680634
++
++#define NV_PRAMDAC_FP_VDISPLAY_END			0x00680800
++#define NV_PRAMDAC_FP_VTOTAL				0x00680804
++#define NV_PRAMDAC_FP_VCRTC				0x00680808
++#define NV_PRAMDAC_FP_VSYNC_START			0x0068080c
++#define NV_PRAMDAC_FP_VSYNC_END				0x00680810
++#define NV_PRAMDAC_FP_VVALID_START			0x00680814
++#define NV_PRAMDAC_FP_VVALID_END			0x00680818
++#define NV_PRAMDAC_FP_HDISPLAY_END			0x00680820
++#define NV_PRAMDAC_FP_HTOTAL				0x00680824
++#define NV_PRAMDAC_FP_HCRTC				0x00680828
++#define NV_PRAMDAC_FP_HSYNC_START			0x0068082c
++#define NV_PRAMDAC_FP_HSYNC_END				0x00680830
++#define NV_PRAMDAC_FP_HVALID_START			0x00680834
++#define NV_PRAMDAC_FP_HVALID_END			0x00680838
++
++#define NV_RAMDAC_FP_DITHER				0x0068083c
++#define NV_PRAMDAC_FP_TG_CONTROL			0x00680848
++#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS		(1 << 0)
++#	define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_DISABLE		(2 << 0)
++#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS		(1 << 4)
++#	define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_DISABLE		(2 << 4)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_SCALE		(0 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_CENTER		(1 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_MODE_NATIVE		(2 << 8)
++#	define NV_PRAMDAC_FP_TG_CONTROL_READ_PROG		(1 << 20)
++#	define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12		(1 << 24)
++#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS		(1 << 28)
++#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE		(2 << 28)
++#define NV_PRAMDAC_850					0x00680850
++#define NV_PRAMDAC_85C					0x0068085c
++#define NV_PRAMDAC_FP_DEBUG_0				0x00680880
++#	define NV_PRAMDAC_FP_DEBUG_0_XSCALE_ENABLE		(1 << 0)
++#	define NV_PRAMDAC_FP_DEBUG_0_YSCALE_ENABLE		(1 << 4)
++/* This doesn't seem to be essential for tmds, but still often set */
++#	define NV_RAMDAC_FP_DEBUG_0_TMDS_ENABLED		(8 << 4)
++#	define NV_PRAMDAC_FP_DEBUG_0_XINTERP_BILINEAR		(1 << 8)
++#	define NV_PRAMDAC_FP_DEBUG_0_YINTERP_BILINEAR		(1 << 12)
++#	define NV_PRAMDAC_FP_DEBUG_0_XWEIGHT_ROUND		(1 << 20)
++#	define NV_PRAMDAC_FP_DEBUG_0_YWEIGHT_ROUND		(1 << 24)
++#       define NV_PRAMDAC_FP_DEBUG_0_PWRDOWN_FPCLK              (1 << 28)
++#define NV_PRAMDAC_FP_DEBUG_1				0x00680884
++#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_VALUE		11:0
++#	define NV_PRAMDAC_FP_DEBUG_1_XSCALE_TESTMODE_ENABLE	(1 << 12)
++#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_VALUE		27:16
++#	define NV_PRAMDAC_FP_DEBUG_1_YSCALE_TESTMODE_ENABLE	(1 << 28)
++#define NV_PRAMDAC_FP_DEBUG_2				0x00680888
++#define NV_PRAMDAC_FP_DEBUG_3				0x0068088C
++
++/* see NV_PRAMDAC_INDIR_TMDS in rules.xml */
++#define NV_PRAMDAC_FP_TMDS_CONTROL			0x006808b0
++#	define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE		(1 << 16)
++#define NV_PRAMDAC_FP_TMDS_DATA				0x006808b4
++
++/* Some kind of switch */
++#define NV_PRAMDAC_900					0x00680900
++#define NV_PRAMDAC_A20					0x00680A20
++#define NV_PRAMDAC_A24					0x00680A24
++#define NV_PRAMDAC_A34					0x00680A34
++
++/* names fabricated from NV_USER_DAC info */
++#define NV_PRMDIO_PIXEL_MASK		0x006813c6
++#	define NV_PRMDIO_PIXEL_MASK_MASK	0xff
++#define NV_PRMDIO_READ_MODE_ADDRESS	0x006813c7
++#define NV_PRMDIO_WRITE_MODE_ADDRESS	0x006813c8
++#define NV_PRMDIO_PALETTE_DATA		0x006813c9
++
++#define NV_PGRAPH_DEBUG_0		0x00400080
++#define NV_PGRAPH_DEBUG_1		0x00400084
++#define NV_PGRAPH_DEBUG_2_NV04		0x00400088
++#define NV_PGRAPH_DEBUG_2		0x00400620
++#define NV_PGRAPH_DEBUG_3		0x0040008c
++#define NV_PGRAPH_DEBUG_4		0x00400090
++#define NV_PGRAPH_INTR			0x00400100
++#define NV_PGRAPH_INTR_EN		0x00400140
++#define NV_PGRAPH_CTX_CONTROL		0x00400144
++#define NV_PGRAPH_CTX_CONTROL_NV04	0x00400170
++#define NV_PGRAPH_ABS_UCLIP_XMIN	0x0040053C
++#define NV_PGRAPH_ABS_UCLIP_YMIN	0x00400540
++#define NV_PGRAPH_ABS_UCLIP_XMAX	0x00400544
++#define NV_PGRAPH_ABS_UCLIP_YMAX	0x00400548
++#define NV_PGRAPH_BETA_AND		0x00400608
++#define NV_PGRAPH_LIMIT_VIOL_PIX	0x00400610
++#define NV_PGRAPH_BOFFSET0		0x00400640
++#define NV_PGRAPH_BOFFSET1		0x00400644
++#define NV_PGRAPH_BOFFSET2		0x00400648
++#define NV_PGRAPH_BLIMIT0		0x00400684
++#define NV_PGRAPH_BLIMIT1		0x00400688
++#define NV_PGRAPH_BLIMIT2		0x0040068c
++#define NV_PGRAPH_STATUS		0x00400700
++#define NV_PGRAPH_SURFACE		0x00400710
++#define NV_PGRAPH_STATE			0x00400714
++#define NV_PGRAPH_FIFO			0x00400720
++#define NV_PGRAPH_PATTERN_SHAPE		0x00400810
++#define NV_PGRAPH_TILE			0x00400b00
++
++#define NV_PVIDEO_INTR_EN		0x00008140
++#define NV_PVIDEO_BUFFER		0x00008700
++#define NV_PVIDEO_STOP			0x00008704
++#define NV_PVIDEO_UVPLANE_BASE(buff)	(0x00008800+(buff)*4)
++#define NV_PVIDEO_UVPLANE_LIMIT(buff)	(0x00008808+(buff)*4)
++#define NV_PVIDEO_UVPLANE_OFFSET_BUFF(buff)	(0x00008820+(buff)*4)
++#define NV_PVIDEO_BASE(buff)		(0x00008900+(buff)*4)
++#define NV_PVIDEO_LIMIT(buff)		(0x00008908+(buff)*4)
++#define NV_PVIDEO_LUMINANCE(buff)	(0x00008910+(buff)*4)
++#define NV_PVIDEO_CHROMINANCE(buff)	(0x00008918+(buff)*4)
++#define NV_PVIDEO_OFFSET_BUFF(buff)	(0x00008920+(buff)*4)
++#define NV_PVIDEO_SIZE_IN(buff)		(0x00008928+(buff)*4)
++#define NV_PVIDEO_POINT_IN(buff)	(0x00008930+(buff)*4)
++#define NV_PVIDEO_DS_DX(buff)		(0x00008938+(buff)*4)
++#define NV_PVIDEO_DT_DY(buff)		(0x00008940+(buff)*4)
++#define NV_PVIDEO_POINT_OUT(buff)	(0x00008948+(buff)*4)
++#define NV_PVIDEO_SIZE_OUT(buff)	(0x00008950+(buff)*4)
++#define NV_PVIDEO_FORMAT(buff)		(0x00008958+(buff)*4)
++#	define NV_PVIDEO_FORMAT_PLANAR			(1 << 0)
++#	define NV_PVIDEO_FORMAT_COLOR_LE_CR8YB8CB8YA8	(1 << 16)
++#	define NV_PVIDEO_FORMAT_DISPLAY_COLOR_KEY	(1 << 20)
++#	define NV_PVIDEO_FORMAT_MATRIX_ITURBT709	(1 << 24)
++#define NV_PVIDEO_COLOR_KEY		0x00008B00
++
++/* NV04 overlay defines from VIDIX & Haiku */
++#define NV_PVIDEO_INTR_EN_0		0x00680140
++#define NV_PVIDEO_STEP_SIZE		0x00680200
++#define NV_PVIDEO_CONTROL_Y		0x00680204
++#define NV_PVIDEO_CONTROL_X		0x00680208
++#define NV_PVIDEO_BUFF0_START_ADDRESS	0x0068020c
++#define NV_PVIDEO_BUFF0_PITCH_LENGTH	0x00680214
++#define NV_PVIDEO_BUFF0_OFFSET		0x0068021c
++#define NV_PVIDEO_BUFF1_START_ADDRESS	0x00680210
++#define NV_PVIDEO_BUFF1_PITCH_LENGTH	0x00680218
++#define NV_PVIDEO_BUFF1_OFFSET		0x00680220
++#define NV_PVIDEO_OE_STATE		0x00680224
++#define NV_PVIDEO_SU_STATE		0x00680228
++#define NV_PVIDEO_RM_STATE		0x0068022c
++#define NV_PVIDEO_WINDOW_START		0x00680230
++#define NV_PVIDEO_WINDOW_SIZE		0x00680234
++#define NV_PVIDEO_FIFO_THRES_SIZE	0x00680238
++#define NV_PVIDEO_FIFO_BURST_LENGTH	0x0068023c
++#define NV_PVIDEO_KEY			0x00680240
++#define NV_PVIDEO_OVERLAY		0x00680244
++#define NV_PVIDEO_RED_CSC_OFFSET	0x00680280
++#define NV_PVIDEO_GREEN_CSC_OFFSET	0x00680284
++#define NV_PVIDEO_BLUE_CSC_OFFSET	0x00680288
++#define NV_PVIDEO_CSC_ADJUST		0x0068028c
++
++#endif
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
 index b940fdf..cfa6af4 100644
 --- a/include/drm/Kbuild
@@ -42929,7 +49627,7 @@ index b940fdf..cfa6af4 100644
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index b61b0c6..5b7ce2d 100644
+index b0d024c..fb93588 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -1267,6 +1267,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1701
retrieving revision 1.1702
diff -u -p -r1.1701 -r1.1702
--- kernel.spec	12 Aug 2009 15:26:50 -0000	1.1701
+++ kernel.spec	12 Aug 2009 16:49:51 -0000	1.1702
@@ -656,11 +656,21 @@ Patch1700: agp-set_memory_ucwb.patch
 # nouveau + drm fixes
 Patch1811: drm-next.patch
 Patch1812: drm-modesetting-radeon.patch
-Patch1813: drm-radeon-pm.patch
-Patch1814: drm-nouveau.patch
-Patch1816: drm-no-gem-on-i8xx.patch
-Patch1818: drm-i915-resume-force-mode.patch
-Patch1819: drm-intel-big-hammer.patch
+Patch1813: drm-nouveau.patch
+Patch1814: drm-no-gem-on-i8xx.patch
+Patch1815: drm-i915-resume-force-mode.patch
+Patch1816: drm-intel-big-hammer.patch
+Patch1817: drm-intel-gen3-fb-hack.patch
+Patch1818: drm-intel-hdmi-edid-fix.patch
+Patch1819: drm-intel-gem-use-dma32-on-pae.patch
+Patch1820: drm-modesetting-radeon-fixes.patch
+Patch1821: drm-radeon-new-pciids.patch
+Patch1822: drm-dont-frob-i2c.patch
+Patch1823: drm-intel-tv-fix.patch
+Patch1824: drm-radeon-cs-oops-fix.patch
+Patch1825: drm-pnp-add-resource-range-checker.patch
+Patch1826: drm-i915-enable-mchbar.patch
+
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1261,16 +1271,24 @@ ApplyPatch linux-2.6-crash-driver.patch
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
+# DRM patches
 ApplyPatch agp-set_memory_ucwb.patch
-# Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
-#ApplyPatch drm-modesetting-radeon.patch
-#ApplyPatch drm-nouveau.patch
-# pm broken on my thinkpad t60p - airlied
-#ApplyPatch drm-radeon-pm.patch
+ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-nouveau.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
+ApplyPatch drm-intel-gen3-fb-hack.patch
+ApplyPatch drm-intel-hdmi-edid-fix.patch
+#ApplyPatch drm-intel-gem-use-dma32-on-pae.patch
+ApplyPatch drm-modesetting-radeon-fixes.patch
+ApplyPatch drm-radeon-new-pciids.patch
+ApplyPatch drm-dont-frob-i2c.patch
+ApplyPatch drm-intel-tv-fix.patch
+ApplyPatch drm-radeon-cs-oops-fix.patch
+ApplyPatch drm-pnp-add-resource-range-checker.patch
+ApplyPatch drm-i915-enable-mchbar.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1879,6 +1897,24 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
+- DRM patch sync-up with F-11-2.6.29.y, ABI probably isn't right yet though...
+ - drm-modesetting-radeon.patch
+ - drm-nouveau.patch
+ - drm-no-gem-on-i8xx.patch
+ - drm-i915-resume-force-mode.patch
+ - drm-intel-big-hammer.patch
+ - drm-intel-gen3-fb-hack.patch
+ - drm-intel-hdmi-edid-fix.patch
+ - drm-modesetting-radeon-fixes.patch
+ - drm-radeon-new-pciids.patch
+ - drm-dont-frob-i2c.patch
+ - drm-intel-tv-fix.patch
+ - drm-radeon-cs-oops-fix.patch
+ - drm-pnp-add-resource-range-checker.patch
+ - drm-i915-enable-mchbar.patch
+- The rest were merged upstream.
+
 * Wed Aug 12 2009 John W. Linville <linville at redhat.com>
 - iwlwifi: fix TX queue race
 



From scop at fedoraproject.org  Wed Aug 12 17:02:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:02:15 +0000 (UTC)
Subject: rpms/qt-creator/devel .cvsignore, 1.5, 1.6 qt-creator.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090812170215.5B91111C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32746

Modified Files:
	.cvsignore qt-creator.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2.1-3
- Use upstream gzipped tarball instead of zip.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Jul 2009 14:26:43 -0000	1.5
+++ .cvsignore	12 Aug 2009 17:02:14 -0000	1.6
@@ -1 +1 @@
-qt-creator-1.2.1-src.zip
+qt-creator-1.2.1-src.tar.gz


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qt-creator.spec	27 Jul 2009 02:36:10 -0000	1.7
+++ qt-creator.spec	12 Aug 2009 17:02:15 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           qt-creator
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
 License:        LGPLv2 with exceptions
 URL:            http://www.qtsoftware.com/developer/qt-creator
-Source0:        http://download.qtsoftware.com/qtcreator/%name-%version-src.zip
+Source0:        http://download.qtsoftware.com/qtcreator/%name-%version-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:       qtcreator.desktop
@@ -96,6 +96,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2.1-3
+- Use upstream gzipped tarball instead of zip.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Jul 2009 14:26:43 -0000	1.5
+++ sources	12 Aug 2009 17:02:15 -0000	1.6
@@ -1 +1 @@
-41f044cf567db09153161403fbab4076  qt-creator-1.2.1-src.zip
+4025308096e49dd76946fa4fd8d1b95e  qt-creator-1.2.1-src.tar.gz



From scop at fedoraproject.org  Wed Aug 12 17:04:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:04:04 +0000 (UTC)
Subject: rpms/curl/devel .cvsignore, 1.34, 1.35 curl.spec, 1.107,
	1.108 sources, 1.34, 1.35
Message-ID: <20090812170404.9661411C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv644

Modified Files:
	.cvsignore curl.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.19.5-10
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	19 May 2009 18:17:41 -0000	1.34
+++ .cvsignore	12 Aug 2009 17:04:04 -0000	1.35
@@ -1,2 +1 @@
-curl-7.19.4.tar.bz2
-curl-7.19.5.tar.bz2
+curl-7.19.5.tar.lzma


Index: curl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- curl.spec	24 Jul 2009 19:49:40 -0000	1.107
+++ curl.spec	12 Aug 2009 17:04:04 -0000	1.108
@@ -1,10 +1,10 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: Applications/Internet
-Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
+Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
 Patch1: curl-7.15.3-multilib.patch
 Patch2: curl-7.16.0-privlibs.patch
@@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.19.5-10
+- Use lzma compressed upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.19.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	19 May 2009 18:17:41 -0000	1.34
+++ sources	12 Aug 2009 17:04:04 -0000	1.35
@@ -1 +1 @@
-426d161661dce70c8ea9ad8f553363a3  curl-7.19.5.tar.bz2
+e4612af6cc471879ae0f4727457eb6fc  curl-7.19.5.tar.lzma



From tuxbrewr at fedoraproject.org  Wed Aug 12 17:04:52 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 12 Aug 2009 17:04:52 +0000 (UTC)
Subject: rpms/liferea/devel .cvsignore, 1.84, 1.85 liferea.spec, 1.140,
	1.141 sources, 1.85, 1.86
Message-ID: <20090812170452.5CC1811C00D5@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv892

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
Official 1.6.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	23 Jul 2009 19:25:29 -0000	1.84
+++ .cvsignore	12 Aug 2009 17:04:52 -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/devel/liferea.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- liferea.spec	25 Jul 2009 11:03:05 -0000	1.140
+++ liferea.spec	12 Aug 2009 17:04:52 -0000	1.141
@@ -1,14 +1,15 @@
 Name:           liferea
 Version:        1.6.0
-Release:        0.5.rc7%{?dist}
+Release:        0%{?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	
@@ -35,7 +36,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
@@ -106,6 +107,9 @@ fi
 %dir %{_libdir}/%{name}
 
 %changelog
+* Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-0
+- Final 1.6.0 release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-0.5.rc7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	23 Jul 2009 19:25:29 -0000	1.85
+++ sources	12 Aug 2009 17:04:52 -0000	1.86
@@ -1 +1 @@
-8b283144b77d872dce53e402ef8a4cf6  liferea-1.6.0-rc7.tar.gz
+7c532101d3c9cfd71b76d3a8a82622fa  liferea-1.6.0.tar.gz



From mclasen at fedoraproject.org  Wed Aug 12 17:04:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 12 Aug 2009 17:04:57 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany-default-bookmarks.patch, NONE,
	1.1 epiphany.spec, 1.239, 1.240
Message-ID: <20090812170457.729CE11C00D5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv879

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-default-bookmarks.patch 
Log Message:
2.27.90


epiphany-default-bookmarks.patch:
 ephy-bookmarks.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE epiphany-default-bookmarks.patch ---
diff -up epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c.default-bookmarks epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c
--- epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c.default-bookmarks	2009-07-30 07:03:37.000000000 -0400
+++ epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c	2009-08-12 13:02:36.290404807 -0400
@@ -130,14 +130,7 @@ G_DEFINE_TYPE_WITH_CODE (EphyBookmarks, 
 static void
 ephy_bookmarks_init_defaults (EphyBookmarks *eb)
 {
-	int i;
-
-	for (i = 0; i < G_N_ELEMENTS (default_topics); i++)
-	{
-		ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
-	}
-
-	ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf");
+	ephy_bookmarks_import_mozilla (eb, "/usr/share/bookmarks/default-bookmarks.html");
 }
 
 static void


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- epiphany.spec	11 Aug 2009 04:20:47 -0000	1.239
+++ epiphany.spec	12 Aug 2009 17:04:57 -0000	1.240
@@ -50,7 +50,7 @@ BuildRequires: libsoup-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
-Patch2: epiphany-2.18.1-default-bookmarks.patch
+Patch2: epiphany-default-bookmarks.patch
 Patch3: clear-button.patch
 
 %description



From scop at fedoraproject.org  Wed Aug 12 17:05:49 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:05:49 +0000 (UTC)
Subject: rpms/dnsmasq/devel .cvsignore, 1.25, 1.26 dnsmasq.spec, 1.40,
	1.41 sources, 1.25, 1.26
Message-ID: <20090812170549.7824B11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1177

Modified Files:
	.cvsignore dnsmasq.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.48-3
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	10 Jun 2009 12:36:25 -0000	1.25
+++ .cvsignore	12 Aug 2009 17:05:49 -0000	1.26
@@ -1 +1 @@
-dnsmasq-2.48.tar.gz
+dnsmasq-2.48.tar.lzma


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- dnsmasq.spec	24 Jul 2009 20:24:04 -0000	1.40
+++ dnsmasq.spec	12 Aug 2009 17:05:49 -0000	1.41
@@ -11,13 +11,13 @@
 
 Name:           dnsmasq
 Version:        2.48
-Release:        2%{?extraversion}%{?dist}
+Release:        3%{?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.gz
+Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
 Patch0:         %{name}-2.33-initscript.patch
 Patch1:         %{name}-configuration.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -109,6 +109,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.48-3
+- Use lzma compressed upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.48-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	10 Jun 2009 12:36:25 -0000	1.25
+++ sources	12 Aug 2009 17:05:49 -0000	1.26
@@ -1 +1 @@
-8e12a386831b0b597c8a078f31d3fbd5  dnsmasq-2.48.tar.gz
+014eae223140ec283b4301165db0509a  dnsmasq-2.48.tar.lzma



From scop at fedoraproject.org  Wed Aug 12 17:09:02 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:09:02 +0000 (UTC)
Subject: rpms/gnucash/devel .cvsignore, 1.37, 1.38 gnucash.spec, 1.101,
	1.102 sources, 1.39, 1.40
Message-ID: <20090812170902.3F48D11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1842

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	5 Mar 2009 21:28:53 -0000	1.37
+++ .cvsignore	12 Aug 2009 17:09:01 -0000	1.38
@@ -1 +1 @@
-gnucash-2.2.9.tar.bz2
+gnucash-2.2.9.tar.lzma


Index: gnucash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gnucash.spec	25 Jul 2009 00:56:36 -0000	1.101
+++ gnucash.spec	12 Aug 2009 17:09:01 -0000	1.102
@@ -4,10 +4,10 @@ Name: gnucash
 Summary: Finance management application
 Version: 2.2.9
 URL: http://gnucash.org/
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
-Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
+Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.lzma
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkhtml3-devel
 BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
@@ -128,6 +128,9 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.9-3
+- Use lzma compressed upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	5 Mar 2009 21:28:53 -0000	1.39
+++ sources	12 Aug 2009 17:09:02 -0000	1.40
@@ -1 +1 @@
-1d814de8673b4760045bf51b72924d04  gnucash-2.2.9.tar.bz2
+b83c188506f749929a69b48c0632d3b8  gnucash-2.2.9.tar.lzma



From scop at fedoraproject.org  Wed Aug 12 17:10:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:10:26 +0000 (UTC)
Subject: rpms/gpm/devel .cvsignore, 1.7, 1.8 gpm.spec, 1.75, 1.76 sources,
	1.8, 1.9
Message-ID: <20090812171026.B032B11C048B@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/gpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2167

Modified Files:
	.cvsignore gpm.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.20.6-5
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Feb 2009 10:21:19 -0000	1.7
+++ .cvsignore	12 Aug 2009 17:10:26 -0000	1.8
@@ -1 +1 @@
-gpm-1.20.6.tar.gz
+gpm-1.20.6.tar.lzma


Index: gpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- gpm.spec	25 Jul 2009 01:18:05 -0000	1.75
+++ gpm.spec	12 Aug 2009 17:10:26 -0000	1.76
@@ -1,11 +1,11 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
-Source: http://unix.schottelius.org/gpm/archives/%{name}-%{version}.tar.gz
+Source: http://unix.schottelius.org/gpm/archives/%{name}-%{version}.tar.lzma
 Source1: gpm.init
 Source2: inputattach.c
 Patch1: gpm-1.20.6-multilib.patch
@@ -154,6 +154,9 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.20.6-5
+- Use lzma compressed upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Feb 2009 10:21:19 -0000	1.8
+++ sources	12 Aug 2009 17:10:26 -0000	1.9
@@ -1 +1 @@
-b75e794bfb9fe8114d0b083932673b8f  gpm-1.20.6.tar.gz
+9dcb5d3a7db1686adb0974a55098b9e3  gpm-1.20.6.tar.lzma



From scop at fedoraproject.org  Wed Aug 12 17:12:44 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:12:44 +0000 (UTC)
Subject: rpms/hotwire/devel .cvsignore, 1.15, 1.16 hotwire.spec, 1.26,
	1.27 sources, 1.16, 1.17
Message-ID: <20090812171244.CE7A511C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hotwire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2654

Modified Files:
	.cvsignore hotwire.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.721-6
- Use upstream gzipped tarball instead of zip.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Mar 2008 13:44:23 -0000	1.15
+++ .cvsignore	12 Aug 2009 17:12:44 -0000	1.16
@@ -1 +1 @@
-hotwire-0.721.zip
+hotwire-0.721.tar.gz


Index: hotwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/hotwire.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- hotwire.spec	25 Jul 2009 02:12:13 -0000	1.26
+++ hotwire.spec	12 Aug 2009 17:12:44 -0000	1.27
@@ -4,8 +4,8 @@
 Summary: Hotwire Shell
 Name: hotwire
 Version: 0.721
-Release: 5%{?dist}
-Source0: http://hotwire-shell.googlecode.com/files/hotwire-%{version}.zip
+Release: 6%{?dist}
+Source0: http://hotwire-shell.googlecode.com/files/hotwire-%{version}.tar.gz
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -80,6 +80,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.721-6
+- Use upstream gzipped tarball instead of zip.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.721-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	24 Mar 2008 13:44:24 -0000	1.16
+++ sources	12 Aug 2009 17:12:44 -0000	1.17
@@ -1 +1 @@
-501fbe8c270b8931bc423eced9af2be6  hotwire-0.721.zip
+077a32573b32c91d591b668d2dcb9645  hotwire-0.721.tar.gz



From jkeating at fedoraproject.org  Wed Aug 12 17:13:08 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 12 Aug 2009 17:13:08 +0000 (UTC)
Subject: rpms/python-offtrac/devel .cvsignore, 1.2, 1.3 python-offtrac.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090812171308.9188711C00D5@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/python-offtrac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2791

Modified Files:
	.cvsignore python-offtrac.spec sources 
Log Message:
* Wed Aug 12 2009 Jesse Keating <jkeating at redhat.com> - 0.0.3-1
- Declare classes in the correct way, to work on python-2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 23:10:58 -0000	1.2
+++ .cvsignore	12 Aug 2009 17:13:08 -0000	1.3
@@ -1 +1 @@
-offtrac-0.0.2.tar.bz2
+offtrac-0.0.3.tar.bz2


Index: python-offtrac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/devel/python-offtrac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-offtrac.spec	5 Aug 2009 23:10:59 -0000	1.1
+++ python-offtrac.spec	12 Aug 2009 17:13:08 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-offtrac
-Version:        0.0.2
+Version:        0.0.3
 Release:        1%{?dist}
 Summary:        Trac xmlrpc library
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Jesse Keating <jkeating at redhat.com> - 0.0.3-1
+- Declare classes in the correct way, to work on python-2.5
+
 * Wed Aug 05 2009 Jesse Keating <jkeating at redhat.com> - 0.0.2-1
 - Fix licensing issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 23:10:59 -0000	1.2
+++ sources	12 Aug 2009 17:13:08 -0000	1.3
@@ -1 +1 @@
-0498b93c6f4ffbfdc139124e94b2ae0a  offtrac-0.0.2.tar.bz2
+3e4cdcbf50ba492b93748d2e08cbbc9c  offtrac-0.0.3.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 17:15:18 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:15:18 +0000 (UTC)
Subject: rpms/jam/devel .cvsignore, 1.2, 1.3 jam.spec, 1.10, 1.11 sources,
	1.2, 1.3
Message-ID: <20090812171518.679F511C043D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/jam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3286

Modified Files:
	.cvsignore jam.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.5-10
- Use upstream zip instead of uncompressed tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jam/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Sep 2005 22:37:54 -0000	1.2
+++ .cvsignore	12 Aug 2009 17:15:18 -0000	1.3
@@ -1 +1 @@
-jam-2.5.tar
+jam-2.5.zip


Index: jam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jam/devel/jam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- jam.spec	3 Aug 2009 04:34:30 -0000	1.10
+++ jam.spec	12 Aug 2009 17:15:18 -0000	1.11
@@ -1,11 +1,11 @@
 Name:		jam
 Version:	2.5
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	Copyright only
 Group:		Development/Tools
 Summary:	Program construction tool, similar to make
 URL:		http://public.perforce.com/public/jam/index.html
-Source0:	ftp://ftp.perforce.com/jam/%{name}-%{version}.tar
+Source0:	ftp://ftp.perforce.com/jam/%{name}-%{version}.zip
 # Submitted upstream by e-mail
 Patch0:         jam-2.5-overflow.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +20,7 @@ for common use, relying on a user-provid
 targets and sources. 
 
 %prep
-%setup -q
+%setup -q -c
 %patch0 -p1 -b .overflows
 
 %build
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mkjambase
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.5-10
+- Use upstream zip instead of uncompressed tarball.
+
 * Mon Aug  3 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.5-9
 - Add the stack overflow fix patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jam/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Sep 2005 22:37:54 -0000	1.2
+++ sources	12 Aug 2009 17:15:18 -0000	1.3
@@ -1 +1 @@
-c7eb7719d8523c0f819116479492d367  jam-2.5.tar
+f92caadb62fe4cb0b152eff508c9d450  jam-2.5.zip



From scop at fedoraproject.org  Wed Aug 12 17:16:45 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:16:45 +0000 (UTC)
Subject: rpms/lftp/devel .cvsignore, 1.39, 1.40 lftp.spec, 1.82, 1.83 sources,
	1.39, 1.40
Message-ID: <20090812171645.1303311C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3545

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.7.14-6
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	22 May 2009 12:13:41 -0000	1.39
+++ .cvsignore	12 Aug 2009 17:16:44 -0000	1.40
@@ -1 +1 @@
-lftp-3.7.14.tar.gz
+lftp-3.7.14.tar.lzma


Index: lftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- lftp.spec	25 Jul 2009 05:05:52 -0000	1.82
+++ lftp.spec	12 Aug 2009 17:16:44 -0000	1.83
@@ -1,10 +1,10 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
 Version:	3.7.14
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
-Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
+Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma
 URL:		http://lftp.yar.ru/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.7.14-6
+- Use lzma compressed upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lftp/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	22 May 2009 12:13:41 -0000	1.39
+++ sources	12 Aug 2009 17:16:44 -0000	1.40
@@ -1 +1 @@
-b0cad53f75ebd37b9dc6aeeb8d05f88c  lftp-3.7.14.tar.gz
+102f675cdc937dd1c4c7a919cf908678  lftp-3.7.14.tar.lzma



From scop at fedoraproject.org  Wed Aug 12 17:19:13 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:19:13 +0000 (UTC)
Subject: rpms/pacemaker/devel .cvsignore, 1.2, 1.3 pacemaker.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090812171914.0519A11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4478

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.5-0.7.c9120a53a6ae.hg
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Jul 2009 05:47:06 -0000	1.2
+++ .cvsignore	12 Aug 2009 17:19:13 -0000	1.3
@@ -1 +1 @@
-c9120a53a6ae.tar.gz
+c9120a53a6ae.tar.bz2


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pacemaker.spec	31 Jul 2009 05:47:06 -0000	1.1
+++ pacemaker.spec	12 Aug 2009 17:19:13 -0000	1.2
@@ -16,11 +16,11 @@
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}6%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}7%{?alphatag:.%{alphatag}}%{?dist}
 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.gz
+Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstreamversion}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
@@ -210,6 +210,8 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.5-0.7.c9120a53a6ae.hg
+- Use bzipped upstream tarball.
 
 * Wed Jul  29 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-0.6.c9120a53a6ae.hg
 - Add back missing build auto* dependancies


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jul 2009 05:47:06 -0000	1.2
+++ sources	12 Aug 2009 17:19:13 -0000	1.3
@@ -1 +1 @@
-0737aaf01c73868fe006b4880ef2776e  c9120a53a6ae.tar.gz
+acc5f83dbe09b508347a0b01bc9d0752  c9120a53a6ae.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 17:20:40 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:20:40 +0000 (UTC)
Subject: rpms/libgdl/devel .cvsignore, 1.10, 1.11 libgdl.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20090812172040.8915511C0489@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libgdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5042

Modified Files:
	.cvsignore libgdl.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Jul 2009 05:27:18 -0000	1.10
+++ .cvsignore	12 Aug 2009 17:20:40 -0000	1.11
@@ -1 +1 @@
-gdl-2.27.3.tar.gz
+gdl-2.27.3.tar.bz2


Index: libgdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdl/devel/libgdl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libgdl.spec	25 Jul 2009 05:42:34 -0000	1.16
+++ libgdl.spec	12 Aug 2009 17:20:40 -0000	1.17
@@ -1,12 +1,12 @@
 Summary:	Components and library for GNOME development tools
 Name:		libgdl
 Version:	2.27.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 # Mixed source licensing scenario.
 License:	(GPLv2 and GPLv2+ and LGPLv2+)
 Group:		Development/Libraries
 URL:		http://www.gnome.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdl/2.27/gdl-%{version}.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdl/2.27/gdl-%{version}.tar.bz2
 
 Patch0:		%{name}-%{version}-pkgconfig.patch
 
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-1.0/gdl
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-3
+- Use bzipped upstream tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdl/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Jul 2009 05:27:18 -0000	1.10
+++ sources	12 Aug 2009 17:20:40 -0000	1.11
@@ -1 +1 @@
-0f6aeeaeabb6b2617861d5297f35b0a2  gdl-2.27.3.tar.gz
+1a01f8c43f7ed7dbae75307f0b6cc843  gdl-2.27.3.tar.bz2



From jkeating at fedoraproject.org  Wed Aug 12 17:20:45 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 12 Aug 2009 17:20:45 +0000 (UTC)
Subject: rpms/python-offtrac/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-offtrac.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090812172045.6795811C00D5@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/python-offtrac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4924/F-11

Modified Files:
	.cvsignore import.log python-offtrac.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 23:14:31 -0000	1.2
+++ .cvsignore	12 Aug 2009 17:20:45 -0000	1.3
@@ -1 +1 @@
-offtrac-0.0.2.tar.bz2
+offtrac-0.0.3.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Aug 2009 23:14:31 -0000	1.1
+++ import.log	12 Aug 2009 17:20:45 -0000	1.2
@@ -1 +1,2 @@
 python-offtrac-0_0_2-1_fc11:F-11:python-offtrac-0.0.2-1.fc11.src.rpm:1249514043
+python-offtrac-0_0_3-1_fc12:F-11:python-offtrac-0.0.3-1.fc12.src.rpm:1250097582


Index: python-offtrac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/F-11/python-offtrac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-offtrac.spec	5 Aug 2009 23:14:31 -0000	1.1
+++ python-offtrac.spec	12 Aug 2009 17:20:45 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-offtrac
-Version:        0.0.2
+Version:        0.0.3
 Release:        1%{?dist}
 Summary:        Trac xmlrpc library
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Jesse Keating <jkeating at redhat.com> - 0.0.3-1
+- Declare classes in the correct way, to work on python-2.5
+
 * Wed Aug 05 2009 Jesse Keating <jkeating at redhat.com> - 0.0.2-1
 - Fix licensing issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-offtrac/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 23:14:31 -0000	1.2
+++ sources	12 Aug 2009 17:20:45 -0000	1.3
@@ -1 +1 @@
-0498b93c6f4ffbfdc139124e94b2ae0a  offtrac-0.0.2.tar.bz2
+3e4cdcbf50ba492b93748d2e08cbbc9c  offtrac-0.0.3.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 17:21:59 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:21:59 +0000 (UTC)
Subject: rpms/libsexy/devel .cvsignore, 1.10, 1.11 libsexy.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <20090812172159.6473C11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libsexy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5385

Modified Files:
	.cvsignore libsexy.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.1.11-12
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	31 Mar 2007 14:52:42 -0000	1.10
+++ .cvsignore	12 Aug 2009 17:21:59 -0000	1.11
@@ -1 +1 @@
-libsexy-0.1.11.tar.gz
+libsexy-0.1.11.tar.bz2


Index: libsexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libsexy.spec	25 Jul 2009 08:36:35 -0000	1.23
+++ libsexy.spec	12 Aug 2009 17:21:59 -0000	1.24
@@ -1,12 +1,12 @@
 Name:           libsexy
 Version:        0.1.11
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.chipx86.com/wiki/Libsexy
-Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-url-label.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.1.11-12
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.11-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 Mar 2007 14:52:42 -0000	1.10
+++ sources	12 Aug 2009 17:21:59 -0000	1.11
@@ -1 +1 @@
-33c079a253270ec8bfb9508e4bb30754  libsexy-0.1.11.tar.gz
+056b5d9d22941cdd881c7823e643d3a8  libsexy-0.1.11.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug 12 17:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:23:24 +0000
Subject: [pkgdb] python-offtrac EL-5 cloned from devel
Message-ID: <20090812172324.B204510F80B@bastion2.fedora.phx.redhat.com>

ausil cloned python-offtrac EL-5 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-offtrac



From pkgdb at fedoraproject.org  Wed Aug 12 17:23:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:23:25 +0000
Subject: [pkgdb] python-offtrac F-10 cloned from devel
Message-ID: <20090812172326.2037910F848@bastion2.fedora.phx.redhat.com>

ausil cloned python-offtrac F-10 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-offtrac



From scop at fedoraproject.org  Wed Aug 12 17:23:48 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:23:48 +0000 (UTC)
Subject: rpms/libtheora/devel .cvsignore, 1.14, 1.15 libtheora.spec, 1.37,
	1.38 sources, 1.14, 1.15
Message-ID: <20090812172348.5EAF811C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libtheora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5855

Modified Files:
	.cvsignore libtheora.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1beta1-2
- Use xz compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Aug 2009 01:08:16 -0000	1.14
+++ .cvsignore	12 Aug 2009 17:23:48 -0000	1.15
@@ -1 +1 @@
-libtheora-1.1beta1.tar.bz2
+libtheora-1.1beta1.tar.xz


Index: libtheora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libtheora.spec	6 Aug 2009 01:08:17 -0000	1.37
+++ libtheora.spec	12 Aug 2009 17:23:48 -0000	1.38
@@ -1,12 +1,12 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.1beta1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.theora.org
-Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.bz2
+Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1beta1-2
+- Use xz compressed upstream tarball.
+
 * Wed Aug  5 2009 Matthias Clasen <mclasen at redhat.com> - 1.1beta1
 - 1.1beta1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	6 Aug 2009 01:08:17 -0000	1.14
+++ sources	12 Aug 2009 17:23:48 -0000	1.15
@@ -1 +1 @@
-4b5e93ff571edb394d931c1228aaa351  libtheora-1.1beta1.tar.bz2
+6eee1d20172f89f29218c5a89666a7d8  libtheora-1.1beta1.tar.xz



From kyle at fedoraproject.org  Wed Aug 12 17:24:58 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 12 Aug 2009 17:24:58 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-no-gem-on-i8xx.patch, 1.4, 1.5 kernel.spec,
	1.1702, 1.1703
Message-ID: <20090812172458.E3FD811C00D5@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6130

Modified Files:
	drm-no-gem-on-i8xx.patch kernel.spec 
Log Message:
* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
- drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX.


drm-no-gem-on-i8xx.patch:
 i915_dma.c |    4 ++--
 i915_drv.h |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

Index: drm-no-gem-on-i8xx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-no-gem-on-i8xx.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drm-no-gem-on-i8xx.patch	12 Aug 2009 16:49:50 -0000	1.4
+++ drm-no-gem-on-i8xx.patch	12 Aug 2009 17:24:58 -0000	1.5
@@ -21,7 +21,7 @@ index c431fa5..dcf5257 100644
  #define IS_I855(dev) ((dev)->pci_device == 0x3582)
  #define IS_I865G(dev) ((dev)->pci_device == 0x2572)
  
-+#define IS_I8XX(dev) (IS_I830(dev) || IS_I845G(dev) || IS_I85X(dev) ||	\
++#define IS_8XX(dev) (IS_I830(dev) || IS_I845G(dev) || IS_I85X(dev) ||	\
 +			IS_I855(dev))
 +
  #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1702
retrieving revision 1.1703
diff -u -p -r1.1702 -r1.1703
--- kernel.spec	12 Aug 2009 16:49:51 -0000	1.1702
+++ kernel.spec	12 Aug 2009 17:24:58 -0000	1.1703
@@ -1898,6 +1898,9 @@ fi
 
 %changelog
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
+- drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX.
+
+* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - DRM patch sync-up with F-11-2.6.29.y, ABI probably isn't right yet though...
  - drm-modesetting-radeon.patch
  - drm-nouveau.patch



From scop at fedoraproject.org  Wed Aug 12 17:25:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:25:09 +0000 (UTC)
Subject: rpms/libtool/devel .cvsignore, 1.18, 1.19 libtool.spec, 1.77,
	1.78 sources, 1.18, 1.19
Message-ID: <20090812172509.3DC7C11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6227

Modified Files:
	.cvsignore libtool.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.6-14
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtool/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	13 Nov 2008 13:11:40 -0000	1.18
+++ .cvsignore	12 Aug 2009 17:25:09 -0000	1.19
@@ -1 +1 @@
-libtool-2.2.6a.tar.gz
+libtool-2.2.6a.tar.lzma


Index: libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libtool.spec	25 Jul 2009 08:47:11 -0000	1.77
+++ libtool.spec	12 Aug 2009 17:25:09 -0000	1.78
@@ -3,10 +3,10 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
-Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.gz
+Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.lzma
 Patch0:  libtool-2.2.6a-rpath.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.6-14
+- Use lzma compressed upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.6-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtool/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	13 Nov 2008 13:11:40 -0000	1.18
+++ sources	12 Aug 2009 17:25:09 -0000	1.19
@@ -1 +1 @@
-8ca1ea241cd27ff9832e045fe9afe4fd  libtool-2.2.6a.tar.gz
+b121e4848cc53fdd69e796aed73b9ccf  libtool-2.2.6a.tar.lzma



From scop at fedoraproject.org  Wed Aug 12 17:26:18 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:26:18 +0000 (UTC)
Subject: rpms/libuninum/devel .cvsignore, 1.2, 1.3 libuninum.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090812172618.2394311C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libuninum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492

Modified Files:
	.cvsignore libuninum.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.7-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuninum/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 May 2008 10:03:57 -0000	1.2
+++ .cvsignore	12 Aug 2009 17:26:17 -0000	1.3
@@ -1 +1 @@
-libuninum-2.7.tar.gz
+libuninum-2.7.tar.bz2


Index: libuninum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuninum/devel/libuninum.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libuninum.spec	25 Jul 2009 08:49:07 -0000	1.4
+++ libuninum.spec	12 Aug 2009 17:26:18 -0000	1.5
@@ -1,12 +1,12 @@
 Summary:       Library for converting unicode strings to numbers
 Name:          libuninum
 Version:       2.7
-Release:       5%{?dist}
+Release:       6%{?dist}
 # numconv is GPLv2, lib is LGPLv2
 License:       GPLv2 and LGPLv2
 Group:         Development/Libraries
 URL:           http://billposer.org/Software/libuninum.html
-Source0:       http://billposer.org/Software/Downloads/%{name}-%{version}.tar.gz
+Source0:       http://billposer.org/Software/Downloads/%{name}-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmp-devel
 
@@ -69,6 +69,9 @@ using %{name}, you will need to install 
 %exclude %{_libdir}/libuninum.la
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.7-6
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuninum/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 May 2008 20:16:08 -0000	1.3
+++ sources	12 Aug 2009 17:26:18 -0000	1.4
@@ -1 +1 @@
-86bf829d4d9b1374f7577c4d812b108c  libuninum-2.7.tar.gz
+09f4d7a8bf2dde1683e23779d53c5bc5  libuninum-2.7.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 17:27:31 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:27:31 +0000 (UTC)
Subject: rpms/libzip/devel .cvsignore, 1.3, 1.4 libzip.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <20090812172731.E0A8E11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6776

Modified Files:
	.cvsignore libzip.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.9-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libzip/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Dec 2008 20:54:25 -0000	1.3
+++ .cvsignore	12 Aug 2009 17:27:31 -0000	1.4
@@ -1 +1 @@
-libzip-0.9.tar.gz
+libzip-0.9.tar.bz2


Index: libzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzip/devel/libzip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libzip.spec	25 Jul 2009 11:02:04 -0000	1.6
+++ libzip.spec	12 Aug 2009 17:27:31 -0000	1.7
@@ -3,13 +3,13 @@
 
 Name:           libzip
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C library for reading, creating, and modifying zip archives
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.nih.at/libzip/index.html
-Source0:        http://www.nih.at/libzip/%{name}-%{version}.tar.gz
+Source0:        http://www.nih.at/libzip/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake libtool
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.9-4
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libzip/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Dec 2008 20:54:25 -0000	1.3
+++ sources	12 Aug 2009 17:27:31 -0000	1.4
@@ -1 +1 @@
-5b753dfe336f6fe87b0e698b382c3071  libzip-0.9.tar.gz
+56b9f11c1eee5eed189a20183d7e06b0  libzip-0.9.tar.bz2



From ruben at fedoraproject.org  Wed Aug 12 17:28:31 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Wed, 12 Aug 2009 17:28:31 +0000 (UTC)
Subject: rpms/mysql-proxy/devel mysql-proxy.init, NONE,
	1.1 mysql-proxy.sysconfig, NONE, 1.1 .cvsignore, 1.4,
	1.5 mysql-proxy.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090812172831.EA5FC11C00D5@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/mysql-proxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7041

Modified Files:
	.cvsignore mysql-proxy.spec sources 
Added Files:
	mysql-proxy.init mysql-proxy.sysconfig 
Log Message:
* Wed Aug 12 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.7.2-1
- Upstream released new version



--- NEW FILE mysql-proxy.init ---
#!/bin/bash
#
# mysql-proxy This script starts and stops the mysql-proxy daemon
#
# chkconfig: - 78 30
# processname: mysql-proxy
# description: mysql-proxy is a proxy daemon for mysql

# Source function library.
. /etc/rc.d/init.d/functions

prog="mysql-proxy"

# Source networking configuration.
if [ -f /etc/sysconfig/network ]; then
    . /etc/sysconfig/network
fi

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

# Set default mysql-proxy configuration.
PROXY_OPTIONS="--daemon"
PROXY_PID=/var/run/mysql-proxy.pid
PROXY_USER="mysql-proxy"

# Source mysql-proxy configuration.
if [ -f /etc/sysconfig/mysql-proxy ]; then
    . /etc/sysconfig/mysql-proxy
fi

RETVAL=0

start() {
    echo -n $"Starting $prog: "
    daemon $prog $PROXY_OPTIONS --pid-file $PROXY_PID --user $PROXY_USER
    RETVAL=$?
    echo
    if [ $RETVAL -eq 0 ]; then
        touch /var/lock/subsys/mysql-proxy
    fi
}

stop() {
    echo -n $"Stopping $prog: "
    killproc -p $PROXY_PID -d 3 $prog
    RETVAL=$?
    echo
    if [ $RETVAL -eq 0 ]; then
        rm -f /var/lock/subsys/mysql-proxy
        rm -f $PROXY_PID
    fi
}
# See how we were called.
case "$1" in
    start)
        start
        ;;
    stop)
        stop
        ;;
    restart)
        stop
        start
        ;;
    condrestart|try-restart)
        if status -p $PROXY_PIDFILE $prog >&/dev/null; then
            stop
            start
        fi
        ;;
    status)
        status -p $PROXY_PID $prog
        ;;
    *)
        echo "Usage: $0 {start|stop|restart|reload|status|condrestart|try-restart}"
        RETVAL=1
        ;;
esac

exit $RETVAL



--- NEW FILE mysql-proxy.sysconfig ---
# Options for mysql-proxy 
PROXY_USER="mysql-proxy"
PROXY_OPTIONS="--daemon --log-level=info --log-use-syslog"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-proxy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Feb 2008 13:14:14 -0000	1.4
+++ .cvsignore	12 Aug 2009 17:28:31 -0000	1.5
@@ -1 +1 @@
-mysql-proxy-0.6.1.tar.gz
+mysql-proxy-0.7.2.tar.gz


Index: mysql-proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-proxy/devel/mysql-proxy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mysql-proxy.spec	25 Jul 2009 15:31:48 -0000	1.9
+++ mysql-proxy.spec	12 Aug 2009 17:28:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mysql-proxy
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A proxy for the MySQL Client/Server protocol
 
 Group:          Applications/Databases
@@ -9,6 +9,8 @@ URL:            http://forge.mysql.com/w
 
 # I haven't found a link to a direct download location, only to mirrors
 Source0:        http://mysql.he.net/Downloads/MySQL-Proxy/%{name}-%{version}.tar.gz
+Source1:    %{name}.init
+Source2:    %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua-devel
@@ -19,6 +21,12 @@ BuildRequires:  gawk
 BuildRequires:  check-devel
 BuildRequires:  flex
 
+Requires(pre):  shadow-utils
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
+
 %description
 MySQL Proxy is a simple program that sits between your client and MySQL
 server(s) that can monitor, analyze or transform their communication.
@@ -27,33 +35,69 @@ failover, query analysis, query filterin
 
 %prep
 %setup -q -n %{name}-%{version}
-
+sed -i 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir, "%{_lib}"/g' src/chassis.c
+sed -i 's/g_build_filename(srv->base_dir, "lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis.c
 
 %build
 %configure
+# strip rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-rm -v %{buildroot}%{_datadir}/*.lua
-rm -v examples/Makefile*
+find %{buildroot} -type f -name \*.la -exec rm -v {} \;
+rm -v examples/Makefile* examples/CMakeLists.txt
+install -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
+install -Dp -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+getent group %{name} &>/dev/null || groupadd -r %{name} &>/dev/null
+getent passwd %{name} &>/dev/null || \
+useradd -r -g %{name} -d / -s /sbin/nologin \
+    -c "MySQL-Proxy user" %{name} &>/dev/null || :
+
+%post
+ldconfig
+/sbin/chkconfig --add %{name} || :
+
+%preun
+if [ "$1" = 0 ] ; then
+    /sbin/service %{name} stop > /dev/null 2>&1
+    /sbin/chkconfig --del %{name} || :
+fi
+
+%postun
+ldconfig
+if [ "$1" -ge 1 ]; then
+    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+fi
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
 %doc examples/
 %{_sbindir}/%{name}
-%{_datadir}/%{name}
-
-
+%{_initrddir}/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_bindir}/mysql-binlog-dump
+%{_bindir}/mysql-myisam-dump
+%{_libdir}/libmysql-chassis.so*
+%{_libdir}/libmysql-proxy.so*
+%{_libdir}/%{name}
 
 %changelog
+* Wed Aug 12 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.7.2-1
+- Upstream released new version
+
 * Sat Jul 25 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/mysql-proxy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Feb 2008 13:14:14 -0000	1.4
+++ sources	12 Aug 2009 17:28:31 -0000	1.5
@@ -1 +1 @@
-f5b003f069c294002ae37c6df3a7a0a5  mysql-proxy-0.6.1.tar.gz
+85caf142acfb4ee7ae5a8bce175579f7  mysql-proxy-0.7.2.tar.gz



From scop at fedoraproject.org  Wed Aug 12 17:29:13 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:29:13 +0000 (UTC)
Subject: rpms/lzma/devel .cvsignore, 1.5, 1.6 lzma.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <20090812172913.583A811C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/lzma/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7289

Modified Files:
	.cvsignore lzma.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.32.7-4
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lzma/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Aug 2008 07:15:21 -0000	1.5
+++ .cvsignore	12 Aug 2009 17:29:13 -0000	1.6
@@ -1 +1 @@
-lzma-4.32.7.tar.gz
+lzma-4.32.7.tar.lzma


Index: lzma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lzma/devel/lzma.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lzma.spec	25 Jul 2009 11:34:22 -0000	1.8
+++ lzma.spec	12 Aug 2009 17:29:13 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: 	LZMA utils
 Name: 		lzma
 Version: 	4.32.7
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPLv2+
 Group:		Applications/File
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}.tar.lzma
 URL:		http://tukaani.org/%{name}/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs	= %{version}-%{release}
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.32.7-4
+- Use lzma compressed upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.32.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lzma/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Aug 2008 07:15:21 -0000	1.5
+++ sources	12 Aug 2009 17:29:13 -0000	1.6
@@ -1 +1 @@
-2a748b77a2f8c3cbc322dbd0b4c9d06a  lzma-4.32.7.tar.gz
+16c3ae92c8e7d3b442c785a9615b82eb  lzma-4.32.7.tar.lzma



From bretm at fedoraproject.org  Wed Aug 12 17:29:15 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed, 12 Aug 2009 17:29:15 +0000 (UTC)
Subject: rpms/wordpress-mu/F-10 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 wordpress-mu.spec, 1.5, 1.6
Message-ID: <20090812172915.1173F11C02CB@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7316

Modified Files:
	.cvsignore sources wordpress-mu.spec 
Log Message:
update to 2.8.4a, includes security fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Dec 2008 21:29:39 -0000	1.3
+++ .cvsignore	12 Aug 2009 17:29:14 -0000	1.4
@@ -1 +1,2 @@
 wordpress-mu-2.6.5.tar.gz
+wordpress-mu-2.8.4a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jul 2009 18:39:23 -0000	1.4
+++ sources	12 Aug 2009 17:29:14 -0000	1.5
@@ -1 +1,2 @@
 b7d119c663833a3fe00d30224530447e  wordpress-mu-2.7.tar.gz
+72dcdfaa60ede87d320b479579028d5e  wordpress-mu-2.8.4a.tar.gz


Index: wordpress-mu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-10/wordpress-mu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- wordpress-mu.spec	10 Jul 2009 18:39:23 -0000	1.5
+++ wordpress-mu.spec	12 Aug 2009 17:29:14 -0000	1.6
@@ -1,14 +1,13 @@
 Summary: WordPress-MU multi-user blogging software
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
-Version: 2.7
-Release: 6%{?dist}
+Version: 2.8.4a
+Release: 1%{?dist}
 Group: Applications/Publishing
 License: GPLv2
 Source0: %{name}-%{version}.tar.gz
 Source1: wordpress-mu-httpd-conf
 Source2: README.fedora.wordpress-mu
-Patch0: cve-2009-2334.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
@@ -19,7 +18,6 @@ one instance to serve multiple users.
 
 %prep
 %setup -q -n wordpress-mu
-%patch0 -p1 -b .patch1
 
 # disable-wordpress-core-update, updates are always installed via rpm
 #
@@ -90,6 +88,7 @@ rm -rf %{buildroot}
 %{_datadir}/wordpress-mu/wp-mail.php
 %{_datadir}/wordpress-mu/wp-pass.php
 %{_datadir}/wordpress-mu/wp-rdf.php
+%{_datadir}/wordpress-mu/wp-register.php
 %{_datadir}/wordpress-mu/wp-rss.php
 %{_datadir}/wordpress-mu/wp-rss2.php
 %{_datadir}/wordpress-mu/wp-settings.php
@@ -100,6 +99,9 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
+* Wed Aug 12 2009 Bret McMillan <bretm at redhat.com> - 2.8.4a-1
+- Update to version 2.8.4a for security fixes
+
 * Fri Jul 10 2009 Bret McMillan <bretm at redhat.com> - 2.7-6
 - Patch for CVE-2009-2334
 - Update to version 2.7



From thm at fedoraproject.org  Wed Aug 12 17:30:15 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 12 Aug 2009 17:30:15 +0000 (UTC)
Subject: rpms/botan/devel .cvsignore, 1.4, 1.5 botan.spec, 1.7,
	1.8 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090812173015.94AE711C048B@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7688/devel

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Apr 2009 18:22:54 -0000	1.4
+++ .cvsignore	12 Aug 2009 17:30:15 -0000	1.5
@@ -1 +1 @@
-Botan-1.8.2.tgz
+Botan-1.8.5.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- botan.spec	24 Jul 2009 18:21:47 -0000	1.7
+++ botan.spec	12 Aug 2009 17:30:15 -0000	1.8
@@ -1,16 +1,16 @@
 Name:           botan
-Version:        1.8.2
-Release:        2%{?dist}
+Version:        1.8.5
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
-Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
+Source0:        http://files.randombit.net/botan/Botan-%{version}.tbz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
-BuildRequires:  perl
+BuildRequires:  python
 
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
@@ -54,7 +54,7 @@ developing applications that use %{name}
 # fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
-./configure.pl \
+./configure.py \
         --prefix=%{_prefix} \
         --libdir=%{_lib} \
         --cc=gcc \
@@ -110,6 +110,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Wed Aug 12 2009 Thomas Moschny <moschny at andromeda.ipd.uni-karlsruhe.de> - 1.8.5-1
+- Update to 1.8.5.
+- Use .tbz source file.
+- Configuration script uses python now.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	25 Apr 2009 18:22:55 -0000	1.4
+++ import.log	12 Aug 2009 17:30:15 -0000	1.5
@@ -2,3 +2,4 @@ botan-1_8_0-2_fc10:HEAD:botan-1.8.0-2.fc
 botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc10.src.rpm:1232633562
 botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc10.src.rpm:1237195036
 botan-1_8_2-1_fc10:HEAD:botan-1.8.2-1.fc10.src.rpm:1240683730
+botan-1_8_5-1_fc11:HEAD:botan-1.8.5-1.fc11.src.rpm:1250098169


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Apr 2009 18:22:55 -0000	1.4
+++ sources	12 Aug 2009 17:30:15 -0000	1.5
@@ -1 +1 @@
-f2eff7f7d35662c8242a569a124a65f5  Botan-1.8.2.tgz
+6c0943fa4282bd57a23316c6d3c21279  Botan-1.8.5.tbz



From bretm at fedoraproject.org  Wed Aug 12 17:31:40 2009
From: bretm at fedoraproject.org (Bret Richard McMillan)
Date: Wed, 12 Aug 2009 17:31:40 +0000 (UTC)
Subject: rpms/wordpress-mu/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 wordpress-mu.spec, 1.8, 1.9
Message-ID: <20090812173140.1E7CF11C00D5@cvs1.fedora.phx.redhat.com>

Author: bretm

Update of /cvs/pkgs/rpms/wordpress-mu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8070

Modified Files:
	.cvsignore sources wordpress-mu.spec 
Log Message:
update to 2.8.4a for security fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Feb 2009 19:30:57 -0000	1.4
+++ .cvsignore	12 Aug 2009 17:31:39 -0000	1.5
@@ -1 +1,2 @@
 wordpress-mu-2.7.tar.gz
+wordpress-mu-2.8.4a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Feb 2009 19:30:57 -0000	1.4
+++ sources	12 Aug 2009 17:31:39 -0000	1.5
@@ -1 +1,2 @@
 b7d119c663833a3fe00d30224530447e  wordpress-mu-2.7.tar.gz
+72dcdfaa60ede87d320b479579028d5e  wordpress-mu-2.8.4a.tar.gz


Index: wordpress-mu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordpress-mu/F-11/wordpress-mu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wordpress-mu.spec	10 Jul 2009 18:12:58 -0000	1.8
+++ wordpress-mu.spec	12 Aug 2009 17:31:39 -0000	1.9
@@ -1,14 +1,13 @@
 Summary: WordPress-MU multi-user blogging software
 URL: http://mu.wordpress.org/latest.tar.gz
 Name: wordpress-mu
-Version: 2.7
-Release: 6%{?dist}
+Version: 2.8.4a
+Release: 1%{?dist}
 Group: Applications/Publishing
 License: GPLv2
 Source0: %{name}-%{version}.tar.gz
 Source1: wordpress-mu-httpd-conf
 Source2: README.fedora.wordpress-mu
-Patch0: cve-2009-2334.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
@@ -19,7 +18,6 @@ one instance to serve multiple users.
 
 %prep
 %setup -q -n wordpress-mu
-%patch0 -p1 -b .patch1
 
 # disable-wordpress-core-update, updates are always installed via rpm
 #
@@ -90,6 +88,7 @@ rm -rf %{buildroot}
 %{_datadir}/wordpress-mu/wp-mail.php
 %{_datadir}/wordpress-mu/wp-pass.php
 %{_datadir}/wordpress-mu/wp-rdf.php
+%{_datadir}/wordpress-mu/wp-register.php
 %{_datadir}/wordpress-mu/wp-rss.php
 %{_datadir}/wordpress-mu/wp-rss2.php
 %{_datadir}/wordpress-mu/wp-settings.php
@@ -100,6 +99,9 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/wordpress-mu
 
 %changelog
+* Wed Aug 12 2009 Bret McMillan <bretm at redhat.com> - 2.8.4a-1
+- Update to version 2.8.4a for security fixes
+
 * Fri Jul 10 2009 Bret McMillan <bretm at redhat.com> - 2.7-6
 - Patch for CVE-2009-2334
 



From pkgdb at fedoraproject.org  Wed Aug 12 17:31:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:31:47 +0000
Subject: [pkgdb] pixman: epienbro has requested watchcommits
Message-ID: <20090812173147.C303B10F80B@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on pixman (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Wed Aug 12 17:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:31:58 +0000
Subject: [pkgdb] pixman: epienbro has requested watchcommits
Message-ID: <20090812173159.1956910F842@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on pixman (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pixman



From pkgdb at fedoraproject.org  Wed Aug 12 17:32:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:32:40 +0000
Subject: [pkgdb] cairo: epienbro has requested watchcommits
Message-ID: <20090812173240.9C46D10F80B@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on cairo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Wed Aug 12 17:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:32:51 +0000
Subject: [pkgdb] cairo: epienbro has requested watchcommits
Message-ID: <20090812173252.1611D10F841@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on cairo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Wed Aug 12 17:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:33:28 +0000
Subject: [pkgdb] glib2: epienbro has requested watchcommits
Message-ID: <20090812173329.31FB910F80B@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on glib2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glib2



From pkgdb at fedoraproject.org  Wed Aug 12 17:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:33:36 +0000
Subject: [pkgdb] glib2: epienbro has requested watchcommits
Message-ID: <20090812173337.1666710F872@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on glib2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glib2



From pkgdb at fedoraproject.org  Wed Aug 12 17:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:33:54 +0000
Subject: [pkgdb] gtk2: epienbro has requested watchcommits
Message-ID: <20090812173355.A57FF10F80B@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on gtk2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 17:34:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:34:04 +0000
Subject: [pkgdb] gtk2: epienbro has requested watchcommits
Message-ID: <20090812173404.AA14210F841@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on gtk2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 17:34:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:34:45 +0000
Subject: [pkgdb] libxml2: epienbro has requested watchcommits
Message-ID: <20090812173445.8601510F7C4@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on libxml2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml2



From pkgdb at fedoraproject.org  Wed Aug 12 17:34:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:34:52 +0000
Subject: [pkgdb] libxml2: epienbro has requested watchcommits
Message-ID: <20090812173452.BE95F10F841@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on libxml2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml2



From scop at fedoraproject.org  Wed Aug 12 17:35:16 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:35:16 +0000 (UTC)
Subject: rpms/m4/devel .cvsignore, 1.14, 1.15 m4.spec, 1.38, 1.39 sources,
	1.14, 1.15
Message-ID: <20090812173516.5E02511C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/m4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8712

Modified Files:
	.cvsignore m4.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.4.13-3
- Use xz compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m4/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 May 2009 09:48:04 -0000	1.14
+++ .cvsignore	12 Aug 2009 17:35:16 -0000	1.15
@@ -1 +1 @@
-m4-1.4.13.tar.bz2
+m4-1.4.13.tar.xz


Index: m4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m4/devel/m4.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- m4.spec	25 Jul 2009 11:36:07 -0000	1.38
+++ m4.spec	12 Aug 2009 17:35:16 -0000	1.39
@@ -1,10 +1,10 @@
 Summary: The GNU macro processor
 Name: m4
 Version: 1.4.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Text
-Source: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
+Source: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
 URL: http://www.gnu.org/software/m4/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -55,6 +55,9 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.4.13-3
+- Use xz compressed upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m4/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 May 2009 09:48:04 -0000	1.14
+++ sources	12 Aug 2009 17:35:16 -0000	1.15
@@ -1 +1 @@
-28f9ccd3ac4da45409251008b911d677  m4-1.4.13.tar.bz2
+206b13cb45e95cd2ba60bf401900ab2d  m4-1.4.13.tar.xz



From pkgdb at fedoraproject.org  Wed Aug 12 17:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:35:24 +0000
Subject: [pkgdb] pango: epienbro has requested watchcommits
Message-ID: <20090812173524.E438110F80B@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on pango (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pango



From pkgdb at fedoraproject.org  Wed Aug 12 17:35:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:35:35 +0000
Subject: [pkgdb] pango: epienbro has requested watchcommits
Message-ID: <20090812173535.7815810F78D@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on pango (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pango



From pkgdb at fedoraproject.org  Wed Aug 12 17:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:36:00 +0000
Subject: [pkgdb] hunspell: epienbro has requested watchcommits
Message-ID: <20090812173600.786CB10F842@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on hunspell (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell



From pkgdb at fedoraproject.org  Wed Aug 12 17:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:36:12 +0000
Subject: [pkgdb] hunspell: epienbro has requested watchcommits
Message-ID: <20090812173613.2494E10F872@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on hunspell (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell



From pkgdb at fedoraproject.org  Wed Aug 12 17:36:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:36:49 +0000
Subject: [pkgdb] libsoup: epienbro has requested watchcommits
Message-ID: <20090812173652.38BC810F8B6@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on libsoup (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsoup



From pkgdb at fedoraproject.org  Wed Aug 12 17:36:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:36:58 +0000
Subject: [pkgdb] libsoup: epienbro has requested watchcommits
Message-ID: <20090812173659.08EAE10F8AF@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on libsoup (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libsoup



From scop at fedoraproject.org  Wed Aug 12 17:37:00 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:37:00 +0000 (UTC)
Subject: rpms/maradns/devel .cvsignore, 1.3, 1.4 maradns.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090812173700.2667911C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/maradns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9068

Modified Files:
	.cvsignore maradns.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.07.09-4
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maradns/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Feb 2009 00:44:25 -0000	1.3
+++ .cvsignore	12 Aug 2009 17:36:59 -0000	1.4
@@ -1 +1 @@
-maradns-1.3.07.09.tar.bz2
+maradns-1.3.07.09.tar.lzma


Index: maradns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maradns/devel/maradns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- maradns.spec	25 Jul 2009 11:47:59 -0000	1.4
+++ maradns.spec	12 Aug 2009 17:36:59 -0000	1.5
@@ -1,9 +1,9 @@
 Name:		maradns
 Version:	1.3.07.09
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Authoritative and recursive DNS server made with security in mind
 
-Source0:	http://www.maradns.org/download/1.3/%{version}/%{name}-%{version}.tar.bz2
+Source0:	http://www.maradns.org/download/1.3/%{version}/%{name}-%{version}.tar.lzma
 Source1:	maradns.init
 Source2:	zoneserver.init
 Group:		System Environment/Daemons
@@ -12,6 +12,8 @@ URL:		http://www.maradns.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# lzma for decompressing in EL-5
+BuildRequires:		lzma
 Requires(pre):		shadow-utils
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/chkconfig
@@ -170,6 +172,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3.07.09-4
+- Use lzma compressed upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.07.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maradns/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Feb 2009 00:44:28 -0000	1.3
+++ sources	12 Aug 2009 17:36:59 -0000	1.4
@@ -1 +1 @@
-1d221438fb4d9317263555262b9c652c  maradns-1.3.07.09.tar.bz2
+88a437d58d7316a91d574bad4d63ec12  maradns-1.3.07.09.tar.lzma



From pkgdb at fedoraproject.org  Wed Aug 12 17:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:37:13 +0000
Subject: [pkgdb] libxslt: epienbro has requested watchcommits
Message-ID: <20090812173713.AF80710F8AD@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on libxslt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxslt



From pkgdb at fedoraproject.org  Wed Aug 12 17:37:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:37:20 +0000
Subject: [pkgdb] libxslt: epienbro has requested watchcommits
Message-ID: <20090812173720.CC07E10F80A@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on libxslt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxslt



From pkgdb at fedoraproject.org  Wed Aug 12 17:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:38:09 +0000
Subject: [pkgdb] enchant: epienbro has requested watchcommits
Message-ID: <20090812173812.0EBC110F7C4@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on enchant (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/enchant



From pkgdb at fedoraproject.org  Wed Aug 12 17:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:38:14 +0000
Subject: [pkgdb] enchant: epienbro has requested watchcommits
Message-ID: <20090812173815.297DA10F890@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on enchant (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/enchant



From scop at fedoraproject.org  Wed Aug 12 17:38:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:38:29 +0000 (UTC)
Subject: rpms/mikmod/devel .cvsignore, 1.4, 1.5 mikmod.spec, 1.43,
	1.44 sources, 1.6, 1.7
Message-ID: <20090812173829.7BA9111C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mikmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9349

Modified Files:
	.cvsignore mikmod.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.2.2-12.beta1
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mikmod/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Apr 2007 17:32:46 -0000	1.4
+++ .cvsignore	12 Aug 2009 17:38:29 -0000	1.5
@@ -1,4 +1 @@
-libmikmod-3.1.11.tar.gz
-mikmod-3.1.6.tar.gz
-mikmod-3.2.2-beta1.tar.gz
-libmikmod-3.2.0-beta2.tar.gz
+mikmod-3.2.2-beta1.tar.bz2


Index: mikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- mikmod.spec	25 Jul 2009 12:11:28 -0000	1.43
+++ mikmod.spec	12 Aug 2009 17:38:29 -0000	1.44
@@ -3,13 +3,13 @@
 Summary: Music module player
 Name: mikmod
 Version: 3.2.2
-Release: 11.beta1%{?dist}
+Release: 12.beta1%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libmikmod-devel
 URL: http://mikmod.raphnet.net/
-Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz
+Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.bz2
 Patch0: mikmod-3.2.2-beta1-missing-protos.patch
 
 %description
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.2.2-12.beta1
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-11.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mikmod/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Oct 2007 10:03:01 -0000	1.6
+++ sources	12 Aug 2009 17:38:29 -0000	1.7
@@ -1 +1 @@
-9a9534a054afe8d28cc784041e6d1519  mikmod-3.2.2-beta1.tar.gz
+006378681d520fa8ee1dacca965bbd3c  mikmod-3.2.2-beta1.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 17:40:23 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:40:23 +0000 (UTC)
Subject: rpms/moserial/devel .cvsignore, 1.3, 1.4 moserial.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090812174023.D1ADA11C048B@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/moserial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9863

Modified Files:
	.cvsignore moserial.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-2
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moserial/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Jul 2009 14:37:08 -0000	1.3
+++ .cvsignore	12 Aug 2009 17:40:23 -0000	1.4
@@ -1 +1 @@
-moserial-2.27.3.tar.gz
+moserial-2.27.3.tar.bz2


Index: moserial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moserial/devel/moserial.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moserial.spec	31 Jul 2009 14:37:08 -0000	1.3
+++ moserial.spec	12 Aug 2009 17:40:23 -0000	1.4
@@ -1,11 +1,11 @@
 Summary:       Serial terminal for the gnome desktop
 Name:          moserial
 Version:       2.27.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Group:         Applications/Communications
 License:       GPLv3+
 URL:           http://live.gnome.org/moserial/
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/moserial/2.27/moserial-%{version}.tar.gz
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/moserial/2.27/moserial-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      yelp hicolor-icon-theme
 BuildRequires: vala desktop-file-utils GConf2-devel perl(XML::Parser)
@@ -58,6 +58,9 @@ fi
 %{_datadir}/omf/%{name}
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.3-2
+- Use bzipped upstream tarball.
+
 * Fri Jul 31 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.27.3-1
 - 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moserial/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Jul 2009 14:37:08 -0000	1.3
+++ sources	12 Aug 2009 17:40:23 -0000	1.4
@@ -1 +1 @@
-7943770ba35f41be18a2633efee28b77  moserial-2.27.3.tar.gz
+6cfeb8177b63ed6586be595bd7dbf56f  moserial-2.27.3.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 17:41:51 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:41:51 +0000 (UTC)
Subject: rpms/mpfr/devel .cvsignore, 1.7, 1.8 mpfr.spec, 1.15, 1.16 sources, 
	1.7, 1.8
Message-ID: <20090812174151.BD6EA11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/mpfr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10129

Modified Files:
	.cvsignore mpfr.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4.1-4
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Mar 2009 11:21:52 -0000	1.7
+++ .cvsignore	12 Aug 2009 17:41:51 -0000	1.8
@@ -1 +1 @@
-mpfr-2.4.1.tar.bz2
+mpfr-2.4.1.tar.lzma


Index: mpfr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/mpfr.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mpfr.spec	10 Aug 2009 13:24:25 -0000	1.15
+++ mpfr.spec	12 Aug 2009 17:41:51 -0000	1.16
@@ -1,9 +1,9 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
 Version: 2.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.mpfr.org/
-Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.bz2
+Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.lzma
 License: LGPLv2+ and GPLv2+ and GFDL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/mpfr.info*
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4.1-4
+- Use lzma compressed upstream tarball.
+
 * Mon Aug 10 2009 Ivana Varekova <varekova redhat com> 2.4.1-3
 - fix installation with --excludedocs option (#515958)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpfr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Mar 2009 11:21:52 -0000	1.7
+++ sources	12 Aug 2009 17:41:51 -0000	1.8
@@ -1 +1 @@
-c5ee0a8ce82ad55fe29ac57edd35d09e  mpfr-2.4.1.tar.bz2
+22402995cf2496d8faea42c8da02ce1f  mpfr-2.4.1.tar.lzma



From ajax at fedoraproject.org  Wed Aug 12 17:47:31 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 12 Aug 2009 17:47:31 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel
	redhat-rpm-config-9.0.3-jars-with-spaces.patch, NONE,
	1.1 redhat-rpm-config.spec, 1.69, 1.70
Message-ID: <20090812174731.740C411C00D5@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10920

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-9.0.3-jars-with-spaces.patch 
Log Message:
* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 9.0.3-14
- redhat-rpm-config-9.0.3-jars-with-spaces.patch: Handle repacking jars
  whose filenames contain spaces. (#461854)


redhat-rpm-config-9.0.3-jars-with-spaces.patch:
 brp-java-repack-jars |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE redhat-rpm-config-9.0.3-jars-with-spaces.patch ---
--- /usr/lib/rpm/redhat/brp-java-repack-jars.orig	2009-04-20 09:56:37.000000000 -0600
+++ /usr/lib/rpm/redhat/brp-java-repack-jars	2009-04-20 10:01:14.000000000 -0600
@@ -38,8 +38,8 @@
 		rm -f $j
 		
 		# Create the directories first.
-		for d in `find -type d | LC_ALL=C sort`; do
-            		mkdir -p $JARDIR/$d
+		find -type d | LC_ALL=C sort | while read d; do
+            		mkdir -p "$JARDIR/$d"
         	done 
 
 		# Get the modtime from the newest ChangeLog. If the project
@@ -64,14 +64,14 @@
 
 		# move the contents over to the a new directory in order and set
 		# the times. 
-		for f in `find -type f | LC_ALL=C sort`; do 
-            		cp $f $JARDIR/$f
-            		touch --date="$DATE" $JARDIR/$f
+		find -type f | LC_ALL=C sort | while read f; do 
+            		cp "$f" "$JARDIR/$f"
+            		touch --date="$DATE" "$JARDIR/$f"
         	done
 		popd > /dev/null
 
 		# Set the times of the directories.
-		touch --date="$DATE" `find $JARDIR -type d`
+		find $JARDIR -type d -print0 | xargs -0 touch --date="$DATE"
 
 		# make the jar
 		pushd $JARDIR > /dev/null


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- redhat-rpm-config.spec	27 Jul 2009 02:55:19 -0000	1.69
+++ redhat-rpm-config.spec	12 Aug 2009 17:47:31 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -13,6 +13,7 @@ Patch3: redhat-rpm-config-9.0.3-F-11-Str
 Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch
 Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
 Patch6:	redhat-rpm-config-9.0.3-xz-payload.patch
+Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -29,6 +30,7 @@ Red Hat specific rpm configuration files
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p5
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -41,6 +43,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 9.0.3-14
+- redhat-rpm-config-9.0.3-jars-with-spaces.patch: Handle repacking jars
+  whose filenames contain spaces. (#461854)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.0.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thm at fedoraproject.org  Wed Aug 12 17:50:24 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 12 Aug 2009 17:50:24 +0000 (UTC)
Subject: rpms/botan/devel botan.spec,1.8,1.9 import.log,1.5,1.6
Message-ID: <20090812175024.E414811C0489@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12129/devel

Modified Files:
	botan.spec import.log 
Log Message:
Fix changelog.


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- botan.spec	12 Aug 2009 17:30:15 -0000	1.8
+++ botan.spec	12 Aug 2009 17:50:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           botan
 Version:        1.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,7 +110,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
-* Wed Aug 12 2009 Thomas Moschny <moschny at andromeda.ipd.uni-karlsruhe.de> - 1.8.5-1
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-2
+- Fix changelog.
+
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-1
 - Update to 1.8.5.
 - Use .tbz source file.
 - Configuration script uses python now.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	12 Aug 2009 17:30:15 -0000	1.5
+++ import.log	12 Aug 2009 17:50:24 -0000	1.6
@@ -3,3 +3,4 @@ botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc
 botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc10.src.rpm:1237195036
 botan-1_8_2-1_fc10:HEAD:botan-1.8.2-1.fc10.src.rpm:1240683730
 botan-1_8_5-1_fc11:HEAD:botan-1.8.5-1.fc11.src.rpm:1250098169
+botan-1_8_5-2_fc11:HEAD:botan-1.8.5-2.fc11.src.rpm:1250099364



From pkgdb at fedoraproject.org  Wed Aug 12 17:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:56:20 +0000
Subject: [pkgdb] libxml2 had acl change status
Message-ID: <20090812175620.25DB310F800@bastion2.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libxml2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml2



From pkgdb at fedoraproject.org  Wed Aug 12 17:57:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:57:43 +0000
Subject: [pkgdb] libxml2 had acl change status
Message-ID: <20090812175743.C946610F7C4@bastion2.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libxml2 (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxml2



From ajax at fedoraproject.org  Wed Aug 12 17:59:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 12 Aug 2009 17:59:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel .cvsignore, 1.6,
	1.7 dri2-page-flip.patch, 1.1, 1.2 sources, 1.7,
	1.8 xorg-x11-drv-intel.spec, 1.21, 1.22
Message-ID: <20090812175930.BC7F411C00D5@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-serv13533

Modified Files:
	.cvsignore dri2-page-flip.patch sources 
	xorg-x11-drv-intel.spec 
Log Message:
* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 2.8.0-6
- Today's driver snapshot, misc bugfixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	21 Jul 2009 17:33:43 -0000	1.6
+++ .cvsignore	12 Aug 2009 17:59:30 -0000	1.7
@@ -4,3 +4,4 @@ xf86-video-intel-20090624.tar.bz2
 intel-gpu-tools-20090714.tar.bz2
 xf86-video-intel-20090714.tar.bz2
 xf86-video-intel-2.8.0.tar.bz2
+xf86-video-intel-20090812.tar.bz2

dri2-page-flip.patch:
 drmmode_display.c |  126 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    6 ++
 i830_dri.c        |   62 ++++++++++++++++++++++++--
 i830_dri.h        |    6 ++
 4 files changed, 194 insertions(+), 6 deletions(-)

Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/dri2-page-flip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dri2-page-flip.patch	9 Aug 2009 00:53:25 -0000	1.1
+++ dri2-page-flip.patch	12 Aug 2009 17:59:30 -0000	1.2
@@ -1,7 +1,6 @@
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 814743b..05541de 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
+diff -up xf86-video-intel-20090812/src/drmmode_display.c.flip xf86-video-intel-20090812/src/drmmode_display.c
+--- xf86-video-intel-20090812/src/drmmode_display.c.flip	2009-08-12 10:24:52.000000000 -0400
++++ xf86-video-intel-20090812/src/drmmode_display.c	2009-08-12 10:30:42.000000000 -0400
 @@ -30,6 +30,7 @@
  #endif
  
@@ -10,7 +9,7 @@ index 814743b..05541de 100644
  
  #include <sys/ioctl.h>
  
-@@ -43,6 +44,11 @@ typedef struct {
+@@ -45,6 +46,11 @@ typedef struct {
      uint32_t fb_id;
      drmModeResPtr mode_res;
      int cpp;
@@ -22,7 +21,7 @@ index 814743b..05541de 100644
  } drmmode_rec, *drmmode_ptr;
  
  typedef struct {
-@@ -343,6 +349,7 @@ static PixmapPtr
+@@ -345,6 +351,7 @@ static PixmapPtr
  drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
  {
  	ScrnInfoPtr pScrn = crtc->scrn;
@@ -30,7 +29,7 @@ index 814743b..05541de 100644
  	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
  	drmmode_ptr drmmode = drmmode_crtc->drmmode;
  	unsigned long rotate_pitch;
-@@ -375,12 +382,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+@@ -377,12 +384,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr c
  	if (drmmode_crtc->rotate_bo)
  		i830_set_pixmap_bo(rotate_pixmap, drmmode_crtc->rotate_bo);
  
@@ -47,7 +46,7 @@ index 814743b..05541de 100644
  	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
  	drmmode_ptr drmmode = drmmode_crtc->drmmode;
  
-@@ -398,6 +409,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *dat
+@@ -400,6 +411,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr 
  		dri_bo_unreference(drmmode_crtc->rotate_bo);
  		drmmode_crtc->rotate_bo = NULL;
  	}
@@ -55,7 +54,7 @@ index 814743b..05541de 100644
  }
  
  static void
-@@ -1085,15 +1097,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+@@ -1119,15 +1131,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
  	return FALSE;
  }
  
@@ -162,13 +161,13 @@ index 814743b..05541de 100644
  	xf86CrtcConfigPtr   xf86_config;
 +	I830Ptr pI830 = I830PTR(pScrn);
  	drmmode_ptr drmmode;
--	int i;
-+	unsigned int i, bad_crtc = 0;
-+	int ret;
+-	int i, lvds = -1;
++	int i, lvds = -1, bad_crtc = 0;
++        Bool ret;
  
  	drmmode = xnfalloc(sizeof *drmmode);
  	drmmode->fd = fd;
-@@ -1120,6 +1227,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+@@ -1167,6 +1275,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
  
  	xf86InitialConfiguration(pScrn, TRUE);
  
@@ -191,48 +190,9 @@ index 814743b..05541de 100644
  	return TRUE;
  }
  
-diff --git a/src/i830.h b/src/i830.h
-index 58afe76..16e3c55 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -65,6 +65,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include "sarea.h"
- #define _XF86DRI_SERVER_
- #include "dri.h"
-+#include "dri2.h"
- #include "GL/glxint.h"
- #include "i830_dri.h"
- #include "intel_bufmgr.h"
-@@ -395,6 +396,7 @@ typedef struct _I830Rec {
- #endif
- 
-    XF86ModReqInfo shadowReq; /* to test for later libshadow */
-+   Bool shadow_present;
-    Rotation rotation;
-    void (*PointerMoved)(int, int, int);
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-@@ -496,6 +498,8 @@ typedef struct _I830Rec {
-    int drmSubFD;
-    char deviceName[64];
- 
-+   Bool use_swap_buffers;
-+
-    /* Broken-out options. */
-    OptionInfoPtr Options;
- 
-@@ -691,6 +695,8 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
- extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
- extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
- extern int drmmode_output_dpms_status(xf86OutputPtr output);
-+extern Bool drmmode_do_pageflip(DrawablePtr pDraw, dri_bo *new_front,
-+				dri_bo *old_front, void *data);
- extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
- 
- extern Bool i830_crtc_on(xf86CrtcPtr crtc);
-diff --git a/src/i830_dri.c b/src/i830_dri.c
-index 40d11e4..b34b9b7 100644
---- a/src/i830_dri.c
-+++ b/src/i830_dri.c
+diff -up xf86-video-intel-20090812/src/i830_dri.c.flip xf86-video-intel-20090812/src/i830_dri.c
+--- xf86-video-intel-20090812/src/i830_dri.c.flip	2009-08-11 14:50:03.000000000 -0400
++++ xf86-video-intel-20090812/src/i830_dri.c	2009-08-12 10:24:52.000000000 -0400
 @@ -45,6 +45,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  #include <errno.h>
  #include <unistd.h>
@@ -254,7 +214,7 @@ index 40d11e4..b34b9b7 100644
  #ifndef USE_DRI2_1_1_0
  static DRI2BufferPtr
  I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
-@@ -359,6 +356,54 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
+@@ -359,6 +356,54 @@ I830DRI2CopyRegion(DrawablePtr pDraw, Re
  
  }
  
@@ -309,7 +269,7 @@ index 40d11e4..b34b9b7 100644
  Bool I830DRI2ScreenInit(ScreenPtr pScreen)
  {
      ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-@@ -428,6 +473,13 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
+@@ -428,6 +473,13 @@ Bool I830DRI2ScreenInit(ScreenPtr pScree
  # endif
  #endif
  
@@ -323,10 +283,9 @@ index 40d11e4..b34b9b7 100644
      info.CopyRegion = I830DRI2CopyRegion;
  
      return DRI2ScreenInit(pScreen, &info);
-diff --git a/src/i830_dri.h b/src/i830_dri.h
-index bedbcbe..e35e940 100644
---- a/src/i830_dri.h
-+++ b/src/i830_dri.h
+diff -up xf86-video-intel-20090812/src/i830_dri.h.flip xf86-video-intel-20090812/src/i830_dri.h
+--- xf86-video-intel-20090812/src/i830_dri.h.flip	2009-08-11 14:50:03.000000000 -0400
++++ xf86-video-intel-20090812/src/i830_dri.h	2009-08-12 10:24:52.000000000 -0400
 @@ -2,6 +2,7 @@
  #ifndef _I830_DRI_H
  #define _I830_DRI_H
@@ -345,3 +304,40 @@ index bedbcbe..e35e940 100644
 +} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
 +
  #endif
+diff -up xf86-video-intel-20090812/src/i830.h.flip xf86-video-intel-20090812/src/i830.h
+--- xf86-video-intel-20090812/src/i830.h.flip	2009-08-12 10:24:52.000000000 -0400
++++ xf86-video-intel-20090812/src/i830.h	2009-08-12 10:24:52.000000000 -0400
+@@ -65,6 +65,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "sarea.h"
+ #define _XF86DRI_SERVER_
+ #include "dri.h"
++#include "dri2.h"
+ #include "GL/glxint.h"
+ #include "i830_dri.h"
+ #include "intel_bufmgr.h"
+@@ -395,6 +396,7 @@ typedef struct _I830Rec {
+ #endif
+ 
+    XF86ModReqInfo shadowReq; /* to test for later libshadow */
++   Bool shadow_present;
+    Rotation rotation;
+    void (*PointerMoved)(int, int, int);
+    CreateScreenResourcesProcPtr    CreateScreenResources;
+@@ -496,6 +498,8 @@ typedef struct _I830Rec {
+    int drmSubFD;
+    char deviceName[64];
+ 
++   Bool use_swap_buffers;
++
+    /* Broken-out options. */
+    OptionInfoPtr Options;
+ 
+@@ -693,6 +697,8 @@ void I830DRI2CloseScreen(ScreenPtr pScre
+ extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+ extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
+ extern int drmmode_output_dpms_status(xf86OutputPtr output);
++extern Bool drmmode_do_pageflip(DrawablePtr pDraw, dri_bo *new_front,
++				dri_bo *old_front, void *data);
+ extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
+ 
+ extern Bool i830_crtc_on(xf86CrtcPtr crtc);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Jul 2009 17:33:44 -0000	1.7
+++ sources	12 Aug 2009 17:59:30 -0000	1.8
@@ -1,2 +1,2 @@
 9a71381224168221894ec723bf6a98e0  intel-gpu-tools-20090714.tar.bz2
-15a390fe3e126e954ed95aeb8bc02196  xf86-video-intel-2.8.0.tar.bz2
+ddb8d64e005e8ce2f9f2071ccabba86b  xf86-video-intel-20090812.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.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xorg-x11-drv-intel.spec	10 Aug 2009 17:55:49 -0000	1.21
+++ xorg-x11-drv-intel.spec	12 Aug 2009 17:59:30 -0000	1.22
@@ -3,19 +3,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20090714
-#define gitdate 20090714
+%define gitdate 20090812
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   5%{?dist}
+Release:   6%{?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:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
+Source0:    xf86-video-intel-%{gitdate}.tar.bz2
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -23,14 +23,11 @@ Source4:    make-git-snapshot.sh
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
-Patch3: intel-2.8.0-build-fix.patch
-Patch4: intel-abi-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
 Patch21: intel-2.8.0-lvds-first.patch
 
-Patch30: intel-chip-names.patch
 Patch40: dri2-page-flip.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
@@ -80,11 +77,8 @@ 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 .xext
-%patch4 -p1 -b .abi
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
-%patch30 -p1 -b .names
 %patch40 -p1 -b .flip
 
 %build
@@ -141,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 2.8.0-6
+- Today's driver snapshot, misc bugfixes.
+
 * Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 2.8.0-5
 - intel-2.8.0-lvds-first.patch: Put LVDS outputs first in the list in KMS to
   match old UMS behaviour.



From pkgdb at fedoraproject.org  Wed Aug 12 17:59:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 17:59:52 +0000
Subject: [pkgdb] libxslt had acl change status
Message-ID: <20090812175957.E30B710F80B@bastion2.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libxslt (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxslt



From pkgdb at fedoraproject.org  Wed Aug 12 18:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 18:00:02 +0000
Subject: [pkgdb] libxslt had acl change status
Message-ID: <20090812180002.5F59F10F882@bastion2.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libxslt (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libxslt



From mtasaka at fedoraproject.org  Wed Aug 12 18:00:06 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 12 Aug 2009 18:00:06 +0000 (UTC)
Subject: rpms/gnome-commander/F-10 .cvsignore, 1.11,
	1.12 gnome-commander.spec, 1.28, 1.29 sources, 1.11, 1.12
Message-ID: <20090812180006.A876011C048B@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-serv13708/F-10

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Thu Aug 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.1-1
- 1.2.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Jun 2009 14:23:55 -0000	1.11
+++ .cvsignore	12 Aug 2009 18:00:06 -0000	1.12
@@ -1 +1 @@
-gnome-commander-1.2.8.tar.bz2
+gnome-commander-1.2.8.1.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/gnome-commander.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gnome-commander.spec	29 Jun 2009 14:23:55 -0000	1.28
+++ gnome-commander.spec	12 Aug 2009 18:00:06 -0000	1.29
@@ -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
+Version:       1.2.8.1
 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)
@@ -149,6 +149,9 @@ replace_icon	gnome-fs-web		folder-remote
 
 %endif
 
+# gzip
+gzip -9 ChangeLog-*
+
 %build
 # Install wrapper script, and move binaries to
 # %%{_libexecdir}/%%{name}
@@ -202,10 +205,11 @@ scrollkeeper-update -q || :
 %defattr(-,root,root,-)
 %doc AUTHORS
 %doc BUGS
-%doc ChangeLog
+%doc ChangeLog*
 %doc COPYING
 %doc NEWS
 %doc README
+%doc README.commits
 %doc TODO
 %doc doc/*.txt
 
@@ -223,6 +227,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Aug 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.1-1
+- 1.2.8.1
+
 * Mon Jun 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-1
 - 1.2.8 released
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Jun 2009 14:23:55 -0000	1.11
+++ sources	12 Aug 2009 18:00:06 -0000	1.12
@@ -1 +1 @@
-5279bb3825efec3789932663e92fc8d2  gnome-commander-1.2.8.tar.bz2
+bb29604eef72e66554151b61db35100f  gnome-commander-1.2.8.1.tar.bz2



From mtasaka at fedoraproject.org  Wed Aug 12 18:00:06 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 12 Aug 2009 18:00:06 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.36,
	1.37 gnome-commander.spec, 1.61, 1.62 sources, 1.36, 1.37
Message-ID: <20090812180006.F1DF311C048B@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-serv13708/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Thu Aug 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.1-1
- 1.2.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Jun 2009 14:23:56 -0000	1.36
+++ .cvsignore	12 Aug 2009 18:00:06 -0000	1.37
@@ -1 +1 @@
-gnome-commander-1.2.8.tar.bz2
+gnome-commander-1.2.8.1.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- gnome-commander.spec	29 Jun 2009 14:23:56 -0000	1.61
+++ gnome-commander.spec	12 Aug 2009 18:00:06 -0000	1.62
@@ -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
+Version:       1.2.8.1
 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)
@@ -149,6 +149,9 @@ replace_icon	gnome-fs-web		folder-remote
 
 %endif
 
+# gzip
+gzip -9 ChangeLog-*
+
 %build
 # Install wrapper script, and move binaries to
 # %%{_libexecdir}/%%{name}
@@ -202,10 +205,11 @@ scrollkeeper-update -q || :
 %defattr(-,root,root,-)
 %doc AUTHORS
 %doc BUGS
-%doc ChangeLog
+%doc ChangeLog*
 %doc COPYING
 %doc NEWS
 %doc README
+%doc README.commits
 %doc TODO
 %doc doc/*.txt
 
@@ -223,6 +227,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Aug 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.1-1
+- 1.2.8.1
+
 * Mon Jun 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8-1
 - 1.2.8 released
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	29 Jun 2009 14:23:56 -0000	1.36
+++ sources	12 Aug 2009 18:00:06 -0000	1.37
@@ -1 +1 @@
-5279bb3825efec3789932663e92fc8d2  gnome-commander-1.2.8.tar.bz2
+bb29604eef72e66554151b61db35100f  gnome-commander-1.2.8.1.tar.bz2



From thm at fedoraproject.org  Wed Aug 12 18:11:32 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 12 Aug 2009 18:11:32 +0000 (UTC)
Subject: rpms/botan/F-11 .cvsignore, 1.4, 1.5 botan.spec, 1.6, 1.7 import.log,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090812181132.64DE111C00D5@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15535/F-11

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 May 2009 07:22:28 -0000	1.4
+++ .cvsignore	12 Aug 2009 18:11:32 -0000	1.5
@@ -1 +1 @@
-Botan-1.8.2.tgz
+Botan-1.8.5.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/botan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- botan.spec	16 May 2009 07:22:28 -0000	1.6
+++ botan.spec	12 Aug 2009 18:11:32 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           botan
-Version:        1.8.2
-Release:        1%{?dist}
+Version:        1.8.5
+Release:        2%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
-Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
+Source0:        http://files.randombit.net/botan/Botan-%{version}.tbz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
-BuildRequires:  perl
+BuildRequires:  python
 
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
@@ -54,7 +54,7 @@ developing applications that use %{name}
 # fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
-./configure.pl \
+./configure.py \
         --prefix=%{_prefix} \
         --libdir=%{_lib} \
         --cc=gcc \
@@ -110,6 +110,17 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-2
+- Fix changelog.
+
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-1
+- Update to 1.8.5.
+- Use .tbz source file.
+- Configuration script uses python now.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.2-1
 - Update to 1.8.2.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 May 2009 07:22:28 -0000	1.4
+++ import.log	12 Aug 2009 18:11:32 -0000	1.5
@@ -2,3 +2,4 @@ botan-1_8_0-2_fc10:HEAD:botan-1.8.0-2.fc
 botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc10.src.rpm:1232633562
 botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc10.src.rpm:1237195036
 botan-1_8_2-1_fc12:F-11:botan-1.8.2-1.fc12.src.rpm:1242458388
+botan-1_8_5-2_fc11:F-11:botan-1.8.5-2.fc11.src.rpm:1250100575


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 May 2009 07:22:28 -0000	1.4
+++ sources	12 Aug 2009 18:11:32 -0000	1.5
@@ -1 +1 @@
-f2eff7f7d35662c8242a569a124a65f5  Botan-1.8.2.tgz
+6c0943fa4282bd57a23316c6d3c21279  Botan-1.8.5.tbz



From linville at fedoraproject.org  Wed Aug 12 18:13:11 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 12 Aug 2009 18:13:11 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-iwlwifi_-fix-TX-queue-race.patch, NONE, 
	1.1.2.2 kernel.spec, 1.1679.2.4, 1.1679.2.5
Message-ID: <20090812181311.0C21511C00D5@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15900

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-iwlwifi_-fix-TX-queue-race.patch 
Log Message:
iwlwifi: fix TX queue race

linux-2.6-iwlwifi_-fix-TX-queue-race.patch:
 iwl-tx.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-iwlwifi_-fix-TX-queue-race.patch ---
Backport of the following upstream commit...

commit 3995bd9332a51b626237d6671cfeb7235e6c1305
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Fri Jul 24 11:13:14 2009 -0700

    iwlwifi: fix TX queue race
    
    I had a problem on 4965 hardware (well, probably other hardware too,
    but others don't survive my stress testing right now, unfortunately)
    where the driver was sending invalid commands to the device, but no
    such thing could be seen from the driver's point of view. I could
    reproduce this fairly easily by sending multiple TCP streams with
    iperf on different TIDs, though sometimes a single iperf stream was
    sufficient. It even happened with a single core, but I have forced
    preemption turned on.
    
    The culprit was a queue overrun, where we advanced the queue's write
    pointer over the read pointer. After careful analysis I've come to
    the conclusion that the cause is a race condition between iwlwifi
    and mac80211.
    
    mac80211, of course, checks whether the queue is stopped, before
    transmitting a frame. This effectively looks like this:
    
            lock(queues)
            if (stopped(queue)) {
                    unlock(queues)
                    return busy;
    	}
            unlock(queues)
            ...             <-- this place will be important
    			    there is some more code here
            drv_tx(frame)
    
    The driver, on the other hand, can stop and start queues, which does
    
            lock(queues)
            mark_running/stopped(queue)
            unlock(queues)
    
    	[if marked running: wake up tasklet to send pending frames]
    
    Now, however, once the driver starts the queue, mac80211 can see that
    and end up at the marked place above, at which point for some reason the
    driver seems to stop the queue again (I don't understand that) and then
    we end up transmitting while the queue is actually full.
    
    Now, this shouldn't actually matter much, but for some reason I've seen
    it happen multiple times in a row and the queue actually overflows, at
    which point the queue bites itself in the tail and things go completely
    wrong.
    
    This patch fixes this by just dropping the packet should this have
    happened, and making the lock in iwlwifi cover everything so iwlwifi
    can't race against itself (dropping the lock there might make it more
    likely, but it did seem to happen without that too).
    
    Since we can't hold the lock across drv_tx() above, I see no way to fix
    this in mac80211, but I also don't understand why I haven't seen this
    before -- maybe I just never stress tested it this badly.
    
    With this patch, the device has survived many minutes of simultanously
    sending two iperf streams on different TIDs with combined throughput
    of about 60 Mbps.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c	2009-08-12 11:56:04.000000000 -0400
@@ -876,8 +876,6 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 		goto drop_unlock;
 	}
 
-	spin_unlock_irqrestore(&priv->lock, flags);
-
 	hdr_len = ieee80211_hdrlen(fc);
 
 	/* Find (or create) index into station table for destination station */
@@ -885,7 +883,7 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 	if (sta_id == IWL_INVALID_STATION) {
 		IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
 			       hdr->addr1);
-		goto drop;
+		goto drop_unlock;
 	}
 
 	IWL_DEBUG_TX("station Id %d\n", sta_id);
@@ -904,14 +902,17 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 		/* aggregation is on for this <sta,tid> */
 		if (info->flags & IEEE80211_TX_CTL_AMPDU)
 			txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
-		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 	}
 
 	txq = &priv->txq[txq_id];
 	q = &txq->q;
 	txq->swq_id = swq_id;
 
-	spin_lock_irqsave(&priv->lock, flags);
+	if (unlikely(iwl_queue_space(q) < q->high_mark))
+		goto drop_unlock;
+
+	if (ieee80211_is_data_qos(fc))
+		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 
 	/* Set up first empty TFD within this queue's circular TFD buffer */
 	tfd = &txq->tfds[q->write_ptr];
@@ -1043,7 +1044,6 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 
 drop_unlock:
 	spin_unlock_irqrestore(&priv->lock, flags);
-drop:
 	return -1;
 }
 EXPORT_SYMBOL(iwl_tx_skb);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.4
retrieving revision 1.1679.2.5
diff -u -p -r1.1679.2.4 -r1.1679.2.5
--- kernel.spec	10 Aug 2009 18:32:32 -0000	1.1679.2.4
+++ kernel.spec	12 Aug 2009 18:13:10 -0000	1.1679.2.5
@@ -687,6 +687,7 @@ Patch687: mac80211-don-t-drop-nullfunc-f
 Patch690: iwl3945-release-resources-before-shutting-down.patch
 Patch691: iwl3945-add-debugging-for-wrong-command-queue.patch
 Patch692: iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
+Patch693: linux-2.6-iwlwifi_-fix-TX-queue-race.patch
 
 Patch700: linux-2.6-dma-debug-fixes.patch
 
@@ -1411,6 +1412,9 @@ ApplyPatch iwl3945-release-resources-bef
 ApplyPatch iwl3945-add-debugging-for-wrong-command-queue.patch
 ApplyPatch iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
 
+# iwlwifi: fix TX queue race
+ApplyPatch linux-2.6-iwlwifi_-fix-TX-queue-race.patch
+
 # Fix up DMA debug code
 ApplyPatch linux-2.6-dma-debug-fixes.patch
 
@@ -2131,6 +2135,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 John W. Linville <linville at redhat.com> 2.6.29.6-217.2.5
+- iwlwifi: fix TX queue race
+
 * Mon Aug 10 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.4
 - Add tunable pad threshold support to lirc_imon
 - Blacklist all iMON devices in usbhid driver so lirc_imon can bind



From scop at fedoraproject.org  Wed Aug 12 17:13:56 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 17:13:56 +0000 (UTC)
Subject: rpms/inkboy-fonts/devel .cvsignore, 1.2, 1.3 inkboy-fonts.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090812171356.4D2A611C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/inkboy-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3015

Modified Files:
	.cvsignore inkboy-fonts.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20070624-5
- Use upstream zip instead of uncompressed tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkboy-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Jun 2009 20:57:08 -0000	1.2
+++ .cvsignore	12 Aug 2009 17:13:56 -0000	1.3
@@ -1 +1 @@
-inkboyfont.tar
+inkboyfont.zip


Index: inkboy-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkboy-fonts/devel/inkboy-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- inkboy-fonts.spec	25 Jul 2009 03:23:58 -0000	1.2
+++ inkboy-fonts.spec	12 Aug 2009 17:13:56 -0000	1.3
@@ -2,12 +2,12 @@
 %global fontconf 65-%{fontname}.conf
 Name:           %{fontname}-fonts
 Version:        20070624
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A clean and usable latin fantasy font
 Group:          User Interface/X
 License:        OFL
 URL:            http://inkboy.fr/html/telechargement-ressources.php
-Source0:        http://inkboy.fr/fichiers/inkboyfont.tar
+Source0:        http://inkboy.fr/fichiers/inkboyfont.zip
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -65,6 +65,9 @@ rm -fr %{buildroot}
 %doc FONTLOG.txt OFL.txt OFL-FAQ.txt
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20070624-5
+- Use upstream zip instead of uncompressed tarball.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070624-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkboy-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Jun 2009 20:57:08 -0000	1.2
+++ sources	12 Aug 2009 17:13:56 -0000	1.3
@@ -1 +1 @@
-4d8c9d581b5f19ba03cc5080506fb116  inkboyfont.tar
+9e41509331c4b2d692634d17c179d1ff  inkboyfont.zip



From thm at fedoraproject.org  Wed Aug 12 18:32:48 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Wed, 12 Aug 2009 18:32:48 +0000 (UTC)
Subject: rpms/botan/F-10 .cvsignore, 1.4, 1.5 botan.spec, 1.4, 1.5 import.log,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090812183248.EC13C11C00D5@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19572/F-10

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 May 2009 07:41:22 -0000	1.4
+++ .cvsignore	12 Aug 2009 18:32:48 -0000	1.5
@@ -1 +1 @@
-Botan-1.8.2.tgz
+Botan-1.8.5.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/botan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- botan.spec	16 May 2009 07:41:22 -0000	1.4
+++ botan.spec	12 Aug 2009 18:32:48 -0000	1.5
@@ -1,16 +1,16 @@
 Name:           botan
-Version:        1.8.2
-Release:        1%{?dist}
+Version:        1.8.5
+Release:        2%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
-Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
+Source0:        http://files.randombit.net/botan/Botan-%{version}.tbz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
-BuildRequires:  perl
+BuildRequires:  python
 
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
@@ -54,7 +54,7 @@ developing applications that use %{name}
 # fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
-./configure.pl \
+./configure.py \
         --prefix=%{_prefix} \
         --libdir=%{_lib} \
         --cc=gcc \
@@ -110,6 +110,17 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-2
+- Fix changelog.
+
+* Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-1
+- Update to 1.8.5.
+- Use .tbz source file.
+- Configuration script uses python now.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Apr 25 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.2-1
 - Update to 1.8.2.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 May 2009 07:41:22 -0000	1.4
+++ import.log	12 Aug 2009 18:32:48 -0000	1.5
@@ -2,3 +2,4 @@ botan-1_8_0-2_fc10:F-10:botan-1.8.0-2.fc
 botan-1_8_1-1_fc10:F-10:botan-1.8.1-1.fc10.src.rpm:1232634423
 botan-1_8_1-4_fc10:F-10:botan-1.8.1-4.fc10.src.rpm:1237195879
 botan-1_8_2-1_fc12:F-10:botan-1.8.2-1.fc12.src.rpm:1242459647
+botan-1_8_5-2_fc11:F-10:botan-1.8.5-2.fc11.src.rpm:1250101840


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 May 2009 07:41:22 -0000	1.4
+++ sources	12 Aug 2009 18:32:48 -0000	1.5
@@ -1 +1 @@
-f2eff7f7d35662c8242a569a124a65f5  Botan-1.8.2.tgz
+6c0943fa4282bd57a23316c6d3c21279  Botan-1.8.5.tbz



From pkgdb at fedoraproject.org  Wed Aug 12 18:32:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 18:32:56 +0000
Subject: [pkgdb] cairo had acl change status
Message-ID: <20090812183256.B993C10F848@bastion2.fedora.phx.redhat.com>

behdad has set the watchcommits acl on cairo (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From pkgdb at fedoraproject.org  Wed Aug 12 18:34:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 18:34:08 +0000
Subject: [pkgdb] pango had acl change status
Message-ID: <20090812183408.DC9AB10F80A@bastion2.fedora.phx.redhat.com>

behdad has set the watchcommits acl on pango (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pango



From pkgdb at fedoraproject.org  Wed Aug 12 18:34:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 18:34:23 +0000
Subject: [pkgdb] pango had acl change status
Message-ID: <20090812183423.E760810F800@bastion2.fedora.phx.redhat.com>

behdad has set the watchcommits acl on pango (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pango



From pkgdb at fedoraproject.org  Wed Aug 12 18:34:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 18:34:49 +0000
Subject: [pkgdb] cairo had acl change status
Message-ID: <20090812183449.30CFE10F80A@bastion2.fedora.phx.redhat.com>

behdad has set the watchcommits acl on cairo (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cairo



From konradm at fedoraproject.org  Wed Aug 12 18:48:47 2009
From: konradm at fedoraproject.org (konradm)
Date: Wed, 12 Aug 2009 18:48:47 +0000 (UTC)
Subject: rpms/bchunk/devel .cvsignore, 1.3, 1.4 01-track-size.dpatch, NONE, 
	1.1 bchunk-1.1.1-CFLAGS.patch, 1.2, 1.3 bchunk.spec, 1.15,
	1.16 sources, 1.3, 1.4
Message-ID: <20090812184847.5A47B11C00D5@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/bchunk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22268

Added Files:
	.cvsignore 01-track-size.dpatch bchunk-1.1.1-CFLAGS.patch 
	bchunk.spec sources 
Log Message:
* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
- Add Debian's patch to fix wrong file size calculations.



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Aug 2009 18:48:46 -0000	1.4
@@ -0,0 +1 @@
+bchunk-1.2.0.tar.gz


--- NEW FILE 01-track-size.dpatch ---
#!/bin/sh /usr/share/dpatch/dpatch-run
## 01-track-size.dpatch by Piotr Kaczuba <pepe at attika.ath.cx>
##
## DP: Fix wrong track size calculation when having multiple tracks in one image
## DP: (Closes: #261274).

@DPATCH@

diff -Naur bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c
--- bchunk-1.2.0.orig/bchunk.c	2004-06-29 20:42:33.000000000 +0000
+++ bchunk-1.2.0/bchunk.c	2006-09-08 18:19:59.000000000 +0000
@@ -476,7 +476,7 @@
 			if (verbose)
 				printf(" (startsect %ld ofs %ld)", track->startsect, track->start);
 			if ((prevtrack) && (prevtrack->stopsect < 0)) {
-				prevtrack->stopsect = track->startsect;
+				prevtrack->stopsect = track->startsect - 1;
 				prevtrack->stop = track->start - 1;
 			}
 		}
@@ -484,7 +484,7 @@
 	
 	if (track) {
 		fseek(binf, 0, SEEK_END);
-		track->stop = ftell(binf);
+		track->stop = ftell(binf) - 1;
 		track->stopsect = track->stop / SECTLEN;
 	}
 	

bchunk-1.1.1-CFLAGS.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: bchunk-1.1.1-CFLAGS.patch
===================================================================
RCS file: bchunk-1.1.1-CFLAGS.patch
diff -N bchunk-1.1.1-CFLAGS.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bchunk-1.1.1-CFLAGS.patch	12 Aug 2009 18:48:46 -0000	1.3
@@ -0,0 +1,12 @@
+diff -Naur bchunk-1.1.1-orig/Makefile bchunk-1.1.1/Makefile
+--- bchunk-1.1.1-orig/Makefile	2001-08-02 14:51:40.000000000 +0200
++++ bchunk-1.1.1/Makefile	2003-05-06 11:24:34.000000000 +0200
+@@ -3,7 +3,7 @@
+ # For systems with GCC (Linux, and others with GCC installed):
+ CC = gcc
+ LD = gcc
+-CFLAGS = -Wall -Wstrict-prototypes -O2
++#CFLAGS = -Wall -Wstrict-prototypes -O2
+ 
+ # For systems with a legacy CC:
+ #CC = cc


Index: bchunk.spec
===================================================================
RCS file: bchunk.spec
diff -N bchunk.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bchunk.spec	12 Aug 2009 18:48:46 -0000	1.16
@@ -0,0 +1,79 @@
+Summary: CD image format converter from .bin/.cue to .iso/.cdr
+Name: bchunk
+Version: 1.2.0
+Release: 9%{?dist}
+URL: http://he.fi/bchunk/
+License: GPLv2+
+Group: Applications/Archiving
+Source0: http://he.fi/bchunk/bchunk-%{version}.tar.gz
+Patch0: 01-track-size.dpatch
+Patch1: bchunk-1.1.1-CFLAGS.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+%description
+The bchunk package contains a UNIX/C rewrite of the BinChunker program.
+BinChunker converts a CD image in a .bin/.cue format (sometimes .raw/.cue)
+into a set of .iso and .cdr tracks.  The .bin/.cue format is used by some
+non-UNIX CD-writing software, but is not supported on most other
+CD-writing programs.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 bchunk $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 644 bchunk.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc COPYING ChangeLog README bchunk-%{version}.lsm
+%{_bindir}/bchunk
+%{_mandir}/man1/bchunk.1.gz
+
+%changelog
+* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
+- Add Debian's patch to fix wrong file size calculations.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 08 2008 Michael Schwendt <mschwendt at fedoraproject.org>
+- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
+
+* Tue Aug 21 2007 Michael Schwendt <mschwendt at fedoraproject.org>
+- rebuilt
+
+* Thu Aug  2 2007 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.0-5
+- Clarify licence (GPLv2+).
+
+* Mon Aug 28 2006 Michael Schwendt <mschwendt at fedoraproject.org>
+- rebuilt
+
+* Sat Feb 25 2006 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.0-3
+- rebuilt for FC5
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt at fedoraproject.org>
+- rebuilt
+
+* Wed Jun 30 2004 Michael Schwendt <mschwendt at fedoraproject.org> - 0:1.2.0-0.fdr.1
+- Update to 1.2.0 (very minor feature add.)
+- A few spec updates.
+
+* Tue May  6 2003 Michael Schwendt <mschwendt at fedoraproject.org> - 0:1.1.1-0.fdr.3
+- Don't strip-install files.
+- Patch1: CFLAGS were hardcoded in the Makefile.
+
+* Mon May  5 2003 Michael Schwendt <mschwendt at fedoraproject.org> - 0:1.1.1-0.fdr.1
+- Update Red Hat's 1.0.0-7 rpm, adhere to Fedora package guidelines.
+


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	12 Aug 2009 18:48:47 -0000	1.4
@@ -0,0 +1 @@
+6a613da3f34f9a303f202d2e9731d231  bchunk-1.2.0.tar.gz



From alikins at fedoraproject.org  Wed Aug 12 19:01:29 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 19:01:29 +0000 (UTC)
Subject: rpms/func/F-11 .cvsignore, 1.10, 1.11 func.spec, 1.13, 1.14 sources,
	1.12, 1.13
Message-ID: <20090812190129.3C14E11C00D5@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25268

Modified Files:
	.cvsignore func.spec sources 
Log Message:
func-0.25-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Dec 2008 21:51:49 -0000	1.10
+++ .cvsignore	12 Aug 2009 19:01:28 -0000	1.11
@@ -7,3 +7,4 @@ func-0.20.tar.gz
 func-0.21.tar.gz
 func-0.23.tar.gz
 func-0.24.tar.gz
+func-0.25.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-11/func.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- func.spec	24 Feb 2009 18:45:44 -0000	1.13
+++ func.spec	12 Aug 2009 19:01:29 -0000	1.14
@@ -11,8 +11,8 @@
 
 Summary: Remote management framework
 Name: func
-Version: 0.24 
-Release: 6%{?dist}
+Version: 0.25
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -57,6 +57,8 @@ func is a remote api for mangement, conf
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/log/func/func.log
+touch $RPM_BUILD_ROOT/var/log/func/audit.log
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -79,6 +81,7 @@ rm -fr $RPM_BUILD_ROOT
 %dir /etc/func/modules/
 %config(noreplace) /etc/func/minion.conf
 %config(noreplace) /etc/func/async_methods.conf
+%config(noreplace) /etc/func/overlord.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %config(noreplace) /etc/func/modules/Test.conf
 %config(noreplace) /etc/func/modules/Bridge.conf
@@ -107,13 +110,20 @@ rm -fr $RPM_BUILD_ROOT
 %{python_sitelib}/func/minion/modules/*/*/*.py*
 
 %dir /var/log/func
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/func.log
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/audit.log
+
 %dir /var/lib/func
-%doc AUTHORS README LICENSE
+
+#%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
+
+%doc AUTHORS README LICENSE CHANGES
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
 %{_mandir}/man1/func-transmit.1.gz
-
+%{_mandir}/man1/func-build-map.1.gz
+%{_mandir}/man1/func-create-module.1.gz
 
 %post
 # for suse 
@@ -131,7 +141,9 @@ else
         ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/k01funcd
    done
 fi
-
+# fix perms on log files
+chmod 600 /var/log/func/func.log
+chmod 600 /var/log/func/audit.log
 # upgrade old installs if needed
 #/usr/bin/update-func
 
@@ -152,8 +164,19 @@ fi
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add CHANGES to spec file
+
+* Wed May 27 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/log/func/*.log files to spec
+- add a post section to chmod any log files with bogus perms
+  
+
+* Thu Apr 16 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- add an overlord.conf file
 
 * Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
 - remove version file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Feb 2009 17:00:41 -0000	1.12
+++ sources	12 Aug 2009 19:01:29 -0000	1.13
@@ -4,3 +4,4 @@ def199858286218daef908e871f2e7ca  func-0
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
 821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz
 f8c91c5f50c6210b7058dbeedb6eea2a  func-0.24.tar.gz
+892252004f122c61bb58bb4607553ffe  func-0.25.tar.gz



From marx at fedoraproject.org  Wed Aug 12 19:03:40 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Wed, 12 Aug 2009 19:03:40 +0000 (UTC)
Subject: rpms/system-config-lvm/devel .cvsignore, 1.24, 1.25 sources, 1.26, 
	1.27 system-config-lvm.spec, 1.38, 1.39
Message-ID: <20090812190340.6990611C00D5@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25759

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
system-config-lvm v1.1.7-1

New version from upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	11 Aug 2009 21:58:08 -0000	1.24
+++ .cvsignore	12 Aug 2009 19:03:40 -0000	1.25
@@ -1 +1 @@
-system-config-lvm-1.1.6.tar.gz
+system-config-lvm-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	11 Aug 2009 21:58:08 -0000	1.26
+++ sources	12 Aug 2009 19:03:40 -0000	1.27
@@ -1 +1 @@
-55102c6f0e19e1558df6ca5f903823ee  system-config-lvm-1.1.6.tar.gz
+007d08bd266a610b444b54828c7f6caa  system-config-lvm-1.1.7.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- system-config-lvm.spec	11 Aug 2009 22:40:41 -0000	1.38
+++ system-config-lvm.spec	12 Aug 2009 19:03:40 -0000	1.39
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.6
-Release: 2%{?dist}
+Version: 1.1.7
+Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -61,6 +61,16 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Wed Aug 12 2009 Marek Grac <mgrac at redhat.com> - 1.1.7-1
+- Updated translations for several languages (transifex)
+- Resolves: #432065 - Add ext4 and xfs functionality
+- Resolves: #466812 - missing files from POTFILES.in (again)
+- Resolves: #443581 - Use human readable sizing units
+- Resolves: #443579 - traceback trying to add volume to VG with no selection
+- Resolves: #474996 - extremely slow start with cluster.conf
+- Resolves: #486699 - crashes when "command_names = 1" in lvm.conf
+- Resolves: #466899 - system-config-lvm online resize fix
+
 * Tue Aug 11 2009 Marek Grac <mgrac at redhat.com> - 1.1.6-2
 - Updated translations for Spanish and Polish (transifex)
 - Resolves: #494127 - system-config-lvm crashes on lvs with corelog



From alikins at fedoraproject.org  Wed Aug 12 19:04:05 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 19:04:05 +0000 (UTC)
Subject: rpms/func/F-10 .cvsignore, 1.12, 1.13 func.spec, 1.11, 1.12 sources,
	1.13, 1.14
Message-ID: <20090812190405.E748D11C00D5@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25952

Modified Files:
	.cvsignore func.spec sources 
Log Message:
func-0.25-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 18:32:54 -0000	1.12
+++ .cvsignore	12 Aug 2009 19:04:05 -0000	1.13
@@ -1,3 +1,4 @@
 func-0.23.tar.gz
 certmaster-0.24.tar.gz
 func-0.24.tar.gz
+func-0.25.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-10/func.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- func.spec	22 Dec 2008 18:14:13 -0000	1.11
+++ func.spec	12 Aug 2009 19:04:05 -0000	1.12
@@ -1,31 +1,43 @@
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
 
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 
 Summary: Remote management framework
 Name: func
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-Requires: python-simplejson
-Requires: certmaster >= 0.24
+%endif
+Requires: %{python}-simplejson
+Requires: certmaster >= %{version}
 Requires: logrotate
-BuildRequires: python-devel
+BuildRequires: %{python}-devel
 %if %is_suse
 BuildRequires: gettext-devel
 %else
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
+%if 0%{?rhel} >= 5
 BuildRequires: python-setuptools
 %endif
 %endif
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: https://fedorahosted.org/func/
@@ -35,6 +47,9 @@ func is a remote api for mangement, conf
 
 %prep
 %setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
 
 %build
 %{__python} setup.py build
@@ -42,13 +57,15 @@ func is a remote api for mangement, conf
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/log/func/func.log
+touch $RPM_BUILD_ROOT/var/log/func/audit.log
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
 %{python_sitelib}/func*.egg-info
 %endif
 %{_bindir}/funcd
@@ -64,8 +81,11 @@ rm -fr $RPM_BUILD_ROOT
 %dir /etc/func/modules/
 %config(noreplace) /etc/func/minion.conf
 %config(noreplace) /etc/func/async_methods.conf
+%config(noreplace) /etc/func/overlord.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %config(noreplace) /etc/func/modules/Test.conf
+%config(noreplace) /etc/func/modules/Bridge.conf
+%config(noreplace) /etc/func/modules/Vlan.conf
 %dir %{python_sitelib}/func
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
@@ -90,13 +110,20 @@ rm -fr $RPM_BUILD_ROOT
 %{python_sitelib}/func/minion/modules/*/*/*.py*
 
 %dir /var/log/func
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/func.log
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/audit.log
+
 %dir /var/lib/func
-%doc AUTHORS README LICENSE
+
+#%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
+
+%doc AUTHORS README LICENSE CHANGES
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
 %{_mandir}/man1/func-transmit.1.gz
-
+%{_mandir}/man1/func-build-map.1.gz
+%{_mandir}/man1/func-create-module.1.gz
 
 %post
 # for suse 
@@ -114,7 +141,9 @@ else
         ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/k01funcd
    done
 fi
-
+# fix perms on log files
+chmod 600 /var/log/func/func.log
+chmod 600 /var/log/func/audit.log
 # upgrade old installs if needed
 #/usr/bin/update-func
 
@@ -135,6 +164,36 @@ fi
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add CHANGES to spec file
+
+* Wed May 27 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/log/func/*.log files to spec
+- add a post section to chmod any log files with bogus perms
+  
+
+* Thu Apr 16 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- add an overlord.conf file
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+  do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
 * Wed Dec 17 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
 - require certmaster 0.24 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 Dec 2008 18:32:54 -0000	1.13
+++ sources	12 Aug 2009 19:04:05 -0000	1.14
@@ -1,3 +1,4 @@
 821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz
 8a21725c88947133c2cc04b1fd21305e  certmaster-0.24.tar.gz
 36b8a5190c0d6f12973ebdfb02f63652  func-0.24.tar.gz
+892252004f122c61bb58bb4607553ffe  func-0.25.tar.gz



From marx at fedoraproject.org  Wed Aug 12 19:09:24 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Wed, 12 Aug 2009 19:09:24 +0000 (UTC)
Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.39,1.40
Message-ID: <20090812190924.C3A2F11C00D5@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27059

Modified Files:
	system-config-lvm.spec 
Log Message:
bad version tagged, so 2nd attempt



Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- system-config-lvm.spec	12 Aug 2009 19:03:40 -0000	1.39
+++ system-config-lvm.spec	12 Aug 2009 19:09:24 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
 Version: 1.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -61,7 +61,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
-* Wed Aug 12 2009 Marek Grac <mgrac at redhat.com> - 1.1.7-1
+* Wed Aug 12 2009 Marek Grac <mgrac at redhat.com> - 1.1.7-2
 - Updated translations for several languages (transifex)
 - Resolves: #432065 - Add ext4 and xfs functionality
 - Resolves: #466812 - missing files from POTFILES.in (again)



From radford at fedoraproject.org  Wed Aug 12 19:09:53 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Wed, 12 Aug 2009 19:09:53 +0000 (UTC)
Subject: rpms/dot2tex/devel .cvsignore, 1.3, 1.4 dot2tex.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090812190953.37A6811C00D5@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dot2tex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27253

Modified Files:
	.cvsignore dot2tex.spec sources 
Log Message:
upgrade to 2.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dot2tex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Dec 2008 04:30:55 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:09:52 -0000	1.4
@@ -1 +1,2 @@
 dot2tex-2.8.4.tar.gz
+dot2tex-2.8.6.tar.gz


Index: dot2tex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dot2tex/devel/dot2tex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dot2tex.spec	24 Jul 2009 20:29:08 -0000	1.5
+++ dot2tex.spec	12 Aug 2009 19:09:53 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           dot2tex
-Version:        2.8.4
-Release:        3%{?dist}
+Version:        2.8.6
+Release:        1%{?dist}
 Summary:        A Graphviz to LaTeX converter
 Group:          Applications/Publishing
 License:        MIT
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Jim Radford <Jim Radford <radford at blackbean.org>> - 2.8.6-1
+- upgrade to 2.8.6
+
 * Fri Jul 24 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/dot2tex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Dec 2008 04:28:55 -0000	1.3
+++ sources	12 Aug 2009 19:09:53 -0000	1.4
@@ -1 +1,2 @@
 e63d164fad5722290646cb200dcfcb61  dot2tex-2.8.4.tar.gz
+8af7c44ea6484d47faee31cacbad9206  dot2tex-2.8.6.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 12 19:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:14:37 +0000
Subject: [pkgdb] glib2 had acl change status
Message-ID: <20090812191438.0AFD710F80B@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on glib2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glib2



From pkgdb at fedoraproject.org  Wed Aug 12 19:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:14:48 +0000
Subject: [pkgdb] glib2 had acl change status
Message-ID: <20090812191448.7AF8810F800@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on glib2 (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glib2



From pkgdb at fedoraproject.org  Wed Aug 12 19:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:15:25 +0000
Subject: [pkgdb] gtk2 had acl change status
Message-ID: <20090812191526.0686810F842@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on gtk2 (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 19:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:15:34 +0000
Subject: [pkgdb] gtk2 had acl change status
Message-ID: <20090812191533.EF62210F87B@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on gtk2 (Fedora 9) to Approved for mkasik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 19:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:15:40 +0000
Subject: [pkgdb] gtk2 had acl change status
Message-ID: <20090812191540.E5DF010F882@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on gtk2 (Fedora 9) to Approved for mkasik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 19:15:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:15:45 +0000
Subject: [pkgdb] gtk2 had acl change status
Message-ID: <20090812191545.8B3CF10F841@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on gtk2 (Fedora 10) to Approved for mkasik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 19:15:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:15:46 +0000
Subject: [pkgdb] gtk2 had acl change status
Message-ID: <20090812191547.15D1B10F89A@bastion2.fedora.phx.redhat.com>

mclasen has set the commit acl on gtk2 (Fedora 10) to Approved for mkasik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From pkgdb at fedoraproject.org  Wed Aug 12 19:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:15:51 +0000
Subject: [pkgdb] gtk2 had acl change status
Message-ID: <20090812191551.199B710F848@bastion2.fedora.phx.redhat.com>

mclasen has set the watchcommits acl on gtk2 (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtk2



From scop at fedoraproject.org  Wed Aug 12 19:17:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:17:21 +0000 (UTC)
Subject: rpms/netbeans-resolver/devel .cvsignore, 1.3,
	1.4 netbeans-resolver.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090812191721.F19EC11C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/netbeans-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28892

Modified Files:
	.cvsignore netbeans-resolver.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 6.7.1-2
- Use upstream gzipped tarball instead of zip.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 22:30:22 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:17:21 -0000	1.4
@@ -1 +1 @@
-xml-commons-resolver-1.2.zip
+xml-commons-resolver-1.2.tar.gz


Index: netbeans-resolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/netbeans-resolver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netbeans-resolver.spec	11 Aug 2009 22:30:23 -0000	1.4
+++ netbeans-resolver.spec	12 Aug 2009 19:17:21 -0000	1.5
@@ -3,14 +3,14 @@
 
 Name:    netbeans-resolver
 Version: 6.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Resolver subproject of xml-commons patched for NetBeans
 
 Group:   Development/Libraries
 License: ASL 1.1
 URL:     http://xml.apache.org/commons/
 
-Source0: http://www.apache.org/dist/xml/commons/%{patched_resolver}.zip
+Source0: http://www.apache.org/dist/xml/commons/%{patched_resolver}.tar.gz
 
 # see http://hg.netbeans._org/main/file/721f72486327/o.apache.xml.resolver/external/readme.txt
 Patch0: %{name}-%{version}-nb.patch
@@ -62,6 +62,9 @@ dos2unix -k LICENSE.resolver.txt
 %doc LICENSE.resolver.txt KEYS
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 6.7.1-2
+- Use upstream gzipped tarball instead of zip.
+
 * Wed Aug 12 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
 - Patching for the NetBeans 6.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-resolver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 22:30:23 -0000	1.3
+++ sources	12 Aug 2009 19:17:21 -0000	1.4
@@ -1 +1 @@
-e1016770401dc0a8207f9358878e3c84  xml-commons-resolver-1.2.zip
+46d52acdb67ba60f0156043f30108766  xml-commons-resolver-1.2.tar.gz



From konradm at fedoraproject.org  Wed Aug 12 19:17:21 2009
From: konradm at fedoraproject.org (konradm)
Date: Wed, 12 Aug 2009 19:17:21 +0000 (UTC)
Subject: rpms/bchunk/F-11 01-track-size.dpatch, NONE, 1.1 bchunk.spec, 1.14,
	1.15
Message-ID: <20090812191721.EA5B711C00D5@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/bchunk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28906

Modified Files:
	bchunk.spec 
Added Files:
	01-track-size.dpatch 
Log Message:
* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
- Add Debian's patch to fix wrong file size calculations.



--- NEW FILE 01-track-size.dpatch ---
#!/bin/sh /usr/share/dpatch/dpatch-run
## 01-track-size.dpatch by Piotr Kaczuba <pepe at attika.ath.cx>
##
## DP: Fix wrong track size calculation when having multiple tracks in one image
## DP: (Closes: #261274).

@DPATCH@

diff -Naur bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c
--- bchunk-1.2.0.orig/bchunk.c	2004-06-29 20:42:33.000000000 +0000
+++ bchunk-1.2.0/bchunk.c	2006-09-08 18:19:59.000000000 +0000
@@ -476,7 +476,7 @@
 			if (verbose)
 				printf(" (startsect %ld ofs %ld)", track->startsect, track->start);
 			if ((prevtrack) && (prevtrack->stopsect < 0)) {
-				prevtrack->stopsect = track->startsect;
+				prevtrack->stopsect = track->startsect - 1;
 				prevtrack->stop = track->start - 1;
 			}
 		}
@@ -484,7 +484,7 @@
 	
 	if (track) {
 		fseek(binf, 0, SEEK_END);
-		track->stop = ftell(binf);
+		track->stop = ftell(binf) - 1;
 		track->stopsect = track->stop / SECTLEN;
 	}
 	


Index: bchunk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bchunk/F-11/bchunk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- bchunk.spec	24 Feb 2009 04:17:34 -0000	1.14
+++ bchunk.spec	12 Aug 2009 19:17:21 -0000	1.15
@@ -1,11 +1,12 @@
 Summary: CD image format converter from .bin/.cue to .iso/.cdr
 Name: bchunk
 Version: 1.2.0
-Release: 8
+Release: 9%{?dist}
 URL: http://he.fi/bchunk/
 License: GPLv2+
 Group: Applications/Archiving
-Source: http://he.fi/bchunk/%{name}-%{version}.tar.gz
+Source0: http://he.fi/bchunk/bchunk-%{version}.tar.gz
+Patch0: 01-track-size.dpatch
 Patch1: bchunk-1.1.1-CFLAGS.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
@@ -18,10 +19,11 @@ CD-writing programs.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bchunk.1.gz
 
 %changelog
+* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
+- Add Debian's patch to fix wrong file size calculations.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From konradm at fedoraproject.org  Wed Aug 12 19:17:26 2009
From: konradm at fedoraproject.org (konradm)
Date: Wed, 12 Aug 2009 19:17:26 +0000 (UTC)
Subject: rpms/bchunk/F-10 01-track-size.dpatch, NONE, 1.1 bchunk.spec, 1.13,
	1.14
Message-ID: <20090812191726.6F8B111C00D5@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/bchunk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28961

Modified Files:
	bchunk.spec 
Added Files:
	01-track-size.dpatch 
Log Message:
* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
- Add Debian's patch to fix wrong file size calculations.



--- NEW FILE 01-track-size.dpatch ---
#!/bin/sh /usr/share/dpatch/dpatch-run
## 01-track-size.dpatch by Piotr Kaczuba <pepe at attika.ath.cx>
##
## DP: Fix wrong track size calculation when having multiple tracks in one image
## DP: (Closes: #261274).

@DPATCH@

diff -Naur bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c
--- bchunk-1.2.0.orig/bchunk.c	2004-06-29 20:42:33.000000000 +0000
+++ bchunk-1.2.0/bchunk.c	2006-09-08 18:19:59.000000000 +0000
@@ -476,7 +476,7 @@
 			if (verbose)
 				printf(" (startsect %ld ofs %ld)", track->startsect, track->start);
 			if ((prevtrack) && (prevtrack->stopsect < 0)) {
-				prevtrack->stopsect = track->startsect;
+				prevtrack->stopsect = track->startsect - 1;
 				prevtrack->stop = track->start - 1;
 			}
 		}
@@ -484,7 +484,7 @@
 	
 	if (track) {
 		fseek(binf, 0, SEEK_END);
-		track->stop = ftell(binf);
+		track->stop = ftell(binf) - 1;
 		track->stopsect = track->stop / SECTLEN;
 	}
 	


Index: bchunk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bchunk/F-10/bchunk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- bchunk.spec	8 Feb 2008 21:44:17 -0000	1.13
+++ bchunk.spec	12 Aug 2009 19:17:26 -0000	1.14
@@ -1,11 +1,12 @@
 Summary: CD image format converter from .bin/.cue to .iso/.cdr
 Name: bchunk
 Version: 1.2.0
-Release: 7
+Release: 9%{?dist}
 URL: http://he.fi/bchunk/
 License: GPLv2+
 Group: Applications/Archiving
-Source: http://he.fi/bchunk/%{name}-%{version}.tar.gz
+Source0: http://he.fi/bchunk/bchunk-%{version}.tar.gz
+Patch0: 01-track-size.dpatch
 Patch1: bchunk-1.1.1-CFLAGS.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
@@ -18,10 +19,11 @@ CD-writing programs.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +42,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bchunk.1.gz
 
 %changelog
+* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
+- Add Debian's patch to fix wrong file size calculations.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 08 2008 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering
 



From scop at fedoraproject.org  Wed Aug 12 19:17:36 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:17:36 +0000 (UTC)
Subject: rpms/nfoview/devel .cvsignore, 1.3, 1.4 nfoview.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090812191736.22B0B11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/nfoview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29059

Modified Files:
	.cvsignore nfoview.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.5-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfoview/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 May 2009 17:43:12 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:17:35 -0000	1.4
@@ -1 +1 @@
-nfoview-1.5.tar.gz
+nfoview-1.5.tar.bz2


Index: nfoview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfoview/devel/nfoview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nfoview.spec	25 Jul 2009 19:17:50 -0000	1.3
+++ nfoview.spec	12 Aug 2009 19:17:36 -0000	1.4
@@ -2,13 +2,13 @@
 
 Name:           nfoview
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Viewer for NFO files
 
 Group:          Applications/File
 License:        GPLv3+
 URL:            http://home.gna.org/nfoview/
-Source0:        http://download.gna.org/nfoview/%{version}/%{name}-%{version}.tar.gz
+Source0:        http://download.gna.org/nfoview/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -77,6 +77,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.5-3
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfoview/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 May 2009 17:43:12 -0000	1.3
+++ sources	12 Aug 2009 19:17:36 -0000	1.4
@@ -1 +1 @@
-4690e8f3bdc3d83fb90fb266129e6e15  nfoview-1.5.tar.gz
+184f89bfb43a3c64f03f93e9429ecb9c  nfoview-1.5.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:17:50 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:17:50 +0000 (UTC)
Subject: rpms/notify-python/devel .cvsignore, 1.3, 1.4 notify-python.spec,
	1.11, 1.12 sources, 1.3, 1.4
Message-ID: <20090812191750.0A9B511C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/notify-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29264

Modified Files:
	.cvsignore notify-python.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.1.1-9
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/notify-python/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jan 2008 22:10:58 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:17:49 -0000	1.4
@@ -1 +1 @@
-notify-python-0.1.1.tar.gz
+notify-python-0.1.1.tar.bz2


Index: notify-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notify-python/devel/notify-python.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- notify-python.spec	25 Jul 2009 19:30:35 -0000	1.11
+++ notify-python.spec	12 Aug 2009 19:17:49 -0000	1.12
@@ -2,14 +2,14 @@
 
 Name:           notify-python
 Version:        0.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Python bindings for libnotify
 
 Group:          Development/Languages
 # No version specified, just COPYING.
 License:        LGPLv2+
 URL:            http://www.galago-project.org/specs/notification
-Source0:        http://www.galago-project.org/files/releases/source/notify-python/notify-python-%{version}.tar.gz
+Source0:        http://www.galago-project.org/files/releases/source/notify-python/notify-python-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, pkgconfig, libnotify-devel, pygtk2-devel
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.1.1-9
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/notify-python/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jan 2008 22:10:58 -0000	1.3
+++ sources	12 Aug 2009 19:17:49 -0000	1.4
@@ -1 +1 @@
-8f0ef0939cc8edd2efd896ce5ba80cf4  notify-python-0.1.1.tar.gz
+d247cf79b46cef7495deb0a76334f81d  notify-python-0.1.1.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:18:04 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:18:04 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.12, 1.13 obexd.spec, 1.13,
	1.14 sources, 1.12, 1.13
Message-ID: <20090812191804.29B2511C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29363

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	16 Jul 2009 09:50:47 -0000	1.12
+++ .cvsignore	12 Aug 2009 19:18:03 -0000	1.13
@@ -1 +1 @@
-obexd-0.15.tar.gz
+obexd-0.15.tar.bz2


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- obexd.spec	25 Jul 2009 19:47:04 -0000	1.13
+++ obexd.spec	12 Aug 2009 19:18:03 -0000	1.14
@@ -1,11 +1,11 @@
 Name:		obexd
 Version:	0.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
 License:	GPLv2+
-Source0:	http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.gz
+Source0:	http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.bz2
 Url:		http://www.bluez.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15-3
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	16 Jul 2009 09:50:47 -0000	1.12
+++ sources	12 Aug 2009 19:18:04 -0000	1.13
@@ -1 +1 @@
-f9adc013e0e4b26c992cc0ca05328f3d  obexd-0.15.tar.gz
+4b3687548b84fa64dfe3114b41fe3c47  obexd-0.15.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:18:18 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:18:18 +0000 (UTC)
Subject: rpms/online-desktop/devel .cvsignore, 1.22, 1.23 online-desktop.spec,
	1.34, 1.35 sources, 1.23, 1.24
Message-ID: <20090812191818.A1CC111C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29471

Modified Files:
	.cvsignore online-desktop.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.2-5
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	28 Oct 2008 22:25:06 -0000	1.22
+++ .cvsignore	12 Aug 2009 19:18:18 -0000	1.23
@@ -1,4 +1 @@
-online-desktop-0.2.28.tar.gz
-online-desktop-0.3.0.tar.gz
-online-desktop-0.3.1.tar.gz
-online-desktop-0.3.2.tar.gz
+online-desktop-0.3.2.tar.bz2


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/online-desktop.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- online-desktop.spec	25 Jul 2009 20:41:44 -0000	1.34
+++ online-desktop.spec	12 Aug 2009 19:18:18 -0000	1.35
@@ -3,14 +3,14 @@
 
 Name:           online-desktop
 Version:        0.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Desktop built around web sites and online services
 
 Group:          Applications/Internet
 # No version specified, just COPYING.
 License:        GPL+
 URL:            http://developer.mugshot.org/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/online-desktop/0.3/online-desktop-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/online-desktop/0.3/online-desktop-%{version}.tar.bz2
 Source1:        Getting_Started.html
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	dbus-python
@@ -201,6 +201,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3.2-5
+- Use bzipped upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	28 Oct 2008 22:25:06 -0000	1.23
+++ sources	12 Aug 2009 19:18:18 -0000	1.24
@@ -1 +1 @@
-2ebce122153e8d0158baa22ab03272bb  online-desktop-0.3.2.tar.gz
+90f27f4229c0a62c79e167de956b2eae  online-desktop-0.3.2.tar.bz2



From davidz at fedoraproject.org  Wed Aug 12 19:25:45 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 12 Aug 2009 19:25:45 +0000 (UTC)
Subject: rpms/polkit/devel .cvsignore, 1.3, 1.4 polkit.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <20090812192545.6BD6411C00D5@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31914

Modified Files:
	.cvsignore polkit.spec sources 
Log Message:
* Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-1
- Update to upstream release 0.94




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Jul 2009 00:47:47 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:25:45 -0000	1.4
@@ -1,2 +1,3 @@
 polkit-0.92.tar.gz
 polkit-0.93.tar.gz
+polkit-0.94.tar.gz


Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- polkit.spec	26 Jul 2009 19:08:08 -0000	1.6
+++ polkit.spec	12 Aug 2009 19:25:45 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
-Version: 0.93
-Release: 3%{?dist}
+Version: 0.94
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ BuildRequires: pam-devel
 BuildRequires: eggdbus-devel
 BuildRequires: gtk-doc
 BuildRequires: intltool
+BuildRequires: gobject-introspection-devel
 
 Requires: ConsoleKit
 Requires: dbus
@@ -72,12 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/polkit-1
 %dir %{_libdir}/polkit-1/extensions
 %{_libdir}/polkit-1/extensions/*.so
-%{_datadir}/man/man1/pkexec.1.gz
-%{_datadir}/man/man1/pkaction.1.gz
-%{_datadir}/man/man1/pkcheck.1.gz
-%{_datadir}/man/man8/polkitd.8.gz
-%{_datadir}/man/man8/polkit.8.gz
-%{_datadir}/man/man8/pklocalauthority.8.gz
+%{_datadir}/man/man1/*
+%{_datadir}/man/man8/*
 %{_datadir}/dbus-1/system-services/*
 %dir %{_datadir}/polkit-1/
 %dir %{_datadir}/polkit-1/actions
@@ -88,16 +85,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pkaction
 %{_bindir}/pkcheck
 %{_libexecdir}/polkit-1/polkitd
+%{_libdir}/girepository-1.0/*.typelib
 
 # see upstream docs for why these permissions are necessary
 %attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1/
 %attr(4755,root,root) %{_bindir}/pkexec
 %attr(4755,root,root) %{_libexecdir}/polkit-1/polkit-agent-helper-1
 
+%attr(0700,root,root) %dir /var/lib/polkit-1/
+%dir /var/lib/polkit-1/localauthority
+%dir /var/lib/polkit-1/localauthority/10-vendor.d
+%dir /var/lib/polkit-1/localauthority/20-org.d
+%dir /var/lib/polkit-1/localauthority/30-site.d
+%dir /var/lib/polkit-1/localauthority/50-local.d
+%dir /var/lib/polkit-1/localauthority/90-mandatory.d
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
 %{_includedir}/*
 %{_bindir}/pk-example-frobnicate
 %{_datadir}/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
@@ -107,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-1
+- Update to upstream release 0.94
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.93-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Jul 2009 00:47:47 -0000	1.3
+++ sources	12 Aug 2009 19:25:45 -0000	1.4
@@ -1 +1 @@
-16e9361b6c8dbbecc29ee263d7880998  polkit-0.93.tar.gz
+5abc9f858e7b614ef41161db36d53915  polkit-0.94.tar.gz



From davidz at fedoraproject.org  Wed Aug 12 19:26:04 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 12 Aug 2009 19:26:04 +0000 (UTC)
Subject: rpms/polkit-gnome/devel .cvsignore, 1.3, 1.4 polkit-gnome.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090812192604.B3C7011C00D5@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32053

Modified Files:
	.cvsignore polkit-gnome.spec sources 
Log Message:
* Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-1
- Update to upstream release 0.94




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Jul 2009 00:49:12 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:26:04 -0000	1.4
@@ -1,2 +1,3 @@
 polkit-gnome-0.92.tar.bz2
 polkit-gnome-0.93.tar.bz2
+polkit-gnome-0.94.tar.bz2


Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- polkit-gnome.spec	26 Jul 2009 19:08:23 -0000	1.6
+++ polkit-gnome.spec	12 Aug 2009 19:26:04 -0000	1.7
@@ -1,14 +1,14 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
-Version: 0.93
-Release: 3%{?dist}
+Version: 0.94
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
-BuildRequires: polkit-devel >= 0.93
+BuildRequires: polkit-devel >= 0.94
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 
@@ -16,17 +16,40 @@ BuildRequires: intltool
 polkit-gnome provides an authentication agent for PolicyKit
 that matches the look and feel of the GNOME desktop.
 
+%package devel
+Summary: Development files for polkit-gnome
+Group: Development/Libraries
+Requires: %name = %{version}-%{release}
+Requires: %name-docs = %{version}-%{release}
+Requires: pkgconfig
+Requires: polkit-devel
+
+%description devel
+Development files for polkit-gnome.
+
+%package docs
+Summary: Development documentation for polkit-gnome
+Group: Development/Libraries
+Requires: %name-devel = %{version}-%{release}
+Requires: gtk-doc
+
+%description docs
+Development documentation for polkit-gnome.
+
 %prep
 %setup -q
 
 %build
-%configure
+%configure --enable-gtk-doc
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 desktop-file-install --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                      \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
@@ -41,8 +64,23 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING AUTHORS README
 %{_sysconfdir}/xdg/autostart/*
 %{_libexecdir}/*
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
+
+%files docs
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/*
+
 
 %changelog
+* Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-1
+- Update to upstream release 0.94
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.93-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Jul 2009 00:49:12 -0000	1.3
+++ sources	12 Aug 2009 19:26:04 -0000	1.4
@@ -1 +1 @@
-b30bd877f674e89a80848ed45257375d  polkit-gnome-0.93.tar.bz2
+eebab8363a7b7c0516aca4f7b7cd7f7a  polkit-gnome-0.94.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:26:54 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:26:54 +0000 (UTC)
Subject: rpms/php-magickwand/devel .cvsignore, 1.6, 1.7 php-magickwand.spec, 
	1.14, 1.15 sources, 1.6, 1.7
Message-ID: <20090812192654.3F98C11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/php-magickwand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32277

Modified Files:
	.cvsignore php-magickwand.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.8-5
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-magickwand/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Feb 2009 19:42:45 -0000	1.6
+++ .cvsignore	12 Aug 2009 19:26:54 -0000	1.7
@@ -1 +1 @@
-MagickWandForPHP-1.0.8.tar.gz
+MagickWandForPHP-1.0.8.tar.bz2


Index: php-magickwand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-magickwand/devel/php-magickwand.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- php-magickwand.spec	26 Jul 2009 18:05:38 -0000	1.14
+++ php-magickwand.spec	12 Aug 2009 19:26:54 -0000	1.15
@@ -4,11 +4,11 @@
 Summary:	PHP API for ImageMagick
 Name:		php-magickwand
 Version:	1.0.8
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	ImageMagick
 Group:		Development/Languages
 # Only latest version is always kept on: http://www.magickwand.org/download/php/
-Source0:	http://image_magick.veidrodis.com/image_magick/php/MagickWandForPHP-%{version}.tar.gz
+Source0:	http://image_magick.veidrodis.com/image_magick/php/MagickWandForPHP-%{version}.tar.bz2
 Source1:	magickwand.ini
 URL:		http://www.magickwand.org/
 BuildRequires:	php-devel >= 4.3.0, ImageMagick-devel >= 6.4.0, autoconf, automake, libtool
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/php.d/magickwand.ini
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.8-5
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-magickwand/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Feb 2009 19:42:45 -0000	1.6
+++ sources	12 Aug 2009 19:26:54 -0000	1.7
@@ -1 +1 @@
-380eb4625aee903945fcec434fcf191d  MagickWandForPHP-1.0.8.tar.gz
+b82f107b2f7c1f0446e7e0c0c17a40b0  MagickWandForPHP-1.0.8.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:27:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:27:07 +0000 (UTC)
Subject: rpms/pipenightdreams/devel .cvsignore, 1.2, 1.3 pipenightdreams.spec,
	1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20090812192707.C176411C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/pipenightdreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32402

Modified Files:
	.cvsignore pipenightdreams.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.10.0-11
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pipenightdreams/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Apr 2006 11:12:45 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:27:07 -0000	1.3
@@ -1 +1 @@
-pipenightdreams-0.10.0.tar.gz
+pipenightdreams-0.10.0.tar.bz2


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipenightdreams/devel/pipenightdreams.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pipenightdreams.spec	26 Jul 2009 18:49:32 -0000	1.10
+++ pipenightdreams.spec	12 Aug 2009 19:27:07 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.libsdl.org/projects/pipenightdreams/
-Source0:        http://www.libsdl.org/projects/pipenightdreams/packages/pipenightdreams-0.10.0.tar.gz
+Source0:        http://www.libsdl.org/projects/pipenightdreams/packages/pipenightdreams-0.10.0.tar.bz2
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
@@ -82,6 +82,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.10.0-11
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pipenightdreams/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Apr 2006 11:12:45 -0000	1.2
+++ sources	12 Aug 2009 19:27:07 -0000	1.3
@@ -1 +1 @@
-f22f23649852f54cca43de775e691de6  pipenightdreams-0.10.0.tar.gz
+a04fa95a152a4394e6c74660e4db14a3  pipenightdreams-0.10.0.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:27:22 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:27:22 +0000 (UTC)
Subject: rpms/ppl/devel .cvsignore, 1.5, 1.6 ppl.spec, 1.33, 1.34 sources,
	1.5, 1.6
Message-ID: <20090812192722.8632811C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32503

Modified Files:
	.cvsignore ppl.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.10.2-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Apr 2009 09:07:44 -0000	1.5
+++ .cvsignore	12 Aug 2009 19:27:22 -0000	1.6
@@ -1 +1 @@
-ppl-0.10.2.tar.gz
+ppl-0.10.2.tar.bz2


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ppl.spec	26 Jul 2009 19:21:00 -0000	1.33
+++ ppl.spec	12 Aug 2009 19:27:22 -0000	1.34
@@ -2,13 +2,13 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
 License:        GPLv3+
 URL:            http://www.cs.unipr.it/ppl/
-Source0:        ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{version}.tar.bz2
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.10.2-6
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Apr 2009 09:07:44 -0000	1.5
+++ sources	12 Aug 2009 19:27:22 -0000	1.6
@@ -1 +1 @@
-e7dd265afdeaea81f7e87a72b182d875  ppl-0.10.2.tar.gz
+5667111f53150618b0fa522ffc53fc3e  ppl-0.10.2.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:27:35 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:27:35 +0000 (UTC)
Subject: rpms/psad/devel .cvsignore, 1.2, 1.3 psad.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090812192735.8E12311C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/psad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32617

Modified Files:
	.cvsignore psad.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.3-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psad/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 13:43:27 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:27:35 -0000	1.3
@@ -1 +1 @@
-psad-2.1.3.tar.gz
+psad-2.1.3.tar.bz2


Index: psad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psad/devel/psad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- psad.spec	26 Jul 2009 19:33:26 -0000	1.3
+++ psad.spec	12 Aug 2009 19:27:35 -0000	1.4
@@ -5,11 +5,11 @@
 Summary: Port Scan Attack Detector (psad) watches for suspect traffic
 Name: psad
 Version: 2.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/psad/
-Source: http://www.cipherdyne.org/psad/download/%name-%version.tar.gz
+Source: http://www.cipherdyne.org/psad/download/%name-%version.tar.bz2
 Patch1: psad-2.1.2-initscript.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: iptables
@@ -140,6 +140,9 @@ fi
 %dir %psadrundir
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1.3-4
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Aug 2008 13:43:27 -0000	1.2
+++ sources	12 Aug 2009 19:27:35 -0000	1.3
@@ -1 +1 @@
-3acf5577f0728a76c2fba758b2cb948f  psad-2.1.3.tar.gz
+23c62a7502c4defa6f5f88342b0f60e6  psad-2.1.3.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:27:48 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:27:48 +0000 (UTC)
Subject: rpms/python-kiwi/devel .cvsignore, 1.14, 1.15 python-kiwi.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <20090812192748.90E3E11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/python-kiwi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32712

Modified Files:
	.cvsignore python-kiwi.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.25-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 May 2009 04:34:49 -0000	1.14
+++ .cvsignore	12 Aug 2009 19:27:48 -0000	1.15
@@ -1 +1 @@
-kiwi-1.9.25.tar.gz
+kiwi-1.9.25.tar.bz2


Index: python-kiwi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/devel/python-kiwi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- python-kiwi.spec	26 Jul 2009 20:32:00 -0000	1.21
+++ python-kiwi.spec	12 Aug 2009 19:27:48 -0000	1.22
@@ -3,13 +3,13 @@
 
 Name:           python-kiwi
 Version:        1.9.25
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Framework for Python GUI applications
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.async.com.br/projects/kiwi/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.25-3
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 May 2009 04:34:49 -0000	1.14
+++ sources	12 Aug 2009 19:27:48 -0000	1.15
@@ -1 +1 @@
-bf660040835547f8c92e0f5ea99706c6  kiwi-1.9.25.tar.gz
+9cc66b79a5991c28a88d7991f6694dbc  kiwi-1.9.25.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:28:01 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:28:01 +0000 (UTC)
Subject: rpms/python-pp/devel .cvsignore, 1.9, 1.10 python-pp.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <20090812192801.91CAE11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/python-pp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv332

Modified Files:
	.cvsignore python-pp.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.5.7-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 May 2009 01:24:53 -0000	1.9
+++ .cvsignore	12 Aug 2009 19:28:01 -0000	1.10
@@ -1 +1 @@
-pp-1.5.7.tar.gz
+pp-1.5.7.tar.bz2


Index: python-pp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/devel/python-pp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- python-pp.spec	26 Jul 2009 20:52:43 -0000	1.14
+++ python-pp.spec	12 Aug 2009 19:28:01 -0000	1.15
@@ -2,13 +2,13 @@
 
 Name:           python-pp
 Version:        1.5.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parallel execution of python on smp
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.parallelpython.com/
-Source0:        http://www.parallelpython.com/downloads/pp/pp-%{version}.tar.gz
+Source0:        http://www.parallelpython.com/downloads/pp/pp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.5.7-4
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 May 2009 01:24:53 -0000	1.9
+++ sources	12 Aug 2009 19:28:01 -0000	1.10
@@ -1 +1 @@
-50b52a7940f297d9bda769349fa78eb0  pp-1.5.7.tar.gz
+dc26a848917e4d319f6e76646774f629  pp-1.5.7.tar.bz2



From radford at fedoraproject.org  Wed Aug 12 19:28:58 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Wed, 12 Aug 2009 19:28:58 +0000 (UTC)
Subject: rpms/dkim-milter/devel .cvsignore, 1.4, 1.5 dkim-milter.spec, 1.7, 
	1.8 sources, 1.4, 1.5
Message-ID: <20090812192858.4785A11C00D5@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dkim-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv611

Modified Files:
	.cvsignore dkim-milter.spec sources 
Log Message:
upgrade to 2.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Feb 2009 19:46:29 -0000	1.4
+++ .cvsignore	12 Aug 2009 19:28:57 -0000	1.5
@@ -1 +1,2 @@
 dkim-milter-2.8.1.tar.gz
+dkim-milter-2.8.3.tar.gz


Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dkim-milter.spec	24 Jul 2009 20:22:24 -0000	1.7
+++ dkim-milter.spec	12 Aug 2009 19:28:58 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           dkim-milter
-Version:        2.8.1
-Release:        3%{?dist}
+Version:        2.8.3
+Release:        1%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -69,9 +69,11 @@ EOF
 
 install -p -d %{buildroot}%{_mandir}/man{3,5,8}
 install -p -d %{buildroot}%{_sbindir}
+install -p -d %{buildroot}%{_includedir}
 make install DESTDIR=%{buildroot} {UBIN,MAN}{OWN,GRP}=$(whoami) UBINMODE=755 MANMODE=644
 
 rm -rf %{buildroot}%{_mandir}/man3 # /ar.3.gz
+rm -rf %{buildroot}%{_includedir} # /dkim.h
 
 install -p -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 
@@ -124,6 +126,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Fri Jul 24 2009 Jim Radford <radford at blackbean.org> - 2.8.3-1
+- update to 2.8.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Feb 2009 19:46:29 -0000	1.4
+++ sources	12 Aug 2009 19:28:58 -0000	1.5
@@ -1 +1,2 @@
 a822f7f5eb36f15d1377ca534d5d7edf  dkim-milter-2.8.1.tar.gz
+d2043c269f1720cc095a9b4f163cf3df  dkim-milter-2.8.3.tar.gz



From alikins at fedoraproject.org  Wed Aug 12 19:30:17 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 19:30:17 +0000 (UTC)
Subject: rpms/certmaster/EL-5 .cvsignore, 1.6, 1.7 certmaster.spec, 1.5,
	1.6 sources, 1.7, 1.8
Message-ID: <20090812193017.6E93B11C048B@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1130

Modified Files:
	.cvsignore certmaster.spec sources 
Log Message:
certmaster-0.25-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Dec 2008 20:46:33 -0000	1.6
+++ .cvsignore	12 Aug 2009 19:30:17 -0000	1.7
@@ -3,3 +3,4 @@ certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
 certmaster-0.23.tar.gz
 certmaster-0.24.tar.gz
+certmaster-0.25.tar.gz


Index: certmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-5/certmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- certmaster.spec	17 Dec 2008 20:44:57 -0000	1.5
+++ certmaster.spec	12 Aug 2009 19:30:17 -0000	1.6
@@ -1,31 +1,53 @@
 
+
+# We can run on Rhel 3'ish systems, but only if python2.3 is installed 
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
+
+
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 
+
 Summary: Remote certificate distribution framework
 Name: certmaster
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25 
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: https://fedorahosted.org/certmaster
+
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-BuildRequires: python-devel
+%endif
+
+# NOTE: if you 
+BuildRequires: %{python}-devel
 %if %is_suse
 BuildRequires: gettext-devel
 %else
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
+%if 0%{?rhel} >= 5
 BuildRequires: python-setuptools
 %endif
 %endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-Url: https://fedorahosted.org/certmaster
+%endif
+
+
 
 %description
 
@@ -40,18 +62,24 @@ certmaster is a easy mechanism for distr
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/sign/post/certmaster-sync
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/remove/post/certmaster-sync
+touch $RPM_BUILD_ROOT/var/log/certmaster/certmaster.log
+touch $RPM_BUILD_ROOT/var/log/certmaster/audit.log
+
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}"  >= "2.5"
 %{python_sitelib}/certmaster*.egg-info
 %endif
 %{_bindir}/certmaster
 %{_bindir}/certmaster-request
 %{_bindir}/certmaster-ca
+%{_bindir}/certmaster-sync
 /etc/init.d/certmaster
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -61,8 +89,16 @@ rm -fr $RPM_BUILD_ROOT
 %config(noreplace) /etc/logrotate.d/certmaster_rotate
 %dir %{python_sitelib}/certmaster
 %{python_sitelib}/certmaster/*.py*
+
 %dir /var/log/certmaster
-%dir /var/lib/certmaster
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/certmaster.log
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/audit.log
+
+%attr(600,root,root) %dir /var/lib/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/certs
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/csrs
+%dir /var/lib/certmaster/peers
 %dir /var/lib/certmaster/triggers/sign/
 %dir /var/lib/certmaster/triggers/sign/pre
 %dir /var/lib/certmaster/triggers/sign/post
@@ -72,6 +108,8 @@ rm -fr $RPM_BUILD_ROOT
 %dir /var/lib/certmaster/triggers/remove/
 %dir /var/lib/certmaster/triggers/remove/pre
 %dir /var/lib/certmaster/triggers/remove/post
+/var/lib/certmaster/triggers/sign/post/certmaster-sync
+/var/lib/certmaster/triggers/remove/post/certmaster-sync
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 
@@ -93,6 +131,9 @@ else
    done
 fi
 exit 0
+# fix perms on log files
+chmod 600 /var/log/certmaster/certmaster.log
+chmod 600 /var/log/certmaster/audit.log
 
 %preun
 if [ "$1" = 0 ] ; then
@@ -108,6 +149,30 @@ fi
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 26 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/lib/certmaster/certmaster* to spec and set perms
+- add /var/log/certmaster/certmaster.log,audit.log to spec
+  and set perms
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24.5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+  do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3x1
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
 * Mon Dec 12 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
 - add missing dirs as per bz#473633
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Dec 2008 20:46:33 -0000	1.7
+++ sources	12 Aug 2009 19:30:17 -0000	1.8
@@ -3,3 +3,4 @@ d661004b7eb0c7b43f57f0a510232bd2  certma
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
 884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz
 8a21725c88947133c2cc04b1fd21305e  certmaster-0.24.tar.gz
+83d6115f2cff4af18e150274602c71c1  certmaster-0.25.tar.gz



From alikins at fedoraproject.org  Wed Aug 12 19:33:05 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 19:33:05 +0000 (UTC)
Subject: rpms/certmaster/EL-4 .cvsignore, 1.6, 1.7 certmaster.spec, 1.5,
	1.6 sources, 1.7, 1.8
Message-ID: <20090812193305.539D711C00D5@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/certmaster/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1963

Modified Files:
	.cvsignore certmaster.spec sources 
Log Message:
certmaster-0.25-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Dec 2008 20:39:07 -0000	1.6
+++ .cvsignore	12 Aug 2009 19:33:05 -0000	1.7
@@ -3,3 +3,4 @@ certmaster-0.19.tar.gz
 certmaster-0.20.tar.gz
 certmaster-0.23.tar.gz
 certmaster-0.24.tar.gz
+certmaster-0.25.tar.gz


Index: certmaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-4/certmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- certmaster.spec	17 Dec 2008 20:40:34 -0000	1.5
+++ certmaster.spec	12 Aug 2009 19:33:05 -0000	1.6
@@ -1,31 +1,53 @@
 
+
+# We can run on Rhel 3'ish systems, but only if python2.3 is installed 
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
+
+
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 
+
 Summary: Remote certificate distribution framework
 Name: certmaster
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25 
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: https://fedorahosted.org/certmaster
+
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-BuildRequires: python-devel
+%endif
+
+# NOTE: if you 
+BuildRequires: %{python}-devel
 %if %is_suse
 BuildRequires: gettext-devel
 %else
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
+%if 0%{?rhel} >= 5
 BuildRequires: python-setuptools
 %endif
 %endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-Url: https://fedorahosted.org/certmaster
+%endif
+
+
 
 %description
 
@@ -40,18 +62,24 @@ certmaster is a easy mechanism for distr
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/sign/post/certmaster-sync
+ln -s %{_bindir}/certmaster-sync $RPM_BUILD_ROOT/var/lib/certmaster/triggers/remove/post/certmaster-sync
+touch $RPM_BUILD_ROOT/var/log/certmaster/certmaster.log
+touch $RPM_BUILD_ROOT/var/log/certmaster/audit.log
+
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}"  >= "2.5"
 %{python_sitelib}/certmaster*.egg-info
 %endif
 %{_bindir}/certmaster
 %{_bindir}/certmaster-request
 %{_bindir}/certmaster-ca
+%{_bindir}/certmaster-sync
 /etc/init.d/certmaster
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -61,8 +89,16 @@ rm -fr $RPM_BUILD_ROOT
 %config(noreplace) /etc/logrotate.d/certmaster_rotate
 %dir %{python_sitelib}/certmaster
 %{python_sitelib}/certmaster/*.py*
+
 %dir /var/log/certmaster
-%dir /var/lib/certmaster
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/certmaster.log
+%attr(0600,root,root)  %config(noreplace) %verify(not md5 size mtime) /var/log/certmaster/audit.log
+
+%attr(600,root,root) %dir /var/lib/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/certs
+%attr(600,root,root) %dir /var/lib/certmaster/certmaster/csrs
+%dir /var/lib/certmaster/peers
 %dir /var/lib/certmaster/triggers/sign/
 %dir /var/lib/certmaster/triggers/sign/pre
 %dir /var/lib/certmaster/triggers/sign/post
@@ -72,6 +108,8 @@ rm -fr $RPM_BUILD_ROOT
 %dir /var/lib/certmaster/triggers/remove/
 %dir /var/lib/certmaster/triggers/remove/pre
 %dir /var/lib/certmaster/triggers/remove/post
+/var/lib/certmaster/triggers/sign/post/certmaster-sync
+/var/lib/certmaster/triggers/remove/post/certmaster-sync
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 
@@ -93,6 +131,9 @@ else
    done
 fi
 exit 0
+# fix perms on log files
+chmod 600 /var/log/certmaster/certmaster.log
+chmod 600 /var/log/certmaster/audit.log
 
 %preun
 if [ "$1" = 0 ] ; then
@@ -108,6 +149,27 @@ fi
 
 
 %changelog
+* Tue May 26 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/lib/certmaster/certmaster* to spec and set perms
+- add /var/log/certmaster/certmaster.log,audit.log to spec
+  and set perms
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24.5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+  do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3x1
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
 * Mon Dec 12 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
 - add missing dirs as per bz#473633
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/certmaster/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Dec 2008 20:39:07 -0000	1.7
+++ sources	12 Aug 2009 19:33:05 -0000	1.8
@@ -3,3 +3,4 @@ d661004b7eb0c7b43f57f0a510232bd2  certma
 470c450b3c5adbbeae3d154cb9de495c  certmaster-0.20.tar.gz
 884faef5a2da2f5b4e8bd6782d28a284  certmaster-0.23.tar.gz
 8a21725c88947133c2cc04b1fd21305e  certmaster-0.24.tar.gz
+83d6115f2cff4af18e150274602c71c1  certmaster-0.25.tar.gz



From scop at fedoraproject.org  Wed Aug 12 19:33:34 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:33:34 +0000 (UTC)
Subject: rpms/redet/devel .cvsignore, 1.5, 1.6 redet.spec, 1.6, 1.7 sources, 
	1.5, 1.6
Message-ID: <20090812193334.ABE5111C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/redet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2182

Modified Files:
	.cvsignore redet.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 8.26-4
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Oct 2008 16:08:01 -0000	1.5
+++ .cvsignore	12 Aug 2009 19:33:34 -0000	1.6
@@ -1 +1 @@
-redet-8.26.tar.gz
+redet-8.26.tar.bz2


Index: redet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/redet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- redet.spec	27 Jul 2009 02:54:34 -0000	1.6
+++ redet.spec	12 Aug 2009 19:33:34 -0000	1.7
@@ -6,11 +6,11 @@
 Summary:	Regular expression development and execution tool
 Name:		redet
 Version:	8.26
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv3
 Group:		Development/Tools
 URL:		http://www.billposer.org/Software/redet.html
-Source0:	http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.gz
+Source0:	http://www.billposer.org/Software/Downloads/%{name}-%{version}.tar.bz2
 Source1:	%{name}.png
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -94,6 +94,9 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 8.26-4
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Oct 2008 16:08:01 -0000	1.5
+++ sources	12 Aug 2009 19:33:34 -0000	1.6
@@ -1 +1 @@
-36b0f07845ca0ed7599adb38c31994d3  redet-8.26.tar.gz
+3b938f2d0161c0874f4111ac8562d756  redet-8.26.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:33:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:33:47 +0000 (UTC)
Subject: rpms/reiserfs-utils/devel .cvsignore, 1.8, 1.9 reiserfs-utils.spec, 
	1.21, 1.22 sources, 1.8, 1.9
Message-ID: <20090812193347.CFBF911C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/reiserfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2320

Modified Files:
	.cvsignore reiserfs-utils.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2:3.6.21-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Apr 2009 17:18:00 -0000	1.8
+++ .cvsignore	12 Aug 2009 19:33:47 -0000	1.9
@@ -1 +1 @@
-reiserfsprogs-3.6.21.tar.gz
+reiserfsprogs-3.6.21.tar.bz2


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- reiserfs-utils.spec	27 Jul 2009 02:57:15 -0000	1.21
+++ reiserfs-utils.spec	12 Aug 2009 19:33:47 -0000	1.22
@@ -1,11 +1,11 @@
 Name: reiserfs-utils
 Version: 3.6.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools for creating, repairing, and debugging ReiserFS filesystems
 #URL: http://www.namesys.com/
 URL: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/
 #Source0: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
-Source0: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-%{version}.tar.gz
+Source0: http://ftp.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-%{version}.tar.bz2
 # See README.
 License: GPLv2 with exceptions
 Group: System Environment/Base
@@ -63,6 +63,9 @@ install -m644 mkreiserfs/mkreiserfs.8 $R
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2:3.6.21-3
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:3.6.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/reiserfs-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	1 Apr 2009 17:18:00 -0000	1.8
+++ sources	12 Aug 2009 19:33:47 -0000	1.9
@@ -1 +1 @@
-bc00c7c4e047902575dc4e1c64ab3ba4  reiserfsprogs-3.6.21.tar.gz
+0639cefac8f8150536cfa7531c2aa2d2  reiserfsprogs-3.6.21.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:34:00 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:34:00 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.11,
	1.12 resource-agents.spec, 1.12, 1.13 sources, 1.11, 1.12
Message-ID: <20090812193400.E226C11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2413

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0.0-15
- Use bzipped upstream hg tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Jul 2009 11:37:06 -0000	1.11
+++ .cvsignore	12 Aug 2009 19:34:00 -0000	1.12
@@ -1,2 +1,2 @@
 resource-agents-3.0.0.tar.gz
-3aa338887920.tar.gz
+3aa338887920.tar.bz2


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- resource-agents.spec	29 Jul 2009 11:37:06 -0000	1.12
+++ resource-agents.spec	12 Aug 2009 19:34:00 -0000	1.13
@@ -25,12 +25,12 @@
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.0
-Release: 14%{?alphatag:.%{alphatag}}%{?dist}
+Release: 15%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
-Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.gz
+Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -113,6 +113,9 @@ service managers.
 %{_libdir}/heartbeat/sfex_daemon
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0.0-15
+- Use bzipped upstream hg tarball.
+
 * Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
 - Merge Pacemaker cluster resource agents:
   * Add Source1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Jul 2009 11:37:06 -0000	1.11
+++ sources	12 Aug 2009 19:34:00 -0000	1.12
@@ -1,2 +1,2 @@
 485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
-a05617c9fd4a765fb76e38247eb4738f  3aa338887920.tar.gz
+33048577b70aca705a62677e54c1d339  3aa338887920.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:34:14 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:34:14 +0000 (UTC)
Subject: rpms/rfdump/devel .cvsignore, 1.2, 1.3 rfdump.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20090812193414.7AB7811C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rfdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2506

Modified Files:
	.cvsignore rfdump.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rfdump/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Jan 2009 21:24:27 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:34:14 -0000	1.3
@@ -1 +1 @@
-rfdump-1.6.tar.gz
+rfdump-1.6.tar.bz2


Index: rfdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rfdump/devel/rfdump.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rfdump.spec	27 Jul 2009 03:00:12 -0000	1.4
+++ rfdump.spec	12 Aug 2009 19:34:14 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           rfdump
 Version:        1.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RFID tags detector
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.rfdump.org
-Source0:        http://www.rfdump.org/dl/%{name}-%{version}.tar.gz
+Source0:        http://www.rfdump.org/dl/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-1.6-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6-6
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rfdump/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Jan 2009 21:24:27 -0000	1.2
+++ sources	12 Aug 2009 19:34:14 -0000	1.3
@@ -1 +1 @@
-9db8053b5e2268234f516daed2731db8  rfdump-1.6.tar.gz
+e355566826ae313eb51aeb0d54ba1b68  rfdump-1.6.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:34:27 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:34:27 +0000 (UTC)
Subject: rpms/rxtx/devel .cvsignore, 1.2, 1.3 rxtx.spec, 1.7, 1.8 sources,
	1.2, 1.3
Message-ID: <20090812193427.CC8C911C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rxtx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2618

Modified Files:
	.cvsignore rxtx.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1-0.8.7r2
- Use upstream gzipped tarball instead of zip.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Oct 2008 19:50:29 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:34:27 -0000	1.3
@@ -1 +1 @@
-rxtx-2.1-7r2.zip
+rxtx-2.1-7r2.tgz


Index: rxtx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/rxtx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rxtx.spec	27 Jul 2009 03:41:21 -0000	1.7
+++ rxtx.spec	12 Aug 2009 19:34:27 -0000	1.8
@@ -1,6 +1,6 @@
 %define upver	2.1
 %define uprel	7r2
-%define rel	0.7
+%define rel	0.8
 #define jni	%{_jnidir}
 %define jni	%{_libdir}/%{name}
 
@@ -11,7 +11,7 @@ Release:	%{rel}.%{uprel}%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://rxtx.qbang.org/
-Source:		http://rxtx.qbang.org/pub/rxtx/%{name}-%{upver}-%{uprel}.zip
+Source:		http://rxtx.qbang.org/pub/rxtx/%{name}-%{upver}-%{uprel}.tgz
 Patch1:		%{name}-%{version}-loadlibrary.patch
 Patch2:		%{name}-%{version}-configure.patch
 Patch3:		%{name}-%{version}-uts.patch
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{jni}
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.1-0.8.7r2
+- Use upstream gzipped tarball instead of zip.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.7.7r2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Oct 2008 19:50:30 -0000	1.2
+++ sources	12 Aug 2009 19:34:27 -0000	1.3
@@ -1 +1 @@
-9290b4832d46199f8d798a531209640b  rxtx-2.1-7r2.zip
+aea33fc2d34972426da4eb5edc9b1b97  rxtx-2.1-7r2.tgz



From radford at fedoraproject.org  Wed Aug 12 19:35:12 2009
From: radford at fedoraproject.org (Jim Radford)
Date: Wed, 12 Aug 2009 19:35:12 +0000 (UTC)
Subject: rpms/dot2tex/devel dot2tex.spec,1.6,1.7
Message-ID: <20090812193512.E3E0311C00D5@cvs1.fedora.phx.redhat.com>

Author: radford

Update of /cvs/pkgs/rpms/dot2tex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2709

Modified Files:
	dot2tex.spec 
Log Message:
Remember, cvs update common/, then tag / build!



Index: dot2tex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dot2tex/devel/dot2tex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dot2tex.spec	12 Aug 2009 19:09:53 -0000	1.6
+++ dot2tex.spec	12 Aug 2009 19:35:12 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           dot2tex
 Version:        2.8.6
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A Graphviz to LaTeX converter
 Group:          Applications/Publishing
 License:        MIT
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 12 2009 Jim Radford <Jim Radford <radford at blackbean.org>> - 2.8.6-1
+* Wed Aug 12 2009 Jim Radford <Jim Radford <radford at blackbean.org>> - 2.8.6-3
 - upgrade to 2.8.6
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.4-3



From scop at fedoraproject.org  Wed Aug 12 19:41:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:41:07 +0000 (UTC)
Subject: rpms/sed/devel .cvsignore, 1.13, 1.14 sed.spec, 1.49, 1.50 sources, 
	1.13, 1.14
Message-ID: <20090812194107.C052411C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/sed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4156

Modified Files:
	.cvsignore sed.spec sources 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.2.1-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sed/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	1 Jul 2009 10:42:17 -0000	1.13
+++ .cvsignore	12 Aug 2009 19:41:07 -0000	1.14
@@ -1 +1 @@
-sed-4.2.1.tar.gz
+sed-4.2.1.tar.bz2


Index: sed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sed/devel/sed.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sed.spec	27 Jul 2009 04:07:36 -0000	1.49
+++ sed.spec	12 Aug 2009 19:41:07 -0000	1.50
@@ -6,11 +6,11 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://sed.sourceforge.net/
-Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.bz2
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.2.1-dummyparam.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +66,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.2.1-3
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sed/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Jul 2009 10:42:17 -0000	1.13
+++ sources	12 Aug 2009 19:41:07 -0000	1.14
@@ -1 +1 @@
-f0fd4d7da574d4707e442285fd2d3b86  sed-4.2.1.tar.gz
+7d310fbd76e01a01115075c1fd3f455a  sed-4.2.1.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:41:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:41:21 +0000 (UTC)
Subject: rpms/spring/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 spring.spec,
	1.5, 1.6
Message-ID: <20090812194121.4F8CB11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4255

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.79.1.2-4
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jul 2009 21:40:24 -0000	1.3
+++ .cvsignore	12 Aug 2009 19:41:21 -0000	1.4
@@ -1 +1 @@
-spring_0.79.1.2_src.tar.gz
+spring_0.79.1.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jul 2009 21:40:24 -0000	1.3
+++ sources	12 Aug 2009 19:41:21 -0000	1.4
@@ -1 +1 @@
-408b0359a43ae2a34798a6f41fe6f82a  spring_0.79.1.2_src.tar.gz
+fe22719f1df985051584767b19261dbc  spring_0.79.1.2_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- spring.spec	27 Jul 2009 04:42:27 -0000	1.5
+++ spring.spec	12 Aug 2009 19:41:21 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           spring
 Version:        0.79.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
 Group:          Amusements/Games
@@ -13,7 +13,7 @@ Group:          Amusements/Games
 License:        GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
 
 URL:            http://springrts.com
-Source0:        http://springrts.com/dl/spring_%{version}_src.tar.gz
+Source0:        http://springrts.com/dl/spring_%{version}_src.tar.lzma
 Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.79.1.2-4
+- Use lzma compressed upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.79.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:41:34 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:41:34 +0000 (UTC)
Subject: rpms/straw/devel .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 straw.spec, 
	1.20, 1.21
Message-ID: <20090812194134.756CD11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/straw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4366

Modified Files:
	sources straw.spec 
Added Files:
	.cvsignore 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.27-18
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	12 Aug 2009 19:41:34 -0000	1.4
@@ -0,0 +1 @@
+straw-0.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/straw/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Sep 2007 14:31:44 -0000	1.4
+++ sources	12 Aug 2009 19:41:34 -0000	1.5
@@ -1 +1 @@
-5c64c65158dab096e2077e4f91412b37  straw-0.27.tar.gz
+d21249c82b14570fe2c61e114d1d2ea7  straw-0.27.tar.bz2


Index: straw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/straw/devel/straw.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- straw.spec	27 Jul 2009 04:54:45 -0000	1.20
+++ straw.spec	12 Aug 2009 19:41:34 -0000	1.21
@@ -5,11 +5,11 @@
 Summary:        Desktop news aggregator
 Name:           straw
 Version:        0.27
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.gnome.org/projects/straw/
-Source:         http://download.gnome.org/sources/straw/%{version}/%{name}-%{version}.tar.gz
+Source:         http://download.gnome.org/sources/straw/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: python >= 2.4
@@ -105,6 +105,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.27-18
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:41:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:41:47 +0000 (UTC)
Subject: rpms/surl/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 surl.spec,
	1.4, 1.5
Message-ID: <20090812194147.EB36411C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/surl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4474

Modified Files:
	.cvsignore sources surl.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.4-2
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/surl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 17:24:22 -0000	1.4
+++ .cvsignore	12 Aug 2009 19:41:47 -0000	1.5
@@ -1 +1 @@
-surl-0.5.4.tar.gz
+surl-0.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/surl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 17:24:22 -0000	1.4
+++ sources	12 Aug 2009 19:41:47 -0000	1.5
@@ -1 +1 @@
-94f3843dcf9b5068523b8d949add9657  surl-0.5.4.tar.gz
+691c34fe22565ead3f3a186362f25ded  surl-0.5.4.tar.bz2


Index: surl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/surl/devel/surl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- surl.spec	28 Jul 2009 17:24:22 -0000	1.4
+++ surl.spec	12 Aug 2009 19:41:47 -0000	1.5
@@ -2,13 +2,13 @@
 
 Name:           surl
 Version:        0.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A URL shortening command line tool
 
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            https://launchpad.net/surl
-Source0:        http://launchpad.net/surl/trunk/0.5/+download/%{name}-%{version}.tar.gz
+Source0:        http://launchpad.net/surl/trunk/0.5/+download/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.4-2
+- Use bzipped upstream tarball.
+
 * Tue Jul 26 2009 Fabian Affolter <fabian at bernewireless.net> - 0.5.4-1
 - Updated to new upstream version 0.5.4
 



From davidz at fedoraproject.org  Wed Aug 12 19:42:21 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Wed, 12 Aug 2009 19:42:21 +0000 (UTC)
Subject: rpms/polkit/devel polkit.spec,1.7,1.8
Message-ID: <20090812194221.750AE11C00D5@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4609

Modified Files:
	polkit.spec 
Log Message:
* Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-2
- Disable GObject Introspection for now as it breaks the build




Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- polkit.spec	12 Aug 2009 19:25:45 -0000	1.7
+++ polkit.spec	12 Aug 2009 19:42:21 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.94
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -47,7 +47,7 @@ Development documentation for PolicyKit.
 %setup -q
 
 %build
-%configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1
+%configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --disable-introspection
 make
 
 %install
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pkaction
 %{_bindir}/pkcheck
 %{_libexecdir}/polkit-1/polkitd
-%{_libdir}/girepository-1.0/*.typelib
+#%{_libdir}/girepository-1.0/*.typelib
 
 # see upstream docs for why these permissions are necessary
 %attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1/
@@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/gir-1.0/*.gir
+#%{_datadir}/gir-1.0/*.gir
 %{_includedir}/*
 %{_bindir}/pk-example-frobnicate
 %{_datadir}/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-2
+- Disable GObject Introspection for now as it breaks the build
+
 * Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-1
 - Update to upstream release 0.94
 



From scop at fedoraproject.org  Wed Aug 12 19:46:16 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:46:16 +0000 (UTC)
Subject: rpms/tango-icon-theme/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tango-icon-theme.spec, 1.9, 1.10
Message-ID: <20090812194616.90B5011C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/tango-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5502

Modified Files:
	.cvsignore sources tango-icon-theme.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.90-3
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Mar 2009 05:55:55 -0000	1.5
+++ .cvsignore	12 Aug 2009 19:46:16 -0000	1.6
@@ -1 +1 @@
-tango-icon-theme-0.8.90.tar.gz
+tango-icon-theme-0.8.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Mar 2009 05:55:55 -0000	1.5
+++ sources	12 Aug 2009 19:46:16 -0000	1.6
@@ -1 +1 @@
-0795895d2f20eddcbd2bffe94ed431a6  tango-icon-theme-0.8.90.tar.gz
+b7b9b16480afb781a4c13f8bceb8688b  tango-icon-theme-0.8.90.tar.bz2


Index: tango-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tango-icon-theme/devel/tango-icon-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tango-icon-theme.spec	27 Jul 2009 05:31:03 -0000	1.9
+++ tango-icon-theme.spec	12 Aug 2009 19:46:16 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		tango-icon-theme
 Version:	0.8.90
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Icons from Tango Project
 Summary(pl):	Ikony Projektu Tango
 Summary(es):	Iconos del Proyecto Tango
@@ -9,7 +9,7 @@ License:	Public Domain
 Group:		User Interface/Desktops
 URL:		http://tango.freedesktop.org/Tango_Desktop_Project
 
-Source0:	http://tango.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source0:	http://tango.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.90-3
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.90-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:46:29 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:46:29 +0000 (UTC)
Subject: rpms/teseq/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 teseq.spec, 
	1.3, 1.4
Message-ID: <20090812194629.C5F8F11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/teseq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5622

Modified Files:
	.cvsignore sources teseq.spec 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.0-5
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Sep 2008 13:26:09 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:46:29 -0000	1.3
@@ -1 +1 @@
-teseq-1.0.0.tar.gz
+teseq-1.0.0.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Sep 2008 13:26:09 -0000	1.2
+++ sources	12 Aug 2009 19:46:29 -0000	1.3
@@ -1 +1 @@
-3bec1d4ee22a4a087f11aa2cb7485dde  teseq-1.0.0.tar.gz
+0dc9610637cac9b94a1e15b03a69a8af  teseq-1.0.0.tar.lzma


Index: teseq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teseq/devel/teseq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- teseq.spec	27 Jul 2009 05:47:24 -0000	1.3
+++ teseq.spec	12 Aug 2009 19:46:29 -0000	1.4
@@ -1,12 +1,12 @@
 Name:		teseq
 Version:	1.0.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An utility for rendering terminal typescripts human-readable 
 
 Group:		Development/Tools
 License:	GPLv3+
 URL:		http://www.gnu.org/software/teseq/
-Source0:	http://ftp.gnu.org/gnu/teseq/%{name}-%{version}.tar.gz
+Source0:	http://ftp.gnu.org/gnu/teseq/%{name}-%{version}.tar.lzma
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):	info
@@ -60,6 +60,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.0-5
+- Use lzma compressed upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:46:42 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:46:42 +0000 (UTC)
Subject: rpms/udpcast/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 udpcast.spec, 1.3, 1.4
Message-ID: <20090812194642.EFD2511C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/udpcast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5727

Modified Files:
	.cvsignore sources udpcast.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20071228-7
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udpcast/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 May 2008 19:46:16 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:46:42 -0000	1.3
@@ -1 +1 @@
-udpcast-20071228.tar.gz
+udpcast-20071228.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udpcast/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2008 19:46:16 -0000	1.2
+++ sources	12 Aug 2009 19:46:42 -0000	1.3
@@ -1 +1 @@
-064cfdbcdfe5f18552835ae88e3211f1  udpcast-20071228.tar.gz
+e6f5b78fc67edb70794b9cb372cc04b6  udpcast-20071228.tar.bz2


Index: udpcast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udpcast/devel/udpcast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- udpcast.spec	27 Jul 2009 06:27:56 -0000	1.3
+++ udpcast.spec	12 Aug 2009 19:46:42 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           udpcast
 Summary:        UDP broadcast file distribution and installation
 Version:        20071228
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv2+ and BSD
 Group:          Applications/System
 URL:            http://udpcast.linux.lu/
-Source:         http://udpcast.linux.lu/download/%{name}-%{version}.tar.gz
+Source:         http://udpcast.linux.lu/download/%{name}-%{version}.tar.bz2
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  m4
@@ -49,6 +49,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 20071228-7
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071228-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:46:56 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:46:56 +0000 (UTC)
Subject: rpms/ustr/devel .cvsignore, 1.5, 1.6 sources, 1.7, 1.8 ustr.spec,
	1.23, 1.24
Message-ID: <20090812194656.72AC111C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ustr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5844

Modified Files:
	.cvsignore sources ustr.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.4-10
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Mar 2008 02:10:10 -0000	1.5
+++ .cvsignore	12 Aug 2009 19:46:56 -0000	1.6
@@ -1 +1 @@
-ustr-1.0.4.tar.gz
+ustr-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Mar 2008 03:49:32 -0000	1.7
+++ sources	12 Aug 2009 19:46:56 -0000	1.8
@@ -1 +1 @@
-0833c29554eea19f2660aa000ba4c7b0  ustr-1.0.4.tar.gz
+93147d9f0c9765d4cd0f04f7e44bdfce  ustr-1.0.4.tar.bz2


Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ustr.spec	27 Jul 2009 06:40:16 -0000	1.23
+++ ustr.spec	12 Aug 2009 19:46:56 -0000	1.24
@@ -27,12 +27,12 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
 URL: http://www.and.org/ustr/
-Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz
+Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.bz2
 Patch0: c99-inline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # BuildRequires: make gcc sed
@@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.4-10
+- Use bzipped upstream tarball.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rmeggins at fedoraproject.org  Wed Aug 12 19:46:54 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 19:46:54 +0000 (UTC)
Subject: rpms/389-ds-base/devel 389-ds-base-git.sh, 1.1, 1.2 389-ds-base.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090812194654.0E0D711C00D5@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-serv5772/devel

Modified Files:
	389-ds-base-git.sh 389-ds-base.spec sources 
Log Message:
this is the 1.2.1 release


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git.sh	26 May 2009 22:55:06 -0000	1.1
+++ 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=HEAD
+TAG=389-ds-base-1.2.1
 VERSION=1.2.1
 PKGNAME=389-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base.spec	24 Jul 2009 14:58:04 -0000	1.2
+++ 389-ds-base.spec	12 Aug 2009 19:46:53 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -20,6 +20,7 @@ BuildRequires:    db4-devel
 BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
+BuildRequires:    pcre-devel
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
 %ifnarch sparc sparc64 ppc ppc64
@@ -172,6 +173,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-3
+- added BuildRequires pcre
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 May 2009 22:55:06 -0000	1.2
+++ sources	12 Aug 2009 19:46:53 -0000	1.3
@@ -1 +1 @@
-bc0c5ccc95bf0fcbc68b372c5f00d2d5  389-ds-base-1.2.1.tar.bz2
+49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 19:46:53 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 19:46:53 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 389-ds-base-git.sh, 1.1, 1.2 389-ds-base.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090812194653.A2B9A11C00D5@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-serv5772/F-10

Modified Files:
	389-ds-base-git.sh 389-ds-base.spec sources 
Log Message:
this is the 1.2.1 release


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git.sh	4 Jun 2009 16:20:08 -0000	1.1
+++ 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=HEAD
+TAG=389-ds-base-1.2.1
 VERSION=1.2.1
 PKGNAME=389-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base.spec	4 Jun 2009 16:20:08 -0000	1.1
+++ 389-ds-base.spec	12 Aug 2009 19:46:53 -0000	1.2
@@ -20,6 +20,7 @@ BuildRequires:    db4-devel
 BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
+BuildRequires:    pcre-devel
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
 %ifnarch sparc sparc64 ppc ppc64
@@ -173,6 +174,7 @@ fi
 
 %changelog
 * Mon May 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-1
+- uses pcre
 - change name to 389
 - change version to 1.2.1
 - added initial support for numeric string syntax


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 16:20:08 -0000	1.2
+++ sources	12 Aug 2009 19:46:53 -0000	1.3
@@ -1 +1 @@
-bc0c5ccc95bf0fcbc68b372c5f00d2d5  389-ds-base-1.2.1.tar.bz2
+49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 19:46:53 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 19:46:53 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 389-ds-base-git.sh, 1.1, 1.2 389-ds-base.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090812194653.DBB1111C00D5@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-serv5772/F-11

Modified Files:
	389-ds-base-git.sh 389-ds-base.spec sources 
Log Message:
this is the 1.2.1 release


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git.sh	4 Jun 2009 16:20:08 -0000	1.1
+++ 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=HEAD
+TAG=389-ds-base-1.2.1
 VERSION=1.2.1
 PKGNAME=389-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base.spec	4 Jun 2009 16:20:08 -0000	1.1
+++ 389-ds-base.spec	12 Aug 2009 19:46:53 -0000	1.2
@@ -20,6 +20,7 @@ BuildRequires:    db4-devel
 BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
+BuildRequires:    pcre-devel
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
 %ifnarch sparc sparc64 ppc ppc64
@@ -173,6 +174,7 @@ fi
 
 %changelog
 * Mon May 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-1
+- uses pcre
 - change name to 389
 - change version to 1.2.1
 - added initial support for numeric string syntax


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 16:20:08 -0000	1.2
+++ sources	12 Aug 2009 19:46:53 -0000	1.3
@@ -1 +1 @@
-bc0c5ccc95bf0fcbc68b372c5f00d2d5  389-ds-base-1.2.1.tar.bz2
+49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 19:50:18 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:50:18 +0000 (UTC)
Subject: rpms/ytalk/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ytalk.spec, 
	1.57, 1.58
Message-ID: <20090812195019.0145C11C0489@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/ytalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6800

Modified Files:
	.cvsignore sources ytalk.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.3.0-17
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytalk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Feb 2006 08:24:47 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:50:18 -0000	1.3
@@ -1 +1 @@
-ytalk-3.3.0.tar.gz
+ytalk-3.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytalk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Feb 2006 08:24:47 -0000	1.2
+++ sources	12 Aug 2009 19:50:18 -0000	1.3
@@ -1 +1 @@
-c043a8d854638b293a3b645d8600aa38  ytalk-3.3.0.tar.gz
+a82e4c82f724e36a6a3242d3839d4332  ytalk-3.3.0.tar.bz2


Index: ytalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ytalk/devel/ytalk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ytalk.spec	27 Jul 2009 08:56:11 -0000	1.57
+++ ytalk.spec	12 Aug 2009 19:50:18 -0000	1.58
@@ -1,11 +1,11 @@
 Summary: A chat program for multiple users
 Name: ytalk
 Version: 3.3.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.impul.se/ytalk/
-Source: http://www.impul.se/ytalk/%{name}-%{version}.tar.gz
+Source: http://www.impul.se/ytalk/%{name}-%{version}.tar.bz2
 Source1: ytalkrc
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: ncurses-devel
@@ -38,6 +38,9 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/ytalkrc
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.3.0-17
+- Use bzipped upstream tarball.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:50:32 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:50:32 +0000 (UTC)
Subject: rpms/zenon/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zenon.spec, 
	1.6, 1.7
Message-ID: <20090812195032.0964311C0489@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zenon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6900

Modified Files:
	.cvsignore sources zenon.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.0-6
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zenon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2008 16:40:45 -0000	1.2
+++ .cvsignore	12 Aug 2009 19:50:31 -0000	1.3
@@ -1 +1 @@
-zenon-0.5.0.tar.gz
+zenon-0.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zenon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jul 2008 16:40:45 -0000	1.2
+++ sources	12 Aug 2009 19:50:31 -0000	1.3
@@ -1 +1 @@
-d5440999c6f92d436a1d1e96d4ffbd56  zenon-0.5.0.tar.gz
+3b5496aac11aa401ffccb422c866a4b6  zenon-0.5.0.tar.bz2


Index: zenon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zenon/devel/zenon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- zenon.spec	27 Jul 2009 09:00:14 -0000	1.6
+++ zenon.spec	12 Aug 2009 19:50:31 -0000	1.7
@@ -1,11 +1,11 @@
 Name:		zenon
 Version:	0.5.0
-Release:	5%{?dist}.1
+Release:	6%{?dist}
 Summary:	Automated theorem prover for first-order classical logic
 Group:		Applications/Engineering
 License:	BSD
 URL:		http://focal.inria.fr/zenon
-Source0:	http://focal.inria.fr/zenon/zenon-0.5.0.tar.gz
+Source0:	http://focal.inria.fr/zenon/zenon-0.5.0.tar.bz2
 Source1:	zenon-tptp-COM003+2.p
 Source2:	zenon-tptp-ReadMe
 # Basic documentation (man pages). Submitted upstream 2008-07-25:
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.0-6
+- Use bzipped upstream tarball.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Wed Aug 12 19:50:45 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 19:50:45 +0000 (UTC)
Subject: rpms/zlib/devel .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 zlib.spec, 
	1.51, 1.52
Message-ID: <20090812195045.CC73511C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7019

Modified Files:
	.cvsignore sources zlib.spec 
Log Message:
* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2.3-24
- Use bzipped upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Aug 2005 14:14:47 -0000	1.8
+++ .cvsignore	12 Aug 2009 19:50:45 -0000	1.9
@@ -1,4 +1 @@
-zlib-1.2.1.1.tar.gz
-zlib-1.2.2.1.tar.gz
-zlib-1.2.2.2.tar.gz
-zlib-1.2.3.tar.gz
+zlib-1.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Aug 2005 14:14:47 -0000	1.9
+++ sources	12 Aug 2009 19:50:45 -0000	1.10
@@ -1 +1 @@
-debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
+dee233bf288ee795ac96a98cc2e369b6  zlib-1.2.3.tar.bz2


Index: zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- zlib.spec	27 Jul 2009 09:04:10 -0000	1.51
+++ zlib.spec	12 Aug 2009 19:50:45 -0000	1.52
@@ -1,9 +1,9 @@
 Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.3
-Release: 23%{?dist}
+Release: 24%{?dist}
 Group: System Environment/Libraries
-Source: http://www.zlib.net/zlib-%{version}.tar.gz
+Source: http://www.zlib.net/zlib-%{version}.tar.bz2
 Patch3: zlib-1.2.3-autotools.patch
 Patch6: minizip-1.2.3-malloc.patch
 URL: http://www.gzip.org/zlib/
@@ -129,6 +129,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/minizip.pc
 
 %changelog
+* Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2.3-24
+- Use bzipped upstream tarball.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rmeggins at fedoraproject.org  Wed Aug 12 19:53:27 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 19:53:27 +0000 (UTC)
Subject: rpms/389-adminutil/F-10 389-adminutil.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090812195327.6235011C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-adminutil/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8270/F-10

Modified Files:
	389-adminutil.spec sources 
Log Message:
final 1.1.8 release


Index: 389-adminutil.spec
===================================================================
RCS file: /cvs/extras/rpms/389-adminutil/F-10/389-adminutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-adminutil.spec	17 Jul 2009 21:15:13 -0000	1.1
+++ 389-adminutil.spec	12 Aug 2009 19:53:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
 Version:          1.1.8
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
 Group:            Development/Libraries
@@ -82,6 +82,9 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-3
+- final 1.1.8 release
+
 * Tue May 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-2
 - rename to 389-adminutil
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-adminutil/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 21:15:13 -0000	1.2
+++ sources	12 Aug 2009 19:53:27 -0000	1.3
@@ -1 +1 @@
-e84240547e2f7b97d0576bcb85c06a57  389-adminutil-1.1.8.tar.bz2
+f1b0884c701e3cc7705224e07d088d8e  389-adminutil-1.1.8.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 19:53:27 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 19:53:27 +0000 (UTC)
Subject: rpms/389-adminutil/devel 389-adminutil.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <20090812195327.9D05411C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-adminutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8270/devel

Modified Files:
	389-adminutil.spec sources 
Log Message:
final 1.1.8 release


Index: 389-adminutil.spec
===================================================================
RCS file: /cvs/extras/rpms/389-adminutil/devel/389-adminutil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-adminutil.spec	24 Jul 2009 14:57:19 -0000	1.2
+++ 389-adminutil.spec	12 Aug 2009 19:53:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
 Version:          1.1.8
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
 Group:            Development/Libraries
@@ -82,6 +82,9 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-4
+- final 1.1.8 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-adminutil/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 21:00:17 -0000	1.2
+++ sources	12 Aug 2009 19:53:27 -0000	1.3
@@ -1 +1 @@
-e84240547e2f7b97d0576bcb85c06a57  389-adminutil-1.1.8.tar.bz2
+f1b0884c701e3cc7705224e07d088d8e  389-adminutil-1.1.8.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 19:53:27 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 19:53:27 +0000 (UTC)
Subject: rpms/389-adminutil/F-11 389-adminutil.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090812195327.7619211C02CB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-adminutil/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8270/F-11

Modified Files:
	389-adminutil.spec sources 
Log Message:
final 1.1.8 release


Index: 389-adminutil.spec
===================================================================
RCS file: /cvs/extras/rpms/389-adminutil/F-11/389-adminutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-adminutil.spec	17 Jul 2009 21:15:14 -0000	1.1
+++ 389-adminutil.spec	12 Aug 2009 19:53:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
 Version:          1.1.8
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
 Group:            Development/Libraries
@@ -82,6 +82,9 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-3
+- final 1.1.8 release
+
 * Tue May 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-2
 - rename to 389-adminutil
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-adminutil/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 21:15:14 -0000	1.2
+++ sources	12 Aug 2009 19:53:27 -0000	1.3
@@ -1 +1 @@
-e84240547e2f7b97d0576bcb85c06a57  389-adminutil-1.1.8.tar.bz2
+f1b0884c701e3cc7705224e07d088d8e  389-adminutil-1.1.8.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug 12 19:56:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:56:59 +0000
Subject: [pkgdb] hunspell had acl change status
Message-ID: <20090812195659.22F7D10F842@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hunspell (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell



From pkgdb at fedoraproject.org  Wed Aug 12 19:57:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 19:57:12 +0000
Subject: [pkgdb] hunspell had acl change status
Message-ID: <20090812195712.4527D10F800@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hunspell (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell



From rmeggins at fedoraproject.org  Wed Aug 12 20:00:08 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:00:08 +0000 (UTC)
Subject: rpms/389-admin/devel 389-admin.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090812200008.C1E0C11C048B@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559/devel

Modified Files:
	389-admin.spec sources 
Log Message:
final 1.1.8 release


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-admin.spec	24 Jul 2009 14:56:45 -0000	1.5
+++ 389-admin.spec	12 Aug 2009 20:00:08 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.8
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -150,6 +150,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-4
+- final rebuild for 1.1.8 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Jul 2009 15:38:09 -0000	1.4
+++ sources	12 Aug 2009 20:00:08 -0000	1.5
@@ -1 +1 @@
-44fa5cfbb7570ebb2cd775ac8379b5de  389-admin-1.1.8.tar.bz2
+62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:00:08 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:00:08 +0000 (UTC)
Subject: rpms/389-admin/F-10 389-admin.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090812200008.5995811C048B@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-serv9559/F-10

Modified Files:
	389-admin.spec sources 
Log Message:
final 1.1.8 release


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-10/389-admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-admin.spec	21 Jul 2009 12:59:11 -0000	1.3
+++ 389-admin.spec	12 Aug 2009 20:00:08 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.8
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -148,6 +148,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-3
+- final rebuild for 1.1.8 release
+
 * Tue Jul 21 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-2
 - change adminutil to 389-adminutil
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Jul 2009 15:38:08 -0000	1.3
+++ sources	12 Aug 2009 20:00:08 -0000	1.4
@@ -1 +1 @@
-44fa5cfbb7570ebb2cd775ac8379b5de  389-admin-1.1.8.tar.bz2
+62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:00:08 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:00:08 +0000 (UTC)
Subject: rpms/389-admin/F-11 389-admin.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090812200008.83F9B11C048B@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-serv9559/F-11

Modified Files:
	389-admin.spec sources 
Log Message:
final 1.1.8 release


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-admin.spec	21 Jul 2009 12:59:11 -0000	1.3
+++ 389-admin.spec	12 Aug 2009 20:00:08 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.8
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -150,6 +150,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-3
+- final rebuild for 1.1.8 release
+
 * Tue Jul 21 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-2
 - change adminutil to 389-adminutil
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Jul 2009 15:38:09 -0000	1.3
+++ sources	12 Aug 2009 20:00:08 -0000	1.4
@@ -1 +1 @@
-44fa5cfbb7570ebb2cd775ac8379b5de  389-admin-1.1.8.tar.bz2
+62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2



From scop at fedoraproject.org  Wed Aug 12 20:00:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 20:00:09 +0000 (UTC)
Subject: rpms/perl-qooxdoo-compat/devel .cvsignore, 1.2,
	1.3 perl-qooxdoo-compat.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090812200009.0BA0311C048B@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-qooxdoo-compat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9607

Modified Files:
	.cvsignore perl-qooxdoo-compat.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.7.3-5
- Use upstream gzipped tarball instead of zip.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-qooxdoo-compat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Oct 2008 18:02:03 -0000	1.2
+++ .cvsignore	12 Aug 2009 20:00:08 -0000	1.3
@@ -1 +1 @@
-qooxdoo-0.7.3-backend.zip
+qooxdoo-0.7.3-backend.tar.gz


Index: perl-qooxdoo-compat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-qooxdoo-compat/devel/perl-qooxdoo-compat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-qooxdoo-compat.spec	26 Jul 2009 17:50:37 -0000	1.3
+++ perl-qooxdoo-compat.spec	12 Aug 2009 20:00:08 -0000	1.4
@@ -1,16 +1,15 @@
 Summary:    Perl backend for Qooxdoo
 Name:       perl-qooxdoo-compat
 Version:    0.7.3
-Release:    4%{?dist}
+Release:    5%{?dist}
 License:    LGPLv2 or EPL
 Group:      Development/Languages
 URL:        http://qooxdoo.org/
-Source0:    http://downloads.sourceforge.net/qooxdoo/qooxdoo-%{version}-backend.zip
+Source0:    http://downloads.sourceforge.net/qooxdoo/qooxdoo-%{version}-backend.tar.gz
 Patch0:     perl-qooxdoo-compat-0.7.3-strict.patch
 BuildArch:  noarch
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: dos2unix
 
 %description
 This package provides the Perl backend for Qooxdoo, a comprehensive
@@ -20,7 +19,6 @@ Qooxdoo 0.7.
 %prep
 %setup -q -n qooxdoo-%{version}-backend
 %patch0 -p1
-dos2unix -k AUTHORS LICENSE README RELEASENOTES TODO VERSION
 
 %build
 # nothing to build
@@ -41,6 +39,9 @@ dos2unix -k AUTHORS LICENSE README RELEA
 %{perl_vendorlib}/Qooxdoo
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.7.3-5
+- Use upstream gzipped tarball instead of zip.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-qooxdoo-compat/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Oct 2008 18:02:03 -0000	1.2
+++ sources	12 Aug 2009 20:00:08 -0000	1.3
@@ -1 +1 @@
-e7998bc24c14b9c9ee7d7eeff0e8d18f  qooxdoo-0.7.3-backend.zip
+25da0f712c8b4b3970894f3406f1634c  qooxdoo-0.7.3-backend.tar.gz



From rmeggins at fedoraproject.org  Wed Aug 12 20:03:47 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:03:47 +0000 (UTC)
Subject: rpms/389-console/F-10 389-console.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090812200347.9973911C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10227/F-10

Modified Files:
	389-console.spec sources 
Log Message:
this is the final 1.1.3 release


Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-10/389-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-console.spec	18 Jun 2009 21:11:43 -0000	1.1
+++ 389-console.spec	12 Aug 2009 20:03:47 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-3
+- final rebuild for 1.1.3 release
+
 * Wed May 13 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-2
 - rename to 389
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jun 2009 21:11:43 -0000	1.2
+++ sources	12 Aug 2009 20:03:47 -0000	1.3
@@ -1 +1 @@
-e9152a2e523a2890767a91cb338e2974  389-console-1.1.3.tar.bz2
+65cc927851ae61d0763ea61fd92f18f9  389-console-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:03:47 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:03:47 +0000 (UTC)
Subject: rpms/389-console/F-11 389-console.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090812200347.C4C1411C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10227/F-11

Modified Files:
	389-console.spec sources 
Log Message:
this is the final 1.1.3 release


Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-11/389-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-console.spec	18 Jun 2009 21:11:44 -0000	1.1
+++ 389-console.spec	12 Aug 2009 20:03:47 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-3
+- final rebuild for 1.1.3 release
+
 * Wed May 13 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-2
 - rename to 389
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-console/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jun 2009 21:11:44 -0000	1.2
+++ sources	12 Aug 2009 20:03:47 -0000	1.3
@@ -1 +1 @@
-e9152a2e523a2890767a91cb338e2974  389-console-1.1.3.tar.bz2
+65cc927851ae61d0763ea61fd92f18f9  389-console-1.1.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:03:47 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:03:47 +0000 (UTC)
Subject: rpms/389-console/devel 389-console.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090812200347.F34F811C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10227/devel

Modified Files:
	389-console.spec sources 
Log Message:
this is the final 1.1.3 release


Index: 389-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-console/devel/389-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-console.spec	24 Jul 2009 14:57:36 -0000	1.2
+++ 389-console.spec	12 Aug 2009 20:03:47 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-4
+- final rebuild for 1.1.3 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-console/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jun 2009 20:40:18 -0000	1.2
+++ sources	12 Aug 2009 20:03:47 -0000	1.3
@@ -1 +1 @@
-e9152a2e523a2890767a91cb338e2974  389-console-1.1.3.tar.bz2
+65cc927851ae61d0763ea61fd92f18f9  389-console-1.1.3.tar.bz2



From dwalsh at fedoraproject.org  Wed Aug 12 20:09:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 12 Aug 2009 20:09:22 +0000 (UTC)
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.50,
	1.51 modules-minimum.conf, 1.26, 1.27 modules-targeted.conf,
	1.135, 1.136 policy-F12.patch, 1.49, 1.50
Message-ID: <20090812200922.C8D2111C00D5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11149

Modified Files:
	booleans-targeted.conf modules-minimum.conf 
	modules-targeted.conf policy-F12.patch 
Log Message:
* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-9
- Add kdump policy for Miroslav Grepl
- Turn off execstack boolean



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- booleans-targeted.conf	10 Aug 2009 18:22:10 -0000	1.50
+++ booleans-targeted.conf	12 Aug 2009 20:09:21 -0000	1.51
@@ -8,7 +8,7 @@ allow_execmod = false
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = false
+allow_execstack = true
 
 # Allow ftpd to read cifs directories.
 # 


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- modules-minimum.conf	10 Aug 2009 18:22:10 -0000	1.26
+++ modules-minimum.conf	12 Aug 2009 20:09:21 -0000	1.27
@@ -557,12 +557,27 @@ gnomeclock = module
 hal = module
 
 # Layer: services
+# Module: hddtemp
+#
+# hddtemp hard disk temperature tool running as a daemon
+# 
+hddtemp = module
+
+# Layer: services
 # Module: policykit
 #
 # Hardware abstraction layer
 # 
 policykit = module
 
+
+# Layer: apps
+# Module: ptchown
+#
+# helper function for grantpt(3), changes ownship and permissions of pseudotty
+# 
+ptchown = module
+
 # Layer: services
 # Module: psad
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- modules-targeted.conf	10 Aug 2009 18:22:10 -0000	1.135
+++ modules-targeted.conf	12 Aug 2009 20:09:21 -0000	1.136
@@ -557,12 +557,27 @@ gnomeclock = module
 hal = module
 
 # Layer: services
+# Module: hddtemp
+#
+# hddtemp hard disk temperature tool running as a daemon
+# 
+hddtemp = module
+
+# Layer: services
 # Module: policykit
 #
 # Hardware abstraction layer
 # 
 policykit = module
 
+
+# Layer: apps
+# Module: ptchown
+#
+# helper function for grantpt(3), changes ownship and permissions of pseudotty
+# 
+ptchown = module
+
 # Layer: services
 # Module: psad
 #

policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |    8 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   35 
 policy/modules/apps/pulseaudio.te                  |    4 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 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                     |  145 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   22 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    3 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   38 
 policy/modules/kernel/filesystem.te                |    2 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   31 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   20 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |   11 
 policy/modules/services/cups.te                    |   23 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   26 
 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               |   55 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    2 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   45 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   50 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    4 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   49 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   80 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   97 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  128 +-
 policy/modules/services/virt.te                    |  272 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   28 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  175 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   77 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  227 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  116 +
 policy/modules/system/sysnetwork.te                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   42 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  439 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1303 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 308 files changed, 13400 insertions(+), 2605 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- policy-F12.patch	10 Aug 2009 18:22:10 -0000	1.49
+++ policy-F12.patch	12 Aug 2009 20:09:21 -0000	1.50
@@ -460,7 +460,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.26/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/admin/mrtg.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/admin/mrtg.te	2009-08-11 14:24:37.000000000 -0400
 @@ -116,6 +116,9 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -471,6 +471,17 @@ diff -b -B --ignore-all-space --exclude-
  
  ifdef(`enable_mls',`
  	corenet_udp_sendrecv_lo_if(mrtg_t)
+@@ -139,6 +142,10 @@
+ ')
+ 
+ optional_policy(`
++	hddtemp_domtrans(mrtg_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(mrtg_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.26/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-07-23 14:11:04.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/admin/prelink.if	2009-07-30 15:33:08.000000000 -0400
@@ -783,7 +794,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.26/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/admin/rpm.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/admin/rpm.te	2009-08-12 15:12:20.000000000 -0400
 @@ -31,11 +31,15 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -986,7 +997,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -326,13 +370,18 @@
+@@ -326,13 +370,22 @@
  ')
  
  optional_policy(`
@@ -1000,6 +1011,10 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 -	unconfined_domain(rpm_script_t)
++	udev_domtrans(rpm_script_t)
++')
++
++optional_policy(`
 +	unconfined_domain_noaudit(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
 +	unconfined_execmem_domtrans(rpm_script_t)
@@ -3088,6 +3103,77 @@ diff -b -B --ignore-all-space --exclude-
 +
 +
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.fc serefpolicy-3.6.26/policy/modules/apps/ptchown.fc
+--- nsaserefpolicy/policy/modules/apps/ptchown.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/apps/ptchown.fc	2009-08-12 14:48:50.000000000 -0400
+@@ -0,0 +1,2 @@
++
++/usr/libexec/pt_chown	--	gen_context(system_u:object_r:ptchown_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.if serefpolicy-3.6.26/policy/modules/apps/ptchown.if
+--- nsaserefpolicy/policy/modules/apps/ptchown.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/apps/ptchown.if	2009-08-12 14:51:46.000000000 -0400
+@@ -0,0 +1,22 @@
++
++## <summary>helper function for grantpt(3), changes ownship and permissions of pseudotty</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run ptchown.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ptchown_domtrans',`
++	gen_require(`
++		type ptchown_t;
++                type ptchown_exec_t;
++	')
++
++	domtrans_pattern($1,ptchown_exec_t,ptchown_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.6.26/policy/modules/apps/ptchown.te
+--- nsaserefpolicy/policy/modules/apps/ptchown.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/apps/ptchown.te	2009-08-12 14:55:11.000000000 -0400
+@@ -0,0 +1,35 @@
++policy_module(ptchown,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ptchown_t;
++type ptchown_exec_t;
++application_domain(ptchown_t, ptchown_exec_t)
++role system_r types ptchown_t;
++
++permissive ptchown_t;
++
++########################################
++#
++# ptchown local policy
++#
++
++allow ptchown_t self:capability { chown setuid };
++allow ptchown_t self:process { getcap setcap };
++
++# Init script handling
++domain_use_interactive_fds(ptchown_t)
++
++# internal communication is often done using fifo and unix sockets.
++allow ptchown_t self:fifo_file rw_file_perms;
++allow ptchown_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(ptchown_t)
++
++term_setattr_generic_ptys(ptchown_t)
++term_setattr_all_user_ptys(ptchown_t)
++
++miscfiles_read_localization(ptchown_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.26/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-07-23 14:11:04.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/apps/pulseaudio.te	2009-08-04 05:32:34.000000000 -0400
@@ -4266,8 +4352,16 @@ 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.26/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/corecommands.fc	2009-07-30 15:33:08.000000000 -0400
-@@ -142,6 +142,9 @@
++++ serefpolicy-3.6.26/policy/modules/kernel/corecommands.fc	2009-08-11 14:58:11.000000000 -0400
+@@ -125,6 +125,7 @@
+ /sbin/.*				gen_context(system_u:object_r:bin_t,s0)
+ /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:bin_t,s0)
+ /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:bin_t,s0)
++/sbin/nologin			--	gen_context(system_u:object_r:shell_exec_t,s0)
+ 
+ #
+ # /opt
+@@ -142,6 +143,9 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -4277,7 +4371,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -315,3 +318,21 @@
+@@ -315,3 +319,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4312,7 +4406,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.26/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/corenetwork.te.in	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/corenetwork.te.in	2009-08-11 14:24:37.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -4321,7 +4415,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,25 +88,31 @@
  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)
@@ -4344,7 +4438,9 @@ 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)
-@@ -106,6 +111,7 @@
+ network_port(gpsd, tcp,2947,s0)
++network_port(hddtemp, tcp,7634,s0)
+ network_port(howl, tcp,5335,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
@@ -4352,7 +4448,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)
-@@ -128,7 +134,7 @@
+@@ -128,7 +135,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
@@ -4361,7 +4457,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)
-@@ -146,6 +152,12 @@
+@@ -146,6 +153,12 @@
  network_port(pegasus_https, tcp,5989,s0)
  network_port(pgpkeyserver, udp, 11371,s0, tcp,11371,s0)
  network_port(pingd, tcp,9125,s0)
@@ -4374,7 +4470,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)
-@@ -172,27 +184,31 @@
+@@ -172,27 +185,31 @@
  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)
@@ -4409,7 +4505,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)
-@@ -221,6 +237,8 @@
+@@ -221,6 +238,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -4442,7 +4538,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.26/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-10 10:05:44.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-11 18:56:44.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -4584,11 +4680,11 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Read the lvm comtrol device.
-@@ -2232,6 +2359,24 @@
+@@ -2268,6 +2395,25 @@
  
  ########################################
  ## <summary>
-+##	Read and write the the wireless device.
++##	Delete the null device (/dev/null).
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -4596,24 +4692,25 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`dev_rw_wireless',`
++interface(`dev_delete_null',`
 +	gen_require(`
-+		type device_t, wireless_device_t;
++		type device_t, null_device_t;
 +	')
 +
-+	rw_chr_files_pattern($1, device_t, wireless_device_t)
++	allow $1 device_t:dir del_entry_dir_perms;
++	allow $1 null_device_t:chr_file unlink;
 +')
 +
 +########################################
 +## <summary>
- ##	Get the attributes of the null device nodes.
+ ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
-@@ -2268,6 +2413,25 @@
+@@ -3562,6 +3708,24 @@
  
  ########################################
  ## <summary>
-+##	Delete the null device (/dev/null).
++##	Read and write the the wireless device.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -4621,18 +4718,17 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`dev_delete_null',`
++interface(`dev_rw_wireless',`
 +	gen_require(`
-+		type device_t, null_device_t;
++		type device_t, wireless_device_t;
 +	')
 +
-+	allow $1 device_t:dir del_entry_dir_perms;
-+	allow $1 null_device_t:chr_file unlink;
++	rw_chr_files_pattern($1, device_t, wireless_device_t)
 +')
 +
 +########################################
 +## <summary>
- ##	Read and write to the null device (/dev/null).
+ ##	Read and write Xen devices.
  ## </summary>
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.26/policy/modules/kernel/devices.te
@@ -5399,7 +5495,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.6.26/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/files.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/files.te	2009-08-12 14:53:21.000000000 -0400
 @@ -42,6 +42,7 @@
  #
  type boot_t;
@@ -5419,6 +5515,14 @@ diff -b -B --ignore-all-space --exclude-
  files_type(etc_t)
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
+@@ -193,6 +196,7 @@
+ fs_associate_noxattr(file_type)
+ fs_associate_tmpfs(file_type)
+ fs_associate_ramfs(file_type)
++fs_associate_hugetlbfs(file_type)
+ 
+ ########################################
+ #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.fc serefpolicy-3.6.26/policy/modules/kernel/filesystem.fc
 --- nsaserefpolicy/policy/modules/kernel/filesystem.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/kernel/filesystem.fc	2009-07-30 15:33:08.000000000 -0400
@@ -5427,8 +5531,33 @@ 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.26/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/filesystem.if	2009-07-30 15:33:08.000000000 -0400
-@@ -3971,3 +3971,23 @@
++++ serefpolicy-3.6.26/policy/modules/kernel/filesystem.if	2009-08-11 16:06:07.000000000 -0400
+@@ -1537,6 +1537,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow the type to associate to hugetlbfs filesystems.
++## </summary>
++## <param name="type">
++##	<summary>
++##	The type of the object to be associated.
++##	</summary>
++## </param>
++#
++interface(`fs_associate_hugetlbfs',`
++	gen_require(`
++		type hugetlbfs_t;
++	')
++
++	allow $1 hugetlbfs_t:filesystem associate;
++')
++
++########################################
++## <summary>
+ ##	Search inotifyfs filesystem. 
+ ## </summary>
+ ## <param name="domain">
+@@ -3971,3 +3989,23 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -5452,6 +5581,18 @@ diff -b -B --ignore-all-space --exclude-
 +	dontaudit $1 cifs_t:dir list_dir_perms;
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.6.26/policy/modules/kernel/filesystem.te
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/filesystem.te	2009-08-12 11:10:36.000000000 -0400
+@@ -93,7 +93,7 @@
+ type hugetlbfs_t;
+ fs_type(hugetlbfs_t)
+ files_mountpoint(hugetlbfs_t)
+-genfscon hugetlbfs / gen_context(system_u:object_r:hugetlbfs_t,s0)
++fs_use_trans hugetlbfs gen_context(system_u:object_r:hugetlbfs_t,s0);
+ 
+ type ibmasmfs_t;
+ fs_type(ibmasmfs_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.26/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/kernel/kernel.if	2009-08-10 11:43:18.000000000 -0400
@@ -5671,7 +5812,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.26/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/terminal.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/terminal.if	2009-08-12 14:54:39.000000000 -0400
 @@ -173,7 +173,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -5743,6 +5884,17 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Read and write the controlling
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-3.6.26/policy/modules/kernel/terminal.te
+--- nsaserefpolicy/policy/modules/kernel/terminal.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/terminal.te	2009-08-11 14:33:58.000000000 -0400
+@@ -44,6 +44,7 @@
+ type ptmx_t;
+ dev_node(ptmx_t)
+ mls_trusted_object(ptmx_t)
++allow ptmx_t devpts_t:filesystem associate;
+ 
+ #
+ # tty_device_t is the type of /dev/*tty*
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.6.26/policy/modules/roles/guest.te
 --- nsaserefpolicy/policy/modules/roles/guest.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/roles/guest.te	2009-07-30 15:33:08.000000000 -0400
@@ -8947,7 +9099,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.6.26/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/bind.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/bind.if	2009-08-12 15:14:43.000000000 -0400
 @@ -287,6 +287,25 @@
  
  ########################################
@@ -9997,7 +10149,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.26/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/dbus.if	2009-08-06 08:01:02.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/dbus.if	2009-08-12 16:08:16.000000000 -0400
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -10027,16 +10179,17 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1_dbusd_t $3:process sigkill;
  	allow $3 $1_dbusd_t:fd use;
  	allow $3 $1_dbusd_t:fifo_file rw_fifo_file_perms;
-@@ -146,6 +148,8 @@
+@@ -146,6 +148,9 @@
  	seutil_read_config($1_dbusd_t)
  	seutil_read_default_contexts($1_dbusd_t)
  
 +	term_use_all_terms($1_dbusd_t)
 +
++	userdom_dontaudit_search_admin_dir($1_dbusd_t)
  	userdom_read_user_home_content_files($1_dbusd_t)
  
  	ifdef(`hide_broken_symptoms', `
-@@ -153,12 +157,15 @@
+@@ -153,12 +158,15 @@
  	')
  
  	optional_policy(`
@@ -10054,7 +10207,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -178,10 +185,12 @@
+@@ -178,10 +186,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -10068,7 +10221,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($1)
-@@ -190,6 +199,10 @@
+@@ -190,6 +200,10 @@
  	files_search_pids($1)
  	stream_connect_pattern($1, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
  	dbus_read_config($1)
@@ -10079,7 +10232,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -256,7 +269,7 @@
+@@ -256,7 +270,7 @@
  
  ########################################
  ## <summary>
@@ -10257,7 +10410,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.26/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-10 11:51:36.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-11 13:59:10.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)
@@ -10302,9 +10455,9 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_urand(devicekit_disk_t)
  dev_getattr_usbfs_dirs(devicekit_disk_t)
 +dev_manage_generic_files(devicekit_disk_t)
- 
-+domain_read_all_domains_state(devicekit_disk_t)
 +
++domain_read_all_domains_state(devicekit_disk_t)
+ 
 +files_getattr_all_mountpoints(devicekit_disk_t)
 +files_getattr_all_files(devicekit_disk_t)
  files_manage_mnt_dirs(devicekit_disk_t)
@@ -10383,7 +10536,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,6 +201,8 @@
+@@ -167,12 +201,16 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -10392,7 +10545,15 @@ diff -b -B --ignore-all-space --exclude-
  term_use_all_terms(devicekit_power_t)
  
  auth_use_nsswitch(devicekit_power_t)
-@@ -180,8 +216,11 @@
+ 
+ miscfiles_read_localization(devicekit_power_t)
+ 
++sysnet_read_dhcp_config(devicekit_power_t)
++
+ userdom_read_all_users_state(devicekit_power_t)
+ 
+ optional_policy(`
+@@ -180,8 +218,11 @@
  ')
  
  optional_policy(`
@@ -10405,7 +10566,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +242,23 @@
+@@ -203,17 +244,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -11017,6 +11178,100 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +permissive hald_dccm_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.fc serefpolicy-3.6.26/policy/modules/services/hddtemp.fc
+--- nsaserefpolicy/policy/modules/services/hddtemp.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/services/hddtemp.fc	2009-08-11 14:24:37.000000000 -0400
+@@ -0,0 +1,4 @@
++
++/etc/rc\.d/init\.d/hddtemp      --      gen_context(system_u:object_r:hddtemp_initrc_exec_t,s0)
++
++/usr/sbin/hddtemp             	--      gen_context(system_u:object_r:hddtemp_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.if serefpolicy-3.6.26/policy/modules/services/hddtemp.if
+--- nsaserefpolicy/policy/modules/services/hddtemp.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/services/hddtemp.if	2009-08-11 14:26:32.000000000 -0400
+@@ -0,0 +1,38 @@
++## <summary>hddtemp hard disk temperature tool running as a daemon</summary>
++
++#######################################
++## <summary>
++##      Execute hddtemp in the hddtemp domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`hddtemp_domtrans',`
++        gen_require(`
++                type hddtemp_t, hddtemp_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1, hddtemp_exec_t, hddtemp_t)
++')
++
++######################################
++## <summary>
++##      Execute hddtemp 
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`hddtemp_exec',`
++        gen_require(`
++                type hddtemp_exec_t;
++        ')
++
++        can_exec($1, hddtemp_exec_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.te serefpolicy-3.6.26/policy/modules/services/hddtemp.te
+--- nsaserefpolicy/policy/modules/services/hddtemp.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.26/policy/modules/services/hddtemp.te	2009-08-11 14:24:37.000000000 -0400
+@@ -0,0 +1,40 @@
++policy_module(hddtemp,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type hddtemp_t;
++type hddtemp_exec_t;
++init_daemon_domain(hddtemp_t,hddtemp_exec_t)
++
++type hddtemp_initrc_exec_t;
++init_script_file(hddtemp_initrc_exec_t)
++
++########################################
++#
++# hddtemp local policy
++#
++
++allow hddtemp_t self:capability sys_rawio;
++dontaudit hddtemp_t self:capability sys_admin;
++
++allow hddtemp_t self:netlink_route_socket r_netlink_socket_perms;
++allow hddtemp_t self:tcp_socket create_stream_socket_perms;
++allow hddtemp_t self:udp_socket create_socket_perms;
++
++corenet_tcp_bind_all_nodes(hddtemp_t)
++corenet_tcp_bind_hddtemp_port(hddtemp_t)
++
++storage_raw_read_fixed_disk(hddtemp_t)
++
++# read hddtemp db file
++files_read_usr_files(hddtemp_t)
++
++logging_send_syslog_msg(hddtemp_t)
++
++miscfiles_read_localization(hddtemp_t)
++
++permissive hddtemp_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.6.26/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2009-07-23 14:11:04.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/kerberos.te	2009-07-30 15:33:08.000000000 -0400
@@ -12812,7 +13067,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.26/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-10 10:24:17.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/policykit.te	2009-08-11 14:14:45.000000000 -0400
 @@ -38,9 +38,10 @@
  
  allow policykit_t self:capability { setgid setuid };
@@ -12852,11 +13107,13 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
-@@ -77,12 +90,15 @@
+@@ -76,13 +89,16 @@
+ #
  
  allow policykit_auth_t self:capability setgid;
- allow policykit_auth_t self:process getattr;
+-allow policykit_auth_t self:process getattr;
 -allow policykit_auth_t self:fifo_file rw_file_perms;
++allow policykit_auth_t self:process { getattr getsched };
 +allow policykit_auth_t self:fifo_file rw_fifo_file_perms;
 +
  allow policykit_auth_t self:unix_dgram_socket create_socket_perms;
@@ -12889,7 +13146,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -116,6 +136,13 @@
+@@ -116,6 +136,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -12898,12 +13155,13 @@ diff -b -B --ignore-all-space --exclude-
 +	xserver_xdm_append_log(policykit_auth_t)
 +	xserver_read_xdm_pid(policykit_auth_t)
 +	xserver_search_xdm_lib(policykit_auth_t)
++	xserver_create_xdm_tmp_sockets(policykit_auth_t)
 +')
 +
  ########################################
  #
  # polkit_grant local policy
-@@ -123,7 +150,8 @@
+@@ -123,7 +151,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -12913,7 +13171,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;
  
-@@ -153,9 +181,12 @@
+@@ -153,9 +182,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -12927,7 +13185,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -167,7 +198,8 @@
+@@ -167,7 +199,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -14184,7 +14442,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_manage_cache(gssd_t) 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.6.26/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/rsync.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/rsync.te	2009-08-12 07:48:31.000000000 -0400
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -14199,7 +14457,15 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow rsync to export any files/directories read only.
  ## </p>
  ## </desc>
-@@ -126,4 +133,19 @@
+@@ -24,7 +31,6 @@
+ 
+ type rsync_t;
+ type rsync_exec_t;
+-init_daemon_domain(rsync_t, rsync_exec_t)
+ application_executable_file(rsync_exec_t)
+ role system_r types rsync_t;
+ 
+@@ -126,4 +132,19 @@
  	auth_read_all_symlinks_except_shadow(rsync_t)
  	auth_tunable_read_shadow(rsync_t)
  ')
@@ -16746,7 +17012,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.26/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.if	2009-08-05 16:59:48.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.if	2009-08-12 16:06:07.000000000 -0400
 @@ -103,7 +103,7 @@
  
  ########################################
@@ -16844,7 +17110,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an virt environment
  ## </summary>
-@@ -327,3 +364,56 @@
+@@ -327,3 +364,76 @@
  
  	virt_manage_log($1)
  ')
@@ -16901,9 +17167,29 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +')
 +
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	svirt cache files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`virt_manage_svirt_cache',`
++	gen_require(`
++		type svirt_cache_t;
++	')
++
++	files_search_var($1)
++	manage_files_pattern($1, svirt_cache_t, svirt_cache_t)
++	manage_lnk_files_pattern($1, svirt_cache_t, svirt_cache_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.26/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-05 15:13:13.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-12 16:05:46.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -16989,7 +17275,7 @@ diff -b -B --ignore-all-space --exclude-
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
-@@ -68,6 +115,12 @@
+@@ -68,6 +115,14 @@
  filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir)
  
  manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
@@ -16997,12 +17283,14 @@ diff -b -B --ignore-all-space --exclude-
 +allow virtd_t virt_image_type:file { relabelfrom relabelto };
 +allow virtd_t virt_image_type:blk_file { relabelfrom relabelto };
 +
++mcs_process_set_categories(virtd_t)
++
 +manage_dirs_pattern(virtd_t, virt_content_t, virt_content_t)
 +manage_files_pattern(virtd_t, virt_content_t, virt_content_t)
  
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
-@@ -86,6 +139,7 @@
+@@ -86,6 +141,7 @@
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
  kernel_load_module(virtd_t)
@@ -17010,7 +17298,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -96,30 +150,51 @@
+@@ -96,30 +152,51 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -17065,7 +17353,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -129,7 +204,14 @@
+@@ -129,7 +206,14 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -17080,7 +17368,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -167,22 +249,35 @@
+@@ -167,22 +251,35 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -17121,7 +17409,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -195,8 +290,155 @@
+@@ -195,8 +292,161 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -17232,6 +17520,8 @@ 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)
++
 +kernel_read_system_state(virt_domain)
 +
 +corenet_all_recvfrom_unlabeled(virt_domain)
@@ -17272,6 +17562,10 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(virt_domain)
 +
 +optional_policy(`
++	ptchown_domtrans(virt_domain)
++')
++
++optional_policy(`
 +	virt_read_config(virt_domain)
 +	virt_read_lib_files(virt_domain)
 +	virt_read_content(virt_domain)
@@ -17374,7 +17668,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.26/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/xserver.if	2009-08-05 07:48:30.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/xserver.if	2009-08-11 14:14:49.000000000 -0400
 @@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
@@ -19549,7 +19843,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.26/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-07-30 09:44:08.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-10 13:12:20.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-12 16:06:54.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -19907,19 +20201,23 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +837,11 @@
- 	uml_setattr_util_sockets(initrc_t)
+@@ -755,6 +838,15 @@
  ')
  
+ optional_policy(`
++	virt_manage_svirt_cache(initrc_t)
++')
++
 +# Cron jobs used to start and stop services
 +optional_policy(`
 +	cron_rw_pipes(daemon)
 +')
 +
- optional_policy(`
++optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -765,6 +853,13 @@
+ 	ifdef(`distro_redhat',`
+@@ -765,6 +857,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -19933,7 +20231,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -790,3 +885,31 @@
+@@ -790,3 +889,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -20860,7 +21158,7 @@ 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.26/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/logging.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/logging.if	2009-08-12 15:17:48.000000000 -0400
 @@ -623,7 +623,7 @@
  	')
  
@@ -22206,7 +22504,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.26/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/sysnetwork.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/sysnetwork.if	2009-08-11 13:58:43.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -22591,7 +22889,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.te serefpolicy-3.6.26/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-08-10 10:36:14.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-08-11 14:30:39.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;
@@ -22697,7 +22995,7 @@ diff -b -B --ignore-all-space --exclude-
  	openct_read_pid_files(udev_t)
  	openct_domtrans(udev_t)
  ')
-@@ -242,6 +270,10 @@
+@@ -242,6 +270,14 @@
  ')
  
  optional_policy(`
@@ -22705,6 +23003,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	vbetool_domtrans(udev_t)
++')
++
++optional_policy(`
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)



From scop at fedoraproject.org  Wed Aug 12 20:10:01 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 20:10:01 +0000 (UTC)
Subject: rpms/libcmpiutil/devel libcmpiutil.spec,1.9,1.10
Message-ID: <20090812201001.3FCB411C02CB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/libcmpiutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11354

Modified Files:
	libcmpiutil.spec 
Log Message:
Note gz and bz2 tarball differences (https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html).


Index: libcmpiutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcmpiutil/devel/libcmpiutil.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libcmpiutil.spec	25 Jul 2009 05:27:17 -0000	1.9
+++ libcmpiutil.spec	12 Aug 2009 20:10:00 -0000	1.10
@@ -6,6 +6,8 @@ Version: 0.5
 Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: System Environment/Libraries
+# Note: as of 0.5, the gz and bz2 archives aren't the same; the bz2 one is
+#       a raw hg snapshot or something.
 Source: ftp://libvirt.org/libvirt-cim/libcmpiutil-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/CIM/



From rmeggins at fedoraproject.org  Wed Aug 12 20:10:36 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:10:36 +0000 (UTC)
Subject: rpms/389-ds-console/F-10 389-ds-console.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090812201036.1400611C048B@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-console/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11478/F-10

Modified Files:
	389-ds-console.spec sources 
Log Message:
the final 1.2.0 release


Index: 389-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/F-10/389-ds-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-console.spec	17 Jul 2009 21:18:28 -0000	1.1
+++ 389-ds-console.spec	12 Aug 2009 20:10:35 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 21:18:28 -0000	1.2
+++ sources	12 Aug 2009 20:10:35 -0000	1.3
@@ -1 +1 @@
-90bd0d779719ef7d4cd57de3054b8721  389-ds-console-1.2.0.tar.bz2
+2a856772523e5a331e1c407545ee3cfc  389-ds-console-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:10:36 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:10:36 +0000 (UTC)
Subject: rpms/389-ds-console/F-11 389-ds-console.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090812201036.3A7DF11C048B@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-console/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11478/F-11

Modified Files:
	389-ds-console.spec sources 
Log Message:
the final 1.2.0 release


Index: 389-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/F-11/389-ds-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-console.spec	17 Jul 2009 21:18:29 -0000	1.1
+++ 389-ds-console.spec	12 Aug 2009 20:10:36 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-4
+- final rebuild for 1.2.0 release
+
 * Tue Jul 14 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-3
 - added doc subpackage
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 21:18:29 -0000	1.2
+++ sources	12 Aug 2009 20:10:36 -0000	1.3
@@ -1 +1 @@
-90bd0d779719ef7d4cd57de3054b8721  389-ds-console-1.2.0.tar.bz2
+2a856772523e5a331e1c407545ee3cfc  389-ds-console-1.2.0.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:10:36 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:10:36 +0000 (UTC)
Subject: rpms/389-ds-console/devel 389-ds-console.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <20090812201036.6C87611C048B@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-console/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11478/devel

Modified Files:
	389-ds-console.spec sources 
Log Message:
the final 1.2.0 release


Index: 389-ds-console.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/devel/389-ds-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-console.spec	24 Jul 2009 14:58:17 -0000	1.2
+++ 389-ds-console.spec	12 Aug 2009 20:10:36 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: 389-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: 389 Directory Server Management Console
 
 Group: Applications/System
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.2.0-5
+- final rebuild for 1.2.0 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-console/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 21:02:38 -0000	1.2
+++ sources	12 Aug 2009 20:10:36 -0000	1.3
@@ -1 +1 @@
-90bd0d779719ef7d4cd57de3054b8721  389-ds-console-1.2.0.tar.bz2
+2a856772523e5a331e1c407545ee3cfc  389-ds-console-1.2.0.tar.bz2



From dwalsh at fedoraproject.org  Wed Aug 12 20:10:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 12 Aug 2009 20:10:51 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.894,1.895
Message-ID: <20090812201051.62ADC11C00D5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11556

Modified Files:
	selinux-policy.spec 
Log Message:
* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-10
- Add pt_chown policy



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -p -r1.894 -r1.895
--- selinux-policy.spec	10 Aug 2009 18:22:10 -0000	1.894
+++ selinux-policy.spec	12 Aug 2009 20:10:51 -0000	1.895
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-10
+- Add pt_chown policy
+
 * Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-9
 - Add kdump policy for Miroslav Grepl
 - Turn off execstack boolean



From alikins at fedoraproject.org  Wed Aug 12 20:22:49 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 20:22:49 +0000 (UTC)
Subject: rpms/func/EL-4 .cvsignore, 1.10, 1.11 func.spec, 1.9, 1.10 sources, 
	1.10, 1.11
Message-ID: <20090812202249.422F611C00D5@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13682

Modified Files:
	.cvsignore func.spec sources 
Log Message:
func-0.25-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Dec 2008 21:51:47 -0000	1.10
+++ .cvsignore	12 Aug 2009 20:22:48 -0000	1.11
@@ -7,3 +7,4 @@ func-0.20.tar.gz
 func-0.21.tar.gz
 func-0.23.tar.gz
 func-0.24.tar.gz
+func-0.25.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/func.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- func.spec	17 Dec 2008 21:51:47 -0000	1.9
+++ func.spec	12 Aug 2009 20:22:48 -0000	1.10
@@ -1,31 +1,43 @@
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
 
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 
 Summary: Remote management framework
 Name: func
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-Requires: python-simplejson
-Requires: certmaster >= 0.24
+%endif
+Requires: %{python}-simplejson
+Requires: certmaster >= %{version}
 Requires: logrotate
-BuildRequires: python-devel
+BuildRequires: %{python}-devel
 %if %is_suse
 BuildRequires: gettext-devel
 %else
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
+%if 0%{?rhel} >= 5
 BuildRequires: python-setuptools
 %endif
 %endif
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: https://fedorahosted.org/func/
@@ -35,6 +47,9 @@ func is a remote api for mangement, conf
 
 %prep
 %setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
 
 %build
 %{__python} setup.py build
@@ -42,13 +57,15 @@ func is a remote api for mangement, conf
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/log/func/func.log
+touch $RPM_BUILD_ROOT/var/log/func/audit.log
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
 %{python_sitelib}/func*.egg-info
 %endif
 %{_bindir}/funcd
@@ -64,8 +81,11 @@ rm -fr $RPM_BUILD_ROOT
 %dir /etc/func/modules/
 %config(noreplace) /etc/func/minion.conf
 %config(noreplace) /etc/func/async_methods.conf
+%config(noreplace) /etc/func/overlord.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %config(noreplace) /etc/func/modules/Test.conf
+%config(noreplace) /etc/func/modules/Bridge.conf
+%config(noreplace) /etc/func/modules/Vlan.conf
 %dir %{python_sitelib}/func
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
@@ -90,13 +110,20 @@ rm -fr $RPM_BUILD_ROOT
 %{python_sitelib}/func/minion/modules/*/*/*.py*
 
 %dir /var/log/func
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/func.log
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/audit.log
+
 %dir /var/lib/func
-%doc AUTHORS README LICENSE
+
+#%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
+
+%doc AUTHORS README LICENSE CHANGES
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
 %{_mandir}/man1/func-transmit.1.gz
-
+%{_mandir}/man1/func-build-map.1.gz
+%{_mandir}/man1/func-create-module.1.gz
 
 %post
 # for suse 
@@ -114,7 +141,9 @@ else
         ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/k01funcd
    done
 fi
-
+# fix perms on log files
+chmod 600 /var/log/func/func.log
+chmod 600 /var/log/func/audit.log
 # upgrade old installs if needed
 #/usr/bin/update-func
 
@@ -135,6 +164,36 @@ fi
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add CHANGES to spec file
+
+* Wed May 27 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/log/func/*.log files to spec
+- add a post section to chmod any log files with bogus perms
+  
+
+* Thu Apr 16 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- add an overlord.conf file
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+  do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
 * Wed Dec 17 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
 - require certmaster 0.24 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Dec 2008 21:51:47 -0000	1.10
+++ sources	12 Aug 2009 20:22:48 -0000	1.11
@@ -5,3 +5,4 @@ def199858286218daef908e871f2e7ca  func-0
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
 821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz
 36b8a5190c0d6f12973ebdfb02f63652  func-0.24.tar.gz
+892252004f122c61bb58bb4607553ffe  func-0.25.tar.gz



From rmeggins at fedoraproject.org  Wed Aug 12 20:23:18 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:23:18 +0000 (UTC)
Subject: rpms/389-dsgw/devel .cvsignore, 1.2, 1.3 389-dsgw.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090812202318.2798A11C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-dsgw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13849/devel

Modified Files:
	.cvsignore 389-dsgw.spec sources 
Log Message:
this is the final 1.1.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 15:50:44 -0000	1.2
+++ .cvsignore	12 Aug 2009 20:23:17 -0000	1.3
@@ -1 +1,2 @@
 389-dsgw-1.1.3.tar.bz2
+389-dsgw-1.1.4.tar.bz2


Index: 389-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/devel/389-dsgw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-dsgw.spec	24 Jul 2009 14:58:33 -0000	1.3
+++ 389-dsgw.spec	12 Aug 2009 20:23:18 -0000	1.4
@@ -2,8 +2,8 @@
 
 Summary:          389 Directory Server Gateway (dsgw)
 Name:             389-dsgw
-Version:          1.1.3
-Release:          3%{?dist}
+Version:          1.1.4
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -86,6 +86,11 @@ fi
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.4-1
+- bump version to 1.1.4
+- fix remaining licensing problems
+- fix adminutil.m4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 15:50:45 -0000	1.2
+++ sources	12 Aug 2009 20:23:18 -0000	1.3
@@ -1 +1,2 @@
 cd46daccd82073e859c9531d50057a2c  389-dsgw-1.1.3.tar.bz2
+962ee240e93c8a074bd2fce39f70a44e  389-dsgw-1.1.4.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:23:17 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:23:17 +0000 (UTC)
Subject: rpms/389-dsgw/F-11 .cvsignore, 1.2, 1.3 389-dsgw.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090812202317.EA82C11C02CB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-dsgw/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13849/F-11

Modified Files:
	.cvsignore 389-dsgw.spec sources 
Log Message:
this is the final 1.1.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 15:54:58 -0000	1.2
+++ .cvsignore	12 Aug 2009 20:23:17 -0000	1.3
@@ -1 +1,2 @@
 389-dsgw-1.1.3.tar.bz2
+389-dsgw-1.1.4.tar.bz2


Index: 389-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/F-11/389-dsgw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-dsgw.spec	21 Jul 2009 13:03:14 -0000	1.2
+++ 389-dsgw.spec	12 Aug 2009 20:23:17 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:          389 Directory Server Gateway (dsgw)
 Name:             389-dsgw
-Version:          1.1.3
-Release:          2%{?dist}
+Version:          1.1.4
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -86,6 +86,11 @@ fi
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.4-1
+- bump version to 1.1.4
+- fix remaining licensing problems
+- fix adminutil.m4
+
 * Tue Jul 21 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
 - use 389-adminutil instead of adminutil
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 15:54:58 -0000	1.2
+++ sources	12 Aug 2009 20:23:17 -0000	1.3
@@ -1 +1,2 @@
 cd46daccd82073e859c9531d50057a2c  389-dsgw-1.1.3.tar.bz2
+962ee240e93c8a074bd2fce39f70a44e  389-dsgw-1.1.4.tar.bz2



From rmeggins at fedoraproject.org  Wed Aug 12 20:23:17 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:23:17 +0000 (UTC)
Subject: rpms/389-dsgw/F-10 .cvsignore, 1.2, 1.3 389-dsgw.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090812202317.BFF1B11C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-dsgw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13849/F-10

Modified Files:
	.cvsignore 389-dsgw.spec sources 
Log Message:
this is the final 1.1.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 15:54:57 -0000	1.2
+++ .cvsignore	12 Aug 2009 20:23:17 -0000	1.3
@@ -1 +1,2 @@
 389-dsgw-1.1.3.tar.bz2
+389-dsgw-1.1.4.tar.bz2


Index: 389-dsgw.spec
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/F-10/389-dsgw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-dsgw.spec	21 Jul 2009 13:03:14 -0000	1.2
+++ 389-dsgw.spec	12 Aug 2009 20:23:17 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:          389 Directory Server Gateway (dsgw)
 Name:             389-dsgw
-Version:          1.1.3
-Release:          2%{?dist}
+Version:          1.1.4
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -86,6 +86,11 @@ fi
 %{_libdir}/%{pkgname}/dsgw-cgi-bin
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.4-1
+- bump version to 1.1.4
+- fix remaining licensing problems
+- fix adminutil.m4
+
 * Tue Jul 21 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.3-2
 - use 389-adminutil instead of adminutil
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-dsgw/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 15:54:57 -0000	1.2
+++ sources	12 Aug 2009 20:23:17 -0000	1.3
@@ -1 +1,2 @@
 cd46daccd82073e859c9531d50057a2c  389-dsgw-1.1.3.tar.bz2
+962ee240e93c8a074bd2fce39f70a44e  389-dsgw-1.1.4.tar.bz2



From kyle at fedoraproject.org  Wed Aug 12 20:28:48 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 12 Aug 2009 20:28:48 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-no-gem-on-i8xx.patch, 1.5, 1.6 kernel.spec,
	1.1703, 1.1704
Message-ID: <20090812202848.A6B0811C00D5@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15449

Modified Files:
	drm-no-gem-on-i8xx.patch kernel.spec 
Log Message:
fix build

drm-no-gem-on-i8xx.patch:
 i915_dma.c |    4 ++--
 i915_drv.h |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

Index: drm-no-gem-on-i8xx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-no-gem-on-i8xx.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- drm-no-gem-on-i8xx.patch	12 Aug 2009 17:24:58 -0000	1.5
+++ drm-no-gem-on-i8xx.patch	12 Aug 2009 20:28:48 -0000	1.6
@@ -21,7 +21,7 @@ index c431fa5..dcf5257 100644
  #define IS_I855(dev) ((dev)->pci_device == 0x3582)
  #define IS_I865G(dev) ((dev)->pci_device == 0x2572)
  
-+#define IS_8XX(dev) (IS_I830(dev) || IS_I845G(dev) || IS_I85X(dev) ||	\
++#define IS_8XX(dev) (IS_I830(dev) || IS_845G(dev) || IS_I85X(dev) ||	\
 +			IS_I855(dev))
 +
  #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1703
retrieving revision 1.1704
diff -u -p -r1.1703 -r1.1704
--- kernel.spec	12 Aug 2009 17:24:58 -0000	1.1703
+++ kernel.spec	12 Aug 2009 20:28:48 -0000	1.1704
@@ -1898,7 +1898,7 @@ fi
 
 %changelog
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
-- drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX.
+- drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX & IS_I845G, sigh.
 
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - DRM patch sync-up with F-11-2.6.29.y, ABI probably isn't right yet though...



From rmeggins at fedoraproject.org  Wed Aug 12 20:30:39 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:30:39 +0000 (UTC)
Subject: rpms/389-ds/F-10 389-ds.spec,1.1,1.2
Message-ID: <20090812203039.0CFE711C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15742/F-10

Modified Files:
	389-ds.spec 
Log Message:
this is the final 1.1.3 release


Index: 389-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds/F-10/389-ds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds.spec	17 Jul 2009 21:20:29 -0000	1.1
+++ 389-ds.spec	12 Aug 2009 20:30:38 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:          389 Directory, Administration, and Console Suite
 Name:             389-ds
 Version:          1.1.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -13,11 +13,13 @@ Obsoletes:        fedora-ds < 1.1.3-2
 Source:           LICENSE
 
 Requires:         389-ds-base
-Requires:         389-ds-admin
+Requires:         389-admin
 Requires:         idm-console-framework
 Requires:         389-console
 Requires:         389-ds-console
+Requires:         389-ds-console-doc
 Requires:         389-admin-console
+Requires:         389-admin-console-doc
 Requires:         389-dsgw
 
 %description
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-4
+- added doc subpackages
+
 * Fri Jul 17 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-3
 - added empty build section
 



From rmeggins at fedoraproject.org  Wed Aug 12 20:30:39 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:30:39 +0000 (UTC)
Subject: rpms/389-ds/devel 389-ds.spec,1.3,1.4
Message-ID: <20090812203039.4E58B11C02CB@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15742/devel

Modified Files:
	389-ds.spec 
Log Message:
this is the final 1.1.3 release


Index: 389-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds/devel/389-ds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds.spec	24 Jul 2009 14:57:50 -0000	1.3
+++ 389-ds.spec	12 Aug 2009 20:30:39 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:          389 Directory, Administration, and Console Suite
 Name:             389-ds
 Version:          1.1.3
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -13,11 +13,13 @@ Obsoletes:        fedora-ds < 1.1.3-2
 Source:           LICENSE
 
 Requires:         389-ds-base
-Requires:         389-ds-admin
+Requires:         389-admin
 Requires:         idm-console-framework
 Requires:         389-console
 Requires:         389-ds-console
+Requires:         389-ds-console-doc
 Requires:         389-admin-console
+Requires:         389-admin-console-doc
 Requires:         389-dsgw
 
 %description
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-5
+- added doc subpackages
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rmeggins at fedoraproject.org  Wed Aug 12 20:30:39 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 12 Aug 2009 20:30:39 +0000 (UTC)
Subject: rpms/389-ds/F-11 389-ds.spec,1.1,1.2
Message-ID: <20090812203039.2B50A11C00D5@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-ds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15742/F-11

Modified Files:
	389-ds.spec 
Log Message:
this is the final 1.1.3 release


Index: 389-ds.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds/F-11/389-ds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds.spec	17 Jul 2009 21:20:30 -0000	1.1
+++ 389-ds.spec	12 Aug 2009 20:30:39 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:          389 Directory, Administration, and Console Suite
 Name:             389-ds
 Version:          1.1.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -13,11 +13,13 @@ Obsoletes:        fedora-ds < 1.1.3-2
 Source:           LICENSE
 
 Requires:         389-ds-base
-Requires:         389-ds-admin
+Requires:         389-admin
 Requires:         idm-console-framework
 Requires:         389-console
 Requires:         389-ds-console
+Requires:         389-ds-console-doc
 Requires:         389-admin-console
+Requires:         389-admin-console-doc
 Requires:         389-dsgw
 
 %description
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-4
+- added doc subpackages
+
 * Fri Jul 17 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-3
 - added empty build section
 



From alikins at fedoraproject.org  Wed Aug 12 20:35:23 2009
From: alikins at fedoraproject.org (Adrian Likins)
Date: Wed, 12 Aug 2009 20:35:23 +0000 (UTC)
Subject: rpms/func/EL-5 .cvsignore, 1.10, 1.11 func.spec, 1.9, 1.10 sources, 
	1.10, 1.11
Message-ID: <20090812203523.D113811C00D5@cvs1.fedora.phx.redhat.com>

Author: alikins

Update of /cvs/pkgs/rpms/func/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16561

Modified Files:
	.cvsignore func.spec sources 
Log Message:
func-0.25-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Dec 2008 21:51:48 -0000	1.10
+++ .cvsignore	12 Aug 2009 20:35:23 -0000	1.11
@@ -7,3 +7,4 @@ func-0.20.tar.gz
 func-0.21.tar.gz
 func-0.23.tar.gz
 func-0.24.tar.gz
+func-0.25.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/func.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- func.spec	17 Dec 2008 21:51:48 -0000	1.9
+++ func.spec	12 Aug 2009 20:35:23 -0000	1.10
@@ -1,31 +1,43 @@
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
 
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 
 Summary: Remote management framework
 Name: func
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.25
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-Requires: python-simplejson
-Requires: certmaster >= 0.24
+%endif
+Requires: %{python}-simplejson
+Requires: certmaster >= %{version}
 Requires: logrotate
-BuildRequires: python-devel
+BuildRequires: %{python}-devel
 %if %is_suse
 BuildRequires: gettext-devel
 %else
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
 %else
+%if 0%{?rhel} >= 5
 BuildRequires: python-setuptools
 %endif
 %endif
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: https://fedorahosted.org/func/
@@ -35,6 +47,9 @@ func is a remote api for mangement, conf
 
 %prep
 %setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
 
 %build
 %{__python} setup.py build
@@ -42,13 +57,15 @@ func is a remote api for mangement, conf
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/log/func/func.log
+touch $RPM_BUILD_ROOT/var/log/func/audit.log
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
 %{python_sitelib}/func*.egg-info
 %endif
 %{_bindir}/funcd
@@ -64,8 +81,11 @@ rm -fr $RPM_BUILD_ROOT
 %dir /etc/func/modules/
 %config(noreplace) /etc/func/minion.conf
 %config(noreplace) /etc/func/async_methods.conf
+%config(noreplace) /etc/func/overlord.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %config(noreplace) /etc/func/modules/Test.conf
+%config(noreplace) /etc/func/modules/Bridge.conf
+%config(noreplace) /etc/func/modules/Vlan.conf
 %dir %{python_sitelib}/func
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
@@ -90,13 +110,20 @@ rm -fr $RPM_BUILD_ROOT
 %{python_sitelib}/func/minion/modules/*/*/*.py*
 
 %dir /var/log/func
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/func.log
+%attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /var/log/func/audit.log
+
 %dir /var/lib/func
-%doc AUTHORS README LICENSE
+
+#%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
+
+%doc AUTHORS README LICENSE CHANGES
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
 %{_mandir}/man1/func-transmit.1.gz
-
+%{_mandir}/man1/func-build-map.1.gz
+%{_mandir}/man1/func-create-module.1.gz
 
 %post
 # for suse 
@@ -114,7 +141,9 @@ else
         ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/k01funcd
    done
 fi
-
+# fix perms on log files
+chmod 600 /var/log/func/func.log
+chmod 600 /var/log/func/audit.log
 # upgrade old installs if needed
 #/usr/bin/update-func
 
@@ -135,6 +164,36 @@ fi
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add CHANGES to spec file
+
+* Wed May 27 2009 Adrian Likins <alikins at redhat.com> - 0.25-1
+- add /var/log/func/*.log files to spec
+- add a post section to chmod any log files with bogus perms
+  
+
+* Thu Apr 16 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- add an overlord.conf file
+
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+  do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift at gmail.com> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
 * Wed Dec 17 2008 Adrian Likins <alikins at redhat.com> - 0.24-1
 - require certmaster 0.24 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Dec 2008 21:51:48 -0000	1.10
+++ sources	12 Aug 2009 20:35:23 -0000	1.11
@@ -5,3 +5,4 @@ def199858286218daef908e871f2e7ca  func-0
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
 821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz
 36b8a5190c0d6f12973ebdfb02f63652  func-0.24.tar.gz
+892252004f122c61bb58bb4607553ffe  func-0.25.tar.gz



From scop at fedoraproject.org  Wed Aug 12 20:37:40 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 12 Aug 2009 20:37:40 +0000 (UTC)
Subject: rpms/minbar/devel .cvsignore, 1.2, 1.3 minbar.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <20090812203740.8D33C11C00D5@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/minbar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17092

Modified Files:
	.cvsignore minbar.spec sources 
Log Message:
* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.2.1-9
- Use lzma compressed upstream tarball.

https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00563.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/minbar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Mar 2008 17:39:26 -0000	1.2
+++ .cvsignore	12 Aug 2009 20:37:40 -0000	1.3
@@ -1 +1 @@
-minbar-0.2.1.tar.bz2
+minbar-0.2.1.tar.lzma


Index: minbar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minbar/devel/minbar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- minbar.spec	25 Jul 2009 12:13:24 -0000	1.3
+++ minbar.spec	12 Aug 2009 20:37:40 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           minbar
 Version:        0.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Athan call and prayer times notification software
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://djihed.com/minbar/
-Source0:        http://files.djihed.com/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://files.djihed.com/%{name}/%{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libitl-devel libglade2-devel gstreamer-devel libgnomecanvas-devel
@@ -25,6 +25,7 @@ call and notifications for Islam prayer 
 %prep
 %setup -q
 sed -i -e "s|\(Utility;\)\1|\1|" %{name}.desktop.in
+rm data/minbar.schemas{,.in} # outdated in 0.2.1 lzma tarball
 
 %build
 %configure
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/minbar/
 
 %changelog
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.2.1-9
+- Use lzma compressed upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/minbar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Mar 2008 17:39:26 -0000	1.2
+++ sources	12 Aug 2009 20:37:40 -0000	1.3
@@ -1 +1 @@
-dd1543a2e6cc9873d39d60b61dec7508  minbar-0.2.1.tar.bz2
+6bde64d6ad3abd7a79923a78d4d84e31  minbar-0.2.1.tar.lzma



From gerd at fedoraproject.org  Wed Aug 12 20:38:02 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed, 12 Aug 2009 20:38:02 +0000 (UTC)
Subject: rpms/rakudo/devel import.log, 1.3, 1.4 rakudo.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20090812203802.7DAB811C00D5@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16877/devel

Modified Files:
	import.log rakudo.spec sources 
Log Message:
modified source to add a path to the @*INC array



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Aug 2009 11:54:30 -0000	1.3
+++ import.log	12 Aug 2009 20:38:02 -0000	1.4
@@ -1,3 +1,4 @@
 rakudo-2009_07-3_fc11:HEAD:rakudo-2009.07-3.fc11.src.rpm:1249282522
 rakudo-0_0_2009_07_1_4_0-1_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-1.fc11.src.rpm:1249480110
 rakudo-0_0_2009_07_1_4_0-3_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818713
+rakudo-0_0_2009_07_1_4_0-4_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-4.fc11.src.rpm:1250109284


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rakudo.spec	9 Aug 2009 11:54:30 -0000	1.5
+++ rakudo.spec	12 Aug 2009 20:38:02 -0000	1.6
@@ -9,7 +9,7 @@ ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -19,7 +19,7 @@ Source0:        http://cloud.github.com/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# This librarys are needed while pbc_to_exe include them
+# This librarys are needed while "pbc_to_exe" include them
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 BuildRequires:  gmp-devel
@@ -38,19 +38,27 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
+%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
 %{__perl} Configure.pl
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# Force executable permission on shared objects so they get stripped
+%{__chmod} 755 $RPM_BUILD_ROOT%{parrot_dynext}/perl6*.so
+
 # Creating man-page
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
 pod2man --section=1 --name=perl6 docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/perl6.1.gz
 
+
 %check
 %{?!_without_tests: make test}
 exit 0
@@ -75,16 +83,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-3
-- modified source added so that shared objects will be stripped
+* Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
+- modified source to add a path to the @*INC array
+- force executable permission on shared objects so they get stripped
 
 * Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2
-- Add a perl6 man page
+- add a perl6 man page
 
 * Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-1
-- Fix versioning
+- fix versioning
 - use 'ExcludeArch:ppc' for now
-- Provide full SourceURL
+- provide full SourceURL
 - strip binary
 - first .spec file created
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 11:54:30 -0000	1.4
+++ sources	12 Aug 2009 20:38:02 -0000	1.5
@@ -1 +1 @@
-585ae3110c4471cb860f067028762c2b  rakudo-2009-07.tar.gz
+8605d1d1987143db58749a983a7801bf  rakudo-2009-07.tar.gz



From gerd at fedoraproject.org  Wed Aug 12 20:39:46 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Wed, 12 Aug 2009 20:39:46 +0000 (UTC)
Subject: rpms/rakudo/F-11 import.log, 1.1, 1.2 rakudo.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090812203946.A7F4911C00D5@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17465/F-11

Modified Files:
	import.log rakudo.spec sources 
Log Message:
modified source to add a path to the @*INC library array



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Aug 2009 11:45:06 -0000	1.1
+++ import.log	12 Aug 2009 20:39:46 -0000	1.2
@@ -1 +1,2 @@
 rakudo-0_0_2009_07_1_4_0-3_fc11:F-11:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818177
+rakudo-0_0_2009_07_1_4_0-4_fc11:F-11:rakudo-0.0.2009.07_1.4.0-4.fc11.src.rpm:1250109455


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/rakudo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rakudo.spec	9 Aug 2009 11:45:06 -0000	1.1
+++ rakudo.spec	12 Aug 2009 20:39:46 -0000	1.2
@@ -9,7 +9,7 @@ ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -19,7 +19,7 @@ Source0:        http://cloud.github.com/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# This librarys are needed while pbc_to_exe include them
+# This librarys are needed while "pbc_to_exe" include them
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 BuildRequires:  gmp-devel
@@ -38,19 +38,27 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
+%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
 %{__perl} Configure.pl
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# Force executable permission on shared objects so they get stripped
+%{__chmod} 755 $RPM_BUILD_ROOT%{parrot_dynext}/perl6*.so
+
 # Creating man-page
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
 pod2man --section=1 --name=perl6 docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/perl6.1.gz
 
+
 %check
 %{?!_without_tests: make test}
 exit 0
@@ -75,16 +83,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-3
-- modified source added so that shared objects will be stripped
+* Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
+- modified source to add a path to the @*INC array
+- force executable permission on shared objects so they get stripped
 
 * Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2
-- Add a perl6 man page
+- add a perl6 man page
 
 * Fri Jul 31 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-1
-- Fix versioning
+- fix versioning
 - use 'ExcludeArch:ppc' for now
-- Provide full SourceURL
+- provide full SourceURL
 - strip binary
 - first .spec file created
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Aug 2009 11:45:06 -0000	1.2
+++ sources	12 Aug 2009 20:39:46 -0000	1.3
@@ -1 +1 @@
-585ae3110c4471cb860f067028762c2b  rakudo-2009-07.tar.gz
+8605d1d1987143db58749a983a7801bf  rakudo-2009-07.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 12 20:57:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:57:08 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812205708.E705010F8B1@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora devel was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 20:57:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:57:14 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812205715.ABBE610F8BA@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora 11 was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 20:57:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:57:17 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812205719.B788C10F8C6@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora 10 was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 20:57:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:57:25 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090812205731.CD44E10F8CD@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora devel was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 20:57:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:57:35 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090812205736.D4B0010F890@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora 10 was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 20:57:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:57:59 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812205800.6FD7210F8E5@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora 11 is now owned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 20:58:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:58:05 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812205806.57FEA10F899@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora 11 was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 20:58:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 20:58:07 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090812205808.717A010F880@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora 11 was orphaned by mgarski

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From dcantrel at fedoraproject.org  Wed Aug 12 21:04:26 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 12 Aug 2009 21:04:26 +0000 (UTC)
Subject: rpms/dhcp/devel 10-dhclient,1.1,1.2 dhcp.spec,1.267,1.268
Message-ID: <20090812210426.8ED5811C0073@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21872

Modified Files:
	10-dhclient dhcp.spec 
Log Message:
* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
- Update NetworkManager dispatcher script to remove case conversion
  and source /etc/sysconfig/network



Index: 10-dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/10-dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 10-dhclient	24 Jul 2009 03:07:41 -0000	1.1
+++ 10-dhclient	12 Aug 2009 21:04:26 -0000	1.2
@@ -1,19 +1,23 @@
 #!/bin/bash
 # run dhclient.d scripts in an emulated environment
 
+PATH=/bin:/usr/bin:/sbin
 SAVEDIR=/var/lib/dhclient
 ETCDIR=/etc/dhcp
 interface=$1
 
 eval "$(
 declare | LC_ALL=C grep '^DHCP4_[A-Z_]*=' | while read opt; do
-    optname=$(echo "${opt%%=*}" | LC_ALL=C tr 'A-Z' 'a-z')
+    optname=${opt%%=*}
+    optname=${optname,,}
     optname=new_${optname#dhcp4_}
     optvalue=${opt#*=}
     echo "$optname=$optvalue"
 done
 )"
 
+[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
+
 [ -f /etc/sysconfig/network-scripts/ifcfg-$interface ] && \
     . /etc/sysconfig/network-scripts/ifcfg-$interface
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- dhcp.spec	6 Aug 2009 21:45:18 -0000	1.267
+++ dhcp.spec	12 Aug 2009 21:04:26 -0000	1.268
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  2%{?dist}
+Release:  3%{?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.
@@ -471,6 +471,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
+- Update NetworkManager dispatcher script to remove case conversion
+  and source /etc/sysconfig/network
+
 * Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
 - Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
   resume with active dhclient leases (#479639)



From krh at fedoraproject.org  Wed Aug 12 21:14:00 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Wed, 12 Aug 2009 21:14:00 +0000 (UTC)
Subject: rpms/kernel/devel drm-page-flip.patch, 1.2, 1.3 kernel.spec, 1.1713,
	1.1714
Message-ID: <20090812211400.3F9D111C0073@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23798

Modified Files:
	drm-page-flip.patch kernel.spec 
Log Message:
* Wed Aug 12 2009 Kristian H?gsberg <krh at redhat.com>
- Fix drm-page-flip.patch to not break radeon kms and to not reset
  crtc offset into fb on flip.


drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                          |  169 +++++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                   |   12 +
 b/drivers/gpu/drm/drm_drv.c                           |    1 
 b/drivers/gpu/drm/drm_fops.c                          |   68 +++++++
 b/drivers/gpu/drm/drm_irq.c                           |   43 ++++
 b/drivers/gpu/drm/i915/i915_drv.c                     |    1 
 b/drivers/gpu/drm/i915/intel_display.c                |   24 +-
 b/drivers/gpu/drm/radeon/radeon_display.c             |    3 
 b/include/drm/drm.h                                   |   25 ++
 b/include/drm/drmP.h                                  |   32 +++
 b/include/drm/drm_crtc.h                              |   27 ++
 b/include/drm/drm_crtc_helper.h                       |    4 
 b/include/drm/drm_mode.h                              |   16 +
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 15 files changed, 415 insertions(+), 14 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-page-flip.patch	26 Jul 2009 22:11:09 -0000	1.2
+++ drm-page-flip.patch	12 Aug 2009 21:13:59 -0000	1.3
@@ -1,50 +1,32 @@
-From 2c6289cd75e125745e38dc563fa33301d05923a0 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at hinata.local>
-Date: Mon, 13 Jul 2009 09:07:19 -0400
-Subject: [PATCH] Add modesetting pageflip ioctl and corresponding drm event
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+commit f2884697ef0e0064a189d5baacf565d6742687f1
+Author: Kristian H?gsberg <krh at hinata.local>
+Date:   Mon Jul 13 09:07:19 2009 -0400
 
-This patch adds a vblank synced pageflip ioctl for to the modesetting
-family of ioctls.  The ioctl takes a crtc and an fb and schedules a
-pageflip to the new fb at the next coming vertical blank event.  This
-feature lets userspace implement tear-free updating of the screen contents
-with hw-guaranteed low latency page flipping.
-
-The ioctl is asynchronous in that it returns immediately and then later
-notifies the client by making an event available for reading on the drm fd.
-This lets applications add the drm fd to their main loop and handle other
-tasks while waiting for the flip to happen.  The event includes the time
-of the flip, the frame counter and a 64 bit opaque token provided by
-user space in the ioctl.
-
-Based on work and suggestions from
-	Jesse Barnes <jbarnes at virtuousgeek.org>,
-	Jakob Bornecrantz <wallbraker at gmail.com>,
-	Chris Wilson <chris at chris-wilson.co.uk>
-
-Signed-off-by: Kristian H?gsberg <krh at redhat.com>
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
----
- drivers/gpu/drm/drm_crtc.c              |  169 ++++++++++++++++++++++++++++++-
- drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
- drivers/gpu/drm/drm_drv.c               |    1 +
- drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++-
- drivers/gpu/drm/drm_irq.c               |   43 ++++++++
- drivers/gpu/drm/i915/i915_drv.c         |    1 +
- drivers/gpu/drm/i915/intel_display.c    |   24 +++--
- drivers/gpu/drm/radeon/atombios_crtc.c  |    1 -
- drivers/gpu/drm/radeon/radeon_display.c |    3 +-
- include/drm/drm.h                       |   25 +++++
- include/drm/drmP.h                      |   32 ++++++
- include/drm/drm_crtc.h                  |   27 +++++
- include/drm/drm_crtc_helper.h           |    4 +
- include/drm/drm_mode.h                  |   16 +++
- 14 files changed, 413 insertions(+), 13 deletions(-)
+    Add modesetting pageflip ioctl and corresponding drm event
+    
+    This patch adds a vblank synced pageflip ioctl for to the modesetting
+    family of ioctls.  The ioctl takes a crtc and an fb and schedules a
+    pageflip to the new fb at the next coming vertical blank event.  This
+    feature lets userspace implement tear-free updating of the screen contents
+    with hw-guaranteed low latency page flipping.
+    
+    The ioctl is asynchronous in that it returns immediately and then later
+    notifies the client by making an event available for reading on the drm fd.
+    This lets applications add the drm fd to their main loop and handle other
+    tasks while waiting for the flip to happen.  The event includes the time
+    of the flip, the frame counter and a 64 bit opaque token provided by
+    user space in the ioctl.
+    
+    Based on work and suggestions from
+    	Jesse Barnes <jbarnes at virtuousgeek.org>,
+    	Jakob Bornecrantz <wallbraker at gmail.com>,
+    	Chris Wilson <chris at chris-wilson.co.uk>
+    
+    Signed-off-by: Kristian H?gsberg <krh at redhat.com>
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
 
 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 8fab789..32212e6 100644
+index 8fab789..f598ce0 100644
 --- a/drivers/gpu/drm/drm_crtc.c
 +++ b/drivers/gpu/drm/drm_crtc.c
 @@ -34,6 +34,8 @@
@@ -76,7 +58,7 @@ index 8fab789..32212e6 100644
 +	BUG_ON(crtc->pending_flip == NULL);
 +
 +	mutex_lock(&dev->struct_mutex);
-+	crtc->funcs->set_base(crtc, 0, 0, NULL);
++	crtc->funcs->set_base(crtc, crtc->x, crtc->y, NULL);
 +
 +	pending = crtc->pending_flip;
 +	crtc->pending_flip = NULL;
@@ -593,27 +575,15 @@ index 508838e..697c31a 100644
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
-index c0080cc..501209d 100644
---- a/drivers/gpu/drm/radeon/atombios_crtc.c
-+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
-@@ -535,7 +535,6 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = {
- 	.dpms = atombios_crtc_dpms,
- 	.mode_fixup = atombios_crtc_mode_fixup,
- 	.mode_set = atombios_crtc_mode_set,
--	.mode_set_base = atombios_crtc_set_base,
- 	.prepare = atombios_crtc_prepare,
- 	.commit = atombios_crtc_commit,
- };
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 3efcf1a..372ba35 100644
+index 3efcf1a..4d73f0b 100644
 --- a/drivers/gpu/drm/radeon/radeon_display.c
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
 @@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
-+	.set_base = radeon_crtc_set_base,
++	.set_base = drm_crtc_helper_set_base,
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
@@ -874,9 +844,6 @@ index ae304cc..464b779 100644
 +};
 +
  #endif
--- 
-1.6.3.3
-
 diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c
 --- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~	2009-07-24 19:38:36.000000000 -0400
 +++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-07-26 18:06:06.000000000 -0400


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1713
retrieving revision 1.1714
diff -u -p -r1.1713 -r1.1714
--- kernel.spec	12 Aug 2009 15:58:25 -0000	1.1713
+++ kernel.spec	12 Aug 2009 21:13:59 -0000	1.1714
@@ -1980,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Kristian H?gsberg <krh at redhat.com>
+- Fix drm-page-flip.patch to not break radeon kms and to not reset
+  crtc offset into fb on flip.
+
 * Wed Aug 12 2009 Adam Jackson <ajax at redhat.com>
 - Update drm-intel-next patch
 



From jcollie at fedoraproject.org  Wed Aug 12 21:14:08 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 12 Aug 2009 21:14:08 +0000 (UTC)
Subject: rpms/pitivi/F-11 .cvsignore, 1.15, 1.16 pitivi.spec, 1.35,
	1.36 sources, 1.15,
	1.16 0001-Fix-non-utf-8-ness-in-ChangeLog.patch, 1.2,
	NONE pitivi-0.11.3-py26.patch, 1.1, NONE
Message-ID: <20090812211408.7F76811C0073@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23846

Modified Files:
	.cvsignore pitivi.spec sources 
Removed Files:
	0001-Fix-non-utf-8-ness-in-ChangeLog.patch 
	pitivi-0.11.3-py26.patch 
Log Message:
* Wed Aug 12 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.1.3-1
- Update to latest prerelease.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	28 Jul 2009 20:04:51 -0000	1.15
+++ .cvsignore	12 Aug 2009 21:14:08 -0000	1.16
@@ -1 +1 @@
-pitivi-0.13.1.2.tar.bz2
+pitivi-0.13.1.3.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/pitivi.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- pitivi.spec	28 Jul 2009 20:04:51 -0000	1.35
+++ pitivi.spec	12 Aug 2009 21:14:08 -0000	1.36
@@ -1,5 +1,5 @@
 %define major   0.13
-%define minor   1.2
+%define minor   1.3
 Name:           pitivi
 Version:        %{major}.%{minor}
 Release:        1%{?dist}
@@ -12,18 +12,19 @@ Source0:        http://ftp.gnome.org/pub
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       gnonlin >= 0.10.11.2
+Requires:       gnonlin >= 0.10.12
 Requires:       gstreamer-python >= 0.10.15
-Requires:       gstreamer >= 0.10.23
+Requires:       gstreamer >= 0.10.24
+Requires:       gstreamer-plugins-base
 Requires:       pygtk2 >= 2.12.0
 Requires:       python-zope-interface
 Requires:       python-setuptools
 Requires:       pygoocanvas
 
-BuildRequires:  gstreamer-devel >= 0.10.23
-BuildRequires:  gstreamer-plugins-base-devel >= 0.10.23
-BuildRequires:  gnonlin >= 0.10.11.2
+BuildRequires:  gnonlin >= 0.10.12
 BuildRequires:  gstreamer-python >= 0.10.15
+BuildRequires:  gstreamer-devel >= 0.10.24
+BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
 BuildRequires:  GConf2-devel
 BuildRequires:  gtk2-devel >= 2.8
 BuildRequires:  pygtk2-devel >= 2.12.0
@@ -79,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Wed Aug 12 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.1.3-1
+- Update to latest prerelease.
+
 * Mon Jul 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.1.2-1
 - Update to prerelease
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Jul 2009 20:04:51 -0000	1.15
+++ sources	12 Aug 2009 21:14:08 -0000	1.16
@@ -1 +1 @@
-d642eb3c2aa2d8497598948162a0ddfc  pitivi-0.13.1.2.tar.bz2
+8ffc110eef126d6dd6bb82f18c4e0ba0  pitivi-0.13.1.3.tar.bz2


--- 0001-Fix-non-utf-8-ness-in-ChangeLog.patch DELETED ---


--- pitivi-0.11.3-py26.patch DELETED ---



From kanarip at fedoraproject.org  Wed Aug 12 21:19:35 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 21:19:35 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-11 .cvsignore, 1.8, 1.9 import.log, 1.1,
	1.2 rubygem-actionmailer.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090812211935.7FC8C11C0073@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-actionmailer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25017/F-11

Modified Files:
	.cvsignore import.log rubygem-actionmailer.spec sources 
Log Message:
2.3.3-1.fc12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	16 Mar 2009 10:58:22 -0000	1.8
+++ .cvsignore	12 Aug 2009 21:19:35 -0000	1.9
@@ -1 +1 @@
-actionmailer-2.3.2.gem
+actionmailer-2.3.3.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Mar 2009 10:58:22 -0000	1.1
+++ import.log	12 Aug 2009 21:19:35 -0000	1.2
@@ -1 +1,2 @@
 rubygem-actionmailer-2_3_2-1_fc10:HEAD:rubygem-actionmailer-2.3.2-1.fc10.src.rpm:1237201085
+rubygem-actionmailer-2_3_3-1_fc12:F-11:rubygem-actionmailer-2.3.3-1.fc12.src.rpm:1250111931


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/rubygem-actionmailer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- rubygem-actionmailer.spec	16 Mar 2009 10:58:22 -0000	1.9
+++ rubygem-actionmailer.spec	12 Aug 2009 21:19:35 -0000	1.10
@@ -6,7 +6,7 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.3.2
+Version: 2.3.3
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -16,6 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: rubygems
 Requires: rubygem(actionpack) = %{version}
 BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(actionpack) = %{version}
+BuildRequires(check): rubygem(mocha)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -24,31 +27,42 @@ Makes it trivial to test and deliver ema
 
 
 %prep
-
-%build
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            -V \
             --force --rdoc %{SOURCE0}
 
 # Remove backup files
-find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+find ./%{geminstdir} -type f -name "*~" -delete
 
 # Fix anything executable that does not have a shebang
-for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+for file in `find ./%{geminstdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
 done
 
 # Find files with a shebang that do not have executable permissions
-for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
 done
 
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+
 %clean
 rm -rf %{buildroot}
 
+%check
+export GEM_PATH=$(pwd)/%{gemdir}
+pushd .%{geminstdir}
+
+rake test --trace
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
@@ -65,6 +79,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-1
+- 2.3.3
+- Enable test
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.2-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	16 Mar 2009 10:58:22 -0000	1.8
+++ sources	12 Aug 2009 21:19:35 -0000	1.9
@@ -1 +1 @@
-422d6ec5d13c0c8a151e80b1024bd100  actionmailer-2.3.2.gem
+b8caa899e009e09d643e6105d977b165  actionmailer-2.3.3.gem



From jgarzik at fedoraproject.org  Wed Aug 12 21:21:05 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 12 Aug 2009 21:21:05 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.13,1.14 sources,1.10,1.11
Message-ID: <20090812212105.B598311C0073@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25429

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cld.spec	11 Aug 2009 06:03:00 -0000	1.13
+++ cld.spec	12 Aug 2009 21:21:05 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.14.g8c350253%{?dist}
+Release:	0.15.g6409c437%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 8c3502530c8061ffdaf892e9529abceecfee8dcf
+# pulled from upstream git, commit 6409c437045a4545377c17016d514ecaca3d74a0
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.15.g6409c437
+- update to commit 6409c437045a4545377c17016d514ecaca3d74a0
+
 * Tue Aug 11 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.14.g8c350253
 - update to commit 8c3502530c8061ffdaf892e9529abceecfee8dcf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 06:03:00 -0000	1.10
+++ sources	12 Aug 2009 21:21:05 -0000	1.11
@@ -1 +1 @@
-5fb5d8b5540c297935cb5ab984594020  cld-0.2git.tar.gz
+e8a1b3fafc34fd5b1ea5b2641577500d  cld-0.2git.tar.gz



From jgarzik at fedoraproject.org  Wed Aug 12 21:32:23 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 12 Aug 2009 21:32:23 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20090812213223.8405F11C0073@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28244

Modified Files:
	chunkd.spec sources 
Log Message:
update to latest upstream


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- chunkd.spec	11 Aug 2009 05:14:21 -0000	1.9
+++ chunkd.spec	12 Aug 2009 21:32:23 -0000	1.10
@@ -1,13 +1,13 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.10.g6456a2cc%{?dist}
+Release:	0.11.g8749c45c%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 6456a2cc90b8b81f4e2ab23a87776e5ec8e8c76d
+# pulled from upstream git, commit 8749c45cb46a26dcf3f93369665da6573204d028
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	chunkd-%{version}git.tar.gz
 Source2:	chunkd.init
@@ -95,6 +95,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.11.g8749c45c
+- update source to commit 8749c45cb46a26dcf3f93369665da6573204d028
+
 * Tue Aug 11 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.10.g6456a2cc
 - update source to commit 6456a2cc90b8b81f4e2ab23a87776e5ec8e8c76d
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 05:14:21 -0000	1.7
+++ sources	12 Aug 2009 21:32:23 -0000	1.8
@@ -1 +1 @@
-3a5af079ce9471df948945ce8d54e6a9  chunkd-0.4git.tar.gz
+166afd3e8357132b9354ace41b272357  chunkd-0.4git.tar.gz



From kanarip at fedoraproject.org  Wed Aug 12 21:33:54 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 21:33:54 +0000 (UTC)
Subject: rpms/rubygem-rails/F-11 rubygem-rails.spec,1.13,1.14
Message-ID: <20090812213354.1665511C0073@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rails/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28437

Modified Files:
	rubygem-rails.spec 
Log Message:
Mamoru Tasaka's fix for 496480



Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/rubygem-rails.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-rails.spec	26 Jul 2009 11:46:22 -0000	1.13
+++ rubygem-rails.spec	12 Aug 2009 21:33:53 -0000	1.14
@@ -7,7 +7,7 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -59,8 +59,8 @@ done
 # Remove backup files
 find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
 
-# Delete zero-length files
-find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+# Don't delete zero-length files (#496480)
+#find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
 
 # Fix anything executable that does not have a shebang
 for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-2
+- Don't delete zero-length files (#496480, mtasaka)
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 



From jgarzik at fedoraproject.org  Wed Aug 12 21:36:16 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 12 Aug 2009 21:36:16 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.7,1.8 tabled.spec,1.9,1.10
Message-ID: <20090812213616.577E611C0073@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29248

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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 07:22:33 -0000	1.7
+++ sources	12 Aug 2009 21:36:16 -0000	1.8
@@ -1 +1 @@
-9da54871d542e240fe6090023645b3e5  tabled-0.3git.tar.gz
+13557d3b279dc820d7325f3cf9596666  tabled-0.3git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tabled.spec	8 Aug 2009 07:22:33 -0000	1.9
+++ tabled.spec	12 Aug 2009 21:36:16 -0000	1.10
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.3
-Release:	0.10.ge1ef4104%{?dist}
+Release:	0.11.g7f6a0b63%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit e1ef4104ba859f251c9976d1e2afd3e0d9317067
+# pulled from upstream git, commit 7f6a0b639167eb64adf223d9f38d13c61e4ff185
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
@@ -102,6 +102,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.11.g7f6a0b63
+- update to git commit 7f6a0b639167eb64adf223d9f38d13c61e4ff185
+
 * Sat Aug  8 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.10.ge1ef4104
 - update to git commit e1ef4104ba859f251c9976d1e2afd3e0d9317067
 



From ausil at fedoraproject.org  Wed Aug 12 21:42:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 12 Aug 2009 21:42:32 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1714,1.1715
Message-ID: <20090812214232.86A6C11C0073@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30572

Modified Files:
	kernel.spec 
Log Message:
have kernel obsolete kernel-smp on sparc64
Require grubby >= 7.0.2-1  it provides the dracut options we need



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1714
retrieving revision 1.1715
diff -u -p -r1.1714 -r1.1715
--- kernel.spec	12 Aug 2009 21:13:59 -0000	1.1714
+++ kernel.spec	12 Aug 2009 21:42:32 -0000	1.1715
@@ -430,7 +430,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, grubby >= 7.0.2-1
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -470,7 +470,7 @@ ExclusiveArch: noarch %{all_x86} x86_64 
 ExclusiveOS: Linux
 
 %kernel_reqprovconf
-%ifarch x86_64
+%ifarch x86_64 sparc64
 Obsoletes: kernel-smp
 %endif
 
@@ -1980,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Dennis Gilmore <dennis at ausil.us>
+- Obsolete kernel-smp on sparc64
+- Require grubby >= 7.0.2-1 since thats what introduces the dracut options we use
+
 * Wed Aug 12 2009 Kristian H?gsberg <krh at redhat.com>
 - Fix drm-page-flip.patch to not break radeon kms and to not reset
   crtc offset into fb on flip.



From pkgdb at fedoraproject.org  Wed Aug 12 21:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 21:58:27 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812215828.239AC10F7C4@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 21:58:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 21:58:41 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812215841.4717B10F7C4@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 21:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 21:58:44 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090812215844.2A73610F842@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora 11 is now owned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 22:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:04:54 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090812220454.3BE6810F7C4@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora 11 is now owned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 22:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:04:55 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090812220455.9081010F841@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 22:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:05:03 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090812220503.5727710F848@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 22:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:05:50 +0000
Subject: [pkgdb] packagekit-qt ownership updated
Message-ID: <20090812220551.A385210F841@bastion2.fedora.phx.redhat.com>

Package packagekit-qt in Fedora devel is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt



From pkgdb at fedoraproject.org  Wed Aug 12 22:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:05:50 +0000
Subject: [pkgdb] packagekit-qt (un)retirement
Message-ID: <20090812220552.B529410F842@bastion2.fedora.phx.redhat.com>

Package packagekit-qt in Fedora devel has been retired by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt



From pkgdb at fedoraproject.org  Wed Aug 12 22:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:06:05 +0000
Subject: [pkgdb] packagekit-qt ownership updated
Message-ID: <20090812220605.4E86110F872@bastion2.fedora.phx.redhat.com>

Package packagekit-qt in Fedora 9 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt



From pkgdb at fedoraproject.org  Wed Aug 12 22:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:06:05 +0000
Subject: [pkgdb] packagekit-qt (un)retirement
Message-ID: <20090812220605.9CE4F10F882@bastion2.fedora.phx.redhat.com>

Package packagekit-qt in Fedora 9 has been retired by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/packagekit-qt



From epienbro at fedoraproject.org  Wed Aug 12 22:06:26 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 22:06:26 +0000 (UTC)
Subject: rpms/mingw32-hunspell/devel mingw32-hunspell.spec,1.3,1.4
Message-ID: <20090812220626.8712A11C0073@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594

Modified Files:
	mingw32-hunspell.spec 
Log Message:
Fixed invalid source URL



Index: mingw32-hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-hunspell/devel/mingw32-hunspell.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-hunspell.spec	30 Jul 2009 22:04:54 -0000	1.3
+++ mingw32-hunspell.spec	12 Aug 2009 22:06:26 -0000	1.4
@@ -7,8 +7,8 @@
 Name:          mingw32-hunspell
 Summary:       MinGW Windows spell checker and morphological analyzer library
 Version:       1.2.8
-Release:       8%{?dist}
-Source0:       http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
+Release:       9%{?dist}
+Source0:       http://downloads.sourceforge.net/hunspell/hunspell-%{version}.tar.gz
 Group:         System Environment/Libraries
 URL:           http://hunspell.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.8-9
+- Fixed invalid source URL
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 1.2.8-8
 - Bump for F12 rebuild
 - Fill in a date for the previous commit



From pkgdb at fedoraproject.org  Wed Aug 12 22:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:06:27 +0000
Subject: [pkgdb] qpackagekit ownership updated
Message-ID: <20090812220628.E904810F80B@bastion2.fedora.phx.redhat.com>

Package qpackagekit in Fedora devel was orphaned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qpackagekit



From pkgdb at fedoraproject.org  Wed Aug 12 22:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:06:27 +0000
Subject: [pkgdb] qpackagekit (un)retirement
Message-ID: <20090812220629.B568510F899@bastion2.fedora.phx.redhat.com>

Package qpackagekit in Fedora devel has been retired by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qpackagekit



From pkgdb at fedoraproject.org  Wed Aug 12 22:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:06:45 +0000
Subject: [pkgdb] qpackagekit ownership updated
Message-ID: <20090812220646.26EB810F80A@bastion2.fedora.phx.redhat.com>

Package qpackagekit in Fedora 9 was orphaned by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qpackagekit



From pkgdb at fedoraproject.org  Wed Aug 12 22:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:06:45 +0000
Subject: [pkgdb] qpackagekit (un)retirement
Message-ID: <20090812220646.541FB10F897@bastion2.fedora.phx.redhat.com>

Package qpackagekit in Fedora 9 has been retired by tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qpackagekit



From wtogami at fedoraproject.org  Wed Aug 12 22:10:45 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 12 Aug 2009 22:10:45 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.30, 1.31 pidgin.spec, 1.91,
	1.92 sources, 1.30, 1.31
Message-ID: <20090812221045.D4C3611C0073@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4637

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
new snapshot at the request of maiku



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	6 Aug 2009 21:16:17 -0000	1.30
+++ .cvsignore	12 Aug 2009 22:10:45 -0000	1.31
@@ -1 +1 @@
-pidgin-2.6.0-devel-20090806.tar.bz2
+pidgin-2.6.0-devel-20090812.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- pidgin.spec	6 Aug 2009 21:16:17 -0000	1.91
+++ pidgin.spec	12 Aug 2009 22:10:45 -0000	1.92
@@ -82,8 +82,8 @@
 
 Name:		pidgin
 Version:	2.6.0
-%define snapshot 20090806
-Release:	0.10.%{snapshot}%{?dist}
+%define snapshot 20090812
+Release:	0.11.%{snapshot}%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -615,6 +615,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.11.20090812
+- new snapshot at the request of maiku
+
 * Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.10.20090806
 - new snapshot - theoretically better sound quality in voice chat
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	6 Aug 2009 21:16:17 -0000	1.30
+++ sources	12 Aug 2009 22:10:45 -0000	1.31
@@ -1 +1 @@
-8357c7bbe385f6e7db3932f6039c6ca4  pidgin-2.6.0-devel-20090806.tar.bz2
+592fc737e76149e842e4e33a89e2d45a  pidgin-2.6.0-devel-20090812.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug 12 22:17:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:17:01 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested watchcommits
Message-ID: <20090812221702.4BCD010F80A@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Wed Aug 12 22:17:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:17:06 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested approveacls
Message-ID: <20090812221706.9E36310F87B@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Wed Aug 12 22:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:17:07 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested commit
Message-ID: <20090812221707.EF76510F897@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Wed Aug 12 22:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 22:17:11 +0000
Subject: [pkgdb] mingw32-libxml2: epienbro has requested watchbugzilla
Message-ID: <20090812221711.7EAC410F8AD@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From toshio at fedoraproject.org  Wed Aug 12 22:18:11 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 12 Aug 2009 22:18:11 +0000 (UTC)
Subject: rpms/python-cherrypy2/devel python-cherrypy2.spec,1.8,1.9
Message-ID: <20090812221811.C1D6611C0073@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6268

Modified Files:
	python-cherrypy2.spec 
Log Message:

* Wed Aug 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.0-10
- Remove the touch of easy_install.pth.  It's not necessary and leads to file
  conflicts with other packages.



Index: python-cherrypy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy2/devel/python-cherrypy2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-cherrypy2.spec	26 Jul 2009 20:13:00 -0000	1.8
+++ python-cherrypy2.spec	12 Aug 2009 22:18:11 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           python-cherrypy2
 Version:        2.3.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
@@ -48,7 +48,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} -c '
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-touch $RPM_BUILD_ROOT%{python_sitelib}/easy-install.pth
 easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg
 find $RPM_BUILD_ROOT%{python_sitelib}/ -type f -exec chmod -x \{\} \;
 
@@ -66,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.0-10
+- Remove the touch of easy_install.pth.  It's not necessary and leads to file
+  conflicts with other packages.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Wed Aug 12 22:20:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 12 Aug 2009 22:20:44 +0000 (UTC)
Subject: rpms/hplip/devel hplip-hpcups-reorder.patch, NONE, 1.1 hplip.spec, 
	1.217, 1.218
Message-ID: <20090812222044.CB63211C0073@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7027

Modified Files:
	hplip.spec 
Added Files:
	hplip-hpcups-reorder.patch 
Log Message:
* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
- Upstream patch to fix paper size order and LJColor device class
  color space.


hplip-hpcups-reorder.patch:
 hpcups.drv.in |  914 +++++++++++++++++++++++++---------------------------------
 1 file changed, 402 insertions(+), 512 deletions(-)

--- NEW FILE hplip-hpcups-reorder.patch ---
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder	2009-08-04 22:42:07.000000000 +0100
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-12 23:17:41.192332302 +0100
@@ -210,10 +210,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -226,10 +232,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -244,16 +256,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -265,35 +289,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   {
     // Custom page sizes from 1x4in to Legal
     HWMargins 18 36 18 36
@@ -754,8 +749,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -763,12 +762,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -893,10 +886,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -909,10 +908,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -927,16 +932,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -948,35 +965,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   {
 
     // Custom page sizes from 1x4in to Legal
@@ -1010,8 +998,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -1019,12 +1011,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -1142,10 +1128,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -1158,10 +1150,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -1176,16 +1174,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -1197,41 +1207,15 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -1239,12 +1223,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -1366,10 +1344,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -1382,10 +1366,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -1400,16 +1390,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -1421,36 +1423,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
   {
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
@@ -1659,8 +1631,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -1668,12 +1644,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -1784,10 +1754,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -1800,10 +1776,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -1818,16 +1800,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -1839,36 +1833,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -2017,10 +1981,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -2033,10 +2003,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -2051,56 +2027,38 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
-  CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
-  CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<</PageSize[558 774]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 101/PageSize[558 774]/ImagingBBox null>>setpagedevice"   // custom
-  CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 91/PageSize[459 649]/ImagingBBox null>>setpagedevice"
-  CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
-
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
   CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
   CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
+  CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
+  CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<</PageSize[558 774]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 101/PageSize[558 774]/ImagingBBox null>>setpagedevice"   // custom
+  CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 91/PageSize[459 649]/ImagingBBox null>>setpagedevice"
+  CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -2259,12 +2217,26 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -2273,12 +2245,24 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -2293,16 +2277,34 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -2314,62 +2316,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -3702,8 +3648,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -3711,12 +3661,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -3902,12 +3846,26 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -3916,12 +3874,24 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -3936,16 +3906,34 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -3957,62 +3945,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -4039,8 +3971,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -4048,12 +3984,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -4178,12 +4108,26 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -4192,12 +4136,24 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -4212,16 +4168,34 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -4233,62 +4207,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -4419,10 +4337,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -4435,10 +4359,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -4453,16 +4383,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -4474,36 +4416,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -4655,8 +4567,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -4664,12 +4580,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5176,10 +5086,14 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -5229,12 +5143,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6 (three sided)
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5576,12 +5484,20 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -5590,12 +5506,18 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 36 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -5610,14 +5532,20 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -5631,32 +5559,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5790,10 +5692,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -5801,14 +5709,6 @@ Manufacturer "HP"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to A6
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5919,10 +5819,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -5930,14 +5836,6 @@ Manufacturer "HP"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to A6
     HWMargins 9 9 9 9
     VariablePaperSize Yes
@@ -6125,12 +6023,20 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -6139,12 +6045,18 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -6156,24 +6068,6 @@ Manufacturer "HP"
   CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666  9 41 9 9 "<</PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to 5x7
     HWMargins 9 9 9 9
     VariablePaperSize Yes
@@ -6295,12 +6189,20 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -6309,12 +6211,18 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -6326,24 +6234,6 @@ Manufacturer "HP"
   CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666  9 41 9 9 "<</PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to 5x7
     HWMargins 9 9 9 9
     VariablePaperSize Yes
@@ -7753,7 +7643,7 @@ Manufacturer "HP"
   // cupsRowCount values map to PEN_TYPE + 1 from global_types.h
   Option "ColorModel/Output Mode" PickOne AnySetup 10.0
     Choice "Gray/Grayscale" "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsRowCount 3/cupsRowStep 1>>setpagedevice"
-    *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice"
+    *Choice "RGB/Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice"
 
   // cupsMediaType values map to MEDIATYPE from global_types.h
   Option "MediaType/Media Type" PickOne AnySetup 10.0
@@ -10288,7 +10178,7 @@ Manufacturer "HP"
 {
   Group "General/General"
 
-  Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-steup:" ""
+  Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" ""
 
   Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
     Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- hplip.spec	12 Aug 2009 12:20:26 -0000	1.217
+++ hplip.spec	12 Aug 2009 22:20:44 -0000	1.218
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,8 +14,9 @@ Conflicts: selinux-policy < 3.0.3-3
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
-Patch1: hplip-strstr-const.patch
-Patch2: hplip-ui-optional.patch
+Patch1: hplip-hpcups-reorder.patch
+Patch2: hplip-strstr-const.patch
+Patch3: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -97,11 +98,14 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Upstream patch to fix paper size order and LJColor device class color space.
+%patch1 -p1 -b .hpcups-reorder
+
 # Fix compilation.
-%patch1 -p1 -b .strstr-const
+%patch2 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
-%patch2 -p1 -b .ui-optional
+%patch3 -p1 -b .ui-optional
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
@@ -310,6 +314,10 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
+- Upstream patch to fix paper size order and LJColor device class
+  color space.
+
 * Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-3
 - The python-reportlab dependency was in the wrong sub-package.
 



From twaugh at fedoraproject.org  Wed Aug 12 22:21:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 12 Aug 2009 22:21:20 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-hpcups-reorder.patch, NONE, 1.1 hplip.spec,
	1.215, 1.216
Message-ID: <20090812222120.9B2A711C0073@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7209

Modified Files:
	hplip.spec 
Added Files:
	hplip-hpcups-reorder.patch 
Log Message:
* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
- Upstream patch to fix paper size order and LJColor device class
  color space.


hplip-hpcups-reorder.patch:
 hpcups.drv.in |  914 +++++++++++++++++++++++++---------------------------------
 1 file changed, 402 insertions(+), 512 deletions(-)

--- NEW FILE hplip-hpcups-reorder.patch ---
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder	2009-08-04 22:42:07.000000000 +0100
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-12 23:17:41.192332302 +0100
@@ -210,10 +210,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -226,10 +232,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -244,16 +256,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -265,35 +289,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   {
     // Custom page sizes from 1x4in to Legal
     HWMargins 18 36 18 36
@@ -754,8 +749,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -763,12 +762,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -893,10 +886,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -909,10 +908,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -927,16 +932,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -948,35 +965,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   {
 
     // Custom page sizes from 1x4in to Legal
@@ -1010,8 +998,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -1019,12 +1011,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -1142,10 +1128,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -1158,10 +1150,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -1176,16 +1174,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -1197,41 +1207,15 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -1239,12 +1223,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -1366,10 +1344,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -1382,10 +1366,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -1400,16 +1390,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -1421,36 +1423,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
   {
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
@@ -1659,8 +1631,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -1668,12 +1644,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -1784,10 +1754,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -1800,10 +1776,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -1818,16 +1800,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -1839,36 +1833,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -2017,10 +1981,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -2033,10 +2003,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -2051,56 +2027,38 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
-  CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
-  CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<</PageSize[558 774]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 101/PageSize[558 774]/ImagingBBox null>>setpagedevice"   // custom
-  CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 91/PageSize[459 649]/ImagingBBox null>>setpagedevice"
-  CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
-
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
   CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
   CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
+  CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
+  CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<</PageSize[558 774]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 101/PageSize[558 774]/ImagingBBox null>>setpagedevice"   // custom
+  CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 91/PageSize[459 649]/ImagingBBox null>>setpagedevice"
+  CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -2259,12 +2217,26 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -2273,12 +2245,24 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -2293,16 +2277,34 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -2314,62 +2316,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -3702,8 +3648,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -3711,12 +3661,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -3902,12 +3846,26 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -3916,12 +3874,24 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -3936,16 +3906,34 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -3957,62 +3945,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -4039,8 +3971,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -4048,12 +3984,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 18 36 18 36
     VariablePaperSize Yes
@@ -4178,12 +4108,26 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -4192,12 +4136,24 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -4212,16 +4168,34 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -4233,62 +4207,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -4419,10 +4337,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -4435,10 +4359,16 @@ Manufacturer "HP"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -4453,16 +4383,28 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
+  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
   CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -4474,36 +4416,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Duplex 4x6
-  CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<</PageSize[288 423]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
-
-// Duplex 5x7
-  CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<</PageSize[360 567]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 75/PageSize[360 567]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
-
-// Duplex Standard
-  CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<</PageSize[612 783]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
-  CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<</PageSize[612 999]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 3/PageSize[612 999]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<</PageSize[420 586]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[420 586]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<</PageSize[499 699]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 65/PageSize[499 699]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<</PageSize[516 720]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [516 720]/ImagingBBox null>>setpagedevice"
-  CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<</PageSize[522 747]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[522 747]/ImagingBBox null>>setpagedevice"
-
 // CDDVD
   CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<</PageSize[238 238]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 98/PageSize[238 238]/ImagingBBox null>>setpagedevice"
@@ -4655,8 +4567,12 @@ Manufacturer "HP"
 // Large
   CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<</PageSize[842 1190]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 27/PageSize[842 1190]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
   CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<</PageSize[729 1033]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 46/PageSize[729 1033]/ImagingBBox null>>setpagedevice"
+  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
   CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<</PageSize[1224 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 6/PageSize[1224 792]/ImagingBBox null>>setpagedevice"
   CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<</PageSize[936 1368]/ImagingBBox null>>setpagedevice"
@@ -4664,12 +4580,6 @@ Manufacturer "HP"
   CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<</PageSize[774 1116]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 101/PageSize[774 1116]/ImagingBBox null>>setpagedevice"          // custom
 
-// Duplex Large
-  CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<</PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[842 1181]/ImagingBBox null>>setpagedevice"
-  CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<</PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 1/PageSize[729 1024]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to SuperB
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5176,10 +5086,14 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -5229,12 +5143,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6 (three sided)
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5576,12 +5484,20 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -5590,12 +5506,18 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 36 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -5610,14 +5532,20 @@ Manufacturer "HP"
 // Standard
   *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
+  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
+         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
   CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<</PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice"
   CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice"
+  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
   CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice"
   CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice"
@@ -5631,32 +5559,6 @@ Manufacturer "HP"
   CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed Standard
-  CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<</PageSize[622 802]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
-         "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<</PageSize[526 739]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 45/PageSize [526 739]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to Legal
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5790,10 +5692,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -5801,14 +5709,6 @@ Manufacturer "HP"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to A6
     HWMargins 9 36 9 36
     VariablePaperSize Yes
@@ -5919,10 +5819,16 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
@@ -5930,14 +5836,6 @@ Manufacturer "HP"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to A6
     HWMargins 9 9 9 9
     VariablePaperSize Yes
@@ -6125,12 +6023,20 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -6139,12 +6045,18 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -6156,24 +6068,6 @@ Manufacturer "HP"
   CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666  9 41 9 9 "<</PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to 5x7
     HWMargins 9 9 9 9
     VariablePaperSize Yes
@@ -6295,12 +6189,20 @@ Manufacturer "HP"
 // 4x6 or smaller
   CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice"
+  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<</PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
@@ -6309,12 +6211,18 @@ Manufacturer "HP"
 // 5x7
   CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<</PageSize[360 504]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice"
+  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
   CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
   CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice"
   CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<</PageSize[420 558]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 72/PageSize[420 558]/ImagingBBox null>>setpagedevice"
+  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
+         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
   CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice"
   CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<</PageSize[314.64 414]/ImagingBBox null>>setpagedevice"
@@ -6326,24 +6234,6 @@ Manufacturer "HP"
   CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666  9 41 9 9 "<</PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice"
 
-// Full Bleed 4x6
-  CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<</PageSize[298 442]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<</PageSize[294 430]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 71/PageSize[294 430]/ImagingBBox null>>setpagedevice"
-
-// Full Bleed 5x7
-  CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<</PageSize[370 514]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 122/PageSize[370 514]/ImagingBBox null>>setpagedevice"
-  CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<</PageSize[430 577]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 72/PageSize[430 577]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<</PageSize[430 605]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 25/PageSize[430 605]/ImagingBBox null>>setpagedevice"
-  CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<</PageSize [262 370]/ImagingBBox null>>setpagedevice"
-         "<</cupsInteger0 78/PageSize[262 370]/ImagingBBox null>>setpagedevice"
-
     // Custom page sizes from 1x4in to 5x7
     HWMargins 9 9 9 9
     VariablePaperSize Yes
@@ -7753,7 +7643,7 @@ Manufacturer "HP"
   // cupsRowCount values map to PEN_TYPE + 1 from global_types.h
   Option "ColorModel/Output Mode" PickOne AnySetup 10.0
     Choice "Gray/Grayscale" "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsRowCount 3/cupsRowStep 1>>setpagedevice"
-    *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice"
+    *Choice "RGB/Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice"
 
   // cupsMediaType values map to MEDIATYPE from global_types.h
   Option "MediaType/Media Type" PickOne AnySetup 10.0
@@ -10288,7 +10178,7 @@ Manufacturer "HP"
 {
   Group "General/General"
 
-  Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-steup:" ""
+  Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" ""
 
   Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
     Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- hplip.spec	12 Aug 2009 15:01:03 -0000	1.215
+++ hplip.spec	12 Aug 2009 22:21:20 -0000	1.216
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,8 +14,9 @@ Conflicts: selinux-policy < 3.0.3-3
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
-Patch1: hplip-strstr-const.patch
-Patch2: hplip-ui-optional.patch
+Patch1: hplip-hpcups-reorder.patch
+Patch2: hplip-strstr-const.patch
+Patch3: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -97,11 +98,14 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Upstream patch to fix paper size order and LJColor device class color space.
+%patch1 -p1 -b .hpcups-reorder
+
 # Fix compilation.
-%patch1 -p1 -b .strstr-const
+%patch2 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
-%patch2 -p1 -b .ui-optional
+%patch3 -p1 -b .ui-optional
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
@@ -310,6 +314,10 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
+- Upstream patch to fix paper size order and LJColor device class
+  color space.
+
 * Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-3
 - The python-reportlab dependency was in the wrong sub-package.
 



From epienbro at fedoraproject.org  Wed Aug 12 22:23:57 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 22:23:57 +0000 (UTC)
Subject: rpms/mingw32-pango/devel .cvsignore, 1.3, 1.4 mingw32-pango.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090812222357.20D7011C0496@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7867

Modified Files:
	.cvsignore mingw32-pango.spec sources 
Log Message:
Update to 1.25.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jun 2009 21:10:41 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:23:56 -0000	1.4
@@ -1 +1 @@
-pango-1.24.2.tar.bz2
+pango-1.25.2.tar.bz2


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-pango.spec	25 Jul 2009 14:27:56 -0000	1.4
+++ mingw32-pango.spec	12 Aug 2009 22:23:56 -0000	1.5
@@ -5,14 +5,14 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-pango
-Version:        1.24.2
-Release:        2%{?dist}
+Version:        1.25.2
+Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.pango.org
-Source0:        http://download.gnome.org/sources/pango/1.24/pango-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.2-1
+- Update to 1.25.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jun 2009 21:10:41 -0000	1.3
+++ sources	12 Aug 2009 22:23:56 -0000	1.4
@@ -1 +1 @@
-7bc6c884d847cabc613e4c6d663771f5  pango-1.24.2.tar.bz2
+22cc2affdb660049932b16b61c76214a  pango-1.25.2.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 22:27:32 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 22:27:32 +0000 (UTC)
Subject: rpms/mingw32-pango/F-11 .cvsignore, 1.2, 1.3 mingw32-pango.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090812222732.CD6E611C00E0@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10441

Modified Files:
	.cvsignore mingw32-pango.spec sources 
Log Message:
Update to 1.24.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Mar 2009 22:46:14 -0000	1.2
+++ .cvsignore	12 Aug 2009 22:27:32 -0000	1.3
@@ -1 +1 @@
-pango-1.23.0.tar.bz2
+pango-1.24.5.tar.bz2


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/F-11/mingw32-pango.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-pango.spec	10 Mar 2009 22:46:14 -0000	1.1
+++ mingw32-pango.spec	12 Aug 2009 22:27:32 -0000	1.2
@@ -5,14 +5,14 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-pango
-Version:        1.23.0
+Version:        1.24.5
 Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.pango.org
-Source0:        http://download.gnome.org/sources/pango/1.23/pango-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pango/1.24/pango-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.24.5-1
+- Update to version 1.24.5
+
 * Mon Mar  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.23.0-1
 - Remove man page which duplicates what is in base Fedora.
 - Rebase to 1.23.0 to match Fedora.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Mar 2009 22:46:14 -0000	1.2
+++ sources	12 Aug 2009 22:27:32 -0000	1.3
@@ -1 +1 @@
-358a87607c0a5b4889bab52b1cf5e921  pango-1.23.0.tar.bz2
+815416a452e9cccc172fed9862401f37  pango-1.24.5.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 22:31:16 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 22:31:16 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel .cvsignore, 1.3, 1.4 mingw32-pixman.spec, 
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090812223116.3033D11C00E0@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11849

Modified Files:
	.cvsignore mingw32-pixman.spec sources 
Log Message:
- Update to version 0.15.20
- Updated SOURCE0 and URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jun 2009 19:38:19 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:31:15 -0000	1.4
@@ -1 +1 @@
-pixman-0.15.10.tar.gz
+pixman-0.15.20.tar.bz2


Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-pixman.spec	25 Jul 2009 14:29:19 -0000	1.6
+++ mingw32-pixman.spec	12 Aug 2009 22:31:15 -0000	1.7
@@ -5,15 +5,15 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-pixman
-Version:        0.15.10
-Release:        2%{?dist}
+Version:        0.15.20
+Release:        1%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
-URL:            http://xorg.freedesktop.org/
+URL:            http://cgit.freedesktop.org/pixman/
 Group:          Development/Libraries
 
-Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz
+Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
 Source1:        make-pixman-snapshot.sh
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.15.20-1
+- Update to version 0.15.20
+- Updated SOURCE0 and URL
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jun 2009 19:38:19 -0000	1.3
+++ sources	12 Aug 2009 22:31:15 -0000	1.4
@@ -1 +1 @@
-8813e13aa3817df03039bd66a4863670  pixman-0.15.10.tar.gz
+8cca7bdf45bd3c31cf95ecea0f05bddc  pixman-0.15.20.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 22:35:25 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 22:35:25 +0000 (UTC)
Subject: rpms/mingw32-pixman/F-11 .cvsignore, 1.2, 1.3 mingw32-pixman.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090812223525.CE1D011C00E0@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12919

Modified Files:
	.cvsignore mingw32-pixman.spec sources 
Log Message:
Update to 0.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jan 2009 11:48:10 -0000	1.2
+++ .cvsignore	12 Aug 2009 22:35:25 -0000	1.3
@@ -1 +1 @@
-pixman-0.13.2.tar.gz
+pixman-0.14.0.tar.gz


Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-11/mingw32-pixman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-pixman.spec	14 Apr 2009 19:30:36 -0000	1.4
+++ mingw32-pixman.spec	12 Aug 2009 22:35:25 -0000	1.5
@@ -5,8 +5,8 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-pixman
-Version:        0.13.2
-Release:        5%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        MinGW Windows Pixman library
 
 License:        MIT
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.14.0-1
+- Update to 0.14.0
+
 * Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.13.2-5
 - Fixed %%defattr line
 - Added -static subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jan 2009 11:48:10 -0000	1.2
+++ sources	12 Aug 2009 22:35:25 -0000	1.3
@@ -1 +1 @@
-837df4a02c61a60a880644393b57faed  pixman-0.13.2.tar.gz
+da330524bbd975271974378b1c5e7b5d  pixman-0.14.0.tar.gz



From lutter at fedoraproject.org  Wed Aug 12 22:36:06 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 12 Aug 2009 22:36:06 +0000 (UTC)
Subject: rpms/ruby-augeas/EL-4 .cvsignore, 1.3, 1.4 ruby-augeas.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090812223606.920BB11C00E0@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/ruby-augeas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13188

Modified Files:
	.cvsignore ruby-augeas.spec sources 
Log Message:
New Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 02:01:27 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:36:06 -0000	1.4
@@ -1 +1 @@
-ruby-augeas-0.2.0.tgz
+ruby-augeas-0.3.0.tgz


Index: ruby-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/EL-4/ruby-augeas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ruby-augeas.spec	19 Dec 2008 01:29:11 -0000	1.5
+++ ruby-augeas.spec	12 Aug 2009 22:36:06 -0000	1.6
@@ -2,25 +2,20 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-augeas
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Ruby bindings for Augeas
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            http://augeas.net
-Source0:        ruby-augeas-0.2.0.tgz
+Source0:        http://augeas.net/download/ruby/ruby-augeas-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel
-BuildRequires:  augeas-devel >= 0.0.6
+BuildRequires:  augeas-devel >= 0.5.1
 BuildRequires:  pkgconfig
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-Requires:       ruby(abi) = 1.8
-%endif
-
-Requires:       augeas-libs >= 0.3.0
+Requires:       augeas-libs >= 0.5.1
 Provides:       ruby(augeas) = %{version}
 
 %description
@@ -51,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.rdoc
+%doc COPYING README.rdoc NEWS
 %{ruby_sitelib}/augeas.rb
 %{ruby_sitearch}/_augeas.so
 
 
 %changelog
+* Wed Aug 12 2009 David Lutterkort <lutter at redhat.com> - 0.3.0-1
+- New version
+
 * Thu Dec 18 2008 David Lutterkort <lutter at redhat.com> - 0.2.0-3
 - Fix busted build section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 02:01:27 -0000	1.3
+++ sources	12 Aug 2009 22:36:06 -0000	1.4
@@ -1 +1 @@
-27737357428723b975472317b2b2db62  ruby-augeas-0.2.0.tgz
+bdeeb2b99f962a453259748073495d3f  ruby-augeas-0.3.0.tgz



From lutter at fedoraproject.org  Wed Aug 12 22:36:36 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 12 Aug 2009 22:36:36 +0000 (UTC)
Subject: rpms/ruby-augeas/EL-5 .cvsignore, 1.3, 1.4 ruby-augeas.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090812223636.41ECB11C00E0@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/ruby-augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13394

Modified Files:
	.cvsignore ruby-augeas.spec sources 
Log Message:
New Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 02:01:27 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:36:36 -0000	1.4
@@ -1 +1 @@
-ruby-augeas-0.2.0.tgz
+ruby-augeas-0.3.0.tgz


Index: ruby-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/EL-5/ruby-augeas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ruby-augeas.spec	27 Aug 2008 02:01:27 -0000	1.3
+++ ruby-augeas.spec	12 Aug 2009 22:36:36 -0000	1.4
@@ -2,21 +2,21 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-augeas
-Version:        0.2.0
+Version:        0.3.0
 Release:        1%{?dist}
 Summary:        Ruby bindings for Augeas
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            http://augeas.net
-Source0:        ruby-augeas-0.2.0.tgz
+Source0:        http://augeas.net/download/ruby/ruby-augeas-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel rubygem(rake)
-BuildRequires:  augeas-devel >= 0.0.6
+BuildRequires:  augeas-devel >= 0.5.1
 BuildRequires:  pkgconfig
 Requires:       ruby(abi) = 1.8
-Requires:       augeas-libs >= 0.3.0
+Requires:       augeas-libs >= 0.5.1
 Provides:       ruby(augeas) = %{version}
 
 %description
@@ -46,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.rdoc
+%doc COPYING README.rdoc NEWS
 %{ruby_sitelib}/augeas.rb
 %{ruby_sitearch}/_augeas.so
 
 
 %changelog
+* Wed Aug 12 2009 David Lutterkort <lutter at redhat.com> - 0.3.0-1
+- New version
+
 * Tue Aug 26 2008 David Lutterkort <dlutter at redhat.com> - 0.2.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 02:01:27 -0000	1.3
+++ sources	12 Aug 2009 22:36:36 -0000	1.4
@@ -1 +1 @@
-27737357428723b975472317b2b2db62  ruby-augeas-0.2.0.tgz
+bdeeb2b99f962a453259748073495d3f  ruby-augeas-0.3.0.tgz



From lutter at fedoraproject.org  Wed Aug 12 22:37:03 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 12 Aug 2009 22:37:03 +0000 (UTC)
Subject: rpms/ruby-augeas/F-10 .cvsignore, 1.3, 1.4 ruby-augeas.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090812223703.E9DA611C00E0@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/ruby-augeas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13553

Modified Files:
	.cvsignore ruby-augeas.spec sources 
Log Message:
New Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 02:01:27 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:37:03 -0000	1.4
@@ -1 +1 @@
-ruby-augeas-0.2.0.tgz
+ruby-augeas-0.3.0.tgz


Index: ruby-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/F-10/ruby-augeas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ruby-augeas.spec	27 Aug 2008 02:01:27 -0000	1.3
+++ ruby-augeas.spec	12 Aug 2009 22:37:03 -0000	1.4
@@ -2,21 +2,21 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-augeas
-Version:        0.2.0
+Version:        0.3.0
 Release:        1%{?dist}
 Summary:        Ruby bindings for Augeas
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            http://augeas.net
-Source0:        ruby-augeas-0.2.0.tgz
+Source0:        http://augeas.net/download/ruby/ruby-augeas-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel rubygem(rake)
-BuildRequires:  augeas-devel >= 0.0.6
+BuildRequires:  augeas-devel >= 0.5.1
 BuildRequires:  pkgconfig
 Requires:       ruby(abi) = 1.8
-Requires:       augeas-libs >= 0.3.0
+Requires:       augeas-libs >= 0.5.1
 Provides:       ruby(augeas) = %{version}
 
 %description
@@ -46,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.rdoc
+%doc COPYING README.rdoc NEWS
 %{ruby_sitelib}/augeas.rb
 %{ruby_sitearch}/_augeas.so
 
 
 %changelog
+* Wed Aug 12 2009 David Lutterkort <lutter at redhat.com> - 0.3.0-1
+- New version
+
 * Tue Aug 26 2008 David Lutterkort <dlutter at redhat.com> - 0.2.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 02:01:27 -0000	1.3
+++ sources	12 Aug 2009 22:37:03 -0000	1.4
@@ -1 +1 @@
-27737357428723b975472317b2b2db62  ruby-augeas-0.2.0.tgz
+bdeeb2b99f962a453259748073495d3f  ruby-augeas-0.3.0.tgz



From lutter at fedoraproject.org  Wed Aug 12 22:38:00 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 12 Aug 2009 22:38:00 +0000 (UTC)
Subject: rpms/ruby-augeas/F-11 .cvsignore, 1.3, 1.4 ruby-augeas.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090812223800.0489811C00E0@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/ruby-augeas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13800

Modified Files:
	.cvsignore ruby-augeas.spec sources 
Log Message:
New Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 02:01:27 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:37:59 -0000	1.4
@@ -1 +1 @@
-ruby-augeas-0.2.0.tgz
+ruby-augeas-0.3.0.tgz


Index: ruby-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/F-11/ruby-augeas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ruby-augeas.spec	25 Feb 2009 21:19:22 -0000	1.4
+++ ruby-augeas.spec	12 Aug 2009 22:37:59 -0000	1.5
@@ -2,21 +2,21 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-augeas
-Version:        0.2.0
-Release:        2%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Ruby bindings for Augeas
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            http://augeas.net
-Source0:        ruby-augeas-0.2.0.tgz
+Source0:        http://augeas.net/download/ruby/ruby-augeas-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel rubygem(rake)
-BuildRequires:  augeas-devel >= 0.0.6
+BuildRequires:  augeas-devel >= 0.5.1
 BuildRequires:  pkgconfig
 Requires:       ruby(abi) = 1.8
-Requires:       augeas-libs >= 0.3.0
+Requires:       augeas-libs >= 0.5.1
 Provides:       ruby(augeas) = %{version}
 
 %description
@@ -46,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.rdoc
+%doc COPYING README.rdoc NEWS
 %{ruby_sitelib}/augeas.rb
 %{ruby_sitearch}/_augeas.so
 
 
 %changelog
+* Wed Aug 12 2009 David Lutterkort <lutter at redhat.com> - 0.3.0-1
+- New version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 02:01:27 -0000	1.3
+++ sources	12 Aug 2009 22:37:59 -0000	1.4
@@ -1 +1 @@
-27737357428723b975472317b2b2db62  ruby-augeas-0.2.0.tgz
+bdeeb2b99f962a453259748073495d3f  ruby-augeas-0.3.0.tgz



From lutter at fedoraproject.org  Wed Aug 12 22:40:15 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed, 12 Aug 2009 22:40:15 +0000 (UTC)
Subject: rpms/ruby-augeas/devel .cvsignore, 1.3, 1.4 ruby-augeas.spec, 1.5, 
	1.6 sources, 1.3, 1.4
Message-ID: <20090812224016.0063311C048B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/ruby-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14491

Modified Files:
	.cvsignore ruby-augeas.spec sources 
Log Message:
New Version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 02:01:27 -0000	1.3
+++ .cvsignore	12 Aug 2009 22:40:15 -0000	1.4
@@ -1 +1 @@
-ruby-augeas-0.2.0.tgz
+ruby-augeas-0.3.0.tgz


Index: ruby-augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/devel/ruby-augeas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ruby-augeas.spec	27 Jul 2009 03:20:44 -0000	1.5
+++ ruby-augeas.spec	12 Aug 2009 22:40:15 -0000	1.6
@@ -2,21 +2,21 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-augeas
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Ruby bindings for Augeas
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            http://augeas.net
-Source0:        ruby-augeas-0.2.0.tgz
+Source0:        http://augeas.net/download/ruby/ruby-augeas-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel rubygem(rake)
-BuildRequires:  augeas-devel >= 0.0.6
+BuildRequires:  augeas-devel >= 0.5.1
 BuildRequires:  pkgconfig
 Requires:       ruby(abi) = 1.8
-Requires:       augeas-libs >= 0.3.0
+Requires:       augeas-libs >= 0.5.1
 Provides:       ruby(augeas) = %{version}
 
 %description
@@ -46,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.rdoc
+%doc COPYING README.rdoc NEWS
 %{ruby_sitelib}/augeas.rb
 %{ruby_sitearch}/_augeas.so
 
 
 %changelog
+* Wed Aug 12 2009 David Lutterkort <lutter at redhat.com> - 0.3.0-1
+- New version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-augeas/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 02:01:27 -0000	1.3
+++ sources	12 Aug 2009 22:40:15 -0000	1.4
@@ -1 +1 @@
-27737357428723b975472317b2b2db62  ruby-augeas-0.2.0.tgz
+bdeeb2b99f962a453259748073495d3f  ruby-augeas-0.3.0.tgz



From robert at fedoraproject.org  Wed Aug 12 22:43:16 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 12 Aug 2009 22:43:16 +0000 (UTC)
Subject: rpms/mksh/EL-4 .cvsignore, 1.19, 1.20 mksh.spec, 1.22, 1.23 sources,
	1.19, 1.20
Message-ID: <20090812224316.D16EA11C00E0@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15047/EL-4

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 39 and updated arc4random.c file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	31 May 2009 20:09:33 -0000	1.19
+++ .cvsignore	12 Aug 2009 22:43:16 -0000	1.20
@@ -1,2 +1,2 @@
-mksh-R38b.cpio.gz
+mksh-R39.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mksh.spec	31 May 2009 20:09:33 -0000	1.22
+++ mksh.spec	12 Aug 2009 22:43:16 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          38b
+Version:          39
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 39-1
+- Upgrade to 39 and updated arc4random.c file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 38b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 31 2009 Robert Scheck <robert at fedoraproject.org> 38b-1
 - Upgrade to 38b
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 May 2009 20:09:33 -0000	1.19
+++ sources	12 Aug 2009 22:43:16 -0000	1.20
@@ -1,2 +1,2 @@
-7a9353648b6f4008b1bbcfffdffff333  mksh-R38b.cpio.gz
-68160e316642b01464544b3f91a82bf7  arc4random.c
+b2eeb4fe4ccac2704e1440e53cd2672c  mksh-R39.cpio.gz
+e8376a9b51c0ce08f5ed20722b05cad3  arc4random.c



From robert at fedoraproject.org  Wed Aug 12 22:43:17 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 12 Aug 2009 22:43:17 +0000 (UTC)
Subject: rpms/mksh/EL-5 .cvsignore, 1.19, 1.20 mksh.spec, 1.22, 1.23 sources,
	1.19, 1.20
Message-ID: <20090812224317.1D94711C0346@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15047/EL-5

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 39 and updated arc4random.c file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	31 May 2009 20:09:35 -0000	1.19
+++ .cvsignore	12 Aug 2009 22:43:16 -0000	1.20
@@ -1,2 +1,2 @@
-mksh-R38b.cpio.gz
+mksh-R39.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mksh.spec	31 May 2009 20:09:36 -0000	1.22
+++ mksh.spec	12 Aug 2009 22:43:16 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          38b
+Version:          39
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 39-1
+- Upgrade to 39 and updated arc4random.c file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 38b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 31 2009 Robert Scheck <robert at fedoraproject.org> 38b-1
 - Upgrade to 38b
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 May 2009 20:09:36 -0000	1.19
+++ sources	12 Aug 2009 22:43:16 -0000	1.20
@@ -1,2 +1,2 @@
-7a9353648b6f4008b1bbcfffdffff333  mksh-R38b.cpio.gz
-68160e316642b01464544b3f91a82bf7  arc4random.c
+b2eeb4fe4ccac2704e1440e53cd2672c  mksh-R39.cpio.gz
+e8376a9b51c0ce08f5ed20722b05cad3  arc4random.c



From robert at fedoraproject.org  Wed Aug 12 22:43:17 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 12 Aug 2009 22:43:17 +0000 (UTC)
Subject: rpms/mksh/F-10 .cvsignore, 1.19, 1.20 mksh.spec, 1.23, 1.24 sources,
	1.19, 1.20
Message-ID: <20090812224317.673C311C00E0@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15047/F-10

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 39 and updated arc4random.c file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	31 May 2009 20:09:36 -0000	1.19
+++ .cvsignore	12 Aug 2009 22:43:17 -0000	1.20
@@ -1,2 +1,2 @@
-mksh-R38b.cpio.gz
+mksh-R39.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-10/mksh.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mksh.spec	31 May 2009 20:09:36 -0000	1.23
+++ mksh.spec	12 Aug 2009 22:43:17 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          38b
+Version:          39
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 39-1
+- Upgrade to 39 and updated arc4random.c file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 38b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 31 2009 Robert Scheck <robert at fedoraproject.org> 38b-1
 - Upgrade to 38b
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 May 2009 20:09:37 -0000	1.19
+++ sources	12 Aug 2009 22:43:17 -0000	1.20
@@ -1,2 +1,2 @@
-7a9353648b6f4008b1bbcfffdffff333  mksh-R38b.cpio.gz
-68160e316642b01464544b3f91a82bf7  arc4random.c
+b2eeb4fe4ccac2704e1440e53cd2672c  mksh-R39.cpio.gz
+e8376a9b51c0ce08f5ed20722b05cad3  arc4random.c



From robert at fedoraproject.org  Wed Aug 12 22:43:17 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 12 Aug 2009 22:43:17 +0000 (UTC)
Subject: rpms/mksh/F-11 .cvsignore, 1.19, 1.20 mksh.spec, 1.24, 1.25 sources,
	1.19, 1.20
Message-ID: <20090812224317.C793511C043B@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15047/F-11

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 39 and updated arc4random.c file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	31 May 2009 20:09:37 -0000	1.19
+++ .cvsignore	12 Aug 2009 22:43:17 -0000	1.20
@@ -1,2 +1,2 @@
-mksh-R38b.cpio.gz
+mksh-R39.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-11/mksh.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- mksh.spec	31 May 2009 20:09:37 -0000	1.24
+++ mksh.spec	12 Aug 2009 22:43:17 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          38b
+Version:          39
 Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
@@ -71,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 39-1
+- Upgrade to 39 and updated arc4random.c file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 38b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 31 2009 Robert Scheck <robert at fedoraproject.org> 38b-1
 - Upgrade to 38b
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 May 2009 20:09:37 -0000	1.19
+++ sources	12 Aug 2009 22:43:17 -0000	1.20
@@ -1,2 +1,2 @@
-7a9353648b6f4008b1bbcfffdffff333  mksh-R38b.cpio.gz
-68160e316642b01464544b3f91a82bf7  arc4random.c
+b2eeb4fe4ccac2704e1440e53cd2672c  mksh-R39.cpio.gz
+e8376a9b51c0ce08f5ed20722b05cad3  arc4random.c



From robert at fedoraproject.org  Wed Aug 12 22:43:18 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 12 Aug 2009 22:43:18 +0000 (UTC)
Subject: rpms/mksh/devel .cvsignore, 1.19, 1.20 mksh.spec, 1.25, 1.26 sources,
	1.19, 1.20
Message-ID: <20090812224318.43E9611C0346@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15047/devel

Modified Files:
	.cvsignore mksh.spec sources 
Log Message:
Upgrade to 39 and updated arc4random.c file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	31 May 2009 20:09:38 -0000	1.19
+++ .cvsignore	12 Aug 2009 22:43:17 -0000	1.20
@@ -1,2 +1,2 @@
-mksh-R38b.cpio.gz
+mksh-R39.cpio.gz
 arc4random.c


Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mksh.spec	25 Jul 2009 14:36:49 -0000	1.25
+++ mksh.spec	12 Aug 2009 22:43:18 -0000	1.26
@@ -2,8 +2,8 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          38b
-Release:          2%{?dist}
+Version:          39
+Release:          1%{?dist}
 License:          BSD with advertising
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 39-1
+- Upgrade to 39 and updated arc4random.c file
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 38b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 May 2009 20:09:39 -0000	1.19
+++ sources	12 Aug 2009 22:43:18 -0000	1.20
@@ -1,2 +1,2 @@
-7a9353648b6f4008b1bbcfffdffff333  mksh-R38b.cpio.gz
-68160e316642b01464544b3f91a82bf7  arc4random.c
+b2eeb4fe4ccac2704e1440e53cd2672c  mksh-R39.cpio.gz
+e8376a9b51c0ce08f5ed20722b05cad3  arc4random.c



From tuxbrewr at fedoraproject.org  Wed Aug 12 22:44:57 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 12 Aug 2009 22:44:57 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 .cvsignore, 1.13, 1.14 kpackagekit.spec, 1.37,
	1.38 sources, 1.17, 1.18
Message-ID: <20090812224457.116C211C00E0@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16214

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	11 Jun 2009 13:00:23 -0000	1.13
+++ .cvsignore	12 Aug 2009 22:44:56 -0000	1.14
@@ -1 +1 @@
-kpackagekit-0.4.1.1.tar.bz2
+kpackagekit-0.4.2.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- kpackagekit.spec	16 Jul 2009 14:00:28 -0000	1.37
+++ kpackagekit.spec	12 Aug 2009 22:44:56 -0000	1.38
@@ -2,14 +2,14 @@
 %define pk_version 0.4.7
 
 Name:	  	kpackagekit
-Version:	0.4.1.1
-Release:	2%{?dist}
+Version:	0.4.2
+Release:	0%{?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.4.1.1.tar.bz2
+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)
 
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> 0.4.2-0
+- New upstream release
+
 * Thu Jul 16 2009 Steven M. Parrish <smparrish at gmail.com> 0.4.1.1-2
 - Now includes Slovak(sk) translations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 Jul 2009 14:00:28 -0000	1.17
+++ sources	12 Aug 2009 22:44:56 -0000	1.18
@@ -1 +1 @@
-ec1f85ef73405a79afbffc50e9c3ab79  kpackagekit-0.4.1.1.tar.bz2
+ef430574a3236a9b8df49ace8ae9b651  kpackagekit-0.4.2.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 22:50:52 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 22:50:52 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel
	pixman-disable-blitters-test-testcase.patch, 
	NONE, 1.1 mingw32-pixman.spec, 1.7, 1.8
Message-ID: <20090812225052.42FEF11C00E0@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17707

Modified Files:
	mingw32-pixman.spec 
Added Files:
	pixman-disable-blitters-test-testcase.patch 
Log Message:
- Automatically generate debuginfo subpackage
- Don't build the 'blitters-test' testcase as it requires the memalign function
  which we don't have on MinGW


pixman-disable-blitters-test-testcase.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pixman-disable-blitters-test-testcase.patch ---
--- test/Makefile.in.orig	2009-08-13 00:44:30.275385290 +0200
+++ test/Makefile.in	2009-08-13 00:47:49.722395581 +0200
@@ -58,7 +58,7 @@
 @HAVE_GTK_TRUE@	alpha-test$(EXEEXT) screen-test$(EXEEXT) \
 @HAVE_GTK_TRUE@	convolution-test$(EXEEXT) trap-test$(EXEEXT)
 am__EXEEXT_2 = region-test$(EXEEXT) scaling-test$(EXEEXT) \
-	blitters-test$(EXEEXT) fetch-test$(EXEEXT) oob-test$(EXEEXT) \
+	fetch-test$(EXEEXT) oob-test$(EXEEXT) \
 	window-test$(EXEEXT) trap-crasher$(EXEEXT) $(am__EXEEXT_1)
 PROGRAMS = $(noinst_PROGRAMS)
 am__alpha_test_SOURCES_DIST = alpha-test.c utils.c utils.h
@@ -282,7 +282,7 @@
 TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la
 INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \
 	$(am__append_2)
-TESTPROGRAMS = region-test scaling-test blitters-test fetch-test \
+TESTPROGRAMS = region-test scaling-test fetch-test \
 	oob-test window-test trap-crasher $(am__append_1)
 fetch_test_LDADD = $(TEST_LDADD)
 region_test_LDADD = $(TEST_LDADD)


Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-pixman.spec	12 Aug 2009 22:31:15 -0000	1.7
+++ mingw32-pixman.spec	12 Aug 2009 22:50:52 -0000	1.8
@@ -3,6 +3,7 @@
 %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-pixman
 Version:        0.15.20
@@ -16,10 +17,12 @@ Group:          Development/Libraries
 Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
 Source1:        make-pixman-snapshot.sh
 
+Patch0:         pixman-disable-blitters-test-testcase.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -39,8 +42,12 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Pixman library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n pixman-%{version}
+%patch0 -p0
 
 
 %build
@@ -79,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.15.20-1
 - Update to version 0.15.20
 - Updated SOURCE0 and URL
+- Automatically generate debuginfo subpackage
+- Don't build the 'blitters-test' testcase as it requires the memalign function
+  which we don't have on MinGW
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From jkeating at fedoraproject.org  Wed Aug 12 22:53:30 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 12 Aug 2009 22:53:30 +0000 (UTC)
Subject: common Makefile.common,1.134,1.135
Message-ID: <20090812225330.B991011C00E0@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18299

Modified Files:
	Makefile.common 
Log Message:
Add a 'target' make target to print out what build target would be used



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- Makefile.common	11 Aug 2009 22:03:50 -0000	1.134
+++ Makefile.common	12 Aug 2009 22:53:30 -0000	1.135
@@ -541,6 +541,9 @@ Or if this is a tag request for updates,
 cvsurl:
 	@echo '$(CVS_URL)'
 
+target:
+	@echo '$(TARGET)'
+
 chain-build: build-check
 	@if [ -z "$(CHAIN)" ]; then \
                 echo "Missing CHAIN variable, please specify the order of packages to" ; \



From kanarip at fedoraproject.org  Wed Aug 12 22:56:23 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 22:56:23 +0000 (UTC)
Subject: rpms/facter/EL-4
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 import.log, NONE, 1.1 facter.spec, 1.11, 1.12
Message-ID: <20090812225623.3D9BA11C0047@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/facter/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343/EL-4

Modified Files:
	facter.spec 
Added Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
	import.log 
Log Message:
1.5.5-3

facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 43da65cd2af00d8e7162461835b039bc5ee7d5c8 Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Tue, 23 Jun 2009 23:18:01 +0200
Subject: [PATCH] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
 Signed-off-by: Bernhard Furtmueller <furti at 1012surf.net>

---
 lib/facter/virtual.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 72bfe51..8c11b40 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -41,9 +41,11 @@ Facter.add("virtual") do
         end
         
         if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            Thread::exclusive do
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0" 
+                end
             end
         end
  
-- 
1.6.0.4



--- NEW FILE import.log ---
facter-1_5_5-3_fc11:EL-4:facter-1.5.5-3.fc11.src.rpm:1250117769


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-4/facter.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- facter.spec	26 May 2009 19:46:31 -0000	1.11
+++ facter.spec	12 Aug 2009 22:56:23 -0000	1.12
@@ -6,11 +6,15 @@
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
+
+# Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
+Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,6 +34,7 @@ operating system. Additional facts can b
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -50,6 +55,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz at pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch



From kanarip at fedoraproject.org  Wed Aug 12 22:56:54 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 22:56:54 +0000 (UTC)
Subject: rpms/facter/EL-5
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 import.log, NONE, 1.1 facter.spec, 1.13, 1.14
Message-ID: <20090812225654.62DEB11C0047@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/facter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19591/EL-5

Modified Files:
	facter.spec 
Added Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
	import.log 
Log Message:
1.5.5-3

facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 43da65cd2af00d8e7162461835b039bc5ee7d5c8 Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Tue, 23 Jun 2009 23:18:01 +0200
Subject: [PATCH] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
 Signed-off-by: Bernhard Furtmueller <furti at 1012surf.net>

---
 lib/facter/virtual.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 72bfe51..8c11b40 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -41,9 +41,11 @@ Facter.add("virtual") do
         end
         
         if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            Thread::exclusive do
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0" 
+                end
             end
         end
  
-- 
1.6.0.4



--- NEW FILE import.log ---
facter-1_5_5-3_fc11:EL-5:facter-1.5.5-3.fc11.src.rpm:1250117801


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/EL-5/facter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- facter.spec	22 May 2009 21:39:10 -0000	1.13
+++ facter.spec	12 Aug 2009 22:56:54 -0000	1.14
@@ -6,11 +6,15 @@
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
+
+# Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
+Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,6 +34,7 @@ operating system. Additional facts can b
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -50,6 +55,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz at pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch



From kanarip at fedoraproject.org  Wed Aug 12 22:57:26 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 22:57:26 +0000 (UTC)
Subject: rpms/facter/F-10
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 import.log, NONE, 1.1 facter.spec, 1.13, 1.14
Message-ID: <20090812225726.0C40F11C0047@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/facter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19840/F-10

Modified Files:
	facter.spec 
Added Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
	import.log 
Log Message:
1.5.5-3

facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 43da65cd2af00d8e7162461835b039bc5ee7d5c8 Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Tue, 23 Jun 2009 23:18:01 +0200
Subject: [PATCH] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
 Signed-off-by: Bernhard Furtmueller <furti at 1012surf.net>

---
 lib/facter/virtual.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 72bfe51..8c11b40 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -41,9 +41,11 @@ Facter.add("virtual") do
         end
         
         if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            Thread::exclusive do
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0" 
+                end
             end
         end
  
-- 
1.6.0.4



--- NEW FILE import.log ---
facter-1_5_5-3_fc11:F-10:facter-1.5.5-3.fc11.src.rpm:1250117832


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-10/facter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- facter.spec	22 May 2009 21:37:24 -0000	1.13
+++ facter.spec	12 Aug 2009 22:57:25 -0000	1.14
@@ -6,11 +6,15 @@
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
+
+# Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
+Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,6 +34,7 @@ operating system. Additional facts can b
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -50,6 +55,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz at pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch



From kanarip at fedoraproject.org  Wed Aug 12 22:57:58 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 22:57:58 +0000 (UTC)
Subject: rpms/facter/F-11
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 import.log, NONE, 1.1 facter.spec, 1.14, 1.15
Message-ID: <20090812225758.2970A11C0047@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/facter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20071/F-11

Modified Files:
	facter.spec 
Added Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
	import.log 
Log Message:
1.5.5-3

facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 43da65cd2af00d8e7162461835b039bc5ee7d5c8 Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Tue, 23 Jun 2009 23:18:01 +0200
Subject: [PATCH] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
 Signed-off-by: Bernhard Furtmueller <furti at 1012surf.net>

---
 lib/facter/virtual.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 72bfe51..8c11b40 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -41,9 +41,11 @@ Facter.add("virtual") do
         end
         
         if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            Thread::exclusive do
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0" 
+                end
             end
         end
  
-- 
1.6.0.4



--- NEW FILE import.log ---
facter-1_5_5-3_fc11:F-11:facter-1.5.5-3.fc11.src.rpm:1250117864


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/F-11/facter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- facter.spec	22 May 2009 21:44:10 -0000	1.14
+++ facter.spec	12 Aug 2009 22:57:58 -0000	1.15
@@ -6,11 +6,15 @@
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
+
+# Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
+Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,6 +34,7 @@ operating system. Additional facts can b
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -50,6 +55,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Todd Zullinger <tmz at pobox.com> - 1.5.5-1
 - Update to 1.5.5
 - Drop upstreamed libperms patch



From kanarip at fedoraproject.org  Wed Aug 12 22:58:31 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 12 Aug 2009 22:58:31 +0000 (UTC)
Subject: rpms/facter/devel
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch, NONE,
	1.1 import.log, NONE, 1.1 facter.spec, 1.15, 1.16
Message-ID: <20090812225831.65F2011C0047@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/facter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20318/devel

Modified Files:
	facter.spec 
Added Files:
	facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch 
	import.log 
Log Message:
1.5.5-3

facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch:
 virtual.rb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch ---
>From 43da65cd2af00d8e7162461835b039bc5ee7d5c8 Mon Sep 17 00:00:00 2001
From: Bernhard Furtmueller <furti at 1012surf.net>
Date: Tue, 23 Jun 2009 23:18:01 +0200
Subject: [PATCH] Fixed #2355 read hang on /proc/xen/capabilties on RHEL 4.7
 Signed-off-by: Bernhard Furtmueller <furti at 1012surf.net>

---
 lib/facter/virtual.rb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 72bfe51..8c11b40 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -41,9 +41,11 @@ Facter.add("virtual") do
         end
         
         if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            Thread::exclusive do
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0" 
+                end
             end
         end
  
-- 
1.6.0.4



--- NEW FILE import.log ---
facter-1_5_5-3_fc11:HEAD:facter-1.5.5-3.fc11.src.rpm:1250117897


Index: facter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/facter/devel/facter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- facter.spec	24 Jul 2009 22:29:15 -0000	1.15
+++ facter.spec	12 Aug 2009 22:58:31 -0000	1.16
@@ -6,11 +6,15 @@
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: 1.5.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tar.gz
+
+# Bugzilla 508037, or upstream ticket 2355 (drop in 1.6.0)
+Patch0: facter-1.5.5-facts-hanging-on-_proc_xen_capabilities.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,6 +34,7 @@ operating system. Additional facts can b
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -50,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 12 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.5.5-3
+- Fix #508037 or upstream #2355
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Wed Aug 12 23:02:13 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:02:13 +0000 (UTC)
Subject: rpms/mingw32-cairo/devel .cvsignore, 1.3, 1.4 mingw32-cairo.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20090812230213.39D5811C0047@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21262/devel

Modified Files:
	.cvsignore mingw32-cairo.spec sources 
Log Message:
- Update to 1.8.8
- Automatically generate debuginfo subpackage
- Use %global instead of %define



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 13:47:37 -0000	1.3
+++ .cvsignore	12 Aug 2009 23:02:12 -0000	1.4
@@ -1 +1 @@
-cairo-1.8.6.tar.gz
+cairo-1.8.8.tar.gz


Index: mingw32-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/mingw32-cairo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-cairo.spec	25 Jul 2009 12:15:08 -0000	1.7
+++ mingw32-cairo.spec	12 Aug 2009 23:02:13 -0000	1.8
@@ -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-cairo
-Version:        1.8.6
-Release:        3%{?dist}
+Version:        1.8.8
+Release:        1%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -17,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-libxml2
@@ -50,6 +51,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Cairo library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n cairo-%{version}
 
@@ -100,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.8-1
+- Update to 1.8.8
+- Automatically generate debuginfo subpackage
+- Use %%global instead of %%define
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 13:47:38 -0000	1.3
+++ sources	12 Aug 2009 23:02:13 -0000	1.4
@@ -1 +1 @@
-4e64139ef6f668df24450f3b81dd0771  cairo-1.8.6.tar.gz
+d3e1a1035ae563812d4dd44a74fb0dd0  cairo-1.8.8.tar.gz



From epienbro at fedoraproject.org  Wed Aug 12 23:02:34 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:02:34 +0000 (UTC)
Subject: rpms/mingw32-cairo/F-11 .cvsignore, 1.3, 1.4 mingw32-cairo.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090812230234.DD39711C0047@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-cairo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21364/F-11

Modified Files:
	.cvsignore mingw32-cairo.spec sources 
Log Message:
- Update to 1.8.8
- Use %global instead of %define



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 13:47:37 -0000	1.3
+++ .cvsignore	12 Aug 2009 23:02:34 -0000	1.4
@@ -1 +1 @@
-cairo-1.8.6.tar.gz
+cairo-1.8.8.tar.gz


Index: mingw32-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-11/mingw32-cairo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-cairo.spec	14 Apr 2009 19:25:29 -0000	1.6
+++ mingw32-cairo.spec	12 Aug 2009 23:02:34 -0000	1.7
@@ -1,12 +1,12 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-cairo
-Version:        1.8.6
-Release:        2%{?dist}
+Version:        1.8.8
+Release:        1%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.8-1
+- Update to 1.8.8
+- Use %%global instead of %%define
+
 * Fri Apr  3 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.6-2
 - Fixed %%defattr line
 - Added -static subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 13:47:38 -0000	1.3
+++ sources	12 Aug 2009 23:02:34 -0000	1.4
@@ -1 +1 @@
-4e64139ef6f668df24450f3b81dd0771  cairo-1.8.6.tar.gz
+d3e1a1035ae563812d4dd44a74fb0dd0  cairo-1.8.8.tar.gz



From epienbro at fedoraproject.org  Wed Aug 12 23:09:27 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:09:27 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.7, 1.8 mingw32-glib2.spec,
	1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20090812230927.828F611C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23937

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.21.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Jul 2009 18:06:51 -0000	1.7
+++ .cvsignore	12 Aug 2009 23:09:27 -0000	1.8
@@ -1 +1 @@
-glib-2.21.3.tar.bz2
+glib-2.21.4.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mingw32-glib2.spec	25 Jul 2009 12:18:19 -0000	1.12
+++ mingw32-glib2.spec	12 Aug 2009 23:09:27 -0000	1.13
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.21.3
-Release:        2%{?dist}
+Version:        2.21.4
+Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.4-1
+- Update to 2.21.4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.21.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Jul 2009 18:06:51 -0000	1.7
+++ sources	12 Aug 2009 23:09:27 -0000	1.8
@@ -1 +1 @@
-8ed8d959a131e295ce75c8ebe867014e  glib-2.21.3.tar.bz2
+5092c5b479ba80065dc164d27e63000f  glib-2.21.4.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 23:12:46 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:12:46 +0000 (UTC)
Subject: rpms/mingw32-glib2/F-11 .cvsignore, 1.4, 1.5 mingw32-glib2.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090812231246.2DB9211C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24751

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
- Update to 2.20.4
- Use %global instead of %define



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Apr 2009 12:15:12 -0000	1.4
+++ .cvsignore	12 Aug 2009 23:12:45 -0000	1.5
@@ -1,2 +1 @@
-glib-2.19.10.tar.bz2
-glib-2.20.1.tar.bz2
+glib-2.20.4.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-11/mingw32-glib2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-glib2.spec	16 Apr 2009 12:15:12 -0000	1.6
+++ mingw32-glib2.spec	12 Aug 2009 23:12:45 -0000	1.7
@@ -1,11 +1,11 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glib2
-Version:        2.20.1
+Version:        2.20.4
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
@@ -178,7 +178,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libgobject-2.0.a
 %{_mingw32_libdir}/libgthread-2.0.a
 
+
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.20.4-1
+- Update to 2.20.4
+- Use %%global instead of %%define
+
 * Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.20.1-1
 - Update to 2.20.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Apr 2009 12:15:12 -0000	1.4
+++ sources	12 Aug 2009 23:12:45 -0000	1.5
@@ -1 +1 @@
-d7ef53c7b65827a1baa4bad1c6893fa3  glib-2.20.1.tar.bz2
+346916673c0eab72191cf44b4afe535f  glib-2.20.4.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 23:15:50 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:15:50 +0000 (UTC)
Subject: rpms/mingw32-pango/devel mingw32-pango.spec,1.5,1.6
Message-ID: <20090812231550.6998411C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25496

Modified Files:
	mingw32-pango.spec 
Log Message:
- Added BR: mingw32-gcc-c++
- Automatically generate debuginfo subpackage



Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mingw32-pango.spec	12 Aug 2009 22:23:56 -0000	1.5
+++ mingw32-pango.spec	12 Aug 2009 23:15:50 -0000	1.6
@@ -3,6 +3,7 @@
 %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-pango
 Version:        1.25.2
@@ -32,6 +33,7 @@ BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
 BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
 
 BuildRequires:  mingw32-cairo >= 1.8.0
@@ -68,6 +70,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Pango library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n pango-%{version}
 %patch1000
@@ -193,6 +198,8 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.2-1
 - Update to 1.25.2
+- Added BR: mingw32-gcc-c++
+- Automatically generate debuginfo subpackage
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From toshio at fedoraproject.org  Wed Aug 12 23:24:38 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 12 Aug 2009 23:24:38 +0000 (UTC)
Subject: rpms/TurboGears/devel feedkid.diff, NONE, 1.1 TurboGears.spec, 1.46,
	1.47
Message-ID: <20090812232438.B43ED11C02C2@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27549

Modified Files:
	TurboGears.spec 
Added Files:
	feedkid.diff 
Log Message:

* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
- Add patch to make FeedController work when the default template engine is
  not kid.


feedkid.diff:
 feed.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE feedkid.diff ---
Index: turbogears/feed/feed.py
===================================================================
--- turbogears/feed/feed.py	(revision 6599)
+++ turbogears/feed/feed.py	(working copy)
@@ -52,7 +52,7 @@
         feed["href"] = turbogears.url("/") + "atom1.0"
         self.depr_entrys(feed)
         return feed
-    atom1_0 = turbogears.expose(template="turbogears.feed.atom1_0",
+    atom1_0 = turbogears.expose(template="kid:turbogears.feed.atom1_0",
                     format="xml", content_type="application/atom+xml")(atom1_0)
 
     def atom0_3(self, **kwargs):
@@ -61,7 +61,7 @@
         feed["href"] = turbogears.url("/") + "atom0.3"
         self.depr_entrys(feed)
         return feed
-    atom0_3 = turbogears.expose(template="turbogears.feed.atom0_3",
+    atom0_3 = turbogears.expose(template="kid:turbogears.feed.atom0_3",
                     format="xml", content_type="application/atom+xml")(atom0_3)
 
     def rss2_0(self, **kwargs):
@@ -69,5 +69,5 @@
         self.format_dates(feed, 822)
         self.depr_entrys(feed)
         return feed
-    rss2_0 = turbogears.expose(template="turbogears.feed.rss2_0",
+    rss2_0 = turbogears.expose(template="kid:turbogears.feed.rss2_0",
                     format="xml", content_type="application/rss+xml")(rss2_0)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- TurboGears.spec	24 Jul 2009 16:26:19 -0000	1.46
+++ TurboGears.spec	12 Aug 2009 23:24:38 -0000	1.47
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -14,6 +14,9 @@ Patch0:         %{name}-%{version}-cherr
 Patch1:         %{name}-%{version}-setup.patch
 # From upstream changeset r6575
 Patch2:         %{name}-%{version}-paginate.patch
+# From upstream bug report: http://trac.turbogears.org/ticket/2348
+# Going into TG-1.1 but not TG-1.0.x
+Patch3: feedkid.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -70,7 +73,7 @@ TurboGears is easy to use for a wide ran
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
-
+%patch3 -p0 -b .feedkid
 
 %build
 %{__python} setup.py build
@@ -93,6 +96,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
+- Add patch to make FeedController work when the default template engine is
+  not kid.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Wed Aug 12 23:32:46 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:32:46 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.5, 1.6 mingw32-gtk2.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090812233246.3213411C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29372

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
- Update to 2.17.7
- Automatically generate debuginfo subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jun 2009 19:57:01 -0000	1.5
+++ .cvsignore	12 Aug 2009 23:32:45 -0000	1.6
@@ -1 +1 @@
-gtk+-2.17.1.tar.bz2
+gtk+-2.17.7.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-gtk2.spec	25 Jul 2009 12:19:17 -0000	1.8
+++ mingw32-gtk2.spec	12 Aug 2009 23:32:45 -0000	1.9
@@ -3,10 +3,11 @@
 %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-gtk2
-Version:        2.17.1
-Release:        2%{?dist}
+Version:        2.17.7
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -78,6 +79,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Gtk2 library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n gtk+-%{version}
 
@@ -324,6 +328,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.7-1
+- Update to 2.17.7
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jun 2009 19:57:01 -0000	1.5
+++ sources	12 Aug 2009 23:32:45 -0000	1.6
@@ -1 +1 @@
-ba8f8bf549be224b124a9efa745d9240  gtk+-2.17.1.tar.bz2
+94a359d5929a1306bb3267a02f9707d0  gtk+-2.17.7.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 23:36:59 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:36:59 +0000 (UTC)
Subject: rpms/mingw32-gtk2/F-11 .cvsignore, 1.4, 1.5 mingw32-gtk2.spec, 1.7, 
	1.8 sources, 1.4, 1.5 double-browser.patch, 1.1, NONE
Message-ID: <20090812233659.5A9A811C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31045

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Removed Files:
	double-browser.patch 
Log Message:
- Update to 2.16.5
- Use %global instead of %define
- Drop upstreamed patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 May 2009 15:34:06 -0000	1.4
+++ .cvsignore	12 Aug 2009 23:36:58 -0000	1.5
@@ -1 +1 @@
-gtk+-2.16.1.tar.bz2
+gtk+-2.16.5.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/mingw32-gtk2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-gtk2.spec	22 May 2009 10:05:17 -0000	1.7
+++ mingw32-gtk2.spec	12 Aug 2009 23:36:59 -0000	1.8
@@ -1,18 +1,18 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtk2
-Version:        2.16.1
-Release:        2%{?dist}
+Version:        2.16.5
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,9 +20,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
 Source1:        gdk-pixbuf.loaders
 
-# Don't open double browser windows from about dialog
-Patch0:         double-browser.patch
-
 # Fix use of extended buttons in gtkstatusicon.
 Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 
@@ -82,7 +79,6 @@ Static version of the MinGW Windows Gtk2
 %prep
 %setup -q -n gtk+-%{version}
 
-%patch0 -p1
 %patch1000 -p1
 %patch1001 -p0
 
@@ -322,6 +318,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.16.5-1
+- Update to 2.16.5
+- Use %%global instead of %%define
+- Drop upstreamed patch
+
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.16.1-2
 - don't open double browser windows from about dialogs
   (patch is from the native gtk2 package)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 May 2009 15:34:06 -0000	1.4
+++ sources	12 Aug 2009 23:36:59 -0000	1.5
@@ -1 +1 @@
-74e35ff3e6e02c960fe2117a4b6b102f  gtk+-2.16.1.tar.bz2
+8d1ea0b9b0400224d25b0cc2750b438d  gtk+-2.16.5.tar.bz2


--- double-browser.patch DELETED ---



From epienbro at fedoraproject.org  Wed Aug 12 23:37:37 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:37:37 +0000 (UTC)
Subject: rpms/mingw32-atk/devel .cvsignore, 1.3, 1.4 mingw32-atk.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <20090812233737.212D511C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31309

Modified Files:
	.cvsignore mingw32-atk.spec sources 
Log Message:
- Update to 1.27.90
- Automatically generate debuginfo subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-atk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jun 2009 20:58:00 -0000	1.3
+++ .cvsignore	12 Aug 2009 23:37:36 -0000	1.4
@@ -1 +1 @@
-atk-1.26.0.tar.bz2
+atk-1.27.90.tar.bz2


Index: mingw32-atk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-atk/devel/mingw32-atk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-atk.spec	25 Jul 2009 12:14:09 -0000	1.6
+++ mingw32-atk.spec	12 Aug 2009 23:37:36 -0000	1.7
@@ -3,16 +3,17 @@
 %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-atk
-Version:        1.26.0
+Version:        1.27.90
 Release:        1%{?dist}
 Summary:        MinGW Windows Atk library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://projects.gnome.org/accessibility/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/atk/1.26/atk-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/atk/1.27/atk-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +46,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Atk library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n atk-%{version}
 
@@ -91,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 
   
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.27.90-1
+- Update to 1.27.90
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26.0-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-atk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jun 2009 20:58:00 -0000	1.3
+++ sources	12 Aug 2009 23:37:37 -0000	1.4
@@ -1 +1 @@
-719229408019c548855673840679f156  atk-1.26.0.tar.bz2
+8906c67d015cc90e2e70a341d0752a6f  atk-1.27.90.tar.bz2



From epienbro at fedoraproject.org  Wed Aug 12 23:45:10 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:45:10 +0000 (UTC)
Subject: rpms/mingw32-pango/F-11 mingw32-pango.spec,1.2,1.3
Message-ID: <20090812234510.6521E11C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv461

Modified Files:
	mingw32-pango.spec 
Log Message:
Fix file list



Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/F-11/mingw32-pango.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-pango.spec	12 Aug 2009 22:27:32 -0000	1.2
+++ mingw32-pango.spec	12 Aug 2009 23:45:10 -0000	1.3
@@ -95,7 +95,7 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_
 
 rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 
-rm $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1/*.1
+rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1
 
 
 %clean
@@ -110,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/libpangoft2-1.0-0.dll
 %{_mingw32_bindir}/libpangowin32-1.0-0.dll
 %{_mingw32_bindir}/pango-querymodules.exe
+%{_mingw32_bindir}/pango-view.exe
 %{_mingw32_includedir}/pango-1.0/
 %{_mingw32_libdir}/libpango-1.0.dll.a
 %{_mingw32_libdir}/libpango-1.0.la



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:22 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested watchcommits
Message-ID: <20090812234622.42F8D10F842@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on digikam-doc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:22 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested watchbugzilla
Message-ID: <20090812234622.7E6AC10F876@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on digikam-doc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:22 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested commit
Message-ID: <20090812234622.A946A10F880@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on digikam-doc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:24 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested approveacls
Message-ID: <20090812234624.AFD0110F886@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam-doc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:31 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested approveacls
Message-ID: <20090812234631.4AF2B10F898@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam-doc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:32 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested approveacls
Message-ID: <20090812234632.9318E10F89B@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam-doc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:36 +0000
Subject: [pkgdb] digikam-doc: rdieter has requested approveacls
Message-ID: <20090812234636.575AC10F7FF@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam-doc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:46:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:46:58 +0000
Subject: [pkgdb] digikam: rdieter has requested approveacls
Message-ID: <20090812234659.D14C410F87C@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:47:05 +0000
Subject: [pkgdb] digikam: rdieter has requested watchbugzilla
Message-ID: <20090812234705.4435710F842@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on digikam (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:47:07 +0000
Subject: [pkgdb] digikam: rdieter has requested approveacls
Message-ID: <20090812234707.AAC1710F87B@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:47:08 +0000
Subject: [pkgdb] digikam: rdieter has requested commit
Message-ID: <20090812234708.2E61910F886@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on digikam (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:47:08 +0000
Subject: [pkgdb] digikam: rdieter has requested watchcommits
Message-ID: <20090812234708.35B7410F890@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on digikam (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:47:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:47:11 +0000
Subject: [pkgdb] digikam: rdieter has requested approveacls
Message-ID: <20090812234711.A97D310F8AD@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:47:12 +0000
Subject: [pkgdb] digikam: rdieter has requested approveacls
Message-ID: <20090812234713.0CE4110F898@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on digikam (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From epienbro at fedoraproject.org  Wed Aug 12 23:54:45 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Wed, 12 Aug 2009 23:54:45 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2.spec,1.9,1.10
Message-ID: <20090812235445.E2BC111C02C2@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2219

Modified Files:
	mingw32-gtk2.spec 
Log Message:
Add --with-libjasper to the ./configure command



Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-gtk2.spec	12 Aug 2009 23:32:45 -0000	1.9
+++ mingw32-gtk2.spec	12 Aug 2009 23:54:45 -0000	1.10
@@ -98,7 +98,7 @@ libtoolize
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus
+%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --with-libjasper
 make %{?_smp_mflags}
 
 
@@ -331,6 +331,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.7-1
 - Update to 2.17.7
 - Automatically generate debuginfo subpackage
+- Add --with-libjasper to the ./configure command
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pkgdb at fedoraproject.org  Wed Aug 12 23:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:55:46 +0000
Subject: [pkgdb] gnome-shell was added for otaylor
Message-ID: <20090812235546.CE4E910F842@bastion2.fedora.phx.redhat.com>

kevin has added Package gnome-shell with summary Window management and application launching for GNOME
kevin has approved Package gnome-shell
kevin has added a Fedora devel branch for gnome-shell with an owner of otaylor
kevin has approved gnome-shell in Fedora devel
kevin has approved Package gnome-shell
kevin has set commit to Approved for 107427 on gnome-shell (Fedora devel)
kevin has set checkout to Approved for 107427 on gnome-shell (Fedora devel)
kevin has set build to Approved for 107427 on gnome-shell (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Wed Aug 12 23:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:55:48 +0000
Subject: [pkgdb] gnome-shell summary updated by kevin
Message-ID: <20090812235549.1D26610F87B@bastion2.fedora.phx.redhat.com>

kevin set package gnome-shell summary to Window management and application launching for GNOME

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Wed Aug 12 23:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:55:48 +0000
Subject: [pkgdb] gnome-shell (Fedora, devel) updated by kevin
Message-ID: <20090812235549.C6CA410F886@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gnome-shell (Fedora devel) for walters
kevin approved watchcommits on gnome-shell (Fedora devel) for walters
kevin approved commit on gnome-shell (Fedora devel) for walters
kevin approved build on gnome-shell (Fedora devel) for walters
kevin approved approveacls on gnome-shell (Fedora devel) for walters

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-shell



From pkgdb at fedoraproject.org  Wed Aug 12 23:55:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:55:49 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090812235550.1A41A10F890@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on digikam-doc (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From kevin at fedoraproject.org  Wed Aug 12 23:55:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:55:56 +0000 (UTC)
Subject: rpms/gnome-shell - New directory
Message-ID: <20090812235556.1BEF511C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-shell
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKQ2592/rpms/gnome-shell

Log Message:
Directory /cvs/pkgs/rpms/gnome-shell added to the repository




From kevin at fedoraproject.org  Wed Aug 12 23:55:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:55:56 +0000 (UTC)
Subject: rpms/gnome-shell/devel - New directory
Message-ID: <20090812235556.441A311C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKQ2592/rpms/gnome-shell/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-shell/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 12 23:55:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:55:57 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090812235558.A0CE810F8A8@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on digikam-doc (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:01 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090812235602.281C310F848@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on digikam-doc (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From kevin at fedoraproject.org  Wed Aug 12 23:56:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:56:03 +0000 (UTC)
Subject: rpms/gnome-shell Makefile,NONE,1.1
Message-ID: <20090812235603.2134211C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-shell
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKQ2592/rpms/gnome-shell

Added Files:
	Makefile 
Log Message:
Setup of module gnome-shell


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-shell
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 12 23:56:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:56:03 +0000 (UTC)
Subject: rpms/gnome-shell/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090812235603.4E85111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsKQ2592/rpms/gnome-shell/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-shell


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-shell
# $Id: Makefile,v 1.1 2009/08/12 23:56:03 kevin Exp $
NAME := gnome-shell
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:36 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090812235636.93BA310F881@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on digikam (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:40 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090812235640.5846210F886@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchcommits acl on digikam (Fedora devel) to Obsolete for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:43 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090812235643.ABAEC10F898@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the watchbugzilla acl on digikam (Fedora devel) to Obsolete for tuxbrewr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:48 +0000
Subject: [pkgdb] digikam: tuxbrewr has requested watchbugzilla
Message-ID: <20090812235649.3579610F8AF@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on digikam (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:49 +0000
Subject: [pkgdb] blazeblogger summary updated by kevin
Message-ID: <20090812235649.7B95410F8B1@bastion2.fedora.phx.redhat.com>

kevin set package blazeblogger summary to A simple to use but capable CMS for the command line

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/blazeblogger



From pkgdb at fedoraproject.org  Wed Aug 12 23:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:49 +0000
Subject: [pkgdb] blazeblogger (Fedora, 10) updated by kevin
Message-ID: <20090812235651.9A3F010F89F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for blazeblogger
kevin has set commit to Approved for 107427 on blazeblogger (Fedora 10)
kevin has set checkout to Approved for 107427 on blazeblogger (Fedora 10)
kevin has set build to Approved for 107427 on blazeblogger (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/blazeblogger



From kevin at fedoraproject.org  Wed Aug 12 23:56:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:56:57 +0000 (UTC)
Subject: rpms/blazeblogger - New directory
Message-ID: <20090812235657.1F83811C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/blazeblogger
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk2846/rpms/blazeblogger

Log Message:
Directory /cvs/pkgs/rpms/blazeblogger added to the repository




From pkgdb at fedoraproject.org  Wed Aug 12 23:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:49 +0000
Subject: [pkgdb] blazeblogger (Fedora, 10) updated by kevin
Message-ID: <20090812235654.C2A4D10F8AA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for blazeblogger
kevin has set commit to Approved for 107427 on blazeblogger (Fedora 11)
kevin has set checkout to Approved for 107427 on blazeblogger (Fedora 11)
kevin has set build to Approved for 107427 on blazeblogger (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/blazeblogger



From kevin at fedoraproject.org  Wed Aug 12 23:56:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:56:57 +0000 (UTC)
Subject: rpms/blazeblogger/devel - New directory
Message-ID: <20090812235657.41E4811C043B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/blazeblogger/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk2846/rpms/blazeblogger/devel

Log Message:
Directory /cvs/pkgs/rpms/blazeblogger/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 12 23:56:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:56:51 +0000
Subject: [pkgdb] digikam: tuxbrewr has requested watchcommits
Message-ID: <20090812235653.8C9C310F842@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on digikam (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:57:06 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090812235707.3707C10F8CA@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on digikam (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Wed Aug 12 23:57:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:57:02 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090812235703.C2BA710F8B7@bastion2.fedora.phx.redhat.com>

tuxbrewr has set the approveacls acl on digikam (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From kevin at fedoraproject.org  Wed Aug 12 23:57:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:57:04 +0000 (UTC)
Subject: rpms/blazeblogger Makefile,NONE,1.1
Message-ID: <20090812235704.2081E11C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/blazeblogger
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk2846/rpms/blazeblogger

Added Files:
	Makefile 
Log Message:
Setup of module blazeblogger


--- NEW FILE Makefile ---
# Top level Makefile for module blazeblogger
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 12 23:57:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:57:04 +0000 (UTC)
Subject: rpms/blazeblogger/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090812235704.53F9F11C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/blazeblogger/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstk2846/rpms/blazeblogger/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module blazeblogger


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: blazeblogger
# $Id: Makefile,v 1.1 2009/08/12 23:57:04 kevin Exp $
NAME := blazeblogger
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 12 23:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:33 +0000
Subject: [pkgdb] sblim-cmpi-rpm summary updated by kevin
Message-ID: <20090812235834.AFBF310F8AA@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-rpm summary to CIM access to installed software packages

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From pkgdb at fedoraproject.org  Wed Aug 12 23:58:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:31 +0000
Subject: [pkgdb] sblim-cmpi-rpm was added for praveenp
Message-ID: <20090812235833.1DF7F10F89F@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-rpm with summary CIM access to installed software packages
kevin has approved Package sblim-cmpi-rpm
kevin has added a Fedora devel branch for sblim-cmpi-rpm with an owner of praveenp
kevin has approved sblim-cmpi-rpm in Fedora devel
kevin has approved Package sblim-cmpi-rpm
kevin has set commit to Approved for 107427 on sblim-cmpi-rpm (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-rpm (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-rpm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From pkgdb at fedoraproject.org  Wed Aug 12 23:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:33 +0000
Subject: [pkgdb] sblim-cmpi-rpm (Fedora EPEL, 4) updated by kevin
Message-ID: <20090812235835.2367110F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sblim-cmpi-rpm (Fedora devel) for mdomsch
kevin approved watchcommits on sblim-cmpi-rpm (Fedora devel) for mdomsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From pkgdb at fedoraproject.org  Wed Aug 12 23:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:33 +0000
Subject: [pkgdb] sblim-cmpi-rpm (Fedora EPEL, 4) updated by kevin
Message-ID: <20090812235836.A131E10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-rpm
kevin has set commit to Approved for 107427 on sblim-cmpi-rpm (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-rpm (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-rpm (Fedora 10)
kevin approved watchbugzilla on sblim-cmpi-rpm (Fedora 10) for mdomsch
kevin approved watchcommits on sblim-cmpi-rpm (Fedora 10) for mdomsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From pkgdb at fedoraproject.org  Wed Aug 12 23:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:33 +0000
Subject: [pkgdb] sblim-cmpi-rpm (Fedora EPEL, 4) updated by kevin
Message-ID: <20090812235841.854CB10F8C2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-rpm
kevin has set commit to Approved for 107427 on sblim-cmpi-rpm (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-rpm (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-rpm (Fedora EPEL 4)
kevin approved watchbugzilla on sblim-cmpi-rpm (Fedora EPEL 4) for mdomsch
kevin approved watchcommits on sblim-cmpi-rpm (Fedora EPEL 4) for mdomsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From pkgdb at fedoraproject.org  Wed Aug 12 23:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:33 +0000
Subject: [pkgdb] sblim-cmpi-rpm (Fedora EPEL, 4) updated by kevin
Message-ID: <20090812235837.B480D10F8BB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-rpm
kevin has set commit to Approved for 107427 on sblim-cmpi-rpm (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-rpm (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-rpm (Fedora 11)
kevin approved watchbugzilla on sblim-cmpi-rpm (Fedora 11) for mdomsch
kevin approved watchcommits on sblim-cmpi-rpm (Fedora 11) for mdomsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From kevin at fedoraproject.org  Wed Aug 12 23:58:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:58:45 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm - New directory
Message-ID: <20090812235845.2214911C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYa3338/rpms/sblim-cmpi-rpm

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-rpm added to the repository




From pkgdb at fedoraproject.org  Wed Aug 12 23:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:58:33 +0000
Subject: [pkgdb] sblim-cmpi-rpm (Fedora EPEL, 4) updated by kevin
Message-ID: <20090812235840.4EDB210F876@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-rpm
kevin has set commit to Approved for 107427 on sblim-cmpi-rpm (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-rpm (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-rpm (Fedora EPEL 5)
kevin approved watchbugzilla on sblim-cmpi-rpm (Fedora EPEL 5) for mdomsch
kevin approved watchcommits on sblim-cmpi-rpm (Fedora EPEL 5) for mdomsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-rpm



From kevin at fedoraproject.org  Wed Aug 12 23:58:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:58:45 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/devel - New directory
Message-ID: <20090812235845.4271911C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYa3338/rpms/sblim-cmpi-rpm/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-rpm/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 12 23:58:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:58:51 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090812235851.C7F6111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYa3338/rpms/sblim-cmpi-rpm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-rpm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-rpm
# $Id: Makefile,v 1.1 2009/08/12 23:58:51 kevin Exp $
NAME := sblim-cmpi-rpm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Aug 12 23:58:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:58:51 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm Makefile,NONE,1.1
Message-ID: <20090812235851.9AA8E11C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYa3338/rpms/sblim-cmpi-rpm

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-rpm


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-rpm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug 12 23:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:59:37 +0000
Subject: [pkgdb] espresso-ab was added for shakthimaan
Message-ID: <20090812235938.ED84510F8DD@bastion2.fedora.phx.redhat.com>

kevin has added Package espresso-ab with summary A boolean minimization tool
kevin has approved Package espresso-ab
kevin has added a Fedora devel branch for espresso-ab with an owner of shakthimaan
kevin has approved espresso-ab in Fedora devel
kevin has approved Package espresso-ab
kevin has set commit to Approved for 107427 on espresso-ab (Fedora devel)
kevin has set checkout to Approved for 107427 on espresso-ab (Fedora devel)
kevin has set build to Approved for 107427 on espresso-ab (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From pkgdb at fedoraproject.org  Wed Aug 12 23:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:59:39 +0000
Subject: [pkgdb] espresso-ab summary updated by kevin
Message-ID: <20090812235940.6393610F8E0@bastion2.fedora.phx.redhat.com>

kevin set package espresso-ab summary to A boolean minimization tool

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From kevin at fedoraproject.org  Wed Aug 12 23:59:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:59:48 +0000 (UTC)
Subject: rpms/espresso-ab/devel - New directory
Message-ID: <20090812235948.4056F11C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/espresso-ab/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszy3774/rpms/espresso-ab/devel

Log Message:
Directory /cvs/pkgs/rpms/espresso-ab/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 12 23:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:59:39 +0000
Subject: [pkgdb] espresso-ab (Fedora, 10) updated by kevin
Message-ID: <20090812235941.8F4F210F8DB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for espresso-ab
kevin has set commit to Approved for 107427 on espresso-ab (Fedora 10)
kevin has set checkout to Approved for 107427 on espresso-ab (Fedora 10)
kevin has set build to Approved for 107427 on espresso-ab (Fedora 10)
kevin approved watchbugzilla on espresso-ab (Fedora 10) for chitlesh
kevin approved watchcommits on espresso-ab (Fedora 10) for chitlesh
kevin approved commit on espresso-ab (Fedora 10) for chitlesh
kevin approved build on espresso-ab (Fedora 10) for chitlesh
kevin approved approveacls on espresso-ab (Fedora 10) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From kevin at fedoraproject.org  Wed Aug 12 23:59:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:59:48 +0000 (UTC)
Subject: rpms/espresso-ab - New directory
Message-ID: <20090812235948.1A21711C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/espresso-ab
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszy3774/rpms/espresso-ab

Log Message:
Directory /cvs/pkgs/rpms/espresso-ab added to the repository




From pkgdb at fedoraproject.org  Wed Aug 12 23:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:59:39 +0000
Subject: [pkgdb] espresso-ab (Fedora, 10) updated by kevin
Message-ID: <20090812235950.C348D10F8AD@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on espresso-ab (Fedora devel) for chitlesh
kevin approved watchcommits on espresso-ab (Fedora devel) for chitlesh
kevin approved commit on espresso-ab (Fedora devel) for chitlesh
kevin approved build on espresso-ab (Fedora devel) for chitlesh
kevin approved approveacls on espresso-ab (Fedora devel) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From pkgdb at fedoraproject.org  Wed Aug 12 23:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 12 Aug 2009 23:59:39 +0000
Subject: [pkgdb] espresso-ab (Fedora, 10) updated by kevin
Message-ID: <20090812235947.B3F4A10F8EE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for espresso-ab
kevin has set commit to Approved for 107427 on espresso-ab (Fedora 11)
kevin has set checkout to Approved for 107427 on espresso-ab (Fedora 11)
kevin has set build to Approved for 107427 on espresso-ab (Fedora 11)
kevin approved watchbugzilla on espresso-ab (Fedora 11) for chitlesh
kevin approved watchcommits on espresso-ab (Fedora 11) for chitlesh
kevin approved commit on espresso-ab (Fedora 11) for chitlesh
kevin approved build on espresso-ab (Fedora 11) for chitlesh
kevin approved approveacls on espresso-ab (Fedora 11) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From kevin at fedoraproject.org  Wed Aug 12 23:59:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:59:55 +0000 (UTC)
Subject: rpms/espresso-ab/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090812235955.5D62211C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/espresso-ab/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszy3774/rpms/espresso-ab/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module espresso-ab


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: espresso-ab
# $Id: Makefile,v 1.1 2009/08/12 23:59:55 kevin Exp $
NAME := espresso-ab
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Aug 12 23:59:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 12 Aug 2009 23:59:55 +0000 (UTC)
Subject: rpms/espresso-ab Makefile,NONE,1.1
Message-ID: <20090812235955.2B68111C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/espresso-ab
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszy3774/rpms/espresso-ab

Added Files:
	Makefile 
Log Message:
Setup of module espresso-ab


--- NEW FILE Makefile ---
# Top level Makefile for module espresso-ab
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 13 00:00:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:00:46 +0000
Subject: [pkgdb] mmapper was added for kalev
Message-ID: <20090813000049.3777810F8C8@bastion2.fedora.phx.redhat.com>

kevin has added Package mmapper with summary Graphical MUME mapper
kevin has approved Package mmapper
kevin has added a Fedora devel branch for mmapper with an owner of kalev
kevin has approved mmapper in Fedora devel
kevin has approved Package mmapper
kevin has set commit to Approved for 107427 on mmapper (Fedora devel)
kevin has set checkout to Approved for 107427 on mmapper (Fedora devel)
kevin has set build to Approved for 107427 on mmapper (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mmapper



From kevin at fedoraproject.org  Thu Aug 13 00:00:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:00:57 +0000 (UTC)
Subject: rpms/mmapper - New directory
Message-ID: <20090813000057.1A18811C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mmapper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGa4190/rpms/mmapper

Log Message:
Directory /cvs/pkgs/rpms/mmapper added to the repository




From kevin at fedoraproject.org  Thu Aug 13 00:01:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:01:03 +0000 (UTC)
Subject: rpms/mmapper/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090813000103.771C911C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mmapper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGa4190/rpms/mmapper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mmapper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mmapper
# $Id: Makefile,v 1.1 2009/08/13 00:01:03 kevin Exp $
NAME := mmapper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 13 00:01:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:01:03 +0000 (UTC)
Subject: rpms/mmapper Makefile,NONE,1.1
Message-ID: <20090813000103.1F83011C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mmapper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGa4190/rpms/mmapper

Added Files:
	Makefile 
Log Message:
Setup of module mmapper


--- NEW FILE Makefile ---
# Top level Makefile for module mmapper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 13 00:00:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:00:57 +0000 (UTC)
Subject: rpms/mmapper/devel - New directory
Message-ID: <20090813000057.41D2211C043B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mmapper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGa4190/rpms/mmapper/devel

Log Message:
Directory /cvs/pkgs/rpms/mmapper/devel added to the repository




From pkgdb at fedoraproject.org  Thu Aug 13 00:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:00:48 +0000
Subject: [pkgdb] mmapper (Fedora, 10) updated by kevin
Message-ID: <20090813000059.776D210F906@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mmapper
kevin has set commit to Approved for 107427 on mmapper (Fedora 11)
kevin has set checkout to Approved for 107427 on mmapper (Fedora 11)
kevin has set build to Approved for 107427 on mmapper (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mmapper



From pkgdb at fedoraproject.org  Thu Aug 13 00:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:00:48 +0000
Subject: [pkgdb] mmapper (Fedora, 10) updated by kevin
Message-ID: <20090813000055.DA88710F902@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mmapper
kevin has set commit to Approved for 107427 on mmapper (Fedora 10)
kevin has set checkout to Approved for 107427 on mmapper (Fedora 10)
kevin has set build to Approved for 107427 on mmapper (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mmapper



From pkgdb at fedoraproject.org  Thu Aug 13 00:00:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:00:48 +0000
Subject: [pkgdb] mmapper summary updated by kevin
Message-ID: <20090813000051.CA04E10F87B@bastion2.fedora.phx.redhat.com>

kevin set package mmapper summary to Graphical MUME mapper

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mmapper



From pkgdb at fedoraproject.org  Thu Aug 13 00:02:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:02:01 +0000
Subject: [pkgdb] cobertura summary updated by kevin
Message-ID: <20090813000204.57D2210F8E2@bastion2.fedora.phx.redhat.com>

kevin set package cobertura summary to Java tool for calculating the test coverage

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cobertura



From pkgdb at fedoraproject.org  Thu Aug 13 00:01:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:01:59 +0000
Subject: [pkgdb] cobertura was added for victorv
Message-ID: <20090813000202.8EDD410F8DF@bastion2.fedora.phx.redhat.com>

kevin has added Package cobertura with summary Java tool for calculating the test coverage
kevin has approved Package cobertura
kevin has added a Fedora devel branch for cobertura with an owner of victorv
kevin has approved cobertura in Fedora devel
kevin has approved Package cobertura
kevin has set commit to Approved for 107427 on cobertura (Fedora devel)
kevin has set checkout to Approved for 107427 on cobertura (Fedora devel)
kevin has set build to Approved for 107427 on cobertura (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cobertura



From pkgdb at fedoraproject.org  Thu Aug 13 00:02:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:02:01 +0000
Subject: [pkgdb] cobertura (Fedora, 10) updated by kevin
Message-ID: <20090813000207.8657810F8E0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cobertura
kevin has set commit to Approved for 107427 on cobertura (Fedora 11)
kevin has set checkout to Approved for 107427 on cobertura (Fedora 11)
kevin has set build to Approved for 107427 on cobertura (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cobertura



From kevin at fedoraproject.org  Thu Aug 13 00:02:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:02:12 +0000 (UTC)
Subject: rpms/cobertura - New directory
Message-ID: <20090813000212.1BE4111C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cobertura
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPg4571/rpms/cobertura

Log Message:
Directory /cvs/pkgs/rpms/cobertura added to the repository




From pkgdb at fedoraproject.org  Thu Aug 13 00:02:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:02:01 +0000
Subject: [pkgdb] cobertura (Fedora, 10) updated by kevin
Message-ID: <20090813000205.ECC5B10F8DB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cobertura
kevin has set commit to Approved for 107427 on cobertura (Fedora 10)
kevin has set checkout to Approved for 107427 on cobertura (Fedora 10)
kevin has set build to Approved for 107427 on cobertura (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cobertura



From kevin at fedoraproject.org  Thu Aug 13 00:02:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:02:12 +0000 (UTC)
Subject: rpms/cobertura/devel - New directory
Message-ID: <20090813000212.4727811C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPg4571/rpms/cobertura/devel

Log Message:
Directory /cvs/pkgs/rpms/cobertura/devel added to the repository




From kevin at fedoraproject.org  Thu Aug 13 00:02:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:02:18 +0000 (UTC)
Subject: rpms/cobertura Makefile,NONE,1.1
Message-ID: <20090813000218.A422111C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cobertura
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPg4571/rpms/cobertura

Added Files:
	Makefile 
Log Message:
Setup of module cobertura


--- NEW FILE Makefile ---
# Top level Makefile for module cobertura
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 13 00:02:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:02:18 +0000 (UTC)
Subject: rpms/cobertura/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090813000218.DE4C311C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPg4571/rpms/cobertura/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cobertura


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cobertura
# $Id: Makefile,v 1.1 2009/08/13 00:02:18 kevin Exp $
NAME := cobertura
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 13 00:03:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:03:08 +0000
Subject: [pkgdb] hyphen-fo summary updated by kevin
Message-ID: <20090813000315.9DBD710F898@bastion2.fedora.phx.redhat.com>

kevin set package hyphen-fo summary to Faroese hyphenation rules

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-fo



From pkgdb at fedoraproject.org  Thu Aug 13 00:03:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:03:07 +0000
Subject: [pkgdb] hyphen-fo was added for caolanm
Message-ID: <20090813000311.4F0BA10F947@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-fo with summary Faroese hyphenation rules
kevin has approved Package hyphen-fo
kevin has added a Fedora devel branch for hyphen-fo with an owner of caolanm
kevin has approved hyphen-fo in Fedora devel
kevin has approved Package hyphen-fo
kevin has set commit to Approved for 107427 on hyphen-fo (Fedora devel)
kevin has set checkout to Approved for 107427 on hyphen-fo (Fedora devel)
kevin has set build to Approved for 107427 on hyphen-fo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-fo



From kevin at fedoraproject.org  Thu Aug 13 00:03:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:03:18 +0000 (UTC)
Subject: rpms/hyphen-fo - New directory
Message-ID: <20090813000318.1864D11C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqA4932/rpms/hyphen-fo

Log Message:
Directory /cvs/pkgs/rpms/hyphen-fo added to the repository




From kevin at fedoraproject.org  Thu Aug 13 00:03:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:03:24 +0000 (UTC)
Subject: rpms/hyphen-fo Makefile,NONE,1.1
Message-ID: <20090813000324.E984D11C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqA4932/rpms/hyphen-fo

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-fo


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-fo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 13 00:03:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:03:18 +0000 (UTC)
Subject: rpms/hyphen-fo/devel - New directory
Message-ID: <20090813000318.411F011C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqA4932/rpms/hyphen-fo/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-fo/devel added to the repository




From kevin at fedoraproject.org  Thu Aug 13 00:03:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:03:25 +0000 (UTC)
Subject: rpms/hyphen-fo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090813000325.2D5A011C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqA4932/rpms/hyphen-fo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-fo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-fo
# $Id: Makefile,v 1.1 2009/08/13 00:03:25 kevin Exp $
NAME := hyphen-fo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 13 00:04:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:04:36 +0000 (UTC)
Subject: rpms/shotwell/devel - New directory
Message-ID: <20090813000436.4034811C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnJ5294/rpms/shotwell/devel

Log Message:
Directory /cvs/pkgs/rpms/shotwell/devel added to the repository




From pkgdb at fedoraproject.org  Thu Aug 13 00:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:04:25 +0000
Subject: [pkgdb] shotwell was added for mclasen
Message-ID: <20090813000430.90D3510F96D@bastion2.fedora.phx.redhat.com>

kevin has added Package shotwell with summary A photo organizer for the GNOME desktop
kevin has approved Package shotwell
kevin has added a Fedora devel branch for shotwell with an owner of mclasen
kevin has approved shotwell in Fedora devel
kevin has approved Package shotwell
kevin has set commit to Approved for 107427 on shotwell (Fedora devel)
kevin has set checkout to Approved for 107427 on shotwell (Fedora devel)
kevin has set build to Approved for 107427 on shotwell (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shotwell



From kevin at fedoraproject.org  Thu Aug 13 00:04:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:04:43 +0000 (UTC)
Subject: rpms/shotwell/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090813000443.6AD4B11C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnJ5294/rpms/shotwell/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shotwell


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shotwell
# $Id: Makefile,v 1.1 2009/08/13 00:04:43 kevin Exp $
NAME := shotwell
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 13 00:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:04:25 +0000
Subject: [pkgdb] shotwell was added for mclasen
Message-ID: <20090813000430.90D3510F96D@bastion2.fedora.phx.redhat.com>

kevin has added Package shotwell with summary A photo organizer for the GNOME desktop
kevin has approved Package shotwell
kevin has added a Fedora devel branch for shotwell with an owner of mclasen
kevin has approved shotwell in Fedora devel
kevin has approved Package shotwell
kevin has set commit to Approved for 107427 on shotwell (Fedora devel)
kevin has set checkout to Approved for 107427 on shotwell (Fedora devel)
kevin has set build to Approved for 107427 on shotwell (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shotwell



From kevin at fedoraproject.org  Thu Aug 13 00:07:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:07:25 +0000 (UTC)
Subject: rpms/pcc/devel - New directory
Message-ID: <20090813000725.40A2211C043B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pcc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqL6653/rpms/pcc/devel

Log Message:
Directory /cvs/pkgs/rpms/pcc/devel added to the repository




From pkgdb at fedoraproject.org  Thu Aug 13 00:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:07:18 +0000
Subject: [pkgdb] pcc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090813000720.DD17C10F8DF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pcc
kevin has set commit to Approved for 107427 on pcc (Fedora 11)
kevin has set checkout to Approved for 107427 on pcc (Fedora 11)
kevin has set build to Approved for 107427 on pcc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pcc



From kevin at fedoraproject.org  Thu Aug 13 00:04:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:04:43 +0000 (UTC)
Subject: rpms/shotwell/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090813000443.6AD4B11C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnJ5294/rpms/shotwell/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shotwell


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shotwell
# $Id: Makefile,v 1.1 2009/08/13 00:04:43 kevin Exp $
NAME := shotwell
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 13 00:13:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 13 Aug 2009 00:13:11 +0000 (UTC)
Subject: rpms/shotwell/devel import.log, NONE, 1.1 shotwell.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813001311.0985411C02C2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8353/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shotwell.spec 
Log Message:
initial import



--- NEW FILE import.log ---
shotwell-0_2_0-2_fc12:HEAD:shotwell-0.2.0-2.fc12.src.rpm:1250122068


--- NEW FILE shotwell.spec ---
Name:           shotwell
Version:        0.2.0
Release:        2%{?dist}
Summary:        A photo organizer for the GNOME desktop

Group:          Applications/Multimedia
# LGPLv2+ for the code
# CC-BY-SA for some of the icons
License:        LGPLv2+ and CC-BY-SA
URL:            http://www.yorba.org/shotwell/
Source0:        http://www.yorba.org/download/shotwell/0.2/shotwell-0.2.0.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  sqlite-devel
BuildRequires:  vala-devel
BuildRequires:  libgee-devel
BuildRequires:  hal-devel
BuildRequires:  dbus-glib-devel
BuildRequires:  unique-devel
BuildRequires:  libexif-devel
BuildRequires:  libgphoto2-devel
BuildRequires:  desktop-file-utils


%description
Shotwell is a new open source photo organizer designed for the GNOME desktop
environment. It allows you to import photos from your camera, view and edit
them, and share them with others.

%prep
%setup -q

%build
./configure --prefix=/usr
sed -i -e 's/\\n/\n/g' configure.mk
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :

%files
%defattr(-,root,root,-)
%doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
%{_bindir}/shotwell
%{_datadir}/shotwell
%{_datadir}/applications/shotwell.desktop
%{_datadir}/icons/hicolor/scalable/apps/shotwell.svg


%changelog
* Sun Aug 12 2009  Matthias Clasen <mclasen at redhat.com> - 0.2.0-2.fc12
- Bring icon cache handling in sync with current guidelines

* Sun Aug  9 2009  Matthias Clasen <mclasen at redhat.com> - 0.2.0-1.fc12
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:04:43 -0000	1.1
+++ .cvsignore	13 Aug 2009 00:13:10 -0000	1.2
@@ -0,0 +1 @@
+shotwell-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:04:43 -0000	1.1
+++ sources	13 Aug 2009 00:13:10 -0000	1.2
@@ -0,0 +1 @@
+2ea693170b4285d30015366d8c2844af  shotwell-0.2.0.tar.bz2



From kevin at fedoraproject.org  Thu Aug 13 00:07:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:07:25 +0000 (UTC)
Subject: rpms/pcc - New directory
Message-ID: <20090813000725.19E5111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pcc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqL6653/rpms/pcc

Log Message:
Directory /cvs/pkgs/rpms/pcc added to the repository




From kevin at fedoraproject.org  Thu Aug 13 00:04:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:04:36 +0000 (UTC)
Subject: rpms/shotwell/devel - New directory
Message-ID: <20090813000436.4034811C043C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnJ5294/rpms/shotwell/devel

Log Message:
Directory /cvs/pkgs/rpms/shotwell/devel added to the repository




From kevin at fedoraproject.org  Thu Aug 13 00:04:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:04:36 +0000 (UTC)
Subject: rpms/shotwell - New directory
Message-ID: <20090813000436.19E3111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shotwell
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnJ5294/rpms/shotwell

Log Message:
Directory /cvs/pkgs/rpms/shotwell added to the repository




From pkgdb at fedoraproject.org  Thu Aug 13 00:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:07:18 +0000
Subject: [pkgdb] pcc summary updated by kevin
Message-ID: <20090813000718.4355010F89C@bastion2.fedora.phx.redhat.com>

kevin set package pcc summary to The Portable C Compiler

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pcc



From kevin at fedoraproject.org  Thu Aug 13 00:07:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:07:32 +0000 (UTC)
Subject: rpms/pcc Makefile,NONE,1.1
Message-ID: <20090813000732.4FEE511C02C2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pcc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqL6653/rpms/pcc

Added Files:
	Makefile 
Log Message:
Setup of module pcc


--- NEW FILE Makefile ---
# Top level Makefile for module pcc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 13 00:04:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:04:43 +0000 (UTC)
Subject: rpms/shotwell Makefile,NONE,1.1
Message-ID: <20090813000443.3604711C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shotwell
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnJ5294/rpms/shotwell

Added Files:
	Makefile 
Log Message:
Setup of module shotwell


--- NEW FILE Makefile ---
# Top level Makefile for module shotwell
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 13 00:04:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:04:26 +0000
Subject: [pkgdb] shotwell summary updated by kevin
Message-ID: <20090813000434.2BDEA10F974@bastion2.fedora.phx.redhat.com>

kevin set package shotwell summary to A photo organizer for the GNOME desktop

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shotwell



From pkgdb at fedoraproject.org  Thu Aug 13 00:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:07:18 +0000
Subject: [pkgdb] pcc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090813000718.D5B7610F8BC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pcc
kevin has set commit to Approved for 107427 on pcc (Fedora 10)
kevin has set checkout to Approved for 107427 on pcc (Fedora 10)
kevin has set build to Approved for 107427 on pcc (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pcc



From pkgdb at fedoraproject.org  Thu Aug 13 00:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:07:16 +0000
Subject: [pkgdb] pcc was added for jussilehtola
Message-ID: <20090813000716.97C5E10F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package pcc with summary The Portable C Compiler
kevin has approved Package pcc
kevin has added a Fedora devel branch for pcc with an owner of jussilehtola
kevin has approved pcc in Fedora devel
kevin has approved Package pcc
kevin has set commit to Approved for 107427 on pcc (Fedora devel)
kevin has set checkout to Approved for 107427 on pcc (Fedora devel)
kevin has set build to Approved for 107427 on pcc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pcc



From kevin at fedoraproject.org  Thu Aug 13 00:07:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 13 Aug 2009 00:07:32 +0000 (UTC)
Subject: rpms/pcc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090813000732.792A511C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pcc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsqL6653/rpms/pcc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pcc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pcc
# $Id: Makefile,v 1.1 2009/08/13 00:07:32 kevin Exp $
NAME := pcc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 13 00:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:07:18 +0000
Subject: [pkgdb] pcc (Fedora EPEL, 5) updated by kevin
Message-ID: <20090813000719.D20DD10F8D7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pcc
kevin has set commit to Approved for 107427 on pcc (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pcc (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pcc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pcc



From otaylor at fedoraproject.org  Thu Aug 13 00:07:57 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu, 13 Aug 2009 00:07:57 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813000757.20AB311C02C2@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7024/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-shell.spec import.log 
Log Message:
Initial import (#516654).


--- NEW FILE gnome-shell.spec ---
Name:           gnome-shell
Version:        2.27.0
Release:        4
Summary:        Window management and application launching for GNOME

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://live.gnome.org/GnomeShell
Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.27/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%define clutter_version 1.0.0
%define mutter_version 2.27.2

BuildRequires:  clutter-devel >= %{clutter_version}
BuildRequires:  dbus-glib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gir-repository-devel
BuildRequires:  gjs-devel
BuildRequires:  glib2-devel
BuildRequires:  gnome-menus-devel
# for screencast recorder functionality
BuildRequires:  gstreamer-devel
BuildRequires:  gtk2-devel
# temporary until GnomeThumbnailFactory => GnomeDesktopThumbnailFactory
BuildRequires:  libgnomeui-devel
# used in unused BigThemeImage
BuildRequires:  librsvg2-devel
BuildRequires:  mutter-devel >= %{mutter_version}

# wrapper script uses to see if gnome-panel is running
Requires:       dbus-python
# For %pre/%post usage of gconftool-2
Requires:       GConf2
# wrapper script uses to figure out available GLX capabilities
Requires:       glx-utils
# needed for loading SVG's via gdk-pixbuf
Requires:       librsvg2
Requires:       mutter >= %{mutter_version}
# These are needed to run gnome-shell nested Xephyr mode, but that's a
# developer-only thing and unlikely to be interesting for a normal user
#Requires:       xorg-x11-server-Xephyr
#Requires:       xorg-x11-xauth

%description
GNOME Shell provides core user interface functions for the GNOME 3 desktop,
like switching to windows and launching applications. GNOME Shell takes
advantage of the capabilities of modern graphics hardware and introduces
innovative user interface concepts to provide a visually attractive and
easy to use experience.

%prep
%setup -q

%build
%configure

# 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

# http://bugzilla.gnome.org/show_bug.cgi?id=591474
# make %{?_smp_mflags}
make

%install
rm -rf %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

rm -rf %{buildroot}/%{_libdir}/mutter/plugins/*.la

desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-shell.desktop

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/gnome-shell
%{_datadir}/applications/gnome-shell.desktop
%{_datadir}/gnome-shell/
%{_libdir}/gnome-shell/
%{_libdir}/mutter/plugins/libgnome-shell.so
%{_sysconfdir}/gconf/schemas/gnome-shell.schemas

%pre
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/gnome-shell.schemas \
    > /dev/null || :
fi

%preun
if [ "$1" -gt 0 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/gnome-shell.schemas \
    > /dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
    %{_sysconfdir}/gconf/schemas/gnome-shell.schemas \
  > /dev/null || :

%changelog
* Wed Aug 12 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-4
- Add an explicit dependency on GConf2 for pre/post

* Tue Aug 11 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-3
- Add missing BuildRequires on gir-repository-devel

* Tue Aug 11 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-2
- Temporarily use a non-parallel-build until gnome-shell is fixed

* Mon Aug 10 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-1
- Initial version


--- NEW FILE import.log ---
gnome-shell-2_27_0-4:HEAD:gnome-shell-2.27.0-4.src.rpm:1250122041


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:56:03 -0000	1.1
+++ .cvsignore	13 Aug 2009 00:07:56 -0000	1.2
@@ -0,0 +1 @@
+gnome-shell-2.27.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:56:03 -0000	1.1
+++ sources	13 Aug 2009 00:07:57 -0000	1.2
@@ -0,0 +1 @@
+372771ace3aeb34b0a689f917bb68f10  gnome-shell-2.27.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Aug 13 00:14:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:14:43 +0000
Subject: [pkgdb] gnome-do: palango has requested watchcommits
Message-ID: <20090813001445.C052510F92E@bastion2.fedora.phx.redhat.com>

palango has requested the watchcommits acl on gnome-do (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 13 00:14:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:14:44 +0000
Subject: [pkgdb] gnome-do: palango has requested commit
Message-ID: <20090813001446.5D98910F92F@bastion2.fedora.phx.redhat.com>

palango has requested the commit acl on gnome-do (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From behdad at fedoraproject.org  Thu Aug 13 00:15:42 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu, 13 Aug 2009 00:15:42 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.92, 1.93 pango.spec, 1.172,
	1.173 sources, 1.93, 1.94
Message-ID: <20090813001542.36CF511C02C2@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9149

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Tue Aug 11 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.3-1
- 1.25.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- .cvsignore	11 Aug 2009 14:41:17 -0000	1.92
+++ .cvsignore	13 Aug 2009 00:15:41 -0000	1.93
@@ -1 +1 @@
-pango-1.25.2.tar.bz2
+pango-1.25.3.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- pango.spec	11 Aug 2009 14:41:17 -0000	1.172
+++ pango.spec	13 Aug 2009 00:15:41 -0000	1.173
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.25.2
+Version: 1.25.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -76,7 +76,7 @@ for the pango package.
 %build
 
 # We try hard to not link to libstdc++
-%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc CXXFLAGS="${CXXFLAGS/-fexceptions/}"
+%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc
 make
 
 %install
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.3-1
+- 1.25.3
+
 * Tue Aug 11 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.2-1
 - 1.25.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- sources	11 Aug 2009 14:41:17 -0000	1.93
+++ sources	13 Aug 2009 00:15:42 -0000	1.94
@@ -1 +1 @@
-22cc2affdb660049932b16b61c76214a  pango-1.25.2.tar.bz2
+f0ec03e56931f63c9a759a0321164e84  pango-1.25.3.tar.bz2



From pkgdb at fedoraproject.org  Thu Aug 13 00:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 00:14:49 +0000
Subject: [pkgdb] gnome-do: palango has requested watchbugzilla
Message-ID: <20090813001451.4E68310F8C4@bastion2.fedora.phx.redhat.com>

palango has requested the watchbugzilla acl on gnome-do (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From jistone at fedoraproject.org  Thu Aug 13 00:17:24 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Thu, 13 Aug 2009 00:17:24 +0000 (UTC)
Subject: rpms/systemtap/devel systemtap.spec,1.50,1.51
Message-ID: <20090813001724.9BAD711C02C2@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9568

Modified Files:
	systemtap.spec 
Log Message:
Fix uprobes error suppression


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- systemtap.spec	5 Aug 2009 04:00:44 -0000	1.50
+++ systemtap.spec	13 Aug 2009 00:17:24 -0000	1.51
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -281,13 +281,13 @@ exit 0
 
 %post
 # Remove any previously-built uprobes.ko materials
-(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
-(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
+(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 2>&1 || true
 
 %preun
 # Ditto
-(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
-(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
+(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 2>&1 || true
 
 %files
 %defattr(-,root,root)
@@ -381,6 +381,10 @@ exit 0
 
 
 %changelog
+* Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
+- Fix uprobes error suppression in %post and %preun (#515870)
+  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
+
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
 - Rebuild with correct sources.
 



From jistone at fedoraproject.org  Thu Aug 13 00:17:52 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Thu, 13 Aug 2009 00:17:52 +0000 (UTC)
Subject: rpms/systemtap/F-11 systemtap.spec,1.49,1.50
Message-ID: <20090813001752.38C3511C02C2@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9710

Modified Files:
	systemtap.spec 
Log Message:
Fix uprobes error suppression


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/systemtap.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- systemtap.spec	5 Aug 2009 04:04:18 -0000	1.49
+++ systemtap.spec	13 Aug 2009 00:17:52 -0000	1.50
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -281,13 +281,13 @@ exit 0
 
 %post
 # Remove any previously-built uprobes.ko materials
-(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
-(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
+(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 2>&1 || true
 
 %preun
 # Ditto
-(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
-(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
+(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 2>&1 || true
 
 %files
 %defattr(-,root,root)
@@ -381,6 +381,10 @@ exit 0
 
 
 %changelog
+* Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
+- Fix uprobes error suppression in %post and %preun (#515870)
+  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
+
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
 - Rebuild with correct sources.
 



From jistone at fedoraproject.org  Thu Aug 13 00:17:55 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Thu, 13 Aug 2009 00:17:55 +0000 (UTC)
Subject: rpms/systemtap/F-10 systemtap.spec,1.47,1.48
Message-ID: <20090813001755.69B8D11C02C2@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9738

Modified Files:
	systemtap.spec 
Log Message:
Fix uprobes error suppression


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/systemtap.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- systemtap.spec	5 Aug 2009 04:05:41 -0000	1.47
+++ systemtap.spec	13 Aug 2009 00:17:55 -0000	1.48
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 0.9.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -281,13 +281,13 @@ exit 0
 
 %post
 # Remove any previously-built uprobes.ko materials
-(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
-(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
+(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 2>&1 || true
 
 %preun
 # Ditto
-(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 3>&1 || true
-(/sbin/rmmod uprobes) >/dev/null 3>&1 || true
+(make -C /usr/share/systemtap/runtime/uprobes clean) >/dev/null 2>&1 || true
+(/sbin/rmmod uprobes) >/dev/null 2>&1 || true
 
 %files
 %defattr(-,root,root)
@@ -381,6 +381,10 @@ exit 0
 
 
 %changelog
+* Wed Aug 12 2009 Josh Stone <jistone at redhat.com> - 0.9.9-3
+- Fix uprobes error suppression in %post and %preun (#515870)
+  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
+
 * Tue Aug  4 2009 Josh Stone <jistone at redhat.com> - 0.9.9-2
 - Rebuild with correct sources.
 



From victorv at fedoraproject.org  Thu Aug 13 00:23:09 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Thu, 13 Aug 2009 00:23:09 +0000 (UTC)
Subject: rpms/cobertura/devel cobertura-1.9.pom, NONE,
	1.1 cobertura-build_xml.patch, NONE,
	1.1 cobertura-runtime-1.9.pom, NONE, 1.1 cobertura-scripts.patch,
	NONE, 1.1 cobertura.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813002309.8D9AB11C02C2@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11081/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cobertura-1.9.pom cobertura-build_xml.patch 
	cobertura-runtime-1.9.pom cobertura-scripts.patch 
	cobertura.spec import.log 
Log Message:
Initial version



--- NEW FILE cobertura-1.9.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>JPP</groupId>
  <artifactId>cobertura</artifactId>
  <version>1.9</version>

  <dependencies>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>oro</artifactId>
      <version>2.0.8</version>
    </dependency>
    <dependency>
      <groupId>JPP/asm2</groupId>
      <artifactId>asm2</artifactId>
      <version>2.2.1</version>
    </dependency>
    <dependency>
      <groupId>JPP/asm2</groupId>
      <artifactId>asm2-tree</artifactId>
      <version>2.2.1</version>
    </dependency>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>log4j</artifactId>
      <version>1.2.9</version>
    </dependency>
  </dependencies>

</project>

cobertura-build_xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cobertura-build_xml.patch ---
--- build.xml.sav	2007-07-19 18:03:37.000000000 +0200
+++ build.xml	2007-07-19 18:05:47.000000000 +0200
@@ -236,7 +236,7 @@
 			<report format="frames" todir="${build.reports.dir}/junit-html" />
 		</junitreport>
 
-		<fail message="Tests failed." if="test.failed" />
+		<echo message="Tests failed is ${test.failed}" />
 	</target>
 
 	<target name="coverage-report">


--- NEW FILE cobertura-runtime-1.9.pom ---
<?xml version="1.0" ?>
<project>
  <modelVersion>4.0.0</modelVersion>

  <groupId>net.sourceforge.cobertura</groupId>
  <artifactId>cobertura-runtime</artifactId>
  <name>Cobertura :: Limited Runtime</name>
  <version>1.9</version>
  <packaging>pom</packaging>

  <description>
    Cobertura Runtime artifact to prevent unneeded dependencies at runtime.
  </description>

  <licenses>
    <license>
      <name>The GNU General Public License, Version 2</name>
      <url>http://www.gnu.org/licenses/gpl.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>

  <dependencies>
    <dependency>
      <groupId>net.sourceforge.cobertura</groupId>
      <artifactId>cobertura</artifactId>
      <version>1.9</version>
      <exclusions>
        <exclusion>
          <groupId>oro</groupId>
          <artifactId>oro</artifactId>
        </exclusion>
        <exclusion>
          <groupId>asm</groupId>
          <artifactId>asm</artifactId>
        </exclusion>
        <exclusion>
          <groupId>asm</groupId>
          <artifactId>asm-tree</artifactId>
        </exclusion>
        <exclusion>
          <groupId>log4j</groupId>
          <artifactId>log4j</artifactId>
        </exclusion>
      </exclusions>
    </dependency>
  </dependencies>

</project>

cobertura-scripts.patch:
 cobertura-check.sh      |   10 +++++++++-
 cobertura-instrument.sh |   10 +++++++++-
 cobertura-merge.sh      |   10 +++++++++-
 cobertura-report.sh     |   10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

--- NEW FILE cobertura-scripts.patch ---
--- cobertura-check.sh.sav	2007-06-05 20:39:54.000000000 +0200
+++ cobertura-check.sh	2007-07-20 15:12:12.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.check.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.check.Main $*
--- cobertura-instrument.sh.sav	2007-06-05 20:39:53.000000000 +0200
+++ cobertura-instrument.sh	2007-07-20 15:12:19.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.instrument.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.instrument.Main $*
--- cobertura-merge.sh.sav	2007-06-05 20:39:54.000000000 +0200
+++ cobertura-merge.sh	2007-07-20 15:12:28.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.merge.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.merge.Main $*
--- cobertura-report.sh.sav	2007-06-05 20:39:53.000000000 +0200
+++ cobertura-report.sh	2007-07-20 15:12:34.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.reporting.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.reporting.Main $*


--- NEW FILE cobertura.spec ---
Name:           cobertura
Version:        1.9
Release:        2%{?dist}
Summary:        Free Java tool that calculates the percentage of code accessed by tests

Group:          Development/Libraries
License:        ASL 1.1 and GPLv2+
URL:            http://cobertura.sourceforge.net/

Source0:        http://prdownloads.sourceforge.net/cobertura/cobertura-1.9-src.tar.gz
Source1:        %{name}-%{version}.pom
Source2:        %{name}-runtime-%{version}.pom
Patch0:         cobertura-build_xml.patch
Patch1:         cobertura-scripts.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  ant-trax
BuildRequires:  asm2
BuildRequires:  dos2unix
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  java-devel
BuildRequires:  jakarta-oro
BuildRequires:  jaxen
BuildRequires:  jdom
BuildRequires:  junit
BuildRequires:  log4j
BuildRequires:  xalan-j2
BuildRequires:  xerces-j2
BuildRequires:  xml-commons-jaxp-1.3-apis

Requires:       ant >= 0:1.6.5
Requires:       asm2
Requires:       jpackage-utils >= 0:1.7.3
Requires:       java
Requires:       jakarta-oro
Requires:       junit
Requires:       log4j

Requires(post): jpackage-utils >= 0:1.7.3
Requires(postun): jpackage-utils >= 0:1.7.3

BuildArch:      noarch

%description
Cobertura is a free Java tool that calculates the percentage of code 
accessed by tests. It can be used to identify which parts of your 
Java program are lacking test coverage. It is based on jcoverage.

Features

    * Can be executed from ant or from the command line.
    * Instruments Java bytecode after it has been compiled.
    * Can generate reports in HTML or XML.
    * Shows percent of lines coveraged and branches coveraged for each
      class, package, and for the overall project.
    * Shows the McCabe cyclomatic code complexity of each class, and
      the average cyclomatic code complexity for each package, and for
      the overall product.
    * Can sort HTML results by class name, percent of lines covered,
      percent of branches covered, etc. And can sort in ascending or
      decending order.

NOTE: Due to asm version conflicts, if you use Cobertura as an ant
      task you MUST add manually a classpath element 

        <classpath location="/usr/share/java/asm2/asm2.jar"/>

      to all Cobertura tasks requiring bytecode manipulation.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       %{name}-%{version}-%{release}

%description    javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q
%patch0 -b .sav
%patch1 -b .sav
find . -type f -name '*.jar' | xargs -t rm

dos2unix -k ChangeLog COPYING COPYRIGHT README

%build
pushd lib
%__ln_s -f %{_javadir}/asm2/asm2.jar
%__ln_s -f %{_javadir}/asm2/asm2-tree.jar
%__ln_s -f %{_javadir}/jaxen.jar
%__ln_s -f %{_javadir}/jdom.jar
%__ln_s -f %{_javadir}/junit.jar
%__ln_s -f %{_javadir}/oro.jar
%__ln_s -f %{_javadir}/log4j.jar
%__ln_s -f %{_javadir}/xalan-j2.jar
pushd xerces
%__ln_s -f %{_javadir}/xerces-j2.jar
%__ln_s -f %{_javadir}/xml-commons-jaxp-1.3-apis.jar
popd
popd

export CLASSPATH=
export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
%ant compile test jar javadoc

%install
%__rm -rf %{buildroot}

# jar
%__mkdir_p %{buildroot}%{_javadir}
%__cp -a %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
%__ln_s ${jar} ${jar/-%{version}/}; done)
%add_to_maven_depmap cobertura cobertura %{version} JPP %{name}
%add_to_maven_depmap cobertura cobertura-runtime %{version} JPP %{name}
%add_to_maven_depmap net.sourceforge.cobertura cobertura %{version} JPP %{name}
%add_to_maven_depmap net.sourceforge.cobertura cobertura-runtime %{version} JPP %{name}

# pom
%__mkdir_p %{buildroot}%{_datadir}/maven2/poms
%__cp -a %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
%__cp -a %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-runtime.pom

%__mkdir_p  %{buildroot}%{_sysconfdir}/ant.d
%__cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
ant cobertura junit log4j oro xerces-j2
EOF

# bin
%__mkdir_p %{buildroot}%{_bindir}
%__install -m 755 cobertura-check.sh %{buildroot}%{_bindir}/cobertura-check
%__install -m 755 cobertura-instrument.sh %{buildroot}%{_bindir}/cobertura-instrument
%__install -m 755 cobertura-merge.sh %{buildroot}%{_bindir}/cobertura-merge
%__install -m 755 cobertura-report.sh %{buildroot}%{_bindir}/cobertura-report

# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
%__cp -a build/api/* %{buildroot}%{_javadocdir}/%{name}

%clean
%__rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING COPYRIGHT README
%attr(0755,root,root) %{_bindir}/*
%{_javadir}/*.jar
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
%{_datadir}/maven2/poms/JPP-%{name}*.pom
%config(noreplace) %{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}

%changelog
* Sun Aug 09 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-2
- The license tag is changed according to http://cobertura.sourceforge.net/license.html
* Fri Jun 19 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-1
- release 1.9


--- NEW FILE import.log ---
cobertura-1_9-2_fc12:HEAD:cobertura-1.9-2.fc12.src.rpm:1250123324


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:02:18 -0000	1.1
+++ .cvsignore	13 Aug 2009 00:23:09 -0000	1.2
@@ -0,0 +1 @@
+cobertura-1.9-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:02:18 -0000	1.1
+++ sources	13 Aug 2009 00:23:09 -0000	1.2
@@ -0,0 +1 @@
+0b23286374edc1e0a9ed7dd592b0fed3  cobertura-1.9-src.tar.gz



From mclasen at fedoraproject.org  Thu Aug 13 00:27:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 13 Aug 2009 00:27:03 +0000 (UTC)
Subject: rpms/shotwell/devel shotwell.spec,1.1,1.2
Message-ID: <20090813002703.1F91711C02C2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12045

Modified Files:
	shotwell.spec 
Log Message:
Use standard CFLAGS



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shotwell.spec	13 Aug 2009 00:13:10 -0000	1.1
+++ shotwell.spec	13 Aug 2009 00:27:02 -0000	1.2
@@ -34,6 +34,7 @@ them, and share them with others.
 %build
 ./configure --prefix=/usr
 sed -i -e 's/\\n/\n/g' configure.mk
+sed -i -e 's/^CFLAGS = .*$/CFLAGS=%{optflags}/' Makefile
 make %{?_smp_mflags}
 
 



From bojan at fedoraproject.org  Thu Aug 13 01:20:37 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu, 13 Aug 2009 01:20:37 +0000 (UTC)
Subject: rpms/viewvc/devel viewvc-lexer-mimetypes.py, 1.1, 1.2 viewvc.spec, 
	1.22, 1.23
Message-ID: <20090813012037.5552F11C0489@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24424

Modified Files:
	viewvc-lexer-mimetypes.py viewvc.spec 
Log Message:
Better mimetypes.conf generation script.


Index: viewvc-lexer-mimetypes.py
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc-lexer-mimetypes.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- viewvc-lexer-mimetypes.py	11 Aug 2009 03:21:21 -0000	1.1
+++ viewvc-lexer-mimetypes.py	13 Aug 2009 01:20:37 -0000	1.2
@@ -20,6 +20,18 @@ for fullname, names, exts, mimetype in g
             print exts[i][2:],
           if i == len(exts)-1:
             print
+  elif len(exts) == 1:
+    for i in range(len(mimetype)):
+      if re.match('\*\.',exts[0]):
+        if re.search('\[[0-9]+\]',exts[0]):
+          s=re.search('\[[0-9]+\]',exts[0]).span()[0]+1
+          e=re.search('\[[0-9]+\]',exts[0]).span()[1]-1
+          print mimetype[i],
+          for k in range(s,e):
+            print exts[0][2:s-1]+exts[0][k]+exts[0][e+1:],
+          print
+        else:
+          print mimetype[i], exts[0][2:]
   else:
     for i in range(len(mimetype)):
       if len(exts) > i:


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- viewvc.spec	12 Aug 2009 03:05:17 -0000	1.22
+++ viewvc.spec	13 Aug 2009 01:20:37 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-3
+- better mimetypes.conf generation script
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
 - fix replacement of various config variables
 



From bojan at fedoraproject.org  Thu Aug 13 01:24:16 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu, 13 Aug 2009 01:24:16 +0000 (UTC)
Subject: rpms/viewvc/F-11 viewvc-lexer-mimetypes.py, 1.1, 1.2 viewvc.spec,
	1.21, 1.22
Message-ID: <20090813012416.61FC311C02C2@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25338

Modified Files:
	viewvc-lexer-mimetypes.py viewvc.spec 
Log Message:
Better mimetypes.conf generation script.


Index: viewvc-lexer-mimetypes.py
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc-lexer-mimetypes.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- viewvc-lexer-mimetypes.py	11 Aug 2009 03:26:33 -0000	1.1
+++ viewvc-lexer-mimetypes.py	13 Aug 2009 01:24:16 -0000	1.2
@@ -20,6 +20,18 @@ for fullname, names, exts, mimetype in g
             print exts[i][2:],
           if i == len(exts)-1:
             print
+  elif len(exts) == 1:
+    for i in range(len(mimetype)):
+      if re.match('\*\.',exts[0]):
+        if re.search('\[[0-9]+\]',exts[0]):
+          s=re.search('\[[0-9]+\]',exts[0]).span()[0]+1
+          e=re.search('\[[0-9]+\]',exts[0]).span()[1]-1
+          print mimetype[i],
+          for k in range(s,e):
+            print exts[0][2:s-1]+exts[0][k]+exts[0][e+1:],
+          print
+        else:
+          print mimetype[i], exts[0][2:]
   else:
     for i in range(len(mimetype)):
       if len(exts) > i:


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- viewvc.spec	12 Aug 2009 03:05:26 -0000	1.21
+++ viewvc.spec	13 Aug 2009 01:24:16 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-3
+- better mimetypes.conf generation script
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
 - fix replacement of various config variables
 



From mbarnes at fedoraproject.org  Thu Aug 13 01:23:36 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 13 Aug 2009 01:23:36 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.23, 1.24 devhelp.spec, 1.111,
	1.112 sources, 1.23,
	1.24 devhelp-0.23-deprecation-workaround.patch, 1.1, NONE
Message-ID: <20090813012336.A933211C02C2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25115

Modified Files:
	.cvsignore devhelp.spec sources 
Removed Files:
	devhelp-0.23-deprecation-workaround.patch 
Log Message:

* Wed Aug 12 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23.1-1
- Update to 0.23.1
- Remove patch for GNOME bug #588655 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	20 Jan 2009 01:43:11 -0000	1.23
+++ .cvsignore	13 Aug 2009 01:23:36 -0000	1.24
@@ -1 +1 @@
-devhelp-0.23.tar.bz2
+devhelp-0.23.1.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- devhelp.spec	24 Jul 2009 20:11:20 -0000	1.111
+++ devhelp.spec	13 Aug 2009 01:23:36 -0000	1.112
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.23
-Release: 9%{?dist}
+Version: 0.23.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
@@ -19,9 +19,6 @@ BuildRoot: %{_tmppath}/devhelp-%{version
 # RH bug #572022
 Patch0: devhelp-load-uris.patch
 
-# GNOME bug #588655
-Patch1: devhelp-0.23-deprecation-workaround.patch
-
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -59,7 +56,6 @@ into other applications such as IDEs.
 %prep
 %setup -q -n devhelp-%{version}
 %patch0 -p0 -b .uris
-%patch1 -p1 -b .deprecation-workaround
 
 # force regeneration
 rm data/devhelp.schemas
@@ -146,6 +142,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Aug 12 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23.1-1
+- Update to 0.23.1
+- Remove patch for GNOME bug #588655 (fixed upstream).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	20 Jan 2009 01:43:11 -0000	1.23
+++ sources	13 Aug 2009 01:23:36 -0000	1.24
@@ -1 +1 @@
-704c0c90616aeb1c52ca3af1df93fde6  devhelp-0.23.tar.bz2
+9bb80a1e82eb0de57cdd7f4234880b2f  devhelp-0.23.1.tar.bz2


--- devhelp-0.23-deprecation-workaround.patch DELETED ---



From mclasen at fedoraproject.org  Thu Aug 13 01:29:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 13 Aug 2009 01:29:25 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-config.patch, NONE, 1.1 nautilus.spec, 
	1.279, 1.280
Message-ID: <20090813012925.82D7811C02C2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26379

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-config.patch 
Log Message:
Turn off autorun for x-content/software


nautilus-config.patch:
 apps_nautilus_preferences.schemas.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE nautilus-config.patch ---
diff -up nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in.config nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in
--- nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in.config	2009-08-12 21:07:44.331994084 -0400
+++ nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in	2009-08-12 21:26:31.258991695 -0400
@@ -149,7 +149,7 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/nautilus/preferences/media_autorun_never_</key>
+      <key>/schemas/apps/nautilus/preferences/media_autorun_never</key>
       <applyto>/apps/nautilus/preferences/media_autorun_never</applyto>
       <owner>nautilus</owner>
       <type>bool</type>
@@ -169,7 +169,7 @@
       <owner>nautilus</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[x-content/software]</default>
+      <default>[]</default>
       <locale name="C">
          <short>List of x-content/* types where the preferred application will be launched</short>
          <long>
@@ -187,7 +187,7 @@
       <owner>nautilus</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[]</default>
+      <default>[x-content/software]</default>
       <locale name="C">
          <short>List of x-content/* types set to "Do Nothing"</short>
          <long>


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- nautilus.spec	3 Aug 2009 23:20:23 -0000	1.279
+++ nautilus.spec	13 Aug 2009 01:29:25 -0000	1.280
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.27.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -70,7 +70,7 @@ Obsoletes:      gnome-volume-manager < 2
 #Obsoletes:	eel2 < 2.25.1-4.fc10
 
 # Some changes to default config
-Patch1:         nautilus-2.5.7-rhconfig.patch
+Patch1:         nautilus-config.patch
 
 Patch5:		nautilus-2.23.5-selinux.patch
 
@@ -119,7 +119,7 @@ for developing nautilus extensions.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch1 -p1 -b .rhconfig
+%patch1 -p1 -b .config
 %patch5 -p1 -b .selinux
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
@@ -268,6 +268,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-5
+- Turn off autorun for x-content/software
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-4
 - Show icons for bookmarks and similar in menus
 



From dcantrel at fedoraproject.org  Thu Aug 13 01:55:18 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 13 Aug 2009 01:55:18 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.656, 1.657 anaconda.spec, 1.806, 
	1.807 sources, 1.790, 1.791
Message-ID: <20090813015518.EB68011C02C2@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31597

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12.14-1
- Correctly inform the user once about obsolete parm/conf file options on
  s390 (maier)
- Handle activation of DASDs in linuxrc.s390 since loader no longer works
  (maier)
- make IPv4 configuration in linuxrc.s390 compatible with NM in loader
  (maier)
- suggest disabled X11-forwarding for ssh login in linuxrc.s390 (maier)
- Fix an erroneous "!" in the test for doKill, and make reboot explicit.
  (pjones)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -p -r1.656 -r1.657
--- .cvsignore	11 Aug 2009 04:57:41 -0000	1.656
+++ .cvsignore	13 Aug 2009 01:55:18 -0000	1.657
@@ -1 +1 @@
-anaconda-12.13.tar.bz2
+anaconda-12.14.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -p -r1.806 -r1.807
--- anaconda.spec	11 Aug 2009 04:57:41 -0000	1.806
+++ anaconda.spec	13 Aug 2009 01:55:18 -0000	1.807
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.13
+Version: 12.14
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -209,6 +209,17 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12.14-1
+- Correctly inform the user once about obsolete parm/conf file options on
+  s390 (maier)
+- Handle activation of DASDs in linuxrc.s390 since loader no longer works
+  (maier)
+- make IPv4 configuration in linuxrc.s390 compatible with NM in loader
+  (maier)
+- suggest disabled X11-forwarding for ssh login in linuxrc.s390 (maier)
+- Fix an erroneous "!" in the test for doKill, and make reboot explicit.
+  (pjones)
+
 * Mon Aug 10 2009 David Cantrell <dcantrell at redhat.com> - 12.13-1
 - Fix syntax error in identifyMultipaths() (dcantrell)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -p -r1.790 -r1.791
--- sources	11 Aug 2009 04:57:41 -0000	1.790
+++ sources	13 Aug 2009 01:55:18 -0000	1.791
@@ -1 +1 @@
-5fcbf356ea84061d5c8bc58058d50f50  anaconda-12.13.tar.bz2
+8080b01d8f67c75003c9830b0337555d  anaconda-12.14.tar.bz2



From victorv at fedoraproject.org  Thu Aug 13 02:29:07 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Thu, 13 Aug 2009 02:29:07 +0000 (UTC)
Subject: rpms/netbeans-platform/devel
	netbeans-platform-6.7.1-build_bootstrap.patch, NONE,
	1.1 netbeans-platform-6.7.1-javac.patch, NONE,
	1.1 netbeans-platform-6.7.1-properties.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 netbeans-platform.spec, 1.4, 1.5 sources, 1.2,
	1.3 netbeans-platform-6.5-build_bootstrap.patch, 1.1,
	NONE netbeans-platform-6.5-properties.patch, 1.1,
	NONE netbeans-platform-6.5-win_launcher.patch, 1.1, NONE
Message-ID: <20090813022907.EC10111C02C2@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5524/devel

Modified Files:
	.cvsignore import.log netbeans-platform.spec sources 
Added Files:
	netbeans-platform-6.7.1-build_bootstrap.patch 
	netbeans-platform-6.7.1-javac.patch 
	netbeans-platform-6.7.1-properties.patch 
Removed Files:
	netbeans-platform-6.5-build_bootstrap.patch 
	netbeans-platform-6.5-properties.patch 
	netbeans-platform-6.5-win_launcher.patch 
Log Message:
Re-base for the NetBeans 6.7.1


netbeans-platform-6.7.1-build_bootstrap.patch:
 build.xml |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE netbeans-platform-6.7.1-build_bootstrap.patch ---
diff -Nur netbeans-platform-6.7/o.n.bootstrap/build.xml netbeans-platform-6.7.new/o.n.bootstrap/build.xml
--- netbeans-platform-6.7/o.n.bootstrap/build.xml	2009-05-21 02:24:48.000000000 +0400
+++ netbeans-platform-6.7.new/o.n.bootstrap/build.xml	2009-05-21 02:51:50.000000000 +0400
@@ -65,8 +65,10 @@
     <target name="release" depends="init">
         <copy file="launcher/unix/nbexec" todir="${cluster}/lib" />
         <chmod file="${cluster}/lib/nbexec" perm="ugo+rx"/>
+<!--
         <copy file="launcher/windows/nbexec.exe" todir="${cluster}/lib/" />
         <copy file="launcher/windows/nbexec.dll" todir="${cluster}/lib/" />
+-->
         <fixcrlf srcdir="${cluster}/lib" eol="lf">
             <include name="**/*.sh"/>
             <include name="**/ide.cfg"/>

netbeans-platform-6.7.1-javac.patch:
 project.properties |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-platform-6.7.1-javac.patch ---
diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.7.1/apisupport.harness/nbproject/project.properties libnb-platform-java-6.7.1.new/apisupport.harness/nbproject/project.properties
--- libnb-platform-java-6.7.1/apisupport.harness/nbproject/project.properties	2009-07-21 23:25:00.000000000 +0400
+++ libnb-platform-java-6.7.1.new/apisupport.harness/nbproject/project.properties	2009-07-23 20:27:05.000000000 +0400
@@ -48,7 +48,7 @@
 release.../nbbuild/templates/no-testcoverage.xml=no-testcoverage.xml
 release.../nbbuild/jdk.xml=jdk.xml
 release.external/jsearch-2.0_05.jar=antlib/jsearch-2.0_05.jar
-release.external/openjdk-javac-6-b12.jar=antlib/openjdk-javac-6-b12.jar
+#release.external/openjdk-javac-6-b12.jar=antlib/openjdk-javac-6-b12.jar
 extra.module.files=\
     jnlp/jnlp-launcher.jar,\
     tasks.jar

netbeans-platform-6.7.1-properties.patch:
 project.properties |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netbeans-platform-6.7.1-properties.patch ---
--- netbeans-platform-6.7/o.jdesktop.layout/nbproject/project.properties	2009-07-08 19:15:21.000000000 +0400
+++ netbeans-platform-6.7.new/o.jdesktop.layout/nbproject/project.properties	2009-07-08 19:29:40.000000000 +0400
@@ -39,7 +39,7 @@
 
 is.autoload=true
 release.external/swing-layout-1.0.3.jar=modules/ext/swing-layout-1.0.3.jar
-release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
-release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
+#release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
+#release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.3-doc.zip, docs/swing-layout-1.0.3-src.zip
 spec.version.base=1.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jan 2009 13:14:33 -0000	1.2
+++ .cvsignore	13 Aug 2009 02:29:07 -0000	1.3
@@ -1 +1 @@
-netbeans-6.5-200811100001-ml-platform-src.zip
+netbeans-6.7.1-200907230233-platform-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jan 2009 13:14:33 -0000	1.1
+++ import.log	13 Aug 2009 02:29:07 -0000	1.2
@@ -1 +1,2 @@
 netbeans-platform-6_5-4_fc11:HEAD:netbeans-platform-6.5-4.fc11.src.rpm:1231938808
+netbeans-platform-6_7_1-1_fc12:HEAD:netbeans-platform-6.7.1-1.fc12.src.rpm:1250130860


Index: netbeans-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/netbeans-platform.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netbeans-platform.spec	25 Jul 2009 18:02:08 -0000	1.4
+++ netbeans-platform.spec	13 Aug 2009 02:29:07 -0000	1.5
@@ -2,12 +2,12 @@
 %define __jar_repack %{nil}
 
 %define nb_             netbeans
-%define nb_ver          6.5
-%define nb_release_time 200811100001
+%define nb_ver          6.7.1
+%define nb_release_time 200907230233
 %define nb_home         %{_datadir}/%{nb_}
 %define nb_dir          %{nb_home}/%{nb_ver}
 
-%define nb_platform_ver 9
+%define nb_platform_ver 10
 %define nb_platform     platform%{nb_platform_ver}
 %define nb_platform_dir %{nb_home}/%{nb_platform}
 
@@ -24,24 +24,36 @@
 
 %define nb_javadoc_site http://bits.netbeans.org/%{nb_ver}/javadoc
 
+%define nbbuild_platform_dir nbbuild/netbeans/%{nb_platform}
+%define nbbuild_harness_dir nbbuild/netbeans/%{nb_harness}
+
 # Prevents use of autoupdate on the specified directory.
 # %1 the directory being prevented for autoupdate.
 %define noautoupdate()    echo > %1/.noautoupdate
 
+# Links the system JAR
+# %1 - the sys jar name
+# %2 - the symlink
+%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
+
 Name:         netbeans-platform
 Version:      %{nb_ver}
-Release:      7%{?dist}
+Release:      1%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
 URL:          http://platform.netbeans.org
 
-Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-ml-platform-src.zip
+Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-platform-src.zip
 
+# Removes the copy actions for the windows launcher components
+# (*.exe *.dll) from the o.n.bootstrup/build.xml
 Patch0: %{name}-%{version}-build_bootstrap.patch
+# Prevents from releasing zip files (swing-layout-1.0.3-doc.zip,
+# swing-layout-1.0.3-src.zip) in the o.jdesktop.layout module
 Patch1: %{name}-%{version}-properties.patch
-# http://www.netbeans.org/issues/show_bug.cgi?id=134544
-Patch2: %{name}-%{version}-win_launcher.patch
+# openjdk-javac-6-b12.jar is needed only if JDK 1.5 is used, but we use JDK 1.6
+Patch2: %{name}-%{version}-javac.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -53,18 +65,21 @@ BuildRequires: ant-junit >= 1.7.0
 BuildRequires: ant-nodeps >= 1.7.0
 BuildRequires: ant-trax >= 1.7.0
 BuildRequires: junit4 >= 4.5
-BuildRequires: swing-layout >= 0:1.0
+BuildRequires: swing-layout >= 1.0
 BuildRequires: javahelp2 >= 2.0.05
-BuildRequires: jna >= 3.0.2
+BuildRequires: jna >= 3.0.9
+BuildRequires: cobertura >= 1.9
+BuildRequires: asm2 >= 2.2.1
+BuildRequires: log4j >= 1.2.9
+BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: jemmy >= 2.3.0.0
 
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: swing-layout >= 1.0
 Requires: javahelp2 >= 2.0.05
-Requires: jna >= 3.0.2
-
+Requires: jna >= 3.0.9
 Obsoletes: netbeans-platform8 < 6.5
-Provides:  netbeans-platform8 < 6.5
 
 %description
 The NetBeans Platform is a generic framework for Swing applications. 
@@ -90,13 +105,18 @@ Requires: java >= 1:1.6.0
 Requires: ant >= 1.7.0
 Requires: %{name} = %{version}-%{release}
 Requires: javahelp2 >= 2.0.05
+Requires: cobertura >= 1.9
+Requires: asm2 >= 2.2.1
+Requires: log4j >= 1.2.9
+Requires: jakarta-oro >= 2.0.8
+Requires: jemmy >= 2.3.0.0
 Obsoletes: netbeans-platform8-harness < 6.5
 %description %{nb_harness}
 Harness with build scripts and ant tasks for everyone who
 build an application on top of NetBeans Platform
 
 %prep
-%setup -q -c 
+%setup -q -c
 
 find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %{__rm} -f
 find . -type f \( -iname "*.exe" \) | xargs -t %{__rm} -f
@@ -109,12 +129,18 @@ echo "package javax.script; class empty 
 %{__mkdir_p} libs.jsr223/external
 jar cf libs.jsr223/external/jsr223-api.jar libs.jsr223/src/javax/script/empty.java
 
-# to build the netbeans modules the installed jars will be used instead of pre-packaged ones
-%{__ln_s} -f %{_javadir}/swing-layout.jar o.jdesktop.layout/external/swing-layout-1.0.3.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar javahelp/external/jh-2.0_05.jar
-%{__ln_s} -f %{_javadir}/jna.jar libs.jna/external/jna-3.0.2.jar
-%{__ln_s} -f %{_javadir}/junit4.jar libs.junit4/external/junit-4.5.jar
+# To build the netbeans modules the installed jars will be used instead of pre-packaged ones
+%lnSysJAR javahelp2.jar     javahelp/external/jh-2.0_05.jar
+%lnSysJAR jemmy.jar         jemmy/external/jemmy-2.3.0.0.jar
+%lnSysJAR jna.jar           libs.jna/external/jna-3.0.9.jar
+%lnSysJAR junit4.jar        libs.junit4/external/junit-4.5.jar
+%lnSysJAR swing-layout.jar  o.jdesktop.layout/external/swing-layout-1.0.3.jar
+%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
+%lnSysJAR cobertura.jar apisupport.harness/external/cobertura-1.9.jar
+%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-2.2.1.jar
+%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-tree-2.2.1.jar
+%lnSysJAR log4j.jar     apisupport.harness/external/log4j-1.2.9.jar
+%lnSysJAR oro.jar       apisupport.harness/external/jakarta-oro-2.0.8.jar
 
 %patch0 -p1
 %patch1 -p1
@@ -122,17 +148,8 @@ jar cf libs.jsr223/external/jsr223-api.j
 
 %build
 
-# build platform
+# build platform & harness
 %{ant_nb_opt} -f nbbuild/build.xml build-platform
-%{__ln_s} -f %{_javadir}/swing-layout.jar nbbuild/netbeans/%{nb_platform}/modules/ext/swing-layout-1.0.3.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_platform}/modules/ext/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_platform}/modules/ext/jh-2.0_05.jar
-%{__ln_s} -f %{_javadir}/jna.jar nbbuild/netbeans/%{nb_platform}/modules/ext/jna-3.0.2.jar
-%{__ln_s} -f %{_javadir}/junit4.jar nbbuild/netbeans/%{nb_platform}/modules/ext/junit-4.5.jar
-
-# build platform harness
-%{ant_nb_opt} -f apisupport.harness/build.xml
-%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_harness}/jsearch-2.0_05.jar
 
 # build platform javadoc
 %{ant_nb_opt} \
@@ -149,18 +166,9 @@ sendopts,options.api,editor.mimelookup \
    -Djavadoc.docs.org-netbeans-modules-project-ant=%{nb_javadoc_site}/org-netbeans-modules-project-ant/ \
    -Djavadoc.docs.org-netbeans-modules-projectapi=%{nb_javadoc_site}/org-netbeans-modules-projectapi/ \
    -f nbbuild/build.xml build-javadoc
-%{__rm} -rf nbbuild/build/javadoc/*.zip
-
-# clean up links to ext jars
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/swing-layout-1.0.3.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/jsearch-2.0_05.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/jh-2.0_05.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/jna-3.0.2.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/junit-4.5.jar
-%{__rm} -f nbbuild/netbeans/%{nb_harness}/jsearch-2.0_05.jar
 
 # clean up stub jars
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/script-api.jar
+%{__rm} -f %{nbbuild_platform_dir}/modules/ext/script-api.jar
 
 %install
 
@@ -172,11 +180,11 @@ sendopts,options.api,editor.mimelookup \
 %noautoupdate %{buildroot}%{nb_platform_dir}
 
 # linking the platform to the external JARs
-%{__ln_s} -f %{_javadir}/swing-layout.jar %{buildroot}%{nb_platform_dir}/modules/ext/swing-layout-1.0.3.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_platform_dir}/modules/ext/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_platform_dir}/modules/ext/jh-2.0_05.jar
-%{__ln_s} -f %{_javadir}/jna.jar %{buildroot}%{nb_platform_dir}/modules/ext/jna-3.0.2.jar
-%{__ln_s} -f %{_javadir}/junit4.jar %{buildroot}%{nb_platform_dir}/modules/ext/junit-4.5.jar
+BR_PLATFORM_EXT=%{buildroot}%{nb_platform_dir}/modules/ext
+%lnSysJAR javahelp2.jar    ${BR_PLATFORM_EXT}/jh-2.0_05.jar
+%lnSysJAR jna.jar          ${BR_PLATFORM_EXT}/jna-3.0.9.jar
+%lnSysJAR junit4.jar       ${BR_PLATFORM_EXT}/junit-4.5.jar
+%lnSysJAR swing-layout.jar ${BR_PLATFORM_EXT}/swing-layout-1.0.3.jar
 
 # install harness
 %{__mkdir_p} %{buildroot}%{nb_harness_dir}
@@ -184,7 +192,14 @@ sendopts,options.api,editor.mimelookup \
 %noautoupdate %{buildroot}%{nb_harness_dir}
 
 # linking the harness to the external JARs
-%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_harness_dir}/jsearch-2.0_05.jar
+BR_HARNESS=%{buildroot}%{nb_harness_dir}
+%lnSysJAR javahelp2.jar ${BR_HARNESS}/antlib/jsearch-2.0_05.jar
+%lnSysJAR jemmy.jar ${BR_HARNESS}/modules/ext/jemmy-2.3.0.0.jar
+%lnSysJAR cobertura.jar ${BR_HARNESS}/testcoverage/cobertura/cobertura-1.9.jar
+%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-2.2.1.jar
+%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-tree-2.2.1.jar
+%lnSysJAR oro.jar       ${BR_HARNESS}/testcoverage/cobertura/lib/jakarta-oro-2.0.8.jar
+%lnSysJAR log4j.jar     ${BR_HARNESS}/testcoverage/cobertura/lib/log4j-1.2.9.jar
 
 # install javadoc
 %{__mkdir_p} %{buildroot}%{nb_javadoc_dir}
@@ -195,8 +210,7 @@ sendopts,options.api,editor.mimelookup \
 
 %files
 %defattr(-,root,root,-)
-%doc nbbuild/licenses/CDDL-1.0 nbbuild/licenses/CDDL-GPL-2-CP 
-%doc nbbuild/licenses/GPL-2-CP nbbuild/licenses/GPL-with-Proguard-exception
+%doc nbbuild/licenses/CDDL-GPL-2-CP
 %dir %{nb_home}/
 %dir %{nb_platform_dir}/
 %{nb_platform_dir}/config
@@ -213,58 +227,38 @@ sendopts,options.api,editor.mimelookup \
 %files %{nb_harness}
 %defattr(-,root,root,-)
 %dir %{nb_harness_dir}/
+%{nb_harness_dir}/antlib
 %{nb_harness_dir}/config
 %{nb_harness_dir}/etc
 %{nb_harness_dir}/jnlp
 %dir %{nb_harness_dir}/launchers
 %attr(755, root, root) %{nb_harness_dir}/launchers/app.sh
 %{nb_harness_dir}/modules
+%{nb_harness_dir}/testcoverage
 %{nb_harness_dir}/update_tracking
 %doc %{nb_harness_dir}/README
 %{nb_harness_dir}/build.xml
 %{nb_harness_dir}/common.xml
 %{nb_harness_dir}/jdk.xml
 %{nb_harness_dir}/jnlp.xml
-%{nb_harness_dir}/jsearch-2.0_05.jar
 %{nb_harness_dir}/run.xml
 %{nb_harness_dir}/suite.xml
-%{nb_harness_dir}/suite.xml.orig
 %{nb_harness_dir}/tasks.jar
 %{nb_harness_dir}/.noautoupdate
+%{nb_harness_dir}/no-testcoverage.xml
+%{nb_harness_dir}/testcoverage-suite.xml
+%{nb_harness_dir}/testcoverage.xml
 
 %files %{nb_javadoc}
 %defattr(-,root,root,-)
 %doc %{nb_javadoc_dir}/
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 04 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-5
-- Bug #483384 - "netbeans : Unowned directories" is fixed
-- netbeans-platform provides netbeans-platform8
-
-* Mon Jan 12 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-4
-- Creation of the .noautoupdate files is  moved to the install section
-
-* Tue Dec 30 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-3
-- The "Distrubution" tag is deleted
-- The "6.1" references are removed from the changelog
-- Specifications of providing non-Fedora packages are removed
-
-* Tue Dec 19 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-2
-- The platform version number is removed from the package names
-- "Obsoletes" are added for the netbeans-platform8* packages
-
-* Tue Dec 02 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-1
-- Bootstrapping of the spec 6.1 for platform of the NetBeans 6.5
-- Patch for the fixed issue http://www.netbeans.org/issues/show_bug.cgi?id=143729 is deleted
-- The binaries-list files are removed from the sources
-- BR junit -> junit4
-- An original of suite.xml is saved as suite.xml.orig in the harness
-- Call of the brp-java-repack-jars script is disabled
-- Description for the platform is changed
-- A previous version of harness is marked as obsolete
+* Thu May 21 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
+- Bootstrapping of the spec 6.5 for platform of the NetBeans 6.7.1
+- jna-3.0.2.jar -> jna-3.0.9.jar
+- cobertura-1.9.jar
+- asm-2.2.1.jar provided by asm2-2.2.3
+- log4j-1.2.9.jar provided by log4j-1.2.14
+- jakarta-oro-2.0.8.jar
+- jemmy-2.3.0.0.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jan 2009 13:14:33 -0000	1.2
+++ sources	13 Aug 2009 02:29:07 -0000	1.3
@@ -1 +1 @@
-2925d770380fbd028230788120816281  netbeans-6.5-200811100001-ml-platform-src.zip
+da30b40c20dc3b6a391bad4a7cdb6766  netbeans-6.7.1-200907230233-platform-src.zip


--- netbeans-platform-6.5-build_bootstrap.patch DELETED ---


--- netbeans-platform-6.5-properties.patch DELETED ---


--- netbeans-platform-6.5-win_launcher.patch DELETED ---



From deji at fedoraproject.org  Thu Aug 13 03:48:36 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 13 Aug 2009 03:48:36 +0000 (UTC)
Subject: rpms/bibletime/devel .cvsignore, 1.10, 1.11 bibletime.spec, 1.15,
	1.16 sources, 1.10, 1.11
Message-ID: <20090813034836.3911711C02C2@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/bibletime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21169

Modified Files:
	.cvsignore bibletime.spec sources 
Log Message:
* Wed Aug 12 2009 Deji Akingunola <dakingun at gmail.com> - 2.1-1
- Update to 2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Jun 2009 01:47:48 -0000	1.10
+++ .cvsignore	13 Aug 2009 03:48:35 -0000	1.11
@@ -1 +1 @@
-bibletime-2.0.1.tar.gz
+bibletime-2.1.tar.gz


Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/bibletime.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- bibletime.spec	24 Jul 2009 18:00:09 -0000	1.15
+++ bibletime.spec	13 Aug 2009 03:48:35 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	BibleTime is an easy to use Bible study tool for KDE
 Name:		bibletime
-Version:	2.0.1
-Release:	2%{?dist}
+Version:	2.1
+Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
 Group:		Applications/Productivity
@@ -82,6 +82,9 @@ done
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Aug 12 2009 Deji Akingunola <dakingun at gmail.com> - 2.1-1
+- Update to 2.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Jun 2009 01:47:48 -0000	1.10
+++ sources	13 Aug 2009 03:48:35 -0000	1.11
@@ -1 +1 @@
-1eaef5b96a9749932d50ac8f888c3778  bibletime-2.0.1.tar.gz
+79bb28840f655e7e5d6ce759e41dd832  bibletime-2.1.tar.gz



From bojan at fedoraproject.org  Thu Aug 13 04:00:57 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu, 13 Aug 2009 04:00:57 +0000 (UTC)
Subject: rpms/viewvc/devel viewvc-lexer-mimetypes.py, 1.2, 1.3 viewvc.spec, 
	1.23, 1.24
Message-ID: <20090813040057.1BF3B11C02C2@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23608

Modified Files:
	viewvc-lexer-mimetypes.py viewvc.spec 
Log Message:
Better mimetypes.conf generation script. Again.


Index: viewvc-lexer-mimetypes.py
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc-lexer-mimetypes.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- viewvc-lexer-mimetypes.py	13 Aug 2009 01:20:37 -0000	1.2
+++ viewvc-lexer-mimetypes.py	13 Aug 2009 04:00:56 -0000	1.3
@@ -7,10 +7,12 @@ from pygments.lexers import get_all_lexe
 for fullname, names, exts, mimetype in get_all_lexers():
   if len(exts) > len(mimetype):
     for j in range(len(mimetype)):
+      line=0
       for i in range(len(exts)):
         if re.match('\*\.',exts[i]):
           if i == 0:
             print mimetype[j],
+            line=1
           if re.search('\[[0-9]+\]',exts[i]):
             s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
             e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
@@ -18,8 +20,8 @@ for fullname, names, exts, mimetype in g
               print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
           else:
             print exts[i][2:],
-          if i == len(exts)-1:
-            print
+        if line==1 and i == len(exts)-1:
+          print
   elif len(exts) == 1:
     for i in range(len(mimetype)):
       if re.match('\*\.',exts[0]):


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- viewvc.spec	13 Aug 2009 01:20:37 -0000	1.23
+++ viewvc.spec	13 Aug 2009 04:00:56 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-4
+- try one more time
+
 * Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-3
 - better mimetypes.conf generation script
 



From bojan at fedoraproject.org  Thu Aug 13 04:01:47 2009
From: bojan at fedoraproject.org (bojan)
Date: Thu, 13 Aug 2009 04:01:47 +0000 (UTC)
Subject: rpms/viewvc/F-11 viewvc-lexer-mimetypes.py, 1.2, 1.3 viewvc.spec,
	1.22, 1.23
Message-ID: <20090813040147.CE83611C02C2@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23778

Modified Files:
	viewvc-lexer-mimetypes.py viewvc.spec 
Log Message:
Better mimetypes.conf generation script. Again.


Index: viewvc-lexer-mimetypes.py
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc-lexer-mimetypes.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- viewvc-lexer-mimetypes.py	13 Aug 2009 01:24:16 -0000	1.2
+++ viewvc-lexer-mimetypes.py	13 Aug 2009 04:01:47 -0000	1.3
@@ -7,10 +7,12 @@ from pygments.lexers import get_all_lexe
 for fullname, names, exts, mimetype in get_all_lexers():
   if len(exts) > len(mimetype):
     for j in range(len(mimetype)):
+      line=0
       for i in range(len(exts)):
         if re.match('\*\.',exts[i]):
           if i == 0:
             print mimetype[j],
+            line=1
           if re.search('\[[0-9]+\]',exts[i]):
             s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
             e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
@@ -18,8 +20,8 @@ for fullname, names, exts, mimetype in g
               print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
           else:
             print exts[i][2:],
-          if i == len(exts)-1:
-            print
+        if line==1 and i == len(exts)-1:
+          print
   elif len(exts) == 1:
     for i in range(len(mimetype)):
       if re.match('\*\.',exts[0]):


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- viewvc.spec	13 Aug 2009 01:24:16 -0000	1.22
+++ viewvc.spec	13 Aug 2009 04:01:47 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-4
+- try one more time
+
 * Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-3
 - better mimetypes.conf generation script
 



From dcantrel at fedoraproject.org  Thu Aug 13 04:21:01 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 13 Aug 2009 04:21:01 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.657, 1.658 anaconda.spec, 1.807, 
	1.808 sources, 1.791, 1.792
Message-ID: <20090813042101.355D611C0097@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16287

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12.15-1
- Make sure we have the ca cert to handle https repo connections. (517171)
  (jkeating)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -p -r1.657 -r1.658
--- .cvsignore	13 Aug 2009 01:55:18 -0000	1.657
+++ .cvsignore	13 Aug 2009 04:21:00 -0000	1.658
@@ -1 +1 @@
-anaconda-12.14.tar.bz2
+anaconda-12.15.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -p -r1.807 -r1.808
--- anaconda.spec	13 Aug 2009 01:55:18 -0000	1.807
+++ anaconda.spec	13 Aug 2009 04:21:00 -0000	1.808
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.14
+Version: 12.15
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -209,6 +209,10 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12.15-1
+- Make sure we have the ca cert to handle https repo connections. (517171)
+  (jkeating)
+
 * Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12.14-1
 - Correctly inform the user once about obsolete parm/conf file options on
   s390 (maier)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -p -r1.791 -r1.792
--- sources	13 Aug 2009 01:55:18 -0000	1.791
+++ sources	13 Aug 2009 04:21:00 -0000	1.792
@@ -1 +1 @@
-8080b01d8f67c75003c9830b0337555d  anaconda-12.14.tar.bz2
+909540f75411355f3157d06f4a39e012  anaconda-12.15.tar.bz2



From tmz at fedoraproject.org  Thu Aug 13 04:40:37 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 13 Aug 2009 04:40:37 +0000 (UTC)
Subject: rpms/asciidoc/devel asciidoc-8.4.5-datadir.patch, NONE,
	1.1 asciidoc-8.4.5-use-unsafe-mode-by-default.patch, NONE,
	1.1 asciidoc.spec, 1.13, 1.14
Message-ID: <20090813044037.6178511C048B@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/asciidoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20274

Modified Files:
	asciidoc.spec 
Added Files:
	asciidoc-8.4.5-datadir.patch 
	asciidoc-8.4.5-use-unsafe-mode-by-default.patch 
Log Message:
Fix spurious 'unsafe include' errors and rpmlint complaints

- Use 'unsafe' mode by default (bug 506953)
- Install filter scripts in %{_datadir}/asciidoc
- Convert spec file, CHANGELOG, and README to utf-8
- Preserve timestamps on installed files, where feasible
- s/$RPM_BUILD_ROOT/%{buildroot} and drop duplicated /'s
- Fix rpmlint mixed-use-of-spaces-and-tabs and end-of-line-encoding warnings


asciidoc-8.4.5-datadir.patch:
 Makefile.in |   10 +++++++++-
 asciidoc.py |    3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE asciidoc-8.4.5-datadir.patch ---
diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py
--- asciidoc-8.4.5/asciidoc.py.datadir	2009-07-18 14:48:29.000000000 -0400
+++ asciidoc-8.4.5/asciidoc.py	2009-07-18 14:50:26.000000000 -0400
@@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr
         if not found:
             found = findfilter(filtername, CONF_DIR, cmd)
         if not found:
+            found = findfilter(filtername, DATA_DIR, cmd)
+        if not found:
             found = findfilter(filtername, APP_DIR, cmd)
     else:
         if os.path.isfile(cmd):
@@ -4997,6 +4999,7 @@ APP_DIR = None              # This file'
 USER_DIR = None             # ~/.asciidoc
 # Global configuration files directory (set by Makefile build target).
 CONF_DIR = '/etc/asciidoc'
+DATA_DIR = '/usr/share/asciidoc'
 HELP_FILE = 'help.conf'     # Default (English) help file.
 
 # Globals
diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in
--- asciidoc-8.4.5/Makefile.in.datadir	2009-04-23 18:49:43.000000000 -0400
+++ asciidoc-8.4.5/Makefile.in	2009-07-18 14:46:22.000000000 -0400
@@ -23,6 +23,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 ASCIIDOCCONF = $(sysconfdir)/asciidoc
+ASCIIDOCDATA = $(datadir)/asciidoc
 
 prog = asciidoc.py a2x
 progdir = $(bindir)
@@ -126,6 +127,13 @@ fixconfpath:
 		mv $$f.out $$f; \
 	done
 
+fixdatapath:
+	@for f in $(prog); do \
+		echo "Fixing DATA_DIR in $$f"; \
+		$(SED) "s#^DATA_DIR = '.*'#DATA_DIR = '$(ASCIIDOCDATA)'#; s#^DATA_DIR=.*#DATA_DIR=$(ASCIIDOCDATA)#" $$f > $$f.out; \
+		mv $$f.out $$f; \
+	done
+
 install-vim:
 	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
 		if ! test -d $$d; then continue; fi ; \
@@ -145,7 +153,7 @@ uninstall-vim:
 	done
 
 
-build: fixconfpath
+build: fixconfpath fixdatapath
 
 install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
 

asciidoc-8.4.5-use-unsafe-mode-by-default.patch:
 asciidoc.py    |    6 +++---
 doc/asciidoc.1 |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE asciidoc-8.4.5-use-unsafe-mode-by-default.patch ---
diff -up asciidoc-8.4.5/asciidoc.py.default-unsafe asciidoc-8.4.5/asciidoc.py
--- asciidoc-8.4.5/asciidoc.py.default-unsafe	2009-05-25 22:12:38.000000000 -0400
+++ asciidoc-8.4.5/asciidoc.py	2009-07-16 02:27:09.000000000 -0400
@@ -1138,7 +1138,7 @@ class Document:
         self.level = 0          # 0 => front matter. 1,2,3 => sect1,2,3.
         self.has_errors = False # Set true if processing errors were flagged.
         self.has_warnings = False # Set true if warnings were flagged.
-        self.safe = True        # Default safe mode.
+        self.safe = False       # Default safe mode.
     def update_attributes(self):
         # Set implicit attributes.
         if self.infile and os.path.exists(self.infile):
@@ -5205,8 +5205,8 @@ def execute(cmd,opts,args):
     for o,v in opts:
         if o in ('--help','-h'):
             help_option = True
-        if o == '--unsafe':
-            document.safe = False
+        if o == '--safe':
+            document.safe = True
         if o == '--version':
             print('asciidoc %s' % VERSION)
             sys.exit(0)
diff -up asciidoc-8.4.5/doc/asciidoc.1.default-unsafe asciidoc-8.4.5/doc/asciidoc.1
--- asciidoc-8.4.5/doc/asciidoc.1.default-unsafe	2009-05-26 02:38:36.000000000 -0400
+++ asciidoc-8.4.5/doc/asciidoc.1	2009-08-12 23:51:09.000000000 -0400
@@ -123,9 +123,9 @@ Auto\-number HTML article section titles
 \fB\-a numbered\fR\.
 .RE
 .PP
-\fB\-\-unsafe\fR
+\fB\-\-safe\fR
 .RS 4
-Disable safe mode\. Safe mode is enabled by default, disabling it is potentially dangerous\.
+Enable safe mode\. Safe mode is disabled by default\.
 .RE
 .PP
 \fB\-v, \-\-verbose\fR


Index: asciidoc.spec
===================================================================
RCS file: /cvs/extras/rpms/asciidoc/devel/asciidoc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- asciidoc.spec	24 Jul 2009 17:10:42 -0000	1.13
+++ asciidoc.spec	13 Aug 2009 04:40:37 -0000	1.14
@@ -1,13 +1,17 @@
 Summary: Text based document generation
 Name: asciidoc
 Version: 8.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The python code does not specify a version.
 # The javascript example code is GPLv2+.
 License: GPL+ and GPLv2+
 Group: Applications/System
 URL: http://www.methods.co.nz/asciidoc/
 Source0: http://www.methods.co.nz/asciidoc/%{name}-%{version}.tar.gz
+# http://groups.google.com/group/asciidoc/browse_thread/thread/7f7a633c5b11ddc3
+Patch0: asciidoc-8.4.5-datadir.patch
+# https://bugzilla.redhat.com/506953
+Patch1: asciidoc-8.4.5-use-unsafe-mode-by-default.patch
 Requires: python >= 2.3
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,55 +23,74 @@ to HTML and DocBook markups using the as
 
 %prep
 %setup -q
+%patch0 -p1 -b .datadir
+%patch1 -p1 -b .use-unsafe-mode-by-default
+
+# Fix line endings on COPYRIGHT file
+sed -i "s/\r//g" COPYRIGHT
+
+# Convert CHANGELOG and README to utf-8
+for file in CHANGELOG README; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
 
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 # make directory structure
-%{__install} -d $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/code	\
-        -d $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/music	\
-        -d $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/source	\
-        -d $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/graphviz	\
-	$RPM_BUILD_ROOT/%{_datadir}/asciidoc/docbook-xsl		\
-	$RPM_BUILD_ROOT/%{_datadir}/asciidoc/stylesheets		\
-	$RPM_BUILD_ROOT/%{_datadir}/asciidoc/javascripts		\
-	$RPM_BUILD_ROOT/%{_datadir}/asciidoc/images/icons/callouts	\
-	$RPM_BUILD_ROOT/%{_bindir}					\
-	$RPM_BUILD_ROOT/%{_mandir}/man1
+%{__install} -d							\
+	%{buildroot}%{_sysconfdir}/asciidoc/filters/code	\
+	%{buildroot}%{_sysconfdir}/asciidoc/filters/graphviz	\
+	%{buildroot}%{_sysconfdir}/asciidoc/filters/music	\
+	%{buildroot}%{_sysconfdir}/asciidoc/filters/source	\
+	%{buildroot}%{_datadir}/asciidoc/docbook-xsl		\
+	%{buildroot}%{_datadir}/asciidoc/stylesheets		\
+	%{buildroot}%{_datadir}/asciidoc/javascripts		\
+	%{buildroot}%{_datadir}/asciidoc/images/icons/callouts	\
+	%{buildroot}%{_datadir}/asciidoc/filters/code		\
+	%{buildroot}%{_datadir}/asciidoc/filters/graphviz	\
+	%{buildroot}%{_datadir}/asciidoc/filters/music		\
+	%{buildroot}%{_bindir}					\
+	%{buildroot}%{_mandir}/man1
 
 # real conf data goes to sysconfdir, rest goes to datadir
-%{__install} -m 0644 *.conf $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc
-%{__install} -m 0644 filters/code/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/code/
-%{__install} -m 0644 filters/music/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/music/
-%{__install} -m 0644 filters/source/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/source/
-%{__install} -m 0644 filters/graphviz/*.conf $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/graphviz/
-%{__install} filters/code/*.py $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/code/
-%{__install} filters/music/*.py $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/music/
-%{__install} filters/graphviz/*.py $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/filters/graphviz/
+%{__install} -m 0644 *.conf %{buildroot}%{_sysconfdir}/asciidoc
+for filter in code graphviz music source ; do
+	%{__install} -p -m 0644 filters/$filter/*.conf \
+	%{buildroot}%{_sysconfdir}/asciidoc/filters/$filter/
+done
+
+# filter scripts
+for filter in code graphviz music ; do
+	%{__install} -p -m 0755 filters/$filter/*.py \
+	%{buildroot}%{_datadir}/asciidoc/filters/$filter/
+done
 
 # symlinks so asciidoc works
-ln -s %{_datadir}/asciidoc/docbook-xsl $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/
-ln -s %{_datadir}/asciidoc/stylesheets $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/
-ln -s %{_datadir}/asciidoc/javascripts $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/
-ln -s %{_datadir}/asciidoc/images $RPM_BUILD_ROOT/%{_sysconfdir}/asciidoc/
+ln -s %{_datadir}/asciidoc/docbook-xsl %{buildroot}%{_sysconfdir}/asciidoc/
+ln -s %{_datadir}/asciidoc/stylesheets %{buildroot}%{_sysconfdir}/asciidoc/
+ln -s %{_datadir}/asciidoc/javascripts %{buildroot}%{_sysconfdir}/asciidoc/
+ln -s %{_datadir}/asciidoc/images %{buildroot}%{_sysconfdir}/asciidoc/
 
 # binaries
-%{__install} asciidoc.py $RPM_BUILD_ROOT/%{_bindir}/asciidoc
-%{__install} a2x $RPM_BUILD_ROOT/%{_bindir}/
+%{__install} -p asciidoc.py %{buildroot}%{_bindir}/asciidoc
+%{__install} -p a2x %{buildroot}%{_bindir}/
 
 # manpages
-%{__install} -m 0644 doc/*.1  $RPM_BUILD_ROOT/%{_mandir}/man1
+%{__install} -m 0644 doc/*.1  %{buildroot}%{_mandir}/man1
 
 # ancillary data
-%{__install} -m 0644 docbook-xsl/*.xsl $RPM_BUILD_ROOT/%{_datadir}/asciidoc/docbook-xsl
-%{__install} -m 0644 stylesheets/*.css $RPM_BUILD_ROOT/%{_datadir}/asciidoc/stylesheets/
-%{__install} -m 0644 javascripts/*.js $RPM_BUILD_ROOT/%{_datadir}/asciidoc/javascripts
-%{__install} -m 0644 images/icons/callouts/* $RPM_BUILD_ROOT/%{_datadir}/asciidoc/images/icons/callouts
-%{__install} -m 0644 images/icons/{README,*.png} $RPM_BUILD_ROOT/%{_datadir}/asciidoc/images/icons
+%{__install} -p -m 0644 docbook-xsl/*.xsl %{buildroot}%{_datadir}/asciidoc/docbook-xsl
+%{__install} -p -m 0644 stylesheets/*.css %{buildroot}%{_datadir}/asciidoc/stylesheets/
+%{__install} -p -m 0644 javascripts/*.js %{buildroot}%{_datadir}/asciidoc/javascripts
+%{__install} -p -m 0644 images/icons/callouts/* %{buildroot}%{_datadir}/asciidoc/images/icons/callouts
+%{__install} -p -m 0644 images/icons/{README,*.png} %{buildroot}%{_datadir}/asciidoc/images/icons
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
@@ -78,6 +101,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc README BUGS CHANGELOG COPYRIGHT
 
 %changelog
+* Thu Aug 13 2009 Todd Zullinger <tmz at pobox.com> - 8.4.5-3
+- Use 'unsafe' mode by default (bug 506953)
+- Install filter scripts in %%{_datadir}/asciidoc
+- Convert spec file, CHANGELOG, and README to utf-8
+- Preserve timestamps on installed files, where feasible
+- s/$RPM_BUILD_ROOT/%%{buildroot} and drop duplicated /'s
+- Fix rpmlint mixed-use-of-spaces-and-tabs and end-of-line-encoding warnings
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -124,19 +155,18 @@ rm -rf $RPM_BUILD_ROOT
 - use _datadir
 - use config and _sysconfdir
 
-* Wed Jun 29 2005 Terje R??sten <terje.rosten at ntnu.no> - 7.0.1-1
+* Wed Jun 29 2005 Terje R?sten <terje.rosten at ntnu.no> - 7.0.1-1
+
 - 7.0.1
 - Drop patch now upstream
-- Build as noarch (Petr Kl??ma)
+- Build as noarch (Petr Kl?ma)
 
-* Sat Jun 11 2005 Terje R??sten <terje.rosten at ntnu.no> - 7.0.0-0.3
+* Sat Jun 11 2005 Terje R?sten <terje.rosten at ntnu.no> - 7.0.0-0.3
 - Add include patch 
 
-* Fri Jun 10 2005 Terje R??sten <terje.rosten at ntnu.no> - 7.0.0-0.2
+* Fri Jun 10 2005 Terje R?sten <terje.rosten at ntnu.no> - 7.0.0-0.2
 - Fix stylesheets according to Stuart
 
-* Fri Jun 10 2005 Terje R??sten <terje.rosten at ntnu.no> - 7.0.0-0.1
+* Fri Jun 10 2005 Terje R?sten <terje.rosten at ntnu.no> - 7.0.0-0.1
 - Initial package
 - Based on Debian package, thx!
-
-



From deji at fedoraproject.org  Thu Aug 13 04:52:56 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 13 Aug 2009 04:52:56 +0000 (UTC)
Subject: rpms/nautilus-actions/devel .cvsignore, 1.10,
	1.11 nautilus-actions.spec, 1.24, 1.25 sources, 1.10, 1.11
Message-ID: <20090813045256.27D2411C0097@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/nautilus-actions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23449

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Log Message:
* Wed Aug 12 2009 Deji Akingunola <dakingun at gmail.com> - 1.12.0-1
- Update to 1.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Aug 2009 04:12:47 -0000	1.10
+++ .cvsignore	13 Aug 2009 04:52:55 -0000	1.11
@@ -1 +1 @@
-nautilus-actions-1.11.2.tar.bz2
+nautilus-actions-1.12.0.tar.gz


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nautilus-actions.spec	5 Aug 2009 04:12:47 -0000	1.24
+++ nautilus-actions.spec	13 Aug 2009 04:52:55 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:	Nautilus extension for customizing the context menu
 Name:		nautilus-actions
-Version:	1.11.2
+Version:	1.12.0
 Release:	1%{?dist}
 Group:		User Interface/Desktops
 License:	GPLv2+
@@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/fedora-nact.desktop
 
 %changelog
+* Wed Aug 12 2009 Deji Akingunola <dakingun at gmail.com> - 1.12.0-1
+- Update to 1.12.0
+
 * Tue Aug 04 2009 Deji Akingunola <dakingun at gmail.com> - 1.11.2-1
 - Update to 1.11.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Aug 2009 04:12:47 -0000	1.10
+++ sources	13 Aug 2009 04:52:55 -0000	1.11
@@ -1 +1 @@
-bcb1d7a2e948eeb7afddf0d55a21f4d3  nautilus-actions-1.11.2.tar.bz2
+901f0c75419d9b7ca2a18ac4ed695323  nautilus-actions-1.12.0.tar.gz



From lucilanga at fedoraproject.org  Thu Aug 13 05:12:47 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 13 Aug 2009 05:12:47 +0000 (UTC)
Subject: rpms/tucnak2/devel tucnak2-2.27-soundwrapper.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tucnak2.spec, 1.2,
	1.3 tucnak2-2.25-soundwrapper.patch, 1.1, NONE
Message-ID: <20090813051247.4F3D211C0097@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/tucnak2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27747

Modified Files:
	.cvsignore sources tucnak2.spec 
Added Files:
	tucnak2-2.27-soundwrapper.patch 
Removed Files:
	tucnak2-2.25-soundwrapper.patch 
Log Message:
* Wed Aug 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.27-1
- update to latest upstream release

tucnak2-2.27-soundwrapper.patch:
 Makefile.in |   22 +++++++++++-----------
 os_dep.c    |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE tucnak2-2.27-soundwrapper.patch ---
diff -Naur tucnak2-2.27/src/Makefile.in tucnak2-2.27-mod/src/Makefile.in
--- tucnak2-2.27/src/Makefile.in	2009-07-09 09:45:00.000000000 +0300
+++ tucnak2-2.27-mod/src/Makefile.in	2009-08-13 08:08:02.000000000 +0300
@@ -81,14 +81,14 @@
 TUCNAK_LDADD = @TUCNAK_LDADD@
 VERSION = @VERSION@
 
-bin_PROGRAMS = tucnak soundwrapper 
+bin_PROGRAMS = tucnak tucnak2-soundwrapper 
 
 tucnak_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc 	control.c cor.c cor.h cordata.c cordata.h cordata.inc 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c 	error.c excdb.c fhs.c fifo.c font.c font.inc gfx_png.c ghash.c 	gptrarray.c hash.c header.h html.c iarray.c iarray.h 	icons.c icons.h icons.inc img_png.c inpout.c inputln.c interfaces.c interfaces.h kbd.c 	kbdbind.c language.c language.h language.inc loc.c main.c map.c 	menu.c menu1.c menu2.c menu3.c menu4.c menu5.c namedb.c net.c ntpq.c 	os_dep.c os_dep.h oss.c ppdev.c rc.c regex.c report.c rotar.c 	qrvdb.c qsodb.c scandir.c scope.c sdev.c sdl.c 	select.c session.c settings.c setup.h sked.c 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c trig.c 	ttys.c txts.c txts.h txts.inc uni_7b.inc winkey.c wizz.c zstring.c
 
 
 tucnak_LDADD = @TUCNAK_LDADD@
 
-soundwrapper_SOURCES = soundwrapper.c	
+tucnak2-soundwrapper_SOURCES = soundwrapper.c	
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -111,10 +111,10 @@
 txts.o winkey.o wizz.o zstring.o
 tucnak_DEPENDENCIES = 
 tucnak_LDFLAGS = 
-soundwrapper_OBJECTS =  soundwrapper.o
-soundwrapper_LDADD = $(LDADD)
-soundwrapper_DEPENDENCIES = 
-soundwrapper_LDFLAGS = 
+tucnak2-soundwrapper_OBJECTS =  soundwrapper.o
+tucnak2-soundwrapper_LDADD = $(LDADD)
+tucnak2-soundwrapper_DEPENDENCIES = 
+tucnak2-soundwrapper_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -126,8 +126,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(tucnak_SOURCES) $(soundwrapper_SOURCES)
-OBJECTS = $(tucnak_OBJECTS) $(soundwrapper_OBJECTS)
+SOURCES = $(tucnak_SOURCES) $(tucnak2-soundwrapper_SOURCES)
+OBJECTS = $(tucnak_OBJECTS) $(tucnak2-soundwrapper_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -188,9 +188,9 @@
 	@rm -f tucnak
 	$(LINK) $(tucnak_LDFLAGS) $(tucnak_OBJECTS) $(tucnak_LDADD) $(LIBS)
 
-soundwrapper: $(soundwrapper_OBJECTS) $(soundwrapper_DEPENDENCIES)
-	@rm -f soundwrapper
-	$(LINK) $(soundwrapper_LDFLAGS) $(soundwrapper_OBJECTS) $(soundwrapper_LDADD) $(LIBS)
+tucnak2-soundwrapper: $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_DEPENDENCIES)
+	@rm -f tucnak2-soundwrapper
+	$(LINK) $(tucnak2-soundwrapper_LDFLAGS) $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_LDADD) $(LIBS)
 
 tags: TAGS
 
diff -Naur tucnak2-2.27/src/os_dep.c tucnak2-2.27-mod/src/os_dep.c
--- tucnak2-2.27/src/os_dep.c	2009-06-21 10:57:46.000000000 +0300
+++ tucnak2-2.27-mod/src/os_dep.c	2009-08-12 07:44:55.000000000 +0300
@@ -1612,7 +1612,7 @@
     dup2(fds[0], 0);
     close(fds[0]);
     for (i=3;i<1024;i++) close(i);
-    execlp("soundwrapper", "soundwrapper", NULL);
+    execlp("tucnak2-soundwrapper", "tucnak2-soundwrapper", NULL);
 	exit(-1);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Mar 2009 05:53:54 -0000	1.2
+++ .cvsignore	13 Aug 2009 05:12:46 -0000	1.3
@@ -1 +1 @@
-tucnak2-2.25.tar.gz
+tucnak2-2.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Mar 2009 05:53:54 -0000	1.2
+++ sources	13 Aug 2009 05:12:46 -0000	1.3
@@ -1 +1 @@
-560ea856eb48b6e3be23193e31428033  tucnak2-2.25.tar.gz
+fc25c1c9521b4ea98d154a60ad201260  tucnak2-2.27.tar.gz


Index: tucnak2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/devel/tucnak2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tucnak2.spec	27 Jul 2009 06:21:19 -0000	1.2
+++ tucnak2.spec	13 Aug 2009 05:12:46 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           tucnak2
-Version:        2.25
-Release:        2%{?dist}
+Version:        2.27
+Release:        1%{?dist}
 Summary:        VHF contest logging program
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://tucnak.nagano.cz/wiki/Main_Page
 Source0:        http://tucnak.nagano.cz/%{name}-%{version}.tar.gz
-Patch0:         tucnak2-2.25-soundwrapper.patch
+Patch0:         tucnak2-2.27-soundwrapper.patch
 Patch1:         tucnak2-2.25-sharedconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.27-1
+- update to latest upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- tucnak2-2.25-soundwrapper.patch DELETED ---



From sdz at fedoraproject.org  Thu Aug 13 05:16:36 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 13 Aug 2009 05:16:36 +0000 (UTC)
Subject: rpms/blazeblogger/devel blazeblogger.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813051637.00A6811C0097@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29051/devel

Modified Files:
	.cvsignore sources 
Added Files:
	blazeblogger.spec import.log 
Log Message:
initial import



--- NEW FILE blazeblogger.spec ---
Name:           blazeblogger
Version:        0.9.0
Release:        1%{?dist}
Summary:        A simple to use but capable CMS for the command line

Group:          Applications/Publishing
# The application is GPLv3 while the man pages are GFDL
License:        GPLv3 and GFDL
URL:            http://blaze.blackened.cz/
Source0:        http://blazeblogger.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArchitectures: noarch 

%description
Written in Perl as a cross-platform application and producing
the static content without the need of database servers or
server side scripting, BlazeBlogger is literally a CMS without
boundaries suitable for a wide variety of web presentations,
from personal weblog to a project page or even a company presentation.

%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
make install prefix=$RPM_BUILD_ROOT/usr


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FDL
%{_bindir}/blaze*
%{_mandir}/man1/blaze-*.1.gz
%{_mandir}/man7/blaze*.7.gz


%changelog
* Sun Aug 09 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
- initial packaging


--- NEW FILE import.log ---
blazeblogger-0_9_0-1_fc11:HEAD:blazeblogger-0.9.0-1.fc11.src.rpm:1250140546


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:57:04 -0000	1.1
+++ .cvsignore	13 Aug 2009 05:16:36 -0000	1.2
@@ -0,0 +1 @@
+blazeblogger-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:57:04 -0000	1.1
+++ sources	13 Aug 2009 05:16:36 -0000	1.2
@@ -0,0 +1 @@
+79b240e196cdb2f2a765e4ef10546163  blazeblogger-0.9.0.tar.gz



From sdz at fedoraproject.org  Thu Aug 13 05:17:58 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 13 Aug 2009 05:17:58 +0000 (UTC)
Subject: rpms/blazeblogger/F-11 blazeblogger.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813051758.D6CB011C0097@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29544/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	blazeblogger.spec import.log 
Log Message:
initial import



--- NEW FILE blazeblogger.spec ---
Name:           blazeblogger
Version:        0.9.0
Release:        1%{?dist}
Summary:        A simple to use but capable CMS for the command line

Group:          Applications/Publishing
# The application is GPLv3 while the man pages are GFDL
License:        GPLv3 and GFDL
URL:            http://blaze.blackened.cz/
Source0:        http://blazeblogger.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArchitectures: noarch 

%description
Written in Perl as a cross-platform application and producing
the static content without the need of database servers or
server side scripting, BlazeBlogger is literally a CMS without
boundaries suitable for a wide variety of web presentations,
from personal weblog to a project page or even a company presentation.

%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
make install prefix=$RPM_BUILD_ROOT/usr


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FDL
%{_bindir}/blaze*
%{_mandir}/man1/blaze-*.1.gz
%{_mandir}/man7/blaze*.7.gz


%changelog
* Sun Aug 09 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
- initial packaging


--- NEW FILE import.log ---
blazeblogger-0_9_0-1_fc11:F-11:blazeblogger-0.9.0-1.fc11.src.rpm:1250140652


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:57:04 -0000	1.1
+++ .cvsignore	13 Aug 2009 05:17:58 -0000	1.2
@@ -0,0 +1 @@
+blazeblogger-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:57:04 -0000	1.1
+++ sources	13 Aug 2009 05:17:58 -0000	1.2
@@ -0,0 +1 @@
+79b240e196cdb2f2a765e4ef10546163  blazeblogger-0.9.0.tar.gz



From lucilanga at fedoraproject.org  Thu Aug 13 05:18:26 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 13 Aug 2009 05:18:26 +0000 (UTC)
Subject: rpms/tucnak2/F-11 tucnak2-2.27-soundwrapper.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tucnak2.spec, 1.1,
	1.2 tucnak2-2.25-soundwrapper.patch, 1.1, NONE
Message-ID: <20090813051826.137D311C0097@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/tucnak2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29810

Modified Files:
	.cvsignore sources tucnak2.spec 
Added Files:
	tucnak2-2.27-soundwrapper.patch 
Removed Files:
	tucnak2-2.25-soundwrapper.patch 
Log Message:
* Thu Aug 13 2009 Lucian Langa <cooly at gnome.eu.org> - 2.27-1
- update to latest upstream release

tucnak2-2.27-soundwrapper.patch:
 Makefile.in |   22 +++++++++++-----------
 os_dep.c    |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE tucnak2-2.27-soundwrapper.patch ---
diff -Naur tucnak2-2.27/src/Makefile.in tucnak2-2.27-mod/src/Makefile.in
--- tucnak2-2.27/src/Makefile.in	2009-07-09 09:45:00.000000000 +0300
+++ tucnak2-2.27-mod/src/Makefile.in	2009-08-13 08:08:02.000000000 +0300
@@ -81,14 +81,14 @@
 TUCNAK_LDADD = @TUCNAK_LDADD@
 VERSION = @VERSION@
 
-bin_PROGRAMS = tucnak soundwrapper 
+bin_PROGRAMS = tucnak tucnak2-soundwrapper 
 
 tucnak_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc 	control.c cor.c cor.h cordata.c cordata.h cordata.inc 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c 	error.c excdb.c fhs.c fifo.c font.c font.inc gfx_png.c ghash.c 	gptrarray.c hash.c header.h html.c iarray.c iarray.h 	icons.c icons.h icons.inc img_png.c inpout.c inputln.c interfaces.c interfaces.h kbd.c 	kbdbind.c language.c language.h language.inc loc.c main.c map.c 	menu.c menu1.c menu2.c menu3.c menu4.c menu5.c namedb.c net.c ntpq.c 	os_dep.c os_dep.h oss.c ppdev.c rc.c regex.c report.c rotar.c 	qrvdb.c qsodb.c scandir.c scope.c sdev.c sdl.c 	select.c session.c settings.c setup.h sked.c 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c trig.c 	ttys.c txts.c txts.h txts.inc uni_7b.inc winkey.c wizz.c zstring.c
 
 
 tucnak_LDADD = @TUCNAK_LDADD@
 
-soundwrapper_SOURCES = soundwrapper.c	
+tucnak2-soundwrapper_SOURCES = soundwrapper.c	
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -111,10 +111,10 @@
 txts.o winkey.o wizz.o zstring.o
 tucnak_DEPENDENCIES = 
 tucnak_LDFLAGS = 
-soundwrapper_OBJECTS =  soundwrapper.o
-soundwrapper_LDADD = $(LDADD)
-soundwrapper_DEPENDENCIES = 
-soundwrapper_LDFLAGS = 
+tucnak2-soundwrapper_OBJECTS =  soundwrapper.o
+tucnak2-soundwrapper_LDADD = $(LDADD)
+tucnak2-soundwrapper_DEPENDENCIES = 
+tucnak2-soundwrapper_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -126,8 +126,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(tucnak_SOURCES) $(soundwrapper_SOURCES)
-OBJECTS = $(tucnak_OBJECTS) $(soundwrapper_OBJECTS)
+SOURCES = $(tucnak_SOURCES) $(tucnak2-soundwrapper_SOURCES)
+OBJECTS = $(tucnak_OBJECTS) $(tucnak2-soundwrapper_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -188,9 +188,9 @@
 	@rm -f tucnak
 	$(LINK) $(tucnak_LDFLAGS) $(tucnak_OBJECTS) $(tucnak_LDADD) $(LIBS)
 
-soundwrapper: $(soundwrapper_OBJECTS) $(soundwrapper_DEPENDENCIES)
-	@rm -f soundwrapper
-	$(LINK) $(soundwrapper_LDFLAGS) $(soundwrapper_OBJECTS) $(soundwrapper_LDADD) $(LIBS)
+tucnak2-soundwrapper: $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_DEPENDENCIES)
+	@rm -f tucnak2-soundwrapper
+	$(LINK) $(tucnak2-soundwrapper_LDFLAGS) $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_LDADD) $(LIBS)
 
 tags: TAGS
 
diff -Naur tucnak2-2.27/src/os_dep.c tucnak2-2.27-mod/src/os_dep.c
--- tucnak2-2.27/src/os_dep.c	2009-06-21 10:57:46.000000000 +0300
+++ tucnak2-2.27-mod/src/os_dep.c	2009-08-12 07:44:55.000000000 +0300
@@ -1612,7 +1612,7 @@
     dup2(fds[0], 0);
     close(fds[0]);
     for (i=3;i<1024;i++) close(i);
-    execlp("soundwrapper", "soundwrapper", NULL);
+    execlp("tucnak2-soundwrapper", "tucnak2-soundwrapper", NULL);
 	exit(-1);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Mar 2009 05:53:54 -0000	1.2
+++ .cvsignore	13 Aug 2009 05:18:25 -0000	1.3
@@ -1 +1 @@
-tucnak2-2.25.tar.gz
+tucnak2-2.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Mar 2009 05:53:54 -0000	1.2
+++ sources	13 Aug 2009 05:18:25 -0000	1.3
@@ -1 +1 @@
-560ea856eb48b6e3be23193e31428033  tucnak2-2.25.tar.gz
+fc25c1c9521b4ea98d154a60ad201260  tucnak2-2.27.tar.gz


Index: tucnak2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/F-11/tucnak2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tucnak2.spec	19 Mar 2009 05:53:54 -0000	1.1
+++ tucnak2.spec	13 Aug 2009 05:18:25 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           tucnak2
-Version:        2.25
+Version:        2.27
 Release:        1%{?dist}
 Summary:        VHF contest logging program
 
@@ -7,7 +7,7 @@ Group:          Applications/Communicati
 License:        GPLv2+
 URL:            http://tucnak.nagano.cz/wiki/Main_Page
 Source0:        http://tucnak.nagano.cz/%{name}-%{version}.tar.gz
-Patch0:         tucnak2-2.25-soundwrapper.patch
+Patch0:         tucnak2-2.27-soundwrapper.patch
 Patch1:         tucnak2-2.25-sharedconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Lucian Langa <cooly at gnome.eu.org> - 2.27-1
+- update to latest upstream release
+
 * Thu Mar 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.25-1
 - new upstream release
 - update patch0


--- tucnak2-2.25-soundwrapper.patch DELETED ---



From sdz at fedoraproject.org  Thu Aug 13 05:19:06 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 13 Aug 2009 05:19:06 +0000 (UTC)
Subject: rpms/blazeblogger/F-10 blazeblogger.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813051906.9055111C0097@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30064/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	blazeblogger.spec import.log 
Log Message:
initial import



--- NEW FILE blazeblogger.spec ---
Name:           blazeblogger
Version:        0.9.0
Release:        1%{?dist}
Summary:        A simple to use but capable CMS for the command line

Group:          Applications/Publishing
# The application is GPLv3 while the man pages are GFDL
License:        GPLv3 and GFDL
URL:            http://blaze.blackened.cz/
Source0:        http://blazeblogger.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArchitectures: noarch 

%description
Written in Perl as a cross-platform application and producing
the static content without the need of database servers or
server side scripting, BlazeBlogger is literally a CMS without
boundaries suitable for a wide variety of web presentations,
from personal weblog to a project page or even a company presentation.

%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT
make install prefix=$RPM_BUILD_ROOT/usr


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FDL
%{_bindir}/blaze*
%{_mandir}/man1/blaze-*.1.gz
%{_mandir}/man7/blaze*.7.gz


%changelog
* Sun Aug 09 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
- initial packaging


--- NEW FILE import.log ---
blazeblogger-0_9_0-1_fc11:F-10:blazeblogger-0.9.0-1.fc11.src.rpm:1250140714


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:57:04 -0000	1.1
+++ .cvsignore	13 Aug 2009 05:19:06 -0000	1.2
@@ -0,0 +1 @@
+blazeblogger-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:57:04 -0000	1.1
+++ sources	13 Aug 2009 05:19:06 -0000	1.2
@@ -0,0 +1 @@
+79b240e196cdb2f2a765e4ef10546163  blazeblogger-0.9.0.tar.gz



From lucilanga at fedoraproject.org  Thu Aug 13 05:22:00 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Thu, 13 Aug 2009 05:22:00 +0000 (UTC)
Subject: rpms/tucnak2/F-10 tucnak2-2.27-soundwrapper.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tucnak2.spec, 1.1,
	1.2 tucnak2-2.25-soundwrapper.patch, 1.1, NONE
Message-ID: <20090813052200.DB12411C0097@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/tucnak2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30833

Modified Files:
	.cvsignore sources tucnak2.spec 
Added Files:
	tucnak2-2.27-soundwrapper.patch 
Removed Files:
	tucnak2-2.25-soundwrapper.patch 
Log Message:
* Thu Aug 13 2009 Lucian Langa <cooly at gnome.eu.org> - 2.27-1
- update to latest upstream release

tucnak2-2.27-soundwrapper.patch:
 Makefile.in |   22 +++++++++++-----------
 os_dep.c    |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE tucnak2-2.27-soundwrapper.patch ---
diff -Naur tucnak2-2.27/src/Makefile.in tucnak2-2.27-mod/src/Makefile.in
--- tucnak2-2.27/src/Makefile.in	2009-07-09 09:45:00.000000000 +0300
+++ tucnak2-2.27-mod/src/Makefile.in	2009-08-13 08:08:02.000000000 +0300
@@ -81,14 +81,14 @@
 TUCNAK_LDADD = @TUCNAK_LDADD@
 VERSION = @VERSION@
 
-bin_PROGRAMS = tucnak soundwrapper 
+bin_PROGRAMS = tucnak tucnak2-soundwrapper 
 
 tucnak_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc 	control.c cor.c cor.h cordata.c cordata.h cordata.inc 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c 	error.c excdb.c fhs.c fifo.c font.c font.inc gfx_png.c ghash.c 	gptrarray.c hash.c header.h html.c iarray.c iarray.h 	icons.c icons.h icons.inc img_png.c inpout.c inputln.c interfaces.c interfaces.h kbd.c 	kbdbind.c language.c language.h language.inc loc.c main.c map.c 	menu.c menu1.c menu2.c menu3.c menu4.c menu5.c namedb.c net.c ntpq.c 	os_dep.c os_dep.h oss.c ppdev.c rc.c regex.c report.c rotar.c 	qrvdb.c qsodb.c scandir.c scope.c sdev.c sdl.c 	select.c session.c settings.c setup.h sked.c 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c trig.c 	ttys.c txts.c txts.h txts.inc uni_7b.inc winkey.c wizz.c zstring.c
 
 
 tucnak_LDADD = @TUCNAK_LDADD@
 
-soundwrapper_SOURCES = soundwrapper.c	
+tucnak2-soundwrapper_SOURCES = soundwrapper.c	
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -111,10 +111,10 @@
 txts.o winkey.o wizz.o zstring.o
 tucnak_DEPENDENCIES = 
 tucnak_LDFLAGS = 
-soundwrapper_OBJECTS =  soundwrapper.o
-soundwrapper_LDADD = $(LDADD)
-soundwrapper_DEPENDENCIES = 
-soundwrapper_LDFLAGS = 
+tucnak2-soundwrapper_OBJECTS =  soundwrapper.o
+tucnak2-soundwrapper_LDADD = $(LDADD)
+tucnak2-soundwrapper_DEPENDENCIES = 
+tucnak2-soundwrapper_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -126,8 +126,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(tucnak_SOURCES) $(soundwrapper_SOURCES)
-OBJECTS = $(tucnak_OBJECTS) $(soundwrapper_OBJECTS)
+SOURCES = $(tucnak_SOURCES) $(tucnak2-soundwrapper_SOURCES)
+OBJECTS = $(tucnak_OBJECTS) $(tucnak2-soundwrapper_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -188,9 +188,9 @@
 	@rm -f tucnak
 	$(LINK) $(tucnak_LDFLAGS) $(tucnak_OBJECTS) $(tucnak_LDADD) $(LIBS)
 
-soundwrapper: $(soundwrapper_OBJECTS) $(soundwrapper_DEPENDENCIES)
-	@rm -f soundwrapper
-	$(LINK) $(soundwrapper_LDFLAGS) $(soundwrapper_OBJECTS) $(soundwrapper_LDADD) $(LIBS)
+tucnak2-soundwrapper: $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_DEPENDENCIES)
+	@rm -f tucnak2-soundwrapper
+	$(LINK) $(tucnak2-soundwrapper_LDFLAGS) $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_LDADD) $(LIBS)
 
 tags: TAGS
 
diff -Naur tucnak2-2.27/src/os_dep.c tucnak2-2.27-mod/src/os_dep.c
--- tucnak2-2.27/src/os_dep.c	2009-06-21 10:57:46.000000000 +0300
+++ tucnak2-2.27-mod/src/os_dep.c	2009-08-12 07:44:55.000000000 +0300
@@ -1612,7 +1612,7 @@
     dup2(fds[0], 0);
     close(fds[0]);
     for (i=3;i<1024;i++) close(i);
-    execlp("soundwrapper", "soundwrapper", NULL);
+    execlp("tucnak2-soundwrapper", "tucnak2-soundwrapper", NULL);
 	exit(-1);
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Mar 2009 06:24:09 -0000	1.2
+++ .cvsignore	13 Aug 2009 05:22:00 -0000	1.3
@@ -1 +1 @@
-tucnak2-2.25.tar.gz
+tucnak2-2.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Mar 2009 06:24:09 -0000	1.2
+++ sources	13 Aug 2009 05:22:00 -0000	1.3
@@ -1 +1 @@
-560ea856eb48b6e3be23193e31428033  tucnak2-2.25.tar.gz
+fc25c1c9521b4ea98d154a60ad201260  tucnak2-2.27.tar.gz


Index: tucnak2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/F-10/tucnak2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tucnak2.spec	19 Mar 2009 06:24:09 -0000	1.1
+++ tucnak2.spec	13 Aug 2009 05:22:00 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           tucnak2
-Version:        2.25
+Version:        2.27
 Release:        1%{?dist}
 Summary:        VHF contest logging program
 
@@ -7,7 +7,7 @@ Group:          Applications/Communicati
 License:        GPLv2+
 URL:            http://tucnak.nagano.cz/wiki/Main_Page
 Source0:        http://tucnak.nagano.cz/%{name}-%{version}.tar.gz
-Patch0:         tucnak2-2.25-soundwrapper.patch
+Patch0:         tucnak2-2.27-soundwrapper.patch
 Patch1:         tucnak2-2.25-sharedconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Lucian Langa <cooly at gnome.eu.org> - 2.27-1
+- update to latest upstream release
+
 * Thu Mar 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.25-1
 - new upstream release
 - update patch0


--- tucnak2-2.25-soundwrapper.patch DELETED ---



From paragn at fedoraproject.org  Thu Aug 13 05:32:08 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu, 13 Aug 2009 05:32:08 +0000 (UTC)
Subject: rpms/libXaw/devel libXaw.spec,1.32,1.33
Message-ID: <20090813053208.AF6B411C0097@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv490

Modified Files:
	libXaw.spec 
Log Message:

* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.6-4
- Merge-review cleanups #226064
- Updated summary, added Requires: pkgconfig
- removed zero length file AUTHORS




Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libXaw.spec	25 Jul 2009 05:10:03 -0000	1.32
+++ libXaw.spec	13 Aug 2009 05:32:08 -0000	1.33
@@ -1,9 +1,9 @@
 %define with_compat 0
 
-Summary: X.Org X11 libXaw runtime library
+Summary: X Athena Widget Set
 Name: libXaw
 Version: 1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -17,7 +17,7 @@ BuildRequires: pkgconfig(xmu) pkgconfig(
 BuildRequires: ed
 
 %description
-X.Org X11 libXaw runtime library
+Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
 
 %if %{with_compat}
 %package compat
@@ -29,10 +29,10 @@ X.Org X11 libXaw version 6 compatibility
 %endif
 
 %package devel
-Summary: X.Org X11 libXaw development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-
+Requires: pkgconfig
 Requires: pkgconfig(xproto) pkgconfig(xmu) pkgconfig(xt) pkgconfig(xpm)
 
 %description devel
@@ -52,7 +52,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc COPYING README ChangeLog
 %{_libdir}/libXaw.so.7
 %{_libdir}/libXaw7.so.7
 %{_libdir}/libXaw7.so.7.0.0
@@ -91,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.6-4
+- Merge-review cleanups #226064
+- Updated summary, added Requires: pkgconfig
+- removed zero length file AUTHORS 
+
 * 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
 



From jussilehtola at fedoraproject.org  Thu Aug 13 05:47:22 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 05:47:22 +0000 (UTC)
Subject: rpms/pcc/devel import.log, NONE, 1.1 pcc-090808-optflags.patch, NONE,
	1.1 pcc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813054722.94A0111C0097@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pcc-090808-optflags.patch pcc.spec 
Log Message:
Package imported in Fedora.


--- NEW FILE import.log ---
pcc-0_9_9-0_3_090813cvs_fc11:HEAD:pcc-0.9.9-0.3.090813cvs.fc11.src.rpm:1250142387

pcc-090808-optflags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcc-090808-optflags.patch ---
diff -up pcc-090808/pcc-libs/csu/linux/Makefile.orig pcc-090808/pcc-libs/csu/linux/Makefile
--- pcc-090808/pcc-libs/csu/linux/Makefile.orig	2009-01-23 09:10:09.000000000 +0200
+++ pcc-090808/pcc-libs/csu/linux/Makefile	2009-08-08 13:42:43.616850463 +0300
@@ -25,7 +25,7 @@ crtn.o: $(MACH)/crtn.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<
 
 crtbegin.o: crtbegin.c
-	$(CC) -O $(CFLAGS) -c -o $@ $<
+	$(CC) -O $(CFLAGS_NODEBUG) -c -o $@ $<
 
 crtend.o: crtend.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<


--- NEW FILE pcc.spec ---
%global snapshot 090813

Name:		pcc
Version:	0.9.9
Release:	0.3.%{snapshot}cvs%{?dist}
Summary:	The Portable C Compiler
Group:		Development/Languages
License:	BSD and ISC 
URL:		http://pcc.ludd.ltu.se/
Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
# Patch to disable the use of -g on pcc-libs-090805/csu/linux/crtbegin.c which is partly assembler code
Patch0:		pcc-090808-optflags.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Currently only x86 supported both in ppc and ppc-libs
ExclusiveArch:	%{ix86}
BuildRequires:	bison flex
Requires:	glibc-devel

%description
The compiler is based on the original Portable C Compiler by Stephen C.
Johnson, written in the late 70's. Even though much of the compiler has been
rewritten, some of the basics still remain.
PCC debuted in Unix Version 7 and replaced the DMR compiler (Dennis Ritchie's
original C compiler) in both System V and the BSD 4.x releases. Some history
about pcc is in the A History of UNIX before Berkeley: UNIX Evolution:
1975-1984 and in the Evolution of C.

About 50% of the frontend code and 80% of the backend code has been rewritten.
Most stuff is written by Anders Magnusson, with the exception of the data-flow
analysis part and the SSA conversion code which is written by Peter A Jonsson,
and the Mips port that were written as part of a project by undergraduate
students at Lule? University of Technology (LTU).

%prep
%setup -q -n pcc-%{snapshot} -a1
# Get rid of the default optimization flag
find . -name Makefile.in |xargs sed -i 's| -O | |g'
# Rename the libs directory for the patch to work
mv pcc-libs-%{snapshot} pcc-libs
# Apply patch
%patch0 -p1


%build
export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
# First, build the library.
cd pcc-libs
%configure
make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
cd ..
# Then, build the compiler
%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
 --with-libdir=%{_libdir} --with-incdir=%{_includedir}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
# Install the libraries
make -C pcc-libs install DESTDIR=%{buildroot} strip=no
# Install the compiler
make install DESTDIR=%{buildroot} strip=no
# Fix man file perms
chmod 644 %{buildroot}%{_mandir}/man1/*
# Install symlink
ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
# Directory for pcc-specific include files
mkdir -p %{buildroot}%{_includedir}/pcc


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/pcc
%{_bindir}/%{_target_platform}-pcc
%{_libdir}/pcc/
%{_includedir}/pcc/
%{_libexecdir}/%{_target_platform}-cpp
%{_libexecdir}/%{_target_platform}-ccom
%{_mandir}/man1/%{_target_platform}-ccom.1.*
%{_mandir}/man1/%{_target_platform}-cpp.1.*
%{_mandir}/man1/%{_target_platform}-pcc.1.*

%changelog
* Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
- Removed unneeded BR: byacc.
- Update to 20090813.

* Tue Aug 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090811cvs
- Spec file cleanups.
- Update to 20090811.

* Sun Aug 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090809cvs
- Changed --with-libdir to %%{_libdir} to make pcc use the glibc version of crt0.o by suggestion of upstream.
- Update to 20090809.

* Sat Aug 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.1.090808cvs
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:07:32 -0000	1.1
+++ .cvsignore	13 Aug 2009 05:47:21 -0000	1.2
@@ -0,0 +1,2 @@
+pcc-090813.tgz
+pcc-libs-090813.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:07:32 -0000	1.1
+++ sources	13 Aug 2009 05:47:22 -0000	1.2
@@ -0,0 +1,2 @@
+1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
+b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz



From jussilehtola at fedoraproject.org  Thu Aug 13 05:54:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 05:54:39 +0000 (UTC)
Subject: rpms/pcc/EL-5 pcc-090808-optflags.patch, NONE, 1.1 pcc.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090813055439.479F911C0097@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5878/EL-5

Modified Files:
	sources 
Added Files:
	pcc-090808-optflags.patch pcc.spec 
Log Message:
Imported in Fedora.

pcc-090808-optflags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcc-090808-optflags.patch ---
diff -up pcc-090808/pcc-libs/csu/linux/Makefile.orig pcc-090808/pcc-libs/csu/linux/Makefile
--- pcc-090808/pcc-libs/csu/linux/Makefile.orig	2009-01-23 09:10:09.000000000 +0200
+++ pcc-090808/pcc-libs/csu/linux/Makefile	2009-08-08 13:42:43.616850463 +0300
@@ -25,7 +25,7 @@ crtn.o: $(MACH)/crtn.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<
 
 crtbegin.o: crtbegin.c
-	$(CC) -O $(CFLAGS) -c -o $@ $<
+	$(CC) -O $(CFLAGS_NODEBUG) -c -o $@ $<
 
 crtend.o: crtend.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<


--- NEW FILE pcc.spec ---
%global snapshot 090813

Name:		pcc
Version:	0.9.9
Release:	0.3.%{snapshot}cvs%{?dist}
Summary:	The Portable C Compiler
Group:		Development/Languages
License:	BSD and ISC 
URL:		http://pcc.ludd.ltu.se/
Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
# Patch to disable the use of -g on pcc-libs-090805/csu/linux/crtbegin.c which is partly assembler code
Patch0:		pcc-090808-optflags.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Currently only x86 supported both in ppc and ppc-libs
ExclusiveArch:	%{ix86}
BuildRequires:	bison flex
Requires:	glibc-devel

%description
The compiler is based on the original Portable C Compiler by Stephen C.
Johnson, written in the late 70's. Even though much of the compiler has been
rewritten, some of the basics still remain.
PCC debuted in Unix Version 7 and replaced the DMR compiler (Dennis Ritchie's
original C compiler) in both System V and the BSD 4.x releases. Some history
about pcc is in the A History of UNIX before Berkeley: UNIX Evolution:
1975-1984 and in the Evolution of C.

About 50% of the frontend code and 80% of the backend code has been rewritten.
Most stuff is written by Anders Magnusson, with the exception of the data-flow
analysis part and the SSA conversion code which is written by Peter A Jonsson,
and the Mips port that were written as part of a project by undergraduate
students at Lule? University of Technology (LTU).

%prep
%setup -q -n pcc-%{snapshot} -a1
# Get rid of the default optimization flag
find . -name Makefile.in |xargs sed -i 's| -O | |g'
# Rename the libs directory for the patch to work
mv pcc-libs-%{snapshot} pcc-libs
# Apply patch
%patch0 -p1


%build
export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
# First, build the library.
cd pcc-libs
%configure
make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
cd ..
# Then, build the compiler
%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
 --with-libdir=%{_libdir} --with-incdir=%{_includedir}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
# Install the libraries
make -C pcc-libs install DESTDIR=%{buildroot} strip=no
# Install the compiler
make install DESTDIR=%{buildroot} strip=no
# Fix man file perms
chmod 644 %{buildroot}%{_mandir}/man1/*
# Install symlink
ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
# Directory for pcc-specific include files
mkdir -p %{buildroot}%{_includedir}/pcc


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/pcc
%{_bindir}/%{_target_platform}-pcc
%{_libdir}/pcc/
%{_includedir}/pcc/
%{_libexecdir}/%{_target_platform}-cpp
%{_libexecdir}/%{_target_platform}-ccom
%{_mandir}/man1/%{_target_platform}-ccom.1.*
%{_mandir}/man1/%{_target_platform}-cpp.1.*
%{_mandir}/man1/%{_target_platform}-pcc.1.*

%changelog
* Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
- Removed unneeded BR: byacc.
- Update to 20090813.

* Tue Aug 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090811cvs
- Spec file cleanups.
- Update to 20090811.

* Sun Aug 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090809cvs
- Changed --with-libdir to %%{_libdir} to make pcc use the glibc version of crt0.o by suggestion of upstream.
- Update to 20090809.

* Sat Aug 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.1.090808cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:07:32 -0000	1.1
+++ sources	13 Aug 2009 05:54:38 -0000	1.2
@@ -0,0 +1,2 @@
+1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
+b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz



From jussilehtola at fedoraproject.org  Thu Aug 13 05:54:39 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 05:54:39 +0000 (UTC)
Subject: rpms/pcc/F-10 pcc-090808-optflags.patch, NONE, 1.1 pcc.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090813055439.CEEC211C0097@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5878/F-10

Modified Files:
	sources 
Added Files:
	pcc-090808-optflags.patch pcc.spec 
Log Message:
Imported in Fedora.

pcc-090808-optflags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcc-090808-optflags.patch ---
diff -up pcc-090808/pcc-libs/csu/linux/Makefile.orig pcc-090808/pcc-libs/csu/linux/Makefile
--- pcc-090808/pcc-libs/csu/linux/Makefile.orig	2009-01-23 09:10:09.000000000 +0200
+++ pcc-090808/pcc-libs/csu/linux/Makefile	2009-08-08 13:42:43.616850463 +0300
@@ -25,7 +25,7 @@ crtn.o: $(MACH)/crtn.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<
 
 crtbegin.o: crtbegin.c
-	$(CC) -O $(CFLAGS) -c -o $@ $<
+	$(CC) -O $(CFLAGS_NODEBUG) -c -o $@ $<
 
 crtend.o: crtend.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<


--- NEW FILE pcc.spec ---
%global snapshot 090813

Name:		pcc
Version:	0.9.9
Release:	0.3.%{snapshot}cvs%{?dist}
Summary:	The Portable C Compiler
Group:		Development/Languages
License:	BSD and ISC 
URL:		http://pcc.ludd.ltu.se/
Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
# Patch to disable the use of -g on pcc-libs-090805/csu/linux/crtbegin.c which is partly assembler code
Patch0:		pcc-090808-optflags.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Currently only x86 supported both in ppc and ppc-libs
ExclusiveArch:	%{ix86}
BuildRequires:	bison flex
Requires:	glibc-devel

%description
The compiler is based on the original Portable C Compiler by Stephen C.
Johnson, written in the late 70's. Even though much of the compiler has been
rewritten, some of the basics still remain.
PCC debuted in Unix Version 7 and replaced the DMR compiler (Dennis Ritchie's
original C compiler) in both System V and the BSD 4.x releases. Some history
about pcc is in the A History of UNIX before Berkeley: UNIX Evolution:
1975-1984 and in the Evolution of C.

About 50% of the frontend code and 80% of the backend code has been rewritten.
Most stuff is written by Anders Magnusson, with the exception of the data-flow
analysis part and the SSA conversion code which is written by Peter A Jonsson,
and the Mips port that were written as part of a project by undergraduate
students at Lule? University of Technology (LTU).

%prep
%setup -q -n pcc-%{snapshot} -a1
# Get rid of the default optimization flag
find . -name Makefile.in |xargs sed -i 's| -O | |g'
# Rename the libs directory for the patch to work
mv pcc-libs-%{snapshot} pcc-libs
# Apply patch
%patch0 -p1


%build
export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
# First, build the library.
cd pcc-libs
%configure
make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
cd ..
# Then, build the compiler
%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
 --with-libdir=%{_libdir} --with-incdir=%{_includedir}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
# Install the libraries
make -C pcc-libs install DESTDIR=%{buildroot} strip=no
# Install the compiler
make install DESTDIR=%{buildroot} strip=no
# Fix man file perms
chmod 644 %{buildroot}%{_mandir}/man1/*
# Install symlink
ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
# Directory for pcc-specific include files
mkdir -p %{buildroot}%{_includedir}/pcc


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/pcc
%{_bindir}/%{_target_platform}-pcc
%{_libdir}/pcc/
%{_includedir}/pcc/
%{_libexecdir}/%{_target_platform}-cpp
%{_libexecdir}/%{_target_platform}-ccom
%{_mandir}/man1/%{_target_platform}-ccom.1.*
%{_mandir}/man1/%{_target_platform}-cpp.1.*
%{_mandir}/man1/%{_target_platform}-pcc.1.*

%changelog
* Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
- Removed unneeded BR: byacc.
- Update to 20090813.

* Tue Aug 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090811cvs
- Spec file cleanups.
- Update to 20090811.

* Sun Aug 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090809cvs
- Changed --with-libdir to %%{_libdir} to make pcc use the glibc version of crt0.o by suggestion of upstream.
- Update to 20090809.

* Sat Aug 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.1.090808cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:07:32 -0000	1.1
+++ sources	13 Aug 2009 05:54:39 -0000	1.2
@@ -0,0 +1,2 @@
+1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
+b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz



From jussilehtola at fedoraproject.org  Thu Aug 13 05:54:40 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 05:54:40 +0000 (UTC)
Subject: rpms/pcc/F-11 pcc-090808-optflags.patch, NONE, 1.1 pcc.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090813055440.344C611C0097@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5878/F-11

Modified Files:
	sources 
Added Files:
	pcc-090808-optflags.patch pcc.spec 
Log Message:
Imported in Fedora.

pcc-090808-optflags.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcc-090808-optflags.patch ---
diff -up pcc-090808/pcc-libs/csu/linux/Makefile.orig pcc-090808/pcc-libs/csu/linux/Makefile
--- pcc-090808/pcc-libs/csu/linux/Makefile.orig	2009-01-23 09:10:09.000000000 +0200
+++ pcc-090808/pcc-libs/csu/linux/Makefile	2009-08-08 13:42:43.616850463 +0300
@@ -25,7 +25,7 @@ crtn.o: $(MACH)/crtn.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<
 
 crtbegin.o: crtbegin.c
-	$(CC) -O $(CFLAGS) -c -o $@ $<
+	$(CC) -O $(CFLAGS_NODEBUG) -c -o $@ $<
 
 crtend.o: crtend.c
 	$(CC) -O $(CFLAGS) -c -o $@ $<


--- NEW FILE pcc.spec ---
%global snapshot 090813

Name:		pcc
Version:	0.9.9
Release:	0.3.%{snapshot}cvs%{?dist}
Summary:	The Portable C Compiler
Group:		Development/Languages
License:	BSD and ISC 
URL:		http://pcc.ludd.ltu.se/
Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
# Patch to disable the use of -g on pcc-libs-090805/csu/linux/crtbegin.c which is partly assembler code
Patch0:		pcc-090808-optflags.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Currently only x86 supported both in ppc and ppc-libs
ExclusiveArch:	%{ix86}
BuildRequires:	bison flex
Requires:	glibc-devel

%description
The compiler is based on the original Portable C Compiler by Stephen C.
Johnson, written in the late 70's. Even though much of the compiler has been
rewritten, some of the basics still remain.
PCC debuted in Unix Version 7 and replaced the DMR compiler (Dennis Ritchie's
original C compiler) in both System V and the BSD 4.x releases. Some history
about pcc is in the A History of UNIX before Berkeley: UNIX Evolution:
1975-1984 and in the Evolution of C.

About 50% of the frontend code and 80% of the backend code has been rewritten.
Most stuff is written by Anders Magnusson, with the exception of the data-flow
analysis part and the SSA conversion code which is written by Peter A Jonsson,
and the Mips port that were written as part of a project by undergraduate
students at Lule? University of Technology (LTU).

%prep
%setup -q -n pcc-%{snapshot} -a1
# Get rid of the default optimization flag
find . -name Makefile.in |xargs sed -i 's| -O | |g'
# Rename the libs directory for the patch to work
mv pcc-libs-%{snapshot} pcc-libs
# Apply patch
%patch0 -p1


%build
export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
# First, build the library.
cd pcc-libs
%configure
make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
cd ..
# Then, build the compiler
%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
 --with-libdir=%{_libdir} --with-incdir=%{_includedir}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
# Install the libraries
make -C pcc-libs install DESTDIR=%{buildroot} strip=no
# Install the compiler
make install DESTDIR=%{buildroot} strip=no
# Fix man file perms
chmod 644 %{buildroot}%{_mandir}/man1/*
# Install symlink
ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
# Directory for pcc-specific include files
mkdir -p %{buildroot}%{_includedir}/pcc


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/pcc
%{_bindir}/%{_target_platform}-pcc
%{_libdir}/pcc/
%{_includedir}/pcc/
%{_libexecdir}/%{_target_platform}-cpp
%{_libexecdir}/%{_target_platform}-ccom
%{_mandir}/man1/%{_target_platform}-ccom.1.*
%{_mandir}/man1/%{_target_platform}-cpp.1.*
%{_mandir}/man1/%{_target_platform}-pcc.1.*

%changelog
* Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
- Removed unneeded BR: byacc.
- Update to 20090813.

* Tue Aug 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090811cvs
- Spec file cleanups.
- Update to 20090811.

* Sun Aug 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.2.090809cvs
- Changed --with-libdir to %%{_libdir} to make pcc use the glibc version of crt0.o by suggestion of upstream.
- Update to 20090809.

* Sat Aug 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.1.090808cvs
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:07:32 -0000	1.1
+++ sources	13 Aug 2009 05:54:39 -0000	1.2
@@ -0,0 +1,2 @@
+1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
+b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz



From jussilehtola at fedoraproject.org  Thu Aug 13 06:04:29 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 06:04:29 +0000 (UTC)
Subject: rpms/pcc/EL-5 pcc.spec,1.1,1.2
Message-ID: <20090813060429.8C7A511C0097@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118/EL-5

Modified Files:
	pcc.spec 
Log Message:
Fix build.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/EL-5/pcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pcc.spec	13 Aug 2009 05:54:38 -0000	1.1
+++ pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
@@ -65,7 +65,7 @@ make install DESTDIR=%{buildroot} strip=
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
 # Install symlink
-ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 



From jussilehtola at fedoraproject.org  Thu Aug 13 06:04:29 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 06:04:29 +0000 (UTC)
Subject: rpms/pcc/F-10 pcc.spec,1.1,1.2
Message-ID: <20090813060429.BA62211C0349@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118/F-10

Modified Files:
	pcc.spec 
Log Message:
Fix build.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/pcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pcc.spec	13 Aug 2009 05:54:39 -0000	1.1
+++ pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
@@ -65,7 +65,7 @@ make install DESTDIR=%{buildroot} strip=
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
 # Install symlink
-ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 



From jussilehtola at fedoraproject.org  Thu Aug 13 06:04:30 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 06:04:30 +0000 (UTC)
Subject: rpms/pcc/devel pcc.spec,1.1,1.2
Message-ID: <20090813060430.1DD4011C043D@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118/devel

Modified Files:
	pcc.spec 
Log Message:
Fix build.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/pcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pcc.spec	13 Aug 2009 05:47:22 -0000	1.1
+++ pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
@@ -65,7 +65,7 @@ make install DESTDIR=%{buildroot} strip=
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
 # Install symlink
-ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 



From jussilehtola at fedoraproject.org  Thu Aug 13 06:04:29 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 06:04:29 +0000 (UTC)
Subject: rpms/pcc/F-11 pcc.spec,1.1,1.2
Message-ID: <20090813060429.E0B2C11C043C@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8118/F-11

Modified Files:
	pcc.spec 
Log Message:
Fix build.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-11/pcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pcc.spec	13 Aug 2009 05:54:39 -0000	1.1
+++ pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
@@ -65,7 +65,7 @@ make install DESTDIR=%{buildroot} strip=
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
 # Install symlink
-ln -s %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 



From tsmetana at fedoraproject.org  Thu Aug 13 06:14:41 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu, 13 Aug 2009 06:14:41 +0000 (UTC)
Subject: rpms/gnomebaker/devel gnomebaker.spec,1.20,1.21
Message-ID: <20090813061441.D2A2611C0097@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10853

Modified Files:
	gnomebaker.spec 
Log Message:
* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-5
- And update the mime database...



Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gnomebaker.spec	12 Aug 2009 15:29:53 -0000	1.20
+++ gnomebaker.spec	13 Aug 2009 06:14:40 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -66,12 +66,13 @@ rm -rf $RPM_BUILD_ROOT
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
 scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -86,6 +87,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-5
+- And update the mime database...
+
 * Wed Aug 12 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-4
 - fix #506397 - missing MimeType entry in .desktop file
 



From tsmetana at fedoraproject.org  Thu Aug 13 06:24:26 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu, 13 Aug 2009 06:24:26 +0000 (UTC)
Subject: rpms/gnomebaker/F-11 gnomebaker.spec,1.19,1.20
Message-ID: <20090813062426.0A76E11C0097@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13030

Modified Files:
	gnomebaker.spec 
Log Message:
* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-4
- And update the mime database...



Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-11/gnomebaker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnomebaker.spec	12 Aug 2009 15:45:25 -0000	1.19
+++ gnomebaker.spec	13 Aug 2009 06:24:25 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -66,12 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %postun
 scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -86,6 +88,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-4
+- And update the mime database...
+
 * Wed Aug 12 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-3
 - fix #506397 - missing MimeType entry in .desktop file
 



From msivak at fedoraproject.org  Thu Aug 13 06:30:10 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Thu, 13 Aug 2009 06:30:10 +0000 (UTC)
Subject: rpms/python-cryptsetup/devel python-cryptsetup.spec,1.13,1.14
Message-ID: <20090813063010.76D8F11C048B@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/python-cryptsetup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14193

Modified Files:
	python-cryptsetup.spec 
Log Message:
new build



Index: python-cryptsetup.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-cryptsetup.spec	26 Jul 2009 20:15:37 -0000	1.13
+++ python-cryptsetup.spec	13 Aug 2009 06:30:09 -0000	1.14
@@ -2,13 +2,18 @@
 
 Name:           python-cryptsetup
 Version:        0.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for cryptsetup
 
 Group:          Development/Libraries
 License:        GPLv2+
-Url:            http://msivak.fedorapeople.org/pycryptsetup
-Source:         http://msivak.fedorapeople.org/pycryptsetup/%{name}-%{version}.tar.bz2
+Url:            http://git.fedorahosted.org/git/?p=python-cryptsetup.git
+
+# To generate source do
+# git clone git://git.fedorahosted.org/python-cryptsetup.git
+# make archive
+
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cryptsetup-luks-devel
@@ -42,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc selftest.py
 
 %changelog
+* Thu Aug 13 2009 Martin Sivak <msivak at redhat dot com> - 0.0.9-3
+- spec file change, point to proper project url
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From paragn at fedoraproject.org  Thu Aug 13 06:30:10 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu, 13 Aug 2009 06:30:10 +0000 (UTC)
Subject: rpms/libX11/devel libX11.spec,1.65,1.66
Message-ID: <20090813063010.78DE611C04DB@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14178

Modified Files:
	libX11.spec 
Log Message:
* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.2.99-5.20090805
- Merge-review cleanups #226062




Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- libX11.spec	5 Aug 2009 22:56:36 -0000	1.65
+++ libX11.spec	13 Aug 2009 06:30:09 -0000	1.66
@@ -1,10 +1,10 @@
 %define tarball libX11
 %define gitdate 20090805
 
-Summary: X.Org X11 libX11 runtime library
+Summary: Core X11 protocol client library
 Name: libX11
 Version: 1.2.99
-Release: 4.%{gitdate}%{?dist}
+Release: 5.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -28,10 +28,10 @@ BuildRequires: libXdmcp-devel
 Requires: %{name}-common = %{version}-%{release}
 
 %description
-X.Org X11 libX11 runtime library
+Core X11 protocol client library.
 
 %package common
-Summary: libX11 common data
+Summary: Common data for libX11
 Group: System Environment/Libraries
 BuildArch: noarch
 
@@ -39,7 +39,7 @@ BuildArch: noarch
 libX11 common data
 
 %package devel
-Summary: X.Org X11 libX11 development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -66,7 +66,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
 find $RPM_BUILD_ROOT -type f -name '*.la' -delete
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.2.99-5.20090805
+- Merge-review cleanups #226062
+
 * Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-4.20090805
 - Today's git snapshot
 - minor soname bump to 6.3.0



From whot at fedoraproject.org  Thu Aug 13 07:04:16 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 13 Aug 2009 07:04:16 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 .cvsignore, 1.60, 1.61 sources, 1.55,
	1.56 xorg-x11-server.spec, 1.454,
	1.455 xserver-1.6.0-selinux-less.patch, 1.1,
	NONE xserver-1.6.1-pea-quirk.patch, 1.1, NONE
Message-ID: <20090813070416.E510311C0097@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-serv21603

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.6.0-selinux-less.patch xserver-1.6.1-pea-quirk.patch 
Log Message:
* Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-1
- xserver 1.6.3
- xserver-1.6.0-selinux-less.patch: Drop
  xserver-1.6.1-pea-quirk.patch: Drop



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	8 Jul 2009 22:13:01 -0000	1.60
+++ .cvsignore	13 Aug 2009 07:04:13 -0000	1.61
@@ -1 +1 @@
-xorg-server-1.6.2.tar.bz2
+xorg-server-1.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	8 Jul 2009 22:13:01 -0000	1.55
+++ sources	13 Aug 2009 07:04:14 -0000	1.56
@@ -1 +1 @@
-37641d0899df8a9c4a6284586d932b8d  xorg-server-1.6.2.tar.bz2
+0af168abeefa6579cab20387f75c0c7a  xorg-server-1.6.3.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- xorg-x11-server.spec	28 Jul 2009 23:02:45 -0000	1.454
+++ xorg-x11-server.spec	13 Aug 2009 07:04:14 -0000	1.455
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.2
-Release:   3%{?dist}
+Version:   1.6.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -80,9 +80,6 @@ Patch6011: xserver-1.6.0-less-acpi-broke
 # don't try intel on poulsbo
 Patch6012: xserver-1.5.99.902-sod-off-poulsbo.patch
 
-# don't do selinux if we're not told to
-Patch6013: xserver-1.6.0-selinux-less.patch
-
 # https://bugs.freedesktop.org/show_bug.cgi?id=20087
 Patch6015: xserver-1.5.99.902-vnc.patch
 
@@ -108,8 +105,6 @@ Patch6041: xserver-1.6.1-synaptics.patch
 Patch6042: xserver-1.6.1-proc-cmdline.patch
 # second part to xserver-1.6.1-synaptics.patch
 Patch6043: xserver-1.6.1-mousedrivers.patch
-# #492359, monitor doesn't set first detailed timing preferred bit
-Patch6045: xserver-1.6.1-pea-quirk.patch
 
 Patch6046: xserver-1.6.1-fix-glx-drawable.patch
 
@@ -532,6 +527,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-1
+- xserver 1.6.3
+- xserver-1.6.0-selinux-less.patch: Drop
+  xserver-1.6.1-pea-quirk.patch: Drop
+
 * Wed Jul 29 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.2-3
 - Fix nouveau autoconfig patch (rh#512851)
 


--- xserver-1.6.0-selinux-less.patch DELETED ---


--- xserver-1.6.1-pea-quirk.patch DELETED ---



From fujiwara at fedoraproject.org  Thu Aug 13 07:27:58 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Thu, 13 Aug 2009 07:27:58 +0000 (UTC)
Subject: rpms/ibus-anthy/devel ibus-anthy.spec,1.20,1.21 sources,1.17,1.18
Message-ID: <20090813072758.4309311C0097@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26827

Modified Files:
	ibus-anthy.spec sources 
Log Message:

Fix bug 509483 - reconversion feature doesn't work
Fix bug 509485 - commit_first_segment feature doesn't work



Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-anthy.spec	4 Aug 2009 05:52:47 -0000	1.20
+++ ibus-anthy.spec	13 Aug 2009 07:27:56 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define require_ibus_version 1.2.0
 Name:       ibus-anthy
-Version:    1.2.0.20090804
+Version:    1.2.0.20090813
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -57,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Aug 13 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090813-1
+- Update to 1.2.0.20090804
+- Fix bug 509483 - reconversion feature doesn't work
+- Fix bug 509485 - commit_first_segment feature doesn't work
+
 * Tue Aug 04 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090804-1
 - Update to 1.2.0.20090804
 - Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	4 Aug 2009 05:52:47 -0000	1.17
+++ sources	13 Aug 2009 07:27:57 -0000	1.18
@@ -1 +1 @@
-00106d050cf8bb249504a87b7482e8f8  ibus-anthy-1.2.0.20090804.tar.gz
+6a1bfb19a95fcfd31ee801218d915468  ibus-anthy-1.2.0.20090813.tar.gz



From braden at fedoraproject.org  Thu Aug 13 07:37:41 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Thu, 13 Aug 2009 07:37:41 +0000 (UTC)
Subject: rpms/openvrml/devel .cvsignore, 1.22, 1.23 openvrml.spec, 1.69,
	1.70 sources, 1.22, 1.23 openvrml-player-visibility.patch, 1.3, NONE
Message-ID: <20090813073741.5357D11C0097@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29161/devel

Modified Files:
	.cvsignore openvrml.spec sources 
Removed Files:
	openvrml-player-visibility.patch 
Log Message:
Updates for 0.18.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	7 Jul 2009 06:02:47 -0000	1.22
+++ .cvsignore	13 Aug 2009 07:37:40 -0000	1.23
@@ -1 +1 @@
-openvrml-0.18.2.tar.gz
+openvrml-0.18.3.tar.gz


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- openvrml.spec	25 Jul 2009 20:56:29 -0000	1.69
+++ openvrml.spec	13 Aug 2009 07:37:41 -0000	1.70
@@ -1,12 +1,11 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.18.2
-Release:        3%{?dist}
+Version:        0.18.3
+Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
 Source:         http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          openvrml-player-visibility.patch
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.18.0
@@ -99,8 +98,6 @@ BuildArch:      noarch
 %prep
 %setup
 
-%patch
-
 %build
 CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden -Wno-missing-braces"
 %configure --disable-static --enable-exception-specs=nothrow --disable-examples CPPFLAGS="-I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" JAVA_HOME=/usr/lib/jvm/jre
@@ -191,6 +188,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Aug 13 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-1
+- Updated to 0.18.3.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	7 Jul 2009 06:02:47 -0000	1.22
+++ sources	13 Aug 2009 07:37:41 -0000	1.23
@@ -1 +1 @@
-b8af1ab43e5e8a1617323693810b8bd7  openvrml-0.18.2.tar.gz
+82cee1ae3d9e9a0f71740f93d6dba24c  openvrml-0.18.3.tar.gz


--- openvrml-player-visibility.patch DELETED ---



From braden at fedoraproject.org  Thu Aug 13 07:37:40 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Thu, 13 Aug 2009 07:37:40 +0000 (UTC)
Subject: rpms/openvrml/F-11 .cvsignore, 1.22, 1.23 openvrml.spec, 1.67,
	1.68 sources, 1.22, 1.23 openvrml-player-visibility.patch, 1.3, NONE
Message-ID: <20090813073740.E900F11C0097@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29161/F-11

Modified Files:
	.cvsignore openvrml.spec sources 
Removed Files:
	openvrml-player-visibility.patch 
Log Message:
Updates for 0.18.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	7 Jul 2009 06:02:46 -0000	1.22
+++ .cvsignore	13 Aug 2009 07:37:40 -0000	1.23
@@ -1 +1 @@
-openvrml-0.18.2.tar.gz
+openvrml-0.18.3.tar.gz


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- openvrml.spec	24 Jul 2009 01:24:49 -0000	1.67
+++ openvrml.spec	13 Aug 2009 07:37:40 -0000	1.68
@@ -1,12 +1,11 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.18.2
-Release:        2%{?dist}
+Version:        0.18.3
+Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
 Source:         http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          openvrml-player-visibility.patch
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.18.0
@@ -99,8 +98,6 @@ BuildArch:      noarch
 %prep
 %setup
 
-%patch
-
 %build
 CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden -Wno-missing-braces"
 %configure --disable-static --enable-exception-specs=nothrow --disable-examples CPPFLAGS="-I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" JAVA_HOME=/usr/lib/jvm/jre
@@ -191,6 +188,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
   
 %changelog
+* Thu Aug 13 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-1
+- Updated to 0.18.3.
+
 * Thu Jul 23 2009  Braden McDaniel  <braden at endoframe.com>
 - Made dependencies on gecko-libs and java arch-specific.
 - Removed unnecessary (redundant) dependencies on libGLU-devel and


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	7 Jul 2009 06:02:47 -0000	1.22
+++ sources	13 Aug 2009 07:37:40 -0000	1.23
@@ -1 +1 @@
-b8af1ab43e5e8a1617323693810b8bd7  openvrml-0.18.2.tar.gz
+82cee1ae3d9e9a0f71740f93d6dba24c  openvrml-0.18.3.tar.gz


--- openvrml-player-visibility.patch DELETED ---



From kushal at fedoraproject.org  Thu Aug 13 07:39:46 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Thu, 13 Aug 2009 07:39:46 +0000 (UTC)
Subject: rpms/translation-filter/EL-5 translation-filter.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090813073946.EBFC911C0097@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/translation-filter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29654

Modified Files:
	sources 
Added Files:
	translation-filter.spec 
Log Message:
Initial import in EL5



--- NEW FILE translation-filter.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           translation-filter
Version:        1.0
Release:        1%{?dist}
Summary:        A l10n file filter

Group:          Development/Languages
License:        GPLv2
URL:            http://fedorahosted.org/translation-filter
Source0:        http://fedorahosted.org/releases/t/r/translation-filter/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools, desktop-file-utils
Requires:       translate-toolkit, pygtk2-libglade, pygtk2

%if 0%{?fedora}
BuildRequires:  PyQt4-devel
%endif

%description
A l10n file filter to check translations
%if 0%{?fedora}
%package        kde
Summary:        translation-filter KDE based UI
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}
Requires:       PyQt4

%description    kde
KDE UI for translation-filter
%endif


%prep
%setup -q


%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 --vendor="fedora"                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications           \
%{buildroot}/%{_datadir}/applications/translation-filter.desktop
rm -rf %{buildroot}/%{_datadir}/applications/translation-filter.desktop

desktop-file-install --vendor="fedora"                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications           \
%{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop

rm %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
rm %{buildroot}/%{_datadir}/applications/translation-filter.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%if 0%{?rhel}
%exclude
%{python_sitelib}/Translationfilter/TranslationApp.py*
%{_bindir}/translation-filter-gui
%{_datadir}/translationfilter/ui/*
%{_datadir}/applications/translation-filter-kde-fedora.desktop
%{_datadir}/applications/*-kde.desktop
%endif


%if 0%{?fedora}
%files kde
%defattr(-,root,root,-)
%{python_sitelib}/Translationfilter/TranslationApp.py*
%{_bindir}/translation-filter-gui
%{_datadir}/translationfilter/ui/*
%{_datadir}/applications/fedora-translation-filter-kde.desktop
%endif

%files
%defattr(-,root,root,-)
%doc docs/README docs/ChangeLog docs/COPYING
# For noarch packages: sitelib
%{python_sitelib}/Translationfilter/BasicTranslation.py*
%{python_sitelib}/Translationfilter/poparser.py*
%{python_sitelib}/Translationfilter/__init__.py*
%{python_sitelib}/*.egg-info
%{_bindir}/translation-filter
%{_bindir}/translation-filter-gnome
%{_datadir}/translationfilter/data/*
%{_datadir}/translationfilter/tf-gnome/*
%{_datadir}/pixmaps/translation-filter.png
%{_datadir}/applications/fedora-translation-filter.desktop

%changelog
* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 1.0-1
- The 1.0 release

* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 0.1-2
- Fixing file issues

* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 0.1-1
- New release of version 0.1

* Wed Jun 10 2009 Kushal Das <kushal at fedoraproject.org> 0.0.4-1
- New release of version 0.0.4

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-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.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.0.2-3
- Rebuild for Python 2.6

* Mon Aug 11 2008 Kushal Das <kushal at fedoraproject.org> 0.0.2-2
- Fixed BR and LICENSE issue

* Wed Aug 06 2008 Kushal Das <kushal at fedoraproject.org> 0.0.2-1
- New version 

* Mon Aug 04 2008 Kushal Das <kushal at fedoraproject.org> 0.0.1-1
- Initial release



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2008 17:23:12 -0000	1.1
+++ sources	13 Aug 2009 07:39:46 -0000	1.2
@@ -0,0 +1 @@
+ca6b4bf23f0745e6717905b3d62b32b0  translation-filter-0.0.2.tar.gz



From kushal at fedoraproject.org  Thu Aug 13 07:41:56 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Thu, 13 Aug 2009 07:41:56 +0000 (UTC)
Subject: rpms/translation-filter/EL-5 translation-filter.spec,1.1,1.2
Message-ID: <20090813074156.4770111C0097@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/translation-filter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30218

Modified Files:
	translation-filter.spec 
Log Message:
fixing the initial spec file, imported wrong file


Index: translation-filter.spec
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/EL-5/translation-filter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- translation-filter.spec	13 Aug 2009 07:39:46 -0000	1.1
+++ translation-filter.spec	13 Aug 2009 07:41:55 -0000	1.2
@@ -98,12 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 1.0-1
 - The 1.0 release
 
-* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 0.1-2
-- Fixing file issues
-
-* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 0.1-1
-- New release of version 0.1
-
 * Wed Jun 10 2009 Kushal Das <kushal at fedoraproject.org> 0.0.4-1
 - New release of version 0.0.4
 



From akurtakov at fedoraproject.org  Thu Aug 13 07:47:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 13 Aug 2009 07:47:54 +0000 (UTC)
Subject: rpms/jakarta-commons-net/devel build.xml.tar.gz, NONE,
	1.1 commons-net-MANIFEST.MF, NONE, 1.1 .cvsignore, 1.2,
	1.3 jakarta-commons-net.spec, 1.10, 1.11 sources, 1.2,
	1.3 commons-net-1.4.1-jpp-depmap.xml, 1.1,
	NONE commons-net-1.4.1-disable-tests.patch, 1.1,
	NONE pom-maven2jpp-newdepmap.xsl, 1.1,
	NONE commons-net-1.4.1-project_properties.patch, 1.2,
	NONE pom-maven2jpp-depcat.xsl, 1.1, NONE MANIFEST.MF, 1.1,
	NONE commons-net-1.4.1.pom, 1.1,
	NONE jakarta-commons-net-crosslink.patch, 1.2,
	NONE commons-net-1.4.1-project_xml.patch, 1.3,
	NONE jakarta-commons-net-build-xml.patch, 1.1,
	NONE pom-maven2jpp-mapdeps.xsl, 1.1, NONE
Message-ID: <20090813074754.4977811C0097@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-net/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32317/devel

Modified Files:
	.cvsignore jakarta-commons-net.spec sources 
Added Files:
	build.xml.tar.gz commons-net-MANIFEST.MF 
Removed Files:
	commons-net-1.4.1-jpp-depmap.xml 
	commons-net-1.4.1-disable-tests.patch 
	pom-maven2jpp-newdepmap.xsl 
	commons-net-1.4.1-project_properties.patch 
	pom-maven2jpp-depcat.xsl MANIFEST.MF commons-net-1.4.1.pom 
	jakarta-commons-net-crosslink.patch 
	commons-net-1.4.1-project_xml.patch 
	jakarta-commons-net-build-xml.patch pom-maven2jpp-mapdeps.xsl 
Log Message:
Update to upstream 2.0.


--- NEW FILE build.xml.tar.gz ---
?
?;Z????XR#?R???????????$J8?-?\?2mu???fj???L?A?	C1l??]E?	?,y?^?/ 'W??7??3???zy?????YG?(%\R"^c??pwoP?????????~??$?cIB4??se
j????&?A?/???
:yv?n>?]????N?????
av?}????vw??\??a??f+?K7?	!5 ??????????)????[?]A??CG?l<?hB?1??;?_
,\???{y???1Mpt????????[A8?^?&mDeV?????????n?O?J.3?fz?W??
fM?
??68?sA
???s???lf\<????]mRN?
=??S??%i????????g????!??+???'?????SU?)????0??d!I#6??Ce?,?E?n?@???[1O???????o??b???1????vj??~l??u?M??.?j???d??
+X???B???)????4?g?@4??? ??TJ@?????|??_?p?A???A*?E????]??VlN?????0?c?x?[?????3?,v?2??Z??XHrO9K??*????????rq?y????	????a?	???%??L=t????B???5Y??`?/c0;?;[??Hj,?Jr?x|%??L??+?????S???6d???|l]????	???ts?uf?????v??r????a?|?????K???O3??4?X?jP?=
??6???s?m("!??zF?V????P???0??r?r:U[N?(I??m?3?F9???1?Q???erm?/&??,??M?????????P??????`m?W???T??*L
???Y?^?~?a??T???DD???f??(??n?umG????^?J????$??{???QW?!4?????????????f?^3?b+?????F?G?a ???Gq???x?]?;[Ub????tU??=`?H^?
?(?????`b?'???%b?K??yy???jd;#&?yBv{???57?Ap?Y"
p?
:?Uhe??u#Y?(?(?9???8?&-PmqL?ty[??On????S?!`?I??(+a+D?Dp3?n?5??g?N\?(g?? ?
H.?kT?V??"?07:|?j?Y/?8??c??c1????=??
?2y??:D%\w4]R??}I?????????&@?????
^?P?{???L;~u?*vC[???A?F7???)?pg????o???Y?pi?????5???r.Z@??
X?,???????@??)??h?e0?:?
CU??z?!??Y?
dh?
?5lh?lC?9???????X,Q?fI??G]34?(?k"??
sx?#?????j????V7???FS??R?O??==4????@_? +?+|??B??????Jew?V?
?Z?[?!;?:?s?
[?X?
?_,?:R????&?}u??m?jQ?r?6??K?G???=?xqv??2?????&@????m* ?W???@D4?X?:??????????hV?ruh??Gd??n???G???#b??=d??^?]S???H[+????????????4?_?&?s?s'9t?n*?B??T%??????l??%???S
B?::&QW????BcQ??	?O ?????BJ3mE*tl???????j????????C???2?ZW?$??$??t?>a??P??;;|????[Nq?YC@(?`.T?v}????,??????n??'????`?Y-???h!????G(?wE??G??x???De?^????DW??? ??*?)??&????]Zq?u??;??#{?I??*Y????|?f']?_\/?4???????e^)Tjt?f?Yd??0?cB~>-J]fS
???z?Y? KF"?O?tUem'/S??Jv????CN?L???I???7{H"??\N8P???g;??KNq?`N n?9?3??R?????????/.???pv?@]:???????
??????*???3??????*X??????xCo?UCle???4"??z???:S1a????L???x?_Zm?qm)?????GR?$???z?0:T?O???V%??5????o?oiQ/???6m?6m?6m?6m?6m?6m?6m?6m?6m???????

--- NEW FILE commons-net-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-DocURL: http://commons.apache.org/net/
Implementation-Vendor: The Apache Software Foundation
Bundle-Localization: plugin
X-Compile-Target-JDK: 1.5
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Implementation-Vendor-Id: org.apache
Built-By: Rory
Bundle-SymbolicName: org.apache.commons.net
Export-Package: org.apache.commons.net;version="2.0",org.apache.common
 s.net.bsd;version="2.0",org.apache.commons.net.chargen;version="2.0",
 org.apache.commons.net.daytime;version="2.0",org.apache.commons.net.d
 iscard;version="2.0",org.apache.commons.net.echo;version="2.0",org.ap
 ache.commons.net.finger;version="2.0",org.apache.commons.net.ftp;vers
 ion="2.0",org.apache.commons.net.ftp.parser;version="2.0",org.apache.
 commons.net.io;version="2.0",org.apache.commons.net.nntp;version="2.0
 ",org.apache.commons.net.ntp;version="2.0",org.apache.commons.net.pop
 3;version="2.0",org.apache.commons.net.smtp;version="2.0",org.apache.
 commons.net.telnet;version="2.0",org.apache.commons.net.tftp;version=
 "2.0",org.apache.commons.net.time;version="2.0",org.apache.commons.ne
 t.util;version="2.0",org.apache.commons.net.whois;version="2.0"
Bundle-Version: 2.0.0.v200905272248
X-Compile-Source-JDK: 1.5
Specification-Version: 2.0
Specification-Title: Commons Net
Bundle-Description: %bundleDesc
Specification-Vendor: The Apache Software Foundation
Build-Jdk: 1.5.0_04
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Implementation-Title: Commons Net
Implementation-Version: 2.0
Import-Package: javax.net,javax.net.ssl,org.apache.commons.net;version
 ="2.0",org.apache.commons.net.bsd;version="2.0",org.apache.commons.ne
 t.chargen;version="2.0",org.apache.commons.net.daytime;version="2.0",
 org.apache.commons.net.discard;version="2.0",org.apache.commons.net.e
 cho;version="2.0",org.apache.commons.net.finger;version="2.0",org.apa
 che.commons.net.ftp;version="2.0",org.apache.commons.net.ftp.parser;v
 ersion="2.0",org.apache.commons.net.io;version="2.0",org.apache.commo
 ns.net.nntp;version="2.0",org.apache.commons.net.ntp;version="2.0",or
 g.apache.commons.net.pop3;version="2.0",org.apache.commons.net.smtp;v
 ersion="2.0",org.apache.commons.net.telnet;version="2.0",org.apache.c
 ommons.net.tftp;version="2.0",org.apache.commons.net.time;version="2.
 0",org.apache.commons.net.util;version="2.0",org.apache.commons.net.w
 hois;version="2.0"
Bundle-ManifestVersion: 2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Mar 2007 21:51:14 -0000	1.2
+++ .cvsignore	13 Aug 2009 07:47:53 -0000	1.3
@@ -1,2 +1,3 @@
 commons-build.tar.gz
 commons-net-1.4.1-src.tar.gz
+commons-net-2.0-src.tar.bz2


Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- jakarta-commons-net.spec	25 Jul 2009 03:51:42 -0000	1.10
+++ jakarta-commons-net.spec	13 Aug 2009 07:47:53 -0000	1.11
@@ -28,43 +28,24 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _without_maven 1
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
- 
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 %define _without_tests 1
 %define without_tests %{?_without_tests:1}%{!?_without_tests:%{?_with_tests:0}%{!?_with_tests:%{?_tests:%{_tests}}%{!?_tests:0}}}
-%define gcj_support 0
 %define base_name    net
 %define short_name   commons-%{base_name}
 
 Name:           jakarta-commons-net
-Version:        1.4.1
-Release:        6.4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Internet protocol suite Java library
 License:        ASL 2.0
 Group:          Development/Libraries/Java
-Url:            http://jakarta.apache.org/commons/%{base_name}/
-Source0:        http://www.apache.org/dist/jakarta/commons/net/source/commons-net-1.4.1-src.tar.gz
-Source1:        pom-maven2jpp-depcat.xsl
-Source2:        pom-maven2jpp-newdepmap.xsl
-Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        commons-net-1.4.1-jpp-depmap.xml
-
-# svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
-# tar czf commons-build.tar.gz commons-build
-Source5:        commons-build.tar.gz
-Source6:        commons-net-1.4.1.pom
-Source7:	MANIFEST.MF
-
-Patch0:         %{name}-crosslink.patch
-Patch1:         %{short_name}-%{version}-project_xml.patch
-Patch2:         %{short_name}-%{version}-project_properties.patch
-Patch3:         %{name}-build-xml.patch
+URL:            http://commons.apache.org/%{base_name}/
+Source0:        http://apache.mirror.rbftpnetworks.com/commons/net/source/commons-net-2.0-src.tar.bz2
+# generated by mvn ant:ant
+Source1:	    commons-net-MANIFEST.MF
+Source2:	    build.xml.tar.gz
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 %if ! %{without_tests}
@@ -73,36 +54,14 @@ BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit >= 3.8.1
 BuildRequires:  java-javadoc
 BuildRequires:  oro >= 2.0.8
-%if %{with_maven}
-BuildRequires:  maven >= 0:1.1
-BuildRequires:  maven-plugins-base
-BuildRequires:  maven-plugin-changes
-BuildRequires:  maven-plugin-checkstyle
-BuildRequires:  maven-plugin-jcoverage
-BuildRequires:  maven-plugin-jdepend
-BuildRequires:  maven-plugin-jxr
-BuildRequires:  maven-plugin-license
-BuildRequires:  maven-plugin-tasklist
-BuildRequires:  maven-plugin-test
-BuildRequires:  maven-plugin-xdoc
-
 BuildRequires:  saxon
-BuildRequires:  saxon-scripts
-%endif
 Requires:       oro >= 2.0.8
 Requires:       java
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:       %{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
 Requires:       jpackage-utils >= 0:1.7.2
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
 
 %description
 This is an Internet protocol suite Java library originally developed by
@@ -118,80 +77,19 @@ Group:      Documentation
 %description javadoc
 Javadoc for %{name}.
 
-%if %{with_maven}
-%package manual
-Summary:    Documents for %{name}
-Group:      Documentation
-
-%description manual
-%{summary}.
-%endif
-
 %prep
-cat <<EOT
-
-                If you dont want to build with maven,
-                give rpmbuild option '--without maven'
-
-EOT
-
-%setup -q -n %{short_name}-%{version}
-gzip -dc %{SOURCE5} | tar xf -
-
-cp %{SOURCE7} .
-
-%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%patch3
+%setup -q -n %{short_name}-%{version}-src
+mkdir -p .m2/repository/JPP/maven2/default_poms
+cp pom.xml .m2/repository/JPP/maven2/default_poms/org.apache.commons-commons-parent.pom
+mkdir -p target/osgi/
+tar xzf %{SOURCE2}
+cp %{SOURCE1} target/osgi/MANIFEST.MF
 
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-%if %{with_maven}
-export DEPCAT=$(pwd)/commons-net-1.4.1-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
-    popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > commons-net-1.4.1-depmap.new.xml
-
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    cp project.xml project.xml.orig
-    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
-    popd
-done
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-
-#        -Dmaven.test.failure.ignore=true \
-maven -e \
-        -Dmaven.repo.remote=file:/usr/share/maven/repository \
-        -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
-        jar:jar javadoc:generate site
-%else
-mkdir -p target/lib
-ln -s %{_javadir}/oro.jar target/lib
-ln -s %{_javadir}/junit.jar target/lib
-
-export CLASSPATH=%{_javadir}/oro.jar:%{_javadir}/junit.jar
-%if %{without_tests}
-ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
-  -Dj2se.api=%{_javadocdir}/java jar javadoc
-%else
-export OPT_JAR_LIST="ant/ant-junit junit"
-# FIXME: Investigate test failures in Fedora
-ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
-  -Dj2se.api=%{_javadocdir}/java jar test javadoc
-%endif
-%endif
+ant -Dmaven.mode.offline=true -Dmaven.test.skip=true package javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -217,73 +115,39 @@ install -m 644 target/%{short_name}-%{ve
 
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 %{SOURCE6} \
+install -pm 644 pom.xml \
     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-rm -rf target/docs/apidocs
-# manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%if %{with_maven}
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
-%endif
-
-%if %{gcj_support}
-export CLASSPATH=$(build-classpath gnu-crypto)
-%{_bindir}/aot-compile-rpm
-%endif
+rm -rf target/site/apidocs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%doc LICENSE.txt
 %{_javadir}/*
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/*
 
-%if %{with_maven}
-%files manual
-%defattr(0644,root,root,0755)
-%{_docdir}/%{name}-%{version}
-%endif
-
 %changelog
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0-1
+- Update to upstream 2.0.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.4.1-6.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Mar 2007 21:51:14 -0000	1.2
+++ sources	13 Aug 2009 07:47:53 -0000	1.3
@@ -1,2 +1 @@
-6854865ce0272a28261d4dc575595390  commons-build.tar.gz
-ccbb3f67b55e8a7a676499db4386673c  commons-net-1.4.1-src.tar.gz
+2c3c56ea569b255f65858971541c2337  commons-net-2.0-src.tar.bz2


--- commons-net-1.4.1-jpp-depmap.xml DELETED ---


--- commons-net-1.4.1-disable-tests.patch DELETED ---


--- pom-maven2jpp-newdepmap.xsl DELETED ---


--- commons-net-1.4.1-project_properties.patch DELETED ---


--- pom-maven2jpp-depcat.xsl DELETED ---


--- MANIFEST.MF DELETED ---


--- commons-net-1.4.1.pom DELETED ---


--- jakarta-commons-net-crosslink.patch DELETED ---


--- commons-net-1.4.1-project_xml.patch DELETED ---


--- jakarta-commons-net-build-xml.patch DELETED ---


--- pom-maven2jpp-mapdeps.xsl DELETED ---



From kushal at fedoraproject.org  Thu Aug 13 08:00:09 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Thu, 13 Aug 2009 08:00:09 +0000 (UTC)
Subject: rpms/translation-filter/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 
	1.2 sources, 1.2, 1.3 translation-filter.spec, 1.4, 1.5
Message-ID: <20090813080009.DF33511C048B@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/translation-filter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2650/devel

Modified Files:
	.cvsignore import.log sources translation-filter.spec 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 12:31:04 -0000	1.2
+++ .cvsignore	13 Aug 2009 08:00:03 -0000	1.3
@@ -1 +1 @@
-translation-filter-0.0.2.tar.gz
+translation-filter-1.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2008 12:31:04 -0000	1.1
+++ import.log	13 Aug 2009 08:00:03 -0000	1.2
@@ -1 +1,2 @@
 translation-filter-0_0_2-2_fc9:HEAD:translation-filter-0.0.2-2.fc9.src.rpm:1218544133
+translation-filter-1_0-1_fc11:HEAD:translation-filter-1.0-1.fc11.src.rpm:1250150490


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2008 12:31:04 -0000	1.2
+++ sources	13 Aug 2009 08:00:03 -0000	1.3
@@ -1 +1 @@
-ca6b4bf23f0745e6717905b3d62b32b0  translation-filter-0.0.2.tar.gz
+9101f23ddbea649c8a04e53b7101a300  translation-filter-1.0.tar.gz


Index: translation-filter.spec
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/devel/translation-filter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- translation-filter.spec	27 Jul 2009 06:14:42 -0000	1.4
+++ translation-filter.spec	13 Aug 2009 08:00:03 -0000	1.5
@@ -1,23 +1,38 @@
 # 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()")}
 
 Name:           translation-filter
-Version:        0.0.2
-Release:        5%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        A l10n file filter
 
 Group:          Development/Languages
 License:        GPLv2
-URL:            http://kushaldas.in
-Source0:        http://kushal.fedorapeople.org/%{name}-%{version}.tar.gz
+URL:            http://fedorahosted.org/translation-filter
+Source0:        http://fedorahosted.org/releases/t/r/translation-filter/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils
-Requires:       PyQt4
+BuildRequires:  python-devel, python-setuptools, desktop-file-utils
+Requires:       translate-toolkit, pygtk2-libglade, pygtk2
+
+%if 0%{?fedora}
+BuildRequires:  PyQt4-devel
+%endif
 
 %description
 A l10n file filter to check translations
+%if 0%{?fedora}
+%package        kde
+Summary:        The translation-filter KDE based UI
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+Requires:       PyQt4
+
+%description    kde
+KDE UI for translation-filter
+%endif
+
 
 %prep
 %setup -q
@@ -35,20 +50,53 @@ desktop-file-install --vendor="fedora"  
 %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 rm -rf %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 
- 
+desktop-file-install --vendor="fedora"                    \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications           \
+%{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+rm -rf %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?rhel}
+%exclude
+%{python_sitelib}/Translationfilter/TranslationApp.py*
+%{_bindir}/translation-filter-gui
+%{_datadir}/translationfilter/ui/*
+%{_datadir}/applications/translation-filter-kde-fedora.desktop
+%{_datadir}/applications/*-kde.desktop
+%endif
+
+
+%if 0%{?fedora}
+%files kde
+%defattr(-,root,root,-)
+%{python_sitelib}/Translationfilter/TranslationApp.py*
+%{_bindir}/translation-filter-gui
+%{_datadir}/translationfilter/ui/*
+%{_datadir}/applications/fedora-translation-filter-kde.desktop
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc docs/README docs/ChangeLog docs/COPYING 
+%doc docs/README docs/ChangeLog docs/COPYING
 # For noarch packages: sitelib
-%{python_sitelib}/*
-%{_bindir}/*
-%{_datadir}/*
+%{python_sitelib}/Translationfilter/BasicTranslation.py*
+%{python_sitelib}/Translationfilter/poparser.py*
+%{python_sitelib}/Translationfilter/__init__.py*
+%{python_sitelib}/*.egg-info
+%{_bindir}/translation-filter
+%{_bindir}/translation-filter-gnome
+%{_datadir}/translationfilter/data/*
+%{_datadir}/translationfilter/tf-gnome/*
+%{_datadir}/pixmaps/translation-filter.png
+%{_datadir}/applications/fedora-translation-filter.desktop
 
 %changelog
+* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 1.0-1
+- The 1.0 release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kalev at fedoraproject.org  Thu Aug 13 08:04:34 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 13 Aug 2009 08:04:34 +0000 (UTC)
Subject: rpms/mmapper/devel import.log, NONE, 1.1 mmapper.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813080434.B201711C0097@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mmapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3750/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mmapper.spec 
Log Message:
Initial import (#516336).


--- NEW FILE import.log ---
mmapper-2_0_4-2_final2_fc12:HEAD:mmapper-2.0.4-2.final2.fc12.src.rpm:1250150670


--- NEW FILE mmapper.spec ---
%global extraversion final2

Name:           mmapper
Version:        2.0.4
Release:        2.%{extraversion}%{?dist}
Summary:        Graphical MUME mapper

Group:          Amusements/Games
# The following files are dual licensed under
# LGPLv2 with exceptions or GPLv3 with exceptions:
#  - src/3rdparty/qtiocompressor.cpp
#  - src/3rdparty/qtiocompressor.h
# The following files are GPLv2:
#  - src/mapstorage/basemapsavefilter.cpp
#  - src/mapstorage/basemapsavefilter.h
#  - src/mapstorage/filesaver.cpp
#  - src/mapstorage/filesaver.h
#  - src/mapstorage/progresscounter.cpp
#  - src/mapstorage/progresscounter.h
# The rest of the source files are GPLv2+
License:        GPLv2
URL:            http://sourceforge.net/projects/mmapper
Source0:        http://downloads.sourceforge.net/%{name}/%{name}%20%{version}%20%28final%29/%{name}-%{version}-%{extraversion}-source.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  desktop-file-utils
BuildRequires:  qt4-devel
Requires:       hicolor-icon-theme

%description
MMapper is a graphical mapper for a MUD named MUME (Multi-Users in Middle
Earth). The game is traditionally played in a text-only mode, but MMapper tries
to represent the virtual world in user-friendly graphical environment. It acts
as a proxy between a telnet client and a MUD server, being able to analyze game
data in real time and show player's position in a map.


%prep
%setup -q -n %{name}-%{version}-%{extraversion}-source


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

# It is questionable if one is allowed to redistribute the map.
rm -f $RPM_BUILD_ROOT/%{_datadir}/games/mmapper/arda.mm2

desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mmapper.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS.txt ChangeLog.txt COPYING.txt doc/*.txt
%doc src/3rdparty/LGPL_EXCEPTION.txt src/3rdparty/LICENSE.LGPL
%{_bindir}/mmapper
%{_datadir}/applications/mmapper.desktop
%{_datadir}/icons/hicolor/*/apps/mmapper.png


%changelog
* Tue Aug 11 2009 Kalev Lember <kalev at smartlink.ee> - 2.0.4-2.final2
- Changed license tag to read "GPLv2" as there is GPLv2-only code in the mix.

* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 2.0.4-1.final2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:01:03 -0000	1.1
+++ .cvsignore	13 Aug 2009 08:04:34 -0000	1.2
@@ -0,0 +1 @@
+mmapper-2.0.4-final2-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:01:03 -0000	1.1
+++ sources	13 Aug 2009 08:04:34 -0000	1.2
@@ -0,0 +1 @@
+ba690157374e51bf11291accb5de3b0e  mmapper-2.0.4-final2-source.tar.gz



From akurtakov at fedoraproject.org  Thu Aug 13 08:05:32 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 13 Aug 2009 08:05:32 +0000 (UTC)
Subject: rpms/jakarta-commons-net/devel jakarta-commons-net.spec,1.11,1.12
Message-ID: <20090813080532.B86EA11C0097@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-net/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3984/devel

Modified Files:
	jakarta-commons-net.spec 
Log Message:
- Set maven.repo.local.


Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- jakarta-commons-net.spec	13 Aug 2009 07:47:53 -0000	1.11
+++ jakarta-commons-net.spec	13 Aug 2009 08:05:32 -0000	1.12
@@ -35,7 +35,7 @@
 
 Name:           jakarta-commons-net
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Internet protocol suite Java library
 License:        ASL 2.0
@@ -89,7 +89,7 @@ cp %{SOURCE1} target/osgi/MANIFEST.MF
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-ant -Dmaven.mode.offline=true -Dmaven.test.skip=true package javadoc
+ant -Dmaven.mode.offline=true -Dmaven.test.skip=true -Dmaven.repo.local=.m2 package javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -145,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0-2
+- Set maven.repo.local.
+
 * Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0-1
 - Update to upstream 2.0.
 



From akurtakov at fedoraproject.org  Thu Aug 13 08:08:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 13 Aug 2009 08:08:35 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.657,1.658
Message-ID: <20090813080835.1B7B911C0097@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4648/devel

Modified Files:
	eclipse.spec 
Log Message:
Add epoch to icu4j Requires/BuildRequires.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -p -r1.657 -r1.658
--- eclipse.spec	11 Aug 2009 16:44:00 -0000	1.657
+++ eclipse.spec	13 Aug 2009 08:08:34 -0000	1.658
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.4.0%{?dist}
+Release:        0.5%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -167,7 +167,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 4.0.1-3
+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
@@ -222,7 +222,7 @@ Requires:       %{name}-swt = %{epoch}:%
 # 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 >= 4.0.1-3
+Requires:       icu4j-eclipse >= 1:4.0.1-3
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -1488,6 +1488,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.5
+- Add epoch to icu4j Requires/BuildRequires.
+
 * Tue Aug 11 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.4.0
 - Fix sources url.
 - Make it use system icu4j and sat4j.



From kalev at fedoraproject.org  Thu Aug 13 08:09:21 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 13 Aug 2009 08:09:21 +0000 (UTC)
Subject: rpms/mmapper/F-11 import.log, NONE, 1.1 mmapper.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813080921.54B3D11C0097@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mmapper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4974/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mmapper.spec 
Log Message:
Initial import (#516336).


--- NEW FILE import.log ---
mmapper-2_0_4-2_final2_fc12:F-11:mmapper-2.0.4-2.final2.fc12.src.rpm:1250150950


--- NEW FILE mmapper.spec ---
%global extraversion final2

Name:           mmapper
Version:        2.0.4
Release:        2.%{extraversion}%{?dist}
Summary:        Graphical MUME mapper

Group:          Amusements/Games
# The following files are dual licensed under
# LGPLv2 with exceptions or GPLv3 with exceptions:
#  - src/3rdparty/qtiocompressor.cpp
#  - src/3rdparty/qtiocompressor.h
# The following files are GPLv2:
#  - src/mapstorage/basemapsavefilter.cpp
#  - src/mapstorage/basemapsavefilter.h
#  - src/mapstorage/filesaver.cpp
#  - src/mapstorage/filesaver.h
#  - src/mapstorage/progresscounter.cpp
#  - src/mapstorage/progresscounter.h
# The rest of the source files are GPLv2+
License:        GPLv2
URL:            http://sourceforge.net/projects/mmapper
Source0:        http://downloads.sourceforge.net/%{name}/%{name}%20%{version}%20%28final%29/%{name}-%{version}-%{extraversion}-source.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  desktop-file-utils
BuildRequires:  qt4-devel
Requires:       hicolor-icon-theme

%description
MMapper is a graphical mapper for a MUD named MUME (Multi-Users in Middle
Earth). The game is traditionally played in a text-only mode, but MMapper tries
to represent the virtual world in user-friendly graphical environment. It acts
as a proxy between a telnet client and a MUD server, being able to analyze game
data in real time and show player's position in a map.


%prep
%setup -q -n %{name}-%{version}-%{extraversion}-source


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

# It is questionable if one is allowed to redistribute the map.
rm -f $RPM_BUILD_ROOT/%{_datadir}/games/mmapper/arda.mm2

desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mmapper.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS.txt ChangeLog.txt COPYING.txt doc/*.txt
%doc src/3rdparty/LGPL_EXCEPTION.txt src/3rdparty/LICENSE.LGPL
%{_bindir}/mmapper
%{_datadir}/applications/mmapper.desktop
%{_datadir}/icons/hicolor/*/apps/mmapper.png


%changelog
* Tue Aug 11 2009 Kalev Lember <kalev at smartlink.ee> - 2.0.4-2.final2
- Changed license tag to read "GPLv2" as there is GPLv2-only code in the mix.

* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 2.0.4-1.final2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:01:03 -0000	1.1
+++ .cvsignore	13 Aug 2009 08:09:20 -0000	1.2
@@ -0,0 +1 @@
+mmapper-2.0.4-final2-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:01:03 -0000	1.1
+++ sources	13 Aug 2009 08:09:21 -0000	1.2
@@ -0,0 +1 @@
+ba690157374e51bf11291accb5de3b0e  mmapper-2.0.4-final2-source.tar.gz



From kalev at fedoraproject.org  Thu Aug 13 08:10:27 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Thu, 13 Aug 2009 08:10:27 +0000 (UTC)
Subject: rpms/mmapper/F-10 import.log, NONE, 1.1 mmapper.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813081027.6EB3C11C048B@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mmapper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5454/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mmapper.spec 
Log Message:
Initial import (#516336).


--- NEW FILE import.log ---
mmapper-2_0_4-2_final2_fc12:F-10:mmapper-2.0.4-2.final2.fc12.src.rpm:1250151027


--- NEW FILE mmapper.spec ---
%global extraversion final2

Name:           mmapper
Version:        2.0.4
Release:        2.%{extraversion}%{?dist}
Summary:        Graphical MUME mapper

Group:          Amusements/Games
# The following files are dual licensed under
# LGPLv2 with exceptions or GPLv3 with exceptions:
#  - src/3rdparty/qtiocompressor.cpp
#  - src/3rdparty/qtiocompressor.h
# The following files are GPLv2:
#  - src/mapstorage/basemapsavefilter.cpp
#  - src/mapstorage/basemapsavefilter.h
#  - src/mapstorage/filesaver.cpp
#  - src/mapstorage/filesaver.h
#  - src/mapstorage/progresscounter.cpp
#  - src/mapstorage/progresscounter.h
# The rest of the source files are GPLv2+
License:        GPLv2
URL:            http://sourceforge.net/projects/mmapper
Source0:        http://downloads.sourceforge.net/%{name}/%{name}%20%{version}%20%28final%29/%{name}-%{version}-%{extraversion}-source.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  desktop-file-utils
BuildRequires:  qt4-devel
Requires:       hicolor-icon-theme

%description
MMapper is a graphical mapper for a MUD named MUME (Multi-Users in Middle
Earth). The game is traditionally played in a text-only mode, but MMapper tries
to represent the virtual world in user-friendly graphical environment. It acts
as a proxy between a telnet client and a MUD server, being able to analyze game
data in real time and show player's position in a map.


%prep
%setup -q -n %{name}-%{version}-%{extraversion}-source


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}

# It is questionable if one is allowed to redistribute the map.
rm -f $RPM_BUILD_ROOT/%{_datadir}/games/mmapper/arda.mm2

desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mmapper.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS.txt ChangeLog.txt COPYING.txt doc/*.txt
%doc src/3rdparty/LGPL_EXCEPTION.txt src/3rdparty/LICENSE.LGPL
%{_bindir}/mmapper
%{_datadir}/applications/mmapper.desktop
%{_datadir}/icons/hicolor/*/apps/mmapper.png


%changelog
* Tue Aug 11 2009 Kalev Lember <kalev at smartlink.ee> - 2.0.4-2.final2
- Changed license tag to read "GPLv2" as there is GPLv2-only code in the mix.

* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 2.0.4-1.final2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:01:03 -0000	1.1
+++ .cvsignore	13 Aug 2009 08:10:26 -0000	1.2
@@ -0,0 +1 @@
+mmapper-2.0.4-final2-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mmapper/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:01:03 -0000	1.1
+++ sources	13 Aug 2009 08:10:27 -0000	1.2
@@ -0,0 +1 @@
+ba690157374e51bf11291accb5de3b0e  mmapper-2.0.4-final2-source.tar.gz



From caolanm at fedoraproject.org  Thu Aug 13 08:11:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 13 Aug 2009 08:11:07 +0000 (UTC)
Subject: rpms/hyphen-fo/devel hyphen-fo.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813081107.87E9711C0097@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-fo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5619/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-fo.spec import.log 
Log Message:



--- NEW FILE hyphen-fo.spec ---
Name: hyphen-fo
Summary: Faroese hyphenation rules
%define upstreamid 20040420
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://fo.speling.org/filer/hyph_fo_FO-20040420a.zip
Group: Applications/Text
URL: http://fo.speling.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL+
BuildArch: noarch
Requires: hyphen

%description
Faroese hyphenation rules.

%prep
%setup -q -c

%build
for i in README_hyph_fo_FO.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
    mv -f $i.new $i
  fi
  tr -d '\r' < $i > $i.new
  touch -r $i $i.new
  mv -f $i.new $i
done

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p hyph_fo_FO.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_fo_FO.txt
%{_datadir}/hyphen/*

%changelog
* Mon Aug 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.20040420-1
- initial version


--- NEW FILE import.log ---
hyphen-fo-0_20040420-1_fc11:HEAD:hyphen-fo-0.20040420-1.fc11.src.rpm:1250151020


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-fo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:03:25 -0000	1.1
+++ .cvsignore	13 Aug 2009 08:11:07 -0000	1.2
@@ -0,0 +1 @@
+hyph_fo_FO-20040420a.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-fo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:03:25 -0000	1.1
+++ sources	13 Aug 2009 08:11:07 -0000	1.2
@@ -0,0 +1 @@
+e0e6e6bb2e455ca49a7fd7cfef3e8003  hyph_fo_FO-20040420a.zip



From tsmetana at fedoraproject.org  Thu Aug 13 08:25:44 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu, 13 Aug 2009 08:25:44 +0000 (UTC)
Subject: rpms/gnomebaker/devel gnomebaker.spec,1.21,1.22
Message-ID: <20090813082544.A7CE711C0097@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9308

Modified Files:
	gnomebaker.spec 
Log Message:
* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-6
- Shouldn't update the mime database but the desktop database



Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnomebaker.spec	13 Aug 2009 06:14:40 -0000	1.21
+++ gnomebaker.spec	13 Aug 2009 08:25:43 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -66,13 +66,13 @@ rm -rf $RPM_BUILD_ROOT
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
 scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -87,6 +87,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-6
+- Shouldn't update the mime database but the desktop database
+
 * Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-5
 - And update the mime database...
 



From tsmetana at fedoraproject.org  Thu Aug 13 08:28:12 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu, 13 Aug 2009 08:28:12 +0000 (UTC)
Subject: rpms/gnomebaker/F-11 gnomebaker.spec,1.20,1.21
Message-ID: <20090813082812.9FEC911C0097@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/gnomebaker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9884

Modified Files:
	gnomebaker.spec 
Log Message:
* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-5
- Shouldn't update the mime database but the desktop database



Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/F-11/gnomebaker.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gnomebaker.spec	13 Aug 2009 06:24:25 -0000	1.20
+++ gnomebaker.spec	13 Aug 2009 08:28:12 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -66,14 +66,14 @@ rm -rf $RPM_BUILD_ROOT
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %postun
 scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -88,6 +88,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-5
+- Shouldn't update the mime database but the desktop database
+
 * Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-4
 - And update the mime database...
 



From pkgdb at fedoraproject.org  Thu Aug 13 08:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 08:33:33 +0000
Subject: [pkgdb] ant: akurtakov has requested watchbugzilla
Message-ID: <20090813083333.AD3DE10F84F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on ant (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ant



From pkgdb at fedoraproject.org  Thu Aug 13 08:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 08:33:34 +0000
Subject: [pkgdb] ant: akurtakov has requested commit
Message-ID: <20090813083334.9844210F857@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on ant (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ant



From pkgdb at fedoraproject.org  Thu Aug 13 08:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 08:33:34 +0000
Subject: [pkgdb] ant: akurtakov has requested watchcommits
Message-ID: <20090813083334.CFFA110F85B@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on ant (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ant



From epienbro at fedoraproject.org  Thu Aug 13 09:05:54 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 13 Aug 2009 09:05:54 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel .cvsignore, 1.3, 1.4 mingw32-libsoup.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090813090554.39CA211C0097@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17178

Modified Files:
	.cvsignore mingw32-libsoup.spec sources 
Log Message:
- Update to 2.27.90
- Automatically generate debuginfo subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jun 2009 21:29:23 -0000	1.3
+++ .cvsignore	13 Aug 2009 09:05:53 -0000	1.4
@@ -1 +1 @@
-libsoup-2.27.1.tar.bz2
+libsoup-2.27.90.tar.bz2


Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-libsoup.spec	25 Jul 2009 12:23:28 -0000	1.3
+++ mingw32-libsoup.spec	13 Aug 2009 09:05:54 -0000	1.4
@@ -3,10 +3,11 @@
 %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-libsoup
-Version:	2.27.1
-Release:	2%{?dist}
+Version:	2.27.90
+Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -48,6 +49,9 @@ Group:		Development/Libraries
 Static version of the MinGW Windows Libsoup library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libsoup-%{version}
 
@@ -115,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.90-1
+- Update to 2.27.90
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jun 2009 21:29:24 -0000	1.3
+++ sources	13 Aug 2009 09:05:54 -0000	1.4
@@ -1 +1 @@
-3505d83ca47f32fb30e6b3cc3f4fee96  libsoup-2.27.1.tar.bz2
+5bad95448a9ea59ca590567c41854fbb  libsoup-2.27.90.tar.bz2



From epienbro at fedoraproject.org  Thu Aug 13 09:11:00 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 13 Aug 2009 09:11:00 +0000 (UTC)
Subject: rpms/mingw32-libsoup/F-11 .cvsignore, 1.2, 1.3 mingw32-libsoup.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090813091100.7306C11C0097@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18176

Modified Files:
	.cvsignore mingw32-libsoup.spec sources 
Log Message:
Update to 2.26.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 May 2009 12:35:19 -0000	1.2
+++ .cvsignore	13 Aug 2009 09:11:00 -0000	1.3
@@ -1 +1 @@
-libsoup-2.26.1.tar.bz2
+libsoup-2.26.3.tar.bz2


Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/F-11/mingw32-libsoup.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-libsoup.spec	24 May 2009 12:35:19 -0000	1.1
+++ mingw32-libsoup.spec	13 Aug 2009 09:11:00 -0000	1.2
@@ -5,8 +5,8 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:		mingw32-libsoup
-Version:	2.26.1
-Release:	2%{?dist}
+Version:	2.26.3
+Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -106,12 +106,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libsoup-2.4.la
 %{_mingw32_libdir}/pkgconfig/libsoup-2.4.pc
 
-
 %files static
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libsoup-2.4.a
 
+
 %changelog
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 2.26.3-1
+- Update to 2.26.3
+
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.26.1-2
 - Fixed license typo
 - Use %%global instead of %%define


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 May 2009 12:35:20 -0000	1.2
+++ sources	13 Aug 2009 09:11:00 -0000	1.3
@@ -1 +1 @@
-94c0495dc8bf213709bdb175ab224c7e  libsoup-2.26.1.tar.bz2
+19f15636380a9a08a0f071cc53069b80  libsoup-2.26.3.tar.bz2



From kushal at fedoraproject.org  Thu Aug 13 09:12:50 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Thu, 13 Aug 2009 09:12:50 +0000 (UTC)
Subject: rpms/translation-filter/F-11 sources, 1.2,
	1.3 translation-filter.spec, 1.3, 1.4
Message-ID: <20090813091250.CEEAD11C0097@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/translation-filter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18568

Modified Files:
	sources translation-filter.spec 
Log Message:
new release of tf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2008 12:31:04 -0000	1.2
+++ sources	13 Aug 2009 09:12:50 -0000	1.3
@@ -1 +1 @@
-ca6b4bf23f0745e6717905b3d62b32b0  translation-filter-0.0.2.tar.gz
+9101f23ddbea649c8a04e53b7101a300  translation-filter-1.0.tar.gz


Index: translation-filter.spec
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/F-11/translation-filter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- translation-filter.spec	25 Feb 2009 21:47:47 -0000	1.3
+++ translation-filter.spec	13 Aug 2009 09:12:50 -0000	1.4
@@ -1,23 +1,38 @@
 # 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()")}
 
 Name:           translation-filter
-Version:        0.0.2
-Release:        4%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        A l10n file filter
 
 Group:          Development/Languages
 License:        GPLv2
-URL:            http://kushaldas.in
-Source0:        http://kushal.fedorapeople.org/%{name}-%{version}.tar.gz
+URL:            http://fedorahosted.org/translation-filter
+Source0:        http://fedorahosted.org/releases/t/r/translation-filter/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils
-Requires:       PyQt4
+BuildRequires:  python-devel, python-setuptools, desktop-file-utils
+Requires:       translate-toolkit, pygtk2-libglade, pygtk2
+
+%if 0%{?fedora}
+BuildRequires:  PyQt4-devel
+%endif
 
 %description
 A l10n file filter to check translations
+%if 0%{?fedora}
+%package        kde
+Summary:        The translation-filter KDE based UI
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+Requires:       PyQt4
+
+%description    kde
+KDE UI for translation-filter
+%endif
+
 
 %prep
 %setup -q
@@ -35,20 +50,56 @@ desktop-file-install --vendor="fedora"  
 %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 rm -rf %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 
- 
+desktop-file-install --vendor="fedora"                    \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications           \
+%{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+rm -rf %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?rhel}
+%exclude
+%{python_sitelib}/Translationfilter/TranslationApp.py*
+%{_bindir}/translation-filter-gui
+%{_datadir}/translationfilter/ui/*
+%{_datadir}/applications/translation-filter-kde-fedora.desktop
+%{_datadir}/applications/*-kde.desktop
+%endif
+
+
+%if 0%{?fedora}
+%files kde
+%defattr(-,root,root,-)
+%{python_sitelib}/Translationfilter/TranslationApp.py*
+%{_bindir}/translation-filter-gui
+%{_datadir}/translationfilter/ui/*
+%{_datadir}/applications/fedora-translation-filter-kde.desktop
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc docs/README docs/ChangeLog docs/COPYING 
+%doc docs/README docs/ChangeLog docs/COPYING
 # For noarch packages: sitelib
-%{python_sitelib}/*
-%{_bindir}/*
-%{_datadir}/*
+%{python_sitelib}/Translationfilter/BasicTranslation.py*
+%{python_sitelib}/Translationfilter/poparser.py*
+%{python_sitelib}/Translationfilter/__init__.py*
+%{python_sitelib}/*.egg-info
+%{_bindir}/translation-filter
+%{_bindir}/translation-filter-gnome
+%{_datadir}/translationfilter/data/*
+%{_datadir}/translationfilter/tf-gnome/*
+%{_datadir}/pixmaps/translation-filter.png
+%{_datadir}/applications/fedora-translation-filter.desktop
 
 %changelog
+* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 1.0-1
+- The 1.0 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-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.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From epienbro at fedoraproject.org  Thu Aug 13 09:17:48 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 13 Aug 2009 09:17:48 +0000 (UTC)
Subject: rpms/mingw32-libsoup/devel mingw32-libsoup.spec,1.4,1.5
Message-ID: <20090813091748.575C611C0097@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19524

Modified Files:
	mingw32-libsoup.spec 
Log Message:
Added BR: mingw32-gnutls for SSL support



Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/devel/mingw32-libsoup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libsoup.spec	13 Aug 2009 09:05:54 -0000	1.4
+++ mingw32-libsoup.spec	13 Aug 2009 09:17:48 -0000	1.5
@@ -23,6 +23,7 @@ BuildRequires:	mingw32-gcc
 BuildRequires:	mingw32-binutils
 BuildRequires:	mingw32-glib2
 BuildRequires:	mingw32-libxml2
+BuildRequires:	mingw32-gnutls
 
 Requires:	pkgconfig
 
@@ -122,6 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.27.90-1
 - Update to 2.27.90
 - Automatically generate debuginfo subpackage
+- Added BR: mingw32-gnutls for SSL support
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pkgdb at fedoraproject.org  Thu Aug 13 09:20:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:20:15 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090813092015.CD30B10F848@bastion2.fedora.phx.redhat.com>

mgarski has set the watchbugzilla acl on digikam-doc (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Thu Aug 13 09:20:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:20:17 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090813092017.F22E610F855@bastion2.fedora.phx.redhat.com>

mgarski has set the watchcommits acl on digikam-doc (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Thu Aug 13 09:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:20:20 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090813092020.8FD5D10F85A@bastion2.fedora.phx.redhat.com>

mgarski has set the commit acl on digikam-doc (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From pkgdb at fedoraproject.org  Thu Aug 13 09:20:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:20:22 +0000
Subject: [pkgdb] digikam-doc had acl change status
Message-ID: <20090813092023.6CB9C10F85C@bastion2.fedora.phx.redhat.com>

mgarski has set the approveacls acl on digikam-doc (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From kushal at fedoraproject.org  Thu Aug 13 09:20:58 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Thu, 13 Aug 2009 09:20:58 +0000 (UTC)
Subject: rpms/translation-filter/F-10 sources, 1.2,
	1.3 translation-filter.spec, 1.1, 1.2
Message-ID: <20090813092058.362E011C0097@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/translation-filter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20910

Modified Files:
	sources translation-filter.spec 
Log Message:
new release of tf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Aug 2008 12:31:04 -0000	1.2
+++ sources	13 Aug 2009 09:20:58 -0000	1.3
@@ -1 +1 @@
-ca6b4bf23f0745e6717905b3d62b32b0  translation-filter-0.0.2.tar.gz
+9101f23ddbea649c8a04e53b7101a300  translation-filter-1.0.tar.gz


Index: translation-filter.spec
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/F-10/translation-filter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- translation-filter.spec	12 Aug 2008 12:31:04 -0000	1.1
+++ translation-filter.spec	13 Aug 2009 09:20:58 -0000	1.2
@@ -1,23 +1,38 @@
 # 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()")}
 
 Name:           translation-filter
-Version:        0.0.2
-Release:        2%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        A l10n file filter
 
 Group:          Development/Languages
 License:        GPLv2
-URL:            http://kushaldas.in
-Source0:        http://kushal.fedorapeople.org/%{name}-%{version}.tar.gz
+URL:            http://fedorahosted.org/translation-filter
+Source0:        http://fedorahosted.org/releases/t/r/translation-filter/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils
-Requires:       PyQt4
+BuildRequires:  python-devel, python-setuptools, desktop-file-utils
+Requires:       translate-toolkit, pygtk2-libglade, pygtk2
+
+%if 0%{?fedora}
+BuildRequires:  PyQt4-devel
+%endif
 
 %description
 A l10n file filter to check translations
+%if 0%{?fedora}
+%package        kde
+Summary:        The translation-filter KDE based UI
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+Requires:       PyQt4
+
+%description    kde
+KDE UI for translation-filter
+%endif
+
 
 %prep
 %setup -q
@@ -35,20 +50,62 @@ desktop-file-install --vendor="fedora"  
 %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 rm -rf %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 
- 
+desktop-file-install --vendor="fedora"                    \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications           \
+%{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+rm -rf %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?rhel}
+%exclude
+%{python_sitelib}/Translationfilter/TranslationApp.py*
+%{_bindir}/translation-filter-gui
+%{_datadir}/translationfilter/ui/*
+%{_datadir}/applications/translation-filter-kde-fedora.desktop
+%{_datadir}/applications/*-kde.desktop
+%endif
+
+
+%if 0%{?fedora}
+%files kde
+%defattr(-,root,root,-)
+%{python_sitelib}/Translationfilter/TranslationApp.py*
+%{_bindir}/translation-filter-gui
+%{_datadir}/translationfilter/ui/*
+%{_datadir}/applications/fedora-translation-filter-kde.desktop
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc docs/README docs/ChangeLog docs/COPYING 
+%doc docs/README docs/ChangeLog docs/COPYING
 # For noarch packages: sitelib
-%{python_sitelib}/*
-%{_bindir}/*
-%{_datadir}/*
+%{python_sitelib}/Translationfilter/BasicTranslation.py*
+%{python_sitelib}/Translationfilter/poparser.py*
+%{python_sitelib}/Translationfilter/__init__.py*
+%{python_sitelib}/*.egg-info
+%{_bindir}/translation-filter
+%{_bindir}/translation-filter-gnome
+%{_datadir}/translationfilter/data/*
+%{_datadir}/translationfilter/tf-gnome/*
+%{_datadir}/pixmaps/translation-filter.png
+%{_datadir}/applications/fedora-translation-filter.desktop
 
 %changelog
+* Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 1.0-1
+- The 1.0 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-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.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.0.2-3
+- Rebuild for Python 2.6
+
 * Mon Aug 11 2008 Kushal Das <kushal at fedoraproject.org> 0.0.2-2
 - Fixed BR and LICENSE issue
 



From pkgdb at fedoraproject.org  Thu Aug 13 09:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:21:07 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090813092107.D85D410F855@bastion2.fedora.phx.redhat.com>

mgarski has set the watchbugzilla acl on digikam (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Thu Aug 13 09:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:21:09 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090813092109.C30BB10F862@bastion2.fedora.phx.redhat.com>

mgarski has set the watchcommits acl on digikam (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Thu Aug 13 09:21:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:21:11 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090813092112.07B5610F86C@bastion2.fedora.phx.redhat.com>

mgarski has set the commit acl on digikam (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Thu Aug 13 09:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 09:21:14 +0000
Subject: [pkgdb] digikam had acl change status
Message-ID: <20090813092115.8341B10F87B@bastion2.fedora.phx.redhat.com>

mgarski has set the approveacls acl on digikam (Fedora EPEL 5) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From epienbro at fedoraproject.org  Thu Aug 13 09:32:07 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 13 Aug 2009 09:32:07 +0000 (UTC)
Subject: rpms/mingw32-libsoup/F-11 mingw32-libsoup.spec,1.2,1.3
Message-ID: <20090813093207.2EBFF11C0097@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libsoup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22984

Modified Files:
	mingw32-libsoup.spec 
Log Message:
Fixed small typo in previous changelog entry



Index: mingw32-libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libsoup/F-11/mingw32-libsoup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-libsoup.spec	13 Aug 2009 09:11:00 -0000	1.2
+++ mingw32-libsoup.spec	13 Aug 2009 09:32:07 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:		mingw32-libsoup
 Version:	2.26.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -112,7 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 2.26.3-1
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.26.3-2
+- Fixed small typo in previous changelog entry
+
+* Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.26.3-1
 - Update to 2.26.3
 
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.26.1-2



From drindt at fedoraproject.org  Thu Aug 13 09:34:33 2009
From: drindt at fedoraproject.org (Daniel Rindt)
Date: Thu, 13 Aug 2009 09:34:33 +0000 (UTC)
Subject: rpms/mtkbabel/F-10 import.log, NONE, 1.1 mtkbabel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813093433.8350D11C0097@cvs1.fedora.phx.redhat.com>

Author: drindt

Update of /cvs/pkgs/rpms/mtkbabel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23560/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mtkbabel.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
mtkbabel-0_8-1_fc10:F-10:mtkbabel-0.8-1.fc10.src.rpm:1250163099


--- NEW FILE mtkbabel.spec ---
Name:           mtkbabel
Version:        0.8
Release:        1%{?dist}
Summary:        Program to Operate the i-Blue 747 GPS Data Logger
Group:          Applications/Communications
License:        GPLv2+
Url:            https://sourceforge.net/projects/mtkbabel
Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger.
It should work also with other GPS devices based on the MediaTek MTK
chipset. It is free software released under the GPL license.

The main capabilities are:

  * Command line interface
  * Save data log in GPX and raw binary format
  * If required retrieve all the data, also the old one being overlapped
  * Change logging criteria: time, distance, speed
  * Change log format
  * START/STOP logging
  * Set OVERLAP or STOP method on memory full
  * Erase the internal memory

The program is written in Perl, and it was tested on Linux via USB
connection. One goal is easy portability to C and small RAM footprint.

Authors:
--------
    Niccolo Rigacci <niccolo at rigacci.org>

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
install -D -m 0755 mtkbabel $RPM_BUILD_ROOT%{_bindir}/mtkbabel
install -D -m 0644 mtkbabel.1 $RPM_BUILD_ROOT%{_mandir}/man1/mtkbabel.1
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc MtkExtensionsv1.xsd README changelog copyright
%{_bindir}/*
%{_mandir}/man1/*.*

%changelog
* Fri Aug 3 2009 Daniel Rindt <drindt at visetics.com> 0.8-1
- Created new package, version 0.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtkbabel/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:29:12 -0000	1.1
+++ .cvsignore	13 Aug 2009 09:34:33 -0000	1.2
@@ -0,0 +1 @@
+mtkbabel-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtkbabel/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:29:12 -0000	1.1
+++ sources	13 Aug 2009 09:34:33 -0000	1.2
@@ -0,0 +1 @@
+d5518b678bffb58ceeae898d950ee27e  mtkbabel-0.8.tar.gz



From drindt at fedoraproject.org  Thu Aug 13 09:38:50 2009
From: drindt at fedoraproject.org (Daniel Rindt)
Date: Thu, 13 Aug 2009 09:38:50 +0000 (UTC)
Subject: rpms/mtkbabel/F-11 import.log, NONE, 1.1 mtkbabel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813093850.2E91911C0097@cvs1.fedora.phx.redhat.com>

Author: drindt

Update of /cvs/pkgs/rpms/mtkbabel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24469/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mtkbabel.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
mtkbabel-0_8-1_fc10:F-11:mtkbabel-0.8-1.fc10.src.rpm:1250163417


--- NEW FILE mtkbabel.spec ---
Name:           mtkbabel
Version:        0.8
Release:        1%{?dist}
Summary:        Program to Operate the i-Blue 747 GPS Data Logger
Group:          Applications/Communications
License:        GPLv2+
Url:            https://sourceforge.net/projects/mtkbabel
Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger.
It should work also with other GPS devices based on the MediaTek MTK
chipset. It is free software released under the GPL license.

The main capabilities are:

  * Command line interface
  * Save data log in GPX and raw binary format
  * If required retrieve all the data, also the old one being overlapped
  * Change logging criteria: time, distance, speed
  * Change log format
  * START/STOP logging
  * Set OVERLAP or STOP method on memory full
  * Erase the internal memory

The program is written in Perl, and it was tested on Linux via USB
connection. One goal is easy portability to C and small RAM footprint.

Authors:
--------
    Niccolo Rigacci <niccolo at rigacci.org>

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
install -D -m 0755 mtkbabel $RPM_BUILD_ROOT%{_bindir}/mtkbabel
install -D -m 0644 mtkbabel.1 $RPM_BUILD_ROOT%{_mandir}/man1/mtkbabel.1
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc MtkExtensionsv1.xsd README changelog copyright
%{_bindir}/*
%{_mandir}/man1/*.*

%changelog
* Fri Aug 3 2009 Daniel Rindt <drindt at visetics.com> 0.8-1
- Created new package, version 0.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtkbabel/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:29:12 -0000	1.1
+++ .cvsignore	13 Aug 2009 09:38:49 -0000	1.2
@@ -0,0 +1 @@
+mtkbabel-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtkbabel/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:29:12 -0000	1.1
+++ sources	13 Aug 2009 09:38:50 -0000	1.2
@@ -0,0 +1 @@
+d5518b678bffb58ceeae898d950ee27e  mtkbabel-0.8.tar.gz



From drindt at fedoraproject.org  Thu Aug 13 09:46:25 2009
From: drindt at fedoraproject.org (Daniel Rindt)
Date: Thu, 13 Aug 2009 09:46:25 +0000 (UTC)
Subject: rpms/mtkbabel/devel import.log, NONE, 1.1 mtkbabel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813094625.5F2A911C0097@cvs1.fedora.phx.redhat.com>

Author: drindt

Update of /cvs/pkgs/rpms/mtkbabel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25999/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mtkbabel.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
mtkbabel-0_8-1_fc10:HEAD:mtkbabel-0.8-1.fc10.src.rpm:1250163841


--- NEW FILE mtkbabel.spec ---
Name:           mtkbabel
Version:        0.8
Release:        1%{?dist}
Summary:        Program to Operate the i-Blue 747 GPS Data Logger
Group:          Applications/Communications
License:        GPLv2+
Url:            https://sourceforge.net/projects/mtkbabel
Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

%description
MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger.
It should work also with other GPS devices based on the MediaTek MTK
chipset. It is free software released under the GPL license.

The main capabilities are:

  * Command line interface
  * Save data log in GPX and raw binary format
  * If required retrieve all the data, also the old one being overlapped
  * Change logging criteria: time, distance, speed
  * Change log format
  * START/STOP logging
  * Set OVERLAP or STOP method on memory full
  * Erase the internal memory

The program is written in Perl, and it was tested on Linux via USB
connection. One goal is easy portability to C and small RAM footprint.

Authors:
--------
    Niccolo Rigacci <niccolo at rigacci.org>

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
install -D -m 0755 mtkbabel $RPM_BUILD_ROOT%{_bindir}/mtkbabel
install -D -m 0644 mtkbabel.1 $RPM_BUILD_ROOT%{_mandir}/man1/mtkbabel.1
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc MtkExtensionsv1.xsd README changelog copyright
%{_bindir}/*
%{_mandir}/man1/*.*

%changelog
* Fri Aug 3 2009 Daniel Rindt <drindt at visetics.com> 0.8-1
- Created new package, version 0.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtkbabel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Aug 2009 20:29:12 -0000	1.1
+++ .cvsignore	13 Aug 2009 09:46:25 -0000	1.2
@@ -0,0 +1 @@
+mtkbabel-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtkbabel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Aug 2009 20:29:12 -0000	1.1
+++ sources	13 Aug 2009 09:46:25 -0000	1.2
@@ -0,0 +1 @@
+d5518b678bffb58ceeae898d950ee27e  mtkbabel-0.8.tar.gz



From ovasik at fedoraproject.org  Thu Aug 13 09:56:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 13 Aug 2009 09:56:22 +0000 (UTC)
Subject: rpms/docbook-utils/devel docbook-utils-rtfmanpage.patch, NONE,
	1.1 docbook-utils.spec, 1.33, 1.34
Message-ID: <20090813095622.6D8CA11C0097@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28791

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-rtfmanpage.patch 
Log Message:
add note about openjade limitation in rtf section of jw manpage(#516942)

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


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- docbook-utils.spec	24 Jul 2009 13:30:48 -0000	1.33
+++ docbook-utils.spec	13 Aug 2009 09:56:22 -0000	1.34
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 18%{?dist}
+Release: 19%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -33,6 +33,7 @@ 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
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -61,6 +62,7 @@ PDF format.
 %patch2 -p1 -b .w3mtxtconvert
 %patch3 -p1 -b .grepnocolors
 %patch4 -p1 -b .sgmlinclude
+%patch5 -p1 -b .rtfman
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -128,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Thu Aug 13 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-19
+- add note about openjade limitation in rtf section of jw
+  manpage(#516942)
+
 * Fri Jul 24 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-18
 - another quoted variable fixes for spaces in filenames
 - use SGML_INCLUDE in man backend(upstream)



From rjones at fedoraproject.org  Thu Aug 13 10:11:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 10:11:05 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.56,1.57
Message-ID: <20090813101105.1AD9D11C0097@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31552/EL-5

Modified Files:
	libguestfs.spec 
Log Message:
Add requirement for libselinux{,-devel} which will be needed for the next release.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- libguestfs.spec	7 Aug 2009 07:37:09 -0000	1.56
+++ libguestfs.spec	13 Aug 2009 10:11:04 -0000	1.57
@@ -34,6 +34,7 @@ BuildRequires: qemu-system-x86 >= 0.10.5
 BuildRequires: qemu-system-ppc >= 0.10.5
 %endif
 BuildRequires: createrepo
+BuildRequires: libselinux-devel
 
 # This is only needed for RHEL 5 because readline-devel doesn't
 # properly depend on it, but doesn't do any harm on other platforms:
@@ -43,7 +44,7 @@ BuildRequires: ncurses-devel
 BuildRequires: kernel, bash, coreutils, lvm2
 BuildRequires: MAKEDEV, net-tools, file
 BuildRequires: module-init-tools, procps, strace, iputils
-BuildRequires: dosfstools, lsof, scrub
+BuildRequires: dosfstools, lsof, scrub, libselinux
 # Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree
 # Not working: augeas-libs
 %ifarch %{ix86} x86_64
@@ -54,7 +55,7 @@ BuildRequires: grub, ntfsprogs
 Requires:      kernel, bash, coreutils, lvm2
 Requires:      MAKEDEV, net-tools, file
 Requires:      module-init-tools, procps, strace, iputils
-Requires:      dosfstools, lsof, scrub
+Requires:      dosfstools, lsof, scrub, libselinux
 # Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree
 # Not working: augeas-libs
 %ifarch %{ix86} x86_64



From rjones at fedoraproject.org  Thu Aug 13 10:11:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 10:11:05 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.89,1.90
Message-ID: <20090813101105.7773111C043C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31552/devel

Modified Files:
	libguestfs.spec 
Log Message:
Add requirement for libselinux{,-devel} which will be needed for the next release.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- libguestfs.spec	10 Aug 2009 11:38:33 -0000	1.89
+++ libguestfs.spec	13 Aug 2009 10:11:05 -0000	1.90
@@ -25,6 +25,7 @@ BuildRequires: squashfs-tools
 BuildRequires: qemu-kvm >= 0.10-7
 BuildRequires: createrepo
 BuildRequires: glibc-static
+BuildRequires: libselinux-devel
 
 # This is only needed for RHEL 5 because readline-devel doesn't
 # properly depend on it, but doesn't do any harm on other platforms:
@@ -34,7 +35,7 @@ BuildRequires: ncurses-devel
 BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
 BuildRequires: MAKEDEV, net-tools, augeas-libs, file
 BuildRequires: module-init-tools, procps, strace, iputils
-BuildRequires: dosfstools, zerofree, lsof, scrub
+BuildRequires: dosfstools, zerofree, lsof, scrub, libselinux
 %ifarch %{ix86} x86_64
 BuildRequires: grub, ntfsprogs
 %endif
@@ -43,7 +44,7 @@ BuildRequires: grub, ntfsprogs
 Requires:      kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
 Requires:      MAKEDEV, net-tools, augeas-libs, file
 Requires:      module-init-tools, procps, strace, iputils
-Requires:      dosfstools, zerofree, lsof, scrub
+Requires:      dosfstools, zerofree, lsof, scrub, libselinux
 %ifarch %{ix86} x86_64
 Requires:      grub, ntfsprogs
 %endif



From rjones at fedoraproject.org  Thu Aug 13 10:11:05 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 10:11:05 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.53,1.54
Message-ID: <20090813101105.488B911C0349@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31552/F-11

Modified Files:
	libguestfs.spec 
Log Message:
Add requirement for libselinux{,-devel} which will be needed for the next release.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libguestfs.spec	10 Aug 2009 11:38:32 -0000	1.53
+++ libguestfs.spec	13 Aug 2009 10:11:05 -0000	1.54
@@ -22,6 +22,7 @@ BuildRequires: squashfs-tools
 BuildRequires: qemu-kvm >= 0.10-7
 BuildRequires: createrepo
 BuildRequires: glibc-static
+BuildRequires: libselinux-devel
 
 # This is only needed for RHEL 5 because readline-devel doesn't
 # properly depend on it, but doesn't do any harm on other platforms:
@@ -31,7 +32,7 @@ BuildRequires: ncurses-devel
 BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
 BuildRequires: MAKEDEV, net-tools, augeas-libs, file
 BuildRequires: module-init-tools, procps, strace, iputils
-BuildRequires: dosfstools, zerofree, lsof, scrub
+BuildRequires: dosfstools, zerofree, lsof, scrub, libselinux
 %ifarch %{ix86} x86_64
 BuildRequires: grub, ntfsprogs
 %endif
@@ -40,7 +41,7 @@ BuildRequires: grub, ntfsprogs
 Requires:      kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
 Requires:      MAKEDEV, net-tools, augeas-libs, file
 Requires:      module-init-tools, procps, strace, iputils
-Requires:      dosfstools, zerofree, lsof, scrub
+Requires:      dosfstools, zerofree, lsof, scrub, libselinux
 %ifarch %{ix86} x86_64
 Requires:      grub, ntfsprogs
 %endif



From dnovotny at fedoraproject.org  Thu Aug 13 10:16:04 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 13 Aug 2009 10:16:04 +0000 (UTC)
Subject: rpms/emacs/devel emacs.desktop,1.9,1.10 emacs.spec,1.132,1.133
Message-ID: <20090813101604.9604C11C0097@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32513

Modified Files:
	emacs.desktop emacs.spec 
Log Message:

fix desktop file



Index: emacs.desktop
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.desktop,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- emacs.desktop	27 Aug 2007 20:50:44 -0000	1.9
+++ emacs.desktop	13 Aug 2009 10:16:04 -0000	1.10
@@ -1,26 +1,5 @@
 [Desktop Entry]
-Name=Emacs Text Editor
-Name[bg]=???????? Emacs
-Name[ca]=Editor Emacs
-Name[cs]=Editor Emacs
-Name[da]=Emacs tekstredigerer
-Name[de]=Emacs Texteditor
-Name[eo]=La redaktilo Emakso
-Name[et]=V?imas tekstiredaktor Emacs
-Name[fi]=Emacs editori
-Name[fr]=?diteur Emacs
-Name[hu]=Emacs sz?vegszerkeszt?
-Name[is]=Emacs-ritill
-Name[ja]=Emacs ??????????
-Name[mk]=??????????????? Emacs ????????
-Name[no]=Emacs-tekstredigerer
-Name[pt]=Editor Emacs
-Name[ro]=Editorul Emacs
-Name[ru]=???????? Emacs
-Name[sk]=Editor Emacs
-Name[sl]=Urejevalnik Emacs
-Name[uk]=???????? Emacs
-Name[zh_TW]=Emacs ?????
+Name=Emacs
 GenericName=Text Editor
 Comment=Edit text
 Comment[zh_TW]=????


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- emacs.spec	10 Aug 2009 15:35:01 -0000	1.132
+++ emacs.spec	13 Aug 2009 10:16:04 -0000	1.133
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -369,6 +369,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Aug 13 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-3
+- fixed Name and GenericName in desktop file (#514599)
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:23.1-2
 - Use bzipped upstream tarball.
 



From pbrobinson at fedoraproject.org  Thu Aug 13 10:24:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 13 Aug 2009 10:24:03 +0000 (UTC)
Subject: rpms/libccss/devel .cvsignore, 1.3, 1.4 libccss.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090813102403.5D92411C0097@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libccss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2286

Modified Files:
	.cvsignore libccss.spec sources 
Log Message:
- New release - 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libccss/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Jul 2009 16:44:20 -0000	1.3
+++ .cvsignore	13 Aug 2009 10:24:03 -0000	1.4
@@ -1 +1 @@
-libccss-0.3.1.tar.gz
+libccss-0.4.0.tar.gz


Index: libccss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libccss/devel/libccss.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libccss.spec	25 Jul 2009 05:24:56 -0000	1.7
+++ libccss.spec	13 Aug 2009 10:24:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libccss
-Version:        0.3.1
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        A simple api for CSS Stylesheets
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/ccss-cairo
 
 %changelog
+* Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.0-1
+- New release - 0.4.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libccss/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Jul 2009 16:44:20 -0000	1.3
+++ sources	13 Aug 2009 10:24:03 -0000	1.4
@@ -1 +1 @@
-c13c4dcafbd595e66b47399129f48fa6  libccss-0.3.1.tar.gz
+da6028a7230ea41cae8e08155299a6a8  libccss-0.4.0.tar.gz



From jussilehtola at fedoraproject.org  Thu Aug 13 10:27:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 10:27:55 +0000 (UTC)
Subject: rpms/pcc/EL-5 pcc.spec,1.2,1.3
Message-ID: <20090813102755.91D2F11C0097@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2957/EL-5

Modified Files:
	pcc.spec 
Log Message:
Fix license.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/EL-5/pcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
+++ pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
@@ -1,11 +1,26 @@
+# Use our own configure in order to prevent --target
+%global pccconfigure \
+ export CFLAGS="%{optflags}"; \
+ export CXXFLAGS="%{optflags}"; \
+ export FFLAGS="%{optflags} -I%{_fmoddir}"; \
+ ./configure --program-prefix= --prefix=%{_prefix} \
+ --exec-prefix=%{_prefix} --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} --includedir=%{_includedir} \
+ --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
+ --localstatedir=%{_localstatedir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --mandir=%{_mandir} --infodir=%{_infodir}
+
+# Used CVS snapshot
 %global snapshot 090813
 
 Name:		pcc
 Version:	0.9.9
-Release:	0.3.%{snapshot}cvs%{?dist}
+Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and ISC 
+License:	BSD and BSD with advertising and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -77,14 +92,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/pcc
-%{_bindir}/%{_target_platform}-pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/%{_target_platform}-cpp
-%{_libexecdir}/%{_target_platform}-ccom
-%{_mandir}/man1/%{_target_platform}-ccom.1.*
-%{_mandir}/man1/%{_target_platform}-cpp.1.*
-%{_mandir}/man1/%{_target_platform}-pcc.1.*
+%{_libexecdir}/pcc-cpp
+%{_libexecdir}/pcc-ccom
+%{_mandir}/man1/pcc-ccom.1.*
+%{_mandir}/man1/pcc-cpp.1.*
+%{_mandir}/man1/pcc.1.*
 
 %changelog
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs



From jussilehtola at fedoraproject.org  Thu Aug 13 10:27:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 10:27:55 +0000 (UTC)
Subject: rpms/pcc/F-10 pcc.spec,1.2,1.3
Message-ID: <20090813102755.A7B3E11C0349@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2957/F-10

Modified Files:
	pcc.spec 
Log Message:
Fix license.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/pcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
+++ pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
@@ -1,11 +1,26 @@
+# Use our own configure in order to prevent --target
+%global pccconfigure \
+ export CFLAGS="%{optflags}"; \
+ export CXXFLAGS="%{optflags}"; \
+ export FFLAGS="%{optflags} -I%{_fmoddir}"; \
+ ./configure --program-prefix= --prefix=%{_prefix} \
+ --exec-prefix=%{_prefix} --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} --includedir=%{_includedir} \
+ --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
+ --localstatedir=%{_localstatedir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --mandir=%{_mandir} --infodir=%{_infodir}
+
+# Used CVS snapshot
 %global snapshot 090813
 
 Name:		pcc
 Version:	0.9.9
-Release:	0.3.%{snapshot}cvs%{?dist}
+Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and ISC 
+License:	BSD and BSD with advertising and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -77,14 +92,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/pcc
-%{_bindir}/%{_target_platform}-pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/%{_target_platform}-cpp
-%{_libexecdir}/%{_target_platform}-ccom
-%{_mandir}/man1/%{_target_platform}-ccom.1.*
-%{_mandir}/man1/%{_target_platform}-cpp.1.*
-%{_mandir}/man1/%{_target_platform}-pcc.1.*
+%{_libexecdir}/pcc-cpp
+%{_libexecdir}/pcc-ccom
+%{_mandir}/man1/pcc-ccom.1.*
+%{_mandir}/man1/pcc-cpp.1.*
+%{_mandir}/man1/pcc.1.*
 
 %changelog
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs



From jussilehtola at fedoraproject.org  Thu Aug 13 10:27:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 10:27:55 +0000 (UTC)
Subject: rpms/pcc/F-11 pcc.spec,1.2,1.3
Message-ID: <20090813102755.C8BCA11C043C@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2957/F-11

Modified Files:
	pcc.spec 
Log Message:
Fix license.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-11/pcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
+++ pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
@@ -1,11 +1,26 @@
+# Use our own configure in order to prevent --target
+%global pccconfigure \
+ export CFLAGS="%{optflags}"; \
+ export CXXFLAGS="%{optflags}"; \
+ export FFLAGS="%{optflags} -I%{_fmoddir}"; \
+ ./configure --program-prefix= --prefix=%{_prefix} \
+ --exec-prefix=%{_prefix} --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} --includedir=%{_includedir} \
+ --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
+ --localstatedir=%{_localstatedir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --mandir=%{_mandir} --infodir=%{_infodir}
+
+# Used CVS snapshot
 %global snapshot 090813
 
 Name:		pcc
 Version:	0.9.9
-Release:	0.3.%{snapshot}cvs%{?dist}
+Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and ISC 
+License:	BSD and BSD with advertising and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -77,14 +92,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/pcc
-%{_bindir}/%{_target_platform}-pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/%{_target_platform}-cpp
-%{_libexecdir}/%{_target_platform}-ccom
-%{_mandir}/man1/%{_target_platform}-ccom.1.*
-%{_mandir}/man1/%{_target_platform}-cpp.1.*
-%{_mandir}/man1/%{_target_platform}-pcc.1.*
+%{_libexecdir}/pcc-cpp
+%{_libexecdir}/pcc-ccom
+%{_mandir}/man1/pcc-ccom.1.*
+%{_mandir}/man1/pcc-cpp.1.*
+%{_mandir}/man1/pcc.1.*
 
 %changelog
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs



From jussilehtola at fedoraproject.org  Thu Aug 13 10:27:55 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 13 Aug 2009 10:27:55 +0000 (UTC)
Subject: rpms/pcc/devel pcc.spec,1.2,1.3
Message-ID: <20090813102755.E9B7711C043D@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2957/devel

Modified Files:
	pcc.spec 
Log Message:
Fix license.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/pcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pcc.spec	13 Aug 2009 06:04:29 -0000	1.2
+++ pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
@@ -1,11 +1,26 @@
+# Use our own configure in order to prevent --target
+%global pccconfigure \
+ export CFLAGS="%{optflags}"; \
+ export CXXFLAGS="%{optflags}"; \
+ export FFLAGS="%{optflags} -I%{_fmoddir}"; \
+ ./configure --program-prefix= --prefix=%{_prefix} \
+ --exec-prefix=%{_prefix} --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} --includedir=%{_includedir} \
+ --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
+ --localstatedir=%{_localstatedir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --mandir=%{_mandir} --infodir=%{_infodir}
+
+# Used CVS snapshot
 %global snapshot 090813
 
 Name:		pcc
 Version:	0.9.9
-Release:	0.3.%{snapshot}cvs%{?dist}
+Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and ISC 
+License:	BSD and BSD with advertising and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -77,14 +92,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/pcc
-%{_bindir}/%{_target_platform}-pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/%{_target_platform}-cpp
-%{_libexecdir}/%{_target_platform}-ccom
-%{_mandir}/man1/%{_target_platform}-ccom.1.*
-%{_mandir}/man1/%{_target_platform}-cpp.1.*
-%{_mandir}/man1/%{_target_platform}-pcc.1.*
+%{_libexecdir}/pcc-cpp
+%{_libexecdir}/pcc-ccom
+%{_mandir}/man1/pcc-ccom.1.*
+%{_mandir}/man1/pcc-cpp.1.*
+%{_mandir}/man1/pcc.1.*
 
 %changelog
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs



From petersen at fedoraproject.org  Thu Aug 13 10:40:31 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 13 Aug 2009 10:40:31 +0000 (UTC)
Subject: rpms/ibus-anthy/devel ibus-anthy.spec,1.21,1.22
Message-ID: <20090813104031.1B3CF11C048B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4814

Modified Files:
	ibus-anthy.spec 
Log Message:
fix changelog snapdate and specify libexec glob


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ibus-anthy.spec	13 Aug 2009 07:27:56 -0000	1.21
+++ ibus-anthy.spec	13 Aug 2009 10:40:30 -0000	1.22
@@ -52,13 +52,13 @@ rm -rf $RPM_BUILD_ROOT
 # %dir %{python_sitearch}/ibus
 %{python_sitearch}/anthy.py*
 %{python_sitearch}/_anthy.so
-%{_libexecdir}/*
+%{_libexecdir}/ibus-*-anthy
 %{_datadir}/ibus-anthy
 %{_datadir}/ibus/component/*
 
 %changelog
 * Thu Aug 13 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090813-1
-- Update to 1.2.0.20090804
+- Update to 1.2.0.20090813
 - Fix bug 509483 - reconversion feature doesn't work
 - Fix bug 509485 - commit_first_segment feature doesn't work
 



From harald at fedoraproject.org  Thu Aug 13 11:08:01 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 13 Aug 2009 11:08:01 +0000 (UTC)
Subject: rpms/readahead/F-11 .cvsignore, 1.11, 1.12 readahead.spec, 1.55,
	1.56 sources, 1.15, 1.16 readahead-1.4.5-audit_reply_list.patch,
	1.1, NONE readahead-1.4.5-usr.patch, 1.2, NONE
Message-ID: <20090813110801.5932C11C0097@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9994

Modified Files:
	.cvsignore readahead.spec sources 
Removed Files:
	readahead-1.4.5-audit_reply_list.patch 
	readahead-1.4.5-usr.patch 
Log Message:
* Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
- version 1.5.0
- see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	5 Mar 2009 18:00:09 -0000	1.11
+++ .cvsignore	13 Aug 2009 11:08:01 -0000	1.12
@@ -1 +1 @@
-readahead-1.4.9.tar.bz2
+readahead-1.5.0.tar.bz2


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-11/readahead.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- readahead.spec	5 Mar 2009 18:00:09 -0000	1.55
+++ readahead.spec	13 Aug 2009 11:08:01 -0000	1.56
@@ -1,6 +1,6 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.4.9
+Version:        1.5.0
 Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
@@ -68,6 +68,10 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
+- version 1.5.0
+- see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD
+
 * Thu Mar 05 2009 Harald Hoyer <harald at redhat.com> 1.4.9-1
 - version 1.4.9
 - readahead-collector is now triggered by rpm database changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 Mar 2009 18:00:09 -0000	1.15
+++ sources	13 Aug 2009 11:08:01 -0000	1.16
@@ -1 +1 @@
-f0f4b5259aebb62c83c4079b977464e7  readahead-1.4.9.tar.bz2
+409a1fedb5d9c72c023541156b250e3f  readahead-1.5.0.tar.bz2


--- readahead-1.4.5-audit_reply_list.patch DELETED ---


--- readahead-1.4.5-usr.patch DELETED ---



From harald at fedoraproject.org  Thu Aug 13 11:08:11 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 13 Aug 2009 11:08:11 +0000 (UTC)
Subject: rpms/readahead/devel .cvsignore, 1.11, 1.12 readahead.spec, 1.57,
	1.58 sources, 1.15, 1.16 readahead-1.4.5-audit_reply_list.patch,
	1.1, NONE readahead-1.4.5-usr.patch, 1.2, NONE
Message-ID: <20090813110811.828EA11C0097@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10080

Modified Files:
	.cvsignore readahead.spec sources 
Removed Files:
	readahead-1.4.5-audit_reply_list.patch 
	readahead-1.4.5-usr.patch 
Log Message:
* Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
- version 1.5.0
- see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	5 Mar 2009 18:00:09 -0000	1.11
+++ .cvsignore	13 Aug 2009 11:08:11 -0000	1.12
@@ -1 +1 @@
-readahead-1.4.9.tar.bz2
+readahead-1.5.0.tar.bz2


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- readahead.spec	27 Jul 2009 02:53:08 -0000	1.57
+++ readahead.spec	13 Aug 2009 11:08:11 -0000	1.58
@@ -1,7 +1,7 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.4.9
-Release:        3%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -68,6 +68,10 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
+- version 1.5.0
+- see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	5 Mar 2009 18:00:09 -0000	1.15
+++ sources	13 Aug 2009 11:08:11 -0000	1.16
@@ -1 +1 @@
-f0f4b5259aebb62c83c4079b977464e7  readahead-1.4.9.tar.bz2
+409a1fedb5d9c72c023541156b250e3f  readahead-1.5.0.tar.bz2


--- readahead-1.4.5-audit_reply_list.patch DELETED ---


--- readahead-1.4.5-usr.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Aug 13 11:10:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 13 Aug 2009 11:10:49 +0000 (UTC)
Subject: rpms/libccss/devel libccss.spec,1.8,1.9
Message-ID: <20090813111049.9FC4C11C0097@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libccss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10644

Modified Files:
	libccss.spec 
Log Message:
- Update some changed files


Index: libccss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libccss/devel/libccss.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libccss.spec	13 Aug 2009 10:24:03 -0000	1.8
+++ libccss.spec	13 Aug 2009 11:10:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libccss
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple api for CSS Stylesheets
 
 Group:          System Environment/Libraries
@@ -62,12 +62,12 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS TODO
-%{_libdir}/libccss-1.so.3.0.1
-%{_libdir}/libccss-gtk-1.so.3.0.1
-%{_libdir}/libccss-cairo-1.so.3.0.1
-%{_libdir}/libccss-1.so.3
-%{_libdir}/libccss-cairo-1.so.3
-%{_libdir}/libccss-gtk-1.so.3
+%{_libdir}/libccss-1.so.4.0.0
+%{_libdir}/libccss-gtk-1.so.4.0.0
+%{_libdir}/libccss-cairo-1.so.4.0.0
+%{_libdir}/libccss-1.so.4
+%{_libdir}/libccss-cairo-1.so.4
+%{_libdir}/libccss-gtk-1.so.4
 %{_bindir}/ccss-stylesheet-to-gtkrc
 
 %files devel
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/ccss-cairo
 
 %changelog
+* Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.0-2
+- Update some changed files
+
 * Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.0-1
 - New release - 0.4.0
 



From harald at fedoraproject.org  Thu Aug 13 11:13:16 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 13 Aug 2009 11:13:16 +0000 (UTC)
Subject: rpms/readahead/F-10 readahead.spec,1.53,1.54 sources,1.14,1.15
Message-ID: <20090813111316.7FD7A11C0097@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11098

Modified Files:
	readahead.spec sources 
Log Message:
* Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
- version 1.5.0
- see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD



Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-10/readahead.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- readahead.spec	2 Mar 2009 12:47:53 -0000	1.53
+++ readahead.spec	13 Aug 2009 11:13:16 -0000	1.54
@@ -1,6 +1,6 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.4.8
+Version:        1.5.0
 Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
@@ -68,6 +68,14 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
+- version 1.5.0
+- see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD
+
+* Thu Mar 05 2009 Harald Hoyer <harald at redhat.com> 1.4.9-1
+- version 1.4.9
+- readahead-collector is now triggered by rpm database changes
+
 * Fri Feb 20 2009 Harald Hoyer <harald at redhat.com> 1.4.8-1
 - version 1.4.8
 - /etc/readahead.d moved to /var/lib/readahead


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Mar 2009 12:47:53 -0000	1.14
+++ sources	13 Aug 2009 11:13:16 -0000	1.15
@@ -1 +1 @@
-e249a7c6d4aebea77412ffa3e2b8a570  readahead-1.4.8.tar.bz2
+409a1fedb5d9c72c023541156b250e3f  readahead-1.5.0.tar.bz2



From caolanm at fedoraproject.org  Thu Aug 13 11:17:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 13 Aug 2009 11:17:30 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.dr72.patch, NONE,
	1.1 workspace.kso32fixes.patch, NONE, 1.1 openoffice.org.spec,
	1.1979, 1.1980 openoffice.org-2.2.0.ooo63159.sal.dtype.patch, 1.4,
	NONE openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch,
	1.1, NONE
Message-ID: <20090813111730.2307111C0097@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11766

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.dr72.patch workspace.kso32fixes.patch 
Removed Files:
	openoffice.org-2.2.0.ooo63159.sal.dtype.patch 
	openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch 
Log Message:
rename to accepted upstream workspaces

workspace.dr72.patch:
 prj/build.lst                |    2 
 source/core/filterdetect.cxx |  244 +++++++++++++++++++++++++++++++++++++++----
 util/makefile.mk             |    3 
 3 files changed, 226 insertions(+), 23 deletions(-)

--- NEW FILE workspace.dr72.patch ---
diff -ru oox.orig/prj/build.lst oox/prj/build.lst
--- oox.orig/prj/build.lst	2009-06-25 12:29:27.000000000 +0100
+++ oox/prj/build.lst	2009-06-26 11:02:26.000000000 +0100
@@ -1,4 +1,4 @@
-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools BOOST:boost NULL
+oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools BOOST:boost OPENSSL:openssl NULL
 oox	oox				usr1	-   all	oox_mkout NULL
 oox	oox\prj				get	-   all	oox_prj NULL
 oox	oox\source\token		nmake	-   all	oox_token NULL
diff -ru oox.orig/source/core/filterdetect.cxx oox/source/core/filterdetect.cxx
--- oox.orig/source/core/filterdetect.cxx	2009-06-25 12:30:35.000000000 +0100
+++ oox/source/core/filterdetect.cxx	2009-06-26 11:01:15.000000000 +0100
@@ -37,12 +37,20 @@
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 
+#include <com/sun/star/io/XTempFile.hpp>
+
 #include <comphelper/mediadescriptor.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 
+#include <rtl/digest.h>
+#include <openssl/evp.h>
+
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/zipstorage.hxx"
+#include "oox/helper/olestorage.hxx"
+#include "oox/helper/binaryinputstream.hxx"
+#include "oox/helper/binaryoutputstream.hxx"
 #include "oox/core/fasttokenhandler.hxx"
 #include "oox/core/namespaces.hxx"
 #include "tokens.hxx"
@@ -317,6 +325,97 @@
 {
 }
 
+/*
+ * Derive Key
+ */
+void DeriveKey(const sal_uInt8 *pHash, sal_uInt32 cbHash, sal_uInt8 *keyDerived, sal_uInt32 cbRequiredKeyLength)
+{
+    sal_uInt8 aBuffer[64];
+
+    memset(aBuffer, 0x36, sizeof(aBuffer));
+    for (sal_uInt32 i = 0; i < cbHash; ++i)
+        aBuffer[i] ^= pHash[i];
+
+    rtlDigest aDigest;
+    rtlDigestError aError;
+
+    aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    aError = rtl_digest_update(aDigest, aBuffer, sizeof(aBuffer));
+    sal_uInt8 X1[RTL_DIGEST_LENGTH_SHA1];
+    aError = rtl_digest_get(aDigest, X1, RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    memset(aBuffer, 0x5C, sizeof(aBuffer));
+    for (sal_uInt32 i = 0; i < cbHash; ++i)
+        aBuffer[i] ^= pHash[i];
+
+    aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    aError = rtl_digest_update(aDigest, aBuffer, sizeof(aBuffer));
+    sal_uInt8 X2[RTL_DIGEST_LENGTH_SHA1];
+    aError = rtl_digest_get(aDigest, X2, RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    if (cbRequiredKeyLength > RTL_DIGEST_LENGTH_SHA1)
+    {
+        memcpy(keyDerived+RTL_DIGEST_LENGTH_SHA1, X2, cbRequiredKeyLength-RTL_DIGEST_LENGTH_SHA1);
+        cbRequiredKeyLength=RTL_DIGEST_LENGTH_SHA1;
+    }
+    memcpy(keyDerived, X1, cbRequiredKeyLength);
+}
+
+/*
+ * Generate an encryption key
+ */
+
+void GenerateEncryptionKey(sal_uInt32 SaltSize, const sal_uInt8 *Salt, const rtl::OUString &rPassword,
+    sal_uInt8 *key, sal_uInt32 cbRequiredKeyLength)
+{
+    size_t nBufferSize = (SaltSize + (rPassword.getLength() * sizeof(sal_uInt16)));
+    sal_uInt8 *pBuffer = new sal_uInt8[nBufferSize];
+
+    memcpy(pBuffer, Salt, SaltSize);
+
+    sal_uInt8 *pPasswordLoc = pBuffer+SaltSize;
+    sal_Int32 nLen = rPassword.getLength();
+    const sal_Unicode *pStr = rPassword.getStr();
+
+    for (sal_Int32 i = 0; i < nLen; ++i, ++pStr)
+    {
+        *pPasswordLoc++ = (*pStr & 0x00FF);
+        *pPasswordLoc++ = ((*pStr & 0xFF00) >> 8);
+    }
+
+    rtlDigest aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    rtlDigestError aError;
+    aError = rtl_digest_update(aDigest, pBuffer, nBufferSize);
+    delete [] pBuffer;
+    size_t nHashSize = RTL_DIGEST_LENGTH_SHA1+sizeof(sal_uInt32);
+    sal_uInt8 aHash[nHashSize];
+    aError = rtl_digest_get(aDigest, aHash+sizeof(sal_uInt32), RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    for (sal_uInt32 i = 0; i < 50000; ++i)
+    {
+        aHash[0] = (i & 0x000000FF);
+        aHash[1] = (i & 0x0000FF00) >> 8;
+        aHash[2] = (i & 0x00FF0000) >> 16;
+        aHash[3] = (i & 0xFF000000) >> 24;
+        aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+        aError = rtl_digest_update(aDigest, aHash, nHashSize);
+        aError = rtl_digest_get(aDigest, aHash+sizeof(sal_uInt32), RTL_DIGEST_LENGTH_SHA1);
+        rtl_digest_destroy(aDigest);
+    }
+
+    memmove(aHash, aHash+sizeof(sal_uInt32), RTL_DIGEST_LENGTH_SHA1);
+    memset(aHash+RTL_DIGEST_LENGTH_SHA1, 0, sizeof(sal_uInt32));
+    aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    aError = rtl_digest_update(aDigest, aHash, nHashSize);
+    aError = rtl_digest_get(aDigest, aHash, RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    DeriveKey(aHash, RTL_DIGEST_LENGTH_SHA1, key, cbRequiredKeyLength);
+}
+
 // com.sun.star.document.XExtendedFilterDetect interface ----------------------
 
 OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException )
@@ -325,31 +424,134 @@
 
     if( mxFactory.is() ) try
     {
-        Reference< XFastParser > xParser( mxFactory->createInstance(
-            CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ) ), UNO_QUERY_THROW );
-
-        xParser->setFastDocumentHandler( new FilterDetectDocHandler( aFilter ) );
-        xParser->setTokenHandler( new FastTokenHandler );
-
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships" ), NMSP_PACKAGE_RELATIONSHIPS );
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships" ), NMSP_RELATIONSHIPS );
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/content-types" ), NMSP_CONTENT_TYPES );
-
         MediaDescriptor aDescriptor( lDescriptor );
         aDescriptor.addInputStream();
         Reference< XInputStream > xInputStream( aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY_THROW );
-        StorageRef xStorage( new ZipStorage( mxFactory, xInputStream ) );
+        StorageRef xZipStorage( new ZipStorage( mxFactory, xInputStream ) );
 
-        // Parse _rels/.rels to get the target path.
-        InputSource aParserInput;
-        aParserInput.sSystemId = CREATE_OUSTRING( "_rels/.rels" );
-        aParserInput.aInputStream = xStorage->openInputStream( aParserInput.sSystemId );
-        xParser->parseStream( aParserInput );
-
-        // Parse [Content_Types].xml to determine the content type of the part at the target path.
-        aParserInput.sSystemId = CREATE_OUSTRING( "[Content_Types].xml" );
-        aParserInput.aInputStream = xStorage->openInputStream( aParserInput.sSystemId );
-        xParser->parseStream( aParserInput );
+        if (xZipStorage->isStorage())
+        {
+            Reference< XFastParser > xParser( mxFactory->createInstance(
+                CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ) ), UNO_QUERY_THROW );
+
+            xParser->setFastDocumentHandler( new FilterDetectDocHandler( aFilter ) );
+            xParser->setTokenHandler( new FastTokenHandler );
+
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships" ), NMSP_PACKAGE_RELATIONSHIPS );
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships" ), NMSP_RELATIONSHIPS );
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/content-types" ), NMSP_CONTENT_TYPES );
+
+            // Parse _rels/.rels to get the target path.
+            InputSource aParserInput;
+            aParserInput.sSystemId = CREATE_OUSTRING( "_rels/.rels" );
+            aParserInput.aInputStream = xZipStorage->openInputStream( aParserInput.sSystemId );
+            xParser->parseStream( aParserInput );
+
+            // Parse [Content_Types].xml to determine the content type of the part at the target path.
+            aParserInput.sSystemId = CREATE_OUSTRING( "[Content_Types].xml" );
+            aParserInput.aInputStream = xZipStorage->openInputStream( aParserInput.sSystemId );
+            xParser->parseStream( aParserInput );
+        }
+        else
+        {
+            StorageRef xOLEStorage ( new OleStorage( mxFactory, xInputStream, false ) );
+            if (xOLEStorage->isStorage())
+            {
+                Reference< XInputStream > xEncryptionInfo = xOLEStorage->openInputStream( CREATE_OUSTRING( "EncryptionInfo") );
+                Reference< XInputStream > xEncryptedPackage = xOLEStorage->openInputStream( CREATE_OUSTRING( "EncryptedPackage") );
+                BinaryXInputStream aInfo(xEncryptionInfo, true);
+                aInfo.skip(0x00000008);
+                sal_uInt32 EncryptionHeaderSize = aInfo.readuInt32();
+                aInfo.skip(0x00000008);
+                sal_uInt32 AlgID = aInfo.readuInt32();
+                sal_uInt32 AlgIDHash = aInfo.readuInt32();
+                sal_uInt32 KeySize = aInfo.readuInt32();
+                aInfo.skip(EncryptionHeaderSize-0x00000014);
+                sal_uInt32 SaltSize = aInfo.readuInt32();
+                sal_uInt8 Salt[16];
+                aInfo.readMemory(Salt, 16);
+                sal_uInt8 EncryptedVerifier[16];
+                aInfo.readMemory(EncryptedVerifier, 16);
+                sal_uInt32 VerifierHashSize = aInfo.readuInt32();
+                sal_uInt8 EncryptedVerifierHash[32];
+                aInfo.readMemory(EncryptedVerifierHash, 32);
+
+                bool bCorrectPassword = false;
+                //aes128 && sha1 && expected hash size
+                bool bImplemented = ((AlgID == 0x0000660E) && (AlgIDHash == 0x00008004) && (VerifierHashSize == 0x14));
+
+                if (bImplemented)
+                {
+                    sal_uInt8 cbRequiredKeyLength = KeySize/8;
+                    sal_uInt8 *key = new sal_uInt8[cbRequiredKeyLength];
+                    //VelvetSweatshop is the default .xlsx "protection" password, so out-of-the-box we should
+                    //be able to open those immediately. For other passwords we need to pass down that data, or query
+                    //for it, however its normall done, to here.
+                    //Unlike other formats, we can't really detect what's inside this wrapper until *after* 
+                    //decryption
+                    GenerateEncryptionKey(SaltSize, Salt, CREATE_OUSTRING("VelvetSweatshop"), key, cbRequiredKeyLength);
+
+                    EVP_CIPHER_CTX aes_ctx;
+                    int outlen=0;
+
+                    EVP_CIPHER_CTX_init(&aes_ctx);
+                    EVP_DecryptInit_ex(&aes_ctx, EVP_aes_128_ecb(), NULL, key, NULL);
+                    EVP_CIPHER_CTX_set_padding(&aes_ctx, 0);
+                    sal_uInt8 Verifier[16]= {0};
+                    /*int*/ EVP_DecryptUpdate(&aes_ctx, Verifier, &outlen, EncryptedVerifier, sizeof(EncryptedVerifier));
+                    EVP_CIPHER_CTX_cleanup(&aes_ctx);
+
+                    EVP_CIPHER_CTX_init(&aes_ctx);
+                    EVP_DecryptInit_ex(&aes_ctx, EVP_aes_128_ecb(), NULL, key, NULL);
+                    EVP_CIPHER_CTX_set_padding(&aes_ctx, 0);
+                    sal_uInt8 VerifierHash[32] = {0};
+                    /*int*/ EVP_DecryptUpdate(&aes_ctx, VerifierHash, &outlen, EncryptedVerifierHash, sizeof(EncryptedVerifierHash));
+                    EVP_CIPHER_CTX_cleanup(&aes_ctx);
+
+                    rtlDigest aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+                    rtlDigestError aError = rtl_digest_update(aDigest, Verifier, sizeof(Verifier));
+                    sal_uInt8 sha1Hash[RTL_DIGEST_LENGTH_SHA1];
+                    aError = rtl_digest_get(aDigest, sha1Hash, RTL_DIGEST_LENGTH_SHA1);
+                    rtl_digest_destroy(aDigest);
+
+                    bCorrectPassword = memcmp(sha1Hash, VerifierHash, RTL_DIGEST_LENGTH_SHA1) == 0;
+
+                    if (bCorrectPassword)
+                    {
+                        Reference<XTempFile> xTemp(
+                            mxFactory->createInstance(CREATE_OUSTRING("com.sun.star.io.TempFile")),
+                              UNO_QUERY_THROW);
+                        BinaryXInputStream aEncryptedPackage(xEncryptedPackage, true);
+                        BinaryXOutputStream aDecryptedPackage(xTemp->getOutputStream(), true);
+
+                        EVP_CIPHER_CTX_init(&aes_ctx);
+                        EVP_DecryptInit_ex(&aes_ctx, EVP_aes_128_ecb(), NULL, key, NULL);
+                        EVP_CIPHER_CTX_set_padding(&aes_ctx, 0);
+
+                        sal_uInt8 inbuf[1024];
+                        sal_uInt8 outbuf[1024];
+                        sal_Int32 inlen;
+                        aEncryptedPackage.skip(sizeof(sal_uInt64)); /*decrypted size*/
+                        while ((inlen = aEncryptedPackage.readMemory(inbuf, sizeof(inbuf))))
+                        {
+                            /*int*/ EVP_DecryptUpdate(&aes_ctx, outbuf, &outlen, inbuf, inlen);
+                            aDecryptedPackage.writeMemory(outbuf, outlen);
+                        }
+                        EVP_DecryptFinal_ex(&aes_ctx, outbuf, &outlen);
+                        aDecryptedPackage.writeMemory(outbuf, outlen);
+
+                        EVP_CIPHER_CTX_cleanup(&aes_ctx);
+                        delete [] key;
+
+                        aDecryptedPackage.seekToStart();
+                        xTemp->getOutputStream()->flush();
+                        aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= xTemp;
+                        aDescriptor >> lDescriptor;
+                        aFilter = detect( lDescriptor );
+                    }
+                }
+            }
+        }
     }
     catch ( const Exception& )
     {
diff -ru oox.orig/util/makefile.mk oox/util/makefile.mk
--- oox.orig/util/makefile.mk	2009-06-25 12:30:40.000000000 +0100
+++ oox/util/makefile.mk	2009-06-25 16:35:08.000000000 +0100
@@ -73,7 +73,8 @@
 		$(RTLLIB)		\
 		$(SALLIB)		\
 		$(BASEGFXLIB)	\
-		$(SAXLIB)
+		$(SAXLIB) \
+		$(OPENSSLLIB)
 
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(LIB1TARGET)

workspace.kso32fixes.patch:
 openoffice.org/sal/osl/unx/file_impl.hxx |   18 ++++++++
 sal/osl/unx/file.cxx                     |   64 ++++++++++++++++++++++++++++++
 sal/osl/unx/file_stat.cxx                |   66 +++++++++++++++++++++++++++++--
 3 files changed, 145 insertions(+), 3 deletions(-)

--- NEW FILE workspace.kso32fixes.patch ---
Index: sal/osl/unx/file.cxx
===================================================================
RCS file: /cvs/porting/sal/osl/unx/file.cxx,v
retrieving revision 1.10
diff -u -p -r1.10 file.cxx
--- openoffice.org.orig/sal/osl/unx/file.cxx	8 Sep 2005 14:53:53 -0000	1.10
+++ openoffice.org/sal/osl/unx/file.cxx	18 Jan 2006 14:38:41 -0000
@@ -156,6 +156,42 @@
 
 #endif
 
+#ifdef _DIRENT_HAVE_D_TYPE
+#include "file_impl.hxx"
+	oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType )
+	{
+		oslDirectoryItemImpl *pItemObject = (oslDirectoryItemImpl*) malloc( sizeof( oslDirectoryItemImpl ) );
+		pItemObject->RefCount = 1;
+		pItemObject->bHasType = _bHasDType;
+		pItemObject->DType = _DType;
+		pItemObject->ustrFilePath = _ustrFilePath;
+
+		return pItemObject;
+	}
+
+	void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem )
+	{
+		if( pItem->ustrFilePath ) {
+			rtl_uString_release( pItem->ustrFilePath );
+			pItem->ustrFilePath = NULL;
+		}
+		free( pItem );
+	}
+
+	void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem )
+	{
+		pItem->RefCount ++;
+	}
+
+	void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem )
+	{
+		pItem->RefCount --;
+
+		if( pItem->RefCount <= 0 )
+			oslDirectoryItemImpl_Destroy( pItem );
+	}
+#endif
+
 #if OSL_DEBUG_LEVEL > 1
 
 	extern void debug_ustring(rtl_uString*);
@@ -484,8 +520,14 @@
 	osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath);
     rtl_uString_release( ustrFileName );
 
+#ifdef _DIRENT_HAVE_D_TYPE
+    if(*pItem)
+      oslDirectoryItemImpl_release( ( oslDirectoryItemImpl* )( *pItem ) );
+    *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrFilePath, true, pEntry->d_type );
+#else
     /* use path as directory item */
     *pItem = (oslDirectoryItem) ustrFilePath;
+#endif
 
     return osl_File_E_None;
 }
@@ -514,7 +556,11 @@
 
 	if (0 == access_u(ustrSystemPath, F_OK))
 	{
+#ifdef _DIRENT_HAVE_D_TYPE
+		*pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrSystemPath, false );
+#else
 		*pItem = (oslDirectoryItem)ustrSystemPath;
+#endif
 		osl_error = osl_File_E_None;
 	}
 	else
@@ -532,12 +578,21 @@
 
 oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
 {
+#ifdef _DIRENT_HAVE_D_TYPE
+	oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
+#else
     rtl_uString* ustrFilePath = (rtl_uString *) Item;
+#endif
 
     OSL_ASSERT( Item );
 
+#ifdef _DIRENT_HAVE_D_TYPE
+	if( pImpl )
+		oslDirectoryItemImpl_acquire( pImpl );
+#else
     if( ustrFilePath )
         rtl_uString_acquire( ustrFilePath );
+#endif
 
     return osl_File_E_None;
 }
@@ -548,12 +603,21 @@
 
 oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
 {
+#ifdef _DIRENT_HAVE_D_TYPE
+	oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
+#else
     rtl_uString* ustrFilePath = (rtl_uString *) Item;
+#endif
 
     OSL_ASSERT( Item );
 
+#ifdef _DIRENT_HAVE_D_TYPE
+	if( pImpl )
+		oslDirectoryItemImpl_release( pImpl );
+#else
     if( ustrFilePath )
         rtl_uString_release( ustrFilePath );
+#endif
 
     return osl_File_E_None;
 }
Index: sal/osl/unx/file_stat.cxx
===================================================================
RCS file: /cvs/porting/sal/osl/unx/file_stat.cxx,v
retrieving revision 1.6
diff -u -p -r1.6 file_stat.cxx
--- openoffice.org.orig/sal/osl/unx/file_stat.cxx	8 Sep 2005 14:56:14 -0000	1.6
+++ openoffice.org/sal/osl/unx/file_stat.cxx	18 Jan 2006 14:38:41 -0000
@@ -42,6 +42,7 @@
 #ifndef _UNISTD_H
 #include <unistd.h>
 #endif
+#include <dirent.h>
 #include <osl/file.h>
 
 #ifndef _ERRNO_H
@@ -56,6 +57,9 @@
 #include "file_path_helper.hxx"
 #include "file_error_transl.h"
 
+#ifdef _DIRENT_HAVE_D_TYPE
+#include "file_impl.hxx"
+#endif
 
 namespace /* private */
 {
@@ -223,9 +227,19 @@
 	
 	/* we only need to call stat or lstat if one of the 
        following flags is set */
+#ifdef _DIRENT_HAVE_D_TYPE
+	inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslDirectoryItemImpl *pImpl)
+#else
 	inline bool is_stat_call_necessary(sal_uInt32 field_mask)
+#endif
 	{
-		return ((field_mask & osl_FileStatus_Mask_Type) ||
+		return (
+/* on linux the dirent might have d_type */
+#ifdef _DIRENT_HAVE_D_TYPE
+				((field_mask & osl_FileStatus_Mask_Type) && (!pImpl->bHasType || pImpl->DType == DT_UNKNOWN)) ||
+#else
+				(field_mask & osl_FileStatus_Mask_Type) ||
+#endif
 				(field_mask & osl_FileStatus_Mask_Attributes) ||
 				(field_mask & osl_FileStatus_Mask_CreationTime) ||
 				(field_mask & osl_FileStatus_Mask_AccessTime) ||
@@ -254,7 +268,11 @@
     	if ((NULL == Item) || (NULL == pStat))
         	return osl_File_E_INVAL;
 							
+#ifdef _DIRENT_HAVE_D_TYPE
+		file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(((oslDirectoryItemImpl* ) Item)->ustrFilePath));
+#else
 		file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(Item));    
+#endif
 
 		OSL_ASSERT(file_path.getLength() > 0);
 		
@@ -285,10 +303,18 @@
 #else
 	struct stat file_stat;
 #endif
-	if (is_stat_call_necessary(uFieldMask) && (0 != osl::lstat(file_path, file_stat)))
+
+#ifdef _DIRENT_HAVE_D_TYPE
+	oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
+	bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl);
+#else
+	bool bStatNeeded = is_stat_call_necessary(uFieldMask);
+#endif
+
+	if (bStatNeeded && (0 != osl::lstat(file_path, file_stat)))
     	return oslTranslateFileError(OSL_FET_ERROR, errno);
 	
-	if (is_stat_call_necessary(uFieldMask))
+	if (bStatNeeded)
 	{
 		// we set all these attributes because it's cheap				
 		set_file_type(file_stat, pStat);
@@ -305,6 +331,40 @@
 				return osl_error;
 		}
     }
+#ifdef _DIRENT_HAVE_D_TYPE
+    else if (uFieldMask & osl_FileStatus_Mask_Type)
+    {
+		OSL_ASSERT(pImpl->bHasType);
+
+		switch(pImpl->DType)
+		{
+		case DT_LNK:
+			pStat->eType = osl_File_Type_Link;              
+			break;
+		case DT_DIR:
+			pStat->eType = osl_File_Type_Directory;       
+			break;
+		case DT_REG:
+			pStat->eType = osl_File_Type_Regular;
+			break;
+		case DT_FIFO:
+			pStat->eType = osl_File_Type_Fifo;
+			break;
+		case DT_SOCK:
+			pStat->eType = osl_File_Type_Socket;
+			break;
+		case DT_CHR:
+		case DT_BLK:
+			pStat->eType = osl_File_Type_Special;
+			break;
+		default:
+			OSL_ASSERT(0);
+			pStat->eType = osl_File_Type_Unknown;
+		}
+
+       pStat->uValidFields |= osl_FileStatus_Mask_Type;
+	}
+#endif
 			
     if (uFieldMask & osl_FileStatus_Mask_FileURL)
     {
Index: sal/osl/unx/file_impl.hxx
===================================================================
--- /dev/null	2006-01-10 21:26:33.568399000 +0100
+++ openoffice.org/sal/osl/unx/file_impl.hxx	2006-01-17 20:05:30.000000000 +0100
@@ -0,0 +1,18 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef struct
+{
+	rtl_uString* ustrFilePath;       /* holds native file name */
+	unsigned char DType;
+	bool bHasType;
+	sal_uInt32 RefCount;
+} oslDirectoryItemImpl;
+
+	oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType=0 );
+	void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem );
+	void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem );
+	void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem );
+#ifdef __cplusplus
+} /* extern "C" */
+#endif


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -p -r1.1979 -r1.1980
--- openoffice.org.spec	11 Aug 2009 13:59:59 -0000	1.1979
+++ openoffice.org.spec	13 Aug 2009 11:17:29 -0000	1.1980
@@ -88,7 +88,7 @@ Patch11: openoffice.org-2.0.3.rh127576.g
 %endif
 Patch12: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
 Patch13: ooo-build.ooo68717.gstreamer.video.patch
-Patch14: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch14: workspace.kso32fixes.patch
 Patch15: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
 Patch16: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
 Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
@@ -148,7 +148,7 @@ Patch70: workspace.calc51.patch
 Patch71: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
 Patch72: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
 Patch73: workspace.cmcfixes60.patch
-Patch74: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
+Patch74: workspace.dr72.patch
 Patch75: workspace.vcl103.patch
 Patch76: workspace.cmcfixes61.patch
 Patch77: workspace.os132.patch
@@ -1626,7 +1626,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %endif
 %patch12 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
 %patch13 -p0 -b .ooo68717.gstreamer.video.patch
-%patch14 -p1 -b .ooo63159.sal.dtype.patch
+%patch14 -p1 -b .workspace.kso32fixes.patch
 %patch15 -p1 -b .ooo76393.sal.dynamicsection.patch
 %patch16 -p1 -b .ooo7065.sw.titlepagedialog.patch
 %patch17 -p1 -b .ooo76649.httpencoding.patch
@@ -1686,7 +1686,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch71 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
 %patch72 -p0 -b .ooo102920.i18npool.utf16bustage.patch
 %patch73 -p0 -b .workspace.cmcfixes60.patch
-%patch74 -p0 -b .ooo92645.oox.msxmldecryptimpl.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


--- openoffice.org-2.2.0.ooo63159.sal.dtype.patch DELETED ---


--- openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Aug 13 11:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 11:27:57 +0000
Subject: [pkgdb] ant had acl change status
Message-ID: <20090813112757.C299E10F862@bastion2.fedora.phx.redhat.com>

pcheung has set the watchbugzilla acl on ant (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ant



From pkgdb at fedoraproject.org  Thu Aug 13 11:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 11:27:58 +0000
Subject: [pkgdb] ant had acl change status
Message-ID: <20090813112758.4F2EF10F87C@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on ant (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ant



From pkgdb at fedoraproject.org  Thu Aug 13 11:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 11:27:59 +0000
Subject: [pkgdb] ant had acl change status
Message-ID: <20090813112759.6A2A110F895@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on ant (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ant



From mlichvar at fedoraproject.org  Thu Aug 13 11:34:36 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 13 Aug 2009 11:34:36 +0000 (UTC)
Subject: rpms/xterm/devel xterm-245-resources.patch, NONE, 1.1 .cvsignore,
	1.33, 1.34 sources, 1.33, 1.34 xterm.spec, 1.74,
	1.75 xterm-242-resources.patch, 1.1, NONE xterm-242-xbell.patch,
	1.1, NONE
Message-ID: <20090813113436.73F0811C0097@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15038

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-245-resources.patch 
Removed Files:
	xterm-242-resources.patch xterm-242-xbell.patch 
Log Message:
- update to 245


xterm-245-resources.patch:
 XTerm.ad |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE xterm-245-resources.patch ---
diff -up xterm-245/XTerm.ad.resources xterm-245/XTerm.ad
--- xterm-245/XTerm.ad.resources	2009-02-13 01:14:13.000000000 +0100
+++ xterm-245/XTerm.ad	2009-08-13 12:28:59.000000000 +0200
@@ -210,3 +210,13 @@
 !*allowTcapOps: false
 !*allowTitleOps: false
 !*allowWindowOps: false
+
+! Red Hat Defaults:
+*allowFontOps: false
+*allowTcapOps: false
+*allowWindowOps: false
+*VT100*eightBitInput: false
+*VT100*metaSendsEscape: true
+*VT100*backarrowKey: false
+*VT100*scrollBar: true
+*VT100*utf8Title: true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	18 Feb 2009 14:47:26 -0000	1.33
+++ .cvsignore	13 Aug 2009 11:34:36 -0000	1.34
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-242.tgz
+xterm-245.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	18 Feb 2009 14:47:26 -0000	1.33
+++ sources	13 Aug 2009 11:34:36 -0000	1.34
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-663fa3aac8e30e4c2d4bf07c0aee4dca  xterm-242.tgz
+ad87d0a641da70a3c1196a209c8db70e  xterm-245.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- xterm.spec	27 Jul 2009 08:47:12 -0000	1.74
+++ xterm.spec	13 Aug 2009 11:34:36 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 242
-Release: 4%{?dist}
+Version: 245
+Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -13,10 +13,9 @@ Source0: ftp://invisible-island.net/xter
 Source1: ftp://invisible-island.net/xterm/16colors.txt
 Source2: %{name}.desktop
 
-Patch1: xterm-242-resources.patch
+Patch1: xterm-245-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
-Patch4: xterm-242-xbell.patch
 
 %bcond_with trace
 
@@ -33,16 +32,13 @@ 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 .xbell
 
 %build
 %configure \
 	--enable-256-color \
 	--enable-exec-xterm \
 	--enable-luit \
-%if %{with trace}
-	--enable-trace \
-%endif
+%{?with_trace: --enable-trace} \
 	--enable-warnings \
 	--enable-wide-chars \
 	--with-app-defaults=%{x11_app_defaults_dir} \
@@ -84,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Aug 13 2009 Miroslav Lichvar <mlichvar at redhat.com> 245-1
+- update to 245
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 242-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xterm-242-resources.patch DELETED ---


--- xterm-242-xbell.patch DELETED ---



From akurtakov at fedoraproject.org  Thu Aug 13 11:37:49 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 13 Aug 2009 11:37:49 +0000 (UTC)
Subject: rpms/ant/devel ant.spec,1.101,1.102
Message-ID: <20090813113749.2AF3C11C0097@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15684/devel

Modified Files:
	ant.spec 
Log Message:
Fix compile with commons-net 2.0.


Index: ant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant/devel/ant.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- ant.spec	7 Aug 2009 22:02:43 -0000	1.101
+++ ant.spec	13 Aug 2009 11:37:48 -0000	1.102
@@ -55,7 +55,7 @@
 
 Name:           ant
 Version:        1.7.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -493,7 +493,8 @@ Javadoc pour %{name}.
 
 %prep
 %setup -q -n apache-ant-%{cvs_version}
-
+#https://issues.apache.org/bugzilla/show_bug.cgi?id=47669
+sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
 # Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
 %ifarch ppc64 s390x
 %patch1 -p1
@@ -1313,6 +1314,9 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.7.1-12
+- Fix compile with commons-net 2.0.
+
 * Fri Aug  7 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.1.7-11
 - Add links to jar files into %{ant_home} (Bug #179759)
 
@@ -1714,4 +1718,3 @@ fi
 * Wed Dec 20 2000 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-1mdk
 - first Mandrake release
 - used SRPMS from Henri Gomez <hgomez at users.sourceforge.net>
-



From scop at fedoraproject.org  Thu Aug 13 11:46:46 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 13 Aug 2009 11:46:46 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs.spec,1.49,1.50
Message-ID: <20090813114646.89A7F11C0097@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17153

Modified Files:
	xemacs.spec 
Log Message:
Note why (probably) modules are disabled on ia64.


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xemacs.spec	27 Jul 2009 07:46:08 -0000	1.49
+++ xemacs.spec	13 Aug 2009 11:46:46 -0000	1.50
@@ -11,6 +11,7 @@
 %bcond_without  nox
 %bcond_without  xim
 %ifarch ia64
+# no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39
 %bcond_with     modules
 %else
 %bcond_without  modules



From pmachata at fedoraproject.org  Thu Aug 13 11:48:06 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Thu, 13 Aug 2009 11:48:06 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009k-cairo.patch, NONE, 1.1 tzdata.spec, 
	1.85, 1.86
Message-ID: <20090813114806.DB1F311C0097@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17325

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009k-cairo.patch 
Log Message:
- Egypt starts winter time on August 21.


tzdata-2009k-cairo.patch:
 africa |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tzdata-2009k-cairo.patch ---
diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa
--- tzdata2009k/africa	2009-07-20 15:45:47.000000000 +0200
+++ tzdata2009k/africa	2009-08-12 13:56:08.000000000 +0200
@@ -277,7 +277,7 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # Thursday in September; Egypt is expected to revert to the last Thursday
 # in September.
 Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Aug	20	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

Diff finished.  Wed Aug 12 13:57:48 2009


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- tzdata.spec	27 Jul 2009 06:25:49 -0000	1.85
+++ tzdata.spec	13 Aug 2009 11:48:06 -0000	1.86
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009k
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2009k-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,13 +109,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Aug 13 2009 Petr Machata <pmachata at redhat.com> - 2009k-3
+- Egypt starts winter time on August 21.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009k-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jul 20 2009 Petr Machata <pmachata at redhat.com> - 2009k-1
 - Upstream 2009k
   - Mauritius will not continue to observe DST the coming summer
-  - Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time
+  - Arbitrarily end DST at the end of 2009 so that a POSIX-style time
     zone string can appear in the Dhaka binary file
 
 * Thu Jun 18 2009 Petr Machata <pmachata at redhat.com> - 2009j-1



From pmachata at fedoraproject.org  Thu Aug 13 11:48:24 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Thu, 13 Aug 2009 11:48:24 +0000 (UTC)
Subject: rpms/tzdata/F-11 tzdata-2009k-cairo.patch, NONE, 1.1 tzdata.spec,
	1.83, 1.84
Message-ID: <20090813114824.5732711C0097@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17391

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009k-cairo.patch 
Log Message:
- Egypt starts winter time on August 21.


tzdata-2009k-cairo.patch:
 africa |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tzdata-2009k-cairo.patch ---
diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa
--- tzdata2009k/africa	2009-07-20 15:45:47.000000000 +0200
+++ tzdata2009k/africa	2009-08-12 13:56:08.000000000 +0200
@@ -277,7 +277,7 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # Thursday in September; Egypt is expected to revert to the last Thursday
 # in September.
 Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Aug	20	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

Diff finished.  Wed Aug 12 13:57:48 2009


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/tzdata.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- tzdata.spec	20 Jul 2009 15:41:46 -0000	1.83
+++ tzdata.spec	13 Aug 2009 11:48:24 -0000	1.84
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009k
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2009k-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,10 +109,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Aug 13 2009 Petr Machata <pmachata at redhat.com> - 2009k-2
+- Egypt starts winter time on August 21.
+
 * Mon Jul 20 2009 Petr Machata <pmachata at redhat.com> - 2009k-1
 - Upstream 2009k
   - Mauritius will not continue to observe DST the coming summer
-  - Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time
+  - Arbitrarily end DST at the end of 2009 so that a POSIX-style time
     zone string can appear in the Dhaka binary file
 
 * Thu Jun 18 2009 Petr Machata <pmachata at redhat.com> - 2009j-1



From pmachata at fedoraproject.org  Thu Aug 13 11:48:44 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Thu, 13 Aug 2009 11:48:44 +0000 (UTC)
Subject: rpms/tzdata/F-10 tzdata-2009k-cairo.patch, NONE, 1.1 tzdata.spec,
	1.79, 1.80
Message-ID: <20090813114844.CCEC711C0097@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17552

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2009k-cairo.patch 
Log Message:
- Egypt starts winter time on August 21.


tzdata-2009k-cairo.patch:
 africa |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tzdata-2009k-cairo.patch ---
diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009k/africa
--- tzdata2009k/africa	2009-07-20 15:45:47.000000000 +0200
+++ tzdata2009k/africa	2009-08-12 13:56:08.000000000 +0200
@@ -277,7 +277,7 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # Thursday in September; Egypt is expected to revert to the last Thursday
 # in September.
 Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Aug	20	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct

Diff finished.  Wed Aug 12 13:57:48 2009


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- tzdata.spec	20 Jul 2009 15:43:34 -0000	1.79
+++ tzdata.spec	13 Aug 2009 11:48:44 -0000	1.80
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009k
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,7 @@ Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2009k-cairo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +48,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_ver
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p0
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,10 +109,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Aug 13 2009 Petr Machata <pmachata at redhat.com> - 2009k-2
+- Egypt starts winter time on August 21.
+
 * Mon Jul 20 2009 Petr Machata <pmachata at redhat.com> - 2009k-1
 - Upstream 2009k
   - Mauritius will not continue to observe DST the coming summer
-  - Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time
+  - Arbitrarily end DST at the end of 2009 so that a POSIX-style time
     zone string can appear in the Dhaka binary file
 
 * Thu Jun 18 2009 Petr Machata <pmachata at redhat.com> - 2009j-1



From pkgdb at fedoraproject.org  Thu Aug 13 11:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 11:56:53 +0000
Subject: [pkgdb] digikam ownership updated
Message-ID: <20090813115653.5ECFA10F855@bastion2.fedora.phx.redhat.com>

Package digikam in Fedora EPEL 5 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam



From pkgdb at fedoraproject.org  Thu Aug 13 11:57:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 11:57:11 +0000
Subject: [pkgdb] digikam-doc ownership updated
Message-ID: <20090813115711.9F99A10F84F@bastion2.fedora.phx.redhat.com>

Package digikam-doc in Fedora EPEL 5 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/digikam-doc



From rdieter at fedoraproject.org  Thu Aug 13 12:09:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 13 Aug 2009 12:09:02 +0000 (UTC)
Subject: comps comps-el5.xml.in, 1.25, 1.26 comps-f10.xml.in, 1.265,
	1.266 comps-f11.xml.in, 1.284, 1.285 comps-f12.xml.in, 1.80, 1.81
Message-ID: <20090813120902.5F67F11C0097@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20880

Modified Files:
	comps-el5.xml.in comps-f10.xml.in comps-f11.xml.in 
	comps-f12.xml.in 
Log Message:
+alpine



Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-el5.xml.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- comps-el5.xml.in	2 Jun 2009 13:59:03 -0000	1.25
+++ comps-el5.xml.in	13 Aug 2009 12:09:01 -0000	1.26
@@ -395,6 +395,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">alpine</packagereq>
       <packagereq type="optional">naim</packagereq>
       <packagereq type="optional">ncftp</packagereq>
       <packagereq type="optional">pork</packagereq>


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- comps-f10.xml.in	12 Aug 2009 16:23:02 -0000	1.265
+++ comps-f10.xml.in	13 Aug 2009 12:09:01 -0000	1.266
@@ -4654,6 +4654,7 @@
       <packagereq type="default">mutt</packagereq>
       <packagereq type="default">slrn</packagereq>
       <packagereq type="optional">abook</packagereq>
+      <packagereq type="optional">alpine</packagereq>
       <packagereq type="optional">archivemail</packagereq>
       <packagereq type="optional">argus</packagereq>
       <packagereq type="optional">axel</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- comps-f11.xml.in	12 Aug 2009 16:23:02 -0000	1.284
+++ comps-f11.xml.in	13 Aug 2009 12:09:01 -0000	1.285
@@ -5358,6 +5358,7 @@
       <packagereq type="default">mutt</packagereq>
       <packagereq type="default">slrn</packagereq>
       <packagereq type="optional">abook</packagereq>
+      <packagereq type="optional">alpine</packagereq>
       <packagereq type="optional">archivemail</packagereq>
       <packagereq type="optional">argus</packagereq>
       <packagereq type="optional">axel</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- comps-f12.xml.in	11 Aug 2009 15:42:40 -0000	1.80
+++ comps-f12.xml.in	13 Aug 2009 12:09:02 -0000	1.81
@@ -5491,6 +5491,7 @@
       <packagereq type="default">mutt</packagereq>
       <packagereq type="default">slrn</packagereq>
       <packagereq type="optional">abook</packagereq>
+      <packagereq type="optional">alpine</packagereq>
       <packagereq type="optional">archivemail</packagereq>
       <packagereq type="optional">argus</packagereq>
       <packagereq type="optional">axel</packagereq>



From jstanley at fedoraproject.org  Thu Aug 13 12:29:10 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu, 13 Aug 2009 12:29:10 +0000 (UTC)
Subject: rpms/trac-customfieldadmin-plugin/EL-5 .cvsignore, 1.1, 1.2 sources,
	1.2, 1.3 trac-customfieldadmin-plugin.spec, 1.1, 1.2
Message-ID: <20090813122910.D888C11C0097@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/trac-customfieldadmin-plugin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24386

Modified Files:
	.cvsignore sources trac-customfieldadmin-plugin.spec 
Log Message:
Update to new upstream, fix some minor packaging bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Jul 2009 02:36:43 -0000	1.1
+++ .cvsignore	13 Aug 2009 12:29:10 -0000	1.2
@@ -0,0 +1 @@
+trac-customfieldadminplugin-0.10.svn5253.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Jul 2009 22:37:44 -0000	1.2
+++ sources	13 Aug 2009 12:29:10 -0000	1.3
@@ -1 +1 @@
-0c551244396c6725bb301ece9964ad57  trac-customfieldadminplugin-0.10.svn5073.tar.gz
+9b3dec440af7700c0af5ae8b817eaa40  trac-customfieldadminplugin-0.10.svn5253.tar.gz


Index: trac-customfieldadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-customfieldadmin-plugin/EL-5/trac-customfieldadmin-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- trac-customfieldadmin-plugin.spec	8 Jul 2009 22:37:44 -0000	1.1
+++ trac-customfieldadmin-plugin.spec	13 Aug 2009 12:29:10 -0000	1.2
@@ -2,23 +2,23 @@
 
 Name:           trac-customfieldadmin-plugin
 Version:        0.1
-Release:        0.1.svn5073%{?dist}
+Release:        0.3.svn5253%{?dist}
 Summary:        Expose ticket custom fields via the web admin interface
 
 Group:          Applications/Internet
 # BSD license derived from metadata in setup.py
 License:        BSD
-URL:            http://trac-hacks.org/wiki/PrivateTicketsPlugin
-# Produce via 'svn export -r5073 http://trac-hacks.org/svn/customfieldadminplugin/0.10 customfieldadminplugin-0.10'
-# tar -czvf trac-customfieldadminplugin-0.10.svn5073.tar.gz customfieldadminplugin-0.10
-Source0:        trac-customfieldadminplugin-0.10.svn5073.tar.gz
+URL:            http://trac-hacks.org/wiki/CustomFieldAdminPlugin
+# Produce via 'svn export -r5253 http://trac-hacks.org/svn/customfieldadminplugin/0.10 customfieldadminplugin-0.10'
+# tar -czvf trac-customfieldadminplugin-0.10.svn5253.tar.gz customfieldadminplugin-0.10
+Source0:        trac-customfieldadminplugin-0.10.svn5253.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
 Requires:       trac >= 0.10
 # Only for 0.10
-Requires:       trac-webadmin-plugin
+Requires:       trac-webadmin
 
 %description
 A trac plugin to expose custom ticket fields via the admin web interface,
@@ -29,10 +29,10 @@ instead of directly editing trac.ini
 
 
 %build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py build
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 
@@ -45,6 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Aug 13 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.3.svn5253
+- Correct some packaging errors, update to new SVN checkout
 
 * Sat Jul 04 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-0.2.svn5073
 - Correctly name package, correct SVN checkout instructions



From than at fedoraproject.org  Thu Aug 13 12:33:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 13 Aug 2009 12:33:33 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.56,1.57
Message-ID: <20090813123333.869E911C0097@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25049

Modified Files:
	kdeplasma-addons.spec 
Log Message:
omit BR on kdevel-devel/eigen2-devel for rhel



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- kdeplasma-addons.spec	8 Aug 2009 02:12:06 -0000	1.56
+++ kdeplasma-addons.spec	13 Aug 2009 12:33:33 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -25,14 +25,14 @@ BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
 # for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
+%if 0%{?fedora}
+BuildRequires:  eigen2-devel
 # RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
 BuildRequires:  kdeedu-devel >= %{version}
-%if 0%{?fedora} > 9
-# Optional (but recommended), enables automatic rotation for frame applet
+%endif
 BuildRequires:  libkexiv2-devel >= 0.4.0
 # lancelot eye-candy
 BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
-%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 
@@ -96,9 +96,11 @@ make install/fast DESTDIR=%{buildroot} -
 # 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
@@ -160,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
+- omit BR on kdevel-devel/eigen2-devel for rhel
+
 * Fri Aug 07 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.0-8
 - Waited for newRepo task
 



From rvokal at fedoraproject.org  Thu Aug 13 12:35:04 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Thu, 13 Aug 2009 12:35:04 +0000 (UTC)
Subject: rpms/gjots2/devel .cvsignore, 1.5, 1.6 gjots2.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <20090813123504.9B65711C0097@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25359

Modified Files:
	.cvsignore gjots2.spec sources 
Log Message:
update to 2.3.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Nov 2008 12:48:48 -0000	1.5
+++ .cvsignore	13 Aug 2009 12:35:04 -0000	1.6
@@ -1 +1 @@
-gjots2-2.3.8.tgz
+gjots2-2.3.9.tgz


Index: gjots2.spec
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/gjots2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gjots2.spec	25 Jul 2009 00:14:02 -0000	1.14
+++ gjots2.spec	13 Aug 2009 12:35:04 -0000	1.15
@@ -20,8 +20,8 @@
 
 Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy
 Name: gjots2
-Version: 2.3.8
-Release: 4%{?dist}
+Version: 2.3.9
+Release: 1%{?dist}
 URL: http://bhepple.freeshell.org/gjots
 Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
 Patch0: gjots2-2.3.7-sitelib.patch
@@ -134,6 +134,9 @@ desktop-file-install --vendor fedora    
 %{_mandir}/man1/docbook2gjots*
 
 %changelog
+* Thu Aug 13 2009 Radek Vokal <rvokal at redhat.com> 2.3.9-1
+- upgrade to 2.3.9, adds Undo/Redo support
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2008 12:48:48 -0000	1.5
+++ sources	13 Aug 2009 12:35:04 -0000	1.6
@@ -1 +1 @@
-1061044c828771c4f17f677f48a38cd4  gjots2-2.3.8.tgz
+e1bac3e2c90672e281d479ba2177daab  gjots2-2.3.9.tgz



From pbrobinson at fedoraproject.org  Thu Aug 13 13:34:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 13 Aug 2009 13:34:03 +0000 (UTC)
Subject: rpms/nbtk/devel nbtk.spec,1.19,1.20
Message-ID: <20090813133403.3AC4A11C0097@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1970

Modified Files:
	nbtk.spec 
Log Message:
- Rebuild against new ccss, update BuildReq to new ccss name


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nbtk.spec	7 Aug 2009 14:06:16 -0000	1.19
+++ nbtk.spec	13 Aug 2009 13:34:02 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           nbtk
 Version:        0.16.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
 BuildRequires: gtk2-devel
-BuildRequires: libccss-devel
+BuildRequires: ccss-devel
 BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
@@ -34,7 +34,6 @@ Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 Files for development with %{name}.
@@ -79,9 +78,12 @@ rm -rf %{buildroot}
 %{_includedir}/nbtk-1.0
 %{_libdir}/pkgconfig/nbtk*.pc
 %{_libdir}/libnbtk*.so
-%{_datadir}/gtk-doc/html/%{name}
+%doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-11
+- Rebuild against new ccss, update BuildReq to new ccss name
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-10
 - And once more with feeling
 



From pbrobinson at fedoraproject.org  Thu Aug 13 13:37:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 13 Aug 2009 13:37:13 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/devel moblin-gtk-engine-fixtheme.patch, NONE,
	1.1 moblin-gtk-engine.spec, 1.3, 1.4 import.log, 1.1, NONE
Message-ID: <20090813133713.DB78811C0097@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-serv2426

Modified Files:
	moblin-gtk-engine.spec 
Added Files:
	moblin-gtk-engine-fixtheme.patch 
Removed Files:
	import.log 
Log Message:
- Specifiy the Moblin rather than Mist icon theme

moblin-gtk-engine-fixtheme.patch:
 index.theme |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE moblin-gtk-engine-fixtheme.patch ---
--- moblin-gtk-engine-0.4.1/data/index.theme.orig	2009-08-13 14:10:22.000000000 +0100
+++ moblin-gtk-engine-0.4.1/data/index.theme	2009-08-13 14:10:31.000000000 +0100
@@ -5,4 +5,4 @@
 Encoding=UTF-8
 GtkTheme=Moblin-Netbook
 MetacityTheme=Moblin-Netbook
-IconTheme=Mist
+IconTheme=Moblin


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/moblin-gtk-engine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-gtk-engine.spec	24 Jul 2009 19:22:52 -0000	1.3
+++ moblin-gtk-engine.spec	13 Aug 2009 13:37:13 -0000	1.4
@@ -1,21 +1,18 @@
 Name:           moblin-gtk-engine
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK engine for Moblin
 
 Group:          User Interface/Desktops
 License:        LGPLv2
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:         moblin-gtk-engine-fixtheme.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: intltool
-BuildRequires: gettext
 
 Requires:       gnome-settings-daemon
 
@@ -24,6 +21,7 @@ GTK engine for Moblin
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixtheme
 
 %build
 ./autogen.sh
@@ -32,9 +30,11 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
 rm -rf %{buildroot}/%{_libdir}/*.la
 rm -rf %{buildroot}/%{_libdir}/gtk-2.0/2.10.0/engines/*.la
 
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Moblin-Netbook/metacity-1
 
 %changelog
+* Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.1-2
+- Specifiy the Moblin rather than Mist icon theme
+
 * Fri Jul 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.1-1
 - New upstream 0.4.1 release
 


--- import.log DELETED ---



From mhlavink at fedoraproject.org  Thu Aug 13 13:42:56 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 13 Aug 2009 13:42:56 +0000 (UTC)
Subject: rpms/squirrelmail/devel squirrelmail.spec,1.74,1.75
Message-ID: <20090813134257.07D0111C0097@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3240

Modified Files:
	squirrelmail.spec 
Log Message:
- updated to 1.4.20RC1
- fixes #517312 - CSRF issues in all forms (SA34627)



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- squirrelmail.spec	27 Jul 2009 04:46:05 -0000	1.74
+++ squirrelmail.spec	13 Aug 2009 13:42:56 -0000	1.75
@@ -5,12 +5,12 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.19
-Release: 4%{?dist}
+Version: 1.4.20
+Release: 0.rc1%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
+Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}RC1.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
@@ -50,7 +50,7 @@ compatibility across browsers.  It has v
 easy to configure and install.
 
 %prep
-%setup -q -n squirrelmail-%{version}
+%setup -q -n squirrelmail-%{version}RC1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Thu Aug 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20RC1-1
+- updated to 1.4.20RC1
+- fixes #517312 - CSRF issues in all forms (SA34627)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Thu Aug 13 13:43:37 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 13 Aug 2009 13:43:37 +0000 (UTC)
Subject: rpms/babl/devel babl.spec,1.16,1.17
Message-ID: <20090813134337.801C911C0097@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/babl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3445

Modified Files:
	babl.spec 
Log Message:
explain patch status


Index: babl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/babl/devel/babl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- babl.spec	24 Jul 2009 17:46:18 -0000	1.16
+++ babl.spec	13 Aug 2009 13:43:37 -0000	1.17
@@ -7,6 +7,9 @@ License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/babl/
 Source0:	ftp://ftp.gtk.org/pub/babl/0.1/%{name}-%{version}.tar.bz2
+# needed for building, reported upstream at
+# http://bugzilla.gnome.org/show_bug.cgi?id=583565, fixed in upstream git
+# repository already
 Patch0:		babl-build-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	librsvg2 w3m
@@ -73,6 +76,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Aug 13 2009 Nils Philippsen <nils at redhat.com>
+- explain patch status
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From smilner at fedoraproject.org  Thu Aug 13 13:57:25 2009
From: smilner at fedoraproject.org (smilner)
Date: Thu, 13 Aug 2009 13:57:25 +0000 (UTC)
Subject: rpms/buildbot/devel .cvsignore, 1.9, 1.10 buildbot.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <20090813135725.CFC0211C0097@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6132

Modified Files:
	.cvsignore buildbot.spec sources 
Log Message:
Updated for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Jul 2009 07:33:18 -0000	1.9
+++ .cvsignore	13 Aug 2009 13:57:25 -0000	1.10
@@ -1 +1 @@
-buildbot-0.7.11p1.tar.gz
+buildbot-0.7.11p2.tar.gz


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/devel/buildbot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- buildbot.spec	24 Jul 2009 18:29:07 -0000	1.16
+++ buildbot.spec	13 Aug 2009 13:57:25 -0000	1.17
@@ -3,8 +3,8 @@
 %global do_tests 1
 
 Name:           buildbot
-Version:        0.7.11p1
-Release:        2%{?dist}
+Version:        0.7.11p2
+Release:        1%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p2-1
+- Update for XSS vuln from upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.11p1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Jul 2009 07:33:19 -0000	1.9
+++ sources	13 Aug 2009 13:57:25 -0000	1.10
@@ -1 +1 @@
-2f83cd6562f0288ec4f4d77027f3090f  buildbot-0.7.11p1.tar.gz
+eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz



From limb at fedoraproject.org  Thu Aug 13 14:00:32 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 13 Aug 2009 14:00:32 +0000 (UTC)
Subject: rpms/gallery2/EL-5 gallery2-2.3-captcha.patch, NONE,
	1.1 gallery2-2.3-installer.patch, NONE,
	1.1 gallery2-2.3-module-cleanup.README, NONE,
	1.1 gallery2-2.3-smtp.patch, NONE,
	1.1 gallery2-2.3-upgrade.patch, NONE, 1.1 README.fedora.Gallery2,
	1.5, 1.6 gallery2-httpd-conf, 1.1, 1.2 gallery2.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090813140032.32F7A11C043B@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gallery2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6666

Modified Files:
	README.fedora.Gallery2 gallery2-httpd-conf gallery2.spec 
	sources 
Added Files:
	gallery2-2.3-captcha.patch gallery2-2.3-installer.patch 
	gallery2-2.3-module-cleanup.README gallery2-2.3-smtp.patch 
	gallery2-2.3-upgrade.patch 
Log Message:
Update to current, 486068


gallery2-2.3-captcha.patch:
 GallerySession.class |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gallery2-2.3-captcha.patch ---
--- modules/core/classes/GallerySession.class~	2009-05-21 09:03:54.000000000 -0500
+++ modules/core/classes/GallerySession.class	2009-05-21 09:03:54.000000000 -0500
@@ -27,0 +28,3 @@
+//BZ 501871, captcha fix.
+GalleryCoreApi::requireOnce('modules/core/classes/GalleryTranslator.class');  
+

gallery2-2.3-installer.patch:
 index.php |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gallery2-2.3-installer.patch ---
--- install/index.php~	2009-06-19 11:58:00.000000000 -0500
+++ install/index.php	2009-06-19 11:58:00.000000000 -0500
@@ -49,0 +50 @@
+require_once($g2Base . 'modules/core/classes/GalleryCoreApi.class');


--- NEW FILE gallery2-2.3-module-cleanup.README ---
A recent update of gallery2 removed 3 modules, which, if these had not been
 deactivated within gallery2 beforehand, caused errors in upgraded gallery2
installations.

To remove the remnants of the recently removed uploadapplet, 
slideshowapplet and remote modules, do the following:

In your gallery2 database:
delete from g2_PluginMap where g_pluginId = 'uploadapplet';
delete from g2_PluginPackageMap where g_pluginId = 'uploadapplet';
delete from g2_PluginParameterMap where g_pluginId = 'uploadapplet';
delete from g2_PluginMap where g_pluginId = 'slideshowapplet';
delete from g2_PluginPackageMap where g_pluginId = 'slideshowapplet';
delete from g2_PluginParameterMap where g_pluginId = 'slideshowapplet';
delete from g2_PluginMap where g_pluginId = 'remote';
delete from g2_PluginPackageMap where g_pluginId = 'remote';
delete from g2_PluginParameterMap where g_pluginId = 'remote';

Then, on the host with gallery2 installed, in your g2data directory:
rm -f g2data/cache/module/_all/0/0/*
rm -rf g2data/cache/module/uploadapplet
rm -rf g2data/cache/module/slideshowapplet
rm -rf g2data/cache/module/remote

This will restore any functionality not directly affected by the .jar 
removals, such as adding new items.
gallery2-2.3-smtp.patch:
 smtp.php |   40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

--- NEW FILE gallery2-2.3-smtp.patch ---
--- lib/smtp/smtp.php~	2008-10-18 02:15:42.000000000 -0500
+++ lib/smtp/smtp.php	2009-05-21 07:14:59.000000000 -0500
@@ -42,14 +42,15 @@
-    if (isset($headers)) {
-	$headers = rtrim($headers);
-
-	// Make sure there are no bare linefeeds in the headers
-	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
-
-	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $cc = split(', *', $match[1]);
-	}
-	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $bcc = split(', *', $match[1]);
-	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
-	}
-    }
+    /// JOEL
+//    if (isset($headers)) {
+//	$headers = rtrim($headers);
+//
+//	// Make sure there are no bare linefeeds in the headers
+//	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
+//
+//	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $cc = split(', *', $match[1]);
+//	}
+//	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $bcc = split(', *', $match[1]);
+//	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
+//	}
+//    }
@@ -68 +69,10 @@
-    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+//    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+// JDY JOEL YOUNG FIX FROM http://blog.bonetree.net/2008/10/configuring-gallery2-to-send-email-using-gmail/
+    $url_info = parse_url($config['smtp.host']);
+    $config['smtp.host'] = '';
+    if( isset($url_info['scheme']) ) {
+       $config['smtp.host'] = $url_info['scheme'].'://';
+       }
+    $config['smtp.host'] .= $url_info['host'];
+    $port = ( isset($url_info['port']) ) ? $url_info['port'] : 25;
+

gallery2-2.3-upgrade.patch:
 index.php |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gallery2-2.3-upgrade.patch ---
--- upgrade/index.php~	2008-10-18 02:15:43.000000000 -0500
+++ upgrade/index.php	2009-07-17 07:46:11.000000000 -0500
@@ -49,0 +50 @@
+require_once($g2Base . 'modules/core/classes/GalleryCoreApi.class');


Index: README.fedora.Gallery2
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/README.fedora.Gallery2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- README.fedora.Gallery2	15 May 2007 19:59:41 -0000	1.5
+++ README.fedora.Gallery2	13 Aug 2009 14:00:30 -0000	1.6
@@ -53,7 +53,9 @@ disregard this notice and refer to the n
 Step 4 (Storage setup): The default selection for the image storage directory
 in this package is /srv/gallery2.  You must chose a directory that the web
 server can write to - if you have a read-only /usr directory tree, the
-storage directory must be outside that tree.
+storage directory must be outside that tree.  If you use the default seletion, 
+you must create this directory yourself and ensure that it is writable by the
+user that your web server runs as (usually 'apache').
 
 Step 7 (Create config file): This step will tell you that the config file,
 config.php, has been written to the gallery2 directory.  It was actually


Index: gallery2-httpd-conf
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/gallery2-httpd-conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gallery2-httpd-conf	7 Jun 2006 03:51:38 -0000	1.1
+++ gallery2-httpd-conf	13 Aug 2009 14:00:30 -0000	1.2
@@ -1,5 +1,5 @@
 Alias /gallery2 /usr/share/gallery2
 
 <Directory /usr/share/gallery2>
-  AllowOverride Options
+  AllowOverride Options FileInfo
 </Directory>


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/gallery2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gallery2.spec	20 Mar 2008 18:11:12 -0000	1.13
+++ gallery2.spec	13 Aug 2009 14:00:30 -0000	1.14
@@ -5,23 +5,37 @@
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.2.4
+Version: 2.3
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
-# Source0: http://dl.sf.net/gallery/gallery-%{version}-developer.tar.gz
-# Tarball from upstream will not work - must use SVN snapshot
-Source0: gallery-2.2.svn.tar.gz
+#Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
+# Tarball from upstream contains prebuilt jars, some of which are not redistributable.
+# Generated from gallery-2.3-full.zip
+# unzip gallery-2.3-full.zip
+# find . -name '*.jar' | xargs rm -f
+# tar -czf gallery-2.3-jarless.tar.gz gallery2/
+Source0: gallery-2.3-jarless.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
+Source4: gallery2-2.3-module-cleanup.README
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty
+Requires: php >= 4.3.0, httpd, gallery2-classic, gallery2-matrix, gallery2-display, php-Smarty, gallery2-httpauth
 BuildArch: noarch
 # Subversion needed to generate manifest
-BuildRequires: perl-String-CRC32, subversion
-
-Patch0: gallery2-perl-location.patch
+#BuildRequires: perl-String-CRC32, subversion
+BuildRequires: java-1.6.0-openjdk-devel
+Obsoletes: gallery2-panorama <= 2.3-4
+Obsoletes: gallery2-remote <= 2.3-7
+Obsoletes: gallery2-uploadapplet <= 2.3-7
+Obsoletes: gallery2-slideshowapplet <= 2.3-7
+
+#Patch0: gallery2-perl-location.patch
+Patch1: gallery2-2.3-smtp.patch
+Patch2: gallery2-2.3-captcha.patch
+Patch3: gallery2-2.3-installer.patch
+Patch4: gallery2-2.3-upgrade.patch
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -123,6 +137,7 @@ Requires: gallery2 = %{version}-%{releas
 Summary: Httpauth module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
+Requires: gallery2-rewrite = %{version}-%{release}
 
 %package icons
 Summary: Icons module for Gallery 2
@@ -145,6 +160,11 @@ Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}, ImageMagick >= 4.0
 Provides: gallery2-graphics
 
+%package jpegtran
+Summary: JPEG manipulation module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}, libjpeg
+
 %package itemadd
 Summary: Itemadd module for Gallery 2
 Group: Applications/Publishing
@@ -206,8 +226,8 @@ Summary: Nokiaupload module for Gallery 
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package panorama
-Summary: Panorama module for Gallery 2
+%package notification
+Summary: Notification module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
@@ -261,10 +281,10 @@ Summary: Register module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package remote
-Summary: Remote module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package remote
+#Summary: Remote module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package replica
 Summary: Replica module for Gallery 2
@@ -311,16 +331,21 @@ Summary: Slideshow module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package slideshowapplet
-Summary: Slideshowapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package slideshowapplet
+#Summary: Slideshowapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package squarethumb
 Summary: Squarethumb module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package snapgalaxy
+Summary: Snapgalaxy module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package thumbnail
 Summary: Thumbnail module for Gallery 2
 Group: Applications/Publishing
@@ -331,10 +356,10 @@ Summary: Thumbpage module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
-%package uploadapplet
-Summary: Uploadapplet module for Gallery 2
-Group: Applications/Publishing
-Requires: gallery2 = %{version}-%{release}
+#%package uploadapplet
+#Summary: Uploadapplet module for Gallery 2
+#Group: Applications/Publishing
+#Requires: gallery2 = %{version}-%{release}
 
 %package useralbum
 Summary: Useralbum module for Gallery 2
@@ -495,6 +520,9 @@ Gallery 2 module - Render frames around 
 %description imagemagick
 Gallery 2 module - ImageMagick / GraphicsMagick Graphics Toolkit
 
+%description jpegtran
+Gallery 2 module - JPEG manipulation
+
 %description itemadd
 Gallery 2 module - Item addition
 
@@ -531,8 +559,8 @@ Gallery 2 module - Highlight new/updated
 %description nokiaupload
 Gallery 2 module - Implementation of Nokia Image Upload Server API v1.1 
 
-%description panorama
-Gallery 2 module - View wide jpeg/gif images in a java applet viewer 
+%description notification
+Gallery 2 module - Email notification
 
 %description password
 Gallery 2 module - password - CVS only
@@ -564,8 +592,8 @@ Gallery 2 module - Rearrange the order o
 %description register
 Gallery 2 module - New User Registration
 
-%description remote
-Gallery 2 module - Implementation for the remote control protocol
+#%description remote
+#Gallery 2 module - Implementation for the remote control protocol
 
 %description replica
 Gallery 2 module - Replication support
@@ -594,8 +622,11 @@ Gallery 2 module - Define picture size l
 %description slideshow
 Gallery 2 module - Slideshow 
 
-%description slideshowapplet
-Gallery 2 module - Fullscreen slideshow using a Java applet
+#%description slideshowapplet
+#Gallery 2 module - Fullscreen slideshow using a Java applet
+
+%description snapgalaxy
+Gallery 2 module - Print photos using SnapGalaxy
 
 %description squarethumb
 Gallery 2 module - Build all thumbnails so they are square
@@ -607,8 +638,8 @@ Gallery 2 module - Set default thumbnail
 Gallery 2 module - Select page/frame from a multipage file or movie 
 for the thumbnail
 
-%description uploadapplet
-Gallery 2 module - Easy to use upload applet for media
+#%description uploadapplet
+#Gallery 2 module - Easy to use upload applet for media
 
 %description useralbum
 Gallery 2 module - Create an album for each new user
@@ -655,12 +686,16 @@ subalbums/other items not shown
 
 %prep
 %setup -q -n gallery2
-%patch0 -p1
+#%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
 
 %build
-pushd lib/tools/bin
-perl makeManifest.pl
-popd
+#pushd lib/tools/bin
+#perl makeManifest.pl
+#popd
 rm -rf `cat MANIFEST | grep -e "^R" | cut -f 2`
 find . -depth -name .svn -type d -exec rm -rf {} \;
 # Remove the execute bit from files that don't start with #!
@@ -671,20 +706,27 @@ for file in `find -type f -perm /111`; d
 done
 # We evidently didn't catch one, so...
 chmod 755 lib/tools/po/header.pl
+#These modules need unredistributable jars, so we'll remove the files.
+rm -rf modules/panorama
+rm -rf modules/remote
+rm -rf modules/uploadapplet
+rm -rf modules/slideshowapplet
+
 
 %install
+rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{installprefix}/gallery2
 install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/gallery2.conf
 install -m 0644 -p %{SOURCE2} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/.htaccess
+#remove bundled Smarty.
+rm -rf lib/smarty
 cp -pr * ${RPM_BUILD_ROOT}%{installprefix}/gallery2
-# Remove lib/Smarty directory to try to use php-Smary package
-rm -rf ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/Smarty
 install -m 0644 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/README.fedora
+install -m 0644 -p %{SOURCE4} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/gallery2-2.3-module-cleanup.README
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/premerge-messages.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/update-all-translations.pl
-chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/bin/getIllegalFunctions.pl
-chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/uml/make-java-classes.pl
-mkdir -p ${RPM_BUILD_ROOT}%{g2datadir}
+#chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/bin/getIllegalFunctions.pl
+#chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/uml/make-java-classes.pl
 mkdir -p ${RPM_BUILD_ROOT}%{g2confdir}
 # Touch a login.txt in /srv/gallery2/ and ghost it so we don't
 # run afoul of a ro /usr
@@ -695,6 +737,7 @@ echo "\$gallery->setConfig('data.gallery
 echo "?>" >> ${RPM_BUILD_ROOT}%{g2confdir}/config.php
 ln -s ../../..%{g2confdir}/config.php ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
 chmod 644 ${RPM_BUILD_ROOT}%{g2confdir}/config.php
+ln -s ../../php/Smarty ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/smarty
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -716,6 +759,18 @@ echo If this is an upgrade from a previo
 echo please be sure to point a web browser at http://\<hostname\>/gallery2/upgrade/
 echo and follow the instructions there to complete the upgrade process.
 
+if [ -d %{installprefix}/gallery2/lib/smarty -a ! -L %{installprefix}/gallery2/lib/smarty ]; then
+    mv %{installprefix}/gallery2/lib/smarty %{installprefix}/gallery2/lib/smarty.rpmbak && \
+    ln -s ../../php/Smarty %{installprefix}/gallery2/lib/smarty && \
+    rm -rf %{installprefix}/gallery2/lib/smarty.rpmbak
+fi 
+if [ ! -L %{installprefix}/gallery2/lib/smarty ]; then
+  ln -s ../../php/Smarty %{installprefix}/gallery2/lib/smarty
+fi
+
+
+
+
 %files
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/bootstrap.inc
@@ -732,17 +787,19 @@ echo and follow the instructions there t
 %dir %{installprefix}/gallery2/modules
 %{installprefix}/gallery2/modules/core/
 %dir %{installprefix}/gallery2/themes
-%attr(-,apache,root) %dir %{g2datadir}
+%{installprefix}/gallery2/locale/
 %{installprefix}/gallery2/upgrade/
 %doc %{installprefix}/gallery2/LICENSE
 %doc %{installprefix}/gallery2/MANIFEST
 %doc %{installprefix}/gallery2/README.html
 %doc %{installprefix}/gallery2/README.fedora
+%doc %{installprefix}/gallery2/gallery2-2.3-module-cleanup.README
 %attr(-,apache,root) %config(noreplace) %{g2confdir}/config.php
 %config(noreplace) %{installprefix}/gallery2/.htaccess
 %dir %{g2confdir}
 %config(noreplace) %{g2confdir}/login.txt
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/gallery2.conf
+%ghost %{installprefix}/gallery2/lib/smarty
 
 %files albumselect
 %defattr(-,root,root,-)
@@ -840,6 +897,10 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/imagemagick/
 
+%files jpegtran
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/jpegtran/
+
 %files linkitem
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/linkitem/
@@ -888,9 +949,9 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/nokiaupload/
 
-%files panorama
+%files notification
 %defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/panorama/
+%{installprefix}/gallery2/modules/notification/
 
 %files password
 %defattr(-,root,root,-)
@@ -932,9 +993,9 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/register/
 
-%files remote
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/remote/
+#%files remote
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/remote/
 
 %files replica
 %defattr(-,root,root,-)
@@ -972,9 +1033,13 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/slideshow/
 
-%files slideshowapplet
+#%files slideshowapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/slideshowapplet/
+
+%files snapgalaxy
 %defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/slideshowapplet/
+%{installprefix}/gallery2/modules/snapgalaxy/
 
 %files squarethumb
 %defattr(-,root,root,-)
@@ -988,9 +1053,9 @@ echo and follow the instructions there t
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/thumbpage/
 
-%files uploadapplet
-%defattr(-,root,root,-)
-%{installprefix}/gallery2/modules/uploadapplet/
+#%files uploadapplet
+#%defattr(-,root,root,-)
+#%{installprefix}/gallery2/modules/uploadapplet/
 
 %files useralbum
 %defattr(-,root,root,-)
@@ -1049,6 +1114,69 @@ echo and follow the instructions there t
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-14
+- Upgrader patch, BZ 506983.
+- Removed extra slash from installer patch.
+
+* Fri Jun 19 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-13
+- Installer patch, BZ 506983.
+
+* Wed May 27 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-12
+- Added gallery2-2.3-module-cleanup.README.
+
+* Wed May 21 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-11
+- Patch to fix SMTP, 501868.
+- Patch to fix captcha, 501871.
+
+* Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-10
+- Fine-tuning of symlink script.
+
+* Fri May 01 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-9
+- Add rewrite dep for httpauth, BZ 498061.
+- Adopt rdieter's symlink handling suggestions from rel-eng #1674.
+
+* Tue Apr 28 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-8
+- pretrans script logic fix. BZ498019.
+
+* Thu Apr 16 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-7
+- Drop all jars and remote, uploadapplet and slideshowapplet modules
+- to satisfy legal requirements, as source build would be
+- highly laborious and functionality is not critical.
+- See BZ464566 for details.
+
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-6
+- Document jar source origins, build jars in build, not prep.
+
+* Fri Apr 10 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-5
+- Remove .jar files and build from source BZ464566.
+- Modify source to remove two non-redistutable .jar files.
+- Dropped panorama module as a result.
+- Fix symlink/dir issues, BZ 484240.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-3
+- Base requires gallery2-httpauth for upgrade path, BZ 483523.
+
+* Thu Dec 18 2008 Jon Ciesla <limb at jcomserv.net> - 2.3-2
+- Correct removal of bundled Smarty and usage of system Smarty.
+
+* Thu Dec 04 2008 Jon Ciesla <limb at jcomserv.net> - 2.3-1
+- Update to new upstream.
+- Rebased on tarball now that perl path issue is fixed.
+- Added buildroot wipe to start of install.
+- Escaped macros in changelog.
+
+* Wed Jun 18 2008 John Berninger <john at ncphotography dot com> - 2.2.5-1
+- update to upstream 2.2.5 for security vuln fixes
+
+* Tue Apr 22 2008 John Berninger <john at ncphotography dot com> - 2.2.4-4
+- don't create or own any dirs in /srv
+
 * Thu Mar 20 2008 John Berninger <john at ncphotography dot com> - 2.2.4-3
 - revert to SVN snapshot so that config-time integrity checks don't fail
 - remove embedded copy of smarty and use php-Smarty package
@@ -1122,7 +1250,7 @@ echo and follow the instructions there t
 - Removed find_lang stuff since it only looks in /usr/share
 
 * Thu May 25 2006 John Berninger <johnw at berningeronline dot net> - 2.1-0.16.svn20060524
-- Trying to use %find_lang but builds fail.  Uploading for review / assistance
+- Trying to use %%find_lang but builds fail.  Uploading for review / assistance
 - Switch name to svn (vs cvs)
 - Various corrections
 
@@ -1148,18 +1276,18 @@ echo and follow the instructions there t
 - Add an alias for the gallery2.conf file that goes into httpd/conf.d
 
 * Sun Feb 26 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-0.9cvs20060223
-- Remove %post, requesting modifications to selinux-policy to handle security
+- Remove %%post, requesting modifications to selinux-policy to handle security
   contexts - BZ 183140
 
 * Fri Feb 24 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-0.8cvs20060223
-- Add a %post to check for the existence of /usr/bin/chcon, which signifies the
+- Add a %%post to check for the existence of /usr/bin/chcon, which signifies the
   presence of SELinux, and if it is found, change the security context of
   /srv/gallery2 appropriately.
 
 * Thu Feb 23 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-0.7cvs20060223
 - Change to CVS tarball.
 - gallery2-gd requires php-gd
-- Added %build section to regen the MANIFEST file.
+- Added %%build section to regen the MANIFEST file.
 - Added several CVS-only modules
 - Added /etc/httpd/conf.d/gallery2.conf config file
 - Added php memory limit override directive to .htaccess
@@ -1180,7 +1308,7 @@ echo and follow the instructions there t
 
 * Sun Feb 19 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-4
 - Split off documentation into a -docs package, modify payload listing,
-  remove "listed twice" error, change %ghost %config into pure %ghost.
+  remove "listed twice" error, change %%ghost %%config into pure %%ghost.
 - Release bump to -4
 
 * Sun Feb 19 2006 John Berninger <johnw at berningeronline dot net> - 2.0.2-3
@@ -1190,7 +1318,7 @@ echo and follow the instructions there t
 - Added ghost config files - these are created during initial setup, they are
   not part of the tarball's payload.
 - Removed relocatability
-- Added '-q' to %setup line
+- Added '-q' to %%setup line
 - Changed name to 'gallery2' (versus 'gallery')
 
 * Tue Feb 14 2006 John Berninger <johnw at berningeronline dot net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Mar 2008 18:18:43 -0000	1.6
+++ sources	13 Aug 2009 14:00:30 -0000	1.7
@@ -1 +1 @@
-7f10a8605f2b69a49929f757fc2b4a92  gallery-2.2.svn.tar.gz
+f28f49f9042b5d2baec604bf43bfeb35  gallery-2.3-jarless.tar.gz



From mkasik at fedoraproject.org  Thu Aug 13 14:02:25 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu, 13 Aug 2009 14:02:25 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel cups-pk-helper.spec, 1.10,
	1.11 get_devices.patch, 1.1, 1.2
Message-ID: <20090813140225.DC25F11C0097@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7089

Modified Files:
	cups-pk-helper.spec get_devices.patch 
Log Message:
* Thu Aug 13 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
- Add parameters to DevicesGet method.



Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/cups-pk-helper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cups-pk-helper.spec	24 Jul 2009 19:49:26 -0000	1.10
+++ cups-pk-helper.spec	13 Aug 2009 14:02:25 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
+- Add parameters to DevicesGet method.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

get_devices.patch:
 cups-pk-helper-mechanism.c                    |   24 +++
 cups-pk-helper-mechanism.h                    |    7 
 cups-pk-helper-mechanism.xml                  |    9 +
 cups.c                                        |  188 +++++++++++++++++++++++++-
 cups.h                                        |    5 
 org.opensuse.cupspkhelper.mechanism.policy.in |    9 +
 6 files changed, 241 insertions(+), 1 deletion(-)

Index: get_devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/get_devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- get_devices.patch	16 Jul 2009 12:35:46 -0000	1.1
+++ get_devices.patch	13 Aug 2009 14:02:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- cups-pk-helper-0.0.4/src/cups.c	2009-03-04 13:41:53.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups.c	2009-07-16 12:49:46.000000000 +0200
++++ cups-pk-helper-0.0.4/src/cups.c	2009-08-13 12:15:47.000000000 +0200
 @@ -58,7 +58,7 @@
       getPPDs
       getServerPPD
@@ -9,116 +9,225 @@
       getJobs
       getJobAttributes
  ~!+* cancelJob
-@@ -1807,6 +1807,89 @@ cph_cups_job_get_status (CphCups    *cup
+@@ -1807,6 +1807,192 @@ cph_cups_job_get_status (CphCups    *cup
          return status;
  }
  
-+void get_devices_cb (const char *device_class,
-+                     const char *device_id,
-+                     const char *device_info,
-+                     const char *device_make_and_model,
-+                     const char *device_uri,
-+                     const char *device_location,
-+                     void       *user_data)
-+{
-+        GHashTable *hash = (GHashTable*) user_data;
++struct _CphCupsGetDevices {
 +        int         iter;
++        GHashTable *hash;
++};
 +
-+        g_return_if_fail (hash != NULL);
++static void
++_cph_cups_get_devices_cb (const char *device_class,
++                          const char *device_id,
++                          const char *device_info,
++                          const char *device_make_and_model,
++                          const char *device_uri,
++                          const char *device_location,
++                          void       *user_data)
++{
++        struct _CphCupsGetDevices *data = user_data;
 +
-+        iter = atoi (g_hash_table_lookup (hash, "iter"));
-+        iter++;
++        g_return_if_fail (data != NULL);
 +
-+        if (device_class && strlen (device_class) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-class:%d", iter),
++        if (device_class && device_class[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-class:%d",
++                                                       data->iter),
 +                                      g_strdup (device_class));
-+        if (device_id && strlen (device_id) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-id:%d", iter),
++        if (device_id && device_id[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-id:%d",
++                                                       data->iter),
 +                                      g_strdup (device_id));
-+        if (device_info && strlen (device_info) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-info:%d", iter),
++        if (device_info && device_info[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-info:%d",
++                                                       data->iter),
 +                                      g_strdup (device_info));
-+        if (device_make_and_model && strlen (device_make_and_model) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-make-and-model:%d", iter),
++        if (device_make_and_model && device_make_and_model[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-make-and-model:%d",
++                                                       data->iter),
 +                                      g_strdup (device_make_and_model));
-+        if (device_uri && strlen (device_uri) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-uri:%d", iter),
++        if (device_uri && device_uri[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-uri:%d",
++                                                       data->iter),
 +                                      g_strdup (device_uri));
-+        if (device_location && strlen (device_location) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-location:%d ", iter),
++        if (device_location && device_location[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-location:%d ",
++                                                       data->iter),
 +                                      g_strdup (device_location));
-+        g_hash_table_replace (hash,
-+                              g_strdup ("iter"),
-+                              g_strdup_printf ("%d", iter));
++
++        data->iter++;
 +}
 +
-+GHashTable *cph_cups_devices_get (CphCups *cups)
++GHashTable *
++cph_cups_devices_get (CphCups    *cups,
++                      int         timeout,
++                      const char *include_schemes,
++                      const char *exclude_schemes)
 +{
-+        int            retval;
-+        GHashTable    *hash;
-+        cups_option_t *settings;
-+        int            num_settings, i;
++        struct _CphCupsGetDevices  data;
++        char                      *error_str;
 +
 +        g_return_val_if_fail (CPH_IS_CUPS (cups), NULL);
 +
-+        hash = g_hash_table_new_full (g_str_hash, g_str_equal,
-+                                      g_free, g_free);
++        data.iter = 0;
++        data.hash = g_hash_table_new_full (g_str_hash, g_str_equal,
++                                           g_free, g_free);
++
++#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 4) || CUPS_VERSION_MAJOR > 1
++        ipp_status_t   retval;
++        int            timeout_param = CUPS_TIMEOUT_DEFAULT;
++        char          *include_schemes_param = (char *) CUPS_INCLUDE_ALL;
++        char          *exclude_schemes_param = (char *) CUPS_EXCLUDE_NONE;
++
++        if (timeout > 0)
++                timeout_param = timeout;
 +
-+        g_hash_table_replace (hash,
-+                              g_strdup ("iter"),
-+                              g_strdup ("-1"));
++        if (include_schemes && strlen (include_schemes) > 0)
++                include_schemes_param = g_strdup (include_schemes);
++
++        if (exclude_schemes && strlen (exclude_schemes) > 0)
++                exclude_schemes_param = g_strdup (exclude_schemes);
 +
 +        retval = cupsGetDevices (cups->priv->connection,
-+                                 CUPS_TIMEOUT_DEFAULT,
-+                                 CUPS_INCLUDE_ALL,
-+                                 CUPS_EXCLUDE_NONE,
-+                                 get_devices_cb,
-+                                 hash);
-+
-+        if (retval != IPP_OK) {
-+                char *error;
-+
-+                error = g_strdup_printf ("Can not get devices.");
-+                _cph_cups_set_internal_status (cups, error);
-+                g_free (error);
++                                 timeout_param,
++                                 include_schemes_param,
++                                 exclude_schemes_param,
++                                 _cph_cups_get_devices_cb,
++                                 &data);
++
++        g_free (include_schemes_param);
++        g_free (exclude_schemes_param);
++
++        if (retval != IPP_OK)
++                goto error;
++#else
++        ipp_t              *request;
++        const char         *resource_char;
++        ipp_t              *reply;
++        ipp_attribute_t    *attr;
++        const char         *device_class;
++        const char         *device_id;
++        const char         *device_info;
++        const char         *device_location;
++        const char         *device_make_and_model;
++        const char         *device_uri;
++
++        request = ippNewRequest (CUPS_GET_DEVICES);
++        resource_char = _cph_cups_get_resource (CPH_RESOURCE_ROOT);
++        reply = cupsDoRequest (cups->priv->connection,
++                               request, resource_char);
++
++        if (!reply)
++                goto error;
++
++        for (attr = reply->attrs; attr; attr = attr->next) {
++                while (attr && attr->group_tag != IPP_TAG_PRINTER)
++                        attr = attr->next;
++
++                if (attr == NULL)
++                        break;
++
++                device_class          = NULL;
++                device_id             = NULL;
++                device_info           = NULL;
++                device_location       = "";
++                device_make_and_model = NULL;
++                device_uri            = NULL;
++
++                while (attr && attr->group_tag == IPP_TAG_PRINTER) {
++                        g_message ("name: %s", attr->name);
++                        if (attr->name &&
++                            strcmp (attr->name, "device-class") == 0 &&
++                            attr->value_tag == IPP_TAG_KEYWORD)
++                                device_class = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-id") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_id = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-info") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_info = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-location") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_location = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-make-and-model") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_make_and_model = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-uri") == 0 &&
++                            attr->value_tag == IPP_TAG_URI)
++                                device_uri = g_strdup (attr->values[0].string.text);
++
++                        attr = attr->next;
++                }
++
++                if (device_class && device_id && device_info && device_make_and_model &&
++                    device_uri)
++                        _cph_cups_get_devices_cb (device_class,
++                                        device_id,
++                                        device_info,
++                                        device_make_and_model,
++                                        device_uri,
++                                        device_location,
++                                        &data);
 +
-+                return NULL;
++                if (attr == NULL)
++                        break;
 +        }
 +
-+        g_hash_table_remove (hash, "iter");
++        ippDelete (reply);
++#endif
++
++        return data.hash;
++
++error:
++        error_str = g_strdup ("Can not get devices.");
++        _cph_cups_set_internal_status (cups, error_str);
++        g_hash_table_destroy (data.hash);
++        g_free (error_str);
 +
-+        return hash;
++        return NULL;
 +}
 +
  /******************************************************
   * Non-object functions
   ******************************************************/
 --- cups-pk-helper-0.0.4/src/cups.h	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups.h	2009-07-16 12:50:44.000000000 +0200
-@@ -184,6 +184,8 @@ CphJobStatus cph_cups_job_get_status (Cp
++++ cups-pk-helper-0.0.4/src/cups.h	2009-08-13 12:16:08.000000000 +0200
+@@ -184,6 +184,11 @@ CphJobStatus cph_cups_job_get_status (Cp
                                        int         job_id,
                                        const char *user);
  
-+GHashTable *cph_cups_devices_get (CphCups    *cups);
++GHashTable *cph_cups_devices_get (CphCups    *cups,
++                                  int         timeout,
++                                  const char *include_schemes,
++                                  const char *exclude_schemes);
 +
  G_END_DECLS
  
  #endif /* CPH_CUPS_H */
---- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-07-16 12:46:03.000000000 +0200
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-07-16 12:52:02.000000000 +0200
-@@ -1103,3 +1103,21 @@ cph_mechanism_job_set_hold_until (CphMec
+--- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-08-13 12:14:09.000000000 +0200
++++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-08-13 12:16:48.000000000 +0200
+@@ -1103,3 +1103,27 @@ cph_mechanism_job_set_hold_until (CphMec
  
          return TRUE;
  }
 +
 +gboolean
 +cph_mechanism_devices_get (CphMechanism          *mechanism,
++                           int                    timeout,
++                           const char            *include_schemes,
++                           const char            *exclude_schemes,                           
 +                           DBusGMethodInvocation *context)
 +{
 +        GHashTable *devices;
@@ -128,41 +237,50 @@
 +        if (!_check_polkit_for_action (mechanism, context, "devices-get"))
 +                return FALSE;
 +
-+        devices = cph_cups_devices_get (mechanism->priv->cups);
++        devices = cph_cups_devices_get (mechanism->priv->cups,
++                                        timeout,
++                                        include_schemes,
++                                        exclude_schemes);
 +        _cph_mechanism_return_error_and_value (mechanism, context,
 +                                               devices == NULL, devices);
 +
 +        return TRUE;
 +}
 --- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h	2009-07-16 12:52:37.000000000 +0200
-@@ -236,6 +236,10 @@ cph_mechanism_job_set_hold_until (CphMec
++++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h	2009-08-13 12:17:10.000000000 +0200
+@@ -236,6 +236,13 @@ cph_mechanism_job_set_hold_until (CphMec
                                    const char            *job_hold_until,
                                    DBusGMethodInvocation *context);
  
 +gboolean
 +cph_mechanism_devices_get (CphMechanism          *mechanism,
++                           int                    timeout,
++                           const char            *include_schemes,
++                           const char            *exclude_schemes,                           
 +                           DBusGMethodInvocation *context);
 +
  G_END_DECLS
  
  #endif /* CPH_MECHANISM_H */
 --- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml	2009-07-16 12:53:27.000000000 +0200
-@@ -192,5 +192,11 @@
++++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml	2009-08-13 12:17:36.000000000 +0200
+@@ -192,5 +192,14 @@
        <arg name="job_hold_until" direction="in"  type="s"/>
        <arg name="error"          direction="out" type="s"/>
      </method>
 +
 +    <method name="DevicesGet">
 +      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++      <arg name="timeout"         direction="in"  type="i"/>
++      <arg name="include_schemes" direction="in"  type="s"/>
++      <arg name="exclude_schemes" direction="in"  type="s"/>
 +      <arg name="error"           direction="out" type="s"/>
 +      <arg name="devices"         direction="out" type="a{ss}"/>
 +    </method>
    </interface>
  </node>
---- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-07-16 12:46:03.000000000 +0200
-+++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-07-16 12:53:57.000000000 +0200
+--- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-08-13 12:14:09.000000000 +0200
++++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-08-13 12:18:24.000000000 +0200
 @@ -86,6 +86,15 @@
      </defaults>
    </action>



From mkasik at fedoraproject.org  Thu Aug 13 14:02:51 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu, 13 Aug 2009 14:02:51 +0000 (UTC)
Subject: rpms/cups-pk-helper/F-11 cups-pk-helper.spec, 1.8,
	1.9 get_devices.patch, 1.1, 1.2
Message-ID: <20090813140251.7665B11C0097@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7223

Modified Files:
	cups-pk-helper.spec get_devices.patch 
Log Message:
* Thu Aug 13 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-3
- Add parameters to DevicesGet method.



Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-11/cups-pk-helper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cups-pk-helper.spec	16 Jul 2009 12:19:49 -0000	1.8
+++ cups-pk-helper.spec	13 Aug 2009 14:02:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-3
+- Add parameters to DevicesGet method.
+
 * Thu Jul 16 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-2
 - Add devices_get() function.
 

get_devices.patch:
 cups-pk-helper-mechanism.c                    |   24 +++
 cups-pk-helper-mechanism.h                    |    7 
 cups-pk-helper-mechanism.xml                  |    9 +
 cups.c                                        |  188 +++++++++++++++++++++++++-
 cups.h                                        |    5 
 org.opensuse.cupspkhelper.mechanism.policy.in |    9 +
 6 files changed, 241 insertions(+), 1 deletion(-)

Index: get_devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-11/get_devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- get_devices.patch	16 Jul 2009 12:19:49 -0000	1.1
+++ get_devices.patch	13 Aug 2009 14:02:51 -0000	1.2
@@ -1,5 +1,5 @@
 --- cups-pk-helper-0.0.4/src/cups.c	2009-03-04 13:41:53.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups.c	2009-07-16 10:41:03.000000000 +0200
++++ cups-pk-helper-0.0.4/src/cups.c	2009-07-21 12:23:03.000000000 +0200
 @@ -58,7 +58,7 @@
       getPPDs
       getServerPPD
@@ -9,116 +9,225 @@
       getJobs
       getJobAttributes
  ~!+* cancelJob
-@@ -1807,6 +1807,89 @@ cph_cups_job_get_status (CphCups    *cup
+@@ -1807,6 +1807,192 @@ cph_cups_job_get_status (CphCups    *cup
          return status;
  }
  
-+void get_devices_cb (const char *device_class,
-+                     const char *device_id,
-+                     const char *device_info,
-+                     const char *device_make_and_model,
-+                     const char *device_uri,
-+                     const char *device_location,
-+                     void       *user_data)
-+{
-+        GHashTable *hash = (GHashTable*) user_data;
++struct _CphCupsGetDevices {
 +        int         iter;
++        GHashTable *hash;
++};
 +
-+        g_return_if_fail (hash != NULL);
++static void
++_cph_cups_get_devices_cb (const char *device_class,
++                          const char *device_id,
++                          const char *device_info,
++                          const char *device_make_and_model,
++                          const char *device_uri,
++                          const char *device_location,
++                          void       *user_data)
++{
++        struct _CphCupsGetDevices *data = user_data;
 +
-+        iter = atoi (g_hash_table_lookup (hash, "iter"));
-+        iter++;
++        g_return_if_fail (data != NULL);
 +
-+        if (device_class && strlen (device_class) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-class:%d", iter),
++        if (device_class && device_class[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-class:%d",
++                                                       data->iter),
 +                                      g_strdup (device_class));
-+        if (device_id && strlen (device_id) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-id:%d", iter),
++        if (device_id && device_id[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-id:%d",
++                                                       data->iter),
 +                                      g_strdup (device_id));
-+        if (device_info && strlen (device_info) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-info:%d", iter),
++        if (device_info && device_info[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-info:%d",
++                                                       data->iter),
 +                                      g_strdup (device_info));
-+        if (device_make_and_model && strlen (device_make_and_model) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-make-and-model:%d", iter),
++        if (device_make_and_model && device_make_and_model[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-make-and-model:%d",
++                                                       data->iter),
 +                                      g_strdup (device_make_and_model));
-+        if (device_uri && strlen (device_uri) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-uri:%d", iter),
++        if (device_uri && device_uri[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-uri:%d",
++                                                       data->iter),
 +                                      g_strdup (device_uri));
-+        if (device_location && strlen (device_location) > 0)
-+                g_hash_table_replace (hash,
-+                                      g_strdup_printf ("device-location:%d ", iter),
++        if (device_location && device_location[0] != '\0')
++                g_hash_table_replace (data->hash,
++                                      g_strdup_printf ("device-location:%d ",
++                                                       data->iter),
 +                                      g_strdup (device_location));
-+        g_hash_table_replace (hash,
-+                              g_strdup ("iter"),
-+                              g_strdup_printf ("%d", iter));
++
++        data->iter++;
 +}
 +
-+GHashTable *cph_cups_devices_get (CphCups *cups)
++GHashTable *
++cph_cups_devices_get (CphCups    *cups,
++                      int         timeout,
++                      const char *include_schemes,
++                      const char *exclude_schemes)
 +{
-+        int            retval;
-+        GHashTable    *hash;
-+        cups_option_t *settings;
-+        int            num_settings, i;
++        struct _CphCupsGetDevices  data;
++        char                      *error_str;
 +
 +        g_return_val_if_fail (CPH_IS_CUPS (cups), NULL);
 +
-+        hash = g_hash_table_new_full (g_str_hash, g_str_equal,
-+                                      g_free, g_free);
++        data.iter = 0;
++        data.hash = g_hash_table_new_full (g_str_hash, g_str_equal,
++                                           g_free, g_free);
++
++#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 4) || CUPS_VERSION_MAJOR > 1
++        ipp_status_t   retval;
++        int            timeout_param = CUPS_TIMEOUT_DEFAULT;
++        char          *include_schemes_param = (char *) CUPS_INCLUDE_ALL;
++        char          *exclude_schemes_param = (char *) CUPS_EXCLUDE_NONE;
++
++        if (timeout > 0)
++                timeout_param = timeout;
 +
-+        g_hash_table_replace (hash,
-+                              g_strdup ("iter"),
-+                              g_strdup ("-1"));
++        if (include_schemes && strlen (include_schemes) > 0)
++                include_schemes_param = g_strdup (include_schemes);
++
++        if (exclude_schemes && strlen (exclude_schemes) > 0)
++                exclude_schemes_param = g_strdup (exclude_schemes);
 +
 +        retval = cupsGetDevices (cups->priv->connection,
-+                                 CUPS_TIMEOUT_DEFAULT,
-+                                 CUPS_INCLUDE_ALL,
-+                                 CUPS_EXCLUDE_NONE,
-+                                 get_devices_cb,
-+                                 hash);
-+
-+        if (retval != IPP_OK) {
-+                char *error;
-+
-+                error = g_strdup_printf ("Can not get devices.");
-+                _cph_cups_set_internal_status (cups, error);
-+                g_free (error);
++                                 timeout_param,
++                                 include_schemes_param,
++                                 exclude_schemes_param,
++                                 _cph_cups_get_devices_cb,
++                                 &data);
++
++        g_free (include_schemes_param);
++        g_free (exclude_schemes_param);
++
++        if (retval != IPP_OK)
++                goto error;
++#else
++        ipp_t              *request;
++        const char         *resource_char;
++        ipp_t              *reply;
++        ipp_attribute_t    *attr;
++        const char         *device_class;
++        const char         *device_id;
++        const char         *device_info;
++        const char         *device_location;
++        const char         *device_make_and_model;
++        const char         *device_uri;
++
++        request = ippNewRequest (CUPS_GET_DEVICES);
++        resource_char = _cph_cups_get_resource (CPH_RESOURCE_ROOT);
++        reply = cupsDoRequest (cups->priv->connection,
++                               request, resource_char);
++
++        if (!reply)
++                goto error;
++
++        for (attr = reply->attrs; attr; attr = attr->next) {
++                while (attr && attr->group_tag != IPP_TAG_PRINTER)
++                        attr = attr->next;
++
++                if (attr == NULL)
++                        break;
++
++                device_class          = NULL;
++                device_id             = NULL;
++                device_info           = NULL;
++                device_location       = "";
++                device_make_and_model = NULL;
++                device_uri            = NULL;
++
++                while (attr && attr->group_tag == IPP_TAG_PRINTER) {
++                        g_message ("name: %s", attr->name);
++                        if (attr->name &&
++                            strcmp (attr->name, "device-class") == 0 &&
++                            attr->value_tag == IPP_TAG_KEYWORD)
++                                device_class = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-id") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_id = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-info") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_info = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-location") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_location = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-make-and-model") == 0 &&
++                            attr->value_tag == IPP_TAG_TEXT)
++                                device_make_and_model = g_strdup (attr->values[0].string.text);
++                        else if (attr->name &&
++                            strcmp (attr->name, "device-uri") == 0 &&
++                            attr->value_tag == IPP_TAG_URI)
++                                device_uri = g_strdup (attr->values[0].string.text);
++
++                        attr = attr->next;
++                }
++
++                if (device_class && device_id && device_info && device_make_and_model &&
++                    device_uri)
++                        _cph_cups_get_devices_cb (device_class,
++                                        device_id,
++                                        device_info,
++                                        device_make_and_model,
++                                        device_uri,
++                                        device_location,
++                                        &data);
 +
-+                return NULL;
++                if (attr == NULL)
++                        break;
 +        }
 +
-+        g_hash_table_remove (hash, "iter");
++        ippDelete (reply);
++#endif
++
++        return data.hash;
++
++error:
++        error_str = g_strdup ("Can not get devices.");
++        _cph_cups_set_internal_status (cups, error_str);
++        g_hash_table_destroy (data.hash);
++        g_free (error_str);
 +
-+        return hash;
++        return NULL;
 +}
 +
  /******************************************************
   * Non-object functions
   ******************************************************/
 --- cups-pk-helper-0.0.4/src/cups.h	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups.h	2009-07-14 16:27:13.000000000 +0200
-@@ -184,6 +184,8 @@ CphJobStatus cph_cups_job_get_status (Cp
++++ cups-pk-helper-0.0.4/src/cups.h	2009-07-20 15:18:27.000000000 +0200
+@@ -184,6 +184,11 @@ CphJobStatus cph_cups_job_get_status (Cp
                                        int         job_id,
                                        const char *user);
  
-+GHashTable *cph_cups_devices_get (CphCups    *cups);
++GHashTable *cph_cups_devices_get (CphCups    *cups,
++                                  int         timeout,
++                                  const char *include_schemes,
++                                  const char *exclude_schemes);
 +
  G_END_DECLS
  
  #endif /* CPH_CUPS_H */
 --- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-07-16 11:07:49.000000000 +0200
-@@ -1166,3 +1166,21 @@ cph_mechanism_job_set_hold_until (CphMec
++++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-07-20 13:32:17.000000000 +0200
+@@ -1166,3 +1166,27 @@ cph_mechanism_job_set_hold_until (CphMec
  
          return TRUE;
  }
 +
 +gboolean
 +cph_mechanism_devices_get (CphMechanism          *mechanism,
++                           int                    timeout,
++                           const char            *include_schemes,
++                           const char            *exclude_schemes,                           
 +                           DBusGMethodInvocation *context)
 +{
 +        GHashTable *devices;
@@ -128,41 +237,50 @@
 +        if (!_check_polkit_for_action (mechanism, context, "devices-get"))
 +                return FALSE;
 +
-+        devices = cph_cups_devices_get (mechanism->priv->cups);
++        devices = cph_cups_devices_get (mechanism->priv->cups,
++                                        timeout,
++                                        include_schemes,
++                                        exclude_schemes);
 +        _cph_mechanism_return_error_and_value (mechanism, context,
 +                                               devices == NULL, devices);
 +
 +        return TRUE;
 +}
 --- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h	2009-07-14 15:08:09.000000000 +0200
-@@ -236,6 +236,10 @@ cph_mechanism_job_set_hold_until (CphMec
++++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.h	2009-07-20 15:17:39.000000000 +0200
+@@ -236,6 +236,13 @@ cph_mechanism_job_set_hold_until (CphMec
                                    const char            *job_hold_until,
                                    DBusGMethodInvocation *context);
  
 +gboolean
 +cph_mechanism_devices_get (CphMechanism          *mechanism,
++                           int                    timeout,
++                           const char            *include_schemes,
++                           const char            *exclude_schemes,                           
 +                           DBusGMethodInvocation *context);
 +
  G_END_DECLS
  
  #endif /* CPH_MECHANISM_H */
 --- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml	2009-07-15 16:29:56.000000000 +0200
-@@ -192,5 +192,11 @@
++++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.xml	2009-07-20 13:08:33.000000000 +0200
+@@ -192,5 +192,14 @@
        <arg name="job_hold_until" direction="in"  type="s"/>
        <arg name="error"          direction="out" type="s"/>
      </method>
 +
 +    <method name="DevicesGet">
 +      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++      <arg name="timeout"         direction="in"  type="i"/>
++      <arg name="include_schemes" direction="in"  type="s"/>
++      <arg name="exclude_schemes" direction="in"  type="s"/>
 +      <arg name="error"           direction="out" type="s"/>
 +      <arg name="devices"         direction="out" type="a{ss}"/>
 +    </method>
    </interface>
  </node>
 --- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-02-28 03:38:13.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-07-16 11:07:12.000000000 +0200
++++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-07-16 14:50:54.000000000 +0200
 @@ -86,6 +86,15 @@
      </defaults>
    </action>



From mclasen at fedoraproject.org  Thu Aug 13 14:08:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 13 Aug 2009 14:08:20 +0000 (UTC)
Subject: rpms/gtk2/devel appearance-crash.patch, NONE, 1.1 gtk2.spec, 1.395, 
	1.396
Message-ID: <20090813140820.82E1711C0097@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7983

Modified Files:
	gtk2.spec 
Added Files:
	appearance-crash.patch 
Log Message:
fix a possible crash


appearance-crash.patch:
 gtkiconview.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE appearance-crash.patch ---
diff -up gtk+-2.17.7/gtk/gtkiconview.c.appearance-crash gtk+-2.17.7/gtk/gtkiconview.c
--- gtk+-2.17.7/gtk/gtkiconview.c.appearance-crash	2009-08-13 10:03:01.717854077 -0400
+++ gtk+-2.17.7/gtk/gtkiconview.c	2009-08-13 10:03:31.483855146 -0400
@@ -3498,16 +3498,16 @@ gtk_icon_view_get_item_at_coords (GtkIco
 		    {
 		      if (cell_at_pos)
 			*cell_at_pos = info;
-		      
+
 		      return item;
 		    }
 		}
 
-	      if (only_in_cell)
-		return NULL;
-	      
 	      if (cell_at_pos)
 		*cell_at_pos = NULL;
+
+	      if (only_in_cell)
+		return NULL;
 	    }
 
 	  return item;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- gtk2.spec	12 Aug 2009 03:12:02 -0000	1.395
+++ gtk2.spec	13 Aug 2009 14:08:20 -0000	1.396
@@ -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.17/gtk+-%{version}.tar.bz2
@@ -30,6 +30,9 @@ Patch0: gtk+-2.13.5-lib64.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 # Patch1: default_printer.patch
 
+# fixed upstream
+Patch2: appearance-crash.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -141,6 +144,7 @@ This package contains developer document
 
 %patch0 -p1 -b .lib64
 # %patch1 -p0 -b .default-printer
+%patch2 -p1 -b .appearance-crash
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -385,6 +389,9 @@ fi
 
 
 %changelog
+* Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.7-2
+- Fix a possible crash
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.7-1
 - 2.17.7
 



From tbzatek at fedoraproject.org  Thu Aug 13 14:16:57 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu, 13 Aug 2009 14:16:57 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.3.5-gdaemonmount-root-path.patch, NONE,
	1.1 gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch,
	NONE, 1.1 gvfs.spec, 1.147, 1.148
Message-ID: <20090813141657.CB3B011C0097@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9487

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.5-gdaemonmount-root-path.patch 
	gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch 
Log Message:
* Thu Aug 13 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-5
- More complete fix for DAV mount path prefix issues


gvfs-1.3.5-gdaemonmount-root-path.patch:
 gdaemonmount.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gvfs-1.3.5-gdaemonmount-root-path.patch ---
Index: client/gdaemonmount.c
===================================================================
--- trunk/client/gdaemonmount.c	(revision 2378)
+++ trunk/client/gdaemonmount.c	(working copy)
@@ -108,7 +108,8 @@
 {
   GDaemonMount *daemon_mount = G_DAEMON_MOUNT (mount);
 
-  return g_daemon_file_new (daemon_mount->mount_info->mount_spec, "/");
+  return g_daemon_file_new (daemon_mount->mount_info->mount_spec, 
+        daemon_mount->mount_info->mount_spec->mount_prefix);
 }
 
 static GIcon *

gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch:
 gmountspec.c |   31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

--- NEW FILE gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch ---
>From 3e62465b2aee2ca71302f00ccf815a48e87626ee Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 13 Aug 2009 15:30:35 +0200
Subject: [PATCH] Always set mount prefix ending with path separator

Mount prefix should always end with path separator ("/") to prevent
duplicate mounts, which would only have different prefix strings
(e.g. one with "/subdir" and the other with "/subdir/").
---
 common/gmountspec.c |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/common/gmountspec.c b/common/gmountspec.c
index d72e189..16c0e66 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -42,6 +42,19 @@ item_compare (const void *_a, const void *_b)
   return strcmp (a->key, b->key);
 }
 
+/*
+ * Ensure trailing "/" to avoid redirections and mount_spec duplication.
+ * Returns newly allocated string.
+ */
+static gchar *
+ensure_trailing_path_separator (const gchar *path)
+{
+  if (path == NULL || g_str_has_suffix (path, "/"))
+    return g_strdup (path);
+  else
+    return g_strconcat (path, "/", NULL);
+}
+
 GMountSpec *
 g_mount_spec_new (const char *type)
 {
@@ -69,9 +82,14 @@ g_mount_spec_new_from_data (GArray *items,
   spec->ref_count = 1;
   spec->items = items;
   if (mount_prefix == NULL)
-    spec->mount_prefix = g_strdup ("/");
+    {
+      spec->mount_prefix = g_strdup ("/");
+    }
   else
-    spec->mount_prefix = mount_prefix;
+    {
+      spec->mount_prefix = ensure_trailing_path_separator (mount_prefix);
+      g_free (mount_prefix);
+    }
 
   g_array_sort (spec->items, item_compare);
   
@@ -112,7 +130,7 @@ g_mount_spec_set_mount_prefix  (GMountSpec      *spec,
 				const char      *mount_prefix)
 {
   g_free (spec->mount_prefix);
-  spec->mount_prefix = g_strdup (mount_prefix);
+  spec->mount_prefix = ensure_trailing_path_separator (mount_prefix);
 }
 
 
@@ -247,7 +265,8 @@ g_mount_spec_from_dbus (DBusMessageIter *iter)
 
   spec = g_mount_spec_new (NULL);
   g_free (spec->mount_prefix);
-  spec->mount_prefix = mount_prefix;
+  spec->mount_prefix = ensure_trailing_path_separator (mount_prefix);
+  g_free (mount_prefix);
   
   if (dbus_message_iter_get_arg_type (&spec_iter) != DBUS_TYPE_ARRAY ||
       dbus_message_iter_get_element_type (&spec_iter) != DBUS_TYPE_STRUCT)
@@ -541,7 +560,8 @@ g_mount_spec_new_from_string (const gchar     *str,
       if (strcmp (tokens[0], "prefix") == 0)
         {
           g_free (item.key);
-          mount_prefix = item.value;
+          mount_prefix = ensure_trailing_path_separator (item.value);
+          g_free (item.value);
         }
       else
         {
-- 
1.6.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- gvfs.spec	11 Aug 2009 16:23:14 -0000	1.147
+++ gvfs.spec	13 Aug 2009 14:16:57 -0000	1.148
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -38,6 +38,10 @@ Patch1: gvfs-archive-integration.patch
 # Bad mount prefix stripping in g_daemon_file_get_path()
 # http://bugzilla.gnome.org/show_bug.cgi?id=590862
 Patch4: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
+# GDaemonMount calculates wrong root path when mount_prefix is set
+# http://bugzilla.gnome.org/show_bug.cgi?id=590730
+Patch5: gvfs-1.3.5-gdaemonmount-root-path.patch
+Patch6: gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=497631
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
@@ -138,6 +142,8 @@ and iPod Touches to applications using g
 %setup -q
 %patch1 -p1 -b .archive-integration
 %patch4 -p1 -b .mount-prefix
+%patch5 -p1 -b .root-path
+%patch6 -p1 -b .prefix-slash
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 %patch10 -p1 -b .afc
@@ -295,6 +301,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Thu Aug 13 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-5
+- More complete fix for DAV mount path prefix issues
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-4
 - Fix crash on startup for the afc volume monitor
 



From kyle at fedoraproject.org  Thu Aug 13 14:19:16 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 13 Aug 2009 14:19:16 +0000 (UTC)
Subject: rpms/kernel/devel perf,NONE,1.1 kernel.spec,1.1715,1.1716
Message-ID: <20090813141916.57BF011C0097@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9817

Modified Files:
	kernel.spec 
Added Files:
	perf 
Log Message:
* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
- fix perf.



--- NEW FILE perf ---
#!/bin/sh
exec /usr/libexec/perf-$(uname -r)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1715
retrieving revision 1.1716
diff -u -p -r1.1715 -r1.1716
--- kernel.spec	12 Aug 2009 21:42:32 -0000	1.1715
+++ kernel.spec	13 Aug 2009 14:19:15 -0000	1.1716
@@ -1700,12 +1700,9 @@ ls $man9dir | grep -q '' || > $man9dir/B
 
 %if %{with_perf}
 # perf docs and shell wrapper.
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-cat <<EOF >>$RPM_BUILD_ROOT/usr/sbin/perf
-#!/bin/bash
-exec /usr/libexec/perf-\$(uname -r)
-EOF
-chmod 755 $RPM_BUILD_ROOT/usr/sbin/perf
+mkdir -p $RPM_BUILD_ROOT/usr/sbin/
+cp $RPM_SOURCE_DIR/perf $RPM_BUILD_ROOT/usr/sbin/perf
+chmod 0755 $RPM_BUILD_ROOT/usr/sbin/perf
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
 %endif
 
@@ -1980,6 +1977,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
+- fix perf.
+
 * Wed Aug 12 2009 Dennis Gilmore <dennis at ausil.us>
 - Obsolete kernel-smp on sparc64
 - Require grubby >= 7.0.2-1 since thats what introduces the dracut options we use



From robert at fedoraproject.org  Thu Aug 13 14:22:54 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 13 Aug 2009 14:22:54 +0000 (UTC)
Subject: rpms/mksh/devel mksh.spec,1.26,1.27
Message-ID: <20090813142254.E481511C0097@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/mksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10449

Modified Files:
	mksh.spec 
Log Message:
Updated License tag, next upstream release will have MirOS license



Index: mksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mksh.spec	12 Aug 2009 22:43:18 -0000	1.26
+++ mksh.spec	13 Aug 2009 14:22:54 -0000	1.27
@@ -4,7 +4,7 @@ Summary:          MirBSD enhanced versio
 Name:             mksh
 Version:          39
 Release:          1%{?dist}
-License:          BSD with advertising
+License:          MirOS
 Group:            System Environment/Shells
 URL:              http://www.mirbsd.de/%{name}/
 Source0:          http://www.mirbsd.org/MirOS/dist/mir/%{name}/%{name}-R%{version}.cpio.gz



From dcbw at fedoraproject.org  Thu Aug 13 14:45:42 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 13 Aug 2009 14:45:42 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.283,1.284
Message-ID: <20090813144542.6132711C0097@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14375

Modified Files:
	NetworkManager.spec 
Log Message:
* Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-3.git20090813
- nm: add iSCSI support
- nm: add connection assume/takeover support for ethernet (rh #517333)
- nm: IPv6 fixes
- nm: re-add OLPC XO-1 mesh device support (removed with 0.7.0)
- applet: better WiFi dialog focus handling




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- NetworkManager.spec	11 Aug 2009 09:06:38 -0000	1.283
+++ NetworkManager.spec	13 Aug 2009 14:45:41 -0000	1.284
@@ -8,14 +8,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090804
-%define applet_snapshot .git20090804
+%define snapshot .git20090813
+%define applet_snapshot .git20090813
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.995
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -25,7 +25,6 @@ Source1: network-manager-applet-%{versio
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
-Patch3: 0001-bluetooth-fix-device-capability-checking-need-NAP.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -146,9 +145,6 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
-pushd network-manager-applet-*/
-%patch3 -p1 -b .bt-detection
-popd
 
 %build
 
@@ -279,6 +275,7 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 %{_datadir}/PolicyKit/policy/*.policy
+%{udev_scriptdir}/rules.d/*.rules
 
 %files devel
 %defattr(-,root,root,0755)
@@ -327,6 +324,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-3.git20090813
+- nm: add iSCSI support
+- nm: add connection assume/takeover support for ethernet (rh #517333)
+- nm: IPv6 fixes
+- nm: re-add OLPC XO-1 mesh device support (removed with 0.7.0)
+- applet: better WiFi dialog focus handling
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 0.7.995-2.git20090804
 - Add patch to fix service detection on phones
 



From smilner at fedoraproject.org  Thu Aug 13 14:49:22 2009
From: smilner at fedoraproject.org (smilner)
Date: Thu, 13 Aug 2009 14:49:22 +0000 (UTC)
Subject: rpms/buildbot/F-11 .cvsignore, 1.7, 1.8 buildbot.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20090813144922.1D83811C0097@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14959

Modified Files:
	.cvsignore buildbot.spec sources 
Log Message:
update for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Mar 2009 10:19:31 -0000	1.7
+++ .cvsignore	13 Aug 2009 14:49:21 -0000	1.8
@@ -1 +1 @@
-buildbot-0.7.10p1.tar.gz
+buildbot-0.7.11p2.tar.gz


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/buildbot.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- buildbot.spec	3 Mar 2009 16:40:04 -0000	1.13
+++ buildbot.spec	13 Aug 2009 14:49:21 -0000	1.14
@@ -1,36 +1,39 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%global do_tests 1
+
 Name:           buildbot
-Version:        0.7.10p1
-Release:        2%{?dist}
+Version:        0.7.11p2
+Release:        1%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://buildbot.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/b/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 
 # Needed for tests
+%if %do_tests
 BuildRequires:  python-twisted-core
 BuildRequires:  python-twisted-web
 BuildRequires:  python-twisted-mail
 BuildRequires:  python-twisted-words
-# Removed until http://buildbot.net/trac/ticket/434 is fixed
-# BuildRequires:  bazaar
+BuildRequires:  bazaar
 BuildRequires:  bzr
 BuildRequires:  cvs
-%ifarch {ix86}
-# looks like darcs is not available outside ix86
+%ifarch %{ix86} x86_64 ppc alpha
+# darcs ExclusiveArchs
 BuildRequires:  darcs
 %endif
 BuildRequires:  git
 BuildRequires:  mercurial
 BuildRequires:  subversion
 BuildRequires:  tla
+%endif
 
 Requires:       python-twisted-core
 Requires:       python-twisted-web
@@ -54,8 +57,10 @@ inconvenienced by the failure.
 %build
 %{__python} setup.py build
 
+%if %do_tests
 %check
 trial buildbot.test
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -84,6 +89,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p2-1
+- Update for XSS vuln from upstream
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.11p1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Gianluca Sforna <giallu gmail com> - 0.7.11p1-1
+- New upstream release
+- Change Source0 URI
+- Make tests optional
+
 * Tue Mar  3 2009 Gianluca Sforna <giallu gmail com> - 0.7.10p1-2
 - New upstream release
 - darcs only avaliable on ix86 platforms 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Mar 2009 10:19:31 -0000	1.7
+++ sources	13 Aug 2009 14:49:21 -0000	1.8
@@ -1 +1 @@
-38475c54ff26ab4028cfd371b3f76c1f  buildbot-0.7.10p1.tar.gz
+eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz



From smilner at fedoraproject.org  Thu Aug 13 14:51:47 2009
From: smilner at fedoraproject.org (smilner)
Date: Thu, 13 Aug 2009 14:51:47 +0000 (UTC)
Subject: rpms/buildbot/F-10 .cvsignore, 1.5, 1.6 buildbot.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090813145147.45CF111C0097@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15379

Modified Files:
	.cvsignore buildbot.spec sources 
Log Message:
Update for upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Apr 2008 23:20:03 -0000	1.5
+++ .cvsignore	13 Aug 2009 14:51:46 -0000	1.6
@@ -1 +1 @@
-buildbot-0.7.7.tar.gz
+buildbot-0.7.11p2.tar.gz


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-10/buildbot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- buildbot.spec	3 Apr 2008 21:06:51 -0000	1.8
+++ buildbot.spec	13 Aug 2009 14:51:47 -0000	1.9
@@ -1,20 +1,40 @@
-%{!?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 do_tests 1
 
 Name:           buildbot
-Version:        0.7.7
-Release:        2%{?dist}
+Version:        0.7.11p2
+Release:        1%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://buildbot.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-no-shebang.patch
+Source0:        http://pypi.python.org/packages/source/b/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 
+# Needed for tests
+%if %do_tests
+BuildRequires:  python-twisted-core
+BuildRequires:  python-twisted-web
+BuildRequires:  python-twisted-mail
+BuildRequires:  python-twisted-words
+BuildRequires:  bazaar
+BuildRequires:  bzr
+BuildRequires:  cvs
+%ifarch %{ix86} x86_64 ppc alpha
+# darcs ExclusiveArchs
+BuildRequires:  darcs
+%endif
+BuildRequires:  git
+BuildRequires:  mercurial
+BuildRequires:  subversion
+BuildRequires:  tla
+%endif
+
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       python-twisted-mail
@@ -22,6 +42,7 @@ Requires:       python-twisted-words
 
 BuildArch:      noarch
 
+
 %description
 The BuildBot is a system to automate the compile/test cycle required by
 most software projects to validate code changes. By automatically
@@ -31,11 +52,16 @@ inconvenienced by the failure.
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 %{__python} setup.py build
 
+%if %do_tests
+%check
+trial buildbot.test
+%endif
+
 %install
 rm -rf %{buildroot}
 
@@ -56,13 +82,39 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog NEWS README docs
+%doc COPYING CREDITS NEWS README docs/
 %{_bindir}/buildbot
 %{python_sitelib}/*
 %{_datadir}/%{name}
 
 
 %changelog
+* Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p2-1
+- Update for XSS vuln from upstream
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.11p1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Gianluca Sforna <giallu gmail com> - 0.7.11p1-1
+- New upstream release
+- Change Source0 URI
+- Make tests optional
+
+* Tue Mar  3 2009 Gianluca Sforna <giallu gmail com> - 0.7.10p1-2
+- New upstream release
+- darcs only avaliable on ix86 platforms 
+
+* Thu Feb 26 2009 Gianluca Sforna <giallu gmail com> - 0.7.10-1
+- New upstream release
+- Drop upstreamed patch
+- Add %%check section and needed BR
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7.7-3
+- Rebuild for Python 2.6
+
 * Thu Apr  3 2008 Gianluca Sforna <giallu gmail com> - 0.7.7-2
 - Fix upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Apr 2008 23:20:03 -0000	1.5
+++ sources	13 Aug 2009 14:51:47 -0000	1.6
@@ -1 +1 @@
-4647a15a9d9b2db6a5b3493ac78e11d9  buildbot-0.7.7.tar.gz
+eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz



From dcbw at fedoraproject.org  Thu Aug 13 14:53:40 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 13 Aug 2009 14:53:40 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.106, 1.107 sources, 1.145,
	1.146
Message-ID: <20090813145340.A30BC11C0097@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15704

Modified Files:
	.cvsignore sources 
Log Message:
Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	4 Aug 2009 20:02:07 -0000	1.106
+++ .cvsignore	13 Aug 2009 14:53:40 -0000	1.107
@@ -157,3 +157,5 @@ NetworkManager-0.7.995.git20090728.tar.b
 network-manager-applet-0.7.995.git20090728.tar.bz2
 NetworkManager-0.7.995.git20090804.tar.bz2
 network-manager-applet-0.7.995.git20090804.tar.bz2
+NetworkManager-0.7.995.git20090813.tar.bz2
+network-manager-applet-0.7.995.git20090813.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- sources	4 Aug 2009 20:02:08 -0000	1.145
+++ sources	13 Aug 2009 14:53:40 -0000	1.146
@@ -1,2 +1,2 @@
-18140c0555929b27f1e382f9b006d267  NetworkManager-0.7.995.git20090804.tar.bz2
-40f582f9bad42e4f4d4b5e582626c0d7  network-manager-applet-0.7.995.git20090804.tar.bz2
+49aeb927168b4f486509492ba5e49825  NetworkManager-0.7.995.git20090813.tar.bz2
+57680ec416238cdce5be61d59cf82283  network-manager-applet-0.7.995.git20090813.tar.bz2



From mgrepl at fedoraproject.org  Thu Aug 13 14:54:01 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 13 Aug 2009 14:54:01 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 modules-minimum.conf, 1.22,
	1.23 modules-targeted.conf, 1.131, 1.132 policy-20090521.patch,
	1.41, 1.42 selinux-policy.spec, 1.896, 1.897
Message-ID: <20090813145401.44E5811C0097@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-serv15737

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow hald_t to list net_conf_t directory




Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-minimum.conf,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- modules-minimum.conf	11 Apr 2009 12:30:21 -0000	1.22
+++ modules-minimum.conf	13 Aug 2009 14:54:00 -0000	1.23
@@ -543,6 +543,13 @@ gnomeclock = module
 hal = module
 
 # Layer: services
+# Module: hddtemp
+#
+# hddtemp hard disk temperature tool running as a daemon
+#
+hddtemp = module
+
+# Layer: services
 # Module: polkit
 #
 # Hardware abstraction layer


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-targeted.conf,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- modules-targeted.conf	25 Jun 2009 09:18:40 -0000	1.131
+++ modules-targeted.conf	13 Aug 2009 14:54:00 -0000	1.132
@@ -557,6 +557,13 @@ gnomeclock = module
 hal = module
 
 # Layer: services
+# Module: hddtemp
+#
+# hddtemp hard disk temperature tool running as a daemon
+# 
+hddtemp = module
+
+# Layer: services
 # Module: polkit
 #
 # Hardware abstraction layer

policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    8 +
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/sudo.if              |    4 
 modules/admin/usermanage.te        |    1 
 modules/apps/calamaris.te          |    4 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/screen.if             |    1 
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |   10 +
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |   12 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.fc           |    2 
 modules/services/cups.te           |   28 +++
 modules/services/dbus.if           |    4 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |    8 -
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/hddtemp.fc        |    4 
 modules/services/hddtemp.if        |   38 +++++
 modules/services/hddtemp.te        |   40 +++++
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    3 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   29 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   41 +++++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    1 
 modules/system/sysnetwork.if       |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    6 
 modules/system/userdomain.if       |   30 ++--
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 130 files changed, 2138 insertions(+), 640 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- policy-20090521.patch	11 Aug 2009 08:52:45 -0000	1.41
+++ policy-20090521.patch	13 Aug 2009 14:54:00 -0000	1.42
@@ -126,8 +126,16 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.12/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-06-25 10:19:43.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/admin/mrtg.te	2009-07-28 14:35:23.000000000 +0200
-@@ -140,6 +140,10 @@
++++ serefpolicy-3.6.12/policy/modules/admin/mrtg.te	2009-08-13 08:59:23.000000000 +0200
+@@ -136,10 +136,18 @@
+ ')
+ 
+ optional_policy(`
++        hddtemp_domtrans(mrtg_t)
++')
++
++optional_policy(`
+ 	hostname_exec(mrtg_t)
  ')
  
  optional_policy(`
@@ -1365,16 +1373,17 @@ diff -b -B --ignore-all-space --exclude-
  # VMWare need access to pcmcia devices for network
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-06-25 10:21:01.000000000 +0200
-@@ -7,6 +7,7 @@
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-08-12 11:02:41.000000000 +0200
+@@ -7,6 +7,8 @@
  /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
 +/bin/fish			--	gen_context(system_u:object_r:shell_exec_t,s0)
++/bin/nologin			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/ksh.*			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/sash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/tcsh			--	gen_context(system_u:object_r:shell_exec_t,s0)
-@@ -69,6 +70,8 @@
+@@ -69,6 +71,8 @@
  /etc/ppp/ipv6-up\..*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/ppp/ipv6-down\..*		--	gen_context(system_u:object_r:bin_t,s0)
  
@@ -1383,7 +1392,7 @@ diff -b -B --ignore-all-space --exclude-
  /etc/rc\.d/init\.d/functions	--	gen_context(system_u:object_r:bin_t,s0)
  
  /etc/security/namespace.init    --      gen_context(system_u:object_r:bin_t,s0)
-@@ -145,6 +148,7 @@
+@@ -145,6 +149,7 @@
  /usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  /usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  /usr/bin/git-shell		--	gen_context(system_u:object_r:shell_exec_t,s0)
@@ -1391,7 +1400,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/scponly		--	gen_context(system_u:object_r:shell_exec_t,s0)
  
  /usr/lib(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
-@@ -217,8 +221,11 @@
+@@ -217,8 +222,11 @@
  /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)
@@ -1406,8 +1415,16 @@ 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.12/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/corenetwork.te.in	2009-08-04 13:16:29.000000000 +0200
-@@ -116,7 +116,7 @@
++++ serefpolicy-3.6.12/policy/modules/kernel/corenetwork.te.in	2009-08-13 08:57:43.000000000 +0200
+@@ -107,6 +107,7 @@
+ network_port(giftd, tcp,1213,s0)
+ network_port(gopher, tcp,70,s0, udp,70,s0)
+ network_port(gpsd,tcp,2947,s0)
++network_port(hddtemp, tcp,7634,s0)
+ network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
+ portcon tcp 10001-10010 gen_context(system_u:object_r:http_cache_port_t, 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
+@@ -116,7 +117,7 @@
  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)
  network_port(innd, tcp,119,s0)
@@ -1416,7 +1433,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(ipsecnat, tcp,4500,s0, udp,4500,s0)
  network_port(ircd, tcp,6667,s0)
  network_port(ipmi, udp,623,s0, udp,664,s0)
-@@ -134,7 +134,7 @@
+@@ -134,7 +135,7 @@
  network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0)
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
  network_port(lmtp, tcp,24,s0, udp,24,s0)
@@ -2171,7 +2188,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.12/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-11 09:44:51.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/cups.te	2009-08-13 09:15:32.000000000 +0200
 @@ -59,12 +59,13 @@
  init_daemon_domain(hplip_t, hplip_exec_t)
  # For CUPS to run as a backend
@@ -2246,6 +2263,17 @@ diff -b -B --ignore-all-space --exclude-
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
  userdom_manage_user_home_content_dirs(cups_pdf_t)
  userdom_manage_user_home_content_files(cups_pdf_t)
+@@ -765,3 +776,10 @@
+ manage_files_pattern(cups_pdf_t, cupsd_log_t, cupsd_log_t)
+ miscfiles_read_fonts(cups_pdf_t)
+ 
++#need to read user-dirs.dirs
++optional_policy(`
++	gnome_read_config(cups_pdf_t)
++')
++
++
++
 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-08-05 21:48:06.000000000 +0200
@@ -2759,6 +2787,100 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
  permissive hald_dccm_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.fc serefpolicy-3.6.12/policy/modules/services/hddtemp.fc
+--- nsaserefpolicy/policy/modules/services/hddtemp.fc	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/services/hddtemp.fc	2009-08-13 08:56:27.000000000 +0200
+@@ -0,0 +1,4 @@
++
++/etc/rc\.d/init\.d/hddtemp      --      gen_context(system_u:object_r:hddtemp_initrc_exec_t,s0)
++
++/usr/sbin/hddtemp             	--      gen_context(system_u:object_r:hddtemp_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.if serefpolicy-3.6.12/policy/modules/services/hddtemp.if
+--- nsaserefpolicy/policy/modules/services/hddtemp.if	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/services/hddtemp.if	2009-08-13 08:56:27.000000000 +0200
+@@ -0,0 +1,38 @@
++## <summary>hddtemp hard disk temperature tool running as a daemon</summary>
++
++#######################################
++## <summary>
++##      Execute hddtemp in the hddtemp domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`hddtemp_domtrans',`
++        gen_require(`
++                type hddtemp_t, hddtemp_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1, hddtemp_exec_t, hddtemp_t)
++')
++
++######################################
++## <summary>
++##      Execute hddtemp 
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`hddtemp_exec',`
++        gen_require(`
++                type hddtemp_exec_t;
++        ')
++
++        can_exec($1, hddtemp_exec_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.te serefpolicy-3.6.12/policy/modules/services/hddtemp.te
+--- nsaserefpolicy/policy/modules/services/hddtemp.te	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/services/hddtemp.te	2009-08-13 08:56:27.000000000 +0200
+@@ -0,0 +1,40 @@
++policy_module(hddtemp,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type hddtemp_t;
++type hddtemp_exec_t;
++init_daemon_domain(hddtemp_t,hddtemp_exec_t)
++
++type hddtemp_initrc_exec_t;
++init_script_file(hddtemp_initrc_exec_t)
++
++########################################
++#
++# hddtemp local policy
++#
++
++allow hddtemp_t self:capability sys_rawio;
++dontaudit hddtemp_t self:capability sys_admin;
++
++allow hddtemp_t self:netlink_route_socket r_netlink_socket_perms;
++allow hddtemp_t self:tcp_socket create_stream_socket_perms;
++allow hddtemp_t self:udp_socket create_socket_perms;
++
++corenet_tcp_bind_all_nodes(hddtemp_t)
++corenet_tcp_bind_hddtemp_port(hddtemp_t)
++
++storage_raw_read_fixed_disk(hddtemp_t)
++
++# read hddtemp db file
++files_read_usr_files(hddtemp_t)
++
++logging_send_syslog_msg(hddtemp_t)
++
++miscfiles_read_localization(hddtemp_t)
++
++permissive hddtemp_t;
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.6.12/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/kerberos.if	2009-06-25 10:21:01.000000000 +0200
@@ -4844,6 +4966,17 @@ diff -b -B --ignore-all-space --exclude-
  dev_rw_lvm_control(mount_t)
  dev_dontaudit_getattr_all_chr_files(mount_t)
  dev_dontaudit_getattr_memory_dev(mount_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.12/policy/modules/system/sysnetwork.if
+--- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.if	2009-08-12 10:55:14.000000000 +0200
+@@ -281,6 +281,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
++	allow $1 net_conf_t:dir list_dir_perms;
+ 	read_files_pattern($1, net_conf_t, net_conf_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/sysnetwork.te	2009-07-17 09:43:41.000000000 +0200
@@ -4945,8 +5078,17 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-05 23:25:40.000000000 +0200
-@@ -627,12 +627,6 @@
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-13 09:03:28.000000000 +0200
+@@ -518,6 +518,8 @@
+ 	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 };
+ 
++	allow $1_t self:socket create_socket_perms;
++
+ 	allow $1_usertype unpriv_userdomain:fd use;
+ 
+ 	kernel_read_system_state($1_usertype)
+@@ -627,12 +629,6 @@
  		')
  
  		optional_policy(`
@@ -4959,7 +5101,7 @@ diff -b -B --ignore-all-space --exclude-
  			evolution_dbus_chat($1_usertype)
  			evolution_alarm_dbus_chat($1_usertype)
  	')
-@@ -968,6 +962,21 @@
+@@ -968,6 +964,21 @@
  	')
  
  		optional_policy(`
@@ -4981,7 +5123,7 @@ diff -b -B --ignore-all-space --exclude-
  		gnome_manage_config($1_usertype)
  		gnome_manage_gconf_home_files($1_usertype)
  		gnome_read_gconf_config($1_usertype)
-@@ -1457,6 +1466,7 @@
+@@ -1457,6 +1468,7 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -4989,7 +5131,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_home($1)
  ')
  
-@@ -1880,7 +1890,7 @@
+@@ -1880,7 +1892,7 @@
  		type user_home_t;
  	')
  
@@ -4998,7 +5140,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3317,10 +3327,6 @@
+@@ -3317,10 +3329,6 @@
    seutil_run_newrole($1_t, $1_r)
  
    optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -p -r1.896 -r1.897
--- selinux-policy.spec	11 Aug 2009 08:52:45 -0000	1.896
+++ selinux-policy.spec	13 Aug 2009 14:54:00 -0000	1.897
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 75%{?dist}
+Release: 76%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 13 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-76
+- Allow hald_t to list net_conf_t directory
+
 * Tue Aug 11 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-75
 - Allow polkit_auth_t to getattr of all persistent filesystems
 



From laxathom at fedoraproject.org  Thu Aug 13 15:00:36 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu, 13 Aug 2009 15:00:36 +0000 (UTC)
Subject: rpms/gammu/F-11 gammu.spec,1.26,1.27 sources,1.16,1.17
Message-ID: <20090813150036.8810411C043B@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17504/F-11

Modified Files:
	gammu.spec sources 
Log Message:
Update release


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-11/gammu.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gammu.spec	29 Apr 2009 19:40:08 -0000	1.26
+++ gammu.spec	13 Aug 2009 15:00:35 -0000	1.27
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.24.0
+Version:        1.25.0
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -111,7 +111,6 @@ mkdir devel_docs
 mkdir -p docs/symbian
 cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/devel/* devel_docs
 cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/symbian/* docs/symbian
-cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/* docs/examples
 cp -p $RPM_BUILD_ROOT%{_docdir}/%{name}/*.* .
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -158,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Xavier Lamien <laxathom at fedoraproject.org> 1.25.0-1
+- update release.
+
 * Wed Apr 29 2009 Xavier Lamien <lxtnow at gmail.com> - 1.24.0-1
 - Update release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Apr 2009 19:40:09 -0000	1.16
+++ sources	13 Aug 2009 15:00:36 -0000	1.17
@@ -1 +1 @@
-f805d6d93ca7064f6d04eb3c6b24168f  gammu-1.24.0.tar.bz2
+49cb33609cc8cfb4b1f998319cd12b7c  gammu-1.25.0.tar.bz2



From laxathom at fedoraproject.org  Thu Aug 13 15:00:36 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Thu, 13 Aug 2009 15:00:36 +0000 (UTC)
Subject: rpms/gammu/devel .cvsignore, 1.16, 1.17 gammu.spec, 1.28,
	1.29 sources, 1.16, 1.17
Message-ID: <20090813150036.E82B711C043B@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17504/devel

Modified Files:
	.cvsignore gammu.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	9 Jun 2009 18:20:46 -0000	1.16
+++ .cvsignore	13 Aug 2009 15:00:36 -0000	1.17
@@ -1 +1 @@
-gammu-1.24.0.tar.bz2
+gammu-1.25.0.tar.bz2


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gammu.spec	24 Jul 2009 23:30:00 -0000	1.28
+++ gammu.spec	13 Aug 2009 15:00:36 -0000	1.29
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.24.0
-Release:        3%{?dist}
+Version:        1.25.0
+Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -108,7 +108,6 @@ mkdir devel_docs
 mkdir -p docs/symbian
 cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/devel/* devel_docs
 cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/symbian/* docs/symbian
-cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/* docs/examples
 cp -p $RPM_BUILD_ROOT%{_docdir}/%{name}/*.* .
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -155,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Xavier Lamien <laxathom at fedorarproject.org> - 1.25.0-1
+- Update release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	29 Apr 2009 19:40:09 -0000	1.16
+++ sources	13 Aug 2009 15:00:36 -0000	1.17
@@ -1 +1 @@
-f805d6d93ca7064f6d04eb3c6b24168f  gammu-1.24.0.tar.bz2
+49cb33609cc8cfb4b1f998319cd12b7c  gammu-1.25.0.tar.bz2



From shakthimaan at fedoraproject.org  Thu Aug 13 15:09:21 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Thu, 13 Aug 2009 15:09:21 +0000 (UTC)
Subject: rpms/espresso-ab/devel espresso-ab.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813150922.0D05D11C0097@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/espresso-ab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18865/devel

Modified Files:
	.cvsignore sources 
Added Files:
	espresso-ab.spec import.log 
Log Message:
First espresso-ab package commit.



--- NEW FILE espresso-ab.spec ---
Name:           espresso-ab
Version:        1.0
Release:        1%{?dist}
Summary:        A boolean minimization tool

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
Espresso takes as input a two-level representation of a two-valued 
(or multiple-valued) Boolean function, and produces a minimal equivalent 
representation. It is a boolean logic minimization tool.

%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 README COPYING
%{_bindir}/espresso

%changelog
* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0-1
- First .spec release for espress-ab-1.0

--- NEW FILE import.log ---
espresso-ab-1_0-1_fc11:HEAD:espresso-ab-1.0-1.fc11.src.rpm:1250176406


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:59:55 -0000	1.1
+++ .cvsignore	13 Aug 2009 15:09:20 -0000	1.2
@@ -0,0 +1 @@
+espresso-ab-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:59:55 -0000	1.1
+++ sources	13 Aug 2009 15:09:20 -0000	1.2
@@ -0,0 +1 @@
+1c60ac344779dc8753f8e0785eafd8ac  espresso-ab-1.0.tar.gz



From shakthimaan at fedoraproject.org  Thu Aug 13 15:12:26 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Thu, 13 Aug 2009 15:12:26 +0000 (UTC)
Subject: rpms/espresso-ab/F-10 espresso-ab.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813151226.C63CB11C0097@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/espresso-ab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19476/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	espresso-ab.spec import.log 
Log Message:
First espresso-ab package commit.



--- NEW FILE espresso-ab.spec ---
Name:           espresso-ab
Version:        1.0
Release:        1%{?dist}
Summary:        A boolean minimization tool

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
Espresso takes as input a two-level representation of a two-valued 
(or multiple-valued) Boolean function, and produces a minimal equivalent 
representation. It is a boolean logic minimization tool.

%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 README COPYING
%{_bindir}/espresso

%changelog
* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0-1
- First .spec release for espress-ab-1.0

--- NEW FILE import.log ---
espresso-ab-1_0-1_fc11:F-10:espresso-ab-1.0-1.fc11.src.rpm:1250176679


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:59:55 -0000	1.1
+++ .cvsignore	13 Aug 2009 15:12:26 -0000	1.2
@@ -0,0 +1 @@
+espresso-ab-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:59:55 -0000	1.1
+++ sources	13 Aug 2009 15:12:26 -0000	1.2
@@ -0,0 +1 @@
+1c60ac344779dc8753f8e0785eafd8ac  espresso-ab-1.0.tar.gz



From shakthimaan at fedoraproject.org  Thu Aug 13 15:14:14 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Thu, 13 Aug 2009 15:14:14 +0000 (UTC)
Subject: rpms/espresso-ab/F-11 espresso-ab.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090813151414.96A7D11C0097@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/espresso-ab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19914/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	espresso-ab.spec import.log 
Log Message:
First espresso-ab package commit.



--- NEW FILE espresso-ab.spec ---
Name:           espresso-ab
Version:        1.0
Release:        1%{?dist}
Summary:        A boolean minimization tool

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
Espresso takes as input a two-level representation of a two-valued 
(or multiple-valued) Boolean function, and produces a minimal equivalent 
representation. It is a boolean logic minimization tool.

%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 README COPYING
%{_bindir}/espresso

%changelog
* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0-1
- First .spec release for espress-ab-1.0

--- NEW FILE import.log ---
espresso-ab-1_0-1_fc11:F-11:espresso-ab-1.0-1.fc11.src.rpm:1250176789


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:59:55 -0000	1.1
+++ .cvsignore	13 Aug 2009 15:14:14 -0000	1.2
@@ -0,0 +1 @@
+espresso-ab-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:59:55 -0000	1.1
+++ sources	13 Aug 2009 15:14:14 -0000	1.2
@@ -0,0 +1 @@
+1c60ac344779dc8753f8e0785eafd8ac  espresso-ab-1.0.tar.gz



From mgrepl at fedoraproject.org  Thu Aug 13 15:16:17 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 13 Aug 2009 15:16:17 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.42,1.43
Message-ID: <20090813151617.B8E8811C0097@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-serv20419

Modified Files:
	policy-20090521.patch 
Log Message:
- Allow hald_t to list net_conf_t directory



policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    8 +
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/sudo.if              |    4 
 modules/admin/usermanage.te        |    1 
 modules/apps/calamaris.te          |    4 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/screen.if             |    1 
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |   10 +
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |   12 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.fc           |    2 
 modules/services/cups.te           |   28 +++
 modules/services/dbus.if           |    4 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |    8 -
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/hddtemp.fc        |    4 
 modules/services/hddtemp.if        |   38 +++++
 modules/services/hddtemp.te        |   40 +++++
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    3 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   29 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   41 +++++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    1 
 modules/system/sysnetwork.if       |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |    6 
 modules/system/userdomain.if       |   30 ++--
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 130 files changed, 2138 insertions(+), 640 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- policy-20090521.patch	13 Aug 2009 14:54:00 -0000	1.42
+++ policy-20090521.patch	13 Aug 2009 15:16:17 -0000	1.43
@@ -1373,17 +1373,16 @@ diff -b -B --ignore-all-space --exclude-
  # VMWare need access to pcmcia devices for network
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-08-12 11:02:41.000000000 +0200
-@@ -7,6 +7,8 @@
++++ serefpolicy-3.6.12/policy/modules/kernel/corecommands.fc	2009-08-13 17:13:38.000000000 +0200
+@@ -7,6 +7,7 @@
  /bin/d?ash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/bash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/bash2			--	gen_context(system_u:object_r:shell_exec_t,s0)
 +/bin/fish			--	gen_context(system_u:object_r:shell_exec_t,s0)
-+/bin/nologin			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/ksh.*			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/sash			--	gen_context(system_u:object_r:shell_exec_t,s0)
  /bin/tcsh			--	gen_context(system_u:object_r:shell_exec_t,s0)
-@@ -69,6 +71,8 @@
+@@ -69,6 +70,8 @@
  /etc/ppp/ipv6-up\..*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/ppp/ipv6-down\..*		--	gen_context(system_u:object_r:bin_t,s0)
  
@@ -1392,6 +1391,14 @@ diff -b -B --ignore-all-space --exclude-
  /etc/rc\.d/init\.d/functions	--	gen_context(system_u:object_r:bin_t,s0)
  
  /etc/security/namespace.init    --      gen_context(system_u:object_r:bin_t,s0)
+@@ -119,6 +122,7 @@
+ /sbin/.*				gen_context(system_u:object_r:bin_t,s0)
+ /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:bin_t,s0)
+ /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:bin_t,s0)
++/sbin/nologin                   --      gen_context(system_u:object_r:shell_exec_t,s0)
+ 
+ #
+ # /opt
 @@ -145,6 +149,7 @@
  /usr/(.*/)?Bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
  /usr/(.*/)?bin(/.*)?			gen_context(system_u:object_r:bin_t,s0)



From berrange at fedoraproject.org  Thu Aug 13 15:27:44 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 13 Aug 2009 15:27:44 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.7.0-policy-kit-rewrite.patch, NONE,
	1.1 libvirt.spec, 1.166, 1.167
Message-ID: <20090813152744.655C711C0097@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22411

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.7.0-policy-kit-rewrite.patch 
Log Message:
Rewrite policykit support (rhbz #499970)

libvirt-0.7.0-policy-kit-rewrite.patch:
 configure.in            |   73 +++++++++++++++++++++++++++++--------------
 qemud/Makefile.am       |   11 +++++-
 qemud/libvirtd.policy   |   42 ------------------------
 qemud/libvirtd.policy-0 |   42 ++++++++++++++++++++++++
 qemud/libvirtd.policy-1 |   42 ++++++++++++++++++++++++
 qemud/qemud.c           |    4 +-
 qemud/qemud.h           |    4 +-
 qemud/remote.c          |   81 +++++++++++++++++++++++++++++++++++++++++++++---
 src/remote_internal.c   |    7 ++++
 9 files changed, 230 insertions(+), 76 deletions(-)

--- NEW FILE libvirt-0.7.0-policy-kit-rewrite.patch ---
diff -rupN libvirt-0.7.0/configure.in libvirt-0.7.0.new/configure.in
--- libvirt-0.7.0/configure.in	2009-08-05 08:53:49.000000000 -0400
+++ libvirt-0.7.0.new/configure.in	2009-08-13 08:37:22.393897620 -0400
@@ -641,40 +641,61 @@ AC_SUBST([SASL_LIBS])
 dnl PolicyKit library
 POLKIT_CFLAGS=
 POLKIT_LIBS=
+PKCHECK_PATH=
 AC_ARG_WITH([polkit],
   [  --with-polkit         use PolicyKit for UNIX socket access checks],
   [],
   [with_polkit=check])
 
+with_polkit0=no
+with_polkit1=no
 if test "x$with_polkit" = "xyes" -o "x$with_polkit" = "xcheck"; then
-  PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLKIT_REQUIRED,
-    [with_polkit=yes], [
-    if test "x$with_polkit" = "xcheck" ; then
-       with_polkit=no
-    else
-       AC_MSG_ERROR(
-         [You must install PolicyKit >= $POLKIT_REQUIRED to compile libvirt])
-    fi
-  ])
-  if test "x$with_polkit" = "xyes" ; then
+  dnl Check for new polkit first - just a binary
+  AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])
+  if test "x$PKCHECK_PATH" != "x" ; then
+    AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])
     AC_DEFINE_UNQUOTED([HAVE_POLKIT], 1,
-      [use PolicyKit for UNIX socket access checks])
-
-    old_CFLAGS=$CFLAGS
-    old_LDFLAGS=$LDFLAGS
-    CFLAGS="$CFLAGS $POLKIT_CFLAGS"
-    LDFLAGS="$LDFLAGS $POLKIT_LIBS"
-    AC_CHECK_FUNCS([polkit_context_is_caller_authorized])
-    CFLAGS="$old_CFLAGS"
-    LDFLAGS="$old_LDFLAGS"
-
-    AC_PATH_PROG([POLKIT_AUTH], [polkit-auth])
-    if test "x$POLKIT_AUTH" != "x"; then
-      AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program])
+        [use PolicyKit for UNIX socket access checks])
+    AC_DEFINE_UNQUOTED([HAVE_POLKIT1], 1,
+        [use PolicyKit for UNIX socket access checks])
+    with_polkit="yes"
+    with_polkit1="yes"
+  else
+    dnl Check for old polkit second - library + binary
+    PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLKIT_REQUIRED,
+      [with_polkit=yes], [
+      if test "x$with_polkit" = "xcheck" ; then
+         with_polkit=no
+      else
+         AC_MSG_ERROR(
+           [You must install PolicyKit >= $POLKIT_REQUIRED to compile libvirt])
+      fi
+    ])
+    if test "x$with_polkit" = "xyes" ; then
+      AC_DEFINE_UNQUOTED([HAVE_POLKIT], 1,
+        [use PolicyKit for UNIX socket access checks])
+      AC_DEFINE_UNQUOTED([HAVE_POLKIT0], 1,
+        [use PolicyKit for UNIX socket access checks])
+
+      old_CFLAGS=$CFLAGS
+      old_LDFLAGS=$LDFLAGS
+      CFLAGS="$CFLAGS $POLKIT_CFLAGS"
+      LDFLAGS="$LDFLAGS $POLKIT_LIBS"
+      AC_CHECK_FUNCS([polkit_context_is_caller_authorized])
+      CFLAGS="$old_CFLAGS"
+      LDFLAGS="$old_LDFLAGS"
+
+      AC_PATH_PROG([POLKIT_AUTH], [polkit-auth])
+      if test "x$POLKIT_AUTH" != "x"; then
+        AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program])
+      fi
+      with_polkit0="yes"
     fi
   fi
 fi
 AM_CONDITIONAL([HAVE_POLKIT], [test "x$with_polkit" = "xyes"])
+AM_CONDITIONAL([HAVE_POLKIT0], [test "x$with_polkit0" = "xyes"])
+AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"])
 AC_SUBST([POLKIT_CFLAGS])
 AC_SUBST([POLKIT_LIBS])
 
@@ -1695,7 +1716,11 @@ else
 AC_MSG_NOTICE([   avahi: no])
 fi
 if test "$with_polkit" = "yes" ; then
-AC_MSG_NOTICE([  polkit: $POLKIT_CFLAGS $POLKIT_LIBS])
+if test "$with_polkit0" = "yes" ; then
+AC_MSG_NOTICE([  polkit: $POLKIT_CFLAGS $POLKIT_LIBS (version 0)])
+else
+AC_MSG_NOTICE([  polkit: $PKCHECK_PATH (version 1)])
+fi
 else
 AC_MSG_NOTICE([  polkit: no])
 fi
diff -rupN libvirt-0.7.0/qemud/libvirtd.policy libvirt-0.7.0.new/qemud/libvirtd.policy
--- libvirt-0.7.0/qemud/libvirtd.policy	2009-07-22 09:37:32.000000000 -0400
+++ libvirt-0.7.0.new/qemud/libvirtd.policy	1969-12-31 19:00:00.000000000 -0500
@@ -1,42 +0,0 @@
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!--
-Policy definitions for libvirt daemon
-
-Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
-
-libvirt is licensed to you under the GNU Lesser General Public License
-version 2. See COPYING for details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
--->
-
-<policyconfig>
-    <action id="org.libvirt.unix.monitor">
-      <description>Monitor local virtualized systems</description>
-      <message>System policy prevents monitoring of local virtualized systems</message>
-      <defaults>
-        <!-- Any program can use libvirt in read-only mode for monitoring,
-             even if not part of a session -->
-        <allow_any>yes</allow_any>
-        <allow_inactive>yes</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </action>
-
-    <action id="org.libvirt.unix.manage">
-      <description>Manage local virtualized systems</description>
-      <message>System policy prevents management of local virtualized systems</message>
-      <defaults>
-        <!-- Only a program in the active host session can use libvirt in
-             read-write mode for management, and we require user password -->
-        <allow_any>no</allow_any>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin_keep_session</allow_active>
-      </defaults>
-    </action>
-</policyconfig>
diff -rupN libvirt-0.7.0/qemud/libvirtd.policy-0 libvirt-0.7.0.new/qemud/libvirtd.policy-0
--- libvirt-0.7.0/qemud/libvirtd.policy-0	1969-12-31 19:00:00.000000000 -0500
+++ libvirt-0.7.0.new/qemud/libvirtd.policy-0	2009-08-13 08:37:22.408883879 -0400
@@ -0,0 +1,42 @@
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<!--
+Policy definitions for libvirt daemon
+
+Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
+
+libvirt is licensed to you under the GNU Lesser General Public License
+version 2. See COPYING for details.
+
+NOTE: If you make changes to this file, make sure to validate the file
+using the polkit-policy-file-validate(1) tool. Changes made to this
+file are instantly applied.
+-->
+
+<policyconfig>
+    <action id="org.libvirt.unix.monitor">
+      <description>Monitor local virtualized systems</description>
+      <message>System policy prevents monitoring of local virtualized systems</message>
+      <defaults>
+        <!-- Any program can use libvirt in read-only mode for monitoring,
+             even if not part of a session -->
+        <allow_any>yes</allow_any>
+        <allow_inactive>yes</allow_inactive>
+        <allow_active>yes</allow_active>
+      </defaults>
+    </action>
+
+    <action id="org.libvirt.unix.manage">
+      <description>Manage local virtualized systems</description>
+      <message>System policy prevents management of local virtualized systems</message>
+      <defaults>
+        <!-- Only a program in the active host session can use libvirt in
+             read-write mode for management, and we require user password -->
+        <allow_any>no</allow_any>
+        <allow_inactive>no</allow_inactive>
+        <allow_active>auth_admin_keep_session</allow_active>
+      </defaults>
+    </action>
+</policyconfig>
diff -rupN libvirt-0.7.0/qemud/libvirtd.policy-1 libvirt-0.7.0.new/qemud/libvirtd.policy-1
--- libvirt-0.7.0/qemud/libvirtd.policy-1	1969-12-31 19:00:00.000000000 -0500
+++ libvirt-0.7.0.new/qemud/libvirtd.policy-1	2009-08-13 08:37:22.412905763 -0400
@@ -0,0 +1,42 @@
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<!--
+Policy definitions for libvirt daemon
+
+Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
+
+libvirt is licensed to you under the GNU Lesser General Public License
+version 2. See COPYING for details.
+
+NOTE: If you make changes to this file, make sure to validate the file
+using the polkit-policy-file-validate(1) tool. Changes made to this
+file are instantly applied.
+-->
+
+<policyconfig>
+    <action id="org.libvirt.unix.monitor">
+      <description>Monitor local virtualized systems</description>
+      <message>System policy prevents monitoring of local virtualized systems</message>
+      <defaults>
+        <!-- Any program can use libvirt in read-only mode for monitoring,
+             even if not part of a session -->
+        <allow_any>yes</allow_any>
+        <allow_inactive>yes</allow_inactive>
+        <allow_active>yes</allow_active>
+      </defaults>
+    </action>
+
+    <action id="org.libvirt.unix.manage">
+      <description>Manage local virtualized systems</description>
+      <message>System policy prevents management of local virtualized systems</message>
+      <defaults>
+        <!-- Only a program in the active host session can use libvirt in
+             read-write mode for management, and we require user password -->
+        <allow_any>no</allow_any>
+        <allow_inactive>no</allow_inactive>
+        <allow_active>auth_admin_keep</allow_active>
+      </defaults>
+    </action>
+</policyconfig>
diff -rupN libvirt-0.7.0/qemud/Makefile.am libvirt-0.7.0.new/qemud/Makefile.am
--- libvirt-0.7.0/qemud/Makefile.am	2009-07-22 09:37:32.000000000 -0400
+++ libvirt-0.7.0.new/qemud/Makefile.am	2009-08-13 08:37:22.398915449 -0400
@@ -21,7 +21,8 @@ EXTRA_DIST =						\
 	remote_protocol.x				\
 	libvirtd.conf					\
 	libvirtd.init.in				\
-	libvirtd.policy					\
+	libvirtd.policy-0				\
+	libvirtd.policy-1				\
 	libvirtd.sasl					\
 	libvirtd.sysconf				\
 	libvirtd.aug                                    \
@@ -147,7 +148,13 @@ endif
 libvirtd_LDADD += ../src/libvirt.la
 
 if HAVE_POLKIT
+if HAVE_POLKIT0
 policydir = $(datadir)/PolicyKit/policy
+policyfile = libvirtd.policy-0
+else
+policydir = $(datadir)/polkit-1/actions
+policyfile = libvirtd.policy-1
+endif
 endif
 
 if HAVE_AVAHI
@@ -197,7 +204,7 @@ endif
 if HAVE_POLKIT
 install-data-polkit:: install-init
 	mkdir -p $(DESTDIR)$(policydir)
-	$(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
 uninstall-data-polkit:: install-init
 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
 else
diff -rupN libvirt-0.7.0/qemud/qemud.c libvirt-0.7.0.new/qemud/qemud.c
--- libvirt-0.7.0/qemud/qemud.c	2009-07-22 09:37:32.000000000 -0400
+++ libvirt-0.7.0.new/qemud/qemud.c	2009-08-13 08:37:22.419878018 -0400
@@ -895,7 +895,7 @@ static struct qemud_server *qemudNetwork
     }
 #endif
 
-#ifdef HAVE_POLKIT
+#if HAVE_POLKIT0
     if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
         auth_unix_ro == REMOTE_AUTH_POLKIT) {
         DBusError derr;
@@ -982,7 +982,7 @@ static struct qemud_server *qemudNetwork
             sock = sock->next;
         }
 
-#ifdef HAVE_POLKIT
+#if HAVE_POLKIT0
         if (server->sysbus)
             dbus_connection_unref(server->sysbus);
 #endif
diff -rupN libvirt-0.7.0/qemud/qemud.h libvirt-0.7.0.new/qemud/qemud.h
--- libvirt-0.7.0/qemud/qemud.h	2009-07-23 12:33:02.000000000 -0400
+++ libvirt-0.7.0.new/qemud/qemud.h	2009-08-13 08:37:22.425909852 -0400
@@ -34,7 +34,7 @@
 #include <sasl/sasl.h>
 #endif
 
-#ifdef HAVE_POLKIT
+#if HAVE_POLKIT0
 #include <dbus/dbus.h>
 #endif
 
@@ -253,7 +253,7 @@ struct qemud_server {
 #if HAVE_SASL
     char **saslUsernameWhitelist;
 #endif
-#if HAVE_POLKIT
+#if HAVE_POLKIT0
     DBusConnection *sysbus;
 #endif
 };
diff -rupN libvirt-0.7.0/qemud/remote.c libvirt-0.7.0.new/qemud/remote.c
--- libvirt-0.7.0/qemud/remote.c	2009-07-23 12:33:02.000000000 -0400
+++ libvirt-0.7.0.new/qemud/remote.c	2009-08-13 08:37:22.431865087 -0400
@@ -43,7 +43,7 @@
 #include <fnmatch.h>
 #include "virterror_internal.h"
 
-#ifdef HAVE_POLKIT
+#if HAVE_POLKIT0
 #include <polkit/polkit.h>
 #include <polkit-dbus/polkit-dbus.h>
 #endif
@@ -3106,7 +3106,80 @@ remoteDispatchAuthSaslStep (struct qemud
 #endif /* HAVE_SASL */
 
 
-#if HAVE_POLKIT
+#if HAVE_POLKIT1
+static int
+remoteDispatchAuthPolkit (struct qemud_server *server,
+                          struct qemud_client *client,
+                          virConnectPtr conn ATTRIBUTE_UNUSED,
+                          remote_error *rerr,
+                          void *args ATTRIBUTE_UNUSED,
+                          remote_auth_polkit_ret *ret)
+{
+    pid_t callerPid;
+    uid_t callerUid;
+    const char *action;
+    int status = -1;
+    char pidbuf[50];
+    int rv;
+
+    virMutexLock(&server->lock);
+    virMutexLock(&client->lock);
+    virMutexUnlock(&server->lock);
+
+    action = client->readonly ?
+        "org.libvirt.unix.monitor" :
+        "org.libvirt.unix.manage";
+
+    const char * const pkcheck [] = {
+      PKCHECK_PATH,
+      "--action-id", action,
+      "--process", pidbuf,
+      "--allow-user-interaction",
+      NULL
+    };
+
+    REMOTE_DEBUG("Start PolicyKit auth %d", client->fd);
+    if (client->auth != REMOTE_AUTH_POLKIT) {
+        VIR_ERROR0(_("client tried invalid PolicyKit init request"));
+        goto authfail;
+    }
+
+    if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) {
+        VIR_ERROR0(_("cannot get peer socket identity"));
+        goto authfail;
+    }
+
+    VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid);
+
+    rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid);
+    if (rv < 0 || rv >= sizeof pidbuf) {
+        VIR_ERROR(_("Caller PID was too large %d"), callerPid);
+	goto authfail;
+    }
+
+    if (virRun(NULL, pkcheck, &status) < 0) {
+        VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH);
+	goto authfail;
+    }
+    if (status != 0) {
+        VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d\n"),
+                  action, callerPid, callerUid, status);
+        goto authfail;
+    }
+    VIR_INFO(_("Policy allowed action %s from pid %d, uid %d"),
+             action, callerPid, callerUid);
+    ret->complete = 1;
+    client->auth = REMOTE_AUTH_NONE;
+
+    virMutexUnlock(&client->lock);
+    return 0;
+
+authfail:
+    remoteDispatchAuthError(rerr);
+    virMutexUnlock(&client->lock);
+    return -1;
+}
+#elif HAVE_POLKIT0
 static int
 remoteDispatchAuthPolkit (struct qemud_server *server,
                           struct qemud_client *client,
@@ -3217,7 +3290,7 @@ authfail:
     return -1;
 }
 
-#else /* HAVE_POLKIT */
+#else /* !HAVE_POLKIT0 & !HAVE_POLKIT1*/
 
 static int
 remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
@@ -3231,7 +3304,7 @@ remoteDispatchAuthPolkit (struct qemud_s
     remoteDispatchAuthError(rerr);
     return -1;
 }
-#endif /* HAVE_POLKIT */
+#endif /* HAVE_POLKIT1 */
 
 
 /***************************************************************
diff -rupN libvirt-0.7.0/src/remote_internal.c libvirt-0.7.0.new/src/remote_internal.c
--- libvirt-0.7.0/src/remote_internal.c	2009-07-29 10:42:15.000000000 -0400
+++ libvirt-0.7.0.new/src/remote_internal.c	2009-08-13 10:55:57.607899170 -0400
@@ -6201,6 +6201,7 @@ remoteAuthPolkit (virConnectPtr conn, st
                   virConnectAuthPtr auth)
 {
     remote_auth_polkit_ret ret;
+#if HAVE_POLKIT0
     int i, allowcb = 0;
     virConnectCredential cred = {
         VIR_CRED_EXTERNAL,
@@ -6210,8 +6211,10 @@ remoteAuthPolkit (virConnectPtr conn, st
         NULL,
         0,
     };
+#endif
     DEBUG0("Client initialize PolicyKit authentication");
 
+#if HAVE_POLKIT0
     if (auth && auth->cb) {
         /* Check if the necessary credential type for PolicyKit is supported */
         for (i = 0 ; i < auth->ncredtype ; i++) {
@@ -6220,6 +6223,7 @@ remoteAuthPolkit (virConnectPtr conn, st
         }
 
         if (allowcb) {
+            DEBUG0("Client run callback for PolicyKit authentication");
             /* Run the authentication callback */
             if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
                 virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
@@ -6233,6 +6237,9 @@ remoteAuthPolkit (virConnectPtr conn, st
     } else {
         DEBUG0("No auth callback provided");
     }
+#else
+    DEBUG0("No auth callback required for PolicyKit-1");
+#endif
 
     memset (&ret, 0, sizeof ret);
     if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT,


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- libvirt.spec	10 Aug 2009 10:32:28 -0000	1.166
+++ libvirt.spec	13 Aug 2009 15:27:42 -0000	1.167
@@ -78,7 +78,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -89,6 +89,10 @@ Patch01: libvirt-0.7.0-chown-kernel-init
 # Don't fail to start network if ipv6 modules is not loaded (bug #516497)
 Patch02: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
 
+# Policykit rewrite (bug #499970)
+# NB remove autoreconf hack & extra BRs when this goes away
+Patch03: libvirt-0.7.0-policy-kit-rewrite.patch
+
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
 Patch200: libvirt-0.6.4-svirt-sound.patch
@@ -106,8 +110,12 @@ Requires: iptables
 # needed for device enumeration
 Requires: hal
 %if %{with_polkit}
+%if 0%{?fedora} >= 12
+Requires: polkit >= 0.93
+%else
 Requires: PolicyKit >= 0.6
 %endif
+%endif
 %if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
@@ -161,8 +169,13 @@ BuildRequires: bridge-utils
 BuildRequires: cyrus-sasl-devel
 %endif
 %if %{with_polkit}
+%if 0%{?fedora} >= 12
+# Only need the binary, not -devel
+BuildRequires: polkit >= 0.93
+%else
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
+%endif
 %if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
@@ -205,6 +218,9 @@ BuildRequires: netcf-devel
 # Fedora build root suckage
 BuildRequires: gawk
 
+# Temp hack for patch 3
+BuildRequires: libtool autoconf automake gettext
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -260,6 +276,7 @@ of recent versions of Linux (and other O
 
 %patch01 -p1
 %patch02 -p1
+%patch03 -p1
 
 %patch200 -p0
 
@@ -352,6 +369,9 @@ of recent versions of Linux (and other O
 %define _without_netcf --without-netcf
 %endif
 
+# Temp hack for patch 3
+autoreconf -if
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -541,8 +561,12 @@ fi
 %endif
 
 %if %{with_polkit}
+%if 0%{?fedora} >= 12
+%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
+%else
 %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
+%endif
 
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
 %if %{with_qemu}
@@ -621,6 +645,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 13 2009  <berrange at dhcp-0-233.camlab.fab.redhat.com> - 0.7.0-4
+- Rewrite policykit support (rhbz #499970)
+
 * Mon Aug 10 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-3
 - Don't fail to start network if ipv6 modules is not loaded (#516497)
 



From berrange at fedoraproject.org  Thu Aug 13 15:30:20 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 13 Aug 2009 15:30:20 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.7.0-numa-ignore-fail.patch, NONE,
	1.1 libvirt.spec, 1.167, 1.168
Message-ID: <20090813153020.1E86A11C043B@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23557

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.7.0-numa-ignore-fail.patch 
Log Message:
Log and ignore NUMA topology problems (rhbz #506590)

libvirt-0.7.0-numa-ignore-fail.patch:
 capabilities.c |    1 +
 lxc_conf.c     |   12 ++++++++++--
 uml_conf.c     |   11 +++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE libvirt-0.7.0-numa-ignore-fail.patch ---
commit 19bac57b26c2d46ac8a7601158f210f34acdceac
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Thu Aug 13 11:56:31 2009 +0100

    Make LXC / UML drivers robust against NUMA topology brokenness
    
    Some kernel versions expose broken NUMA topology for some machines.
    This causes the LXC/UML drivers to fail to start. QEMU driver was
    already fixed for this problem
    
    * src/lxc_conf.c: Log and ignore failure to populate NUMA info
    * src/uml_conf.c: Log and ignore failure to populate NUMA info
    * src/capabilities.c: Reset nnumaCell to 0 after freeing

diff --git a/src/capabilities.c b/src/capabilities.c
index c6766b6..193a9fe 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -139,6 +139,7 @@ virCapabilitiesFreeNUMAInfo(virCapsPtr caps)
     for (i = 0 ; i < caps->host.nnumaCell ; i++)
         virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
     VIR_FREE(caps->host.numaCell);
+    caps->host.nnumaCell = 0;
 }
 
 /**
diff --git a/src/lxc_conf.c b/src/lxc_conf.c
index d06a024..fef60ba 100644
--- a/src/lxc_conf.c
+++ b/src/lxc_conf.c
@@ -30,6 +30,8 @@
 #include "lxc_conf.h"
 #include "nodeinfo.h"
 #include "virterror_internal.h"
+#include "logging.h"
+
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
@@ -46,8 +48,14 @@ virCapsPtr lxcCapsInit(void)
                                    0, 0)) == NULL)
         goto no_memory;
 
-    if (nodeCapsInitNUMA(caps) < 0)
-        goto no_memory;
+    /* Some machines have problematic NUMA toplogy causing
+     * unexpected failures. We don't want to break the QEMU
+     * driver in this scenario, so log errors & carry on
+     */
+    if (nodeCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
 
     /* XXX shouldn't 'borrow' KVM's prefix */
     virCapabilitiesSetMacPrefix(caps, (unsigned char []){ 0x52, 0x54, 0x00 });
diff --git a/src/uml_conf.c b/src/uml_conf.c
index 48e05a8..4f756d4 100644
--- a/src/uml_conf.c
+++ b/src/uml_conf.c
@@ -45,6 +45,7 @@
 #include "nodeinfo.h"
 #include "verify.h"
 #include "bridge.h"
+#include "logging.h"
 
 #define VIR_FROM_THIS VIR_FROM_UML
 
@@ -63,8 +64,14 @@ virCapsPtr umlCapsInit(void) {
                                    0, 0)) == NULL)
         goto no_memory;
 
-    if (nodeCapsInitNUMA(caps) < 0)
-        goto no_memory;
+    /* Some machines have problematic NUMA toplogy causing
+     * unexpected failures. We don't want to break the QEMU
+     * driver in this scenario, so log errors & carry on
+     */
+    if (nodeCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
 
     if ((guest = virCapabilitiesAddGuest(caps,
                                          "uml",


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- libvirt.spec	13 Aug 2009 15:27:42 -0000	1.167
+++ libvirt.spec	13 Aug 2009 15:30:19 -0000	1.168
@@ -93,6 +93,9 @@ Patch02: libvirt-0.7.0-handle-kernels-wi
 # NB remove autoreconf hack & extra BRs when this goes away
 Patch03: libvirt-0.7.0-policy-kit-rewrite.patch
 
+# Log and ignore NUMA topology problems (rhbz #506590)
+Patch04: libvirt-0.7.0-numa-ignore-fail.patch
+
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
 Patch200: libvirt-0.6.4-svirt-sound.patch
@@ -277,6 +280,7 @@ of recent versions of Linux (and other O
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
+%patch04 -p1
 
 %patch200 -p0
 
@@ -645,8 +649,9 @@ fi
 %endif
 
 %changelog
-* Thu Aug 13 2009  <berrange at dhcp-0-233.camlab.fab.redhat.com> - 0.7.0-4
+* Thu Aug 13 2009 Daniel P. Berrange <berrange at redhat.com> - 0.7.0-4
 - Rewrite policykit support (rhbz #499970)
+- Log and ignore NUMA topology problems (rhbz #506590)
 
 * Mon Aug 10 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-3
 - Don't fail to start network if ipv6 modules is not loaded (#516497)



From berrange at fedoraproject.org  Thu Aug 13 15:40:14 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 13 Aug 2009 15:40:14 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager.spec,1.54,1.55
Message-ID: <20090813154014.9457311C048B@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25081

Modified Files:
	virt-manager.spec 
Log Message:
Remove obsolete dep on policykit agent


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- virt-manager.spec	29 Jul 2009 02:35:39 -0000	1.54
+++ virt-manager.spec	13 Aug 2009 15:40:14 -0000	1.55
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -54,7 +54,8 @@ Requires: scrollkeeper
 # For console widget
 Requires: gtk-vnc-python >= 0.3.8
 # For local authentication against PolicyKit
-%if 0%{?fedora} >= 11
+# Fedora 12 has no need for a client agent.
+%if 0%{?fedora} = 11
 Requires: PolicyKit-authentication-agent
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} < 11
@@ -153,6 +154,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Aug 13 2009 Daniel P. Berrange <berrange at redhat.com> - 0.8.0-2.fc12
+- Remove obsolete dep on policykit agent
+
 * Tue Jul 28 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-1.fc12
 - Update to release 0.8.0
 - New 'Clone VM' Wizard



From dwalsh at fedoraproject.org  Thu Aug 13 15:40:50 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 15:40:50 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.152,1.153
Message-ID: <20090813154050.820EC11C0097@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25206

Modified Files:
	setroubleshoot.spec 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.18-2
- Add buildrequires python-slip-dbus



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- setroubleshoot.spec	30 Jul 2009 20:08:03 -0000	1.152
+++ setroubleshoot.spec	13 Aug 2009 15:40:50 -0000	1.153
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.2.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -16,7 +16,7 @@ Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
 Requires: gnome-python2-gtkhtml2
-Requires: python-bugzilla
+Requires: python-bugzilla python-slip-dbus
 Requires: polkit
 Requires: gnome-python2-gnomekeyring
 Requires(post): /usr/bin/update-desktop-database
@@ -209,6 +209,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.18-2
+- Add buildrequires python-slip-dbus
+
 * Thu Jul 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.18-1
 - Add sgrubb drop capabilities, patch
 - Fix infiniteloop



From berrange at fedoraproject.org  Thu Aug 13 15:43:14 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 13 Aug 2009 15:43:14 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.168,1.169
Message-ID: <20090813154314.671CB11C0097@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25660

Modified Files:
	libvirt.spec 
Log Message:
Added utterly crazy build dep on CVS for stupid autopoint tool


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- libvirt.spec	13 Aug 2009 15:30:19 -0000	1.168
+++ libvirt.spec	13 Aug 2009 15:43:14 -0000	1.169
@@ -222,7 +222,7 @@ BuildRequires: netcf-devel
 BuildRequires: gawk
 
 # Temp hack for patch 3
-BuildRequires: libtool autoconf automake gettext
+BuildRequires: libtool autoconf automake gettext cvs
 
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities



From pghmcfc at fedoraproject.org  Thu Aug 13 15:45:12 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 13 Aug 2009 15:45:12 +0000 (UTC)
Subject: rpms/libpng10/devel libpng-1.0.48-soname.patch, NONE, 1.1 .cvsignore,
	1.22, 1.23 libpng10.spec, 1.32, 1.33 sources, 1.22,
	1.23 libpng-1.0.38-soname.patch, 1.1, NONE
Message-ID: <20090813154512.795B711C0097@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25995

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.48-soname.patch 
Removed Files:
	libpng-1.0.38-soname.patch 
Log Message:
update to 1.0.48
- avoid a possible NULL dereference in debug build, in png_set_text_2()
- reject attempt to write iCCP chunk with negative embedded profile length
rebase soname patch to remove fuzz


libpng-1.0.48-soname.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 ltmain.sh   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libpng-1.0.48-soname.patch ---
--- libpng-1.0.48/ltmain.sh	2009-07-11 14:39:02.000000000 +0100
+++ libpng-1.0.48/ltmain.sh	2009-08-13 13:59:25.000000000 +0100
@@ -6225,7 +6225,7 @@
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]|[0-9].[0-9][0-9]) ;;
 	*)
 	  func_error "REVISION \`$revision' must be a nonnegative integer"
 	  func_fatal_error "\`$vinfo' is not valid version information"
--- libpng-1.0.48/Makefile.am	2009-08-13 12:12:18.000000000 +0100
+++ libpng-1.0.48/Makefile.am	2009-08-13 13:59:25.000000000 +0100
@@ -45,7 +45,7 @@
 	-version-number 0:@PNGLIB_RELEASE@:0
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_RELEASE@:0
+	-version-number 2:1:0. at PNGLIB_RELEASE@
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
--- libpng-1.0.48/Makefile.in	2009-08-13 12:12:26.000000000 +0100
+++ libpng-1.0.48/Makefile.in	2009-08-13 14:04:41.000000000 +0100
@@ -325,7 +325,7 @@
 	$(am__append_2)
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_RELEASE@:0
+	-version-number 2:1:0. at PNGLIB_RELEASE@
 
 @HAVE_LD_VERSION_SCRIPT_FALSE at libpng10_la_DEPENDENCIES = libpng.sym
 @HAVE_LD_VERSION_SCRIPT_TRUE at libpng10_la_DEPENDENCIES = libpng.vers


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	17 Jul 2009 11:32:35 -0000	1.22
+++ .cvsignore	13 Aug 2009 15:45:11 -0000	1.23
@@ -1 +1 @@
-libpng-1.0.47.tar.bz2
+libpng-1.0.48.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libpng10.spec	25 Jul 2009 06:26:10 -0000	1.32
+++ libpng10.spec	13 Aug 2009 15:45:12 -0000	1.33
@@ -1,12 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.47
-Release:	2%{?dist}
+Version:	1.0.48
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
-Patch0:		libpng-1.0.38-soname.patch
+Patch0:		libpng-1.0.48-soname.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -111,8 +111,14 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.47-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Aug 13 2009 Paul Howarth <paul at city-fan.org> 1.0.48-1
+- update to 1.0.48
+  - avoid a possible NULL dereference in debug build, in png_set_text_2()
+  - reject attempt to write iCCP chunk with negative embedded profile length
+- rebase soname patch to remove fuzz
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1.0.47-2
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Fri Jul 17 2009 Paul Howarth <paul at city-fan.org> 1.0.47-1
 - update to 1.0.47 (changes to unknown chunk handling and documentation)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	17 Jul 2009 11:32:35 -0000	1.22
+++ sources	13 Aug 2009 15:45:12 -0000	1.23
@@ -1 +1 @@
-4d96b1f0c1820886ea021dd79432bca1  libpng-1.0.47.tar.bz2
+e440d8789d8ce5563d4ada7e57a8b0ac  libpng-1.0.48.tar.bz2


--- libpng-1.0.38-soname.patch DELETED ---



From thm at fedoraproject.org  Thu Aug 13 15:45:25 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 13 Aug 2009 15:45:25 +0000 (UTC)
Subject: rpms/botan/devel .cvsignore, 1.5, 1.6 botan.spec, 1.9,
	1.10 import.log, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090813154525.68DD911C0097@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26138/devel

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 17:30:15 -0000	1.5
+++ .cvsignore	13 Aug 2009 15:45:25 -0000	1.6
@@ -1 +1 @@
-Botan-1.8.5.tbz
+Botan-1.8.6.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- botan.spec	12 Aug 2009 17:50:24 -0000	1.9
+++ botan.spec	13 Aug 2009 15:45:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,6 +110,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.6-1
+- Update to 1.8.6, which contains new features as well as bugfixes,
+  e.g. concerning the /proc-walking entropy source.
+
 * Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-2
 - Fix changelog.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	12 Aug 2009 17:50:24 -0000	1.6
+++ import.log	13 Aug 2009 15:45:25 -0000	1.7
@@ -4,3 +4,4 @@ botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc
 botan-1_8_2-1_fc10:HEAD:botan-1.8.2-1.fc10.src.rpm:1240683730
 botan-1_8_5-1_fc11:HEAD:botan-1.8.5-1.fc11.src.rpm:1250098169
 botan-1_8_5-2_fc11:HEAD:botan-1.8.5-2.fc11.src.rpm:1250099364
+botan-1_8_6-1_fc11:HEAD:botan-1.8.6-1.fc11.src.rpm:1250178270


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 17:30:15 -0000	1.5
+++ sources	13 Aug 2009 15:45:25 -0000	1.6
@@ -1 +1 @@
-6c0943fa4282bd57a23316c6d3c21279  Botan-1.8.5.tbz
+827f71f450eb1b7bc9e173c402bc48dc  Botan-1.8.6.tbz



From berrange at fedoraproject.org  Thu Aug 13 15:51:03 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 13 Aug 2009 15:51:03 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager.spec,1.55,1.56
Message-ID: <20090813155103.E8F2411C0097@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27127

Modified Files:
	virt-manager.spec 
Log Message:
Fix typo in comparison


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- virt-manager.spec	13 Aug 2009 15:40:14 -0000	1.55
+++ virt-manager.spec	13 Aug 2009 15:51:03 -0000	1.56
@@ -55,7 +55,7 @@ Requires: scrollkeeper
 Requires: gtk-vnc-python >= 0.3.8
 # For local authentication against PolicyKit
 # Fedora 12 has no need for a client agent.
-%if 0%{?fedora} = 11
+%if 0%{?fedora} == 11
 Requires: PolicyKit-authentication-agent
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} < 11



From dwalsh at fedoraproject.org  Thu Aug 13 15:51:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 15:51:54 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.199,
	1.200 policycoreutils-rhat.patch, 1.426,
	1.427 policycoreutils.spec, 1.618, 1.619 sources, 1.205, 1.206
Message-ID: <20090813155154.92D6411C0097@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27322

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-1
- Fix chcat to report error on non existing file
- Update to upstream
	* Modify setfiles/restorecon checking of exclude paths.  Only check
	user-supplied exclude paths (not automatically generated ones based on
	lack of seclabel support), don't require them to be directories, and
	ignore permission denied errors on them (it is ok to exclude a path to
	which the caller lacks permission).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- .cvsignore	9 Aug 2009 13:35:33 -0000	1.199
+++ .cvsignore	13 Aug 2009 15:51:51 -0000	1.200
@@ -204,3 +204,4 @@ policycoreutils-2.0.67.tgz
 policycoreutils-2.0.68.tgz
 policycoreutils-2.0.70.tgz
 policycoreutils_man_ru2.tar.bz2
+policycoreutils-2.0.71.tgz

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 restorecond/Makefile                        |   20 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  397 +++-------------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  220 +++++++++++++++
 restorecond/walk.c                          |   30 ++
 restorecond/watch.c                         |  346 ++++++++++++++++++++++++
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++++++
 scripts/sandbox.8                           |   22 +
 scripts/sandbox.py                          |   67 ++++
 semanage/semanage                           |   49 +++
 semanage/semanage.8                         |    2 
 semanage/seobject.py                        |  109 +++++++
 19 files changed, 1074 insertions(+), 370 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -p -r1.426 -r1.427
--- policycoreutils-rhat.patch	10 Aug 2009 15:26:43 -0000	1.426
+++ policycoreutils-rhat.patch	13 Aug 2009 15:51:52 -0000	1.427
@@ -1,15 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.70/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.70/Makefile	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-13 11:48:14.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.70/restorecond/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.71/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/Makefile	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-13 11:48:14.000000000 -0400
 @@ -2,16 +2,23 @@
  PREFIX ?= ${DESTDIR}/usr
  SBINDIR ?= $(PREFIX)/sbin
@@ -51,16 +51,16 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.70/restorecond/org.selinux.Restorecond.service
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/org.selinux.Restorecond.service	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-13 11:48:14.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.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.70/restorecond/restorecond.c
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.71/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/restorecond.c	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-13 11:48:14.000000000 -0400
 @@ -48,294 +48,37 @@
  #include <signal.h>
  #include <string.h>
@@ -173,7 +173,7 @@ diff --exclude-from=exclude --exclude=se
 -	}
 -	firstDir = NULL;
 -}
- 
+-
 -/* 
 -   Set the file context to the default file context for this system.
 -   Same as restorecon.
@@ -288,14 +288,11 @@ diff --exclude-from=exclude --exclude=se
 -   Files specified one per line.  Files with "~" will be expanded to the logged in users
 -   homedirs.
 -*/
-+static char *server_watch_file  = "/etc/selinux/restorecond.conf";
-+static char *user_watch_file  = "/etc/selinux/restorecond_user.conf";
-+static char *watch_file;
- 
+-
 -static void read_config(int fd)
 -{
 -	char *watch_file_path = "/etc/selinux/restorecond.conf";
--
+ 
 -	FILE *cfg = NULL;
 -	if (debug_mode)
 -		printf("Read Config\n");
@@ -314,7 +311,9 @@ diff --exclude-from=exclude --exclude=se
 -	if (master_wd == -1)
 -		exitApp("Error watching config file.");
 -}
-+#include <selinux/selinux.h>
++static char *server_watch_file  = "/etc/selinux/restorecond.conf";
++static char *user_watch_file  = "/etc/selinux/restorecond_user.conf";
++static char *watch_file;
  
 -/* 
 -   Inotify watch loop 
@@ -349,21 +348,22 @@ diff --exclude-from=exclude --exclude=se
 -				if (event->len)
 -					watch_list_find(event->wd, event->name);
 -				break;
--
++#include <selinux/selinux.h>
+ 
 -			case 1:	/* utmp has changed need to reload */
 -				read_config(fd);
 -				break;
--
--			default:	/* No users logged in or out */
--				break;
--			}
--		}
 +int debug_mode = 0;
 +int verbose_mode = 0;
 +int terminate = 0;
 +int master_wd = -1;
 +int run_as_user = 0;
  
+-			default:	/* No users logged in or out */
+-				break;
+-			}
+-		}
+-
 -		i += EVENT_SIZE + event->len;
 -	}
 -	return 0;
@@ -485,7 +485,7 @@ diff --exclude-from=exclude --exclude=se
  		case 'v':
  			verbose_mode = 1;
  			break;
-@@ -483,22 +168,40 @@
+@@ -483,20 +168,36 @@
  			usage(argv[0]);
  		}
  	}
@@ -525,13 +525,9 @@ diff --exclude-from=exclude --exclude=se
  	if (pidfile)
  		unlink(pidfile);
  
- 	return 0;
- }
-+
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.70/restorecond/restorecond.conf
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.70/restorecond/restorecond.conf	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-13 11:48:14.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -542,9 +538,9 @@ diff --exclude-from=exclude --exclude=se
  /root/.ssh/*
 -
 -
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.70/restorecond/restorecond.desktop
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.71/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/restorecond.desktop	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -553,9 +549,9 @@ diff --exclude-from=exclude --exclude=se
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.70/restorecond/restorecond.h
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.71/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.70/restorecond/restorecond.h	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-13 11:48:14.000000000 -0400
 @@ -24,7 +24,22 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -581,15 +577,15 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.70/restorecond/restorecond_user.conf
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/restorecond_user.conf	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.70/restorecond/user.c
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.71/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/user.c	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/user.c	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,220 @@
 +/*
 + * restorecond
@@ -811,9 +807,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.70/restorecond/walk.c
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.71/restorecond/walk.c
 --- nsapolicycoreutils/restorecond/walk.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/walk.c	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/walk.c	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,30 @@
 +#define _XOPEN_SOURCE 500
 +#include <ftw.h>
@@ -845,9 +841,9 @@ diff --exclude-from=exclude --exclude=se
 +    printf("Total Dirs %d\n",ctr);
 +    exit(EXIT_SUCCESS);
 +}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.70/restorecond/watch.c
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.71/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/restorecond/watch.c	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,346 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1195,9 +1191,21 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.70/scripts/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-13 11:48:14.000000000 -0400
+@@ -435,6 +435,8 @@
+                     continue
+     except ValueError, e:
+         error(e)
++    except OSError, e:
++        error(e)
+     
+     sys.exit(errors)
+     
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.71/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.70/scripts/Makefile	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-13 11:48:14.000000000 -0400
 @@ -5,11 +5,12 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1212,9 +1220,9 @@ diff --exclude-from=exclude --exclude=se
  	install -m 755 fixfiles $(DESTDIR)/sbin
  	install -m 755 genhomedircon  $(SBINDIR)
  	-mkdir -p $(MANDIR)/man8
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.70/scripts/sandbox
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.71/scripts/sandbox
 --- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/scripts/sandbox	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
@@ -1355,9 +1363,9 @@ diff --exclude-from=exclude --exclude=se
 +        error_exit(error.args[1])
 +        
 +    sys.exit(rc)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.70/scripts/sandbox.8
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.71/scripts/sandbox.8
 --- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/scripts/sandbox.8	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,22 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1381,9 +1389,9 @@ diff --exclude-from=exclude --exclude=se
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.70/scripts/sandbox.py
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.71/scripts/sandbox.py
 --- nsapolicycoreutils/scripts/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.70/scripts/sandbox.py	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-13 11:48:14.000000000 -0400
 @@ -0,0 +1,67 @@
 +#!/usr/bin/python
 +import os, sys, getopt, socket, random, fcntl
@@ -1452,9 +1460,9 @@ diff --exclude-from=exclude --exclude=se
 +    mount(mount_src, filecon)
 +    umount(filecon)
 +os.execvp(cmds[0], cmds)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.70/semanage/semanage
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.70/semanage/semanage	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage	2009-08-13 11:48:14.000000000 -0400
 @@ -44,16 +44,17 @@
                 text = _("""
  semanage [ -S store ] -i [ input_file | - ]
@@ -1508,17 +1516,16 @@ diff --exclude-from=exclude --exclude=se
  		valid_option["permissive"] = []
  		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
  		return valid_option
-@@ -192,7 +198,10 @@
+@@ -192,6 +198,9 @@
  		locallist = False
  		use_file = False
                  store = ""
 +                equal=""
- 			
++			
 +                dontaudit = ""
-+
+ 			
  		object = argv[0]
  		option_dict=get_options()
- 		if object not in option_dict.keys():
 @@ -201,10 +210,12 @@
  		args = argv[1:]
  
@@ -1533,23 +1540,13 @@ diff --exclude-from=exclude --exclude=se
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -241,16 +252,24 @@
- 				if modify or add:
-                                        raise ValueError(_("%s bad option") % o)
- 				delete = True
-+
- 			if o == "-D"  or o == "--deleteall":
- 				if modify:
-                                        raise ValueError(_("%s bad option") % o)
- 				deleteall = True
-+
+@@ -248,9 +261,15 @@
  			if o == "-f"  or o == "--ftype":
--				ftype=a
-+				ftype = a
-+
+ 				ftype=a
+ 
 +			if o == "-e"  or o == "--equal":
 +				equal = a
- 
++
  			if o == "-F"  or o == "--file":
  				use_file = True
  
@@ -1559,16 +1556,16 @@ diff --exclude-from=exclude --exclude=se
  			if o == "-h" or o == "--help":
                                 raise ValueError(_("%s bad option") % o)
  
-@@ -323,6 +342,9 @@
- 		
+@@ -324,6 +343,9 @@
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
-+
+ 		
 +		if object == "module":
 +			OBJECT = seobject.moduleRecords(store)
- 		
++		
  		if object == "translation":
  			OBJECT = seobject.setransRecords()
+ 		
 @@ -341,6 +363,13 @@
  			OBJECT.deleteall()
                          return
@@ -1594,9 +1591,8 @@ diff --exclude-from=exclude --exclude=se
  				OBJECT.add(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
--				OBJECT.add(target, setype, ftype, serange, seuser)
 +                                if equal == "":
-+                                       OBJECT.add(target, setype, ftype, serange, seuser)
+ 				OBJECT.add(target, setype, ftype, serange, seuser)
 +                                else:
 +                                       OBJECT.add_equal(target, equal)
  			if object == "permissive":
@@ -1616,26 +1612,16 @@ diff --exclude-from=exclude --exclude=se
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
--				OBJECT.modify(target, setype, ftype, serange, seuser)
 +                                if equal == "":
-+                                       OBJECT.modify(target, setype, ftype, serange, seuser)
+ 				OBJECT.modify(target, setype, ftype, serange, seuser)
 +                                else:
 +                                       OBJECT.modify_equal(target, equal)
  
                          return
  
-@@ -405,7 +446,7 @@
- 				OBJECT.delete(target, proto)
- 
- 			elif object == "fcontext":
--				OBJECT.delete(target, ftype)
-+                                OBJECT.delete(target, ftype)
- 
- 			elif object == "node":
- 				OBJECT.delete(target, mask, proto)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.70/semanage/semanage.8
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.71/semanage/semanage.8
 --- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.70/semanage/semanage.8	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage.8	2009-08-13 11:48:14.000000000 -0400
 @@ -21,6 +21,8 @@
  .br
  .B semanage permissive \-{a|d} type
@@ -1645,9 +1631,9 @@ diff --exclude-from=exclude --exclude=se
  .B semanage translation \-{a|d|m} [\-T] level
  .P
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.70/semanage/seobject.py
+diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.71/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.70/semanage/seobject.py	2009-08-05 15:24:16.000000000 -0400
++++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-13 11:48:14.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 
@@ -1655,93 +1641,15 @@ diff --exclude-from=exclude --exclude=se
  # see file 'COPYING' for use and warranty information
  #
  # semanage is a tool for managing SELinux configuration files
-@@ -21,16 +21,16 @@
+@@ -21,7 +21,7 @@
  #
  #  
  
 -import pwd, grp, string, selinux, tempfile, os, re, sys
 +import pwd, grp, string, selinux, tempfile, os, re, sys, stat
  from semanage import *;
--PROGNAME="policycoreutils"
-+PROGNAME = "policycoreutils"
+ PROGNAME="policycoreutils"
  import sepolgen.module as module
- 
- import gettext
- gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
- gettext.textdomain(PROGNAME)
- try:
--       gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
-+       gettext.install(PROGNAME, localedir = "/usr/share/locale", unicode = 1)
- except IOError:
-        import __builtin__
-        __builtin__.__dict__['_'] = unicode
-@@ -96,7 +96,7 @@
- 			self.audit_fd = audit.audit_open()
- 
- 		def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
--			audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],str(msg), name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
-+			audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0], str(msg), name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
- except:
- 	class logger:
- 		def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
-@@ -104,7 +104,7 @@
- 				message = "Successful: "
- 			else:
- 				message = "Failed: "
--			message += " %s name=%s" % (msg,name)
-+			message += " %s name=%s" % (msg, name)
- 			if sename != "":
- 				message += " sename=" + sename
- 			if old_sename != "":
-@@ -123,9 +123,9 @@
- 
- import xml.etree.ElementTree
- 
--booleans_dict={}
-+booleans_dict = {}
- try:
--       tree=xml.etree.ElementTree.parse("/usr/share/selinux/devel/policy.xml")
-+       tree = xml.etree.ElementTree.parse("/usr/share/selinux/devel/policy.xml")
-        for l in  tree.findall("layer"):
-               for m in  l.findall("module"):
-                      for b in  m.findall("tunable"):
-@@ -160,12 +160,12 @@
- 	cat_range = category + "(\." + category +")?"
- 	categories = cat_range + "(\," + cat_range + ")*"
- 	reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?"
--	return re.search("^" + reg +"$",raw)
-+	return re.search("^" + reg +"$", raw)
- 
- def translate(raw, prepend = 1):
--        filler="a:b:c:"
-+        filler = "a:b:c:"
-         if prepend == 1:
--		context = "%s%s" % (filler,raw)
-+		context = "%s%s" % (filler, raw)
- 	else:
- 		context = raw
- 	(rc, trans) = selinux.selinux_raw_to_trans_context(context)
-@@ -179,9 +179,9 @@
- 		return trans
- 	
- def untranslate(trans, prepend = 1):
--        filler="a:b:c:"
-+        filler = "a:b:c:"
-  	if prepend == 1:
--		context = "%s%s" % (filler,trans)
-+		context = "%s%s" % (filler, trans)
- 	else:
- 		context = trans
- 
-@@ -234,7 +234,7 @@
- 			rec += "%s=%s\n" %  (k, self.ddict[k])
- 		return rec
- 	
--	def list(self,heading = 1, locallist = 0):
-+	def list(self, heading = 1, locallist = 0):
- 		if heading:
- 			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
- 		keys = self.ddict.keys()
 @@ -273,6 +273,7 @@
  		(fd, newfilename) = tempfile.mkstemp('', self.filename)
  		os.write(fd, self.out())
@@ -1750,15 +1658,6 @@ diff --exclude-from=exclude --exclude=se
  		os.rename(newfilename, self.filename)
                  os.system("/sbin/service mcstrans reload > /dev/null")
  
-@@ -283,7 +284,7 @@
-                if handle != None:
-                       self.sh = handle
-                else:
--                      self.sh=get_handle(store)
-+                      self.sh = get_handle(store)
-                self.transaction = False
- 
-         def deleteall(self):
 @@ -314,6 +315,49 @@
                 self.transaction = False
                 self.commit()
@@ -1809,254 +1708,6 @@ diff --exclude-from=exclude --exclude=se
  class permissiveRecords(semanageRecords):
  	def __init__(self, store):
                 semanageRecords.__init__(self, store)
-@@ -331,7 +375,7 @@
-                              l.append(name.split("permissive_")[1])
-                return l
- 
--	def list(self,heading = 1, locallist = 0):
-+	def list(self, heading = 1, locallist = 0):
- 		if heading:
- 			print "\n%-25s\n" % (_("Permissive Types"))
-                 for t in self.get_all():
-@@ -353,7 +397,7 @@
- 
- permissive %s;
- """ % (name, type, type)
--               fd = open(filename,'w')
-+               fd = open(filename, 'w')
-                fd.write(modtxt)
-                fd.close()
-                mc = module.ModuleCompiler()
-@@ -366,7 +410,7 @@
-                if rc >= 0:
-                       self.commit()
- 
--               for root, dirs, files in os.walk("tmp", topdown=False):
-+               for root, dirs, files in os.walk("tmp", topdown = False):
-                       for name in files:
-                              os.remove(os.path.join(root, name))
-                       for name in dirs:
-@@ -405,11 +449,11 @@
- 		if sename == "":
- 			sename = "user_u"
- 			
--		(rc,k) = semanage_seuser_key_create(self.sh, name)
-+		(rc, k) = semanage_seuser_key_create(self.sh, name)
- 		if rc < 0:
- 			raise ValueError(_("Could not create a key for %s") % name)
- 
--		(rc,exists) = semanage_seuser_exists(self.sh, k)
-+		(rc, exists) = semanage_seuser_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
- 		if exists:
-@@ -425,7 +469,7 @@
-                        except:
-                               raise ValueError(_("Linux User %s does not exist") % name)
- 
--                (rc,u) = semanage_seuser_create(self.sh)
-+                (rc, u) = semanage_seuser_create(self.sh)
-                 if rc < 0:
-                        raise ValueError(_("Could not create login mapping for %s") % name)
- 
-@@ -465,17 +509,17 @@
-                if sename == "" and serange == "":
-                       raise ValueError(_("Requires seuser or serange"))
- 
--               (rc,k) = semanage_seuser_key_create(self.sh, name)
-+               (rc, k) = semanage_seuser_key_create(self.sh, name)
-                if rc < 0:
-                       raise ValueError(_("Could not create a key for %s") % name)
- 
--               (rc,exists) = semanage_seuser_exists(self.sh, k)
-+               (rc, exists) = semanage_seuser_exists(self.sh, k)
-                if rc < 0:
-                       raise ValueError(_("Could not check if login mapping for %s is defined") % name)
-                if not exists:
-                       raise ValueError(_("Login mapping for %s is not defined") % name)
- 
--               (rc,u) = semanage_seuser_query(self.sh, k)
-+               (rc, u) = semanage_seuser_query(self.sh, k)
-                if rc < 0:
-                       raise ValueError(_("Could not query seuser for %s") % name)
- 
-@@ -498,7 +542,7 @@
-                semanage_seuser_key_free(k)
-                semanage_seuser_free(u)
- 
--               mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
-+               mylog.log(1, "modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
- 
- 	def modify(self, name, sename = "", serange = ""):
- 		try:
-@@ -507,21 +551,21 @@
-                         self.commit()
- 
- 		except ValueError, error:
--			mylog.log(0,"modify selinux user mapping", name, sename,"", serange, "", "", "");
-+			mylog.log(0, "modify selinux user mapping", name, sename, "", serange, "", "", "");
- 			raise error
- 		
- 	def __delete(self, name):
--               (rc,k) = semanage_seuser_key_create(self.sh, name)
-+               (rc, k) = semanage_seuser_key_create(self.sh, name)
-                if rc < 0:
-                       raise ValueError(_("Could not create a key for %s") % name)
- 
--               (rc,exists) = semanage_seuser_exists(self.sh, k)
-+               (rc, exists) = semanage_seuser_exists(self.sh, k)
-                if rc < 0:
-                       raise ValueError(_("Could not check if login mapping for %s is defined") % name)
-                if not exists:
-                       raise ValueError(_("Login mapping for %s is not defined") % name)
- 
--               (rc,exists) = semanage_seuser_exists_local(self.sh, k)
-+               (rc, exists) = semanage_seuser_exists_local(self.sh, k)
-                if rc < 0:
-                       raise ValueError(_("Could not check if login mapping for %s is defined") % name)
-                if not exists:
-@@ -540,10 +584,10 @@
-                        self.commit()
- 
- 		except ValueError, error:
--			mylog.log(0,"delete SELinux user mapping", name);
-+			mylog.log(0, "delete SELinux user mapping", name);
- 			raise error
- 		
--		mylog.log(1,"delete SELinux user mapping", name);
-+		mylog.log(1, "delete SELinux user mapping", name);
- 
- 	def get_all(self, locallist = 0):
- 		ddict = {}
-@@ -593,17 +637,17 @@
-                 if len(roles) < 1:
-                        raise ValueError(_("You must add at least one role for %s") % name)
-                        
--                (rc,k) = semanage_user_key_create(self.sh, name)
-+                (rc, k) = semanage_user_key_create(self.sh, name)
-                 if rc < 0:
-                        raise ValueError(_("Could not create a key for %s") % name)
- 
--                (rc,exists) = semanage_user_exists(self.sh, k)
-+                (rc, exists) = semanage_user_exists(self.sh, k)
-                 if rc < 0:
-                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
-                 if exists:
-                        raise ValueError(_("SELinux user %s is already defined") % name)
- 
--                (rc,u) = semanage_user_create(self.sh)
-+                (rc, u) = semanage_user_create(self.sh)
-                 if rc < 0:
-                        raise ValueError(_("Could not create SELinux user for %s") % name)
- 
-@@ -627,7 +671,7 @@
-                 rc = semanage_user_set_prefix(self.sh, u, prefix)
-                 if rc < 0:
-                        raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
--                (rc,key) = semanage_user_key_extract(self.sh,u)
-+                (rc, key) = semanage_user_key_extract(self.sh,u)
-                 if rc < 0:
-                        raise ValueError(_("Could not extract key for %s") % name)
- 
-@@ -660,17 +704,17 @@
-                        else:
-                               raise ValueError(_("Requires prefix or roles"))
- 
--                (rc,k) = semanage_user_key_create(self.sh, name)
-+                (rc, k) = semanage_user_key_create(self.sh, name)
-                 if rc < 0:
-                        raise ValueError(_("Could not create a key for %s") % name)
- 
--                (rc,exists) = semanage_user_exists(self.sh, k)
-+                (rc, exists) = semanage_user_exists(self.sh, k)
-                 if rc < 0:
-                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
-                 if not exists:
-                        raise ValueError(_("SELinux user %s is not defined") % name)
- 
--                (rc,u) = semanage_user_query(self.sh, k)
-+                (rc, u) = semanage_user_query(self.sh, k)
-                 if rc < 0:
-                        raise ValueError(_("Could not query user for %s") % name)
- 
-@@ -718,17 +762,17 @@
- 			raise error
- 
- 	def __delete(self, name):
--               (rc,k) = semanage_user_key_create(self.sh, name)
-+               (rc, k) = semanage_user_key_create(self.sh, name)
-                if rc < 0:
-                       raise ValueError(_("Could not create a key for %s") % name)
- 			
--               (rc,exists) = semanage_user_exists(self.sh, k)
-+               (rc, exists) = semanage_user_exists(self.sh, k)
-                if rc < 0:
-                       raise ValueError(_("Could not check if SELinux user %s is defined") % name)		
-                if not exists:
-                       raise ValueError(_("SELinux user %s is not defined") % name)
- 
--               (rc,exists) = semanage_user_exists_local(self.sh, k)
-+               (rc, exists) = semanage_user_exists_local(self.sh, k)
-                if rc < 0:
-                       raise ValueError(_("Could not check if SELinux user %s is defined") % name)
-                if not exists:
-@@ -810,7 +854,7 @@
- 			low = int(ports[0])
- 			high = int(ports[1])
- 
--		(rc,k) = semanage_port_key_create(self.sh, low, high, proto_d)
-+		(rc, k) = semanage_port_key_create(self.sh, low, high, proto_d)
- 		if rc < 0:
- 			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
- 		return ( k, proto_d, low, high )
-@@ -827,13 +871,13 @@
- 
- 		( k, proto_d, low, high ) = self.__genkey(port, proto)			
- 
--		(rc,exists) = semanage_port_exists(self.sh, k)
-+		(rc, exists) = semanage_port_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
- 		if exists:
- 			raise ValueError(_("Port %s/%s already defined") % (proto, port))
- 
--		(rc,p) = semanage_port_create(self.sh)
-+		(rc, p) = semanage_port_create(self.sh)
- 		if rc < 0:
- 			raise ValueError(_("Could not create port for %s/%s") % (proto, port))
- 		
-@@ -886,13 +930,13 @@
- 
- 		( k, proto_d, low, high ) = self.__genkey(port, proto)
- 
--		(rc,exists) = semanage_port_exists(self.sh, k)
-+		(rc, exists) = semanage_port_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
- 		if not exists:
- 			raise ValueError(_("Port %s/%s is not defined") % (proto,port))
- 	
--		(rc,p) = semanage_port_query(self.sh, k)
-+		(rc, p) = semanage_port_query(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not query port %s/%s") % (proto, port))
- 
-@@ -941,13 +985,13 @@
- 
- 	def __delete(self, port, proto):
- 		( k, proto_d, low, high ) = self.__genkey(port, proto)
--		(rc,exists) = semanage_port_exists(self.sh, k)
-+		(rc, exists) = semanage_port_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
- 		if not exists:
- 			raise ValueError(_("Port %s/%s is not defined") % (proto, port))
- 		
--		(rc,exists) = semanage_port_exists_local(self.sh, k)
-+		(rc, exists) = semanage_port_exists_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
- 		if not exists:
 @@ -983,7 +1027,7 @@
  			proto_str = semanage_port_get_proto_str(proto)
  			low = semanage_port_get_low(port)
@@ -2066,132 +1717,6 @@ diff --exclude-from=exclude --exclude=se
  		return ddict
  
  	def get_all_by_type(self, locallist = 0):
-@@ -1053,17 +1097,17 @@
-                if ctype == "":
-                        raise ValueError(_("SELinux Type is required"))
- 
--               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
-+               (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
-                if rc < 0:
-                        raise ValueError(_("Could not create key for %s") % addr)
-                if rc < 0:
-                        raise ValueError(_("Could not check if addr %s is defined") % addr)
- 
--               (rc,exists) = semanage_node_exists(self.sh, k)
-+               (rc, exists) = semanage_node_exists(self.sh, k)
-                if exists:
-                        raise ValueError(_("Addr %s already defined") % addr)
- 
--               (rc,node) = semanage_node_create(self.sh)
-+               (rc, node) = semanage_node_create(self.sh)
-                if rc < 0:
-                        raise ValueError(_("Could not create addr for %s") % addr)
- 
-@@ -1128,17 +1172,17 @@
-                if serange == "" and setype == "":
-                        raise ValueError(_("Requires setype or serange"))
- 
--               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
-+               (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
-                if rc < 0:
-                        raise ValueError(_("Could not create key for %s") % addr)
- 
--               (rc,exists) = semanage_node_exists(self.sh, k)
-+               (rc, exists) = semanage_node_exists(self.sh, k)
-                if rc < 0:
-                        raise ValueError(_("Could not check if addr %s is defined") % addr)
-                if not exists:
-                        raise ValueError(_("Addr %s is not defined") % addr)
- 
--               (rc,node) = semanage_node_query(self.sh, k)
-+               (rc, node) = semanage_node_query(self.sh, k)
-                if rc < 0:
-                        raise ValueError(_("Could not query addr %s") % addr)
- 
-@@ -1175,17 +1219,17 @@
-                else:
-                       raise ValueError(_("Unknown or missing protocol"))
- 
--               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
-+               (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
-                if rc < 0:
-                        raise ValueError(_("Could not create key for %s") % addr)
- 
--               (rc,exists) = semanage_node_exists(self.sh, k)
-+               (rc, exists) = semanage_node_exists(self.sh, k)
-                if rc < 0:
-                        raise ValueError(_("Could not check if addr %s is defined") % addr)
-                if not exists:
-                        raise ValueError(_("Addr %s is not defined") % addr)
- 
--               (rc,exists) = semanage_node_exists_local(self.sh, k)
-+               (rc, exists) = semanage_node_exists_local(self.sh, k)
-                if rc < 0:
-                        raise ValueError(_("Could not check if addr %s is defined") % addr)
-                if not exists:
-@@ -1255,17 +1299,17 @@
- 		if ctype == "":
- 			raise ValueError(_("SELinux Type is required"))
- 
--		(rc,k) = semanage_iface_key_create(self.sh, interface)
-+		(rc, k) = semanage_iface_key_create(self.sh, interface)
- 		if rc < 0:
- 			raise ValueError(_("Could not create key for %s") % interface)
- 
--		(rc,exists) = semanage_iface_exists(self.sh, k)
-+		(rc, exists) = semanage_iface_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if interface %s is defined") % interface)
- 		if exists:
- 			raise ValueError(_("Interface %s already defined") % interface)
- 
--		(rc,iface) = semanage_iface_create(self.sh)
-+		(rc, iface) = semanage_iface_create(self.sh)
- 		if rc < 0:
- 			raise ValueError(_("Could not create interface for %s") % interface)
- 		
-@@ -1316,17 +1360,17 @@
- 		if serange == "" and setype == "":
- 			raise ValueError(_("Requires setype or serange"))
- 
--		(rc,k) = semanage_iface_key_create(self.sh, interface)
-+		(rc, k) = semanage_iface_key_create(self.sh, interface)
- 		if rc < 0:
- 			raise ValueError(_("Could not create key for %s") % interface)
- 
--		(rc,exists) = semanage_iface_exists(self.sh, k)
-+		(rc, exists) = semanage_iface_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if interface %s is defined") % interface)
- 		if not exists:
- 			raise ValueError(_("Interface %s is not defined") % interface)
- 	
--		(rc,iface) = semanage_iface_query(self.sh, k)
-+		(rc, iface) = semanage_iface_query(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not query interface %s") % interface)
- 
-@@ -1350,17 +1394,17 @@
-                 self.commit()
- 
- 	def __delete(self, interface):
--		(rc,k) = semanage_iface_key_create(self.sh, interface)
-+		(rc, k) = semanage_iface_key_create(self.sh, interface)
- 		if rc < 0:
- 			raise ValueError(_("Could not create key for %s") % interface)
- 
--		(rc,exists) = semanage_iface_exists(self.sh, k)
-+		(rc, exists) = semanage_iface_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if interface %s is defined") % interface)
- 		if not exists:
- 			raise ValueError(_("Interface %s is not defined") % interface)
- 
--		(rc,exists) = semanage_iface_exists_local(self.sh, k)
-+		(rc, exists) = semanage_iface_exists_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if interface %s is defined") % interface)
- 		if not exists:
 @@ -1408,6 +1452,48 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):
@@ -2241,101 +1766,23 @@ diff --exclude-from=exclude --exclude=se
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1444,23 +1530,23 @@
- 		if type == "":
- 			raise ValueError(_("SELinux Type is required"))
- 
--		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
-+		(rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
- 		if rc < 0:
- 			raise ValueError(_("Could not create key for %s") % target)
- 
--		(rc,exists) = semanage_fcontext_exists(self.sh, k)
-+		(rc, exists) = semanage_fcontext_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if file context for %s is defined") % target)
- 
- 		if not exists:
--                       (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
-+                       (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
-                        if rc < 0:
-                               raise ValueError(_("Could not check if file context for %s is defined") % target)
- 
-                 if exists:
-                        raise ValueError(_("File context for %s already defined") % target)
- 
--		(rc,fcontext) = semanage_fcontext_create(self.sh)
-+		(rc, fcontext) = semanage_fcontext_create(self.sh)
- 		if rc < 0:
- 			raise ValueError(_("Could not create file context for %s") % target)
- 		
-@@ -1501,21 +1587,21 @@
- 			raise ValueError(_("Requires setype, serange or seuser"))
-                 self.validate(target)
- 
--		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
-+		(rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
- 		if rc < 0:
- 			raise ValueError(_("Could not create a key for %s") % target)
- 
--		(rc,exists) = semanage_fcontext_exists(self.sh, k)
-+		(rc, exists) = semanage_fcontext_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if file context for %s is defined") % target)
- 		if not exists:
--                       (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
-+                       (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
-                        if not exists:
-                               raise ValueError(_("File context for %s is not defined") % target)
- 		
--		(rc,fcontext) = semanage_fcontext_query_local(self.sh, k)
-+		(rc, fcontext) = semanage_fcontext_query_local(self.sh, k)
- 		if rc < 0:
--                       (rc,fcontext) = semanage_fcontext_query(self.sh, k)
-+                       (rc, fcontext) = semanage_fcontext_query(self.sh, k)
-                        if rc < 0:
-                               raise ValueError(_("Could not query file context for %s") % target)
- 
-@@ -1565,7 +1651,7 @@
-                        target = semanage_fcontext_get_expr(fcontext)
-                        ftype = semanage_fcontext_get_type(fcontext)
-                        ftype_str = semanage_fcontext_get_type_str(ftype)
--                       (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
-+                       (rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
-                        if rc < 0:
-                               raise ValueError(_("Could not create a key for %s") % target)
- 
-@@ -1573,19 +1659,26 @@
-                        if rc < 0:
+@@ -1574,9 +1660,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
--	
-+
+ 	
 +                self.equiv = {}
 +                self.equal_ind = True
                  self.commit()
  
  	def __delete(self, target, ftype):
--		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
 +                if target in self.equiv.keys():
 +                       self.equiv.pop(target)
 +                       self.equal_ind = True
 +                       return
 +
-+		(rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ 		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
- 
--		(rc,exists) = semanage_fcontext_exists_local(self.sh, k)
-+		(rc, exists) = semanage_fcontext_exists_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if file context for %s is defined") % target)
- 		if not exists:
--			(rc,exists) = semanage_fcontext_exists(self.sh, k)
-+			(rc, exists) = semanage_fcontext_exists(self.sh, k)
- 			if rc < 0:
- 				raise ValueError(_("Could not check if file context for %s is defined") % target)
- 			if exists:
 @@ -1632,11 +1725,11 @@
  		return ddict
  			
@@ -2350,7 +1797,7 @@ diff --exclude-from=exclude --exclude=se
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1645,11 +1738,17 @@
+@@ -1645,6 +1738,12 @@
  					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
  			else:
  				print "%-50s %-18s <<None>>" % (k[0], k[1])
@@ -2363,108 +1810,3 @@ diff --exclude-from=exclude --exclude=se
  				
  class booleanRecords(semanageRecords):
  	def __init__(self, store = ""):
- 		semanageRecords.__init__(self, store)
--                self.dict={}
-+                self.dict = {}
-                 self.dict["TRUE"] = 1
-                 self.dict["FALSE"] = 0
-                 self.dict["ON"] = 1
-@@ -1658,16 +1757,16 @@
-                 self.dict["0"] = 0
- 
- 	def __mod(self, name, value):
--                (rc,k) = semanage_bool_key_create(self.sh, name)
-+                (rc, k) = semanage_bool_key_create(self.sh, name)
-                 if rc < 0:
-                        raise ValueError(_("Could not create a key for %s") % name)
--                (rc,exists) = semanage_bool_exists(self.sh, k)
-+                (rc, exists) = semanage_bool_exists(self.sh, k)
-                 if rc < 0:
-                        raise ValueError(_("Could not check if boolean %s is defined") % name)
-                 if not exists:
-                        raise ValueError(_("Boolean %s is not defined") % name)	
-                 
--                (rc,b) = semanage_bool_query(self.sh, k)
-+                (rc, b) = semanage_bool_query(self.sh, k)
-                 if rc < 0:
-                        raise ValueError(_("Could not query file context %s") % name)
- 
-@@ -1685,7 +1784,7 @@
- 		semanage_bool_key_free(k)
- 		semanage_bool_free(b)
- 
--	def modify(self, name, value=None, use_file=False):
-+	def modify(self, name, value = None, use_file = False):
-                 
-                 self.begin()
- 
-@@ -1709,16 +1808,16 @@
- 		
- 	def __delete(self, name):
- 
--                (rc,k) = semanage_bool_key_create(self.sh, name)
-+                (rc, k) = semanage_bool_key_create(self.sh, name)
-                 if rc < 0:
-                       raise ValueError(_("Could not create a key for %s") % name)
--		(rc,exists) = semanage_bool_exists(self.sh, k)
-+		(rc, exists) = semanage_bool_exists(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if boolean %s is defined") % name)
- 		if not exists:
- 			raise ValueError(_("Boolean %s is not defined") % name)
- 	
--		(rc,exists) = semanage_bool_exists_local(self.sh, k)
-+		(rc, exists) = semanage_bool_exists_local(self.sh, k)
- 		if rc < 0:
- 			raise ValueError(_("Could not check if boolean %s is defined") % name)
- 		if not exists:
-@@ -1777,7 +1876,7 @@
-                       return _("unknown")
- 
- 	def list(self, heading = True, locallist = False, use_file = False):
--                on_off = (_("off"),_("on")) 
-+                on_off = (_("off"), _("on")) 
- 		if use_file:
-                        ddict = self.get_all(locallist)
-                        keys = ddict.keys()
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.70/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-08-05 15:10:56.000000000 -0400
-+++ policycoreutils-2.0.70/setfiles/setfiles.c	2009-08-10 11:06:54.000000000 -0400
-@@ -234,7 +234,7 @@
- 	fl_head = NULL;
- }
- 
--static int add_exclude(const char *directory)
-+static int add_exclude(const char *directory, int warn)
- {
- 	struct stat sb;
- 	size_t len = 0;
-@@ -244,8 +244,8 @@
- 		return 1;
- 	}
- 	if (lstat(directory, &sb)) {
--		fprintf(stderr, "Can't stat directory \"%s\", %s.\n",
--			directory, strerror(errno));
-+		if (warn) fprintf(stderr, "Can't stat directory \"%s\", %s.\n",
-+				directory, strerror(errno));
- 		return 0;
- 	}
- 	if ((sb.st_mode & S_IFDIR) == 0) {
-@@ -727,7 +727,7 @@
- 
- 		/* exclude mount points without the seclabel option */
- 		if (!found)
--			add_exclude(mount_info[1]);
-+			add_exclude(mount_info[1], 0);
- 	}
- 
- 	free(buf);
-@@ -840,7 +840,7 @@
- 			}
- 		case 'e':
- 			remove_exclude(optarg);
--			if (add_exclude(optarg))
-+			if (add_exclude(optarg, 1))
- 				exit(1);
- 			break;
- 		case 'f':


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -p -r1.618 -r1.619
--- policycoreutils.spec	10 Aug 2009 15:26:45 -0000	1.618
+++ policycoreutils.spec	13 Aug 2009 15:51:54 -0000	1.619
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.16
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.70
-Release: 2%{?dist}
+Version: 2.0.71
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -266,6 +266,15 @@ else
 fi
 
 %changelog
+* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-1
+- Fix chcat to report error on non existing file
+- Update to upstream
+	* Modify setfiles/restorecon checking of exclude paths.  Only check
+	user-supplied exclude paths (not automatically generated ones based on
+	lack of seclabel support), don't require them to be directories, and
+	ignore permission denied errors on them (it is ok to exclude a path to
+	which the caller lacks permission).
+
 * Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 2.0.70-2
 - Don't warn if the user did not specify the exclude if root can not stat file system
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- sources	9 Aug 2009 13:35:33 -0000	1.205
+++ sources	13 Aug 2009 15:51:54 -0000	1.206
@@ -1,3 +1,2 @@
 e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
-8c4c0c43a9b6c3865e2a8b8bdd222f90  policycoreutils-2.0.70.tgz
-4c24e437f254291bc6d1378ee5a5712c  policycoreutils_man_ru2.tar.bz2
+00fd9d86bd6a8066da710d6fda910b01  policycoreutils-2.0.71.tgz



From mso at fedoraproject.org  Thu Aug 13 16:00:41 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 13 Aug 2009 16:00:41 +0000 (UTC)
Subject: rpms/ruby-icon-artist/F-10 .cvsignore, 1.2,
	1.3 ruby-icon-artist.spec, 
	1.1, 1.2 sources, 1.2, 1.3 ruby-icon-artist-iconname.patch, 1.1, NONE
Message-ID: <20090813160041.4FDC511C0097@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29394/F-10

Modified Files:
	.cvsignore ruby-icon-artist.spec sources 
Removed Files:
	ruby-icon-artist-iconname.patch 
Log Message:


New upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 15:34:52 -0000	1.2
+++ .cvsignore	13 Aug 2009 16:00:40 -0000	1.3
@@ -1 +1 @@
-icon-artist-0.1.90.tar.bz2
+icon-artist-0.1.91.tar.bz2


Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-10/ruby-icon-artist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-icon-artist.spec	14 Jul 2009 15:34:52 -0000	1.1
+++ ruby-icon-artist.spec	13 Aug 2009 16:00:41 -0000	1.2
@@ -1,16 +1,15 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 Name:           ruby-icon-artist
-Version:        0.1.90
-Release:        2%{?dist}
+Version:        0.1.91
+Release:        1%{?dist}
 Summary:        Supporting libraries for icon artists
 
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            https://fedorahosted.org/echo-icon-theme/
-Source0:        https://fedorahosted.org/releases/e/c/echo-icon-theme/icon-artist-%{version}.tar.bz2
-Patch0:         %{name}-iconname.patch
+Source0:        https://fedorahosted.org/released/echo-icon-theme/icon-artist-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,6 +17,7 @@ BuildRequires:  ruby
 Requires:       ruby(abi) = 1.8
 Requires:       rubygem(git)
 Requires:       inkscape
+Requires:       icon-naming-utils
 Provides:       ruby(icon-artist) = %{version}
 
 %description
@@ -27,7 +27,6 @@ SVG, creating new icon theme and managin
 
 %prep
 %setup -q -n icon-artist-%{version}
-%patch0 -p1 -b .iconname
 
 
 %build
@@ -52,6 +51,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.91-1
+- New upstream release
+- Patch upstreamed
+- Add icon-naming-utils dependency
+
 * Mon Jul 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.90-2
 - Backport fix for correct checking of icon name from git
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 15:34:52 -0000	1.2
+++ sources	13 Aug 2009 16:00:41 -0000	1.3
@@ -1 +1 @@
-f5ebfea7ab6ecd4d97b1953f6cb53e97  icon-artist-0.1.90.tar.bz2
+035ad38e5fa0b5594274e77a8109306d  icon-artist-0.1.91.tar.bz2


--- ruby-icon-artist-iconname.patch DELETED ---



From mso at fedoraproject.org  Thu Aug 13 16:00:41 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 13 Aug 2009 16:00:41 +0000 (UTC)
Subject: rpms/ruby-icon-artist/F-11 .cvsignore, 1.2,
	1.3 ruby-icon-artist.spec, 
	1.1, 1.2 sources, 1.2, 1.3 ruby-icon-artist-iconname.patch, 1.1, NONE
Message-ID: <20090813160041.920F511C0097@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29394/F-11

Modified Files:
	.cvsignore ruby-icon-artist.spec sources 
Removed Files:
	ruby-icon-artist-iconname.patch 
Log Message:


New upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 15:34:53 -0000	1.2
+++ .cvsignore	13 Aug 2009 16:00:41 -0000	1.3
@@ -1 +1 @@
-icon-artist-0.1.90.tar.bz2
+icon-artist-0.1.91.tar.bz2


Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/ruby-icon-artist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-icon-artist.spec	14 Jul 2009 15:34:53 -0000	1.1
+++ ruby-icon-artist.spec	13 Aug 2009 16:00:41 -0000	1.2
@@ -1,16 +1,15 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 Name:           ruby-icon-artist
-Version:        0.1.90
-Release:        2%{?dist}
+Version:        0.1.91
+Release:        1%{?dist}
 Summary:        Supporting libraries for icon artists
 
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            https://fedorahosted.org/echo-icon-theme/
-Source0:        https://fedorahosted.org/releases/e/c/echo-icon-theme/icon-artist-%{version}.tar.bz2
-Patch0:         %{name}-iconname.patch
+Source0:        https://fedorahosted.org/released/echo-icon-theme/icon-artist-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,6 +17,7 @@ BuildRequires:  ruby
 Requires:       ruby(abi) = 1.8
 Requires:       rubygem(git)
 Requires:       inkscape
+Requires:       icon-naming-utils
 Provides:       ruby(icon-artist) = %{version}
 
 %description
@@ -27,7 +27,6 @@ SVG, creating new icon theme and managin
 
 %prep
 %setup -q -n icon-artist-%{version}
-%patch0 -p1 -b .iconname
 
 
 %build
@@ -52,6 +51,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.91-1
+- New upstream release
+- Patch upstreamed
+- Add icon-naming-utils dependency
+
 * Mon Jul 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.90-2
 - Backport fix for correct checking of icon name from git
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 15:34:53 -0000	1.2
+++ sources	13 Aug 2009 16:00:41 -0000	1.3
@@ -1 +1 @@
-f5ebfea7ab6ecd4d97b1953f6cb53e97  icon-artist-0.1.90.tar.bz2
+035ad38e5fa0b5594274e77a8109306d  icon-artist-0.1.91.tar.bz2


--- ruby-icon-artist-iconname.patch DELETED ---



From mso at fedoraproject.org  Thu Aug 13 16:00:41 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 13 Aug 2009 16:00:41 +0000 (UTC)
Subject: rpms/ruby-icon-artist/devel .cvsignore, 1.2,
	1.3 ruby-icon-artist.spec, 
	1.3, 1.4 sources, 1.2, 1.3 ruby-icon-artist-iconname.patch, 1.1, NONE
Message-ID: <20090813160041.DB8A411C0097@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29394/devel

Modified Files:
	.cvsignore ruby-icon-artist.spec sources 
Removed Files:
	ruby-icon-artist-iconname.patch 
Log Message:


New upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jul 2009 18:44:29 -0000	1.2
+++ .cvsignore	13 Aug 2009 16:00:41 -0000	1.3
@@ -1 +1 @@
-icon-artist-0.1.90.tar.bz2
+icon-artist-0.1.91.tar.bz2


Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/ruby-icon-artist.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ruby-icon-artist.spec	27 Jul 2009 03:21:52 -0000	1.3
+++ ruby-icon-artist.spec	13 Aug 2009 16:00:41 -0000	1.4
@@ -1,16 +1,15 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 Name:           ruby-icon-artist
-Version:        0.1.90
-Release:        3%{?dist}
+Version:        0.1.91
+Release:        1%{?dist}
 Summary:        Supporting libraries for icon artists
 
 Group:          Development/Languages
 
 License:        LGPLv2+
 URL:            https://fedorahosted.org/echo-icon-theme/
-Source0:        https://fedorahosted.org/releases/e/c/echo-icon-theme/icon-artist-%{version}.tar.bz2
-Patch0:         %{name}-iconname.patch
+Source0:        https://fedorahosted.org/released/echo-icon-theme/icon-artist-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,6 +17,7 @@ BuildRequires:  ruby
 Requires:       ruby(abi) = 1.8
 Requires:       rubygem(git)
 Requires:       inkscape
+Requires:       icon-naming-utils
 Provides:       ruby(icon-artist) = %{version}
 
 %description
@@ -27,7 +27,6 @@ SVG, creating new icon theme and managin
 
 %prep
 %setup -q -n icon-artist-%{version}
-%patch0 -p1 -b .iconname
 
 
 %build
@@ -52,8 +51,10 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.90-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Aug 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.91-1
+- New upstream release
+- Patch upstreamed
+- Add icon-naming-utils dependency
 
 * Mon Jul 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.90-2
 - Backport fix for correct checking of icon name from git


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2009 18:44:29 -0000	1.2
+++ sources	13 Aug 2009 16:00:41 -0000	1.3
@@ -1 +1 @@
-f5ebfea7ab6ecd4d97b1953f6cb53e97  icon-artist-0.1.90.tar.bz2
+035ad38e5fa0b5594274e77a8109306d  icon-artist-0.1.91.tar.bz2


--- ruby-icon-artist-iconname.patch DELETED ---



From thm at fedoraproject.org  Thu Aug 13 16:03:09 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 13 Aug 2009 16:03:09 +0000 (UTC)
Subject: rpms/botan/F-11 .cvsignore, 1.5, 1.6 botan.spec, 1.7, 1.8 import.log,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090813160309.C090D11C0097@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29888/F-11

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 18:11:32 -0000	1.5
+++ .cvsignore	13 Aug 2009 16:03:09 -0000	1.6
@@ -1 +1 @@
-Botan-1.8.5.tbz
+Botan-1.8.6.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/botan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- botan.spec	12 Aug 2009 18:11:32 -0000	1.7
+++ botan.spec	13 Aug 2009 16:03:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,6 +110,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.6-1
+- Update to 1.8.6, which contains new features as well as bugfixes,
+  e.g. concerning the /proc-walking entropy source.
+
 * Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-2
 - Fix changelog.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	12 Aug 2009 18:11:32 -0000	1.5
+++ import.log	13 Aug 2009 16:03:09 -0000	1.6
@@ -3,3 +3,4 @@ botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc
 botan-1_8_1-4_fc10:HEAD:botan-1.8.1-4.fc10.src.rpm:1237195036
 botan-1_8_2-1_fc12:F-11:botan-1.8.2-1.fc12.src.rpm:1242458388
 botan-1_8_5-2_fc11:F-11:botan-1.8.5-2.fc11.src.rpm:1250100575
+botan-1_8_6-1_fc11:F-11:botan-1.8.6-1.fc11.src.rpm:1250179358


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 18:11:32 -0000	1.5
+++ sources	13 Aug 2009 16:03:09 -0000	1.6
@@ -1 +1 @@
-6c0943fa4282bd57a23316c6d3c21279  Botan-1.8.5.tbz
+827f71f450eb1b7bc9e173c402bc48dc  Botan-1.8.6.tbz



From thm at fedoraproject.org  Thu Aug 13 16:05:05 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 13 Aug 2009 16:05:05 +0000 (UTC)
Subject: rpms/botan/F-10 .cvsignore, 1.5, 1.6 botan.spec, 1.5, 1.6 import.log,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090813160505.438BF11C0097@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30365/F-10

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 18:32:48 -0000	1.5
+++ .cvsignore	13 Aug 2009 16:05:04 -0000	1.6
@@ -1 +1 @@
-Botan-1.8.5.tbz
+Botan-1.8.6.tbz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/botan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- botan.spec	12 Aug 2009 18:32:48 -0000	1.5
+++ botan.spec	13 Aug 2009 16:05:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.5
-Release:        2%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,6 +110,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.6-1
+- Update to 1.8.6, which contains new features as well as bugfixes,
+  e.g. concerning the /proc-walking entropy source.
+
 * Wed Aug 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.5-2
 - Fix changelog.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	12 Aug 2009 18:32:48 -0000	1.5
+++ import.log	13 Aug 2009 16:05:04 -0000	1.6
@@ -3,3 +3,4 @@ botan-1_8_1-1_fc10:F-10:botan-1.8.1-1.fc
 botan-1_8_1-4_fc10:F-10:botan-1.8.1-4.fc10.src.rpm:1237195879
 botan-1_8_2-1_fc12:F-10:botan-1.8.2-1.fc12.src.rpm:1242459647
 botan-1_8_5-2_fc11:F-10:botan-1.8.5-2.fc11.src.rpm:1250101840
+botan-1_8_6-1_fc11:F-10:botan-1.8.6-1.fc11.src.rpm:1250179466


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 18:32:48 -0000	1.5
+++ sources	13 Aug 2009 16:05:05 -0000	1.6
@@ -1 +1 @@
-6c0943fa4282bd57a23316c6d3c21279  Botan-1.8.5.tbz
+827f71f450eb1b7bc9e173c402bc48dc  Botan-1.8.6.tbz



From berrange at fedoraproject.org  Thu Aug 13 16:07:23 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Thu, 13 Aug 2009 16:07:23 +0000 (UTC)
Subject: rpms/libvirt/F-11 libvirt-0.6.2-numa-ignore-fail.patch, NONE,
	1.1 libvirt.spec, 1.136, 1.137
Message-ID: <20090813160723.A409F11C0097@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30818

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.2-numa-ignore-fail.patch 
Log Message:
Log and ignore NUMA topology problems (rhbz #506590)

libvirt-0.6.2-numa-ignore-fail.patch:
 capabilities.c       |   16 +++++++++++++---
 capabilities.h       |    3 +++
 libvirt_private.syms |    1 +
 lxc_conf.c           |   11 +++++++++--
 qemu_conf.c          |   10 ++++++++--
 uml_conf.c           |   11 +++++++++--
 6 files changed, 43 insertions(+), 9 deletions(-)

--- NEW FILE libvirt-0.6.2-numa-ignore-fail.patch ---
diff -rup libvirt-0.6.2.orig/src/capabilities.c libvirt-0.6.2.new/src/capabilities.c
--- libvirt-0.6.2.orig/src/capabilities.c	2009-03-24 12:31:01.000000000 +0000
+++ libvirt-0.6.2.new/src/capabilities.c	2009-08-13 12:10:57.000000000 +0100
@@ -122,6 +122,18 @@ virCapabilitiesFreeGuest(virCapsGuestPtr
 }
 
 
+void
+virCapabilitiesFreeNUMAInfo(virCapsPtr caps)
+{
+    int i;
+
+    for (i = 0 ; i < caps->host.nnumaCell ; i++)
+        virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
+    VIR_FREE(caps->host.numaCell);
+    caps->host.nnumaCell = 0;
+}
+
+
 /**
  * virCapabilitiesFree:
  * @caps: object to free
@@ -141,9 +153,7 @@ virCapabilitiesFree(virCapsPtr caps) {
     for (i = 0 ; i < caps->host.nfeatures ; i++)
         VIR_FREE(caps->host.features[i]);
     VIR_FREE(caps->host.features);
-    for (i = 0 ; i < caps->host.nnumaCell ; i++)
-        virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
-    VIR_FREE(caps->host.numaCell);
+    virCapabilitiesFreeNUMAInfo(caps);
 
     for (i = 0 ; i < caps->host.nmigrateTrans ; i++)
         VIR_FREE(caps->host.migrateTrans[i]);
diff -rup libvirt-0.6.2.orig/src/capabilities.h libvirt-0.6.2.new/src/capabilities.h
--- libvirt-0.6.2.orig/src/capabilities.h	2009-03-24 12:31:01.000000000 +0000
+++ libvirt-0.6.2.new/src/capabilities.h	2009-08-13 11:50:46.000000000 +0100
@@ -118,6 +118,9 @@ extern void
 virCapabilitiesFree(virCapsPtr caps);
 
 extern void
+virCapabilitiesFreeNUMAInfo(virCapsPtr caps);
+
+extern void
 virCapabilitiesSetMacPrefix(virCapsPtr caps,
                             unsigned char *prefix);
 
diff -rup libvirt-0.6.2.orig/src/libvirt_private.syms libvirt-0.6.2.new/src/libvirt_private.syms
--- libvirt-0.6.2.orig/src/libvirt_private.syms	2009-04-03 15:04:28.000000000 +0100
+++ libvirt-0.6.2.new/src/libvirt_private.syms	2009-08-13 11:50:59.000000000 +0100
@@ -24,6 +24,7 @@ virCapabilitiesDefaultGuestEmulator;
 virCapabilitiesDefaultGuestMachine;
 virCapabilitiesFormatXML;
 virCapabilitiesFree;
+virCapabilitiesFreeNUMAInfo;
 virCapabilitiesNew;
 virCapabilitiesSetMacPrefix;
 virCapabilitiesGenerateMac;
diff -rup libvirt-0.6.2.orig/src/lxc_conf.c libvirt-0.6.2.new/src/lxc_conf.c
--- libvirt-0.6.2.orig/src/lxc_conf.c	2009-01-31 09:04:17.000000000 +0000
+++ libvirt-0.6.2.new/src/lxc_conf.c	2009-08-13 11:58:41.000000000 +0100
@@ -30,6 +30,7 @@
 #include "lxc_conf.h"
 #include "nodeinfo.h"
 #include "virterror_internal.h"
+#include "logging.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
@@ -46,8 +47,14 @@ virCapsPtr lxcCapsInit(void)
                                    0, 0)) == NULL)
         goto no_memory;
 
-    if (virCapsInitNUMA(caps) < 0)
-        goto no_memory;
+    /* Some machines have problematic NUMA toplogy causing
+     * unexpected failures. We don't want to break the QEMU
+     * driver in this scenario, so log errors & carry on
+     */
+    if (virCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
 
     /* XXX shouldn't 'borrow' KVM's prefix */
     virCapabilitiesSetMacPrefix(caps, (unsigned char []){ 0x52, 0x54, 0x00 });
diff -rup libvirt-0.6.2.orig/src/qemu_conf.c libvirt-0.6.2.new/src/qemu_conf.c
--- libvirt-0.6.2.orig/src/qemu_conf.c	2009-08-13 11:44:11.000000000 +0100
+++ libvirt-0.6.2.new/src/qemu_conf.c	2009-08-13 11:45:34.000000000 +0100
@@ -376,8 +376,14 @@ virCapsPtr qemudCapsInit(void) {
     /* Using KVM's mac prefix for QEMU too */
     virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 });
 
-    if (virCapsInitNUMA(caps) < 0)
-        goto no_memory;
+    /* Some machines have problematic NUMA toplogy causing
+     * unexpected failures. We don't want to break the QEMU
+     * driver in this scenario, so log errors & carry on
+     */
+    if (virCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
 
     /* First the pure HVM guests */
     for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_hvm) ; i++)
diff -rup libvirt-0.6.2.orig/src/uml_conf.c libvirt-0.6.2.new/src/uml_conf.c
--- libvirt-0.6.2.orig/src/uml_conf.c	2009-01-31 09:04:18.000000000 +0000
+++ libvirt-0.6.2.new/src/uml_conf.c	2009-08-13 11:58:47.000000000 +0100
@@ -44,6 +44,7 @@
 #include "memory.h"
 #include "nodeinfo.h"
 #include "verify.h"
+#include "logging.h"
 
 #define VIR_FROM_THIS VIR_FROM_UML
 
@@ -62,8 +63,14 @@ virCapsPtr umlCapsInit(void) {
                                    0, 0)) == NULL)
         goto no_memory;
 
-    if (virCapsInitNUMA(caps) < 0)
-        goto no_memory;
+    /* Some machines have problematic NUMA toplogy causing
+     * unexpected failures. We don't want to break the QEMU
+     * driver in this scenario, so log errors & carry on
+     */
+    if (virCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
 
     if ((guest = virCapabilitiesAddGuest(caps,
                                          "uml",


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- libvirt.spec	5 Aug 2009 15:48:14 -0000	1.136
+++ libvirt.spec	13 Aug 2009 16:07:23 -0000	1.137
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 14%{?dist}%{?extra_release}
+Release: 15%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -116,6 +116,8 @@ Patch20: libvirt-0.6.2-pci-device-crash.
 Patch21: libvirt-0.6.2-qemu-name-uniqueness.patch
 # rhbz #479517
 Patch22: libvirt-0.6.2-buf-locale-escape.patch
+# rhbz #506590
+Patch23: libvirt-0.6.2-numa-ignore-fail.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -290,6 +292,7 @@ of recent versions of Linux (and other O
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %patch200 -p0
 
@@ -613,6 +616,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 13 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.2-15.fc11
+- Log and ignore NUMA topology problems (rhbz #506590)
+
 * Wed Aug  5 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.2-14.fc11
 - Fix crash when attaching/detaching non-existant PCI device (rhbz #510907)
 - Fix QEMU guest name/uuid uniqueness checks (rhbz #507405)



From mso at fedoraproject.org  Thu Aug 13 16:28:53 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 13 Aug 2009 16:28:53 +0000 (UTC)
Subject: rpms/ruby-icon-artist/F-10 ruby-icon-artist.spec,1.2,1.3
Message-ID: <20090813162853.18B9A11C0097@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1211/F-10

Modified Files:
	ruby-icon-artist.spec 
Log Message:


readd F12_Mass_Rebuild changelog entry




Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-10/ruby-icon-artist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ruby-icon-artist.spec	13 Aug 2009 16:00:41 -0000	1.2
+++ ruby-icon-artist.spec	13 Aug 2009 16:28:52 -0000	1.3
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 - Patch upstreamed
 - Add icon-naming-utils dependency
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.90-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.90-2
 - Backport fix for correct checking of icon name from git
 



From mso at fedoraproject.org  Thu Aug 13 16:28:53 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 13 Aug 2009 16:28:53 +0000 (UTC)
Subject: rpms/ruby-icon-artist/devel ruby-icon-artist.spec,1.4,1.5
Message-ID: <20090813162853.68F2711C0097@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1211/devel

Modified Files:
	ruby-icon-artist.spec 
Log Message:


readd F12_Mass_Rebuild changelog entry




Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/devel/ruby-icon-artist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ruby-icon-artist.spec	13 Aug 2009 16:00:41 -0000	1.4
+++ ruby-icon-artist.spec	13 Aug 2009 16:28:53 -0000	1.5
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 - Patch upstreamed
 - Add icon-naming-utils dependency
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.90-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.90-2
 - Backport fix for correct checking of icon name from git
 



From mso at fedoraproject.org  Thu Aug 13 16:28:53 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Thu, 13 Aug 2009 16:28:53 +0000 (UTC)
Subject: rpms/ruby-icon-artist/F-11 ruby-icon-artist.spec,1.2,1.3
Message-ID: <20090813162853.418F911C0349@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/ruby-icon-artist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1211/F-11

Modified Files:
	ruby-icon-artist.spec 
Log Message:


readd F12_Mass_Rebuild changelog entry




Index: ruby-icon-artist.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-icon-artist/F-11/ruby-icon-artist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ruby-icon-artist.spec	13 Aug 2009 16:00:41 -0000	1.2
+++ ruby-icon-artist.spec	13 Aug 2009 16:28:53 -0000	1.3
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 - Patch upstreamed
 - Add icon-naming-utils dependency
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.90-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 13 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.90-2
 - Backport fix for correct checking of icon name from git
 



From twaugh at fedoraproject.org  Thu Aug 13 16:40:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 13 Aug 2009 16:40:49 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-getdevices.patch, 1.2,
	1.3 system-config-printer.spec, 1.277, 1.278
Message-ID: <20090813164049.A9EF411C0097@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-serv3660

Modified Files:
	system-config-printer-getdevices.patch 
	system-config-printer.spec 
Log Message:
* Thu Aug 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
- Updated cupspk DevicesGet call for accepted API.


system-config-printer-getdevices.patch:
 cupspk.py |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

Index: system-config-printer-getdevices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-getdevices.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-printer-getdevices.patch	7 Aug 2009 17:12:29 -0000	1.2
+++ system-config-printer-getdevices.patch	13 Aug 2009 16:40:49 -0000	1.3
@@ -1,7 +1,7 @@
 diff -up system-config-printer-1.1.11/cupspk.py.getdevices system-config-printer-1.1.11/cupspk.py
 --- system-config-printer-1.1.11/cupspk.py.getdevices	2009-08-05 11:33:24.000000000 +0100
-+++ system-config-printer-1.1.11/cupspk.py	2009-08-07 18:05:45.528421465 +0100
-@@ -300,7 +300,53 @@ class Connection:
++++ system-config-printer-1.1.11/cupspk.py	2009-08-13 17:39:34.251284301 +0100
+@@ -300,7 +300,74 @@ class Connection:
  #    getPPDs
  #    getServerPPD
  #    getDocument
@@ -10,13 +10,34 @@ diff -up system-config-printer-1.1.11/cu
 +
 +    def getDevices(self, *args, **kwds):
 +        use_pycups = False
-+        pk_args = ()
++
++        timeout = 0
++        include_schemes = ''
++        exclude_schemes = ''
++
++        if len(args) == 3:
++            (use_pycups, timeout, include_schemes, exclude_schemes) = self._args_to_tuple([int, str, str], *args)
++        else:
++            if kwds.has_key('timeout'):
++                timeout = kwds['timeout']
++
++            if kwds.has_key('include_schemes'):
++                include_schemes = kwds['include_schemes']
++
++            if kwds.has_key('exclude_schemes'):
++                exclude_schemes = kwds['exclude_schemes']
++
++        pk_args = (timeout, include_schemes, exclude_schemes)
 +
 +        result = self._call_with_pk_and_fallback(use_pycups,
 +                                                 'DevicesGet', pk_args,
 +                                                 self._connection.getDevices,
 +                                                 *args, **kwds)
 +
++        # return 'result' if fallback was called
++        if len (result.keys()) > 0 and type (result[result.keys()[0]]) == dict:
++             return result
++
 +        result_str = {}
 +        if result != None:
 +            for i in result.keys():
@@ -37,7 +58,7 @@ diff -up system-config-printer-1.1.11/cu
 +            device_uri = None
 +            device_dict = {}
 +            for i in device_keys:
-+                key = i[:len(i)-len(postfix)]
++                key = i[:len(i) - len(postfix)]
 +                if key != 'device-uri':
 +                    device_dict[key] = result_str[i]
 +                else:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- system-config-printer.spec	7 Aug 2009 17:12:29 -0000	1.277
+++ system-config-printer.spec	13 Aug 2009 16:40:49 -0000	1.278
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -183,6 +183,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Aug 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
+- Updated cupspk DevicesGet call for accepted API.
+
 * Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
 - 1.1.11:
   - Several udev-configure-printer fixes.



From pgf at fedoraproject.org  Thu Aug 13 16:53:21 2009
From: pgf at fedoraproject.org (Paul Fox)
Date: Thu, 13 Aug 2009 16:53:21 +0000 (UTC)
Subject: rpms/olpc-powerd/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 olpc-powerd.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090813165321.86E1611C0097@cvs1.fedora.phx.redhat.com>

Author: pgf

Update of /cvs/pkgs/rpms/olpc-powerd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5432/F-11

Modified Files:
	.cvsignore import.log olpc-powerd.spec sources 
Log Message:
olpc-powerd v.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jul 2009 21:34:54 -0000	1.2
+++ .cvsignore	13 Aug 2009 16:53:21 -0000	1.3
@@ -1 +1 @@
-olpc-powerd-9-gitb61ec99.tar.gz
+olpc-powerd-10-git34fc8ac.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Jul 2009 21:34:54 -0000	1.1
+++ import.log	13 Aug 2009 16:53:21 -0000	1.2
@@ -1 +1,2 @@
 olpc-powerd-9-1:F-11:olpc-powerd-9-1.src.rpm:1248989675
+olpc-powerd-10-1:F-11:olpc-powerd-10-1.src.rpm:1250182361


Index: olpc-powerd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/F-11/olpc-powerd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- olpc-powerd.spec	30 Jul 2009 21:34:54 -0000	1.1
+++ olpc-powerd.spec	13 Aug 2009 16:53:21 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 9
+Version: 10
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/powerd/tree/powerd
 # Source0: the source tarball is created by "make tarball" from within
 # a clone of this git tree: git://dev.laptop.org/users/pgf/powerd
-Source0: olpc-powerd-9-gitb61ec99.tar.gz
+Source0: olpc-powerd-10-git34fc8ac.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: kernel-headers
 Requires: olpc-kbdshim, upstart
@@ -104,9 +104,16 @@ fi
 exit 0
 
 %changelog
+* Thu Aug 13 2009 Paul Fox <pgf at laptop.org>
+- 10-1
+- prevent running on non-XO hardware
+- workaround rtcwake bug
+- prevent console spew, by redirecting stderr weven when not logging.
+
 * Thu Jul 30 2009 Paul Fox <pgf at laptop.org>
 - 9-1
-- disable tracing, by default.  use "powerd-control =tracing-on" to enable at runtime.
+- disable tracing, by default.  use "powerd-control =tracing-on"
+    to enable at runtime.
 - create the inhibit file so that root owns it and can make it writeable.
 - don't brighten the screen on wlan wakeups.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jul 2009 21:34:54 -0000	1.2
+++ sources	13 Aug 2009 16:53:21 -0000	1.3
@@ -1 +1 @@
-7cc49b84ae66f9ed0c2dc841ce3c9b9a  olpc-powerd-9-gitb61ec99.tar.gz
+6cdb70a4e754b3dac45090ca98b143d9  olpc-powerd-10-git34fc8ac.tar.gz



From mgrepl at fedoraproject.org  Thu Aug 13 17:19:29 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 13 Aug 2009 17:19:29 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.43,
	1.44 selinux-policy.spec, 1.897, 1.898
Message-ID: <20090813171929.CB8A611C0349@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-serv9392

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow fprintd_t to getattr of all persistent filesystems



policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    8 +
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/sudo.if              |    4 
 modules/admin/usermanage.te        |    1 
 modules/apps/calamaris.te          |    4 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/screen.if             |    1 
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |   10 +
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |   12 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.fc           |    2 
 modules/services/cups.te           |   28 +++
 modules/services/dbus.if           |    4 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |   10 +
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/hddtemp.fc        |    4 
 modules/services/hddtemp.if        |   38 +++++
 modules/services/hddtemp.te        |   40 +++++
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    3 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   29 ++-
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   41 +++++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    1 
 modules/system/sysnetwork.if       |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |   10 +
 modules/system/userdomain.if       |   30 ++--
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 130 files changed, 2144 insertions(+), 640 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- policy-20090521.patch	13 Aug 2009 15:16:17 -0000	1.43
+++ policy-20090521.patch	13 Aug 2009 17:19:29 -0000	1.44
@@ -2603,8 +2603,8 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_urand(fetchmail_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.12/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-06-25 10:21:01.000000000 +0200
-@@ -22,12 +22,15 @@
++++ serefpolicy-3.6.12/policy/modules/services/fprintd.te	2009-08-13 18:07:07.000000000 +0200
+@@ -22,12 +22,17 @@
  
  corecmd_search_bin(fprintd_t)
  
@@ -2612,6 +2612,8 @@ diff -b -B --ignore-all-space --exclude-
  dev_rw_generic_usb_dev(fprintd_t)
  dev_read_sysfs(fprintd_t)
  
++fs_getattr_all_fs(fprintd_t)  
++
  files_read_etc_files(fprintd_t)
  files_read_usr_files(fprintd_t)
  
@@ -2620,7 +2622,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(fprintd_t)
  
  miscfiles_read_localization(fprintd_t)
-@@ -40,9 +43,10 @@
+@@ -40,9 +45,10 @@
  ')
  
  optional_policy(`
@@ -5055,7 +5057,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-07-30 17:17:23.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/udev.te	2009-08-13 18:24:35.000000000 +0200
 @@ -67,6 +67,7 @@
  
  manage_dirs_pattern(udev_t,udev_var_run_t,udev_var_run_t)
@@ -5083,6 +5085,17 @@ diff -b -B --ignore-all-space --exclude-
  	brctl_domtrans(udev_t)
  ')
  
+@@ -258,6 +264,10 @@
+ ')
+ 
+ optional_policy(`
++	unconfined_signal(udev_t)
++')
++
++optional_policy(`
+ 	kernel_write_xen_state(udev_t)
+ 	kernel_read_xen_state(udev_t)
+ 	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-13 09:03:28.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -p -r1.897 -r1.898
--- selinux-policy.spec	13 Aug 2009 14:54:00 -0000	1.897
+++ selinux-policy.spec	13 Aug 2009 17:19:29 -0000	1.898
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 76%{?dist}
+Release: 77%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 13 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-77
+- Allow fprintd_t to getattr of all persistent filesystems
+
 * Thu Aug 13 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-76
 - Allow hald_t to list net_conf_t directory
 



From ajax at fedoraproject.org  Thu Aug 13 17:24:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 13 Aug 2009 17:24:05 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel
	redhat-rpm-config-9.0.3-brpssa-speedup.patch, NONE,
	1.1 redhat-rpm-config.spec, 1.70, 1.71
Message-ID: <20090813172405.21CA411C0349@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-9.0.3-brpssa-speedup.patch 
Log Message:
* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 9.0.3-15
- redhat-rpm-config-9.0.4-brpssa-speedup.patch: When looking for static
  archives, only run file(1) on files named *.a. (#517101)


redhat-rpm-config-9.0.3-brpssa-speedup.patch:
 brp-strip-static-archive |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE redhat-rpm-config-9.0.3-brpssa-speedup.patch ---
diff -up redhat-rpm-config-9.0.3/brp-strip-static-archive.jx redhat-rpm-config-9.0.3/brp-strip-static-archive
--- redhat-rpm-config-9.0.3/brp-strip-static-archive.jx	2008-05-06 19:08:20.000000000 -0400
+++ redhat-rpm-config-9.0.3/brp-strip-static-archive	2009-08-12 10:52:07.000000000 -0400
@@ -8,7 +8,7 @@ fi
 [ -z "$STRIP" ] && STRIP=strip
 
 # Strip static libraries.
-for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \
+for f in `find $RPM_BUILD_ROOT -name \*.a -a -exec file {} \; | \
         grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
 	grep 'current ar archive' | \
 	sed -n -e 's/^\(.*\):[ 	]*current ar archive/\1/p'`; do


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- redhat-rpm-config.spec	12 Aug 2009 17:47:31 -0000	1.70
+++ redhat-rpm-config.spec	13 Aug 2009 17:24:04 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -14,6 +14,7 @@ Patch4: redhat-rpm-config-9.0.3-F-12-Arc
 Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
 Patch6:	redhat-rpm-config-9.0.3-xz-payload.patch
 Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch
+Patch8: redhat-rpm-config-9.0.3-brpssa-speedup.patch
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -31,6 +32,7 @@ Red Hat specific rpm configuration files
 %patch5 -p1
 %patch6 -p1
 %patch7 -p5
+%patch8 -p1
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -43,6 +45,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 9.0.3-15
+- redhat-rpm-config-9.0.4-brpssa-speedup.patch: When looking for static
+  archives, only run file(1) on files named *.a. (#517101)
+
 * Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 9.0.3-14
 - redhat-rpm-config-9.0.3-jars-with-spaces.patch: Handle repacking jars
   whose filenames contain spaces. (#461854)



From thm at fedoraproject.org  Thu Aug 13 17:31:59 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 13 Aug 2009 17:31:59 +0000 (UTC)
Subject: rpms/python-py/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-py.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090813173159.197C311C0349@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-py/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12072/devel

Modified Files:
	.cvsignore import.log python-py.spec sources 
Log Message:
Update to final 1.0.0 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jul 2009 22:54:57 -0000	1.3
+++ .cvsignore	13 Aug 2009 17:31:58 -0000	1.4
@@ -1 +1 @@
-py-1.0.0b8.tar.gz
+py-1.0.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	22 Jul 2009 22:54:57 -0000	1.2
+++ import.log	13 Aug 2009 17:31:58 -0000	1.3
@@ -1,2 +1,3 @@
 python-py-0_9_2-6_fc10:HEAD:python-py-0.9.2-6.fc10.src.rpm:1232104910
 python-py-1_0_0-0_b8_fc11:HEAD:python-py-1.0.0-0.b8.fc11.src.rpm:1248303215
+python-py-1_0_0-1_fc11:HEAD:python-py-1.0.0-1.fc11.src.rpm:1250184682


Index: python-py.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/python-py.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-py.spec	26 Jul 2009 20:54:51 -0000	1.4
+++ python-py.spec	13 Aug 2009 17:31:58 -0000	1.5
@@ -1,7 +1,5 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define prerelease b8
-
 Name:           python-py
 Version:        1.0.0
 Release:        1%{?prerelease:.%{prerelease}}%{?dist}
@@ -86,7 +84,7 @@ find %{buildroot}%{python_sitelib} -name
 %check
 # some tests need to be skipped currently
 PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test \
-  '-k-test_make_sdist_and_run_it -TestWCSvnCommandPath.test_not_versioned -TestWCSvnCommandPath.test_versioned' \
+  '-k-test_make_sdist_and_run_it' \
   py
 
 
@@ -102,6 +100,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.0-1
+- Update to 1.0.0.
+- Re-enable SVN tests in %%check.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-1.b8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jul 2009 22:54:57 -0000	1.3
+++ sources	13 Aug 2009 17:31:58 -0000	1.4
@@ -1 +1 @@
-96a466614c3002431f735dc34088ce0f  py-1.0.0b8.tar.gz
+3223ff8fcaefd060be13262e367794ce  py-1.0.0.tar.gz



From davidz at fedoraproject.org  Thu Aug 13 17:56:44 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Thu, 13 Aug 2009 17:56:44 +0000 (UTC)
Subject: rpms/polkit/devel polkit.spec,1.8,1.9
Message-ID: <20090813175644.ECABF11C0349@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/polkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16078

Modified Files:
	polkit.spec 
Log Message:
* Thu Aug 13 2009 David Zeuthen <davidz at redhat.com> - 0.94-3
- Add desktop_admin_r and desktop_user_r groups along with a first cut
  of default authorizations for users in these groups.




Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/devel/polkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- polkit.spec	12 Aug 2009 19:42:21 -0000	1.8
+++ polkit.spec	13 Aug 2009 17:56:44 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.94
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -43,6 +43,17 @@ Requires: gtk-doc
 %description docs
 Development documentation for PolicyKit.
 
+%package desktop-policy
+Summary: Roles and default policy for desktop usage
+Group: Development/Libraries
+#Requires: %name = %{version}-%{release}
+Requires(pre): /usr/sbin/groupadd
+Requires(preun): /usr/sbin/groupdel
+BuildArch: noarch
+
+%description desktop-policy
+Roles and default policy for desktop usage.
+
 %prep
 %setup -q
 
@@ -59,6 +70,51 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1
 
 %find_lang polkit-1
 
+###
+### BEGIN DESKTOP POLICY CONFIGURATION ###
+###
+
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/localauthority.conf.d/60-desktop-policy.conf << EOF
+# This allows users in the desktop_admin_r group to authenticate as
+# the administrator.
+#
+# DO NOT EDIT THIS FILE, it will be overwritten on update.
+
+[Configuration]
+AdminIdentities=unix-group:desktop_admin_r
+EOF
+
+cat > $RPM_BUILD_ROOT%{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/10-desktop-policy.pkla << EOF
+# Authorizations/policy for the desktop_admin_r and desktop_user_r groups.
+#
+# DO NOT EDIT THIS FILE, it will be overwritten on update.
+
+# Allow "standard users" to do some things without being interrupted by
+# password dialogs (TODO: not complete)
+#
+[Desktop User Permissions]
+Identity=unix-group:desktop_user_r
+Action=org.gnome.clockapplet.mechanism.settimezone
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
+
+# Allow "administrative users" to do a lot of things without being interrupted by
+# password dialogs (TODO: not complete)
+#
+[Desktop Administrator Permissions]
+Identity=unix-group:desktop_admin_r
+Action=org.gnome.clockapplet.mechanism.*;org.freedesktop.devicekit.disks.*;org.freedesktop.RealtimeKit1.*
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
+
+EOF
+
+###
+### END DESKTOP POLICY CONFIGURATION
+###
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,6 +122,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+%pre desktop-policy
+/usr/sbin/groupadd -r desktop_admin_r 2> /dev/null || :
+/usr/sbin/groupadd -r desktop_user_r 2> /dev/null || :
+
+%preun desktop-policy
+/usr/sbin/groupdel desktop_admin_r 2> /dev/null || :
+/usr/sbin/groupdel desktop_user_r 2> /dev/null || :
+
+%files desktop-policy
+%{_sysconfdir}/polkit-1/localauthority.conf.d/60-desktop-policy.conf
+%{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/10-desktop-policy.pkla
+
 %files -f polkit-1.lang
 %defattr(-,root,root,-)
 %doc COPYING
@@ -114,6 +182,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Aug 13 2009 David Zeuthen <davidz at redhat.com> - 0.94-3
+- Add desktop_admin_r and desktop_user_r groups along with a first cut
+  of default authorizations for users in these groups.
+
 * Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-2
 - Disable GObject Introspection for now as it breaks the build
 



From rjones at fedoraproject.org  Thu Aug 13 18:09:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 18:09:04 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.32, 1.33 libguestfs.spec, 1.54, 
	1.55 sources, 1.32, 1.33
Message-ID: <20090813180904.8028E11C0349@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19091

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.67.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	6 Aug 2009 16:15:11 -0000	1.32
+++ .cvsignore	13 Aug 2009 18:09:04 -0000	1.33
@@ -1 +1 @@
-libguestfs-1.0.66.tar.gz
+libguestfs-1.0.67.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libguestfs.spec	13 Aug 2009 10:11:05 -0000	1.54
+++ libguestfs.spec	13 Aug 2009 18:09:04 -0000	1.55
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.66
-Release:     1%{?dist}.1
+Version:     1.0.67
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -537,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
+- New upstream release 1.0.67.
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1.fc11.1
 - Disable tests (because of RHBZ#516096).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	6 Aug 2009 16:15:11 -0000	1.32
+++ sources	13 Aug 2009 18:09:04 -0000	1.33
@@ -1 +1 @@
-385d65176732738566e9ab99898104f7  libguestfs-1.0.66.tar.gz
+ce1896a1faa9a19642d5a19aa4f09c4b  libguestfs-1.0.67.tar.gz



From rjones at fedoraproject.org  Thu Aug 13 18:09:00 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 18:09:00 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.26, 1.27 libguestfs.spec, 1.57, 
	1.58 sources, 1.26,
	1.27 0001-Tests-Don-t-test-block-size-in-statvfs-test.patch, 1.1,
	NONE 0002-Always-pass-mkswap-f-parameter.patch, 1.1,
	NONE 0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch,
	1.1, NONE
Message-ID: <20090813180900.C9DF011C0349@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19068

Modified Files:
	.cvsignore libguestfs.spec sources 
Removed Files:
	0001-Tests-Don-t-test-block-size-in-statvfs-test.patch 
	0002-Always-pass-mkswap-f-parameter.patch 
	0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch 
Log Message:
New upstream release 1.0.67.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	6 Aug 2009 16:15:17 -0000	1.26
+++ .cvsignore	13 Aug 2009 18:09:00 -0000	1.27
@@ -1 +1 @@
-libguestfs-1.0.66.tar.gz
+libguestfs-1.0.67.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- libguestfs.spec	13 Aug 2009 10:11:04 -0000	1.57
+++ libguestfs.spec	13 Aug 2009 18:09:00 -0000	1.58
@@ -4,18 +4,14 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.66
-Release:     4%{?dist}
+Version:     1.0.67
+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
 
-Patch0:      0001-Tests-Don-t-test-block-size-in-statvfs-test.patch
-Patch1:      0002-Always-pass-mkswap-f-parameter.patch
-Patch2:      0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch
-
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -311,10 +307,6 @@ Requires:    jpackage-utils
 
 mkdir -p daemon/m4
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 
 %build
 %if %{buildnonet}
@@ -542,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
+- New upstream release 1.0.67.
+
 * Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-4
 - Another patch to try to fix the tests.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	6 Aug 2009 16:15:17 -0000	1.26
+++ sources	13 Aug 2009 18:09:00 -0000	1.27
@@ -1 +1 @@
-385d65176732738566e9ab99898104f7  libguestfs-1.0.66.tar.gz
+ce1896a1faa9a19642d5a19aa4f09c4b  libguestfs-1.0.67.tar.gz


--- 0001-Tests-Don-t-test-block-size-in-statvfs-test.patch DELETED ---


--- 0002-Always-pass-mkswap-f-parameter.patch DELETED ---


--- 0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch DELETED ---



From kyle at fedoraproject.org  Thu Aug 13 18:10:00 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 13 Aug 2009 18:10:00 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1716,1.1717 perf,1.1,1.2
Message-ID: <20090813181000.18DF511C0349@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19309

Modified Files:
	kernel.spec perf 
Log Message:
* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
- fix perf.
- move perf to perf.$ver instead of perf-$ver...



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1716
retrieving revision 1.1717
diff -u -p -r1.1716 -r1.1717
--- kernel.spec	13 Aug 2009 14:19:15 -0000	1.1716
+++ kernel.spec	13 Aug 2009 18:09:59 -0000	1.1717
@@ -1449,7 +1449,7 @@ BuildKernel() {
     make -s V=1 %{?_smp_mflags} perf
 #later#    make -s V=1 %{?_smp_mflags} doc
     mkdir -p $RPM_BUILD_ROOT/usr/libexec/
-    install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf-$KernelVer
+    install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf.$KernelVer
     popd
 %endif
 
@@ -1918,7 +1918,7 @@ fi
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
 /boot/System.map-%{KVERREL}%{?2:.%{2}}\
 %if %{with_perftool}\
-/usr/libexec/perf-%{KVERREL}%{?2:.%{2}}\
+/usr/libexec/perf.%{KVERREL}%{?2:.%{2}}\
 %endif\
 #/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
 /boot/config-%{KVERREL}%{?2:.%{2}}\
@@ -1979,6 +1979,7 @@ fi
 %changelog
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - fix perf.
+- move perf to perf.$ver instead of perf-$ver...
 
 * Wed Aug 12 2009 Dennis Gilmore <dennis at ausil.us>
 - Obsolete kernel-smp on sparc64


Index: perf
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/perf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perf	13 Aug 2009 14:19:16 -0000	1.1
+++ perf	13 Aug 2009 18:09:59 -0000	1.2
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/libexec/perf-$(uname -r)
+exec /usr/libexec/perf.$(uname -r)



From rjones at fedoraproject.org  Thu Aug 13 18:09:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 18:09:07 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.45, 1.46 libguestfs.spec, 1.90, 
	1.91 sources, 1.45, 1.46
Message-ID: <20090813180907.ADF9211C0349@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19128

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
New upstream release 1.0.67.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	6 Aug 2009 16:15:09 -0000	1.45
+++ .cvsignore	13 Aug 2009 18:09:07 -0000	1.46
@@ -1 +1 @@
-libguestfs-1.0.66.tar.gz
+libguestfs-1.0.67.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- libguestfs.spec	13 Aug 2009 10:11:05 -0000	1.90
+++ libguestfs.spec	13 Aug 2009 18:09:07 -0000	1.91
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.66
-Release:     5%{?dist}
+Version:     1.0.67
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -549,6 +549,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
+- New upstream release 1.0.67.
+
 * Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-5
 - Set network interface to ne2k_pci (workaround for RHBZ#516022).
 - Rerun autoconf because patch touches configure script.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	6 Aug 2009 16:15:09 -0000	1.45
+++ sources	13 Aug 2009 18:09:07 -0000	1.46
@@ -1 +1 @@
-385d65176732738566e9ab99898104f7  libguestfs-1.0.66.tar.gz
+ce1896a1faa9a19642d5a19aa4f09c4b  libguestfs-1.0.67.tar.gz



From myoung at fedoraproject.org  Thu Aug 13 18:13:16 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 13 Aug 2009 18:13:16 +0000 (UTC)
Subject: rpms/kernel/devel Makefile.config, 1.70.6.1, 1.70.6.2 config-generic,
	1.238.6.33, 1.238.6.34 config-sparc64-generic, 1.21.6.5,
	1.21.6.6 drm-intel-next.patch, 1.4.6.4,
	1.4.6.5 drm-page-flip.patch, 1.2.6.2, 1.2.6.3 kernel.spec,
	1.1294.2.48, 1.1294.2.49 xen.pvops.patch, 1.1.2.31,
	1.1.2.32 config-sparc64-smp, 1.2.16.3, NONE
Message-ID: <20090813181316.3227311C0349@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19882

Modified Files:
      Tag: private-myoung-dom0-branch
	Makefile.config config-generic config-sparc64-generic 
	drm-intel-next.patch drm-page-flip.patch kernel.spec 
	xen.pvops.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	config-sparc64-smp 
Log Message:
get latest update from rebase/master



Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.70.6.1
retrieving revision 1.70.6.2
diff -u -p -r1.70.6.1 -r1.70.6.2
--- Makefile.config	5 Aug 2009 23:00:08 -0000	1.70.6.1
+++ Makefile.config	13 Aug 2009 18:13:03 -0000	1.70.6.2
@@ -10,7 +10,7 @@ CONFIGFILES	= \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config $(CFG)-arm.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
-	$(CFG)-sparc64.config $(CFG)-sparc64-smp.config \
+	$(CFG)-sparc64.config  \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ia64.config
 
@@ -80,9 +80,6 @@ kernel-$(VERSION)-x86_64.config: /dev/nu
 kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-kernel-$(VERSION)-sparc64-smp.config: config-sparc64-smp temp-sparc64-generic
-	perl merge.pl $^ sparc64 > $@
-
 kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic
 	perl merge.pl $^ sparc64 > $@
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.33
retrieving revision 1.238.6.34
diff -u -p -r1.238.6.33 -r1.238.6.34
--- config-generic	8 Aug 2009 18:06:03 -0000	1.238.6.33
+++ config-generic	13 Aug 2009 18:13:03 -0000	1.238.6.34
@@ -3987,7 +3987,10 @@ CONFIG_FCOE_FNIC=m
 
 CONFIG_NOP_USB_XCEIV=m
 
-# CONFIG_IMA is not set
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_AUDIT=y
+CONFIG_IMA_LSM_RULES=y
 
 # CONFIG_PAGE_POISONING is not set
 


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.21.6.5
retrieving revision 1.21.6.6
diff -u -p -r1.21.6.5 -r1.21.6.6
--- config-sparc64-generic	10 Aug 2009 21:22:18 -0000	1.21.6.5
+++ config-sparc64-generic	13 Aug 2009 18:13:03 -0000	1.21.6.6
@@ -1,4 +1,4 @@
-# CONFIG_SMP is not set
+CONFIG_SMP=y
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
 CONFIG_SECCOMP=y
@@ -199,5 +199,3 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
-
-# CONFIG_KGDB is not set

drm-intel-next.patch:
 i915_dma.c         |   15 -
 i915_drv.h         |    4 
 i915_gem.c         |    4 
 i915_gem_debugfs.c |    2 
 i915_irq.c         |  235 +++++++++++-----
 i915_reg.h         |   45 +++
 i915_suspend.c     |    2 
 intel_bios.c       |   40 ++
 intel_bios.h       |   45 +++
 intel_crt.c        |   12 
 intel_display.c    |  759 +++++++++++++++++++++++++++++++++++------------------
 intel_dp.c         |  216 +++++++++++++--
 intel_drv.h        |    3 
 intel_hdmi.c       |   64 ----
 intel_lvds.c       |   12 
 intel_sdvo.c       |  254 ++++++++++++-----
 intel_tv.c         |   22 +
 17 files changed, 1221 insertions(+), 513 deletions(-)

Index: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.4.6.4
retrieving revision 1.4.6.5
diff -u -p -r1.4.6.4 -r1.4.6.5
--- drm-intel-next.patch	5 Aug 2009 23:00:10 -0000	1.4.6.4
+++ drm-intel-next.patch	13 Aug 2009 18:13:03 -0000	1.4.6.5
@@ -1,5 +1,59 @@
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 8c47831..50d1f78 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1186,6 +1186,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 	if (ret)
+ 		goto out_iomapfree;
+ 
++	dev_priv->wq = create_workqueue("i915");
++	if (dev_priv->wq == NULL) {
++		DRM_ERROR("Failed to create our workqueue.\n");
++		ret = -ENOMEM;
++		goto out_iomapfree;
++	}
++
+ 	/* enable GEM by default */
+ 	dev_priv->has_gem = 1;
+ 
+@@ -1211,7 +1218,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 	if (!I915_NEED_GFX_HWS(dev)) {
+ 		ret = i915_init_phys_hws(dev);
+ 		if (ret != 0)
+-			goto out_iomapfree;
++			goto out_workqueue_free;
+ 	}
+ 
+ 	i915_get_mem_freq(dev);
+@@ -1245,7 +1252,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 		ret = i915_load_modeset_init(dev, prealloc_size, agp_size);
+ 		if (ret < 0) {
+ 			DRM_ERROR("failed to init modeset\n");
+-			goto out_rmmap;
++			goto out_workqueue_free;
+ 		}
+ 	}
+ 
+@@ -1256,6 +1263,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+ 
+ 	return 0;
+ 
++out_workqueue_free:
++	destroy_workqueue(dev_priv->wq);
+ out_iomapfree:
+ 	io_mapping_free(dev_priv->mm.gtt_mapping);
+ out_rmmap:
+@@ -1269,6 +1278,8 @@ int i915_driver_unload(struct drm_device *dev)
+ {
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
+ 
++	destroy_workqueue(dev_priv->wq);
++
+ 	io_mapping_free(dev_priv->mm.gtt_mapping);
+ 	if (dev_priv->mm.gtt_mtrr >= 0) {
+ 		mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d087528..5f3a259 100644
+index d087528..7537f57 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -219,6 +219,7 @@ typedef struct drm_i915_private {
@@ -10,15 +64,16 @@ index d087528..5f3a259 100644
  	int lvds_ssc_freq;
  
  	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
-@@ -229,6 +230,7 @@ typedef struct drm_i915_private {
+@@ -229,6 +230,8 @@ typedef struct drm_i915_private {
  
  	spinlock_t error_lock;
  	struct drm_i915_error_state *first_error;
 +	struct work_struct error_work;
++	struct workqueue_struct *wq;
  
  	/* Register state */
  	u8 saveLBB;
-@@ -888,6 +890,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
+@@ -888,6 +891,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  						      IS_I915GM(dev)))
  #define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
  #define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
@@ -26,6 +81,28 @@ index d087528..5f3a259 100644
  #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev))
  /* dsparb controlled by hw only */
  #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index 5bf4203..140bee1 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -1570,7 +1570,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
+ 	}
+ 
+ 	if (was_empty && !dev_priv->mm.suspended)
+-		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
++		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
+ 	return seqno;
+ }
+ 
+@@ -1719,7 +1719,7 @@ i915_gem_retire_work_handler(struct work_struct *work)
+ 	i915_gem_retire_requests(dev);
+ 	if (!dev_priv->mm.suspended &&
+ 	    !list_empty(&dev_priv->mm.request_list))
+-		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
++		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
+ 	mutex_unlock(&dev->struct_mutex);
+ }
+ 
 diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
 index 9a44bfc..cb3b974 100644
 --- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
@@ -40,7 +117,7 @@ index 9a44bfc..cb3b974 100644
  	seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
  	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ba23a6..f340b3f 100644
+index 7ba23a6..83aee80 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -290,6 +290,35 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
@@ -211,7 +288,7 @@ index 7ba23a6..f340b3f 100644
 +		I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
 +	}
 +
-+	schedule_work(&dev_priv->error_work);
++	queue_work(dev_priv->wq, &dev_priv->error_work);
 +}
 +
  irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
@@ -227,7 +304,15 @@ index 7ba23a6..f340b3f 100644
  		/*
  		 * Clear the PIPE(A|B)STAT regs before the IIR
  		 */
-@@ -409,80 +566,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -403,86 +560,13 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ 			DRM_DEBUG("hotplug event received, stat 0x%08x\n",
+ 				  hotplug_status);
+ 			if (hotplug_status & dev_priv->hotplug_supported_mask)
+-				schedule_work(&dev_priv->hotplug_work);
++				queue_work(dev_priv->wq,
++					   &dev_priv->hotplug_work);
+ 
+ 			I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
  			I915_READ(PORT_HOTPLUG_STAT);
  		}
  
@@ -308,7 +393,7 @@ index 7ba23a6..f340b3f 100644
  		I915_WRITE(IIR, iir);
  		new_iir = I915_READ(IIR); /* Flush posted writes */
  
-@@ -830,6 +913,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -830,6 +914,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
  	atomic_set(&dev_priv->irq_received, 0);
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
@@ -412,6 +497,19 @@ index 6c08584..2955083 100644
 +#define PCH_DPD_AUX_CH_DATA5	0xe4324
 +
  #endif /* _I915_REG_H_ */
+diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
+index 9e1d16e..1d04e19 100644
+--- a/drivers/gpu/drm/i915/i915_suspend.c
++++ b/drivers/gpu/drm/i915/i915_suspend.c
+@@ -598,7 +598,7 @@ int i915_restore_state(struct drm_device *dev)
+ 
+ 	for (i = 0; i < 16; i++) {
+ 		I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]);
+-		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]);
++		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i]);
+ 	}
+ 	for (i = 0; i < 3; i++)
+ 		I915_WRITE(SWF30 + (i << 2), dev_priv->saveSWF2[i]);
 diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
 index 7cc4471..300aee3 100644
 --- a/drivers/gpu/drm/i915/intel_bios.c

drm-page-flip.patch:
 b/drivers/gpu/drm/drm_crtc.c                          |  169 +++++++++++++++++-
 b/drivers/gpu/drm/drm_crtc_helper.c                   |   12 +
 b/drivers/gpu/drm/drm_drv.c                           |    1 
 b/drivers/gpu/drm/drm_fops.c                          |   68 +++++++
 b/drivers/gpu/drm/drm_irq.c                           |   43 ++++
 b/drivers/gpu/drm/i915/i915_drv.c                     |    1 
 b/drivers/gpu/drm/i915/intel_display.c                |   24 +-
 b/drivers/gpu/drm/radeon/radeon_display.c             |    3 
 b/include/drm/drm.h                                   |   25 ++
 b/include/drm/drmP.h                                  |   32 +++
 b/include/drm/drm_crtc.h                              |   27 ++
 b/include/drm/drm_crtc_helper.h                       |    4 
 b/include/drm/drm_mode.h                              |   16 +
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c |    2 
 linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c |    2 
 15 files changed, 415 insertions(+), 14 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -p -r1.2.6.2 -r1.2.6.3
--- drm-page-flip.patch	5 Aug 2009 23:00:15 -0000	1.2.6.2
+++ drm-page-flip.patch	13 Aug 2009 18:13:04 -0000	1.2.6.3
@@ -1,50 +1,32 @@
-From 2c6289cd75e125745e38dc563fa33301d05923a0 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at hinata.local>
-Date: Mon, 13 Jul 2009 09:07:19 -0400
-Subject: [PATCH] Add modesetting pageflip ioctl and corresponding drm event
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+commit f2884697ef0e0064a189d5baacf565d6742687f1
+Author: Kristian H?gsberg <krh at hinata.local>
+Date:   Mon Jul 13 09:07:19 2009 -0400
 
-This patch adds a vblank synced pageflip ioctl for to the modesetting
-family of ioctls.  The ioctl takes a crtc and an fb and schedules a
-pageflip to the new fb at the next coming vertical blank event.  This
-feature lets userspace implement tear-free updating of the screen contents
-with hw-guaranteed low latency page flipping.
-
-The ioctl is asynchronous in that it returns immediately and then later
-notifies the client by making an event available for reading on the drm fd.
-This lets applications add the drm fd to their main loop and handle other
-tasks while waiting for the flip to happen.  The event includes the time
-of the flip, the frame counter and a 64 bit opaque token provided by
-user space in the ioctl.
-
-Based on work and suggestions from
-	Jesse Barnes <jbarnes at virtuousgeek.org>,
-	Jakob Bornecrantz <wallbraker at gmail.com>,
-	Chris Wilson <chris at chris-wilson.co.uk>
-
-Signed-off-by: Kristian H?gsberg <krh at redhat.com>
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
----
- drivers/gpu/drm/drm_crtc.c              |  169 ++++++++++++++++++++++++++++++-
- drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
- drivers/gpu/drm/drm_drv.c               |    1 +
- drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++-
- drivers/gpu/drm/drm_irq.c               |   43 ++++++++
- drivers/gpu/drm/i915/i915_drv.c         |    1 +
- drivers/gpu/drm/i915/intel_display.c    |   24 +++--
- drivers/gpu/drm/radeon/atombios_crtc.c  |    1 -
- drivers/gpu/drm/radeon/radeon_display.c |    3 +-
- include/drm/drm.h                       |   25 +++++
- include/drm/drmP.h                      |   32 ++++++
- include/drm/drm_crtc.h                  |   27 +++++
- include/drm/drm_crtc_helper.h           |    4 +
- include/drm/drm_mode.h                  |   16 +++
- 14 files changed, 413 insertions(+), 13 deletions(-)
+    Add modesetting pageflip ioctl and corresponding drm event
+    
+    This patch adds a vblank synced pageflip ioctl for to the modesetting
+    family of ioctls.  The ioctl takes a crtc and an fb and schedules a
+    pageflip to the new fb at the next coming vertical blank event.  This
+    feature lets userspace implement tear-free updating of the screen contents
+    with hw-guaranteed low latency page flipping.
+    
+    The ioctl is asynchronous in that it returns immediately and then later
+    notifies the client by making an event available for reading on the drm fd.
+    This lets applications add the drm fd to their main loop and handle other
+    tasks while waiting for the flip to happen.  The event includes the time
+    of the flip, the frame counter and a 64 bit opaque token provided by
+    user space in the ioctl.
+    
+    Based on work and suggestions from
+    	Jesse Barnes <jbarnes at virtuousgeek.org>,
+    	Jakob Bornecrantz <wallbraker at gmail.com>,
+    	Chris Wilson <chris at chris-wilson.co.uk>
+    
+    Signed-off-by: Kristian H?gsberg <krh at redhat.com>
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
 
 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 8fab789..32212e6 100644
+index 8fab789..f598ce0 100644
 --- a/drivers/gpu/drm/drm_crtc.c
 +++ b/drivers/gpu/drm/drm_crtc.c
 @@ -34,6 +34,8 @@
@@ -76,7 +58,7 @@ index 8fab789..32212e6 100644
 +	BUG_ON(crtc->pending_flip == NULL);
 +
 +	mutex_lock(&dev->struct_mutex);
-+	crtc->funcs->set_base(crtc, 0, 0, NULL);
++	crtc->funcs->set_base(crtc, crtc->x, crtc->y, NULL);
 +
 +	pending = crtc->pending_flip;
 +	crtc->pending_flip = NULL;
@@ -593,27 +575,15 @@ index 508838e..697c31a 100644
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
-index c0080cc..501209d 100644
---- a/drivers/gpu/drm/radeon/atombios_crtc.c
-+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
-@@ -535,7 +535,6 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = {
- 	.dpms = atombios_crtc_dpms,
- 	.mode_fixup = atombios_crtc_mode_fixup,
- 	.mode_set = atombios_crtc_mode_set,
--	.mode_set_base = atombios_crtc_set_base,
- 	.prepare = atombios_crtc_prepare,
- 	.commit = atombios_crtc_commit,
- };
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 3efcf1a..372ba35 100644
+index 3efcf1a..4d73f0b 100644
 --- a/drivers/gpu/drm/radeon/radeon_display.c
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
 @@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
-+	.set_base = radeon_crtc_set_base,
++	.set_base = drm_crtc_helper_set_base,
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
@@ -874,9 +844,6 @@ index ae304cc..464b779 100644
 +};
 +
  #endif
--- 
-1.6.3.3
-
 diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c
 --- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~	2009-07-24 19:38:36.000000000 -0400
 +++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-07-26 18:06:06.000000000 -0400


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.48
retrieving revision 1.1294.2.49
diff -u -p -r1.1294.2.48 -r1.1294.2.49
--- kernel.spec	11 Aug 2009 18:55:10 -0000	1.1294.2.48
+++ kernel.spec	13 Aug 2009 18:13:04 -0000	1.1294.2.49
@@ -79,7 +79,7 @@ Summary: The Linux kernel
 #
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
-# kernel-smp (only valid for ppc 32-bit, sparc64)
+# kernel-smp (only valid for ppc 32-bit)
 %define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
 # kernel-kdump
 %define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
@@ -233,8 +233,8 @@ Summary: The Linux kernel
 
 # Overrides for generic default options
 
-# only ppc and sparc64 need separate smp kernels
-%ifnarch ppc sparc64 alphaev56
+# only ppc and alphav56 need separate smp kernels
+%ifnarch ppc alphaev56
 %define with_smp 0
 %endif
 
@@ -320,6 +320,7 @@ Summary: The Linux kernel
 %define make_target image
 %define kernel_image arch/sparc/boot/image
 %define image_install_path boot
+%define with_perftool 0
 %endif
 
 %ifarch ppc
@@ -432,7 +433,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, grubby >= 7.0.2-1
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -472,7 +473,7 @@ ExclusiveArch: noarch %{all_x86} x86_64 
 ExclusiveOS: Linux
 
 %kernel_reqprovconf
-%ifarch x86_64
+%ifarch x86_64 sparc64
 Obsoletes: kernel-smp
 %endif
 
@@ -540,7 +541,6 @@ Source60: config-ia64-generic
 Source70: config-s390x
 
 Source90: config-sparc64-generic
-Source91: config-sparc64-smp
 
 Source100: config-arm
 
@@ -684,7 +684,7 @@ Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-03
+# anholt's tree as of 2009-08-12
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
@@ -1709,12 +1709,9 @@ ls $man9dir | grep -q '' || > $man9dir/B
 
 %if %{with_perf}
 # perf docs and shell wrapper.
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-cat <<EOF >>$RPM_BUILD_ROOT/usr/sbin/perf
-#!/bin/bash
-exec /usr/libexec/perf-\$(uname -r)
-EOF
-chmod 755 $RPM_BUILD_ROOT/usr/sbin/perf
+mkdir -p $RPM_BUILD_ROOT/usr/sbin/
+cp $RPM_SOURCE_DIR/perf $RPM_BUILD_ROOT/usr/sbin/perf
+chmod 0755 $RPM_BUILD_ROOT/usr/sbin/perf
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
 %endif
 
@@ -1990,6 +1987,30 @@ fi
 
 %changelog
 * Tue Aug 11 2009 Michael Young <m.a.young at durham.ac.uk>
+- add another rebase/master update
+
+* Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
+- fix perf.
+
+* Wed Aug 12 2009 Dennis Gilmore <dennis at ausil.us>
+- Obsolete kernel-smp on sparc64
+- Require grubby >= 7.0.2-1 since thats what introduces the dracut options we use
+
+* Wed Aug 12 2009 Kristian H?gsberg <krh at redhat.com>
+- Fix drm-page-flip.patch to not break radeon kms and to not reset
+  crtc offset into fb on flip.
+
+* Wed Aug 12 2009 Adam Jackson <ajax at redhat.com>
+- Update drm-intel-next patch
+
+* Tue Aug 11 2009 Dennis Gilmore <dennis at ausil.us> - 2.6.31-0.149.rc5.git3
+- disable building the -smp kernel on sparc64
+- disable building kernel-perf on sparc64 syscalls not supported
+
+* Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
+- Enable config IMA
+
+* Tue Aug 11 2009 Michael Young <m.a.young at durham.ac.uk>
 - CONFIG_CC_STACKPROTECTOR was probably innocent but leave it off
   a bit longer just in case
 - add rebase/master update

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   36 
 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             |   13 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   37 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    4 
 arch/x86/xen/apic.c                        |   60 +
 arch/x86/xen/enlighten.c                   |   63 +
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |   86 +
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/pci.h                          |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   32 
 drivers/xen/Makefile                       |   18 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  152 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  315 +++++-
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/pci.h                        |    6 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   21 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 128 files changed, 9889 insertions(+), 1295 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -p -r1.1.2.31 -r1.1.2.32
--- xen.pvops.patch	11 Aug 2009 18:55:10 -0000	1.1.2.31
+++ xen.pvops.patch	13 Aug 2009 18:13:04 -0000	1.1.2.32
@@ -1920,7 +1920,7 @@ index 0000000..75df312
 +#endif
 +
 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
-index 018a0a4..ebc174c 100644
+index 018a0a4..f334014 100644
 --- a/arch/x86/include/asm/xen/page.h
 +++ b/arch/x86/include/asm/xen/page.h
 @@ -5,6 +5,7 @@
@@ -1931,7 +1931,7 @@ index 018a0a4..ebc174c 100644
  
  #include <asm/uaccess.h>
  #include <asm/page.h>
-@@ -35,16 +36,25 @@ typedef struct xpaddr {
+@@ -35,6 +36,8 @@ typedef struct xpaddr {
  #define MAX_DOMAIN_PAGES						\
      ((unsigned long)((u64)CONFIG_XEN_MAX_DOMAIN_MEMORY * 1024 * 1024 * 1024 / PAGE_SIZE))
  
@@ -1940,25 +1940,7 @@ index 018a0a4..ebc174c 100644
  
  extern unsigned long get_phys_to_machine(unsigned long pfn);
  extern void set_phys_to_machine(unsigned long pfn, unsigned long mfn);
- 
- static inline unsigned long pfn_to_mfn(unsigned long pfn)
- {
-+	unsigned long mfn;
-+
- 	if (xen_feature(XENFEAT_auto_translated_physmap))
- 		return pfn;
- 
--	return get_phys_to_machine(pfn) & ~FOREIGN_FRAME_BIT;
-+	mfn = get_phys_to_machine(pfn);
-+
-+	if (unlikely(mfn == INVALID_P2M_ENTRY))
-+		return mfn;
-+
-+	return mfn & ~FOREIGN_FRAME_BIT;
- }
- 
- static inline int phys_to_machine_mapping_valid(unsigned long pfn)
-@@ -62,10 +72,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
+@@ -62,10 +65,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
  	if (xen_feature(XENFEAT_auto_translated_physmap))
  		return mfn;
  
@@ -1970,7 +1952,7 @@ index 018a0a4..ebc174c 100644
  
  	pfn = 0;
  	/*
-@@ -112,13 +120,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine)
+@@ -112,13 +113,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine)
   */
  static inline unsigned long mfn_to_local_pfn(unsigned long mfn)
  {
@@ -1986,23 +1968,7 @@ index 018a0a4..ebc174c 100644
  	return pfn;
  }
  
-@@ -143,6 +147,15 @@ static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)
- 	return pte;
- }
- 
-+static inline unsigned long pte_invalid_mfn(void)
-+{
-+	pte_t pte;
-+
-+	pte.pte = ((phys_addr_t)INVALID_P2M_ENTRY << PAGE_SHIFT);
-+
-+	return pte_mfn(pte);
-+}
-+
- static inline pteval_t pte_val_ma(pte_t pte)
- {
- 	return pte.pte;
-@@ -163,6 +176,7 @@ static inline pte_t __pte_ma(pteval_t x)
+@@ -163,6 +160,7 @@ static inline pte_t __pte_ma(pteval_t x)
  
  #define pgd_val_ma(x)	((x).pgd)
  
@@ -3760,7 +3726,7 @@ index 0a1700a..6ba04d4 100644
  
  	xen_raw_console_write("about to get started...\n");
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 4ceb285..e23f89f 100644
+index 4ceb285..a654a49 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
 @@ -50,7 +50,9 @@
@@ -3958,27 +3924,14 @@ index 4ceb285..e23f89f 100644
  static void xen_flush_tlb_others(const struct cpumask *cpus,
  				 struct mm_struct *mm, unsigned long va)
  {
-@@ -1441,13 +1547,29 @@ static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)
- }
- #endif
- 
--#ifdef CONFIG_X86_32
--static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
-+static __init pte_t filter_pte(pte_t *ptep, pte_t pte)
+@@ -1444,10 +1550,17 @@ static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)
+ #ifdef CONFIG_X86_32
+ static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
  {
 -	/* If there's an existing pte, then don't allow _PAGE_RW to be set */
 -	if (pte_val_ma(*ptep) & _PAGE_PRESENT)
-+#ifdef CONFIG_X86_32
 +	pte_t oldpte = *ptep;
-+#endif
 +
-+	if ((pte_flags(pte) & _PAGE_PRESENT) &&
-+	    (pte_mfn(pte) == pte_invalid_mfn())) {
-+		/* Don't allow pre-balloned mappings to be set */
-+		pte = __pte_ma(0);
-+	}
-+
-+#ifdef CONFIG_X86_32
 +	if (pte_flags(oldpte) & _PAGE_PRESENT) {
 +		/* Don't allow existing IO mappings to be overridden */
 +		if (pte_flags(oldpte) & _PAGE_IOMAP)
@@ -3988,24 +3941,10 @@ index 4ceb285..e23f89f 100644
  		pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
  			       pte_val_ma(pte));
 +	}
-+#endif
  
  	return pte;
  }
-@@ -1456,11 +1578,10 @@ static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
-    doesn't allow RO pagetable pages to be remapped RW */
- static __init void xen_set_pte_init(pte_t *ptep, pte_t pte)
- {
--	pte = mask_rw_pte(ptep, pte);
-+	pte = filter_pte(ptep, pte);
- 
- 	xen_set_pte(ptep, pte);
- }
--#endif
- 
- static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
- {
-@@ -1616,6 +1737,7 @@ static void *m2v(phys_addr_t maddr)
+@@ -1616,6 +1729,7 @@ static void *m2v(phys_addr_t maddr)
  	return __ka(m2p(maddr));
  }
  
@@ -4013,7 +3952,7 @@ index 4ceb285..e23f89f 100644
  static void set_page_prot(void *addr, pgprot_t prot)
  {
  	unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
-@@ -1671,6 +1793,20 @@ static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
+@@ -1671,6 +1785,20 @@ static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
  	set_page_prot(pmd, PAGE_KERNEL_RO);
  }
  
@@ -4034,7 +3973,7 @@ index 4ceb285..e23f89f 100644
  #ifdef CONFIG_X86_64
  static void convert_pfn_mfn(void *v)
  {
-@@ -1762,6 +1898,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+@@ -1762,6 +1890,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
  					 unsigned long max_pfn)
  {
  	pmd_t *kernel_pmd;
@@ -4042,7 +3981,7 @@ index 4ceb285..e23f89f 100644
  
  	max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->pt_base) +
  				  xen_start_info->nr_pt_frames * PAGE_SIZE +
-@@ -1773,6 +1910,20 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+@@ -1773,6 +1902,20 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
  	xen_map_identity_early(level2_kernel_pgt, max_pfn);
  
  	memcpy(swapper_pg_dir, pgd, sizeof(pgd_t) * PTRS_PER_PGD);
@@ -4063,7 +4002,7 @@ index 4ceb285..e23f89f 100644
  	set_pgd(&swapper_pg_dir[KERNEL_PGD_BOUNDARY],
  			__pgd(__pa(level2_kernel_pgt) | _PAGE_PRESENT));
  
-@@ -1824,9 +1975,25 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
+@@ -1824,9 +1967,25 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
  		pte = pfn_pte(phys, prot);
  		break;
  
@@ -4090,7 +4029,7 @@ index 4ceb285..e23f89f 100644
  	}
  
  	__native_set_fixmap(idx, pte);
-@@ -1841,6 +2008,29 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
+@@ -1841,6 +2000,29 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
  #endif
  }
  
@@ -4120,19 +4059,7 @@ index 4ceb285..e23f89f 100644
  __init void xen_post_allocator_init(void)
  {
  	pv_mmu_ops.set_pte = xen_set_pte;
-@@ -1906,11 +2096,7 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
- 	.kmap_atomic_pte = xen_kmap_atomic_pte,
- #endif
- 
--#ifdef CONFIG_X86_64
--	.set_pte = xen_set_pte,
--#else
- 	.set_pte = xen_set_pte_init,
--#endif
- 	.set_pte_at = xen_set_pte_at,
- 	.set_pmd = xen_set_pmd_hyper,
- 
-@@ -1955,6 +2141,271 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
+@@ -1955,6 +2137,271 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
  };
  
  
@@ -4556,7 +4483,7 @@ index 0000000..07b59fe
 +	}
 +}
 diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
-index ad0047f..c0304a1 100644
+index ad0047f..2439456 100644
 --- a/arch/x86/xen/setup.c
 +++ b/arch/x86/xen/setup.c
 @@ -19,6 +19,7 @@
@@ -4567,19 +4494,15 @@ index ad0047f..c0304a1 100644
  #include <xen/interface/physdev.h>
  #include <xen/features.h>
  
-@@ -36,21 +37,63 @@ extern void xen_syscall32_target(void);
+@@ -36,21 +37,62 @@ extern void xen_syscall32_target(void);
  /**
   * machine_specific_memory_setup - Hook for machine specific memory setup.
   **/
 -
  char * __init xen_memory_setup(void)
  {
--	unsigned long max_pfn = xen_start_info->nr_pages;
--
--	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);
-+	unsigned long nrpages = min(xen_start_info->nr_pages, MAX_DOMAIN_PAGES);
-+	unsigned long long mem_limit = PFN_PHYS((u64)MAX_DOMAIN_PAGES);
-+	unsigned long long mem_max = 0;
+ 	unsigned long max_pfn = xen_start_info->nr_pages;
++	unsigned long long mem_end;
 +	int rc;
 +	struct xen_memory_map memmap;
 +	/*
@@ -4591,6 +4514,9 @@ index ad0047f..c0304a1 100644
 +		XENMEM_machine_memory_map :
 +		XENMEM_memory_map;
 +	int i;
+ 
+ 	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);
++	mem_end = PFN_PHYS((u64)max_pfn);
 +
 +	memmap.nr_entries = E820MAX;
 +	set_xen_guest_handle(memmap.buffer, map);
@@ -4599,7 +4525,7 @@ index ad0047f..c0304a1 100644
 +	if (rc == -ENOSYS) {
 +		memmap.nr_entries = 1;
 +		map[0].addr = 0ULL;
-+		map[0].size = xen_start_info->nr_pages;
++		map[0].size = mem_end;
 +		/* 8MB slack (to balance backend allocations). */
 +		map[0].size += 8ULL << 20;
 +		map[0].type = E820_RAM;
@@ -4613,15 +4539,12 @@ index ad0047f..c0304a1 100644
 +	for (i = 0; i < memmap.nr_entries; i++) {
 +		unsigned long long end = map[i].addr + map[i].size;
 +		if (map[i].type == E820_RAM) {
-+			if (map[i].addr > mem_limit)
++			if (map[i].addr > mem_end)
 +				continue;
-+			if (end > mem_limit) {
-+				/* Truncate region to mem_limit. */
-+				map[i].size -= end - mem_limit;
-+				end = mem_limit;
++			if (end > mem_end) {
++				/* Truncate region to max_mem. */
++				map[i].size -= end - mem_end;
 +			}
-+			if (end > mem_max)
-+				mem_max = end;
 +		}
 +		if (map[i].size > 0)
 +			e820_add_region(map[i].addr, map[i].size, map[i].type);
@@ -4637,19 +4560,7 @@ index ad0047f..c0304a1 100644
  	 */
  	e820_add_region(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS,
  			E820_RESERVED);
-@@ -65,6 +108,11 @@ char * __init xen_memory_setup(void)
- 		      __pa(xen_start_info->pt_base),
- 			"XEN START INFO");
- 
-+	/*
-+	 * Reserve extra memory for the balloon driver.
-+	 */
-+	reserve_early(nrpages * PAGE_SIZE, mem_max, "XEN BALLOON");
-+
- 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
- 
- 	return "Xen";
-@@ -188,7 +236,5 @@ void __init xen_arch_setup(void)
+@@ -188,7 +230,5 @@ void __init xen_arch_setup(void)
  
  	pm_idle = xen_idle;
  
@@ -5624,7 +5535,7 @@ index 0000000..e6d3d0e
 +	return HYPERVISOR_dom0_op(&op);
 +}
 diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
-index f5bbd9e..168e61f 100644
+index f5bbd9e..939721e 100644
 --- a/drivers/xen/balloon.c
 +++ b/drivers/xen/balloon.c
 @@ -43,6 +43,7 @@
@@ -5786,17 +5697,7 @@ index f5bbd9e..168e61f 100644
  
  	init_timer(&balloon_timer);
  	balloon_timer.data = 0;
-@@ -442,8 +417,7 @@ static int __init balloon_init(void)
- 	/* Initialise the balloon with excess memory space. */
- 	for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
- 		page = pfn_to_page(pfn);
--		if (!PageReserved(page))
--			balloon_append(page);
-+		balloon_append(page);
- 	}
- 
- 	target_watch.callback = watch_target;
-@@ -464,6 +438,101 @@ static void balloon_exit(void)
+@@ -464,6 +439,101 @@ static void balloon_exit(void)
  
  module_exit(balloon_exit);
  
@@ -5898,7 +5799,7 @@ index f5bbd9e..168e61f 100644
  #define BALLOON_SHOW(name, format, args...)				\
  	static ssize_t show_##name(struct sys_device *dev,		\
  				   struct sysdev_attribute *attr,	\
-@@ -476,9 +545,6 @@ module_exit(balloon_exit);
+@@ -476,9 +546,6 @@ module_exit(balloon_exit);
  BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(balloon_stats.current_pages));
  BALLOON_SHOW(low_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_low));
  BALLOON_SHOW(high_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_high));
@@ -5908,7 +5809,7 @@ index f5bbd9e..168e61f 100644
  BALLOON_SHOW(driver_kb, "%lu\n", PAGES2KB(balloon_stats.driver_pages));
  
  static ssize_t show_target_kb(struct sys_device *dev, struct sysdev_attribute *attr,
-@@ -548,7 +614,6 @@ static struct attribute *balloon_info_attrs[] = {
+@@ -548,7 +615,6 @@ static struct attribute *balloon_info_attrs[] = {
  	&attr_current_kb.attr,
  	&attr_low_kb.attr,
  	&attr_high_kb.attr,


--- config-sparc64-smp DELETED ---



From krh at fedoraproject.org  Thu Aug 13 18:36:36 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 13 Aug 2009 18:36:36 +0000 (UTC)
Subject: rpms/kernel/F-11 drm-i915-gem-bad-bug-on.patch, NONE,
	1.1.2.1 kernel.spec, 1.1679.2.5, 1.1679.2.6
Message-ID: <20090813183636.A8C7F11C0349@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25695

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	drm-i915-gem-bad-bug-on.patch 
Log Message:
* Thu Aug 13 2009 Kristian H?gsberg <krh at redhat.com> - 2.6.29.6-217.2.6
- Backport 0e7ddf7e to fix bad BUG_ON() in i915 gem fence management
  code.  Adds drm-i915-gem-bad-bug-on.patch, fixes #514091.


drm-i915-gem-bad-bug-on.patch:
 i915_gem.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE drm-i915-gem-bad-bug-on.patch ---
commit 0e7ddf7eeeef5aea85412120539ab5369577faeb
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jun 4 11:18:14 2009 +0000

    drm/i915: Remove a bad BUG_ON in the fence management code.
    
    This could be triggered by a gtt mapping fault on 965 that decides to
    remove the fence from another object that happens to be active currently.
    Since the other object doesn't rely on the fence reg for its execution, we
    don't wait for it to finish.  We'll soon be not waiting on 915 most of the
    time as well, so just drop the BUG_ON.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 670d128..39f5c65 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2260,9 +2260,6 @@ try_again:
 			goto try_again;
 		}
 
-		BUG_ON(old_obj_priv->active ||
-		       (reg->obj->write_domain & I915_GEM_GPU_DOMAINS));
-
 		/*
 		 * Zap this virtual mapping so we can set up a fence again
 		 * for this object next time we need it.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.5
retrieving revision 1.1679.2.6
diff -u -p -r1.1679.2.5 -r1.1679.2.6
--- kernel.spec	12 Aug 2009 18:13:10 -0000	1.1679.2.5
+++ kernel.spec	13 Aug 2009 18:36:36 -0000	1.1679.2.6
@@ -739,6 +739,7 @@ Patch1846: drm-radeon-cs-oops-fix.patch
 Patch1847: drm-intel-a17-fix.patch
 Patch1848: drm-pnp-add-resource-range-checker.patch
 Patch1849: drm-i915-enable-mchbar.patch
+Patch1850: drm-i915-gem-bad-bug-on.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1476,6 +1477,7 @@ ApplyPatch drm-radeon-cs-oops-fix.patch
 ApplyPatch drm-intel-a17-fix.patch
 ApplyPatch drm-pnp-add-resource-range-checker.patch
 ApplyPatch drm-i915-enable-mchbar.patch
+ApplyPatch drm-i915-gem-bad-bug-on.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2135,6 +2137,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 13 2009 Kristian H?gsberg <krh at redhat.com> - 2.6.29.6-217.2.6
+- Backport 0e7ddf7e to fix bad BUG_ON() in i915 gem fence management
+  code.  Adds drm-i915-gem-bad-bug-on.patch, fixes #514091.
+
 * Wed Aug 12 2009 John W. Linville <linville at redhat.com> 2.6.29.6-217.2.5
 - iwlwifi: fix TX queue race
 



From rjones at fedoraproject.org  Thu Aug 13 18:15:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 13 Aug 2009 18:15:35 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec, 1.91,
	1.92 0001-Allow-network-interface-to-be-configured.patch, 1.1, NONE
Message-ID: <20090813181535.E352511C0349@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20593

Modified Files:
	libguestfs.spec 
Removed Files:
	0001-Allow-network-interface-to-be-configured.patch 
Log Message:
Workaround for RHBZ#516022 no longer required - removed.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- libguestfs.spec	13 Aug 2009 18:09:07 -0000	1.91
+++ libguestfs.spec	13 Aug 2009 18:15:35 -0000	1.92
@@ -5,16 +5,13 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.67
-Release:     1%{?dist}
+Release:     2%{?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
 
-Patch0:      0001-Allow-network-interface-to-be-configured.patch
-BuildRequires: automake, autoconf, libtool, gettext, gettext-devel, cvs
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -296,9 +293,6 @@ Requires:    jpackage-utils
 
 mkdir -p daemon/m4
 
-%patch0 -p1
-autoreconf -i
-
 
 %build
 %if %{buildnonet}
@@ -310,14 +304,12 @@ createrepo repo
 %define extra %nil
 %endif
 
-# --with-net-if=ne2k_pci is a workaround for RHBZ#516022.
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
   --mandir=%{_mandir} \
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   --enable-debug-command \
   --enable-supermin \
-  --with-net-if=ne2k_pci \
   %{extra}
 
 # This ensures that /usr/sbin/chroot is on the path.  Not needed
@@ -349,7 +341,7 @@ export LIBGUESTFS_DEBUG=1
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu (FIXED)
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
-#                                 (WORKAROUND ENABLED)
+#                                 (FIXED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 # 516543   ?            F-12   qemu-kvm segfaults when run inside a VM
 
@@ -549,7 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
+* Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-2
 - New upstream release 1.0.67.
 
 * Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-5


--- 0001-Allow-network-interface-to-be-configured.patch DELETED ---



From myoung at fedoraproject.org  Thu Aug 13 18:16:23 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 13 Aug 2009 18:16:23 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1294.2.49,1.1294.2.50
Message-ID: <20090813181623.3E51411C0349@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20678

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec 
Log Message:
fix typo



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.49
retrieving revision 1.1294.2.50
diff -u -p -r1.1294.2.49 -r1.1294.2.50
--- kernel.spec	13 Aug 2009 18:13:04 -0000	1.1294.2.49
+++ kernel.spec	13 Aug 2009 18:16:22 -0000	1.1294.2.50
@@ -1986,7 +1986,7 @@ fi
 # and build.
 
 %changelog
-* Tue Aug 11 2009 Michael Young <m.a.young at durham.ac.uk>
+* Thu Aug 13 2009 Michael Young <m.a.young at durham.ac.uk>
 - add another rebase/master update
 
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>



From mclasen at fedoraproject.org  Thu Aug 13 18:26:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 13 Aug 2009 18:26:39 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.364, 1.365 polkit1.patch,
	1.1, 1.2
Message-ID: <20090813182639.1292411C0349@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22631

Modified Files:
	gnome-panel.spec polkit1.patch 
Log Message:
Stricter clock applet policy



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -p -r1.364 -r1.365
--- gnome-panel.spec	6 Aug 2009 00:24:40 -0000	1.364
+++ gnome-panel.spec	13 Aug 2009 18:26:38 -0000	1.365
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.27.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -370,6 +370,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-8
+- Stricter clock-applet PolicyKit policy
+
 * Wed Aug  5 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-7
 - Make 'Clear Recent Documents' follow the menu-images setting
 

polkit1.patch:
 applets/clock/Makefile.am                               |   10 
 applets/clock/clock-location.c                          |    3 
 applets/clock/clock.c                                   |    4 
 applets/clock/gnome-clock-applet-mechanism.c            |  146 ++++----
 applets/clock/gnome-clock-applet-mechanism.h            |    5 
 applets/clock/gnome-clock-applet-mechanism.xml          |    8 
 applets/clock/org.gnome.clockapplet.mechanism.policy.in |    6 
 applets/clock/set-timezone.c                            |  274 +++-------------
 applets/clock/set-timezone.h                            |    2 
 configure.in                                            |   20 -
 10 files changed, 169 insertions(+), 309 deletions(-)

Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- polkit1.patch	10 Jun 2009 04:20:34 -0000	1.1
+++ polkit1.patch	13 Aug 2009 18:26:38 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.26.1/applets/clock/clock.c.polkit1 gnome-panel-2.26.1/applets/clock/clock.c
---- gnome-panel-2.26.1/applets/clock/clock.c.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock.c	2009-05-13 17:53:57.490936276 -0400
-@@ -1707,7 +1707,7 @@ update_set_time_button (ClockData *cd)
+diff -up gnome-panel-2.27.4/applets/clock/clock.c.polkit1 gnome-panel-2.27.4/applets/clock/clock.c
+--- gnome-panel-2.27.4/applets/clock/clock.c.polkit1	2009-07-01 09:06:23.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/clock.c	2009-08-13 14:09:17.734209990 -0400
+@@ -1617,7 +1617,7 @@ update_set_time_button (ClockData *cd)
  {
  	gint can_set;
  
@@ -10,7 +10,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
  
  	if (cd->time_settings_button)
  		gtk_widget_set_sensitive (cd->time_settings_button, can_set);
-@@ -1770,7 +1770,7 @@ set_time (GtkWidget *widget, ClockData *
+@@ -1680,7 +1680,7 @@ set_time (GtkWidget *widget, ClockData *
  
  	tim = mktime (&t);
  
@@ -19,9 +19,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
  }
  
  static void
-diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1 gnome-panel-2.26.1/applets/clock/clock-location.c
---- gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1	2009-05-13 17:53:57.477962768 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock-location.c	2009-05-13 17:53:57.491936414 -0400
+diff -up gnome-panel-2.27.4/applets/clock/clock-location.c.polkit1 gnome-panel-2.27.4/applets/clock/clock-location.c
+--- gnome-panel-2.27.4/applets/clock/clock-location.c.polkit1	2009-08-13 14:09:17.708956705 -0400
++++ gnome-panel-2.27.4/applets/clock/clock-location.c	2009-08-13 14:09:17.737208766 -0400
 @@ -537,8 +537,7 @@ clock_location_make_current (ClockLocati
  
          filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
@@ -32,9 +32,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
  				   mcdata,
                                     free_make_current_data);
          g_free (filename);
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1 gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c	2009-05-13 18:00:51.818938425 -0400
+diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c
+--- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c.polkit1	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c	2009-08-13 14:09:17.739206856 -0400
 @@ -37,7 +37,7 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
@@ -233,9 +233,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
  
 +	return TRUE;
  }
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1 gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h	2009-05-13 17:53:57.493994728 -0400
+diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h
+--- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h.polkit1	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h	2009-08-13 14:09:17.740206913 -0400
 @@ -69,9 +69,14 @@ gboolean            gnome_clock_applet_m
                                                                 const char                   *zone_file,
                                                                 DBusGMethodInvocation        *context);
@@ -251,9 +251,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
  
  gboolean            gnome_clock_applet_mechanism_adjust_time  (GnomeClockAppletMechanism    *mechanism,
                                                                 gint64                        seconds_to_add,
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml	2009-05-13 17:53:57.494962879 -0400
+diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml
+--- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml.polkit1	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml	2009-08-13 14:09:17.741205993 -0400
 @@ -5,10 +5,18 @@
        <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
        <arg name="zonefile" direction="in" type="s"/>
@@ -273,10 +273,10 @@ diff -up gnome-panel-2.26.1/applets/cloc
      <method name="AdjustTime">
        <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
        <arg name="seconds_to_add" direction="in" type="x"/>
-diff -up gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1 gnome-panel-2.26.1/applets/clock/Makefile.am
---- gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/Makefile.am	2009-05-13 17:53:57.495947232 -0400
-@@ -7,7 +7,7 @@ INCLUDES =							\
+diff -up gnome-panel-2.27.4/applets/clock/Makefile.am.polkit1 gnome-panel-2.27.4/applets/clock/Makefile.am
+--- gnome-panel-2.27.4/applets/clock/Makefile.am.polkit1	2009-07-01 09:06:23.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/Makefile.am	2009-08-13 14:09:17.742205491 -0400
+@@ -9,7 +9,7 @@ INCLUDES =							\
  	$(GNOME_INCLUDEDIR)					\
  	$(WARN_CFLAGS)						\
  	$(CLOCK_CFLAGS)						\
@@ -285,7 +285,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
  	$(LIBPANEL_APPLET_CFLAGS)				\
  	-DDATADIR=\""$(datadir)"\"				\
  	-DGLADEDIR=\""$(datadir)/gnome-panel/glade"\"		\
-@@ -66,7 +66,7 @@ CLOCK_LDADD =						\
+@@ -67,7 +67,7 @@ CLOCK_LDADD =						\
  	../../libpanel-applet/libpanel-applet-2.la	\
  	$(CLOCK_LIBS)					\
  	$(LIBPANEL_APPLET_LIBS)				\
@@ -294,7 +294,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
  	-lgweather
  
  BUILT_SOURCES =					\
-@@ -128,11 +128,11 @@ endif
+@@ -132,11 +132,11 @@ endif
  
  gnome_clock_applet_mechanism_INCLUDES =	\
  	$(CLOCK_MECHANISM_CFLAGS) 	\
@@ -308,7 +308,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
  
  if CLOCK_INPROCESS
  APPLET_TYPE     = shlib
-@@ -201,7 +201,7 @@ endif
+@@ -206,7 +206,7 @@ endif
  
  dbus_servicesdir = $(datadir)/dbus-1/system-services
  dbus_confdir = $(sysconfdir)/dbus-1/system.d
@@ -317,15 +317,15 @@ diff -up gnome-panel-2.26.1/applets/cloc
  
  dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
  polkit_in_files = org.gnome.clockapplet.mechanism.policy.in
-diff -up gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in
---- gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in	2009-05-13 17:53:57.496936685 -0400
+diff -up gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in
+--- gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in	2009-08-13 14:21:10.175979956 -0400
 @@ -13,7 +13,7 @@
      <_message>Privileges are required to change the system time zone.</_message>
      <defaults>
        <allow_inactive>no</allow_inactive>
 -      <allow_active>auth_self_keep_always</allow_active>
-+      <allow_active>auth_self_keep</allow_active>
++      <allow_active>auth_admin_keep</allow_active>
      </defaults>
    </action>
  
@@ -334,7 +334,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
      <defaults>
        <allow_inactive>no</allow_inactive>
 -      <allow_active>auth_self_keep_always</allow_active>
-+      <allow_active>auth_self_keep</allow_active>
++      <allow_active>auth_admin_keep</allow_active>
      </defaults>
    </action>
  
@@ -343,13 +343,13 @@ diff -up gnome-panel-2.26.1/applets/cloc
      <defaults>
        <allow_inactive>no</allow_inactive>
 -      <allow_active>auth_self_keep_always</allow_active>
-+      <allow_active>auth_self_keep</allow_active>
++      <allow_active>auth_admin_keep</allow_active>
      </defaults>
    </action>
  
-diff -up gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1 gnome-panel-2.26.1/applets/clock/set-timezone.c
---- gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/set-timezone.c	2009-05-13 17:53:57.497965108 -0400
+diff -up gnome-panel-2.27.4/applets/clock/set-timezone.c.polkit1 gnome-panel-2.27.4/applets/clock/set-timezone.c
+--- gnome-panel-2.27.4/applets/clock/set-timezone.c.polkit1	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/set-timezone.c	2009-08-13 14:09:17.744960941 -0400
 @@ -32,31 +32,8 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
@@ -719,9 +719,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
  	data->callback = callback;
  	data->data = d;
  	data->notify = notify;
-diff -up gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1 gnome-panel-2.26.1/applets/clock/set-timezone.h
---- gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1	2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/set-timezone.h	2009-05-13 17:53:57.498936332 -0400
+diff -up gnome-panel-2.27.4/applets/clock/set-timezone.h.polkit1 gnome-panel-2.27.4/applets/clock/set-timezone.h
+--- gnome-panel-2.27.4/applets/clock/set-timezone.h.polkit1	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/set-timezone.h	2009-08-13 14:09:17.745957855 -0400
 @@ -28,13 +28,11 @@ gint     can_set_system_timezone (void);
  gint     can_set_system_time     (void);
  
@@ -736,9 +736,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
                                        GFunc           callback,
                                        gpointer        data,
                                        GDestroyNotify  notify);
-diff -up gnome-panel-2.26.1/configure.in.polkit1 gnome-panel-2.26.1/configure.in
---- gnome-panel-2.26.1/configure.in.polkit1	2009-04-14 16:15:50.000000000 -0400
-+++ gnome-panel-2.26.1/configure.in	2009-05-13 17:53:57.498936332 -0400
+diff -up gnome-panel-2.27.4/configure.in.polkit1 gnome-panel-2.27.4/configure.in
+--- gnome-panel-2.27.4/configure.in.polkit1	2009-07-15 11:05:33.000000000 -0400
++++ gnome-panel-2.27.4/configure.in	2009-08-13 14:09:17.746976770 -0400
 @@ -129,24 +129,21 @@ PKG_CHECK_MODULES(CLOCK_MECHANISM, [ gth
  AC_SUBST(CLOCK_MECHANISM_CFLAGS)
  AC_SUBST(CLOCK_MECHANISM_LIBS)



From jcollie at fedoraproject.org  Thu Aug 13 18:30:40 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 13 Aug 2009 18:30:40 +0000 (UTC)
Subject: rpms/pitivi/F-11 .cvsignore, 1.16, 1.17 pitivi.spec, 1.36,
	1.37 sources, 1.16, 1.17
Message-ID: <20090813183040.AD53711C0439@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23731

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Thu Aug 13 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-1
- Update to 0.13.2 "Jailbreak (out of Deadlock City)"
- 
- The PiTiVi team is proud to announce the second release in the
- unstable 0.13 PiTiVi series.
- 
- Due to its dependency on GStreamer, The PiTiVi team strongly
- recommends users have all official latest gstreamer libraries and
- plugins installed for the best user experience.
- 
- Features of this release
- 
-    * Undo/Redo support
-    * Audio mixing
-    * Ripple/Roll edit
-    * misc fixes everywhere 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Aug 2009 21:14:08 -0000	1.16
+++ .cvsignore	13 Aug 2009 18:30:40 -0000	1.17
@@ -1 +1 @@
-pitivi-0.13.1.3.tar.bz2
+pitivi-0.13.2.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/pitivi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- pitivi.spec	12 Aug 2009 21:14:08 -0000	1.36
+++ pitivi.spec	13 Aug 2009 18:30:40 -0000	1.37
@@ -1,5 +1,5 @@
 %define major   0.13
-%define minor   1.3
+%define minor   2
 Name:           pitivi
 Version:        %{major}.%{minor}
 Release:        1%{?dist}
@@ -80,6 +80,23 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Thu Aug 13 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-1
+- Update to 0.13.2 "Jailbreak (out of Deadlock City)"
+- 
+- The PiTiVi team is proud to announce the second release in the
+- unstable 0.13 PiTiVi series.
+- 
+- Due to its dependency on GStreamer, The PiTiVi team strongly
+- recommends users have all official latest gstreamer libraries and
+- plugins installed for the best user experience.
+- 
+- Features of this release
+- 
+-    * Undo/Redo support
+-    * Audio mixing
+-    * Ripple/Roll edit
+-    * misc fixes everywhere 
+
 * Wed Aug 12 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.1.3-1
 - Update to latest prerelease.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Aug 2009 21:14:08 -0000	1.16
+++ sources	13 Aug 2009 18:30:40 -0000	1.17
@@ -1 +1 @@
-8ffc110eef126d6dd6bb82f18c4e0ba0  pitivi-0.13.1.3.tar.bz2
+bb5053faf283fd5ba1f77fce50143184  pitivi-0.13.2.tar.bz2



From mclasen at fedoraproject.org  Thu Aug 13 18:44:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 13 Aug 2009 18:44:36 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.245,1.246
Message-ID: <20090813184436.1004F11C0349@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27241

Modified Files:
	gnome-session.spec 
Log Message:
Require polkit-desktop-policy



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- gnome-session.spec	29 Jul 2009 03:24:19 -0000	1.245
+++ gnome-session.spec	13 Aug 2009 18:44:35 -0000	1.246
@@ -10,7 +10,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.27.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.27/%{name}-%{version}.tar.bz2
 Source2: gnome.desktop
@@ -34,6 +34,8 @@ Requires: dbus-x11
 
 # we need an authentication agent in the session
 Requires: polkit-gnome
+# and we want good defaults
+Requires: polkit-desktop-policy
 
 ## we conflict with gdm that contains the GNOME gdm xsession
 Conflicts: gdm < 1:2.6.0.8-5
@@ -175,10 +177,12 @@ fi
 
 
 %changelog
+* Thu Aug 13 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.5-2
+- Require polkit-desktop-policy
+
 * Tue Jul 28 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 
-:a
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Thu Aug 13 18:57:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 13 Aug 2009 18:57:30 +0000 (UTC)
Subject: rpms/mesa/devel .cvsignore, 1.35, 1.36 mesa.spec, 1.250,
	1.251 sources, 
	1.37, 1.38 mesa-7.1-disable-intel-classic-warn.patch, 1.3, NONE
Message-ID: <20090813185730.4C44211C0349@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29921

Modified Files:
	.cvsignore mesa.spec sources 
Removed Files:
	mesa-7.1-disable-intel-classic-warn.patch 
Log Message:
* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 7.6-0.9
- Today's git snap.
- mesa-7.1-disable-intel-classic-warn.patch: Drop.
- mesa-7.6-hush-vblank-warning.patch: Hush the drmWaitVBlank() warning.
- Add -dri-drivers-experimental package, add r600 to it.  Note: experimental
  means it doesn't work, don't file bugs unless they contain patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	23 Jul 2009 02:15:26 -0000	1.35
+++ .cvsignore	13 Aug 2009 18:57:29 -0000	1.36
@@ -4,3 +4,4 @@ MesaDemos-7.3.tar.bz2
 MesaLib-7.3.tar.bz2
 mesa-20090322.tar.bz2
 mesa-20090723.tar.bz2
+mesa-20090813.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- mesa.spec	6 Aug 2009 18:04:05 -0000	1.250
+++ mesa.spec	13 Aug 2009 18:57:29 -0000	1.251
@@ -13,7 +13,7 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090723
+%define gitdate 20090813
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -44,10 +44,10 @@ Patch3: mesa-no-mach64.patch
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
 
-Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
 Patch20: mesa-7.6-dri2-page-flip.patch
+Patch30: mesa-7.6-hush-vblank-warning.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_hardware}
@@ -93,6 +93,13 @@ Group: User Interface/X Hardware Support
 Mesa-based DRI drivers.
 
 
+%package dri-drivers-experimental
+Summary: Mesa-based DRI drivers (experimental)
+Group: User Interface/X Hardware Support
+%description dri-drivers-experimental
+Mesa-based DRI drivers (experimental).
+
+
 %package libGL-devel
 Summary: Mesa libGL development package
 Group: Development/Libraries
@@ -171,9 +178,9 @@ This package provides some demo applicat
 %patch3 -p1 -b .no-mach64
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
-%patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
 %patch20 -p1 -b .dri2-page-flip
+%patch30 -p1 -b .vblank-warning
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa,' progs/demos/*.c
@@ -229,7 +236,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
     --disable-gl-osmesa \
     --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
-    %{dri_drivers}
+    %{?dri_drivers}
 
 make #{?_smp_mflags}
 
@@ -242,6 +249,7 @@ make %{?_smp_mflags}
 popd
 
 pushd ../%{manpages}
+autoreconf -v --install
 %configure
 make %{?_smp_mflags}
 popd
@@ -255,7 +263,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI
 # just the DRI drivers that are sane
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
-for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis swrast tdfx unichrome; do
+for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome; do
     so=%{_lib}/${f}_dri.so
     test -e $so && echo $so
 done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
@@ -319,6 +327,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/dri
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
+%exclude %{_libdir}/dri/r600_dri.so
+
+%files dri-drivers-experimental
+%defattr(-,root,root,-)
+%{_libdir}/dri/r600_dri.so
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -374,6 +387,13 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 7.6-0.9
+- Today's git snap.
+- mesa-7.1-disable-intel-classic-warn.patch: Drop.
+- mesa-7.6-hush-vblank-warning.patch: Hush the drmWaitVBlank() warning.
+- Add -dri-drivers-experimental package, add r600 to it.  Note: experimental
+  means it doesn't work, don't file bugs unless they contain patches.
+
 * Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 7.6-0.8
 - Build --disable-asm on x86 since it makes everything all textrel'y and
   that makes selinux unhappy.  Strictly we only need to disable the asm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	23 Jul 2009 02:15:27 -0000	1.37
+++ sources	13 Aug 2009 18:57:30 -0000	1.38
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-b3547e33cef106021dac5f5ff44e6bc6  mesa-20090723.tar.bz2
+e4b84f75a05c52325edde32c0fb72f09  mesa-20090813.tar.bz2


--- mesa-7.1-disable-intel-classic-warn.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Aug 13 19:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 19:07:28 +0000
Subject: [pkgdb] php-adodb (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090813190728.CECEB10F8D7@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for php-adodb
tibbs has set commit to Approved for 107427 on php-adodb (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on php-adodb (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on php-adodb (Fedora EPEL 5)
tibbs changed owner of php-adodb in Fedora EPEL 5 to topdog
tibbs changed owner of php-adodb in Fedora EPEL 5 to topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Thu Aug 13 19:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 19:07:56 +0000
Subject: [pkgdb] php-adodb (Fedora EPEL, 4) updated by tibbs
Message-ID: <20090813190756.4B7DE10F8DB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for php-adodb
tibbs has set commit to Approved for 107427 on php-adodb (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on php-adodb (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on php-adodb (Fedora EPEL 4)
tibbs changed owner of php-adodb in Fedora EPEL 4 to topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From plindner at fedoraproject.org  Thu Aug 13 20:32:43 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Thu, 13 Aug 2009 20:32:43 +0000 (UTC)
Subject: rpms/memcached/EL-4 memcached.spec,1.3,1.4
Message-ID: <20090813203243.9865A11C00EF@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2742

Modified Files:
	memcached.spec 
Log Message:
fix for init script for EL-4, Patch from Ingvar Hagelund


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/EL-4/memcached.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- memcached.spec	24 Jul 2009 05:50:55 -0000	1.3
+++ memcached.spec	13 Aug 2009 20:32:41 -0000	1.4
@@ -35,6 +35,14 @@ web applications by alleviating database
 
 make %{?_smp_mflags}
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?rhel} <= 4 && 0%{?fedora} <= 8
+        # Old style daemon function
+        sed -i 's,--pidfile /var/run/memcached/memcached.pid,,g;
+                s,status -p /var/run/memcached/memcached.pid,status,g;
+                s,killproc -p /var/run/memcached/memcached.pid,killproc,g' \
+       %{SOURCE1} 
+%endif
+
 
 %check
 # remove failing test that doesn't work in
@@ -101,6 +109,9 @@ exit 0
 
 
 %changelog
+* Thu Aug 13 2009 Paul Lindner <lindner at mirth.inuus.com> - 1.2.8-1
+- Fix init script for EL-4, patch from Ingvar Hagelund
+
 * Thu Jul 23 2009 Paul Lindner <lindner at mirth.inuus.com> - 1.2.8-1
 - Upgrade to memcache 1.2.8
 



From robert at fedoraproject.org  Thu Aug 13 20:50:32 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 13 Aug 2009 20:50:32 +0000 (UTC)
Subject: rpms/digitemp/devel digitemp.spec,1.6,1.7
Message-ID: <20090813205032.597FB11C043D@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6396

Modified Files:
	digitemp.spec 
Log Message:
Run 'make clean' after each make for working USB (#517284)



Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/devel/digitemp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- digitemp.spec	24 Jul 2009 20:16:55 -0000	1.6
+++ digitemp.spec	13 Aug 2009 20:50:30 -0000	1.7
@@ -3,7 +3,7 @@
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
 Version:           3.6.0
-Release:           3%{?dist}
+Release:           4%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
@@ -32,8 +32,10 @@ cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
+make clean
 make ds9097u %{?_smp_mflags}
 %if %{with_libusb}
+make clean
 make ds2490 %{?_smp_mflags}
 %endif
 
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-4
+- Run 'make clean' after each make for working USB (#517284)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Thu Aug 13 21:13:18 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 13 Aug 2009 21:13:18 +0000 (UTC)
Subject: rpms/digitemp/F-11 digitemp.spec,1.5,1.6
Message-ID: <20090813211318.BA3EE11C0439@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9769/F-11

Modified Files:
	digitemp.spec 
Log Message:
Run 'make clean' after each make for working USB (#517284)



Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-11/digitemp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- digitemp.spec	23 Feb 2009 20:39:18 -0000	1.5
+++ digitemp.spec	13 Aug 2009 21:13:18 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
 Version:           3.6.0
-Release:           2%{?dist}
+Release:           4%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
@@ -32,8 +32,10 @@ cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
+make clean
 make ds9097u %{?_smp_mflags}
 %if %{with_libusb}
+make clean
 make ds2490 %{?_smp_mflags}
 %endif
 
@@ -61,6 +63,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-4
+- Run 'make clean' after each make for working USB (#517284)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-2
 - Rebuilt against gcc 4.4 and rpm 4.6
 



From robert at fedoraproject.org  Thu Aug 13 21:13:18 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 13 Aug 2009 21:13:18 +0000 (UTC)
Subject: rpms/digitemp/EL-5 digitemp.spec,1.3,1.4
Message-ID: <20090813211318.B413F11C02CC@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9769/EL-5

Modified Files:
	digitemp.spec 
Log Message:
Run 'make clean' after each make for working USB (#517284)



Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/digitemp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- digitemp.spec	25 Jan 2009 20:16:59 -0000	1.3
+++ digitemp.spec	13 Aug 2009 21:13:17 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
 Version:           3.6.0
-Release:           1%{?dist}
+Release:           4%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
@@ -32,8 +32,10 @@ cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
+make clean
 make ds9097u %{?_smp_mflags}
 %if %{with_libusb}
+make clean
 make ds2490 %{?_smp_mflags}
 %endif
 
@@ -61,6 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-4
+- Run 'make clean' after each make for working USB (#517284)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
 - Upgrade to 3.6.0
 



From robert at fedoraproject.org  Thu Aug 13 21:13:18 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 13 Aug 2009 21:13:18 +0000 (UTC)
Subject: rpms/digitemp/EL-4 digitemp.spec,1.3,1.4
Message-ID: <20090813211318.B0F9811C00EF@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9769/EL-4

Modified Files:
	digitemp.spec 
Log Message:
Run 'make clean' after each make for working USB (#517284)



Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-4/digitemp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- digitemp.spec	25 Jan 2009 20:16:59 -0000	1.3
+++ digitemp.spec	13 Aug 2009 21:13:17 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
 Version:           3.6.0
-Release:           1%{?dist}
+Release:           4%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
@@ -32,8 +32,10 @@ cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
+make clean
 make ds9097u %{?_smp_mflags}
 %if %{with_libusb}
+make clean
 make ds2490 %{?_smp_mflags}
 %endif
 
@@ -61,6 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-4
+- Run 'make clean' after each make for working USB (#517284)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
 - Upgrade to 3.6.0
 



From robert at fedoraproject.org  Thu Aug 13 21:13:18 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Thu, 13 Aug 2009 21:13:18 +0000 (UTC)
Subject: rpms/digitemp/F-10 digitemp.spec,1.4,1.5
Message-ID: <20090813211318.B744211C0349@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9769/F-10

Modified Files:
	digitemp.spec 
Log Message:
Run 'make clean' after each make for working USB (#517284)



Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-10/digitemp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- digitemp.spec	25 Jan 2009 20:16:59 -0000	1.4
+++ digitemp.spec	13 Aug 2009 21:13:18 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
 Version:           3.6.0
-Release:           1%{?dist}
+Release:           4%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
@@ -32,8 +32,10 @@ cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
+make clean
 make ds9097u %{?_smp_mflags}
 %if %{with_libusb}
+make clean
 make ds2490 %{?_smp_mflags}
 %endif
 
@@ -61,6 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Thu Aug 13 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-4
+- Run 'make clean' after each make for working USB (#517284)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
 - Upgrade to 3.6.0
 



From myoung at fedoraproject.org  Thu Aug 13 21:26:10 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 13 Aug 2009 21:26:10 +0000 (UTC)
Subject: rpms/kernel/devel perf, NONE, 1.2.2.2 kernel.spec, 1.1294.2.50,
	1.1294.2.51
Message-ID: <20090813212610.0CEF511C00EF@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12094

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec 
Added Files:
      Tag: private-myoung-dom0-branch
	perf 
Log Message:
failed to add perf file



--- NEW FILE perf ---
#!/bin/sh
exec /usr/libexec/perf.$(uname -r)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.50
retrieving revision 1.1294.2.51
diff -u -p -r1.1294.2.50 -r1.1294.2.51
--- kernel.spec	13 Aug 2009 18:16:22 -0000	1.1294.2.50
+++ kernel.spec	13 Aug 2009 21:26:09 -0000	1.1294.2.51
@@ -1458,7 +1458,7 @@ BuildKernel() {
     make -s V=1 %{?_smp_mflags} perf
 #later#    make -s V=1 %{?_smp_mflags} doc
     mkdir -p $RPM_BUILD_ROOT/usr/libexec/
-    install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf-$KernelVer
+    install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf.$KernelVer
     popd
 %endif
 
@@ -1927,7 +1927,7 @@ fi
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
 /boot/System.map-%{KVERREL}%{?2:.%{2}}\
 %if %{with_perftool}\
-/usr/libexec/perf-%{KVERREL}%{?2:.%{2}}\
+/usr/libexec/perf.%{KVERREL}%{?2:.%{2}}\
 %endif\
 #/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
 /boot/config-%{KVERREL}%{?2:.%{2}}\
@@ -1991,6 +1991,7 @@ fi
 
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - fix perf.
+- move perf to perf.$ver instead of perf-$ver...
 
 * Wed Aug 12 2009 Dennis Gilmore <dennis at ausil.us>
 - Obsolete kernel-smp on sparc64



From ajax at fedoraproject.org  Thu Aug 13 21:33:51 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 13 Aug 2009 21:33:51 +0000 (UTC)
Subject: rpms/gnome-applet-music/devel gnome-applet-music.spec,1.31,1.32
Message-ID: <20090813213351.627A411C00EF@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/gnome-applet-music/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15255

Modified Files:
	gnome-applet-music.spec 
Log Message:
* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 2.5.1-4
- Add explicit Requires: numpy.



Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/gnome-applet-music.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gnome-applet-music.spec	25 Jul 2009 00:33:29 -0000	1.31
+++ gnome-applet-music.spec	13 Aug 2009 21:33:51 -0000	1.32
@@ -4,7 +4,7 @@
 
 Name:		gnome-applet-music
 Version:	2.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci?n del panel GNOME para controlar reproductores de m?sica
 
@@ -38,6 +38,7 @@ Requires:	gnome-python2-gnomekeyring
 Requires:	hicolor-icon-theme
 Requires:	notify-python
 Requires:	pygtk2
+Requires:       numpy
 Requires:	PyXML
 
 Requires(pre):	GConf2
@@ -149,6 +150,9 @@ fi
 
 
 %changelog
+* Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 2.5.1-4
+- Add explicit Requires: numpy.
+
 * Fri Jul 24 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 mbarnes at fedoraproject.org  Thu Aug 13 21:37:06 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 13 Aug 2009 21:37:06 +0000 (UTC)
Subject: rpms/pygtk2/devel pygtk2.spec,1.30,1.31
Message-ID: <20090813213706.E547811C00EF@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16134

Modified Files:
	pygtk2.spec 
Log Message:
Add a comment.



Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- pygtk2.spec	26 Jul 2009 19:51:32 -0000	1.30
+++ pygtk2.spec	13 Aug 2009 21:37:06 -0000	1.31
@@ -25,6 +25,7 @@ Source: http://ftp.gnome.org/pub/GNOME/s
 
 ### Patches ###
 
+# RH bug #208608
 Patch0: pygtk-nodisplay-exception.patch
 
 # RH bug #379051 / GNOME bug #523001



From dwalsh at fedoraproject.org  Thu Aug 13 21:55:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 21:55:29 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.23,
	1.24 sources, 1.206, 1.207
Message-ID: <20090813215529.3A99711C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19027

Modified Files:
	policycoreutils-sepolgen.patch sources 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-1
- Fix chcat to report error on non existing file
- Update to upstream
	* Modify setfiles/restorecon checking of exclude paths.  Only check
	user-supplied exclude paths (not automatically generated ones based on
	lack of seclabel support), don't require them to be directories, and
	ignore permission denied errors on them (it is ok to exclude a path to
	which the caller lacks permission).


policycoreutils-sepolgen.patch:
 access.py    |    2 +-
 audit.py     |   11 +++++++++++
 refparser.py |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- policycoreutils-sepolgen.patch	5 May 2009 18:51:54 -0000	1.23
+++ policycoreutils-sepolgen.patch	13 Aug 2009 21:55:27 -0000	1.24
@@ -39,7 +39,7 @@ diff --exclude-from=exclude -N -u -r nsa
      modules = []
      support_macros = None
 -    blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
-+    blacklist = ["uml.if", "thunderbird.if"]
++    blacklist = ["uml.if", "thunderbird.if, unconfined.if"]
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- sources	13 Aug 2009 15:51:54 -0000	1.206
+++ sources	13 Aug 2009 21:55:27 -0000	1.207
@@ -1,2 +1,3 @@
 e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
 00fd9d86bd6a8066da710d6fda910b01  policycoreutils-2.0.71.tgz
+7915287c8377b768ccae7eb6dc736783  policycoreutils_man_ru2.tar.bz2



From whot at fedoraproject.org  Thu Aug 13 21:56:11 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 13 Aug 2009 21:56:11 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.3-sync-conditions.patch, NONE,
	1.1 xorg-x11-server.spec, 1.455, 1.456
Message-ID: <20090813215611.CA2DE11C00EF@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-serv19245

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.3-sync-conditions.patch 
Log Message:
* Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-2
- xserver-1.6.3-sync-conditions.patch: Fix conditions when checking
  negative transition triggers in the sync extension (#501601)


xserver-1.6.3-sync-conditions.patch:
 sync.c |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

--- NEW FILE xserver-1.6.3-sync-conditions.patch ---
>From d6a3e574497b8f4855a0bb9e5c1eb3e1b6ebb770 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 13 Aug 2009 16:37:00 +1000
Subject: [PATCH] Xext: fix up wrong conditions for negative sync transitions.

If the counter had a value higher than the trigger value for a negative
transition, the trigger value did not get set.

The correct sequence of checks is:
if (positive transition)
   if (counter value < trigger value)
      set up trigger
if (negative transition)
   if (counter value > trigger value)
      set up trigger

Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>
---
 Xext/sync.c |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Xext/sync.c b/Xext/sync.c
index 5f4ce56..667f8ab 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -962,28 +962,24 @@ SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
 		pnewltval = &psci->bracket_less;
 	    }
 	}
-	else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+	else if (pTrigger->test_type == XSyncNegativeTransition &&
 		   ct != XSyncCounterNeverIncreases)
-		 ||
-		 (pTrigger->test_type == XSyncNegativeTransition &&
+	{
+	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+		XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+	    {
+		psci->bracket_less = pTrigger->test_value;
+		pnewltval = &psci->bracket_less;
+	    }
+	}
+        else if (pTrigger->test_type == XSyncPositiveTransition &&
 		  ct != XSyncCounterNeverDecreases)
-		 )
 	{
-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+		XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
 	    {
-		if (XSyncValueLessThan(pTrigger->test_value,
-				       psci->bracket_greater))
-		{
-		    psci->bracket_greater = pTrigger->test_value;
-		    pnewgtval = &psci->bracket_greater;
-		}
-		else
-		if (XSyncValueGreaterThan(pTrigger->test_value,
-					  psci->bracket_less))
-		{
-		    psci->bracket_less = pTrigger->test_value;
-		    pnewltval = &psci->bracket_less;
-		}
+		psci->bracket_greater = pTrigger->test_value;
+		pnewgtval = &psci->bracket_greater;
 	    }
 	}
     } /* end for each trigger */
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- xorg-x11-server.spec	13 Aug 2009 07:04:14 -0000	1.455
+++ xorg-x11-server.spec	13 Aug 2009 21:56:11 -0000	1.456
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -111,6 +111,9 @@ Patch6046: xserver-1.6.1-fix-glx-drawabl
 # #510238, already upstream
 Patch6047: xserver-1.6.2-vboxvideo.patch
 
+# 501601, upstream, nominated for 1.6.4
+Patch6048: xserver-1.6.3-sync-conditions.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -527,6 +530,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-2
+- xserver-1.6.3-sync-conditions.patch: Fix conditions when checking
+  negative transition triggers in the sync extension (#501601)
+
 * Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-1
 - xserver 1.6.3
 - xserver-1.6.0-selinux-less.patch: Drop



From dwalsh at fedoraproject.org  Thu Aug 13 22:01:03 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 22:01:03 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.619,1.620
Message-ID: <20090813220103.1185F11C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20216

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-1
- Fix chcat to report error on non existing file
- Update to upstream
	* Modify setfiles/restorecon checking of exclude paths.  Only check
	user-supplied exclude paths (not automatically generated ones based on
	lack of seclabel support), don't require them to be directories, and
	ignore permission denied errors on them (it is ok to exclude a path to
	which the caller lacks permission).



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -p -r1.619 -r1.620
--- policycoreutils.spec	13 Aug 2009 15:51:54 -0000	1.619
+++ policycoreutils.spec	13 Aug 2009 22:01:02 -0000	1.620
@@ -125,7 +125,6 @@ The policycoreutils-python package conta
 %{_mandir}/man1/audit2allow.1*
 %{_mandir}/ru/man1/audit2allow.1*
 %{_mandir}/man1/audit2why.1*
-%{_mandir}/ru/man1/audit2why.1*
 %{_mandir}/man8/chcat.8*
 %{_mandir}/ru/man8/chcat.8*
 %{_mandir}/man8/semanage.8*



From dwalsh at fedoraproject.org  Thu Aug 13 22:08:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 22:08:59 +0000 (UTC)
Subject: rpms/policycoreutils/devel sources,1.207,1.208
Message-ID: <20090813220859.BA24511C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22538

Modified Files:
	sources 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-1
- Fix chcat to report error on non existing file
- Update to upstream
	* Modify setfiles/restorecon checking of exclude paths.  Only check
	user-supplied exclude paths (not automatically generated ones based on
	lack of seclabel support), don't require them to be directories, and
	ignore permission denied errors on them (it is ok to exclude a path to
	which the caller lacks permission).



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- sources	13 Aug 2009 21:55:27 -0000	1.207
+++ sources	13 Aug 2009 22:08:59 -0000	1.208
@@ -1,3 +1,3 @@
 e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
 00fd9d86bd6a8066da710d6fda910b01  policycoreutils-2.0.71.tgz
-7915287c8377b768ccae7eb6dc736783  policycoreutils_man_ru2.tar.bz2
+59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2



From dwalsh at fedoraproject.org  Thu Aug 13 22:22:35 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 22:22:35 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.24,
	1.25 policycoreutils.spec, 1.620, 1.621
Message-ID: <20090813222235.E0F8F11C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26012

Modified Files:
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-2
- exclude unconfined.if from sepolgen


policycoreutils-sepolgen.patch:
 access.py    |    2 +-
 audit.py     |   11 +++++++++++
 refparser.py |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- policycoreutils-sepolgen.patch	13 Aug 2009 21:55:27 -0000	1.24
+++ policycoreutils-sepolgen.patch	13 Aug 2009 22:22:35 -0000	1.25
@@ -39,7 +39,7 @@ diff --exclude-from=exclude -N -u -r nsa
      modules = []
      support_macros = None
 -    blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
-+    blacklist = ["uml.if", "thunderbird.if, unconfined.if"]
++    blacklist = ["uml.if", "thunderbird.if", "unconfined.if"]
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -p -r1.620 -r1.621
--- policycoreutils.spec	13 Aug 2009 22:01:02 -0000	1.620
+++ policycoreutils.spec	13 Aug 2009 22:22:35 -0000	1.621
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-2
+- exclude unconfined.if from sepolgen
+
 * Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-1
 - Fix chcat to report error on non existing file
 - Update to upstream



From kzak at fedoraproject.org  Thu Aug 13 22:22:43 2009
From: kzak at fedoraproject.org (kzak)
Date: Thu, 13 Aug 2009 22:22:43 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng-2.16-libblkid-ext2.patch,
	NONE, 1.1 util-linux-ng.spec, 1.54, 1.55
Message-ID: <20090813222243.E1B9C11C00EF@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-serv26119

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-libblkid-ext2.patch 
Log Message:
* Thu Aug 13 2009 Karel Zak <kzak at redhat.com> 2.16-5
- fix #513104 - blkid returns no fstype for ext2 device when ext2 module not loaded


util-linux-ng-2.16-libblkid-ext2.patch:
 ext.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE util-linux-ng-2.16-libblkid-ext2.patch ---
>From 92cf3ab964266603cf36272d0eec96cd07fa083c Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Thu, 13 Aug 2009 21:55:43 +0200
Subject: [PATCH] libblkid: fix ext2 detection on systems with ext4 only

Address-Red-Hat-Bug: #513104
Signed-off-by: Karel Zak <kzak at redhat.com>
---
 shlibs/blkid/src/probers/ext.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c
index 671e556..a4d35d1 100644
--- a/shlibs/blkid/src/probers/ext.c
+++ b/shlibs/blkid/src/probers/ext.c
@@ -483,11 +483,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
 	if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
 		return -BLKID_ERR_PARAM;
 
-	/* Ext4 has at least one feature which ext3 doesn't understand */
-	if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
-	    !(fi  & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
-		return -BLKID_ERR_PARAM;
-
 	/*
 	 * If the filesystem does not have a journal and ext2 is not
 	 * present, then force this to be detected as an ext2
@@ -498,6 +493,12 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
 	    get_linux_version() >= EXT4_SUPPORTS_EXT2)
 		goto force_ext4;
 
+	/* Ext4 has at least one feature which ext3 doesn't understand */
+	if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
+	    !(fi  & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
+		return -BLKID_ERR_PARAM;
+
+force_ext4:
 	/*
 	 * If the filesystem is a OK for use by in-development
 	 * filesystem code, and ext4dev is supported or ext4 is not
@@ -513,7 +514,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
 			return -BLKID_ERR_PARAM;
 	}
 
-force_ext4:
 	ext_get_info(pr, 4, es);
 	return 0;
 }
-- 
1.6.2.5



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- util-linux-ng.spec	5 Aug 2009 07:45:59 -0000	1.54
+++ util-linux-ng.spec	13 Aug 2009 22:22:43 -0000	1.55
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -103,6 +103,8 @@ Patch5: util-linux-ng-2.16-blkid-cachefi
 Patch7: util-linux-ng-2.13-login-lastlog.patch
 # 231192 - ipcs is not printing correct values on pLinux
 Patch8: util-linux-ng-2.15-ipcs-32bit.patch
+# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
+Patch9: util-linux-ng-2.16-libblkid-ext2.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -197,6 +199,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 unset LINGUAS || :
@@ -707,6 +710,9 @@ fi
 
 
 %changelog
+* Thu Aug 13 2009 Karel Zak <kzak at redhat.com> 2.16-5
+- fix #513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
+
 * Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> 2.16-4
 - set conflict with versions of e2fsprogs containing fsck
 



From jgarzik at fedoraproject.org  Thu Aug 13 22:24:32 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Thu, 13 Aug 2009 22:24:32 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.14,1.15 sources,1.11,1.12
Message-ID: <20090813222432.452F811C00EF@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27028

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cld.spec	12 Aug 2009 21:21:05 -0000	1.14
+++ cld.spec	13 Aug 2009 22:24:31 -0000	1.15
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.15.g6409c437%{?dist}
+Release:	0.16.gefe1f957%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 6409c437045a4545377c17016d514ecaca3d74a0
+# pulled from upstream git, commit efe1f95712cefa78cf28c328bcce8e25ac50e72b
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Aug 13 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.16.gefe1f957
+- update to commit efe1f95712cefa78cf28c328bcce8e25ac50e72b
+
 * Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.15.g6409c437
 - update to commit 6409c437045a4545377c17016d514ecaca3d74a0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Aug 2009 21:21:05 -0000	1.11
+++ sources	13 Aug 2009 22:24:32 -0000	1.12
@@ -1 +1 @@
-e8a1b3fafc34fd5b1ea5b2641577500d  cld-0.2git.tar.gz
+976b37a5e8edcb3b262d7535edcf1db5  cld-0.2git.tar.gz



From dwalsh at fedoraproject.org  Thu Aug 13 22:33:09 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 13 Aug 2009 22:33:09 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.50,
	1.51 selinux-policy.spec, 1.895, 1.896
Message-ID: <20090813223309.365F411C00EF@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29512

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-11
- Make all unconfined_domains permissive so we can see what AVC's happen 


policy-F12.patch:
 Makefile                                           |    2 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/sudo.if                       |   13 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |    9 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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.if                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   38 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   22 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   85 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   56 
 policy/modules/kernel/filesystem.te                |    2 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/webadm.te                     |    2 
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  132 +-
 policy/modules/services/cups.fc                    |   11 
 policy/modules/services/cups.te                    |   23 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   26 
 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               |   49 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |    1 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    5 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   49 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   14 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  129 +-
 policy/modules/services/virt.te                    |  270 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  308 ++++
 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                   |    9 
 policy/modules/system/hostname.te                  |    4 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  177 ++
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   28 
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  152 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   28 
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   17 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |   35 
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |   77 +
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 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                |   72 -
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1304 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  127 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 308 files changed, 13444 insertions(+), 2611 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- policy-F12.patch	12 Aug 2009 20:09:21 -0000	1.50
+++ policy-F12.patch	13 Aug 2009 22:33:07 -0000	1.51
@@ -568,7 +568,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.26/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/admin/rpm.if	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/admin/rpm.if	2009-08-13 15:26:27.000000000 -0400
 @@ -66,6 +66,11 @@
  	rpm_domtrans($1)
  	role $2 types rpm_t;
@@ -1124,10 +1124,22 @@ 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.26/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/admin/vbetool.te	2009-07-30 15:33:08.000000000 -0400
-@@ -23,7 +23,10 @@
++++ serefpolicy-3.6.26/policy/modules/admin/vbetool.te	2009-08-13 15:29:00.000000000 -0400
+@@ -15,15 +15,20 @@
+ # Local policy
+ #
+ 
+-allow vbetool_t self:capability { sys_tty_config sys_admin };
++allow vbetool_t self:capability { dac_override sys_tty_config sys_admin };
+ allow vbetool_t self:process execmem;
+ 
+ dev_wx_raw_memory(vbetool_t)
+ dev_read_raw_memory(vbetool_t)
  dev_rwx_zero(vbetool_t)
- dev_read_sysfs(vbetool_t)
+-dev_read_sysfs(vbetool_t)
++dev_rw_sysfs(vbetool_t)
++dev_rw_xserver_misc(vbetool_t)
++dev_rw_mtrr(vbetool_t)
  
 +domain_mmap_low_type(vbetool_t)
 +tunable_policy(`mmap_low_allowed',`
@@ -1136,7 +1148,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_unallocated_ttys(vbetool_t)
  
-@@ -34,3 +37,8 @@
+@@ -34,3 +39,8 @@
  	hal_write_log(vbetool_t)
  	hal_dontaudit_append_lib_files(vbetool_t)
  ')
@@ -2693,7 +2705,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.26/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te	2009-08-06 08:01:24.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/apps/nsplugin.te	2009-08-13 14:58:45.000000000 -0400
 @@ -0,0 +1,286 @@
 +
 +policy_module(nsplugin, 1.0.0)
@@ -3137,8 +3149,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.6.26/policy/modules/apps/ptchown.te
 --- nsaserefpolicy/policy/modules/apps/ptchown.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/apps/ptchown.te	2009-08-12 14:55:11.000000000 -0400
-@@ -0,0 +1,35 @@
++++ serefpolicy-3.6.26/policy/modules/apps/ptchown.te	2009-08-13 17:39:44.000000000 -0400
+@@ -0,0 +1,38 @@
 +policy_module(ptchown,1.0.0)
 +
 +########################################
@@ -3158,7 +3170,7 @@ diff -b -B --ignore-all-space --exclude-
 +# ptchown local policy
 +#
 +
-+allow ptchown_t self:capability { chown setuid };
++allow ptchown_t self:capability { fowner chown setuid };
 +allow ptchown_t self:process { getcap setcap };
 +
 +# Init script handling
@@ -3170,13 +3182,16 @@ diff -b -B --ignore-all-space --exclude-
 +
 +files_read_etc_files(ptchown_t)
 +
++fs_rw_anon_inodefs_files(ptchown_t)
++
++term_use_generic_ptys(ptchown_t)
 +term_setattr_generic_ptys(ptchown_t)
 +term_setattr_all_user_ptys(ptchown_t)
 +
 +miscfiles_read_localization(ptchown_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.26/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/apps/pulseaudio.te	2009-08-04 05:32:34.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/apps/pulseaudio.te	2009-08-13 15:27:08.000000000 -0400
 @@ -22,6 +22,7 @@
  allow pulseaudio_t self:unix_dgram_socket { sendto create_socket_perms };
  allow pulseaudio_t self:tcp_socket create_stream_socket_perms;
@@ -3193,7 +3208,15 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_all_user_ttys(pulseaudio_t)
  term_use_all_user_ptys(pulseaudio_t)
-@@ -85,8 +87,8 @@
+@@ -81,12 +83,15 @@
+ ')
+ 
+ optional_policy(`
++	rpm_dbus_chat(pulseaudio_t)
++')
++
++optional_policy(`
+ 	udev_read_db(pulseaudio_t)
  ')
  
  optional_policy(`
@@ -3202,7 +3225,7 @@ diff -b -B --ignore-all-space --exclude-
  	xserver_read_xdm_lib_files(pulseaudio_t)
 +	xserver_common_app(pulseaudio_t)
  ')
- 
+-
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.6.26/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/apps/qemu.fc	2009-07-30 15:33:08.000000000 -0400
@@ -3643,8 +3666,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.26/policy/modules/apps/sambagui.te
 --- nsaserefpolicy/policy/modules/apps/sambagui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/apps/sambagui.te	2009-07-30 15:33:08.000000000 -0400
-@@ -0,0 +1,57 @@
++++ serefpolicy-3.6.26/policy/modules/apps/sambagui.te	2009-08-13 09:46:37.000000000 -0400
+@@ -0,0 +1,55 @@
 +policy_module(sambagui,1.0.0)
 +
 +########################################
@@ -3700,8 +3723,6 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	policykit_dbus_chat(sambagui_t)
 +')
-+
-+permissive sambagui_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.fc serefpolicy-3.6.26/policy/modules/apps/sandbox.fc
 --- nsaserefpolicy/policy/modules/apps/sandbox.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.26/policy/modules/apps/sandbox.fc	2009-07-30 15:33:08.000000000 -0400
@@ -3709,8 +3730,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.26/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/apps/sandbox.if	2009-07-30 15:33:08.000000000 -0400
-@@ -0,0 +1,145 @@
++++ serefpolicy-3.6.26/policy/modules/apps/sandbox.if	2009-08-13 09:52:58.000000000 -0400
+@@ -0,0 +1,143 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -3834,8 +3855,6 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_lnk_files_pattern($1_client_t, $1_file_t, $1_file_t)
 +	manage_fifo_files_pattern($1_client_t, $1_file_t, $1_file_t)
 +	manage_sock_files_pattern($1_client_t, $1_file_t, $1_file_t)
-+
-+#	permissive $1_client_t;
 +')
 +
 +########################################
@@ -4516,7 +4535,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.26/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.fc	2009-08-03 06:30:31.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.fc	2009-08-13 15:24:04.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)
@@ -4536,9 +4555,18 @@ diff -b -B --ignore-all-space --exclude-
  /dev/(misc/)?rtc[0-9]*	-c	gen_context(system_u:object_r:clock_device_t,s0)
  /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
+@@ -148,6 +151,8 @@
+ /dev/touchscreen/ucb1x00 -c	gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/touchscreen/mk712	-c	gen_context(system_u:object_r:mouse_device_t,s0)
+ 
++/dev/vga_arbiter	-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
++
+ /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.26/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-11 18:56:44.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/devices.if	2009-08-13 15:36:14.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -5120,7 +5148,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.26/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/files.if	2009-08-10 11:51:27.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/files.if	2009-08-13 18:17:55.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5531,7 +5559,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.26/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/filesystem.if	2009-08-11 16:06:07.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/filesystem.if	2009-08-13 15:46:05.000000000 -0400
 @@ -1537,6 +1537,24 @@
  
  ########################################
@@ -5557,7 +5585,32 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search inotifyfs filesystem. 
  ## </summary>
  ## <param name="domain">
-@@ -3971,3 +3989,23 @@
+@@ -2542,6 +2560,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Getattr files on an nfsd filesystem
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_getattr_nfsd_files',`
++	gen_require(`
++		type nfsd_fs_t;
++	')
++
++	allow $1 nfsd_fs_t:file getattr;
++')
++
++########################################
++## <summary>
+ ##	Read and write NFS server files.
+ ## </summary>
+ ## <param name="domain">
+@@ -3971,3 +4007,23 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -5655,7 +5708,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.26/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/kernel/kernel.te	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/kernel/kernel.te	2009-08-13 18:32:39.000000000 -0400
 @@ -63,6 +63,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -5731,14 +5784,12 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -387,3 +410,7 @@
+@@ -387,3 +410,5 @@
  allow kern_unconfined unlabeled_t:association *;
  allow kern_unconfined unlabeled_t:packet *;
  allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap };
 +
 +files_boot(kernel_t)
-+
-+permissive kernel_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.6.26/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/kernel/selinux.if	2009-07-30 15:33:08.000000000 -0400
@@ -9207,14 +9258,33 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.6.26/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/consolekit.if	2009-08-10 13:11:45.000000000 -0400
-@@ -57,3 +57,23 @@
++++ serefpolicy-3.6.26/policy/modules/services/consolekit.if	2009-08-13 15:40:37.000000000 -0400
+@@ -57,3 +57,42 @@
  	read_files_pattern($1, consolekit_log_t, consolekit_log_t)
  	files_search_pids($1)
  ')
 +
 +########################################
 +## <summary>
++##	Manage consolekit log files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`consolekit_manage_log',`
++	gen_require(`
++		type consolekit_log_t;
++	')
++
++	manage_files_pattern($1, consolekit_log_t, consolekit_log_t)
++	files_search_pids($1)
++')
++
++########################################
++## <summary>
 +##	Read consolekit PID files.
 +## </summary>
 +## <param name="domain">
@@ -10410,7 +10480,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.26/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-11 13:59:10.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/devicekit.te	2009-08-13 09:46:15.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)
@@ -10490,22 +10560,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 +152,28 @@
+@@ -134,14 +152,22 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
 +
-+#ifdef(`TESTING',`
-+	permissive devicekit_t;
-+	permissive devicekit_power_t;
-+	permissive devicekit_disk_t;
-+#',`
-+#optional_policy(`
-+#	unconfined_domain(devicekit_t)
-+#	unconfined_domain(devicekit_power_t)
-+#	unconfined_domain(devicekit_disk_t)
-+#')
-+#')
++optional_policy(`
++	unconfined_domain(devicekit_t)
++	unconfined_domain(devicekit_power_t)
++	unconfined_domain(devicekit_disk_t)
++')
 +
  ########################################
  #
@@ -10520,7 +10584,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 +183,7 @@
+@@ -151,6 +177,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -10528,7 +10592,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +192,7 @@
+@@ -159,6 +186,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -10536,7 +10600,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 +201,16 @@
+@@ -167,12 +195,16 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -10553,7 +10617,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_all_users_state(devicekit_power_t)
  
  optional_policy(`
-@@ -180,8 +218,11 @@
+@@ -180,8 +212,11 @@
  ')
  
  optional_policy(`
@@ -10566,7 +10630,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +244,23 @@
+@@ -203,17 +238,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -10663,8 +10727,17 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.6.26/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/fprintd.te	2009-07-30 15:33:08.000000000 -0400
-@@ -51,5 +51,7 @@
++++ serefpolicy-3.6.26/policy/modules/services/fprintd.te	2009-08-13 12:03:17.000000000 -0400
+@@ -37,6 +37,8 @@
+ files_read_etc_files(fprintd_t)
+ files_read_usr_files(fprintd_t)
+ 
++fs_getattr_all_fs(fprintd_t)
++
+ auth_use_nsswitch(fprintd_t)
+ 
+ miscfiles_read_localization(fprintd_t)
+@@ -51,5 +53,7 @@
  optional_policy(`
  	policykit_read_reload(fprintd_t)
  	policykit_read_lib(fprintd_t)
@@ -11043,7 +11116,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.26/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/hal.te	2009-08-05 17:09:21.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/hal.te	2009-08-13 12:00:48.000000000 -0400
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -11074,7 +11147,18 @@ diff -b -B --ignore-all-space --exclude-
  files_getattr_all_mountpoints(hald_t)
  
  mls_file_read_all_levels(hald_t)
-@@ -290,6 +299,7 @@
+@@ -202,8 +211,9 @@
+ seutil_read_default_contexts(hald_t)
+ seutil_read_file_contexts(hald_t)
+ 
+-sysnet_read_config(hald_t)
+ sysnet_domtrans_dhcpc(hald_t)
++sysnet_read_config(hald_t)
++sysnet_read_dhcp_config(hald_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(hald_t)
+ userdom_dontaudit_search_user_home_dirs(hald_t)
+@@ -290,6 +300,7 @@
  ')
  
  optional_policy(`
@@ -11082,7 +11166,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_t)
  	policykit_domtrans_resolve(hald_t)
  	policykit_read_lib(hald_t)
-@@ -321,6 +331,10 @@
+@@ -321,6 +332,10 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -11093,7 +11177,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Hal acl local policy
-@@ -341,6 +355,7 @@
+@@ -341,6 +356,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -11101,7 +11185,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -357,6 +372,8 @@
+@@ -357,6 +373,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -11110,7 +11194,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -369,6 +386,7 @@
+@@ -369,6 +387,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -11118,7 +11202,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +468,16 @@
+@@ -450,12 +469,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -11137,7 +11221,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +491,22 @@
+@@ -469,10 +492,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -11160,7 +11244,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +518,7 @@
+@@ -484,6 +519,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -11168,7 +11252,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +526,9 @@
+@@ -491,3 +527,7 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -11176,8 +11260,6 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	dbus_system_bus_client(hald_dccm_t)
 +')
-+
-+permissive hald_dccm_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hddtemp.fc serefpolicy-3.6.26/policy/modules/services/hddtemp.fc
 --- nsaserefpolicy/policy/modules/services/hddtemp.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.26/policy/modules/services/hddtemp.fc	2009-08-11 14:24:37.000000000 -0400
@@ -12672,8 +12754,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nslcd.te serefpolicy-3.6.26/policy/modules/services/nslcd.te
 --- nsaserefpolicy/policy/modules/services/nslcd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/services/nslcd.te	2009-07-30 15:33:09.000000000 -0400
-@@ -0,0 +1,50 @@
++++ serefpolicy-3.6.26/policy/modules/services/nslcd.te	2009-08-13 09:51:48.000000000 -0400
+@@ -0,0 +1,48 @@
 +policy_module(nslcd,1.0.0)
 +
 +########################################
@@ -12685,8 +12767,6 @@ diff -b -B --ignore-all-space --exclude-
 +type nslcd_exec_t;
 +init_daemon_domain(nslcd_t, nslcd_exec_t)
 +
-+#permissive nslcd_t;
-+
 +type nslcd_initrc_exec_t;
 +init_script_file(nslcd_initrc_exec_t)
 +
@@ -12976,18 +13056,22 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.fc serefpolicy-3.6.26/policy/modules/services/policykit.fc
 --- nsaserefpolicy/policy/modules/services/policykit.fc	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/policykit.fc	2009-07-31 06:55:00.000000000 -0400
-@@ -1,7 +1,9 @@
++++ serefpolicy-3.6.26/policy/modules/services/policykit.fc	2009-08-13 15:56:23.000000000 -0400
+@@ -1,10 +1,13 @@
  /usr/libexec/polkit-read-auth-helper	--	gen_context(system_u:object_r:policykit_auth_exec_t,s0)
-+/usr/libexec/polkit-gnome-authentication-agent-1	--	gen_context(system_u:object_r:policykit_auth_exec_t,s0)
  /usr/libexec/polkit-grant-helper.*	--	gen_context(system_u:object_r:policykit_grant_exec_t,s0)
  /usr/libexec/polkit-resolve-exe-helper.* --	gen_context(system_u:object_r:policykit_resolve_exec_t,s0)
 -/usr/libexec/polkitd			--	gen_context(system_u:object_r:policykit_exec_t,s0)
 +/usr/libexec/polkitd.*			--	gen_context(system_u:object_r:policykit_exec_t,s0)
++/usr/libexec/polkit-1/polkit-agent-helper-1 --	gen_context(system_u:object_r:policykit_auth_exec_t,s0)
 +/usr/libexec/polkit-1/polkitd.*		--	gen_context(system_u:object_r:policykit_exec_t,s0)
  
  /var/lib/misc/PolicyKit.reload			gen_context(system_u:object_r:policykit_reload_t,s0)
  /var/lib/PolicyKit(/.*)?			gen_context(system_u:object_r:policykit_var_lib_t,s0)
++/var/lib/polkit-1(/.*)?			gen_context(system_u:object_r:policykit_var_lib_t,s0)
+ /var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:policykit_var_lib_t,s0)
+ /var/run/PolicyKit(/.*)?			gen_context(system_u:object_r:policykit_var_run_t,s0)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.6.26/policy/modules/services/policykit.if
 --- nsaserefpolicy/policy/modules/services/policykit.if	2009-07-23 14:11:04.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/policykit.if	2009-08-03 06:44:10.000000000 -0400
@@ -14789,7 +14873,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.26/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/samba.te	2009-08-06 07:30:26.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/samba.te	2009-08-13 18:18:57.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -14823,7 +14907,16 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	pcscd_read_pub_files(samba_net_t)
-@@ -341,6 +350,8 @@
+@@ -325,6 +334,8 @@
+ files_read_etc_runtime_files(smbd_t)
+ files_read_usr_files(smbd_t)
+ files_search_spool(smbd_t)
++# smbd seems to getattr all mountpoints
++files_dontaudit_getattr_all_dirs(smbd_t)
+ # Allow samba to list mnt_t for potential mounted dirs
+ files_list_mnt(smbd_t)
+ 
+@@ -341,6 +352,8 @@
  
  usermanage_read_crack_db(smbd_t)
  
@@ -14832,7 +14925,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -352,19 +363,19 @@
+@@ -352,19 +365,19 @@
  ') 
  
  tunable_policy(`samba_domain_controller',`
@@ -14858,7 +14951,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # Support Samba sharing of NFS mount points
-@@ -376,6 +387,15 @@
+@@ -376,6 +389,15 @@
  	fs_manage_nfs_named_sockets(smbd_t)
  ')
  
@@ -14874,7 +14967,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
-@@ -391,6 +411,11 @@
+@@ -391,6 +413,11 @@
  ')
  
  optional_policy(`
@@ -14886,7 +14979,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpc_search_nfs_state_data(smbd_t)
  ')
  
-@@ -405,13 +430,15 @@
+@@ -405,13 +432,15 @@
  tunable_policy(`samba_create_home_dirs',`
  	allow smbd_t self:capability chown;
  	userdom_create_user_home_dirs(smbd_t)
@@ -14903,7 +14996,7 @@ diff -b -B --ignore-all-space --exclude-
  	auth_read_all_files_except_shadow(nmbd_t)
  ')
  
-@@ -420,8 +447,8 @@
+@@ -420,8 +449,8 @@
  	auth_manage_all_files_except_shadow(smbd_t)
  	fs_read_noxattr_fs_files(nmbd_t) 
  	auth_manage_all_files_except_shadow(nmbd_t)
@@ -14913,7 +15006,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
-@@ -525,6 +552,7 @@
+@@ -525,6 +554,7 @@
  
  allow smbcontrol_t winbind_t:process { signal signull };
  
@@ -14921,7 +15014,7 @@ diff -b -B --ignore-all-space --exclude-
  samba_read_config(smbcontrol_t)
  samba_rw_var_files(smbcontrol_t)
  samba_search_var(smbcontrol_t)
-@@ -638,6 +666,10 @@
+@@ -638,6 +668,10 @@
  
  allow swat_t smbd_var_run_t:file { lock unlink };
  
@@ -14932,7 +15025,7 @@ diff -b -B --ignore-all-space --exclude-
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
-@@ -713,12 +745,23 @@
+@@ -713,12 +747,23 @@
  	kerberos_use(swat_t)
  ')
  
@@ -14957,7 +15050,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process { signal_perms getsched setsched };
  allow winbind_t self:fifo_file rw_fifo_file_perms;
-@@ -866,6 +909,16 @@
+@@ -866,6 +911,16 @@
  #
  
  optional_policy(`
@@ -14974,7 +15067,7 @@ diff -b -B --ignore-all-space --exclude-
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -876,9 +929,12 @@
+@@ -876,9 +931,12 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  
@@ -15803,8 +15896,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/shorewall.te serefpolicy-3.6.26/policy/modules/services/shorewall.te
 --- nsaserefpolicy/policy/modules/services/shorewall.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/policy/modules/services/shorewall.te	2009-07-30 15:33:09.000000000 -0400
-@@ -0,0 +1,97 @@
++++ serefpolicy-3.6.26/policy/modules/services/shorewall.te	2009-08-13 09:47:21.000000000 -0400
+@@ -0,0 +1,95 @@
 +policy_module(shorewall,1.0.0)
 +
 +########################################
@@ -15900,8 +15993,6 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	ulogd_search_log(shorewall_t)
 +')
-+
-+permissive shorewall_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.26/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.26/policy/modules/services/smartmon.te	2009-07-30 15:33:09.000000000 -0400
@@ -17012,7 +17103,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.26/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.if	2009-08-12 16:06:07.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.if	2009-08-13 15:24:46.000000000 -0400
 @@ -103,7 +103,7 @@
  
  ########################################
@@ -17110,7 +17201,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an virt environment
  ## </summary>
-@@ -327,3 +364,76 @@
+@@ -327,3 +364,77 @@
  
  	virt_manage_log($1)
  ')
@@ -17184,12 +17275,13 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	files_search_var($1)
++	manage_dirs_pattern($1, svirt_cache_t, svirt_cache_t)
 +	manage_files_pattern($1, svirt_cache_t, svirt_cache_t)
 +	manage_lnk_files_pattern($1, svirt_cache_t, svirt_cache_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.26/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-12 16:05:46.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/services/virt.te	2009-08-13 16:49:58.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -17391,16 +17483,16 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	lvm_domtrans(virtd_t)
 +')
-+
-+optional_policy(`
+ 
+ optional_policy(`
+-	qemu_domtrans(virtd_t)
 +        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)
@@ -17409,7 +17501,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -195,8 +292,161 @@
+@@ -195,8 +292,159 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -17427,8 +17519,6 @@ diff -b -B --ignore-all-space --exclude-
 +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)
 +
-+permissive virtd_t;
-+
 +########################################
 +#
 +# svirt local policy
@@ -17595,8 +17685,8 @@ 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.26/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/services/xserver.fc	2009-07-30 15:33:09.000000000 -0400
-@@ -3,12 +3,16 @@
++++ serefpolicy-3.6.26/policy/modules/services/xserver.fc	2009-08-13 13:40:39.000000000 -0400
+@@ -3,12 +3,17 @@
  #
  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)
@@ -17607,13 +17697,14 @@ diff -b -B --ignore-all-space --exclude-
  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)
 +HOME_DIR/\.xsession-errors.*	--	gen_context(system_u:object_r:xdm_home_t,s0)
-+HOME_DIR/\.dmrc			--	gen_context(system_u:object_r:xdm_home_t,s0)
++HOME_DIR/\.dmrc		--	gen_context(system_u:object_r:xdm_home_t,s0)
  
-+/root/\.xauth.*			--	gen_context(system_u:object_r:xauth_home_t,s0)
++/root/\.Xauth.*		--	gen_context(system_u:object_r:xauth_home_t,s0)
++/root/\.xauth.*		--	gen_context(system_u:object_r:xauth_home_t,s0)
  #
  # /dev
  #
-@@ -32,11 +36,6 @@
+@@ -32,11 +37,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)
  
@@ -17625,7 +17716,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /opt
  #
-@@ -61,7 +60,9 @@
+@@ -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)
  /usr/bin/iceauth	--	gen_context(system_u:object_r:iceauth_exec_t,s0)
@@ -17635,7 +17726,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 +90,27 @@
+@@ -89,16 +91,27 @@
  
  /var/[xgk]dm(/.*)?		gen_context(system_u:object_r:xserver_log_t,s0)
  
@@ -19843,7 +19934,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.26/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-07-30 09:44:08.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-12 16:06:54.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/init.te	2009-08-13 15:46:16.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -19912,7 +20003,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-+	consolekit_read_log(init_t)
++	consolekit_manage_log(init_t)
 +')
 +
 +optional_policy(`
@@ -20005,7 +20096,16 @@ diff -b -B --ignore-all-space --exclude-
  fs_register_binary_executable_type(initrc_t)
  # rhgb-console writes to ramfs
  fs_write_ramfs_pipes(initrc_t)
-@@ -328,7 +375,7 @@
+@@ -289,6 +336,8 @@
+ fs_unmount_all_fs(initrc_t)
+ fs_remount_all_fs(initrc_t)
+ fs_getattr_all_fs(initrc_t)
++fs_search_nfsd_fs(initrc_t)
++fs_getattr_nfsd_files(initrc_t)
+ 
+ # initrc_t needs to do a pidof which requires ptrace
+ mcs_ptrace_all(initrc_t)
+@@ -328,7 +377,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -20014,7 +20114,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:
-@@ -343,14 +390,15 @@
+@@ -343,14 +392,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -20032,7 +20132,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)
-@@ -366,7 +414,9 @@
+@@ -366,7 +416,9 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
@@ -20042,7 +20142,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)
-@@ -423,8 +473,6 @@
+@@ -423,8 +475,6 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -20051,7 +20151,7 @@ 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)
-@@ -451,11 +499,9 @@
+@@ -451,11 +501,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -20064,7 +20164,7 @@ diff -b -B --ignore-all-space --exclude-
  	# These seem to be from the initrd
  	# during device initialization:
  	dev_create_generic_dirs(initrc_t)
-@@ -465,6 +511,7 @@
+@@ -465,6 +513,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -20072,7 +20172,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
-@@ -498,6 +545,7 @@
+@@ -498,6 +547,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -20080,7 +20180,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -516,6 +564,33 @@
+@@ -516,6 +566,33 @@
  	')
  ')
  
@@ -20114,7 +20214,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +645,10 @@
+@@ -570,6 +647,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -20125,7 +20225,7 @@ diff -b -B --ignore-all-space --exclude-
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -591,6 +670,10 @@
+@@ -591,6 +672,10 @@
  ')
  
  optional_policy(`
@@ -20136,7 +20236,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -647,20 +730,20 @@
+@@ -647,20 +732,20 @@
  ')
  
  optional_policy(`
@@ -20163,7 +20263,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -669,6 +752,7 @@
+@@ -669,6 +754,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -20171,7 +20271,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -697,7 +781,6 @@
+@@ -697,7 +783,6 @@
  ')
  
  optional_policy(`
@@ -20179,7 +20279,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -719,8 +802,6 @@
+@@ -719,8 +804,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -20188,7 +20288,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -733,10 +814,12 @@
+@@ -733,10 +816,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -20201,7 +20301,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -755,6 +838,15 @@
+@@ -755,6 +840,15 @@
  ')
  
  optional_policy(`
@@ -20217,7 +20317,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -765,6 +857,13 @@
+@@ -765,6 +859,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -20231,7 +20331,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -790,3 +889,31 @@
+@@ -790,3 +891,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -22504,7 +22604,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.26/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/sysnetwork.if	2009-08-11 13:58:43.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/sysnetwork.if	2009-08-13 12:00:25.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -22592,7 +22692,15 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -541,6 +594,7 @@
+@@ -464,6 +517,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
++	allow $1 dhcp_etc_t:dir list_dir_perms;
+ 	read_files_pattern($1, dhcp_etc_t, dhcp_etc_t)
+ ')
+ 
+@@ -541,6 +595,7 @@
  		type net_conf_t;
  	')
  
@@ -22600,7 +22708,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 self:tcp_socket create_socket_perms;
  	allow $1 self:udp_socket create_socket_perms;
  
-@@ -557,6 +611,14 @@
+@@ -557,6 +612,14 @@
  
  	files_search_etc($1)
  	allow $1 net_conf_t:file read_file_perms;
@@ -22615,7 +22723,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -586,6 +648,8 @@
+@@ -586,6 +649,8 @@
  
  	files_search_etc($1)
  	allow $1 net_conf_t:file read_file_perms;
@@ -22624,7 +22732,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -620,3 +684,49 @@
+@@ -620,3 +685,49 @@
  	files_search_etc($1)
  	allow $1 net_conf_t:file read_file_perms;
  ')
@@ -22889,7 +22997,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.te serefpolicy-3.6.26/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-08-11 14:30:39.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-08-13 09:56:06.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;
@@ -22922,22 +23030,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(udev_t)
  # read modules.inputmap:
-@@ -182,9 +186,11 @@
- 	# for arping used for static IP addresses on PCMCIA ethernet
- 	netutils_domtrans(udev_t)
- 
--	optional_policy(`
--		unconfined_domain(udev_t)
--	')
-+	permissive udev_t;
-+
-+#	optional_policy(`
-+#		unconfined_domain(udev_t)
-+#	')
- ')
- 
- optional_policy(`
-@@ -194,6 +200,10 @@
+@@ -194,6 +198,10 @@
  ')
  
  optional_policy(`
@@ -22948,7 +23041,7 @@ diff -b -B --ignore-all-space --exclude-
  	brctl_domtrans(udev_t)
  ')
  
-@@ -202,14 +212,27 @@
+@@ -202,14 +210,27 @@
  ')
  
  optional_policy(`
@@ -22976,7 +23069,7 @@ diff -b -B --ignore-all-space --exclude-
  	lvm_domtrans(udev_t)
  ')
  
-@@ -219,6 +242,7 @@
+@@ -219,6 +240,7 @@
  
  optional_policy(`
  	hal_dgram_send(udev_t)
@@ -22984,7 +23077,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -228,6 +252,10 @@
+@@ -228,6 +250,10 @@
  ')
  
  optional_policy(`
@@ -22995,7 +23088,7 @@ diff -b -B --ignore-all-space --exclude-
  	openct_read_pid_files(udev_t)
  	openct_domtrans(udev_t)
  ')
-@@ -242,6 +270,14 @@
+@@ -242,6 +268,18 @@
  ')
  
  optional_policy(`
@@ -23007,6 +23100,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	unconfined_signal(udev_t)
++')
++
++optional_policy(`
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
@@ -23032,7 +23129,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.26/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/unconfined.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/unconfined.if	2009-08-13 16:47:59.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -23103,18 +23200,30 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -111,6 +122,10 @@
+@@ -111,16 +122,17 @@
  ## </param>
  #
  interface(`unconfined_domain',`
+-	unconfined_domain_noaudit($1)
 +	gen_require(`
 +		attribute unconfined_services;
 +	')	
 +
- 	unconfined_domain_noaudit($1)
++	#		unconfined_domain_noaudit($1)
++	permissive $1;
  
  	tunable_policy(`allow_execheap',`
-@@ -173,411 +188,3 @@
+ 		auditallow $1 self:process execheap;
+ 	')
+ 
+-# Turn off this audit for FC5
+-#	tunable_policy(`allow_execmem',`
+-#		auditallow $1 self:process execmem;
+-#	')
+ ')
+ 
+ ########################################
+@@ -173,411 +185,3 @@
  	refpolicywarn(`$0($1) has been deprecated.')
  ')
  
@@ -23777,7 +23886,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.26/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-10 11:36:42.000000000 -0400
++++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-12 16:13:59.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -24215,11 +24324,12 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -511,182 +518,194 @@
+@@ -511,182 +518,195 @@
  	# 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 };
 +	allow $1_t self:netlink_kobject_uevent_socket create_socket_perms;
++	allow $1_t self:socket create_socket_perms;
  
 -	allow $1_t unpriv_userdomain:fd use;
 +	allow $1_usertype unpriv_userdomain:fd use;
@@ -24486,7 +24596,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -714,13 +733,26 @@
+@@ -714,13 +734,26 @@
  
  	userdom_base_user_template($1)
  
@@ -24518,7 +24628,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -738,70 +770,71 @@
+@@ -738,70 +771,71 @@
  
  	allow $1_t self:context contains;
  
@@ -24623,7 +24733,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -838,6 +871,28 @@
+@@ -838,6 +872,28 @@
  	# Local policy
  	#
  
@@ -24652,7 +24762,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -868,7 +923,10 @@
+@@ -868,7 +924,10 @@
  
  	userdom_restricted_user_template($1)
  
@@ -24664,7 +24774,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -876,14 +934,19 @@
+@@ -876,14 +935,19 @@
  	#
  
  	auth_role($1_r, $1_t)
@@ -24689,7 +24799,7 @@ diff -b -B --ignore-all-space --exclude-
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -891,28 +954,47 @@
+@@ -891,28 +955,47 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -24744,7 +24854,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -946,8 +1028,8 @@
+@@ -946,8 +1029,8 @@
  	# Declarations
  	#
  
@@ -24754,7 +24864,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -956,11 +1038,12 @@
+@@ -956,11 +1039,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -24769,7 +24879,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,36 +1061,53 @@
+@@ -978,36 +1062,53 @@
  		')
  	')
  
@@ -24837,7 +24947,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1042,7 +1142,7 @@
+@@ -1042,7 +1143,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -24846,7 +24956,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1151,7 @@
+@@ -1051,8 +1152,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -24856,7 +24966,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1174,8 @@
+@@ -1075,7 +1175,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -24866,7 +24976,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1191,7 @@
+@@ -1091,6 +1192,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -24874,7 +24984,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1199,6 @@
+@@ -1098,8 +1200,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -24883,7 +24993,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)
-@@ -1154,20 +1253,6 @@
+@@ -1154,20 +1254,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -24904,7 +25014,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1298,7 @@
+@@ -1213,6 +1299,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -24912,7 +25022,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1364,15 @@
+@@ -1278,11 +1365,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -24928,7 +25038,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1464,13 @@
+@@ -1374,12 +1465,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -24943,7 +25053,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1503,14 @@
+@@ -1412,6 +1504,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -24958,7 +25068,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1526,11 @@
+@@ -1427,9 +1527,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -24970,7 +25080,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1587,25 @@
+@@ -1486,6 +1588,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -24996,7 +25106,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1680,8 @@
+@@ -1560,6 +1681,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -25005,7 +25115,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1775,7 @@
+@@ -1653,6 +1776,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -25013,7 +25123,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)
  ')
-@@ -1780,19 +1903,32 @@
+@@ -1780,19 +1904,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -25053,7 +25163,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1963,7 @@
+@@ -1827,6 +1964,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -25061,7 +25171,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2511,7 @@
+@@ -2374,7 +2512,7 @@
  
  ########################################
  ## <summary>
@@ -25070,7 +25180,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2865,32 @@
+@@ -2728,11 +2866,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -25105,7 +25215,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3018,25 @@
+@@ -2860,7 +3019,25 @@
  		type user_tmp_t;
  	')
  
@@ -25132,7 +25242,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3073,7 @@
+@@ -2897,6 +3074,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -25140,7 +25250,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3204,501 @@
+@@ -3027,3 +3205,501 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -p -r1.895 -r1.896
--- selinux-policy.spec	12 Aug 2009 20:10:51 -0000	1.895
+++ selinux-policy.spec	13 Aug 2009 22:33:07 -0000	1.896
@@ -15,12 +15,12 @@
 %endif
 %define POLICYVER 23
 %define libsepolver 2.0.20-1
-%define POLICYCOREUTILSVER 2.0.62-10
+%define POLICYCOREUTILSVER 2.0.71-2
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.26
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,7 +348,7 @@ if [ $1 -eq 1 ]; then
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run 2> /dev/null
 else
-   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth 2>/dev/null
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit 2>/dev/null
    packages="%{expand:%%moduleList targeted} `get_unconfined`"
    %loadpolicy targeted $packages
    %relabel targeted
@@ -459,7 +459,7 @@ SELinux Reference policy mls base module
 %saveFileContext mls
 
 %post mls 
-semodule -n -s mls -r mailscanner -r polkit_auth 2>/dev/null
+semodule -n -s mls -r mailscanner -r polkit 2>/dev/null
 packages="%{expand:%%moduleList mls}"
 %loadpolicy mls $packages
 
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-11
+- Make all unconfined_domains permissive so we can see what AVC's happen 
+
 * Mon Aug 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-10
 - Add pt_chown policy
 



From hadess at fedoraproject.org  Thu Aug 13 22:51:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 13 Aug 2009 22:51:32 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.56, 1.57 gnome-media.spec,
	1.176, 1.177 sources, 1.55, 1.56
Message-ID: <20090813225132.CC19111C00EF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2035

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Thu Aug 13 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90.fix-1
- Update to 2.27.90.fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	27 Jul 2009 22:12:49 -0000	1.56
+++ .cvsignore	13 Aug 2009 22:51:32 -0000	1.57
@@ -1 +1 @@
-gnome-media-2.27.5.tar.bz2
+gnome-media-2.27.90.fix.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- gnome-media.spec	31 Jul 2009 13:30:14 -0000	1.176
+++ gnome-media.spec	13 Aug 2009 22:51:32 -0000	1.177
@@ -13,8 +13,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.27.5
-Release:        3%{?dist}
+Version:        2.27.90.fix
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.27/gnome-media-%{version}.tar.bz2
@@ -314,6 +314,9 @@ fi
 
 
 %changelog
+* Thu Aug 13 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90.fix-1
+- Update to 2.27.90.fix
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-3
 - Adjust the package split to not break rhythmbox
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	27 Jul 2009 22:12:50 -0000	1.55
+++ sources	13 Aug 2009 22:51:32 -0000	1.56
@@ -1 +1 @@
-f08b077bc635acd9abe93192b7410049  gnome-media-2.27.5.tar.bz2
+b2a95ada8b70385ce965338a152242e9  gnome-media-2.27.90.fix.tar.bz2



From whot at fedoraproject.org  Thu Aug 13 23:01:32 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 13 Aug 2009 23:01:32 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.67, 1.68 commitid, 1.30,
	1.31 sources, 1.62, 1.63 xorg-x11-server.spec, 1.470,
	1.471 xserver-1.6.99-git-e94c7c42ce.patch, 1.1, NONE
Message-ID: <20090813230132.C3D8E11C00EF@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5094

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Removed Files:
	xserver-1.6.99-git-e94c7c42ce.patch 
Log Message:
* Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-34.20090814
- Today's git snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	7 Aug 2009 05:48:12 -0000	1.67
+++ .cvsignore	13 Aug 2009 23:01:32 -0000	1.68
@@ -1 +1 @@
-xorg-server-20090807.tar.bz2
+xorg-server-20090814.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- commitid	7 Aug 2009 05:48:12 -0000	1.30
+++ commitid	13 Aug 2009 23:01:32 -0000	1.31
@@ -1 +1 @@
-e94c7c42ce9d6a194b76ba7e8b3904b180f93a1b
+db568f9eabf3450d8a023597ff007df355b13ea8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	7 Aug 2009 05:48:12 -0000	1.62
+++ sources	13 Aug 2009 23:01:32 -0000	1.63
@@ -1 +1 @@
-13b6f940d5b27fe39fbd6bfbd5801983  xorg-server-20090807.tar.bz2
+c42f978865f2d6be46770eeb0122afee  xorg-server-20090814.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -p -r1.470 -r1.471
--- xorg-x11-server.spec	11 Aug 2009 18:27:34 -0000	1.470
+++ xorg-x11-server.spec	13 Aug 2009 23:01:32 -0000	1.471
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090807
+%define gitdate 20090814
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   33.%{gitdate}%{?dist}
+Release:   34.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -28,7 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %if 0%{?gitdate}
 # git snapshot.  to recreate, run:
 # ./make-git-snapshot.sh `cat commitid`
-Source0:   xorg-server-%{gitdate}.tar.bz2
+Source0:   xorg-server-%{gitdate}.tar.xz
 Source1:   make-git-snapshot.sh
 Source2:   commitid
 %else
@@ -46,7 +46,6 @@ Source20:  http://svn.exactcode.de/t2/tr
 Source30: find-provides
 #define __find_provides {nil}
 
-Patch0: xserver-1.6.99-git-e94c7c42ce.patch
 Patch5: xserver-1.4.99-pic-libxf86config.patch
 Patch10: xserver-1.6.99-linkmap.patch
 
@@ -508,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-34.20090814
+- Today's git snapshot.
+
 * Tue Aug 11 2009 Adam Jackson <ajax at redhat.com> 1.6.99-33.20090807
 - xserver-1.6.99-show-ugly-cursor.patch: Drop, gtk bug found.
 


--- xserver-1.6.99-git-e94c7c42ce.patch DELETED ---



From hadess at fedoraproject.org  Thu Aug 13 23:22:56 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 13 Aug 2009 23:22:56 +0000 (UTC)
Subject: rpms/gnome-media/F-11 .cvsignore, 1.52, 1.53 gnome-media.spec, 1.173,
	1.174 sources, 1.51, 1.52
Message-ID: <20090813232256.3493011C00EF@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-serv10895

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90.fix-1
- Update to 2.27.90.fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	1 Jul 2009 10:01:07 -0000	1.52
+++ .cvsignore	13 Aug 2009 23:22:54 -0000	1.53
@@ -1 +1 @@
-gnome-media-2.27.3.1.tar.bz2
+gnome-media-2.27.90.fix.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- gnome-media.spec	1 Jul 2009 10:01:07 -0000	1.173
+++ gnome-media.spec	13 Aug 2009 23:22:54 -0000	1.174
@@ -13,7 +13,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.27.3.1
+Version:        2.27.90.fix
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
@@ -247,6 +247,9 @@ scrollkeeper-update -q || :
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90.fix-1
+- Update to 2.27.90.fix
+
 * Wed Jul 01 2009 Bastien Nocera <bnocera at redhat.com> 2.27.3.1-1
 - Update to 2.27.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	1 Jul 2009 10:01:07 -0000	1.51
+++ sources	13 Aug 2009 23:22:54 -0000	1.52
@@ -1 +1 @@
-426bb62bf75898a95458ce8438c35e83  gnome-media-2.27.3.1.tar.bz2
+b2a95ada8b70385ce965338a152242e9  gnome-media-2.27.90.fix.tar.bz2



From agoode at fedoraproject.org  Thu Aug 13 23:31:19 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Thu, 13 Aug 2009 23:31:19 +0000 (UTC)
Subject: rpms/htmldoc/devel htmldoc-1.8.27-scanf-overflows.patch, NONE,
	1.1 htmldoc.spec, 1.15, 1.16
Message-ID: <20090813233119.0D8AE11C00EF@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/htmldoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13043

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-scanf-overflows.patch 
Log Message:
Add scanf overflows patch

htmldoc-1.8.27-scanf-overflows.patch:
 htmllib.cxx      |    2 +-
 htmllib.cxx.orig |only
 ps-pdf.cxx       |    2 +-
 ps-pdf.cxx.orig  |only
 util.cxx         |    2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE htmldoc-1.8.27-scanf-overflows.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/htmllib.cxx htmldoc-1.8.27/htmldoc/htmllib.cxx
--- htmldoc-1.8.27~/htmldoc/htmllib.cxx	2009-08-13 19:25:30.066734472 -0400
+++ htmldoc-1.8.27/htmldoc/htmllib.cxx	2009-08-13 19:25:38.997733603 -0400
@@ -2154,7 +2154,7 @@
 	  * assigned charset...
 	  */
 
-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
+          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
           for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: htmllib.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:25:30.076736152 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:25:39.010735889 -0400
@@ -12515,7 +12515,7 @@
 	  * assigned charset...
 	  */
 
-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
+	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
 	  for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: ps-pdf.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/util.cxx htmldoc-1.8.27/htmldoc/util.cxx
--- htmldoc-1.8.27~/htmldoc/util.cxx	2005-04-24 15:20:32.000000000 -0400
+++ htmldoc-1.8.27/htmldoc/util.cxx	2009-08-13 19:25:39.014737749 -0400
@@ -484,7 +484,7 @@
     PageWidth  = 595;
     PageLength = 792;
   }
-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
+  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
   {
    /*
     * Custom size...


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/devel/htmldoc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- htmldoc.spec	25 Jul 2009 02:15:45 -0000	1.15
+++ htmldoc.spec	13 Aug 2009 23:31:18 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
@@ -15,6 +15,7 @@ Source:		http://ftp.easysw.com/pub/%{nam
 Patch0:		htmldoc-1.8.27-desktop-icon.patch
 Patch1:		htmldoc-1.8.27-dingbats-standard.patch
 Patch2:		htmldoc-1.8.27-system-fonts.patch
+Patch3:		htmldoc-1.8.27-scanf-overflows.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -95,6 +96,10 @@ ln -s %{_fontbasedir}/dejavu/DejaVuSerif
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Bold.ttf
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Italic.ttf
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif.ttf
+cd ..
+
+# fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
+%patch3 -p1 -b .scanf-overflows
 
 
 %build
@@ -173,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug  4 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
+- Fix scanf overflows (#512513)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.27-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Aug 13 23:39:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 23:39:39 +0000
Subject: [pkgdb] PolicyKit-gnome: dcbw has requested commit
Message-ID: <20090813233939.F236510F89F@bastion2.fedora.phx.redhat.com>

dcbw has requested the commit acl on PolicyKit-gnome (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-gnome



From pkgdb at fedoraproject.org  Thu Aug 13 23:39:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 23:39:44 +0000
Subject: [pkgdb] PolicyKit-gnome: dcbw has requested commit
Message-ID: <20090813233944.C56D210F8AA@bastion2.fedora.phx.redhat.com>

dcbw has requested the commit acl on PolicyKit-gnome (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-gnome



From agoode at fedoraproject.org  Thu Aug 13 23:46:02 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Thu, 13 Aug 2009 23:46:02 +0000 (UTC)
Subject: rpms/htmldoc/devel htmldoc-1.8.27-fortify-fail.patch, NONE,
	1.1 htmldoc.spec, 1.16, 1.17
Message-ID: <20090813234602.D765B11C00EF@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/htmldoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17633

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-fortify-fail.patch 
Log Message:
* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
- Fix scanf overflows (#512513)


htmldoc-1.8.27-fortify-fail.patch:
 ps-pdf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE htmldoc-1.8.27-fortify-fail.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
@@ -8619,7 +8619,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.text.buffer, (char *)data);
+        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
         get_color(_htmlTextColor, r->data.text.rgb);
         break;
     case RENDER_IMAGE :
@@ -8640,7 +8640,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.link, (char *)data);
+        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
         break;
   }
 


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/devel/htmldoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- htmldoc.spec	13 Aug 2009 23:31:18 -0000	1.16
+++ htmldoc.spec	13 Aug 2009 23:46:02 -0000	1.17
@@ -16,6 +16,7 @@ Patch0:		htmldoc-1.8.27-desktop-icon.pat
 Patch1:		htmldoc-1.8.27-dingbats-standard.patch
 Patch2:		htmldoc-1.8.27-system-fonts.patch
 Patch3:		htmldoc-1.8.27-scanf-overflows.patch
+Patch4:		htmldoc-1.8.27-fortify-fail.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -101,6 +102,9 @@ cd ..
 # fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
 %patch3 -p1 -b .scanf-overflows
 
+# fix limitation of -D_FORTIFY_SOURCE=2
+%patch4 -p1 -b .fortify-fail
+
 
 %build
 %configure
@@ -178,7 +182,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug  4 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
+* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
+- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
 - Fix scanf overflows (#512513)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.27-11



From pkgdb at fedoraproject.org  Thu Aug 13 23:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 23:50:53 +0000
Subject: [pkgdb] tomoe ownership updated
Message-ID: <20090813235053.C3AD010F84F@bastion2.fedora.phx.redhat.com>

Package tomoe in Fedora devel is now owned by dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomoe



From pkgdb at fedoraproject.org  Thu Aug 13 23:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 23:51:07 +0000
Subject: [pkgdb] tomoe ownership updated
Message-ID: <20090813235107.2BEC310F855@bastion2.fedora.phx.redhat.com>

Package tomoe in Fedora 10 is now owned by dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomoe



From pkgdb at fedoraproject.org  Thu Aug 13 23:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 23:51:10 +0000
Subject: [pkgdb] tomoe ownership updated
Message-ID: <20090813235111.3CFFF10F85C@bastion2.fedora.phx.redhat.com>

Package tomoe in Fedora 11 is now owned by dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tomoe



From pkgdb at fedoraproject.org  Thu Aug 13 23:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 13 Aug 2009 23:51:29 +0000
Subject: [pkgdb] libtomoe-gtk ownership updated
Message-ID: <20090813235130.4E7CD10F84F@bastion2.fedora.phx.redhat.com>

Package libtomoe-gtk in Fedora devel is now owned by dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libtomoe-gtk



From quaid at fedoraproject.org  Thu Aug 13 23:56:36 2009
From: quaid at fedoraproject.org (Karsten Wade)
Date: Thu, 13 Aug 2009 23:56:36 +0000 (UTC)
Subject: CVSROOT avail,1.63,1.64
Message-ID: <20090813235636.C7E1C11C00EF@cvs1.fedora.phx.redhat.com>

Author: quaid

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19985

Modified Files:
	avail 
Log Message:
adding radsy and mdious to the docs overall; removed duplicate stanzas that repeated earlier permissions; e.g. sparks already has access to the whole tree.  Thinking that all writers should get the ACL to the docs/ tree, spread the love.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- avail	11 Jun 2009 02:38:39 -0000	1.63
+++ avail	13 Aug 2009 23:56:36 -0000	1.64
@@ -32,9 +32,7 @@
 avail | harald | web/html/docs/udev
 avail | eitch,mdomsch | web/html/download
 avail | eitch,mdomsch | web/html/Download
-avail | mdious,sparks | web/html/docs/selinux-guide
-avail | mdious,sparks,sradvan | web/html/docs/selinux-user-guide
-avail | sparks,sradvan | web/html/docs/security-guide
+avail | mdious,sradvan | web/html/docs
 
 
 # Fedora security repository
@@ -46,4 +44,3 @@
 avail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security
 avail | trassl,kevin,dercorny,eteo | fedora-security
 
-avail | eitch | web/html/docs



From deji at fedoraproject.org  Fri Aug 14 01:13:40 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 14 Aug 2009 01:13:40 +0000 (UTC)
Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.25,1.26
Message-ID: <20090814011340.36B1511C00EF@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/nautilus-actions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5521

Modified Files:
	nautilus-actions.spec 
Log Message:
Fix the source tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- nautilus-actions.spec	13 Aug 2009 04:52:55 -0000	1.25
+++ nautilus-actions.spec	14 Aug 2009 01:13:39 -0000	1.26
@@ -5,7 +5,7 @@ Release:	1%{?dist}
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.grumz.net/node/8
-Source0:	http://download.gnome.org/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libgnomeui-devel, libglade2-devel, nautilus-devel
 BuildRequires:	libuuid-devel, unique-devel, gettext, perl(XML::Parser)



From itamarjp at fedoraproject.org  Fri Aug 14 01:26:55 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 14 Aug 2009 01:26:55 +0000 (UTC)
Subject: rpms/sylpheed/devel .cvsignore, 1.43, 1.44 sources, 1.43,
	1.44 sylpheed.spec, 1.102, 1.103
Message-ID: <20090814012655.9769211C00EF@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8699

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
- include patch to 2.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	29 Jul 2009 17:50:00 -0000	1.43
+++ .cvsignore	14 Aug 2009 01:26:55 -0000	1.44
@@ -1,2 +1,4 @@
 sylpheed-2.7.0.tar.bz2
 sylpheed-2.7.0.tar.bz2.asc
+sylpheed-2.7.0-2.7.1.patch.bz2
+sylpheed-2.7.0-2.7.1.patch.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	29 Jul 2009 17:50:00 -0000	1.43
+++ sources	14 Aug 2009 01:26:55 -0000	1.44
@@ -1,2 +1,4 @@
 977a8fc56dafc2af948e082f3ac28d9e  sylpheed-2.7.0.tar.bz2
 3d82d15ff617d94bee1ec22a12db72bf  sylpheed-2.7.0.tar.bz2.asc
+b8b4156c68de9b7e7c22bf6fa47a1885  sylpheed-2.7.0-2.7.1.patch.bz2
+fb39c625f1bba68ec1b87476c5de4d17  sylpheed-2.7.0-2.7.1.patch.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sylpheed.spec	29 Jul 2009 17:50:31 -0000	1.102
+++ sylpheed.spec	14 Aug 2009 01:26:55 -0000	1.103
@@ -6,8 +6,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.7.0
-Release: 3%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -26,6 +26,9 @@ BuildRequires: enchant-devel
 Source0: http://sylpheed.sraoss.jp/sylpheed/v2.6/%{name}-%{tarversion}.tar.bz2
 Source1: sylpheed.1
 
+#patch to upgrade to 2.7.1
+Patch0: sylpheed-2.7.0-2.7.1.patch.bz2
+
 # customisations for default program paths
 Patch1: sylpheed-2.4.6-defs.h.patch
 # customisations in the .desktop file
@@ -79,6 +82,7 @@ this package contains development files 
 
 %prep
 %setup -q -n sylpheed-%{tarversion}
+%patch0 -p1
 %patch1 -p1 -b .defs.h
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .certsdir
@@ -147,9 +151,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.7.1-1
+- new version 2.7.1
+
 * Wed Jul 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.7.0-3
 - no ldconfig scriptlets in -devel package
-- add more/new %doc files
+- add more/new %%doc files
 
 * Mon Jul 27 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.7.0-2
 - small fix in spec files about libs



From deji at fedoraproject.org  Fri Aug 14 01:30:35 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 14 Aug 2009 01:30:35 +0000 (UTC)
Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.26,1.27
Message-ID: <20090814013035.8DF0A11C0349@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/nautilus-actions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9868

Modified Files:
	nautilus-actions.spec 
Log Message:
Disable schema install



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nautilus-actions.spec	14 Aug 2009 01:13:39 -0000	1.26
+++ nautilus-actions.spec	14 Aug 2009 01:30:35 -0000	1.27
@@ -20,7 +20,7 @@ selected in Nautilus interface
 %setup -q
 
 %build
-%configure --enable-commandline-tool
+%configure --enable-commandline-tool --disable-schemas-install
 make %{?_smp_mflags} 
 
 %install



From whot at fedoraproject.org  Fri Aug 14 02:15:39 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 14 Aug 2009 02:15:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.36, 1.37 commitid, 1.2, 
	1.3 sources, 1.36, 1.37 xorg-x11-drv-evdev.spec, 1.58, 1.59
Message-ID: <20090814021539.4424C11C00EF@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-serv23408

Modified Files:
	.cvsignore commitid sources xorg-x11-drv-evdev.spec 
Log Message:
* Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-6.20090814
- Update to today's git master



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Jul 2009 23:20:29 -0000	1.36
+++ .cvsignore	14 Aug 2009 02:15:38 -0000	1.37
@@ -1 +1 @@
-xf86-input-evdev-20090730.tar.bz2
+xf86-input-evdev-20090814.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/commitid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- commitid	29 Jul 2009 23:20:29 -0000	1.2
+++ commitid	14 Aug 2009 02:15:38 -0000	1.3
@@ -1 +1 @@
-1f641d75edba7394201c1c53938215bae696791b
+ca0fb396f1a4b87be9f8aa7ad066e0b469c9075d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	29 Jul 2009 23:20:29 -0000	1.36
+++ sources	14 Aug 2009 02:15:38 -0000	1.37
@@ -1 +1 @@
-387261a86c9cd97824cae66955b03b56  xf86-input-evdev-20090730.tar.bz2
+b4da7e1563241129b493a775f66929e6  xf86-input-evdev-20090814.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.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xorg-x11-drv-evdev.spec	29 Jul 2009 23:20:29 -0000	1.58
+++ xorg-x11-drv-evdev.spec	14 Aug 2009 02:15:38 -0000	1.59
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090730
+%define gitdate 20090814
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.2.99
-Release:    5.%{gitdate}%{?dist}
+Release:    6.%{gitdate}%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -71,6 +71,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-6.20090814
+- Update to today's git master
+
 * Thu Jul 30 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-5.20090730
 - Update to today's git master
 



From pkgdb at fedoraproject.org  Fri Aug 14 02:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 02:18:23 +0000
Subject: [pkgdb] scim-tomoe ownership updated
Message-ID: <20090814021823.DD6D210F848@bastion2.fedora.phx.redhat.com>

Package scim-tomoe in Fedora 10 is now owned by dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From pkgdb at fedoraproject.org  Fri Aug 14 02:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 02:18:27 +0000
Subject: [pkgdb] scim-tomoe ownership updated
Message-ID: <20090814021828.6608210F857@bastion2.fedora.phx.redhat.com>

Package scim-tomoe in Fedora 11 is now owned by dchen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/scim-tomoe



From mclasen at fedoraproject.org  Fri Aug 14 03:18:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 03:18:27 +0000 (UTC)
Subject: rpms/libtheora/devel .cvsignore, 1.15, 1.16 libtheora.spec, 1.38,
	1.39 sources, 1.15, 1.16
Message-ID: <20090814031827.C8B2311C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libtheora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9635

Modified Files:
	.cvsignore libtheora.spec sources 
Log Message:
1.1beta2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Aug 2009 17:23:48 -0000	1.15
+++ .cvsignore	14 Aug 2009 03:18:26 -0000	1.16
@@ -1 +1 @@
-libtheora-1.1beta1.tar.xz
+libtheora-1.1beta2.tar.xz


Index: libtheora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libtheora.spec	12 Aug 2009 17:23:48 -0000	1.38
+++ libtheora.spec	14 Aug 2009 03:18:26 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
-Version: 1.1beta1
-Release: 2%{?dist}
+Version: 1.1beta2
+Release: 1%{?dist}
 Epoch: 1
 License: BSD
 Group: System Environment/Libraries
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.1beta2
+- 1.1beta2
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1beta1-2
 - Use xz compressed upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Aug 2009 17:23:48 -0000	1.15
+++ sources	14 Aug 2009 03:18:26 -0000	1.16
@@ -1 +1 @@
-6eee1d20172f89f29218c5a89666a7d8  libtheora-1.1beta1.tar.xz
+0503c6be02665e8193cf3f7b5a71828b  libtheora-1.1beta2.tar.xz



From cwickert at fedoraproject.org  Fri Aug 14 03:21:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 14 Aug 2009 03:21:34 +0000 (UTC)
Subject: rpms/gwget/devel gwget-epiphany-webkit.patch, NONE, 1.1 .cvsignore, 
	1.12, 1.13 gwget.spec, 1.35, 1.36 sources, 1.12,
	1.13 gwget-1.0.1-epiphany.patch, 1.1, NONE
Message-ID: <20090814032134.B55E911C00EF@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10659

Modified Files:
	.cvsignore gwget.spec sources 
Added Files:
	gwget-epiphany-webkit.patch 
Removed Files:
	gwget-1.0.1-epiphany.patch 
Log Message:
* 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)
- No need to run any autotools any longer


gwget-epiphany-webkit.patch:
 configure.ac                              |   24 ++++++++++++++++++------
 epiphany-extension/ephy-gwget-extension.c |    4 ++++
 2 files changed, 22 insertions(+), 6 deletions(-)

--- NEW FILE gwget-epiphany-webkit.patch ---
Index: gwget-1.0.2/configure.ac
===================================================================
--- gwget-1.0.2.orig/configure.ac
+++ gwget-1.0.2/configure.ac
@@ -98,13 +98,17 @@ AC_MSG_CHECKING([which epiphany to use])
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 or 2.26 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 or 2.26 or 2.28 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25 or 2.26
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, 2.27 or 2.28
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.26; then
+if pkg-config --exists epiphany-2.28; then
+        EPHY_VER=2.28
+elif pkg-config --exists epiphany-2.27; then
+        EPHY_VER=2.27
+elif pkg-config --exists epiphany-2.26; then
         EPHY_VER=2.26
 elif pkg-config --exists epiphany-2.25; then
         EPHY_VER=2.25
@@ -219,13 +223,21 @@ elif test "x$EPHY_VER" = "x2.26"; then
 	  EPIPHANY_PKGCONFIG=epiphany-2.26
           EPIPHANY_REQUIRED=2.26
 	  EPIPHANY_SHORTVER=226
+elif test "x$EPHY_VER" = "x2.27"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.27
+          EPIPHANY_REQUIRED=2.27
+	  EPIPHANY_SHORTVER=227
+elif test "x$EPHY_VER" = "x2.28"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.28
+          EPIPHANY_REQUIRED=2.28
+	  EPIPHANY_SHORTVER=228
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
-AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225 or 226)])
+AC_DEFINE_UNQUOTED(EPHY_VERSION, $EPIPHANY_SHORTVER,
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227 or 228)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0
Index: gwget-1.0.2/epiphany-extension/ephy-gwget-extension.c
===================================================================
--- gwget-1.0.2.orig/epiphany-extension/ephy-gwget-extension.c
+++ gwget-1.0.2/epiphany-extension/ephy-gwget-extension.c
@@ -29,8 +29,12 @@
 #endif
 
 
+#if EPHY_VERSION >= 227
+#include <epiphany/epiphany.h>
+#else
 #include <epiphany/ephy-embed-single.h>
 #include <epiphany/ephy-embed-shell.h>
+#endif
 
 #define EPHY_GWGET_EXTENSION_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_GWGET_EXTENSION, EphyGwgetExtensionPrivate))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Feb 2009 02:44:00 -0000	1.12
+++ .cvsignore	14 Aug 2009 03:21:34 -0000	1.13
@@ -1 +1 @@
-gwget-1.0.1.tar.bz2
+gwget-1.0.2.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gwget.spec	25 Jul 2009 01:56:47 -0000	1.35
+++ gwget.spec	14 Aug 2009 03:21:34 -0000	1.36
@@ -1,17 +1,18 @@
 %global epimajor 2.26
-# disable epiphany extension for F12 mass rebuild
-%global _with_epi 0
+# enable/disable epiphany extension
+%global _with_epiphany 1
+# if you comment this out, make sure to remove the %
 
 Name:		gwget
-Version:	1.0.1
-Release:	6%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/%{version}/gwget-%{version}.tar.bz2
-Patch0:		gwget-1.0.1-epiphany.patch
+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
@@ -24,22 +25,16 @@ BuildRequires:	desktop-file-utils
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
-%if 0%{?_with_epi} == 1
+%if 0%{?_with_epiphany:1}
 BuildRequires:	epiphany-devel >= %{epimajor}
 %endif
 
-# disable epiphany extension for mass rebuild
-Obsoletes:	gwget-epiphany-extension <= 1.0.1-4
-
-# Was a buildreq on autoconf
-BuildRequires:	automake, libtool
-
 %description
 Gwget is a Download Manager for Gnome 2. It uses wget as a backend.
 Currently, very basic wget options are available, supporting multiple
 downloads, drag&drop and display the errors from wget process.
 
-%if 0%{?_with_epi} == 1
+%if 0%{?_with_epiphany:1}
 %package	epiphany-extension
 Summary:	Gwget2 extensions for epiphany
 Group:		Applications/Internet
@@ -48,7 +43,7 @@ Requires:	%{name} = %{version}
 Requires:	epiphany >= %{epimajor}
 
 %description epiphany-extension
-This package contains gwget2 extensions for epiphany.
+This package contains gwget2 extensions for the epiphany webbrowser.
 %endif
 
 %prep
@@ -63,11 +58,13 @@ done
 
 
 %build
-#intltoolize -f
-aclocal
-libtoolize -f
-autoreconf -f
-%configure --disable-static
+%configure --disable-static \
+%if 0%{?_with_epiphany:1}
+    --enable-epiphany-extension
+%else
+    --disable-epiphany-extension
+%endif
+
 make %{?_smp_mflags}
 
 
@@ -75,7 +72,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 desktop-file-install --vendor fedora			\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -114,7 +111,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/dbus-1/services/org.gnome.gwget.service
 
-%if 0%{?_with_epi} == 1
+%if 0%{?_with_epiphany:1}
 %files epiphany-extension
 %defattr (-,root,root,-)
 %{_libdir}/epiphany/*/extensions/gwget.xml
@@ -123,6 +120,11 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* 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)
+- No need to run any autotools any longer
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Feb 2009 02:44:00 -0000	1.12
+++ sources	14 Aug 2009 03:21:34 -0000	1.13
@@ -1 +1 @@
-780d2d8569032cbc4405b88c33e431cc  gwget-1.0.1.tar.bz2
+52b518ea58b3bd618db0c58910ee5ccc  gwget-1.0.2.tar.bz2


--- gwget-1.0.1-epiphany.patch DELETED ---



From orion at fedoraproject.org  Fri Aug 14 03:36:13 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 14 Aug 2009 03:36:13 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.4-octave32.patch, NONE, 1.1 plplot.spec,
	1.80, 1.81
Message-ID: <20090814033613.B7AD211C00EF@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.9.4-octave32.patch 
Log Message:
* Thu Aug 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-4
- Add patch to support octave 3.2


plplot-5.9.4-octave32.patch:
 closefig.m |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 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
 


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- plplot.spec	1 Aug 2009 09:57:39 -0000	1.80
+++ plplot.spec	14 Aug 2009 03:36:13 -0000	1.81
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -19,6 +19,7 @@ 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
+Patch3:         plplot-5.9.4-octave32.patch
 Patch5:         plplot-5.9.3-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -256,6 +257,7 @@ Requires:       pkgconfig
 %setup -q
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .info
+%patch3 -p1 -b .octave32
 %patch5 -p1 -b .test
 %patch6 -p1 -b .jni
 # Convert to UTF-8
@@ -597,6 +599,9 @@ fi
 
 
 %changelog
+* 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.
 



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:43 +0000
Subject: [pkgdb] perl: corsepiu has given up watchbugzilla
Message-ID: <20090814035846.4B0E010F859@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:43 +0000
Subject: [pkgdb] perl: corsepiu has given up watchcommits
Message-ID: <20090814035845.8CC1B10F857@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:44 +0000
Subject: [pkgdb] perl: corsepiu has given up commit
Message-ID: <20090814035848.E41B710F86C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:45 +0000
Subject: [pkgdb] perl: corsepiu has given up approveacls
Message-ID: <20090814035849.2926410F876@bastion2.fedora.phx.redhat.com>

corsepiu has given up the approveacls acl on perl (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:49 +0000
Subject: [pkgdb] perl: corsepiu has given up watchbugzilla
Message-ID: <20090814035850.7A42310F899@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:49 +0000
Subject: [pkgdb] perl: corsepiu has given up watchcommits
Message-ID: <20090814035851.3A64110F8A5@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:51 +0000
Subject: [pkgdb] perl: corsepiu has given up approveacls
Message-ID: <20090814035852.3E92E10F8B4@bastion2.fedora.phx.redhat.com>

corsepiu has given up the approveacls acl on perl (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:58:51 +0000
Subject: [pkgdb] perl: corsepiu has given up commit
Message-ID: <20090814035852.36D0010F8B2@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 14 03:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 03:59:47 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090814035948.076D810F84F@bastion2.fedora.phx.redhat.com>

Package Coin2 in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:08 +0000
Subject: [pkgdb] OpenSceneGraph ownership updated
Message-ID: <20090814040008.A5E9E10F85A@bastion2.fedora.phx.redhat.com>

Package OpenSceneGraph in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/OpenSceneGraph



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:11 +0000
Subject: [pkgdb] OpenSceneGraph ownership updated
Message-ID: <20090814040012.0DBA010F85C@bastion2.fedora.phx.redhat.com>

Package OpenSceneGraph in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/OpenSceneGraph



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:34 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040034.9B41510F876@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 7 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:36 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040036.C391C10F897@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 3 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:37 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040038.081C710F8A8@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 4 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:40 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040041.A1D8910F89F@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 6 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:38 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040040.1349F10F8B5@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 5 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:41 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040042.7EC4010F8AA@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 8 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:00:50 +0000
Subject: [pkgdb] perl-Business-Hours ownership updated
Message-ID: <20090814040053.898DC10F8F2@bastion2.fedora.phx.redhat.com>

Package perl-Business-Hours in Fedora 9 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Business-Hours



From pkgdb at fedoraproject.org  Fri Aug 14 04:01:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:01:13 +0000
Subject: [pkgdb] cvsutils ownership updated
Message-ID: <20090814040113.EBC4E10F8FE@bastion2.fedora.phx.redhat.com>

Package cvsutils in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From pkgdb at fedoraproject.org  Fri Aug 14 04:01:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:01:12 +0000
Subject: [pkgdb] cvsutils ownership updated
Message-ID: <20090814040112.E8B7710F85A@bastion2.fedora.phx.redhat.com>

Package cvsutils in Fedora 6 is now owned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From pkgdb at fedoraproject.org  Fri Aug 14 04:01:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:01:15 +0000
Subject: [pkgdb] cvsutils ownership updated
Message-ID: <20090814040115.8F8D610F85C@bastion2.fedora.phx.redhat.com>

Package cvsutils in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From pkgdb at fedoraproject.org  Fri Aug 14 04:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:01:19 +0000
Subject: [pkgdb] cvsutils ownership updated
Message-ID: <20090814040120.DFC5810F902@bastion2.fedora.phx.redhat.com>

Package cvsutils in Fedora 6 is now owned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cvsutils



From orion at fedoraproject.org  Fri Aug 14 04:01:26 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 14 Aug 2009 04:01:26 +0000 (UTC)
Subject: rpms/hdf/devel hdf.spec,1.32,1.33
Message-ID: <20090814040126.A595311C00EF@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/hdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21193

Modified Files:
	hdf.spec 
Log Message:
* Thu Aug 13 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-4
- Add -fPIC to FFLAGS



Index: hdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- hdf.spec	25 Jul 2009 02:04:15 -0000	1.32
+++ hdf.spec	14 Aug 2009 04:01:26 -0000	1.33
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -56,7 +56,7 @@ touch -c -r ./mfhdf/libsrc/config/netcdf
 # avoid upstream compiler flags settings
 rm config/*linux-gnu
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-export FFLAGS="$RPM_OPT_FLAGS -ffixed-line-length-none"
+export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
 %configure F77=gfortran --disable-production --disable-netcdf \
  --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}
 
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Orion Poplawski <orion at cora.nwra.com> 4.2r4-4
+- Add -fPIC to FFLAGS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2r4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Aug 14 04:01:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:01:49 +0000
Subject: [pkgdb] help2man ownership updated
Message-ID: <20090814040150.2801610F90C@bastion2.fedora.phx.redhat.com>

Package help2man in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:16 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040219.1F03910F89A@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 7 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:23 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040232.DDDD910F919@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 4 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:22 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040238.3190B10F8BE@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 9 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:32 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040239.825AA10F8C0@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 6 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:24 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040232.E47DE10F91A@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 8 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:20 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040231.969E310F916@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 3 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:25 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040234.276A210F91B@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 5 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:23 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040232.A100B10F918@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 2 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:17 +0000
Subject: [pkgdb] lib3ds ownership updated
Message-ID: <20090814040226.8FAC410F90E@bastion2.fedora.phx.redhat.com>

Package lib3ds in Fedora 1 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lib3ds



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:47 +0000
Subject: [pkgdb] perl-Want ownership updated
Message-ID: <20090814040249.758FA10F92A@bastion2.fedora.phx.redhat.com>

Package perl-Want in Fedora 3 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Want



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:49 +0000
Subject: [pkgdb] perl-Want ownership updated
Message-ID: <20090814040253.7B4B910F937@bastion2.fedora.phx.redhat.com>

Package perl-Want in Fedora 5 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Want



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:52 +0000
Subject: [pkgdb] perl-Want ownership updated
Message-ID: <20090814040255.55C5010F8B0@bastion2.fedora.phx.redhat.com>

Package perl-Want in Fedora 8 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Want



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:46 +0000
Subject: [pkgdb] perl-Want ownership updated
Message-ID: <20090814040247.6C81F10F8B1@bastion2.fedora.phx.redhat.com>

Package perl-Want in Fedora 7 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Want



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:48 +0000
Subject: [pkgdb] perl-Want ownership updated
Message-ID: <20090814040249.E47CC10F92D@bastion2.fedora.phx.redhat.com>

Package perl-Want in Fedora 4 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Want



From pkgdb at fedoraproject.org  Fri Aug 14 04:02:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:02:50 +0000
Subject: [pkgdb] perl-Want ownership updated
Message-ID: <20090814040253.002DC10F8B5@bastion2.fedora.phx.redhat.com>

Package perl-Want in Fedora 6 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Want



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:04 +0000
Subject: [pkgdb] perl-Params-Util ownership updated
Message-ID: <20090814040306.781DB10F936@bastion2.fedora.phx.redhat.com>

Package perl-Params-Util in Fedora 7 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Util



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:09 +0000
Subject: [pkgdb] perl-Params-Util ownership updated
Message-ID: <20090814040319.75FF210F93E@bastion2.fedora.phx.redhat.com>

Package perl-Params-Util in Fedora 4 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Util



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:06 +0000
Subject: [pkgdb] perl-Params-Util ownership updated
Message-ID: <20090814040316.4266810F947@bastion2.fedora.phx.redhat.com>

Package perl-Params-Util in Fedora 3 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Util



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:28 +0000
Subject: [pkgdb] perl-Test-Inline ownership updated
Message-ID: <20090814040330.DA8AB10F8C4@bastion2.fedora.phx.redhat.com>

Package perl-Test-Inline in Fedora 3 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Inline



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:15 +0000
Subject: [pkgdb] perl-Params-Util ownership updated
Message-ID: <20090814040322.56F6D10F8B9@bastion2.fedora.phx.redhat.com>

Package perl-Params-Util in Fedora 8 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Util



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:17 +0000
Subject: [pkgdb] perl-Params-Util ownership updated
Message-ID: <20090814040322.7617910F950@bastion2.fedora.phx.redhat.com>

Package perl-Params-Util in Fedora 5 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Util



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:26 +0000
Subject: [pkgdb] perl-Test-Inline ownership updated
Message-ID: <20090814040328.B639010F93C@bastion2.fedora.phx.redhat.com>

Package perl-Test-Inline in Fedora 7 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Inline



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:13 +0000
Subject: [pkgdb] perl-Params-Util ownership updated
Message-ID: <20090814040320.A80DB10F94E@bastion2.fedora.phx.redhat.com>

Package perl-Params-Util in Fedora 6 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Params-Util



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:37 +0000
Subject: [pkgdb] perl-Test-Inline ownership updated
Message-ID: <20090814040343.27C3A10F946@bastion2.fedora.phx.redhat.com>

Package perl-Test-Inline in Fedora 8 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Inline



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:30 +0000
Subject: [pkgdb] perl-Test-Inline ownership updated
Message-ID: <20090814040334.4E59610F95F@bastion2.fedora.phx.redhat.com>

Package perl-Test-Inline in Fedora 4 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Inline



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:34 +0000
Subject: [pkgdb] perl-Test-Inline ownership updated
Message-ID: <20090814040337.AFAEE10F8C6@bastion2.fedora.phx.redhat.com>

Package perl-Test-Inline in Fedora 6 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Inline



From pkgdb at fedoraproject.org  Fri Aug 14 04:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 04:03:32 +0000
Subject: [pkgdb] perl-Test-Inline ownership updated
Message-ID: <20090814040336.00BE110F962@bastion2.fedora.phx.redhat.com>

Package perl-Test-Inline in Fedora 5 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Inline



From orion at fedoraproject.org  Fri Aug 14 04:11:19 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 14 Aug 2009 04:11:19 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.4-octave32.patch,1.1,1.2
Message-ID: <20090814041119.7D80411C00D0@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11047

Modified Files:
	plplot-5.9.4-octave32.patch 
Log Message:
typo


plplot-5.9.4-octave32.patch:
 closefig.m |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: plplot-5.9.4-octave32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot-5.9.4-octave32.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plplot-5.9.4-octave32.patch	14 Aug 2009 03:36:13 -0000	1.1
+++ plplot-5.9.4-octave32.patch	14 Aug 2009 04:11:19 -0000	1.2
@@ -5,7 +5,7 @@
    global __pl
  
 -  if ( !(exist "__pl") || !struct_contains (__pl,"inited"))
-+  if ( !(exist (__pl")) || !struct_contains (__pl,"inited"))
++  if ( !(exist ("__pl")) || !struct_contains (__pl,"inited"))
      return;
    endif
  



From agoode at fedoraproject.org  Fri Aug 14 04:12:54 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Fri, 14 Aug 2009 04:12:54 +0000 (UTC)
Subject: rpms/htmldoc/F-11 htmldoc-1.8.27-fortify-fail.patch, NONE,
	1.1 htmldoc-1.8.27-scanf-overflows.patch, NONE, 1.1 htmldoc.spec,
	1.14, 1.15
Message-ID: <20090814041254.484E811C00D0@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/htmldoc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11755

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-fortify-fail.patch 
	htmldoc-1.8.27-scanf-overflows.patch 
Log Message:
* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
- Fix scanf overflows (#512513)


htmldoc-1.8.27-fortify-fail.patch:
 ps-pdf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE htmldoc-1.8.27-fortify-fail.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
@@ -8619,7 +8619,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.text.buffer, (char *)data);
+        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
         get_color(_htmlTextColor, r->data.text.rgb);
         break;
     case RENDER_IMAGE :
@@ -8640,7 +8640,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.link, (char *)data);
+        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
         break;
   }
 

htmldoc-1.8.27-scanf-overflows.patch:
 htmllib.cxx      |    2 +-
 htmllib.cxx.orig |only
 ps-pdf.cxx       |    2 +-
 ps-pdf.cxx.orig  |only
 util.cxx         |    2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE htmldoc-1.8.27-scanf-overflows.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/htmllib.cxx htmldoc-1.8.27/htmldoc/htmllib.cxx
--- htmldoc-1.8.27~/htmldoc/htmllib.cxx	2009-08-13 19:25:30.066734472 -0400
+++ htmldoc-1.8.27/htmldoc/htmllib.cxx	2009-08-13 19:25:38.997733603 -0400
@@ -2154,7 +2154,7 @@
 	  * assigned charset...
 	  */
 
-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
+          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
           for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: htmllib.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:25:30.076736152 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:25:39.010735889 -0400
@@ -12515,7 +12515,7 @@
 	  * assigned charset...
 	  */
 
-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
+	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
 	  for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: ps-pdf.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/util.cxx htmldoc-1.8.27/htmldoc/util.cxx
--- htmldoc-1.8.27~/htmldoc/util.cxx	2005-04-24 15:20:32.000000000 -0400
+++ htmldoc-1.8.27/htmldoc/util.cxx	2009-08-13 19:25:39.014737749 -0400
@@ -484,7 +484,7 @@
     PageWidth  = 595;
     PageLength = 792;
   }
-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
+  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
   {
    /*
     * Custom size...


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/F-11/htmldoc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- htmldoc.spec	25 Feb 2009 04:10:02 -0000	1.14
+++ htmldoc.spec	14 Aug 2009 04:12:54 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	10%{?dist}
+Release:	12%{?dist}
 Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
@@ -15,6 +15,8 @@ Source:		http://ftp.easysw.com/pub/%{nam
 Patch0:		htmldoc-1.8.27-desktop-icon.patch
 Patch1:		htmldoc-1.8.27-dingbats-standard.patch
 Patch2:		htmldoc-1.8.27-system-fonts.patch
+Patch3:		htmldoc-1.8.27-scanf-overflows.patch
+Patch4:		htmldoc-1.8.27-fortify-fail.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -95,6 +97,13 @@ ln -s %{_fontbasedir}/dejavu/DejaVuSerif
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Bold.ttf
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Italic.ttf
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif.ttf
+cd ..
+
+# fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
+%patch3 -p1 -b .scanf-overflows
+
+# fix limitation of -D_FORTIFY_SOURCE=2
+%patch4 -p1 -b .fortify-fail
 
 
 %build
@@ -173,6 +182,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
+- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
+- Fix scanf overflows (#512513)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.27-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.27-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pgordon at fedoraproject.org  Fri Aug 14 04:43:51 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 14 Aug 2009 04:43:51 +0000 (UTC)
Subject: rpms/telepathy-haze/devel telepathy-haze-no-yahoo-japan.patch, NONE,
	1.1 telepathy-haze.spec, 1.17, 1.18
Message-ID: <20090814044351.A63F411C00D0@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19965

Modified Files:
	telepathy-haze.spec 
Added Files:
	telepathy-haze-no-yahoo-japan.patch 
Log Message:
Add upstream patch to fix Yahoo! protocol usage (GNOME bug #591381, Fedora bug #514998).

telepathy-haze-no-yahoo-japan.patch:
 haze.manager |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE telepathy-haze-no-yahoo-japan.patch ---
>From d6c1f853371f4b4a0b2c8554512d148f37d6d990 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson at collabora.co.uk>
Date: Thu, 13 Aug 2009 00:44:15 +0100
Subject: [PATCH] Remove Yahoo Japan options from haze.manager

These have been removed in libpurple 2.6.0, but MC4 explicitly sets
them, and hence RequestConnection fails. Fixes Gnome bug #591381.
---
 data/haze.manager |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/data/haze.manager b/data/haze.manager
index 636c133..d87c918 100644
--- a/data/haze.manager
+++ b/data/haze.manager
@@ -157,22 +157,16 @@ default-useproxy=false
 [Protocol yahoo]
 param-account=s required
 param-password=s required
-param-yahoojp=b
 param-server=s
-param-serverjp=s
 param-port=i
 param-xfer-host=s
-param-xferjp-host=s
 param-xfer-port=i
 param-room-list-locale=s
 param-ignore-invites=b
 param-charset=s
-default-yahoojp=false
 default-server=scs.msg.yahoo.com
-default-serverjp=cs.yahoo.co.jp
 default-port=5050
 default-xfer-host=filetransfer.msg.yahoo.com
-default-xferjp-host=filetransfer.msg.yahoo.co.jp
 default-xfer-port=80
 default-room-list-locale=us
 default-ignore-invites=false
-- 
1.6.3.3



Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- telepathy-haze.spec	27 Jul 2009 05:44:20 -0000	1.17
+++ telepathy-haze.spec	14 Aug 2009 04:43:51 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
 Version:	0.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -9,6 +9,10 @@ URL:		http://developer.pidgin.im/wiki/Te
 
 Source0:	http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
+## Remove Yahoo Japan options from haze.manager, to fix Yahoo! IM connectivity
+## issues. (Fedora bug #514998, GNOME Bug #591381)
+Patch0: 	%{name}-no-yahoo-japan.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel >= 2.1.1
@@ -26,6 +30,7 @@ others will probably work too.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-yahoo-japan
 
 
 %build
@@ -51,6 +56,13 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Thu Aug 13 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-3
+- Add upstream patch to remove the Yahoo! Japan from the manager profile,
+  which fixes Yahoo! IM connectivity issues as reported in GNOME bug #591381.
+  + no-yahoo-japan.patch
+- Resolves: Fedora bug #514998 (Yahoo! Instant Messenger accounts do not work
+  in empathy).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From agoode at fedoraproject.org  Fri Aug 14 04:50:51 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Fri, 14 Aug 2009 04:50:51 +0000 (UTC)
Subject: rpms/htmldoc/F-10 htmldoc-1.8.27-fortify-fail.patch, NONE,
	1.1 htmldoc-1.8.27-scanf-overflows.patch, NONE, 1.1 htmldoc.spec,
	1.10, 1.11
Message-ID: <20090814045051.3C06D11C00D0@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/htmldoc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21582

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-fortify-fail.patch 
	htmldoc-1.8.27-scanf-overflows.patch 
Log Message:
* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-8
- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
- Fix scanf overflows (#512513)


htmldoc-1.8.27-fortify-fail.patch:
 ps-pdf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE htmldoc-1.8.27-fortify-fail.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
@@ -8619,7 +8619,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.text.buffer, (char *)data);
+        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
         get_color(_htmlTextColor, r->data.text.rgb);
         break;
     case RENDER_IMAGE :
@@ -8640,7 +8640,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.link, (char *)data);
+        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
         break;
   }
 

htmldoc-1.8.27-scanf-overflows.patch:
 htmllib.cxx      |    2 +-
 htmllib.cxx.orig |only
 ps-pdf.cxx       |    2 +-
 ps-pdf.cxx.orig  |only
 util.cxx         |    2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE htmldoc-1.8.27-scanf-overflows.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/htmllib.cxx htmldoc-1.8.27/htmldoc/htmllib.cxx
--- htmldoc-1.8.27~/htmldoc/htmllib.cxx	2009-08-13 19:25:30.066734472 -0400
+++ htmldoc-1.8.27/htmldoc/htmllib.cxx	2009-08-13 19:25:38.997733603 -0400
@@ -2154,7 +2154,7 @@
 	  * assigned charset...
 	  */
 
-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
+          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
           for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: htmllib.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:25:30.076736152 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:25:39.010735889 -0400
@@ -12515,7 +12515,7 @@
 	  * assigned charset...
 	  */
 
-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
+	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
 	  for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: ps-pdf.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/util.cxx htmldoc-1.8.27/htmldoc/util.cxx
--- htmldoc-1.8.27~/htmldoc/util.cxx	2005-04-24 15:20:32.000000000 -0400
+++ htmldoc-1.8.27/htmldoc/util.cxx	2009-08-13 19:25:39.014737749 -0400
@@ -484,7 +484,7 @@
     PageWidth  = 595;
     PageLength = 792;
   }
-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
+  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
   {
    /*
     * Custom size...


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/F-10/htmldoc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- htmldoc.spec	30 Aug 2008 17:18:55 -0000	1.10
+++ htmldoc.spec	14 Aug 2009 04:50:51 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	7%{?dist}
-Summary:	Convert HTML source files into HTML, PostScript, or PDF
+Release:	8%{?dist}
+Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
 
@@ -13,6 +13,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 Source:		http://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
 
 Patch0:		htmldoc-1.8.27-desktop-icon.patch
+Patch3:		htmldoc-1.8.27-scanf-overflows.patch
+Patch4:		htmldoc-1.8.27-fortify-fail.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -37,9 +39,15 @@ you to change options and generate docum
 # fix up hardcoded documentation path
 sed -i 's/\(\$prefix\/share\/doc\/htmldoc\)/\1-%{version}/g' configure
 
-# fix desktop icon (upstream bug STR #169)
+# fix desktop icon (http://www.htmldoc.org/str.php?L169)
 %patch0 -p1 -b .desktop-icon
 
+# fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
+%patch3 -p1 -b .scanf-overflows
+
+# fix limitation of -D_FORTIFY_SOURCE=2
+%patch4 -p1 -b .fortify-fail
+
 
 %build
 %configure
@@ -65,8 +73,8 @@ install -d ${RPM_BUILD_ROOT}%{_datadir}/
 cp -a desktop/htmldoc.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages
 
 # desktop file
-desktop-file-install --vendor fedora                            \
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+desktop-file-install --vendor fedora				\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--remove-category=X-Red-Hat-Base			\
 	--add-mime-type=application/vnd.htmldoc-book		\
 	desktop/htmldoc.desktop
@@ -76,7 +84,7 @@ desktop-file-install --vendor fedora    
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 # scriptlet for MIME
@@ -90,7 +98,7 @@ update-desktop-database &> /dev/null || 
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 # scriptlet for MIME
@@ -117,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-8
+- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
+- Fix scanf overflows (#512513)
+
 * Sat Aug 30 2008 Adam Goode <adam at spicenitz.org> - 1.8.27-7
 - RPM 4.6 fix for patch tag
 



From orion at fedoraproject.org  Fri Aug 14 04:51:52 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 14 Aug 2009 04:51:52 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.4-octave32.patch,1.2,1.3
Message-ID: <20090814045152.B124C11C00D0@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21846

Modified Files:
	plplot-5.9.4-octave32.patch 
Log Message:
More octave 3.2 fixes


plplot-5.9.4-octave32.patch:
 PLplot/closefig.m |    2 +-
 demos/p4.m        |    2 +-
 demos/p5.m        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: plplot-5.9.4-octave32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot-5.9.4-octave32.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- plplot-5.9.4-octave32.patch	14 Aug 2009 04:11:19 -0000	1.2
+++ plplot-5.9.4-octave32.patch	14 Aug 2009 04:51:52 -0000	1.3
@@ -9,3 +9,25 @@
      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);



From akurtakov at fedoraproject.org  Fri Aug 14 05:18:58 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 14 Aug 2009 05:18:58 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.658,1.659 eclipse.ini,1.1,NONE
Message-ID: <20090814051858.659D811C00D0@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28360/devel

Modified Files:
	eclipse.spec 
Removed Files:
	eclipse.ini 
Log Message:
Do not use the provided eclipse.ini but the one from build.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -p -r1.658 -r1.659
--- eclipse.spec	13 Aug 2009 08:08:34 -0000	1.658
+++ eclipse.spec	14 Aug 2009 05:18:58 -0000	1.659
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.5%{?dist}
+Release:        0.6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -74,7 +74,6 @@ Source28:       %{name}-mv-Platform.sh
 #   %{name}-%{version}-testframework
 # (generated 2009-07-23)
 Source30:       %{name}-%{version}-testframework.tar.bz2
-Source31: eclipse.ini
 
 # Build swttools.jar before generation on 64-bit platforms.
 # Build SWT native libraries
@@ -1010,7 +1009,7 @@ done
 popd
 %endif
 
-cp -p %{SOURCE31} \
+cp -p build/eclipse-I20090611-1540-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
@@ -1488,6 +1487,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Aug 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.6
+- Do not use the provided eclipse.ini but the one from build.
+
 * Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.5
 - Add epoch to icu4j Requires/BuildRequires.
 


--- eclipse.ini DELETED ---



From fujiwara at fedoraproject.org  Fri Aug 14 05:20:54 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Fri, 14 Aug 2009 05:20:54 +0000 (UTC)
Subject: rpms/ibus-anthy/F-11 ibus-anthy.spec, 1.17, 1.18 sources, 1.15,
	1.16 .cvsignore, 1.15, 1.16
Message-ID: <20090814052054.6F70111C00D0@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29030

Modified Files:
	ibus-anthy.spec sources .cvsignore 
Log Message:

Update to 1.1.0.20090814



Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/ibus-anthy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ibus-anthy.spec	3 Jun 2009 04:55:37 -0000	1.17
+++ ibus-anthy.spec	14 Aug 2009 05:20:54 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path ibus-1.1
 Name:       ibus-anthy
-Version:    1.1.0.20090603
+Version:    1.1.0.20090814
 Release:    1%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
@@ -56,6 +56,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Aug 14 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.1.0.20090814-1
+- Update to 1.1.0.20090814
+- Fix bug 509480 - No prediction feature work
+- Fix bug 509487 - convert_to_char_type_forward feature doesn't work
+- Fix bug 509488 - dict_admin feature doesn't work
+- Fix bug 508358 - ANTHY_HISTORY_FILE record only a single word
+- Fix bug 509483 - reconversion feature doesn't work
+- Fix bug 509485 - commit_first_segment feature doesn't work
+
 * Wed Jun 03 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090603-1
 - Update to 1.1.0.20090603
 - Implement setup ui.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	3 Jun 2009 04:55:37 -0000	1.15
+++ sources	14 Aug 2009 05:20:54 -0000	1.16
@@ -1 +1 @@
-b8e9970bf6dbaf1dde27c8a3eb5622d9  ibus-anthy-1.1.0.20090603.tar.gz
+a410c8c85513705b24edfa36c6f0b00c  ibus-anthy-1.1.0.20090814.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	3 Jun 2009 04:55:37 -0000	1.15
+++ .cvsignore	14 Aug 2009 05:20:54 -0000	1.16
@@ -1 +1 @@
-ibus-anthy-1.1.0.20090603.tar.gz
+ibus-anthy-1.1.0.20090814.tar.gz



From pgordon at fedoraproject.org  Fri Aug 14 05:27:28 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 14 Aug 2009 05:27:28 +0000 (UTC)
Subject: rpms/telepathy-haze/F-11 telepathy-haze-no-yahoo-japan.patch, NONE, 
	1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 telepathy-haze.spec,
	1.15, 1.16
Message-ID: <20090814052728.A6DD011C00D0@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30452

Modified Files:
	.cvsignore sources telepathy-haze.spec 
Added Files:
	telepathy-haze-no-yahoo-japan.patch 
Log Message:
Update to 0.3.1, and add upstream patch to fix Yahoo! protocol usage (GNOME bug #591381, Fedora bug #514998).

telepathy-haze-no-yahoo-japan.patch:
 haze.manager |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE telepathy-haze-no-yahoo-japan.patch ---
>From d6c1f853371f4b4a0b2c8554512d148f37d6d990 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson at collabora.co.uk>
Date: Thu, 13 Aug 2009 00:44:15 +0100
Subject: [PATCH] Remove Yahoo Japan options from haze.manager

These have been removed in libpurple 2.6.0, but MC4 explicitly sets
them, and hence RequestConnection fails. Fixes Gnome bug #591381.
---
 data/haze.manager |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/data/haze.manager b/data/haze.manager
index 636c133..d87c918 100644
--- a/data/haze.manager
+++ b/data/haze.manager
@@ -157,22 +157,16 @@ default-useproxy=false
 [Protocol yahoo]
 param-account=s required
 param-password=s required
-param-yahoojp=b
 param-server=s
-param-serverjp=s
 param-port=i
 param-xfer-host=s
-param-xferjp-host=s
 param-xfer-port=i
 param-room-list-locale=s
 param-ignore-invites=b
 param-charset=s
-default-yahoojp=false
 default-server=scs.msg.yahoo.com
-default-serverjp=cs.yahoo.co.jp
 default-port=5050
 default-xfer-host=filetransfer.msg.yahoo.com
-default-xferjp-host=filetransfer.msg.yahoo.co.jp
 default-xfer-port=80
 default-room-list-locale=us
 default-ignore-invites=false
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Apr 2009 05:29:40 -0000	1.7
+++ .cvsignore	14 Aug 2009 05:27:28 -0000	1.8
@@ -1 +1 @@
-telepathy-haze-0.3.0.tar.gz
+telepathy-haze-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Apr 2009 05:29:40 -0000	1.7
+++ sources	14 Aug 2009 05:27:28 -0000	1.8
@@ -1 +1 @@
-3d5528baa98f5e8151d2b740ff69cc85  telepathy-haze-0.3.0.tar.gz
+0076c47edea2cf2c9708fd7aaaf848a8  telepathy-haze-0.3.1.tar.gz


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/telepathy-haze.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- telepathy-haze.spec	13 Apr 2009 05:29:40 -0000	1.15
+++ telepathy-haze.spec	14 Aug 2009 05:27:28 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		telepathy-haze
-Version:	0.3.0
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
@@ -9,9 +9,13 @@ URL:		http://developer.pidgin.im/wiki/Te
 
 Source0:	http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
+## Remove Yahoo Japan options from haze.manager, to fix Yahoo! IM connectivity
+## issues. (Fedora bug #514998, GNOME Bug #591381)
+Patch0: 	%{name}-no-yahoo-japan.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libpurple-devel
+BuildRequires:	libpurple-devel >= 2.1.1
 BuildRequires:	telepathy-glib-devel >= 0.7.21
   
 Requires:	telepathy-filesystem    
@@ -26,6 +30,7 @@ others will probably work too.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-yahoo-japan
 
 
 %build
@@ -51,6 +56,14 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Thu Aug 13 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-1
+- Update to new upstream release (0.3.1).
+- Add upstream patch to remove the Yahoo! Japan from the manager profile,
+  which fixes Yahoo! IM connectivity issues as reported in GNOME bug #591381.
+  + no-yahoo-japan.patch
+- Resolves: Fedora bug #514998 (Yahoo! Instant Messenger accounts do not work
+  in empathy).
+
 * Sun Apr 12 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.0-1
 - Update to new upstream release (0.3.0)
 



From mgrepl at fedoraproject.org  Fri Aug 14 06:45:14 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 14 Aug 2009 06:45:14 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 modules-minimum.conf, 1.23,
	1.24 modules-targeted.conf, 1.132, 1.133 policy-20090521.patch,
	1.44, 1.45 selinux-policy.spec, 1.898, 1.899
Message-ID: <20090814064514.DF94411C00D0@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-serv13459

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Add ptchown policy from Dan Walsh




Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-minimum.conf,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- modules-minimum.conf	13 Aug 2009 14:54:00 -0000	1.23
+++ modules-minimum.conf	14 Aug 2009 06:45:12 -0000	1.24
@@ -556,6 +556,13 @@ hddtemp = module
 # 
 polkit = module
 
+# Layer: apps
+# Module: ptchown
+#
+# helper function for grantpt(3), changes ownship and permissions of pseudotty
+# 
+ptchown = module
+
 # Layer: services
 # Module: psad
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-targeted.conf,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- modules-targeted.conf	13 Aug 2009 14:54:00 -0000	1.132
+++ modules-targeted.conf	14 Aug 2009 06:45:12 -0000	1.133
@@ -570,6 +570,12 @@ hddtemp = module
 # 
 polkit = module
 
+# Layer: apps
+# Module: ptchown
+#
+# helper function for grantpt(3), changes ownship and permissions of pseudotty
+ptchown = module 
+
 # Layer: services
 # Module: psad
 #

policy-20090521.patch:
 mcs                                |   12 -
 modules/admin/certwatch.te         |    4 
 modules/admin/kismet.te            |   16 ++
 modules/admin/logrotate.te         |    6 
 modules/admin/mrtg.te              |    8 +
 modules/admin/prelink.te           |    9 -
 modules/admin/readahead.te         |    2 
 modules/admin/rpm.if               |   18 ++
 modules/admin/rpm.te               |    4 
 modules/admin/shorewall.fc         |   12 +
 modules/admin/shorewall.if         |  166 ++++++++++++++++++++++
 modules/admin/shorewall.te         |  103 +++++++++++++
 modules/admin/sudo.if              |    4 
 modules/admin/usermanage.te        |    1 
 modules/apps/calamaris.te          |    4 
 modules/apps/gitosis.fc            |    4 
 modules/apps/gitosis.if            |   96 ++++++++++++
 modules/apps/gitosis.te            |   43 +++++
 modules/apps/mozilla.if            |   16 ++
 modules/apps/mozilla.te            |   14 +
 modules/apps/nsplugin.if           |    2 
 modules/apps/ptchown.fc            |    2 
 modules/apps/ptchown.if            |   22 ++
 modules/apps/ptchown.te            |   39 +++++
 modules/apps/qemu.fc               |    1 
 modules/apps/qemu.te               |    5 
 modules/apps/sandbox.if            |  134 +++++++++++++-----
 modules/apps/sandbox.te            |  274 ++++++++++++++++++++++++++++++++++---
 modules/apps/screen.if             |    1 
 modules/apps/vmware.fc             |    1 
 modules/apps/vmware.te             |    6 
 modules/kernel/corecommands.fc     |   10 +
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    2 
 modules/kernel/devices.if          |  145 +++++++++++++++++++
 modules/kernel/devices.te          |   13 +
 modules/kernel/domain.if           |   45 ++----
 modules/kernel/domain.te           |   30 +++-
 modules/kernel/files.if            |    3 
 modules/kernel/kernel.if           |    2 
 modules/kernel/terminal.if         |   19 ++
 modules/roles/staff.te             |   12 +
 modules/roles/sysadm.if            |   35 ++++
 modules/roles/sysadm.te            |    4 
 modules/roles/unconfineduser.te    |    9 -
 modules/roles/unprivuser.te        |    4 
 modules/roles/xguest.te            |    6 
 modules/services/apache.fc         |    4 
 modules/services/automount.if      |   18 ++
 modules/services/avahi.te          |    2 
 modules/services/bluetooth.te      |    1 
 modules/services/clamav.te         |    4 
 modules/services/consolekit.te     |    3 
 modules/services/cron.if           |   19 --
 modules/services/cron.te           |    2 
 modules/services/cups.fc           |    2 
 modules/services/cups.te           |   28 +++
 modules/services/dbus.if           |    4 
 modules/services/dcc.te            |    8 -
 modules/services/ddclient.if       |   25 +++
 modules/services/devicekit.te      |    6 
 modules/services/dnsmasq.te        |    4 
 modules/services/dovecot.if        |   34 ++--
 modules/services/dovecot.te        |   20 +-
 modules/services/exim.te           |    6 
 modules/services/fetchmail.te      |    2 
 modules/services/fprintd.te        |   10 +
 modules/services/ftp.te            |    7 
 modules/services/gnomeclock.te     |    1 
 modules/services/gpsd.fc           |    3 
 modules/services/gpsd.te           |   17 ++
 modules/services/hal.te            |   14 +
 modules/services/hddtemp.fc        |    4 
 modules/services/hddtemp.if        |   38 +++++
 modules/services/hddtemp.te        |   40 +++++
 modules/services/kerberos.if       |    2 
 modules/services/kerberos.te       |   12 +
 modules/services/lircd.te          |    4 
 modules/services/mailman.if        |    1 
 modules/services/mta.if            |    1 
 modules/services/mysql.te          |    6 
 modules/services/nis.te            |    3 
 modules/services/nslcd.fc          |    4 
 modules/services/nslcd.if          |  145 +++++++++++++++++++
 modules/services/nslcd.te          |   50 ++++++
 modules/services/openvpn.te        |    1 
 modules/services/pcscd.te          |    3 
 modules/services/polkit.fc         |    2 
 modules/services/polkit.if         |    2 
 modules/services/polkit.te         |    3 
 modules/services/postfix.if        |   26 +++
 modules/services/postfix.te        |   26 ---
 modules/services/postgresql.te     |    2 
 modules/services/ppp.if            |    6 
 modules/services/privoxy.te        |    3 
 modules/services/pyzor.fc          |    2 
 modules/services/pyzor.te          |    2 
 modules/services/rpc.te            |   12 +
 modules/services/rsync.te          |    2 
 modules/services/sendmail.if       |   39 +++++
 modules/services/sendmail.te       |    7 
 modules/services/setroubleshoot.te |    5 
 modules/services/shorewall.fc      |   12 -
 modules/services/shorewall.if      |  166 ----------------------
 modules/services/shorewall.te      |  102 -------------
 modules/services/spamassassin.fc   |    4 
 modules/services/spamassassin.te   |    1 
 modules/services/ssh.if            |   23 ++-
 modules/services/ssh.te            |    4 
 modules/services/uucp.te           |    2 
 modules/services/virt.te           |   27 +++
 modules/services/xserver.fc        |    2 
 modules/services/xserver.if        |   41 +++++
 modules/services/xserver.te        |   11 +
 modules/system/authlogin.fc        |    3 
 modules/system/authlogin.if        |  223 ++++++++++++++++--------------
 modules/system/authlogin.te        |   27 +--
 modules/system/init.fc             |    2 
 modules/system/init.te             |    2 
 modules/system/ipsec.te            |   34 ++--
 modules/system/iptables.te         |    4 
 modules/system/iscsi.te            |    1 
 modules/system/libraries.fc        |   11 +
 modules/system/locallogin.te       |    6 
 modules/system/miscfiles.fc        |    1 
 modules/system/mount.te            |    1 
 modules/system/sysnetwork.if       |    1 
 modules/system/sysnetwork.te       |   17 +-
 modules/system/udev.fc             |    1 
 modules/system/udev.te             |   10 +
 modules/system/userdomain.if       |   30 ++--
 modules/system/virtual.te          |    5 
 modules/system/xen.te              |    1 
 133 files changed, 2208 insertions(+), 637 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- policy-20090521.patch	13 Aug 2009 17:19:29 -0000	1.44
+++ policy-20090521.patch	14 Aug 2009 06:45:12 -0000	1.45
@@ -822,6 +822,81 @@ diff -b -B --ignore-all-space --exclude-
  
  	list_dirs_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
  	read_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.fc serefpolicy-3.6.12/policy/modules/apps/ptchown.fc
+--- nsaserefpolicy/policy/modules/apps/ptchown.fc	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/apps/ptchown.fc	2009-08-14 08:31:59.000000000 +0200
+@@ -0,0 +1,2 @@
++
++/usr/libexec/pt_chown	--	gen_context(system_u:object_r:ptchown_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.if serefpolicy-3.6.12/policy/modules/apps/ptchown.if
+--- nsaserefpolicy/policy/modules/apps/ptchown.if	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/apps/ptchown.if	2009-08-14 08:09:22.000000000 +0200
+@@ -0,0 +1,22 @@
++
++## <summary>helper function for grantpt(3), changes ownship and permissions of pseudotty</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run ptchown.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ptchown_domtrans',`
++	gen_require(`
++		type ptchown_t;
++                type ptchown_exec_t;
++	')
++
++	domtrans_pattern($1,ptchown_exec_t,ptchown_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.6.12/policy/modules/apps/ptchown.te
+--- nsaserefpolicy/policy/modules/apps/ptchown.te	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.6.12/policy/modules/apps/ptchown.te	2009-08-14 08:31:55.000000000 +0200
+@@ -0,0 +1,39 @@
++policy_module(ptchown,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ptchown_t;
++type ptchown_exec_t;
++application_domain(ptchown_t, ptchown_exec_t)
++role system_r types ptchown_t;
++
++permissive ptchown_t;
++
++########################################
++#
++# ptchown local policy
++#
++
++allow ptchown_t self:capability { fowner chown setuid };
++allow ptchown_t self:process { getcap setcap };
++
++# Init script handling
++domain_use_interactive_fds(ptchown_t)
++
++# internal communication is often done using fifo and unix sockets.
++allow ptchown_t self:fifo_file rw_file_perms;
++allow ptchown_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(ptchown_t)
++
++fs_rw_anon_inodefs_files(ptchown_t)
++
++term_use_generic_ptys(ptchown_t)
++term_setattr_generic_ptys(ptchown_t)
++term_setattr_all_user_ptys(ptchown_t)
++
++miscfiles_read_localization(ptchown_t)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.6.12/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/qemu.fc	2009-06-25 10:21:01.000000000 +0200
@@ -4048,7 +4123,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(uucpd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.12/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-08-05 20:44:32.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/virt.te	2009-08-14 08:33:53.000000000 +0200
 @@ -22,6 +22,13 @@
  
  ## <desc>
@@ -4125,17 +4200,15 @@ diff -b -B --ignore-all-space --exclude-
  corenet_udp_sendrecv_generic_if(svirt_t)
  corenet_udp_sendrecv_generic_node(svirt_t)
  corenet_udp_sendrecv_all_ports(svirt_t)
-@@ -353,10 +372,6 @@
+@@ -353,7 +372,7 @@
  ')
  
  optional_policy(`
 -	samba_domtrans_smb(svirt_t)
--')
--
--optional_policy(`
- 	xen_rw_image_files(svirt_t)
++        ptchown_domtrans(svirt_t)
  ')
  
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.12/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/xserver.fc	2009-07-28 14:14:07.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -p -r1.898 -r1.899
--- selinux-policy.spec	13 Aug 2009 17:19:29 -0000	1.898
+++ selinux-policy.spec	14 Aug 2009 06:45:12 -0000	1.899
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 77%{?dist}
+Release: 78%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-78
+- Add ptchown policy from Dan Walsh
+
 * Thu Aug 13 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-77
 - Allow fprintd_t to getattr of all persistent filesystems
 



From kushal at fedoraproject.org  Fri Aug 14 06:47:10 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Fri, 14 Aug 2009 06:47:10 +0000 (UTC)
Subject: rpms/translation-filter/EL-5 sources, 1.2,
	1.3 translation-filter.spec, 1.2, 1.3
Message-ID: <20090814064710.AE2EA11C00D0@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/translation-filter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13899

Modified Files:
	sources translation-filter.spec 
Log Message:
Finally getting the right sources and spec file



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 07:39:46 -0000	1.2
+++ sources	14 Aug 2009 06:47:10 -0000	1.3
@@ -1 +1 @@
-ca6b4bf23f0745e6717905b3d62b32b0  translation-filter-0.0.2.tar.gz
+9101f23ddbea649c8a04e53b7101a300  translation-filter-1.0.tar.gz


Index: translation-filter.spec
===================================================================
RCS file: /cvs/extras/rpms/translation-filter/EL-5/translation-filter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- translation-filter.spec	13 Aug 2009 07:41:55 -0000	1.2
+++ translation-filter.spec	14 Aug 2009 06:47:10 -0000	1.3
@@ -24,7 +24,7 @@ BuildRequires:  PyQt4-devel
 A l10n file filter to check translations
 %if 0%{?fedora}
 %package        kde
-Summary:        translation-filter KDE based UI
+Summary:        The translation-filter KDE based UI
 Group:          Development/Languages
 Requires:       %{name} = %{version}-%{release}
 Requires:       PyQt4
@@ -53,9 +53,8 @@ rm -rf %{buildroot}/%{_datadir}/applicat
 desktop-file-install --vendor="fedora"                    \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications           \
 %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
+rm -rf %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
 
-rm %{buildroot}/%{_datadir}/applications/translation-filter-kde.desktop
-rm %{buildroot}/%{_datadir}/applications/translation-filter.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,9 +97,6 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 29 2009 Kushal Das <kushal at fedoraproject.org> 1.0-1
 - The 1.0 release
 
-* Wed Jun 10 2009 Kushal Das <kushal at fedoraproject.org> 0.0.4-1
-- New release of version 0.0.4
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From paragn at fedoraproject.org  Fri Aug 14 06:51:03 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri, 14 Aug 2009 06:51:03 +0000 (UTC)
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.28,1.29
Message-ID: <20090814065103.5CF1711C00D0@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXcomposite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15234

Modified Files:
	libXcomposite.spec 
Log Message:
* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 0.4.0-10
- Merge-review cleanups #226065




Index: libXcomposite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libXcomposite.spec	25 Jul 2009 05:10:17 -0000	1.28
+++ libXcomposite.spec	14 Aug 2009 06:51:03 -0000	1.29
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXcomposite runtime library
+Summary: X Composite Extension library
 Name: libXcomposite
 Version: 0.4.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -16,12 +16,13 @@ BuildRequires: libXext-devel
 BuildRequires: libXfixes-devel
 
 %description
-X.Org X11 libXcomposite runtime library
+X Composite Extension library
 
 %package devel
-Summary: X.Org X11 libXcomposite development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 X.Org X11 libXcomposite development package
@@ -30,14 +31,12 @@ X.Org X11 libXcomposite development pack
 %setup -q
 
 %build
-
 %configure --disable-static
-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"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -60,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/X?omposite*.3*
 
 %changelog
+* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 0.4.0-10
+- Merge-review cleanups #226065
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From paragn at fedoraproject.org  Fri Aug 14 06:52:01 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri, 14 Aug 2009 06:52:01 +0000 (UTC)
Subject: rpms/libXdamage/devel libXdamage.spec,1.24,1.25
Message-ID: <20090814065201.896C111C00D0@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXdamage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15375

Modified Files:
	libXdamage.spec 
Log Message:
* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.1.1-9
- Merge-review cleanups #226067




Index: libXdamage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXdamage.spec	25 Jul 2009 05:11:10 -0000	1.24
+++ libXdamage.spec	14 Aug 2009 06:52:01 -0000	1.25
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXdamage runtime library
+Summary: X Damage extension library
 Name: libXdamage
 Version: 1.1.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,9 +18,10 @@ BuildRequires: libXfixes-devel
 X.Org X11 libXdamage runtime library
 
 %package devel
-Summary: X.Org X11 libXdamage development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 X.Org X11 libXdamage development package
@@ -30,12 +31,12 @@ X.Org X11 libXdamage development package
 
 %build
 %configure --disable-static
-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
@@ -59,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.1.1-9
+- Merge-review cleanups #226067
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From paragn at fedoraproject.org  Fri Aug 14 06:52:34 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri, 14 Aug 2009 06:52:34 +0000 (UTC)
Subject: rpms/libXres/devel libXres.spec,1.24,1.25
Message-ID: <20090814065234.5793111C00D0@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXres/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15532

Modified Files:
	libXres.spec 
Log Message:
* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.3-9
- Merge-review cleanups #226086





Index: libXres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXres.spec	25 Jul 2009 05:15:09 -0000	1.24
+++ libXres.spec	14 Aug 2009 06:52:33 -0000	1.25
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXres runtime library
+Summary: X-Resource extension client library
 Name: libXres
 Version: 1.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,17 +9,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
+#BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
 %description
-X.Org X11 libXres runtime library
+X-Resource is an extension that allows a client to query
+the X server about its usage of various resources. 
 
 %package devel
-Summary: X.Org X11 libXres development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 X.Org X11 libXres development package
@@ -35,12 +37,12 @@ X.Org X11 libXres 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 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/libXRes.so.1
 %{_libdir}/libXRes.so.1.0.0
 
@@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.3-9
+- Merge-review cleanups #226086
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Fri Aug 14 06:54:55 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 14 Aug 2009 06:54:55 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.15, 1.16 imsettings.spec, 1.32, 
	1.33 sources, 1.14, 1.15
Message-ID: <20090814065455.88C6011C00D0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16036

Modified Files:
	.cvsignore imsettings.spec sources 
Log Message:
* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-1
- New upstream release.
  - Fix memory leaks.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Aug 2009 11:31:42 -0000	1.15
+++ .cvsignore	14 Aug 2009 06:54:54 -0000	1.16
@@ -14,3 +14,4 @@ imsettings-0.106.0.tar.bz2
 imsettings-0.106.1.tar.bz2
 imsettings-0.106.2.tar.bz2
 imsettings-0.107.0.tar.bz2
+imsettings-0.107.1.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- imsettings.spec	12 Aug 2009 11:31:42 -0000	1.32
+++ imsettings.spec	14 Aug 2009 06:54:55 -0000	1.33
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	0.107.0
+Version:	0.107.1
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -201,6 +201,10 @@ fi
 
 
 %changelog
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-1
+- New upstream release.
+  - Fix memory leaks.
+
 * Wed Aug 12 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.0-1
 - New upstream release.
   - Pop up an error if failed to invoke IM. (#497946)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	12 Aug 2009 11:31:42 -0000	1.14
+++ sources	14 Aug 2009 06:54:55 -0000	1.15
@@ -1 +1 @@
-484f82e665e68dd33619f46912be9067  imsettings-0.107.0.tar.bz2
+aa1ac21b4a8cb8a73933d9c5a8e4f256  imsettings-0.107.1.tar.bz2



From cebbert at fedoraproject.org  Fri Aug 14 07:38:17 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 14 Aug 2009 07:38:17 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.5-rc2.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1051, 1.1052 kernel.spec, 1.1704, 1.1705 sources, 1.1013,
	1.1014 upstream, 1.924, 1.925 drm-intel-tv-fix.patch, 1.3, NONE
Message-ID: <20090814073817.B245511C00D0@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24490

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.5-rc2.bz2.sign 
Removed Files:
	drm-intel-tv-fix.patch 
Log Message:
Linux 2.6.30.5-rc2
Dropped drm-intel-tv-fix.patch, merged in -stable now.


--- NEW FILE patch-2.6.30.5-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKhJg2yGugalF9Dw4RAqGiAJ4vXePCyjunG2dAWMwjNFfWtvN1UgCfaxJ0
V+6gtBjfQTfwLtqvqQyxalI=
=/PBq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1051
retrieving revision 1.1052
diff -u -p -r1.1051 -r1.1052
--- .cvsignore	5 Aug 2009 16:07:43 -0000	1.1051
+++ .cvsignore	14 Aug 2009 07:38:14 -0000	1.1052
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.30.4.bz2
+patch-2.6.30.5-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1704
retrieving revision 1.1705
diff -u -p -r1.1704 -r1.1705
--- kernel.spec	12 Aug 2009 20:28:48 -0000	1.1704
+++ kernel.spec	14 Aug 2009 07:38:15 -0000	1.1705
@@ -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 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -666,7 +666,6 @@ Patch1819: drm-intel-gem-use-dma32-on-pa
 Patch1820: drm-modesetting-radeon-fixes.patch
 Patch1821: drm-radeon-new-pciids.patch
 Patch1822: drm-dont-frob-i2c.patch
-Patch1823: drm-intel-tv-fix.patch
 Patch1824: drm-radeon-cs-oops-fix.patch
 Patch1825: drm-pnp-add-resource-range-checker.patch
 Patch1826: drm-i915-enable-mchbar.patch
@@ -1285,7 +1284,6 @@ ApplyPatch drm-intel-hdmi-edid-fix.patch
 ApplyPatch drm-modesetting-radeon-fixes.patch
 ApplyPatch drm-radeon-new-pciids.patch
 ApplyPatch drm-dont-frob-i2c.patch
-ApplyPatch drm-intel-tv-fix.patch
 ApplyPatch drm-radeon-cs-oops-fix.patch
 ApplyPatch drm-pnp-add-resource-range-checker.patch
 ApplyPatch drm-i915-enable-mchbar.patch
@@ -1897,6 +1895,10 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.30.5-rc2
+- Dropped drm-intel-tv-fix.patch, merged in -stable now.
+
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX & IS_I845G, sigh.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1013
retrieving revision 1.1014
diff -u -p -r1.1013 -r1.1014
--- sources	5 Aug 2009 16:07:44 -0000	1.1013
+++ sources	14 Aug 2009 07:38:15 -0000	1.1014
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 d0fc44b54ba5953140b3f2aa9a1f2580  patch-2.6.30.4.bz2
+5376db7f63da62e0f71ebf3738be1628  patch-2.6.30.5-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -p -r1.924 -r1.925
--- upstream	5 Aug 2009 16:07:44 -0000	1.924
+++ upstream	14 Aug 2009 07:38:15 -0000	1.925
@@ -1,3 +1,4 @@
 linux-2.6.30.tar.bz2
 patch-2.6.30.4.bz2
+patch-2.6.30.5-rc2.bz2
 


--- drm-intel-tv-fix.patch DELETED ---



From bagnara at fedoraproject.org  Fri Aug 14 07:43:57 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Fri, 14 Aug 2009 07:43:57 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.34,1.35
Message-ID: <20090814074357.8257D11C00D0@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25331

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ppl.spec	12 Aug 2009 19:27:22 -0000	1.34
+++ ppl.spec	14 Aug 2009 07:43:57 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> - 0.10.2-7
+- Force rebuild.
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.10.2-6
 - Use bzipped upstream tarball.
 



From bagnara at fedoraproject.org  Fri Aug 14 07:46:43 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Fri, 14 Aug 2009 07:46:43 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.35,1.36
Message-ID: <20090814074643.7F8B811C00D0@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25880

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ppl.spec	14 Aug 2009 07:43:57 -0000	1.35
+++ ppl.spec	14 Aug 2009 07:46:43 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> - 0.10.2-8
+- Force rebuild.
+
 * Fri Aug 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> - 0.10.2-7
 - Force rebuild.
 



From topdog at fedoraproject.org  Fri Aug 14 07:58:11 2009
From: topdog at fedoraproject.org (topdog)
Date: Fri, 14 Aug 2009 07:58:11 +0000 (UTC)
Subject: rpms/php-adodb/EL-5 php-adodb.spec,1.11,1.12
Message-ID: <20090814075811.B765511C00D0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-adodb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28025

Modified Files:
	php-adodb.spec 
Log Message:
* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.95-1.a
- Upgrade to 4.95a
- Initialize EL-5




Index: php-adodb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-adodb/EL-5/php-adodb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-adodb.spec	18 Apr 2007 07:03:22 -0000	1.11
+++ php-adodb.spec	14 Aug 2009 07:58:11 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.94
-Release:        1%{?dist}
+Version:        4.95
+Release:        1.a%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb494.tgz
-License:        BSD
+Source0:        http://dl.sf.net/adodb/adodb495a.tgz
+License:        BSD or LGPLv2+
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/www/icons/*
 
 %changelog
+* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.95-1.a
+- version 4.95a
+- fix license tag
+
 * Fri Apr 06 2007 Aurelien Bompard <abompard at fedoraproject.org> 4.94-1
 - version 4.94
 - move install path to %%_datadir/php/adodb (#235461)



From pkgdb at fedoraproject.org  Fri Aug 14 08:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:07:42 +0000
Subject: [pkgdb] perl-Algorithm-Dependency ownership updated
Message-ID: <20090814080742.9AF4210F855@bastion2.fedora.phx.redhat.com>

Package perl-Algorithm-Dependency in Fedora 8 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Dependency



From pkgdb at fedoraproject.org  Fri Aug 14 08:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:07:45 +0000
Subject: [pkgdb] perl-Algorithm-Dependency ownership updated
Message-ID: <20090814080745.67ED210F868@bastion2.fedora.phx.redhat.com>

Package perl-Algorithm-Dependency in Fedora 5 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Dependency



From pkgdb at fedoraproject.org  Fri Aug 14 08:07:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:07:43 +0000
Subject: [pkgdb] perl-Algorithm-Dependency ownership updated
Message-ID: <20090814080743.80EE110F85B@bastion2.fedora.phx.redhat.com>

Package perl-Algorithm-Dependency in Fedora 6 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Dependency



From pkgdb at fedoraproject.org  Fri Aug 14 08:07:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:07:46 +0000
Subject: [pkgdb] perl-Algorithm-Dependency ownership updated
Message-ID: <20090814080746.F2FA810F876@bastion2.fedora.phx.redhat.com>

Package perl-Algorithm-Dependency in Fedora 4 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Dependency



From pkgdb at fedoraproject.org  Fri Aug 14 08:07:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:07:49 +0000
Subject: [pkgdb] perl-Algorithm-Dependency ownership updated
Message-ID: <20090814080749.6A14A10F881@bastion2.fedora.phx.redhat.com>

Package perl-Algorithm-Dependency in Fedora 3 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Dependency



From pkgdb at fedoraproject.org  Fri Aug 14 08:07:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:07:50 +0000
Subject: [pkgdb] perl-Algorithm-Dependency ownership updated
Message-ID: <20090814080750.D6A8A10F890@bastion2.fedora.phx.redhat.com>

Package perl-Algorithm-Dependency in Fedora 7 is now owned by laxathom

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-Dependency



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:32 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up commit
Message-ID: <20090814080832.71DB610F859@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-GDGraph (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:33 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchbugzilla
Message-ID: <20090814080833.9BB7310F85B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-GDGraph (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:37 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up commit
Message-ID: <20090814080838.9081810F848@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-GDGraph (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:40 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchbugzilla
Message-ID: <20090814080840.32ED510F876@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-GDGraph (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:39 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchcommits
Message-ID: <20090814080839.0C26610F86C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-GDGraph (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:50 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up commit
Message-ID: <20090814080850.9A37B10F855@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-GDGraph (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:51 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchcommits
Message-ID: <20090814080851.DC96110F890@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-GDGraph (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:52 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchbugzilla
Message-ID: <20090814080852.9B29E10F898@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-GDGraph (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:54 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up commit
Message-ID: <20090814080854.268BA10F89B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-GDGraph (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:56 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up commit
Message-ID: <20090814080856.C678B10F8AA@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-GDGraph (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:54 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchbugzilla
Message-ID: <20090814080854.D8EF810F8A6@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-GDGraph (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:57 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchbugzilla
Message-ID: <20090814080857.C0F9310F857@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-GDGraph (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:00 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up watchbugzilla
Message-ID: <20090814080900.9F23010F8B1@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-GDGraph (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:08:59 +0000
Subject: [pkgdb] perl-GDGraph: corsepiu has given up commit
Message-ID: <20090814080859.C7E4D10F85A@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-GDGraph (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:23 +0000
Subject: [pkgdb] perl-HTML-Lint ownership updated
Message-ID: <20090814080923.33F9A10F868@bastion2.fedora.phx.redhat.com>

Package perl-HTML-Lint in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Lint



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:33 +0000
Subject: [pkgdb] perl-HTML-RewriteAttributes ownership updated
Message-ID: <20090814080933.936A210F86F@bastion2.fedora.phx.redhat.com>

Package perl-HTML-RewriteAttributes in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-RewriteAttributes



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:34 +0000
Subject: [pkgdb] perl-HTML-RewriteAttributes ownership updated
Message-ID: <20090814080934.3DA7510F880@bastion2.fedora.phx.redhat.com>

Package perl-HTML-RewriteAttributes in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-RewriteAttributes



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:43 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up commit
Message-ID: <20090814080943.C3B1010F881@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTML-Scrubber (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:44 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchbugzilla
Message-ID: <20090814080944.E6B5610F895@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTML-Scrubber (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:47 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up commit
Message-ID: <20090814080947.2CA5810F8B9@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTML-Scrubber (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:47 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchcommits
Message-ID: <20090814080947.E5AF810F8BD@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-HTML-Scrubber (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:48 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchbugzilla
Message-ID: <20090814080949.0F57B10F8C1@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTML-Scrubber (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:55 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up commit
Message-ID: <20090814080955.4BBA510F899@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTML-Scrubber (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:09:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:09:56 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchbugzilla
Message-ID: <20090814080956.709AC10F89C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTML-Scrubber (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:02 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchbugzilla
Message-ID: <20090814081002.EBFA710F8C9@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTML-Scrubber (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:01 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up commit
Message-ID: <20090814081001.800ED10F8C6@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTML-Scrubber (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:05 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up commit
Message-ID: <20090814081005.561C410F8CD@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTML-Scrubber (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:06 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchbugzilla
Message-ID: <20090814081006.EC4AC10F8A6@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTML-Scrubber (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:11 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchcommits
Message-ID: <20090814081011.7AEAF10F8D6@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-HTML-Scrubber (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:13 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up watchbugzilla
Message-ID: <20090814081013.0D64010F8DA@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTML-Scrubber (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:13 +0000
Subject: [pkgdb] perl-HTML-Scrubber: corsepiu has given up commit
Message-ID: <20090814081013.1741A10F8DB@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTML-Scrubber (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-Scrubber



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:41 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchbugzilla
Message-ID: <20090814081042.132A610F85C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:43 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchcommits
Message-ID: <20090814081044.08F2710F8B2@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:45 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up commit
Message-ID: <20090814081045.A261F10F8B6@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:47 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up approveacls
Message-ID: <20090814081047.0688610F8E1@bastion2.fedora.phx.redhat.com>

corsepiu has given up the approveacls acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:51 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up approveacls
Message-ID: <20090814081051.62F2B10F862@bastion2.fedora.phx.redhat.com>

corsepiu has given up the approveacls acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:52 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up commit
Message-ID: <20090814081052.C641610F86E@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:53 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchcommits
Message-ID: <20090814081053.3C26D10F8FA@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:54 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchbugzilla
Message-ID: <20090814081054.BF0D310F8FD@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:56 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up approveacls
Message-ID: <20090814081056.7894910F902@bastion2.fedora.phx.redhat.com>

corsepiu has given up the approveacls acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:57 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up commit
Message-ID: <20090814081057.53B3310F905@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:58 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchbugzilla
Message-ID: <20090814081058.D4D0A10F909@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:10:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:10:58 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchcommits
Message-ID: <20090814081058.DF61010F90C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:00 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up approveacls
Message-ID: <20090814081100.C4D7710F86F@bastion2.fedora.phx.redhat.com>

corsepiu has given up the approveacls acl on perl-HTTP-Server-Simple (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:01 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up commit
Message-ID: <20090814081102.1AC4610F90F@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-HTTP-Server-Simple (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:02 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchcommits
Message-ID: <20090814081102.912E010F912@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-HTTP-Server-Simple (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:03 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has given up watchbugzilla
Message-ID: <20090814081103.4969A10F914@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:29 +0000
Subject: [pkgdb] perl-IPC-Run3 ownership updated
Message-ID: <20090814081129.79E8410F890@bastion2.fedora.phx.redhat.com>

Package perl-IPC-Run3 in Fedora 6 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run3



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:30 +0000
Subject: [pkgdb] perl-IPC-Run3 ownership updated
Message-ID: <20090814081130.D1F8F10F8B8@bastion2.fedora.phx.redhat.com>

Package perl-IPC-Run3 in Fedora 7 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run3



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:32 +0000
Subject: [pkgdb] perl-IPC-Run3 ownership updated
Message-ID: <20090814081132.86BD610F918@bastion2.fedora.phx.redhat.com>

Package perl-IPC-Run3 in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-IPC-Run3



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:50 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up commit
Message-ID: <20090814081150.6D91410F8C1@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Locale-Maketext-Fuzzy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:51 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchcommits
Message-ID: <20090814081151.69DC810F91A@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Locale-Maketext-Fuzzy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:52 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081152.7129B10F91E@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Locale-Maketext-Fuzzy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:55 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up commit
Message-ID: <20090814081155.424F610F921@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Locale-Maketext-Fuzzy (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:55 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchcommits
Message-ID: <20090814081155.CB5BF10F924@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Locale-Maketext-Fuzzy (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:11:56 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081156.D79A610F927@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Locale-Maketext-Fuzzy (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:01 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up commit
Message-ID: <20090814081201.66FB210F89B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Locale-Maketext-Fuzzy (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:02 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchcommits
Message-ID: <20090814081202.375F010F8C4@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Locale-Maketext-Fuzzy (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:02 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081203.028A810F92B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Locale-Maketext-Fuzzy (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:06 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up commit
Message-ID: <20090814081206.AC45210F92E@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Locale-Maketext-Fuzzy (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:07 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchcommits
Message-ID: <20090814081207.827BD10F931@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Locale-Maketext-Fuzzy (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:08 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081208.2BF1610F8C9@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Locale-Maketext-Fuzzy (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:10 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up commit
Message-ID: <20090814081210.3E01E10F8C8@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Locale-Maketext-Fuzzy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:10 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchcommits
Message-ID: <20090814081210.DB23610F936@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Locale-Maketext-Fuzzy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:11 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081211.A9D7B10F939@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Locale-Maketext-Fuzzy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:13 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up commit
Message-ID: <20090814081213.1EEF810F93D@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Locale-Maketext-Fuzzy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:14 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchcommits
Message-ID: <20090814081214.5413C10F941@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Locale-Maketext-Fuzzy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:14 +0000
Subject: [pkgdb] perl-Locale-Maketext-Fuzzy: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081214.F0D1010F944@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Locale-Maketext-Fuzzy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Maketext-Fuzzy



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:57 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up commit
Message-ID: <20090814081257.1F75210F8CD@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Log-Dispatch-FileRotate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:57 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchcommits
Message-ID: <20090814081257.DE07810F8D0@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Log-Dispatch-FileRotate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:58 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081258.A3A8710F8D3@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Log-Dispatch-FileRotate (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:12:59 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up commit
Message-ID: <20090814081259.E526A10F8D7@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Log-Dispatch-FileRotate (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:00 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchcommits
Message-ID: <20090814081300.F231310F8DB@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Log-Dispatch-FileRotate (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:05 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up commit
Message-ID: <20090814081305.99C0910F859@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Log-Dispatch-FileRotate (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:06 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchcommits
Message-ID: <20090814081306.60A2B10F848@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Log-Dispatch-FileRotate (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:07 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081307.882AF10F949@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Log-Dispatch-FileRotate (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:09 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up commit
Message-ID: <20090814081309.64F2810F94F@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Log-Dispatch-FileRotate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:10 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchcommits
Message-ID: <20090814081310.218E110F952@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Log-Dispatch-FileRotate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:11 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081311.0DC2D10F955@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Log-Dispatch-FileRotate (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:12 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up commit
Message-ID: <20090814081312.B994910F958@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Log-Dispatch-FileRotate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:14 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchcommits
Message-ID: <20090814081313.EF9C210F95B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Log-Dispatch-FileRotate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:14 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081314.326C010F95E@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Log-Dispatch-FileRotate (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:18 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up commit
Message-ID: <20090814081318.6DD2010F85C@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Log-Dispatch-FileRotate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:19 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchcommits
Message-ID: <20090814081319.305A910F8B1@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Log-Dispatch-FileRotate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:13:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:13:20 +0000
Subject: [pkgdb] perl-Log-Dispatch-FileRotate: corsepiu has given up
	watchbugzilla
Message-ID: <20090814081320.0981810F962@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Log-Dispatch-FileRotate (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Log-Dispatch-FileRotate



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:46 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up commit
Message-ID: <20090814081546.49E0C10F8B8@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Text-Template (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:47 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchbugzilla
Message-ID: <20090814081547.996CC10F8EB@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Text-Template (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:47 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchcommits
Message-ID: <20090814081547.2660C10F8B9@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Text-Template (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:51 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up commit
Message-ID: <20090814081551.CEDF810F8BE@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Text-Template (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:52 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchcommits
Message-ID: <20090814081552.B3DB410F8FA@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Text-Template (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:53 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchbugzilla
Message-ID: <20090814081553.8D23B10F8FE@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Text-Template (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:58 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up commit
Message-ID: <20090814081558.C77D010F898@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Text-Template (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:15:59 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchcommits
Message-ID: <20090814081559.F1E1310F899@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Text-Template (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:00 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchbugzilla
Message-ID: <20090814081600.75C7110F905@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Text-Template (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:02 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up commit
Message-ID: <20090814081602.1A3CF10F8C1@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Text-Template (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:02 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchcommits
Message-ID: <20090814081602.E5A3010F908@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Text-Template (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:03 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchbugzilla
Message-ID: <20090814081603.9576F10F90B@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Text-Template (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:05 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up commit
Message-ID: <20090814081605.3F4D810F90E@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Text-Template (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:06 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchcommits
Message-ID: <20090814081606.537CB10F8C2@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Text-Template (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:07 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchbugzilla
Message-ID: <20090814081607.389B610F913@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Text-Template (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:08 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up commit
Message-ID: <20090814081608.E3AAD10F917@bastion2.fedora.phx.redhat.com>

corsepiu has given up the commit acl on perl-Text-Template (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:09 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchcommits
Message-ID: <20090814081609.D4AD310F91A@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchcommits acl on perl-Text-Template (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Fri Aug 14 08:16:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:16:10 +0000
Subject: [pkgdb] perl-Text-Template: corsepiu has given up watchbugzilla
Message-ID: <20090814081611.11B6210F968@bastion2.fedora.phx.redhat.com>

corsepiu has given up the watchbugzilla acl on perl-Text-Template (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From topdog at fedoraproject.org  Fri Aug 14 08:18:19 2009
From: topdog at fedoraproject.org (topdog)
Date: Fri, 14 Aug 2009 08:18:19 +0000 (UTC)
Subject: rpms/php-adodb/EL-5 sources,1.9,1.10
Message-ID: <20090814081819.D9F3411C00D0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-adodb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31813

Modified Files:
	sources 
Log Message:

* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.95-1.a
- source update




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-adodb/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 Apr 2007 07:03:22 -0000	1.9
+++ sources	14 Aug 2009 08:18:19 -0000	1.10
@@ -1 +1 @@
-fbbcb6ef34aa2b08e19d85b0578aeb56  adodb494.tgz
+3f470830f7932a8a33e0c42949fa1470  adodb495a.tgz



From pkgdb at fedoraproject.org  Fri Aug 14 08:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:19:51 +0000
Subject: [pkgdb] rt3 ownership updated
Message-ID: <20090814081951.E369A10F8D0@bastion2.fedora.phx.redhat.com>

Package rt3 in Fedora 8 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rt3



From pkgdb at fedoraproject.org  Fri Aug 14 08:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 08:19:56 +0000
Subject: [pkgdb] rt3 ownership updated
Message-ID: <20090814081956.59E0310F8D6@bastion2.fedora.phx.redhat.com>

Package rt3 in Fedora 9 was orphaned by corsepiu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rt3



From xhorak at fedoraproject.org  Fri Aug 14 08:41:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 14 Aug 2009 08:41:11 +0000 (UTC)
Subject: rpms/thunderbird/F-11 thunderbird.spec,1.139,1.140
Message-ID: <20090814084111.D21AA11C00D0@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4177

Modified Files:
	thunderbird.spec 
Log Message:
Rebuild


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- thunderbird.spec	6 Aug 2009 09:46:46 -0000	1.139
+++ thunderbird.spec	14 Aug 2009 08:41:10 -0000	1.140
@@ -11,7 +11,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.5.b3%{?dist}
+Release:        2.6.b3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -288,6 +288,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Jul 16 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.6
+- Rebuild for update
+
 * Thu Jul 16 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.5
 - Update to 3.0 beta3
 



From tmraz at fedoraproject.org  Fri Aug 14 08:43:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 14 Aug 2009 08:43:38 +0000 (UTC)
Subject: rpms/gnutls/devel .cvsignore, 1.23, 1.24 gnutls.spec, 1.46,
	1.47 sources, 1.23, 1.24
Message-ID: <20090814084338.DB8AF11C00D0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4791

Modified Files:
	.cvsignore gnutls.spec sources 
Log Message:
* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.8.3-1
- upgrade to a new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	10 Jun 2009 19:02:21 -0000	1.23
+++ .cvsignore	14 Aug 2009 08:43:38 -0000	1.24
@@ -1 +1 @@
-gnutls-2.8.1-nosrp.tar.bz2
+gnutls-2.8.3-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gnutls.spec	25 Jul 2009 01:00:24 -0000	1.46
+++ gnutls.spec	14 Aug 2009 08:43:38 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.8.1
-Release: 2%{?dist}
+Version: 2.8.3
+Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -10,8 +10,8 @@ BuildRequires: zlib-devel, readline-deve
 BuildRequires: lzo-devel, libtool, automake, autoconf
 BuildRequires: guile-devel
 URL: http://www.gnutls.org/
-#Source0: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz
-#Source1: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz.sig
+#Source0: ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.gz
+#Source1: ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.gz.sig
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
@@ -147,6 +147,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.8.3-1
+- upgrade to a new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	10 Jun 2009 19:02:21 -0000	1.23
+++ sources	14 Aug 2009 08:43:38 -0000	1.24
@@ -1 +1 @@
-a894b36e675870b9563792d6b922a930  gnutls-2.8.1-nosrp.tar.bz2
+d74ee79f709021efbf27c34739c82e11  gnutls-2.8.3-nosrp.tar.bz2



From tagoh at fedoraproject.org  Fri Aug 14 08:48:46 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 14 Aug 2009 08:48:46 +0000 (UTC)
Subject: rpms/uim/devel .cvsignore, 1.24, 1.25 sources, 1.23, 1.24 uim.spec, 
	1.73, 1.74 uim-1.5.5-applet.patch, 1.1,
	NONE uim-qt-destdir.patch, 1.1, NONE
Message-ID: <20090814084846.1FE5911C00D0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6063

Modified Files:
	.cvsignore sources uim.spec 
Removed Files:
	uim-1.5.5-applet.patch uim-qt-destdir.patch 
Log Message:
* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
- New upstream release.
- Remove patches because it has been applied in this release.
  - uim-qt-destdir.patch
  - uim-1.5.5-applet.patch
- Update the usage of alternatives according to PackagingDrafts/UsingAlternatives.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	27 Feb 2009 12:07:14 -0000	1.24
+++ .cvsignore	14 Aug 2009 08:48:45 -0000	1.25
@@ -24,3 +24,4 @@ uim-1.5.0.tar.bz2
 uim-1.5.2.tar.bz2
 uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
+uim-1.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	27 Feb 2009 12:07:14 -0000	1.23
+++ sources	14 Aug 2009 08:48:45 -0000	1.24
@@ -1 +1 @@
-b7403fa4ae78229f31ca49df283502da  uim-1.5.5.tar.bz2
+2bd5a9095d6354a2a23c908b0d6e7861  uim-1.5.6.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- uim.spec	27 Jul 2009 06:28:58 -0000	1.73
+++ uim.spec	14 Aug 2009 08:48:45 -0000	1.74
@@ -1,9 +1,9 @@
-%define inst_xinput alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
-%define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
+%define inst_xinput %{_sbindir}/update-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
+%define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.5
-Release:	2%{?dist}
+Version:	1.5.6
+Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -28,14 +28,12 @@ Source0:	http://uim.googlecode.com/files
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 Patch0:		uim-1.4.2-emacs23.patch
-Patch1:		uim-qt-destdir.patch
-Patch2:		uim-1.5.5-applet.patch
 
 
 Summary:	A multilingual input method library
 Group:		System Environment/Libraries
-Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
-Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
+Requires(post): %{_sbindir}/update-alternatives /sbin/ldconfig
+Requires(postun): %{_sbindir}/update-alternatives /sbin/ldconfig
 Requires:	imsettings im-chooser
 
 %package	devel
@@ -215,12 +213,6 @@ many languages using the input table map
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .emacs23
-%patch1 -p1 -b .qt-destdir
-%patch2 -p1 -b .applet
-libtoolize -f
-aclocal -Im4
-automake --add-missing
-autoconf
 
 
 %build
@@ -282,6 +274,8 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/l
 ln -sf %{_localstatedir}/lib/uim/installed-modules.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 ln -sf %{_localstatedir}/lib/uim/loader.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 
+# https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
+touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
@@ -403,6 +397,7 @@ fi
 %exclude %{_datadir}/uim/pixmaps/wnn.png
 %exclude %{_datadir}/uim/pixmaps/wnn.svg
 %{_sysconfdir}/X11/xinit/xinput.d
+%ghost %{_sysconfdir}/X11/xinit/xinputrc
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
 %{_libdir}/uim/plugin/libuim-look.so
 %{_libexecdir}/uim-helper-server
@@ -518,6 +513,13 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
+- New upstream release.
+- Remove patches because it has been applied in this release.
+  - uim-qt-destdir.patch
+  - uim-1.5.5-applet.patch
+- Update the usage of alternatives according to PackagingDrafts/UsingAlternatives.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- uim-1.5.5-applet.patch DELETED ---


--- uim-qt-destdir.patch DELETED ---



From victorv at fedoraproject.org  Fri Aug 14 08:48:53 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Fri, 14 Aug 2009 08:48:53 +0000 (UTC)
Subject: rpms/netbeans/devel netbeans-6.7.1@00-updatecenters.patch, NONE,
	1.1 netbeans-6.7.1@10-ant-patch.patch, NONE,
	1.1 netbeans-6.7.1@20-parse-project-xml.patch, NONE,
	1.1 netbeans-6.7.1@30-build-xml.patch, NONE,
	1.1 netbeans-6.7.1@40-ide-launcher.patch, NONE,
	1.1 netbeans-6.7.1@50-build-copy.patch, NONE,
	1.1 netbeans-6.7.1@60-nosvnkit.patch, NONE,
	1.1 netbeans-6.7.1@70-small-ide-cluster.patch, NONE,
	1.1 netbeans-6.7.1@80-check-modules.patch, NONE,
	1.1 netbeans-6.7.1@90-copy_license.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 import.log, 1.1, 1.2 netbeans.spec, 1.11, 1.12 sources,
	1.3, 1.4 netbeans-6.5-00-copy-build.patch, 1.1,
	NONE netbeans-6.5-10-ant-external-build.patch, 1.1,
	NONE netbeans-6.5-20-ant-build.patch, 1.1,
	NONE netbeans-6.5-30-parse-project-xml.patch, 1.1,
	NONE netbeans-6.5-40-build-xml.patch, 1.1,
	NONE netbeans-6.5-50-ide-launcher.patch, 1.1,
	NONE netbeans-6.5-60-small-ide-config.patch, 1.1,
	NONE netbeans-6.5-70-updatecenters.patch, 1.1,
	NONE netbeans-6.5-80-nosvnkit.patch, 1.1, NONE
Message-ID: <20090814084853.DF7FB11C00D0@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5861/devel

Modified Files:
	.cvsignore import.log netbeans.spec sources 
Added Files:
	netbeans-6.7.1 at 00-updatecenters.patch 
	netbeans-6.7.1 at 10-ant-patch.patch 
	netbeans-6.7.1 at 20-parse-project-xml.patch 
	netbeans-6.7.1 at 30-build-xml.patch 
	netbeans-6.7.1 at 40-ide-launcher.patch 
	netbeans-6.7.1 at 50-build-copy.patch 
	netbeans-6.7.1 at 60-nosvnkit.patch 
	netbeans-6.7.1 at 70-small-ide-cluster.patch 
	netbeans-6.7.1 at 80-check-modules.patch 
	netbeans-6.7.1 at 90-copy_license.patch 
Removed Files:
	netbeans-6.5-00-copy-build.patch 
	netbeans-6.5-10-ant-external-build.patch 
	netbeans-6.5-20-ant-build.patch 
	netbeans-6.5-30-parse-project-xml.patch 
	netbeans-6.5-40-build-xml.patch 
	netbeans-6.5-50-ide-launcher.patch 
	netbeans-6.5-60-small-ide-config.patch 
	netbeans-6.5-70-updatecenters.patch 
	netbeans-6.5-80-nosvnkit.patch 
Log Message:
Re-base for the NetBeans 6.7.1


netbeans-6.7.1 at 00-updatecenters.patch:
 Bundle.properties |    3 +++
 mf-layer.xml      |   13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE netbeans-6.7.1 at 00-updatecenters.patch ---
diff -Nur netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2009-08-05 00:31:46.000000000 +0400
+++ netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2009-08-05 21:41:02.000000000 +0400
@@ -51,9 +51,12 @@
 Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
 Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins
 Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal
+Services/AutoupdateType/standard-update-provider-fedora.instance=NetBeans for Fedora
 #NOI18N
 URL_Standard=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
 URL_Beta=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
 URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
 URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.7/catalog.xml.gz
+URL_Standard_Fedora=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/fedora/catalog.xml.gz?{$netbeans.hash.code}
+
 
diff -Nur netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2009-08-05 00:31:46.000000000 +0400
+++ netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2009-08-05 21:46:02.000000000 +0400
@@ -54,7 +54,7 @@
 
         <attr name="url_key" stringvalue="URL_Standard"/>
         <attr name="category" stringvalue="STANDARD"/>
-        <attr name="enabled" boolvalue="true"/>
+        <attr name="enabled" boolvalue="false"/>
         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
       </file>
@@ -92,6 +92,17 @@
         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
       </file>
 
+      <file name="standard-update-provider-fedora.instance">
+        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.updatecenters.resources.Bundle"/>
+        <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+
+        <attr name="url_key" stringvalue="URL_Standard_Fedora"/>
+        <attr name="category" stringvalue="STANDARD"/>
+        <attr name="enabled" boolvalue="true"/>
+        <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
+        <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
+      </file>
+
    </folder>
   
   </folder> <!-- Services -->

netbeans-6.7.1 at 10-ant-patch.patch:
 build.xml          |   15 ---------------
 external/build.xml |    1 -
 2 files changed, 16 deletions(-)

--- NEW FILE netbeans-6.7.1 at 10-ant-patch.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.5/o.apache.tools.ant.module/build.xml netbeans-6.5.new/o.apache.tools.ant.module/build.xml
--- netbeans-6.5/o.apache.tools.ant.module/build.xml	2008-11-10 00:13:56.000000000 +0300
+++ netbeans-6.5.new/o.apache.tools.ant.module/build.xml	2009-01-10 19:16:13.000000000 +0300
@@ -75,21 +75,6 @@
     </target>
 
     <target name="netbeans-extra" depends="jar-bridge">
-        <mkdir dir="${cluster}/ant/lib"/>
-        <copy todir="${cluster}/ant/lib">
-            <fileset dir="external/lib"/>
-        </copy>
-        <unzip dest="${cluster}/ant">
-            <fileset dir="external">
-                <include name="ant-misc-*.zip"/>
-            </fileset>
-        </unzip>
-        <chmod perm="ugo+x">
-            <fileset dir="${cluster}/ant/bin">
-                <exclude name="*.cmd"/>
-                <exclude name="*.bat"/>
-            </fileset>
-        </chmod>
     </target>
 
     <target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
diff -Nur -x '*.orig' -x '*~' netbeans-6.5/o.apache.tools.ant.module/external/build.xml netbeans-6.5.new/o.apache.tools.ant.module/external/build.xml
--- netbeans-6.5/o.apache.tools.ant.module/external/build.xml	2008-11-10 00:13:56.000000000 +0300
+++ netbeans-6.5.new/o.apache.tools.ant.module/external/build.xml	2009-01-10 19:15:52.000000000 +0300
@@ -42,7 +42,6 @@
 -->
 <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
     <target name="unzip">
-        <unzip src="ant-libs-1.7.1.zip" dest="lib"/>
     </target>
     <target name="clean">
         <delete dir="lib"/>

netbeans-6.7.1 at 20-parse-project-xml.patch:
 ParseProjectXml.java |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE netbeans-6.7.1 at 20-parse-project-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.5/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java netbeans-6.5.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
--- netbeans-6.5/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	2008-11-10 00:13:54.000000000 +0300
+++ netbeans-6.5.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	2009-01-10 19:02:41.000000000 +0300
@@ -1247,6 +1247,7 @@
             for (File jar : jars) {
                 if (!jar.isFile()) {
                     log("Classpath entry " + jar + " does not exist; skipping", Project.MSG_WARN);
+                    continue;
                 }
                 InputStream is = new FileInputStream(jar);
                 try {

netbeans-6.7.1 at 30-build-xml.patch:
 nbbuild/build.xml       |    1 -
 o.n.bootstrap/build.xml |    2 --
 2 files changed, 3 deletions(-)

--- NEW FILE netbeans-6.7.1 at 30-build-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7/nbbuild/build.xml netbeans-6.7.new/nbbuild/build.xml
--- netbeans-6.7/nbbuild/build.xml	2009-07-20 21:24:40.000000000 +0400
+++ netbeans-6.7.new/nbbuild/build.xml	2009-07-20 21:29:30.000000000 +0400
@@ -568,7 +568,6 @@
     <mkdir dir="${netbeans.dest.dir}/bin" />
     <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
     <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
-    <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
     <!-- if anybody knows better place for icons, let me know: jtulach at netbeans.org -->
 
     <mkdir dir="${netbeans.dest.dir}/etc" />
diff -Nur -x '*.orig' -x '*~' netbeans-6.7/o.n.bootstrap/build.xml netbeans-6.7.new/o.n.bootstrap/build.xml
--- netbeans-6.7/o.n.bootstrap/build.xml	2009-07-20 21:24:40.000000000 +0400
+++ netbeans-6.7.new/o.n.bootstrap/build.xml	2009-07-20 21:29:31.000000000 +0400
@@ -65,8 +65,6 @@
     <target name="release" depends="init">
         <copy file="launcher/unix/nbexec" todir="${cluster}/lib" />
         <chmod file="${cluster}/lib/nbexec" perm="ugo+rx"/>
-        <copy file="launcher/windows/nbexec.exe" todir="${cluster}/lib/" />
-        <copy file="launcher/windows/nbexec.dll" todir="${cluster}/lib/" />
         <fixcrlf srcdir="${cluster}/lib" eol="lf">
             <include name="**/*.sh"/>
             <include name="**/ide.cfg"/>

netbeans-6.7.1 at 40-ide-launcher.patch:
 netbeans |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE netbeans-6.7.1 at 40-ide-launcher.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/ide/launcher/unix/netbeans netbeans-6.7.1.new/ide/launcher/unix/netbeans
--- netbeans-6.7.1/ide/launcher/unix/netbeans	2009-07-27 15:43:48.000000000 +0400
+++ netbeans-6.7.1.new/ide/launcher/unix/netbeans	2009-07-27 15:56:36.000000000 +0400
@@ -38,6 +38,17 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
+# The Startup Notification Protocol Specification established by freedesktop.org
+# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid
+# possible reuse by some process started later by this process, e.g. when a browser
+# will be started after clicking a hyperlink in the NetBeans.
+if [ ! -z $DESKTOP_STARTUP_ID ] ; then
+    # Save a value for later using in the NB_DESKTOP_STARTUP_ID
+    NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID
+
+    unset DESKTOP_STARTUP_ID
+fi
+
 #
 # resolve symlinks
 #
@@ -54,16 +65,18 @@
     fi
 done
 
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
+# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.7.1/bin
 
 if [ -f "$progdir"/../etc/netbeans.conf ] ; then
     . "$progdir"/../etc/netbeans.conf
 fi
 
 # following should be done just in RPM or Solaris Launcher
-# if [ -f /etc/netbeans.conf ] ; then
-#     . /etc/netbeans.conf
-# fi
+if [ -f /etc/netbeans.conf ] ; then
+    . /etc/netbeans.conf
+fi
 
 
 # #68373: look for userdir, but do not modify "$@"
@@ -195,7 +208,6 @@
             --branding nb \
             --clusters '"$netbeans_clusters"' \
             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
             ${netbeans_default_options} \
             '"$@"'
         ;;

netbeans-6.7.1 at 50-build-copy.patch:
 css.editor/nbproject/project.properties              |    1 -
 html.editor/nbproject/project.properties             |    1 -
 junit/nbproject/project.properties                   |    5 -----
 libs.commons_logging/nbproject/project.properties    |    1 -
 libs.commons_net/nbproject/project.properties        |    1 -
 libs.freemarker/nbproject/project.properties         |    1 -
 libs.ini4j/nbproject/project.properties              |    1 -
 libs.jakarta_oro/nbproject/project.properties        |    1 -
 libs.javacapi/nbproject/project.properties           |    1 -
 libs.javacimpl/nbproject/project.properties          |    1 -
 libs.jna/nbproject/project.properties                |    1 -
 libs.jsch/nbproject/project.properties               |    1 -
 libs.junit4/nbproject/project.properties             |    1 -
 libs.lucene/nbproject/project.properties             |    1 -
 libs.svnClientAdapter/nbproject/project.properties   |    2 --
 libs.xerces/nbproject/project.properties             |    1 -
 o.apache.xml.resolver/nbproject/project.properties   |    1 -
 o.jdesktop.beansbinding/nbproject/project.properties |    2 --
 o.jdesktop.layout/nbproject/project.properties       |    3 ---
 swingapp/nbproject/project.properties                |    3 ---
 20 files changed, 30 deletions(-)

--- NEW FILE netbeans-6.7.1 at 50-build-copy.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/css.editor/nbproject/project.properties netbeans-6.7.1.new/css.editor/nbproject/project.properties
--- netbeans-6.7.1/css.editor/nbproject/project.properties	2009-08-12 19:59:07.000000000 +0400
+++ netbeans-6.7.1.new/css.editor/nbproject/project.properties	2009-08-12 20:06:31.000000000 +0400
@@ -37,7 +37,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-release.external/css21-spec.zip=docs/css21-spec.zip
 jnlp.indirect.jars=docs/css21-spec.zip
 
 javac.compilerargs=-Xlint -Xlint:-serial
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/html.editor/nbproject/project.properties netbeans-6.7.1.new/html.editor/nbproject/project.properties
--- netbeans-6.7.1/html.editor/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/html.editor/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -37,7 +37,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-release.external/html-4.01.zip=docs/html-4.01.zip
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/junit/nbproject/project.properties netbeans-6.7.1.new/junit/nbproject/project.properties
--- netbeans-6.7.1/junit/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/junit/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -42,11 +42,6 @@
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
 
-release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
-release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
-release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip
-release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar
-release.external/Ant-1.7.1-binary-patch-72080.jar=ant/patches/72080.jar
 
 # XXX AntBridge.createMainClassPath probably would not find this anyway:
 jnlp.verify.excludes=ant/patches/72080.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.commons_logging/nbproject/project.properties netbeans-6.7.1.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.7.1/libs.commons_logging/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.commons_logging/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar
 spec.version.base=1.8.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.commons_net/nbproject/project.properties netbeans-6.7.1.new/libs.commons_net/nbproject/project.properties
--- netbeans-6.7.1/libs.commons_net/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.commons_net/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar
 spec.version.base=1.3.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.freemarker/nbproject/project.properties netbeans-6.7.1.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.7.1/libs.freemarker/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.freemarker/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -41,6 +41,5 @@
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
-release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
 module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper))
 spec.version.base=2.6.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.ini4j/nbproject/project.properties netbeans-6.7.1.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.7.1/libs.ini4j/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.ini4j/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,6 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/ini4j-0.4.1.jar=modules/ext/ini4j-0.4.1.jar
 module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener
 
 # Fatal error: class javax.servlet.ServletContextListener not found
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.jakarta_oro/nbproject/project.properties netbeans-6.7.1.new/libs.jakarta_oro/nbproject/project.properties
--- netbeans-6.7.1/libs.jakarta_oro/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.jakarta_oro/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar
 spec.version.base=1.2.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.javacapi/nbproject/project.properties netbeans-6.7.1.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.7.1/libs.javacapi/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.javacapi/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -44,6 +44,5 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.8.1
-release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
 javadoc.arch=${basedir}/arch.xml
 module.javadoc.packages=com.sun.source.tree,com.sun.source.util
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.javacimpl/nbproject/project.properties netbeans-6.7.1.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.7.1/libs.javacimpl/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.javacimpl/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -41,7 +41,6 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.10.2
-release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
 javadoc.arch=${basedir}/arch.xml
 
 
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.jna/nbproject/project.properties netbeans-6.7.1.new/libs.jna/nbproject/project.properties
--- netbeans-6.7.1/libs.jna/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.jna/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -37,4 +37,3 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-release.external/jna-3.0.9.jar=modules/ext/jna-3.0.9.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.jsch/nbproject/project.properties netbeans-6.7.1.new/libs.jsch/nbproject/project.properties
--- netbeans-6.7.1/libs.jsch/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.jsch/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,6 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/jsch-0.1.41.jar=modules/ext/jsch-0.1.41.jar
 spec.version.base=1.8.1
 sigtest.gen.fail.on.error=false
 
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.junit4/nbproject/project.properties netbeans-6.7.1.new/libs.junit4/nbproject/project.properties
--- netbeans-6.7.1/libs.junit4/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.junit4/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,6 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
 
 
 sigtest.skip.check=true
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.lucene/nbproject/project.properties netbeans-6.7.1.new/libs.lucene/nbproject/project.properties
--- netbeans-6.7.1/libs.lucene/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.lucene/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/lucene-core-2.3.2.jar=modules/ext/lucene-core-2.3.2.jar
 spec.version.base=2.5.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.svnClientAdapter/nbproject/project.properties netbeans-6.7.1.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.7.1/libs.svnClientAdapter/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.svnClientAdapter/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -40,8 +40,6 @@
 is.autoload=true
 
 javac.source=1.5
-release.external/svnClientAdapter-1.6.0.jar=modules/ext/svnClientAdapter-1.6.0.jar
-release.external/svnjavahl-1.6.0.jar=modules/ext/svnjavahl-1.6.0.jar
 
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.xerces/nbproject/project.properties netbeans-6.7.1.new/libs.xerces/nbproject/project.properties
--- netbeans-6.7.1/libs.xerces/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.xerces/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,6 +38,5 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
 module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
 spec.version.base=1.13.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/o.apache.xml.resolver/nbproject/project.properties netbeans-6.7.1.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.7.1/o.apache.xml.resolver/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/o.apache.xml.resolver/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
 spec.version.base=1.6.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.7.1.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.7.1/o.jdesktop.beansbinding/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/o.jdesktop.beansbinding/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,5 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
-release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
 jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
 spec.version.base=1.2.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/o.jdesktop.layout/nbproject/project.properties netbeans-6.7.1.new/o.jdesktop.layout/nbproject/project.properties
--- netbeans-6.7.1/o.jdesktop.layout/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/o.jdesktop.layout/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,8 +38,5 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/swing-layout-1.0.3.jar=modules/ext/swing-layout-1.0.3.jar
-release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
-release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.3-doc.zip, docs/swing-layout-1.0.3-src.zip
 spec.version.base=1.7.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/swingapp/nbproject/project.properties netbeans-6.7.1.new/swingapp/nbproject/project.properties
--- netbeans-6.7.1/swingapp/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/swingapp/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -1,6 +1,3 @@
-extra.module.files=modules/ext/appframework-1.0.3.jar,\
-                   docs/appframework-1.0.3-doc.zip,\
-                   modules/ext/swing-worker-1.1.jar
 jnlp.indirect.jars=docs/appframework-1.0.3-doc.zip
 javac.source=1.5
 spec.version.base=1.4.1

netbeans-6.7.1 at 60-nosvnkit.patch:
 SvnClientAdapterFactory.java |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE netbeans-6.7.1 at 60-nosvnkit.patch ---
diff -Nur netbeans-6.7.1/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java netbeans-6.7.1.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
--- netbeans-6.7.1/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java	2009-08-05 00:31:45.000000000 +0400
+++ netbeans-6.7.1.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java	2009-08-06 22:41:34.000000000 +0400
@@ -45,7 +45,6 @@
 import org.tigris.subversion.svnclientadapter.SVNClientException;
 import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter;
 import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory;
-import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory;
 
 /**
  *
@@ -98,8 +97,7 @@
                 return JhlClientAdapterFactory.isAvailable();
             }
             case svnkit: {
-                SvnKitClientAdapterFactory.setup();
-                return SvnKitClientAdapterFactory.isAvailable();
+                return false;
             }
         }
         return false;
@@ -111,7 +109,7 @@
                 return JhlClientAdapterFactory.createSVNClient(JhlClientAdapterFactory.JAVAHL_CLIENT);
             }
             case svnkit: {
-                return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT); //provider.createClient();
+                return null;
             }
         }
         return null;

netbeans-6.7.1 at 70-small-ide-cluster.patch:
 apisupport.kit/nbproject/project.xml |   13 -----
 editor.kit/nbproject/project.xml     |   48 ++------------------
 form.kit/nbproject/project.xml       |   13 -----
 ide.kit/nbproject/project.xml        |    4 -
 java.kit/nbproject/project.xml       |   20 --------
 nbbuild/cluster.properties           |   82 +----------------------------------
 6 files changed, 13 insertions(+), 167 deletions(-)

--- NEW FILE netbeans-6.7.1 at 70-small-ide-cluster.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/apisupport.kit/nbproject/project.xml netbeans-6.7.1.new/apisupport.kit/nbproject/project.xml
--- netbeans-6.7.1/apisupport.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/apisupport.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -12,25 +12,12 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.apisupport.harness</code-name-base>
                     <run-dependency>
                         <specification-version>1.14.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
                     <run-dependency>
                         <specification-version>1.28.2</specification-version>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/editor.kit/nbproject/project.xml netbeans-6.7.1.new/editor.kit/nbproject/project.xml
--- netbeans-6.7.1/editor.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/editor.kit/nbproject/project.xml	2009-08-12 19:42:05.000000000 +0400
@@ -6,13 +6,6 @@
             <code-name-base>org.netbeans.modules.editor.kit</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.css.visual</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
                     <run-dependency>
                         <release-version>0-1</release-version>
@@ -20,13 +13,13 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.html</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.23</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
+                     <code-name-base>org.netbeans.modules.html</code-name-base>
+                     <run-dependency>
+                         <release-version>1</release-version>
+                         <specification-version>1.23</specification-version>
+                     </run-dependency>
+                 </dependency>
+                 <dependency>
                     <code-name-base>org.netbeans.modules.image</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
@@ -34,13 +27,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.javascript.kit</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>0.105.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.languages.diff</code-name-base>
                     <run-dependency>
                         <specification-version>1.4</specification-version>
@@ -53,12 +39,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.languages.yaml</code-name-base>
-                    <run-dependency>
-                        <specification-version>2.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
                     <run-dependency>
                         <specification-version>1.0</specification-version>
@@ -78,13 +58,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.web.flyingsaucer</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.xml.core</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
@@ -117,13 +90,6 @@
                         <specification-version>1.13</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xsl</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.13</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/form.kit/nbproject/project.xml netbeans-6.7.1.new/form.kit/nbproject/project.xml
--- netbeans-6.7.1/form.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/form.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -13,13 +13,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.form.j2ee</code-name-base>
-                    <run-dependency>
-                        <release-version>0</release-version>
-                        <specification-version>0.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.i18n.form</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
@@ -27,12 +20,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.j2ee.persistence.kit</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.java.kit</code-name-base>
                     <run-dependency>
                         <specification-version>1.0</specification-version>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/ide.kit/nbproject/project.xml netbeans-6.7.1.new/ide.kit/nbproject/project.xml
--- netbeans-6.7.1/ide.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/ide.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -144,13 +144,13 @@
                         <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
+                <!--dependency>
                     <code-name-base>org.netbeans.modules.httpserver</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
                         <specification-version>2.7</specification-version>
                     </run-dependency>
-                </dependency>
+                </dependency-->
                 <dependency>
                     <code-name-base>org.netbeans.modules.jumpto</code-name-base>
                     <run-dependency>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/java.kit/nbproject/project.xml netbeans-6.7.1.new/java.kit/nbproject/project.xml
--- netbeans-6.7.1/java.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/java.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -198,31 +198,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.websvc.jaxws21api</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.netbeans.modules.xml.tools.java</code-name-base>
                     <run-dependency>
                         <specification-version>1.3</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <test-dependencies>
                 <test-type>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/nbbuild/cluster.properties netbeans-6.7.1.new/nbbuild/cluster.properties
--- netbeans-6.7.1/nbbuild/cluster.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/nbbuild/cluster.properties	2009-08-12 19:40:56.000000000 +0400
@@ -110,9 +110,7 @@
 clusters.config.java.list=\
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
-        nb.cluster.websvccommon,\
         nb.cluster.java,\
-        nb.cluster.profiler,\
         nb.cluster.nb
 
 clusters.config.enterprise.list=\
@@ -257,24 +255,10 @@
         api.debugger,\
         api.java.classpath,\
         api.xml,\
-        bugtracking,\
-        bugtracking.bridge,\
-        bugzilla,\
         classfile,\
         core.ide,\
         csl.api,\
         css.editor,\
-        css.visual,\
-        db,\
-        db.core,\
-        db.dataview,\
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
         defaults,\
         diff,\
         editor,\
@@ -312,50 +296,31 @@
         html.editor,\
         html.editor.lib,\
         html.lexer,\
-        httpserver,\
         hudson,\
-        hudson.kenai,\
         hudson.mercurial,\
         hudson.subversion,\
         ide.kit,\
         image,\
-        javascript.editing,\
-        javascript.hints,\
-        javascript.kit,\
-        javascript.refactoring,\
         jumpto,\
-        kenai,\
-        kenai.collab,\
-        kenai.ui,\
         languages,\
         languages.diff,\
         languages.manifest,\
-        languages.yaml,\
         lexer,\
         lexer.editorbridge,\
         lexer.nbbridge,\
         lib.cvsclient,\
-        libs.bugtracking,\
-        libs.bugzilla,\
-        libs.bytelist,\
-        libs.commons_codec,\
         libs.commons_logging,\
         libs.commons_net,\
         libs.freemarker,\
         libs.ini4j,\
         libs.jakarta_oro,\
-        libs.jaxb,\
         libs.jsch,\
-        libs.jvyamlb,\
         libs.lucene,\
-        libs.smack,\
         libs.svnClientAdapter,\
-        libs.swingx,\
         libs.xerces,\
         localhistory,\
         mercurial,\
         o.apache.xml.resolver,\
-        o.mozilla.rhino.patched,\
         o.n.swing.dirchooser,\
         o.openidex.util,\
         options.editor,\
@@ -372,7 +337,6 @@
         refactoring.api,\
         schema2beans,\
         server,\
-        servletapi,\
         spi.debugger.ui,\
         spi.editor.hints,\
         spi.navigator,\
@@ -384,7 +348,6 @@
         tasklist.projectint,\
         tasklist.todo,\
         tasklist.ui,\
-        team.kit,\
         usersguide,\
         utilities,\
         utilities.project,\
@@ -392,7 +355,6 @@
         versioning.system.cvss,\
         versioning.util,\
         web.client.tools.api,\
-        web.flyingsaucer,\
         xml,\
         xml.axi,\
         xml.catalog,\
@@ -407,14 +369,12 @@
         xml.tools,\
         xml.wsdl.model,\
         xml.xam,\
-        xml.xdm,\
-        xsl
+        xml.xdm
 
 nb.cluster.java.dir=java2
 nb.cluster.java.depends=\
         nb.cluster.ide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon
+        nb.cluster.platform
 nb.cluster.java=\
         ant.browsetask,\
         ant.debugger,\
@@ -424,30 +384,18 @@
         api.debugger.jpda,\
         api.java,\
         beans,\
-        dbschema,\
         debugger.jpda,\
         debugger.jpda.ant,\
         debugger.jpda.projects,\
         debugger.jpda.ui,\
-        derby,\
         form,\
-        form.j2ee,\
         form.kit,\
-        hibernate,\
-        hibernatelib,\
-        hudson.ant,\
-        hudson.maven,\
         i18n,\
         i18n.form,\
         j2ee.core.utilities,\
-        j2ee.jpa.refactoring,\
-        j2ee.jpa.verification,\
         j2ee.metadata,\
         j2ee.metadata.model.support,\
-        j2ee.persistence,\
-        j2ee.persistence.kit,\
         j2ee.persistenceapi,\
-        j2ee.toplinklib,\
         java.api.common,\
         java.debug,\
         java.editor,\
@@ -472,34 +420,14 @@
         javadoc,\
         javawebstart,\
         junit,\
-        libs.cglib,\
         libs.javacapi,\
         libs.javacimpl,\
-        libs.springframework,\
-        maven,\
-        maven.embedder,\
-        maven.grammar,\
-        maven.graph,\
-        maven.hints,\
-        maven.indexer,\
-        maven.junit,\
-        maven.kit,\
-        maven.model,\
-        maven.persistence,\
-        maven.repository,\
-        maven.search,\
-        maven.spring,\
         o.apache.tools.ant.module,\
         o.jdesktop.beansbinding,\
         projectimport.eclipse.core,\
         projectimport.eclipse.j2se,\
         refactoring.java,\
-        spring.beans,\
         swingapp,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        xml.jaxb,\
         xml.tools.java
 validation.nb.cluster.java=\
         java.kit
@@ -543,12 +471,10 @@
         nb.cluster.harness
 nb.cluster.apisupport=\
         apisupport.ant,\
-        apisupport.feedreader,\
         apisupport.kit,\
-        apisupport.paintapp,\
         apisupport.project,\
-        apisupport.refactoring,\
-        maven.apisupport
+        apisupport.refactoring
+        
 
 nb.cluster.enterprise.dir=enterprise5
 nb.cluster.enterprise.depends=\

netbeans-6.7.1 at 80-check-modules.patch:
 build.xml |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE netbeans-6.7.1 at 80-check-modules.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/nbbuild/build.xml netbeans-6.7.1.new/nbbuild/build.xml
--- netbeans-6.7.1/nbbuild/build.xml	2009-08-06 18:13:50.000000000 +0400
+++ netbeans-6.7.1.new/nbbuild/build.xml	2009-08-06 18:14:49.000000000 +0400
@@ -162,7 +162,6 @@
     <resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/>
     <property name="allmodules" value="${fixedmodules},${modules}"/>
     <taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/>
-    <checkmoduleconfigs nbroot=".."/>
   </target>
 
   <target name="set-buildnumber" unless="buildnumber">

netbeans-6.7.1 at 90-copy_license.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-6.7.1 at 90-copy_license.patch ---
diff -Nur netbeans-6.7.1/o.n.upgrader/build.xml netbeans-6.7.1.new/o.n.upgrader/build.xml
--- netbeans-6.7.1/o.n.upgrader/build.xml	2009-07-23 02:39:14.000000000 +0400
+++ netbeans-6.7.1.new/o.n.upgrader/build.xml	2009-08-12 19:42:25.000000000 +0400
@@ -46,7 +46,7 @@
     <target name="compile" depends="projectized-common.compile">
         <echo message="${build.classes.dir}"/>
         <copy file="../ide.branding/release-toplevel/LICENSE.txt"
-              tofile="${build.classes.dir}/org/netbeans/license/LICENSE.txt" failonerror="true"/>
+              tofile="${build.classes.dir}/org/netbeans/license/LICENSE.txt" failonerror="false"/>
     </target>
 
     <import file="../nbbuild/templates/projectized.xml"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jan 2009 16:53:05 -0000	1.3
+++ .cvsignore	14 Aug 2009 08:48:51 -0000	1.4
@@ -1 +1 @@
-netbeans-6.5-200811100001-base-src-linux.tar.gz
+netbeans-6.7.1-200907230233-base-src-linux.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2008 00:38:06 -0000	1.1
+++ import.log	14 Aug 2009 08:48:51 -0000	1.2
@@ -1 +1,2 @@
 netbeans-6_1-4_fc10:HEAD:netbeans-6.1-4.fc10.src.rpm:1221007047
+netbeans-6_7_1-1_fc12:HEAD:netbeans-6.7.1-1.fc12.src.rpm:1250240039


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- netbeans.spec	25 Jul 2009 18:01:28 -0000	1.11
+++ netbeans.spec	14 Aug 2009 08:48:53 -0000	1.12
@@ -5,13 +5,14 @@
 
 %define nb_              netbeans
 %define nb_org           %{nb_}.org
-%define nb_ver           6.5
-%define nb_alt_priority  650
-%define nb_release_time  200811100001
+%define nb_ver_major     6.7
+%define nb_ver           %{nb_ver_major}.1
+%define nb_alt_priority  670
+%define nb_release_time  200907230233
 %define nb_home          %{_datadir}/%{nb_}
 %define nb_dir           %{nb_home}/%{nb_ver}
 
-%define nb_platform_ver  9
+%define nb_platform_ver  10
 %define nb_platform      platform%{nb_platform_ver}
 %define nb_platform_dir  %{nb_home}/%{nb_platform}
 %define nb_platform_pkg  %{nb_}-platform
@@ -20,7 +21,7 @@
 %define nb_harness_dir   %{nb_home}/%{nb_harness}
 %define nb_harness_pkg   %{nb_platform_pkg}-%{nb_harness}
 
-%define nb_ide_ver       10
+%define nb_ide_ver       11
 %define nb_ide           ide%{nb_ide_ver}
 %define nb_ide_dir       %{nb_home}/%{nb_ide}
 %define nb_ide_pkg       %{nb_}-%{nb_ide}
@@ -35,7 +36,7 @@
 %define nb_apisupport_dir  %{nb_home}/%{nb_apisupport}
 %define nb_apisupport_pkg  %{nb_}-%{nb_apisupport}
 
-%define nb_nb         nb%{nb_ver}
+%define nb_nb         nb%{nb_ver_major}
 %define nb_nb_dir     %{nb_dir}/%{nb_nb}
 %define nb_bin_dir    %{nb_dir}/bin
 %define nb_etc_dir    %{nb_dir}/etc
@@ -69,42 +70,76 @@
 
 # Used xml resolver
 %define xml_resolver netbeans-resolver
-# %define xml_resolver_ver %{nb_ver}
-%define xml_resolver_ver 6.1
-%define xml_resolver_jar %{_javadir}/%{xml_resolver}-%{xml_resolver_ver}.jar
+%define xml_resolver_ver %{nb_ver}
+%define xml_resolver_jar %{xml_resolver}-%{xml_resolver_ver}.jar
 
 # Used svn client adapter
 %define svnclientadapter     netbeans-svnclientadapter
 %define svnclientadapter_ver %{nb_ver}
-%define svnclientadapter_jar %{_javadir}/%{svnclientadapter}-%{svnclientadapter_ver}.jar
+%define svnclientadapter_jar %{svnclientadapter}.jar
+
+%define javaparser_ver %{nb_ver}
+
+# existing commons-logging-1.0.4.jar instead of required commons-logging-1.1.jar
+%define commons_logging_ver 1.1
+
+# existing ini4j-0.3.2.jar instead of required ini4j-0.4.1.jar
+%define ini4j_ver 0.4.1
+
+%define svnjavahl_ver 1.6.0
+
+# Links the system JAR
+# %1 - the sys jar name
+# %2 - the symlink
+%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
 Vendor:         netbeans.org
 URL:            http://www.netbeans.org
 
-Source0: http://nbi.netbeans.org/files/documents/210/2387/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}-src-linux.tar.gz
+# A lite tarball configured and released for Linux distributions is used instead of the full source archive
+# http://download.netbeans.org/%{nb_}/%{nb_ver}/final/zip/%{nb_}-%{nb_ver}-%{nb_release_time}-src.zip
+# The tarball contains only modules of the basic cluster that are being packaged.
+# Unused source files and all binary files are removed.
+Source0: http://nbi.netbeans.org/files/documents/210/2537/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}-src-linux.tar.gz
+
 Source1: %{name}-ide.desktop-template
 %define nb_desktop_template %{SOURCE1}
 
-Patch0: %{name}-%{version}-00-copy-build.patch
-Patch1: %{name}-%{version}-10-ant-external-build.patch
-Patch2: %{name}-%{version}-20-ant-build.patch
-Patch3: %{name}-%{version}-30-parse-project-xml.patch
-Patch4: %{name}-%{version}-40-build-xml.patch
+# Enables the Update Center (UC) for Fedora
+Patch0: %{name}-%{version}@00-updatecenters.patch
+# Removes actions against binary files
+Patch1: %{name}-%{version}@10-ant-patch.patch 
+# Makes org/netbeans/nbbuild/ParseProjectXml.java happy
+# even if  a classpath entry (jar) does not exist
+Patch2: %{name}-%{version}@20-parse-project-xml.patch 
+# Removes windows components
+Patch3: %{name}-%{version}@30-build-xml.patch
+# Adapts IDE launcher for Fedora
+# - unset DESKTOP_STARTUP_ID
+# - set progdir
+# - exec /etc/netbeans.conf
+# - avoid interactive accepting license
 # http://wiki.netbeans.org/Fedora10PackagingNBIDELauncher
 # https://bugzilla.redhat.com/show_bug.cgi?id=464820
 # https://bugzilla.redhat.com/show_bug.cgi?id=467546
-Patch5: %{name}-%{version}-50-ide-launcher.patch
-Patch6: %{name}-%{version}-60-small-ide-config.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=466179
-Patch7: %{name}-%{version}-70-updatecenters.patch
-# avoiding use svnkit
-Patch8: %{name}-%{version}-80-nosvnkit.patch
+Patch4: %{name}-%{version}@40-ide-launcher.patch 
+# Avoids releasing binary files
+Patch5: %{name}-%{version}@50-build-copy.patch 
+# Avoids using svnkit
+Patch6: %{name}-%{version}@60-nosvnkit.patch
+# Sets up IDE configuration
+Patch7: %{name}-%{version}@70-small-ide-cluster.patch
+# Disables the checkmoduleconfigs task
+Patch8: %{name}-%{version}@80-check-modules.patch
+# Avoids failonerror during copying license file.
+# The file is moved to the top directory of the tarball.
+Patch9: %{name}-%{version}@90-copy_license.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -123,18 +158,19 @@ BuildRequires: %{nb_platform_pkg} >= %{v
 BuildRequires: lucene >= 2.3.1
 BuildRequires: unzip
 BuildRequires: desktop-file-utils
-BuildRequires: netbeans-javaparser = %{version}
+BuildRequires: netbeans-javaparser >= %{javaparser_ver}
 BuildRequires: xerces-j2 >= 2.7.1
 BuildRequires: appframework >= 1.03
 BuildRequires: beansbinding >= 1.2.1
 BuildRequires: freemarker >= 2.3.8
-BuildRequires: jsch >= 0.1.39
+BuildRequires: jsch
 BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
-BuildRequires: ini4j >= 0.3.2-4
+BuildRequires: ini4j
 BuildRequires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
-BuildRequires: subversion-javahl >= 1.5.0
+BuildRequires: subversion-javahl
 BuildRequires: jakarta-commons-logging >= 1.0.4
 BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: jakarta-commons-net >= 1.4.1
 BuildRequires: %{nb_harness_pkg}    >= %{version}
 
 Requires: jpackage-utils
@@ -181,15 +217,16 @@ Group: Development/Tools
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: %{nb_platform_pkg} >= %{version}
-Requires: jsch >= 0.1.39
+Requires: jsch
 Requires: %{xml_resolver} >= %{xml_resolver_ver}
-Requires: ini4j >= 0.3.2-4
+Requires: ini4j
 Requires: freemarker >= 2.3.8
 Requires: xerces-j2 >= 2.7.1
 Requires: netbeans-svnclientadapter >= %{version}
-Requires: subversion-javahl >= 1.5.0
+Requires: subversion-javahl
 Requires: jakarta-commons-logging >= 1.0.4
 Requires: jakarta-oro >= 2.0.8
+Requires: jakarta-commons-net >= 1.4.1
 # A requirement for the owner of the /usr/share/netbeans directory
 Requires: %{nb_platform_pkg}   >= %{version}
 
@@ -205,13 +242,13 @@ Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: %{name}-%{nb_ide} >= %{version}
 Requires: java-sdk >= 1:1.6.0
-Requires: netbeans-javaparser = %{version}
+Requires: netbeans-javaparser >= %{javaparser_ver}
 Requires: appframework >= 1.03
 Requires: beansbinding >= 1.2.1
-Requires: ant >= 0:1.7.0
-Requires: ant-junit >= 0:1.7.0
-Requires: ant-nodeps >= 0:1.7.0
-Requires: ant-trax >= 0:1.7.0
+Requires: ant >= 1.7.0
+Requires: ant-junit >= 1.7.0
+Requires: ant-nodeps >= 1.7.0
+Requires: ant-trax >= 1.7.0
 # A requirement for the owner of the /usr/share/netbeans directory
 Requires: %{nb_platform_pkg}   >= %{version}
 
@@ -219,30 +256,19 @@ Requires: %{nb_platform_pkg}   >= %{vers
 Common libraries for the NetBeans Java IDE.
 
 %prep
-%setup -q
+%setup -q 
 
 find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__rm} -f
 find . -type f \( -iname "binaries-list" \) | xargs -t %{__rm} -f
 
-# Generate stub jar file, so there is something in jsr223  module.
-%{__mkdir_p} libs.jsr223/src/javax/script
-echo "As of Java 6, JSR 223 is included in the JRE." > libs.jsr223/src/javax/script/readme.txt
-%{__mkdir_p} libs.jsr223/external
-jar cf libs.jsr223/external/jsr223-api.jar libs.jsr223/src/javax/script/readme.txt
-
-# Generate stub jar file, so there is something in swingapp module.
-%{__mkdir_p} swingapp/src/javax/swing
-echo "As of Java 6, SwingWorker is included in the JRE." > swingapp/src/javax/swing/SwingWorker-readme.txt
-%{__mkdir_p} swingapp/external
-jar cf swingapp/external/swing-worker-1.1.jar swingapp/src/javax/swing/SwingWorker-readme.txt
-
-# to build the netbeans modules the installed jars will be used instead of pre-packaged ones
-# javahelp2.jar is required for the build target "bootstrap" for "JavaHelp indexing".
-%{__ln_s} -f %{_javadir}/javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar javahelp/external/jh-2.0_05.jar
-
+# To build the netbeans modules the installed jars will be used instead of pre-packaged ones
+# - javahelp2.jar is required for the build target "bootstrap" for "JavaHelp indexing".
+#   see also classpath in the jhindexer task in nbbuild/templates/projectized.xml (334)
+%{__mkdir_p} apisupport.harness/external
+%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
+%lnSysJAR javahelp2.jar javahelp/external/jh-2.0_05.jar
+# - links ant libs
 %{__ln_s} -f %{_javadir} o.apache.tools.ant.module/external/lib
-%{__ln_s} -f %{_javadir}/freemarker-2.3.jar libs.freemarker/external/freemarker-2.3.8.jar
 
 %patch0 -p1 -b .sav
 %patch1 -p1 -b .sav
@@ -253,37 +279,37 @@ jar cf swingapp/external/swing-worker-1.
 %patch6 -p1 -b .sav
 %patch7 -p1 -b .sav
 %patch8 -p1 -b .sav
+%patch9 -p1 -b .sav
 
 %build
 
 mkdir -p nbbuild/netbeans
 %{__ln_s} -f %{nb_platform_dir} nbbuild/netbeans/%{nb_platform}
+%{__ln_s} -f %{nb_harness_dir} nbbuild/netbeans/harness
 
 IDE_EXT_DIR=nbbuild/netbeans/%{nb_ide}/modules/ext
-%{__mkdir_p}  ${IDE_EXT_DIR}
-%{__ln_s} -f %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.39.jar
-%{__ln_s} -f %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
-%{__ln_s} -f %{_javadir}/ini4j.jar  ${IDE_EXT_DIR}/ini4j-0.2.6.jar
+%{__mkdir_p} ${IDE_EXT_DIR}
+%lnSysJAR jsch.jar ${IDE_EXT_DIR}/jsch-0.1.41.jar
+%lnSysJAR %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
+%lnSysJAR ini4j.jar  ${IDE_EXT_DIR}/ini4j-%{ini4j_ver}.jar
 # The freemarker 2.2 isn't compatible with 2.3. It means that future versions can be incompatible too.
 # Therefore, we must use the freemarker-2.3.jar link instead of freemarker.jar
-%{__ln_s} -f %{_javadir}/freemarker-2.3.jar  ${IDE_EXT_DIR}/freemarker-2.3.8.jar
-%{__ln_s} -f %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
-%{__ln_s} -f %{_javadir}/svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
-%{__ln_s} -f %{_javadir}/xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
-%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
-%{__ln_s} -f %{_javadir}/jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
+%lnSysJAR freemarker-2.3.jar  ${IDE_EXT_DIR}/freemarker-2.3.8.jar
+%lnSysJAR %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.6.0.jar
+%lnSysJAR svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
+%lnSysJAR xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
+%lnSysJAR lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
+%lnSysJAR commons-logging.jar ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
+%lnSysJAR jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
+%lnSysJAR commons-net.jar ${IDE_EXT_DIR}/commons-net-1.4.1.jar
 
 JAVA_EXT_DIR=nbbuild/netbeans/%{nb_java}/modules/ext
-%{__mkdir_p}  ${JAVA_EXT_DIR}
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
-%{__ln_s} -f %{_javadir}/beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
-%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
-%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
-
-%{__ln_s} -f %{nb_harness_dir} nbbuild/netbeans/harness
+%{__mkdir_p} ${JAVA_EXT_DIR}
+%lnSysJAR netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
+%lnSysJAR appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
+%lnSysJAR beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
+%lnSysJAR junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
 %{ant_nb_opt} \
     -Do.n.core.dir=%{nb_platform_dir} \
@@ -304,15 +330,15 @@ sed --in-place "s|<nb_icon>|%{nb_icon}|g
 sed --in-place "s|<nb_launcher>|%{nb_launcher}|g" %{nb_desktop}
 
 # clean up links to ext jars for the ide module
-%{__rm} -f ${IDE_EXT_DIR}/jsch-0.1.39.jar
+%{__rm} -f ${IDE_EXT_DIR}/jsch-0.1.41.jar
 %{__rm} -f ${IDE_EXT_DIR}/resolver-1.2.jar
-%{__rm} -f ${IDE_EXT_DIR}/ini4j-0.2.6.jar
+%{__rm} -f ${IDE_EXT_DIR}/ini4j-%{ini4j_ver}.jar
 %{__rm} -f ${IDE_EXT_DIR}/freemarker-2.3.8.jar
-%{__rm} -f ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
-%{__rm} -f ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
+%{__rm} -f ${IDE_EXT_DIR}/svnClientAdapter-1.6.0.jar
+%{__rm} -f ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
 %{__rm} -f ${IDE_EXT_DIR}/xerces-2.8.0.jar
 %{__rm} -f ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
-%{__rm} -f ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
+%{__rm} -f ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
 %{__rm} -f ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
 
 # clean up links to ext jars for the java module
@@ -323,9 +349,6 @@ sed --in-place "s|<nb_launcher>|%{nb_lau
 %{__rm} -f ${JAVA_EXT_DIR}/junit-4.5.jar
 %{__rm} -f ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
-# clean up the stub jar
-%{__rm} -f ${JAVA_EXT_DIR}/swing-worker-1.1.jar
-
 %install
 
 # Installs the specified source(s) in the destination directory.
@@ -351,18 +374,18 @@ install_package %{buildroot}%{nb_ide_dir
 
 # linking the ide to the external JARs
 IDE_EXT_DIR=%{buildroot}%{nb_ide_dir}/modules/ext
-%{__ln_s} -f %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.39.jar
-%{__ln_s} -f %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
-%{__ln_s} -f %{_javadir}/ini4j.jar  ${IDE_EXT_DIR}/ini4j-0.2.6.jar
+%lnSysJAR jsch.jar ${IDE_EXT_DIR}/jsch-0.1.41.jar
+%lnSysJAR %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
+%lnSysJAR ini4j.jar  ${IDE_EXT_DIR}/ini4j-%{ini4j_ver}.jar
 # The freemarker 2.2 isn't compatible with 2.3. It means that future versions can be incompatible too.
 # Therefore, we must use the freemarker-2.3.jar link instead of freemarker.jar
-%{__ln_s} -f %{_javadir}/freemarker-2.3.jar  ${IDE_EXT_DIR}/freemarker-2.3.8.jar
-%{__ln_s} -f %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
-%{__ln_s} -f %{_javadir}/svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
-%{__ln_s} -f %{_javadir}/xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
-%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
-%{__ln_s} -f %{_javadir}/jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
+%lnSysJAR freemarker-2.3.jar  ${IDE_EXT_DIR}/freemarker-2.3.8.jar
+%lnSysJAR %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.6.0.jar
+%lnSysJAR svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
+%lnSysJAR xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
+%lnSysJAR lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
+%lnSysJAR commons-logging.jar ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
+%lnSysJAR jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
 
 # Install java
 install_package %{buildroot}%{nb_java_dir} nbbuild/netbeans/%{nb_java}/*
@@ -373,18 +396,19 @@ install -d -m 755 %{buildroot}%{nb_java_
 
 # linking the java to the external JARs
 JAVA_EXT_DIR=%{buildroot}%{nb_java_dir}/modules/ext
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
-%{__ln_s} -f %{_javadir}/beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
-%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
-%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
+%lnSysJAR netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
+%lnSysJAR appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
+%lnSysJAR beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
+%lnSysJAR junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
+%lnSysJAR junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
+# linking the Ant components
 JAVA_ANT_DIR=%{buildroot}%{nb_java_dir}/ant
 %{__ln_s} -f %{ant_bin_dir}/ant ${JAVA_ANT_DIR}/bin/ant
 %{__ln_s} -f %{ant_bin_dir}/antRun ${JAVA_ANT_DIR}/bin/antRun
 %{__ln_s} -f %{ant_etc_dir} ${JAVA_ANT_DIR}/etc
-
+# - jars
 %{__ln_s} -f %{ant_lib_dir}/ant.jar ${JAVA_ANT_DIR}/lib/ant.jar
 %{__ln_s} -f %{ant_lib_dir}/ant-launcher.jar ${JAVA_ANT_DIR}/lib/ant-launcher.jar
 %{__ln_s} -f %{ant_lib_dir2}/ant-junit.jar ${JAVA_ANT_DIR}/lib/ant-junit.jar
@@ -445,97 +469,26 @@ fi
 %dir %{_datadir}/applications/%{nb_org}/
 %{nb_nb_dir}/.noautoupdate
 %{_datadir}/applications/%{nb_org}/%{nb_desktop}
+%doc LICENSE.txt README.txt
 
 %files %{nb_apisupport}
 %defattr(-,root,root,-)
 %{nb_apisupport_dir}/
 %{nb_apisupport_dir}/.noautoupdate
-%doc nbbuild/standard-nbm-license.txt
+%doc LICENSE.txt
 
 %files %{nb_ide}
 %defattr(-,root,root,-)
 %{nb_ide_dir}/
 %{nb_ide_dir}/.noautoupdate
-%doc nbbuild/standard-nbm-license.txt
+%doc LICENSE.txt
 
 %files %{nb_java}
 %defattr(-,root,root,-)
 %{nb_java_dir}/
 %{nb_java_dir}/.noautoupdate
-%doc nbbuild/standard-nbm-license.txt
+%doc LICENSE.txt
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.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> - 6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 04 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-2
-- Bug #483384 - "netbeans : Unowned directories" is fixed.
-  Dependencies on the netbeans-platform package are added for both ide and java subpackages.
-
-* Tue Dec 09 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-1
-- Bootstrapping of the spec for IDE of the NetBeans 6.5
-- Removing of all binaries-list files
-- New dependency on jakarta-oro-2.0.8.jar is added
-- The Distribution tag is removed
-- jsch 0.1.24 -> 0.1.39
-- lucene 2.2.0 -> 2.3.1 (2.3.2)
-- netbeans-javaparser 6.1 -> 6.5
-- junit4 4.1 -> 4.5
-- netbeans-platform9 -> netbeans-platform
-- netbeans-platform9-harness -> netbeans-platform-harness
-- BR netbeans-platform-harness
-- svnClientAdapter 0.9.23 -> 1.4.0
-- B(R) subversion-javahl >= 1.5.0
-- Creation of the .noautoupdate files is  moved to the install section
-
-* Tue Nov 25 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-10
-- Explicit dependencies on the jakarta-commons-logging package are added (#472825).
-- Summary is fixed according to the request of the Richard Hughes <hughsient at gmail.com>.
-- Call of the brp-java-repack-jars script is disabled.
-- The deprecated key "Encoding" is removed from the desktop file template.
-
-* Wed Oct 22 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-9
-- Unset the DESKTOP_STARTUP_ID environment variable (#467546). The netbeans-6.1-50-ide-launcher.patch is modified.
-
-* Thu Oct 09 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-8
-- Update center - NetBeans is disabled, update center - NetBeans for Fedora is added (#466179)
-- Some cosmetics
-
-* Tue Oct 07 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-7
-- Dependency upon java-sdk is added instead of java-1.6.0-openjdk (#464558, # 465891)
-
-* Wed Oct 01 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-6
-- Showing an incorrect EULA at startup is disabled (#464820). The netbeans-6.1-50-ide-launcher.patch is modified.
-
-* Mon Sep 15 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-5
-- A location of the productid file is changed
-- The swingapp module is removed from the small IDE configuration (netbeans-6.1-60-small-ide-config.patch)
-
-* Tue Sep 09 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-4
-- The java, java-devel and jpackage-utils requirenments are used
-
-* Mon Sep 08 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-3
-- The symlink locations for both java2/ant/ant/bin/antRun and java2/ant/ant/etc are corrected (#456337#c9)
-- Linking to the external JARs is moved to the %%install script from the %%post (#456337#c9)
-- The requires for a version of the ini4j package are corrected (#456337#c9)
-- The %%description content for the NetBeans IDE is updated (#456337#c9)
-- Canonical value for %%defattr is used everywhere
-
-* Tue Jul 29 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-2
-- rpmlint warnings about hidden .noautoupdate files are supressed
-- Package dependencies are adjusted
-- Relative links are used
-- The alternatives system is used to run netbeans
-- Group is changed
-- nb_distro_id is added
-- The %%{buildroot} is used everywhere instead of $RPM_BUILD_ROOT
-- A version requirement for the xerces-j2 is decreased from 2.8.0 up to 2.7.1
-- The warnings about links to external JARs are suppressed
-- Redundant stub swing-worker-1.1.jar is removed
-- The standard-nbm-license.txt is added to all subpackages
-
-* Fri Jun 06 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-1
-- Initial version
+* Sat May 23 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
+- re-base for the NetBeans 6.7.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jan 2009 16:53:06 -0000	1.3
+++ sources	14 Aug 2009 08:48:53 -0000	1.4
@@ -1 +1 @@
-836d358b43f76c01cca10b943e7cd718  netbeans-6.5-200811100001-base-src-linux.tar.gz
+5a38c0539b82027eeea8b16ed1065e95  netbeans-6.7.1-200907230233-base-src-linux.tar.gz


--- netbeans-6.5-00-copy-build.patch DELETED ---


--- netbeans-6.5-10-ant-external-build.patch DELETED ---


--- netbeans-6.5-20-ant-build.patch DELETED ---


--- netbeans-6.5-30-parse-project-xml.patch DELETED ---


--- netbeans-6.5-40-build-xml.patch DELETED ---


--- netbeans-6.5-50-ide-launcher.patch DELETED ---


--- netbeans-6.5-60-small-ide-config.patch DELETED ---


--- netbeans-6.5-70-updatecenters.patch DELETED ---


--- netbeans-6.5-80-nosvnkit.patch DELETED ---



From kdudka at fedoraproject.org  Fri Aug 14 09:21:27 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 14 Aug 2009 09:21:27 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.6-verifyhost.patch, NONE, 1.1 .cvsignore, 
	1.35, 1.36 curl.spec, 1.108, 1.109 sources, 1.35,
	1.36 curl-7.17.1-badsocket.patch, 1.2, NONE curl-7.19.5-cc.patch,
	1.1, NONE curl-7.19.5-cc_refcnt-1.patch, 1.1,
	NONE curl-7.19.5-cc_refcnt-2.patch, 1.3, NONE
Message-ID: <20090814092127.5145E11C00D0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12257

Modified Files:
	.cvsignore curl.spec sources 
Added Files:
	curl-7.19.6-verifyhost.patch 
Removed Files:
	curl-7.17.1-badsocket.patch curl-7.19.5-cc.patch 
	curl-7.19.5-cc_refcnt-1.patch curl-7.19.5-cc_refcnt-2.patch 
Log Message:
- new upstream release, dropped applied patches
- changed NSS code to not ignore the value of ssl.verifyhost and produce more
  verbose error messages (#516056)

curl-7.19.6-verifyhost.patch:
 nss.c |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE curl-7.19.6-verifyhost.patch ---
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-08-14 11:14:45.423733097 +0200
+++ curl-7.19.6/lib/nss.c	2009-08-14 11:15:04.142733360 +0200
@@ -615,16 +615,26 @@ static SECStatus BadCertHandler(void *ar
           issuer);
     break;
   case SSL_ERROR_BAD_CERT_DOMAIN:
-    if(conn->data->set.ssl.verifypeer)
+    if(conn->data->set.ssl.verifyhost) {
+      failf(conn->data, "common name '%s' does not match '%s'",
+            subject, conn->host.dispname);
       success = SECFailure;
-    infof(conn->data, "common name: %s (does not match '%s')\n",
-          subject, conn->host.dispname);
+    } else {
+      infof(conn->data, "warning: common name '%s' does not match '%s'\n",
+            subject, conn->host.dispname);
+    }
     break;
   case SEC_ERROR_EXPIRED_CERTIFICATE:
     if(conn->data->set.ssl.verifypeer)
       success = SECFailure;
     infof(conn->data, "Remote Certificate has expired.\n");
     break;
+  case SEC_ERROR_UNKNOWN_ISSUER:
+    if(conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Peer's certificate issuer is not recognized: '%s'\n",
+          issuer);
+    break;
   default:
     if(conn->data->set.ssl.verifypeer)
       success = SECFailure;
@@ -1067,6 +1077,9 @@ CURLcode Curl_nss_connect(struct connect
     }
   }
 
+  if(data->set.ssl.verifyhost == 1)
+    infof(data, "warning: ignoring unsupported value (1) of ssl.verifyhost\n");
+
   data->set.ssl.certverifyresult=0; /* not checked yet */
   if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
      != SECSuccess) {
@@ -1200,7 +1213,9 @@ CURLcode Curl_nss_connect(struct connect
   if(SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
       != SECSuccess) {
-    if(conn->data->set.ssl.certverifyresult!=0)
+    if(conn->data->set.ssl.certverifyresult == SSL_ERROR_BAD_CERT_DOMAIN)
+      curlerr = CURLE_PEER_FAILED_VERIFICATION;
+    else if(conn->data->set.ssl.certverifyresult!=0)
       curlerr = CURLE_SSL_CACERT;
     goto error;
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	12 Aug 2009 17:04:04 -0000	1.35
+++ .cvsignore	14 Aug 2009 09:21:24 -0000	1.36
@@ -1 +1,2 @@
 curl-7.19.5.tar.lzma
+curl-7.19.6.tar.lzma


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- curl.spec	12 Aug 2009 17:04:04 -0000	1.108
+++ curl.spec	14 Aug 2009 09:21:25 -0000	1.109
@@ -1,18 +1,15 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.19.5
-Release: 10%{?dist}
+Version: 7.19.6
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
-Patch1: curl-7.15.3-multilib.patch
-Patch2: curl-7.16.0-privlibs.patch
-Patch3: curl-7.17.1-badsocket.patch
-Patch4: curl-7.19.4-debug.patch
-Patch5: curl-7.19.5-cc_refcnt-1.patch
-Patch6: curl-7.19.5-cc_refcnt-2.patch
-Patch7: curl-7.19.5-cc.patch
+Patch1: curl-7.19.6-verifyhost.patch
+Patch101: curl-7.15.3-multilib.patch
+Patch102: curl-7.16.0-privlibs.patch
+Patch103: curl-7.19.4-debug.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,13 +50,14 @@ use cURL's capabilities internally.
 
 %prep
 %setup -q
+
+# upstream patches
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+
+# Fedora patches
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -142,6 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Aug 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-1
+- new upstream release, dropped applied patches
+- changed NSS code to not ignore the value of ssl.verifyhost and produce more
+  verbose error messages (#516056)
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.19.5-10
 - Use lzma compressed upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	12 Aug 2009 17:04:04 -0000	1.35
+++ sources	14 Aug 2009 09:21:25 -0000	1.36
@@ -1 +1,2 @@
 e4612af6cc471879ae0f4727457eb6fc  curl-7.19.5.tar.lzma
+9351ad8ee0bea75015dfa9ec6248e055  curl-7.19.6.tar.lzma


--- curl-7.17.1-badsocket.patch DELETED ---


--- curl-7.19.5-cc.patch DELETED ---


--- curl-7.19.5-cc_refcnt-1.patch DELETED ---


--- curl-7.19.5-cc_refcnt-2.patch DELETED ---



From topdog at fedoraproject.org  Fri Aug 14 09:22:00 2009
From: topdog at fedoraproject.org (topdog)
Date: Fri, 14 Aug 2009 09:22:00 +0000 (UTC)
Subject: rpms/php-adodb/EL-4 php-adodb.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090814092200.56D5C11C00D0@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-adodb/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12230

Modified Files:
	php-adodb.spec sources 
Log Message:
* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.95-1.a
- Initialize EL-4
- Upgrade to 4.95a




Index: php-adodb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-adodb/EL-4/php-adodb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-adodb.spec	8 May 2005 17:27:19 -0000	1.3
+++ php-adodb.spec	14 Aug 2009 09:22:00 -0000	1.4
@@ -1,15 +1,15 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.62
-Release:        1%{?dist}
+Version:        4.95
+Release:        1.a%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb462.tgz
-License:        BSD
+Source0:        http://dl.sf.net/adodb/adodb495a.tgz
+License:        BSD or LGPLv2+
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       php >= 4.0.5
+Requires:       php >= 4.1.0
 
 %description
 PHP is a wonderful language for building dynamic web pages.
@@ -32,16 +32,15 @@ find . -type f | xargs chmod 644
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_var}/www/icons
-install -d $RPM_BUILD_ROOT%{_datadir}/adodb
-cp -pr * $RPM_BUILD_ROOT%{_datadir}/adodb/
+install -d $RPM_BUILD_ROOT%{_datadir}/php/adodb
+cp -pr * $RPM_BUILD_ROOT%{_datadir}/php/adodb/
 
 install -m644 cute_icons_for_site/* $RPM_BUILD_ROOT%{_var}/www/icons/
 
 # cleanup
-rm -rf $RPM_BUILD_ROOT%{_datadir}/adodb/cute_icons_for_site
-rm -rf $RPM_BUILD_ROOT%{_datadir}/adodb/docs
-rm -f $RPM_BUILD_ROOT%{_datadir}/*.zip
-rm -f $RPM_BUILD_ROOT%{_datadir}/*.txt
+rm -rf $RPM_BUILD_ROOT%{_datadir}/php/adodb/cute_icons_for_site
+rm -rf $RPM_BUILD_ROOT%{_datadir}/php/adodb/docs
+rm -f $RPM_BUILD_ROOT%{_datadir}/php/adodb/*.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,10 +48,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc *.txt docs/*
-%{_datadir}/adodb
+%{_datadir}/php/adodb
 %{_var}/www/icons/*
 
 %changelog
+* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.95-1.a
+- version 4.95a
+- fix license tag
+
 * Sun May 08 2005 Aurelien Bompard <gauret[AT]free.fr> 4.62-1%{?dist}
 - version 4.62
 - use disttag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-adodb/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 May 2005 17:27:19 -0000	1.3
+++ sources	14 Aug 2009 09:22:00 -0000	1.4
@@ -1 +1 @@
-208e9eb5d3e2d4f5a9efbf428db11e70  adodb462.tgz
+3f470830f7932a8a33e0c42949fa1470  adodb495a.tgz



From kdudka at fedoraproject.org  Fri Aug 14 09:32:23 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 14 Aug 2009 09:32:23 +0000 (UTC)
Subject: rpms/curl/F-11 curl-7.19.6-verifyhost.patch, NONE, 1.1 .cvsignore, 
	1.33, 1.34 curl.spec, 1.96, 1.97 sources, 1.33,
	1.34 curl-7.17.1-badsocket.patch, 1.2,
	NONE curl-7.19.4-enable-aes.patch, 1.1,
	NONE curl-7.19.4-infloop.patch, 1.1,
	NONE curl-7.19.4-nss-leak.patch, 1.1,
	NONE curl-7.19.4-tool-leak.patch, 1.1, NONE
Message-ID: <20090814093223.2EBC311C00D0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15118

Modified Files:
	.cvsignore curl.spec sources 
Added Files:
	curl-7.19.6-verifyhost.patch 
Removed Files:
	curl-7.17.1-badsocket.patch curl-7.19.4-enable-aes.patch 
	curl-7.19.4-infloop.patch curl-7.19.4-nss-leak.patch 
	curl-7.19.4-tool-leak.patch 
Log Message:
- new upstream release, dropped applied patches
- changed NSS code to not ignore the value of ssl.verifyhost and produce more
  verbose error messages (#516056)

curl-7.19.6-verifyhost.patch:
 nss.c |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE curl-7.19.6-verifyhost.patch ---
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-08-14 11:14:45.423733097 +0200
+++ curl-7.19.6/lib/nss.c	2009-08-14 11:15:04.142733360 +0200
@@ -615,16 +615,26 @@ static SECStatus BadCertHandler(void *ar
           issuer);
     break;
   case SSL_ERROR_BAD_CERT_DOMAIN:
-    if(conn->data->set.ssl.verifypeer)
+    if(conn->data->set.ssl.verifyhost) {
+      failf(conn->data, "common name '%s' does not match '%s'",
+            subject, conn->host.dispname);
       success = SECFailure;
-    infof(conn->data, "common name: %s (does not match '%s')\n",
-          subject, conn->host.dispname);
+    } else {
+      infof(conn->data, "warning: common name '%s' does not match '%s'\n",
+            subject, conn->host.dispname);
+    }
     break;
   case SEC_ERROR_EXPIRED_CERTIFICATE:
     if(conn->data->set.ssl.verifypeer)
       success = SECFailure;
     infof(conn->data, "Remote Certificate has expired.\n");
     break;
+  case SEC_ERROR_UNKNOWN_ISSUER:
+    if(conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Peer's certificate issuer is not recognized: '%s'\n",
+          issuer);
+    break;
   default:
     if(conn->data->set.ssl.verifypeer)
       success = SECFailure;
@@ -1067,6 +1077,9 @@ CURLcode Curl_nss_connect(struct connect
     }
   }
 
+  if(data->set.ssl.verifyhost == 1)
+    infof(data, "warning: ignoring unsupported value (1) of ssl.verifyhost\n");
+
   data->set.ssl.certverifyresult=0; /* not checked yet */
   if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
      != SECSuccess) {
@@ -1200,7 +1213,9 @@ CURLcode Curl_nss_connect(struct connect
   if(SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
       != SECSuccess) {
-    if(conn->data->set.ssl.certverifyresult!=0)
+    if(conn->data->set.ssl.certverifyresult == SSL_ERROR_BAD_CERT_DOMAIN)
+      curlerr = CURLE_PEER_FAILED_VERIFICATION;
+    else if(conn->data->set.ssl.certverifyresult!=0)
       curlerr = CURLE_SSL_CACERT;
     goto error;
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	3 Mar 2009 07:08:27 -0000	1.33
+++ .cvsignore	14 Aug 2009 09:32:22 -0000	1.34
@@ -1 +1 @@
-curl-7.19.4.tar.bz2
+curl-7.19.6.tar.bz2


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/curl.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- curl.spec	10 Jun 2009 13:21:09 -0000	1.96
+++ curl.spec	14 Aug 2009 09:32:22 -0000	1.97
@@ -1,18 +1,15 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.19.4
-Release: 9%{?dist}
+Version: 7.19.6
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-Patch1: curl-7.15.3-multilib.patch
-Patch2: curl-7.16.0-privlibs.patch
-Patch3: curl-7.17.1-badsocket.patch
-Patch4: curl-7.19.4-tool-leak.patch
-Patch5: curl-7.19.4-enable-aes.patch
-Patch6: curl-7.19.4-nss-leak.patch
-Patch7: curl-7.19.4-debug.patch
-Patch8: curl-7.19.4-infloop.patch
+Patch1: curl-7.19.6-verifyhost.patch
+Patch101: curl-7.15.3-multilib.patch
+Patch102: curl-7.16.0-privlibs.patch
+Patch103: curl-7.19.4-debug.patch
+Provides: webclient
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,14 +49,14 @@ use cURL's capabilities internally.
 
 %prep
 %setup -q
-%patch1 -p1 -b .multilib
-%patch2 -p1 -b .privlibs
-%patch3 -p1 -b .badsocket
-%patch4 -p1 -b .toolleak
-%patch5 -p1 -b .enableaes
-%patch6 -p1 -b .nssleak
-%patch7 -p1 -b .debug
-%patch8 -p1 -b .infloop
+
+# upstream patches
+%patch1 -p1
+
+# Fedora patches
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -152,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Aug 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-1
+- new upstream release, dropped applied patches
+- changed NSS code to not ignore the value of ssl.verifyhost and produce more
+  verbose error messages (#516056)
+
 * Wed Jun 10 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-9
 - avoid unguarded comparison in the spec file, thanks to R P Herrold (#504857)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	3 Mar 2009 07:08:27 -0000	1.33
+++ sources	14 Aug 2009 09:32:23 -0000	1.34
@@ -1 +1 @@
-2734167c1e5f7ce6be99b75d2d371d85  curl-7.19.4.tar.bz2
+8402c1f654c51ad7287aad57c3aa79be  curl-7.19.6.tar.bz2


--- curl-7.17.1-badsocket.patch DELETED ---


--- curl-7.19.4-enable-aes.patch DELETED ---


--- curl-7.19.4-infloop.patch DELETED ---


--- curl-7.19.4-nss-leak.patch DELETED ---


--- curl-7.19.4-tool-leak.patch DELETED ---



From kdudka at fedoraproject.org  Fri Aug 14 09:37:21 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 14 Aug 2009 09:37:21 +0000 (UTC)
Subject: rpms/curl/devel .cvsignore,1.36,1.37 sources,1.36,1.37
Message-ID: <20090814093721.214A011C00D0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16138

Modified Files:
	.cvsignore sources 
Log Message:
remove old tarballs from .cvsignore and sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	14 Aug 2009 09:21:24 -0000	1.36
+++ .cvsignore	14 Aug 2009 09:37:20 -0000	1.37
@@ -1,2 +1 @@
-curl-7.19.5.tar.lzma
 curl-7.19.6.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	14 Aug 2009 09:21:25 -0000	1.36
+++ sources	14 Aug 2009 09:37:20 -0000	1.37
@@ -1,2 +1 @@
-e4612af6cc471879ae0f4727457eb6fc  curl-7.19.5.tar.lzma
 9351ad8ee0bea75015dfa9ec6248e055  curl-7.19.6.tar.lzma



From kdudka at fedoraproject.org  Fri Aug 14 09:38:25 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 14 Aug 2009 09:38:25 +0000 (UTC)
Subject: rpms/curl/F-11 curl.spec,1.97,1.98
Message-ID: <20090814093825.6BB8B11C00D0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16376

Modified Files:
	curl.spec 
Log Message:
remove redundant line in curl.spec


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/curl.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- curl.spec	14 Aug 2009 09:32:22 -0000	1.97
+++ curl.spec	14 Aug 2009 09:38:25 -0000	1.98
@@ -10,7 +10,6 @@ Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
 Provides: webclient
-Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf



From kdudka at fedoraproject.org  Fri Aug 14 09:43:48 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 14 Aug 2009 09:43:48 +0000 (UTC)
Subject: rpms/curl/F-10 curl-7.19.6-verifyhost.patch, NONE, 1.1 .cvsignore, 
	1.32, 1.33 curl.spec, 1.90, 1.91 sources, 1.32,
	1.33 curl-7.17.1-badsocket.patch, 1.2,
	NONE curl-7.19.4-infloop.patch, 1.1, NONE
Message-ID: <20090814094348.63C8311C00D0@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17506

Modified Files:
	.cvsignore curl.spec sources 
Added Files:
	curl-7.19.6-verifyhost.patch 
Removed Files:
	curl-7.17.1-badsocket.patch curl-7.19.4-infloop.patch 
Log Message:
- new upstream release, dropped applied patches
- changed NSS code to not ignore the value of ssl.verifyhost and produce more
  verbose error messages (#516056)

curl-7.19.6-verifyhost.patch:
 nss.c |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE curl-7.19.6-verifyhost.patch ---
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-08-14 11:14:45.423733097 +0200
+++ curl-7.19.6/lib/nss.c	2009-08-14 11:15:04.142733360 +0200
@@ -615,16 +615,26 @@ static SECStatus BadCertHandler(void *ar
           issuer);
     break;
   case SSL_ERROR_BAD_CERT_DOMAIN:
-    if(conn->data->set.ssl.verifypeer)
+    if(conn->data->set.ssl.verifyhost) {
+      failf(conn->data, "common name '%s' does not match '%s'",
+            subject, conn->host.dispname);
       success = SECFailure;
-    infof(conn->data, "common name: %s (does not match '%s')\n",
-          subject, conn->host.dispname);
+    } else {
+      infof(conn->data, "warning: common name '%s' does not match '%s'\n",
+            subject, conn->host.dispname);
+    }
     break;
   case SEC_ERROR_EXPIRED_CERTIFICATE:
     if(conn->data->set.ssl.verifypeer)
       success = SECFailure;
     infof(conn->data, "Remote Certificate has expired.\n");
     break;
+  case SEC_ERROR_UNKNOWN_ISSUER:
+    if(conn->data->set.ssl.verifypeer)
+      success = SECFailure;
+    infof(conn->data, "Peer's certificate issuer is not recognized: '%s'\n",
+          issuer);
+    break;
   default:
     if(conn->data->set.ssl.verifypeer)
       success = SECFailure;
@@ -1067,6 +1077,9 @@ CURLcode Curl_nss_connect(struct connect
     }
   }
 
+  if(data->set.ssl.verifyhost == 1)
+    infof(data, "warning: ignoring unsupported value (1) of ssl.verifyhost\n");
+
   data->set.ssl.certverifyresult=0; /* not checked yet */
   if(SSL_BadCertHook(model, (SSLBadCertHandler) BadCertHandler, conn)
      != SECSuccess) {
@@ -1200,7 +1213,9 @@ CURLcode Curl_nss_connect(struct connect
   if(SSL_ForceHandshakeWithTimeout(connssl->handle,
                                     PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
       != SECSuccess) {
-    if(conn->data->set.ssl.certverifyresult!=0)
+    if(conn->data->set.ssl.certverifyresult == SSL_ERROR_BAD_CERT_DOMAIN)
+      curlerr = CURLE_PEER_FAILED_VERIFICATION;
+    else if(conn->data->set.ssl.certverifyresult!=0)
       curlerr = CURLE_SSL_CACERT;
     goto error;
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	3 Mar 2009 07:29:45 -0000	1.32
+++ .cvsignore	14 Aug 2009 09:43:47 -0000	1.33
@@ -1 +1 @@
-curl-7.19.4.tar.bz2
+curl-7.19.6.tar.bz2


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-10/curl.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- curl.spec	10 Jun 2009 13:21:13 -0000	1.90
+++ curl.spec	14 Aug 2009 09:43:48 -0000	1.91
@@ -1,15 +1,14 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.19.4
-Release: 6%{?dist}
+Version: 7.19.6
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-Patch1: curl-7.15.3-multilib.patch
-Patch2: curl-7.16.0-privlibs.patch
-Patch3: curl-7.17.1-badsocket.patch
-Patch4: curl-7.19.4-debug.patch
-Patch5: curl-7.19.4-infloop.patch
+Patch1: curl-7.19.6-verifyhost.patch
+Patch101: curl-7.15.3-multilib.patch
+Patch102: curl-7.16.0-privlibs.patch
+Patch103: curl-7.19.4-debug.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,11 +48,14 @@ use cURL's capabilities internally.
 
 %prep
 %setup -q
-%patch1 -p1 -b .multilib
-%patch2 -p1 -b .privlibs
-%patch3 -p1 -b .badsocket
-%patch4 -p1 -b .debug
-%patch5 -p1 -b .infloop
+
+# upstream patches
+%patch1 -p1
+
+# Fedora patches
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -146,6 +148,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Aug 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-1
+- new upstream release, dropped applied patches
+- changed NSS code to not ignore the value of ssl.verifyhost and produce more
+  verbose error messages (#516056)
+
 * Wed Jun 10 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-6
 - avoid unguarded comparison in the spec file, thanks to R P Herrold (#504857)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	3 Mar 2009 07:29:45 -0000	1.32
+++ sources	14 Aug 2009 09:43:48 -0000	1.33
@@ -1 +1 @@
-2734167c1e5f7ce6be99b75d2d371d85  curl-7.19.4.tar.bz2
+8402c1f654c51ad7287aad57c3aa79be  curl-7.19.6.tar.bz2


--- curl-7.17.1-badsocket.patch DELETED ---


--- curl-7.19.4-infloop.patch DELETED ---



From epienbro at fedoraproject.org  Fri Aug 14 09:48:47 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 14 Aug 2009 09:48:47 +0000 (UTC)
Subject: rpms/mingw32-pango/devel pango-87f9fe.patch, NONE,
	1.1 pango-b4f105.patch, NONE, 1.1 pango-f48680.patch, NONE,
	1.1 mingw32-pango.spec, 1.6, 1.7
Message-ID: <20090814094847.47EA111C00D0@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18581

Modified Files:
	mingw32-pango.spec 
Added Files:
	pango-87f9fe.patch pango-b4f105.patch pango-f48680.patch 
Log Message:
Add some already upstreamed patches to get pango compiled on mingw32


pango-87f9fe.patch:
 hb-buffer-private.h |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE pango-87f9fe.patch ---
>From 87f9fedcd27baa62043cb59b03dfd5ce0a9214db Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad at behdad.org>
Date: Thu, 13 Aug 2009 09:20:46 +0000
Subject: [HB] Fix buffer sizing issue with mingw gcc

Bit field packing is a delicate field.  Issue reported in comment 3 here:
http://bugzilla.gnome.org/show_bug.cgi?id=591511
---
diff --git a/pango/opentype/hb-buffer-private.h b/pango/opentype/hb-buffer-private.h
index 2d2ea06..0456125 100644
--- a/pango/opentype/hb-buffer-private.h
+++ b/pango/opentype/hb-buffer-private.h
@@ -50,15 +50,15 @@ typedef struct _hb_internal_glyph_position_t {
   hb_position_t  y_pos;
   hb_position_t  x_advance;
   hb_position_t  y_advance;
-  hb_bool_t      new_advance :1;	/* if set, the advance width values are
-					   absolute, i.e., they won't be
-					   added to the original glyph's value
-					   but rather replace them */
+  unsigned short new_advance :1;	/* if set, the advance width values are
+					 * absolute, i.e., they won't be
+					 * added to the original glyph's value
+					 * but rather replace them */
   unsigned short back : 15;		/* number of glyphs to go back
-					   for drawing current glyph */
+					 * for drawing current glyph */
   short          cursive_chain : 16;	/* character to which this connects,
-					   may be positive or negative; used
-					   only internally */
+					 * may be positive or negative; used
+					 * only internally */
 } hb_internal_glyph_position_t;
 
 ASSERT_STATIC (sizeof (hb_glyph_info_t) == sizeof (hb_internal_glyph_info_t));
--
cgit v0.8.2

pango-b4f105.patch:
 configure.in             |    2 +-
 pango/opentype/hb-blob.c |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE pango-b4f105.patch ---
>From b4f10583ea84d02ed0278fc2cb2846aaf075864d Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad at behdad.org>
Date: Thu, 13 Aug 2009 09:25:23 +0000
Subject: Bug 591511 ? hh-blob.c does not compile using mingw on windows

Check for sys/mman.h, not mprotect().
---
diff --git a/configure.in b/configure.in
index 7ea8648..f3f242e 100644
--- a/configure.in
+++ b/configure.in
@@ -128,7 +128,7 @@ AC_LANG_RESTORE
 #
 
 AC_PROG_CXX
-AC_CHECK_FUNCS(mprotect)
+AC_CHECK_HEADERS(unistd.h sys/mman.h)
 
 # Make sure we don't link to libstdc++ (needs de-gcc-fication)
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
diff --git a/pango/opentype/hb-blob.c b/pango/opentype/hb-blob.c
index 178bc8e..2abd4ca 100644
--- a/pango/opentype/hb-blob.c
+++ b/pango/opentype/hb-blob.c
@@ -28,12 +28,12 @@
 
 #include "hb-blob.h"
 
-#ifdef HAVE_MPROTECT
+#ifdef HAVE_SYS_MMAN_H
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <sys/mman.h>
-#endif /* HAVE_MPROTECT */
+#endif /* HAVE_SYS_MMAN_H */
 
 struct _hb_blob_t {
   hb_reference_count_t ref_count;
@@ -244,7 +244,7 @@ hb_blob_try_writeable_inplace (hb_blob_t *blob)
 
   hb_mutex_lock (blob->lock);
 
-#ifdef HAVE_MPROTECT
+#ifdef HAVE_SYS_MMAN_H
   if (blob->mode == HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITEABLE) {
     unsigned int pagesize, mask, length;
     const char *addr;
@@ -286,7 +286,7 @@ hb_blob_try_writeable_inplace (hb_blob_t *blob)
 	     addr, addr+length, length);
 #endif
   }
-#else /* !HAVE_MPROTECT */
+#else /* !HAVE_SYS_MMAN_H */
 #warning "No way to make readonly memory writeable.  This is suboptimal."
 #endif
 
--
cgit v0.8.2

pango-f48680.patch:
 hb-buffer.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE pango-f48680.patch ---
>From f4868084a55e3abd0b45ee2fb7b477e038a81d1a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad at behdad.org>
Date: Thu, 13 Aug 2009 15:47:08 +0000
Subject: [HB] Bitfield packing *is* very delicate

Fix the second instance.
---
diff --git a/pango/opentype/hb-buffer.h b/pango/opentype/hb-buffer.h
index f06a255..f27739f 100644
--- a/pango/opentype/hb-buffer.h
+++ b/pango/opentype/hb-buffer.h
@@ -56,7 +56,7 @@ typedef struct _hb_glyph_position_t {
   hb_position_t  x_advance;
   hb_position_t  y_advance;
   /* XXX these should all be replaced by "uint32_t internal" */
-  hb_bool_t      new_advance :1;	/* if set, the advance width values are
+  unsigned short new_advance :1;	/* if set, the advance width values are
 					   absolute, i.e., they won't be
 					   added to the original glyph's value
 					   but rather replace them */
--
cgit v0.8.2


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-pango.spec	12 Aug 2009 23:15:50 -0000	1.6
+++ mingw32-pango.spec	14 Aug 2009 09:48:46 -0000	1.7
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.25.2
+Version:        1.25.3
 Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
@@ -27,6 +27,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules
 Source1:        pango.modules
 
+# Upstream commit b4f10583ea84d02ed0278fc2cb2846aaf075864d
+Patch0:         pango-b4f105.patch
+# Upstream commit 87f9fedcd27baa62043cb59b03dfd5ce0a9214db
+Patch1:         pango-87f9fe.patch
+# Upstream commit f4868084a55e3abd0b45ee2fb7b477e038a81d1a 
+Patch2:         pango-f48680.patch
+
 Patch1000:      pango_enable_static_build.patch
 
 BuildArch:      noarch
@@ -75,6 +82,9 @@ Static version of the MinGW Windows Pang
 
 %prep
 %setup -q -n pango-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch1000
 
 # Regenerate the configure script
@@ -196,6 +206,11 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Fri Aug 14 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 1.25.3-1
+- Update to 1.25.3
+- Drop upstreamed patch
+- Added some (already upstreamed) patches to get pango compiled on mingw32
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.2-1
 - Update to 1.25.2
 - Added BR: mingw32-gcc-c++



From laxathom at fedoraproject.org  Fri Aug 14 09:50:39 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 14 Aug 2009 09:50:39 +0000 (UTC)
Subject: rpms/gstreamer-python/devel gstreamer-python.spec, 1.31,
	1.32 sources, 1.16, 1.17
Message-ID: <20090814095039.5BC4211C04D9@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gstreamer-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19156/devel

Modified Files:
	gstreamer-python.spec sources 
Log Message:
Update release.


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gstreamer-python.spec	25 Jul 2009 01:37:26 -0000	1.31
+++ gstreamer-python.spec	14 Aug 2009 09:50:39 -0000	1.32
@@ -1,15 +1,15 @@
 %define         majorminor      0.10
 
 Name:           gstreamer-python
-Version:        0.10.15
-Release:        2%{?dist}
+Version:        0.10.16
+Release:        1%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
-Patch0:         gst-python-0.10.15-strayline.patch
+#Patch0:         gst-python-0.10.15-strayline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       python >= 2.3
@@ -49,7 +49,7 @@ developing gstreamer-python applications
 %prep
 %setup -q -n gst-python-%{version}
 %{__sed} -i 's|^#!/usr/bin/env python$|#|' gst/extend/*.py
-%patch0 -p1 -b .strayline
+#%patch0 -p1 -b .strayline
 
 
 %build
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.10-16-1
+- Update release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	28 May 2009 07:55:33 -0000	1.16
+++ sources	14 Aug 2009 09:50:39 -0000	1.17
@@ -1 +1 @@
-3329320a97bdbc669e11054f19bddf5a  gst-python-0.10.15.tar.bz2
+00cceddc81ff6cdc9838a5c40bbcf305  gst-python-0.10.16.tar.bz2



From laxathom at fedoraproject.org  Fri Aug 14 09:50:39 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 14 Aug 2009 09:50:39 +0000 (UTC)
Subject: rpms/gstreamer-python/F-11 .cvsignore, 1.16,
	1.17 gstreamer-python.spec, 1.30, 1.31 sources, 1.16, 1.17
Message-ID: <20090814095039.3122411C043D@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gstreamer-python/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19156/F-11

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
Update release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	1 Jun 2009 11:58:49 -0000	1.16
+++ .cvsignore	14 Aug 2009 09:50:38 -0000	1.17
@@ -1 +1 @@
-gst-python-0.10.15.tar.bz2
+gst-python-0.10.16.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/F-11/gstreamer-python.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gstreamer-python.spec	1 Jun 2009 11:58:49 -0000	1.30
+++ gstreamer-python.spec	14 Aug 2009 09:50:39 -0000	1.31
@@ -1,7 +1,7 @@
 %define         majorminor      0.10
 
 Name:           gstreamer-python
-Version:        0.10.15
+Version:        0.10.16
 Release:        1%{?dist}
 Summary:        Python bindings for GStreamer
 
@@ -9,7 +9,7 @@ Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
-Patch0:         gst-python-0.10.15-strayline.patch
+#Patch0:         gst-python-0.10.15-strayline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       python >= 2.3
@@ -49,7 +49,7 @@ developing gstreamer-python applications
 %prep
 %setup -q -n gst-python-%{version}
 %{__sed} -i 's|^#!/usr/bin/env python$|#|' gst/extend/*.py
-%patch0 -p1 -b .strayline
+#%patch0 -p1 -b .strayline
 
 
 %build
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.10-16-1
+- Update release.
+
 * Mon Jun  1 2009 Denis Leroy <denis at poolshark.org> - 0.10.15-1
 - Update to upstream 0.10.15, for pitivi update
 - Added git patch for compile fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	1 Jun 2009 11:58:49 -0000	1.16
+++ sources	14 Aug 2009 09:50:39 -0000	1.17
@@ -1 +1 @@
-3329320a97bdbc669e11054f19bddf5a  gst-python-0.10.15.tar.bz2
+00cceddc81ff6cdc9838a5c40bbcf305  gst-python-0.10.16.tar.bz2



From epienbro at fedoraproject.org  Fri Aug 14 09:58:45 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 14 Aug 2009 09:58:45 +0000 (UTC)
Subject: rpms/mingw32-pango/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090814095845.0919411C00D0@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21721

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 22:23:56 -0000	1.4
+++ .cvsignore	14 Aug 2009 09:58:44 -0000	1.5
@@ -1 +1 @@
-pango-1.25.2.tar.bz2
+pango-1.25.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 22:23:56 -0000	1.4
+++ sources	14 Aug 2009 09:58:44 -0000	1.5
@@ -1 +1 @@
-22cc2affdb660049932b16b61c76214a  pango-1.25.2.tar.bz2
+f0ec03e56931f63c9a759a0321164e84  pango-1.25.3.tar.bz2



From nphilipp at fedoraproject.org  Fri Aug 14 09:58:51 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 14 Aug 2009 09:58:51 +0000 (UTC)
Subject: rpms/gimp/devel .cvsignore, 1.51, 1.52 gimp.spec, 1.196,
	1.197 sources, 
	1.51, 1.52 gimp-2.6.6-gegl-babl-versions-check.patch, 1.1,
	NONE gimp-2.6.6-help-browser-webkit.patch, 1.2, NONE
Message-ID: <20090814095851.D249F11C00D0@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21681

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.6-gegl-babl-versions-check.patch 
	gimp-2.6.6-help-browser-webkit.patch 
Log Message:
version 2.6.7
remove obsolete gegl-babl-versions-check, help-browser-webkit patches
comment/explain patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	18 Mar 2009 10:16:51 -0000	1.51
+++ .cvsignore	14 Aug 2009 09:58:51 -0000	1.52
@@ -1 +1 @@
-gimp-2.6.6.tar.bz2
+gimp-2.6.7.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- gimp.spec	24 Jul 2009 14:29:51 -0000	1.196
+++ gimp.spec	14 Aug 2009 09:58:51 -0000	1.197
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.6
-Release:        8%{?dist}
+Version:        2.6.7
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -120,11 +120,14 @@ Provides:       gimp-%{_arch} = %{?epoch
 
 Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
+# distro specific: use xdg-open instead of firefox as web browser
 Patch0:         gimp-2.6.2-xdg-open.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=559081
+# "JPEG Save dialog preview should adjust size units"
 Patch1:         gimp-2.6.2-jpeg-units.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556896
+# "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-Patch3:         gimp-2.6.6-gegl-babl-versions-check.patch
-Patch4:         gimp-2.6.6-help-browser-webkit.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -206,8 +209,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .gegl-babl-versions-check
-%patch4 -p1 -b .help-browser-webkit
 
 %build
 # if [ ! -f configure ]; then
@@ -498,6 +499,80 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Aug 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-1
+- version 2.6.7
+
+  Overview of Changes from GIMP 2.6.6 to GIMP 2.6.7
+  =================================================
+
+  * Bugs fixed:
+
+   591017 - Tablet pan is not working as fast as it should
+   577581 - Crashes when using any colors tool/function on Windows
+   589667 - GIMP crashes when clicking GEGL Operation on Windows
+   569833 - file-jpeg-save erroneous with small quality values
+   590638 - Changing palettes from list to grid view loses "locked to dock"
+            status
+   589674 - "Send by Email" does not update "Filename"
+   589674 - "Send by Email" does not update "Filename"
+   586851 - Transparent BMP files fail to load
+   589205 - help-browser uses deprecated (and sometimes broken) webkit call
+   582821 - 'Sphere Designer' does not reset correctly...
+   570353 - first time open of .svg file ignores the requested units
+   555777 - Export to MNG animation fails
+   577301 - Dithering with transparency is broken for "positioned" method
+   493778 - metadata plug-in crashes on some images
+   567466 - PNG comment not found if more than 1 tEXt chunks
+   585665 - Exporting to PSD with a blank text layer creates a corrupt file
+   586316 - Levels tool does not adjust output levels correctly if input
+            levels are changed
+   569661 - Import from PDF throws errors when entering resolution in
+            pixels per millimetre
+   567262 - Black pixels appear in "Spread" filter preview
+   554658 - Path Dialog: Path preview pics not to see constantly
+   167604 - gimp_gradient_get_color_at() may return out-of-bounds values
+   567393 - Rectangle select tool size shrinks to 0 if size is larger than
+            the image and the up or down arrow is pressed
+   587543 - crash when invoking certain actions by keyboard shortcut
+   563029 - Closing maximized image doesn't restore document window size
+   585488 - Perspective transformation on a layer with a mask causes crash
+   586008 - GIMP crashes when right-click canceling a drawing action initiated
+            outside layer boundaries
+   584345 - when printing, the number of copies should be reset to 1
+   557061 - Alpha to Logo
+   472644 - Rotate with clipping crops the whole layer
+   577575 - transform tool fills underlying extracted area wrongly
+   555738 - Image display is wrong after undoing canvas size
+   577024 - help-browser plugin crashes when used with webkit 1.1.3
+   555025 - Action GEGL box widgets weirdness
+
+  * Updated and new translations:
+
+   Czech (cs)
+   Danish (da)
+   German (de)
+   Spanish (es)
+   Basque (eu)
+   Finnish (fi)
+   Hungarian (hu)
+   Italian (it)
+   Gujarati (gu)
+   Japanese (ja)
+   Kannada (kn)
+   Marathi (mr)
+   Norwegian bokm?l (nb)
+   Oriya (or)
+   Portuguese (pt)
+   Romanian (ro)
+   Sinhala (si)
+   Swedish (sv)
+   Simplified Chinese (zh_CN)
+   Traditional Chinese - Hong Kong (zh_HK)
+   Traditional Chinese - Taiwan (zh_TW)
+
+- remove obsolete gegl-babl-versions-check, help-browser-webkit patches
+- comment/explain patches
+
 * Fri Jul 24 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-8
 - rebuild with chrpath >= 0.13-5 (#513419)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	18 Mar 2009 10:16:51 -0000	1.51
+++ sources	14 Aug 2009 09:58:51 -0000	1.52
@@ -1 +1 @@
-23d880dd09cd62c936ed04666a53f8e4  gimp-2.6.6.tar.bz2
+77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2


--- gimp-2.6.6-gegl-babl-versions-check.patch DELETED ---


--- gimp-2.6.6-help-browser-webkit.patch DELETED ---



From hadess at fedoraproject.org  Fri Aug 14 10:13:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 10:13:47 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.30,
	1.31 gnome-settings-daemon.spec, 1.114, 1.115 sources, 1.31, 1.32
Message-ID: <20090814101347.7D86011C00D0@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-serv25210

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-1
- Update to 2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	28 Jul 2009 05:03:25 -0000	1.30
+++ .cvsignore	14 Aug 2009 10:13:47 -0000	1.31
@@ -1 +1 @@
-gnome-settings-daemon-2.27.5.tar.bz2
+gnome-settings-daemon-2.27.90.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- gnome-settings-daemon.spec	28 Jul 2009 05:03:25 -0000	1.114
+++ gnome-settings-daemon.spec	14 Aug 2009 10:13:47 -0000	1.115
@@ -1,5 +1,5 @@
 Name:		gnome-settings-daemon
-Version:	2.27.5
+Version:	2.27.90
 Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
@@ -170,6 +170,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	28 Jul 2009 05:03:25 -0000	1.31
+++ sources	14 Aug 2009 10:13:47 -0000	1.32
@@ -1 +1 @@
-bdb36927b3060b66b88fe5a0f132e8ae  gnome-settings-daemon-2.27.5.tar.bz2
+806a8c063c81a63b650ec2ae9d645c90  gnome-settings-daemon-2.27.90.tar.bz2



From nphilipp at fedoraproject.org  Fri Aug 14 10:15:12 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 14 Aug 2009 10:15:12 +0000 (UTC)
Subject: rpms/gimp/F-11 .cvsignore, 1.51, 1.52 gimp.spec, 1.192,
	1.193 sources, 
	1.51, 1.52 gimp-2.6.6-gegl-babl-versions-check.patch, 1.1,
	NONE gimp-2.6.6-help-browser-webkit.patch, 1.2, NONE
Message-ID: <20090814101512.095B611C00D0@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25620

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.6-gegl-babl-versions-check.patch 
	gimp-2.6.6-help-browser-webkit.patch 
Log Message:
comment/explain patches
version 2.6.7
remove obsolete gegl-babl-versions-check, help-browser-webkit patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	18 Mar 2009 10:16:51 -0000	1.51
+++ .cvsignore	14 Aug 2009 10:15:11 -0000	1.52
@@ -1 +1 @@
-gimp-2.6.6.tar.bz2
+gimp-2.6.7.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/gimp.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- gimp.spec	29 Jun 2009 11:38:51 -0000	1.192
+++ gimp.spec	14 Aug 2009 10:15:11 -0000	1.193
@@ -30,8 +30,8 @@
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.6
-Release:        6%{?dist}
+Version:        2.6.7
+Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -44,7 +44,7 @@ URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
-BuildRequires:  chrpath
+BuildRequires:  chrpath >= 0.13-5
 %if %{with aalib}
 BuildRequires:  aalib-devel
 %endif
@@ -120,11 +120,14 @@ Provides:       gimp-%{_arch} = %{?epoch
 
 Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
+# distro specific: use xdg-open instead of firefox as web browser
 Patch0:         gimp-2.6.2-xdg-open.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=559081
+# "JPEG Save dialog preview should adjust size units"
 Patch1:         gimp-2.6.2-jpeg-units.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556896
+# "Dialogs don't get minimized with single image window"
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
-Patch3:         gimp-2.6.6-gegl-babl-versions-check.patch
-Patch4:         gimp-2.6.6-help-browser-webkit.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -206,8 +209,6 @@ EOF
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .gegl-babl-versions-check
-%patch4 -p1 -b .help-browser-webkit
 
 %build
 # if [ ! -f configure ]; then
@@ -498,6 +499,86 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Aug 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-1
+- version 2.6.7
+
+  Overview of Changes from GIMP 2.6.6 to GIMP 2.6.7
+  =================================================
+
+  * Bugs fixed:
+
+   591017 - Tablet pan is not working as fast as it should
+   577581 - Crashes when using any colors tool/function on Windows
+   589667 - GIMP crashes when clicking GEGL Operation on Windows
+   569833 - file-jpeg-save erroneous with small quality values
+   590638 - Changing palettes from list to grid view loses "locked to dock"
+            status
+   589674 - "Send by Email" does not update "Filename"
+   589674 - "Send by Email" does not update "Filename"
+   586851 - Transparent BMP files fail to load
+   589205 - help-browser uses deprecated (and sometimes broken) webkit call
+   582821 - 'Sphere Designer' does not reset correctly...
+   570353 - first time open of .svg file ignores the requested units
+   555777 - Export to MNG animation fails
+   577301 - Dithering with transparency is broken for "positioned" method
+   493778 - metadata plug-in crashes on some images
+   567466 - PNG comment not found if more than 1 tEXt chunks
+   585665 - Exporting to PSD with a blank text layer creates a corrupt file
+   586316 - Levels tool does not adjust output levels correctly if input
+            levels are changed
+   569661 - Import from PDF throws errors when entering resolution in
+            pixels per millimetre
+   567262 - Black pixels appear in "Spread" filter preview
+   554658 - Path Dialog: Path preview pics not to see constantly
+   167604 - gimp_gradient_get_color_at() may return out-of-bounds values
+   567393 - Rectangle select tool size shrinks to 0 if size is larger than
+            the image and the up or down arrow is pressed
+   587543 - crash when invoking certain actions by keyboard shortcut
+   563029 - Closing maximized image doesn't restore document window size
+   585488 - Perspective transformation on a layer with a mask causes crash
+   586008 - GIMP crashes when right-click canceling a drawing action initiated
+            outside layer boundaries
+   584345 - when printing, the number of copies should be reset to 1
+   557061 - Alpha to Logo
+   472644 - Rotate with clipping crops the whole layer
+   577575 - transform tool fills underlying extracted area wrongly
+   555738 - Image display is wrong after undoing canvas size
+   577024 - help-browser plugin crashes when used with webkit 1.1.3
+   555025 - Action GEGL box widgets weirdness
+
+  * Updated and new translations:
+
+   Czech (cs)
+   Danish (da)
+   German (de)
+   Spanish (es)
+   Basque (eu)
+   Finnish (fi)
+   Hungarian (hu)
+   Italian (it)
+   Gujarati (gu)
+   Japanese (ja)
+   Kannada (kn)
+   Marathi (mr)
+   Norwegian bokm?l (nb)
+   Oriya (or)
+   Portuguese (pt)
+   Romanian (ro)
+   Sinhala (si)
+   Swedish (sv)
+   Simplified Chinese (zh_CN)
+   Traditional Chinese - Hong Kong (zh_HK)
+   Traditional Chinese - Taiwan (zh_TW)
+
+- remove obsolete gegl-babl-versions-check, help-browser-webkit patches
+- comment/explain patches
+
+* Fri Jul 24 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-8
+- rebuild with chrpath >= 0.13-5 (#513419)
+
+* Thu Jul 16 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-7
+- rebuild against gegl-0.1 (#510209)
+
 * Mon Jun 29 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-6
 - really fix help browser crash with new WebKit versions (#508301)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	18 Mar 2009 10:16:51 -0000	1.51
+++ sources	14 Aug 2009 10:15:11 -0000	1.52
@@ -1 +1 @@
-23d880dd09cd62c936ed04666a53f8e4  gimp-2.6.6.tar.bz2
+77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2


--- gimp-2.6.6-gegl-babl-versions-check.patch DELETED ---


--- gimp-2.6.6-help-browser-webkit.patch DELETED ---



From nphilipp at fedoraproject.org  Fri Aug 14 10:20:10 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 14 Aug 2009 10:20:10 +0000 (UTC)
Subject: rpms/gimp/F-10 gimp-2.6.6-minimize-dialogs.patch, NONE,
	1.1 .cvsignore, 
	1.51, 1.52 gimp.spec, 1.182, 1.183 sources, 1.51, 1.52
Message-ID: <20090814102010.D460111C043D@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26516

Modified Files:
	.cvsignore gimp.spec sources 
Added Files:
	gimp-2.6.6-minimize-dialogs.patch 
Log Message:
comment/explain patches
version 2.6.7
remove rpaths from binaries (#495670)
minimize dialogs with single image window (#492796, backported from trunk, original patch by Sven Neumann)


gimp-2.6.6-minimize-dialogs.patch:
 display/gimpdisplay-foreach.c |   29 +++++++++
 display/gimpdisplay-foreach.h |    2 
 display/gimpdisplayshell.c    |   16 ++++-
 widgets/gimpdialogfactory.c   |   61 ++++++++++++++++---
 widgets/gimpdialogfactory.h   |  129 +++++++++++++++++++++---------------------
 5 files changed, 164 insertions(+), 73 deletions(-)

--- NEW FILE gimp-2.6.6-minimize-dialogs.patch ---
diff -up gimp-2.6.6/app/display/gimpdisplay-foreach.c.minimize-dialogs gimp-2.6.6/app/display/gimpdisplay-foreach.c
--- gimp-2.6.6/app/display/gimpdisplay-foreach.c.minimize-dialogs	2008-11-20 23:43:04.000000000 +0100
+++ gimp-2.6.6/app/display/gimpdisplay-foreach.c	2009-03-30 14:24:05.145595522 +0200
@@ -227,6 +227,35 @@ gimp_displays_reconnect (Gimp      *gimp
   g_list_free (contexts);
 }
 
+gint
+gimp_displays_get_num_visible (Gimp *gimp)
+{
+  GList *list;
+  gint   visible = 0;
+
+  g_return_val_if_fail (GIMP_IS_GIMP (gimp), 0);
+
+  for (list = GIMP_LIST (gimp->displays)->list;
+       list;
+       list = g_list_next (list))
+    {
+      GimpDisplay *display = list->data;
+
+      if (GTK_WIDGET_DRAWABLE (display->shell))
+        {
+          GdkWindowState state = gdk_window_get_state (display->shell->window);
+
+          if ((state & (GDK_WINDOW_STATE_WITHDRAWN |
+                        GDK_WINDOW_STATE_ICONIFIED)) == 0)
+            {
+              visible++;
+            }
+        }
+    }
+
+  return visible;
+}
+
 void
 gimp_displays_set_busy (Gimp *gimp)
 {
diff -up gimp-2.6.6/app/display/gimpdisplay-foreach.h.minimize-dialogs gimp-2.6.6/app/display/gimpdisplay-foreach.h
--- gimp-2.6.6/app/display/gimpdisplay-foreach.h.minimize-dialogs	2008-11-20 23:43:04.000000000 +0100
+++ gimp-2.6.6/app/display/gimpdisplay-foreach.h	2009-03-30 14:24:05.146606054 +0200
@@ -28,6 +28,8 @@ void            gimp_displays_reconnect 
                                                 GimpImage *old,
                                                 GimpImage *new);
 
+gint            gimp_displays_get_num_visible  (Gimp      *gimp);
+
 void            gimp_displays_set_busy         (Gimp      *gimp);
 void            gimp_displays_unset_busy       (Gimp      *gimp);
 
diff -up gimp-2.6.6/app/display/gimpdisplayshell.c.minimize-dialogs gimp-2.6.6/app/display/gimpdisplayshell.c
--- gimp-2.6.6/app/display/gimpdisplayshell.c.minimize-dialogs	2009-03-15 21:57:09.000000000 +0100
+++ gimp-2.6.6/app/display/gimpdisplayshell.c	2009-03-30 14:24:05.147606111 +0200
@@ -59,6 +59,7 @@
 
 #include "gimpcanvas.h"
 #include "gimpdisplay.h"
+#include "gimpdisplay-foreach.h"
 #include "gimpdisplayoptions.h"
 #include "gimpdisplayshell.h"
 #include "gimpdisplayshell-appearance.h"
@@ -615,12 +616,12 @@ gimp_display_shell_window_state_event (G
                                        GdkEventWindowState *event)
 {
   GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
+  Gimp             *gimp  = shell->display->gimp;
 
   shell->window_state = event->new_window_state;
 
   if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
     {
-      Gimp            *gimp = shell->display->gimp;
       GimpActionGroup *group;
       gboolean         fullscreen;
 
@@ -644,6 +645,19 @@ gimp_display_shell_window_state_event (G
 
   if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED)
     {
+      gboolean iconified = (event->new_window_state &
+                            GDK_WINDOW_STATE_ICONIFIED) != 0;
+
+      if (iconified)
+        {
+          if (gimp_displays_get_num_visible (gimp) == 0)
+            gimp_dialog_factories_hide_with_display ();
+        }
+      else
+        {
+          gimp_dialog_factories_show_with_display ();
+        }
+
       gimp_display_shell_progress_window_state_changed (shell);
     }
 
diff -up gimp-2.6.6/app/widgets/gimpdialogfactory.c.minimize-dialogs gimp-2.6.6/app/widgets/gimpdialogfactory.c
--- gimp-2.6.6/app/widgets/gimpdialogfactory.c.minimize-dialogs	2008-11-20 23:43:05.000000000 +0100
+++ gimp-2.6.6/app/widgets/gimpdialogfactory.c	2009-03-30 14:24:05.148606028 +0200
@@ -45,6 +45,13 @@
 #include "gimp-log.h"
 
 
+typedef enum
+{
+  GIMP_DIALOGS_SHOWN,
+  GIMP_DIALOGS_HIDDEN_EXPLICITLY,  /* user used the Tab key to hide dialogs */
+  GIMP_DIALOGS_HIDDEN_WITH_DISPLAY /* dialogs are hidden with the display   */
+} GimpDialogsState;
+
 enum
 {
   DOCK_ADDED,
@@ -103,7 +110,7 @@ G_DEFINE_TYPE (GimpDialogFactory, gimp_d
 
 static guint factory_signals[LAST_SIGNAL] = { 0 };
 
-static gboolean dialogs_shown = TRUE;  /* FIXME */
+static GimpDialogsState dialogs_state = GIMP_DIALOGS_SHOWN;
 
 
 static void
@@ -1079,7 +1086,7 @@ gimp_dialog_factory_hide_dialog (GtkWidg
 
   gtk_widget_hide (dialog);
 
-  if (! dialogs_shown)
+  if (dialogs_state != GIMP_DIALOGS_SHOWN)
     g_object_set_data (G_OBJECT (dialog), GIMP_DIALOG_VISIBILITY_KEY,
                        GINT_TO_POINTER (GIMP_DIALOG_VISIBILITY_INVISIBLE));
 }
@@ -1122,30 +1129,66 @@ gimp_dialog_factories_session_clear (voi
                         NULL);
 }
 
-void
-gimp_dialog_factories_toggle (void)
+static void
+gimp_dialog_factories_set_state (GimpDialogsState state)
 {
   GimpDialogFactoryClass *factory_class;
 
   factory_class = g_type_class_peek (GIMP_TYPE_DIALOG_FACTORY);
 
-  if (dialogs_shown)
+  dialogs_state = state;
+
+  if (state == GIMP_DIALOGS_SHOWN)
     {
-      dialogs_shown = FALSE;
       g_hash_table_foreach (factory_class->factories,
-                            (GHFunc) gimp_dialog_factories_hide_foreach,
+                            (GHFunc) gimp_dialog_factories_show_foreach,
                             NULL);
     }
   else
     {
-      dialogs_shown = TRUE;
       g_hash_table_foreach (factory_class->factories,
-                            (GHFunc) gimp_dialog_factories_show_foreach,
+                            (GHFunc) gimp_dialog_factories_hide_foreach,
                             NULL);
     }
 }
 
 void
+gimp_dialog_factories_show_with_display (void)
+{
+  if (dialogs_state == GIMP_DIALOGS_HIDDEN_WITH_DISPLAY)
+    {
+      gimp_dialog_factories_set_state (GIMP_DIALOGS_SHOWN);
+    }
+}
+
+void
+gimp_dialog_factories_hide_with_display (void)
+{
+  if (dialogs_state == GIMP_DIALOGS_SHOWN)
+    {
+      gimp_dialog_factories_set_state (GIMP_DIALOGS_HIDDEN_WITH_DISPLAY);
+    }
+}
+
+void
+gimp_dialog_factories_toggle (void)
+{
+  switch (dialogs_state)
+    {
+    case GIMP_DIALOGS_SHOWN:
+      gimp_dialog_factories_set_state (GIMP_DIALOGS_HIDDEN_EXPLICITLY);
+      break;
+
+    case GIMP_DIALOGS_HIDDEN_EXPLICITLY:
+      gimp_dialog_factories_set_state (GIMP_DIALOGS_SHOWN);
+      break;
+
+    case GIMP_DIALOGS_HIDDEN_WITH_DISPLAY:
+      break;
+    }
+}
+
+void
 gimp_dialog_factories_set_busy (void)
 {
   GimpDialogFactoryClass *factory_class;
diff -up gimp-2.6.6/app/widgets/gimpdialogfactory.h.minimize-dialogs gimp-2.6.6/app/widgets/gimpdialogfactory.h
--- gimp-2.6.6/app/widgets/gimpdialogfactory.h.minimize-dialogs	2008-11-20 23:43:05.000000000 +0100
+++ gimp-2.6.6/app/widgets/gimpdialogfactory.h	2009-03-30 14:24:05.149601894 +0200
@@ -103,74 +103,77 @@ struct _GimpDialogFactoryClass
 };
 
 
-GType               gimp_dialog_factory_get_type  (void) G_GNUC_CONST;
+GType               gimp_dialog_factory_get_type    (void) G_GNUC_CONST;
 
-GimpDialogFactory * gimp_dialog_factory_new       (const gchar       *name,
-                                                   GimpContext       *context,
-                                                   GimpMenuFactory   *menu_factory,
-                                                   GimpDialogNewFunc  new_dock_func,
-                                                   gboolean           toggle_visibility);
-
-GimpDialogFactory * gimp_dialog_factory_from_name (const gchar       *name);
-
-void        gimp_dialog_factory_set_constructor   (GimpDialogFactory *factory,
-                                                   GimpDialogConstructor constructor);
-
-void        gimp_dialog_factory_register_entry    (GimpDialogFactory *factory,
-                                                   const gchar       *identifier,
-                                                   const gchar       *name,
-                                                   const gchar       *blurb,
-                                                   const gchar       *stock_id,
-                                                   const gchar       *help_id,
-                                                   GimpDialogNewFunc  new_func,
-                                                   gint               view_size,
-                                                   gboolean           singleton,
-                                                   gboolean           session_managed,
-                                                   gboolean           remember_size,
-                                                   gboolean           remember_if_open);
+GimpDialogFactory * gimp_dialog_factory_new         (const gchar       *name,
+                                                     GimpContext       *context,
+                                                     GimpMenuFactory   *menu_factory,
+                                                     GimpDialogNewFunc  new_dock_func,
+                                                     gboolean           toggle_visibility);
+
+GimpDialogFactory * gimp_dialog_factory_from_name   (const gchar       *name);
+
+void        gimp_dialog_factory_set_constructor     (GimpDialogFactory *factory,
+                                                     GimpDialogConstructor constructor);
+
+void        gimp_dialog_factory_register_entry      (GimpDialogFactory *factory,
+                                                     const gchar       *identifier,
+                                                     const gchar       *name,
+                                                     const gchar       *blurb,
+                                                     const gchar       *stock_id,
+                                                     const gchar       *help_id,
+                                                     GimpDialogNewFunc  new_func,
+                                                     gint               view_size,
+                                                     gboolean           singleton,
+                                                     gboolean           session_managed,
+                                                     gboolean           remember_size,
+                                                     gboolean           remember_if_open);
 GimpDialogFactoryEntry * gimp_dialog_factory_find_entry
-                                                  (GimpDialogFactory *factory,
-                                                   const gchar       *identifier);
+                                                    (GimpDialogFactory *factory,
+                                                     const gchar       *identifier);
 
 GimpSessionInfo * gimp_dialog_factory_find_session_info
-                                                  (GimpDialogFactory *factory,
-                                                   const gchar       *identifier);
+                                                    (GimpDialogFactory *factory,
+                                                     const gchar       *identifier);
 
-GtkWidget * gimp_dialog_factory_dialog_new        (GimpDialogFactory *factory,
-                                                   GdkScreen         *screen,
-                                                   const gchar       *identifier,
-                                                   gint               view_size,
-                                                   gboolean           present);
-GtkWidget * gimp_dialog_factory_dialog_raise      (GimpDialogFactory *factory,
-                                                   GdkScreen         *screen,
-                                                   const gchar       *identifiers,
-                                                   gint               view_size);
-GtkWidget * gimp_dialog_factory_dockable_new      (GimpDialogFactory *factory,
-                                                   GimpDock          *dock,
-                                                   const gchar       *identifier,
-                                                   gint               view_size);
-GtkWidget * gimp_dialog_factory_dock_new          (GimpDialogFactory *factory,
-                                                   GdkScreen         *screen);
-
-void        gimp_dialog_factory_add_dialog        (GimpDialogFactory *factory,
-                                                   GtkWidget         *dialog);
-void        gimp_dialog_factory_add_foreign       (GimpDialogFactory *factory,
-                                                   const gchar       *identifier,
-                                                   GtkWidget         *dialog);
-void        gimp_dialog_factory_remove_dialog     (GimpDialogFactory *factory,
-                                                   GtkWidget         *dialog);
-
-void        gimp_dialog_factory_show_toolbox      (GimpDialogFactory *toolbox_factory);
-
-void        gimp_dialog_factory_hide_dialog       (GtkWidget         *dialog);
-
-void        gimp_dialog_factories_session_save    (GimpConfigWriter  *writer);
-void        gimp_dialog_factories_session_restore (void);
-void        gimp_dialog_factories_session_clear   (void);
-
-void        gimp_dialog_factories_toggle          (void);
-void        gimp_dialog_factories_set_busy        (void);
-void        gimp_dialog_factories_unset_busy      (void);
+GtkWidget * gimp_dialog_factory_dialog_new          (GimpDialogFactory *factory,
+                                                     GdkScreen         *screen,
+                                                     const gchar       *identifier,
+                                                     gint               view_size,
+                                                     gboolean           present);
+GtkWidget * gimp_dialog_factory_dialog_raise        (GimpDialogFactory *factory,
+                                                     GdkScreen         *screen,
+                                                     const gchar       *identifiers,
+                                                     gint               view_size);
+GtkWidget * gimp_dialog_factory_dockable_new        (GimpDialogFactory *factory,
+                                                     GimpDock          *dock,
+                                                     const gchar       *identifier,
+                                                     gint               view_size);
+GtkWidget * gimp_dialog_factory_dock_new            (GimpDialogFactory *factory,
+                                                     GdkScreen         *screen);
+
+void        gimp_dialog_factory_add_dialog          (GimpDialogFactory *factory,
+                                                     GtkWidget         *dialog);
+void        gimp_dialog_factory_add_foreign         (GimpDialogFactory *factory,
+                                                     const gchar       *identifier,
+                                                     GtkWidget         *dialog);
+void        gimp_dialog_factory_remove_dialog       (GimpDialogFactory *factory,
+                                                     GtkWidget         *dialog);
+
+void        gimp_dialog_factory_show_toolbox        (GimpDialogFactory *toolbox_factory);
+
+void        gimp_dialog_factory_hide_dialog         (GtkWidget         *dialog);
+
+void        gimp_dialog_factories_session_save      (GimpConfigWriter  *writer);
+void        gimp_dialog_factories_session_restore   (void);
+void        gimp_dialog_factories_session_clear     (void);
+
+void        gimp_dialog_factories_show_with_display (void);
+void        gimp_dialog_factories_hide_with_display (void);
+void        gimp_dialog_factories_toggle            (void);
+
+void        gimp_dialog_factories_set_busy          (void);
+void        gimp_dialog_factories_unset_busy        (void);
 
 GimpDialogFactory *
             gimp_dialog_factory_from_widget (GtkWidget               *dialog,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	18 Mar 2009 10:18:30 -0000	1.51
+++ .cvsignore	14 Aug 2009 10:20:10 -0000	1.52
@@ -1 +1 @@
-gimp-2.6.6.tar.bz2
+gimp-2.6.7.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gimp.spec	18 Mar 2009 10:18:30 -0000	1.182
+++ gimp.spec	14 Aug 2009 10:20:10 -0000	1.183
@@ -19,11 +19,18 @@
 %bcond_without gutenprint
 # convenience: install convenience symlinks
 %bcond_without convenience
+# aalib:       build with AAlib (ASCII art gfx library)
+%if 0%{?rhel} != 0
+# don't use aalib on RHEL
+%bcond_with aalib
+%else
+%bcond_without aalib
+%endif
 
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
-Version:        2.6.6
+Version:        2.6.7
 Release:        1%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
@@ -37,7 +44,10 @@ URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
+BuildRequires:  chrpath >= 0.13-5
+%if %{with aalib}
 BuildRequires:  aalib-devel
+%endif
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
 BuildRequires:  cairo-devel >= 1.4.10
@@ -70,7 +80,11 @@ BuildRequires:  poppler-devel >= 0.4.1
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5
+BuildRequires:  webkitgtk-devel >= 1.0.0
+%else
 BuildRequires:  WebKit-gtk-devel >= 1.0.0
+%endif
 %if %{with modular_x}
 BuildRequires:  libX11-devel
 BuildRequires:  libXmu-devel
@@ -106,8 +120,14 @@ Provides:       gimp-%{_arch} = %{?epoch
 
 Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
+# distro specific: use xdg-open instead of firefox as web browser
 Patch0:         gimp-2.6.2-xdg-open.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=559081
+# "JPEG Save dialog preview should adjust size units"
 Patch1:         gimp-2.6.2-jpeg-units.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556896
+# "Dialogs don't get minimized with single image window"
+Patch2:         gimp-2.6.6-minimize-dialogs.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -180,6 +200,7 @@ build the print plugin:                 
 prefer gutenprint over (external) gimp-print plugin:
                                           %{with gutenprint}
 %endif
+build ASCII art plugin                    %{with aalib}
 
 
 EOF
@@ -187,11 +208,13 @@ EOF
 %setup -q -n gimp-%{version}
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
+%patch2 -p1 -b .minimize-dialogs
 
 %build
-if [ ! -f configure ]; then
-  ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
-fi
+# if [ ! -f configure ]; then
+#   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
+# fi
+
 # Use PIC/PIE because gimp is likely to deal with files coming from untrusted
 # sources
 CFLAGS='-fPIC %optflags -fno-strict-aliasing'
@@ -225,7 +248,11 @@ LDFLAGS='-pie'
     --without-lcms \
 %endif
     --enable-gimp-console \
+%if %{with aalib}
     --with-aa \
+%else
+    --without-aa \
+%endif
 %ifos linux
     --with-linux-input \
 %endif
@@ -244,6 +271,9 @@ rm -rf %{buildroot}
 # makeinstall macro won't work here - libexec is overriden
 make DESTDIR=%{buildroot} install
 
+# remove rpaths
+find %buildroot -type f -print0 | xargs -0 -L 20 chrpath --delete --keepgoing 2>/dev/null || :
+
 %ifos linux
 # remove .la files
 find %buildroot -name \*.la -exec %__rm -f {} \;
@@ -469,6 +499,104 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Fri Aug 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-1
+- version 2.6.7
+
+  Overview of Changes from GIMP 2.6.6 to GIMP 2.6.7
+  =================================================
+
+  * Bugs fixed:
+
+   591017 - Tablet pan is not working as fast as it should
+   577581 - Crashes when using any colors tool/function on Windows
+   589667 - GIMP crashes when clicking GEGL Operation on Windows
+   569833 - file-jpeg-save erroneous with small quality values
+   590638 - Changing palettes from list to grid view loses "locked to dock"
+            status
+   589674 - "Send by Email" does not update "Filename"
+   589674 - "Send by Email" does not update "Filename"
+   586851 - Transparent BMP files fail to load
+   589205 - help-browser uses deprecated (and sometimes broken) webkit call
+   582821 - 'Sphere Designer' does not reset correctly...
+   570353 - first time open of .svg file ignores the requested units
+   555777 - Export to MNG animation fails
+   577301 - Dithering with transparency is broken for "positioned" method
+   493778 - metadata plug-in crashes on some images
+   567466 - PNG comment not found if more than 1 tEXt chunks
+   585665 - Exporting to PSD with a blank text layer creates a corrupt file
+   586316 - Levels tool does not adjust output levels correctly if input
+            levels are changed
+   569661 - Import from PDF throws errors when entering resolution in
+            pixels per millimetre
+   567262 - Black pixels appear in "Spread" filter preview
+   554658 - Path Dialog: Path preview pics not to see constantly
+   167604 - gimp_gradient_get_color_at() may return out-of-bounds values
+   567393 - Rectangle select tool size shrinks to 0 if size is larger than
+            the image and the up or down arrow is pressed
+   587543 - crash when invoking certain actions by keyboard shortcut
+   563029 - Closing maximized image doesn't restore document window size
+   585488 - Perspective transformation on a layer with a mask causes crash
+   586008 - GIMP crashes when right-click canceling a drawing action initiated
+            outside layer boundaries
+   584345 - when printing, the number of copies should be reset to 1
+   557061 - Alpha to Logo
+   472644 - Rotate with clipping crops the whole layer
+   577575 - transform tool fills underlying extracted area wrongly
+   555738 - Image display is wrong after undoing canvas size
+   577024 - help-browser plugin crashes when used with webkit 1.1.3
+   555025 - Action GEGL box widgets weirdness
+
+  * Updated and new translations:
+
+   Czech (cs)
+   Danish (da)
+   German (de)
+   Spanish (es)
+   Basque (eu)
+   Finnish (fi)
+   Hungarian (hu)
+   Italian (it)
+   Gujarati (gu)
+   Japanese (ja)
+   Kannada (kn)
+   Marathi (mr)
+   Norwegian bokm?l (nb)
+   Oriya (or)
+   Portuguese (pt)
+   Romanian (ro)
+   Sinhala (si)
+   Swedish (sv)
+   Simplified Chinese (zh_CN)
+   Traditional Chinese - Hong Kong (zh_HK)
+   Traditional Chinese - Taiwan (zh_TW)
+
+- remove obsolete gegl-babl-versions-check, help-browser-webkit patches
+- comment/explain patches
+
+* Fri Jul 24 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-8
+- rebuild with chrpath >= 0.13-5 (#513419)
+
+* Thu Jul 16 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-7
+- rebuild against gegl-0.1 (#510209)
+
+* Mon Jun 29 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-6
+- really fix help browser crash with new WebKit versions (#508301)
+
+* Sat Jun 27 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-5
+- fix help browser crash with new WebKit versions (#508301)
+- BR: webkitgtk-devel from F-11 on
+
+* Fri Jun 05 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-4
+- don't build against aalib on RHEL
+- use backported patch to correctly check gegl/babl versions
+
+* Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-3
+- remove rpaths from binaries (#495670)
+
+* Mon Mar 30 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-2
+- minimize dialogs with single image window (#492796, backported from trunk,
+  original patch by Sven Neumann)
+
 * Wed Mar 18 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-1
 - version 2.6.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	18 Mar 2009 10:18:30 -0000	1.51
+++ sources	14 Aug 2009 10:20:10 -0000	1.52
@@ -1 +1 @@
-23d880dd09cd62c936ed04666a53f8e4  gimp-2.6.6.tar.bz2
+77ed86a8de9b48587efb24f2b115ad38  gimp-2.6.7.tar.bz2



From paragn at fedoraproject.org  Fri Aug 14 11:13:43 2009
From: paragn at fedoraproject.org (paragn)
Date: Fri, 14 Aug 2009 11:13:43 +0000 (UTC)
Subject: rpms/libXres/devel libXres.spec,1.25,1.26
Message-ID: <20090814111343.7F34111C00D0@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXres/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7428

Modified Files:
	libXres.spec 
Log Message:
- By mistake commented BR:pkgconfig. Enable it again.



Index: libXres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libXres.spec	14 Aug 2009 06:52:33 -0000	1.25
+++ libXres.spec	14 Aug 2009 11:13:43 -0000	1.26
@@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-#BuildRequires: pkgconfig
+BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 



From tmraz at fedoraproject.org  Fri Aug 14 11:59:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 14 Aug 2009 11:59:04 +0000 (UTC)
Subject: rpms/gnutls/F-11 gnutls-2.6.6-cve-2009-2730.patch, NONE,
	1.1 gnutls.spec, 1.43, 1.44
Message-ID: <20090814115904.1B24D11C00D0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19358

Modified Files:
	gnutls.spec 
Added Files:
	gnutls-2.6.6-cve-2009-2730.patch 
Log Message:
* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.6.6-2
- fix CVE-2009-2730 - handling of NUL chars in certificate
  CNs and SANs


gnutls-2.6.6-cve-2009-2730.patch:
 gnutls_str.c            |   24 +++++++++++++++---------
 gnutls_str.h            |    2 +-
 openpgp/pgp.c           |    2 +-
 x509/common.c           |   38 ++++++++++++++++++++++----------------
 x509/output.c           |   31 +++++++++++++++++++++++++++++++
 x509/rfc2818_hostname.c |    6 +++---
 6 files changed, 73 insertions(+), 30 deletions(-)

--- NEW FILE gnutls-2.6.6-cve-2009-2730.patch ---
diff -up gnutls-2.6.6/lib/gnutls_str.c.decoding gnutls-2.6.6/lib/gnutls_str.c
--- gnutls-2.6.6/lib/gnutls_str.c.decoding	2009-04-24 00:01:23.000000000 +0200
+++ gnutls-2.6.6/lib/gnutls_str.c	2009-08-14 13:55:31.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2008  Free Software Foundation
+ * Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009  Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -330,17 +330,22 @@ _gnutls_hex2bin (const opaque * hex_data
 
 /* compare hostname against certificate, taking account of wildcards
  * return 1 on success or 0 on error
+ *
+ * note: certnamesize is required as X509 certs can contain embedded NULs in
+ * the strings such as CN or subjectAltName
  */
 int
-_gnutls_hostname_compare (const char *certname, const char *hostname)
+_gnutls_hostname_compare (const char *certname,
+			  size_t certnamesize,
+			  const char *hostname)
 {
   /* find the first different character */
   for (; *certname && *hostname && toupper (*certname) == toupper (*hostname);
-       certname++, hostname++)
+       certname++, hostname++, certnamesize--)
     ;
 
   /* the strings are the same */
-  if (strlen (certname) == 0 && strlen (hostname) == 0)
+  if (certnamesize == 0 && *hostname == '\0')
     return 1;
 
   if (*certname == '*')
@@ -348,15 +353,16 @@ _gnutls_hostname_compare (const char *ce
       /* a wildcard certificate */
 
       certname++;
+      certnamesize--;
 
       while (1)
 	{
 	  /* Use a recursive call to allow multiple wildcards */
-	  if (_gnutls_hostname_compare (certname, hostname))
-	    {
-	      return 1;
-	    }
-	  /* wildcards are only allowed to match a single domain component or component fragment */
+	  if (_gnutls_hostname_compare (certname, certnamesize, hostname))
+	    return 1;
+
+	  /* wildcards are only allowed to match a single domain
+	     component or component fragment */
 	  if (*hostname == '\0' || *hostname == '.')
 	    break;
 	  hostname++;
diff -up gnutls-2.6.6/lib/gnutls_str.h.decoding gnutls-2.6.6/lib/gnutls_str.h
--- gnutls-2.6.6/lib/gnutls_str.h.decoding	2009-04-24 00:01:23.000000000 +0200
+++ gnutls-2.6.6/lib/gnutls_str.h	2009-08-14 13:54:25.000000000 +0200
@@ -68,7 +68,7 @@ char *_gnutls_bin2hex (const void *old, 
 int _gnutls_hex2bin (const opaque * hex_data, int hex_size, opaque * bin_data,
 		     size_t * bin_size);
 
-int _gnutls_hostname_compare (const char *certname, const char *hostname);
+int _gnutls_hostname_compare (const char *certname, size_t certnamesize, const char *hostname);
 #define MAX_CN 256
 
 #endif
diff -up gnutls-2.6.6/lib/openpgp/pgp.c.decoding gnutls-2.6.6/lib/openpgp/pgp.c
--- gnutls-2.6.6/lib/openpgp/pgp.c.decoding	2009-04-18 13:09:50.000000000 +0200
+++ gnutls-2.6.6/lib/openpgp/pgp.c	2009-08-14 13:54:25.000000000 +0200
@@ -570,7 +570,7 @@ gnutls_openpgp_crt_check_hostname (gnutl
 
       if (ret == 0)
 	{
-	  if (_gnutls_hostname_compare (dnsname, hostname))
+	  if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	    return 1;
 	}
     }
diff -up gnutls-2.6.6/lib/x509/common.c.decoding gnutls-2.6.6/lib/x509/common.c
--- gnutls-2.6.6/lib/x509/common.c.decoding	2009-04-24 00:01:23.000000000 +0200
+++ gnutls-2.6.6/lib/x509/common.c	2009-08-14 13:48:53.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -242,6 +242,10 @@ _gnutls_x509_oid_data2string (const char
     {
       str[len] = 0;
 
+      /* Refuse to deal with strings containing NULs. */
+      if (strlen (str) != len)
+	return GNUTLS_E_ASN1_DER_ERROR;
+
       if (res)
 	_gnutls_str_cpy (res, *res_size, str);
       *res_size = len;
@@ -291,25 +295,27 @@ _gnutls_x509_oid_data2string (const char
 	    non_printable = 0;
 	}
 
-      if (res)
+      if (non_printable == 0)
 	{
-	  if (non_printable == 0)
-	    {
-	      str[len] = 0;
-	      _gnutls_str_cpy (res, *res_size, str);
-	      *res_size = len;
-	    }
-	  else
+	  str[len] = 0;
+
+	  /* Refuse to deal with strings containing NULs. */
+	  if (strlen (str) != len)
+	    return GNUTLS_E_ASN1_DER_ERROR;
+
+	  if (res)
+	    _gnutls_str_cpy (res, *res_size, str);
+	  *res_size = len;
+	}
+      else
+	{
+	  result = _gnutls_x509_data2hex (str, len, res, res_size);
+	  if (result < 0)
 	    {
-	      result = _gnutls_x509_data2hex (str, len, res, res_size);
-	      if (result < 0)
-		{
-		  gnutls_assert ();
-		  return result;
-		}
+	      gnutls_assert ();
+	      return result;
 	    }
 	}
-
     }
 
   return 0;
diff -up gnutls-2.6.6/lib/x509/output.c.decoding gnutls-2.6.6/lib/x509/output.c
--- gnutls-2.6.6/lib/x509/output.c.decoding	2009-04-24 00:01:23.000000000 +0200
+++ gnutls-2.6.6/lib/x509/output.c	2009-08-14 13:53:19.000000000 +0200
@@ -319,6 +319,17 @@ print_crldist (gnutls_string * str, gnut
 	  return;
 	}
 
+      if ((err == GNUTLS_SAN_DNSNAME
+	   || err == GNUTLS_SAN_RFC822NAME
+	   || err == GNUTLS_SAN_URI) &&
+	  strlen (buffer) != size)
+	{
+	  adds (str, _("warning: distributionPoint contains an embedded NUL, "
+		       "replacing with '!'\n"));
+	  while (strlen (buffer) < size)
+	    buffer[strlen (buffer)] = '!';
+	}
+
       switch (err)
 	{
 	case GNUTLS_SAN_DNSNAME:
@@ -476,6 +487,17 @@ print_san (gnutls_string * str, gnutls_x
 	  return;
 	}
 
+      if ((err == GNUTLS_SAN_DNSNAME
+	   || err == GNUTLS_SAN_RFC822NAME
+	   || err == GNUTLS_SAN_URI) &&
+	  strlen (buffer) != size)
+	{
+	  adds (str, _("warning: SAN contains an embedded NUL, "
+		       "replacing with '!'\n"));
+	  while (strlen (buffer) < size)
+	    buffer[strlen (buffer)] = '!';
+	}
+
       switch (err)
 	{
 	case GNUTLS_SAN_DNSNAME:
@@ -534,7 +556,16 @@ print_san (gnutls_string * str, gnutls_x
 	      }
 
 	    if (err == GNUTLS_SAN_OTHERNAME_XMPP)
+	      {
+		if (strlen (buffer) != size)
+		  {
+		    adds (str, _("warning: SAN contains an embedded NUL, "
+				 "replacing with '!'\n"));
+		    while (strlen (buffer) < size)
+		      buffer[strlen (buffer)] = '!';
+		  }
 	      addf (str, _("\t\t\tXMPP Address: %.*s\n"), size, buffer);
+	      }
 	    else
 	      {
 		addf (str, _("\t\t\totherName OID: %.*s\n"), oidsize, oid);
diff -up gnutls-2.6.6/lib/x509/rfc2818_hostname.c.decoding gnutls-2.6.6/lib/x509/rfc2818_hostname.c
--- gnutls-2.6.6/lib/x509/rfc2818_hostname.c.decoding	2009-04-18 13:09:50.000000000 +0200
+++ gnutls-2.6.6/lib/x509/rfc2818_hostname.c	2009-08-14 13:54:25.000000000 +0200
@@ -74,7 +74,7 @@ gnutls_x509_crt_check_hostname (gnutls_x
       if (ret == GNUTLS_SAN_DNSNAME)
 	{
 	  found_dnsname = 1;
-	  if (_gnutls_hostname_compare (dnsname, hostname))
+	  if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	    {
 	      return 1;
 	    }
@@ -84,7 +84,7 @@ gnutls_x509_crt_check_hostname (gnutls_x
 	  found_dnsname = 1;	/* RFC 2818 is unclear whether the CN
 				   should be compared for IP addresses
 				   too, but we won't do it.  */
-	  if (_gnutls_hostname_compare (dnsname, hostname))
+	  if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	    {
 	      return 1;
 	    }
@@ -104,7 +104,7 @@ gnutls_x509_crt_check_hostname (gnutls_x
 	  return 0;
 	}
 
-      if (_gnutls_hostname_compare (dnsname, hostname))
+      if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	{
 	  return 1;
 	}


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-11/gnutls.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gnutls.spec	4 May 2009 14:17:24 -0000	1.43
+++ gnutls.spec	14 Aug 2009 11:59:03 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 2.6.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -16,6 +16,7 @@ URL: http://www.gnutls.org/
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
 Patch1: gnutls-2.6.2-nosrp.patch
+Patch2: gnutls-2.6.6-cve-2009-2730.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -68,6 +69,7 @@ This package contains Guile bindings for
 %prep
 %setup -q
 %patch1 -p1 -b .nosrp
+%patch2 -p1 -b .decoding
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -149,6 +151,10 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.6.6-2
+- fix CVE-2009-2730 - handling of NUL chars in certificate
+  CNs and SANs
+
 * Mon May  4 2009 Tomas Mraz <tmraz at redhat.com> 2.6.6-1
 - upgrade to a new upstream version - security fixes
 



From tmraz at fedoraproject.org  Fri Aug 14 12:24:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 14 Aug 2009 12:24:52 +0000 (UTC)
Subject: rpms/gnutls/F-10 gnutls-2.4.2-cve-2009-2730.patch, NONE,
	1.1 gnutls.spec, 1.37, 1.38
Message-ID: <20090814122452.1416C11C00D0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25493

Modified Files:
	gnutls.spec 
Added Files:
	gnutls-2.4.2-cve-2009-2730.patch 
Log Message:
* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-4
- fix CVE-2009-2730 - handling of NUL chars in certificate
  CNs and SANs


gnutls-2.4.2-cve-2009-2730.patch:
 gnutls_str.c            |   45 ++++++++++++++++++++++++++-------------------
 gnutls_str.h            |    2 +-
 openpgp/pgp.c           |    2 +-
 x509/common.c           |   38 ++++++++++++++++++++++----------------
 x509/output.c           |   31 +++++++++++++++++++++++++++++++
 x509/rfc2818_hostname.c |   12 ++++++------
 6 files changed, 87 insertions(+), 43 deletions(-)

--- NEW FILE gnutls-2.4.2-cve-2009-2730.patch ---
diff -up gnutls-2.4.2/lib/gnutls_str.c.decoding gnutls-2.4.2/lib/gnutls_str.c
--- gnutls-2.4.2/lib/gnutls_str.c.decoding	2008-09-15 22:04:19.000000000 +0200
+++ gnutls-2.4.2/lib/gnutls_str.c	2009-08-14 14:21:11.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2008  Free Software Foundation
+ * Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009  Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -331,35 +331,42 @@ _gnutls_hex2bin (const opaque * hex_data
 
 /* compare hostname against certificate, taking account of wildcards
  * return 1 on success or 0 on error
+ *
+ * note: certnamesize is required as X509 certs can contain embedded NULs in
+ * the strings such as CN or subjectAltName
  */
 int
-_gnutls_hostname_compare (const char *certname, const char *hostname)
-{
-   /* find the first different character */
-  for (; *certname && *hostname && toupper(*certname) == toupper(*hostname); certname++, hostname++)
+_gnutls_hostname_compare (const char *certname,
+			  size_t certnamesize,
+			  const char *hostname)
+{
+  /* find the first different character */
+  for (; *certname && *hostname && toupper (*certname) == toupper (*hostname);
+       certname++, hostname++, certnamesize--)
     ;
- 
-   /* the strings are the same */
-  if (strlen (certname) == 0 && strlen (hostname) == 0)
+
+  /* the strings are the same */
+  if (certnamesize == 0 && *hostname == '\0')
     return 1;
-  
+
   if (*certname == '*')
     {
       /* a wildcard certificate */
 
       certname++;
-  
+      certnamesize--;
+
       while (1)
-       	{
+	{
 	  /* Use a recursive call to allow multiple wildcards */
-	  if (_gnutls_hostname_compare (certname, hostname))
- 	    {
- 	      return 1;
- 	    }
- 	  /* wildcards are only allowed to match a single domain component or component fragment */
- 	  if (*hostname == '\0' || *hostname == '.')
- 	    break;
- 	  hostname++;
+	  if (_gnutls_hostname_compare (certname, certnamesize, hostname))
+	    return 1;
+
+	  /* wildcards are only allowed to match a single domain
+	     component or component fragment */
+	  if (*hostname == '\0' || *hostname == '.')
+	    break;
+	  hostname++;
 	}
 
       return 0;
diff -up gnutls-2.4.2/lib/gnutls_str.h.decoding gnutls-2.4.2/lib/gnutls_str.h
--- gnutls-2.4.2/lib/gnutls_str.h.decoding	2008-09-15 22:04:19.000000000 +0200
+++ gnutls-2.4.2/lib/gnutls_str.h	2009-08-14 14:18:31.000000000 +0200
@@ -62,7 +62,7 @@ char *_gnutls_bin2hex (const void *old, 
 int _gnutls_hex2bin (const opaque * hex_data, int hex_size, opaque * bin_data,
 		     size_t * bin_size);
 
-int _gnutls_hostname_compare (const char *certname, const char *hostname);
+int _gnutls_hostname_compare (const char *certname, size_t certnamesize, const char *hostname);
 #define MAX_CN 256
 
 #endif
diff -up gnutls-2.4.2/lib/openpgp/pgp.c.decoding gnutls-2.4.2/lib/openpgp/pgp.c
--- gnutls-2.4.2/lib/openpgp/pgp.c.decoding	2008-09-15 22:04:19.000000000 +0200
+++ gnutls-2.4.2/lib/openpgp/pgp.c	2009-08-14 14:20:13.000000000 +0200
@@ -566,7 +566,7 @@ gnutls_openpgp_crt_check_hostname (gnutl
       
       if (ret == 0)
         {
-          if (_gnutls_hostname_compare (dnsname, hostname))
+          if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
             return 1;
         }
     }
diff -up gnutls-2.4.2/lib/x509/common.c.decoding gnutls-2.4.2/lib/x509/common.c
--- gnutls-2.4.2/lib/x509/common.c.decoding	2008-09-15 22:04:19.000000000 +0200
+++ gnutls-2.4.2/lib/x509/common.c	2009-08-14 14:18:31.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -241,6 +241,10 @@ _gnutls_x509_oid_data2string (const char
     {
       str[len] = 0;
 
+      /* Refuse to deal with strings containing NULs. */
+      if (strlen (str) != len)
+	return GNUTLS_E_ASN1_DER_ERROR;
+
       if (res)
 	_gnutls_str_cpy (res, *res_size, str);
       *res_size = len;
@@ -291,25 +295,27 @@ _gnutls_x509_oid_data2string (const char
 	    non_printable = 0;
 	}
 
-      if (res)
+      if (non_printable == 0)
 	{
-	  if (non_printable == 0)
-	    {
-	      str[len] = 0;
-	      _gnutls_str_cpy (res, *res_size, str);
-	      *res_size = len;
-	    }
-	  else
+	  str[len] = 0;
+
+	  /* Refuse to deal with strings containing NULs. */
+	  if (strlen (str) != len)
+	    return GNUTLS_E_ASN1_DER_ERROR;
+
+	  if (res)
+	    _gnutls_str_cpy (res, *res_size, str);
+	  *res_size = len;
+	}
+      else
+	{
+	  result = _gnutls_x509_data2hex (str, len, res, res_size);
+	  if (result < 0)
 	    {
-	      result = _gnutls_x509_data2hex (str, len, res, res_size);
-	      if (result < 0)
-		{
-		  gnutls_assert ();
-		  return result;
-		}
+	      gnutls_assert ();
+	      return result;
 	    }
 	}
-
     }
 
   return 0;
diff -up gnutls-2.4.2/lib/x509/output.c.decoding gnutls-2.4.2/lib/x509/output.c
--- gnutls-2.4.2/lib/x509/output.c.decoding	2008-09-15 22:04:19.000000000 +0200
+++ gnutls-2.4.2/lib/x509/output.c	2009-08-14 14:18:31.000000000 +0200
@@ -272,6 +272,17 @@ print_crldist (gnutls_string * str, gnut
 	  return;
 	}
 
+      if ((err == GNUTLS_SAN_DNSNAME
+	   || err == GNUTLS_SAN_RFC822NAME
+	   || err == GNUTLS_SAN_URI) &&
+	  strlen (buffer) != size)
+	{
+	  adds (str, _("warning: distributionPoint contains an embedded NUL, "
+		       "replacing with '!'\n"));
+	  while (strlen (buffer) < size)
+	    buffer[strlen (buffer)] = '!';
+	}
+
       switch (err)
 	{
 	case GNUTLS_SAN_DNSNAME:
@@ -423,6 +434,17 @@ print_san (gnutls_string * str, gnutls_x
 	  return;
 	}
 
+      if ((err == GNUTLS_SAN_DNSNAME
+	   || err == GNUTLS_SAN_RFC822NAME
+	   || err == GNUTLS_SAN_URI) &&
+	  strlen (buffer) != size)
+	{
+	  adds (str, _("warning: SAN contains an embedded NUL, "
+		       "replacing with '!'\n"));
+	  while (strlen (buffer) < size)
+	    buffer[strlen (buffer)] = '!';
+	}
+
       switch (err)
 	{
 	case GNUTLS_SAN_DNSNAME:
@@ -481,7 +503,16 @@ print_san (gnutls_string * str, gnutls_x
 	      }
 
 	    if (err == GNUTLS_SAN_OTHERNAME_XMPP)
+	      {
+		if (strlen (buffer) != size)
+		  {
+		    adds (str, _("warning: SAN contains an embedded NUL, "
+				 "replacing with '!'\n"));
+		    while (strlen (buffer) < size)
+		      buffer[strlen (buffer)] = '!';
+		  }
 	      addf (str, _("\t\t\tXMPP Address: %.*s\n"), size, buffer);
+	      }
 	    else
 	      {
 		addf (str, _("\t\t\totherName OID: %.*s\n"), oidsize, oid);
diff -up gnutls-2.4.2/lib/x509/rfc2818_hostname.c.decoding gnutls-2.4.2/lib/x509/rfc2818_hostname.c
--- gnutls-2.4.2/lib/x509/rfc2818_hostname.c.decoding	2008-09-15 22:04:19.000000000 +0200
+++ gnutls-2.4.2/lib/x509/rfc2818_hostname.c	2009-08-14 14:22:02.000000000 +0200
@@ -74,17 +74,17 @@ gnutls_x509_crt_check_hostname (gnutls_x
       if (ret == GNUTLS_SAN_DNSNAME)
 	{
 	  found_dnsname = 1;
-	  if (_gnutls_hostname_compare (dnsname, hostname))
+	  if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	    {
 	      return 1;
 	    }
 	}
       else if (ret == GNUTLS_SAN_IPADDRESS)
 	{
-	  found_dnsname = 1; /* RFC 2818 is unclear whether the CN
-				should be compared for IP addresses
-				too, but we won't do it.  */
-	  if (_gnutls_hostname_compare (dnsname, hostname))
+	  found_dnsname = 1;	/* RFC 2818 is unclear whether the CN
+				   should be compared for IP addresses
+				   too, but we won't do it.  */
+	  if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	    {
 	      return 1;
 	    }
@@ -104,7 +104,7 @@ gnutls_x509_crt_check_hostname (gnutls_x
 	  return 0;
 	}
 
-      if (_gnutls_hostname_compare (dnsname, hostname))
+      if (_gnutls_hostname_compare (dnsname, dnsnamesize, hostname))
 	{
 	  return 1;
 	}


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-10/gnutls.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gnutls.spec	11 Nov 2008 12:55:25 -0000	1.37
+++ gnutls.spec	14 Aug 2009 12:24:51 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -17,6 +17,7 @@ Source0: %{name}-%{version}-nosrp.tar.bz
 Source1: libgnutls-config
 Patch1: gnutls-2.4.0-nosrp.patch
 Patch5: gnutls-1.4.1-cve-2008-4989.patch
+Patch6: gnutls-2.4.2-cve-2009-2730.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -70,6 +71,7 @@ This package contains Guile bindings for
 %setup -q
 %patch1 -p1 -b .nosrp
 %patch5 -p1 -b .chain-verify
+%patch6 -p1 -b .decoding
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -150,6 +152,10 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> 2.4.2-4
+- fix CVE-2009-2730 - handling of NUL chars in certificate
+  CNs and SANs
+
 * Tue Nov 11 2008 Tomas Mraz <tmraz at redhat.com> 2.4.2-3
 - fix chain verification issue CVE-2008-4989 (#470079)
 



From mmaslano at fedoraproject.org  Fri Aug 14 12:47:30 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 14 Aug 2009 12:47:30 +0000 (UTC)
Subject: rpms/cronie/devel .cvsignore, 1.6, 1.7 cronie.spec, 1.23,
	1.24 sources, 1.6, 1.7 0001-Update-manual-for-symlink.patch, 1.1,
	NONE reboot-alias-check-the-return-value.patch, 1.1, NONE
Message-ID: <20090814124730.D958D11C00D0@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31467

Modified Files:
	.cvsignore cronie.spec sources 
Removed Files:
	0001-Update-manual-for-symlink.patch 
	reboot-alias-check-the-return-value.patch 
Log Message:
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.1-1
- update to 1.4.1
- create and own /var/spool/anacron/cron.{daily,weekly,monthly} to
 remove false warning about non existent files
- Resolves: 517398



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Jul 2009 18:12:36 -0000	1.6
+++ .cvsignore	14 Aug 2009 12:47:30 -0000	1.7
@@ -1 +1 @@
-cronie-1.4.tar.gz
+cronie-1.4.1.tar.gz


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- cronie.spec	5 Aug 2009 16:51:09 -0000	1.23
+++ cronie.spec	14 Aug 2009 12:47:30 -0000	1.24
@@ -5,8 +5,8 @@
 
 Summary: Cron daemon for executing programs at set times
 Name: cronie
-Version: 1.4
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -90,16 +90,23 @@ mkdir -pm755 $RPM_BUILD_ROOT%{_sysconfdi
 install -m 755 cronie.init $RPM_BUILD_ROOT%{_initrddir}/crond
 install -m 644 crond.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cron.deny
-install -m 644 contrib/regularly-jobs $RPM_BUILD_ROOT%{_sysconfdir}/regularly-jobs
+install -m 644 contrib/anacrontab $RPM_BUILD_ROOT%{_sysconfdir}/anacrontab
 install -c -m755 contrib/0hourly $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/0hourly
 mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -c -m755 contrib/0anacron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/0anacron
+mkdir -p $RPM_BUILD_ROOT/var/spool/anacron
+touch $RPM_BUILD_ROOT/var/spool/anacron/cron.daily
+touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly
+touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add crond
+[ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily
+[ -e /var/spool/anacron/cron.weekly ] || touch /var/spool/anacron/cron.weekly
+[ -e /var/spool/anacron/cron.monthly ] || touch /var/spool/anacron/cron.monthly
 
 %preun
 if [ "$1" = "0" ]; then
@@ -112,6 +119,15 @@ if [ "$1" -ge "1" ]; then
     service crond condrestart > /dev/null 2>&1 ||:
 fi
 
+# empty /etc/crontab in case there are only old regular jobs
+%triggerun -- cronie < 1.4.1
+cp -a /etc/crontab /etc/crontab.rpmsave
+sed -e '/^01 \* \* \* \* root run-parts \/etc\/cron\.hourly/d'\
+  -e '/^02 4 \* \* \* root run-parts \/etc\/cron\.daily/d'\
+  -e '/^22 4 \* \* 0 root run-parts \/etc\/cron\.weekly/d'\
+  -e '/^42 4 1 \* \* root run-parts \/etc\/cron\.monthly/d' /etc/crontab.rpmsave > /etc/crontab
+exit 0
+
 #copy the lock, remove old daemon from chkconfig
 %triggerun -- vixie-cron
 cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
@@ -139,18 +155,27 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %config(noreplace) %{_sysconfdir}/cron.deny
-%config(noreplace) %{_sysconfdir}/regularly-jobs
+%config(noreplace) %{_sysconfdir}/anacrontab
 
 %files anacron
 %defattr(-,root,root,-)
 %{_sbindir}/anacron
 %attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron
-%{_mandir}/man5/regularly-jobs.*
+%dir /var/spool/anacron
+%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily
+%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.weekly
+%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.monthly
 %{_mandir}/man5/anacrontab.*
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.1-1
+- update to 1.4.1
+- create and own /var/spool/anacron/cron.{daily,weekly,monthly} to
+ remove false warning about non existent files
+- Resolves: 517398
+
 * Wed Aug  5 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-4
 - 515762 move anacron provides and obsoletes to the anacron subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Jul 2009 18:12:36 -0000	1.6
+++ sources	14 Aug 2009 12:47:30 -0000	1.7
@@ -1 +1 @@
-10728a81af9f5995a39bf541aaf14422  cronie-1.4.tar.gz
+9c089d2035b9fa8263bc71da3eb31cdd  cronie-1.4.1.tar.gz


--- 0001-Update-manual-for-symlink.patch DELETED ---


--- reboot-alias-check-the-return-value.patch DELETED ---



From cwickert at fedoraproject.org  Fri Aug 14 12:48:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 14 Aug 2009 12:48:37 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.17, 1.18 rednotebook.spec, 1.17,
	1.18 sources, 1.17, 1.18
Message-ID: <20090814124837.1F06C11C00D0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31763

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
- Updated to new upstream version 0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	7 Aug 2009 16:28:10 -0000	1.17
+++ .cvsignore	14 Aug 2009 12:48:36 -0000	1.18
@@ -1 +1 @@
-rednotebook-0.8.3.tar.gz
+rednotebook-0.8.4.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rednotebook.spec	7 Aug 2009 16:28:11 -0000	1.17
+++ rednotebook.spec	14 Aug 2009 12:48:36 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Updated to new upstream version 0.8.4
+
 * Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
 - Updated to new upstream version 0.8.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	7 Aug 2009 16:28:11 -0000	1.17
+++ sources	14 Aug 2009 12:48:36 -0000	1.18
@@ -1 +1 @@
-0ed6f152312020c227bc8edbe4e4dbe2  rednotebook-0.8.3.tar.gz
+5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz



From michich at fedoraproject.org  Fri Aug 14 12:51:28 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri, 14 Aug 2009 12:51:28 +0000 (UTC)
Subject: rpms/icecream/devel icecream.fc, 1.2, 1.3 icecream.spec, 1.22,
	1.23 icecream.te, 1.8, 1.9 initscript-scheduler, 1.1, 1.2
Message-ID: <20090814125128.A73E211C00D0@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32350

Modified Files:
	icecream.fc icecream.spec icecream.te initscript-scheduler 
Log Message:
* Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
- Create the logfile for the scheduler in the initscript.
- Allow the scheduler to write to the log in the SELinux policy (BZ#517251).



Index: icecream.fc
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.fc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- icecream.fc	16 Feb 2009 13:54:52 -0000	1.2
+++ icecream.fc	14 Aug 2009 12:51:28 -0000	1.3
@@ -3,3 +3,4 @@
 /var/cache/icecream(/.*)?			gen_context(system_u:object_r:iceccd_cache_t,s0)
 /var/log/iceccd				--	gen_context(system_u:object_r:iceccd_log_t,s0)
 /usr/sbin/icecc-scheduler		--	gen_context(system_u:object_r:icecc_scheduler_exec_t,s0)
+/var/log/icecc[-_]scheduler		--	gen_context(system_u:object_r:icecc_scheduler_log_t,s0)


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- icecream.spec	25 Jul 2009 03:06:37 -0000	1.22
+++ icecream.spec	14 Aug 2009 12:51:28 -0000	1.23
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -233,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
+- Create the logfile for the scheduler in the initscript.
+- Allow the scheduler to write to the log in the SELinux policy (BZ#517251).
+
 * 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
 


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.te,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- icecream.te	5 Apr 2009 23:00:36 -0000	1.8
+++ icecream.te	14 Aug 2009 12:51:28 -0000	1.9
@@ -41,6 +41,9 @@ type icecc_scheduler_t;
 type icecc_scheduler_exec_t;
 init_daemon_domain(icecc_scheduler_t, icecc_scheduler_exec_t)
 
+type icecc_scheduler_log_t;
+logging_log_file(icecc_scheduler_log_t)
+
 ########################################
 #
 # iceccd_untrusted declarations
@@ -188,6 +191,9 @@ can_exec(iceccd_untrusted_t, iceccd_cach
 allow icecc_scheduler_t self:tcp_socket create_stream_socket_perms;
 allow icecc_scheduler_t self:udp_socket create_socket_perms;
 
+manage_files_pattern(icecc_scheduler_t, icecc_scheduler_log_t, icecc_scheduler_log_t)
+logging_log_filetrans(icecc_scheduler_t, icecc_scheduler_log_t, file)
+
 corenet_all_recvfrom_unlabeled(icecc_scheduler_t)
 corenet_all_recvfrom_netlabel(icecc_scheduler_t)
 corenet_tcp_sendrecv_generic_if(icecc_scheduler_t)


Index: initscript-scheduler
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/initscript-scheduler,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- initscript-scheduler	21 Nov 2007 00:32:33 -0000	1.1
+++ initscript-scheduler	14 Aug 2009 12:51:28 -0000	1.2
@@ -30,15 +30,16 @@ start() {
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
 	echo -n $"Starting distributed compiler scheduler: "
-	params=""
+	netname=
 	if [ -n "$ICECREAM_NETNAME" ] ; then
-		params="$params -n $ICECREAM_NETNAME"
+		netname="-n $ICECREAM_NETNAME"
 	fi
 	logfile=${ICECREAM_SCHEDULER_LOG_FILE:-/var/log/icecc-scheduler}
-	params="$params -l $logfile"
-#	touch "$logfile"
-#	chown icecream:icecream $logfile
-	daemon --user icecream --check $service $exec -d $params
+	touch "$logfile"
+	chown icecream:icecream "$logfile"
+	chmod 0640 "$logfile"
+	[ -x /sbin/restorecon ] && /sbin/restorecon "$logfile"
+	daemon --user icecream --check $service $exec -d -l "$logfile" $netname
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile



From tagoh at fedoraproject.org  Fri Aug 14 12:56:12 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 14 Aug 2009 12:56:12 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-log.patch, NONE,
	1.1 imsettings.spec, 1.33, 1.34
Message-ID: <20090814125612.C230111C00D0@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1501

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-log.patch 
Log Message:
* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-2
- export the certain environment variables.

imsettings-log.patch:
 xinput.sh.in.in |   94 ++++++++++++++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 50 deletions(-)

--- NEW FILE imsettings-log.patch ---
Index: data/xinput.sh.in.in
===================================================================
--- data/xinput.sh.in.in	(????? 315)
+++ data/xinput.sh.in.in	(?????)
@@ -10,6 +10,17 @@
 #
 # X Input method setup script
 
+function log_init() {
+    if [ ! -n "$DRY_RUN" ]; then
+	rm -rf $HOME/.imsettings.log
+	touch $HOME/.imsettings.log
+    fi
+}
+
+function log() {
+    echo $* >> $HOME/.imsettings.log
+}
+
 function is_dbus_enabled() {
     [ -n "$DBUS_SESSION_BUS_ADDRESS" ]
 }
@@ -73,7 +84,7 @@
 function run_imsettings() {
     print_info
     if [ -n "$DRY_RUN" ]; then
-	echo "*** DRY RUN MODE: running IM through imsettings"
+	log "*** DRY RUN MODE: running IM through imsettings"
     else
 	if [ -n "$IMSETTINGS_INTEGRATE_DESKTOP" -a "x$IMSETTINGS_INTEGRATE_DESKTOP" = "xno" ]; then
 	    which imsettings-start > /dev/null 2>&1 && LANG="$tmplang" imsettings-start -n "$IMSETTINGS_MODULE" || :
@@ -88,56 +99,48 @@
 function run_xim() {
     print_info
     if [ -n "$DRY_RUN" ]; then
-	echo "*** DRY RUN MODE: running IM without imsettings"
+	log "*** DRY RUN MODE: running IM without imsettings"
     else
 	DISABLE_IMSETTINGS=true
 	export DISABLE_IMSETTINGS
 
 	# execute XIM_PROGRAM
-	[ -n "$XIM_PROGRAM" ] && which "$XIM_PROGRAM" > /dev/null 2>&1 && LANG="$tmplang" "$XIM_PROGRAM" $XIM_ARGS &
+	[ -n "$XIM_PROGRAM" ] && which "$XIM_PROGRAM" > /dev/null 2>&1 && LANG="$tmplang" "$XIM_PROGRAM" $XIM_ARGS > $HOME/.imsettings.log 2>&1 &
     fi
 }
 
 function print_result() {
     $1
     if [ $? -eq 0 ]; then
-	echo yes
+	log yes
     else
-	echo no
+	log no
     fi
 }
 
 function print_info() {
-    echo "imsettings information"
-    echo "=========================="
-    echo -n "Is DBus enabled: "
+    log "imsettings information"
+    log "=========================="
+    log -n "Is DBus enabled: "
     print_result is_dbus_enabled
-    echo -n "Is imsettings enabled: "
+    log -n "Is imsettings enabled: "
     print_result is_imsettings_enabled
-    echo -n "Is GTK+ supported: "
+    log -n "Is GTK+ supported: "
     print_result is_gtk_supported
-    echo -n "Is Qt supported: "
+    log -n "Is Qt supported: "
     print_result is_qt_supported
-    echo "DESKTOP_SESSION: $DESKTOP_SESSION"
-    echo "DISABLE_IMSETTINGS: $DISABLE_IMSETTINGS"
-    echo "IMSETTINGS_DISABLE_DESKTOP_CHECK: $IMSETTINGS_DISABLE_DESKTOP_CHECK"
-    echo "DBUS_SESSION_BUS_ADDRESS: $DBUS_SESSION_BUS_ADDRESS"
-    echo "GTK_IM_MODULE: $GTK_IM_MODULE"
-    echo "QT_IM_MODULE: $QT_IM_MODULE"
-    echo "XMODIFIERS: $XMODIFIERS"
-    echo "IMSETTINGS_MODULE: $IMSETTINGS_MODULE"
-    echo "IMSETTINGS_INTEGRATE_DESKTOP: $IMSETTINGS_INTEGRATE_DESKTOP"
-    echo ""
+    log "DESKTOP_SESSION: $DESKTOP_SESSION"
+    log "DISABLE_IMSETTINGS: $DISABLE_IMSETTINGS"
+    log "IMSETTINGS_DISABLE_DESKTOP_CHECK: $IMSETTINGS_DISABLE_DESKTOP_CHECK"
+    log "DBUS_SESSION_BUS_ADDRESS: $DBUS_SESSION_BUS_ADDRESS"
+    log "GTK_IM_MODULE: $GTK_IM_MODULE"
+    log "QT_IM_MODULE: $QT_IM_MODULE"
+    log "XMODIFIERS: $XMODIFIERS"
+    log "IMSETTINGS_MODULE: $IMSETTINGS_MODULE"
+    log "IMSETTINGS_INTEGRATE_DESKTOP: $IMSETTINGS_INTEGRATE_DESKTOP"
+    log ""
 }
 
-function output() {
-    OPTS=""
-    if [ -n "$DRY_RUN" ]; then
-	OPTS="-a"
-    fi
-    tee $OPTS $HOME/.imsettings.log
-}
-
 USER_XINPUTRC="$HOME/.xinputrc"
 SYS_XINPUTRC="@XINPUTRC_PATH@/xinputrc"
 
@@ -179,35 +182,26 @@
 [ -z "$IMSETTINGS_MODULE" ] && IMSETTINGS_MODULE="none"
 export IMSETTINGS_MODULE
 
+##
+log_init
+setup_gtk_immodule
+setup_qt_immodule
+setup_xim
+
 # NOTE: Please make sure the session bus is established before running this script.
-(
 if ! is_dbus_enabled; then
-    echo "***"
-    echo "*** No DBus session hasn't been established yet. giving up to deal with Input Method with imsettings."
-    echo "***"
+    log "***"
+    log "*** No DBus session hasn't been established yet. giving up to deal with Input Method with imsettings."
+    log "***"
 
-    setup_gtk_immodule
-    setup_qt_immodule
-    setup_xim
-
     run_xim
 elif ! is_imsettings_enabled; then
-    echo "***"
-    echo "*** imsettings is explicitly disabled."
-    echo "***"
+    log "***"
+    log "*** imsettings is explicitly disabled."
+    log "***"
 
-    setup_gtk_immodule
-    setup_qt_immodule
-    setup_xim
-
     run_xim
 else
     # Yes, we are in the dbus session
-    setup_gtk_immodule
-    setup_qt_immodule
-    setup_xim
-
     run_imsettings
 fi
-# redirect the output to $HOME/.imsettings.log too
-)|output


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- imsettings.spec	14 Aug 2009 06:54:55 -0000	1.33
+++ imsettings.spec	14 Aug 2009 12:56:12 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,7 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-log.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -82,6 +83,7 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
+%patch2 -p0 -b .2-log
 
 %build
 %configure	\
@@ -201,6 +203,9 @@ fi
 
 
 %changelog
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-2
+- export the certain environment variables.
+
 * Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-1
 - New upstream release.
   - Fix memory leaks.



From hadess at fedoraproject.org  Fri Aug 14 12:58:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 12:58:15 +0000 (UTC)
Subject: rpms/control-center/devel 0001-Port-about-me-to-PolicyKit-1.0.patch,
	NONE, 1.1 control-center.spec, 1.465, 1.466 make-default.patch,
	1.11, 1.12 polkit1.patch, 1.5, NONE
Message-ID: <20090814125815.7C3AF11C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2326

Modified Files:
	control-center.spec make-default.patch 
Added Files:
	0001-Port-about-me-to-PolicyKit-1.0.patch 
Removed Files:
	polkit1.patch 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
- Update to 2.27.5
- Port PolicyKit patches to latest version
- Disable gecos patch, needs porting to GtkBuilder


0001-Port-about-me-to-PolicyKit-1.0.patch:
 capplets/about-me/Makefile.am      |    3 +--
 capplets/about-me/gnome-about-me.c |   37 -------------------------------------
 configure.in                       |    6 ------
 3 files changed, 1 insertion(+), 45 deletions(-)

--- NEW FILE 0001-Port-about-me-to-PolicyKit-1.0.patch ---
>From fcff611fdd771580e303db0f36638c2f9e0f3f8e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 14 Aug 2009 12:12:29 +0100
Subject: [PATCH] Port about-me to PolicyKit 1.0

Remove the polkit-gnome dependency. It's unlikely that admins
would require a password for the user to enroll themselves,
and we can't modify other users' fingerprints either.
---
 capplets/about-me/Makefile.am      |    3 +-
 capplets/about-me/gnome-about-me.c |   37 ------------------------------------
 configure.in                       |    5 ----
 3 files changed, 1 insertions(+), 44 deletions(-)

diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 32ebdaa..ab2d8df 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -23,7 +23,7 @@ gnome_about_me_SOURCES =	 	\
 if BUILD_ABOUTME
 bin_PROGRAMS = gnome-about-me
 
-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(POLKIT_GNOME_LIBS)
+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS)
 gnome_about_me_LDFLAGS = -export-dynamic
 
 @INTLTOOL_DESKTOP_RULE@
@@ -37,7 +37,6 @@ ui_DATA = $(ui_files)
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
-	$(POLKIT_GNOME_CFLAGS) \
 	-DDATADIR="\"$(datadir)\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_UI_DIR="\"$(uidir)\"" \
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 8119c3c..5a40874 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -35,10 +35,6 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 
-#ifdef HAVE_POLKIT
-#include <polkit-gnome/polkit-gnome.h>
-#endif
-
 #include "e-image-chooser.h"
 #include "gnome-about-me-password.h"
 #include "gnome-about-me-fingerprint.h"
@@ -167,28 +163,6 @@ about_me_error (GtkWindow *parent, gchar *str)
 	gtk_widget_destroy (dialog);
 }
 
-#ifdef HAVE_POLKIT
-static GtkWidget *
-create_fingerprint_button (const char *msg, const char *name)
-{
-	GtkWidget *button;
-	PolKitAction *action;
-	PolKitGnomeAction *gaction;
-
-	action = polkit_action_new_from_string_representation ("net.reactivated.fprint.device.enroll");
-	gaction = polkit_gnome_action_new_default (name,
-						   action,
-						   msg,
-						   NULL);
-	polkit_action_unref (action);
-
-	button = polkit_gnome_action_create_button (gaction);
-	g_object_unref (gaction);
-
-	return button;
-}
-#endif /* HAVE_POLKIT */
-
 /********************/
 static void
 about_me_destroy (GnomeAboutMe *me)
@@ -1011,19 +985,8 @@ about_me_setup_dialog (void)
 	g_signal_connect (widget, "clicked",
 			  G_CALLBACK (about_me_image_clicked_cb), me);
 
-#ifdef HAVE_POLKIT
-	gtk_widget_destroy (WID ("enable_fingerprint_button"));
-	gtk_widget_destroy (WID ("disable_fingerprint_button"));
-
-	me->enable_fingerprint_button = create_fingerprint_button (_("Enable _Fingerprint Login..."), "enable-action");
-	gtk_container_add (GTK_CONTAINER (WID("buttons_vbox")), me->enable_fingerprint_button);
-
-	me->disable_fingerprint_button = create_fingerprint_button (_("Disable _Fingerprint Login..."), "disable-action");
-	gtk_container_add (GTK_CONTAINER (WID("buttons_vbox")), me->disable_fingerprint_button);
-#else
 	me->enable_fingerprint_button = WID ("enable_fingerprint_button");
 	me->disable_fingerprint_button = WID ("disable_fingerprint_button");
-#endif /* HAVE_POLKIT */
 
 	g_signal_connect (me->enable_fingerprint_button, "clicked",
 			  G_CALLBACK (about_me_fingerprint_button_clicked_cb), me);
diff --git a/configure.in b/configure.in
index d3cd6bb..eefca87 100644
--- a/configure.in
+++ b/configure.in
@@ -228,11 +228,6 @@ if test "x$enable_aboutme" = "xyes"; then
   PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
                     [AC_DEFINE([HAVE_LIBEBOOK], 1,
                     [Define if evolution-data-server libebook-1.2 is available])])
-  dnl PolicyKit-gnome is optional
-  PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
-  		    [AC_DEFINE([HAVE_POLKIT], 1,
-  		    [Define if PolicyKit-gnome is available])],
-  		    has_polkit=false)
 fi
 
 AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
-- 
1.6.2.5



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -p -r1.465 -r1.466
--- control-center.spec	10 Aug 2009 16:14:28 -0000	1.465
+++ control-center.spec	14 Aug 2009 12:58:15 -0000	1.466
@@ -1,3 +1,4 @@
+%define		_default_patch_fuzz 2
 %define gettext_package gnome-control-center-2.0
 
 %define glib2_version 2.13.0
@@ -46,9 +47,8 @@ Patch30: default-layout-toggle.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=546036
 Patch33: notification-theme.patch
 
-# http://bugzilla.redhat.com/show_bug.cgi?id=498365
-# http://bugzilla.gnome.org/show_bug.cgi?id=536531
-Patch37: polkit1.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=591796
+Patch37: 0001-Port-about-me-to-PolicyKit-1.0.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=588729
 Patch45: mnemonic.patch
@@ -183,7 +183,7 @@ utilities.
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
-%patch96 -p1 -b .gecos
+#%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 
 %patch7 -p1 -b .make-default
@@ -358,6 +358,11 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
+- Update to 2.27.5
+- Port PolicyKit patches to latest version
+- Disable gecos patch, needs porting to GtkBuilder
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-5
 - Fix a lost mnemonic
 

make-default.patch:
 appearance-desktop.c |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

Index: make-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- make-default.patch	16 Jul 2009 00:59:22 -0000	1.11
+++ make-default.patch	14 Aug 2009 12:58:15 -0000	1.12
@@ -1,20 +1,49 @@
-diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.make-default	2009-07-15 11:12:52.000000000 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c	2009-07-15 17:08:10.808068841 -0400
-@@ -31,6 +31,9 @@
+From e47d2eefeea93a34848ee67ea0794d1fc88fe89f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 14 Aug 2009 12:49:52 +0100
+Subject: [PATCH] =?utf-8?q?Bug=20536531=20=E2=80=93=20Allow=20setting=20the=20default=20background?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+The new gdm uses the system-wide default background for the login
+screen. This patch allows configuring this using the normal
+configuration tool for the desktop background.
+
+Add a "Make default" button to the background tab of the appearance
+capplet. It depends on the gconf-defaults service and uses
+PolicyKit for access control.
+---
+ capplets/appearance/appearance-desktop.c |  116 ++++++++++++++++++++++++++++++
+ 1 files changed, 116 insertions(+), 0 deletions(-)
+
+diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
+index bf2f5a1..a5ff367 100644
+--- a/capplets/appearance/appearance-desktop.c
++++ b/capplets/appearance/appearance-desktop.c
+@@ -31,6 +31,8 @@
  #include <libgnomeui/gnome-desktop-thumbnail.h>
  #include <libgnomeui/gnome-bg.h>
  
 +#include <dbus/dbus-glib.h>
-+#include <polkit-gnome/polkit-gnome.h>
 +
  enum {
    TARGET_URI_LIST,
    TARGET_BGIMAGE
-@@ -992,12 +995,61 @@ wp_select_after_realize (GtkWidget *widg
+@@ -991,12 +993,108 @@ wp_select_after_realize (GtkWidget *widget,
    select_item (data, item, TRUE);
  }
  
++static char *background_keys[7] = {
++  "/desktop/gnome/background/picture_filename",
++  "/desktop/gnome/background/picture_opacity",
++  "/desktop/gnome/background/picture_options",
++  "/desktop/gnome/background/color_shading_type",
++  "/desktop/gnome/background/primary_color",
++  "/desktop/gnome/background/secondary_color",
++  NULL
++};
++
 +static void
 +set_background (GtkAction *action, gpointer data)
 +{
@@ -22,15 +51,6 @@ diff -up gnome-control-center-2.27.4/cap
 +  DBusGProxy *proxy;
 +  DBusGConnection *connection;
 +  GError *error;
-+  char *keys[7] = {
-+    "/desktop/gnome/background/picture_filename",
-+    "/desktop/gnome/background/picture_opacity",
-+    "/desktop/gnome/background/picture_options",
-+    "/desktop/gnome/background/color_shading_type",
-+    "/desktop/gnome/background/primary_color",
-+    "/desktop/gnome/background/secondary_color",
-+    NULL
-+  };
 +
 +  gconf_client_suggest_sync (adata->client, NULL);
 +
@@ -51,14 +71,61 @@ diff -up gnome-control-center-2.27.4/cap
 +    return;
 +  }
 +
-+  dbus_g_proxy_call (proxy, "SetSystem",
-+                     &error,
-+                     G_TYPE_STRV, keys,
-+                     G_TYPE_STRV, NULL,
-+                     G_TYPE_INVALID,
-+                     G_TYPE_INVALID);
++  if (!dbus_g_proxy_call (proxy, "SetSystem",
++                          &error,
++                          G_TYPE_STRV, background_keys,
++                          G_TYPE_STRV, NULL,
++                          G_TYPE_INVALID,
++                          G_TYPE_INVALID)) {
++    g_warning ("error calling SetSystem: %s\n", error->message);
++    g_error_free (error);
++  }
++
++  g_object_unref (proxy);
++}
++
++static void
++check_can_set_background (GtkAction *action)
++{
++  DBusGProxy *proxy;
++  DBusGConnection *connection;
++  GError *error;
++  guint result;
++
++  result = 0;
++
++  error = NULL;
++  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++  if (error != NULL) {
++    g_warning ("failed to get system bus connection: %s", error->message);
++    g_error_free (error);
++    goto out;
++  }
++
++  proxy = dbus_g_proxy_new_for_name (connection,
++                                     "org.gnome.GConf.Defaults",
++                                     "/",
++                                     "org.gnome.GConf.Defaults");
++  if (proxy == NULL) {
++    g_warning ("Cannot connect to defaults mechanism");
++    goto out;
++  }
++
++  if (!dbus_g_proxy_call (proxy, "CanSetSystem",
++                          &error,
++                          G_TYPE_STRV, background_keys,
++                          G_TYPE_INVALID,
++		          G_TYPE_UINT, &result,
++                          G_TYPE_INVALID)) {
++    g_warning ("error calling CanSetSystem: %s\n", error->message);
++    g_error_free (error);
++  }
 +
++  g_print ("calling CanSetSystem: %d\n", result);
 +  g_object_unref (proxy);
++
++out:
++  gtk_action_set_visible (action, result != 0);
 +}
 +
  void
@@ -67,34 +134,36 @@ diff -up gnome-control-center-2.27.4/cap
  {
    GtkWidget *add_button;
    GtkCellRenderer *cr;
-+  PolKitAction *pk_action;
-+  PolKitGnomeAction *action;
++  GtkAction *action;
 +  GtkWidget *widget, *box, *button;
  
    g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
  
-@@ -1118,6 +1170,24 @@ desktop_init (AppearanceData *data,
+@@ -1117,6 +1215,24 @@ 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);
-+ 
-+  pk_action = polkit_action_new ();
-+  polkit_action_set_action_id (pk_action, "org.gnome.gconf.defaults.set-default-background");
-+ 
-+  action = polkit_gnome_action_new_default ("set-system", 
-+                                            pk_action,
-+                                            _("Make Default"),
-+                                            _("Set the current background as the system-wide default"));
-+  g_object_set (action, "no-visible", FALSE, NULL);
++
++  action = gtk_action_new ("set-system",
++                           _("Make Default"),
++                           _("Set the current background as the system-wide default"),
++                           NULL);
++  check_can_set_background (action);
 +          
-+  polkit_action_unref (pk_action);
-+  button = polkit_gnome_action_create_button (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);
 +
 +  g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
  }
  
  void
+-- 
+1.6.2.5
+


--- polkit1.patch DELETED ---



From tbzatek at fedoraproject.org  Fri Aug 14 13:03:21 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 14 Aug 2009 13:03:21 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel
	gnome-vfs-2.24.1-disable-gnome-mime-data.patch, 
	NONE, 1.1 gnome-vfs2.spec, 1.195, 1.196
Message-ID: <20090814130321.2B19111C00D0@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3473

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.24.1-disable-gnome-mime-data.patch 
Log Message:
* Fri Aug 14 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-8
- Drop gnome-mount and gnome-mime-data dependencies


gnome-vfs-2.24.1-disable-gnome-mime-data.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-vfs-2.24.1-disable-gnome-mime-data.patch ---
diff -up gnome-vfs-2.24.1/configure.in.orig gnome-vfs-2.24.1/configure.in
--- gnome-vfs-2.24.1/configure.in.orig	2009-03-17 14:48:24.000000000 +0100
+++ gnome-vfs-2.24.1/configure.in	2009-08-14 14:00:49.000000000 +0200
@@ -1044,7 +1044,7 @@ dnl ====================================
 dnl End of IPv6 checks
 dnl ==============================================================================
 
-PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement)
 LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
 LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
 AC_SUBST(LIBGNOMEVFS_CFLAGS)


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- gnome-vfs2.spec	10 Aug 2009 08:36:06 -0000	1.195
+++ gnome-vfs2.spec	14 Aug 2009 13:03:20 -0000	1.196
@@ -1,10 +1,10 @@
 %define samba_version 3.0.8-0.pre1.3
 %define gconf2_version 2.14
 %define gtkdoc_version 0.9
-%define gnome_mime_data_version 2.0.0-11
+# %define gnome_mime_data_version 2.0.0-11
 %define perl_XML_Parser_version 2.31-16
 %define po_package gnome-vfs-2.0
-%define gnome_mount_version 0.4
+# %define gnome_mount_version 0.4
 %define glib2_version 2.9.3
 %define dbus_version 0.90
 %define dbus_glib_version 0.70
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -22,15 +22,15 @@ Group: System Environment/Libraries
 Source0: http://download.gnome.org/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
 URL: http://www.gnome.org/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Requires:      gnome-mime-data >= %{gnome_mime_data_version}
+# Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-Requires:      gnome-mount >= %{gnome_mount_version}
+# Requires:      gnome-mount >= %{gnome_mount_version}
 Requires:      GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
+# BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
@@ -48,7 +48,7 @@ BuildRequires: avahi-glib-devel >= %{ava
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
+# BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel
@@ -56,6 +56,9 @@ BuildRequires: keyutils-libs-devel
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
+# remove gnome-mime-data dependency
+Patch4: gnome-vfs-2.24.1-disable-gnome-mime-data.patch
+
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -123,6 +126,7 @@ shares (SMB) to applications using GNOME
 %setup -q -n gnome-vfs-%{version} 
 
 %patch3 -p1 -b .modules-conf
+%patch4 -p1 -b .mime-data
 
 %patch6 -p1 -b .mailto-command
 
@@ -139,7 +143,7 @@ shares (SMB) to applications using GNOME
 %patch403 -p1 -b .uninitialized-struct
 %patch404 -p1 -b .utf8-mounts
 
-# for patch 10
+# for patch 10 and 4
 autoheader
 autoconf
 
@@ -260,6 +264,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Aug 14 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-8
+- Drop gnome-mount and gnome-mime-data dependencies
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.24.1-7
 - Convert specfile to UTF-8.
 



From mgrepl at fedoraproject.org  Fri Aug 14 13:03:50 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 14 Aug 2009 13:03:50 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 modules-minimum.conf, 1.11,
	1.12 modules-targeted.conf, 1.116, 1.117 policy-20080710.patch,
	1.175, 1.176 selinux-policy.spec, 1.803, 1.804
Message-ID: <20090814130350.D1D7211C00D0@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-serv3571

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Add ptchown policy from Dan Walsh




Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/modules-minimum.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- modules-minimum.conf	23 Mar 2009 12:36:29 -0000	1.11
+++ modules-minimum.conf	14 Aug 2009 13:03:49 -0000	1.12
@@ -505,6 +505,13 @@ hal = module
 # 
 polkit = module
 
+# Layer: apps
+# Module: ptchown
+#
+# helper function for grantpt(3), changes ownship and permissions of pseudotty
+# 
+ptchown = module
+
 # Layer: services
 # Module: psad
 # 


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/modules-targeted.conf,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- modules-targeted.conf	23 Mar 2009 12:36:29 -0000	1.116
+++ modules-targeted.conf	14 Aug 2009 13:03:49 -0000	1.117
@@ -519,6 +519,13 @@ hal = module
 # 
 polkit = module
 
+# Layer: apps
+# Module: ptchown
+#
+# helper function for grantpt(3), changes ownship and permissions of pseudotty
+# 
+ptchown = module
+
 # Layer: services
 # Module: psad
 # 

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                      |   38 
 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/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               |   11 
 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             |  219 ++
 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                  |   88 
 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                      |   81 
 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 
 455 files changed, 22273 insertions(+), 3611 deletions(-)

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- policy-20080710.patch	31 Jul 2009 07:14:11 -0000	1.175
+++ policy-20080710.patch	14 Aug 2009 13:03:49 -0000	1.176
@@ -5403,6 +5403,80 @@ diff --exclude-from=exclude -N -u -r nsa
  miscfiles_read_localization(podsleuth_t)
  
  dbus_system_bus_client_template(podsleuth, podsleuth_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.fc serefpolicy-3.5.13/policy/modules/apps/ptchown.fc
+--- nsaserefpolicy/policy/modules/apps/ptchown.fc	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/apps/ptchown.fc	2009-08-14 14:12:49.000000000 +0200
+@@ -0,0 +1,2 @@
++
++/usr/libexec/pt_chown	--	gen_context(system_u:object_r:ptchown_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.if serefpolicy-3.5.13/policy/modules/apps/ptchown.if
+--- nsaserefpolicy/policy/modules/apps/ptchown.if	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/apps/ptchown.if	2009-08-14 14:12:49.000000000 +0200
+@@ -0,0 +1,22 @@
++
++## <summary>helper function for grantpt(3), changes ownship and permissions of pseudotty</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run ptchown.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ptchown_domtrans',`
++	gen_require(`
++		type ptchown_t;
++                type ptchown_exec_t;
++	')
++
++	domtrans_pattern($1,ptchown_exec_t,ptchown_t)
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.5.13/policy/modules/apps/ptchown.te
+--- nsaserefpolicy/policy/modules/apps/ptchown.te	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/apps/ptchown.te	2009-08-14 14:13:12.000000000 +0200
+@@ -0,0 +1,38 @@
++policy_module(ptchown,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ptchown_t;
++type ptchown_exec_t;
++application_domain(ptchown_t, ptchown_exec_t)
++role system_r types ptchown_t;
++
++permissive ptchown_t;
++
++########################################
++#
++# ptchown local policy
++#
++
++allow ptchown_t self:capability { fowner chown setuid };
++allow ptchown_t self:process { getcap setcap };
++
++# Init script handling
++domain_use_interactive_fds(ptchown_t)
++
++# internal communication is often done using fifo and unix sockets.
++allow ptchown_t self:fifo_file rw_file_perms;
++allow ptchown_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(ptchown_t)
++
++fs_rw_anon_inodefs_files(ptchown_t)
++
++term_use_generic_ptys(ptchown_t)
++term_setattr_generic_ptys(ptchown_t)
++term_setattr_all_user_ptys(ptchown_t)
++
++miscfiles_read_localization(ptchown_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.13/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2008-10-17 14:49:14.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/apps/qemu.fc	2009-02-25 19:55:15.000000000 +0100


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -p -r1.803 -r1.804
--- selinux-policy.spec	31 Jul 2009 07:14:12 -0000	1.803
+++ selinux-policy.spec	14 Aug 2009 13:03:50 -0000	1.804
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 68%{?dist}
+Release: 69%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -462,6 +462,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-69
+- Add ptchown policy from Dan Walsh
+
 * Fri Jul 31 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-68
 - Allow lircd read/write input event devices
 



From cwickert at fedoraproject.org  Fri Aug 14 13:06:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 14 Aug 2009 13:06:14 +0000 (UTC)
Subject: rpms/rednotebook/F-10 .cvsignore, 1.11, 1.12 rednotebook.spec, 1.14,
	1.15 sources, 1.14, 1.15
Message-ID: <20090814130614.C2B1511C00D0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4149/F-10

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
- Updated to new upstream version 0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Aug 2009 16:41:16 -0000	1.11
+++ .cvsignore	14 Aug 2009 13:06:14 -0000	1.12
@@ -1 +1 @@
-rednotebook-0.8.3.tar.gz
+rednotebook-0.8.4.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/rednotebook.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rednotebook.spec	7 Aug 2009 16:41:17 -0000	1.14
+++ rednotebook.spec	14 Aug 2009 13:06:14 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Updated to new upstream version 0.8.4
+
 * Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
 - Updated to new upstream version 0.8.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	7 Aug 2009 16:41:17 -0000	1.14
+++ sources	14 Aug 2009 13:06:14 -0000	1.15
@@ -1 +1 @@
-0ed6f152312020c227bc8edbe4e4dbe2  rednotebook-0.8.3.tar.gz
+5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz



From cwickert at fedoraproject.org  Fri Aug 14 13:06:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 14 Aug 2009 13:06:15 +0000 (UTC)
Subject: rpms/rednotebook/F-11 .cvsignore, 1.12, 1.13 rednotebook.spec, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <20090814130615.1408411C00D0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4149/F-11

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
- Updated to new upstream version 0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	7 Aug 2009 16:41:17 -0000	1.12
+++ .cvsignore	14 Aug 2009 13:06:14 -0000	1.13
@@ -1 +1 @@
-rednotebook-0.8.3.tar.gz
+rednotebook-0.8.4.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rednotebook.spec	7 Aug 2009 16:41:17 -0000	1.15
+++ rednotebook.spec	14 Aug 2009 13:06:14 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.3
+Version:        0.8.4
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
+- Updated to new upstream version 0.8.4
+
 * Fri Aug 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.3-1
 - Updated to new upstream version 0.8.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	7 Aug 2009 16:41:17 -0000	1.15
+++ sources	14 Aug 2009 13:06:14 -0000	1.16
@@ -1 +1 @@
-0ed6f152312020c227bc8edbe4e4dbe2  rednotebook-0.8.3.tar.gz
+5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz



From hadess at fedoraproject.org  Fri Aug 14 13:08:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 13:08:37 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.466,1.467
Message-ID: <20090814130837.6104811C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4732

Modified Files:
	control-center.spec 
Log Message:
Fix filelist


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- control-center.spec	14 Aug 2009 12:58:15 -0000	1.466
+++ control-center.spec	14 Aug 2009 13:08:37 -0000	1.467
@@ -311,7 +311,6 @@ fi
 %doc AUTHORS COPYING NEWS README
 %{_datadir}/gnome-control-center/keybindings/*.xml
 %{_datadir}/gnome-control-center/default-apps/*.xml
-%{_datadir}/gnome-control-center/glade
 %{_datadir}/gnome-control-center/ui
 %{_datadir}/gnome-control-center/pixmaps
 %{_datadir}/applications/*.desktop



From nhorman at fedoraproject.org  Fri Aug 14 13:30:28 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri, 14 Aug 2009 13:30:28 +0000 (UTC)
Subject: rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase install, 1.2,
	1.3
Message-ID: <20090814133028.63E8711C0348@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9799/kdump_dracut_modules/99kdumpbase

Modified Files:
	install 
Log Message:
Updating dracut modules


Index: install
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump_dracut_modules/99kdumpbase/install,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- install	11 Aug 2009 20:07:22 -0000	1.2
+++ install	14 Aug 2009 13:30:28 -0000	1.3
@@ -1,3 +1,5 @@
 #!/bin/bash
 rm -f $initdir/init
 inst "/etc/kdump-adv-conf/init" "/init"
+inst "/bin/date" "/bin/date"
+inst "/usr/bin/reboot" "bin/reboot"



From nhorman at fedoraproject.org  Fri Aug 14 13:30:28 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri, 14 Aug 2009 13:30:28 +0000 (UTC)
Subject: rpms/kexec-tools/devel kexec-tools.spec, 1.149, 1.150 sources, 1.21,
	1.22
Message-ID: <20090814133028.174F111C0348@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9799

Modified Files:
	kexec-tools.spec sources 
Log Message:
Updating dracut modules


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- kexec-tools.spec	11 Aug 2009 20:07:22 -0000	1.149
+++ kexec-tools.spec	14 Aug 2009 13:30:27 -0000	1.150
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -261,6 +261,9 @@ done
 
 
 %changelog
+* Thu Aug 13 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-24
+- update kdump adv conf init script & dracut module
+
 * Wed Jul 29 2009 Neil Horman <nhorman at redhat.com> - 2.0,0-23
 - Remove mkdumprd2 and start replacement with dracut
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	11 Aug 2009 20:07:22 -0000	1.21
+++ sources	14 Aug 2009 13:30:27 -0000	1.22
@@ -1,4 +1,4 @@
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 190f8878aa7e7b63a96fde5d59538eec  makedumpfile-1.3.3.tar.gz
-925dc7a5121fbb8eab854375d7ea4d1d  dracut-files.tbz2
+827939e16fc1af25ecddb0d4ef9e2bb2  dracut-files.tbz2



From nhorman at fedoraproject.org  Fri Aug 14 13:30:28 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri, 14 Aug 2009 13:30:28 +0000 (UTC)
Subject: rpms/kexec-tools/devel/kdump_initscripts init,1.1,1.2
Message-ID: <20090814133028.8F77E11C043C@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/kdump_initscripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9799/kdump_initscripts

Modified Files:
	init 
Log Message:
Updating dracut modules


Index: init
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kdump_initscripts/init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- init	29 Jul 2009 19:34:48 -0000	1.1
+++ init	14 Aug 2009 13:30:28 -0000	1.2
@@ -174,60 +174,12 @@ while :; do
         && { flock -s 9 ; emergency_shell "Can't mount root filesystem"; } 9>/.console_lock
 done
 
-# pre pivot scripts are sourced just before we switch over to the new root.
-getarg 'rdbreak=pre-pivot' && emergency_shell "Break pre-pivot"
-source_all pre-pivot
+# We have the root file system mounted under $NEWROOT, so copy 
+# the vmcore there and call it a day
+#
+DATEDIR=`date +%d.%m.%y-%T`
+mkdir -p $NEWROOT/var/crash/$DATEDIR
+cp /proc/vmcore /var/crash/$DATEDIR/vmcore
 
-# by the time we get here, the root filesystem should be mounted.
-# Try to find init.
-for i in "$(getarg init=)" /sbin/init /etc/init /init /bin/sh; do
-    [ -f "$NEWROOT$i" -a -x "$NEWROOT$i" ] && { INIT="$i"; break; }
-done
-[ "$INIT" ] || {
-    echo "Cannot find init!"
-    echo "Please check to make sure you passed a valid root filesystem!"
-    emergency_shell
-}
-
-getarg rdbreak && emergency_shell "Break before switch_root"
-
-HARD=""
-while pidof udevd >/dev/null 2>&1; do 
-    for pid in $(pidof udevd); do
-	kill $HARD $pid >/dev/null 2>&1
-    done
-    HARD="-9"
-done
-
-# Clean up the environment
-for i in $(export -p); do
-    i=${i#declare -x}
-    i=${i#export}
-    i=${i%%=*}
-    [ "$i" = "root" -o "$i" = "PATH" -o "$i" = "HOME" -o "$i" = "TERM" ] || unset $i
-done
-
-initargs=""
-initrdargs="$initrdargs console BOOT_IMAGE rdbreak rdinitdebug rdudevinfo rdudevdebug rdnetdebug rdcopystate rdshell"
-
-for x in "$@"; do
-    for s in $initrdargs; do       
-	[ "${x%%=*}" = $s ] && continue 2
-    done
-    initargs="$initargs $x"
-done
-
-# Copy state
-mkdir /dev/.initramfs/
-if getarg rdcopystate; then
-    cp /tmp/* /dev/.initramfs/ >/dev/null 2>&1
-else
-    cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
-fi
-
-exec switch_root "$NEWROOT" "$INIT" $initargs || {
-    # davej doesn't like initrd bugs
-    echo "Something went very badly wrong in the initrd.  Please "
-    echo "file a bug against mkinitrd."
-    emergency_shell
-}
+# Once the copy is done, just reboot the system
+reboot -f



From rdieter at fedoraproject.org  Fri Aug 14 13:38:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 14 Aug 2009 13:38:16 +0000 (UTC)
Subject: rpms/kaffeine/devel .cvsignore, 1.8, 1.9 kaffeine.spec, 1.27,
	1.28 sources, 1.8, 1.9
Message-ID: <20090814133816.1FEFD11C00D0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11452

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.3.pre2
- kaffeine-1.0-pre2
- update %description/%summary
- %check: use desktop-file-validate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Apr 2009 19:41:58 -0000	1.8
+++ .cvsignore	14 Aug 2009 13:38:15 -0000	1.9
@@ -1 +1 @@
-kaffeine-1.0-pre1.tar.gz
+kaffeine-1.0-pre2.tar.gz


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- kaffeine.spec	25 Jul 2009 04:17:07 -0000	1.27
+++ kaffeine.spec	14 Aug 2009 13:38:15 -0000	1.28
@@ -1,19 +1,18 @@
 
-%define pre pre1
+%define pre pre2
 
 Name:    kaffeine
 Version: 1.0 
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
 
 License: GPLv2+
-Summary: Xine-based media player
+Summary: Phonon-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 BuildRequires: phonon-devel
@@ -22,14 +21,12 @@ Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
 %description
-Kaffeine is a xine-based media player for KDE.
+Kaffeine is a phonon-based media player.
 
 
 %prep
 %setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
 
-%patch1 -p1 -b .kernel_headers
-
 
 %build
 mkdir -p %{_target_platform}
@@ -50,8 +47,12 @@ mv %{buildroot}%{_kde4_iconsdir}/oxygen 
 %find_lang %{name}
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+
+
 %clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
 
 
 %post
@@ -73,13 +74,19 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING TODO
 %{_kde4_bindir}/kaffeine
-%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/kaffeine/
 %{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/kaffeine.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/kaffeinedvb.so
 
 
 %changelog
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Apr 2009 19:41:58 -0000	1.8
+++ sources	14 Aug 2009 13:38:15 -0000	1.9
@@ -1 +1 @@
-ecae6fd84103a268daf17b61784d837f  kaffeine-1.0-pre1.tar.gz
+24eee004427d6b3f73ffb85a94fc6e3b  kaffeine-1.0-pre2.tar.gz



From hadess at fedoraproject.org  Fri Aug 14 13:44:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 13:44:39 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.467,1.468
Message-ID: <20090814134439.A767511C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12778

Modified Files:
	control-center.spec 
Log Message:
Remove libslab devel stuff


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- control-center.spec	14 Aug 2009 13:08:37 -0000	1.467
+++ control-center.spec	14 Aug 2009 13:44:37 -0000	1.468
@@ -249,6 +249,9 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
 
+# Remove libslab devel stuff which shouldn't be used
+rm -rf $RPM_BUILD_ROOT%{_includedir}/libslab/ $RPM_BUILD_ROOT%{_libdir}/libslab.so
+
 rm $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 # remove useless libtool archive files



From atkac at fedoraproject.org  Fri Aug 14 13:47:08 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri, 14 Aug 2009 13:47:08 +0000 (UTC)
Subject: rpms/tigervnc/F-11 tigervnc10-rh508998.patch, NONE,
	1.1 tigervnc10-xorg-rh514528.patch, NONE, 1.1 tigervnc.spec,
	1.12, 1.13
Message-ID: <20090814134708.4ACAF11C00D0@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13434

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-rh508998.patch tigervnc10-xorg-rh514528.patch 
Log Message:
- don't segfault due unitialized Activate/DeactivateGrab (#514528)
- fix random cursor disappearing (#508998)


tigervnc10-rh508998.patch:
 xserver16.patch |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

--- NEW FILE tigervnc10-rh508998.patch ---
diff -up tigervnc-0.0.91/unix/xserver16.patch.rh508998 tigervnc-0.0.91/unix/xserver16.patch
--- tigervnc-0.0.91/unix/xserver16.patch.rh508998	2009-08-14 15:26:44.829138415 +0200
+++ tigervnc-0.0.91/unix/xserver16.patch	2009-08-14 15:28:55.017134974 +0200
@@ -1,13 +1,13 @@
 diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc	2009-04-27 14:35:51.116084095 +0200
-+++ xserver/configure.ac	2009-04-27 14:36:20.012084519 +0200
+--- xserver/configure.ac.vnc	2009-08-14 15:25:23.879137863 +0200
++++ xserver/configure.ac	2009-08-14 15:25:24.381142987 +0200
 @@ -29,7 +29,6 @@ AC_PREREQ(2.57)
- AC_INIT([xorg-server], 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+ AC_INIT([xorg-server], 1.6.1.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 -AM_MAINTAINER_MODE
  
- RELEASE_DATE="2009-4-14"
+ RELEASE_DATE="2009-5-8"
  
 @@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
  AC_CONFIG_HEADERS(include/kdrive-config.h)
@@ -17,7 +17,7 @@ diff -up xserver/configure.ac.vnc xserve
  AM_PROG_AS
  AC_PROG_INSTALL
  AC_PROG_LN_S
-@@ -995,7 +995,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
+@@ -994,7 +994,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
  
  AC_DEFINE(XKB, 1, [Build XKB])
  AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
@@ -26,7 +26,7 @@ diff -up xserver/configure.ac.vnc xserve
  REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
  XKB_LIB='$(top_builddir)/xkb/libxkb.la'
  XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-@@ -1199,6 +1199,9 @@ if test "x$XVFB" = xyes; then
+@@ -1207,6 +1207,9 @@ if test "x$XVFB" = xyes; then
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -36,7 +36,7 @@ diff -up xserver/configure.ac.vnc xserve
  
  dnl Xnest DDX
  
-@@ -1234,6 +1237,8 @@ xorg_bus_linuxpci=no
+@@ -1242,6 +1245,8 @@ xorg_bus_linuxpci=no
  xorg_bus_bsdpci=no
  xorg_bus_sparc=no
  
@@ -45,7 +45,7 @@ diff -up xserver/configure.ac.vnc xserve
  if test "x$XORG" = xyes; then
  	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
  	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -1421,7 +1426,6 @@ if test "x$XORG" = xyes; then
+@@ -1427,7 +1432,6 @@ if test "x$XORG" = xyes; then
  	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
  	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
  	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
@@ -53,7 +53,7 @@ diff -up xserver/configure.ac.vnc xserve
  	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
  	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
  	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -1875,6 +1879,7 @@ hw/dmx/input/Makefile
+@@ -1881,6 +1885,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile
@@ -62,8 +62,8 @@ diff -up xserver/configure.ac.vnc xserve
  hw/xwin/Makefile
  hw/xquartz/Makefile
 diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc	2009-04-27 14:35:51.244085095 +0200
-+++ xserver/hw/Makefile.am	2009-04-27 14:36:07.676108196 +0200
+--- xserver/hw/Makefile.am.vnc	2009-08-14 15:25:23.987137653 +0200
++++ xserver/hw/Makefile.am	2009-08-14 15:25:24.382139759 +0200
 @@ -33,7 +33,8 @@ SUBDIRS =			\
  	$(XNEST_SUBDIRS)	\
  	$(DMX_SUBDIRS)		\
@@ -75,8 +75,8 @@ diff -up xserver/hw/Makefile.am.vnc xser
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc	2009-04-27 14:35:51.252085110 +0200
-+++ xserver/mi/miinitext.c	2009-04-27 14:36:07.676108196 +0200
+--- xserver/mi/miinitext.c.vnc	2009-08-14 15:25:23.998137343 +0200
++++ xserver/mi/miinitext.c	2009-08-14 15:26:19.857206094 +0200
 @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
  extern void CompositeExtensionInit(INITARGS);
  #endif
@@ -85,11 +85,11 @@ diff -up xserver/mi/miinitext.c.vnc xser
  
  /* The following is only a small first step towards run-time
   * configurable extensions.
-@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[])
- 	GlxPushProvider(&__glXDRISWRastProvider);
-     if (!noGlxExtension) GlxExtensionInit();
+@@ -438,6 +439,7 @@ InitExtensions(int argc, char *argv[])
+ #ifdef XF86BIGFONT
+     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
  #endif
 +    vncExtensionInit();
- }
- 
- #else /* XFree86LOADER */
+ #if !defined(NO_HW_ONLY_EXTS)
+ #if defined(XF86VIDMODE)
+     if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();

tigervnc10-xorg-rh514528.patch:
 devices.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE tigervnc10-xorg-rh514528.patch ---
diff --git a/dix/devices.c b/dix/devices.c
index 0858f20..3b8d544 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -216,6 +216,8 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
 
     /* device grab defaults */
     dev->deviceGrab.grabTime = currentTime;
+    dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+    dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
 
     dev->coreEvents = TRUE;
 


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tigervnc.spec	23 Jun 2009 13:11:31 -0000	1.12
+++ tigervnc.spec	14 Aug 2009 13:47:08 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.91
-Release:	0.11%{?dist}.1
+Release:	0.12%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -39,6 +39,8 @@ 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
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -86,12 +88,15 @@ 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
 
 
@@ -244,6 +249,10 @@ fi
 %endif
 
 %changelog
+* 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)
+
 * Tue Jun 23 2009 Adam Tkac <atkac redhat com> 0.0.91-11.1
 - don't ship tigervnc-server-module on s390/s390x
 



From tmraz at fedoraproject.org  Fri Aug 14 13:54:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 14 Aug 2009 13:54:42 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.24,1.25
Message-ID: <20090814135442.895D511C00D0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15022

Modified Files:
	cronie.spec 
Log Message:
* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-2
- create the anacron timestamps in correct post script



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- cronie.spec	14 Aug 2009 12:47:30 -0000	1.24
+++ cronie.spec	14 Aug 2009 13:54:42 -0000	1.25
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -31,7 +31,7 @@ Buildrequires: pam-devel >= 1.0.1
 Buildrequires: audit-libs-devel >= 1.4.1
 %endif
 
-Requires(post): /sbin/chkconfig coreutils
+Requires(post): /sbin/chkconfig coreutils sed
 Requires(postun): /sbin/chkconfig
 Requires(postun): /sbin/service 
 Requires(preun): /sbin/chkconfig 
@@ -49,6 +49,7 @@ Requires: crontabs
 Group: System Environment/Base
 Provides: anacron = 2.4
 Obsoletes: anacron <= 2.3
+Requires(post): coreutils
 
 %description anacron
 Anacron becames part of cronie. Anacron is used only for running regular jobs.
@@ -104,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add crond
+
+%post anacron
 [ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily
 [ -e /var/spool/anacron/cron.weekly ] || touch /var/spool/anacron/cron.weekly
 [ -e /var/spool/anacron/cron.monthly ] || touch /var/spool/anacron/cron.monthly
@@ -170,6 +173,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-2
+- create the anacron timestamps in correct post script
+
 * Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.1-1
 - update to 1.4.1
 - create and own /var/spool/anacron/cron.{daily,weekly,monthly} to



From rrakus at fedoraproject.org  Fri Aug 14 13:55:37 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 14 Aug 2009 13:55:37 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-1.3.14-ipv6.patch, NONE, 1.1 yaboot.spec, 
	1.64, 1.65
Message-ID: <20090814135537.32FA911C00D0@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15298

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-ipv6.patch 
Log Message:
ipv6 support, don't do debuginfo rpm

yaboot-1.3.14-ipv6.patch:
 include/file.h |    5 +++++
 include/prom.h |    1 +
 second/file.c  |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 second/fs_of.c |    8 ++++++--
 4 files changed, 64 insertions(+), 3 deletions(-)

--- NEW FILE yaboot-1.3.14-ipv6.patch ---
diff -up yaboot-1.3.14/include/file.h.ipv6_4 yaboot-1.3.14/include/file.h
--- yaboot-1.3.14/include/file.h.ipv6_4	2009-08-14 13:48:47.000000000 +0200
+++ yaboot-1.3.14/include/file.h	2009-08-14 13:48:47.000000000 +0200
@@ -46,6 +46,11 @@ struct boot_fspec_t {
 	char*	bootp_retries;	/* Bootp retries */
 	char*	tftp_retries;	/* TFTP retries */
 	char*	addl_params;	/* copy all additional parameters */
+
+	/* Following fields are used only in ipv6 format */
+	int	is_ipv6;	/* is ipv6 specified ? */
+	char*	dhcpv6;		/* dhcpv6 string */
+	char*	blksize;	/* blksize string */
 };
 
 struct boot_file_t {
diff -up yaboot-1.3.14/include/prom.h.ipv6_4 yaboot-1.3.14/include/prom.h
--- yaboot-1.3.14/include/prom.h.ipv6_4	2008-04-15 15:34:48.000000000 +0200
+++ yaboot-1.3.14/include/prom.h	2009-08-14 14:37:25.000000000 +0200
@@ -37,6 +37,7 @@ typedef void *phandle;
 #define PROM_INVALID_HANDLE	((prom_handle)-1UL)
 #define BOOTDEVSZ               (2048) /* iscsi args can be in excess of 1040 bytes */
 #define TOK_ISCSI               "iscsi"
+#define TOK_IPV6                "ipv6"
 #define PROM_CLAIM_MAX_ADDR	0x8000000
 #define BOOTLASTSZ		1024
 #define FW_NBR_REBOOTSZ		4
diff -up yaboot-1.3.14/second/file.c.ipv6_4 yaboot-1.3.14/second/file.c
--- yaboot-1.3.14/second/file.c.ipv6_4	2009-08-14 13:48:47.000000000 +0200
+++ yaboot-1.3.14/second/file.c	2009-08-14 14:44:37.000000000 +0200
@@ -193,6 +193,50 @@ extract_netinfo_args(struct boot_fspec_t
 }
 
 /*
+ * Extract all the ipv6 arguments from the bootpath provided and fill result
+ * Syntax: ipv6,[dhcpv6[=diaddr,]]ciaddr=c_iaddr,giaddr=g_iaddr,siaddr=s_iaddr,
+ *      filename=file_name,tftp-retries=tftp_retries,blksize=block_size
+ * Returns 1 on success, 0 on failure.
+ */
+static int
+extract_ipv6_args(char *imagepath, struct boot_fspec_t *result)
+{
+     char *str, *tmp;
+     int total_len;
+
+     result->is_ipv6 = 1;
+
+     /* Just allocate the max required size */
+     total_len = strlen(imagepath) + 1;
+     str = malloc(total_len);
+     if (!str)
+	return 0;
+
+     if ((tmp = strstr(imagepath, "dhcpv6=")) != NULL)
+	result->dhcpv6 = scopy(&str, &tmp);
+
+     if ((tmp = strstr(imagepath, "ciaddr=")) != NULL)
+	result->ciaddr = scopy(&str, &tmp);
+
+     if ((tmp = strstr(imagepath, "giaddr=")) != NULL)
+	result->giaddr = scopy(&str, &tmp);
+
+     if ((tmp = strstr(imagepath, "siaddr=")) != NULL)
+	result->siaddr = scopy(&str, &tmp);
+
+     if ((tmp = strstr(imagepath, "filename=")) != NULL)
+	result->file = scopy(&str, &tmp);
+
+     if ((tmp = strstr(imagepath, "tftp-retries=")) != NULL)
+	result->tftp_retries = scopy(&str, &tmp);
+
+     if ((tmp = strstr(imagepath, "blksize=")) != NULL)
+	result->blksize = scopy(&str, &tmp);
+
+     return 1;
+}
+
+/*
  * Extract all the arguments provided in the imagepath and fill it in result.
  * Returns 1 on success, 0 on failure.
  */
@@ -206,9 +250,14 @@ extract_netboot_args(char *imagepath, st
      if (!imagepath)
 	  return 1;
 
-     ret = extract_ipv4_args(imagepath, result);
+     if (strstr(imagepath, TOK_IPV6))
+	  ret = extract_ipv6_args(imagepath, result);
+     else
+	  ret = extract_ipv4_args(imagepath, result);
+ 
      ret |= extract_netinfo_args(result);
 
+     DEBUG_F("ipv6 = <%d>\n", result->is_ipv6);
      DEBUG_F("siaddr = <%s>\n", result->siaddr);
      DEBUG_F("file = <%s>\n", result->file);
      DEBUG_F("ciaddr = <%s>\n", result->ciaddr);
@@ -216,6 +265,8 @@ extract_netboot_args(char *imagepath, st
      DEBUG_F("bootp_retries = <%s>\n", result->bootp_retries);
      DEBUG_F("tftp_retries = <%s>\n", result->tftp_retries);
      DEBUG_F("addl_params = <%s>\n", result->addl_params);
+     DEBUG_F("dhcpv6 = <%s>\n", result->dhcpv6);
+     DEBUG_F("blksize = <%s>\n", result->blksize);
    
      return ret;
 }
diff -up yaboot-1.3.14/second/fs_of.c.ipv6_4 yaboot-1.3.14/second/fs_of.c
--- yaboot-1.3.14/second/fs_of.c.ipv6_4	2009-08-14 13:48:47.000000000 +0200
+++ yaboot-1.3.14/second/fs_of.c	2009-08-14 14:47:18.000000000 +0200
@@ -148,14 +148,18 @@ of_net_open(struct boot_file_t* file,
 		    *p = '\\';
      }
 
-     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;\n",
-		fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr);
+     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] != ':')
           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);


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- yaboot.spec	7 Aug 2009 20:27:51 -0000	1.64
+++ yaboot.spec	14 Aug 2009 13:55:37 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -31,6 +31,9 @@ Patch34: yaboot-1.3.14-no-birecs.patch
 # mkofboot in verbose mode returns bad value
 Patch35: yaboot-1.3.14-returns.patch
 
+# ipv6 support
+Patch36: yaboot-1.3.14-ipv6.patch
+
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
@@ -38,6 +41,11 @@ ExclusiveArch: ppc
 Requires: hfsutils
 BuildRequires: e2fsprogs-devel
 
+# yaboot is bootloader. It contains ELF object, but it is not Linux or MacOS
+# executable file. Yaboot is meant to be executed only by OpenFirmware.
+# So debuginfo rpm is nonsense
+%global debug_package %{nil}
+
 %description
 yaboot is a bootloader for PowerPC machines which works on New World ROM
 machines (Rev. A iMac and newer) and runs directly from Open Firmware,
@@ -68,6 +76,7 @@ yaboot can also bootload IBM pSeries mac
 %patch33 -p1 -b .netboot
 %patch34 -p1 -b .birecs
 %patch35 -p1 -b .returns
+%patch36 -p1 -b .ipv6
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -103,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Fri Aug 14 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-17
+- ipv6 support
+- don't build debuginfo package
+
 * Fri Aug 07 2009 Bill Nottingham <notting at redhat.com> - 1.3.14-16
 - fix patch file for (#515555)
 



From rrakus at fedoraproject.org  Fri Aug 14 14:07:35 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 14 Aug 2009 14:07:35 +0000 (UTC)
Subject: rpms/yaboot/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090814140735.4DAB711C00D0@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18352

Modified Files:
	.cvsignore sources 
Log Message:
Use only yaboot-1.3.14 source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Apr 2008 11:21:11 -0000	1.7
+++ .cvsignore	14 Aug 2009 14:07:35 -0000	1.8
@@ -1,3 +1 @@
-yaboot-1.3.12.tar.gz
-yaboot-1.3.13.tar.gz
 yaboot-1.3.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Apr 2008 11:21:11 -0000	1.7
+++ sources	14 Aug 2009 14:07:35 -0000	1.8
@@ -1,3 +1 @@
-85cf685c1dc5873c2a5124ba4524b2d2  yaboot-1.3.12.tar.gz
-f12798d1b2063f21d07e0ae7f602ccaf  yaboot-1.3.13.tar.gz
 dd346812667ab3818248c9784fe8e38e  yaboot-1.3.14.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 14 14:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 14:11:56 +0000
Subject: [pkgdb] PolicyKit-gnome had acl change status
Message-ID: <20090814141157.14C2D10F859@bastion2.fedora.phx.redhat.com>

davidz has set the commit acl on PolicyKit-gnome (Fedora devel) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-gnome



From pkgdb at fedoraproject.org  Fri Aug 14 14:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 14:12:00 +0000
Subject: [pkgdb] PolicyKit-gnome had acl change status
Message-ID: <20090814141200.E5EDA10F85C@bastion2.fedora.phx.redhat.com>

davidz has set the approveacls acl on PolicyKit-gnome (Fedora devel) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-gnome



From pkgdb at fedoraproject.org  Fri Aug 14 14:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 14:12:13 +0000
Subject: [pkgdb] PolicyKit-gnome had acl change status
Message-ID: <20090814141213.7878F10F854@bastion2.fedora.phx.redhat.com>

davidz has set the commit acl on PolicyKit-gnome (Fedora 11) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-gnome



From pkgdb at fedoraproject.org  Fri Aug 14 14:12:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 14:12:15 +0000
Subject: [pkgdb] PolicyKit-gnome had acl change status
Message-ID: <20090814141215.A000310F855@bastion2.fedora.phx.redhat.com>

davidz has set the approveacls acl on PolicyKit-gnome (Fedora 11) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-gnome



From twaugh at fedoraproject.org  Fri Aug 14 14:18:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 14 Aug 2009 14:18:40 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.278, 
	1.279
Message-ID: <20090814141840.6CAE011C00D0@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-serv20466

Modified Files:
	system-config-printer.spec 
Log Message:
* Thu Aug 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
- Updated cupspk DevicesGet call for accepted API.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- system-config-printer.spec	13 Aug 2009 16:40:49 -0000	1.278
+++ system-config-printer.spec	14 Aug 2009 14:18:40 -0000	1.279
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -102,6 +102,9 @@ pushd pysmbc-%{pysmbc_version}
 make DESTDIR=%buildroot install
 popd
 
+%{__mkdir_p} %buildroot%{_localstatedir}/run/udev-configure-printer
+touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
+
 %find_lang system-config-printer
 
 %clean
@@ -127,6 +130,8 @@ rm -rf %buildroot
 %defattr(-,root,root,-)
 %{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/*
+%dir %{_localstatedir}/run/udev-configure-printer
+%verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
 
 %files
 %defattr(-,root,root,-)
@@ -183,6 +188,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-3
+- Own /var/run/udev-configure-printer.
+
 * Thu Aug 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
 - Updated cupspk DevicesGet call for accepted API.
 



From rdieter at fedoraproject.org  Fri Aug 14 14:21:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 14 Aug 2009 14:21:12 +0000 (UTC)
Subject: rpms/kdelibs/devel kde4.csh, 1.4, 1.5 kde4.sh, 1.5, 1.6 kdelibs.spec,
	1.501, 1.502
Message-ID: <20090814142112.C0DA011C00D0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21073

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.csh	14 May 2009 16:52:04 -0000	1.4
+++ kde4.csh	14 Aug 2009 14:21:12 -0000	1.5
@@ -5,11 +5,11 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( -f /etc/sysconfig/prelink ) then
-   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-   if ( "$PRELINKING" == "yes" )  then
-     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-   endif
-   unset PRELINKING
-endif
-
+## disabled, for now, due to http://bugzilla.redhat.com/515539
+#if ( -f /etc/sysconfig/prelink ) then
+#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+#   if ( "$PRELINKING" == "yes" )  then
+#     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+#   endif
+#   unset PRELINKING
+#endif


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde4.sh	14 May 2009 16:52:04 -0000	1.5
+++ kde4.sh	14 Aug 2009 14:21:12 -0000	1.6
@@ -5,8 +5,8 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -z "$KDE_IS_PRELINKED" ] ; then
-  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
-  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-fi
-
+## disabled, for now, due to http://bugzilla.redhat.com/515539
+#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/devel/kdelibs.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -p -r1.501 -r1.502
--- kdelibs.spec	5 Aug 2009 18:25:22 -0000	1.501
+++ kdelibs.spec	14 Aug 2009 14:21:12 -0000	1.502
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -405,6 +405,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
 - khtml crasher (kdebug#199557)



From dcbw at fedoraproject.org  Fri Aug 14 14:23:21 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 14 Aug 2009 14:23:21 +0000 (UTC)
Subject: rpms/PolicyKit-gnome/devel
	PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch,
	NONE, 1.1 PolicyKit-gnome.spec, 1.28, 1.29
Message-ID: <20090814142321.CC15611C00D0@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21531

Modified Files:
	PolicyKit-gnome.spec 
Added Files:
	PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch 
Log Message:
* Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.9.2-5
- Workaround for dbus-glib duplicate object path registrations (fdo #23297)



PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch:
 polkit-gnome-auth.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch ---
diff -up PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c.foo PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c
--- PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c.foo	2009-08-13 18:28:06.942432221 -0500
+++ PolicyKit-gnome-0.9.2/polkit-gnome/polkit-gnome-auth.c	2009-08-13 18:28:45.469307352 -0500
@@ -140,7 +140,7 @@ polkit_gnome_auth_obtain (PolKitAction *
 
 	polkit_gnome_proxy = dbus_g_proxy_new_for_name (session_bus,
                                                         "org.freedesktop.PolicyKit.AuthenticationAgent", /* bus name */
-                                                        "/",                                             /* object */
+                                                        "/org/gnome/PolicyKit/Manager",                  /* object */
                                                         "org.freedesktop.PolicyKit.AuthenticationAgent");/* interface */
 
         c = g_new0 (CallClosure, 1);


Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- PolicyKit-gnome.spec	24 Jul 2009 15:45:49 -0000	1.28
+++ PolicyKit-gnome.spec	14 Aug 2009 14:23:21 -0000	1.29
@@ -10,7 +10,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: PolicyKit-gnome
 Version: 0.9.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 URL: http://svn.gnome.org/viewvc/policykit-gnome/trunk
@@ -35,6 +35,10 @@ Requires(preun): GConf2 >= 2.14
 
 Patch0: PolicyKit-gnome-0.9.2-dont-spawn-when-running-under-gdm.patch
 Patch1: PolicyKit-gnome-0.9.2-fix-clickable-buttons.patch
+# fdo #23297: dbus-glib 0.82 stopped allowing duplicate object path
+# registrations, which should get fixed in dbus-glib; until then work around
+# it by using the preferred polkit-gnome-manager object path
+Patch2: PolicyKit-gnome-0.9.2-fix-manager-object-path-fdo-23297.patch
 
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
@@ -83,6 +87,7 @@ PolicyKit-gnome.
 %setup -q
 %patch0 -p0 -b .no-spawning-under-gdm
 %patch1 -p0 -b .fix-clickable-buttons
+%patch2 -p1 -b .fix-manager-path
 
 %build
 %configure
@@ -155,6 +160,9 @@ fi
 %{_datadir}/PolicyKit/policy/*.policy
 
 %changelog
+* Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.9.2-5
+- Workaround for dbus-glib duplicate object path registrations (fdo #23297)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Fri Aug 14 14:30:55 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 14 Aug 2009 14:30:55 +0000 (UTC)
Subject: rpms/wxGTK/F-10 wxGTK.spec,1.43,1.44
Message-ID: <20090814143055.0E01211C00D0@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24071

Modified Files:
	wxGTK.spec 
Log Message:
* Fri Aug 14 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-2.1
- fix default plugin path for 64 bit arches



Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-10/wxGTK.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- wxGTK.spec	15 Jul 2009 17:55:06 -0000	1.43
+++ wxGTK.spec	14 Aug 2009 14:30:54 -0000	1.44
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 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
@@ -131,6 +131,9 @@ libraries or the X Window System.
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
+# fix plugin dir for 64-bit
+sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
+
 
 %build
 
@@ -270,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-2.1
+- fix default plugin path for 64 bit arches
+
 * Wed Jul 15 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-2
 - add fix for CVE-2009-2369 (#511279)
 



From jwilson at fedoraproject.org  Fri Aug 14 14:47:00 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri, 14 Aug 2009 14:47:00 +0000 (UTC)
Subject: rpms/linuxwacom/devel linuxwacom-0.8.2.2-xorg17-buildfix.patch, NONE,
	1.1 linuxwacom.spec, 1.80, 1.81
Message-ID: <20090814144700.0F3FA11C00D0@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27340

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.8.2.2-xorg17-buildfix.patch 
Log Message:
* Tue Jul 21 2009 Jarod Wilson <jarod at redhat.com> 0.8.2.2-13
- Patch up build for xorg 1.7 API changes


linuxwacom-0.8.2.2-xorg17-buildfix.patch:
 linuxwacom/src/xdrv/wcmCommon.c |    3 
 linuxwacom/src/xdrv/xf86Wacom.c |  130 +++++++++++++++++++++++++++++++++++-----
 src/xdrv/xf86Wacom.c            |    8 ++
 3 files changed, 124 insertions(+), 17 deletions(-)

--- NEW FILE linuxwacom-0.8.2.2-xorg17-buildfix.patch ---
diff -Nru linuxwacom-0.8.3-5/src/xdrv/wcmCommon.c linuxwacom/src/xdrv/wcmCommon.c
--- linuxwacom-0.8.3-5/src/xdrv/wcmCommon.c	2009-05-22 16:01:33.000000000 -0400
+++ linuxwacom/src/xdrv/wcmCommon.c	2009-06-19 14:43:05.000000000 -0400
@@ -19,6 +19,7 @@
 
 #include "xf86Wacom.h"
 #include "../include/Xwacom.h"
+#include <X11/extensions/XKBsrv.h>
 
 /*
 #if XF86_VERSION_MAJOR < 4
@@ -393,7 +394,7 @@
 	int i, j, alt_keysym = 0;
 
 	/* Now that we have the keycode look for key index */
-	KeySymsRec *ksr = &keydev->key->curKeySyms;
+	KeySymsRec *ksr = keydev->key->xkbInfo->desc;
 
 	for (i = ksr->minKeyCode; i <= ksr->maxKeyCode; i++)
 		if (ksr->map [(i - ksr->minKeyCode) * ksr->mapWidth] == keysym)
diff -Nru linuxwacom-0.8.3-5/src/xdrv/xf86Wacom.c linuxwacom/src/xdrv/xf86Wacom.c
--- linuxwacom-0.8.3-5/src/xdrv/xf86Wacom.c	2009-05-22 16:01:33.000000000 -0400
+++ linuxwacom/src/xdrv/xf86Wacom.c	2009-06-19 14:43:05.000000000 -0400
@@ -88,6 +88,11 @@
 #include "xf86Wacom.h"
 #include "wcmFilter.h"
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
+#include <X11/Xatom.h>
+#include <xserver-properties.h>
+#endif
+
 static int xf86WcmDevOpen(DeviceIntPtr pWcm);
 static void xf86WcmDevReadInput(LocalDevicePtr local);
 static void xf86WcmDevControlProc(DeviceIntPtr device, PtrCtrl* ctrl);
@@ -396,8 +401,11 @@
 		resolution = (int)((double)resolution * priv->factorX + 0.5);
 #endif
 
-		InitValuatorAxisStruct(local->dev, 0, topx, bottomx, 
-			resolution, 0, resolution); 
+		InitValuatorAxisStruct(local->dev, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X),
+#endif
+				topx, bottomx, resolution, 0, resolution);
 	}
 	else /* y ax */
 	{
@@ -420,8 +428,11 @@
 		resolution = (int)((double)resolution * priv->factorY + 0.5);
 #endif
 
-		InitValuatorAxisStruct(local->dev, 1, topy, bottomy, 
-			resolution, 0, resolution); 
+		InitValuatorAxisStruct(local->dev, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y),
+#endif
+				topy, bottomy, resolution, 0, resolution); 
 	}
 	return;
 }
@@ -618,6 +629,32 @@
 	return;
 }
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+static void xf86WcmInitButtonLabels(Atom *labels, int nlabels)
+{
+    memset(labels, 0, nlabels * sizeof(Atom));
+    switch(nlabels)
+    {
+        default:
+        case 7:
+            labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+        case 6:
+            labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+        case 5:
+            labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+        case 4:
+            labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+        case 3:
+            labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+        case 2:
+            labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+        case 1:
+            labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            break;
+    }
+}
+#endif
+
 /*****************************************************************************
  * xf86WcmRegisterX11Devices --
  *    Register the X11 input devices with X11 core.
@@ -630,6 +667,9 @@
 	CARD8 butmap[MAX_BUTTONS+1];
 	int nbaxes, nbbuttons, nbkeys;
 	int loop;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+	Atom *axis_labels, *btn_labels;
+#endif
 
 	/* Detect tablet configuration, if possible */
 	if (priv->common->wcmModel->DetectConfig)
@@ -645,6 +685,11 @@
 			            	     * nbbuttons = 0 while sending a beep 
 			             	     * This is only a workaround. 
 				     	     */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+	axis_labels = xcalloc(nbaxes, sizeof(Atom));
+	btn_labels = xcalloc(nbbuttons, sizeof(Atom));
+	xf86WcmInitButtonLabels(btn_labels, nbbuttons);
+#endif
 
 	DBG(10, priv->debugLevel, ErrorF("xf86WcmRegisterX11Devices "
 		"(%s) %d buttons, %d keys, %d axes\n",
@@ -656,8 +701,19 @@
 	for(loop=1; loop<=nbbuttons; loop++)
 		butmap[loop] = loop;
 
-	if (InitButtonClassDeviceStruct(local->dev, nbbuttons, butmap) == FALSE)
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+	btn_labels = xcalloc(nbbuttons, sizeof(Atom));
+	xf86WcmInitButtonLabels(btn_labels, nbbuttons);
+#endif
+	if (InitButtonClassDeviceStruct(local->dev, nbbuttons,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				btn_labels,
+#endif
+				butmap) == FALSE)
 	{
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+		xfree(btn_labels);
+#endif
 		ErrorF("unable to allocate Button class device\n");
 		return FALSE;
 	}
@@ -685,6 +741,9 @@
 		nbaxes = priv->naxes = 6;
 
 	if (InitValuatorClassDeviceStruct(local->dev, nbaxes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+					  axis_labels,
+#endif
 #if WCM_XINPUTABI_MAJOR == 0
 					  xf86GetMotionEvents,
 					  local->history_size,
@@ -776,14 +835,25 @@
 	xf86WcmRotateTablet(local, common->wcmRotate);
 
 	/* pressure */
-	InitValuatorAxisStruct(local->dev, 2, 0, 
-		common->wcmMaxZ, 1, 1, 1);
+	InitValuatorAxisStruct(local->dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE),
+#endif
+		       	0, common->wcmMaxZ, 1, 1, 1);
 
 	if (IsCursor(priv))
 	{
 		/* z-rot and throttle */
-		InitValuatorAxisStruct(local->dev, 3, -900, 899, 1, 1, 1);
-		InitValuatorAxisStruct(local->dev, 4, -1023, 1023, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_RZ),
+#endif
+				-900, 899, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 4,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_THROTTLE),
+#endif
+				-1023, 1023, 1, 1, 1);
 	}
 	else if (IsPad(priv))
 	{
@@ -791,15 +861,31 @@
 		if (strstr(common->wcmModel->name, "Intuos3") || 
 			strstr(common->wcmModel->name, "CintiqV5")) 
 		{
-			InitValuatorAxisStruct(local->dev, 3, 0, common->wcmMaxStripX, 1, 1, 1);
-			InitValuatorAxisStruct(local->dev, 4, 0, common->wcmMaxStripY, 1, 1, 1);
+			InitValuatorAxisStruct(local->dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_HAT0X), // TODO
+#endif
+					0, common->wcmMaxStripX, 1, 1, 1);
+			InitValuatorAxisStruct(local->dev, 4,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_HAT0Y), // TODO
+#endif
+					0, common->wcmMaxStripY, 1, 1, 1);
 		}
 	}
 	else
 	{
 		/* tilt-x and tilt-y */
-		InitValuatorAxisStruct(local->dev, 3, -64, 63, 1, 1, 1);
-		InitValuatorAxisStruct(local->dev, 4, -64, 63, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X),
+#endif
+				-64, 63, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 4,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y),
+#endif
+				-64, 63, 1, 1, 1);
 	}
 
 	if ((strstr(common->wcmModel->name, "Intuos3") || 
@@ -807,16 +893,28 @@
 		strstr(common->wcmModel->name, "Intuos4")) 
 			&& IsStylus(priv))
 		/* Art Marker Pen rotation */
-		InitValuatorAxisStruct(local->dev, 5, -900, 899, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 5,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_RZ), // TODO
+#endif
+				-900, 899, 1, 1, 1);
 	else if ((strstr(common->wcmModel->name, "Bamboo") ||
 		strstr(common->wcmModel->name, "Intuos4"))
 			&& IsPad(priv))
 		/* Touch ring */
-		InitValuatorAxisStruct(local->dev, 5, 0, 71, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 5,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MISC), // TODO
+#endif
+				0, 71, 1, 1, 1);
 	else
 	{
 		/* absolute wheel */
-		InitValuatorAxisStruct(local->dev, 5, 0, 1023, 1, 1, 1);
+		InitValuatorAxisStruct(local->dev, 5,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+				XIGetKnownProperty(AXIS_LABEL_PROP_ABS_WHEEL),
+#endif
+				0, 1023, 1, 1, 1);
 	}
 
 	if (IsTouch(priv))
--- linuxwacom-0.8.3-5/src/xdrv/xf86Wacom.c	2009-06-22 12:16:42.000000000 -0400
+++ linuxwacom/src/xdrv/xf86Wacom.c	2009-06-22 12:09:09.000000000 -0400
@@ -438,6 +438,7 @@
 }
 
 #ifdef WCM_KEY_SENDING_SUPPORT
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
 /*****************************************************************************
  * xf86WcmRegisterX11Devices --
  *    Register the X11 input devices with X11 core.
@@ -585,6 +586,7 @@
 	{ XK_Mode_switch,	Mod3Mask }, /*AltMask*/
 	{ NoSymbol,	0 }
 };
+#endif
 #endif /* WCM_KEY_SENDING_SUPPORT */
 
 /*****************************************************************************
@@ -768,6 +770,7 @@
 #ifdef WCM_KEY_SENDING_SUPPORT
 		if (nbkeys)
 		{
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
 			KeySymsRec wacom_keysyms;
 			CARD8 modmap[MAP_LENGTH];
 			int i,j;
@@ -798,6 +801,9 @@
 			wacom_keysyms.maxKeyCode = 255;
 			wacom_keysyms.mapWidth = 2;
 			if (InitKeyClassDeviceStruct(local->dev, &wacom_keysyms, modmap) == FALSE)
+#else
+			if (!InitKeyboardDeviceStruct(local->dev, NULL, xf86WcmBellCallback, xf86WcmKbdCtrlCallback))
+#endif
 			{
 				ErrorF("unable to init key class device\n");
 				return FALSE;
@@ -805,11 +811,13 @@
 		}
 
 #ifndef WCM_XFREE86
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
 		if(InitKbdFeedbackClassDeviceStruct(local->dev, xf86WcmBellCallback,
 				xf86WcmKbdCtrlCallback) == FALSE) {
 			ErrorF("unable to init kbd feedback device struct\n");
 			return FALSE;
 		}
+#endif
 
 		if(InitLedFeedbackClassDeviceStruct (local->dev, xf86WcmKbdLedCallback) == FALSE) {
 			ErrorF("unable to init led feedback device struct\n");


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- linuxwacom.spec	20 Jul 2009 21:58:30 -0000	1.80
+++ linuxwacom.spec	14 Aug 2009 14:46:59 -0000	1.81
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -32,6 +32,9 @@ Patch8:		linuxwacom-0.8.2.2-hal-setup.pa
 Patch9:		linuxwacom-0.8.2.2-serial-check.patch
 # backport of upstream intuos4 support
 Patch10:	linuxwacom-0.8.2.2-intuos4-support-backport.patch
+# patch up for new Xorg API changes, extracted from linuxwacom-devel list
+# https://sourceforge.net/mailarchive/forum.php?thread_name=200906181709.56283.neitzke%40physics.harvard.edu&forum_name=linuxwacom-devel
+Patch11:	linuxwacom-0.8.2.2-xorg17-buildfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -68,6 +71,7 @@ compiling applications for manipulating 
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 
@@ -130,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Tue Jul 21 2009 Jarod Wilson <jarod at redhat.com> 0.8.2.2-13
+- Patch up build for xorg 1.7 API changes
+
 * Mon Jul 20 2009 Jarod Wilson <jarod at redhat.com> 0.8.2.2-12
 - Backport support for Intuos4 tablets from linuxwacom-dev branch
 



From hadess at fedoraproject.org  Fri Aug 14 14:50:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 14:50:11 +0000 (UTC)
Subject: rpms/gvfs/devel 0001-Add-AFC-backend.patch, 1.1, 1.2 gvfs.spec,
	1.148, 
	1.149 0001-Revert-part-of-the-excessive-function-culling.patch,
	1.1, NONE
Message-ID: <20090814145012.0189D11C043D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28060

Modified Files:
	0001-Add-AFC-backend.patch gvfs.spec 
Removed Files:
	0001-Revert-part-of-the-excessive-function-culling.patch 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-6
- Update AFC patch


0001-Add-AFC-backend.patch:
 configure.ac                                            |   26 
 daemon/Makefile.am                                      |   23 
 daemon/afc.mount.in                                     |    7 
 daemon/gvfsbackendafc.c                                 | 1228 ++++++++++++++++
 daemon/gvfsbackendafc.h                                 |   37 
 monitor/Makefile.am                                     |    6 
 monitor/afc/Makefile.am                                 |   49 
 monitor/afc/afc.monitor                                 |    5 
 monitor/afc/afcvolume.c                                 |  353 ++++
 monitor/afc/afcvolume.h                                 |   44 
 monitor/afc/afcvolumemonitor.c                          |  224 ++
 monitor/afc/afcvolumemonitor.h                          |   39 
 monitor/afc/afcvolumemonitordaemon.c                    |   31 
 monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in |    5 
 14 files changed, 2074 insertions(+), 3 deletions(-)

Index: 0001-Add-AFC-backend.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/0001-Add-AFC-backend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Add-AFC-backend.patch	11 Aug 2009 09:11:03 -0000	1.1
+++ 0001-Add-AFC-backend.patch	14 Aug 2009 14:50:11 -0000	1.2
@@ -1,4 +1,4 @@
-From 1ba08909cdc395c14116d7cdf0f8f3442ba5e4c0 Mon Sep 17 00:00:00 2001
+From 8675a60e030fc91292d19cfd2cd9a6d74dd1776f Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 6 Aug 2009 22:55:47 +0100
 Subject: [PATCH] Add AFC backend
@@ -15,18 +15,18 @@ Bastien Nocera <hadess at hadess.net>
  configure.ac                                       |   26 +-
  daemon/Makefile.am                                 |   23 +
  daemon/afc.mount.in                                |    7 +
- daemon/gvfsbackendafc.c                            | 1226 ++++++++++++++++++++
+ daemon/gvfsbackendafc.c                            | 1228 ++++++++++++++++++++
  daemon/gvfsbackendafc.h                            |   37 +
  monitor/Makefile.am                                |    6 +-
  monitor/afc/Makefile.am                            |   49 +
  monitor/afc/afc.monitor                            |    5 +
- monitor/afc/afcvolume.c                            |  336 ++++++
+ monitor/afc/afcvolume.c                            |  353 ++++++
  monitor/afc/afcvolume.h                            |   44 +
- monitor/afc/afcvolumemonitor.c                     |  215 ++++
+ monitor/afc/afcvolumemonitor.c                     |  224 ++++
  monitor/afc/afcvolumemonitor.h                     |   39 +
  monitor/afc/afcvolumemonitordaemon.c               |   31 +
  .../org.gtk.Private.AfcVolumeMonitor.service.in    |    4 +
- 14 files changed, 2046 insertions(+), 2 deletions(-)
+ 14 files changed, 2074 insertions(+), 2 deletions(-)
  create mode 100644 daemon/afc.mount.in
  create mode 100644 daemon/gvfsbackendafc.c
  create mode 100644 daemon/gvfsbackendafc.h
@@ -40,7 +40,7 @@ Bastien Nocera <hadess at hadess.net>
  create mode 100644 monitor/afc/org.gtk.Private.AfcVolumeMonitor.service.in
 
 diff --git a/configure.ac b/configure.ac
-index 7f1ec16..4675ae9 100644
+index 9bfb8ad..6b3838c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -324,6 +324,28 @@ AC_SUBST(CDDA_CFLAGS)
@@ -91,7 +91,7 @@ index 7f1ec16..4675ae9 100644
          DNS-SD support:               $msg_avahi
  	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 733fa41..4c9e4af 100644
+index a03eba1..cf68391 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
 @@ -101,6 +101,12 @@ mount_DATA += archive.mount
@@ -107,7 +107,7 @@ index 733fa41..4c9e4af 100644
  EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
  
  DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
-@@ -433,3 +439,20 @@ gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS)
+@@ -442,3 +448,20 @@ gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS)
  if HAVE_AVAHI
  gvfsd_dav_LDADD += $(top_builddir)/common/libgvfscommon-dnssd.la
  endif
@@ -143,10 +143,10 @@ index 0000000..727d833
 +
 diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
 new file mode 100644
-index 0000000..97d0a22
+index 0000000..d30ede8
 --- /dev/null
 +++ b/daemon/gvfsbackendafc.c
-@@ -0,0 +1,1226 @@
+@@ -0,0 +1,1228 @@
 +/*
 + * gvfs/daemon/gvfsbackendafc.c
 + *
@@ -165,7 +165,6 @@ index 0000000..97d0a22
 +#include <glib/gi18n.h>
 +#include <errno.h>
 +
-+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
 +#include <gudev/gudev.h>
 +
 +#include <libiphone/libiphone.h>
@@ -239,7 +238,7 @@ index 0000000..97d0a22
 +      { -1 }
 +};
 +
-+/** 
++/**
 + * Tries to convert the AFC error value into a GIOError.
 + *
 + * @param client AFC client to retrieve status value from.
@@ -414,7 +413,7 @@ index 0000000..97d0a22
 +  int retries;
 +  iphone_error_t err;
 +  lockdownd_client_t lockdown_cli = NULL;
-+  const gchar * const subsystems[] = { "usb_endpoint", NULL };
++  const gchar * const subsystems[] = { "usb", NULL };
 +
 +  self = G_VFS_BACKEND_AFC(backend);
 +  self->connected = FALSE;
@@ -505,7 +504,7 @@ index 0000000..97d0a22
 +              /* translators:
 +               * This is the device name, with the service being browsed in brackets, eg.:
 +               * Alan Smithee's iPhone (Service 2 on Apple Mobile Device */
-+              g_vfs_backend_set_display_name (G_VFS_BACKEND(self), 
++              g_vfs_backend_set_display_name (G_VFS_BACKEND(self),
 +                                              g_strdup_printf (_("%s (%s)"), display_name, self->service));
 +            }
 +          else
@@ -566,10 +565,13 @@ index 0000000..97d0a22
 +
 +static void
 +g_vfs_backend_afc_unmount (GVfsBackend *backend,
-+                           GVfsJobUnmount * job)
++                           GVfsJobUnmount *job,
++                           GMountUnmountFlags flags,
++                           GMountSource *mount_source)
 +{
 +  GVfsBackendAfc *self;
 +
++  /* FIXME: check on G_MOUNT_UNMOUNT_FORCE flag */
 +  self = G_VFS_BACKEND_AFC (backend);
 +  g_vfs_backend_afc_close_connection (self);
 +  g_vfs_job_succeeded (G_VFS_JOB(job));
@@ -768,7 +770,7 @@ index 0000000..97d0a22
 +  if (req > 0 &&
 +      G_UNLIKELY(g_vfs_backend_afc_check (afc_file_read (self->afc_cli,
 +                                                         fd, buffer, req, &nread),
-+                                          G_VFS_JOB(job)))) 
++                                          G_VFS_JOB(job))))
 +    {
 +      return;
 +    }
@@ -797,7 +799,7 @@ index 0000000..97d0a22
 +  if (sz > 0 &&
 +      G_UNLIKELY(g_vfs_backend_afc_check(afc_file_write (self->afc_cli,
 +                                                         fd, buffer, sz, &nwritten),
-+                                         G_VFS_JOB(job)))) 
++                                         G_VFS_JOB(job))))
 +    {
 +      return;
 +    }
@@ -1179,19 +1181,19 @@ index 0000000..97d0a22
 +      g_strfreev (kvps);
 +
 +      g_file_info_set_attribute_uint32 (info,
-+                                        G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE, 
++                                        G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE,
 +                                        (guint32) blocksize);
-+      g_file_info_set_attribute_uint64 (info, 
-+                                        G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, 
++      g_file_info_set_attribute_uint64 (info,
++                                        G_FILE_ATTRIBUTE_FILESYSTEM_SIZE,
 +                                        (guint64) totalspace);
-+      g_file_info_set_attribute_uint64 (info, 
-+                                        G_FILE_ATTRIBUTE_FILESYSTEM_FREE, 
++      g_file_info_set_attribute_uint64 (info,
++                                        G_FILE_ATTRIBUTE_FILESYSTEM_FREE,
 +                                        (guint64) freespace);
-+      g_file_info_set_attribute_boolean (info, 
-+                                         G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, 
++      g_file_info_set_attribute_boolean (info,
++                                         G_FILE_ATTRIBUTE_FILESYSTEM_READONLY,
 +                                         FALSE);
 +      g_file_info_set_attribute_uint32 (info,
-+                                        G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW, 
++                                        G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW,
 +                                        G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL);
 +    }
 +
@@ -1502,10 +1504,10 @@ index 0000000..1663573
 +
 diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
 new file mode 100644
-index 0000000..fe290a1
+index 0000000..688f75b
 --- /dev/null
 +++ b/monitor/afc/afcvolume.c
-@@ -0,0 +1,336 @@
+@@ -0,0 +1,353 @@
 +/*
 + * gvfs/monitor/afc/afc-volume.c
 + *
@@ -1592,7 +1594,7 @@ index 0000000..fe290a1
 +      err = iphone_get_device_by_uuid (&dev, self->uuid);
 +      if (err == IPHONE_E_SUCCESS)
 +        break;
-+      g_usleep (G_USEC_PER_SEC); 
++      g_usleep (G_USEC_PER_SEC);
 +  } while (retries++ < 10);
 +
 +  if (err != IPHONE_E_SUCCESS)
@@ -1624,7 +1626,7 @@ index 0000000..fe290a1
 +      model = afc_get_device_info_field (afc_cli, "Model");
 +      if (model != NULL)
 +        {
-+          if(strstr(model, "iPod") != NULL)
++          if(g_str_has_prefix(model, "iPod") != FALSE)
 +            {
 +              g_free (self->icon);
 +              self->icon = g_strdup ("multimedia-player-apple-ipod-touch");
@@ -1699,6 +1701,17 @@ index 0000000..fe290a1
 +  return TRUE;
 +}
 +
++static GDrive *
++g_vfs_afc_volume_get_drive (GVolume *volume)
++{
++  return NULL;
++}
++
++static GMount *
++g_vfs_afc_volume_get_mount (GVolume *volume)
++{
++  return NULL;
++}
 +
 +typedef struct
 +{
@@ -1778,7 +1791,7 @@ index 0000000..fe290a1
 +  char *id;
 +
 +  id = NULL;
-+  if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
++  if (g_str_equal (kind, G_VOLUME_IDENTIFIER_KIND_UUID) != FALSE)
 +    id = g_strdup (afc_volume->uuid);
 +
 +  return id;
@@ -1810,7 +1823,11 @@ index 0000000..fe290a1
 +static GFile *
 +g_vfs_afc_volume_get_activation_root (GVolume *volume)
 +{
-+  GFile *root = g_object_get_data (G_OBJECT (volume), "root");
++  GFile *root;
++
++  root = g_object_get_data (G_OBJECT (volume), "root");
++  if (root == NULL)
++    return NULL;
 +
 +  return g_object_ref (root);
 +}
@@ -1821,6 +1838,8 @@ index 0000000..fe290a1
 +  iface->get_name = g_vfs_afc_volume_get_name;
 +  iface->get_icon = g_vfs_afc_volume_get_icon;
 +  iface->get_uuid = g_vfs_afc_volume_get_uuid;
++  iface->get_drive = g_vfs_afc_volume_get_drive;
++  iface->get_mount = g_vfs_afc_volume_get_mount;
 +  iface->can_mount = g_vfs_afc_volume_can_mount;
 +  iface->should_automount = g_vfs_afc_volume_should_automount;
 +  iface->mount_fn = g_vfs_afc_volume_mount;
@@ -1894,10 +1913,10 @@ index 0000000..de24cd5
 + */
 diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
 new file mode 100644
-index 0000000..c98b603
+index 0000000..93926eb
 --- /dev/null
 +++ b/monitor/afc/afcvolumemonitor.c
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,224 @@
 +/*
 + * gvfs/monitor/afc/afc-volume-monitor.c
 + *
@@ -1977,33 +1996,28 @@ index 0000000..c98b603
 +                          gpointer      user_data)
 +{
 +  GVfsAfcVolumeMonitor *self;
-+  const char *vendor, *devname, *uuid;
++  const char *vendor, *uuid;
 +
 +  self = G_VFS_AFC_VOLUME_MONITOR(user_data);
 +
 +  /* Vendor is Apple? */
 +  vendor = g_udev_device_get_property (device, "ID_VENDOR");
 +  if (vendor == NULL ||
-+      g_str_equal (vendor, "Apple_Inc.") == FALSE)
-+    return;
-+
-+  /* Device is for end point 85? */
-+  devname = g_udev_device_get_device_file (device);
-+  if (devname == NULL ||
-+      g_str_has_suffix (devname, "_ep85") == FALSE)
++      g_str_equal (vendor, "Apple_Inc.") == FALSE) {
 +    return;
++  }
 +
 +  /* Get us a UUID */
 +  uuid = g_udev_device_get_property (device, "ID_SERIAL_SHORT");
 +  if (uuid == NULL)
 +    {
-+      g_warning ("Could not get UUID for device '%s'", devname);
++      g_message ("No serial for device");
 +      return;
 +    }
 +
 +  if (g_str_equal (action, "add") != FALSE)
 +    g_vfs_afc_monitor_create_volume (self, uuid);
-+  else
++  else if (g_str_equal (action, "remove") != FALSE)
 +    g_vfs_afc_monitor_remove_volume (self, uuid);
 +}
 +
@@ -2013,7 +2027,7 @@ index 0000000..c98b603
 +{
 +  GVfsAfcVolumeMonitor *self;
 +  GList *devices, *l;
-+  const gchar * const subsystems[] = { "usb_endpoint", NULL };
++  const gchar * const subsystems[] = { "usb", NULL };
 +
 +  /* Boilerplate code to chain from parent. */
 +  self = G_VFS_AFC_VOLUME_MONITOR((*G_OBJECT_CLASS(g_vfs_afc_volume_monitor_parent_class)->constructor)(type, ncps, cps));
@@ -2066,6 +2080,12 @@ index 0000000..c98b603
 +}
 +
 +static GList *
++g_vfs_afc_volume_monitor_get_mounts (GVolumeMonitor *_self)
++{
++  return NULL;
++}
++
++static GList *
 +g_vfs_afc_volume_monitor_get_volumes (GVolumeMonitor *_self)
 +{
 +  GVfsAfcVolumeMonitor *self;
@@ -2079,6 +2099,12 @@ index 0000000..c98b603
 +  return l;
 +}
 +
++static GList *
++g_vfs_afc_volume_monitor_get_connected_drives (GVolumeMonitor *_self)
++{
++  return NULL;
++}
++
 +static gboolean
 +g_vfs_afc_volume_monitor_is_supported (void)
 +{
@@ -2094,7 +2120,9 @@ index 0000000..c98b603
 +  gobject_class->constructor = g_vfs_afc_volume_monitor_constructor;
 +  gobject_class->finalize = g_vfs_afc_volume_monitor_finalize;
 +
++  monitor_class->get_mounts = g_vfs_afc_volume_monitor_get_mounts;
 +  monitor_class->get_volumes = g_vfs_afc_volume_monitor_get_volumes;
++  monitor_class->get_connected_drives = g_vfs_afc_volume_monitor_get_connected_drives;
 +  monitor_class->is_supported = g_vfs_afc_volume_monitor_is_supported;
 +}
 +


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- gvfs.spec	13 Aug 2009 14:16:57 -0000	1.148
+++ gvfs.spec	14 Aug 2009 14:50:11 -0000	1.149
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -48,7 +48,6 @@ Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 Patch9: gvfs-1.2.3-sftp-40sec-timeout.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
 Patch10: 0001-Add-AFC-backend.patch
-Patch11: 0001-Revert-part-of-the-excessive-function-culling.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -301,6 +300,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-6
+- Update AFC patch
+
 * Thu Aug 13 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-5
 - More complete fix for DAV mount path prefix issues
 


--- 0001-Revert-part-of-the-excessive-function-culling.patch DELETED ---



From hadess at fedoraproject.org  Fri Aug 14 14:56:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 14:56:16 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.149,1.150
Message-ID: <20090814145616.92F8A11C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29404

Modified Files:
	gvfs.spec 
Log Message:
fix patch application


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- gvfs.spec	14 Aug 2009 14:50:11 -0000	1.149
+++ gvfs.spec	14 Aug 2009 14:56:16 -0000	1.150
@@ -146,7 +146,6 @@ and iPod Touches to applications using g
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 %patch10 -p1 -b .afc
-%patch11 -p1 -b .afc-crasher
 
 %build
 



From twaugh at fedoraproject.org  Fri Aug 14 15:03:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 14 Aug 2009 15:03:14 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-hplip-hack.patch, NONE,
	1.1 system-config-printer.spec, 1.279, 1.280
Message-ID: <20090814150314.49B8911C00D0@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-serv31534

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-hplip-hack.patch 
Log Message:
* Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-4
- Compare MFG and MDL fields case insensitively when adding automatic
  queues, because HPLIP provides them with different case than the
  actual devices do.  Upstream HPLIP bug:
  https://bugs.launchpad.net/hplip/+bug/405804


system-config-printer-hplip-hack.patch:
 udev-configure-printer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-hplip-hack.patch ---
diff -up system-config-printer-1.1.11/udev/udev-configure-printer.c.hplip-hack system-config-printer-1.1.11/udev/udev-configure-printer.c
--- system-config-printer-1.1.11/udev/udev-configure-printer.c.hplip-hack	2009-08-07 17:42:55.000000000 +0100
+++ system-config-printer-1.1.11/udev/udev-configure-printer.c	2009-08-14 15:50:32.302334316 +0100
@@ -791,8 +791,8 @@ find_matching_device_uris (struct device
 
       /* Now check the manufacturer and model names. */
       if (device_uri && this_id.mfg && this_id.mdl &&
-	  !strcmp (this_id.mfg, id->mfg) &&
-	  !strcmp (this_id.mdl, id->mdl))
+	  !strcasecmp (this_id.mfg, id->mfg) &&
+	  !strcasecmp (this_id.mdl, id->mdl))
 	{
 	  /* We've checked everything except the serial numbers.  This
 	   * is more complicated.  Some devices include a serial


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- system-config-printer.spec	14 Aug 2009 14:18:40 -0000	1.279
+++ system-config-printer.spec	14 Aug 2009 15:03:14 -0000	1.280
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-getdevices.patch
+Patch2: system-config-printer-hplip-hack.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .getdevices
+%patch2 -p1 -b .hplip-hack
 
 %build
 %configure --with-udev-rules
@@ -188,6 +190,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-4
+- Compare MFG and MDL fields case insensitively when adding automatic
+  queues, because HPLIP provides them with different case than the
+  actual devices do.  Upstream HPLIP bug:
+  https://bugs.launchpad.net/hplip/+bug/405804
+
 * Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-3
 - Own /var/run/udev-configure-printer.
 



From hadess at fedoraproject.org  Fri Aug 14 15:36:07 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 15:36:07 +0000 (UTC)
Subject: rpms/usbmuxd/devel 0002-Port-udev-rules-to-newer-kernels.patch, NONE,
	1.1 usbmuxd.spec, 1.1, 1.2
Message-ID: <20090814153607.A5C7F11C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6024

Modified Files:
	usbmuxd.spec 
Added Files:
	0002-Port-udev-rules-to-newer-kernels.patch 
Log Message:
* 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)


0002-Port-udev-rules-to-newer-kernels.patch:
 85-usbmuxd.rules.in |   25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

--- NEW FILE 0002-Port-udev-rules-to-newer-kernels.patch ---
>From 20b807e0d003d97cbf526f8727db9e65eaae0fdf Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 14 Aug 2009 16:25:24 +0100
Subject: [PATCH 2/2] Port udev rules to newer kernels

Remove use of usb_endpoint, it's gone in newer kernels.
---
 udev/85-usbmuxd.rules.in |   24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/udev/85-usbmuxd.rules.in b/udev/85-usbmuxd.rules.in
index 82221d4..c0a3900 100644
--- a/udev/85-usbmuxd.rules.in
+++ b/udev/85-usbmuxd.rules.in
@@ -1,23 +1,7 @@
 # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
 
-# Skip anything non Apple
-ACTION=="add|remove", SUBSYSTEM!="usb|usb_endpoint", ATTRS{idVendor}!="05ac", GOTO="usbmuxd_rules_end"
+# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-4]", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@prefix@/sbin/usbmuxd -u"
 
-# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="1290|1291|1292|1293|1294", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", GOTO="usbmuxd_rules_end"
-
-LABEL="usbmuxd_rules_usbmux"
-
-# Only apply to usb endpoints
-ACTION=="add|remove", SUBSYSTEM!="usb_endpoint", GOTO="usbmuxd_rules_end"
-
-# Setup cute names for the endpoints
-ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep04", IMPORT{program}="usb_id %p --export", SYMLINK+="usbmux/$env{ID_SERIAL_SHORT}/%s{direction}"
-ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", IMPORT{program}="usb_id %p --export", SYMLINK+="usbmux/$env{ID_SERIAL_SHORT}/%s{direction}"
-
-# Start and stop 'usbmuxd' as required
-ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", RUN+="@prefix@/sbin/usbmuxd -u"
-ACTION=="remove", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", RUN+="@prefix@/sbin/usbmuxd -x"
-
-# skip
-LABEL="usbmuxd_rules_end"
+# Exit usbmuxd when the last phone is removed
+ACTION=="remove", SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="05ac", ENV{ID_MODEL_ID}=="129[0-4]", RUN+="@prefix@/sbin/usbmuxd -x"
-- 
1.6.2.5



Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/usbmuxd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- usbmuxd.spec	11 Aug 2009 07:48:20 -0000	1.1
+++ usbmuxd.spec	14 Aug 2009 15:36:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		usbmuxd
 Version:	0.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 
 Group:		Applications/System
@@ -12,6 +12,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	libusb-devel
 BuildRequires:	automake autoconf libtool
 
+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
@@ -28,6 +30,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .new-kernel
 
 %build
 %configure --enable-static=no
@@ -65,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* 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)
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
 - Update to 0.1.4
 



From pwouters at fedoraproject.org  Fri Aug 14 15:50:52 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 14 Aug 2009 15:50:52 +0000 (UTC)
Subject: rpms/ldns/devel .cvsignore, 1.10, 1.11 ldns.spec, 1.47, 1.48 sources,
	1.14, 1.15
Message-ID: <20090814155052.46E0D11C00D0@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8903

Modified Files:
	.cvsignore ldns.spec sources 
Log Message:
* Fri Aug 14 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
- Updated to 1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Feb 2009 18:25:11 -0000	1.10
+++ .cvsignore	14 Aug 2009 15:50:51 -0000	1.11
@@ -4,3 +4,5 @@ ldns-1.3.0.tar.gz
 ldns-1.4.0.tar.gz
 ldns-1.5.0.tar.gz
 ldns-1.5.1.tar.gz
+ldns-1.6.0.tar.gz
+ldns-1.6.1.tar.gz


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ldns.spec	25 Jul 2009 05:02:57 -0000	1.47
+++ ldns.spec	14 Aug 2009 15:50:52 -0000	1.48
@@ -1,11 +1,10 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.6.0
-Release: 5%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
-Patch0: ldns-ssl.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
@@ -32,13 +31,12 @@ The devel package contains the ldns libr
 #libtoolize
 #autoreconf
 
-%patch0 -p1
-
 %build
-%configure --disable-rpath --with-sha2 --without-ssl
-make %{?_smp_mflags}
-(cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ --without-ssl)
-(cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ --without-ssl)
+%configure --disable-rpath --with-sha2 
+(cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
+(cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
+
+make %{?_smp_mflags} 
 ( cd drill ; make %{?_smp_mflags} )
 ( cd examples ; make %{?_smp_mflags} )
 make %{?_smp_mflags} doc
@@ -90,6 +88,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Aug 14 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
+- Updated to 1.6.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -105,6 +106,10 @@ rm -rf %{buildroot}
 - Updated to 1.6.0
 - (did not yet compile with --without-ssl due to compile failures)
 
+* Fri Jul 10 2009 Paul Wouters <paul at xelerance.com> - 1.6.0-1
+- Updated to 1.6.0
+- Compile without openssl
+
 * Thu Apr 16 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-4
 - Memory management bug when generating a sha256 key, see:
   https://bugzilla.redhat.com/show_bug.cgi?id=493953


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Jul 2009 04:29:04 -0000	1.14
+++ sources	14 Aug 2009 15:50:52 -0000	1.15
@@ -1 +1 @@
-cd0d4d34a60d018fbfedae6d3ee4049b  ldns-1.6.0.tar.gz
+a44dafecdcc49aaea5d20ae15bc738c0  ldns-1.6.1.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 14 15:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 15:59:42 +0000
Subject: [pkgdb] fbzx was added for musuruan
Message-ID: <20090814155943.CC51F10F84F@bastion2.fedora.phx.redhat.com>

tibbs has added Package fbzx with summary A ZX Spectrum emulator for FrameBuffer
tibbs has approved Package fbzx
tibbs has added a Fedora devel branch for fbzx with an owner of musuruan
tibbs has approved fbzx in Fedora devel
tibbs has approved Package fbzx
tibbs has set commit to Approved for 107427 on fbzx (Fedora devel)
tibbs has set checkout to Approved for 107427 on fbzx (Fedora devel)
tibbs has set build to Approved for 107427 on fbzx (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fbzx



From pkgdb at fedoraproject.org  Fri Aug 14 15:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 15:59:43 +0000
Subject: [pkgdb] fbzx summary updated by tibbs
Message-ID: <20090814155944.9002410F85A@bastion2.fedora.phx.redhat.com>

tibbs set package fbzx summary to A ZX Spectrum emulator for FrameBuffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fbzx



From pkgdb at fedoraproject.org  Fri Aug 14 15:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 15:59:43 +0000
Subject: [pkgdb] fbzx (Fedora, 11) updated by tibbs
Message-ID: <20090814155944.C0C1810F85D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for fbzx
tibbs has set commit to Approved for 107427 on fbzx (Fedora 11)
tibbs has set checkout to Approved for 107427 on fbzx (Fedora 11)
tibbs has set build to Approved for 107427 on fbzx (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fbzx



From tibbs at fedoraproject.org  Fri Aug 14 15:59:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 15:59:50 +0000 (UTC)
Subject: rpms/fbzx - New directory
Message-ID: <20090814155950.1BEC711C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fbzx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ10701/rpms/fbzx

Log Message:
Directory /cvs/pkgs/rpms/fbzx added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 15:59:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 15:59:50 +0000 (UTC)
Subject: rpms/fbzx/devel - New directory
Message-ID: <20090814155950.4078411C0426@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fbzx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ10701/rpms/fbzx/devel

Log Message:
Directory /cvs/pkgs/rpms/fbzx/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 15:59:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 15:59:56 +0000 (UTC)
Subject: rpms/fbzx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090814155956.A372311C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fbzx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ10701/rpms/fbzx/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fbzx


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fbzx
# $Id: Makefile,v 1.1 2009/08/14 15:59:56 tibbs Exp $
NAME := fbzx
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 14 15:59:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 15:59:56 +0000 (UTC)
Subject: rpms/fbzx Makefile,NONE,1.1
Message-ID: <20090814155956.70E9F11C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fbzx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ10701/rpms/fbzx

Added Files:
	Makefile 
Log Message:
Setup of module fbzx


--- NEW FILE Makefile ---
# Top level Makefile for module fbzx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 14 15:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 15:59:43 +0000
Subject: [pkgdb] fbzx (Fedora, 11) updated by tibbs
Message-ID: <20090814155945.200C710F86C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for fbzx
tibbs has set commit to Approved for 107427 on fbzx (Fedora 10)
tibbs has set checkout to Approved for 107427 on fbzx (Fedora 10)
tibbs has set build to Approved for 107427 on fbzx (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fbzx



From pkgdb at fedoraproject.org  Fri Aug 14 16:00:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:00:46 +0000
Subject: [pkgdb] php-ezc-AuthenticationDatabaseTiein was added for llaumgui
Message-ID: <20090814160046.BEBFE10F855@bastion2.fedora.phx.redhat.com>

tibbs has added Package php-ezc-AuthenticationDatabaseTiein with summary Provides a Database filter for the Authentication component
tibbs has approved Package php-ezc-AuthenticationDatabaseTiein
tibbs has added a Fedora devel branch for php-ezc-AuthenticationDatabaseTiein with an owner of llaumgui
tibbs has approved php-ezc-AuthenticationDatabaseTiein in Fedora devel
tibbs has approved Package php-ezc-AuthenticationDatabaseTiein
tibbs has set commit to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora devel)
tibbs has set checkout to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora devel)
tibbs has set build to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-AuthenticationDatabaseTiein



From pkgdb at fedoraproject.org  Fri Aug 14 16:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:00:47 +0000
Subject: [pkgdb] php-ezc-AuthenticationDatabaseTiein summary updated by tibbs
Message-ID: <20090814160047.D979B10F85A@bastion2.fedora.phx.redhat.com>

tibbs set package php-ezc-AuthenticationDatabaseTiein summary to Provides a Database filter for the Authentication component

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-AuthenticationDatabaseTiein



From pkgdb at fedoraproject.org  Fri Aug 14 16:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:00:47 +0000
Subject: [pkgdb] php-ezc-AuthenticationDatabaseTiein (Fedora,
	11) updated by tibbs
Message-ID: <20090814160048.2A9B010F85D@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for php-ezc-AuthenticationDatabaseTiein
tibbs has set commit to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora 11)
tibbs has set checkout to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora 11)
tibbs has set build to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-AuthenticationDatabaseTiein



From pkgdb at fedoraproject.org  Fri Aug 14 16:00:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:00:47 +0000
Subject: [pkgdb] php-ezc-AuthenticationDatabaseTiein (Fedora,
	11) updated by tibbs
Message-ID: <20090814160048.680C210F86C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for php-ezc-AuthenticationDatabaseTiein
tibbs has set commit to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora 10)
tibbs has set checkout to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora 10)
tibbs has set build to Approved for 107427 on php-ezc-AuthenticationDatabaseTiein (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-AuthenticationDatabaseTiein



From harald at fedoraproject.org  Fri Aug 14 16:02:07 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 14 Aug 2009 16:02:07 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.6, 1.7 dracut.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090814160207.50E4A11C00D0@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12035

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
- version 0.9
- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Aug 2009 15:13:34 -0000	1.6
+++ .cvsignore	14 Aug 2009 16:02:06 -0000	1.7
@@ -1 +1 @@
-dracut-0.8.tar.bz2
+dracut-0.9.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dracut.spec	6 Aug 2009 15:13:34 -0000	1.11
+++ dracut.spec	14 Aug 2009 16:02:07 -0000	1.12
@@ -12,7 +12,7 @@
 %endif
 
 Name: dracut
-Version: 0.8
+Version: 0.9
 Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
@@ -32,6 +32,7 @@ Requires: which
 Requires: mktemp >= 1.5-5
 Requires: mount
 Requires: bash
+Requires: dash
 Requires: /bin/sh 
 Requires: fileutils, gzip, tar
 Requires: lvm2 >= 2.02.33-9, dhclient
@@ -63,6 +64,7 @@ Requires: iscsi-initiator-utils
 Requires: nbd
 Requires: net-tools iproute
 Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar
+Requires: plymouth-theme-fade-in plymouth-theme-spinfinity
 
 %description generic
 This package requires everything which is needed to build a generic
@@ -143,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
+- version 0.9
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+
 * Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
 - version 0.8 
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2009 15:13:34 -0000	1.7
+++ sources	14 Aug 2009 16:02:07 -0000	1.8
@@ -1 +1 @@
-ee98470ff5b7f3a288573632c07e9cb6  dracut-0.8.tar.bz2
+e672a50435520c078e4b064f789850ce  dracut-0.9.tar.bz2



From harald at fedoraproject.org  Fri Aug 14 16:04:26 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 14 Aug 2009 16:04:26 +0000 (UTC)
Subject: rpms/dracut/F-11 .cvsignore, 1.7, 1.8 dracut.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20090814160426.1C40E11C00D0@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12535

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
- version 0.9
- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Aug 2009 15:35:48 -0000	1.7
+++ .cvsignore	14 Aug 2009 16:04:25 -0000	1.8
@@ -1 +1 @@
-dracut-0.8.tar.bz2
+dracut-0.9.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dracut.spec	6 Aug 2009 15:35:48 -0000	1.6
+++ dracut.spec	14 Aug 2009 16:04:25 -0000	1.7
@@ -12,7 +12,7 @@
 %endif
 
 Name: dracut
-Version: 0.8
+Version: 0.9
 Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
@@ -32,6 +32,7 @@ Requires: which
 Requires: mktemp >= 1.5-5
 Requires: mount
 Requires: bash
+Requires: dash
 Requires: /bin/sh 
 Requires: fileutils, gzip, tar
 Requires: lvm2 >= 2.02.33-9, dhclient
@@ -63,6 +64,7 @@ Requires: iscsi-initiator-utils
 Requires: nbd
 Requires: net-tools iproute
 Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar
+Requires: plymouth-theme-fade-in plymouth-theme-spinfinity
 
 %description generic
 This package requires everything which is needed to build a generic
@@ -143,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
+- version 0.9
+- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS
+
 * Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 0.8-1
 - version 0.8 
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Aug 2009 15:35:48 -0000	1.7
+++ sources	14 Aug 2009 16:04:25 -0000	1.8
@@ -1 +1 @@
-ee98470ff5b7f3a288573632c07e9cb6  dracut-0.8.tar.bz2
+e672a50435520c078e4b064f789850ce  dracut-0.9.tar.bz2



From pkgdb at fedoraproject.org  Fri Aug 14 16:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:13:51 +0000
Subject: [pkgdb] php-ezc-Feed was added for llaumgui
Message-ID: <20090814161354.092FE10F862@bastion2.fedora.phx.redhat.com>

tibbs has added Package php-ezc-Feed with summary This component handles parsing and creating RSS1, RSS2 and ATOM feeds
tibbs has approved Package php-ezc-Feed
tibbs has added a Fedora devel branch for php-ezc-Feed with an owner of llaumgui
tibbs has approved php-ezc-Feed in Fedora devel
tibbs has approved Package php-ezc-Feed
tibbs has set commit to Approved for 107427 on php-ezc-Feed (Fedora devel)
tibbs has set checkout to Approved for 107427 on php-ezc-Feed (Fedora devel)
tibbs has set build to Approved for 107427 on php-ezc-Feed (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Feed



From pkgdb at fedoraproject.org  Fri Aug 14 16:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:13:52 +0000
Subject: [pkgdb] php-ezc-Feed (Fedora, 11) updated by tibbs
Message-ID: <20090814161358.A30FE10F881@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for php-ezc-Feed
tibbs has set commit to Approved for 107427 on php-ezc-Feed (Fedora 11)
tibbs has set checkout to Approved for 107427 on php-ezc-Feed (Fedora 11)
tibbs has set build to Approved for 107427 on php-ezc-Feed (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Feed



From tibbs at fedoraproject.org  Fri Aug 14 16:13:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:13:59 +0000 (UTC)
Subject: rpms/php-ezc-Feed - New directory
Message-ID: <20090814161359.2105911C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-ezc-Feed
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsi14433/rpms/php-ezc-Feed

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Feed added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:13:52 +0000
Subject: [pkgdb] php-ezc-Feed summary updated by tibbs
Message-ID: <20090814161355.E6EFD10F854@bastion2.fedora.phx.redhat.com>

tibbs set package php-ezc-Feed summary to This component handles parsing and creating RSS1, RSS2 and ATOM feeds

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Feed



From tibbs at fedoraproject.org  Fri Aug 14 16:14:05 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:14:05 +0000 (UTC)
Subject: rpms/php-ezc-Feed Makefile,NONE,1.1
Message-ID: <20090814161405.74FCA11C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-ezc-Feed
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsi14433/rpms/php-ezc-Feed

Added Files:
	Makefile 
Log Message:
Setup of module php-ezc-Feed


--- NEW FILE Makefile ---
# Top level Makefile for module php-ezc-Feed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 14 16:14:05 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:14:05 +0000 (UTC)
Subject: rpms/php-ezc-Feed/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090814161405.C1EE211C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-ezc-Feed/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsi14433/rpms/php-ezc-Feed/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-ezc-Feed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-ezc-Feed
# $Id: Makefile,v 1.1 2009/08/14 16:14:05 tibbs Exp $
NAME := php-ezc-Feed
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 14 16:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:13:52 +0000
Subject: [pkgdb] php-ezc-Feed (Fedora, 11) updated by tibbs
Message-ID: <20090814161400.91A3410F868@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for php-ezc-Feed
tibbs has set commit to Approved for 107427 on php-ezc-Feed (Fedora 10)
tibbs has set checkout to Approved for 107427 on php-ezc-Feed (Fedora 10)
tibbs has set build to Approved for 107427 on php-ezc-Feed (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-ezc-Feed



From tibbs at fedoraproject.org  Fri Aug 14 16:13:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:13:59 +0000 (UTC)
Subject: rpms/php-ezc-Feed/devel - New directory
Message-ID: <20090814161359.4251511C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-ezc-Feed/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsi14433/rpms/php-ezc-Feed/devel

Log Message:
Directory /cvs/pkgs/rpms/php-ezc-Feed/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:14:28 +0000
Subject: [pkgdb] rubygem-json (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161428.CD89010F86C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for rubygem-json
tibbs has set commit to Approved for 107427 on rubygem-json (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on rubygem-json (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on rubygem-json (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Fri Aug 14 16:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:14:27 +0000
Subject: [pkgdb] rubygem-json was added for laxathom
Message-ID: <20090814161427.2036310F857@bastion2.fedora.phx.redhat.com>

tibbs has added Package rubygem-json with summary A JSON implementation in Ruby
tibbs has approved Package rubygem-json
tibbs has added a Fedora devel branch for rubygem-json with an owner of laxathom
tibbs has approved rubygem-json in Fedora devel
tibbs has approved Package rubygem-json
tibbs has set commit to Approved for 107427 on rubygem-json (Fedora devel)
tibbs has set checkout to Approved for 107427 on rubygem-json (Fedora devel)
tibbs has set build to Approved for 107427 on rubygem-json (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Fri Aug 14 16:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:14:28 +0000
Subject: [pkgdb] rubygem-json summary updated by tibbs
Message-ID: <20090814161428.77A9810F85C@bastion2.fedora.phx.redhat.com>

tibbs set package rubygem-json summary to A JSON implementation in Ruby

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Fri Aug 14 16:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:14:28 +0000
Subject: [pkgdb] rubygem-json (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161429.446F310F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for rubygem-json
tibbs has set commit to Approved for 107427 on rubygem-json (Fedora 11)
tibbs has set checkout to Approved for 107427 on rubygem-json (Fedora 11)
tibbs has set build to Approved for 107427 on rubygem-json (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-json



From tibbs at fedoraproject.org  Fri Aug 14 16:14:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:14:35 +0000 (UTC)
Subject: rpms/rubygem-json - New directory
Message-ID: <20090814161435.1A3F711C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-json
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX14727/rpms/rubygem-json

Log Message:
Directory /cvs/pkgs/rpms/rubygem-json added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 16:14:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:14:35 +0000 (UTC)
Subject: rpms/rubygem-json/devel - New directory
Message-ID: <20090814161435.3EA1711C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-json/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX14727/rpms/rubygem-json/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-json/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:14:28 +0000
Subject: [pkgdb] rubygem-json (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161430.3369010F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for rubygem-json
tibbs has set commit to Approved for 107427 on rubygem-json (Fedora 10)
tibbs has set checkout to Approved for 107427 on rubygem-json (Fedora 10)
tibbs has set build to Approved for 107427 on rubygem-json (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-json



From tibbs at fedoraproject.org  Fri Aug 14 16:14:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:14:41 +0000 (UTC)
Subject: rpms/rubygem-json/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090814161441.A636611C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-json/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX14727/rpms/rubygem-json/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-json


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-json
# $Id: Makefile,v 1.1 2009/08/14 16:14:41 tibbs Exp $
NAME := rubygem-json
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tibbs at fedoraproject.org  Fri Aug 14 16:14:41 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:14:41 +0000 (UTC)
Subject: rpms/rubygem-json Makefile,NONE,1.1
Message-ID: <20090814161441.68F1F11C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-json
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsX14727/rpms/rubygem-json

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-json


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-json
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From karsten at fedoraproject.org  Fri Aug 14 16:14:59 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 14 Aug 2009 16:14:59 +0000 (UTC)
Subject: rpms/listen/F-11 listen.spec,1.40,1.41
Message-ID: <20090814161459.6E01011C00D0@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/listen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15014

Modified Files:
	listen.spec 
Log Message:
- fix libdir on s390x


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/F-11/listen.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- listen.spec	6 Jul 2009 09:12:38 -0000	1.40
+++ listen.spec	14 Aug 2009 16:14:59 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -75,8 +75,8 @@ Listen can be extended with plugins.
 %setup -q -n %{name}-%{version} 
 # mandatory to build inside mock
 %{__sed} -i 's#CHECK_DEPENDS ?= 1#CHECK_DEPENDS ?= 0#' Makefile
-# correct path issue on x86_64 box
-%ifarch x86_64 ppc64 sparc64
+# correct path issue on 64bit boxes
+%ifarch x86_64 ppc64 sparc64 s390x
     %{__sed} -i 's#/lib#/lib64#' Makefile
 %endif
 %build
@@ -126,6 +126,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> 0.6.2-3
+- fix libdir on s390x
+
 * Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-2
 - added python-inotify as Requires
 



From pkgdb at fedoraproject.org  Fri Aug 14 16:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:15:04 +0000
Subject: [pkgdb] ccss summary updated by tibbs
Message-ID: <20090814161507.0AB1510F886@bastion2.fedora.phx.redhat.com>

tibbs set package ccss summary to A simple api for CSS Stylesheets

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccss



From pkgdb at fedoraproject.org  Fri Aug 14 16:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:15:03 +0000
Subject: [pkgdb] ccss was added for pbrobinson
Message-ID: <20090814161504.425F710F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package ccss with summary A simple api for CSS Stylesheets
tibbs has approved Package ccss
tibbs has added a Fedora devel branch for ccss with an owner of pbrobinson
tibbs has approved ccss in Fedora devel
tibbs has approved Package ccss
tibbs has set commit to Approved for 107427 on ccss (Fedora devel)
tibbs has set checkout to Approved for 107427 on ccss (Fedora devel)
tibbs has set build to Approved for 107427 on ccss (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccss



From pkgdb at fedoraproject.org  Fri Aug 14 16:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:15:04 +0000
Subject: [pkgdb] ccss (Fedora, 10) updated by tibbs
Message-ID: <20090814161508.AFD6410F8BC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for ccss
tibbs has set commit to Approved for 107427 on ccss (Fedora 10)
tibbs has set checkout to Approved for 107427 on ccss (Fedora 10)
tibbs has set build to Approved for 107427 on ccss (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccss



From tibbs at fedoraproject.org  Fri Aug 14 16:15:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:15:10 +0000 (UTC)
Subject: rpms/ccss - New directory
Message-ID: <20090814161510.18E2E11C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsO15114/rpms/ccss

Log Message:
Directory /cvs/pkgs/rpms/ccss added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 16:15:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:15:10 +0000 (UTC)
Subject: rpms/ccss/devel - New directory
Message-ID: <20090814161510.32A1A11C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsO15114/rpms/ccss/devel

Log Message:
Directory /cvs/pkgs/rpms/ccss/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:15:04 +0000
Subject: [pkgdb] ccss (Fedora, 10) updated by tibbs
Message-ID: <20090814161510.9C31A10F8C0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ccss
tibbs has set commit to Approved for 107427 on ccss (Fedora 11)
tibbs has set checkout to Approved for 107427 on ccss (Fedora 11)
tibbs has set build to Approved for 107427 on ccss (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ccss



From tibbs at fedoraproject.org  Fri Aug 14 16:15:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:15:16 +0000 (UTC)
Subject: rpms/ccss Makefile,NONE,1.1
Message-ID: <20090814161516.716F411C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccss
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsO15114/rpms/ccss

Added Files:
	Makefile 
Log Message:
Setup of module ccss


--- NEW FILE Makefile ---
# Top level Makefile for module ccss
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 14 16:15:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:15:16 +0000 (UTC)
Subject: rpms/ccss/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090814161516.A907511C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ccss/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsO15114/rpms/ccss/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ccss


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ccss
# $Id: Makefile,v 1.1 2009/08/14 16:15:16 tibbs Exp $
NAME := ccss
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From karsten at fedoraproject.org  Fri Aug 14 16:16:09 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 14 Aug 2009 16:16:09 +0000 (UTC)
Subject: rpms/listen/F-11 listen.spec,1.41,1.42
Message-ID: <20090814161609.9590D11C0348@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/listen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15457

Modified Files:
	listen.spec 
Log Message:
- -3 is already in rawhide, use 2.1 instead


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/F-11/listen.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- listen.spec	14 Aug 2009 16:14:59 -0000	1.41
+++ listen.spec	14 Aug 2009 16:16:09 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        2.1%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -126,7 +126,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> 0.6.2-3
+* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> 0.6.2-2.1
 - fix libdir on s390x
 
 * Mon Jul 06 2009 Ha?kel Gu?mar <karlthered at gmail.com> 0.6.2-2



From pkgdb at fedoraproject.org  Fri Aug 14 16:16:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:16:24 +0000
Subject: [pkgdb] python-sqlalchemy0.5 was added for lmacken
Message-ID: <20090814161625.44F7F10F89B@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-sqlalchemy0.5 with summary Modular and flexible ORM library for python
tibbs has approved Package python-sqlalchemy0.5
tibbs has added a Fedora devel branch for python-sqlalchemy0.5 with an owner of lmacken
tibbs has approved python-sqlalchemy0.5 in Fedora devel
tibbs has approved Package python-sqlalchemy0.5
tibbs has set commit to Approved for 107427 on python-sqlalchemy0.5 (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-sqlalchemy0.5 (Fedora devel)
tibbs has set build to Approved for 107427 on python-sqlalchemy0.5 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy0.5



From pkgdb at fedoraproject.org  Fri Aug 14 16:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:16:25 +0000
Subject: [pkgdb] python-sqlalchemy0.5 summary updated by tibbs
Message-ID: <20090814161626.5560310F8B8@bastion2.fedora.phx.redhat.com>

tibbs set package python-sqlalchemy0.5 summary to Modular and flexible ORM library for python

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy0.5



From pkgdb at fedoraproject.org  Fri Aug 14 16:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:16:25 +0000
Subject: [pkgdb] python-sqlalchemy0.5 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161627.F360710F876@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-sqlalchemy0.5
tibbs has set commit to Approved for 107427 on python-sqlalchemy0.5 (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on python-sqlalchemy0.5 (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on python-sqlalchemy0.5 (Fedora EPEL 5)
tibbs approved watchbugzilla on python-sqlalchemy0.5 (Fedora EPEL 5) for toshio
tibbs approved watchcommits on python-sqlalchemy0.5 (Fedora EPEL 5) for toshio
tibbs approved commit on python-sqlalchemy0.5 (Fedora EPEL 5) for toshio
tibbs approved build on python-sqlalchemy0.5 (Fedora EPEL 5) for toshio
tibbs approved approveacls on python-sqlalchemy0.5 (Fedora EPEL 5) for toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy0.5



From pkgdb at fedoraproject.org  Fri Aug 14 16:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:16:25 +0000
Subject: [pkgdb] python-sqlalchemy0.5 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161629.BC70410F8AF@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on python-sqlalchemy0.5 (Fedora devel) for toshio
tibbs approved watchcommits on python-sqlalchemy0.5 (Fedora devel) for toshio
tibbs approved commit on python-sqlalchemy0.5 (Fedora devel) for toshio
tibbs approved build on python-sqlalchemy0.5 (Fedora devel) for toshio
tibbs approved approveacls on python-sqlalchemy0.5 (Fedora devel) for toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy0.5



From tibbs at fedoraproject.org  Fri Aug 14 16:16:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:16:32 +0000 (UTC)
Subject: rpms/python-sqlalchemy0.5/devel - New directory
Message-ID: <20090814161632.3C22D11C0426@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-sqlalchemy0.5/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15619/rpms/python-sqlalchemy0.5/devel

Log Message:
Directory /cvs/pkgs/rpms/python-sqlalchemy0.5/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 16:16:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:16:32 +0000 (UTC)
Subject: rpms/python-sqlalchemy0.5 - New directory
Message-ID: <20090814161632.1AE5111C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-sqlalchemy0.5
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15619/rpms/python-sqlalchemy0.5

Log Message:
Directory /cvs/pkgs/rpms/python-sqlalchemy0.5 added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:16:25 +0000
Subject: [pkgdb] python-sqlalchemy0.5 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161628.F013D10F87B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for python-sqlalchemy0.5
tibbs has set commit to Approved for 107427 on python-sqlalchemy0.5 (Fedora 10)
tibbs has set checkout to Approved for 107427 on python-sqlalchemy0.5 (Fedora 10)
tibbs has set build to Approved for 107427 on python-sqlalchemy0.5 (Fedora 10)
tibbs approved watchbugzilla on python-sqlalchemy0.5 (Fedora 10) for toshio
tibbs approved watchcommits on python-sqlalchemy0.5 (Fedora 10) for toshio
tibbs approved commit on python-sqlalchemy0.5 (Fedora 10) for toshio
tibbs approved build on python-sqlalchemy0.5 (Fedora 10) for toshio
tibbs approved approveacls on python-sqlalchemy0.5 (Fedora 10) for toshio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-sqlalchemy0.5



From tibbs at fedoraproject.org  Fri Aug 14 16:16:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:16:38 +0000 (UTC)
Subject: rpms/python-sqlalchemy0.5 Makefile,NONE,1.1
Message-ID: <20090814161638.9FAE311C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-sqlalchemy0.5
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15619/rpms/python-sqlalchemy0.5

Added Files:
	Makefile 
Log Message:
Setup of module python-sqlalchemy0.5


--- NEW FILE Makefile ---
# Top level Makefile for module python-sqlalchemy0.5
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 14 16:16:38 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:16:38 +0000 (UTC)
Subject: rpms/python-sqlalchemy0.5/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090814161638.DC88011C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-sqlalchemy0.5/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15619/rpms/python-sqlalchemy0.5/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-sqlalchemy0.5


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-sqlalchemy0.5
# $Id: Makefile,v 1.1 2009/08/14 16:16:38 tibbs Exp $
NAME := python-sqlalchemy0.5
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 14 16:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:17:48 +0000
Subject: [pkgdb] rubygem-fattr summary updated by tibbs
Message-ID: <20090814161748.96CD510F90D@bastion2.fedora.phx.redhat.com>

tibbs set package rubygem-fattr summary to Fatter attribute for Ruby

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fattr



From pkgdb at fedoraproject.org  Fri Aug 14 16:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:17:48 +0000
Subject: [pkgdb] rubygem-fattr (Fedora, 11) updated by tibbs
Message-ID: <20090814161749.5005B10F904@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for rubygem-fattr
tibbs has set commit to Approved for 107427 on rubygem-fattr (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on rubygem-fattr (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on rubygem-fattr (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fattr



From pkgdb at fedoraproject.org  Fri Aug 14 16:17:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:17:47 +0000
Subject: [pkgdb] rubygem-fattr was added for kanarip
Message-ID: <20090814161748.348B110F8D4@bastion2.fedora.phx.redhat.com>

tibbs has added Package rubygem-fattr with summary Fatter attribute for Ruby
tibbs has approved Package rubygem-fattr
tibbs has added a Fedora devel branch for rubygem-fattr with an owner of kanarip
tibbs has approved rubygem-fattr in Fedora devel
tibbs has approved Package rubygem-fattr
tibbs has set commit to Approved for 107427 on rubygem-fattr (Fedora devel)
tibbs has set checkout to Approved for 107427 on rubygem-fattr (Fedora devel)
tibbs has set build to Approved for 107427 on rubygem-fattr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fattr



From pkgdb at fedoraproject.org  Fri Aug 14 16:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:17:48 +0000
Subject: [pkgdb] rubygem-fattr (Fedora, 11) updated by tibbs
Message-ID: <20090814161749.BE9F510F911@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for rubygem-fattr
tibbs has set commit to Approved for 107427 on rubygem-fattr (Fedora 10)
tibbs has set checkout to Approved for 107427 on rubygem-fattr (Fedora 10)
tibbs has set build to Approved for 107427 on rubygem-fattr (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fattr



From tibbs at fedoraproject.org  Fri Aug 14 16:17:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:17:53 +0000 (UTC)
Subject: rpms/rubygem-fattr/devel - New directory
Message-ID: <20090814161753.41C8311C0426@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-fattr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN16069/rpms/rubygem-fattr/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-fattr/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 16:17:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:17:53 +0000 (UTC)
Subject: rpms/rubygem-fattr - New directory
Message-ID: <20090814161753.1FB1811C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-fattr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN16069/rpms/rubygem-fattr

Log Message:
Directory /cvs/pkgs/rpms/rubygem-fattr added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:17:48 +0000
Subject: [pkgdb] rubygem-fattr (Fedora, 11) updated by tibbs
Message-ID: <20090814161750.3A47710F913@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for rubygem-fattr
tibbs has set commit to Approved for 107427 on rubygem-fattr (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on rubygem-fattr (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on rubygem-fattr (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fattr



From pkgdb at fedoraproject.org  Fri Aug 14 16:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:17:48 +0000
Subject: [pkgdb] rubygem-fattr (Fedora, 11) updated by tibbs
Message-ID: <20090814161750.CFC5E10F916@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for rubygem-fattr
tibbs has set commit to Approved for 107427 on rubygem-fattr (Fedora 11)
tibbs has set checkout to Approved for 107427 on rubygem-fattr (Fedora 11)
tibbs has set build to Approved for 107427 on rubygem-fattr (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fattr



From tibbs at fedoraproject.org  Fri Aug 14 16:18:00 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:18:00 +0000 (UTC)
Subject: rpms/rubygem-fattr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090814161800.1F84111C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-fattr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN16069/rpms/rubygem-fattr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-fattr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-fattr
# $Id: Makefile,v 1.1 2009/08/14 16:17:59 tibbs Exp $
NAME := rubygem-fattr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 14 16:17:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:17:59 +0000 (UTC)
Subject: rpms/rubygem-fattr Makefile,NONE,1.1
Message-ID: <20090814161759.D2B0E11C0426@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-fattr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN16069/rpms/rubygem-fattr

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-fattr


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-fattr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From karsten at fedoraproject.org  Fri Aug 14 16:18:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 14 Aug 2009 16:18:10 +0000 (UTC)
Subject: rpms/listen/devel listen.spec,1.41,1.42
Message-ID: <20090814161810.0CB5811C0348@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/listen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16351

Modified Files:
	listen.spec 
Log Message:
- fix libdir on s390x


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- listen.spec	25 Jul 2009 11:09:40 -0000	1.41
+++ listen.spec	14 Aug 2009 16:18:09 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -75,8 +75,8 @@ Listen can be extended with plugins.
 %setup -q -n %{name}-%{version} 
 # mandatory to build inside mock
 %{__sed} -i 's#CHECK_DEPENDS ?= 1#CHECK_DEPENDS ?= 0#' Makefile
-# correct path issue on x86_64 box
-%ifarch x86_64 ppc64 sparc64
+# correct path issue on 64bit boxes
+%ifarch x86_64 ppc64 sparc64 s390x
     %{__sed} -i 's#/lib#/lib64#' Makefile
 %endif
 %build
@@ -126,6 +126,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 14 2009 Karsten Hopp <karsten at redhat.com> 0.6.2-4
+- fix libdir on s390x
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Aug 14 16:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:23 +0000
Subject: [pkgdb] Django-south summary updated by tibbs
Message-ID: <20090814161825.3C63010F89B@bastion2.fedora.phx.redhat.com>

tibbs set package Django-south summary to Intelligent schema migrations for Django apps

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django-south



From pkgdb at fedoraproject.org  Fri Aug 14 16:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:22 +0000
Subject: [pkgdb] Django-south was added for diegobz
Message-ID: <20090814161824.3930710F89C@bastion2.fedora.phx.redhat.com>

tibbs has added Package Django-south with summary Intelligent schema migrations for Django apps
tibbs has approved Package Django-south
tibbs has added a Fedora devel branch for Django-south with an owner of diegobz
tibbs has approved Django-south in Fedora devel
tibbs has approved Package Django-south
tibbs has set commit to Approved for 107427 on Django-south (Fedora devel)
tibbs has set checkout to Approved for 107427 on Django-south (Fedora devel)
tibbs has set build to Approved for 107427 on Django-south (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django-south



From pkgdb at fedoraproject.org  Fri Aug 14 16:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:23 +0000
Subject: [pkgdb] Django-south (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161825.B996B10F8C7@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for Django-south
tibbs has set commit to Approved for 107427 on Django-south (Fedora 11)
tibbs has set checkout to Approved for 107427 on Django-south (Fedora 11)
tibbs has set build to Approved for 107427 on Django-south (Fedora 11)
tibbs approved watchbugzilla on Django-south (Fedora 11) for diegobz
tibbs approved watchcommits on Django-south (Fedora 11) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django-south



From pkgdb at fedoraproject.org  Fri Aug 14 16:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:23 +0000
Subject: [pkgdb] Django-south (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161826.592CB10F901@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on Django-south (Fedora devel) for diegobz
tibbs approved watchcommits on Django-south (Fedora devel) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django-south



From tibbs at fedoraproject.org  Fri Aug 14 16:18:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:18:30 +0000 (UTC)
Subject: rpms/Django-south/devel - New directory
Message-ID: <20090814161830.3FD8811C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/Django-south/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJ16510/rpms/Django-south/devel

Log Message:
Directory /cvs/pkgs/rpms/Django-south/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:23 +0000
Subject: [pkgdb] Django-south (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161827.3056B10F90A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for Django-south
tibbs has set commit to Approved for 107427 on Django-south (Fedora 10)
tibbs has set checkout to Approved for 107427 on Django-south (Fedora 10)
tibbs has set build to Approved for 107427 on Django-south (Fedora 10)
tibbs approved watchbugzilla on Django-south (Fedora 10) for diegobz
tibbs approved watchcommits on Django-south (Fedora 10) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django-south



From tibbs at fedoraproject.org  Fri Aug 14 16:18:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:18:36 +0000 (UTC)
Subject: rpms/Django-south Makefile,NONE,1.1
Message-ID: <20090814161836.DE8C511C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/Django-south
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJ16510/rpms/Django-south

Added Files:
	Makefile 
Log Message:
Setup of module Django-south


--- NEW FILE Makefile ---
# Top level Makefile for module Django-south
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 14 16:18:30 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:18:30 +0000 (UTC)
Subject: rpms/Django-south - New directory
Message-ID: <20090814161830.1AA7811C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/Django-south
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJ16510/rpms/Django-south

Log Message:
Directory /cvs/pkgs/rpms/Django-south added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:23 +0000
Subject: [pkgdb] Django-south (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161828.5092210F91B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for Django-south
tibbs has set commit to Approved for 107427 on Django-south (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on Django-south (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on Django-south (Fedora EPEL 5)
tibbs approved watchbugzilla on Django-south (Fedora EPEL 5) for diegobz
tibbs approved watchcommits on Django-south (Fedora EPEL 5) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django-south



From tibbs at fedoraproject.org  Fri Aug 14 16:18:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:18:37 +0000 (UTC)
Subject: rpms/Django-south/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090814161837.1E28711C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/Django-south/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJ16510/rpms/Django-south/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Django-south


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: Django-south
# $Id: Makefile,v 1.1 2009/08/14 16:18:36 tibbs Exp $
NAME := Django-south
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 14 16:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:00 +0000
Subject: [pkgdb] sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161905.3B52410F932@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for sphinx
tibbs has set commit to Approved for 107427 on sphinx (Fedora 11)
tibbs has set checkout to Approved for 107427 on sphinx (Fedora 11)
tibbs has set build to Approved for 107427 on sphinx (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinx



From pkgdb at fedoraproject.org  Fri Aug 14 16:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:00 +0000
Subject: [pkgdb] sphinx summary updated by tibbs
Message-ID: <20090814161903.A9AFB10F8CF@bastion2.fedora.phx.redhat.com>

tibbs set package sphinx summary to Free open-source SQL full-text search engine

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinx



From pkgdb at fedoraproject.org  Fri Aug 14 16:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:18:59 +0000
Subject: [pkgdb] sphinx was added for allisson
Message-ID: <20090814161902.7B44910F930@bastion2.fedora.phx.redhat.com>

tibbs has added Package sphinx with summary Free open-source SQL full-text search engine
tibbs has approved Package sphinx
tibbs has added a Fedora devel branch for sphinx with an owner of allisson
tibbs has approved sphinx in Fedora devel
tibbs has approved Package sphinx
tibbs has set commit to Approved for 107427 on sphinx (Fedora devel)
tibbs has set checkout to Approved for 107427 on sphinx (Fedora devel)
tibbs has set build to Approved for 107427 on sphinx (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinx



From tibbs at fedoraproject.org  Fri Aug 14 16:19:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:19:07 +0000 (UTC)
Subject: rpms/sphinx - New directory
Message-ID: <20090814161907.1A0FC11C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sphinx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl16842/rpms/sphinx

Log Message:
Directory /cvs/pkgs/rpms/sphinx added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:00 +0000
Subject: [pkgdb] sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161907.A7EAA10F935@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for sphinx
tibbs has set commit to Approved for 107427 on sphinx (Fedora 10)
tibbs has set checkout to Approved for 107427 on sphinx (Fedora 10)
tibbs has set build to Approved for 107427 on sphinx (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinx



From pkgdb at fedoraproject.org  Fri Aug 14 16:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:00 +0000
Subject: [pkgdb] sphinx (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814161909.A856710F8D7@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for sphinx
tibbs has set commit to Approved for 107427 on sphinx (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on sphinx (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on sphinx (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinx



From tibbs at fedoraproject.org  Fri Aug 14 16:19:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:19:13 +0000 (UTC)
Subject: rpms/sphinx Makefile,NONE,1.1
Message-ID: <20090814161913.98BEA11C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sphinx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl16842/rpms/sphinx

Added Files:
	Makefile 
Log Message:
Setup of module sphinx


--- NEW FILE Makefile ---
# Top level Makefile for module sphinx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 14 16:19:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:19:13 +0000 (UTC)
Subject: rpms/sphinx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090814161913.C99D111C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl16842/rpms/sphinx/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sphinx


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sphinx
# $Id: Makefile,v 1.1 2009/08/14 16:19:13 tibbs Exp $
NAME := sphinx
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 14 16:19:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:19:07 +0000 (UTC)
Subject: rpms/sphinx/devel - New directory
Message-ID: <20090814161907.4047611C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsl16842/rpms/sphinx/devel

Log Message:
Directory /cvs/pkgs/rpms/sphinx/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:55 +0000
Subject: [pkgdb] fpaste summary updated by tibbs
Message-ID: <20090814161956.6DE3410F937@bastion2.fedora.phx.redhat.com>

tibbs set package fpaste summary to A simple tool for pasting info onto fpaste.org

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Fri Aug 14 16:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:54 +0000
Subject: [pkgdb] fpaste was added for ankursinha
Message-ID: <20090814161955.CF96710F8ED@bastion2.fedora.phx.redhat.com>

tibbs has added Package fpaste with summary A simple tool for pasting info onto fpaste.org
tibbs has approved Package fpaste
tibbs has added a Fedora devel branch for fpaste with an owner of ankursinha
tibbs has approved fpaste in Fedora devel
tibbs has approved Package fpaste
tibbs has set commit to Approved for 107427 on fpaste (Fedora devel)
tibbs has set checkout to Approved for 107427 on fpaste (Fedora devel)
tibbs has set build to Approved for 107427 on fpaste (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From tibbs at fedoraproject.org  Fri Aug 14 16:20:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:20:01 +0000 (UTC)
Subject: rpms/fpaste - New directory
Message-ID: <20090814162001.1A63311C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fpaste
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR17300/rpms/fpaste

Log Message:
Directory /cvs/pkgs/rpms/fpaste added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:55 +0000
Subject: [pkgdb] fpaste (Fedora, 11) updated by tibbs
Message-ID: <20090814161958.F32A910F8C1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for fpaste
tibbs has set commit to Approved for 107427 on fpaste (Fedora 11)
tibbs has set checkout to Approved for 107427 on fpaste (Fedora 11)
tibbs has set build to Approved for 107427 on fpaste (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From tibbs at fedoraproject.org  Fri Aug 14 16:20:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:20:07 +0000 (UTC)
Subject: rpms/fpaste Makefile,NONE,1.1
Message-ID: <20090814162007.51E9211C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fpaste
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR17300/rpms/fpaste

Added Files:
	Makefile 
Log Message:
Setup of module fpaste


--- NEW FILE Makefile ---
# Top level Makefile for module fpaste
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 14 16:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:19:55 +0000
Subject: [pkgdb] fpaste (Fedora, 11) updated by tibbs
Message-ID: <20090814162000.6E09A10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for fpaste
tibbs has set commit to Approved for 107427 on fpaste (Fedora 10)
tibbs has set checkout to Approved for 107427 on fpaste (Fedora 10)
tibbs has set build to Approved for 107427 on fpaste (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From tibbs at fedoraproject.org  Fri Aug 14 16:20:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:20:07 +0000 (UTC)
Subject: rpms/fpaste/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090814162007.8966411C043D@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fpaste/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR17300/rpms/fpaste/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fpaste


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fpaste
# $Id: Makefile,v 1.1 2009/08/14 16:20:07 tibbs Exp $
NAME := fpaste
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 14 16:20:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:20:01 +0000 (UTC)
Subject: rpms/fpaste/devel - New directory
Message-ID: <20090814162001.4266011C049D@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/fpaste/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsR17300/rpms/fpaste/devel

Log Message:
Directory /cvs/pkgs/rpms/fpaste/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:20:48 +0000
Subject: [pkgdb] django-piston summary updated by tibbs
Message-ID: <20090814162049.6474A10F8A8@bastion2.fedora.phx.redhat.com>

tibbs set package django-piston summary to A mini-framework for Django for creating RESTful APIs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-piston



From pkgdb at fedoraproject.org  Fri Aug 14 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:20:48 +0000
Subject: [pkgdb] django-piston (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814162052.B9F1610F8DC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for django-piston
tibbs has set commit to Approved for 107427 on django-piston (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on django-piston (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on django-piston (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-piston



From pkgdb at fedoraproject.org  Fri Aug 14 16:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:20:47 +0000
Subject: [pkgdb] django-piston was added for diegobz
Message-ID: <20090814162049.8B40D10F8AA@bastion2.fedora.phx.redhat.com>

tibbs has added Package django-piston with summary A mini-framework for Django for creating RESTful APIs
tibbs has approved Package django-piston
tibbs has added a Fedora devel branch for django-piston with an owner of diegobz
tibbs has approved django-piston in Fedora devel
tibbs has approved Package django-piston
tibbs has set commit to Approved for 107427 on django-piston (Fedora devel)
tibbs has set checkout to Approved for 107427 on django-piston (Fedora devel)
tibbs has set build to Approved for 107427 on django-piston (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-piston



From pkgdb at fedoraproject.org  Fri Aug 14 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:20:48 +0000
Subject: [pkgdb] django-piston (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814162050.40DDB10F8C0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for django-piston
tibbs has set commit to Approved for 107427 on django-piston (Fedora 11)
tibbs has set checkout to Approved for 107427 on django-piston (Fedora 11)
tibbs has set build to Approved for 107427 on django-piston (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-piston



From pkgdb at fedoraproject.org  Fri Aug 14 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:20:48 +0000
Subject: [pkgdb] django-piston (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814162051.7A8B910F8BC@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for django-piston
tibbs has set commit to Approved for 107427 on django-piston (Fedora 10)
tibbs has set checkout to Approved for 107427 on django-piston (Fedora 10)
tibbs has set build to Approved for 107427 on django-piston (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-piston



From tibbs at fedoraproject.org  Fri Aug 14 16:20:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:20:55 +0000 (UTC)
Subject: rpms/django-piston - New directory
Message-ID: <20090814162055.1C60211C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-piston
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB17704/rpms/django-piston

Log Message:
Directory /cvs/pkgs/rpms/django-piston added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 16:21:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:21:01 +0000 (UTC)
Subject: rpms/django-piston Makefile,NONE,1.1
Message-ID: <20090814162101.70D5511C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-piston
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB17704/rpms/django-piston

Added Files:
	Makefile 
Log Message:
Setup of module django-piston


--- NEW FILE Makefile ---
# Top level Makefile for module django-piston
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 14 16:21:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:21:01 +0000 (UTC)
Subject: rpms/django-piston/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090814162101.9579211C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-piston/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB17704/rpms/django-piston/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-piston


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-piston
# $Id: Makefile,v 1.1 2009/08/14 16:21:01 tibbs Exp $
NAME := django-piston
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 14 16:20:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 16:20:55 +0000 (UTC)
Subject: rpms/django-piston/devel - New directory
Message-ID: <20090814162055.407B811C0348@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-piston/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsB17704/rpms/django-piston/devel

Log Message:
Directory /cvs/pkgs/rpms/django-piston/devel added to the repository




From thm at fedoraproject.org  Fri Aug 14 16:21:34 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 14 Aug 2009 16:21:34 +0000 (UTC)
Subject: rpms/python-simpletal/devel import.log, NONE, 1.1 .cvsignore, 1.4, 
	1.5 python-simpletal.spec, 1.16, 1.17 sources, 1.4, 1.5
Message-ID: <20090814162134.5521911C00D0@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-simpletal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18067/devel

Modified Files:
	.cvsignore python-simpletal.spec sources 
Added Files:
	import.log 
Log Message:
Update to 4.2, minor specfile and rpmlint fixes.


--- NEW FILE import.log ---
python-simpletal-4_2-1_fc11:HEAD:python-simpletal-4.2-1.fc11.src.rpm:1250266814


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simpletal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jan 2006 23:59:25 -0000	1.4
+++ .cvsignore	14 Aug 2009 16:21:34 -0000	1.5
@@ -1 +1 @@
-SimpleTAL-4.1.tar.gz
+SimpleTAL-4.2.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-simpletal.spec	26 Jul 2009 21:05:09 -0000	1.16
+++ python-simpletal.spec	14 Aug 2009 16:21:34 -0000	1.17
@@ -3,10 +3,10 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        4.1
-Release:        11%{?dist}
+Version:        4.2
+Release:        1%{?dist}
 
-Summary:        An XML based template processor for TAL, TALES and METAL specifications.
+Summary:        An XML based template processor for TAL, TALES and METAL specifications
 
 Group:          Development/Libraries
 License:        BSD
@@ -17,24 +17,30 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python-devel
 
+
 %description
-SimpleTAL is a stand alone Python implementation of the TAL, TALES and METAL  specifications  used in Zope to power HTML and XML templates.
+SimpleTAL is a stand alone Python implementation of the TAL, TALES and
+METAL specifications used in Zope to power HTML and XML templates.
 
 
 %prep
 %setup -q -n %{srcname}-%{version}
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+# remove x-bits from example files
+find examples -name '*.py' -exec chmod -x {} \;
+
 
- 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -46,7 +52,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/simpletal/*.pyo
 %{python_sitelib}/SimpleTAL-%{version}-py*.egg-info
 
+
 %changelog
+* Fri Aug 14 2009 Thomas Moschny <thomas.moschny at gmx.de> - 4.2-1
+- Update to 4.2, a (not fully backwards compatible) bugfix release.
+- Minor specfile cosmetics.
+- Remove execute bits from example scripts.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simpletal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jan 2006 23:59:25 -0000	1.4
+++ sources	14 Aug 2009 16:21:34 -0000	1.5
@@ -1 +1 @@
-16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz
+24b5f2ee0a9cb851cfc5e093f60f5a67  SimpleTAL-4.2.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 14 16:21:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:21:51 +0000
Subject: [pkgdb] openal-soft (Fedora, 11) updated by tibbs
Message-ID: <20090814162152.B03ED10F916@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for openal-soft
tibbs has set commit to Approved for 107427 on openal-soft (Fedora 11)
tibbs has set checkout to Approved for 107427 on openal-soft (Fedora 11)
tibbs has set build to Approved for 107427 on openal-soft (Fedora 11)
tibbs changed owner of openal-soft in Fedora 11 to linuxdonald

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Aug 14 16:21:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 16:21:51 +0000
Subject: [pkgdb] openal-soft (Fedora, 11) updated by tibbs
Message-ID: <20090814162154.329F910F8B9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for openal-soft
tibbs has set commit to Approved for 107427 on openal-soft (Fedora 10)
tibbs has set checkout to Approved for 107427 on openal-soft (Fedora 10)
tibbs has set build to Approved for 107427 on openal-soft (Fedora 10)
tibbs changed owner of openal-soft in Fedora 10 to linuxdonald

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openal-soft



From allisson at fedoraproject.org  Fri Aug 14 16:35:26 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 14 Aug 2009 16:35:26 +0000 (UTC)
Subject: rpms/sphinx/devel import.log, NONE, 1.1 sphinx.init, NONE,
	1.1 sphinx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814163526.A058A11C00D0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20744/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sphinx.init sphinx.spec 
Log Message:

First import.



--- NEW FILE import.log ---
sphinx-0_9_8_1-3_fc11:HEAD:sphinx-0.9.8.1-3.fc11.src.rpm:1250267674


--- NEW FILE sphinx.init ---
#!/bin/sh
#
# sphinx searchd Free open-source SQL full-text search engine
#
# chkconfig:   - 20 80
# description: Starts and stops the sphinx searchd daemon that handles \
#	       all search requests.

### BEGIN INIT INFO
# Provides: searchd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $remote_fs
# Should-Stop: $remote_fs
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop sphinx searchd daemon
# Description: Sphinx is a free open-source SQL full-text search engine     
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/searchd"
prog="searchd"
config="/etc/sphinx/sphinx.conf"

lockfile=/var/lock/subsys/searchd

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon $exec --config $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE sphinx.spec ---
Name:           sphinx
Version:        0.9.8.1
Release:        3%{?dist}
Summary:        Free open-source SQL full-text search engine

Group:          Applications/Text
License:        GPLv2+
URL:            http://sphinxsearch.com
Source0:        http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
Source1:        %{name}.init
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  postgresql-devel
BuildRequires:  expat-devel
#Requires:

Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
       

%description
Sphinx is a full-text search engine, distributed under GPL version 2.
Commercial licensing (eg. for embedded use) is also available upon request.

Generally, it's a standalone search engine, meant to provide fast,
size-efficient and relevant full-text search functions to other
applications. Sphinx was specially designed to integrate well with SQL
databases and scripting languages.

Currently built-in data source drivers support fetching data either via
direct connection to MySQL, or PostgreSQL, or from a pipe in a custom XML
format. Adding new drivers (eg. to natively support some other DBMSes) is
designed to be as easy as possible.

Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also
available as a pluggable MySQL storage engine. API is very lightweight so
porting it to new language is known to take a few hours.

As for the name, Sphinx is an acronym which is officially decoded as SQL
Phrase Index. Yes, I know about CMU's Sphinx project.


%package -n libsphinxclient
Summary:        Pure C searchd client API library
Group:          Development/Libraries


%description -n libsphinxclient
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%package -n libsphinxclient-devel
Summary:        Development libraries and header files for libsphinxclient
Group:          Development/Libraries
Requires:       libsphinxclient = %{version}-%{release}


%description -n libsphinxclient-devel
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%prep
%setup -q

# Fix wrong-file-end-of-line-encoding
sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql
sed -i 's/\r//' api/java/mk.cmd
sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php
sed -i 's/\r//' api/ruby/lib/sphinx/response.rb


%build
%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql
make %{?_smp_mflags}

# Build libsphinxclient
cd api/libsphinxclient/
%configure
make #%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# Install sphinx initscript
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd

# Create /var/log/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx

# Create /var/run/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx

# Create /var/lib/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx

# Create sphinx.conf
cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \
    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
    
# Modify sphinx.conf
sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

# Create /etc/logrotate.d/sphinx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF
/var/log/sphinx/*.log {
       weekly
       rotate 10
       copytruncate
       delaycompress
       compress
       notifempty
       missingok
}
EOF

# Install libsphinxclient
cd api/libsphinxclient/
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# clean-up .la archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# clean-up .a archives
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add searchd

%preun
if [ $1 = 0 ] ; then
    /sbin/service searchd stop >/dev/null 2>&1
    /sbin/chkconfig --del searchd
fi


%post -p /sbin/ldconfig -n libsphinxclient


%postun -p /sbin/ldconfig -n libsphinxclient
 


%files
%defattr(-,root,root,-)
%doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql
%dir %{_sysconfdir}/sphinx
%config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf
%exclude %{_sysconfdir}/sphinx/*.conf.dist
%exclude %{_sysconfdir}/sphinx/example.sql
%{_initrddir}/searchd
%config(noreplace) %{_sysconfdir}/logrotate.d/sphinx
%{_bindir}/*
%dir %{_localstatedir}/log/sphinx
%dir %{_localstatedir}/run/sphinx
%dir %{_localstatedir}/lib/sphinx

%files -n libsphinxclient
%defattr(-,root,root,-)
%doc api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
%{_libdir}/libsphinxclient-0*.so


%files -n libsphinxclient-devel
%defattr(-,root,root,-)
%{_libdir}/libsphinxclient.so
%{_includedir}/*

%changelog
* Wed Aug 12 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-3
- Fixed macros consistency.
- Modified make install to keep timestamps.
- Added libsphinxclient package.

* Fri Aug  7 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-2
- Added sysv init.
- Added logrotate.d entry.

* Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-1
- Initial rpm release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:19:13 -0000	1.1
+++ .cvsignore	14 Aug 2009 16:35:26 -0000	1.2
@@ -0,0 +1 @@
+sphinx-0.9.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:19:13 -0000	1.1
+++ sources	14 Aug 2009 16:35:26 -0000	1.2
@@ -0,0 +1 @@
+428a14df41fb425e664d9e2d6178c037  sphinx-0.9.8.1.tar.gz



From hadess at fedoraproject.org  Fri Aug 14 16:36:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 16:36:24 +0000 (UTC)
Subject: rpms/clutter/devel .cvsignore, 1.17, 1.18 clutter.spec, 1.33,
	1.34 sources, 1.17, 1.18
Message-ID: <20090814163624.2B74711C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21015

Modified Files:
	.cvsignore clutter.spec sources 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 1.0.2-1
- Update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Jul 2009 10:05:37 -0000	1.17
+++ .cvsignore	14 Aug 2009 16:36:24 -0000	1.18
@@ -1 +1 @@
-clutter-1.0.0.tar.bz2
+clutter-1.0.2.tar.bz2


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- clutter.spec	2 Aug 2009 04:42:20 -0000	1.33
+++ clutter.spec	14 Aug 2009 16:36:24 -0000	1.34
@@ -1,12 +1,12 @@
 Name:           clutter
-Version:        1.0.0
-Release:        4%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.9/%{name}-%{version}.tar.bz2
+Source0:        http://www.clutter-project.org/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gobject-introspection
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 1.0.2-1
+- Update to 1.0.2
+
 * Sun Aug  1 2009 Matthias Clasen <mclasen at redhat.com> 1.0.0-4
 - Move ChangeLog to -devel to save some space
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	29 Jul 2009 10:05:37 -0000	1.17
+++ sources	14 Aug 2009 16:36:24 -0000	1.18
@@ -1 +1 @@
-eb1a3db895d914dc29caadd15bc1f5e0  clutter-1.0.0.tar.bz2
+498ac921fbe5881a03701877b7ea3edd  clutter-1.0.2.tar.bz2



From diegobz at fedoraproject.org  Fri Aug 14 16:43:08 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Fri, 14 Aug 2009 16:43:08 +0000 (UTC)
Subject: rpms/Django-south/devel Django-south.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814164308.6A11011C00D0@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/Django-south/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21748/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Django-south.spec import.log 
Log Message:
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
- Initial import




--- NEW FILE Django-south.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define vcstag rc1

Name:           Django-south
Version:        0.6
Release:        2%{?dist}
Summary:        Intelligent schema migrations for Django apps

Group:          Development/Languages
License:        ASL 2.0
URL:            http://south.aeracode.org
#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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
South brings migrations to Django applications. Its main objectives are to
provide a simple, stable and database-independent migration layer to prevent
all the hassle schema changes over time bring to your Django applications.

%prep
%setup -q -n south
#%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc docs/
%{python_sitelib}/*

%changelog
* 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

* Sun Aug 11 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-1
- Updated to 0.6 Release

* Sun Aug 11 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.1.20090811hgrc1
- Initial RPM release


--- NEW FILE import.log ---
Django-south-0_6-2_fc11:HEAD:Django-south-0.6-2.fc11.src.rpm:1250268071


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:18:36 -0000	1.1
+++ .cvsignore	14 Aug 2009 16:43:08 -0000	1.2
@@ -0,0 +1 @@
+south-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:18:36 -0000	1.1
+++ sources	14 Aug 2009 16:43:08 -0000	1.2
@@ -0,0 +1 @@
+44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz



From allisson at fedoraproject.org  Fri Aug 14 16:49:19 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 14 Aug 2009 16:49:19 +0000 (UTC)
Subject: rpms/sphinx/F-11 import.log, NONE, 1.1 sphinx.init, NONE,
	1.1 sphinx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814164919.711A411C00D0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/sphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22950/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sphinx.init sphinx.spec 
Log Message:

First import.



--- NEW FILE import.log ---
sphinx-0_9_8_1-3_fc11:F-11:sphinx-0.9.8.1-3.fc11.src.rpm:1250267828


--- NEW FILE sphinx.init ---
#!/bin/sh
#
# sphinx searchd Free open-source SQL full-text search engine
#
# chkconfig:   - 20 80
# description: Starts and stops the sphinx searchd daemon that handles \
#	       all search requests.

### BEGIN INIT INFO
# Provides: searchd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $remote_fs
# Should-Stop: $remote_fs
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop sphinx searchd daemon
# Description: Sphinx is a free open-source SQL full-text search engine     
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/searchd"
prog="searchd"
config="/etc/sphinx/sphinx.conf"

lockfile=/var/lock/subsys/searchd

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon $exec --config $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE sphinx.spec ---
Name:           sphinx
Version:        0.9.8.1
Release:        3%{?dist}
Summary:        Free open-source SQL full-text search engine

Group:          Applications/Text
License:        GPLv2+
URL:            http://sphinxsearch.com
Source0:        http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
Source1:        %{name}.init
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  postgresql-devel
BuildRequires:  expat-devel
#Requires:

Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
       

%description
Sphinx is a full-text search engine, distributed under GPL version 2.
Commercial licensing (eg. for embedded use) is also available upon request.

Generally, it's a standalone search engine, meant to provide fast,
size-efficient and relevant full-text search functions to other
applications. Sphinx was specially designed to integrate well with SQL
databases and scripting languages.

Currently built-in data source drivers support fetching data either via
direct connection to MySQL, or PostgreSQL, or from a pipe in a custom XML
format. Adding new drivers (eg. to natively support some other DBMSes) is
designed to be as easy as possible.

Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also
available as a pluggable MySQL storage engine. API is very lightweight so
porting it to new language is known to take a few hours.

As for the name, Sphinx is an acronym which is officially decoded as SQL
Phrase Index. Yes, I know about CMU's Sphinx project.


%package -n libsphinxclient
Summary:        Pure C searchd client API library
Group:          Development/Libraries


%description -n libsphinxclient
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%package -n libsphinxclient-devel
Summary:        Development libraries and header files for libsphinxclient
Group:          Development/Libraries
Requires:       libsphinxclient = %{version}-%{release}


%description -n libsphinxclient-devel
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%prep
%setup -q

# Fix wrong-file-end-of-line-encoding
sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql
sed -i 's/\r//' api/java/mk.cmd
sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php
sed -i 's/\r//' api/ruby/lib/sphinx/response.rb


%build
%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql
make %{?_smp_mflags}

# Build libsphinxclient
cd api/libsphinxclient/
%configure
make #%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# Install sphinx initscript
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd

# Create /var/log/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx

# Create /var/run/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx

# Create /var/lib/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx

# Create sphinx.conf
cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \
    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
    
# Modify sphinx.conf
sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

# Create /etc/logrotate.d/sphinx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF
/var/log/sphinx/*.log {
       weekly
       rotate 10
       copytruncate
       delaycompress
       compress
       notifempty
       missingok
}
EOF

# Install libsphinxclient
cd api/libsphinxclient/
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# clean-up .la archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# clean-up .a archives
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add searchd

%preun
if [ $1 = 0 ] ; then
    /sbin/service searchd stop >/dev/null 2>&1
    /sbin/chkconfig --del searchd
fi


%post -p /sbin/ldconfig -n libsphinxclient


%postun -p /sbin/ldconfig -n libsphinxclient
 


%files
%defattr(-,root,root,-)
%doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql
%dir %{_sysconfdir}/sphinx
%config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf
%exclude %{_sysconfdir}/sphinx/*.conf.dist
%exclude %{_sysconfdir}/sphinx/example.sql
%{_initrddir}/searchd
%config(noreplace) %{_sysconfdir}/logrotate.d/sphinx
%{_bindir}/*
%dir %{_localstatedir}/log/sphinx
%dir %{_localstatedir}/run/sphinx
%dir %{_localstatedir}/lib/sphinx

%files -n libsphinxclient
%defattr(-,root,root,-)
%doc api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
%{_libdir}/libsphinxclient-0*.so


%files -n libsphinxclient-devel
%defattr(-,root,root,-)
%{_libdir}/libsphinxclient.so
%{_includedir}/*

%changelog
* Wed Aug 12 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-3
- Fixed macros consistency.
- Modified make install to keep timestamps.
- Added libsphinxclient package.

* Fri Aug  7 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-2
- Added sysv init.
- Added logrotate.d entry.

* Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-1
- Initial rpm release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:19:13 -0000	1.1
+++ .cvsignore	14 Aug 2009 16:49:19 -0000	1.2
@@ -0,0 +1 @@
+sphinx-0.9.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:19:13 -0000	1.1
+++ sources	14 Aug 2009 16:49:19 -0000	1.2
@@ -0,0 +1 @@
+428a14df41fb425e664d9e2d6178c037  sphinx-0.9.8.1.tar.gz



From hadess at fedoraproject.org  Fri Aug 14 16:52:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 16:52:59 +0000 (UTC)
Subject: rpms/control-center/devel
	0001-Remove-old-code-poking-directly-into-the-pwent.patch, NONE,
	1.1 control-center.spec, 1.468,
	1.469 gnome-control-center-2.25.2-passwd.patch, 1.3, 1.4
Message-ID: <20090814165259.D4E4E11C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23512

Modified Files:
	control-center.spec gnome-control-center-2.25.2-passwd.patch 
Added Files:
	0001-Remove-old-code-poking-directly-into-the-pwent.patch 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
- Split off passwd usage patch


0001-Remove-old-code-poking-directly-into-the-pwent.patch:
 gnome-about-me.c |   59 +++++--------------------------------------------------
 1 file changed, 6 insertions(+), 53 deletions(-)

--- NEW FILE 0001-Remove-old-code-poking-directly-into-the-pwent.patch ---
>From d5c5c8d58fe997e8af0675cdaf0e025e21edfa19 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Fri, 14 Aug 2009 17:44:17 +0100
Subject: [PATCH] Remove old code poking directly into the pwent

Use the glib functions to get the login name and real user name,
instead or some crummy Unix-y code.
---
 capplets/about-me/gnome-about-me.c |   58 ++++--------------------------------
 1 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 5a40874..af5c579 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -24,10 +24,8 @@
 #endif
 
 #include <glib/gstdio.h>
-#include <pwd.h>
 #include <gio/gio.h>
 #include <gconf/gconf-client.h>
-#include <pwd.h>
 #include <unistd.h>
 #include <libebook/e-book.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -332,22 +330,6 @@ about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, GnomeAboutMe *me)
 	return FALSE;
 }
 
-static char *
-get_user_login (void)
-{
-	char buf[LINE_MAX * 4];
-	struct passwd pwd, *err;
-
-	int i;
-#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS)
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
-	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
-#else
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
-	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
-#endif
-}
-
 /*
  * Helpers
  */
@@ -858,16 +840,13 @@ about_me_setup_dialog (void)
 	GtkBuilder   *dialog;
 	GError 	     *error = NULL;
 	GList        *chain;
-
-	struct passwd *pwent;
-	gchar *str;
-	gchar **tok;
+	gchar        *str;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
 	dialog = gtk_builder_new ();
 	gtk_builder_add_from_file (dialog, GNOMECC_UI_DIR "/gnome-about-me-dialog.ui", NULL);
-    
+
 	me->image_chooser = e_image_chooser_new ();
 	gtk_container_add (GTK_CONTAINER (WID ("button-image")), me->image_chooser);
 
@@ -933,34 +912,14 @@ about_me_setup_dialog (void)
 		about_me_setup_email (me);
 	}
 
-	/************************************************/
-	me->login = get_user_login ();
-	setpwent ();
-	pwent = getpwnam (me->login);
-	if (pwent == NULL) {
-		about_me_error (GTK_WINDOW (WID ("about-me-dialog")),
-				_("Unknown login ID, the user database might be corrupted"));
-		about_me_destroy (me);
-		return -1;
-	}
-	tok = g_strsplit (pwent->pw_gecos, ",", 0);
-
-	/************************************************/
-
-	if (tok[0] == NULL || *tok[0] == '\0')
-		me->username = NULL;
-	else
-		me->username = g_strdup (tok[0]);
+	me->login = g_strdup (g_get_user_name ());
+	me->username = g_strdup (g_get_real_name ());
 
 	/* Contact Tab */
 	about_me_load_photo (me, me->contact);
 
 	widget = WID ("fullname");
-	if (tok[0] == NULL || *tok[0] == '\0') {
-		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", me->login);
-	} else {
-		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", tok[0]);
-	}
+	str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", me->username);
 
 	gtk_label_set_markup (GTK_LABEL (widget), str);
 	g_free (str);
@@ -968,14 +927,9 @@ about_me_setup_dialog (void)
 	widget = WID ("login");
 	gtk_label_set_text (GTK_LABEL (widget), me->login);
 
-	if (tok[0] == NULL || *tok[0] == '\0') {
-		str = g_strdup_printf (_("About %s"), me->login);
-	} else {
-		str = g_strdup_printf (_("About %s"), tok[0]);
-	}
+	str = g_strdup_printf (_("About %s"), me->username);
 	gtk_window_set_title (GTK_WINDOW (main_dialog), str);
 	g_free (str);
-	g_strfreev (tok);
 
 	widget = WID ("password");
 	g_signal_connect (widget, "clicked",
-- 
1.6.2.5



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- control-center.spec	14 Aug 2009 13:44:37 -0000	1.468
+++ control-center.spec	14 Aug 2009 16:52:59 -0000	1.469
@@ -34,6 +34,8 @@ Source1: org.gnome.control-center.defaul
 Patch3: control-center-2.19.3-no-gnome-common.patch
 # http://bugzilla.gnome.org/536531
 Patch7: make-default.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=591824
+Patch8: 0001-Remove-old-code-poking-directly-into-the-pwent.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=475804
 Patch10: gcc-pam-fprintd-avail.patch
@@ -361,6 +363,9 @@ fi
 
 %changelog
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
+- Split off passwd usage patch
+
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
 - Update to 2.27.5
 - Port PolicyKit patches to latest version
 - Disable gecos patch, needs porting to GtkBuilder

gnome-control-center-2.25.2-passwd.patch:
 gnome-about-me.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Index: gnome-control-center-2.25.2-passwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-passwd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-control-center-2.25.2-passwd.patch	10 Aug 2009 16:14:29 -0000	1.3
+++ gnome-control-center-2.25.2-passwd.patch	14 Aug 2009 16:52:59 -0000	1.4
@@ -22,69 +22,3 @@ index 8119c3c..b7fe5d8 100644
  }
  
  static void
-@@ -884,10 +880,7 @@ about_me_setup_dialog (void)
- 	GtkBuilder   *dialog;
- 	GError 	     *error = NULL;
- 	GList        *chain;
--
--	struct passwd *pwent;
--	gchar *str;
--	gchar **tok;
-+	gchar        *str;
- 
- 	me = g_new0 (GnomeAboutMe, 1);
- 
-@@ -959,34 +952,14 @@ about_me_setup_dialog (void)
- 		about_me_setup_email (me);
- 	}
- 
--	/************************************************/
--	me->login = get_user_login ();
--	setpwent ();
--	pwent = getpwnam (me->login);
--	if (pwent == NULL) {
--		about_me_error (GTK_WINDOW (WID ("about-me-dialog")),
--				_("Unknown login ID, the user database might be corrupted"));
--		about_me_destroy (me);
--		return -1;
--	}
--	tok = g_strsplit (pwent->pw_gecos, ",", 0);
--
--	/************************************************/
--
--	if (tok[0] == NULL || *tok[0] == '\0')
--		me->username = NULL;
--	else
--		me->username = g_strdup (tok[0]);
-+	me->login = g_strdup (g_get_user_name ());
-+	me->username = g_strdup (g_get_real_name ());
- 
- 	/* Contact Tab */
- 	about_me_load_photo (me, me->contact);
- 
- 	widget = WID ("fullname");
--	if (tok[0] == NULL || *tok[0] == '\0') {
--		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", me->login);
--	} else {
--		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", tok[0]);
--	}
-+	str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", me->username);
- 
- 	gtk_label_set_markup (GTK_LABEL (widget), str);
- 	g_free (str);
-@@ -994,14 +967,9 @@ about_me_setup_dialog (void)
- 	widget = WID ("login");
- 	gtk_label_set_text (GTK_LABEL (widget), me->login);
- 
--	if (tok[0] == NULL || *tok[0] == '\0') {
--		str = g_strdup_printf (_("About %s"), me->login);
--	} else {
--		str = g_strdup_printf (_("About %s"), tok[0]);
--	}
-+	str = g_strdup_printf (_("About %s"), me->username);
- 	gtk_window_set_title (GTK_WINDOW (main_dialog), str);
- 	g_free (str);
--	g_strfreev (tok);
- 
- 	widget = WID ("password");
- 	g_signal_connect (widget, "clicked",



From hadess at fedoraproject.org  Fri Aug 14 16:53:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 16:53:30 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.469,1.470
Message-ID: <20090814165330.D083711C00D0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23697

Modified Files:
	control-center.spec 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
- Split off passwd usage patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -p -r1.469 -r1.470
--- control-center.spec	14 Aug 2009 16:52:59 -0000	1.469
+++ control-center.spec	14 Aug 2009 16:53:30 -0000	1.470
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -362,7 +362,7 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
-* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
 - Split off passwd usage patch
 
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-1



From jkeating at fedoraproject.org  Fri Aug 14 16:57:09 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 14 Aug 2009 16:57:09 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.1-geode-i686.patch, NONE, 1.1 rpm.spec, 1.358,
	1.359
Message-ID: <20090814165709.E64D011C00D0@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24432

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.1-geode-i686.patch 
Log Message:
* Fri Aug 14 2009 Jesse Keating <jkeating at redhat.com> - 4.7.1-4
- Patch to make geode appear as i686 (#517475)


rpm-4.7.1-geode-i686.patch:
 rpmrc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-geode-i686.patch ---
diff --git a/rpmrc.in b/rpmrc.in
index 4a6cca9..d62ddaf 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -281,7 +281,7 @@ arch_compat: alphaev5: alpha
 arch_compat: alpha: axp noarch
 
 arch_compat: athlon: i686
-arch_compat: geode: i586
+arch_compat: geode: i686
 arch_compat: pentium4: pentium3
 arch_compat: pentium3: i686
 arch_compat: i686: i586



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -p -r1.358 -r1.359
--- rpm.spec	6 Aug 2009 17:06:31 -0000	1.358
+++ rpm.spec	14 Aug 2009 16:57:09 -0000	1.359
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -43,6 +43,7 @@ Patch3: rpm-4.6.0-fedora-specspo.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
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -193,6 +194,7 @@ packages on a system.
 
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
+%patch302 -p1 -b .geode
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -404,6 +406,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Aug 14 2009 Jesse Keating <jkeating at redhat.com> - 4.7.1-4
+- Patch to make geode appear as i686 (#517475)
+
 * Thu Aug 06 2009 Jindrich Novy <jnovy at redhat.com> - 4.7.1-3
 - rebuild because of the new xz
 



From allisson at fedoraproject.org  Fri Aug 14 16:57:13 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 14 Aug 2009 16:57:13 +0000 (UTC)
Subject: rpms/sphinx/F-10 import.log, NONE, 1.1 sphinx.init, NONE,
	1.1 sphinx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814165713.5B25F11C00D0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/sphinx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24349/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sphinx.init sphinx.spec 
Log Message:

First import



--- NEW FILE import.log ---
sphinx-0_9_8_1-3_fc11:F-10:sphinx-0.9.8.1-3.fc11.src.rpm:1250268856


--- NEW FILE sphinx.init ---
#!/bin/sh
#
# sphinx searchd Free open-source SQL full-text search engine
#
# chkconfig:   - 20 80
# description: Starts and stops the sphinx searchd daemon that handles \
#	       all search requests.

### BEGIN INIT INFO
# Provides: searchd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $remote_fs
# Should-Stop: $remote_fs
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop sphinx searchd daemon
# Description: Sphinx is a free open-source SQL full-text search engine     
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/searchd"
prog="searchd"
config="/etc/sphinx/sphinx.conf"

lockfile=/var/lock/subsys/searchd

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon $exec --config $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE sphinx.spec ---
Name:           sphinx
Version:        0.9.8.1
Release:        3%{?dist}
Summary:        Free open-source SQL full-text search engine

Group:          Applications/Text
License:        GPLv2+
URL:            http://sphinxsearch.com
Source0:        http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
Source1:        %{name}.init
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  postgresql-devel
BuildRequires:  expat-devel
#Requires:

Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
       

%description
Sphinx is a full-text search engine, distributed under GPL version 2.
Commercial licensing (eg. for embedded use) is also available upon request.

Generally, it's a standalone search engine, meant to provide fast,
size-efficient and relevant full-text search functions to other
applications. Sphinx was specially designed to integrate well with SQL
databases and scripting languages.

Currently built-in data source drivers support fetching data either via
direct connection to MySQL, or PostgreSQL, or from a pipe in a custom XML
format. Adding new drivers (eg. to natively support some other DBMSes) is
designed to be as easy as possible.

Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also
available as a pluggable MySQL storage engine. API is very lightweight so
porting it to new language is known to take a few hours.

As for the name, Sphinx is an acronym which is officially decoded as SQL
Phrase Index. Yes, I know about CMU's Sphinx project.


%package -n libsphinxclient
Summary:        Pure C searchd client API library
Group:          Development/Libraries


%description -n libsphinxclient
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%package -n libsphinxclient-devel
Summary:        Development libraries and header files for libsphinxclient
Group:          Development/Libraries
Requires:       libsphinxclient = %{version}-%{release}


%description -n libsphinxclient-devel
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%prep
%setup -q

# Fix wrong-file-end-of-line-encoding
sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql
sed -i 's/\r//' api/java/mk.cmd
sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php
sed -i 's/\r//' api/ruby/lib/sphinx/response.rb


%build
%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql
make %{?_smp_mflags}

# Build libsphinxclient
cd api/libsphinxclient/
%configure
make #%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# Install sphinx initscript
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd

# Create /var/log/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx

# Create /var/run/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx

# Create /var/lib/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx

# Create sphinx.conf
cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \
    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
    
# Modify sphinx.conf
sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

# Create /etc/logrotate.d/sphinx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF
/var/log/sphinx/*.log {
       weekly
       rotate 10
       copytruncate
       delaycompress
       compress
       notifempty
       missingok
}
EOF

# Install libsphinxclient
cd api/libsphinxclient/
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# clean-up .la archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# clean-up .a archives
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add searchd

%preun
if [ $1 = 0 ] ; then
    /sbin/service searchd stop >/dev/null 2>&1
    /sbin/chkconfig --del searchd
fi


%post -p /sbin/ldconfig -n libsphinxclient


%postun -p /sbin/ldconfig -n libsphinxclient
 


%files
%defattr(-,root,root,-)
%doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql
%dir %{_sysconfdir}/sphinx
%config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf
%exclude %{_sysconfdir}/sphinx/*.conf.dist
%exclude %{_sysconfdir}/sphinx/example.sql
%{_initrddir}/searchd
%config(noreplace) %{_sysconfdir}/logrotate.d/sphinx
%{_bindir}/*
%dir %{_localstatedir}/log/sphinx
%dir %{_localstatedir}/run/sphinx
%dir %{_localstatedir}/lib/sphinx

%files -n libsphinxclient
%defattr(-,root,root,-)
%doc api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
%{_libdir}/libsphinxclient-0*.so


%files -n libsphinxclient-devel
%defattr(-,root,root,-)
%{_libdir}/libsphinxclient.so
%{_includedir}/*

%changelog
* Wed Aug 12 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-3
- Fixed macros consistency.
- Modified make install to keep timestamps.
- Added libsphinxclient package.

* Fri Aug  7 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-2
- Added sysv init.
- Added logrotate.d entry.

* Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-1
- Initial rpm release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:19:13 -0000	1.1
+++ .cvsignore	14 Aug 2009 16:57:13 -0000	1.2
@@ -0,0 +1 @@
+sphinx-0.9.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:19:13 -0000	1.1
+++ sources	14 Aug 2009 16:57:13 -0000	1.2
@@ -0,0 +1 @@
+428a14df41fb425e664d9e2d6178c037  sphinx-0.9.8.1.tar.gz



From diegobz at fedoraproject.org  Fri Aug 14 16:57:47 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Fri, 14 Aug 2009 16:57:47 +0000 (UTC)
Subject: rpms/Django-south/F-11 Django-south.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814165747.4DD9611C00D0@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-serv24266/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	Django-south.spec import.log 
Log Message:
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
- Initial cvs import for F-11




--- NEW FILE Django-south.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define vcstag rc1

Name:           Django-south
Version:        0.6
Release:        2%{?dist}
Summary:        Intelligent schema migrations for Django apps

Group:          Development/Languages
License:        ASL 2.0
URL:            http://south.aeracode.org
#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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
South brings migrations to Django applications. Its main objectives are to
provide a simple, stable and database-independent migration layer to prevent
all the hassle schema changes over time bring to your Django applications.

%prep
%setup -q -n south
#%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc docs/
%{python_sitelib}/*

%changelog
* 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

* Sun Aug 11 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-1
- Updated to 0.6 Release

* Sun Aug 11 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.1.20090811hgrc1
- Initial RPM release


--- NEW FILE import.log ---
Django-south-0_6-2_fc11:F-11:Django-south-0.6-2.fc11.src.rpm:1250269009


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:18:36 -0000	1.1
+++ .cvsignore	14 Aug 2009 16:57:47 -0000	1.2
@@ -0,0 +1 @@
+south-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:18:36 -0000	1.1
+++ sources	14 Aug 2009 16:57:47 -0000	1.2
@@ -0,0 +1 @@
+44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz



From diegobz at fedoraproject.org  Fri Aug 14 17:05:01 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Fri, 14 Aug 2009 17:05:01 +0000 (UTC)
Subject: rpms/Django-south/EL-5 Django-south.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814170501.4732C11C00D0@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-serv26665/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	Django-south.spec import.log 
Log Message:
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
- Initial cvs import for EL-5




--- NEW FILE Django-south.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define vcstag rc1

Name:           Django-south
Version:        0.6
Release:        2%{?dist}
Summary:        Intelligent schema migrations for Django apps

Group:          Development/Languages
License:        ASL 2.0
URL:            http://south.aeracode.org
#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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
South brings migrations to Django applications. Its main objectives are to
provide a simple, stable and database-independent migration layer to prevent
all the hassle schema changes over time bring to your Django applications.

%prep
%setup -q -n south
#%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc docs/
%{python_sitelib}/*

%changelog
* 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

* Sun Aug 11 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-1
- Updated to 0.6 Release

* Sun Aug 11 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.1.20090811hgrc1
- Initial RPM release


--- NEW FILE import.log ---
Django-south-0_6-2_fc11:EL-5:Django-south-0.6-2.fc11.src.rpm:1250269504


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:18:36 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:05:01 -0000	1.2
@@ -0,0 +1 @@
+south-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:18:36 -0000	1.1
+++ sources	14 Aug 2009 17:05:01 -0000	1.2
@@ -0,0 +1 @@
+44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz



From allisson at fedoraproject.org  Fri Aug 14 17:16:52 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 14 Aug 2009 17:16:52 +0000 (UTC)
Subject: rpms/sphinx/EL-5 import.log, NONE, 1.1 sphinx.init, NONE,
	1.1 sphinx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814171652.44A7C11C00D0@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/sphinx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28483/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sphinx.init sphinx.spec 
Log Message:

First import.



--- NEW FILE import.log ---
sphinx-0_9_8_1-3_fc11:EL-5:sphinx-0.9.8.1-3.fc11.src.rpm:1250269749


--- NEW FILE sphinx.init ---
#!/bin/sh
#
# sphinx searchd Free open-source SQL full-text search engine
#
# chkconfig:   - 20 80
# description: Starts and stops the sphinx searchd daemon that handles \
#	       all search requests.

### BEGIN INIT INFO
# Provides: searchd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $remote_fs
# Should-Stop: $remote_fs
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop sphinx searchd daemon
# Description: Sphinx is a free open-source SQL full-text search engine     
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/searchd"
prog="searchd"
config="/etc/sphinx/sphinx.conf"

lockfile=/var/lock/subsys/searchd

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon $exec --config $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE sphinx.spec ---
Name:           sphinx
Version:        0.9.8.1
Release:        3%{?dist}
Summary:        Free open-source SQL full-text search engine

Group:          Applications/Text
License:        GPLv2+
URL:            http://sphinxsearch.com
Source0:        http://sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
Source1:        %{name}.init
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  postgresql-devel
BuildRequires:  expat-devel
#Requires:

Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
       

%description
Sphinx is a full-text search engine, distributed under GPL version 2.
Commercial licensing (eg. for embedded use) is also available upon request.

Generally, it's a standalone search engine, meant to provide fast,
size-efficient and relevant full-text search functions to other
applications. Sphinx was specially designed to integrate well with SQL
databases and scripting languages.

Currently built-in data source drivers support fetching data either via
direct connection to MySQL, or PostgreSQL, or from a pipe in a custom XML
format. Adding new drivers (eg. to natively support some other DBMSes) is
designed to be as easy as possible.

Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also
available as a pluggable MySQL storage engine. API is very lightweight so
porting it to new language is known to take a few hours.

As for the name, Sphinx is an acronym which is officially decoded as SQL
Phrase Index. Yes, I know about CMU's Sphinx project.


%package -n libsphinxclient
Summary:        Pure C searchd client API library
Group:          Development/Libraries


%description -n libsphinxclient
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%package -n libsphinxclient-devel
Summary:        Development libraries and header files for libsphinxclient
Group:          Development/Libraries
Requires:       libsphinxclient = %{version}-%{release}


%description -n libsphinxclient-devel
Pure C searchd client API library
Sphinx search engine, http://sphinxsearch.com/


%prep
%setup -q

# Fix wrong-file-end-of-line-encoding
sed -i 's/\r//' api/ruby/spec/sphinx/sphinx_test.sql
sed -i 's/\r//' api/java/mk.cmd
sed -i 's/\r//' api/ruby/spec/fixtures/keywords.php
sed -i 's/\r//' api/ruby/lib/sphinx/response.rb


%build
%configure --sysconfdir=/etc/sphinx --with-mysql --with-pgsql
make %{?_smp_mflags}

# Build libsphinxclient
cd api/libsphinxclient/
%configure
make #%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# Install sphinx initscript
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd

# Create /var/log/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx

# Create /var/run/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx

# Create /var/lib/sphinx
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx

# Create sphinx.conf
cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \
    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
    
# Modify sphinx.conf
sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \
$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf

# Create /etc/logrotate.d/sphinx
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF
/var/log/sphinx/*.log {
       weekly
       rotate 10
       copytruncate
       delaycompress
       compress
       notifempty
       missingok
}
EOF

# Install libsphinxclient
cd api/libsphinxclient/
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"

# clean-up .la archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# clean-up .a archives
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add searchd

%preun
if [ $1 = 0 ] ; then
    /sbin/service searchd stop >/dev/null 2>&1
    /sbin/chkconfig --del searchd
fi


%post -p /sbin/ldconfig -n libsphinxclient


%postun -p /sbin/ldconfig -n libsphinxclient
 


%files
%defattr(-,root,root,-)
%doc COPYING doc/sphinx.txt sphinx-min.conf.dist sphinx.conf.dist example.sql
%dir %{_sysconfdir}/sphinx
%config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf
%exclude %{_sysconfdir}/sphinx/*.conf.dist
%exclude %{_sysconfdir}/sphinx/example.sql
%{_initrddir}/searchd
%config(noreplace) %{_sysconfdir}/logrotate.d/sphinx
%{_bindir}/*
%dir %{_localstatedir}/log/sphinx
%dir %{_localstatedir}/run/sphinx
%dir %{_localstatedir}/lib/sphinx

%files -n libsphinxclient
%defattr(-,root,root,-)
%doc api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
%{_libdir}/libsphinxclient-0*.so


%files -n libsphinxclient-devel
%defattr(-,root,root,-)
%{_libdir}/libsphinxclient.so
%{_includedir}/*

%changelog
* Wed Aug 12 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-3
- Fixed macros consistency.
- Modified make install to keep timestamps.
- Added libsphinxclient package.

* Fri Aug  7 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-2
- Added sysv init.
- Added logrotate.d entry.

* Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-1
- Initial rpm release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:19:13 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:16:52 -0000	1.2
@@ -0,0 +1 @@
+sphinx-0.9.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:19:13 -0000	1.1
+++ sources	14 Aug 2009 17:16:52 -0000	1.2
@@ -0,0 +1 @@
+428a14df41fb425e664d9e2d6178c037  sphinx-0.9.8.1.tar.gz



From hadess at fedoraproject.org  Fri Aug 14 17:18:00 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 17:18:00 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.115, 
	1.116
Message-ID: <20090814171800.2200811C00D0@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-serv28840

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-2
- Update gnome-volume-control code



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- gnome-settings-daemon.spec	14 Aug 2009 10:13:47 -0000	1.115
+++ gnome-settings-daemon.spec	14 Aug 2009 17:17:59 -0000	1.116
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.27.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -32,6 +32,7 @@ BuildRequires:	gettext
 BuildRequires:  autoconf, automake, libtool, intltool
 BuildRequires:  fontconfig-devel
 
+Patch0:		0001-Update-gnome-volume-control-code.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=524499
@@ -55,6 +56,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 
+%patch0 -p1 -b .gvc-update
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .locate-pointer
 
@@ -170,6 +172,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-2
+- Update gnome-volume-control code
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-1
 - Update to 2.27.90
 



From hadess at fedoraproject.org  Fri Aug 14 17:22:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 17:22:47 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	0001-Update-gnome-volume-control-code.patch, NONE, 1.1
Message-ID: <20090814172247.F27CB11C02C2@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-serv29794

Added Files:
	0001-Update-gnome-volume-control-code.patch 
Log Message:
And a missing patch

0001-Update-gnome-volume-control-code.patch:
 cut-n-paste/gvc-channel-map.c   |   15 +++++++++++----
 cut-n-paste/gvc-channel-map.h   |    5 +++--
 cut-n-paste/gvc-mixer-control.c |    2 +-
 cut-n-paste/gvc-mixer-stream.c  |   16 +++++++++++++---
 gsd-media-keys-manager.c        |    4 +++-
 5 files changed, 31 insertions(+), 11 deletions(-)

--- NEW FILE 0001-Update-gnome-volume-control-code.patch ---
>From 5f24fe80d888f9bf8670f03c37af63e96799285a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 14 Aug 2009 18:16:10 +0100
Subject: [PATCH] Update gnome-volume-control code

Should cut down on the feedback loops.
---
 plugins/media-keys/cut-n-paste/gvc-channel-map.c   |   15 +++++++++++----
 plugins/media-keys/cut-n-paste/gvc-channel-map.h   |    5 +++--
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c |    2 +-
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.c  |   16 +++++++++++++---
 plugins/media-keys/gsd-media-keys-manager.c        |    3 +++
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/plugins/media-keys/cut-n-paste/gvc-channel-map.c b/plugins/media-keys/cut-n-paste/gvc-channel-map.c
index 32750ef..ea3e5af 100644
--- a/plugins/media-keys/cut-n-paste/gvc-channel-map.c
+++ b/plugins/media-keys/cut-n-paste/gvc-channel-map.c
@@ -44,6 +44,7 @@
 struct GvcChannelMapPrivate
 {
         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;
@@ -208,15 +209,16 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GvcChannelMapClass, volume_changed),
                               NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE, 0);
+                              g_cclosure_marshal_VOID__BOOLEAN,
+                              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
         g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate));
 }
 
 void
 gvc_channel_map_volume_changed (GvcChannelMap     *map,
-                                const pa_cvolume  *cv)
+                                const pa_cvolume  *cv,
+                                gboolean           set)
 {
         g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
         g_return_if_fail (cv != NULL);
@@ -227,13 +229,18 @@ gvc_channel_map_volume_changed (GvcChannelMap     *map,
 
         map->priv->pa_volume = *cv;
 
-        g_signal_emit (map, signals[VOLUME_CHANGED], 0);
+        if (map->priv->pa_volume_is_set == FALSE) {
+                map->priv->pa_volume_is_set = TRUE;
+                return;
+        }
+        g_signal_emit (map, signals[VOLUME_CHANGED], 0, set);
 }
 
 static void
 gvc_channel_map_init (GvcChannelMap *map)
 {
         map->priv = GVC_CHANNEL_MAP_GET_PRIVATE (map);
+        map->priv->pa_volume_is_set = FALSE;
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-channel-map.h b/plugins/media-keys/cut-n-paste/gvc-channel-map.h
index b35c9cb..497ce69 100644
--- a/plugins/media-keys/cut-n-paste/gvc-channel-map.h
+++ b/plugins/media-keys/cut-n-paste/gvc-channel-map.h
@@ -44,7 +44,7 @@ typedef struct
 typedef struct
 {
         GObjectClass           parent_class;
-        void (*volume_changed) (GvcChannelMap *channel_map);
+        void (*volume_changed) (GvcChannelMap *channel_map, gboolean set);
 } GvcChannelMapClass;
 
 enum {
@@ -67,7 +67,8 @@ gboolean                gvc_channel_map_can_fade                (GvcChannelMap
 gboolean                gvc_channel_map_has_lfe                 (GvcChannelMap  *map);
 
 void                    gvc_channel_map_volume_changed          (GvcChannelMap    *map,
-                                                                 const pa_cvolume *cv);
+                                                                 const pa_cvolume *cv,
+                                                                 gboolean          set);
 const char *            gvc_channel_map_get_mapping             (GvcChannelMap  *map);
 
 /* private */
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
index 0b5feee..eba8f55 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-control.c
@@ -691,7 +691,7 @@ update_sink (GvcMixerControl    *control,
 
         if (map == NULL)
                 map = gvc_mixer_stream_get_channel_map (stream);
-        gvc_channel_map_volume_changed (map, &info->volume);
+        gvc_channel_map_volume_changed (map, &info->volume, TRUE);
 }
 
 static void
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
index caea0f1..2a9a7ce 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-stream.c
@@ -153,7 +153,7 @@ gvc_mixer_stream_set_volume (GvcMixerStream *stream,
         pa_cvolume_scale(&cv, volume);
 
         if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
-                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv);
+                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv, FALSE);
                 g_object_notify (G_OBJECT (stream), "volume");
         }
 
@@ -172,7 +172,7 @@ gvc_mixer_stream_set_decibel (GvcMixerStream *stream,
         pa_cvolume_scale(&cv, pa_sw_volume_from_dB(db));
 
         if (!pa_cvolume_equal(gvc_channel_map_get_cvolume(stream->priv->channel_map), &cv)) {
-                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv);
+                gvc_channel_map_volume_changed(stream->priv->channel_map, &cv, FALSE);
                 g_object_notify (G_OBJECT (stream), "volume");
         }
 
@@ -323,9 +323,11 @@ gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
 
 static void
 on_channel_map_volume_changed (GvcChannelMap  *channel_map,
+                               gboolean        set,
                                GvcMixerStream *stream)
 {
-        gvc_mixer_stream_push_volume (stream);
+        if (set == TRUE)
+                gvc_mixer_stream_push_volume (stream);
 
         g_object_notify (G_OBJECT (stream), "volume");
 }
@@ -650,7 +652,15 @@ gvc_mixer_stream_push_volume (GvcMixerStream *stream)
 {
         pa_operation *op;
         gboolean ret;
+
         g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
+
+        if (stream->priv->is_event_stream != FALSE)
+                return TRUE;
+
+        g_debug ("Pushing new volume to stream '%s' (%s)",
+                 stream->priv->description, stream->priv->name);
+
         ret = GVC_MIXER_STREAM_GET_CLASS (stream)->push_volume (stream, (gpointer *) &op);
         if (ret) {
                 if (stream->priv->change_volume_op != NULL)
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 8438875..2b14bcc 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -688,9 +688,11 @@ do_sound_action (GsdMediaKeysManager *manager,
                         manager->priv->num_expected_update_signals = 2;
                         gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
                         gvc_mixer_stream_set_volume (manager->priv->stream, 0);
+                        gvc_mixer_stream_push_volume (manager->priv->stream);
                 } else if (!muted) {
                         manager->priv->num_expected_update_signals = 1;
                         gvc_mixer_stream_set_volume (manager->priv->stream, vol - norm_vol_step);
+                        gvc_mixer_stream_push_volume (manager->priv->stream);
                 }
                 break;
         case VOLUME_UP_KEY:
@@ -698,6 +700,7 @@ do_sound_action (GsdMediaKeysManager *manager,
                         if (vol == 0) {
                                 manager->priv->num_expected_update_signals = 2;
                                 gvc_mixer_stream_set_volume (manager->priv->stream, vol + norm_vol_step);
+                                gvc_mixer_stream_push_volume (manager->priv->stream);
                                 gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted);
                         } else {
                                 manager->priv->num_expected_update_signals = 1;
-- 
1.6.2.5




From ankursinha at fedoraproject.org  Fri Aug 14 17:22:47 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 14 Aug 2009 17:22:47 +0000 (UTC)
Subject: rpms/fpaste/devel fpaste.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814172247.3476711C00D0@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29643/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fpaste.spec import.log 
Log Message:
* Fri Aug 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2
- initial cvs commit for fpaste



--- NEW FILE fpaste.spec ---
Name:		fpaste
Version:	0.3.2
Release:	2%{?dist}
Summary:	A simple tool for pasting info onto fpaste.org
BuildArch:	noarch
Group:		Applications/Internet
License:	GPLv3+
URL:		https://fedorahosted.org/fpaste/
Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2


%description
It is often useful to be able to easily paste text to the Fedora
Pastebin at http://fpaste.org and this simple script will do that
and return the resulting URL so that people may examine the
output. This can hopefully help folks who are for some reason 
stuck without X, working remotely, or any other reason they may
be unable to paste something into the pastebin

%prep
%setup -q 

%build
#nothing required

%install
mkdir -p %{buildroot}%{_bindir}
make install BINDIR=%{buildroot}%{_bindir} MANDIR=%{buildroot}%{_mandir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc CHANGELOG COPYING README TODO
%{_mandir}/man1/fpaste.1.gz

%changelog
* Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-2
- Corrected source0 field
* Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-1
- New tar 
- Man page included in tar
* Wed Aug 12 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.1-2
- Review request begins : #516698
- Removed buildroot declaration and removal from install section in accordance with new guidelines
- Aligned description properly
* Tue Aug 11 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.1-1
- Initial rpm build


--- NEW FILE import.log ---
fpaste-0_3_2-2_fc11:HEAD:fpaste-0.3.2-2.fc11.src.rpm:1250270457


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:20:07 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:22:46 -0000	1.2
@@ -0,0 +1 @@
+fpaste-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:20:07 -0000	1.1
+++ sources	14 Aug 2009 17:22:46 -0000	1.2
@@ -0,0 +1 @@
+3831fc1f9b070d75c0fbe9134b6e210d  fpaste-0.3.2.tar.bz2



From diegobz at fedoraproject.org  Fri Aug 14 17:27:21 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Fri, 14 Aug 2009 17:27:21 +0000 (UTC)
Subject: rpms/django-piston/devel django-piston.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814172721.D4E9C11C00D0@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-piston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30600/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-piston.spec import.log 
Log Message:
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.2.2-1
- Initial cvs import for devel




--- NEW FILE django-piston.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-piston
Version:        0.2.2
Release:        1%{?dist}
Summary:        A mini-framework for Django for creating RESTful APIs

Group:          Development/Languages
License:        BSD
URL:            http://bitbucket.org/jespern/django-piston/
Source:         http://bitbucket.org/jespern/django-piston/downloads/django-piston-0.2.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Piston is a relatively small Django application that lets you
create application programming interfaces (API) for your sites.

%prep
%setup -q -n %{name}

%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,-)
%{python_sitelib}/*

%changelog
* Thu Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.2.2-1
- Initial RPM release


--- NEW FILE import.log ---
django-piston-0_2_2-1_fc11:HEAD:django-piston-0.2.2-1.fc11.src.rpm:1250270826


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-piston/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:21:01 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:27:21 -0000	1.2
@@ -0,0 +1 @@
+django-piston-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-piston/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:21:01 -0000	1.1
+++ sources	14 Aug 2009 17:27:21 -0000	1.2
@@ -0,0 +1 @@
+28a2900695fdbcb14ff3c45390e7a4fd  django-piston-0.2.2.tar.gz



From ankursinha at fedoraproject.org  Fri Aug 14 17:29:06 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 14 Aug 2009 17:29:06 +0000 (UTC)
Subject: rpms/fpaste/F-10 fpaste.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814172906.9F50411C00D0@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31086/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	fpaste.spec import.log 
Log Message:
* Fri Aug 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2
- Initial cvs commit for fpaste



--- NEW FILE fpaste.spec ---
Name:		fpaste
Version:	0.3.2
Release:	2%{?dist}
Summary:	A simple tool for pasting info onto fpaste.org
BuildArch:	noarch
Group:		Applications/Internet
License:	GPLv3+
URL:		https://fedorahosted.org/fpaste/
Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2


%description
It is often useful to be able to easily paste text to the Fedora
Pastebin at http://fpaste.org and this simple script will do that
and return the resulting URL so that people may examine the
output. This can hopefully help folks who are for some reason 
stuck without X, working remotely, or any other reason they may
be unable to paste something into the pastebin

%prep
%setup -q 

%build
#nothing required

%install
mkdir -p %{buildroot}%{_bindir}
make install BINDIR=%{buildroot}%{_bindir} MANDIR=%{buildroot}%{_mandir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc CHANGELOG COPYING README TODO
%{_mandir}/man1/fpaste.1.gz

%changelog
* Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-2
- Corrected source0 field
* Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-1
- New tar 
- Man page included in tar
* Wed Aug 12 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.1-2
- Review request begins : #516698
- Removed buildroot declaration and removal from install section in accordance with new guidelines
- Aligned description properly
* Tue Aug 11 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.1-1
- Initial rpm build


--- NEW FILE import.log ---
fpaste-0_3_2-2_fc11:F-10:fpaste-0.3.2-2.fc11.src.rpm:1250270861


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:20:07 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:29:06 -0000	1.2
@@ -0,0 +1 @@
+fpaste-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:20:07 -0000	1.1
+++ sources	14 Aug 2009 17:29:06 -0000	1.2
@@ -0,0 +1 @@
+3831fc1f9b070d75c0fbe9134b6e210d  fpaste-0.3.2.tar.bz2



From ankursinha at fedoraproject.org  Fri Aug 14 17:35:39 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 14 Aug 2009 17:35:39 +0000 (UTC)
Subject: rpms/fpaste/F-11 fpaste.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814173539.3A12511C00D0@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv535/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	fpaste.spec import.log 
Log Message:
* Fri Aug 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2
- Initial cvs commit



--- NEW FILE fpaste.spec ---
Name:		fpaste
Version:	0.3.2
Release:	2%{?dist}
Summary:	A simple tool for pasting info onto fpaste.org
BuildArch:	noarch
Group:		Applications/Internet
License:	GPLv3+
URL:		https://fedorahosted.org/fpaste/
Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2


%description
It is often useful to be able to easily paste text to the Fedora
Pastebin at http://fpaste.org and this simple script will do that
and return the resulting URL so that people may examine the
output. This can hopefully help folks who are for some reason 
stuck without X, working remotely, or any other reason they may
be unable to paste something into the pastebin

%prep
%setup -q 

%build
#nothing required

%install
mkdir -p %{buildroot}%{_bindir}
make install BINDIR=%{buildroot}%{_bindir} MANDIR=%{buildroot}%{_mandir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc CHANGELOG COPYING README TODO
%{_mandir}/man1/fpaste.1.gz

%changelog
* Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-2
- Corrected source0 field
* Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-1
- New tar 
- Man page included in tar
* Wed Aug 12 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.1-2
- Review request begins : #516698
- Removed buildroot declaration and removal from install section in accordance with new guidelines
- Aligned description properly
* Tue Aug 11 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.1-1
- Initial rpm build


--- NEW FILE import.log ---
fpaste-0_3_2-2_fc11:F-11:fpaste-0.3.2-2.fc11.src.rpm:1250271212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:20:07 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:35:38 -0000	1.2
@@ -0,0 +1 @@
+fpaste-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:20:07 -0000	1.1
+++ sources	14 Aug 2009 17:35:38 -0000	1.2
@@ -0,0 +1 @@
+3831fc1f9b070d75c0fbe9134b6e210d  fpaste-0.3.2.tar.bz2



From diegobz at fedoraproject.org  Fri Aug 14 17:39:23 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Fri, 14 Aug 2009 17:39:23 +0000 (UTC)
Subject: rpms/django-piston/F-11 django-piston.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814173923.538D211C00D0@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-piston/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1154/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-piston.spec import.log 
Log Message:
Initial cvs import for F-11 



--- NEW FILE django-piston.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-piston
Version:        0.2.2
Release:        1%{?dist}
Summary:        A mini-framework for Django for creating RESTful APIs

Group:          Development/Languages
License:        BSD
URL:            http://bitbucket.org/jespern/django-piston/
Source:         http://bitbucket.org/jespern/django-piston/downloads/django-piston-0.2.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Piston is a relatively small Django application that lets you
create application programming interfaces (API) for your sites.

%prep
%setup -q -n %{name}

%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,-)
%{python_sitelib}/*

%changelog
* Thu Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.2.2-1
- Initial RPM release


--- NEW FILE import.log ---
django-piston-0_2_2-1_fc11:F-11:django-piston-0.2.2-1.fc11.src.rpm:1250271353


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-piston/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:21:01 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:39:23 -0000	1.2
@@ -0,0 +1 @@
+django-piston-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-piston/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:21:01 -0000	1.1
+++ sources	14 Aug 2009 17:39:23 -0000	1.2
@@ -0,0 +1 @@
+28a2900695fdbcb14ff3c45390e7a4fd  django-piston-0.2.2.tar.gz



From toshio at fedoraproject.org  Fri Aug 14 17:46:15 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 14 Aug 2009 17:46:15 +0000 (UTC)
Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.27,
	1.28 python-sqlalchemy.spec, 1.44, 1.45 sources, 1.28, 1.29
Message-ID: <20090814174615.9296811C00D0@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2782

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:

* Thu Aug 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.5-1
- Upstream bugfix release 0.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	12 Jun 2009 13:59:50 -0000	1.27
+++ .cvsignore	14 Aug 2009 17:46:15 -0000	1.28
@@ -1 +1 @@
-SQLAlchemy-0.5.4p2.tar.gz
+SQLAlchemy-0.5.5.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- python-sqlalchemy.spec	26 Jul 2009 23:08:25 -0000	1.44
+++ python-sqlalchemy.spec	14 Aug 2009 17:46:15 -0000	1.45
@@ -2,22 +2,22 @@
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 %global srcname SQLAlchemy
-%global patchtag p2
 
 Name:           python-sqlalchemy
-Version:        0.5.4
-Release:        2.%{?patchtag}%{?dist}
+Version:        0.5.5
+Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.sqlalchemy.org/
-Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}%{?patchtag}.tar.gz
+Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel >= 0.6c3
+BuildRequires: python-nose
 
 %description
 SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible,
@@ -29,7 +29,7 @@ define the join conditions explicitly, t
 domain.
 
 %prep
-%setup -q -n %{srcname}-%{version}%{?patchtag}
+%setup -q -n %{srcname}-%{version}
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -47,8 +47,9 @@ rm -rf doc/build
 rm -rf $RPM_BUILD_ROOT
 
 %check
-export PYTHONPATH=./test
-python test/alltests.py
+export PYTHONPATH=.
+python setup.py develop -d .
+nosetests
 
 %files
 %defattr(-,root,root,-)
@@ -56,6 +57,9 @@ python test/alltests.py
 %{python_sitelib}/*
 
 %changelog
+* Thu Aug 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.5-1
+- Upstream bugfix release 0.5.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2.p2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	12 Jun 2009 13:59:50 -0000	1.28
+++ sources	14 Aug 2009 17:46:15 -0000	1.29
@@ -1 +1 @@
-408dfb0868018abc1654b17a2fafaf70  SQLAlchemy-0.5.4p2.tar.gz
+6a518d2c16caf10bdbce85ad06e08abb  SQLAlchemy-0.5.5.tar.gz



From toshio at fedoraproject.org  Fri Aug 14 17:47:35 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 14 Aug 2009 17:47:35 +0000 (UTC)
Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec,1.45,1.46
Message-ID: <20090814174735.D2B0311C00D0@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3026

Modified Files:
	python-sqlalchemy.spec 
Log Message:
Interrupting make tag leaves the tag in the special tag-checking file.



Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- python-sqlalchemy.spec	14 Aug 2009 17:46:15 -0000	1.45
+++ python-sqlalchemy.spec	14 Aug 2009 17:47:35 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name:           python-sqlalchemy
 Version:        0.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -57,7 +57,7 @@ nosetests
 %{python_sitelib}/*
 
 %changelog
-* Thu Aug 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.5-1
+* Fri Aug 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.5-2
 - Upstream bugfix release 0.5.5
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2.p2



From davej at fedoraproject.org  Fri Aug 14 17:50:38 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 14 Aug 2009 17:50:38 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1108, 1.1109 kernel.spec, 1.1717, 1.1718 sources, 1.1066,
	1.1067 upstream, 1.980, 1.981 drm-hush-vblank-warning.patch, 1.1,
	NONE drm-radeon-fixes.patch, 1.1,
	NONE linux-2.6-ppc-perfctr-oops-fix.patch, 1.2,
	NONE patch-2.6.31-rc5-git3.bz2.sign, 1.1,
	NONE patch-2.6.31-rc5.bz2.sign, 1.1,
	NONE revert-ftrace-powerpc-snafu.patch, 1.1, NONE
Message-ID: <20090814175038.A8A8211C043D@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3692

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc6.bz2.sign 
Removed Files:
	drm-hush-vblank-warning.patch drm-radeon-fixes.patch 
	linux-2.6-ppc-perfctr-oops-fix.patch 
	patch-2.6.31-rc5-git3.bz2.sign patch-2.6.31-rc5.bz2.sign 
	revert-ftrace-powerpc-snafu.patch 
Log Message:
2.6.31-rc6


--- NEW FILE patch-2.6.31-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKhJwayGugalF9Dw4RApxAAJwPZmk4WG9CYJYy3TctvpzcXYj2NwCdFzAJ
A1H1MYHBR0WF6zAO81Pd830=
=W6Px
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1108
retrieving revision 1.1109
diff -u -p -r1.1108 -r1.1109
--- .cvsignore	5 Aug 2009 00:45:59 -0000	1.1108
+++ .cvsignore	14 Aug 2009 17:50:37 -0000	1.1109
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git3.bz2
+patch-2.6.31-rc6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1717
retrieving revision 1.1718
diff -u -p -r1.1717 -r1.1718
--- kernel.spec	13 Aug 2009 18:09:59 -0000	1.1717
+++ kernel.spec	14 Aug 2009 17:50:37 -0000	1.1718
@@ -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 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -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
@@ -588,8 +588,6 @@ Patch05: linux-2.6-makefile-after_link.p
 
 %if !%{nopatches}
 
-# revert powerpc breakage
-Patch08: revert-ftrace-powerpc-snafu.patch
 # revert upstream patches we get via other methods
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
@@ -614,7 +612,6 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch148: linux-2.6-ppc-perfctr-oops-fix.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -675,7 +672,6 @@ Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 
 # nouveau + drm fixes
-Patch1810: drm-radeon-fixes.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -685,7 +681,6 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
-Patch1827: drm-hush-vblank-warning.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1121,7 +1116,6 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-ApplyPatch revert-ftrace-powerpc-snafu.patch
 #ApplyPatch git-cpufreq.patch
 #ApplyPatch git-bluetooth.patch
 
@@ -1165,8 +1159,6 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
-# Fix oops in 7450 perfctr
-ApplyPatch linux-2.6-ppc-perfctr-oops-fix.patch
 
 #
 # SPARC64
@@ -1295,7 +1287,7 @@ ApplyPatch hid-ignore-all-recent-imon-de
 ApplyPatch linux-2.6-ksm.patch
 ApplyPatch linux-2.6-ksm-updates.patch
 # Optimize KVM for KSM support
-ApplyPatch linux-2.6-ksm-kvm.patch
+#ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1303,9 +1295,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-radeon-fixes.patch
 ApplyPatch drm-r600-kms.patch
-ApplyPatch drm-hush-vblank-warning.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1313,7 +1303,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-ApplyPatch drm-intel-next.patch
+#ApplyPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -1977,6 +1967,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 14 2009 Dave Jones <davej at redhat.com> 2.6.31-0.155.rc6
+- 2.6.31-rc6
+
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - fix perf.
 - move perf to perf.$ver instead of perf-$ver...


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1066
retrieving revision 1.1067
diff -u -p -r1.1066 -r1.1067
--- sources	5 Aug 2009 00:45:59 -0000	1.1066
+++ sources	14 Aug 2009 17:50:38 -0000	1.1067
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2
-6bc3320216b43bd8ce98e5f0565b485f  patch-2.6.31-rc5-git3.bz2
+056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -p -r1.980 -r1.981
--- upstream	5 Aug 2009 00:46:00 -0000	1.980
+++ upstream	14 Aug 2009 17:50:38 -0000	1.981
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git3.bz2
+patch-2.6.31-rc6.bz2


--- drm-hush-vblank-warning.patch DELETED ---


--- drm-radeon-fixes.patch DELETED ---


--- linux-2.6-ppc-perfctr-oops-fix.patch DELETED ---


--- patch-2.6.31-rc5-git3.bz2.sign DELETED ---


--- patch-2.6.31-rc5.bz2.sign DELETED ---


--- revert-ftrace-powerpc-snafu.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Aug 14 17:53:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:53:08 +0000
Subject: [pkgdb] xrdp was added for itamarjp
Message-ID: <20090814175308.6F0C510F84F@bastion2.fedora.phx.redhat.com>

tibbs has added Package xrdp with summary Open source remote desktop protocol (RDP) server
tibbs has approved Package xrdp
tibbs has added a Fedora devel branch for xrdp with an owner of itamarjp
tibbs has approved xrdp in Fedora devel
tibbs has approved Package xrdp
tibbs has set commit to Approved for 107427 on xrdp (Fedora devel)
tibbs has set checkout to Approved for 107427 on xrdp (Fedora devel)
tibbs has set build to Approved for 107427 on xrdp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xrdp



From pkgdb at fedoraproject.org  Fri Aug 14 17:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:53:09 +0000
Subject: [pkgdb] xrdp summary updated by tibbs
Message-ID: <20090814175309.C69D310F855@bastion2.fedora.phx.redhat.com>

tibbs set package xrdp summary to Open source remote desktop protocol (RDP) server

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xrdp



From pkgdb at fedoraproject.org  Fri Aug 14 17:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:53:09 +0000
Subject: [pkgdb] xrdp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814175309.E8C3B10F85C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for xrdp
tibbs has set commit to Approved for 107427 on xrdp (Fedora 11)
tibbs has set checkout to Approved for 107427 on xrdp (Fedora 11)
tibbs has set build to Approved for 107427 on xrdp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xrdp



From pkgdb at fedoraproject.org  Fri Aug 14 17:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:53:09 +0000
Subject: [pkgdb] xrdp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814175310.38BE710F862@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for xrdp
tibbs has set commit to Approved for 107427 on xrdp (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on xrdp (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on xrdp (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xrdp



From pkgdb at fedoraproject.org  Fri Aug 14 17:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:53:09 +0000
Subject: [pkgdb] xrdp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814175310.83D7E10F86E@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for xrdp
tibbs has set commit to Approved for 107427 on xrdp (Fedora 10)
tibbs has set checkout to Approved for 107427 on xrdp (Fedora 10)
tibbs has set build to Approved for 107427 on xrdp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xrdp



From tibbs at fedoraproject.org  Fri Aug 14 17:53:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:53:16 +0000 (UTC)
Subject: rpms/xrdp - New directory
Message-ID: <20090814175316.1AD0711C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xrdp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBF4376/rpms/xrdp

Log Message:
Directory /cvs/pkgs/rpms/xrdp added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 17:53:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:53:16 +0000 (UTC)
Subject: rpms/xrdp/devel - New directory
Message-ID: <20090814175316.3E16B11C0426@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBF4376/rpms/xrdp/devel

Log Message:
Directory /cvs/pkgs/rpms/xrdp/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 17:53:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:53:22 +0000 (UTC)
Subject: rpms/xrdp Makefile,NONE,1.1
Message-ID: <20090814175322.62C8511C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xrdp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBF4376/rpms/xrdp

Added Files:
	Makefile 
Log Message:
Setup of module xrdp


--- NEW FILE Makefile ---
# Top level Makefile for module xrdp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 14 17:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:53:09 +0000
Subject: [pkgdb] xrdp (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090814175311.36E3F10F87B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for xrdp
tibbs has set commit to Approved for 107427 on xrdp (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on xrdp (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on xrdp (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xrdp



From tibbs at fedoraproject.org  Fri Aug 14 17:53:22 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:53:22 +0000 (UTC)
Subject: rpms/xrdp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090814175322.9677211C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsBF4376/rpms/xrdp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xrdp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xrdp
# $Id: Makefile,v 1.1 2009/08/14 17:53:22 tibbs Exp $
NAME := xrdp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 14 17:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:54:55 +0000
Subject: [pkgdb] papyon summary updated by tibbs
Message-ID: <20090814175457.1962210F859@bastion2.fedora.phx.redhat.com>

tibbs set package papyon summary to Python libraries for MSN Messenger network

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/papyon



From tibbs at fedoraproject.org  Fri Aug 14 17:55:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:55:01 +0000 (UTC)
Subject: rpms/papyon - New directory
Message-ID: <20090814175501.1CABF11C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/papyon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOK4979/rpms/papyon

Log Message:
Directory /cvs/pkgs/rpms/papyon added to the repository




From tibbs at fedoraproject.org  Fri Aug 14 17:55:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:55:01 +0000 (UTC)
Subject: rpms/papyon/devel - New directory
Message-ID: <20090814175501.438CB11C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOK4979/rpms/papyon/devel

Log Message:
Directory /cvs/pkgs/rpms/papyon/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 14 17:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 14 Aug 2009 17:54:54 +0000
Subject: [pkgdb] papyon was added for bpepple
Message-ID: <20090814175456.92F4E10F895@bastion2.fedora.phx.redhat.com>

tibbs has added Package papyon with summary Python libraries for MSN Messenger network
tibbs has approved Package papyon
tibbs has added a Fedora devel branch for papyon with an owner of bpepple
tibbs has approved papyon in Fedora devel
tibbs has approved Package papyon
tibbs has set commit to Approved for 107427 on papyon (Fedora devel)
tibbs has set checkout to Approved for 107427 on papyon (Fedora devel)
tibbs has set build to Approved for 107427 on papyon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/papyon



From tibbs at fedoraproject.org  Fri Aug 14 17:55:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:55:07 +0000 (UTC)
Subject: rpms/papyon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090814175507.64E3511C02C2@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOK4979/rpms/papyon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module papyon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: papyon
# $Id: Makefile,v 1.1 2009/08/14 17:55:07 tibbs Exp $
NAME := papyon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 14 17:55:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 14 Aug 2009 17:55:07 +0000 (UTC)
Subject: rpms/papyon Makefile,NONE,1.1
Message-ID: <20090814175507.206ED11C00D0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/papyon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOK4979/rpms/papyon

Added Files:
	Makefile 
Log Message:
Setup of module papyon


--- NEW FILE Makefile ---
# Top level Makefile for module papyon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From diegobz at fedoraproject.org  Fri Aug 14 17:59:24 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Fri, 14 Aug 2009 17:59:24 +0000 (UTC)
Subject: rpms/django-piston/EL-5 django-piston.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814175924.58B4211C00D0@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-piston/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5675/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-piston.spec import.log 
Log Message:
Initial import



--- NEW FILE django-piston.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-piston
Version:        0.2.2
Release:        1%{?dist}
Summary:        A mini-framework for Django for creating RESTful APIs

Group:          Development/Languages
License:        BSD
URL:            http://bitbucket.org/jespern/django-piston/
Source:         http://bitbucket.org/jespern/django-piston/downloads/django-piston-0.2.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Piston is a relatively small Django application that lets you
create application programming interfaces (API) for your sites.

%prep
%setup -q -n %{name}

%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,-)
%{python_sitelib}/*

%changelog
* Thu Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.2.2-1
- Initial RPM release


--- NEW FILE import.log ---
django-piston-0_2_2-1_fc11:EL-5:django-piston-0.2.2-1.fc11.src.rpm:1250272738


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-piston/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:21:01 -0000	1.1
+++ .cvsignore	14 Aug 2009 17:59:24 -0000	1.2
@@ -0,0 +1 @@
+django-piston-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-piston/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:21:01 -0000	1.1
+++ sources	14 Aug 2009 17:59:24 -0000	1.2
@@ -0,0 +1 @@
+28a2900695fdbcb14ff3c45390e7a4fd  django-piston-0.2.2.tar.gz



From itamarjp at fedoraproject.org  Fri Aug 14 18:01:35 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 14 Aug 2009 18:01:35 +0000 (UTC)
Subject: rpms/xrdp/devel import.log, NONE, 1.1 xrdp.init, NONE,
	1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE,
	1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814180135.7F3AE11C00D0@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6256/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xrdp.init xrdp.logrotate xrdp.spec xrdp.sysconfig 
Log Message:
initial version



--- NEW FILE import.log ---
xrdp-0_5_0-0_2_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272824


--- NEW FILE xrdp.init ---
#!/bin/sh
#
# xrdp Open source remote desktop protocol (RDP) server
#
# chkconfig:   - 64 36
# description: Open source remote desktop protocol (RDP) server
#

### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network
# Required-Stop: $network
# Should-Start: $network
# Should-Stop: $network
# Default-Start:
# Default-Stop:
# Short-Description: Starts the xrdp daemon
# Description:  Open source remote desktop protocol (RDP) server
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0

[ -e /etc/sysconfig/xrdp ] && . /etc/sysconfig/xrdp

start_xrdp() {
    exec="/usr/sbin/xrdp"
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $XRDP_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_xrdp() {
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

start_sesman() {
    exec="/usr/sbin/xrdp-sesman"
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $SESMAN_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_sesman() {
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}
start() {
    start_xrdp
    start_sesman
}

stop() {
    stop_xrdp
    stop_sesman
}

restart() {
    stop_xrdp
    stop_sesman
    start_xrdp
    start_sesman
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    prog="xrdp"
    status $prog
    prog="xrdp-sesman"
    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 xrdp.logrotate ---
/var/log/xrdp/sesman.log {
    create 644 root root
    daily
    compress
    missingok
    postrotate
    /etc/rc.d/init.d/xrdp restart > /dev/null 2>/dev/null || :
    endscript
}


--- NEW FILE xrdp.spec ---
%{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}

%define cvs 20090811cvs
Summary:   Open source remote desktop protocol (RDP) server
Name:      xrdp
Version:   0.5.0
Release:   0.2.%{cvs}%{?dist}
License:   GPLv2+ with exceptions
Group:     Applications/Internet
URL:       http://xrdp.sourceforge.net/
#Source0:   http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#
# visit http://sourceforge.net/projects/xrdp/develop
#
# cvs -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
# cvs -z3 -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
# mv xrdp xrdp-0.5.0.20090811cvs
# tar -czvf xrdp-0.5.0.20090811cvs.tar.gz xrdp-0.5.0.20090811cvs


Source0: %{name}-%{version}.%{cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: xrdp.init
Source2: xrdp.sysconfig
Source3: xrdp.logrotate

BuildRequires:  pam-devel
BuildRequires:  openssl-devel
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool


#vnc-server provides Xvnc (tigervnc-server in fedora)
Requires: vnc-server

#initscripts requires
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
# This is for /sbin/service
Requires(postun): initscripts


%description
The goal of this project is to provide a fully functional Linux terminal
server, capable of accepting connections from rdesktop and Microsoft's own
terminal server / remote desktop clients.

%prep
%setup -q -n %{name}-%{version}.%{cvs}

# remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini

#fix wrong permission
%{__chmod} 644 keygen/keygen.c

%build
./bootstrap

%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}

#remove .la and .a files
find %{buildroot} -name '*.a' -exec rm {} \;
find %{buildroot} -name '*.la' -exec rm {} \;

#install sesman pam config /etc/pam.d/xrdp-sesman
%{__install} -Dp -m 644 instfiles/pam.d/xrdp-sesman %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman

#installx xrdp initscript /etc/rc.d/init.d/xrdp
%{__install} -Dp -m 755 %{SOURCE1} %{buildroot}%{_initddir}/xrdp

#install xrdp sysconfig /etc/sysconfig/xrdp
%{__install} -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/xrdp

#install logrotate /etc/logrotate.d/xrdp
%{__install} -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/xrdp

#install log file /var/log/xrdp-sesman.log
%{__mkdir} -p %{buildroot}%{_localstatedir}/log/
touch %{buildroot}%{_localstatedir}/log/xrdp-sesman.log

# rsakeys.ini
touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
%{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini


%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi


%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

xrdp-keygen xrdp %{_sysconfdir}/xrdp/rsakeys.ini > /dev/null
%{__chmod} 0600 %{_sysconfdir}/xrdp/rsakeys.ini

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING *.txt
%dir %{_libdir}/xrdp
%dir %{_sysconfdir}/xrdp
%dir %{_datadir}/xrdp
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
%config(noreplace) %{_sysconfdir}/sysconfig/xrdp
%{_initddir}/xrdp
%{_sysconfdir}/xrdp/*.sh
%{_bindir}/xrdp-sesadmin
%{_bindir}/xrdp-keygen
%{_bindir}/xrdp-sesrun
%{_bindir}/xrdp-sestest
%{_sbindir}/xrdp-chansrv
%{_sbindir}/xrdp
%{_sbindir}/xrdp-sesman
%{_sbindir}/xrdp-sessvc
%{_datadir}/xrdp/ad256.bmp
%{_datadir}/xrdp/cursor0.cur
%{_datadir}/xrdp/cursor1.cur
%{_datadir}/xrdp/xrdp256.bmp
%{_datadir}/xrdp/sans-10.fv1
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_libdir}/xrdp/lib*.so.*
%{_libdir}/xrdp/libcommon.so
%{_libdir}/xrdp/libmc.so
%{_libdir}/xrdp/librdp.so
%{_libdir}/xrdp/libscp.so
%{_libdir}/xrdp/libvnc.so
%{_libdir}/xrdp/libxrdp.so
%{_libdir}/xrdp/libxup.so
%ghost %{_localstatedir}/log/xrdp-sesman.log
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini

%changelog
* Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
- more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10

* Wed Aug 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.1.20090811cvs
- change versioning schema
- improve initscript
- fix some macros


* Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
- changes from BZ#516364 comment 2 from Mamoru Tasaka
- changed license to "GPLv2+ with exceptions"
- dropped -libs subpackage
- use cvs version
- remove a patch and use sed instead
- remove attr's

* Thu Apr 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 0.5.0-1
- Initial RPM release


--- NEW FILE xrdp.sysconfig ---
# put some options here

#XRDP_OPTIONS=""
#SESMAN_OPTIONS=""



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 17:53:22 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:01:35 -0000	1.2
@@ -0,0 +1 @@
+xrdp-0.5.0.20090811cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 17:53:22 -0000	1.1
+++ sources	14 Aug 2009 18:01:35 -0000	1.2
@@ -0,0 +1 @@
+541982ebe6acc8f4b0d342d9fd336768  xrdp-0.5.0.20090811cvs.tar.gz



From itamarjp at fedoraproject.org  Fri Aug 14 18:04:05 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 14 Aug 2009 18:04:05 +0000 (UTC)
Subject: rpms/xrdp/F-11 import.log, NONE, 1.1 xrdp.init, NONE,
	1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE,
	1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814180405.3A53C11C00D0@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7498/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xrdp.init xrdp.logrotate xrdp.spec xrdp.sysconfig 
Log Message:
initial import



--- NEW FILE import.log ---
xrdp-0_5_0-0_2_20090811cvs_fc12:F-11:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272977


--- NEW FILE xrdp.init ---
#!/bin/sh
#
# xrdp Open source remote desktop protocol (RDP) server
#
# chkconfig:   - 64 36
# description: Open source remote desktop protocol (RDP) server
#

### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network
# Required-Stop: $network
# Should-Start: $network
# Should-Stop: $network
# Default-Start:
# Default-Stop:
# Short-Description: Starts the xrdp daemon
# Description:  Open source remote desktop protocol (RDP) server
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0

[ -e /etc/sysconfig/xrdp ] && . /etc/sysconfig/xrdp

start_xrdp() {
    exec="/usr/sbin/xrdp"
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $XRDP_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_xrdp() {
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

start_sesman() {
    exec="/usr/sbin/xrdp-sesman"
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $SESMAN_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_sesman() {
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}
start() {
    start_xrdp
    start_sesman
}

stop() {
    stop_xrdp
    stop_sesman
}

restart() {
    stop_xrdp
    stop_sesman
    start_xrdp
    start_sesman
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    prog="xrdp"
    status $prog
    prog="xrdp-sesman"
    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 xrdp.logrotate ---
/var/log/xrdp/sesman.log {
    create 644 root root
    daily
    compress
    missingok
    postrotate
    /etc/rc.d/init.d/xrdp restart > /dev/null 2>/dev/null || :
    endscript
}


--- NEW FILE xrdp.spec ---
%{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}

%define cvs 20090811cvs
Summary:   Open source remote desktop protocol (RDP) server
Name:      xrdp
Version:   0.5.0
Release:   0.2.%{cvs}%{?dist}
License:   GPLv2+ with exceptions
Group:     Applications/Internet
URL:       http://xrdp.sourceforge.net/
#Source0:   http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#
# visit http://sourceforge.net/projects/xrdp/develop
#
# cvs -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
# cvs -z3 -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
# mv xrdp xrdp-0.5.0.20090811cvs
# tar -czvf xrdp-0.5.0.20090811cvs.tar.gz xrdp-0.5.0.20090811cvs


Source0: %{name}-%{version}.%{cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: xrdp.init
Source2: xrdp.sysconfig
Source3: xrdp.logrotate

BuildRequires:  pam-devel
BuildRequires:  openssl-devel
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool


#vnc-server provides Xvnc (tigervnc-server in fedora)
Requires: vnc-server

#initscripts requires
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
# This is for /sbin/service
Requires(postun): initscripts


%description
The goal of this project is to provide a fully functional Linux terminal
server, capable of accepting connections from rdesktop and Microsoft's own
terminal server / remote desktop clients.

%prep
%setup -q -n %{name}-%{version}.%{cvs}

# remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini

#fix wrong permission
%{__chmod} 644 keygen/keygen.c

%build
./bootstrap

%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}

#remove .la and .a files
find %{buildroot} -name '*.a' -exec rm {} \;
find %{buildroot} -name '*.la' -exec rm {} \;

#install sesman pam config /etc/pam.d/xrdp-sesman
%{__install} -Dp -m 644 instfiles/pam.d/xrdp-sesman %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman

#installx xrdp initscript /etc/rc.d/init.d/xrdp
%{__install} -Dp -m 755 %{SOURCE1} %{buildroot}%{_initddir}/xrdp

#install xrdp sysconfig /etc/sysconfig/xrdp
%{__install} -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/xrdp

#install logrotate /etc/logrotate.d/xrdp
%{__install} -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/xrdp

#install log file /var/log/xrdp-sesman.log
%{__mkdir} -p %{buildroot}%{_localstatedir}/log/
touch %{buildroot}%{_localstatedir}/log/xrdp-sesman.log

# rsakeys.ini
touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
%{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini


%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi


%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

xrdp-keygen xrdp %{_sysconfdir}/xrdp/rsakeys.ini > /dev/null
%{__chmod} 0600 %{_sysconfdir}/xrdp/rsakeys.ini

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING *.txt
%dir %{_libdir}/xrdp
%dir %{_sysconfdir}/xrdp
%dir %{_datadir}/xrdp
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
%config(noreplace) %{_sysconfdir}/sysconfig/xrdp
%{_initddir}/xrdp
%{_sysconfdir}/xrdp/*.sh
%{_bindir}/xrdp-sesadmin
%{_bindir}/xrdp-keygen
%{_bindir}/xrdp-sesrun
%{_bindir}/xrdp-sestest
%{_sbindir}/xrdp-chansrv
%{_sbindir}/xrdp
%{_sbindir}/xrdp-sesman
%{_sbindir}/xrdp-sessvc
%{_datadir}/xrdp/ad256.bmp
%{_datadir}/xrdp/cursor0.cur
%{_datadir}/xrdp/cursor1.cur
%{_datadir}/xrdp/xrdp256.bmp
%{_datadir}/xrdp/sans-10.fv1
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_libdir}/xrdp/lib*.so.*
%{_libdir}/xrdp/libcommon.so
%{_libdir}/xrdp/libmc.so
%{_libdir}/xrdp/librdp.so
%{_libdir}/xrdp/libscp.so
%{_libdir}/xrdp/libvnc.so
%{_libdir}/xrdp/libxrdp.so
%{_libdir}/xrdp/libxup.so
%ghost %{_localstatedir}/log/xrdp-sesman.log
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini

%changelog
* Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
- more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10

* Wed Aug 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.1.20090811cvs
- change versioning schema
- improve initscript
- fix some macros


* Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
- changes from BZ#516364 comment 2 from Mamoru Tasaka
- changed license to "GPLv2+ with exceptions"
- dropped -libs subpackage
- use cvs version
- remove a patch and use sed instead
- remove attr's

* Thu Apr 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 0.5.0-1
- Initial RPM release


--- NEW FILE xrdp.sysconfig ---
# put some options here

#XRDP_OPTIONS=""
#SESMAN_OPTIONS=""



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 17:53:22 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:04:04 -0000	1.2
@@ -0,0 +1 @@
+xrdp-0.5.0.20090811cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 17:53:22 -0000	1.1
+++ sources	14 Aug 2009 18:04:04 -0000	1.2
@@ -0,0 +1 @@
+541982ebe6acc8f4b0d342d9fd336768  xrdp-0.5.0.20090811cvs.tar.gz



From itamarjp at fedoraproject.org  Fri Aug 14 18:06:35 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 14 Aug 2009 18:06:35 +0000 (UTC)
Subject: rpms/xrdp/F-10 import.log, NONE, 1.1 xrdp.init, NONE,
	1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE,
	1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814180635.6D9C711C00D0@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8145/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xrdp.init xrdp.logrotate xrdp.spec xrdp.sysconfig 
Log Message:
initial import



--- NEW FILE import.log ---
xrdp-0_5_0-0_2_20090811cvs_fc12:F-10:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273132


--- NEW FILE xrdp.init ---
#!/bin/sh
#
# xrdp Open source remote desktop protocol (RDP) server
#
# chkconfig:   - 64 36
# description: Open source remote desktop protocol (RDP) server
#

### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network
# Required-Stop: $network
# Should-Start: $network
# Should-Stop: $network
# Default-Start:
# Default-Stop:
# Short-Description: Starts the xrdp daemon
# Description:  Open source remote desktop protocol (RDP) server
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0

[ -e /etc/sysconfig/xrdp ] && . /etc/sysconfig/xrdp

start_xrdp() {
    exec="/usr/sbin/xrdp"
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $XRDP_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_xrdp() {
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

start_sesman() {
    exec="/usr/sbin/xrdp-sesman"
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $SESMAN_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_sesman() {
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}
start() {
    start_xrdp
    start_sesman
}

stop() {
    stop_xrdp
    stop_sesman
}

restart() {
    stop_xrdp
    stop_sesman
    start_xrdp
    start_sesman
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    prog="xrdp"
    status $prog
    prog="xrdp-sesman"
    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 xrdp.logrotate ---
/var/log/xrdp/sesman.log {
    create 644 root root
    daily
    compress
    missingok
    postrotate
    /etc/rc.d/init.d/xrdp restart > /dev/null 2>/dev/null || :
    endscript
}


--- NEW FILE xrdp.spec ---
%{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}

%define cvs 20090811cvs
Summary:   Open source remote desktop protocol (RDP) server
Name:      xrdp
Version:   0.5.0
Release:   0.2.%{cvs}%{?dist}
License:   GPLv2+ with exceptions
Group:     Applications/Internet
URL:       http://xrdp.sourceforge.net/
#Source0:   http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#
# visit http://sourceforge.net/projects/xrdp/develop
#
# cvs -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
# cvs -z3 -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
# mv xrdp xrdp-0.5.0.20090811cvs
# tar -czvf xrdp-0.5.0.20090811cvs.tar.gz xrdp-0.5.0.20090811cvs


Source0: %{name}-%{version}.%{cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: xrdp.init
Source2: xrdp.sysconfig
Source3: xrdp.logrotate

BuildRequires:  pam-devel
BuildRequires:  openssl-devel
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool


#vnc-server provides Xvnc (tigervnc-server in fedora)
Requires: vnc-server

#initscripts requires
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
# This is for /sbin/service
Requires(postun): initscripts


%description
The goal of this project is to provide a fully functional Linux terminal
server, capable of accepting connections from rdesktop and Microsoft's own
terminal server / remote desktop clients.

%prep
%setup -q -n %{name}-%{version}.%{cvs}

# remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini

#fix wrong permission
%{__chmod} 644 keygen/keygen.c

%build
./bootstrap

%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}

#remove .la and .a files
find %{buildroot} -name '*.a' -exec rm {} \;
find %{buildroot} -name '*.la' -exec rm {} \;

#install sesman pam config /etc/pam.d/xrdp-sesman
%{__install} -Dp -m 644 instfiles/pam.d/xrdp-sesman %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman

#installx xrdp initscript /etc/rc.d/init.d/xrdp
%{__install} -Dp -m 755 %{SOURCE1} %{buildroot}%{_initddir}/xrdp

#install xrdp sysconfig /etc/sysconfig/xrdp
%{__install} -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/xrdp

#install logrotate /etc/logrotate.d/xrdp
%{__install} -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/xrdp

#install log file /var/log/xrdp-sesman.log
%{__mkdir} -p %{buildroot}%{_localstatedir}/log/
touch %{buildroot}%{_localstatedir}/log/xrdp-sesman.log

# rsakeys.ini
touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
%{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini


%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi


%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

xrdp-keygen xrdp %{_sysconfdir}/xrdp/rsakeys.ini > /dev/null
%{__chmod} 0600 %{_sysconfdir}/xrdp/rsakeys.ini

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING *.txt
%dir %{_libdir}/xrdp
%dir %{_sysconfdir}/xrdp
%dir %{_datadir}/xrdp
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
%config(noreplace) %{_sysconfdir}/sysconfig/xrdp
%{_initddir}/xrdp
%{_sysconfdir}/xrdp/*.sh
%{_bindir}/xrdp-sesadmin
%{_bindir}/xrdp-keygen
%{_bindir}/xrdp-sesrun
%{_bindir}/xrdp-sestest
%{_sbindir}/xrdp-chansrv
%{_sbindir}/xrdp
%{_sbindir}/xrdp-sesman
%{_sbindir}/xrdp-sessvc
%{_datadir}/xrdp/ad256.bmp
%{_datadir}/xrdp/cursor0.cur
%{_datadir}/xrdp/cursor1.cur
%{_datadir}/xrdp/xrdp256.bmp
%{_datadir}/xrdp/sans-10.fv1
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_libdir}/xrdp/lib*.so.*
%{_libdir}/xrdp/libcommon.so
%{_libdir}/xrdp/libmc.so
%{_libdir}/xrdp/librdp.so
%{_libdir}/xrdp/libscp.so
%{_libdir}/xrdp/libvnc.so
%{_libdir}/xrdp/libxrdp.so
%{_libdir}/xrdp/libxup.so
%ghost %{_localstatedir}/log/xrdp-sesman.log
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini

%changelog
* Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
- more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10

* Wed Aug 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.1.20090811cvs
- change versioning schema
- improve initscript
- fix some macros


* Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
- changes from BZ#516364 comment 2 from Mamoru Tasaka
- changed license to "GPLv2+ with exceptions"
- dropped -libs subpackage
- use cvs version
- remove a patch and use sed instead
- remove attr's

* Thu Apr 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 0.5.0-1
- Initial RPM release


--- NEW FILE xrdp.sysconfig ---
# put some options here

#XRDP_OPTIONS=""
#SESMAN_OPTIONS=""



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 17:53:22 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:06:35 -0000	1.2
@@ -0,0 +1 @@
+xrdp-0.5.0.20090811cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 17:53:22 -0000	1.1
+++ sources	14 Aug 2009 18:06:35 -0000	1.2
@@ -0,0 +1 @@
+541982ebe6acc8f4b0d342d9fd336768  xrdp-0.5.0.20090811cvs.tar.gz



From ankursinha at fedoraproject.org  Fri Aug 14 18:07:39 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 14 Aug 2009 18:07:39 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.266, 1.267 comps-f11.xml.in, 1.285,
	1.286 comps-f12.xml.in, 1.81, 1.82
Message-ID: <20090814180739.EF92411C00D0@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7825

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
Log Message:
* Fri Aug 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> 
- added fpaste to comps



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- comps-f10.xml.in	13 Aug 2009 12:09:01 -0000	1.266
+++ comps-f10.xml.in	14 Aug 2009 18:07:39 -0000	1.267
@@ -4665,6 +4665,7 @@
       <packagereq type="optional">ekg2</packagereq>
       <packagereq type="optional">emacs-mew</packagereq>
       <packagereq type="optional">epic</packagereq>
+      <packagereq type="optional">fpaste</packagereq>
       <packagereq type="optional">iperf</packagereq>
       <packagereq type="optional">irssi</packagereq>
       <packagereq type="optional">libtranslate</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- comps-f11.xml.in	13 Aug 2009 12:09:01 -0000	1.285
+++ comps-f11.xml.in	14 Aug 2009 18:07:39 -0000	1.286
@@ -5370,6 +5370,7 @@
       <packagereq type="optional">ekg2</packagereq>
       <packagereq type="optional">emacs-mew</packagereq>
       <packagereq type="optional">epic</packagereq>
+      <packagereq type="optional">fpaste</packagereq>
       <packagereq type="optional">getmail</packagereq>
       <packagereq type="optional">iperf</packagereq>
       <packagereq type="optional">irssi</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- comps-f12.xml.in	13 Aug 2009 12:09:02 -0000	1.81
+++ comps-f12.xml.in	14 Aug 2009 18:07:39 -0000	1.82
@@ -5503,6 +5503,7 @@
       <packagereq type="optional">ekg2</packagereq>
       <packagereq type="optional">emacs-mew</packagereq>
       <packagereq type="optional">epic</packagereq>
+      <packagereq type="optional">fpaste</packagereq>
       <packagereq type="optional">getmail</packagereq>
       <packagereq type="optional">iperf</packagereq>
       <packagereq type="optional">irssi</packagereq>



From itamarjp at fedoraproject.org  Fri Aug 14 18:09:12 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 14 Aug 2009 18:09:12 +0000 (UTC)
Subject: rpms/xrdp/EL-5 import.log, NONE, 1.1 xrdp.init, NONE,
	1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE,
	1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814180912.3ECE311C0348@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8813/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xrdp.init xrdp.logrotate xrdp.spec xrdp.sysconfig 
Log Message:
initial import



--- NEW FILE import.log ---
xrdp-0_5_0-0_2_20090811cvs_fc12:EL-5:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273281


--- NEW FILE xrdp.init ---
#!/bin/sh
#
# xrdp Open source remote desktop protocol (RDP) server
#
# chkconfig:   - 64 36
# description: Open source remote desktop protocol (RDP) server
#

### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network
# Required-Stop: $network
# Should-Start: $network
# Should-Stop: $network
# Default-Start:
# Default-Stop:
# Short-Description: Starts the xrdp daemon
# Description:  Open source remote desktop protocol (RDP) server
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0

[ -e /etc/sysconfig/xrdp ] && . /etc/sysconfig/xrdp

start_xrdp() {
    exec="/usr/sbin/xrdp"
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $XRDP_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_xrdp() {
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

start_sesman() {
    exec="/usr/sbin/xrdp-sesman"
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $SESMAN_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_sesman() {
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}
start() {
    start_xrdp
    start_sesman
}

stop() {
    stop_xrdp
    stop_sesman
}

restart() {
    stop_xrdp
    stop_sesman
    start_xrdp
    start_sesman
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    prog="xrdp"
    status $prog
    prog="xrdp-sesman"
    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 xrdp.logrotate ---
/var/log/xrdp/sesman.log {
    create 644 root root
    daily
    compress
    missingok
    postrotate
    /etc/rc.d/init.d/xrdp restart > /dev/null 2>/dev/null || :
    endscript
}


--- NEW FILE xrdp.spec ---
%{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}

%define cvs 20090811cvs
Summary:   Open source remote desktop protocol (RDP) server
Name:      xrdp
Version:   0.5.0
Release:   0.2.%{cvs}%{?dist}
License:   GPLv2+ with exceptions
Group:     Applications/Internet
URL:       http://xrdp.sourceforge.net/
#Source0:   http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#
# visit http://sourceforge.net/projects/xrdp/develop
#
# cvs -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
# cvs -z3 -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
# mv xrdp xrdp-0.5.0.20090811cvs
# tar -czvf xrdp-0.5.0.20090811cvs.tar.gz xrdp-0.5.0.20090811cvs


Source0: %{name}-%{version}.%{cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: xrdp.init
Source2: xrdp.sysconfig
Source3: xrdp.logrotate

BuildRequires:  pam-devel
BuildRequires:  openssl-devel
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool


#vnc-server provides Xvnc (tigervnc-server in fedora)
Requires: vnc-server

#initscripts requires
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
# This is for /sbin/service
Requires(postun): initscripts


%description
The goal of this project is to provide a fully functional Linux terminal
server, capable of accepting connections from rdesktop and Microsoft's own
terminal server / remote desktop clients.

%prep
%setup -q -n %{name}-%{version}.%{cvs}

# remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini

#fix wrong permission
%{__chmod} 644 keygen/keygen.c

%build
./bootstrap

%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}

#remove .la and .a files
find %{buildroot} -name '*.a' -exec rm {} \;
find %{buildroot} -name '*.la' -exec rm {} \;

#install sesman pam config /etc/pam.d/xrdp-sesman
%{__install} -Dp -m 644 instfiles/pam.d/xrdp-sesman %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman

#installx xrdp initscript /etc/rc.d/init.d/xrdp
%{__install} -Dp -m 755 %{SOURCE1} %{buildroot}%{_initddir}/xrdp

#install xrdp sysconfig /etc/sysconfig/xrdp
%{__install} -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/xrdp

#install logrotate /etc/logrotate.d/xrdp
%{__install} -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/xrdp

#install log file /var/log/xrdp-sesman.log
%{__mkdir} -p %{buildroot}%{_localstatedir}/log/
touch %{buildroot}%{_localstatedir}/log/xrdp-sesman.log

# rsakeys.ini
touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
%{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini


%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi


%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

xrdp-keygen xrdp %{_sysconfdir}/xrdp/rsakeys.ini > /dev/null
%{__chmod} 0600 %{_sysconfdir}/xrdp/rsakeys.ini

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING *.txt
%dir %{_libdir}/xrdp
%dir %{_sysconfdir}/xrdp
%dir %{_datadir}/xrdp
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
%config(noreplace) %{_sysconfdir}/sysconfig/xrdp
%{_initddir}/xrdp
%{_sysconfdir}/xrdp/*.sh
%{_bindir}/xrdp-sesadmin
%{_bindir}/xrdp-keygen
%{_bindir}/xrdp-sesrun
%{_bindir}/xrdp-sestest
%{_sbindir}/xrdp-chansrv
%{_sbindir}/xrdp
%{_sbindir}/xrdp-sesman
%{_sbindir}/xrdp-sessvc
%{_datadir}/xrdp/ad256.bmp
%{_datadir}/xrdp/cursor0.cur
%{_datadir}/xrdp/cursor1.cur
%{_datadir}/xrdp/xrdp256.bmp
%{_datadir}/xrdp/sans-10.fv1
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_libdir}/xrdp/lib*.so.*
%{_libdir}/xrdp/libcommon.so
%{_libdir}/xrdp/libmc.so
%{_libdir}/xrdp/librdp.so
%{_libdir}/xrdp/libscp.so
%{_libdir}/xrdp/libvnc.so
%{_libdir}/xrdp/libxrdp.so
%{_libdir}/xrdp/libxup.so
%ghost %{_localstatedir}/log/xrdp-sesman.log
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini

%changelog
* Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
- more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10

* Wed Aug 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.1.20090811cvs
- change versioning schema
- improve initscript
- fix some macros


* Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
- changes from BZ#516364 comment 2 from Mamoru Tasaka
- changed license to "GPLv2+ with exceptions"
- dropped -libs subpackage
- use cvs version
- remove a patch and use sed instead
- remove attr's

* Thu Apr 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 0.5.0-1
- Initial RPM release


--- NEW FILE xrdp.sysconfig ---
# put some options here

#XRDP_OPTIONS=""
#SESMAN_OPTIONS=""



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 17:53:22 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:09:12 -0000	1.2
@@ -0,0 +1 @@
+xrdp-0.5.0.20090811cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 17:53:22 -0000	1.1
+++ sources	14 Aug 2009 18:09:12 -0000	1.2
@@ -0,0 +1 @@
+541982ebe6acc8f4b0d342d9fd336768  xrdp-0.5.0.20090811cvs.tar.gz



From itamarjp at fedoraproject.org  Fri Aug 14 18:11:22 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Fri, 14 Aug 2009 18:11:22 +0000 (UTC)
Subject: rpms/xrdp/EL-4 import.log, NONE, 1.1 xrdp.init, NONE,
	1.1 xrdp.logrotate, NONE, 1.1 xrdp.spec, NONE,
	1.1 xrdp.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814181122.9D42011C00D0@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9359/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xrdp.init xrdp.logrotate xrdp.spec xrdp.sysconfig 
Log Message:
initial import



--- NEW FILE import.log ---
xrdp-0_5_0-0_2_20090811cvs_fc12:EL-4:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273423


--- NEW FILE xrdp.init ---
#!/bin/sh
#
# xrdp Open source remote desktop protocol (RDP) server
#
# chkconfig:   - 64 36
# description: Open source remote desktop protocol (RDP) server
#

### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network
# Required-Stop: $network
# Should-Start: $network
# Should-Stop: $network
# Default-Start:
# Default-Stop:
# Short-Description: Starts the xrdp daemon
# Description:  Open source remote desktop protocol (RDP) server
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0

[ -e /etc/sysconfig/xrdp ] && . /etc/sysconfig/xrdp

start_xrdp() {
    exec="/usr/sbin/xrdp"
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $XRDP_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_xrdp() {
    prog="xrdp"
    lockfile=/var/lock/subsys/xrdp
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

start_sesman() {
    exec="/usr/sbin/xrdp-sesman"
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    [ -x $exec ] || exit 5
    echo -n $"Starting $prog: "
    daemon "$exec $SESMAN_OPTIONS >> /dev/null"
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop_sesman() {
    prog="xrdp-sesman"
    lockfile=/var/lock/subsys/xrdp-sesman
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}
start() {
    start_xrdp
    start_sesman
}

stop() {
    stop_xrdp
    stop_sesman
}

restart() {
    stop_xrdp
    stop_sesman
    start_xrdp
    start_sesman
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    prog="xrdp"
    status $prog
    prog="xrdp-sesman"
    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 xrdp.logrotate ---
/var/log/xrdp/sesman.log {
    create 644 root root
    daily
    compress
    missingok
    postrotate
    /etc/rc.d/init.d/xrdp restart > /dev/null 2>/dev/null || :
    endscript
}


--- NEW FILE xrdp.spec ---
%{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}

%define cvs 20090811cvs
Summary:   Open source remote desktop protocol (RDP) server
Name:      xrdp
Version:   0.5.0
Release:   0.2.%{cvs}%{?dist}
License:   GPLv2+ with exceptions
Group:     Applications/Internet
URL:       http://xrdp.sourceforge.net/
#Source0:   http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz

# The source for this package was pulled from upstream's vcs.  Use the
# following commands to generate the tarball:
#
# visit http://sourceforge.net/projects/xrdp/develop
#
# cvs -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
# cvs -z3 -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
# mv xrdp xrdp-0.5.0.20090811cvs
# tar -czvf xrdp-0.5.0.20090811cvs.tar.gz xrdp-0.5.0.20090811cvs


Source0: %{name}-%{version}.%{cvs}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source1: xrdp.init
Source2: xrdp.sysconfig
Source3: xrdp.logrotate

BuildRequires:  pam-devel
BuildRequires:  openssl-devel
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  libtool


#vnc-server provides Xvnc (tigervnc-server in fedora)
Requires: vnc-server

#initscripts requires
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
# This is for /sbin/service
Requires(postun): initscripts


%description
The goal of this project is to provide a fully functional Linux terminal
server, capable of accepting connections from rdesktop and Microsoft's own
terminal server / remote desktop clients.

%prep
%setup -q -n %{name}-%{version}.%{cvs}

# remove unused modules from xrdp login combobox
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini

#fix wrong permission
%{__chmod} 644 keygen/keygen.c

%build
./bootstrap

%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}

#remove .la and .a files
find %{buildroot} -name '*.a' -exec rm {} \;
find %{buildroot} -name '*.la' -exec rm {} \;

#install sesman pam config /etc/pam.d/xrdp-sesman
%{__install} -Dp -m 644 instfiles/pam.d/xrdp-sesman %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman

#installx xrdp initscript /etc/rc.d/init.d/xrdp
%{__install} -Dp -m 755 %{SOURCE1} %{buildroot}%{_initddir}/xrdp

#install xrdp sysconfig /etc/sysconfig/xrdp
%{__install} -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/xrdp

#install logrotate /etc/logrotate.d/xrdp
%{__install} -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/xrdp

#install log file /var/log/xrdp-sesman.log
%{__mkdir} -p %{buildroot}%{_localstatedir}/log/
touch %{buildroot}%{_localstatedir}/log/xrdp-sesman.log

# rsakeys.ini
touch %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini
%{__chmod} 0600 %{buildroot}%{_sysconfdir}/xrdp/rsakeys.ini


%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi


%post
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add %{name}

xrdp-keygen xrdp %{_sysconfdir}/xrdp/rsakeys.ini > /dev/null
%{__chmod} 0600 %{_sysconfdir}/xrdp/rsakeys.ini

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING *.txt
%dir %{_libdir}/xrdp
%dir %{_sysconfdir}/xrdp
%dir %{_datadir}/xrdp
%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
%config(noreplace) %{_sysconfdir}/sysconfig/xrdp
%{_initddir}/xrdp
%{_sysconfdir}/xrdp/*.sh
%{_bindir}/xrdp-sesadmin
%{_bindir}/xrdp-keygen
%{_bindir}/xrdp-sesrun
%{_bindir}/xrdp-sestest
%{_sbindir}/xrdp-chansrv
%{_sbindir}/xrdp
%{_sbindir}/xrdp-sesman
%{_sbindir}/xrdp-sessvc
%{_datadir}/xrdp/ad256.bmp
%{_datadir}/xrdp/cursor0.cur
%{_datadir}/xrdp/cursor1.cur
%{_datadir}/xrdp/xrdp256.bmp
%{_datadir}/xrdp/sans-10.fv1
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_libdir}/xrdp/lib*.so.*
%{_libdir}/xrdp/libcommon.so
%{_libdir}/xrdp/libmc.so
%{_libdir}/xrdp/librdp.so
%{_libdir}/xrdp/libscp.so
%{_libdir}/xrdp/libvnc.so
%{_libdir}/xrdp/libxrdp.so
%{_libdir}/xrdp/libxup.so
%ghost %{_localstatedir}/log/xrdp-sesman.log
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini

%changelog
* Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
- more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10

* Wed Aug 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.1.20090811cvs
- change versioning schema
- improve initscript
- fix some macros


* Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
- changes from BZ#516364 comment 2 from Mamoru Tasaka
- changed license to "GPLv2+ with exceptions"
- dropped -libs subpackage
- use cvs version
- remove a patch and use sed instead
- remove attr's

* Thu Apr 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 0.5.0-1
- Initial RPM release


--- NEW FILE xrdp.sysconfig ---
# put some options here

#XRDP_OPTIONS=""
#SESMAN_OPTIONS=""



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 17:53:22 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:11:22 -0000	1.2
@@ -0,0 +1 @@
+xrdp-0.5.0.20090811cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 17:53:22 -0000	1.1
+++ sources	14 Aug 2009 18:11:22 -0000	1.2
@@ -0,0 +1 @@
+541982ebe6acc8f4b0d342d9fd336768  xrdp-0.5.0.20090811cvs.tar.gz



From myoung at fedoraproject.org  Fri Aug 14 18:31:37 2009
From: myoung at fedoraproject.org (myoung)
Date: Fri, 14 Aug 2009 18:31:37 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6.bz2.sign, NONE,
	1.1.2.2 .cvsignore, 
	1.1014.2.22, 1.1014.2.23 kernel.spec, 1.1294.2.51,
	1.1294.2.52 sources, 1.976.2.23, 1.976.2.24 upstream, 1.888.2.22,
	1.888.2.23 xen.pvops.patch, 1.1.2.32,
	1.1.2.33 drm-hush-vblank-warning.patch, 1.1.2.2,
	NONE drm-radeon-fixes.patch, 1.1.2.2,
	NONE linux-2.6-ppc-perfctr-oops-fix.patch, 1.2.2.3,
	NONE patch-2.6.31-rc5-git3.bz2.sign, 1.1.2.2,
	NONE patch-2.6.31-rc5.bz2.sign, 1.1.6.2,
	NONE revert-ftrace-powerpc-snafu.patch, 1.1.2.2, NONE
Message-ID: <20090814183137.3182311C00D0@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12829

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore kernel.spec sources upstream xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc6.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	drm-hush-vblank-warning.patch drm-radeon-fixes.patch 
	linux-2.6-ppc-perfctr-oops-fix.patch 
	patch-2.6.31-rc5-git3.bz2.sign patch-2.6.31-rc5.bz2.sign 
	revert-ftrace-powerpc-snafu.patch 
Log Message:
Another pvops update, and add "perf" to the list of source files so it builds



--- NEW FILE patch-2.6.31-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKhJwayGugalF9Dw4RApxAAJwPZmk4WG9CYJYy3TctvpzcXYj2NwCdFzAJ
A1H1MYHBR0WF6zAO81Pd830=
=W6Px
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.22
retrieving revision 1.1014.2.23
diff -u -p -r1.1014.2.22 -r1.1014.2.23
--- .cvsignore	5 Aug 2009 23:00:08 -0000	1.1014.2.22
+++ .cvsignore	14 Aug 2009 18:31:25 -0000	1.1014.2.23
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git3.bz2
+patch-2.6.31-rc6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.51
retrieving revision 1.1294.2.52
diff -u -p -r1.1294.2.51 -r1.1294.2.52
--- kernel.spec	13 Aug 2009 21:26:09 -0000	1.1294.2.51
+++ kernel.spec	14 Aug 2009 18:31:25 -0000	1.1294.2.52
@@ -60,9 +60,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 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -544,6 +544,8 @@ Source90: config-sparc64-generic
 
 Source100: config-arm
 
+Source999: perf
+
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel
@@ -591,8 +593,6 @@ Patch05: linux-2.6-makefile-after_link.p
 
 %if !%{nopatches}
 
-# revert powerpc breakage
-Patch08: revert-ftrace-powerpc-snafu.patch
 # revert upstream patches we get via other methods
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
@@ -617,7 +617,6 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch148: linux-2.6-ppc-perfctr-oops-fix.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -678,7 +677,6 @@ Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 
 # nouveau + drm fixes
-Patch1810: drm-radeon-fixes.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -688,7 +686,6 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
-Patch1827: drm-hush-vblank-warning.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1127,7 +1124,6 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-ApplyPatch revert-ftrace-powerpc-snafu.patch
 #ApplyPatch git-cpufreq.patch
 #ApplyPatch git-bluetooth.patch
 
@@ -1171,8 +1167,6 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
-# Fix oops in 7450 perfctr
-ApplyPatch linux-2.6-ppc-perfctr-oops-fix.patch
 
 #
 # SPARC64
@@ -1301,7 +1295,7 @@ ApplyPatch hid-ignore-all-recent-imon-de
 ApplyPatch linux-2.6-ksm.patch
 ApplyPatch linux-2.6-ksm-updates.patch
 # Optimize KVM for KSM support
-ApplyPatch linux-2.6-ksm-kvm.patch
+#ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1309,9 +1303,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-radeon-fixes.patch
 ApplyPatch drm-r600-kms.patch
-ApplyPatch drm-hush-vblank-warning.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1319,7 +1311,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-ApplyPatch drm-intel-next.patch
+#ApplyPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -1986,6 +1978,13 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 14 2009 Michael Young <m.a.young at durham.ac.uk>
+- another rebase/master update
+- make perf a Source file so the kernel builds
+
+* Fri Aug 14 2009 Dave Jones <davej at redhat.com> 2.6.31-0.155.rc6
+- 2.6.31-rc6
+
 * Thu Aug 13 2009 Michael Young <m.a.young at durham.ac.uk>
 - add another rebase/master update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.23
retrieving revision 1.976.2.24
diff -u -p -r1.976.2.23 -r1.976.2.24
--- sources	5 Aug 2009 23:00:18 -0000	1.976.2.23
+++ sources	14 Aug 2009 18:31:26 -0000	1.976.2.24
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2
-6bc3320216b43bd8ce98e5f0565b485f  patch-2.6.31-rc5-git3.bz2
+056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.22
retrieving revision 1.888.2.23
diff -u -p -r1.888.2.22 -r1.888.2.23
--- upstream	5 Aug 2009 23:00:18 -0000	1.888.2.22
+++ upstream	14 Aug 2009 18:31:26 -0000	1.888.2.23
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc5.bz2
-patch-2.6.31-rc5-git3.bz2
+patch-2.6.31-rc6.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 arch/x86/include/asm/xen/hypercall.h       |   36 
 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             |   13 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   37 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    4 
 arch/x86/xen/apic.c                        |   60 +
 arch/x86/xen/enlighten.c                   |   63 +
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |   86 +
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/pci.h                          |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   32 
 drivers/xen/Makefile                       |   18 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  152 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  322 +++++-
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/pci.h                        |    6 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   21 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 128 files changed, 9895 insertions(+), 1296 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -p -r1.1.2.32 -r1.1.2.33
--- xen.pvops.patch	13 Aug 2009 18:13:04 -0000	1.1.2.32
+++ xen.pvops.patch	14 Aug 2009 18:31:26 -0000	1.1.2.33
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 738bdc6..a619154 100644
+index 13ffa5d..ae6617b 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
 @@ -1884,6 +1884,10 @@ config PCI_OLPC
@@ -7514,7 +7514,7 @@ index 0000000..650f4b3
 +	(void)xenbus_register_backend(&blkback);
 +}
 diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index abad71b..2aed84f 100644
+index abad71b..8bcbf6b 100644
 --- a/drivers/xen/events.c
 +++ b/drivers/xen/events.c
 @@ -16,7 +16,7 @@
@@ -7539,7 +7539,7 @@ index abad71b..2aed84f 100644
  #include <asm/sync_bitops.h>
  #include <asm/xen/hypercall.h>
  #include <asm/xen/hypervisor.h>
-@@ -83,16 +85,16 @@ struct irq_info
+@@ -83,20 +85,25 @@ struct irq_info
  		enum ipi_vector ipi;
  		struct {
  			unsigned short gsi;
@@ -7561,7 +7561,17 @@ index abad71b..2aed84f 100644
  struct cpu_evtchn_s {
  	unsigned long bits[NR_EVENT_CHANNELS/BITS_PER_LONG];
  };
-@@ -106,6 +108,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
+-static struct cpu_evtchn_s *cpu_evtchn_mask_p;
++
++static __initdata struct cpu_evtchn_s init_evtchn_mask = {
++	.bits[0 ... (NR_EVENT_CHANNELS/BITS_PER_LONG)-1] = ~0ul,
++};
++static struct cpu_evtchn_s *cpu_evtchn_mask_p = &init_evtchn_mask;
++
+ static inline unsigned long *cpu_evtchn_mask(int cpu)
+ {
+ 	return cpu_evtchn_mask_p[cpu].bits;
+@@ -106,6 +113,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
  #define VALID_EVTCHN(chn)	((chn) != 0)
  
  static struct irq_chip xen_dynamic_chip;
@@ -7569,7 +7579,7 @@ index abad71b..2aed84f 100644
  
  /* Constructor for packed IRQ information. */
  static struct irq_info mk_unbound_info(void)
-@@ -218,6 +221,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
+@@ -218,6 +226,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
  	return ret;
  }
  
@@ -7585,7 +7595,7 @@ index abad71b..2aed84f 100644
  static inline unsigned long active_evtchns(unsigned int cpu,
  					   struct shared_info *sh,
  					   unsigned int idx)
-@@ -329,12 +341,24 @@ static void unmask_evtchn(int port)
+@@ -329,12 +346,24 @@ static void unmask_evtchn(int port)
  	put_cpu();
  }
  
@@ -7611,7 +7621,7 @@ index abad71b..2aed84f 100644
  		if (irq_info[irq].type == IRQT_UNBOUND)
  			break;
  
-@@ -350,6 +374,213 @@ static int find_unbound_irq(void)
+@@ -350,6 +379,213 @@ static int find_unbound_irq(void)
  	return irq;
  }
  
@@ -7825,7 +7835,7 @@ index abad71b..2aed84f 100644
  int bind_evtchn_to_irq(unsigned int evtchn)
  {
  	int irq;
-@@ -409,8 +640,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+@@ -409,8 +645,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
  	return irq;
  }
  
@@ -7843,14 +7853,14 @@ index abad71b..2aed84f 100644
 +
 +        return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
 +}
-+
  
 -static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
++
 +int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
  {
  	struct evtchn_bind_virq bind_virq;
  	int evtchn, irq;
-@@ -501,6 +747,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
+@@ -501,6 +752,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
  }
  EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
  
@@ -7880,7 +7890,7 @@ index abad71b..2aed84f 100644
  int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
  			    irq_handler_t handler,
  			    unsigned long irqflags, const char *devname, void *dev_id)
-@@ -532,6 +801,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
+@@ -532,6 +806,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
  	if (irq < 0)
  		return irq;
  
@@ -7888,7 +7898,7 @@ index abad71b..2aed84f 100644
  	retval = request_irq(irq, handler, irqflags, devname, dev_id);
  	if (retval != 0) {
  		unbind_from_irq(irq);
-@@ -924,13 +1194,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
+@@ -924,13 +1199,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
  	.retrigger	= retrigger_dynirq,
  };
  
@@ -7928,7 +7938,7 @@ index abad71b..2aed84f 100644
  
  	init_evtchn_cpu_bindings();
  
-@@ -939,4 +1234,6 @@ void __init xen_init_IRQ(void)
+@@ -939,4 +1239,6 @@ void __init xen_init_IRQ(void)
  		mask_evtchn(i);
  
  	irq_ctx_init(smp_processor_id());
@@ -13700,7 +13710,7 @@ index b9763ba..542ca7c 100644
  	int (*read_otherend_details)(struct xenbus_device *dev);
  	int (*is_ready)(struct xenbus_device *dev);
 diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 61c679d..c077438 100644
+index d222515..d5e2bb8 100644
 --- a/kernel/irq/manage.c
 +++ b/kernel/irq/manage.c
 @@ -200,7 +200,8 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc)


--- drm-hush-vblank-warning.patch DELETED ---


--- drm-radeon-fixes.patch DELETED ---


--- linux-2.6-ppc-perfctr-oops-fix.patch DELETED ---


--- patch-2.6.31-rc5-git3.bz2.sign DELETED ---


--- patch-2.6.31-rc5.bz2.sign DELETED ---


--- revert-ftrace-powerpc-snafu.patch DELETED ---



From devrim at fedoraproject.org  Fri Aug 14 18:38:29 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 14 Aug 2009 18:38:29 +0000 (UTC)
Subject: rpms/python-psycopg2/devel .cvsignore, 1.9,
	1.10 python-psycopg2.spec, 1.25, 1.26 sources, 1.9, 1.10
Message-ID: <20090814183829.2313211C00D0@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15314

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 May 2009 19:23:33 -0000	1.9
+++ .cvsignore	14 Aug 2009 18:38:28 -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.12.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/python-psycopg2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- python-psycopg2.spec	26 Jul 2009 20:54:16 -0000	1.25
+++ python-psycopg2.spec	14 Aug 2009 18:38:28 -0000	1.26
@@ -7,8 +7,8 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.11
-Release:	2%{?dist}
+Version:	2.0.12
+Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
 License:	GPLv2+ with exceptions
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
+- Update to 2.0.12
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 May 2009 19:23:33 -0000	1.9
+++ sources	14 Aug 2009 18:38:28 -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
+5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz



From laxathom at fedoraproject.org  Fri Aug 14 18:51:32 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 14 Aug 2009 18:51:32 +0000 (UTC)
Subject: rpms/rubygem-json/F-10 import.log, NONE, 1.1 rubygem-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814185132.3A65111C00D0@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/rubygem-json/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17741/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-json.spec 
Log Message:


Initial import.



--- NEW FILE import.log ---
rubygem-json-1_1_7-3_fc10:F-10:rubygem-json-1.1.7-3.fc10.src.rpm:1250275845


--- NEW FILE rubygem-json.spec ---
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname json
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global installroot %{buildroot}%{geminstdir}


Name:           rubygem-%{gemname}
Version:        1.1.7
Release:        3%{?dist}
Summary:        A JSON implementation in Ruby

Group:          Development/Languages

License:        Ruby or GPLv2
URL:            http://json.rubyforge.org
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ruby, ruby-devel
BuildRequires:  rubygem(rake)
Requires:       ruby(abi) = 1.8
Requires:       ruby(gtk2), rubygems
Provides:       rubygem(json) = %{version}

%description
This is a implementation of the JSON specification according
to RFC 4627 in Ruby.
You can think of it as a low fat alternative to XML,
if you want to store data to disk or transmit it over
a network rather than use a verbose markup language.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation

Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%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

mkdir -p ./%{gemdir}

%build
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
#pushd ./%{gemdir}
gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{gemdir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext
 
cp -a .%{gemdir}/* %{buildroot}/%{gemdir}

# Let's move arch dependent files to %%ruby_sitearch
mv .%{geminstdir}/ext/json/ext/*.so \
	$RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext

mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT%{_bindir}

chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/install.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/bin/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tests/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tools/server.rb
chmod 0644 $RPM_BUILD_ROOT%{geminstdir}/tools/fuzz.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/benchmarks/*.rb

# We don't need those files anymore.
rm -rf $RPM_BUILD_ROOT%{geminstdir}/ext
rm -rf $RPM_BUILD_ROOT%{geminstdir}/install.rb
rm -rf $RPM_BUILD_ROOT%{geminstdir}/.require_paths
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.src
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.html

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 $RPM_BUILD_ROOT

%check
pushd .%{geminstdir}
rake test --trace
popd



%files
%defattr(-,root,root,-)
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{_bindir}/*.rb
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/tools
%{ruby_sitearch}/%{gemname}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files      doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/data
%{geminstdir}/tests
%{geminstdir}/benchmarks
%{geminstdir}/doc-templates
%{gemdir}/doc/%{gemname}-%{version}

%files -n   ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}
%{ruby_sitelib}/%{gemname}.rb


%changelog
* Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
- Fix gem scripts and install_dir.
- Enable %%check stage.

* Wed Aug 05 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-2
- Rebuild in correct buildir process.
- Add sub packages.

* Mon Aug 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-1
- Update release.

* Sat Jun 06 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.6-1
- Update release.

* Tue May 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.5-1
- Update release.

* Thu Apr 02 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.4-1
- Update release.

* Sat Jul 12 2008 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:41 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:51:31 -0000	1.2
@@ -0,0 +1 @@
+json-1.1.7.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:41 -0000	1.1
+++ sources	14 Aug 2009 18:51:32 -0000	1.2
@@ -0,0 +1 @@
+f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem



From spot at fedoraproject.org  Fri Aug 14 18:53:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 14 Aug 2009 18:53:38 +0000 (UTC)
Subject: rpms/lapack/devel .cvsignore, 1.5, 1.6 Makefile.blas, 1.5,
	1.6 Makefile.lapack, 1.4, 1.5 lapack.spec, 1.22, 1.23 sources,
	1.5, 1.6
Message-ID: <20090814185338.E6D4711C00D0@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18442

Modified Files:
	.cvsignore Makefile.blas Makefile.lapack lapack.spec sources 
Log Message:
update to 3.2.1, spec file cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 May 2007 22:08:50 -0000	1.5
+++ .cvsignore	14 Aug 2009 18:53:38 -0000	1.6
@@ -1,6 +1,2 @@
-lapack.tar.bz2
-manpages.tar.bz2
+lapack-3.2.1.tgz
 manpages.tgz
-lapack.tgz
-lapack-3.1.0.tgz
-lapack-3.1.1.tgz


Index: Makefile.blas
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/Makefile.blas,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Makefile.blas	25 May 2007 22:08:50 -0000	1.5
+++ Makefile.blas	14 Aug 2009 18:53:38 -0000	1.6
@@ -2,30 +2,31 @@ clean:
 	rm -f *.o libblas.a libblas.so*
 
 OBJS=	caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o \
-	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher.o cher2.o \
-	cher2k.o cherk.o chpmv.o chpr.o chpr2.o crotg.o cscal.o csrot.o \
+	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher2.o cher2k.o \
+	cher.o cherk.o chpmv.o chpr2.o chpr.o crotg.o cscal.o csrot.o \
 	csscal.o cswap.o csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o \
 	ctpmv.o ctpsv.o ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o \
 	daxpy.o dcabs1.o dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o \
-	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o dscal.o dsdot.o dspmv.o \
-	dspr.o dspr2.o dswap.o dsymm.o dsymv.o dsyr.o dsyr2.o \
-	dsyr2k.o dsyrk.o dtbmv.o dtbsv.o dtpmv.o dtpsv.o dtrmm.o \
-	dtrmv.o dtrsm.o dtrsv.o dzasum.o dznrm2.o icamax.o idamax.o \
-	isamax.o izamax.o lsame.o sasum.o saxpy.o scasum.o scnrm2.o \
-	scopy.o sdot.o sdsdot.o sgbmv.o sgemm.o sgemv.o sger.o snrm2.o \
-	srot.o srotg.o srotm.o srotmg.o ssbmv.o sscal.o sspmv.o sspr.o sspr2.o \
-	sswap.o ssymm.o ssymv.o ssyr.o ssyr2.o ssyr2k.o ssyrk.o \
-	stbmv.o stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o \
-	strsv.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o zdrot.o zdscal.o \
-	zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o zhbmv.o zhemm.o \
-	zhemv.o zher.o zher2.o zher2k.o zherk.o zhpmv.o zhpr.o \
-	zhpr2.o zrotg.o zscal.o zswap.o zsymm.o zsyr2k.o zsyrk.o \
-	ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o ztrmv.o ztrsm.o \
-	ztrsv.o scabs1.o
+	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o \
+	dscal.o dsdot.o dspmv.o dspr2.o dspr.o dswap.o dsymm.o \
+	dsymv.o dsyr2.o dsyr2k.o dsyr.o dsyrk.o dtbmv.o dtbsv.o \
+	dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o dzasum.o \
+	dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o sasum.o \
+	saxpy.o scabs1.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o \
+	sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o \
+	srotmg.o ssbmv.o sscal.o sspmv.o sspr2.o sspr.o sswap.o \
+	ssymm.o ssymv.o ssyr2.o ssyr2k.o ssyr.o ssyrk.o stbmv.o \
+	stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o \
+	xerbla_array.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o \
+	zdrot.o zdscal.o zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o \
+	zhbmv.o zhemm.o zhemv.o zher2.o zher2k.o zher.o zherk.o \
+	zhpmv.o zhpr2.o zhpr.o zrotg.o zscal.o zswap.o zsymm.o \
+	zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o \
+	ztrmv.o ztrsm.o ztrsv.o
 
 static: $(OBJS)
 	ar ruv libblas.a $(OBJS)
 	ranlib libblas.a
 
 shared: $(OBJS)
-	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.1.1 $(OBJS) -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.2.1 $(OBJS) -lm -lgfortran -lc


Index: Makefile.lapack
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/Makefile.lapack,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- Makefile.lapack	25 May 2007 22:08:50 -0000	1.4
+++ Makefile.lapack	14 Aug 2009 18:53:38 -0000	1.5
@@ -1,237 +1,254 @@
 clean:
 	rm -f *.o liblapack*
 
-OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o \
-	cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o \
-	cgebd2.o cgebrd.o cgecon.o cgeequ.o cgees.o cgeesx.o \
-	cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o \
-	cgelq2.o cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o \
-	cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o \
-	cgeqrf.o cgerfs.o cgerq2.o cgerqf.o cgesc2.o cgesdd.o \
-	cgesvd.o cgesv.o cgesvx.o cgetc2.o cgetf2.o cgetrf.o \
-	cgetri.o cgetrs.o cggbak.o cggbal.o cgges.o cggesx.o \
-	cggev.o cggevx.o cggglm.o cgghrd.o cgglse.o cggqrf.o \
-	cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o cgtsv.o \
-	cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
-	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o \
-	checon.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o \
-	chegst.o chegvd.o chegv.o chegvx.o cherfs.o chesv.o \
-	chesvx.o chetd2.o chetf2.o chetrd.o chetrf.o chetri.o \
-	chetrs.o chgeqz.o chpcon.o chpevd.o chpev.o chpevx.o \
-	chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
-	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o \
-	chseqr.o clabrd.o clacgv.o clacn2.o clacon.o clacp2.o \
-	clacpy.o clacrm.o clacrt.o cladiv.o claed0.o claed7.o \
-	claed8.o claein.o claesy.o claev2.o clag2z.o clags2.o \
-	clagtm.o clahef.o clahqr.o clahr2.o clahrd.o claic1.o \
-	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \
-	clanhb.o clanhe.o clanhp.o clanhs.o clanht.o clansb.o \
-	clansp.o clansy.o clantb.o clantp.o clantr.o clapll.o \
-	clapmt.o claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
-	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o \
-	claqr4.o claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o \
-	clar2v.o clarcm.o clarfb.o clarf.o clarfg.o clarft.o \
-	clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \
-	clarzb.o clarz.o clarzt.o clascl.o claset.o clasr.o \
-	classq.o claswp.o clasyf.o clatbs.o clatdf.o clatps.o \
-	clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o clauum.o \
-	cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o cpbsvx.o \
-	cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
-	cposv.o cposvx.o cpotf2.o cpotrf.o cpotri.o cpotrs.o \
-	cppcon.o cppequ.o cpprfs.o cppsv.o cppsvx.o cpptrf.o \
-	cpptri.o cpptrs.o cptcon.o cpteqr.o cptrfs.o cptsv.o \
-	cptsvx.o cpttrf.o cpttrs.o cptts2.o crot.o cspcon.o \
-	cspmv.o cspr.o csprfs.o cspsv.o cspsvx.o csptrf.o \
-	csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
-	cstein.o cstemr.o csteqr.o csycon.o csymv.o csyr.o \
-	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o \
-	csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
-	ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o \
-	ctpcon.o ctprfs.o ctptri.o ctptrs.o ctrcon.o ctrevc.o \
-	ctrexc.o ctrrfs.o ctrsen.o ctrsna.o ctrsyl.o ctrti2.o \
-	ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \
-	cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o \
-	cungr2.o cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o \
-	cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o cunmr2.o \
-	cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
-	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequ.o \
-	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o \
-	dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequ.o \
-	dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
-	dgehd2.o dgehrd.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
-	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o \
-	dgeqpf.o dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o \
-	dgesc2.o dgesdd.o dgesvd.o dgesv.o dgesvx.o dgetc2.o \
-	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o \
-	dgges.o dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o \
-	dgglse.o dggqrf.o dggrqf.o dggsvd.o dggsvp.o dgtcon.o \
-	dgtrfs.o dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o \
-	dhgeqz.o dhsein.o dhseqr.o disnan.o dlabad.o dlabrd.o \
-	dlacn2.o dlacon.o dlacpy.o dladiv.o dlae2.o dlaebz.o \
-	dlaed0.o dlaed1.o dlaed2.o dlaed3.o dlaed4.o dlaed5.o \
-	dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o dlaein.o \
-	dlaev2.o dlaexc.o dlag2.o dlag2s.o dlags2.o dlagtf.o \
-	dlagtm.o dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o \
-	dlaic1.o dlaisnan.o dlaln2.o dlals0.o dlalsa.o \
-	dlalsd.o dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o \
-	dlanhs.o dlansb.o dlansp.o dlanst.o dlansy.o dlantb.o \
-	dlantp.o dlantr.o dlanv2.o dlapll.o dlapmt.o dlapy2.o \
-	dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqr0.o \
-	dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o dlaqsb.o \
-	dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
-	dlarf.o dlarfg.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
-	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o dlarrf.o \
-	dlarrj.o dlarrk.o dlarrr.o dlarrv.o dlartg.o dlartv.o \
-	dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o dlascl.o \
-	dlasd0.o dlasd1.o dlasd2.o dlasd3.o dlasd4.o dlasd5.o \
-	dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o dlasdt.o \
-	dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
-	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o \
-	dlasy2.o dlasyf.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
-	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o dlazq3.o \
-	dlazq4.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o \
-	dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \
-	dorgrq.o dorgtr.o dorm2l.o dorm2r.o dormbr.o dormhr.o \
-	dorml2.o dormlq.o dormql.o dormqr.o dormr2.o dormr3.o \
-	dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \
-	dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
-	dpocon.o dpoequ.o dporfs.o dposv.o dposvx.o dpotf2.o \
-	dpotrf.o dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o \
-	dppsv.o dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \
-	dpteqr.o dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o \
-	dptts2.o drscl.o dsbevd.o dsbev.o dsbevx.o dsbgst.o \
-	dsbgvd.o dsbgv.o dsbgvx.o dsbtrd.o dsgesv.o dspcon.o \
-	dspevd.o dspev.o dspevx.o dspgst.o dspgvd.o dspgv.o \
-	dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o dsptrf.o \
-	dsptri.o dsptrs.o dstebz.o dstedc.o dstegr.o dstein.o \
-	dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o dstevr.o \
-	dstevx.o dsycon.o dsyevd.o dsyev.o dsyevr.o dsyevx.o \
-	dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
-	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o dsytrf.o \
-	dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o \
-	dtgex2.o dtgexc.o dtgsen.o dtgsja.o dtgsna.o dtgsy2.o \
-	dtgsyl.o dtpcon.o dtprfs.o dtptri.o dtptrs.o dtrcon.o \
-	dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
-	dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dzsum1.o \
-	icmax1.o ieeeck.o ilaenv.o ilaver.o iparmq.o izmax1.o \
-	lsamen.o sbdsdc.o sbdsqr.o scsum1.o sdisna.o sgbbrd.o \
-	sgbcon.o sgbequ.o sgbrfs.o sgbsv.o sgbsvx.o sgbtf2.o \
-	sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o sgebrd.o \
-	sgecon.o sgeequ.o sgees.o sgeesx.o sgeev.o sgeevx.o \
-	sgegs.o sgegv.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
-	sgelsd.o sgels.o sgelss.o sgelsx.o sgelsy.o sgeql2.o \
-	sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o sgeqrf.o sgerfs.o \
-	sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesvd.o sgesv.o \
-	sgesvx.o sgetc2.o sgetf2.o sgetrf.o sgetri.o sgetrs.o \
-	sggbak.o sggbal.o sgges.o sggesx.o sggev.o sggevx.o \
-	sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o sggsvd.o \
-	sggsvp.o sgtcon.o sgtrfs.o sgtsv.o sgtsvx.o sgttrf.o \
-	sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o sisnan.o \
-	slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
-	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o \
-	slaed4.o slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o \
-	slaeda.o slaein.o slaev2.o slaexc.o slag2d.o slag2.o \
-	slags2.o slagtf.o slagtm.o slagts.o slagv2.o slahqr.o \
-	slahr2.o slahrd.o slaic1.o slaisnan.o slaln2.o \
-	slals0.o slalsa.o slalsd.o slamrg.o slaneg.o slangb.o \
-	slange.o slangt.o slanhs.o slansb.o slansp.o slanst.o \
-	slansy.o slantb.o slantp.o slantr.o slanv2.o slapll.o \
-	slapmt.o slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
-	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o \
-	slaqr5.o slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o \
-	slar2v.o slarfb.o slarf.o slarfg.o slarft.o slarfx.o \
-	slargv.o slarnv.o slarra.o slarrb.o slarrc.o slarrd.o \
-	slarre.o slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
-	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o \
-	slas2.o slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
-	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o \
-	slasdq.o slasdt.o slaset.o slasq1.o slasq2.o slasq3.o \
-	slasq4.o slasq5.o slasq6.o slasr.o slasrt.o slassq.o \
-	slasv2.o slaswp.o slasy2.o slasyf.o slatbs.o slatdf.o \
-	slatps.o slatrd.o slatrs.o slatrz.o slatzm.o slauu2.o \
-	slauum.o slazq3.o slazq4.o sopgtr.o sopmtr.o sorg2l.o \
-	sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o \
-	sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
-	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o \
-	sormr2.o sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o \
-	spbequ.o spbrfs.o spbstf.o spbsv.o spbsvx.o spbtf2.o \
-	spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o \
-	sposvx.o spotf2.o spotrf.o spotri.o spotrs.o sppcon.o \
-	sppequ.o spprfs.o sppsv.o sppsvx.o spptrf.o spptri.o \
-	spptrs.o sptcon.o spteqr.o sptrfs.o sptsv.o sptsvx.o \
-	spttrf.o spttrs.o sptts2.o srscl.o ssbevd.o ssbev.o \
-	ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o ssbtrd.o \
-	sspcon.o sspevd.o sspev.o sspevx.o sspgst.o sspgvd.o \
-	sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
-	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o \
-	sstein.o sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o \
-	sstevr.o sstevx.o ssycon.o ssyevd.o ssyev.o ssyevr.o \
-	ssyevx.o ssygs2.o ssygst.o ssygvd.o ssygv.o ssygvx.o \
-	ssyrfs.o ssysv.o ssysvx.o ssytd2.o ssytf2.o ssytrd.o \
-	ssytrf.o ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o \
-	stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o stgsna.o \
-	stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
-	strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o \
-	strsyl.o strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o \
-	xerbla.o zbdsqr.o zcgesv.o zdrscl.o zgbbrd.o \
-	zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
-	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \
-	zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \
-	zgegs.o zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
-	zgelsd.o zgels.o zgelss.o zgelsx.o zgelsy.o zgeql2.o \
-	zgeqlf.o zgeqp3.o zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o \
-	zgerq2.o zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o \
-	zgesvx.o zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o \
-	zggbak.o zggbal.o zgges.o zggesx.o zggev.o zggevx.o \
-	zggglm.o zgghrd.o zgglse.o zggqrf.o zggrqf.o zggsvd.o \
-	zggsvp.o zgtcon.o zgtrfs.o zgtsv.o zgtsvx.o zgttrf.o \
-	zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o zhbgst.o \
-	zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheevd.o \
-	zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
-	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o zhetd2.o \
-	zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhgeqz.o \
-	zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
-	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o \
-	zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \
-	zlacgv.o zlacn2.o zlacon.o zlacp2.o zlacpy.o zlacrm.o \
-	zlacrt.o zladiv.o zlaed0.o zlaed7.o zlaed8.o zlaein.o \
-	zlaesy.o zlaev2.o zlag2c.o zlags2.o zlagtm.o zlahef.o \
-	zlahqr.o zlahr2.o zlahrd.o zlaic1.o zlals0.o zlalsa.o \
-	zlalsd.o zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o \
-	zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o \
-	zlantb.o zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o \
-	zlaqge.o zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o \
-	zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \
-	zlaqsb.o zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o zlarcm.o \
-	zlarfb.o zlarf.o zlarfg.o zlarft.o zlarfx.o zlargv.o \
-	zlarnv.o zlarrv.o zlartg.o zlartv.o zlarzb.o zlarz.o \
-	zlarzt.o zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
-	zlasyf.o zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o \
-	zlatrz.o zlatzm.o zlauu2.o zlauum.o zpbcon.o zpbequ.o \
-	zpbrfs.o zpbstf.o zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o \
-	zpbtrs.o zpocon.o zpoequ.o zporfs.o zposv.o zposvx.o \
-	zpotf2.o zpotrf.o zpotri.o zpotrs.o zppcon.o zppequ.o \
-	zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o zpptrs.o \
-	zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o \
-	zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o zspr.o \
-	zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
+OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb.o cgbequ.o cgbrfs.o cgbrfsx.o \
+	cgbsv.o cgbsvx.o cgbsvxx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o \
+	cgebal.o cgebd2.o cgebrd.o cgecon.o cgeequb.o cgeequ.o cgees.o \
+	cgeesx.o cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o \
+	cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o cgelsy.o cgeql2.o \
+	cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o cgerfsx.o \
+	cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesvd.o cgesv.o cgesvx.o \
+	cgesvxx.o cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o cggbak.o \
+	cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o cgghrd.o \
+	cgglse.o cggqrf.o cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o \
+	cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
+	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o checon.o \
+	cheequb.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o chegst.o \
+	chegvd.o chegv.o chegvx.o cherfs.o cherfsx.o chesv.o chesvx.o \
+	chesvxx.o chetd2.o chetf2.o chetrd.o chetrf.o chetri.o chetrs.o \
+	chfrk.o chgeqz.o chla_transtype.o chpcon.o chpevd.o chpev.o \
+	chpevx.o chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
+	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o \
+	clabrd.o clacgv.o clacn2.o clacon.o clacp2.o clacpy.o clacrm.o \
+	clacrt.o cladiv.o claed0.o claed7.o claed8.o claein.o claesy.o \
+	claev2.o clag2z.o cla_gbamv.o cla_gbrcond_c.o cla_gbrcond_x.o \
+	cla_gbrfsx_extended.o cla_gbrpvgrw.o cla_geamv.o cla_gercond_c.o \
+	cla_gercond_x.o cla_gerfsx_extended.o clags2.o clagtm.o cla_heamv.o \
+	clahef.o cla_hercond_c.o cla_hercond_x.o cla_herfsx_extended.o \
+	cla_herpvgrw.o clahqr.o clahr2.o clahrd.o claic1.o cla_lin_berr.o \
+	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o clanhb.o \
+	clanhe.o clanhf.o clanhp.o clanhs.o clanht.o clansb.o clansp.o \
+	clansy.o clantb.o clantp.o clantr.o clapll.o clapmt.o \
+	cla_porcond_c.o cla_porcond_x.o cla_porfsx_extended.o \
+	cla_porpvgrw.o claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
+	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o \
+	claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o clar2v.o clarcm.o \
+	clarfb.o clarf.o clarfg.o clarfp.o clarft.o clarfx.o clargv.o \
+	clarnv.o cla_rpvgrw.o clarrv.o clarscl2.o clartg.o clartv.o \
+	clarzb.o clarz.o clarzt.o clascl2.o clascl.o claset.o clasr.o \
+	classq.o claswp.o cla_syamv.o clasyf.o cla_syrcond_c.o \
+	cla_syrcond_x.o cla_syrfsx_extended.o cla_syrpvgrw.o clatbs.o \
+	clatdf.o clatps.o clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o \
+	clauum.o cla_wwaddw.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
+	cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpftrf.o cpftri.o cpftrs.o \
+	cpocon.o cpoequb.o cpoequ.o cporfs.o cporfsx.o cposv.o cposvx.o \
+	cposvxx.o cpotf2.o cpotrf.o cpotri.o cpotrs.o cppcon.o cppequ.o \
+	cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o cpstf2.o \
+	cpstrf.o cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o \
+	cpttrs.o cptts2.o crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
+	cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
+	cstein.o cstemr.o csteqr.o csycon.o csyequb.o csymv.o csyr.o \
+	csyrfs.o csyrfsx.o csysv.o csysvx.o csysvxx.o csytf2.o csytrf.o \
+	csytri.o csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctfsm.o ctftri.o \
+	ctfttp.o ctfttr.o ctgevc.o ctgex2.o ctgexc.o ctgsen.o ctgsja.o \
+	ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o ctprfs.o ctptri.o ctptrs.o \
+	ctpttf.o ctpttr.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o \
+	ctrsna.o ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctrttf.o ctrttp.o \
+	ctzrqf.o ctzrzf.o cung2l.o cung2r.o cungbr.o cunghr.o cungl2.o \
+	cunglq.o cungql.o cungqr.o cungr2.o cungrq.o cungtr.o cunm2l.o \
+	cunm2r.o cunmbr.o cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o \
+	cunmr2.o cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
+	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequb.o dgbequ.o \
+	dgbrfs.o dgbrfsx.o dgbsv.o dgbsvx.o dgbsvxx.o dgbtf2.o dgbtrf.o \
+ 	dgbtrs.o dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequb.o \
+ 	dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
+	dgehd2.o dgehrd.o dgejsv.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
+	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o dgeqpf.o \
+	dgeqr2.o dgeqrf.o dgerfs.o dgerfsx.o dgerq2.o dgerqf.o dgesc2.o \
+	dgesdd.o dgesvd.o dgesv.o dgesvj.o dgesvx.o dgesvxx.o dgetc2.o \
+	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o dgges.o \
+	dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o dgglse.o dggqrf.o \
+	dggrqf.o dggsvd.o dggsvp.o dgsvj0.o dgsvj1.o dgtcon.o dgtrfs.o \
+	dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o dhsein.o \
+	dhseqr.o disnan.o dlabad.o dlabrd.o dlacn2.o dlacon.o dlacpy.o \
+	dladiv.o dlae2.o dlaebz.o dlaed0.o dlaed1.o dlaed2.o dlaed3.o \
+	dlaed4.o dlaed5.o dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o \
+	dlaein.o dlaev2.o dlaexc.o dlag2.o dlag2s.o dla_gbamv.o \
+	dla_gbrcond.o dla_gbrfsx_extended.o dla_gbrpvgrw.o dla_geamv.o \
+	dla_gercond.o dla_gerfsx_extended.o dlags2.o dlagtf.o dlagtm.o \
+	dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o dlaic1.o \
+	dlaisnan.o dla_lin_berr.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
+	dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o \
+	dlansf.o dlansp.o dlanst.o dlansy.o dlantb.o dlantp.o dlantr.o \
+	dlanv2.o dlapll.o dlapmt.o dla_porcond.o dla_porfsx_extended.o \
+	dla_porpvgrw.o dlapy2.o dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o \
+	dlaqps.o dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
+	dlaqsb.o dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
+	dlarf.o dlarfg.o dlarfp.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
+	dla_rpvgrw.o dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o \
+	dlarrf.o dlarrj.o dlarrk.o dlarrr.o dlarrv.o dlarscl2.o \
+	dlartg.o dlartv.o dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o \
+	dlascl2.o dlascl.o dlasd0.o dlasd1.o dlasd2.o dlasd3.o \
+	dlasd4.o dlasd5.o dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o \
+	dlasdt.o dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
+	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o dlasy2.o \
+	dla_syamv.o dlasyf.o dla_syrcond.o dla_syrfsx_extended.o \
+	dla_syrpvgrw.o dlat2s.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
+	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o dla_wwaddw.o \
+	dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o dorghr.o dorgl2.o \
+	dorglq.o dorgql.o dorgqr.o dorgr2.o dorgrq.o dorgtr.o dorm2l.o \
+	dorm2r.o dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o \
+	dormr2.o dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o \
+	dpbrfs.o dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
+	dpftrf.o dpftri.o dpftrs.o dpocon.o dpoequb.o dpoequ.o \
+	dporfs.o dporfsx.o dposv.o dposvx.o dposvxx.o dpotf2.o dpotrf.o \
+	dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o dppsv.o dppsvx.o \
+	dpptrf.o dpptri.o dpptrs.o dpstf2.o dpstrf.o dptcon.o dpteqr.o \
+	dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o dptts2.o drscl.o \
+	dsbevd.o dsbev.o dsbevx.o dsbgst.o dsbgvd.o dsbgv.o dsbgvx.o \
+	dsbtrd.o dsfrk.o dsgesv.o dspcon.o dspevd.o dspev.o dspevx.o \
+	dspgst.o dspgvd.o dspgv.o dspgvx.o dsposv.o dsprfs.o dspsv.o \
+	dspsvx.o dsptrd.o dsptrf.o dsptri.o dsptrs.o dstebz.o dstedc.o \
+	dstegr.o dstein.o dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o \
+	dstevr.o dstevx.o dsycon.o dsyequb.o dsyevd.o dsyev.o dsyevr.o \
+	dsyevx.o dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
+	dsyrfsx.o dsysv.o dsysvx.o dsysvxx.o dsytd2.o dsytf2.o dsytrd.o \
+	dsytrf.o dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtfsm.o \
+	dtftri.o dtfttp.o dtfttr.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
+	dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
+	dtptrs.o dtpttf.o dtpttr.o dtrcon.o dtrevc.o dtrexc.o dtrrfs.o \
+	dtrsen.o dtrsna.o dtrsyl.o dtrti2.o dtrtri.o dtrtrs.o dtrttf.o \
+	dtrttp.o dtzrqf.o dtzrzf.o dzsum1.o icmax1.o ieeeck.o ilaclc.o \
+	ilaclr.o iladiag.o iladlc.o iladlr.o ilaenv.o ilaprec.o \
+	ilaslc.o ilaslr.o ilatrans.o ilauplo.o ilaver.o ilazlc.o \
+	ilazlr.o iparmq.o izmax1.o lsamen.o sbdsdc.o sbdsqr.o scsum1.o \
+	sdisna.o sgbbrd.o sgbcon.o sgbequb.o sgbequ.o sgbrfs.o \
+	sgbrfsx.o sgbsv.o sgbsvx.o sgbsvxx.o sgbtf2.o sgbtrf.o sgbtrs.o \
+	sgebak.o sgebal.o sgebd2.o sgebrd.o sgecon.o sgeequb.o sgeequ.o \
+	sgees.o sgeesx.o sgeev.o sgeevx.o sgegs.o sgegv.o sgehd2.o \
+	sgehrd.o sgejsv.o sgelq2.o sgelqf.o sgelsd.o sgels.o sgelss.o \
+	sgelsx.o sgelsy.o sgeql2.o sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o \
+	sgeqrf.o sgerfs.o sgerfsx.o sgerq2.o sgerqf.o sgesc2.o sgesdd.o \
+	sgesvd.o sgesv.o sgesvj.o sgesvx.o sgesvxx.o sgetc2.o sgetf2.o \
+	sgetrf.o sgetri.o sgetrs.o sggbak.o sggbal.o sgges.o sggesx.o \
+	sggev.o sggevx.o sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o \
+	sggsvd.o sggsvp.o sgsvj0.o sgsvj1.o sgtcon.o sgtrfs.o sgtsv.o \
+	sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o \
+	sisnan.o slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
+	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o \
+	slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o slaeda.o slaein.o \
+	slaev2.o slaexc.o slag2d.o slag2.o sla_gbamv.o sla_gbrcond.o \
+	sla_gbrfsx_extended.o sla_gbrpvgrw.o sla_geamv.o sla_gercond.o \
+	sla_gerfsx_extended.o slags2.o slagtf.o slagtm.o slagts.o \
+	slagv2.o slahqr.o slahr2.o slahrd.o slaic1.o slaisnan.o \
+	sla_lin_berr.o slaln2.o slals0.o slalsa.o slalsd.o slamrg.o \
+	slaneg.o slangb.o slange.o slangt.o slanhs.o slansb.o slansf.o \
+	slansp.o slanst.o slansy.o slantb.o slantp.o slantr.o slanv2.o \
+	slapll.o slapmt.o sla_porcond.o sla_porfsx_extended.o \
+	sla_porpvgrw.o slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
+	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
+	slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o slar2v.o slarfb.o \
+	slarf.o slarfg.o slarfp.o slarft.o slarfx.o slargv.o slarnv.o \
+	sla_rpvgrw.o slarra.o slarrb.o slarrc.o slarrd.o slarre.o \
+	slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o slarscl2.o \
+	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o slas2.o \
+	slascl2.o slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
+	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o slasdq.o \
+	slasdt.o slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o \
+	slasq6.o slasr.o slasrt.o slassq.o slasv2.o slaswp.o slasy2.o \
+	sla_syamv.o slasyf.o sla_syrcond.o sla_syrfsx_extended.o \
+	sla_syrpvgrw.o slatbs.o slatdf.o slatps.o slatrd.o slatrs.o \
+	slatrz.o slatzm.o slauu2.o slauum.o sla_wwaddw.o sopgtr.o \
+	sopmtr.o sorg2l.o sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o \
+	sorgql.o sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
+	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
+	sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
+	spbstf.o spbsv.o spbsvx.o spbtf2.o spbtrf.o spbtrs.o spftrf.o \
+	spftri.o spftrs.o spocon.o spoequb.o spoequ.o sporfs.o \
+	sporfsx.o sposv.o sposvx.o sposvxx.o spotf2.o spotrf.o \
+	spotri.o spotrs.o sppcon.o sppequ.o spprfs.o sppsv.o sppsvx.o \
+	spptrf.o spptri.o spptrs.o spstf2.o spstrf.o sptcon.o spteqr.o \
+	sptrfs.o sptsv.o sptsvx.o spttrf.o spttrs.o sptts2.o srscl.o \
+	ssbevd.o ssbev.o ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o \
+	ssbtrd.o ssfrk.o sspcon.o sspevd.o sspev.o sspevx.o sspgst.o \
+	sspgvd.o sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
+	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o sstein.o \
+	sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o sstevr.o sstevx.o \
+	ssycon.o ssyequb.o ssyevd.o ssyev.o ssyevr.o ssyevx.o ssygs2.o \
+	ssygst.o ssygvd.o ssygv.o ssygvx.o ssyrfs.o ssyrfsx.o ssysv.o \
+	ssysvx.o ssysvxx.o ssytd2.o ssytf2.o ssytrd.o ssytrf.o \
+	ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o stfsm.o stftri.o \
+	stfttp.o stfttr.o stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o \
+	stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
+	stpttf.o stpttr.o strcon.o strevc.o strexc.o strrfs.o strsen.o \
+	strsna.o strsyl.o strti2.o strtri.o strtrs.o strttf.o strttp.o \
+	stzrqf.o stzrzf.o xerbla_array.o xerbla.o zbdsqr.o zcgesv.o \
+	zcposv.o zdrscl.o zgbbrd.o zgbcon.o zgbequb.o zgbequ.o \
+	zgbrfs.o zgbrfsx.o zgbsv.o zgbsvx.o zgbsvxx.o zgbtf2.o \
+	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o zgecon.o \
+	zgeequb.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o zgegs.o \
+	zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o zgelsd.o zgels.o \
+	zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
+	zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerfsx.o zgerq2.o \
+	zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o zgesvx.o zgesvxx.o \
+	zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o zggbak.o zggbal.o \
+	zgges.o zggesx.o zggev.o zggevx.o zggglm.o zgghrd.o zgglse.o \
+	zggqrf.o zggrqf.o zggsvd.o zggsvp.o zgtcon.o zgtrfs.o zgtsv.o \
+	zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o \
+	zhbgst.o zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheequb.o \
+	zheevd.o zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
+	zhegv.o zhegvx.o zherfs.o zherfsx.o zhesv.o zhesvx.o zhesvxx.o \
+	zhetd2.o zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhfrk.o \
+	zhgeqz.o zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
+	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o zhptrf.o \
+	zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o zlacgv.o zlacn2.o \
+	zlacon.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o zlaed0.o \
+	zlaed7.o zlaed8.o zlaein.o zlaesy.o zlaev2.o zlag2c.o \
+	zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o \
+	zla_gbrfsx_extended.o zla_gbrpvgrw.o zla_geamv.o \
+	zla_gercond_c.o zla_gercond_x.o zla_gerfsx_extended.o zlags2.o \
+	zlagtm.o zla_heamv.o zlahef.o zla_hercond_c.o zla_hercond_x.o \
+	zla_herfsx_extended.o zla_herpvgrw.o zlahqr.o zlahr2.o \
+	zlahrd.o zlaic1.o zla_lin_berr.o zlals0.o zlalsa.o zlalsd.o \
+	zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o zlanhf.o zlanhp.o \
+	zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o zlantp.o \
+	zlantr.o zlapll.o zlapmt.o zla_porcond_c.o zla_porcond_x.o \
+	zla_porfsx_extended.o zla_porpvgrw.o zlaqgb.o zlaqge.o \
+	zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqr0.o zlaqr1.o \
+	zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o zlaqsb.o zlaqsp.o zlaqsy.o \
+	zlar1v.o zlar2v.o zlarcm.o zlarfb.o zlarf.o zlarfg.o zlarfp.o \
+	zlarft.o zlarfx.o zlargv.o zlarnv.o zla_rpvgrw.o zlarrv.o \
+	zlarscl2.o zlartg.o zlartv.o zlarzb.o zlarz.o zlarzt.o \
+	zlascl2.o zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
+	zla_syamv.o zlasyf.o zla_syrcond_c.o zla_syrcond_x.o \
+	zla_syrfsx_extended.o zla_syrpvgrw.o zlat2c.o zlatbs.o \
+	zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
+	zlauum.o zla_wwaddw.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o \
+	zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpftrf.o zpftri.o \
+	zpftrs.o zpocon.o zpoequb.o zpoequ.o zporfs.o zporfsx.o \
+	zposv.o zposvx.o zposvxx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o \
+	zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o \
+	zpptrs.o zpstf2.o zpstrf.o zptcon.o zpteqr.o zptrfs.o zptsv.o \
+	zptsvx.o zpttrf.o zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o \
+	zspr.o zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
 	zstedc.o zstegr.o zstein.o zstemr.o zsteqr.o zsycon.o \
-	zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o \
-	zsytrf.o zsytri.o zsytrs.o ztbcon.o ztbrfs.o ztbtrs.o \
-	ztgevc.o ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o \
-	ztgsy2.o ztgsyl.o ztpcon.o ztprfs.o ztptri.o ztptrs.o \
-	ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
-	ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o \
-	zung2l.o zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o \
-	zungql.o zungqr.o zungr2.o zungrq.o zungtr.o zunm2l.o \
-	zunm2r.o zunmbr.o zunmhr.o zunml2.o zunmlq.o zunmql.o \
-	zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o zunmtr.o \
-	zupgtr.o zupmtr.o ../INSTALL/dlamch.o ../INSTALL/dsecnd_INT_ETIME.o \
-	../INSTALL/lsame.o ../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
+	zsyequb.o zsymv.o zsyr.o zsyrfs.o zsyrfsx.o zsysv.o zsysvx.o \
+	zsysvxx.o zsytf2.o zsytrf.o zsytri.o zsytrs.o ztbcon.o \
+	ztbrfs.o ztbtrs.o ztfsm.o ztftri.o ztfttp.o ztfttr.o ztgevc.o \
+	ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o \
+	ztpcon.o ztprfs.o ztptri.o ztptrs.o ztpttf.o ztpttr.o ztrcon.o \
+	ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o ztrsyl.o ztrti2.o \
+	ztrtri.o ztrtrs.o ztrttf.o ztrttp.o ztzrqf.o ztzrzf.o zung2l.o \
+	zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o \
+	zungr2.o zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o \
+	zunml2.o zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o \
+	zunmrz.o zunmtr.o zupgtr.o zupmtr.o ../INSTALL/dlamch.o \
+	../INSTALL/dsecnd_INT_ETIME.o ../INSTALL/lsame.o \
+	../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
 
 static: $(OBJS)
 	ar ruv liblapack.a $(OBJS)
 	ranlib liblapack.a
 
 shared: $(OBJS)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.1.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.2.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc


Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- lapack.spec	10 Aug 2009 09:15:44 -0000	1.22
+++ lapack.spec	14 Aug 2009 18:53:38 -0000	1.23
@@ -1,17 +1,17 @@
-Summary: The LAPACK libraries for numerical linear algebra.
+Summary: Numerical linear algebra package libraries
 Name: lapack
-Version: 3.1.1
-Release: 7%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
 Source0: http://www.netlib.org/lapack/lapack-%{version}.tgz
+Source1: http://www.netlib.org/lapack/manpages.tgz
 Source2: Makefile.blas
 Source3: Makefile.lapack
 Source4: http://www.netlib.org/lapack/lapackqref.ps
 Source5: http://www.netlib.org/blas/blasqr.ps
 Patch3: lapack-3.1.1-make.inc.patch
-Obsoletes: lapack-man
 BuildRequires: gcc-gfortran
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,39 +33,41 @@ Summary: LAPACK development libraries
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: blas-devel = %{version}-%{release}
+Provides: lapack-static = %{version}-%{release}
 
 %description devel
 LAPACK development libraries for applications that link statically.
 
 %package -n blas
-Summary: The BLAS (Basic Linear Algebra Subprograms) library.
+Summary: The Basic Linear Algebra Subprograms library
 Group: Development/Libraries
-Obsoletes: lapack-blas blas-man
 
 %description -n blas
 BLAS (Basic Linear Algebra Subprograms) is a standard library which
-provides a number of basic algorithms for numerical algebra. Man
-pages for blas are available in the blas-man package.
+provides a number of basic algorithms for numerical algebra. 
 
 %package -n blas-devel
-Summary: LAPACK development libraries
+Summary: BLAS development libraries
 Group: Development/Libraries
 Requires: blas = %{version}-%{release}
 Requires: gcc-gfortran
+Provides: blas-static = %{version}-%{release}
 
 %description -n blas-devel
 BLAS development libraries for applications that link statically.
 
 %prep
 %setup -q 
-%setup -q -D -T
+%setup -q -D -T -a1
 %patch3 -p1
 cp -f INSTALL/make.inc.gfortran make.inc
-cp -f $RPM_SOURCE_DIR/Makefile.blas BLAS/SRC/Makefile
-cp -f $RPM_SOURCE_DIR/Makefile.lapack SRC/Makefile
+cp -f %{SOURCE2} BLAS/SRC/Makefile
+cp -f %{SOURCE3} SRC/Makefile
+
+mv lapack-3.2.0/manpages/ manpages/
 
 #Empty
-rm -f man/manl/zbcon.l
+rm -f manpages/man/manl/zbcon.l
 
 %build
 
@@ -80,10 +82,10 @@ cp libblas.a ${RPM_BUILD_DIR}/%{name}-%{
 make clean
 FFLAGS="$RPM_OPT_O_FLAGS -fPIC" make dcabs1.o
 FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
-cp libblas.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/
+cp libblas.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-ln -s libblas.so.3.1.1 libblas.so
+ln -s libblas.so.%{version} libblas.so
 
 # Some files don't like -O2, but -Os is fine
 RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|')
@@ -109,7 +111,7 @@ popd
 pushd SRC
 make clean
 make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
-cp liblapack.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/
+cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
 # Buuld the static with pic dlamch, dsecnd, lsame, second, slamch bits
@@ -125,15 +127,15 @@ make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAG
 cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
 popd
 
-cp %{SOURCE4} lapackqref.ps
-cp %{SOURCE5} blasqr.ps
+cp -p %{SOURCE4} lapackqref.ps
+cp -p %{SOURCE5} blasqr.ps
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl
 
-for f in liblapack.so.3.1.1 libblas.so.3.1.1 libblas.a liblapack.a liblapack_pic.a; do
+for f in liblapack.so.%{version} libblas.so.%{version} libblas.a liblapack.a liblapack_pic.a; do
   cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f
 done
 
@@ -148,12 +150,12 @@ cp -f manpages/blas/man/manl/* ${RPM_BUI
 cp -f manpages/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl
 
 cd ${RPM_BUILD_ROOT}%{_libdir}
-ln -sf liblapack.so.3.1.1 liblapack.so
-ln -sf liblapack.so.3.1.1 liblapack.so.3
-ln -sf liblapack.so.3.1.1 liblapack.so.3.1
-ln -sf libblas.so.3.1.1 libblas.so
-ln -sf libblas.so.3.1.1 libblas.so.3
-ln -sf libblas.so.3.1.1 libblas.so.3.1
+ln -sf liblapack.so.%{version} liblapack.so
+ln -sf liblapack.so.%{version} liblapack.so.3
+ln -sf liblapack.so.%{version} liblapack.so.3.2
+ln -sf libblas.so.%{version} libblas.so
+ln -sf libblas.so.%{version} libblas.so.3
+ln -sf libblas.so.%{version} libblas.so.3.2
 
 %post -p /sbin/ldconfig
 
@@ -187,6 +189,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Fri Aug 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-1
+- update to 3.2.1, spec file cleanups
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.1.1-7
 - Convert specfile to UTF-8.
 
@@ -287,7 +292,7 @@ rm -fr ${RPM_BUILD_ROOT}
 * Sun Nov 10 2002 Jeff Johnson <jbj at redhat.com> 3.0-19
 - rebuild with x86_64.
 
-* Thu Jul 18 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-18
+* Thu Jul 18 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-18
 - Remove an empty man page (#63569)
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -296,44 +301,44 @@ rm -fr ${RPM_BUILD_ROOT}
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed May  1 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-15
+* Wed May  1 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-15
 - Rebuild
 
-* Thu Feb 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-14
+* Thu Feb 21 2002 Trond Eivind Glomsrod <teg at redhat.com> 3.0-14
 - Rebuild
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Aug 13 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.0-12
+* Mon Aug 13 2001 Trond Eivind Glomsrod <teg at redhat.com> 3.0-12
 - The man-pages for xerbla and lsame were in blas-man and lapack-man (#51605)
 
-* Fri Jun  8 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun  8 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Reenable optimization for IA64
 
-* Fri May 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri May 25 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Add all patches from the LAPACK site as of 2001-05-25
 - Use this workaround for IA64 instead
 - Remove SPARC workaround
 - Don't exclude IA64
 
-* Thu Dec 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Dec 07 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - rebuild for main distribution
 
-* Mon Nov 20 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Nov 20 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - add the LAPACK Quick Reference Guide to the docs
 - add the BLAS Quick Reference Guide to the docs
 
-* Tue Aug 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Aug 01 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - fix lack of ldconfig in postuninstall script
 
 * Mon Jul 24 2000 Prospector <prospector at redhat.com>
 - rebuilt
 
-* Mon Jul 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 10 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - updated with the latest updates (new tarfile..) from netlib 
 
-* Thu Jun 15 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jun 15 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - use %%{_mandir}
 - added some flags to work around SPARC compiler bug
 
@@ -362,12 +367,12 @@ rm -fr ${RPM_BUILD_ROOT}
 * Fri Jul 17 1998 Jeff Johnson <jbj at redhat.com>
 - repackage for powertools.
 
-* Sun Feb 15 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Feb 15 1998 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-9]
  - No code updates, just built with a customized rpm -
    this should make dependencies right.
 
-* Sat Feb 07 1998 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Feb 07 1998 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-8]
  - Total rewrite of the spec file
  - Added my own makefiles - libs should build better,
@@ -379,16 +384,16 @@ rm -fr ${RPM_BUILD_ROOT}
    (oh - and as always: Dedicated to the girl I
    love, Eline Skirnisdottir)
 
-* Sat Dec 06 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sat Dec 06 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
  [lapack-2.0-7]
   - added a dependency to glibc, so people don't try with libc5
 
-* Thu Nov 20 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Thu Nov 20 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
   [lapack-2.0-6]
   - removed etime.c
   - compiled with egcs, and for glibc 2.0
 
-* Sun Oct 12 1997 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+* Sun Oct 12 1997 Trond Eivind Glomsrod <teg at pvv.ntnu.no>
   [lapack-2.0-5]
   - added a changelog
   - cleaned up building of shared libs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 May 2007 22:08:50 -0000	1.5
+++ sources	14 Aug 2009 18:53:38 -0000	1.6
@@ -1 +1,2 @@
-00b21551a899bcfbaa7b8443e1faeef9  lapack-3.1.1.tgz
+a3202a4f9e2f15ffd05d15dab4ac7857  lapack-3.2.1.tgz
+145007cab915504caec382289462a166  manpages.tgz



From laxathom at fedoraproject.org  Fri Aug 14 18:53:25 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 14 Aug 2009 18:53:25 +0000 (UTC)
Subject: rpms/rubygem-json/F-11 import.log, NONE, 1.1 rubygem-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814185325.248A011C00D0@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-serv18331/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-json.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
rubygem-json-1_1_7-3_fc10:F-11:rubygem-json-1.1.7-3.fc10.src.rpm:1250275982


--- NEW FILE rubygem-json.spec ---
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname json
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global installroot %{buildroot}%{geminstdir}


Name:           rubygem-%{gemname}
Version:        1.1.7
Release:        3%{?dist}
Summary:        A JSON implementation in Ruby

Group:          Development/Languages

License:        Ruby or GPLv2
URL:            http://json.rubyforge.org
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ruby, ruby-devel
BuildRequires:  rubygem(rake)
Requires:       ruby(abi) = 1.8
Requires:       ruby(gtk2), rubygems
Provides:       rubygem(json) = %{version}

%description
This is a implementation of the JSON specification according
to RFC 4627 in Ruby.
You can think of it as a low fat alternative to XML,
if you want to store data to disk or transmit it over
a network rather than use a verbose markup language.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation

Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%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

mkdir -p ./%{gemdir}

%build
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
#pushd ./%{gemdir}
gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{gemdir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext
 
cp -a .%{gemdir}/* %{buildroot}/%{gemdir}

# Let's move arch dependent files to %%ruby_sitearch
mv .%{geminstdir}/ext/json/ext/*.so \
	$RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext

mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT%{_bindir}

chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/install.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/bin/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tests/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tools/server.rb
chmod 0644 $RPM_BUILD_ROOT%{geminstdir}/tools/fuzz.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/benchmarks/*.rb

# We don't need those files anymore.
rm -rf $RPM_BUILD_ROOT%{geminstdir}/ext
rm -rf $RPM_BUILD_ROOT%{geminstdir}/install.rb
rm -rf $RPM_BUILD_ROOT%{geminstdir}/.require_paths
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.src
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.html

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 $RPM_BUILD_ROOT

%check
pushd .%{geminstdir}
rake test --trace
popd



%files
%defattr(-,root,root,-)
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{_bindir}/*.rb
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/tools
%{ruby_sitearch}/%{gemname}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files      doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/data
%{geminstdir}/tests
%{geminstdir}/benchmarks
%{geminstdir}/doc-templates
%{gemdir}/doc/%{gemname}-%{version}

%files -n   ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}
%{ruby_sitelib}/%{gemname}.rb


%changelog
* Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
- Fix gem scripts and install_dir.
- Enable %%check stage.

* Wed Aug 05 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-2
- Rebuild in correct buildir process.
- Add sub packages.

* Mon Aug 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-1
- Update release.

* Sat Jun 06 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.6-1
- Update release.

* Tue May 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.5-1
- Update release.

* Thu Apr 02 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.4-1
- Update release.

* Sat Jul 12 2008 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:41 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:53:24 -0000	1.2
@@ -0,0 +1 @@
+json-1.1.7.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:41 -0000	1.1
+++ sources	14 Aug 2009 18:53:24 -0000	1.2
@@ -0,0 +1 @@
+f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem



From laxathom at fedoraproject.org  Fri Aug 14 18:54:51 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 14 Aug 2009 18:54:51 +0000 (UTC)
Subject: rpms/rubygem-json/devel import.log, NONE, 1.1 rubygem-json.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814185451.E428511C00D0@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/rubygem-json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18851/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-json.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
rubygem-json-1_1_7-3_fc10:HEAD:rubygem-json-1.1.7-3.fc10.src.rpm:1250276064


--- NEW FILE rubygem-json.spec ---
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname json
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global installroot %{buildroot}%{geminstdir}


Name:           rubygem-%{gemname}
Version:        1.1.7
Release:        3%{?dist}
Summary:        A JSON implementation in Ruby

Group:          Development/Languages

License:        Ruby or GPLv2
URL:            http://json.rubyforge.org
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ruby, ruby-devel
BuildRequires:  rubygem(rake)
Requires:       ruby(abi) = 1.8
Requires:       ruby(gtk2), rubygems
Provides:       rubygem(json) = %{version}

%description
This is a implementation of the JSON specification according
to RFC 4627 in Ruby.
You can think of it as a low fat alternative to XML,
if you want to store data to disk or transmit it over
a network rather than use a verbose markup language.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation

Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%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

mkdir -p ./%{gemdir}

%build
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
#pushd ./%{gemdir}
gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{gemdir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext
 
cp -a .%{gemdir}/* %{buildroot}/%{gemdir}

# Let's move arch dependent files to %%ruby_sitearch
mv .%{geminstdir}/ext/json/ext/*.so \
	$RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext

mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT%{_bindir}

chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/install.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/bin/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tests/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tools/server.rb
chmod 0644 $RPM_BUILD_ROOT%{geminstdir}/tools/fuzz.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/benchmarks/*.rb

# We don't need those files anymore.
rm -rf $RPM_BUILD_ROOT%{geminstdir}/ext
rm -rf $RPM_BUILD_ROOT%{geminstdir}/install.rb
rm -rf $RPM_BUILD_ROOT%{geminstdir}/.require_paths
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.src
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.html

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 $RPM_BUILD_ROOT

%check
pushd .%{geminstdir}
rake test --trace
popd



%files
%defattr(-,root,root,-)
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{_bindir}/*.rb
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/tools
%{ruby_sitearch}/%{gemname}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files      doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/data
%{geminstdir}/tests
%{geminstdir}/benchmarks
%{geminstdir}/doc-templates
%{gemdir}/doc/%{gemname}-%{version}

%files -n   ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}
%{ruby_sitelib}/%{gemname}.rb


%changelog
* Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
- Fix gem scripts and install_dir.
- Enable %%check stage.

* Wed Aug 05 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-2
- Rebuild in correct buildir process.
- Add sub packages.

* Mon Aug 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-1
- Update release.

* Sat Jun 06 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.6-1
- Update release.

* Tue May 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.5-1
- Update release.

* Thu Apr 02 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.4-1
- Update release.

* Sat Jul 12 2008 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:41 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:54:51 -0000	1.2
@@ -0,0 +1 @@
+json-1.1.7.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:41 -0000	1.1
+++ sources	14 Aug 2009 18:54:51 -0000	1.2
@@ -0,0 +1 @@
+f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem



From laxathom at fedoraproject.org  Fri Aug 14 18:57:03 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 14 Aug 2009 18:57:03 +0000 (UTC)
Subject: rpms/rubygem-json/EL-5 import.log, NONE, 1.1 rubygem-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814185703.F2EFE11C00D0@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/rubygem-json/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19385/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-json.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
rubygem-json-1_1_7-3_fc10:EL-5:rubygem-json-1.1.7-3.fc10.src.rpm:1250276193


--- NEW FILE rubygem-json.spec ---
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname json
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global installroot %{buildroot}%{geminstdir}


Name:           rubygem-%{gemname}
Version:        1.1.7
Release:        3%{?dist}
Summary:        A JSON implementation in Ruby

Group:          Development/Languages

License:        Ruby or GPLv2
URL:            http://json.rubyforge.org
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ruby, ruby-devel
BuildRequires:  rubygem(rake)
Requires:       ruby(abi) = 1.8
Requires:       ruby(gtk2), rubygems
Provides:       rubygem(json) = %{version}

%description
This is a implementation of the JSON specification according
to RFC 4627 in Ruby.
You can think of it as a low fat alternative to XML,
if you want to store data to disk or transmit it over
a network rather than use a verbose markup language.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation

Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%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

mkdir -p ./%{gemdir}

%build
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
#pushd ./%{gemdir}
gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{gemdir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext
 
cp -a .%{gemdir}/* %{buildroot}/%{gemdir}

# Let's move arch dependent files to %%ruby_sitearch
mv .%{geminstdir}/ext/json/ext/*.so \
	$RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext

mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT%{_bindir}

chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/install.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/bin/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tests/*.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/tools/server.rb
chmod 0644 $RPM_BUILD_ROOT%{geminstdir}/tools/fuzz.rb
chmod 0755 $RPM_BUILD_ROOT%{geminstdir}/benchmarks/*.rb

# We don't need those files anymore.
rm -rf $RPM_BUILD_ROOT%{geminstdir}/ext
rm -rf $RPM_BUILD_ROOT%{geminstdir}/install.rb
rm -rf $RPM_BUILD_ROOT%{geminstdir}/.require_paths
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.src
rm -rf $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version}/rdoc/classes/.html

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 $RPM_BUILD_ROOT

%check
pushd .%{geminstdir}
rake test --trace
popd



%files
%defattr(-,root,root,-)
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{_bindir}/*.rb
%{geminstdir}/bin
%{geminstdir}/lib
%{geminstdir}/tools
%{ruby_sitearch}/%{gemname}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files      doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/data
%{geminstdir}/tests
%{geminstdir}/benchmarks
%{geminstdir}/doc-templates
%{gemdir}/doc/%{gemname}-%{version}

%files -n   ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}
%{ruby_sitelib}/%{gemname}.rb


%changelog
* Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
- Fix gem scripts and install_dir.
- Enable %%check stage.

* Wed Aug 05 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-2
- Rebuild in correct buildir process.
- Add sub packages.

* Mon Aug 03 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-1
- Update release.

* Sat Jun 06 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.6-1
- Update release.

* Tue May 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.5-1
- Update release.

* Thu Apr 02 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.4-1
- Update release.

* Sat Jul 12 2008 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.3-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:41 -0000	1.1
+++ .cvsignore	14 Aug 2009 18:57:03 -0000	1.2
@@ -0,0 +1 @@
+json-1.1.7.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:41 -0000	1.1
+++ sources	14 Aug 2009 18:57:03 -0000	1.2
@@ -0,0 +1 @@
+f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem



From firewing at fedoraproject.org  Fri Aug 14 19:18:13 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 19:18:13 +0000 (UTC)
Subject: rpms/gnofract4d/F-11 gnofract4d.spec,1.22,1.23
Message-ID: <20090814191813.DA7CC11C00D0@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/gnofract4d/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24173/F-11

Modified Files:
	gnofract4d.spec 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.12-3
- Disable make check, it seems to cause extremely long build times (>24h)



Index: gnofract4d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnofract4d/F-11/gnofract4d.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnofract4d.spec	19 Jun 2009 20:35:58 -0000	1.22
+++ gnofract4d.spec	14 Aug 2009 19:18:13 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           gnofract4d
 Version:        3.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gnofract 4D is a Gnome-based program to draw fractals
 Group:          Amusements/Graphics
 License:        LGPLv2+
@@ -65,10 +65,11 @@ update-mime-database %{_datadir}/mime &>
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
-%check
+## This section has been disabled as it causes extremely long build times
+#check
 # Randomly assigns a number 10-99 to $dnum
-let "dnum = $RANDOM % 90 + 10"
-xinit %{__python} test.py -- /usr/bin/Xvfb :$dnum -ac
+#let "dnum = $RANDOM % 90 + 10"
+#xinit %{__python} test.py -- /usr/bin/Xvfb :$dnum -ac
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -88,6 +89,9 @@ xinit %{__python} test.py -- /usr/bin/Xv
 %{python_sitearch}/fractutils/
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.12-2
+- Disable make check, it seems to cause extremely long build times (>24h)
+
 * Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 3.12-1
 - Update to 3.12
 



From firewing at fedoraproject.org  Fri Aug 14 19:18:13 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 19:18:13 +0000 (UTC)
Subject: rpms/gnofract4d/devel gnofract4d.spec,1.23,1.24
Message-ID: <20090814191813.F143B11C00D0@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/gnofract4d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24173/devel

Modified Files:
	gnofract4d.spec 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.12-3
- Disable make check, it seems to cause extremely long build times (>24h)



Index: gnofract4d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnofract4d/devel/gnofract4d.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gnofract4d.spec	25 Jul 2009 00:31:44 -0000	1.23
+++ gnofract4d.spec	14 Aug 2009 19:18:13 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           gnofract4d
 Version:        3.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Gnofract 4D is a Gnome-based program to draw fractals
 Group:          Amusements/Graphics
 License:        LGPLv2+
@@ -65,10 +65,11 @@ update-mime-database %{_datadir}/mime &>
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
-%check
+## This section has been disabled as it causes extremely long build times
+#check
 # Randomly assigns a number 10-99 to $dnum
-let "dnum = $RANDOM % 90 + 10"
-xinit %{__python} test.py -- /usr/bin/Xvfb :$dnum -ac
+#let "dnum = $RANDOM % 90 + 10"
+#xinit %{__python} test.py -- /usr/bin/Xvfb :$dnum -ac
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -88,6 +89,9 @@ xinit %{__python} test.py -- /usr/bin/Xv
 %{python_sitearch}/fractutils/
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.12-3
+- Disable make check, it seems to cause extremely long build times (>24h)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From firewing at fedoraproject.org  Fri Aug 14 19:28:04 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 19:28:04 +0000 (UTC)
Subject: rpms/monit/F-11 .cvsignore, 1.2, 1.3 monit.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <20090814192804.2F68411C00D0@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/monit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474/F-11

Modified Files:
	.cvsignore monit.spec sources 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 5.0.3-1
- Update to 5.0.3 (thanks to Lubomir Rintel of Good Data for the patch)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monit/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Nov 2007 23:48:48 -0000	1.2
+++ .cvsignore	14 Aug 2009 19:28:03 -0000	1.3
@@ -1 +1 @@
-monit-4.10.1.tar.gz
+monit-5.0.3.tar.gz


Index: monit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monit/F-11/monit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- monit.spec	26 Feb 2009 02:23:18 -0000	1.8
+++ monit.spec	14 Aug 2009 19:28:03 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           monit
-Version:        4.10.1
-Release:        10%{?dist}
+Version:        5.0.3
+Release:        1%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
@@ -85,7 +85,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README README.DEVELOPER README.SSL STATUS UPGRADE.txt
+%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README README.DEVELOPER README.SSL
 %config(noreplace) %{_sysconfdir}/monit.conf
 %config(noreplace) %{_sysconfdir}/monit.d/logging
 %config(noreplace) %{_sysconfdir}/logrotate.d/monit
@@ -96,6 +96,9 @@ fi
 %{_mandir}/man1/monit.1*
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 5.0.3-1
+- Update to 5.0.3 (thanks to Lubomir Rintel of Good Data for the patch)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monit/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Nov 2007 23:48:48 -0000	1.2
+++ sources	14 Aug 2009 19:28:03 -0000	1.3
@@ -1 +1 @@
-d3143b0bbd79b53f1b019d2fc1dae656  monit-4.10.1.tar.gz
+dae7859ec10551fc941daeae60dee9d3  monit-5.0.3.tar.gz



From firewing at fedoraproject.org  Fri Aug 14 19:28:04 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 19:28:04 +0000 (UTC)
Subject: rpms/monit/devel .cvsignore, 1.2, 1.3 monit.spec, 1.9, 1.10 sources,
	1.2, 1.3
Message-ID: <20090814192804.83B0311C00D0@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/monit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474/devel

Modified Files:
	.cvsignore monit.spec sources 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 5.0.3-1
- Update to 5.0.3 (thanks to Lubomir Rintel of Good Data for the patch)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Nov 2007 23:48:48 -0000	1.2
+++ .cvsignore	14 Aug 2009 19:28:03 -0000	1.3
@@ -1 +1 @@
-monit-4.10.1.tar.gz
+monit-5.0.3.tar.gz


Index: monit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monit/devel/monit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- monit.spec	25 Jul 2009 14:58:30 -0000	1.9
+++ monit.spec	14 Aug 2009 19:28:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           monit
-Version:        4.10.1
-Release:        11%{?dist}
+Version:        5.0.3
+Release:        1%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
@@ -85,7 +85,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README README.DEVELOPER README.SSL STATUS UPGRADE.txt
+%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README README.DEVELOPER README.SSL
 %config(noreplace) %{_sysconfdir}/monit.conf
 %config(noreplace) %{_sysconfdir}/monit.d/logging
 %config(noreplace) %{_sysconfdir}/logrotate.d/monit
@@ -96,6 +96,9 @@ fi
 %{_mandir}/man1/monit.1*
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 5.0.3-1
+- Update to 5.0.3 (thanks to Lubomir Rintel of Good Data for the patch)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Nov 2007 23:48:48 -0000	1.2
+++ sources	14 Aug 2009 19:28:04 -0000	1.3
@@ -1 +1 @@
-d3143b0bbd79b53f1b019d2fc1dae656  monit-4.10.1.tar.gz
+dae7859ec10551fc941daeae60dee9d3  monit-5.0.3.tar.gz



From hadess at fedoraproject.org  Fri Aug 14 19:36:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 14 Aug 2009 19:36:28 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel .cvsignore, 1.20,
	1.21 gstreamer-plugins-good.spec, 1.100, 1.101 sources, 1.20, 1.21
Message-ID: <20090814193628.0D79711C00D0@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-serv29265

Modified Files:
	.cvsignore gstreamer-plugins-good.spec sources 
Log Message:
* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15.3-1
- Update to 0.10.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	20 May 2009 23:27:21 -0000	1.20
+++ .cvsignore	14 Aug 2009 19:36:27 -0000	1.21
@@ -1 +1 @@
-gst-plugins-good-0.10.15.tar.bz2
+gst-plugins-good-0.10.15.3.tar.bz2


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gstreamer-plugins-good.spec	11 Aug 2009 15:04:12 -0000	1.100
+++ gstreamer-plugins-good.spec	14 Aug 2009 19:36:27 -0000	1.101
@@ -5,8 +5,8 @@
 %define         _gstpb          0.10.17
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.15
-Release:  	6%{?dist}
+Version: 	0.10.15.3
+Release:  	1%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -275,6 +275,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15.3-1
+- Update to 0.10.15.3
+
 * Tue Aug 11 2009 Hans de Goede <hdegoede at redhat.com> 0.10.15-6
 - Fix usage of webcamdrivers which do not implement VIDIOC_G_PARM (#467961)
 - Include "Fix FLAC seeking" patch from F-11 package (#515886)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	20 May 2009 23:27:21 -0000	1.20
+++ sources	14 Aug 2009 19:36:27 -0000	1.21
@@ -1 +1 @@
-19bc6cc07951b3382d1ac8525b20e83f  gst-plugins-good-0.10.15.tar.bz2
+916a8a2f30891246f6c8ad7f6a94e42f  gst-plugins-good-0.10.15.3.tar.bz2



From pbrobinson at fedoraproject.org  Fri Aug 14 19:43:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 14 Aug 2009 19:43:20 +0000 (UTC)
Subject: rpms/ccss/devel ccss.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090814194320.DC3E811C00D0@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ccss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25960/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ccss.spec import.log 
Log Message:
- initial import



--- NEW FILE ccss.spec ---
Name:           ccss
Version:        0.5.0
Release:        1%{?dist}
Summary:        A simple api for CSS Stylesheets

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://people.freedesktop.org/~robsta/ccss/
Source0:        http://people.freedesktop.org/~robsta/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cairo-devel
BuildRequires: glib2-devel
BuildRequires: libcroco-devel
BuildRequires: librsvg2-devel
BuildRequires: libsoup-devel

Provides: libccss = %{version}
Obsoletes: libccss < 0.5

%description
Libccss offers a simple API to

    * Parse CSS stylesheets.
    * Query for style configurations on a user-provided document
      representation.
    * Draw query results onto cairo surfaces.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

Provides: libccss-devel = %{version}
Obsoletes: libccss-devel <= 0.4.0

%description devel
Files for development with %{name}.

%package docs
Summary: Documentation package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc
BuildArch: noarch

%description docs
Developer documentation for development with %{name}.

%prep
%setup -q

%build
%configure --disable-examples
# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

#Remove libtool archives.
rm -rf %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS TODO
%{_libdir}/libccss-1.so.5.0.0
%{_libdir}/libccss-gtk-1.so.5.0.0
%{_libdir}/libccss-cairo-1.so.5.0.0
%{_libdir}/libccss-1.so.5
%{_libdir}/libccss-cairo-1.so.5
%{_libdir}/libccss-gtk-1.so.5
%{_bindir}/ccss-stylesheet-to-gtkrc

%files devel
%defattr(-,root,root,-)
%{_includedir}/ccss-1
%{_libdir}/pkgconfig/ccss-1.pc
%{_libdir}/pkgconfig/ccss-cairo-1.pc
%{_libdir}/pkgconfig/ccss-gtk-1.pc
%{_libdir}/libccss-1.so
%{_libdir}/libccss-cairo-1.so
%{_libdir}/libccss-gtk-1.so

%files docs
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/ccss
%doc %{_datadir}/gtk-doc/html/ccss-cairo
%doc %{_datadir}/gtk-doc/html/ccss-gtk

%changelog
* Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.0-1
- New release - 0.5.0. 
- Rename package from libccss to ccss as per upstream
- Split gtk-docs out to -docs noarch sub package

* Thu Aug 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.0-1
- New release - 0.4.0

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Jul  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-2
- Add new files to specs

* Thu Jul  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-1
- New release - 0.3.1

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.0-1
- Initial packaging


--- NEW FILE import.log ---
ccss-0_5_0-1_fc11:HEAD:ccss-0.5.0-1.fc11.src.rpm:1250277848


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccss/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:15:16 -0000	1.1
+++ .cvsignore	14 Aug 2009 19:43:20 -0000	1.2
@@ -0,0 +1 @@
+ccss-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccss/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:15:16 -0000	1.1
+++ sources	14 Aug 2009 19:43:20 -0000	1.2
@@ -0,0 +1 @@
+468ffcbbdf738a1896f2d77610375124  ccss-0.5.0.tar.gz



From mclasen at fedoraproject.org  Fri Aug 14 19:45:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 19:45:21 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.220,1.221
Message-ID: <20090814194521.4989311C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30800

Modified Files:
	gnome-desktop.spec 
Log Message:
Drop the -extras backgrounds



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- gnome-desktop.spec	5 Aug 2009 02:23:00 -0000	1.220
+++ gnome-desktop.spec	14 Aug 2009 19:45:21 -0000	1.221
@@ -12,7 +12,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.27.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
@@ -31,7 +31,6 @@ Provides: gnome-core
 
 # Make sure to update libgnome schema when changing this
 Requires: constantine-backgrounds
-Requires: constantine-backgrounds-extras
 
 BuildRequires: gnome-common
 BuildRequires: libxml2-devel >= %{libxml2_version}
@@ -76,6 +75,8 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
+%patch2 -p1 -b .slideshow-api
+%patch3 -p1 -b .more-slideshow-api
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -123,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-4
+- Drop constantine-backgrounds-extras, too big
+
 * Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-3
 - Require constantine-backgrounds
 



From mclasen at fedoraproject.org  Fri Aug 14 19:51:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 19:51:01 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.221,1.222
Message-ID: <20090814195101.EF7E411C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32161

Modified Files:
	gnome-desktop.spec 
Log Message:
fix spec



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- gnome-desktop.spec	14 Aug 2009 19:45:21 -0000	1.221
+++ gnome-desktop.spec	14 Aug 2009 19:51:01 -0000	1.222
@@ -75,8 +75,6 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
-%patch2 -p1 -b .slideshow-api
-%patch3 -p1 -b .more-slideshow-api
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \



From mclasen at fedoraproject.org  Fri Aug 14 19:57:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 19:57:25 +0000 (UTC)
Subject: rpms/cheese/devel fix-schemas.patch,NONE,1.1 cheese.spec,1.58,1.59
Message-ID: <20090814195725.399E311C00D0@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv952

Modified Files:
	cheese.spec 
Added Files:
	fix-schemas.patch 
Log Message:
fix schemas file


fix-schemas.patch:
 cheese.schemas.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE fix-schemas.patch ---
diff -up cheese-2.27.90/data/cheese.schemas.in.fix-schemas cheese-2.27.90/data/cheese.schemas.in
--- cheese-2.27.90/data/cheese.schemas.in.fix-schemas	2009-08-14 15:54:43.643811926 -0400
+++ cheese-2.27.90/data/cheese.schemas.in	2009-08-14 15:54:48.860844990 -0400
@@ -148,6 +148,7 @@
       </locale>
     </schema>
 
+    <schema>
       <key>/schemas/apps/cheese/wide_mode</key>
       <applyto>/apps/cheese/wide_mode</applyto>
       <owner>cheese</owner>


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- cheese.spec	11 Aug 2009 04:52:23 -0000	1.58
+++ cheese.spec	14 Aug 2009 19:57:24 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           cheese
 Version:        2.27.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
@@ -34,13 +34,16 @@ Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
 
+#
+Patch0: fix-schemas.patch
+
 %description
 Cheese is a Photobooth-inspired GNOME application for taking pictures and
 videos from a webcam. It can also apply fancy graphical effects.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .fix-schemas
 
 %build
 %configure
@@ -123,6 +126,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.90-2
+- Fix schemas file syntax
+
 * Tue Aug 11 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.90-1
 - Update to 2.27.90
 



From chitlesh at fedoraproject.org  Fri Aug 14 20:06:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 14 Aug 2009 20:06:12 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.82,1.83
Message-ID: <20090814200612.0C45011C00D0@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3512

Modified Files:
	comps-f12.xml.in 
Log Message:
added FEL related packages in FEL's group


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- comps-f12.xml.in	14 Aug 2009 18:07:39 -0000	1.82
+++ comps-f12.xml.in	14 Aug 2009 20:06:11 -0000	1.83
@@ -1379,7 +1379,9 @@
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
+      <packagereq type="default">eclipse-eclox</packagereq>
       <packagereq type="default">electric</packagereq>
+      <packagereq type="default">espresso-ab</packagereq>
       <packagereq type="default">gds2pov</packagereq>
       <packagereq type="default">geda-docs</packagereq>
       <packagereq type="default">geda-examples</packagereq>
@@ -1392,6 +1394,7 @@
       <packagereq type="default">gerbv</packagereq>
       <packagereq type="default">ghdl</packagereq>
       <packagereq type="default">gnucap</packagereq>
+      <packagereq type="default">gnuradio</packagereq>
       <packagereq type="default">gnusim8085</packagereq>
       <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gsim85</packagereq>
@@ -1406,10 +1409,11 @@
       <packagereq type="default">LabPlot</packagereq>
       <packagereq type="default">linsmith</packagereq>
       <packagereq type="default">magic</packagereq>
+      <packagereq type="default">magic-doc</packagereq>
       <packagereq type="default">mcu8051ide</packagereq>
       <packagereq type="default">netgen</packagereq>
       <packagereq type="default">ngspice</packagereq>
-      <packagereq type="default">octave-forge</packagereq>
+      <packagereq type="default">ngspice-doc</packagereq>
       <packagereq type="default">pcb</packagereq>
       <packagereq type="default">perl-Hardware-Verilog-Parser</packagereq>
       <packagereq type="default">perl-Hardware-Vhdl-Lexer</packagereq>
@@ -1434,10 +1438,14 @@
       <packagereq type="default">qucs</packagereq>
       <packagereq type="default">sdcc</packagereq>
       <packagereq type="default">sk2py</packagereq>
+      <packagereq type="default">tclspice</packagereq>
       <packagereq type="default">tetex-IEEEtran</packagereq>
       <packagereq type="default">tkcvs</packagereq>
+      <packagereq type="default">tkgate</packagereq>
       <packagereq type="default">toped</packagereq>
       <packagereq type="default">uisp</packagereq>
+      <packagereq type="default">usrp</packagereq>
+      <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
       <packagereq type="default">vym</packagereq>
       <packagereq type="default">xcircuit</packagereq>
@@ -1448,6 +1456,7 @@
       <packagereq type="optional">freehdl</packagereq>
       <packagereq type="optional">kdesvn</packagereq>
       <packagereq type="optional">minicom</packagereq>
+      <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">planner</packagereq>
       <packagereq type="optional">qemu</packagereq>
       <packagereq type="optional">rfdump</packagereq>



From jcollie at fedoraproject.org  Fri Aug 14 20:11:43 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 14 Aug 2009 20:11:43 +0000 (UTC)
Subject: rpms/pitivi/F-11 pitivi.spec,1.37,1.38
Message-ID: <20090814201143.B551311C00D0@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4588

Modified Files:
	pitivi.spec 
Log Message:
* Thu Aug 13 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-1
- Update to 0.13.2 "Jailbreak (out of Deadlock City)"
- 
- The PiTiVi team is proud to announce the second release in the
- unstable 0.13 PiTiVi series.
- 
- Due to its dependency on GStreamer, The PiTiVi team strongly
- recommends users have all official latest gstreamer libraries and
- plugins installed for the best user experience.
- 
- Features of this release
- 
-    * Undo/Redo support
-    * Audio mixing
-    * Ripple/Roll edit
-    * misc fixes everywhere 



Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/pitivi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- pitivi.spec	13 Aug 2009 18:30:40 -0000	1.37
+++ pitivi.spec	14 Aug 2009 20:11:43 -0000	1.38
@@ -13,22 +13,22 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 
 Requires:       gnonlin >= 0.10.12
-Requires:       gstreamer-python >= 0.10.15
+Requires:       gstreamer-python >= 0.10.16
 Requires:       gstreamer >= 0.10.24
-Requires:       gstreamer-plugins-base
-Requires:       pygtk2 >= 2.12.0
+Requires:       gstreamer-plugins-base >= 0.10.24
+Requires:       pygtk2 >= 2.14.0
 Requires:       python-zope-interface
 Requires:       python-setuptools
 Requires:       pygoocanvas
 
 BuildRequires:  gnonlin >= 0.10.12
-BuildRequires:  gstreamer-python >= 0.10.15
+BuildRequires:  gstreamer-python >= 0.10.16
 BuildRequires:  gstreamer-devel >= 0.10.24
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
 BuildRequires:  GConf2-devel
 BuildRequires:  gtk2-devel >= 2.8
-BuildRequires:  pygtk2-devel >= 2.12.0
-BuildRequires:  pygtk2-libglade >= 2.12.0
+BuildRequires:  pygtk2-devel >= 2.14.0
+BuildRequires:  pygtk2-libglade >= 2.14.0
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils



From jcollie at fedoraproject.org  Fri Aug 14 20:12:53 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 14 Aug 2009 20:12:53 +0000 (UTC)
Subject: rpms/pitivi/F-11 pitivi.spec,1.38,1.39
Message-ID: <20090814201253.B712E11C00D0@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4882

Modified Files:
	pitivi.spec 
Log Message:
* Fri Aug 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-2
- Bump required version of gstreamer-python



Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/pitivi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- pitivi.spec	14 Aug 2009 20:11:43 -0000	1.38
+++ pitivi.spec	14 Aug 2009 20:12:53 -0000	1.39
@@ -2,7 +2,7 @@
 %define minor   2
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Fri Aug 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-2
+- Bump required version of gstreamer-python
+
 * Thu Aug 13 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-1
 - Update to 0.13.2 "Jailbreak (out of Deadlock City)"
 - 



From orion at fedoraproject.org  Fri Aug 14 20:19:51 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 14 Aug 2009 20:19:51 +0000 (UTC)
Subject: devel/elinks elinks.spec,1.76,1.77
Message-ID: <20090814201951.6FB8411C00D0@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/devel/elinks
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6242

Modified Files:
	elinks.spec 
Log Message:
* Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 0.12-0.19.pre5
- Add Requires(post/postun): coreutils for readlink



Index: elinks.spec
===================================================================
RCS file: /cvs/pkgs/devel/elinks/elinks.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- elinks.spec	24 Jul 2009 22:00:37 -0000	1.76
+++ elinks.spec	14 Aug 2009 20:19:51 -0000	1.77
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.18.pre5%{?dist}
+Release:   0.19.pre5%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -19,7 +19,9 @@ BuildRequires: nss-devel
 BuildRequires: pkgconfig
 Requires: zlib >= 1.2.0.2
 Requires(preun): %{_sbindir}/alternatives
+Requires(post): coreutils
 Requires(post): %{_sbindir}/alternatives
+Requires(postun): coreutils
 Requires(postun): %{_sbindir}/alternatives
 Provides:  webclient
 Obsoletes: links < 1:0.97
@@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 0.12-0.19.pre5
+- Add Requires(post/postun): coreutils for readlink
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-0.18.pre5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Aug 14 20:24:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 14 Aug 2009 20:24:05 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-10 dead.package, NONE, 1.1 .cvsignore, 1.1,
	NONE PolicyKit-kde.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <20090814202405.C43F711C00D0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PolicyKit-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7252/F-10

Added Files:
	dead.package 
Removed Files:
	.cvsignore PolicyKit-kde.spec sources 
Log Message:
Obsoleted by kdebase-workspace >= 4.2.85



--- NEW FILE dead.package ---
Obsoleted by kdebase-workspace >= 4.2.85


--- .cvsignore DELETED ---


--- PolicyKit-kde.spec DELETED ---


--- sources DELETED ---



From rdieter at fedoraproject.org  Fri Aug 14 20:24:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 14 Aug 2009 20:24:06 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-11 dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE PolicyKit-kde.spec, 1.8,
	NONE kdebase-workspace-4.2.90-PolicyKit_standalone.patch, 1.1,
	NONE sources, 1.4, NONE
Message-ID: <20090814202406.1ABB811C02C2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PolicyKit-kde/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7252/F-11

Added Files:
	dead.package 
Removed Files:
	.cvsignore PolicyKit-kde.spec 
	kdebase-workspace-4.2.90-PolicyKit_standalone.patch sources 
Log Message:
Obsoleted by kdebase-workspace >= 4.2.85



--- NEW FILE dead.package ---
Obsoleted by kdebase-workspace >= 4.2.85


--- .cvsignore DELETED ---


--- PolicyKit-kde.spec DELETED ---


--- kdebase-workspace-4.2.90-PolicyKit_standalone.patch DELETED ---


--- sources DELETED ---



From rdieter at fedoraproject.org  Fri Aug 14 20:25:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 14 Aug 2009 20:25:31 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.263,1.264
Message-ID: <20090814202531.7116511C00D0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7543

Modified Files:
	kdebase-workspace.spec 
Log Message:
clarify Obsoletes: PolicyKit-kde versioning



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- kdebase-workspace.spec	7 Aug 2009 16:29:26 -0000	1.263
+++ kdebase-workspace.spec	14 Aug 2009 20:25:31 -0000	1.264
@@ -36,7 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < %{version}-100 
+Obsoletes: PolicyKit-kde < 4.3.0-100 
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under



From orion at fedoraproject.org  Fri Aug 14 20:29:28 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 14 Aug 2009 20:29:28 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.185,1.186
Message-ID: <20090814202928.5B2B511C00D0@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8411

Modified Files:
	net-snmp.spec 
Log Message:
* Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 1:5.4.2.1-15
- Prevent post script failure on fresh installs



Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- net-snmp.spec	25 Jul 2009 17:59:37 -0000	1.185
+++ net-snmp.spec	14 Aug 2009 20:29:28 -0000	1.186
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -331,7 +331,7 @@ dd bs=1024 count=250 if=ChangeLog of=Cha
 /sbin/chkconfig --add snmptrapd
 
 # move local state files from /var/net-snmp to new location when updating the package
-mv %{_localstatedir}/net-snmp/* %{_localstatedir}/lib/net-snmp/ &>/dev/null
+mv %{_localstatedir}/net-snmp/* %{_localstatedir}/lib/net-snmp/ &>/dev/null || :
 
 %preun
 if [ $1 = 0 ]; then
@@ -429,6 +429,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
+* Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 1:5.4.2.1-15
+- Prevent post script failure on fresh installs
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.4.2.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From firewing at fedoraproject.org  Fri Aug 14 21:09:35 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 21:09:35 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-10 .cvsignore, 1.8,
	1.9 audio-convert-mod.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20090814210935.43EDB11C00D0@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17726/F-10

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
- Update to 3.46.0a (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Aug 2009 17:24:49 -0000	1.8
+++ .cvsignore	14 Aug 2009 21:09:34 -0000	1.9
@@ -1 +1 @@
-audio-convert-mod-3.46.0.tar.bz2
+audio-convert-mod-3.46.0a.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/audio-convert-mod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- audio-convert-mod.spec	7 Aug 2009 17:24:50 -0000	1.10
+++ audio-convert-mod.spec	14 Aug 2009 21:09:34 -0000	1.11
@@ -1,5 +1,5 @@
 Name:              audio-convert-mod
-Version:           3.46.0
+Version:           3.46.0a
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
+- Update to 3.46.0a (see ChangeLog for details on version changes)
+
 * Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
 - Update to 3.46.0 (see ChangeLog for details on version changes)
 - Update Source0 URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Aug 2009 17:24:50 -0000	1.8
+++ sources	14 Aug 2009 21:09:34 -0000	1.9
@@ -1 +1 @@
-72c818e6840bb6a459b37ffe3140d888  audio-convert-mod-3.46.0.tar.bz2
+ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2



From firewing at fedoraproject.org  Fri Aug 14 21:09:35 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 21:09:35 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-11 .cvsignore, 1.8,
	1.9 audio-convert-mod.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <20090814210935.758AB11C02C2@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17726/F-11

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
- Update to 3.46.0a (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Aug 2009 17:24:50 -0000	1.8
+++ .cvsignore	14 Aug 2009 21:09:35 -0000	1.9
@@ -1 +1 @@
-audio-convert-mod-3.46.0.tar.bz2
+audio-convert-mod-3.46.0a.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-11/audio-convert-mod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- audio-convert-mod.spec	7 Aug 2009 17:24:50 -0000	1.12
+++ audio-convert-mod.spec	14 Aug 2009 21:09:35 -0000	1.13
@@ -1,5 +1,5 @@
 Name:              audio-convert-mod
-Version:           3.46.0
+Version:           3.46.0a
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
+- Update to 3.46.0a (see ChangeLog for details on version changes)
+
 * Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
 - Update to 3.46.0 (see ChangeLog for details on version changes)
 - Update Source0 URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Aug 2009 17:24:50 -0000	1.8
+++ sources	14 Aug 2009 21:09:35 -0000	1.9
@@ -1 +1 @@
-72c818e6840bb6a459b37ffe3140d888  audio-convert-mod-3.46.0.tar.bz2
+ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2



From firewing at fedoraproject.org  Fri Aug 14 21:09:35 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Fri, 14 Aug 2009 21:09:35 +0000 (UTC)
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.8,
	1.9 audio-convert-mod.spec, 1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20090814210935.C53A211C00D0@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17726/devel

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
- Update to 3.46.0a (see ChangeLog for details on version changes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Aug 2009 17:24:50 -0000	1.8
+++ .cvsignore	14 Aug 2009 21:09:35 -0000	1.9
@@ -1 +1 @@
-audio-convert-mod-3.46.0.tar.bz2
+audio-convert-mod-3.46.0a.tar.bz2


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- audio-convert-mod.spec	7 Aug 2009 17:24:50 -0000	1.13
+++ audio-convert-mod.spec	14 Aug 2009 21:09:35 -0000	1.14
@@ -1,5 +1,5 @@
 Name:              audio-convert-mod
-Version:           3.46.0
+Version:           3.46.0a
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1
+- Update to 3.46.0a (see ChangeLog for details on version changes)
+
 * Fri Aug 7 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0-1
 - Update to 3.46.0 (see ChangeLog for details on version changes)
 - Update Source0 URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Aug 2009 17:24:50 -0000	1.8
+++ sources	14 Aug 2009 21:09:35 -0000	1.9
@@ -1 +1 @@
-72c818e6840bb6a459b37ffe3140d888  audio-convert-mod-3.46.0.tar.bz2
+ddac31ef193852474be9420821b6001d  audio-convert-mod-3.46.0a.tar.bz2



From devrim at fedoraproject.org  Fri Aug 14 21:11:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 14 Aug 2009 21:11:23 +0000 (UTC)
Subject: rpms/python-psycopg2/F-10 .cvsignore, 1.9, 1.10 python-psycopg2.spec,
	1.20, 1.21 sources, 1.9, 1.10
Message-ID: <20090814211123.6F0C911C00D0@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-serv18272/F-10

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/.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	14 Aug 2009 21:11:23 -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.12.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/python-psycopg2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-psycopg2.spec	19 May 2009 19:35:49 -0000	1.20
+++ python-psycopg2.spec	14 Aug 2009 21:11:23 -0000	1.21
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.11
+Version:	2.0.12
 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
+* Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
+- Update to 2.0.12
+
 * 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/F-10/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	14 Aug 2009 21:11:23 -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
+5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz



From devrim at fedoraproject.org  Fri Aug 14 21:11:23 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri, 14 Aug 2009 21:11:23 +0000 (UTC)
Subject: rpms/python-psycopg2/F-11 .cvsignore, 1.9, 1.10 python-psycopg2.spec,
	1.25, 1.26 sources, 1.9, 1.10
Message-ID: <20090814211123.A873C11C00D0@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-serv18272/F-11

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:
Update to 2.0.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/.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	14 Aug 2009 21:11:23 -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.12.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/python-psycopg2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- python-psycopg2.spec	19 May 2009 19:35:49 -0000	1.25
+++ python-psycopg2.spec	14 Aug 2009 21:11:23 -0000	1.26
@@ -7,8 +7,8 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.11
-Release:	2%{?dist}
+Version:	2.0.12
+Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
 License:	GPLv2+ with exceptions
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
+- Update to 2.0.12
+
 * 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/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 May 2009 19:23:33 -0000	1.9
+++ sources	14 Aug 2009 21:11:23 -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
+5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz



From ausil at fedoraproject.org  Fri Aug 14 21:11:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 14 Aug 2009 21:11:24 +0000 (UTC)
Subject: rpms/silo/devel silo-1.4.14-__sprintf_chk.patch, NONE,
	1.1 silo-1.4.14-gcc43.patch, NONE,
	1.1 silo-1.4.14-kernelheaders.patch, NONE,
	1.1 silo-1.4.14-preventoverlap.patch, NONE, 1.1 silo.spec, 1.4,
	1.5 sources, 1.2, 1.3 silo-1.2.4-ext3.patch, 1.1,
	NONE silo-1.4.13-localheaders.patch, 1.1,
	NONE silo-1.4.13-modernkernheaders.patch, 1.1,
	NONE silo-big-kernel.patch, 1.1, NONE silo_degraded_raid1.patch,
	1.1, NONE
Message-ID: <20090814211124.2E95711C00D0@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/silo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18316

Modified Files:
	silo.spec sources 
Added Files:
	silo-1.4.14-__sprintf_chk.patch silo-1.4.14-gcc43.patch 
	silo-1.4.14-kernelheaders.patch 
	silo-1.4.14-preventoverlap.patch 
Removed Files:
	silo-1.2.4-ext3.patch silo-1.4.13-localheaders.patch 
	silo-1.4.13-modernkernheaders.patch silo-big-kernel.patch 
	silo_degraded_raid1.patch 
Log Message:
update silo in devel tomatch F-9


silo-1.4.14-__sprintf_chk.patch:
 common/printf.c     |    5 +++++
 include/stringops.h |    3 +++
 2 files changed, 8 insertions(+)

--- NEW FILE silo-1.4.14-__sprintf_chk.patch ---
diff -up silo-1.4.14/common/printf.c.BAD silo-1.4.14/common/printf.c
--- silo-1.4.14/common/printf.c.BAD	2008-10-15 08:58:01.000000000 -0500
+++ silo-1.4.14/common/printf.c	2008-10-15 08:59:34.000000000 -0500
@@ -236,3 +236,8 @@ int sprintf (char *s, char *format, ...)
 
     return done;
 }
+
+int __sprintf_chk (char *s, int flag, size_t slen, const char *format, ...)
+{
+    return sprintf(s, format);
+}
diff -up silo-1.4.14/include/stringops.h.BAD silo-1.4.14/include/stringops.h
--- silo-1.4.14/include/stringops.h.BAD	2008-10-15 09:05:38.000000000 -0500
+++ silo-1.4.14/include/stringops.h	2008-10-15 09:06:08.000000000 -0500
@@ -32,4 +32,7 @@ int strncasecmp(const char *, const char
 char *strstr(const char *, const char *);
 int memcmp(const void *, const void *, size_t);
 
+/* This isn't really a string op, but we need to put it here for size_t. */
+int __sprintf_chk (char *s, int flag, size_t slen, const char *format, ...);
+
 #endif /* __STRINGOPS_H */

silo-1.4.14-gcc43.patch:
 common/printf.c |   89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/silo.h  |    2 +
 second/Makefile |    8 ++---
 3 files changed, 95 insertions(+), 4 deletions(-)

--- NEW FILE silo-1.4.14-gcc43.patch ---
diff -up silo-1.4.14/common/printf.c.BAD silo-1.4.14/common/printf.c
--- silo-1.4.14/common/printf.c.BAD	2008-10-14 10:55:39.000000000 -0500
+++ silo-1.4.14/common/printf.c	2008-10-14 10:56:47.000000000 -0500
@@ -21,6 +21,7 @@
    USA.  */
 
 #include "promlib.h"
+#include <stringops.h>
 
 /*
  * This part is rewritten by Igor Timkin <ivt at msu.su>. Than I
@@ -147,3 +148,91 @@ void prom_printf (char *fmt,...)
     vprintf (fmt, x1);
     va_end (x1);
 }
+
+static int sprintn (char *str, long long n, int b)
+{
+    static char prbuf[33];
+    register char *cp;
+    int count = 0;
+
+    if (b == 10 && n < 0) {
+       memset (str + count, '-', 1);
+       count++;
+       n = -n;
+    }
+    cp = prbuf;
+    do
+       *cp++ = "0123456789ABCDEF"[(unsigned int) (((unsigned long)n) % b)];
+    while ((n = ((unsigned long long)n) / b & 0x0FFFFFFFFFFFFFFFULL));
+    do {
+       memset (str + count, *--cp, 1);
+       count++;
+    } while (cp > prbuf);
+
+    return count;
+}
+
+int vsprintf (char *str, char *fmt, va_list adx)
+{
+    register int c;
+    char *s;
+    int count = 0;
+
+    for (;;) {
+       while ((c = *fmt++) != '%') {
+           memset (str + count, c, 1);
+           if (c == '\0') {
+               return count;
+           }
+       }
+       c = *fmt++;
+       if (c == 'd' || c == 'o' || c == 'x' || c == 'X') {
+           count += sprintn (str + count, (long long) va_arg (adx, unsigned),
+                            c == 'o' ? 8 : (c == 'd' ? 10 : 16));
+       } else if (c == 'c') {
+           memset (str + count, va_arg (adx, unsigned), 1);
+           count++;
+       } else if (c == 's') {
+           if ((s = va_arg (adx, char *)) == NULL)
+               s = (char *)"(null)";
+           while ((c = *s++)) {
+               memset (str + count, c, 1);
+               count++;
+           }
+       } else if (c == 'l' || c == 'O') {
+           count += sprintn (str + count, (long long) va_arg (adx, long), c == 'l' ? 10 : 8);
+       } else if (c == 'L') {
+           int hex = 0;
+           if (*fmt == 'x') {
+               fmt++;
+               hex = 1;
+           }
+           count += sprintn (str + count, (long long) va_arg (adx, long long), hex ? 16 : 10);
+       } else {
+           /* This is basically what libc's printf does */
+           memset (str + count, '%', 1);
+           count++;
+           memset (str + count, c, 1);
+           count++;
+       }
+    }
+
+    return count;
+}
+
+/*
+ * Scaled down version of C Library sprintf.
+ * Only %c %s %d (==%u) %o %x %X %l %O are recognized.
+ */
+
+int sprintf (char *s, char *format, ...)
+{
+    va_list arg;
+    int done;
+
+    va_start (arg, format);
+    done = vsprintf (s, format, arg);
+    va_end (arg);
+
+    return done;
+}
diff -up silo-1.4.14/include/silo.h.BAD silo-1.4.14/include/silo.h
--- silo-1.4.14/include/silo.h.BAD	2008-10-14 10:56:52.000000000 -0500
+++ silo-1.4.14/include/silo.h	2008-10-14 10:57:15.000000000 -0500
@@ -87,6 +87,8 @@ int silo_disk_partitionable(void);
 void silo_disk_close(void);
 /* printf.c */
 int vprintf (char *, va_list);
+int vsprintf (char *str, char *fmt, va_list adx);
+int sprintf (char *s, char *format, ...);
 int putchar (int);
 /* malloc.c */
 void *malloc (int);
diff -up silo-1.4.14/second/Makefile.BAD silo-1.4.14/second/Makefile
--- silo-1.4.14/second/Makefile.BAD	2008-10-14 10:57:20.000000000 -0500
+++ silo-1.4.14/second/Makefile	2008-10-14 10:58:08.000000000 -0500
@@ -58,13 +58,13 @@ fs/libfs.a: $(FS_OBJS)
 	$(AR) rc $@ $(FS_OBJS)
 
 second: $(OBJS) mark.o
-	$(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o
-	$(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o
+	$(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
+	$(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
 	$(NM) second | grep -v '*ABS*' | sort > second.map
 
 silotftp: $(OBJSNET) mark.o
-	$(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o
-	$(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o
+	$(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
+	$(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o `$(CC) -print-libgcc-file-name`
 	$(NM) silotftp | grep -v '*ABS*' | sort > silotftp.map
 
 second.l: second

silo-1.4.14-kernelheaders.patch:
 include/ext2fs/ext2fs.h |    2 +-
 second/main.c           |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE silo-1.4.14-kernelheaders.patch ---
diff -up silo-1.4.14/include/ext2fs/ext2fs.h.BAD silo-1.4.14/include/ext2fs/ext2fs.h
--- silo-1.4.14/include/ext2fs/ext2fs.h.BAD	2008-10-14 10:53:52.000000000 -0500
+++ silo-1.4.14/include/ext2fs/ext2fs.h	2008-10-14 10:54:08.000000000 -0500
@@ -39,7 +39,7 @@ extern "C" {
  */
 #define EXT2_LIB_CURRENT_REV	0
 
-#ifdef HAVE_SYS_TYPES_H
+#if defined(HAVE_SYS_TYPES_H) && !defined(_LINUX_TYPES_H)
 #include <sys/types.h>
 #endif
 
diff -up silo-1.4.14/second/main.c.BAD silo-1.4.14/second/main.c
--- silo-1.4.14/second/main.c.BAD	2008-10-14 10:54:17.000000000 -0500
+++ silo-1.4.14/second/main.c	2008-10-14 10:54:38.000000000 -0500
@@ -25,8 +25,7 @@
 /* TODO: This file is a good candidate for rewrite from scratch.  */
 
 #include <silo.h>
-#include <asm/page.h>
-#include <linux/elf.h>
+#include <elf.h>
 #include <stringops.h>
 
 #ifndef NULL

silo-1.4.14-preventoverlap.patch:
 memory.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE silo-1.4.14-preventoverlap.patch ---
diff -up silo-1.4.14/second/memory.c.BAD silo-1.4.14/second/memory.c
--- silo-1.4.14/second/memory.c.BAD	2008-10-14 10:59:02.000000000 -0500
+++ silo-1.4.14/second/memory.c	2008-10-14 11:00:36.000000000 -0500
@@ -330,8 +330,13 @@ static char *sun4u_memory_find (unsigned
 			continue;
 
 		if (p[i].size >= len) {
-			phys = p[i].phys;
-			break;
+			if (is_kernel) {
+				phys = p[i].phys;
+				break;
+			} else if (p[i].phys > phys) {
+				phys = p[i].phys;
+				continue;
+			}
 		}
 	}
 


Index: silo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/silo/devel/silo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- silo.spec	27 Jul 2009 04:19:54 -0000	1.4
+++ silo.spec	14 Aug 2009 21:11:24 -0000	1.5
@@ -1,9 +1,9 @@
 Summary: The SILO boot loader for SPARCs
 Name: silo
-Version: 1.4.13
-Release: 10%{?dist}
+Version: 1.4.14
+Release: 1%{?dist}
 License: GPLv2+
-ExclusiveArch: sparcv9
+ExclusiveArch: sparcv9 sparc
 Group: System Environment/Base
 URL:    http://www.sparc-boot.org
 Source: http://www.sparc-boot.org/pub/silo/silo-%{version}.tar.bz2
@@ -11,11 +11,10 @@ BuildRequires: elftoaout e2fsprogs-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: silo-1.2.4-ext3.patch
-Patch2: silo-1.4.13-modernkernheaders.patch
-Patch3: silo_degraded_raid1.patch
-Patch4: silo-big-kernel.patch
-Patch5: silo-1.4.13-localheaders.patch
+Patch0: silo-1.4.14-kernelheaders.patch
+Patch1: silo-1.4.14-gcc43.patch
+Patch2: silo-1.4.14-__sprintf_chk.patch
+Patch3: silo-1.4.14-preventoverlap.patch
 
 %description
 The silo package installs the SILO (Sparc Improved LOader) boot
@@ -25,11 +24,10 @@ Linux, Solaris and SunOS.
 
 %prep 
 %setup -q -n silo-%{version}
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 make %{?_smp_mflags}
@@ -67,6 +65,12 @@ echo "You probably want to run /sbin/sil
 %{_mandir}/man8/silo.8*
  
 %changelog
+* Fri Aug 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.14-1
+- update to 1.4.14
+- pick up kernelheaders and gcc43 patches from gentoo
+- fix issue with __sprintf_chk in e2fsprogs
+- add patch from Peter to prevent overlap issues btw kernel and initrd
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.13-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/silo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Oct 2007 03:01:40 -0000	1.2
+++ sources	14 Aug 2009 21:11:24 -0000	1.3
@@ -1 +1 @@
-7039aabf3c1b3858ae8d0ccdde21343e  silo-1.4.13.tar.bz2
+168182dfa0025914ceecac9591a6674c  silo-1.4.14.tar.bz2


--- silo-1.2.4-ext3.patch DELETED ---


--- silo-1.4.13-localheaders.patch DELETED ---


--- silo-1.4.13-modernkernheaders.patch DELETED ---


--- silo-big-kernel.patch DELETED ---


--- silo_degraded_raid1.patch DELETED ---



From mbarnes at fedoraproject.org  Fri Aug 14 21:55:02 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 14 Aug 2009 21:55:02 +0000 (UTC)
Subject: rpms/evolution/devel
	evolution-2.27.90-fix-libevolution-cal-shared.patch, NONE,
	1.1 evolution.spec, 1.412, 1.413
Message-ID: <20090814215502.81A0711C00D0@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27800

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.27.90-fix-libevolution-cal-shared.patch 
Log Message:

* Fri Aug 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-3.fc12
- Add patch for GNOME bug #591414 (calendar library linked as module).


evolution-2.27.90-fix-libevolution-cal-shared.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-2.27.90-fix-libevolution-cal-shared.patch ---
diff -up evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.am
--- evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared	2009-08-14 17:47:01.000000000 -0400
+++ evolution-2.27.90/calendar/gui/Makefile.am	2009-08-14 17:47:14.000000000 -0400
@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD =					
 	$(CAMEL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED)
 
 
 libevolution_calendar_la_LIBADD =					\
diff -up evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.in
--- evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared	2009-08-14 17:47:21.000000000 -0400
+++ evolution-2.27.90/calendar/gui/Makefile.in	2009-08-14 17:47:34.000000000 -0400
@@ -730,7 +730,7 @@ libevolution_cal_shared_la_LIBADD = \
 	$(CAMEL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED)
 libevolution_calendar_la_LIBADD = \
 	$(top_builddir)/calendar/gui/libevolution-cal-shared.la		\
 	$(WIN32_BOOTSTRAP_LIBS)						\


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- evolution.spec	11 Aug 2009 10:16:20 -0000	1.412
+++ evolution.spec	14 Aug 2009 21:55:02 -0000	1.413
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.27.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -66,6 +66,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# GNOME bug #591414
+Patch13: evolution-2.27.90-fix-libevolution-cal-shared.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 .fix-libevolution-cal-shared
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -479,6 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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-cal-shared.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.*
@@ -695,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-3.fc12
+- Add patch for GNOME bug #591414 (calendar library linked as module).
+
 * Tue Aug 11 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-2.fc12
 - Build requires gnome-desktop-devel >= 2.26
 - New library libevolution-cal-shared.so



From snirkel at fedoraproject.org  Fri Aug 14 21:55:46 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Fri, 14 Aug 2009 21:55:46 +0000 (UTC)
Subject: rpms/libmtp/F-11 newdevices.patch,NONE,1.1 libmtp.spec,1.33,1.34
Message-ID: <20090814215546.A858311C00D0@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28030

Modified Files:
	libmtp.spec 
Added Files:
	newdevices.patch 
Log Message:
Update the device database with a patch.


newdevices.patch:
 device-flags.h  |   39 ++++++++++
 music-players.h |  202 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 200 insertions(+), 41 deletions(-)

--- NEW FILE newdevices.patch ---
diff -ur libmtp-0.3.7-orig/src/device-flags.h libmtp-0.3.7/src/device-flags.h
--- libmtp-0.3.7-orig/src/device-flags.h	2009-08-14 23:50:17.738560431 +0200
+++ libmtp-0.3.7/src/device-flags.h	2009-08-14 23:50:38.622622232 +0200
@@ -206,3 +206,42 @@
  * level.
  */
 #define DEVICE_FLAG_BROKEN_BATTERY_LEVEL 0x00010000
+
+/**
+ * Devices that send "ObjectDeleted" events after deletion
+ * of images. (libgphoto2) 
+ */ 
+#define DEVICE_FLAG_DELETE_SENDS_EVENT	0x00020000
+
+/**
+ * Cameras that can capture images. (libgphoto2)
+ */ 
+#define DEVICE_FLAG_CAPTURE		0x00040000
+
+/**
+ * Cameras that can capture images. (libgphoto2)
+ */ 
+#define DEVICE_FLAG_CAPTURE_PREVIEW	0x00080000
+
+/**
+ * Nikon broken capture support without proper ObjectAdded events.
+ * (libgphoto2)
+ */ 
+#define DEVICE_FLAG_NIKON_BROKEN_CAPTURE	0x00100000
+
+/**
+ * Broken capture support where cameras do not send CaptureComplete events.
+ * (libgphoto2)
+ */ 
+#define DEVICE_FLAG_NO_CAPTURE_COMPLETE		0x00400000
+
+/**
+ * Direct PTP match required.
+ * (libgphoto2)
+ */ 
+#define DEVICE_FLAG_MATCH_PTP_INTERFACE		0x00800000
+/**
+ * This flag is like DEVICE_FLAG_OGG_IS_UNKNOWN but for FLAC
+ * files instead. Using the unknown filetype for FLAC files.
+ */
+#define DEVICE_FLAG_FLAC_IS_UNKNOWN 0x01000000
diff -ur libmtp-0.3.7-orig/src/music-players.h libmtp-0.3.7/src/music-players.h
--- libmtp-0.3.7-orig/src/music-players.h	2009-08-14 23:50:17.739561611 +0200
+++ libmtp-0.3.7/src/music-players.h	2009-08-14 23:50:42.660580451 +0200
@@ -31,6 +31,8 @@
 /*
  * MTP device list, trying real bad to get all devices into
  * this list by stealing from everyone I know.
+ * Some devices taken from the Rockbox device listing:
+ * http://www.rockbox.org/twiki/bin/view/Main/DeviceDetection
  */
 
   /*
@@ -60,20 +62,27 @@
   // This version of the Vision:M needs the no release interface flag,
   // unclear whether the other version above need it too or not.
   { "Creative", 0x041e, "ZEN Vision:M (DVP-HD0004)", 0x4151, 
-      DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL},
+      DEVICE_FLAG_NO_RELEASE_INTERFACE |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL},
   // Reported by Darel on the XNJB forums
-  { "Creative", 0x041e, "ZEN V Plus", 0x4152, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
-  { "Creative", 0x041e, "ZEN Vision W", 0x4153, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Creative", 0x041e, "ZEN V Plus", 0x4152,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Creative", 0x041e, "ZEN Vision W", 0x4153,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Don't add 0x4155: this is a Zen Stone device which is not MTP
   // Reported by Paul Kurczaba <paul at kurczaba.com>
   { "Creative", 0x041e, "ZEN", 0x4157, DEVICE_FLAG_IGNORE_HEADER_ERRORS |
-    DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+    DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Reported by Ringofan <mcroman at users.sourceforge.net>
-  { "Creative", 0x041e, "ZEN V 2GB", 0x4158, DEVICE_FLAG_NONE },
+  { "Creative", 0x041e, "ZEN V 2GB", 0x4158,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Reported by j norment <stormzen at gmail.com>
-  { "Creative", 0x041e, "ZEN Mozaic", 0x4161, DEVICE_FLAG_NONE },
+  { "Creative", 0x041e, "ZEN Mozaic", 0x4161,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Reported by Aaron F. Gonzalez <sub_tex at users.sourceforge.net>
-  { "Creative", 0x041e, "ZEN X-Fi", 0x4162, DEVICE_FLAG_NONE },
+  { "Creative", 0x041e, "ZEN X-Fi", 0x4162,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
 
   /*
    * Samsung
@@ -107,49 +116,75 @@
   { "Samsung", 0x04e8, "YP-Z5", 0x503c, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // Don't add 0x5041 as this is YP-Z5 in USB mode
   // Contributed by anonymous person on SourceForge
-  { "Samsung", 0x04e8, "YP-T7J", 0x5047, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "YP-T7J", 0x5047, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by cstrickler at gmail.com
   { "Samsung", 0x04e8, "YP-U2J (YP-U2JXB/XAA)", 0x5054, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Andrew Benson
   { "Samsung", 0x04e8, "YP-F2J", 0x5057, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Patrick <skibler at gmail.com>
   // Just guessing but looks like .spl v1 http://www.anythingbutipod.com/forum/showthread.php?t=14160
-  { "Samsung", 0x04e8, "YP-K5", 0x505a, DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-K5", 0x505a, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From dev.local at gmail.com - 0x4e8/0x507c is the UMS mode, apparently
   // do not add that device.
   // From m.eik michalke
   // This device does NOT use the special SPL playlist according to sypqgjxu at gmx.de.
-  { "Samsung", 0x04e8, "YP-U3", 0x507d, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "YP-U3", 0x507d, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Matthew Wilcox <matthew at wil.cx>
   // Sergio <sfrdll at tiscali.it> reports this device need the BROKEN ALL flag.
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-T9", 0x507f, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-T9", 0x507f, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From Paul Clinch
   // Just guessing but looks like .spl v1 http://www.anythingbutipod.com/forum/showthread.php?t=14160
   // Some versions of the firmware reportedly support OGG, reportedly only the
   // UMS versions, so MTP+OGG is not possible on this device.
-  { "Samsung", 0x04e8, "YP-K3", 0x5081, DEVICE_FLAG_NONE | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-K3", 0x5081, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From XNJB user
   // From Alistair Boyle, .spl v2 required for playlists
   // According to the device log it properly supports OGG
-  { "Samsung", 0x04e8, "YP-P2", 0x5083, DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V2 },
+  { "Samsung", 0x04e8, "YP-P2", 0x5083, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V2 },
   // From Paul Clinch
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-T10", 0x508a, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 | DEVICE_FLAG_NO_ZERO_READS },
+  { "Samsung", 0x04e8, "YP-T10", 0x508a, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 | DEVICE_FLAG_NO_ZERO_READS },
   // From Wim Verwimp <wimverwimp at gmail.com>
   // Not sure about the Ogg and broken proplist flags here. Just guessing.
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-S5", 0x508b, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-S5", 0x508b, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From Ludovic Danigo
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-S3", 0x5091, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-S3", 0x5091, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From Adrian Levi <adrian.levi at gmail.com>
   // Guessing on .spl flag
   // This one supports OGG properly through the correct MTP type.
-  { "Samsung", 0x04e8, "YP-U4", 0x5093, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "YP-U4", 0x5093, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Anonymous SourceForge user, NOT VERIFIED TO BE MTP
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-Q1", 0x5115, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-Q1", 0x5115, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  // From Anonymous SourceForge user
+  // Guessing on .spl flag
+  { "Samsung", 0x04e8, "YP-P3", 0x511a, DEVICE_FLAG_UNLOAD_DRIVER |
+     DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+     DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  // From Anonymous SourceForge user
+  // Guessing on .spl flag
+  { "Samsung", 0x04e8, "YP-Q2", 0x511d, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  // From Marco Pizzocaro <mpizzocaro at users.sourceforge.net>
+  // Guessing on .spl flag
+  { "Samsung", 0x04e8, "YP-U5", 0x5121,
+     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From a rouge .INF file,
   // this device ID seems to have been recycled for:
   // the Samsung SGH-A707 Cingular cellphone
@@ -161,7 +196,7 @@
   // From Santi B?jar <sbejar at gmail.com> - not sure this is MTP...
   // { "Samsung", 0x04e8, "E250 Mobile Phone", 0x663e, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Lionel Bouton
-  { "Samsung", 0x04e8, "X830 Mobile Phone", 0x6702, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "X830 Mobile Phone", 0x6702, DEVICE_FLAG_UNLOAD_DRIVER },
   // From James <jamestech at gmail.com>
   { "Samsung", 0x04e8, "U600 Mobile Phone", 0x6709, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Cesar Cardoso <cesar at cesarcardoso.tk>
@@ -169,6 +204,12 @@
   { "Samsung", 0x04e8, "F250 Mobile Phone", 0x6727, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Charlie Todd  2007-10-31
   { "Samsung", 0x04e8, "Juke (SCH-U470)", 0x6734, DEVICE_FLAG_UNLOAD_DRIVER},
+  // Reported by Tenn
+  { "Samsung", 0x04e8, "GT-B2700", 0x6752, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Added by Greg Fitzgerald <netzdamon at gmail.com>
+  { "Samsung", 0x04e8, "SAMSUNG Trance", 0x6763, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+
 
   /*
    * Intel
@@ -216,6 +257,12 @@
   { "Philips", 0x0471, "GoGear SA3345", 0x2004, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Roberto Vidmar <rvidmar at libero.it>
   { "Philips", 0x0471, "SA5285", 0x2022, DEVICE_FLAG_UNLOAD_DRIVER },
+  // From Elie De Brauwer <elie at de-brauwer.be>
+  { "Philips", 0x0471, "GoGear ViBE SA1VBE04", 0x2075,
+    DEVICE_FLAG_UNLOAD_DRIVER },
+  // From Elie De Brauwer <elie at de-brauwer.be>
+  { "Philips", 0x0471, "GoGear ViBE SA1VBE08", 0x207b,
+    DEVICE_FLAG_UNLOAD_DRIVER },
   // from XNJB user
   { "Philips", 0x0471, "PSA235", 0x7e01, DEVICE_FLAG_NONE },
 
@@ -238,30 +285,31 @@
    * For more info see: http://daniel.haxx.se/sansa/v2.html
    */
   // Reported by Brian Robison
-  { "SanDisk", 0x0781, "Sansa m230/m240", 0x7400, 
+  { "SanDisk", 0x0781, "Sansa m230/m240", 0x7400,
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
+    DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
+  // From Rockbox device listing
+  { "SanDisk", 0x0781, "Sansa m200-tcc (MTP mode)", 0x7401,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by tangent_ at users.sourceforge.net
-  { "SanDisk", 0x0781, "Sansa c150", 0x7410, 
+  { "SanDisk", 0x0781, "Sansa c150", 0x7410,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // From libgphoto2 source
   // Reported by <gonkflea at users.sourceforge.net>
   // Reported by Mike Owen <mikeowen at computerbaseusa.com>
-  { "SanDisk", 0x0781, "Sansa e200/e250/e260/e270/e280", 0x7420, 
+  { "SanDisk", 0x0781, "Sansa e200/e250/e260/e270/e280", 0x7420,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
+  // Don't add 0x7421 as this is e280 in MSC mode
   // Reported by XNJB user
-  { "SanDisk", 0x0781, "Sansa e280", 0x7421, 
-    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
-    DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
-  // Reported by XNJB user
-  { "SanDisk", 0x0781, "Sansa e260/e280 v2", 0x7422, 
+  { "SanDisk", 0x0781, "Sansa e260/e280 v2", 0x7422,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR |
     DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by XNJB user
-  { "SanDisk", 0x0781, "Sansa m240/m250", 0x7430, 
+  { "SanDisk", 0x0781, "Sansa m240/m250", 0x7430,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by Eugene Brevdo <ebrevdo at princeton.edu>
@@ -275,23 +323,23 @@
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR |
     DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED},
   // Reported by anonymous user at sourceforge.net
-  { "SanDisk", 0x0781, "Sansa c240/c250", 0x7450, 
+  { "SanDisk", 0x0781, "Sansa c240/c250", 0x7450,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by anonymous SourceForge user
-  { "SanDisk", 0x0781, "Sansa c250 v2", 0x7452, 
+  { "SanDisk", 0x0781, "Sansa c250 v2", 0x7452,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by Troy Curtis Jr.
-  { "SanDisk", 0x0781, "Sansa Express", 0x7460, 
-    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | 
+  { "SanDisk", 0x0781, "Sansa Express", 0x7460,
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by XNJB user, and Miguel de Icaza <miguel at gnome.org>
   // This has no dual-mode so no need to unload any driver.
   // This is a Linux based device!
   { "SanDisk", 0x0781, "Sansa Connect", 0x7480, DEVICE_FLAG_NONE },
   // Reported by anonymous SourceForge user
-  { "SanDisk", 0x0781, "Sansa View", 0x74b0, 
+  { "SanDisk", 0x0781, "Sansa View", 0x74b0,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by Patrick <skibler at gmail.com>
@@ -313,10 +361,13 @@
    * all properties for a file when asking for metadata 0xffffffff. 
    * Please test on your device if you believe it isn't broken!
    */
-  { "iRiver", 0x1006, "Portable Media Center", 0x4002, 
+  { "iRiver", 0x1006, "H300 Series MTP", 0x3004,
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_IRIVER_OGG_ALZHEIMER },
-  { "iRiver", 0x1006, "Portable Media Center", 0x4003, 
+  { "iRiver", 0x1006, "Portable Media Center", 0x4002,
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
+    DEVICE_FLAG_IRIVER_OGG_ALZHEIMER },
+  { "iRiver", 0x1006, "Portable Media Center", 0x4003,
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_IRIVER_OGG_ALZHEIMER },
   // From [st]anislav <iamstanislav at gmail.com>
@@ -387,12 +438,20 @@
   // In USB Mass Storage mode it is 0x4102/0x1047
   // Seems to use the new shaped-up firmware.
   { "iRiver", 0x4102, "Spinn", 0x1147, DEVICE_FLAG_NONE },
+  // Reported by Tony Janssen <tonyjanssen at users.sourceforge.net>
+  { "iRiver", 0x4102, "E50", 0x1151,
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
+    DEVICE_FLAG_OGG_IS_UNKNOWN },
   // Reported by Scott Call
   // Assume this actually supports OGG though it reports it doesn't.
   { "iRiver", 0x4102, "H10 20GB", 0x2101, 
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_OGG_IS_UNKNOWN },
-  { "iRiver", 0x4102, "H10", 0x2102, 
+  { "iRiver", 0x4102, "H10 5GB", 0x2102, 
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
+    DEVICE_FLAG_OGG_IS_UNKNOWN },
+  // From Rockbox device listing
+  { "iRiver", 0x4102, "H10 5.6GB", 0x2105, 
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_OGG_IS_UNKNOWN },
 
@@ -463,6 +522,8 @@
   { "Archos", 0x0e79, "704 mobile dvr", 0x130d, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Joe Rabinoff
   { "Archos", 0x0e79, "605 (MTP mode)", 0x1313, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Jim Krehl <jimmuhk at users.sourceforge.net>
+  { "Archos", 0x0e79, "5 (MTP mode)", 0x1331, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Adrien Guichard <tmor at users.sourceforge.net>
   { "Archos", 0x0e79, "5 (MTP mode)", 0x1333, DEVICE_FLAG_UNLOAD_DRIVER },
 
@@ -545,12 +606,20 @@
   { "Nokia", 0x0421, "E71", 0x00e4, DEVICE_FLAG_NONE },
   // From: Laurent Bigonville <bigon at users.sourceforge.net>
   { "Nokia", 0x0421, "E66", 0x00e5, DEVICE_FLAG_NONE },
+  // From: Pier <pierlucalino at users.sourceforge.net>
+  { "Nokia", 0x0421, "5320 XpressMusic", 0x00ea, DEVICE_FLAG_NONE },
+  // From: Gausie <innerdreams at users.sourceforge.net>
+  { "Nokia", 0x0421, "5800 XpressMusic", 0x0154, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // From: Willy Gardiol (web) <willy at gardiol.org>
   // Spurious errors for getting all objects, lead me to believe this flag atleast is needed
-  { "Nokia", 0x0421, "5800 XpressMusic", 0x0155, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Nokia", 0x0421, "5800 XpressMusic v2", 0x0155, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // From an anonymous SourceForge user
   // Not verified to be MTP
   { "Nokia", 0x0421, "E63", 0x0179, DEVICE_FLAG_NONE },
+  // From: FunkyPenguin <awafaa at users.sourceforge.net>
+  { "Nokia", 0x0421, "N97", 0x01f5, DEVICE_FLAG_NONE },
+  // https://sourceforge.net/tracker/index.php?func=detail&aid=2692473&group_id=8874&atid=358874
+  { "Nokia", 0x0421, "5200", 0x0421, DEVICE_FLAG_NONE },
   // From: http://nds2.nokia.com/files/support/global/phones/software/Nokia_3250_WMP10_driver.inf
   { "Nokia", 0x0421, "3250 Mobile Phone", 0x0462, DEVICE_FLAG_NONE },
   // From http://nds2.nokia.com/files/support/global/phones/software/Nokia_N93_WMP10_Driver.inf
@@ -612,7 +681,7 @@
   { "NormSoft, Inc.", 0x1703, "Pocket Tunes 4", 0x0002, DEVICE_FLAG_NONE },
 
   /*
-   * TrekStor and Medion devices
+   * TrekStor, Medion and Maxfield devices
    * Their datasheet claims their devices are dualmode so probably needs to
    * unload the attached drivers here.
    */
@@ -625,20 +694,31 @@
   // the same bug flag as its ancestor above.
   { "Medion", 0x066f, "MD8333", 0x8550,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
-  // Reported by anonymous Sourceforge user
+  // Reported by anonymous SourceForge user
   { "Medion", 0x066f, "MD8333", 0x8588,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by anonymous SourceForge user
+  { "Maxfield", 0x066f, "G-Flash NG 1GB", 0x846c,
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
   // Reported by Cristi Magherusan <majeru at gentoo.ro>
   { "TrekStor", 0x0402, "i.Beat Sweez FM", 0x0611, 
     DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Anonymous SourceForge user
+  {"TrekStor", 0x1e68, "i.Beat Organix 2.0", 0x0002,
+    DEVICE_FLAG_UNLOAD_DRIVER },
   
   /*
-   * Disney/Tevion (have had no reports of these actually working.)
+   * Disney/Tevion/MyMusix
    */
   // Reported by XNJB user
   { "Disney", 0x0aa6, "MixMax", 0x6021, DEVICE_FLAG_NONE },
   // Reported by anonymous Sourceforge user 
   { "Tevion", 0x0aa6, "MD 81488", 0x3011, DEVICE_FLAG_NONE },
+  // Reported by Peter Hedlund <peter at peterandlinda.com>
+  { "MyMusix", 0x0aa6, "PD-6070", 0x9601, DEVICE_FLAG_UNLOAD_DRIVER |
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+    DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST |
+    DEVICE_FLAG_NO_RELEASE_INTERFACE },
 
   /*
    * Cowon Systems, Inc.
@@ -657,8 +737,24 @@
   { "Cowon", 0x0e21, "iAudio U5 (MTP mode)", 0x0761,
    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
   // Reported by TJ Something <tjbk_tjb at users.sourceforge.net>
-  { "Cowon", 0x0e21, "iAudio D2 (MTP mode)", 0x0801, 
+  { "Cowon", 0x0e21, "iAudio D2 (MTP mode)", 0x0801,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by anonymous Sourceforge user
+  { "Cowon", 0x0e21, "iAudio D2+ FW 2.x (MTP mode)", 0x0861,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // From Rockbox device listing
+  { "Cowon", 0x0e21, "iAudio D2+ DAB FW 4.x (MTP mode)", 0x0871,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // From Rockbox device listing
+  { "Cowon", 0x0e21, "iAudio D2+ FW 3.x (MTP mode)", 0x0881,
    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // From Rockbox device listing
+  { "Cowon", 0x0e21, "iAudio D2+ DMB FW 1.x (MTP mode)", 0x0891,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by <twkonefal at users.sourceforge.net>
+  { "Cowon", 0x0e21, "iAudio S9 (MTP mode)", 0x0901,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+   DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_FLAC_IS_UNKNOWN },
 
   /*
    * Insignia, dual-mode.
@@ -680,6 +776,9 @@
   // Reported by Cyrille Potereau <cyrille.potereau at wanadoo.fr>
   { "LG Electronics Inc.", 0x1004, "KC910 Renoir Mobile Phone", 0x608f,
       DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by anonymous sourceforge user
+  { "LG Electronics Inc.", 0x1004, "KM900", 0x6132,
+      DEVICE_FLAG_UNLOAD_DRIVER },
 
   /*
    * Sony
@@ -703,10 +802,18 @@
   { "Sony", 0x054c, "Walkman NWZ-B135", 0x036e, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by <tiagoboldt at users.sourceforge.net>
   { "Sony", 0x054c, "Walkman NWZ-E436F", 0x0385, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Michael Wilkinson
+  { "Sony", 0x054c, "Walkman NWZ-W202", 0x0388, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Ondrej Sury <ondrej at sury.org>
   { "Sony", 0x054c, "Walkman NWZ-S739F", 0x038c, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Marco Filipe Nunes Soares Abrantes Pereira <marcopereira at ua.pt>
   { "Sony", 0x054c, "Walkman NWZ-S638F", 0x038e, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Elliot <orwells at users.sourceforge.net>
+  { "Sony", 0x054c, "Walkman NWZ-X1050B/NWZ-X1060B",
+    0x0397, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Silvio J. Gutierrez <silviogutierrez at users.sourceforge.net>
+  { "Sony", 0x054c, "Walkman NWZ-X1051/NWZ-X1061",
+    0x0398, DEVICE_FLAG_UNLOAD_DRIVER },
 
 
   /*
@@ -729,8 +836,18 @@
   { "SonyEricsson", 0x0fce, "C702", 0x00d9, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
   // Reported by Christian Zuckschwerdt <christian at zuckschwerdt.org>
   { "SonyEricsson", 0x0fce, "W980", 0x00da, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by David Taylor <davidt-libmtp at yadt.co.uk>
+  { "SonyEricsson", 0x0fce, "C905", 0x00ef, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by David House <dmhouse at users.sourceforge.net>
+  { "SonyEricsson", 0x0fce, "W595", 0x00f3,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST },
   // Reported by Mattias Evensson <mevensson at users.sourceforge.net>
   { "SonyEricsson", 0x0fce, "W902", 0x00f5, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by St?phane Pontier <shadow_walker at users.sourceforge.net>
+  { "SonyEricsson", 0x0fce, "W705/W715", 0x0105, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by H?kan Kvist
+  { "SonyEricsson", 0x0fce, "W995", 0x0112, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+
 
   /*
    * Motorola
@@ -801,6 +918,9 @@
     DEVICE_FLAG_BROKEN_BATTERY_LEVEL | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
     DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST },
 
+  // Reported by Demadridsur <demadridsur at gmail.com>
+  { "O2 Sistemas", 0x1e53, "ZoltarTV", 0x0006, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+
   /*
    * Other strange stuff.
    */


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-11/libmtp.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libmtp.spec	16 Mar 2009 23:57:22 -0000	1.33
+++ libmtp.spec	14 Aug 2009 21:55:46 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        0.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -17,6 +17,7 @@ BuildRequires:  libusb-devel
 BuildRequires:  doxygen
 
 Patch0: libmtp-0.2.6.1-simpler-rules.patch
+Patch1: newdevices.patch
 
 %description
 This package provides a software library for communicating with MTP
@@ -46,6 +47,7 @@ library for MTP media players.
 %prep
 %setup -q
 %patch0 -p1 -b .rules
+%patch1 -p1 -b .newdevices
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -106,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Linus Walleij <triad at df.lth.se> 0.3.7-2
+- Devel has moved to 1.0.0 but the 1.0.0 contain many new devices that
+  we want to support in older releases so let's patch in a new
+  device database with new SONYs, Samsungs, SanDisks etc.
+
 * Tue Mar 17 2009 Linus Walleij <triad at df.lth.se> 0.3.7-1
 - New upstream bugfix release.
 



From linuxdonald at fedoraproject.org  Fri Aug 14 22:02:49 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Fri, 14 Aug 2009 22:02:49 +0000 (UTC)
Subject: rpms/openal-soft/devel import.log,1.1,1.2
Message-ID: <20090814220249.4AD3C11C00D0@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29259/devel

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Aug 2009 09:28:09 -0000	1.1
+++ import.log	14 Aug 2009 22:02:49 -0000	1.2
@@ -1 +1,2 @@
 openal-soft-1_8_466-6_fc11:HEAD:openal-soft-1.8.466-6.fc11.src.rpm:1249896240
+openal-soft-1_8_466-6_fc11:HEAD:openal-soft-1.8.466-6.fc11.src.rpm:1250287182



From linuxdonald at fedoraproject.org  Fri Aug 14 22:07:23 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Fri, 14 Aug 2009 22:07:23 +0000 (UTC)
Subject: rpms/openal-soft/F-10 import.log,1.1,1.2
Message-ID: <20090814220723.ACB2A11C00D0@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30166/F-10

Modified Files:
	import.log 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Aug 2009 09:28:09 -0000	1.1
+++ import.log	14 Aug 2009 22:07:23 -0000	1.2
@@ -1 +1,2 @@
 openal-soft-1_8_466-6_fc11:HEAD:openal-soft-1.8.466-6.fc11.src.rpm:1249896240
+openal-soft-1_8_466-6_fc11:F-10:openal-soft-1.8.466-6.fc11.src.rpm:1250287508



From linuxdonald at fedoraproject.org  Fri Aug 14 22:12:36 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Fri, 14 Aug 2009 22:12:36 +0000 (UTC)
Subject: rpms/openal-soft/F-11 import.log,1.1,1.2
Message-ID: <20090814221236.BC8E011C0077@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32394/F-11

Modified Files:
	import.log 
Log Message:
Added F11 Package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Aug 2009 09:28:09 -0000	1.1
+++ import.log	14 Aug 2009 22:12:36 -0000	1.2
@@ -1 +1,2 @@
 openal-soft-1_8_466-6_fc11:HEAD:openal-soft-1.8.466-6.fc11.src.rpm:1249896240
+openal-soft-1_8_466-6_fc11:F-11:openal-soft-1.8.466-6.fc11.src.rpm:1250287938



From snirkel at fedoraproject.org  Fri Aug 14 22:19:32 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Fri, 14 Aug 2009 22:19:32 +0000 (UTC)
Subject: rpms/libmtp/F-10 newdevices.patch,NONE,1.1 libmtp.spec,1.32,1.33
Message-ID: <20090814221932.9B74D11C0077@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1263

Modified Files:
	libmtp.spec 
Added Files:
	newdevices.patch 
Log Message:
Update device database with new devices from libmtp 1.0.0


newdevices.patch:
 device-flags.h  |   39 ++++++++++
 music-players.h |  202 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 200 insertions(+), 41 deletions(-)

--- NEW FILE newdevices.patch ---
diff -ur libmtp-0.3.7-orig/src/device-flags.h libmtp-0.3.7/src/device-flags.h
--- libmtp-0.3.7-orig/src/device-flags.h	2009-08-14 23:50:17.738560431 +0200
+++ libmtp-0.3.7/src/device-flags.h	2009-08-14 23:50:38.622622232 +0200
@@ -206,3 +206,42 @@
  * level.
  */
 #define DEVICE_FLAG_BROKEN_BATTERY_LEVEL 0x00010000
+
+/**
+ * Devices that send "ObjectDeleted" events after deletion
+ * of images. (libgphoto2) 
+ */ 
+#define DEVICE_FLAG_DELETE_SENDS_EVENT	0x00020000
+
+/**
+ * Cameras that can capture images. (libgphoto2)
+ */ 
+#define DEVICE_FLAG_CAPTURE		0x00040000
+
+/**
+ * Cameras that can capture images. (libgphoto2)
+ */ 
+#define DEVICE_FLAG_CAPTURE_PREVIEW	0x00080000
+
+/**
+ * Nikon broken capture support without proper ObjectAdded events.
+ * (libgphoto2)
+ */ 
+#define DEVICE_FLAG_NIKON_BROKEN_CAPTURE	0x00100000
+
+/**
+ * Broken capture support where cameras do not send CaptureComplete events.
+ * (libgphoto2)
+ */ 
+#define DEVICE_FLAG_NO_CAPTURE_COMPLETE		0x00400000
+
+/**
+ * Direct PTP match required.
+ * (libgphoto2)
+ */ 
+#define DEVICE_FLAG_MATCH_PTP_INTERFACE		0x00800000
+/**
+ * This flag is like DEVICE_FLAG_OGG_IS_UNKNOWN but for FLAC
+ * files instead. Using the unknown filetype for FLAC files.
+ */
+#define DEVICE_FLAG_FLAC_IS_UNKNOWN 0x01000000
diff -ur libmtp-0.3.7-orig/src/music-players.h libmtp-0.3.7/src/music-players.h
--- libmtp-0.3.7-orig/src/music-players.h	2009-08-14 23:50:17.739561611 +0200
+++ libmtp-0.3.7/src/music-players.h	2009-08-14 23:50:42.660580451 +0200
@@ -31,6 +31,8 @@
 /*
  * MTP device list, trying real bad to get all devices into
  * this list by stealing from everyone I know.
+ * Some devices taken from the Rockbox device listing:
+ * http://www.rockbox.org/twiki/bin/view/Main/DeviceDetection
  */
 
   /*
@@ -60,20 +62,27 @@
   // This version of the Vision:M needs the no release interface flag,
   // unclear whether the other version above need it too or not.
   { "Creative", 0x041e, "ZEN Vision:M (DVP-HD0004)", 0x4151, 
-      DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL},
+      DEVICE_FLAG_NO_RELEASE_INTERFACE |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL},
   // Reported by Darel on the XNJB forums
-  { "Creative", 0x041e, "ZEN V Plus", 0x4152, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
-  { "Creative", 0x041e, "ZEN Vision W", 0x4153, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Creative", 0x041e, "ZEN V Plus", 0x4152,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Creative", 0x041e, "ZEN Vision W", 0x4153,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Don't add 0x4155: this is a Zen Stone device which is not MTP
   // Reported by Paul Kurczaba <paul at kurczaba.com>
   { "Creative", 0x041e, "ZEN", 0x4157, DEVICE_FLAG_IGNORE_HEADER_ERRORS |
-    DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+    DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Reported by Ringofan <mcroman at users.sourceforge.net>
-  { "Creative", 0x041e, "ZEN V 2GB", 0x4158, DEVICE_FLAG_NONE },
+  { "Creative", 0x041e, "ZEN V 2GB", 0x4158,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Reported by j norment <stormzen at gmail.com>
-  { "Creative", 0x041e, "ZEN Mozaic", 0x4161, DEVICE_FLAG_NONE },
+  { "Creative", 0x041e, "ZEN Mozaic", 0x4161,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // Reported by Aaron F. Gonzalez <sub_tex at users.sourceforge.net>
-  { "Creative", 0x041e, "ZEN X-Fi", 0x4162, DEVICE_FLAG_NONE },
+  { "Creative", 0x041e, "ZEN X-Fi", 0x4162,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
 
   /*
    * Samsung
@@ -107,49 +116,75 @@
   { "Samsung", 0x04e8, "YP-Z5", 0x503c, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // Don't add 0x5041 as this is YP-Z5 in USB mode
   // Contributed by anonymous person on SourceForge
-  { "Samsung", 0x04e8, "YP-T7J", 0x5047, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "YP-T7J", 0x5047, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by cstrickler at gmail.com
   { "Samsung", 0x04e8, "YP-U2J (YP-U2JXB/XAA)", 0x5054, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Andrew Benson
   { "Samsung", 0x04e8, "YP-F2J", 0x5057, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Patrick <skibler at gmail.com>
   // Just guessing but looks like .spl v1 http://www.anythingbutipod.com/forum/showthread.php?t=14160
-  { "Samsung", 0x04e8, "YP-K5", 0x505a, DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-K5", 0x505a, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From dev.local at gmail.com - 0x4e8/0x507c is the UMS mode, apparently
   // do not add that device.
   // From m.eik michalke
   // This device does NOT use the special SPL playlist according to sypqgjxu at gmx.de.
-  { "Samsung", 0x04e8, "YP-U3", 0x507d, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "YP-U3", 0x507d, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Matthew Wilcox <matthew at wil.cx>
   // Sergio <sfrdll at tiscali.it> reports this device need the BROKEN ALL flag.
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-T9", 0x507f, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-T9", 0x507f, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From Paul Clinch
   // Just guessing but looks like .spl v1 http://www.anythingbutipod.com/forum/showthread.php?t=14160
   // Some versions of the firmware reportedly support OGG, reportedly only the
   // UMS versions, so MTP+OGG is not possible on this device.
-  { "Samsung", 0x04e8, "YP-K3", 0x5081, DEVICE_FLAG_NONE | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-K3", 0x5081, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From XNJB user
   // From Alistair Boyle, .spl v2 required for playlists
   // According to the device log it properly supports OGG
-  { "Samsung", 0x04e8, "YP-P2", 0x5083, DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V2 },
+  { "Samsung", 0x04e8, "YP-P2", 0x5083, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V2 },
   // From Paul Clinch
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-T10", 0x508a, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 | DEVICE_FLAG_NO_ZERO_READS },
+  { "Samsung", 0x04e8, "YP-T10", 0x508a, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 | DEVICE_FLAG_NO_ZERO_READS },
   // From Wim Verwimp <wimverwimp at gmail.com>
   // Not sure about the Ogg and broken proplist flags here. Just guessing.
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-S5", 0x508b, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-S5", 0x508b, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From Ludovic Danigo
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-S3", 0x5091, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-S3", 0x5091, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From Adrian Levi <adrian.levi at gmail.com>
   // Guessing on .spl flag
   // This one supports OGG properly through the correct MTP type.
-  { "Samsung", 0x04e8, "YP-U4", 0x5093, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "YP-U4", 0x5093, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Anonymous SourceForge user, NOT VERIFIED TO BE MTP
   // Guessing on .spl flag
-  { "Samsung", 0x04e8, "YP-Q1", 0x5115, DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  { "Samsung", 0x04e8, "YP-Q1", 0x5115, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  // From Anonymous SourceForge user
+  // Guessing on .spl flag
+  { "Samsung", 0x04e8, "YP-P3", 0x511a, DEVICE_FLAG_UNLOAD_DRIVER |
+     DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+     DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  // From Anonymous SourceForge user
+  // Guessing on .spl flag
+  { "Samsung", 0x04e8, "YP-Q2", 0x511d, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+      DEVICE_FLAG_PLAYLIST_SPL_V1 },
+  // From Marco Pizzocaro <mpizzocaro at users.sourceforge.net>
+  // Guessing on .spl flag
+  { "Samsung", 0x04e8, "YP-U5", 0x5121,
+     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_PLAYLIST_SPL_V1 },
   // From a rouge .INF file,
   // this device ID seems to have been recycled for:
   // the Samsung SGH-A707 Cingular cellphone
@@ -161,7 +196,7 @@
   // From Santi B?jar <sbejar at gmail.com> - not sure this is MTP...
   // { "Samsung", 0x04e8, "E250 Mobile Phone", 0x663e, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Lionel Bouton
-  { "Samsung", 0x04e8, "X830 Mobile Phone", 0x6702, DEVICE_FLAG_NONE },
+  { "Samsung", 0x04e8, "X830 Mobile Phone", 0x6702, DEVICE_FLAG_UNLOAD_DRIVER },
   // From James <jamestech at gmail.com>
   { "Samsung", 0x04e8, "U600 Mobile Phone", 0x6709, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Cesar Cardoso <cesar at cesarcardoso.tk>
@@ -169,6 +204,12 @@
   { "Samsung", 0x04e8, "F250 Mobile Phone", 0x6727, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Charlie Todd  2007-10-31
   { "Samsung", 0x04e8, "Juke (SCH-U470)", 0x6734, DEVICE_FLAG_UNLOAD_DRIVER},
+  // Reported by Tenn
+  { "Samsung", 0x04e8, "GT-B2700", 0x6752, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Added by Greg Fitzgerald <netzdamon at gmail.com>
+  { "Samsung", 0x04e8, "SAMSUNG Trance", 0x6763, DEVICE_FLAG_UNLOAD_DRIVER |
+      DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 },
+
 
   /*
    * Intel
@@ -216,6 +257,12 @@
   { "Philips", 0x0471, "GoGear SA3345", 0x2004, DEVICE_FLAG_UNLOAD_DRIVER },
   // From Roberto Vidmar <rvidmar at libero.it>
   { "Philips", 0x0471, "SA5285", 0x2022, DEVICE_FLAG_UNLOAD_DRIVER },
+  // From Elie De Brauwer <elie at de-brauwer.be>
+  { "Philips", 0x0471, "GoGear ViBE SA1VBE04", 0x2075,
+    DEVICE_FLAG_UNLOAD_DRIVER },
+  // From Elie De Brauwer <elie at de-brauwer.be>
+  { "Philips", 0x0471, "GoGear ViBE SA1VBE08", 0x207b,
+    DEVICE_FLAG_UNLOAD_DRIVER },
   // from XNJB user
   { "Philips", 0x0471, "PSA235", 0x7e01, DEVICE_FLAG_NONE },
 
@@ -238,30 +285,31 @@
    * For more info see: http://daniel.haxx.se/sansa/v2.html
    */
   // Reported by Brian Robison
-  { "SanDisk", 0x0781, "Sansa m230/m240", 0x7400, 
+  { "SanDisk", 0x0781, "Sansa m230/m240", 0x7400,
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
+    DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
+  // From Rockbox device listing
+  { "SanDisk", 0x0781, "Sansa m200-tcc (MTP mode)", 0x7401,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by tangent_ at users.sourceforge.net
-  { "SanDisk", 0x0781, "Sansa c150", 0x7410, 
+  { "SanDisk", 0x0781, "Sansa c150", 0x7410,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // From libgphoto2 source
   // Reported by <gonkflea at users.sourceforge.net>
   // Reported by Mike Owen <mikeowen at computerbaseusa.com>
-  { "SanDisk", 0x0781, "Sansa e200/e250/e260/e270/e280", 0x7420, 
+  { "SanDisk", 0x0781, "Sansa e200/e250/e260/e270/e280", 0x7420,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
+  // Don't add 0x7421 as this is e280 in MSC mode
   // Reported by XNJB user
-  { "SanDisk", 0x0781, "Sansa e280", 0x7421, 
-    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
-    DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
-  // Reported by XNJB user
-  { "SanDisk", 0x0781, "Sansa e260/e280 v2", 0x7422, 
+  { "SanDisk", 0x0781, "Sansa e260/e280 v2", 0x7422,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR |
     DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by XNJB user
-  { "SanDisk", 0x0781, "Sansa m240/m250", 0x7430, 
+  { "SanDisk", 0x0781, "Sansa m240/m250", 0x7430,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by Eugene Brevdo <ebrevdo at princeton.edu>
@@ -275,23 +323,23 @@
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR |
     DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED},
   // Reported by anonymous user at sourceforge.net
-  { "SanDisk", 0x0781, "Sansa c240/c250", 0x7450, 
+  { "SanDisk", 0x0781, "Sansa c240/c250", 0x7450,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by anonymous SourceForge user
-  { "SanDisk", 0x0781, "Sansa c250 v2", 0x7452, 
+  { "SanDisk", 0x0781, "Sansa c250 v2", 0x7452,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by Troy Curtis Jr.
-  { "SanDisk", 0x0781, "Sansa Express", 0x7460, 
-    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | 
+  { "SanDisk", 0x0781, "Sansa Express", 0x7460,
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by XNJB user, and Miguel de Icaza <miguel at gnome.org>
   // This has no dual-mode so no need to unload any driver.
   // This is a Linux based device!
   { "SanDisk", 0x0781, "Sansa Connect", 0x7480, DEVICE_FLAG_NONE },
   // Reported by anonymous SourceForge user
-  { "SanDisk", 0x0781, "Sansa View", 0x74b0, 
+  { "SanDisk", 0x0781, "Sansa View", 0x74b0,
     DEVICE_FLAG_UNLOAD_DRIVER |  DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL |
     DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED },
   // Reported by Patrick <skibler at gmail.com>
@@ -313,10 +361,13 @@
    * all properties for a file when asking for metadata 0xffffffff. 
    * Please test on your device if you believe it isn't broken!
    */
-  { "iRiver", 0x1006, "Portable Media Center", 0x4002, 
+  { "iRiver", 0x1006, "H300 Series MTP", 0x3004,
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_IRIVER_OGG_ALZHEIMER },
-  { "iRiver", 0x1006, "Portable Media Center", 0x4003, 
+  { "iRiver", 0x1006, "Portable Media Center", 0x4002,
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
+    DEVICE_FLAG_IRIVER_OGG_ALZHEIMER },
+  { "iRiver", 0x1006, "Portable Media Center", 0x4003,
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_IRIVER_OGG_ALZHEIMER },
   // From [st]anislav <iamstanislav at gmail.com>
@@ -387,12 +438,20 @@
   // In USB Mass Storage mode it is 0x4102/0x1047
   // Seems to use the new shaped-up firmware.
   { "iRiver", 0x4102, "Spinn", 0x1147, DEVICE_FLAG_NONE },
+  // Reported by Tony Janssen <tonyjanssen at users.sourceforge.net>
+  { "iRiver", 0x4102, "E50", 0x1151,
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
+    DEVICE_FLAG_OGG_IS_UNKNOWN },
   // Reported by Scott Call
   // Assume this actually supports OGG though it reports it doesn't.
   { "iRiver", 0x4102, "H10 20GB", 0x2101, 
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_OGG_IS_UNKNOWN },
-  { "iRiver", 0x4102, "H10", 0x2102, 
+  { "iRiver", 0x4102, "H10 5GB", 0x2102, 
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
+    DEVICE_FLAG_OGG_IS_UNKNOWN },
+  // From Rockbox device listing
+  { "iRiver", 0x4102, "H10 5.6GB", 0x2105, 
     DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS | 
     DEVICE_FLAG_OGG_IS_UNKNOWN },
 
@@ -463,6 +522,8 @@
   { "Archos", 0x0e79, "704 mobile dvr", 0x130d, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Joe Rabinoff
   { "Archos", 0x0e79, "605 (MTP mode)", 0x1313, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Jim Krehl <jimmuhk at users.sourceforge.net>
+  { "Archos", 0x0e79, "5 (MTP mode)", 0x1331, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Adrien Guichard <tmor at users.sourceforge.net>
   { "Archos", 0x0e79, "5 (MTP mode)", 0x1333, DEVICE_FLAG_UNLOAD_DRIVER },
 
@@ -545,12 +606,20 @@
   { "Nokia", 0x0421, "E71", 0x00e4, DEVICE_FLAG_NONE },
   // From: Laurent Bigonville <bigon at users.sourceforge.net>
   { "Nokia", 0x0421, "E66", 0x00e5, DEVICE_FLAG_NONE },
+  // From: Pier <pierlucalino at users.sourceforge.net>
+  { "Nokia", 0x0421, "5320 XpressMusic", 0x00ea, DEVICE_FLAG_NONE },
+  // From: Gausie <innerdreams at users.sourceforge.net>
+  { "Nokia", 0x0421, "5800 XpressMusic", 0x0154, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // From: Willy Gardiol (web) <willy at gardiol.org>
   // Spurious errors for getting all objects, lead me to believe this flag atleast is needed
-  { "Nokia", 0x0421, "5800 XpressMusic", 0x0155, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
+  { "Nokia", 0x0421, "5800 XpressMusic v2", 0x0155, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },
   // From an anonymous SourceForge user
   // Not verified to be MTP
   { "Nokia", 0x0421, "E63", 0x0179, DEVICE_FLAG_NONE },
+  // From: FunkyPenguin <awafaa at users.sourceforge.net>
+  { "Nokia", 0x0421, "N97", 0x01f5, DEVICE_FLAG_NONE },
+  // https://sourceforge.net/tracker/index.php?func=detail&aid=2692473&group_id=8874&atid=358874
+  { "Nokia", 0x0421, "5200", 0x0421, DEVICE_FLAG_NONE },
   // From: http://nds2.nokia.com/files/support/global/phones/software/Nokia_3250_WMP10_driver.inf
   { "Nokia", 0x0421, "3250 Mobile Phone", 0x0462, DEVICE_FLAG_NONE },
   // From http://nds2.nokia.com/files/support/global/phones/software/Nokia_N93_WMP10_Driver.inf
@@ -612,7 +681,7 @@
   { "NormSoft, Inc.", 0x1703, "Pocket Tunes 4", 0x0002, DEVICE_FLAG_NONE },
 
   /*
-   * TrekStor and Medion devices
+   * TrekStor, Medion and Maxfield devices
    * Their datasheet claims their devices are dualmode so probably needs to
    * unload the attached drivers here.
    */
@@ -625,20 +694,31 @@
   // the same bug flag as its ancestor above.
   { "Medion", 0x066f, "MD8333", 0x8550,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
-  // Reported by anonymous Sourceforge user
+  // Reported by anonymous SourceForge user
   { "Medion", 0x066f, "MD8333", 0x8588,
     DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by anonymous SourceForge user
+  { "Maxfield", 0x066f, "G-Flash NG 1GB", 0x846c,
+    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
   // Reported by Cristi Magherusan <majeru at gentoo.ro>
   { "TrekStor", 0x0402, "i.Beat Sweez FM", 0x0611, 
     DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Anonymous SourceForge user
+  {"TrekStor", 0x1e68, "i.Beat Organix 2.0", 0x0002,
+    DEVICE_FLAG_UNLOAD_DRIVER },
   
   /*
-   * Disney/Tevion (have had no reports of these actually working.)
+   * Disney/Tevion/MyMusix
    */
   // Reported by XNJB user
   { "Disney", 0x0aa6, "MixMax", 0x6021, DEVICE_FLAG_NONE },
   // Reported by anonymous Sourceforge user 
   { "Tevion", 0x0aa6, "MD 81488", 0x3011, DEVICE_FLAG_NONE },
+  // Reported by Peter Hedlund <peter at peterandlinda.com>
+  { "MyMusix", 0x0aa6, "PD-6070", 0x9601, DEVICE_FLAG_UNLOAD_DRIVER |
+    DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+    DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST |
+    DEVICE_FLAG_NO_RELEASE_INTERFACE },
 
   /*
    * Cowon Systems, Inc.
@@ -657,8 +737,24 @@
   { "Cowon", 0x0e21, "iAudio U5 (MTP mode)", 0x0761,
    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
   // Reported by TJ Something <tjbk_tjb at users.sourceforge.net>
-  { "Cowon", 0x0e21, "iAudio D2 (MTP mode)", 0x0801, 
+  { "Cowon", 0x0e21, "iAudio D2 (MTP mode)", 0x0801,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by anonymous Sourceforge user
+  { "Cowon", 0x0e21, "iAudio D2+ FW 2.x (MTP mode)", 0x0861,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // From Rockbox device listing
+  { "Cowon", 0x0e21, "iAudio D2+ DAB FW 4.x (MTP mode)", 0x0871,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // From Rockbox device listing
+  { "Cowon", 0x0e21, "iAudio D2+ FW 3.x (MTP mode)", 0x0881,
    DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // From Rockbox device listing
+  { "Cowon", 0x0e21, "iAudio D2+ DMB FW 1.x (MTP mode)", 0x0891,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by <twkonefal at users.sourceforge.net>
+  { "Cowon", 0x0e21, "iAudio S9 (MTP mode)", 0x0901,
+   DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
+   DEVICE_FLAG_OGG_IS_UNKNOWN | DEVICE_FLAG_FLAC_IS_UNKNOWN },
 
   /*
    * Insignia, dual-mode.
@@ -680,6 +776,9 @@
   // Reported by Cyrille Potereau <cyrille.potereau at wanadoo.fr>
   { "LG Electronics Inc.", 0x1004, "KC910 Renoir Mobile Phone", 0x608f,
       DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by anonymous sourceforge user
+  { "LG Electronics Inc.", 0x1004, "KM900", 0x6132,
+      DEVICE_FLAG_UNLOAD_DRIVER },
 
   /*
    * Sony
@@ -703,10 +802,18 @@
   { "Sony", 0x054c, "Walkman NWZ-B135", 0x036e, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by <tiagoboldt at users.sourceforge.net>
   { "Sony", 0x054c, "Walkman NWZ-E436F", 0x0385, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Michael Wilkinson
+  { "Sony", 0x054c, "Walkman NWZ-W202", 0x0388, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Ondrej Sury <ondrej at sury.org>
   { "Sony", 0x054c, "Walkman NWZ-S739F", 0x038c, DEVICE_FLAG_UNLOAD_DRIVER },
   // Reported by Marco Filipe Nunes Soares Abrantes Pereira <marcopereira at ua.pt>
   { "Sony", 0x054c, "Walkman NWZ-S638F", 0x038e, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Elliot <orwells at users.sourceforge.net>
+  { "Sony", 0x054c, "Walkman NWZ-X1050B/NWZ-X1060B",
+    0x0397, DEVICE_FLAG_UNLOAD_DRIVER },
+  // Reported by Silvio J. Gutierrez <silviogutierrez at users.sourceforge.net>
+  { "Sony", 0x054c, "Walkman NWZ-X1051/NWZ-X1061",
+    0x0398, DEVICE_FLAG_UNLOAD_DRIVER },
 
 
   /*
@@ -729,8 +836,18 @@
   { "SonyEricsson", 0x0fce, "C702", 0x00d9, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
   // Reported by Christian Zuckschwerdt <christian at zuckschwerdt.org>
   { "SonyEricsson", 0x0fce, "W980", 0x00da, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by David Taylor <davidt-libmtp at yadt.co.uk>
+  { "SonyEricsson", 0x0fce, "C905", 0x00ef, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by David House <dmhouse at users.sourceforge.net>
+  { "SonyEricsson", 0x0fce, "W595", 0x00f3,
+      DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST },
   // Reported by Mattias Evensson <mevensson at users.sourceforge.net>
   { "SonyEricsson", 0x0fce, "W902", 0x00f5, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by St?phane Pontier <shadow_walker at users.sourceforge.net>
+  { "SonyEricsson", 0x0fce, "W705/W715", 0x0105, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+  // Reported by H?kan Kvist
+  { "SonyEricsson", 0x0fce, "W995", 0x0112, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+
 
   /*
    * Motorola
@@ -801,6 +918,9 @@
     DEVICE_FLAG_BROKEN_BATTERY_LEVEL | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |
     DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST },
 
+  // Reported by Demadridsur <demadridsur at gmail.com>
+  { "O2 Sistemas", 0x1e53, "ZoltarTV", 0x0006, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+
   /*
    * Other strange stuff.
    */


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-10/libmtp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libmtp.spec	16 Mar 2009 23:59:37 -0000	1.32
+++ libmtp.spec	14 Aug 2009 22:19:32 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        0.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -17,6 +17,7 @@ BuildRequires:  libusb-devel
 BuildRequires:  doxygen
 
 Patch0: libmtp-0.2.6.1-simpler-rules.patch
+Patch1: newdevices.patch
 
 %description
 This package provides a software library for communicating with MTP
@@ -46,6 +47,7 @@ library for MTP media players.
 %prep
 %setup -q
 %patch0 -p1 -b .rules
+%patch1 -p1 -b .newdevices
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -106,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Linus Walleij <triad at df.lth.se> 0.3.7-2
+- Devel has moved to 1.0.0 but the 1.0.0 contain many new devices that
+  we want to support in older releases so let's patch in a new
+  device database with new SONYs, Samsungs, SanDisks etc.
+
 * Tue Mar 17 2009 Linus Walleij <triad at df.lth.se> 0.3.7-1
 - New upstream bugfix release.
 



From mclasen at fedoraproject.org  Fri Aug 14 22:38:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 22:38:49 +0000 (UTC)
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.65,
	1.66 gnome-icon-theme.spec, 1.103, 1.104 sources, 1.69, 1.70
Message-ID: <20090814223850.06D0511C0077@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5108

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	17 Mar 2009 01:12:00 -0000	1.65
+++ .cvsignore	14 Aug 2009 22:38:47 -0000	1.66
@@ -1 +1 @@
-gnome-icon-theme-2.26.0.tar.bz2
+gnome-icon-theme-2.27.90.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gnome-icon-theme.spec	25 Jul 2009 00:39:44 -0000	1.103
+++ gnome-icon-theme.spec	14 Aug 2009 22:38:47 -0000	1.104
@@ -1,8 +1,8 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
-Version: 2.26.0
-Release: 3%{?dist}
-Source0: http://download.gnome.org/sources/gnome-icon-theme/2.26/%{name}-%{version}.tar.bz2
+Version: 2.27.90
+Release: 1%{?dist}
+Source0: http://download.gnome.org/sources/gnome-icon-theme/2.27/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-5.tar.bz2
 Source2: legacy-icon-mapping.xml
 Source3: window.png
@@ -76,6 +76,9 @@ done
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	17 Mar 2009 01:28:53 -0000	1.69
+++ sources	14 Aug 2009 22:38:48 -0000	1.70
@@ -1,2 +1,2 @@
-36a4e5e1b2c7c053779a9a399f6146a2  gnome-icon-theme-2.26.0.tar.bz2
+4abd68866f7d3763644c21c0eaf4dfea  gnome-icon-theme-2.27.90.tar.bz2
 824f011a845100714eb8a47199cf4398  gnome-icon-theme-extra-device-icons-5.tar.bz2



From mclasen at fedoraproject.org  Fri Aug 14 22:47:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 22:47:05 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.86, 1.87 eog.spec, 1.149, 1.150 sources,
	1.86, 1.87
Message-ID: <20090814224705.C02F011C0077@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7639

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	28 Jul 2009 13:23:13 -0000	1.86
+++ .cvsignore	14 Aug 2009 22:47:05 -0000	1.87
@@ -1 +1 @@
-eog-2.27.5.tar.bz2
+eog-2.27.90.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- eog.spec	28 Jul 2009 13:23:13 -0000	1.149
+++ eog.spec	14 Aug 2009 22:47:05 -0000	1.150
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.27.5
+Version: 2.27.90
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.27/%{name}-%{version}.tar.bz2
@@ -170,6 +170,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
+- 2.27.90
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	28 Jul 2009 13:23:13 -0000	1.86
+++ sources	14 Aug 2009 22:47:05 -0000	1.87
@@ -1 +1 @@
-3c7a604d6b60cdc710cbaa056864dbc4  eog-2.27.5.tar.bz2
+3f44ee2f23c612a242f060b1e85a976b  eog-2.27.90.tar.bz2



From davej at fedoraproject.org  Fri Aug 14 22:51:56 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 14 Aug 2009 22:51:56 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1718,1.1719
Message-ID: <20090814225156.B8B2D11C0077@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8876

Modified Files:
	kernel.spec 
Log Message:
perf needs to be added.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1718
retrieving revision 1.1719
diff -u -p -r1.1718 -r1.1719
--- kernel.spec	14 Aug 2009 17:50:37 -0000	1.1718
+++ kernel.spec	14 Aug 2009 22:51:55 -0000	1.1719
@@ -541,6 +541,8 @@ Source90: config-sparc64-generic
 
 Source100: config-arm
 
+Source200: perf
+
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel



From mclasen at fedoraproject.org  Fri Aug 14 22:52:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 22:52:01 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.102, 1.103 gnome-games.spec,
	1.225, 1.226 sources, 1.107, 1.108
Message-ID: <20090814225201.2687C11C0077@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8799

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	28 Jul 2009 05:13:31 -0000	1.102
+++ .cvsignore	14 Aug 2009 22:52:00 -0000	1.103
@@ -1 +1 @@
-gnome-games-2.27.5.tar.bz2
+gnome-games-2.27.90.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- gnome-games.spec	1 Aug 2009 03:09:48 -0000	1.225
+++ gnome-games.spec	14 Aug 2009 22:52:00 -0000	1.226
@@ -45,8 +45,8 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.27.5
-Release: 5%{?dist}
+Version: 2.27.90
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -489,8 +489,11 @@ fi
 
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
+- Updated to 2.27.90
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-5
-- Drop unneded python deps
+- Drop unneeded python deps
 
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-4
 - Fix a typo (#515033)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- sources	28 Jul 2009 05:13:31 -0000	1.107
+++ sources	14 Aug 2009 22:52:01 -0000	1.108
@@ -1 +1 @@
-07be56cc17cf8e1df16942caafd24d79  gnome-games-2.27.5.tar.bz2
+7b2da877c34ac13009adf64d0f89ba31  gnome-games-2.27.90.tar.bz2



From mclasen at fedoraproject.org  Fri Aug 14 23:05:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 14 Aug 2009 23:05:15 +0000 (UTC)
Subject: rpms/gnome-games/devel gnome-games.spec,1.226,1.227
Message-ID: <20090814230515.77FCE11C0077@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11768

Modified Files:
	gnome-games.spec 
Log Message:
drop upstreamed patch



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- gnome-games.spec	14 Aug 2009 22:52:00 -0000	1.226
+++ gnome-games.spec	14 Aug 2009 23:05:14 -0000	1.227
@@ -54,8 +54,6 @@ Source: http://download.gnome.org/source
 # http://bugzilla.gnome.org/show_bug.cgi?id=551455
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
-# http://git.gnome.org/cgit/gnome-games/commit/?id=152a29c7d25ff84ab363ccb2b176b565930b1a7d
-Patch2: 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
@@ -143,8 +141,6 @@ sed -i -e 's/Gnometris/GnomeFallingBlock
 #cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav
 #cp -f gnometris/sounds/gameover.wav gnibbles/sounds/pop.wav
 
-%patch2 -p1 -b .clutter
-
 %build
 
 autoconf



From jgarzik at fedoraproject.org  Fri Aug 14 23:32:07 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Fri, 14 Aug 2009 23:32:07 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.15,1.16 sources,1.12,1.13
Message-ID: <20090814233207.EE6C011C0077@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18219

Modified Files:
	cld.spec sources 
Log Message:
update to latest upstream


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cld.spec	13 Aug 2009 22:24:31 -0000	1.15
+++ cld.spec	14 Aug 2009 23:32:06 -0000	1.16
@@ -1,13 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.16.gefe1f957%{?dist}
+Release:	0.17.gbb117496%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit efe1f95712cefa78cf28c328bcce8e25ac50e72b
+# pulled from upstream git, commit bb11749606a204b9ab87b815352d231179dba7a1
 # to recreate tarball, check out commit, then run "make dist"
 Source0:	cld-%{version}git.tar.gz
 Source2:	cld.init
@@ -101,6 +101,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug 14 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.17.gbb117496
+- update to commit bb11749606a204b9ab87b815352d231179dba7a1
+
 * Thu Aug 13 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.16.gefe1f957
 - update to commit efe1f95712cefa78cf28c328bcce8e25ac50e72b
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Aug 2009 22:24:32 -0000	1.12
+++ sources	14 Aug 2009 23:32:06 -0000	1.13
@@ -1 +1 @@
-976b37a5e8edcb3b262d7535edcf1db5  cld-0.2git.tar.gz
+a27c772d28038c4c09c52fd9d374e847  cld-0.2git.tar.gz



From tgl at fedoraproject.org  Fri Aug 14 23:39:16 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 14 Aug 2009 23:39:16 +0000 (UTC)
Subject: rpms/mysql/devel mysql-no-check-testcases.patch, NONE,
	1.1 mysql-testing.patch, 1.13, 1.14 mysql.spec, 1.124, 1.125
Message-ID: <20090814233916.6219C11C0077@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19815

Modified Files:
	mysql-testing.patch mysql.spec 
Added Files:
	mysql-no-check-testcases.patch 
Log Message:
Let's see if these changes will persuade the regression tests to pass in koji.

mysql-no-check-testcases.patch:
 mysql-test-run.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mysql-no-check-testcases.patch ---
As of mysql 5.1.x, the --check-testcases option in mysql-test-run was made
the default, although the documentation for it doesn't tell you that.
Unfortunately the check-testcases code frequently fails in koji for
obscure reasons; what's more it slows down the tests materially.
Since it's not really our job to debug the test suite, let's just turn
it back off ...


diff -Naur mysql-5.1.37.orig/mysql-test/mysql-test-run.pl mysql-5.1.37/mysql-test/mysql-test-run.pl
--- mysql-5.1.37.orig/mysql-test/mysql-test-run.pl	2009-07-13 19:09:03.000000000 -0400
+++ mysql-5.1.37/mysql-test/mysql-test-run.pl	2009-08-14 17:40:49.000000000 -0400
@@ -193,7 +193,7 @@
 
 my $opt_skip_core;
 
-our $opt_check_testcases= 1;
+our $opt_check_testcases= 0;
 my $opt_mark_progress;
 
 my $opt_sleep;

mysql-testing.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mysql-testing.patch	5 Mar 2009 02:50:07 -0000	1.13
+++ mysql-testing.patch	14 Aug 2009 23:39:16 -0000	1.14
@@ -1,6 +1,13 @@
 Hack the top-level Makefile to enable the openssl regression tests.
 (Why doesn't this happen automatically given the configure option??)
 
+Also, increase the overall timeout for the regression tests to 12 hours,
+because on a slow or heavily-loaded build machine sometimes the default of
+5 hours isn't enough.  (This has been demonstrated to fail in mass-rebuild
+scenarios, which aren't that uncommon for Fedora.)  Similarly increase the
+per-testcase timeout to 30 minutes, since the default of 15 hasn't got a
+great deal of headroom either.
+
 
 diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am
 --- mysql-5.1.32.orig/Makefile.am	2009-02-13 19:51:56.000000000 -0500
@@ -10,7 +17,7 @@ diff -Naur mysql-5.1.32.orig/Makefile.am
  test-ns:
  	cd mysql-test ; \
 -	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed
++	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed --suite-timeout=720 --testcase-timeout=30
  
  test-binlog-statement:
  	cd mysql-test ; \


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- mysql.spec	3 Aug 2009 02:23:58 -0000	1.124
+++ mysql.spec	14 Aug 2009 23:39:16 -0000	1.125
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.37
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -32,6 +32,7 @@ Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
+Patch10: mysql-no-check-testcases.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -174,6 +175,7 @@ the MySQL sources.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 libtoolize --force
 aclocal
@@ -249,6 +251,7 @@ make check
 
   # note: "make test" invokes two largely-duplicate sets of tests,
   # which makes the runtime really unacceptably long ...
+  # if you want to change this, look at mysql-testing.patch too.
   make test-ns
 %endif
 
@@ -639,6 +642,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Aug 14 2009 Tom Lane <tgl at redhat.com> 5.1.37-2
+- Add a couple of patches to improve the probability of the regression tests
+  completing in koji builds
+
 * Sun Aug  2 2009 Tom Lane <tgl at redhat.com> 5.1.37-1
 - Update to MySQL 5.1.37, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html



From kyle at fedoraproject.org  Sat Aug 15 00:26:44 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 15 Aug 2009 00:26:44 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1705,1.1706
Message-ID: <20090815002644.E077F11C0077@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31672

Modified Files:
	kernel.spec 
Log Message:
tag and build 2.6.30.5-27.rc2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1705
retrieving revision 1.1706
diff -u -p -r1.1705 -r1.1706
--- kernel.spec	14 Aug 2009 07:38:15 -0000	1.1705
+++ kernel.spec	15 Aug 2009 00:26:44 -0000	1.1706
@@ -1895,7 +1895,7 @@ fi
 # and build.
 
 %changelog
-* Fri Aug 14 2009 Chuck Ebbert <cebbert at redhat.com>
+* Fri Aug 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-27.rc2
 - Linux 2.6.30.5-rc2
 - Dropped drm-intel-tv-fix.patch, merged in -stable now.
 



From kyle at fedoraproject.org  Sat Aug 15 00:26:54 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 15 Aug 2009 00:26:54 +0000 (UTC)
Subject: rpms/kernel/F-10 make-sock_sendpage-use-kernel_sendpage.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.78, 1.1206.2.79
Message-ID: <20090815002654.DE59A11C0077@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31728

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	make-sock_sendpage-use-kernel_sendpage.patch 
Log Message:
* Fri Aug 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.29-170.2.79
- CVE-2009-2692: Fix sock sendpage NULL ptr deref.


make-sock_sendpage-use-kernel_sendpage.patch:
 socket.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE make-sock_sendpage-use-kernel_sendpage.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu, 13 Aug 2009 15:28:36 +0000 (-0700)
Subject: Make sock_sendpage() use kernel_sendpage()
X-Git-Tag: v2.6.31-rc6~8
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e694958388c50148389b0e9b9e9e8945cf0f1b98

Make sock_sendpage() use kernel_sendpage()

kernel_sendpage() does the proper default case handling for when the
socket doesn't have a native sendpage implementation.

Now, arguably this might be something that we could instead solve by
just specifying that all protocols should do it themselves at the
protocol level, but we really only care about the common protocols.
Does anybody really care about sendpage on something like Appletalk? Not
likely.

Acked-by: David S. Miller <davem at davemloft.net>
Acked-by: Julien TINNES <julien at cr0.org>
Acked-by: Tavis Ormandy <taviso at sdf.lonestar.org>
Cc: stable at kernel.org
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/net/socket.c b/net/socket.c
index 791d71a..6d47165 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 	if (more)
 		flags |= MSG_MORE;
 
-	return sock->ops->sendpage(sock, page, offset, size, flags);
+	return kernel_sendpage(sock, page, offset, size, flags);
 }
 
 static ssize_t sock_splice_read(struct file *file, loff_t *ppos,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.78
retrieving revision 1.1206.2.79
diff -u -p -r1.1206.2.78 -r1.1206.2.79
--- kernel.spec	31 Jul 2009 07:55:42 -0000	1.1206.2.78
+++ kernel.spec	15 Aug 2009 00:26:54 -0000	1.1206.2.79
@@ -589,6 +589,8 @@ Patch21: linux-2.6-utrace.patch
 Patch22: linux-2.6-x86-tracehook.patch
 Patch23: linux-2.6.27-x86-tracehook-syscall-arg-order.patch
 
+Patch30: make-sock_sendpage-use-kernel_sendpage.patch
+
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch60: linux-2.6-sched-fine-tune-SD_MC_INIT.patch
@@ -1140,6 +1142,8 @@ ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-x86-tracehook.patch
 ApplyPatch linux-2.6.27-x86-tracehook-syscall-arg-order.patch
 
+ApplyPatch make-sock_sendpage-use-kernel_sendpage.patch
+
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1991,6 +1995,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Aug 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.29-170.2.79
+- CVE-2009-2692: Fix sock sendpage NULL ptr deref.
+
 * Fri Jul 31 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.29-170.2.78
 - The kernel package needs to override the new rpm %%install behavior.
 



From kyle at fedoraproject.org  Sat Aug 15 00:27:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 15 Aug 2009 00:27:04 +0000 (UTC)
Subject: rpms/kernel/F-11 make-sock_sendpage-use-kernel_sendpage.patch, NONE,
	1.1.2.1 kernel.spec, 1.1679.2.6, 1.1679.2.7
Message-ID: <20090815002704.50AAF11C0077@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31777

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	make-sock_sendpage-use-kernel_sendpage.patch 
Log Message:
* Fri Aug 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.7
- CVE-2009-2692: Fix sock sendpage NULL ptr deref.


make-sock_sendpage-use-kernel_sendpage.patch:
 socket.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE make-sock_sendpage-use-kernel_sendpage.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu, 13 Aug 2009 15:28:36 +0000 (-0700)
Subject: Make sock_sendpage() use kernel_sendpage()
X-Git-Tag: v2.6.31-rc6~8
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e694958388c50148389b0e9b9e9e8945cf0f1b98

Make sock_sendpage() use kernel_sendpage()

kernel_sendpage() does the proper default case handling for when the
socket doesn't have a native sendpage implementation.

Now, arguably this might be something that we could instead solve by
just specifying that all protocols should do it themselves at the
protocol level, but we really only care about the common protocols.
Does anybody really care about sendpage on something like Appletalk? Not
likely.

Acked-by: David S. Miller <davem at davemloft.net>
Acked-by: Julien TINNES <julien at cr0.org>
Acked-by: Tavis Ormandy <taviso at sdf.lonestar.org>
Cc: stable at kernel.org
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/net/socket.c b/net/socket.c
index 791d71a..6d47165 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 	if (more)
 		flags |= MSG_MORE;
 
-	return sock->ops->sendpage(sock, page, offset, size, flags);
+	return kernel_sendpage(sock, page, offset, size, flags);
 }
 
 static ssize_t sock_splice_read(struct file *file, loff_t *ppos,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.6
retrieving revision 1.1679.2.7
diff -u -p -r1.1679.2.6 -r1.1679.2.7
--- kernel.spec	13 Aug 2009 18:36:36 -0000	1.1679.2.6
+++ kernel.spec	15 Aug 2009 00:27:03 -0000	1.1679.2.7
@@ -609,6 +609,8 @@ Patch30: linux-2.6-iommu-fixes.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch50: make-sock_sendpage-use-kernel_sendpage.patch
+
 #Patch101: linux-2.6-e820-save-restore-edi-ebp.patch
 #Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
 #Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch
@@ -1232,6 +1234,7 @@ ApplyPatch linux-2.6-iommu-fixes.patch
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
+
 # Architecture patches
 # x86(-64)
 #ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch
@@ -1540,6 +1543,8 @@ ApplyPatch personality-fix-per_clear_on_
 # don't optimize out null pointer tests
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
+ApplyPatch make-sock_sendpage-use-kernel_sendpage.patch
+
 # VIA: add 64-bit padlock support, sdmmc driver, temp sensor driver
 ApplyPatch via-centaur-merge-32-64-bit-init.patch
 ApplyPatch via-padlock-fix-might-sleep.patch
@@ -2137,6 +2142,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.7
+- CVE-2009-2692: Fix sock sendpage NULL ptr deref.
+
 * Thu Aug 13 2009 Kristian H?gsberg <krh at redhat.com> - 2.6.29.6-217.2.6
 - Backport 0e7ddf7e to fix bad BUG_ON() in i915 gem fence management
   code.  Adds drm-i915-gem-bad-bug-on.patch, fixes #514091.



From dcantrel at fedoraproject.org  Sat Aug 15 01:10:42 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 15 Aug 2009 01:10:42 +0000 (UTC)
Subject: rpms/dhcp/devel .cvsignore, 1.28, 1.29 dhcp.spec, 1.268,
	1.269 sources, 1.30, 1.31
Message-ID: <20090815011042.9A7EE11C0489@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9770

Modified Files:
	.cvsignore dhcp.spec sources 
Log Message:
* Fri Aug 14 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-4
- Upgrade to latest ldap-for-dhcp patch which makes sure that only
  dhcpd links with OpenLDAP (#517474)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	5 Aug 2009 23:59:10 -0000	1.28
+++ .cvsignore	15 Aug 2009 01:10:42 -0000	1.29
@@ -1,2 +1,2 @@
-ldap-for-dhcp-4.1.0-4.tar.gz
 dhcp-4.1.0p1.tar.gz
+ldap-for-dhcp-4.1.0-5.tar.gz


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- dhcp.spec	12 Aug 2009 21:04:26 -0000	1.268
+++ dhcp.spec	15 Aug 2009 01:10:42 -0000	1.269
@@ -8,12 +8,12 @@
 %define basever 4.1.0
 
 # LDAP patch version
-%define ldappatchver %{basever}-4
+%define ldappatchver %{basever}-5
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  3%{?dist}
+Release:  4%{?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.
@@ -471,6 +471,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Aug 14 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-4
+- Upgrade to latest ldap-for-dhcp patch which makes sure that only
+  dhcpd links with OpenLDAP (#517474)
+
 * Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
 - Update NetworkManager dispatcher script to remove case conversion
   and source /etc/sysconfig/network


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	5 Aug 2009 23:59:10 -0000	1.30
+++ sources	15 Aug 2009 01:10:42 -0000	1.31
@@ -1,2 +1,2 @@
-39b4ff6ce0fcf84c69c12f221b0b6eb4  ldap-for-dhcp-4.1.0-4.tar.gz
 325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz
+f6e192cb2fb0fea15b226732f201d9cd  ldap-for-dhcp-4.1.0-5.tar.gz



From kyle at fedoraproject.org  Sat Aug 15 01:21:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 15 Aug 2009 01:21:24 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1706,1.1707
Message-ID: <20090815012124.DE13811C0077@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12761

Modified Files:
	kernel.spec 
Log Message:
fscking docs


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1706
retrieving revision 1.1707
diff -u -p -r1.1706 -r1.1707
--- kernel.spec	15 Aug 2009 00:26:44 -0000	1.1706
+++ kernel.spec	15 Aug 2009 01:21:24 -0000	1.1707
@@ -100,7 +100,7 @@ Summary: The Linux kernel
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
 %if 0%{?released_kernel}
-%define doc_build_fail false
+%define doc_build_fail true
 %else
 %define doc_build_fail true
 %endif



From dyfet at fedoraproject.org  Sat Aug 15 01:46:58 2009
From: dyfet at fedoraproject.org (David Sugar)
Date: Sat, 15 Aug 2009 01:46:58 +0000 (UTC)
Subject: rpms/sipwitch/devel .cvsignore, 1.4, 1.5 sipwitch.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090815014658.C6EC811C0077@cvs1.fedora.phx.redhat.com>

Author: dyfet

Update of /cvs/pkgs/rpms/sipwitch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19106

Modified Files:
	.cvsignore sipwitch.spec sources 
Log Message:
update to upstream 0.5.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Jul 2009 20:15:14 -0000	1.4
+++ .cvsignore	15 Aug 2009 01:46:58 -0000	1.5
@@ -1 +1 @@
-sipwitch-0.5.6.tar.gz
+sipwitch-0.5.7.tar.gz


Index: sipwitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/sipwitch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sipwitch.spec	27 Jul 2009 04:22:52 -0000	1.5
+++ sipwitch.spec	15 Aug 2009 01:46:58 -0000	1.6
@@ -15,8 +15,8 @@
 
 Name: sipwitch
 Summary: SIP telephony server for secure phone systems
-Version: 0.5.6
-Release: 2%{?dist}
+Version: 0.5.7
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
 Group: Applications/Communications
@@ -246,6 +246,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Fri Aug 14 2009 David Sugar <duyfet at gnutelephony.org> - 0.5.7-1
+- memory corruption issue in allocating subnet access objects fixed
+
 * Sun Jul 26 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/sipwitch/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Jul 2009 20:15:14 -0000	1.4
+++ sources	15 Aug 2009 01:46:58 -0000	1.5
@@ -1 +1 @@
-9dd409baa335e74a580d4432267bf977  sipwitch-0.5.6.tar.gz
+db05132fcbd8dee5a17758137db5cfa1  sipwitch-0.5.7.tar.gz



From dyfet at fedoraproject.org  Sat Aug 15 01:56:39 2009
From: dyfet at fedoraproject.org (David Sugar)
Date: Sat, 15 Aug 2009 01:56:39 +0000 (UTC)
Subject: rpms/sipwitch/F-11 .cvsignore, 1.4, 1.5 sipwitch.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090815015639.6D00311C0077@cvs1.fedora.phx.redhat.com>

Author: dyfet

Update of /cvs/pkgs/rpms/sipwitch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21226

Modified Files:
	.cvsignore sipwitch.spec sources 
Log Message:
update to upstream 0.5.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Jul 2009 20:06:23 -0000	1.4
+++ .cvsignore	15 Aug 2009 01:56:38 -0000	1.5
@@ -1 +1 @@
-sipwitch-0.5.6.tar.gz
+sipwitch-0.5.7.tar.gz


Index: sipwitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/F-11/sipwitch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sipwitch.spec	4 Jul 2009 20:06:24 -0000	1.3
+++ sipwitch.spec	15 Aug 2009 01:56:39 -0000	1.4
@@ -14,7 +14,7 @@
 
 Name: sipwitch
 Summary: SIP telephony server for secure phone systems
-Version: 0.5.6
+Version: 0.5.7
 Release: 0%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
@@ -231,6 +231,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Fri Aug 14 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.7-0
+- upstream fix for memory corruption issue.
+
 * Sat Jul 04 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.6-0
 - split runtime from server to build plugins without requiring server.
 - removed separate rtp proxy, functionality will be integrated into server.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Jul 2009 20:06:24 -0000	1.4
+++ sources	15 Aug 2009 01:56:39 -0000	1.5
@@ -1 +1 @@
-9dd409baa335e74a580d4432267bf977  sipwitch-0.5.6.tar.gz
+db05132fcbd8dee5a17758137db5cfa1  sipwitch-0.5.7.tar.gz



From bpepple at fedoraproject.org  Sat Aug 15 02:02:12 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 15 Aug 2009 02:02:12 +0000 (UTC)
Subject: rpms/papyon/devel import.log, NONE, 1.1 papyon.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090815020212.2DD0111C0077@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22587/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log papyon.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
papyon-0_4_1-3_fc11:HEAD:papyon-0.4.1-3.fc11.src.rpm:1250301940


--- NEW FILE papyon.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           papyon
Version:        0.4.1
Release:        3%{?dist}
Summary:        Python libraries for MSN Messenger network

Group:          Development/Languages
License:        GPLv2+
URL:            http://telepathy.freedesktop.org/wiki/Papyon
Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:	pyOpenSSL
BuildRequires:	python-crypto
BuildRequires:  python-devel
BuildRequires:	pygobject2

Requires:	pyOpenSSL
Requires:	python-crypto
Requires:	pygobject2

Provides:	pymsn = 0.3.4-1
Obsoletes:	pymsn < 0.3.4


%description
%{name} is the library behind the msn connection manager for telepathy.
%{name} uses the glib mainloop to process the network events in an
asynchronous manner


%prep
%setup -q
%{__sed} -i 's|\#!/usr/bin/env python||' papyon/msnp2p/test.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS AUTHORS
%{python_sitelib}/*


%changelog
* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-3
- Clean up some rpmlint error.

* Tue Aug  4 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-2
- Update URL.

* Tue Jul 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1.

* Sun Jul  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.0-1
- Initial spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 17:55:07 -0000	1.1
+++ .cvsignore	15 Aug 2009 02:02:11 -0000	1.2
@@ -0,0 +1 @@
+papyon-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 17:55:07 -0000	1.1
+++ sources	15 Aug 2009 02:02:11 -0000	1.2
@@ -0,0 +1 @@
+b78af3d244bf9bb6460dfec7e0f831bc  papyon-0.4.1.tar.gz



From dyfet at fedoraproject.org  Sat Aug 15 02:12:40 2009
From: dyfet at fedoraproject.org (David Sugar)
Date: Sat, 15 Aug 2009 02:12:40 +0000 (UTC)
Subject: rpms/sipwitch/F-10 .cvsignore, 1.4, 1.5 sipwitch.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090815021240.6E60A11C0077@cvs1.fedora.phx.redhat.com>

Author: dyfet

Update of /cvs/pkgs/rpms/sipwitch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25062

Modified Files:
	.cvsignore sipwitch.spec sources 
Log Message:
update to upstream 0.5.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Jul 2009 19:54:20 -0000	1.4
+++ .cvsignore	15 Aug 2009 02:12:40 -0000	1.5
@@ -1 +1 @@
-sipwitch-0.5.6.tar.gz
+sipwitch-0.5.7.tar.gz


Index: sipwitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/F-10/sipwitch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sipwitch.spec	4 Jul 2009 19:54:21 -0000	1.3
+++ sipwitch.spec	15 Aug 2009 02:12:40 -0000	1.4
@@ -14,7 +14,7 @@
 
 Name: sipwitch
 Summary: SIP telephony server for secure phone systems
-Version: 0.5.6
+Version: 0.5.7
 Release: 0%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
@@ -231,6 +231,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Fri Jul 14 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.7-0
+- upstream fix for memory corruption issue.
+
 * Sat Jul 04 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.6-0
 - split runtime from server to build plugins without requiring server.
 - removed separate rtp proxy, functionality will be integrated into server.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Jul 2009 19:54:21 -0000	1.4
+++ sources	15 Aug 2009 02:12:40 -0000	1.5
@@ -1 +1 @@
-9dd409baa335e74a580d4432267bf977  sipwitch-0.5.6.tar.gz
+db05132fcbd8dee5a17758137db5cfa1  sipwitch-0.5.7.tar.gz



From bpepple at fedoraproject.org  Sat Aug 15 02:18:43 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 15 Aug 2009 02:18:43 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.19,
	1.20 python-telepathy.spec, 1.31, 1.32 sources, 1.19, 1.20
Message-ID: <20090815021843.8781311C0346@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27234

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.10-1
- Update to 0.15.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	15 Jun 2009 22:17:43 -0000	1.19
+++ .cvsignore	15 Aug 2009 02:18:43 -0000	1.20
@@ -1 +1 @@
-telepathy-python-0.15.8.tar.gz
+telepathy-python-0.15.10.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- python-telepathy.spec	26 Jul 2009 23:12:11 -0000	1.31
+++ python-telepathy.spec	15 Aug 2009 02:18:43 -0000	1.32
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.8
-Release:        2%{?dist}
+Version:        0.15.10
+Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.10-1
+- Update to 0.15.10.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	15 Jun 2009 22:17:43 -0000	1.19
+++ sources	15 Aug 2009 02:18:43 -0000	1.20
@@ -1 +1 @@
-d96d8954045c03abcb311460fb4d1dfe  telepathy-python-0.15.8.tar.gz
+0c79eb7023a2c5124d38a60b9fc21881  telepathy-python-0.15.10.tar.gz



From mclasen at fedoraproject.org  Sat Aug 15 02:28:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 02:28:14 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel .cvsignore, 1.5,
	1.6 fedora-gnome-theme.spec, 1.14, 1.15 sources, 1.5, 1.6
Message-ID: <20090815022814.6B17611C0346@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29735

Modified Files:
	.cvsignore fedora-gnome-theme.spec sources 
Log Message:
12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Aug 2009 15:49:58 -0000	1.5
+++ .cvsignore	15 Aug 2009 02:28:14 -0000	1.6
@@ -1 +1 @@
-fedora-gnome-theme-12.0.tar.bz2
+fedora-gnome-theme-12.1.tar.bz2


Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fedora-gnome-theme.spec	7 Aug 2009 20:50:39 -0000	1.14
+++ fedora-gnome-theme.spec	15 Aug 2009 02:28:14 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
-Version: 12.0
+Version: 12.1
 Release: 1%{?dist}
 BuildArch: noarch
 # No version given, no license attribution.
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 12.1-1
+- Add cursor theme to the Fedora metatheme
+
 * Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 12.0-1
 - Bump to 12.0
 - Add gtk-cursor-theme-name to gtkrc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Aug 2009 15:49:58 -0000	1.5
+++ sources	15 Aug 2009 02:28:14 -0000	1.6
@@ -1 +1 @@
-0eada735ee54995da21f54851e2f75a1  fedora-gnome-theme-12.0.tar.bz2
+051e200a5dcb7a366802a477c3ba5fe4  fedora-gnome-theme-12.1.tar.bz2



From bpepple at fedoraproject.org  Sat Aug 15 02:28:58 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 15 Aug 2009 02:28:58 +0000 (UTC)
Subject: rpms/telepathy-butterfly/devel telepathy-butterfly.spec,1.15,1.16
Message-ID: <20090815022858.AE1F911C0346@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29954

Modified Files:
	telepathy-butterfly.spec 
Log Message:
* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
- Update to 0.5.0.
- Add requires on papyon, and drop req on pymsn.



Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- telepathy-butterfly.spec	27 Jul 2009 05:43:07 -0000	1.15
+++ telepathy-butterfly.spec	15 Aug 2009 02:28:58 -0000	1.16
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.3.4
-Release:        2%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -18,8 +18,8 @@ BuildRequires:	dbus-devel
 BuildRequires:	python-devel
 BuildRequires:	pkgconfig
 
-Requires:	python-telepathy
-Requires:	pymsn
+Requires:	python-telepathy >= 0.15.9
+Requires:	papyon >= 0.4.1
 Requires:	dbus
 Requires:	telepathy-filesystem
 
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0.
+- Add requires on papyon, and drop req on pymsn.
+
 * 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
 



From bpepple at fedoraproject.org  Sat Aug 15 02:41:30 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 15 Aug 2009 02:41:30 +0000 (UTC)
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 telepathy-butterfly.spec, 1.16, 1.17
Message-ID: <20090815024130.B71B911C0346@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv533

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
- Actually upload the tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Jun 2009 03:42:17 -0000	1.10
+++ .cvsignore	15 Aug 2009 02:41:30 -0000	1.11
@@ -1 +1 @@
-telepathy-butterfly-0.3.4.tar.gz
+telepathy-butterfly-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Jun 2009 03:42:18 -0000	1.10
+++ sources	15 Aug 2009 02:41:30 -0000	1.11
@@ -1 +1 @@
-932557c19e619dc6327f52a76e71e46d  telepathy-butterfly-0.3.4.tar.gz
+8c55e6446ec40924a655502a66ba6b47  telepathy-butterfly-0.5.0.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- telepathy-butterfly.spec	15 Aug 2009 02:28:58 -0000	1.16
+++ telepathy-butterfly.spec	15 Aug 2009 02:41:30 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           telepathy-butterfly
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MSN connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-2
+- Actually upload the tarball.
+
 * Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
 - Update to 0.5.0.
 - Add requires on papyon, and drop req on pymsn.



From mclasen at fedoraproject.org  Sat Aug 15 02:45:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 02:45:04 +0000 (UTC)
Subject: rpms/file-roller/devel cab.patch, NONE, 1.1 file-roller.spec, 1.152,
	1.153
Message-ID: <20090815024504.1F15F11C0346@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1219

Modified Files:
	file-roller.spec 
Added Files:
	cab.patch 
Log Message:
fix .cab handling


cab.patch:
 nautilus/nautilus-fileroller.c |    2 +-
 src/fr-command-7z.c            |    7 +++++--
 src/main.c                     |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE cab.patch ---
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
index e467e17..d67b69e 100644
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@ -151,7 +151,7 @@ static char *mime_types[] = {
 	"application/x-bzip-compressed-tar",
 	"application/x-bzip1",
 	"application/x-bzip1-compressed-tar",
-	"application/x-cabinet",
+	"application/vnd.ms-cab-compressed",
 	"application/x-cbr",
 	"application/x-cbz",
 	"application/x-cd-image",
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index b24cbd5..ef1eb08 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -512,7 +512,7 @@ fr_command_7z_handle_error (FrCommand   *comm,
 
 const char *sevenz_mime_types[] = { "application/x-7z-compressed",
 				    "application/x-arj",
-				    "application/x-cabinet",
+				    "application/vnd.ms-cab-compressed",
 				    "application/x-cd-image",
 				    /*"application/x-cbr",*/
 				    "application/x-cbz",
@@ -545,7 +545,10 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
 	else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) {
 		capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER | FR_COMMAND_CAN_CREATE_VOLUMES;
 	}
-	else if (is_program_in_path ("7z")) {
+	else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) {
+		capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER | FR_COMMAND_CAN_CREATE_VOLUMES;
+	}
+	else if (is_program_in_path ("7z") || is_program_in_path ("7za")) {
 		if (is_mime_type (mime_type, "application/x-rar")
 		    || is_mime_type (mime_type, "application/x-cbr"))
 		{
diff --git a/src/main.c b/src/main.c
index 0981a23..16cd83b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -88,7 +88,7 @@ FrMimeTypeDescription mime_type_desc[] = {
 	{ "application/x-bzip-compressed-tar",  ".tar.bz2",  N_("Tar compressed with bzip2 (.tar.bz2)"), 0 },
 	{ "application/x-bzip1",                ".bz",       NULL, 0 },
 	{ "application/x-bzip1-compressed-tar", ".tar.bz",   N_("Tar compressed with bzip (.tar.bz)"), 0 },
-	{ "application/x-cabinet",              ".cab",      N_("Cabinet (.cab)"), 0 },
+	{ "application/vnd.ms-cab-compressed",  ".cab",      N_("Cabinet (.cab)"), 0 },
 	{ "application/x-cbr",                  ".cbr",      N_("Rar Archived Comic Book (.cbr)"), 0 },
 	{ "application/x-cbz",                  ".cbz",      N_("Zip Archived Comic Book (.cbz)"), 0 },
 	{ "application/x-cd-image",             ".iso",      NULL, 0 },
@@ -130,7 +130,7 @@ FrExtensionType file_ext_type[] = {
 	{ ".bin", "application/x-stuffit" },
 	{ ".bz", "application/x-bzip" },
 	{ ".bz2", "application/x-bzip" },
-	{ ".cab", "application/x-cabinet" },
+	{ ".cab", "application/vnd.ms-cab-compressed" },
 	{ ".cbr", "application/x-cbr" },
 	{ ".cbz", "application/x-cbz" },
 	{ ".cpio", "application/x-cpio" },


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- file-roller.spec	11 Aug 2009 04:58:02 -0000	1.152
+++ file-roller.spec	15 Aug 2009 02:45:03 -0000	1.153
@@ -11,11 +11,14 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.27.90
-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.27/file-roller-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=591868
+Patch0:		cab.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -50,6 +53,7 @@ such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .cab
 
 autoreconf -f -i
 
@@ -128,6 +132,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
+- Make opening .cab files work
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
 - Update to 2.27.90
 



From mclasen at fedoraproject.org  Sat Aug 15 03:55:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 03:55:04 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel cosmos-wallpaper.xml, NONE,
	1.1 cosmos.xml, NONE, 1.1 gnome-screensaver.spec, 1.218, 1.219
Message-ID: <20090815035504.F0C1F11C0346@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19192

Modified Files:
	gnome-screensaver.spec 
Added Files:
	cosmos-wallpaper.xml cosmos.xml 
Log Message:
Make cosmos images available as background slideshow



--- NEW FILE cosmos-wallpaper.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
<wallpapers>
  <wallpaper deleted="false">
    <name>Cosmos</name>
    <filename>/usr/share/pixmaps/backgrounds/cosmos/cosmos.xml</filename>
    <options>stretched</options>
  </wallpaper>
</wallpapers>


--- NEW FILE cosmos.xml ---
<background>
  <starttime>
    <year>2009</year>
    <month>08</month>
    <day>04</day>
    <hour>00</hour>
    <minute>00</minute>
    <second>00</second>
  </starttime>
<!-- This animation will start at midnight. -->
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/cloud.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/cloud.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/comet.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/comet.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/comet.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/earth-horizon.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/earth-horizon.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/earth-horizon.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/earthrise.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/earthrise.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/earthrise.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/helix-nebula.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/helix-nebula.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/helix-nebula.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/jupiter.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/jupiter.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/jupiter.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/sombrero.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/sombrero.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/sombrero.jpg</from>
    <to>/usr/share/pixmaps/backgrounds/cosmos/whirlpool.jpg</to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file>/usr/share/pixmaps/backgrounds/cosmos/whirlpool.jpg</file>
  </static>
  <transition>
    <duration>5.0</duration>
    <from>/usr/share/pixmaps/backgrounds/cosmos/whirlpool.jpg</from>
    <to></to>
  </transition>
  <static>
    <duration>1795.0</duration>
    <file></file>
  </static>
</background>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- gnome-screensaver.spec	25 Jul 2009 00:46:13 -0000	1.218
+++ gnome-screensaver.spec	15 Aug 2009 03:55:04 -0000	1.219
@@ -14,11 +14,13 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
+Source2: cosmos.xml
+Source3: cosmos-wallpaper.xml
 
 Patch1: gnome-screensaver-2.20.0-default-theme.patch
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
@@ -115,6 +117,10 @@ desktop-file-install --vendor gnome --de
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
+install -D -m644 ${SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/cosmos/cosmos.xml
+
+install -D -m644 ${SOURCE3} $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/cosmos.xml
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -146,6 +152,8 @@ fi
 %{_datadir}/pixmaps/backgrounds/
 %{_datadir}/pixmaps/gnome-logo-white.svg
 %{_datadir}/desktop-directories/gnome-screensaver.directory
+%dir %{_datadir}/gnome-background-properties
+%{_datadir}/gnome-background-properties/cosmos.xml
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/menus/preferences-post-merged/*
 %{_sysconfdir}/xdg/menus/gnome-screensavers.menu
@@ -154,6 +162,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-6
+- Make cosmos images available as background slideshow
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Sat Aug 15 04:00:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 04:00:50 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel use-gtkbuilder.patch,NONE,1.1
Message-ID: <20090815040050.E240711C0346@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20695

Added Files:
	use-gtkbuilder.patch 
Log Message:
add patches


use-gtkbuilder.patch:
 b/configure.ac                           |    3 
 b/data/Makefile.am                       |    8 
 b/data/gnome-screensaver-preferences.ui  |  719 +++++++++++++++++++++++++++++
 b/data/lock-dialog-default.ui            |  523 +++++++++++++++++++++
 b/po/POTFILES.in                         |    4 
 b/src/Makefile.am                        |    2 
 b/src/gnome-screensaver-preferences.c    |  102 ++--
 b/src/gs-lock-plug.c                     |   75 +--
 data/gnome-screensaver-preferences.glade |  760 -------------------------------
 data/lock-dialog-default.glade           |  568 -----------------------
 10 files changed, 1340 insertions(+), 1424 deletions(-)

--- NEW FILE use-gtkbuilder.patch ---
diff --git a/configure.ac b/configure.ac
index 1eb840a..30d0a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ GTK_REQUIRED_VERSION=2.11.5
 LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
 GNOME_DESKTOP_REQUIRED_VERSION=2.23.2
 
-GLADE_REQUIRED_VERSION=2.5.0
 LIBGNOMEKBDUI_REQUIRED_VERSION=0.1
 
 AC_CHECK_HEADERS(unistd.h)
@@ -64,7 +63,6 @@ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
 
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG,
-        libglade-2.0 >= $GLADE_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
         gthread-2.0
         gtk+-2.0 >= $GTK_REQUIRED_VERSION)
@@ -74,7 +72,6 @@ AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS)
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_CAPPLET,
         gio-2.0 >= $GLIB_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        libglade-2.0 >= $GLADE_REQUIRED_VERSION
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
         libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CAPPLET_CFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index 87d46d6..9833cae 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,10 +34,10 @@ menu_DATA =					\
 	gnome-screensavers.menu			\
 	$(NULL)
 
-gladedir = $(pkgdatadir)
-glade_DATA = 					\
-	gnome-screensaver-preferences.glade	\
-	lock-dialog-default.glade		\
+gtkbuilderdir = $(pkgdatadir)
+gtkbuilder_DATA = 					\
+	gnome-screensaver-preferences.ui	\
+	lock-dialog-default.ui		\
 	$(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/data/gnome-screensaver-preferences.glade b/data/gnome-screensaver-preferences.glade
deleted file mode 100644
index 574e142..0000000
--- a/data/gnome-screensaver-preferences.glade
+++ /dev/null
@@ -1,760 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="prefs_dialog">
-  <property name="border_width">5</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Screensaver Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">600</property>
-  <property name="default_height">400</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">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="helpbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-help</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">-11</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="gpm_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-2</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment2">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox11">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image6">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-jump-to</property>
-			  <property name="icon_size">4</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">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label16">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Power _Management</property>
-			  <property name="use_underline">True</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">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</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">-7</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>
[...2670 lines suppressed...]
         char      *string;
         gdouble    activate_delay;
         gboolean   enabled;
         gboolean   is_writable;
         GConfClient *client;
+        GError    *error=NULL;
 
-        glade_file = g_build_filename (GLADEDIR, GLADE_XML_FILE, NULL);
-        xml = glade_xml_new (glade_file, NULL, PACKAGE);
-        g_free (glade_file);
+        gtk_builder_file = g_build_filename (GTKBUILDERDIR, GTK_BUILDER_FILE, NULL);
+        builder = gtk_builder_new();
+        if (!gtk_builder_add_from_file(builder, gtk_builder_file, &error)) {
+                g_warning("Couldn't load builder file: %s", error->message);
+                g_error_free(error);
+        }
+        g_free (gtk_builder_file);
 
-        if (xml == NULL) {
+        if (builder == NULL) {
 
                 dialog = gtk_message_dialog_new (NULL,
                                                  0, GTK_MESSAGE_ERROR,
@@ -1471,26 +1475,26 @@ init_capplet (void)
                 exit (1);
         }
 
-        preview            = glade_xml_get_widget (xml, "preview_area");
-        dialog             = glade_xml_get_widget (xml, "prefs_dialog");
-        treeview           = glade_xml_get_widget (xml, "savers_treeview");
-        list_scroller      = glade_xml_get_widget (xml, "themes_scrolled_window");
-        activate_delay_hscale = glade_xml_get_widget (xml, "activate_delay_hscale");
-        activate_delay_hbox   = glade_xml_get_widget (xml, "activate_delay_hbox");
-        enabled_checkbox   = glade_xml_get_widget (xml, "enable_checkbox");
-        lock_checkbox      = glade_xml_get_widget (xml, "lock_checkbox");
-        root_warning_label = glade_xml_get_widget (xml, "root_warning_label");
-        preview_button     = glade_xml_get_widget (xml, "preview_button");
-        gpm_button         = glade_xml_get_widget (xml, "gpm_button");
-        fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
-        fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
-        fullscreen_preview_close = glade_xml_get_widget (xml, "fullscreen_preview_close");
-        fullscreen_preview_previous = glade_xml_get_widget (xml, "fullscreen_preview_previous_button");
-        fullscreen_preview_next = glade_xml_get_widget (xml, "fullscreen_preview_next_button");
-
-        label              = glade_xml_get_widget (xml, "activate_delay_label");
+        preview            = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
+        dialog             = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
+        treeview           = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+        list_scroller      = GTK_WIDGET (gtk_builder_get_object (builder, "themes_scrolled_window"));
+        activate_delay_hscale = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hscale"));
+        activate_delay_hbox   = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hbox"));
+        enabled_checkbox   = GTK_WIDGET (gtk_builder_get_object (builder, "enable_checkbox"));
+        lock_checkbox      = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
+        root_warning_label = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_label"));
+        preview_button     = GTK_WIDGET (gtk_builder_get_object (builder, "preview_button"));
+        gpm_button         = GTK_WIDGET (gtk_builder_get_object (builder, "gpm_button"));
+        fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
+        fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
+        fullscreen_preview_close = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_close"));
+        fullscreen_preview_previous = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_previous_button"));
+        fullscreen_preview_next = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_next_button"));
+
+        label              = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_label"));
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), activate_delay_hscale);
-        label              = glade_xml_get_widget (xml, "savers_label");
+        label              = GTK_WIDGET (gtk_builder_get_object (builder, "savers_label"));
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), treeview);
 
         gtk_widget_set_no_show_all (root_warning_label, TRUE);
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 0b36a7c..bdb68ae 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -37,7 +37,6 @@
 #include <gdk/gdkx.h>
 #include <X11/XKBlib.h>
 #include <gtk/gtk.h>
-#include <glade/glade-xml.h>
 #include <gconf/gconf-client.h>
 
 #ifdef WITH_KBD_LAYOUT_INDICATOR
@@ -1627,21 +1626,22 @@ load_theme (GSLockPlug *plug)
 {
         char       *theme;
         char       *filename;
-        char       *glade;
+        char       *gtkbuilder;
         char       *rc;
-        GladeXML   *xml;
+        GtkBuilder *builder;
         GtkWidget  *lock_dialog;
+        GError     *error=NULL;
 
         theme = get_dialog_theme_name (plug);
         if (theme == NULL) {
                 return FALSE;
         }
 
-        filename = g_strdup_printf ("lock-dialog-%s.glade", theme);
-        glade = g_build_filename (GLADEDIR, filename, NULL);
+        filename = g_strdup_printf ("lock-dialog-%s.ui", theme);
+        gtkbuilder = g_build_filename (GTKBUILDERDIR, filename, NULL);
         g_free (filename);
-        if (! g_file_test (glade, G_FILE_TEST_IS_REGULAR)) {
-                g_free (glade);
+        if (! g_file_test (gtkbuilder, G_FILE_TEST_IS_REGULAR)) {
+                g_free (gtkbuilder);
                 g_free (theme);
                 return FALSE;
         }
@@ -1649,50 +1649,51 @@ load_theme (GSLockPlug *plug)
         filename = g_strdup_printf ("lock-dialog-%s.gtkrc", theme);
         g_free (theme);
 
-        rc = g_build_filename (GLADEDIR, filename, NULL);
+        rc = g_build_filename (GTKBUILDERDIR, filename, NULL);
         g_free (filename);
         if (g_file_test (rc, G_FILE_TEST_IS_REGULAR)) {
                 gtk_rc_parse (rc);
         }
         g_free (rc);
 
-        xml = glade_xml_new (glade, "lock-dialog", NULL);
+        builder = gtk_builder_new();
 
-        if (xml == NULL) {
-                g_warning ("Failed to load '%s'\n", glade);
-                g_free (glade);
+        if (!gtk_builder_add_from_file (builder,filename ,&error)) {
+                g_warning ("Couldn't load builder file: %s", error->message);
+                g_error_free(error);
+                g_free (gtkbuilder);
                 return FALSE;
         }
-        g_free (glade);
+        g_free (gtkbuilder);
 
-        lock_dialog = glade_xml_get_widget (xml, "lock-dialog");
+        lock_dialog = GTK_WIDGET (gtk_builder_get_object(builder, "lock-dialog"));
         gtk_container_add (GTK_CONTAINER (plug), lock_dialog);
 
         plug->priv->vbox = NULL;
-        plug->priv->notebook = glade_xml_get_widget (xml, "notebook");
-
-        plug->priv->auth_face_image = glade_xml_get_widget (xml, "auth-face-image");
-        plug->priv->auth_action_area = glade_xml_get_widget (xml, "auth-action-area");
-        plug->priv->auth_realname_label = glade_xml_get_widget (xml, "auth-realname-label");
-        plug->priv->auth_username_label = glade_xml_get_widget (xml, "auth-username-label");
-        plug->priv->auth_prompt_label = glade_xml_get_widget (xml, "auth-prompt-label");
-        plug->priv->auth_prompt_entry = glade_xml_get_widget (xml, "auth-prompt-entry");
-        plug->priv->auth_prompt_box = glade_xml_get_widget (xml, "auth-prompt-box");
-        plug->priv->auth_capslock_label = glade_xml_get_widget (xml, "auth-capslock-label");
-        plug->priv->auth_message_label = glade_xml_get_widget (xml, "auth-status-label");
-        plug->priv->auth_unlock_button = glade_xml_get_widget (xml, "auth-unlock-button");
-        plug->priv->auth_cancel_button = glade_xml_get_widget (xml, "auth-cancel-button");
-        plug->priv->auth_logout_button = glade_xml_get_widget (xml, "auth-logout-button");
-        plug->priv->auth_switch_button = glade_xml_get_widget (xml, "auth-switch-button");
-        plug->priv->auth_note_button = glade_xml_get_widget (xml, "auth-note-button");
-        plug->priv->note_tab = glade_xml_get_widget (xml, "note-tab");
-        plug->priv->note_tab_label = glade_xml_get_widget (xml, "note-tab-label");
-        plug->priv->note_ok_button = glade_xml_get_widget (xml, "note-ok-button");
-        plug->priv->note_text_view = glade_xml_get_widget (xml, "note-text-view");
-        plug->priv->note_cancel_button = glade_xml_get_widget (xml, "note-cancel-button");
+        plug->priv->notebook = GTK_WIDGET (gtk_builder_get_object(builder, "notebook"));
+
+        plug->priv->auth_face_image = GTK_WIDGET (gtk_builder_get_object(builder, "auth-face-image"));
+        plug->priv->auth_action_area = GTK_WIDGET (gtk_builder_get_object(builder, "auth-action-area"));
+        plug->priv->auth_realname_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-realname-label"));
+        plug->priv->auth_username_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-username-label"));
+        plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
+        plug->priv->auth_prompt_entry = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-entry"));
+        plug->priv->auth_prompt_box = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-box"));
+        plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
+        plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
+        plug->priv->auth_unlock_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-unlock-button"));
+        plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
+        plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
+        plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
+        plug->priv->auth_note_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-note-button"));
+        plug->priv->note_tab = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab"));
+        plug->priv->note_tab_label = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab-label"));
+        plug->priv->note_ok_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-ok-button"));
+        plug->priv->note_text_view = GTK_WIDGET (gtk_builder_get_object(builder, "note-text-view"));
+        plug->priv->note_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-cancel-button"));
 
         /* Placeholder for the keyboard indicator */
-        plug->priv->auth_prompt_kbd_layout_indicator = glade_xml_get_widget (xml, "auth-prompt-kbd-layout-indicator");
+        plug->priv->auth_prompt_kbd_layout_indicator = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-kbd-layout-indicator"));
         if (plug->priv->auth_logout_button != NULL) {
                 gtk_widget_set_no_show_all (plug->priv->auth_logout_button, TRUE);
         }
@@ -1705,7 +1706,7 @@ load_theme (GSLockPlug *plug)
 
         gtk_widget_show_all (lock_dialog);
 
-        plug->priv->status_message_label = glade_xml_get_widget (xml, "status-message-label");
+        plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
 
         return TRUE;
 }



From kyle at fedoraproject.org  Sat Aug 15 04:32:10 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 15 Aug 2009 04:32:10 +0000 (UTC)
Subject: rpms/kernel/F-10 make-sock_sendpage-use-kernel_sendpage.patch, 1.1, 
	1.2 posix-timers-fix-oops-in-clock_nanosleep.patch, NONE,
	1.1 kernel.spec, 1.1396, 1.1397
Message-ID: <20090815043210.A87E511C0349@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16077

Modified Files:
	kernel.spec 
Added Files:
	make-sock_sendpage-use-kernel_sendpage.patch 
	posix-timers-fix-oops-in-clock_nanosleep.patch 
Log Message:
* Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-96
- For F-10-updates-testing:
- CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.
- CVE-2009-2692: Fix sock sendpage NULL ptr deref.


make-sock_sendpage-use-kernel_sendpage.patch:
 socket.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: make-sock_sendpage-use-kernel_sendpage.patch
===================================================================
RCS file: make-sock_sendpage-use-kernel_sendpage.patch
diff -N make-sock_sendpage-use-kernel_sendpage.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ make-sock_sendpage-use-kernel_sendpage.patch	15 Aug 2009 04:32:10 -0000	1.2
@@ -0,0 +1,37 @@
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Thu, 13 Aug 2009 15:28:36 +0000 (-0700)
+Subject: Make sock_sendpage() use kernel_sendpage()
+X-Git-Tag: v2.6.31-rc6~8
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e694958388c50148389b0e9b9e9e8945cf0f1b98
+
+Make sock_sendpage() use kernel_sendpage()
+
+kernel_sendpage() does the proper default case handling for when the
+socket doesn't have a native sendpage implementation.
+
+Now, arguably this might be something that we could instead solve by
+just specifying that all protocols should do it themselves at the
+protocol level, but we really only care about the common protocols.
+Does anybody really care about sendpage on something like Appletalk? Not
+likely.
+
+Acked-by: David S. Miller <davem at davemloft.net>
+Acked-by: Julien TINNES <julien at cr0.org>
+Acked-by: Tavis Ormandy <taviso at sdf.lonestar.org>
+Cc: stable at kernel.org
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+
+diff --git a/net/socket.c b/net/socket.c
+index 791d71a..6d47165 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
+ 	if (more)
+ 		flags |= MSG_MORE;
+ 
+-	return sock->ops->sendpage(sock, page, offset, size, flags);
++	return kernel_sendpage(sock, page, offset, size, flags);
+ }
+ 
+ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,

posix-timers-fix-oops-in-clock_nanosleep.patch:
 posix-timers.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE posix-timers-fix-oops-in-clock_nanosleep.patch ---
From: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Date: Mon, 3 Aug 2009 02:48:19 +0000 (+0900)
Subject: posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW
X-Git-Tag: v2.6.31-rc6~76^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=70d715fd0597f18528f389b5ac59102263067744

posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW

Prevent calling do_nanosleep() with clockid
CLOCK_MONOTONIC_RAW, it may cause oops, such as NULL pointer
dereference.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: John Stultz <johnstul at us.ibm.com>
Cc: <stable at kernel.org>
LKML-Reference: <4A764FF3.50607 at ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 052ec4d..d089d05 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -202,6 +202,12 @@ static int no_timer_create(struct k_itimer *new_timer)
 	return -EOPNOTSUPP;
 }
 
+static int no_nsleep(const clockid_t which_clock, int flags,
+		     struct timespec *tsave, struct timespec __user *rmtp)
+{
+	return -EOPNOTSUPP;
+}
+
 /*
  * Return nonzero if we know a priori this clockid_t value is bogus.
  */
@@ -254,6 +260,7 @@ static __init int init_posix_timers(void)
 		.clock_get = posix_get_monotonic_raw,
 		.clock_set = do_posix_clock_nosettime,
 		.timer_create = no_timer_create,
+		.nsleep = no_nsleep,
 	};
 
 	register_posix_clock(CLOCK_REALTIME, &clock_realtime);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1396
retrieving revision 1.1397
diff -u -p -r1.1396 -r1.1397
--- kernel.spec	28 Jul 2009 20:04:17 -0000	1.1396
+++ kernel.spec	15 Aug 2009 04:32:10 -0000	1.1397
@@ -598,6 +598,9 @@ Patch30: linux-2.6-iommu-fixes.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch50: make-sock_sendpage-use-kernel_sendpage.patch
+Patch51: posix-timers-fix-oops-in-clock_nanosleep.patch
+
 Patch81: linux-2.6-defaults-saner-vm-settings.patch
 Patch90: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
 Patch91: linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
@@ -1167,6 +1170,9 @@ ApplyPatch linux-2.6-iommu-fixes.patch
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
+ApplyPatch make-sock_sendpage-use-kernel_sendpage.patch
+ApplyPatch posix-timers-fix-oops-in-clock_nanosleep.patch
+
 ApplyPatch linux-2.6-defaults-saner-vm-settings.patch
 ApplyPatch linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
 ApplyPatch linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
@@ -1987,6 +1993,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-96
+- For F-10-updates-testing:
+- CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.
+- CVE-2009-2692: Fix sock sendpage NULL ptr deref.
+
 * Tue Jul 28 2009 Eric Sandeen <sandeen at redhat.com>
 - Fix eCryptfs overflow issues (CVE-2009-2406, CVE-2009-2407)
 



From kyle at fedoraproject.org  Sat Aug 15 04:33:06 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 15 Aug 2009 04:33:06 +0000 (UTC)
Subject: rpms/kernel/F-11 posix-timers-fix-oops-in-clock_nanosleep.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1679.2.7, 1.1679.2.8
Message-ID: <20090815043306.9EEF311C0349@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16395

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	posix-timers-fix-oops-in-clock_nanosleep.patch 
Log Message:
* Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.8
- CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.


posix-timers-fix-oops-in-clock_nanosleep.patch:
 posix-timers.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE posix-timers-fix-oops-in-clock_nanosleep.patch ---
From: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Date: Mon, 3 Aug 2009 02:48:19 +0000 (+0900)
Subject: posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW
X-Git-Tag: v2.6.31-rc6~76^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=70d715fd0597f18528f389b5ac59102263067744

posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW

Prevent calling do_nanosleep() with clockid
CLOCK_MONOTONIC_RAW, it may cause oops, such as NULL pointer
dereference.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: John Stultz <johnstul at us.ibm.com>
Cc: <stable at kernel.org>
LKML-Reference: <4A764FF3.50607 at ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 052ec4d..d089d05 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -202,6 +202,12 @@ static int no_timer_create(struct k_itimer *new_timer)
 	return -EOPNOTSUPP;
 }
 
+static int no_nsleep(const clockid_t which_clock, int flags,
+		     struct timespec *tsave, struct timespec __user *rmtp)
+{
+	return -EOPNOTSUPP;
+}
+
 /*
  * Return nonzero if we know a priori this clockid_t value is bogus.
  */
@@ -254,6 +260,7 @@ static __init int init_posix_timers(void)
 		.clock_get = posix_get_monotonic_raw,
 		.clock_set = do_posix_clock_nosettime,
 		.timer_create = no_timer_create,
+		.nsleep = no_nsleep,
 	};
 
 	register_posix_clock(CLOCK_REALTIME, &clock_realtime);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.7
retrieving revision 1.1679.2.8
diff -u -p -r1.1679.2.7 -r1.1679.2.8
--- kernel.spec	15 Aug 2009 00:27:03 -0000	1.1679.2.7
+++ kernel.spec	15 Aug 2009 04:33:06 -0000	1.1679.2.8
@@ -610,6 +610,7 @@ Patch30: linux-2.6-iommu-fixes.patch
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch50: make-sock_sendpage-use-kernel_sendpage.patch
+Patch51: posix-timers-fix-oops-in-clock_nanosleep.patch
 
 #Patch101: linux-2.6-e820-save-restore-edi-ebp.patch
 #Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
@@ -1544,6 +1545,7 @@ ApplyPatch personality-fix-per_clear_on_
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
 ApplyPatch make-sock_sendpage-use-kernel_sendpage.patch
+ApplyPatch posix-timers-fix-oops-in-clock_nanosleep.patch
 
 # VIA: add 64-bit padlock support, sdmmc driver, temp sensor driver
 ApplyPatch via-centaur-merge-32-64-bit-init.patch
@@ -2142,6 +2144,9 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.8
+- CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.
+
 * Fri Aug 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.7
 - CVE-2009-2692: Fix sock sendpage NULL ptr deref.
 



From mclasen at fedoraproject.org  Sat Aug 15 04:38:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 04:38:24 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.219,1.220
Message-ID: <20090815043824.44C0511C0349@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17668

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix spec



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- gnome-screensaver.spec	15 Aug 2009 03:55:04 -0000	1.219
+++ gnome-screensaver.spec	15 Aug 2009 04:38:24 -0000	1.220
@@ -117,9 +117,9 @@ desktop-file-install --vendor gnome --de
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-install -D -m644 ${SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/cosmos/cosmos.xml
+install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/cosmos/cosmos.xml
 
-install -D -m644 ${SOURCE3} $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/cosmos.xml
+install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/cosmos.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From remi at fedoraproject.org  Sat Aug 15 05:55:07 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 15 Aug 2009 05:55:07 +0000 (UTC)
Subject: rpms/php-pecl-apc/devel .cvsignore, 1.5, 1.6 php-pecl-apc.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090815055508.46ED711C0349@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-apc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2784

Modified Files:
	.cvsignore php-pecl-apc.spec sources 
Log Message:
update to 3.1.3p1 (still beta), better php 5.3.0?support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-apc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Jul 2009 06:56:00 -0000	1.5
+++ .cvsignore	15 Aug 2009 05:55:05 -0000	1.6
@@ -1 +1 @@
-APC-3.1.2.tgz
+APC-3.1.3p1.tgz


Index: php-pecl-apc.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-apc/devel/php-pecl-apc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-pecl-apc.spec	26 Jul 2009 18:33:51 -0000	1.12
+++ php-pecl-apc.spec	15 Aug 2009 05:55:06 -0000	1.13
@@ -6,8 +6,8 @@
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.2
-Release:       2%{?dist}
+Version:       3.1.3p1
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -71,14 +71,14 @@ popd
 ; Enable apc extension module
 extension = apc.so
 
-; Options for the APC module version 3.1.x
+; Options for the APC module version >= 3.1.3
 
 ; This can be set to 0 to disable APC. 
 apc.enabled=1
 ; The number of shared memory segments to allocate for the compiler cache. 
 apc.shm_segments=1
 ; The size of each shared memory segment in MB.
-apc.shm_size=32
+apc.shm_size=64
 ; A "hint" about the number of distinct source files that will be included or 
 ; requested on your web server. Set to zero or omit if you're not sure;
 apc.num_files_hint=1024
@@ -88,6 +88,8 @@ apc.user_entries_hint=4096
 ; The number of seconds a cache entry is allowed to idle in a slot in case this
 ; cache entry slot is needed by another entry.
 apc.ttl=7200
+; use the SAPI request start time for TTL
+apc.use_request_time=1
 ; The number of seconds a user cache entry is allowed to idle in a slot in case
 ; this cache entry slot is needed by another entry.
 apc.user_ttl=7200
@@ -126,6 +128,8 @@ apc.rfc1867_freq=0
 apc.rfc1867_ttl=3600
 ; Optimize include_once and require_once calls and avoid the expensive system calls used.
 apc.include_once_override=0
+apc.lazy_classes=00
+apc.lazy_functions=0
 ; not documented
 apc.coredump_unmap=0
 apc.file_md5=0
@@ -133,6 +137,14 @@ apc.preload_path
 EOF
 
 
+%check
+cd %{pecl_name}-%{version}
+TEST_PHP_EXECUTABLE=$(which php) php run-tests.php \
+    -n -q -d extension_dir=modules \
+    -d extension=apc.so \
+|| true  # 1 test fails http://pecl.php.net/bugs/bug.php?id=16793
+
+
 %if 0%{?pecl_install:1}
 %post
 %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
@@ -162,6 +174,11 @@ fi
 
 
 %changelog
+* Fri Aug 14 2009 Remi Collet <Fedora at FamilleCollet.com> - 3.1.3p1-1
+- update to 3.1.3 patch1 (beta, for PHP 5.3 support)
+- add test suite (disabled for http://pecl.php.net/bugs/bug.php?id=16793)
+- add use_request_time, lazy_classes, lazy_functions options (apc.ini)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-apc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Jul 2009 06:56:00 -0000	1.6
+++ sources	15 Aug 2009 05:55:06 -0000	1.7
@@ -1 +1 @@
-0a18cf164b3e044e27edd4c1d8c3145c  APC-3.1.2.tgz
+941cf59c3f8042c1d6961b7afb1002b9  APC-3.1.3p1.tgz



From mclasen at fedoraproject.org  Sat Aug 15 05:55:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 05:55:54 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel cosmos.xml, 1.1,
	1.2 gnome-screensaver.spec, 1.220, 1.221
Message-ID: <20090815055554.722CA11C0349@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2628

Modified Files:
	cosmos.xml gnome-screensaver.spec 
Log Message:
Make slideshow cyclic



Index: cosmos.xml
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/cosmos.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cosmos.xml	15 Aug 2009 03:55:04 -0000	1.1
+++ cosmos.xml	15 Aug 2009 05:55:53 -0000	1.2
@@ -87,10 +87,5 @@
   <transition>
     <duration>5.0</duration>
     <from>/usr/share/pixmaps/backgrounds/cosmos/whirlpool.jpg</from>
-    <to></to>
-  </transition>
-  <static>
-    <duration>1795.0</duration>
-    <file></file>
-  </static>
+    <to>/usr/share/pixmaps/backgrounds/cosmos/cloud.jpg</to>
 </background>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- gnome-screensaver.spec	15 Aug 2009 04:38:24 -0000	1.220
+++ gnome-screensaver.spec	15 Aug 2009 05:55:54 -0000	1.221
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -162,6 +162,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-7
+- Make the slideshow cyclic
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-6
 - Make cosmos images available as background slideshow
 



From musuruan at fedoraproject.org  Sat Aug 15 08:29:01 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 15 Aug 2009 08:29:01 +0000 (UTC)
Subject: rpms/fbzx/devel README_fbzx.Fedora, NONE,
	1.1 fbzx-generate-tarball.sh, 
	NONE, 1.1 fbzx.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090815082901.E348C11C0349@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6408/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README_fbzx.Fedora fbzx-generate-tarball.sh fbzx.spec 
	import.log 
Log Message:
First import



--- NEW FILE README_fbzx.Fedora ---
ATTENTION!

Due to Fedora policy, this version of FBZX has been packaged WITHOUT the ROMs. 
These are available from RPM Fusion: http://rpmfusion.org/

If you have RPM Fusion nonfree repository enabled, simply install the 'spectrum-roms' package.

Otherwise download FBZX tarball from: http://www.rastersoft.com/fbzx.html. Then 
extract the ROMs from the 'spectrum-roms' subdirectory and copy them in 
'/usr/share/spectrum-roms/'.



--- NEW FILE fbzx-generate-tarball.sh ---
#!/bin/sh

NAME=fbzx
VERSION=$1

mkdir $NAME
cd $NAME
tar xvfj ../$NAME-$VERSION.tar.bz2
rm -rf $NAME-$VERSION/spectrum-roms/
tar cvfj ../$NAME-$VERSION-noroms.tar.bz2 .
cd ..
rm -rf $NAME



--- NEW FILE fbzx.spec ---
Name:           fbzx
Version:        2.1b
Release:        2%{?dist}
Summary:        A ZX Spectrum emulator for FrameBuffer

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.rastersoft.com/fbzx.html
Source0:        %{name}-%{version}-noroms.tar.bz2
# The above file is derived from:
# http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# This file contains Spectrum ROMs and cannot be shipped in Fedora. 
# Therefore we use this script to remove them before shipping it. 
# Download the upstream tarball and invoke this script while in 
# the tarball's directory:
# ./fbxz-generate-tarball.sh 2.1b
Source1:        %{name}-generate-tarball.sh
Source2:        README_%{name}.Fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
FBZX is a Sinclair Spectrum emulator, designed to work at full screen using 
the FrameBuffer or under X-Windows. 


%prep
%setup -q

# Fix desktop file version
sed -i -e "/^Version/s|2.1|1.0|" fbzx.desktop

# Patch to use rpm optflags 
sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile

# Fix source file permissions
chmod 644 z80free/Z80free.c

# Clean out accidentally packaged file
rm -f fbzx


%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

#install application
mkdir -p %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}

# install data
mkdir -p %{buildroot}%{_datadir}/%{name}
install -p -m 644 keymap.bmp %{buildroot}%{_datadir}/%{name}

# install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -p -m 644 %{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps

# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
  --vendor '' \
  --add-category Emulator \
  --dir %{buildroot}%{_datadir}/applications \
  %{name}.desktop

# install Fedora README
install -pm0644 %{SOURCE2} README.Fedora


%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,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
%doc AMSTRAD CAPABILITIES COPYING FAQ README* TODO VERSIONS


%changelog
* Wed Aug 12 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-2
- Icon is now installed into %%{_datadir}/icons/hicolor/scalable/apps
- Added missing desktop-file-utils to BuildRequires
- Added missing hicolor-icon-theme to Requires
- Preserved timestamps

* Sat Jul 25 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-1
- First release



--- NEW FILE import.log ---
fbzx-2_1b-2_fc10:HEAD:fbzx-2.1b-2.fc10.src.rpm:1250324873


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 15:59:56 -0000	1.1
+++ .cvsignore	15 Aug 2009 08:28:59 -0000	1.2
@@ -0,0 +1 @@
+fbzx-2.1b-noroms.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 15:59:56 -0000	1.1
+++ sources	15 Aug 2009 08:28:59 -0000	1.2
@@ -0,0 +1 @@
+2976fed44540325511e9965e3f37d3b9  fbzx-2.1b-noroms.tar.bz2



From musuruan at fedoraproject.org  Sat Aug 15 08:35:15 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 15 Aug 2009 08:35:15 +0000 (UTC)
Subject: rpms/fbzx/F-11 README_fbzx.Fedora, NONE,
	1.1 fbzx-generate-tarball.sh, 
	NONE, 1.1 fbzx.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090815083515.D42B211C0349@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7524/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README_fbzx.Fedora fbzx-generate-tarball.sh fbzx.spec 
	import.log 
Log Message:
First import



--- NEW FILE README_fbzx.Fedora ---
ATTENTION!

Due to Fedora policy, this version of FBZX has been packaged WITHOUT the ROMs. 
These are available from RPM Fusion: http://rpmfusion.org/

If you have RPM Fusion nonfree repository enabled, simply install the 'spectrum-roms' package.

Otherwise download FBZX tarball from: http://www.rastersoft.com/fbzx.html. Then 
extract the ROMs from the 'spectrum-roms' subdirectory and copy them in 
'/usr/share/spectrum-roms/'.



--- NEW FILE fbzx-generate-tarball.sh ---
#!/bin/sh

NAME=fbzx
VERSION=$1

mkdir $NAME
cd $NAME
tar xvfj ../$NAME-$VERSION.tar.bz2
rm -rf $NAME-$VERSION/spectrum-roms/
tar cvfj ../$NAME-$VERSION-noroms.tar.bz2 .
cd ..
rm -rf $NAME



--- NEW FILE fbzx.spec ---
Name:           fbzx
Version:        2.1b
Release:        2%{?dist}
Summary:        A ZX Spectrum emulator for FrameBuffer

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.rastersoft.com/fbzx.html
Source0:        %{name}-%{version}-noroms.tar.bz2
# The above file is derived from:
# http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# This file contains Spectrum ROMs and cannot be shipped in Fedora. 
# Therefore we use this script to remove them before shipping it. 
# Download the upstream tarball and invoke this script while in 
# the tarball's directory:
# ./fbxz-generate-tarball.sh 2.1b
Source1:        %{name}-generate-tarball.sh
Source2:        README_%{name}.Fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
FBZX is a Sinclair Spectrum emulator, designed to work at full screen using 
the FrameBuffer or under X-Windows. 


%prep
%setup -q

# Fix desktop file version
sed -i -e "/^Version/s|2.1|1.0|" fbzx.desktop

# Patch to use rpm optflags 
sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile

# Fix source file permissions
chmod 644 z80free/Z80free.c

# Clean out accidentally packaged file
rm -f fbzx


%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

#install application
mkdir -p %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}

# install data
mkdir -p %{buildroot}%{_datadir}/%{name}
install -p -m 644 keymap.bmp %{buildroot}%{_datadir}/%{name}

# install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -p -m 644 %{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps

# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
  --vendor '' \
  --add-category Emulator \
  --dir %{buildroot}%{_datadir}/applications \
  %{name}.desktop

# install Fedora README
install -pm0644 %{SOURCE2} README.Fedora


%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,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
%doc AMSTRAD CAPABILITIES COPYING FAQ README* TODO VERSIONS


%changelog
* Wed Aug 12 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-2
- Icon is now installed into %%{_datadir}/icons/hicolor/scalable/apps
- Added missing desktop-file-utils to BuildRequires
- Added missing hicolor-icon-theme to Requires
- Preserved timestamps

* Sat Jul 25 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-1
- First release



--- NEW FILE import.log ---
fbzx-2_1b-2_fc10:F-11:fbzx-2.1b-2.fc10.src.rpm:1250324997


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 15:59:56 -0000	1.1
+++ .cvsignore	15 Aug 2009 08:35:15 -0000	1.2
@@ -0,0 +1 @@
+fbzx-2.1b-noroms.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 15:59:56 -0000	1.1
+++ sources	15 Aug 2009 08:35:15 -0000	1.2
@@ -0,0 +1 @@
+2976fed44540325511e9965e3f37d3b9  fbzx-2.1b-noroms.tar.bz2



From musuruan at fedoraproject.org  Sat Aug 15 08:40:26 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 15 Aug 2009 08:40:26 +0000 (UTC)
Subject: rpms/fbzx/F-10 README_fbzx.Fedora, NONE,
	1.1 fbzx-generate-tarball.sh, 
	NONE, 1.1 fbzx.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090815084026.C9D4D11C0489@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/fbzx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9508/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README_fbzx.Fedora fbzx-generate-tarball.sh fbzx.spec 
	import.log 
Log Message:
First import



--- NEW FILE README_fbzx.Fedora ---
ATTENTION!

Due to Fedora policy, this version of FBZX has been packaged WITHOUT the ROMs. 
These are available from RPM Fusion: http://rpmfusion.org/

If you have RPM Fusion nonfree repository enabled, simply install the 'spectrum-roms' package.

Otherwise download FBZX tarball from: http://www.rastersoft.com/fbzx.html. Then 
extract the ROMs from the 'spectrum-roms' subdirectory and copy them in 
'/usr/share/spectrum-roms/'.



--- NEW FILE fbzx-generate-tarball.sh ---
#!/bin/sh

NAME=fbzx
VERSION=$1

mkdir $NAME
cd $NAME
tar xvfj ../$NAME-$VERSION.tar.bz2
rm -rf $NAME-$VERSION/spectrum-roms/
tar cvfj ../$NAME-$VERSION-noroms.tar.bz2 .
cd ..
rm -rf $NAME



--- NEW FILE fbzx.spec ---
Name:           fbzx
Version:        2.1b
Release:        2%{?dist}
Summary:        A ZX Spectrum emulator for FrameBuffer

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.rastersoft.com/fbzx.html
Source0:        %{name}-%{version}-noroms.tar.bz2
# The above file is derived from:
# http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# This file contains Spectrum ROMs and cannot be shipped in Fedora. 
# Therefore we use this script to remove them before shipping it. 
# Download the upstream tarball and invoke this script while in 
# the tarball's directory:
# ./fbxz-generate-tarball.sh 2.1b
Source1:        %{name}-generate-tarball.sh
Source2:        README_%{name}.Fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
FBZX is a Sinclair Spectrum emulator, designed to work at full screen using 
the FrameBuffer or under X-Windows. 


%prep
%setup -q

# Fix desktop file version
sed -i -e "/^Version/s|2.1|1.0|" fbzx.desktop

# Patch to use rpm optflags 
sed -i -e "s/^\(CC\ =\).*/\1 gcc \$(CFLAGS) \$(SDL_CFLAGS)/" Makefile

# Fix source file permissions
chmod 644 z80free/Z80free.c

# Clean out accidentally packaged file
rm -f fbzx


%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

#install application
mkdir -p %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}

# install data
mkdir -p %{buildroot}%{_datadir}/%{name}
install -p -m 644 keymap.bmp %{buildroot}%{_datadir}/%{name}

# install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -p -m 644 %{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps

# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
  --vendor '' \
  --add-category Emulator \
  --dir %{buildroot}%{_datadir}/applications \
  %{name}.desktop

# install Fedora README
install -pm0644 %{SOURCE2} README.Fedora


%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,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
%doc AMSTRAD CAPABILITIES COPYING FAQ README* TODO VERSIONS


%changelog
* Wed Aug 12 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-2
- Icon is now installed into %%{_datadir}/icons/hicolor/scalable/apps
- Added missing desktop-file-utils to BuildRequires
- Added missing hicolor-icon-theme to Requires
- Preserved timestamps

* Sat Jul 25 2009 Andrea Musuruane <musuruan at gmail.com> 2.1b-1
- First release



--- NEW FILE import.log ---
fbzx-2_1b-2_fc10:F-10:fbzx-2.1b-2.fc10.src.rpm:1250325431


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 15:59:56 -0000	1.1
+++ .cvsignore	15 Aug 2009 08:40:26 -0000	1.2
@@ -0,0 +1 @@
+fbzx-2.1b-noroms.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbzx/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 15:59:56 -0000	1.1
+++ sources	15 Aug 2009 08:40:26 -0000	1.2
@@ -0,0 +1 @@
+2976fed44540325511e9965e3f37d3b9  fbzx-2.1b-noroms.tar.bz2



From pkgdb at fedoraproject.org  Sat Aug 15 09:58:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 15 Aug 2009 09:58:23 +0000
Subject: [pkgdb] ddclient had acl change status
Message-ID: <20090815095823.D626910F857@bastion2.fedora.phx.redhat.com>

subhodip has set the watchbugzilla acl on ddclient (Fedora 11) to Approved for jrowens

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ddclient



From pkgdb at fedoraproject.org  Sat Aug 15 09:58:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 15 Aug 2009 09:58:25 +0000
Subject: [pkgdb] ddclient had acl change status
Message-ID: <20090815095825.40F8D10F85C@bastion2.fedora.phx.redhat.com>

subhodip has set the watchcommits acl on ddclient (Fedora 11) to Approved for jrowens

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ddclient



From robert at fedoraproject.org  Sat Aug 15 10:28:27 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 15 Aug 2009 10:28:27 +0000 (UTC)
Subject: rpms/gnaughty/devel gnaughty.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090815102827.50B9211C0382@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnaughty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3327/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnaughty.spec 
Log Message:
Import into Fedora as provenpackager on behalf of Simon Wesp (Red Hat Bugzilla #503013, comment #29).



--- NEW FILE gnaughty.spec ---
Name:           gnaughty
Version:        1.2.0
Release:        2%{?dist}
Summary:        Downloader for adult content
Group:          Applications/Internet
License:        GPLv2+
URL:            http://gnaughty.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:    libglade2-devel
BuildRequires:    gtk2-devel
BuildRequires:    GConf2-devel
BuildRequires:    libcurl-devel
BuildRequires:    pcre-devel
BuildRequires:    desktop-file-utils

Requires(pre):    GConf2
Requires(preun):  GConf2
Requires(post):   GConf2


%description
Application to download automatically adult sex content, i.e. movies and 
pictures, from a known internet directory.


%prep
%setup -q

sed -i 's|Icon=%{name}.png|Icon=%{name}|g' %{name}.desktop
sed -i 's|Comment=Porn downloader|Comment=Downloader for adult content|g' %{name}.desktop


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1

make install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install \
        --dir=%{buildroot}%{_datadir}/applications \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
    gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
    gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%post
export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :


%clean
rm -rf %{buildroot}


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png


%changelog
* Fri May 29 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.2.0-2
- Replace "porn" with "adult content" in spec and desktopfile
- Remove Featurelist from DESCRIPTION

* Thu May 28 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.2.0-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnaughty/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:36:15 -0000	1.1
+++ .cvsignore	15 Aug 2009 10:28:26 -0000	1.2
@@ -0,0 +1 @@
+gnaughty-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnaughty/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:36:15 -0000	1.1
+++ sources	15 Aug 2009 10:28:26 -0000	1.2
@@ -0,0 +1 @@
+c4ba9b800af39c98dfe927788d42cd9b  gnaughty-1.2.0.tar.gz



From robert at fedoraproject.org  Sat Aug 15 10:28:27 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 15 Aug 2009 10:28:27 +0000 (UTC)
Subject: rpms/gnaughty/F-11 gnaughty.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090815102827.4CAD211C0349@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnaughty/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3327/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gnaughty.spec 
Log Message:
Import into Fedora as provenpackager on behalf of Simon Wesp (Red Hat Bugzilla #503013, comment #29).



--- NEW FILE gnaughty.spec ---
Name:           gnaughty
Version:        1.2.0
Release:        2%{?dist}
Summary:        Downloader for adult content
Group:          Applications/Internet
License:        GPLv2+
URL:            http://gnaughty.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:    libglade2-devel
BuildRequires:    gtk2-devel
BuildRequires:    GConf2-devel
BuildRequires:    libcurl-devel
BuildRequires:    pcre-devel
BuildRequires:    desktop-file-utils

Requires(pre):    GConf2
Requires(preun):  GConf2
Requires(post):   GConf2


%description
Application to download automatically adult sex content, i.e. movies and 
pictures, from a known internet directory.


%prep
%setup -q

sed -i 's|Icon=%{name}.png|Icon=%{name}|g' %{name}.desktop
sed -i 's|Comment=Porn downloader|Comment=Downloader for adult content|g' %{name}.desktop


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1

make install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install \
        --dir=%{buildroot}%{_datadir}/applications \
        %{buildroot}/%{_datadir}/applications/%{name}.desktop


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
    gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
    gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi


%post
export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :


%clean
rm -rf %{buildroot}


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png


%changelog
* Fri May 29 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.2.0-2
- Replace "porn" with "adult content" in spec and desktopfile
- Remove Featurelist from DESCRIPTION

* Thu May 28 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 1.2.0-1
- Initial package build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnaughty/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Aug 2009 05:36:15 -0000	1.1
+++ .cvsignore	15 Aug 2009 10:28:26 -0000	1.2
@@ -0,0 +1 @@
+gnaughty-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnaughty/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Aug 2009 05:36:15 -0000	1.1
+++ sources	15 Aug 2009 10:28:26 -0000	1.2
@@ -0,0 +1 @@
+c4ba9b800af39c98dfe927788d42cd9b  gnaughty-1.2.0.tar.gz



From lkundrak at fedoraproject.org  Sat Aug 15 12:01:36 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 15 Aug 2009 12:01:36 +0000 (UTC)
Subject: rpms/sunbird/F-11 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 sunbird.spec, 1.29, 1.30 sunbird-0.9-gcc44.patch, 1.1,
	NONE thunderbird-pango.patch, 1.1, NONE
Message-ID: <20090815120137.0702B11C0349@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28873

Modified Files:
	.cvsignore sources sunbird.spec 
Removed Files:
	sunbird-0.9-gcc44.patch thunderbird-pango.patch 
Log Message:
* Sun Jun 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.5.20090715hg
- Sync up with Thunderbird



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Jun 2009 13:00:23 -0000	1.12
+++ .cvsignore	15 Aug 2009 12:01:36 -0000	1.13
@@ -1,2 +1 @@
-sunbird-1.0-20090513hg.tar.lzma
-sunbird-l10n.tar
+thunderbird-3.0b3-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Jun 2009 13:00:23 -0000	1.12
+++ sources	15 Aug 2009 12:01:36 -0000	1.13
@@ -1,2 +1,2 @@
 9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar
-76e7c2ac4767049156b9b7a9d4036239  sunbird-1.0-20090513hg.tar.lzma
+84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sunbird.spec	28 Jun 2009 13:00:23 -0000	1.29
+++ sunbird.spec	15 Aug 2009 12:01:36 -0000	1.30
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.5.20090513hg%{?dist}
+Release:        0.5.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        sunbird-1.0-20090513hg.tar.lzma
+Source0:        thunderbird-3.0b3-source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -32,12 +32,10 @@ Source100:      find-external-requires
 
 # Pulled from Thunderbird
 Patch0:         mozilla-jemalloc.patch
-Patch1:         thunderbird-pango.patch
 
 # Ours
 Patch10:        sunbird-1.0-libical.patch
 Patch11:        sunbird-1.0-uilocale.patch
-Patch12:        sunbird-0.9-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,8 +71,8 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-Requires:       thunderbird >= 3.0-2.4.b3pre
-Requires:       thunderbird < 3.0-2.4.b4
+Requires:       thunderbird >= 3.0-2.6.b3
+Requires:       thunderbird < 3.0-2.6.b4
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -107,12 +105,10 @@ calendaring tasks.
 
 
 %prep
-%setup -q -a 2
+%setup -c -q -a 2
 %patch0 -p0 -b .jemalloc
-%patch1 -p1 -b .pango
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
-%patch12 -p0 -b .gcc44
 
 find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
 
@@ -299,6 +295,9 @@ fi
 
 
 %changelog
+* Sun Jun 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.5.20090715hg
+- Sync up with Thunderbird
+
 * Sun Jun 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.5.20090513hg
 - Sync up with Thunderbird
 - Enable the Google Data Provider


--- sunbird-0.9-gcc44.patch DELETED ---


--- thunderbird-pango.patch DELETED ---



From jgarzik at fedoraproject.org  Sat Aug 15 12:04:46 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat, 15 Aug 2009 12:04:46 +0000 (UTC)
Subject: rpms/cld/devel .cvsignore, 1.2, 1.3 cld.spec, 1.16, 1.17 sources,
	1.13, 1.14
Message-ID: <20090815120446.8EDD211C0349@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29739

Modified Files:
	.cvsignore cld.spec sources 
Log Message:
upstream version 0.2 released


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 20:12:32 -0000	1.2
+++ .cvsignore	15 Aug 2009 12:04:46 -0000	1.3
@@ -1 +1 @@
-cld-0.2git.tar.gz
+cld-0.2.tar.gz


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cld.spec	14 Aug 2009 23:32:06 -0000	1.16
+++ cld.spec	15 Aug 2009 12:04:46 -0000	1.17
@@ -1,15 +1,13 @@
 Name:		cld
 Version:	0.2
-Release:	0.17.gbb117496%{?dist}
+Release:	1%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit bb11749606a204b9ab87b815352d231179dba7a1
-# to recreate tarball, check out commit, then run "make dist"
-Source0:	cld-%{version}git.tar.gz
+Source0:	cld-%{version}.tar.gz
 Source2:	cld.init
 Source3:	cld.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,7 +38,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q -n cld-0.2git
+%setup -q
 
 %build
 %configure --disable-static
@@ -101,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-1
+- Upstream version 0.2 release.
+
 * Fri Aug 14 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.17.gbb117496
 - update to commit bb11749606a204b9ab87b815352d231179dba7a1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Aug 2009 23:32:06 -0000	1.13
+++ sources	15 Aug 2009 12:04:46 -0000	1.14
@@ -1 +1 @@
-a27c772d28038c4c09c52fd9d374e847  cld-0.2git.tar.gz
+fa486b987fad42f511640816cfea7a0e  cld-0.2.tar.gz



From jwrdegoede at fedoraproject.org  Sat Aug 15 12:37:09 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 15 Aug 2009 12:37:09 +0000 (UTC)
Subject: rpms/flight-of-the-amazon-queen-cd/devel
	flight-of-the-amazon-queen-cd.spec, 1.4, 1.5
Message-ID: <20090815123709.DBB9F11C0349@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5346

Modified Files:
	flight-of-the-amazon-queen-cd.spec 
Log Message:
Drop Source# url's as the files are no longer available upstream (change to be picked up with next build)


Index: flight-of-the-amazon-queen-cd.spec
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel/flight-of-the-amazon-queen-cd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- flight-of-the-amazon-queen-cd.spec	24 Jul 2009 22:54:27 -0000	1.4
+++ flight-of-the-amazon-queen-cd.spec	15 Aug 2009 12:37:09 -0000	1.5
@@ -11,9 +11,9 @@ URL:            http://www.scummvm.org/d
 # from the original data using queenrebuild (scummvm tools).
 #
 # queenrebuild --ogg -Q -b 16 queen.1
-Source0:        ftp://ftp.suse.com/pub/suse/i386/supplementary/X/FOTAQ/queen.1c.bz2
+Source0:        queen.1c.bz2
 Source1:        %{name}.desktop
-Source2:        ftp://ftp.suse.com/pub/suse/i386/supplementary/X/FOTAQ/readme.txt
+Source2:        readme.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildArch:      noarch



From jgarzik at fedoraproject.org  Sat Aug 15 12:55:01 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat, 15 Aug 2009 12:55:01 +0000 (UTC)
Subject: rpms/chunkd/devel .cvsignore, 1.2, 1.3 chunkd.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20090815125501.64DA711C0349@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9399

Modified Files:
	.cvsignore chunkd.spec sources 
Log Message:
update to update version 0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 15:45:20 -0000	1.2
+++ .cvsignore	15 Aug 2009 12:55:01 -0000	1.3
@@ -1 +1 @@
-chunkd-0.4git.tar.gz
+chunkd-0.4.tar.gz


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- chunkd.spec	12 Aug 2009 21:32:23 -0000	1.10
+++ chunkd.spec	15 Aug 2009 12:55:01 -0000	1.11
@@ -1,22 +1,24 @@
 Name:		chunkd
 Version:	0.4
-Release:	0.11.g8749c45c%{?dist}
+Release:	1%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 8749c45cb46a26dcf3f93369665da6573204d028
-# to recreate tarball, check out commit, then run "make dist"
-Source0:	chunkd-%{version}git.tar.gz
+Source0:	chunkd-%{version}.tar.gz
 Source2:	chunkd.init
 Source3:	chunkd.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # N.B. We need cld to build, because our "make check" spawns a private copy.
 BuildRequires:	libevent-devel glib2-devel openssl-devel zlib-devel
-BuildRequires:	libxml2-devel procps cld cld-devel
+BuildRequires:	libxml2-devel procps
+BuildRequires:	cld >= 0.2
+BuildRequires:	cld-devel >= 0.2
+
+Requires:	cld >= 0.2
 
 %description
 Single-node data storage daemon for cloud computing.
@@ -31,13 +33,14 @@ Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Requires: cld-devel >= 0.2
 
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}git
+%setup -q
 
 
 %build
@@ -95,6 +98,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-1
+- Update to release version 0.4.
+
 * Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.11.g8749c45c
 - update source to commit 8749c45cb46a26dcf3f93369665da6573204d028
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Aug 2009 21:32:23 -0000	1.8
+++ sources	15 Aug 2009 12:55:01 -0000	1.9
@@ -1 +1 @@
-166afd3e8357132b9354ace41b272357  chunkd-0.4git.tar.gz
+c35af84524521216422aad1cf9fc7599  chunkd-0.4.tar.gz



From jgarzik at fedoraproject.org  Sat Aug 15 15:08:02 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat, 15 Aug 2009 15:08:02 +0000 (UTC)
Subject: rpms/tabled/devel .cvsignore, 1.2, 1.3 sources, 1.8, 1.9 tabled.spec,
	1.10, 1.11
Message-ID: <20090815150802.A31BA11C0349@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9217

Modified Files:
	.cvsignore sources tabled.spec 
Log Message:
update to release version 0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jul 2009 16:00:06 -0000	1.2
+++ .cvsignore	15 Aug 2009 15:08:01 -0000	1.3
@@ -1 +1 @@
-tabled-0.3git.tar.gz
+tabled-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Aug 2009 21:36:16 -0000	1.8
+++ sources	15 Aug 2009 15:08:01 -0000	1.9
@@ -1 +1 @@
-13557d3b279dc820d7325f3cf9596666  tabled-0.3git.tar.gz
+4beccbcd7adefac4fac775e9ebec4bc1  tabled-0.3.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tabled.spec	12 Aug 2009 21:36:16 -0000	1.10
+++ tabled.spec	15 Aug 2009 15:08:01 -0000	1.11
@@ -1,15 +1,13 @@
 Name:		tabled
 Version:	0.3
-Release:	0.11.g7f6a0b63%{?dist}
+Release:	1%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 7f6a0b639167eb64adf223d9f38d13c61e4ff185
-# to recreate tarball, check out commit, then run "make dist"
-Source0:	tabled-%{version}git.tar.gz
+Source0:	tabled-%{version}.tar.gz
 Source2:	tabled.init
 Source3:	tabled.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +15,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 # N.B. We need chunkd and cld to build, because our "make check" spawns
 # private copies of infrastructure daemons.
 BuildRequires:	db4-devel libevent-devel glib2-devel pcre-devel
-BuildRequires:	chunkd chunkd-devel cld cld-devel libcurl-devel
+BuildRequires:	chunkd cld libcurl-devel
 BuildRequires:	procps
+BuildRequires:	cld-devel >= 0.2
+BuildRequires:	chunkd-devel >= 0.4
+
+Requires:	cld >= 0.2
+Requires:	chunkd >= 0.4
 
 # chunkd is broken on big-endian... embarrassing!!!
 # FIXME: remove this when chunkd is fixed
@@ -43,7 +46,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}git
+%setup -q
 
 
 %build
@@ -102,6 +105,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-1
+- update to release version 0.3
+
 * Wed Aug 12 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-0.11.g7f6a0b63
 - update to git commit 7f6a0b639167eb64adf223d9f38d13c61e4ff185
 



From jgarzik at fedoraproject.org  Sat Aug 15 15:31:57 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Sat, 15 Aug 2009 15:31:57 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.11,1.12
Message-ID: <20090815153157.D639111C0349@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14257

Modified Files:
	chunkd.spec 
Log Message:
remove cld-devel dependency from client lib


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- chunkd.spec	15 Aug 2009 12:55:01 -0000	1.11
+++ chunkd.spec	15 Aug 2009 15:31:56 -0000	1.12
@@ -33,7 +33,6 @@ Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: cld-devel >= 0.2
 
 %description devel
 The %{name}-devel package contains libraries and header files for



From jkratoch at fedoraproject.org  Sat Aug 15 15:51:34 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Sat, 15 Aug 2009 15:51:34 +0000 (UTC)
Subject: rpms/gdb/F-11 gdb-delayed-symfile-aranges.patch, NONE, 1.1 gdb.spec,
	1.360, 1.361
Message-ID: <20090815155134.AE8F411C0349@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18578

Modified Files:
	gdb.spec 
Added Files:
	gdb-delayed-symfile-aranges.patch 
Log Message:
* Sat Aug 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-37
- Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
- Temporarily disabled orphanripper on Fedora 11.


gdb-delayed-symfile-aranges.patch:
 b/gdb/testsuite/gdb.dwarf2/dw2-aranges.S   |  140 +++++++++++++++++++++++++++++
 b/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp |   40 ++++++++
 gdb/dwarf2read.c                           |   42 ++++++++
 3 files changed, 221 insertions(+), 1 deletion(-)

--- NEW FILE gdb-delayed-symfile-aranges.patch ---
archer-tromey-delayed-symfile d0fe3272b8b3b64a9a72912d334a9adca8c66a99
archer-tromey-delayed-symfile 77fa7778a37b0d28a7e4e5235f074a10ecf1815d
archer-tromey-delayed-symfile <1 check-in after 77fa7778a37b0d28a7e4e5235f074a10ecf1815d>

[ Backported for F-11.  ]

--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1421,9 +1421,28 @@ dwarf2_create_quick_addrmap (struct objfile *objfile)
       unsigned int bytes_read, segment_size, delta;
       LONGEST info_offset;
       struct dwarf2_cu cu;
+      char *end_ptr;
 
       cu_header.initial_length_size = 0;
+      end_ptr = aranges_ptr;
       aranges_ptr = read_comp_unit_head (&cu_header, aranges_ptr, abfd);
+      end_ptr += cu_header.initial_length_size + cu_header.length;
+
+      /* Sanity check.  */
+      if (end_ptr - aranges_ptr >= dwarf2_per_objfile->aranges_size)
+	{
+	  do_cleanups (old);
+	  complaint (&symfile_complaints,
+		     _("aranges entry runs off end of `.debug_aranges' section, ignored"));
+	  return;
+	}
+      if (cu_header.addr_size == 0)
+	{
+	  do_cleanups (old);
+	  complaint (&symfile_complaints,
+		     _("aranges entry has zero addr_size, ignored"));
+	  return;
+	}
 
       segment_size = read_1_byte (abfd, aranges_ptr);
       aranges_ptr += 1;
@@ -1450,9 +1469,30 @@ dwarf2_create_quick_addrmap (struct objfile *objfile)
 	  if (address == 0 && length == 0)
 	    break;
 
+	  if (length == 0)
+	    {
+	      do_cleanups (old);
+	      complaint (&symfile_complaints,
+			 _("aranges entry has zero length, ignored"));
+	      return;
+	    }
+
 	  address += baseaddr;
 
-	  addrmap_set_empty (mutable_map, address, address + length, objfile);
+	  addrmap_set_empty (mutable_map, address, address + length - 1,
+			     objfile);
+	}
+
+      /* Some older versions of GCC incorrectly started the arange
+	 with a (0,0) pair.  If we encounter any oddity while reading
+	 the section, just abandon the attempt; falling back to the
+	 slower code is always safe.  */
+      if (aranges_ptr != end_ptr)
+	{
+	  do_cleanups (old);
+	  complaint (&symfile_complaints,
+		     _("aranges entry ends early, ignored"));
+	  return;
 	}
     }
 
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-aranges.S
@@ -0,0 +1,140 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Test .debug_aranges containing zero address_size.  */
+
+/* Dummy function to provide debug information for.  */
+
+	.text
+.Lbegin_text1:
+	.globl main
+	.type main, %function
+main:
+.Lbegin_main:
+	.int 0
+.Lend_main:
+	.size main, .-main
+.Lend_text1:
+
+/* Debug information */
+
+	.section .debug_info
+.Lcu1_begin:
+	/* CU header */
+	.4byte	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
+.Lcu1_start:
+	.2byte	2				/* DWARF Version */
+	.4byte	.Labbrev1_begin			/* Offset into abbrev section */
+	.byte	4				/* Pointer size */
+
+	/* CU die */
+	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
+	.4byte	.Lend_text1			/* DW_AT_high_pc */
+	.4byte	.Lbegin_text1			/* DW_AT_low_pc */
+	.ascii	"file1.txt\0"			/* DW_AT_name */
+	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
+	.byte	1				/* DW_AT_language (C) */
+
+	/* main */
+	.uleb128	2			/* Abbrev: DW_TAG_subprogram */
+	.byte		1			/* DW_AT_external */
+	.byte		1			/* DW_AT_decl_file */
+	.byte		2			/* DW_AT_decl_line */
+	.ascii		"main\0"		/* DW_AT_name */
+	.4byte		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
+	.4byte		.Lbegin_main	/* DW_AT_low_pc */
+	.4byte		.Lend_main		/* DW_AT_high_pc */
+	.byte		1			/* DW_AT_frame_base: length */
+	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
+
+.Ltype_int:
+	.uleb128	3			/* Abbrev: DW_TAG_base_type */
+	.ascii		"int\0"			/* DW_AT_name */
+	.byte		4			/* DW_AT_byte_size */
+	.byte		5			/* DW_AT_encoding */
+
+	.byte		0			/* End of children of CU */
+
+.Lcu1_end:
+
+/* Abbrev table */
+	.section .debug_abbrev
+.Labbrev1_begin:
+	.uleb128	1			/* Abbrev code */
+	.uleb128	0x11			/* DW_TAG_compile_unit */
+	.byte		1			/* has_children */
+	.uleb128	0x12			/* DW_AT_high_pc */
+	.uleb128	0x1			/* DW_FORM_addr */
+	.uleb128	0x11			/* DW_AT_low_pc */
+	.uleb128	0x1			/* DW_FORM_addr */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0x25			/* DW_AT_producer */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0x13			/* DW_AT_language */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.uleb128	2			/* Abbrev code */
+	.uleb128	0x2e			/* DW_TAG_subprogram */
+	.byte		0			/* has_children */
+	.uleb128	0x3f			/* DW_AT_external */
+	.uleb128	0xc			/* DW_FORM_flag */
+	.uleb128	0x3a			/* DW_AT_decl_file */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.uleb128	0x3b			/* DW_AT_decl_line */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0x49			/* DW_AT_type */
+	.uleb128	0x13			/* DW_FORM_ref4 */
+	.uleb128	0x11			/* DW_AT_low_pc */
+	.uleb128	0x1			/* DW_FORM_addr */
+	.uleb128	0x12			/* DW_AT_high_pc */
+	.uleb128	0x1			/* DW_FORM_addr */
+	.uleb128	0x40			/* DW_AT_frame_base */
+	.uleb128	0xa			/* DW_FORM_block1 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.uleb128	3			/* Abbrev code */
+	.uleb128	0x24			/* DW_TAG_base_type */
+	.byte		0			/* has_children */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0xb			/* DW_AT_byte_size */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.uleb128	0x3e			/* DW_AT_encoding */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+
+/* aranges table */
+	.section .debug_aranges
+	.long	.Laranges_end - 1f
+1:
+	.2byte	2				/* aranges Version */
+	.4byte	.Lcu1_begin - .debug_info	/* Offset into .debug_info section */
+	/* The GDB crasher is this zero value.  */
+	.byte		0			/* aranges address_size */
+	.byte		0			/* aranges segment_size */
+
+.Laranges_end:
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp
@@ -0,0 +1,40 @@
+# Copyright 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test .debug_aranges containing zero address_size.
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+# For now pick a sampling of likely targets.
+if {![istarget *-*-linux*]
+    && ![istarget *-*-gnu*]
+    && ![istarget *-*-elf*]
+    && ![istarget *-*-openbsd*]
+    && ![istarget arm-*-eabi*]
+    && ![istarget powerpc-*-eabi*]} {
+    return 0  
+}
+
+set testfile "dw2-aranges"
+set srcfile ${testfile}.S
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {nodebug}] != "" } {
+    return -1
+}
+
+clean_restart $testfile
+
+# Failed gdb_load would abort the testcase execution earlier.
+pass "file loaded"


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -p -r1.360 -r1.361
--- gdb.spec	2 Aug 2009 08:15:19 -0000	1.360
+++ gdb.spec	15 Aug 2009 15:51:34 -0000	1.361
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 36%{?_with_upstream:.upstream}%{?dist}
+Release: 37%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -391,6 +391,9 @@ Patch374: gdb-bz507267-block-sort-fast.p
 # Fix crash running gdbserver (incompatibility with python).
 Patch376: gdb-python-gdbserver-tp-crash.patch
 
+# Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
+Patch377: gdb-delayed-symfile-aranges.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -591,6 +594,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch370 -p1
 %patch374 -p1
 %patch376 -p1
+%patch377 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -748,7 +752,8 @@ gcc -o ./orphanripper %{SOURCE2} -Wall -
   CHECK="$(echo $CHECK|sed 's#check//unix/[^ ]*#& &/-fPIE/-pie#g')"
 %endif	# 0%{!?_with_upstream:1}
 
-  ./orphanripper make %{?_smp_mflags} -k $CHECK || :
+  # FIXME: Temporary F11 disable: ./orphanripper
+  make %{?_smp_mflags} -k $CHECK || :
 )
 for t in sum log
 do
@@ -870,6 +875,10 @@ fi
 %endif
 
 %changelog
+* Sat Aug 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-37
+- Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
+- Temporarily disabled orphanripper on Fedora 11.
+
 * Sun Aug  2 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-36
 - Fix compilation error typo in the previous commit 6.8.50.20090302-35.
 



From lmacken at fedoraproject.org  Sat Aug 15 17:19:40 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 15 Aug 2009 17:19:40 +0000 (UTC)
Subject: rpms/python-sqlalchemy0.5/F-10 import.log, NONE,
	1.1 python-sqlalchemy0.5.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090815171940.2D71D11C0349@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-sqlalchemy0.5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7704/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-sqlalchemy0.5.spec 
Log Message:
Initial import of python-sqlalchemy0.5


--- NEW FILE import.log ---
python-sqlalchemy0_5-0_5_5-1_fc11:F-10:python-sqlalchemy0.5-0.5.5-1.fc11.src.rpm:1250342130


--- NEW FILE python-sqlalchemy0.5.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]")}

%define srcname SQLAlchemy

Name:           python-sqlalchemy0.5
Version:        0.5.5
Release:        1%{?dist}
Summary:        Modular and flexible ORM library for python

Group:          Development/Libraries
License:        MIT
URL:            http://www.sqlalchemy.org/
Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel >= 0.6c3
BuildRequires:  python-sqlite2
BuildRequires:  python-nose


%description
SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible,
high-level interface to SQL databases.  Database and domain concepts are
decoupled, allowing both sides maximum flexibility and power. SQLAlchemy
provides a powerful mapping layer that can work as automatically or as manually
as you choose, determining relationships based on foreign keys or letting you
define the join conditions explicitly, to bridge the gap between database and
domain.

%prep
%setup -q -n %{srcname}-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{python_sitelib}
easy_install -m --prefix %{buildroot}%{_usr} dist/*.egg
sed -i 's/\r//' examples/dynamic_dict/dynamic_dict.py
find %{buildroot}%{python_sitelib} -type f -exec chmod a-x \{\} \;


# remove unnecessary scripts for building documentation
rm -rf doc/build

%clean
rm -rf %{buildroot}

%check
export PYTHONPATH=.
python setup.py develop -d .
nosetests


%files
%defattr(-,root,root,-)
%doc README LICENSE PKG-INFO CHANGES doc examples
%{python_sitelib}/*

%changelog
* Sat Aug 15 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- Switch to using nose for running the test suite

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.5.3-3
- Remove conflicting easy-install.pth file from our site-packages

* Fri Jul 10 2009 Luke Macken <lmacken at redhat.com> - 0.5.3-2
- Remove the executable bit from *.py

* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
- Upstream bugfix release.

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.

* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5-0.1.rc4
- Update to 0.5.0rc4 which works with the new pysqlite
- And update test cases to work with the new pysqlite

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.7-2
- Rebuild for Python 2.6

* Sun Jul 27 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.7-1
- Update to 0.4.7.

* Sun Jun 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.6-1
- Update to 0.4.6.

* Tue Apr 8 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.5-1
- Update to 0.4.5.

* Fri Feb 22 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.3-1
- Update to 0.4.3.

* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4.2-1.p3
- Update to 0.4.2p3.

* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4.1-1
- Update to 0.4.1.

* Wed Oct 17 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4.0-1
- SQLAlchemy-0.4.0 final
- Run the testsuite

* Wed Oct  3 2007 Luke Macken <lmacken at redhat.com> 0.4.0-0.4.beta6
- SQLAlchemy-0.4.0beta6

* Tue Sep 11 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta5
- Update to 0.4beta5.

* Fri Sep 06 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta4
- setuptools has been fixed.

* Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
- setuptools seems to be broken WRT having an active and inactive version
  of an egg.  Have to make both versions inactive and manually setup a copy
  that can be started via import. (Necessary for the sqlalchemy0.3 compat
  package.)

* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.2.beta4
- Modify setuptools to handle the -devel subpackage split in F-8.

* Mon Aug 27 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.0-0.1.beta4
- Update to 0.4 beta4.

* Tue Jul 24 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.10-2
- Remove python-abi Requires.  This is automatic since FC4+.

* Tue Jul 24 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.10-1
- Update to new upstream version 0.3.10

* Fri Mar 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.6-1
- Update to new upstream version 0.3.6

* Sat Mar 10 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.5-1
- Update to new upstream version 0.3.5
- Simplify the files listing

* Tue Jan 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.4-2
- Remember to upload the source tarball to the lookaside cache.

* Tue Jan 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.4-1
- Update to new upstream version 0.3.4

* Mon Jan 01 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.3-1
- Update to new upstream version 0.3.3

* Sat Dec 09 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.1-2
- Bump and rebuild for python 2.5 on devel.
- BuildRequire: python-devel as a header is missing otherwise.

* Fri Nov 24 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.1-1
- Update to new upstream version 0.3.1

* Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 0.2.7-2
- Rebuild for FC6

* Thu Aug 17 2006 Shahms E. King <shahms at shahms.com> 0.2.7-1
- Update to new upstream version

* Fri Aug 11 2006 Shahms E. King <shahms at shahms.com> 0.2.6-2
- Include, don't ghost .pyo files per new guidelines

* Tue Aug 08 2006 Shahms E. King <shahms at shahms.com> 0.2.6-1
- Update to new upstream version

* Fri Jul 07 2006 Shahms E. King <shahms at shahms.com> 0.2.4-1
- Update to new upstream version

* Mon Jun 26 2006 Shahms E. King <shahms at shahms.com> 0.2.3-1
- Update to new upstream version

* Wed May 31 2006 Shahms E. King <shahms at shahms.com> 0.2.1-1
- Update to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy0.5/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:16:38 -0000	1.1
+++ .cvsignore	15 Aug 2009 17:19:39 -0000	1.2
@@ -0,0 +1 @@
+SQLAlchemy-0.5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy0.5/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:16:38 -0000	1.1
+++ sources	15 Aug 2009 17:19:39 -0000	1.2
@@ -0,0 +1 @@
+6a518d2c16caf10bdbce85ad06e08abb  SQLAlchemy-0.5.5.tar.gz



From lmacken at fedoraproject.org  Sat Aug 15 17:21:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 15 Aug 2009 17:21:00 +0000 (UTC)
Subject: rpms/python-sqlalchemy0.5/EL-5 import.log, NONE,
	1.1 python-sqlalchemy0.5.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090815172100.CF27911C0349@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-sqlalchemy0.5/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8174/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-sqlalchemy0.5.spec 
Log Message:
Initial import of python-sqlalchemy0.5


--- NEW FILE import.log ---
python-sqlalchemy0_5-0_5_5-1_fc11:EL-5:python-sqlalchemy0.5-0.5.5-1.fc11.src.rpm:1250342216


--- NEW FILE python-sqlalchemy0.5.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]")}

%define srcname SQLAlchemy

Name:           python-sqlalchemy0.5
Version:        0.5.5
Release:        1%{?dist}
Summary:        Modular and flexible ORM library for python

Group:          Development/Libraries
License:        MIT
URL:            http://www.sqlalchemy.org/
Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel >= 0.6c3
BuildRequires:  python-sqlite2
BuildRequires:  python-nose


%description
SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible,
high-level interface to SQL databases.  Database and domain concepts are
decoupled, allowing both sides maximum flexibility and power. SQLAlchemy
provides a powerful mapping layer that can work as automatically or as manually
as you choose, determining relationships based on foreign keys or letting you
define the join conditions explicitly, to bridge the gap between database and
domain.

%prep
%setup -q -n %{srcname}-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{python_sitelib}
easy_install -m --prefix %{buildroot}%{_usr} dist/*.egg
sed -i 's/\r//' examples/dynamic_dict/dynamic_dict.py
find %{buildroot}%{python_sitelib} -type f -exec chmod a-x \{\} \;


# remove unnecessary scripts for building documentation
rm -rf doc/build

%clean
rm -rf %{buildroot}

%check
export PYTHONPATH=.
python setup.py develop -d .
nosetests


%files
%defattr(-,root,root,-)
%doc README LICENSE PKG-INFO CHANGES doc examples
%{python_sitelib}/*

%changelog
* Sat Aug 15 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- Switch to using nose for running the test suite

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.5.3-3
- Remove conflicting easy-install.pth file from our site-packages

* Fri Jul 10 2009 Luke Macken <lmacken at redhat.com> - 0.5.3-2
- Remove the executable bit from *.py

* Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
- Upstream bugfix release.

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.

* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5-0.1.rc4
- Update to 0.5.0rc4 which works with the new pysqlite
- And update test cases to work with the new pysqlite

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.7-2
- Rebuild for Python 2.6

* Sun Jul 27 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.7-1
- Update to 0.4.7.

* Sun Jun 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.6-1
- Update to 0.4.6.

* Tue Apr 8 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.5-1
- Update to 0.4.5.

* Fri Feb 22 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.3-1
- Update to 0.4.3.

* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4.2-1.p3
- Update to 0.4.2p3.

* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4.1-1
- Update to 0.4.1.

* Wed Oct 17 2007 Toshio Kuratomi <a.badger at gmail.com> 0.4.0-1
- SQLAlchemy-0.4.0 final
- Run the testsuite

* Wed Oct  3 2007 Luke Macken <lmacken at redhat.com> 0.4.0-0.4.beta6
- SQLAlchemy-0.4.0beta6

* Tue Sep 11 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta5
- Update to 0.4beta5.

* Fri Sep 06 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.4.beta4
- setuptools has been fixed.

* Fri Aug 31 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.3.beta4
- setuptools seems to be broken WRT having an active and inactive version
  of an egg.  Have to make both versions inactive and manually setup a copy
  that can be started via import. (Necessary for the sqlalchemy0.3 compat
  package.)

* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.4.0-0.2.beta4
- Modify setuptools to handle the -devel subpackage split in F-8.

* Mon Aug 27 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.4.0-0.1.beta4
- Update to 0.4 beta4.

* Tue Jul 24 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.10-2
- Remove python-abi Requires.  This is automatic since FC4+.

* Tue Jul 24 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.10-1
- Update to new upstream version 0.3.10

* Fri Mar 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.6-1
- Update to new upstream version 0.3.6

* Sat Mar 10 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.5-1
- Update to new upstream version 0.3.5
- Simplify the files listing

* Tue Jan 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.4-2
- Remember to upload the source tarball to the lookaside cache.

* Tue Jan 23 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.4-1
- Update to new upstream version 0.3.4

* Mon Jan 01 2007 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.3-1
- Update to new upstream version 0.3.3

* Sat Dec 09 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.1-2
- Bump and rebuild for python 2.5 on devel.
- BuildRequire: python-devel as a header is missing otherwise.

* Fri Nov 24 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.3.1-1
- Update to new upstream version 0.3.1

* Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 0.2.7-2
- Rebuild for FC6

* Thu Aug 17 2006 Shahms E. King <shahms at shahms.com> 0.2.7-1
- Update to new upstream version

* Fri Aug 11 2006 Shahms E. King <shahms at shahms.com> 0.2.6-2
- Include, don't ghost .pyo files per new guidelines

* Tue Aug 08 2006 Shahms E. King <shahms at shahms.com> 0.2.6-1
- Update to new upstream version

* Fri Jul 07 2006 Shahms E. King <shahms at shahms.com> 0.2.4-1
- Update to new upstream version

* Mon Jun 26 2006 Shahms E. King <shahms at shahms.com> 0.2.3-1
- Update to new upstream version

* Wed May 31 2006 Shahms E. King <shahms at shahms.com> 0.2.1-1
- Update to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy0.5/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:16:38 -0000	1.1
+++ .cvsignore	15 Aug 2009 17:21:00 -0000	1.2
@@ -0,0 +1 @@
+SQLAlchemy-0.5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy0.5/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:16:38 -0000	1.1
+++ sources	15 Aug 2009 17:21:00 -0000	1.2
@@ -0,0 +1 @@
+6a518d2c16caf10bdbce85ad06e08abb  SQLAlchemy-0.5.5.tar.gz



From rdieter at fedoraproject.org  Sat Aug 15 20:15:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 15 Aug 2009 20:15:16 +0000 (UTC)
Subject: rpms/qt/devel 0288-more-x-keycodes.patch, NONE,
	1.1 287-qmenu-respect-minwidth, NONE, 1.1 qt.spec, 1.305, 1.306
Message-ID: <20090815201516.99B6611C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13347

Modified Files:
	qt.spec 
Added Files:
	0288-more-x-keycodes.patch 287-qmenu-respect-minwidth 
Log Message:
* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-7
- kde-qt: 287-qmenu-respect-minwidth
- kde-qt: 0288-more-x-keycodes (#475247)


0288-more-x-keycodes.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 0288-more-x-keycodes.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] 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.1



--- NEW FILE 287-qmenu-respect-minwidth ---
>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] 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.1



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- qt.spec	5 Aug 2009 20:59:40 -0000	1.305
+++ qt.spec	15 Aug 2009 20:15:15 -0000	1.306
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -62,6 +62,10 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 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
+# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
+Patch0288: 0288-more-x-keycodes.patch
 # we'll want to switch to the kde-qt branches, e.g.:
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/4.5.2-patched
 # once they actually contain all the patches from qt-copy (0283 and 0285 are
@@ -400,6 +404,9 @@ popd
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
+%patch287 -p1 -b .287-qmenu-respect
+%patch0288 -p1 -b .0288-more-x-keycodes
+
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 
@@ -922,6 +929,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Sat Aug 18 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-6
 - use linker scripts for _debug targets (#510246)
 - tighten deps using %%{?_isa}



From rdieter at fedoraproject.org  Sat Aug 15 20:18:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 15 Aug 2009 20:18:11 +0000 (UTC)
Subject: rpms/qt/devel 287-qmenu-respect-minwidth.patch, NONE, 1.1 qt.spec, 
	1.306, 1.307 287-qmenu-respect-minwidth, 1.1, NONE
Message-ID: <20090815201811.F31A311C0489@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13934

Modified Files:
	qt.spec 
Added Files:
	287-qmenu-respect-minwidth.patch 
Removed Files:
	287-qmenu-respect-minwidth 
Log Message:
sanitize patch name (oops)


287-qmenu-respect-minwidth.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 287-qmenu-respect-minwidth.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] 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.1



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- qt.spec	15 Aug 2009 20:15:15 -0000	1.306
+++ qt.spec	15 Aug 2009 20:18:11 -0000	1.307
@@ -63,7 +63,7 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 
 ## qt-copy patches
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/01f26d0756839fbe783c637ca7dec5b7987f7e14.patch
-Patch287: 287-qmenu-respect-minwidth
+Patch287: 287-qmenu-respect-minwidth.patch
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
 Patch0288: 0288-more-x-keycodes.patch
 # we'll want to switch to the kde-qt branches, e.g.:
@@ -404,7 +404,7 @@ popd
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
-%patch287 -p1 -b .287-qmenu-respect
+%patch287 -p1 -b .287-qmenu-respect-minwidth
 %patch0288 -p1 -b .0288-more-x-keycodes
 
 # drop -fexceptions from $RPM_OPT_FLAGS


--- 287-qmenu-respect-minwidth DELETED ---



From rdieter at fedoraproject.org  Sat Aug 15 20:28:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 15 Aug 2009 20:28:38 +0000 (UTC)
Subject: rpms/qt/F-11 0288-more-x-keycodes.patch, NONE,
	1.1 287-qmenu-respect-minwidth.patch, NONE, 1.1 qt.spec, 1.276, 1.277
Message-ID: <20090815202838.2112811C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15858

Modified Files:
	qt.spec 
Added Files:
	0288-more-x-keycodes.patch 287-qmenu-respect-minwidth.patch 
Log Message:
* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
- kde-qt: 287-qmenu-respect-minwidth
- kde-qt: 0288-more-x-keycodes (#475247)


0288-more-x-keycodes.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 0288-more-x-keycodes.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] 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.1


287-qmenu-respect-minwidth.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 287-qmenu-respect-minwidth.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] 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.1



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- qt.spec	5 Aug 2009 21:02:54 -0000	1.276
+++ qt.spec	15 Aug 2009 20:28:37 -0000	1.277
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -58,6 +58,10 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 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
+# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
+Patch0288: 0288-more-x-keycodes.patch
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
@@ -374,6 +378,9 @@ test -x apply_patches && ./apply_patches
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
+%patch287 -p1 -b .287-qmenu-respect
+%patch0288 -p1 -b .0288-more-x-keycodes
+
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 
@@ -872,6 +879,10 @@ fi
 
 
 %changelog
+* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
+- 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
 - use linker scripts for _debug targets (#510246)
 - apply upstream patch to fix issue in Copy and paste



From mclasen at fedoraproject.org  Sat Aug 15 21:07:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 15 Aug 2009 21:07:12 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel cosmos.xml, 1.2,
	1.3 gnome-screensaver.spec, 1.221, 1.222
Message-ID: <20090815210712.AF97111C0349@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23133

Modified Files:
	cosmos.xml gnome-screensaver.spec 
Log Message:
fix xml



Index: cosmos.xml
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/cosmos.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cosmos.xml	15 Aug 2009 05:55:53 -0000	1.2
+++ cosmos.xml	15 Aug 2009 21:07:12 -0000	1.3
@@ -88,4 +88,5 @@
     <duration>5.0</duration>
     <from>/usr/share/pixmaps/backgrounds/cosmos/whirlpool.jpg</from>
     <to>/usr/share/pixmaps/backgrounds/cosmos/cloud.jpg</to>
+  </transition>
 </background>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- gnome-screensaver.spec	15 Aug 2009 05:55:54 -0000	1.221
+++ gnome-screensaver.spec	15 Aug 2009 21:07:12 -0000	1.222
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -162,6 +162,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Sat Aug 15 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-8
+- Manual XML editing considered harmful...
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-7
 - Make the slideshow cyclic
 



From slankes at fedoraproject.org  Sat Aug 15 21:22:07 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat, 15 Aug 2009 21:22:07 +0000 (UTC)
Subject: rpms/merkaartor/F-11 merkaartor-noqgtkstyle.patch, 1.1,
	1.2 merkaartor.spec, 1.12, 1.13 sources, 1.7,
	1.8 merkaartor-eslang.patch, 1.1, NONE
Message-ID: <20090815212207.9925011C0349@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26698

Modified Files:
	merkaartor-noqgtkstyle.patch merkaartor.spec sources 
Removed Files:
	merkaartor-eslang.patch 
Log Message:
* Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
- 0.14


merkaartor-noqgtkstyle.patch:
 Main.cpp |    2 ++
 1 file changed, 2 insertions(+)

Index: merkaartor-noqgtkstyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/merkaartor-noqgtkstyle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- merkaartor-noqgtkstyle.patch	28 Apr 2009 22:08:28 -0000	1.1
+++ merkaartor-noqgtkstyle.patch	15 Aug 2009 21:22:07 -0000	1.2
@@ -1,6 +1,6 @@
---- Main.cpp.orig	2009-04-28 23:23:20.804816252 +0200
-+++ Main.cpp	2009-04-28 23:23:32.628816670 +0200
-@@ -9,6 +9,8 @@
+--- src/Main.cpp.orig	2009-07-26 19:46:51.000000000 +0200
++++ src/Main.cpp	2009-08-15 22:56:09.465179311 +0200
+@@ -92,6 +92,8 @@
  
  int main(int argc, char** argv)
  {
@@ -8,4 +8,4 @@
 +
  	QApplication app(argc,argv);
  
- 	QCoreApplication::setOrganizationName("BartVanhauwaert");
+ #if defined(Q_OS_UNIX)


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/merkaartor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- merkaartor.spec	28 Apr 2009 22:08:28 -0000	1.12
+++ merkaartor.spec	15 Aug 2009 21:22:07 -0000	1.13
@@ -1,15 +1,14 @@
 Name:           merkaartor
-Version:        0.13.2
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
 Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
-# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
-Patch0:         merkaartor-eslang.patch
-Patch1:         merkaartor-noqgtkstyle.patch
+Patch0:         merkaartor-noqgtkstyle.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -25,22 +24,20 @@ It has some unique features like anti-al
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q 
+%setup -q -n merkaartor-0.14 
 %patch0 -p0
-%patch1 -p0
+find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
-lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
+lrelease-qt4 src/src.pro
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
-install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
-desktop-file-install --vendor="fedora" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,20 +46,37 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%dir %{_datadir}/merkaartor
-%dir %{_datadir}/merkaartor/translations
-%dir %{_datadir}/merkaartor/world_shp
-%dir %{_datadir}/merkaartor/world_shp/*
-%{_datadir}/merkaartor/translations/%{name}_*.qm
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/translations/
+%{_datadir}/%{name}/translations/%{name}_??.qm
+%{_datadir}/%{name}/world_background.osb
+%{_datadir}/%{name}/*.xml
+%{_datadir}/applications/%{name}.desktop
+%dir %{_libdir}/%{name}/plugins
+%dir %{_libdir}/%{name}/plugins/background
+%{_libdir}/%{name}/plugins/background/*.so
+%dir %{_libdir}/%{name}/plugins/styles
+%{_libdir}/%{name}/plugins/styles/*.so
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
+- 0.14
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-0.2.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 05 2009 Sven Lankes <sven at lank.es> - 0.14-0.1-pre2
+- 0.14-pre2
+
+* Thu Jul 02 2009 Sven Lankes <sven at lank.es> - 0.14-0.1-pre1
+- 0.14-pre1
+
 * Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
 - disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
 
-* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+* Sun Apr 25 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
 - new upstream release
 
 * Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Apr 2009 19:45:39 -0000	1.7
+++ sources	15 Aug 2009 21:22:07 -0000	1.8
@@ -1 +1 @@
-0e6a65d723a7fa29f1e8c921a74d1893  merkaartor-0.13.2.tar.bz2
+61e01855f4fc99d0cb5bf1696534f5a0  merkaartor-0.14.tar.bz2


--- merkaartor-eslang.patch DELETED ---



From michich at fedoraproject.org  Sat Aug 15 21:41:46 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sat, 15 Aug 2009 21:41:46 +0000 (UTC)
Subject: rpms/icecream/F-11 icecream.fc, 1.2, 1.3 icecream.spec, 1.21,
	1.22 icecream.te, 1.8, 1.9 initscript-scheduler, 1.1, 1.2
Message-ID: <20090815214146.071EF11C043B@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30240

Modified Files:
	icecream.fc icecream.spec icecream.te initscript-scheduler 
Log Message:
* Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
- Create the logfile for the scheduler in the initscript.
- Allow the scheduler to write to the log in the SELinux policy (BZ#517251).



Index: icecream.fc
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.fc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- icecream.fc	16 Feb 2009 13:54:52 -0000	1.2
+++ icecream.fc	15 Aug 2009 21:41:45 -0000	1.3
@@ -3,3 +3,4 @@
 /var/cache/icecream(/.*)?			gen_context(system_u:object_r:iceccd_cache_t,s0)
 /var/log/iceccd				--	gen_context(system_u:object_r:iceccd_log_t,s0)
 /usr/sbin/icecc-scheduler		--	gen_context(system_u:object_r:icecc_scheduler_exec_t,s0)
+/var/log/icecc[-_]scheduler		--	gen_context(system_u:object_r:icecc_scheduler_log_t,s0)


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- icecream.spec	30 Apr 2009 13:32:02 -0000	1.21
+++ icecream.spec	15 Aug 2009 21:41:45 -0000	1.22
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -233,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
+- Create the logfile for the scheduler in the initscript.
+- Allow the scheduler to write to the log in the SELinux policy (BZ#517251).
+
 * Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
 - Upstream release 0.9.4.
 - Dropped merged patches.


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.te,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- icecream.te	5 Apr 2009 23:00:36 -0000	1.8
+++ icecream.te	15 Aug 2009 21:41:45 -0000	1.9
@@ -41,6 +41,9 @@ type icecc_scheduler_t;
 type icecc_scheduler_exec_t;
 init_daemon_domain(icecc_scheduler_t, icecc_scheduler_exec_t)
 
+type icecc_scheduler_log_t;
+logging_log_file(icecc_scheduler_log_t)
+
 ########################################
 #
 # iceccd_untrusted declarations
@@ -188,6 +191,9 @@ can_exec(iceccd_untrusted_t, iceccd_cach
 allow icecc_scheduler_t self:tcp_socket create_stream_socket_perms;
 allow icecc_scheduler_t self:udp_socket create_socket_perms;
 
+manage_files_pattern(icecc_scheduler_t, icecc_scheduler_log_t, icecc_scheduler_log_t)
+logging_log_filetrans(icecc_scheduler_t, icecc_scheduler_log_t, file)
+
 corenet_all_recvfrom_unlabeled(icecc_scheduler_t)
 corenet_all_recvfrom_netlabel(icecc_scheduler_t)
 corenet_tcp_sendrecv_generic_if(icecc_scheduler_t)


Index: initscript-scheduler
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/initscript-scheduler,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- initscript-scheduler	21 Nov 2007 00:32:33 -0000	1.1
+++ initscript-scheduler	15 Aug 2009 21:41:45 -0000	1.2
@@ -30,15 +30,16 @@ start() {
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
 	echo -n $"Starting distributed compiler scheduler: "
-	params=""
+	netname=
 	if [ -n "$ICECREAM_NETNAME" ] ; then
-		params="$params -n $ICECREAM_NETNAME"
+		netname="-n $ICECREAM_NETNAME"
 	fi
 	logfile=${ICECREAM_SCHEDULER_LOG_FILE:-/var/log/icecc-scheduler}
-	params="$params -l $logfile"
-#	touch "$logfile"
-#	chown icecream:icecream $logfile
-	daemon --user icecream --check $service $exec -d $params
+	touch "$logfile"
+	chown icecream:icecream "$logfile"
+	chmod 0640 "$logfile"
+	[ -x /sbin/restorecon ] && /sbin/restorecon "$logfile"
+	daemon --user icecream --check $service $exec -d -l "$logfile" $netname
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile



From rdieter at fedoraproject.org  Sat Aug 15 21:56:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 15 Aug 2009 21:56:09 +0000 (UTC)
Subject: rpms/qt/F-10 0288-more-x-keycodes.patch, NONE,
	1.1 287-qmenu-respect-minwidth.patch, NONE, 1.1 qt.spec, 1.232, 1.233
Message-ID: <20090815215609.DB20911C0426@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1089

Modified Files:
	qt.spec 
Added Files:
	0288-more-x-keycodes.patch 287-qmenu-respect-minwidth.patch 
Log Message:
* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
- kde-qt: 287-qmenu-respect-minwidth
- kde-qt: 0288-more-x-keycodes (#475247)


0288-more-x-keycodes.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 0288-more-x-keycodes.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] 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.1


287-qmenu-respect-minwidth.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 287-qmenu-respect-minwidth.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] 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.1



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- qt.spec	5 Aug 2009 23:14:36 -0000	1.232
+++ qt.spec	15 Aug 2009 21:56:09 -0000	1.233
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -58,6 +58,10 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 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
+# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
+Patch0288: 0288-more-x-keycodes.patch
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
@@ -374,6 +378,9 @@ test -x apply_patches && ./apply_patches
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
+%patch287 -p1 -b .287-qmenu-respect
+%patch0288 -p1 -b .0288-more-x-keycodes
+
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 
@@ -872,6 +879,10 @@ fi
 
 
 %changelog
+* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
+- 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
 - use linker scripts for _debug targets (#510246)
 - apply upstream patch to fix issue in Copy and paste



From pgordon at fedoraproject.org  Sat Aug 15 23:39:48 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sat, 15 Aug 2009 23:39:48 +0000 (UTC)
Subject: rpms/telepathy-haze/F-11 telepathy-haze.spec,1.16,1.17
Message-ID: <20090815233948.EF6A411C0426@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19722

Modified Files:
	telepathy-haze.spec 
Log Message:
Fedora 11 doesn't need the no-yahoo-japan patch, since it still has Pidgin 2.5.x


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/telepathy-haze.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- telepathy-haze.spec	14 Aug 2009 05:27:28 -0000	1.16
+++ telepathy-haze.spec	15 Aug 2009 23:39:47 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
 Version:	0.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -10,8 +10,9 @@ URL:		http://developer.pidgin.im/wiki/Te
 Source0:	http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
 ## Remove Yahoo Japan options from haze.manager, to fix Yahoo! IM connectivity
-## issues. (Fedora bug #514998, GNOME Bug #591381)
-Patch0: 	%{name}-no-yahoo-japan.patch
+## issues. (Fedora bug #514998, GNOME Bug #591381) - only needed with Pidgin
+## 2.6.0+, so not yet included in Fedora 11's package.
+# Patch0: 	%{name}-no-yahoo-japan.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +31,7 @@ others will probably work too.
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-yahoo-japan
+#patch0 -p1 -b .no-yahoo-japan
 
 
 %build
@@ -56,6 +57,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Sat Aug 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-2
+- Don't include the Yahoo! Japan patch just yet. It's only for Pidgin
+  (libpurple) 2.6.0+. 
+
 * Thu Aug 13 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-1
 - Update to new upstream release (0.3.1).
 - Add upstream patch to remove the Yahoo! Japan from the manager profile,



From rdieter at fedoraproject.org  Sun Aug 16 00:10:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 16 Aug 2009 00:10:44 +0000 (UTC)
Subject: rpms/qt/F-10 qt.spec,1.233,1.234
Message-ID: <20090816001044.2D13C11C04D1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24804/F-10

Modified Files:
	qt.spec 
Log Message:
fix botched patch287



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- qt.spec	15 Aug 2009 21:56:09 -0000	1.233
+++ qt.spec	16 Aug 2009 00:10:43 -0000	1.234
@@ -59,7 +59,7 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 
 ## qt-copy patches
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/01f26d0756839fbe783c637ca7dec5b7987f7e14.patch
-Patch287: 287-qmenu-respect-minwidth
+Patch287: 287-qmenu-respect-minwidth.patch
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
 Patch0288: 0288-more-x-keycodes.patch
 %define qt_copy 20090626



From rdieter at fedoraproject.org  Sun Aug 16 00:10:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 16 Aug 2009 00:10:44 +0000 (UTC)
Subject: rpms/qt/F-11 qt.spec,1.277,1.278
Message-ID: <20090816001044.7E1CC11C04E7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24804/F-11

Modified Files:
	qt.spec 
Log Message:
fix botched patch287



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- qt.spec	15 Aug 2009 20:28:37 -0000	1.277
+++ qt.spec	16 Aug 2009 00:10:44 -0000	1.278
@@ -59,7 +59,7 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 
 ## qt-copy patches
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/01f26d0756839fbe783c637ca7dec5b7987f7e14.patch
-Patch287: 287-qmenu-respect-minwidth
+Patch287: 287-qmenu-respect-minwidth.patch
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
 Patch0288: 0288-more-x-keycodes.patch
 %define qt_copy 20090626



From smilner at fedoraproject.org  Sun Aug 16 00:30:06 2009
From: smilner at fedoraproject.org (smilner)
Date: Sun, 16 Aug 2009 00:30:06 +0000 (UTC)
Subject: rpms/Django/F-11 .cvsignore, 1.12, 1.13 Django.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20090816003006.EA94611C04D1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28268

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
Update for bz user request.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jul 2009 20:55:02 -0000	1.12
+++ .cvsignore	16 Aug 2009 00:30:06 -0000	1.13
@@ -1 +1,3 @@
-Django-1.0.3.tar.gz
+Django-1.1.tar.gz
+Django-ignore-pyo-bz-495046.patch
+simplejson-init.py


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/Django.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- Django.spec	30 Jul 2009 03:33:42 -0000	1.21
+++ Django.spec	16 Aug 2009 00:30:06 -0000	1.22
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.1
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ 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
@@ -41,6 +42,7 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -56,7 +58,7 @@ cp -p %{SOURCE1} __init__.py
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 # Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
@@ -67,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
@@ -84,25 +88,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
 %{python_sitelib}/django
 
+# Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
-
-%if 0%{?rhel} == 5
-%exclude %{_bindir}/django-admin.pyc
-%exclude %{_bindir}/django-admin.pyo
-%endif
+# -----------------
+ 
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
 
+
 %changelog
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+- Applied Daniel Mach's patch from bz#516016.
+
+* Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-6
 - Attempted combined spec for F12/11/10 and EL5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jul 2009 20:55:02 -0000	1.12
+++ sources	16 Aug 2009 00:30:06 -0000	1.13
@@ -1 +1,3 @@
-3c5435b015d8cde602b17a5f0c9873dc  Django-1.0.3.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py



From cebbert at fedoraproject.org  Sun Aug 16 00:52:14 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 16 Aug 2009 00:52:14 +0000 (UTC)
Subject: rpms/kernel/devel/scripts sort-config,NONE,1.1
Message-ID: <20090816005214.912A111C0426@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32109/scripts

Added Files:
	sort-config 
Log Message:
add sort-config script


--- NEW FILE sort-config ---
#!/bin/bash

SRC=($(ls config-* 2>/dev/null))
TGT=($(ls kernel-*/linux-*.noarch/configs/kernel-2.6.*-*.config kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})

if [ $# -lt 2 ] ; then
	echo -e "Usage:  $(basename $0) [-d] input target"
	echo -e "Sort input config file into the same order as the target"
	echo -e "      -d: show raw unsorted output with extra debug text"
	echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']'
	echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']'
	exit 1
fi

if [ "$1" = "-d" ] ; then
	DEBUG=1
	shift
fi

if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
	echo "WARNING! Output files named xx?? already exist."
	read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
fi
rm -f xx00 xx01 xx99

SRCFILE=config-$1
[ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2

TGTFILE=kernel-*/linux-*.noarch/configs/kernel-2.6.*-$2.config
[ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2

IX=0
declare -a SAVECOMMENT

cat ${SRCFILE} | while read TEXT ; do

	LINE=
	COMMENT=
	[ -z "$TEXT" ] && TEXT='#'

	if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then
		LINE=$(grep -n "^$TEXT" $TGTFILE | head -1 | grep "$TEXT" | cut -f 1 -d ':')
		if [ -z "$LINE" ] ; then
			[ "$DEBUG" ] && echo "nofind      ->" "$TEXT"

			# see if option changed in output file
			OPTNAME=
			if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
				OPTNAME=${TEXT%%=*}
			elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
				OPTNAME=${TEXT%"is not set"}
				OPTNAME=${OPTNAME#\# }
			fi
			if [ "$OPTNAME" ] ; then
				[ "$DEBUG" ] && echo "looking for ->" "$OPTNAME"
				LINE=$(grep -n "$OPTNAME" $TGTFILE | head -1 | grep "$OPTNAME" | cut -f 1 -d ':')
				[ "$LINE" ] && COMMENT="# -- Next line was changed by config rules in output at line $LINE"
			fi
		fi
	else
		COMMENT="$TEXT"
		TEXT=
	fi

	[ "$DEBUG" -a "$COMMENT" ] && echo "comment     ->" "$LINE" "$COMMENT"
	[ "$DEBUG" -a "$TEXT" ]    && echo "text        ->" "$LINE" "$TEXT"

	if [ "$TEXT" ] ; then
		# we have output, make sure it has a line number
		[ -z "$LINE" ] && LINE=999999

		# print saved comments first
		if [ $IX -gt 0 ] ; then
			[ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
			(( IX-- ))
			for IX in $(seq 0 $IX) ; do
				echo "$LINE":"${SAVECOMMENT[$IX]}"
			done
			unset SAVECOMMENT
			IX=0
		fi
		[ "$COMMENT" ] && echo "$LINE":"$COMMENT"
		echo "$LINE":"$TEXT"
	else
		# no output yet, save the comment
		SAVECOMMENT[$IX]="$COMMENT"
		[ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
		(( IX++ ))
	fi

done > xx99

if [ "$DEBUG" ] ; then
	cat xx99
else

	cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null

	cat xx00 | cut -f 2- -d ':'
	if [ -s xx01 ] ; then
		echo
		echo '# ------------  UNMATCHED OPTIONS  ------------'
		echo
		cat xx01 | cut -f 2- -d ':'
	fi

fi

rm -f xx00 xx01 xx99



From smilner at fedoraproject.org  Sun Aug 16 01:54:42 2009
From: smilner at fedoraproject.org (smilner)
Date: Sun, 16 Aug 2009 01:54:42 +0000 (UTC)
Subject: rpms/Django/EL-5 .cvsignore, 1.10, 1.11 Django.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <20090816015442.D360D11C0426@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10948

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
updated for bz user request


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Jul 2009 23:19:24 -0000	1.10
+++ .cvsignore	16 Aug 2009 01:54:40 -0000	1.11
@@ -1 +1,3 @@
-Django-1.0.3.tar.gz
+Django-1.1.tar.gz
+Django-ignore-pyo-bz-495046.patch
+simplejson-init.py


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Django.spec	30 Jul 2009 02:47:20 -0000	1.13
+++ Django.spec	16 Aug 2009 01:54:40 -0000	1.14
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.1
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ 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
@@ -41,13 +42,13 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
 # and put the replacement stub in place
 cp -p %{SOURCE1} __init__.py
-echo %{?rhel}
-echo "************"
+
 
 %build
 %{__python} setup.py build
@@ -57,7 +58,7 @@ echo "************"
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 # Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
@@ -68,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
@@ -85,25 +88,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
 %{python_sitelib}/django
 
+# Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
-
-%if 0%{?rhel} <= 5
-%exclude %{_bindir}/django-admin.pyc
-%exclude %{_bindir}/django-admin.pyo
-%endif
+# -----------------
+ 
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
 
+
 %changelog
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+- Applied Daniel Mach's patch from bz#516016.
+
+* Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-6
 - Attempted combined spec for F12/11/10 and EL5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Jul 2009 23:19:24 -0000	1.10
+++ sources	16 Aug 2009 01:54:40 -0000	1.11
@@ -1 +1,3 @@
-3c5435b015d8cde602b17a5f0c9873dc  Django-1.0.3.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py



From cebbert at fedoraproject.org  Sun Aug 16 03:08:21 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 16 Aug 2009 03:08:21 +0000 (UTC)
Subject: rpms/kernel/devel/scripts sort-config,1.1,1.2
Message-ID: <20090816030821.B7ECC11C0426@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27043/scripts

Modified Files:
	sort-config 
Log Message:
sort-config: fix option matching, add force option


Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/sort-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sort-config	16 Aug 2009 00:52:13 -0000	1.1
+++ sort-config	16 Aug 2009 03:08:19 -0000	1.2
@@ -1,26 +1,40 @@
 #!/bin/bash
 
 SRC=($(ls config-* 2>/dev/null))
-TGT=($(ls kernel-*/linux-*.noarch/configs/kernel-2.6.*-*.config kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
+TGT=($(ls kernel-*/linux-*.noarch/configs/kernel-2.6.*-*.config \
+          kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
 TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})
 
 if [ $# -lt 2 ] ; then
-	echo -e "Usage:  $(basename $0) [-d] input target"
-	echo -e "Sort input config file into the same order as the target"
-	echo -e "      -d: show raw unsorted output with extra debug text"
-	echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']'
-	echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']'
-	exit 1
+   echo -e "Usage:\n   $(basename $0) [-df] input target\n"
+   echo -e " Sort input config file into the same order as the target\n"
+   echo -e "      -d: show raw unsorted output with extra debug text"
+   echo -e "      -f: force output to match what is in the target config\n"
+   echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
+   echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
+   exit 1
 fi
 
-if [ "$1" = "-d" ] ; then
-	DEBUG=1
-	shift
-fi
+while getopts "df" OPTION ; do
+case $OPTION in
+d)
+   DEBUG=1
+;;
+f)
+   FORCE=1
+;;
+\?)
+   exit 2
+;;
+esac
+done
+
+shift $((OPTIND-1))
 
 if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
-	echo "WARNING! Output files named xx?? already exist."
-	read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
+   echo "WARNING! Output files named xx?? already exist." >&2
+   read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
+   echo >&2
 fi
 rm -f xx00 xx01 xx99
 
@@ -35,75 +49,89 @@ declare -a SAVECOMMENT
 
 cat ${SRCFILE} | while read TEXT ; do
 
-	LINE=
-	COMMENT=
-	[ -z "$TEXT" ] && TEXT='#'
-
-	if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then
-		LINE=$(grep -n "^$TEXT" $TGTFILE | head -1 | grep "$TEXT" | cut -f 1 -d ':')
-		if [ -z "$LINE" ] ; then
-			[ "$DEBUG" ] && echo "nofind      ->" "$TEXT"
-
-			# see if option changed in output file
-			OPTNAME=
-			if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
-				OPTNAME=${TEXT%%=*}
-			elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
-				OPTNAME=${TEXT%"is not set"}
-				OPTNAME=${OPTNAME#\# }
-			fi
-			if [ "$OPTNAME" ] ; then
-				[ "$DEBUG" ] && echo "looking for ->" "$OPTNAME"
-				LINE=$(grep -n "$OPTNAME" $TGTFILE | head -1 | grep "$OPTNAME" | cut -f 1 -d ':')
-				[ "$LINE" ] && COMMENT="# -- Next line was changed by config rules in output at line $LINE"
-			fi
-		fi
-	else
-		COMMENT="$TEXT"
-		TEXT=
-	fi
-
-	[ "$DEBUG" -a "$COMMENT" ] && echo "comment     ->" "$LINE" "$COMMENT"
-	[ "$DEBUG" -a "$TEXT" ]    && echo "text        ->" "$LINE" "$TEXT"
-
-	if [ "$TEXT" ] ; then
-		# we have output, make sure it has a line number
-		[ -z "$LINE" ] && LINE=999999
-
-		# print saved comments first
-		if [ $IX -gt 0 ] ; then
-			[ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
-			(( IX-- ))
-			for IX in $(seq 0 $IX) ; do
-				echo "$LINE":"${SAVECOMMENT[$IX]}"
-			done
-			unset SAVECOMMENT
-			IX=0
-		fi
-		[ "$COMMENT" ] && echo "$LINE":"$COMMENT"
-		echo "$LINE":"$TEXT"
-	else
-		# no output yet, save the comment
-		SAVECOMMENT[$IX]="$COMMENT"
-		[ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
-		(( IX++ ))
-	fi
+   LINE=
+   COMMENT=
+   [ -z "$TEXT" ] && TEXT='#'
+
+   if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then
+
+      LINE=$(grep -n "^$TEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
+      if [ -z "$LINE" ] ; then
+         [ "$DEBUG" ] && echo "nofind      ->" "$TEXT"
+
+         # see if option changed in output file
+         OPTNAME=
+         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
+            OPTNAME=${TEXT%%=*}
+         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
+            OPTNAME=${TEXT%"is not set"}
+            OPTNAME=${OPTNAME#\# }
+         fi
+         if [ "$OPTNAME" ] ; then
+            for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
+               if [ -z "$LINE" ] ; then
+                  [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
+                  LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
+                  if [ "$LINE" ] ; then
+                     if [ "$FORCE" ] ; then
+                        TEXT=$(grep "$FINDTEXT" $TGTFILE | head -1)
+                        [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
+                     else
+                        COMMENT="# -- Next option was changed in target line $LINE --"
+                     fi
+                  fi
+               fi
+            done
+         fi
+
+      fi
+
+   else
+      COMMENT="$TEXT"
+      TEXT=
+   fi
+
+   [ "$DEBUG" -a "$COMMENT" ] && echo "comment     ->" "$LINE" "$COMMENT"
+   [ "$DEBUG" -a "$TEXT" ]    && echo "text        ->" "$LINE" "$TEXT"
+
+   if [ "$TEXT" ] ; then
+      # we have output, make sure it has a line number
+      [ -z "$LINE" ] && LINE=999999
+
+      # print saved comments first
+      if [ $IX -gt 0 ] ; then
+         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
+         (( IX-- ))
+         for IX in $(seq 0 $IX) ; do
+            echo "$LINE":"${SAVECOMMENT[$IX]}"
+         done
+         unset SAVECOMMENT
+         IX=0
+      fi
+      [ "$COMMENT" ] && echo "$LINE":"$COMMENT"
+      echo "$LINE":"$TEXT"
+   else
+      # no output yet, save the comment
+      SAVECOMMENT[$IX]="$COMMENT"
+      [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
+      (( IX++ ))
+   fi
 
 done > xx99
 
 if [ "$DEBUG" ] ; then
-	cat xx99
+   cat xx99
 else
 
-	cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null
+   cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null
 
-	cat xx00 | cut -f 2- -d ':'
-	if [ -s xx01 ] ; then
-		echo
-		echo '# ------------  UNMATCHED OPTIONS  ------------'
-		echo
-		cat xx01 | cut -f 2- -d ':'
-	fi
+   cat xx00 | cut -f 2- -d ':'
+   if [ -s xx01 ] ; then
+      echo
+      echo '# ------------  UNMATCHED OPTIONS  ------------'
+      echo
+      cat xx01 | cut -f 2- -d ':'
+   fi
 
 fi
 



From davej at fedoraproject.org  Sun Aug 16 03:21:52 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sun, 16 Aug 2009 03:21:52 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1719,1.1720
Message-ID: <20090816032152.DB28911C0426@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30413

Modified Files:
	kernel.spec 
Log Message:
Disable KSM patches on a hunch.  Chasing the "encrypted VGs don't work" bug.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1719
retrieving revision 1.1720
diff -u -p -r1.1719 -r1.1720
--- kernel.spec	14 Aug 2009 22:51:55 -0000	1.1719
+++ kernel.spec	16 Aug 2009 03:21:52 -0000	1.1720
@@ -1286,8 +1286,8 @@ ApplyPatch hdpvr-ir-enable.patch
 ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Add kernel KSM support
-ApplyPatch linux-2.6-ksm.patch
-ApplyPatch linux-2.6-ksm-updates.patch
+#ApplyPatch linux-2.6-ksm.patch
+#ApplyPatch linux-2.6-ksm-updates.patch
 # Optimize KVM for KSM support
 #ApplyPatch linux-2.6-ksm-kvm.patch
 
@@ -1969,6 +1969,9 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 15 2009 Dave Jones <davej at redhat.com> 2.6.31-0.157.rc6
+- Disable KSM patches on a hunch.  Chasing the "encrypted VGs don't work" bug.
+
 * Fri Aug 14 2009 Dave Jones <davej at redhat.com> 2.6.31-0.155.rc6
 - 2.6.31-rc6
 



From pwouters at fedoraproject.org  Sun Aug 16 05:10:24 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:10:24 +0000 (UTC)
Subject: rpms/ldns/devel ldns.spec,1.48,1.49
Message-ID: <20090816051024.BBD0F11C04D1@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17928

Modified Files:
	ldns.spec 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
- Updated to 1.6.1



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ldns.spec	14 Aug 2009 15:50:52 -0000	1.48
+++ ldns.spec	16 Aug 2009 05:10:22 -0000	1.49
@@ -88,7 +88,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-* Fri Aug 14 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
+* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
 - Updated to 1.6.1
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-5



From emaldonado at fedoraproject.org  Sun Aug 16 05:16:57 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 16 Aug 2009 05:16:57 +0000 (UTC)
Subject: rpms/nss/F-11 nss.spec,1.73,1.74
Message-ID: <20090816051657.102A111C0262@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19356

Modified Files:
	nss.spec 
Log Message:
Fixed problems uncovered by mass rebuild with new version of rpmbuild


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- nss.spec	23 Jun 2009 02:22:39 -0000	1.73
+++ nss.spec	16 Aug 2009 05:16:56 -0000	1.74
@@ -1,10 +1,19 @@
-%define nspr_version 4.7
-%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+%global nspr_version 4.7
+%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+
+# Produce .chk files for the final stripped binaries
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+%{nil}
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          2.11.3%{?dist}
+Release:          2.11.4%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -153,14 +162,14 @@ export USE_64
 %{__make} -C ./mozilla/security/nss
 
 # Set up our package file
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+%{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSS_VERSION%%,%{version},g" > \
-                          $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+                          ./mozilla/dist/pkgconfig/nss.pc
 
 NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
 NSS_VMINOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
@@ -170,7 +179,6 @@ export NSS_VMAJOR 
 export NSS_VMINOR 
 export NSS_VPATCH
 
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__cat} %{SOURCE2} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
@@ -178,9 +186,9 @@ export NSS_VPATCH
                           -e "s, at MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
                           -e "s, at MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
                           -e "s, at MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
-                          > $RPM_BUILD_ROOT/%{_bindir}/nss-config
+                          > ./mozilla/dist/pkgconfig/nss-config
 
-chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
+chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
@@ -232,23 +240,18 @@ if [ $TEST_FAILURES -ne 0 ]; then
 fi
 echo "test suite completed"
 
-# Produce .chk files for the final stripped binaries
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
-%{nil}
 
 %install
 
+%{__rm} -rf $RPM_BUILD_ROOT
+
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
@@ -296,6 +299,9 @@ do
   %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
+# Copy the package configuration files
+%{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+%{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -331,6 +337,7 @@ done
 %{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 %files softokn-freebl
+%defattr(-,root,root)
 /%{_lib}/libfreebl3.so
 /%{_lib}/libfreebl3.chk
 
@@ -476,6 +483,8 @@ done
 
 
 %changelog
+* Mon Jun 22 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-2.11.4
+- Fixed problems uncovered by mass rebuild with new version of rpmbuild
 * Mon Jun 22 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-2.11.3
 - updated pem module incorporates various patches
 - fix off-by-one error when computing size to reduce memory leak, rhbz#483855



From pwouters at fedoraproject.org  Sun Aug 16 05:18:16 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:18:16 +0000 (UTC)
Subject: rpms/ldns/devel ldns.spec,1.49,1.50
Message-ID: <20090816051816.55A3711C0262@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19683

Modified Files:
	ldns.spec 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
- Added openssl dependancy back in, since we get more functionality
 when using openssl. Especially in 'drill'.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ldns.spec	16 Aug 2009 05:10:22 -0000	1.49
+++ ldns.spec	16 Aug 2009 05:18:16 -0000	1.50
@@ -1,14 +1,14 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.6.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
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
-BuildRequires: perl, libpcap-devel
+BuildRequires: perl, libpcap-devel, openssl-devel
 
 %description
 ldns is a library with the aim to simplify DNS programing in C. All
@@ -88,6 +88,10 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
+- Added openssl dependancy back in, since we get more functionality
+ when using openssl. Especially in 'drill'.
+
 * Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
 - Updated to 1.6.1
 



From pwouters at fedoraproject.org  Sun Aug 16 05:27:07 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:27:07 +0000 (UTC)
Subject: rpms/ldns/EL-5 ldns.spec,1.18,1.19
Message-ID: <20090816052707.48C1D11C0262@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21989

Modified Files:
	ldns.spec 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
-Updated to 1.6.1



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/ldns.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ldns.spec	11 Jul 2009 04:46:57 -0000	1.18
+++ ldns.spec	16 Aug 2009 05:27:07 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.6.0
+Version: 1.6.1
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
+-Updated to 1.6.1
+
 * Sat Jul 11 2009 Paul Wouters <paul at xelerance.com> - 1.6.0-1
 - Updated to 1.6.0
 



From pwouters at fedoraproject.org  Sun Aug 16 05:29:14 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:29:14 +0000 (UTC)
Subject: rpms/ldns/F-11 .cvsignore, 1.10, 1.11 ldns.spec, 1.40, 1.41 sources,
	1.12, 1.13
Message-ID: <20090816052914.BB60811C0262@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22456

Modified Files:
	.cvsignore ldns.spec sources 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
-Updated to 1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Feb 2009 18:25:11 -0000	1.10
+++ .cvsignore	16 Aug 2009 05:29:14 -0000	1.11
@@ -4,3 +4,4 @@ ldns-1.3.0.tar.gz
 ldns-1.4.0.tar.gz
 ldns-1.5.0.tar.gz
 ldns-1.5.1.tar.gz
+ldns-1.6.1.tar.gz


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/F-11/ldns.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ldns.spec	25 Feb 2009 12:51:00 -0000	1.40
+++ ldns.spec	16 Aug 2009 05:29:14 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.5.1
-Release: 2%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
+-Updated to 1.6.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Feb 2009 18:25:11 -0000	1.12
+++ sources	16 Aug 2009 05:29:14 -0000	1.13
@@ -1,2 +1,3 @@
 676c088b6a7e1ae0be16a16410fda805  ldns-1.5.0.tar.gz
 17f73def98711e1475409d9a8d5d9dcd  ldns-1.5.1.tar.gz
+a44dafecdcc49aaea5d20ae15bc738c0  ldns-1.6.1.tar.gz



From pwouters at fedoraproject.org  Sun Aug 16 05:30:38 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:30:38 +0000 (UTC)
Subject: rpms/ldns/EL-5 ldns.spec,1.19,1.20 sources,1.8,1.9
Message-ID: <20090816053038.683EE11C034A@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22806

Modified Files:
	ldns.spec sources 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
- Bump version, sources file was not updated.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/ldns.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ldns.spec	16 Aug 2009 05:27:07 -0000	1.19
+++ ldns.spec	16 Aug 2009 05:30:38 -0000	1.20
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
+- Bump version, sources file was not updated.
+
 * Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
 -Updated to 1.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Jul 2009 04:46:57 -0000	1.8
+++ sources	16 Aug 2009 05:30:38 -0000	1.9
@@ -1 +1 @@
-cd0d4d34a60d018fbfedae6d3ee4049b  ldns-1.6.0.tar.gz
+a44dafecdcc49aaea5d20ae15bc738c0  ldns-1.6.1.tar.gz



From pwouters at fedoraproject.org  Sun Aug 16 05:32:37 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:32:37 +0000 (UTC)
Subject: rpms/ldns/F-10 ldns.spec,1.36,1.37 sources,1.11,1.12
Message-ID: <20090816053237.672B811C0262@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23143

Modified Files:
	ldns.spec sources 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
-Updated to 1.6.1



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/F-10/ldns.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ldns.spec	13 Feb 2009 20:36:03 -0000	1.36
+++ ldns.spec	16 Aug 2009 05:32:37 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.5.1
+Version: 1.6.1
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-1
+-Updated to 1.6.1
+
 * Fri Feb 13 2009 Paul Wouters <paul at xelerance.com> - 1.5.1-1
 - Upgrade to 1.5.1 (1.5.0 was a dud release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Feb 2009 20:36:03 -0000	1.11
+++ sources	16 Aug 2009 05:32:37 -0000	1.12
@@ -1,2 +1,3 @@
 676c088b6a7e1ae0be16a16410fda805  ldns-1.5.0.tar.gz
 17f73def98711e1475409d9a8d5d9dcd  ldns-1.5.1.tar.gz
+a44dafecdcc49aaea5d20ae15bc738c0  ldns-1.6.1.tar.gz



From pwouters at fedoraproject.org  Sun Aug 16 05:32:56 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 16 Aug 2009 05:32:56 +0000 (UTC)
Subject: rpms/ldns/EL-5 ldns.spec,1.20,1.21
Message-ID: <20090816053256.A170C11C0262@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23212

Modified Files:
	ldns.spec 
Log Message:
* Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
- Bump version, sources file was not updated.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/ldns.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ldns.spec	16 Aug 2009 05:30:38 -0000	1.20
+++ ldns.spec	16 Aug 2009 05:32:56 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.6.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



From liangsuilong at fedoraproject.org  Sun Aug 16 05:58:30 2009
From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=)
Date: Sun, 16 Aug 2009 05:58:30 +0000 (UTC)
Subject: rpms/shutter/F-11 shutter.spec,1.1,1.2
Message-ID: <20090816055830.5CC7511C0262@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29009

Modified Files:
	shutter.spec 
Log Message:



Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-11/shutter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shutter.spec	11 Aug 2009 06:35:00 -0000	1.1
+++ shutter.spec	16 Aug 2009 05:58:28 -0000	1.2
@@ -1,7 +1,7 @@
 #%define  ppa_version ppa6
 Name:		shutter
 Version:	0.80.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
 License:	GPL+ or Artistic
@@ -10,7 +10,7 @@ Source0:	http://shutter-project.org/wp-c
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	gnome-web-photo, gtklp
+Requires:	gnome-web-photo
 Requires:	perl(Gtk2::ImageView)
 Requires:	perl(X11::Protocol)
 
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-2
+- Remove requires: gtklp
+
 * Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
 - Updrade to shutter-0.80.1
 



From liangsuilong at fedoraproject.org  Sun Aug 16 06:14:08 2009
From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=)
Date: Sun, 16 Aug 2009 06:14:08 +0000 (UTC)
Subject: rpms/shutter/F-10 shutter.spec,1.1,1.2
Message-ID: <20090816061408.976F011C0262@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32296

Modified Files:
	shutter.spec 
Log Message:



Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/F-10/shutter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shutter.spec	11 Aug 2009 06:44:40 -0000	1.1
+++ shutter.spec	16 Aug 2009 06:14:07 -0000	1.2
@@ -1,7 +1,7 @@
 #%define  ppa_version ppa6
 Name:		shutter
 Version:	0.80.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
 License:	GPL+ or Artistic
@@ -10,7 +10,7 @@ Source0:	http://shutter-project.org/wp-c
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	gnome-web-photo, gtklp
+Requires:	gnome-web-photo
 Requires:	perl(Gtk2::ImageView)
 Requires:	perl(X11::Protocol)
 
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-2
+- Remove requires: gtklp
+
 * Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
 - Updrade to shutter-0.80.1
 



From mtasaka at fedoraproject.org  Sun Aug 16 06:14:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 16 Aug 2009 06:14:21 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.393, 1.394 jd.spec, 1.453, 1.454 sources,
	1.394, 1.395
Message-ID: <20090816061421.3E44111C0262@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32347/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3043



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- .cvsignore	6 Aug 2009 14:54:43 -0000	1.393
+++ .cvsignore	16 Aug 2009 06:14:20 -0000	1.394
@@ -1 +1 @@
-jd-2.4.2-beta090806.tgz
+jd-2.4.2-svn3043_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- jd.spec	6 Aug 2009 14:54:43 -0000	1.453
+++ jd.spec	16 Aug 2009 06:14:20 -0000	1.454
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        beta090806
+%define         strtag        svn3043_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3043
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- sources	6 Aug 2009 14:54:44 -0000	1.394
+++ sources	16 Aug 2009 06:14:21 -0000	1.395
@@ -1 +1 @@
-b6960e2962ffc9ea0382073a2f2046e4  jd-2.4.2-beta090806.tgz
+1620d352ab45129c51d457cf86a3e5eb  jd-2.4.2-svn3043_trunk.tgz



From mtasaka at fedoraproject.org  Sun Aug 16 06:14:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 16 Aug 2009 06:14:21 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.387, 1.388 jd.spec, 1.449, 1.450 sources,
	1.388, 1.389
Message-ID: <20090816061421.C7C6F11C0262@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32347/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3043



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- .cvsignore	6 Aug 2009 14:54:44 -0000	1.387
+++ .cvsignore	16 Aug 2009 06:14:21 -0000	1.388
@@ -1 +1 @@
-jd-2.4.2-beta090806.tgz
+jd-2.4.2-svn3043_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- jd.spec	6 Aug 2009 14:54:44 -0000	1.449
+++ jd.spec	16 Aug 2009 06:14:21 -0000	1.450
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        beta090806
+%define         strtag        svn3043_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3043
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- sources	6 Aug 2009 14:54:44 -0000	1.388
+++ sources	16 Aug 2009 06:14:21 -0000	1.389
@@ -1 +1 @@
-b6960e2962ffc9ea0382073a2f2046e4  jd-2.4.2-beta090806.tgz
+1620d352ab45129c51d457cf86a3e5eb  jd-2.4.2-svn3043_trunk.tgz



From mtasaka at fedoraproject.org  Sun Aug 16 06:14:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 16 Aug 2009 06:14:22 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.386, 1.387 jd.spec, 1.449, 1.450 sources,
	1.387, 1.388
Message-ID: <20090816061422.2577D11C02C3@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32347/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3043



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- .cvsignore	6 Aug 2009 14:54:44 -0000	1.386
+++ .cvsignore	16 Aug 2009 06:14:21 -0000	1.387
@@ -1 +1 @@
-jd-2.4.2-beta090806.tgz
+jd-2.4.2-svn3043_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- jd.spec	6 Aug 2009 14:54:44 -0000	1.449
+++ jd.spec	16 Aug 2009 06:14:21 -0000	1.450
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        beta090806
+%define         strtag        svn3043_trunk
 %define         repoid        43007
 # Define this if this is pre-version
 %define         pre_release   1
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3043
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- sources	6 Aug 2009 14:54:44 -0000	1.387
+++ sources	16 Aug 2009 06:14:21 -0000	1.388
@@ -1 +1 @@
-b6960e2962ffc9ea0382073a2f2046e4  jd-2.4.2-beta090806.tgz
+1620d352ab45129c51d457cf86a3e5eb  jd-2.4.2-svn3043_trunk.tgz



From liangsuilong at fedoraproject.org  Sun Aug 16 06:20:09 2009
From: liangsuilong at fedoraproject.org (=?utf-8?b?5qKB56mX6ZqG?=)
Date: Sun, 16 Aug 2009 06:20:09 +0000 (UTC)
Subject: rpms/shutter/devel shutter.spec,1.1,1.2
Message-ID: <20090816062009.92EFB11C04BE@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/shutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1240

Modified Files:
	shutter.spec 
Log Message:



Index: shutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shutter/devel/shutter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shutter.spec	11 Aug 2009 06:57:40 -0000	1.1
+++ shutter.spec	16 Aug 2009 06:20:09 -0000	1.2
@@ -1,7 +1,7 @@
 #%define  ppa_version ppa6
 Name:		shutter
 Version:	0.80.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ 2.0 screenshot application written in perl
 Group:		Applications/Multimedia
 License:	GPL+ or Artistic
@@ -10,7 +10,7 @@ Source0:	http://shutter-project.org/wp-c
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	gnome-web-photo, gtklp
+Requires:	gnome-web-photo
 Requires:	perl(Gtk2::ImageView)
 Requires:	perl(X11::Protocol)
 
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-2
+- Remove requires: gtklp
+
 * Mon Aug 3 2009 Liang Suilong <liangsuilong at gmail.com> - 0.80.1-1
 - Updrade to shutter-0.80.1
 



From pkgdb at fedoraproject.org  Sun Aug 16 06:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:55:27 +0000
Subject: [pkgdb] gnome-telnet ownership updated
Message-ID: <20090816065527.9EEE510F855@bastion2.fedora.phx.redhat.com>

Package gnome-telnet in Fedora devel was orphaned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-telnet



From pkgdb at fedoraproject.org  Sun Aug 16 06:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:55:27 +0000
Subject: [pkgdb] gnome-telnet (un)retirement
Message-ID: <20090816065527.CB7DE10F85A@bastion2.fedora.phx.redhat.com>

Package gnome-telnet in Fedora devel has been retired by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-telnet



From pkgdb at fedoraproject.org  Sun Aug 16 06:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:56:38 +0000
Subject: [pkgdb] aget ownership updated
Message-ID: <20090816065639.1910010F857@bastion2.fedora.phx.redhat.com>

Package aget in Fedora devel was orphaned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aget



From pkgdb at fedoraproject.org  Sun Aug 16 06:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:56:38 +0000
Subject: [pkgdb] aget (un)retirement
Message-ID: <20090816065639.CBC4810F85C@bastion2.fedora.phx.redhat.com>

Package aget in Fedora devel has been retired by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aget



From pkgdb at fedoraproject.org  Sun Aug 16 06:57:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:57:07 +0000
Subject: [pkgdb] aget (un)retirement
Message-ID: <20090816065714.D39B710F84F@bastion2.fedora.phx.redhat.com>

Package aget in Fedora 9 has been retired by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aget



From pkgdb at fedoraproject.org  Sun Aug 16 06:57:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:57:07 +0000
Subject: [pkgdb] aget ownership updated
Message-ID: <20090816065712.863F410F85B@bastion2.fedora.phx.redhat.com>

Package aget in Fedora 9 was orphaned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aget



From pkgdb at fedoraproject.org  Sun Aug 16 06:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 06:57:13 +0000
Subject: [pkgdb] aget (un)retirement
Message-ID: <20090816065715.28B9210F888@bastion2.fedora.phx.redhat.com>

Package aget in Fedora 8 has been retired by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aget



From thm at fedoraproject.org  Sun Aug 16 07:33:26 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 16 Aug 2009 07:33:26 +0000 (UTC)
Subject: rpms/trac-tracnav-plugin/devel import.log, NONE,
	1.1 trac-tracnav-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090816073326.DF0EB11C0262@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/trac-tracnav-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16697/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log trac-tracnav-plugin.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
trac-tracnav-plugin-4_1-2_fc11:HEAD:trac-tracnav-plugin-4.1-2.fc11.src.rpm:1250407946


--- NEW FILE trac-tracnav-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global tarname TracNav-%{version}

Name:           trac-tracnav-plugin
Version:        4.1
Release:        2%{?dist}
Summary:        Navigation Bar for Trac
Group:          Applications/Internet
License:        GPLv2+
URL:            http://svn.ipd.uka.de/trac/javaparty/wiki/TracNav
Source:         http://pypi.python.org/packages/source/T/TracNav/TracNav-%{version}.zip
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
Requires:       python-setuptools
Requires:       trac >= 0.11

%description
The TracNav macro implements a fully customizable navigation bar for
the Trac wiki engine. The contents of the navigation bar is a wiki
page itself and can be edited like any other wiki page through the web
interface. The navigation bar supports hierarchical ordering of
topics. The design of TracNav mimics the design of the TracGuideToc
that was originally supplied with Trac.


%prep
%setup -n %{tarname} -q


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README
%{python_sitelib}/*


%changelog
* Fri Jul 31 2009 Thomas Moschny <thomas.moschny at gmx.de> - 4.1-2
- Use %%global instead of %%define.

* Mon Jul 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 4.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tracnav-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 16:00:04 -0000	1.1
+++ .cvsignore	16 Aug 2009 07:33:24 -0000	1.2
@@ -0,0 +1 @@
+TracNav-4.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tracnav-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 16:00:04 -0000	1.1
+++ sources	16 Aug 2009 07:33:25 -0000	1.2
@@ -0,0 +1 @@
+390ea72c9170bcc6a5994cb5954fcfcf  TracNav-4.1.zip



From thm at fedoraproject.org  Sun Aug 16 08:06:42 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sun, 16 Aug 2009 08:06:42 +0000 (UTC)
Subject: rpms/trac-tracnav-plugin/F-11 import.log, NONE,
	1.1 trac-tracnav-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090816080642.AE63711C0262@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/trac-tracnav-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23886/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log trac-tracnav-plugin.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
trac-tracnav-plugin-4_1-2_fc11:F-11:trac-tracnav-plugin-4.1-2.fc11.src.rpm:1250409963


--- NEW FILE trac-tracnav-plugin.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global tarname TracNav-%{version}

Name:           trac-tracnav-plugin
Version:        4.1
Release:        2%{?dist}
Summary:        Navigation Bar for Trac
Group:          Applications/Internet
License:        GPLv2+
URL:            http://svn.ipd.uka.de/trac/javaparty/wiki/TracNav
Source:         http://pypi.python.org/packages/source/T/TracNav/TracNav-%{version}.zip
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
Requires:       python-setuptools
Requires:       trac >= 0.11

%description
The TracNav macro implements a fully customizable navigation bar for
the Trac wiki engine. The contents of the navigation bar is a wiki
page itself and can be edited like any other wiki page through the web
interface. The navigation bar supports hierarchical ordering of
topics. The design of TracNav mimics the design of the TracGuideToc
that was originally supplied with Trac.


%prep
%setup -n %{tarname} -q


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README
%{python_sitelib}/*


%changelog
* Fri Jul 31 2009 Thomas Moschny <thomas.moschny at gmx.de> - 4.1-2
- Use %%global instead of %%define.

* Mon Jul 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 4.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tracnav-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Aug 2009 16:00:04 -0000	1.1
+++ .cvsignore	16 Aug 2009 08:06:40 -0000	1.2
@@ -0,0 +1 @@
+TracNav-4.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-tracnav-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Aug 2009 16:00:04 -0000	1.1
+++ sources	16 Aug 2009 08:06:41 -0000	1.2
@@ -0,0 +1 @@
+390ea72c9170bcc6a5994cb5954fcfcf  TracNav-4.1.zip



From jwrdegoede at fedoraproject.org  Sun Aug 16 08:13:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 16 Aug 2009 08:13:32 +0000 (UTC)
Subject: rpms/chromium-bsu/devel chromium-bsu.spec,1.2,1.3
Message-ID: <20090816081332.5AFB311C0262@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chromium-bsu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25438

Modified Files:
	chromium-bsu.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-5
- Switch to openal-soft



Index: chromium-bsu.spec
===================================================================
RCS file: /cvs/extras/rpms/chromium-bsu/devel/chromium-bsu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chromium-bsu.spec	24 Jul 2009 18:57:24 -0000	1.2
+++ chromium-bsu.spec	16 Aug 2009 08:13:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           chromium-bsu
 Version:        0.9.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fast paced, arcade-style, top-scrolling space shooter
 Group:          Amusements/Games
 License:        Artistic clarified
@@ -9,7 +9,8 @@ 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 freealut-devel libglpng-devel ftgl-devel
+BuildRequires:  libpng-devel libglpng-devel ftgl-devel
+BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 Requires:       hicolor-icon-theme
 
 %description
@@ -72,6 +73,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-5
+- Switch to openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From michich at fedoraproject.org  Sun Aug 16 08:54:09 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sun, 16 Aug 2009 08:54:09 +0000 (UTC)
Subject: rpms/opencryptoki/devel opencryptoki.spec,1.2,1.3
Message-ID: <20090816085409.A362D11C0262@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/opencryptoki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32750

Modified Files:
	opencryptoki.spec 
Log Message:
* Sun Aug 16 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-2
- Require libica-2.0.



Index: opencryptoki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/opencryptoki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- opencryptoki.spec	7 Aug 2009 14:16:03 -0000	1.2
+++ opencryptoki.spec	16 Aug 2009 08:54:07 -0000	1.3
@@ -1,7 +1,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version:		2.3.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
@@ -17,7 +17,7 @@ Requires(postun):	initscripts
 BuildRequires:		openssl-devel trousers-devel
 BuildRequires:		autoconf automake libtool
 %ifarch s390 s390x
-BuildRequires:		libica-devel >= 1.3.7
+BuildRequires:		libica-devel >= 2.0
 %endif
 Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -136,6 +136,9 @@ exit 0
 
 
 %changelog
+* Sun Aug 16 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-2
+- Require libica-2.0.
+
 * Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-1
 - New upstream release 2.3.0:
   - adds support for RSA 4096 bit keys in the ICA token.



From bellet at fedoraproject.org  Sun Aug 16 09:02:22 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Sun, 16 Aug 2009 09:02:22 +0000 (UTC)
Subject: rpms/SimGear/F-10 SimGear.spec,1.12,1.13
Message-ID: <20090816090222.D982A11C0262@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/SimGear/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2309

Modified Files:
	SimGear.spec 
Log Message:
* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.0.0-6
- Switch to openal-soft



Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/F-10/SimGear.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- SimGear.spec	24 Sep 2008 20:24:40 -0000	1.12
+++ SimGear.spec	16 Aug 2009 09:02:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		SimGear
 Version:	1.0.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
@@ -14,7 +14,7 @@ Patch3:		SimGear-1.0.0-shared-auto.patch
 Patch4:		SimGear-0.3.10-thesky.patch
 Patch5:		SimGear-1.0.0-untangle.patch
 Patch7:		SimGear-1.0.0-more-archs.patch
-BuildRequires:	openal-devel, plib-devel, libXt-devel, libXext-devel
+BuildRequires:	openal-soft-devel, plib-devel, libXt-devel, libXext-devel
 BuildRequires:	libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
 BuildRequires:	zlib-devel, libjpeg-devel
 
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsgxml.so
 
 %changelog
+* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.0.0-6
+- Switch to openal-soft
+
 * Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.0-5
 - fix SimGear-0.3.10-notabbed_value_test.patch to apply without fuzz
 



From bellet at fedoraproject.org  Sun Aug 16 09:16:56 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Sun, 16 Aug 2009 09:16:56 +0000 (UTC)
Subject: rpms/SimGear/devel SimGear.spec,1.20,1.21
Message-ID: <20090816091657.0C82611C0262@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/SimGear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5371

Modified Files:
	SimGear.spec 
Log Message:
* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-8
- Switch to openal-soft



Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/SimGear.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- SimGear.spec	24 Jul 2009 16:23:36 -0000	1.20
+++ SimGear.spec	16 Aug 2009 09:16:55 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		SimGear
 Version:	1.9.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
@@ -14,7 +14,7 @@ Patch5:		SimGear-1.9.1-untangle.patch
 Patch7:		SimGear-1.9.0-more-archs.patch
 Patch8:		SimGear-1.9.1-gcc44.patch
 Patch9:		SimGear-1.9.1-fix-header-installed-twice.patch
-BuildRequires:	openal-devel, plib-devel >= 1.8.5
+BuildRequires:	openal-soft-devel, plib-devel >= 1.8.5
 BuildRequires:	OpenSceneGraph-devel >= 2.6.0
 BuildRequires:	boost-devel >= 1.34.0
 BuildRequires:	libXt-devel, libXext-devel
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsgxml.so
 
 %changelog
+* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-8
+- Switch to openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bellet at fedoraproject.org  Sun Aug 16 09:18:35 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Sun, 16 Aug 2009 09:18:35 +0000 (UTC)
Subject: rpms/FlightGear/devel FlightGear.spec,1.15,1.16
Message-ID: <20090816091835.B9EEF11C0262@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/FlightGear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5793

Modified Files:
	FlightGear.spec 
Log Message:
* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-6
- Switch to openal-soft



Index: FlightGear.spec
===================================================================
RCS file: /cvs/extras/rpms/FlightGear/devel/FlightGear.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- FlightGear.spec	24 Jul 2009 15:09:39 -0000	1.15
+++ FlightGear.spec	16 Aug 2009 09:18:35 -0000	1.16
@@ -1,7 +1,7 @@
 Name:		FlightGear
 Summary:	The FlightGear Flight Simulator
 Version:	1.9.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -17,7 +17,7 @@ Patch0:		FlightGear-0.9.10-no-automake-i
 Patch1:		FlightGear-1.9.1-gcc44.patch
 URL:		http://www.flightgear.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	openal-devel, SimGear-devel >= %{version}, freeglut-devel
+BuildRequires:	openal-soft-devel, SimGear-devel >= %{version}, freeglut-devel
 BuildRequires:	OpenSceneGraph-devel >= 2.6.0, boost-devel >= 1.34.0
 BuildRequires:	desktop-file-utils
 Requires:	FlightGear-data >= 1.9.0, opengl-games-utils
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-6
+- Switch to openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Sun Aug 16 09:42:59 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 16 Aug 2009 09:42:59 +0000 (UTC)
Subject: rpms/quake3/devel quake3.spec,1.11,1.12
Message-ID: <20090816094259.35ED411C0262@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11785

Modified Files:
	quake3.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.36-3
- Switch to openal-soft



Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- quake3.spec	27 Jul 2009 02:39:12 -0000	1.11
+++ quake3.spec	16 Aug 2009 09:42:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           quake3
 Version:        1.36
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -35,8 +35,8 @@ Patch3:         quake3-1.34-dont-ask-ope
 Patch4:         quake3-1.34-no-pak0-check.patch
 Patch5:         quake3-1.34-rc4-demo-pak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel speex-devel
-BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
+BuildRequires:  SDL-devel libXt-devel openal-soft-devel libjpeg-devel
+BuildRequires:  speex-devel libvorbis-devel curl-devel desktop-file-utils
 %ifarch %{ix86} x86_64
 BuildRequires:  nasm
 %endif
@@ -48,7 +48,7 @@ This package contains the enhanced opens
 Arena engine. This engine can be used to play a number of games based on this
 engine, below is an (incomplete list):
 
-* OpenArena Free, Open Source Quake3 like game, recommended!
+* OpenArena, Free, Open Source Quake3 like game, recommended!
   (packagename: openarena)
 
 * Urban Terror, gratis, but not Open Source FPS best be described as a
@@ -267,6 +267,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.36-3
+- Switch to openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jussilehtola at fedoraproject.org  Sun Aug 16 09:52:22 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 16 Aug 2009 09:52:22 +0000 (UTC)
Subject: rpms/pcc/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 pcc.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090816095222.7820411C0262@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13602/devel

Modified Files:
	.cvsignore import.log pcc.spec sources 
Log Message:
Update to 20090816, adding support for x86_64. Use own configure script to avoid cross compilation.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2009 05:47:21 -0000	1.2
+++ .cvsignore	16 Aug 2009 09:52:21 -0000	1.3
@@ -1,2 +1,2 @@
-pcc-090813.tgz
-pcc-libs-090813.tgz
+pcc-090816.tgz
+pcc-libs-090816.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Aug 2009 05:47:22 -0000	1.1
+++ import.log	16 Aug 2009 09:52:22 -0000	1.2
@@ -1 +1,2 @@
 pcc-0_9_9-0_3_090813cvs_fc11:HEAD:pcc-0.9.9-0.3.090813cvs.fc11.src.rpm:1250142387
+pcc-0_9_9-0_4_090816cvs_fc11:HEAD:pcc-0.9.9-0.4.090816cvs.fc11.src.rpm:1250416223


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/pcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
+++ pcc.spec	16 Aug 2009 09:52:22 -0000	1.4
@@ -3,24 +3,17 @@
  export CFLAGS="%{optflags}"; \
  export CXXFLAGS="%{optflags}"; \
  export FFLAGS="%{optflags} -I%{_fmoddir}"; \
- ./configure --program-prefix= --prefix=%{_prefix} \
- --exec-prefix=%{_prefix} --bindir=%{_bindir} \
- --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} --includedir=%{_includedir} \
- --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} --infodir=%{_infodir}
+ ./configure --program-prefix= --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir}  --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
 
 # Used CVS snapshot
-%global snapshot 090813
+%global snapshot 090816
 
 Name:		pcc
 Version:	0.9.9
 Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and BSD with advertising and ISC 
+License:	BSD with advertising and BSD and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -28,8 +21,8 @@ Source1:	http://pcc.ludd.ltu.se/ftp/pub/
 Patch0:		pcc-090808-optflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Currently only x86 supported both in ppc and ppc-libs
-ExclusiveArch:	%{ix86}
+# Currently only x86 and x86_64 supported both in ppc and ppc-libs
+ExclusiveArch:	%{ix86} x86_64
 BuildRequires:	bison flex
 Requires:	glibc-devel
 
@@ -60,13 +53,21 @@ mv pcc-libs-%{snapshot} pcc-libs
 
 %build
 export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
+# Set architecture directory needed for include flag
+%ifarch x86_64
+export archdir=amd64
+%endif
+%ifarch %{ix86}
+export archdir=i386
+%endif
+
 # First, build the library.
 cd pcc-libs
-%configure
-make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
+%pccconfigure
+make CFLAGS="-I${archdir} -Ilinux -I. %{optflags}" CFLAGS_NODEBUG="-I${archdir} -Ilinux -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
 cd ..
 # Then, build the compiler
-%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
+%pccconfigure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
  --with-libdir=%{_libdir} --with-incdir=%{_includedir}
 make %{?_smp_mflags}
 
@@ -79,8 +80,8 @@ make -C pcc-libs install DESTDIR=%{build
 make install DESTDIR=%{buildroot} strip=no
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
-# Install symlink
-ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+# Rename cpp man page
+mv  %{buildroot}%{_mandir}/man1/{,pcc-}cpp.1
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 
@@ -94,13 +95,17 @@ rm -rf %{buildroot}
 %{_bindir}/pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/pcc-cpp
-%{_libexecdir}/pcc-ccom
-%{_mandir}/man1/pcc-ccom.1.*
+%{_libexecdir}/cpp
+%{_libexecdir}/ccom
+%{_mandir}/man1/ccom.1.*
 %{_mandir}/man1/pcc-cpp.1.*
 %{_mandir}/man1/pcc.1.*
 
 %changelog
+* Sun Aug 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.4.090816cvs
+- Update to 20090816, adding support for x86_64.
+- Use own configure macro to disable cross compilation.
+
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
 - Removed unneeded BR: byacc.
 - Update to 20090813.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:47:22 -0000	1.2
+++ sources	16 Aug 2009 09:52:22 -0000	1.3
@@ -1,2 +1,2 @@
-1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
-b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz
+2e98489a6f3fa699b19a2e08718d38d8  pcc-090816.tgz
+c44547b1f64051534820b61c4f38b284  pcc-libs-090816.tgz



From jussilehtola at fedoraproject.org  Sun Aug 16 09:53:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 16 Aug 2009 09:53:16 +0000 (UTC)
Subject: rpms/pcc/EL-5 pcc.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090816095316.8AFED11C0262@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13804/EL-5

Modified Files:
	pcc.spec sources 
Log Message:
Update to 20090816, adding support for x86_64. Use own configure script to avoid cross compilation.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/EL-5/pcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
+++ pcc.spec	16 Aug 2009 09:53:16 -0000	1.4
@@ -3,24 +3,17 @@
  export CFLAGS="%{optflags}"; \
  export CXXFLAGS="%{optflags}"; \
  export FFLAGS="%{optflags} -I%{_fmoddir}"; \
- ./configure --program-prefix= --prefix=%{_prefix} \
- --exec-prefix=%{_prefix} --bindir=%{_bindir} \
- --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} --includedir=%{_includedir} \
- --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} --infodir=%{_infodir}
+ ./configure --program-prefix= --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir}  --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
 
 # Used CVS snapshot
-%global snapshot 090813
+%global snapshot 090816
 
 Name:		pcc
 Version:	0.9.9
 Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and BSD with advertising and ISC 
+License:	BSD with advertising and BSD and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -28,8 +21,8 @@ Source1:	http://pcc.ludd.ltu.se/ftp/pub/
 Patch0:		pcc-090808-optflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Currently only x86 supported both in ppc and ppc-libs
-ExclusiveArch:	%{ix86}
+# Currently only x86 and x86_64 supported both in ppc and ppc-libs
+ExclusiveArch:	%{ix86} x86_64
 BuildRequires:	bison flex
 Requires:	glibc-devel
 
@@ -60,13 +53,21 @@ mv pcc-libs-%{snapshot} pcc-libs
 
 %build
 export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
+# Set architecture directory needed for include flag
+%ifarch x86_64
+export archdir=amd64
+%endif
+%ifarch %{ix86}
+export archdir=i386
+%endif
+
 # First, build the library.
 cd pcc-libs
-%configure
-make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
+%pccconfigure
+make CFLAGS="-I${archdir} -Ilinux -I. %{optflags}" CFLAGS_NODEBUG="-I${archdir} -Ilinux -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
 cd ..
 # Then, build the compiler
-%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
+%pccconfigure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
  --with-libdir=%{_libdir} --with-incdir=%{_includedir}
 make %{?_smp_mflags}
 
@@ -79,8 +80,8 @@ make -C pcc-libs install DESTDIR=%{build
 make install DESTDIR=%{buildroot} strip=no
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
-# Install symlink
-ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+# Rename cpp man page
+mv  %{buildroot}%{_mandir}/man1/{,pcc-}cpp.1
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 
@@ -94,13 +95,17 @@ rm -rf %{buildroot}
 %{_bindir}/pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/pcc-cpp
-%{_libexecdir}/pcc-ccom
-%{_mandir}/man1/pcc-ccom.1.*
+%{_libexecdir}/cpp
+%{_libexecdir}/ccom
+%{_mandir}/man1/ccom.1.*
 %{_mandir}/man1/pcc-cpp.1.*
 %{_mandir}/man1/pcc.1.*
 
 %changelog
+* Sun Aug 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.4.090816cvs
+- Update to 20090816, adding support for x86_64.
+- Use own configure macro to disable cross compilation.
+
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
 - Removed unneeded BR: byacc.
 - Update to 20090813.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:54:38 -0000	1.2
+++ sources	16 Aug 2009 09:53:16 -0000	1.3
@@ -1,2 +1,2 @@
-1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
-b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz
+2e98489a6f3fa699b19a2e08718d38d8  pcc-090816.tgz
+c44547b1f64051534820b61c4f38b284  pcc-libs-090816.tgz



From jussilehtola at fedoraproject.org  Sun Aug 16 09:53:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 16 Aug 2009 09:53:16 +0000 (UTC)
Subject: rpms/pcc/F-11 pcc.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090816095316.F08ED11C0262@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13804/F-11

Modified Files:
	pcc.spec sources 
Log Message:
Update to 20090816, adding support for x86_64. Use own configure script to avoid cross compilation.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-11/pcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
+++ pcc.spec	16 Aug 2009 09:53:16 -0000	1.4
@@ -3,24 +3,17 @@
  export CFLAGS="%{optflags}"; \
  export CXXFLAGS="%{optflags}"; \
  export FFLAGS="%{optflags} -I%{_fmoddir}"; \
- ./configure --program-prefix= --prefix=%{_prefix} \
- --exec-prefix=%{_prefix} --bindir=%{_bindir} \
- --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} --includedir=%{_includedir} \
- --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} --infodir=%{_infodir}
+ ./configure --program-prefix= --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir}  --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
 
 # Used CVS snapshot
-%global snapshot 090813
+%global snapshot 090816
 
 Name:		pcc
 Version:	0.9.9
 Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and BSD with advertising and ISC 
+License:	BSD with advertising and BSD and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -28,8 +21,8 @@ Source1:	http://pcc.ludd.ltu.se/ftp/pub/
 Patch0:		pcc-090808-optflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Currently only x86 supported both in ppc and ppc-libs
-ExclusiveArch:	%{ix86}
+# Currently only x86 and x86_64 supported both in ppc and ppc-libs
+ExclusiveArch:	%{ix86} x86_64
 BuildRequires:	bison flex
 Requires:	glibc-devel
 
@@ -60,13 +53,21 @@ mv pcc-libs-%{snapshot} pcc-libs
 
 %build
 export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
+# Set architecture directory needed for include flag
+%ifarch x86_64
+export archdir=amd64
+%endif
+%ifarch %{ix86}
+export archdir=i386
+%endif
+
 # First, build the library.
 cd pcc-libs
-%configure
-make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
+%pccconfigure
+make CFLAGS="-I${archdir} -Ilinux -I. %{optflags}" CFLAGS_NODEBUG="-I${archdir} -Ilinux -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
 cd ..
 # Then, build the compiler
-%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
+%pccconfigure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
  --with-libdir=%{_libdir} --with-incdir=%{_includedir}
 make %{?_smp_mflags}
 
@@ -79,8 +80,8 @@ make -C pcc-libs install DESTDIR=%{build
 make install DESTDIR=%{buildroot} strip=no
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
-# Install symlink
-ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+# Rename cpp man page
+mv  %{buildroot}%{_mandir}/man1/{,pcc-}cpp.1
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 
@@ -94,13 +95,17 @@ rm -rf %{buildroot}
 %{_bindir}/pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/pcc-cpp
-%{_libexecdir}/pcc-ccom
-%{_mandir}/man1/pcc-ccom.1.*
+%{_libexecdir}/cpp
+%{_libexecdir}/ccom
+%{_mandir}/man1/ccom.1.*
 %{_mandir}/man1/pcc-cpp.1.*
 %{_mandir}/man1/pcc.1.*
 
 %changelog
+* Sun Aug 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.4.090816cvs
+- Update to 20090816, adding support for x86_64.
+- Use own configure macro to disable cross compilation.
+
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
 - Removed unneeded BR: byacc.
 - Update to 20090813.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:54:39 -0000	1.2
+++ sources	16 Aug 2009 09:53:16 -0000	1.3
@@ -1,2 +1,2 @@
-1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
-b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz
+2e98489a6f3fa699b19a2e08718d38d8  pcc-090816.tgz
+c44547b1f64051534820b61c4f38b284  pcc-libs-090816.tgz



From jussilehtola at fedoraproject.org  Sun Aug 16 09:53:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 16 Aug 2009 09:53:16 +0000 (UTC)
Subject: rpms/pcc/F-10 pcc.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090816095316.BFBFA11C0262@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/pcc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13804/F-10

Modified Files:
	pcc.spec sources 
Log Message:
Update to 20090816, adding support for x86_64. Use own configure script to avoid cross compilation.


Index: pcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/pcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pcc.spec	13 Aug 2009 10:27:55 -0000	1.3
+++ pcc.spec	16 Aug 2009 09:53:16 -0000	1.4
@@ -3,24 +3,17 @@
  export CFLAGS="%{optflags}"; \
  export CXXFLAGS="%{optflags}"; \
  export FFLAGS="%{optflags} -I%{_fmoddir}"; \
- ./configure --program-prefix= --prefix=%{_prefix} \
- --exec-prefix=%{_prefix} --bindir=%{_bindir} \
- --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} --includedir=%{_includedir} \
- --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} --infodir=%{_infodir}
+ ./configure --program-prefix= --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir}  --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
 
 # Used CVS snapshot
-%global snapshot 090813
+%global snapshot 090816
 
 Name:		pcc
 Version:	0.9.9
 Release:	0.4.%{snapshot}cvs%{?dist}
 Summary:	The Portable C Compiler
 Group:		Development/Languages
-License:	BSD and BSD with advertising and ISC 
+License:	BSD with advertising and BSD and ISC 
 URL:		http://pcc.ludd.ltu.se/
 Source0:	http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-%{snapshot}.tgz
 Source1:	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/pcc-libs-%{snapshot}.tgz
@@ -28,8 +21,8 @@ Source1:	http://pcc.ludd.ltu.se/ftp/pub/
 Patch0:		pcc-090808-optflags.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Currently only x86 supported both in ppc and ppc-libs
-ExclusiveArch:	%{ix86}
+# Currently only x86 and x86_64 supported both in ppc and ppc-libs
+ExclusiveArch:	%{ix86} x86_64
 BuildRequires:	bison flex
 Requires:	glibc-devel
 
@@ -60,13 +53,21 @@ mv pcc-libs-%{snapshot} pcc-libs
 
 %build
 export CFLAGS_NODEBUG=`echo %{optflags}|sed "s|-g||g"`
+# Set architecture directory needed for include flag
+%ifarch x86_64
+export archdir=amd64
+%endif
+%ifarch %{ix86}
+export archdir=i386
+%endif
+
 # First, build the library.
 cd pcc-libs
-%configure
-make CFLAGS="-I%{_arch} -I. %{optflags}" CFLAGS_NODEBUG="-I%{_arch} -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
+%pccconfigure
+make CFLAGS="-I${archdir} -Ilinux -I. %{optflags}" CFLAGS_NODEBUG="-I${archdir} -Ilinux -I. $CFLAGS_NODEBUG" %{?_smp_mflags}
 cd ..
 # Then, build the compiler
-%configure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
+%pccconfigure --with-assembler=%{_bindir}/as --with-linker=%{_bindir}/ld \
  --with-libdir=%{_libdir} --with-incdir=%{_includedir}
 make %{?_smp_mflags}
 
@@ -79,8 +80,8 @@ make -C pcc-libs install DESTDIR=%{build
 make install DESTDIR=%{buildroot} strip=no
 # Fix man file perms
 chmod 644 %{buildroot}%{_mandir}/man1/*
-# Install symlink
-ln -sf %{_target_platform}-pcc %{buildroot}%{_bindir}/pcc
+# Rename cpp man page
+mv  %{buildroot}%{_mandir}/man1/{,pcc-}cpp.1
 # Directory for pcc-specific include files
 mkdir -p %{buildroot}%{_includedir}/pcc
 
@@ -94,13 +95,17 @@ rm -rf %{buildroot}
 %{_bindir}/pcc
 %{_libdir}/pcc/
 %{_includedir}/pcc/
-%{_libexecdir}/pcc-cpp
-%{_libexecdir}/pcc-ccom
-%{_mandir}/man1/pcc-ccom.1.*
+%{_libexecdir}/cpp
+%{_libexecdir}/ccom
+%{_mandir}/man1/ccom.1.*
 %{_mandir}/man1/pcc-cpp.1.*
 %{_mandir}/man1/pcc.1.*
 
 %changelog
+* Sun Aug 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.4.090816cvs
+- Update to 20090816, adding support for x86_64.
+- Use own configure macro to disable cross compilation.
+
 * Thu Aug 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.9.9-0.3.090813cvs
 - Removed unneeded BR: byacc.
 - Update to 20090813.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcc/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 05:54:39 -0000	1.2
+++ sources	16 Aug 2009 09:53:16 -0000	1.3
@@ -1,2 +1,2 @@
-1ab38c96c30b04f97c8de5f113e7fb8f  pcc-090813.tgz
-b339afe4381e344011f9009c52458f8d  pcc-libs-090813.tgz
+2e98489a6f3fa699b19a2e08718d38d8  pcc-090816.tgz
+c44547b1f64051534820b61c4f38b284  pcc-libs-090816.tgz



From jwrdegoede at fedoraproject.org  Sun Aug 16 10:05:54 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 16 Aug 2009 10:05:54 +0000 (UTC)
Subject: rpms/vegastrike/devel vegastrike.spec,1.21,1.22
Message-ID: <20090816100554.4054F11C0262@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16259

Modified Files:
	vegastrike.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-13
- Switch to openal-soft



Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- vegastrike.spec	3 Aug 2009 12:43:19 -0000	1.21
+++ vegastrike.spec	16 Aug 2009 10:05:54 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -23,8 +23,8 @@ Patch9:         vegastrike-0.5.0-glext.p
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
-BuildRequires:  SDL_mixer-devel openal-devel freealut-devel libvorbis-devel
-BuildRequires:  ogre-devel cegui-devel desktop-file-utils
+BuildRequires:  SDL_mixer-devel openal-soft-devel freealut-devel
+BuildRequires:  libvorbis-devel ogre-devel cegui-devel desktop-file-utils
 Requires:       %{name}-data = %{version}, hicolor-icon-theme, xdg-utils
 Requires:       opengl-games-utils
 
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-13
+- Switch to openal-soft
+
 * Mon Aug  3 2009 Hans de Goede <hdegoede at redhat.com> 0.5.0-12
 - Fix building with latest OpenGL headers
 



From dodji at fedoraproject.org  Sun Aug 16 10:44:11 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sun, 16 Aug 2009 10:44:11 +0000 (UTC)
Subject: rpms/cloog/devel cloog.spec,1.8,1.9
Message-ID: <20090816104411.3EDC911C0262@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22116

Modified Files:
	cloog.spec 
Log Message:
* Sat Aug 15 2009 Dodji Seketeli <dodji at redhat.com> - 0.15.7-1
- Update to new upstream version (0.15.7)
- Do not build from git snapshot anymore. Rather, got the tarball from
  ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.7.tar.gz
- The upstream tarball is named cloog-ppl, not cloog. Adjusted thusly.
- Use system libtool to disable standard rpath
- Do not try to touch the info file if it's not present. Closes #515929.




Index: cloog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/cloog.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cloog.spec	24 Jul 2009 19:07:16 -0000	1.8
+++ cloog.spec	16 Aug 2009 10:44:10 -0000	1.9
@@ -1,23 +1,21 @@
 %define         git_revision   gitb9d79
 Name:           cloog
-Version:        0.15
-Release:        0.10.%{git_revision}%{?dist}
+%define         tarball_name %{name}-ppl
+Version:        0.15.7
+Release:        1%{?dist}
 Summary:        The Chunky Loop Generator
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.cloog.org
-# The source of this package was pulled from upstream vcs.
-# Please use the following commands to regenerate the tarball:
-# git clone git://repo.or.cz/cloog-ppl.git cloog.git
-# cd cloog.git
-# ./autogen.sh
-# configure --with-ppl
-# make distcheck
-Source0:        %{name}-%{version}-%{git_revision}.tar.gz
-Source1:        README.cloog.txt
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ppl-devel >= 0.10, gmp-devel >= 4.1.3, texinfo >= 4.12
+Source0:        %{tarball_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{tarball_name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  ppl-devel >= 0.10
+BuildRequires:  gmp-devel >= 4.1.3
+BuildRequires:  texinfo >= 4.12
+BuildRequires:  libtool
+
 Requires(post): info
 Requires(preun): info
 
@@ -42,15 +40,18 @@ Requires:       ppl-devel >= 0.10, gmp-d
 The header files and dynamic shared libraries of the Chunky Loop Generator.
 
 %prep
-%setup -q
+%setup -q -n %{tarball_name}-%{version}
 
 %build
 %configure --with-ppl
+
 # Remove the cloog.info in the tarball
 # to force the re-generation of a new one
 test -f doc/cloog.info && rm doc/cloog.info
+
 # Remove the -fomit-frame-pointer compile flag
-make %{?_smp_mflags} AM_CFLAGS=
+# Use system libtool to disable standard rpath
+make %{?_smp_mflags} AM_CFLAGS= LIBTOOL=%{_bindir}/libtool
 
 
 %install
@@ -76,16 +77,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %post ppl
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+test -f %{_infodir}/%{name}.info \
+     && /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun ppl
 if [ $1 = 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+  test -f %{_infodir}/%{name}.info && \
+      /sbin/install-info \
+          --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
 %postun ppl -p /sbin/ldconfig
 
 %changelog
+* Sat Aug 15 2009 Dodji Seketeli <dodji at redhat.com> - 0.15.7-1
+- Update to new upstream version (0.15.7)
+- Do not build from git snapshot anymore. Rather, got the tarball from
+  ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.7.tar.gz
+- The upstream tarball is named cloog-ppl, not cloog. Adjusted thusly.
+- Use system libtool to disable standard rpath
+- Do not try to touch the info file if it's not present. Closes #515929.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-0.10.gitb9d79
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dodji at fedoraproject.org  Sun Aug 16 10:46:50 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sun, 16 Aug 2009 10:46:50 +0000 (UTC)
Subject: rpms/cloog/F-11 cloog.spec,1.7,1.8
Message-ID: <20090816104650.C90C911C0262@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22499

Modified Files:
	cloog.spec 
Log Message:
* Sat Aug 15 2009 Dodji Seketeli <dodji at redhat.com> - 0.15.7-1
- Update to new upstream version (0.15.7)
- Do not build from git snapshot anymore. Rather, got the tarball from
  ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.7.tar.gz
- The upstream tarball is named cloog-ppl, not cloog.
- Use system libtool to disable standard rpath
- Do not try to touch the info file if it's not present. Closes #515929.




Index: cloog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/F-11/cloog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cloog.spec	7 Jul 2009 08:28:59 -0000	1.7
+++ cloog.spec	16 Aug 2009 10:46:50 -0000	1.8
@@ -1,23 +1,21 @@
 %define         git_revision   gitb9d79
 Name:           cloog
-Version:        0.15
-Release:        0.9.%{git_revision}%{?dist}
+%define         tarball_name %{name}-ppl
+Version:        0.15.7
+Release:        1%{?dist}
+#Release:        0.9.%{git_revision}%{?dist}
 Summary:        The Chunky Loop Generator
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.cloog.org
-# The source of this package was pulled from upstream vcs.
-# Please use the following commands to regenerate the tarball:
-# git clone git://repo.or.cz/cloog-ppl.git cloog.git
-# cd cloog.git
-# ./autogen.sh
-# configure --with-ppl
-# make distcheck
-Source0:        %{name}-%{version}-%{git_revision}.tar.gz
-Source1:        README.cloog.txt
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ppl-devel >= 0.10, gmp-devel >= 4.1.3, texinfo >= 4.12
+Source0:        %{tarball_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{tarball_name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  ppl-devel >= 0.10
+BuildRequires:  gmp-devel >= 4.1.3
+BuildRequires:  texinfo >= 4.12
+BuildRequires:  libtool
+
 Requires(post): info
 Requires(preun): info
 
@@ -42,15 +40,18 @@ Requires:       ppl-devel >= 0.10, gmp-d
 The header files and dynamic shared libraries of the Chunky Loop Generator.
 
 %prep
-%setup -q
+%setup -q -n %{tarball_name}-%{version}
 
 %build
 %configure --with-ppl
+
 # Remove the cloog.info in the tarball
 # to force the re-generation of a new one
 test -f doc/cloog.info && rm doc/cloog.info
+
 # Remove the -fomit-frame-pointer compile flag
-make %{?_smp_mflags} AM_CFLAGS=
+# Use system libtool to disable standard rpath
+make %{?_smp_mflags} AM_CFLAGS= LIBTOOL=%{_bindir}/libtool
 
 
 %install
@@ -76,16 +77,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %post ppl
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+test -f %{_infodir}/%{name}.info \
+     && /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun ppl
 if [ $1 = 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+  test -f %{_infodir}/%{name}.info \
+      && /sbin/install-info \
+          --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
 %postun ppl -p /sbin/ldconfig
 
 %changelog
+* Sat Aug 15 2009 Dodji Seketeli <dodji at redhat.com> - 0.15.7-1
+- Update to new upstream version (0.15.7)
+- Do not build from git snapshot anymore. Rather, got the tarball from
+  ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.7.tar.gz
+- The upstream tarball is named cloog-ppl, not cloog. Adjuted thusly.
+- Use system libtool to disable standard rpath
+- Do not try to touch the info file if it's not present. Closes #515929.
+
 * Tue Jul 07 2009 Dodji Seketeli <dodji at redhat.com> - 0.15-0.9.gitb9d79
 - Update to new upstream git snapshot.
 - Update some comments in the spec file.



From dodji at fedoraproject.org  Sun Aug 16 10:48:18 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sun, 16 Aug 2009 10:48:18 +0000 (UTC)
Subject: rpms/cloog/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090816104818.AC6AA11C0262@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22844

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Jul 2009 08:33:33 -0000	1.6
+++ .cvsignore	16 Aug 2009 10:48:18 -0000	1.7
@@ -1 +1,2 @@
 cloog-0.15-gitb9d79.tar.gz
+cloog-ppl-0.15.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Jul 2009 08:33:33 -0000	1.6
+++ sources	16 Aug 2009 10:48:18 -0000	1.7
@@ -1 +1,2 @@
 468879bed7054e75770700eca7cca7a6  cloog-0.15-gitb9d79.tar.gz
+6455e7875daac5bd885545c71c3f2001  cloog-ppl-0.15.7.tar.gz



From gemi at fedoraproject.org  Sun Aug 16 10:48:38 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 16 Aug 2009 10:48:38 +0000 (UTC)
Subject: rpms/hugs98/devel hugs98.spec,1.16,1.17
Message-ID: <20090816104838.764FC11C0262@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/hugs98/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23013

Modified Files:
	hugs98.spec 
Log Message:
rebuild against openal-soft


Index: hugs98.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hugs98.spec	25 Jul 2009 02:18:45 -0000	1.16
+++ hugs98.spec	16 Aug 2009 10:48:38 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2006.09
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
@@ -23,7 +23,7 @@ BuildRequires:	libXmu-devel
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	openal-devel
+BuildRequires:	openal-soft-devel
 BuildRequires:	freealut-devel
 BuildRequires:	prelink
 
@@ -210,6 +210,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-8
+- rebuild against openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2006.09-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gemi at fedoraproject.org  Sun Aug 16 10:51:41 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 16 Aug 2009 10:51:41 +0000 (UTC)
Subject: rpms/hugs98/F-10 hugs98.spec,1.15,1.16
Message-ID: <20090816105141.C27BE11C0262@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/hugs98/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23590/F-10

Modified Files:
	hugs98.spec 
Log Message:
rebuild against openal-soft


Index: hugs98.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hugs98/F-10/hugs98.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hugs98.spec	4 Jul 2009 10:52:00 -0000	1.15
+++ hugs98.spec	16 Aug 2009 10:51:41 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2006.09
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
@@ -23,7 +23,7 @@ BuildRequires:	libXmu-devel
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	openal-devel
+BuildRequires:	openal-soft-devel
 BuildRequires:	freealut-devel
 BuildRequires:	prelink
 
@@ -210,6 +210,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-8
+- rebuild against openal-soft
+
 * Fri Jul  3 2009 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-6
 - added alternatives setup for runhaskell and friends
 



From gemi at fedoraproject.org  Sun Aug 16 10:51:41 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 16 Aug 2009 10:51:41 +0000 (UTC)
Subject: rpms/hugs98/F-11 hugs98.spec,1.15,1.16
Message-ID: <20090816105141.DC1FC11C02C3@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/hugs98/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23590/F-11

Modified Files:
	hugs98.spec 
Log Message:
rebuild against openal-soft


Index: hugs98.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hugs98/F-11/hugs98.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- hugs98.spec	4 Jul 2009 11:11:56 -0000	1.15
+++ hugs98.spec	16 Aug 2009 10:51:41 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2006.09
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
@@ -23,7 +23,7 @@ BuildRequires:	libXmu-devel
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	openal-devel
+BuildRequires:	openal-soft-devel
 BuildRequires:	freealut-devel
 BuildRequires:	prelink
 
@@ -210,6 +210,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-8
+- rebuild against openal-soft
+
 * Fri Jul  3 2009 Gerard Milmeister <gemi at bluewin.ch> - 2006.09-6
 - added alternatives setup for runhaskell and friends
 



From dodji at fedoraproject.org  Sun Aug 16 10:59:31 2009
From: dodji at fedoraproject.org (Dodji Seketeli)
Date: Sun, 16 Aug 2009 10:59:31 +0000 (UTC)
Subject: rpms/cloog/F-11 .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090816105931.CA19211C0262@cvs1.fedora.phx.redhat.com>

Author: dodji

Update of /cvs/pkgs/rpms/cloog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24806

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Jul 2009 08:43:11 -0000	1.6
+++ .cvsignore	16 Aug 2009 10:59:31 -0000	1.7
@@ -1 +1,2 @@
 cloog-0.15-gitb9d79.tar.gz
+cloog-ppl-0.15.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cloog/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Jul 2009 08:43:11 -0000	1.6
+++ sources	16 Aug 2009 10:59:31 -0000	1.7
@@ -1 +1,2 @@
 468879bed7054e75770700eca7cca7a6  cloog-0.15-gitb9d79.tar.gz
+6455e7875daac5bd885545c71c3f2001  cloog-ppl-0.15.7.tar.gz



From bellet at fedoraproject.org  Sun Aug 16 11:09:54 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Sun, 16 Aug 2009 11:09:54 +0000 (UTC)
Subject: rpms/SimGear/F-10 SimGear.spec,1.13,1.14
Message-ID: <20090816110954.E438611C0262@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/SimGear/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26918

Modified Files:
	SimGear.spec 
Log Message:
* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.0.0-7
- Revert previous commit (bz 515109)



Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/F-10/SimGear.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- SimGear.spec	16 Aug 2009 09:02:22 -0000	1.13
+++ SimGear.spec	16 Aug 2009 11:09:54 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		SimGear
 Version:	1.0.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
@@ -14,7 +14,7 @@ Patch3:		SimGear-1.0.0-shared-auto.patch
 Patch4:		SimGear-0.3.10-thesky.patch
 Patch5:		SimGear-1.0.0-untangle.patch
 Patch7:		SimGear-1.0.0-more-archs.patch
-BuildRequires:	openal-soft-devel, plib-devel, libXt-devel, libXext-devel
+BuildRequires:	openal-devel, plib-devel, libXt-devel, libXext-devel
 BuildRequires:	libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
 BuildRequires:	zlib-devel, libjpeg-devel
 
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsgxml.so
 
 %changelog
+* Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.0.0-7
+- Revert previous commit (bz 515109)
+
 * Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.0.0-6
 - Switch to openal-soft
 



From linuxdonald at fedoraproject.org  Sun Aug 16 11:24:46 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:24:46 +0000 (UTC)
Subject: rpms/openal-soft/F-10 openal-soft.spec,1.1,1.2
Message-ID: <20090816112446.0C93511C0262@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28998/F-10

Modified Files:
	openal-soft.spec 
Log Message:

-Added an upstream patch that fix the bug 517721



Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-10/openal-soft.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openal-soft.spec	10 Aug 2009 09:28:09 -0000	1.1
+++ openal-soft.spec	16 Aug 2009 11:24:45 -0000	1.2
@@ -14,8 +14,6 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	portaudio-devel
 BuildRequires:	cmake
-Obsoletes: 	openal <= 0.0.10
-Provides: 	openal = %{version}
 
 %description
 OpenAL Soft is a cross-platform software implementation of the OpenAL 3D



From linuxdonald at fedoraproject.org  Sun Aug 16 11:24:46 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:24:46 +0000 (UTC)
Subject: rpms/openal-soft/F-11 upstream.patch, NONE, 1.1 openal-soft.spec,
	1.1, 1.2
Message-ID: <20090816112446.78D6411C0262@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28998/F-11

Modified Files:
	openal-soft.spec 
Added Files:
	upstream.patch 
Log Message:

-Added an upstream patch that fix the bug 517721


upstream.patch:
 alsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE upstream.patch ---
--- openal-soft-1.8.466/Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
+++ openal-soft-1.8.466/Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
@@ -537,7 +537,6 @@ static void alsa_close_playback(ALCdevic
 
 static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
 {
-    snd_pcm_format_t alsaFormat;
     snd_pcm_hw_params_t *p;
     snd_pcm_uframes_t bufferSizeInFrames;
     snd_pcm_access_t access;
@@ -598,13 +597,13 @@ open_alsa:
     switch(aluBytesFromFormat(format))
     {
         case 1:
-            alsaFormat = SND_PCM_FORMAT_U8;
+            data->format = SND_PCM_FORMAT_U8;
             break;
         case 2:
-            alsaFormat = SND_PCM_FORMAT_S16;
+            data->format = SND_PCM_FORMAT_S16;
             break;
         default:
-            alsaFormat = SND_PCM_FORMAT_UNKNOWN;
+            data->format = SND_PCM_FORMAT_UNKNOWN;
             AL_PRINT("Unknown format?! %x\n", format);
     }
 
@@ -652,7 +652,7 @@ open_alsa:
         if((i=psnd_pcm_hw_params_any(data->pcmHandle, p)) < 0)
             err = "any";
         /* set interleaved access */
-        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)
+        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
             err = "set access";
         /* set format (implicitly sets sample bits) */
         if(err == NULL && (i=psnd_pcm_hw_params_set_format(data->pcmHandle, p, data->format)) < 0)


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/openal-soft.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openal-soft.spec	10 Aug 2009 09:28:09 -0000	1.1
+++ openal-soft.spec	16 Aug 2009 11:24:46 -0000	1.2
@@ -8,14 +8,14 @@ License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
 Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
 Patch1:		openal-soft.patch
+Patch2:		upstream.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	portaudio-devel
 BuildRequires:	cmake
-Obsoletes: 	openal <= 0.0.10
-Provides: 	openal = %{version}
+Conflicts:	openal-devel
 
 %description
 OpenAL Soft is a cross-platform software implementation of the OpenAL 3D
@@ -42,6 +42,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch1 -p0 -b .orig
+%patch2 -p0 -b .orig
 
 %build
 %cmake .



From linuxdonald at fedoraproject.org  Sun Aug 16 11:24:46 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:24:46 +0000 (UTC)
Subject: rpms/openal-soft/devel upstream.patch, NONE, 1.1 openal-soft.spec,
	1.1, 1.2
Message-ID: <20090816112446.989CE11C02C3@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28998/devel

Modified Files:
	openal-soft.spec 
Added Files:
	upstream.patch 
Log Message:

-Added an upstream patch that fix the bug 517721


upstream.patch:
 alsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE upstream.patch ---
--- openal-soft-1.8.466/Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
+++ openal-soft-1.8.466/Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
@@ -537,7 +537,6 @@ static void alsa_close_playback(ALCdevic
 
 static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
 {
-    snd_pcm_format_t alsaFormat;
     snd_pcm_hw_params_t *p;
     snd_pcm_uframes_t bufferSizeInFrames;
     snd_pcm_access_t access;
@@ -598,13 +597,13 @@ open_alsa:
     switch(aluBytesFromFormat(format))
     {
         case 1:
-            alsaFormat = SND_PCM_FORMAT_U8;
+            data->format = SND_PCM_FORMAT_U8;
             break;
         case 2:
-            alsaFormat = SND_PCM_FORMAT_S16;
+            data->format = SND_PCM_FORMAT_S16;
             break;
         default:
-            alsaFormat = SND_PCM_FORMAT_UNKNOWN;
+            data->format = SND_PCM_FORMAT_UNKNOWN;
             AL_PRINT("Unknown format?! %x\n", format);
     }
 
@@ -652,7 +652,7 @@ open_alsa:
         if((i=psnd_pcm_hw_params_any(data->pcmHandle, p)) < 0)
             err = "any";
         /* set interleaved access */
-        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)
+        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
             err = "set access";
         /* set format (implicitly sets sample bits) */
         if(err == NULL && (i=psnd_pcm_hw_params_set_format(data->pcmHandle, p, data->format)) < 0)


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openal-soft.spec	10 Aug 2009 09:28:09 -0000	1.1
+++ openal-soft.spec	16 Aug 2009 11:24:46 -0000	1.2
@@ -8,6 +8,7 @@ License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
 Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
 Patch1:		openal-soft.patch
+Patch2:		upstream.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -42,6 +43,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch1 -p0 -b .orig
+%patch2 -p0 -b .orig
 
 %build
 %cmake .



From linuxdonald at fedoraproject.org  Sun Aug 16 11:28:25 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:28:25 +0000 (UTC)
Subject: rpms/openal-soft/F-11 openal-soft.spec,1.2,1.3
Message-ID: <20090816112825.CCE2F11C0262@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29910/F-11

Modified Files:
	openal-soft.spec 
Log Message:

- forgoten to change the version number



Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/openal-soft.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openal-soft.spec	16 Aug 2009 11:24:46 -0000	1.2
+++ openal-soft.spec	16 Aug 2009 11:28:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		openal-soft
 Version:	1.8.466
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Sun Aug 16 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-7
+- Fixed bug 517721. Added upstream.patch
+
 * Sat Aug 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-6
 - Fixed license and pkgconfig problem thx goes to Christoph Wickert
 



From linuxdonald at fedoraproject.org  Sun Aug 16 11:28:25 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:28:25 +0000 (UTC)
Subject: rpms/openal-soft/devel openal-soft.spec,1.2,1.3
Message-ID: <20090816112825.EF69611C0262@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29910/devel

Modified Files:
	openal-soft.spec 
Log Message:

- forgoten to change the version number



Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openal-soft.spec	16 Aug 2009 11:24:46 -0000	1.2
+++ openal-soft.spec	16 Aug 2009 11:28:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		openal-soft
 Version:	1.8.466
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Sun Aug 16 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-7
+- Fixed bug 517721. Added upstream.patch
+
 * Sat Aug 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-6
 - Fixed license and pkgconfig problem thx goes to Christoph Wickert
 



From gemi at fedoraproject.org  Sun Aug 16 11:30:18 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 16 Aug 2009 11:30:18 +0000 (UTC)
Subject: rpms/scheme2js/devel scheme2js.spec,1.2,1.3
Message-ID: <20090816113018.CB55711C04D1@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/scheme2js/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30351

Modified Files:
	scheme2js.spec 
Log Message:
Rebuilt against bigloo 3.2b


Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/devel/scheme2js.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- scheme2js.spec	27 Jul 2009 03:52:42 -0000	1.2
+++ scheme2js.spec	16 Aug 2009 11:30:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scheme2js
 Version:        20081219
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Scheme to JavaScript compiler
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 20081219-4
+- Rebuilt against bigloo 3.2b
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081219-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Sun Aug 16 11:32:02 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 16 Aug 2009 11:32:02 +0000 (UTC)
Subject: rpms/TnL/devel TnL.spec,1.12,1.13
Message-ID: <20090816113202.6F37911C0262@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/TnL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30715

Modified Files:
	TnL.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 071111-11
- Switch to openal-soft



Index: TnL.spec
===================================================================
RCS file: /cvs/extras/rpms/TnL/devel/TnL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- TnL.spec	24 Jul 2009 16:25:46 -0000	1.12
+++ TnL.spec	16 Aug 2009 11:32:02 -0000	1.13
@@ -7,7 +7,7 @@
 
 Name:           TnL
 Version:        071111
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Thunder & Lightning - A futuristic action flight simulator game
 Group:          Amusements/Games
 License:        GPL+
@@ -18,8 +18,9 @@ Patch0:         TnL-070909-system-boost.
 Patch1:         TnL-070909-crash-on-exit.patch
 Patch2:         TnL-source-071111-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  freealut-devel glew-devel libpng-devel libsigc++-devel
+BuildRequires:  glew-devel libpng-devel libsigc++-devel
 BuildRequires:  SDL-devel Io-language-devel boost-devel cegui-devel
+BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 BuildRequires:  desktop-file-utils
 Requires:       %{name}-data = %{version}, opengl-games-utils
 
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 071111-11
+- Switch to openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 071111-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gemi at fedoraproject.org  Sun Aug 16 11:37:22 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sun, 16 Aug 2009 11:37:22 +0000 (UTC)
Subject: rpms/bigloo/devel bigloo.spec,1.34,1.35
Message-ID: <20090816113722.75E1B11C0262@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31571

Modified Files:
	bigloo.spec 
Log Message:
added requires gc-devel


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- bigloo.spec	9 Aug 2009 22:08:27 -0000	1.34
+++ bigloo.spec	16 Aug 2009 11:37:22 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           bigloo
 Version:        3.2b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bigloo is compiler for the Scheme programming language
 
 Group:          Development/Languages
@@ -27,6 +27,7 @@ BuildRequires:  sqlite-devel
 Requires:       bigloo-libs = %{version}-%{release}
 Requires:       indent
 Requires:       gmp-devel
+Requires:       gc-devel
 Requires(post):	   /sbin/install-info
 Requires(postun):  /sbin/install-info
 ExcludeArch:    ppc64
@@ -227,6 +228,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.2b-2
+- added requires gc-devel
+
 * Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.2b-1
 - new release 3.2b
 



From linuxdonald at fedoraproject.org  Sun Aug 16 11:44:30 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:44:30 +0000 (UTC)
Subject: rpms/openal-soft/F-11 openal-soft.spec, 1.3, 1.4 upstream.patch, 1.1,
	1.2
Message-ID: <20090816114430.EDFBD11C02C3@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725/F-11

Modified Files:
	openal-soft.spec upstream.patch 
Log Message:

- fixed some small bugs on my files



Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/openal-soft.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openal-soft.spec	16 Aug 2009 11:28:25 -0000	1.3
+++ openal-soft.spec	16 Aug 2009 11:44:30 -0000	1.4
@@ -15,7 +15,6 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	portaudio-devel
 BuildRequires:	cmake
-Conflicts:	openal-devel
 
 %description
 OpenAL Soft is a cross-platform software implementation of the OpenAL 3D
@@ -32,8 +31,7 @@ and audio capture.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes: 	openal-devel <= 0.0.10
-Provides: 	openal-devel = %{version}
+Conflicts:	openal-devel
 
 %description	devel
 The %{name}-devel package contains libraries and header files for

upstream.patch:
 alsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Index: upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-11/upstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstream.patch	16 Aug 2009 11:24:46 -0000	1.1
+++ upstream.patch	16 Aug 2009 11:44:30 -0000	1.2
@@ -1,5 +1,5 @@
---- openal-soft-1.8.466/Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
-+++ openal-soft-1.8.466/Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
+--- Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
++++ Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
 @@ -537,7 +537,6 @@ static void alsa_close_playback(ALCdevic
  
  static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)



From linuxdonald at fedoraproject.org  Sun Aug 16 11:44:31 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:44:31 +0000 (UTC)
Subject: rpms/openal-soft/devel upstream.patch,1.1,1.2
Message-ID: <20090816114431.20D6E11C0262@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725/devel

Modified Files:
	upstream.patch 
Log Message:

- fixed some small bugs on my files


upstream.patch:
 alsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Index: upstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/upstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstream.patch	16 Aug 2009 11:24:46 -0000	1.1
+++ upstream.patch	16 Aug 2009 11:44:30 -0000	1.2
@@ -1,5 +1,5 @@
---- openal-soft-1.8.466/Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
-+++ openal-soft-1.8.466/Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
+--- Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
++++ Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
 @@ -537,7 +537,6 @@ static void alsa_close_playback(ALCdevic
  
  static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)



From linuxdonald at fedoraproject.org  Sun Aug 16 11:44:30 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sun, 16 Aug 2009 11:44:30 +0000 (UTC)
Subject: rpms/openal-soft/F-10 upstream.patch, NONE, 1.1 openal-soft.spec,
	1.2, 1.3
Message-ID: <20090816114430.CF28911C0262@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725/F-10

Modified Files:
	openal-soft.spec 
Added Files:
	upstream.patch 
Log Message:

- fixed some small bugs on my files


upstream.patch:
 alsa.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE upstream.patch ---
--- Alc/alsa.c	2009-05-26 23:54:15.000000000 +0200
+++ Alc/alsa.c	2009-08-16 11:09:57.000000000 +0200
@@ -537,7 +537,6 @@ static void alsa_close_playback(ALCdevic
 
 static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
 {
-    snd_pcm_format_t alsaFormat;
     snd_pcm_hw_params_t *p;
     snd_pcm_uframes_t bufferSizeInFrames;
     snd_pcm_access_t access;
@@ -598,13 +597,13 @@ open_alsa:
     switch(aluBytesFromFormat(format))
     {
         case 1:
-            alsaFormat = SND_PCM_FORMAT_U8;
+            data->format = SND_PCM_FORMAT_U8;
             break;
         case 2:
-            alsaFormat = SND_PCM_FORMAT_S16;
+            data->format = SND_PCM_FORMAT_S16;
             break;
         default:
-            alsaFormat = SND_PCM_FORMAT_UNKNOWN;
+            data->format = SND_PCM_FORMAT_UNKNOWN;
             AL_PRINT("Unknown format?! %x\n", format);
     }
 
@@ -652,7 +652,7 @@ open_alsa:
         if((i=psnd_pcm_hw_params_any(data->pcmHandle, p)) < 0)
             err = "any";
         /* set interleaved access */
-        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)
+        if(err == NULL && (i=psnd_pcm_hw_params_set_access(data->pcmHandle, p, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
             err = "set access";
         /* set format (implicitly sets sample bits) */
         if(err == NULL && (i=psnd_pcm_hw_params_set_format(data->pcmHandle, p, data->format)) < 0)


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/F-10/openal-soft.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openal-soft.spec	16 Aug 2009 11:24:45 -0000	1.2
+++ openal-soft.spec	16 Aug 2009 11:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		openal-soft
 Version:	1.8.466
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -8,6 +8,7 @@ License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
 Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
 Patch1:		openal-soft.patch
+Patch2:		upstream.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -30,8 +31,7 @@ and audio capture.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes: 	openal-devel <= 0.0.10
-Provides: 	openal-devel = %{version}
+Conflicts: 	openal-devel
 
 %description	devel
 The %{name}-devel package contains libraries and header files for
@@ -40,6 +40,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch1 -p0 -b .orig
+%patch2 -p0 -b .orig
 
 %build
 %cmake .
@@ -70,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Sun Aug 16 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-7
+- Fixed bug 517721. Added upstream.patch
+
 * Sat Aug 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-6
 - Fixed license and pkgconfig problem thx goes to Christoph Wickert
 



From jwrdegoede at fedoraproject.org  Sun Aug 16 12:41:36 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 16 Aug 2009 12:41:36 +0000 (UTC)
Subject: rpms/nogravity/devel nogravity.spec,1.4,1.5
Message-ID: <20090816124136.988DC11C0262@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/nogravity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9919

Modified Files:
	nogravity.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 2.00-9
- Switch to openal-soft



Index: nogravity.spec
===================================================================
RCS file: /cvs/extras/rpms/nogravity/devel/nogravity.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nogravity.spec	25 Jul 2009 19:28:25 -0000	1.4
+++ nogravity.spec	16 Aug 2009 12:41:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nogravity
 Version:        2.00
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Space shooter in 3D
 Group:          Amusements/Games
 License:        GPLv2+
@@ -23,7 +23,7 @@ Patch6:         nogravity--README.patch
 Patch7:         nogravity--bufer-overflows.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       %{name}-data = %{version}
-BuildRequires:  SDL_mixer-devel openal-devel libpng-devel libvorbis-devel
+BuildRequires:  SDL_mixer-devel openal-soft-devel libpng-devel libvorbis-devel
 BuildRequires:  automake desktop-file-utils
 Requires:       hicolor-icon-theme glx-utils
 
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 2.00-9
+- Switch to openal-soft
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Sun Aug 16 12:52:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 16 Aug 2009 12:52:35 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, NONE,
	1.1 qt.spec, 1.307, 1.308
Message-ID: <20090816125235.7AF9911C0262@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11544

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
fix phonon-backend-gstreamer for using pulsaudio



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: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -p -r1.307 -r1.308
--- qt.spec	15 Aug 2009 20:18:11 -0000	1.307
+++ qt.spec	16 Aug 2009 12:52:35 -0000	1.308
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -49,6 +49,7 @@ Patch17: phonon-4.2.96-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
 # fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
 Patch20: qt-copy-20090626-qt452.patch
+Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -398,6 +399,7 @@ pushd src/3rdparty/phonon
 %patch17 -p1 -b .phonon-pulseaudio
 popd
 %patch19 -p1 -b .servicesfile
+%patch21 -p1 -b .gst-pulsaudio
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -929,6 +931,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Sun Aug 16 2009 Than Ngo <than at redhat.com> - 4.5.2-8
+- fix phonon-backend-gstreamer for using pulsaudio
+
 * Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-7
 - kde-qt: 287-qmenu-respect-minwidth
 - kde-qt: 0288-more-x-keycodes (#475247)



From than at fedoraproject.org  Sun Aug 16 12:53:18 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 16 Aug 2009 12:53:18 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.308,1.309
Message-ID: <20090816125318.52CAF11C0262@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11731

Modified Files:
	qt.spec 
Log Message:
fix phonon-backend-gstreamer for using pulsaudio



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- qt.spec	16 Aug 2009 12:52:35 -0000	1.308
+++ qt.spec	16 Aug 2009 12:53:18 -0000	1.309
@@ -934,7 +934,7 @@ fi
 * Sun Aug 16 2009 Than Ngo <than at redhat.com> - 4.5.2-8
 - fix phonon-backend-gstreamer for using pulsaudio
 
-* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-7
+* 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)
 



From tejas at fedoraproject.org  Sun Aug 16 13:18:31 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Sun, 16 Aug 2009 13:18:31 +0000 (UTC)
Subject: rpms/choqok/devel .cvsignore, 1.4, 1.5 choqok.spec, 1.7,
	1.8 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090816131831.9431B11C0262@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16408/devel

Modified Files:
	.cvsignore choqok.spec import.log sources 
Log Message:
Adding Choqok 0.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Jun 2009 18:52:12 -0000	1.4
+++ .cvsignore	16 Aug 2009 13:18:31 -0000	1.5
@@ -1 +1 @@
-choqok-0.6.1.tar.bz2
+choqok-0.6.6.tar.bz2


Index: choqok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/choqok.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- choqok.spec	24 Jul 2009 18:57:10 -0000	1.7
+++ choqok.spec	16 Aug 2009 13:18:31 -0000	1.8
@@ -1,11 +1,11 @@
 Summary: Choqok KDE Micro-Blogging Client
 Name: choqok
-Version: 0.6.1
-Release: 8%{?dist}
+Version: 0.6.6
+Release: 9%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
-Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.1/choqok-0.6.1.tar.bz2
+Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.6/choqok-0.6.6.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -13,6 +13,8 @@ BuildRequires: cmake >= 2.6
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
 
+Requires: kdeutils >= 4.1
+
 %description
 A Free/Open Source micro-blogging client for K Desktop Environment.
 The name comes from an ancient Persian word, which means Sparrow!
@@ -50,9 +52,11 @@ rm -rf %{buildroot}
 %{_kde4_sharedir}/config.kcfg/choqok.kcfg
 
 %changelog
+* Sun Aug 16 2009 Tejas Dinkar <tejas at gja.in> - 0.6.6-8
+- Added Dependency on kdeutils
+- Choqok 0.6.6 is out
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sun Jun 14 2009 Tejas Dinkar <tejas at gja.in> - 0.6.1-7
 - Choqok 0.6.1 is out with the below two patches
 * Sat Jun 13 2009 Tejas Dinkar <tejas at gja.in> - 0.6-6


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	13 Jun 2009 18:52:12 -0000	1.3
+++ import.log	16 Aug 2009 13:18:31 -0000	1.4
@@ -1,3 +1,4 @@
 choqok-0_5-2_fc10:HEAD:choqok-0.5-2.fc10.src.rpm:1239330826
 choqok-0_6-4_fc10:HEAD:choqok-0.6-4.fc10.src.rpm:1243425066
 choqok-0_6_1-7_fc11:HEAD:choqok-0.6.1-7.fc11.src.rpm:1244919090
+choqok-0_6_6-9_fc11:HEAD:choqok-0.6.6-9.fc11.src.rpm:1250428727


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jun 2009 18:52:12 -0000	1.4
+++ sources	16 Aug 2009 13:18:31 -0000	1.5
@@ -1 +1 @@
-7873f67505d9f61ae7cfb370be8bdb7d  choqok-0.6.1.tar.bz2
+712ba741b6f256ec230b36bfe574d1c0  choqok-0.6.6.tar.bz2



From tejas at fedoraproject.org  Sun Aug 16 13:20:14 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Sun, 16 Aug 2009 13:20:14 +0000 (UTC)
Subject: rpms/choqok/F-10 choqok.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090816132014.9049711C04BE@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16845/F-10

Modified Files:
	choqok.spec sources 
Log Message:
Updating F-11 and F-10 to choqok 0.6.6



Index: choqok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-10/choqok.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- choqok.spec	13 Jun 2009 18:56:15 -0000	1.5
+++ choqok.spec	16 Aug 2009 13:20:14 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: Choqok KDE Micro-Blogging Client
 Name: choqok
-Version: 0.6.1
-Release: 7%{?dist}
+Version: 0.6.6
+Release: 9%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
-Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.1/choqok-0.6.1.tar.bz2
+Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.6/choqok-0.6.6.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -13,6 +13,8 @@ BuildRequires: cmake >= 2.6
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
 
+Requires: kdeutils >= 4.1
+
 %description
 A Free/Open Source micro-blogging client for K Desktop Environment.
 The name comes from an ancient Persian word, which means Sparrow!
@@ -50,6 +52,11 @@ rm -rf %{buildroot}
 %{_kde4_sharedir}/config.kcfg/choqok.kcfg
 
 %changelog
+* Sun Aug 16 2009 Tejas Dinkar <tejas at gja.in> - 0.6.6-8
+- Added Dependency on kdeutils
+- Choqok 0.6.6 is out
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sun Jun 14 2009 Tejas Dinkar <tejas at gja.in> - 0.6.1-7
 - Choqok 0.6.1 is out with the below two patches
 * Sat Jun 13 2009 Tejas Dinkar <tejas at gja.in> - 0.6-6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jun 2009 18:56:15 -0000	1.4
+++ sources	16 Aug 2009 13:20:14 -0000	1.5
@@ -1 +1 @@
-7873f67505d9f61ae7cfb370be8bdb7d  choqok-0.6.1.tar.bz2
+712ba741b6f256ec230b36bfe574d1c0  choqok-0.6.6.tar.bz2



From tejas at fedoraproject.org  Sun Aug 16 13:20:14 2009
From: tejas at fedoraproject.org (Tejas Dinkar)
Date: Sun, 16 Aug 2009 13:20:14 +0000 (UTC)
Subject: rpms/choqok/F-11 choqok.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090816132014.BC8A811C04BE@cvs1.fedora.phx.redhat.com>

Author: tejas

Update of /cvs/pkgs/rpms/choqok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16845/F-11

Modified Files:
	choqok.spec sources 
Log Message:
Updating F-11 and F-10 to choqok 0.6.6



Index: choqok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-11/choqok.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- choqok.spec	13 Jun 2009 18:56:15 -0000	1.5
+++ choqok.spec	16 Aug 2009 13:20:14 -0000	1.6
@@ -1,11 +1,11 @@
 Summary: Choqok KDE Micro-Blogging Client
 Name: choqok
-Version: 0.6.1
-Release: 7%{?dist}
+Version: 0.6.6
+Release: 9%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
-Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.1/choqok-0.6.1.tar.bz2
+Source: http://mirror.umoss.org/download.ospdev.net/choqok/choqok/0.6.6/choqok-0.6.6.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -13,6 +13,8 @@ BuildRequires: cmake >= 2.6
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
 
+Requires: kdeutils >= 4.1
+
 %description
 A Free/Open Source micro-blogging client for K Desktop Environment.
 The name comes from an ancient Persian word, which means Sparrow!
@@ -50,6 +52,11 @@ rm -rf %{buildroot}
 %{_kde4_sharedir}/config.kcfg/choqok.kcfg
 
 %changelog
+* Sun Aug 16 2009 Tejas Dinkar <tejas at gja.in> - 0.6.6-8
+- Added Dependency on kdeutils
+- Choqok 0.6.6 is out
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Sun Jun 14 2009 Tejas Dinkar <tejas at gja.in> - 0.6.1-7
 - Choqok 0.6.1 is out with the below two patches
 * Sat Jun 13 2009 Tejas Dinkar <tejas at gja.in> - 0.6-6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/choqok/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jun 2009 18:56:15 -0000	1.4
+++ sources	16 Aug 2009 13:20:14 -0000	1.5
@@ -1 +1 @@
-7873f67505d9f61ae7cfb370be8bdb7d  choqok-0.6.1.tar.bz2
+712ba741b6f256ec230b36bfe574d1c0  choqok-0.6.6.tar.bz2



From rdieter at fedoraproject.org  Sun Aug 16 13:25:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 16 Aug 2009 13:25:38 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.309,1.310
Message-ID: <20090816132538.0B60211C0262@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18069

Modified Files:
	qt.spec 
Log Message:
mention bug #513421



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- qt.spec	16 Aug 2009 12:53:18 -0000	1.309
+++ qt.spec	16 Aug 2009 13:25:37 -0000	1.310
@@ -932,7 +932,7 @@ fi
 
 %changelog
 * Sun Aug 16 2009 Than Ngo <than at redhat.com> - 4.5.2-8
-- fix phonon-backend-gstreamer for using pulsaudio
+- 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



From pbrobinson at fedoraproject.org  Sun Aug 16 14:30:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:30:47 +0000 (UTC)
Subject: rpms/anerley/devel import.log,1.1,NONE
Message-ID: <20090816143047.3AA0111C034A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30917

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:37:44 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:37:44 +0000 (UTC)
Subject: rpms/bisho/devel import.log,1.1,NONE
Message-ID: <20090816143744.0AF4411C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32050

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:38:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:38:37 +0000 (UTC)
Subject: rpms/ccss/devel import.log,1.1,NONE
Message-ID: <20090816143837.CEC1011C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ccss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32266

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:39:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:39:04 +0000 (UTC)
Subject: rpms/clutter-imcontext/devel import.log,1.1,NONE
Message-ID: <20090816143904.B3E9E11C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/clutter-imcontext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32389

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:41:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:41:39 +0000 (UTC)
Subject: rpms/gjs/devel import.log,1.1,NONE
Message-ID: <20090816144139.A812F11C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gjs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv410

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:43:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:43:10 +0000 (UTC)
Subject: rpms/mutter/devel import.log,1.1,NONE
Message-ID: <20090816144310.6FA8711C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv658

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:47:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:47:13 +0000 (UTC)
Subject: rpms/moblin-cursor-theme/devel import.log,1.1,NONE
Message-ID: <20090816144713.21D3311C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-cursor-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2079

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:48:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:48:13 +0000 (UTC)
Subject: rpms/libplist/devel import.log,1.1,NONE
Message-ID: <20090816144813.D796B11C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2311

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:48:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:48:57 +0000 (UTC)
Subject: rpms/gypsy import.log,1.1,NONE
Message-ID: <20090816144857.AC26211C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gypsy
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:48:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:48:57 +0000 (UTC)
Subject: rpms/gypsy/F-9 gypsy.spec,1.1,1.2
Message-ID: <20090816144857.D220411C02C3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gypsy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461/F-9

Modified Files:
	gypsy.spec 
Log Message:
- remove import.log


Index: gypsy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gypsy/F-9/gypsy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gypsy.spec	16 May 2008 12:12:57 -0000	1.1
+++ gypsy.spec	16 Aug 2009 14:48:57 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           gypsy
 Version:        0.6
-Release:        3%{?dist}
-Summary:        Gypsy is a GPS multiplexing daemon
+Release:        9%{?dist}
+Summary:        A GPS multiplexing daemon
 
 Group:          System Environment/Libraries
 # See LICENSE file for details
@@ -10,12 +10,18 @@ URL:            http://gypsy.freedesktop
 Source0:        http://gypsy.freedesktop.org/gypsy-releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         0001-Make-gypsy-run-as-a-system-service.patch
+
+BuildRequires: bluez-libs-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
-BuildRequires: bluez-libs-devel
 BuildRequires: glib2-devel
+BuildRequires: gtk-doc
 BuildRequires: libxslt
 
+# For patch0
+BuildRequires: automake autoconf libtool
+
 Requires: dbus
 
 %description
@@ -25,16 +31,30 @@ access GPS data from multiple GPS source
 %package devel
 Summary: Development package for gypsy
 Group: Development/Libraries
-Requires: gypsy = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
+Requires: dbus-glib-devel
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 Header files for development with gypsy.
 
+%package docs
+Summary: Documentation files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk-doc
+BuildArch: noarch
+
+%description docs
+This package contains developer documentation for %{name}.
+
 %prep
 %setup -q
 
+%patch0 -p1 -b .dbus
+libtoolize -f
+autoreconf
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -55,21 +75,39 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.lib LICENSE
 %{_sysconfdir}/dbus-1/system.d/Gypsy.conf
-%{_datadir}/dbus-1/services/org.freedesktop.Gypsy.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.Gypsy.service
 %{_libexecdir}/gypsy-daemon
 %{_libdir}/libgypsy.so.0
 %{_libdir}/libgypsy.so.0.0.0
 
 %files devel
-%defattr(-,root,root)
-%dir %{_includedir}/gypsy/
-%dir %{_datadir}/gtk-doc/html/gypsy/
-%doc %{_datadir}/gtk-doc/html/gypsy/*
+%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/gypsy.pc
-%{_includedir}/gypsy/*
+%{_includedir}/gypsy
 %{_libdir}/libgypsy.so
 
+%files docs
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/gypsy
+
 %changelog
+* Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.6-9
+- Gypsy is supposed to run as a system service, as root
+
+* Wed Mar  4 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-8
+- Move docs to noarch, some spec file updates
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.6-6
+- Add gtk-doc build req
+
+* Sat Nov 22 2008 Peter Robinson <pbrobinson at gmail.com> 0.6-5
+- Rebuild
+
+* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 0.6-4
+- Rebuild
 
 * Mon May 15 2008 Peter Robinson <pbrobinson at gmail.com> 0.6-3
 - Further spec file cleanups



From pbrobinson at fedoraproject.org  Sun Aug 16 14:49:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:49:59 +0000 (UTC)
Subject: rpms/gssdp/F-11 import.log,1.1,NONE
Message-ID: <20090816144959.7D01511C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gssdp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2712

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:50:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:50:39 +0000 (UTC)
Subject: rpms/twitter-glib/devel import.log,1.1,NONE
Message-ID: <20090816145039.0FA9811C04BE@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/twitter-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2870

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:51:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:51:28 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel import.log,1.1,NONE
Message-ID: <20090816145128.AD17F11C0262@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-serv3065

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:52:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:52:05 +0000 (UTC)
Subject: rpms/moblin-sound-theme/devel import.log,1.1,NONE
Message-ID: <20090816145205.7468111C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-sound-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3193

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:52:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:52:38 +0000 (UTC)
Subject: rpms/rygel/devel import.log,1.1,NONE
Message-ID: <20090816145238.AF34111C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3319

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:57:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:57:17 +0000 (UTC)
Subject: rpms/usbmuxd/devel import.log,1.1,NONE
Message-ID: <20090816145717.1D3F111C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4195

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:58:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:58:20 +0000 (UTC)
Subject: rpms/ptlib/F-11 import.log,1.1,NONE
Message-ID: <20090816145820.7FC2911C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4409/F-11

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:58:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:58:20 +0000 (UTC)
Subject: rpms/ptlib/devel import.log,1.1,NONE
Message-ID: <20090816145820.B297011C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4409/devel

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:59:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:59:09 +0000 (UTC)
Subject: rpms/tangogps/F-11 import.log,1.1,NONE
Message-ID: <20090816145909.52B3C11C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4586/F-11

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 14:59:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 14:59:09 +0000 (UTC)
Subject: rpms/tangogps/devel import.log,1.1,NONE
Message-ID: <20090816145909.94D0511C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4586/devel

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From bruno at fedoraproject.org  Sun Aug 16 15:03:46 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 16 Aug 2009 15:03:46 +0000 (UTC)
Subject: rpms/colossus/devel 4485.patch, NONE, 1.1 4486.patch, NONE,
	1.1 colossus.spec, 1.5, 1.6
Message-ID: <20090816150346.4477611C0262@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5285

Modified Files:
	colossus.spec 
Added Files:
	4485.patch 4486.patch 
Log Message:
Grab a couple of upstream fixes.



4485.patch:
 TerrainRecruitLoader.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 4485.patch ---
--- core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4484)
+++ core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4485)
@@ -969,7 +969,7 @@
                 + "old is " + g_value + " while new is " + theNumber
                 + " when " + recruiter.getName() + " recruits "
                 + recruit.getName() + " in " + terrain.getId() + " on hex "
-                + hex.getLabel());
+                + (hex != null ? hex.getLabel() : "[hex is null]"));
             LOGGER.warning("The RST is\n"
                 + terrain.getRecruitingSubTree().toString());
         }

4486.patch:
 MasterBoard.java |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 4486.patch ---
--- core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4485)
+++ core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4486)
@@ -888,6 +888,11 @@
         String propName = "java.util.logging.FileHandler.pattern";
         String logPattern = LogManager.getLogManager().getProperty(propName);
 
+        if (logPattern == null)
+        {
+            return "<UNKNOWN> (system property "
+                + " \"java.util.logging.FileHandler.pattern\" is not set?)";
+        }
         // Replace %t with Java's idea of system temp directory:
         if (logPattern.startsWith("%t"))
         {


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- colossus.spec	11 Aug 2009 04:53:08 -0000	1.5
+++ colossus.spec	16 Aug 2009 15:03:45 -0000	1.6
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4482
 %define         revdate    20090810
 Version:        0.9.0
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,8 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:	4485.patch
+Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +66,8 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
+%patch2
 
 %build
 
@@ -179,6 +183,10 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+- Patch 4485 Fix creature info popup
+- Patch 4486 Fix Help problem when a logging property is not set
+
 * Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
 - New public build.
 - Upstream is now using real version numbers.



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:10 +0000 (UTC)
Subject: rpms/speech-dispatcher/F-10 import.log,1.7,NONE
Message-ID: <20090816150510.5BA7811C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-10

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:10 +0000 (UTC)
Subject: rpms/speech-dispatcher/F-11 import.log,1.7,NONE
Message-ID: <20090816150510.B1A6411C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-11

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:11 +0000 (UTC)
Subject: rpms/speech-dispatcher/F-9 import.log,1.6,NONE
Message-ID: <20090816150511.518CD11C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-9

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:11 +0000 (UTC)
Subject: rpms/speech-dispatcher/OLPC-2 import.log,1.6,NONE
Message-ID: <20090816150511.A772E11C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-2
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/OLPC-2

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:11 +0000 (UTC)
Subject: rpms/speech-dispatcher/F-8 import.log,1.5,NONE
Message-ID: <20090816150511.19F7911C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-8

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:12 +0000 (UTC)
Subject: rpms/speech-dispatcher/OLPC-3 import.log,1.5,NONE
Message-ID: <20090816150512.0C20511C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/OLPC-3

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Sun Aug 16 15:05:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 16 Aug 2009 15:05:12 +0000 (UTC)
Subject: rpms/speech-dispatcher/devel import.log,1.7,NONE
Message-ID: <20090816150512.5356211C0262@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/speech-dispatcher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/devel

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From emaldonado at fedoraproject.org  Sun Aug 16 16:31:57 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 16 Aug 2009 16:31:57 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.80,1.81
Message-ID: <20090816163157.2C60711C0262@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22182

Modified Files:
	nss.spec 
Log Message:
Fix to preserve the configuration files and other spec file problems uncovered by Fedora_12_Mass_Rebuild


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- nss.spec	25 Jul 2009 19:34:25 -0000	1.80
+++ nss.spec	16 Aug 2009 16:31:55 -0000	1.81
@@ -1,10 +1,19 @@
-%define nspr_version 4.7
-%define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+%global nspr_version 4.7
+%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+
+# Produce .chk files for the final stripped binaries
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+%{nil}
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          7%{?dist}
+Release:          7.1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -153,14 +162,14 @@ export USE_64
 %{__make} -C ./mozilla/security/nss
 
 # Set up our package file
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+%{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSS_VERSION%%,%{version},g" > \
-                          $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+                          ./mozilla/dist/pkgconfig/nss.pc
 
 NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
 NSS_VMINOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
@@ -170,7 +179,6 @@ export NSS_VMAJOR 
 export NSS_VMINOR 
 export NSS_VPATCH
 
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__cat} %{SOURCE2} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
@@ -178,9 +186,9 @@ export NSS_VPATCH
                           -e "s, at MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
                           -e "s, at MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
                           -e "s, at MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
-                          > $RPM_BUILD_ROOT/%{_bindir}/nss-config
+                          > ./mozilla/dist/pkgconfig/nss-config
 
-chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
+chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
@@ -232,23 +240,18 @@ if [ $TEST_FAILURES -ne 0 ]; then
 fi
 echo "test suite completed"
 
-# Produce .chk files for the final stripped binaries
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
-%{nil}
 
 %install
 
+%{__rm} -rf $RPM_BUILD_ROOT
+
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
@@ -296,6 +299,9 @@ do
   %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
+# Copy the package configuration files
+%{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+%{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -331,6 +337,7 @@ done
 %{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 %files softokn-freebl
+%defattr(-,root,root)
 /%{_lib}/libfreebl3.so
 /%{_lib}/libfreebl3.chk
 
@@ -476,6 +483,9 @@ done
 
 
 %changelog
+* Sat Aug 06 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-7.1
+- Fix spec file problems uncovered by Fedora_12_Mass_Rebuild
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12.3.99.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From eponyme at fedoraproject.org  Sun Aug 16 17:00:34 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:00:34 +0000 (UTC)
Subject: rpms/trustyrc/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 trustyrc.spec, 1.5, 1.6
Message-ID: <20090816170034.3607A11C034A@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27922

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Apr 2009 01:08:47 -0000	1.4
+++ .cvsignore	16 Aug 2009 17:00:33 -0000	1.5
@@ -1 +1 @@
-trustyrc-0.1.3.tar.gz
+trustyrc-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Apr 2009 01:08:47 -0000	1.4
+++ sources	16 Aug 2009 17:00:33 -0000	1.5
@@ -1 +1 @@
-03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz
+fcbae2faa51301fdaece8741a8f0233f  trustyrc-0.1.4.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/trustyrc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- trustyrc.spec	27 Jul 2009 06:18:40 -0000	1.5
+++ trustyrc.spec	16 Aug 2009 17:00:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           trustyrc
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.4
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
@@ -9,7 +9,11 @@ URL:            http://nicoleau.fabien.f
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} 
 BuildRequires:  tinyxml-devel, libcurl-devel
+%else if 0%{?rhel}
+BuildRequires:  curl-devel
+%endif
 Obsoletes:      %{name}-plugins <= 0.1.2
 Obsoletes:      %{name}-plugins-extras <= 0.1.2
 Provides:       %{name}-plugins = %{version}-%{release}
@@ -36,15 +40,20 @@ when the plugin is unloaded.
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}"
 export CXXFLAGS
-make %{?_smp_mflags} PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%if 0%{?fedora}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
-
+%if 0%{?fedora}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,25 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Sat Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.4-1
+- Update to 0.1.4
+- Manage EPEL build
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
 - Rebuild for 0.1.3
 - No more sub packages
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
-
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
-
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build



From eponyme at fedoraproject.org  Sun Aug 16 17:01:41 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:01:41 +0000 (UTC)
Subject: rpms/trustyrc/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 trustyrc.spec, 1.4, 1.5
Message-ID: <20090816170141.E468011C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28229

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Apr 2009 01:10:58 -0000	1.4
+++ .cvsignore	16 Aug 2009 17:01:41 -0000	1.5
@@ -1 +1 @@
-trustyrc-0.1.3.tar.gz
+trustyrc-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Apr 2009 01:10:58 -0000	1.4
+++ sources	16 Aug 2009 17:01:41 -0000	1.5
@@ -1 +1 @@
-03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz
+fcbae2faa51301fdaece8741a8f0233f  trustyrc-0.1.4.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-11/trustyrc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trustyrc.spec	19 Apr 2009 01:10:58 -0000	1.4
+++ trustyrc.spec	16 Aug 2009 17:01:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           trustyrc
-Version:        0.1.3
+Version:        0.1.4
 Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
@@ -9,7 +9,11 @@ URL:            http://nicoleau.fabien.f
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} 
 BuildRequires:  tinyxml-devel, libcurl-devel
+%else if 0%{?rhel}
+BuildRequires:  curl-devel
+%endif
 Obsoletes:      %{name}-plugins <= 0.1.2
 Obsoletes:      %{name}-plugins-extras <= 0.1.2
 Provides:       %{name}-plugins = %{version}-%{release}
@@ -36,15 +40,20 @@ when the plugin is unloaded.
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}"
 export CXXFLAGS
-make %{?_smp_mflags} PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%if 0%{?fedora}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
-
+%if 0%{?fedora}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,22 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Sat Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.4-1
+- Update to 0.1.4
+- Manage EPEL build
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
 - Rebuild for 0.1.3
 - No more sub packages
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
-
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
-
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build



From eponyme at fedoraproject.org  Sun Aug 16 17:02:41 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:02:41 +0000 (UTC)
Subject: rpms/trustyrc/F-10 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 trustyrc.spec, 1.3, 1.4
Message-ID: <20090816170241.6824211C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28468

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Apr 2009 01:12:45 -0000	1.4
+++ .cvsignore	16 Aug 2009 17:02:41 -0000	1.5
@@ -1 +1 @@
-trustyrc-0.1.3.tar.gz
+trustyrc-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Apr 2009 01:12:45 -0000	1.4
+++ sources	16 Aug 2009 17:02:41 -0000	1.5
@@ -1 +1 @@
-03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz
+fcbae2faa51301fdaece8741a8f0233f  trustyrc-0.1.4.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/F-10/trustyrc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- trustyrc.spec	19 Apr 2009 01:12:45 -0000	1.3
+++ trustyrc.spec	16 Aug 2009 17:02:41 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           trustyrc
-Version:        0.1.3
+Version:        0.1.4
 Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
@@ -9,7 +9,11 @@ URL:            http://nicoleau.fabien.f
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} 
 BuildRequires:  tinyxml-devel, libcurl-devel
+%else if 0%{?rhel}
+BuildRequires:  curl-devel
+%endif
 Obsoletes:      %{name}-plugins <= 0.1.2
 Obsoletes:      %{name}-plugins-extras <= 0.1.2
 Provides:       %{name}-plugins = %{version}-%{release}
@@ -36,15 +40,20 @@ when the plugin is unloaded.
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}"
 export CXXFLAGS
-make %{?_smp_mflags} PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%if 0%{?fedora}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
-
+%if 0%{?fedora}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,22 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Sat Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.4-1
+- Update to 0.1.4
+- Manage EPEL build
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
 - Rebuild for 0.1.3
 - No more sub packages
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
-
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
-
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build



From denis at fedoraproject.org  Sun Aug 16 17:04:51 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 16 Aug 2009 17:04:51 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.37, 1.38 glibmm.spec, 1.55,
	1.56 sources, 1.38, 1.39
Message-ID: <20090816170451.7B5BE11C0262@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28909

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.21.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	9 Jul 2009 07:25:24 -0000	1.37
+++ .cvsignore	16 Aug 2009 17:04:51 -0000	1.38
@@ -1 +1 @@
-glibmm-2.21.1.tar.bz2
+glibmm-2.21.3.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- glibmm.spec	25 Jul 2009 00:20:31 -0000	1.55
+++ glibmm.spec	16 Aug 2009 17:04:51 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           glibmm24
-Version:        2.21.1
-Release:        2%{?dist}
+Version:        2.21.3
+Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Denis Leroy <denis at poolshark.org> - 2.21.3-1
+- Update to upstream 2.21.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.21.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	9 Jul 2009 07:25:24 -0000	1.38
+++ sources	16 Aug 2009 17:04:51 -0000	1.39
@@ -1 +1 @@
-d725ce0768e906930f6b44ffef34c51f  glibmm-2.21.1.tar.bz2
+f9f7023f9bddc38f787853eff0a3aafe  glibmm-2.21.3.tar.bz2



From eponyme at fedoraproject.org  Sun Aug 16 17:05:58 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:05:58 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.6, 1.7 cclive.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <20090816170558.EDF5511C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29222

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Aug 2009 10:47:53 -0000	1.6
+++ .cvsignore	16 Aug 2009 17:05:58 -0000	1.7
@@ -1 +1 @@
-cclive-0.4.6.tar.bz2
+cclive-0.4.7.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cclive.spec	3 Aug 2009 10:47:53 -0000	1.6
+++ cclive.spec	16 Aug 2009 17:05:58 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
+- Update to 0.4.7
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1
 - Update to 0.4.6
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Aug 2009 10:47:53 -0000	1.6
+++ sources	16 Aug 2009 17:05:58 -0000	1.7
@@ -1 +1 @@
-d1cce0a433fc515f3682ba7ef4cbdc09  cclive-0.4.6.tar.bz2
+ea7ea8143471690d8972bf9caf21660b  cclive-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Sun Aug 16 17:07:03 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:07:03 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.6, 1.7 cclive.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090816170703.AC7AA11C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29548

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Aug 2009 10:49:44 -0000	1.6
+++ .cvsignore	16 Aug 2009 17:07:03 -0000	1.7
@@ -1 +1 @@
-cclive-0.4.6.tar.bz2
+cclive-0.4.7.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cclive.spec	3 Aug 2009 10:49:45 -0000	1.5
+++ cclive.spec	16 Aug 2009 17:07:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
+- Update to 0.4.7
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1
 - Update to 0.4.6
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Aug 2009 10:49:45 -0000	1.6
+++ sources	16 Aug 2009 17:07:03 -0000	1.7
@@ -1 +1 @@
-d1cce0a433fc515f3682ba7ef4cbdc09  cclive-0.4.6.tar.bz2
+ea7ea8143471690d8972bf9caf21660b  cclive-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Sun Aug 16 17:08:04 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:08:04 +0000 (UTC)
Subject: rpms/cclive/F-10 .cvsignore, 1.6, 1.7 cclive.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <20090816170804.D892511C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29817

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Aug 2009 10:50:57 -0000	1.6
+++ .cvsignore	16 Aug 2009 17:08:04 -0000	1.7
@@ -1 +1 @@
-cclive-0.4.6.tar.bz2
+cclive-0.4.7.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/cclive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cclive.spec	3 Aug 2009 10:50:57 -0000	1.5
+++ cclive.spec	16 Aug 2009 17:08:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.7-1
+- Update to 0.4.7
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.6-1
 - Update to 0.4.6
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Aug 2009 10:50:57 -0000	1.6
+++ sources	16 Aug 2009 17:08:04 -0000	1.7
@@ -1 +1 @@
-d1cce0a433fc515f3682ba7ef4cbdc09  cclive-0.4.6.tar.bz2
+ea7ea8143471690d8972bf9caf21660b  cclive-0.4.7.tar.bz2



From eponyme at fedoraproject.org  Sun Aug 16 17:10:07 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:10:07 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.18, 1.19 clive.spec, 1.22,
	1.23 sources, 1.18, 1.19
Message-ID: <20090816171007.1333911C04D1@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30241

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	3 Aug 2009 13:25:24 -0000	1.18
+++ .cvsignore	16 Aug 2009 17:10:06 -0000	1.19
@@ -1 +1 @@
-clive-2.2.4.tar.bz2
+clive-2.2.5.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- clive.spec	8 Aug 2009 16:59:51 -0000	1.22
+++ clive.spec	16 Aug 2009 17:10:06 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           clive
-Version:        2.2.4
-Release:        2%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1
+- Update to 2.2.5
 * Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2
 - Add perl(Getopt::ArgvFile) as a Require
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Aug 2009 13:25:24 -0000	1.18
+++ sources	16 Aug 2009 17:10:06 -0000	1.19
@@ -1 +1 @@
-30fa519d41432c492c9014358ac0b677  clive-2.2.4.tar.bz2
+ee8460011e966fcc1ca538fd76ecd23a  clive-2.2.5.tar.bz2



From eponyme at fedoraproject.org  Sun Aug 16 17:11:24 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:11:24 +0000 (UTC)
Subject: rpms/clive/F-11 .cvsignore, 1.18, 1.19 clive.spec, 1.21,
	1.22 sources, 1.18, 1.19
Message-ID: <20090816171124.B967211C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30536

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	3 Aug 2009 13:27:05 -0000	1.18
+++ .cvsignore	16 Aug 2009 17:11:24 -0000	1.19
@@ -1 +1 @@
-clive-2.2.4.tar.bz2
+clive-2.2.5.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- clive.spec	8 Aug 2009 17:00:54 -0000	1.21
+++ clive.spec	16 Aug 2009 17:11:24 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           clive
-Version:        2.2.4
-Release:        2%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1
+- Update to 2.2.5
 * Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2
 - Add perl(Getopt::ArgvFile) as a Require
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Aug 2009 13:27:05 -0000	1.18
+++ sources	16 Aug 2009 17:11:24 -0000	1.19
@@ -1 +1 @@
-30fa519d41432c492c9014358ac0b677  clive-2.2.4.tar.bz2
+ee8460011e966fcc1ca538fd76ecd23a  clive-2.2.5.tar.bz2



From eponyme at fedoraproject.org  Sun Aug 16 17:12:22 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 16 Aug 2009 17:12:22 +0000 (UTC)
Subject: rpms/clive/F-10 .cvsignore, 1.18, 1.19 clive.spec, 1.19,
	1.20 sources, 1.18, 1.19
Message-ID: <20090816171222.94E4311C0262@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30762

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	3 Aug 2009 13:28:16 -0000	1.18
+++ .cvsignore	16 Aug 2009 17:12:22 -0000	1.19
@@ -1 +1 @@
-clive-2.2.4.tar.bz2
+clive-2.2.5.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- clive.spec	8 Aug 2009 17:01:44 -0000	1.19
+++ clive.spec	16 Aug 2009 17:12:22 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           clive
-Version:        2.2.4
-Release:        2%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1
+- Update to 2.2.5
 * Sat Aug  8 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-2
 - Add perl(Getopt::ArgvFile) as a Require
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.4-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	3 Aug 2009 13:28:16 -0000	1.18
+++ sources	16 Aug 2009 17:12:22 -0000	1.19
@@ -1 +1 @@
-30fa519d41432c492c9014358ac0b677  clive-2.2.4.tar.bz2
+ee8460011e966fcc1ca538fd76ecd23a  clive-2.2.5.tar.bz2



From denis at fedoraproject.org  Sun Aug 16 17:26:50 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 16 Aug 2009 17:26:50 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.33, 1.34 gtkmm.spec, 1.52,
	1.53 sources, 1.35, 1.36
Message-ID: <20090816172650.5EC5011C0262@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1797

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to upstream 2.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	6 Apr 2009 10:30:24 -0000	1.33
+++ .cvsignore	16 Aug 2009 17:26:50 -0000	1.34
@@ -1 +1 @@
-gtkmm-2.16.0.tar.bz2
+gtkmm-2.17.2.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gtkmm.spec	25 Jul 2009 01:45:58 -0000	1.52
+++ gtkmm.spec	16 Aug 2009 17:26:50 -0000	1.53
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.16.0
-Release:        2%{?dist}
+Version:        2.17.2
+Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -10,10 +10,10 @@ URL:            http://gtkmm.sourceforge
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.15/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glibmm24-devel >= 2.18.0
+BuildRequires:  glibmm24-devel >= 2.21.2
 BuildRequires:  atk-devel >= 1.9.0
-BuildRequires:  pango-devel >= 1.5.2
-BuildRequires:  gtk2-devel >= 2.15.5
+BuildRequires:  pango-devel
+BuildRequires:  gtk2-devel >= 2.17.4
 BuildRequires:  cairomm-devel >= 1.2.2
 BuildRequires:  pangomm-devel >= 2.14.0
 
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Denis Leroy <denis at poolshark.org> - 2.17.2-1
+- Update to upstream 2.17.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	6 Apr 2009 10:30:24 -0000	1.35
+++ sources	16 Aug 2009 17:26:50 -0000	1.36
@@ -1 +1 @@
-a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2
+fdb4932b254c270c0023addd6c2ec420  gtkmm-2.17.2.tar.bz2



From robert at fedoraproject.org  Sun Aug 16 17:28:02 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 16 Aug 2009 17:28:02 +0000 (UTC)
Subject: rpms/jwhois/devel jwhois-4.0-conf_update4.patch, NONE,
	1.1 jwhois.spec, 1.51, 1.52
Message-ID: <20090816172802.2CA4911C0262@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/jwhois/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2092

Modified Files:
	jwhois.spec 
Added Files:
	jwhois-4.0-conf_update4.patch 
Log Message:
Update jwhois.conf for .edu.ar, .bs, .by, .dk, .name, .ng, .ps, .sg, .sl, .sv, .co.zw domains and handles from .name and .aero


jwhois-4.0-conf_update4.patch:
 jwhois.conf |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 82 insertions(+), 5 deletions(-)

--- NEW FILE jwhois-4.0-conf_update4.patch ---
--- jwhois-4.0/example/jwhois.conf		2009-08-16 17:59:06.000000000 +0200
+++ jwhois-4.0/example/jwhois.conf.rsc		2009-08-16 17:59:39.000000000 +0200
@@ -121,6 +121,7 @@
 	"\\.ai$" = "whois.ai";
 	"\\.al$" = "www.ert.gov.al";
 	"\\.am$" = "whois.amnic.net";
+	"\\.edu\\.ar$" = "www.riu.edu.ar";
 	"\\.ar$" = "www.nic.ar";
 	"\\.arpa$" = "whois.iana.org";
 	"\\.as$" = "whois.nic.as";
@@ -142,8 +143,9 @@
 	"\\.bm$" = "rwhois.ibl.bm 4321";
 	"\\.bo$" = "whois.nic.bo";
 	"\\.br$" = "whois.nic.br";
+	"\\.bs$" = "www.register.bs";
 	"\\.bv$" = "whois.ripe.net";
-	"\\.by$" = "whois.ripe.net";
+	"\\.by$" = "www.domain.by";
 	"\\.bz$" = "whois.belizenic.bz";
 	"\\.co\\.ca$" = "whois.co.ca";
 	"\\.ca$" = "whois.cira.ca";
@@ -176,7 +178,10 @@
 		whois-server = "whois.denic.de";
 		query-format = "-C UTF-8 -T dn,ace $*";
 	}
-	"\\.dk$" = "whois.dk-hostmaster.dk";
+	"\\.dk$" {
+		whois-server = "whois.dk-hostmaster.dk";
+		query-format = "--show-handles $*";
+	}
 	"\\.dm$" = "whois.nic.dm";
 	"\\.do$" = "whois.nic.do";
 	"\\.dz$" = "www.nic.dz";
@@ -257,13 +262,16 @@
 	"\\.mx$" = "whois.nic.mx";
 	"\\.my$" = "whois.domainregistry.my";
 	"\\.na$" = "whois.na-nic.com.na";
-	"\\.name$" = "whois.nic.name";
+	"\\.name$" {
+		whois-server = "whois.nic.name";
+		query-format = "domain = $*";
+		}
 	"\\.net$" {
 		whois-server = "whois.verisign-grs.com";
 		query-format = "domain $*";
 	}
 	"\\.nf$" = "whois.cocca.cx";
-	"\\.ng$" = "whois.rg.net";
+	"\\.ng$" = "whois.nic.net.ng";
 	"\\.nl$" = "whois.domain-registry.nl";
 	"\\.no$" = "whois.norid.no";
 	"\\.nu$" = "whois.nic.nu";
@@ -276,6 +284,7 @@
 	"\\.pm$" = "whois.nic.pm";
 	"\\.pr$" = "whois.nic.pr";
 	"\\.pro$" = "whois.registrypro.pro";
+	"\\.ps$" = "www.nic.ps";
 	"\\.pt$" = "whois.dns.pt";
 	"\\.pw$" = "whois.nic.pw";
 	"\\.re$" = "whois.nic.re";
@@ -287,17 +296,19 @@
 	"\\.sb$" = "whois.nic.sb";
 	"\\.sc$" = "whois2.afilias-grs.net";
 	"\\.se$" = "whois.iis.se";
-	"\\.sg$" = "whois.nic.net.sg";
+	"\\.sg$" = "whois.sgnic.sg";
 	"\\.sh$" = "whois.nic.sh";
 	"\\.si$" = "whois.arnes.si";
 	"\\.sj$" = "whois.ripe.net";
 	"\\.sk$" = "whois.sk-nic.sk";
+	"\\.sl$" = "whois.nic.sl";
 	"\\.sm$" = "whois.ripe.net";
 	"\\.sn$" = "whois.nic.sn";
 	"\\.so$" = "whois.nic.so";
 	"\\.sr$" = "whois.register.sr";
 	"\\.st$" = "whois.nic.st";
 	"\\.su$" = "whois.ripn.net";
+	"\\.sv$" = "www.svnet.org.sv";
 	"\\.tc$" = "whois.adamsnames.tc";
 	"\\.tel$" = "whois.nic.tel";
 	"\\.tf$" = "whois.afnic.fr";
@@ -345,6 +356,7 @@
 	"\\.co\\.za$" = "whois.co.za";
 	"\\.nom\\.za$" = "www.nom.za";
 	# "\\.za$" = "whois.frd.ac.za";
+	"\\.co\\.zw$" = "www.zispa.co.zw";
 
 	#
 	# Specify different port numbers to connect to by postfixing the IP
@@ -782,6 +794,22 @@
 		whois-server = "whois.nic.coop";
 		query-format = "CONTACT $*";
 	}
+	".*CONTACT-NAME$" {
+		whois-server = "whois.nic.name";
+		query-format = "contact = $*";
+	}
+	".*REGISTRAR-NAME$" {
+		whois-server = "whois.nic.name";
+		query-format = "registrar = $*";
+	}
+	"^C[0-9]+-AERO$" {
+		whois-server = "whois.aero";
+		query-format = "CONTACT ID $*";
+	}
+	"^D[0-9]+-AERO$" {
+		whois-server = "whois.aero";
+		query-format = "DOMAIN ID $*";
+	}
 }
 
 #
@@ -1089,6 +1117,55 @@
 		http-action = "/dom_det.php";
 		form-element = "domsrch";
 	}
+
+	"www\\.nic\\.ps" {
+		http = "true";
+		http-method = "GET";
+		http-action = "/whois/domain_whois.php";
+		form-element = "dname";
+	}
+
+	"www\\.svnet\\.org\\.sv" {
+		http = "true";
+		http-method = "POST";
+		http-action = "/registro/consultas/whois.php";
+		form-element = "subdominio";
+	}
+
+	"www\\.zispa\\.co\\.zw" {
+		http = "true";
+		http-method = "GET";
+		http-action = "/cgi-bin/search";
+		form-element = "domain";
+	}
+
+	"www\\.riu\\.edu\\.ar" {
+		http = "true";
+		http-method = "POST";
+		http-action = "/cgi-bin/verdom.pl.nuevo";
+		query-format = "username=${+3}";
+	}
+
+	"www\\.register\\.bs" {
+		http = "true";
+		http-method = "POST";
+		http-action = "/cgi-bin/search.pl";
+		form-element = "name";
+	}
+
+	"www\\.domain\\.by" {
+		http = "true";
+		http-method = "POST";
+		http-action = "/cgi-bin/registry.cgi";
+		query-format = "domain=${+2}&lang=e&mode=slquest";
+	}
+
+	"www\\.nic\\.ac" {
+		http = "true";
+		http-method = "GET";
+		http-action = "/cgi-bin/whois";
+		form-element = "textfield";
+	}
 }
 
 #


Index: jwhois.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- jwhois.spec	25 Jul 2009 04:14:09 -0000	1.51
+++ jwhois.spec	16 Aug 2009 17:28:02 -0000	1.52
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 4.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Patch0: jwhois-4.0-connect.patch
@@ -13,6 +13,7 @@ Patch6: jwhois-4.0-conf_update.patch
 Patch7: jwhois-4.0-conf_update2.patch
 Patch8: jwhois-4.0-dotster.patch
 Patch9: jwhois-4.0-conf_update3.patch
+Patch10: jwhois-4.0-conf_update4.patch
 License: GPLv3
 Group: Applications/Internet
 Summary: Internet whois/nicname client
@@ -36,6 +37,7 @@ A whois client that accepts both traditi
 %patch7 -p1 -b .conf_update2
 %patch8 -p1 -b .dotster
 %patch9 -p1 -b .conf_update3
+%patch10 -p1 -b .conf_update4
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -75,6 +77,10 @@ fi
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Sun Aug 16 2009 Robert Scheck <robert at fedoraproject.org> - 4.0-17
+- Update jwhois.conf for .edu.ar, .bs, .by, .dk, .name, .ng, .ps,
+  .sg, .sl, .sv, .co.zw domains and handles from .name and .aero
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sun Aug 16 17:29:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 16 Aug 2009 17:29:51 +0000
Subject: [pkgdb] mtpaint had acl change status
Message-ID: <20090816172951.2770010F86F@bastion2.fedora.phx.redhat.com>

terjeros has set the watchcommits acl on mtpaint (Fedora 10) to Approved for sx2kirby

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mtpaint



From bruno at fedoraproject.org  Sun Aug 16 17:39:25 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 16 Aug 2009 17:39:25 +0000 (UTC)
Subject: rpms/colossus/F-11 4485.patch, NONE, 1.1 4486.patch, NONE,
	1.1 colossus.spec, 1.2, 1.3
Message-ID: <20090816173925.5937611C0262@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4408

Modified Files:
	colossus.spec 
Added Files:
	4485.patch 4486.patch 
Log Message:
Grab a couple of upstream bugfix patches



4485.patch:
 TerrainRecruitLoader.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 4485.patch ---
--- core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4484)
+++ core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4485)
@@ -969,7 +969,7 @@
                 + "old is " + g_value + " while new is " + theNumber
                 + " when " + recruiter.getName() + " recruits "
                 + recruit.getName() + " in " + terrain.getId() + " on hex "
-                + hex.getLabel());
+                + (hex != null ? hex.getLabel() : "[hex is null]"));
             LOGGER.warning("The RST is\n"
                 + terrain.getRecruitingSubTree().toString());
         }

4486.patch:
 MasterBoard.java |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 4486.patch ---
--- core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4485)
+++ core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4486)
@@ -888,6 +888,11 @@
         String propName = "java.util.logging.FileHandler.pattern";
         String logPattern = LogManager.getLogManager().getProperty(propName);
 
+        if (logPattern == null)
+        {
+            return "<UNKNOWN> (system property "
+                + " \"java.util.logging.FileHandler.pattern\" is not set?)";
+        }
         // Replace %t with Java's idea of system temp directory:
         if (logPattern.startsWith("%t"))
         {


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- colossus.spec	11 Aug 2009 05:48:58 -0000	1.2
+++ colossus.spec	16 Aug 2009 17:39:25 -0000	1.3
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4482
 %define         revdate    20090810
 Version:        0.9.0
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,8 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:	4485.patch
+Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +66,8 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
+%patch2
 
 %build
 
@@ -179,6 +183,10 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+- Patch 4485 Fix creature info popup
+- Patch 4486 Fix Help problem when a logging property is not set
+
 * Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
 - New public build.
 - Upstream is now using real version numbers.



From bruno at fedoraproject.org  Sun Aug 16 17:41:02 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 16 Aug 2009 17:41:02 +0000 (UTC)
Subject: rpms/colossus/F-10 4485.patch, NONE, 1.1 4486.patch, NONE,
	1.1 colossus.spec, 1.2, 1.3
Message-ID: <20090816174102.9DC3E11C0262@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4795

Modified Files:
	colossus.spec 
Added Files:
	4485.patch 4486.patch 
Log Message:
Grab a couple of upstream bugfix patches



4485.patch:
 TerrainRecruitLoader.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 4485.patch ---
--- core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4484)
+++ core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4485)
@@ -969,7 +969,7 @@
                 + "old is " + g_value + " while new is " + theNumber
                 + " when " + recruiter.getName() + " recruits "
                 + recruit.getName() + " in " + terrain.getId() + " on hex "
-                + hex.getLabel());
+                + (hex != null ? hex.getLabel() : "[hex is null]"));
             LOGGER.warning("The RST is\n"
                 + terrain.getRecruitingSubTree().toString());
         }

4486.patch:
 MasterBoard.java |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 4486.patch ---
--- core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4485)
+++ core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4486)
@@ -888,6 +888,11 @@
         String propName = "java.util.logging.FileHandler.pattern";
         String logPattern = LogManager.getLogManager().getProperty(propName);
 
+        if (logPattern == null)
+        {
+            return "<UNKNOWN> (system property "
+                + " \"java.util.logging.FileHandler.pattern\" is not set?)";
+        }
         // Replace %t with Java's idea of system temp directory:
         if (logPattern.startsWith("%t"))
         {


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- colossus.spec	11 Aug 2009 05:47:55 -0000	1.2
+++ colossus.spec	16 Aug 2009 17:41:02 -0000	1.3
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4482
 %define         revdate    20090810
 Version:        0.9.0
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,8 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:	4485.patch
+Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +66,8 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
+%patch2
 
 %build
 
@@ -179,6 +183,10 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+- Patch 4485 Fix creature info popup
+- Patch 4486 Fix Help problem when a logging property is not set
+
 * Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
 - New public build.
 - Upstream is now using real version numbers.



From dmaphy at fedoraproject.org  Sun Aug 16 18:03:37 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 18:03:37 +0000 (UTC)
Subject: rpms/geany/F-11 geany-api-0.18.c.tags, NONE, 1.1 std.vala.tags, NONE,
	1.1 geany.spec, 1.29, 1.30 gtk216.c.tags, 1.1,
	1.2 geany-0.17-button-pixmaps.patch, 1.1, NONE
Message-ID: <20090816180337.BDF2211C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9348

Modified Files:
	geany.spec gtk216.c.tags 
Added Files:
	geany-api-0.18.c.tags std.vala.tags 
Removed Files:
	geany-0.17-button-pixmaps.patch 
Log Message:
- new upstream release
- remove button pixmaps patch since this fix is included in 0.18
- add new tags-files geany-api-0.18.c.tags and std.vala.tags




--- NEW FILE geany-api-0.18.c.tags ---
# format=tagmanager
GEANY_FUNCTIONS_H?65536?0
_GNU_SOURCE?65536?0
__STDC_HOSTED__?65536?0
__STDC__?65536?0
__cplusplus?65536?0
dialogs_show_input_numeric?65536?0
dialogs_show_msgbox?65536?0
dialogs_show_question?65536?0
dialogs_show_save_as?65536?0
document_close?65536?0
document_find_by_filename?65536?0
document_find_by_real_path?65536?0
document_get_basename_for_display?65536?0
document_get_current?65536?0
document_get_from_page?65536?0
document_get_status_color?65536?0
document_index?65536?0
document_new_file?65536?0
document_open_file?65536?0
document_open_files?65536?0
document_reload_file?65536?0
document_remove_page?65536?0
document_rename_file?65536?0
document_save_file?65536?0
document_save_file_as?65536?0
document_set_encoding?65536?0
document_set_filetype?65536?0
document_set_text_changed?65536?0
editor_create_widget?65536?0
editor_get_indent_prefs?65536?0
editor_get_word_at_pos?65536?0
editor_indicator_clear?65536?0
editor_indicator_set_on_line?65536?0
editor_indicator_set_on_range?65536?0
editor_set_indent_type?65536?0
encodings_convert_to_utf8?65536?0
encodings_convert_to_utf8_from_charset?65536?0
encodings_get_charset_from_index?65536?0
filetypes_detect_from_file?65536?0
filetypes_index?65536?0
filetypes_lookup_by_name?65536?0
highlighting_get_style?65536?0
keybindings_send_command?65536?0
keybindings_set_item?65536?0
main_locale_init?65536?0
main_reload_configuration?65536?0
msgwin_clear_tab?65536?0
msgwin_compiler_add?65536?0
msgwin_msg_add?65536?0
msgwin_status_add?65536?0
msgwin_switch_tab?65536?0
navqueue_goto_line?65536?0
plugin_add_toolbar_item?65536?0
plugin_module_make_resident?65536?0
plugin_signal_connect?65536?0
sci_end_undo_action?65536?0
sci_ensure_line_is_visible?65536?0
sci_find_matching_brace?65536?0
sci_get_char_at?65536?0
sci_get_col_from_position?65536?0
sci_get_contents?65536?0
sci_get_contents_range?65536?0
sci_get_current_line?65536?0
sci_get_current_position?65536?0
sci_get_length?65536?0
sci_get_line?65536?0
sci_get_line_count?65536?0
sci_get_line_from_position?65536?0
sci_get_line_is_visible?65536?0
sci_get_line_length?65536?0
sci_get_position_from_line?65536?0
sci_get_selected_text?65536?0
sci_get_selected_text_length?65536?0
sci_get_selection_contents?65536?0
sci_get_selection_end?65536?0
sci_get_selection_mode?65536?0
sci_get_selection_start?65536?0
sci_get_style_at?65536?0
sci_get_tab_width?65536?0
sci_get_text?65536?0
sci_get_text_range?65536?0
sci_has_selection?65536?0
sci_indicator_clear?65536?0
sci_indicator_set?65536?0
sci_insert_text?65536?0
sci_replace_sel?65536?0
sci_scroll_caret?65536?0
sci_send_command?65536?0
sci_set_current_position?65536?0
sci_set_font?65536?0
sci_set_selection_end?65536?0
sci_set_selection_mode?65536?0
sci_set_selection_start?65536?0
sci_set_text?65536?0
sci_start_undo_action?65536?0
scintilla_new?65536?0
scintilla_send_message?65536?0
search_show_find_in_files_dialog?65536?0
templates_get_template_fileheader?65536?0
tm_get_real_path?65536?0
tm_source_file_new?65536?0
tm_source_file_update?65536?0
tm_work_object_free?65536?0
tm_workspace_add_object?65536?0
tm_workspace_remove_object?65536?0
ui_add_document_sensitive?65536?0
ui_button_new_with_image?65536?0
ui_dialog_vbox_new?65536?0
ui_entry_add_clear_icon?65536?0
ui_frame_new_with_alignment?65536?0
ui_image_menu_item_new?65536?0
ui_lookup_widget?65536?0
ui_path_box_new?65536?0
ui_progress_bar_start?65536?0
ui_progress_bar_stop?65536?0
ui_set_statusbar?65536?0
ui_table_add_row?65536?0
ui_widget_set_tooltip_text?65536?0
utils_get_date_time?65536?0
utils_get_file_list?65536?0
utils_get_locale_from_utf8?65536?0
utils_get_setting_boolean?65536?0
utils_get_setting_integer?65536?0
utils_get_setting_string?65536?0
utils_get_utf8_from_locale?65536?0
utils_mkdir?65536?0
utils_open_browser?65536?0
utils_remove_ext_from_filename?65536?0
utils_spawn_async?65536?0
utils_spawn_sync?65536?0
utils_str_casecmp?65536?0
utils_str_equal?65536?0
utils_str_middle_truncate?65536?0
utils_str_remove_chars?65536?0
utils_string_replace_all?65536?0
utils_string_replace_first?65536?0
utils_write_file?65536?0


--- NEW FILE std.vala.tags ---
# format=tagmanager
@1016?4?Gst.RTPPayload?0
@1_0?4?Gst.RTSPVersion?0
@1_0?4?Soup.HTTPVersion?0
@1_0?4?Soup.HttpVersion?0
@1_1?4?Soup.HTTPVersion?0
@1_1?4?Soup.HttpVersion?0
@24_HR?4?Gnome.DateEditFlags?0
@2BUTTON_PRESS?4?Gdk.EventType?0
@32000?4?V4l2.MpegAudioSamplingFreq?0
@3BUTTON_PRESS?4?Gdk.EventType?0
@44100?4?V4l2.MpegAudioSamplingFreq?0
@48000?4?V4l2.MpegAudioSamplingFreq?0
@base?8?Gtk.RcStyle?0?Gdk.Color
@base?8?Gtk.Style?0?Gdk.Color
@base?8?V4l2.FrameBuffer?0?void
@break?128?(string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len)?Pango?0?public void
@class?8?X.WindowAttributes?0?int
@construct?128?(string fname, string? root, string? domain)?Glade.XML?0?public bool
@construct?128?(string appname, string title)?Gnome.App?0?public void
@construct?128?(ulong the_time, Gnome.DateEditFlags flags)?Gnome.DateEdit?0?public void
@construct?128?(string history_id, string browse_dialog_title)?Gnome.IconEntry?0?public void
@construct?128?(Gdk.NativeWindow socket_id)?Gtk.Plug?0?public void
@continue?128?()?GLib.Timer?0?public void
@default?128?()?GLib.MainContext?0?public weak MainContext
@default?8?Gsl.RNGTypes?0?RNGType
@delete?128?()?GLib.AppInfo?0?public bool
@delete?128?(GLib.Cancellable? cancellable)?GLib.File?0?public bool
@delete?128?(string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data)?GnomeKeyring?0?public void *
@delete?128?(Gtk.TextIter start, Gtk.TextIter end)?Gtk.TextBuffer?0?public void
@dynamic?8?Gst.BaseRTPPayload?0?bool
@flags?8?X.SizeHints?0?long
@foreach?128?(GConf.ChangeSetForeachFunc func)?GConf.ChangeSet?0?public void
@foreach?128?(GConf.ListenersForeach callback)?GConf.Listeners?0?public void
@foreach?128?(DataForeachFunc func)?GLib.Datalist?0?public void
@foreach?128?(Func func)?GLib.List?0?public void
@foreach?128?(Func func)?GLib.SList?0?public void
@foreach?128?(Func func)?GLib.Sequence?0?public void
@foreach?128?(Func thread_func)?GLib.Thread?0?public void
@foreach?128?(GLib.HFunc func)?Gsf.DocMetaData?0?public void
@foreach?128?(GLib.Func func)?Gst.Iterator?0?public Gst.IteratorResult
@foreach?128?(Gst.StructureForeachFunc func)?Gst.Structure?0?public bool
@foreach?128?(Gst.TagForeachFunc func)?Gst.TagList?0?public void
@foreach?128?(void* data, Gtk.AccelMapForeach foreach_func)?Gtk.AccelMap?0?public void
@foreach?128?(Gtk.Callback callback)?Gtk.Container?0?public void
@foreach?128?(Gtk.PrintSettingsFunc func)?Gtk.PrintSettings?0?public void
@foreach?128?(Gtk.TextTagTableForeach func, void* data)?Gtk.TextTagTable?0?public void
@foreach?128?(Gtk.TreeModelForeachFunc func)?Gtk.TreeModel?0?public void
@foreach?128?(Pango.FontsetForeachFunc func, void* data)?Pango.Fontset?0?public void
@foreach?128?(Soup.MessageHeadersForeachFunc func)?Soup.MessageHeaders?0?public void
@foreach?128?(Tracker.MetadataForeach func)?Tracker.Metadata?0?public void
@foreach?128?(GLib.HFunc func)?Xfce.MenuItemCache?0?public void
@foreach?128?(GLib.HFunc func)?Xfce.MenuItemPool?0?public void
@get?8?GLib.SourceCallbackFuncs?0?SourceCallbackGetFunc
@get?128?(size_t i)?Gsl.Combination?0?public size_t
@get?128?(size_t i)?Gsl.Histogram?0?public double
@get?128?(size_t i, size_t j)?Gsl.Histogram2d?0?public double
@get?128?(size_t i, size_t j)?Gsl.Matrix?0?public double
@get?128?(size_t i, size_t j)?Gsl.MatrixComplex?0?public double
@get?128?(size_t i)?Gsl.Permutation?0?public size_t
@get?128?([CCode (array_length = false)] double[] x)?Gsl.QRNG?0?public int
@get?8?Gsl.QRNGType?0?QRNGGetState2
@get?128?()?Gsl.RNG?0
@get?8?Gsl.RNGType?0?RNGGetState
@get?128?(size_t i)?Gsl.Vector?0?public double
@get?128?(size_t i)?Gsl.VectorComplex?0?public Complex
@in?8?Gdk.EventFocus?0?int16
@interface?8?FTDI.Context?0?int
@interface?8?Soup.Server?0?Soup.Address
@interface?8?USB.ConfigDescriptor?0?Interface
@lock?128?()?GLib.AsyncQueue?0?public void
@lock?128?()?GLib.Mutex?0?public void
@lock?128?(string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data)?GnomeKeyring?0?public void *
@lock?8?Gst.Controller?0?GLib.Mutex
@lock?8?Gst.InterpolationControlSource?0?GLib.Mutex
@lock?8?Gst.Iterator?0?GLib.Mutex
@lock?8?Gst.LFOControlSource?0?GLib.Mutex
@lock?8?Gst.Message?0?GLib.Mutex
@lock?8?Gst.Object?0?GLib.Mutex
@lock?8?Gst.Task?0?void
@lock?128?()?Gtk.AccelGroup?0?public void
@new?128?(Type type, ...)?GLib.Object?0?public Object
@new?128?(out Gst.RTSPMessage msg)?Gst.RTSPMessage?0?public Gst.RTSPResult
@new?128?(out Gst.RTSPTransport transport)?Gst.RTSPTransport?0?public Gst.RTSPResult
@new?128?()?Pango.CairoFontMap?0?public unowned
@ref?128?()?GLib.Object?0?public weak Object
@ref?8?GLib.SourceCallbackFuncs?0?SourceCallbackRefFunc
@ref?128?()?GnomeVFS.Drive?0?public unowned
@ref?128?()?GnomeVFS.Volume?0?public unowned
@ref?128?()?GnomeVFS.VolumeMonitor?0?public unowned
@ref?128?()?Gst.Buffer?0?public unowned
@ref?128?()?Gst.Caps?0?public unowned
@ref?128?()?Gst.Object?0?public unowned
@set?128?(double omega, double L, QAWO sine)?Gsl.IntegrationQAWOTable?0?public int
@set?128?(double alpha, double beta, int mu, int nu)?Gsl.IntegrationQAWSTable?0?public int
@set?128?(size_t i, size_t j, double x)?Gsl.Matrix?0?public void
@set?128?(size_t i, size_t j, double x)?Gsl.MatrixComplex?0?public void
@set?128?(Function* f, double x_minimum, double x_lower, double x_upper)?Gsl.MinFminimizer?0?public int
@set?8?Gsl.MinFminimizerType?0?MinSet
@set?128?(MultifitFunctionFdf* fdf, Vector x)?Gsl.MultifitFdfsolver?0?public int
@set?8?Gsl.MultifitFdfsolverType?0?MultifitFdfSet
@set?128?(MultifitFunction* f, Vector x)?Gsl.MultifitFsolver?0?public int
@set?8?Gsl.MultifitFsolverType?0?MultifitFSet
@set?128?(MultiminFunctionFdf* fdf, Vector x, double step_size, double tol)?Gsl.MultiminFdfminimizer?0?public int
@set?8?Gsl.MultiminFdfminimizerType?0?MultiminFdfSet
@set?128?(MultiminFunction* f, Vector x, Vector step_size)?Gsl.MultiminFminimizer?0?public int
@set?8?Gsl.MultiminFminimizerType?0?MultiminFSet
@set?128?(MultirootFunctionFdf* fdf, Vector x)?Gsl.MultirootFdfsolver?0?public int
@set?8?Gsl.MultirootFdfsolverType?0?MultirootFdfSet
@set?128?(MultirootFunction* f, Vector x)?Gsl.MultirootFsolver?0?public int
@set?8?Gsl.MultirootFsolverType?0?MultirootFSet
@set?128?(ulong s)?Gsl.RNG?0?public void
@set?8?Gsl.RNGType?0?RNGSetState
@set?128?(FunctionFdf* fdf, double root)?Gsl.RootFdfsolver?0?public int
@set?8?Gsl.RootFdfsolverType?0?RootFdfsolverSet
@set?128?(Function* f, double x_lower, double x_upper)?Gsl.RootFsolver?0?public int
@set?8?Gsl.RootFsolverType?0?RootFsolverSet
@set?128?(size_t i, double x)?Gsl.Vector?0?public void
@set?128?(size_t i, Complex x)?Gsl.VectorComplex?0?public void
@signal?128?()?GLib.Cond?0?public void
@signal?8?Glade.AccelInfo?0
@signal?128?()?SDL.Condition?0?public int
@signal?8?V4l2.Tuner?0?int32
@try?128?()?Sqlite.Mutex?0?public int
@value?8?SDL.JoyAxisEvent?0?uint16
@value?8?SDL.JoyHatEvent?0?uchar
@value?8?V4l2.Control?0?int32
@value?8?V4l2.ExtControl?0?int32
A?4?FTDI.Interface?0
A?8?Gsl.MultifitLinearWorkspace?0?Matrix
A?8?Gsl.RanDiscrete?0?size_t
A1?4?Cairo.Format?0
A1?4?Curses.Key?0
A3?4?Curses.Key?0
A8?4?Cairo.Format?0
ABGR?8?Gst.VideoCaps?0
ABGR?4?Gst.VideoFormat?0
ABORT?4?GnomeVFS.XferErrorAction?0
ABORT?4?GnomeVFS.XferErrorMode?0
ABORT?4?GnomeVFS.XferOverwriteAction?0
ABORT?4?GnomeVFS.XferOverwriteMode?0
ABORT?8?Sqlite?0?int
ABORTED?4?GLib.MountOperationResult?0
ABOUT?4?Gnome.UIInfoConfigurableTypes?0
ABOVE?4?Gdk.WindowState?0
ABOVE?4?Wnck.WindowActions?0
ABOVE?4?Wnck.WindowState?0
ABRT?4?Daemon.Sig?0
ABRT?4?GLib.ProcessSignal?0
ABSOLUTE_SIZE?4?Pango.AttrType?0
ABS_ASC?4?Gsl.EigenSortType?0
ABS_DESC?4?Gsl.EigenSortType?0
AC3?4?Gst.BufferFormat?0
AC3?4?Gst.BufferFormatType?0
ACCELERATED_VISUAL?4?SDL.GLattr?0
ACCELERATOR?4?Gtk.UIManagerItemType?0
ACCEL_LABEL?4?Atk.Role?0
ACCEPT?4?Gst.RTSPHeaderField?0
ACCEPT?4?Gtk.ResponseType?0
ACCEPT?4?WebKit.NavigationResponse?0
ACCEPTED?4?Soup.KnownStatusCode?0
ACCEPT_ENCODING?4?Gst.RTSPHeaderField?0
ACCEPT_FILENAME?4?Gtk.FileChooserConfirmation?0
ACCEPT_ITEMS_ONLY?4?Exo.ToolbarsModelFlags?0
ACCEPT_LANGUAGE?4?Gst.RTSPHeaderField?0
ACCES?4?GLib.FileError?0
ACCES?4?GLib.SpawnError?0
ACCESS?4?GnomeVFS.FileInfoFields?0
ACCESS_DENIED?4?DBus.Error?0
ACCESS_DENIED?4?Oobs.Result?0
ACCESS_EXECUTABLE?4?GnomeVFS.FilePermissions?0
ACCESS_READABLE?4?GnomeVFS.FilePermissions?0
ACCESS_WRITABLE?4?GnomeVFS.FilePermissions?0
ACCUM_ALPHA_SIZE?4?SDL.GLattr?0
ACCUM_BLUE_SIZE?4?SDL.GLattr?0
ACCUM_GREEN_SIZE?4?SDL.GLattr?0
ACCUM_RED_SIZE?4?SDL.GLattr?0
ACCURATE?4?Gst.SeekFlags?0
ACE?1?GnomeVFS?0
ACE?128?(GnomeVFS.ACLKind kind, string id, GnomeVFS.ACLPerm perms)?GnomeVFS.ACE?0
ACL?1?GnomeVFS?0
ACL?128?()?GnomeVFS.ACL?0
ACL?4?GnomeVFS.FileInfoFields?0
ACL?4?GnomeVFS.SetFileInfoMask?0
ACLKind?1?GnomeVFS?0
ACLPerm?1?GnomeVFS?0
ACRE?4?Gsl.ConstCGS?0
ACRE?4?Gsl.ConstCGSM?0
ACRE?4?Gsl.ConstMKS?0
ACRE?4?Gsl.ConstMKSA?0
ACTION?4?GLib.SignalFlags?0
ACTION?4?Gtk.SignalRunType?0
ACTIVATABLE?4?Gtk.CellRendererMode?0
ACTIVATE?4?Unique.Command?0
ACTIVE?4?Atk.StateType?0
ACTIVE?4?Exo.MountPointMatchMask?0
ACTIVE?4?Gtk.RcTokenType?0
ACTIVE?4?Gtk.StateType?0
ACTIVE?4?SDL.ActiveState?0
[...32520 lines suppressed...]
xml_write_cache?128?(string location)?Gst.Registry?0?public bool
xmlrpc_build_fault?128?(int fault_code, string fault_format, ...)?Soup?0?public unowned string
xmlrpc_build_method_call?128?(string method_name, GLib.Value[] params)?Soup?0?public unowned string
xmlrpc_build_method_response?128?(GLib.Value value)?Soup?0?public unowned string
xmlrpc_error_quark?128?()?Soup?0?public GLib.Quark
xmlrpc_extract_method_call?128?(string method_call, int length, out unowned string method_name, ...)?Soup?0?public bool
xmlrpc_extract_method_response?128?(string method_response, int length, ...)?Soup?0?public bool
xmlrpc_fault_quark?128?()?Soup?0?public GLib.Quark
xmlrpc_parse_method_call?128?(string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray params)?Soup?0?public bool
xmlrpc_parse_method_response?128?(string method_response, int length, GLib.Value value)?Soup?0?public bool
xmlrpc_request_new?128?(string uri, string method_name, ...)?Soup?0?public unowned
xmlrpc_set_fault?128?(Soup.Message msg, int fault_code, string fault_format, ...)?Soup?0?public void
xmlrpc_set_response?128?(Soup.Message msg, ...)?Soup?0?public void
xmotion?8?X.Event?0?MotionEvent
xmove?128?(LuaVM from, LuaVM to, int n)?Lua.LuaVM?0?public void
xoffset?8?Gtk.TextView?0?int
xor?128?(Gdk.Region source2)?Gdk.Region?0?public void
xor_gc?8?Gtk.Calendar?0?Gdk.GC
xor_gc?8?Gtk.Paned?0?Gdk.GC
xor_gc?8?Hildon.Calendar?0?Gdk.GC
xor_sets?128?(Atk.StateSet compare_set)?Atk.StateSet?0?public unowned
xpad?8?Gtk.CellRenderer?0
xpad?8?Gtk.Misc?0?int
xpadding?8?Gtk.TableChild?0?uint16
xpels_meter?8?Gst.gst_riff_strf_vids?0?uint32
xproperty?8?X.Event?0?PropertyEvent
xrange?8?Gsl.Histogram2d?0?double
xrange?8?Gsl.Histogram2dPDF?0?double
xrel?8?SDL.JoyBallEvent?0?int16
xrel?8?SDL.MouseMotionEvent?0?int16
xreparent?8?X.Event?0?ReparentEvent
xscale?8?Gtk.Alignment?0?float
xselection?8?X.Event?0?SelectionEvent
xserver_vendor_name?128?()?X.Display?0
xserver_vendor_release?128?()?X.Display?0
xshrink?8?Gtk.TableChild?0
xsigma?128?()?Gsl.Histogram2d?0?public double
xsrc?8?Gtk.Ruler?0?int
xt?8?Gsl.MultifitLinearWorkspace?0?Vector
xthickness?8?Gtk.RcStyle?0?int
xthickness?8?Gtk.Style?0?int
xunmap?8?X.Event?0?UnmapEvent
xx?8?Pango.Matrix?0?double
xy?8?Pango.Matrix?0?double
xy_to_index?128?(int x, int y, int index_, int trailing)?Pango.Layout?0?public bool
y?8?Atk.Rectangle?0?int
y?8?Atk.TextRectangle?0?int
y?8?Cairo.PathDataPoint?0?double
y?8?Gdk.EventButton?0?double
y?8?Gdk.EventConfigure?0?int
y?8?Gdk.EventCrossing?0?double
y?8?Gdk.EventMotion?0?double
y?8?Gdk.EventScroll?0?double
y?8?Gdk.Point?0?int
y?8?Gdk.Rectangle?0?int
y?8?Gdk.Span?0?int
y?8?Gdk.WindowAttr?0?int
y?8?Goo.CanvasImage?0?double
y?8?Goo.CanvasImageData?0?double
y?8?Goo.CanvasImageModel?0?double
y?8?Goo.CanvasRect?0?double
y?8?Goo.CanvasRectData?0?double
y?8?Goo.CanvasRectModel?0?double
y?8?Goo.CanvasText?0?double
y?8?Goo.CanvasTextData?0?double
y?8?Goo.CanvasTextModel?0?double
y?8?Goo.CanvasWidget?0?double
y?8?Gsl.Spline?0?double
y?8?Gst.VideoRectangle?0?int
y?8?Gtk.Allocation?0?int
y?8?Gtk.FixedChild?0?int
y?8?Gtk.WidgetAuxInfo?0?int
y?8?Pango.Rectangle?0?int
y?4?SDL.KeySymbol?0
y?8?SDL.MouseButtonEvent?0?uint16
y?8?SDL.MouseMotionEvent?0?uint16
y?8?SDL.Rect?0?int16
y?8?X.ButtonEvent?0?int
y?8?X.ConfigureEvent?0?int
y?8?X.ConfigureRequestEvent?0?int
y?8?X.CreateWindowEvent?0?int
y?8?X.CrossingEvent?0?int
y?8?X.GravityEvent?0?int
y?8?X.KeyEvent?0?int
y?8?X.MotionEvent?0?int
y?8?X.ReparentEvent?0?int
y?8?X.SizeHints?0?int
y?8?X.WindowAttributes?0?int
y?8?X.WindowChanges?0?int
y?8?Xcb.ExposeEvent?0?uint16
y0?128?(double x0)?GLib.Math?0?public double
y0?128?(double x)?Gsl.Bessel?0?public double
y0?8?Gsl.OdeivEvolve?0?double
y0?8?Pango.Matrix?0?double
y0_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y0f?128?(float x0)?GLib.Math?0?public float
y1?128?(double x0)?GLib.Math?0?public double
y1?8?Gdk.Segment?0?int
y1?8?Gdk.Trapezoid?0?double
y1?8?Goo.Canvas?0?double
y1?8?Goo.CanvasBounds?0?double
y1?128?(double x)?Gsl.Bessel?0?public double
y1?8?Poppler.Rectangle?0?double
y1_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y1f?128?(float x0)?GLib.Math?0?public float
y2?8?Gdk.Segment?0?int
y2?8?Gdk.Trapezoid?0?double
y2?8?Goo.Canvas?0?double
y2?8?Goo.CanvasBounds?0?double
y2?128?(double x)?Gsl.Bessel?0?public double
y2?8?Poppler.Rectangle?0?double
y2_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y_advance?8?Cairo.TextExtents?0?double
y_bearing?8?Cairo.TextExtents?0?double
y_offset?8?Pango.GlyphGeometry?0?Pango.GlyphUnit
y_root?8?Gdk.EventButton?0?double
y_root?8?Gdk.EventCrossing?0?double
y_root?8?Gdk.EventDND?0?short
y_root?8?Gdk.EventMotion?0?double
y_root?8?Gdk.EventScroll?0?double
y_root?8?X.ButtonEvent?0?int
y_root?8?X.CrossingEvent?0?int
y_root?8?X.KeyEvent?0?int
y_root?8?X.MotionEvent?0?int
y_set?8?Gtk.WidgetAuxInfo?0
yalign?8?Gtk.Alignment?0?float
yalign?8?Gtk.AspectFrame?0?float
yalign?8?Gtk.Button?0?float
yalign?8?Gtk.CellRenderer?0?float
yalign?8?Gtk.Misc?0?float
ycbcr?8?Tiff.RGBAImage?0?YCbCrToRGB
year?8?GLib.Time?0?int
year?8?Gtk.Calendar?0?int
year?8?Hildon.Calendar?0?int
year?8?Hildon.CalendarPopup?0?int
year?8?Hildon.DateEditor?0
year?8?Soup.Date?0?int
year?8?TagLib.Tag?0
yerr?8?Gsl.OdeivEvolve?0?double
yexpand?8?Gtk.TableChild?0
yfill?8?Gtk.TableChild?0
yield?128?()?GLib.Thread?0?public void
yield?128?(int nresults)?Lua.LuaVM?0?public int
yl?128?(int l, double x)?Gsl.Bessel?0?public double
yl_array?128?(int lmax, double x, [CCode (array_length = false)] double[] result_array)?Gsl.Bessel?0?public int
yl_e?128?(int l, double x, out Result result)?Gsl.Bessel?0?public int
ymax?128?()?Gsl.Histogram2d?0?public double
ymean?128?()?Gsl.Histogram2d?0?public double
ymin?128?()?Gsl.Histogram2d?0?public double
yn?128?(int x0, double x1)?GLib.Math?0?public double
ynf?128?(int x0, float x1)?GLib.Math?0?public float
yoffset?8?Gtk.TextView?0?int
your_event_mask?8?X.WindowAttributes?0?long
ypad?8?Gtk.CellRenderer?0
ypad?8?Gtk.Misc?0?int
ypadding?8?Gtk.TableChild?0?uint16
ypels_meter?8?Gst.gst_riff_strf_vids?0?uint32
yrange?8?Gsl.Histogram2d?0?double
yrange?8?Gsl.Histogram2dPDF?0?double
yrel?8?SDL.JoyBallEvent?0?int16
yrel?8?SDL.MouseMotionEvent?0?int16
yscale?8?Gtk.Alignment?0?float
yshrink?8?Gtk.TableChild?0
ysigma?128?()?Gsl.Histogram2d?0?public double
ysrc?8?Gtk.Ruler?0?int
ythickness?8?Gtk.RcStyle?0?int
ythickness?8?Gtk.Style?0?int
yx?8?Pango.Matrix?0?double
yy?8?Pango.Matrix?0?double
z?4?SDL.KeySymbol?0
zero_Ai?128?(uint s)?Gsl.Airy?0?public double
zero_Ai_deriv?128?(uint s)?Gsl.Airy?0?public double
zero_Ai_deriv_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Ai_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Bi?128?(uint s)?Gsl.Airy?0?public double
zero_Bi_deriv?128?(uint s)?Gsl.Airy?0?public double
zero_Bi_deriv_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Bi_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_J0?128?(uint s)?Gsl.Bessel?0?public double
zero_J0_e?128?(uint s, out Result result)?Gsl.Bessel?0?public int
zero_J1?128?(uint s)?Gsl.Bessel?0?public double
zero_J1_e?128?(uint s, out Result result)?Gsl.Bessel?0?public int
zero_Jnu?128?(double nu, uint s)?Gsl.Bessel?0?public double
zero_Jnu_e?128?(double nu, uint s, out Result result)?Gsl.Bessel?0?public int
zero_ref_count?8?Gtk.TreeModelSort?0?int
zeta?128?(double s)?Gsl.Zeta?0?public double
zeta_e?128?(double s, out Result result)?Gsl.Zeta?0?public int
zeta_int?128?(int n)?Gsl.Zeta?0?public double
zeta_int_e?128?(int n, out Result result)?Gsl.Zeta?0?public int
zetam1?128?(double s)?Gsl.Zeta?0?public double
zetam1_e?128?(double s, out Result result)?Gsl.Zeta?0?public int
zetam1_int?128?(int n)?Gsl.Zeta?0?public double
zetam1_int_e?128?(int n, out Result result)?Gsl.Zeta?0?public int
zones?8?Gst.SDPMessage?0?GLib.Array
zones_len?128?()?Gst.SDPMessage?0
zoom?8?Poppler.Dest?0?double
zoom?128?(Surface src, double zoomx, double zoomy, int smooth)?SDLGraphics.RotoZoom?0?public Surface
zoom_size?128?(int width, int height, double zoomx, double zoomy, ref int dstwidth, ref int dstheight)?SDLGraphics.RotoZoom?0?public void
zuf?8?Gsl.RNGTypes?0?RNGType
zz?8?Gsl.MathieuWorkspace?0?double


Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- geany.spec	31 Jul 2009 21:21:24 -0000	1.29
+++ geany.spec	16 Aug 2009 18:03:36 -0000	1.30
@@ -1,6 +1,6 @@
 Name:      geany
-Version:   0.17
-Release:   8%{?dist}
+Version:   0.18
+Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -8,16 +8,15 @@ License:   GPLv2+
 URL:       http://www.geany.org/
 Source0:   http://download.geany.org/%{name}-%{version}.tar.bz2
 
-# The following tags files were retrieved 25th Feb 2009
+# The following tags files were retrieved 16th Aug 2009
 Source1:   http://download.geany.org/contrib/tags/sqlite3.c.tags
 Source2:   http://download.geany.org/contrib/tags/std.glsl.tags
 Source3:   http://download.geany.org/contrib/tags/gtk216.c.tags
 Source4:   http://download.geany.org/contrib/tags/xfce46.c.tags
 Source5:   http://download.geany.org/contrib/tags/dbus-glib-0.76.c.tags
 Source6:   http://download.geany.org/contrib/tags/standard.css.tags
-
-# Fix the button pixmaps - backported from upstream SVN rev 3882
-Patch0:    geany-0.17-button-pixmaps.patch
+Source7:   http://download.geany.org/contrib/tags/geany-api-0.18.c.tags
+Source8:   http://download.geany.org/contrib/tags/std.vala.tags
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +27,7 @@ Requires: vte
 %define geany_docdir $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %description
-Geany is a small and fast editor with basic features of an 
+Geany is a small and fast editor with basic features of an
 integrated development environment.
 
 Some features:
@@ -53,8 +52,6 @@ Geany plug-ins. You do not need to insta
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
@@ -97,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-1
+- new upstream release
+- remove button pixmaps patch since this fix is included in 0.18
+- add new tags-files geany-api-0.18.c.tags and std.vala.tags
+
 * Mon Jul 27 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.17-8
 - install additional *.tags-files to $prefix/share/geany/tags
 
@@ -153,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Mar 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-2
 - Fix docdir/doc_dir so geany correctly finds the system installed html docs (BZ
-  438534) 
+  438534)
 
 * Sun Feb 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-1
 - Update to version 0.13


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gtk216.c.tagsIndex: gtk216.c.tags
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/gtk216.c.tags,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk216.c.tags	20 May 2009 22:36:40 -0000	1.1
+++ gtk216.c.tags	16 Aug 2009 18:03:36 -0000	1.2
@@ -1,9 +1,7 @@
 # format=tagmanager
 ABS?65536?0
 ABS?131072?(a)?0
-ACCESSPERMS?65536?0
 AIO_PRIO_DELTA_MAX?65536?0
-ALLPERMS?65536?0
 ARG_MAX?65536?0
 ATEXIT?131072?(proc)?0
 ATK_ACTION?131072?(obj)?0
@@ -461,7 +459,6 @@ CAIRO_FORMAT_ARGB32?4?_cairo_format?0
 CAIRO_FORMAT_RGB16_565?65536?0
 CAIRO_FORMAT_RGB24?4?_cairo_format?0
 CAIRO_H?65536?0
-CAIRO_HAS_DIRECTFB_SURFACE?65536?0
 CAIRO_HAS_FT_FONT?65536?0
 CAIRO_HAS_IMAGE_SURFACE?65536?0
 CAIRO_HAS_PDF_SURFACE?65536?0
@@ -602,7 +599,6 @@ DBL_MAX_EXP?65536?0
 DBL_MIN?65536?0
 DBL_MIN_10_EXP?65536?0
 DBL_MIN_EXP?65536?0
-DEFFILEMODE?65536?0
 DELAYTIMER_MAX?65536?0
 EOF?65536?0
 EXPR_NEST_MAX?65536?0
@@ -639,14 +635,14 @@ FPE_INTOVF?65536?0
 FPE_INTOVF?4?anon_enum_20?0
 GAllocator?4096?0?_GAllocator
 GAppInfo?4096?0?_GAppInfo
-GAppInfoCreateFlags?4096?0?anon_enum_103
+GAppInfoCreateFlags?4096?0?anon_enum_98
 GAppInfoIface?4096?0?_GAppInfoIface
 GAppLaunchContext?4096?0?_GAppLaunchContext
 GAppLaunchContextClass?4096?0?_GAppLaunchContextClass
 GAppLaunchContextPrivate?4096?0?_GAppLaunchContextPrivate
 GArray?4096?0?_GArray
 GAsciiType?4096?0?anon_enum_84
-GAskPasswordFlags?4096?0?anon_enum_119
+GAskPasswordFlags?4096?0?anon_enum_114
 GAsyncQueue?4096?0?_GAsyncQueue
 GAsyncReadyCallback?4096?0?typedef void
 GAsyncResult?4096?0?_GAsyncResult
@@ -687,7 +683,7 @@ GCompletion?4096?0?_GCompletion
 GCompletionFunc?4096?0?typedef gchar *
 GCompletionStrncmpFunc?4096?0?typedef gint
 GCond?4096?0?_GCond
-GConnectFlags?4096?0?anon_enum_101
+GConnectFlags?4096?0?anon_enum_96
 GConvertError?4096?0?anon_enum_48
 GCopyFunc?4096?0?typedef gpointer
 GDKCONFIG_H?65536?0
@@ -1315,8 +1311,8 @@ GDataInputStreamPrivate?4096?0?_GDataInp
 GDataOutputStream?4096?0?_GDataOutputStream
 GDataOutputStreamClass?4096?0?_GDataOutputStreamClass
 GDataOutputStreamPrivate?4096?0?_GDataOutputStreamPrivate
-GDataStreamByteOrder?4096?0?anon_enum_104
-GDataStreamNewlineType?4096?0?anon_enum_105
+GDataStreamByteOrder?4096?0?anon_enum_99
+GDataStreamNewlineType?4096?0?anon_enum_100
 GDate?4096?0?_GDate
 GDateDMY?4096?0?anon_enum_49
 GDateDay?4096?0?guint8
@@ -1331,7 +1327,7 @@ GDrive?4096?0?_GDrive
 GDriveIface?4096?0?_GDriveIface
 GEmblem?4096?0?_GEmblem
 GEmblemClass?4096?0?_GEmblemClass
-GEmblemOrigin?4096?0?anon_enum_123
+GEmblemOrigin?4096?0?anon_enum_118
 GEmblemedIcon?4096?0?_GEmblemedIcon
 GEmblemedIconClass?4096?0?_GEmblemedIconClass
 GEnumClass?4096?0?_GEnumClass
@@ -1341,13 +1337,13 @@ GError?4096?0?_GError
 GErrorType?4096?0?anon_enum_79
 GFile?4096?0?_GFile
 GFileAttributeInfo?4096?0?_GFileAttributeInfo
-GFileAttributeInfoFlags?4096?0?anon_enum_107
+GFileAttributeInfoFlags?4096?0?anon_enum_102
 GFileAttributeInfoList?4096?0?_GFileAttributeInfoList
 GFileAttributeMatcher?4096?0?_GFileAttributeMatcher
-GFileAttributeStatus?4096?0?anon_enum_108
-GFileAttributeType?4096?0?anon_enum_106
-GFileCopyFlags?4096?0?anon_enum_113
-GFileCreateFlags?4096?0?anon_enum_110
+GFileAttributeStatus?4096?0?anon_enum_103
+GFileAttributeType?4096?0?anon_enum_101
+GFileCopyFlags?4096?0?anon_enum_108
+GFileCreateFlags?4096?0?anon_enum_105
 GFileEnumerator?4096?0?_GFileEnumerator
 GFileEnumeratorClass?4096?0?_GFileEnumeratorClass
 GFileEnumeratorPrivate?4096?0?_GFileEnumeratorPrivate
@@ -1362,20 +1358,20 @@ GFileInputStreamClass?4096?0?_GFileInput
 GFileInputStreamPrivate?4096?0?_GFileInputStreamPrivate
 GFileMonitor?4096?0?_GFileMonitor
 GFileMonitorClass?4096?0?_GFileMonitorClass
-GFileMonitorEvent?4096?0?anon_enum_117
-GFileMonitorFlags?4096?0?anon_enum_114
+GFileMonitorEvent?4096?0?anon_enum_112
+GFileMonitorFlags?4096?0?anon_enum_109
 GFileMonitorPrivate?4096?0?_GFileMonitorPrivate
 GFileOutputStream?4096?0?_GFileOutputStream
 GFileOutputStreamClass?4096?0?_GFileOutputStreamClass
 GFileOutputStreamPrivate?4096?0?_GFileOutputStreamPrivate
 GFileProgressCallback?4096?0?typedef void
-GFileQueryInfoFlags?4096?0?anon_enum_109
+GFileQueryInfoFlags?4096?0?anon_enum_104
 GFileReadMoreCallback?4096?0?typedef gboolean
 GFileTest?4096?0?anon_enum_53
-GFileType?4096?0?anon_enum_115
+GFileType?4096?0?anon_enum_110
 GFilenameCompleter?4096?0?_GFilenameCompleter
 GFilenameCompleterClass?4096?0?_GFilenameCompleterClass
-GFilesystemPreviewType?4096?0?anon_enum_116
+GFilesystemPreviewType?4096?0?anon_enum_111
 GFilterInputStream?4096?0?_GFilterInputStream
 GFilterInputStreamClass?4096?0?_GFilterInputStreamClass
 GFilterOutputStream?4096?0?_GFilterOutputStream
@@ -1422,7 +1418,7 @@ GIOChannel?4096?0?_GIOChannel
 GIOChannelError?4096?0?anon_enum_60
 GIOCondition?4096?0?anon_enum_63
 GIOError?4096?0?anon_enum_59
-GIOErrorEnum?4096?0?anon_enum_118
+GIOErrorEnum?4096?0?anon_enum_113
 GIOExtension?4096?0?_GIOExtension
 GIOExtensionPoint?4096?0?_GIOExtensionPoint
 GIOFlags?4096?0?anon_enum_64
@@ -1492,16 +1488,16 @@ GMemoryOutputStreamClass?4096?0?_GMemory
 GMemoryOutputStreamPrivate?4096?0?_GMemoryOutputStreamPrivate
 GModule?4096?0?_GModule
 GModuleCheckInit?4096?0?typedef const gchar *
-GModuleFlags?4096?0?anon_enum_124
+GModuleFlags?4096?0?anon_enum_119
 GModuleUnload?4096?0?typedef void
 GMount?4096?0?_GMount
 GMountIface?4096?0?_GMountIface
-GMountMountFlags?4096?0?anon_enum_111
+GMountMountFlags?4096?0?anon_enum_106
 GMountOperation?4096?0?_GMountOperation
 GMountOperationClass?4096?0?_GMountOperationClass
 GMountOperationPrivate?4096?0?_GMountOperationPrivate
-GMountOperationResult?4096?0?anon_enum_121
-GMountUnmountFlags?4096?0?anon_enum_112
+GMountOperationResult?4096?0?anon_enum_116
+GMountUnmountFlags?4096?0?anon_enum_107
 GMutex?4096?0?_GMutex
 GNativeVolumeMonitor?4096?0?_GNativeVolumeMonitor
 GNativeVolumeMonitorClass?4096?0?_GNativeVolumeMonitorClass
@@ -1530,11 +1526,11 @@ GOptionParseFunc?4096?0?typedef gboolean
 GOutputStream?4096?0?_GOutputStream
 GOutputStreamClass?4096?0?_GOutputStreamClass
 GOutputStreamPrivate?4096?0?_GOutputStreamPrivate
-GOutputStreamSpliceFlags?4096?0?anon_enum_122
+GOutputStreamSpliceFlags?4096?0?anon_enum_117
 GPOINTER_TO_INT?131072?(p)?0
 GPOINTER_TO_SIZE?131072?(p)?0
 GPOINTER_TO_UINT?131072?(p)?0
-GParamFlags?4096?0?anon_enum_99
+GParamFlags?4096?0?anon_enum_94
 GParamSpec?4096?0?_GParamSpec
 GParamSpecBoolean?4096?0?_GParamSpecBoolean
 GParamSpecBoxed?4096?0?_GParamSpecBoxed
@@ -1562,7 +1558,7 @@ GParamSpecULong?4096?0?_GParamSpecULong
 GParamSpecUnichar?4096?0?_GParamSpecUnichar
 GParamSpecValueArray?4096?0?_GParamSpecValueArray
 GParameter?4096?0?_GParameter
-GPasswordSave?4096?0?anon_enum_120
+GPasswordSave?4096?0?anon_enum_115
 GPatternSpec?4096?0?_GPatternSpec
 GPid?4096?0?int
 GPollFD?4096?0?_GPollFD
@@ -1596,9 +1592,9 @@ GShellError?4096?0?anon_enum_81
 GSignalAccumulator?4096?0?typedef gboolean
 GSignalCMarshaller?4096?0?GClosureMarshal
 GSignalEmissionHook?4096?0?typedef gboolean
-GSignalFlags?4096?0?anon_enum_100
+GSignalFlags?4096?0?anon_enum_95
 GSignalInvocationHint?4096?0?_GSignalInvocationHint
-GSignalMatchType?4096?0?anon_enum_102
+GSignalMatchType?4096?0?anon_enum_97
 GSignalQuery?4096?0?_GSignalQuery
 GSimpleAsyncResult?4096?0?_GSimpleAsyncResult
 GSimpleAsyncResultClass?4096?0?_GSimpleAsyncResultClass
@@ -1714,6 +1710,7 @@ GTK_BUILDABLE_GET_IFACE?131072?(obj)?0
 GTK_BUILDER?131072?(obj)?0
 GTK_BUILDER_CLASS?131072?(klass)?0
 GTK_BUILDER_ERROR?65536?0
+GTK_BUILDER_ERROR_DUPLICATE_ID?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_ATTRIBUTE?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_TAG?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION?4?anon_enum_280?0
@@ -3710,9 +3707,9 @@ GType?4096?0?gulong
 GTypeCValue?4096?0?_GTypeCValue
[...6544 lines suppressed...]
 widget_selected?1024?(GtkTipsQuery *tips_query, GtkWidget *widget, const gchar *tip_text, const gchar *tip_private, GdkEventButton *event)?_GtkTipsQueryClass?0?gint
+widgets?64?_GtkItemFactoryItem?0?GSList
+widgets?64?_GtkSizeGroup?0?GSList
+width?64?_AtkRectangle?0?gint
+width?64?_AtkTextRectangle?0?gint
+width?64?_GdkEventConfigure?0?gint
+width?64?_GdkImage?0?gint
+width?64?_GdkRectangle?0?gint
+width?64?_GdkSpan?0?gint
+width?64?_GdkWindowAttr?0?gint
+width?64?_GtkCListColumn?0?gint
+width?64?_GtkCellRenderer?0?gint
+width?64?_GtkLayout?0?guint
+width?64?_GtkOptionMenu?0?guint16
+width?64?_GtkRequisition?0?gint
+width?64?_GtkTextView?0?gint
+width?64?_GtkTreeViewColumn?0?gint
+width?64?_GtkWidgetAuxInfo?0?gint
+width?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+width?64?_PangoRectangle?0?int
+width?64?_cairo_rectangle?0?double
+width?64?anon_struct_122?0?double
+width_changed?64?_GtkTextView?0?guint
+width_chars?64?_GtkEntry?0?gint
+width_inc?64?_GdkGeometry?0?gint
+width_set?64?_GtkCListColumn?0?guint
+win_gravity?64?_GdkGeometry?0?GdkGravity
+window?64?_GdkEventAny?0?GdkWindow
+window?64?_GdkEventButton?0?GdkWindow
+window?64?_GdkEventClient?0?GdkWindow
+window?64?_GdkEventConfigure?0?GdkWindow
+window?64?_GdkEventCrossing?0?GdkWindow
+window?64?_GdkEventDND?0?GdkWindow
+window?64?_GdkEventExpose?0?GdkWindow
+window?64?_GdkEventFocus?0?GdkWindow
+window?64?_GdkEventGrabBroken?0?GdkWindow
+window?64?_GdkEventKey?0?GdkWindow
+window?64?_GdkEventMotion?0?GdkWindow
+window?64?_GdkEventNoExpose?0?GdkWindow
+window?64?_GdkEventOwnerChange?0?GdkWindow
+window?64?_GdkEventProperty?0?GdkWindow
+window?64?_GdkEventProximity?0?GdkWindow
+window?64?_GdkEventScroll?0?GdkWindow
+window?64?_GdkEventSelection?0?GdkWindow
+window?64?_GdkEventSetting?0?GdkWindow
+window?64?_GdkEventVisibility?0?GdkWindow
+window?64?_GdkEventWindowState?0?GdkWindow
+window?64?_GtkCListColumn?0?GdkWindow
+window?64?_GtkDialog?0?GtkWindow
+window?64?_GtkPlug?0?GtkWindow
+window?64?_GtkTreeViewColumn?0?GdkWindow
+window?64?_GtkWidget?0?GdkWindow
 window_at_pointer?1024?(GdkDisplay *display, gint *win_x, gint *win_y)?_GdkDisplayPointerHooks?0?GdkWindow *
 window_at_pointer?1024?(GdkScreen *screen, gint *win_x, gint *win_y)?_GdkPointerHooks?0?GdkWindow *
 window_get_pointer?1024?(GdkDisplay *display, GdkWindow *window, gint *x, gint *y, GdkModifierType *mask)?_GdkDisplayPointerHooks?0?GdkWindow *
+window_placement?64?_GtkScrolledWindow?0?guint
+window_state?64?_GdkEvent?0?GdkEventWindowState
 window_state_event?1024?(GtkWidget *widget, GdkEventWindowState *event)?_GtkWidgetClass?0?gboolean
+window_type?64?_GdkWindowAttr?0?GdkWindowType
+window_type?64?_GdkWindowObject?0?guint8
+windowing_data?64?_GdkColormap?0?gpointer
+windowing_data?64?_GdkDragContext?0?gpointer
+windowing_data?64?_GdkImage?0?gpointer
 wint_t?4096?0?int
+wm_role?64?_GtkWindow?0?gchar
+wmclass_class?64?_GdkWindowAttr?0?gchar
+wmclass_class?64?_GtkWindow?0?gchar
+wmclass_name?64?_GdkWindowAttr?0?gchar
+wmclass_name?64?_GtkWindow?0?gchar
+wrap?64?_GtkLabel?0?guint
+wrap?64?_GtkSpinButton?0?guint
+wrap_mode?64?_GtkLabel?0?guint
+wrap_mode?64?_GtkTextAttributes?0?GtkWrapMode
+wrap_mode?64?_GtkTextView?0?GtkWrapMode
+wrap_mode_set?64?_GtkTextTag?0?guint
 wrapped?1024?(GtkSpinButton *spin_button)?_GtkSpinButtonClass?0?void
+write?64?anon_struct_148?0?__io_write_fn
 write_async?1024?(GOutputStream *stream, const void *buffer, gsize count, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)?_GOutputStreamClass?0?void
+write_buf?64?_GIOChannel?0?GString
+write_cd?64?_GIOChannel?0?GIConv
+write_cond?64?_GStaticRWLock?0?GCond
 write_finish?1024?(GOutputStream *stream, GAsyncResult *result, GError **error)?_GOutputStreamClass?0?gssize
 write_fn?1024?(GOutputStream *stream, const void *buffer, gsize count, GCancellable *cancellable, GError **error)?_GOutputStreamClass?0?gssize
+x?64?_AtkRectangle?0?gint
+x?64?_AtkTextRectangle?0?gint
+x?64?_GdkEventButton?0?gdouble
+x?64?_GdkEventConfigure?0?gint
+x?64?_GdkEventCrossing?0?gdouble
+x?64?_GdkEventMotion?0?gdouble
+x?64?_GdkEventScroll?0?gdouble
+x?64?_GdkPoint?0?gint
+x?64?_GdkRectangle?0?gint
+x?64?_GdkSpan?0?gint
+x?64?_GdkWindowAttr?0?gint
+x?64?_GdkWindowObject?0?gint
+x?64?_GtkFixedChild?0?gint
+x?64?_GtkWidgetAuxInfo?0?gint
+x?64?_PangoRectangle?0?int
+x?64?_cairo_path_data_t::anon_struct_125?0?double
+x?64?_cairo_rectangle?0?double
+x?64?anon_struct_120?0?double
+x0?64?_PangoMatrix?0?double
+x0?64?_cairo_matrix?0?double
+x1?64?_GdkSegment?0?gint
+x11?64?_GdkTrapezoid?0?double
+x12?64?_GdkTrapezoid?0?double
+x2?64?_GdkSegment?0?gint
+x21?64?_GdkTrapezoid?0?double
+x22?64?_GdkTrapezoid?0?double
+x_advance?64?anon_struct_122?0?double
+x_align?64?_GtkProgress?0?gfloat
+x_bearing?64?anon_struct_122?0?double
+x_drag?64?_GtkCList?0?gint
+x_offset?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+x_root?64?_GdkEventButton?0?gdouble
+x_root?64?_GdkEventCrossing?0?gdouble
+x_root?64?_GdkEventDND?0?gshort
+x_root?64?_GdkEventMotion?0?gdouble
+x_root?64?_GdkEventScroll?0?gdouble
+x_set?64?_GtkWidgetAuxInfo?0?guint
+xalign?64?_GtkAlignment?0?gfloat
+xalign?64?_GtkAspectFrame?0?gfloat
+xalign?64?_GtkCellRenderer?0?gfloat
+xalign?64?_GtkMisc?0?gfloat
+xalign?64?_GtkTreeViewColumn?0?gfloat
+xembed_version?64?_GtkSocket?0?gshort
+xexpand?64?_GtkTableChild?0?guint
+xfill?64?_GtkTableChild?0?guint
+xoffset?64?_GtkTextView?0?gint
+xor_gc?64?_GtkCList?0?GdkGC
+xor_gc?64?_GtkCalendar?0?GdkGC
+xor_gc?64?_GtkPaned?0?GdkGC
+xpad?64?_GtkCellRenderer?0?guint16
+xpad?64?_GtkMisc?0?guint16
+xpadding?64?_GtkTableChild?0?guint16
+xscale?64?_GtkAlignment?0?gfloat
+xshrink?64?_GtkTableChild?0?guint
+xsrc?64?_GtkRuler?0?gint
+xthickness?64?_GtkRcStyle?0?gint
+xthickness?64?_GtkStyle?0?gint
+xx?64?_PangoMatrix?0?double
+xx?64?_cairo_matrix?0?double
+xy?64?_PangoMatrix?0?double
+xy?64?_cairo_matrix?0?double
+y?64?_AtkRectangle?0?gint
+y?64?_AtkTextRectangle?0?gint
+y?64?_GdkEventButton?0?gdouble
+y?64?_GdkEventConfigure?0?gint
+y?64?_GdkEventCrossing?0?gdouble
+y?64?_GdkEventMotion?0?gdouble
+y?64?_GdkEventScroll?0?gdouble
+y?64?_GdkPoint?0?gint
+y?64?_GdkRectangle?0?gint
+y?64?_GdkSpan?0?gint
+y?64?_GdkWindowAttr?0?gint
+y?64?_GdkWindowObject?0?gint
+y?64?_GtkFixedChild?0?gint
+y?64?_GtkWidgetAuxInfo?0?gint
+y?64?_PangoRectangle?0?int
+y?64?_cairo_path_data_t::anon_struct_125?0?double
+y?64?_cairo_rectangle?0?double
+y?64?anon_struct_120?0?double
+y0?64?_PangoMatrix?0?double
+y0?64?_cairo_matrix?0?double
+y1?64?_GdkSegment?0?gint
+y1?64?_GdkTrapezoid?0?double
+y2?64?_GdkSegment?0?gint
+y2?64?_GdkTrapezoid?0?double
+y_advance?64?anon_struct_122?0?double
+y_align?64?_GtkProgress?0?gfloat
+y_bearing?64?anon_struct_122?0?double
+y_offset?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+y_root?64?_GdkEventButton?0?gdouble
+y_root?64?_GdkEventCrossing?0?gdouble
+y_root?64?_GdkEventDND?0?gshort
+y_root?64?_GdkEventMotion?0?gdouble
+y_root?64?_GdkEventScroll?0?gdouble
+y_set?64?_GtkWidgetAuxInfo?0?guint
+yalign?64?_GtkAlignment?0?gfloat
+yalign?64?_GtkAspectFrame?0?gfloat
+yalign?64?_GtkCellRenderer?0?gfloat
+yalign?64?_GtkMisc?0?gfloat
+year?64?_GDate?0?guint
+year?64?_GtkCalendar?0?gint
+yexpand?64?_GtkTableChild?0?guint
+yfill?64?_GtkTableChild?0?guint
+yoffset?64?_GtkTextView?0?gint
+ypad?64?_GtkCellRenderer?0?guint16
+ypad?64?_GtkMisc?0?guint16
+ypadding?64?_GtkTableChild?0?guint16
+yscale?64?_GtkAlignment?0?gfloat
+yshrink?64?_GtkTableChild?0?guint
+ysrc?64?_GtkRuler?0?gint
+ythickness?64?_GtkRcStyle?0?gint
+ythickness?64?_GtkStyle?0?gint
+yx?64?_PangoMatrix?0?double
+yx?64?_cairo_matrix?0?double
+yy?64?_PangoMatrix?0?double
+yy?64?_cairo_matrix?0?double
+zero_ref_count?64?_GtkTreeModelSort?0?gint


--- geany-0.17-button-pixmaps.patch DELETED ---



From dmaphy at fedoraproject.org  Sun Aug 16 18:12:14 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 18:12:14 +0000 (UTC)
Subject: rpms/geany/F-11 geany.spec,1.30,1.31
Message-ID: <20090816181214.3DCD211C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10827

Modified Files:
	geany.spec 
Log Message:
also add the new tags files to the install section (oops)




Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- geany.spec	16 Aug 2009 18:03:36 -0000	1.30
+++ geany.spec	16 Aug 2009 18:12:14 -0000	1.31
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 
 # Install tags files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
-install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
+install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From dmaphy at fedoraproject.org  Sun Aug 16 18:51:51 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 18:51:51 +0000 (UTC)
Subject: rpms/geany/F-11 geany.spec,1.31,1.32
Message-ID: <20090816185151.BDE6511C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18801

Modified Files:
	geany.spec 
Log Message:
remove Geany icon from pixmaps path and add it to 48x48 and scalable
(icon changes came with upstream release 0.18)




Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- geany.spec	16 Aug 2009 18:12:14 -0000	1.31
+++ geany.spec	16 Aug 2009 18:51:51 -0000	1.32
@@ -83,8 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/doc/%{name}-%{version}
 %{_mandir}/man1/geany.1.gz
 
@@ -98,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 - new upstream release
 - remove button pixmaps patch since this fix is included in 0.18
 - add new tags-files geany-api-0.18.c.tags and std.vala.tags
+- remove Geany icon from pixmaps path and add it to 48x48 and scalable
 
 * Mon Jul 27 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.17-8
 - install additional *.tags-files to $prefix/share/geany/tags



From spot at fedoraproject.org  Sun Aug 16 19:06:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 16 Aug 2009 19:06:33 +0000 (UTC)
Subject: rpms/alienarena/F-10 alienarena.spec,1.11,1.12
Message-ID: <20090816190633.D639511C0262@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21722/F-10

Modified Files:
	alienarena.spec 
Log Message:
use openal-soft


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/F-10/alienarena.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- alienarena.spec	31 Jul 2009 16:13:50 -0000	1.11
+++ alienarena.spec	16 Aug 2009 19:06:33 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
 Version:	7.30
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
@@ -24,7 +24,7 @@ URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel
-BuildRequires:	libvorbis-devel, openal-devel
+BuildRequires:	libvorbis-devel, openal-soft-devel
 BuildRequires:	desktop-file-utils
 Requires:	alienarena-data = 20090730
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
@@ -66,6 +66,10 @@ cp -p %{SOURCE2} .
 # clean up end-line encoding
 [[ -e docs/README.txt ]] && %{__sed} -i 's/\r//' docs/README.txt
 
+# So, AlienArena now "uses" openal by dlopening the library, which is hardcoded to 
+# "libopenal.so". That file only lives in openal-devel, so we need to adjust the hardcoding.
+LIBOPENAL=`ls %{_libdir}/libopenal.so.*.* | cut -d "/" -f 4`
+sed -i "s|\"libopenal.so\"|\"$LIBOPENAL\"|g" source/unix/qal_unix.c
 
 %build
 cd source/
@@ -147,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 
 
 %changelog
+* Wed Aug 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.30-2
+- fix dlopen code to find proper openal library
+- use openal-soft instead of old openal
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.30-1
 - update to 7.30
 



From spot at fedoraproject.org  Sun Aug 16 19:06:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 16 Aug 2009 19:06:34 +0000 (UTC)
Subject: rpms/alienarena/devel alienarena.spec,1.13,1.14
Message-ID: <20090816190634.2F14A11C0262@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21722/devel

Modified Files:
	alienarena.spec 
Log Message:
use openal-soft


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/devel/alienarena.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- alienarena.spec	31 Jul 2009 16:13:50 -0000	1.13
+++ alienarena.spec	16 Aug 2009 19:06:34 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
 Version:	7.30
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
@@ -24,7 +24,7 @@ URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel
-BuildRequires:	libvorbis-devel, openal-devel
+BuildRequires:	libvorbis-devel, openal-soft-devel
 BuildRequires:	desktop-file-utils
 Requires:	alienarena-data = 20090730
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
@@ -66,6 +66,10 @@ cp -p %{SOURCE2} .
 # clean up end-line encoding
 [[ -e docs/README.txt ]] && %{__sed} -i 's/\r//' docs/README.txt
 
+# So, AlienArena now "uses" openal by dlopening the library, which is hardcoded to 
+# "libopenal.so". That file only lives in openal-devel, so we need to adjust the hardcoding.
+LIBOPENAL=`ls %{_libdir}/libopenal.so.*.* | cut -d "/" -f 4`
+sed -i "s|\"libopenal.so\"|\"$LIBOPENAL\"|g" source/unix/qal_unix.c
 
 %build
 cd source/
@@ -147,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 
 
 %changelog
+* Wed Aug 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.30-2
+- fix dlopen code to find proper openal library
+- use openal-soft instead of old openal
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.30-1
 - update to 7.30
 



From spot at fedoraproject.org  Sun Aug 16 19:06:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sun, 16 Aug 2009 19:06:34 +0000 (UTC)
Subject: rpms/alienarena/F-11 alienarena.spec,1.12,1.13
Message-ID: <20090816190634.0933A11C02C3@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21722/F-11

Modified Files:
	alienarena.spec 
Log Message:
use openal-soft


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/F-11/alienarena.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- alienarena.spec	31 Jul 2009 16:13:50 -0000	1.12
+++ alienarena.spec	16 Aug 2009 19:06:33 -0000	1.13
@@ -1,7 +1,7 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
 Version:	7.30
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
@@ -24,7 +24,7 @@ URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel
-BuildRequires:	libvorbis-devel, openal-devel
+BuildRequires:	libvorbis-devel, openal-soft-devel
 BuildRequires:	desktop-file-utils
 Requires:	alienarena-data = 20090730
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
@@ -66,6 +66,10 @@ cp -p %{SOURCE2} .
 # clean up end-line encoding
 [[ -e docs/README.txt ]] && %{__sed} -i 's/\r//' docs/README.txt
 
+# So, AlienArena now "uses" openal by dlopening the library, which is hardcoded to 
+# "libopenal.so". That file only lives in openal-devel, so we need to adjust the hardcoding.
+LIBOPENAL=`ls %{_libdir}/libopenal.so.*.* | cut -d "/" -f 4`
+sed -i "s|\"libopenal.so\"|\"$LIBOPENAL\"|g" source/unix/qal_unix.c
 
 %build
 cd source/
@@ -147,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 
 
 %changelog
+* Wed Aug 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.30-2
+- fix dlopen code to find proper openal library
+- use openal-soft instead of old openal
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.30-1
 - update to 7.30
 



From dmaphy at fedoraproject.org  Sun Aug 16 19:08:11 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:08:11 +0000 (UTC)
Subject: rpms/geany/F-11 sources,1.10,1.11
Message-ID: <20090816190811.093AC11C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22184

Modified Files:
	sources 
Log Message:
add new upstream sources for 0.18



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 May 2009 22:36:40 -0000	1.10
+++ sources	16 Aug 2009 19:08:10 -0000	1.11
@@ -1 +1 @@
-097f619f5f0800098a2438a216a28e7b  geany-0.17.tar.bz2
+d8e301f6933c828e2c36b3afdb3f4c34  geany-0.18.tar.bz2



From dmaphy at fedoraproject.org  Sun Aug 16 19:13:28 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:13:28 +0000 (UTC)
Subject: rpms/geany/devel geany-api-0.18.c.tags, NONE, 1.1 std.vala.tags,
	NONE, 
	1.1 .cvsignore, 1.10, 1.11 geany.spec, 1.30, 1.31 gtk216.c.tags,
	1.1, 1.2 sources, 1.10, 1.11 geany-0.17-button-pixmaps.patch,
	1.1, NONE
Message-ID: <20090816191328.F36C411C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22939

Modified Files:
	.cvsignore geany.spec gtk216.c.tags sources 
Added Files:
	geany-api-0.18.c.tags std.vala.tags 
Removed Files:
	geany-0.17-button-pixmaps.patch 
Log Message:
- new upstream release
- remove button pixmaps patch since this fix is included in 0.18
- add new tags-files geany-api-0.18.c.tags and std.vala.tags
- remove Geany icon from pixmaps path and add it to 48x48 and scalable



--- NEW FILE geany-api-0.18.c.tags ---
# format=tagmanager
GEANY_FUNCTIONS_H?65536?0
_GNU_SOURCE?65536?0
__STDC_HOSTED__?65536?0
__STDC__?65536?0
__cplusplus?65536?0
dialogs_show_input_numeric?65536?0
dialogs_show_msgbox?65536?0
dialogs_show_question?65536?0
dialogs_show_save_as?65536?0
document_close?65536?0
document_find_by_filename?65536?0
document_find_by_real_path?65536?0
document_get_basename_for_display?65536?0
document_get_current?65536?0
document_get_from_page?65536?0
document_get_status_color?65536?0
document_index?65536?0
document_new_file?65536?0
document_open_file?65536?0
document_open_files?65536?0
document_reload_file?65536?0
document_remove_page?65536?0
document_rename_file?65536?0
document_save_file?65536?0
document_save_file_as?65536?0
document_set_encoding?65536?0
document_set_filetype?65536?0
document_set_text_changed?65536?0
editor_create_widget?65536?0
editor_get_indent_prefs?65536?0
editor_get_word_at_pos?65536?0
editor_indicator_clear?65536?0
editor_indicator_set_on_line?65536?0
editor_indicator_set_on_range?65536?0
editor_set_indent_type?65536?0
encodings_convert_to_utf8?65536?0
encodings_convert_to_utf8_from_charset?65536?0
encodings_get_charset_from_index?65536?0
filetypes_detect_from_file?65536?0
filetypes_index?65536?0
filetypes_lookup_by_name?65536?0
highlighting_get_style?65536?0
keybindings_send_command?65536?0
keybindings_set_item?65536?0
main_locale_init?65536?0
main_reload_configuration?65536?0
msgwin_clear_tab?65536?0
msgwin_compiler_add?65536?0
msgwin_msg_add?65536?0
msgwin_status_add?65536?0
msgwin_switch_tab?65536?0
navqueue_goto_line?65536?0
plugin_add_toolbar_item?65536?0
plugin_module_make_resident?65536?0
plugin_signal_connect?65536?0
sci_end_undo_action?65536?0
sci_ensure_line_is_visible?65536?0
sci_find_matching_brace?65536?0
sci_get_char_at?65536?0
sci_get_col_from_position?65536?0
sci_get_contents?65536?0
sci_get_contents_range?65536?0
sci_get_current_line?65536?0
sci_get_current_position?65536?0
sci_get_length?65536?0
sci_get_line?65536?0
sci_get_line_count?65536?0
sci_get_line_from_position?65536?0
sci_get_line_is_visible?65536?0
sci_get_line_length?65536?0
sci_get_position_from_line?65536?0
sci_get_selected_text?65536?0
sci_get_selected_text_length?65536?0
sci_get_selection_contents?65536?0
sci_get_selection_end?65536?0
sci_get_selection_mode?65536?0
sci_get_selection_start?65536?0
sci_get_style_at?65536?0
sci_get_tab_width?65536?0
sci_get_text?65536?0
sci_get_text_range?65536?0
sci_has_selection?65536?0
sci_indicator_clear?65536?0
sci_indicator_set?65536?0
sci_insert_text?65536?0
sci_replace_sel?65536?0
sci_scroll_caret?65536?0
sci_send_command?65536?0
sci_set_current_position?65536?0
sci_set_font?65536?0
sci_set_selection_end?65536?0
sci_set_selection_mode?65536?0
sci_set_selection_start?65536?0
sci_set_text?65536?0
sci_start_undo_action?65536?0
scintilla_new?65536?0
scintilla_send_message?65536?0
search_show_find_in_files_dialog?65536?0
templates_get_template_fileheader?65536?0
tm_get_real_path?65536?0
tm_source_file_new?65536?0
tm_source_file_update?65536?0
tm_work_object_free?65536?0
tm_workspace_add_object?65536?0
tm_workspace_remove_object?65536?0
ui_add_document_sensitive?65536?0
ui_button_new_with_image?65536?0
ui_dialog_vbox_new?65536?0
ui_entry_add_clear_icon?65536?0
ui_frame_new_with_alignment?65536?0
ui_image_menu_item_new?65536?0
ui_lookup_widget?65536?0
ui_path_box_new?65536?0
ui_progress_bar_start?65536?0
ui_progress_bar_stop?65536?0
ui_set_statusbar?65536?0
ui_table_add_row?65536?0
ui_widget_set_tooltip_text?65536?0
utils_get_date_time?65536?0
utils_get_file_list?65536?0
utils_get_locale_from_utf8?65536?0
utils_get_setting_boolean?65536?0
utils_get_setting_integer?65536?0
utils_get_setting_string?65536?0
utils_get_utf8_from_locale?65536?0
utils_mkdir?65536?0
utils_open_browser?65536?0
utils_remove_ext_from_filename?65536?0
utils_spawn_async?65536?0
utils_spawn_sync?65536?0
utils_str_casecmp?65536?0
utils_str_equal?65536?0
utils_str_middle_truncate?65536?0
utils_str_remove_chars?65536?0
utils_string_replace_all?65536?0
utils_string_replace_first?65536?0
utils_write_file?65536?0


--- NEW FILE std.vala.tags ---
# format=tagmanager
@1016?4?Gst.RTPPayload?0
@1_0?4?Gst.RTSPVersion?0
@1_0?4?Soup.HTTPVersion?0
@1_0?4?Soup.HttpVersion?0
@1_1?4?Soup.HTTPVersion?0
@1_1?4?Soup.HttpVersion?0
@24_HR?4?Gnome.DateEditFlags?0
@2BUTTON_PRESS?4?Gdk.EventType?0
@32000?4?V4l2.MpegAudioSamplingFreq?0
@3BUTTON_PRESS?4?Gdk.EventType?0
@44100?4?V4l2.MpegAudioSamplingFreq?0
@48000?4?V4l2.MpegAudioSamplingFreq?0
@base?8?Gtk.RcStyle?0?Gdk.Color
@base?8?Gtk.Style?0?Gdk.Color
@base?8?V4l2.FrameBuffer?0?void
@break?128?(string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len)?Pango?0?public void
@class?8?X.WindowAttributes?0?int
@construct?128?(string fname, string? root, string? domain)?Glade.XML?0?public bool
@construct?128?(string appname, string title)?Gnome.App?0?public void
@construct?128?(ulong the_time, Gnome.DateEditFlags flags)?Gnome.DateEdit?0?public void
@construct?128?(string history_id, string browse_dialog_title)?Gnome.IconEntry?0?public void
@construct?128?(Gdk.NativeWindow socket_id)?Gtk.Plug?0?public void
@continue?128?()?GLib.Timer?0?public void
@default?128?()?GLib.MainContext?0?public weak MainContext
@default?8?Gsl.RNGTypes?0?RNGType
@delete?128?()?GLib.AppInfo?0?public bool
@delete?128?(GLib.Cancellable? cancellable)?GLib.File?0?public bool
@delete?128?(string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data)?GnomeKeyring?0?public void *
@delete?128?(Gtk.TextIter start, Gtk.TextIter end)?Gtk.TextBuffer?0?public void
@dynamic?8?Gst.BaseRTPPayload?0?bool
@flags?8?X.SizeHints?0?long
@foreach?128?(GConf.ChangeSetForeachFunc func)?GConf.ChangeSet?0?public void
@foreach?128?(GConf.ListenersForeach callback)?GConf.Listeners?0?public void
@foreach?128?(DataForeachFunc func)?GLib.Datalist?0?public void
@foreach?128?(Func func)?GLib.List?0?public void
@foreach?128?(Func func)?GLib.SList?0?public void
@foreach?128?(Func func)?GLib.Sequence?0?public void
@foreach?128?(Func thread_func)?GLib.Thread?0?public void
@foreach?128?(GLib.HFunc func)?Gsf.DocMetaData?0?public void
@foreach?128?(GLib.Func func)?Gst.Iterator?0?public Gst.IteratorResult
@foreach?128?(Gst.StructureForeachFunc func)?Gst.Structure?0?public bool
@foreach?128?(Gst.TagForeachFunc func)?Gst.TagList?0?public void
@foreach?128?(void* data, Gtk.AccelMapForeach foreach_func)?Gtk.AccelMap?0?public void
@foreach?128?(Gtk.Callback callback)?Gtk.Container?0?public void
@foreach?128?(Gtk.PrintSettingsFunc func)?Gtk.PrintSettings?0?public void
@foreach?128?(Gtk.TextTagTableForeach func, void* data)?Gtk.TextTagTable?0?public void
@foreach?128?(Gtk.TreeModelForeachFunc func)?Gtk.TreeModel?0?public void
@foreach?128?(Pango.FontsetForeachFunc func, void* data)?Pango.Fontset?0?public void
@foreach?128?(Soup.MessageHeadersForeachFunc func)?Soup.MessageHeaders?0?public void
@foreach?128?(Tracker.MetadataForeach func)?Tracker.Metadata?0?public void
@foreach?128?(GLib.HFunc func)?Xfce.MenuItemCache?0?public void
@foreach?128?(GLib.HFunc func)?Xfce.MenuItemPool?0?public void
@get?8?GLib.SourceCallbackFuncs?0?SourceCallbackGetFunc
@get?128?(size_t i)?Gsl.Combination?0?public size_t
@get?128?(size_t i)?Gsl.Histogram?0?public double
@get?128?(size_t i, size_t j)?Gsl.Histogram2d?0?public double
@get?128?(size_t i, size_t j)?Gsl.Matrix?0?public double
@get?128?(size_t i, size_t j)?Gsl.MatrixComplex?0?public double
@get?128?(size_t i)?Gsl.Permutation?0?public size_t
@get?128?([CCode (array_length = false)] double[] x)?Gsl.QRNG?0?public int
@get?8?Gsl.QRNGType?0?QRNGGetState2
@get?128?()?Gsl.RNG?0
@get?8?Gsl.RNGType?0?RNGGetState
@get?128?(size_t i)?Gsl.Vector?0?public double
@get?128?(size_t i)?Gsl.VectorComplex?0?public Complex
@in?8?Gdk.EventFocus?0?int16
@interface?8?FTDI.Context?0?int
@interface?8?Soup.Server?0?Soup.Address
@interface?8?USB.ConfigDescriptor?0?Interface
@lock?128?()?GLib.AsyncQueue?0?public void
@lock?128?()?GLib.Mutex?0?public void
@lock?128?(string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data)?GnomeKeyring?0?public void *
@lock?8?Gst.Controller?0?GLib.Mutex
@lock?8?Gst.InterpolationControlSource?0?GLib.Mutex
@lock?8?Gst.Iterator?0?GLib.Mutex
@lock?8?Gst.LFOControlSource?0?GLib.Mutex
@lock?8?Gst.Message?0?GLib.Mutex
@lock?8?Gst.Object?0?GLib.Mutex
@lock?8?Gst.Task?0?void
@lock?128?()?Gtk.AccelGroup?0?public void
@new?128?(Type type, ...)?GLib.Object?0?public Object
@new?128?(out Gst.RTSPMessage msg)?Gst.RTSPMessage?0?public Gst.RTSPResult
@new?128?(out Gst.RTSPTransport transport)?Gst.RTSPTransport?0?public Gst.RTSPResult
@new?128?()?Pango.CairoFontMap?0?public unowned
@ref?128?()?GLib.Object?0?public weak Object
@ref?8?GLib.SourceCallbackFuncs?0?SourceCallbackRefFunc
@ref?128?()?GnomeVFS.Drive?0?public unowned
@ref?128?()?GnomeVFS.Volume?0?public unowned
@ref?128?()?GnomeVFS.VolumeMonitor?0?public unowned
@ref?128?()?Gst.Buffer?0?public unowned
@ref?128?()?Gst.Caps?0?public unowned
@ref?128?()?Gst.Object?0?public unowned
@set?128?(double omega, double L, QAWO sine)?Gsl.IntegrationQAWOTable?0?public int
@set?128?(double alpha, double beta, int mu, int nu)?Gsl.IntegrationQAWSTable?0?public int
@set?128?(size_t i, size_t j, double x)?Gsl.Matrix?0?public void
@set?128?(size_t i, size_t j, double x)?Gsl.MatrixComplex?0?public void
@set?128?(Function* f, double x_minimum, double x_lower, double x_upper)?Gsl.MinFminimizer?0?public int
@set?8?Gsl.MinFminimizerType?0?MinSet
@set?128?(MultifitFunctionFdf* fdf, Vector x)?Gsl.MultifitFdfsolver?0?public int
@set?8?Gsl.MultifitFdfsolverType?0?MultifitFdfSet
@set?128?(MultifitFunction* f, Vector x)?Gsl.MultifitFsolver?0?public int
@set?8?Gsl.MultifitFsolverType?0?MultifitFSet
@set?128?(MultiminFunctionFdf* fdf, Vector x, double step_size, double tol)?Gsl.MultiminFdfminimizer?0?public int
@set?8?Gsl.MultiminFdfminimizerType?0?MultiminFdfSet
@set?128?(MultiminFunction* f, Vector x, Vector step_size)?Gsl.MultiminFminimizer?0?public int
@set?8?Gsl.MultiminFminimizerType?0?MultiminFSet
@set?128?(MultirootFunctionFdf* fdf, Vector x)?Gsl.MultirootFdfsolver?0?public int
@set?8?Gsl.MultirootFdfsolverType?0?MultirootFdfSet
@set?128?(MultirootFunction* f, Vector x)?Gsl.MultirootFsolver?0?public int
@set?8?Gsl.MultirootFsolverType?0?MultirootFSet
@set?128?(ulong s)?Gsl.RNG?0?public void
@set?8?Gsl.RNGType?0?RNGSetState
@set?128?(FunctionFdf* fdf, double root)?Gsl.RootFdfsolver?0?public int
@set?8?Gsl.RootFdfsolverType?0?RootFdfsolverSet
@set?128?(Function* f, double x_lower, double x_upper)?Gsl.RootFsolver?0?public int
@set?8?Gsl.RootFsolverType?0?RootFsolverSet
@set?128?(size_t i, double x)?Gsl.Vector?0?public void
@set?128?(size_t i, Complex x)?Gsl.VectorComplex?0?public void
@signal?128?()?GLib.Cond?0?public void
@signal?8?Glade.AccelInfo?0
@signal?128?()?SDL.Condition?0?public int
@signal?8?V4l2.Tuner?0?int32
@try?128?()?Sqlite.Mutex?0?public int
@value?8?SDL.JoyAxisEvent?0?uint16
@value?8?SDL.JoyHatEvent?0?uchar
@value?8?V4l2.Control?0?int32
@value?8?V4l2.ExtControl?0?int32
A?4?FTDI.Interface?0
A?8?Gsl.MultifitLinearWorkspace?0?Matrix
A?8?Gsl.RanDiscrete?0?size_t
A1?4?Cairo.Format?0
A1?4?Curses.Key?0
A3?4?Curses.Key?0
A8?4?Cairo.Format?0
ABGR?8?Gst.VideoCaps?0
ABGR?4?Gst.VideoFormat?0
ABORT?4?GnomeVFS.XferErrorAction?0
ABORT?4?GnomeVFS.XferErrorMode?0
ABORT?4?GnomeVFS.XferOverwriteAction?0
ABORT?4?GnomeVFS.XferOverwriteMode?0
ABORT?8?Sqlite?0?int
ABORTED?4?GLib.MountOperationResult?0
ABOUT?4?Gnome.UIInfoConfigurableTypes?0
ABOVE?4?Gdk.WindowState?0
ABOVE?4?Wnck.WindowActions?0
ABOVE?4?Wnck.WindowState?0
ABRT?4?Daemon.Sig?0
ABRT?4?GLib.ProcessSignal?0
ABSOLUTE_SIZE?4?Pango.AttrType?0
ABS_ASC?4?Gsl.EigenSortType?0
ABS_DESC?4?Gsl.EigenSortType?0
AC3?4?Gst.BufferFormat?0
AC3?4?Gst.BufferFormatType?0
ACCELERATED_VISUAL?4?SDL.GLattr?0
ACCELERATOR?4?Gtk.UIManagerItemType?0
ACCEL_LABEL?4?Atk.Role?0
ACCEPT?4?Gst.RTSPHeaderField?0
ACCEPT?4?Gtk.ResponseType?0
ACCEPT?4?WebKit.NavigationResponse?0
ACCEPTED?4?Soup.KnownStatusCode?0
ACCEPT_ENCODING?4?Gst.RTSPHeaderField?0
ACCEPT_FILENAME?4?Gtk.FileChooserConfirmation?0
ACCEPT_ITEMS_ONLY?4?Exo.ToolbarsModelFlags?0
ACCEPT_LANGUAGE?4?Gst.RTSPHeaderField?0
ACCES?4?GLib.FileError?0
ACCES?4?GLib.SpawnError?0
ACCESS?4?GnomeVFS.FileInfoFields?0
ACCESS_DENIED?4?DBus.Error?0
ACCESS_DENIED?4?Oobs.Result?0
ACCESS_EXECUTABLE?4?GnomeVFS.FilePermissions?0
ACCESS_READABLE?4?GnomeVFS.FilePermissions?0
ACCESS_WRITABLE?4?GnomeVFS.FilePermissions?0
ACCUM_ALPHA_SIZE?4?SDL.GLattr?0
ACCUM_BLUE_SIZE?4?SDL.GLattr?0
ACCUM_GREEN_SIZE?4?SDL.GLattr?0
ACCUM_RED_SIZE?4?SDL.GLattr?0
ACCURATE?4?Gst.SeekFlags?0
ACE?1?GnomeVFS?0
ACE?128?(GnomeVFS.ACLKind kind, string id, GnomeVFS.ACLPerm perms)?GnomeVFS.ACE?0
ACL?1?GnomeVFS?0
ACL?128?()?GnomeVFS.ACL?0
ACL?4?GnomeVFS.FileInfoFields?0
ACL?4?GnomeVFS.SetFileInfoMask?0
ACLKind?1?GnomeVFS?0
ACLPerm?1?GnomeVFS?0
ACRE?4?Gsl.ConstCGS?0
ACRE?4?Gsl.ConstCGSM?0
ACRE?4?Gsl.ConstMKS?0
ACRE?4?Gsl.ConstMKSA?0
ACTION?4?GLib.SignalFlags?0
ACTION?4?Gtk.SignalRunType?0
ACTIVATABLE?4?Gtk.CellRendererMode?0
ACTIVATE?4?Unique.Command?0
ACTIVE?4?Atk.StateType?0
ACTIVE?4?Exo.MountPointMatchMask?0
ACTIVE?4?Gtk.RcTokenType?0
ACTIVE?4?Gtk.StateType?0
ACTIVE?4?SDL.ActiveState?0
[...32520 lines suppressed...]
xml_write_cache?128?(string location)?Gst.Registry?0?public bool
xmlrpc_build_fault?128?(int fault_code, string fault_format, ...)?Soup?0?public unowned string
xmlrpc_build_method_call?128?(string method_name, GLib.Value[] params)?Soup?0?public unowned string
xmlrpc_build_method_response?128?(GLib.Value value)?Soup?0?public unowned string
xmlrpc_error_quark?128?()?Soup?0?public GLib.Quark
xmlrpc_extract_method_call?128?(string method_call, int length, out unowned string method_name, ...)?Soup?0?public bool
xmlrpc_extract_method_response?128?(string method_response, int length, ...)?Soup?0?public bool
xmlrpc_fault_quark?128?()?Soup?0?public GLib.Quark
xmlrpc_parse_method_call?128?(string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray params)?Soup?0?public bool
xmlrpc_parse_method_response?128?(string method_response, int length, GLib.Value value)?Soup?0?public bool
xmlrpc_request_new?128?(string uri, string method_name, ...)?Soup?0?public unowned
xmlrpc_set_fault?128?(Soup.Message msg, int fault_code, string fault_format, ...)?Soup?0?public void
xmlrpc_set_response?128?(Soup.Message msg, ...)?Soup?0?public void
xmotion?8?X.Event?0?MotionEvent
xmove?128?(LuaVM from, LuaVM to, int n)?Lua.LuaVM?0?public void
xoffset?8?Gtk.TextView?0?int
xor?128?(Gdk.Region source2)?Gdk.Region?0?public void
xor_gc?8?Gtk.Calendar?0?Gdk.GC
xor_gc?8?Gtk.Paned?0?Gdk.GC
xor_gc?8?Hildon.Calendar?0?Gdk.GC
xor_sets?128?(Atk.StateSet compare_set)?Atk.StateSet?0?public unowned
xpad?8?Gtk.CellRenderer?0
xpad?8?Gtk.Misc?0?int
xpadding?8?Gtk.TableChild?0?uint16
xpels_meter?8?Gst.gst_riff_strf_vids?0?uint32
xproperty?8?X.Event?0?PropertyEvent
xrange?8?Gsl.Histogram2d?0?double
xrange?8?Gsl.Histogram2dPDF?0?double
xrel?8?SDL.JoyBallEvent?0?int16
xrel?8?SDL.MouseMotionEvent?0?int16
xreparent?8?X.Event?0?ReparentEvent
xscale?8?Gtk.Alignment?0?float
xselection?8?X.Event?0?SelectionEvent
xserver_vendor_name?128?()?X.Display?0
xserver_vendor_release?128?()?X.Display?0
xshrink?8?Gtk.TableChild?0
xsigma?128?()?Gsl.Histogram2d?0?public double
xsrc?8?Gtk.Ruler?0?int
xt?8?Gsl.MultifitLinearWorkspace?0?Vector
xthickness?8?Gtk.RcStyle?0?int
xthickness?8?Gtk.Style?0?int
xunmap?8?X.Event?0?UnmapEvent
xx?8?Pango.Matrix?0?double
xy?8?Pango.Matrix?0?double
xy_to_index?128?(int x, int y, int index_, int trailing)?Pango.Layout?0?public bool
y?8?Atk.Rectangle?0?int
y?8?Atk.TextRectangle?0?int
y?8?Cairo.PathDataPoint?0?double
y?8?Gdk.EventButton?0?double
y?8?Gdk.EventConfigure?0?int
y?8?Gdk.EventCrossing?0?double
y?8?Gdk.EventMotion?0?double
y?8?Gdk.EventScroll?0?double
y?8?Gdk.Point?0?int
y?8?Gdk.Rectangle?0?int
y?8?Gdk.Span?0?int
y?8?Gdk.WindowAttr?0?int
y?8?Goo.CanvasImage?0?double
y?8?Goo.CanvasImageData?0?double
y?8?Goo.CanvasImageModel?0?double
y?8?Goo.CanvasRect?0?double
y?8?Goo.CanvasRectData?0?double
y?8?Goo.CanvasRectModel?0?double
y?8?Goo.CanvasText?0?double
y?8?Goo.CanvasTextData?0?double
y?8?Goo.CanvasTextModel?0?double
y?8?Goo.CanvasWidget?0?double
y?8?Gsl.Spline?0?double
y?8?Gst.VideoRectangle?0?int
y?8?Gtk.Allocation?0?int
y?8?Gtk.FixedChild?0?int
y?8?Gtk.WidgetAuxInfo?0?int
y?8?Pango.Rectangle?0?int
y?4?SDL.KeySymbol?0
y?8?SDL.MouseButtonEvent?0?uint16
y?8?SDL.MouseMotionEvent?0?uint16
y?8?SDL.Rect?0?int16
y?8?X.ButtonEvent?0?int
y?8?X.ConfigureEvent?0?int
y?8?X.ConfigureRequestEvent?0?int
y?8?X.CreateWindowEvent?0?int
y?8?X.CrossingEvent?0?int
y?8?X.GravityEvent?0?int
y?8?X.KeyEvent?0?int
y?8?X.MotionEvent?0?int
y?8?X.ReparentEvent?0?int
y?8?X.SizeHints?0?int
y?8?X.WindowAttributes?0?int
y?8?X.WindowChanges?0?int
y?8?Xcb.ExposeEvent?0?uint16
y0?128?(double x0)?GLib.Math?0?public double
y0?128?(double x)?Gsl.Bessel?0?public double
y0?8?Gsl.OdeivEvolve?0?double
y0?8?Pango.Matrix?0?double
y0_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y0f?128?(float x0)?GLib.Math?0?public float
y1?128?(double x0)?GLib.Math?0?public double
y1?8?Gdk.Segment?0?int
y1?8?Gdk.Trapezoid?0?double
y1?8?Goo.Canvas?0?double
y1?8?Goo.CanvasBounds?0?double
y1?128?(double x)?Gsl.Bessel?0?public double
y1?8?Poppler.Rectangle?0?double
y1_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y1f?128?(float x0)?GLib.Math?0?public float
y2?8?Gdk.Segment?0?int
y2?8?Gdk.Trapezoid?0?double
y2?8?Goo.Canvas?0?double
y2?8?Goo.CanvasBounds?0?double
y2?128?(double x)?Gsl.Bessel?0?public double
y2?8?Poppler.Rectangle?0?double
y2_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y_advance?8?Cairo.TextExtents?0?double
y_bearing?8?Cairo.TextExtents?0?double
y_offset?8?Pango.GlyphGeometry?0?Pango.GlyphUnit
y_root?8?Gdk.EventButton?0?double
y_root?8?Gdk.EventCrossing?0?double
y_root?8?Gdk.EventDND?0?short
y_root?8?Gdk.EventMotion?0?double
y_root?8?Gdk.EventScroll?0?double
y_root?8?X.ButtonEvent?0?int
y_root?8?X.CrossingEvent?0?int
y_root?8?X.KeyEvent?0?int
y_root?8?X.MotionEvent?0?int
y_set?8?Gtk.WidgetAuxInfo?0
yalign?8?Gtk.Alignment?0?float
yalign?8?Gtk.AspectFrame?0?float
yalign?8?Gtk.Button?0?float
yalign?8?Gtk.CellRenderer?0?float
yalign?8?Gtk.Misc?0?float
ycbcr?8?Tiff.RGBAImage?0?YCbCrToRGB
year?8?GLib.Time?0?int
year?8?Gtk.Calendar?0?int
year?8?Hildon.Calendar?0?int
year?8?Hildon.CalendarPopup?0?int
year?8?Hildon.DateEditor?0
year?8?Soup.Date?0?int
year?8?TagLib.Tag?0
yerr?8?Gsl.OdeivEvolve?0?double
yexpand?8?Gtk.TableChild?0
yfill?8?Gtk.TableChild?0
yield?128?()?GLib.Thread?0?public void
yield?128?(int nresults)?Lua.LuaVM?0?public int
yl?128?(int l, double x)?Gsl.Bessel?0?public double
yl_array?128?(int lmax, double x, [CCode (array_length = false)] double[] result_array)?Gsl.Bessel?0?public int
yl_e?128?(int l, double x, out Result result)?Gsl.Bessel?0?public int
ymax?128?()?Gsl.Histogram2d?0?public double
ymean?128?()?Gsl.Histogram2d?0?public double
ymin?128?()?Gsl.Histogram2d?0?public double
yn?128?(int x0, double x1)?GLib.Math?0?public double
ynf?128?(int x0, float x1)?GLib.Math?0?public float
yoffset?8?Gtk.TextView?0?int
your_event_mask?8?X.WindowAttributes?0?long
ypad?8?Gtk.CellRenderer?0
ypad?8?Gtk.Misc?0?int
ypadding?8?Gtk.TableChild?0?uint16
ypels_meter?8?Gst.gst_riff_strf_vids?0?uint32
yrange?8?Gsl.Histogram2d?0?double
yrange?8?Gsl.Histogram2dPDF?0?double
yrel?8?SDL.JoyBallEvent?0?int16
yrel?8?SDL.MouseMotionEvent?0?int16
yscale?8?Gtk.Alignment?0?float
yshrink?8?Gtk.TableChild?0
ysigma?128?()?Gsl.Histogram2d?0?public double
ysrc?8?Gtk.Ruler?0?int
ythickness?8?Gtk.RcStyle?0?int
ythickness?8?Gtk.Style?0?int
yx?8?Pango.Matrix?0?double
yy?8?Pango.Matrix?0?double
z?4?SDL.KeySymbol?0
zero_Ai?128?(uint s)?Gsl.Airy?0?public double
zero_Ai_deriv?128?(uint s)?Gsl.Airy?0?public double
zero_Ai_deriv_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Ai_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Bi?128?(uint s)?Gsl.Airy?0?public double
zero_Bi_deriv?128?(uint s)?Gsl.Airy?0?public double
zero_Bi_deriv_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Bi_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_J0?128?(uint s)?Gsl.Bessel?0?public double
zero_J0_e?128?(uint s, out Result result)?Gsl.Bessel?0?public int
zero_J1?128?(uint s)?Gsl.Bessel?0?public double
zero_J1_e?128?(uint s, out Result result)?Gsl.Bessel?0?public int
zero_Jnu?128?(double nu, uint s)?Gsl.Bessel?0?public double
zero_Jnu_e?128?(double nu, uint s, out Result result)?Gsl.Bessel?0?public int
zero_ref_count?8?Gtk.TreeModelSort?0?int
zeta?128?(double s)?Gsl.Zeta?0?public double
zeta_e?128?(double s, out Result result)?Gsl.Zeta?0?public int
zeta_int?128?(int n)?Gsl.Zeta?0?public double
zeta_int_e?128?(int n, out Result result)?Gsl.Zeta?0?public int
zetam1?128?(double s)?Gsl.Zeta?0?public double
zetam1_e?128?(double s, out Result result)?Gsl.Zeta?0?public int
zetam1_int?128?(int n)?Gsl.Zeta?0?public double
zetam1_int_e?128?(int n, out Result result)?Gsl.Zeta?0?public int
zones?8?Gst.SDPMessage?0?GLib.Array
zones_len?128?()?Gst.SDPMessage?0
zoom?8?Poppler.Dest?0?double
zoom?128?(Surface src, double zoomx, double zoomy, int smooth)?SDLGraphics.RotoZoom?0?public Surface
zoom_size?128?(int width, int height, double zoomx, double zoomy, ref int dstwidth, ref int dstheight)?SDLGraphics.RotoZoom?0?public void
zuf?8?Gsl.RNGTypes?0?RNGType
zz?8?Gsl.MathieuWorkspace?0?double


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 May 2009 22:29:28 -0000	1.10
+++ .cvsignore	16 Aug 2009 19:13:28 -0000	1.11
@@ -1 +1 @@
-geany-0.17.tar.bz2
+geany-0.18.tar.bz2


Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/devel/geany.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- geany.spec	31 Jul 2009 21:22:47 -0000	1.30
+++ geany.spec	16 Aug 2009 19:13:28 -0000	1.31
@@ -1,6 +1,6 @@
 Name:      geany
-Version:   0.17
-Release:   10%{?dist}
+Version:   0.18
+Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -8,16 +8,15 @@ License:   GPLv2+
 URL:       http://www.geany.org/
 Source0:   http://download.geany.org/%{name}-%{version}.tar.bz2
 
-# The following tags files were retrieved 25th Feb 2009
+# The following tags files were retrieved 16th Aug 2009
 Source1:   http://download.geany.org/contrib/tags/sqlite3.c.tags
 Source2:   http://download.geany.org/contrib/tags/std.glsl.tags
 Source3:   http://download.geany.org/contrib/tags/gtk216.c.tags
 Source4:   http://download.geany.org/contrib/tags/xfce46.c.tags
 Source5:   http://download.geany.org/contrib/tags/dbus-glib-0.76.c.tags
 Source6:   http://download.geany.org/contrib/tags/standard.css.tags
-
-# Fix the button pixmaps - backported from upstream SVN rev 3882
-Patch0:    geany-0.17-button-pixmaps.patch
+Source7:   http://download.geany.org/contrib/tags/geany-api-0.18.c.tags
+Source8:   http://download.geany.org/contrib/tags/std.vala.tags
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +27,7 @@ Requires: vte
 %define geany_docdir $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %description
-Geany is a small and fast editor with basic features of an 
+Geany is a small and fast editor with basic features of an
 integrated development environment.
 
 Some features:
@@ -53,8 +52,6 @@ Geany plug-ins. You do not need to insta
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
@@ -75,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 
 # Install tags files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
-install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
+install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,8 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/doc/%{name}-%{version}
 %{_mandir}/man1/geany.1.gz
 
@@ -97,8 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
-* Mon Jul 27 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.17-10
-- Rebuild Package
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-1
+- new upstream release
+- remove button pixmaps patch since this fix is included in 0.18
+- add new tags-files geany-api-0.18.c.tags and std.vala.tags
+- remove Geany icon from pixmaps path and add it to 48x48 and scalable
 
 * Mon Jul 27 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.17-9
 - install additional *.tags-files to $prefix/share/geany/tags


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gtk216.c.tagsIndex: gtk216.c.tags
===================================================================
RCS file: /cvs/pkgs/rpms/geany/devel/gtk216.c.tags,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk216.c.tags	20 May 2009 22:32:54 -0000	1.1
+++ gtk216.c.tags	16 Aug 2009 19:13:28 -0000	1.2
@@ -1,9 +1,7 @@
 # format=tagmanager
 ABS?65536?0
 ABS?131072?(a)?0
-ACCESSPERMS?65536?0
 AIO_PRIO_DELTA_MAX?65536?0
-ALLPERMS?65536?0
 ARG_MAX?65536?0
 ATEXIT?131072?(proc)?0
 ATK_ACTION?131072?(obj)?0
@@ -461,7 +459,6 @@ CAIRO_FORMAT_ARGB32?4?_cairo_format?0
 CAIRO_FORMAT_RGB16_565?65536?0
 CAIRO_FORMAT_RGB24?4?_cairo_format?0
 CAIRO_H?65536?0
-CAIRO_HAS_DIRECTFB_SURFACE?65536?0
 CAIRO_HAS_FT_FONT?65536?0
 CAIRO_HAS_IMAGE_SURFACE?65536?0
 CAIRO_HAS_PDF_SURFACE?65536?0
@@ -602,7 +599,6 @@ DBL_MAX_EXP?65536?0
 DBL_MIN?65536?0
 DBL_MIN_10_EXP?65536?0
 DBL_MIN_EXP?65536?0
-DEFFILEMODE?65536?0
 DELAYTIMER_MAX?65536?0
 EOF?65536?0
 EXPR_NEST_MAX?65536?0
@@ -639,14 +635,14 @@ FPE_INTOVF?65536?0
 FPE_INTOVF?4?anon_enum_20?0
 GAllocator?4096?0?_GAllocator
 GAppInfo?4096?0?_GAppInfo
-GAppInfoCreateFlags?4096?0?anon_enum_103
+GAppInfoCreateFlags?4096?0?anon_enum_98
 GAppInfoIface?4096?0?_GAppInfoIface
 GAppLaunchContext?4096?0?_GAppLaunchContext
 GAppLaunchContextClass?4096?0?_GAppLaunchContextClass
 GAppLaunchContextPrivate?4096?0?_GAppLaunchContextPrivate
 GArray?4096?0?_GArray
 GAsciiType?4096?0?anon_enum_84
-GAskPasswordFlags?4096?0?anon_enum_119
+GAskPasswordFlags?4096?0?anon_enum_114
 GAsyncQueue?4096?0?_GAsyncQueue
 GAsyncReadyCallback?4096?0?typedef void
 GAsyncResult?4096?0?_GAsyncResult
@@ -687,7 +683,7 @@ GCompletion?4096?0?_GCompletion
 GCompletionFunc?4096?0?typedef gchar *
 GCompletionStrncmpFunc?4096?0?typedef gint
 GCond?4096?0?_GCond
-GConnectFlags?4096?0?anon_enum_101
+GConnectFlags?4096?0?anon_enum_96
 GConvertError?4096?0?anon_enum_48
 GCopyFunc?4096?0?typedef gpointer
 GDKCONFIG_H?65536?0
@@ -1315,8 +1311,8 @@ GDataInputStreamPrivate?4096?0?_GDataInp
 GDataOutputStream?4096?0?_GDataOutputStream
 GDataOutputStreamClass?4096?0?_GDataOutputStreamClass
 GDataOutputStreamPrivate?4096?0?_GDataOutputStreamPrivate
-GDataStreamByteOrder?4096?0?anon_enum_104
-GDataStreamNewlineType?4096?0?anon_enum_105
+GDataStreamByteOrder?4096?0?anon_enum_99
+GDataStreamNewlineType?4096?0?anon_enum_100
 GDate?4096?0?_GDate
 GDateDMY?4096?0?anon_enum_49
 GDateDay?4096?0?guint8
@@ -1331,7 +1327,7 @@ GDrive?4096?0?_GDrive
 GDriveIface?4096?0?_GDriveIface
 GEmblem?4096?0?_GEmblem
 GEmblemClass?4096?0?_GEmblemClass
-GEmblemOrigin?4096?0?anon_enum_123
+GEmblemOrigin?4096?0?anon_enum_118
 GEmblemedIcon?4096?0?_GEmblemedIcon
 GEmblemedIconClass?4096?0?_GEmblemedIconClass
 GEnumClass?4096?0?_GEnumClass
@@ -1341,13 +1337,13 @@ GError?4096?0?_GError
 GErrorType?4096?0?anon_enum_79
 GFile?4096?0?_GFile
 GFileAttributeInfo?4096?0?_GFileAttributeInfo
-GFileAttributeInfoFlags?4096?0?anon_enum_107
+GFileAttributeInfoFlags?4096?0?anon_enum_102
 GFileAttributeInfoList?4096?0?_GFileAttributeInfoList
 GFileAttributeMatcher?4096?0?_GFileAttributeMatcher
-GFileAttributeStatus?4096?0?anon_enum_108
-GFileAttributeType?4096?0?anon_enum_106
-GFileCopyFlags?4096?0?anon_enum_113
-GFileCreateFlags?4096?0?anon_enum_110
+GFileAttributeStatus?4096?0?anon_enum_103
+GFileAttributeType?4096?0?anon_enum_101
+GFileCopyFlags?4096?0?anon_enum_108
+GFileCreateFlags?4096?0?anon_enum_105
 GFileEnumerator?4096?0?_GFileEnumerator
 GFileEnumeratorClass?4096?0?_GFileEnumeratorClass
 GFileEnumeratorPrivate?4096?0?_GFileEnumeratorPrivate
@@ -1362,20 +1358,20 @@ GFileInputStreamClass?4096?0?_GFileInput
 GFileInputStreamPrivate?4096?0?_GFileInputStreamPrivate
 GFileMonitor?4096?0?_GFileMonitor
 GFileMonitorClass?4096?0?_GFileMonitorClass
-GFileMonitorEvent?4096?0?anon_enum_117
-GFileMonitorFlags?4096?0?anon_enum_114
+GFileMonitorEvent?4096?0?anon_enum_112
+GFileMonitorFlags?4096?0?anon_enum_109
 GFileMonitorPrivate?4096?0?_GFileMonitorPrivate
 GFileOutputStream?4096?0?_GFileOutputStream
 GFileOutputStreamClass?4096?0?_GFileOutputStreamClass
 GFileOutputStreamPrivate?4096?0?_GFileOutputStreamPrivate
 GFileProgressCallback?4096?0?typedef void
-GFileQueryInfoFlags?4096?0?anon_enum_109
+GFileQueryInfoFlags?4096?0?anon_enum_104
 GFileReadMoreCallback?4096?0?typedef gboolean
 GFileTest?4096?0?anon_enum_53
-GFileType?4096?0?anon_enum_115
+GFileType?4096?0?anon_enum_110
 GFilenameCompleter?4096?0?_GFilenameCompleter
 GFilenameCompleterClass?4096?0?_GFilenameCompleterClass
-GFilesystemPreviewType?4096?0?anon_enum_116
+GFilesystemPreviewType?4096?0?anon_enum_111
 GFilterInputStream?4096?0?_GFilterInputStream
 GFilterInputStreamClass?4096?0?_GFilterInputStreamClass
 GFilterOutputStream?4096?0?_GFilterOutputStream
@@ -1422,7 +1418,7 @@ GIOChannel?4096?0?_GIOChannel
 GIOChannelError?4096?0?anon_enum_60
 GIOCondition?4096?0?anon_enum_63
 GIOError?4096?0?anon_enum_59
-GIOErrorEnum?4096?0?anon_enum_118
+GIOErrorEnum?4096?0?anon_enum_113
 GIOExtension?4096?0?_GIOExtension
 GIOExtensionPoint?4096?0?_GIOExtensionPoint
 GIOFlags?4096?0?anon_enum_64
@@ -1492,16 +1488,16 @@ GMemoryOutputStreamClass?4096?0?_GMemory
 GMemoryOutputStreamPrivate?4096?0?_GMemoryOutputStreamPrivate
 GModule?4096?0?_GModule
 GModuleCheckInit?4096?0?typedef const gchar *
-GModuleFlags?4096?0?anon_enum_124
+GModuleFlags?4096?0?anon_enum_119
 GModuleUnload?4096?0?typedef void
 GMount?4096?0?_GMount
 GMountIface?4096?0?_GMountIface
-GMountMountFlags?4096?0?anon_enum_111
+GMountMountFlags?4096?0?anon_enum_106
 GMountOperation?4096?0?_GMountOperation
 GMountOperationClass?4096?0?_GMountOperationClass
 GMountOperationPrivate?4096?0?_GMountOperationPrivate
-GMountOperationResult?4096?0?anon_enum_121
-GMountUnmountFlags?4096?0?anon_enum_112
+GMountOperationResult?4096?0?anon_enum_116
+GMountUnmountFlags?4096?0?anon_enum_107
 GMutex?4096?0?_GMutex
 GNativeVolumeMonitor?4096?0?_GNativeVolumeMonitor
 GNativeVolumeMonitorClass?4096?0?_GNativeVolumeMonitorClass
@@ -1530,11 +1526,11 @@ GOptionParseFunc?4096?0?typedef gboolean
 GOutputStream?4096?0?_GOutputStream
 GOutputStreamClass?4096?0?_GOutputStreamClass
 GOutputStreamPrivate?4096?0?_GOutputStreamPrivate
-GOutputStreamSpliceFlags?4096?0?anon_enum_122
+GOutputStreamSpliceFlags?4096?0?anon_enum_117
 GPOINTER_TO_INT?131072?(p)?0
 GPOINTER_TO_SIZE?131072?(p)?0
 GPOINTER_TO_UINT?131072?(p)?0
-GParamFlags?4096?0?anon_enum_99
+GParamFlags?4096?0?anon_enum_94
 GParamSpec?4096?0?_GParamSpec
 GParamSpecBoolean?4096?0?_GParamSpecBoolean
 GParamSpecBoxed?4096?0?_GParamSpecBoxed
@@ -1562,7 +1558,7 @@ GParamSpecULong?4096?0?_GParamSpecULong
 GParamSpecUnichar?4096?0?_GParamSpecUnichar
 GParamSpecValueArray?4096?0?_GParamSpecValueArray
 GParameter?4096?0?_GParameter
-GPasswordSave?4096?0?anon_enum_120
+GPasswordSave?4096?0?anon_enum_115
 GPatternSpec?4096?0?_GPatternSpec
 GPid?4096?0?int
 GPollFD?4096?0?_GPollFD
@@ -1596,9 +1592,9 @@ GShellError?4096?0?anon_enum_81
 GSignalAccumulator?4096?0?typedef gboolean
 GSignalCMarshaller?4096?0?GClosureMarshal
 GSignalEmissionHook?4096?0?typedef gboolean
-GSignalFlags?4096?0?anon_enum_100
+GSignalFlags?4096?0?anon_enum_95
 GSignalInvocationHint?4096?0?_GSignalInvocationHint
-GSignalMatchType?4096?0?anon_enum_102
+GSignalMatchType?4096?0?anon_enum_97
 GSignalQuery?4096?0?_GSignalQuery
 GSimpleAsyncResult?4096?0?_GSimpleAsyncResult
 GSimpleAsyncResultClass?4096?0?_GSimpleAsyncResultClass
@@ -1714,6 +1710,7 @@ GTK_BUILDABLE_GET_IFACE?131072?(obj)?0
 GTK_BUILDER?131072?(obj)?0
 GTK_BUILDER_CLASS?131072?(klass)?0
 GTK_BUILDER_ERROR?65536?0
+GTK_BUILDER_ERROR_DUPLICATE_ID?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_ATTRIBUTE?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_TAG?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION?4?anon_enum_280?0
@@ -3710,9 +3707,9 @@ GType?4096?0?gulong
 GTypeCValue?4096?0?_GTypeCValue
[...6544 lines suppressed...]
 widget_selected?1024?(GtkTipsQuery *tips_query, GtkWidget *widget, const gchar *tip_text, const gchar *tip_private, GdkEventButton *event)?_GtkTipsQueryClass?0?gint
+widgets?64?_GtkItemFactoryItem?0?GSList
+widgets?64?_GtkSizeGroup?0?GSList
+width?64?_AtkRectangle?0?gint
+width?64?_AtkTextRectangle?0?gint
+width?64?_GdkEventConfigure?0?gint
+width?64?_GdkImage?0?gint
+width?64?_GdkRectangle?0?gint
+width?64?_GdkSpan?0?gint
+width?64?_GdkWindowAttr?0?gint
+width?64?_GtkCListColumn?0?gint
+width?64?_GtkCellRenderer?0?gint
+width?64?_GtkLayout?0?guint
+width?64?_GtkOptionMenu?0?guint16
+width?64?_GtkRequisition?0?gint
+width?64?_GtkTextView?0?gint
+width?64?_GtkTreeViewColumn?0?gint
+width?64?_GtkWidgetAuxInfo?0?gint
+width?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+width?64?_PangoRectangle?0?int
+width?64?_cairo_rectangle?0?double
+width?64?anon_struct_122?0?double
+width_changed?64?_GtkTextView?0?guint
+width_chars?64?_GtkEntry?0?gint
+width_inc?64?_GdkGeometry?0?gint
+width_set?64?_GtkCListColumn?0?guint
+win_gravity?64?_GdkGeometry?0?GdkGravity
+window?64?_GdkEventAny?0?GdkWindow
+window?64?_GdkEventButton?0?GdkWindow
+window?64?_GdkEventClient?0?GdkWindow
+window?64?_GdkEventConfigure?0?GdkWindow
+window?64?_GdkEventCrossing?0?GdkWindow
+window?64?_GdkEventDND?0?GdkWindow
+window?64?_GdkEventExpose?0?GdkWindow
+window?64?_GdkEventFocus?0?GdkWindow
+window?64?_GdkEventGrabBroken?0?GdkWindow
+window?64?_GdkEventKey?0?GdkWindow
+window?64?_GdkEventMotion?0?GdkWindow
+window?64?_GdkEventNoExpose?0?GdkWindow
+window?64?_GdkEventOwnerChange?0?GdkWindow
+window?64?_GdkEventProperty?0?GdkWindow
+window?64?_GdkEventProximity?0?GdkWindow
+window?64?_GdkEventScroll?0?GdkWindow
+window?64?_GdkEventSelection?0?GdkWindow
+window?64?_GdkEventSetting?0?GdkWindow
+window?64?_GdkEventVisibility?0?GdkWindow
+window?64?_GdkEventWindowState?0?GdkWindow
+window?64?_GtkCListColumn?0?GdkWindow
+window?64?_GtkDialog?0?GtkWindow
+window?64?_GtkPlug?0?GtkWindow
+window?64?_GtkTreeViewColumn?0?GdkWindow
+window?64?_GtkWidget?0?GdkWindow
 window_at_pointer?1024?(GdkDisplay *display, gint *win_x, gint *win_y)?_GdkDisplayPointerHooks?0?GdkWindow *
 window_at_pointer?1024?(GdkScreen *screen, gint *win_x, gint *win_y)?_GdkPointerHooks?0?GdkWindow *
 window_get_pointer?1024?(GdkDisplay *display, GdkWindow *window, gint *x, gint *y, GdkModifierType *mask)?_GdkDisplayPointerHooks?0?GdkWindow *
+window_placement?64?_GtkScrolledWindow?0?guint
+window_state?64?_GdkEvent?0?GdkEventWindowState
 window_state_event?1024?(GtkWidget *widget, GdkEventWindowState *event)?_GtkWidgetClass?0?gboolean
+window_type?64?_GdkWindowAttr?0?GdkWindowType
+window_type?64?_GdkWindowObject?0?guint8
+windowing_data?64?_GdkColormap?0?gpointer
+windowing_data?64?_GdkDragContext?0?gpointer
+windowing_data?64?_GdkImage?0?gpointer
 wint_t?4096?0?int
+wm_role?64?_GtkWindow?0?gchar
+wmclass_class?64?_GdkWindowAttr?0?gchar
+wmclass_class?64?_GtkWindow?0?gchar
+wmclass_name?64?_GdkWindowAttr?0?gchar
+wmclass_name?64?_GtkWindow?0?gchar
+wrap?64?_GtkLabel?0?guint
+wrap?64?_GtkSpinButton?0?guint
+wrap_mode?64?_GtkLabel?0?guint
+wrap_mode?64?_GtkTextAttributes?0?GtkWrapMode
+wrap_mode?64?_GtkTextView?0?GtkWrapMode
+wrap_mode_set?64?_GtkTextTag?0?guint
 wrapped?1024?(GtkSpinButton *spin_button)?_GtkSpinButtonClass?0?void
+write?64?anon_struct_148?0?__io_write_fn
 write_async?1024?(GOutputStream *stream, const void *buffer, gsize count, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)?_GOutputStreamClass?0?void
+write_buf?64?_GIOChannel?0?GString
+write_cd?64?_GIOChannel?0?GIConv
+write_cond?64?_GStaticRWLock?0?GCond
 write_finish?1024?(GOutputStream *stream, GAsyncResult *result, GError **error)?_GOutputStreamClass?0?gssize
 write_fn?1024?(GOutputStream *stream, const void *buffer, gsize count, GCancellable *cancellable, GError **error)?_GOutputStreamClass?0?gssize
+x?64?_AtkRectangle?0?gint
+x?64?_AtkTextRectangle?0?gint
+x?64?_GdkEventButton?0?gdouble
+x?64?_GdkEventConfigure?0?gint
+x?64?_GdkEventCrossing?0?gdouble
+x?64?_GdkEventMotion?0?gdouble
+x?64?_GdkEventScroll?0?gdouble
+x?64?_GdkPoint?0?gint
+x?64?_GdkRectangle?0?gint
+x?64?_GdkSpan?0?gint
+x?64?_GdkWindowAttr?0?gint
+x?64?_GdkWindowObject?0?gint
+x?64?_GtkFixedChild?0?gint
+x?64?_GtkWidgetAuxInfo?0?gint
+x?64?_PangoRectangle?0?int
+x?64?_cairo_path_data_t::anon_struct_125?0?double
+x?64?_cairo_rectangle?0?double
+x?64?anon_struct_120?0?double
+x0?64?_PangoMatrix?0?double
+x0?64?_cairo_matrix?0?double
+x1?64?_GdkSegment?0?gint
+x11?64?_GdkTrapezoid?0?double
+x12?64?_GdkTrapezoid?0?double
+x2?64?_GdkSegment?0?gint
+x21?64?_GdkTrapezoid?0?double
+x22?64?_GdkTrapezoid?0?double
+x_advance?64?anon_struct_122?0?double
+x_align?64?_GtkProgress?0?gfloat
+x_bearing?64?anon_struct_122?0?double
+x_drag?64?_GtkCList?0?gint
+x_offset?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+x_root?64?_GdkEventButton?0?gdouble
+x_root?64?_GdkEventCrossing?0?gdouble
+x_root?64?_GdkEventDND?0?gshort
+x_root?64?_GdkEventMotion?0?gdouble
+x_root?64?_GdkEventScroll?0?gdouble
+x_set?64?_GtkWidgetAuxInfo?0?guint
+xalign?64?_GtkAlignment?0?gfloat
+xalign?64?_GtkAspectFrame?0?gfloat
+xalign?64?_GtkCellRenderer?0?gfloat
+xalign?64?_GtkMisc?0?gfloat
+xalign?64?_GtkTreeViewColumn?0?gfloat
+xembed_version?64?_GtkSocket?0?gshort
+xexpand?64?_GtkTableChild?0?guint
+xfill?64?_GtkTableChild?0?guint
+xoffset?64?_GtkTextView?0?gint
+xor_gc?64?_GtkCList?0?GdkGC
+xor_gc?64?_GtkCalendar?0?GdkGC
+xor_gc?64?_GtkPaned?0?GdkGC
+xpad?64?_GtkCellRenderer?0?guint16
+xpad?64?_GtkMisc?0?guint16
+xpadding?64?_GtkTableChild?0?guint16
+xscale?64?_GtkAlignment?0?gfloat
+xshrink?64?_GtkTableChild?0?guint
+xsrc?64?_GtkRuler?0?gint
+xthickness?64?_GtkRcStyle?0?gint
+xthickness?64?_GtkStyle?0?gint
+xx?64?_PangoMatrix?0?double
+xx?64?_cairo_matrix?0?double
+xy?64?_PangoMatrix?0?double
+xy?64?_cairo_matrix?0?double
+y?64?_AtkRectangle?0?gint
+y?64?_AtkTextRectangle?0?gint
+y?64?_GdkEventButton?0?gdouble
+y?64?_GdkEventConfigure?0?gint
+y?64?_GdkEventCrossing?0?gdouble
+y?64?_GdkEventMotion?0?gdouble
+y?64?_GdkEventScroll?0?gdouble
+y?64?_GdkPoint?0?gint
+y?64?_GdkRectangle?0?gint
+y?64?_GdkSpan?0?gint
+y?64?_GdkWindowAttr?0?gint
+y?64?_GdkWindowObject?0?gint
+y?64?_GtkFixedChild?0?gint
+y?64?_GtkWidgetAuxInfo?0?gint
+y?64?_PangoRectangle?0?int
+y?64?_cairo_path_data_t::anon_struct_125?0?double
+y?64?_cairo_rectangle?0?double
+y?64?anon_struct_120?0?double
+y0?64?_PangoMatrix?0?double
+y0?64?_cairo_matrix?0?double
+y1?64?_GdkSegment?0?gint
+y1?64?_GdkTrapezoid?0?double
+y2?64?_GdkSegment?0?gint
+y2?64?_GdkTrapezoid?0?double
+y_advance?64?anon_struct_122?0?double
+y_align?64?_GtkProgress?0?gfloat
+y_bearing?64?anon_struct_122?0?double
+y_offset?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+y_root?64?_GdkEventButton?0?gdouble
+y_root?64?_GdkEventCrossing?0?gdouble
+y_root?64?_GdkEventDND?0?gshort
+y_root?64?_GdkEventMotion?0?gdouble
+y_root?64?_GdkEventScroll?0?gdouble
+y_set?64?_GtkWidgetAuxInfo?0?guint
+yalign?64?_GtkAlignment?0?gfloat
+yalign?64?_GtkAspectFrame?0?gfloat
+yalign?64?_GtkCellRenderer?0?gfloat
+yalign?64?_GtkMisc?0?gfloat
+year?64?_GDate?0?guint
+year?64?_GtkCalendar?0?gint
+yexpand?64?_GtkTableChild?0?guint
+yfill?64?_GtkTableChild?0?guint
+yoffset?64?_GtkTextView?0?gint
+ypad?64?_GtkCellRenderer?0?guint16
+ypad?64?_GtkMisc?0?guint16
+ypadding?64?_GtkTableChild?0?guint16
+yscale?64?_GtkAlignment?0?gfloat
+yshrink?64?_GtkTableChild?0?guint
+ysrc?64?_GtkRuler?0?gint
+ythickness?64?_GtkRcStyle?0?gint
+ythickness?64?_GtkStyle?0?gint
+yx?64?_PangoMatrix?0?double
+yx?64?_cairo_matrix?0?double
+yy?64?_PangoMatrix?0?double
+yy?64?_cairo_matrix?0?double
+zero_ref_count?64?_GtkTreeModelSort?0?gint


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 May 2009 22:29:28 -0000	1.10
+++ sources	16 Aug 2009 19:13:28 -0000	1.11
@@ -1 +1 @@
-097f619f5f0800098a2438a216a28e7b  geany-0.17.tar.bz2
+d8e301f6933c828e2c36b3afdb3f4c34  geany-0.18.tar.bz2


--- geany-0.17-button-pixmaps.patch DELETED ---



From dmaphy at fedoraproject.org  Sun Aug 16 19:20:55 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:20:55 +0000 (UTC)
Subject: rpms/geany/F-10 geany-api-0.18.c.tags, NONE, 1.1 std.vala.tags, NONE,
	1.1 .cvsignore, 1.8, 1.9 geany.spec, 1.26, 1.27 gtk216.c.tags,
	1.1, 1.2 sources, 1.10, 1.11 geany-0.17-button-pixmaps.patch,
	1.1, NONE
Message-ID: <20090816192055.0D84911C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24191

Modified Files:
	.cvsignore geany.spec gtk216.c.tags sources 
Added Files:
	geany-api-0.18.c.tags std.vala.tags 
Removed Files:
	geany-0.17-button-pixmaps.patch 
Log Message:
- new upstream release
- remove button pixmaps patch since this fix is included in 0.18
- add new tags-files geany-api-0.18.c.tags and std.vala.tags
- remove Geany icon from pixmaps path and add it to 48x48 and scalable



--- NEW FILE geany-api-0.18.c.tags ---
# format=tagmanager
GEANY_FUNCTIONS_H?65536?0
_GNU_SOURCE?65536?0
__STDC_HOSTED__?65536?0
__STDC__?65536?0
__cplusplus?65536?0
dialogs_show_input_numeric?65536?0
dialogs_show_msgbox?65536?0
dialogs_show_question?65536?0
dialogs_show_save_as?65536?0
document_close?65536?0
document_find_by_filename?65536?0
document_find_by_real_path?65536?0
document_get_basename_for_display?65536?0
document_get_current?65536?0
document_get_from_page?65536?0
document_get_status_color?65536?0
document_index?65536?0
document_new_file?65536?0
document_open_file?65536?0
document_open_files?65536?0
document_reload_file?65536?0
document_remove_page?65536?0
document_rename_file?65536?0
document_save_file?65536?0
document_save_file_as?65536?0
document_set_encoding?65536?0
document_set_filetype?65536?0
document_set_text_changed?65536?0
editor_create_widget?65536?0
editor_get_indent_prefs?65536?0
editor_get_word_at_pos?65536?0
editor_indicator_clear?65536?0
editor_indicator_set_on_line?65536?0
editor_indicator_set_on_range?65536?0
editor_set_indent_type?65536?0
encodings_convert_to_utf8?65536?0
encodings_convert_to_utf8_from_charset?65536?0
encodings_get_charset_from_index?65536?0
filetypes_detect_from_file?65536?0
filetypes_index?65536?0
filetypes_lookup_by_name?65536?0
highlighting_get_style?65536?0
keybindings_send_command?65536?0
keybindings_set_item?65536?0
main_locale_init?65536?0
main_reload_configuration?65536?0
msgwin_clear_tab?65536?0
msgwin_compiler_add?65536?0
msgwin_msg_add?65536?0
msgwin_status_add?65536?0
msgwin_switch_tab?65536?0
navqueue_goto_line?65536?0
plugin_add_toolbar_item?65536?0
plugin_module_make_resident?65536?0
plugin_signal_connect?65536?0
sci_end_undo_action?65536?0
sci_ensure_line_is_visible?65536?0
sci_find_matching_brace?65536?0
sci_get_char_at?65536?0
sci_get_col_from_position?65536?0
sci_get_contents?65536?0
sci_get_contents_range?65536?0
sci_get_current_line?65536?0
sci_get_current_position?65536?0
sci_get_length?65536?0
sci_get_line?65536?0
sci_get_line_count?65536?0
sci_get_line_from_position?65536?0
sci_get_line_is_visible?65536?0
sci_get_line_length?65536?0
sci_get_position_from_line?65536?0
sci_get_selected_text?65536?0
sci_get_selected_text_length?65536?0
sci_get_selection_contents?65536?0
sci_get_selection_end?65536?0
sci_get_selection_mode?65536?0
sci_get_selection_start?65536?0
sci_get_style_at?65536?0
sci_get_tab_width?65536?0
sci_get_text?65536?0
sci_get_text_range?65536?0
sci_has_selection?65536?0
sci_indicator_clear?65536?0
sci_indicator_set?65536?0
sci_insert_text?65536?0
sci_replace_sel?65536?0
sci_scroll_caret?65536?0
sci_send_command?65536?0
sci_set_current_position?65536?0
sci_set_font?65536?0
sci_set_selection_end?65536?0
sci_set_selection_mode?65536?0
sci_set_selection_start?65536?0
sci_set_text?65536?0
sci_start_undo_action?65536?0
scintilla_new?65536?0
scintilla_send_message?65536?0
search_show_find_in_files_dialog?65536?0
templates_get_template_fileheader?65536?0
tm_get_real_path?65536?0
tm_source_file_new?65536?0
tm_source_file_update?65536?0
tm_work_object_free?65536?0
tm_workspace_add_object?65536?0
tm_workspace_remove_object?65536?0
ui_add_document_sensitive?65536?0
ui_button_new_with_image?65536?0
ui_dialog_vbox_new?65536?0
ui_entry_add_clear_icon?65536?0
ui_frame_new_with_alignment?65536?0
ui_image_menu_item_new?65536?0
ui_lookup_widget?65536?0
ui_path_box_new?65536?0
ui_progress_bar_start?65536?0
ui_progress_bar_stop?65536?0
ui_set_statusbar?65536?0
ui_table_add_row?65536?0
ui_widget_set_tooltip_text?65536?0
utils_get_date_time?65536?0
utils_get_file_list?65536?0
utils_get_locale_from_utf8?65536?0
utils_get_setting_boolean?65536?0
utils_get_setting_integer?65536?0
utils_get_setting_string?65536?0
utils_get_utf8_from_locale?65536?0
utils_mkdir?65536?0
utils_open_browser?65536?0
utils_remove_ext_from_filename?65536?0
utils_spawn_async?65536?0
utils_spawn_sync?65536?0
utils_str_casecmp?65536?0
utils_str_equal?65536?0
utils_str_middle_truncate?65536?0
utils_str_remove_chars?65536?0
utils_string_replace_all?65536?0
utils_string_replace_first?65536?0
utils_write_file?65536?0


--- NEW FILE std.vala.tags ---
# format=tagmanager
@1016?4?Gst.RTPPayload?0
@1_0?4?Gst.RTSPVersion?0
@1_0?4?Soup.HTTPVersion?0
@1_0?4?Soup.HttpVersion?0
@1_1?4?Soup.HTTPVersion?0
@1_1?4?Soup.HttpVersion?0
@24_HR?4?Gnome.DateEditFlags?0
@2BUTTON_PRESS?4?Gdk.EventType?0
@32000?4?V4l2.MpegAudioSamplingFreq?0
@3BUTTON_PRESS?4?Gdk.EventType?0
@44100?4?V4l2.MpegAudioSamplingFreq?0
@48000?4?V4l2.MpegAudioSamplingFreq?0
@base?8?Gtk.RcStyle?0?Gdk.Color
@base?8?Gtk.Style?0?Gdk.Color
@base?8?V4l2.FrameBuffer?0?void
@break?128?(string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len)?Pango?0?public void
@class?8?X.WindowAttributes?0?int
@construct?128?(string fname, string? root, string? domain)?Glade.XML?0?public bool
@construct?128?(string appname, string title)?Gnome.App?0?public void
@construct?128?(ulong the_time, Gnome.DateEditFlags flags)?Gnome.DateEdit?0?public void
@construct?128?(string history_id, string browse_dialog_title)?Gnome.IconEntry?0?public void
@construct?128?(Gdk.NativeWindow socket_id)?Gtk.Plug?0?public void
@continue?128?()?GLib.Timer?0?public void
@default?128?()?GLib.MainContext?0?public weak MainContext
@default?8?Gsl.RNGTypes?0?RNGType
@delete?128?()?GLib.AppInfo?0?public bool
@delete?128?(GLib.Cancellable? cancellable)?GLib.File?0?public bool
@delete?128?(string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data)?GnomeKeyring?0?public void *
@delete?128?(Gtk.TextIter start, Gtk.TextIter end)?Gtk.TextBuffer?0?public void
@dynamic?8?Gst.BaseRTPPayload?0?bool
@flags?8?X.SizeHints?0?long
@foreach?128?(GConf.ChangeSetForeachFunc func)?GConf.ChangeSet?0?public void
@foreach?128?(GConf.ListenersForeach callback)?GConf.Listeners?0?public void
@foreach?128?(DataForeachFunc func)?GLib.Datalist?0?public void
@foreach?128?(Func func)?GLib.List?0?public void
@foreach?128?(Func func)?GLib.SList?0?public void
@foreach?128?(Func func)?GLib.Sequence?0?public void
@foreach?128?(Func thread_func)?GLib.Thread?0?public void
@foreach?128?(GLib.HFunc func)?Gsf.DocMetaData?0?public void
@foreach?128?(GLib.Func func)?Gst.Iterator?0?public Gst.IteratorResult
@foreach?128?(Gst.StructureForeachFunc func)?Gst.Structure?0?public bool
@foreach?128?(Gst.TagForeachFunc func)?Gst.TagList?0?public void
@foreach?128?(void* data, Gtk.AccelMapForeach foreach_func)?Gtk.AccelMap?0?public void
@foreach?128?(Gtk.Callback callback)?Gtk.Container?0?public void
@foreach?128?(Gtk.PrintSettingsFunc func)?Gtk.PrintSettings?0?public void
@foreach?128?(Gtk.TextTagTableForeach func, void* data)?Gtk.TextTagTable?0?public void
@foreach?128?(Gtk.TreeModelForeachFunc func)?Gtk.TreeModel?0?public void
@foreach?128?(Pango.FontsetForeachFunc func, void* data)?Pango.Fontset?0?public void
@foreach?128?(Soup.MessageHeadersForeachFunc func)?Soup.MessageHeaders?0?public void
@foreach?128?(Tracker.MetadataForeach func)?Tracker.Metadata?0?public void
@foreach?128?(GLib.HFunc func)?Xfce.MenuItemCache?0?public void
@foreach?128?(GLib.HFunc func)?Xfce.MenuItemPool?0?public void
@get?8?GLib.SourceCallbackFuncs?0?SourceCallbackGetFunc
@get?128?(size_t i)?Gsl.Combination?0?public size_t
@get?128?(size_t i)?Gsl.Histogram?0?public double
@get?128?(size_t i, size_t j)?Gsl.Histogram2d?0?public double
@get?128?(size_t i, size_t j)?Gsl.Matrix?0?public double
@get?128?(size_t i, size_t j)?Gsl.MatrixComplex?0?public double
@get?128?(size_t i)?Gsl.Permutation?0?public size_t
@get?128?([CCode (array_length = false)] double[] x)?Gsl.QRNG?0?public int
@get?8?Gsl.QRNGType?0?QRNGGetState2
@get?128?()?Gsl.RNG?0
@get?8?Gsl.RNGType?0?RNGGetState
@get?128?(size_t i)?Gsl.Vector?0?public double
@get?128?(size_t i)?Gsl.VectorComplex?0?public Complex
@in?8?Gdk.EventFocus?0?int16
@interface?8?FTDI.Context?0?int
@interface?8?Soup.Server?0?Soup.Address
@interface?8?USB.ConfigDescriptor?0?Interface
@lock?128?()?GLib.AsyncQueue?0?public void
@lock?128?()?GLib.Mutex?0?public void
@lock?128?(string keyring, GnomeKeyring.OperationDoneCallback callback, void* data, GLib.DestroyNotify destroy_data)?GnomeKeyring?0?public void *
@lock?8?Gst.Controller?0?GLib.Mutex
@lock?8?Gst.InterpolationControlSource?0?GLib.Mutex
@lock?8?Gst.Iterator?0?GLib.Mutex
@lock?8?Gst.LFOControlSource?0?GLib.Mutex
@lock?8?Gst.Message?0?GLib.Mutex
@lock?8?Gst.Object?0?GLib.Mutex
@lock?8?Gst.Task?0?void
@lock?128?()?Gtk.AccelGroup?0?public void
@new?128?(Type type, ...)?GLib.Object?0?public Object
@new?128?(out Gst.RTSPMessage msg)?Gst.RTSPMessage?0?public Gst.RTSPResult
@new?128?(out Gst.RTSPTransport transport)?Gst.RTSPTransport?0?public Gst.RTSPResult
@new?128?()?Pango.CairoFontMap?0?public unowned
@ref?128?()?GLib.Object?0?public weak Object
@ref?8?GLib.SourceCallbackFuncs?0?SourceCallbackRefFunc
@ref?128?()?GnomeVFS.Drive?0?public unowned
@ref?128?()?GnomeVFS.Volume?0?public unowned
@ref?128?()?GnomeVFS.VolumeMonitor?0?public unowned
@ref?128?()?Gst.Buffer?0?public unowned
@ref?128?()?Gst.Caps?0?public unowned
@ref?128?()?Gst.Object?0?public unowned
@set?128?(double omega, double L, QAWO sine)?Gsl.IntegrationQAWOTable?0?public int
@set?128?(double alpha, double beta, int mu, int nu)?Gsl.IntegrationQAWSTable?0?public int
@set?128?(size_t i, size_t j, double x)?Gsl.Matrix?0?public void
@set?128?(size_t i, size_t j, double x)?Gsl.MatrixComplex?0?public void
@set?128?(Function* f, double x_minimum, double x_lower, double x_upper)?Gsl.MinFminimizer?0?public int
@set?8?Gsl.MinFminimizerType?0?MinSet
@set?128?(MultifitFunctionFdf* fdf, Vector x)?Gsl.MultifitFdfsolver?0?public int
@set?8?Gsl.MultifitFdfsolverType?0?MultifitFdfSet
@set?128?(MultifitFunction* f, Vector x)?Gsl.MultifitFsolver?0?public int
@set?8?Gsl.MultifitFsolverType?0?MultifitFSet
@set?128?(MultiminFunctionFdf* fdf, Vector x, double step_size, double tol)?Gsl.MultiminFdfminimizer?0?public int
@set?8?Gsl.MultiminFdfminimizerType?0?MultiminFdfSet
@set?128?(MultiminFunction* f, Vector x, Vector step_size)?Gsl.MultiminFminimizer?0?public int
@set?8?Gsl.MultiminFminimizerType?0?MultiminFSet
@set?128?(MultirootFunctionFdf* fdf, Vector x)?Gsl.MultirootFdfsolver?0?public int
@set?8?Gsl.MultirootFdfsolverType?0?MultirootFdfSet
@set?128?(MultirootFunction* f, Vector x)?Gsl.MultirootFsolver?0?public int
@set?8?Gsl.MultirootFsolverType?0?MultirootFSet
@set?128?(ulong s)?Gsl.RNG?0?public void
@set?8?Gsl.RNGType?0?RNGSetState
@set?128?(FunctionFdf* fdf, double root)?Gsl.RootFdfsolver?0?public int
@set?8?Gsl.RootFdfsolverType?0?RootFdfsolverSet
@set?128?(Function* f, double x_lower, double x_upper)?Gsl.RootFsolver?0?public int
@set?8?Gsl.RootFsolverType?0?RootFsolverSet
@set?128?(size_t i, double x)?Gsl.Vector?0?public void
@set?128?(size_t i, Complex x)?Gsl.VectorComplex?0?public void
@signal?128?()?GLib.Cond?0?public void
@signal?8?Glade.AccelInfo?0
@signal?128?()?SDL.Condition?0?public int
@signal?8?V4l2.Tuner?0?int32
@try?128?()?Sqlite.Mutex?0?public int
@value?8?SDL.JoyAxisEvent?0?uint16
@value?8?SDL.JoyHatEvent?0?uchar
@value?8?V4l2.Control?0?int32
@value?8?V4l2.ExtControl?0?int32
A?4?FTDI.Interface?0
A?8?Gsl.MultifitLinearWorkspace?0?Matrix
A?8?Gsl.RanDiscrete?0?size_t
A1?4?Cairo.Format?0
A1?4?Curses.Key?0
A3?4?Curses.Key?0
A8?4?Cairo.Format?0
ABGR?8?Gst.VideoCaps?0
ABGR?4?Gst.VideoFormat?0
ABORT?4?GnomeVFS.XferErrorAction?0
ABORT?4?GnomeVFS.XferErrorMode?0
ABORT?4?GnomeVFS.XferOverwriteAction?0
ABORT?4?GnomeVFS.XferOverwriteMode?0
ABORT?8?Sqlite?0?int
ABORTED?4?GLib.MountOperationResult?0
ABOUT?4?Gnome.UIInfoConfigurableTypes?0
ABOVE?4?Gdk.WindowState?0
ABOVE?4?Wnck.WindowActions?0
ABOVE?4?Wnck.WindowState?0
ABRT?4?Daemon.Sig?0
ABRT?4?GLib.ProcessSignal?0
ABSOLUTE_SIZE?4?Pango.AttrType?0
ABS_ASC?4?Gsl.EigenSortType?0
ABS_DESC?4?Gsl.EigenSortType?0
AC3?4?Gst.BufferFormat?0
AC3?4?Gst.BufferFormatType?0
ACCELERATED_VISUAL?4?SDL.GLattr?0
ACCELERATOR?4?Gtk.UIManagerItemType?0
ACCEL_LABEL?4?Atk.Role?0
ACCEPT?4?Gst.RTSPHeaderField?0
ACCEPT?4?Gtk.ResponseType?0
ACCEPT?4?WebKit.NavigationResponse?0
ACCEPTED?4?Soup.KnownStatusCode?0
ACCEPT_ENCODING?4?Gst.RTSPHeaderField?0
ACCEPT_FILENAME?4?Gtk.FileChooserConfirmation?0
ACCEPT_ITEMS_ONLY?4?Exo.ToolbarsModelFlags?0
ACCEPT_LANGUAGE?4?Gst.RTSPHeaderField?0
ACCES?4?GLib.FileError?0
ACCES?4?GLib.SpawnError?0
ACCESS?4?GnomeVFS.FileInfoFields?0
ACCESS_DENIED?4?DBus.Error?0
ACCESS_DENIED?4?Oobs.Result?0
ACCESS_EXECUTABLE?4?GnomeVFS.FilePermissions?0
ACCESS_READABLE?4?GnomeVFS.FilePermissions?0
ACCESS_WRITABLE?4?GnomeVFS.FilePermissions?0
ACCUM_ALPHA_SIZE?4?SDL.GLattr?0
ACCUM_BLUE_SIZE?4?SDL.GLattr?0
ACCUM_GREEN_SIZE?4?SDL.GLattr?0
ACCUM_RED_SIZE?4?SDL.GLattr?0
ACCURATE?4?Gst.SeekFlags?0
ACE?1?GnomeVFS?0
ACE?128?(GnomeVFS.ACLKind kind, string id, GnomeVFS.ACLPerm perms)?GnomeVFS.ACE?0
ACL?1?GnomeVFS?0
ACL?128?()?GnomeVFS.ACL?0
ACL?4?GnomeVFS.FileInfoFields?0
ACL?4?GnomeVFS.SetFileInfoMask?0
ACLKind?1?GnomeVFS?0
ACLPerm?1?GnomeVFS?0
ACRE?4?Gsl.ConstCGS?0
ACRE?4?Gsl.ConstCGSM?0
ACRE?4?Gsl.ConstMKS?0
ACRE?4?Gsl.ConstMKSA?0
ACTION?4?GLib.SignalFlags?0
ACTION?4?Gtk.SignalRunType?0
ACTIVATABLE?4?Gtk.CellRendererMode?0
ACTIVATE?4?Unique.Command?0
ACTIVE?4?Atk.StateType?0
ACTIVE?4?Exo.MountPointMatchMask?0
ACTIVE?4?Gtk.RcTokenType?0
ACTIVE?4?Gtk.StateType?0
ACTIVE?4?SDL.ActiveState?0
[...32520 lines suppressed...]
xml_write_cache?128?(string location)?Gst.Registry?0?public bool
xmlrpc_build_fault?128?(int fault_code, string fault_format, ...)?Soup?0?public unowned string
xmlrpc_build_method_call?128?(string method_name, GLib.Value[] params)?Soup?0?public unowned string
xmlrpc_build_method_response?128?(GLib.Value value)?Soup?0?public unowned string
xmlrpc_error_quark?128?()?Soup?0?public GLib.Quark
xmlrpc_extract_method_call?128?(string method_call, int length, out unowned string method_name, ...)?Soup?0?public bool
xmlrpc_extract_method_response?128?(string method_response, int length, ...)?Soup?0?public bool
xmlrpc_fault_quark?128?()?Soup?0?public GLib.Quark
xmlrpc_parse_method_call?128?(string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray params)?Soup?0?public bool
xmlrpc_parse_method_response?128?(string method_response, int length, GLib.Value value)?Soup?0?public bool
xmlrpc_request_new?128?(string uri, string method_name, ...)?Soup?0?public unowned
xmlrpc_set_fault?128?(Soup.Message msg, int fault_code, string fault_format, ...)?Soup?0?public void
xmlrpc_set_response?128?(Soup.Message msg, ...)?Soup?0?public void
xmotion?8?X.Event?0?MotionEvent
xmove?128?(LuaVM from, LuaVM to, int n)?Lua.LuaVM?0?public void
xoffset?8?Gtk.TextView?0?int
xor?128?(Gdk.Region source2)?Gdk.Region?0?public void
xor_gc?8?Gtk.Calendar?0?Gdk.GC
xor_gc?8?Gtk.Paned?0?Gdk.GC
xor_gc?8?Hildon.Calendar?0?Gdk.GC
xor_sets?128?(Atk.StateSet compare_set)?Atk.StateSet?0?public unowned
xpad?8?Gtk.CellRenderer?0
xpad?8?Gtk.Misc?0?int
xpadding?8?Gtk.TableChild?0?uint16
xpels_meter?8?Gst.gst_riff_strf_vids?0?uint32
xproperty?8?X.Event?0?PropertyEvent
xrange?8?Gsl.Histogram2d?0?double
xrange?8?Gsl.Histogram2dPDF?0?double
xrel?8?SDL.JoyBallEvent?0?int16
xrel?8?SDL.MouseMotionEvent?0?int16
xreparent?8?X.Event?0?ReparentEvent
xscale?8?Gtk.Alignment?0?float
xselection?8?X.Event?0?SelectionEvent
xserver_vendor_name?128?()?X.Display?0
xserver_vendor_release?128?()?X.Display?0
xshrink?8?Gtk.TableChild?0
xsigma?128?()?Gsl.Histogram2d?0?public double
xsrc?8?Gtk.Ruler?0?int
xt?8?Gsl.MultifitLinearWorkspace?0?Vector
xthickness?8?Gtk.RcStyle?0?int
xthickness?8?Gtk.Style?0?int
xunmap?8?X.Event?0?UnmapEvent
xx?8?Pango.Matrix?0?double
xy?8?Pango.Matrix?0?double
xy_to_index?128?(int x, int y, int index_, int trailing)?Pango.Layout?0?public bool
y?8?Atk.Rectangle?0?int
y?8?Atk.TextRectangle?0?int
y?8?Cairo.PathDataPoint?0?double
y?8?Gdk.EventButton?0?double
y?8?Gdk.EventConfigure?0?int
y?8?Gdk.EventCrossing?0?double
y?8?Gdk.EventMotion?0?double
y?8?Gdk.EventScroll?0?double
y?8?Gdk.Point?0?int
y?8?Gdk.Rectangle?0?int
y?8?Gdk.Span?0?int
y?8?Gdk.WindowAttr?0?int
y?8?Goo.CanvasImage?0?double
y?8?Goo.CanvasImageData?0?double
y?8?Goo.CanvasImageModel?0?double
y?8?Goo.CanvasRect?0?double
y?8?Goo.CanvasRectData?0?double
y?8?Goo.CanvasRectModel?0?double
y?8?Goo.CanvasText?0?double
y?8?Goo.CanvasTextData?0?double
y?8?Goo.CanvasTextModel?0?double
y?8?Goo.CanvasWidget?0?double
y?8?Gsl.Spline?0?double
y?8?Gst.VideoRectangle?0?int
y?8?Gtk.Allocation?0?int
y?8?Gtk.FixedChild?0?int
y?8?Gtk.WidgetAuxInfo?0?int
y?8?Pango.Rectangle?0?int
y?4?SDL.KeySymbol?0
y?8?SDL.MouseButtonEvent?0?uint16
y?8?SDL.MouseMotionEvent?0?uint16
y?8?SDL.Rect?0?int16
y?8?X.ButtonEvent?0?int
y?8?X.ConfigureEvent?0?int
y?8?X.ConfigureRequestEvent?0?int
y?8?X.CreateWindowEvent?0?int
y?8?X.CrossingEvent?0?int
y?8?X.GravityEvent?0?int
y?8?X.KeyEvent?0?int
y?8?X.MotionEvent?0?int
y?8?X.ReparentEvent?0?int
y?8?X.SizeHints?0?int
y?8?X.WindowAttributes?0?int
y?8?X.WindowChanges?0?int
y?8?Xcb.ExposeEvent?0?uint16
y0?128?(double x0)?GLib.Math?0?public double
y0?128?(double x)?Gsl.Bessel?0?public double
y0?8?Gsl.OdeivEvolve?0?double
y0?8?Pango.Matrix?0?double
y0_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y0f?128?(float x0)?GLib.Math?0?public float
y1?128?(double x0)?GLib.Math?0?public double
y1?8?Gdk.Segment?0?int
y1?8?Gdk.Trapezoid?0?double
y1?8?Goo.Canvas?0?double
y1?8?Goo.CanvasBounds?0?double
y1?128?(double x)?Gsl.Bessel?0?public double
y1?8?Poppler.Rectangle?0?double
y1_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y1f?128?(float x0)?GLib.Math?0?public float
y2?8?Gdk.Segment?0?int
y2?8?Gdk.Trapezoid?0?double
y2?8?Goo.Canvas?0?double
y2?8?Goo.CanvasBounds?0?double
y2?128?(double x)?Gsl.Bessel?0?public double
y2?8?Poppler.Rectangle?0?double
y2_e?128?(double x, out Result result)?Gsl.Bessel?0?public int
y_advance?8?Cairo.TextExtents?0?double
y_bearing?8?Cairo.TextExtents?0?double
y_offset?8?Pango.GlyphGeometry?0?Pango.GlyphUnit
y_root?8?Gdk.EventButton?0?double
y_root?8?Gdk.EventCrossing?0?double
y_root?8?Gdk.EventDND?0?short
y_root?8?Gdk.EventMotion?0?double
y_root?8?Gdk.EventScroll?0?double
y_root?8?X.ButtonEvent?0?int
y_root?8?X.CrossingEvent?0?int
y_root?8?X.KeyEvent?0?int
y_root?8?X.MotionEvent?0?int
y_set?8?Gtk.WidgetAuxInfo?0
yalign?8?Gtk.Alignment?0?float
yalign?8?Gtk.AspectFrame?0?float
yalign?8?Gtk.Button?0?float
yalign?8?Gtk.CellRenderer?0?float
yalign?8?Gtk.Misc?0?float
ycbcr?8?Tiff.RGBAImage?0?YCbCrToRGB
year?8?GLib.Time?0?int
year?8?Gtk.Calendar?0?int
year?8?Hildon.Calendar?0?int
year?8?Hildon.CalendarPopup?0?int
year?8?Hildon.DateEditor?0
year?8?Soup.Date?0?int
year?8?TagLib.Tag?0
yerr?8?Gsl.OdeivEvolve?0?double
yexpand?8?Gtk.TableChild?0
yfill?8?Gtk.TableChild?0
yield?128?()?GLib.Thread?0?public void
yield?128?(int nresults)?Lua.LuaVM?0?public int
yl?128?(int l, double x)?Gsl.Bessel?0?public double
yl_array?128?(int lmax, double x, [CCode (array_length = false)] double[] result_array)?Gsl.Bessel?0?public int
yl_e?128?(int l, double x, out Result result)?Gsl.Bessel?0?public int
ymax?128?()?Gsl.Histogram2d?0?public double
ymean?128?()?Gsl.Histogram2d?0?public double
ymin?128?()?Gsl.Histogram2d?0?public double
yn?128?(int x0, double x1)?GLib.Math?0?public double
ynf?128?(int x0, float x1)?GLib.Math?0?public float
yoffset?8?Gtk.TextView?0?int
your_event_mask?8?X.WindowAttributes?0?long
ypad?8?Gtk.CellRenderer?0
ypad?8?Gtk.Misc?0?int
ypadding?8?Gtk.TableChild?0?uint16
ypels_meter?8?Gst.gst_riff_strf_vids?0?uint32
yrange?8?Gsl.Histogram2d?0?double
yrange?8?Gsl.Histogram2dPDF?0?double
yrel?8?SDL.JoyBallEvent?0?int16
yrel?8?SDL.MouseMotionEvent?0?int16
yscale?8?Gtk.Alignment?0?float
yshrink?8?Gtk.TableChild?0
ysigma?128?()?Gsl.Histogram2d?0?public double
ysrc?8?Gtk.Ruler?0?int
ythickness?8?Gtk.RcStyle?0?int
ythickness?8?Gtk.Style?0?int
yx?8?Pango.Matrix?0?double
yy?8?Pango.Matrix?0?double
z?4?SDL.KeySymbol?0
zero_Ai?128?(uint s)?Gsl.Airy?0?public double
zero_Ai_deriv?128?(uint s)?Gsl.Airy?0?public double
zero_Ai_deriv_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Ai_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Bi?128?(uint s)?Gsl.Airy?0?public double
zero_Bi_deriv?128?(uint s)?Gsl.Airy?0?public double
zero_Bi_deriv_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_Bi_e?128?(uint s, out Result result)?Gsl.Airy?0?public int
zero_J0?128?(uint s)?Gsl.Bessel?0?public double
zero_J0_e?128?(uint s, out Result result)?Gsl.Bessel?0?public int
zero_J1?128?(uint s)?Gsl.Bessel?0?public double
zero_J1_e?128?(uint s, out Result result)?Gsl.Bessel?0?public int
zero_Jnu?128?(double nu, uint s)?Gsl.Bessel?0?public double
zero_Jnu_e?128?(double nu, uint s, out Result result)?Gsl.Bessel?0?public int
zero_ref_count?8?Gtk.TreeModelSort?0?int
zeta?128?(double s)?Gsl.Zeta?0?public double
zeta_e?128?(double s, out Result result)?Gsl.Zeta?0?public int
zeta_int?128?(int n)?Gsl.Zeta?0?public double
zeta_int_e?128?(int n, out Result result)?Gsl.Zeta?0?public int
zetam1?128?(double s)?Gsl.Zeta?0?public double
zetam1_e?128?(double s, out Result result)?Gsl.Zeta?0?public int
zetam1_int?128?(int n)?Gsl.Zeta?0?public double
zetam1_int_e?128?(int n, out Result result)?Gsl.Zeta?0?public int
zones?8?Gst.SDPMessage?0?GLib.Array
zones_len?128?()?Gst.SDPMessage?0
zoom?8?Poppler.Dest?0?double
zoom?128?(Surface src, double zoomx, double zoomy, int smooth)?SDLGraphics.RotoZoom?0?public Surface
zoom_size?128?(int width, int height, double zoomx, double zoomy, ref int dstwidth, ref int dstheight)?SDLGraphics.RotoZoom?0?public void
zuf?8?Gsl.RNGTypes?0?RNGType
zz?8?Gsl.MathieuWorkspace?0?double


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Oct 2008 15:19:39 -0000	1.8
+++ .cvsignore	16 Aug 2009 19:20:54 -0000	1.9
@@ -1 +1 @@
-geany-0.15.tar.bz2
+geany-0.18.tar.bz2


Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-10/geany.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- geany.spec	31 Jul 2009 21:20:10 -0000	1.26
+++ geany.spec	16 Aug 2009 19:20:54 -0000	1.27
@@ -1,6 +1,6 @@
 Name:      geany
-Version:   0.17
-Release:   8%{?dist}
+Version:   0.18
+Release:   1%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -8,16 +8,15 @@ License:   GPLv2+
 URL:       http://www.geany.org/
 Source0:   http://download.geany.org/%{name}-%{version}.tar.bz2
 
-# The following tags files were retrieved 25th Feb 2009
+# The following tags files were retrieved 16th Aug 2009
 Source1:   http://download.geany.org/contrib/tags/sqlite3.c.tags
 Source2:   http://download.geany.org/contrib/tags/std.glsl.tags
 Source3:   http://download.geany.org/contrib/tags/gtk216.c.tags
 Source4:   http://download.geany.org/contrib/tags/xfce46.c.tags
 Source5:   http://download.geany.org/contrib/tags/dbus-glib-0.76.c.tags
 Source6:   http://download.geany.org/contrib/tags/standard.css.tags
-
-# Fix the button pixmaps - backported from upstream SVN rev 3882
-Patch0:    geany-0.17-button-pixmaps.patch
+Source7:   http://download.geany.org/contrib/tags/geany-api-0.18.c.tags
+Source8:   http://download.geany.org/contrib/tags/std.vala.tags
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +27,7 @@ Requires: vte
 %define geany_docdir $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %description
-Geany is a small and fast editor with basic features of an 
+Geany is a small and fast editor with basic features of an
 integrated development environment.
 
 Some features:
@@ -53,8 +52,6 @@ Geany plug-ins. You do not need to insta
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
@@ -75,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 
 # Install tags files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
-install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
+install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,8 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/doc/%{name}-%{version}
 %{_mandir}/man1/geany.1.gz
 
@@ -97,6 +95,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-1
+- new upstream release
+- remove button pixmaps patch since this fix is included in 0.18
+- add new tags-files geany-api-0.18.c.tags and std.vala.tags
+- remove Geany icon from pixmaps path and add it to 48x48 and scalable
+
 * Mon Jul 27 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.17-8
 - install additional *.tags-files to $prefix/share/geany/tags
 


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gtk216.c.tagsIndex: gtk216.c.tags
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-10/gtk216.c.tags,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk216.c.tags	20 May 2009 22:38:04 -0000	1.1
+++ gtk216.c.tags	16 Aug 2009 19:20:54 -0000	1.2
@@ -1,9 +1,7 @@
 # format=tagmanager
 ABS?65536?0
 ABS?131072?(a)?0
-ACCESSPERMS?65536?0
 AIO_PRIO_DELTA_MAX?65536?0
-ALLPERMS?65536?0
 ARG_MAX?65536?0
 ATEXIT?131072?(proc)?0
 ATK_ACTION?131072?(obj)?0
@@ -461,7 +459,6 @@ CAIRO_FORMAT_ARGB32?4?_cairo_format?0
 CAIRO_FORMAT_RGB16_565?65536?0
 CAIRO_FORMAT_RGB24?4?_cairo_format?0
 CAIRO_H?65536?0
-CAIRO_HAS_DIRECTFB_SURFACE?65536?0
 CAIRO_HAS_FT_FONT?65536?0
 CAIRO_HAS_IMAGE_SURFACE?65536?0
 CAIRO_HAS_PDF_SURFACE?65536?0
@@ -602,7 +599,6 @@ DBL_MAX_EXP?65536?0
 DBL_MIN?65536?0
 DBL_MIN_10_EXP?65536?0
 DBL_MIN_EXP?65536?0
-DEFFILEMODE?65536?0
 DELAYTIMER_MAX?65536?0
 EOF?65536?0
 EXPR_NEST_MAX?65536?0
@@ -639,14 +635,14 @@ FPE_INTOVF?65536?0
 FPE_INTOVF?4?anon_enum_20?0
 GAllocator?4096?0?_GAllocator
 GAppInfo?4096?0?_GAppInfo
-GAppInfoCreateFlags?4096?0?anon_enum_103
+GAppInfoCreateFlags?4096?0?anon_enum_98
 GAppInfoIface?4096?0?_GAppInfoIface
 GAppLaunchContext?4096?0?_GAppLaunchContext
 GAppLaunchContextClass?4096?0?_GAppLaunchContextClass
 GAppLaunchContextPrivate?4096?0?_GAppLaunchContextPrivate
 GArray?4096?0?_GArray
 GAsciiType?4096?0?anon_enum_84
-GAskPasswordFlags?4096?0?anon_enum_119
+GAskPasswordFlags?4096?0?anon_enum_114
 GAsyncQueue?4096?0?_GAsyncQueue
 GAsyncReadyCallback?4096?0?typedef void
 GAsyncResult?4096?0?_GAsyncResult
@@ -687,7 +683,7 @@ GCompletion?4096?0?_GCompletion
 GCompletionFunc?4096?0?typedef gchar *
 GCompletionStrncmpFunc?4096?0?typedef gint
 GCond?4096?0?_GCond
-GConnectFlags?4096?0?anon_enum_101
+GConnectFlags?4096?0?anon_enum_96
 GConvertError?4096?0?anon_enum_48
 GCopyFunc?4096?0?typedef gpointer
 GDKCONFIG_H?65536?0
@@ -1315,8 +1311,8 @@ GDataInputStreamPrivate?4096?0?_GDataInp
 GDataOutputStream?4096?0?_GDataOutputStream
 GDataOutputStreamClass?4096?0?_GDataOutputStreamClass
 GDataOutputStreamPrivate?4096?0?_GDataOutputStreamPrivate
-GDataStreamByteOrder?4096?0?anon_enum_104
-GDataStreamNewlineType?4096?0?anon_enum_105
+GDataStreamByteOrder?4096?0?anon_enum_99
+GDataStreamNewlineType?4096?0?anon_enum_100
 GDate?4096?0?_GDate
 GDateDMY?4096?0?anon_enum_49
 GDateDay?4096?0?guint8
@@ -1331,7 +1327,7 @@ GDrive?4096?0?_GDrive
 GDriveIface?4096?0?_GDriveIface
 GEmblem?4096?0?_GEmblem
 GEmblemClass?4096?0?_GEmblemClass
-GEmblemOrigin?4096?0?anon_enum_123
+GEmblemOrigin?4096?0?anon_enum_118
 GEmblemedIcon?4096?0?_GEmblemedIcon
 GEmblemedIconClass?4096?0?_GEmblemedIconClass
 GEnumClass?4096?0?_GEnumClass
@@ -1341,13 +1337,13 @@ GError?4096?0?_GError
 GErrorType?4096?0?anon_enum_79
 GFile?4096?0?_GFile
 GFileAttributeInfo?4096?0?_GFileAttributeInfo
-GFileAttributeInfoFlags?4096?0?anon_enum_107
+GFileAttributeInfoFlags?4096?0?anon_enum_102
 GFileAttributeInfoList?4096?0?_GFileAttributeInfoList
 GFileAttributeMatcher?4096?0?_GFileAttributeMatcher
-GFileAttributeStatus?4096?0?anon_enum_108
-GFileAttributeType?4096?0?anon_enum_106
-GFileCopyFlags?4096?0?anon_enum_113
-GFileCreateFlags?4096?0?anon_enum_110
+GFileAttributeStatus?4096?0?anon_enum_103
+GFileAttributeType?4096?0?anon_enum_101
+GFileCopyFlags?4096?0?anon_enum_108
+GFileCreateFlags?4096?0?anon_enum_105
 GFileEnumerator?4096?0?_GFileEnumerator
 GFileEnumeratorClass?4096?0?_GFileEnumeratorClass
 GFileEnumeratorPrivate?4096?0?_GFileEnumeratorPrivate
@@ -1362,20 +1358,20 @@ GFileInputStreamClass?4096?0?_GFileInput
 GFileInputStreamPrivate?4096?0?_GFileInputStreamPrivate
 GFileMonitor?4096?0?_GFileMonitor
 GFileMonitorClass?4096?0?_GFileMonitorClass
-GFileMonitorEvent?4096?0?anon_enum_117
-GFileMonitorFlags?4096?0?anon_enum_114
+GFileMonitorEvent?4096?0?anon_enum_112
+GFileMonitorFlags?4096?0?anon_enum_109
 GFileMonitorPrivate?4096?0?_GFileMonitorPrivate
 GFileOutputStream?4096?0?_GFileOutputStream
 GFileOutputStreamClass?4096?0?_GFileOutputStreamClass
 GFileOutputStreamPrivate?4096?0?_GFileOutputStreamPrivate
 GFileProgressCallback?4096?0?typedef void
-GFileQueryInfoFlags?4096?0?anon_enum_109
+GFileQueryInfoFlags?4096?0?anon_enum_104
 GFileReadMoreCallback?4096?0?typedef gboolean
 GFileTest?4096?0?anon_enum_53
-GFileType?4096?0?anon_enum_115
+GFileType?4096?0?anon_enum_110
 GFilenameCompleter?4096?0?_GFilenameCompleter
 GFilenameCompleterClass?4096?0?_GFilenameCompleterClass
-GFilesystemPreviewType?4096?0?anon_enum_116
+GFilesystemPreviewType?4096?0?anon_enum_111
 GFilterInputStream?4096?0?_GFilterInputStream
 GFilterInputStreamClass?4096?0?_GFilterInputStreamClass
 GFilterOutputStream?4096?0?_GFilterOutputStream
@@ -1422,7 +1418,7 @@ GIOChannel?4096?0?_GIOChannel
 GIOChannelError?4096?0?anon_enum_60
 GIOCondition?4096?0?anon_enum_63
 GIOError?4096?0?anon_enum_59
-GIOErrorEnum?4096?0?anon_enum_118
+GIOErrorEnum?4096?0?anon_enum_113
 GIOExtension?4096?0?_GIOExtension
 GIOExtensionPoint?4096?0?_GIOExtensionPoint
 GIOFlags?4096?0?anon_enum_64
@@ -1492,16 +1488,16 @@ GMemoryOutputStreamClass?4096?0?_GMemory
 GMemoryOutputStreamPrivate?4096?0?_GMemoryOutputStreamPrivate
 GModule?4096?0?_GModule
 GModuleCheckInit?4096?0?typedef const gchar *
-GModuleFlags?4096?0?anon_enum_124
+GModuleFlags?4096?0?anon_enum_119
 GModuleUnload?4096?0?typedef void
 GMount?4096?0?_GMount
 GMountIface?4096?0?_GMountIface
-GMountMountFlags?4096?0?anon_enum_111
+GMountMountFlags?4096?0?anon_enum_106
 GMountOperation?4096?0?_GMountOperation
 GMountOperationClass?4096?0?_GMountOperationClass
 GMountOperationPrivate?4096?0?_GMountOperationPrivate
-GMountOperationResult?4096?0?anon_enum_121
-GMountUnmountFlags?4096?0?anon_enum_112
+GMountOperationResult?4096?0?anon_enum_116
+GMountUnmountFlags?4096?0?anon_enum_107
 GMutex?4096?0?_GMutex
 GNativeVolumeMonitor?4096?0?_GNativeVolumeMonitor
 GNativeVolumeMonitorClass?4096?0?_GNativeVolumeMonitorClass
@@ -1530,11 +1526,11 @@ GOptionParseFunc?4096?0?typedef gboolean
 GOutputStream?4096?0?_GOutputStream
 GOutputStreamClass?4096?0?_GOutputStreamClass
 GOutputStreamPrivate?4096?0?_GOutputStreamPrivate
-GOutputStreamSpliceFlags?4096?0?anon_enum_122
+GOutputStreamSpliceFlags?4096?0?anon_enum_117
 GPOINTER_TO_INT?131072?(p)?0
 GPOINTER_TO_SIZE?131072?(p)?0
 GPOINTER_TO_UINT?131072?(p)?0
-GParamFlags?4096?0?anon_enum_99
+GParamFlags?4096?0?anon_enum_94
 GParamSpec?4096?0?_GParamSpec
 GParamSpecBoolean?4096?0?_GParamSpecBoolean
 GParamSpecBoxed?4096?0?_GParamSpecBoxed
@@ -1562,7 +1558,7 @@ GParamSpecULong?4096?0?_GParamSpecULong
 GParamSpecUnichar?4096?0?_GParamSpecUnichar
 GParamSpecValueArray?4096?0?_GParamSpecValueArray
 GParameter?4096?0?_GParameter
-GPasswordSave?4096?0?anon_enum_120
+GPasswordSave?4096?0?anon_enum_115
 GPatternSpec?4096?0?_GPatternSpec
 GPid?4096?0?int
 GPollFD?4096?0?_GPollFD
@@ -1596,9 +1592,9 @@ GShellError?4096?0?anon_enum_81
 GSignalAccumulator?4096?0?typedef gboolean
 GSignalCMarshaller?4096?0?GClosureMarshal
 GSignalEmissionHook?4096?0?typedef gboolean
-GSignalFlags?4096?0?anon_enum_100
+GSignalFlags?4096?0?anon_enum_95
 GSignalInvocationHint?4096?0?_GSignalInvocationHint
-GSignalMatchType?4096?0?anon_enum_102
+GSignalMatchType?4096?0?anon_enum_97
 GSignalQuery?4096?0?_GSignalQuery
 GSimpleAsyncResult?4096?0?_GSimpleAsyncResult
 GSimpleAsyncResultClass?4096?0?_GSimpleAsyncResultClass
@@ -1714,6 +1710,7 @@ GTK_BUILDABLE_GET_IFACE?131072?(obj)?0
 GTK_BUILDER?131072?(obj)?0
 GTK_BUILDER_CLASS?131072?(klass)?0
 GTK_BUILDER_ERROR?65536?0
+GTK_BUILDER_ERROR_DUPLICATE_ID?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_ATTRIBUTE?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_TAG?4?anon_enum_280?0
 GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION?4?anon_enum_280?0
@@ -3710,9 +3707,9 @@ GType?4096?0?gulong
 GTypeCValue?4096?0?_GTypeCValue
[...6544 lines suppressed...]
 widget_selected?1024?(GtkTipsQuery *tips_query, GtkWidget *widget, const gchar *tip_text, const gchar *tip_private, GdkEventButton *event)?_GtkTipsQueryClass?0?gint
+widgets?64?_GtkItemFactoryItem?0?GSList
+widgets?64?_GtkSizeGroup?0?GSList
+width?64?_AtkRectangle?0?gint
+width?64?_AtkTextRectangle?0?gint
+width?64?_GdkEventConfigure?0?gint
+width?64?_GdkImage?0?gint
+width?64?_GdkRectangle?0?gint
+width?64?_GdkSpan?0?gint
+width?64?_GdkWindowAttr?0?gint
+width?64?_GtkCListColumn?0?gint
+width?64?_GtkCellRenderer?0?gint
+width?64?_GtkLayout?0?guint
+width?64?_GtkOptionMenu?0?guint16
+width?64?_GtkRequisition?0?gint
+width?64?_GtkTextView?0?gint
+width?64?_GtkTreeViewColumn?0?gint
+width?64?_GtkWidgetAuxInfo?0?gint
+width?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+width?64?_PangoRectangle?0?int
+width?64?_cairo_rectangle?0?double
+width?64?anon_struct_122?0?double
+width_changed?64?_GtkTextView?0?guint
+width_chars?64?_GtkEntry?0?gint
+width_inc?64?_GdkGeometry?0?gint
+width_set?64?_GtkCListColumn?0?guint
+win_gravity?64?_GdkGeometry?0?GdkGravity
+window?64?_GdkEventAny?0?GdkWindow
+window?64?_GdkEventButton?0?GdkWindow
+window?64?_GdkEventClient?0?GdkWindow
+window?64?_GdkEventConfigure?0?GdkWindow
+window?64?_GdkEventCrossing?0?GdkWindow
+window?64?_GdkEventDND?0?GdkWindow
+window?64?_GdkEventExpose?0?GdkWindow
+window?64?_GdkEventFocus?0?GdkWindow
+window?64?_GdkEventGrabBroken?0?GdkWindow
+window?64?_GdkEventKey?0?GdkWindow
+window?64?_GdkEventMotion?0?GdkWindow
+window?64?_GdkEventNoExpose?0?GdkWindow
+window?64?_GdkEventOwnerChange?0?GdkWindow
+window?64?_GdkEventProperty?0?GdkWindow
+window?64?_GdkEventProximity?0?GdkWindow
+window?64?_GdkEventScroll?0?GdkWindow
+window?64?_GdkEventSelection?0?GdkWindow
+window?64?_GdkEventSetting?0?GdkWindow
+window?64?_GdkEventVisibility?0?GdkWindow
+window?64?_GdkEventWindowState?0?GdkWindow
+window?64?_GtkCListColumn?0?GdkWindow
+window?64?_GtkDialog?0?GtkWindow
+window?64?_GtkPlug?0?GtkWindow
+window?64?_GtkTreeViewColumn?0?GdkWindow
+window?64?_GtkWidget?0?GdkWindow
 window_at_pointer?1024?(GdkDisplay *display, gint *win_x, gint *win_y)?_GdkDisplayPointerHooks?0?GdkWindow *
 window_at_pointer?1024?(GdkScreen *screen, gint *win_x, gint *win_y)?_GdkPointerHooks?0?GdkWindow *
 window_get_pointer?1024?(GdkDisplay *display, GdkWindow *window, gint *x, gint *y, GdkModifierType *mask)?_GdkDisplayPointerHooks?0?GdkWindow *
+window_placement?64?_GtkScrolledWindow?0?guint
+window_state?64?_GdkEvent?0?GdkEventWindowState
 window_state_event?1024?(GtkWidget *widget, GdkEventWindowState *event)?_GtkWidgetClass?0?gboolean
+window_type?64?_GdkWindowAttr?0?GdkWindowType
+window_type?64?_GdkWindowObject?0?guint8
+windowing_data?64?_GdkColormap?0?gpointer
+windowing_data?64?_GdkDragContext?0?gpointer
+windowing_data?64?_GdkImage?0?gpointer
 wint_t?4096?0?int
+wm_role?64?_GtkWindow?0?gchar
+wmclass_class?64?_GdkWindowAttr?0?gchar
+wmclass_class?64?_GtkWindow?0?gchar
+wmclass_name?64?_GdkWindowAttr?0?gchar
+wmclass_name?64?_GtkWindow?0?gchar
+wrap?64?_GtkLabel?0?guint
+wrap?64?_GtkSpinButton?0?guint
+wrap_mode?64?_GtkLabel?0?guint
+wrap_mode?64?_GtkTextAttributes?0?GtkWrapMode
+wrap_mode?64?_GtkTextView?0?GtkWrapMode
+wrap_mode_set?64?_GtkTextTag?0?guint
 wrapped?1024?(GtkSpinButton *spin_button)?_GtkSpinButtonClass?0?void
+write?64?anon_struct_148?0?__io_write_fn
 write_async?1024?(GOutputStream *stream, const void *buffer, gsize count, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)?_GOutputStreamClass?0?void
+write_buf?64?_GIOChannel?0?GString
+write_cd?64?_GIOChannel?0?GIConv
+write_cond?64?_GStaticRWLock?0?GCond
 write_finish?1024?(GOutputStream *stream, GAsyncResult *result, GError **error)?_GOutputStreamClass?0?gssize
 write_fn?1024?(GOutputStream *stream, const void *buffer, gsize count, GCancellable *cancellable, GError **error)?_GOutputStreamClass?0?gssize
+x?64?_AtkRectangle?0?gint
+x?64?_AtkTextRectangle?0?gint
+x?64?_GdkEventButton?0?gdouble
+x?64?_GdkEventConfigure?0?gint
+x?64?_GdkEventCrossing?0?gdouble
+x?64?_GdkEventMotion?0?gdouble
+x?64?_GdkEventScroll?0?gdouble
+x?64?_GdkPoint?0?gint
+x?64?_GdkRectangle?0?gint
+x?64?_GdkSpan?0?gint
+x?64?_GdkWindowAttr?0?gint
+x?64?_GdkWindowObject?0?gint
+x?64?_GtkFixedChild?0?gint
+x?64?_GtkWidgetAuxInfo?0?gint
+x?64?_PangoRectangle?0?int
+x?64?_cairo_path_data_t::anon_struct_125?0?double
+x?64?_cairo_rectangle?0?double
+x?64?anon_struct_120?0?double
+x0?64?_PangoMatrix?0?double
+x0?64?_cairo_matrix?0?double
+x1?64?_GdkSegment?0?gint
+x11?64?_GdkTrapezoid?0?double
+x12?64?_GdkTrapezoid?0?double
+x2?64?_GdkSegment?0?gint
+x21?64?_GdkTrapezoid?0?double
+x22?64?_GdkTrapezoid?0?double
+x_advance?64?anon_struct_122?0?double
+x_align?64?_GtkProgress?0?gfloat
+x_bearing?64?anon_struct_122?0?double
+x_drag?64?_GtkCList?0?gint
+x_offset?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+x_root?64?_GdkEventButton?0?gdouble
+x_root?64?_GdkEventCrossing?0?gdouble
+x_root?64?_GdkEventDND?0?gshort
+x_root?64?_GdkEventMotion?0?gdouble
+x_root?64?_GdkEventScroll?0?gdouble
+x_set?64?_GtkWidgetAuxInfo?0?guint
+xalign?64?_GtkAlignment?0?gfloat
+xalign?64?_GtkAspectFrame?0?gfloat
+xalign?64?_GtkCellRenderer?0?gfloat
+xalign?64?_GtkMisc?0?gfloat
+xalign?64?_GtkTreeViewColumn?0?gfloat
+xembed_version?64?_GtkSocket?0?gshort
+xexpand?64?_GtkTableChild?0?guint
+xfill?64?_GtkTableChild?0?guint
+xoffset?64?_GtkTextView?0?gint
+xor_gc?64?_GtkCList?0?GdkGC
+xor_gc?64?_GtkCalendar?0?GdkGC
+xor_gc?64?_GtkPaned?0?GdkGC
+xpad?64?_GtkCellRenderer?0?guint16
+xpad?64?_GtkMisc?0?guint16
+xpadding?64?_GtkTableChild?0?guint16
+xscale?64?_GtkAlignment?0?gfloat
+xshrink?64?_GtkTableChild?0?guint
+xsrc?64?_GtkRuler?0?gint
+xthickness?64?_GtkRcStyle?0?gint
+xthickness?64?_GtkStyle?0?gint
+xx?64?_PangoMatrix?0?double
+xx?64?_cairo_matrix?0?double
+xy?64?_PangoMatrix?0?double
+xy?64?_cairo_matrix?0?double
+y?64?_AtkRectangle?0?gint
+y?64?_AtkTextRectangle?0?gint
+y?64?_GdkEventButton?0?gdouble
+y?64?_GdkEventConfigure?0?gint
+y?64?_GdkEventCrossing?0?gdouble
+y?64?_GdkEventMotion?0?gdouble
+y?64?_GdkEventScroll?0?gdouble
+y?64?_GdkPoint?0?gint
+y?64?_GdkRectangle?0?gint
+y?64?_GdkSpan?0?gint
+y?64?_GdkWindowAttr?0?gint
+y?64?_GdkWindowObject?0?gint
+y?64?_GtkFixedChild?0?gint
+y?64?_GtkWidgetAuxInfo?0?gint
+y?64?_PangoRectangle?0?int
+y?64?_cairo_path_data_t::anon_struct_125?0?double
+y?64?_cairo_rectangle?0?double
+y?64?anon_struct_120?0?double
+y0?64?_PangoMatrix?0?double
+y0?64?_cairo_matrix?0?double
+y1?64?_GdkSegment?0?gint
+y1?64?_GdkTrapezoid?0?double
+y2?64?_GdkSegment?0?gint
+y2?64?_GdkTrapezoid?0?double
+y_advance?64?anon_struct_122?0?double
+y_align?64?_GtkProgress?0?gfloat
+y_bearing?64?anon_struct_122?0?double
+y_offset?64?_PangoGlyphGeometry?0?PangoGlyphUnit
+y_root?64?_GdkEventButton?0?gdouble
+y_root?64?_GdkEventCrossing?0?gdouble
+y_root?64?_GdkEventDND?0?gshort
+y_root?64?_GdkEventMotion?0?gdouble
+y_root?64?_GdkEventScroll?0?gdouble
+y_set?64?_GtkWidgetAuxInfo?0?guint
+yalign?64?_GtkAlignment?0?gfloat
+yalign?64?_GtkAspectFrame?0?gfloat
+yalign?64?_GtkCellRenderer?0?gfloat
+yalign?64?_GtkMisc?0?gfloat
+year?64?_GDate?0?guint
+year?64?_GtkCalendar?0?gint
+yexpand?64?_GtkTableChild?0?guint
+yfill?64?_GtkTableChild?0?guint
+yoffset?64?_GtkTextView?0?gint
+ypad?64?_GtkCellRenderer?0?guint16
+ypad?64?_GtkMisc?0?guint16
+ypadding?64?_GtkTableChild?0?guint16
+yscale?64?_GtkAlignment?0?gfloat
+yshrink?64?_GtkTableChild?0?guint
+ysrc?64?_GtkRuler?0?gint
+ythickness?64?_GtkRcStyle?0?gint
+ythickness?64?_GtkStyle?0?gint
+yx?64?_PangoMatrix?0?double
+yx?64?_cairo_matrix?0?double
+yy?64?_PangoMatrix?0?double
+yy?64?_cairo_matrix?0?double
+zero_ref_count?64?_GtkTreeModelSort?0?gint


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 May 2009 22:38:04 -0000	1.10
+++ sources	16 Aug 2009 19:20:54 -0000	1.11
@@ -1 +1 @@
-097f619f5f0800098a2438a216a28e7b  geany-0.17.tar.bz2
+d8e301f6933c828e2c36b3afdb3f4c34  geany-0.18.tar.bz2


--- geany-0.17-button-pixmaps.patch DELETED ---



From hadess at fedoraproject.org  Sun Aug 16 19:27:02 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sun, 16 Aug 2009 19:27:02 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.101,
	1.102 0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch,
	1.1, NONE gst-plugins-good-0.10.15-v4l2-no-framerate.patch, 1.1, NONE
Message-ID: <20090816192702.A4F7711C0262@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-serv26403

Modified Files:
	gstreamer-plugins-good.spec 
Removed Files:
	0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch 
	gst-plugins-good-0.10.15-v4l2-no-framerate.patch 
Log Message:
Remove upstreamed patches


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gstreamer-plugins-good.spec	14 Aug 2009 19:36:27 -0000	1.101
+++ gstreamer-plugins-good.spec	16 Aug 2009 19:27:02 -0000	1.102
@@ -13,8 +13,6 @@ Group: 		Applications/Multimedia
 License: 	LGPLv2+
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
-Patch1:         gst-plugins-good-0.10.15-v4l2-no-framerate.patch
-Patch2:         0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: 	%{gstreamer} >= %{_gst}
@@ -108,8 +106,6 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
-%patch1 -p1 -b .v4l2
-%patch2 -p1 -b .flac
 libtoolize -f
 autoreconf
 


--- 0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch DELETED ---


--- gst-plugins-good-0.10.15-v4l2-no-framerate.patch DELETED ---



From dmaphy at fedoraproject.org  Sun Aug 16 19:46:59 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:46:59 +0000 (UTC)
Subject: rpms/geany/F-11 geany.spec,1.32,1.33
Message-ID: <20090816194659.B4C5911C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29875

Modified Files:
	geany.spec 
Log Message:
update icon cache (oops)



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- geany.spec	16 Aug 2009 18:51:51 -0000	1.32
+++ geany.spec	16 Aug 2009 19:46:59 -0000	1.33
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -74,6 +74,18 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-2
+- update icon cache
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-1
 - new upstream release
 - remove button pixmaps patch since this fix is included in 0.18



From dmaphy at fedoraproject.org  Sun Aug 16 19:49:04 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:49:04 +0000 (UTC)
Subject: rpms/geany/F-11 geany.spec,1.33,1.34
Message-ID: <20090816194904.BCF2111C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30306

Modified Files:
	geany.spec 
Log Message:
rebuilt package



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- geany.spec	16 Aug 2009 19:46:59 -0000	1.33
+++ geany.spec	16 Aug 2009 19:49:04 -0000	1.34
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-3
+- rebuilt package
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-2
 - update icon cache
 



From dmaphy at fedoraproject.org  Sun Aug 16 19:51:33 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:51:33 +0000 (UTC)
Subject: rpms/geany/F-11 geany.spec,1.34,1.35
Message-ID: <20090816195133.F376911C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30812

Modified Files:
	geany.spec 
Log Message:
rebuilt package (again)



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- geany.spec	16 Aug 2009 19:49:04 -0000	1.34
+++ geany.spec	16 Aug 2009 19:51:33 -0000	1.35
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-4
+- rebuilt package (again)
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-3
 - rebuilt package
 



From dmaphy at fedoraproject.org  Sun Aug 16 19:53:13 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:53:13 +0000 (UTC)
Subject: rpms/geany/F-11 geany.spec,1.35,1.36
Message-ID: <20090816195313.A688611C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31893

Modified Files:
	geany.spec 
Log Message:
rebuilt package (one more time)



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- geany.spec	16 Aug 2009 19:51:33 -0000	1.35
+++ geany.spec	16 Aug 2009 19:53:13 -0000	1.36
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-5
+- rebuilt package (one more time)
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-4
 - rebuilt package (again)
 



From dmaphy at fedoraproject.org  Sun Aug 16 19:57:39 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 19:57:39 +0000 (UTC)
Subject: rpms/geany/F-11 .cvsignore,1.9,1.10 geany.spec,1.36,1.37
Message-ID: <20090816195739.570E211C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv301

Modified Files:
	.cvsignore geany.spec 
Log Message:
rebuilt package (ok, this is the last one)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	25 Feb 2009 21:20:43 -0000	1.9
+++ .cvsignore	16 Aug 2009 19:57:39 -0000	1.10
@@ -1,6 +1 @@
-geany-0.16.tar.bz2
-sqlite3.c.tags
-std.glsl.tags
-gtk214.c.tags
-xfce46.c.tags
-dbus-glib-0.76.c.tags
+geany-0.18.tar.bz2


Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-11/geany.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- geany.spec	16 Aug 2009 19:53:13 -0000	1.36
+++ geany.spec	16 Aug 2009 19:57:39 -0000	1.37
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-6
+- rebuilt package (ok, this is really the last one)
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-5
 - rebuilt package (one more time)
 



From dmaphy at fedoraproject.org  Sun Aug 16 20:01:42 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 20:01:42 +0000 (UTC)
Subject: rpms/geany/devel geany.spec,1.31,1.32
Message-ID: <20090816200142.E935111C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1157

Modified Files:
	geany.spec 
Log Message:
update icon cache 



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/devel/geany.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- geany.spec	16 Aug 2009 19:13:28 -0000	1.31
+++ geany.spec	16 Aug 2009 20:01:42 -0000	1.32
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -74,6 +74,18 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-2
+- update icon cache
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-1
 - new upstream release
 - remove button pixmaps patch since this fix is included in 0.18
@@ -160,7 +175,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Mar 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-2
 - Fix docdir/doc_dir so geany correctly finds the system installed html docs (BZ
-  438534) 
+  438534)
 
 * Sun Feb 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-1
 - Update to version 0.13



From steved at fedoraproject.org  Sun Aug 16 20:03:23 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Sun, 16 Aug 2009 20:03:23 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.1-rc3.patch, NONE,
	1.1 nfs-utils.spec, 1.238,
	1.239 nfs-utils-1.2.0-nfsd-41vers.patch, 1.1, NONE
Message-ID: <20090816200323.DC62B11C0262@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1640

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.1-rc3.patch 
Removed Files:
	nfs-utils-1.2.0-nfsd-41vers.patch 
Log Message:
 - Added upstream 1.2.1-rc3 patch
   - Add IPv6 support to nfsd
   - Allow nfssvc_setfds to properly deal with AF_INET6
   - Convert nfssvc_setfds to use getaddrinfo
   - Move check for active knfsd to helper function
   - Declare a static common buffer for nfssvc.c routine
   - Convert rpc.nfsd to use xlog() and add --debug and --syslog options


nfs-utils-1.2.1-rc3.patch:
 b/support/include/nfs/nfs.h |   15 +-
 b/support/include/nfslib.h  |    1 
 b/support/nfs/Makefile.am   |    2 
 b/utils/nfsd/Makefile.am    |    6 
 b/utils/nfsd/nfsd.c         |  263 +++++++++++++++++++++++++++++-----------
 b/utils/nfsd/nfsd.man       |   25 +++
 b/utils/nfsd/nfssvc.c       |  289 ++++++++++++++++++++++++++++++++++++++++++++
 b/utils/nfsd/nfssvc.h       |   27 ++++
 support/nfs/nfssvc.c        |  187 ----------------------------
 9 files changed, 545 insertions(+), 270 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc3.patch ---
diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h
index 00b0028..a64eb0a 100644
--- a/support/include/nfs/nfs.h
+++ b/support/include/nfs/nfs.h
@@ -42,14 +42,21 @@ struct nfs_fh_old {
 #define NFSCTL_GETFD		7	/* get an fh by path (used by mountd) */
 #define NFSCTL_GETFS		8	/* get an fh by path with max size (used by mountd) */
 
+#define NFSCTL_UDPBIT		      (1 << (17 - 1))
+#define NFSCTL_TCPBIT		      (1 << (18 - 1))
+
 #define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1))) 
-#define NFSCTL_UDPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (17 - 1))) 
-#define NFSCTL_TCPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (18 - 1))) 
+#define NFSCTL_UDPUNSET(_cltbits)     ((_cltbits) &= ~NFSCTL_UDPBIT) 
+#define NFSCTL_TCPUNSET(_cltbits)     ((_cltbits) &= ~NFSCTL_TCPBIT) 
 
 #define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1))) 
-#define NFSCTL_UDPISSET(_cltbits)     ((_cltbits) & (1 << (17 - 1))) 
-#define NFSCTL_TCPISSET(_cltbits)     ((_cltbits) & (1 << (18 - 1))) 
+#define NFSCTL_UDPISSET(_cltbits)     ((_cltbits) & NFSCTL_UDPBIT) 
+#define NFSCTL_TCPISSET(_cltbits)     ((_cltbits) & NFSCTL_TCPBIT) 
+
+#define NFSCTL_UDPSET(_cltbits)       ((_cltbits) |= NFSCTL_UDPBIT)
+#define NFSCTL_TCPSET(_cltbits)       ((_cltbits) |= NFSCTL_TCPBIT)
 
+#define NFSCTL_ANYPROTO(_cltbits)     ((_cltbits) & (NFSCTL_UDPBIT | NFSCTL_TCPBIT))
 #define NFSCTL_ALLBITS (~0)
 
 /* SVC */
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index ae98650..537a31e 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -130,7 +130,6 @@ int			wildmat(char *text, char *pattern);
  * nfsd library functions.
  */
 int			nfsctl(int, struct nfsctl_arg *, union nfsctl_res *);
-int			nfssvc(int port, int nrservs, unsigned int versbits, int minorvers4, unsigned int portbits, char *haddr);
 int			nfsaddclient(struct nfsctl_client *clp);
 int			nfsdelclient(struct nfsctl_client *clp);
 int			nfsexport(struct nfsctl_export *exp);
diff --git a/support/nfs/Makefile.am b/support/nfs/Makefile.am
index 86f52a1..096f56d 100644
--- a/support/nfs/Makefile.am
+++ b/support/nfs/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libnfs.a
 libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
-		   xlog.c xcommon.c wildmat.c nfssvc.c nfsclient.c \
+		   xlog.c xcommon.c wildmat.c nfsclient.c \
 		   nfsexport.c getfh.c nfsctl.c rpc_socket.c getport.c \
 		   svc_socket.c cacheio.c closeall.c nfs_mntent.c
 
diff --git a/support/nfs/nfssvc.c b/support/nfs/nfssvc.c
deleted file mode 100644
index 33c15a7..0000000
--- a/support/nfs/nfssvc.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * support/nfs/nfssvc.c
- *
- * Run an NFS daemon.
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <syslog.h>
-
-
-#include "nfslib.h"
-
-#define NFSD_PORTS_FILE     "/proc/fs/nfsd/portlist"
-#define NFSD_VERS_FILE    "/proc/fs/nfsd/versions"
-#define NFSD_THREAD_FILE  "/proc/fs/nfsd/threads"
-
-static void
-nfssvc_setfds(int port, unsigned int ctlbits, char *haddr)
-{
-	int fd, n, on=1;
-	char buf[BUFSIZ];
-	int udpfd = -1, tcpfd = -1;
-	struct sockaddr_in sin;
-
-	fd = open(NFSD_PORTS_FILE, O_RDONLY);
-	if (fd < 0)
-		return;
-	n = read(fd, buf, BUFSIZ);
-	close(fd);
-	if (n != 0)
-		return;
-	/* there are no ports currently open, so it is safe to
-	 * try to open some and pass them through.
-	 * Note: If the user explicitly asked for 'udp', then
-	 * we should probably check if that is open, and should
-	 * open it if not.  However we don't yet.  All sockets
-	 * have to be opened when the first daemon is started.
-	 */
-	fd = open(NFSD_PORTS_FILE, O_WRONLY);
-	if (fd < 0)
-		return;
-	sin.sin_family = AF_INET;
-	sin.sin_port   = htons(port);
-	sin.sin_addr.s_addr =  inet_addr(haddr);
-
-	if (NFSCTL_UDPISSET(ctlbits)) {
-		udpfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-		if (udpfd < 0) {
-			syslog(LOG_ERR, "nfssvc: unable to create UPD socket: "
-				"errno %d (%s)\n", errno, strerror(errno));
-			exit(1);
-		}
-		if (bind(udpfd, (struct  sockaddr  *)&sin, sizeof(sin)) < 0){
-			syslog(LOG_ERR, "nfssvc: unable to bind UPD socket: "
-				"errno %d (%s)\n", errno, strerror(errno));
-			exit(1);
-		}
-	}
-
-	if (NFSCTL_TCPISSET(ctlbits)) {
-		tcpfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-		if (tcpfd < 0) {
-			syslog(LOG_ERR, "nfssvc: unable to createt tcp socket: "
-				"errno %d (%s)\n", errno, strerror(errno));
-			exit(1);
-		}
-		if (setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) {
-			syslog(LOG_ERR, "nfssvc: unable to set SO_REUSEADDR: "
-				"errno %d (%s)\n", errno, strerror(errno));
-			exit(1);
-		}
-		if (bind(tcpfd, (struct  sockaddr  *)&sin, sizeof(sin)) < 0){
-			syslog(LOG_ERR, "nfssvc: unable to bind TCP socket: "
-				"errno %d (%s)\n", errno, strerror(errno));
-			exit(1);
-		}
-		if (listen(tcpfd, 64) < 0){
-			syslog(LOG_ERR, "nfssvc: unable to create listening socket: "
-				"errno %d (%s)\n", errno, strerror(errno));
-			exit(1);
-		}
-	}
-	if (udpfd >= 0) {
-		snprintf(buf, BUFSIZ,"%d\n", udpfd); 
-		if (write(fd, buf, strlen(buf)) != strlen(buf)) {
-			syslog(LOG_ERR, 
-			       "nfssvc: writing fds to kernel failed: errno %d (%s)", 
-			       errno, strerror(errno));
-		}
-		close(fd);
-		fd = -1;
-	}
-	if (tcpfd >= 0) {
-		if (fd < 0)
-			fd = open(NFSD_PORTS_FILE, O_WRONLY);
-		snprintf(buf, BUFSIZ,"%d\n", tcpfd); 
-		if (write(fd, buf, strlen(buf)) != strlen(buf)) {
-			syslog(LOG_ERR, 
-			       "nfssvc: writing fds to kernel failed: errno %d (%s)", 
-			       errno, strerror(errno));
-		}
-	}
-	close(fd);
-
-	return;
-}
-static void
-nfssvc_versbits(unsigned int ctlbits, int minorvers4)
-{
-	int fd, n, off;
-	char buf[BUFSIZ], *ptr;
-
-	ptr = buf;
-	off = 0;
-	fd = open(NFSD_VERS_FILE, O_WRONLY);
-	if (fd < 0)
-		return;
-
-	for (n = NFSD_MINVERS; n <= NFSD_MAXVERS; n++) {
-		if (NFSCTL_VERISSET(ctlbits, n))
-		    off += snprintf(ptr+off, BUFSIZ - off, "+%d ", n);
-		else
-		    off += snprintf(ptr+off, BUFSIZ - off, "-%d ", n);
-	}
-	n = minorvers4 >= 0 ? minorvers4 : -minorvers4;
-	if (n >= NFSD_MINMINORVERS4 && n <= NFSD_MAXMINORVERS4)
-		    off += snprintf(ptr+off, BUFSIZ - off, "%c4.%d",
-				    minorvers4 > 0 ? '+' : '-',
-				    n);
-	snprintf(ptr+off, BUFSIZ - off, "\n");
-	if (write(fd, buf, strlen(buf)) != strlen(buf)) {
-		syslog(LOG_ERR, "nfssvc: Setting version failed: errno %d (%s)", 
-			errno, strerror(errno));
-	}
-	close(fd);
-
-	return;
-}
-int
-nfssvc(int port, int nrservs, unsigned int versbits, int minorvers4,
-	unsigned protobits, char *haddr)
-{
-	struct nfsctl_arg	arg;
-	int fd;
-
-	/* Note: must set versions before fds so that
-	 * the ports get registered with portmap against correct
-	 * versions
-	 */
-	nfssvc_versbits(versbits, minorvers4);
-	nfssvc_setfds(port, protobits, haddr);
-
-	fd = open(NFSD_THREAD_FILE, O_WRONLY);
-	if (fd < 0)
-		fd = open("/proc/fs/nfs/threads", O_WRONLY);
-	if (fd >= 0) {
-		/* 2.5+ kernel with nfsd filesystem mounted.
-		 * Just write the number in.
-		 * Cannot handle port number yet, but does anyone care?
-		 */
-		char buf[20];
-		int n;
-		snprintf(buf, 20,"%d\n", nrservs);
-		n = write(fd, buf, strlen(buf));
-		close(fd);
-		if (n != strlen(buf))
-			return -1;
-		else
-			return 0;
-	}
-
-	arg.ca_version = NFSCTL_VERSION;
-	arg.ca_svc.svc_nthreads = nrservs;
-	arg.ca_svc.svc_port = port;
-	return nfsctl(NFSCTL_SVC, &arg, NULL);
-}
diff --git a/utils/nfsd/Makefile.am b/utils/nfsd/Makefile.am
index 445e3fd..c4c6fb0 100644
--- a/utils/nfsd/Makefile.am
+++ b/utils/nfsd/Makefile.am
@@ -7,10 +7,8 @@ RPCPREFIX	= rpc.
 KPREFIX		= @kprefix@
 sbin_PROGRAMS	= nfsd
 
-nfsd_SOURCES = nfsd.c
-nfsd_LDADD = ../../support/export/libexport.a \
-	     ../../support/nfs/libnfs.a \
-	     ../../support/misc/libmisc.a
+nfsd_SOURCES = nfsd.c nfssvc.c
+nfsd_LDADD = ../../support/nfs/libnfs.a
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index e3c0094..650c593 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -18,13 +18,14 @@
 #include <string.h>
 #include <errno.h>
 #include <getopt.h>
-#include <syslog.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "nfslib.h"
+#include "nfssvc.h"
+#include "xlog.h"
 
 static void	usage(const char *);
 
@@ -37,47 +38,116 @@ static struct option longopts[] =
 	{ "no-udp", 0, 0, 'U' },
 	{ "port", 1, 0, 'P' },
 	{ "port", 1, 0, 'p' },
+	{ "debug", 0, 0, 'd' },
+	{ "syslog", 0, 0, 's' },
 	{ NULL, 0, 0, 0 }
 };
-unsigned int protobits = NFSCTL_ALLBITS;
-unsigned int versbits = NFSCTL_ALLBITS;
-int minorvers4 = NFSD_MAXMINORVERS4;		/* nfsv4 minor version */
-char *haddr = NULL;
+
+/* given a family and ctlbits, disable any that aren't listed in netconfig */
+#ifdef HAVE_LIBTIRPC
+static void
+nfsd_enable_protos(unsigned int *proto4, unsigned int *proto6)
+{
+	struct netconfig *nconf;
+	unsigned int *famproto;
+	void *handle;
+
+	xlog(D_GENERAL, "Checking netconfig for visible protocols.");
+
+	handle = setnetconfig();
+	while((nconf = getnetconfig(handle))) {
+		if (!(nconf->nc_flag & NC_VISIBLE))
+			continue;
+
+		if (!strcmp(nconf->nc_protofmly, NC_INET))
+			famproto = proto4;
+		else if (!strcmp(nconf->nc_protofmly, NC_INET6))
+			famproto = proto6;
+		else
+			continue;
+
+		if (!strcmp(nconf->nc_proto, NC_TCP))
+			NFSCTL_TCPSET(*famproto);
+		else if (!strcmp(nconf->nc_proto, NC_UDP))
+			NFSCTL_UDPSET(*famproto);
+
+		xlog(D_GENERAL, "Enabling %s %s.", nconf->nc_protofmly,
+			nconf->nc_proto);
+	}
+	endnetconfig(handle);
+	return;
+}
+#else /* HAVE_LIBTIRPC */
+static void
+nfsd_enable_protos(unsigned int *proto4, unsigned int *proto6)
+{
+	/* Enable all IPv4 protocols if no TIRPC support */
+	*proto4 = NFSCTL_ALLBITS;
+	*proto6 = 0;
+}
+#endif /* HAVE_LIBTIRPC */
 
 int
 main(int argc, char **argv)
 {
-	int	count = 1, c, error, port, fd, found_one;
-	struct servent *ent;
-	struct hostent *hp;
-	char *p;
-
-	ent = getservbyname ("nfs", "udp");
-	if (ent != NULL)
-		port = ntohs (ent->s_port);
-	else
-		port = 2049;
-
-	while ((c = getopt_long(argc, argv, "H:hN:p:P:TU", longopts, NULL)) != EOF) {
+	int	count = 1, c, error = 0, portnum = 0, fd, found_one;
+	char *p, *progname, *port;
+	char *haddr = NULL;
+	int	socket_up = 0;
+	int minorvers4 = NFSD_MAXMINORVERS4;	/* nfsv4 minor version */
+	unsigned int versbits = NFSCTL_ALLBITS;
+	unsigned int protobits = NFSCTL_ALLBITS;
+	unsigned int proto4 = 0;
+	unsigned int proto6 = 0;
+
+	progname = strdup(basename(argv[0]));
+	if (!progname) {
+		fprintf(stderr, "%s: unable to allocate memory.\n", argv[0]);
+		exit(1);
+	}
+
+	port = strdup("nfs");
+	if (!port) {
+		fprintf(stderr, "%s: unable to allocate memory.\n", progname);
+		exit(1);
+	}
+
+	xlog_syslog(0);
+	xlog_stderr(1);
+
+	while ((c = getopt_long(argc, argv, "dH:hN:p:P:sTU", longopts, NULL)) != EOF) {
 		switch(c) {
+		case 'd':
+			xlog_config(D_ALL, 1);
+			break;
 		case 'H':
-			if (inet_addr(optarg) != INADDR_NONE) {
-				haddr = strdup(optarg);
-			} else if ((hp = gethostbyname(optarg)) != NULL) {
-				haddr = inet_ntoa((*(struct in_addr*)(hp->h_addr_list[0])));
-			} else {
-				fprintf(stderr, "%s: Unknown hostname: %s\n",
-					argv[0], optarg);
-				usage(argv [0]);
+			/*
+			 * for now, this only handles one -H option. Use the
+			 * last one specified.
+			 */
+			free(haddr);
+			haddr = strdup(optarg);
+			if (!haddr) {
+				fprintf(stderr, "%s: unable to allocate "
+					"memory.\n", progname);
+				exit(1);
 			}
 			break;
 		case 'P':	/* XXX for nfs-server compatibility */
 		case 'p':
-			port = atoi(optarg);
-			if (port <= 0 || port > 65535) {
+			/* only the last -p option has any effect */
+			portnum = atoi(optarg);
+			if (portnum <= 0 || portnum > 65535) {
 				fprintf(stderr, "%s: bad port number: %s\n",
-					argv[0], optarg);
-				usage(argv [0]);
+					progname, optarg);
+				usage(progname);
+			}
+			free(port);
+			port = strdup(optarg);
+			if (!port) {
+				fprintf(stderr, "%s: unable to allocate "
+						"memory.\n", progname);
+				exit(1);
 			}
 			break;
 		case 'N':
@@ -96,80 +166,133 @@ main(int argc, char **argv)
 				exit(1);
 			}
 			break;
+		case 's':
+			xlog_syslog(1);
+			xlog_stderr(0);
+			break;
 		case 'T':
-				NFSCTL_TCPUNSET(protobits);
-				break;
+			NFSCTL_TCPUNSET(protobits);
+			break;
 		case 'U':
-				NFSCTL_UDPUNSET(protobits);
-				break;
+			NFSCTL_UDPUNSET(protobits);
+			break;
 		default:
 			fprintf(stderr, "Invalid argument: '%c'\n", c);
 		case 'h':
-			usage(argv[0]);
+			usage(progname);
 		}
 	}
-	/*
-	 * Do some sanity checking, if the ctlbits are set
-	 */
-	if (!NFSCTL_UDPISSET(protobits) && !NFSCTL_TCPISSET(protobits)) {
-		fprintf(stderr, "invalid protocol specified\n");
-		exit(1);
+
+	if (optind < argc) {
+		if ((count = atoi(argv[optind])) < 0) {
+			/* insane # of servers */
+			fprintf(stderr,
+				"%s: invalid server count (%d), using 1\n",
+				argv[0], count);
+			count = 1;
+		} else if (count == 0) {
+			/*
+			 * don't bother setting anything else if the threads
+			 * are coming down anyway.
+			 */
+			socket_up = 1;
+			goto set_threads;
+		}
 	}
+
+	xlog_open(progname);
+
+	nfsd_enable_protos(&proto4, &proto6);
+
+	if (!NFSCTL_TCPISSET(protobits)) {
+		NFSCTL_TCPUNSET(proto4);
+		NFSCTL_TCPUNSET(proto6);
+	}
+
+	if (!NFSCTL_UDPISSET(protobits)) {
+		NFSCTL_UDPUNSET(proto4);
+		NFSCTL_UDPUNSET(proto6);
+	}
+
+	/* make sure that at least one version is enabled */
 	found_one = 0;
 	for (c = NFSD_MINVERS; c <= NFSD_MAXVERS; c++) {
 		if (NFSCTL_VERISSET(versbits, c))
 			found_one = 1;
 	}
 	if (!found_one) {
-		fprintf(stderr, "no version specified\n");
+		xlog(L_ERROR, "no version specified");
 		exit(1);
 	}			
 
-	if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(protobits)) {
-		fprintf(stderr, "version 4 requires the TCP protocol\n");
+	if (NFSCTL_VERISSET(versbits, 4) &&
+	    !NFSCTL_TCPISSET(proto4) &&
+	    !NFSCTL_TCPISSET(proto6)) {
+		xlog(L_ERROR, "version 4 requires the TCP protocol");
 		exit(1);
 	}
-	if (haddr == NULL) {
-		struct in_addr in = {INADDR_ANY}; 
-		haddr = strdup(inet_ntoa(in));
-	}
 
 	if (chdir(NFS_STATEDIR)) {
-		fprintf(stderr, "%s: chdir(%s) failed: %s\n",
-			argv [0], NFS_STATEDIR, strerror(errno));
+		xlog(L_ERROR, "chdir(%s) failed: %m", NFS_STATEDIR);
 		exit(1);
 	}
 
-	if (optind < argc) {
-		if ((count = atoi(argv[optind])) < 0) {
-			/* insane # of servers */
-			fprintf(stderr,
-				"%s: invalid server count (%d), using 1\n",
-				argv[0], count);
-			count = 1;
-		}
+	/* can only change number of threads if nfsd is already up */
+	if (nfssvc_inuse()) {
+		socket_up = 1;
+		goto set_threads;
 	}
-	/* KLUDGE ALERT:
-	   Some kernels let nfsd kernel threads inherit open files
-	   from the program that spawns them (i.e. us).  So close
-	   everything before spawning kernel threads.  --Chip */
+
+	/*
+	 * must set versions before the fd's so that the right versions get
+	 * registered with rpcbind. Note that on older kernels w/o the right
+	 * interfaces, these are a no-op.
+	 */
+	nfssvc_setvers(versbits, minorvers4);
+ 
+	error = nfssvc_set_sockets(AF_INET, proto4, haddr, port);
+	if (!error)
+		socket_up = 1;
+
+#ifdef IPV6_SUPPORTED
+	error = nfssvc_set_sockets(AF_INET6, proto6, haddr, port);
+	if (!error)
+		socket_up = 1;
+#endif /* IPV6_SUPPORTED */
+
+set_threads:
+	/* don't start any threads if unable to hand off any sockets */
+	if (!socket_up) {
+		xlog(L_ERROR, "unable to set any sockets for nfsd");
+		goto out;
+	}
+	error = 0;
+
+	/*
+	 * KLUDGE ALERT:
+	 * Some kernels let nfsd kernel threads inherit open files
+	 * from the program that spawns them (i.e. us).  So close
+	 * everything before spawning kernel threads.  --Chip
+	 */
 	fd = open("/dev/null", O_RDWR);
 	if (fd == -1)
-		perror("/dev/null");
+		xlog(L_ERROR, "Unable to open /dev/null: %m");
 	else {
+		/* switch xlog output to syslog since stderr is being closed */
+		xlog_syslog(1);
+		xlog_stderr(0);
 		(void) dup2(fd, 0);
 		(void) dup2(fd, 1);
 		(void) dup2(fd, 2);
 	}
 	closeall(3);
 
-	openlog("nfsd", LOG_PID, LOG_DAEMON);
-	if ((error = nfssvc(port, count, versbits, minorvers4, protobits, haddr)) < 0) {
-		int e = errno;
-		syslog(LOG_ERR, "nfssvc: %s", strerror(e));
-		closelog();
-	}
-
+	if ((error = nfssvc_threads(portnum, count)) < 0)
+		xlog(L_ERROR, "error starting threads: errno %d (%m)", errno);
+out:
+	free(port);
+	free(haddr);
+	free(progname);
 	return (error != 0);
 }
 
@@ -177,7 +300,7 @@ static void
 usage(const char *prog)
 {
 	fprintf(stderr, "Usage:\n"
-		"%s [-H hostname] [-p|-P|--port port] [-N|--no-nfs-version version ] [-T|--no-tcp] [-U|--no-udp] nrservs\n", 
+		"%s [-d|--debug] [-H hostname] [-p|-P|--port port] [-N|--no-nfs-version version ] [-s|--syslog] [-T|--no-tcp] [-U|--no-udp] nrservs\n", 
 		prog);
 	exit(2);
 }
diff --git a/utils/nfsd/nfsd.man b/utils/nfsd/nfsd.man
index 4eb3e21..d8988d2 100644
--- a/utils/nfsd/nfsd.man
+++ b/utils/nfsd/nfsd.man
@@ -13,8 +13,9 @@ The
 program implements the user level part of the NFS service. The
 main functionality is handled by the
 .B nfsd
-kernel module; the user space program merely starts the specified
-number of kernel threads.
+kernel module. The user space program merely specifies what sort of sockets
+the kernel service should listen on, what NFS versions it should support, and
+how many kernel threads it should use.
 .P
 The
 .B rpc.mountd
@@ -22,6 +23,9 @@ server provides an ancillary service needed to satisfy mount requests
 by NFS clients.
 .SH OPTIONS
 .TP
+.B \-d " or " \-\-debug
+enable logging of debugging messages
+.TP
 .B \-H " or " \-\-host  hostname
 specify a particular hostname (or address) that NFS requests will
 be accepted on. By default,
@@ -45,6 +49,14 @@ does not offer certain versions of NFS. The current version of
 .B rpc.nfsd
 can support both NFS version 2,3 and the newer version 4.
 .TP
+.B \-s " or " \-\-syslog
+By default,
+.B rpc.nfsd
+logs error messages (and debug messages, if enabled) to stderr. This option makes 
+.B rpc.nfsd
+log these messages to syslog instead. Note that errors encountered during
+option processing will still be logged to stderr regardless of this option.
+.TP
 .B \-T " or " \-\-no-tcp
 Disable 
 .B rpc.nfsd 
@@ -75,12 +87,19 @@ In particular
 .B rpc.nfsd 0
 will stop all threads and thus close any open connections.
 
+.SH NOTES
+If the program is built with TI-RPC support, it will enable any protocol and
+address family combinations that are marked visible in the
+.B netconfig
+database.
+
 .SH SEE ALSO
 .BR rpc.mountd (8),
 .BR exports (5),
 .BR exportfs (8),
 .BR rpc.rquotad (8),
-.BR nfsstat (8).
+.BR nfsstat (8),
+.BR netconfig(5).
 .SH AUTHOR
 Olaf Kirch, Bill Hawes, H. J. Lu, G. Allan Morris III,
 and a host of others.
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
new file mode 100644
index 0000000..ee862b2
--- /dev/null
+++ b/utils/nfsd/nfssvc.c
@@ -0,0 +1,289 @@
+/*
+ * utils/nfsd/nfssvc.c
+ *
+ * Run an NFS daemon.
+ *
+ * Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "nfslib.h"
+#include "xlog.h"
+
+#define NFSD_PORTS_FILE     "/proc/fs/nfsd/portlist"
+#define NFSD_VERS_FILE    "/proc/fs/nfsd/versions"
+#define NFSD_THREAD_FILE  "/proc/fs/nfsd/threads"
+
+/*
+ * declaring a common static scratch buffer here keeps us from having to
+ * continually thrash the stack. The value of 128 bytes here is really just a
+ * SWAG and can be increased if necessary. It ought to be enough for the
+ * routines below however.
+ */
+char buf[128];
+
+/*
+ * Are there already sockets configured? If not, then it is safe to try to
+ * open some and pass them through.
+ *
+ * Note: If the user explicitly asked for 'udp', then we should probably check
+ * if that is open, and should open it if not. However we don't yet. All
+ * sockets have to be opened when the first daemon is started.
+ */
+int
+nfssvc_inuse(void)
+{
+	int fd, n;
+
+	fd = open(NFSD_PORTS_FILE, O_RDONLY);
+
+	/* problem opening file, assume that nothing is configured */
+	if (fd < 0)
+		return 0;
+
+	n = read(fd, buf, sizeof(buf));
+	close(fd);
+
+	xlog(D_GENERAL, "knfsd is currently %s", (n > 0) ? "up" : "down");
+
+	return (n > 0);
+}
+
+static int
+nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
+{
+	int fd, on = 1, fac = L_ERROR;
+	int sockfd = -1, rc = 0;
+	struct addrinfo *addrhead = NULL, *addr;
+	char *proto, *family;
+
+	/*
+	 * if file can't be opened, then assume that it's not available and
+	 * that the caller should just fall back to the old nfsctl interface
+ 	 */
+	fd = open(NFSD_PORTS_FILE, O_WRONLY);
+	if (fd < 0)
+		return 0;
+
+	switch(hints->ai_family) {
+	case AF_INET:
+		family = "inet";
+		break;
+#ifdef IPV6_SUPPORTED
+	case AF_INET6:
+		family = "inet6";
+		break;
+#endif /* IPV6_SUPPORTED */
+	default:
+		xlog(L_ERROR, "Unknown address family specified: %d\n",
+				hints->ai_family);
+		rc = EAFNOSUPPORT;
+		goto error;
+	}
+
+	rc = getaddrinfo(node, port, hints, &addrhead);
+	if (rc == EAI_NONAME && !strcmp(port, "nfs")) {
+		snprintf(buf, sizeof(buf), "%d", NFS_PORT);
+		rc = getaddrinfo(node, buf, hints, &addrhead);
+	}
+
+	if (rc != 0) {
+		xlog(L_ERROR, "unable to resolve %s:%s to %s address: "
+				"%s", node ? node : "ANYADDR", port, family,
+				rc == EAI_SYSTEM ? strerror(errno) :
+					gai_strerror(rc));
+		goto error;
+	}
+
+	addr = addrhead;
+	while(addr) {
+		/* skip non-TCP / non-UDP sockets */
+		switch(addr->ai_protocol) {
+		case IPPROTO_UDP:
+			proto = "UDP";
+			break;
+		case IPPROTO_TCP:
+			proto = "TCP";
+			break;
+		default:
+			addr = addr->ai_next;
+			continue;
+		}
+
+		xlog(D_GENERAL, "Creating %s %s socket.", family, proto);
+
+		/* open socket and prepare to hand it off to kernel */
+		sockfd = socket(addr->ai_family, addr->ai_socktype,
+				addr->ai_protocol);
+		if (sockfd < 0) {
+			xlog(L_ERROR, "unable to create %s %s socket: "
+				"errno %d (%m)", family, proto, errno);
+			rc = errno;
+			goto error;
+		}
+#ifdef IPV6_SUPPORTED
+		if (addr->ai_family == AF_INET6 &&
+		    setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on))) {
+			xlog(L_ERROR, "unable to set IPV6_V6ONLY: "
+				"errno %d (%m)\n", errno);
+			rc = errno;
+			goto error;
+		}
+#endif /* IPV6_SUPPORTED */
+		if (addr->ai_protocol == IPPROTO_TCP &&
+		    setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))) {
+			xlog(L_ERROR, "unable to set SO_REUSEADDR on %s "
+				"socket: errno %d (%m)", family, errno);
+			rc = errno;
+			goto error;
+		}
+		if (bind(sockfd, addr->ai_addr, addr->ai_addrlen)) {
+			xlog(L_ERROR, "unable to bind %s %s socket: "
+				"errno %d (%m)", family, proto, errno);
+			rc = errno;
+			goto error;
+		}
+		if (addr->ai_protocol == IPPROTO_TCP && listen(sockfd, 64)) {
+			xlog(L_ERROR, "unable to create listening socket: "
+				"errno %d (%m)", errno);
+			rc = errno;
+			goto error;
+		}
+
+		if (fd < 0)
+			fd = open(NFSD_PORTS_FILE, O_WRONLY);
+
+		if (fd < 0) {
+			xlog(L_ERROR, "couldn't open ports file: errno "
+				      "%d (%m)", errno);
+			goto error;
+		}
+
+		snprintf(buf, sizeof(buf), "%d\n", sockfd); 
+		if (write(fd, buf, strlen(buf)) != strlen(buf)) {
+			/*
+			 * this error may be common on older kernels that don't
+			 * support IPv6, so turn into a debug message.
+			 */
+			if (errno == EAFNOSUPPORT)
+				fac = D_ALL;
+			xlog(fac, "writing fd to kernel failed: errno %d (%m)",
+				  errno);
+			rc = errno;
+			goto error;
+		}
+		close(fd);
+		close(sockfd);
+		sockfd = fd = -1;
+		addr = addr->ai_next;
+	}
+error:
+	if (fd >= 0)
+		close(fd);
+	if (sockfd >= 0)
+		close(sockfd);
+	if (addrhead)
+		freeaddrinfo(addrhead);
+	return rc;
+}
+
+int
+nfssvc_set_sockets(const int family, const unsigned int protobits,
+		   const char *host, const char *port)
+{
+	struct addrinfo hints = { .ai_flags = AI_PASSIVE | AI_ADDRCONFIG };
+
+	hints.ai_family = family;
+
+	if (!NFSCTL_ANYPROTO(protobits))
+		return EPROTOTYPE;
+	else if (!NFSCTL_UDPISSET(protobits))
+		hints.ai_protocol = IPPROTO_TCP;
+	else if (!NFSCTL_TCPISSET(protobits))
+		hints.ai_protocol = IPPROTO_UDP;
+
+	return nfssvc_setfds(&hints, host, port);
+}
+
+void
+nfssvc_setvers(unsigned int ctlbits, int minorvers4)
+{
+	int fd, n, off;
+	char *ptr;
+
+	ptr = buf;
+	off = 0;
+	fd = open(NFSD_VERS_FILE, O_WRONLY);
+	if (fd < 0)
+		return;
+
+	for (n = NFSD_MINVERS; n <= NFSD_MAXVERS; n++) {
+		if (NFSCTL_VERISSET(ctlbits, n))
+		    off += snprintf(ptr+off, sizeof(buf) - off, "+%d ", n);
+		else
+		    off += snprintf(ptr+off, sizeof(buf) - off, "-%d ", n);
+	}
+	n = minorvers4 >= 0 ? minorvers4 : -minorvers4;
+	if (n >= NFSD_MINMINORVERS4 && n <= NFSD_MAXMINORVERS4)
+		    off += snprintf(ptr+off, sizeof(buf) - off, "%c4.%d",
+				    minorvers4 > 0 ? '+' : '-',
+				    n);
+	xlog(D_GENERAL, "Writing version string to kernel: %s", buf);
+	snprintf(ptr+off, sizeof(buf) - off, "\n");
+	if (write(fd, buf, strlen(buf)) != strlen(buf))
+		xlog(L_ERROR, "Setting version failed: errno %d (%m)", errno);
+
+	close(fd);
+
+	return;
+}
+
+int
+nfssvc_threads(unsigned short port, const int nrservs)
+{
+	struct nfsctl_arg	arg;
+	struct servent *ent;
+	ssize_t n;
+	int fd;
+
+	fd = open(NFSD_THREAD_FILE, O_WRONLY);
+	if (fd < 0)
+		fd = open("/proc/fs/nfs/threads", O_WRONLY);
+	if (fd >= 0) {
+		/* 2.5+ kernel with nfsd filesystem mounted.
+		 * Just write the number of threads.
+		 */
+		snprintf(buf, sizeof(buf), "%d\n", nrservs);
+		n = write(fd, buf, strlen(buf));
+		close(fd);
+		if (n != strlen(buf))
+			return -1;
+		else
+			return 0;
+	}
+
+	if (!port) {
+		ent = getservbyname("nfs", "udp");
+		if (ent != NULL)
+			port = ntohs(ent->s_port);
+		else
+			port = NFS_PORT;
+	}
+
+	arg.ca_version = NFSCTL_VERSION;
+	arg.ca_svc.svc_nthreads = nrservs;
+	arg.ca_svc.svc_port = port;
+	return nfsctl(NFSCTL_SVC, &arg, NULL);
+}
diff --git a/utils/nfsd/nfssvc.h b/utils/nfsd/nfssvc.h
new file mode 100644
index 0000000..0c69bd6
--- /dev/null
+++ b/utils/nfsd/nfssvc.h
@@ -0,0 +1,27 @@
+/*
+ *   utils/nfsd/nfssvc.h -- nfs service control routines for rpc.nfsd
+ *
+ *   Copyright (C) 2009 Red Hat, Inc <nfs at redhat.com>.
+ *   Copyright (C) 2009 Jeff Layton <jlayton at redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+int	nfssvc_inuse(void);
+int	nfssvc_set_sockets(const int family, const unsigned int protobits,
+			   const char *host, const char *port);
+void	nfssvc_setvers(unsigned int ctlbits, int minorvers4);
+int	nfssvc_threads(unsigned short port, int nrservs);


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- nfs-utils.spec	28 Jul 2009 12:33:38 -0000	1.238
+++ nfs-utils.spec	16 Aug 2009 20:03:23 -0000	1.239
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -25,7 +25,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 Patch100: nfs-utils-1.2.1-rc1.patch
 Patch101: nfs-utils-1.2.1-rc2.patch
 Patch102: nfs-utils-1.2.0-proots-rel5.patch
-Patch103: nfs-utils-1.2.0-nfsd-41vers.patch
+Patch103: nfs-utils-1.2.1-rc3.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -249,35 +249,44 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Tue Jul 28 2009 <steved at redhat.com> 1.2.0-8
+* Fri Aug 14 2009 Steve Dickson <steved at redhat.com> 1.2.0-9
+- Added upstream 1.2.1-rc3 patch
+  - Add IPv6 support to nfsd
+  - Allow nfssvc_setfds to properly deal with AF_INET6
+  - Convert nfssvc_setfds to use getaddrinfo
+  - Move check for active knfsd to helper function
+  - Declare a static common buffer for nfssvc.c routine
+  - Convert rpc.nfsd to use xlog() and add --debug and --syslog options
+
+* Tue Jul 28 2009 Steve Dickson <steved at redhat.com> 1.2.0-8
 - Fixed 4.1 versioning problem (bz 512377)
 
-* Wed Jul 15 2009 <steved at redhat.com> 1.2.0-7
+* Wed Jul 15 2009 Steve Dickson <steved at redhat.com> 1.2.0-7
 - Added upstream 1.2.1-rc2 patch
   - A large number of mount command changes.
 
-* Mon Jul 13 2009 <steved at redhat.com> 1.2.0-6
+* Mon Jul 13 2009 Steve Dickson <steved at redhat.com> 1.2.0-6
 - Added NFSD v4 dynamic pseudo root patch which allows
   NFS v3 exports to be mounted by v4 clients.
 
-* Mon Jun 29 2009 <steved at redhat.com> 1.2.0-5
+* Mon Jun 29 2009 Steve Dickson <steved at redhat.com> 1.2.0-5
 - Stopped rpc.idmapd from spinning (bz 508221)
 
-* Mon Jun 22 2009 <steved at redhat.com> 1.2.0-4
+* Mon Jun 22 2009 Steve Dickson <steved at redhat.com> 1.2.0-4
 - Added upstream 1.2.1-rc1 patch 
   - Fix to check in closeall()
   - Make --enable-tirpc the default
   - Set all verbose types in gssd daemons
   - Retry exports if getfh() fails
 
-* Wed Jun 10 2009 <steved at redhat.com> 1.2.0-3
+* Wed Jun 10 2009 Steve Dickson <steved at redhat.com> 1.2.0-3
 - Updated init scripts to add dependencies
   on other system facilities (bz 475133)
 
-* Wed Jun 10 2009 <steved at redhat.com> 1.2.0-2
+* Wed Jun 10 2009 Steve Dickson <steved at redhat.com> 1.2.0-2
 - nfsnobody gid is wrong (bz 485379)
 
-* Tue Jun  2 2009 <steved at redhat.com> 1.2.0-1
+* Tue Jun  2 2009 Steve Dickson <steved at redhat.com> 1.2.0-1
 - Updated to latest upstream release: 1.2.0
 
 * Tue May 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.6-4


--- nfs-utils-1.2.0-nfsd-41vers.patch DELETED ---



From dmaphy at fedoraproject.org  Sun Aug 16 20:03:42 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 20:03:42 +0000 (UTC)
Subject: rpms/geany/F-10 geany.spec,1.27,1.28
Message-ID: <20090816200342.0C48211C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1734

Modified Files:
	geany.spec 
Log Message:
update icon cache



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/F-10/geany.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- geany.spec	16 Aug 2009 19:20:54 -0000	1.27
+++ geany.spec	16 Aug 2009 20:03:41 -0000	1.28
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -74,6 +74,18 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/geany/*
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-2
+- update icon cache
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-1
 - new upstream release
 - remove button pixmaps patch since this fix is included in 0.18
@@ -157,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Mar 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-2
 - Fix docdir/doc_dir so geany correctly finds the system installed html docs (BZ
-  438534) 
+  438534)
 
 * Sun Feb 24 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.13-1
 - Update to version 0.13



From dmaphy at fedoraproject.org  Sun Aug 16 20:30:48 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 20:30:48 +0000 (UTC)
Subject: rpms/geany/devel geany.spec,1.32,1.33
Message-ID: <20090816203048.ACED911C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7516

Modified Files:
	geany.spec 
Log Message:
bump the release to correct the update path



Index: geany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany/devel/geany.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- geany.spec	16 Aug 2009 20:01:42 -0000	1.32
+++ geany.spec	16 Aug 2009 20:30:48 -0000	1.33
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.18
-Release:   2%{?dist}
+Release:   6%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-6
+- release bump to correct the update path
+
 * Sun Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> - 0.18-2
 - update icon cache
 



From dmaphy at fedoraproject.org  Sun Aug 16 21:03:50 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 21:03:50 +0000 (UTC)
Subject: rpms/geany-plugins/F-11 geany-plugins.spec,1.1,1.2
Message-ID: <20090816210350.0B6BF11C0262@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-serv13804

Modified Files:
	geany-plugins.spec 
Log Message:
rebuilt against geany 0.18 and require geany 0.18



Index: geany-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-11/geany-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- geany-plugins.spec	31 Jul 2009 19:49:42 -0000	1.1
+++ geany-plugins.spec	16 Aug 2009 21:03:49 -0000	1.2
@@ -1,9 +1,9 @@
 %global geany_plug_docdir %{_defaultdocdir}/%{name}-%{version}
-%global req_geany_ver 0.16
+%global req_geany_ver 0.18
 
 Name:           geany-plugins
 Version:        0.17.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plugins for Geany
 
 Group:          Development/Tools
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-5
+- build against and require geany 0.18
+
 * Sat Jul 25 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-4
 - write BuildRequires at the beginning of this file
 



From dmaphy at fedoraproject.org  Sun Aug 16 21:08:19 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sun, 16 Aug 2009 21:08:19 +0000 (UTC)
Subject: rpms/geany-plugins/devel geany-plugins.spec,1.2,1.3
Message-ID: <20090816210819.AE80111C0262@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14368

Modified Files:
	geany-plugins.spec 
Log Message:
built against and require geany 0.18



Index: geany-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/geany-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- geany-plugins.spec	10 Aug 2009 19:31:36 -0000	1.2
+++ geany-plugins.spec	16 Aug 2009 21:08:19 -0000	1.3
@@ -1,9 +1,9 @@
 %global geany_plug_docdir %{_defaultdocdir}/%{name}-%{version}
-%global req_geany_ver 0.16
+%global req_geany_ver 0.18
 
 Name:           geany-plugins
 Version:        0.17.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plugins for Geany
 
 Group:          Development/Tools
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-6
+- build against and require geany 0.18
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.17.1-5
 - Use bzipped upstream tarball.
 



From terjeros at fedoraproject.org  Sun Aug 16 21:11:14 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun, 16 Aug 2009 21:11:14 +0000 (UTC)
Subject: rpms/smokeping/devel smokeping-2.4.2-scriptname.patch, NONE,
	1.1 smokeping.spec, 1.3, 1.4
Message-ID: <20090816211115.0532411C0262@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/smokeping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15115

Modified Files:
	smokeping.spec 
Added Files:
	smokeping-2.4.2-scriptname.patch 
Log Message:
* Sun Aug 16 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-10
- Add patch to fix #497746


smokeping-2.4.2-scriptname.patch:
 Smokeping.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smokeping-2.4.2-scriptname.patch ---
diff -uNr -x '*~' smokeping-2.4.2.orig/lib/Smokeping.pm smokeping-2.4.2/lib/Smokeping.pm
--- smokeping-2.4.2.orig/lib/Smokeping.pm	2008-07-24 19:37:05.000000000 +0200
+++ smokeping-2.4.2/lib/Smokeping.pm	2009-08-16 23:00:27.000000000 +0200
@@ -73,7 +73,7 @@
 }
 
 sub dummyCGI::script_name {
-    return wantarray ? () : "";
+    return "sorry_no_script_name_when_running_offline";
 }
 
 sub load_probes ($){


Index: smokeping.spec
===================================================================
RCS file: /cvs/extras/rpms/smokeping/devel/smokeping.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- smokeping.spec	27 Jul 2009 04:30:01 -0000	1.3
+++ smokeping.spec	16 Aug 2009 21:11:14 -0000	1.4
@@ -7,7 +7,7 @@
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
 Version:          2.4.2
-Release:          9%{?dist}
+Release:          10%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -22,6 +22,7 @@ Patch1:           smokeping-2.4.2-config
 Patch2:           smokeping-2.4.2-tr.patch
 Patch3:           smokeping-2.3.5-silence.patch
 Patch4:           smokeping-2.4.2-jsonrpc-strict.patch
+Patch5:           smokeping-2.4.2-scriptname.patch
 BuildRequires:    glibc-common
 Requires:         perl >= 5.6.1 rrdtool >= 1.0.33 fping >= 2.4b2 traceroute
 # Not picked up for some reason
@@ -45,6 +46,7 @@ which presents the graphs.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__install} -p -m 0644 %{SOURCE5} . 
 iconv -f ISO-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES
@@ -132,6 +134,9 @@ fi
 %attr(0755, apache, root) %{_localstatedir}/lib/%{name}/images
 
 %changelog
+* Sun Aug 16 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-10
+- Add patch to fix #497746
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -149,9 +154,9 @@ fi
 - move Qooxdoo::JSONRPC to separate package
 
 * Tue Sep 16 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-4
-- use mv macro
-- fix cut-n-paste error in rm lines
-- remove perl as buildreq
+- Use mv macro
+- Fix cut-n-paste error in rm lines
+- Remove perl as buildreq
 
 * Mon Sep 15 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-3
 - Fix perms on writeable dir for apache



From terjeros at fedoraproject.org  Sun Aug 16 21:18:03 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun, 16 Aug 2009 21:18:03 +0000 (UTC)
Subject: rpms/smokeping/F-10 smokeping-2.4.2-scriptname.patch, NONE,
	1.1 smokeping.spec, 1.1, 1.2
Message-ID: <20090816211803.9663811C0262@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/smokeping/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16164/F-10

Modified Files:
	smokeping.spec 
Added Files:
	smokeping-2.4.2-scriptname.patch 
Log Message:
Sync with rawhide.



smokeping-2.4.2-scriptname.patch:
 Smokeping.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smokeping-2.4.2-scriptname.patch ---
diff -uNr -x '*~' smokeping-2.4.2.orig/lib/Smokeping.pm smokeping-2.4.2/lib/Smokeping.pm
--- smokeping-2.4.2.orig/lib/Smokeping.pm	2008-07-24 19:37:05.000000000 +0200
+++ smokeping-2.4.2/lib/Smokeping.pm	2009-08-16 23:00:27.000000000 +0200
@@ -73,7 +73,7 @@
 }
 
 sub dummyCGI::script_name {
-    return wantarray ? () : "";
+    return "sorry_no_script_name_when_running_offline";
 }
 
 sub load_probes ($){


Index: smokeping.spec
===================================================================
RCS file: /cvs/extras/rpms/smokeping/F-10/smokeping.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- smokeping.spec	27 Oct 2008 20:33:24 -0000	1.1
+++ smokeping.spec	16 Aug 2009 21:18:03 -0000	1.2
@@ -7,7 +7,7 @@
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
 Version:          2.4.2
-Release:          7%{?dist}
+Release:          10%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -22,6 +22,7 @@ Patch1:           smokeping-2.4.2-config
 Patch2:           smokeping-2.4.2-tr.patch
 Patch3:           smokeping-2.3.5-silence.patch
 Patch4:           smokeping-2.4.2-jsonrpc-strict.patch
+Patch5:           smokeping-2.4.2-scriptname.patch
 BuildRequires:    glibc-common
 Requires:         perl >= 5.6.1 rrdtool >= 1.0.33 fping >= 2.4b2 traceroute
 # Not picked up for some reason
@@ -45,6 +46,7 @@ which presents the graphs.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__install} -p -m 0644 %{SOURCE5} . 
 iconv -f ISO-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES
@@ -132,6 +134,15 @@ fi
 %attr(0755, apache, root) %{_localstatedir}/lib/%{name}/images
 
 %changelog
+* Sun Aug 16 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-10
+- Add patch to fix #497746
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Oct 27 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-7
 - Add some SELinux information, thanks to wolfy for help
   with this and other improvements.
@@ -143,9 +154,9 @@ fi
 - move Qooxdoo::JSONRPC to separate package
 
 * Tue Sep 16 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-4
-- use mv macro
-- fix cut-n-paste error in rm lines
-- remove perl as buildreq
+- Use mv macro
+- Fix cut-n-paste error in rm lines
+- Remove perl as buildreq
 
 * Mon Sep 15 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-3
 - Fix perms on writeable dir for apache



From terjeros at fedoraproject.org  Sun Aug 16 21:18:03 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Sun, 16 Aug 2009 21:18:03 +0000 (UTC)
Subject: rpms/smokeping/F-11 smokeping-2.4.2-scriptname.patch, NONE,
	1.1 smokeping.spec, 1.2, 1.3
Message-ID: <20090816211803.BCEC111C02C3@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/smokeping/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16164/F-11

Modified Files:
	smokeping.spec 
Added Files:
	smokeping-2.4.2-scriptname.patch 
Log Message:
Sync with rawhide.



smokeping-2.4.2-scriptname.patch:
 Smokeping.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smokeping-2.4.2-scriptname.patch ---
diff -uNr -x '*~' smokeping-2.4.2.orig/lib/Smokeping.pm smokeping-2.4.2/lib/Smokeping.pm
--- smokeping-2.4.2.orig/lib/Smokeping.pm	2008-07-24 19:37:05.000000000 +0200
+++ smokeping-2.4.2/lib/Smokeping.pm	2009-08-16 23:00:27.000000000 +0200
@@ -73,7 +73,7 @@
 }
 
 sub dummyCGI::script_name {
-    return wantarray ? () : "";
+    return "sorry_no_script_name_when_running_offline";
 }
 
 sub load_probes ($){


Index: smokeping.spec
===================================================================
RCS file: /cvs/extras/rpms/smokeping/F-11/smokeping.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- smokeping.spec	26 Feb 2009 01:42:34 -0000	1.2
+++ smokeping.spec	16 Aug 2009 21:18:03 -0000	1.3
@@ -7,7 +7,7 @@
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
 Version:          2.4.2
-Release:          8%{?dist}
+Release:          10%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -22,6 +22,7 @@ Patch1:           smokeping-2.4.2-config
 Patch2:           smokeping-2.4.2-tr.patch
 Patch3:           smokeping-2.3.5-silence.patch
 Patch4:           smokeping-2.4.2-jsonrpc-strict.patch
+Patch5:           smokeping-2.4.2-scriptname.patch
 BuildRequires:    glibc-common
 Requires:         perl >= 5.6.1 rrdtool >= 1.0.33 fping >= 2.4b2 traceroute
 # Not picked up for some reason
@@ -45,6 +46,7 @@ which presents the graphs.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__install} -p -m 0644 %{SOURCE5} . 
 iconv -f ISO-8859-1 -t utf-8 -o CHANGES.utf8 CHANGES
@@ -132,6 +134,12 @@ fi
 %attr(0755, apache, root) %{_localstatedir}/lib/%{name}/images
 
 %changelog
+* Sun Aug 16 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-10
+- Add patch to fix #497746
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -146,9 +154,9 @@ fi
 - move Qooxdoo::JSONRPC to separate package
 
 * Tue Sep 16 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-4
-- use mv macro
-- fix cut-n-paste error in rm lines
-- remove perl as buildreq
+- Use mv macro
+- Fix cut-n-paste error in rm lines
+- Remove perl as buildreq
 
 * Mon Sep 15 2008 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-3
 - Fix perms on writeable dir for apache



From kyle at fedoraproject.org  Sun Aug 16 22:09:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sun, 16 Aug 2009 22:09:02 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1720,1.1721 perf,1.2,1.3
Message-ID: <20090816220902.9DD2F11C0262@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25875

Modified Files:
	kernel.spec perf 
Log Message:
* Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
- Improve the perf script so it prints something helpful if the
  perf binary doesn't exist.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1720
retrieving revision 1.1721
diff -u -p -r1.1720 -r1.1721
--- kernel.spec	16 Aug 2009 03:21:52 -0000	1.1720
+++ kernel.spec	16 Aug 2009 22:09:02 -0000	1.1721
@@ -1969,6 +1969,10 @@ fi
 # and build.
 
 %changelog
+* Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
+- Improve the perf script so it prints something helpful if the
+  perf binary doesn't exist.
+
 * Sat Aug 15 2009 Dave Jones <davej at redhat.com> 2.6.31-0.157.rc6
 - Disable KSM patches on a hunch.  Chasing the "encrypted VGs don't work" bug.
 


Index: perf
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/perf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perf	13 Aug 2009 18:09:59 -0000	1.2
+++ perf	16 Aug 2009 22:09:02 -0000	1.3
@@ -1,2 +1,9 @@
 #!/bin/sh
-exec /usr/libexec/perf.$(uname -r)
+
+PERF="/usr/libexec/perf.$(uname -r)"
+
+if [ -x $PERF ]; then
+	exec $PERF;
+else
+	echo "Sorry, your kernel doesn't support perf.";
+fi



From robert at fedoraproject.org  Sun Aug 16 22:43:43 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 16 Aug 2009 22:43:43 +0000 (UTC)
Subject: rpms/bitlbee/EL-5 bitlbee-1.2.3-libresolv.patch, NONE,
	1.1 bitlbee-wrapper.h, NONE, 1.1 bitlbee.spec, 1.7,
	1.8 bitlbee-1.2.2-libresolv.patch, 1.1, NONE
Message-ID: <20090816224343.B553311C0262@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/EL-5

Modified Files:
	bitlbee.spec 
Added Files:
	bitlbee-1.2.3-libresolv.patch bitlbee-wrapper.h 
Removed Files:
	bitlbee-1.2.2-libresolv.patch 
Log Message:
- Updated libresolv patch to not segfault when connecting to the Jabber/XMPP server if there's no SRV record (#506719, #501786)
- Added -devel subpackage with header files for plugins (#504882)


bitlbee-1.2.3-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.3-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.3/configure			2008-08-27 00:36:44.000000000 +0200
+++ bitlbee-1.2.3/configure.libresolv		2008-08-27 19:52:00.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.3/lib/Makefile			2008-03-02 18:10:16.000000000 +0100
+++ bitlbee-1.2.3/lib/Makefile.libresolv	2008-06-28 17:24:51.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.3/lib/misc.c			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.c.libresolv		2008-06-28 17:25:44.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"
@@ -465,58 +466,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.3/lib/misc.h			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.h.libresolv		2008-06-28 17:26:24.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.3/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/Makefile			2008-09-06 14:33:14.000000000 +0200
+++ bitlbee-1.2.3/Makefile.libresolv		2009-06-12 00:34:51.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.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 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)


--- NEW FILE bitlbee-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because config.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "config-i386.h"
#elif defined(__ia64__)
#include "config-ia64.h"
#elif defined(__powerpc64__)
#include "config-ppc64.h"
#elif defined(__powerpc__)
#include "config-ppc.h"
#elif defined(__s390x__)
#include "config-s390x.h"
#elif defined(__s390__)
#include "config-s390.h"
#elif defined(__x86_64__)
#include "config-x86_64.h"
#elif defined(__alpha__)
#include "config-alpha.h"
#elif defined(__arm__)
#include "config-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "config-sparc64.h"
#elif defined(__sparc__)
#include "config-sparc.h"
#elif defined(__hppa__) && defined(__LP64__)
#include "config-parisc64.h"
#elif defined(__hppa__)
#include "config-parisc.h"
#elif defined(__mips__)
#include "config-mips.h"
#elif defined(__mipsel__)
#include "config-mipsel.h"
#elif defined(__mips64__)
#include "config-mipsx.h"
#elif defined(__sh64__)
#include "config-sh64.h"
#elif defined(__sh__)
#include "config-sh.h"
#else
#error "This bitlbee-devel package does not work your architecture?"
#endif


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/bitlbee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bitlbee.spec	7 Sep 2008 20:02:45 -0000	1.7
+++ bitlbee.spec	16 Aug 2009 22:43:43 -0000	1.8
@@ -1,18 +1,19 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           1.2.3
-Release:           1%{?dist}
+Release:           4%{?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
-Patch0:            bitlbee-1.2.2-libresolv.patch
+Source2:           bitlbee-wrapper.h
+Patch0:            bitlbee-1.2.3-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
 BuildRequires:     gnutls-devel
 %else
 BuildRequires:     openssl-devel
@@ -24,6 +25,15 @@ Bitlbee is an IRC to other chat networks
 an IRC server which forwards everything you say to people on other chat
 networks like ICQ, MSN, Jabber or Yahoo!
 
+%package devel
+Summary:           Development files for bitlbee
+Group:             Development/Libraries
+Requires:          %{name} = %{version}-%{release}, pkgconfig
+
+%description devel
+The bitlbee-devel package includes header files necessary for building and
+developing programs and plugins which use bitlbee.
+
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
@@ -33,6 +43,9 @@ perl -pi.make -e '
                 s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                 s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                 s|\$\(MANDIR\)|\$(mandir)|g;
+                s|\$\(INCLUDEDIR\)|\$(includedir)/%{name}|g;
+                s|\$\(PCDIR\)|\$(libdir)/pkgconfig|g;
+                s|install -m|install -p -m|g;
         ' Makefile */Makefile */*/Makefile
 
 %build
@@ -43,9 +56,11 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --mandir=%{_mandir} \
         --datadir=%{_datadir}/%{name} \
         --config=%{_localstatedir}/lib/%{name} \
+        --pcdir=%{_libdir}/pkgconfig \
+        --plugindir=%{_libdir}/%{name} \
         --strip=0 \
         --plugins=1 \
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
         --ssl=gnutls
 %else
         --ssl=openssl
@@ -55,18 +70,26 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}
+%makeinstall install-dev
 
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
-install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+# Install some files manually to their correct destination
+mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
+install -D -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+
+# Hack to allow parallel install of 32 bit and 64 bit -devel packages
+%if 0%{?fedora}%{?rhel}
+mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config{,-%{_arch}}.h
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+%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
 mv -f doc/CHANGES.utf8 doc/CHANGES
+
 iconv -f iso-8859-1 -t utf-8 -o doc/CREDITS.utf8 doc/CREDITS
+touch -c -r doc/CREDITS doc/CREDITS.utf8
 mv -f doc/CREDITS.utf8 doc/CREDITS
 
 %pre
@@ -83,18 +106,36 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
 %doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %{_sbindir}/%{name}
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_mandir}/man?/%{name}*
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
+%files devel
+%defattr(-,root,root,-)
+%doc doc/example_plugin.c
+%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
 %changelog
+* 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)
+- Added -devel subpackage with header files for plugins (#504882)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
 - Upgrade to 1.2.3 (#461424)
 


--- bitlbee-1.2.2-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sun Aug 16 22:43:43 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 16 Aug 2009 22:43:43 +0000 (UTC)
Subject: rpms/bitlbee/EL-4 bitlbee-1.2.3-libresolv.patch, NONE,
	1.1 bitlbee-wrapper.h, NONE, 1.1 bitlbee.spec, 1.7,
	1.8 bitlbee-1.2.2-libresolv.patch, 1.1, NONE
Message-ID: <20090816224343.9A00D11C0262@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/EL-4

Modified Files:
	bitlbee.spec 
Added Files:
	bitlbee-1.2.3-libresolv.patch bitlbee-wrapper.h 
Removed Files:
	bitlbee-1.2.2-libresolv.patch 
Log Message:
- Updated libresolv patch to not segfault when connecting to the Jabber/XMPP server if there's no SRV record (#506719, #501786)
- Added -devel subpackage with header files for plugins (#504882)


bitlbee-1.2.3-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.3-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.3/configure			2008-08-27 00:36:44.000000000 +0200
+++ bitlbee-1.2.3/configure.libresolv		2008-08-27 19:52:00.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.3/lib/Makefile			2008-03-02 18:10:16.000000000 +0100
+++ bitlbee-1.2.3/lib/Makefile.libresolv	2008-06-28 17:24:51.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.3/lib/misc.c			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.c.libresolv		2008-06-28 17:25:44.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"
@@ -465,58 +466,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.3/lib/misc.h			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.h.libresolv		2008-06-28 17:26:24.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.3/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/Makefile			2008-09-06 14:33:14.000000000 +0200
+++ bitlbee-1.2.3/Makefile.libresolv		2009-06-12 00:34:51.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.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 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)


--- NEW FILE bitlbee-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because config.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "config-i386.h"
#elif defined(__ia64__)
#include "config-ia64.h"
#elif defined(__powerpc64__)
#include "config-ppc64.h"
#elif defined(__powerpc__)
#include "config-ppc.h"
#elif defined(__s390x__)
#include "config-s390x.h"
#elif defined(__s390__)
#include "config-s390.h"
#elif defined(__x86_64__)
#include "config-x86_64.h"
#elif defined(__alpha__)
#include "config-alpha.h"
#elif defined(__arm__)
#include "config-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "config-sparc64.h"
#elif defined(__sparc__)
#include "config-sparc.h"
#elif defined(__hppa__) && defined(__LP64__)
#include "config-parisc64.h"
#elif defined(__hppa__)
#include "config-parisc.h"
#elif defined(__mips__)
#include "config-mips.h"
#elif defined(__mipsel__)
#include "config-mipsel.h"
#elif defined(__mips64__)
#include "config-mipsx.h"
#elif defined(__sh64__)
#include "config-sh64.h"
#elif defined(__sh__)
#include "config-sh.h"
#else
#error "This bitlbee-devel package does not work your architecture?"
#endif


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/bitlbee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bitlbee.spec	7 Sep 2008 20:02:45 -0000	1.7
+++ bitlbee.spec	16 Aug 2009 22:43:43 -0000	1.8
@@ -1,18 +1,19 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           1.2.3
-Release:           1%{?dist}
+Release:           4%{?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
-Patch0:            bitlbee-1.2.2-libresolv.patch
+Source2:           bitlbee-wrapper.h
+Patch0:            bitlbee-1.2.3-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
 BuildRequires:     gnutls-devel
 %else
 BuildRequires:     openssl-devel
@@ -24,6 +25,15 @@ Bitlbee is an IRC to other chat networks
 an IRC server which forwards everything you say to people on other chat
 networks like ICQ, MSN, Jabber or Yahoo!
 
+%package devel
+Summary:           Development files for bitlbee
+Group:             Development/Libraries
+Requires:          %{name} = %{version}-%{release}, pkgconfig
+
+%description devel
+The bitlbee-devel package includes header files necessary for building and
+developing programs and plugins which use bitlbee.
+
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
@@ -33,6 +43,9 @@ perl -pi.make -e '
                 s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                 s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                 s|\$\(MANDIR\)|\$(mandir)|g;
+                s|\$\(INCLUDEDIR\)|\$(includedir)/%{name}|g;
+                s|\$\(PCDIR\)|\$(libdir)/pkgconfig|g;
+                s|install -m|install -p -m|g;
         ' Makefile */Makefile */*/Makefile
 
 %build
@@ -43,9 +56,11 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --mandir=%{_mandir} \
         --datadir=%{_datadir}/%{name} \
         --config=%{_localstatedir}/lib/%{name} \
+        --pcdir=%{_libdir}/pkgconfig \
+        --plugindir=%{_libdir}/%{name} \
         --strip=0 \
         --plugins=1 \
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
         --ssl=gnutls
 %else
         --ssl=openssl
@@ -55,18 +70,26 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}
+%makeinstall install-dev
 
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
-install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+# Install some files manually to their correct destination
+mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
+install -D -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+
+# Hack to allow parallel install of 32 bit and 64 bit -devel packages
+%if 0%{?fedora}%{?rhel}
+mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config{,-%{_arch}}.h
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+%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
 mv -f doc/CHANGES.utf8 doc/CHANGES
+
 iconv -f iso-8859-1 -t utf-8 -o doc/CREDITS.utf8 doc/CREDITS
+touch -c -r doc/CREDITS doc/CREDITS.utf8
 mv -f doc/CREDITS.utf8 doc/CREDITS
 
 %pre
@@ -83,18 +106,36 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
 %doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %{_sbindir}/%{name}
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_mandir}/man?/%{name}*
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
+%files devel
+%defattr(-,root,root,-)
+%doc doc/example_plugin.c
+%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
 %changelog
+* 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)
+- Added -devel subpackage with header files for plugins (#504882)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
 - Upgrade to 1.2.3 (#461424)
 


--- bitlbee-1.2.2-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sun Aug 16 22:43:44 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 16 Aug 2009 22:43:44 +0000 (UTC)
Subject: rpms/bitlbee/F-11 bitlbee-1.2.3-libresolv.patch, NONE,
	1.1 bitlbee-wrapper.h, NONE, 1.1 bitlbee.spec, 1.10,
	1.11 bitlbee-1.2.2-libresolv.patch, 1.1, NONE
Message-ID: <20090816224344.3ECA211C02C3@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/F-11

Modified Files:
	bitlbee.spec 
Added Files:
	bitlbee-1.2.3-libresolv.patch bitlbee-wrapper.h 
Removed Files:
	bitlbee-1.2.2-libresolv.patch 
Log Message:
- Updated libresolv patch to not segfault when connecting to the Jabber/XMPP server if there's no SRV record (#506719, #501786)
- Added -devel subpackage with header files for plugins (#504882)


bitlbee-1.2.3-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.3-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.3/configure			2008-08-27 00:36:44.000000000 +0200
+++ bitlbee-1.2.3/configure.libresolv		2008-08-27 19:52:00.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.3/lib/Makefile			2008-03-02 18:10:16.000000000 +0100
+++ bitlbee-1.2.3/lib/Makefile.libresolv	2008-06-28 17:24:51.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.3/lib/misc.c			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.c.libresolv		2008-06-28 17:25:44.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"
@@ -465,58 +466,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.3/lib/misc.h			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.h.libresolv		2008-06-28 17:26:24.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.3/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/Makefile			2008-09-06 14:33:14.000000000 +0200
+++ bitlbee-1.2.3/Makefile.libresolv		2009-06-12 00:34:51.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.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 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)


--- NEW FILE bitlbee-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because config.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "config-i386.h"
#elif defined(__ia64__)
#include "config-ia64.h"
#elif defined(__powerpc64__)
#include "config-ppc64.h"
#elif defined(__powerpc__)
#include "config-ppc.h"
#elif defined(__s390x__)
#include "config-s390x.h"
#elif defined(__s390__)
#include "config-s390.h"
#elif defined(__x86_64__)
#include "config-x86_64.h"
#elif defined(__alpha__)
#include "config-alpha.h"
#elif defined(__arm__)
#include "config-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "config-sparc64.h"
#elif defined(__sparc__)
#include "config-sparc.h"
#elif defined(__hppa__) && defined(__LP64__)
#include "config-parisc64.h"
#elif defined(__hppa__)
#include "config-parisc.h"
#elif defined(__mips__)
#include "config-mips.h"
#elif defined(__mipsel__)
#include "config-mipsel.h"
#elif defined(__mips64__)
#include "config-mipsx.h"
#elif defined(__sh64__)
#include "config-sh64.h"
#elif defined(__sh__)
#include "config-sh.h"
#else
#error "This bitlbee-devel package does not work your architecture?"
#endif


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-11/bitlbee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bitlbee.spec	23 Feb 2009 20:12:01 -0000	1.10
+++ bitlbee.spec	16 Aug 2009 22:43:44 -0000	1.11
@@ -1,18 +1,19 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           1.2.3
-Release:           2%{?dist}
+Release:           4%{?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
-Patch0:            bitlbee-1.2.2-libresolv.patch
+Source2:           bitlbee-wrapper.h
+Patch0:            bitlbee-1.2.3-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
 BuildRequires:     gnutls-devel
 %else
 BuildRequires:     openssl-devel
@@ -24,6 +25,15 @@ Bitlbee is an IRC to other chat networks
 an IRC server which forwards everything you say to people on other chat
 networks like ICQ, MSN, Jabber or Yahoo!
 
+%package devel
+Summary:           Development files for bitlbee
+Group:             Development/Libraries
+Requires:          %{name} = %{version}-%{release}, pkgconfig
+
+%description devel
+The bitlbee-devel package includes header files necessary for building and
+developing programs and plugins which use bitlbee.
+
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
@@ -33,6 +43,9 @@ perl -pi.make -e '
                 s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                 s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                 s|\$\(MANDIR\)|\$(mandir)|g;
+                s|\$\(INCLUDEDIR\)|\$(includedir)/%{name}|g;
+                s|\$\(PCDIR\)|\$(libdir)/pkgconfig|g;
+                s|install -m|install -p -m|g;
         ' Makefile */Makefile */*/Makefile
 
 %build
@@ -43,9 +56,11 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --mandir=%{_mandir} \
         --datadir=%{_datadir}/%{name} \
         --config=%{_localstatedir}/lib/%{name} \
+        --pcdir=%{_libdir}/pkgconfig \
+        --plugindir=%{_libdir}/%{name} \
         --strip=0 \
         --plugins=1 \
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
         --ssl=gnutls
 %else
         --ssl=openssl
@@ -55,18 +70,26 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}
+%makeinstall install-dev
 
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
-install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+# Install some files manually to their correct destination
+mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
+install -D -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+
+# Hack to allow parallel install of 32 bit and 64 bit -devel packages
+%if 0%{?fedora}%{?rhel}
+mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config{,-%{_arch}}.h
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+%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
 mv -f doc/CHANGES.utf8 doc/CHANGES
+
 iconv -f iso-8859-1 -t utf-8 -o doc/CREDITS.utf8 doc/CREDITS
+touch -c -r doc/CREDITS doc/CREDITS.utf8
 mv -f doc/CREDITS.utf8 doc/CREDITS
 
 %pre
@@ -83,18 +106,33 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
 %doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %{_sbindir}/%{name}
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_mandir}/man?/%{name}*
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
+%files devel
+%defattr(-,root,root,-)
+%doc doc/example_plugin.c
+%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
 %changelog
+* 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)
+- Added -devel subpackage with header files for plugins (#504882)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-2
 - Rebuilt against gcc 4.4 and rpm 4.6
 


--- bitlbee-1.2.2-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sun Aug 16 22:43:43 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 16 Aug 2009 22:43:43 +0000 (UTC)
Subject: rpms/bitlbee/F-10 bitlbee-1.2.3-libresolv.patch, NONE,
	1.1 bitlbee-wrapper.h, NONE, 1.1 bitlbee.spec, 1.8,
	1.9 bitlbee-1.2.2-libresolv.patch, 1.1, NONE
Message-ID: <20090816224343.EE90811C0262@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/F-10

Modified Files:
	bitlbee.spec 
Added Files:
	bitlbee-1.2.3-libresolv.patch bitlbee-wrapper.h 
Removed Files:
	bitlbee-1.2.2-libresolv.patch 
Log Message:
- Updated libresolv patch to not segfault when connecting to the Jabber/XMPP server if there's no SRV record (#506719, #501786)
- Added -devel subpackage with header files for plugins (#504882)


bitlbee-1.2.3-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.3-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.3/configure			2008-08-27 00:36:44.000000000 +0200
+++ bitlbee-1.2.3/configure.libresolv		2008-08-27 19:52:00.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.3/lib/Makefile			2008-03-02 18:10:16.000000000 +0100
+++ bitlbee-1.2.3/lib/Makefile.libresolv	2008-06-28 17:24:51.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.3/lib/misc.c			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.c.libresolv		2008-06-28 17:25:44.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"
@@ -465,58 +466,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.3/lib/misc.h			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.h.libresolv		2008-06-28 17:26:24.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.3/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/Makefile			2008-09-06 14:33:14.000000000 +0200
+++ bitlbee-1.2.3/Makefile.libresolv		2009-06-12 00:34:51.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.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 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)


--- NEW FILE bitlbee-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because config.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "config-i386.h"
#elif defined(__ia64__)
#include "config-ia64.h"
#elif defined(__powerpc64__)
#include "config-ppc64.h"
#elif defined(__powerpc__)
#include "config-ppc.h"
#elif defined(__s390x__)
#include "config-s390x.h"
#elif defined(__s390__)
#include "config-s390.h"
#elif defined(__x86_64__)
#include "config-x86_64.h"
#elif defined(__alpha__)
#include "config-alpha.h"
#elif defined(__arm__)
#include "config-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "config-sparc64.h"
#elif defined(__sparc__)
#include "config-sparc.h"
#elif defined(__hppa__) && defined(__LP64__)
#include "config-parisc64.h"
#elif defined(__hppa__)
#include "config-parisc.h"
#elif defined(__mips__)
#include "config-mips.h"
#elif defined(__mipsel__)
#include "config-mipsel.h"
#elif defined(__mips64__)
#include "config-mipsx.h"
#elif defined(__sh64__)
#include "config-sh64.h"
#elif defined(__sh__)
#include "config-sh.h"
#else
#error "This bitlbee-devel package does not work your architecture?"
#endif


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-10/bitlbee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bitlbee.spec	7 Sep 2008 20:02:46 -0000	1.8
+++ bitlbee.spec	16 Aug 2009 22:43:43 -0000	1.9
@@ -1,18 +1,19 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           1.2.3
-Release:           1%{?dist}
+Release:           4%{?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
-Patch0:            bitlbee-1.2.2-libresolv.patch
+Source2:           bitlbee-wrapper.h
+Patch0:            bitlbee-1.2.3-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
 BuildRequires:     gnutls-devel
 %else
 BuildRequires:     openssl-devel
@@ -24,6 +25,15 @@ Bitlbee is an IRC to other chat networks
 an IRC server which forwards everything you say to people on other chat
 networks like ICQ, MSN, Jabber or Yahoo!
 
+%package devel
+Summary:           Development files for bitlbee
+Group:             Development/Libraries
+Requires:          %{name} = %{version}-%{release}, pkgconfig
+
+%description devel
+The bitlbee-devel package includes header files necessary for building and
+developing programs and plugins which use bitlbee.
+
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
@@ -33,6 +43,9 @@ perl -pi.make -e '
                 s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                 s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                 s|\$\(MANDIR\)|\$(mandir)|g;
+                s|\$\(INCLUDEDIR\)|\$(includedir)/%{name}|g;
+                s|\$\(PCDIR\)|\$(libdir)/pkgconfig|g;
+                s|install -m|install -p -m|g;
         ' Makefile */Makefile */*/Makefile
 
 %build
@@ -43,9 +56,11 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --mandir=%{_mandir} \
         --datadir=%{_datadir}/%{name} \
         --config=%{_localstatedir}/lib/%{name} \
+        --pcdir=%{_libdir}/pkgconfig \
+        --plugindir=%{_libdir}/%{name} \
         --strip=0 \
         --plugins=1 \
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
         --ssl=gnutls
 %else
         --ssl=openssl
@@ -55,18 +70,26 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}
+%makeinstall install-dev
 
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
-install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+# Install some files manually to their correct destination
+mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
+install -D -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+
+# Hack to allow parallel install of 32 bit and 64 bit -devel packages
+%if 0%{?fedora}%{?rhel}
+mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config{,-%{_arch}}.h
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+%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
 mv -f doc/CHANGES.utf8 doc/CHANGES
+
 iconv -f iso-8859-1 -t utf-8 -o doc/CREDITS.utf8 doc/CREDITS
+touch -c -r doc/CREDITS doc/CREDITS.utf8
 mv -f doc/CREDITS.utf8 doc/CREDITS
 
 %pre
@@ -83,18 +106,36 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
 %doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %{_sbindir}/%{name}
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_mandir}/man?/%{name}*
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
+%files devel
+%defattr(-,root,root,-)
+%doc doc/example_plugin.c
+%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
 %changelog
+* 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)
+- Added -devel subpackage with header files for plugins (#504882)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-2
+- Rebuilt against gcc 4.4 and rpm 4.6
+
 * Sun Sep 07 2008 Robert Scheck <robert at fedoraproject.org> 1.2.3-1
 - Upgrade to 1.2.3 (#461424)
 


--- bitlbee-1.2.2-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sun Aug 16 22:43:44 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 16 Aug 2009 22:43:44 +0000 (UTC)
Subject: rpms/bitlbee/devel bitlbee-1.2.3-libresolv.patch, NONE,
	1.1 bitlbee-wrapper.h, NONE, 1.1 bitlbee.spec, 1.11,
	1.12 bitlbee-1.2.2-libresolv.patch, 1.1, NONE
Message-ID: <20090816224344.7296D11C0262@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072/devel

Modified Files:
	bitlbee.spec 
Added Files:
	bitlbee-1.2.3-libresolv.patch bitlbee-wrapper.h 
Removed Files:
	bitlbee-1.2.2-libresolv.patch 
Log Message:
- Updated libresolv patch to not segfault when connecting to the Jabber/XMPP server if there's no SRV record (#506719, #501786)
- Added -devel subpackage with header files for plugins (#504882)


bitlbee-1.2.3-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.3-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.3/configure			2008-08-27 00:36:44.000000000 +0200
+++ bitlbee-1.2.3/configure.libresolv		2008-08-27 19:52:00.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.3/lib/Makefile			2008-03-02 18:10:16.000000000 +0100
+++ bitlbee-1.2.3/lib/Makefile.libresolv	2008-06-28 17:24:51.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.3/lib/misc.c			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.c.libresolv		2008-06-28 17:25:44.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"
@@ -465,58 +466,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.3/lib/misc.h			2008-06-22 14:23:46.000000000 +0200
+++ bitlbee-1.2.3/lib/misc.h.libresolv		2008-06-28 17:26:24.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.3/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.3/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.3/Makefile			2008-09-06 14:33:14.000000000 +0200
+++ bitlbee-1.2.3/Makefile.libresolv		2009-06-12 00:34:51.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.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 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)


--- NEW FILE bitlbee-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because config.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "config-i386.h"
#elif defined(__ia64__)
#include "config-ia64.h"
#elif defined(__powerpc64__)
#include "config-ppc64.h"
#elif defined(__powerpc__)
#include "config-ppc.h"
#elif defined(__s390x__)
#include "config-s390x.h"
#elif defined(__s390__)
#include "config-s390.h"
#elif defined(__x86_64__)
#include "config-x86_64.h"
#elif defined(__alpha__)
#include "config-alpha.h"
#elif defined(__arm__)
#include "config-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "config-sparc64.h"
#elif defined(__sparc__)
#include "config-sparc.h"
#elif defined(__hppa__) && defined(__LP64__)
#include "config-parisc64.h"
#elif defined(__hppa__)
#include "config-parisc.h"
#elif defined(__mips__)
#include "config-mips.h"
#elif defined(__mipsel__)
#include "config-mipsel.h"
#elif defined(__mips64__)
#include "config-mipsx.h"
#elif defined(__sh64__)
#include "config-sh64.h"
#elif defined(__sh__)
#include "config-sh.h"
#else
#error "This bitlbee-devel package does not work your architecture?"
#endif


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/bitlbee.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- bitlbee.spec	24 Jul 2009 18:06:33 -0000	1.11
+++ bitlbee.spec	16 Aug 2009 22:43:44 -0000	1.12
@@ -1,18 +1,19 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           1.2.3
-Release:           3%{?dist}
+Release:           4%{?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
-Patch0:            bitlbee-1.2.2-libresolv.patch
+Source2:           bitlbee-wrapper.h
+Patch0:            bitlbee-1.2.3-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
 BuildRequires:     gnutls-devel
 %else
 BuildRequires:     openssl-devel
@@ -24,6 +25,15 @@ Bitlbee is an IRC to other chat networks
 an IRC server which forwards everything you say to people on other chat
 networks like ICQ, MSN, Jabber or Yahoo!
 
+%package devel
+Summary:           Development files for bitlbee
+Group:             Development/Libraries
+Requires:          %{name} = %{version}-%{release}, pkgconfig
+
+%description devel
+The bitlbee-devel package includes header files necessary for building and
+developing programs and plugins which use bitlbee.
+
 %prep
 %setup -q
 %patch0 -p1 -b .libresolv
@@ -33,6 +43,9 @@ perl -pi.make -e '
                 s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
                 s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
                 s|\$\(MANDIR\)|\$(mandir)|g;
+                s|\$\(INCLUDEDIR\)|\$(includedir)/%{name}|g;
+                s|\$\(PCDIR\)|\$(libdir)/pkgconfig|g;
+                s|install -m|install -p -m|g;
         ' Makefile */Makefile */*/Makefile
 
 %build
@@ -43,9 +56,11 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --mandir=%{_mandir} \
         --datadir=%{_datadir}/%{name} \
         --config=%{_localstatedir}/lib/%{name} \
+        --pcdir=%{_libdir}/pkgconfig \
+        --plugindir=%{_libdir}/%{name} \
         --strip=0 \
         --plugins=1 \
-%if 0%{?rhl}%{?fedora}%{?rhel}
+%if 0%{?fedora}%{?rhel}
         --ssl=gnutls
 %else
         --ssl=openssl
@@ -55,18 +70,26 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}
+%makeinstall install-dev
 
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
-install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
-install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+# Install some files manually to their correct destination
+mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
+install -D -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
+
+# Hack to allow parallel install of 32 bit and 64 bit -devel packages
+%if 0%{?fedora}%{?rhel}
+mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config{,-%{_arch}}.h
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
+%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
 mv -f doc/CHANGES.utf8 doc/CHANGES
+
 iconv -f iso-8859-1 -t utf-8 -o doc/CREDITS.utf8 doc/CREDITS
+touch -c -r doc/CREDITS doc/CREDITS.utf8
 mv -f doc/CREDITS.utf8 doc/CREDITS
 
 %pre
@@ -83,18 +106,30 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
 %doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %{_sbindir}/%{name}
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_mandir}/man?/%{name}*
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
+%files devel
+%defattr(-,root,root,-)
+%doc doc/example_plugin.c
+%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/%{name}.pc
+
 %changelog
+* 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)
+- Added -devel subpackage with header files for plugins (#504882)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- bitlbee-1.2.2-libresolv.patch DELETED ---



From roland at fedoraproject.org  Mon Aug 17 00:35:45 2009
From: roland at fedoraproject.org (roland)
Date: Mon, 17 Aug 2009 00:35:45 +0000 (UTC)
Subject: rpms/kernel/devel perf,1.3,1.4
Message-ID: <20090817003545.2A66411C0262@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18274

Modified Files:
	perf 
Log Message:
Like that, but with some proper defensive sh habits and care to the error case.


Index: perf
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/perf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perf	16 Aug 2009 22:09:02 -0000	1.3
+++ perf	17 Aug 2009 00:35:44 -0000	1.4
@@ -1,9 +1,12 @@
 #!/bin/sh
 
-PERF="/usr/libexec/perf.$(uname -r)"
+# In pathological situations, this will print some error about uname.
+kverrel="`uname -r`" || exit
 
-if [ -x $PERF ]; then
-	exec $PERF;
-else
-	echo "Sorry, your kernel doesn't support perf.";
-fi
+exec "/usr/libexec/perf.$kverrel"
+rc=$?
+
+# We're still here, so the exec failed.
+echo >&2 "Sorry, your kernel ($kverrel) doesn't support perf."
+
+exit $rc



From kyle at fedoraproject.org  Mon Aug 17 00:38:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 17 Aug 2009 00:38:52 +0000 (UTC)
Subject: rpms/kernel/devel perf,1.4,1.5
Message-ID: <20090817003852.9388B11C0262@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18777

Modified Files:
	perf 
Log Message:
make perf do something useful


Index: perf
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/perf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perf	17 Aug 2009 00:35:44 -0000	1.4
+++ perf	17 Aug 2009 00:38:52 -0000	1.5
@@ -3,7 +3,7 @@
 # In pathological situations, this will print some error about uname.
 kverrel="`uname -r`" || exit
 
-exec "/usr/libexec/perf.$kverrel"
+exec "/usr/libexec/perf.$kverrel" $@
 rc=$?
 
 # We're still here, so the exec failed.



From mmcgrath at fedoraproject.org  Mon Aug 17 02:00:42 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 02:00:42 +0000 (UTC)
Subject: rpms/cacti/devel .cvsignore, 1.8, 1.9 cacti.spec, 1.28, 1.29 sources,
	1.8, 1.9
Message-ID: <20090817020042.4197F11C034A@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32604

Modified Files:
	.cvsignore cacti.spec sources 
Log Message:
upstream released new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Feb 2009 15:33:44 -0000	1.8
+++ .cvsignore	17 Aug 2009 02:00:41 -0000	1.9
@@ -1 +1 @@
-cacti-0.8.7d.tar.gz
+cacti-0.8.7e.tar.gz


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- cacti.spec	24 Jul 2009 18:35:38 -0000	1.28
+++ cacti.spec	17 Aug 2009 02:00:41 -0000	1.29
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.7d
-Release: 4%{?dist}
+Version: 0.8.7e
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,6 +105,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
+- Upstream released new version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Feb 2009 15:33:45 -0000	1.8
+++ sources	17 Aug 2009 02:00:42 -0000	1.9
@@ -1 +1 @@
-0822068bfa547278e94d3143ef9279e0  cacti-0.8.7d.tar.gz
+7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz



From cebbert at fedoraproject.org  Mon Aug 17 02:11:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 02:11:55 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.30.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.17, 1.960.2.18 kernel.spec, 1.1206.2.79,
	1.1206.2.80 linux-2.6-firewire-git-update.patch, 1.18.6.1,
	1.18.6.2 sources, 1.922.2.17, 1.922.2.18 upstream, 1.834.2.17,
	1.834.2.18 make-sock_sendpage-use-kernel_sendpage.patch, 1.1.2.1,
	NONE patch-2.6.27.29.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090817021155.7A96E11C0262@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1932

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec linux-2.6-firewire-git-update.patch 
	sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.30.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	make-sock_sendpage-use-kernel_sendpage.patch 
	patch-2.6.27.29.bz2.sign 
Log Message:
Linux 2.6.27.30
Dropped patch make-sock_sendpage-use-kernel_sendpage.patch


--- NEW FILE patch-2.6.27.30.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKiH0vyGugalF9Dw4RAvIxAJwIcxSwxLmAMYvUsuh6U9G/XBxpIACePUF/
tk7mPynG4NT5REE/8+6mglo=
=6PoN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.17
retrieving revision 1.960.2.18
diff -u -p -r1.960.2.17 -r1.960.2.18
--- .cvsignore	31 Jul 2009 02:33:58 -0000	1.960.2.17
+++ .cvsignore	17 Aug 2009 02:11:54 -0000	1.960.2.18
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.29.bz2
+patch-2.6.27.30.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.79
retrieving revision 1.1206.2.80
diff -u -p -r1.1206.2.79 -r1.1206.2.80
--- kernel.spec	15 Aug 2009 00:26:54 -0000	1.1206.2.79
+++ kernel.spec	17 Aug 2009 02:11:54 -0000	1.1206.2.80
@@ -39,7 +39,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 29
+%define stable_update 30
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -589,8 +589,6 @@ Patch21: linux-2.6-utrace.patch
 Patch22: linux-2.6-x86-tracehook.patch
 Patch23: linux-2.6.27-x86-tracehook-syscall-arg-order.patch
 
-Patch30: make-sock_sendpage-use-kernel_sendpage.patch
-
 Patch41: linux-2.6-sysrq-c.patch
 
 Patch60: linux-2.6-sched-fine-tune-SD_MC_INIT.patch
@@ -1142,8 +1140,6 @@ ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-x86-tracehook.patch
 ApplyPatch linux-2.6.27-x86-tracehook-syscall-arg-order.patch
 
-ApplyPatch make-sock_sendpage-use-kernel_sendpage.patch
-
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
@@ -1995,6 +1991,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Aug 16 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.80
+- Linux 2.6.27.30
+- Dropped patch make-sock_sendpage-use-kernel_sendpage.patch
+
 * Fri Aug 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.29-170.2.79
 - CVE-2009-2692: Fix sock sendpage NULL ptr deref.
 

linux-2.6-firewire-git-update.patch:
 drivers/firewire/fw-card.c         |   58 +------
 drivers/firewire/fw-cdev.c         |   42 ++---
 drivers/firewire/fw-device.c       |   40 +----
 drivers/firewire/fw-device.h       |    4 
 drivers/firewire/fw-ohci.c         |  123 ++++++++++------
 drivers/firewire/fw-sbp2.c         |  154 +++++++++-----------
 drivers/firewire/fw-topology.c     |   18 ++
 drivers/firewire/fw-transaction.c  |   48 +++++-
 drivers/firewire/fw-transaction.h  |   20 ++
 drivers/ieee1394/csr1212.c         |    2 
 drivers/ieee1394/dv1394.c          |    2 
 drivers/ieee1394/eth1394.c         |    2 
 drivers/ieee1394/nodemgr.c         |  279 ++++++++++++++-----------------------
 drivers/ieee1394/nodemgr.h         |    2 
 drivers/ieee1394/raw1394-private.h |    1 
 drivers/ieee1394/raw1394.c         |  230 ++++++++++++++++--------------
 drivers/ieee1394/sbp2.c            |  218 ++++++++++++----------------
 drivers/ieee1394/sbp2.h            |   33 +---
 drivers/ieee1394/video1394.c       |    8 -
 include/linux/firewire-cdev.h      |    9 -
 20 files changed, 622 insertions(+), 671 deletions(-)

Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.18.6.1
retrieving revision 1.18.6.2
diff -u -p -r1.18.6.1 -r1.18.6.2
--- linux-2.6-firewire-git-update.patch	17 Feb 2009 19:47:41 -0000	1.18.6.1
+++ linux-2.6-firewire-git-update.patch	17 Aug 2009 02:11:54 -0000	1.18.6.2
@@ -669,7 +669,7 @@ index aaff50e..d334cac 100644
  /*
   * Per section 7.4.8 of the SBP-2 spec, a mgt_ORB_timeout value can be
   * provided in the config rom. Most devices do provide a value, which
-@@ -181,10 +185,16 @@ struct sbp2_target {
+@@ -181,16 +185,22 @@ struct sbp2_target {
  #define SBP2_MAX_LOGIN_ORB_TIMEOUT	40000U	/* Timeout in ms */
  #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
  #define SBP2_ORB_NULL			0x80000000
@@ -677,6 +677,12 @@ index aaff50e..d334cac 100644
  #define SBP2_RETRY_LIMIT		0xf		/* 15 retries */
  #define SBP2_CYCLE_LIMIT		(0xc8 << 12)	/* 200 125us cycles */
  
+ /*
+  * There is no transport protocol limit to the CDB length,  but we implement
+  * a fixed length only.  16 bytes is enough for disks larger than 2 TB.
+  */
+ #define SBP2_MAX_CDB_SIZE		16
+ 
 +/*
 + * The default maximum s/g segment size of a FireWire controller is
 + * usually 0x10000, but SBP-2 only allows 0xffff. Since buffers have to


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.17
retrieving revision 1.922.2.18
diff -u -p -r1.922.2.17 -r1.922.2.18
--- sources	31 Jul 2009 02:33:59 -0000	1.922.2.17
+++ sources	17 Aug 2009 02:11:54 -0000	1.922.2.18
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-ab19d1f101f8711e7963cbe254557f33  patch-2.6.27.29.bz2
+f55adbeb6e3a44e814ce2a192a9ecf8b  patch-2.6.27.30.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.17
retrieving revision 1.834.2.18
diff -u -p -r1.834.2.17 -r1.834.2.18
--- upstream	31 Jul 2009 02:33:59 -0000	1.834.2.17
+++ upstream	17 Aug 2009 02:11:55 -0000	1.834.2.18
@@ -1,3 +1,3 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.29.bz2
+patch-2.6.27.30.bz2
 


--- make-sock_sendpage-use-kernel_sendpage.patch DELETED ---


--- patch-2.6.27.29.bz2.sign DELETED ---



From mmcgrath at fedoraproject.org  Mon Aug 17 02:14:38 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 02:14:38 +0000 (UTC)
Subject: rpms/cacti/EL-5 cacti.spec,1.18,1.19 sources,1.7,1.8
Message-ID: <20090817021438.29DDC11C0262@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2318/EL-5

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version



Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-5/cacti.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cacti.spec	23 Feb 2009 17:14:22 -0000	1.18
+++ cacti.spec	17 Aug 2009 02:14:37 -0000	1.19
@@ -1,5 +1,5 @@
 Name: cacti
-Version: 0.8.7d
+Version: 0.8.7e
 Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
@@ -80,6 +80,7 @@ fi
 %dir %{_sysconfdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_localstatedir}/lib/%{name}
+%dir %{_localstatedir}/lib/%{name}/cli
 %dir %{_localstatedir}/lib/%{name}/scripts
 %doc docs/ README LICENSE cacti.sql
 %config(noreplace) %{_sysconfdir}/cron.d/cacti
@@ -104,6 +105,18 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
+- Upstream released new version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.7d-3
+- Fix unowned cli directory (#473631)
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7d-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Feb 2009 17:14:22 -0000	1.7
+++ sources	17 Aug 2009 02:14:37 -0000	1.8
@@ -1 +1 @@
-0822068bfa547278e94d3143ef9279e0  cacti-0.8.7d.tar.gz
+7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz



From mmcgrath at fedoraproject.org  Mon Aug 17 02:14:38 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 02:14:38 +0000 (UTC)
Subject: rpms/cacti/F-11 cacti.spec,1.27,1.28 sources,1.8,1.9
Message-ID: <20090817021438.8E9B011C0262@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2318/F-11

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version



Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-11/cacti.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cacti.spec	31 Mar 2009 20:11:13 -0000	1.27
+++ cacti.spec	17 Aug 2009 02:14:38 -0000	1.28
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.7d
-Release: 3%{?dist}
+Version: 0.8.7e
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -105,6 +105,12 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
+- Upstream released new version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.7d-3
 - Fix unowned cli directory (#473631)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Feb 2009 15:33:45 -0000	1.8
+++ sources	17 Aug 2009 02:14:38 -0000	1.9
@@ -1 +1 @@
-0822068bfa547278e94d3143ef9279e0  cacti-0.8.7d.tar.gz
+7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz



From mmcgrath at fedoraproject.org  Mon Aug 17 02:14:38 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 02:14:38 +0000 (UTC)
Subject: rpms/cacti/F-10 cacti.spec,1.25,1.26 sources,1.8,1.9
Message-ID: <20090817021438.549E211C0262@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2318/F-10

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version



Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-10/cacti.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- cacti.spec	23 Feb 2009 17:14:22 -0000	1.25
+++ cacti.spec	17 Aug 2009 02:14:38 -0000	1.26
@@ -1,5 +1,5 @@
 Name: cacti
-Version: 0.8.7d
+Version: 0.8.7e
 Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
@@ -80,6 +80,7 @@ fi
 %dir %{_sysconfdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_localstatedir}/lib/%{name}
+%dir %{_localstatedir}/lib/%{name}/cli
 %dir %{_localstatedir}/lib/%{name}/scripts
 %doc docs/ README LICENSE cacti.sql
 %config(noreplace) %{_sysconfdir}/cron.d/cacti
@@ -104,6 +105,18 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
+- Upstream released new version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.7d-3
+- Fix unowned cli directory (#473631)
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7d-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Feb 2009 17:14:22 -0000	1.8
+++ sources	17 Aug 2009 02:14:38 -0000	1.9
@@ -1 +1 @@
-0822068bfa547278e94d3143ef9279e0  cacti-0.8.7d.tar.gz
+7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz



From mmcgrath at fedoraproject.org  Mon Aug 17 02:15:04 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 02:15:04 +0000 (UTC)
Subject: rpms/cacti/EL-4 cacti.spec,1.18,1.19 sources,1.7,1.8
Message-ID: <20090817021504.5132011C0262@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2433/EL-4

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-4/cacti.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cacti.spec	23 Feb 2009 17:14:22 -0000	1.18
+++ cacti.spec	17 Aug 2009 02:15:04 -0000	1.19
@@ -1,5 +1,5 @@
 Name: cacti
-Version: 0.8.7d
+Version: 0.8.7e
 Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
@@ -80,6 +80,7 @@ fi
 %dir %{_sysconfdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_localstatedir}/lib/%{name}
+%dir %{_localstatedir}/lib/%{name}/cli
 %dir %{_localstatedir}/lib/%{name}/scripts
 %doc docs/ README LICENSE cacti.sql
 %config(noreplace) %{_sysconfdir}/cron.d/cacti
@@ -104,6 +105,18 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
+- Upstream released new version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.7d-3
+- Fix unowned cli directory (#473631)
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7d-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb 21 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7d-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Feb 2009 17:14:22 -0000	1.7
+++ sources	17 Aug 2009 02:15:04 -0000	1.8
@@ -1 +1 @@
-0822068bfa547278e94d3143ef9279e0  cacti-0.8.7d.tar.gz
+7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz



From mtruch at fedoraproject.org  Mon Aug 17 02:31:15 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Mon, 17 Aug 2009 02:31:15 +0000 (UTC)
Subject: rpms/getdata/F-11 getdata.spec,1.6,1.7
Message-ID: <20090817023115.A6C4B11C0262@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5925

Modified Files:
	getdata.spec 
Log Message:
Disable useless verbose debugging output.



Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-11/getdata.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- getdata.spec	23 Feb 2009 20:44:11 -0000	1.6
+++ getdata.spec	17 Aug 2009 02:31:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -54,7 +54,7 @@ Does not yet allow writing of bzip2 enco
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static --enable-modules --enable-debug
+%configure --disable-static --enable-modules
 make %{?_smp_mflags}
 
 %check
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Sun Aug 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-3
+- Disable verbose debugging output.
+
 * Mon Feb 23 2009 Matthew Truch <matt at truch.net> - 0.5.0-2
 - Bump for mass rebuild.
 



From cebbert at fedoraproject.org  Mon Aug 17 02:32:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 02:32:12 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.5.bz2.sign, NONE, 1.1 .cvsignore,
	1.1052, 1.1053 kernel.spec, 1.1707, 1.1708 sources, 1.1014,
	1.1015 upstream, 1.925, 1.926 patch-2.6.30.4.bz2.sign, 1.1,
	NONE patch-2.6.30.5-rc2.bz2.sign, 1.1, NONE
Message-ID: <20090817023212.62AA011C0262@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6152

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.5.bz2.sign 
Removed Files:
	patch-2.6.30.4.bz2.sign patch-2.6.30.5-rc2.bz2.sign 
Log Message:
Linux 2.6.30.5


--- NEW FILE patch-2.6.30.5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKiHrfyGugalF9Dw4RAk6jAJ9CTkHccSXmCw/nTGpUvraORZM9CQCfU2I8
ijzA9FtvYGLU+7uKpH82uuY=
=y+LZ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1052
retrieving revision 1.1053
diff -u -p -r1.1052 -r1.1053
--- .cvsignore	14 Aug 2009 07:38:14 -0000	1.1052
+++ .cvsignore	17 Aug 2009 02:32:11 -0000	1.1053
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.4.bz2
-patch-2.6.30.5-rc2.bz2
+patch-2.6.30.5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1707
retrieving revision 1.1708
diff -u -p -r1.1707 -r1.1708
--- kernel.spec	15 Aug 2009 01:21:24 -0000	1.1707
+++ kernel.spec	17 Aug 2009 02:32:11 -0000	1.1708
@@ -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 2
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1895,6 +1895,9 @@ fi
 # and build.
 
 %changelog
+* Sun Aug 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-28
+- Linux 2.6.30.5
+
 * Fri Aug 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-27.rc2
 - Linux 2.6.30.5-rc2
 - Dropped drm-intel-tv-fix.patch, merged in -stable now.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1014
retrieving revision 1.1015
diff -u -p -r1.1014 -r1.1015
--- sources	14 Aug 2009 07:38:15 -0000	1.1014
+++ sources	17 Aug 2009 02:32:12 -0000	1.1015
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-d0fc44b54ba5953140b3f2aa9a1f2580  patch-2.6.30.4.bz2
-5376db7f63da62e0f71ebf3738be1628  patch-2.6.30.5-rc2.bz2
+47841c7ff5c81a7b349a79f2fa8e9138  patch-2.6.30.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -p -r1.925 -r1.926
--- upstream	14 Aug 2009 07:38:15 -0000	1.925
+++ upstream	17 Aug 2009 02:32:12 -0000	1.926
@@ -1,4 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.4.bz2
-patch-2.6.30.5-rc2.bz2
+patch-2.6.30.5.bz2
 


--- patch-2.6.30.4.bz2.sign DELETED ---


--- patch-2.6.30.5-rc2.bz2.sign DELETED ---



From mtruch at fedoraproject.org  Mon Aug 17 02:33:11 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Mon, 17 Aug 2009 02:33:11 +0000 (UTC)
Subject: rpms/getdata/F-10 getdata.spec,1.5,1.6
Message-ID: <20090817023311.42A7911C0262@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6305

Modified Files:
	getdata.spec 
Log Message:
Disable verbose debugging output.



Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-10/getdata.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- getdata.spec	16 Jan 2009 22:26:02 -0000	1.5
+++ getdata.spec	17 Aug 2009 02:33:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           getdata
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for reading and writing dirfile data
 
 Group:          Development/Libraries
@@ -54,7 +54,7 @@ Does not yet allow writing of bzip2 enco
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static --enable-modules --enable-debug
+%configure --disable-static --enable-modules
 make %{?_smp_mflags}
 
 %check
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgetdatabzip2*.so
 
 %changelog
+* Sun Aug 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-2
+- Disable verbose debugging output.
+
 * Fri Jan 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-1
 - Upstream 0.5.0
 -   Includes bugfixes.



From jstanley at fedoraproject.org  Mon Aug 17 03:03:31 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 17 Aug 2009 03:03:31 +0000 (UTC)
Subject: rpms/keychecker/devel .cvsignore, 1.2, 1.3 keychecker.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090817030331.AA86911C0262@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/keychecker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11112

Modified Files:
	.cvsignore keychecker.spec sources 
Log Message:
Update to new upstream 0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 03:03:07 -0000	1.2
+++ .cvsignore	17 Aug 2009 03:03:31 -0000	1.3
@@ -1 +1 @@
-keychecker-0.1.tar.gz
+keychecker-0.2.tar.gz


Index: keychecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/devel/keychecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keychecker.spec	29 Jul 2009 03:03:07 -0000	1.1
+++ keychecker.spec	17 Aug 2009 03:03:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           keychecker
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Generate list of installed packages sorted by GPG key
 
 Group:          Applications/System
@@ -22,7 +22,7 @@ Separately list rpm's based on the GPG k
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT/%{_bindir}/keychecker
+install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT%{_bindir}/keychecker
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +31,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/keychecker
-%doc README LICENSE
+%doc README LICENSE known_keys.txt
 
 %changelog
+* Sun Aug 16 2009 Jon Stanley <jonstanley at gmail.com> - 0.2-1
+- Add option for getting keys from a file
+
 * Tue Jul 28 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-3
 - Fix spec typo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 03:03:07 -0000	1.2
+++ sources	17 Aug 2009 03:03:31 -0000	1.3
@@ -1 +1 @@
-1855c6359578ada657f5c465ccfddba1  keychecker-0.1.tar.gz
+148d3f35ae749e8b0bab2810d2099ccd  keychecker-0.2.tar.gz



From jstanley at fedoraproject.org  Mon Aug 17 03:08:47 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 17 Aug 2009 03:08:47 +0000 (UTC)
Subject: rpms/keychecker/EL-4 keychecker.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090817030847.91DB211C0262@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/keychecker/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11813/EL-4

Modified Files:
	keychecker.spec sources 
Log Message:
Update to new upstream 0.2



Index: keychecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/EL-4/keychecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keychecker.spec	29 Jul 2009 03:05:19 -0000	1.1
+++ keychecker.spec	17 Aug 2009 03:08:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           keychecker
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Generate list of installed packages sorted by GPG key
 
 Group:          Applications/System
@@ -22,7 +22,7 @@ Separately list rpm's based on the GPG k
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT/%{_bindir}/keychecker
+install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT%{_bindir}/keychecker
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +31,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/keychecker
-%doc README LICENSE
+%doc README LICENSE known_keys.txt
 
 %changelog
+* Sun Aug 16 2009 Jon Stanley <jonstanley at gmail.com> - 0.2-1
+- Add option for getting keys from a file
+
 * Tue Jul 28 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-3
 - Fix spec typo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 03:05:19 -0000	1.2
+++ sources	17 Aug 2009 03:08:47 -0000	1.3
@@ -1 +1 @@
-1855c6359578ada657f5c465ccfddba1  keychecker-0.1.tar.gz
+148d3f35ae749e8b0bab2810d2099ccd  keychecker-0.2.tar.gz



From jstanley at fedoraproject.org  Mon Aug 17 03:08:47 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 17 Aug 2009 03:08:47 +0000 (UTC)
Subject: rpms/keychecker/EL-5 keychecker.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090817030847.C1DC411C0262@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/keychecker/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11813/EL-5

Modified Files:
	keychecker.spec sources 
Log Message:
Update to new upstream 0.2



Index: keychecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/EL-5/keychecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keychecker.spec	29 Jul 2009 03:05:19 -0000	1.1
+++ keychecker.spec	17 Aug 2009 03:08:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           keychecker
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Generate list of installed packages sorted by GPG key
 
 Group:          Applications/System
@@ -22,7 +22,7 @@ Separately list rpm's based on the GPG k
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT/%{_bindir}/keychecker
+install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT%{_bindir}/keychecker
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +31,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/keychecker
-%doc README LICENSE
+%doc README LICENSE known_keys.txt
 
 %changelog
+* Sun Aug 16 2009 Jon Stanley <jonstanley at gmail.com> - 0.2-1
+- Add option for getting keys from a file
+
 * Tue Jul 28 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-3
 - Fix spec typo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 03:05:19 -0000	1.2
+++ sources	17 Aug 2009 03:08:47 -0000	1.3
@@ -1 +1 @@
-1855c6359578ada657f5c465ccfddba1  keychecker-0.1.tar.gz
+148d3f35ae749e8b0bab2810d2099ccd  keychecker-0.2.tar.gz



From jstanley at fedoraproject.org  Mon Aug 17 03:08:48 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 17 Aug 2009 03:08:48 +0000 (UTC)
Subject: rpms/keychecker/F-10 keychecker.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090817030848.0734311C0262@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/keychecker/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11813/F-10

Modified Files:
	keychecker.spec sources 
Log Message:
Update to new upstream 0.2



Index: keychecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/F-10/keychecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keychecker.spec	29 Jul 2009 03:05:19 -0000	1.1
+++ keychecker.spec	17 Aug 2009 03:08:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           keychecker
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Generate list of installed packages sorted by GPG key
 
 Group:          Applications/System
@@ -22,7 +22,7 @@ Separately list rpm's based on the GPG k
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT/%{_bindir}/keychecker
+install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT%{_bindir}/keychecker
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +31,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/keychecker
-%doc README LICENSE
+%doc README LICENSE known_keys.txt
 
 %changelog
+* Sun Aug 16 2009 Jon Stanley <jonstanley at gmail.com> - 0.2-1
+- Add option for getting keys from a file
+
 * Tue Jul 28 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-3
 - Fix spec typo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 03:05:19 -0000	1.2
+++ sources	17 Aug 2009 03:08:47 -0000	1.3
@@ -1 +1 @@
-1855c6359578ada657f5c465ccfddba1  keychecker-0.1.tar.gz
+148d3f35ae749e8b0bab2810d2099ccd  keychecker-0.2.tar.gz



From jstanley at fedoraproject.org  Mon Aug 17 03:08:48 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 17 Aug 2009 03:08:48 +0000 (UTC)
Subject: rpms/keychecker/F-11 keychecker.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090817030848.4084511C02C3@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/keychecker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11813/F-11

Modified Files:
	keychecker.spec sources 
Log Message:
Update to new upstream 0.2



Index: keychecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/F-11/keychecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keychecker.spec	29 Jul 2009 03:05:20 -0000	1.1
+++ keychecker.spec	17 Aug 2009 03:08:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           keychecker
-Version:        0.1
-Release:        3%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Generate list of installed packages sorted by GPG key
 
 Group:          Applications/System
@@ -22,7 +22,7 @@ Separately list rpm's based on the GPG k
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT/%{_bindir}/keychecker
+install -Dpm 0755 key_checker.py $RPM_BUILD_ROOT%{_bindir}/keychecker
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +31,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/keychecker
-%doc README LICENSE
+%doc README LICENSE known_keys.txt
 
 %changelog
+* Sun Aug 16 2009 Jon Stanley <jonstanley at gmail.com> - 0.2-1
+- Add option for getting keys from a file
+
 * Tue Jul 28 2009 Jon Stanley <jonstanley at gmail.com> - 0.1-3
 - Fix spec typo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keychecker/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 03:05:20 -0000	1.2
+++ sources	17 Aug 2009 03:08:48 -0000	1.3
@@ -1 +1 @@
-1855c6359578ada657f5c465ccfddba1  keychecker-0.1.tar.gz
+148d3f35ae749e8b0bab2810d2099ccd  keychecker-0.2.tar.gz



From mclasen at fedoraproject.org  Mon Aug 17 03:19:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 17 Aug 2009 03:19:55 +0000 (UTC)
Subject: rpms/gnome-desktop/devel slideshow-api.patch, NONE,
	1.1 gnome-desktop.spec, 1.222, 1.223
Message-ID: <20090817031955.18ED611C0262@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13355

Modified Files:
	gnome-desktop.spec 
Added Files:
	slideshow-api.patch 
Log Message:
Add slideshow api


slideshow-api.patch:
 gnome-bg.c            |   87 +++++++++++++++++++++++++++++++++++++++++++++++---
 libgnomeui/gnome-bg.h |    8 ++++
 2 files changed, 89 insertions(+), 6 deletions(-)

--- NEW FILE slideshow-api.patch ---
diff -up gnome-desktop-2.27.5/libgnome-desktop/gnome-bg.c.slideshow-api gnome-desktop-2.27.5/libgnome-desktop/gnome-bg.c
--- gnome-desktop-2.27.5/libgnome-desktop/gnome-bg.c.slideshow-api	2009-04-26 18:40:20.000000000 -0400
+++ gnome-desktop-2.27.5/libgnome-desktop/gnome-bg.c	2009-08-13 01:14:41.403741426 -0400
@@ -177,7 +177,8 @@ static GdkPixbuf *create_img_thumbnail (
 					GnomeDesktopThumbnailFactory *factory,
 					GdkScreen             *screen,
 					int                    dest_width,
-					int                    dest_height);
+					int                    dest_height,
+					int		       frame_num);
 static SlideShow * get_as_slideshow    (GnomeBG               *bg,
 					const char 	      *filename);
 static Slide *     get_current_slide   (SlideShow 	      *show,
@@ -1055,7 +1056,7 @@ fit_factor (int from_width, int from_hei
 
 GdkPixbuf *
 gnome_bg_create_thumbnail (GnomeBG               *bg,
-			   GnomeDesktopThumbnailFactory *factory,
+		           GnomeDesktopThumbnailFactory *factory,
 			   GdkScreen             *screen,
 			   int                    dest_width,
 			   int                    dest_height)
@@ -1069,7 +1070,7 @@ gnome_bg_create_thumbnail (GnomeBG      
 	
 	draw_color (bg, result);
 	
-	thumb = create_img_thumbnail (bg, factory, screen, dest_width, dest_height);
+	thumb = create_img_thumbnail (bg, factory, screen, dest_width, dest_height, -1);
 	
 	if (thumb) {
 		draw_image (bg->placement, thumb, result);
@@ -1752,7 +1753,8 @@ create_img_thumbnail (GnomeBG           
 		      GnomeDesktopThumbnailFactory *factory,
 		      GdkScreen             *screen,
 		      int                    dest_width,
-		      int                    dest_height)
+		      int                    dest_height,
+		      int                    frame_num)
 {
 	if (bg->filename) {
 		GdkPixbuf *thumb = get_as_thumbnail (bg, factory, bg->filename);
@@ -1771,7 +1773,10 @@ create_img_thumbnail (GnomeBG           
 
 				slideshow_ref (show);
 
-				slide = get_current_slide (show, &alpha);
+				if (frame_num == -1)
+					slide = get_current_slide (show, &alpha);
+				else
+					slide = g_queue_peek_nth (show->slides, frame_num);
 
 				if (slide->fixed) {
 					GdkPixbuf *tmp;
@@ -2636,3 +2641,75 @@ slideshow_changes_with_size (SlideShow *
 	return show->changes_with_size;
 }
 
+gboolean
+gnome_bg_changes_with_time (GnomeBG *bg)
+{
+	SlideShow *show;
+
+	g_return_val_if_fail (bg != NULL, FALSE);
+
+	show = get_as_slideshow (bg, bg->filename);
+	if (show)
+		return g_queue_get_length (show->slides) > 1;
+
+	return FALSE;
+}
+
+/* frame_num is only counting static frames here,
+ * we are skipping transitions
+ * returns NULL if frame_num is out of bounds
+ */
+GdkPixbuf *
+gnome_bg_create_frame_thumbnail (GnomeBG               *bg,
+		   	         GnomeDesktopThumbnailFactory *factory,
+			         GdkScreen             *screen,
+			         int                    dest_width,
+			         int                    dest_height,
+                                 int                    frame_num)
+{
+	SlideShow *show;
+	GdkPixbuf *result;
+	GdkPixbuf *thumb;
+	GList *l;
+        int i, skipped;
+	gboolean found;
+
+	g_return_val_if_fail (bg != NULL, FALSE);
+
+	show = get_as_slideshow (bg, bg->filename);
+
+	if (!show)
+		return NULL;
+
+	i = 0;
+	skipped = 0;
+	found = FALSE;
+	for (l = show->slides->head; l; l = l->next) {
+		Slide *slide = l->data;
+		if (!slide->fixed) {
+			skipped++;
+			continue;
+		}
+		if (i == frame_num) {
+			found = TRUE;
+			break;
+		}
+		i++;
+	}
+	if (!found)
+		return NULL;
+
+	result = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, dest_width, dest_height);
+
+	draw_color (bg, result);
+
+	thumb = create_img_thumbnail (bg, factory, screen, dest_width, dest_height, frame_num + skipped);
+
+	if (thumb) {
+		draw_image (bg->placement, thumb, result);
+		g_object_unref (thumb);
+	}
+
+	return result;
+}
+
diff -up gnome-desktop-2.27.5/libgnome-desktop/libgnomeui/gnome-bg.h.slideshow-api gnome-desktop-2.27.5/libgnome-desktop/libgnomeui/gnome-bg.h
--- gnome-desktop-2.27.5/libgnome-desktop/libgnomeui/gnome-bg.h.slideshow-api	2009-04-19 13:39:06.000000000 -0400
+++ gnome-desktop-2.27.5/libgnome-desktop/libgnomeui/gnome-bg.h	2009-08-12 23:09:11.297992749 -0400
@@ -104,7 +104,13 @@ GdkPixbuf *      gnome_bg_create_thumbna
 						 int                    dest_height);
 gboolean         gnome_bg_is_dark               (GnomeBG               *bg);
 gboolean         gnome_bg_changes_with_size     (GnomeBG               *bg);
-
+gboolean         gnome_bg_changes_with_time     (GnomeBG               *bg);
+GdkPixbuf *      gnome_bg_create_frame_thumbnail (GnomeBG              *bg,
+						 GnomeDesktopThumbnailFactory *factory,
+						 GdkScreen             *screen,
+						 int                    dest_width,
+						 int                    dest_height,
+                                                 int                    frame_num);
 
 /* Set a pixmap as root - not a GnomeBG method. At some point
  * if we decide to stabilize the API then we may want to make


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- gnome-desktop.spec	14 Aug 2009 19:51:01 -0000	1.222
+++ gnome-desktop.spec	17 Aug 2009 03:19:54 -0000	1.223
@@ -12,10 +12,12 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.27.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
+# from upstream
+Patch2: slideshow-api.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 .slideshow-api
 
 %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
+* Sun Aug 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-5
+- Add slideshow api
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-4
 - Drop constantine-backgrounds-extras, too big
 



From lkundrak at fedoraproject.org  Mon Aug 17 03:21:08 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 17 Aug 2009 03:21:08 +0000 (UTC)
Subject: rpms/qemu/devel kvm.modules,1.1,1.2 qemu.spec,1.119,1.120
Message-ID: <20090817032108.7CB0211C0262@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13737

Modified Files:
	kvm.modules qemu.spec 
Log Message:
* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.91-0.6.rc1
- Allow blacklisting of kvm modules



Index: kvm.modules
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/kvm.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kvm.modules	4 Mar 2009 00:11:56 -0000	1.1
+++ kvm.modules	17 Aug 2009 03:21:08 -0000	1.2
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then 
-    modprobe kvm-intel >/dev/null 2>&1
+    modprobe -b kvm-intel >/dev/null 2>&1
 fi
 
 if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then 
-    modprobe kvm-amd >/dev/null 2>&1
+    modprobe -b kvm-amd >/dev/null 2>&1
 fi


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- qemu.spec	7 Aug 2009 08:53:27 -0000	1.119
+++ qemu.spec	17 Aug 2009 03:21:08 -0000	1.120
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.5.%{kvmvertag}%{?dist}
+Release: 0.6.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -484,6 +484,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.91-0.6.rc1
+- Allow blacklisting of kvm modules
+
 * Fri Aug  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.5.rc1
 - Fix virtio_net with -net user (#516022)
 



From whot at fedoraproject.org  Mon Aug 17 03:29:47 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 17 Aug 2009 03:29:47 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-dpms.patch, NONE,
	1.1 xorg-x11-server.spec, 1.471, 1.472
Message-ID: <20090817032947.BF64E11C0262@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15055

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-dpms.patch 
Log Message:
* Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-35.20090814
- xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.


xserver-1.6.99-dpms.patch:
 dpms.c |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

--- NEW FILE xserver-1.6.99-dpms.patch ---
>From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Fri, 14 Aug 2009 11:44:35 +0100
Subject: [PATCH] Don't reset the lastDeviceEventTime when doing DPMS actions

When we change the DPMS mode, don't play games with the last event time as
this breaks applications using IDLETIME to turn the backlight off after a
preset time.

This patch fixes gnome-power-manager and xfce-power-manager

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Xext/dpms.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 21ba923..df63a8b 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
     if (!DPMSEnabled)
 	return BadMatch;
 
-    if (stuff->level == DPMSModeOn) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis();
-    } else if (stuff->level == DPMSModeStandby) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSStandbyTime;
-    } else if (stuff->level == DPMSModeSuspend) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSSuspendTime;
-    } else if (stuff->level == DPMSModeOff) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSOffTime;
-    } else {
+    if (stuff->level != DPMSModeOn &&
+        stuff->level != DPMSModeStandby &&
+        stuff->level != DPMSModeSuspend &&
+        stuff->level != DPMSModeOff) {
 	client->errorValue = stuff->level;
 	return BadValue;
     }
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- xorg-x11-server.spec	13 Aug 2009 23:01:32 -0000	1.471
+++ xorg-x11-server.spec	17 Aug 2009 03:29:47 -0000	1.472
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   34.%{gitdate}%{?dist}
+Release:   35.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,6 +82,9 @@ Patch6029: xserver-1.6.1-proc-cmdline.pa
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
+# dpms/idlecounter race condition. upstream soon
+Patch6032: xserver-1.6.99-dpms.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -507,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-35.20090814
+- xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.
+
 * Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-34.20090814
 - Today's git snapshot.
 



From mclasen at fedoraproject.org  Mon Aug 17 03:36:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 17 Aug 2009 03:36:30 +0000 (UTC)
Subject: rpms/control-center/devel slideshow-ui.patch, NONE,
	1.1 control-center.spec, 1.470, 1.471
Message-ID: <20090817033630.22A5A11C0262@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16653

Modified Files:
	control-center.spec 
Added Files:
	slideshow-ui.patch 
Log Message:
Make slide shows visually distinct


slideshow-ui.patch:
 appearance-desktop.c |  187 ++++++++++++++++++++++++++++++++++++++++++++++++---
 appearance.h         |    1 
 gnome-wp-item.c      |   85 +++++++++++++++++++----
 gnome-wp-item.h      |    3 
 gnome-wp-xml.c       |    2 
 5 files changed, 255 insertions(+), 23 deletions(-)

--- NEW FILE slideshow-ui.patch ---
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index bf2f5a1..436c22a 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -131,9 +131,7 @@ static void on_item_changed (GnomeBG *bg, AppearanceData *data) {
 
     pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
     if (pixbuf) {
-      gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter,
-                          0, pixbuf,
-                         -1);
+      gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
       g_object_unref (pixbuf);
     }
 
@@ -316,10 +314,7 @@ wp_scale_type_changed (GtkComboBox *combobox,
   item->options = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_style_menu));
 
   pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
-  gtk_list_store_set (GTK_LIST_STORE (data->wp_model),
-                      &iter,
-                      0, pixbuf,
-                      -1);
+  gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
   if (pixbuf != NULL)
     g_object_unref (pixbuf);
 
@@ -344,9 +339,7 @@ wp_shade_type_changed (GtkWidget *combobox,
   item->shade_type = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_color_menu));
 
   pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
-  gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter,
-                      0, pixbuf,
-                      -1);
+  gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
   if (pixbuf != NULL)
     g_object_unref (pixbuf);
 
@@ -991,6 +984,162 @@ wp_select_after_realize (GtkWidget *widget,
   select_item (data, item, TRUE);
 }
 
+static GdkPixbuf *buttons[3];
+
+static void
+create_button_images (AppearanceData  *data)
+{
+  GtkWidget *widget = (GtkWidget*)data->wp_view;
+  GtkIconSet *icon_set;
+  GdkPixbuf *pixbuf, *pb, *pb2;
+  gint i, w, h;
+
+  icon_set = gtk_style_lookup_icon_set (widget->style, "gtk-media-play");
+  pb = gtk_icon_set_render_icon (icon_set,
+                                 widget->style,
+                                 GTK_TEXT_DIR_RTL,
+                                 GTK_STATE_NORMAL,
+                                 GTK_ICON_SIZE_MENU,
+                                 widget,
+                                 NULL);
+  pb2 = gtk_icon_set_render_icon (icon_set,
+                                  widget->style,
+                                  GTK_TEXT_DIR_LTR,
+                                  GTK_STATE_NORMAL,
+                                  GTK_ICON_SIZE_MENU,
+                                  widget,
+                                  NULL);
+  w = gdk_pixbuf_get_width (pb);
+  h = gdk_pixbuf_get_height (pb);
+
+  for (i = 0; i < 3; i++) {
+    pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 2 * w, h);
+    gdk_pixbuf_fill (pixbuf, 0);
+    if (i > 0)
+      gdk_pixbuf_composite (pb, pixbuf, 0, 0, w, h, 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+    if (i < 2)
+      gdk_pixbuf_composite (pb2, pixbuf, w, 0, w, h, w, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+
+    buttons[i] = pixbuf;
+  }
+
+  g_object_unref (pb);
+  g_object_unref (pb2);
+}
+
+static gboolean
+next_frame (AppearanceData  *data,
+            GtkCellRenderer *cr,
+            gint             direction)
+{
+  GnomeWPItem *item;
+  GtkTreeIter iter;
+  GdkPixbuf *pixbuf, *pb;
+  gint frame;
+
+  pixbuf = NULL;
+
+  frame = data->frame + direction;
+  item = get_selected_item (data, &iter);
+
+  if (frame >= 0)
+    pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame);
+  if (pixbuf) {
+    gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1);
+    g_object_unref (pixbuf);
+    data->frame = frame;
+  }
+
+  pb = buttons[1];
+  if (direction < 0) {
+    if (frame == 0)
+      pb = buttons[0];
+  }
+  else {
+    pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame + 1);
+    if (pixbuf)
+      g_object_unref (pixbuf);
+    else
+      pb = buttons[2];
+  }
+  g_object_set (cr, "pixbuf", pb, NULL);
+}
+
+static gboolean
+wp_button_press_cb (GtkWidget      *widget,
+                    GdkEventButton *event,
+                    AppearanceData *data)
+{
+  GtkCellRenderer *cell;
+  GdkEventButton *button_event = (GdkEventButton *) event;
+
+  if (event->type != GDK_BUTTON_PRESS)
+    return FALSE;
+
+  if (gtk_icon_view_get_item_at_pos (GTK_ICON_VIEW (widget),
+                                     button_event->x, button_event->y,
+                                     NULL, &cell)) {
+    if (g_object_get_data (G_OBJECT (cell), "buttons")) {
+      gint w, h;
+      GtkCellRenderer *cell2 = NULL;
+      gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
+      if (gtk_icon_view_get_item_at_pos (GTK_ICON_VIEW (widget),
+                                         button_event->x + w, button_event->y,
+                                         NULL, &cell2) && cell == cell2)
+        next_frame (data, cell, -1);
+      else
+        next_frame (data, cell, 1);
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+static void
+wp_selected_changed_cb (GtkIconView    *view,
+                        AppearanceData *data)
+{
+  GtkCellRenderer *cr;
+  GList *cells, *l;
+
+  data->frame = -1;
+
+  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (data->wp_view));
+  for (l = cells; l; l = l->next) {
+    cr = l->data;
+    if (g_object_get_data (cr, "buttons"))
+      g_object_set (cr, "pixbuf", buttons[0], NULL);
+  }
+  g_list_free (cells);
+}
+
+static void
+buttons_cell_data_func (GtkCellLayout   *layout,
+                        GtkCellRenderer *cell,
+                        GtkTreeModel    *model,
+                        GtkTreeIter     *iter,
+                        gpointer         user_data)
+{
+  AppearanceData *data = user_data;
+  GtkTreePath *path;
+  GnomeWPItem *item;
+  gboolean visible;
+
+  path = gtk_tree_model_get_path (model, iter);
+
+  if (gtk_icon_view_path_is_selected (GTK_ICON_VIEW (layout), path)) {
+    item = get_selected_item (data, NULL);
+    visible = gnome_bg_changes_with_time (item->bg);
+  }
+  else
+    visible = FALSE;
+
+  g_object_set (G_OBJECT (cell), "visible", visible, NULL);
+
+  gtk_tree_path_free (path);
+}
+
 void
 desktop_init (AppearanceData *data,
 	      const gchar **uris)
@@ -1056,6 +1205,24 @@ desktop_init (AppearanceData *data,
                                   "pixbuf", 0,
                                   NULL);
 
+  cr = gtk_cell_renderer_pixbuf_new ();
+  create_button_images (data);
+  g_object_set (cr,
+                "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
+                "pixbuf", buttons[0],
+                NULL);
+  g_object_set_data (G_OBJECT (cr), "buttons", GINT_TO_POINTER (TRUE));
+
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (data->wp_view), cr, FALSE);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (data->wp_view), cr,
+                                      buttons_cell_data_func, data, NULL);
+  g_signal_connect (data->wp_view, "selection-changed",
+                    (GCallback) wp_selected_changed_cb, data);
+  g_signal_connect (data->wp_view, "button-press-event",
+                    G_CALLBACK (wp_button_press_cb), data);
+
+  data->frame = -1;
+
   gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 2,
                                    (GtkTreeIterCompareFunc) wp_list_sort,
                                    data, NULL);
diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h
index 7c30687..69001ef 100644
--- a/capplets/appearance/appearance.h
+++ b/capplets/appearance/appearance.h
@@ -46,6 +46,7 @@ typedef struct
   GtkFileChooser *wp_filesel;
   GtkWidget *wp_image;
   GSList *wp_uris;
+  gint frame;
 
   /* font */
   GtkWidget *font_details;
diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
index 4e40b07..bf32c51 100644
--- a/capplets/appearance/gnome-wp-item.c
+++ b/capplets/appearance/gnome-wp-item.c
@@ -140,9 +140,9 @@ GnomeWPItem * gnome_wp_item_new (const gchar * filename,
       item->name = g_filename_to_utf8 (item->fileinfo->name, -1, NULL,
 				       NULL, NULL);
 
+    gnome_wp_item_ensure_gnome_bg (item);
     gnome_wp_item_update (item);
     gnome_wp_item_update_description (item);
-    gnome_wp_item_ensure_gnome_bg (item);
 
     g_hash_table_insert (wallpapers, item->filename, item);
   } else {
@@ -177,24 +177,71 @@ void gnome_wp_item_free (GnomeWPItem * item) {
   g_free (item);
 }
 
+static GdkPixbuf *
+add_slideshow_frame (GdkPixbuf *pixbuf)
+{
+  GdkPixbuf *sheet, *sheet2;
+  GdkPixbuf *tmp;
+  gint w, h;
+
+  w = gdk_pixbuf_get_width (pixbuf);
+  h = gdk_pixbuf_get_height (pixbuf);
+
+  sheet = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, w, h);
+  gdk_pixbuf_fill (sheet, 0x00000000);
+  sheet2 = gdk_pixbuf_new_subpixbuf (sheet, 1, 1, w - 2, h - 2);
+  gdk_pixbuf_fill (sheet2, 0xffffffff);
+  g_object_unref (sheet2);
+
+  tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w + 6, h + 6);
+
+  gdk_pixbuf_fill (tmp, 0x00000000);
+  gdk_pixbuf_composite (sheet, tmp, 6, 6, w, h, 6.0, 6.0, 1.0, 1.0, GDK_INTERP_NEAREST, 255);
+  gdk_pixbuf_composite (sheet, tmp, 3, 3, w, h, 3.0, 3.0, 1.0, 1.0, GDK_INTERP_NEAREST, 255);
+  gdk_pixbuf_composite (pixbuf, tmp, 0, 0, w, h, 0.0, 0.0, 1.0, 1.0, GDK_INTERP_NEAREST, 255);
+
+  g_object_unref (sheet);
+
+  return tmp;
+}
+
 #define LIST_IMAGE_WIDTH 108
 
-GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
-					 GnomeDesktopThumbnailFactory * thumbs) {
-  GdkPixbuf *pixbuf;
+GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
+					       GnomeDesktopThumbnailFactory * thumbs,
+                                               gint frame) {
+  GdkPixbuf *pixbuf = NULL;
   double aspect =
     (double)gdk_screen_get_height (gdk_screen_get_default()) /
     gdk_screen_get_width (gdk_screen_get_default());
 
   set_bg_properties (item);
 
-  pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect);
+  if (frame != -1)
+    pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect, frame);
+  else
+    pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect);
+
+  if (pixbuf && gnome_bg_changes_with_time (item->bg))
+    {
+      GdkPixbuf *tmp;
+
+      tmp = add_slideshow_frame (pixbuf);
+      g_object_unref (pixbuf);
+      pixbuf = tmp;
+    }
 
   gnome_bg_get_image_size (item->bg, thumbs, &item->width, &item->height);
 
   return pixbuf;
 }
 
+
+GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
+					 GnomeDesktopThumbnailFactory * thumbs) {
+  return gnome_wp_item_get_frame_thumbnail (item, thumbs, -1);
+}
+
 void gnome_wp_item_update_description (GnomeWPItem * item) {
   g_free (item->description);
 
@@ -202,27 +249,41 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
     item->description = g_strdup (item->name);
   } else {
     const gchar *description;
+    gchar *size;
     gchar *dirname = g_path_get_dirname (item->filename);
 
     if (strcmp (item->fileinfo->mime_type, "application/xml") == 0)
-      description = _("Slide Show");
+      {
+        if (gnome_bg_changes_with_time (item->bg))
+          description = _("Slide Show");
+        else
+          description = _("Image");
+      }
     else
       description = g_content_type_get_description (item->fileinfo->mime_type);
 
+    if (gnome_bg_changes_with_size (item->bg))
+      size = g_strdup (_("multiple sizes"));
+    else
+      /* translators: x pixel(s) by y pixel(s) */
+      size = g_strdup_printf ("%d %s by %d %s",
+                              item->width,
+                              ngettext ("pixel", "pixels", item->width),
+                              item->height,
+                              ngettext ("pixel", "pixels", item->height));
+
     /* translators: <b>wallpaper name</b>
-     * mime type, x pixel(s) by y pixel(s)
+     * mime type, size
      * Folder: /path/to/file
      */
     item->description = g_markup_printf_escaped (_("<b>%s</b>\n"
-                                   "%s, %d %s by %d %s\n"
+                                   "%s, %s\n"
                                    "Folder: %s"),
                                  item->name,
                                  description,
-                                 item->width,
-                                 ngettext ("pixel", "pixels", item->width),
-                                 item->height,
-                                 ngettext ("pixel", "pixels", item->height),
+                                 size,
                                  dirname);
+    g_free (size);
     g_free (dirname);
   }
 }
diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h
index 7a62cdb..63bdb69 100644
--- a/capplets/appearance/gnome-wp-item.h
+++ b/capplets/appearance/gnome-wp-item.h
@@ -72,6 +72,9 @@ GnomeWPItem * gnome_wp_item_new (const gchar *filename,
 void gnome_wp_item_free (GnomeWPItem *item);
 GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem *item,
 					 GnomeDesktopThumbnailFactory *thumbs);
+GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item,
+					 GnomeDesktopThumbnailFactory *thumbs,
+                                         gint frame);
 void gnome_wp_item_update (GnomeWPItem *item);
 void gnome_wp_item_update_description (GnomeWPItem *item);
 void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item);
diff --git a/capplets/appearance/gnome-wp-xml.c b/capplets/appearance/gnome-wp-xml.c
index 59d742b..9d2613d 100644
--- a/capplets/appearance/gnome-wp-xml.c
+++ b/capplets/appearance/gnome-wp-xml.c
@@ -237,9 +237,9 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
 	  wp->name = g_strdup (wp->fileinfo->name);
 	}
 
+        gnome_wp_item_ensure_gnome_bg (wp);
 	gnome_wp_item_update_description (wp);
 	g_hash_table_insert (data->wp_hash, wp->filename, wp);
-        gnome_wp_item_ensure_gnome_bg (wp);
       } else {
 	gnome_wp_item_free (wp);
         wp = NULL;


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -p -r1.470 -r1.471
--- control-center.spec	14 Aug 2009 16:53:30 -0000	1.470
+++ control-center.spec	17 Aug 2009 03:36:29 -0000	1.471
@@ -4,7 +4,7 @@
 %define glib2_version 2.13.0
 %define gtk2_version 2.11.6
 %define gconf2_version 1.2.0
-%define gnome_desktop_version 2.23.90
+%define gnome_desktop_version 2.27.5-5
 %define libgnome_version 2.3.0
 %define libbonobo_version 2.3.0
 %define libgnomeui_version 2.3.0
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch46: no-tweaks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=590349
 Patch47: save-as.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=591375
+Patch50: slideshow-ui.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
@@ -182,6 +185,7 @@ utilities.
 %patch33 -p1 -b .notification-theme
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
+%patch50 -p1 -b .slideshow-ui
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -362,6 +366,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sun Aug 16 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-3
+- Make slide shows visually distinct
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
 - Split off passwd usage patch
 



From roland at fedoraproject.org  Mon Aug 17 04:17:52 2009
From: roland at fedoraproject.org (roland)
Date: Mon, 17 Aug 2009 04:17:52 +0000 (UTC)
Subject: rpms/kernel/devel perf,1.5,1.6
Message-ID: <20090817041752.BE2C811C00E4@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11087

Modified Files:
	perf 
Log Message:
Fix sh quoting.



Index: perf
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/perf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perf	17 Aug 2009 00:38:52 -0000	1.5
+++ perf	17 Aug 2009 04:17:52 -0000	1.6
@@ -3,7 +3,7 @@
 # In pathological situations, this will print some error about uname.
 kverrel="`uname -r`" || exit
 
-exec "/usr/libexec/perf.$kverrel" $@
+exec "/usr/libexec/perf.$kverrel" ${1+"$@"}
 rc=$?
 
 # We're still here, so the exec failed.



From whot at fedoraproject.org  Mon Aug 17 04:38:08 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 17 Aug 2009 04:38:08 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.99-dpms.patch, NONE,
	1.1 xorg-x11-server.spec, 1.456, 1.457
Message-ID: <20090817043808.C38E811C00E4@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-serv14846

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-dpms.patch 
Log Message:
* Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-3
- xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.


xserver-1.6.99-dpms.patch:
 dpms.c |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

--- NEW FILE xserver-1.6.99-dpms.patch ---
>From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Fri, 14 Aug 2009 11:44:35 +0100
Subject: [PATCH] Don't reset the lastDeviceEventTime when doing DPMS actions

When we change the DPMS mode, don't play games with the last event time as
this breaks applications using IDLETIME to turn the backlight off after a
preset time.

This patch fixes gnome-power-manager and xfce-power-manager

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Xext/dpms.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 21ba923..df63a8b 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
     if (!DPMSEnabled)
 	return BadMatch;
 
-    if (stuff->level == DPMSModeOn) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis();
-    } else if (stuff->level == DPMSModeStandby) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSStandbyTime;
-    } else if (stuff->level == DPMSModeSuspend) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSSuspendTime;
-    } else if (stuff->level == DPMSModeOff) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSOffTime;
-    } else {
+    if (stuff->level != DPMSModeOn &&
+        stuff->level != DPMSModeStandby &&
+        stuff->level != DPMSModeSuspend &&
+        stuff->level != DPMSModeOff) {
 	client->errorValue = stuff->level;
 	return BadValue;
     }
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -p -r1.456 -r1.457
--- xorg-x11-server.spec	13 Aug 2009 21:56:11 -0000	1.456
+++ xorg-x11-server.spec	17 Aug 2009 04:38:08 -0000	1.457
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -113,6 +113,8 @@ Patch6047: xserver-1.6.2-vboxvideo.patch
 
 # 501601, upstream, nominated for 1.6.4
 Patch6048: xserver-1.6.3-sync-conditions.patch
+# 501601, part 2.
+Patch6049: xserver-1.6.99-dpms.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -530,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-3
+- xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.
+
 * Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-2
 - xserver-1.6.3-sync-conditions.patch: Fix conditions when checking
   negative transition triggers in the sync extension (#501601)



From cebbert at fedoraproject.org  Mon Aug 17 04:43:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 04:43:07 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-upstream-reverts.patch,1.6,1.6.2.1
Message-ID: <20090817044307.9F4C611C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15686

Modified Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-upstream-reverts.patch 
Log Message:
revert broken 2.6.27.30 fiemap patch

linux-2.6-upstream-reverts.patch:
 drivers/firewire/fw-cdev.c        |    6 +++---
 drivers/firewire/fw-sbp2.c        |   38 +++++++++++++++++++++++++++-----------
 drivers/firewire/fw-topology.c    |    6 ++++--
 drivers/firewire/fw-transaction.h |    2 +-
 drivers/gpu/drm/i915/i915_dma.c   |    2 +-
 fs/compat_ioctl.c                 |    1 +
 6 files changed, 37 insertions(+), 18 deletions(-)

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -p -r1.6 -r1.6.2.1
--- linux-2.6-upstream-reverts.patch	9 Nov 2008 22:38:20 -0000	1.6
+++ linux-2.6-upstream-reverts.patch	17 Aug 2009 04:43:07 -0000	1.6.2.1
@@ -382,3 +382,45 @@ Signed-off-by: Greg Kroah-Hartman <gregk
  	int gap_count;
  	bool beta_repeaters_present;
  
+From 69130c7cf96ea853dc5be599dd6a4b98907d39cc Mon Sep 17 00:00:00 2001
+From: Eric Sandeen <sandeen at redhat.com>
+Date: Thu, 6 Aug 2009 15:07:37 -0700
+Subject: compat_ioctl: hook up compat handler for FIEMAP ioctl
+
+From: Eric Sandeen <sandeen at redhat.com>
+
+commit 69130c7cf96ea853dc5be599dd6a4b98907d39cc upstream.
+
+The FIEMAP_IOC_FIEMAP mapping ioctl was missing a 32-bit compat handler,
+which means that 32-bit suerspace on 64-bit kernels cannot use this ioctl
+command.
+
+The structure is nicely aligned, padded, and sized, so it is just this
+simple.
+
+Tested w/ 32-bit ioctl tester (from Josef) on a 64-bit kernel on ext4.
+
+Signed-off-by: Eric Sandeen <sandeen at redhat.com>
+Cc: <linux-ext4 at vger.kernel.org>
+Cc: Mark Lord <lkml at rtr.ca>
+Cc: Arnd Bergmann <arnd at arndb.de>
+Cc: Josef Bacik <josef at redhat.com>
+Cc: 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>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ fs/compat_ioctl.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fs/compat_ioctl.c
++++ b/fs/compat_ioctl.c
+@@ -1910,6 +1910,7 @@ COMPATIBLE_IOCTL(FIONCLEX)
+ COMPATIBLE_IOCTL(FIOASYNC)
+ COMPATIBLE_IOCTL(FIONBIO)
+ COMPATIBLE_IOCTL(FIONREAD)  /* This is also TIOCINQ */
++COMPATIBLE_IOCTL(FS_IOC_FIEMAP)
+ /* 0x00 */
+ COMPATIBLE_IOCTL(FIBMAP)
+ COMPATIBLE_IOCTL(FIGETBSZ)



From transif at fedoraproject.org  Mon Aug 17 06:01:47 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 17 Aug 2009 06:01:47 +0000 (UTC)
Subject: comps/po zh_CN.po,1.24,1.25
Message-ID: <20090817060147.87B8C11C00E4@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29396/po

Modified Files:
	zh_CN.po 
Log Message:
Sending translation for Chinese (Simplified)


Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- zh_CN.po	29 Apr 2009 20:00:24 -0000	1.24
+++ zh_CN.po	17 Aug 2009 06:01:44 -0000	1.25
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-03-30 15:54+1000\n"
+"PO-Revision-Date: 2009-08-17 16:01+1000\n"
 "Last-Translator: Leah Liu <lliu at redhat.com>\n"
 "Language-Team: Simplified Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -427,15 +427,13 @@ msgstr "?????????????????????????????? Q
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "?????????????????????????????????????????????????????????(X)???"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
@@ -681,8 +679,7 @@ msgstr "?????????"
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:169
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
@@ -721,8 +718,7 @@ msgstr "??????????????????"
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit text files. This includes Emacs and Vi."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????????????????????? Emacs ??? Vi???"
+msgstr "????????????????????????????????????????????????????????????????????????????????????????????? Emacs ??? Vi???"
 
 #: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
 #: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:178
@@ -811,8 +807,7 @@ msgstr "????????????????????????????????
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:200
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "???????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
@@ -823,21 +818,18 @@ msgstr "?????????????????????????????? I
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:202
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "???????????????????????????????????? X ??????????????????????????????"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:204
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "?????????????????????????????????????????????????????? DHCP???Kerberos ??? NIS???"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
@@ -954,15 +946,13 @@ msgstr ""
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:221
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:222
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
@@ -971,13 +961,11 @@ msgstr "????????????????????????????????
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
-msgstr ""
-"???????????????????????????????????????????????????????????? SMB ????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????? SMB ????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:225
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "?????????????????????????????????????????? DNS ???????????????(BIND)???"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
@@ -1266,19 +1254,16 @@ msgid "Amazigh Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "?????????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1289,9 +1274,8 @@ msgid "Electronic Lab"
 msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "?????????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1306,47 +1290,40 @@ msgid "Friulian Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "??????????????????"
+msgstr "Hiligaynon ?????????"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "??????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "?????????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "????????????????????????"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "???????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "???????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1365,14 +1342,12 @@ msgid "Online Help and Documentation"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "??????????????????"
+msgstr "????????????"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1391,14 +1366,12 @@ msgid ""
 msgstr "?????????????????? CAML ???????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "Swati ?????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "??????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""
@@ -1442,8 +1415,7 @@ msgstr ""
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
-msgstr ""
-"??????????????????????????????????????????????????????????????????????????????????????? Emacs ??? Vi???"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????? Emacs ??? Vi???"
 
 #: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
@@ -1462,18 +1434,15 @@ msgid "This group is a collection of net
 msgstr "??????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1481,6 +1450,6 @@ msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
+



From cebbert at fedoraproject.org  Mon Aug 17 06:18:18 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 06:18:18 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-char-remove-low_latency-nozomi-mxser.patch, 
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.80, 1.1206.2.81
Message-ID: <20090817061819.170C711C034A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32627

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-char-remove-low_latency-nozomi-mxser.patch 
Log Message:
Backport F-11 patch to fix oopses in nozomi and mxser drivers.

linux-2.6-char-remove-low_latency-nozomi-mxser.patch:
 mxser.c  |    2 --
 nozomi.c |    1 -
 2 files changed, 3 deletions(-)

--- NEW FILE linux-2.6-char-remove-low_latency-nozomi-mxser.patch ---
From: Chuck Ebbert <cebbert at redhat.com>
Date: Wed, 24 Jun 2009 17:35:13 +0000 (+0100)
Subject: Remove low_latency flag setting from nozomi and mxser drivers
X-Git-Tag: v2.6.31-rc1~16
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d8d4d251df8eaaa3dae71c8cfa7fbf4510d967d

[cebbert at redhat.com: backport to 2.6.27]

Remove low_latency flag setting from nozomi and mxser drivers

The kernel oopses if this flag is set.

[and neither driver should set it as they call tty_flip_buffer_push from IRQ
 paths so have always been buggy]

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
Signed-off-by: Alan Cox <alan at linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 9533f43..52d953e 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -1048,8 +1048,6 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
 	if (retval)
 		return retval;
 
-	/* unmark here for very high baud rate (ex. 921600 bps) used */
-	tty->low_latency = 1;
 	return 0;
 }
 
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index d6102b6..574f1c7 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1591,7 +1591,6 @@ static int ntty_open(struct tty_struct *tty, struct file *file)
 
 	/* Enable interrupt downlink for channel */
 	if (port->tty_open_count == 1) {
-		tty->low_latency = 1;
 		tty->driver_data = port;
 		port->tty = tty;
 		DBG1("open: %d", port->token_dl);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.80
retrieving revision 1.1206.2.81
diff -u -p -r1.1206.2.80 -r1.1206.2.81
--- kernel.spec	17 Aug 2009 02:11:54 -0000	1.1206.2.80
+++ kernel.spec	17 Aug 2009 06:18:16 -0000	1.1206.2.81
@@ -639,6 +639,8 @@ Patch454: linux-2.6-input.git-i8042-add-
 # 490250
 Patch455: linux-2.6-input.git-i8042-add-vostro-1510-to-nomux.patch
 
+Patch458: linux-2.6-char-remove-low_latency-nozomi-mxser.patch
+
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1264,6 +1266,8 @@ ApplyPatch linux-2.6.27-hwmon-applesmc-2
 ApplyPatch linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
 # 490250
 ApplyPatch linux-2.6-input.git-i8042-add-vostro-1510-to-nomux.patch
+# from f-11: fix oopses in nozomi and mxser driver
+ApplyPatch linux-2.6-char-remove-low_latency-nozomi-mxser.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1991,6 +1995,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 17 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.81
+- Backport F-11 patch to fix oopses in nozomi and mxser drivers.
+
 * Sun Aug 16 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.80
 - Linux 2.6.27.30
 - Dropped patch make-sock_sendpage-use-kernel_sendpage.patch



From cebbert at fedoraproject.org  Mon Aug 17 06:23:03 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 06:23:03 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-cdrom-door-status.patch,1.4,1.4.2.1
Message-ID: <20090817062303.242F711C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1043

Modified Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-cdrom-door-status.patch 
Log Message:
replace with official patch for -stable

linux-2.6-cdrom-door-status.patch:
 sr_ioctl.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: linux-2.6-cdrom-door-status.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-cdrom-door-status.patch,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -p -r1.4 -r1.4.2.1
--- linux-2.6-cdrom-door-status.patch	16 Dec 2008 16:31:01 -0000	1.4
+++ linux-2.6-cdrom-door-status.patch	17 Aug 2009 06:23:00 -0000	1.4.2.1
@@ -1,7 +1,10 @@
-From e85e03d7f680b62bb8d4d037fdde6dd94c9582a3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
-Date: Wed, 8 Oct 2008 15:10:39 -0400
-Subject: [PATCH] make sr_mod report more accurate drive status after closing the door.
+Date: Fri, 11 Jul 2008 20:17:05 +0000 (-0400)
+Subject: [SCSI] sr: report more accurate drive status after closing the tray.
+X-Git-Tag: v2.6.30-rc5~53^2~52
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=96bcc722c47d07b6fd05c9d0cb3ab8ea5574c5b1
+
+[SCSI] sr: report more accurate drive status after closing the tray.
 
 So, what's happening here is that the drive is reporting a sense of
 2/4/1 ("logical unit is becoming ready") from sr_test_unit_ready(), and
@@ -13,13 +16,13 @@ not, but there's no way to express that 
 
 My current thought is that if it told us the device isn't yet ready, we
 should return that immediately, since there's nothing that'll tell us
-any more data than that reliably.
+any more data than that reliably:
+
+Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
 ---
- drivers/scsi/sr_ioctl.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
-index ae87d08..7ee51ff 100644
+index d92ff51..291236e 100644
 --- a/drivers/scsi/sr_ioctl.c
 +++ b/drivers/scsi/sr_ioctl.c
 @@ -309,6 +309,11 @@ int sr_drive_status(struct cdrom_device_info *cdi, int slot)
@@ -34,6 +37,3 @@ index ae87d08..7ee51ff 100644
  	if (!cdrom_get_media_event(cdi, &med)) {
  		if (med.media_present)
  			return CDS_DISC_OK;
--- 
-1.6.0.1
-



From pnemade at fedoraproject.org  Mon Aug 17 06:31:43 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 06:31:43 +0000 (UTC)
Subject: rpms/m17n-lib/F-10 m17n-lib.spec,1.22,1.23 sources,1.12,1.13
Message-ID: <20090817063143.B77E811C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2515

Modified Files:
	m17n-lib.spec sources 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-1
- update to new upstream release 1.5.4





Index: m17n-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/F-10/m17n-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- m17n-lib.spec	21 Oct 2008 10:17:24 -0000	1.22
+++ m17n-lib.spec	17 Aug 2009 06:31:40 -0000	1.23
@@ -4,7 +4,7 @@
 %define with_examples 0
 
 Name:    m17n-lib
-Version:  1.5.3
+Version:  1.5.4
 Release:  1%{?dist}
 Summary:  Multilingual text library
 
@@ -96,6 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-1
+- update to new upstream release 1.5.4
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Oct 21 2008 Parag Nemade <pnemade at redhat.com> -1.5.3-1.fc10
 - Update to new upstream release 1.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Oct 2008 10:17:24 -0000	1.12
+++ sources	17 Aug 2009 06:31:41 -0000	1.13
@@ -1 +1 @@
-6c6c243a14305fee373283b553226215  m17n-lib-1.5.3.tar.gz
+f7ef72fc1e084c6fc6fb3ba9663fd151  m17n-lib-1.5.4.tar.gz



From pnemade at fedoraproject.org  Mon Aug 17 06:39:18 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 06:39:18 +0000 (UTC)
Subject: rpms/m17n-db/F-11 m17n-db.spec,1.99,1.100 sources,1.70,1.71
Message-ID: <20090817063918.3C9CD11C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4654

Modified Files:
	m17n-db.spec sources 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
- update to new upstream release 1.5.5





Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/F-11/m17n-db.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- m17n-db.spec	8 Apr 2009 09:19:59 -0000	1.99
+++ m17n-db.spec	17 Aug 2009 06:39:17 -0000	1.100
@@ -1,7 +1,7 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
-Version:    1.5.4
-Release:    2%{?dist}
+Version:    1.5.5
+Release:    1%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
@@ -274,6 +274,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/m17n/ug-*.mim
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
+- update to new upstream release 1.5.5
+
 * Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-2
 - Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/F-11/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	3 Mar 2009 05:49:51 -0000	1.70
+++ sources	17 Aug 2009 06:39:17 -0000	1.71
@@ -1 +1 @@
-c29db871d1e9c3cdde5891f1380c9eb2  m17n-db-1.5.4.tar.gz
+a6fa9486caed6fe2a09d89fe97787696  m17n-db-1.5.5.tar.gz



From pnemade at fedoraproject.org  Mon Aug 17 06:43:57 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 06:43:57 +0000 (UTC)
Subject: rpms/m17n-lib/devel .cvsignore, 1.11, 1.12 m17n-lib.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <20090817064357.E05A911C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5512

Modified Files:
	.cvsignore m17n-lib.spec sources 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
- update to new upstream release 1.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Mar 2009 04:45:29 -0000	1.11
+++ .cvsignore	17 Aug 2009 06:43:57 -0000	1.12
@@ -1 +1 @@
-m17n-lib-1.5.4.tar.gz
+m17n-lib-1.5.5.tar.gz


Index: m17n-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- m17n-lib.spec	25 Jul 2009 11:35:39 -0000	1.25
+++ m17n-lib.spec	17 Aug 2009 06:43:57 -0000	1.26
@@ -4,8 +4,8 @@
 %define with_examples 0
 
 Name:    m17n-lib
-Version:  1.5.4
-Release:  2%{?dist}
+Version:  1.5.5
+Release:  1%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
+- update to new upstream release 1.5.5
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Mar 2009 04:45:29 -0000	1.13
+++ sources	17 Aug 2009 06:43:57 -0000	1.14
@@ -1 +1 @@
-f7ef72fc1e084c6fc6fb3ba9663fd151  m17n-lib-1.5.4.tar.gz
+924875cfc30ac6620744b67385ecc144  m17n-lib-1.5.5.tar.gz



From mhlavink at fedoraproject.org  Mon Aug 17 07:47:27 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 17 Aug 2009 07:47:27 +0000 (UTC)
Subject: rpms/squirrelmail/devel .cvsignore,1.26,1.27 sources,1.26,1.27
Message-ID: <20090817074727.E063111C00E4@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17251

Modified Files:
	.cvsignore sources 
Log Message:
update source files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	22 May 2009 07:02:00 -0000	1.26
+++ .cvsignore	17 Aug 2009 07:47:26 -0000	1.27
@@ -1,2 +1,2 @@
 all_locales-1.4.13-20071220.tar.bz2
-squirrelmail-1.4.19.tar.bz2
+squirrelmail-1.4.20RC1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	22 May 2009 07:02:00 -0000	1.26
+++ sources	17 Aug 2009 07:47:26 -0000	1.27
@@ -1,2 +1,2 @@
 c6463312afcd602ae60fd8f388dfb8c2  all_locales-1.4.13-20071220.tar.bz2
-b7c5ebf0a57fe3511042a740ff1b5710  squirrelmail-1.4.19.tar.bz2
+7632177bd3618cd9965e548fd196f737  squirrelmail-1.4.20RC1.tar.bz2



From rrakus at fedoraproject.org  Mon Aug 17 07:53:21 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon, 17 Aug 2009 07:53:21 +0000 (UTC)
Subject: rpms/iprutils/devel .cvsignore, 1.16, 1.17 iprutils.spec, 1.38,
	1.39 sources, 1.17, 1.18 iprutils-swab-moved.patch, 1.1, NONE
Message-ID: <20090817075321.ADDBC11C00E4@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/iprutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18224

Modified Files:
	.cvsignore iprutils.spec sources 
Removed Files:
	iprutils-swab-moved.patch 
Log Message:
Bump to version 2.2.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	21 Nov 2008 13:23:41 -0000	1.16
+++ .cvsignore	17 Aug 2009 07:53:21 -0000	1.17
@@ -1 +1 @@
-iprutils-2.2.13-src.tgz
+iprutils-2.2.16-src.tgz


Index: iprutils.spec
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- iprutils.spec	25 Jul 2009 03:32:04 -0000	1.38
+++ iprutils.spec	17 Aug 2009 07:53:21 -0000	1.39
@@ -1,16 +1,14 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
-Version: 2.2.13
-Release: 4%{?dist}
+Version: 2.2.16
+Release: 1%{?dist}
 License: CPL
 Group:   System Environment/Base
 URL:     http://sourceforge.net/projects/iprdd/
 
-Source0: http://osdn.dl.sourceforge.net/sourceforge/iprdd/%{name}-%{version}-src.tgz
+Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}-src.tgz
 Patch0:  %{name}-cflags.patch
-#Patch1:  %{name}-lsb-init-ectomy.patch
-Patch2: %{name}-initscripts.patch
-Patch3: iprutils-swab-moved.patch
+Patch1:  %{name}-initscripts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
 
@@ -30,10 +28,9 @@ supported by the ipr SCSI storage device
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-#%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -b .swab-moved
+%patch0 -p1 -b .cflags
+%patch1 -p1 -b .initscripts
+
 %build
 CFLAGS="%{optflags}" %{__make}
 
@@ -67,6 +64,9 @@ CFLAGS="%{optflags}" %{__make}
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Aug 17 2009 Roman Rakus <rrakus at redhat.com> - 2.2.16-1
+- Bump to version 2.2.16
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Nov 2008 13:23:41 -0000	1.17
+++ sources	17 Aug 2009 07:53:21 -0000	1.18
@@ -1 +1 @@
-c5ac4eb628ee16fd7816f94c226d6a5b  iprutils-2.2.13-src.tgz
+611d469e77d94bb56d62a63ead4c0830  iprutils-2.2.16-src.tgz


--- iprutils-swab-moved.patch DELETED ---



From petersen at fedoraproject.org  Mon Aug 17 07:59:26 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 17 Aug 2009 07:59:26 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.84,1.85
Message-ID: <20090817075926.EA27E11C00E4@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17964

Modified Files:
	comps-f12.xml.in 
Log Message:
make some cjk fonts optional:
[ja] vlgothic and japanese-bitmap fonts
[ko] baekmuk and un-extra fonts
[zh] taipei fonts



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- comps-f12.xml.in	15 Aug 2009 08:34:09 -0000	1.84
+++ comps-f12.xml.in	17 Aug 2009 07:59:26 -0000	1.85
@@ -672,7 +672,6 @@
       <packagereq type="conditional" requires="moodle">moodle-zh_tw</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
-      <packagereq type="default">taipeifonts</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
@@ -690,6 +689,7 @@
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">stardict-dic-zh_CN</packagereq>
       <packagereq type="optional">stardict-dic-zh_TW</packagereq>
+      <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">wqy-unibit-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
@@ -3306,15 +3306,13 @@
       <packagereq type="default">ipa-mincho-fonts</packagereq>
       <packagereq type="default">ipa-pgothic-fonts</packagereq>
       <packagereq type="default">ipa-pmincho-fonts</packagereq>
-      <packagereq type="default">japanese-bitmap-fonts</packagereq>
-      <packagereq type="default">vlgothic-fonts</packagereq>
-      <packagereq type="default">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">cmigemo</packagereq>
       <packagereq type="optional">ddskk</packagereq>
       <packagereq type="optional">ddskk-xemacs</packagereq>
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
+      <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">kcc</packagereq>
@@ -3340,6 +3338,8 @@
       <packagereq type="optional">stardict-dic-ja</packagereq>
       <packagereq type="optional">uim-canna</packagereq>
       <packagereq type="optional">uim-skk</packagereq>
+      <packagereq type="optional">vlgothic-fonts</packagereq>
+      <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">wkf</packagereq>
     </packagelist>
   </group>
@@ -3740,7 +3740,6 @@
     <uservisible>true</uservisible>
     <langonly>ko</langonly>
     <packagelist>
-      <packagereq type="mandatory">un-core-fonts-dotum</packagereq>
       <packagereq type="conditional" requires="autocorr-en">autocorr-ko</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ko</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ko</packagereq>
@@ -3750,31 +3749,32 @@
       <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="default">baekmuk-bdf-fonts</packagereq>
-      <packagereq type="default">baekmuk-ttf-batang-fonts</packagereq>
-      <packagereq type="default">baekmuk-ttf-dotum-fonts</packagereq>
-      <packagereq type="default">baekmuk-ttf-gulim-fonts</packagereq>
-      <packagereq type="default">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="default">un-core-fonts-batang</packagereq>
       <packagereq type="default">un-core-fonts-dinaru</packagereq>
+      <packagereq type="default">un-core-fonts-dotum</packagereq>
       <packagereq type="default">un-core-fonts-graphic</packagereq>
       <packagereq type="default">un-core-fonts-gungseo</packagereq>
       <packagereq type="default">un-core-fonts-pilgi</packagereq>
-      <packagereq type="default">un-extra-fonts-bom</packagereq>
-      <packagereq type="default">un-extra-fonts-jamobatang</packagereq>
-      <packagereq type="default">un-extra-fonts-jamodotum</packagereq>
-      <packagereq type="default">un-extra-fonts-jamonovel</packagereq>
-      <packagereq type="default">un-extra-fonts-jamosora</packagereq>
-      <packagereq type="default">un-extra-fonts-pen</packagereq>
-      <packagereq type="default">un-extra-fonts-penheulim</packagereq>
-      <packagereq type="default">un-extra-fonts-pilgia</packagereq>
-      <packagereq type="default">un-extra-fonts-shinmun</packagereq>
-      <packagereq type="default">un-extra-fonts-taza</packagereq>
-      <packagereq type="default">un-extra-fonts-vada</packagereq>
-      <packagereq type="default">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
+      <packagereq type="optional">baekmuk-ttf-batang-fonts</packagereq>
+      <packagereq type="optional">baekmuk-ttf-dotum-fonts</packagereq>
+      <packagereq type="optional">baekmuk-ttf-gulim-fonts</packagereq>
+      <packagereq type="optional">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>
       <packagereq type="optional">nabi</packagereq>
+      <packagereq type="optional">un-extra-fonts-bom</packagereq>
+      <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
+      <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
+      <packagereq type="optional">un-extra-fonts-jamonovel</packagereq>
+      <packagereq type="optional">un-extra-fonts-jamosora</packagereq>
+      <packagereq type="optional">un-extra-fonts-pen</packagereq>
+      <packagereq type="optional">un-extra-fonts-penheulim</packagereq>
+      <packagereq type="optional">un-extra-fonts-pilgia</packagereq>
+      <packagereq type="optional">un-extra-fonts-shinmun</packagereq>
+      <packagereq type="optional">un-extra-fonts-taza</packagereq>
+      <packagereq type="optional">un-extra-fonts-vada</packagereq>
+      <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
     </packagelist>
   </group>
   <group>



From markmc at fedoraproject.org  Mon Aug 17 08:08:48 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 17 Aug 2009 08:08:48 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-0.6.4-svirt-sound.patch, 1.1,
	1.2 libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch,
	1.1, 1.2 libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch,
	1.1, 1.2 libvirt-0.7.0-numa-ignore-fail.patch, 1.1,
	1.2 libvirt-0.7.0-policy-kit-rewrite.patch, 1.1,
	1.2 libvirt.spec, 1.169, 1.170
Message-ID: <20090817080848.693AA11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20576

Modified Files:
	libvirt-0.6.4-svirt-sound.patch 
	libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch 
	libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch 
	libvirt-0.7.0-numa-ignore-fail.patch 
	libvirt-0.7.0-policy-kit-rewrite.patch libvirt.spec 
Log Message:
Sync patches from git


libvirt-0.6.4-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.4-svirt-sound.patch	29 May 2009 17:28:28 -0000	1.1
+++ libvirt-0.6.4-svirt-sound.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,6 +1,21 @@
---- src/qemu_conf.c.orig	2009-05-29 19:24:59.000000000 +0200
-+++ src/qemu_conf.c	2009-05-29 19:19:39.000000000 +0200
-@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr 
+From f9355301cf4dda452308b616e8c00e59be5aec0a Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 17 Aug 2009 08:32:08 +0100
+Subject: [PATCH] Disable sound cards when running sVirt
+
+Temporary hack till PulseAudio autostart problems are sorted out when
+SELinux enforcing (bz 486112)
+
+Fedora-patch: libvirt-0.6.4-svirt-sound.patch
+---
+ src/qemu_conf.c |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 6b0b404..53186e0 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -1384,6 +1384,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
      char uuid[VIR_UUID_STRING_BUFLEN];
      char domid[50];
      const char *cpu = NULL;
@@ -10,7 +25,7 @@
 +        driver->securityDriver->name &&
 +        STREQ(driver->securityDriver->name, "selinux") &&
 +        getuid() == 0) {
-+        static int soundWarned = 0; 
++        static int soundWarned = 0;
 +        skipSound = 1;
 +        if (def->nsounds &&
 +            !soundWarned) {
@@ -21,7 +36,7 @@
  
      uname_normalize(&ut);
  
-@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
+@@ -2015,7 +2029,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
      }
  
      /* Add sound hardware */
@@ -31,3 +46,6 @@
          int size = 100;
          char *modstr;
          if (VIR_ALLOC_N(modstr, size+1) < 0)
+-- 
+1.6.2.5
+

libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch:
 qemu_driver.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Index: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch	6 Aug 2009 15:01:49 -0000	1.1
+++ libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,4 +1,6 @@
+From 541cfdf5465ac3bba2c0c0901950547bc6638e47 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
+Date: Thu, 6 Aug 2009 15:14:19 +0100
 Subject: [PATCH] chown kernel/initrd before spawning qemu
 
 If we're running qemu unprivileged, we need to chown any supplied kernel
@@ -8,6 +10,10 @@ or initrd before spawning it.
   qemuDomainSetFileOwnership(), pass it a path string instead of a disk
   definition and use it for chowning the kernel/initrd in
   qemuDomainSetAllDeviceOwnership()
+
+(cherry picked from commit c42b39784534930791d1feb3de859d85a7848168)
+
+Fedora-patch: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
 ---
  src/qemu_driver.c |   20 ++++++++++++--------
  1 files changed, 12 insertions(+), 8 deletions(-)

libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch:
 network_driver.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch	10 Aug 2009 10:24:12 -0000	1.1
+++ libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,4 +1,6 @@
+From ddf0a7cb04debe60825d11186e68cc6de6fd1dd2 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
+Date: Mon, 10 Aug 2009 11:16:37 +0100
 Subject: [PATCH] Handle kernels with no ipv6 support
 
 If the ipv6 kernel module is not loaded, then we get this when starting
@@ -13,6 +15,10 @@ way.
 
 * src/network_driver.c: make networkDisableIPV6() not fail if the kernel
   has no ipv6 support
+
+(cherry picked from commit f5a8f969dd92ec2744e1eec5d35288d5fbcded22)
+
+Fedora-patch: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
 ---
  src/network_driver.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)

libvirt-0.7.0-numa-ignore-fail.patch:
 capabilities.c |    1 +
 lxc_conf.c     |   12 ++++++++++--
 uml_conf.c     |   12 +++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

Index: libvirt-0.7.0-numa-ignore-fail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-numa-ignore-fail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-numa-ignore-fail.patch	13 Aug 2009 15:30:19 -0000	1.1
+++ libvirt-0.7.0-numa-ignore-fail.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,16 +1,24 @@
-commit 19bac57b26c2d46ac8a7601158f210f34acdceac
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Thu Aug 13 11:56:31 2009 +0100
-
-    Make LXC / UML drivers robust against NUMA topology brokenness
-    
-    Some kernel versions expose broken NUMA topology for some machines.
-    This causes the LXC/UML drivers to fail to start. QEMU driver was
-    already fixed for this problem
-    
-    * src/lxc_conf.c: Log and ignore failure to populate NUMA info
-    * src/uml_conf.c: Log and ignore failure to populate NUMA info
-    * src/capabilities.c: Reset nnumaCell to 0 after freeing
+From 663bf081dc6737c7fcc68a7ca1169aca60fbf8e5 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Thu, 13 Aug 2009 11:56:31 +0100
+Subject: [PATCH] Make LXC / UML drivers robust against NUMA topology brokenness
+
+Some kernel versions expose broken NUMA topology for some machines.
+This causes the LXC/UML drivers to fail to start. QEMU driver was
+already fixed for this problem
+
+* src/lxc_conf.c: Log and ignore failure to populate NUMA info
+* src/uml_conf.c: Log and ignore failure to populate NUMA info
+* src/capabilities.c: Reset nnumaCell to 0 after freeing
+
+(cherry picked from commit 19bac57b26c2d46ac8a7601158f210f34acdceac)
+
+Fedora-patch: libvirt-0.7.0-numa-ignore-fail.patch
+---
+ src/capabilities.c |    1 +
+ src/lxc_conf.c     |   12 ++++++++++--
+ src/uml_conf.c     |   11 +++++++++--
+ 3 files changed, 20 insertions(+), 4 deletions(-)
 
 diff --git a/src/capabilities.c b/src/capabilities.c
 index c6766b6..193a9fe 100644
@@ -83,3 +91,6 @@ index 48e05a8..4f756d4 100644
  
      if ((guest = virCapabilitiesAddGuest(caps,
                                           "uml",
+-- 
+1.6.2.5
+

libvirt-0.7.0-policy-kit-rewrite.patch:
 b/configure.in            |   73 +++++++++++++++++++++++++++--------------
 b/qemud/Makefile.am       |   11 +++++-
 b/qemud/libvirtd.policy-0 |   42 +++++++++++++++++++++++
 b/qemud/libvirtd.policy-1 |   42 +++++++++++++++++++++++
 b/qemud/qemud.c           |    4 +-
 b/qemud/qemud.h           |    4 +-
 b/qemud/remote.c          |   81 +++++++++++++++++++++++++++++++++++++++++++---
 b/src/remote_internal.c   |    8 +++-
 qemud/libvirtd.policy     |   42 -----------------------
 9 files changed, 230 insertions(+), 77 deletions(-)

Index: libvirt-0.7.0-policy-kit-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-policy-kit-rewrite.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-policy-kit-rewrite.patch	13 Aug 2009 15:27:42 -0000	1.1
+++ libvirt-0.7.0-policy-kit-rewrite.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,6 +1,28 @@
-diff -rupN libvirt-0.7.0/configure.in libvirt-0.7.0.new/configure.in
---- libvirt-0.7.0/configure.in	2009-08-05 08:53:49.000000000 -0400
-+++ libvirt-0.7.0.new/configure.in	2009-08-13 08:37:22.393897620 -0400
+From d54fc5008d465d192101a0cb78fd02c437dff736 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 17 Aug 2009 08:32:08 +0100
+Subject: [PATCH] Policykit rewrite (bug #499970)
+
+Fedora-patch: libvirt-0.7.0-policy-kit-rewrite.patch
+---
+ configure.in            |   73 ++++++++++++++++++++++++++++--------------
+ qemud/Makefile.am       |   11 +++++-
+ qemud/libvirtd.policy   |   42 ------------------------
+ qemud/libvirtd.policy-0 |   42 ++++++++++++++++++++++++
+ qemud/libvirtd.policy-1 |   42 ++++++++++++++++++++++++
+ qemud/qemud.c           |    4 +-
+ qemud/qemud.h           |    4 +-
+ qemud/remote.c          |   81 ++++++++++++++++++++++++++++++++++++++++++++--
+ src/remote_internal.c   |    7 ++++
+ 9 files changed, 230 insertions(+), 76 deletions(-)
+ delete mode 100644 qemud/libvirtd.policy
+ create mode 100644 qemud/libvirtd.policy-0
+ create mode 100644 qemud/libvirtd.policy-1
+
+diff --git a/configure.in b/configure.in
+index 45fa9ed..d28c44a 100644
+--- a/configure.in
++++ b/configure.in
 @@ -641,40 +641,61 @@ AC_SUBST([SASL_LIBS])
  dnl PolicyKit library
  POLKIT_CFLAGS=
@@ -99,9 +121,48 @@ diff -rupN libvirt-0.7.0/configure.in li
  else
  AC_MSG_NOTICE([  polkit: no])
  fi
-diff -rupN libvirt-0.7.0/qemud/libvirtd.policy libvirt-0.7.0.new/qemud/libvirtd.policy
---- libvirt-0.7.0/qemud/libvirtd.policy	2009-07-22 09:37:32.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/libvirtd.policy	1969-12-31 19:00:00.000000000 -0500
+diff --git a/qemud/Makefile.am b/qemud/Makefile.am
+index 959ff88..3d143da 100644
+--- a/qemud/Makefile.am
++++ b/qemud/Makefile.am
+@@ -21,7 +21,8 @@ EXTRA_DIST =						\
+ 	remote_protocol.x				\
+ 	libvirtd.conf					\
+ 	libvirtd.init.in				\
+-	libvirtd.policy					\
++	libvirtd.policy-0				\
++	libvirtd.policy-1				\
+ 	libvirtd.sasl					\
+ 	libvirtd.sysconf				\
+ 	libvirtd.aug                                    \
+@@ -147,7 +148,13 @@ endif
+ libvirtd_LDADD += ../src/libvirt.la
+ 
+ if HAVE_POLKIT
++if HAVE_POLKIT0
+ policydir = $(datadir)/PolicyKit/policy
++policyfile = libvirtd.policy-0
++else
++policydir = $(datadir)/polkit-1/actions
++policyfile = libvirtd.policy-1
++endif
+ endif
+ 
+ if HAVE_AVAHI
+@@ -197,7 +204,7 @@ endif
+ if HAVE_POLKIT
+ install-data-polkit:: install-init
+ 	mkdir -p $(DESTDIR)$(policydir)
+-	$(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
++	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+ uninstall-data-polkit:: install-init
+ 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+ else
+diff --git a/qemud/libvirtd.policy b/qemud/libvirtd.policy
+deleted file mode 100644
+index b6da946..0000000
+--- a/qemud/libvirtd.policy
++++ /dev/null
 @@ -1,42 +0,0 @@
 -<!DOCTYPE policyconfig PUBLIC
 - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
@@ -145,9 +206,11 @@ diff -rupN libvirt-0.7.0/qemud/libvirtd.
 -      </defaults>
 -    </action>
 -</policyconfig>
-diff -rupN libvirt-0.7.0/qemud/libvirtd.policy-0 libvirt-0.7.0.new/qemud/libvirtd.policy-0
---- libvirt-0.7.0/qemud/libvirtd.policy-0	1969-12-31 19:00:00.000000000 -0500
-+++ libvirt-0.7.0.new/qemud/libvirtd.policy-0	2009-08-13 08:37:22.408883879 -0400
+diff --git a/qemud/libvirtd.policy-0 b/qemud/libvirtd.policy-0
+new file mode 100644
+index 0000000..b6da946
+--- /dev/null
++++ b/qemud/libvirtd.policy-0
 @@ -0,0 +1,42 @@
 +<!DOCTYPE policyconfig PUBLIC
 + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
@@ -191,9 +254,11 @@ diff -rupN libvirt-0.7.0/qemud/libvirtd.
 +      </defaults>
 +    </action>
 +</policyconfig>
-diff -rupN libvirt-0.7.0/qemud/libvirtd.policy-1 libvirt-0.7.0.new/qemud/libvirtd.policy-1
---- libvirt-0.7.0/qemud/libvirtd.policy-1	1969-12-31 19:00:00.000000000 -0500
-+++ libvirt-0.7.0.new/qemud/libvirtd.policy-1	2009-08-13 08:37:22.412905763 -0400
+diff --git a/qemud/libvirtd.policy-1 b/qemud/libvirtd.policy-1
+new file mode 100644
+index 0000000..6fa3a5e
+--- /dev/null
++++ b/qemud/libvirtd.policy-1
 @@ -0,0 +1,42 @@
 +<!DOCTYPE policyconfig PUBLIC
 + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
@@ -237,46 +302,11 @@ diff -rupN libvirt-0.7.0/qemud/libvirtd.
 +      </defaults>
 +    </action>
 +</policyconfig>
-diff -rupN libvirt-0.7.0/qemud/Makefile.am libvirt-0.7.0.new/qemud/Makefile.am
---- libvirt-0.7.0/qemud/Makefile.am	2009-07-22 09:37:32.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/Makefile.am	2009-08-13 08:37:22.398915449 -0400
-@@ -21,7 +21,8 @@ EXTRA_DIST =						\
- 	remote_protocol.x				\
- 	libvirtd.conf					\
- 	libvirtd.init.in				\
--	libvirtd.policy					\
-+	libvirtd.policy-0				\
-+	libvirtd.policy-1				\
- 	libvirtd.sasl					\
- 	libvirtd.sysconf				\
- 	libvirtd.aug                                    \
-@@ -147,7 +148,13 @@ endif
- libvirtd_LDADD += ../src/libvirt.la
- 
- if HAVE_POLKIT
-+if HAVE_POLKIT0
- policydir = $(datadir)/PolicyKit/policy
-+policyfile = libvirtd.policy-0
-+else
-+policydir = $(datadir)/polkit-1/actions
-+policyfile = libvirtd.policy-1
-+endif
- endif
- 
- if HAVE_AVAHI
-@@ -197,7 +204,7 @@ endif
- if HAVE_POLKIT
- install-data-polkit:: install-init
- 	mkdir -p $(DESTDIR)$(policydir)
--	$(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-+	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- uninstall-data-polkit:: install-init
- 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- else
-diff -rupN libvirt-0.7.0/qemud/qemud.c libvirt-0.7.0.new/qemud/qemud.c
---- libvirt-0.7.0/qemud/qemud.c	2009-07-22 09:37:32.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/qemud.c	2009-08-13 08:37:22.419878018 -0400
-@@ -895,7 +895,7 @@ static struct qemud_server *qemudNetwork
+diff --git a/qemud/qemud.c b/qemud/qemud.c
+index 3e551ca..50b0cdd 100644
+--- a/qemud/qemud.c
++++ b/qemud/qemud.c
+@@ -895,7 +895,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
      }
  #endif
  
@@ -285,7 +315,7 @@ diff -rupN libvirt-0.7.0/qemud/qemud.c l
      if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
          auth_unix_ro == REMOTE_AUTH_POLKIT) {
          DBusError derr;
-@@ -982,7 +982,7 @@ static struct qemud_server *qemudNetwork
+@@ -982,7 +982,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
              sock = sock->next;
          }
  
@@ -294,9 +324,10 @@ diff -rupN libvirt-0.7.0/qemud/qemud.c l
          if (server->sysbus)
              dbus_connection_unref(server->sysbus);
  #endif
-diff -rupN libvirt-0.7.0/qemud/qemud.h libvirt-0.7.0.new/qemud/qemud.h
---- libvirt-0.7.0/qemud/qemud.h	2009-07-23 12:33:02.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/qemud.h	2009-08-13 08:37:22.425909852 -0400
+diff --git a/qemud/qemud.h b/qemud/qemud.h
+index 254db44..e8ce209 100644
+--- a/qemud/qemud.h
++++ b/qemud/qemud.h
 @@ -34,7 +34,7 @@
  #include <sasl/sasl.h>
  #endif
@@ -315,9 +346,10 @@ diff -rupN libvirt-0.7.0/qemud/qemud.h l
      DBusConnection *sysbus;
  #endif
  };
-diff -rupN libvirt-0.7.0/qemud/remote.c libvirt-0.7.0.new/qemud/remote.c
---- libvirt-0.7.0/qemud/remote.c	2009-07-23 12:33:02.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/remote.c	2009-08-13 08:37:22.431865087 -0400
+diff --git a/qemud/remote.c b/qemud/remote.c
+index d32d513..490a807 100644
+--- a/qemud/remote.c
++++ b/qemud/remote.c
 @@ -43,7 +43,7 @@
  #include <fnmatch.h>
  #include "virterror_internal.h"
@@ -327,7 +359,7 @@ diff -rupN libvirt-0.7.0/qemud/remote.c 
  #include <polkit/polkit.h>
  #include <polkit-dbus/polkit-dbus.h>
  #endif
-@@ -3106,7 +3106,80 @@ remoteDispatchAuthSaslStep (struct qemud
+@@ -3106,7 +3106,80 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED,
  #endif /* HAVE_SASL */
  
  
@@ -418,7 +450,7 @@ diff -rupN libvirt-0.7.0/qemud/remote.c 
  
  static int
  remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
-@@ -3231,7 +3304,7 @@ remoteDispatchAuthPolkit (struct qemud_s
+@@ -3231,7 +3304,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
      remoteDispatchAuthError(rerr);
      return -1;
  }
@@ -427,10 +459,11 @@ diff -rupN libvirt-0.7.0/qemud/remote.c 
  
  
  /***************************************************************
-diff -rupN libvirt-0.7.0/src/remote_internal.c libvirt-0.7.0.new/src/remote_internal.c
---- libvirt-0.7.0/src/remote_internal.c	2009-07-29 10:42:15.000000000 -0400
-+++ libvirt-0.7.0.new/src/remote_internal.c	2009-08-13 10:55:57.607899170 -0400
-@@ -6201,6 +6201,7 @@ remoteAuthPolkit (virConnectPtr conn, st
+diff --git a/src/remote_internal.c b/src/remote_internal.c
+index a58b768..e98c99b 100644
+--- a/src/remote_internal.c
++++ b/src/remote_internal.c
+@@ -6201,6 +6201,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
                    virConnectAuthPtr auth)
  {
      remote_auth_polkit_ret ret;
@@ -438,7 +471,7 @@ diff -rupN libvirt-0.7.0/src/remote_inte
      int i, allowcb = 0;
      virConnectCredential cred = {
          VIR_CRED_EXTERNAL,
-@@ -6210,8 +6211,10 @@ remoteAuthPolkit (virConnectPtr conn, st
+@@ -6210,8 +6211,10 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
          NULL,
          0,
      };
@@ -449,7 +482,7 @@ diff -rupN libvirt-0.7.0/src/remote_inte
      if (auth && auth->cb) {
          /* Check if the necessary credential type for PolicyKit is supported */
          for (i = 0 ; i < auth->ncredtype ; i++) {
-@@ -6220,6 +6223,7 @@ remoteAuthPolkit (virConnectPtr conn, st
+@@ -6220,6 +6223,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
          }
  
          if (allowcb) {
@@ -457,7 +490,7 @@ diff -rupN libvirt-0.7.0/src/remote_inte
              /* Run the authentication callback */
              if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
                  virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
-@@ -6233,6 +6237,9 @@ remoteAuthPolkit (virConnectPtr conn, st
+@@ -6233,6 +6237,9 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
      } else {
          DEBUG0("No auth callback provided");
      }
@@ -467,3 +500,6 @@ diff -rupN libvirt-0.7.0/src/remote_inte
  
      memset (&ret, 0, sizeof ret);
      if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT,
+-- 
+1.6.2.5
+


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- libvirt.spec	13 Aug 2009 15:43:14 -0000	1.169
+++ libvirt.spec	17 Aug 2009 08:08:46 -0000	1.170
@@ -78,7 +78,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 4%{?dist}%{?extra_release}
+Release: 5%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -282,7 +282,7 @@ of recent versions of Linux (and other O
 %patch03 -p1
 %patch04 -p1
 
-%patch200 -p0
+%patch200 -p1
 
 %build
 %if ! %{with_xen}



From markmc at fedoraproject.org  Mon Aug 17 08:08:58 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 17 Aug 2009 08:08:58 +0000 (UTC)
Subject: rpms/libvirt/F-11
	libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch, 1.1,
	1.2 libvirt-0.6.2-bring-up-ipless-bridge.patch, 1.1,
	1.2 libvirt-0.6.2-buf-locale-escape.patch, 1.1,
	1.2 libvirt-0.6.2-do-not-log-monitor-output.patch, 1.1, 1.2
	libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch,
	1.1, 1.2 libvirt-0.6.2-enable-qemu-0-10-migration.patch, 1.1,
	1.2 libvirt-0.6.2-event-handling-1.patch, 1.1,
	1.2 libvirt-0.6.2-event-handling-2.patch, 1.1,
	1.2 libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch,
	1.1, 1.2 libvirt-0.6.2-fix-nosource-label.patch, 1.1,
	1.2 libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch, 1.1,
	1.2 libvirt-0.6.2-hotplug-labelling.patch, 1.1,
	1.2 libvirt-0.6.2-hotplug-monitor-syntax.patch, 1.1,
	1.2 libvirt-0.6.2-libvirtd-double-free.patch, 1.1,
	1.2 libvirt-0.6.2-monitor-prompt-discard.patch, 1.1,
	1.2 libvirt-0.6.2-numa-ignore-fail.patch, 1.1,
	1.2 libvirt-0.6.2-pci-device-crash.patch, 1.1,
	1.2 libvirt-0.6.2-qemu-drive-format.patch, 1.1,
	1.2 libvirt-0.6.2-qemu-name-uniqueness.patch, 1.1,
	1.2 libvirt-0.6.2-qemu-ppc-machine-type.patch, 1.1,
	1.2 libvirt-0.6.2-shared-readonly-label.patch, 1.1,
	1.2 libvirt-0.6.2-svirt-sound.patch, 1.1,
	1.2 libvirt-0.6.2-xml-attribute-escaping.patch, 1.1,
	1.2 libvirt-0.6.3-hostdev-managed.patch, 1.1,
	1.2 libvirt-0.6.3-refresh-qemu-caps.patch, 1.1, 1.2 libvirt.spec,
	1.137, 1.138
Message-ID: <20090817080858.E06FF11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20666

Modified Files:
	libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch 
	libvirt-0.6.2-bring-up-ipless-bridge.patch 
	libvirt-0.6.2-buf-locale-escape.patch 
	libvirt-0.6.2-do-not-log-monitor-output.patch 
	libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch 
	libvirt-0.6.2-enable-qemu-0-10-migration.patch 
	libvirt-0.6.2-event-handling-1.patch 
	libvirt-0.6.2-event-handling-2.patch 
	libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch 
	libvirt-0.6.2-fix-nosource-label.patch 
	libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch 
	libvirt-0.6.2-hotplug-labelling.patch 
	libvirt-0.6.2-hotplug-monitor-syntax.patch 
	libvirt-0.6.2-libvirtd-double-free.patch 
	libvirt-0.6.2-monitor-prompt-discard.patch 
	libvirt-0.6.2-numa-ignore-fail.patch 
	libvirt-0.6.2-pci-device-crash.patch 
	libvirt-0.6.2-qemu-drive-format.patch 
	libvirt-0.6.2-qemu-name-uniqueness.patch 
	libvirt-0.6.2-qemu-ppc-machine-type.patch 
	libvirt-0.6.2-shared-readonly-label.patch 
	libvirt-0.6.2-svirt-sound.patch 
	libvirt-0.6.2-xml-attribute-escaping.patch 
	libvirt-0.6.3-hostdev-managed.patch 
	libvirt-0.6.3-refresh-qemu-caps.patch libvirt.spec 
Log Message:
Sync patches from git


libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch:
 qemu_conf.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch	5 Jun 2009 11:47:31 -0000	1.1
+++ libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch	17 Aug 2009 08:08:56 -0000	1.2
@@ -1,14 +1,17 @@
-From 934b71abf1b908f720811a44ad5411cfc1a4ca37 Mon Sep 17 00:00:00 2001
+From 6e80c60b89728de28267242f7373ecf553e40bc1 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Thu, 28 May 2009 13:15:57 +0000
-Subject: [PATCH 1/1] Avoid broken networking with new QEMU/KVM >= 86
+Subject: [PATCH] Avoid broken networking with new QEMU/KVM >= 86
 
+(cherry picked from commit 2afc3bfd8b779ddba974da9d66d6ea337fc91c01)
+
+Fedora-patch: libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch
 ---
  src/qemu_conf.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 93dc0b7..a04d216 100644
+index fc0e772..99f13c6 100644
 --- a/src/qemu_conf.c
 +++ b/src/qemu_conf.c
 @@ -658,8 +658,8 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
@@ -23,5 +26,5 @@ index 93dc0b7..a04d216 100644
      if (!(retval = strdup(tapfdstr)))
          goto no_memory;
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-bring-up-ipless-bridge.patch:
 network_driver.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Index: libvirt-0.6.2-bring-up-ipless-bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-bring-up-ipless-bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-bring-up-ipless-bridge.patch	25 May 2009 15:23:17 -0000	1.1
+++ libvirt-0.6.2-bring-up-ipless-bridge.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,10 +1,11 @@
-From 4db7474b0c1907e877d7206edeb4d73962971096 Mon Sep 17 00:00:00 2001
+From 6635abc3bbe54e6b0168182805de92cd70d125e4 Mon Sep 17 00:00:00 2001
 From: Daniel Veillard <veillard at redhat.com>
 Date: Tue, 12 May 2009 15:31:22 +0000
-Subject: [PATCH 1/1] * src/network_driver.c: enable bridges which are not up
-   without an IP address, patch by Ludwig Nussel
- Daniel
+Subject: [PATCH] * src/network_driver.c: enable bridges which are not up without an IP address, patch by Ludwig Nussel
 
+(cherry picked from commit e978774ec67f4b062b1f65e5c76a13193a9430eb)
+
+Fedora-patch: libvirt-0.6.2-bring-up-ipless-bridge.patch
 ---
  src/network_driver.c |    9 +++------
  1 files changed, 3 insertions(+), 6 deletions(-)
@@ -44,5 +45,5 @@ index a17a769..a163b15 100644
                   network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
      }
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-buf-locale-escape.patch:
 buf.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: libvirt-0.6.2-buf-locale-escape.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-buf-locale-escape.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-buf-locale-escape.patch	5 Aug 2009 15:48:14 -0000	1.1
+++ libvirt-0.6.2-buf-locale-escape.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,13 +1,19 @@
-commit 8feb499ba2c3625632210c997b49f5df515c05d4
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Tue Aug 4 18:13:09 2009 +0100
-
-    Fix escaping of 8-bit high characters
-    
-    Fix  https://bugzilla.redhat.com/show_bug.cgi?id=479517
-    
-    * src/buf.c: Cast to 'unsigned char' before doing compare to
-      avoid rejecting 8-bit high characters
+From f793cd9b7220145b6df8086d77db4fdc035d680b Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Tue, 4 Aug 2009 18:13:09 +0100
+Subject: [PATCH] Fix escaping of 8-bit high characters
+
+Fix  https://bugzilla.redhat.com/show_bug.cgi?id=479517
+
+* src/buf.c: Cast to 'unsigned char' before doing compare to
+  avoid rejecting 8-bit high characters
+
+(cherry picked from commit 8feb499ba2c3625632210c997b49f5df515c05d4)
+
+Fedora-patch: libvirt-0.6.2-buf-locale-escape.patch
+---
+ src/buf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/buf.c b/src/buf.c
 index 259175d..c802aa2 100644
@@ -22,3 +28,6 @@ index 259175d..c802aa2 100644
                     (*cur == '\r')) {
              /*
               * default case, just copy !
+-- 
+1.6.2.5
+

libvirt-0.6.2-do-not-log-monitor-output.patch:
 qemu_driver.c |   61 ++++++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 37 deletions(-)

Index: libvirt-0.6.2-do-not-log-monitor-output.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-do-not-log-monitor-output.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-do-not-log-monitor-output.patch	22 May 2009 09:24:30 -0000	1.1
+++ libvirt-0.6.2-do-not-log-monitor-output.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,19 +1,23 @@
-From fbd16cecc72494e8a9450f38197221f2f50c9d0e Mon Sep 17 00:00:00 2001
+From 182a3cac2b4339e988802eb02279e7ab4c883c67 Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Thu, 16 Apr 2009 15:56:27 +0000
-Subject: [PATCH 1/1] Don't log monitor output to domain log file.
+Subject: [PATCH] Don't log monitor output to domain log file.
 
 It's logged via the logging system already. Prefix monitor debug output with vm
 name.
+
+(cherry picked from commit 5caa1e0eb050a12fe8ed02cf635bb672a56cdb6f)
+
+Fedora-patch: libvirt-0.6.2-do-not-log-monitor-output.patch
 ---
  src/qemu_driver.c |   60 +++++++++++++++++++++-------------------------------
  1 files changed, 24 insertions(+), 36 deletions(-)
 
 diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 79ee072..f5b5fa5 100644
+index 5ca3d20..cb738b2 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
-@@ -1710,27 +1710,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
+@@ -1706,27 +1706,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
              goto error;
          }
      }
@@ -42,7 +46,7 @@ index 79ee072..f5b5fa5 100644
      return -1;
  }
  
-@@ -2463,7 +2447,7 @@ static int qemudDomainGetMemoryBalloon(virConnectPtr conn,
+@@ -2461,7 +2445,7 @@ static int qemudDomainGetMemoryBalloon(virConnectPtr conn,
          goto cleanup;
      }
  
@@ -51,7 +55,7 @@ index 79ee072..f5b5fa5 100644
      if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) {
          unsigned int memMB;
          char *end;
-@@ -2517,7 +2501,7 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
+@@ -2515,7 +2499,7 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
  
      /* If the command failed qemu prints: 'unknown command'
       * No message is printed on success it seems */
@@ -60,7 +64,7 @@ index 79ee072..f5b5fa5 100644
      if (strstr(reply, "\nunknown command:")) {
          /* Don't set error - it is expected memory balloon fails on many qemu */
          ret = 0;
-@@ -2812,7 +2796,7 @@ static int qemudDomainSave(virDomainPtr dom,
+@@ -2810,7 +2794,7 @@ static int qemudDomainSave(virDomainPtr dom,
          goto cleanup;
      }
  
@@ -69,7 +73,7 @@ index 79ee072..f5b5fa5 100644
  
      /* If the command isn't supported then qemu prints:
       * unknown command: migrate" */
-@@ -3658,7 +3642,7 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
+@@ -3662,7 +3646,7 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
      /* If the command failed qemu prints:
       * device not found, device is locked ...
       * No message is printed on success it seems */
@@ -78,7 +82,7 @@ index 79ee072..f5b5fa5 100644
      if (strstr(reply, "\ndevice ")) {
          qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
                            _("changing cdrom media failed: %s"), reply);
-@@ -3719,7 +3703,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+@@ -3723,7 +3707,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
          return -1;
      }
  
@@ -87,7 +91,7 @@ index 79ee072..f5b5fa5 100644
      /* If the command succeeds qemu prints:
       * OK bus 0... */
  #define PCI_ATTACH_OK_MSG "OK bus 0, slot "
-@@ -3787,7 +3771,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virConnectPtr conn,
+@@ -3791,7 +3775,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virConnectPtr conn,
          return -1;
      }
  
@@ -96,7 +100,7 @@ index 79ee072..f5b5fa5 100644
      /* If the command failed qemu prints:
       * Could not add ... */
      if (strstr(reply, "Could not add ")) {
-@@ -3841,7 +3825,7 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
+@@ -3845,7 +3829,7 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
          return -1;
      }
  
@@ -105,7 +109,7 @@ index 79ee072..f5b5fa5 100644
      /* If the command failed qemu prints:
       * Could not add ... */
      if (strstr(reply, "Could not add ")) {
-@@ -3980,7 +3964,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+@@ -3984,7 +3968,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
          goto cleanup;
      }
  
@@ -114,7 +118,7 @@ index 79ee072..f5b5fa5 100644
      /* If the command fails due to a wrong slot qemu prints: invalid slot,
       * nothing is printed on success */
      if (strstr(reply, "invalid slot")) {
-@@ -4210,7 +4194,7 @@ qemudDomainBlockStats (virDomainPtr dom,
+@@ -4214,7 +4198,7 @@ qemudDomainBlockStats (virDomainPtr dom,
                            "%s", _("'info blockstats' command failed"));
          goto cleanup;
      }
@@ -123,7 +127,7 @@ index 79ee072..f5b5fa5 100644
  
      /* If the command isn't supported then qemu prints the supported
       * info commands, so the output starts "info ".  Since this is
-@@ -4251,21 +4235,25 @@ qemudDomainBlockStats (virDomainPtr dom,
+@@ -4255,21 +4239,25 @@ qemudDomainBlockStats (virDomainPtr dom,
                  if (STRPREFIX (p, "rd_bytes=")) {
                      p += 9;
                      if (virStrToLong_ll (p, &dummy, 10, &stats->rd_bytes) == -1)
@@ -154,7 +158,7 @@ index 79ee072..f5b5fa5 100644
  
                  /* Skip to next label. */
                  p = strchr (p, ' ');
-@@ -4477,7 +4465,7 @@ qemudDomainMemoryPeek (virDomainPtr dom,
+@@ -4481,7 +4469,7 @@ qemudDomainMemoryPeek (virDomainPtr dom,
          goto cleanup;
      }
  
@@ -163,7 +167,7 @@ index 79ee072..f5b5fa5 100644
  
      /* Read the memory file into buffer. */
      if (saferead (fd, buffer, size) == (ssize_t) -1) {
-@@ -4794,7 +4782,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
+@@ -4798,7 +4786,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
                               "%s", _("off-line migration specified, but suspend operation failed"));
              goto cleanup;
          }
@@ -172,7 +176,7 @@ index 79ee072..f5b5fa5 100644
          VIR_FREE(info);
          paused = 1;
  
-@@ -4811,7 +4799,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
+@@ -4815,7 +4803,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
          snprintf (cmd, sizeof cmd, "migrate_set_speed %lum", resource);
          qemudMonitorCommand (vm, cmd, &info);
  
@@ -181,7 +185,7 @@ index 79ee072..f5b5fa5 100644
          VIR_FREE (info);
      }
  
-@@ -4830,7 +4818,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
+@@ -4834,7 +4822,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
          goto cleanup;
      }
  
@@ -190,7 +194,7 @@ index 79ee072..f5b5fa5 100644
  
      /* Now check for "fail" in the output string */
      if (strstr(info, "fail") != NULL) {
-@@ -4869,7 +4857,7 @@ cleanup:
+@@ -4873,7 +4861,7 @@ cleanup:
                        vm->def->name);
          }
          else {
@@ -200,5 +204,5 @@ index 79ee072..f5b5fa5 100644
          }
  
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch:
 security_selinux.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Index: libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch	3 Jul 2009 10:05:41 -0000	1.1
+++ libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,7 +1,7 @@
-From ae4523336ac06e3ff7cc7b416fad9e57998c6b54 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh at redhat.com>
-Date: Fri, 3 Jul 2009 10:29:01 +0100
-Subject: [PATCH 2/3] Don't unnecessarily try to change a file context
+From 2d299525f5de29d11c6dc4810aa41e893535695b Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc at redhat.com>
+Date: Fri, 3 Jul 2009 10:27:46 +0000
+Subject: [PATCH] Don't unnecessarily try to change a file context
 
 As pointed out by Tim Waugh here:
 
@@ -12,13 +12,15 @@ matches what we want.
 
 (Fixed to use STREQ() and not use tabs, as pointed out by danpb)
 
-Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+(cherry picked from commit add254feeaa830dd5af1118c141cb140bf55b5a7)
+
+Fedora-patch: libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch
 ---
  src/security_selinux.c |   11 ++++++++++-
  1 files changed, 10 insertions(+), 1 deletions(-)
 
 diff --git a/src/security_selinux.c b/src/security_selinux.c
-index db1c27d..c2015a1 100644
+index 450fce2..8ebe1fe 100644
 --- a/src/security_selinux.c
 +++ b/src/security_selinux.c
 @@ -280,10 +280,19 @@ static int

libvirt-0.6.2-enable-qemu-0-10-migration.patch:
 qemu_conf.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Index: libvirt-0.6.2-enable-qemu-0-10-migration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-enable-qemu-0-10-migration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-enable-qemu-0-10-migration.patch	7 May 2009 19:08:42 -0000	1.1
+++ libvirt-0.6.2-enable-qemu-0-10-migration.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,17 +1,20 @@
-From: "Daniel P. Berrange" <berrange at redhat.com>
-To: libvir-list at redhat.com
-Date: Thu, 30 Apr 2009 15:09:05 +0100
-Subject: [libvirt] PATCH: Enable migration with QEMU >= 0.10.0
+From 9b41d6550b6bf8d4450bb5b86550eb605cc1fd91 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Fri, 8 May 2009 10:07:15 +0000
+Subject: [PATCH] Enable save/restore/migrate for QEMU >= 0.10.0
 
-The KVM migration code was added to QEMU for the 0.10.0 release, so we 
-should enable this in libvirt now.
+(cherry picked from commit 88e22e4e8cb7fc7e1fa1d132778aa1994f4b55b6)
 
-Daniel
+Fedora-patch: libvirt-0.6.2-enable-qemu-0-10-migration.patch
+---
+ src/qemu_conf.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
 
-diff -r be7993675e07 src/qemu_conf.c
---- a/src/qemu_conf.c	Thu Apr 30 14:49:27 2009 +0100
-+++ b/src/qemu_conf.c	Thu Apr 30 15:08:45 2009 +0100
-@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 6f9e610..929fe00 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *qemu,
  
      /*
       * Handling of -incoming arg with varying features
@@ -30,7 +33,7 @@ diff -r be7993675e07 src/qemu_conf.c
       */
      if (kvm_version >= 79) {
          flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *
+@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *qemu,
              flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
      } else if (kvm_version > 0) {
          flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
@@ -40,6 +43,6 @@ diff -r be7993675e07 src/qemu_conf.c
      }
  
      if (retversion)
-
-
 -- 
+1.6.2.5
+

libvirt-0.6.2-event-handling-1.patch:
 event.c |   43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

Index: libvirt-0.6.2-event-handling-1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-event-handling-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-event-handling-1.patch	21 May 2009 12:07:19 -0000	1.1
+++ libvirt-0.6.2-event-handling-1.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,17 +1,20 @@
-From e7be6cc841a5652b73ddd2ccd3769c7f8bbad13d Mon Sep 17 00:00:00 2001
+From 261ec2c9597b2eb6c7d91589fc66e203f60b6735 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Tue, 12 May 2009 16:41:49 +0000
-Subject: [PATCH 1/2] Fix interrupting of main event thread & protect against accidental uniniitalized variables
+Subject: [PATCH] Fix interrupting of main event thread & protect against accidental uniniitalized variables
 
+(cherry picked from commit 0a31be6ba243066378c344882cc1a32802774edb)
+
+Fedora-patch: libvirt-0.6.2-event-handling-1.patch
 ---
  qemud/event.c |   42 +++++++++++++++++++++++++++++++++++-------
  1 files changed, 35 insertions(+), 7 deletions(-)
 
 diff --git a/qemud/event.c b/qemud/event.c
-index 65f548e..754f2b1 100644
+index 0887008..4dc1020 100644
 --- a/qemud/event.c
 +++ b/qemud/event.c
-@@ -84,10 +84,10 @@ struct virEventLoop {
+@@ -83,10 +83,10 @@ struct virEventLoop {
  static struct virEventLoop eventLoop;
  
  /* Unique ID for the next FD watch to be registered */
@@ -24,7 +27,7 @@ index 65f548e..754f2b1 100644
  
  static void virEventLock(void)
  {
-@@ -143,15 +143,22 @@ int virEventAddHandleImpl(int fd, int events,
+@@ -142,15 +142,22 @@ int virEventAddHandleImpl(int fd, int events,
  
  void virEventUpdateHandleImpl(int watch, int events) {
      int i;
@@ -48,7 +51,7 @@ index 65f548e..754f2b1 100644
      virEventUnlock();
  }
  
-@@ -164,6 +171,12 @@ void virEventUpdateHandleImpl(int watch, int events) {
+@@ -163,6 +170,12 @@ void virEventUpdateHandleImpl(int watch, int events) {
  int virEventRemoveHandleImpl(int watch) {
      int i;
      EVENT_DEBUG("Remove handle %d", watch);
@@ -61,7 +64,7 @@ index 65f548e..754f2b1 100644
      virEventLock();
      for (i = 0 ; i < eventLoop.handlesCount ; i++) {
          if (eventLoop.handles[i].deleted)
-@@ -172,11 +185,11 @@ int virEventRemoveHandleImpl(int watch) {
+@@ -171,11 +184,11 @@ int virEventRemoveHandleImpl(int watch) {
          if (eventLoop.handles[i].watch == watch) {
              EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd);
              eventLoop.handles[i].deleted = 1;
@@ -74,7 +77,7 @@ index 65f548e..754f2b1 100644
      virEventUnlock();
      return -1;
  }
-@@ -232,6 +245,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
+@@ -231,6 +244,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
      struct timeval tv;
      int i;
      EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency);
@@ -87,7 +90,7 @@ index 65f548e..754f2b1 100644
      if (gettimeofday(&tv, NULL) < 0) {
          return;
      }
-@@ -244,10 +263,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
+@@ -243,10 +262,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
                  frequency >= 0 ? frequency +
                  (((unsigned long long)tv.tv_sec)*1000) +
                  (((unsigned long long)tv.tv_usec)/1000) : 0;
@@ -99,7 +102,7 @@ index 65f548e..754f2b1 100644
      virEventUnlock();
  }
  
-@@ -260,6 +279,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
+@@ -259,6 +278,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
  int virEventRemoveTimeoutImpl(int timer) {
      int i;
      EVENT_DEBUG("Remove timer %d", timer);
@@ -112,7 +115,7 @@ index 65f548e..754f2b1 100644
      virEventLock();
      for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
          if (eventLoop.timeouts[i].deleted)
-@@ -267,11 +292,11 @@ int virEventRemoveTimeoutImpl(int timer) {
+@@ -266,11 +291,11 @@ int virEventRemoveTimeoutImpl(int timer) {
  
          if (eventLoop.timeouts[i].timer == timer) {
              eventLoop.timeouts[i].deleted = 1;
@@ -125,7 +128,7 @@ index 65f548e..754f2b1 100644
      virEventUnlock();
      return -1;
  }
-@@ -617,9 +642,12 @@ static int virEventInterruptLocked(void)
+@@ -616,9 +641,12 @@ static int virEventInterruptLocked(void)
      char c = '\0';
  
      if (!eventLoop.running ||
@@ -140,5 +143,5 @@ index 65f548e..754f2b1 100644
          return -1;
      return 0;
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-event-handling-2.patch:
 event.c |  113 ++++++++++++++++++++++++++++------------------------------------
 1 file changed, 51 insertions(+), 62 deletions(-)

Index: libvirt-0.6.2-event-handling-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-event-handling-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-event-handling-2.patch	21 May 2009 12:07:19 -0000	1.1
+++ libvirt-0.6.2-event-handling-2.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,17 +1,20 @@
-From 6483ee77ed12f037d68a6adc690624fa1b508dc0 Mon Sep 17 00:00:00 2001
+From ef1a3eaa58d83c3367a1addff6c8132f27aa09dd Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Tue, 12 May 2009 16:43:04 +0000
-Subject: [PATCH 2/2] Fix watch/timer event deletion
+Subject: [PATCH] Fix watch/timer event deletion
 
+(cherry picked from commit 470317f5c71cbcc6b6d8d83d0978aea3510d3698)
+
+Fedora-patch: libvirt-0.6.2-event-handling-2.patch
 ---
  qemud/event.c |  112 ++++++++++++++++++++++++++-------------------------------
  1 files changed, 51 insertions(+), 61 deletions(-)
 
 diff --git a/qemud/event.c b/qemud/event.c
-index 754f2b1..a57d967 100644
+index 4dc1020..8bc7c34 100644
 --- a/qemud/event.c
 +++ b/qemud/event.c
-@@ -313,7 +313,7 @@ static int virEventCalculateTimeout(int *timeout) {
+@@ -312,7 +312,7 @@ static int virEventCalculateTimeout(int *timeout) {
      EVENT_DEBUG("Calculate expiry of %d timers", eventLoop.timeoutsCount);
      /* Figure out if we need a timeout */
      for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
@@ -20,7 +23,7 @@ index 754f2b1..a57d967 100644
              continue;
  
          EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt);
-@@ -350,32 +350,26 @@ static int virEventCalculateTimeout(int *timeout) {
+@@ -349,32 +349,26 @@ static int virEventCalculateTimeout(int *timeout) {
   * file handles. The caller must free the returned data struct
   * returns: the pollfd array, or NULL on error
   */
@@ -66,7 +69,7 @@ index 754f2b1..a57d967 100644
  }
  
  
-@@ -435,26 +429,30 @@ static int virEventDispatchTimeouts(void) {
+@@ -434,26 +428,30 @@ static int virEventDispatchTimeouts(void) {
   * Returns 0 upon success, -1 if an error occurred
   */
  static int virEventDispatchHandles(int nfds, struct pollfd *fds) {
@@ -106,7 +109,7 @@ index 754f2b1..a57d967 100644
      }
  
      return 0;
-@@ -545,22 +543,21 @@ static int virEventCleanupHandles(void) {
+@@ -544,22 +542,21 @@ static int virEventCleanupHandles(void) {
   * at least one file handle has an event, or a timer expires
   */
  int virEventRunOnce(void) {
@@ -138,7 +141,7 @@ index 754f2b1..a57d967 100644
  
      virEventUnlock();
  
-@@ -572,38 +569,31 @@ int virEventRunOnce(void) {
+@@ -571,38 +568,31 @@ int virEventRunOnce(void) {
          if (errno == EINTR) {
              goto retry;
          }
@@ -193,5 +196,5 @@ index 754f2b1..a57d967 100644
  
  static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED,
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch:
 qemu_driver.c |   81 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 27 deletions(-)

Index: libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch	3 Jul 2009 10:05:41 -0000	1.1
+++ libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,15 +1,19 @@
-From 80965bff6d46dea1808c8bbf02f50f0e289a0e65 Mon Sep 17 00:00:00 2001
+From d8bd0cff27c0572e9305e7fdbc6b843f74d9e30f Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 29 Jun 2009 10:41:56 +0000
 Subject: [PATCH] Fix crash in QEMU driver with bad capabilities data
 
+(cherry picked from commit 39c7e7a6b79bbdfa36928a430d56fa88a204e8fd)
+
+Fedora-patch: libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch
 ---
  src/qemu_driver.c |   80 +++++++++++++++++++++++++++++++++++-----------------
  1 files changed, 54 insertions(+), 26 deletions(-)
 
-diff -up libvirt-0.6.2/src/qemu_driver.c.bad-caps libvirt-0.6.2/src/qemu_driver.c
---- libvirt-0.6.2/src/qemu_driver.c.bad-caps	2009-07-03 10:07:03.275252815 +0100
-+++ libvirt-0.6.2/src/qemu_driver.c	2009-07-03 10:08:52.143502961 +0100
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index cb738b2..3d3675c 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
 @@ -360,12 +360,43 @@ next:
      return 0;
  }
@@ -56,7 +60,7 @@ diff -up libvirt-0.6.2/src/qemu_driver.c
      virSecurityDriverPtr security_drv;
  
      ret = virSecurityDriverStartup(&security_drv,
-@@ -381,36 +412,17 @@ qemudSecurityInit(struct qemud_driver *q
+@@ -381,36 +412,17 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
      }
  
      qemud_drv->securityDriver = security_drv;
@@ -96,7 +100,7 @@ diff -up libvirt-0.6.2/src/qemu_driver.c
  
  /**
   * qemudStartup:
-@@ -1852,13 +1864,29 @@ static int qemudGetNodeInfo(virConnectPt
+@@ -1852,13 +1864,29 @@ static int qemudGetNodeInfo(virConnectPtr conn,
  
  static char *qemudGetCapabilities(virConnectPtr conn) {
      struct qemud_driver *driver = conn->privateData;
@@ -128,3 +132,6 @@ diff -up libvirt-0.6.2/src/qemu_driver.c
      qemuDriverUnlock(driver);
  
      return xml;
+-- 
+1.6.2.5
+

libvirt-0.6.2-fix-nosource-label.patch:
 security_selinux.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: libvirt-0.6.2-fix-nosource-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-fix-nosource-label.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-fix-nosource-label.patch	11 May 2009 02:28:23 -0000	1.1
+++ libvirt-0.6.2-fix-nosource-label.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,7 +1,28 @@
-diff -rup libvirt-0.6.2/src/security_selinux.c new/src/security_selinux.c
---- libvirt-0.6.2/src/security_selinux.c	2009-05-10 22:04:25.000000000 -0400
-+++ new/src/security_selinux.c	2009-05-10 22:06:09.000000000 -0400
-@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectP
+From 99c018831379f23e65860ad4f3628a6d5f1a7d5a Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc at redhat.com>
+Date: Fri, 3 Jul 2009 10:29:09 +0000
+Subject: [PATCH] Skip labelling if no src path present
+
+Fixes startup of guest's with sourceless cdrom devices.
+
+Patch from Cole Robinson originally posted here:
+
+  https://bugzilla.redhat.com/499569
+
+but never sent upstream.
+
+(cherry picked from commit 67d0c6eb9410d5101f4820a7286deacb6398afde)
+
+Fedora-patch: libvirt-0.6.2-fix-nosource-label.patch
+---
+ src/security_selinux.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index 95fa0a6..450fce2 100644
+--- a/src/security_selinux.c
++++ b/src/security_selinux.c
+@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
  {
      const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
  
@@ -11,3 +32,6 @@ diff -rup libvirt-0.6.2/src/security_sel
      if (disk->shared) {
          return SELinuxSetFilecon(conn, disk->src, default_image_context);
      } else if (disk->readonly) {
+-- 
+1.6.2.5
+

libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch:
 qemu_conf.c   |   18 ++++++++++++++----
 qemu_driver.c |   13 ++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

Index: libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch	21 May 2009 12:07:19 -0000	1.1
+++ libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,15 +1,18 @@
-From 2b3fcdc378e7bec5c1a78b81632756e92930fd24 Mon Sep 17 00:00:00 2001
+From 9f6a5f50aee13575331f79f5d93635f701646eb7 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 11 May 2009 15:14:24 +0000
-Subject: [PATCH 1/1] Fix QEMU ARGV detection with kvm >= 85
+Subject: [PATCH] Fix QEMU ARGV detection with kvm >= 85
 
+(cherry picked from commit 426f9772b84752b4901b72fd382ff6e28e258efd)
+
+Fedora-patch: libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch
 ---
  src/qemu_conf.c   |   18 ++++++++++++++----
  src/qemu_driver.c |   12 ++----------
  2 files changed, 16 insertions(+), 14 deletions(-)
 
 diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 9cb71eb..a57d3ab 100644
+index 929fe00..3e7e32d 100644
 --- a/src/qemu_conf.c
 +++ b/src/qemu_conf.c
 @@ -431,18 +431,28 @@ int qemudExtractVersionInfo(const char *qemu,
@@ -46,10 +49,10 @@ index 9cb71eb..a57d3ab 100644
      version = (major * 1000 * 1000) + (minor * 1000) + micro;
  
 diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 30642d5..bd60b29 100644
+index 4752a64..5ca3d20 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
-@@ -1391,12 +1391,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+@@ -1379,12 +1379,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
  
      if (qemudExtractVersionInfo(emulator,
                                  NULL,
@@ -63,7 +66,7 @@ index 30642d5..bd60b29 100644
  
      if (qemuPrepareHostDevices(conn, vm->def) < 0)
          goto cleanup;
-@@ -3715,12 +3711,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
+@@ -3606,12 +3602,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
  
      if (qemudExtractVersionInfo(vm->def->emulator,
                                  NULL,
@@ -78,5 +81,5 @@ index 30642d5..bd60b29 100644
      if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
          if (!(devname = qemudDiskDeviceName(conn, newdisk)))
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-hotplug-labelling.patch:
 qemu_driver.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: libvirt-0.6.2-hotplug-labelling.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-hotplug-labelling.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-hotplug-labelling.patch	5 Aug 2009 15:48:14 -0000	1.1
+++ libvirt-0.6.2-hotplug-labelling.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,17 +1,23 @@
-commit 1795bfe4a177a5eff1b3b0a16d56df6f371c0f8e
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Mon Jul 6 16:01:55 2009 +0100
+From 0aac99f8e13dfc74b87986908165ae7f44662153 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 6 Jul 2009 16:01:55 +0100
+Subject: [PATCH] Fix SELinux denial during hotplug
 
-    Fix SELinux denial during hotplug
-    
-    * src/qemu_driver.c: Relabel disk images *before* running QEMU
-    hotplug monitor commands
+* src/qemu_driver.c: Relabel disk images *before* running QEMU
+hotplug monitor commands
+
+(cherry picked from commit 1795bfe4a177a5eff1b3b0a16d56df6f371c0f8e)
+
+Fedora-patch: libvirt-0.6.2-hotplug-labelling.patch
+---
+ src/qemu_driver.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 5a0ab12..342ba01 100644
+index 5fc21a1..f3661f8 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
-@@ -4225,10 +4225,14 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
+@@ -3934,10 +3934,14 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
          switch (dev->data.disk->device) {
          case VIR_DOMAIN_DISK_DEVICE_CDROM:
          case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
@@ -26,7 +32,7 @@ index 5a0ab12..342ba01 100644
              if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
                  ret = qemudDomainAttachUsbMassstorageDevice(dom->conn, vm, dev);
              } else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI ||
-@@ -4240,8 +4244,6 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
+@@ -3949,8 +3953,6 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
                                   virDomainDiskBusTypeToString(dev->data.disk->bus));
                  goto cleanup;
              }
@@ -35,3 +41,6 @@ index 5a0ab12..342ba01 100644
              break;
  
          default:
+-- 
+1.6.2.5
+

libvirt-0.6.2-hotplug-monitor-syntax.patch:
 qemu_driver.c |   57 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 15 deletions(-)

Index: libvirt-0.6.2-hotplug-monitor-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-hotplug-monitor-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-hotplug-monitor-syntax.patch	5 Aug 2009 15:48:14 -0000	1.1
+++ libvirt-0.6.2-hotplug-monitor-syntax.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,17 +1,23 @@
-commit 326ecb78145cfeb7706ef0dcd521b19d934950e7
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Mon Jul 6 15:58:55 2009 +0100
+From ae80f9ec15b03d9d3ab6cfa2d48529b459a64fb2 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 6 Jul 2009 15:58:55 +0100
+Subject: [PATCH] Fix PCI device hotplug/unplug with newer QEMU
 
-    Fix PCI device hotplug/unplug with newer QEMU
-    
-    * src/qemu_driver.c: Try new monitor syntax for hotplug first. If
-      that fails fallback to old KVM specific syntax
+* src/qemu_driver.c: Try new monitor syntax for hotplug first. If
+  that fails fallback to old KVM specific syntax
+
+(cherry picked from commit 326ecb78145cfeb7706ef0dcd521b19d934950e7)
+
+Fedora-patch: libvirt-0.6.2-hotplug-monitor-syntax.patch
+---
+ src/qemu_driver.c |   56 +++++++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 42 insertions(+), 14 deletions(-)
 
 diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 2e55045..5a0ab12 100644
+index f3661f8..8473616 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
-@@ -4004,6 +4004,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+@@ -3724,6 +3724,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
      char *cmd, *reply, *s;
      char *safe_path;
      const char* type = virDomainDiskBusTypeToString(dev->data.disk->bus);
@@ -19,7 +25,7 @@ index 2e55045..5a0ab12 100644
  
      for (i = 0 ; i < vm->def->ndisks ; i++) {
          if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
-@@ -4018,14 +4019,15 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+@@ -3738,14 +3739,15 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
          return -1;
      }
  
@@ -37,7 +43,7 @@ index 2e55045..5a0ab12 100644
      VIR_FREE(safe_path);
      if (ret == -1) {
          virReportOOMError(conn);
-@@ -4041,17 +4043,27 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+@@ -3761,17 +3763,27 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
  
      DEBUG ("%s: pci_add reply: %s", vm->def->name, reply);
      /* If the command succeeds qemu prints:
@@ -71,7 +77,7 @@ index 2e55045..5a0ab12 100644
          VIR_FREE(reply);
          VIR_FREE(cmd);
          return -1;
-@@ -4268,6 +4280,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+@@ -3990,6 +4002,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
      char *cmd = NULL;
      char *reply = NULL;
      virDomainDiskDefPtr detach = NULL;
@@ -79,7 +85,7 @@ index 2e55045..5a0ab12 100644
  
      for (i = 0 ; i < vm->def->ndisks ; i++) {
          if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
-@@ -4289,9 +4302,17 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+@@ -4011,9 +4024,17 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
          goto cleanup;
      }
  
@@ -100,7 +106,7 @@ index 2e55045..5a0ab12 100644
      }
  
      if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
-@@ -4301,12 +4322,19 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+@@ -4023,12 +4044,19 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
      }
  
      DEBUG ("%s: pci_del reply: %s",vm->def->name,  reply);
@@ -123,3 +129,6 @@ index 2e55045..5a0ab12 100644
          goto cleanup;
      }
  
+-- 
+1.6.2.5
+

libvirt-0.6.2-libvirtd-double-free.patch:
 qemud.c |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

Index: libvirt-0.6.2-libvirtd-double-free.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-libvirtd-double-free.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-libvirtd-double-free.patch	5 Jun 2009 11:47:31 -0000	1.1
+++ libvirt-0.6.2-libvirtd-double-free.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,14 +1,17 @@
-From c3b3f6005d45552d01823504925eb587889cf25a Mon Sep 17 00:00:00 2001
+From 2c42e4c96efd390fa7a6957692a5863d30a10828 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Fri, 29 May 2009 14:34:35 +0000
-Subject: [PATCH 1/1] Avoid double-free in daemon client cleanup code
+Subject: [PATCH] Avoid double-free in daemon client cleanup code
 
+(cherry picked from commit 6c3ef350649b959215cfc5ccfdaba35bf9560066)
+
+Fedora-patch: libvirt-0.6.2-libvirtd-double-free.patch
 ---
  qemud/qemud.c |   22 +++++++++++++++++-----
  1 files changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/qemud/qemud.c b/qemud/qemud.c
-index 1375560..783dc69 100644
+index 4f04355..e299a67 100644
 --- a/qemud/qemud.c
 +++ b/qemud/qemud.c
 @@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket
@@ -23,7 +26,7 @@ index 1375560..783dc69 100644
  
      /* Deregister event delivery callback */
      if(client->conn) {
-@@ -1406,12 +1406,21 @@ void qemudDispatchClientFailure(struct qemud_client *client) {
+@@ -1406,12 +1409,21 @@ void qemudDispatchClientFailure(struct qemud_client *client) {
      }
  
  #if HAVE_SASL
@@ -50,5 +53,5 @@ index 1375560..783dc69 100644
  
  
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-monitor-prompt-discard.patch:
 qemu_driver.c |   25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

Index: libvirt-0.6.2-monitor-prompt-discard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-monitor-prompt-discard.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-monitor-prompt-discard.patch	5 Aug 2009 15:48:14 -0000	1.1
+++ libvirt-0.6.2-monitor-prompt-discard.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,18 +1,23 @@
-commit 2d1f2e706c8b13571e1227df1c69b2302da35d5a
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Mon Jul 6 15:45:04 2009 +0100
+From eb2fad7e94ba9bf48787e24542931688b9926ca1 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 6 Jul 2009 15:45:04 +0100
+Subject: [PATCH] Fix problem with QEMU monitor welcome prompt confusing libvirt after a libvirtd daemon restart with active guests
 
-    Fix problem with QEMU monitor welcome prompt confusing libvirt
-    after a libvirtd daemon restart with active guests
-    
-    * src/qemu_driver: Read and dicard pending monitor data
-      before issuing new monitor commands.
+* src/qemu_driver: Read and dicard pending monitor data
+  before issuing new monitor commands.
+
+(cherry picked from commit 2d1f2e706c8b13571e1227df1c69b2302da35d5a)
+
+Fedora-patch: libvirt-0.6.2-monitor-prompt-discard.patch
+---
+ src/qemu_driver.c |   24 ++++++++++++++++++++++++
+ 1 files changed, 24 insertions(+), 0 deletions(-)
 
 diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index e2b7acb..2e55045 100644
+index 3d3675c..5fc21a1 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
-@@ -1744,6 +1744,28 @@ cleanup:
+@@ -1636,6 +1636,28 @@ cleanup:
      qemuDriverUnlock(driver);
  }
  
@@ -41,7 +46,7 @@ index e2b7acb..2e55045 100644
  static int
  qemudMonitorCommandExtra(const virDomainObjPtr vm,
                           const char *cmd,
-@@ -1755,6 +1777,8 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
+@@ -1647,6 +1669,8 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
      size_t cmdlen = strlen(cmd);
      size_t extralen = extra ? strlen(extra) : 0;
  
@@ -50,3 +55,6 @@ index e2b7acb..2e55045 100644
      if (safewrite(vm->monitor, cmd, cmdlen) != cmdlen)
          return -1;
      if (safewrite(vm->monitor, "\r", 1) != 1)
+-- 
+1.6.2.5
+

libvirt-0.6.2-numa-ignore-fail.patch:
 capabilities.c       |   16 +++++++++++++---
 capabilities.h       |    3 +++
 libvirt_private.syms |    1 +
 lxc_conf.c           |   11 +++++++++--
 qemu_conf.c          |   10 ++++++++--
 uml_conf.c           |   12 +++++++++---
 6 files changed, 43 insertions(+), 10 deletions(-)

Index: libvirt-0.6.2-numa-ignore-fail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-numa-ignore-fail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-numa-ignore-fail.patch	13 Aug 2009 16:07:23 -0000	1.1
+++ libvirt-0.6.2-numa-ignore-fail.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,7 +1,25 @@
-diff -rup libvirt-0.6.2.orig/src/capabilities.c libvirt-0.6.2.new/src/capabilities.c
---- libvirt-0.6.2.orig/src/capabilities.c	2009-03-24 12:31:01.000000000 +0000
-+++ libvirt-0.6.2.new/src/capabilities.c	2009-08-13 12:10:57.000000000 +0100
-@@ -122,6 +122,18 @@ virCapabilitiesFreeGuest(virCapsGuestPtr
+From 3cf2f90a4747547f9877b15c1f573f8a771098e8 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 29 Jun 2009 10:41:56 +0000
+Subject: [PATCH] Fix crash in QEMU driver with bad capabilities data
+
+(cherry picked from commit 39c7e7a6b79bbdfa36928a430d56fa88a204e8fd)
+
+Fedora-patch: libvirt-0.6.2-numa-ignore-fail.patch
+---
+ src/capabilities.c       |   16 +++++++++++++---
+ src/capabilities.h       |    3 +++
+ src/libvirt_private.syms |    1 +
+ src/lxc_conf.c           |   11 +++++++++--
+ src/qemu_conf.c          |   10 ++++++++--
+ src/uml_conf.c           |   11 +++++++++--
+ 6 files changed, 43 insertions(+), 9 deletions(-)
+
+diff --git a/src/capabilities.c b/src/capabilities.c
+index d6e3478..8dc32a1 100644
+--- a/src/capabilities.c
++++ b/src/capabilities.c
+@@ -122,6 +122,18 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest)
  }
  
  
@@ -31,9 +49,10 @@ diff -rup libvirt-0.6.2.orig/src/capabil
  
      for (i = 0 ; i < caps->host.nmigrateTrans ; i++)
          VIR_FREE(caps->host.migrateTrans[i]);
-diff -rup libvirt-0.6.2.orig/src/capabilities.h libvirt-0.6.2.new/src/capabilities.h
---- libvirt-0.6.2.orig/src/capabilities.h	2009-03-24 12:31:01.000000000 +0000
-+++ libvirt-0.6.2.new/src/capabilities.h	2009-08-13 11:50:46.000000000 +0100
+diff --git a/src/capabilities.h b/src/capabilities.h
+index 5b0bbab..1b49666 100644
+--- a/src/capabilities.h
++++ b/src/capabilities.h
 @@ -118,6 +118,9 @@ extern void
  virCapabilitiesFree(virCapsPtr caps);
  
@@ -44,9 +63,10 @@ diff -rup libvirt-0.6.2.orig/src/capabil
  virCapabilitiesSetMacPrefix(virCapsPtr caps,
                              unsigned char *prefix);
  
-diff -rup libvirt-0.6.2.orig/src/libvirt_private.syms libvirt-0.6.2.new/src/libvirt_private.syms
---- libvirt-0.6.2.orig/src/libvirt_private.syms	2009-04-03 15:04:28.000000000 +0100
-+++ libvirt-0.6.2.new/src/libvirt_private.syms	2009-08-13 11:50:59.000000000 +0100
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 350a931..9249a1a 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
 @@ -24,6 +24,7 @@ virCapabilitiesDefaultGuestEmulator;
  virCapabilitiesDefaultGuestMachine;
  virCapabilitiesFormatXML;
@@ -55,9 +75,10 @@ diff -rup libvirt-0.6.2.orig/src/libvirt
  virCapabilitiesNew;
  virCapabilitiesSetMacPrefix;
  virCapabilitiesGenerateMac;
-diff -rup libvirt-0.6.2.orig/src/lxc_conf.c libvirt-0.6.2.new/src/lxc_conf.c
---- libvirt-0.6.2.orig/src/lxc_conf.c	2009-01-31 09:04:17.000000000 +0000
-+++ libvirt-0.6.2.new/src/lxc_conf.c	2009-08-13 11:58:41.000000000 +0100
+diff --git a/src/lxc_conf.c b/src/lxc_conf.c
+index 34c8aea..fe721e3 100644
+--- a/src/lxc_conf.c
++++ b/src/lxc_conf.c
 @@ -30,6 +30,7 @@
  #include "lxc_conf.h"
  #include "nodeinfo.h"
@@ -83,9 +104,10 @@ diff -rup libvirt-0.6.2.orig/src/lxc_con
  
      /* XXX shouldn't 'borrow' KVM's prefix */
      virCapabilitiesSetMacPrefix(caps, (unsigned char []){ 0x52, 0x54, 0x00 });
-diff -rup libvirt-0.6.2.orig/src/qemu_conf.c libvirt-0.6.2.new/src/qemu_conf.c
---- libvirt-0.6.2.orig/src/qemu_conf.c	2009-08-13 11:44:11.000000000 +0100
-+++ libvirt-0.6.2.new/src/qemu_conf.c	2009-08-13 11:45:34.000000000 +0100
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 99f13c6..1194e36 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
 @@ -376,8 +376,14 @@ virCapsPtr qemudCapsInit(void) {
      /* Using KVM's mac prefix for QEMU too */
      virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 });
@@ -103,9 +125,10 @@ diff -rup libvirt-0.6.2.orig/src/qemu_co
  
      /* First the pure HVM guests */
      for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_hvm) ; i++)
-diff -rup libvirt-0.6.2.orig/src/uml_conf.c libvirt-0.6.2.new/src/uml_conf.c
---- libvirt-0.6.2.orig/src/uml_conf.c	2009-01-31 09:04:18.000000000 +0000
-+++ libvirt-0.6.2.new/src/uml_conf.c	2009-08-13 11:58:47.000000000 +0100
+diff --git a/src/uml_conf.c b/src/uml_conf.c
+index c0d086e..9dd4967 100644
+--- a/src/uml_conf.c
++++ b/src/uml_conf.c
 @@ -44,6 +44,7 @@
  #include "memory.h"
  #include "nodeinfo.h"
@@ -131,3 +154,6 @@ diff -rup libvirt-0.6.2.orig/src/uml_con
  
      if ((guest = virCapabilitiesAddGuest(caps,
                                           "uml",
+-- 
+1.6.2.5
+

libvirt-0.6.2-pci-device-crash.patch:
 pci.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Index: libvirt-0.6.2-pci-device-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-pci-device-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-pci-device-crash.patch	5 Aug 2009 15:48:14 -0000	1.1
+++ libvirt-0.6.2-pci-device-crash.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,14 +1,20 @@
-commit 4a7acedd3c59a6a750576cb8680bc3f08fe0b52c
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Thu Jul 16 13:23:32 2009 +0100
+From d5d67ea357d92759d4a9ecb213e577835f961eed Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Thu, 16 Jul 2009 13:23:32 +0100
+Subject: [PATCH] Fix free of unitialized data upon PCI open fail
 
-    Fix free of unitialized data upon PCI open fail
+(cherry picked from commit 4a7acedd3c59a6a750576cb8680bc3f08fe0b52c)
+
+Fedora-patch: libvirt-0.6.2-pci-device-crash.patch
+---
+ src/pci.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
 
 diff --git a/src/pci.c b/src/pci.c
-index 3ffa0aa..4030a14 100644
+index ed64d68..68a380d 100644
 --- a/src/pci.c
 +++ b/src/pci.c
-@@ -834,10 +834,8 @@ pciReadDeviceID(pciDevice *dev, const char *id_name)
+@@ -829,10 +829,8 @@ pciReadDeviceID(pciDevice *dev, const char *id_name)
               dev->name, id_name);
  
      /* ID string is '0xNNNN\n' ... i.e. 7 bytes */
@@ -20,3 +26,6 @@ index 3ffa0aa..4030a14 100644
  
      /* Check for 0x suffix */
      if (id_str[0] != '0' || id_str[1] != 'x') {
+-- 
+1.6.2.5
+

libvirt-0.6.2-qemu-drive-format.patch:
 qemu_conf.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: libvirt-0.6.2-qemu-drive-format.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-qemu-drive-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-qemu-drive-format.patch	16 Apr 2009 15:26:45 -0000	1.1
+++ libvirt-0.6.2-qemu-drive-format.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,15 +1,17 @@
-From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001
+From bf7b58a2471a07111f8022c0176f45ee5dc5fe71 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
-Date: Thu, 16 Apr 2009 11:23:55 +0100
-Subject: [PATCH 1/3] qemu -drive takes format= not fmt=
+Date: Thu, 16 Apr 2009 14:21:35 +0000
+Subject: [PATCH] qemu -drive takes format= not fmt=
 
 Seems like a simple typo - it has been "format=" since the flag
 was introduced, but we added it as "fmt=".
 
-Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+(cherry picked from commit 9fa79000ecc883c699a6cb1ce7f00c34881bc8fe)
+
+Fedora-patch: libvirt-0.6.2-qemu-drive-format.patch
 ---
- src/qemu_conf.c                                    |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/qemu_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu_conf.c b/src/qemu_conf.c
 index f36c927..6f9e610 100644
@@ -24,3 +26,6 @@ index f36c927..6f9e610 100644
  
              if (disk->cachemode) {
                  const char *mode =
+-- 
+1.6.2.5
+

libvirt-0.6.2-qemu-name-uniqueness.patch:
 qemu_driver.c |  104 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 83 insertions(+), 21 deletions(-)

Index: libvirt-0.6.2-qemu-name-uniqueness.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-qemu-name-uniqueness.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-qemu-name-uniqueness.patch	5 Aug 2009 15:48:14 -0000	1.1
+++ libvirt-0.6.2-qemu-name-uniqueness.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,7 +1,20 @@
-diff -rupN libvirt-0.6.2/src/qemu_driver.c libvirt-0.6.2.new/src/qemu_driver.c
---- libvirt-0.6.2/src/qemu_driver.c	2009-08-05 16:25:22.000000000 +0100
-+++ libvirt-0.6.2.new/src/qemu_driver.c	2009-08-05 16:27:48.000000000 +0100
-@@ -2174,22 +2174,37 @@ static virDomainPtr qemudDomainCreate(vi
+From 1f1a0ca63c5492c7d41a0cdbd452a2743f314ebc Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Fri, 8 May 2009 10:11:14 +0000
+Subject: [PATCH] Improve name & UUID uniqueness checking in QEMU driver
+
+(cherry picked from commit 54ebbde1e18ec831ff2fddb44ec27ed5dde7874a)
+
+Fedora-patch: libvirt-0.6.2-qemu-name-uniqueness.patch
+---
+ src/qemu_driver.c |  103 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 83 insertions(+), 20 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 8473616..dfd19c5 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -2174,22 +2174,37 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
      if (virSecurityDriverVerify(conn, def) < 0)
          goto cleanup;
  
@@ -52,7 +65,7 @@ diff -rupN libvirt-0.6.2/src/qemu_driver
      }
  
      if (!(vm = virDomainAssignDef(conn,
-@@ -2368,6 +2383,11 @@ static int qemudDomainDestroy(virDomainP
+@@ -2368,6 +2383,11 @@ static int qemudDomainDestroy(virDomainPtr dom) {
                           _("no domain with matching id %d"), dom->id);
          goto cleanup;
      }
@@ -64,7 +77,7 @@ diff -rupN libvirt-0.6.2/src/qemu_driver
  
      qemudShutdownVMDaemon(dom->conn, driver, vm);
      event = virDomainEventNewFromObj(vm,
-@@ -3272,17 +3292,36 @@ static int qemudDomainRestore(virConnect
+@@ -3272,17 +3292,36 @@ static int qemudDomainRestore(virConnectPtr conn,
          goto cleanup;
      }
  
@@ -106,7 +119,7 @@ diff -rupN libvirt-0.6.2/src/qemu_driver
          }
      }
  
-@@ -3470,18 +3509,41 @@ static virDomainPtr qemudDomainDefine(vi
+@@ -3470,18 +3509,41 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
      if (virSecurityDriverVerify(conn, def) < 0)
          goto cleanup;
  
@@ -150,7 +163,7 @@ diff -rupN libvirt-0.6.2/src/qemu_driver
      vm->persistent = 1;
  
      if (virDomainSaveConfig(conn,
-@@ -3503,6 +3565,7 @@ static virDomainPtr qemudDomainDefine(vi
+@@ -3503,6 +3565,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
      if (dom) dom->id = vm->def->id;
  
  cleanup:
@@ -158,3 +171,6 @@ diff -rupN libvirt-0.6.2/src/qemu_driver
      if (vm)
          virDomainObjUnlock(vm);
      if (event)
+-- 
+1.6.2.5
+

libvirt-0.6.2-qemu-ppc-machine-type.patch:
 docs/schemas/domain.rng                      |    2 +-
 src/qemu_conf.c                              |    2 +-
 tests/capabilityschemadata/caps-qemu-kvm.xml |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

Index: libvirt-0.6.2-qemu-ppc-machine-type.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-qemu-ppc-machine-type.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-qemu-ppc-machine-type.patch	5 Jun 2009 11:47:31 -0000	1.1
+++ libvirt-0.6.2-qemu-ppc-machine-type.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,12 +1,11 @@
-From daf3db93457427c25325781af684758c0341a6aa Mon Sep 17 00:00:00 2001
+From 5c1ff776a3194bcc5d593aedd36cd676f1fcab64 Mon Sep 17 00:00:00 2001
 From: Daniel Veillard <veillard at redhat.com>
 Date: Fri, 29 May 2009 13:32:06 +0000
-Subject: [PATCH 1/1] PPC Qemu Machine Type update
- * src/qemu_conf.c docs/schemas/domain.rng
-   tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type
-   changed from g3bw to g3beige some time ago, patch by Thomas Baker
- Daniel
+Subject: [PATCH] PPC Qemu Machine Type update * src/qemu_conf.c docs/schemas/domain.rng tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type changed from g3bw to g3beige some time ago, patch by Thomas Baker
 
+(cherry picked from commit 525c3d40a97a1ccce7c4dc314d2dd9e780b50d41)
+
+Fedora-patch: libvirt-0.6.2-qemu-ppc-machine-type.patch
 ---
  docs/schemas/domain.rng                      |    2 +-
  src/qemu_conf.c                              |    2 +-
@@ -14,7 +13,7 @@ Subject: [PATCH 1/1] PPC Qemu Machine Ty
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
-index 204c633..11cf04a 100644
+index 2f784e1..b29079a 100644
 --- a/docs/schemas/domain.rng
 +++ b/docs/schemas/domain.rng
 @@ -184,7 +184,7 @@
@@ -27,7 +26,7 @@ index 204c633..11cf04a 100644
            <value>prep</value>
          </choice>
 diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 18156cd..d54f2ca 100644
+index 3e7e32d..fc0e772 100644
 --- a/src/qemu_conf.c
 +++ b/src/qemu_conf.c
 @@ -192,7 +192,7 @@ static const char *const arch_info_hvm_sparc_machines[] = {
@@ -53,5 +52,5 @@ index fd8523e..893f9ed 100644
        <machine>prep</machine>
        <domain type='qemu'>
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.2-shared-readonly-label.patch:
 security_selinux.c |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

Index: libvirt-0.6.2-shared-readonly-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-shared-readonly-label.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-shared-readonly-label.patch	5 May 2009 13:01:15 -0000	1.1
+++ libvirt-0.6.2-shared-readonly-label.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,6 +1,27 @@
-diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c
---- libvirt-0.6.2/src/security_selinux.c	2009-04-03 15:36:56.000000000 +0100
-+++ libvirt-0.6.2.new/src/security_selinux.c	2009-05-05 13:39:42.000000000 +0100
+From 36cf92efa2b22f275bdc56411d9704e530cdb3fa Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc at redhat.com>
+Date: Fri, 3 Jul 2009 10:26:37 +0000
+Subject: [PATCH] Re-label shared and readonly images
+
+This patch was posted ages ago here:
+
+  https://bugzilla.redhat.com/493692
+
+But was never posted upstream AFAICT.
+
+Patch from Dan Berrange
+
+(cherry picked from commit 547147084d03ebf30d09d242a5a721a4df664ffe)
+
+Fedora-patch: libvirt-0.6.2-shared-readonly-label.patch
+---
+ src/security_selinux.c |   26 +++++++++++++++++++-------
+ 1 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index ac317d7..95fa0a6 100644
+--- a/src/security_selinux.c
++++ b/src/security_selinux.c
 @@ -24,11 +24,12 @@
  #include "virterror_internal.h"
  #include "util.h"
@@ -31,7 +52,7 @@ diff -rup libvirt-0.6.2/src/security_sel
      return 0;
  }
  
-@@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co
+@@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
  {
      char ebuf[1024];
  
@@ -40,7 +61,7 @@ diff -rup libvirt-0.6.2/src/security_sel
      if(setfilecon(path, tcon) < 0) {
          virSecurityReportError(conn, VIR_ERR_ERROR,
                                 _("%s: unable to set security context "
-@@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn
+@@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConnectPtr conn,
      char *newpath = NULL;
      const char *path = disk->src;
  
@@ -49,7 +70,7 @@ diff -rup libvirt-0.6.2/src/security_sel
      if (disk->readonly || disk->shared)
          return 0;
  
-@@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP
+@@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
  {
      const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
  
@@ -64,7 +85,7 @@ diff -rup libvirt-0.6.2/src/security_sel
  
      return 0;
  }
-@@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co
+@@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr conn,
  
      if (secdef->imagelabel) {
          for (i = 0 ; i < vm->def->ndisks ; i++) {
@@ -74,3 +95,6 @@ diff -rup libvirt-0.6.2/src/security_sel
              if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0)
                  return -1;
          }
+-- 
+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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-svirt-sound.patch	3 Apr 2009 15:52:11 -0000	1.1
+++ libvirt-0.6.2-svirt-sound.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,6 +1,21 @@
---- src/qemu_conf.c.orig	2009-04-02 11:50:10.000000000 +0200
-+++ src/qemu_conf.c	2009-04-03 17:46:59.000000000 +0200
-@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr 
+From 02f85e2c6b3b53f89d8b4b3e5cb70b1700719516 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
+
+Temporary hack till PulseAudio autostart problems are sorted out when
+SELinux enforcing (bz 486112)
+
+Fedora-patch: libvirt-0.6.2-svirt-sound.patch
+---
+ src/qemu_conf.c |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 1194e36..f42aeaa 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -795,6 +795,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
      char domid[50];
      char *pidfile;
      const char *cpu = NULL;
@@ -10,7 +25,7 @@
 +        driver->securityDriver->name &&
 +        STREQ(driver->securityDriver->name, "selinux") &&
 +        getuid() == 0) {
-+        static int soundWarned = 0; 
++        static int soundWarned = 0;
 +        skipSound = 1;
 +        if (vm->def->nsounds &&
 +            !soundWarned) {
@@ -21,7 +36,7 @@
  
      uname_normalize(&ut);
  
-@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr 
+@@ -1441,7 +1455,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
      }
  
      /* Add sound hardware */
@@ -31,3 +46,6 @@
          int size = 100;
          char *modstr;
          if (VIR_ALLOC_N(modstr, size+1) < 0)
+-- 
+1.6.2.5
+

libvirt-0.6.2-xml-attribute-escaping.patch:
 buf.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Index: libvirt-0.6.2-xml-attribute-escaping.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-xml-attribute-escaping.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.2-xml-attribute-escaping.patch	21 May 2009 12:07:19 -0000	1.1
+++ libvirt-0.6.2-xml-attribute-escaping.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,9 +1,11 @@
-From 7f7a4403860f56d5a1ad65bfd16f5bf97a971d45 Mon Sep 17 00:00:00 2001
+From a7d81a2f9e80942c9951c1d16ad69c66b9a47bbb Mon Sep 17 00:00:00 2001
 From: Daniel Veillard <veillard at redhat.com>
 Date: Wed, 13 May 2009 16:19:59 +0000
-Subject: [PATCH 1/1] * src/buf.c: avoid an XML attribute escaping bug #499791
- daniel
+Subject: [PATCH] * src/buf.c: avoid an XML attribute escaping bug #499791 daniel
 
+(cherry picked from commit 7afe94e7e236ec465d838e7d60e961975c526ab2)
+
+Fedora-patch: libvirt-0.6.2-xml-attribute-escaping.patch
 ---
  src/buf.c |   16 +++++++++++++++-
  1 files changed, 15 insertions(+), 1 deletions(-)
@@ -43,5 +45,5 @@ index cdcdac9..259175d 100644
                     (*cur == '\r')) {
              /*
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.3-hostdev-managed.patch:
 qemu_driver.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: libvirt-0.6.3-hostdev-managed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.3-hostdev-managed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.3-hostdev-managed.patch	6 May 2009 15:51:47 -0000	1.1
+++ libvirt-0.6.3-hostdev-managed.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,6 +1,6 @@
-From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001
+From b3f02d5528c121bcf7b9ac5c4284517e71a5e2f2 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
-Date: Wed, 6 May 2009 16:33:28 +0100
+Date: Wed, 6 May 2009 15:56:20 +0000
 Subject: [PATCH] Fix qemu driver's interpretation of <hostdev managed='yes'/>
 
 This change:
@@ -22,13 +22,15 @@ accidentally did this:
 Which results in managed='yes' not causing the device to be
 detached when the guest is starting.
 
-Signed-off-by: Mark McLoughlin <markmc at redhat.com>
+(cherry picked from commit 1d6c713b18741f1a0e3d0ccd094275a11aef138c)
+
+Fedora-patch: libvirt-0.6.3-hostdev-managed.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 5898026..59312c0 100644
+index 79ee072..162d072 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
 @@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
@@ -41,5 +43,5 @@ index 5898026..59312c0 100644
                                            hostdev->source.subsys.u.pci.domain,
                                            hostdev->source.subsys.u.pci.bus,
 -- 
-1.6.0.6
+1.6.2.5
 

libvirt-0.6.3-refresh-qemu-caps.patch:
 qemu_driver.c |   29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

Index: libvirt-0.6.3-refresh-qemu-caps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.3-refresh-qemu-caps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.3-refresh-qemu-caps.patch	6 May 2009 16:32:34 -0000	1.1
+++ libvirt-0.6.3-refresh-qemu-caps.patch	17 Aug 2009 08:08:57 -0000	1.2
@@ -1,17 +1,23 @@
-commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720
-Author: Cole Robinson <crobinso at redhat.com>
-Date:   Mon May 4 15:06:03 2009 -0400
+From a521796bac21f0c8af38a8551a420d87b61c7a9a Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Wed, 6 May 2009 14:20:34 +0000
+Subject: [PATCH] Refresh QEMU driver capabilities for each getCapabilities call.
 
-    Refresh QEMU driver capabilities for each getCapabilities call.
-    
-    Also fix up a couple issues where caps are accessed without locking
-    the driver structure.
+Also fix up a couple issues where caps are accessed without locking
+the driver structure.
+
+(cherry picked from commit 4f107590243631869677ddea2bb667db4a1282a6)
+
+Fedora-patch: libvirt-0.6.3-refresh-qemu-caps.patch
+---
+ src/qemu_driver.c |   28 ++++++++++++++++++++--------
+ 1 files changed, 20 insertions(+), 8 deletions(-)
 
 diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 23ea961..790dac6 100644
+index 162d072..4752a64 100644
 --- a/src/qemu_driver.c
 +++ b/src/qemu_driver.c
-@@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn,
+@@ -1872,10 +1872,12 @@ static int qemudGetNodeInfo(virConnectPtr conn,
  
  static char *qemudGetCapabilities(virConnectPtr conn) {
      struct qemud_driver *driver = conn->privateData;
@@ -26,7 +32,7 @@ index 23ea961..790dac6 100644
          virReportOOMError(conn);
      qemuDriverUnlock(driver);
  
-@@ -3169,20 +3171,26 @@ cleanup:
+@@ -3142,20 +3144,26 @@ cleanup:
      return ret;
  }
  
@@ -57,7 +63,7 @@ index 23ea961..790dac6 100644
      }
      strcpy(secmodel->model, p);
  
-@@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec
+@@ -3164,10 +3172,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec
          qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
                           _("security DOI string exceeds max %d bytes"),
                           VIR_SECURITY_DOI_BUFLEN-1);
@@ -74,3 +80,6 @@ index 23ea961..790dac6 100644
  }
  
  /* TODO: check seclabel restore */
+-- 
+1.6.2.5
+


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- libvirt.spec	13 Aug 2009 16:07:23 -0000	1.137
+++ libvirt.spec	17 Aug 2009 08:08:57 -0000	1.138
@@ -294,7 +294,7 @@ of recent versions of Linux (and other O
 %patch22 -p1
 %patch23 -p1
 
-%patch200 -p0
+%patch200 -p1
 
 mv NEWS NEWS.old
 iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS



From denis at fedoraproject.org  Mon Aug 17 08:17:45 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 17 Aug 2009 08:17:45 +0000 (UTC)
Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.10, 1.11 gnome-vfsmm.spec,
	1.21, 1.22 sources, 1.11, 1.12
Message-ID: <20090817081745.32F0A11C00E4@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gnome-vfsmm26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22628

Modified Files:
	.cvsignore gnome-vfsmm.spec sources 
Log Message:
Update to upstream 2.26.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Sep 2008 04:14:02 -0000	1.10
+++ .cvsignore	17 Aug 2009 08:17:44 -0000	1.11
@@ -1 +1 @@
-gnome-vfsmm-2.24.0.tar.bz2
+gnome-vfsmm-2.26.0.tar.bz2


Index: gnome-vfsmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-vfsmm.spec	25 Jul 2009 00:51:32 -0000	1.21
+++ gnome-vfsmm.spec	17 Aug 2009 08:17:44 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnome-vfsmm26
-Version:        2.24.0
-Release:        3%{?dist}
+Version:        2.26.0
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for gnome-vfs
 
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2009 Denis Leroy <denis at poolshark.org> - 2.26.0-1
+- Update to upstream 2.26.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Sep 2008 04:14:02 -0000	1.11
+++ sources	17 Aug 2009 08:17:44 -0000	1.12
@@ -1 +1 @@
-f02257451583832c4d67f4accba7ad62  gnome-vfsmm-2.24.0.tar.bz2
+d27d34b6a8722c557366729071c1baab  gnome-vfsmm-2.26.0.tar.bz2



From mhlavink at fedoraproject.org  Mon Aug 17 08:24:14 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 17 Aug 2009 08:24:14 +0000 (UTC)
Subject: rpms/squirrelmail/F-11 squirrelmail-1.4.19-csrf.patch, NONE,
	1.1 squirrelmail.spec, 1.69, 1.70
Message-ID: <20090817082414.5214111C034A@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24152

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.19-csrf.patch 
Log Message:
fix #517312 - CSRF issues in all forms (SA34627)


squirrelmail-1.4.19-csrf.patch:
 config/conf.pl                 |   79 ++++++++++++++++-
 doc/ChangeLog                  |    3 
 functions/auth.php             |   49 ++++++++++-
 functions/forms.php            |   30 ++++++
 functions/mailbox_display.php  |    1 
 functions/strings.php          |  181 +++++++++++++++++++++++++++++++++++++++++
 src/addrbook_search_html.php   |    4 
 src/addressbook.php            |   14 ++-
 src/compose.php                |   34 +++++++
 src/folders.php                |    8 -
 src/folders_create.php         |    6 +
 src/folders_delete.php         |    8 +
 src/folders_rename_do.php      |    6 +
 src/folders_rename_getname.php |    2 
 src/folders_subscribe.php      |    6 +
 src/move_messages.php          |    6 +
 src/options.php                |   11 ++
 src/options_highlight.php      |   14 ++-
 src/options_identities.php     |   14 ++-
 src/options_order.php          |   13 ++
 src/search.php                 |   13 ++
 src/vcard.php                  |    3 
 22 files changed, 472 insertions(+), 33 deletions(-)

--- NEW FILE squirrelmail-1.4.19-csrf.patch ---
diff -up squirrelmail-1.4.19/config/conf.pl.scrf squirrelmail-1.4.19/config/conf.pl
--- squirrelmail-1.4.19/config/conf.pl.scrf	2009-04-13 18:52:57.000000000 +0200
+++ squirrelmail-1.4.19/config/conf.pl	2009-08-17 09:53:22.671454970 +0200
@@ -346,15 +346,19 @@ if ( !$sendmail_args && $sendmail_path =
 }
 
 # Added in 1.4.11
-$smtp_sitewide_user = ''				if ( !$smtp_sitewide_user );
-$smtp_sitewide_pass = ''				if ( !$smtp_sitewide_pass );
+$smtp_sitewide_user = ''                if ( !$smtp_sitewide_user );
+$smtp_sitewide_pass = ''                if ( !$smtp_sitewide_pass );
 
 # Added in 1.4.9
 $abook_global_file_listing = 'true'     if ( !$abook_global_file_listing );
 $abook_file_line_length = 2048          if ( !$abook_file_line_length );
 
 # Added in 1.4.16
-$only_secure_cookies = 'true'     if ( !$only_secure_cookies );
+$only_secure_cookies = 'true'           if ( !$only_secure_cookies );
+
+# Added in 1.4.20RC1
+$disable_security_tokens = 'false'      if ( !$disable_security_tokens );
+$check_referrer = ''                    if ( !$check_referrer );
 
 if ( $ARGV[0] eq '--install-plugin' ) {
     print "Activating plugin " . $ARGV[1] . "\n";
@@ -549,6 +553,8 @@ while ( ( $command ne "q" ) && ( $comman
         print "14. PHP session name             : $WHT$session_name$NRM\n";
         print "15. Location base                : $WHT$config_location_base$NRM\n";
         print "16. Only secure cookies if poss. : $WHT$only_secure_cookies$NRM\n";
+        print "17. Disable secure forms         : $WHT$disable_security_tokens$NRM\n";
+        print "18. Page referal requirement     : $WHT$check_referrer$NRM\n";
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 5 ) {
@@ -766,6 +772,8 @@ while ( ( $command ne "q" ) && ( $comman
             elsif ( $command == 14 ) { $session_name             = command314(); }
             elsif ( $command == 15 ) { $config_location_base     = command_config_location_base(); }
             elsif ( $command == 16 ) { $only_secure_cookies      = command316(); }
+            elsif ( $command == 17 ) { $disable_security_tokens  = command317(); }
+            elsif ( $command == 18 ) { $check_referrer           = command318(); }
         } elsif ( $menu == 5 ) {
             if ( $command == 1 ) { command41(); }
             elsif ( $command == 2 ) { $theme_css = command42(); }
@@ -2455,6 +2463,63 @@ sub command316 {
 
 
 
+# disable_security_tokens (since 1.4.20RC1)
+sub command317 {
+    print "This option allows you to turn off the security checks in the forms\n";
+    print "that SquirrelMail generates.  It is NOT RECOMMENDED that you disable\n";
+    print "this feature - otherwise, your users may be exposed to phishing and\n";
+    print "other attacks.\n";
+    print "Unless you know what you are doing, you should leave this set to \"NO\".\n";
+    print "\n";
+
+    if ( lc($disable_security_tokens) eq 'true' ) {
+        $default_value = "y";
+    } else {
+        $default_value = "n";
+    }
+    print "Disable secure forms? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $disable_security_tokens = <STDIN>;
+    if ( ( $disable_security_tokens =~ /^y\n/i ) || ( ( $disable_security_tokens =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $disable_security_tokens = 'true';
+    } else {
+        $disable_security_tokens = 'false';
+    }
+    return $disable_security_tokens;
+}
+
+
+
+# check_referrer (since 1.4.20RC1)
+sub command318 {
+    print "This option allows you to enable referal checks for all page requests\n";
+    print "made to SquirrelMail.  This can help ensure that page requests came\n";
+    print "from the same server and not from an attacker's site (usually the\n";
+    print "result of a XSS or phishing attack).  To enable referal checking,\n";
+    print "this setting can be set to the domain where your SquirrelMail is\n";
+    print "being hosted (usually the same as the Domain setting under Server\n";
+    print "Settings).  For example, it could be \"example.com\", or if you\n";
+    print "use a plugin (such as Login Manager) to host SquirrelMail on more\n";
+    print "than one domain, you can set this to \"###DOMAIN###\" to tell it\n";
+    print "to use the current domain.\n";
+    print "\n";
+    print "However, in some cases (where proxy servers are in use, etc.), the\n";
+    print "domain might be different.\n";
+    print "\n";
+    print "NOTE that referal checks are not foolproof - they can be spoofed by\n";
+    print "browsers, and some browsers intentionally don't send referal\n";
+    print "information (in which case, the check is silently bypassed)\n";
+    print "\n";
+
+    print "Referal requirement? [$WHT$check_referrer$NRM]: $WHT";
+    $new_check_referrer = <STDIN>;
+    chomp($new_check_referrer);
+    $check_referrer = $new_check_referrer;
+
+    return $check_referrer;
+}
+
+
+
 ####################################################################################
 #### THEMES ####
 sub command41 {
@@ -3502,10 +3567,14 @@ sub save_data {
         print CF "\$session_name = '$session_name';\n";
 
     # boolean
-        print CF "\$only_secure_cookies   = $only_secure_cookies;\n";
+        print CF "\$only_secure_cookies     = $only_secure_cookies;\n";
+        print CF "\$disable_security_tokens = $disable_security_tokens;\n";
+
+    # string
+        print CF "\$check_referrer          = '$check_referrer';\n";
 
         print CF "\n";
-        print CF "\$config_location_base     = '$config_location_base';\n";
+        print CF "\$config_location_base    = '$config_location_base';\n";
 
         print CF "\n";
         print CF "\@include SM_PATH . 'config/config_local.php';\n";
diff -U0 squirrelmail-1.4.19/doc/ChangeLog.scrf squirrelmail-1.4.19/doc/ChangeLog
--- squirrelmail-1.4.19/doc/ChangeLog.scrf	2009-05-21 19:19:09.000000000 +0200
+++ squirrelmail-1.4.19/doc/ChangeLog	2009-08-17 09:53:30.039237290 +0200
@@ -4,0 +5,3 @@
+  - Implemented page referal verification mechanism. (Secunia Advisory SA34627)
+  - Implemented security token system. (Secunia Advisory SA34627)
+
diff -up squirrelmail-1.4.19/functions/auth.php.scrf squirrelmail-1.4.19/functions/auth.php
--- squirrelmail-1.4.19/functions/auth.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/functions/auth.php	2009-08-17 09:53:22.673549603 +0200
@@ -33,21 +33,56 @@ if (! isset($use_smtp_tls)) {
  * Check if user has previously logged in to the SquirrelMail session.  If user
  * has not logged in, execution will stop inside this function.
  *
+ * This function optionally checks the referrer of this page request.  If the
+ * administrator wants to impose a check that the referrer of this page request
+ * is another page on the same domain (otherwise, the page request is likely
+ * the result of a XSS or phishing attack), then they need to specify the
+ * acceptable referrer domain in a variable named $check_referrer in
+ * config/config.php (or the configuration tool) for which the value is
+ * usually the same as the $domain setting (for example:
+ *    $check_referrer = 'example.com';
+ * However, in some cases (where proxy servers are in use, etc.), the
+ * acceptable referrer might be different.  If $check_referrer is set to
+ * "###DOMAIN###", then the current value of $domain is used (useful in
+ * situations where $domain might change at runtime (when using the Login
+ * Manager plugin to host multiple domains with one SquirrelMail installation,
+ * for example)):
+ *    $check_referrer = '###DOMAIN###';
+ * NOTE HOWEVER, that referrer checks are not foolproof - they can be spoofed
+ * by browsers, and some browsers intentionally don't send them, in which
+ * case SquirrelMail silently ignores referrer checks.
+ *
  * @return void This function returns ONLY if user has previously logged in
  * successfully (otherwise, execution terminates herein).
  */
 function is_logged_in() {
 
-    if ( sqsession_is_registered('user_is_logged_in') ) {
+    // check for user login as well as referrer if needed
+    //
+    global $check_referrer, $domain;
+    if ($check_referrer == '###DOMAIN###') $check_referrer = $domain;
+    if (!empty($check_referrer)) {
+        $ssl_check_referrer = 'https://' . $check_referrer;
+        $check_referrer = 'http://' . $check_referrer;
+    }
+    if (!sqgetGlobalVar('HTTP_REFERER', $referrer, SQ_SERVER)) $referrer = '';
+    if (sqsession_is_registered('user_is_logged_in') 
+     && (!$check_referrer || empty($referrer)
+      || ($check_referrer && !empty($referrer)
+       && (strpos(strtolower($referrer), strtolower($check_referrer)) === 0
+        || strpos(strtolower($referrer), strtolower($ssl_check_referrer)) === 0)))) {
         return;
     } else {
+
         global $session_expired_post,
                $session_expired_location, $squirrelmail_language;
 
         // use $message to indicate what logout text the user
         // will see... if 0, typical "You must be logged in"
         // if 1, information that the user session was saved
-        // and will be resumed after (re)login
+        // and will be resumed after (re)login, if 2, there
+        // seems to have been a XSS or phishing attack (bad
+        // referrer)
         //
         $message = 0;
 
@@ -67,6 +102,12 @@ function is_logged_in() {
                 $message = 1;
         }
 
+        // was bad referrer the reason we were rejected?
+        //
+        if (sqsession_is_registered('user_is_logged_in') 
+         && $check_referrer && !empty($referrer))
+            $message = 2;
+      
         session_write_close();
 
         // signout page will deal with users who aren't logged 
@@ -79,8 +120,10 @@ function is_logged_in() {
         set_up_language($squirrelmail_language, true);
         if (!$message)
             logout_error( _("You must be logged in to access this page.") );
-        else
+        else if ($message == 1)
             logout_error( _("Your session has expired, but will be resumed after logging in again.") );
+        else if ($message == 2)
+            logout_error( _("The current page request appears to have originated from an unrecognized source.") );
         exit;
     }
 }
diff -up squirrelmail-1.4.19/functions/forms.php.scrf squirrelmail-1.4.19/functions/forms.php
--- squirrelmail-1.4.19/functions/forms.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/functions/forms.php	2009-08-17 09:53:22.673549603 +0200
@@ -130,8 +130,24 @@ function addTextArea($name, $text = '', 
 
 /**
  * Make a <form> start-tag.
+ *
+ * @param string $action
+ * @param string $method
+ * @param string $name
+ * @param string $enctype
+ * @param string $charset
+ * @param string $extra     Any other attributes can be added with this parameter;
+ *                          they should use double quotes around attribute values
+ *                          (OPTIONAL; default empty)
+ * @param mixed  $add_token When given as a string or as boolean TRUE, a hidden
+ *                          input is also added to the form containing a security
+ *                          token.  When given as TRUE, the input name is "smtoken";
+ *                          otherwise the name is the string that is given for this
+ *                          parameter.  When FALSE, no hidden token input field is
+ *                          added.  (OPTIONAL; default not used)
+ *
  */
-function addForm($action, $method = 'post', $name = '', $enctype = '', $charset = '')
+function addForm($action, $method = 'post', $name = '', $enctype = '', $charset = '', $extra = '', $add_token = FALSE)
 {
     if($name) {
         $name = ' name="'.$name.'"';
@@ -143,7 +159,15 @@ function addForm($action, $method = 'pos
         $charset = ' accept-charset="'.htmlspecialchars($charset).'"';
     }
 
-    return '<form action="'. $action .'" method="'. $method .'"'.
-        $enctype . $name . $charset . ">\n";
+    $form_string = '<form action="'. $action .'" method="'. $method .'"'.
+        $enctype . $name . $charset . ' ' . $extra . " >\n";
+
+    if($add_token) {
+        $form_string .= '<input type="hidden" value="' . sm_generate_security_token()
+                      . '" name="' . (is_string($add_token) ? $add_token : 'smtoken')
+                      . "\" />\n";
+    }
+
+    return $form_string;
 }
 
diff -up squirrelmail-1.4.19/functions/mailbox_display.php.scrf squirrelmail-1.4.19/functions/mailbox_display.php
--- squirrelmail-1.4.19/functions/mailbox_display.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/functions/mailbox_display.php	2009-08-17 09:53:22.673549603 +0200
@@ -513,6 +513,7 @@ function showMessagesForMailbox($imapCon
     $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox);
     $form_name = "FormMsgs" . $safe_name;
     echo '<form name="' . $form_name . '" method="post" action="move_messages.php">' ."\n" .
+        '<input type="hidden" name="smtoken" value="'.sm_generate_security_token().'">' . "\n" .
         '<input type="hidden" name="mailbox" value="'.htmlspecialchars($mailbox).'">' . "\n" .
         '<input type="hidden" name="startMessage" value="'.htmlspecialchars($start_msg).'">' . "\n";
     
diff -up squirrelmail-1.4.19/functions/strings.php.scrf squirrelmail-1.4.19/functions/strings.php
--- squirrelmail-1.4.19/functions/strings.php.scrf	2009-05-21 19:19:09.000000000 +0200
+++ squirrelmail-1.4.19/functions/strings.php	2009-08-17 09:53:22.672234055 +0200
@@ -879,5 +879,186 @@ function sq_trim_value ( &$value ) {
     $value = trim($value);
 }
 
+/**
+  * Gathers the list of secuirty tokens currently
+  * stored in the user's preferences and optionally
+  * purges old ones from the list.
+  *
+  * @param boolean $purge_old Indicates if old tokens
+  *                           should be purged from the
+  *                           list ("old" is 30 days or
+  *                           older unless the administrator
+  *                           overrides that value using
+  *                           $max_security_token_age in
+  *                           config/config_local.php)
+  *                           (OPTIONAL; default is to always
+  *                           purge old tokens)
+  *
+  * @return array The list of tokens
+  *
+  * @since 1.4.19 and 1.5.2
+  *
+  */
+function sm_get_user_security_tokens($purge_old=TRUE)
+{
+
+   global $data_dir, $username, $max_token_age_days;
+
+   $tokens = getPref($data_dir, $username, 'security_tokens', '');
+   if (($tokens = unserialize($tokens)) === FALSE || !is_array($tokens))
+      $tokens = array();
+
+   // purge old tokens if necessary
+   //
+   if ($purge_old)
+   {
+      if (empty($max_token_age_days)) $max_token_age_days = 30;
+      $now = time();
+      $discard_token_date = $now - ($max_token_age_days * 86400);
+      $cleaned_tokens = array();
+      foreach ($tokens as $token => $timestamp)
+         if ($timestamp >= $discard_token_date)
+            $cleaned_tokens[$token] = $timestamp;
+      $tokens = $cleaned_tokens;
+   }
+
+   return $tokens;
+
+}
+
+/**
+  * Generates a security token that is then stored in
+  * the user's preferences with a timestamp for later
+  * verification/use.
+  *
+  * WARNING: If the administrator has turned the token system
+  *          off by setting $disable_security_tokens to TRUE in
+  *          config/config.php or the configuration tool, this
+  *          function will not store tokens in the user
+  *          preferences (but it will still generate and return
+  *          a random string).
+  *
+  * @return void
+  *
+  * @since 1.4.19 and 1.5.2
+  *
+  */
+function sm_generate_security_token()
+{
+
+   global $data_dir, $username, $disable_security_tokens;
+   $max_generation_tries = 1000;
+
+   $tokens = sm_get_user_security_tokens();
+
+   $new_token = GenerateRandomString(12, '', 7);
+   $count = 0;
+   while (isset($tokens[$new_token]))
+   {
+      $new_token = GenerateRandomString(12, '', 7);
+      if (++$count > $max_generation_tries)
+      {
+         logout_error(_("Fatal token generation error; please contact your system administrator or the SquirrelMail Team"));
+         exit;
+      }
+   }
+
+   // is the token system enabled?  CAREFUL!
+   //
+   if (!$disable_security_tokens)
+   {
+      $tokens[$new_token] = time();
+      setPref($data_dir, $username, 'security_tokens', serialize($tokens));
+   }
+
+   return $new_token;
+
+}
+
+/**
+  * Validates a given security token and optionally remove it
+  * from the user's preferences if it was valid.  If the token
+  * is too old but otherwise valid, it will still be rejected.
+  *
+  * "Too old" is 30 days or older unless the administrator
+  * overrides that value using $max_security_token_age in
+  * config/config_local.php
+  *
+  * WARNING: If the administrator has turned the token system
+  *          off by setting $disable_security_tokens to TRUE in
+  *          config/config.php or the configuration tool, this
+  *          function will always return TRUE.
+  *
+  * @param string  $token           The token to validate
+  * @param int     $validity_period The number of seconds tokens are valid
+  *                                 for (set to zero to remove valid tokens
+  *                                 after only one use; use 3600 to allow
+  *                                 tokens to be reused for an hour)
+  *                                 (OPTIONAL; default is to only allow tokens
+  *                                 to be used once)
+  * @param boolean $show_error      Indicates that if the token is not
+  *                                 valid, this function should display
+  *                                 a generic error, log the user out
+  *                                 and exit - this function will never
+  *                                 return in that case.
+  *                                 (OPTIONAL; default FALSE)
+  *
+  * @return boolean TRUE if the token validated; FALSE otherwise
+  *
+  * @since 1.4.19 and 1.5.2
+  *
+  */
+function sm_validate_security_token($token, $validity_period=0, $show_error=FALSE)
+{
+
+   global $data_dir, $username, $max_token_age_days,
+          $disable_security_tokens;
+
+   // bypass token validation?  CAREFUL!
+   //
+   if ($disable_security_tokens) return TRUE;
+
+   // don't purge old tokens here because we already
+   // do it when generating tokens
+   //
+   $tokens = sm_get_user_security_tokens(FALSE);
+
+   // token not found?
+   //
+   if (empty($tokens[$token]))
+   {
+      if (!$show_error) return FALSE;
+      logout_error(_("This page request could not be verified and appears to have expired."));
+      exit;
+   }
+
+   $now = time();
+   $timestamp = $tokens[$token];
+
+   // whether valid or not, we want to remove it from
+   // user prefs if it's old enough
+   //
+   if ($timestamp < $now - $validity_period)
+   {
+      unset($tokens[$token]);
+      setPref($data_dir, $username, 'security_tokens', serialize($tokens));
+   }
+
+   // reject tokens that are too old
+   //
+   if (empty($max_token_age_days)) $max_token_age_days = 30;
+   $old_token_date = $now - ($max_token_age_days * 86400);
+   if ($timestamp < $old_token_date)
+   {
+      if (!$show_error) return FALSE;
+      logout_error(_("The current page request appears to have originated from an untrusted source."));
+      exit;
+   }
+
+   // token OK!
+   //
+   return TRUE;
+
+}
 
 $PHP_SELF = php_self();
diff -up squirrelmail-1.4.19/src/addrbook_search_html.php.scrf squirrelmail-1.4.19/src/addrbook_search_html.php
--- squirrelmail-1.4.19/src/addrbook_search_html.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/addrbook_search_html.php	2009-08-17 09:53:22.665180003 +0200
@@ -83,7 +83,7 @@ function addr_display_result($res, $incl
 
     if (sizeof($res) <= 0) return;
 
-    echo addForm($PHP_SELF, 'POST', 'addrbook').
+    echo addForm($PHP_SELF, 'POST', 'addrbook', '', '', '', TRUE).
          addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
     $line = 0;
@@ -308,7 +308,7 @@ else {
 if ($addrquery == '' || sizeof($res) == 0) {
     /* printf('<center><form method="post" name="k" action="compose.php">'."\n", $PHP_SELF); */
     echo '<center>'.
-        addForm('compose.php','POST','k');
+        addForm('compose.php','POST','k', '', '', '', TRUE);
     addr_insert_hidden();
     echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
          '</form></center></nobr>';
diff -up squirrelmail-1.4.19/src/addressbook.php.scrf squirrelmail-1.4.19/src/addressbook.php
--- squirrelmail-1.4.19/src/addressbook.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/addressbook.php	2009-08-17 09:53:22.666180572 +0200
@@ -31,6 +31,9 @@ require_once(SM_PATH . 'functions/html.p
 require_once(SM_PATH . 'functions/forms.php');
 
 /** lets get the global vars we may need */
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 sqgetGlobalVar('key',       $key,           SQ_COOKIE);
 
 sqgetGlobalVar('username',  $username,      SQ_SESSION);
@@ -180,6 +183,9 @@ $form_url = 'addressbook.php';
 /* Handle user's actions */
 if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'POST') {
 
+    // first, validate security token
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     /**************************************************
      * Add new address                                *
      **************************************************/
@@ -313,7 +319,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req
                         $olddata = $abook->lookup($enick, $ebackend);
 
                         /* Display the "new address" form */
-                        echo addForm($form_url, 'post').
+                        echo addForm($form_url, 'post', '', '', '', '', TRUE).
                             html_tag( 'table',
                                     html_tag( 'tr',
                                         html_tag( 'td',
@@ -345,7 +351,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req
                                        'center', '', 'width="100%"' );
 
                         /* Display the "new address" form again */
-                        echo addForm($form_url, 'post').
+                        echo addForm($form_url, 'post', '', '', '', '', TRUE).
                             html_tag( 'table',
                                 html_tag( 'tr',
                                     html_tag( 'td',
@@ -426,7 +432,7 @@ if ($showaddrlist) {
 
     /* List addresses */
     if (count($alist) > 0) {
-        echo addForm($form_url, 'post', 'address_book_form');
+        echo addForm($form_url, 'post', 'address_book_form', '', '', '', TRUE);
         if ($abook->add_extra_field) {
             $abook_fields = 6;
         } else {
@@ -573,7 +579,7 @@ if ($showaddrlist) {
 
 /* Display the "new address" form */
 echo '<a name="AddAddress"></a>' . "\n" .
-    addForm($form_url, 'post', 'f_add').
+    addForm($form_url, 'post', 'f_add', '', '', '', TRUE).
     html_tag( 'table',  
         html_tag( 'tr',
             html_tag( 'td', "\n". '<strong>' . sprintf(_("Add to %s"), $abook->localbackendname) . '</strong>' . "\n",
diff -up squirrelmail-1.4.19/src/compose.php.scrf squirrelmail-1.4.19/src/compose.php
--- squirrelmail-1.4.19/src/compose.php.scrf	2009-08-17 09:53:22.577550465 +0200
+++ squirrelmail-1.4.19/src/compose.php	2009-08-17 09:53:22.668549664 +0200
@@ -67,6 +67,9 @@ if (isset($send) && $send) {
     $SQ_GLOBAL = SQ_FORM;
 }
 sqgetGlobalVar('smaction',$action, $SQ_GLOBAL);
+if (!sqgetGlobalVar('smtoken',$submitted_token, $SQ_GLOBAL)) {
+    $submitted_token = '';
+}
 sqgetGlobalVar('session',$session, $SQ_GLOBAL);
 sqgetGlobalVar('mailbox',$mailbox, $SQ_GLOBAL);
 if ( !sqgetGlobalVar('identity',$identity, $SQ_GLOBAL) ) {
@@ -377,6 +380,11 @@ if (!isset($mailbox) || $mailbox == '' |
 }
 
 if ($draft) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     /*
      * Set $default_charset to correspond with the user's selection
      * of language interface.
@@ -428,6 +436,11 @@ if ($draft) {
 }
 
 if ($send) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if (isset($_FILES['attachfile']) &&
             $_FILES['attachfile']['tmp_name'] &&
             $_FILES['attachfile']['tmp_name'] != 'none') {
@@ -513,6 +526,11 @@ if ($send) {
         /* sqimap_logout($imapConnection); */
     }
 } elseif (isset($html_addr_search_done)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
     }
@@ -557,6 +575,11 @@ if ($send) {
      */
     include_once('./addrbook_search_html.php');
 } elseif (isset($attach)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if (saveAttachedFiles($session)) {
         plain_error_message(_("Could not move/copy file. File not attached"), $color);
     }
@@ -568,6 +591,11 @@ if ($send) {
     showInputForm($session);
 }
 elseif (isset($sigappend)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     $signature = $idents[$identity]['signature'];
     
     $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
@@ -578,6 +606,11 @@ elseif (isset($sigappend)) {
     }
     showInputForm($session);
 } elseif (isset($do_delete)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
     } else {
@@ -1032,6 +1065,7 @@ function showInputForm ($session, $value
 
     echo ">\n";
 
+    echo addHidden('smtoken', sm_generate_security_token());
     echo addHidden('startMessage', $startMessage);
 
     if ($action == 'draft') {
diff -up squirrelmail-1.4.19/src/folders_create.php.scrf squirrelmail-1.4.19/src/folders_create.php
--- squirrelmail-1.4.19/src/folders_create.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_create.php	2009-08-17 09:53:22.669549523 +0200
@@ -37,8 +37,14 @@ sqgetGlobalVar('subfolder',    $subfolde
 if (! sqgetGlobalVar('contain_subs', $contain_subs,  SQ_POST)) {
     unset($contain_subs);
 }
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $folder_name = trim($folder_name);
 
 if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
diff -up squirrelmail-1.4.19/src/folders_delete.php.scrf squirrelmail-1.4.19/src/folders_delete.php
--- squirrelmail-1.4.19/src/folders_delete.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_delete.php	2009-08-17 09:53:22.669549523 +0200
@@ -41,6 +41,9 @@ sqgetGlobalVar('username',  $username,  
 sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
 sqgetGlobalVar('mailbox',   $mailbox,       SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end globals */
 
 if ($mailbox == '') {
@@ -76,7 +79,7 @@ if( !sqgetGlobalVar('confirmed', $tmp, S
         html_tag( 'tr' ) .
         html_tag( 'td', '', 'center', $color[4] ) .
         sprintf(_("Are you sure you want to delete %s?"), str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),imap_utf7_decode_local($mailbox_unformatted_disp))).
-        addForm('folders_delete.php', 'post')."<p>\n".
+        addForm('folders_delete.php', 'post', '', '', '', '', TRUE)."<p>\n".
         addHidden('mailbox', $mailbox).
         addSubmit(_("Yes"), 'confirmed').
         addSubmit(_("No"), 'backingout').
@@ -85,6 +88,9 @@ if( !sqgetGlobalVar('confirmed', $tmp, S
     exit;
 }
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 $boxes = sqimap_mailbox_list ($imap_stream);
diff -up squirrelmail-1.4.19/src/folders.php.scrf squirrelmail-1.4.19/src/folders.php
--- squirrelmail-1.4.19/src/folders.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders.php	2009-08-17 09:53:22.665180003 +0200
@@ -103,7 +103,7 @@ echo html_tag( 'table', '', 'center', ''
             ) .
             html_tag( 'tr' ) .
                 html_tag( 'td', '', 'center', $color[0] ) .
-     addForm('folders_create.php', 'POST', 'cf').
+     addForm('folders_create.php', 'POST', 'cf', '', '', '', TRUE).
      addInput('folder_name', '', 25).
      "<br />\n". _("as a subfolder of"). '<br />'.
      "<tt><select name=\"subfolder\">\n";
@@ -228,7 +228,7 @@ echo html_tag( 'table', '', 'center', ''
                 html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
 
 if (count($skip_folders) < count($boxes)) {
-    echo addForm('folders_subscribe.php?method=unsub')
+    echo addForm('folders_subscribe.php?method=unsub', 'post', '', '', '', '', TRUE)
        . "<tt><select name=\"mailbox[]\" multiple=\"multiple\" size=\"8\">\n";
     for ($i = 0; $i < count($boxes); $i++) {
         $use_folder = true;
@@ -273,7 +273,7 @@ if(!$no_list_for_subscribe) {
   }
   
   if (count($box) > 0) {
-    echo addForm('folders_subscribe.php?method=sub')
+    echo addForm('folders_subscribe.php?method=sub', 'post', '', '', '', '', TRUE)
        . '<tt><select name="mailbox[]" multiple="multiple" size="8">';
 
     for ($q = 0; $q < count($box); $q++) {      
@@ -288,7 +288,7 @@ if(!$no_list_for_subscribe) {
   }
 } else {
   /* don't perform the list action -- this is much faster */
-  echo addForm('folders_subscribe.php?method=sub')
+  echo addForm('folders_subscribe.php?method=sub', 'post', '', '', '', '', TRUE)
      . _("Subscribe to:") . '<br />'
      . '<tt><input type="text" name="mailbox[]" size="35" />'
      . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
diff -up squirrelmail-1.4.19/src/folders_rename_do.php.scrf squirrelmail-1.4.19/src/folders_rename_do.php
--- squirrelmail-1.4.19/src/folders_rename_do.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_rename_do.php	2009-08-17 09:53:22.666180572 +0200
@@ -35,8 +35,14 @@ sqgetGlobalVar('onetimepad',$onetimepad,
 sqgetGlobalVar('orig',      $orig,          SQ_POST);
 sqgetGlobalVar('old_name',  $old_name,      SQ_POST);
 sqgetGlobalVar('new_name',  $new_name,      SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end globals */
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $new_name = trim($new_name);
 
 if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
diff -up squirrelmail-1.4.19/src/folders_rename_getname.php.scrf squirrelmail-1.4.19/src/folders_rename_getname.php
--- squirrelmail-1.4.19/src/folders_rename_getname.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_rename_getname.php	2009-08-17 09:53:22.669549523 +0200
@@ -82,7 +82,7 @@ echo '<br />' .
         ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center', $color[4] ) .
-            addForm('folders_rename_do.php').
+            addForm('folders_rename_do.php', 'post', '', '', '', '', TRUE).
      _("New name:").
      '<br /><b>'. $parent . '</b>'.
      addInput('new_name', $old_name, 25) . '<br />' . "\n";
diff -up squirrelmail-1.4.19/src/folders_subscribe.php.scrf squirrelmail-1.4.19/src/folders_subscribe.php
--- squirrelmail-1.4.19/src/folders_subscribe.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_subscribe.php	2009-08-17 09:53:22.665180003 +0200
@@ -33,8 +33,14 @@ sqgetGlobalVar('username',  $username,  
 sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
 sqgetGlobalVar('method',    $method,        SQ_GET);
 sqgetGlobalVar('mailbox',   $mailbox,       SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end globals */
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $location = get_location();
 
 if (!isset($mailbox) || !isset($mailbox[0]) || $mailbox[0] == '') {
diff -up squirrelmail-1.4.19/src/move_messages.php.scrf squirrelmail-1.4.19/src/move_messages.php
--- squirrelmail-1.4.19/src/move_messages.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/move_messages.php	2009-08-17 09:53:22.667549648 +0200
@@ -138,8 +138,14 @@ sqgetGlobalVar('markUnread',      $markU
 sqgetGlobalVar('attache',         $attache,         SQ_POST);
 sqgetGlobalVar('location',        $location,        SQ_POST);
 
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
+// security check
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
 
diff -up squirrelmail-1.4.19/src/options_highlight.php.scrf squirrelmail-1.4.19/src/options_highlight.php
--- squirrelmail-1.4.19/src/options_highlight.php.scrf	2009-05-03 14:33:46.000000000 +0200
+++ squirrelmail-1.4.19/src/options_highlight.php	2009-08-17 09:53:22.666180572 +0200
@@ -40,6 +40,9 @@ sqGetGlobalVar('color_type', $color_type
 sqGetGlobalVar('match_type', $match_type);
 sqGetGlobalVar('value', $value);
 
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
  
 function oh_opt( $val, $sel, $tit ) {
@@ -59,6 +62,10 @@ if (! isset($message_highlight_list)) {
 if (isset($theid) && ($action == 'delete') ||
                      ($action == 'up')     ||
                      ($action == 'down')) {
+
+    // security check
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     $new_rules = array();
     switch($action) {
         case('delete'):
@@ -93,6 +100,9 @@ if (isset($theid) && ($action == 'delete
     exit;
 } else if ($action == 'save') {
 
+    // security check
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if ($color_type == 1) $newcolor = $newcolor_choose;
     elseif ($color_type == 2) $newcolor = $newcolor_input;
     else $newcolor = $color_type;
@@ -364,7 +374,7 @@ if ($action == 'edit' || $action == 'add
     else if ($selected_choose == '')
         $selected_input = TRUE;
 
-    echo addForm('options_highlight.php', 'POST', 'f').
+    echo addForm('options_highlight.php', 'POST', 'f', '', '', '', TRUE).
          addHidden('action', 'save');
     if($action == 'edit') {
         echo addHidden('theid', (isset($theid)?$theid:''));
@@ -469,4 +479,4 @@ if ($action == 'edit' || $action == 'add
 }
 do_hook('options_highlight_bottom');
 ?>
-</table></body></html>
\ No newline at end of file
+</table></body></html>
diff -up squirrelmail-1.4.19/src/options_identities.php.scrf squirrelmail-1.4.19/src/options_identities.php
--- squirrelmail-1.4.19/src/options_identities.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/options_identities.php	2009-08-17 09:53:22.666180572 +0200
@@ -27,6 +27,7 @@ require_once(SM_PATH . 'include/validate
 include_once(SM_PATH . 'functions/global.php');
 include_once(SM_PATH . 'functions/display_messages.php');
 include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
 include_once(SM_PATH . 'functions/identity.php');
 
 /* make sure that page is not available when $edit_identity is false */
@@ -42,9 +43,16 @@ sqgetGlobalVar('newidentities', $newiden
 sqgetGlobalVar('smaction', $smaction, SQ_POST);
 sqgetGlobalVar('return', $return, SQ_POST);
 
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
+
 // First lets see if there are any actions to perform //
 if (!empty($smaction) && is_array($smaction)) {
 
+    // first do a security check
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     $doaction = '';
     $identid = 0;
 
@@ -72,9 +80,9 @@ displayPageHeader($color, 'None');
 
 do_hook('options_identities_top');
 
-$td_str = '';
-$td_str .= '<form name="f" action="options_identities.php" method="post"><br />' . "\n";
-$td_str .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n";
+$td_str = '<form name="f" action="options_identities.php" method="post"><br />' . "\n"
+        . addHidden('smtoken', sm_generate_security_token()) . "\n"
+        . '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n";
 $cnt = count($identities);
 foreach( $identities as $iKey=>$ident ) {
 
diff -up squirrelmail-1.4.19/src/options_order.php.scrf squirrelmail-1.4.19/src/options_order.php
--- squirrelmail-1.4.19/src/options_order.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/options_order.php	2009-08-17 09:53:26.573299584 +0200
@@ -28,6 +28,7 @@ require_once(SM_PATH . 'functions/displa
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
 
 /* get globals */
 sqgetGlobalVar('num',       $num,       SQ_GET);  
@@ -35,6 +36,9 @@ sqgetGlobalVar('add',       $add,       
 
 sqgetGlobalVar('submit',    $submit);
 sqgetGlobalVar('method',    $method);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
 displayPageHeader($color, 'None');
@@ -83,6 +87,10 @@ displayPageHeader($color, 'None');
            include_once(SM_PATH . 'include/load_prefs.php');
         }
     } else if ($method == 'add' && $add) {
+
+        // first do a security check
+        sm_validate_security_token($submitted_token, 3600, TRUE);
+
         /* User should not be able to insert PHP-code here */
         $add = str_replace ('<?', '..', $add);
         $add = ereg_replace ('<.*script.*language.*php.*>', '..', $add);
@@ -128,8 +136,9 @@ displayPageHeader($color, 'None');
     }
     
     if (count($index_order) != count($available)) {
-        echo '<form name="f" method="post" action="options_order.php">';
-        echo '<select name="add">';
+        echo '<form name="f" method="post" action="options_order.php">' . "\n"
+           . addHidden('smtoken', sm_generate_security_token())
+           . '<select name="add">' . "\n";
         for ($i=1; $i <= count($available); $i++) {
             $found = false;
             for ($j=1; $j <= count($index_order); $j++) {
diff -up squirrelmail-1.4.19/src/options.php.scrf squirrelmail-1.4.19/src/options.php
--- squirrelmail-1.4.19/src/options.php.scrf	2009-05-15 17:09:55.000000000 +0200
+++ squirrelmail-1.4.19/src/options.php	2009-08-17 09:53:22.667549648 +0200
@@ -143,6 +143,9 @@ sqgetGlobalVar('delimiter', $delimiter, 
 sqgetGlobalVar('optpage',     $optpage);
 sqgetGlobalVar('optmode',     $optmode,      SQ_FORM);
 sqgetGlobalVar('optpage_data',$optpage_data, SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of getting globals */
 
 /* Make sure we have an Option Page set. Default to main. */
@@ -226,6 +229,12 @@ if ( !@is_file( $optpage_file ) ) {
 /*** Next, process anything that needs to be processed. ***/
 /***********************************************************/
 
+// security check before saving anything...
+//FIXME: what about SMOPT_MODE_LINK??
+if ($optmode == SMOPT_MODE_SUBMIT) {
+   sm_validate_security_token($submitted_token, 3600, TRUE);
+}
+
 // set empty error message
 $optpage_save_error=array();
 
@@ -426,7 +435,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 /* If we are not looking at the main option page, display the page here. */
 /*************************************************************************/
 } else {
-    echo addForm('options.php', 'POST', 'f')
+    echo addForm('options.php', 'POST', 'f', '', '', '', TRUE)
        . create_optpage_element($optpage)
        . create_optmode_element(SMOPT_MODE_SUBMIT)
        . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n"
diff -up squirrelmail-1.4.19/src/search.php.scrf squirrelmail-1.4.19/src/search.php
--- squirrelmail-1.4.19/src/search.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/search.php	2009-08-17 09:53:22.666180572 +0200
@@ -28,6 +28,7 @@ require_once(SM_PATH . 'functions/imap.p
 require_once(SM_PATH . 'functions/imap_search.php');
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/forms.php');
 
 global $allow_thread_sort;
 
@@ -67,6 +68,9 @@ if (sqgetGlobalVar('count',$count,SQ_GET
 } else {
     unset($count);
 }
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_GET)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
 /*  here are some functions, could go in imap_search.php
@@ -240,7 +244,8 @@ function printSearchMessages($msgs,$mail
         $form_name = "FormMsgs" . $safe_name;
         echo '<form name="' . $form_name . '" method="post" action="move_messages.php">' ."\n" .
              '<input type="hidden" name="mailbox" value="'.htmlspecialchars($mailbox).'">' . "\n" .
-             '<input type="hidden" name="startMessage" value="1">' . "\n";
+             '<input type="hidden" name="startMessage" value="1">' . "\n" .
+             addHidden('smtoken', sm_generate_security_token()) . "\n";
 
         echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
         echo '<tr><td>';
@@ -301,6 +306,11 @@ if (empty($submit) && !empty($what)) {
     $submit = _("Search");
 }
 
+// need to verify security token if user wants to do anything
+if (!empty($submit)) {
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+}
+
 if ($submit == _("Search") && !empty($what)) {
     if ($recent_count > 0) {
         update_recent($what, $where, $mailbox, $username, $data_dir);
@@ -449,6 +459,7 @@ if( substr( phpversion(), 0, 3 ) == '4.1
 /* Search Form */
 echo html_tag( 'div', '<b>' . _("Current Search") . '</b>', 'left' ) . "\n"
    . '<form action="search.php" name="s">'
+   . addHidden('smtoken', sm_generate_security_token())
    . html_tag( 'table', '', '', '', 'width="95%" cellpadding="0" cellspacing="0" border="0"' )
    . html_tag( 'tr' )
    . html_tag( 'td', '', 'left' )
diff -up squirrelmail-1.4.19/src/vcard.php.scrf squirrelmail-1.4.19/src/vcard.php
--- squirrelmail-1.4.19/src/vcard.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/vcard.php	2009-08-17 09:53:22.668549664 +0200
@@ -155,6 +155,7 @@ echo '</table>' .
      '</td></tr>' .
      '<tr><td align="center">' .
      '<form action="../src/addressbook.php" method="post" name="f_add">' .
+     '<input type="hidden" name="smtoken" value="' . sm_generate_security_token() . '" />' .
      '<table border="0" cellpadding="2" cellspacing="0" align="center">' .
      '<tr><td align="right"><b>' . _("Nickname") . ':</b></td>' .
      '<td>' .
@@ -236,4 +237,4 @@ echo '<a href="../src/download.php?absol
 <table border="0" cellspacing="0" cellpadding="2" align="center">
 <tr><td bgcolor="<?php echo $color[4]; ?>">
 </td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-11/squirrelmail.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- squirrelmail.spec	22 May 2009 07:06:56 -0000	1.69
+++ squirrelmail.spec	17 Aug 2009 08:24:13 -0000	1.70
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.19
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -33,6 +33,9 @@ Patch4: squirrelmail-1.4.15-tr-fix.patch
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
 Patch5: squirrelmail-1.4.17-biguid.patch
 
+#taken from upstream, bug #517312, for squirrelmail < 1.4.20RC1
+Patch6: squirrelmail-1.4.19-csrf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -59,6 +62,7 @@ tar xfj %SOURCE4
 popd
 
 %patch5 -p1
+%patch6 -p1
 
 %build
 rm -f plugins/make_archive.pl
@@ -265,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Aug 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.19-2
+- fix #517312 - CSRF issues in all forms (SA34627)
+
 * Fri May 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.19-1
 - updated to 1.4.19                                                                        
 - fixes CVE-2009-1579, CVE-2009-1580, CVE-2009-1581                                        



From jwrdegoede at fedoraproject.org  Mon Aug 17 08:31:51 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 17 Aug 2009 08:31:51 +0000 (UTC)
Subject: rpms/vavoom/devel vavoom.spec,1.17,1.18
Message-ID: <20090817083151.B356211C00E4@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/vavoom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25545

Modified Files:
	vavoom.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.30-3
- Switch to openal-soft



Index: vavoom.spec
===================================================================
RCS file: /cvs/extras/rpms/vavoom/devel/vavoom.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vavoom.spec	27 Jul 2009 06:44:40 -0000	1.17
+++ vavoom.spec	17 Aug 2009 08:31:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           vavoom
 Version:        1.30
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
@@ -25,7 +25,7 @@ Group:          Amusements/Games
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel
-BuildRequires:  libvorbis-devel mikmod-devel flac-devel openal-devel
+BuildRequires:  libvorbis-devel mikmod-devel flac-devel openal-soft-devel
 BuildRequires:  libGLU-devel wxGTK-devel desktop-file-utils cmake
 Requires:       timidity++-patches hicolor-icon-theme autodownloader
 
@@ -123,6 +123,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.30-3
+- Switch to openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Mon Aug 17 08:39:59 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 17 Aug 2009 08:39:59 +0000 (UTC)
Subject: rpms/gsl/devel gsl.spec,1.51,1.52
Message-ID: <20090817083959.EA5A411C00E4@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26974

Modified Files:
	gsl.spec 
Log Message:
- fix preun and post scripts (#517568)

CVS ----------------------------------------------------------------------



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- gsl.spec	10 Aug 2009 14:51:10 -0000	1.51
+++ gsl.spec	17 Aug 2009 08:39:59 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnu.org/software/gsl/
 Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.10-lib64.patch
@@ -63,13 +63,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %postun -p /sbin/ldconfig
 
 %post devel
-if [ -f %{_infodir}/gsl-ref.info* ]; then
+if [ -f %{_infodir}/gsl-ref.info.gz ]; then
     /sbin/install-info %{_infodir}/gsl-ref.info %{_infodir}/dir || :
 fi
 
 %preun devel
 if [ "$1" = 0 ]; then
-    if [ -f %{_infodir}/gsl-ref.info* ]; then
+    if [ -f %{_infodir}/gsl-ref.info.gz ]; then
 	/sbin/install-info --delete %{_infodir}/gsl-ref.info %{_infodir}/dir || :
     fi
 fi
@@ -104,7 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
-* Mon Aug 10 2009 Ivana Varekova <varekova redhat com> - 1.12-5
+* Mon Aug 17 2009 Ivana Varekova <varekova at redhat.com> - 1.12-6
+- fix preun and post scripts (#517568)
+
+* Mon Aug 10 2009 Ivana Varekova <varekova at redhat.com> - 1.12-5
 - fix installation with --excludedocs option (#515971)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-4



From pnemade at fedoraproject.org  Mon Aug 17 08:48:19 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 08:48:19 +0000 (UTC)
Subject: rpms/m17n-contrib/devel kn-kgp-halantha-ayogavaaha.patch, NONE,
	1.1 m17n-contrib.spec, 1.31, 1.32 ks-kbd.mim, 1.1, NONE
Message-ID: <20090817084819.9509811C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29007

Modified Files:
	m17n-contrib.spec 
Added Files:
	kn-kgp-halantha-ayogavaaha.patch 
Removed Files:
	ks-kbd.mim 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-2
- Add patch kn-kgp-halantha-ayogavaaha.patch




kn-kgp-halantha-ayogavaaha.patch:
 kn-kgp-new.mim |   47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

--- NEW FILE kn-kgp-halantha-ayogavaaha.patch ---
--- im/kn-kgp.mim	2008-07-02 14:32:22.000000000 +0530
+++ im/kn-kgp-new.mim	2009-08-03 12:29:13.000000000 +0530
@@ -2,6 +2,8 @@
 ;;   Copyright (C) 2008
 ;;   Sridhar M.A., Mysore; mas at mylug.org
 
+;; Modified for better visual appeal by Prasad H. L. hlprasu at gmail.com
+
 
 ;; This file is part of the m17n contrib; a sub-part of the m17n
 ;; library.
@@ -35,7 +37,7 @@
   ("A") ("B") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") 
   ("L") ("M") ("N") ("O") ("P") ("Q") ("R") ("S") ("T") ("U")
   ("V") ("W") ("Y") ("Z")
-  ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i")
+  ("a") ("b") ("c") ("d") ("e") ("g") ("h") ("i")
   ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r")
   ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z"))
 
@@ -94,8 +96,6 @@
   ("o" "?")
   ("O" "?")
   ("V" "?")
-  ("M" "?")
-  ("H" "?")
   ("|" "?")
   ("||" "?")
   ("sX" "?")
@@ -110,8 +110,15 @@
   ("8" "?")
   ("9" "?"))
 
+ (halantha
+   ("f" "?")
+   ("ff" "??"))
+ 
+ (ayogavaaha
+  ("M" "?")
+  ("H" "?"))
+
  (dependent
-  ("f" "?")
   ("A" "?")
   ("i" "?")
   ("I" "?")
@@ -124,8 +131,7 @@
   ("Y" "?")
   ("o" "?")
   ("O" "?")
-  ("V" "?")
-  ("ff" "??"))
+  ("V" "?"))
 
  (return
   ((Return)))
@@ -135,23 +141,36 @@
 
 (state
  (init
-  (starter (pushback 1) (shift intermediate)))
+  (starter (pushback 1) (shift start)))
+
+ (start
+  (consonant (shift first))
+  (independent (shift ayogavaaha))
+  (backspace)
+  (return (shift init)))
 
- (intermediate
-  (consonant (shift second))
-  (independent (shift finish))
+ (first
+  (consonant (set a @-1) (undo -1) (commit) (pushback a) (shift start))
+  (ayogavaaha (shift finish))
+  (dependent (shift ayogavaaha))
+  (halantha (shift second))
   (backspace)
   (return (shift init)))
 
  (second
-  (consonant)
-  (dependent (shift finish))
+  (consonant (shift first))
   (backspace)
   (return (shift init)))
 
+ (ayogavaaha
+  (ayogavaaha (shift ayogavaaha))
+  (backspace)
+  (return (shift init))
+
  (finish
-  (return)
-  )
+  (backspace)
+  (return))
+)
 
 ;; (finish
 ;;  (return)


Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/devel/m17n-contrib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- m17n-contrib.spec	29 Jul 2009 03:51:18 -0000	1.31
+++ m17n-contrib.spec	17 Aug 2009 08:48:19 -0000	1.32
@@ -1,19 +1,19 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
 Version:  1.1.10
-Release:  1%{?dist}
+Release:  2%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/m17n-contrib-%{version}.tar.gz
 Source1:  mai-inscript.mim
-Source2:  ks-kbd.mim
 Patch0:	  bug433416-bn-probhat.patch
 Patch1:	  as-inscript-keysummary-440201.patch
 Patch2:   ml-inscript-keysummary-435259.patch
 Patch3:   kn-inscript-ZWNJ-440007.patch
 Patch4:   or-inscript-ZWJ-ZWNJ-466748.patch
 Patch5:   pa-jhelum-numeric-503478.patch
+Patch6:   kn-kgp-halantha-ayogavaaha.patch
 BuildArch: noarch
 BuildRequires: m17n-db-devel >= 1.5.2-3
 Requires: m17n-db >= 1.4.0
@@ -102,6 +102,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch6 -p0
 
 %build
 %configure
@@ -111,7 +112,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
-cp -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n/
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 rm -rf $RPM_BUILD_ROOT/%{_bindir}
 
@@ -126,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/m17n/scripts
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-2
+- Add patch kn-kgp-halantha-ayogavaaha.patch
+
 * Wed Jul 29 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-1
 - update to new upstream release 1.1.10 
 - Resolves: rh#513920: [pa_IN]Jhelum layout conflict with shortcut key in lokalize


--- ks-kbd.mim DELETED ---



From jwrdegoede at fedoraproject.org  Mon Aug 17 08:52:40 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 17 Aug 2009 08:52:40 +0000 (UTC)
Subject: rpms/torcs/devel torcs.spec,1.25,1.26
Message-ID: <20090817085240.D57E311C00E4@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/torcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29854

Modified Files:
	torcs.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.3.1-3
- Switch to openal-soft



Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- torcs.spec	27 Jul 2009 06:07:34 -0000	1.25
+++ torcs.spec	17 Aug 2009 08:52:40 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The Open Racing Car Simulator
 Name: torcs
 Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -12,11 +12,12 @@ Requires: torcs-data
 Requires: torcs-data-tracks-road
 Requires: torcs-data-cars-extra
 Requires: opengl-games-utils
-BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
-BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
+BuildRequires: libGL-devel, freeglut-devel, plib-devel >= 1.8.3
+BuildRequires: libpng-devel, libjpeg-devel, zlib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel
 BuildRequires: libXxf86vm-devel, libXrandr-devel, libXrender-devel
+BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10
 # We used to provide a separate "robots" sub-package up to 1.3.0 included
 Obsoletes: torcs-robots <= 1.3.0
 Provides: torcs-robots = %{version}-%{release}
@@ -126,6 +127,9 @@ find %{buildroot}%{_libdir}/%{name}/ -na
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.3.1-3
+- Switch to openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Aug 17 08:56:34 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 17 Aug 2009 08:56:34 +0000 (UTC)
Subject: rpms/squirrelmail/F-10 squirrelmail-1.4.19-csrf.patch, NONE,
	1.1 squirrelmail.spec, 1.65, 1.66
Message-ID: <20090817085634.9CECF11C00E4@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30575

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.19-csrf.patch 
Log Message:
fix #517312 - CSRF issues in all forms (SA34627)


squirrelmail-1.4.19-csrf.patch:
 config/conf.pl                 |   79 ++++++++++++++++-
 doc/ChangeLog                  |    3 
 functions/auth.php             |   49 ++++++++++-
 functions/forms.php            |   30 ++++++
 functions/mailbox_display.php  |    1 
 functions/strings.php          |  181 +++++++++++++++++++++++++++++++++++++++++
 src/addrbook_search_html.php   |    4 
 src/addressbook.php            |   14 ++-
 src/compose.php                |   34 +++++++
 src/folders.php                |    8 -
 src/folders_create.php         |    6 +
 src/folders_delete.php         |    8 +
 src/folders_rename_do.php      |    6 +
 src/folders_rename_getname.php |    2 
 src/folders_subscribe.php      |    6 +
 src/move_messages.php          |    6 +
 src/options.php                |   11 ++
 src/options_highlight.php      |   14 ++-
 src/options_identities.php     |   14 ++-
 src/options_order.php          |   13 ++
 src/search.php                 |   13 ++
 src/vcard.php                  |    3 
 22 files changed, 472 insertions(+), 33 deletions(-)

--- NEW FILE squirrelmail-1.4.19-csrf.patch ---
diff -up squirrelmail-1.4.19/config/conf.pl.scrf squirrelmail-1.4.19/config/conf.pl
--- squirrelmail-1.4.19/config/conf.pl.scrf	2009-04-13 18:52:57.000000000 +0200
+++ squirrelmail-1.4.19/config/conf.pl	2009-08-17 09:53:22.671454970 +0200
@@ -346,15 +346,19 @@ if ( !$sendmail_args && $sendmail_path =
 }
 
 # Added in 1.4.11
-$smtp_sitewide_user = ''				if ( !$smtp_sitewide_user );
-$smtp_sitewide_pass = ''				if ( !$smtp_sitewide_pass );
+$smtp_sitewide_user = ''                if ( !$smtp_sitewide_user );
+$smtp_sitewide_pass = ''                if ( !$smtp_sitewide_pass );
 
 # Added in 1.4.9
 $abook_global_file_listing = 'true'     if ( !$abook_global_file_listing );
 $abook_file_line_length = 2048          if ( !$abook_file_line_length );
 
 # Added in 1.4.16
-$only_secure_cookies = 'true'     if ( !$only_secure_cookies );
+$only_secure_cookies = 'true'           if ( !$only_secure_cookies );
+
+# Added in 1.4.20RC1
+$disable_security_tokens = 'false'      if ( !$disable_security_tokens );
+$check_referrer = ''                    if ( !$check_referrer );
 
 if ( $ARGV[0] eq '--install-plugin' ) {
     print "Activating plugin " . $ARGV[1] . "\n";
@@ -549,6 +553,8 @@ while ( ( $command ne "q" ) && ( $comman
         print "14. PHP session name             : $WHT$session_name$NRM\n";
         print "15. Location base                : $WHT$config_location_base$NRM\n";
         print "16. Only secure cookies if poss. : $WHT$only_secure_cookies$NRM\n";
+        print "17. Disable secure forms         : $WHT$disable_security_tokens$NRM\n";
+        print "18. Page referal requirement     : $WHT$check_referrer$NRM\n";
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 5 ) {
@@ -766,6 +772,8 @@ while ( ( $command ne "q" ) && ( $comman
             elsif ( $command == 14 ) { $session_name             = command314(); }
             elsif ( $command == 15 ) { $config_location_base     = command_config_location_base(); }
             elsif ( $command == 16 ) { $only_secure_cookies      = command316(); }
+            elsif ( $command == 17 ) { $disable_security_tokens  = command317(); }
+            elsif ( $command == 18 ) { $check_referrer           = command318(); }
         } elsif ( $menu == 5 ) {
             if ( $command == 1 ) { command41(); }
             elsif ( $command == 2 ) { $theme_css = command42(); }
@@ -2455,6 +2463,63 @@ sub command316 {
 
 
 
+# disable_security_tokens (since 1.4.20RC1)
+sub command317 {
+    print "This option allows you to turn off the security checks in the forms\n";
+    print "that SquirrelMail generates.  It is NOT RECOMMENDED that you disable\n";
+    print "this feature - otherwise, your users may be exposed to phishing and\n";
+    print "other attacks.\n";
+    print "Unless you know what you are doing, you should leave this set to \"NO\".\n";
+    print "\n";
+
+    if ( lc($disable_security_tokens) eq 'true' ) {
+        $default_value = "y";
+    } else {
+        $default_value = "n";
+    }
+    print "Disable secure forms? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $disable_security_tokens = <STDIN>;
+    if ( ( $disable_security_tokens =~ /^y\n/i ) || ( ( $disable_security_tokens =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $disable_security_tokens = 'true';
+    } else {
+        $disable_security_tokens = 'false';
+    }
+    return $disable_security_tokens;
+}
+
+
+
+# check_referrer (since 1.4.20RC1)
+sub command318 {
+    print "This option allows you to enable referal checks for all page requests\n";
+    print "made to SquirrelMail.  This can help ensure that page requests came\n";
+    print "from the same server and not from an attacker's site (usually the\n";
+    print "result of a XSS or phishing attack).  To enable referal checking,\n";
+    print "this setting can be set to the domain where your SquirrelMail is\n";
+    print "being hosted (usually the same as the Domain setting under Server\n";
+    print "Settings).  For example, it could be \"example.com\", or if you\n";
+    print "use a plugin (such as Login Manager) to host SquirrelMail on more\n";
+    print "than one domain, you can set this to \"###DOMAIN###\" to tell it\n";
+    print "to use the current domain.\n";
+    print "\n";
+    print "However, in some cases (where proxy servers are in use, etc.), the\n";
+    print "domain might be different.\n";
+    print "\n";
+    print "NOTE that referal checks are not foolproof - they can be spoofed by\n";
+    print "browsers, and some browsers intentionally don't send referal\n";
+    print "information (in which case, the check is silently bypassed)\n";
+    print "\n";
+
+    print "Referal requirement? [$WHT$check_referrer$NRM]: $WHT";
+    $new_check_referrer = <STDIN>;
+    chomp($new_check_referrer);
+    $check_referrer = $new_check_referrer;
+
+    return $check_referrer;
+}
+
+
+
 ####################################################################################
 #### THEMES ####
 sub command41 {
@@ -3502,10 +3567,14 @@ sub save_data {
         print CF "\$session_name = '$session_name';\n";
 
     # boolean
-        print CF "\$only_secure_cookies   = $only_secure_cookies;\n";
+        print CF "\$only_secure_cookies     = $only_secure_cookies;\n";
+        print CF "\$disable_security_tokens = $disable_security_tokens;\n";
+
+    # string
+        print CF "\$check_referrer          = '$check_referrer';\n";
 
         print CF "\n";
-        print CF "\$config_location_base     = '$config_location_base';\n";
+        print CF "\$config_location_base    = '$config_location_base';\n";
 
         print CF "\n";
         print CF "\@include SM_PATH . 'config/config_local.php';\n";
diff -U0 squirrelmail-1.4.19/doc/ChangeLog.scrf squirrelmail-1.4.19/doc/ChangeLog
--- squirrelmail-1.4.19/doc/ChangeLog.scrf	2009-05-21 19:19:09.000000000 +0200
+++ squirrelmail-1.4.19/doc/ChangeLog	2009-08-17 09:53:30.039237290 +0200
@@ -4,0 +5,3 @@
+  - Implemented page referal verification mechanism. (Secunia Advisory SA34627)
+  - Implemented security token system. (Secunia Advisory SA34627)
+
diff -up squirrelmail-1.4.19/functions/auth.php.scrf squirrelmail-1.4.19/functions/auth.php
--- squirrelmail-1.4.19/functions/auth.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/functions/auth.php	2009-08-17 09:53:22.673549603 +0200
@@ -33,21 +33,56 @@ if (! isset($use_smtp_tls)) {
  * Check if user has previously logged in to the SquirrelMail session.  If user
  * has not logged in, execution will stop inside this function.
  *
+ * This function optionally checks the referrer of this page request.  If the
+ * administrator wants to impose a check that the referrer of this page request
+ * is another page on the same domain (otherwise, the page request is likely
+ * the result of a XSS or phishing attack), then they need to specify the
+ * acceptable referrer domain in a variable named $check_referrer in
+ * config/config.php (or the configuration tool) for which the value is
+ * usually the same as the $domain setting (for example:
+ *    $check_referrer = 'example.com';
+ * However, in some cases (where proxy servers are in use, etc.), the
+ * acceptable referrer might be different.  If $check_referrer is set to
+ * "###DOMAIN###", then the current value of $domain is used (useful in
+ * situations where $domain might change at runtime (when using the Login
+ * Manager plugin to host multiple domains with one SquirrelMail installation,
+ * for example)):
+ *    $check_referrer = '###DOMAIN###';
+ * NOTE HOWEVER, that referrer checks are not foolproof - they can be spoofed
+ * by browsers, and some browsers intentionally don't send them, in which
+ * case SquirrelMail silently ignores referrer checks.
+ *
  * @return void This function returns ONLY if user has previously logged in
  * successfully (otherwise, execution terminates herein).
  */
 function is_logged_in() {
 
-    if ( sqsession_is_registered('user_is_logged_in') ) {
+    // check for user login as well as referrer if needed
+    //
+    global $check_referrer, $domain;
+    if ($check_referrer == '###DOMAIN###') $check_referrer = $domain;
+    if (!empty($check_referrer)) {
+        $ssl_check_referrer = 'https://' . $check_referrer;
+        $check_referrer = 'http://' . $check_referrer;
+    }
+    if (!sqgetGlobalVar('HTTP_REFERER', $referrer, SQ_SERVER)) $referrer = '';
+    if (sqsession_is_registered('user_is_logged_in') 
+     && (!$check_referrer || empty($referrer)
+      || ($check_referrer && !empty($referrer)
+       && (strpos(strtolower($referrer), strtolower($check_referrer)) === 0
+        || strpos(strtolower($referrer), strtolower($ssl_check_referrer)) === 0)))) {
         return;
     } else {
+
         global $session_expired_post,
                $session_expired_location, $squirrelmail_language;
 
         // use $message to indicate what logout text the user
         // will see... if 0, typical "You must be logged in"
         // if 1, information that the user session was saved
-        // and will be resumed after (re)login
+        // and will be resumed after (re)login, if 2, there
+        // seems to have been a XSS or phishing attack (bad
+        // referrer)
         //
         $message = 0;
 
@@ -67,6 +102,12 @@ function is_logged_in() {
                 $message = 1;
         }
 
+        // was bad referrer the reason we were rejected?
+        //
+        if (sqsession_is_registered('user_is_logged_in') 
+         && $check_referrer && !empty($referrer))
+            $message = 2;
+      
         session_write_close();
 
         // signout page will deal with users who aren't logged 
@@ -79,8 +120,10 @@ function is_logged_in() {
         set_up_language($squirrelmail_language, true);
         if (!$message)
             logout_error( _("You must be logged in to access this page.") );
-        else
+        else if ($message == 1)
             logout_error( _("Your session has expired, but will be resumed after logging in again.") );
+        else if ($message == 2)
+            logout_error( _("The current page request appears to have originated from an unrecognized source.") );
         exit;
     }
 }
diff -up squirrelmail-1.4.19/functions/forms.php.scrf squirrelmail-1.4.19/functions/forms.php
--- squirrelmail-1.4.19/functions/forms.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/functions/forms.php	2009-08-17 09:53:22.673549603 +0200
@@ -130,8 +130,24 @@ function addTextArea($name, $text = '', 
 
 /**
  * Make a <form> start-tag.
+ *
+ * @param string $action
+ * @param string $method
+ * @param string $name
+ * @param string $enctype
+ * @param string $charset
+ * @param string $extra     Any other attributes can be added with this parameter;
+ *                          they should use double quotes around attribute values
+ *                          (OPTIONAL; default empty)
+ * @param mixed  $add_token When given as a string or as boolean TRUE, a hidden
+ *                          input is also added to the form containing a security
+ *                          token.  When given as TRUE, the input name is "smtoken";
+ *                          otherwise the name is the string that is given for this
+ *                          parameter.  When FALSE, no hidden token input field is
+ *                          added.  (OPTIONAL; default not used)
+ *
  */
-function addForm($action, $method = 'post', $name = '', $enctype = '', $charset = '')
+function addForm($action, $method = 'post', $name = '', $enctype = '', $charset = '', $extra = '', $add_token = FALSE)
 {
     if($name) {
         $name = ' name="'.$name.'"';
@@ -143,7 +159,15 @@ function addForm($action, $method = 'pos
         $charset = ' accept-charset="'.htmlspecialchars($charset).'"';
     }
 
-    return '<form action="'. $action .'" method="'. $method .'"'.
-        $enctype . $name . $charset . ">\n";
+    $form_string = '<form action="'. $action .'" method="'. $method .'"'.
+        $enctype . $name . $charset . ' ' . $extra . " >\n";
+
+    if($add_token) {
+        $form_string .= '<input type="hidden" value="' . sm_generate_security_token()
+                      . '" name="' . (is_string($add_token) ? $add_token : 'smtoken')
+                      . "\" />\n";
+    }
+
+    return $form_string;
 }
 
diff -up squirrelmail-1.4.19/functions/mailbox_display.php.scrf squirrelmail-1.4.19/functions/mailbox_display.php
--- squirrelmail-1.4.19/functions/mailbox_display.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/functions/mailbox_display.php	2009-08-17 09:53:22.673549603 +0200
@@ -513,6 +513,7 @@ function showMessagesForMailbox($imapCon
     $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox);
     $form_name = "FormMsgs" . $safe_name;
     echo '<form name="' . $form_name . '" method="post" action="move_messages.php">' ."\n" .
+        '<input type="hidden" name="smtoken" value="'.sm_generate_security_token().'">' . "\n" .
         '<input type="hidden" name="mailbox" value="'.htmlspecialchars($mailbox).'">' . "\n" .
         '<input type="hidden" name="startMessage" value="'.htmlspecialchars($start_msg).'">' . "\n";
     
diff -up squirrelmail-1.4.19/functions/strings.php.scrf squirrelmail-1.4.19/functions/strings.php
--- squirrelmail-1.4.19/functions/strings.php.scrf	2009-05-21 19:19:09.000000000 +0200
+++ squirrelmail-1.4.19/functions/strings.php	2009-08-17 09:53:22.672234055 +0200
@@ -879,5 +879,186 @@ function sq_trim_value ( &$value ) {
     $value = trim($value);
 }
 
+/**
+  * Gathers the list of secuirty tokens currently
+  * stored in the user's preferences and optionally
+  * purges old ones from the list.
+  *
+  * @param boolean $purge_old Indicates if old tokens
+  *                           should be purged from the
+  *                           list ("old" is 30 days or
+  *                           older unless the administrator
+  *                           overrides that value using
+  *                           $max_security_token_age in
+  *                           config/config_local.php)
+  *                           (OPTIONAL; default is to always
+  *                           purge old tokens)
+  *
+  * @return array The list of tokens
+  *
+  * @since 1.4.19 and 1.5.2
+  *
+  */
+function sm_get_user_security_tokens($purge_old=TRUE)
+{
+
+   global $data_dir, $username, $max_token_age_days;
+
+   $tokens = getPref($data_dir, $username, 'security_tokens', '');
+   if (($tokens = unserialize($tokens)) === FALSE || !is_array($tokens))
+      $tokens = array();
+
+   // purge old tokens if necessary
+   //
+   if ($purge_old)
+   {
+      if (empty($max_token_age_days)) $max_token_age_days = 30;
+      $now = time();
+      $discard_token_date = $now - ($max_token_age_days * 86400);
+      $cleaned_tokens = array();
+      foreach ($tokens as $token => $timestamp)
+         if ($timestamp >= $discard_token_date)
+            $cleaned_tokens[$token] = $timestamp;
+      $tokens = $cleaned_tokens;
+   }
+
+   return $tokens;
+
+}
+
+/**
+  * Generates a security token that is then stored in
+  * the user's preferences with a timestamp for later
+  * verification/use.
+  *
+  * WARNING: If the administrator has turned the token system
+  *          off by setting $disable_security_tokens to TRUE in
+  *          config/config.php or the configuration tool, this
+  *          function will not store tokens in the user
+  *          preferences (but it will still generate and return
+  *          a random string).
+  *
+  * @return void
+  *
+  * @since 1.4.19 and 1.5.2
+  *
+  */
+function sm_generate_security_token()
+{
+
+   global $data_dir, $username, $disable_security_tokens;
+   $max_generation_tries = 1000;
+
+   $tokens = sm_get_user_security_tokens();
+
+   $new_token = GenerateRandomString(12, '', 7);
+   $count = 0;
+   while (isset($tokens[$new_token]))
+   {
+      $new_token = GenerateRandomString(12, '', 7);
+      if (++$count > $max_generation_tries)
+      {
+         logout_error(_("Fatal token generation error; please contact your system administrator or the SquirrelMail Team"));
+         exit;
+      }
+   }
+
+   // is the token system enabled?  CAREFUL!
+   //
+   if (!$disable_security_tokens)
+   {
+      $tokens[$new_token] = time();
+      setPref($data_dir, $username, 'security_tokens', serialize($tokens));
+   }
+
+   return $new_token;
+
+}
+
+/**
+  * Validates a given security token and optionally remove it
+  * from the user's preferences if it was valid.  If the token
+  * is too old but otherwise valid, it will still be rejected.
+  *
+  * "Too old" is 30 days or older unless the administrator
+  * overrides that value using $max_security_token_age in
+  * config/config_local.php
+  *
+  * WARNING: If the administrator has turned the token system
+  *          off by setting $disable_security_tokens to TRUE in
+  *          config/config.php or the configuration tool, this
+  *          function will always return TRUE.
+  *
+  * @param string  $token           The token to validate
+  * @param int     $validity_period The number of seconds tokens are valid
+  *                                 for (set to zero to remove valid tokens
+  *                                 after only one use; use 3600 to allow
+  *                                 tokens to be reused for an hour)
+  *                                 (OPTIONAL; default is to only allow tokens
+  *                                 to be used once)
+  * @param boolean $show_error      Indicates that if the token is not
+  *                                 valid, this function should display
+  *                                 a generic error, log the user out
+  *                                 and exit - this function will never
+  *                                 return in that case.
+  *                                 (OPTIONAL; default FALSE)
+  *
+  * @return boolean TRUE if the token validated; FALSE otherwise
+  *
+  * @since 1.4.19 and 1.5.2
+  *
+  */
+function sm_validate_security_token($token, $validity_period=0, $show_error=FALSE)
+{
+
+   global $data_dir, $username, $max_token_age_days,
+          $disable_security_tokens;
+
+   // bypass token validation?  CAREFUL!
+   //
+   if ($disable_security_tokens) return TRUE;
+
+   // don't purge old tokens here because we already
+   // do it when generating tokens
+   //
+   $tokens = sm_get_user_security_tokens(FALSE);
+
+   // token not found?
+   //
+   if (empty($tokens[$token]))
+   {
+      if (!$show_error) return FALSE;
+      logout_error(_("This page request could not be verified and appears to have expired."));
+      exit;
+   }
+
+   $now = time();
+   $timestamp = $tokens[$token];
+
+   // whether valid or not, we want to remove it from
+   // user prefs if it's old enough
+   //
+   if ($timestamp < $now - $validity_period)
+   {
+      unset($tokens[$token]);
+      setPref($data_dir, $username, 'security_tokens', serialize($tokens));
+   }
+
+   // reject tokens that are too old
+   //
+   if (empty($max_token_age_days)) $max_token_age_days = 30;
+   $old_token_date = $now - ($max_token_age_days * 86400);
+   if ($timestamp < $old_token_date)
+   {
+      if (!$show_error) return FALSE;
+      logout_error(_("The current page request appears to have originated from an untrusted source."));
+      exit;
+   }
+
+   // token OK!
+   //
+   return TRUE;
+
+}
 
 $PHP_SELF = php_self();
diff -up squirrelmail-1.4.19/src/addrbook_search_html.php.scrf squirrelmail-1.4.19/src/addrbook_search_html.php
--- squirrelmail-1.4.19/src/addrbook_search_html.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/addrbook_search_html.php	2009-08-17 09:53:22.665180003 +0200
@@ -83,7 +83,7 @@ function addr_display_result($res, $incl
 
     if (sizeof($res) <= 0) return;
 
-    echo addForm($PHP_SELF, 'POST', 'addrbook').
+    echo addForm($PHP_SELF, 'POST', 'addrbook', '', '', '', TRUE).
          addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
     $line = 0;
@@ -308,7 +308,7 @@ else {
 if ($addrquery == '' || sizeof($res) == 0) {
     /* printf('<center><form method="post" name="k" action="compose.php">'."\n", $PHP_SELF); */
     echo '<center>'.
-        addForm('compose.php','POST','k');
+        addForm('compose.php','POST','k', '', '', '', TRUE);
     addr_insert_hidden();
     echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
          '</form></center></nobr>';
diff -up squirrelmail-1.4.19/src/addressbook.php.scrf squirrelmail-1.4.19/src/addressbook.php
--- squirrelmail-1.4.19/src/addressbook.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/addressbook.php	2009-08-17 09:53:22.666180572 +0200
@@ -31,6 +31,9 @@ require_once(SM_PATH . 'functions/html.p
 require_once(SM_PATH . 'functions/forms.php');
 
 /** lets get the global vars we may need */
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 sqgetGlobalVar('key',       $key,           SQ_COOKIE);
 
 sqgetGlobalVar('username',  $username,      SQ_SESSION);
@@ -180,6 +183,9 @@ $form_url = 'addressbook.php';
 /* Handle user's actions */
 if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'POST') {
 
+    // first, validate security token
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     /**************************************************
      * Add new address                                *
      **************************************************/
@@ -313,7 +319,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req
                         $olddata = $abook->lookup($enick, $ebackend);
 
                         /* Display the "new address" form */
-                        echo addForm($form_url, 'post').
+                        echo addForm($form_url, 'post', '', '', '', '', TRUE).
                             html_tag( 'table',
                                     html_tag( 'tr',
                                         html_tag( 'td',
@@ -345,7 +351,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req
                                        'center', '', 'width="100%"' );
 
                         /* Display the "new address" form again */
-                        echo addForm($form_url, 'post').
+                        echo addForm($form_url, 'post', '', '', '', '', TRUE).
                             html_tag( 'table',
                                 html_tag( 'tr',
                                     html_tag( 'td',
@@ -426,7 +432,7 @@ if ($showaddrlist) {
 
     /* List addresses */
     if (count($alist) > 0) {
-        echo addForm($form_url, 'post', 'address_book_form');
+        echo addForm($form_url, 'post', 'address_book_form', '', '', '', TRUE);
         if ($abook->add_extra_field) {
             $abook_fields = 6;
         } else {
@@ -573,7 +579,7 @@ if ($showaddrlist) {
 
 /* Display the "new address" form */
 echo '<a name="AddAddress"></a>' . "\n" .
-    addForm($form_url, 'post', 'f_add').
+    addForm($form_url, 'post', 'f_add', '', '', '', TRUE).
     html_tag( 'table',  
         html_tag( 'tr',
             html_tag( 'td', "\n". '<strong>' . sprintf(_("Add to %s"), $abook->localbackendname) . '</strong>' . "\n",
diff -up squirrelmail-1.4.19/src/compose.php.scrf squirrelmail-1.4.19/src/compose.php
--- squirrelmail-1.4.19/src/compose.php.scrf	2009-08-17 09:53:22.577550465 +0200
+++ squirrelmail-1.4.19/src/compose.php	2009-08-17 09:53:22.668549664 +0200
@@ -67,6 +67,9 @@ if (isset($send) && $send) {
     $SQ_GLOBAL = SQ_FORM;
 }
 sqgetGlobalVar('smaction',$action, $SQ_GLOBAL);
+if (!sqgetGlobalVar('smtoken',$submitted_token, $SQ_GLOBAL)) {
+    $submitted_token = '';
+}
 sqgetGlobalVar('session',$session, $SQ_GLOBAL);
 sqgetGlobalVar('mailbox',$mailbox, $SQ_GLOBAL);
 if ( !sqgetGlobalVar('identity',$identity, $SQ_GLOBAL) ) {
@@ -377,6 +380,11 @@ if (!isset($mailbox) || $mailbox == '' |
 }
 
 if ($draft) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     /*
      * Set $default_charset to correspond with the user's selection
      * of language interface.
@@ -428,6 +436,11 @@ if ($draft) {
 }
 
 if ($send) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if (isset($_FILES['attachfile']) &&
             $_FILES['attachfile']['tmp_name'] &&
             $_FILES['attachfile']['tmp_name'] != 'none') {
@@ -513,6 +526,11 @@ if ($send) {
         /* sqimap_logout($imapConnection); */
     }
 } elseif (isset($html_addr_search_done)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
     }
@@ -557,6 +575,11 @@ if ($send) {
      */
     include_once('./addrbook_search_html.php');
 } elseif (isset($attach)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if (saveAttachedFiles($session)) {
         plain_error_message(_("Could not move/copy file. File not attached"), $color);
     }
@@ -568,6 +591,11 @@ if ($send) {
     showInputForm($session);
 }
 elseif (isset($sigappend)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     $signature = $idents[$identity]['signature'];
     
     $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
@@ -578,6 +606,11 @@ elseif (isset($sigappend)) {
     }
     showInputForm($session);
 } elseif (isset($do_delete)) {
+
+    // validate security token
+    //
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
     } else {
@@ -1032,6 +1065,7 @@ function showInputForm ($session, $value
 
     echo ">\n";
 
+    echo addHidden('smtoken', sm_generate_security_token());
     echo addHidden('startMessage', $startMessage);
 
     if ($action == 'draft') {
diff -up squirrelmail-1.4.19/src/folders_create.php.scrf squirrelmail-1.4.19/src/folders_create.php
--- squirrelmail-1.4.19/src/folders_create.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_create.php	2009-08-17 09:53:22.669549523 +0200
@@ -37,8 +37,14 @@ sqgetGlobalVar('subfolder',    $subfolde
 if (! sqgetGlobalVar('contain_subs', $contain_subs,  SQ_POST)) {
     unset($contain_subs);
 }
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $folder_name = trim($folder_name);
 
 if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
diff -up squirrelmail-1.4.19/src/folders_delete.php.scrf squirrelmail-1.4.19/src/folders_delete.php
--- squirrelmail-1.4.19/src/folders_delete.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_delete.php	2009-08-17 09:53:22.669549523 +0200
@@ -41,6 +41,9 @@ sqgetGlobalVar('username',  $username,  
 sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
 sqgetGlobalVar('mailbox',   $mailbox,       SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end globals */
 
 if ($mailbox == '') {
@@ -76,7 +79,7 @@ if( !sqgetGlobalVar('confirmed', $tmp, S
         html_tag( 'tr' ) .
         html_tag( 'td', '', 'center', $color[4] ) .
         sprintf(_("Are you sure you want to delete %s?"), str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),imap_utf7_decode_local($mailbox_unformatted_disp))).
-        addForm('folders_delete.php', 'post')."<p>\n".
+        addForm('folders_delete.php', 'post', '', '', '', '', TRUE)."<p>\n".
         addHidden('mailbox', $mailbox).
         addSubmit(_("Yes"), 'confirmed').
         addSubmit(_("No"), 'backingout').
@@ -85,6 +88,9 @@ if( !sqgetGlobalVar('confirmed', $tmp, S
     exit;
 }
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 $boxes = sqimap_mailbox_list ($imap_stream);
diff -up squirrelmail-1.4.19/src/folders.php.scrf squirrelmail-1.4.19/src/folders.php
--- squirrelmail-1.4.19/src/folders.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders.php	2009-08-17 09:53:22.665180003 +0200
@@ -103,7 +103,7 @@ echo html_tag( 'table', '', 'center', ''
             ) .
             html_tag( 'tr' ) .
                 html_tag( 'td', '', 'center', $color[0] ) .
-     addForm('folders_create.php', 'POST', 'cf').
+     addForm('folders_create.php', 'POST', 'cf', '', '', '', TRUE).
      addInput('folder_name', '', 25).
      "<br />\n". _("as a subfolder of"). '<br />'.
      "<tt><select name=\"subfolder\">\n";
@@ -228,7 +228,7 @@ echo html_tag( 'table', '', 'center', ''
                 html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
 
 if (count($skip_folders) < count($boxes)) {
-    echo addForm('folders_subscribe.php?method=unsub')
+    echo addForm('folders_subscribe.php?method=unsub', 'post', '', '', '', '', TRUE)
        . "<tt><select name=\"mailbox[]\" multiple=\"multiple\" size=\"8\">\n";
     for ($i = 0; $i < count($boxes); $i++) {
         $use_folder = true;
@@ -273,7 +273,7 @@ if(!$no_list_for_subscribe) {
   }
   
   if (count($box) > 0) {
-    echo addForm('folders_subscribe.php?method=sub')
+    echo addForm('folders_subscribe.php?method=sub', 'post', '', '', '', '', TRUE)
        . '<tt><select name="mailbox[]" multiple="multiple" size="8">';
 
     for ($q = 0; $q < count($box); $q++) {      
@@ -288,7 +288,7 @@ if(!$no_list_for_subscribe) {
   }
 } else {
   /* don't perform the list action -- this is much faster */
-  echo addForm('folders_subscribe.php?method=sub')
+  echo addForm('folders_subscribe.php?method=sub', 'post', '', '', '', '', TRUE)
      . _("Subscribe to:") . '<br />'
      . '<tt><input type="text" name="mailbox[]" size="35" />'
      . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
diff -up squirrelmail-1.4.19/src/folders_rename_do.php.scrf squirrelmail-1.4.19/src/folders_rename_do.php
--- squirrelmail-1.4.19/src/folders_rename_do.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_rename_do.php	2009-08-17 09:53:22.666180572 +0200
@@ -35,8 +35,14 @@ sqgetGlobalVar('onetimepad',$onetimepad,
 sqgetGlobalVar('orig',      $orig,          SQ_POST);
 sqgetGlobalVar('old_name',  $old_name,      SQ_POST);
 sqgetGlobalVar('new_name',  $new_name,      SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end globals */
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $new_name = trim($new_name);
 
 if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
diff -up squirrelmail-1.4.19/src/folders_rename_getname.php.scrf squirrelmail-1.4.19/src/folders_rename_getname.php
--- squirrelmail-1.4.19/src/folders_rename_getname.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_rename_getname.php	2009-08-17 09:53:22.669549523 +0200
@@ -82,7 +82,7 @@ echo '<br />' .
         ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center', $color[4] ) .
-            addForm('folders_rename_do.php').
+            addForm('folders_rename_do.php', 'post', '', '', '', '', TRUE).
      _("New name:").
      '<br /><b>'. $parent . '</b>'.
      addInput('new_name', $old_name, 25) . '<br />' . "\n";
diff -up squirrelmail-1.4.19/src/folders_subscribe.php.scrf squirrelmail-1.4.19/src/folders_subscribe.php
--- squirrelmail-1.4.19/src/folders_subscribe.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/folders_subscribe.php	2009-08-17 09:53:22.665180003 +0200
@@ -33,8 +33,14 @@ sqgetGlobalVar('username',  $username,  
 sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
 sqgetGlobalVar('method',    $method,        SQ_GET);
 sqgetGlobalVar('mailbox',   $mailbox,       SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end globals */
 
+// first, validate security token
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $location = get_location();
 
 if (!isset($mailbox) || !isset($mailbox[0]) || $mailbox[0] == '') {
diff -up squirrelmail-1.4.19/src/move_messages.php.scrf squirrelmail-1.4.19/src/move_messages.php
--- squirrelmail-1.4.19/src/move_messages.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/move_messages.php	2009-08-17 09:53:22.667549648 +0200
@@ -138,8 +138,14 @@ sqgetGlobalVar('markUnread',      $markU
 sqgetGlobalVar('attache',         $attache,         SQ_POST);
 sqgetGlobalVar('location',        $location,        SQ_POST);
 
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
+// security check
+sm_validate_security_token($submitted_token, 3600, TRUE);
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
 
diff -up squirrelmail-1.4.19/src/options_highlight.php.scrf squirrelmail-1.4.19/src/options_highlight.php
--- squirrelmail-1.4.19/src/options_highlight.php.scrf	2009-05-03 14:33:46.000000000 +0200
+++ squirrelmail-1.4.19/src/options_highlight.php	2009-08-17 09:53:22.666180572 +0200
@@ -40,6 +40,9 @@ sqGetGlobalVar('color_type', $color_type
 sqGetGlobalVar('match_type', $match_type);
 sqGetGlobalVar('value', $value);
 
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
  
 function oh_opt( $val, $sel, $tit ) {
@@ -59,6 +62,10 @@ if (! isset($message_highlight_list)) {
 if (isset($theid) && ($action == 'delete') ||
                      ($action == 'up')     ||
                      ($action == 'down')) {
+
+    // security check
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     $new_rules = array();
     switch($action) {
         case('delete'):
@@ -93,6 +100,9 @@ if (isset($theid) && ($action == 'delete
     exit;
 } else if ($action == 'save') {
 
+    // security check
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     if ($color_type == 1) $newcolor = $newcolor_choose;
     elseif ($color_type == 2) $newcolor = $newcolor_input;
     else $newcolor = $color_type;
@@ -364,7 +374,7 @@ if ($action == 'edit' || $action == 'add
     else if ($selected_choose == '')
         $selected_input = TRUE;
 
-    echo addForm('options_highlight.php', 'POST', 'f').
+    echo addForm('options_highlight.php', 'POST', 'f', '', '', '', TRUE).
          addHidden('action', 'save');
     if($action == 'edit') {
         echo addHidden('theid', (isset($theid)?$theid:''));
@@ -469,4 +479,4 @@ if ($action == 'edit' || $action == 'add
 }
 do_hook('options_highlight_bottom');
 ?>
-</table></body></html>
\ No newline at end of file
+</table></body></html>
diff -up squirrelmail-1.4.19/src/options_identities.php.scrf squirrelmail-1.4.19/src/options_identities.php
--- squirrelmail-1.4.19/src/options_identities.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/options_identities.php	2009-08-17 09:53:22.666180572 +0200
@@ -27,6 +27,7 @@ require_once(SM_PATH . 'include/validate
 include_once(SM_PATH . 'functions/global.php');
 include_once(SM_PATH . 'functions/display_messages.php');
 include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
 include_once(SM_PATH . 'functions/identity.php');
 
 /* make sure that page is not available when $edit_identity is false */
@@ -42,9 +43,16 @@ sqgetGlobalVar('newidentities', $newiden
 sqgetGlobalVar('smaction', $smaction, SQ_POST);
 sqgetGlobalVar('return', $return, SQ_POST);
 
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
+
 // First lets see if there are any actions to perform //
 if (!empty($smaction) && is_array($smaction)) {
 
+    // first do a security check
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+
     $doaction = '';
     $identid = 0;
 
@@ -72,9 +80,9 @@ displayPageHeader($color, 'None');
 
 do_hook('options_identities_top');
 
-$td_str = '';
-$td_str .= '<form name="f" action="options_identities.php" method="post"><br />' . "\n";
-$td_str .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n";
+$td_str = '<form name="f" action="options_identities.php" method="post"><br />' . "\n"
+        . addHidden('smtoken', sm_generate_security_token()) . "\n"
+        . '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n";
 $cnt = count($identities);
 foreach( $identities as $iKey=>$ident ) {
 
diff -up squirrelmail-1.4.19/src/options_order.php.scrf squirrelmail-1.4.19/src/options_order.php
--- squirrelmail-1.4.19/src/options_order.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/options_order.php	2009-08-17 09:53:26.573299584 +0200
@@ -28,6 +28,7 @@ require_once(SM_PATH . 'functions/displa
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
 
 /* get globals */
 sqgetGlobalVar('num',       $num,       SQ_GET);  
@@ -35,6 +36,9 @@ sqgetGlobalVar('add',       $add,       
 
 sqgetGlobalVar('submit',    $submit);
 sqgetGlobalVar('method',    $method);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
 displayPageHeader($color, 'None');
@@ -83,6 +87,10 @@ displayPageHeader($color, 'None');
            include_once(SM_PATH . 'include/load_prefs.php');
         }
     } else if ($method == 'add' && $add) {
+
+        // first do a security check
+        sm_validate_security_token($submitted_token, 3600, TRUE);
+
         /* User should not be able to insert PHP-code here */
         $add = str_replace ('<?', '..', $add);
         $add = ereg_replace ('<.*script.*language.*php.*>', '..', $add);
@@ -128,8 +136,9 @@ displayPageHeader($color, 'None');
     }
     
     if (count($index_order) != count($available)) {
-        echo '<form name="f" method="post" action="options_order.php">';
-        echo '<select name="add">';
+        echo '<form name="f" method="post" action="options_order.php">' . "\n"
+           . addHidden('smtoken', sm_generate_security_token())
+           . '<select name="add">' . "\n";
         for ($i=1; $i <= count($available); $i++) {
             $found = false;
             for ($j=1; $j <= count($index_order); $j++) {
diff -up squirrelmail-1.4.19/src/options.php.scrf squirrelmail-1.4.19/src/options.php
--- squirrelmail-1.4.19/src/options.php.scrf	2009-05-15 17:09:55.000000000 +0200
+++ squirrelmail-1.4.19/src/options.php	2009-08-17 09:53:22.667549648 +0200
@@ -143,6 +143,9 @@ sqgetGlobalVar('delimiter', $delimiter, 
 sqgetGlobalVar('optpage',     $optpage);
 sqgetGlobalVar('optmode',     $optmode,      SQ_FORM);
 sqgetGlobalVar('optpage_data',$optpage_data, SQ_POST);
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_POST)) {
+    $submitted_token = '';
+}
 /* end of getting globals */
 
 /* Make sure we have an Option Page set. Default to main. */
@@ -226,6 +229,12 @@ if ( !@is_file( $optpage_file ) ) {
 /*** Next, process anything that needs to be processed. ***/
 /***********************************************************/
 
+// security check before saving anything...
+//FIXME: what about SMOPT_MODE_LINK??
+if ($optmode == SMOPT_MODE_SUBMIT) {
+   sm_validate_security_token($submitted_token, 3600, TRUE);
+}
+
 // set empty error message
 $optpage_save_error=array();
 
@@ -426,7 +435,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 /* If we are not looking at the main option page, display the page here. */
 /*************************************************************************/
 } else {
-    echo addForm('options.php', 'POST', 'f')
+    echo addForm('options.php', 'POST', 'f', '', '', '', TRUE)
        . create_optpage_element($optpage)
        . create_optmode_element(SMOPT_MODE_SUBMIT)
        . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n"
diff -up squirrelmail-1.4.19/src/search.php.scrf squirrelmail-1.4.19/src/search.php
--- squirrelmail-1.4.19/src/search.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/search.php	2009-08-17 09:53:22.666180572 +0200
@@ -28,6 +28,7 @@ require_once(SM_PATH . 'functions/imap.p
 require_once(SM_PATH . 'functions/imap_search.php');
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/forms.php');
 
 global $allow_thread_sort;
 
@@ -67,6 +68,9 @@ if (sqgetGlobalVar('count',$count,SQ_GET
 } else {
     unset($count);
 }
+if (!sqgetGlobalVar('smtoken',$submitted_token, SQ_GET)) {
+    $submitted_token = '';
+}
 /* end of get globals */
 
 /*  here are some functions, could go in imap_search.php
@@ -240,7 +244,8 @@ function printSearchMessages($msgs,$mail
         $form_name = "FormMsgs" . $safe_name;
         echo '<form name="' . $form_name . '" method="post" action="move_messages.php">' ."\n" .
              '<input type="hidden" name="mailbox" value="'.htmlspecialchars($mailbox).'">' . "\n" .
-             '<input type="hidden" name="startMessage" value="1">' . "\n";
+             '<input type="hidden" name="startMessage" value="1">' . "\n" .
+             addHidden('smtoken', sm_generate_security_token()) . "\n";
 
         echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
         echo '<tr><td>';
@@ -301,6 +306,11 @@ if (empty($submit) && !empty($what)) {
     $submit = _("Search");
 }
 
+// need to verify security token if user wants to do anything
+if (!empty($submit)) {
+    sm_validate_security_token($submitted_token, 3600, TRUE);
+}
+
 if ($submit == _("Search") && !empty($what)) {
     if ($recent_count > 0) {
         update_recent($what, $where, $mailbox, $username, $data_dir);
@@ -449,6 +459,7 @@ if( substr( phpversion(), 0, 3 ) == '4.1
 /* Search Form */
 echo html_tag( 'div', '<b>' . _("Current Search") . '</b>', 'left' ) . "\n"
    . '<form action="search.php" name="s">'
+   . addHidden('smtoken', sm_generate_security_token())
    . html_tag( 'table', '', '', '', 'width="95%" cellpadding="0" cellspacing="0" border="0"' )
    . html_tag( 'tr' )
    . html_tag( 'td', '', 'left' )
diff -up squirrelmail-1.4.19/src/vcard.php.scrf squirrelmail-1.4.19/src/vcard.php
--- squirrelmail-1.4.19/src/vcard.php.scrf	2009-04-16 00:00:49.000000000 +0200
+++ squirrelmail-1.4.19/src/vcard.php	2009-08-17 09:53:22.668549664 +0200
@@ -155,6 +155,7 @@ echo '</table>' .
      '</td></tr>' .
      '<tr><td align="center">' .
      '<form action="../src/addressbook.php" method="post" name="f_add">' .
+     '<input type="hidden" name="smtoken" value="' . sm_generate_security_token() . '" />' .
      '<table border="0" cellpadding="2" cellspacing="0" align="center">' .
      '<tr><td align="right"><b>' . _("Nickname") . ':</b></td>' .
      '<td>' .
@@ -236,4 +237,4 @@ echo '<a href="../src/download.php?absol
 <table border="0" cellspacing="0" cellpadding="2" align="center">
 <tr><td bgcolor="<?php echo $color[4]; ?>">
 </td></tr></table>
-</body></html>
\ No newline at end of file
+</body></html>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-10/squirrelmail.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- squirrelmail.spec	22 May 2009 07:08:56 -0000	1.65
+++ squirrelmail.spec	17 Aug 2009 08:56:34 -0000	1.66
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.19
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -33,12 +33,14 @@ Patch4: squirrelmail-1.4.15-tr-fix.patch
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
 Patch5: squirrelmail-1.4.17-biguid.patch
 
+#taken from upstream, bug #517312, for squirrelmail < 1.4.20RC1
+Patch6: squirrelmail-1.4.19-csrf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
-Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell
+Requires: httpd, php, php-mbstring, perl, tmpwatch, aspell
 Requires: /usr/sbin/sendmail
-Prereq: httpd, perl
 Provides: squirrelmail-i18n
 
 %description
@@ -61,6 +63,7 @@ tar xfj %SOURCE4
 popd
 
 %patch5 -p1
+%patch6 -p1
 
 %build
 rm -f plugins/make_archive.pl
@@ -235,6 +238,7 @@ sed -i 's/\r//' doc/release_notes_archiv
 #remove unwanted files
 rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/filters/bulkquery/bulkquery.c
 rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/es_ES/LC_MESSAGES/serversidefilter.po.new
+rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/modules/.htaccess
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -266,6 +270,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Aug 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.19-2
+- fix #517312 - CSRF issues in all forms (SA34627)
+
 * Fri May 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.19-1
 - updated to 1.4.19                                                                        
 - fixes CVE-2009-1579, CVE-2009-1580, CVE-2009-1581                                        



From jwrdegoede at fedoraproject.org  Mon Aug 17 08:57:08 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 17 Aug 2009 08:57:08 +0000 (UTC)
Subject: rpms/maniadrive/devel maniadrive.spec,1.16,1.17
Message-ID: <20090817085708.EE85F11C00E4@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/maniadrive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30799

Modified Files:
	maniadrive.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.2-18
- Switch to openal-soft



Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/devel/maniadrive.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- maniadrive.spec	25 Jul 2009 11:45:57 -0000	1.16
+++ maniadrive.spec	17 Aug 2009 08:57:08 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -14,8 +14,9 @@ Patch1:         %{name}-1.2-php-5.2.8-fi
 Patch2:         %{name}-1.2-fix-ode-assert.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  glew-devel ode-devel php-devel php-embedded-devel
-BuildRequires:  freealut-devel libjpeg-devel libXinerama-devel
+BuildRequires:  libjpeg-devel libXinerama-devel
 BuildRequires:  libvorbis-devel desktop-file-utils
+BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 Requires:       %{name}-data = %{version}, php-soap, hicolor-icon-theme
 Requires:       opengl-games-utils
 # for people who try to install this using upstream capitalization
@@ -165,6 +166,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.2-18
+- Switch to openal-soft
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Mon Aug 17 08:59:40 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 17 Aug 2009 08:59:40 +0000 (UTC)
Subject: rpms/scorched3d/devel openal-config, NONE, 1.1 scorched3d.spec, 1.38,
	1.39
Message-ID: <20090817085940.7FAFE11C00E4@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31388

Modified Files:
	scorched3d.spec 
Added Files:
	openal-config 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 42.1-3
- Switch to openal-soft



--- NEW FILE openal-config ---
#!/bin/bash

pkg-config "$@" openal
exit $?


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- scorched3d.spec	27 Jul 2009 03:59:33 -0000	1.38
+++ scorched3d.spec	17 Aug 2009 08:59:40 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        42.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,11 +12,14 @@ URL:            http://www.scorched3d.co
 # troublesome glew parts replaced
 Source0:        Scorched3D-%{version}-src-clean.tar.gz
 Source1:        %{name}.desktop
+# Fake openal-config as openal-soft doesn't have it
+Source2:        openal-config
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel
+BuildRequires:  wxGTK-devel SDL_net-devel libGLU-devel
 BuildRequires:  expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel
+BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 BuildRequires:  ImageMagick desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
 Requires:       dejavu-sans-fonts dejavu-sans-mono-fonts
@@ -43,6 +46,7 @@ conditions and terrains to be dealt with
 rm `find . -name Makefile`
 %patch1 -p1 -z .syslibs
 %patch2 -p1 -z .help
+install -m 755 %{SOURCE2} .
 # stop autoxxx from running
 touch aclocal.m4
 touch configure
@@ -50,6 +54,7 @@ touch `find -name Makefile.in`
 
 
 %build
+export OPENAL_CONFIG=$PWD/openal-config
 %configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \
   --with-docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
@@ -106,6 +111,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 42.1-3
+- Switch to openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 42.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pnemade at fedoraproject.org  Mon Aug 17 09:23:26 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 09:23:26 +0000 (UTC)
Subject: rpms/m17n-contrib/F-11 kn-kgp-halantha-ayogavaaha.patch, NONE,
	1.1 m17n-contrib.spec, 1.31, 1.32 sources, 1.9, 1.10 ks-kbd.mim,
	1.1, NONE
Message-ID: <20090817092326.496F011C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3713

Modified Files:
	m17n-contrib.spec sources 
Added Files:
	kn-kgp-halantha-ayogavaaha.patch 
Removed Files:
	ks-kbd.mim 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-2
- Add patch kn-kgp-halantha-ayogavaaha.patch



kn-kgp-halantha-ayogavaaha.patch:
 kn-kgp-new.mim |   47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

--- NEW FILE kn-kgp-halantha-ayogavaaha.patch ---
--- im/kn-kgp.mim	2008-07-02 14:32:22.000000000 +0530
+++ im/kn-kgp-new.mim	2009-08-03 12:29:13.000000000 +0530
@@ -2,6 +2,8 @@
 ;;   Copyright (C) 2008
 ;;   Sridhar M.A., Mysore; mas at mylug.org
 
+;; Modified for better visual appeal by Prasad H. L. hlprasu at gmail.com
+
 
 ;; This file is part of the m17n contrib; a sub-part of the m17n
 ;; library.
@@ -35,7 +37,7 @@
   ("A") ("B") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") 
   ("L") ("M") ("N") ("O") ("P") ("Q") ("R") ("S") ("T") ("U")
   ("V") ("W") ("Y") ("Z")
-  ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i")
+  ("a") ("b") ("c") ("d") ("e") ("g") ("h") ("i")
   ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r")
   ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z"))
 
@@ -94,8 +96,6 @@
   ("o" "?")
   ("O" "?")
   ("V" "?")
-  ("M" "?")
-  ("H" "?")
   ("|" "?")
   ("||" "?")
   ("sX" "?")
@@ -110,8 +110,15 @@
   ("8" "?")
   ("9" "?"))
 
+ (halantha
+   ("f" "?")
+   ("ff" "??"))
+ 
+ (ayogavaaha
+  ("M" "?")
+  ("H" "?"))
+
  (dependent
-  ("f" "?")
   ("A" "?")
   ("i" "?")
   ("I" "?")
@@ -124,8 +131,7 @@
   ("Y" "?")
   ("o" "?")
   ("O" "?")
-  ("V" "?")
-  ("ff" "??"))
+  ("V" "?"))
 
  (return
   ((Return)))
@@ -135,23 +141,36 @@
 
 (state
  (init
-  (starter (pushback 1) (shift intermediate)))
+  (starter (pushback 1) (shift start)))
+
+ (start
+  (consonant (shift first))
+  (independent (shift ayogavaaha))
+  (backspace)
+  (return (shift init)))
 
- (intermediate
-  (consonant (shift second))
-  (independent (shift finish))
+ (first
+  (consonant (set a @-1) (undo -1) (commit) (pushback a) (shift start))
+  (ayogavaaha (shift finish))
+  (dependent (shift ayogavaaha))
+  (halantha (shift second))
   (backspace)
   (return (shift init)))
 
  (second
-  (consonant)
-  (dependent (shift finish))
+  (consonant (shift first))
   (backspace)
   (return (shift init)))
 
+ (ayogavaaha
+  (ayogavaaha (shift ayogavaaha))
+  (backspace)
+  (return (shift init))
+
  (finish
-  (return)
-  )
+  (backspace)
+  (return))
+)
 
 ;; (finish
 ;;  (return)


Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-11/m17n-contrib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- m17n-contrib.spec	10 Jul 2009 07:49:56 -0000	1.31
+++ m17n-contrib.spec	17 Aug 2009 09:23:25 -0000	1.32
@@ -1,19 +1,19 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
-Version:  1.1.9
-Release:  7%{?dist}
+Version:  1.1.10
+Release:  2%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/m17n-contrib-%{version}.tar.gz
 Source1:  mai-inscript.mim
-Source2:  ks-kbd.mim
 Patch0:	  bug433416-bn-probhat.patch
 Patch1:	  as-inscript-keysummary-440201.patch
 Patch2:   ml-inscript-keysummary-435259.patch
 Patch3:   kn-inscript-ZWNJ-440007.patch
 Patch4:   or-inscript-ZWJ-ZWNJ-466748.patch
 Patch5:   pa-jhelum-numeric-503478.patch
+Patch6:   kn-kgp-halantha-ayogavaaha.patch
 BuildArch: noarch
 BuildRequires: m17n-db-devel >= 1.5.2-3
 Requires: m17n-db >= 1.4.0
@@ -70,6 +70,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 
 %mk_pkg_uses_db assamese as 1
 %mk_pkg_uses_db bengali bn 1
+%mk_pkg czech cs 1
 %mk_pkg esperanto eo 1
 %mk_pkg_uses_db gujarati gu 1
 %mk_pkg_uses_db hindi hi 1
@@ -80,6 +81,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 %mk_pkg marathi mr 1
 %mk_pkg nepali ne 1
 %mk_pkg_uses_db oriya or 1
+%mk_pkg pashto ps 1
 %mk_pkg_uses_db punjabi pa 1
 %mk_pkg_uses_db russian ru 0
 %mk_pkg sindhi sd 1
@@ -89,6 +91,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 %mk_pkg_uses_db telugu te 1
 %mk_pkg urdu ur 1
 %mk_pkg_uses_db vietnamese vi 1
+%mk_pkg_uses_db chinese zh 1
 
 
 %prep
@@ -99,6 +102,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch6 -p0
 
 %build
 %configure
@@ -108,7 +112,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
-cp -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n/
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 rm -rf $RPM_BUILD_ROOT/%{_bindir}
 
@@ -123,6 +127,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/m17n/scripts
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-2
+- Add patch kn-kgp-halantha-ayogavaaha.patch
+
+* Wed Jul 29 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-1
+- update to new upstream release 1.1.10 
+- Resolves: rh#513920: [pa_IN]Jhelum layout conflict with shortcut key in lokalize
+- revert pa-jhelum-numeric-503478.patch to its original version.
+
 * Fri Jul 10 2009 Parag Nemade <pnemade at redhat.com> -1.1.9-7
 - update patch pa-jhelum-numeric-503478.patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Mar 2009 05:54:51 -0000	1.9
+++ sources	17 Aug 2009 09:23:25 -0000	1.10
@@ -1 +1 @@
-541f628ca20b6e9ff99ccecea82c8d75  m17n-contrib-1.1.9.tar.gz
+e271af85713ebfaf0bc3a86a2e4248db  m17n-contrib-1.1.10.tar.gz


--- ks-kbd.mim DELETED ---



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:28 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested watchcommits
Message-ID: <20090817092528.788B910F857@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-hi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:35 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested watchbugzilla
Message-ID: <20090817092535.7A68E10F85C@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-hi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:42 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested watchcommits
Message-ID: <20090817092543.1CF4C10F881@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-hi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:44 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested commit
Message-ID: <20090817092544.982DB10F889@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-hi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:50 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested approveacls
Message-ID: <20090817092550.345D810F895@bastion2.fedora.phx.redhat.com>

pnemade has requested the approveacls acl on hyphen-hi (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:51 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested commit
Message-ID: <20090817092553.194B310F89B@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-hi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:25:54 +0000
Subject: [pkgdb] hyphen-hi: pnemade has requested watchbugzilla
Message-ID: <20090817092557.982A910F8A5@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-hi (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:28 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested commit
Message-ID: <20090817092632.C598910F88B@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-gu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:31 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested watchcommits
Message-ID: <20090817092633.9091E10F897@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-gu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:35 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested watchbugzilla
Message-ID: <20090817092635.DE35610F865@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-gu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:40 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested watchbugzilla
Message-ID: <20090817092640.53A6C10F89C@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-gu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:42 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested watchcommits
Message-ID: <20090817092642.A88F610F8A6@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-gu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:44 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested commit
Message-ID: <20090817092644.E9AE010F8AF@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-gu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:46 +0000
Subject: [pkgdb] hyphen-gu: pnemade has requested approveacls
Message-ID: <20090817092648.7EE1B10F85C@bastion2.fedora.phx.redhat.com>

pnemade has requested the approveacls acl on hyphen-gu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:56 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested watchcommits
Message-ID: <20090817092656.9D4A610F8A3@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-ml (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:57 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested watchbugzilla
Message-ID: <20090817092657.55B0F10F8A8@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-ml (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:26:57 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested commit
Message-ID: <20090817092657.F1F1810F8B5@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-ml (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:27:00 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested approveacls
Message-ID: <20090817092701.E644C10F88B@bastion2.fedora.phx.redhat.com>

pnemade has requested the approveacls acl on hyphen-ml (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:27:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:27:05 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested watchbugzilla
Message-ID: <20090817092708.6152310F8C0@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-ml (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:27:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:27:07 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested watchcommits
Message-ID: <20090817092709.F3FC510F89A@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-ml (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:27:09 +0000
Subject: [pkgdb] hyphen-ml: pnemade has requested commit
Message-ID: <20090817092711.872B810F899@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-ml (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:28:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:28:28 +0000
Subject: [pkgdb] hyphen-or: pnemade has requested watchbugzilla
Message-ID: <20090817092829.4229010F888@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-or (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Mon Aug 17 09:28:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:28:29 +0000
Subject: [pkgdb] hyphen-or: pnemade has requested commit
Message-ID: <20090817092829.D2D9210F89F@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-or (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From sharkcz at fedoraproject.org  Mon Aug 17 09:28:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 17 Aug 2009 09:28:33 +0000 (UTC)
Subject: rpms/libica/devel .cvsignore, 1.2, 1.3 libica.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090817092833.1CDE911C00E4@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/libica/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4328

Modified Files:
	.cvsignore libica.spec sources 
Log Message:
* Mon Aug 17 2009 Dan Hor?k <dan[at]danny.cz> - 2.0.2-1
- update to 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libica/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 06:40:06 -0000	1.2
+++ .cvsignore	17 Aug 2009 09:28:32 -0000	1.3
@@ -1 +1 @@
-libica-2.0.1.tar.gz
+libica-2.0.2.tar.gz


Index: libica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libica/devel/libica.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libica.spec	25 Jul 2009 05:55:48 -0000	1.2
+++ libica.spec	17 Aug 2009 09:28:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Library for accessing ICA hardware crypto on IBM zSeries
 Name: libica
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: CPL
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/opencryptoki/
@@ -34,7 +34,7 @@ Utility programs to access ICA hardware 
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 # fix EOLs
 sed -i -e 's/\r//g' LICENSE
@@ -81,13 +81,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Dan Hor?k <dan[at]danny.cz> - 2.0.2-1
+- update to 2.0.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr  1 2009 Dan Horak <dan[at]danny.cz> - 2.0.1-1
+* Wed Apr  1 2009 Dan Hor?k <dan[at]danny.cz> - 2.0.1-1
 - update to 2.0.1
 
-* Mon Mar 23 2009 Dan Horak <dan[at]danny.cz> - 2.0-1
+* Mon Mar 23 2009 Dan Hor?k <dan[at]danny.cz> - 2.0-1
 - update to 2.0
 - spec file cleanup before submitting to Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libica/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 06:40:06 -0000	1.2
+++ sources	17 Aug 2009 09:28:32 -0000	1.3
@@ -1 +1 @@
-c00fef46735c918dec3c081a8afc86ae  libica-2.0.1.tar.gz
+6d5a69237eb9256e2286b63bb370be9c  libica-2.0.2.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 17 09:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:28:32 +0000
Subject: [pkgdb] hyphen-or: pnemade has requested watchcommits
Message-ID: <20090817092835.6E52010F8A1@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-or (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Mon Aug 17 09:28:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:28:48 +0000
Subject: [pkgdb] hyphen-pa: pnemade has requested watchcommits
Message-ID: <20090817092849.B130010F8A6@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-pa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Mon Aug 17 09:28:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:28:53 +0000
Subject: [pkgdb] hyphen-pa: pnemade has requested commit
Message-ID: <20090817092854.46A9310F89A@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-pa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Mon Aug 17 09:28:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:28:56 +0000
Subject: [pkgdb] hyphen-pa: pnemade has requested watchbugzilla
Message-ID: <20090817092856.E7C9110F8B1@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-pa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:08 +0000
Subject: [pkgdb] hyphen-ta: pnemade has requested commit
Message-ID: <20090817092911.5A1BB10F85B@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-ta (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From sharkcz at fedoraproject.org  Mon Aug 17 09:29:10 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 17 Aug 2009 09:29:10 +0000 (UTC)
Subject: rpms/libica/F-11 .cvsignore, 1.2, 1.3 libica.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090817092910.1DD7411C00E4@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/libica/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4469

Modified Files:
	.cvsignore libica.spec sources 
Log Message:
* Mon Aug 17 2009 Dan Hor?k <dan[at]danny.cz> - 2.0.2-1
- update to 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libica/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 06:37:49 -0000	1.2
+++ .cvsignore	17 Aug 2009 09:29:09 -0000	1.3
@@ -1 +1 @@
-libica-2.0.1.tar.gz
+libica-2.0.2.tar.gz


Index: libica.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libica/F-11/libica.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libica.spec	2 May 2009 06:37:50 -0000	1.1
+++ libica.spec	17 Aug 2009 09:29:09 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Library for accessing ICA hardware crypto on IBM zSeries
 Name: libica
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 License: CPL
 Group: System Environment/Libraries
@@ -34,7 +34,7 @@ Utility programs to access ICA hardware 
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 # fix EOLs
 sed -i -e 's/\r//g' LICENSE
@@ -81,10 +81,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Apr  1 2009 Dan Horak <dan[at]danny.cz> - 2.0.1-1
+* Mon Aug 17 2009 Dan Hor?k <dan[at]danny.cz> - 2.0.2-1
+- update to 2.0.2
+
+* Wed Apr  1 2009 Dan Hor?k <dan[at]danny.cz> - 2.0.1-1
 - update to 2.0.1
 
-* Mon Mar 23 2009 Dan Horak <dan[at]danny.cz> - 2.0-1
+* Mon Mar 23 2009 Dan Hor?k <dan[at]danny.cz> - 2.0-1
 - update to 2.0
 - spec file cleanup before submitting to Fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libica/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 06:37:50 -0000	1.2
+++ sources	17 Aug 2009 09:29:09 -0000	1.3
@@ -1 +1 @@
-c00fef46735c918dec3c081a8afc86ae  libica-2.0.1.tar.gz
+6d5a69237eb9256e2286b63bb370be9c  libica-2.0.2.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:04 +0000
Subject: [pkgdb] hyphen-ta: pnemade has requested watchbugzilla
Message-ID: <20090817092910.769DB10F857@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-ta (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:06 +0000
Subject: [pkgdb] hyphen-ta: pnemade has requested watchcommits
Message-ID: <20090817092912.BE8D610F8B7@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-ta (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:17 +0000
Subject: [pkgdb] hyphen-te: pnemade has requested watchbugzilla
Message-ID: <20090817092918.6FF9310F8B4@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-te (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:20 +0000
Subject: [pkgdb] hyphen-te: pnemade has requested watchcommits
Message-ID: <20090817092920.777C310F889@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-te (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:24 +0000
Subject: [pkgdb] hyphen-te: pnemade has requested commit
Message-ID: <20090817092925.3D1A310F855@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-te (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:34 +0000
Subject: [pkgdb] hyphen-sa: pnemade has requested watchcommits
Message-ID: <20090817092935.0147010F8BC@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-sa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:31 +0000
Subject: [pkgdb] hyphen-sa: pnemade has requested watchbugzilla
Message-ID: <20090817092932.37C2B10F85C@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-sa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Mon Aug 17 09:29:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:29:36 +0000
Subject: [pkgdb] hyphen-sa: pnemade has requested commit
Message-ID: <20090817092936.4E29510F8C4@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-sa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:07 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093210.991A810F89A@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-hi (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:10 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093211.E165D10F899@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-hi (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:06 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093210.0AF5910F8B1@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-hi (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:13 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093214.3484410F8B9@bastion2.fedora.phx.redhat.com>

caolanm has set the approveacls acl on hyphen-hi (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:16 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093216.E0FB410F8BA@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-hi (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:17 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093219.6813110F8C0@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-hi (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:32:20 +0000
Subject: [pkgdb] hyphen-hi had acl change status
Message-ID: <20090817093222.8839C10F8AA@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-hi (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Mon Aug 17 09:39:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:39:22 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090817093923.802FD10F859@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-sa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Mon Aug 17 09:39:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:39:24 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090817093925.CB9E410F865@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-sa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Mon Aug 17 09:39:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:39:26 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090817093927.C8F0710F87A@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-sa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Mon Aug 17 09:39:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:39:46 +0000
Subject: [pkgdb] hyphen-te had acl change status
Message-ID: <20090817093946.EEC9D10F85A@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-te (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Mon Aug 17 09:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:39:47 +0000
Subject: [pkgdb] hyphen-te had acl change status
Message-ID: <20090817093948.3080010F888@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-te (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Mon Aug 17 09:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:39:49 +0000
Subject: [pkgdb] hyphen-te had acl change status
Message-ID: <20090817093949.5856910F890@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-te (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:07 +0000
Subject: [pkgdb] hyphen-ta had acl change status
Message-ID: <20090817094007.520E710F859@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-ta (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:07 +0000
Subject: [pkgdb] hyphen-ta had acl change status
Message-ID: <20090817094008.2ED5C10F86F@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-ta (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:09 +0000
Subject: [pkgdb] hyphen-ta had acl change status
Message-ID: <20090817094009.9852D10F886@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-ta (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:28 +0000
Subject: [pkgdb] hyphen-pa had acl change status
Message-ID: <20090817094028.37A7B10F85A@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-pa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:28 +0000
Subject: [pkgdb] hyphen-pa had acl change status
Message-ID: <20090817094029.21CE710F890@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-pa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:31 +0000
Subject: [pkgdb] hyphen-pa had acl change status
Message-ID: <20090817094031.860BB10F897@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-pa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:51 +0000
Subject: [pkgdb] hyphen-or had acl change status
Message-ID: <20090817094052.93E2710F8A0@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-or (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:51 +0000
Subject: [pkgdb] hyphen-or had acl change status
Message-ID: <20090817094052.A9CB410F8A1@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-or (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Mon Aug 17 09:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:40:53 +0000
Subject: [pkgdb] hyphen-or had acl change status
Message-ID: <20090817094053.EA2CA10F857@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-or (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:10 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094110.B869910F889@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-ml (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:11 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094111.52ED110F897@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-ml (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:14 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094115.69B9410F8A2@bastion2.fedora.phx.redhat.com>

caolanm has set the approveacls acl on hyphen-ml (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:12 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094112.EF76A10F89B@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-ml (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:17 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094118.5468610F8A6@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-ml (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:18 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094118.F1A2E10F8A9@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-ml (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:20 +0000
Subject: [pkgdb] hyphen-ml had acl change status
Message-ID: <20090817094121.2EBA410F8AD@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-ml (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:40 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094141.2EEAD10F85A@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-gu (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:41 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094141.EC8A410F8A3@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-gu (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:43 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094143.7B51510F8B4@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-gu (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:45 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094145.A7C8D10F8B7@bastion2.fedora.phx.redhat.com>

caolanm has set the approveacls acl on hyphen-gu (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:48 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094149.01E1B10F8B9@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-gu (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:48 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094149.225A510F8BD@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-gu (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Mon Aug 17 09:41:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 09:41:50 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090817094150.CC89110F8BE@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-gu (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From ondrejj at fedoraproject.org  Mon Aug 17 10:06:07 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Mon, 17 Aug 2009 10:06:07 +0000 (UTC)
Subject: rpms/sems/devel sems.spec,1.7,1.8
Message-ID: <20090817100607.C42A611C00E4@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9136

Modified Files:
	sems.spec 
Log Message:
Disabled g722 codec, can't compile with current spandsp.


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sems.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sems.spec	27 Jul 2009 04:08:36 -0000	1.7
+++ sems.spec	17 Aug 2009 10:06:07 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
@@ -69,6 +69,7 @@ It is used from other modules with the D
 can execute DI functions to add a server connection, or send a
 DIAMETER request.
 
+%if 0%{?with_g722}
 %package	g722
 Summary:	G.722 support for SEMS
 Group:		Applications/Communications
@@ -76,6 +77,7 @@ Requires:	%{name} = %{version}-%{release
 
 %description	g722
 This is a wrapper around the g722 codec from the spandsp library.
+%endif
 
 %package	gateway
 Summary:	ISDN gateway for SEMS
@@ -170,7 +172,7 @@ mv ./apps/dsm/fsmc/readme.txt  ./apps/ds
 export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"'  -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
 export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
 export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all \
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3} %{!?with_g722:g722}" all \
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -454,10 +456,12 @@ fi
 %doc doc/Readme.diameter_client
 %{_libdir}/%{name}/plug-in/diameter_client.so
 
+%if 0%{?with_g722}  
 %files g722
 %defattr(-,root,root)
 %doc core/plug-in/g722/Readme.g722codec
 %{_libdir}/%{name}/plug-in/g722.so
+%endif
 
 %files gateway
 %defattr(-,root,root)
@@ -545,6 +549,9 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Mon Aug 17 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-4
+- g722 is a conditional build, until it will work with latest spandsp
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pnemade at fedoraproject.org  Mon Aug 17 10:16:29 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:16:29 +0000 (UTC)
Subject: rpms/hyphen-ml/devel hyphen-ml.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090817101629.E1D0311C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-ml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11713

Modified Files:
	hyphen-ml.spec sources 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version





Index: hyphen-ml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ml/devel/hyphen-ml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-ml.spec	25 Jul 2009 02:54:43 -0000	1.3
+++ hyphen-ml.spec	17 Aug 2009 10:16:29 -0000	1.4
@@ -1,8 +1,8 @@
 Name: hyphen-ml
 Summary: Malayalam hyphenation rules
-%define upstreamid 20090512
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ml_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090512-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ml/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 May 2009 16:46:16 -0000	1.2
+++ sources	17 Aug 2009 10:16:29 -0000	1.3
@@ -1 +1 @@
-2f7ee5e99f248feec32d9002b2848107  hyph_ml_IN.dic
+4c34acc266312727eb58275f44ea487f  hyph_ml_IN.dic



From nphilipp at fedoraproject.org  Mon Aug 17 10:21:13 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 10:21:13 +0000 (UTC)
Subject: rpms/ufraw/devel ufraw.spec,1.43,1.44
Message-ID: <20090817102113.D3C5D11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11732

Modified Files:
	ufraw.spec 
Log Message:
fix building with lensfun (#517558)
explain gcc-4.4 patch



Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- ufraw.spec	27 Jul 2009 06:28:32 -0000	1.43
+++ ufraw.spec	17 Aug 2009 10:21:13 -0000	1.44
@@ -36,11 +36,13 @@
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
 Version: 0.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://ufraw.sourceforge.net
 Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
+# make dcraw.cc compile correctly, upstream CVS already compiles without this
+# patch
 Patch0: ufraw-0.15-gcc-4.4.patch
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
@@ -149,7 +151,7 @@ EOF
 %build
 %configure \
 %if %{with lensfun}
-    --enable-lensfun \
+    --with-lensfun \
 %endif
     --with-exiv2 --with-libexif --enable-mime --enable-extras \
     --enable-contrast
@@ -229,6 +231,10 @@ update-desktop-database >& /dev/null || 
 %endif
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> - 0.15-4
+- fix building with lensfun (#517558)
+- explain gcc-4.4 patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Mon Aug 17 10:26:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 10:26:04 +0000 (UTC)
Subject: rpms/ufraw/devel ufraw.spec,1.44,1.45
Message-ID: <20090817102604.5E2A411C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12964

Modified Files:
	ufraw.spec 
Log Message:
only build with lensfun from F-12 on



Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ufraw.spec	17 Aug 2009 10:21:13 -0000	1.44
+++ ufraw.spec	17 Aug 2009 10:26:04 -0000	1.45
@@ -16,7 +16,7 @@
 %bcond_with pkg_mime_xml
 %endif
 
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %bcond_without lensfun
 %else
 %bcond_with lensfun
@@ -232,7 +232,7 @@ update-desktop-database >& /dev/null || 
 
 %changelog
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> - 0.15-4
-- fix building with lensfun (#517558)
+- fix building with lensfun (#517558), only build with lensfun from F-12 on
 - explain gcc-4.4 patch
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-3



From jnovy at fedoraproject.org  Mon Aug 17 10:26:48 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 17 Aug 2009 10:26:48 +0000 (UTC)
Subject: rpms/xz/devel .cvsignore,1.3,1.4 sources,1.3,1.4 xz.spec,1.3,1.4
Message-ID: <20090817102648.84CB611C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/xz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13134

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.10.beta.20090817git
- sync with upstream because of #517806



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Aug 2009 13:54:59 -0000	1.3
+++ .cvsignore	17 Aug 2009 10:26:48 -0000	1.4
@@ -1 +1 @@
-xz-4.999.8beta.20090804git.tar.gz
+xz-4.999.8beta.20090817git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Aug 2009 13:54:59 -0000	1.3
+++ sources	17 Aug 2009 10:26:48 -0000	1.4
@@ -1 +1 @@
-5efad2a123674034cb0c5a5794686e7a  xz-4.999.8beta.20090804git.tar.gz
+d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/xz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xz.spec	5 Aug 2009 13:54:59 -0000	1.3
+++ xz.spec	17 Aug 2009 10:26:48 -0000	1.4
@@ -1,9 +1,9 @@
-%define git_date 20090804
+%define git_date 20090817
 
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.8
-Release:	0.9.beta.%{git_date}git%{?dist}
+Release:	0.10.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # source created as "make dist" in checked out GIT tree
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.10.beta.20090817git
+- sync with upstream because of #517806
+
 * Tue Aug 04 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.9.beta.20090804git
 - update to the latest GIT snapshot
 



From cebbert at fedoraproject.org  Mon Aug 17 10:36:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 10:36:31 +0000 (UTC)
Subject: rpms/kernel/devel/scripts sort-config,1.2,1.3
Message-ID: <20090817103631.8A2DA11C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14155

Modified Files:
	sort-config 
Log Message:
add nosort option, make comments about unmatched items optional


Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/sort-config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sort-config	16 Aug 2009 03:08:19 -0000	1.2
+++ sort-config	17 Aug 2009 10:36:31 -0000	1.3
@@ -6,16 +6,18 @@ TGT=($(ls kernel-*/linux-*.noarch/config
 TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})
 
 if [ $# -lt 2 ] ; then
-   echo -e "Usage:\n   $(basename $0) [-df] input target\n"
+   echo -e "Usage:\n   $(basename $0) [-dfcn] input target\n"
    echo -e " Sort input config file into the same order as the target\n"
    echo -e "      -d: show raw unsorted output with extra debug text"
-   echo -e "      -f: force output to match what is in the target config\n"
+   echo -e "      -f: force output to match what is in the target config"
+   echo -e "      -c: insert comments about non-matching items"
+   echo -e "      -n: do not sort output\n"
    echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
    echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
    exit 1
 fi
 
-while getopts "df" OPTION ; do
+while getopts "dfcn" OPTION ; do
 case $OPTION in
 d)
    DEBUG=1
@@ -23,12 +25,23 @@ d)
 f)
    FORCE=1
 ;;
+c)
+   ADDCOMMENT=1
+;;
+n)
+   NOSORT=1
+;;
 \?)
    exit 2
 ;;
 esac
 done
 
+if [ "$FORCE" -a "$ADDCOMMENT" ] ; then
+	echo "-f and -c options cannot be used together"
+	exit 2
+fi
+
 shift $((OPTIND-1))
 
 if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
@@ -45,6 +58,7 @@ TGTFILE=kernel-*/linux-*.noarch/configs/
 [ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2
 
 IX=0
+IN=0
 declare -a SAVECOMMENT
 
 cat ${SRCFILE} | while read TEXT ; do
@@ -77,7 +91,9 @@ cat ${SRCFILE} | while read TEXT ; do
                         TEXT=$(grep "$FINDTEXT" $TGTFILE | head -1)
                         [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
                      else
-                        COMMENT="# -- Next option was changed in target line $LINE --"
+                        if [ "$ADDCOMMENT" ] ; then
+                           COMMENT="# -- Next option was changed in target line $LINE --"
+                        fi
                      fi
                   fi
                fi
@@ -95,7 +111,10 @@ cat ${SRCFILE} | while read TEXT ; do
    [ "$DEBUG" -a "$TEXT" ]    && echo "text        ->" "$LINE" "$TEXT"
 
    if [ "$TEXT" ] ; then
-      # we have output, make sure it has a line number
+
+      # use input line numbers if not sorting
+      [ "$NOSORT" ] && LINE=$IN
+      # make sure it has a line number
       [ -z "$LINE" ] && LINE=999999
 
       # print saved comments first
@@ -110,13 +129,18 @@ cat ${SRCFILE} | while read TEXT ; do
       fi
       [ "$COMMENT" ] && echo "$LINE":"$COMMENT"
       echo "$LINE":"$TEXT"
+
    else
+
       # no output yet, save the comment
       SAVECOMMENT[$IX]="$COMMENT"
       [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
       (( IX++ ))
+
    fi
 
+   ((IN++))
+
 done > xx99
 
 if [ "$DEBUG" ] ; then



From pnemade at fedoraproject.org  Mon Aug 17 10:36:39 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:36:39 +0000 (UTC)
Subject: rpms/hyphen-hi/devel hyph_hi_IN.dic,1.1,1.2 hyphen-hi.spec,1.2,1.3
Message-ID: <20090817103639.6DEFD11C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-hi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14139

Modified Files:
	hyph_hi_IN.dic hyphen-hi.spec 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version





Index: hyph_hi_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-hi/devel/hyph_hi_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_hi_IN.dic	8 Apr 2009 08:47:06 -0000	1.1
+++ hyph_hi_IN.dic	17 Aug 2009 10:36:39 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
 %  Hyphenation for Hindi
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,77 +16,121 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2????.
+2????.
+2????.
+2????.
+% Do not break before chandrabindu, anusvara, visarga, avagraha
+% and accents.
+2?
+2?
+2?
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-hi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-hi/devel/hyphen-hi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-hi.spec	25 Jul 2009 02:51:41 -0000	1.2
+++ hyphen-hi.spec	17 Aug 2009 10:36:39 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-hi
 Summary: Hindi hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_hi_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Mon Aug 17 10:39:39 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 17 Aug 2009 10:39:39 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.65, 1.66 setup.spec, 1.83,
	1.84 sources, 1.66, 1.67
Message-ID: <20090817103939.50A4011C00E4@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14563

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
change permissions on /etc/shadow and /etc/gshadow to 0000 and use capabilities for them(#517577)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	21 Jul 2009 12:47:40 -0000	1.65
+++ .cvsignore	17 Aug 2009 10:39:38 -0000	1.66
@@ -1 +1 @@
-setup-2.8.7.tar.bz2
+setup-2.8.8.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- setup.spec	27 Jul 2009 04:13:20 -0000	1.83
+++ setup.spec	17 Aug 2009 10:39:39 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.7
-Release: 2%{?dist}
+Version: 2.8.8
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -58,12 +58,12 @@ for i, name in ipairs({"passwd", "shadow
 end
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc uidgid COPYING
 %verify(not md5 size mtime) %config(noreplace) /etc/passwd
 %verify(not md5 size mtime) %config(noreplace) /etc/group
-%verify(not md5 size mtime) %config(noreplace,missingok) /etc/shadow
-%verify(not md5 size mtime) %config(noreplace,missingok) /etc/gshadow
+%verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/shadow
+%verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/gshadow
 %verify(not md5 size mtime) %config(noreplace) /etc/services
 %verify(not md5 size mtime) %config(noreplace) /etc/exports
 %config(noreplace) /etc/aliases
@@ -89,6 +89,10 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Mon Aug 17 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.8-1
+- change permissions on /etc/shadow and /etc/gshadow to 0000 and
+  use capabilities for them(#517577)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	21 Jul 2009 12:47:40 -0000	1.66
+++ sources	17 Aug 2009 10:39:39 -0000	1.67
@@ -1 +1 @@
-ac42794c9b5ea07cde4b33fe5301216e  setup-2.8.7.tar.bz2
+f3412ac581439c8436158127b78101da  setup-2.8.8.tar.bz2



From pnemade at fedoraproject.org  Mon Aug 17 10:45:46 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:45:46 +0000 (UTC)
Subject: rpms/hyphen-or/devel .cvsignore, 1.1, 1.2 hyph_or_IN.dic, 1.1,
	1.2 hyphen-or.spec, 1.2, 1.3 sources, 1.1, 1.2
Message-ID: <20090817104546.5FF1811C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-or/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16002

Modified Files:
	.cvsignore hyph_or_IN.dic hyphen-or.spec sources 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:50:17 -0000	1.1
+++ .cvsignore	17 Aug 2009 10:45:46 -0000	1.2
@@ -0,0 +1 @@
+hyph_or_IN.dic


Index: hyph_or_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/hyph_or_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_or_IN.dic	8 Apr 2009 08:23:51 -0000	1.1
+++ hyph_or_IN.dic	17 Aug 2009 10:45:46 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
 %  Hyphenation for Oriya
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,70 +16,112 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel, but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2?. 
+2??.
+2??.
+2?. 
+2??.
+2??.
+2??.
+2??.
+2??.
+% Do not break before anusvara, visarga and length mark.
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-or.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/hyphen-or.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-or.spec	25 Jul 2009 02:55:28 -0000	1.2
+++ hyphen-or.spec	17 Aug 2009 10:45:46 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-or
 Summary: Oriya hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_or_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-or/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:50:17 -0000	1.1
+++ sources	17 Aug 2009 10:45:46 -0000	1.2
@@ -0,0 +1 @@
+a831a8c080ea9e0e1f12ab91f45f4750  hyph_or_IN.dic



From pnemade at fedoraproject.org  Mon Aug 17 10:46:16 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:46:16 +0000 (UTC)
Subject: rpms/hyphen-pa/devel .cvsignore, 1.1, 1.2 hyph_pa_IN.dic, 1.1,
	1.2 hyphen-pa.spec, 1.2, 1.3 sources, 1.1, 1.2
Message-ID: <20090817104616.1272E11C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-pa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16097

Modified Files:
	.cvsignore hyph_pa_IN.dic hyphen-pa.spec sources 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:51:45 -0000	1.1
+++ .cvsignore	17 Aug 2009 10:46:15 -0000	1.2
@@ -0,0 +1 @@
+hyph_pa_IN.dic


Index: hyph_pa_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/hyph_pa_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_pa_IN.dic	8 Apr 2009 08:16:51 -0000	1.1
+++ hyph_pa_IN.dic	17 Aug 2009 10:46:15 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
-%  Hyphenation for Panjabi(Gurmughi)
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Hyphenation for Hindi
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,68 +16,110 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+11
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2?.
+2??.
+2??.
+2????.
+2????.
+2????.
+2????.
+% Do not break before chandrabindu, anusvara, visarga, avagraha
+% and accents.
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-pa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/hyphen-pa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-pa.spec	25 Jul 2009 02:55:42 -0000	1.2
+++ hyphen-pa.spec	17 Aug 2009 10:46:15 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-pa
 Summary: Punjabi hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_pa_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:51:45 -0000	1.1
+++ sources	17 Aug 2009 10:46:15 -0000	1.2
@@ -0,0 +1 @@
+a747fb263deab64b91f5618198218838  hyph_pa_IN.dic



From pnemade at fedoraproject.org  Mon Aug 17 10:50:37 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:50:37 +0000 (UTC)
Subject: rpms/hyphen-te/devel .cvsignore, 1.1, 1.2 hyph_te_IN.dic, 1.1,
	1.2 hyphen-te.spec, 1.2, 1.3 sources, 1.1, 1.2
Message-ID: <20090817105037.3CFA711C04BE@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-te/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16728

Modified Files:
	.cvsignore hyph_te_IN.dic hyphen-te.spec sources 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:52:51 -0000	1.1
+++ .cvsignore	17 Aug 2009 10:50:36 -0000	1.2
@@ -0,0 +1 @@
+hyph_te_IN.dic


Index: hyph_te_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/hyph_te_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_te_IN.dic	8 Apr 2009 08:06:43 -0000	1.1
+++ hyph_te_IN.dic	17 Aug 2009 10:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
-%  Hyphenation for Telugu
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Hyphenation for Malayalam
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,76 +16,124 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel, but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1 % can occur in Sanskrit?
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2????.
+2????.
+2????.
+2????.
+% Do not break before chandrabindu, anusvara, visarga,
+% length mark and ai length mark.
+2?
+2?
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-te.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/hyphen-te.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-te.spec	25 Jul 2009 02:58:10 -0000	1.2
+++ hyphen-te.spec	17 Aug 2009 10:50:37 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-te
 Summary: Telugu hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_te_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-te/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:52:51 -0000	1.1
+++ sources	17 Aug 2009 10:50:37 -0000	1.2
@@ -0,0 +1 @@
+d6d326d0baf935dbb02051310cc5dde6  hyph_te_IN.dic



From pnemade at fedoraproject.org  Mon Aug 17 10:52:42 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:52:42 +0000 (UTC)
Subject: rpms/hyphen-gu/devel .cvsignore, 1.1, 1.2 hyph_gu_IN.dic, 1.1,
	1.2 hyphen-gu.spec, 1.2, 1.3 sources, 1.1, 1.2
Message-ID: <20090817105242.7953311C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-gu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17027

Modified Files:
	.cvsignore hyph_gu_IN.dic hyphen-gu.spec sources 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:48:29 -0000	1.1
+++ .cvsignore	17 Aug 2009 10:52:42 -0000	1.2
@@ -0,0 +1 @@
+hyph_gu_IN.dic


Index: hyph_gu_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/hyph_gu_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_gu_IN.dic	8 Apr 2009 08:37:07 -0000	1.1
+++ hyph_gu_IN.dic	17 Aug 2009 10:52:42 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
-%  Hyphenation for Gujarati
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Hyphenation for Guajrati
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,71 +16,116 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2????.
+2????.
+2????.
+2????.
+% Do not break before chandrabindu, anusvara, visarga, avagraha
+% and accents.
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-gu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/hyphen-gu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-gu.spec	25 Jul 2009 02:51:21 -0000	1.2
+++ hyphen-gu.spec	17 Aug 2009 10:52:42 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-gu
 Summary: Gujarati hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_gu_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-gu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:48:29 -0000	1.1
+++ sources	17 Aug 2009 10:52:42 -0000	1.2
@@ -0,0 +1 @@
+331b7a79a21ee148fca70cbd44ba82d5  hyph_gu_IN.dic



From pnemade at fedoraproject.org  Mon Aug 17 10:59:12 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 17 Aug 2009 10:59:12 +0000 (UTC)
Subject: rpms/hyphen-ta/devel .cvsignore, 1.1, 1.2 hyph_ta_IN.dic, 1.1,
	1.2 hyphen-ta.spec, 1.2, 1.3 sources, 1.1, 1.2
Message-ID: <20090817105912.C4E6011C00E4@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-ta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17768

Modified Files:
	.cvsignore hyph_ta_IN.dic hyphen-ta.spec sources 
Log Message:
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- latest version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Apr 2009 02:52:09 -0000	1.1
+++ .cvsignore	17 Aug 2009 10:59:12 -0000	1.2
@@ -0,0 +1 @@
+hyph_ta_IN.dic


Index: hyph_ta_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/hyph_ta_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_ta_IN.dic	8 Apr 2009 08:13:21 -0000	1.1
+++ hyph_ta_IN.dic	17 Aug 2009 10:59:12 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
 %  Hyphenation for Tamil
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,62 +16,83 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel, but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1 
+1?1
+1?1
+1?1 
+1?1
+1?1
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??. 
+2??.
+2??.
+2??. 
+2??.
+2??.
+2??.
+2??.
+% Do not break before anusvara, visarga and length mark.
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-ta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/hyphen-ta.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-ta.spec	25 Jul 2009 02:57:55 -0000	1.2
+++ hyphen-ta.spec	17 Aug 2009 10:59:12 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-ta
 Summary: Tamil hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090813
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_ta_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ta/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Apr 2009 02:52:09 -0000	1.1
+++ sources	17 Aug 2009 10:59:12 -0000	1.2
@@ -0,0 +1 @@
+0bdbe2efd8ce64d82cf005832e815520  hyph_ta_IN.dic



From caolanm at fedoraproject.org  Mon Aug 17 11:08:12 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 17 Aug 2009 11:08:12 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch,
	NONE, 1.1 openoffice.org.spec, 1.1980, 1.1981
Message-ID: <20090817110812.EA4D611C00E4@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18729

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch 
Log Message:
add openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch

openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch:
 xmlnumfi.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch ---
--- xmloff/source/style/xmlnumfi.cxx.orig	2009-08-17 12:01:14.000000000 +0100
+++ xmloff/source/style/xmlnumfi.cxx	2009-08-17 12:01:17.000000000 +0100
@@ -2144,7 +2144,7 @@
     if ( nTokLen > nBufLen )
     	return sal_False;
 
-	sal_Int32 nStartPos = nTokLen - nBufLen;
+	sal_Int32 nStartPos = nBufLen - nTokLen;
 	for ( xub_StrLen nTokPos = 0; nTokPos < nTokLen; nTokPos++ )
 		if ( rToken.GetChar( nTokPos ) != rBuffer.charAt( nStartPos + nTokPos ) )
 			return sal_False;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -p -r1.1980 -r1.1981
--- openoffice.org.spec	13 Aug 2009 11:17:29 -0000	1.1980
+++ openoffice.org.spec	17 Aug 2009 11:08:12 -0000	1.1981
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 18
-%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}
@@ -153,6 +153,7 @@ Patch75: workspace.vcl103.patch
 Patch76: workspace.cmcfixes61.patch
 Patch77: workspace.os132.patch
 Patch78: openoffice.org-3.1.1.oooXXXXX.dmake.patch
+Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1691,6 +1692,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch76 -p0 -b .workspace.cmcfixes61.patch
 %patch77 -p0 -b .workspace.os132.patch
 %patch78 -p0 -b .oooXXXXX.dmake.patch
+%patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4200,6 +4202,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.2
+- add openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+
 * Fri Aug 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.1
 - Resolves: rhbz#516011 keep help .xsl files as non-docs
 - latest milestone



From ltinkl at fedoraproject.org  Mon Aug 17 11:11:29 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 17 Aug 2009 11:11:29 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-copyurls.patch, NONE,
	1.1 kdelibs-4.3.1-unmountfix.patch, NONE, 1.1 kdelibs.spec,
	1.502, 1.503
Message-ID: <20090817111129.BED4411C00E4@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19061

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-copyurls.patch kdelibs-4.3.1-unmountfix.patch 
Log Message:
a pair of useful fixes from the 4.3 branch
(will backport to F11/F10 once it builds here)


kdelibs-4.3.1-copyurls.patch:
 kurlbutton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-copyurls.patch ---
Index: kfile/kurlbutton.cpp
===================================================================
--- kfile/kurlbutton.cpp	(revision 1006184)
+++ kfile/kurlbutton.cpp	(revision 1006185)
@@ -123,7 +123,7 @@
     QAction* activatedAction = popup.exec(QCursor::pos());
     if (activatedAction == copyAction) {
         QMimeData* mimeData = new QMimeData();
-        mimeData->setText(m_urlNavigator->url().prettyUrl());
+        mimeData->setText(m_urlNavigator->url().pathOrUrl());
         clipboard->setMimeData(mimeData);
     } else if (activatedAction == pasteAction) {
         m_urlNavigator->setUrl(KUrl(clipboard->text()));

kdelibs-4.3.1-unmountfix.patch:
 kio/kio/kautomount.cpp |    2 +-
 kioslave/file/file.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-unmountfix.patch ---
Index: kioslave/file/file.cpp
===================================================================
--- kioslave/file/file.cpp	(revision 1008903)
+++ kioslave/file/file.cpp	(revision 1008904)
@@ -1146,7 +1146,7 @@
         error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
         return;
     }
-    buffer = umountProg + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
+    buffer = umountProg + ' ' + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
     system( buffer.constData() );
 #endif /* HAVE_VOLMGT */
 
Index: kio/kio/kautomount.cpp
===================================================================
--- kio/kio/kautomount.cpp	(revision 1008897)
+++ kio/kio/kautomount.cpp	(revision 1008898)
@@ -108,7 +108,7 @@
 };
 
 KAutoUnmount::KAutoUnmount( const QString & _mountpoint, const QString & _desktopFile )
-    : d( new KAutoUnmountPrivate(this, _desktopFile, _mountpoint) )
+    : d( new KAutoUnmountPrivate(this, _mountpoint, _desktopFile) )
 {
     KIO::Job * job = KIO::unmount( d->m_mountpoint );
     connect( job, SIGNAL( result( KJob * ) ), this, SLOT( slotResult( KJob * ) ) );


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -p -r1.502 -r1.503
--- kdelibs.spec	14 Aug 2009 14:21:12 -0000	1.502
+++ kdelibs.spec	17 Aug 2009 11:11:29 -0000	1.503
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -87,6 +87,9 @@ Patch20: kdelibs-4.1.70-cmake.patch
 Patch100: kdelibs-4.3.1-kdebug#202550.patch
 # http://bugs.kde.org/199557
 Patch101: kdelibs-4.3.1-kdebug#199557.patch
+Patch102: kdelibs-4.3.1-unmountfix.patch
+# http://bugs.kde.org/170608
+Patch103: kdelibs-4.3.1-copyurls.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -223,7 +226,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 # 4.3
 %patch100 -p4 -b .kdebug#202550
 %patch101 -p4 -b .kdebug#199557
-
+%patch102 -p0 -b .unmountfix
+%patch103 -p0 -b .copyurls
 
 %build
 
@@ -405,6 +409,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 17 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- fix unmounting devices
+- fix copying URLs to clipboard (kdebug:170608)
+
 * Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
 - kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
 



From jnovy at fedoraproject.org  Mon Aug 17 11:16:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 17 Aug 2009 11:16:31 +0000 (UTC)
Subject: rpms/xz/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3 xz.spec,1.1,1.2
Message-ID: <20090817111631.B979911C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/xz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20334

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* 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)
- man page for xz and other improvements



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 18:20:53 -0000	1.2
+++ .cvsignore	17 Aug 2009 11:16:31 -0000	1.3
@@ -1 +1 @@
-xz-4.999.8beta.tar.gz
+xz-4.999.8beta.20090817git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 18:20:53 -0000	1.2
+++ sources	17 Aug 2009 11:16:31 -0000	1.3
@@ -1 +1 @@
-f00967331a487e88d51207fe17c56f52  xz-4.999.8beta.tar.gz
+d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-11/xz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xz.spec	17 Jul 2009 18:20:53 -0000	1.1
+++ xz.spec	17 Aug 2009 11:16:31 -0000	1.2
@@ -1,10 +1,13 @@
+%define git_date 20090817
+
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.8
-Release:	0.7.beta%{?dist}
+Release:	0.8.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz
+# source created as "make dist" in checked out GIT tree
+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}
@@ -67,6 +70,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 rm -f %{buildroot}/%{_libdir}/*.a
 rm -f %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}/%{_docdir}/%{name}
 
 %check
 LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
@@ -102,6 +106,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* 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)
+- man page for xz and other improvements
+
 * 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 jnovy at fedoraproject.org  Mon Aug 17 11:25:08 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 17 Aug 2009 11:25:08 +0000 (UTC)
Subject: rpms/xz/F-10 .cvsignore,1.2,1.3 sources,1.2,1.3 xz.spec,1.1,1.2
Message-ID: <20090817112508.C133411C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/xz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21365

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* 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)
- man page for xz and other improvements



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 18:20:53 -0000	1.2
+++ .cvsignore	17 Aug 2009 11:25:08 -0000	1.3
@@ -1 +1 @@
-xz-4.999.8beta.tar.gz
+xz-4.999.8beta.20090817git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 18:20:53 -0000	1.2
+++ sources	17 Aug 2009 11:25:08 -0000	1.3
@@ -1 +1 @@
-f00967331a487e88d51207fe17c56f52  xz-4.999.8beta.tar.gz
+d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-10/xz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xz.spec	17 Jul 2009 18:20:53 -0000	1.1
+++ xz.spec	17 Aug 2009 11:25:08 -0000	1.2
@@ -1,10 +1,13 @@
+%define git_date 20090817
+
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.8
-Release:	0.7.beta%{?dist}
+Release:	0.8.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz
+# source created as "make dist" in checked out GIT tree
+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}
@@ -67,6 +70,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 rm -f %{buildroot}/%{_libdir}/*.a
 rm -f %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}/%{_docdir}/%{name}
 
 %check
 LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
@@ -102,6 +106,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* 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)
+- man page for xz and other improvements
+
 * 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 pkgdb at fedoraproject.org  Mon Aug 17 11:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 11:29:05 +0000
Subject: [pkgdb] thunderbird: lkundrak has requested watchcommits
Message-ID: <20090817112907.7212B10F859@bastion2.fedora.phx.redhat.com>

lkundrak has requested the watchcommits acl on thunderbird (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/thunderbird



From cebbert at fedoraproject.org  Mon Aug 17 11:43:34 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 11:43:34 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-usb-remove-low-latency-hack.patch, NONE, 
	1.1.2.2 kernel.spec, 1.1206.2.81, 1.1206.2.82
Message-ID: <20090817114334.4C3C811C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23989

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-usb-remove-low-latency-hack.patch 
Log Message:
Backport F-11 patch to fix oopses in USB serial drivers. (#517259)

linux-2.6-usb-remove-low-latency-hack.patch:
 cyberjack.c        |    7 -------
 cypress_m8.c       |    4 ----
 empeg.c            |    6 ------
 garmin_gps.c       |    8 --------
 generic.c          |    6 ------
 io_edgeport.c      |    8 --------
 io_ti.c            |    8 --------
 ipaq.c             |    6 ------
 ipw.c              |    3 ---
 iuu_phoenix.c      |    1 -
 kobil_sct.c        |    6 ------
 mos7720.c          |    7 -------
 mos7840.c          |    6 ------
 option.c           |    3 ---
 sierra.c           |    3 ---
 ti_usb_3410_5052.c |   17 +----------------
 visor.c            |    8 --------
 17 files changed, 1 insertion(+), 106 deletions(-)

--- NEW FILE linux-2.6-usb-remove-low-latency-hack.patch ---
From: Oliver Neukum <oliver at neukum.org>
Date: Mon, 20 Apr 2009 15:28:53 +0000 (+0200)
Subject: USB: removal of tty->low_latency hack dating back to the old serial code
X-Git-Tag: v2.6.30-rc4~54^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2400a2bfbd0e912193fe3b077f492d4980141813

[ cebbert at redhat.com: backport to 2.6.27 ]

USB: removal of tty->low_latency hack dating back to the old serial code

This removes tty->low_latency from all USB serial drivers that push
data into the tty layer at hard interrupt context. It's no longer needed
and actually harmful.

Signed-off-by: Oliver Neukum <oliver at neukum.org>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
bz 500954
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 858bdd0..dd501bb 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -175,13 +175,6 @@ static int  cyberjack_open(struct tty_struct *tty,
 	dbg("%s - usb_clear_halt", __func__);
 	usb_clear_halt(port->serial->dev, port->write_urb->pipe);
 
-	/* force low_latency on so that our tty_push actually forces
-	 * the data through, otherwise it is scheduled, and with high
-	 * data rates (like with OHCI) data can get lost.
-	 */
-	if (tty)
-		tty->low_latency = 1;
-
 	priv = usb_get_serial_port_data(port);
 	spin_lock_irqsave(&priv->lock, flags);
 	priv->rdtodo = 0;
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index eae4740..e568710 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -656,10 +656,6 @@ static int cypress_open(struct tty_struct *tty,
 	priv->rx_flags = 0;
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-	/* setting to zero could cause data loss */
-	if (tty)
-		tty->low_latency = 1;
-
 	/* raise both lines and set termios */
 	spin_lock_irqsave(&priv->lock, flags);
 	priv->line_control = CONTROL_DTR | CONTROL_RTS;
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 8a69cce..c709ec4 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -478,12 +478,6 @@ static void empeg_set_termios(struct tty_struct *tty,
 	termios->c_cflag
 		|= CS8;		/* character size 8 bits */
 
-	/*
-	 * Force low_latency on; otherwise the pushes are scheduled;
-	 * this is bad as it opens up the possibility of dropping bytes
-	 * on the floor.  We don't want to drop bytes on the floor. :)
-	 */
-	tty->low_latency = 1;
 	tty_encode_baud_rate(tty, 115200, 115200);
 }
 
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index a26a0e2..586d30f 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -973,14 +973,6 @@ static int garmin_open(struct tty_struct *tty,
 
 	dbg("%s - port %d", __func__, port->number);
 
-	/*
-	 * Force low_latency on so that our tty_push actually forces the data
-	 * through, otherwise it is scheduled, and with high data rates (like
-	 * with OHCI) data can get lost.
-	 */
-	if (tty)
-		tty->low_latency = 1;
-
 	spin_lock_irqsave(&garmin_data_p->lock, flags);
 	garmin_data_p->mode  = initial_mode;
 	garmin_data_p->count = 0;
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 9d57cac..4cec990 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -122,12 +122,6 @@ int usb_serial_generic_open(struct tty_struct *tty,
 
 	dbg("%s - port %d", __func__, port->number);
 
-	/* force low_latency on so that our tty_push actually forces the data
-	   through, otherwise it is scheduled, and with high data rates (like
-	   with OHCI) data can get lost. */
-	if (tty)
-		tty->low_latency = 1;
-
 	/* clear the throttle flags */
 	spin_lock_irqsave(&port->lock, flags);
 	port->throttled = 0;
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index e85c8c0..fb4a73d 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -193,8 +193,6 @@ static const struct divisor_table_entry divisor_table[] = {
 /* local variables */
 static int debug;
 
-static int low_latency = 1;	/* tty low latency flag, on by default */
-
 static atomic_t CmdUrbs;	/* Number of outstanding Command Write Urbs */
 
 
@@ -867,9 +865,6 @@ static int edge_open(struct tty_struct *tty,
 	if (edge_port == NULL)
 		return -ENODEV;
 
-	if (tty)
-		tty->low_latency = low_latency;
-
 	/* see if we've set up our endpoint info yet (can't set it up
 	   in edge_startup as the structures were not set up at that time.) */
 	serial = port->serial;
@@ -3299,6 +3294,3 @@ MODULE_FIRMWARE("edgeport/down2.fw");
 
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug enabled or not");
-
-module_param(low_latency, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(low_latency, "Low latency enabled or not");
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index c3cdd00..513b25e 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -76,7 +76,6 @@ struct edgeport_uart_buf_desc {
 #define EDGE_READ_URB_STOPPING	1
 #define EDGE_READ_URB_STOPPED	2
 
-#define EDGE_LOW_LATENCY	1
 #define EDGE_CLOSING_WAIT	4000	/* in .01 sec */
 
 #define EDGE_OUT_BUF_SIZE	1024
@@ -232,7 +231,6 @@ static unsigned short OperationalBuildNumber;
 
 static int debug;
 
-static int low_latency = EDGE_LOW_LATENCY;
 static int closing_wait = EDGE_CLOSING_WAIT;
 static int ignore_cpu_rev;
 static int default_uart_mode;		/* RS232 */
@@ -1850,9 +1848,6 @@ static int edge_open(struct tty_struct *tty,
 	if (edge_port == NULL)
 		return -ENODEV;
 
-	if (tty)
-		tty->low_latency = low_latency;
-
 	port_number = port->number - port->serial->minor;
 	switch (port_number) {
 	case 0:
@@ -3008,9 +3003,6 @@ MODULE_FIRMWARE("edgeport/down3.bin");
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug enabled or not");
 
-module_param(low_latency, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(low_latency, "Low latency enabled or not");
-
 module_param(closing_wait, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(closing_wait, "Maximum wait for data to drain, in .01 secs");
 
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index ef92095..cd62825 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -631,13 +631,7 @@ static int ipaq_open(struct tty_struct *tty,
 		priv->free_len += PACKET_SIZE;
 	}
 
-	/*
-	 * Force low latency on. This will immediately push data to the line
-	 * discipline instead of queueing.
-	 */
-
 	if (tty) {
-		tty->low_latency = 1;
 		/* FIXME: These two are bogus */
 		tty->raw = 1;
 		tty->real_raw = 1;
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index f530032..da2a2b4 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -207,9 +207,6 @@ static int ipw_open(struct tty_struct *tty,
 	if (!buf_flow_init)
 		return -ENOMEM;
 
-	if (tty)
-		tty->low_latency = 1;
-
 	/* --1: Tell the modem to initialize (we think) From sniffs this is
 	 *	always the first thing that gets sent to the modem during
 	 *	opening of the device */
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 2314c6a..4473d44 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -1051,7 +1051,6 @@ static int iuu_open(struct tty_struct *tty,
 		tty->termios->c_oflag = 0;
 		tty->termios->c_iflag = 0;
 		priv->termios_initialized = 1;
-		tty->low_latency = 1;
 		priv->poll = 0;
 	 }
 	spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 6286baa..c148544 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -231,13 +231,7 @@ static int kobil_open(struct tty_struct *tty,
 	/* someone sets the dev to 0 if the close method has been called */
 	port->interrupt_in_urb->dev = port->serial->dev;
 
-
-	/* force low_latency on so that our tty_push actually forces
-	 * the data through, otherwise it is scheduled, and with high
-	 * data rates (like with OHCI) data can get lost.
-	 */
 	if (tty) {
-		tty->low_latency = 1;
 
 		/* Default to echo off and other sane device settings */
 		tty->termios->c_lflag = 0;
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index e772cc0..24e3b5d 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -446,13 +446,6 @@ static int mos7720_open(struct tty_struct *tty,
 	data = 0x0c;
 	send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
 
-	/* force low_latency on so that our tty_push actually forces *
-	 * the data through,otherwise it is scheduled, and with      *
-	 * high data rates (like with OHCI) data can get lost.       */
-
-	if (tty)
-		tty->low_latency = 1;
-
 	/* see if we've set up our endpoint info yet   *
 	 * (can't set it up in mos7720_startup as the  *
 	 * structures were not set up at that time.)   */
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 499b7b8..84fb1dc 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1007,12 +1007,6 @@ static int mos7840_open(struct tty_struct *tty,
 	status = mos7840_set_reg_sync(port, mos7840_port->ControlRegOffset,
 									Data);
 
-	/* force low_latency on so that our tty_push actually forces *
-	 * the data through,otherwise it is scheduled, and with      *
-	 * high data rates (like with OHCI) data can get lost.       */
-	if (tty)
-		tty->low_latency = 1;
-
 	/* Check to see if we've set up our endpoint info yet    *
 	 * (can't set it up in mos7840_startup as the structures *
 	 * were not set up at that time.)                        */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 47bd070..7817b82 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -936,9 +936,6 @@ static int option_open(struct tty_struct *tty,
 				usb_pipeout(urb->pipe), 0); */
 	}
 
-	if (tty)
-		tty->low_latency = 1;
-
 	option_send_setup(tty, port);
 
 	return 0;
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 7da3775..913225c 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -598,9 +598,6 @@ static int sierra_open(struct tty_struct *tty,
 		}
 	}
 
-	if (tty)
-		tty->low_latency = 1;
-
 	sierra_send_setup(tty, port);
 
 	/* start up the interrupt endpoint if we have one */
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 9c4c700..0a64bac 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -50,11 +50,10 @@
 
 #define TI_TRANSFER_TIMEOUT	2
 
-#define TI_DEFAULT_LOW_LATENCY	0
 #define TI_DEFAULT_CLOSING_WAIT	4000		/* in .01 secs */
 
 /* supported setserial flags */
-#define TI_SET_SERIAL_FLAGS	(ASYNC_LOW_LATENCY)
+#define TI_SET_SERIAL_FLAGS	0
 
 /* read urb states */
 #define TI_READ_URB_RUNNING	0
@@ -161,7 +160,6 @@ static int ti_buf_get(struct circ_buf *cb, char *buf, int count);
 
 /* module parameters */
 static int debug;
-static int low_latency = TI_DEFAULT_LOW_LATENCY;
 static int closing_wait = TI_DEFAULT_CLOSING_WAIT;
 static ushort vendor_3410[TI_EXTRA_VID_PID_COUNT];
 static unsigned int vendor_3410_count;
@@ -296,10 +294,6 @@ MODULE_FIRMWARE("mts_edge.fw");
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Enable debugging, 0=no, 1=yes");
 
-module_param(low_latency, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(low_latency,
-		"TTY low_latency flag, 0=off, 1=on, default is off");
-
 module_param(closing_wait, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(closing_wait,
     "Maximum wait for data to drain in close, in .01 secs, default is 4000");
@@ -448,7 +442,6 @@ static int ti_startup(struct usb_serial *serial)
 		spin_lock_init(&tport->tp_lock);
 		tport->tp_uart_base_addr = (i == 0 ?
 				TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR);
-		tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0;
 		tport->tp_closing_wait = closing_wait;
 		init_waitqueue_head(&tport->tp_msr_wait);
 		init_waitqueue_head(&tport->tp_write_wait);
@@ -528,10 +521,6 @@ static int ti_open(struct tty_struct *tty,
 	if (mutex_lock_interruptible(&tdev->td_open_close_lock))
 		return -ERESTARTSYS;
 
-	if (tty)
-		tty->low_latency =
-				(tport->tp_flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-
 	port_number = port->number - port->serial->minor;
 
 	memset(&(tport->tp_icount), 0x00, sizeof(tport->tp_icount));
@@ -1454,10 +1443,6 @@ static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,
 		return -EFAULT;
 
 	tport->tp_flags = new_serial.flags & TI_SET_SERIAL_FLAGS;
-	/* FIXME */
-	if (port->port.tty)
-		port->port.tty->low_latency =
-			(tport->tp_flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 	tport->tp_closing_wait = new_serial.closing_wait;
 
 	return 0;
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 4facce3..5ac414b 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -296,14 +296,6 @@ static int visor_open(struct tty_struct *tty, struct usb_serial_port *port,
 	priv->throttled = 0;
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-	/*
-	 * Force low_latency on so that our tty_push actually forces the data
-	 * through, otherwise it is scheduled, and with high data rates (like
-	 * with OHCI) data can get lost.
-	 */
-	if (tty)
-		tty->low_latency = 1;
-
 	/* Start reading from the device */
 	usb_fill_bulk_urb(port->read_urb, serial->dev,
 			   usb_rcvbulkpipe(serial->dev,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.81
retrieving revision 1.1206.2.82
diff -u -p -r1.1206.2.81 -r1.1206.2.82
--- kernel.spec	17 Aug 2009 06:18:16 -0000	1.1206.2.81
+++ kernel.spec	17 Aug 2009 11:43:33 -0000	1.1206.2.82
@@ -736,6 +736,8 @@ Patch2201: linux-2.6-firewire-git-pendin
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
 Patch2301: linux-2.6-usb-option-increase-outgoing-buffers.patch
+# kill more misuse of tty->low_latency flag
+Patch2302: linux-2.6-usb-remove-low-latency-hack.patch
 
 # Add fips_enable flag
 Patch2400: linux-2.6-crypto-fips_enable.patch
@@ -1198,6 +1200,7 @@ ApplyPatch linux-2.6.27.9-ext4-cap-check
 # USB
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 ApplyPatch linux-2.6-usb-option-increase-outgoing-buffers.patch
+ApplyPatch linux-2.6-usb-remove-low-latency-hack.patch
 
 # Add the ability to turn FIPS-compliant mode on or off at boot
 ApplyPatch linux-2.6-crypto-fips_enable.patch
@@ -1995,6 +1998,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 17 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.82
+- Backport F-11 patch to fix oopses in USB serial drivers. (#517259)
+
 * Mon Aug 17 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.81
 - Backport F-11 patch to fix oopses in nozomi and mxser drivers.
 



From jzeleny at fedoraproject.org  Mon Aug 17 11:48:12 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 17 Aug 2009 11:48:12 +0000 (UTC)
Subject: rpms/dcbd/devel dcbd-0.9.15-sysconfig.patch, NONE, 1.1 .cvsignore,
	1.2, 
	1.3 dcbd-0.9.7-init.patch, 1.1, 1.2 dcbd.spec, 1.2, 1.3 sources,
	1.2, 1.3 dcbd-0.9.7-sysconfig.patch, 1.1, NONE
Message-ID: <20090817114812.081D211C00E4@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25911

Modified Files:
	.cvsignore dcbd-0.9.7-init.patch dcbd.spec sources 
Added Files:
	dcbd-0.9.15-sysconfig.patch 
Removed Files:
	dcbd-0.9.7-sysconfig.patch 
Log Message:
Rebase to 0.9.15


dcbd-0.9.15-sysconfig.patch:
 Makefile.am    |    2 +-
 Makefile.in    |    2 +-
 README         |    4 ++--
 dcbd.8         |    2 +-
 include/dcbd.h |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE dcbd-0.9.15-sysconfig.patch ---
diff -Nurp dcbd-0.9.15/dcbd.8 dcbd-0.9.15-corrected/dcbd.8
--- dcbd-0.9.15/dcbd.8	2009-07-09 01:17:03.000000000 +0200
+++ dcbd-0.9.15-corrected/dcbd.8	2009-08-17 13:07:08.693587866 +0200
@@ -61,7 +61,7 @@ show usage information
 .TP
 .BI "-f" " filename"
 use the specified file as the configuration file instead of the default file:
-/etc/sysconfig/dcbd/dcbd.conf
+/etc/dcbd/dcbd.conf
 .B dcbd
 expects the directory of the configuration file to exist, but if the
 configuration file does not exist, then a default configuration file will
diff -Nurp dcbd-0.9.15/include/dcbd.h dcbd-0.9.15-corrected/include/dcbd.h
--- dcbd-0.9.15/include/dcbd.h	2009-07-09 01:13:57.000000000 +0200
+++ dcbd-0.9.15-corrected/include/dcbd.h	2009-08-17 13:07:33.313595906 +0200
@@ -43,7 +43,7 @@
 #define CLIF_IFACE_DIR "/var/run/dcbd"
 #define CLIF_IFACE_IFNAME "clif"
 
-#define DEFAULT_CFG_FILE "/etc/sysconfig/dcbd/dcbd.conf"
+#define DEFAULT_CFG_FILE "/etc/dcbd/dcbd.conf"
 
 #define DEFAULT_DCBX_VERSION  2
 
diff -Nurp dcbd-0.9.15/Makefile.am dcbd-0.9.15-corrected/Makefile.am
--- dcbd-0.9.15/Makefile.am	2009-07-09 01:13:57.000000000 +0200
+++ dcbd-0.9.15-corrected/Makefile.am	2009-08-17 13:08:13.101591160 +0200
@@ -58,7 +58,7 @@ nltest_SOURCES = nltest.c nltest.h
 dist_man_MANS = dcbd.8 dcbtool.8
 
 ## force the creation of an empty configuration directory at install time
-dcbdconfigdir = /etc/sysconfig/dcbd
+dcbdconfigdir = /etc/dcbd
 dcbdconfig_DATA =
 
 ## pkg-config data file, for client interface software to find headers
diff -Nurp dcbd-0.9.15/Makefile.in dcbd-0.9.15-corrected/Makefile.in
--- dcbd-0.9.15/Makefile.in	2009-07-09 01:14:09.000000000 +0200
+++ dcbd-0.9.15-corrected/Makefile.in	2009-08-17 13:08:21.275576489 +0200
@@ -299,7 +299,7 @@ $(dcbd_include_HEADERS) $(noinst_HEADERS
 
 nltest_SOURCES = nltest.c nltest.h
 dist_man_MANS = dcbd.8 dcbtool.8
-dcbdconfigdir = /etc/sysconfig/dcbd
+dcbdconfigdir = /etc/dcbd
 dcbdconfig_DATA = 
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = dcbd.pc
diff -Nurp dcbd-0.9.15/README dcbd-0.9.15-corrected/README
--- dcbd-0.9.15/README	2009-07-09 01:13:57.000000000 +0200
+++ dcbd-0.9.15-corrected/README	2009-08-17 13:08:37.654597087 +0200
@@ -159,7 +159,7 @@ dcbd Application Install
      ./configure --prefix=/usr; make; make install
 
    This will build and install 'dcbd' and 'dcbtool' to /usr/sbin, make
-   the '/etc/sysconfig/dcbd' directory (default location of
+   the '/etc/dcbd' directory (default location of
    the dcbd.conf file) and setup dcbd to run as a system service using the
    chkconfig program.  Verify that the dcbd service is working as expected
    with the 'service dcbd status' command. If the service is not on, issue
@@ -181,7 +181,7 @@ Options
 dcbd has the following command line options:
     -h show usage information
     -f configfile    use the specified file as the config file instead of
-                     the default file - /etc/sysconfig/dcbd/dcbd.conf
+                     the default file - /etc/dcbd/dcbd.conf
     -d run dcbd as a daemon
     -v show dcbd version
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Mar 2009 13:25:25 -0000	1.2
+++ .cvsignore	17 Aug 2009 11:48:11 -0000	1.3
@@ -1 +1 @@
-dcbd-0.9.7.tar.gz
+dcbd-0.9.15.tar.gz

dcbd-0.9.7-init.patch:
 dcbd.init |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: dcbd-0.9.7-init.patch
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd-0.9.7-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dcbd-0.9.7-init.patch	23 Mar 2009 13:25:25 -0000	1.1
+++ dcbd-0.9.7-init.patch	17 Aug 2009 11:48:11 -0000	1.2
@@ -13,7 +13,7 @@ diff -Nurp dcbd-0.9.7-current/dcbd.init 
  # Provides: dcbd
  # Required-Start: network
  # Required-Stop:
--# Default-Start: 3 4 5
+-# Default-Start: 3 5
 +# Default-Start:
  # Default-Stop:
 +# Short-Description: Data Center Bridging Exchange protocol daemon


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dcbd.spec	24 Jul 2009 20:04:39 -0000	1.2
+++ dcbd.spec	17 Aug 2009 11:48:11 -0000	1.3
@@ -1,19 +1,19 @@
 Name:           dcbd
-Version:        0.9.7
-Release:        5%{?dist}
+Version:        0.9.15
+Release:        1%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://e1000.sourceforge.net
-Source0:        http://downloads.sourceforge.net/e1000/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/project/e1000/DCB%20Tools/%{version}/%{name}-%{version}.tar.gz
 Patch0:         dcbd-0.9.7-make.patch
-Patch1:         dcbd-0.9.7-sysconfig.patch
+Patch1:         dcbd-0.9.15-sysconfig.patch
 Patch2:         dcbd-0.9.7-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: kernel >= 2.6.29
-BuildRequires:  libconfig-devel kernel-headers >= 2.6.29
+Requires: kernel >= 2.6.31
+BuildRequires:  libconfig-devel kernel-headers >= 2.6.31
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-1
+- rebase to 0.9.15
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Mar 2009 13:25:25 -0000	1.2
+++ sources	17 Aug 2009 11:48:11 -0000	1.3
@@ -1 +1 @@
-8a7ad4e410abc1e5c3497aae0db5aa1e  dcbd-0.9.7.tar.gz
+8e4c745ae1b34c7663bce5cb5f5d7059  dcbd-0.9.15.tar.gz


--- dcbd-0.9.7-sysconfig.patch DELETED ---



From peter at fedoraproject.org  Mon Aug 17 12:10:49 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 17 Aug 2009 12:10:49 +0000 (UTC)
Subject: rpms/python-sippy/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-sippy.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090817121049.577F011C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-sippy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28526/devel

Modified Files:
	.cvsignore import.log python-sippy.spec sources 
Log Message:
Ver. 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 May 2009 16:13:59 -0000	1.2
+++ .cvsignore	17 Aug 2009 12:10:48 -0000	1.3
@@ -1 +1 @@
-sippy-20090429.tar.bz2
+sippy-1.0.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 May 2009 16:13:59 -0000	1.1
+++ import.log	17 Aug 2009 12:10:49 -0000	1.2
@@ -1 +1,2 @@
 python-sippy-0-0_8_20090429cvs_fc10:HEAD:python-sippy-0-0.8.20090429cvs.fc10.src.rpm:1243527124
+python-sippy-1_0_1-1_fc11:HEAD:python-sippy-1.0.1-1.fc11.src.rpm:1250511007


Index: python-sippy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/devel/python-sippy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-sippy.spec	30 Jul 2009 22:30:18 -0000	1.3
+++ python-sippy.spec	17 Aug 2009 12:10:49 -0000	1.4
@@ -1,21 +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()")}
 
+%define realname sippy
 
-Name:           python-sippy
-Version:        0
-Release:        0.10.20090429cvs%{?dist}
+Name:           python-%{realname}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        B2BUA (back-to-back user agent) SIP call controlling component
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://b2bua.org/
 BuildArch:      noarch
-Provides:       sippy = %{version}-%{release}
-# cvs -z3 -d:pserver:anonymous at cvs.sippy.berlios.de:/cvsroot/sippy export -D 2009-04-29 -d sippy sippy_dist
-# tar -cjvf sippy-20090429.tar.bz2 sippy
-Source0:        sippy-20090429.tar.bz2
+Provides:       %{realname} = %{version}-%{release}
+Source0:        http://b2bua.org/chrome/site/%{realname}-%{version}.tar.gz
 Patch0:         sippy-setup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
+BuildRequires:	python-setuptools-devel
 Requires: python-twisted-core
 # for sippy/Radius_client.py
 Requires: radiusclient-ng-utils
@@ -37,7 +37,7 @@ into the media path.
 
 
 %prep
-%setup -q -n sippy
+%setup -q -n %{realname}-%{version}
 %patch0 -p0 -b .do_not_install_copying
 chmod 644 sippy/Udp_server.py
 
@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%dir %{_sysconfdir}/sippy
-%config(noreplace) %{_sysconfdir}/sippy/dictionary
+%dir %{_sysconfdir}/%{realname}
+%config(noreplace) %{_sysconfdir}/%{realname}/dictionary
 %{_bindir}/b2bua_radius.py
 %{_bindir}/b2bua_simple.py
 %if 0%{?fedora} == 10 || 0%{?el5}
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
+- Version 1.0.1
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0-0.10.20090429cvs
 - Bump for F12 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 May 2009 16:13:59 -0000	1.2
+++ sources	17 Aug 2009 12:10:49 -0000	1.3
@@ -1 +1 @@
-67043d5bc0c7d232f3b544216c037408  sippy-20090429.tar.bz2
+cc9d530c05ff7e357a1115a191d88205  sippy-1.0.1.tar.gz



From ltinkl at fedoraproject.org  Mon Aug 17 12:18:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 17 Aug 2009 12:18:20 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-copyurls.patch, NONE,
	1.1 kdelibs-4.3.1-unmountfix.patch, NONE, 1.1 kdelibs.spec,
	1.489, 1.490
Message-ID: <20090817121820.18D7A11C0416@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29945/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-copyurls.patch kdelibs-4.3.1-unmountfix.patch 
Log Message:
backport the recent kdelibs fixes


kdelibs-4.3.1-copyurls.patch:
 kurlbutton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-copyurls.patch ---
Index: kfile/kurlbutton.cpp
===================================================================
--- kfile/kurlbutton.cpp	(revision 1006184)
+++ kfile/kurlbutton.cpp	(revision 1006185)
@@ -123,7 +123,7 @@
     QAction* activatedAction = popup.exec(QCursor::pos());
     if (activatedAction == copyAction) {
         QMimeData* mimeData = new QMimeData();
-        mimeData->setText(m_urlNavigator->url().prettyUrl());
+        mimeData->setText(m_urlNavigator->url().pathOrUrl());
         clipboard->setMimeData(mimeData);
     } else if (activatedAction == pasteAction) {
         m_urlNavigator->setUrl(KUrl(clipboard->text()));

kdelibs-4.3.1-unmountfix.patch:
 kio/kio/kautomount.cpp |    2 +-
 kioslave/file/file.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-unmountfix.patch ---
Index: kioslave/file/file.cpp
===================================================================
--- kioslave/file/file.cpp	(revision 1008903)
+++ kioslave/file/file.cpp	(revision 1008904)
@@ -1146,7 +1146,7 @@
         error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
         return;
     }
-    buffer = umountProg + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
+    buffer = umountProg + ' ' + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
     system( buffer.constData() );
 #endif /* HAVE_VOLMGT */
 
Index: kio/kio/kautomount.cpp
===================================================================
--- kio/kio/kautomount.cpp	(revision 1008897)
+++ kio/kio/kautomount.cpp	(revision 1008898)
@@ -108,7 +108,7 @@
 };
 
 KAutoUnmount::KAutoUnmount( const QString & _mountpoint, const QString & _desktopFile )
-    : d( new KAutoUnmountPrivate(this, _desktopFile, _mountpoint) )
+    : d( new KAutoUnmountPrivate(this, _mountpoint, _desktopFile) )
 {
     KIO::Job * job = KIO::unmount( d->m_mountpoint );
     connect( job, SIGNAL( result( KJob * ) ), this, SLOT( slotResult( KJob * ) ) );


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -p -r1.489 -r1.490
--- kdelibs.spec	5 Aug 2009 18:36:06 -0000	1.489
+++ kdelibs.spec	17 Aug 2009 12:18:19 -0000	1.490
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -87,6 +87,9 @@ Patch20: kdelibs-4.1.70-cmake.patch
 Patch100: kdelibs-4.3.1-kdebug#202550.patch
 # http://bugs.kde.org/199557
 Patch101: kdelibs-4.3.1-kdebug#199557.patch
+Patch102: kdelibs-4.3.1-unmountfix.patch
+# http://bugs.kde.org/170608
+Patch103: kdelibs-4.3.1-copyurls.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -223,7 +226,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 # 4.3
 %patch100 -p4 -b .kdebug#202550
 %patch101 -p4 -b .kdebug#199557
-
+%patch102 -p0 -b .unmountfix
+%patch103 -p0 -b .copyurls
 
 %build
 
@@ -405,6 +409,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 17 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- fix unmounting devices
+- fix copying URLs to clipboard (kdebug:170608)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
 - khtml crasher (kdebug#199557)



From ltinkl at fedoraproject.org  Mon Aug 17 12:18:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 17 Aug 2009 12:18:19 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-copyurls.patch, NONE,
	1.1 kdelibs-4.3.1-unmountfix.patch, NONE, 1.1 kdelibs.spec,
	1.435, 1.436
Message-ID: <20090817121819.C05F711C0381@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29945/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-copyurls.patch kdelibs-4.3.1-unmountfix.patch 
Log Message:
backport the recent kdelibs fixes


kdelibs-4.3.1-copyurls.patch:
 kurlbutton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-copyurls.patch ---
Index: kfile/kurlbutton.cpp
===================================================================
--- kfile/kurlbutton.cpp	(revision 1006184)
+++ kfile/kurlbutton.cpp	(revision 1006185)
@@ -123,7 +123,7 @@
     QAction* activatedAction = popup.exec(QCursor::pos());
     if (activatedAction == copyAction) {
         QMimeData* mimeData = new QMimeData();
-        mimeData->setText(m_urlNavigator->url().prettyUrl());
+        mimeData->setText(m_urlNavigator->url().pathOrUrl());
         clipboard->setMimeData(mimeData);
     } else if (activatedAction == pasteAction) {
         m_urlNavigator->setUrl(KUrl(clipboard->text()));

kdelibs-4.3.1-unmountfix.patch:
 kio/kio/kautomount.cpp |    2 +-
 kioslave/file/file.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.1-unmountfix.patch ---
Index: kioslave/file/file.cpp
===================================================================
--- kioslave/file/file.cpp	(revision 1008903)
+++ kioslave/file/file.cpp	(revision 1008904)
@@ -1146,7 +1146,7 @@
         error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
         return;
     }
-    buffer = umountProg + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
+    buffer = umountProg + ' ' + QFile::encodeName(KShell::quoteArg(_point)) + " 2>" + tmpFileName;
     system( buffer.constData() );
 #endif /* HAVE_VOLMGT */
 
Index: kio/kio/kautomount.cpp
===================================================================
--- kio/kio/kautomount.cpp	(revision 1008897)
+++ kio/kio/kautomount.cpp	(revision 1008898)
@@ -108,7 +108,7 @@
 };
 
 KAutoUnmount::KAutoUnmount( const QString & _mountpoint, const QString & _desktopFile )
-    : d( new KAutoUnmountPrivate(this, _desktopFile, _mountpoint) )
+    : d( new KAutoUnmountPrivate(this, _mountpoint, _desktopFile) )
 {
     KIO::Job * job = KIO::unmount( d->m_mountpoint );
     connect( job, SIGNAL( result( KJob * ) ), this, SLOT( slotResult( KJob * ) ) );


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -p -r1.435 -r1.436
--- kdelibs.spec	5 Aug 2009 18:36:06 -0000	1.435
+++ kdelibs.spec	17 Aug 2009 12:18:19 -0000	1.436
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -87,6 +87,9 @@ Patch20: kdelibs-4.1.70-cmake.patch
 Patch100: kdelibs-4.3.1-kdebug#202550.patch
 # http://bugs.kde.org/199557
 Patch101: kdelibs-4.3.1-kdebug#199557.patch
+Patch102: kdelibs-4.3.1-unmountfix.patch
+# http://bugs.kde.org/170608
+Patch103: kdelibs-4.3.1-copyurls.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -223,7 +226,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 # 4.3
 %patch100 -p4 -b .kdebug#202550
 %patch101 -p4 -b .kdebug#199557
-
+%patch102 -p0 -b .unmountfix
+%patch103 -p0 -b .copyurls
 
 %build
 
@@ -405,6 +409,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 17 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- fix unmounting devices
+- fix copying URLs to clipboard (kdebug:170608)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
 - khtml crasher (kdebug#199557)



From peter at fedoraproject.org  Mon Aug 17 12:35:59 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 17 Aug 2009 12:35:59 +0000 (UTC)
Subject: rpms/python-sippy/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-sippy.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090817123559.4403211C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-sippy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31895/F-11

Modified Files:
	.cvsignore import.log python-sippy.spec sources 
Log Message:
Ver. 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 May 2009 16:21:37 -0000	1.2
+++ .cvsignore	17 Aug 2009 12:35:59 -0000	1.3
@@ -1 +1 @@
-sippy-20090429.tar.bz2
+sippy-1.0.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 May 2009 16:21:37 -0000	1.1
+++ import.log	17 Aug 2009 12:35:59 -0000	1.2
@@ -1 +1,2 @@
 python-sippy-0-0_8_20090429cvs_fc10:F-11:python-sippy-0-0.8.20090429cvs.fc10.src.rpm:1243527341
+python-sippy-1_0_1-1_fc11:F-11:python-sippy-1.0.1-1.fc11.src.rpm:1250512356


Index: python-sippy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-11/python-sippy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-sippy.spec	28 May 2009 18:32:45 -0000	1.2
+++ python-sippy.spec	17 Aug 2009 12:35:59 -0000	1.3
@@ -1,21 +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()")}
 
+%define realname sippy
 
-Name:           python-sippy
-Version:        0
-Release:        0.9.20090429cvs%{?dist}
+Name:           python-%{realname}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        B2BUA (back-to-back user agent) SIP call controlling component
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://b2bua.org/
 BuildArch:      noarch
-Provides:       sippy = %{version}-%{release}
-# cvs -z3 -d:pserver:anonymous at cvs.sippy.berlios.de:/cvsroot/sippy export -D 2009-04-29 -d sippy sippy_dist
-# tar -cjvf sippy-20090429.tar.bz2 sippy
-Source0:        sippy-20090429.tar.bz2
+Provides:       %{realname} = %{version}-%{release}
+Source0:        http://b2bua.org/chrome/site/%{realname}-%{version}.tar.gz
 Patch0:         sippy-setup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
+BuildRequires:	python-setuptools-devel
 Requires: python-twisted-core
 # for sippy/Radius_client.py
 Requires: radiusclient-ng-utils
@@ -37,7 +37,7 @@ into the media path.
 
 
 %prep
-%setup -q -n sippy
+%setup -q -n %{realname}-%{version}
 %patch0 -p0 -b .do_not_install_copying
 chmod 644 sippy/Udp_server.py
 
@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%dir %{_sysconfdir}/sippy
-%config(noreplace) %{_sysconfdir}/sippy/dictionary
+%dir %{_sysconfdir}/%{realname}
+%config(noreplace) %{_sysconfdir}/%{realname}/dictionary
 %{_bindir}/b2bua_radius.py
 %{_bindir}/b2bua_simple.py
 %if 0%{?fedora} == 10 || 0%{?el5}
@@ -73,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
+- Version 1.0.1
+
+* Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0-0.10.20090429cvs
+- Bump for F12 mass rebuild
+
 * Thu May 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.9.20090429cvs
 - Fixed build for EL-4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 May 2009 16:21:37 -0000	1.2
+++ sources	17 Aug 2009 12:35:59 -0000	1.3
@@ -1 +1 @@
-67043d5bc0c7d232f3b544216c037408  sippy-20090429.tar.bz2
+cc9d530c05ff7e357a1115a191d88205  sippy-1.0.1.tar.gz



From peter at fedoraproject.org  Mon Aug 17 12:48:15 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 17 Aug 2009 12:48:15 +0000 (UTC)
Subject: rpms/python-sippy/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-sippy.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090817124815.2C6EF11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-sippy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1533/F-10

Modified Files:
	.cvsignore import.log python-sippy.spec sources 
Log Message:
Ver. 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 May 2009 16:23:58 -0000	1.2
+++ .cvsignore	17 Aug 2009 12:48:14 -0000	1.3
@@ -1 +1 @@
-sippy-20090429.tar.bz2
+sippy-1.0.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 May 2009 16:23:58 -0000	1.1
+++ import.log	17 Aug 2009 12:48:14 -0000	1.2
@@ -1 +1,2 @@
 python-sippy-0-0_8_20090429cvs_fc10:F-10:python-sippy-0-0.8.20090429cvs.fc10.src.rpm:1243527774
+python-sippy-1_0_1-1_fc11:F-10:python-sippy-1.0.1-1.fc11.src.rpm:1250513160


Index: python-sippy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-10/python-sippy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-sippy.spec	28 May 2009 18:32:44 -0000	1.2
+++ python-sippy.spec	17 Aug 2009 12:48:14 -0000	1.3
@@ -1,21 +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()")}
 
+%define realname sippy
 
-Name:           python-sippy
-Version:        0
-Release:        0.9.20090429cvs%{?dist}
+Name:           python-%{realname}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        B2BUA (back-to-back user agent) SIP call controlling component
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://b2bua.org/
 BuildArch:      noarch
-Provides:       sippy = %{version}-%{release}
-# cvs -z3 -d:pserver:anonymous at cvs.sippy.berlios.de:/cvsroot/sippy export -D 2009-04-29 -d sippy sippy_dist
-# tar -cjvf sippy-20090429.tar.bz2 sippy
-Source0:        sippy-20090429.tar.bz2
+Provides:       %{realname} = %{version}-%{release}
+Source0:        http://b2bua.org/chrome/site/%{realname}-%{version}.tar.gz
 Patch0:         sippy-setup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
+BuildRequires:	python-setuptools-devel
 Requires: python-twisted-core
 # for sippy/Radius_client.py
 Requires: radiusclient-ng-utils
@@ -37,7 +37,7 @@ into the media path.
 
 
 %prep
-%setup -q -n sippy
+%setup -q -n %{realname}-%{version}
 %patch0 -p0 -b .do_not_install_copying
 chmod 644 sippy/Udp_server.py
 
@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%dir %{_sysconfdir}/sippy
-%config(noreplace) %{_sysconfdir}/sippy/dictionary
+%dir %{_sysconfdir}/%{realname}
+%config(noreplace) %{_sysconfdir}/%{realname}/dictionary
 %{_bindir}/b2bua_radius.py
 %{_bindir}/b2bua_simple.py
 %if 0%{?fedora} == 10 || 0%{?el5}
@@ -73,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
+- Version 1.0.1
+
+* Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0-0.10.20090429cvs
+- Bump for F12 mass rebuild
+
 * Thu May 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.9.20090429cvs
 - Fixed build for EL-4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 May 2009 16:23:58 -0000	1.2
+++ sources	17 Aug 2009 12:48:15 -0000	1.3
@@ -1 +1 @@
-67043d5bc0c7d232f3b544216c037408  sippy-20090429.tar.bz2
+cc9d530c05ff7e357a1115a191d88205  sippy-1.0.1.tar.gz



From peter at fedoraproject.org  Mon Aug 17 12:54:01 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 17 Aug 2009 12:54:01 +0000 (UTC)
Subject: rpms/python-sippy/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-sippy.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090817125401.630CE11C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-sippy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2261/EL-5

Modified Files:
	.cvsignore import.log python-sippy.spec sources 
Log Message:
Ver. 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 May 2009 16:26:14 -0000	1.2
+++ .cvsignore	17 Aug 2009 12:54:01 -0000	1.3
@@ -1 +1 @@
-sippy-20090429.tar.bz2
+sippy-1.0.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 May 2009 16:26:14 -0000	1.1
+++ import.log	17 Aug 2009 12:54:01 -0000	1.2
@@ -1 +1,2 @@
 python-sippy-0-0_8_20090429cvs_fc10:EL-5:python-sippy-0-0.8.20090429cvs.fc10.src.rpm:1243527948
+python-sippy-1_0_1-1_fc11:EL-5:python-sippy-1.0.1-1.fc11.src.rpm:1250513609


Index: python-sippy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-5/python-sippy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-sippy.spec	28 May 2009 18:32:44 -0000	1.2
+++ python-sippy.spec	17 Aug 2009 12:54:01 -0000	1.3
@@ -1,21 +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()")}
 
+%define realname sippy
 
-Name:           python-sippy
-Version:        0
-Release:        0.9.20090429cvs%{?dist}
+Name:           python-%{realname}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        B2BUA (back-to-back user agent) SIP call controlling component
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://b2bua.org/
 BuildArch:      noarch
-Provides:       sippy = %{version}-%{release}
-# cvs -z3 -d:pserver:anonymous at cvs.sippy.berlios.de:/cvsroot/sippy export -D 2009-04-29 -d sippy sippy_dist
-# tar -cjvf sippy-20090429.tar.bz2 sippy
-Source0:        sippy-20090429.tar.bz2
+Provides:       %{realname} = %{version}-%{release}
+Source0:        http://b2bua.org/chrome/site/%{realname}-%{version}.tar.gz
 Patch0:         sippy-setup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
+BuildRequires:	python-setuptools-devel
 Requires: python-twisted-core
 # for sippy/Radius_client.py
 Requires: radiusclient-ng-utils
@@ -37,7 +37,7 @@ into the media path.
 
 
 %prep
-%setup -q -n sippy
+%setup -q -n %{realname}-%{version}
 %patch0 -p0 -b .do_not_install_copying
 chmod 644 sippy/Udp_server.py
 
@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%dir %{_sysconfdir}/sippy
-%config(noreplace) %{_sysconfdir}/sippy/dictionary
+%dir %{_sysconfdir}/%{realname}
+%config(noreplace) %{_sysconfdir}/%{realname}/dictionary
 %{_bindir}/b2bua_radius.py
 %{_bindir}/b2bua_simple.py
 %if 0%{?fedora} == 10 || 0%{?el5}
@@ -73,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
+- Version 1.0.1
+
+* Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0-0.10.20090429cvs
+- Bump for F12 mass rebuild
+
 * Thu May 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.9.20090429cvs
 - Fixed build for EL-4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 May 2009 16:26:14 -0000	1.2
+++ sources	17 Aug 2009 12:54:01 -0000	1.3
@@ -1 +1 @@
-67043d5bc0c7d232f3b544216c037408  sippy-20090429.tar.bz2
+cc9d530c05ff7e357a1115a191d88205  sippy-1.0.1.tar.gz



From peter at fedoraproject.org  Mon Aug 17 12:55:10 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 17 Aug 2009 12:55:10 +0000 (UTC)
Subject: rpms/python-sippy/EL-4 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-sippy.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090817125510.D6C1211C00E4@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-sippy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2529/EL-4

Modified Files:
	.cvsignore import.log python-sippy.spec sources 
Log Message:
Ver. 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 May 2009 16:27:57 -0000	1.2
+++ .cvsignore	17 Aug 2009 12:55:10 -0000	1.3
@@ -1 +1 @@
-sippy-20090429.tar.bz2
+sippy-1.0.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 May 2009 16:27:57 -0000	1.1
+++ import.log	17 Aug 2009 12:55:10 -0000	1.2
@@ -1 +1,2 @@
 python-sippy-0-0_8_20090429cvs_fc10:EL-4:python-sippy-0-0.8.20090429cvs.fc10.src.rpm:1243528046
+python-sippy-1_0_1-1_fc11:EL-4:python-sippy-1.0.1-1.fc11.src.rpm:1250513660


Index: python-sippy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-4/python-sippy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-sippy.spec	28 May 2009 18:32:44 -0000	1.2
+++ python-sippy.spec	17 Aug 2009 12:55:10 -0000	1.3
@@ -1,21 +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()")}
 
+%define realname sippy
 
-Name:           python-sippy
-Version:        0
-Release:        0.9.20090429cvs%{?dist}
+Name:           python-%{realname}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        B2BUA (back-to-back user agent) SIP call controlling component
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://b2bua.org/
 BuildArch:      noarch
-Provides:       sippy = %{version}-%{release}
-# cvs -z3 -d:pserver:anonymous at cvs.sippy.berlios.de:/cvsroot/sippy export -D 2009-04-29 -d sippy sippy_dist
-# tar -cjvf sippy-20090429.tar.bz2 sippy
-Source0:        sippy-20090429.tar.bz2
+Provides:       %{realname} = %{version}-%{release}
+Source0:        http://b2bua.org/chrome/site/%{realname}-%{version}.tar.gz
 Patch0:         sippy-setup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
+BuildRequires:	python-setuptools-devel
 Requires: python-twisted-core
 # for sippy/Radius_client.py
 Requires: radiusclient-ng-utils
@@ -37,7 +37,7 @@ into the media path.
 
 
 %prep
-%setup -q -n sippy
+%setup -q -n %{realname}-%{version}
 %patch0 -p0 -b .do_not_install_copying
 chmod 644 sippy/Udp_server.py
 
@@ -60,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%dir %{_sysconfdir}/sippy
-%config(noreplace) %{_sysconfdir}/sippy/dictionary
+%dir %{_sysconfdir}/%{realname}
+%config(noreplace) %{_sysconfdir}/%{realname}/dictionary
 %{_bindir}/b2bua_radius.py
 %{_bindir}/b2bua_simple.py
 %if 0%{?fedora} == 10 || 0%{?el5}
@@ -73,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
+- Version 1.0.1
+
+* Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 0-0.10.20090429cvs
+- Bump for F12 mass rebuild
+
 * Thu May 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.9.20090429cvs
 - Fixed build for EL-4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sippy/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 May 2009 16:27:57 -0000	1.2
+++ sources	17 Aug 2009 12:55:10 -0000	1.3
@@ -1 +1 @@
-67043d5bc0c7d232f3b544216c037408  sippy-20090429.tar.bz2
+cc9d530c05ff7e357a1115a191d88205  sippy-1.0.1.tar.gz



From jgranado at fedoraproject.org  Mon Aug 17 12:55:54 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Mon, 17 Aug 2009 12:55:54 +0000 (UTC)
Subject: rpms/firstaidkit/devel .cvsignore, 1.8, 1.9 firstaidkit.spec, 1.28, 
	1.29 sources, 1.11, 1.12
Message-ID: <20090817125554.BC16C11C00E4@cvs1.fedora.phx.redhat.com>

Author: jgranado

Update of /cvs/pkgs/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2698

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Aug 2009 11:57:43 -0000	1.8
+++ .cvsignore	17 Aug 2009 12:55:54 -0000	1.9
@@ -1 +1 @@
-firstaidkit-0.2.4.tar.bz2
+firstaidkit-0.2.5.tar.bz2


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- firstaidkit.spec	4 Aug 2009 11:57:43 -0000	1.28
+++ firstaidkit.spec	17 Aug 2009 12:55:54 -0000	1.29
@@ -3,7 +3,7 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.4
+Version:        0.2.5
 Release:        1%{?dist}
 Summary:        System Rescue Tool
 
@@ -44,6 +44,7 @@ Requires:       %{name}-plugin-grub
 %endif
 Requires:       %{name}-gui
 Requires:       %{name}-plugin-mdadm-conf
+Requires:       %{name}-plugin-key-recovery
 #Requires:       %{name}-plugin-undelete-partitions
 #Requires:       %{name}-plugin-rpm
 
@@ -106,6 +107,15 @@ Requires:       mdadm
 This plugin will assess the validity and existence of the mdadm.conf file.
 The file will get replaced if any inconsistencies are found.
 
+%package plugin-key-recovery
+Group:          Applications/System
+Summary:        Firstaidkit plugin to recover key encryption keys
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-volume_key, python-nss
+
+%description plugin-key-recovery
+This plugin helps recover encryption keys using a previously created escrow
+packet.
 
 #%package plugin-rpm
 #Group:          Applications/System
@@ -170,6 +180,7 @@ desktop-file-install --vendor="fedora" -
 %{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
 %{__cp} -f plugins/grub/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
 %{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
+%{__cp} -f plugins/key_recovery.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
 #%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/undelparts
 #%{__cp} -f plugins/undelparts/{*.py,_undelpart.so} $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/undelparts/
 #%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm
@@ -223,6 +234,9 @@ desktop-file-install --vendor="fedora" -
 %files plugin-mdadm-conf
 %{_libdir}/firstaidkit/plugins/mdadm_conf.py*
 
+%files plugin-key-recovery
+%{_libdir}/firstaidkit/plugins/key_recovery.py*
+
 #%files plugin-undelete-partitions
 #%{_libdir}/firstaidkit/plugins/undelparts/*.py*
 #%{_libdir}/firstaidkit/plugins/undelparts/*.so
@@ -232,6 +246,10 @@ desktop-file-install --vendor="fedora" -
 #%{_libdir}/firstaidkit/plugins/rpm/*
 
 %changelog
+* Mon Aug 17 2009 Joel Granados <jgranado at redhat.com> - 0.2.5-1
+- Update the pyparted API calls.
+- Add the key_recovery plugin.
+
 * Tue Aug 04 2009 Martin Sivak <msivak at redhat.com> - 0.2.4-1
 - Fix temp file generation in firstaidkit-qs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Aug 2009 11:57:43 -0000	1.11
+++ sources	17 Aug 2009 12:55:54 -0000	1.12
@@ -1 +1 @@
-d348cef84d521dfdeae49480391eb824  firstaidkit-0.2.4.tar.bz2
+98b602cb19fa52d73773dd43db4e7d38  firstaidkit-0.2.5.tar.bz2



From itamarjp at fedoraproject.org  Mon Aug 17 13:05:07 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 17 Aug 2009 13:05:07 +0000 (UTC)
Subject: rpms/mydns/devel mydns-start-after-mysql.patch, NONE, 1.1 import.log,
	1.3, 1.4 mydns.spec, 1.5, 1.6
Message-ID: <20090817130507.EC18E11C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/mydns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4008/devel

Modified Files:
	import.log mydns.spec 
Added Files:
	mydns-start-after-mysql.patch 
Log Message:
- make mydns start after mysql


mydns-start-after-mysql.patch:
 mydns.redhat |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mydns-start-after-mysql.patch ---
diff -ruNP a/mydns-1.2.8/contrib/mydns.redhat b/mydns-1.2.8/contrib/mydns.redhat
--- a/mydns-1.2.8/contrib/mydns.redhat	2009-02-02 11:52:34.000000000 -0200
+++ b/mydns-1.2.8/contrib/mydns.redhat	2009-08-17 09:54:57.745180794 -0300
@@ -2,7 +2,7 @@
 #
 # mydns        This starts and stops mydns.
 #
-# chkconfig: - 52 50
+# chkconfig: - 65 35
 # description: A database-driven DNS server
 #
 # processname: /usr/sbin/mydns
@@ -22,7 +22,6 @@
 
 start(){
     echo -n $"Starting $prog: "
-	
     daemon $prog -b
     RETVAL=$?
     echo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Aug 2009 04:01:55 -0000	1.3
+++ import.log	17 Aug 2009 13:05:07 -0000	1.4
@@ -1,3 +1,4 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-1_fc11:HEAD:mydns-1.2.8.27-1.fc11.src.rpm:1243279298
 mydns-1_2_8_27-3_fc12:HEAD:mydns-1.2.8.27-3.fc12.src.rpm:1249358398
+mydns-1_2_8_27-4_fc12:HEAD:mydns-1.2.8.27-4.fc12.src.rpm:1250514152


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/devel/mydns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mydns.spec	4 Aug 2009 04:01:55 -0000	1.5
+++ mydns.spec	17 Aug 2009 13:05:07 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -28,6 +28,7 @@ Requires(preun):   chkconfig
 Requires(preun):   initscripts
 
 Patch0: mydns_user.patch
+Patch1: mydns-start-after-mysql.patch
 
 %description
 A nameserver that serves records directly from your database.
@@ -63,7 +64,7 @@ MyDNS compiled with PostGreSQL support
 %prep
 %setup -q -n %{name}-%{base_version}
 %patch0 -p1
-
+%patch1 -p2
 
 #install doc about alternatives
 install -Dp -m 644 %{SOURCE1} ./HOWTO
@@ -246,6 +247,9 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Mon Aug 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-4
+- make mydns start after mysql
+
 * Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
 - fix spec file for rhel
 



From itamarjp at fedoraproject.org  Mon Aug 17 13:07:10 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 17 Aug 2009 13:07:10 +0000 (UTC)
Subject: rpms/mydns/F-11 mydns-start-after-mysql.patch, NONE, 1.1 import.log,
	1.2, 1.3 mydns.spec, 1.3, 1.4
Message-ID: <20090817130710.985F211C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/mydns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4387/F-11

Modified Files:
	import.log mydns.spec 
Added Files:
	mydns-start-after-mysql.patch 
Log Message:
- make mydns start after mysql


mydns-start-after-mysql.patch:
 mydns.redhat |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mydns-start-after-mysql.patch ---
diff -ruNP a/mydns-1.2.8/contrib/mydns.redhat b/mydns-1.2.8/contrib/mydns.redhat
--- a/mydns-1.2.8/contrib/mydns.redhat	2009-02-02 11:52:34.000000000 -0200
+++ b/mydns-1.2.8/contrib/mydns.redhat	2009-08-17 09:54:57.745180794 -0300
@@ -2,7 +2,7 @@
 #
 # mydns        This starts and stops mydns.
 #
-# chkconfig: - 52 50
+# chkconfig: - 65 35
 # description: A database-driven DNS server
 #
 # processname: /usr/sbin/mydns
@@ -22,7 +22,6 @@
 
 start(){
     echo -n $"Starting $prog: "
-	
     daemon $prog -b
     RETVAL=$?
     echo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	30 Jul 2009 02:06:21 -0000	1.2
+++ import.log	17 Aug 2009 13:07:10 -0000	1.3
@@ -1,2 +1,3 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-2_fc12:F-11:mydns-1.2.8.27-2.fc12.src.rpm:1248919552
+mydns-1_2_8_27-4_fc12:F-11:mydns-1.2.8.27-4.fc12.src.rpm:1250514381


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/F-11/mydns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mydns.spec	30 Jul 2009 02:06:21 -0000	1.3
+++ mydns.spec	17 Aug 2009 13:07:10 -0000	1.4
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -28,6 +28,7 @@ Requires(preun):   chkconfig
 Requires(preun):   initscripts
 
 Patch0: mydns_user.patch
+Patch1: mydns-start-after-mysql.patch
 
 %description
 A nameserver that serves records directly from your database.
@@ -63,10 +64,10 @@ MyDNS compiled with PostGreSQL support
 %prep
 %setup -q -n %{name}-%{base_version}
 %patch0 -p1
-
+%patch1 -p2
 
 #install doc about alternatives
-install -Dp -m 644 %{SOURCE1} .
+install -Dp -m 644 %{SOURCE1} ./HOWTO
 
 # Convert to utf-8
 for file in AUTHORS; do
@@ -246,6 +247,12 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Mon Aug 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-4
+- make mydns start after mysql
+
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
+- fix spec file for rhel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Aug 17 13:07:24 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 17 Aug 2009 13:07:24 +0000 (UTC)
Subject: rpms/ultimatestunts/devel ultimatestunts.spec,1.7,1.8
Message-ID: <20090817130724.0FDB011C00E4@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/ultimatestunts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4542

Modified Files:
	ultimatestunts.spec 
Log Message:
* Mon Aug 17 2009 Dan Hor?k <dan[at]danny.cz> 0.7.5-5
- rebuild with openal-soft



Index: ultimatestunts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ultimatestunts/devel/ultimatestunts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ultimatestunts.spec	27 Jul 2009 06:29:54 -0000	1.7
+++ ultimatestunts.spec	17 Aug 2009 13:07:23 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ultimatestunts
 Version:	0.7.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Remake of the famous DOS-game Stunts
 
 Group:		Amusements/Games
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Dan Hor?k <dan[at]danny.cz> 0.7.5-5
+- rebuild with openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Mon Aug 17 13:08:21 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 17 Aug 2009 13:08:21 +0000 (UTC)
Subject: rpms/mydns/F-10 mydns-start-after-mysql.patch, NONE, 1.1 import.log,
	1.2, 1.3 mydns.spec, 1.2, 1.3
Message-ID: <20090817130821.8FF2111C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/mydns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4761/F-10

Modified Files:
	import.log mydns.spec 
Added Files:
	mydns-start-after-mysql.patch 
Log Message:
- make mydns start after mysql


mydns-start-after-mysql.patch:
 mydns.redhat |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mydns-start-after-mysql.patch ---
diff -ruNP a/mydns-1.2.8/contrib/mydns.redhat b/mydns-1.2.8/contrib/mydns.redhat
--- a/mydns-1.2.8/contrib/mydns.redhat	2009-02-02 11:52:34.000000000 -0200
+++ b/mydns-1.2.8/contrib/mydns.redhat	2009-08-17 09:54:57.745180794 -0300
@@ -2,7 +2,7 @@
 #
 # mydns        This starts and stops mydns.
 #
-# chkconfig: - 52 50
+# chkconfig: - 65 35
 # description: A database-driven DNS server
 #
 # processname: /usr/sbin/mydns
@@ -22,7 +22,6 @@
 
 start(){
     echo -n $"Starting $prog: "
-	
     daemon $prog -b
     RETVAL=$?
     echo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	30 Jul 2009 02:07:18 -0000	1.2
+++ import.log	17 Aug 2009 13:08:21 -0000	1.3
@@ -1,2 +1,3 @@
 mydns-1_2_8_25-1_fc10:F-10:mydns-1.2.8.25-1.fc10.src.rpm:1234440880
 mydns-1_2_8_27-2_fc12:F-10:mydns-1.2.8.27-2.fc12.src.rpm:1248919613
+mydns-1_2_8_27-4_fc12:F-10:mydns-1.2.8.27-4.fc12.src.rpm:1250514465


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/F-10/mydns.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mydns.spec	30 Jul 2009 02:07:18 -0000	1.2
+++ mydns.spec	17 Aug 2009 13:08:21 -0000	1.3
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -28,6 +28,7 @@ Requires(preun):   chkconfig
 Requires(preun):   initscripts
 
 Patch0: mydns_user.patch
+Patch1: mydns-start-after-mysql.patch
 
 %description
 A nameserver that serves records directly from your database.
@@ -63,10 +64,10 @@ MyDNS compiled with PostGreSQL support
 %prep
 %setup -q -n %{name}-%{base_version}
 %patch0 -p1
-
+%patch1 -p2
 
 #install doc about alternatives
-install -Dp -m 644 %{SOURCE1} .
+install -Dp -m 644 %{SOURCE1} ./HOWTO
 
 # Convert to utf-8
 for file in AUTHORS; do
@@ -246,6 +247,12 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Mon Aug 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-4
+- make mydns start after mysql
+
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
+- fix spec file for rhel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From itamarjp at fedoraproject.org  Mon Aug 17 13:09:32 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 17 Aug 2009 13:09:32 +0000 (UTC)
Subject: rpms/mydns/EL-5 mydns-start-after-mysql.patch, NONE, 1.1 import.log,
	1.3, 1.4 mydns.spec, 1.5, 1.6
Message-ID: <20090817130932.00D2D11C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/mydns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5025/EL-5

Modified Files:
	import.log mydns.spec 
Added Files:
	mydns-start-after-mysql.patch 
Log Message:
- make mydns start after mysql


mydns-start-after-mysql.patch:
 mydns.redhat |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mydns-start-after-mysql.patch ---
diff -ruNP a/mydns-1.2.8/contrib/mydns.redhat b/mydns-1.2.8/contrib/mydns.redhat
--- a/mydns-1.2.8/contrib/mydns.redhat	2009-02-02 11:52:34.000000000 -0200
+++ b/mydns-1.2.8/contrib/mydns.redhat	2009-08-17 09:54:57.745180794 -0300
@@ -2,7 +2,7 @@
 #
 # mydns        This starts and stops mydns.
 #
-# chkconfig: - 52 50
+# chkconfig: - 65 35
 # description: A database-driven DNS server
 #
 # processname: /usr/sbin/mydns
@@ -22,7 +22,6 @@
 
 start(){
     echo -n $"Starting $prog: "
-	
     daemon $prog -b
     RETVAL=$?
     echo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Aug 2009 04:04:09 -0000	1.3
+++ import.log	17 Aug 2009 13:09:31 -0000	1.4
@@ -1,3 +1,4 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-1_fc11:HEAD:mydns-1.2.8.27-1.fc11.src.rpm:1243279298
 mydns-1_2_8_27-3_fc12:EL-5:mydns-1.2.8.27-3.fc12.src.rpm:1249358556
+mydns-1_2_8_27-4_fc12:EL-5:mydns-1.2.8.27-4.fc12.src.rpm:1250514531


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-5/mydns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mydns.spec	4 Aug 2009 04:04:10 -0000	1.5
+++ mydns.spec	17 Aug 2009 13:09:31 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -28,6 +28,7 @@ Requires(preun):   chkconfig
 Requires(preun):   initscripts
 
 Patch0: mydns_user.patch
+Patch1: mydns-start-after-mysql.patch
 
 %description
 A nameserver that serves records directly from your database.
@@ -63,7 +64,7 @@ MyDNS compiled with PostGreSQL support
 %prep
 %setup -q -n %{name}-%{base_version}
 %patch0 -p1
-
+%patch1 -p2
 
 #install doc about alternatives
 install -Dp -m 644 %{SOURCE1} ./HOWTO
@@ -246,6 +247,9 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Mon Aug 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-4
+- make mydns start after mysql
+
 * Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
 - fix spec file for rhel
 



From ovasik at fedoraproject.org  Mon Aug 17 13:10:44 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 17 Aug 2009 13:10:44 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.63,1.64
Message-ID: <20090817131044.8106611C04D1@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5311

Modified Files:
	filesystem.spec 
Log Message:
adjust directory rights for usage of capabilities(#517575)


Index: filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- filesystem.spec	10 Aug 2009 13:55:46 -0000	1.63
+++ filesystem.spec	17 Aug 2009 13:10:44 -0000	1.64
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.29
+Version: 2.4.30
 Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
@@ -107,16 +107,16 @@ done
 rm -rf %{buildroot}
 
 %files -f filelist
-%defattr(0755,root,root)
-%dir /
-/bin
-/boot
+%defattr(0755,root,root,-)
+%dir %attr(555,root,root) /
+%attr(555,root,root) /bin
+%attr(555,root,root) /boot
 /dev
 /etc
 /home
-/lib
+%attr(555,root,root) /lib
 %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
-/%{_lib}
+%attr(555,root,root) /%{_lib}
 %endif
 /media
 %dir /mnt
@@ -124,15 +124,24 @@ rm -rf %{buildroot}
 %ghost %config(missingok) %verify(not size md5 mode user link rdev group mtime) /mnt/floppy
 %dir /opt
 %attr(555,root,root) /proc
-%attr(750,root,root) /root
-/sbin
+%attr(550,root,root) /root
+%attr(555,root,root) /sbin
 /selinux
 /srv
 /sys
 %attr(1777,root,root) /tmp
 %dir /usr
-/usr/[^s]*
-/usr/sbin
+%attr(555,root,root) /usr/bin
+/usr/etc
+/usr/games
+/usr/include
+%attr(555,root,root) /usr/lib
+%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
+%attr(555,root,root) /usr/%{_lib}
+%endif
+/usr/libexec
+/usr/local
+%attr(555,root,root) /usr/sbin
 %dir /usr/share
 /usr/share/applications
 /usr/share/augeas
@@ -158,6 +167,7 @@ rm -rf %{buildroot}
 /usr/share/xsessions
 /usr/share/X11
 /usr/src
+/usr/tmp
 %dir /var
 /var/db
 /var/games
@@ -180,6 +190,9 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Mon Aug 17 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.30-1
+- adjust directory rights for usage of capabilities(#517575)
+
 * Mon Aug 10 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.29-1
 - iso_codes package no longer provides tab files, do generate
   them on fly with sed (thanks D. Tardon)



From itamarjp at fedoraproject.org  Mon Aug 17 13:11:20 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 17 Aug 2009 13:11:20 +0000 (UTC)
Subject: rpms/mydns/EL-4 mydns-start-after-mysql.patch, NONE, 1.1 import.log,
	1.3, 1.4 mydns.spec, 1.5, 1.6
Message-ID: <20090817131120.42C0611C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/mydns/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5443/EL-4

Modified Files:
	import.log mydns.spec 
Added Files:
	mydns-start-after-mysql.patch 
Log Message:
- make mydns start after mysql


mydns-start-after-mysql.patch:
 mydns.redhat |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mydns-start-after-mysql.patch ---
diff -ruNP a/mydns-1.2.8/contrib/mydns.redhat b/mydns-1.2.8/contrib/mydns.redhat
--- a/mydns-1.2.8/contrib/mydns.redhat	2009-02-02 11:52:34.000000000 -0200
+++ b/mydns-1.2.8/contrib/mydns.redhat	2009-08-17 09:54:57.745180794 -0300
@@ -2,7 +2,7 @@
 #
 # mydns        This starts and stops mydns.
 #
-# chkconfig: - 52 50
+# chkconfig: - 65 35
 # description: A database-driven DNS server
 #
 # processname: /usr/sbin/mydns
@@ -22,7 +22,6 @@
 
 start(){
     echo -n $"Starting $prog: "
-	
     daemon $prog -b
     RETVAL=$?
     echo


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Aug 2009 04:05:43 -0000	1.3
+++ import.log	17 Aug 2009 13:11:20 -0000	1.4
@@ -1,3 +1,4 @@
 mydns-1_2_8_25-1_fc10:HEAD:mydns-1.2.8.25-1.fc10.src.rpm:1234440512
 mydns-1_2_8_27-1_fc11:HEAD:mydns-1.2.8.27-1.fc11.src.rpm:1243279298
 mydns-1_2_8_27-3_fc12:EL-4:mydns-1.2.8.27-3.fc12.src.rpm:1249358676
+mydns-1_2_8_27-4_fc12:EL-4:mydns-1.2.8.27-4.fc12.src.rpm:1250514604


Index: mydns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mydns/EL-4/mydns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mydns.spec	4 Aug 2009 04:05:43 -0000	1.5
+++ mydns.spec	17 Aug 2009 13:11:20 -0000	1.6
@@ -6,7 +6,7 @@
 Summary: A Database based DNS server
 Name: mydns
 Version: 1.2.8.27
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mydns-ng.com/
@@ -28,6 +28,7 @@ Requires(preun):   chkconfig
 Requires(preun):   initscripts
 
 Patch0: mydns_user.patch
+Patch1: mydns-start-after-mysql.patch
 
 %description
 A nameserver that serves records directly from your database.
@@ -63,7 +64,7 @@ MyDNS compiled with PostGreSQL support
 %prep
 %setup -q -n %{name}-%{base_version}
 %patch0 -p1
-
+%patch1 -p2
 
 #install doc about alternatives
 install -Dp -m 644 %{SOURCE1} ./HOWTO
@@ -246,6 +247,9 @@ exit 0
 %{_sbindir}/mydns-pgsql
 
 %changelog
+* Mon Aug 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-4
+- make mydns start after mysql
+
 * Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.8.27-3
 - fix spec file for rhel
 



From jwilson at fedoraproject.org  Mon Aug 17 13:15:51 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 17 Aug 2009 13:15:51 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1679.2.8,
	1.1679.2.9 linux-2.6.29-lirc.patch, 1.10.2.1, 1.10.2.2
Message-ID: <20090817131551.5093711C00E4@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6137

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec linux-2.6.29-lirc.patch 
Log Message:
* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9
- Fix flub in prior lirc patch update that resulted in no lirc
  drivers getting built



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.8
retrieving revision 1.1679.2.9
diff -u -p -r1.1679.2.8 -r1.1679.2.9
--- kernel.spec	15 Aug 2009 04:33:06 -0000	1.1679.2.8
+++ kernel.spec	17 Aug 2009 13:15:50 -0000	1.1679.2.9
@@ -2144,6 +2144,10 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9
+- Fix flub in prior lirc patch update that resulted in no lirc
+  drivers getting built
+
 * Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.8
 - CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.
 

linux-2.6.29-lirc.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  112 +
 drivers/input/lirc/Makefile           |   20 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_i2c.c         |  649 +++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2297 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 24 files changed, 14844 insertions(+)

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-lirc.patch,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -p -r1.10.2.1 -r1.10.2.2
--- linux-2.6.29-lirc.patch	10 Aug 2009 18:32:32 -0000	1.10.2.1
+++ linux-2.6.29-lirc.patch	17 Aug 2009 13:15:50 -0000	1.10.2.2
@@ -2,11 +2,14 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
-Refreshed 20090910
+Refreshed 20090917
 
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
+ MAINTAINERS                           |    9 +
+ drivers/input/Kconfig                 |    2 +
+ drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  112 ++
  drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
@@ -15,7 +18,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_dev.h         |  184 +++
  drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2297 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
@@ -28,8 +31,51 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
- 21 files changed, 14832 insertions(+), 0 deletions(-)
+ 24 files changed, 14844 insertions(+), 0 deletions(-)
 
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 59fd2d1..ad1b16c 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -2749,6 +2749,15 @@ W:	http://www.pasemi.com/
+ L:	linuxppc-dev at ozlabs.org
+ S:	Supported
+ 
++LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
++P:	Jarod Wilson
++M:	jarod at redhat.com
++P:	Christoph Bartelmus
++M:	lirc at bartelmus.de
++W:	http://www.lirc.org/
++L:	lirc-list at lists.sourceforge.net
++S:	Maintained
++
+ LINUX SECURITY MODULE (LSM) FRAMEWORK
+ P:	Chris Wright
+ M:	chrisw at sous-sol.org
+diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
+index 5f9d860..2ba0904 100644
+--- a/drivers/input/Kconfig
++++ b/drivers/input/Kconfig
+@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
+ 
+ source "drivers/input/touchscreen/Kconfig"
+ 
++source "drivers/input/lirc/Kconfig"
++
+ source "drivers/input/misc/Kconfig"
+ 
+ endif
+diff --git a/drivers/input/Makefile b/drivers/input/Makefile
+index 4c9c745..99e2b5e 100644
+--- a/drivers/input/Makefile
++++ b/drivers/input/Makefile
+@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
+ obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
+ 
+ obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
++
++obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
 index 0000000..6ef8622
@@ -2935,10 +2981,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..3c87d94
+index 0000000..05fe0c7
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2298 @@
+@@ -0,0 +1,2297 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -3339,8 +3385,7 @@ index 0000000..3c87d94
 +		 "open. 0=don't disable, 1=disable. (default: don't disable)");
 +module_param(pad_thresh, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(pad_thresh, "Threshold at which a pad push registers as an "
-+		 "arrow key in kbd mode (default 80 on newer devices, 15 on "
-+		 "older devices)");
++		 "arrow key in kbd mode (default: 28)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -4354,7 +4399,7 @@ index 0000000..3c87d94
 +		len = 8;
 +		timeout = 500;	/* in msecs */
 +		/* (2*threshold) x (2*threshold) square */
-+		threshold = pad_thresh ? pad_thresh : 80;
++		threshold = pad_thresh ? pad_thresh : 28;
 +		rel_x = buf[2];
 +		rel_y = buf[3];
 +



From steved at fedoraproject.org  Mon Aug 17 13:21:50 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 13:21:50 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.1-rc4.patch, NONE,
	1.1 nfs-utils-1.2.0-proots-rel5.patch, 1.1, 1.2 nfs-utils.spec,
	1.239, 1.240
Message-ID: <20090817132150.5651B11C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8320

Modified Files:
	nfs-utils-1.2.0-proots-rel5.patch nfs-utils.spec 
Added Files:
	nfs-utils-1.2.1-rc4.patch 
Log Message:
- Added upstream 1.2.1-rc4 patch
  - Fix bug when both crossmnt
  - nfs(5): Add description of lookupcache mount option
  - nfs(5): Remove trailing blanks
  - Added nfs41 support to nfssat
  - Added support for mount to us a configuration file.


nfs-utils-1.2.1-rc4.patch:
 b/configure.ac                  |   25 +
 b/support/include/Makefile.am   |    3 
 b/support/include/conffile.h    |   77 +++
 b/support/nfs/Makefile.am       |    2 
 b/support/nfs/conffile.c        |  962 ++++++++++++++++++++++++++++++++++++++++
 b/utils/idmapd/Makefile.am      |    1 
 b/utils/idmapd/idmapd.c         |    4 
 b/utils/mount/Makefile.am       |    9 
 b/utils/mount/configfile.c      |  320 +++++++++++++
 b/utils/mount/mount.c           |    7 
 b/utils/mount/mount_config.h    |   48 +
 b/utils/mount/nfs.man           |  364 +++++++++------
 b/utils/mount/nfsmount.conf     |  120 ++++
 b/utils/mount/nfsmount.conf.man |   87 +++
 b/utils/mountd/cache.c          |   14 
 b/utils/nfsstat/nfsstat.c       |   46 +
 utils/idmapd/cfg.c              |  893 -------------------------------------
 utils/idmapd/cfg.h              |   67 --
 18 files changed, 1938 insertions(+), 1111 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc4.patch ---
diff --git a/configure.ac b/configure.ac
index e0ca70e..1b653e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,31 @@ AC_ARG_ENABLE(ipv6,
 	AC_SUBST(enable_ipv6)
 	AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"])
 
+if test "$enable_mount" = yes; then
+	AC_ARG_ENABLE(mountconfig,
+	[AC_HELP_STRING([--enable-mountconfig],
+                        [enable mount to use a configuration file])],
+	mountconfig=$enableval,
+	mountconfig=no)
+	if test "$enable_mountconfig" = yes; then
+		AC_DEFINE(MOUNT_CONFIG, 1, 
+			[Define this if you want mount to read a configuration file])
+		AC_ARG_WITH(mountfile,
+			[AC_HELP_STRING([--with-mountfile=filename],
+			[Using filename as the NFS mount options file [/etc/nfsmounts.conf]]
+			)],
+		mountfile=$withval,
+		mountfile=/etc/nfsmount.conf)
+		AC_SUBST(mountfile)
+		AC_DEFINE_UNQUOTED(MOUNTOPTS_CONFFILE, "$mountfile", 
+			[This defines the location of the NFS mount configuration file])
+	else
+		enable_mountconfig=
+	fi
+	AC_SUBST(enable_mountconfig)
+	AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mountconfig" = "yes"])
+fi
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC
 
diff --git a/support/include/Makefile.am b/support/include/Makefile.am
index 718abda..f5a77ec 100644
--- a/support/include/Makefile.am
+++ b/support/include/Makefile.am
@@ -14,6 +14,7 @@ noinst_HEADERS = \
 	xio.h \
 	xlog.h \
 	xmalloc.h \
-	xcommon.h
+	xcommon.h \
+	conffile.h
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/support/include/conffile.h b/support/include/conffile.h
new file mode 100644
index 0000000..132a149
--- /dev/null
+++ b/support/include/conffile.h
@@ -0,0 +1,77 @@
+/* $OpenBSD: conf.h,v 1.30 2004/06/25 20:25:34 hshoexer Exp $	 */
+/* $EOM: conf.h,v 1.13 2000/09/18 00:01:47 ho Exp $	 */
+
+/*
+ * Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000, 2003 H?kan Olsson.  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.
+ */
+
+/*
+ * This code was written under funding by Ericsson Radio Systems.
+ */
+
+#ifndef _CONFFILE_H_
+#define _CONFFILE_H_
+
+#include <sys/queue.h>
+
+struct conf_list_node {
+	TAILQ_ENTRY(conf_list_node) link;
+	char	*field;
+};
+
+struct conf_list {
+	size_t	cnt;
+	TAILQ_HEAD(conf_list_fields_head, conf_list_node) fields;
+};
+
+extern char    *conf_path;
+
+extern int      conf_begin(void);
+extern int      conf_decode_base64(u_int8_t *, u_int32_t *, u_char *);
+extern int      conf_end(int, int);
+extern void     conf_free_list(struct conf_list *);
+extern struct sockaddr *conf_get_address(char *, char *);
+extern struct conf_list *conf_get_list(char *, char *);
+extern struct conf_list *conf_get_tag_list(char *);
+extern int      conf_get_num(char *, char *, int);
+extern char    *conf_get_str(char *, char *);
+extern char    *conf_get_section(char *, char *, char *);
+extern void     conf_init(void);
+extern int      conf_match_num(char *, char *, int);
+extern void     conf_reinit(void);
+extern int      conf_remove(int, char *, char *);
+extern int      conf_remove_section(int, char *);
+extern void     conf_report(void);
+
+/*
+ * Convert letter from upper case to lower case
+ */
+static inline void upper2lower(char *str)
+{
+	char c;
+
+	while ((c = tolower(*str)))
+		*str++ = c;
+}
+#endif				/* _CONFFILE_H_ */
diff --git a/support/nfs/Makefile.am b/support/nfs/Makefile.am
index 096f56d..e9462fc 100644
--- a/support/nfs/Makefile.am
+++ b/support/nfs/Makefile.am
@@ -4,7 +4,7 @@ noinst_LIBRARIES = libnfs.a
 libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
 		   xlog.c xcommon.c wildmat.c nfsclient.c \
 		   nfsexport.c getfh.c nfsctl.c rpc_socket.c getport.c \
-		   svc_socket.c cacheio.c closeall.c nfs_mntent.c
+		   svc_socket.c cacheio.c closeall.c nfs_mntent.c conffile.c
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
new file mode 100644
index 0000000..b277c2a
--- /dev/null
+++ b/support/nfs/conffile.c
@@ -0,0 +1,962 @@
+/*	$OpenBSD: conf.c,v 1.55 2003/06/03 14:28:16 ho Exp $	*/
+/*	$EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $	*/
+
+/*
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000, 2001, 2002 H?kan Olsson.  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.
+ */
+
+/*
+ * This code was written under funding by Ericsson Radio Systems.
+ */
+
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <err.h>
+#include <syslog.h>
+
[...3202 lines suppressed...]
+The configuration file is made up of multiple sections 
+followed by variables associated with that section.
+A section is defined by a string enclosed by 
+.BR [
+and 
+.BR ]
+branches.
+Variables are assignment statements that assign values 
+to particular variables using the  
+.BR = 
+operator, as in 
+.BR Proto=Tcp .
+Sections are broken up into three basic categories:
+Global options, Server options and Mount Point options.
+.HP
+.B [ NFSMount_Global_Options ]
+- This statically named section
+defines all of the global mount options that can be 
+applied to every NFS mount.
+.HP
+.B [ Server \(lqServer_Name\(rq ] 
+- This section defines all the mount options that should 
+be used on mounts to a particular NFS server. The 
+.I \(lqServer_Name\(rq
+strings needs to be surrounded by '\(lq' and 
+be an exact match of the server name used in the 
+.B mount
+command. 
+.HP
+.B [ MountPoint \(lqMount_Point\(rq ]
+- This section defines all the mount options that 
+should be used on a particular mount point.
+The 
+.I \(lqMount_Point\(rq
+string needs to be surrounded by '\(lq' and be an 
+exact match of the mount point used in the 
+.BR mount 
+command.
+.SH EXAMPLES
+.PP
+These are some example lines of how sections and variables
+are defined in the configuration file.
+.PP
+[ NFSMount_Global_Options ]
+.br
+    Proto=Tcp
+.RS
+.HP
+The TCP protocol will be used on every NFS mount.
+.HP
+.RE
+[ Server \(lqnfsserver.foo.com\(rq ]
+.br
+    rsize=32k
+.br
+    wsize=32k
+.HP
+.RS
+A 33k (32768 bytes) block size will be used as the read and write
+size on all mounts to the 'nfsserver.foo.com' server.
+.HP
+.RE
+.BR 
+[ MountPoint \(lq/export/home\(rq ]
+.br
+    Background=True
+.RS
+.HP
+All mounts to the '/export/home' export will be performed in
+the background (i.e. done asynchronously).
+.HP
+.SH FILES
+.TP 10n
+.I /etc/nfsmount.conf
+Default NFS mount configuration file
+.PD
+.SH SEE ALSO
+.BR nfs (5),
+.BR mount (8),
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 9bbbfb3..e4e2f22 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -564,7 +564,7 @@ static void write_fsloc(FILE *f, struct exportent *ep, char *path)
 	release_replicas(servers);
 }
 
-static void write_secinfo(FILE *f, struct exportent *ep)
+static void write_secinfo(FILE *f, struct exportent *ep, int flag_mask)
 {
 	struct sec_entry *p;
 
@@ -578,7 +578,7 @@ static void write_secinfo(FILE *f, struct exportent *ep)
 	qword_printint(f, p - ep->e_secinfo);
 	for (p = ep->e_secinfo; p->flav; p++) {
 		qword_printint(f, p->flav->fnum);
-		qword_printint(f, p->flags);
+		qword_printint(f, p->flags & flag_mask);
 	}
 
 }
@@ -590,16 +590,14 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
 	qword_printint(f, time(0)+30*60);
 	if (exp) {
 		int different_fs = strcmp(path, exp->e_path) != 0;
-		
-		if (different_fs)
-			qword_printint(f, exp->e_flags & ~NFSEXP_FSID);
-		else
-			qword_printint(f, exp->e_flags);
+		int flag_mask = different_fs ? ~NFSEXP_FSID : ~0;
+
+		qword_printint(f, exp->e_flags & flag_mask);
 		qword_printint(f, exp->e_anonuid);
 		qword_printint(f, exp->e_anongid);
 		qword_printint(f, exp->e_fsid);
 		write_fsloc(f, exp, path);
-		write_secinfo(f, exp);
+		write_secinfo(f, exp, flag_mask);
  		if (exp->e_uuid == NULL || different_fs) {
  			char u[16];
  			if (get_uuid(path, NULL, 16, u)) {
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c
index 7e9f327..fa46d5d 100644
--- a/utils/nfsstat/nfsstat.c
+++ b/utils/nfsstat/nfsstat.c
@@ -30,8 +30,8 @@ static unsigned int	cltproc2info[20], cltproc2info_old[20];	/* NFSv2 call counts
 static unsigned int	srvproc3info[24], srvproc3info_old[24];	/* NFSv3 call counts ([0] == 22) */
 static unsigned int	cltproc3info[24], cltproc3info_old[24];	/* NFSv3 call counts ([0] == 22) */
 static unsigned int	srvproc4info[4], srvproc4info_old[4];	/* NFSv4 call counts ([0] == 2) */
-static unsigned int	cltproc4info[37], cltproc4info_old[37];	/* NFSv4 call counts ([0] == 35) */
-static unsigned int	srvproc4opsinfo[42], srvproc4opsinfo_old[42];	/* NFSv4 call counts ([0] == 40) */
+static unsigned int	cltproc4info[49], cltproc4info_old[49];	/* NFSv4 call counts ([0] == 35) */
+static unsigned int	srvproc4opsinfo[61], srvproc4opsinfo_old[61];	/* NFSv4 call counts ([0] == 40) */
 static unsigned int	srvnetinfo[5], srvnetinfo_old[5];	/* 0  # of received packets
 								 * 1  UDP packets
 								 * 2  TCP packets
@@ -93,24 +93,58 @@ static const char *	nfssrvproc4name[2] = {
 	"compound",
 };
 
-static const char *	nfscltproc4name[35] = {
+static const char *	nfscltproc4name[47] = {
 	"null",      "read",      "write",   "commit",      "open",        "open_conf",
 	"open_noat", "open_dgrd", "close",   "setattr",     "fsinfo",      "renew",
 	"setclntid", "confirm",   "lock",
 	"lockt",     "locku",     "access",  "getattr",     "lookup",      "lookup_root",
 	"remove",    "rename",    "link",    "symlink",     "create",      "pathconf",
 	"statfs",    "readlink",  "readdir", "server_caps", "delegreturn", "getacl",
-	"setacl",    "fs_locations"
+	"setacl",    "fs_locations",
+	/* nfsv4.1 client ops */
+	"exchange_id",
+	"create_ses",
+	"destroy_ses",
+	"sequence",
+	"get_lease_t",
+	"layoutget",
+	"layoutcommit",
+	"layoutreturn",
+	"getdevlist",
+	"getdevinfo",
+	/* nfsv4.1 pnfs client ops to data server only */
+	"ds_write",
+	"ds_commit",
 };
 
-static const char *     nfssrvproc4opname[40] = {
+static const char *     nfssrvproc4opname[59] = {
         "op0-unused",   "op1-unused", "op2-future",  "access",     "close",       "commit",
         "create",       "delegpurge", "delegreturn", "getattr",    "getfh",       "link",
         "lock",         "lockt",      "locku",       "lookup",     "lookup_root", "nverify",
         "open",         "openattr",   "open_conf",   "open_dgrd",  "putfh",       "putpubfh",
         "putrootfh",    "read",       "readdir",     "readlink",   "remove",      "rename",
         "renew",        "restorefh",  "savefh",      "secinfo",    "setattr",     "setcltid",
-        "setcltidconf", "verify",     "write",       "rellockowner"
+        "setcltidconf", "verify",     "write",       "rellockowner",
+	/* nfsv4.1 server ops */
+	"bc_ctl",
+	"bind_conn",
+	"exchange_id",
+	"create_ses",
+	"destroy_ses",
+	"free_stateid",
+	"getdirdeleg",
+	"getdevinfo",
+	"getdevlist",
+	"layoutcommit",
+	"layoutget",
+	"layoutreturn",
+	"secinfononam",
+	"sequence",
+	"set_ssv",
+	"test_stateid",
+	"want_deleg",
+	"destroy_clid",
+	"reclaim_comp",
 };
 
 #define LABEL_srvnet		"Server packet stats:\n"

nfs-utils-1.2.0-proots-rel5.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        |  409 +++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 506 insertions(+), 19 deletions(-)

Index: nfs-utils-1.2.0-proots-rel5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.2.0-proots-rel5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-proots-rel5.patch	13 Jul 2009 18:04:54 -0000	1.1
+++ nfs-utils-1.2.0-proots-rel5.patch	17 Aug 2009 13:21:49 -0000	1.2
@@ -1,6 +1,6 @@
-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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/support/export/xtab.c	2009-07-13 13:50:38.000000000 -0400
+diff -up nfs-utils-1.2.0/support/export/xtab.c.orig nfs-utils-1.2.0/support/export/xtab.c
+--- nfs-utils-1.2.0/support/export/xtab.c.orig	2009-06-02 10:43:05.000000000 -0400
++++ nfs-utils-1.2.0/support/export/xtab.c	2009-08-17 07:33:13.000000000 -0400
 @@ -19,7 +19,9 @@
  #include "exportfs.h"
  #include "xio.h"
@@ -29,9 +29,9 @@ diff -up nfs-utils-1.2.0/support/export/
  			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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/support/include/exportfs.h	2009-07-13 13:49:51.000000000 -0400
+diff -up nfs-utils-1.2.0/support/include/exportfs.h.orig nfs-utils-1.2.0/support/include/exportfs.h
+--- nfs-utils-1.2.0/support/include/exportfs.h.orig	2009-06-02 10:43:05.000000000 -0400
++++ nfs-utils-1.2.0/support/include/exportfs.h	2009-08-17 07:33:13.000000000 -0400
 @@ -12,6 +12,17 @@
  #include <netdb.h>
  #include "nfslib.h"
@@ -50,9 +50,9 @@ diff -up nfs-utils-1.2.0/support/include
  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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/support/include/nfs/export.h	2009-07-13 13:49:51.000000000 -0400
+diff -up nfs-utils-1.2.0/support/include/nfs/export.h.orig nfs-utils-1.2.0/support/include/nfs/export.h
+--- nfs-utils-1.2.0/support/include/nfs/export.h.orig	2009-06-02 10:43:05.000000000 -0400
++++ nfs-utils-1.2.0/support/include/nfs/export.h	2009-08-17 07:33:13.000000000 -0400
 @@ -24,6 +24,7 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
@@ -62,9 +62,9 @@ diff -up nfs-utils-1.2.0/support/include
 +#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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/support/include/nfslib.h	2009-07-13 13:49:51.000000000 -0400
+diff -up nfs-utils-1.2.0/support/include/nfslib.h.orig nfs-utils-1.2.0/support/include/nfslib.h
+--- nfs-utils-1.2.0/support/include/nfslib.h.orig	2009-08-17 07:31:52.000000000 -0400
++++ nfs-utils-1.2.0/support/include/nfslib.h	2009-08-17 07:33:13.000000000 -0400
 @@ -88,6 +88,7 @@ struct exportent {
  	int             e_fslocmethod;
  	char *          e_fslocdata;
@@ -74,8 +74,8 @@ diff -up nfs-utils-1.2.0/support/include
  };
  
 diff -up /dev/null nfs-utils-1.2.0/support/include/v4root.h
---- /dev/null	2009-07-13 07:44:43.606003629 -0400
-+++ nfs-utils-1.2.0/support/include/v4root.h	2009-07-13 13:49:57.000000000 -0400
+--- /dev/null	2009-08-13 17:25:29.612003011 -0400
++++ nfs-utils-1.2.0/support/include/v4root.h	2009-08-17 07:33:13.000000000 -0400
 @@ -0,0 +1,20 @@
 +/*
 + * Copyright (C) 2009 Red Hat <nfs at redhat.com>
@@ -97,9 +97,9 @@ diff -up /dev/null nfs-utils-1.2.0/suppo
 +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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mountd/auth.c	2009-07-13 13:50:38.000000000 -0400
+diff -up nfs-utils-1.2.0/utils/mountd/auth.c.orig nfs-utils-1.2.0/utils/mountd/auth.c
+--- nfs-utils-1.2.0/utils/mountd/auth.c.orig	2009-06-02 10:43:05.000000000 -0400
++++ nfs-utils-1.2.0/utils/mountd/auth.c	2009-08-17 07:33:13.000000000 -0400
 @@ -20,6 +20,7 @@
  #include "exportfs.h"
  #include "mountd.h"
@@ -122,9 +122,9 @@ diff -up nfs-utils-1.2.0/utils/mountd/au
  	++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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mountd/cache.c	2009-07-13 13:50:33.000000000 -0400
+diff -up nfs-utils-1.2.0/utils/mountd/cache.c.orig nfs-utils-1.2.0/utils/mountd/cache.c
+--- nfs-utils-1.2.0/utils/mountd/cache.c.orig	2009-08-17 07:31:52.000000000 -0400
++++ nfs-utils-1.2.0/utils/mountd/cache.c	2009-08-17 07:33:13.000000000 -0400
 @@ -32,23 +32,12 @@
  #include "xmalloc.h"
  #include "fsloc.h"
@@ -196,16 +196,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/ca
  	if (found)
  		if (cache_export_ent(dom, found, found_path) < 0)
  			found = 0;
-@@ -590,7 +603,7 @@ static int dump_to_cache(FILE *f, char *
- 	qword_printint(f, time(0)+30*60);
- 	if (exp) {
- 		int different_fs = strcmp(path, exp->e_path) != 0;
--		
-+
- 		if (different_fs)
- 			qword_printint(f, exp->e_flags & ~NFSEXP_FSID);
- 		else
-@@ -631,6 +644,7 @@ void nfsd_export(FILE *f)
+@@ -629,6 +642,7 @@ void nfsd_export(FILE *f)
  	int found_type = 0;
  	struct in_addr addr;
  	struct hostent *he = NULL;
@@ -213,7 +204,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/ca
  
  
  	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
-@@ -665,10 +679,18 @@ void nfsd_export(FILE *f)
+@@ -663,10 +677,18 @@ void nfsd_export(FILE *f)
  				     path[l] == '/' &&
  				     is_mountpoint(path)))
  					/* ok */;
@@ -234,7 +225,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/ca
  			if (use_ipaddr) {
  				if (he == NULL) {
  					if (!inet_aton(dom, &addr))
-@@ -707,17 +729,28 @@ void nfsd_export(FILE *f)
+@@ -705,17 +727,28 @@ void nfsd_export(FILE *f)
  	}
  
  	if (found) {
@@ -265,7 +256,7 @@ diff -up nfs-utils-1.2.0/utils/mountd/ca
  	if (dom) free(dom);
  	if (path) free(path);
  	if (he) free(he);
-@@ -745,7 +778,9 @@ void cache_open(void) 
+@@ -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);
@@ -276,9 +267,9 @@ diff -up nfs-utils-1.2.0/utils/mountd/ca
  	}
  }
  
-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-07-13 13:49:23.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mountd/Makefile.am	2009-07-13 13:49:57.000000000 -0400
+diff -up nfs-utils-1.2.0/utils/mountd/Makefile.am.orig nfs-utils-1.2.0/utils/mountd/Makefile.am
+--- nfs-utils-1.2.0/utils/mountd/Makefile.am.orig	2009-06-02 10:43:05.000000000 -0400
++++ nfs-utils-1.2.0/utils/mountd/Makefile.am	2009-08-17 07:33:13.000000000 -0400
 @@ -8,7 +8,7 @@ KPREFIX		= @kprefix@
  sbin_PROGRAMS	= mountd
  
@@ -289,8 +280,8 @@ diff -up nfs-utils-1.2.0/utils/mountd/Ma
  	       ../../support/nfs/libnfs.a \
  	       ../../support/misc/libmisc.a \
 diff -up /dev/null nfs-utils-1.2.0/utils/mountd/v4root.c
---- /dev/null	2009-07-13 07:44:43.606003629 -0400
-+++ nfs-utils-1.2.0/utils/mountd/v4root.c	2009-07-13 13:50:44.000000000 -0400
+--- /dev/null	2009-08-13 17:25:29.612003011 -0400
++++ nfs-utils-1.2.0/utils/mountd/v4root.c	2009-08-17 07:33:13.000000000 -0400
 @@ -0,0 +1,409 @@
 +/*
 + * Copyright (C) 2009 Red Hat <nfs at redhat.com>


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- nfs-utils.spec	16 Aug 2009 20:03:23 -0000	1.239
+++ nfs-utils.spec	17 Aug 2009 13:21:50 -0000	1.240
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -24,8 +24,10 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 
 Patch100: nfs-utils-1.2.1-rc1.patch
 Patch101: nfs-utils-1.2.1-rc2.patch
-Patch102: nfs-utils-1.2.0-proots-rel5.patch
-Patch103: nfs-utils-1.2.1-rc3.patch
+Patch102: nfs-utils-1.2.1-rc3.patch
+Patch103: nfs-utils-1.2.1-rc4.patch
+
+Patch200: nfs-utils-1.2.0-proots-rel5.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -82,6 +84,8 @@ This package also contains the mount.nfs
 %patch102 -p1
 %patch103 -p1
 
+%patch200 -p1
+
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -101,7 +105,8 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_F
     CFLAGS="$CFLAGS" \
     CPPFLAGS="$DEFINES" \
     LDFLAGS="-pie" \
-    --enable-mount
+    --enable-mount \
+    --enable-mountconfig
 
 make all
 
@@ -118,6 +123,7 @@ install -m 755 %{SOURCE12} $RPM_BUILD_RO
 install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd
 install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd
 install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/nfs
+install -m 644 utils/mount/nfsmount.conf  $RPM_BUILD_ROOT/etc
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
 
@@ -215,6 +221,7 @@ fi
 %config /etc/rc.d/init.d/rpcgssd
 %config /etc/rc.d/init.d/rpcsvcgssd
 %config(noreplace) /etc/sysconfig/nfs
+%config(noreplace) /etc/nfsmount.conf
 %dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
 %dir /var/lib/nfs
@@ -249,6 +256,14 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Aug 17 2009 Steve Dickson <steved at redhat.com> 1.2.0-10
+- Added upstream 1.2.1-rc4 patch
+  - Fix bug when both crossmnt
+  - nfs(5): Add description of lookupcache mount option
+  - nfs(5): Remove trailing blanks
+  - Added nfs41 support to nfssat
+  - Added support for mount to us a configuration file.
+
 * Fri Aug 14 2009 Steve Dickson <steved at redhat.com> 1.2.0-9
 - Added upstream 1.2.1-rc3 patch
   - Add IPv6 support to nfsd



From hadess at fedoraproject.org  Mon Aug 17 13:33:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 17 Aug 2009 13:33:46 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore, 1.13, 1.14 obexd.spec, 1.14,
	1.15 sources, 1.13, 1.14
Message-ID: <20090817133346.C5C8111C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11463

Modified Files:
	.cvsignore obexd.spec sources 
Log Message:
* Mon Aug 17 2009 Bastien Nocera <bnocera at redhat.com> 0.16-1
- Update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Aug 2009 19:18:03 -0000	1.13
+++ .cvsignore	17 Aug 2009 13:33:46 -0000	1.14
@@ -1 +1 @@
-obexd-0.15.tar.bz2
+obexd.spec


Index: obexd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/obexd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- obexd.spec	12 Aug 2009 19:18:03 -0000	1.14
+++ obexd.spec	17 Aug 2009 13:33:46 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		obexd
-Version:	0.15
-Release:	3%{?dist}
+Version:	0.16
+Release:	1%{?dist}
 Summary:	D-Bus service for Obex Client access
 
 Group:		System Environment/Daemons
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/obex-client.service
 
 %changelog
+* Mon Aug 17 2009 Bastien Nocera <bnocera at redhat.com> 0.16-1
+- Update to 0.16
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.15-3
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Aug 2009 19:18:04 -0000	1.13
+++ sources	17 Aug 2009 13:33:46 -0000	1.14
@@ -1 +1 @@
-4b3687548b84fa64dfe3114b41fe3c47  obexd-0.15.tar.bz2
+e40e8bf79fd5d0be84c833a4b1ff4d3e  obexd.spec



From hadess at fedoraproject.org  Mon Aug 17 13:37:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 17 Aug 2009 13:37:18 +0000 (UTC)
Subject: rpms/obexd/devel .cvsignore,1.14,1.15 sources,1.14,1.15
Message-ID: <20090817133718.8AB9411C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obexd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12285

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Aug 17 2009 Bastien Nocera <bnocera at redhat.com> 0.16-1
- Update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	17 Aug 2009 13:33:46 -0000	1.14
+++ .cvsignore	17 Aug 2009 13:37:18 -0000	1.15
@@ -1 +1 @@
-obexd.spec
+obexd-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obexd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	17 Aug 2009 13:33:46 -0000	1.14
+++ sources	17 Aug 2009 13:37:18 -0000	1.15
@@ -1 +1 @@
-e40e8bf79fd5d0be84c833a4b1ff4d3e  obexd.spec
+389de26da04cfabce7a011d582d1800f  obexd-0.16.tar.bz2



From mmcgrath at fedoraproject.org  Mon Aug 17 13:48:26 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 13:48:26 +0000 (UTC)
Subject: rpms/nagios/devel .cvsignore, 1.19, 1.20 nagios.spec, 1.72,
	1.73 sources, 1.20, 1.21
Message-ID: <20090817134826.41EB211C00E4@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15067

Modified Files:
	.cvsignore nagios.spec sources 
Log Message:
upstream released new version - update from jpo (517210)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	15 Jul 2009 18:54:03 -0000	1.19
+++ .cvsignore	17 Aug 2009 13:48:25 -0000	1.20
@@ -1 +1 @@
-nagios-3.1.2.tar.gz
+nagios-3.2.0.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- nagios.spec	24 Jul 2009 17:41:04 -0000	1.72
+++ nagios.spec	17 Aug 2009 13:48:25 -0000	1.73
@@ -1,7 +1,7 @@
 Name: nagios
 
-Version: 3.1.2
-Release: 3%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -204,6 +204,9 @@ fi
 %{_includedir}/%{name}
 
 %changelog
+* Sun Aug 16 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.0-1
+- Upgrade to 3.2.0 (#517210).
+
 * Fri Jul 24 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.2-3
 - Corrected the package version in the last two changelog entries (#499853)
 - Using configure --datarootdir option instead of --datadir (#499853)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	15 Jul 2009 18:54:03 -0000	1.20
+++ sources	17 Aug 2009 13:48:25 -0000	1.21
@@ -1 +1 @@
-f3c60428cba14264c709749182b8d93e  nagios-3.1.2.tar.gz
+3566167cc60ddeaad34e7d2e26ed4a58  nagios-3.2.0.tar.gz



From cebbert at fedoraproject.org  Mon Aug 17 13:50:46 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 13:50:46 +0000 (UTC)
Subject: rpms/kernel/F-10
	add-fno-delete-null-pointer-checks-to-gcc-cflags.patch, NONE,
	1.1 personality-fix-per_clear_on_setid.patch, NONE,
	1.1 security-use-mmap_min_addr-indepedently-of-security-models.patch, 
	NONE, 1.1 config-generic, 1.231, 1.232 kernel.spec, 1.1397, 1.1398
Message-ID: <20090817135046.5F60711C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15467

Modified Files:
	config-generic kernel.spec 
Added Files:
	add-fno-delete-null-pointer-checks-to-gcc-cflags.patch 
	personality-fix-per_clear_on_setid.patch 
	security-use-mmap_min_addr-indepedently-of-security-models.patch 
Log Message:
More security fixes from the F-11 2.6.29.6 kernel.

add-fno-delete-null-pointer-checks-to-gcc-cflags.patch:
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE add-fno-delete-null-pointer-checks-to-gcc-cflags.patch ---
>From a3ca86aea507904148870946d599e07a340b39bf Mon Sep 17 00:00:00 2001
From: Eugene Teo <eteo at redhat.com>
Date: Wed, 15 Jul 2009 14:59:10 +0800
Subject: Add '-fno-delete-null-pointer-checks' to gcc CFLAGS

From: Eugene Teo <eteo at redhat.com>

commit a3ca86aea507904148870946d599e07a340b39bf upstream.

Turning on this flag could prevent the compiler from optimising away
some "useless" checks for null pointers.  Such bugs can sometimes become
exploitable at compile time because of the -O2 optimisation.

See http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Optimize-Options.html

An example that clearly shows this 'problem' is commit 6bf67672.

 static void __devexit agnx_pci_remove(struct pci_dev *pdev)
 {
     struct ieee80211_hw *dev = pci_get_drvdata(pdev);
-    struct agnx_priv *priv = dev->priv;
+    struct agnx_priv *priv;
     AGNX_TRACE;

     if (!dev)
         return;
+    priv = dev->priv;

By reverting this patch, and compile it with and without
-fno-delete-null-pointer-checks flag, we can see that the check for dev
is compiled away.

    call    printk  #
-   testq   %r12, %r12  # dev
-   je  .L94    #,
    movq    %r12, %rdi  # dev,

Clearly the 'fix' is to stop using dev before it is tested, but building
with -fno-delete-null-pointer-checks flag at least makes it harder to
abuse.

Signed-off-by: Eugene Teo <eugeneteo at kernel.sg>
Acked-by: Eric Paris <eparis at redhat.com>
Acked-by: Wang Cong <amwang at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__ $(LINUXI
 
 KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common \
-		   -Werror-implicit-function-declaration
+		   -Werror-implicit-function-declaration \
+		   -fno-delete-null-pointer-checks
 KBUILD_AFLAGS   := -D__ASSEMBLY__
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)

personality-fix-per_clear_on_setid.patch:
 personality.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE personality-fix-per_clear_on_setid.patch ---
>From f9fabcb58a6d26d6efde842d1703ac7cfa9427b6 Mon Sep 17 00:00:00 2001
From: Julien Tinnes <jt at cr0.org>
Date: Fri, 26 Jun 2009 20:27:40 +0200
Subject: personality: fix PER_CLEAR_ON_SETID (CVE-2009-1895)

From: Julien Tinnes <jt at cr0.org>

commit f9fabcb58a6d26d6efde842d1703ac7cfa9427b6 upstream.

We have found that the current PER_CLEAR_ON_SETID mask on Linux doesn't
include neither ADDR_COMPAT_LAYOUT, nor MMAP_PAGE_ZERO.

The current mask is READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE.

We believe it is important to add MMAP_PAGE_ZERO, because by using this
personality it is possible to have the first page mapped inside a
process running as setuid root.  This could be used in those scenarios:

 - Exploiting a NULL pointer dereference issue in a setuid root binary
 - Bypassing the mmap_min_addr restrictions of the Linux kernel: by
   running a setuid binary that would drop privileges before giving us
   control back (for instance by loading a user-supplied library), we
   could get the first page mapped in a process we control.  By further
   using mremap and mprotect on this mapping, we can then completely
   bypass the mmap_min_addr restrictions.

Less importantly, we believe ADDR_COMPAT_LAYOUT should also be added
since on x86 32bits it will in practice disable most of the address
space layout randomization (only the stack will remain randomized).

Signed-off-by: Julien Tinnes <jt at cr0.org>
Signed-off-by: Tavis Ormandy <taviso at sdf.lonestar.org>
Acked-by: Christoph Hellwig <hch at infradead.org>
Acked-by: Kees Cook <kees at ubuntu.com>
Acked-by: Eugene Teo <eugene at redhat.com>
[ Shortened lines and fixed whitespace as per Christophs' suggestion ]
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 include/linux/personality.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/include/linux/personality.h
+++ b/include/linux/personality.h
@@ -40,7 +40,10 @@ enum {
  * Security-relevant compatibility flags that must be
  * cleared upon setuid or setgid exec:
  */
-#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE)
+#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC  | \
+			    ADDR_NO_RANDOMIZE  | \
+			    ADDR_COMPAT_LAYOUT | \
+			    MMAP_PAGE_ZERO)
 
 /*
  * Personality types.

security-use-mmap_min_addr-indepedently-of-security-models.patch:
 include/linux/mm.h       |    2 --
 include/linux/security.h |    2 ++
 kernel/sysctl.c          |    2 --
 mm/Kconfig               |   18 ++++++++++++++++++
 mm/mmap.c                |    3 +++
 security/Kconfig         |   22 +---------------------
 security/security.c      |    3 ---
 7 files changed, 24 insertions(+), 28 deletions(-)

--- NEW FILE security-use-mmap_min_addr-indepedently-of-security-models.patch ---
>From e0a94c2a63f2644826069044649669b5e7ca75d3 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl at linux-foundation.org>
Date: Wed, 3 Jun 2009 16:04:31 -0400
Subject: security: use mmap_min_addr indepedently of security models

From: Christoph Lameter <cl at linux-foundation.org>

commit e0a94c2a63f2644826069044649669b5e7ca75d3 upstream.

This patch removes the dependency of mmap_min_addr on CONFIG_SECURITY.
It also sets a default mmap_min_addr of 4096.

mmapping of addresses below 4096 will only be possible for processes
with CAP_SYS_RAWIO.

Signed-off-by: Christoph Lameter <cl at linux-foundation.org>
Acked-by: Eric Paris <eparis at redhat.com>
Looks-ok-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: James Morris <jmorris at namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 include/linux/mm.h       |    2 --
 include/linux/security.h |    2 ++
 kernel/sysctl.c          |    2 --
 mm/Kconfig               |   19 +++++++++++++++++++
 mm/mmap.c                |    3 +++
 security/Kconfig         |   22 +---------------------
 security/security.c      |    3 ---
 7 files changed, 25 insertions(+), 28 deletions(-)

--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -580,12 +580,10 @@ static inline void set_page_links(struct
  */
 static inline unsigned long round_hint_to_min(unsigned long hint)
 {
-#ifdef CONFIG_SECURITY
 	hint &= PAGE_MASK;
 	if (((void *)hint != NULL) &&
 	    (hint < mmap_min_addr))
 		return PAGE_ALIGN(mmap_min_addr);
-#endif
 	return hint;
 }
 
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2197,6 +2197,8 @@ static inline int security_file_mmap(str
 				     unsigned long addr,
 				     unsigned long addr_only)
 {
+	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
+		return -EACCES;
 	return 0;
 }
 
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1225,7 +1225,6 @@ static struct ctl_table vm_table[] = {
 		.strategy	= &sysctl_jiffies,
 	},
 #endif
-#ifdef CONFIG_SECURITY
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "mmap_min_addr",
@@ -1234,7 +1233,6 @@ static struct ctl_table vm_table[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_doulongvec_minmax,
 	},
-#endif
 #ifdef CONFIG_NUMA
 	{
 		.ctl_name	= CTL_UNNUMBERED,
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -216,3 +216,21 @@ config HAVE_MLOCKED_PAGE_BIT
 
 config MMU_NOTIFIER
 	bool
+
+config DEFAULT_MMAP_MIN_ADDR
+        int "Low address space to protect from user allocation"
+        default 4096
+        help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+	  can help reduce the impact of kernel NULL pointer bugs.
+
+	  For most ia64, ppc64 and x86 users with lots of address space
+	  a value of 65536 is reasonable and should cause no problems.
+	  On arm and other archs it should not be higher than 32768.
+	  Programs which use vm86 functionality would either need additional
+	  permissions from either the LSM or the capabilities module or have
+	  this protection disabled.
+
+	  This value can be changed after boot using the
+	  /proc/sys/vm/mmap_min_addr tunable.
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -87,6 +87,9 @@ int sysctl_overcommit_ratio = 50;	/* def
 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
 struct percpu_counter vm_committed_as;
 
+/* amount of vm to protect from userspace access */
+unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+
 /*
  * Check that a process has enough memory to allocate a new virtual
  * mapping. 0 means there is enough memory for the allocation to
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -110,28 +110,8 @@ config SECURITY_ROOTPLUG
 
 	  See <http://www.linuxjournal.com/article.php?sid=6279> for
 	  more information about this module.
-	  
-	  If you are unsure how to answer this question, answer N.
-
-config SECURITY_DEFAULT_MMAP_MIN_ADDR
-        int "Low address space to protect from user allocation"
-        depends on SECURITY
-        default 0
-        help
-	  This is the portion of low virtual memory which should be protected
-	  from userspace allocation.  Keeping a user from writing to low pages
-	  can help reduce the impact of kernel NULL pointer bugs.
-
-	  For most ia64, ppc64 and x86 users with lots of address space
-	  a value of 65536 is reasonable and should cause no problems.
-	  On arm and other archs it should not be higher than 32768.
-	  Programs which use vm86 functionality would either need additional
-	  permissions from either the LSM or the capabilities module or have
-	  this protection disabled.
-
-	  This value can be changed after boot using the
-	  /proc/sys/vm/mmap_min_addr tunable.
 
+	  If you are unsure how to answer this question, answer N.
 
 source security/selinux/Kconfig
 source security/smack/Kconfig
--- a/security/security.c
+++ b/security/security.c
@@ -26,9 +26,6 @@ extern void security_fixup_ops(struct se
 
 struct security_operations *security_ops;	/* Initialized to NULL */
 
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR;
-
 static inline int verify(struct security_operations *ops)
 {
 	/* verify the security_operations structure exists */


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- config-generic	16 Jun 2009 05:25:44 -0000	1.231
+++ config-generic	17 Aug 2009 13:50:45 -0000	1.232
@@ -3332,7 +3332,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1397
retrieving revision 1.1398
diff -u -p -r1.1397 -r1.1398
--- kernel.spec	15 Aug 2009 04:32:10 -0000	1.1397
+++ kernel.spec	17 Aug 2009 13:50:45 -0000	1.1398
@@ -753,6 +753,10 @@ Patch11000: linux-2.6-parport-quickfix-t
 Patch11100: linux-2.6-dev-zero-avoid-oom-lockup.patch
 Patch11020: linux-2.6-usb-remove-low-latency-hack.patch
 Patch11030: linux-2.6-x86-delay-tsc-barrier.patch
+# security fixes from the F-11 2.6.29.6 kernel
+Patch11040: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
+Patch11050: security-use-mmap_min_addr-indepedently-of-security-models.patch
+Patch11060: personality-fix-per_clear_on_setid.patch
 
 %endif
 
@@ -1417,6 +1421,13 @@ ApplyPatch linux-2.6-usb-remove-low-late
 # fix broken tsc delay code
 ApplyPatch linux-2.6-x86-delay-tsc-barrier.patch
 
+# security fixes from the F-11 2.6.29.6 kernel
+# fix test-after-use of null pointers
+ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
+# mmap zero page fixes
+ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
+ApplyPatch personality-fix-per_clear_on_setid.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -1993,6 +2004,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com> kernel-2.6.29.6-98
+- More security fixes from the F-11 2.6.29.6 kernel.
+
 * Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-96
 - For F-10-updates-testing:
 - CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.



From schwab at fedoraproject.org  Mon Aug 17 13:52:40 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 17 Aug 2009 13:52:40 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.280, 1.281 glibc-fedora.patch, 1.314,
	1.315 glibc.spec, 1.407, 1.408 import.log, 1.23, 1.24 sources,
	1.305, 1.306
Message-ID: <20090817135240.B43E111C00E4@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15837/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- .cvsignore	10 Aug 2009 09:56:03 -0000	1.280
+++ .cvsignore	17 Aug 2009 13:52:39 -0000	1.281
@@ -1,2 +1,2 @@
-glibc-2.10-271-gefa0569-fedora.tar.bz2
-glibc-2.10-271-gefa0569.tar.bz2
+glibc-2.10-277-g677760a-fedora.tar.bz2
+glibc-2.10-277-g677760a.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   35 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 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/powerpc32/____longjmp_chk.S    |    8 
 sysdeps/powerpc/powerpc64/Makefile             |    1 
 sysdeps/powerpc/powerpc64/____longjmp_chk.S    |    8 
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 59 files changed, 787 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- glibc-fedora.patch	10 Aug 2009 09:56:03 -0000	1.314
+++ glibc-fedora.patch	17 Aug 2009 13:52:40 -0000	1.315
@@ -1,6 +1,6 @@
---- glibc-2.10-271-gefa0569/ChangeLog
-+++ glibc-2.10.90-12/ChangeLog
-@@ -374,6 +374,11 @@
+--- glibc-2.10-277-g677760a/ChangeLog
++++ glibc-2.10.90-13/ChangeLog
+@@ -390,6 +390,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -639,6 +644,16 @@
+@@ -655,6 +660,16 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -29,7 +29,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9037,6 +9052,13 @@
+@@ -9053,6 +9068,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -43,7 +43,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9332,6 +9354,10 @@
+@@ -9348,6 +9370,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -54,7 +54,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10589,6 +10615,15 @@
+@@ -10605,6 +10631,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -70,8 +70,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-271-gefa0569/ChangeLog.15
-+++ glibc-2.10.90-12/ChangeLog.15
+--- glibc-2.10-277-g677760a/ChangeLog.15
++++ glibc-2.10.90-13/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -137,8 +137,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-271-gefa0569/ChangeLog.16
-+++ glibc-2.10.90-12/ChangeLog.16
+--- glibc-2.10-277-g677760a/ChangeLog.16
++++ glibc-2.10.90-13/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -310,8 +310,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-271-gefa0569/Makeconfig
-+++ glibc-2.10.90-12/Makeconfig
+--- glibc-2.10-277-g677760a/Makeconfig
++++ glibc-2.10.90-13/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -328,8 +328,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-271-gefa0569/csu/Makefile
-+++ glibc-2.10.90-12/csu/Makefile
+--- glibc-2.10-277-g677760a/csu/Makefile
++++ glibc-2.10.90-13/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -340,8 +340,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-271-gefa0569/csu/elf-init.c
-+++ glibc-2.10.90-12/csu/elf-init.c
+--- glibc-2.10-277-g677760a/csu/elf-init.c
++++ glibc-2.10.90-13/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;
@@ -366,8 +366,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-271-gefa0569/debug/tst-chk1.c
-+++ glibc-2.10.90-12/debug/tst-chk1.c
+--- glibc-2.10-277-g677760a/debug/tst-chk1.c
++++ glibc-2.10.90-13/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -396,8 +396,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-271-gefa0569/elf/ldconfig.c
-+++ glibc-2.10.90-12/elf/ldconfig.c
+--- glibc-2.10-277-g677760a/elf/ldconfig.c
++++ glibc-2.10.90-13/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -479,8 +479,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-271-gefa0569/elf/tst-stackguard1.c
-+++ glibc-2.10.90-12/elf/tst-stackguard1.c
+--- glibc-2.10-277-g677760a/elf/tst-stackguard1.c
++++ glibc-2.10.90-13/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -505,16 +505,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-271-gefa0569/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-12/include/bits/stdlib-ldbl.h
+--- glibc-2.10-277-g677760a/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-13/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-271-gefa0569/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-12/include/bits/wchar-ldbl.h
+--- glibc-2.10-277-g677760a/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-13/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-271-gefa0569/include/features.h
-+++ glibc-2.10.90-12/include/features.h
+--- glibc-2.10-277-g677760a/include/features.h
++++ glibc-2.10.90-13/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -531,8 +531,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-271-gefa0569/intl/locale.alias
-+++ glibc-2.10.90-12/intl/locale.alias
+--- glibc-2.10-277-g677760a/intl/locale.alias
++++ glibc-2.10.90-13/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -542,8 +542,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-271-gefa0569/libio/stdio.h
-+++ glibc-2.10.90-12/libio/stdio.h
+--- glibc-2.10-277-g677760a/libio/stdio.h
++++ glibc-2.10.90-13/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.  */
@@ -557,8 +557,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-271-gefa0569/locale/iso-4217.def
-+++ glibc-2.10.90-12/locale/iso-4217.def
+--- glibc-2.10-277-g677760a/locale/iso-4217.def
++++ glibc-2.10.90-13/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -650,8 +650,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-271-gefa0569/locale/programs/locarchive.c
-+++ glibc-2.10.90-12/locale/programs/locarchive.c
+--- glibc-2.10-277-g677760a/locale/programs/locarchive.c
++++ glibc-2.10.90-13/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,
@@ -683,8 +683,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-271-gefa0569/localedata/Makefile
-+++ glibc-2.10.90-12/localedata/Makefile
+--- glibc-2.10-277-g677760a/localedata/Makefile
++++ glibc-2.10.90-13/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -693,8 +693,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-271-gefa0569/localedata/SUPPORTED
-+++ glibc-2.10.90-12/localedata/SUPPORTED
+--- glibc-2.10-277-g677760a/localedata/SUPPORTED
++++ glibc-2.10.90-13/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -736,8 +736,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-271-gefa0569/localedata/locales/cy_GB
-+++ glibc-2.10.90-12/localedata/locales/cy_GB
+--- glibc-2.10-277-g677760a/localedata/locales/cy_GB
++++ glibc-2.10.90-13/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>"
@@ -752,8 +752,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-271-gefa0569/localedata/locales/en_GB
-+++ glibc-2.10.90-12/localedata/locales/en_GB
+--- glibc-2.10-277-g677760a/localedata/locales/en_GB
++++ glibc-2.10.90-13/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>"
@@ -765,8 +765,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-271-gefa0569/localedata/locales/no_NO
-+++ glibc-2.10.90-12/localedata/locales/no_NO
+--- glibc-2.10-277-g677760a/localedata/locales/no_NO
++++ glibc-2.10.90-13/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -837,8 +837,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-271-gefa0569/localedata/locales/zh_TW
-+++ glibc-2.10.90-12/localedata/locales/zh_TW
+--- glibc-2.10-277-g677760a/localedata/locales/zh_TW
++++ glibc-2.10.90-13/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -866,8 +866,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-271-gefa0569/malloc/mcheck.c
-+++ glibc-2.10.90-12/malloc/mcheck.c
+--- glibc-2.10-277-g677760a/malloc/mcheck.c
++++ glibc-2.10.90-13/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -943,8 +943,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-271-gefa0569/manual/libc.texinfo
-+++ glibc-2.10.90-12/manual/libc.texinfo
+--- glibc-2.10-277-g677760a/manual/libc.texinfo
++++ glibc-2.10.90-13/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -954,8 +954,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-271-gefa0569/misc/sys/cdefs.h
-+++ glibc-2.10.90-12/misc/sys/cdefs.h
+--- glibc-2.10-277-g677760a/misc/sys/cdefs.h
++++ glibc-2.10.90-13/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)
@@ -999,17 +999,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-271-gefa0569/nis/nss
-+++ glibc-2.10.90-12/nis/nss
+--- glibc-2.10-277-g677760a/nis/nss
++++ glibc-2.10.90-13/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-271-gefa0569/nptl/ChangeLog
-+++ glibc-2.10.90-12/nptl/ChangeLog
-@@ -3666,6 +3666,15 @@
+--- glibc-2.10-277-g677760a/nptl/ChangeLog
++++ glibc-2.10.90-13/nptl/ChangeLog
+@@ -3683,6 +3683,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1025,7 +1025,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4402,6 +4411,11 @@
+@@ -4419,6 +4428,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1037,7 +1037,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6476,6 +6490,11 @@
+@@ -6493,6 +6507,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1049,8 +1049,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-271-gefa0569/nptl/Makefile
-+++ glibc-2.10.90-12/nptl/Makefile
+--- glibc-2.10-277-g677760a/nptl/Makefile
++++ glibc-2.10.90-13/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1083,8 +1083,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-271-gefa0569/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-12/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-277-g677760a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-13/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1093,8 +1093,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-271-gefa0569/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-12/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-277-g677760a/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1102,8 +1102,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-271-gefa0569/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-12/nptl/tst-stackguard1.c
+--- glibc-2.10-277-g677760a/nptl/tst-stackguard1.c
++++ glibc-2.10.90-13/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1128,8 +1128,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-271-gefa0569/nscd/nscd.conf
-+++ glibc-2.10.90-12/nscd/nscd.conf
+--- glibc-2.10-277-g677760a/nscd/nscd.conf
++++ glibc-2.10.90-13/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1139,8 +1139,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-271-gefa0569/nscd/nscd.init
-+++ glibc-2.10.90-12/nscd/nscd.init
+--- glibc-2.10-277-g677760a/nscd/nscd.init
++++ glibc-2.10.90-13/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1197,8 +1197,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-271-gefa0569/posix/Makefile
-+++ glibc-2.10.90-12/posix/Makefile
+--- glibc-2.10-277-g677760a/posix/Makefile
++++ glibc-2.10.90-13/posix/Makefile
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1219,8 +1219,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-271-gefa0569/posix/getconf.speclist.h
-+++ glibc-2.10.90-12/posix/getconf.speclist.h
+--- glibc-2.10-277-g677760a/posix/getconf.speclist.h
++++ glibc-2.10.90-13/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1261,8 +1261,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-271-gefa0569/streams/Makefile
-+++ glibc-2.10.90-12/streams/Makefile
+--- glibc-2.10-277-g677760a/streams/Makefile
++++ glibc-2.10.90-13/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1272,8 +1272,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-271-gefa0569/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-12/sysdeps/generic/dl-cache.h
+--- glibc-2.10-277-g677760a/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-13/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1289,8 +1289,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-271-gefa0569/sysdeps/i386/Makefile
-+++ glibc-2.10.90-12/sysdeps/i386/Makefile
+--- glibc-2.10-277-g677760a/sysdeps/i386/Makefile
++++ glibc-2.10.90-13/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1315,8 +1315,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-271-gefa0569/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-12/sysdeps/ia64/Makefile
+--- glibc-2.10-277-g677760a/sysdeps/ia64/Makefile
++++ glibc-2.10.90-13/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1328,8 +1328,8 @@
  endif
  endif
  
---- glibc-2.10-271-gefa0569/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-12/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-277-g677760a/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-13/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1681,8 +1681,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-271-gefa0569/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-12/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-277-g677760a/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-13/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1768,8 +1768,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-271-gefa0569/sysdeps/powerpc/powerpc32/____longjmp_chk.S
-+++ glibc-2.10.90-12/sysdeps/powerpc/powerpc32/____longjmp_chk.S
+--- glibc-2.10-277-g677760a/sysdeps/powerpc/powerpc32/____longjmp_chk.S
++++ glibc-2.10.90-13/sysdeps/powerpc/powerpc32/____longjmp_chk.S
 @@ -49,8 +49,16 @@
  #define CHECK_SP(reg) \
  	cmplw	reg, r1;				\
@@ -1787,8 +1787,8 @@
  .Lok:
  
  #include <__longjmp-common.S>
---- glibc-2.10-271-gefa0569/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-12/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-277-g677760a/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-13/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1797,8 +1797,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-271-gefa0569/sysdeps/powerpc/powerpc64/____longjmp_chk.S
-+++ glibc-2.10.90-12/sysdeps/powerpc/powerpc64/____longjmp_chk.S
+--- glibc-2.10-277-g677760a/sysdeps/powerpc/powerpc64/____longjmp_chk.S
++++ glibc-2.10.90-13/sysdeps/powerpc/powerpc64/____longjmp_chk.S
 @@ -32,8 +32,16 @@
  #define CHECK_SP(reg) \
  	cmpld	reg, r1;				\
@@ -1816,8 +1816,8 @@
  .Lok:
  
  #include <__longjmp-common.S>
---- glibc-2.10-271-gefa0569/sysdeps/unix/nice.c
-+++ glibc-2.10.90-12/sysdeps/unix/nice.c
+--- glibc-2.10-277-g677760a/sysdeps/unix/nice.c
++++ glibc-2.10.90-13/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1832,8 +1832,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1849,8 +1849,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1898,8 +1898,8 @@
      }
    else
  #endif
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1942,8 +1942,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1962,8 +1962,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-13/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.
@@ -2024,8 +2024,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2058,29 +2058,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-13/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-271-gefa0569/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-13/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-271-gefa0569/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-13/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-271-gefa0569/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2106,8 +2106,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2117,8 +2117,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2164,8 +2164,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-271-gefa0569/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-12/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-13/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-271-gefa0569/timezone/zic.c
-+++ glibc-2.10.90-12/timezone/zic.c
+--- glibc-2.10-277-g677760a/timezone/zic.c
++++ glibc-2.10.90-13/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- glibc.spec	10 Aug 2009 09:56:04 -0000	1.407
+++ glibc.spec	17 Aug 2009 13:52:40 -0000	1.408
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-271-gefa0569
+%define glibcsrcdir glibc-2.10-277-g677760a
 %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: 13
+Release: 14
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1026,6 +1026,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Aug 17 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-14
+- Update from master.
+  - fix pthread_cond_signal (#516469)
+
 * Mon Aug 10 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-13
 - Update from master.
   - fix rehashing of unique symbols (#515677)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- import.log	10 Aug 2009 09:56:04 -0000	1.23
+++ import.log	17 Aug 2009 13:52:40 -0000	1.24
@@ -21,3 +21,4 @@ glibc-2_10_90-10:HEAD:glibc-2.10.90-10.s
 glibc-2_10_90-11:HEAD:glibc-2.10.90-11.src.rpm:1248961080
 glibc-2_10_90-12:HEAD:glibc-2.10.90-12.src.rpm:1249300698
 glibc-2_10_90-13:HEAD:glibc-2.10.90-13.src.rpm:1249897909
+glibc-2_10_90-14:HEAD:glibc-2.10.90-14.src.rpm:1250516718


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- sources	10 Aug 2009 09:56:04 -0000	1.305
+++ sources	17 Aug 2009 13:52:40 -0000	1.306
@@ -1,2 +1,2 @@
-86e8369c526f7d5db7d49f934809e2ae  glibc-2.10-271-gefa0569-fedora.tar.bz2
-2a91b24cc1d16c795b50fe8f03853765  glibc-2.10-271-gefa0569.tar.bz2
+41e4a4c404fc8eece82f2f06d3d88412  glibc-2.10-277-g677760a-fedora.tar.bz2
+3c2a0514ce198c7b9c47e538187bff0c  glibc-2.10-277-g677760a.tar.bz2



From jwilson at fedoraproject.org  Mon Aug 17 13:57:27 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 17 Aug 2009 13:57:27 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1398, 1.1399 linux-2.6.29-lirc.patch,
	1.9, 1.10
Message-ID: <20090817135727.B1B3511C00E4@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16739

Modified Files:
	kernel.spec linux-2.6.29-lirc.patch 
Log Message:
* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-99
- Fix flub in prior lirc patch update that resulted in no lirc
  drivers getting built



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1398
retrieving revision 1.1399
diff -u -p -r1.1398 -r1.1399
--- kernel.spec	17 Aug 2009 13:50:45 -0000	1.1398
+++ kernel.spec	17 Aug 2009 13:57:27 -0000	1.1399
@@ -2004,7 +2004,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com> kernel-2.6.29.6-98
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-99
+- Fix flub in prior lirc patch update that resulted in no lirc
+  drivers getting built
+
+* Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-98
 - More security fixes from the F-11 2.6.29.6 kernel.
 
 * Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-96

linux-2.6.29-lirc.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  112 +
 drivers/input/lirc/Makefile           |   20 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_i2c.c         |  649 +++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2297 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 24 files changed, 14844 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.9 -r 1.10 linux-2.6.29-lirc.patchIndex: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.29-lirc.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- linux-2.6.29-lirc.patch	30 Jun 2009 05:02:32 -0000	1.9
+++ linux-2.6.29-lirc.patch	17 Aug 2009 13:57:27 -0000	1.10
@@ -2,7 +2,7 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
-Refreshed 20090630
+Refreshed 20090917
 
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
@@ -10,29 +10,28 @@ Signed-off-by: Jarod Wilson <jarod at redha
  MAINTAINERS                           |    9 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  118 ++
- drivers/input/lirc/Makefile           |   21 +
+ drivers/input/lirc/Kconfig            |  112 ++
+ drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
  drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
- drivers/input/lirc/lirc_i2c.c         |  649 +++++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++++
- drivers/input/lirc/lirc_imon.c        | 2057 +++++++++++++++++++++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++++
+ drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++
+ drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
+ drivers/input/lirc/lirc_imon.c        | 2297 +++++++++++++++++++++++++++++++++
+ 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      |  749 ++++++++++++
- drivers/input/lirc/lirc_mceusb2.c     | 1105 ++++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
+ drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++++
+ 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         | 1294 +++++++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  397 +++++++
- drivers/input/lirc/lirc_zilog.c       | 1384 ++++++++++++++++++++++
- 25 files changed, 15261 insertions(+), 0 deletions(-)
+ 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   |  777 +++++++++++
+ drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
+ drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
+ 24 files changed, 14844 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 59fd2d1..ad1b16c 100644
@@ -79,10 +78,10 @@ index 4c9c745..99e2b5e 100644
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..0482bb9
+index 0000000..6ef8622
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,112 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -139,16 +138,10 @@ index 0000000..0482bb9
 +	  Driver for the ITE8709 IR Receiver
 +
 +config LIRC_MCEUSB
-+	tristate "Microsoft Media Center Ed. Receiver, v1"
++	tristate "Windows Media Center Ed. USB IR Transceiver"
 +	depends on LIRC_DEV && USB
 +	help
-+	  Driver for the Microsoft Media Center Ed. Receiver, v1
-+
-+config LIRC_MCEUSB2
-+	tristate "Microsoft Media Center Ed. Receiver, v2"
-+	depends on LIRC_DEV && USB
-+	help
-+	  Driver for the Microsoft Media Center Ed. Receiver, v2
++	  Driver for Windows Media Center Ed. USB IR Transceivers
 +
 +config LIRC_PARALLEL
 +	tristate "Homebrew Parallel Port Receiver"
@@ -203,10 +196,10 @@ index 0000000..0482bb9
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..a22df78
+index 0000000..7b1386e
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,20 @@
 +# Makefile for the lirc drivers.
 +#
 +
@@ -220,7 +213,6 @@ index 0000000..a22df78
 +obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
 +obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
 +obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
-+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
 +obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 +obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 +obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
@@ -725,7 +717,7 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..a5d5c89
+index 0000000..0510b4e
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
 @@ -0,0 +1,851 @@
@@ -802,7 +794,7 @@ index 0000000..a5d5c89
 +	struct cdev cdev;
 +};
 +
-+static DEFINE_MUTEX(driver_lock);
++static DEFINE_MUTEX(lirc_dev_lock);
 +
 +static struct irctl *irctls[MAX_IRCTL_DEVICES];
 +
@@ -998,7 +990,7 @@ index 0000000..a5d5c89
 +		goto out;
 +	}
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	minor = d->minor;
 +
@@ -1087,7 +1079,7 @@ index 0000000..a5d5c89
 +		goto out_sysfs;
 +
 +	ir->attached = 1;
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	dprintk("lirc_dev: driver %s registered at minor number = %d\n",
 +		ir->d.name, ir->d.minor);
@@ -1096,7 +1088,7 @@ index 0000000..a5d5c89
 +out_sysfs:
 +	device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
 +out_lock:
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +out:
 +	return err;
 +}
@@ -1115,12 +1107,12 @@ index 0000000..a5d5c89
 +
 +	ir = irctls[minor];
 +
-+	mutex_lock(&driver_lock);
++	mutex_lock(&lirc_dev_lock);
 +
 +	if (ir->d.minor != minor) {
 +		printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
 +		       "minor (%d) device not registered!", minor);
-+		mutex_unlock(&driver_lock);
++		mutex_unlock(&lirc_dev_lock);
 +		return -ENOENT;
 +	}
 +
@@ -1148,7 +1140,7 @@ index 0000000..a5d5c89
 +		irctls[minor] = NULL;
 +	}
 +
-+	mutex_unlock(&driver_lock);
++	mutex_unlock(&lirc_dev_lock);
 +
 +	return 0;
 +}
@@ -1165,7 +1157,7 @@ index 0000000..a5d5c89
 +		return -ENODEV;
 +	}
 +
-+	if (mutex_lock_interruptible(&driver_lock))
++	if (mutex_lock_interruptible(&lirc_dev_lock))
 +		return -ERESTARTSYS;
 +
 +	ir = irctls[iminor(inode)];
@@ -1211,7 +1203,7 @@ index 0000000..a5d5c89
 +		dprintk(LOGHEAD "open result = %d\n", ir->d.name, ir->d.minor,
 +			retval);
 +
-+	mutex_unlock(&driver_lock);
[...2451 lines suppressed...]
 +
 +static int io = LIRC_PORT;
 +static int irq = LIRC_IRQ;
@@ -11750,7 +11355,6 @@ index 0000000..6c64072
 +static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue);
 +
 +static DEFINE_SPINLOCK(hardware_lock);
-+static DEFINE_SPINLOCK(dev_lock);
 +
 +static int rx_buf[RBUF_LEN];
 +static unsigned int rx_tail, rx_head;
@@ -11767,8 +11371,6 @@ index 0000000..6c64072
 +/* SECTION: Prototypes */
 +
 +/* Communication with user-space */
-+static int lirc_open(struct inode *inode, struct file *file);
-+static int lirc_close(struct inode *inode, struct file *file);
 +static unsigned int lirc_poll(struct file *file, poll_table *wait);
 +static ssize_t lirc_read(struct file *file, char *buf, size_t count,
 +		loff_t *ppos);
@@ -11828,22 +11430,6 @@ index 0000000..6c64072
 +
 +/* SECTION: Communication with user-space */
 +
-+static int lirc_open(struct inode *inode, struct file *file)
-+{
-+	spin_lock(&dev_lock);
-+	if (module_refcount(THIS_MODULE)) {
-+		spin_unlock(&dev_lock);
-+		return -EBUSY;
-+	}
-+	spin_unlock(&dev_lock);
-+	return 0;
-+}
-+
-+static int lirc_close(struct inode *inode, struct file *file)
-+{
-+	return 0;
-+}
-+
 +static unsigned int lirc_poll(struct file *file, poll_table *wait)
 +{
 +	poll_wait(file, &lirc_read_queue, wait);
@@ -12058,8 +11644,8 @@ index 0000000..6c64072
 +	.write		= lirc_write,
 +	.poll		= lirc_poll,
 +	.ioctl		= lirc_ioctl,
-+	.open		= lirc_open,
-+	.release	= lirc_close,
++	.open		= lirc_dev_fop_open,
++	.release	= lirc_dev_fop_close,
 +};
 +
 +static int set_use_inc(void *data)
@@ -14069,10 +13655,10 @@ index 0000000..2955bad
 +module_exit(ttusbir_exit_module);
 diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
 new file mode 100644
-index 0000000..049c3da
+index 0000000..c532399
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
-@@ -0,0 +1,1384 @@
+@@ -0,0 +1,1374 @@
 +/*
 + * i2c IR lirc driver for devices with zilog IR processors
 + *
@@ -15163,18 +14749,26 @@ index 0000000..049c3da
 +};
 +
 +static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
-+static int ir_detach(struct i2c_client *client);
-+static int ir_probe(struct i2c_adapter *adap);
++static int ir_remove(struct i2c_client *client);
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
 +static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 +
++static const struct i2c_device_id ir_transceiver_id[] = {
++	/* Generic entry for any IR transceiver */
++	{ "ir_video", 0 },
++	/* IR device specific entries could be added here */
++	{ }
++};
++
 +static struct i2c_driver driver = {
 +	.driver = {
 +		.owner	= THIS_MODULE,
 +		.name	= "i2c ir driver",
 +	},
-+	.attach_adapter	= ir_probe,
-+	.detach_client	= ir_detach,
++	.probe		= ir_probe,
++	.remove		= ir_remove,
 +	.command	= ir_command,
++	.id_table	= ir_transceiver_id,
 +};
 +
 +static struct i2c_client client_template = {
@@ -15195,20 +14789,8 @@ index 0000000..049c3da
 +
 +static int i2c_attach(struct i2c_client *client, struct IR *ir)
 +{
-+	int ret;
-+
 +	i2c_set_clientdata(client, ir);
 +
-+	ret = i2c_attach_client(client);
-+	if (ret != 0) {
-+		client->addr = 0;
-+		return ret;
-+	}
-+	if (!i2c_use_client(client)) {
-+		i2c_detach_client(client);
-+		client->addr = 0;
-+		return -EFAULT;
-+	}
 +	++ir->devs;
 +	return 0;
 +}
@@ -15309,13 +14891,13 @@ index 0000000..049c3da
 +err:
 +	/* undo everything, hopefully... */
 +	if (ir->c_rx.addr)
-+		ir_detach(&ir->c_rx);
++		ir_remove(&ir->c_rx);
 +	if (ir->c_tx.addr)
-+		ir_detach(&ir->c_tx);
++		ir_remove(&ir->c_tx);
 +	return ret;
 +}
 +
-+static int ir_detach(struct i2c_client *client)
++static int ir_remove(struct i2c_client *client)
 +{
 +	struct IR *ir = i2c_get_clientdata(client);
 +	mutex_lock(&ir->lock);
@@ -15336,21 +14918,17 @@ index 0000000..049c3da
 +			ir->t_notify2 = NULL;
 +		}
 +
-+		/* unregister device */
-+		i2c_detach_client(&ir->c_rx);
-+	} else if (client == &ir->c_tx) {
-+		i2c_detach_client(&ir->c_tx);
 +	} else {
 +		mutex_unlock(&ir->lock);
-+		zilog_error("ir_detach: detached from something we didn't "
-+			    "attach to\n");
++		zilog_error("%s: detached from something we didn't "
++			    "attach to\n", __func__);
 +		return -ENODEV;
 +	}
 +
 +	--ir->devs;
 +	if (ir->devs < 0) {
 +		mutex_unlock(&ir->lock);
-+		zilog_error("ir_detach: invalid device count\n");
++		zilog_error("%s: invalid device count\n", __func__);
 +		return -ENODEV;
 +	} else if (ir->devs == 0) {
 +		/* unregister lirc driver */
@@ -15369,11 +14947,10 @@ index 0000000..049c3da
 +	return 0;
 +}
 +
-+static int ir_probe(struct i2c_adapter *adap)
++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 +{
-+	struct i2c_client c;
++	struct i2c_adapter *adap = client->adapter;
 +	char buf;
-+	memset(&c, 0, sizeof(c));
 +
 +	if (adap->id == I2C_HW_B_BT848 ||
 +#ifdef I2C_HW_B_HDPVR
@@ -15386,11 +14963,10 @@ index 0000000..049c3da
 +		 * The external IR receiver is at i2c address 0x71.
 +		 * The IR transmitter is at 0x70.
 +		 */
-+		c.adapter = adap;
-+		c.addr = 0x70;
++		client->addr = 0x70;
 +
 +		if (!disable_rx) {
-+			if (i2c_master_recv(&c, &buf, 1) == 1)
++			if (i2c_master_recv(client, &buf, 1) == 1)
 +				have_rx = 1;
 +			dprintk("probe 0x70 @ %s: %s\n",
 +				adap->name,
@@ -15398,8 +14974,8 @@ index 0000000..049c3da
 +		}
 +
 +		if (!disable_tx) {
-+			c.addr = 0x71;
-+			if (i2c_master_recv(&c, &buf, 1) == 1)
++			client->addr = 0x71;
++			if (i2c_master_recv(client, &buf, 1) == 1)
 +				have_tx = 1;
 +			dprintk("probe 0x71 @ %s: %s\n",
 +				adap->name,



From mcpierce at fedoraproject.org  Mon Aug 17 14:04:57 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon, 17 Aug 2009 14:04:57 +0000 (UTC)
Subject: rpms/rubygem-state_machine/devel .cvsignore, 1.2,
	1.3 rubygem-state_machine.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090817140457.B580411C00E4@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-state_machine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18227

Modified Files:
	.cvsignore rubygem-state_machine.spec sources 
Log Message:
* Mon Aug 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.8.0-1
- Release 0.8.0 of state_machine.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 13:16:18 -0000	1.2
+++ .cvsignore	17 Aug 2009 14:04:57 -0000	1.3
@@ -1 +1 @@
-state_machine-0.7.6.gem
+state_machine-0.8.0.gem


Index: rubygem-state_machine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/devel/rubygem-state_machine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-state_machine.spec	27 Jul 2009 03:37:28 -0000	1.2
+++ rubygem-state_machine.spec	17 Aug 2009 14:04:57 -0000	1.3
@@ -6,8 +6,8 @@
 
 Summary:       Adds support for creating state machines for attributes on any Ruby class
 Name:          rubygem-%{gemname}
-Version:       0.7.6
-Release:       2%{?dist}
+Version:       0.8.0
+Release:       1%{?dist}
 Group:         Development/Languages
 License:       MIT
 URL:           http://www.pluginaweek.org
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.8.0-1
+- Release 0.8.0 of state_machine.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 13:16:18 -0000	1.2
+++ sources	17 Aug 2009 14:04:57 -0000	1.3
@@ -1 +1 @@
-14fb2917a858b196f5c8f5048eafdf35  state_machine-0.7.6.gem
+40d39370832a1f10dc40acb20f418947  state_machine-0.8.0.gem



From mcpierce at fedoraproject.org  Mon Aug 17 14:12:25 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon, 17 Aug 2009 14:12:25 +0000 (UTC)
Subject: rpms/rubygem-state_machine/F-10 .cvsignore, 1.2,
	1.3 rubygem-state_machine.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090817141225.E57DD11C00E4@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-state_machine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19654

Modified Files:
	.cvsignore rubygem-state_machine.spec sources 
Log Message:
* Mon Aug 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.8.0-1
- Release 0.8.0 of state_machine.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 13:27:28 -0000	1.2
+++ .cvsignore	17 Aug 2009 14:12:25 -0000	1.3
@@ -1 +1 @@
-state_machine-0.7.6.gem
+state_machine-0.8.0.gem


Index: rubygem-state_machine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/F-10/rubygem-state_machine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-state_machine.spec	14 Jul 2009 13:27:29 -0000	1.1
+++ rubygem-state_machine.spec	17 Aug 2009 14:12:25 -0000	1.2
@@ -6,7 +6,7 @@
 
 Summary:       Adds support for creating state machines for attributes on any Ruby class
 Name:          rubygem-%{gemname}
-Version:       0.7.6
+Version:       0.8.0
 Release:       1%{?dist}
 Group:         Development/Languages
 License:       MIT
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.8.0-1
+- Release 0.8.0 of state_machine.
+
 * Tue Jul 14 2009 Darryl Pierce <dpierce at redhat.com> - 0.7.6-1
 - First official release for Fedora.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 13:27:29 -0000	1.2
+++ sources	17 Aug 2009 14:12:25 -0000	1.3
@@ -1 +1 @@
-14fb2917a858b196f5c8f5048eafdf35  state_machine-0.7.6.gem
+40d39370832a1f10dc40acb20f418947  state_machine-0.8.0.gem



From akurtakov at fedoraproject.org  Mon Aug 17 14:16:01 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 17 Aug 2009 14:16:01 +0000 (UTC)
Subject: rpms/eclipse/devel sources,1.77,1.78 eclipse.spec,1.659,1.660
Message-ID: <20090817141601.A0FDA11C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20451/devel

Modified Files:
	sources eclipse.spec 
Log Message:
 Use o.e.equinox.initializer from SOURCE1 instead of separate one.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	11 Aug 2009 16:43:59 -0000	1.77
+++ sources	17 Aug 2009 14:16:01 -0000	1.78
@@ -1,5 +1,4 @@
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
-e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
 a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -p -r1.659 -r1.660
--- eclipse.spec	14 Aug 2009 05:18:58 -0000	1.659
+++ eclipse.spec	17 Aug 2009 14:16:01 -0000	1.660
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.6%{?dist}
+Release:        0.7%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -42,10 +42,6 @@ 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
-# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer
-# tar cjf eclipse-fileinitializerapp.tar.bz2 equinox-incubator/
-# (generated 2006-11-01 18:48 UTC)
-Source20:       %{name}-fileinitializerapp.tar.bz2
 # Script to wrap PDE Build calls for bundle builds
 Source21:       %{name}-pdebuild.sh
 # config.ini to run the director for provisioning the installation
@@ -631,8 +627,6 @@ if [ ! -z "$JARS" ]; then
    #FIXME: enable  exit 1
 fi
 
-tar jxf %{SOURCE20}
-
 # ECF filetransfer plugins
 # TODO Enable with correct ecf
 #tar jxf %{SOURCE25}
@@ -674,38 +668,14 @@ ORIGCLASSPATH=$CLASSPATH
 export JAVA_HOME=%{java_home}
 ./build.sh
 
-# Build the FileInitializer application
 SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
-mkdir -p home
-homedir=$(cd home && pwd)
 LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-I20090611-1540-fetched-src
-pushd equinox-incubator
-mkdir -p build
- 
-# This can go away when package build handles plugins (not just features)
-echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/assemble.org.eclipse.equinox.initializer.all.xml
-echo "<project default=\"main\"><target name=\"main\"></target></project>" > build/package.org.eclipse.equinox.initializer.all.xml
-
+pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-     -Duser.home=$homedir                              \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=plugin                                    \
-     -Did=org.eclipse.equinox.initializer                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-     
-pushd build/plugins/org.eclipse.equinox.initializer
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-     -Duser.home=$homedir                              \
       org.eclipse.core.launcher.Main \
      -application org.eclipse.ant.core.antRunner       \
      -f build.xml build.update.jar
-popd
+cp org.eclipse.equinox.initializer*.jar $SDK/plugins
 popd
 
 #
@@ -755,7 +725,6 @@ popd
 #rm build/rpmBuild/org.eclipse.test.zip
 #zip -r build/rpmBuild/org.eclipse.test.zip eclipse
 #popd
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -800,10 +769,6 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
-# Install the file initializer app
-cp -p  build/eclipse-I20090611-1540-fetched-src/equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
-  $sdkDir/plugins
-
 installDir=$sdkDir-Platform
 metadataDir=$installDir/metadata-Platform
 provisionDir=$installDir-provisioned
@@ -1487,6 +1452,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.7
+- Use o.e.equinox.initializer from SOURCE1 instead of separate one.
+
 * Fri Aug 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.6
 - Do not use the provided eclipse.ini but the one from build.
 



From jwilson at fedoraproject.org  Mon Aug 17 14:17:08 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 17 Aug 2009 14:17:08 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec, 1.1708, 1.1709 linux-2.6.29-lirc.patch,
	1.12, 1.13
Message-ID: <20090817141708.92D1A11C00E4@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20692

Modified Files:
	kernel.spec linux-2.6.29-lirc.patch 
Log Message:
* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.30.5-29
- Fix flub in prior lirc patch update that resulted in no lirc
  drivers getting built



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1708
retrieving revision 1.1709
diff -u -p -r1.1708 -r1.1709
--- kernel.spec	17 Aug 2009 02:32:11 -0000	1.1708
+++ kernel.spec	17 Aug 2009 14:17:07 -0000	1.1709
@@ -1895,6 +1895,10 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.30.5-29
+- Fix flub in prior lirc patch update that resulted in no lirc
+  drivers getting built
+
 * Sun Aug 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-28
 - Linux 2.6.30.5
 

linux-2.6.29-lirc.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  112 +
 drivers/input/lirc/Makefile           |   20 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  851 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_i2c.c         |  649 +++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2297 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 24 files changed, 14844 insertions(+)

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-lirc.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- linux-2.6.29-lirc.patch	10 Aug 2009 20:19:23 -0000	1.12
+++ linux-2.6.29-lirc.patch	17 Aug 2009 14:17:08 -0000	1.13
@@ -2,11 +2,14 @@ Linux Infrared Remote Control drivers --
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
-Refreshed 20090910
+Refreshed 20090917
 
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
+ MAINTAINERS                           |    9 +
+ drivers/input/Kconfig                 |    2 +
+ drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  112 ++
  drivers/input/lirc/Makefile           |   20 +
  drivers/input/lirc/lirc.h             |  100 ++
@@ -15,7 +18,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_dev.h         |  184 +++
  drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2297 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
@@ -28,8 +31,51 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
- 21 files changed, 14832 insertions(+), 0 deletions(-)
+ 24 files changed, 14844 insertions(+), 0 deletions(-)
 
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 59fd2d1..ad1b16c 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -2749,6 +2749,15 @@ W:	http://www.pasemi.com/
+ L:	linuxppc-dev at ozlabs.org
+ S:	Supported
+ 
++LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
++P:	Jarod Wilson
++M:	jarod at redhat.com
++P:	Christoph Bartelmus
++M:	lirc at bartelmus.de
++W:	http://www.lirc.org/
++L:	lirc-list at lists.sourceforge.net
++S:	Maintained
++
+ LINUX SECURITY MODULE (LSM) FRAMEWORK
+ P:	Chris Wright
+ M:	chrisw at sous-sol.org
+diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
+index 5f9d860..2ba0904 100644
+--- a/drivers/input/Kconfig
++++ b/drivers/input/Kconfig
+@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
+ 
+ source "drivers/input/touchscreen/Kconfig"
+ 
++source "drivers/input/lirc/Kconfig"
++
+ source "drivers/input/misc/Kconfig"
+ 
+ endif
+diff --git a/drivers/input/Makefile b/drivers/input/Makefile
+index 4c9c745..99e2b5e 100644
+--- a/drivers/input/Makefile
++++ b/drivers/input/Makefile
+@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
+ obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
+ 
+ obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
++
++obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
 index 0000000..6ef8622
@@ -2935,10 +2981,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..3c87d94
+index 0000000..05fe0c7
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2298 @@
+@@ -0,0 +1,2297 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -3339,8 +3385,7 @@ index 0000000..3c87d94
 +		 "open. 0=don't disable, 1=disable. (default: don't disable)");
 +module_param(pad_thresh, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(pad_thresh, "Threshold at which a pad push registers as an "
-+		 "arrow key in kbd mode (default 80 on newer devices, 15 on "
-+		 "older devices)");
++		 "arrow key in kbd mode (default: 28)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -4354,7 +4399,7 @@ index 0000000..3c87d94
 +		len = 8;
 +		timeout = 500;	/* in msecs */
 +		/* (2*threshold) x (2*threshold) square */
-+		threshold = pad_thresh ? pad_thresh : 80;
++		threshold = pad_thresh ? pad_thresh : 28;
 +		rel_x = buf[2];
 +		rel_y = buf[3];
 +



From jwilson at fedoraproject.org  Mon Aug 17 14:19:21 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 17 Aug 2009 14:19:21 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1709,1.1710
Message-ID: <20090817141921.8723911C00E4@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21851

Modified Files:
	kernel.spec 
Log Message:
fix release tag off-by-one


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1709
retrieving revision 1.1710
diff -u -p -r1.1709 -r1.1710
--- kernel.spec	17 Aug 2009 14:17:07 -0000	1.1709
+++ kernel.spec	17 Aug 2009 14:19:21 -0000	1.1710
@@ -1895,7 +1895,7 @@ fi
 # and build.
 
 %changelog
-* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.30.5-29
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.30.5-31
 - Fix flub in prior lirc patch update that resulted in no lirc
   drivers getting built
 



From mcpierce at fedoraproject.org  Mon Aug 17 14:22:48 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon, 17 Aug 2009 14:22:48 +0000 (UTC)
Subject: rpms/rubygem-state_machine/F-11 .cvsignore, 1.2,
	1.3 rubygem-state_machine.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090817142248.6795911C00E4@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-state_machine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22620

Modified Files:
	.cvsignore rubygem-state_machine.spec sources 
Log Message:
* Mon Aug 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.8.0-1
- Release 0.8.0 of state_machine.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 13:51:19 -0000	1.2
+++ .cvsignore	17 Aug 2009 14:22:48 -0000	1.3
@@ -1 +1 @@
-state_machine-0.7.6.gem
+state_machine-0.8.0.gem


Index: rubygem-state_machine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/F-11/rubygem-state_machine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-state_machine.spec	14 Jul 2009 13:51:19 -0000	1.1
+++ rubygem-state_machine.spec	17 Aug 2009 14:22:48 -0000	1.2
@@ -6,7 +6,7 @@
 
 Summary:       Adds support for creating state machines for attributes on any Ruby class
 Name:          rubygem-%{gemname}
-Version:       0.7.6
+Version:       0.8.0
 Release:       1%{?dist}
 Group:         Development/Languages
 License:       MIT
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.8.0-1
+- Release 0.8.0 of state_machine.
+
 * Tue Jul 14 2009 Darryl Pierce <dpierce at redhat.com> - 0.7.6-1
 - First official release for Fedora.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-state_machine/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 13:51:19 -0000	1.2
+++ sources	17 Aug 2009 14:22:48 -0000	1.3
@@ -1 +1 @@
-14fb2917a858b196f5c8f5048eafdf35  state_machine-0.7.6.gem
+40d39370832a1f10dc40acb20f418947  state_machine-0.8.0.gem



From tbzatek at fedoraproject.org  Mon Aug 17 14:32:02 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 17 Aug 2009 14:32:02 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.3.5-mkdir-exists-error.patch, NONE,
	1.1 gvfs.spec, 1.150, 1.151
Message-ID: <20090817143202.931E511C00E4@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24654

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.5-mkdir-exists-error.patch 
Log Message:
* Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-7
- Fix Nautilus can't create "untitled folder" on sftp mounts (#512611)


gvfs-1.3.5-mkdir-exists-error.patch:
 gvfsbackendsftp.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.3.5-mkdir-exists-error.patch ---
>From 3fe8a3b48eb45392db2489434fb1b3682ccdc5ab Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Mon, 17 Aug 2009 15:40:52 +0200
Subject: [PATCH] sftp: return proper error when directory exists

Nautilus depends on properly reported errors when an operation fails.
In this case, user was not able to create new directory on sftp share
when "untitled folder" already existed.

So let's mask sftp's universal SSH_FX_FAILURE error for SSH_FXP_MKDIR.
Specification says: "An error will be returned if a file or directory
with the specified path already exists."
---
 daemon/gvfsbackendsftp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index f810b31..cf33eaf 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -4350,7 +4350,7 @@ make_directory_reply (GVfsBackendSftp *backend,
                       gpointer user_data)
 {
   if (reply_type == SSH_FXP_STATUS)
-    result_from_status (job, reply, -1, -1); 
+    result_from_status (job, reply, G_IO_ERROR_EXISTS, -1); 
   else
     g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
                       _("Invalid reply received"));
-- 
1.6.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- gvfs.spec	14 Aug 2009 14:56:16 -0000	1.150
+++ gvfs.spec	17 Aug 2009 14:32:02 -0000	1.151
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -42,6 +42,9 @@ Patch4: gvfs-1.3.4-dont-strip-mount-pref
 # http://bugzilla.gnome.org/show_bug.cgi?id=590730
 Patch5: gvfs-1.3.5-gdaemonmount-root-path.patch
 Patch6: gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch
+# nautilus can't create "unamed folder X" if it exist on the target via sftp
+# https://bugzilla.redhat.com/show_bug.cgi?id=512611
+Patch7: gvfs-1.3.5-mkdir-exists-error.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=497631
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
@@ -143,6 +146,7 @@ and iPod Touches to applications using g
 %patch4 -p1 -b .mount-prefix
 %patch5 -p1 -b .root-path
 %patch6 -p1 -b .prefix-slash
+%patch7 -p1 -b .sftp-mkdir
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 %patch10 -p1 -b .afc
@@ -299,6 +303,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-7
+- Fix Nautilus can't create "untitled folder" on sftp mounts (#512611)
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 1.3.4-6
 - Update AFC patch
 



From pkgdb at fedoraproject.org  Mon Aug 17 14:35:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 14:35:19 +0000
Subject: [pkgdb] abrt: vda has requested commit
Message-ID: <20090817143521.246A710F85B@bastion2.fedora.phx.redhat.com>

vda has requested the commit acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 14:35:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 14:35:31 +0000
Subject: [pkgdb] abrt: vda has requested watchbugzilla
Message-ID: <20090817143531.E9AF610F888@bastion2.fedora.phx.redhat.com>

vda has requested the watchbugzilla acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 14:35:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 14:35:32 +0000
Subject: [pkgdb] abrt: vda has requested commit
Message-ID: <20090817143532.DCC2B10F88B@bastion2.fedora.phx.redhat.com>

vda has requested the commit acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 14:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 14:35:38 +0000
Subject: [pkgdb] abrt: vda has requested watchcommits
Message-ID: <20090817143540.8C6BE10F897@bastion2.fedora.phx.redhat.com>

vda has requested the watchcommits acl on abrt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 14:35:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 14:35:41 +0000
Subject: [pkgdb] abrt: vda has requested watchcommits
Message-ID: <20090817143541.DD70B10F898@bastion2.fedora.phx.redhat.com>

vda has requested the watchcommits acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 14:35:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 14:35:44 +0000
Subject: [pkgdb] abrt: vda has requested watchbugzilla
Message-ID: <20090817143544.B272310F89B@bastion2.fedora.phx.redhat.com>

vda has requested the watchbugzilla acl on abrt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pwouters at fedoraproject.org  Mon Aug 17 14:38:54 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 17 Aug 2009 14:38:54 +0000 (UTC)
Subject: rpms/nsd/devel .cvsignore, 1.16, 1.17 nsd.spec, 1.55, 1.56 sources, 
	1.23, 1.24
Message-ID: <20090817143854.176FC11C00E4@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26118

Modified Files:
	.cvsignore nsd.spec sources 
Log Message:
merged.
* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-1
-Updated to version 3.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	18 May 2009 21:49:27 -0000	1.16
+++ .cvsignore	17 Aug 2009 14:38:53 -0000	1.17
@@ -12,3 +12,4 @@ nsd-3.1.1.tar.gz
 nsd-3.2.0.tar.gz
 nsd-3.2.1.tar.gz
 nsd-3.2.2.tar.gz
+nsd-3.2.3.tar.gz


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- nsd.spec	25 Jul 2009 19:33:16 -0000	1.55
+++ nsd.spec	17 Aug 2009 14:38:53 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.2.2
-Release: 4%{?dist}
+Version: 3.2.3
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-1
+-Updated to version 3.2.3
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	18 May 2009 22:22:45 -0000	1.23
+++ sources	17 Aug 2009 14:38:53 -0000	1.24
@@ -1 +1,2 @@
 a0dcb0a3b3c1a8d386125eeafe403f58  nsd-3.2.2.tar.gz
+5ddb35dfb7da0defb82cda4f7388cba2  nsd-3.2.3.tar.gz



From beekhof at fedoraproject.org  Mon Aug 17 14:40:40 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 17 Aug 2009 14:40:40 +0000 (UTC)
Subject: rpms/cluster-glue/devel .cvsignore, 1.3, 1.4 cluster-glue.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090817144040.5E3DB11C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26570

Modified Files:
	.cvsignore cluster-glue.spec sources 
Log Message:
Refresh sources and include directives for upgrading from combined heartbeat packages in Fedora11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Aug 2009 13:37:09 -0000	1.3
+++ .cvsignore	17 Aug 2009 14:40:40 -0000	1.4
@@ -1 +1 @@
-75cab275433e.tar.bz2
+d97b9dea436e.tar.bz2


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cluster-glue.spec	10 Aug 2009 13:37:09 -0000	1.4
+++ cluster-glue.spec	17 Aug 2009 14:40:40 -0000	1.5
@@ -4,8 +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 upstreamprefix Reusable-Cluster-Components-
-%global upstreamversion 75cab275433e
+%global upstreamversion d97b9dea436e
 
 # Keep around for when/if required
 %global alphatag %{upstreamversion}.hg
@@ -13,12 +14,18 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}8%{?alphatag:.%{alphatag}}%{?dist}
+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
 
+# Directives to allow upgrade from combined heartbeat packages in Fedora11
+Provides:	heartbeat-stonith = 2:%{version}-%{release}
+Provides:	heartbeat-pils = 2:%{version}-%{release}
+Obsoletes:	heartbeat-stonith < 2:1.0-0.9
+Obsoletes:	heartbeat-pils < 2:1.0-0.9
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -39,7 +46,7 @@ BuildRequires: libuuid-devel
 
 ./autogen.sh
 
-%{_configure}	CFLAGS="${CFLAGS} $(echo '%{optflags}')" \
+%{configure}	CFLAGS="${CFLAGS} $(echo '%{optflags}')" \
 		--enable-fatal-warnings=no   \
 		--localstatedir=%{_var}      \
 		--with-daemon-group=%{gname} \
@@ -72,9 +79,13 @@ standards, and an interface to common ST
 %files
 %defattr(-,root,root)
 %{_sbindir}/ha_logger
+%{_sbindir}/hb_report
 %{_sbindir}/lrmadmin
 %{_sbindir}/meatclient
+%{_sbindir}/sbd
 %{_sbindir}/stonith
+%{_sysconfdir}/init.d/logd
+
 %dir %{_libdir}/heartbeat
 %dir %{_libdir}/heartbeat/plugins
 %dir %{_libdir}/heartbeat/plugins/RAExec
@@ -83,6 +94,7 @@ standards, and an interface to common ST
 %{_libdir}/heartbeat/ha_logd
 %{_libdir}/heartbeat/plugins/RAExec/*.so
 %{_libdir}/heartbeat/plugins/InterfaceMgr/*.so
+
 %dir %{_libdir}/stonith
 %dir %{_libdir}/stonith/plugins
 %dir %{_libdir}/stonith/plugins/stonith2
@@ -90,12 +102,19 @@ standards, and an interface to common ST
 %{_libdir}/stonith/plugins/stonith2/*.so
 %{_libdir}/stonith/plugins/stonith2/*.py*
 %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
+
+%dir %{_datadir}/heartbeat
+%{_datadir}/heartbeat/ha_cf_support.sh
+%{_datadir}/heartbeat/openais_conf_support.sh
+%{_datadir}/heartbeat/utillib.sh
+
 %dir %{_var}/lib/heartbeat
 %dir %{_var}/lib/heartbeat/cores
 %dir %attr (0700, root, root)		%{_var}/lib/heartbeat/cores/root
 %dir %attr (0700, nobody, %{nogroup})	%{_var}/lib/heartbeat/cores/nobody
 %dir %attr (0700, %{uname}, %{gname})	%{_var}/lib/heartbeat/cores/%{uname}
-%doc %{_datadir}/doc/stonith
+
+%doc %{_datadir}/doc/glue/stonith
 %doc %{_mandir}/man8/*
 %doc %{_mandir}/man1/*
 %doc AUTHORS
@@ -165,6 +184,31 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.9.d97b9dea436e.hg
+- Include relevant provides: and obsoletes: directives for heartbeat
+- Update the tarball from upstream to version d97b9dea436e
+  + Include license files
+  + Fix error messages in autogen.sh
+  + High (bnc#501723): Tools: hb_report: collect archived logs too
+  + Medium: clplumbing: check input when creating IPC channels
+  + Medium (bnc#510299): stonith: set G_SLICE to always-malloc to avoid bad interaction with the threaded openhpi
+  + Med: hb_report: report on more packages and with more state.
+  + The -E option to lrmadmin does not take an argument
+  + Provide a default value for docdir and ensure it is expanded
+  + Low: clplumbing: fix a potential resource leak in cl_random (bnc#525393).
+  + Med: hb_report: Include dlm_tool debugging information if available.
+  + hb_report: Include more possible error output.
+  + Medium: logd: add init script and example configuration file.
+  + High: logd: Fix init script. Remove apphbd references.
+  + logd: configuration file is optional.
+  + logd: print status on finished operations.
+  + High: sbd: actually install the binary.
+  + Medium: stonith: remove references to heartbeat artifacts.
+  + High: hb_report: define HA_NOARCHBIN
+  + hb_report: correct syntax error.
+  + hb_report: Include details about more packages even.
+  + hb_report: report corosync packages too.
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-0.8.75cab275433e.hg
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 13:37:09 -0000	1.3
+++ sources	17 Aug 2009 14:40:40 -0000	1.4
@@ -1 +1 @@
-1b472f73e6c570f0169edc7d53094470  75cab275433e.tar.bz2
+4983dda666e45a491933fc121a386bc3  d97b9dea436e.tar.bz2



From mmcgrath at fedoraproject.org  Mon Aug 17 14:42:24 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 14:42:24 +0000 (UTC)
Subject: rpms/nagios/devel nagios.spec,1.73,1.74
Message-ID: <20090817144224.3EB8411C00E4@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26911

Modified Files:
	nagios.spec 
Log Message:
removed datarootdir for datadir


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- nagios.spec	17 Aug 2009 13:48:25 -0000	1.73
+++ nagios.spec	17 Aug 2009 14:42:23 -0000	1.74
@@ -1,7 +1,7 @@
 Name: nagios
 
 Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -94,7 +94,7 @@ may compile against.
 	--libexecdir=%{_libdir}/%{name}/plugins \
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--localstatedir=%{_localstatedir}/log/%{name} \
-	--datarootdir=%{_datadir}/%{name}/html \
+	--datadir=%{_datadir}/%{name}/html \
 	--with-gd-lib=%{_libdir} \
 	--with-gd-inc=%{_includedir} \
 	--enable-embedded-perl \
@@ -204,6 +204,9 @@ fi
 %{_includedir}/%{name}
 
 %changelog
+* Mon Aug 17 2009 Mike McGrath <mmcgrath at redhat.com> - 3.2.0-2
+- s/datarootdir/datadir/
+
 * Sun Aug 16 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.0-1
 - Upgrade to 3.2.0 (#517210).
 



From lkundrak at fedoraproject.org  Mon Aug 17 14:44:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 17 Aug 2009 14:44:06 +0000 (UTC)
Subject: rpms/sunbird/devel sunbird.spec, 1.35, 1.36 sunbird-0.9-gcc44.patch,
	1.3, NONE thunderbird-pango.patch, 1.3, NONE
Message-ID: <20090817144406.CA7AD11C00E4@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27280

Modified Files:
	sunbird.spec 
Removed Files:
	sunbird-0.9-gcc44.patch thunderbird-pango.patch 
Log Message:
* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.10.20090715hg
- Sync up with Thunderbird



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sunbird.spec	11 Aug 2009 14:01:19 -0000	1.35
+++ sunbird.spec	17 Aug 2009 14:44:06 -0000	1.36
@@ -13,14 +13,14 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.9.20090513hg%{?dist}
+Release:        0.10.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/calendar/sunbird/
 #Source0:        http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-Source0:        sunbird-1.0-20090513hg.tar.lzma
+Source0:        thunderbird-3.0b3-source.tar.bz2
 Source1:        sunbird.desktop
 Source2:        sunbird-l10n.tar
 #sunbird-langpacks-0.9.tar.gz
@@ -32,12 +32,10 @@ Source100:      find-external-requires
 
 # Pulled from Thunderbird
 Patch0:         mozilla-jemalloc.patch
-Patch1:         thunderbird-pango.patch
 
 # Ours
 Patch10:        sunbird-1.0-libical.patch
 Patch11:        sunbird-1.0-uilocale.patch
-Patch12:        sunbird-0.9-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,8 +71,8 @@ Summary:        The calendar extension t
 Group:          Applications/Productivity
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
-#Requires:       thunderbird >= 3.0-2.3.b3pre
-Requires:       thunderbird = 3.0-3.8.b3
+Requires:       thunderbird >= 3.0-3.8.b3
+Requires:       thunderbird < 3.0-3.8.b4
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -107,12 +105,10 @@ calendaring tasks.
 
 
 %prep
-%setup -q -a 2
+%setup -c -q -a 2
 %patch0 -p0 -b .jemalloc
-%patch1 -p1 -b .pango
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
-%patch12 -p0 -b .gcc44
 
 find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
 
@@ -299,6 +295,9 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.10.20090715hg
+- Sync up with Thunderbird
+
 * Tue Aug 11 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.8.20090513hg
 - Rebuild against new Thunderbird
 


--- sunbird-0.9-gcc44.patch DELETED ---


--- thunderbird-pango.patch DELETED ---



From remi at fedoraproject.org  Mon Aug 17 14:47:08 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 17 Aug 2009 14:47:08 +0000 (UTC)
Subject: rpms/ocsinventory/devel ocsinventory.patch, NONE,
	1.1 ocsinventory.spec, 1.10, 1.11
Message-ID: <20090817144708.8319E11C00E4@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27937

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory.patch 
Log Message:
security fix

ocsinventory.patch:
 machine.php |   89 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

--- NEW FILE ocsinventory.patch ---
--- branches/server/1.02/ocsreports/machine.php	2009/06/29 11:51:53	1762
+++ branches/server/1.02/ocsreports/machine.php	2009/08/12 10:24:11	1829
@@ -25,7 +25,7 @@
 
 if (isset($_GET['systemid'])) {
 	$systemid = $_GET['systemid'];
-	if ($systemid == "")
+	if ($systemid == "" or !is_numeric($systemid))
 	{
 		echo "Please Supply A System ID";
 		die();
@@ -33,7 +33,12 @@
 }
 elseif (isset($_POST['systemid'])) {
 	$systemid = $_POST['systemid'];
+	if ($systemid == "" or !is_numeric($systemid)){
+		echo "Please Supply A System ID";
+		die();
+	}
 }
+
 //for update blacklist serial or mac
 update_blacklist();
 
@@ -51,27 +56,27 @@
 }
 else 
 	$_SESSION["justAdded"] = false;
-	//TODO: voir si on loggue les evenements de groupe
-if( isset( $_GET["actgrp"] )) {	
-		//v???rification si la valeur correspond ??? un groupe
-		$reqGroups = "SELECT h.id id
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_' ";
-		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
-		if ($_SESSION["lvluser"]!=SADMIN)
-			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
-		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
-		$valGroups = mysql_fetch_array( $resGroups ); 
-		if (isset($valGroups['id'])){
-			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
-			
-			if( $_GET["actgrp"] == 0 ) 
-				$reqDelete .= " AND static<>0";
-			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
-			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
-			if( $_GET["actgrp"] != 0 )
-				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
-		}
+	//TODO: voir si on loggue les evenements de groupe
+if( isset( $_GET["actgrp"] )) {	
+		//v???rification si la valeur correspond ??? un groupe
+		$reqGroups = "SELECT h.id id
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_' ";
+		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
+		if ($_SESSION["lvluser"]!=SADMIN)
+			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
+		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
+		$valGroups = mysql_fetch_array( $resGroups ); 
+		if (isset($valGroups['id'])){
+			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
+			
+			if( $_GET["actgrp"] == 0 ) 
+				$reqDelete .= " AND static<>0";
+			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
+			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
+			if( $_GET["actgrp"] != 0 )
+				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
+		}
 }
 
 $queryMachine    = "SELECT * FROM hardware WHERE (ID=$systemid)";
@@ -413,8 +418,8 @@
 	//PROLOG_FREQ
 	optperso("PROLOG_FREQ",$l->g(724)." <font color=green size=1><i>PROLOG_FREQ</i></font>",$optPerso,0,$optdefault["PROLOG_FREQ"],$l->g(730));
 	//GROUPS
-	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
-	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
+	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
+	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
 	
 	if( mysql_num_rows( $resGroups )>0 ) {
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -422,7 +427,7 @@
 			echo "<tr>";
 			echo "<td bgcolor='white' align='center' valign='center'>&nbsp;</td>";
 			echo $td3.$l->g(607)." ";		
-			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
+			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
 				echo "<a href='index.php?multi=29&popup=1&systemid=".$valGroups["group_id"]."' target='_blank'>".$valGroups["name"]."</td>";
 			else
 				echo "<b>".$valGroups["name"]."</b></td>";			
@@ -434,11 +439,11 @@
 				case 2: echo "<font color='red'>".$l->g(597)."</font></td>"; break;
 			}
 			
-			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
+			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
 				$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500))."&grp=".$valGroups["group_id"];
 				switch( $valGroups["static"] ) {
 					case 0: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=2'>".$l->g(600)."</a></td>"; break;
-					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
+					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
 					case 2: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=0'>".$l->g(599)."</a></td>"; break;
 				}
 			}			
@@ -467,20 +472,20 @@
 			echo "</tr>";
 		}
 	}
-	
+	
 		$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500));
 		
 		echo "<tr><td colspan='10' align='right'>";
-		if( $_SESSION["lvluser"]==SADMIN ) 
-			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
-		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
+		if( $_SESSION["lvluser"]==SADMIN ) 
+			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
+		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
 		$l->g(589)."</a>";
-	
-		$reqGroups = "SELECT h.name,h.id,h.workgroup 
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_'";
-		if( $_SESSION["lvluser"]!=SADMIN )
-			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
+	
+		$reqGroups = "SELECT h.name,h.id,h.workgroup 
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_'";
+		if( $_SESSION["lvluser"]!=SADMIN )
+			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
 		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
 		$first = true;
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -495,7 +500,7 @@
 			echo "</select>";
 			
 		echo "</td></tr>";		
-	//}
+	//}
 	echo "</table><br>";
 	
 	if ($_POST['modification_param'])
@@ -784,7 +789,7 @@
 		$td3".textDecode($item->TYPE)."       </td>
 		$td3".textDecode($item->SPEED)."      </td>
 		$td3".textDecode($item->MACADDR).($const?"<br>($const)":"");
-		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"R?seau(x)");
+		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Reseau(x)");
 		echo "</td>";
 		echo "$td3".textDecode($item->STATUS)."     </td>
 		$td3".textDecode($item->IPADDRESS)."  </td>
@@ -1185,7 +1190,7 @@
 	<script language=javascript>
 		function confirme(did,champ,lbl){
 			if(confirm(lbl+" ?"))
-				window.location="machine.php?systemid=<? echo $systemid ?>&option=<? echo $direct ?>&"+champ+"="+did;
+				window.location="machine.php?systemid=<?php echo $systemid ?>&option=<?php echo $direct ?>&"+champ+"="+did;
 		}
 	</script>
 	<?php
@@ -1211,7 +1216,7 @@
 		@mysql_query("INSERT INTO blacklist_serials (SERIAL) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 
 	//blacklist mac
-	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")
+	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")
 		@mysql_query("INSERT INTO blacklist_macaddresses (MACADDRESS) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 		
 	// unblacklist serial
@@ -1219,7 +1224,7 @@
 		@mysql_query("DELETE FROM blacklist_serials WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 		
 	// unblacklist mac 
-	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")	
+	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")	
 		@mysql_query("DELETE FROM blacklist_macaddresses WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 	
 }


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocsinventory.spec	25 Jul 2009 20:07:55 -0000	1.10
+++ ocsinventory.spec	17 Aug 2009 14:47:08 -0000	1.11
@@ -10,7 +10,7 @@ Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,6 +19,8 @@ URL:         http://www.ocsinventory-ng.
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/branches/server/1.02/ocsreports/machine.php?r1=1762&r2=1829&view=patch
+Patch0:      ocsinventory.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +128,7 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%patch0 -p3
 
 %build
 cd Apache
@@ -259,7 +262,7 @@ fi
 
 %files reports
 %defattr(-, root, root, -)
-%doc LICENSE.txt README
+%doc LICENSE.txt README ChangeLog
 %dir %{_sysconfdir}/ocsinventory
 %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
 %attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
@@ -271,6 +274,10 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-3
+- add ChangeLog
+- Security Fixes (internal version 5003) Bug #517837
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Mon Aug 17 14:48:13 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 17 Aug 2009 14:48:13 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.33, 1.34 sources, 1.33,
	1.34 telepathy-glib.spec, 1.42, 1.43
Message-ID: <20090817144813.B4DE311C00E4@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28245

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Mon Aug 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.34-1
- Update to 0.7.34.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	27 Jun 2009 14:02:58 -0000	1.33
+++ .cvsignore	17 Aug 2009 14:48:13 -0000	1.34
@@ -1 +1 @@
-telepathy-glib-0.7.33.tar.gz
+telepathy-glib-0.7.34.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	27 Jun 2009 14:02:58 -0000	1.33
+++ sources	17 Aug 2009 14:48:13 -0000	1.34
@@ -1 +1 @@
-2e9f8ee2c7ffa1612f70bb36757b99e5  telepathy-glib-0.7.33.tar.gz
+a655531426dabd8cf453590069497d04  telepathy-glib-0.7.34.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- telepathy-glib.spec	27 Jul 2009 05:44:09 -0000	1.42
+++ telepathy-glib.spec	17 Aug 2009 14:48:13 -0000	1.43
@@ -3,8 +3,8 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.33
-Release:        2%{?dist}
+Version:        0.7.34
+Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
 Group:          System Environment/Libraries
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.34-1
+- Update to 0.7.34.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.33-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From awjb at fedoraproject.org  Mon Aug 17 14:49:27 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 17 Aug 2009 14:49:27 +0000 (UTC)
Subject: rpms/synce-hal/F-10 synce-hal.spec,1.5,1.6
Message-ID: <20090817144927.06FEE11C00E4@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28454/F-10

Modified Files:
	synce-hal.spec 
Log Message:
- pull sock patch from devel



Index: synce-hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-hal/F-10/synce-hal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- synce-hal.spec	21 Jul 2009 19:22:48 -0000	1.5
+++ synce-hal.spec	17 Aug 2009 14:49:26 -0000	1.6
@@ -1,12 +1,14 @@
 Name:           synce-hal
 Version:        0.14
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Connection framework and dccm-implementation
 
 Group:          Applications/Communications
 License:        GPLv2
 URL:            http://www.synce.org
 Source0:        http://downloads.sourceforge.net/synce/%{name}-%{version}.tar.gz
+# see #514768 create sockets in /var/run instead of /tmp
+Patch0:         synce-hal-sock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsynce-devel
@@ -26,6 +28,7 @@ for Windows Mobile devices that integrat
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-bluetooth-support --with-hal-addon-dir=%{_libexecdir}
@@ -59,6 +62,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/ppp/ip-up.d/synce-bt*
 
 %changelog
+* Mon Aug 03 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-3
+- add patch to create sock files in /var/run
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.14-1
 - version upgrade



From awjb at fedoraproject.org  Mon Aug 17 14:49:27 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 17 Aug 2009 14:49:27 +0000 (UTC)
Subject: rpms/synce-hal/F-11 synce-hal.spec,1.6,1.7
Message-ID: <20090817144927.4F12E11C0346@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28454/F-11

Modified Files:
	synce-hal.spec 
Log Message:
- pull sock patch from devel



Index: synce-hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-hal/F-11/synce-hal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- synce-hal.spec	21 Jul 2009 19:22:48 -0000	1.6
+++ synce-hal.spec	17 Aug 2009 14:49:27 -0000	1.7
@@ -1,12 +1,14 @@
 Name:           synce-hal
 Version:        0.14
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Connection framework and dccm-implementation
 
 Group:          Applications/Communications
 License:        GPLv2
 URL:            http://www.synce.org
 Source0:        http://downloads.sourceforge.net/synce/%{name}-%{version}.tar.gz
+# see #514768 create sockets in /var/run instead of /tmp
+Patch0:         synce-hal-sock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsynce-devel
@@ -26,6 +28,7 @@ for Windows Mobile devices that integrat
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-bluetooth-support --with-hal-addon-dir=%{_libexecdir}
@@ -59,6 +62,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/ppp/ip-up.d/synce-bt*
 
 %changelog
+* Mon Aug 03 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-3
+- add patch to create sock files in /var/run
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.14-1
 - version upgrade



From awjb at fedoraproject.org  Mon Aug 17 14:49:27 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 17 Aug 2009 14:49:27 +0000 (UTC)
Subject: rpms/synce-hal/devel synce-hal.spec,1.8,1.9
Message-ID: <20090817144927.8B3AC11C034A@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28454/devel

Modified Files:
	synce-hal.spec 
Log Message:
- pull sock patch from devel



Index: synce-hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-hal/devel/synce-hal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- synce-hal.spec	3 Aug 2009 18:30:34 -0000	1.8
+++ synce-hal.spec	17 Aug 2009 14:49:27 -0000	1.9
@@ -62,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/ppp/ip-up.d/synce-bt*
 
 %changelog
+* Mon Aug 03 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-3
+- add patch to create sock files in /var/run
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tbzatek at fedoraproject.org  Mon Aug 17 14:52:34 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 17 Aug 2009 14:52:34 +0000 (UTC)
Subject: rpms/gvfs/F-11 gvfs-1.3.5-mkdir-exists-error.patch, NONE,
	1.1 gvfs.spec, 1.141, 1.142
Message-ID: <20090817145234.1F14311C00E4@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29903

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.5-mkdir-exists-error.patch 
Log Message:
* Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-11
- Fix Nautilus can't create "untitled folder" on sftp mounts (#512611)


gvfs-1.3.5-mkdir-exists-error.patch:
 gvfsbackendsftp.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.3.5-mkdir-exists-error.patch ---
>From 3fe8a3b48eb45392db2489434fb1b3682ccdc5ab Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Mon, 17 Aug 2009 15:40:52 +0200
Subject: [PATCH] sftp: return proper error when directory exists

Nautilus depends on properly reported errors when an operation fails.
In this case, user was not able to create new directory on sftp share
when "untitled folder" already existed.

So let's mask sftp's universal SSH_FX_FAILURE error for SSH_FXP_MKDIR.
Specification says: "An error will be returned if a file or directory
with the specified path already exists."
---
 daemon/gvfsbackendsftp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index f810b31..cf33eaf 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -4350,7 +4350,7 @@ make_directory_reply (GVfsBackendSftp *backend,
                       gpointer user_data)
 {
   if (reply_type == SSH_FXP_STATUS)
-    result_from_status (job, reply, -1, -1); 
+    result_from_status (job, reply, G_IO_ERROR_EXISTS, -1); 
   else
     g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
                       _("Invalid reply received"));
-- 
1.6.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- gvfs.spec	7 Aug 2009 13:23:00 -0000	1.141
+++ gvfs.spec	17 Aug 2009 14:52:33 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -46,6 +46,9 @@ Patch6: gvfs-1.3.4-smb-browse-fake-conte
 # Bad mount prefix stripping in g_daemon_file_get_path()
 # http://bugzilla.gnome.org/show_bug.cgi?id=590862
 Patch7: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
+# 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
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -182,6 +185,7 @@ media players (Media Transfer Protocol) 
 %patch5 -p1 -b .sftp-timeout
 %patch6 -p1 -b .smb-fake-content-type
 %patch7 -p1 -b .mount-prefix
+%patch8 -p1 -b .sftp-mkdir
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -347,6 +351,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-11
+- Fix Nautilus can't create "untitled folder" on sftp mounts (#512611)
+
 * Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-10
 - Fix bad mount prefix stripping (part of #509612)
 



From remi at fedoraproject.org  Mon Aug 17 14:52:57 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 17 Aug 2009 14:52:57 +0000 (UTC)
Subject: rpms/ocsinventory/F-11 ocsinventory.patch, NONE,
	1.1 ocsinventory.spec, 1.9, 1.10
Message-ID: <20090817145257.B8F1311C00E4@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30041

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory.patch 
Log Message:
security fix

ocsinventory.patch:
 machine.php |   89 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

--- NEW FILE ocsinventory.patch ---
--- branches/server/1.02/ocsreports/machine.php	2009/06/29 11:51:53	1762
+++ branches/server/1.02/ocsreports/machine.php	2009/08/12 10:24:11	1829
@@ -25,7 +25,7 @@
 
 if (isset($_GET['systemid'])) {
 	$systemid = $_GET['systemid'];
-	if ($systemid == "")
+	if ($systemid == "" or !is_numeric($systemid))
 	{
 		echo "Please Supply A System ID";
 		die();
@@ -33,7 +33,12 @@
 }
 elseif (isset($_POST['systemid'])) {
 	$systemid = $_POST['systemid'];
+	if ($systemid == "" or !is_numeric($systemid)){
+		echo "Please Supply A System ID";
+		die();
+	}
 }
+
 //for update blacklist serial or mac
 update_blacklist();
 
@@ -51,27 +56,27 @@
 }
 else 
 	$_SESSION["justAdded"] = false;
-	//TODO: voir si on loggue les evenements de groupe
-if( isset( $_GET["actgrp"] )) {	
-		//v???rification si la valeur correspond ??? un groupe
-		$reqGroups = "SELECT h.id id
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_' ";
-		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
-		if ($_SESSION["lvluser"]!=SADMIN)
-			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
-		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
-		$valGroups = mysql_fetch_array( $resGroups ); 
-		if (isset($valGroups['id'])){
-			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
-			
-			if( $_GET["actgrp"] == 0 ) 
-				$reqDelete .= " AND static<>0";
-			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
-			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
-			if( $_GET["actgrp"] != 0 )
-				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
-		}
+	//TODO: voir si on loggue les evenements de groupe
+if( isset( $_GET["actgrp"] )) {	
+		//v???rification si la valeur correspond ??? un groupe
+		$reqGroups = "SELECT h.id id
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_' ";
+		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
+		if ($_SESSION["lvluser"]!=SADMIN)
+			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
+		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
+		$valGroups = mysql_fetch_array( $resGroups ); 
+		if (isset($valGroups['id'])){
+			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
+			
+			if( $_GET["actgrp"] == 0 ) 
+				$reqDelete .= " AND static<>0";
+			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
+			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
+			if( $_GET["actgrp"] != 0 )
+				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
+		}
 }
 
 $queryMachine    = "SELECT * FROM hardware WHERE (ID=$systemid)";
@@ -413,8 +418,8 @@
 	//PROLOG_FREQ
 	optperso("PROLOG_FREQ",$l->g(724)." <font color=green size=1><i>PROLOG_FREQ</i></font>",$optPerso,0,$optdefault["PROLOG_FREQ"],$l->g(730));
 	//GROUPS
-	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
-	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
+	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
+	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
 	
 	if( mysql_num_rows( $resGroups )>0 ) {
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -422,7 +427,7 @@
 			echo "<tr>";
 			echo "<td bgcolor='white' align='center' valign='center'>&nbsp;</td>";
 			echo $td3.$l->g(607)." ";		
-			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
+			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
 				echo "<a href='index.php?multi=29&popup=1&systemid=".$valGroups["group_id"]."' target='_blank'>".$valGroups["name"]."</td>";
 			else
 				echo "<b>".$valGroups["name"]."</b></td>";			
@@ -434,11 +439,11 @@
 				case 2: echo "<font color='red'>".$l->g(597)."</font></td>"; break;
 			}
 			
-			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
+			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
 				$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500))."&grp=".$valGroups["group_id"];
 				switch( $valGroups["static"] ) {
 					case 0: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=2'>".$l->g(600)."</a></td>"; break;
-					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
+					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
 					case 2: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=0'>".$l->g(599)."</a></td>"; break;
 				}
 			}			
@@ -467,20 +472,20 @@
 			echo "</tr>";
 		}
 	}
-	
+	
 		$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500));
 		
 		echo "<tr><td colspan='10' align='right'>";
-		if( $_SESSION["lvluser"]==SADMIN ) 
-			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
-		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
+		if( $_SESSION["lvluser"]==SADMIN ) 
+			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
+		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
 		$l->g(589)."</a>";
-	
-		$reqGroups = "SELECT h.name,h.id,h.workgroup 
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_'";
-		if( $_SESSION["lvluser"]!=SADMIN )
-			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
+	
+		$reqGroups = "SELECT h.name,h.id,h.workgroup 
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_'";
+		if( $_SESSION["lvluser"]!=SADMIN )
+			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
 		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
 		$first = true;
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -495,7 +500,7 @@
 			echo "</select>";
 			
 		echo "</td></tr>";		
-	//}
+	//}
 	echo "</table><br>";
 	
 	if ($_POST['modification_param'])
@@ -784,7 +789,7 @@
 		$td3".textDecode($item->TYPE)."       </td>
 		$td3".textDecode($item->SPEED)."      </td>
 		$td3".textDecode($item->MACADDR).($const?"<br>($const)":"");
-		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"R?seau(x)");
+		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Reseau(x)");
 		echo "</td>";
 		echo "$td3".textDecode($item->STATUS)."     </td>
 		$td3".textDecode($item->IPADDRESS)."  </td>
@@ -1185,7 +1190,7 @@
 	<script language=javascript>
 		function confirme(did,champ,lbl){
 			if(confirm(lbl+" ?"))
-				window.location="machine.php?systemid=<? echo $systemid ?>&option=<? echo $direct ?>&"+champ+"="+did;
+				window.location="machine.php?systemid=<?php echo $systemid ?>&option=<?php echo $direct ?>&"+champ+"="+did;
 		}
 	</script>
 	<?php
@@ -1211,7 +1216,7 @@
 		@mysql_query("INSERT INTO blacklist_serials (SERIAL) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 
 	//blacklist mac
-	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")
+	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")
 		@mysql_query("INSERT INTO blacklist_macaddresses (MACADDRESS) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 		
 	// unblacklist serial
@@ -1219,7 +1224,7 @@
 		@mysql_query("DELETE FROM blacklist_serials WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 		
 	// unblacklist mac 
-	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")	
+	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")	
 		@mysql_query("DELETE FROM blacklist_macaddresses WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 	
 }


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-11/ocsinventory.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocsinventory.spec	30 May 2009 18:34:00 -0000	1.9
+++ ocsinventory.spec	17 Aug 2009 14:52:57 -0000	1.10
@@ -10,7 +10,7 @@ Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02.1
-Release:     1%{?dist}
+Release:     3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,6 +19,8 @@ URL:         http://www.ocsinventory-ng.
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/branches/server/1.02/ocsreports/machine.php?r1=1762&r2=1829&view=patch
+Patch0:      ocsinventory.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +128,7 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%patch0 -p3
 
 %build
 cd Apache
@@ -259,7 +262,7 @@ fi
 
 %files reports
 %defattr(-, root, root, -)
-%doc LICENSE.txt README
+%doc LICENSE.txt README ChangeLog
 %dir %{_sysconfdir}/ocsinventory
 %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
 %attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
@@ -271,6 +274,10 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-3
+- add ChangeLog
+- Security Fixes (internal version 5003) Bug #517837
+
 * Sat May 30 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-1
 - update to OCS Inventory NG 1.02.1 - Security Fixes (internal version 5003)
 



From pwouters at fedoraproject.org  Mon Aug 17 14:53:55 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 17 Aug 2009 14:53:55 +0000 (UTC)
Subject: rpms/nsd/F-11 .cvsignore, 1.15, 1.16 nsd.spec, 1.54, 1.55 sources, 
	1.22, 1.23
Message-ID: <20090817145355.3688211C00E4@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29529

Modified Files:
	.cvsignore nsd.spec sources 
Log Message:
* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-1
- Updated to nsd-3.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	19 Jan 2009 16:53:22 -0000	1.15
+++ .cvsignore	17 Aug 2009 14:53:55 -0000	1.16
@@ -11,3 +11,4 @@ nsd-3.1.0.tar.gz
 nsd-3.1.1.tar.gz
 nsd-3.2.0.tar.gz
 nsd-3.2.1.tar.gz
+nsd-3.2.3.tar.gz


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- nsd.spec	18 May 2009 23:26:29 -0000	1.54
+++ nsd.spec	17 Aug 2009 14:53:55 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.2.2
-Release: 2%{?dist}
+Version: 3.2.3
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-1
+- Updated to nsd-3.2.3
+
 * Mon May 18 2009 Paul Wouters <paul at xelerance.com> - 3.2.2-2
 - Bump version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	18 May 2009 22:22:44 -0000	1.22
+++ sources	17 Aug 2009 14:53:55 -0000	1.23
@@ -1 +1,2 @@
 a0dcb0a3b3c1a8d386125eeafe403f58  nsd-3.2.2.tar.gz
+5ddb35dfb7da0defb82cda4f7388cba2  nsd-3.2.3.tar.gz



From awjb at fedoraproject.org  Mon Aug 17 14:57:30 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 17 Aug 2009 14:57:30 +0000 (UTC)
Subject: rpms/synce-sync-engine/F-10 synce-sync-engine.spec,1.11,1.12
Message-ID: <20090817145730.2C5B711C00E4@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-sync-engine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31010/F-10

Modified Files:
	synce-sync-engine.spec 
Log Message:
- install dbus file (#514639)



Index: synce-sync-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-sync-engine/F-10/synce-sync-engine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- synce-sync-engine.spec	21 Jul 2009 20:11:45 -0000	1.11
+++ synce-sync-engine.spec	17 Aug 2009 14:57:29 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           synce-sync-engine
 Version:        0.14
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Synce synchronization engine
 
 Group:          Applications/Communications
@@ -57,6 +57,13 @@ mv \
 
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/plugins/
 
+# install the dbus activation service
+install -Dpm0644 config/org.synce.SyncEngine.service \
+ $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.synce.SyncEngine.service
+
+# spurious doc dir installed by build process
+rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/sync-engine
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/opensync/defaults/
 
 # make defaults file
@@ -74,14 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING
+%doc CHANGELOG COPYING config/syncengine.conf.xml
 %{_bindir}/*py
 %{_bindir}/sync-engine
 %{python_sitelib}/SyncEngine/
 %{python_sitelib}/synce_sync_engine-%{version}-py?.?.egg-info/
-%{_datadir}/doc/sync-engine/
-%exclude %{_bindir}/*pyc
-%exclude %{_bindir}/*pyo
+%{_datadir}/dbus-1/services/org.synce.SyncEngine.service
 
 %files -n libopensync-plugin-synce-wm5
 %defattr(-,root,root,-)
@@ -89,6 +94,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/*
 
 %changelog
+* Wed Aug 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-3
+- install dbus file (#514639)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.14-1
 - version upgrade



From awjb at fedoraproject.org  Mon Aug 17 14:57:30 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 17 Aug 2009 14:57:30 +0000 (UTC)
Subject: rpms/synce-sync-engine/F-11 synce-sync-engine.spec,1.13,1.14
Message-ID: <20090817145730.46AF611C0346@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-sync-engine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31010/F-11

Modified Files:
	synce-sync-engine.spec 
Log Message:
- install dbus file (#514639)



Index: synce-sync-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-sync-engine/F-11/synce-sync-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- synce-sync-engine.spec	21 Jul 2009 19:22:15 -0000	1.13
+++ synce-sync-engine.spec	17 Aug 2009 14:57:30 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           synce-sync-engine
 Version:        0.14
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Synce synchronization engine
 
 Group:          Applications/Communications
@@ -57,6 +57,13 @@ mv \
 
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/plugins/
 
+# install the dbus activation service
+install -Dpm0644 config/org.synce.SyncEngine.service \
+ $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.synce.SyncEngine.service
+
+# spurious doc dir installed by build process
+rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/sync-engine
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/opensync/defaults/
 
 # make defaults file
@@ -74,12 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING
+%doc CHANGELOG COPYING config/syncengine.conf.xml
 %{_bindir}/*py
 %{_bindir}/sync-engine
 %{python_sitelib}/SyncEngine/
 %{python_sitelib}/synce_sync_engine-%{version}-py?.?.egg-info/
-%{_datadir}/doc/sync-engine/
+%{_datadir}/dbus-1/services/org.synce.SyncEngine.service
 
 %files -n libopensync-plugin-synce-wm5
 %defattr(-,root,root,-)
@@ -87,6 +94,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/*
 
 %changelog
+* Wed Aug 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-3
+- install dbus file (#514639)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.14-1
 - version upgrade



From remi at fedoraproject.org  Mon Aug 17 14:58:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 17 Aug 2009 14:58:54 +0000 (UTC)
Subject: rpms/ocsinventory/F-10 ocsinventory.patch, NONE,
	1.1 ocsinventory.spec, 1.8, 1.9
Message-ID: <20090817145854.956DD11C00E4@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31469

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory.patch 
Log Message:
security fix

ocsinventory.patch:
 machine.php |   89 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

--- NEW FILE ocsinventory.patch ---
--- branches/server/1.02/ocsreports/machine.php	2009/06/29 11:51:53	1762
+++ branches/server/1.02/ocsreports/machine.php	2009/08/12 10:24:11	1829
@@ -25,7 +25,7 @@
 
 if (isset($_GET['systemid'])) {
 	$systemid = $_GET['systemid'];
-	if ($systemid == "")
+	if ($systemid == "" or !is_numeric($systemid))
 	{
 		echo "Please Supply A System ID";
 		die();
@@ -33,7 +33,12 @@
 }
 elseif (isset($_POST['systemid'])) {
 	$systemid = $_POST['systemid'];
+	if ($systemid == "" or !is_numeric($systemid)){
+		echo "Please Supply A System ID";
+		die();
+	}
 }
+
 //for update blacklist serial or mac
 update_blacklist();
 
@@ -51,27 +56,27 @@
 }
 else 
 	$_SESSION["justAdded"] = false;
-	//TODO: voir si on loggue les evenements de groupe
-if( isset( $_GET["actgrp"] )) {	
-		//v???rification si la valeur correspond ??? un groupe
-		$reqGroups = "SELECT h.id id
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_' ";
-		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
-		if ($_SESSION["lvluser"]!=SADMIN)
-			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
-		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
-		$valGroups = mysql_fetch_array( $resGroups ); 
-		if (isset($valGroups['id'])){
-			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
-			
-			if( $_GET["actgrp"] == 0 ) 
-				$reqDelete .= " AND static<>0";
-			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
-			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
-			if( $_GET["actgrp"] != 0 )
-				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
-		}
+	//TODO: voir si on loggue les evenements de groupe
+if( isset( $_GET["actgrp"] )) {	
+		//v???rification si la valeur correspond ??? un groupe
+		$reqGroups = "SELECT h.id id
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_' ";
+		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
+		if ($_SESSION["lvluser"]!=SADMIN)
+			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
+		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
+		$valGroups = mysql_fetch_array( $resGroups ); 
+		if (isset($valGroups['id'])){
+			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
+			
+			if( $_GET["actgrp"] == 0 ) 
+				$reqDelete .= " AND static<>0";
+			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
+			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
+			if( $_GET["actgrp"] != 0 )
+				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
+		}
 }
 
 $queryMachine    = "SELECT * FROM hardware WHERE (ID=$systemid)";
@@ -413,8 +418,8 @@
 	//PROLOG_FREQ
 	optperso("PROLOG_FREQ",$l->g(724)." <font color=green size=1><i>PROLOG_FREQ</i></font>",$optPerso,0,$optdefault["PROLOG_FREQ"],$l->g(730));
 	//GROUPS
-	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
-	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
+	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
+	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
 	
 	if( mysql_num_rows( $resGroups )>0 ) {
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -422,7 +427,7 @@
 			echo "<tr>";
 			echo "<td bgcolor='white' align='center' valign='center'>&nbsp;</td>";
 			echo $td3.$l->g(607)." ";		
-			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
+			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
 				echo "<a href='index.php?multi=29&popup=1&systemid=".$valGroups["group_id"]."' target='_blank'>".$valGroups["name"]."</td>";
 			else
 				echo "<b>".$valGroups["name"]."</b></td>";			
@@ -434,11 +439,11 @@
 				case 2: echo "<font color='red'>".$l->g(597)."</font></td>"; break;
 			}
 			
-			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
+			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
 				$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500))."&grp=".$valGroups["group_id"];
 				switch( $valGroups["static"] ) {
 					case 0: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=2'>".$l->g(600)."</a></td>"; break;
-					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
+					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
 					case 2: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=0'>".$l->g(599)."</a></td>"; break;
 				}
 			}			
@@ -467,20 +472,20 @@
 			echo "</tr>";
 		}
 	}
-	
+	
 		$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500));
 		
 		echo "<tr><td colspan='10' align='right'>";
-		if( $_SESSION["lvluser"]==SADMIN ) 
-			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
-		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
+		if( $_SESSION["lvluser"]==SADMIN ) 
+			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
+		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
 		$l->g(589)."</a>";
-	
-		$reqGroups = "SELECT h.name,h.id,h.workgroup 
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_'";
-		if( $_SESSION["lvluser"]!=SADMIN )
-			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
+	
+		$reqGroups = "SELECT h.name,h.id,h.workgroup 
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_'";
+		if( $_SESSION["lvluser"]!=SADMIN )
+			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
 		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
 		$first = true;
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -495,7 +500,7 @@
 			echo "</select>";
 			
 		echo "</td></tr>";		
-	//}
+	//}
 	echo "</table><br>";
 	
 	if ($_POST['modification_param'])
@@ -784,7 +789,7 @@
 		$td3".textDecode($item->TYPE)."       </td>
 		$td3".textDecode($item->SPEED)."      </td>
 		$td3".textDecode($item->MACADDR).($const?"<br>($const)":"");
-		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"R?seau(x)");
+		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Reseau(x)");
 		echo "</td>";
 		echo "$td3".textDecode($item->STATUS)."     </td>
 		$td3".textDecode($item->IPADDRESS)."  </td>
@@ -1185,7 +1190,7 @@
 	<script language=javascript>
 		function confirme(did,champ,lbl){
 			if(confirm(lbl+" ?"))
-				window.location="machine.php?systemid=<? echo $systemid ?>&option=<? echo $direct ?>&"+champ+"="+did;
+				window.location="machine.php?systemid=<?php echo $systemid ?>&option=<?php echo $direct ?>&"+champ+"="+did;
 		}
 	</script>
 	<?php
@@ -1211,7 +1216,7 @@
 		@mysql_query("INSERT INTO blacklist_serials (SERIAL) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 
 	//blacklist mac
-	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")
+	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")
 		@mysql_query("INSERT INTO blacklist_macaddresses (MACADDRESS) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 		
 	// unblacklist serial
@@ -1219,7 +1224,7 @@
 		@mysql_query("DELETE FROM blacklist_serials WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 		
 	// unblacklist mac 
-	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")	
+	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")	
 		@mysql_query("DELETE FROM blacklist_macaddresses WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 	
 }


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-10/ocsinventory.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocsinventory.spec	30 May 2009 18:40:02 -0000	1.8
+++ ocsinventory.spec	17 Aug 2009 14:58:54 -0000	1.9
@@ -10,7 +10,7 @@ Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02.1
-Release:     1%{?dist}
+Release:     3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,6 +19,8 @@ URL:         http://www.ocsinventory-ng.
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/branches/server/1.02/ocsreports/machine.php?r1=1762&r2=1829&view=patch
+Patch0:      ocsinventory.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +128,7 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%patch0 -p3
 
 %build
 cd Apache
@@ -259,7 +262,7 @@ fi
 
 %files reports
 %defattr(-, root, root, -)
-%doc LICENSE.txt README
+%doc LICENSE.txt README ChangeLog
 %dir %{_sysconfdir}/ocsinventory
 %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
 %attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
@@ -271,6 +274,10 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-3
+- add ChangeLog
+- Security Fixes (internal version 5003) Bug #517837
+
 * Sat May 30 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-1
 - update to OCS Inventory NG 1.02.1 - Security Fixes (internal version 5003)
 



From awjb at fedoraproject.org  Mon Aug 17 15:04:49 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 17 Aug 2009 15:04:49 +0000 (UTC)
Subject: rpms/openal/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE openal-gcc43.patch, 1.2, NONE openal-no-undefined.patch,
	1.1, NONE openal-pause.patch, 1.1, NONE openal-pkgconfig.patch,
	1.5, NONE openal-x86_64-mmx.patch, 1.1, NONE openal.spec, 1.30,
	NONE openalrc, 1.2, NONE sources, 1.8, NONE
Message-ID: <20090817150449.120FB11C00E4@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/openal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32600

Added Files:
	dead.package 
Removed Files:
	Makefile openal-gcc43.patch openal-no-undefined.patch 
	openal-pause.patch openal-pkgconfig.patch 
	openal-x86_64-mmx.patch openal.spec openalrc sources 
Log Message:
- EOL openal



--- NEW FILE dead.package ---
Obsoleted by openal-soft


--- Makefile DELETED ---


--- openal-gcc43.patch DELETED ---


--- openal-no-undefined.patch DELETED ---


--- openal-pause.patch DELETED ---


--- openal-pkgconfig.patch DELETED ---


--- openal-x86_64-mmx.patch DELETED ---


--- openal.spec DELETED ---


--- openalrc DELETED ---


--- sources DELETED ---



From remi at fedoraproject.org  Mon Aug 17 15:05:06 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 17 Aug 2009 15:05:06 +0000 (UTC)
Subject: rpms/ocsinventory/EL-5 ocsinventory.patch, NONE,
	1.1 ocsinventory.spec, 1.3, 1.4
Message-ID: <20090817150506.7CF4B11C00E4@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32725

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory.patch 
Log Message:
security fix

ocsinventory.patch:
 machine.php |   89 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

--- NEW FILE ocsinventory.patch ---
--- branches/server/1.02/ocsreports/machine.php	2009/06/29 11:51:53	1762
+++ branches/server/1.02/ocsreports/machine.php	2009/08/12 10:24:11	1829
@@ -25,7 +25,7 @@
 
 if (isset($_GET['systemid'])) {
 	$systemid = $_GET['systemid'];
-	if ($systemid == "")
+	if ($systemid == "" or !is_numeric($systemid))
 	{
 		echo "Please Supply A System ID";
 		die();
@@ -33,7 +33,12 @@
 }
 elseif (isset($_POST['systemid'])) {
 	$systemid = $_POST['systemid'];
+	if ($systemid == "" or !is_numeric($systemid)){
+		echo "Please Supply A System ID";
+		die();
+	}
 }
+
 //for update blacklist serial or mac
 update_blacklist();
 
@@ -51,27 +56,27 @@
 }
 else 
 	$_SESSION["justAdded"] = false;
-	//TODO: voir si on loggue les evenements de groupe
-if( isset( $_GET["actgrp"] )) {	
-		//v???rification si la valeur correspond ??? un groupe
-		$reqGroups = "SELECT h.id id
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_' ";
-		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
-		if ($_SESSION["lvluser"]!=SADMIN)
-			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
-		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
-		$valGroups = mysql_fetch_array( $resGroups ); 
-		if (isset($valGroups['id'])){
-			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
-			
-			if( $_GET["actgrp"] == 0 ) 
-				$reqDelete .= " AND static<>0";
-			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
-			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
-			if( $_GET["actgrp"] != 0 )
-				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
-		}
+	//TODO: voir si on loggue les evenements de groupe
+if( isset( $_GET["actgrp"] )) {	
+		//v???rification si la valeur correspond ??? un groupe
+		$reqGroups = "SELECT h.id id
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_' ";
+		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
+		if ($_SESSION["lvluser"]!=SADMIN)
+			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
+		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
+		$valGroups = mysql_fetch_array( $resGroups ); 
+		if (isset($valGroups['id'])){
+			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
+			
+			if( $_GET["actgrp"] == 0 ) 
+				$reqDelete .= " AND static<>0";
+			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
+			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
+			if( $_GET["actgrp"] != 0 )
+				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
+		}
 }
 
 $queryMachine    = "SELECT * FROM hardware WHERE (ID=$systemid)";
@@ -413,8 +418,8 @@
 	//PROLOG_FREQ
 	optperso("PROLOG_FREQ",$l->g(724)." <font color=green size=1><i>PROLOG_FREQ</i></font>",$optPerso,0,$optdefault["PROLOG_FREQ"],$l->g(730));
 	//GROUPS
-	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
-	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
+	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
+	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
 	
 	if( mysql_num_rows( $resGroups )>0 ) {
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -422,7 +427,7 @@
 			echo "<tr>";
 			echo "<td bgcolor='white' align='center' valign='center'>&nbsp;</td>";
 			echo $td3.$l->g(607)." ";		
-			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
+			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
 				echo "<a href='index.php?multi=29&popup=1&systemid=".$valGroups["group_id"]."' target='_blank'>".$valGroups["name"]."</td>";
 			else
 				echo "<b>".$valGroups["name"]."</b></td>";			
@@ -434,11 +439,11 @@
 				case 2: echo "<font color='red'>".$l->g(597)."</font></td>"; break;
 			}
 			
-			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
+			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
 				$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500))."&grp=".$valGroups["group_id"];
 				switch( $valGroups["static"] ) {
 					case 0: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=2'>".$l->g(600)."</a></td>"; break;
-					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
+					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
 					case 2: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=0'>".$l->g(599)."</a></td>"; break;
 				}
 			}			
@@ -467,20 +472,20 @@
 			echo "</tr>";
 		}
 	}
-	
+	
 		$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500));
 		
 		echo "<tr><td colspan='10' align='right'>";
-		if( $_SESSION["lvluser"]==SADMIN ) 
-			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
-		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
+		if( $_SESSION["lvluser"]==SADMIN ) 
+			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
+		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
 		$l->g(589)."</a>";
-	
-		$reqGroups = "SELECT h.name,h.id,h.workgroup 
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_'";
-		if( $_SESSION["lvluser"]!=SADMIN )
-			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
+	
+		$reqGroups = "SELECT h.name,h.id,h.workgroup 
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_'";
+		if( $_SESSION["lvluser"]!=SADMIN )
+			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
 		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
 		$first = true;
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -495,7 +500,7 @@
 			echo "</select>";
 			
 		echo "</td></tr>";		
-	//}
+	//}
 	echo "</table><br>";
 	
 	if ($_POST['modification_param'])
@@ -784,7 +789,7 @@
 		$td3".textDecode($item->TYPE)."       </td>
 		$td3".textDecode($item->SPEED)."      </td>
 		$td3".textDecode($item->MACADDR).($const?"<br>($const)":"");
-		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"R?seau(x)");
+		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Reseau(x)");
 		echo "</td>";
 		echo "$td3".textDecode($item->STATUS)."     </td>
 		$td3".textDecode($item->IPADDRESS)."  </td>
@@ -1185,7 +1190,7 @@
 	<script language=javascript>
 		function confirme(did,champ,lbl){
 			if(confirm(lbl+" ?"))
-				window.location="machine.php?systemid=<? echo $systemid ?>&option=<? echo $direct ?>&"+champ+"="+did;
+				window.location="machine.php?systemid=<?php echo $systemid ?>&option=<?php echo $direct ?>&"+champ+"="+did;
 		}
 	</script>
 	<?php
@@ -1211,7 +1216,7 @@
 		@mysql_query("INSERT INTO blacklist_serials (SERIAL) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 
 	//blacklist mac
-	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")
+	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")
 		@mysql_query("INSERT INTO blacklist_macaddresses (MACADDRESS) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 		
 	// unblacklist serial
@@ -1219,7 +1224,7 @@
 		@mysql_query("DELETE FROM blacklist_serials WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 		
 	// unblacklist mac 
-	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")	
+	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")	
 		@mysql_query("DELETE FROM blacklist_macaddresses WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 	
 }


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-5/ocsinventory.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocsinventory.spec	30 May 2009 18:53:00 -0000	1.3
+++ ocsinventory.spec	17 Aug 2009 15:05:06 -0000	1.4
@@ -10,7 +10,7 @@ Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02.1
-Release:     1%{?dist}
+Release:     3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,6 +19,8 @@ URL:         http://www.ocsinventory-ng.
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/branches/server/1.02/ocsreports/machine.php?r1=1762&r2=1829&view=patch
+Patch0:      ocsinventory.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +128,7 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%patch0 -p3
 
 %build
 cd Apache
@@ -259,7 +262,7 @@ fi
 
 %files reports
 %defattr(-, root, root, -)
-%doc LICENSE.txt README
+%doc LICENSE.txt README ChangeLog
 %dir %{_sysconfdir}/ocsinventory
 %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
 %attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
@@ -271,6 +274,10 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-3
+- add ChangeLog
+- Security Fixes (internal version 5003) Bug #517837
+
 * Sat May 30 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-1
 - update to OCS Inventory NG 1.02.1 - Security Fixes (internal version 5003)
 



From remi at fedoraproject.org  Mon Aug 17 15:08:03 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 17 Aug 2009 15:08:03 +0000 (UTC)
Subject: rpms/ocsinventory/EL-4 ocsinventory.patch, NONE,
	1.1 ocsinventory.spec, 1.5, 1.6
Message-ID: <20090817150803.AB6C911C00E4@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv843

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory.patch 
Log Message:
security fix

ocsinventory.patch:
 machine.php |   89 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

--- NEW FILE ocsinventory.patch ---
--- branches/server/1.02/ocsreports/machine.php	2009/06/29 11:51:53	1762
+++ branches/server/1.02/ocsreports/machine.php	2009/08/12 10:24:11	1829
@@ -25,7 +25,7 @@
 
 if (isset($_GET['systemid'])) {
 	$systemid = $_GET['systemid'];
-	if ($systemid == "")
+	if ($systemid == "" or !is_numeric($systemid))
 	{
 		echo "Please Supply A System ID";
 		die();
@@ -33,7 +33,12 @@
 }
 elseif (isset($_POST['systemid'])) {
 	$systemid = $_POST['systemid'];
+	if ($systemid == "" or !is_numeric($systemid)){
+		echo "Please Supply A System ID";
+		die();
+	}
 }
+
 //for update blacklist serial or mac
 update_blacklist();
 
@@ -51,27 +56,27 @@
 }
 else 
 	$_SESSION["justAdded"] = false;
-	//TODO: voir si on loggue les evenements de groupe
-if( isset( $_GET["actgrp"] )) {	
-		//v???rification si la valeur correspond ??? un groupe
-		$reqGroups = "SELECT h.id id
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_' ";
-		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
-		if ($_SESSION["lvluser"]!=SADMIN)
-			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
-		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
-		$valGroups = mysql_fetch_array( $resGroups ); 
-		if (isset($valGroups['id'])){
-			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
-			
-			if( $_GET["actgrp"] == 0 ) 
-				$reqDelete .= " AND static<>0";
-			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
-			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
-			if( $_GET["actgrp"] != 0 )
-				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
-		}
+	//TODO: voir si on loggue les evenements de groupe
+if( isset( $_GET["actgrp"] )) {	
+		//v???rification si la valeur correspond ??? un groupe
+		$reqGroups = "SELECT h.id id
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_' ";
+		//pour les autres qu'SADMIN, ajout que pour les groupes d???clar???s visibles
+		if ($_SESSION["lvluser"]!=SADMIN)
+			$reqGroups .= " and h.workgroup = 'GROUP_4_ALL'";
+		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
+		$valGroups = mysql_fetch_array( $resGroups ); 
+		if (isset($valGroups['id'])){
+			$reqDelete = "DELETE FROM groups_cache WHERE hardware_id=".$systemid." AND group_id=".$_GET["grp"];
+			
+			if( $_GET["actgrp"] == 0 ) 
+				$reqDelete .= " AND static<>0";
+			$reqInsert = "INSERT INTO groups_cache(hardware_id, group_id, static) VALUES (".$systemid.", ".$_GET["grp"].", ".$_GET["actgrp"].")";
+			@mysql_query( $reqDelete, $_SESSION["writeServer"] );
+			if( $_GET["actgrp"] != 0 )
+				@mysql_query( $reqInsert, $_SESSION["writeServer"] );
+		}
 }
 
 $queryMachine    = "SELECT * FROM hardware WHERE (ID=$systemid)";
@@ -413,8 +418,8 @@
 	//PROLOG_FREQ
 	optperso("PROLOG_FREQ",$l->g(724)." <font color=green size=1><i>PROLOG_FREQ</i></font>",$optPerso,0,$optdefault["PROLOG_FREQ"],$l->g(730));
 	//GROUPS
-	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
-	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
+	$sql_groups="SELECT static, name, group_id,workgroup  FROM groups_cache g, hardware h WHERE g.hardware_id=$systemid AND h.id=g.group_id";
+	$resGroups = @mysql_query($sql_groups, $_SESSION["readServer"]) or die(mysql_error($_SESSION["readServer"])); 
 	
 	if( mysql_num_rows( $resGroups )>0 ) {
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -422,7 +427,7 @@
 			echo "<tr>";
 			echo "<td bgcolor='white' align='center' valign='center'>&nbsp;</td>";
 			echo $td3.$l->g(607)." ";		
-			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
+			if( $_SESSION["lvluser"] == SADMIN || $_SESSION["lvluser"] == LADMIN || $valGroups["workgroup"]=="GROUP_4_ALL")
 				echo "<a href='index.php?multi=29&popup=1&systemid=".$valGroups["group_id"]."' target='_blank'>".$valGroups["name"]."</td>";
 			else
 				echo "<b>".$valGroups["name"]."</b></td>";			
@@ -434,11 +439,11 @@
 				case 2: echo "<font color='red'>".$l->g(597)."</font></td>"; break;
 			}
 			
-			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
+			if( $_SESSION["lvluser"]==SADMIN || $valGroups["workgroup"]=="GROUP_4_ALL") {
 				$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500))."&grp=".$valGroups["group_id"];
 				switch( $valGroups["static"] ) {
 					case 0: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=2'>".$l->g(600)."</a></td>"; break;
-					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
+					case 1: echo $td3."<a href='$hrefBase&actgrp=0'>".$l->g(818)."</a></td>"; break;
 					case 2: echo $td3."<a href='$hrefBase&actgrp=1'>".$l->g(598)."</a>&nbsp; &nbsp; &nbsp;<a href='$hrefBase&actgrp=0'>".$l->g(599)."</a></td>"; break;
 				}
 			}			
@@ -467,20 +472,20 @@
 			echo "</tr>";
 		}
 	}
-	
+	
 		$hrefBase = "machine.php?systemid=".urlencode($systemid)."&option=".urlencode($l->g(500));
 		
 		echo "<tr><td colspan='10' align='right'>";
-		if( $_SESSION["lvluser"]==SADMIN ) 
-			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
-		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
+		if( $_SESSION["lvluser"]==SADMIN ) 
+			echo "<a href='index.php?multi=24&systemid=$systemid&isgroup=0'>".$l->g(501)."</a>".$l->g(386);
+		echo " <a href=# OnClick=window.location='$hrefBase&actgrp=1&grp='+document.getElementById(\"groupcombo\").options[document.getElementById(\"groupcombo\").selectedIndex].value>".
 		$l->g(589)."</a>";
-	
-		$reqGroups = "SELECT h.name,h.id,h.workgroup 
-					  FROM hardware h 
-					  WHERE h.deviceid='_SYSTEMGROUP_'";
-		if( $_SESSION["lvluser"]!=SADMIN )
-			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
+	
+		$reqGroups = "SELECT h.name,h.id,h.workgroup 
+					  FROM hardware h 
+					  WHERE h.deviceid='_SYSTEMGROUP_'";
+		if( $_SESSION["lvluser"]!=SADMIN )
+			$reqGroups .= " and workgroup = 'GROUP_4_ALL'";
 		$resGroups = mysql_query( $reqGroups, $_SESSION["readServer"] );
 		$first = true;
 		while( $valGroups = mysql_fetch_array( $resGroups ) ) {
@@ -495,7 +500,7 @@
 			echo "</select>";
 			
 		echo "</td></tr>";		
-	//}
+	//}
 	echo "</table><br>";
 	
 	if ($_POST['modification_param'])
@@ -784,7 +789,7 @@
 		$td3".textDecode($item->TYPE)."       </td>
 		$td3".textDecode($item->SPEED)."      </td>
 		$td3".textDecode($item->MACADDR).($const?"<br>($const)":"");
-		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"R?seau(x)");
+		blacklist("select ID from blacklist_macaddresses where macaddress='".textDecode($item->MACADDR)."'",textDecode($item->MACADDR),$l->g(704)." ".$l->g(708),$l->g(705)." ".$l->g(708),"Reseau(x)");
 		echo "</td>";
 		echo "$td3".textDecode($item->STATUS)."     </td>
 		$td3".textDecode($item->IPADDRESS)."  </td>
@@ -1185,7 +1190,7 @@
 	<script language=javascript>
 		function confirme(did,champ,lbl){
 			if(confirm(lbl+" ?"))
-				window.location="machine.php?systemid=<? echo $systemid ?>&option=<? echo $direct ?>&"+champ+"="+did;
+				window.location="machine.php?systemid=<?php echo $systemid ?>&option=<?php echo $direct ?>&"+champ+"="+did;
 		}
 	</script>
 	<?php
@@ -1211,7 +1216,7 @@
 		@mysql_query("INSERT INTO blacklist_serials (SERIAL) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 
 	//blacklist mac
-	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")
+	if (isset($_GET['black']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")
 		@mysql_query("INSERT INTO blacklist_macaddresses (MACADDRESS) value ('".$_GET['black']."')", $_SESSION["writeServer"]);
 		
 	// unblacklist serial
@@ -1219,7 +1224,7 @@
 		@mysql_query("DELETE FROM blacklist_serials WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 		
 	// unblacklist mac 
-	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "R?seau(x)")	
+	if (isset($_GET['noblack']) &  $_SESSION["lvluser"]==SADMIN & $_GET['option'] == "Reseau(x)")	
 		@mysql_query("DELETE FROM blacklist_macaddresses WHERE id=".$_GET['noblack'], $_SESSION["writeServer"]);
 	
 }


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/ocsinventory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ocsinventory.spec	30 May 2009 18:56:24 -0000	1.5
+++ ocsinventory.spec	17 Aug 2009 15:08:03 -0000	1.6
@@ -10,7 +10,7 @@ Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02.1
-Release:     1%{?dist}
+Release:     3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,6 +19,8 @@ URL:         http://www.ocsinventory-ng.
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/branches/server/1.02/ocsreports/machine.php?r1=1762&r2=1829&view=patch
+Patch0:      ocsinventory.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +128,7 @@ navigateur favori.
 %prep
 %setup -q -n %{tarname}
 
+%patch0 -p3
 
 %build
 cd Apache
@@ -259,7 +262,7 @@ fi
 
 %files reports
 %defattr(-, root, root, -)
-%doc LICENSE.txt README
+%doc LICENSE.txt README ChangeLog
 %dir %{_sysconfdir}/ocsinventory
 %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
 %attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
@@ -271,6 +274,10 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-3
+- add ChangeLog
+- Security Fixes (internal version 5003) Bug #517837
+
 * Sat May 30 2009 Remi Collet <Fedora at famillecollet.com> 1.02.1-1
 - update to OCS Inventory NG 1.02.1 - Security Fixes (internal version 5003)
 



From lkundrak at fedoraproject.org  Mon Aug 17 15:09:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 17 Aug 2009 15:09:06 +0000 (UTC)
Subject: rpms/sunbird/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20090817150906.E4E2E11C00E4@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1127

Modified Files:
	.cvsignore sources 
Log Message:
Update sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Jun 2009 07:43:03 -0000	1.12
+++ .cvsignore	17 Aug 2009 15:09:06 -0000	1.13
@@ -1,2 +1 @@
-sunbird-1.0-20090513hg.tar.lzma
-sunbird-l10n.tar
+thunderbird-3.0b3-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Jun 2009 07:43:04 -0000	1.12
+++ sources	17 Aug 2009 15:09:06 -0000	1.13
@@ -1,2 +1,2 @@
 9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar
-76e7c2ac4767049156b9b7a9d4036239  sunbird-1.0-20090513hg.tar.lzma
+84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2



From nphilipp at fedoraproject.org  Mon Aug 17 15:09:38 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:09:38 +0000 (UTC)
Subject: rpms/rss-glx/devel rss-glx-0.9.0-0.9.0.p.diff, NONE,
	1.1 rss-glx-0.9.0.p-optflags.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rss-glx-rm-matrixview.sh, 1.5, 1.6 rss-glx.spec, 1.31,
	1.32 sources, 1.6, 1.7 rss-glx-0.8.2-0.8.2.p.diff, 1.1,
	NONE rss-glx-0.8.2.p-flags.patch, 1.1,
	NONE rss-glx-0.8.2.p-gcc43.patch, 1.1, NONE
Message-ID: <20090817150938.EBD3911C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1242

Modified Files:
	.cvsignore rss-glx-rm-matrixview.sh rss-glx.spec sources 
Added Files:
	rss-glx-0.9.0-0.9.0.p.diff rss-glx-0.9.0.p-optflags.patch 
Removed Files:
	rss-glx-0.8.2-0.8.2.p.diff rss-glx-0.8.2.p-flags.patch 
	rss-glx-0.8.2.p-gcc43.patch 
Log Message:
version 0.9.0.p
build with GLEW
don't distribute README
replace flags by optflags patch
remove obsolete gcc-4.3 patch
remove symlinked source files workaround (#189928)


rss-glx-0.9.0-0.9.0.p.diff:
 ChangeLog                |    4 ++++
 README                   |    1 -
 README.xscreensaver      |    1 -
 configure.in             |    2 +-
 src/Makefile.am          |   10 ++--------
 utils/rss-glx_install.pl |    1 -
 6 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE rss-glx-0.9.0-0.9.0.p.diff ---
diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
--- rss-glx_0.9.0/ChangeLog	2009-05-17 01:03:38.000000000 +0200
+++ rss-glx_0.9.0.p/ChangeLog	2009-08-17 14:58:18.273168054 +0200
@@ -1,3 +1,7 @@
+****************************** Version 0.9.0.p  ********************************
+	
+	Removed matrixview
+
 ******************************* Version 0.9.0  *********************************
 
 	Added port of drempels, originally by Ryan M. Geiss,
diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0/configure.in	2009-05-19 17:12:01.000000000 +0200
+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:00:57.538167383 +0200
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(src/driver.c)
-AM_INIT_AUTOMAKE(rss-glx,0.9.0)
+AM_INIT_AUTOMAKE(rss-glx,0.9.0.p)
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
diff -urBNw rss-glx_0.9.0/README rss-glx_0.9.0.p/README
--- rss-glx_0.9.0/README	2008-08-31 04:38:42.000000000 +0200
+++ rss-glx_0.9.0.p/README	2009-08-17 15:04:45.620179698 +0200
@@ -3,5 +3,4 @@
 	(2) X11+GLX.
 	(3) ImageMagick >6.2
 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
-	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
diff -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
--- rss-glx_0.9.0/README.xscreensaver	2009-04-13 20:30:58.000000000 +0200
+++ rss-glx_0.9.0.p/README.xscreensaver	2009-08-17 15:04:55.724168053 +0200
@@ -28,7 +28,6 @@
   GL:                   "BioF"  biof --root                                 \n\
   GL:            "BusySpheres"  busyspheres --root                          \n\
   GL:            "SpirographX"  spirographx --root                          \n\
-  GL:             "MatrixView"  matrixview --root                           \n\
   GL:                 "Lorenz"  lorenz --root                               \n\
 -- End Here --
 
diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
--- rss-glx_0.9.0/src/Makefile.am	2009-05-19 02:13:52.000000000 +0200
+++ rss-glx_0.9.0.p/src/Makefile.am	2009-08-17 15:03:54.259165189 +0200
@@ -3,7 +3,7 @@
 INCLUDES = -I$(top_srcdir)/src
 AM_LDFLAGS = @GLEW@
 
-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2
+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz plasma skyrocket solarwinds spirographx sundancer2
 
 biof_SOURCES = driver.c biof.c
 busyspheres_SOURCES = driver.c busyspheres.c
@@ -33,9 +33,6 @@
 lattice_LDADD = @BZIP2@
 lorenz_SOURCES = driver.c lorenz.cpp
 lorenz_LDADD = -LrsMath -lrsMath
-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
-matrixview_CFLAGS = @Wand_CFLAGS@
-matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
 plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
 skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
 solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
@@ -73,9 +70,6 @@
 lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
 	./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
 
-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
-	./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
-
 skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
 	./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
 
@@ -113,4 +107,4 @@
 skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
 endif
 
-CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
+CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
diff -urBNw rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
--- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-19 16:36:29.000000000 +0200
+++ rss-glx_0.9.0.p/utils/rss-glx_install.pl	2009-08-17 15:05:08.531419223 +0200
@@ -26,7 +26,6 @@
 $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
 $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
 $screensavers->{'spirographx'} 	= '  GL:            "SpirographX"  spirographx --root                          \\n\\';
-$screensavers->{'matrixview'} 	= '  GL:             "MatrixView"  matrixview --root                           \\n\\';
 $screensavers->{'lorenz'}	= '  GL:                 "Lorenz"  lorenz --root                               \\n\\';
 $screensavers->{'drempels'}	= '  GL:               "Drempels"  drempels --root                             \\n\\';
 $screensavers->{'feedback'}	= '  GL:               "Feedback"  feedback --root                             \\n\\';

rss-glx-0.9.0.p-optflags.patch:
 configure.in |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE rss-glx-0.9.0.p-optflags.patch ---
diff -up rss-glx_0.9.0.p/configure.in.optflags rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0.p/configure.in.optflags	2009-08-17 15:28:29.717199402 +0200
+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:32:02.830167905 +0200
@@ -11,24 +11,28 @@ AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_C_BIGENDIAN
 
+if test "x$CFLAGS" = x; then
 if test "x$GCC" = xyes; then
 	CFLAGS="-O2"
 fi
 AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
     [build with debugging information default=no])],
     [test "$enableval" = "yes" && CFLAGS="-g"])
+fi
 if test "x$GCC" = xyes; then
 	CFLAGS="$CFLAGS -Wall"
 fi
 
 AC_PROG_CXX
 
+if test "x$CXXFLAGS" = x; then
 if test "x$GXX" = xyes; then
 	CXXFLAGS="-O2"
 fi
 AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
     [build with debugging information default=no])],
     [test "$enableval" = "yes" && CXXFLAGS="-g"])
+fi
 if test "x$GXX" = xyes; then
 	CXXFLAGS="$CXXFLAGS -Wall"
 fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Dec 2008 16:36:54 -0000	1.3
+++ .cvsignore	17 Aug 2009 15:09:38 -0000	1.4
@@ -1 +1 @@
-rss-glx_0.8.2.p.tar.bz2
+rss-glx_0.9.0.p.tar.bz2


Index: rss-glx-rm-matrixview.sh
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx-rm-matrixview.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rss-glx-rm-matrixview.sh	18 Dec 2008 11:05:02 -0000	1.5
+++ rss-glx-rm-matrixview.sh	17 Aug 2009 15:09:38 -0000	1.6
@@ -3,7 +3,7 @@
 MV_FILES="matrixview.1 matrixview.c matrixview.desktop matrixview_textures matrixview_textures.h matrixview.xml"
 mv_files=
 for i in $MV_FILES; do
-    mv_files="$mv_files other_src/$i"
+    mv_files="$mv_files src/$i"
 done
 
 usage() {


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- rss-glx.spec	27 Jul 2009 03:16:13 -0000	1.31
+++ rss-glx.spec	17 Aug 2009 15:09:38 -0000	1.32
@@ -43,26 +43,26 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.8.2%{patchext}
-Release: 3%{?dist}
+Version: 0.9.0%{patchext}
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
-# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# Source0: http://downloads.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
 Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
+# The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.8.2-0.8.2.p.diff
-Patch0: rss-glx-0.8.2.p-flags.patch
-Patch1: rss-glx-0.8.2.p-gcc43.patch
+Source3: rss-glx-0.9.0-0.9.0.p.diff
+# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
+Patch0: rss-glx-0.9.0.p-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %{with matrixview}
+BuildRequires: glew-devel
 BuildRequires: ImageMagick-devel >= 6.2.5.4
-%endif
 %if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
@@ -175,15 +175,7 @@ Build settings:
 
 EOF
 %setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .flags
-%patch1 -p1 -b .gcc43
-
-# work around BZ #189928
-for f in `find . -type l` ; do
-    cp -p ${f} ${f}_
-    unlink ${f}
-    mv ${f}_ $f
-done
+%patch0 -p1 -b .optflags
 
 %build
 autoreconf -i
@@ -263,19 +255,22 @@ BioF?biof?This is an attempt to recrea
 Busy Spheres?busyspheres?Spheres made of dancing particles.
 Colorfire?colorfire?Burning colors.
 Cyclone?cyclone?A cyclone made of particles.
+Drempels?drempels?A hallucinatory desktop enhancer.
 Euphoria?euphoria?Psychedelic shapes.
+Feedback?feedback?Stirring colors with a jiggling warp.
 Fieldlines?fieldlines?A simulation of the electric field lines between charged particles.
-Flocks?flocks?Flocks of birds.
-Flux?flux?If you know anything about strange attractors, you might recognize the patterns created by this screensaver.
-Helios?helios?Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get.
-Hufo's Smoke?hufo_smoke?Smoke effect.
+Flocks?flocks?Floating wisps.
+Flux?flux?Flux fields and stuff.
+Helios?helios?Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke?hufo_smoke?Particle smoke effect.
 Hufo's Tunnel?hufo_tunnel?Inside a tunnel.
-Hyperspace?hyperspace?Hyperspace.
+Hyperspace?hyperspace?Flying through hyper space.
 Lattice?lattice?Fly through an endless world of linked rings.
+Lorenz?lorenz?A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
 MatrixView?matrixview?The Matrix.
 %endif
-Plasma?plasma?Probably the second most psychedelic screensaver in existence.
+Plasma?plasma?Oozing plasma.
 Skyrocket (silent)?skyrocket -v 0?The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
 Skyrocket?skyrocket?The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
 Solarwinds?solarwinds?This is a very mesmerizing particle effects saver.
@@ -300,8 +295,8 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog COPYING INSTALL README
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.p.diff
+%doc ChangeLog COPYING INSTALL
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -328,6 +323,14 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-1
+- version 0.9.0.p
+- build with GLEW
+- don't distribute README
+- replace flags by optflags patch
+- remove obsolete gcc-4.3 patch
+- remove symlinked source files workaround (#189928)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.p-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Dec 2008 11:05:02 -0000	1.6
+++ sources	17 Aug 2009 15:09:38 -0000	1.7
@@ -1 +1 @@
-f5c04adbb538a6d74ce50ef091428021  rss-glx_0.8.2.p.tar.bz2
+95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2


--- rss-glx-0.8.2-0.8.2.p.diff DELETED ---


--- rss-glx-0.8.2.p-flags.patch DELETED ---


--- rss-glx-0.8.2.p-gcc43.patch DELETED ---



From pwouters at fedoraproject.org  Mon Aug 17 15:10:16 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 17 Aug 2009 15:10:16 +0000 (UTC)
Subject: rpms/unbound/devel .cvsignore, 1.8, 1.9 sources, 1.12,
	1.13 unbound.spec, 1.31, 1.32
Message-ID: <20090817151016.F324811C04D1@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1421

Modified Files:
	.cvsignore sources unbound.spec 
Log Message:
* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 1.3.3-1
- Updated to 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Jun 2009 04:14:53 -0000	1.8
+++ .cvsignore	17 Aug 2009 15:10:16 -0000	1.9
@@ -2,3 +2,4 @@ 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.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Jul 2009 18:04:45 -0000	1.12
+++ sources	17 Aug 2009 15:10:16 -0000	1.13
@@ -1,4 +1 @@
-d2eb61c10c72de752aef2f77850d4f53  unbound-1.3.1rc2.tar.gz
-783325c26ae1a47be0e496c94f3e1cca  unbound-1.3.0.tar.gz
-1aa735c95cff3d8bdec39b54ced7dd3d  unbound-1.3.2.tar.gz
-6feffef1e6ce315e465b5f747af76494  unbound-1.3.1.tar.gz
+f6b2b2c375288dfd2a03c4a36676221e  unbound-1.3.3.tar.gz


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- unbound.spec	27 Jul 2009 06:31:10 -0000	1.31
+++ unbound.spec	17 Aug 2009 15:10:16 -0000	1.32
@@ -8,8 +8,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.3.0
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -17,9 +17,9 @@ Source1: unbound.init
 Source2: unbound.conf
 Source3: unbound.munin
 # See the unbound svn repository for further documentation on these
-Patch1: unbound-r1657.patch
-Patch2: unbound-r1670.patch
-Patch3: unbound-r1677.patch
+#Patch1: unbound-r1657.patch
+#Patch2: unbound-r1670.patch
+#Patch3: unbound-r1677.patch
 Patch4: unbound-1.2-glob.patch
 
 Group: System Environment/Daemons
@@ -88,9 +88,9 @@ Python modules and extensions for unboun
 
 %prep
 %setup -q 
-%patch1
-%patch2
-%patch3
+#%patch1
+#%patch2
+#%patch3
 %patch4 -p1
 
 %build
@@ -193,6 +193,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 1.3.3-1
+- Updated to 1.3.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Mon Aug 17 15:12:15 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:12:15 +0000 (UTC)
Subject: rpms/rss-glx/F-10 rss-glx-0.9.0-0.9.0.p.diff, NONE,
	1.1 rss-glx-0.9.0.p-optflags.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rss-glx.spec, 1.28, 1.29 sources, 1.3,
	1.4 rss-glx-0.8.2-0.8.2.p.diff, 1.1,
	NONE rss-glx-0.8.2.p-flags.patch, 1.1,
	NONE rss-glx-0.8.2.p-gcc43.patch, 1.1, NONE
Message-ID: <20090817151215.8866811C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1984

Modified Files:
	.cvsignore rss-glx.spec sources 
Added Files:
	rss-glx-0.9.0-0.9.0.p.diff rss-glx-0.9.0.p-optflags.patch 
Removed Files:
	rss-glx-0.8.2-0.8.2.p.diff rss-glx-0.8.2.p-flags.patch 
	rss-glx-0.8.2.p-gcc43.patch 
Log Message:
version 0.9.0.p
build with GLEW
don't distribute README
replace flags by optflags patch
remove obsolete gcc-4.3 patch
remove symlinked source files workaround (#189928)


rss-glx-0.9.0-0.9.0.p.diff:
 ChangeLog                |    4 ++++
 README                   |    1 -
 README.xscreensaver      |    1 -
 configure.in             |    2 +-
 src/Makefile.am          |   10 ++--------
 utils/rss-glx_install.pl |    1 -
 6 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE rss-glx-0.9.0-0.9.0.p.diff ---
diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
--- rss-glx_0.9.0/ChangeLog	2009-05-17 01:03:38.000000000 +0200
+++ rss-glx_0.9.0.p/ChangeLog	2009-08-17 14:58:18.273168054 +0200
@@ -1,3 +1,7 @@
+****************************** Version 0.9.0.p  ********************************
+	
+	Removed matrixview
+
 ******************************* Version 0.9.0  *********************************
 
 	Added port of drempels, originally by Ryan M. Geiss,
diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0/configure.in	2009-05-19 17:12:01.000000000 +0200
+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:00:57.538167383 +0200
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(src/driver.c)
-AM_INIT_AUTOMAKE(rss-glx,0.9.0)
+AM_INIT_AUTOMAKE(rss-glx,0.9.0.p)
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
diff -urBNw rss-glx_0.9.0/README rss-glx_0.9.0.p/README
--- rss-glx_0.9.0/README	2008-08-31 04:38:42.000000000 +0200
+++ rss-glx_0.9.0.p/README	2009-08-17 15:04:45.620179698 +0200
@@ -3,5 +3,4 @@
 	(2) X11+GLX.
 	(3) ImageMagick >6.2
 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
-	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
diff -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
--- rss-glx_0.9.0/README.xscreensaver	2009-04-13 20:30:58.000000000 +0200
+++ rss-glx_0.9.0.p/README.xscreensaver	2009-08-17 15:04:55.724168053 +0200
@@ -28,7 +28,6 @@
   GL:                   "BioF"  biof --root                                 \n\
   GL:            "BusySpheres"  busyspheres --root                          \n\
   GL:            "SpirographX"  spirographx --root                          \n\
-  GL:             "MatrixView"  matrixview --root                           \n\
   GL:                 "Lorenz"  lorenz --root                               \n\
 -- End Here --
 
diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
--- rss-glx_0.9.0/src/Makefile.am	2009-05-19 02:13:52.000000000 +0200
+++ rss-glx_0.9.0.p/src/Makefile.am	2009-08-17 15:03:54.259165189 +0200
@@ -3,7 +3,7 @@
 INCLUDES = -I$(top_srcdir)/src
 AM_LDFLAGS = @GLEW@
 
-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2
+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz plasma skyrocket solarwinds spirographx sundancer2
 
 biof_SOURCES = driver.c biof.c
 busyspheres_SOURCES = driver.c busyspheres.c
@@ -33,9 +33,6 @@
 lattice_LDADD = @BZIP2@
 lorenz_SOURCES = driver.c lorenz.cpp
 lorenz_LDADD = -LrsMath -lrsMath
-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
-matrixview_CFLAGS = @Wand_CFLAGS@
-matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
 plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
 skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
 solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
@@ -73,9 +70,6 @@
 lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
 	./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
 
-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
-	./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
-
 skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
 	./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
 
@@ -113,4 +107,4 @@
 skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
 endif
 
-CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
+CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
diff -urBNw rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
--- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-19 16:36:29.000000000 +0200
+++ rss-glx_0.9.0.p/utils/rss-glx_install.pl	2009-08-17 15:05:08.531419223 +0200
@@ -26,7 +26,6 @@
 $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
 $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
 $screensavers->{'spirographx'} 	= '  GL:            "SpirographX"  spirographx --root                          \\n\\';
-$screensavers->{'matrixview'} 	= '  GL:             "MatrixView"  matrixview --root                           \\n\\';
 $screensavers->{'lorenz'}	= '  GL:                 "Lorenz"  lorenz --root                               \\n\\';
 $screensavers->{'drempels'}	= '  GL:               "Drempels"  drempels --root                             \\n\\';
 $screensavers->{'feedback'}	= '  GL:               "Feedback"  feedback --root                             \\n\\';

rss-glx-0.9.0.p-optflags.patch:
 configure.in |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE rss-glx-0.9.0.p-optflags.patch ---
diff -up rss-glx_0.9.0.p/configure.in.optflags rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0.p/configure.in.optflags	2009-08-17 15:28:29.717199402 +0200
+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:32:02.830167905 +0200
@@ -11,24 +11,28 @@ AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_C_BIGENDIAN
 
+if test "x$CFLAGS" = x; then
 if test "x$GCC" = xyes; then
 	CFLAGS="-O2"
 fi
 AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
     [build with debugging information default=no])],
     [test "$enableval" = "yes" && CFLAGS="-g"])
+fi
 if test "x$GCC" = xyes; then
 	CFLAGS="$CFLAGS -Wall"
 fi
 
 AC_PROG_CXX
 
+if test "x$CXXFLAGS" = x; then
 if test "x$GXX" = xyes; then
 	CXXFLAGS="-O2"
 fi
 AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
     [build with debugging information default=no])],
     [test "$enableval" = "yes" && CXXFLAGS="-g"])
+fi
 if test "x$GXX" = xyes; then
 	CXXFLAGS="$CXXFLAGS -Wall"
 fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Dec 2008 16:51:59 -0000	1.3
+++ .cvsignore	17 Aug 2009 15:12:15 -0000	1.4
@@ -1 +1 @@
-rss-glx_0.8.2.p.tar.bz2
+rss-glx_0.9.0.p.tar.bz2


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/rss-glx.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- rss-glx.spec	22 Dec 2008 16:51:59 -0000	1.28
+++ rss-glx.spec	17 Aug 2009 15:12:15 -0000	1.29
@@ -43,26 +43,26 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.8.2%{patchext}
+Version: 0.9.0%{patchext}
 Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
-# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# Source0: http://downloads.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
 Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
+# The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.8.2-0.8.2.p.diff
-Patch0: rss-glx-0.8.2.p-flags.patch
-Patch1: rss-glx-0.8.2.p-gcc43.patch
+Source3: rss-glx-0.9.0-0.9.0.p.diff
+# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
+Patch0: rss-glx-0.9.0.p-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %{with matrixview}
+BuildRequires: glew-devel
 BuildRequires: ImageMagick-devel >= 6.2.5.4
-%endif
 %if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
@@ -175,15 +175,7 @@ Build settings:
 
 EOF
 %setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .flags
-%patch1 -p1 -b .gcc43
-
-# work around BZ #189928
-for f in `find . -type l` ; do
-    cp -p ${f} ${f}_
-    unlink ${f}
-    mv ${f}_ $f
-done
+%patch0 -p1 -b .optflags
 
 %build
 autoreconf -i
@@ -263,19 +255,22 @@ BioF?biof?This is an attempt to recrea
 Busy Spheres?busyspheres?Spheres made of dancing particles.
 Colorfire?colorfire?Burning colors.
 Cyclone?cyclone?A cyclone made of particles.
+Drempels?drempels?A hallucinatory desktop enhancer.
 Euphoria?euphoria?Psychedelic shapes.
+Feedback?feedback?Stirring colors with a jiggling warp.
 Fieldlines?fieldlines?A simulation of the electric field lines between charged particles.
-Flocks?flocks?Flocks of birds.
-Flux?flux?If you know anything about strange attractors, you might recognize the patterns created by this screensaver.
-Helios?helios?Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get.
-Hufo's Smoke?hufo_smoke?Smoke effect.
+Flocks?flocks?Floating wisps.
+Flux?flux?Flux fields and stuff.
+Helios?helios?Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke?hufo_smoke?Particle smoke effect.
 Hufo's Tunnel?hufo_tunnel?Inside a tunnel.
-Hyperspace?hyperspace?Hyperspace.
+Hyperspace?hyperspace?Flying through hyper space.
 Lattice?lattice?Fly through an endless world of linked rings.
+Lorenz?lorenz?A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
 MatrixView?matrixview?The Matrix.
 %endif
-Plasma?plasma?Probably the second most psychedelic screensaver in existence.
+Plasma?plasma?Oozing plasma.
 Skyrocket (silent)?skyrocket -v 0?The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
 Skyrocket?skyrocket?The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
 Solarwinds?solarwinds?This is a very mesmerizing particle effects saver.
@@ -300,8 +295,8 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog COPYING INSTALL README
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.p.diff
+%doc ChangeLog COPYING INSTALL
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -328,6 +323,20 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-1
+- version 0.9.0.p
+- build with GLEW
+- don't distribute README
+- replace flags by optflags patch
+- remove obsolete gcc-4.3 patch
+- remove symlinked source files workaround (#189928)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.p-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.p-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> 0.8.2.p-1
 - use autoreconf to avoid using non-matching ltmain.sh
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Dec 2008 16:51:59 -0000	1.3
+++ sources	17 Aug 2009 15:12:15 -0000	1.4
@@ -1 +1 @@
-f5c04adbb538a6d74ce50ef091428021  rss-glx_0.8.2.p.tar.bz2
+95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2


--- rss-glx-0.8.2-0.8.2.p.diff DELETED ---


--- rss-glx-0.8.2.p-flags.patch DELETED ---


--- rss-glx-0.8.2.p-gcc43.patch DELETED ---



From limb at fedoraproject.org  Mon Aug 17 15:22:19 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 17 Aug 2009 15:22:19 +0000 (UTC)
Subject: rpms/ddd/devel ddd.spec,1.17,1.18
Message-ID: <20090817152219.5AF6611C00E4@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4683

Modified Files:
	ddd.spec 
Log Message:
Adopt upstream's .desktop file, BZ 517587.



Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ddd.spec	11 Aug 2009 19:22:51 -0000	1.17
+++ ddd.spec	17 Aug 2009 15:22:18 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
 Version: 3.3.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
@@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 #Source0: http://dl.sf.net/ddd/ddd-%{version}.tar.gz
 #For rc:
 Source0: ftp://alpha.gnu.org/gnu/ddd/ddd-3.3.12.tar.gz
-Source1: ddd.desktop
+#Source1: ddd.desktop
 Source2: ddd.png
 Patch1: ddd-3.3.11-lang.patch
 #Patch2: ddd-3.3.11-xprint.patch
@@ -60,7 +60,9 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir*
 desktop-file-install --vendor "fedora" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category X-Fedora \
-        %{SOURCE1}
+        ddd/ddd.desktop
+
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/ddd.desktop
 
 install -D -m 0644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ddd.png
@@ -100,6 +102,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Mon Aug 17 2009 Jon Ciesla <limb at jcomserv.net> - 3.3.12-5
+- Adopt upstream's .desktop file, BZ 517587.
+
 * Tue Aug 10 2009 Jon Ciesla <limb at jcomserv.net> - 3.3.12-4
 - Fix source.
 



From pkgdb at fedoraproject.org  Mon Aug 17 15:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 15:22:21 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090817152222.321E910F87A@bastion2.fedora.phx.redhat.com>

zprikryl has set the watchbugzilla acl on abrt (Fedora devel) to Approved for vda

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 15:22:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 15:22:24 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090817152224.CA68710F88B@bastion2.fedora.phx.redhat.com>

zprikryl has set the watchcommits acl on abrt (Fedora devel) to Approved for vda

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 15:22:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 15:22:26 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090817152227.0173010F898@bastion2.fedora.phx.redhat.com>

zprikryl has set the commit acl on abrt (Fedora devel) to Approved for vda

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 15:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 15:22:36 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090817152236.64E1210F859@bastion2.fedora.phx.redhat.com>

zprikryl has set the watchbugzilla acl on abrt (Fedora 11) to Approved for vda

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 15:22:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 15:22:37 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090817152238.783CD10F89B@bastion2.fedora.phx.redhat.com>

zprikryl has set the watchcommits acl on abrt (Fedora 11) to Approved for vda

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Mon Aug 17 15:22:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 15:22:41 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20090817152241.E858510F89C@bastion2.fedora.phx.redhat.com>

zprikryl has set the commit acl on abrt (Fedora 11) to Approved for vda

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/abrt



From nphilipp at fedoraproject.org  Mon Aug 17 15:12:09 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:12:09 +0000 (UTC)
Subject: rpms/rss-glx/F-11 rss-glx-0.9.0-0.9.0.p.diff, NONE,
	1.1 rss-glx-0.9.0.p-optflags.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rss-glx.spec, 1.30, 1.31 sources, 1.6,
	1.7 rss-glx-0.8.2-0.8.2.p.diff, 1.1,
	NONE rss-glx-0.8.2.p-flags.patch, 1.1,
	NONE rss-glx-0.8.2.p-gcc43.patch, 1.1, NONE
Message-ID: <20090817151209.B89EE11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1953

Modified Files:
	.cvsignore rss-glx.spec sources 
Added Files:
	rss-glx-0.9.0-0.9.0.p.diff rss-glx-0.9.0.p-optflags.patch 
Removed Files:
	rss-glx-0.8.2-0.8.2.p.diff rss-glx-0.8.2.p-flags.patch 
	rss-glx-0.8.2.p-gcc43.patch 
Log Message:
version 0.9.0.p
build with GLEW
don't distribute README
replace flags by optflags patch
remove obsolete gcc-4.3 patch
remove symlinked source files workaround (#189928)


rss-glx-0.9.0-0.9.0.p.diff:
 ChangeLog                |    4 ++++
 README                   |    1 -
 README.xscreensaver      |    1 -
 configure.in             |    2 +-
 src/Makefile.am          |   10 ++--------
 utils/rss-glx_install.pl |    1 -
 6 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE rss-glx-0.9.0-0.9.0.p.diff ---
diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
--- rss-glx_0.9.0/ChangeLog	2009-05-17 01:03:38.000000000 +0200
+++ rss-glx_0.9.0.p/ChangeLog	2009-08-17 14:58:18.273168054 +0200
@@ -1,3 +1,7 @@
+****************************** Version 0.9.0.p  ********************************
+	
+	Removed matrixview
+
 ******************************* Version 0.9.0  *********************************
 
 	Added port of drempels, originally by Ryan M. Geiss,
diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0/configure.in	2009-05-19 17:12:01.000000000 +0200
+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:00:57.538167383 +0200
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(src/driver.c)
-AM_INIT_AUTOMAKE(rss-glx,0.9.0)
+AM_INIT_AUTOMAKE(rss-glx,0.9.0.p)
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
diff -urBNw rss-glx_0.9.0/README rss-glx_0.9.0.p/README
--- rss-glx_0.9.0/README	2008-08-31 04:38:42.000000000 +0200
+++ rss-glx_0.9.0.p/README	2009-08-17 15:04:45.620179698 +0200
@@ -3,5 +3,4 @@
 	(2) X11+GLX.
 	(3) ImageMagick >6.2
 	(4) OPTIONAL: OpenAL for sound. (skyrocket)
-	(5) OPTIONAL: pthreads for smoother image loading. (matrixview)
 	(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
diff -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
--- rss-glx_0.9.0/README.xscreensaver	2009-04-13 20:30:58.000000000 +0200
+++ rss-glx_0.9.0.p/README.xscreensaver	2009-08-17 15:04:55.724168053 +0200
@@ -28,7 +28,6 @@
   GL:                   "BioF"  biof --root                                 \n\
   GL:            "BusySpheres"  busyspheres --root                          \n\
   GL:            "SpirographX"  spirographx --root                          \n\
-  GL:             "MatrixView"  matrixview --root                           \n\
   GL:                 "Lorenz"  lorenz --root                               \n\
 -- End Here --
 
diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
--- rss-glx_0.9.0/src/Makefile.am	2009-05-19 02:13:52.000000000 +0200
+++ rss-glx_0.9.0.p/src/Makefile.am	2009-08-17 15:03:54.259165189 +0200
@@ -3,7 +3,7 @@
 INCLUDES = -I$(top_srcdir)/src
 AM_LDFLAGS = @GLEW@
 
-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2
+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz plasma skyrocket solarwinds spirographx sundancer2
 
 biof_SOURCES = driver.c biof.c
 busyspheres_SOURCES = driver.c busyspheres.c
@@ -33,9 +33,6 @@
 lattice_LDADD = @BZIP2@
 lorenz_SOURCES = driver.c lorenz.cpp
 lorenz_LDADD = -LrsMath -lrsMath
-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
-matrixview_CFLAGS = @Wand_CFLAGS@
-matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
 plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
 skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
 solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
@@ -73,9 +70,6 @@
 lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
 	./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
 
-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
-	./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
-
 skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
 	./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
 
@@ -113,4 +107,4 @@
 skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
 endif
 
-CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
+CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
diff -urBNw rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
--- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-19 16:36:29.000000000 +0200
+++ rss-glx_0.9.0.p/utils/rss-glx_install.pl	2009-08-17 15:05:08.531419223 +0200
@@ -26,7 +26,6 @@
 $screensavers->{'biof'} 	= '  GL:                   "BioF"  biof --root                                 \\n\\';
 $screensavers->{'busyspheres'} 	= '  GL:            "BusySpheres"  busyspheres --root                          \\n\\';
 $screensavers->{'spirographx'} 	= '  GL:            "SpirographX"  spirographx --root                          \\n\\';
-$screensavers->{'matrixview'} 	= '  GL:             "MatrixView"  matrixview --root                           \\n\\';
 $screensavers->{'lorenz'}	= '  GL:                 "Lorenz"  lorenz --root                               \\n\\';
 $screensavers->{'drempels'}	= '  GL:               "Drempels"  drempels --root                             \\n\\';
 $screensavers->{'feedback'}	= '  GL:               "Feedback"  feedback --root                             \\n\\';

rss-glx-0.9.0.p-optflags.patch:
 configure.in |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE rss-glx-0.9.0.p-optflags.patch ---
diff -up rss-glx_0.9.0.p/configure.in.optflags rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0.p/configure.in.optflags	2009-08-17 15:28:29.717199402 +0200
+++ rss-glx_0.9.0.p/configure.in	2009-08-17 15:32:02.830167905 +0200
@@ -11,24 +11,28 @@ AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_C_BIGENDIAN
 
+if test "x$CFLAGS" = x; then
 if test "x$GCC" = xyes; then
 	CFLAGS="-O2"
 fi
 AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
     [build with debugging information default=no])],
     [test "$enableval" = "yes" && CFLAGS="-g"])
+fi
 if test "x$GCC" = xyes; then
 	CFLAGS="$CFLAGS -Wall"
 fi
 
 AC_PROG_CXX
 
+if test "x$CXXFLAGS" = x; then
 if test "x$GXX" = xyes; then
 	CXXFLAGS="-O2"
 fi
 AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
     [build with debugging information default=no])],
     [test "$enableval" = "yes" && CXXFLAGS="-g"])
+fi
 if test "x$GXX" = xyes; then
 	CXXFLAGS="$CXXFLAGS -Wall"
 fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Dec 2008 16:36:54 -0000	1.3
+++ .cvsignore	17 Aug 2009 15:12:08 -0000	1.4
@@ -1 +1 @@
-rss-glx_0.8.2.p.tar.bz2
+rss-glx_0.9.0.p.tar.bz2


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/rss-glx.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- rss-glx.spec	25 Feb 2009 20:38:06 -0000	1.30
+++ rss-glx.spec	17 Aug 2009 15:12:08 -0000	1.31
@@ -43,26 +43,26 @@
 
 Summary: Really Slick Screensavers
 Name: rss-glx
-Version: 0.8.2%{patchext}
-Release: 2%{?dist}
+Version: 0.9.0%{patchext}
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
-# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# Source0: http://downloads.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
 Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
+# The following two strip matrixview from the package and build a new tarball
 Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.8.2-0.8.2.p.diff
-Patch0: rss-glx-0.8.2.p-flags.patch
-Patch1: rss-glx-0.8.2.p-gcc43.patch
+Source3: rss-glx-0.9.0-0.9.0.p.diff
+# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
+Patch0: rss-glx-0.9.0.p-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %{with matrixview}
+BuildRequires: glew-devel
 BuildRequires: ImageMagick-devel >= 6.2.5.4
-%endif
 %if %{with modular_x}
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
@@ -175,15 +175,7 @@ Build settings:
 
 EOF
 %setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .flags
-%patch1 -p1 -b .gcc43
-
-# work around BZ #189928
-for f in `find . -type l` ; do
-    cp -p ${f} ${f}_
-    unlink ${f}
-    mv ${f}_ $f
-done
+%patch0 -p1 -b .optflags
 
 %build
 autoreconf -i
@@ -263,19 +255,22 @@ BioF?biof?This is an attempt to recrea
 Busy Spheres?busyspheres?Spheres made of dancing particles.
 Colorfire?colorfire?Burning colors.
 Cyclone?cyclone?A cyclone made of particles.
+Drempels?drempels?A hallucinatory desktop enhancer.
 Euphoria?euphoria?Psychedelic shapes.
+Feedback?feedback?Stirring colors with a jiggling warp.
 Fieldlines?fieldlines?A simulation of the electric field lines between charged particles.
-Flocks?flocks?Flocks of birds.
-Flux?flux?If you know anything about strange attractors, you might recognize the patterns created by this screensaver.
-Helios?helios?Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get.
-Hufo's Smoke?hufo_smoke?Smoke effect.
+Flocks?flocks?Floating wisps.
+Flux?flux?Flux fields and stuff.
+Helios?helios?Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke?hufo_smoke?Particle smoke effect.
 Hufo's Tunnel?hufo_tunnel?Inside a tunnel.
-Hyperspace?hyperspace?Hyperspace.
+Hyperspace?hyperspace?Flying through hyper space.
 Lattice?lattice?Fly through an endless world of linked rings.
+Lorenz?lorenz?A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
 MatrixView?matrixview?The Matrix.
 %endif
-Plasma?plasma?Probably the second most psychedelic screensaver in existence.
+Plasma?plasma?Oozing plasma.
 Skyrocket (silent)?skyrocket -v 0?The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
 Skyrocket?skyrocket?The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
 Solarwinds?solarwinds?This is a very mesmerizing particle effects saver.
@@ -300,8 +295,8 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog COPYING INSTALL README
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.p.diff
+%doc ChangeLog COPYING INSTALL
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
 
@@ -328,6 +323,17 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-1
+- version 0.9.0.p
+- build with GLEW
+- don't distribute README
+- replace flags by optflags patch
+- remove obsolete gcc-4.3 patch
+- remove symlinked source files workaround (#189928)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.p-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.p-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Dec 2008 11:05:02 -0000	1.6
+++ sources	17 Aug 2009 15:12:08 -0000	1.7
@@ -1 +1 @@
-f5c04adbb538a6d74ce50ef091428021  rss-glx_0.8.2.p.tar.bz2
+95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2


--- rss-glx-0.8.2-0.8.2.p.diff DELETED ---


--- rss-glx-0.8.2.p-flags.patch DELETED ---


--- rss-glx-0.8.2.p-gcc43.patch DELETED ---



From vda at fedoraproject.org  Mon Aug 17 15:41:28 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Mon, 17 Aug 2009 15:41:28 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.5, 1.6 abrt.spec, 1.7, 1.8 sources,
	1.5, 1.6 abrt-0.0.1-newenum.patch, 1.1, NONE
Message-ID: <20090817154128.2E57D11C00E4@cvs1.fedora.phx.redhat.com>

Author: vda

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8694

Modified Files:
	.cvsignore abrt.spec sources 
Removed Files:
	abrt-0.0.1-newenum.patch 
Log Message:
Updated to version 0.0.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 08:15:21 -0000	1.5
+++ .cvsignore	17 Aug 2009 15:41:27 -0000	1.6
@@ -1 +1 @@
-abrt-0.0.4.tar.gz
+abrt-0.0.6.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- abrt.spec	24 Jul 2009 16:31:32 -0000	1.7
+++ abrt.spec	17 Aug 2009 15:41:27 -0000	1.8
@@ -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.4
-Release: 4%{?dist}
+Version: 0.0.6
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -24,8 +24,8 @@ BuildRequires: python-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-%{name} is a tool to help users to detect defects in applications and 
-to create a bug report with all informations needed by maintainer to fix it. 
+%{name} is a tool to help users to detect defects in applications and
+to create a bug report with all informations needed by maintainer to fix it.
 It uses plugin system to extend its functionality.
 
 %package libs
@@ -43,21 +43,11 @@ Requires: %{name}-libs = %{version}-%{re
 %description devel
 Development libraries and headers for %{name}.
 
-%package applet
-Summary: %{name}'s applet
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gui
-
-%description applet
-Simple systray applet to notify user about new events detected by %{name} 
-daemon.
-
 %package gui
 Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-python, rhpl, pygtk2, pygtk2-libglade
+Requires: dbus-python, pygtk2, pygtk2-libglade
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -69,7 +59,7 @@ Requires: gdb
 Requires: %{name} = %{version}-%{release}
 
 %description addon-ccpp
-This package contains hook for C/C++ crashed programs and %{name}'s C/C++ 
+This package contains hook for C/C++ crashed programs and %{name}'s C/C++
 analyzer plugin.
 
 %package addon-kerneloops
@@ -99,7 +89,7 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description plugin-sqlite3
-This package contains SQLite3 database plugin. It is used for storing the data 
+This package contains SQLite3 database plugin. It is used for storing the data
 required for creating a bug report.
 
 %package plugin-logger
@@ -118,7 +108,7 @@ Requires: mailx
 
 %description plugin-mailx
 The simple reporter plugin, which sends a report via mailx to a specified
-email. 
+email.
 
 %package plugin-runapp
 Summary: %{name}'s runapp plugin
@@ -128,6 +118,15 @@ Requires: %{name} = %{version}-%{release
 %description plugin-runapp
 Plugin to run external programs.
 
+%package plugin-sosreport
+Summary: %{name}'s sosreport plugin
+Group: System Environment/Libraries
+Requires: sos
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-sosreport
+Plugin to include an sosreport in an abrt report.
+
 %package plugin-bugzilla
 Summary: %{name}'s bugzilla plugin
 Group: System Environment/Libraries
@@ -162,6 +161,17 @@ Requires: %{name} = %{version}-%{release
 This package contains simple command line client for controling abrt daemon over
 the sockets.
 
+%package desktop
+Summary: Virtual package to install all necessary packages for usage from desktop environment
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla
+Requires: %{name}-gui, %{name}-addon-kerneloops
+Requires: %{name}-addon-ccpp, %{name}-addon-python
+
+%description desktop
+Virtual package to make easy default instalation on desktop environments.
+
 %prep
 %setup -q
 
@@ -186,6 +196,11 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/%{nam
 desktop-file-install \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
         src/Gui/%{name}.desktop
+
+desktop-file-install \
+        --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+        src/Applet/%{name}-applet.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -225,15 +240,13 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 
-%files applet
-%defattr(-,root,root,-)
-%{_bindir}/%{name}-applet
-
 %files gui
 %defattr(-,root,root,-)
 %{_bindir}/%{name}-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_bindir}/%{name}-applet
+%{_sysconfdir}/xdg/autostart/%{name}-applet.desktop
 
 %files addon-ccpp
 %defattr(-,root,root,-)
@@ -244,6 +257,7 @@ fi
 %files addon-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf
+%{_bindir}/dumpoops
 %{_libdir}/%{name}/libKerneloops.so*
 %{_libdir}/%{name}/libKerneloopsScanner.so*
 %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz
@@ -252,6 +266,7 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf
 %{_libdir}/%{name}/libKerneloopsReporter.so*
+%{_libdir}/%{name}/KerneloopsReporter.GTKBuilder
 %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz
 
 %files plugin-sqlite3
@@ -264,12 +279,14 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf
 %{_libdir}/%{name}/libLogger.so*
+%{_libdir}/%{name}/Logger.GTKBuilder
 %{_mandir}/man7/%{name}-Logger.7.gz
 
 %files plugin-mailx
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf
 %{_libdir}/%{name}/libMailx.so*
+%{_libdir}/%{name}/Mailx.GTKBuilder
 %{_mandir}/man7/%{name}-Mailx.7.gz
 
 %files plugin-runapp
@@ -277,10 +294,15 @@ fi
 %{_libdir}/%{name}/libRunApp.so*
 %{_mandir}/man7/%{name}-RunApp.7.gz
 
+%files plugin-sosreport
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libSOSreport.so*
+
 %files plugin-bugzilla
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf
 %{_libdir}/%{name}/libBugzilla.so*
+%{_libdir}/%{name}/Bugzilla.GTKBuilder
 %{_mandir}/man7/%{name}-Bugzilla.7.gz
 
 %files plugin-filetransfer
@@ -300,7 +322,14 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/abrt-cli
 
+%files desktop
+%defattr(-,root,root,-)
+
 %changelog
+* Mon Aug 17 2009  Denys Vlasenko <dvlasenk at redhat.com> 0.0.6-1
+- new version
+- many fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 08:15:22 -0000	1.5
+++ sources	17 Aug 2009 15:41:27 -0000	1.6
@@ -1 +1 @@
-630cecef41f67558173486e51236129a  abrt-0.0.4.tar.gz
+0c7760cb88a2719087846190faf370c6  abrt-0.0.6.tar.gz


--- abrt-0.0.1-newenum.patch DELETED ---



From nphilipp at fedoraproject.org  Mon Aug 17 15:46:47 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:46:47 +0000 (UTC)
Subject: rpms/rss-glx/devel .cvsignore, 1.4, 1.5 rss-glx.spec, 1.32,
	1.33 sources, 1.7, 1.8
Message-ID: <20090817154647.142CC11C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9667

Modified Files:
	.cvsignore rss-glx.spec sources 
Log Message:
don't rebuild autofoo files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 15:09:38 -0000	1.4
+++ .cvsignore	17 Aug 2009 15:46:46 -0000	1.5
@@ -1 +1,2 @@
 rss-glx_0.9.0.p.tar.bz2
+rss-glx-0.9.0-autofoo.patch.bz2


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- rss-glx.spec	17 Aug 2009 15:09:38 -0000	1.32
+++ rss-glx.spec	17 Aug 2009 15:46:46 -0000	1.33
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -76,13 +77,6 @@ BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
 
-## the following deps are needed for autoreconf after applying patches
-# no translations -> no gettext needed
-#BuildRequires: gettext
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
 impressive and graphically intensive screensavers.
@@ -176,9 +170,9 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autofoo
 
 %build
-autoreconf -i
 %configure \
     --with-configdir=%{xssconfigdir} \
     --with-kdessconfigdir=%{kdessconfigdir} \
@@ -323,6 +317,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-2
+- don't rebuild autofoo files
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-1
 - version 0.9.0.p
 - build with GLEW


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Aug 2009 15:09:38 -0000	1.7
+++ sources	17 Aug 2009 15:46:46 -0000	1.8
@@ -1 +1,2 @@
 95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2
+aaa6755b6ddc04a6597fac6ed1984339  rss-glx-0.9.0-autofoo.patch.bz2



From nphilipp at fedoraproject.org  Mon Aug 17 15:47:30 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:47:30 +0000 (UTC)
Subject: rpms/rss-glx/devel rss-glx.spec,1.33,1.34
Message-ID: <20090817154730.845C311C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9798

Modified Files:
	rss-glx.spec 
Log Message:
bump release



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- rss-glx.spec	17 Aug 2009 15:46:46 -0000	1.33
+++ rss-glx.spec	17 Aug 2009 15:47:30 -0000	1.34
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/



From nphilipp at fedoraproject.org  Mon Aug 17 15:48:05 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:48:05 +0000 (UTC)
Subject: rpms/rss-glx/F-11 .cvsignore, 1.4, 1.5 rss-glx.spec, 1.31,
	1.32 sources, 1.7, 1.8
Message-ID: <20090817154805.10E0011C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9944

Modified Files:
	.cvsignore rss-glx.spec sources 
Log Message:
don't rebuild autofoo files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 15:12:08 -0000	1.4
+++ .cvsignore	17 Aug 2009 15:48:04 -0000	1.5
@@ -1 +1,2 @@
 rss-glx_0.9.0.p.tar.bz2
+rss-glx-0.9.0-autofoo.patch.bz2


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/rss-glx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- rss-glx.spec	17 Aug 2009 15:12:08 -0000	1.31
+++ rss-glx.spec	17 Aug 2009 15:48:04 -0000	1.32
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -76,13 +77,6 @@ BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
 
-## the following deps are needed for autoreconf after applying patches
-# no translations -> no gettext needed
-#BuildRequires: gettext
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
 impressive and graphically intensive screensavers.
@@ -176,9 +170,9 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autofoo
 
 %build
-autoreconf -i
 %configure \
     --with-configdir=%{xssconfigdir} \
     --with-kdessconfigdir=%{kdessconfigdir} \
@@ -323,6 +317,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-2
+- don't rebuild autofoo files
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-1
 - version 0.9.0.p
 - build with GLEW


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Aug 2009 15:12:08 -0000	1.7
+++ sources	17 Aug 2009 15:48:04 -0000	1.8
@@ -1 +1,2 @@
 95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2
+aaa6755b6ddc04a6597fac6ed1984339  rss-glx-0.9.0-autofoo.patch.bz2



From nphilipp at fedoraproject.org  Mon Aug 17 15:48:08 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 17 Aug 2009 15:48:08 +0000 (UTC)
Subject: rpms/rss-glx/F-10 .cvsignore, 1.4, 1.5 rss-glx.spec, 1.29,
	1.30 sources, 1.4, 1.5
Message-ID: <20090817154808.7BA4111C00E4@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9875

Modified Files:
	.cvsignore rss-glx.spec sources 
Log Message:
don't rebuild autofoo files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 15:12:15 -0000	1.4
+++ .cvsignore	17 Aug 2009 15:48:08 -0000	1.5
@@ -1 +1,2 @@
 rss-glx_0.9.0.p.tar.bz2
+rss-glx-0.9.0-autofoo.patch.bz2


Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/rss-glx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- rss-glx.spec	17 Aug 2009 15:12:15 -0000	1.29
+++ rss-glx.spec	17 Aug 2009 15:48:08 -0000	1.30
@@ -44,7 +44,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.0%{patchext}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
@@ -76,13 +77,6 @@ BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
 
-## the following deps are needed for autoreconf after applying patches
-# no translations -> no gettext needed
-#BuildRequires: gettext
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
 impressive and graphically intensive screensavers.
@@ -176,9 +170,9 @@ Build settings:
 EOF
 %setup -q -n rss-glx_%{version}
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .autofoo
 
 %build
-autoreconf -i
 %configure \
     --with-configdir=%{xssconfigdir} \
     --with-kdessconfigdir=%{kdessconfigdir} \
@@ -323,6 +317,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-2
+- don't rebuild autofoo files
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-1
 - version 0.9.0.p
 - build with GLEW


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 15:12:15 -0000	1.4
+++ sources	17 Aug 2009 15:48:08 -0000	1.5
@@ -1 +1,2 @@
 95f9c42e1172b65fa9d8c182500a0944  rss-glx_0.9.0.p.tar.bz2
+aaa6755b6ddc04a6597fac6ed1984339  rss-glx-0.9.0-autofoo.patch.bz2



From drago01 at fedoraproject.org  Mon Aug 17 16:11:58 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 17 Aug 2009 16:11:58 +0000 (UTC)
Subject: rpms/fsarchiver/devel fsarchiver.spec,1.15,1.16
Message-ID: <20090817161158.0C4B111C00E4@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15052

Modified Files:
	fsarchiver.spec 
Log Message:
enable xz support


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fsarchiver.spec	24 Jul 2009 23:14:29 -0000	1.15
+++ fsarchiver.spec	17 Aug 2009 16:11:57 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		fsarchiver
 Version:	0.5.8
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -18,8 +18,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
-# Disabled because it needs a beta release of lzma which we do not ship
-#BuildRequires:	lzma-devel
+BuildRequires:	xz-devel
 
 %description
 FSArchiver is a system tool that allows you to save the contents of a 
@@ -34,7 +33,7 @@ is corrupt, you just loose the current f
 %setup -q
 
 %build
-%configure --disable-lzma
+%configure
 make %{?_smp_mflags}
 
 
@@ -53,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-4
+- Enable XZ support
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From drago01 at fedoraproject.org  Mon Aug 17 16:17:49 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 17 Aug 2009 16:17:49 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 fsarchiver.spec,1.13,1.14
Message-ID: <20090817161749.8EDB411C00E4@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16001

Modified Files:
	fsarchiver.spec 
Log Message:
enable xz support


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fsarchiver.spec	12 Jul 2009 15:43:24 -0000	1.13
+++ fsarchiver.spec	17 Aug 2009 16:17:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		fsarchiver
 Version:	0.5.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -16,8 +16,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
-# Disabled because it needs a beta release of lzma which we do not ship
-#BuildRequires:	lzma-devel
+BuildRequires:	xz-devel
 
 %description
 FSArchiver is a system tool that allows you to save the contents of a 
@@ -32,7 +31,7 @@ is corrupt, you just loose the current f
 %setup -q
 
 %build
-%configure --disable-lzma
+%configure
 make %{?_smp_mflags}
 
 
@@ -51,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-2
+- Enable XZ support
+
 * Sun Jul 12 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-1
 - Update to 0.5.8
 



From drago01 at fedoraproject.org  Mon Aug 17 16:17:55 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 17 Aug 2009 16:17:55 +0000 (UTC)
Subject: rpms/fsarchiver/F-10 fsarchiver.spec,1.9,1.10
Message-ID: <20090817161755.552E111C00E4@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16045

Modified Files:
	fsarchiver.spec 
Log Message:
enable xz support


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/fsarchiver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fsarchiver.spec	12 Jul 2009 15:43:30 -0000	1.9
+++ fsarchiver.spec	17 Aug 2009 16:17:55 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		fsarchiver
 Version:	0.5.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -16,8 +16,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	lzo-devel
-# Disabled because it needs a beta release of lzma which we do not ship
-#BuildRequires:	lzma-devel
+BuildRequires:	xz-devel
 
 %description
 FSArchiver is a system tool that allows you to save the contents of a 
@@ -32,7 +31,7 @@ is corrupt, you just loose the current f
 %setup -q
 
 %build
-%configure --disable-lzma
+%configure
 make %{?_smp_mflags}
 
 
@@ -51,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-2
+- Enable XZ support
+
 * Sun Jul 12 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-1
 - Update to 0.5.8
 



From mmcgrath at fedoraproject.org  Mon Aug 17 16:39:27 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 16:39:27 +0000 (UTC)
Subject: rpms/nagios/F-10 nagios.spec,1.67,1.68 sources,1.19,1.20
Message-ID: <20090817163927.CDF3811C00E4@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20484/F-10

Modified Files:
	nagios.spec sources 
Log Message:
upstream released new version


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/nagios.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- nagios.spec	7 Jul 2009 14:51:50 -0000	1.67
+++ nagios.spec	17 Aug 2009 16:39:27 -0000	1.68
@@ -1,7 +1,7 @@
 Name: nagios
 
-Version: 3.1.2
-Release: 1%{?dist}
+Version: 3.2.0
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -22,7 +22,7 @@ BuildRequires: gd-devel > 1.8, mailx, li
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
 
-#Requires: httpd
+Requires: httpd
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires(pre): shadow-utils
 Requires(preun): initscripts, chkconfig
@@ -94,7 +94,7 @@ may compile against.
 	--libexecdir=%{_libdir}/%{name}/plugins \
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--localstatedir=%{_localstatedir}/log/%{name} \
-        --datadir=%{_datadir}/%{name}/html \
+	--datadir=%{_datadir}/%{name}/html \
 	--with-gd-lib=%{_libdir} \
 	--with-gd-inc=%{_includedir} \
 	--enable-embedded-perl \
@@ -191,6 +191,7 @@ fi
 %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg
 %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/conf.d/internet.cfg
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/.htpasswd
+%attr(0640,root,apache) %config(noreplace) %{_datadir}/%{name}/html/config.inc.php
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
@@ -203,7 +204,24 @@ fi
 %{_includedir}/%{name}
 
 %changelog
-* Mon Jun 29 2009  Robert M. Albrecht <fedora at romal.de> 3.2.1-1
+* Mon Aug 17 2009 Mike McGrath <mmcgrath at redhat.com> - 3.2.0-2
+- s/datarootdir/datadir/
+
+* Sun Aug 16 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.0-1
+- Upgrade to 3.2.0 (#517210).
+
+* Fri Jul 24 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.2-3
+- Corrected the package version in the last two changelog entries (#499853)
+- Using configure --datarootdir option instead of --datadir (#499853)
+  (fixes the physical_html_path value in cgi.cfg)
+- Fixes permissions to the new php configuration file config.inc.php (#499853)
+- Re-enables the httpd requirement as its removal caused several problems
+  (see #487411 for more information)
+
+* Wed Jul 15 2009 Mike McGrath <mmcgrath at redhat.com> 3.1.2-2
+- Release bump for rebuild
+
+* Mon Jun 29 2009  Robert M. Albrecht <fedora at romal.de> 3.1.1-1
 - Upstream released a new version
 
 * Mon Jun 22 2009 Mike McGrath <mmcgrath at redhat.com> - 3.0.6-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	6 Jan 2009 18:38:24 -0000	1.19
+++ sources	17 Aug 2009 16:39:27 -0000	1.20
@@ -1 +1 @@
-900e3f4164f4b2a18485420eeaefe812  nagios-3.0.6.tar.gz
+3566167cc60ddeaad34e7d2e26ed4a58  nagios-3.2.0.tar.gz



From mmcgrath at fedoraproject.org  Mon Aug 17 16:39:28 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Mon, 17 Aug 2009 16:39:28 +0000 (UTC)
Subject: rpms/nagios/F-11 nagios.spec,1.67,1.68 sources,1.20,1.21
Message-ID: <20090817163928.027A911C00E4@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20484/F-11

Modified Files:
	nagios.spec sources 
Log Message:
upstream released new version


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-11/nagios.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- nagios.spec	24 Jul 2009 17:41:04 -0000	1.67
+++ nagios.spec	17 Aug 2009 16:39:27 -0000	1.68
@@ -1,7 +1,7 @@
 Name: nagios
 
-Version: 3.1.2
-Release: 3%{?dist}
+Version: 3.2.0
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -94,7 +94,7 @@ may compile against.
 	--libexecdir=%{_libdir}/%{name}/plugins \
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--localstatedir=%{_localstatedir}/log/%{name} \
-	--datarootdir=%{_datadir}/%{name}/html \
+	--datadir=%{_datadir}/%{name}/html \
 	--with-gd-lib=%{_libdir} \
 	--with-gd-inc=%{_includedir} \
 	--enable-embedded-perl \
@@ -204,6 +204,12 @@ fi
 %{_includedir}/%{name}
 
 %changelog
+* Mon Aug 17 2009 Mike McGrath <mmcgrath at redhat.com> - 3.2.0-2
+- s/datarootdir/datadir/
+
+* Sun Aug 16 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.0-1
+- Upgrade to 3.2.0 (#517210).
+
 * Fri Jul 24 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.2-3
 - Corrected the package version in the last two changelog entries (#499853)
 - Using configure --datarootdir option instead of --datadir (#499853)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	24 Jul 2009 18:45:37 -0000	1.20
+++ sources	17 Aug 2009 16:39:27 -0000	1.21
@@ -1 +1 @@
-f3c60428cba14264c709749182b8d93e  nagios-3.1.2.tar.gz
+3566167cc60ddeaad34e7d2e26ed4a58  nagios-3.2.0.tar.gz



From steved at fedoraproject.org  Mon Aug 17 16:58:30 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 16:58:30 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.316, 1.316.2.1 kernel.spec,
	1.1721, 1.1721.2.1
Message-ID: <20090817165830.1832711C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24957

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc6
	config-generic kernel.spec 
Log Message:
Turned on the CONFIG_NFS_4_V1 config variable




Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.316
retrieving revision 1.316.2.1
diff -u -p -r1.316 -r1.316.2.1
--- config-generic	11 Aug 2009 21:55:35 -0000	1.316
+++ config-generic	17 Aug 2009 16:58:29 -0000	1.316.2.1
@@ -3193,7 +3193,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721
retrieving revision 1.1721.2.1
diff -u -p -r1.1721 -r1.1721.2.1
--- kernel.spec	16 Aug 2009 22:09:02 -0000	1.1721
+++ kernel.spec	17 Aug 2009 16:58:29 -0000	1.1721.2.1
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .nfs41
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -1969,6 +1969,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 EDT 2009 Steve Dickson <steved at redhat.com>
+- Turned on the CONFIG_NFS_4_V1 config variable
+
 * Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
 - Improve the perf script so it prints something helpful if the
   perf binary doesn't exist.



From steved at fedoraproject.org  Mon Aug 17 16:59:29 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 16:59:29 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1721.2.1,1.1721.2.2
Message-ID: <20090817165929.9E66D11C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25162

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc6
	kernel.spec 
Log Message:
Fixed a typo in spec file



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721.2.1
retrieving revision 1.1721.2.2
diff -u -p -r1.1721.2.1 -r1.1721.2.2
--- kernel.spec	17 Aug 2009 16:58:29 -0000	1.1721.2.1
+++ kernel.spec	17 Aug 2009 16:59:29 -0000	1.1721.2.2
@@ -1969,7 +1969,7 @@ fi
 # and build.
 
 %changelog
-* Mon Aug 17 EDT 2009 Steve Dickson <steved at redhat.com>
+* Mon Aug 17 2009 Steve Dickson <steved at redhat.com>
 - Turned on the CONFIG_NFS_4_V1 config variable
 
 * Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6



From mtasaka at fedoraproject.org  Mon Aug 17 17:02:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 17 Aug 2009 17:02:11 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.387, 1.388 jd.spec, 1.450, 1.451 sources,
	1.388, 1.389
Message-ID: <20090817170211.69DFA11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25764

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- .cvsignore	16 Aug 2009 06:14:21 -0000	1.387
+++ .cvsignore	17 Aug 2009 17:02:11 -0000	1.388
@@ -1 +1 @@
-jd-2.4.2-svn3043_trunk.tgz
+jd-2.4.2-svn3047_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -p -r1.450 -r1.451
--- jd.spec	16 Aug 2009 06:14:21 -0000	1.450
+++ jd.spec	17 Aug 2009 17:02:11 -0000	1.451
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3043_trunk
+%define         strtag        svn3047_trunk
 %define         repoid        43007
 # 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 Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3043
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3047
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- sources	16 Aug 2009 06:14:21 -0000	1.388
+++ sources	17 Aug 2009 17:02:11 -0000	1.389
@@ -1 +1 @@
-1620d352ab45129c51d457cf86a3e5eb  jd-2.4.2-svn3043_trunk.tgz
+918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz



From mtasaka at fedoraproject.org  Mon Aug 17 17:04:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 17 Aug 2009 17:04:13 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.32, 1.33 kazehakase.spec, 1.88, 
	1.89 sources, 1.32, 1.33
Message-ID: <20090817170413.3BF7011C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26251

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3779



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	25 Jul 2009 17:25:03 -0000	1.32
+++ .cvsignore	17 Aug 2009 17:04:12 -0000	1.33
@@ -1 +1 @@
-kazehakase-0.5.6-svn3778_trunk.tar.gz
+kazehakase-0.5.6-svn3779_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kazehakase.spec	25 Jul 2009 17:25:03 -0000	1.88
+++ kazehakase.spec	17 Aug 2009 17:04:12 -0000	1.89
@@ -31,10 +31,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3778_trunk
+%define		svnver		3779_trunk
 
 
-%define		fedorarel	15
+%define		fedorarel	16
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -321,6 +321,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3779
+
 * Sun Jul 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 3778
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	25 Jul 2009 17:25:03 -0000	1.32
+++ sources	17 Aug 2009 17:04:12 -0000	1.33
@@ -1 +1 @@
-e970c273ffd3c019bbab513befcb48ba  kazehakase-0.5.6-svn3778_trunk.tar.gz
+0314db4d428992ff4f0a2a0be0fa240b  kazehakase-0.5.6-svn3779_trunk.tar.gz



From toshio at fedoraproject.org  Mon Aug 17 17:10:25 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 17:10:25 +0000 (UTC)
Subject: rpms/xz/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3 xz.spec,1.2,1.3
Message-ID: <20090817171025.A0EE011C04D1@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/xz/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27415

Modified Files:
	.cvsignore sources xz.spec 
Log Message:

* Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.10.beta.20090817git
- sync with upstream because of #517806



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jul 2009 18:19:25 -0000	1.2
+++ .cvsignore	17 Aug 2009 17:10:25 -0000	1.3
@@ -1 +1 @@
-xz-4.999.8beta.tar.gz
+xz-4.999.8beta.20090817git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jul 2009 18:19:25 -0000	1.2
+++ sources	17 Aug 2009 17:10:25 -0000	1.3
@@ -1 +1 @@
-f00967331a487e88d51207fe17c56f52  xz-4.999.8beta.tar.gz
+d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/EL-5/xz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xz.spec	22 Jul 2009 15:08:28 -0000	1.2
+++ xz.spec	17 Aug 2009 17:10:25 -0000	1.3
@@ -1,10 +1,16 @@
+%define git_date 20090817
+
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.8
-Release:	0.7.beta%{?dist}.1
+Release:	0.10.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz
+# git clone git://ctrl.tukaani.org/xz.git
+# cd xz
+# git checkout 10242a21e9abda0c5c6a03501703cc40b8a699a5
+# source created as "make dist" in checked out GIT tree
+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}
@@ -67,6 +73,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 rm -f %{buildroot}/%{_libdir}/*.a
 rm -f %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}/%{_docdir}/%{name}
 
 %check
 LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
@@ -102,9 +109,14 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jul 22 2009 Toshio Kuratomi <toshio at fedoraproject.org> 4.999.8-0.7.beta.1
-- Bump release for EPEL while we work out some kinks in how we build in koji
-  for the infrastructure repo.
+* Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.10.beta.20090817git
+- sync with upstream because of #517806
+
+* Tue Aug 04 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.9.beta.20090804git
+- update to the latest GIT snapshot
+
+* 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



From smilner at fedoraproject.org  Mon Aug 17 17:18:04 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 17 Aug 2009 17:18:04 +0000 (UTC)
Subject: rpms/buildbot/devel .cvsignore, 1.10, 1.11 buildbot.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20090817171804.A80EF11C00E4@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28772

Modified Files:
	.cvsignore buildbot.spec sources 
Log Message:
update for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	13 Aug 2009 13:57:25 -0000	1.10
+++ .cvsignore	17 Aug 2009 17:18:04 -0000	1.11
@@ -1 +1 @@
-buildbot-0.7.11p2.tar.gz
+buildbot-0.7.11p3.tar.gz


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/devel/buildbot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- buildbot.spec	13 Aug 2009 13:57:25 -0000	1.17
+++ buildbot.spec	17 Aug 2009 17:18:04 -0000	1.18
@@ -3,7 +3,7 @@
 %global do_tests 1
 
 Name:           buildbot
-Version:        0.7.11p2
+Version:        0.7.11p3
 Release:        1%{?dist}
 Summary:        Build/test automation system
 
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 17 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p3-1
+- Update for another XSS vuln from upstream
+
 * Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p2-1
 - Update for XSS vuln from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	13 Aug 2009 13:57:25 -0000	1.10
+++ sources	17 Aug 2009 17:18:04 -0000	1.11
@@ -1 +1 @@
-eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz
+6e4ef001d11caf270e2ed7d1d7d43318  buildbot-0.7.11p3.tar.gz



From smilner at fedoraproject.org  Mon Aug 17 17:20:06 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 17 Aug 2009 17:20:06 +0000 (UTC)
Subject: rpms/buildbot/F-11 .cvsignore, 1.8, 1.9 buildbot.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <20090817172006.BA43811C04BE@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29173

Modified Files:
	.cvsignore buildbot.spec sources 
Log Message:
update for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 Aug 2009 14:49:21 -0000	1.8
+++ .cvsignore	17 Aug 2009 17:20:06 -0000	1.9
@@ -1 +1 @@
-buildbot-0.7.11p2.tar.gz
+buildbot-0.7.11p3.tar.gz


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/buildbot.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- buildbot.spec	13 Aug 2009 14:49:21 -0000	1.14
+++ buildbot.spec	17 Aug 2009 17:20:06 -0000	1.15
@@ -3,7 +3,7 @@
 %global do_tests 1
 
 Name:           buildbot
-Version:        0.7.11p2
+Version:        0.7.11p3
 Release:        1%{?dist}
 Summary:        Build/test automation system
 
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 17 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p3-1
+- Update for another XSS vuln from upstream
+
 * Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p2-1
 - Update for XSS vuln from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Aug 2009 14:49:21 -0000	1.8
+++ sources	17 Aug 2009 17:20:06 -0000	1.9
@@ -1 +1 @@
-eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz
+6e4ef001d11caf270e2ed7d1d7d43318  buildbot-0.7.11p3.tar.gz



From smilner at fedoraproject.org  Mon Aug 17 17:22:02 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 17 Aug 2009 17:22:02 +0000 (UTC)
Subject: rpms/buildbot/F-10 .cvsignore, 1.6, 1.7 buildbot.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090817172202.90EC911C00E4@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29585

Modified Files:
	.cvsignore buildbot.spec sources 
Log Message:
updated for upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Aug 2009 14:51:46 -0000	1.6
+++ .cvsignore	17 Aug 2009 17:22:02 -0000	1.7
@@ -1 +1 @@
-buildbot-0.7.11p2.tar.gz
+buildbot-0.7.11p3.tar.gz


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-10/buildbot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- buildbot.spec	13 Aug 2009 14:51:47 -0000	1.9
+++ buildbot.spec	17 Aug 2009 17:22:02 -0000	1.10
@@ -3,7 +3,7 @@
 %global do_tests 1
 
 Name:           buildbot
-Version:        0.7.11p2
+Version:        0.7.11p3
 Release:        1%{?dist}
 Summary:        Build/test automation system
 
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 17 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p3-1
+- Update for another XSS vuln from upstream
+
 * Thu Aug 13 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p2-1
 - Update for XSS vuln from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Aug 2009 14:51:47 -0000	1.6
+++ sources	17 Aug 2009 17:22:02 -0000	1.7
@@ -1 +1 @@
-eda5b9649d4c079cf835d885965dbafd  buildbot-0.7.11p2.tar.gz
+6e4ef001d11caf270e2ed7d1d7d43318  buildbot-0.7.11p3.tar.gz



From spot at fedoraproject.org  Mon Aug 17 17:22:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 17:22:13 +0000 (UTC)
Subject: rpms/afuse/F-10 afuse-template-tokenize.patch, NONE, 1.1 afuse.spec,
	1.1, 1.2
Message-ID: <20090817172213.3F36011C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/afuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29623/F-10

Modified Files:
	afuse.spec 
Added Files:
	afuse-template-tokenize.patch 
Log Message:
fix CVE-2008-2232

afuse-template-tokenize.patch:
 afuse.c |  136 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 82 insertions(+), 54 deletions(-)

--- NEW FILE afuse-template-tokenize.patch ---
diff -ur afuse-0.2.orig/src/afuse.c afuse-0.2/src/afuse.c
--- afuse-0.2.orig/src/afuse.c	2008-02-18 17:16:32.000000000 -0500
+++ afuse-0.2/src/afuse.c	2008-07-10 21:50:06.000000000 -0400
@@ -280,14 +280,19 @@
 }
 
 
-// !!FIXME!! allow escaping of %'s
 // Note: this method strips out quotes and applies them itself as should be appropriate
-char *expand_template(const char *template, const char *mount_point, const char *root_name)
+bool run_template(const char *template, const char *mount_point, const char *root_name)
 {
 	int len = 0;
+	int nargs = 1;
 	int i;
-	char *expanded_name;
-	char *expanded_name_start;
+	char *buf;
+	char *p;
+	char **args;
+	char **arg;
+	bool quote = false;
+	pid_t pid;
+	int status;
 
 	// calculate length
 	for(i = 0; template[i]; i++)
@@ -295,53 +300,100 @@
 			switch(template[i + 1])
 			{
 				case 'm':
-					len += strlen(mount_point) + 2;
+					len += strlen(mount_point);
 					i++;
 					break;
 				case 'r':
-					len += strlen(root_name) + 2;
+					len += strlen(root_name);
+					i++;
+					break;
+				case '%':
+					len++;
 					i++;
 					break;
 			}
-		} else if(template[i] != '"')
+		} else if(template[i] == ' ' && !quote) {
+			len++;
+			nargs++;
+		} else if(template[i] == '"')
+			quote = !quote;
+		else if(template[i] == '\\' && template[i + 1])
+			len++, i++;
+		else
 			len++;
 
-	expanded_name_start = expanded_name = my_malloc(len + 1);
+	buf = my_malloc(len + 1);
+	args = my_malloc((nargs + 1) * sizeof(*args));
+
+	p = buf;
+	arg = args;
+	*arg++ = p;
 
 	for(i = 0; template[i]; i++)
 		if(template[i] == '%') {
-			int j = 0;
 			switch(template[i + 1])
 			{
 				case 'm':
-					*expanded_name++ = '"';
-					while(mount_point[j])
-						*expanded_name++ = mount_point[j++];
-					*expanded_name++ = '"';
+					strcpy(p, mount_point);
+					p += strlen(mount_point);
 					i++;
 					break;
 				case 'r':
-					*expanded_name++ = '"';
-					while(root_name[j])
-						*expanded_name++ = root_name[j++];
-					*expanded_name++ = '"';
+					strcpy(p, root_name);
+					p += strlen(root_name);
+					i++;
+					break;
+				case '%':
+					*p++ = '%';
 					i++;
 					break;
 			}
-		} else if(template[i] != '"')
-			*expanded_name++ = template[i];
-
-	*expanded_name = '\0';
-
-	return expanded_name_start;
+		} else if(template[i] == ' ' && !quote) {
+			*p++ = '\0';
+			*arg++ = p;
+		} else if(template[i] == '"')
+			quote = !quote;
+		else if(template[i] == '\\' && template[i + 1])
+			*p++ = template[++i];
+		else
+			*p++ = template[i];
+
+	*p = '\0';
+	*arg = NULL;
+
+	pid = fork();
+	if(pid == -1) {
+		fprintf(stderr, "Failed to fork (%s)\n", strerror(errno));
+		free(args);
+		free(buf);
+		return false;
+	}
+	if(pid == 0) {
+		execvp(args[0], args);
+		abort();
+	}
+	pid = waitpid(pid, &status, 0);
+	if(pid == -1) {
+		fprintf(stderr, "Failed to waitpid (%s)\n", strerror(errno));
+		free(args);
+		free(buf);
+		return false;
+	}
+	if(!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		fprintf(stderr, "Failed to invoke command: %s\n", args[0]);
+		free(args);
+		free(buf);
+		return false;
+	}
+	free(args);
+	free(buf);
+	return true;
 }
 
 mount_list_t *do_mount(const char *root_name)
 {
 	char *mount_point;
-	char *mount_command;
 	mount_list_t *mount;
-	int sysret;
 
 	fprintf(stderr, "Mounting: %s\n", root_name);
 
@@ -351,57 +403,33 @@
 		return NULL;
 	}
 
-	mount_command = expand_template(user_options.mount_command_template,
-	                                mount_point, root_name);
-	sysret = system(mount_command);
-
-	fprintf(stderr, "sysret: %.8x\n", sysret);
-
-	if(sysret) {
-		fprintf(stderr, "Failed to invoke mount command: '%s' (%s)\n",
-			mount_command, sysret != -1 ?
-				"Error executing mount" :
-				strerror(errno));
-
+	if(!run_template(user_options.mount_command_template,
+			 mount_point, root_name)) {
 		// remove the now unused directory
 		if( rmdir(mount_point) == -1 )
 			fprintf(stderr, "Failed to remove mount point dir: %s (%s)",
 				mount_point, strerror(errno));
 
-		free(mount_command);
 		free(mount_point);
 		return NULL;
 	}
 
 	mount = add_mount(root_name, mount_point);
-
-	free(mount_command);
 	return mount;
 }
 
 int do_umount(mount_list_t *mount)
 {
-	char *unmount_command;
-	int sysret;
-
 	fprintf(stderr, "Unmounting: %s\n", mount->root_name);
 
-	unmount_command = expand_template(user_options.unmount_command_template,
-	                                  mount->mount_point, mount->root_name);
-	sysret = system(unmount_command);
-	if(sysret) {
-		fprintf(stderr, "Failed to invoke unmount command: '%s' (%s)\n",
-		        unmount_command, sysret != -1 ?
-			               "Error executing mount" :
-				       strerror(errno));
-		/* Still unmount anyway */
-	}
+	run_template(user_options.unmount_command_template,
+		     mount->mount_point, mount->root_name);
+	/* Still unmount anyway */
 
 	if( rmdir(mount->mount_point) == -1 )
 		fprintf(stderr, "Failed to remove mount point dir: %s (%s)",
 				mount->mount_point, strerror(errno));
 	remove_mount(mount);
-	free(unmount_command);
 	return 1;
 }
 

 	  	 


Index: afuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afuse/F-10/afuse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afuse.spec	2 Dec 2008 18:22:51 -0000	1.1
+++ afuse.spec	17 Aug 2009 17:22:13 -0000	1.2
@@ -1,13 +1,15 @@
 Name:		afuse
 Summary: 	An automounter implemented with FUSE
 Version:	0.2
-Release:	1%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://downloads.sourceforge.net/afuse/%{name}-%{version}.tar.gz
 URL:		http://afuse.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel
+# fix CVE-2008-2232
+Patch0:		afuse-template-tokenize.patch
 
 %description
 Afuse is an automounting file system implemented in user-space using FUSE. 
@@ -20,6 +22,7 @@ with an error.
 
 %prep
 %setup -q
+%patch0 -p1 -b .CVS-2008-2232
 
 %build
 %configure
@@ -38,5 +41,14 @@ rm -rf %{buildroot}
 %{_bindir}/afuse
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2-4
+- fix CVS-2008-2232
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Nov 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.2-1
 - Initial package for Fedora



From spot at fedoraproject.org  Mon Aug 17 17:22:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 17:22:13 +0000 (UTC)
Subject: rpms/afuse/F-11 afuse-template-tokenize.patch, NONE, 1.1 afuse.spec,
	1.2, 1.3
Message-ID: <20090817172213.6441511C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/afuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29623/F-11

Modified Files:
	afuse.spec 
Added Files:
	afuse-template-tokenize.patch 
Log Message:
fix CVE-2008-2232

afuse-template-tokenize.patch:
 afuse.c |  136 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 82 insertions(+), 54 deletions(-)

--- NEW FILE afuse-template-tokenize.patch ---
diff -ur afuse-0.2.orig/src/afuse.c afuse-0.2/src/afuse.c
--- afuse-0.2.orig/src/afuse.c	2008-02-18 17:16:32.000000000 -0500
+++ afuse-0.2/src/afuse.c	2008-07-10 21:50:06.000000000 -0400
@@ -280,14 +280,19 @@
 }
 
 
-// !!FIXME!! allow escaping of %'s
 // Note: this method strips out quotes and applies them itself as should be appropriate
-char *expand_template(const char *template, const char *mount_point, const char *root_name)
+bool run_template(const char *template, const char *mount_point, const char *root_name)
 {
 	int len = 0;
+	int nargs = 1;
 	int i;
-	char *expanded_name;
-	char *expanded_name_start;
+	char *buf;
+	char *p;
+	char **args;
+	char **arg;
+	bool quote = false;
+	pid_t pid;
+	int status;
 
 	// calculate length
 	for(i = 0; template[i]; i++)
@@ -295,53 +300,100 @@
 			switch(template[i + 1])
 			{
 				case 'm':
-					len += strlen(mount_point) + 2;
+					len += strlen(mount_point);
 					i++;
 					break;
 				case 'r':
-					len += strlen(root_name) + 2;
+					len += strlen(root_name);
+					i++;
+					break;
+				case '%':
+					len++;
 					i++;
 					break;
 			}
-		} else if(template[i] != '"')
+		} else if(template[i] == ' ' && !quote) {
+			len++;
+			nargs++;
+		} else if(template[i] == '"')
+			quote = !quote;
+		else if(template[i] == '\\' && template[i + 1])
+			len++, i++;
+		else
 			len++;
 
-	expanded_name_start = expanded_name = my_malloc(len + 1);
+	buf = my_malloc(len + 1);
+	args = my_malloc((nargs + 1) * sizeof(*args));
+
+	p = buf;
+	arg = args;
+	*arg++ = p;
 
 	for(i = 0; template[i]; i++)
 		if(template[i] == '%') {
-			int j = 0;
 			switch(template[i + 1])
 			{
 				case 'm':
-					*expanded_name++ = '"';
-					while(mount_point[j])
-						*expanded_name++ = mount_point[j++];
-					*expanded_name++ = '"';
+					strcpy(p, mount_point);
+					p += strlen(mount_point);
 					i++;
 					break;
 				case 'r':
-					*expanded_name++ = '"';
-					while(root_name[j])
-						*expanded_name++ = root_name[j++];
-					*expanded_name++ = '"';
+					strcpy(p, root_name);
+					p += strlen(root_name);
+					i++;
+					break;
+				case '%':
+					*p++ = '%';
 					i++;
 					break;
 			}
-		} else if(template[i] != '"')
-			*expanded_name++ = template[i];
-
-	*expanded_name = '\0';
-
-	return expanded_name_start;
+		} else if(template[i] == ' ' && !quote) {
+			*p++ = '\0';
+			*arg++ = p;
+		} else if(template[i] == '"')
+			quote = !quote;
+		else if(template[i] == '\\' && template[i + 1])
+			*p++ = template[++i];
+		else
+			*p++ = template[i];
+
+	*p = '\0';
+	*arg = NULL;
+
+	pid = fork();
+	if(pid == -1) {
+		fprintf(stderr, "Failed to fork (%s)\n", strerror(errno));
+		free(args);
+		free(buf);
+		return false;
+	}
+	if(pid == 0) {
+		execvp(args[0], args);
+		abort();
+	}
+	pid = waitpid(pid, &status, 0);
+	if(pid == -1) {
+		fprintf(stderr, "Failed to waitpid (%s)\n", strerror(errno));
+		free(args);
+		free(buf);
+		return false;
+	}
+	if(!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		fprintf(stderr, "Failed to invoke command: %s\n", args[0]);
+		free(args);
+		free(buf);
+		return false;
+	}
+	free(args);
+	free(buf);
+	return true;
 }
 
 mount_list_t *do_mount(const char *root_name)
 {
 	char *mount_point;
-	char *mount_command;
 	mount_list_t *mount;
-	int sysret;
 
 	fprintf(stderr, "Mounting: %s\n", root_name);
 
@@ -351,57 +403,33 @@
 		return NULL;
 	}
 
-	mount_command = expand_template(user_options.mount_command_template,
-	                                mount_point, root_name);
-	sysret = system(mount_command);
-
-	fprintf(stderr, "sysret: %.8x\n", sysret);
-
-	if(sysret) {
-		fprintf(stderr, "Failed to invoke mount command: '%s' (%s)\n",
-			mount_command, sysret != -1 ?
-				"Error executing mount" :
-				strerror(errno));
-
+	if(!run_template(user_options.mount_command_template,
+			 mount_point, root_name)) {
 		// remove the now unused directory
 		if( rmdir(mount_point) == -1 )
 			fprintf(stderr, "Failed to remove mount point dir: %s (%s)",
 				mount_point, strerror(errno));
 
-		free(mount_command);
 		free(mount_point);
 		return NULL;
 	}
 
 	mount = add_mount(root_name, mount_point);
-
-	free(mount_command);
 	return mount;
 }
 
 int do_umount(mount_list_t *mount)
 {
-	char *unmount_command;
-	int sysret;
-
 	fprintf(stderr, "Unmounting: %s\n", mount->root_name);
 
-	unmount_command = expand_template(user_options.unmount_command_template,
-	                                  mount->mount_point, mount->root_name);
-	sysret = system(unmount_command);
-	if(sysret) {
-		fprintf(stderr, "Failed to invoke unmount command: '%s' (%s)\n",
-		        unmount_command, sysret != -1 ?
-			               "Error executing mount" :
-				       strerror(errno));
-		/* Still unmount anyway */
-	}
+	run_template(user_options.unmount_command_template,
+		     mount->mount_point, mount->root_name);
+	/* Still unmount anyway */
 
 	if( rmdir(mount->mount_point) == -1 )
 		fprintf(stderr, "Failed to remove mount point dir: %s (%s)",
 				mount->mount_point, strerror(errno));
 	remove_mount(mount);
-	free(unmount_command);
 	return 1;
 }
 

 	  	 


Index: afuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afuse/F-11/afuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- afuse.spec	24 Feb 2009 00:15:56 -0000	1.2
+++ afuse.spec	17 Aug 2009 17:22:13 -0000	1.3
@@ -1,13 +1,15 @@
 Name:		afuse
 Summary: 	An automounter implemented with FUSE
 Version:	0.2
-Release:	2%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://downloads.sourceforge.net/afuse/%{name}-%{version}.tar.gz
 URL:		http://afuse.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel
+# fix CVE-2008-2232
+Patch0:		afuse-template-tokenize.patch
 
 %description
 Afuse is an automounting file system implemented in user-space using FUSE. 
@@ -20,6 +22,7 @@ with an error.
 
 %prep
 %setup -q
+%patch0 -p1 -b .CVS-2008-2232
 
 %build
 %configure
@@ -38,6 +41,12 @@ rm -rf %{buildroot}
 %{_bindir}/afuse
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2-4
+- fix CVS-2008-2232
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Aug 17 17:22:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 17:22:13 +0000 (UTC)
Subject: rpms/afuse/devel afuse-template-tokenize.patch, NONE, 1.1 afuse.spec,
	1.3, 1.4
Message-ID: <20090817172213.950B111C0346@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/afuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29623/devel

Modified Files:
	afuse.spec 
Added Files:
	afuse-template-tokenize.patch 
Log Message:
fix CVE-2008-2232

afuse-template-tokenize.patch:
 afuse.c |  136 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 82 insertions(+), 54 deletions(-)

--- NEW FILE afuse-template-tokenize.patch ---
diff -ur afuse-0.2.orig/src/afuse.c afuse-0.2/src/afuse.c
--- afuse-0.2.orig/src/afuse.c	2008-02-18 17:16:32.000000000 -0500
+++ afuse-0.2/src/afuse.c	2008-07-10 21:50:06.000000000 -0400
@@ -280,14 +280,19 @@
 }
 
 
-// !!FIXME!! allow escaping of %'s
 // Note: this method strips out quotes and applies them itself as should be appropriate
-char *expand_template(const char *template, const char *mount_point, const char *root_name)
+bool run_template(const char *template, const char *mount_point, const char *root_name)
 {
 	int len = 0;
+	int nargs = 1;
 	int i;
-	char *expanded_name;
-	char *expanded_name_start;
+	char *buf;
+	char *p;
+	char **args;
+	char **arg;
+	bool quote = false;
+	pid_t pid;
+	int status;
 
 	// calculate length
 	for(i = 0; template[i]; i++)
@@ -295,53 +300,100 @@
 			switch(template[i + 1])
 			{
 				case 'm':
-					len += strlen(mount_point) + 2;
+					len += strlen(mount_point);
 					i++;
 					break;
 				case 'r':
-					len += strlen(root_name) + 2;
+					len += strlen(root_name);
+					i++;
+					break;
+				case '%':
+					len++;
 					i++;
 					break;
 			}
-		} else if(template[i] != '"')
+		} else if(template[i] == ' ' && !quote) {
+			len++;
+			nargs++;
+		} else if(template[i] == '"')
+			quote = !quote;
+		else if(template[i] == '\\' && template[i + 1])
+			len++, i++;
+		else
 			len++;
 
-	expanded_name_start = expanded_name = my_malloc(len + 1);
+	buf = my_malloc(len + 1);
+	args = my_malloc((nargs + 1) * sizeof(*args));
+
+	p = buf;
+	arg = args;
+	*arg++ = p;
 
 	for(i = 0; template[i]; i++)
 		if(template[i] == '%') {
-			int j = 0;
 			switch(template[i + 1])
 			{
 				case 'm':
-					*expanded_name++ = '"';
-					while(mount_point[j])
-						*expanded_name++ = mount_point[j++];
-					*expanded_name++ = '"';
+					strcpy(p, mount_point);
+					p += strlen(mount_point);
 					i++;
 					break;
 				case 'r':
-					*expanded_name++ = '"';
-					while(root_name[j])
-						*expanded_name++ = root_name[j++];
-					*expanded_name++ = '"';
+					strcpy(p, root_name);
+					p += strlen(root_name);
+					i++;
+					break;
+				case '%':
+					*p++ = '%';
 					i++;
 					break;
 			}
-		} else if(template[i] != '"')
-			*expanded_name++ = template[i];
-
-	*expanded_name = '\0';
-
-	return expanded_name_start;
+		} else if(template[i] == ' ' && !quote) {
+			*p++ = '\0';
+			*arg++ = p;
+		} else if(template[i] == '"')
+			quote = !quote;
+		else if(template[i] == '\\' && template[i + 1])
+			*p++ = template[++i];
+		else
+			*p++ = template[i];
+
+	*p = '\0';
+	*arg = NULL;
+
+	pid = fork();
+	if(pid == -1) {
+		fprintf(stderr, "Failed to fork (%s)\n", strerror(errno));
+		free(args);
+		free(buf);
+		return false;
+	}
+	if(pid == 0) {
+		execvp(args[0], args);
+		abort();
+	}
+	pid = waitpid(pid, &status, 0);
+	if(pid == -1) {
+		fprintf(stderr, "Failed to waitpid (%s)\n", strerror(errno));
+		free(args);
+		free(buf);
+		return false;
+	}
+	if(!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		fprintf(stderr, "Failed to invoke command: %s\n", args[0]);
+		free(args);
+		free(buf);
+		return false;
+	}
+	free(args);
+	free(buf);
+	return true;
 }
 
 mount_list_t *do_mount(const char *root_name)
 {
 	char *mount_point;
-	char *mount_command;
 	mount_list_t *mount;
-	int sysret;
 
 	fprintf(stderr, "Mounting: %s\n", root_name);
 
@@ -351,57 +403,33 @@
 		return NULL;
 	}
 
-	mount_command = expand_template(user_options.mount_command_template,
-	                                mount_point, root_name);
-	sysret = system(mount_command);
-
-	fprintf(stderr, "sysret: %.8x\n", sysret);
-
-	if(sysret) {
-		fprintf(stderr, "Failed to invoke mount command: '%s' (%s)\n",
-			mount_command, sysret != -1 ?
-				"Error executing mount" :
-				strerror(errno));
-
+	if(!run_template(user_options.mount_command_template,
+			 mount_point, root_name)) {
 		// remove the now unused directory
 		if( rmdir(mount_point) == -1 )
 			fprintf(stderr, "Failed to remove mount point dir: %s (%s)",
 				mount_point, strerror(errno));
 
-		free(mount_command);
 		free(mount_point);
 		return NULL;
 	}
 
 	mount = add_mount(root_name, mount_point);
-
-	free(mount_command);
 	return mount;
 }
 
 int do_umount(mount_list_t *mount)
 {
-	char *unmount_command;
-	int sysret;
-
 	fprintf(stderr, "Unmounting: %s\n", mount->root_name);
 
-	unmount_command = expand_template(user_options.unmount_command_template,
-	                                  mount->mount_point, mount->root_name);
-	sysret = system(unmount_command);
-	if(sysret) {
-		fprintf(stderr, "Failed to invoke unmount command: '%s' (%s)\n",
-		        unmount_command, sysret != -1 ?
-			               "Error executing mount" :
-				       strerror(errno));
-		/* Still unmount anyway */
-	}
+	run_template(user_options.unmount_command_template,
+		     mount->mount_point, mount->root_name);
+	/* Still unmount anyway */
 
 	if( rmdir(mount->mount_point) == -1 )
 		fprintf(stderr, "Failed to remove mount point dir: %s (%s)",
 				mount->mount_point, strerror(errno));
 	remove_mount(mount);
-	free(unmount_command);
 	return 1;
 }
 

 	  	 


Index: afuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afuse/devel/afuse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- afuse.spec	24 Jul 2009 16:37:51 -0000	1.3
+++ afuse.spec	17 Aug 2009 17:22:13 -0000	1.4
@@ -1,13 +1,15 @@
 Name:		afuse
 Summary: 	An automounter implemented with FUSE
 Version:	0.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://downloads.sourceforge.net/afuse/%{name}-%{version}.tar.gz
 URL:		http://afuse.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel
+# fix CVE-2008-2232
+Patch0:		afuse-template-tokenize.patch
 
 %description
 Afuse is an automounting file system implemented in user-space using FUSE. 
@@ -20,6 +22,7 @@ with an error.
 
 %prep
 %setup -q
+%patch0 -p1 -b .CVS-2008-2232
 
 %build
 %configure
@@ -38,6 +41,9 @@ rm -rf %{buildroot}
 %{_bindir}/afuse
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2-4
+- fix CVS-2008-2232
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jeckersb at fedoraproject.org  Mon Aug 17 17:28:02 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Mon, 17 Aug 2009 17:28:02 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.10, 1.11 python-netaddr.spec,
	1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20090817172802.9110511C00E4@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31466

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
New upstream release 0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Aug 2009 13:32:36 -0000	1.10
+++ .cvsignore	17 Aug 2009 17:28:02 -0000	1.11
@@ -1 +1 @@
-netaddr-0.7.tar.gz
+netaddr-0.7.1.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-netaddr.spec	12 Aug 2009 13:32:36 -0000	1.15
+++ python-netaddr.spec	17 Aug 2009 17:28:02 -0000	1.16
@@ -3,7 +3,7 @@
 #====================================================================#
 
 Name:           python-netaddr
-Version:        0.7
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        Network address manipulation, done Pythonically
 
@@ -47,7 +47,6 @@ http://packages.python.org/netaddr/
 
 %prep
 %setup -q -n netaddr-%{version}
-chmod 644 tests/*
 
 # Make rpmlint happy, get rid of DOS line endings
 %{__sed} -i 's/\r//' netaddr/*.py
@@ -70,8 +69,7 @@ rm -rf %{buildroot}
 
 
 %check
-python tests/ut_netaddr.py
-
+%{__python} netaddr/tests/__init__.py
 
 %clean
 rm -rf %{buildroot}
@@ -79,12 +77,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYRIGHT GLOSSARY INSTALL LICENSE PKG-INFO
-%doc README docs/api/ tests
+%doc AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO
+%doc README docs/api/
 %{python_sitelib}/*
-
+%{_bindir}/netaddr
 
 %changelog
+* Mon Aug 17 2009 John Eckersberg <jeckersb at redhat.com> - 0.7.1-1
+- New upstream release 0.7.1 fixes naming conflict with 'nash' by
+  renaming the netaddr shell to 'netaddr'
+
 * Wed Aug 12 2009 John Eckersberg <jeckersb at redhat.com> - 0.7-1
 - Upstream release 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Aug 2009 13:32:36 -0000	1.10
+++ sources	17 Aug 2009 17:28:02 -0000	1.11
@@ -1 +1 @@
-55827ec4397f6e25919bcc5aa6bd0f71  netaddr-0.7.tar.gz
+7f04851de730cef894291153c3310cfe  netaddr-0.7.1.tar.gz



From steved at fedoraproject.org  Mon Aug 17 17:37:54 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 17:37:54 +0000 (UTC)
Subject: rpms/kernel/devel nfs41-v2.6.31-rc6.patch, NONE, 1.1.2.1 kernel.spec,
	1.1721.2.2, 1.1721.2.3
Message-ID: <20090817173754.3606811C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv670

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc6
	kernel.spec 
Added Files:
      Tag: kernel-2_6_31-nfs41_rc6
	nfs41-v2.6.31-rc6.patch 
Log Message:
Update to the latest NFS41 update (v2.6.31-rc6)



nfs41-v2.6.31-rc6.patch:
 fs/nfs/client.c                |   10 
 fs/nfs/nfs4proc.c              |   16 +
 fs/nfs/nfs4state.c             |    2 
 fs/nfsd/nfs4callback.c         |  216 ++++++++++++++++++-
 fs/nfsd/nfs4proc.c             |   35 ---
 fs/nfsd/nfs4state.c            |  462 ++++++++++++++++++-----------------------
 fs/nfsd/nfs4xdr.c              |   16 -
 fs/nfsd/nfssvc.c               |   30 +-
 include/linux/nfs4.h           |    2 
 include/linux/nfsd/nfsd.h      |    3 
 include/linux/nfsd/state.h     |   62 +++--
 include/linux/nfsd/xdr4.h      |   26 --
 include/linux/sunrpc/clnt.h    |    1 
 include/linux/sunrpc/svc.h     |    2 
 include/linux/sunrpc/svcsock.h |    1 
 include/linux/sunrpc/xprt.h    |    7 
 net/sunrpc/backchannel_rqst.c  |    2 
 net/sunrpc/clnt.c              |    1 
 net/sunrpc/sched.c             |    7 
 net/sunrpc/sunrpc.h            |   14 +
 net/sunrpc/svcsock.c           |  251 ++++++++++++++++------
 net/sunrpc/xprt.c              |   16 +
 net/sunrpc/xprtsock.c          |  199 ++++++++++++++++-
 23 files changed, 944 insertions(+), 437 deletions(-)

--- NEW FILE nfs41-v2.6.31-rc6.patch ---
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8d25ccb..e4dae5f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -149,6 +149,7 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
 	clp->cl_boot_time = CURRENT_TIME;
 	clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
 	clp->cl_minorversion = cl_init->minorversion;
+	clp->cl_lease_time = 0;
 #endif
 	cred = rpc_lookup_machine_cred();
 	if (!IS_ERR(cred))
@@ -535,16 +536,11 @@ void nfs_mark_client_ready(struct nfs_client *clp, int state)
 /*
  * With sessions, the client is not marked ready until after a
  * successful EXCHANGE_ID and CREATE_SESSION.
- *
- * Map errors cl_cons_state errors to EPROTONOSUPPORT to indicate
- * other versions of NFS can be tried.
  */
 int nfs4_check_client_ready(struct nfs_client *clp)
 {
-	if (!nfs4_has_session(clp))
-		return 0;
-	if (clp->cl_cons_state < NFS_CS_READY)
-		return -EPROTONOSUPPORT;
+	if (clp->cl_cons_state < 0)
+		return clp->cl_cons_state;
 	return 0;
 }
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6917311..282df2d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1449,13 +1449,21 @@ static int nfs4_recover_expired_lease(struct nfs_server *server)
 	for (;;) {
 		ret = nfs4_wait_clnt_recover(clp);
 		if (ret != 0)
-			return ret;
-		if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
-		    !test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state))
 			break;
+		/* Is lease recovery done? */
+		if (!test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state) &&
+		    !test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
+			break;
+		if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
+		    clp->cl_lease_time) {
+			/* fetch the lease reclaim error */
+			ret = (int)clp->cl_lease_time;
+			break;
+		}
 		nfs4_schedule_state_recovery(clp);
 	}
-	return 0;
+	dprintk("%s: error=%d\n", __func__, ret);
+	return ret;
 }
 
 /*
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 65ca8c1..b5c71dc 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1220,6 +1220,7 @@ static void nfs4_set_lease_expired(struct nfs_client *clp, int status)
 			return;
 		}
 	}
+	clp->cl_lease_time = status;
 	set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
 }
 
@@ -1231,6 +1232,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
 	for(;;) {
 		if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
 			/* We're going to have to re-establish a clientid */
+			clp->cl_lease_time = 0;
 			status = nfs4_reclaim_lease(clp);
 			if (status) {
 				nfs4_set_lease_expired(clp, status);
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 3fd23f7..6f1c046 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -43,6 +43,7 @@
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/svcsock.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/state.h>
 #include <linux/sunrpc/sched.h>
@@ -52,16 +53,19 @@
 
 #define NFSPROC4_CB_NULL 0
 #define NFSPROC4_CB_COMPOUND 1
+#define NFS4_STATEID_SIZE 16
 
 /* Index of predefined Linux callback client operations */
 
 enum {
-        NFSPROC4_CLNT_CB_NULL = 0,
+	NFSPROC4_CLNT_CB_NULL = 0,
 	NFSPROC4_CLNT_CB_RECALL,
+	NFSPROC4_CLNT_CB_SEQUENCE,
 };
 
 enum nfs_cb_opnum4 {
 	OP_CB_RECALL            = 4,
+	OP_CB_SEQUENCE          = 11,
 };
 
 #define NFS4_MAXTAGLEN		20
@@ -70,17 +74,29 @@ enum nfs_cb_opnum4 {
 #define NFS4_dec_cb_null_sz		0
 #define cb_compound_enc_hdr_sz		4
 #define cb_compound_dec_hdr_sz		(3 + (NFS4_MAXTAGLEN >> 2))
+#define sessionid_sz			(NFS4_MAX_SESSIONID_LEN >> 2)
+#define cb_sequence_enc_sz		(sessionid_sz + 4 +             \
+					1 /* no referring calls list yet */)
+#define cb_sequence_dec_sz		(op_dec_sz + sessionid_sz + 4)
+
 #define op_enc_sz			1
 #define op_dec_sz			2
 #define enc_nfs4_fh_sz			(1 + (NFS4_FHSIZE >> 2))
 #define enc_stateid_sz			(NFS4_STATEID_SIZE >> 2)
 #define NFS4_enc_cb_recall_sz		(cb_compound_enc_hdr_sz +       \
+					cb_sequence_enc_sz +            \
 					1 + enc_stateid_sz +            \
 					enc_nfs4_fh_sz)
 
 #define NFS4_dec_cb_recall_sz		(cb_compound_dec_hdr_sz  +      \
+					cb_sequence_dec_sz +            \
 					op_dec_sz)
 
+struct nfs4_rpc_args {
+	void				*args_op;
+	struct nfsd4_cb_sequence	args_seq;
+};
+
 /*
 * Generic encode routines from fs/nfs/nfs4xdr.c
 */
@@ -137,11 +153,13 @@ xdr_error:                                      \
 } while (0)
 
 struct nfs4_cb_compound_hdr {
-	int		status;
-	u32		ident;
+	/* args */
+	u32		ident;	/* minorversion 0 only */
 	u32		nops;
 	__be32		*nops_p;
 	u32		minorversion;
+	/* res */
+	int		status;
 	u32		taglen;
 	char		*tag;
 };
@@ -238,6 +256,27 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp,
 	hdr->nops++;
 }
 
+static void
+encode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *args,
+		   struct nfs4_cb_compound_hdr *hdr)
+{
+	__be32 *p;
+
+	if (hdr->minorversion == 0)
+		return;
+
+	RESERVE_SPACE(1 + NFS4_MAX_SESSIONID_LEN + 20);
+
+	WRITE32(OP_CB_SEQUENCE);
+	WRITEMEM(args->cbs_clp->cl_sessionid.data, NFS4_MAX_SESSIONID_LEN);
+	WRITE32(args->cbs_clp->cl_cb_seq_nr);
+	WRITE32(0);		/* slotid, always 0 */
+	WRITE32(0);		/* highest slotid always 0 */
+	WRITE32(0);		/* cachethis always 0 */
+	WRITE32(0); /* FIXME: support referring_call_lists */
+	hdr->nops++;
+}
+
 static int
 nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 {
@@ -249,15 +288,19 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 }
 
 static int
-nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_delegation *args)
+nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p,
+		struct nfs4_rpc_args *rpc_args)
 {
 	struct xdr_stream xdr;
+	struct nfs4_delegation *args = rpc_args->args_op;
 	struct nfs4_cb_compound_hdr hdr = {
[...1981 lines suppressed...]
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+	int len;
+	struct xdr_buf *xbufp = &req->rq_snd_buf;
+	struct rpc_xprt *xprt = req->rq_xprt;
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+	struct socket *sock = transport->sock;
+	unsigned long headoff;
+	unsigned long tailoff;
+
+	/*
+	 * Set up the rpc header and record marker stuff
+	 */
+	xs_encode_tcp_record_marker(xbufp);
+
+	tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+	headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+	len = svc_send_common(sock, xbufp,
+			      virt_to_page(xbufp->head[0].iov_base), headoff,
+			      xbufp->tail[0].iov_base, tailoff);
+
+	if (len != xbufp->len) {
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+		len = -EAGAIN;
+	}
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	xprt = req->rq_xprt->bc_xprt;
+	svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+	/*
+	 * Grab the mutex to serialize data as the connection is shared
+	 * with the fore channel
+	 */
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	if (len > 0)
+		len = 0;
+
+	return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -2192,6 +2317,22 @@ static struct rpc_xprt_ops xs_tcp_ops = {
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2323,14 +2464,46 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 	xprt->prot = IPPROTO_TCP;
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+	xprt->timeout = &xs_tcp_default_timeout;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_xprt) {
+		struct svc_sock *bc_sock;
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/* backchannel */
+		xprt_set_bound(xprt);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
+
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_xprt = args->bc_xprt;
+		bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+		bc_sock->sk_bc_xprt = xprt;
+		transport->sock = bc_sock->sk_sock;
+		transport->inet = bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		switch (addr->sa_family) {
+		case AF_INET:
+			xs_format_ipv4_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP);
+			break;
+		case AF_INET6:
+			xs_format_ipv6_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP6);
+			break;
+		default:
+			kfree(xprt);
+			return ERR_PTR(-EAFNOSUPPORT);
+		}
+
+		goto out;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2338,20 +2511,30 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		xs_format_ipv4_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
-		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+		xs_format_ipv6_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	default:
 		kfree(xprt);
 		return ERR_PTR(-EAFNOSUPPORT);
 	}
 
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+out:
 	dprintk("RPC:       set up transport to address %s\n",
 			xprt->address_strings[RPC_DISPLAY_ALL]);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721.2.2
retrieving revision 1.1721.2.3
diff -u -p -r1.1721.2.2 -r1.1721.2.3
--- kernel.spec	17 Aug 2009 16:59:29 -0000	1.1721.2.2
+++ kernel.spec	17 Aug 2009 17:37:53 -0000	1.1721.2.3
@@ -708,6 +708,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3100: nfs41-v2.6.31-rc6.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1186,6 +1187,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch nfs41-v2.6.31-rc6.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1970,7 +1972,7 @@ fi
 
 %changelog
 * Mon Aug 17 2009 Steve Dickson <steved at redhat.com>
-- Turned on the CONFIG_NFS_4_V1 config variable
+- Update to the latest NFS41 update (v2.6.31-rc6)
 
 * Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
 - Improve the perf script so it prints something helpful if the



From rdieter at fedoraproject.org  Mon Aug 17 17:42:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 17 Aug 2009 17:42:11 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.233,1.234
Message-ID: <20090817174211.806FD11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1400

Modified Files:
	kdebindings.spec 
Log Message:
* Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
- re-enable php bindings (rawhide)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- kdebindings.spec	11 Aug 2009 15:09:14 -0000	1.233
+++ kdebindings.spec	17 Aug 2009 17:42:10 -0000	1.234
@@ -9,10 +9,7 @@
 %endif
 %endif
 %define falcon 1
-# FIXME: temporarily disable on rawhide, until build failures fixed
-%if 0%{?fedora} < 12
 %define php 1
-%endif
 %define ruby 1
 %define smoke 1
 %define java 0
@@ -32,7 +29,7 @@
 
 Name: kdebindings
 Version: 4.3.0
-Release: 4%{?dist}.1
+Release: 5%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -510,6 +507,9 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
+- re-enable php bindings (rawhide)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4.1
 - BR: qscintilla-devel >= 2.4
 



From steved at fedoraproject.org  Mon Aug 17 17:42:34 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 17:42:34 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1721.2.3,1.1721.2.4
Message-ID: <20090817174234.0D7EA11C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1546

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc6
	kernel.spec 
Log Message:
added %define with_firmware  1 



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721.2.3
retrieving revision 1.1721.2.4
diff -u -p -r1.1721.2.3 -r1.1721.2.4
--- kernel.spec	17 Aug 2009 17:37:53 -0000	1.1721.2.3
+++ kernel.spec	17 Aug 2009 17:42:33 -0000	1.1721.2.4
@@ -103,6 +103,8 @@ Summary: The Linux kernel
 # dracut initrd-generic
 %define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
 
+%define with_firmware  1
+
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
 %if 0%{?released_kernel}



From steved at fedoraproject.org  Mon Aug 17 17:43:33 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 17:43:33 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1721.2.4,1.1721.2.5
Message-ID: <20090817174333.4404D11C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1740

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc6
	kernel.spec 
Log Message:
Update local name



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721.2.4
retrieving revision 1.1721.2.5
diff -u -p -r1.1721.2.4 -r1.1721.2.5
--- kernel.spec	17 Aug 2009 17:42:33 -0000	1.1721.2.4
+++ kernel.spec	17 Aug 2009 17:43:32 -0000	1.1721.2.5
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-%define buildid .nfs41
+%define buildid .nfs41_rc6
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning



From spot at fedoraproject.org  Mon Aug 17 17:44:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 17:44:51 +0000 (UTC)
Subject: rpms/alsamixergui/devel alsamixergui_0.9.0rc2-1-9.diff, NONE,
	1.1 .cvsignore, 1.2, 1.3 alsamixergui.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <20090817174451.4E9E311C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alsamixergui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2053

Modified Files:
	.cvsignore alsamixergui.spec sources 
Added Files:
	alsamixergui_0.9.0rc2-1-9.diff 
Log Message:
update to rc2

alsamixergui_0.9.0rc2-1-9.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'alsamixergui_0.9.0rc2-1-9.diff'

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jan 2006 04:36:36 -0000	1.2
+++ .cvsignore	17 Aug 2009 17:44:50 -0000	1.3
@@ -1 +1 @@
-alsamixergui-0.9.0rc1-2.tar.gz
+alsamixergui_0.9.0rc2-1.orig.tar.gz


Index: alsamixergui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/alsamixergui.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- alsamixergui.spec	24 Jul 2009 16:48:38 -0000	1.7
+++ alsamixergui.spec	17 Aug 2009 17:44:51 -0000	1.8
@@ -1,17 +1,23 @@
 Name:		alsamixergui
 Summary: 	GUI mixer for ALSA sound devices
 Version:	0.9.0
-Release:	0.6.rc1%{?dist}.2
+Release:	0.7.rc2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-Source0:	ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/%{name}-%{version}rc1-2.tar.gz
+# This is where the source used to live, but this upstream is dead.
+# Source0:	ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/%{name}-%{version}rc1-2.tar.gz
+# This tarball was taken from Debian, and is the most recent version as far as I know.
+Source0:	http://ftp.de.debian.org/debian/pool/main/a/alsamixergui/alsamixergui_0.9.0rc2-1.orig.tar.gz
 Source1:	alsamixergui.desktop
 Source2:	alsamixergui.png
+# This site is dead and gone.
 URL:		ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fltk-devel, libstdc++-devel
 BuildRequires:	alsa-lib-devel, desktop-file-utils
-Patch0:		alsamixergui-modernfix.patch
+BuildRequires:	autoconf
+# This is debian's patch, taken 2009-08-17
+Patch0:		alsamixergui_0.9.0rc2-1-9.diff
 
 %description
 alsamixergui is a FLTK based frontend for alsamixer. It is written
@@ -21,8 +27,10 @@ part, so it provides exactly the same fu
 graphical userinterface.
 
 %prep
-%setup -q -n %{name}-%{version}rc1-2
-%patch0 -p1
+%setup -q -n %{name}-%{version}rc2-1.orig
+%patch0 -p1 -b .debian
+autoreconf -i
+chmod +x configure
 
 %build
 %configure
@@ -49,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/alsamixergui.png
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.7.rc2
+- update to rc2, last known update
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-0.6.rc1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jan 2006 04:36:36 -0000	1.2
+++ sources	17 Aug 2009 17:44:51 -0000	1.3
@@ -1 +1 @@
-24b74dda2cf77c313c6cba9b062c8feb  alsamixergui-0.9.0rc1-2.tar.gz
+af942a41b81ba27e2e4d0a1e1ab0decb  alsamixergui_0.9.0rc2-1.orig.tar.gz



From clumens at fedoraproject.org  Mon Aug 17 17:50:50 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Mon, 17 Aug 2009 17:50:50 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.35, 1.36 pyparted.spec, 1.65,
	1.66 sources, 1.40, 1.41
Message-ID: <20090817175050.4615911C00E4@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pyparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3341

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	4 Aug 2009 22:50:04 -0000	1.35
+++ .cvsignore	17 Aug 2009 17:50:49 -0000	1.36
@@ -1 +1,2 @@
 pyparted-2.1.1.tar.gz
+pyparted-2.1.2.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- pyparted.spec	4 Aug 2009 22:50:04 -0000	1.65
+++ pyparted.spec	17 Aug 2009 17:50:50 -0000	1.66
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -44,6 +44,11 @@ partition tables.
 %{python_sitearch}/parted
 
 %changelog
+* 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).
+
 * Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.1.1-1
 - Upgrade to pyparted-2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	4 Aug 2009 22:50:04 -0000	1.40
+++ sources	17 Aug 2009 17:50:50 -0000	1.41
@@ -1 +1 @@
-80b2afa23e0cc5d2e4c65718c06fe104  pyparted-2.1.1.tar.gz
+14e970ff67d3c81c8226c779e4bbcf33  pyparted-2.1.2.tar.gz



From smilner at fedoraproject.org  Mon Aug 17 17:55:58 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 17 Aug 2009 17:55:58 +0000 (UTC)
Subject: rpms/buildbot/F-11 buildbot.spec,1.15,1.16
Message-ID: <20090817175558.489B911C00E4@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/buildbot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5051

Modified Files:
	buildbot.spec 
Log Message:
turning off unittests in builds


Index: buildbot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buildbot/F-11/buildbot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- buildbot.spec	17 Aug 2009 17:20:06 -0000	1.15
+++ buildbot.spec	17 Aug 2009 17:55:57 -0000	1.16
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global do_tests 1
+%global do_tests 0
 
 Name:           buildbot
 Version:        0.7.11p3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 17 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p3-2
+- turning off tests in builds
+
 * Thu Aug 17 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.7.11p3-1
 - Update for another XSS vuln from upstream
 



From steved at fedoraproject.org  Mon Aug 17 18:02:00 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 17 Aug 2009 18:02:00 +0000 (UTC)
Subject: rpms/kernel/devel pnfs-v2.6.31-rc6.patch, NONE,
	1.1.2.1 config-generic, 
	1.316, 1.316.4.1 kernel.spec, 1.1721, 1.1721.4.1
Message-ID: <20090817180200.0B35511C00E4@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6374

Modified Files:
      Tag: kernel-2_6_31-pnfs_rc6
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_31-pnfs_rc6
	pnfs-v2.6.31-rc6.patch 
Log Message:
Updated to latest pNFS update (v2.6.31-rc6)


pnfs-v2.6.31-rc6.patch:
 Documentation/spnfs.txt             |  210 +++
 Makefile                            |    2 
 drivers/md/dm-ioctl.c               |   24 
 drivers/scsi/hosts.c                |    3 
 drivers/scsi/osd/osd_initiator.c    |   22 
 drivers/scsi/osd/osd_uld.c          |   53 
 fs/exofs/Kbuild                     |    1 
 fs/exofs/exofs.h                    |   11 
 fs/exofs/export.c                   |  409 +++++++
 fs/exofs/inode.c                    |   52 
 fs/exofs/super.c                    |    1 
 fs/exportfs/expfs.c                 |    7 
 fs/inode.c                          |    2 
 fs/nfs/Kconfig                      |   38 
 fs/nfs/Makefile                     |    7 
 fs/nfs/blocklayout/Makefile         |    6 
 fs/nfs/blocklayout/blocklayout.c    | 1202 ++++++++++++++++++++
 fs/nfs/blocklayout/blocklayout.h    |  265 ++++
 fs/nfs/blocklayout/blocklayoutdev.c |  735 ++++++++++++
 fs/nfs/blocklayout/blocklayoutdm.c  |  337 +++++
 fs/nfs/blocklayout/extents.c        |  945 ++++++++++++++++
 fs/nfs/callback.h                   |   36 
 fs/nfs/callback_proc.c              |  280 ++++
 fs/nfs/callback_xdr.c               |  155 ++
 fs/nfs/client.c                     |   25 
 fs/nfs/direct.c                     |  227 ++-
 fs/nfs/file.c                       |   50 
 fs/nfs/inode.c                      |   43 
 fs/nfs/internal.h                   |   32 
 fs/nfs/nfs3proc.c                   |    1 
 fs/nfs/nfs4_fs.h                    |   16 
 fs/nfs/nfs4filelayout.c             |  859 +++++++++++++++
 fs/nfs/nfs4filelayout.h             |  131 ++
 fs/nfs/nfs4filelayoutdev.c          |  886 +++++++++++++++
 fs/nfs/nfs4proc.c                   |  648 +++++++++++
 fs/nfs/nfs4renewd.c                 |    2 
 fs/nfs/nfs4state.c                  |   22 
 fs/nfs/nfs4xdr.c                    |  883 +++++++++++++++
 fs/nfs/objlayout/Kbuild             |   11 
 fs/nfs/objlayout/objio_osd.c        |  767 +++++++++++++
 fs/nfs/objlayout/objlayout.c        |  578 ++++++++++
 fs/nfs/objlayout/objlayout.h        |  207 +++
 fs/nfs/objlayout/panfs_shim.c       |  740 ++++++++++++
 fs/nfs/objlayout/panfs_shim.h       |  482 ++++++++
 fs/nfs/objlayout/pnfs_osd_xdr.c     |  344 ++++++
 fs/nfs/objlayout/pnfs_osd_xdr.h     |  412 +++++++
 fs/nfs/objlayout/pnfs_osd_xdr_enc.c |  239 ++++
 fs/nfs/pagelist.c                   |   13 
 fs/nfs/pnfs.c                       | 2061 ++++++++++++++++++++++++++++++++++++
 fs/nfs/pnfs.h                       |  361 ++++++
 fs/nfs/proc.c                       |    1 
 fs/nfs/read.c                       |  104 +
 fs/nfs/super.c                      |   66 +
 fs/nfs/write.c                      |  221 ++-
 fs/nfsd/Kconfig                     |   39 
 fs/nfsd/Makefile                    |    3 
 fs/nfsd/export.c                    |   87 +
 fs/nfsd/nfs4callback.c              |  591 ++++++++++
 fs/nfsd/nfs4filelayoutxdr.c         |  271 ++++
 fs/nfsd/nfs4pnfsd.c                 | 1468 +++++++++++++++++++++++++
 fs/nfsd/nfs4pnfsds.c                |  620 ++++++++++
 fs/nfsd/nfs4proc.c                  |  650 ++++++++++-
 fs/nfsd/nfs4state.c                 |  785 ++++++++-----
 fs/nfsd/nfs4xdr.c                   |  680 +++++++++++
 fs/nfsd/nfsctl.c                    |   95 +
 fs/nfsd/nfsfh.c                     |   15 
 fs/nfsd/nfssvc.c                    |   30 
 fs/nfsd/pnfsd_lexp.c                |  225 +++
 fs/nfsd/spnfs_com.c                 |  504 ++++++++
 fs/nfsd/spnfs_ops.c                 |  788 +++++++++++++
 fs/nfsd/vfs.c                       |   64 +
 include/linux/exportfs.h            |   38 
 include/linux/fs.h                  |    2 
 include/linux/nfs4.h                |   56 
 include/linux/nfs4_pnfs.h           |  319 +++++
 include/linux/nfs_fs.h              |   29 
 include/linux/nfs_fs_sb.h           |   22 
 include/linux/nfs_iostat.h          |    3 
 include/linux/nfs_page.h            |   10 
 include/linux/nfs_xdr.h             |   50 
 include/linux/nfsd/debug.h          |    2 
 include/linux/nfsd/export.h         |    1 
 include/linux/nfsd/nfs4layoutxdr.h  |   98 +
 include/linux/nfsd/nfsd.h           |   20 
 include/linux/nfsd/nfsd4_pnfs.h     |  312 +++++
 include/linux/nfsd/nfsfh.h          |    1 
 include/linux/nfsd/pnfsd.h          |  109 +
 include/linux/nfsd/state.h          |  212 +++
 include/linux/nfsd/syscall.h        |    8 
 include/linux/nfsd/xdr4.h           |   47 
 include/linux/nfsd4_spnfs.h         |  329 +++++
 include/linux/panfs_shim_api.h      |   57 
 include/linux/pnfs_xdr.h            |  146 ++
 include/linux/sunrpc/clnt.h         |    1 
 include/linux/sunrpc/rpc_pipe_fs.h  |    4 
 include/linux/sunrpc/svc.h          |    2 
 include/linux/sunrpc/svc_xprt.h     |   37 
 include/linux/sunrpc/svcsock.h      |    1 
 include/linux/sunrpc/xprt.h         |    7 
 include/scsi/osd_initiator.h        |   53 
 net/sunrpc/backchannel_rqst.c       |    2 
 net/sunrpc/clnt.c                   |    1 
 net/sunrpc/rpc_pipe.c               |   40 
 net/sunrpc/sched.c                  |    7 
 net/sunrpc/sunrpc.h                 |   14 
 net/sunrpc/svcsock.c                |  251 +++-
 net/sunrpc/xdr.c                    |   14 
 net/sunrpc/xprt.c                   |   16 
 net/sunrpc/xprtsock.c               |  199 +++
 109 files changed, 23890 insertions(+), 780 deletions(-)

--- NEW FILE pnfs-v2.6.31-rc6.patch ---
diff -up /dev/null linux-2.6.30.noarch/Documentation/spnfs.txt
--- /dev/null	2009-08-04 07:00:21.623000992 -0400
+++ linux-2.6.30.noarch/Documentation/spnfs.txt	2009-08-17 13:49:48.481379000 -0400
@@ -0,0 +1,210 @@
+(c) 2007 Network Appliance Inc.
+
+spNFS
+-----
+
+An spNFS system consists of a Meta Data Server (MDS), a number of Client machines (C) and a number of Data Servers (DS).
+
+A file system is mounted by the clients from the MDS, and all file data
+is striped across the DSs.
+
+Identify the machines that will be filling each of these roles.
+
+The spnfs kernel will be installed on all machines: clients, the MDS and DSs.
+
+
+Building and installing the spNFS kernel
+----------------------------------------
+
+Get the spNFS kernel from:
+
+	git://linux-nfs.org/~dmuntz/spnfs.git
+
+add these options to your .config file
+
+	CONFIG_NETWORK_FILESYSTEMS=y
+	CONFIG_NFS_FS=y
+	CONFIG_NFSD=y
+	CONFIG_NFS_V4_1=y
+	CONFIG_NFSD_V4_1=y
+	CONFIG_PNFS=y
+	CONFIG_PNFSD=y
+	CONFIG_SPNFS=y
+
+By default, spNFS uses whole-file layouts.  Layout segments can be enabled
+by adding:
+
+	CONFIG_SPNFS_LAYOUTSEGMENTS=y
+
+to your .config file.
+
+Building and installation of kernel+modules is as usual.
+This kernel should be installed and booted on the client, MDS and DSs.
+
+
+Building nfs-utils
+------------------
+
+Get the nfs-utils package containing spnfsd from:
+
+	git://linux-nfs.org/~dmuntz/nfs-utils.git
+
+Follow the standard instructions for building nfs-utils.  We HIGHLY recommend
+NOT doing an install of the binaries generated by this build.  You will only
+need the spnfsd binary generated by this build, and the spnfsd.conf template.
+
+After building, the spnfsd daemon will be located in utils/spnfsd.  The spnfsd
+daemon will only be needed on the MDS.
+
+
+Installation
+------------
+
+The nfs-utils package contains a default spnfsd.conf file in
+utils/spnfsd/spnfsd.conf.  Copy this file to /etc/spnfsd.conf.
+
+By default, the DS-Mount-Directory is set to /spnfs (see spnfsd.conf).  Under
+this directory, mount points must be created for each DS to
+be used for pNFS data stripes.  These mount points are named by the ip address
+of the corresponding DS.  In the sample spnfsd.conf, there are two
+DSs defined (172.16.28.134 and 172.16.28.141).
+
+Following the sample spnfsd.conf,
+
+	mkdir /spnfs
+
+on the MDS (corresponding to DS-Mount-Directory).  Then
+
+	mkdir /spnfs/172.16.28.134
+	mkdir /spnfs/172.16.28.141
+
+to create the mount points for the DSs.
+
+On the DSs, chose a directory where data stripes will be created by the MDS.
+For the sample file, this directory is /pnfs, so on each DS execute:
+
+	mkdir /pnfs
+
+This directory is specified in the spnfsd.conf file by the DS*_ROOT option
+(where * is replaced by the DS number).  DS_ROOT is specified relative to
+the directory being exported by the DSs.  In our example, our DSs are exporting
+the root directory (/) and therefore our DS_ROOT is /pnfs.  On the DSs, we have
+the following entry in /etc/exports:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+N.B. If we had created a /exports directory and a /pnfs directory under
+/exports, and if we were exporting /exports, then DS_ROOT would still be /pnfs
+(not /exports/pnfs).
+
+It may be useful to add entries to /etc/fstab on the MDS to automatically
+mount the DS_ROOT file systems.  For this example, our MDS fstab would
+contain:
+
+	172.17.84.128:/pnfs /spnfs/172.17.84.128 nfs    defaults        1 2
+	172.17.84.122:/pnfs /spnfs/172.17.84.122 nfs    defaults        1 2
+
+The DS mounts must be performed manually or via fstab at this time (automatic
+mounting, directory creation, etc. are on the todo list).  To perform I/O
+through the MDS, the DS mounts MUST use NFSv3 at this time (this restriction
+will eventually be removed).
+
+
+On the MDS, choose a file system to use with spNFS and export it, e.g.:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+Make sure nfsd and all supporting processes are running on the MDS and DSs.
+
+
+Running
+-------
+
+If rpc_pipefs is not already mounted (if you're running idmapd it probably is),
+you may want to add the following line to /etc/fstab:
+
+	rpc_pipefs    /var/lib/nfs/rpc_pipefs rpc_pipefs defaults     0 0
+
+to automatically mount rpc_pipefs.
+
+With spnfsd.conf configured for your environment and the mounts mounted as
+described above, spnfsd can now be started.
+
+On the MDS, execute spnfsd:
+
+	spnfsd
+
+The executable is located in the directory where it was built, and
+may also have been installed elsewhere depending on how you built nfs-utils.
+It will run in the foreground by default, and in fact will do so despite
+any options suggesting the contrary (it's still a debugging build).
+
+On the client, make sure the nfslayoutdriver module is loaded:
+
+	modprobe nfslayoutdriver
+
+Then mount the file system from the MDS:
+
+	mount -t nfs4 mds:/ /mnt
+
+I/O through the MDS is now supported.  To use it, do not load the
+nfslayoutdriver on the client, and mount the MDS using NFSv4 or 4.1
+(NFSv2 and v3 are not yet supported).
+
+You may now use spNFS by performing file system activities in /mnt.
+If you create files in /mnt, you should see stripe files corresponding to
+new files being created on the DSs.  The current implementation names the
+stripe files based on the inode number of the file on the MDS.  For example,
+if you create a file foo in /mnt and do an 'ls -li /mnt/foo':
+
+	# ls -li foo
+	1233 -rw-r--r-- 1 root root 0 Nov 29 15:54 foo
+
+You should see stripe files on each under /pnfs (per the sample) named
+1233.  The file /pnfs/1233 on DS1 will contain the first <stripe size> bytes
+of data written to foo, DS2 will contain the next <stripe size> bytes, etc.
+Removing /mnt/foo will remove the corresponding stripe files on the DSs.
+Other file system operations should behave (mostly :-) as expected.
+
+
+Layout Segments
+---------------
+
+If the kernel is compiled to support layout segments, there will
+be two files created under /proc/fs/spnfs for controlling layout
+segment functionality.
+
+To enable layout segments, write a '1' to /proc/fs/spnfs/layoutseg, e.g.:
+
+	echo 1 > /proc/fs/spnfs/layoutseg
+
+Layout segments can be disabled (returning to whole-file layouts) by
+writing a '0' to /proc/fs/spnfs/layoutseg:
+
+	echo 0 > /proc/fs/spnfs/layoutseg
+
+When layout segments are enabled, the size of the layouts returned can
+be specified by writing a decimal number (ascii representation) to
+/proc/fs/spnfs/layoutsegsize:
+
+	echo 1024 > /proc/fs/spnfs/layoutsegsize
+
+The value'0' has a special meaning--it causes the server to return a
+layout that is exactly the size requested by the client:
+
+	echo 0 > /proc/fs/spnfs/layoutsegsize
[...28066 lines suppressed...]
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+	int len;
+	struct xdr_buf *xbufp = &req->rq_snd_buf;
+	struct rpc_xprt *xprt = req->rq_xprt;
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+	struct socket *sock = transport->sock;
+	unsigned long headoff;
+	unsigned long tailoff;
+
+	/*
+	 * Set up the rpc header and record marker stuff
+	 */
+	xs_encode_tcp_record_marker(xbufp);
+
+	tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+	headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+	len = svc_send_common(sock, xbufp,
+			      virt_to_page(xbufp->head[0].iov_base), headoff,
+			      xbufp->tail[0].iov_base, tailoff);
+
+	if (len != xbufp->len) {
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+		len = -EAGAIN;
+	}
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	xprt = req->rq_xprt->bc_xprt;
+	svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+	/*
+	 * Grab the mutex to serialize data as the connection is shared
+	 * with the fore channel
+	 */
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	if (len > 0)
+		len = 0;
+
+	return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -2192,6 +2317,22 @@ static struct rpc_xprt_ops xs_tcp_ops = 
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2323,14 +2464,46 @@ static struct rpc_xprt *xs_setup_tcp(str
 	xprt->prot = IPPROTO_TCP;
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+	xprt->timeout = &xs_tcp_default_timeout;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_xprt) {
+		struct svc_sock *bc_sock;
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/* backchannel */
+		xprt_set_bound(xprt);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
+
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_xprt = args->bc_xprt;
+		bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+		bc_sock->sk_bc_xprt = xprt;
+		transport->sock = bc_sock->sk_sock;
+		transport->inet = bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		switch (addr->sa_family) {
+		case AF_INET:
+			xs_format_ipv4_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP);
+			break;
+		case AF_INET6:
+			xs_format_ipv6_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP6);
+			break;
+		default:
+			kfree(xprt);
+			return ERR_PTR(-EAFNOSUPPORT);
+		}
+
+		goto out;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2338,20 +2511,30 @@ static struct rpc_xprt *xs_setup_tcp(str
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		xs_format_ipv4_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
-		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+		xs_format_ipv6_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	default:
 		kfree(xprt);
 		return ERR_PTR(-EAFNOSUPPORT);
 	}
 
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+out:
 	dprintk("RPC:       set up transport to address %s\n",
 			xprt->address_strings[RPC_DISPLAY_ALL]);
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.316
retrieving revision 1.316.4.1
diff -u -p -r1.316 -r1.316.4.1
--- config-generic	11 Aug 2009 21:55:35 -0000	1.316
+++ config-generic	17 Aug 2009 18:01:59 -0000	1.316.4.1
@@ -3193,7 +3193,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -3201,6 +3201,16 @@ CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
 CONFIG_NFS_FSCACHE=y
+
+CONFIG_PNFSD=y
+CONFIG_PNFS=y
+CONFIG_PNFSD_LOCAL_EXPORT=y
+CONFIG_SPNFS=y
+CONFIG_PNFS_OBJLAYOUT=y
+CONFIG_PNFS_BLOCK=y
+CONFIG_SPNFS_LAYOUTSEGMENTS=y
+CONFIG_PNFS_PANLAYOUT=y
+
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721
retrieving revision 1.1721.4.1
diff -u -p -r1.1721 -r1.1721.4.1
--- kernel.spec	16 Aug 2009 22:09:02 -0000	1.1721
+++ kernel.spec	17 Aug 2009 18:01:59 -0000	1.1721.4.1
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .pnfs_rc6
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -103,6 +103,8 @@ Summary: The Linux kernel
 # dracut initrd-generic
 %define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
 
+%define with_firmware  1
+
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
 %if 0%{?released_kernel}
@@ -708,6 +710,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3100: pnfs-v2.6.31-rc6.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1186,6 +1189,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch pnfs-v2.6.31-rc6.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1969,6 +1973,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Steve Dickson <steved at redhat.com> 
+- Updated to latest pNFS update (v2.6.31-rc6)
+
 * Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
 - Improve the perf script so it prints something helpful if the
   perf binary doesn't exist.



From davidz at fedoraproject.org  Mon Aug 17 18:06:59 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 17 Aug 2009 18:06:59 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel .cvsignore, 1.10,
	1.11 DeviceKit-disks.spec, 1.31, 1.32 sources, 1.10,
	1.11 DeviceKit-disks-005-port-to-new-libatasmart.patch, 1.1, NONE
Message-ID: <20090817180659.E3A5911C00E4@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7415

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Removed Files:
	DeviceKit-disks-005-port-to-new-libatasmart.patch 
Log Message:
* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 006-1%{?dist}
- Update to release 006




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 Jun 2009 00:15:07 -0000	1.10
+++ .cvsignore	17 Aug 2009 18:06:59 -0000	1.11
@@ -7,3 +7,4 @@ 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


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- DeviceKit-disks.spec	7 Aug 2009 14:22:37 -0000	1.31
+++ DeviceKit-disks.spec	17 Aug 2009 18:06:59 -0000	1.32
@@ -3,7 +3,7 @@
 %define dbus_glib_version	0.76
 %define polkit_version          0.92
 %define parted_version          1.8.8
-%define udev_version            142
+%define udev_version            145
 %define mdadm_version           2.6.7
 %define device_mapper_version   1.02
 %define libatasmart_version     0.12
@@ -11,13 +11,12 @@
 
 Summary: Disk Management Service
 Name: DeviceKit-disks
-Version: 005
-Release: 5%{?dist}
+Version: 006
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
 Source0: %{name}-%{version}.tar.gz
-Patch0: DeviceKit-disks-005-port-to-new-libatasmart.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -30,8 +29,7 @@ BuildRequires: device-mapper-devel >= %{
 BuildRequires: intltool
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: zlib-devel
-# for now, to get gudev-1.0, until we can depend on udev >= 143 where it is libgudev1-devel
-BuildRequires: libgudev-devel
+BuildRequires: libgudev1-devel >= %{udev_version}
 BuildRequires: libudev-devel >= %{udev_version}
 BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
 Requires: dbus >= %{dbus_version}
@@ -79,7 +77,6 @@ D-Bus interface definitions for DeviceKi
 
 %prep
 %setup -q
-%patch0 -p1 -b .new-libata-smart
 
 %build
 %configure --enable-gtk-doc
@@ -146,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 006-1%{?dist}
+- Update to release 006
+
 * Fri Aug 07 2009 David Zeuthen <davidz at redhat.com> - 005-5%{?dist}
 - Update for new libatasmart version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	20 Jun 2009 00:15:07 -0000	1.10
+++ sources	17 Aug 2009 18:06:59 -0000	1.11
@@ -1 +1,2 @@
 8c0e5daa492e044a5a4f65b9412c0b34  DeviceKit-disks-005.tar.gz
+7773b5afeeaad9ff285ef3320a97792c  DeviceKit-disks-006.tar.gz


--- DeviceKit-disks-005-port-to-new-libatasmart.patch DELETED ---



From jwrdegoede at fedoraproject.org  Mon Aug 17 18:07:19 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 17 Aug 2009 18:07:19 +0000 (UTC)
Subject: rpms/supertuxkart/devel supertuxkart.spec,1.15,1.16
Message-ID: <20090817180719.91B9E11C00E4@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7576

Modified Files:
	supertuxkart.spec 
Log Message:
* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> - 0.6.1a-3
- Switch to openal-soft



Index: supertuxkart.spec
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- supertuxkart.spec	27 Jul 2009 05:08:20 -0000	1.15
+++ supertuxkart.spec	17 Aug 2009 18:07:19 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           supertuxkart
 Version:        0.6.1a
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
@@ -11,8 +11,9 @@ Patch0:         supertuxkart-fhs.patch
 Patch1:         supertuxkart-0.3-desktop.patch
 Patch2:         supertuxkart-0.3-default-fs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  plib-devel SDL-devel freealut-devel mikmod-devel
+BuildRequires:  plib-devel SDL-devel mikmod-devel
 BuildRequires:  libvorbis-devel freeglut-devel desktop-file-utils
+BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 Requires:       hicolor-icon-theme opengl-games-utils
 # Provide so that yum install tuxkart will work, obsolete for auto upgrade
 Provides:       tuxkart = 0.4.0-6
@@ -41,7 +42,7 @@ touch src/Makefile.in
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS=-lGLU
 
 
 %install
@@ -118,6 +119,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> - 0.6.1a-3
+- Switch to openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Mon Aug 17 18:07:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 17 Aug 2009 18:07:39 +0000 (UTC)
Subject: rpms/ebview/F-10 .cvsignore, 1.2, 1.3 ebview.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <20090817180739.3D2A611C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ebview/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7714/F-10

Modified Files:
	.cvsignore ebview.spec sources 
Log Message:
* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
- Drop 64 bits patches, remove some unneeded hacks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebview/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Nov 2007 06:05:07 -0000	1.2
+++ .cvsignore	17 Aug 2009 18:07:38 -0000	1.3
@@ -1 +1 @@
-ebview-0.3.6.tar.gz
+ebview_0.3.6.2.orig.tar.gz


Index: ebview.spec
===================================================================
RCS file: /cvs/extras/rpms/ebview/F-10/ebview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ebview.spec	28 Jul 2008 05:02:31 -0000	1.6
+++ ebview.spec	17 Aug 2009 18:07:39 -0000	1.7
@@ -1,14 +1,18 @@
 Name:		ebview
-Version:	0.3.6
-Release:	5%{?dist}.1
+Version:	0.3.6.2
+Release:	1%{?dist}
 Summary:	EPWING CD-ROM dictionary viewer
 
 Group:		Applications/Text      
 License:	GPLv2+
+%if 0
 URL:		http://ebview.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%else
+URL:		http://packages.qa.debian.org/e/ebview.html
+Source0:	http://ftp.de.debian.org/debian/pool/main/e/ebview/ebview_%{version}.orig.tar.gz
+%endif
 Source1:	%{name}.desktop
-Patch0:		ebview-0.3.6-64bits-from-suse.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	eb-devel
@@ -16,18 +20,13 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gtk2-devel
 
-%if 0%{?fedora} >= 10
 Requires:	VLGothic-fonts
-%else
-Requires:	fonts-japanese
-%endif
 
 %description
 EBView is a EPWING dictionary browser.
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bits
 
 # Fix up permission
 find . -type f -exec %{__chmod} 0644 {} ';'
@@ -42,14 +41,6 @@ find . -type f -exec %{__chmod} 0644 {} 
 	-e 's|Kochi |Sazanami |' \
 	src/preference.c
 
-# GTK deprecated option
-for f in \
-	src/ebview.c \
-	src/defs.h \
-	; do
-	%{__sed} -i.gtk_deprecated -e '/GTK_DISABLE_DEPRECATED/d' $f
-done
-
 # encodings
 iconv -f EUCJP -t UTF-8 README > README.tmp && \
 	( touch -r README README.tmp ; %{__mv} -f README.tmp README )
@@ -69,8 +60,6 @@ iconv -f ISO-8859-1 -t UTF-8 doc/en/inde
 	%{__rm} -f doc/en/index.html.tmp
 
 %build
-export LDFLAGS="`pkg-config --libs pangox`"
-
 %configure \
 	--with-eb-conf=%{_libdir}/eb.conf
 %{__make} %{?_smp_mflags}
@@ -114,6 +103,16 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
+- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
+- Drop 64 bits patches, remove some unneeded hacks
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6-7
+- F-12: Mass rebuild
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6-6
+- F-11: Mass rebuild
+
 * Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6-5
 - Change Japanese fonts Requires (F-10+)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebview/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Nov 2007 06:05:07 -0000	1.2
+++ sources	17 Aug 2009 18:07:39 -0000	1.3
@@ -1 +1 @@
-223f679a6b54bc32cb6d44f54909d049  ebview-0.3.6.tar.gz
+dbfe4d338ff1d846084c46ac9dc47d73  ebview_0.3.6.2.orig.tar.gz



From mtasaka at fedoraproject.org  Mon Aug 17 18:07:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 17 Aug 2009 18:07:39 +0000 (UTC)
Subject: rpms/ebview/F-11 .cvsignore, 1.2, 1.3 ebview.spec, 1.7, 1.8 sources,
	1.2, 1.3
Message-ID: <20090817180739.76AD011C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ebview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7714/F-11

Modified Files:
	.cvsignore ebview.spec sources 
Log Message:
* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
- Drop 64 bits patches, remove some unneeded hacks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebview/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Nov 2007 06:05:07 -0000	1.2
+++ .cvsignore	17 Aug 2009 18:07:39 -0000	1.3
@@ -1 +1 @@
-ebview-0.3.6.tar.gz
+ebview_0.3.6.2.orig.tar.gz


Index: ebview.spec
===================================================================
RCS file: /cvs/extras/rpms/ebview/F-11/ebview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ebview.spec	23 Feb 2009 22:10:59 -0000	1.7
+++ ebview.spec	17 Aug 2009 18:07:39 -0000	1.8
@@ -1,14 +1,18 @@
 Name:		ebview
-Version:	0.3.6
-Release:	6%{?dist}
+Version:	0.3.6.2
+Release:	1%{?dist}
 Summary:	EPWING CD-ROM dictionary viewer
 
 Group:		Applications/Text      
 License:	GPLv2+
+%if 0
 URL:		http://ebview.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%else
+URL:		http://packages.qa.debian.org/e/ebview.html
+Source0:	http://ftp.de.debian.org/debian/pool/main/e/ebview/ebview_%{version}.orig.tar.gz
+%endif
 Source1:	%{name}.desktop
-Patch0:		ebview-0.3.6-64bits-from-suse.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	eb-devel
@@ -16,18 +20,13 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gtk2-devel
 
-%if 0%{?fedora} >= 10
 Requires:	VLGothic-fonts
-%else
-Requires:	fonts-japanese
-%endif
 
 %description
 EBView is a EPWING dictionary browser.
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bits
 
 # Fix up permission
 find . -type f -exec %{__chmod} 0644 {} ';'
@@ -42,14 +41,6 @@ find . -type f -exec %{__chmod} 0644 {} 
 	-e 's|Kochi |Sazanami |' \
 	src/preference.c
 
-# GTK deprecated option
-for f in \
-	src/ebview.c \
-	src/defs.h \
-	; do
-	%{__sed} -i.gtk_deprecated -e '/GTK_DISABLE_DEPRECATED/d' $f
-done
-
 # encodings
 iconv -f EUCJP -t UTF-8 README > README.tmp && \
 	( touch -r README README.tmp ; %{__mv} -f README.tmp README )
@@ -69,8 +60,6 @@ iconv -f ISO-8859-1 -t UTF-8 doc/en/inde
 	%{__rm} -f doc/en/index.html.tmp
 
 %build
-export LDFLAGS="`pkg-config --libs pangox`"
-
 %configure \
 	--with-eb-conf=%{_libdir}/eb.conf
 %{__make} %{?_smp_mflags}
@@ -114,6 +103,13 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
+- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
+- Drop 64 bits patches, remove some unneeded hacks
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6-7
+- F-12: Mass rebuild
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6-6
 - F-11: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebview/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Nov 2007 06:05:07 -0000	1.2
+++ sources	17 Aug 2009 18:07:39 -0000	1.3
@@ -1 +1 @@
-223f679a6b54bc32cb6d44f54909d049  ebview-0.3.6.tar.gz
+dbfe4d338ff1d846084c46ac9dc47d73  ebview_0.3.6.2.orig.tar.gz



From mtasaka at fedoraproject.org  Mon Aug 17 18:07:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 17 Aug 2009 18:07:39 +0000 (UTC)
Subject: rpms/ebview/devel .cvsignore, 1.2, 1.3 ebview.spec, 1.8, 1.9 sources,
	1.2, 1.3
Message-ID: <20090817180739.B384A11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ebview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7714/devel

Modified Files:
	.cvsignore ebview.spec sources 
Log Message:
* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
- Drop 64 bits patches, remove some unneeded hacks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Nov 2007 06:05:07 -0000	1.2
+++ .cvsignore	17 Aug 2009 18:07:39 -0000	1.3
@@ -1 +1 @@
-ebview-0.3.6.tar.gz
+ebview_0.3.6.2.orig.tar.gz


Index: ebview.spec
===================================================================
RCS file: /cvs/extras/rpms/ebview/devel/ebview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ebview.spec	24 Jul 2009 16:47:11 -0000	1.8
+++ ebview.spec	17 Aug 2009 18:07:39 -0000	1.9
@@ -1,14 +1,18 @@
 Name:		ebview
-Version:	0.3.6
-Release:	7%{?dist}
+Version:	0.3.6.2
+Release:	1%{?dist}
 Summary:	EPWING CD-ROM dictionary viewer
 
 Group:		Applications/Text      
 License:	GPLv2+
+%if 0
 URL:		http://ebview.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%else
+URL:		http://packages.qa.debian.org/e/ebview.html
+Source0:	http://ftp.de.debian.org/debian/pool/main/e/ebview/ebview_%{version}.orig.tar.gz
+%endif
 Source1:	%{name}.desktop
-Patch0:		ebview-0.3.6-64bits-from-suse.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	eb-devel
@@ -16,18 +20,13 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gtk2-devel
 
-%if 0%{?fedora} >= 10
 Requires:	VLGothic-fonts
-%else
-Requires:	fonts-japanese
-%endif
 
 %description
 EBView is a EPWING dictionary browser.
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bits
 
 # Fix up permission
 find . -type f -exec %{__chmod} 0644 {} ';'
@@ -42,14 +41,6 @@ find . -type f -exec %{__chmod} 0644 {} 
 	-e 's|Kochi |Sazanami |' \
 	src/preference.c
 
-# GTK deprecated option
-for f in \
-	src/ebview.c \
-	src/defs.h \
-	; do
-	%{__sed} -i.gtk_deprecated -e '/GTK_DISABLE_DEPRECATED/d' $f
-done
-
 # encodings
 iconv -f EUCJP -t UTF-8 README > README.tmp && \
 	( touch -r README README.tmp ; %{__mv} -f README.tmp README )
@@ -69,8 +60,6 @@ iconv -f ISO-8859-1 -t UTF-8 doc/en/inde
 	%{__rm} -f doc/en/index.html.tmp
 
 %build
-export LDFLAGS="`pkg-config --libs pangox`"
-
 %configure \
 	--with-eb-conf=%{_libdir}/eb.conf
 %{__make} %{?_smp_mflags}
@@ -114,6 +103,10 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
+- Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
+- Drop 64 bits patches, remove some unneeded hacks
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6-7
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Nov 2007 06:05:07 -0000	1.2
+++ sources	17 Aug 2009 18:07:39 -0000	1.3
@@ -1 +1 @@
-223f679a6b54bc32cb6d44f54909d049  ebview-0.3.6.tar.gz
+dbfe4d338ff1d846084c46ac9dc47d73  ebview_0.3.6.2.orig.tar.gz



From beekhof at fedoraproject.org  Mon Aug 17 18:10:53 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 17 Aug 2009 18:10:53 +0000 (UTC)
Subject: rpms/cluster-glue/devel cluster-glue.spec,1.5,1.6
Message-ID: <20090817181053.6112511C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8664

Modified Files:
	cluster-glue.spec 
Log Message:
Use saner version numbers for Obsoletes/Provides


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cluster-glue.spec	17 Aug 2009 14:40:40 -0000	1.5
+++ cluster-glue.spec	17 Aug 2009 18:10:53 -0000	1.6
@@ -21,10 +21,10 @@ Group:		System Environment/Base
 Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
 
 # Directives to allow upgrade from combined heartbeat packages in Fedora11
-Provides:	heartbeat-stonith = 2:%{version}-%{release}
-Provides:	heartbeat-pils = 2:%{version}-%{release}
-Obsoletes:	heartbeat-stonith < 2:1.0-0.9
-Obsoletes:	heartbeat-pils < 2:1.0-0.9
+Provides:	heartbeat-stonith = 3.0.0-1
+Provides:	heartbeat-pils = 3.0.0-1
+Obsoletes:	heartbeat-stonith < 3.0.0-1
+Obsoletes:	heartbeat-pils < 3.0.0-1
 
 ## Setup/build bits
 



From spot at fedoraproject.org  Mon Aug 17 18:14:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 18:14:49 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.52, 1.53 asymptote.spec, 1.66,
	1.67 sources, 1.52, 1.53
Message-ID: <20090817181449.3714811C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9552

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.83


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	23 Jul 2009 20:20:04 -0000	1.52
+++ .cvsignore	17 Aug 2009 18:14:48 -0000	1.53
@@ -1 +1 @@
-asymptote-1.82.src.tgz
+asymptote-1.83.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- asymptote.spec	24 Jul 2009 17:27:08 -0000	1.66
+++ asymptote.spec	17 Aug 2009 18:14:49 -0000	1.67
@@ -4,8 +4,8 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.82
-Release:        2%{?dist}
+Version:        1.83
+Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
 Group:          Applications/Publishing
@@ -145,6 +145,9 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.83-1
+- update to 1.83
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.82-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	23 Jul 2009 20:20:04 -0000	1.52
+++ sources	17 Aug 2009 18:14:49 -0000	1.53
@@ -1 +1 @@
-0960360e00e8a1a6b84acb70f623ca72  asymptote-1.82.src.tgz
+1f3f0d25cb3ac31313115aee35af6190  asymptote-1.83.src.tgz



From pkgdb at fedoraproject.org  Mon Aug 17 18:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:14:51 +0000
Subject: [pkgdb] perl-PPIx-EditorTools was added for mmaslano
Message-ID: <20090817181451.99B3C10F859@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-PPIx-EditorTools with summary Utility methods and base class for manipulating Perl via PPI
kevin has approved Package perl-PPIx-EditorTools
kevin has added a Fedora devel branch for perl-PPIx-EditorTools with an owner of mmaslano
kevin has approved perl-PPIx-EditorTools in Fedora devel
kevin has approved Package perl-PPIx-EditorTools
kevin has set commit to Approved for 107427 on perl-PPIx-EditorTools (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-PPIx-EditorTools (Fedora devel)
kevin has set build to Approved for 107427 on perl-PPIx-EditorTools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PPIx-EditorTools



From pkgdb at fedoraproject.org  Mon Aug 17 18:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:14:53 +0000
Subject: [pkgdb] perl-PPIx-EditorTools summary updated by kevin
Message-ID: <20090817181453.6A6C710F889@bastion2.fedora.phx.redhat.com>

kevin set package perl-PPIx-EditorTools summary to Utility methods and base class for manipulating Perl via PPI

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PPIx-EditorTools



From kevin at fedoraproject.org  Mon Aug 17 18:15:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:15:00 +0000 (UTC)
Subject: rpms/perl-PPIx-EditorTools/devel - New directory
Message-ID: <20090817181500.4450011C034A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsak9666/rpms/perl-PPIx-EditorTools/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 17 18:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:14:53 +0000
Subject: [pkgdb] perl-PPIx-EditorTools (Fedora, devel) updated by kevin
Message-ID: <20090817181456.DE35210F897@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-PPIx-EditorTools (Fedora devel) for perl-sig
kevin approved watchcommits on perl-PPIx-EditorTools (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-PPIx-EditorTools



From kevin at fedoraproject.org  Mon Aug 17 18:15:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:15:00 +0000 (UTC)
Subject: rpms/perl-PPIx-EditorTools - New directory
Message-ID: <20090817181500.1B8B611C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PPIx-EditorTools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsak9666/rpms/perl-PPIx-EditorTools

Log Message:
Directory /cvs/pkgs/rpms/perl-PPIx-EditorTools added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:15:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:15:07 +0000 (UTC)
Subject: rpms/perl-PPIx-EditorTools Makefile,NONE,1.1
Message-ID: <20090817181507.2F9FB11C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PPIx-EditorTools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsak9666/rpms/perl-PPIx-EditorTools

Added Files:
	Makefile 
Log Message:
Setup of module perl-PPIx-EditorTools


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PPIx-EditorTools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 17 18:15:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:15:07 +0000 (UTC)
Subject: rpms/perl-PPIx-EditorTools/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090817181507.7D37411C0416@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsak9666/rpms/perl-PPIx-EditorTools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PPIx-EditorTools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-PPIx-EditorTools
# $Id: Makefile,v 1.1 2009/08/17 18:15:07 kevin Exp $
NAME := perl-PPIx-EditorTools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From davidz at fedoraproject.org  Mon Aug 17 18:15:06 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 17 Aug 2009 18:15:06 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel .cvsignore, 1.8,
	1.9 gnome-disk-utility.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <20090817181506.CD36511C00E4@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9694

Modified Files:
	.cvsignore gnome-disk-utility.spec sources 
Log Message:
* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-1%{?dist}
- Update to release 0.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Jun 2009 00:15:26 -0000	1.8
+++ .cvsignore	17 Aug 2009 18:15:06 -0000	1.9
@@ -5,3 +5,4 @@ gnome-disk-utility-0.3.20090412git.tar.b
 gnome-disk-utility-0.3.20090415git.tar.bz2
 gnome-disk-utility-0.3.tar.bz2
 gnome-disk-utility-0.4.tar.bz2
+gnome-disk-utility-0.5.tar.bz2


Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gnome-disk-utility.spec	27 Jul 2009 05:18:23 -0000	1.15
+++ gnome-disk-utility.spec	17 Aug 2009 18:15:06 -0000	1.16
@@ -4,15 +4,15 @@
 %define gtk2_version              2.17.2
 %define gnome_doc_utils_version   0.3.2
 %define gnome_keyring_version     2.22
-%define devicekit_disks_version   005
+%define devicekit_disks_version   006
 %define unique_version            1.0.4
 %define libnotify_version         0.4.5
 %define nautilus_version          2.26
 
 Summary: Disk management application
 Name: gnome-disk-utility
-Version: 0.4
-Release: 3%{?dist}
+Version: 0.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -211,6 +211,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-1%{?dist}
+- Update to release 0.5
+
 * Mon Jul 27 2009 Matthias Clasen <mclasen at redhat.com> - 0.4-3%{?dist}
 - Drop PolicyKit from .pc files, too
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Jun 2009 00:15:27 -0000	1.8
+++ sources	17 Aug 2009 18:15:06 -0000	1.9
@@ -1 +1 @@
-067a7b5bb7b5a870518c9566fc03a687  gnome-disk-utility-0.4.tar.bz2
+1764bfcaf3383d2a22c1d73d80be4f66  gnome-disk-utility-0.5.tar.bz2



From davidz at fedoraproject.org  Mon Aug 17 18:16:13 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 17 Aug 2009 18:16:13 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec,1.16,1.17
Message-ID: <20090817181613.D636811C00E4@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10037

Modified Files:
	gnome-disk-utility.spec 
Log Message:
* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
- Rebuild




Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gnome-disk-utility.spec	17 Aug 2009 18:15:06 -0000	1.16
+++ gnome-disk-utility.spec	17 Aug 2009 18:16:13 -0000	1.17
@@ -12,7 +12,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -211,6 +211,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
+- Rebuild
+
 * Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-1%{?dist}
 - Update to release 0.5
 



From pkgdb at fedoraproject.org  Mon Aug 17 18:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:16:34 +0000
Subject: [pkgdb] perl-Locale-Msgfmt was added for mmaslano
Message-ID: <20090817181635.6A7A310F85B@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Locale-Msgfmt with summary Compile .po files to .mo files
kevin has approved Package perl-Locale-Msgfmt
kevin has added a Fedora devel branch for perl-Locale-Msgfmt with an owner of mmaslano
kevin has approved perl-Locale-Msgfmt in Fedora devel
kevin has approved Package perl-Locale-Msgfmt
kevin has set commit to Approved for 107427 on perl-Locale-Msgfmt (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Locale-Msgfmt (Fedora devel)
kevin has set build to Approved for 107427 on perl-Locale-Msgfmt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Msgfmt



From pkgdb at fedoraproject.org  Mon Aug 17 18:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:16:35 +0000
Subject: [pkgdb] perl-Locale-Msgfmt summary updated by kevin
Message-ID: <20090817181636.95F1A10F882@bastion2.fedora.phx.redhat.com>

kevin set package perl-Locale-Msgfmt summary to Compile .po files to .mo files

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Msgfmt



From pkgdb at fedoraproject.org  Mon Aug 17 18:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:16:35 +0000
Subject: [pkgdb] perl-Locale-Msgfmt (Fedora, devel) updated by kevin
Message-ID: <20090817181637.D3E6510F886@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Locale-Msgfmt (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Locale-Msgfmt (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Locale-Msgfmt



From kevin at fedoraproject.org  Mon Aug 17 18:16:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:16:49 +0000 (UTC)
Subject: rpms/perl-Locale-Msgfmt/devel - New directory
Message-ID: <20090817181649.63D8111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10212/rpms/perl-Locale-Msgfmt/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:16:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:16:55 +0000 (UTC)
Subject: rpms/perl-Locale-Msgfmt Makefile,NONE,1.1
Message-ID: <20090817181655.C851311C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Msgfmt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10212/rpms/perl-Locale-Msgfmt

Added Files:
	Makefile 
Log Message:
Setup of module perl-Locale-Msgfmt


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Locale-Msgfmt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 17 18:16:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:16:56 +0000 (UTC)
Subject: rpms/perl-Locale-Msgfmt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090817181656.14D1411C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10212/rpms/perl-Locale-Msgfmt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Locale-Msgfmt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Locale-Msgfmt
# $Id: Makefile,v 1.1 2009/08/17 18:16:55 kevin Exp $
NAME := perl-Locale-Msgfmt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 17 18:16:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:16:49 +0000 (UTC)
Subject: rpms/perl-Locale-Msgfmt - New directory
Message-ID: <20090817181649.1BC3911C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Locale-Msgfmt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10212/rpms/perl-Locale-Msgfmt

Log Message:
Directory /cvs/pkgs/rpms/perl-Locale-Msgfmt added to the repository




From pkgdb at fedoraproject.org  Mon Aug 17 18:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:18:02 +0000
Subject: [pkgdb] moblin-session was added for pbrobinson
Message-ID: <20090817181802.6E5A310F859@bastion2.fedora.phx.redhat.com>

kevin has added Package moblin-session with summary Moblin User Experience Startup Scripts
kevin has approved Package moblin-session
kevin has added a Fedora devel branch for moblin-session with an owner of pbrobinson
kevin has approved moblin-session in Fedora devel
kevin has approved Package moblin-session
kevin has set commit to Approved for 107427 on moblin-session (Fedora devel)
kevin has set checkout to Approved for 107427 on moblin-session (Fedora devel)
kevin has set build to Approved for 107427 on moblin-session (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-session



From pkgdb at fedoraproject.org  Mon Aug 17 18:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:18:03 +0000
Subject: [pkgdb] moblin-session summary updated by kevin
Message-ID: <20090817181803.C871510F865@bastion2.fedora.phx.redhat.com>

kevin set package moblin-session summary to Moblin User Experience Startup Scripts

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-session



From pkgdb at fedoraproject.org  Mon Aug 17 18:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:18:03 +0000
Subject: [pkgdb] moblin-session (Fedora, 11) updated by kevin
Message-ID: <20090817181803.E5E7B10F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for moblin-session
kevin has set commit to Approved for 107427 on moblin-session (Fedora 11)
kevin has set checkout to Approved for 107427 on moblin-session (Fedora 11)
kevin has set build to Approved for 107427 on moblin-session (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-session



From kevin at fedoraproject.org  Mon Aug 17 18:18:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:18:14 +0000 (UTC)
Subject: rpms/moblin-session/devel - New directory
Message-ID: <20090817181814.4808111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-session/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk10520/rpms/moblin-session/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-session/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:18:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:18:14 +0000 (UTC)
Subject: rpms/moblin-session - New directory
Message-ID: <20090817181814.2068D11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-session
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk10520/rpms/moblin-session

Log Message:
Directory /cvs/pkgs/rpms/moblin-session added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:18:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:18:20 +0000 (UTC)
Subject: rpms/moblin-session Makefile,NONE,1.1
Message-ID: <20090817181820.1EA9C11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-session
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk10520/rpms/moblin-session

Added Files:
	Makefile 
Log Message:
Setup of module moblin-session


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-session
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 17 18:18:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:18:20 +0000 (UTC)
Subject: rpms/moblin-session/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090817181820.5DCF511C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-session/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk10520/rpms/moblin-session/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-session


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-session
# $Id: Makefile,v 1.1 2009/08/17 18:18:20 kevin Exp $
NAME := moblin-session
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Mon Aug 17 18:18:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 18:18:14 +0000 (UTC)
Subject: rpms/alsamixergui/devel alsamixergui.spec, 1.8,
	1.9 alsamixergui_0.9.0rc2-1-9.diff, 1.1, 1.2
Message-ID: <20090817181814.7142611C0416@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alsamixergui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10538

Modified Files:
	alsamixergui.spec alsamixergui_0.9.0rc2-1-9.diff 
Log Message:
fix debian patch so that it applies


Index: alsamixergui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/alsamixergui.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- alsamixergui.spec	17 Aug 2009 17:44:51 -0000	1.8
+++ alsamixergui.spec	17 Aug 2009 18:18:13 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		alsamixergui
 Summary: 	GUI mixer for ALSA sound devices
 Version:	0.9.0
-Release:	0.7.rc2%{?dist}
+Release:	0.8.rc2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 # This is where the source used to live, but this upstream is dead.
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/alsamixergui.png
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.8.rc2
+- fix debian patch to apply (i swear, it applied just a second ago)
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.7.rc2
 - update to rc2, last known update
 

alsamixergui_0.9.0rc2-1-9.diff:
 COPYING                     |  340 ++
 INSTALL                     |  229 +
 Makefile.in                 |  497 +++
 aclocal.m4                  | 1005 +++++++
 configure                   | 5556 ++++++++++++++++++++++++++++++++++++++++++++
 configure.in                |    5 
 debian/alsamixergui.desktop |    8 
 debian/alsamixergui.sgml    |   29 
 debian/alsamixergui.xpm     |  139 +
 debian/changelog            |   75 
 debian/compat               |    1 
 debian/control              |   24 
 debian/copyright            |    2 
 debian/manpages             |    1 
 debian/menu                 |    5 
 debian/watch                |    3 
 depcomp                     |  411 +++
 install-sh                  |  294 ++
 missing                     |  336 ++
 mkinstalldirs               |  111 
 src/Fl_AM.cxx               |    2 
 src/Fl_Pixmap_Button.H      |    2 
 src/Makefile.in             |  427 +++
 src/alsamixer.cxx           |   13 
 src/config.h.in             |   70 
 src/stamp-h                 |    1 
 src/stamp-h.in              |    1 
 27 files changed, 9549 insertions(+), 38 deletions(-)

Index: alsamixergui_0.9.0rc2-1-9.diff
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/alsamixergui_0.9.0rc2-1-9.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alsamixergui_0.9.0rc2-1-9.diff	17 Aug 2009 17:44:51 -0000	1.1
+++ alsamixergui_0.9.0rc2-1-9.diff	17 Aug 2009 18:18:13 -0000	1.2
@@ -220,113 +220,6 @@
 +?package(alsamixergui):needs="X11" section="Apps/Sound"\
 +  title="Alsamixergui" command="/usr/bin/alsamixergui" \
 +  icon="/usr/share/pixmaps/alsamixergui.xpm"
---- alsamixergui-0.9.0rc2-1.orig/debian/rules
-+++ alsamixergui-0.9.0rc2-1/debian/rules
-@@ -1,5 +1,4 @@
- #!/usr/bin/make -f
--
- # rules
- #
- # Robert Jordens <rjo at gmx.de>
-@@ -7,87 +6,20 @@
- # This software may be used and distributed according to the terms
- # of the GNU General Public License, incorporated herein by reference.
- #
--# $Id$
--
--# Uncomment this to turn on verbose mode.
--#export DH_VERBOSE=1
--
--# This is the debhelper compatibility version to use.
--export DH_COMPAT=3
--
--# These are used for cross-compiling and for saving the configure script
--# from having to guess our platform (since we know it already)
--DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
--DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--
--
--ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
--	CFLAGS += -g
--endif
--ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
--	INSTALL_PROGRAM += -s
--endif
--
--configure: Makefile.am
--	-rm -f aclocal.m4 INSTALL COPYING install-sh Makefile.in configure \
--		missing mkinstalldirs src/config.h.in src/Makefile.in \
--		src/stamp-h.in config.h.in
--	aclocal
--	automake --add-missing --copy
--	autoheader
--	autoconf
-+# $Id$
-+#
- 
--config.status: configure
--	dh_testdir
--	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
-+include /usr/share/cdbs/1/class/autotools.mk
-+include /usr/share/cdbs/1/rules/debhelper.mk
- 
--build: build-stamp
-+common-binary-post-install-arch::
-+	dh_buildinfo
-+	dh_install debian/alsamixergui.desktop usr/share/applications
-+	dh_install debian/alsamixergui.xpm usr/share/pixmaps
- 
--build-stamp:  config.status
--	dh_testdir
--	$(MAKE)
-+build/alsamixergui::
- 	/usr/bin/docbook-to-man debian/alsamixergui.sgml > debian/alsamixergui.1
--	touch build-stamp
--
--clean: 
--	dh_testdir
--	dh_testroot
--	rm -f build-stamp debian/alsamixergui.1
--	-$(MAKE) distclean
--	dh_clean
--
--install: build
--	dh_testdir
--	dh_testroot
--	dh_clean -k
--	dh_installdirs
--	$(MAKE) install prefix=$(CURDIR)/debian/alsamixergui/usr
--
--# Build architecture-independent files here.
--binary-indep: build install
--# We have nothing to do by default.
- 
--# Build architecture-dependent files here.
--binary-arch: build install
--	dh_testdir
--	dh_testroot
--#	dh_installdebconf	
--	dh_installdocs
--	dh_installexamples
--	dh_installmenu
--	dh_installman debian/alsamixergui.1
--	dh_installinfo
--#	dh_undocumented
--	dh_installchangelogs ChangeLog
--	dh_link
--	dh_strip
--	dh_compress
--	dh_fixperms
--	dh_installdeb
--	dh_shlibdeps
--	dh_gencontrol
--	dh_md5sums
--	dh_builddeb
-+clean::
-+	-rm -f debian/alsamixergui.1
- 
--binary: binary-indep binary-arch
--.PHONY: build clean binary-indep binary-arch binary install 
 --- alsamixergui-0.9.0rc2-1.orig/debian/compat
 +++ alsamixergui-0.9.0rc2-1/debian/compat
 @@ -0,0 +1 @@



From pkgdb at fedoraproject.org  Mon Aug 17 18:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:19:37 +0000
Subject: [pkgdb] rubygem-fastercsv was added for robert
Message-ID: <20090817181939.AF95B10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-fastercsv with summary Faster, smaller and cleaner replacement to standard CSV library
kevin has approved Package rubygem-fastercsv
kevin has added a Fedora devel branch for rubygem-fastercsv with an owner of robert
kevin has approved rubygem-fastercsv in Fedora devel
kevin has approved Package rubygem-fastercsv
kevin has set commit to Approved for 107427 on rubygem-fastercsv (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-fastercsv (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-fastercsv (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fastercsv



From pkgdb at fedoraproject.org  Mon Aug 17 18:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:19:38 +0000
Subject: [pkgdb] rubygem-fastercsv (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817181941.929CE10F865@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-fastercsv
kevin has set commit to Approved for 107427 on rubygem-fastercsv (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-fastercsv (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-fastercsv (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fastercsv



From pkgdb at fedoraproject.org  Mon Aug 17 18:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:19:38 +0000
Subject: [pkgdb] rubygem-fastercsv summary updated by kevin
Message-ID: <20090817181939.EAB4D10F897@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-fastercsv summary to Faster, smaller and cleaner replacement to standard CSV library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fastercsv



From pkgdb at fedoraproject.org  Mon Aug 17 18:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:19:38 +0000
Subject: [pkgdb] rubygem-fastercsv (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817181940.7ECED10F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-fastercsv
kevin has set commit to Approved for 107427 on rubygem-fastercsv (Fedora 10)
kevin has set checkout to Approved for 107427 on rubygem-fastercsv (Fedora 10)
kevin has set build to Approved for 107427 on rubygem-fastercsv (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fastercsv



From pkgdb at fedoraproject.org  Mon Aug 17 18:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:19:38 +0000
Subject: [pkgdb] rubygem-fastercsv (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817181942.33BB710F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-fastercsv
kevin has set commit to Approved for 107427 on rubygem-fastercsv (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-fastercsv (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-fastercsv (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-fastercsv



From kevin at fedoraproject.org  Mon Aug 17 18:19:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:19:48 +0000 (UTC)
Subject: rpms/rubygem-fastercsv - New directory
Message-ID: <20090817181948.18E1E11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-fastercsv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11011/rpms/rubygem-fastercsv

Log Message:
Directory /cvs/pkgs/rpms/rubygem-fastercsv added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:19:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:19:55 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090817181955.376CC11C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-fastercsv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11011/rpms/rubygem-fastercsv/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-fastercsv


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-fastercsv
# $Id: Makefile,v 1.1 2009/08/17 18:19:55 kevin Exp $
NAME := rubygem-fastercsv
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 17 18:19:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:19:48 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/devel - New directory
Message-ID: <20090817181948.4438511C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-fastercsv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11011/rpms/rubygem-fastercsv/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-fastercsv/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:19:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:19:55 +0000 (UTC)
Subject: rpms/rubygem-fastercsv Makefile,NONE,1.1
Message-ID: <20090817181955.01B5C11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-fastercsv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ11011/rpms/rubygem-fastercsv

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-fastercsv


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-fastercsv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pbrobinson at fedoraproject.org  Mon Aug 17 18:24:24 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 17 Aug 2009 18:24:24 +0000 (UTC)
Subject: rpms/moblin-session/devel import.log, NONE,
	1.1 moblin-session-mutter.patch, NONE, 1.1 moblin-session.spec,
	NONE, 1.1 moblin.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090817182424.4F02B11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12200/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-session-mutter.patch moblin-session.spec 
	moblin.desktop 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-session-0_12-4_fc11:HEAD:moblin-session-0.12-4.fc11.src.rpm:1250533299

moblin-session-mutter.patch:
 moblin-xinitrc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE moblin-session-mutter.patch ---
--- moblin-session-0.12/moblin-xinitrc	2009-06-29 18:56:04.000000000 +0100
+++ moblin-session-0.13/moblin-xinitrc	2009-06-30 17:54:49.000000000 +0100
@@ -96,4 +96,4 @@
 /usr/libexec/moblin-panel-pasteboard &
 /usr/libexec/moblin-panel-applications &
 
-metacity --sm-disable
+mutter --sm-disable


--- NEW FILE moblin-session.spec ---
Name:           moblin-session
Version:        0.12
Release:        4%{?dist}
Summary:        Moblin User Experience Startup Scripts

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://www.moblin.org/
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
Source1:        moblin.desktop
Patch0:         moblin-session-mutter.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  desktop-file-utils

%description
moblin-session manages a Moblin desktop session. It starts up the other core 
Moblin components and handles logout and saving the session.

%prep
%setup -q
%patch0 -p1 -b .mutter

%build
# nothing to build

%install
rm -rf %{buildroot}
install -D -p -m 755 moblin-xinitrc %{buildroot}%{_sysconfdir}/xdg/moblin/xinitrc
install -D -p -m 755 startmoblin %{buildroot}%{_bindir}/startmoblin
desktop-file-install --dir=%{buildroot}%{_datadir}/xsessions/ %{SOURCE1}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_sysconfdir}/xdg/moblin
%{_sysconfdir}/xdg/moblin/xinitrc
%{_bindir}/startmoblin
%{_datadir}/xsessions/moblin.desktop

%changelog
* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-4
- Add patch to start mutter not metacity

* Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-3
- More review updates.

* Tue Jul 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-2
- Make package noarch, some spec updates from review

* Sat Jul 25 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-1
- New upstream 0.12 release

* Sun Jun 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.10-1
- Initial packaging


--- NEW FILE moblin.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Exec=startmoblin
TryExec=startmoblin
Name=Moblin User Experience
Comment=Moblin User Experience


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:18:20 -0000	1.1
+++ .cvsignore	17 Aug 2009 18:24:23 -0000	1.2
@@ -0,0 +1 @@
+moblin-session-0.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:18:20 -0000	1.1
+++ sources	17 Aug 2009 18:24:24 -0000	1.2
@@ -0,0 +1 @@
+a458ece31ae5327ad872d9654bf64edf  moblin-session-0.12.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 17 18:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:25:58 +0000
Subject: [pkgdb] php-pear-HTML_Template_PHPLIB was added for topdog
Message-ID: <20090817182558.C007910F859@bastion2.fedora.phx.redhat.com>

kevin has added Package php-pear-HTML_Template_PHPLIB with summary PHP template system based on preg_*
kevin has approved Package php-pear-HTML_Template_PHPLIB
kevin has added a Fedora devel branch for php-pear-HTML_Template_PHPLIB with an owner of topdog
kevin has approved php-pear-HTML_Template_PHPLIB in Fedora devel
kevin has approved Package php-pear-HTML_Template_PHPLIB
kevin has set commit to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora devel)
kevin has set checkout to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora devel)
kevin has set build to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML_Template_PHPLIB



From pkgdb at fedoraproject.org  Mon Aug 17 18:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:26:00 +0000
Subject: [pkgdb] php-pear-HTML_Template_PHPLIB summary updated by kevin
Message-ID: <20090817182600.9D9B510F882@bastion2.fedora.phx.redhat.com>

kevin set package php-pear-HTML_Template_PHPLIB summary to PHP template system based on preg_*

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML_Template_PHPLIB



From pkgdb at fedoraproject.org  Mon Aug 17 18:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:26:00 +0000
Subject: [pkgdb] php-pear-HTML_Template_PHPLIB (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090817182600.AAFFD10F888@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-pear-HTML_Template_PHPLIB
kevin has set commit to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora 10)
kevin has set checkout to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora 10)
kevin has set build to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML_Template_PHPLIB



From pkgdb at fedoraproject.org  Mon Aug 17 18:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:26:00 +0000
Subject: [pkgdb] php-pear-HTML_Template_PHPLIB (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090817182602.14B6010F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for php-pear-HTML_Template_PHPLIB
kevin has set commit to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora 11)
kevin has set checkout to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora 11)
kevin has set build to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML_Template_PHPLIB



From kevin at fedoraproject.org  Mon Aug 17 18:26:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:26:08 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB - New directory
Message-ID: <20090817182608.2725011C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13298/rpms/php-pear-HTML_Template_PHPLIB

Log Message:
Directory /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:26:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:26:08 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB/devel - New directory
Message-ID: <20090817182608.44E7611C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13298/rpms/php-pear-HTML_Template_PHPLIB/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 17 18:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:26:00 +0000
Subject: [pkgdb] php-pear-HTML_Template_PHPLIB (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090817182606.0022B10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pear-HTML_Template_PHPLIB
kevin has set commit to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora EPEL 5)
kevin has set build to Approved for 107427 on php-pear-HTML_Template_PHPLIB (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-pear-HTML_Template_PHPLIB



From kevin at fedoraproject.org  Mon Aug 17 18:26:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:26:15 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB Makefile,NONE,1.1
Message-ID: <20090817182615.86E9011C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13298/rpms/php-pear-HTML_Template_PHPLIB

Added Files:
	Makefile 
Log Message:
Setup of module php-pear-HTML_Template_PHPLIB


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML_Template_PHPLIB
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 17 18:26:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:26:15 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090817182615.C50CF11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13298/rpms/php-pear-HTML_Template_PHPLIB/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML_Template_PHPLIB


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pear-HTML_Template_PHPLIB
# $Id: Makefile,v 1.1 2009/08/17 18:26:15 kevin Exp $
NAME := php-pear-HTML_Template_PHPLIB
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 17 18:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:26:48 +0000
Subject: [pkgdb] foomatic-db was added for twaugh
Message-ID: <20090817182649.9E5F310F865@bastion2.fedora.phx.redhat.com>

kevin has added Package foomatic-db with summary Database of printers and printer drivers
kevin has approved Package foomatic-db
kevin has added a Fedora devel branch for foomatic-db with an owner of twaugh
kevin has approved foomatic-db in Fedora devel
kevin has approved Package foomatic-db
kevin has set commit to Approved for 107427 on foomatic-db (Fedora devel)
kevin has set checkout to Approved for 107427 on foomatic-db (Fedora devel)
kevin has set build to Approved for 107427 on foomatic-db (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/foomatic-db



From kevin at fedoraproject.org  Mon Aug 17 18:26:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:26:58 +0000 (UTC)
Subject: rpms/foomatic-db - New directory
Message-ID: <20090817182658.1828E11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/foomatic-db
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13633/rpms/foomatic-db

Log Message:
Directory /cvs/pkgs/rpms/foomatic-db added to the repository




From pkgdb at fedoraproject.org  Mon Aug 17 18:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:26:50 +0000
Subject: [pkgdb] foomatic-db summary updated by kevin
Message-ID: <20090817182651.52E4310F889@bastion2.fedora.phx.redhat.com>

kevin set package foomatic-db summary to Database of printers and printer drivers

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/foomatic-db



From kevin at fedoraproject.org  Mon Aug 17 18:26:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:26:58 +0000 (UTC)
Subject: rpms/foomatic-db/devel - New directory
Message-ID: <20090817182658.3E19011C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13633/rpms/foomatic-db/devel

Log Message:
Directory /cvs/pkgs/rpms/foomatic-db/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:27:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:27:04 +0000 (UTC)
Subject: rpms/foomatic-db Makefile,NONE,1.1
Message-ID: <20090817182704.D637011C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/foomatic-db
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13633/rpms/foomatic-db

Added Files:
	Makefile 
Log Message:
Setup of module foomatic-db


--- NEW FILE Makefile ---
# Top level Makefile for module foomatic-db
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 17 18:27:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:27:05 +0000 (UTC)
Subject: rpms/foomatic-db/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090817182705.11E6311C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd13633/rpms/foomatic-db/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module foomatic-db


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: foomatic-db
# $Id: Makefile,v 1.1 2009/08/17 18:27:04 kevin Exp $
NAME := foomatic-db
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 17 18:27:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:27:41 +0000
Subject: [pkgdb] django-profile was added for diegobz
Message-ID: <20090817182741.9BD1210F85B@bastion2.fedora.phx.redhat.com>

kevin has added Package django-profile with summary Django pluggable user profile zone
kevin has approved Package django-profile
kevin has added a Fedora devel branch for django-profile with an owner of diegobz
kevin has approved django-profile in Fedora devel
kevin has approved Package django-profile
kevin has set commit to Approved for 107427 on django-profile (Fedora devel)
kevin has set checkout to Approved for 107427 on django-profile (Fedora devel)
kevin has set build to Approved for 107427 on django-profile (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-profile



From pkgdb at fedoraproject.org  Mon Aug 17 18:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:27:43 +0000
Subject: [pkgdb] django-profile (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817182746.2A72F10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for django-profile
kevin has set commit to Approved for 107427 on django-profile (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on django-profile (Fedora EPEL 5)
kevin has set build to Approved for 107427 on django-profile (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-profile



From pkgdb at fedoraproject.org  Mon Aug 17 18:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:27:42 +0000
Subject: [pkgdb] django-profile summary updated by kevin
Message-ID: <20090817182743.9A07910F889@bastion2.fedora.phx.redhat.com>

kevin set package django-profile summary to Django pluggable user profile zone

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-profile



From pkgdb at fedoraproject.org  Mon Aug 17 18:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:27:43 +0000
Subject: [pkgdb] django-profile (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817182746.4DA7410F859@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for django-profile
kevin has set commit to Approved for 107427 on django-profile (Fedora 11)
kevin has set checkout to Approved for 107427 on django-profile (Fedora 11)
kevin has set build to Approved for 107427 on django-profile (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-profile



From pkgdb at fedoraproject.org  Mon Aug 17 18:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:27:43 +0000
Subject: [pkgdb] django-profile (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817182744.653D610F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for django-profile
kevin has set commit to Approved for 107427 on django-profile (Fedora 10)
kevin has set checkout to Approved for 107427 on django-profile (Fedora 10)
kevin has set build to Approved for 107427 on django-profile (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-profile



From kevin at fedoraproject.org  Mon Aug 17 18:27:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:27:51 +0000 (UTC)
Subject: rpms/django-profile - New directory
Message-ID: <20090817182751.2021311C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-profile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC13874/rpms/django-profile

Log Message:
Directory /cvs/pkgs/rpms/django-profile added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:27:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:27:51 +0000 (UTC)
Subject: rpms/django-profile/devel - New directory
Message-ID: <20090817182751.3EB7111C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-profile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC13874/rpms/django-profile/devel

Log Message:
Directory /cvs/pkgs/rpms/django-profile/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:27:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:27:57 +0000 (UTC)
Subject: rpms/django-profile/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090817182757.8B10711C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-profile/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC13874/rpms/django-profile/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-profile


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-profile
# $Id: Makefile,v 1.1 2009/08/17 18:27:57 kevin Exp $
NAME := django-profile
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 17 18:27:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:27:57 +0000 (UTC)
Subject: rpms/django-profile Makefile,NONE,1.1
Message-ID: <20090817182757.5BB6A11C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-profile
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC13874/rpms/django-profile

Added Files:
	Makefile 
Log Message:
Setup of module django-profile


--- NEW FILE Makefile ---
# Top level Makefile for module django-profile
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 17 18:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:28:35 +0000
Subject: [pkgdb] django-authority was added for diegobz
Message-ID: <20090817182836.E53E410F89B@bastion2.fedora.phx.redhat.com>

kevin has added Package django-authority with summary A Django app for generic per-object permissions and custom permissions checks
kevin has approved Package django-authority
kevin has added a Fedora devel branch for django-authority with an owner of diegobz
kevin has approved django-authority in Fedora devel
kevin has approved Package django-authority
kevin has set commit to Approved for 107427 on django-authority (Fedora devel)
kevin has set checkout to Approved for 107427 on django-authority (Fedora devel)
kevin has set build to Approved for 107427 on django-authority (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-authority



From pkgdb at fedoraproject.org  Mon Aug 17 18:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:28:37 +0000
Subject: [pkgdb] django-authority (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817182839.87D2C10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for django-authority
kevin has set commit to Approved for 107427 on django-authority (Fedora 10)
kevin has set checkout to Approved for 107427 on django-authority (Fedora 10)
kevin has set build to Approved for 107427 on django-authority (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-authority



From pkgdb at fedoraproject.org  Mon Aug 17 18:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:28:37 +0000
Subject: [pkgdb] django-authority (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817182841.644F310F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for django-authority
kevin has set commit to Approved for 107427 on django-authority (Fedora 11)
kevin has set checkout to Approved for 107427 on django-authority (Fedora 11)
kevin has set build to Approved for 107427 on django-authority (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-authority



From pkgdb at fedoraproject.org  Mon Aug 17 18:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:28:37 +0000
Subject: [pkgdb] django-authority summary updated by kevin
Message-ID: <20090817182838.9A41210F8A8@bastion2.fedora.phx.redhat.com>

kevin set package django-authority summary to A Django app for generic per-object permissions and custom permissions checks

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-authority



From kevin at fedoraproject.org  Mon Aug 17 18:28:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:28:46 +0000 (UTC)
Subject: rpms/django-authority/devel - New directory
Message-ID: <20090817182846.4298F11C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-authority/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL14268/rpms/django-authority/devel

Log Message:
Directory /cvs/pkgs/rpms/django-authority/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:28:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:28:52 +0000 (UTC)
Subject: rpms/django-authority Makefile,NONE,1.1
Message-ID: <20090817182852.5BAD011C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-authority
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL14268/rpms/django-authority

Added Files:
	Makefile 
Log Message:
Setup of module django-authority


--- NEW FILE Makefile ---
# Top level Makefile for module django-authority
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 17 18:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:28:37 +0000
Subject: [pkgdb] django-authority (Fedora EPEL, 5) updated by kevin
Message-ID: <20090817182842.A851B10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for django-authority
kevin has set commit to Approved for 107427 on django-authority (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on django-authority (Fedora EPEL 5)
kevin has set build to Approved for 107427 on django-authority (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-authority



From kevin at fedoraproject.org  Mon Aug 17 18:28:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:28:46 +0000 (UTC)
Subject: rpms/django-authority - New directory
Message-ID: <20090817182846.1BE4711C00E4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-authority
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL14268/rpms/django-authority

Log Message:
Directory /cvs/pkgs/rpms/django-authority added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:28:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:28:52 +0000 (UTC)
Subject: rpms/django-authority/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090817182852.8334A11C0346@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-authority/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL14268/rpms/django-authority/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-authority


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-authority
# $Id: Makefile,v 1.1 2009/08/17 18:28:52 kevin Exp $
NAME := django-authority
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 17 18:30:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:30:00 +0000
Subject: [pkgdb] perl-Parse-ExuberantCTags was added for mmaslano
Message-ID: <20090817183000.B256F10F895@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Parse-ExuberantCTags with summary Efficiently parse exuberant ctags files
kevin has approved Package perl-Parse-ExuberantCTags
kevin has added a Fedora devel branch for perl-Parse-ExuberantCTags with an owner of mmaslano
kevin has approved perl-Parse-ExuberantCTags in Fedora devel
kevin has approved Package perl-Parse-ExuberantCTags
kevin has set commit to Approved for 107427 on perl-Parse-ExuberantCTags (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Parse-ExuberantCTags (Fedora devel)
kevin has set build to Approved for 107427 on perl-Parse-ExuberantCTags (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-ExuberantCTags



From pkgdb at fedoraproject.org  Mon Aug 17 18:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:30:02 +0000
Subject: [pkgdb] perl-Parse-ExuberantCTags summary updated by kevin
Message-ID: <20090817183002.ABCB010F857@bastion2.fedora.phx.redhat.com>

kevin set package perl-Parse-ExuberantCTags summary to Efficiently parse exuberant ctags files

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-ExuberantCTags



From pkgdb at fedoraproject.org  Mon Aug 17 18:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 18:30:02 +0000
Subject: [pkgdb] perl-Parse-ExuberantCTags (Fedora, devel) updated by kevin
Message-ID: <20090817183003.6A98C10F8A5@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Parse-ExuberantCTags (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Parse-ExuberantCTags (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-ExuberantCTags



From kevin at fedoraproject.org  Mon Aug 17 18:30:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:30:09 +0000 (UTC)
Subject: rpms/perl-Parse-ExuberantCTags/devel - New directory
Message-ID: <20090817183009.3950F11C04FD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14746/rpms/perl-Parse-ExuberantCTags/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:30:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:30:09 +0000 (UTC)
Subject: rpms/perl-Parse-ExuberantCTags - New directory
Message-ID: <20090817183009.1C2A211C04E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ExuberantCTags
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14746/rpms/perl-Parse-ExuberantCTags

Log Message:
Directory /cvs/pkgs/rpms/perl-Parse-ExuberantCTags added to the repository




From kevin at fedoraproject.org  Mon Aug 17 18:30:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:30:15 +0000 (UTC)
Subject: rpms/perl-Parse-ExuberantCTags/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090817183015.8A38011C04E7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14746/rpms/perl-Parse-ExuberantCTags/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Parse-ExuberantCTags


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Parse-ExuberantCTags
# $Id: Makefile,v 1.1 2009/08/17 18:30:15 kevin Exp $
NAME := perl-Parse-ExuberantCTags
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 17 18:30:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 17 Aug 2009 18:30:15 +0000 (UTC)
Subject: rpms/perl-Parse-ExuberantCTags Makefile,NONE,1.1
Message-ID: <20090817183015.5599311C04D1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ExuberantCTags
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu14746/rpms/perl-Parse-ExuberantCTags

Added Files:
	Makefile 
Log Message:
Setup of module perl-Parse-ExuberantCTags


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Parse-ExuberantCTags
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From jwilson at fedoraproject.org  Mon Aug 17 18:33:39 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 17 Aug 2009 18:33:39 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.316, 1.317 kernel.spec, 1.1721, 
	1.1722 linux-2.6.31-lirc.patch, 1.4, 1.5
Message-ID: <20090817183339.B9DD311C00E4@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15550

Modified Files:
	config-generic kernel.spec linux-2.6.31-lirc.patch 
Log Message:
* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com>
- Add new lirc driver for built-in ENE0100 device on some laptops



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- config-generic	11 Aug 2009 21:55:35 -0000	1.316
+++ config-generic	17 Aug 2009 18:33:39 -0000	1.317
@@ -3787,6 +3787,7 @@ CONFIG_DEFAULT_RELATIME=y
 CONFIG_INPUT_LIRC=y
 CONFIG_LIRC_DEV=m
 CONFIG_LIRC_BT829=m
+CONFIG_LIRC_ENE0100=m
 CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1721
retrieving revision 1.1722
diff -u -p -r1.1721 -r1.1722
--- kernel.spec	16 Aug 2009 22:09:02 -0000	1.1721
+++ kernel.spec	17 Aug 2009 18:33:39 -0000	1.1722
@@ -1969,6 +1969,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com>
+- Add new lirc driver for built-in ENE0100 device on some laptops
+
 * Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
 - Improve the perf script so it prints something helpful if the
   perf binary doesn't exist.

linux-2.6.31-lirc.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         |  852 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  450 ++++++
 drivers/input/lirc/lirc_ene0100.h     |  100 +
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2297 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 26 files changed, 15291 insertions(+)

Index: linux-2.6.31-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.31-lirc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6.31-lirc.patch	10 Aug 2009 20:30:10 -0000	1.4
+++ linux-2.6.31-lirc.patch	17 Aug 2009 18:33:39 -0000	1.5
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Monday, August 10, 2009
+Last updated: Monday, August 17, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -10,15 +10,17 @@ Signed-off-by: Jarod Wilson <jarod at redha
  MAINTAINERS                           |    9 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  112 ++
- drivers/input/lirc/Makefile           |   20 +
+ 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         |  851 ++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  852 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
+ drivers/input/lirc/lirc_ene0100.c     |  450 +++++++
+ drivers/input/lirc/lirc_ene0100.h     |  100 ++
  drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2297 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
@@ -31,13 +33,13 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
- 24 files changed, 14733 insertions(+), 0 deletions(-)
+ 26 files changed, 15291 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b1114cf..eb86f8e 100644
+index 2c4326c..15d1ac5 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3122,6 +3122,15 @@ W:	http://www.pasemi.com/
+@@ -3130,6 +3130,15 @@ W:	http://www.pasemi.com/
  L:	linuxppc-dev at ozlabs.org
  S:	Supported
  
@@ -78,10 +80,10 @@ index 4c9c745..99e2b5e 100644
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..6ef8622
+index 0000000..ab13cfe
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,119 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -106,6 +108,14 @@ index 0000000..6ef8622
 +	help
 +	  Driver for the IR interface on BT829-based hardware
 +
++config LIRC_ENE0100
++	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
++	depends on LIRC_DEV
++	help
++	  This is a driver for CIR port handled by ENE KB3924 embedded
++	  controller found on some notebooks.
++	  It appears on PNP list as ENE0100.
++
 +config LIRC_I2C
 +	tristate "I2C Based IR Receivers"
 +	depends on LIRC_DEV
@@ -192,14 +202,13 @@ index 0000000..6ef8622
 +	help
 +	  Driver for the Zilog/Hauppauge IR Transmitter, found on
 +	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
-+
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..7b1386e
+index 0000000..8da7aa9
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,21 @@
 +# Makefile for the lirc drivers.
 +#
 +
@@ -207,6 +216,7 @@ index 0000000..7b1386e
 +
 +obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
 +obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
++obj-$(CONFIG_LIRC_ENE0100)	+= lirc_ene0100.o
 +obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
 +obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
 +obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
@@ -717,10 +727,10 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..0510b4e
+index 0000000..fa0d169
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,851 @@
+@@ -0,0 +1,852 @@
 +/*
 + * LIRC base driver
 + *
@@ -1019,6 +1029,7 @@ index 0000000..0510b4e
 +	}
 +	init_irctl(ir);
 +	irctls[minor] = ir;
++	d->minor = minor;
 +
 +	if (d->sample_rate) {
 +		ir->jiffies_to_wait = HZ / d->sample_rate;
@@ -1100,8 +1111,8 @@ index 0000000..0510b4e
 +
 +	if (minor < 0 || minor >= MAX_IRCTL_DEVICES) {
 +		printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
-+		       "\"minor\" must be between 0 and %d!\n",
-+		       MAX_IRCTL_DEVICES-1);
++		       "\"minor (%d)\" must be between 0 and %d!\n",
++		       minor, MAX_IRCTL_DEVICES-1);
 +		return -EBADRQC;
 +	}
 +
@@ -1762,6 +1773,568 @@ index 0000000..8eeffa2
 +			       unsigned long arg);
 +
 +#endif
+diff --git a/drivers/input/lirc/lirc_ene0100.c b/drivers/input/lirc/lirc_ene0100.c
+new file mode 100644
+index 0000000..e6f1617
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ene0100.c
+@@ -0,0 +1,450 @@
++/*
++ * driver for ENE KB3924 CIR (also known as ENE0100)
++ *
++ * Copyright (C) 2009 Maxim Levitsky <maximlevitsky at gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ * USA
++ */
++
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/pnp.h>
++#include <linux/io.h>
++#include <linux/interrupt.h>
++#include "lirc_ene0100.h"
++
++
++static int sample_period = 50;
++static int enable_idle = 1;
++
++static void ene_set_idle(struct ene_device *dev, int idle);
++
++/* read a hardware register */
++static u8 ene_hw_read_reg(struct ene_device *dev, u16 reg)
++{
++	outb(reg >> 8   , dev->hw_io + ENE_ADDR_HI);
++	outb(reg & 0xFF , dev->hw_io + ENE_ADDR_LO);
++	return inb(dev->hw_io + ENE_IO);
++}
++
++/* write a hardware register */
++static void ene_hw_write_reg(struct ene_device *dev, u16 reg, u8 value)
++{
++	outb(reg >> 8   , dev->hw_io + ENE_ADDR_HI);
++	outb(reg & 0xFF , dev->hw_io + ENE_ADDR_LO);
++	outb(value, dev->hw_io + ENE_IO);
++}
++
++/* change specific bits in hardware register */
++static void ene_hw_write_reg_mask(struct ene_device *dev,
++						u16 reg, u8 value, u8 mask)
++{
++	u8 regvalue;
++
++	outb(reg >> 8   , dev->hw_io + ENE_ADDR_HI);
++	outb(reg & 0xFF , dev->hw_io + ENE_ADDR_LO);
++
++	regvalue = inb(dev->hw_io + ENE_IO) & ~mask;
++	regvalue |= (value & mask);
++	outb(regvalue, dev->hw_io + ENE_IO);
++}
++
++
++/* which half of hardware buffer we read now ?*/
++static int hw_get_buf_pointer(struct ene_device *dev)
++{
++	return 4 * (ene_hw_read_reg(dev, ENE_FW_BUFFER_POINTER)
++				& ENE_FW_BUFFER_POINTER_HIGH);
++}
++
++
++/* read irq status and ack it */
++static int ene_hw_irq_status(struct ene_device *dev)
++{
++	u8 irq_status = ene_hw_read_reg(dev, ENE_IRQ_STATUS);
++
++	if (!irq_status & ENE_IRQ_STATUS_IR)
++		return 0;
++
++	ene_hw_write_reg(dev, ENE_IRQ_STATUS, irq_status & ~ENE_IRQ_STATUS_IR);
++	return 1;
++}
++
++
++/* hardware initialization */
++static int ene_hw_init(void *data)
++{
++	struct ene_device *dev = (struct ene_device *)data;
++	dev->in_use = 1;
++
++	ene_hw_write_reg(dev, ENE_IRQ, dev->irq << 1);
++	ene_hw_write_reg(dev, ENE_ADC_UNK2, 0x00);
++	ene_hw_write_reg(dev, ENE_ADC_SAMPLE_PERIOD, sample_period);
++	ene_hw_write_reg(dev, ENE_ADC_UNK1, 0x07);
++	ene_hw_write_reg(dev, ENE_UNK1, 0x01);
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, ENE_FW_ENABLE | ENE_FW_IRQ,
++		ENE_FW_ENABLE | ENE_FW_IRQ);
++
++	/* ack any pending irqs - just in case */
++	ene_hw_irq_status(dev);
++
++	/* enter idle mode */
++	ene_set_idle(dev, 1);
++
++	/* clear stats */
++	dev->sample = 0;
++	return 0;
++}
++
++/* deinitialization */
++static void ene_hw_deinit(void *data)
++{
++	struct ene_device *dev = (struct ene_device *)data;
++
++	/* disable hardware IRQ and firmware flag */
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, 0,
++		ENE_FW_ENABLE | ENE_FW_IRQ);
++
++	ene_set_idle(dev, 1);
++	dev->in_use = 0;
++}
++
++/*  sends current sample to userspace */
++static void send_sample(struct ene_device *dev)
++{
++	int value = abs(dev->sample) & PULSE_MASK;
++
++	if (dev->sample > 0)
++		value |= PULSE_BIT;
++
++	if (!lirc_buffer_full(dev->lirc_driver->rbuf)) {
++		lirc_buffer_write(dev->lirc_driver->rbuf, (void *) &value);
++		wake_up(&dev->lirc_driver->rbuf->wait_poll);
++	}
++	dev->sample = 0;
++}
++
++/*  this updates current sample */
++static void update_sample(struct ene_device *dev, int sample)
++{
++	if (!dev->sample)
++		dev->sample = sample;
++	else if (same_sign(dev->sample, sample))
++		dev->sample += sample;
++	else {
++		send_sample(dev);
++		dev->sample = sample;
++	}
++}
++
++/* enable or disable idle mode */
++static void ene_set_idle(struct ene_device *dev, int idle)
++{
++	struct timeval now;
++
++	ene_hw_write_reg_mask(dev, ENE_ADC_SAMPLE_PERIOD,
++		idle & enable_idle ? 0 : ENE_ADC_SAMPLE_OVERFLOW,
++		ENE_ADC_SAMPLE_OVERFLOW);
++
++	dev->idle = idle;
++
++
++	/* remember when we have entered the idle mode */
++	if (idle) {
++		do_gettimeofday(&dev->gap_start);
++		return;
++	}
++
++	/* send the gap between keypresses now */
++	do_gettimeofday(&now);
++
++	if (now.tv_sec - dev->gap_start.tv_sec > 16)
++		dev->sample = space(PULSE_MASK);
++	else
++		dev->sample = dev->sample + 
++			space(1000000ull * (now.tv_sec - dev->gap_start.tv_sec))
++				+ space(now.tv_usec - dev->gap_start.tv_usec);
++
++	if (abs(dev->sample) > PULSE_MASK)
++		dev->sample = space(PULSE_MASK);
++	send_sample(dev);
++}
++
++
++/* interrupt handler */
++static irqreturn_t ene_hw_irq(int irq, void *data)
++{
++	u16 hw_address;
++	u8 hw_value;
++	int i, hw_sample;
++	int space;
++
++	struct ene_device *dev = (struct ene_device *)data;
++
++	if (!ene_hw_irq_status(dev))
++		return IRQ_NONE;
++
++	hw_address = ENE_SAMPLE_BUFFER + hw_get_buf_pointer(dev);
++
++	for (i = 0 ; i < ENE_SAMPLES_SIZE ; i++) {
++
++		hw_value = ene_hw_read_reg(dev, hw_address + i);
++		space = hw_value & ENE_SAMPLE_LOW_MASK;
++		hw_value &= ~ENE_SAMPLE_LOW_MASK;
++
++		/* no more data */
++		if (!(hw_value))
++			break;
++
++		/* calculate hw sample */
++		hw_sample = hw_value * sample_period;
++
++		if (space)
++			hw_sample *= -1;
++
++		/* overflow sample recieved, handle it */
++		if (hw_value == ENE_SAMPLE_OVERFLOW) {
++
++			if (dev->idle)
++				continue;
++
++			if (dev->sample > 0 || abs(dev->sample) <= ENE_MAXGAP)
++				update_sample(dev, hw_sample);
++			else
++				ene_set_idle(dev, 1);
++
++			continue;
++		}
++
++		/* normal first sample recieved*/
++		if (dev->idle) {
++			ene_set_idle(dev, 0);
++
++			/* discard first recieved value, its random
++			   since its the time signal was off before
++			   first pulse if idle mode is enabled, HW
++			   does that for us */
++
++			if (!enable_idle)
++				continue;
++		}
++
++		update_sample(dev, hw_sample);
++		send_sample(dev);
++	}
++	return IRQ_HANDLED;
++}
++
++static int ene_probe(struct pnp_dev *pnp_dev,
++					const struct pnp_device_id *dev_id)
++{
++	struct resource *res;
++	struct ene_device *dev;
++	struct lirc_driver *lirc_driver;
++	int error = -ENOMEM;
++
++	dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);
++
++	if (!dev)
++		goto err1;
++
++	dev->pnp_dev = pnp_dev;
++	pnp_set_drvdata(pnp_dev, dev);
++
++	error = -EINVAL;
++	if (sample_period < 5) {
++
++		printk(KERN_ERR ENE_DRIVER_NAME ": sample period must be at "
++		       "least 5 ms, (at least 30 recommended)\n");
++
++		goto err1;
++	}
++
++	/* validate and read resources */
++	error = -ENODEV;
++	res = pnp_get_resource(pnp_dev, IORESOURCE_IO, 0);
++	if (!pnp_resource_valid(res))
++		goto err2;
++
++	dev->hw_io = res->start;
++
++	if (pnp_resource_len(res) < ENE_MAX_IO)
++		goto err2;
++
++
++	res = pnp_get_resource(pnp_dev, IORESOURCE_IRQ, 0);
++	if (!pnp_resource_valid(res))
++		goto err2;
++
++	dev->irq = res->start;
++
++	/* prepare lirc interface */
++	error = -ENOMEM;
++	lirc_driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
++
++	if (!lirc_driver)
++		goto err2;
++
++	dev->lirc_driver = lirc_driver;
++
++	strcpy(lirc_driver->name, ENE_DRIVER_NAME);
++	lirc_driver->minor = -1;
++	lirc_driver->code_length = sizeof(int) * 8;
++	lirc_driver->features = LIRC_CAN_REC_MODE2;
++	lirc_driver->data = dev;
++	lirc_driver->set_use_inc = ene_hw_init;
++	lirc_driver->set_use_dec = ene_hw_deinit;
++	lirc_driver->dev = &pnp_dev->dev;
++	lirc_driver->owner = THIS_MODULE;
++
++	lirc_driver->rbuf = kzalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
++
++	if (!lirc_driver->rbuf)
++		goto err3;
++
++	if (lirc_buffer_init(lirc_driver->rbuf,
++					sizeof(int), sizeof(int) * 256))
++		goto err4;
++
++	error = -ENODEV;
++	if (lirc_register_driver(lirc_driver))
++		goto err5;
++
++	/* claim the resources */
++	error = -EBUSY;
++	if (!request_region(dev->hw_io, ENE_MAX_IO, ENE_DRIVER_NAME))
++		goto err6;
++
++	if (request_irq(dev->irq, ene_hw_irq,
++			IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev))
++		goto err7;
++
++
++	/* check firmware version */
++	error = -ENODEV;
++	if (ene_hw_read_reg(dev, ENE_FW_VERSION) != ENE_FW_VER_SUPP) {
++		printk(KERN_WARNING ENE_DRIVER_NAME ": "
++		       "unsupported firmware found, aborting\n");
++		goto err8;
++	}
++
++	printk(KERN_NOTICE ENE_DRIVER_NAME ": "
++	       "driver has been succesfully loaded\n");
++	return 0;
++
++err8:
++	free_irq(dev->irq, dev);
++err7:
++	release_region(dev->hw_io, ENE_MAX_IO);
++err6:
++	lirc_unregister_driver(lirc_driver->minor);
++err5:
++	lirc_buffer_free(lirc_driver->rbuf);
++err4:
++	kfree(lirc_driver->rbuf);
++err3:
++	kfree(lirc_driver);
++err2:
++	kfree(dev);
++err1:
++	return error;
++}
++
++
++static void ene_remove(struct pnp_dev *pnp_dev)
++{
++	struct ene_device *dev = pnp_get_drvdata(pnp_dev);
++	ene_hw_deinit(dev);
++	free_irq(dev->irq, dev);
++	release_region(dev->hw_io, ENE_MAX_IO);
++	lirc_unregister_driver(dev->lirc_driver->minor);
++	lirc_buffer_free(dev->lirc_driver->rbuf);
++	kfree(dev->lirc_driver);
++	kfree(dev);
++}
++
++
++#ifdef CONFIG_PM
++static int ene_suspend(struct pnp_dev *pnp_dev, pm_message_t state)
++{
++	struct ene_device *dev = pnp_get_drvdata(pnp_dev);
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, ENE_FW_WAKE, ENE_FW_WAKE);
++	return 0;
++}
++
++
++static int ene_resume(struct pnp_dev *pnp_dev)
++{
++	struct ene_device *dev = pnp_get_drvdata(pnp_dev);
++	if (dev->in_use)
++		ene_hw_init(dev);
++
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, 0, ENE_FW_WAKE);
++	return 0;
++}
++
++#endif
++
++
++static const struct pnp_device_id ene_ids[] = {
++	{ .id = "ENE0100", },
++	{ },
++};
++
++static struct pnp_driver ene_driver = {
++	.name = ENE_DRIVER_NAME,
++	.id_table = ene_ids,
++	.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
++
++	.probe = ene_probe,
++	.remove = __devexit_p(ene_remove),
++
++#ifdef CONFIG_PM
++	.suspend = ene_suspend,
++	.resume = ene_resume,
++#endif
++};
++
++
++static int __init ene_init(void)
++{
++	return pnp_register_driver(&ene_driver);
++}
++
++static void ene_exit(void)
++{
++	pnp_unregister_driver(&ene_driver);
++}
++
++
++module_param(sample_period, int, S_IRUGO);
++MODULE_PARM_DESC(sample_period, "Hardware sample period (50 us default)");
++
++
++module_param(enable_idle, bool, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(enable_idle,
++"Allow hardware to signal when IR pulse starts, disable if your remote"
++"doesn't send a sync pulse");
++
++
++MODULE_DEVICE_TABLE(pnp, ene_ids);
++MODULE_DESCRIPTION("LIRC driver for KB3924/ENE0100 CIR port");
++MODULE_AUTHOR("Maxim Levitsky");
++MODULE_LICENSE("GPL");
++
++module_init(ene_init);
++module_exit(ene_exit);
+diff --git a/drivers/input/lirc/lirc_ene0100.h b/drivers/input/lirc/lirc_ene0100.h
+new file mode 100644
+index 0000000..7db3545
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ene0100.h
+@@ -0,0 +1,100 @@
++/*
++ * driver for ENE KB3924 CIR (also known as ENE0100)
++ *
++ * Copyright (C) 2009 Maxim Levitsky <maximlevitsky at gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ * USA
++ */
++
++#include "lirc.h"
++#include "lirc_dev.h"
++
++/* hardware address */
++#define ENE_STATUS		0	/* hardware status - unused */
++#define ENE_ADDR_HI		1	/* hi byte of register address */
++#define ENE_ADDR_LO		2	/* low byte of register address */
++#define ENE_IO			3	/* read/write window */
++#define ENE_MAX_IO		3
++
++
++/* 8 bytes of samples, divided in 2 halfs*/
++#define ENE_SAMPLE_BUFFER		0xF8F0
++#define ENE_SAMPLE_LOW_MASK		(1 << 7)
++#define ENE_SAMPLE_VALUE_MASK		0x7F
++#define ENE_SAMPLE_OVERFLOW		0x7F
++#define ENE_SAMPLES_SIZE		4
++
++
++/* firmware settings */
++#define ENE_FW_SETTINGS			0xF8F8
++#define	ENE_FW_ENABLE			(1 << 0) /* enable fw processing */
++#define ENE_FW_WAKE			(1 << 6) /* enable wake from S3 */
++#define ENE_FW_IRQ			(1 << 7) /* enable interrupt */
++
++
++/* buffer pointer, tells which half of ENE_SAMPLE_BUFFER to read */
++#define ENE_FW_BUFFER_POINTER		0xF8F9
++#define ENE_FW_BUFFER_POINTER_HIGH	(1 << 0)
++
++
++/* IRQ registers block */
++#define ENE_IRQ				0xFD09	 /* IRQ number */
++#define ENE_UNK1			0xFD17   /* unknown setting = 1 */
++#define ENE_IRQ_STATUS			0xFD80   /* irq status */
++#define ENE_IRQ_STATUS_IR		(1 << 5) /* IR irq */
++
++
++/* ADC settings */
++#define ENE_ADC_UNK1			0xFEC0	 /* unknown setting = 7 */
++#define ENE_ADC_UNK2			0xFEC1   /* unknown setting = 0 */
++#define ENE_ADC_SAMPLE_PERIOD		0xFEC8   /* sample period in us */
++#define ENE_ADC_SAMPLE_OVERFLOW		(1 << 7) /* interrupt on
++						    overflows if set */
++
++/* fimware version */
++#define ENE_FW_VERSION			0xFF00
++#define ENE_FW_VER_SUPP			0xC0
++
++
++#define same_sign(a, b) ((((a) > 0) && (b) > 0) || ((a) < 0 && (b) < 0))
++
++#define ENE_DRIVER_NAME			"enecir"
++
++#define ENE_MAXGAP			5000000	/* this is amount of
++						   time we wait before
++						   turning the
++						   sampler, chosen
++						   arbitry */
++
++#define space(len)			(-(len))   /* add a space */
++
++
++struct ene_device {
++	struct pnp_dev *pnp_dev;
++	struct lirc_driver *lirc_driver;
++
++	/* hw settings */
++	unsigned long hw_io;
++	int irq;
++
++	/* device data */
++	int idle;
++	int sample;
++	int in_use;
++
++	struct timeval gap_start;
++};
++
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
 index 0000000..e27d937
@@ -2869,10 +3442,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..3c87d94
+index 0000000..05fe0c7
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2298 @@
+@@ -0,0 +1,2297 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -3273,8 +3846,7 @@ index 0000000..3c87d94
 +		 "open. 0=don't disable, 1=disable. (default: don't disable)");
 +module_param(pad_thresh, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(pad_thresh, "Threshold at which a pad push registers as an "
-+		 "arrow key in kbd mode (default 80 on newer devices, 15 on "
-+		 "older devices)");
++		 "arrow key in kbd mode (default: 28)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -4288,7 +4860,7 @@ index 0000000..3c87d94
 +		len = 8;
 +		timeout = 500;	/* in msecs */
 +		/* (2*threshold) x (2*threshold) square */
-+		threshold = pad_thresh ? pad_thresh : 80;
++		threshold = pad_thresh ? pad_thresh : 28;
 +		rel_x = buf[2];
 +		rel_y = buf[3];
 +



From topdog at fedoraproject.org  Mon Aug 17 18:42:12 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 17 Aug 2009 18:42:12 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB/devel import.log, NONE,
	1.1 php-pear-HTML_Template_PHPLIB.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817184212.71C9011C00E4@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17245/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-HTML_Template_PHPLIB.spec 
Log Message:
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- initial import




--- NEW FILE import.log ---
php-pear-HTML_Template_PHPLIB-1_4_0-2_fc11:HEAD:php-pear-HTML_Template_PHPLIB-1.4.0-2.fc11.src.rpm:1250534404


--- NEW FILE php-pear-HTML_Template_PHPLIB.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name HTML_Template_PHPLIB

Name:		php-pear-HTML_Template_PHPLIB
Version:	1.4.0
Release:	2%{?dist}
Summary:	PHP template system based on preg_* 
Group:		Development/Libraries
License:	LGPLv2
URL:		http://pear.php.net/package/%{pear_name}
Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-pear(PEAR)
Requires(post):	%{__pear}
Requires(postun):	%{__pear}
Provides:	php-pear(%{pear_name}) = %{version}

%description
This is the PEAR port of the popular PHPLIB template system. It
contains some features not currently found in the original version.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}



%build
# Empty build section nothing to do here

%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
# I could not do this in prep as it breaks the pear install due to md5 checks.
iconv -f iso8859-1 -t utf-8 %{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README >	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv && \
mv -f	%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
	%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/HTML/Template
%{_bindir}/*

%changelog
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- Fix naming 

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:26:15 -0000	1.1
+++ .cvsignore	17 Aug 2009 18:42:11 -0000	1.2
@@ -0,0 +1 @@
+HTML_Template_PHPLIB-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:26:15 -0000	1.1
+++ sources	17 Aug 2009 18:42:12 -0000	1.2
@@ -0,0 +1 @@
+ffaec612100e05e989d859cea7a00bb2  HTML_Template_PHPLIB-1.4.0.tgz



From spot at fedoraproject.org  Mon Aug 17 18:42:18 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 18:42:18 +0000 (UTC)
Subject: rpms/alsamixergui/devel alsamixergui.spec,1.9,1.10
Message-ID: <20090817184218.10A2711C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alsamixergui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17327

Modified Files:
	alsamixergui.spec 
Log Message:
fix buildrequires


Index: alsamixergui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsamixergui/devel/alsamixergui.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- alsamixergui.spec	17 Aug 2009 18:18:13 -0000	1.9
+++ alsamixergui.spec	17 Aug 2009 18:42:17 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		alsamixergui
 Summary: 	GUI mixer for ALSA sound devices
 Version:	0.9.0
-Release:	0.8.rc2%{?dist}
+Release:	0.9.rc2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 # This is where the source used to live, but this upstream is dead.
@@ -15,7 +15,7 @@ URL:		ftp://www.iua.upf.es/pub/mdeboer/p
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fltk-devel, libstdc++-devel
 BuildRequires:	alsa-lib-devel, desktop-file-utils
-BuildRequires:	autoconf
+BuildRequires:	libtool
 # This is debian's patch, taken 2009-08-17
 Patch0:		alsamixergui_0.9.0rc2-1-9.diff
 
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/alsamixergui.png
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.9.rc2
+- fix buildrequires
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.0-0.8.rc2
 - fix debian patch to apply (i swear, it applied just a second ago)
 



From topdog at fedoraproject.org  Mon Aug 17 18:45:30 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 17 Aug 2009 18:45:30 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB/F-10 import.log, NONE,
	1.1 php-pear-HTML_Template_PHPLIB.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817184530.2516311C00E4@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17948/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-HTML_Template_PHPLIB.spec 
Log Message:
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- initial import




--- NEW FILE import.log ---
php-pear-HTML_Template_PHPLIB-1_4_0-2_fc11:F-10:php-pear-HTML_Template_PHPLIB-1.4.0-2.fc11.src.rpm:1250534636


--- NEW FILE php-pear-HTML_Template_PHPLIB.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name HTML_Template_PHPLIB

Name:		php-pear-HTML_Template_PHPLIB
Version:	1.4.0
Release:	2%{?dist}
Summary:	PHP template system based on preg_* 
Group:		Development/Libraries
License:	LGPLv2
URL:		http://pear.php.net/package/%{pear_name}
Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-pear(PEAR)
Requires(post):	%{__pear}
Requires(postun):	%{__pear}
Provides:	php-pear(%{pear_name}) = %{version}

%description
This is the PEAR port of the popular PHPLIB template system. It
contains some features not currently found in the original version.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}



%build
# Empty build section nothing to do here

%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
# I could not do this in prep as it breaks the pear install due to md5 checks.
iconv -f iso8859-1 -t utf-8 %{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README >	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv && \
mv -f	%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
	%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/HTML/Template
%{_bindir}/*

%changelog
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- Fix naming 

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:26:15 -0000	1.1
+++ .cvsignore	17 Aug 2009 18:45:29 -0000	1.2
@@ -0,0 +1 @@
+HTML_Template_PHPLIB-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:26:15 -0000	1.1
+++ sources	17 Aug 2009 18:45:29 -0000	1.2
@@ -0,0 +1 @@
+ffaec612100e05e989d859cea7a00bb2  HTML_Template_PHPLIB-1.4.0.tgz



From topdog at fedoraproject.org  Mon Aug 17 18:48:10 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 17 Aug 2009 18:48:10 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB/F-11 import.log, NONE,
	1.1 php-pear-HTML_Template_PHPLIB.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817184810.9434611C00E4@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18545/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-HTML_Template_PHPLIB.spec 
Log Message:
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- initial import




--- NEW FILE import.log ---
php-pear-HTML_Template_PHPLIB-1_4_0-2_fc11:F-11:php-pear-HTML_Template_PHPLIB-1.4.0-2.fc11.src.rpm:1250534830


--- NEW FILE php-pear-HTML_Template_PHPLIB.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name HTML_Template_PHPLIB

Name:		php-pear-HTML_Template_PHPLIB
Version:	1.4.0
Release:	2%{?dist}
Summary:	PHP template system based on preg_* 
Group:		Development/Libraries
License:	LGPLv2
URL:		http://pear.php.net/package/%{pear_name}
Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-pear(PEAR)
Requires(post):	%{__pear}
Requires(postun):	%{__pear}
Provides:	php-pear(%{pear_name}) = %{version}

%description
This is the PEAR port of the popular PHPLIB template system. It
contains some features not currently found in the original version.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}



%build
# Empty build section nothing to do here

%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
# I could not do this in prep as it breaks the pear install due to md5 checks.
iconv -f iso8859-1 -t utf-8 %{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README >	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv && \
mv -f	%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
	%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/HTML/Template
%{_bindir}/*

%changelog
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- Fix naming 

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:26:15 -0000	1.1
+++ .cvsignore	17 Aug 2009 18:48:10 -0000	1.2
@@ -0,0 +1 @@
+HTML_Template_PHPLIB-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:26:15 -0000	1.1
+++ sources	17 Aug 2009 18:48:10 -0000	1.2
@@ -0,0 +1 @@
+ffaec612100e05e989d859cea7a00bb2  HTML_Template_PHPLIB-1.4.0.tgz



From topdog at fedoraproject.org  Mon Aug 17 18:51:02 2009
From: topdog at fedoraproject.org (topdog)
Date: Mon, 17 Aug 2009 18:51:02 +0000 (UTC)
Subject: rpms/php-pear-HTML_Template_PHPLIB/EL-5 import.log, NONE,
	1.1 php-pear-HTML_Template_PHPLIB.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817185102.CB57611C00E4@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19250/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pear-HTML_Template_PHPLIB.spec 
Log Message:
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- initial import




--- NEW FILE import.log ---
php-pear-HTML_Template_PHPLIB-1_4_0-2_fc11:EL-5:php-pear-HTML_Template_PHPLIB-1.4.0-2.fc11.src.rpm:1250535006


--- NEW FILE php-pear-HTML_Template_PHPLIB.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name HTML_Template_PHPLIB

Name:		php-pear-HTML_Template_PHPLIB
Version:	1.4.0
Release:	2%{?dist}
Summary:	PHP template system based on preg_* 
Group:		Development/Libraries
License:	LGPLv2
URL:		http://pear.php.net/package/%{pear_name}
Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-pear(PEAR)
Requires(post):	%{__pear}
Requires(postun):	%{__pear}
Provides:	php-pear(%{pear_name}) = %{version}

%description
This is the PEAR port of the popular PHPLIB template system. It
contains some features not currently found in the original version.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}



%build
# Empty build section nothing to do here

%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
# I could not do this in prep as it breaks the pear install due to md5 checks.
iconv -f iso8859-1 -t utf-8 %{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README >	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv && \
mv -f	%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README.conv	\
%{_builddir}/%{name}-%{version}/%{pear_name}-%{version}/docdir/%{pear_name}/examples/README


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
	%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/HTML/Template
%{_bindir}/*

%changelog
* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-2
- Fix naming 

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> 1.4.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:26:15 -0000	1.1
+++ .cvsignore	17 Aug 2009 18:51:02 -0000	1.2
@@ -0,0 +1 @@
+HTML_Template_PHPLIB-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-HTML_Template_PHPLIB/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:26:15 -0000	1.1
+++ sources	17 Aug 2009 18:51:02 -0000	1.2
@@ -0,0 +1 @@
+ffaec612100e05e989d859cea7a00bb2  HTML_Template_PHPLIB-1.4.0.tgz



From spot at fedoraproject.org  Mon Aug 17 18:58:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 18:58:20 +0000 (UTC)
Subject: rpms/daa2iso/devel daa2iso.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090817185820.B368611C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/daa2iso/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21477

Modified Files:
	daa2iso.spec sources 
Log Message:
update to 0.1.7c


Index: daa2iso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/daa2iso/devel/daa2iso.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- daa2iso.spec	24 Jul 2009 19:55:31 -0000	1.5
+++ daa2iso.spec	17 Aug 2009 18:58:20 -0000	1.6
@@ -1,13 +1,12 @@
 Name:		daa2iso
 Summary: 	Program for converting DAA files to ISO
-Version:	0.1.7a
-Release:	3%{?dist}
+Version:	0.1.7c
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 Source0:	http://aluigi.altervista.org/mytoolz/daa2iso.zip
 URL:		http://aluigi.altervista.org/mytoolz.htm
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	zlib-devel
 
 %description
 DAA2ISO is an open source command-line/GUI tool for converting single and 
@@ -35,10 +34,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc daa2iso.txt
+%doc daa2iso.txt COPYING
 %{_bindir}/daa2iso
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.7c-1
+- update to 0.1.7c
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.7a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/daa2iso/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 20:47:47 -0000	1.4
+++ sources	17 Aug 2009 18:58:20 -0000	1.5
@@ -1 +1 @@
-beb992d0d67b72ac60bb37685723c219  daa2iso.zip
+35703f1ca8f8c5168ee90e912d138409  daa2iso.zip



From cebbert at fedoraproject.org  Mon Aug 17 19:00:45 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 19:00:45 +0000 (UTC)
Subject: rpms/kernel/devel Makefile.config, 1.72, 1.73 kernel.spec, 1.1722, 
	1.1723 config-powerpc64-kdump, 1.1, NONE
Message-ID: <20090817190045.5E89611C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22137

Modified Files:
	Makefile.config kernel.spec 
Removed Files:
	config-powerpc64-kdump 
Log Message:
Stop generating the (unused) ppc64-kdump.config file.


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- Makefile.config	12 Aug 2009 02:27:23 -0000	1.72
+++ Makefile.config	17 Aug 2009 19:00:45 -0000	1.73
@@ -11,7 +11,7 @@ CONFIGFILES	= \
 	$(CFG)-s390x.config $(CFG)-arm.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-sparc64.config  \
-	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ppc64-debug.config \
+	$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ia64.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
@@ -86,9 +86,6 @@ kernel-$(VERSION)-sparc64.config: /dev/n
 kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic
 	perl merge.pl $^ powerpc > $@
 
-kernel-$(VERSION)-ppc64-kdump.config: config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
-	perl merge.pl $^ powerpc > $@
-
 kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generic
 	perl merge.pl $^ powerpc > $@
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1722
retrieving revision 1.1723
diff -u -p -r1.1722 -r1.1723
--- kernel.spec	17 Aug 2009 18:33:39 -0000	1.1722
+++ kernel.spec	17 Aug 2009 19:00:45 -0000	1.1723
@@ -1969,6 +1969,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com>
+- Stop generating the (unused) ppc64-kdump.config file.
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com>
 - Add new lirc driver for built-in ENE0100 device on some laptops
 


--- config-powerpc64-kdump DELETED ---



From spot at fedoraproject.org  Mon Aug 17 18:35:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 18:35:46 +0000 (UTC)
Subject: rpms/bpg-fonts/devel bpg-fonts-excelsior-fontconfig.conf, NONE,
	1.1 .cvsignore, 1.2, 1.3 bpg-fonts.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090817183546.A1B6211C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/bpg-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16025

Modified Files:
	.cvsignore bpg-fonts.spec sources 
Added Files:
	bpg-fonts-excelsior-fontconfig.conf 
Log Message:
add BPG Excelsior font


--- NEW FILE bpg-fonts-excelsior-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>BPG Excelsior GPL&#38;GNU</family>
    </prefer>
  </alias>
  <alias>
    <family>BPG Excelsior GPL&#38;GNU</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bpg-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Feb 2009 15:04:38 -0000	1.2
+++ .cvsignore	17 Aug 2009 18:35:46 -0000	1.3
@@ -1 +1,2 @@
 BPG_GPL_and_GNU_Fonts.zip
+BPG_Excelsior_GPL_and_GNU.zip


Index: bpg-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bpg-fonts/devel/bpg-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bpg-fonts.spec	24 Jul 2009 18:23:42 -0000	1.2
+++ bpg-fonts.spec	17 Aug 2009 18:35:46 -0000	1.3
@@ -8,7 +8,7 @@
 Name:		%{fontname}-fonts
 Summary: 	Georgian Unicode fonts
 Version:	%{common_ver}
-Release:	6%{?dist}
+Release:	7%{?dist}
 # Font exception
 # See: http://groups.google.com/group/bpg-fonts/web/gpl-gnu-license
 # No version of the GPL is specified.
@@ -34,6 +34,11 @@ Source12:	%{name}-sans-modern-fontconfig
 Source13:	%{name}-sans-regular-fontconfig.conf
 Source14:	%{name}-serif-fontconfig.conf
 Source15:	%{name}-serif-modern-fontconfig.conf
+# The source for this one is buried in javascript garbage:
+# http://cid-2b325d7bf5367fe3.skydrive.live.com/self.aspx/Fonts%20%E1%83%A4%E1%83%9D%E1%83%9C%E1%83%A2%E1%83%94%E1%83%91%E1%83%98/GPL%20|0%20GNU%20Fonts/BPG|_Excelsior|_GPL|0GNU.zip
+# Also, I renamed it to remove the &
+Source16:	BPG_Excelsior_GPL_and_GNU.zip
+Source17:	%{name}-excelsior-fontconfig.conf
 URL:		http://groups.google.com/group/bpg-fonts
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fontpackages-devel
@@ -117,6 +122,20 @@ This package contains the Elite font fam
 
 %_font_pkg -n elite -f %{fontconf}-elite.conf "BPG_Elite*.ttf"
 
+%package -n %{fontname}-excelsior-fonts
+Summary:	Excelsior family of BPG Georgian fonts
+Version:	2.025
+Group:		User Interface/X
+Requires:	%{name}-common = %{common_ver}-%{release}
+License:	Bitstream Vera
+
+%description -n %{fontname}-excelsior-fonts
+%common_desc
+
+This package contains the Excelsior font family.
+
+%_font_pkg -n excelsior -f %{fontconf}-excelsior.conf "BPG_Excelsior*.ttf"
+
 %package -n %{fontname}-glaho-fonts
 Summary:	Glaho family of BPG Georgian fonts
 Version:	9.000
@@ -252,6 +271,7 @@ This package contains the Serif Modern f
 %prep
 %setup -q -c -n %{name}
 %{__unzip} -qqo "%{SOURCE0}"
+%{__unzip} -qqo "%{SOURCE16}"
 # correct end-of-line encoding
 sed -i 's/\r//' "Docs/BPG_GPL&GNU_Fonts.txt"
 
@@ -277,11 +297,12 @@ install -m 0644 -p %{SOURCE12} %{buildro
 install -m 0644 -p %{SOURCE13} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans-regular.conf
 install -m 0644 -p %{SOURCE14} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif.conf
 install -m 0644 -p %{SOURCE15} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif-modern.conf
+install -m 0644 -p %{SOURCE17} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-excelsior.conf
 
 for fontconf in %{fontconf}-algeti.conf %{fontconf}-chveulebrivi.conf %{fontconf}-courier.conf %{fontconf}-courier-s.conf\
 		%{fontconf}-elite.conf %{fontconf}-glaho.conf %{fontconf}-ingiri.conf %{fontconf}-nino-medium.conf\
 		%{fontconf}-nino-medium-cond.conf %{fontconf}-sans.conf %{fontconf}-sans-medium.conf %{fontconf}-sans-modern.conf\
-		%{fontconf}-sans-regular.conf %{fontconf}-serif.conf %{fontconf}-serif-modern.conf
+		%{fontconf}-sans-regular.conf %{fontconf}-serif.conf %{fontconf}-serif-modern.conf %{fontconf}-excelsior.conf
 do
 	ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
@@ -295,6 +316,9 @@ rm -rf %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20090205-7
+- add Excelsior font
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090205-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bpg-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Feb 2009 15:04:38 -0000	1.2
+++ sources	17 Aug 2009 18:35:46 -0000	1.3
@@ -1 +1,2 @@
 e6a20ce7171e40fe4fd77f4d97ac0efc  BPG_GPL_and_GNU_Fonts.zip
+22b5e45e226ba90b65bf654cc1c8605b  BPG_Excelsior_GPL_and_GNU.zip



From beekhof at fedoraproject.org  Mon Aug 17 19:14:09 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 17 Aug 2009 19:14:09 +0000 (UTC)
Subject: rpms/pacemaker/devel .cvsignore, 1.3, 1.4 pacemaker.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090817191409.89D0E11C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23392

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
Update to the released 1.0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Aug 2009 17:19:13 -0000	1.3
+++ .cvsignore	17 Aug 2009 19:14:09 -0000	1.4
@@ -1 +1 @@
-c9120a53a6ae.tar.bz2
+462f1569a437.tar.bz2


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pacemaker.spec	12 Aug 2009 17:19:13 -0000	1.2
+++ pacemaker.spec	17 Aug 2009 19:14:09 -0000	1.3
@@ -7,16 +7,17 @@
 # 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 1
 %global upstreamprefix Pacemaker-1-0-
-%global upstreamversion c9120a53a6ae
+%global upstreamversion 462f1569a437
 
 # Keep around for when/if required
-%global alphatag %{upstreamversion}.hg
+#global alphatag %{upstreamversion}.hg
 
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}7%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
@@ -24,6 +25,7 @@ Source0:	http://hg.clusterlabs.org/pacem
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
+Requires:	resource-agents
 
 # Required for core functionality
 BuildRequires:  automake autoconf libtool pkgconfig chrpath libtool-ltdl-devel
@@ -96,7 +98,7 @@ resource health.
 
 %build
 ./autogen.sh
-%{_configure} --localstatedir=%{_var} --enable-fatal-warnings=no 
+%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no 
 make %{_smp_mflags}
 
 %install
@@ -210,6 +212,14 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-1
+- Add dependancy on resource-agents
+- Use the version of the configure macro that supplies --prefix, --libdir, etc
+- Update the tarball from upstream to version 462f1569a437 (Pacemaker 1.0.5 final)
+  + High: Tools: crm_resource - Advertise --move instead of --migrate
+  + Medium: Extra: New node connectivity RA that uses system ping and attrd_updater
+  + Medium: crmd: Note that dc-deadtime can be used to mask the brokeness of some switches
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0.5-0.7.c9120a53a6ae.hg
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Aug 2009 17:19:13 -0000	1.3
+++ sources	17 Aug 2009 19:14:09 -0000	1.4
@@ -1 +1 @@
-acc5f83dbe09b508347a0b01bc9d0752  c9120a53a6ae.tar.bz2
+2206d439eccd8794353ee798849f448d  462f1569a437.tar.bz2



From overholt at fedoraproject.org  Mon Aug 17 19:18:43 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 17 Aug 2009 19:18:43 +0000 (UTC)
Subject: rpms/xmlrpc3/devel xmlrpc3.spec,1.14,1.15
Message-ID: <20090817191843.D0AAF11C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23884

Modified Files:
	xmlrpc3.spec 
Log Message:
* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.10
- Fixed URL (bug #354031)


Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xmlrpc3.spec	27 Jul 2009 08:12:32 -0000	1.14
+++ xmlrpc3.spec	17 Aug 2009 19:18:43 -0000	1.15
@@ -32,11 +32,11 @@
 
 Name:       xmlrpc3
 Version:    3.0
-Release:    4.9%{?dist}
+Release:    4.10%{?dist}
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
 Group:      Development/Libraries
-Url:        http://xml.apache.org/%{name}/
+Url:        http://ws.apache.org/xmlrpc/
 Source0:    http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-%{version}-src.tar.gz
 Source1:    %{name}-jpp-depmap.xml
 # FIXME:  file this upstream
@@ -228,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}-server-%{version}-sources.jar
 
 %changelog
+* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.10
+- Fixed URL (bug #354031)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-4.9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Aug 17 19:35:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 19:35:59 +0000 (UTC)
Subject: rpms/gambas2/F-10 gambas2.spec,1.13,1.14 sources,1.13,1.14
Message-ID: <20090817193559.285D111C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26428/F-10

Modified Files:
	gambas2.spec sources 
Log Message:
update to 2.15.2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/gambas2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gambas2.spec	10 Jul 2009 22:47:00 -0000	1.13
+++ gambas2.spec	17 Aug 2009 19:35:58 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.14.0
+Version:	2.15.2
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1574,6 +1574,12 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.15.2-1
+- update to 2.15.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14.0-1
 - update to 2.14.0
 - fix missing subpackages (bz 507496)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Jul 2009 22:47:00 -0000	1.13
+++ sources	17 Aug 2009 19:35:58 -0000	1.14
@@ -1 +1 @@
-bb63c4ef4925b808d502461daad7ac6e  gambas2-2.14.0.tar.bz2
+8231eaca85c32746a2d64a04a454a95f  gambas2-2.15.2.tar.bz2



From spot at fedoraproject.org  Mon Aug 17 19:35:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 19:35:59 +0000 (UTC)
Subject: rpms/gambas2/F-11 gambas2.spec,1.19,1.20 sources,1.14,1.15
Message-ID: <20090817193559.57C2611C0346@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26428/F-11

Modified Files:
	gambas2.spec sources 
Log Message:
update to 2.15.2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-11/gambas2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gambas2.spec	10 Jul 2009 22:47:01 -0000	1.19
+++ gambas2.spec	17 Aug 2009 19:35:59 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.14.0
+Version:	2.15.2
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1574,6 +1574,12 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.15.2-1
+- update to 2.15.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14.0-1
 - update to 2.14.0
 - fix missing subpackages (bz 507496)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Jul 2009 22:47:01 -0000	1.14
+++ sources	17 Aug 2009 19:35:59 -0000	1.15
@@ -1 +1 @@
-bb63c4ef4925b808d502461daad7ac6e  gambas2-2.14.0.tar.bz2
+8231eaca85c32746a2d64a04a454a95f  gambas2-2.15.2.tar.bz2



From spot at fedoraproject.org  Mon Aug 17 19:35:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 17 Aug 2009 19:35:59 +0000 (UTC)
Subject: rpms/gambas2/devel .cvsignore, 1.13, 1.14 gambas2.spec, 1.20,
	1.21 sources, 1.14, 1.15
Message-ID: <20090817193559.9453F11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26428/devel

Modified Files:
	.cvsignore gambas2.spec sources 
Log Message:
update to 2.15.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Jul 2009 22:47:01 -0000	1.13
+++ .cvsignore	17 Aug 2009 19:35:59 -0000	1.14
@@ -1 +1 @@
-gambas2-2.14.0.tar.bz2
+gambas2-2.15.2.tar.bz2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gambas2.spec	24 Jul 2009 23:28:57 -0000	1.20
+++ gambas2.spec	17 Aug 2009 19:35:59 -0000	1.21
@@ -1,7 +1,7 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.14.0
-Release:	2%{?dist}
+Version:	2.15.2
+Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
 URL:		http://gambas.sourceforge.net/
@@ -1574,6 +1574,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.15.2-1
+- update to 2.15.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.14.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Jul 2009 22:47:01 -0000	1.14
+++ sources	17 Aug 2009 19:35:59 -0000	1.15
@@ -1 +1 @@
-bb63c4ef4925b808d502461daad7ac6e  gambas2-2.14.0.tar.bz2
+8231eaca85c32746a2d64a04a454a95f  gambas2-2.15.2.tar.bz2



From diegobz at fedoraproject.org  Mon Aug 17 19:37:56 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 17 Aug 2009 19:37:56 +0000 (UTC)
Subject: rpms/django-authority/devel django-authority.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817193756.0985D11C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-authority/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26683/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-authority.spec import.log 
Log Message:
Initial import


--- NEW FILE django-authority.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-authority
Version:        0.3
Release:        2%{?dist}
Summary:        A Django app for generic per-object permissions and custom permission checks

Group:          Development/Languages
License:        BSD
URL:            http://bitbucket.org/jezdez/django-authority/
Source:         http://bitbucket.org/jezdez/django-authority/downloads/django-authority-0.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       Django

%description
This is a Django app for generic per-object permissions, custom permission
checks and permission requests. It also includes view decorators and template 
tags for ease of use.

%prep
%setup -q -n %{name}-%{version}
find . -name \*._* -exec rm {} +
find . -name \*.buildinfo* -exec rm {} +

%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 AUTHORS LICENSE README docs/build/html/
%{python_sitelib}/*

%changelog
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.3-2
- Clean up MAC OS hidden files
- Added only HTML built doc files from docs dir
- Added some missed doc files like AUTHORS
- Clean up .builinfo files

* Thu Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.3-1
- Initial RPM


--- NEW FILE import.log ---
django-authority-0_3-2_fc11:HEAD:django-authority-0.3-2.fc11.src.rpm:1250537702


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-authority/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:28:52 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:37:55 -0000	1.2
@@ -0,0 +1 @@
+django-authority-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-authority/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:28:52 -0000	1.1
+++ sources	17 Aug 2009 19:37:55 -0000	1.2
@@ -0,0 +1 @@
+68b70aae6fb7738340aa9172236a235b  django-authority-0.3.tar.gz



From drago01 at fedoraproject.org  Mon Aug 17 19:41:38 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 17 Aug 2009 19:41:38 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore, 1.10, 1.11 iw.spec, 1.14, 1.15 sources,
	1.10, 1.11
Message-ID: <20090817194138.2F1FB11C00E4@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27284

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
update to 0.9.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Jul 2009 08:58:14 -0000	1.10
+++ .cvsignore	17 Aug 2009 19:41:37 -0000	1.11
@@ -1 +1 @@
-iw-0.9.15.tar.bz2
+iw-0.9.16.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- iw.spec	25 Jul 2009 03:43:18 -0000	1.14
+++ iw.spec	17 Aug 2009 19:41:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           iw
-Version:        0.9.15
-Release:        2%{?dist}
+Version:        0.9.16
+Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Jul 2009 08:58:15 -0000	1.10
+++ sources	17 Aug 2009 19:41:37 -0000	1.11
@@ -1 +1 @@
-98ba12eceec5a4ae8aa2d51abd56fa14  iw-0.9.15.tar.bz2
+775f8d1856b0856acbfc960fafe48325  iw-0.9.16.tar.bz2



From diegobz at fedoraproject.org  Mon Aug 17 19:43:02 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 17 Aug 2009 19:43:02 +0000 (UTC)
Subject: rpms/django-authority/F-11 django-authority.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817194302.47FF111C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-authority/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27581/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-authority.spec import.log 
Log Message:
Initial import


--- NEW FILE django-authority.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-authority
Version:        0.3
Release:        2%{?dist}
Summary:        A Django app for generic per-object permissions and custom permission checks

Group:          Development/Languages
License:        BSD
URL:            http://bitbucket.org/jezdez/django-authority/
Source:         http://bitbucket.org/jezdez/django-authority/downloads/django-authority-0.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       Django

%description
This is a Django app for generic per-object permissions, custom permission
checks and permission requests. It also includes view decorators and template 
tags for ease of use.

%prep
%setup -q -n %{name}-%{version}
find . -name \*._* -exec rm {} +
find . -name \*.buildinfo* -exec rm {} +

%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 AUTHORS LICENSE README docs/build/html/
%{python_sitelib}/*

%changelog
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.3-2
- Clean up MAC OS hidden files
- Added only HTML built doc files from docs dir
- Added some missed doc files like AUTHORS
- Clean up .builinfo files

* Thu Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.3-1
- Initial RPM


--- NEW FILE import.log ---
django-authority-0_3-2_fc11:F-11:django-authority-0.3-2.fc11.src.rpm:1250538254


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-authority/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:28:52 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:43:02 -0000	1.2
@@ -0,0 +1 @@
+django-authority-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-authority/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:28:52 -0000	1.1
+++ sources	17 Aug 2009 19:43:02 -0000	1.2
@@ -0,0 +1 @@
+68b70aae6fb7738340aa9172236a235b  django-authority-0.3.tar.gz



From robert at fedoraproject.org  Mon Aug 17 19:46:33 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 19:46:33 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/EL-5 rubygem-fastercsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817194633.B491011C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28088/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-fastercsv.spec 
Log Message:
Initial import of rubygem-fastercsv



--- NEW FILE rubygem-fastercsv.spec ---
%{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_abiver:	%global ruby_abiver	%((echo "1.8"; ruby -rrbconfig -e "puts Config::CONFIG['ruby_version']" 2>/dev/null) | tail -1)}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname fastercsv
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	Faster, smaller and cleaner replacement to standard CSV library
Name:		rubygem-%{gemname}
Version:	1.5.0
Release:	2%{?dist}
License:	GPLv2 or Ruby
Group:		Development/Languages
URL:		http://fastercsv.rubyforge.org/
Source:		http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Requires:	ruby(abi) = %{ruby_abiver}, rubygems
Provides:	rubygem(%{gemname}) = %{version}
BuildRequires:	rubygems
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
FasterCSV is intended as a complete replacement to the CSV standard library.
It is significantly faster and smaller while still being pure Ruby code. It
also strives for a better interface.

%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}

# Find files with a shebang that do not have executable permissions
for file in $(find $RPM_BUILD_ROOT%{geminstdir} -type f ! -perm /a+x -name "*.rb"); do
  if [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ]; then
    sed -e 's@/usr/local/bin/ruby@%{_bindir}/ruby at g' -i $file
    chmod -v 755 $file
  fi
done

%check
ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%dir %{gemdir}/gems/%{gemname}-%{version}/
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/INSTALL
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%{geminstdir}/Rakefile
%{geminstdir}/examples/
%{geminstdir}/lib/
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Aug 09 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-2
- Added missing requirement to ruby(abi) = version (#514928 #c1)
- Switched from defines to globals, updated summary in spec file
- Corrected license tag and removed duplicates in docs (#514928)

* Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-1
- Upgrade to 1.5.0
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:19:55 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:46:33 -0000	1.2
@@ -0,0 +1 @@
+fastercsv-1.5.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:19:55 -0000	1.1
+++ sources	17 Aug 2009 19:46:33 -0000	1.2
@@ -0,0 +1 @@
+f671013ecea1a9a333884298e762cddf  fastercsv-1.5.0.gem



From robert at fedoraproject.org  Mon Aug 17 19:46:34 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 19:46:34 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/F-11 rubygem-fastercsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817194634.1F63411C0381@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28088/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-fastercsv.spec 
Log Message:
Initial import of rubygem-fastercsv



--- NEW FILE rubygem-fastercsv.spec ---
%{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_abiver:	%global ruby_abiver	%((echo "1.8"; ruby -rrbconfig -e "puts Config::CONFIG['ruby_version']" 2>/dev/null) | tail -1)}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname fastercsv
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	Faster, smaller and cleaner replacement to standard CSV library
Name:		rubygem-%{gemname}
Version:	1.5.0
Release:	2%{?dist}
License:	GPLv2 or Ruby
Group:		Development/Languages
URL:		http://fastercsv.rubyforge.org/
Source:		http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Requires:	ruby(abi) = %{ruby_abiver}, rubygems
Provides:	rubygem(%{gemname}) = %{version}
BuildRequires:	rubygems
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
FasterCSV is intended as a complete replacement to the CSV standard library.
It is significantly faster and smaller while still being pure Ruby code. It
also strives for a better interface.

%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}

# Find files with a shebang that do not have executable permissions
for file in $(find $RPM_BUILD_ROOT%{geminstdir} -type f ! -perm /a+x -name "*.rb"); do
  if [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ]; then
    sed -e 's@/usr/local/bin/ruby@%{_bindir}/ruby at g' -i $file
    chmod -v 755 $file
  fi
done

%check
ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%dir %{gemdir}/gems/%{gemname}-%{version}/
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/INSTALL
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%{geminstdir}/Rakefile
%{geminstdir}/examples/
%{geminstdir}/lib/
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Aug 09 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-2
- Added missing requirement to ruby(abi) = version (#514928 #c1)
- Switched from defines to globals, updated summary in spec file
- Corrected license tag and removed duplicates in docs (#514928)

* Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-1
- Upgrade to 1.5.0
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:19:55 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:46:33 -0000	1.2
@@ -0,0 +1 @@
+fastercsv-1.5.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:19:55 -0000	1.1
+++ sources	17 Aug 2009 19:46:34 -0000	1.2
@@ -0,0 +1 @@
+f671013ecea1a9a333884298e762cddf  fastercsv-1.5.0.gem



From robert at fedoraproject.org  Mon Aug 17 19:46:33 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 19:46:33 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/F-10 rubygem-fastercsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817194633.DDED611C0346@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28088/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-fastercsv.spec 
Log Message:
Initial import of rubygem-fastercsv



--- NEW FILE rubygem-fastercsv.spec ---
%{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_abiver:	%global ruby_abiver	%((echo "1.8"; ruby -rrbconfig -e "puts Config::CONFIG['ruby_version']" 2>/dev/null) | tail -1)}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname fastercsv
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	Faster, smaller and cleaner replacement to standard CSV library
Name:		rubygem-%{gemname}
Version:	1.5.0
Release:	2%{?dist}
License:	GPLv2 or Ruby
Group:		Development/Languages
URL:		http://fastercsv.rubyforge.org/
Source:		http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Requires:	ruby(abi) = %{ruby_abiver}, rubygems
Provides:	rubygem(%{gemname}) = %{version}
BuildRequires:	rubygems
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
FasterCSV is intended as a complete replacement to the CSV standard library.
It is significantly faster and smaller while still being pure Ruby code. It
also strives for a better interface.

%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}

# Find files with a shebang that do not have executable permissions
for file in $(find $RPM_BUILD_ROOT%{geminstdir} -type f ! -perm /a+x -name "*.rb"); do
  if [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ]; then
    sed -e 's@/usr/local/bin/ruby@%{_bindir}/ruby at g' -i $file
    chmod -v 755 $file
  fi
done

%check
ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%dir %{gemdir}/gems/%{gemname}-%{version}/
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/INSTALL
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%{geminstdir}/Rakefile
%{geminstdir}/examples/
%{geminstdir}/lib/
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Aug 09 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-2
- Added missing requirement to ruby(abi) = version (#514928 #c1)
- Switched from defines to globals, updated summary in spec file
- Corrected license tag and removed duplicates in docs (#514928)

* Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-1
- Upgrade to 1.5.0
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:19:55 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:46:33 -0000	1.2
@@ -0,0 +1 @@
+fastercsv-1.5.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:19:55 -0000	1.1
+++ sources	17 Aug 2009 19:46:33 -0000	1.2
@@ -0,0 +1 @@
+f671013ecea1a9a333884298e762cddf  fastercsv-1.5.0.gem



From robert at fedoraproject.org  Mon Aug 17 19:46:34 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 19:46:34 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/devel rubygem-fastercsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817194634.5B8DD11C0416@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28088/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-fastercsv.spec 
Log Message:
Initial import of rubygem-fastercsv



--- NEW FILE rubygem-fastercsv.spec ---
%{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_abiver:	%global ruby_abiver	%((echo "1.8"; ruby -rrbconfig -e "puts Config::CONFIG['ruby_version']" 2>/dev/null) | tail -1)}

%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname fastercsv
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	Faster, smaller and cleaner replacement to standard CSV library
Name:		rubygem-%{gemname}
Version:	1.5.0
Release:	2%{?dist}
License:	GPLv2 or Ruby
Group:		Development/Languages
URL:		http://fastercsv.rubyforge.org/
Source:		http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Requires:	ruby(abi) = %{ruby_abiver}, rubygems
Provides:	rubygem(%{gemname}) = %{version}
BuildRequires:	rubygems
BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
FasterCSV is intended as a complete replacement to the CSV standard library.
It is significantly faster and smaller while still being pure Ruby code. It
also strives for a better interface.

%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}

# Find files with a shebang that do not have executable permissions
for file in $(find $RPM_BUILD_ROOT%{geminstdir} -type f ! -perm /a+x -name "*.rb"); do
  if [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ]; then
    sed -e 's@/usr/local/bin/ruby@%{_bindir}/ruby at g' -i $file
    chmod -v 755 $file
  fi
done

%check
ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%dir %{gemdir}/gems/%{gemname}-%{version}/
%doc %{geminstdir}/AUTHORS
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/INSTALL
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%{geminstdir}/Rakefile
%{geminstdir}/examples/
%{geminstdir}/lib/
%{geminstdir}/setup.rb
%{geminstdir}/test/

%changelog
* Sun Aug 09 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-2
- Added missing requirement to ruby(abi) = version (#514928 #c1)
- Switched from defines to globals, updated summary in spec file
- Corrected license tag and removed duplicates in docs (#514928)

* Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.5.0-1
- Upgrade to 1.5.0
- Initial spec file for Fedora and Red Hat Enterprise Linux


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:19:55 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:46:34 -0000	1.2
@@ -0,0 +1 @@
+fastercsv-1.5.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:19:55 -0000	1.1
+++ sources	17 Aug 2009 19:46:34 -0000	1.2
@@ -0,0 +1 @@
+f671013ecea1a9a333884298e762cddf  fastercsv-1.5.0.gem



From diegobz at fedoraproject.org  Mon Aug 17 19:48:16 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 17 Aug 2009 19:48:16 +0000 (UTC)
Subject: rpms/django-authority/EL-5 django-authority.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817194816.6FD5511C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-authority/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28524/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-authority.spec import.log 
Log Message:
Initial import


--- NEW FILE django-authority.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-authority
Version:        0.3
Release:        2%{?dist}
Summary:        A Django app for generic per-object permissions and custom permission checks

Group:          Development/Languages
License:        BSD
URL:            http://bitbucket.org/jezdez/django-authority/
Source:         http://bitbucket.org/jezdez/django-authority/downloads/django-authority-0.3.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       Django

%description
This is a Django app for generic per-object permissions, custom permission
checks and permission requests. It also includes view decorators and template 
tags for ease of use.

%prep
%setup -q -n %{name}-%{version}
find . -name \*._* -exec rm {} +
find . -name \*.buildinfo* -exec rm {} +

%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 AUTHORS LICENSE README docs/build/html/
%{python_sitelib}/*

%changelog
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.3-2
- Clean up MAC OS hidden files
- Added only HTML built doc files from docs dir
- Added some missed doc files like AUTHORS
- Clean up .builinfo files

* Thu Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.3-1
- Initial RPM


--- NEW FILE import.log ---
django-authority-0_3-2_fc11:EL-5:django-authority-0.3-2.fc11.src.rpm:1250538551


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-authority/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:28:52 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:48:15 -0000	1.2
@@ -0,0 +1 @@
+django-authority-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-authority/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:28:52 -0000	1.1
+++ sources	17 Aug 2009 19:48:16 -0000	1.2
@@ -0,0 +1 @@
+68b70aae6fb7738340aa9172236a235b  django-authority-0.3.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 17 19:48:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:48:47 +0000
Subject: [pkgdb] aqute-bndlib: overholt has requested commit
Message-ID: <20090817194847.9DD8510F857@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:48:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:48:47 +0000
Subject: [pkgdb] aqute-bndlib: overholt has requested approveacls
Message-ID: <20090817194848.6DDB310F87A@bastion2.fedora.phx.redhat.com>

overholt has requested the approveacls acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:48:49 +0000
Subject: [pkgdb] aqute-bndlib: overholt has requested watchcommits
Message-ID: <20090817194849.51CD310F888@bastion2.fedora.phx.redhat.com>

overholt has requested the watchcommits acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:48:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:48:50 +0000
Subject: [pkgdb] aqute-bndlib: overholt has requested watchbugzilla
Message-ID: <20090817194850.EAF9410F895@bastion2.fedora.phx.redhat.com>

overholt has requested the watchbugzilla acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:49:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:49:15 +0000
Subject: [pkgdb] plexus-classworlds: overholt has requested watchcommits
Message-ID: <20090817194916.ACEEC10F865@bastion2.fedora.phx.redhat.com>

overholt has requested the watchcommits acl on plexus-classworlds (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-classworlds



From pkgdb at fedoraproject.org  Mon Aug 17 19:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:49:19 +0000
Subject: [pkgdb] plexus-classworlds: overholt has requested commit
Message-ID: <20090817194921.88BB510F8A1@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on plexus-classworlds (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-classworlds



From pkgdb at fedoraproject.org  Mon Aug 17 19:49:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:49:23 +0000
Subject: [pkgdb] plexus-classworlds: overholt has requested approveacls
Message-ID: <20090817194925.357DC10F8A6@bastion2.fedora.phx.redhat.com>

overholt has requested the approveacls acl on plexus-classworlds (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-classworlds



From pkgdb at fedoraproject.org  Mon Aug 17 19:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:50:00 +0000
Subject: [pkgdb] plexus-containers: overholt has requested commit
Message-ID: <20090817195000.CE72E10F85B@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on plexus-containers (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-containers



From pkgdb at fedoraproject.org  Mon Aug 17 19:50:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:50:44 +0000
Subject: [pkgdb] dumbster: overholt has requested commit
Message-ID: <20090817195044.8169B10F888@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on dumbster (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Mon Aug 17 19:51:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:51:08 +0000
Subject: [pkgdb] directory-naming: overholt has requested commit
Message-ID: <20090817195109.1930610F881@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on directory-naming (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From davej at fedoraproject.org  Mon Aug 17 19:51:11 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 17 Aug 2009 19:51:11 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1109, 1.1110 kernel.spec, 1.1723, 1.1724 sources, 1.1067,
	1.1068 upstream, 1.981, 1.982
Message-ID: <20090817195111.3B7E611C00E4@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28956

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc6-git2.bz2.sign 
Log Message:
2.6.31-rc6-git2


--- NEW FILE patch-2.6.31-rc6-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKiKCDyGugalF9Dw4RAm4OAJwNTFnNlLch9Wcj25j3Y2D9RkAW0gCePGYR
/ySWeeT+JPotW0QT/hD3Xog=
=tmkV
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1109
retrieving revision 1.1110
diff -u -p -r1.1109 -r1.1110
--- .cvsignore	14 Aug 2009 17:50:37 -0000	1.1109
+++ .cvsignore	17 Aug 2009 19:51:10 -0000	1.1110
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
+patch-2.6.31-rc6-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1723
retrieving revision 1.1724
diff -u -p -r1.1723 -r1.1724
--- kernel.spec	17 Aug 2009 19:00:45 -0000	1.1723
+++ kernel.spec	17 Aug 2009 19:51:10 -0000	1.1724
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -111,7 +111,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1969,6 +1969,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Dave Jones <davej at redhat.com> 2.6.31-0.161.rc6.git2
+- 2.6.31-rc6-git2
+
 * Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com>
 - Stop generating the (unused) ppc64-kdump.config file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1067
retrieving revision 1.1068
diff -u -p -r1.1067 -r1.1068
--- sources	14 Aug 2009 17:50:38 -0000	1.1067
+++ sources	17 Aug 2009 19:51:10 -0000	1.1068
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
+10f2368eb42af734a8b586628cafa1d9  patch-2.6.31-rc6-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -p -r1.981 -r1.982
--- upstream	14 Aug 2009 17:50:38 -0000	1.981
+++ upstream	17 Aug 2009 19:51:11 -0000	1.982
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
+patch-2.6.31-rc6-git2.bz2



From pkgdb at fedoraproject.org  Mon Aug 17 19:51:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:51:53 +0000
Subject: [pkgdb] jakarta-commons-jxpath: overholt has requested commit
Message-ID: <20090817195154.3497410F85A@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on jakarta-commons-jxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:01 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090817195202.6A7FE10F888@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on aqute-bndlib (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:06 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090817195207.A9AFB10F8B1@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on aqute-bndlib (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:04 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090817195205.D698610F8A5@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on aqute-bndlib (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:05 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090817195206.DC26B10F898@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on aqute-bndlib (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:13 +0000
Subject: [pkgdb] jakarta-commons-configuration: overholt has requested commit
Message-ID: <20090817195214.E637710F890@bastion2.fedora.phx.redhat.com>

overholt has requested the commit acl on jakarta-commons-configuration (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:30 +0000
Subject: [pkgdb] plexus-classworlds had acl change status
Message-ID: <20090817195231.28C2210F86F@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on plexus-classworlds (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-classworlds



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:31 +0000
Subject: [pkgdb] plexus-classworlds had acl change status
Message-ID: <20090817195233.0052310F8A3@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on plexus-classworlds (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-classworlds



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:32 +0000
Subject: [pkgdb] plexus-classworlds had acl change status
Message-ID: <20090817195233.2AC9A10F8A6@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on plexus-classworlds (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-classworlds



From pkgdb at fedoraproject.org  Mon Aug 17 19:52:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:52:56 +0000
Subject: [pkgdb] plexus-containers had acl change status
Message-ID: <20090817195258.1420E10F8B7@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on plexus-containers (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-containers



From pkgdb at fedoraproject.org  Mon Aug 17 19:54:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:54:08 +0000
Subject: [pkgdb] dumbster had acl change status
Message-ID: <20090817195411.7390D10F8B0@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on dumbster (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Mon Aug 17 19:54:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:54:29 +0000
Subject: [pkgdb] directory-naming had acl change status
Message-ID: <20090817195429.77AA710F85B@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on directory-naming (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Mon Aug 17 19:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:54:31 +0000
Subject: [pkgdb] jakarta-commons-jxpath had acl change status
Message-ID: <20090817195431.9A02310F8A6@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jakarta-commons-jxpath (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Mon Aug 17 19:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 17 Aug 2009 19:54:47 +0000
Subject: [pkgdb] jakarta-commons-configuration had acl change status
Message-ID: <20090817195448.2AC1E10F897@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jakarta-commons-configuration (Fedora devel) to Approved for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From davej at fedoraproject.org  Mon Aug 17 19:55:58 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 17 Aug 2009 19:55:58 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1724,1.1725
Message-ID: <20090817195558.5727911C00E4@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29859

Modified Files:
	kernel.spec 
Log Message:
begone powerpc64-kdump


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -p -r1.1724 -r1.1725
--- kernel.spec	17 Aug 2009 19:51:10 -0000	1.1724
+++ kernel.spec	17 Aug 2009 19:55:58 -0000	1.1725
@@ -531,7 +531,6 @@ Source50: config-powerpc-generic
 Source51: config-powerpc32-generic
 Source52: config-powerpc32-smp
 Source53: config-powerpc64
-Source54: config-powerpc64-kdump
 
 Source60: config-ia64-generic
 



From toshio at fedoraproject.org  Mon Aug 17 19:55:11 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 19:55:11 +0000 (UTC)
Subject: rpms/python-sphinx/devel .cvsignore, 1.7, 1.8 python-sphinx.spec,
	1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090817195511.0BE8611C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29588

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.2-1
- Update to 0.6.2 -- upstream bugfix requested inside bz#512438



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Apr 2009 19:44:05 -0000	1.7
+++ .cvsignore	17 Aug 2009 19:55:10 -0000	1.8
@@ -1 +1 @@
-Sphinx-0.6.1.tar.gz
+Sphinx-0.6.2.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/python-sphinx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-sphinx.spec	26 Jul 2009 23:08:02 -0000	1.13
+++ python-sphinx.spec	17 Aug 2009 19:55:10 -0000	1.14
@@ -4,8 +4,8 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.6.1
-Release:        3%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        Python documentation generator
 
 Group:          Development/Tools
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Apr 2009 19:44:06 -0000	1.7
+++ sources	17 Aug 2009 19:55:10 -0000	1.8
@@ -1 +1 @@
-fa1a32c406232a96a776de7dfae15032  Sphinx-0.6.1.tar.gz
+c8f79e171addc73342cc2e775dc78880  Sphinx-0.6.2.tar.gz



From diegobz at fedoraproject.org  Mon Aug 17 19:59:48 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 17 Aug 2009 19:59:48 +0000 (UTC)
Subject: rpms/django-profile/devel django-profile.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817195948.3C23111C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-profile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31326/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-profile.spec import.log 
Log Message:
Initial import


--- NEW FILE django-profile.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define vcsdate 20090813
%define vcstag r420

Name:           django-profile
Version:        0.6
Release:        0.2.%{vcsdate}svn%{vcstag}%{?dist}
Summary:        Django pluggable user profile zone

Group:          Development/Languages
License:        BSD
URL:            http://code.google.com/p/django-profile/
# svn export -%{vcstag} http://django-profile.googlecode.com/svn/trunk/ django-profile-%{version}-%{vcshatag}
# tar zcf django-profile-%{version}-%{vcstag}.tar.gz django-profile-%{version}-%{vcstag} 
Source:         django-profile-%{version}-%{vcstag}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django python-imaging

%description
This is a user private zone/profile management application, allowing
the user to take control of his account and insert information about
him in his profile.

Inside this package you will find a demo application which will show
you what can be accomplished with the rest of the utilities included
in the package.

%prep
%setup -q -n %{name}-%{version}-%{vcstag}

%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 INSTALL.txt CHANGELOG.txt LICENSE.txt README.txt TODO.txt demo/
%{python_sitelib}/*
%exclude %{python_sitelib}/demo

%changelog
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.2.20090813svnr420
- Added docs
- Fixed version in the previous changelog
- Fixed License to BSD based on the LICENSE.txt file
- Moved demo app to docs
- Excluded demo app from python path

* Thu Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.1.20090813svnr420
- Initial RPM


--- NEW FILE import.log ---
django-profile-0_6-0_2_20090813svnr420_fc11:HEAD:django-profile-0.6-0.2.20090813svnr420.fc11.src.rpm:1250539160


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-profile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:27:57 -0000	1.1
+++ .cvsignore	17 Aug 2009 19:59:47 -0000	1.2
@@ -0,0 +1 @@
+django-profile-0.6-r420.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-profile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:27:57 -0000	1.1
+++ sources	17 Aug 2009 19:59:47 -0000	1.2
@@ -0,0 +1 @@
+9ff2ba8df5bc8a9517c7f3f36cc7b9ff  django-profile-0.6-r420.tar.gz



From overholt at fedoraproject.org  Mon Aug 17 20:00:26 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 17 Aug 2009 20:00:26 +0000 (UTC)
Subject: rpms/aqute-bndlib/devel aQute-bndlib-Filter.patch, 1.1,
	1.2 aqute-bndlib.spec, 1.1, 1.2 bnd-0.0.203.pom, 1.1,
	1.2 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817200026.4899B11C034A@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aQute-bndlib-Filter.patch aqute-bndlib.spec bnd-0.0.203.pom 
	import.log 
Log Message:
Initial import (#500245).

aQute-bndlib-Filter.patch:
 Filter.java |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Index: aQute-bndlib-Filter.patch
===================================================================
RCS file: aQute-bndlib-Filter.patch
diff -N aQute-bndlib-Filter.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aQute-bndlib-Filter.patch	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1,38 @@
+--- src/main/java/aQute/lib/filter/Filter.java.sav0	2007-07-31 16:39:46.000000000 +0200
++++ src/main/java/aQute/lib/filter/Filter.java	2007-12-21 17:50:24.000000000 +0100
+@@ -190,17 +190,17 @@
+ 				} else if (numClass == Character.class) {
+ 					return compareString(obj.toString(), op, s);
+ 				} else if (numClass == Long.class) {
+-					return compareSign(op, Long.valueOf(s).compareTo(obj));
++					return compareSign(op, Long.valueOf(s).compareTo((Long)obj));
+ 				} else if (numClass == Integer.class) {
+-					return compareSign(op, Integer.valueOf(s).compareTo(obj));
++					return compareSign(op, Integer.valueOf(s).compareTo((Integer)obj));
+ 				} else if (numClass == Short.class) {
+-					return compareSign(op, Short.valueOf(s).compareTo(obj));
++					return compareSign(op, Short.valueOf(s).compareTo((Short)obj));
+ 				} else if (numClass == Byte.class) {
+-					return compareSign(op, Byte.valueOf(s).compareTo(obj));
++					return compareSign(op, Byte.valueOf(s).compareTo((Byte)obj));
+ 				} else if (numClass == Double.class) {
+-					return compareSign(op, Double.valueOf(s).compareTo(obj));
++					return compareSign(op, Double.valueOf(s).compareTo((Double)obj));
+ 				} else if (numClass == Float.class) {
+-					return compareSign(op, Float.valueOf(s).compareTo(obj));
++					return compareSign(op, Float.valueOf(s).compareTo((Float)obj));
+ 				} else if (numClass == Boolean.class) {
+ 					if (op != EQ)
+ 						return false;
+@@ -208,9 +208,9 @@
+ 					int b = ((Boolean) obj).booleanValue() ? 1 : 0;
+ 					return compareSign(op, a - b);
+ 				} else if (numClass == BigInteger.class) {
+-					return compareSign(op, new BigInteger(s).compareTo(obj));
++					return compareSign(op, new BigInteger(s).compareTo((BigInteger)obj));
+ 				} else if (numClass == BigDecimal.class) {
+-					return compareSign(op, new BigDecimal(s).compareTo(obj));
++					return compareSign(op, new BigDecimal(s).compareTo((BigDecimal)obj));
+ 				} else if (obj instanceof Vector) {
+ 					for (Enumeration e = ((Vector) obj).elements();
+ 						e.hasMoreElements();


Index: aqute-bndlib.spec
===================================================================
RCS file: aqute-bndlib.spec
diff -N aqute-bndlib.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aqute-bndlib.spec	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1,208 @@
+# Copyright (c) 2000-2008, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define section   free
+
+Name:           aqute-bndlib
+Version:        0.0.203
+Release:        4%{?dist}
+Epoch:          0
+Summary:        BND Library
+License:        ASL 2.0
+Group:          Development/Java
+URL:            http://www.aQute.biz/Code/Bnd
+Source0:        http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.jar
+Source1:        http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.pom
+Patch0:         aQute-bndlib-Filter.patch
+
+
+%if %{gcj_support}
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+
+
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  jpackage-utils >= 0:1.7.2
+BuildRequires:  java-devel >= 0:1.5.0
+BuildRequires:  ant >= 0:1.6.5
+#BuildRequires:  ecj
+BuildRequires:  eclipse-ecj
+BuildRequires:  eclipse-platform
+BuildRequires:  eclipse-rcp
+BuildRequires:  eclipse-jdt
+
+Requires:  java >= 0:1.5.0
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
+
+%description
+The bnd tool helps you create and diagnose OSGi R4 bundles.
+The key functions are: 
+- Show the manifest and JAR contents of a bundle 
+- Wrap a JAR so that it becomes a bundle 
+- Create a Bundle from a specification and a class path 
+- Verify the validity of the manifest entries 
+The tool is capable of acting as: 
+- Command line tool 
+- File format 
+- Directives 
+- Use of macros 
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
+
+%description javadoc
+Javadoc for %{name}.
+
+
+%prep
+%setup -q -c
+mkdir -p target/site/apidocs/
+mkdir -p target/classes/
+mkdir -p src/main/
+mv OSGI-OPT/src src/main/java
+%patch0 -b .sav0
+
+%build
+export LANG=en_US.utf8
+export OPT_JAR_LIST=:
+export CLASSPATH=$(build-classpath ant)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi.services_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.jface_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.jobs_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.swt.*.jar)
+
+%{javac} -d target/classes $(find src/main/java -type f -name "*.java")
+%{javadoc} -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter
+cp -p LICENSE maven-dependencies.txt plugin.xml pom.xml target/classes
+for f in $(find aQute/ -type f -not -name "*.class"); do
+    cp -p $f target/classes/$f
+done
+pushd target/classes
+%{jar} cmf ../../META-INF/MANIFEST.MF ../%{name}-%{version}.jar *
+popd
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%add_to_maven_depmap biz.aQute bndlib %{version} JPP %{name}
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
+# pom
+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}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%files
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_datadir}/maven2/poms/JPP-aqute-bndlib.pom
+%{_mavendepmapfragdir}/aqute-bndlib
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so
+%endif
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+
+%changelog
+* Fri Mar 20 2009 Yong Yang <yyang at redhat.com> 0.0.203-4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
+- merge from JPP-6
+
+* Tue Jan 15 2009 David Walluck <dwalluck at redhat.com> 0:0.0.203-3
+- fix build
+
+* Thu Jan 15 2009 Yong Yang <yyang at redhat.com> 0.0.203-3jpp.1
+- Imported from dbhole's maven 2.0.8 packages, initial building
+
+* Tue Mar 11 2008 Deepak Bhole <dbhole at redhat.com> 0.0.203-2jpp.1
+- Import from JPackage + change per Fedora requirements
+
+* Thu Feb 14 2008 Ralph Apel <r.apel at r-apel.de> - 0:0.0.203-2jpp
+- Add several non class files to jar
+
+* Mon Jan 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:0.0.203-1jpp
+- First release
+


Index: bnd-0.0.203.pom
===================================================================
RCS file: bnd-0.0.203.pom
diff -N bnd-0.0.203.pom
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bnd-0.0.203.pom	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1,22 @@
+<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>biz.aQute</groupId>
+  <artifactId>bnd</artifactId>
+  <version>0.0.203</version>
+  <description>
+    A utility and plugin to wrap, build, or print bundles
+  </description>
+  <name>aQute Bundle Tool</name>
+  <url>http://www.aQute.biz/Code/Bnd</url>
+  <organization>
+    <name>aQute SARL</name>
+    <url>http://www.aQute.biz</url>
+  </organization>
+  <licenses>
+    <license>
+    <name>This material is licensed under the Apache Software License, Version 2.0</name>
+    <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    <distribution>repo</distribution>
+    </license>
+  </licenses>
+</project>


--- NEW FILE import.log ---
aqute-bndlib-0_0_203-4_jpp6:HEAD:aqute-bndlib-0.0.203-4.jpp6.src.rpm:1250539159


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2009 04:22:03 -0000	1.1
+++ .cvsignore	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1 @@
+bnd-0.0.203.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2009 04:22:03 -0000	1.1
+++ sources	17 Aug 2009 20:00:26 -0000	1.2
@@ -0,0 +1 @@
+517cc8edead3dbd520c6a8e3f82f7321  bnd-0.0.203.jar



From diegobz at fedoraproject.org  Mon Aug 17 20:05:23 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 17 Aug 2009 20:05:23 +0000 (UTC)
Subject: rpms/django-profile/F-11 django-profile.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817200523.5DEB011C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-profile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32733/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-profile.spec import.log 
Log Message:
Initial import


--- NEW FILE django-profile.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define vcsdate 20090813
%define vcstag r420

Name:           django-profile
Version:        0.6
Release:        0.2.%{vcsdate}svn%{vcstag}%{?dist}
Summary:        Django pluggable user profile zone

Group:          Development/Languages
License:        BSD
URL:            http://code.google.com/p/django-profile/
# svn export -%{vcstag} http://django-profile.googlecode.com/svn/trunk/ django-profile-%{version}-%{vcshatag}
# tar zcf django-profile-%{version}-%{vcstag}.tar.gz django-profile-%{version}-%{vcstag} 
Source:         django-profile-%{version}-%{vcstag}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django python-imaging

%description
This is a user private zone/profile management application, allowing
the user to take control of his account and insert information about
him in his profile.

Inside this package you will find a demo application which will show
you what can be accomplished with the rest of the utilities included
in the package.

%prep
%setup -q -n %{name}-%{version}-%{vcstag}

%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 INSTALL.txt CHANGELOG.txt LICENSE.txt README.txt TODO.txt demo/
%{python_sitelib}/*
%exclude %{python_sitelib}/demo

%changelog
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.2.20090813svnr420
- Added docs
- Fixed version in the previous changelog
- Fixed License to BSD based on the LICENSE.txt file
- Moved demo app to docs
- Excluded demo app from python path

* Thu Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.1.20090813svnr420
- Initial RPM


--- NEW FILE import.log ---
django-profile-0_6-0_2_20090813svnr420_fc11:F-11:django-profile-0.6-0.2.20090813svnr420.fc11.src.rpm:1250539540


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-profile/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:27:57 -0000	1.1
+++ .cvsignore	17 Aug 2009 20:05:23 -0000	1.2
@@ -0,0 +1 @@
+django-profile-0.6-r420.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-profile/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:27:57 -0000	1.1
+++ sources	17 Aug 2009 20:05:23 -0000	1.2
@@ -0,0 +1 @@
+9ff2ba8df5bc8a9517c7f3f36cc7b9ff  django-profile-0.6-r420.tar.gz



From jjohnstn at fedoraproject.org  Mon Aug 17 20:10:20 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon, 17 Aug 2009 20:10:20 +0000 (UTC)
Subject: rpms/eclipse-rse/devel .cvsignore, 1.2, 1.3 eclipse-rse.spec, 1.4, 
	1.5 featureVersions.properties, 1.1,
	1.2 pluginVersions.properties, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090817201020.3347311C04D1@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-rse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1162

Modified Files:
	.cvsignore eclipse-rse.spec featureVersions.properties 
	pluginVersions.properties sources 
Log Message:

* Mon Aug 17 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1-1
- Move to 3.1 tarball.





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jul 2009 20:24:06 -0000	1.2
+++ .cvsignore	17 Aug 2009 20:10:19 -0000	1.3
@@ -1 +1,2 @@
 rse-fetched-src-R3_0_3.tar.gz
+rse-fetched-src-R3_1.tar.gz


Index: eclipse-rse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/eclipse-rse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-rse.spec	29 Jul 2009 22:37:45 -0000	1.4
+++ eclipse-rse.spec	17 Aug 2009 20:10:19 -0000	1.5
@@ -1,17 +1,15 @@
-%global debug_package %{nil}
-
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
 
 Name: eclipse-rse
 Summary: Eclipse Remote System Explorer
-Version: 3.0.3
-Release: 4%{?dist} 
+Version: 3.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_0_3.tar.gz
+Source0: rse-fetched-src-R3_1.tar.gz
 Source1: fetch-rse.sh
 # Following property files are generated by fetch-rse.sh.
 Source2: featureVersions.properties
@@ -21,20 +19,13 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 BuildRequires:    java-devel >= 1.5.0
 
-# Currently, upstream CDT only supports building on the platforms listed here.
-# Since this version of RSE requires CDT, we must restrict the same arches.
-# FIXME: this problem will go away with RSE 3.1 which does not prereq the CDT.
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-
 BuildRequires: eclipse-pde >= 1:3.4.1
-BuildRequires: eclipse-cdt >= 1:5.0.1
 BuildRequires: eclipse-emf >= 0:2.4.1
 BuildRequires: jakarta-commons-net >= 0:1.4.1-5.4
 BuildRequires: jakarta-oro >= 0:2.0.8-5.3
 Requires: eclipse-platform >= 1:3.4.0
 Requires: eclipse-emf >= 0:2.4.1
-Requires: eclipse-cdt >= 1:5.0.1
-Requires: jakarta-commons-net >= 0:1.4.1-5.4
+Requires: jakarta-commons-net >= 0:2.0
 Requires: jakarta-oro >= 0:2.0.8-5.3
 
 Group: Development/Tools
@@ -51,7 +42,7 @@ that allows you to connect and work with
 rm -rf orbitdeps
 mkdir orbitdeps
 pushd orbitdeps
-ln -s %{_javadir}/commons-net-1.4.1.jar org.apache.commons.net_1.4.1.jar
+ln -s %{_javadir}/commons-net-2.0.jar org.apache.commons.net_2.0.jar
 ln -s %{_javadir}/oro-2.0.8.jar org.apache.oro_2.0.8.jar
 popd
 
@@ -63,10 +54,10 @@ cp %{SOURCE3} .
 popd
 
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.tm.terminal -d "emf" \
--a -DgenerateFeatureVersionSuffix=true -j -DJ2SE_1.4=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
+-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DgenerateFeatureVersionSuffix=true" -j -DJ2SE_1.5=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.rse.sdk -d "cdt" \
--a -DgenerateFeatureVersionSuffix=true -j -DJ2SE_1.4=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.rse.sdk \
+-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DgenerateFeatureVersionSuffix=true" -j -DJ2SE_1.5=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
 
 %install
 rm -rf %{buildroot}
@@ -80,9 +71,8 @@ unzip -q -o -d %{buildroot}%{install_loc
  build/rpmBuild/org.eclipse.rse.sdk.zip
 
 pushd %{buildroot}%{install_loc}/rse/eclipse/plugins
-rm org.apache.commons.net_1.4.1.jar
-rm org.apache.oro_2.0.8.jar
-ln -s %{_javadir}/commons-net-1.4.1.jar org.apache.commons.net_1.4.1.jar
+rm org.apache.commons.net_2.0.0*.jar
+ln -s %{_javadir}/commons-net-2.0.jar org.apache.commons.net_2.0.jar
 ln -s %{_javadir}/oro-2.0.8.jar org.apache.oro_2.0.8.jar
 popd
 
@@ -96,6 +86,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.rse.sdk-feature/license.html
 
 %changelog
+* Mon Aug 17 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1-1
+- Move to 3.1 tarball.
+
 * Wed Jul 29 2009 Jeff Johnston <jjohnstn at redhat.com> 3.0.3-4
 - Resolves #514630
 


Index: featureVersions.properties
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/featureVersions.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- featureVersions.properties	23 Jul 2009 20:24:06 -0000	1.1
+++ featureVersions.properties	17 Aug 2009 20:10:19 -0000	1.2
@@ -1,23 +1,22 @@
-# Mon Jul 20 16:19:39 EDT 2009
-org.eclipse.tm.discovery,0.0.0=v20080530
-org.eclipse.rse,0.0.0=v200902042310
-org.eclipse.rse.core,0.0.0=v200902042310
-org.eclipse.rse.dstore,0.0.0=v200902042310
-org.eclipse.rse.examples,0.0.0=v20080604
-org.eclipse.rse.ftp,0.0.0=v200809171630
-org.eclipse.rse.local,0.0.0=v20080710
-org.eclipse.rse.remotecdt,0.0.0=v200809041200
-org.eclipse.rse.sdk,0.0.0=v200902042310
-org.eclipse.rse.ssh,0.0.0=v20080714
-org.eclipse.rse.telnet,0.0.0=v200809181500
-org.eclipse.rse.terminals,0.0.0=v200902181600
-org.eclipse.rse.tests,0.0.0=v200809041200
-org.eclipse.rse.useractions,0.0.0=v200812041720
-org.eclipse.tm.terminal,0.0.0=v200902181600
-org.eclipse.tm.terminal.sdk,0.0.0=v200902181600
-org.eclipse.tm.terminal.serial,0.0.0=v20080715
-org.eclipse.tm.terminal.ssh,0.0.0=v200811110900
-org.eclipse.tm.terminal.telnet,0.0.0=v20080715
-org.eclipse.tm.terminal.test,0.0.0=v20080530
-org.eclipse.tm.terminal.view,0.0.0=v20080715
-org.eclipse.rse.wince,0.0.0=v20080626
+# Tue Jul 28 12:43:22 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.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.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.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.rse.wince,0.0.0=v200905272300


Index: pluginVersions.properties
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/pluginVersions.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pluginVersions.properties	23 Jul 2009 20:24:07 -0000	1.1
+++ pluginVersions.properties	17 Aug 2009 20:10:19 -0000	1.2
@@ -1,71 +1,70 @@
-# Mon Jul 20 16:19:39 EDT 2009
-org.eclipse.rse.discovery,0.0.0=v20080402
-org.eclipse.tm.discovery.doc.isv,0.0.0=v20080406
-org.eclipse.tm.discovery.engine,0.0.0=v20080331
-org.eclipse.tm.discovery.model,0.0.0=v20080331
-org.eclipse.tm.discovery.model.edit,0.0.0=v20080522
-org.eclipse.tm.discovery.protocol.dnssd,0.0.0=v20080331
-org.eclipse.tm.discovery.transport.udp,0.0.0=v20080331
-org.eclipse.tm.discovery.view,0.0.0=v20080522
-org.eclipse.tm.discovery.wizard,0.0.0=v20080529
-org.eclipse.dstore.core,0.0.0=v200902101918
-org.eclipse.dstore.doc.isv,0.0.0=v200809041200
-org.eclipse.dstore.extra,0.0.0=v20080406
-org.eclipse.rse,0.0.0=v200902042310
-org.eclipse.rse.connectorservice.dstore,0.0.0=v200809181500
-org.eclipse.rse.connectorservice.local,0.0.0=v20080604
-org.eclipse.rse.connectorservice.ssh,0.0.0=v20080604
-org.eclipse.rse.connectorservice.telnet,0.0.0=v20080604
-org.eclipse.rse.core,0.0.0=v200902042310
-org.eclipse.rse.doc.isv,0.0.0=v200809041200
-org.eclipse.rse.doc.user,0.0.0=v200809041200
-org.eclipse.rse.dstore.security,0.0.0=v20080609
-org.eclipse.rse.efs,0.0.0=v200809041200
-org.eclipse.rse.efs.ui,0.0.0=v20080606
-org.eclipse.rse.examples.daytime,0.0.0=v20080604
-org.eclipse.rse.examples.tutorial,0.0.0=v20080604
-org.eclipse.rse.files.ui,0.0.0=v200902050040
-org.eclipse.rse.importexport,0.0.0=v20080604
-org.eclipse.rse.processes.ui,0.0.0=v20080714
-org.eclipse.rse.remotecdt,0.0.0=v200808191815
-org.eclipse.rse.sdk,0.0.0=v200902042310
-org.eclipse.rse.services.dstore,0.0.0=v200902181600
-org.eclipse.rse.services.files.ftp,0.0.0=v200808191815
-org.eclipse.rse.services.local,0.0.0=v20080710
-org.eclipse.rse.services.ssh,0.0.0=v20080714
-org.eclipse.rse.services.telnet,0.0.0=v20080604
-org.eclipse.rse.services,0.0.0=v200809091230
-org.eclipse.rse.shells.ui,0.0.0=v20080710
-org.eclipse.rse.subsystems.files.core,0.0.0=v200809041200
-org.eclipse.rse.subsystems.files.dstore,0.0.0=v200902181600
-org.eclipse.rse.subsystems.files.ftp,0.0.0=v20080609
-org.eclipse.rse.subsystems.files.local,0.0.0=v20080604
-org.eclipse.rse.subsystems.files.ssh,0.0.0=v20080604
-org.eclipse.rse.subsystems.processes.core,0.0.0=v200902042310
-org.eclipse.rse.subsystems.processes.dstore,0.0.0=v20080604
-org.eclipse.rse.subsystems.processes.local,0.0.0=v20080604
-org.eclipse.rse.subsystems.processes.shell.linux,0.0.0=v20080714
-org.eclipse.rse.subsystems.shells.core,0.0.0=v20080604
-org.eclipse.rse.subsystems.shells.dstore,0.0.0=v20080604
-org.eclipse.rse.subsystems.shells.local,0.0.0=v20080604
-org.eclipse.rse.subsystems.shells.ssh,0.0.0=v20080604
-org.eclipse.rse.subsystems.shells.telnet,0.0.0=v20080604
-org.eclipse.rse.subsystems.terminals.core,0.0.0=v20080714
-org.eclipse.rse.subsystems.terminals.ssh,0.0.0=v20080604
-org.eclipse.rse.terminals.ui,0.0.0=v200902181600
-org.eclipse.rse.tests,0.0.0=v20080825
-org.eclipse.rse.tests.framework,0.0.0=v20080604
-org.eclipse.rse.ui,0.0.0=v200902042310
-org.eclipse.rse.useractions,0.0.0=v200812041720
-org.eclipse.tm.terminal,0.0.0=v200902181600
-org.eclipse.tm.terminal.serial,0.0.0=v20080715
-org.eclipse.tm.terminal.ssh,0.0.0=v200811110900
-org.eclipse.tm.terminal.telnet,0.0.0=v20080715
-org.eclipse.tm.terminal.test,0.0.0=v20080610
-org.eclipse.tm.terminal.view,0.0.0=v20080715
-org.eclipse.test,0.0.0=v20071108
-org.eclipse.ant.optional.junit,0.0.0=v20070530
-org.eclipse.rse.subsystems.wince,0.0.0=v20080626
-org.eclipse.tm.rapi,0.0.0=v20080606
-org.eclipse.tm.rapi.examples,0.0.0=v20080522
-org.eclipse.tm.rapi.tests,0.0.0=v20080522
+# Tue Jul 28 12:43:22 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
+org.eclipse.tm.discovery.model,0.0.0=v200905272300
+org.eclipse.tm.discovery.model.edit,0.0.0=v200905272300
+org.eclipse.tm.discovery.protocol.dnssd,0.0.0=v200905272300
+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.doc.isv,0.0.0=v200905272300
+org.eclipse.dstore.extra,0.0.0=v200905272300
+org.eclipse.rse,0.0.0=v200905272300
+org.eclipse.rse.connectorservice.dstore,0.0.0=v200906032235
+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.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.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.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.telnet,0.0.0=v200905272300
+org.eclipse.rse.services,0.0.0=v200906102345
+org.eclipse.rse.shells.ui,0.0.0=v200905272300
+org.eclipse.rse.subsystems.files.core,0.0.0=v200906102345
+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.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
+org.eclipse.rse.subsystems.processes.local,0.0.0=v200905272300
+org.eclipse.rse.subsystems.processes.shell.linux,0.0.0=v200905272300
+org.eclipse.rse.subsystems.shells.core,0.0.0=v200905272300
+org.eclipse.rse.subsystems.shells.dstore,0.0.0=v200905272300
+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.tests.framework,0.0.0=v200905272300
+org.eclipse.rse.ui,0.0.0=v200905272300
+org.eclipse.rse.useractions,0.0.0=v200905272300
+org.eclipse.tm.terminal,0.0.0=v200905272300
+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.test,0.0.0=v20081002
+org.eclipse.ant.optional.junit,0.0.0=v20080717
+org.eclipse.rse.subsystems.wince,0.0.0=v200905272300
+org.eclipse.tm.rapi,0.0.0=v200905272300
+org.eclipse.tm.rapi.examples,0.0.0=v200905272300
+org.eclipse.tm.rapi.tests,0.0.0=v200905272300


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 20:24:07 -0000	1.2
+++ sources	17 Aug 2009 20:10:20 -0000	1.3
@@ -1 +1 @@
-2b5dcd26806ff981f9913cbc3fe56db0  rse-fetched-src-R3_0_3.tar.gz
+4fa7edbd093a1ca5dccc794df59a5a7e  rse-fetched-src-R3_1.tar.gz



From cebbert at fedoraproject.org  Mon Aug 17 20:10:45 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 17 Aug 2009 20:10:45 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.287, 1.288 kernel.spec, 1.1710, 
	1.1711
Message-ID: <20090817201045.3C64A11C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1310

Modified Files:
	config-generic kernel.spec 
Log Message:
Change config options:
  CONFIG_SCSI_DEBUG=m
  CONFIG_PCI_MSI_DEFAULT_ON=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- config-generic	25 Jul 2009 03:16:38 -0000	1.287
+++ config-generic	17 Aug 2009 20:10:44 -0000	1.288
@@ -82,7 +82,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
@@ -625,7 +625,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_DC395x=m
 # CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_QLA_ISCSI=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1710
retrieving revision 1.1711
diff -u -p -r1.1710 -r1.1711
--- kernel.spec	17 Aug 2009 14:19:21 -0000	1.1710
+++ kernel.spec	17 Aug 2009 20:10:45 -0000	1.1711
@@ -1895,14 +1895,19 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-32
+- Change config options:
+  CONFIG_SCSI_DEBUG=m
+  CONFIG_PCI_MSI_DEFAULT_ON=y
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.30.5-31
 - Fix flub in prior lirc patch update that resulted in no lirc
   drivers getting built
 
-* Sun Aug 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-28
+* Sun Aug 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-29
 - Linux 2.6.30.5
 
-* Fri Aug 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-27.rc2
+* Fri Aug 14 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-28.rc2
 - Linux 2.6.30.5-rc2
 - Dropped drm-intel-tv-fix.patch, merged in -stable now.
 



From overholt at fedoraproject.org  Mon Aug 17 20:14:53 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 17 Aug 2009 20:14:53 +0000 (UTC)
Subject: rpms/aqute-bndlib/devel aqute-bndlib.spec,1.2,1.3
Message-ID: <20090817201453.3731E11C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2066

Modified Files:
	aqute-bndlib.spec 
Log Message:
* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0.0.203-4.1
- Remove unedded BRs at Andrew Overholt's recommendation
- Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid
  noarch on 64-bit arches problem


Index: aqute-bndlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/aqute-bndlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- aqute-bndlib.spec	17 Aug 2009 20:00:25 -0000	1.2
+++ aqute-bndlib.spec	17 Aug 2009 20:14:52 -0000	1.3
@@ -28,13 +28,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _without_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section   free
 
 Name:           aqute-bndlib
 Version:        0.0.203
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Epoch:          0
 Summary:        BND Library
 License:        ASL 2.0
@@ -62,8 +64,6 @@ BuildRequires:  java-devel >= 0:1.5.0
 BuildRequires:  ant >= 0:1.6.5
 #BuildRequires:  ecj
 BuildRequires:  eclipse-ecj
-BuildRequires:  eclipse-platform
-BuildRequires:  eclipse-rcp
 BuildRequires:  eclipse-jdt
 
 Requires:  java >= 0:1.5.0
@@ -103,18 +103,18 @@ mv OSGI-OPT/src src/main/java
 export LANG=en_US.utf8
 export OPT_JAR_LIST=:
 export CLASSPATH=$(build-classpath ant)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi.services_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.jface_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.jobs_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.swt.*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi.services_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.jobs_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.runtime_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.resources_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.common_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.swt.*.jar)
 
 %{javac} -d target/classes $(find src/main/java -type f -name "*.java")
 %{javadoc} -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter
@@ -187,6 +187,11 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0.0.203-4.1
+- Remove unedded BRs at Andrew Overholt's recommendation
+- Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid
+  noarch on 64-bit arches problem
+
 * Fri Mar 20 2009 Yong Yang <yyang at redhat.com> 0.0.203-4
 - rebuild with new maven2 2.0.8 built in bootstrap mode
 - merge from JPP-6



From diegobz at fedoraproject.org  Mon Aug 17 20:15:03 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Mon, 17 Aug 2009 20:15:03 +0000 (UTC)
Subject: rpms/django-profile/EL-5 django-profile.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090817201503.C3E3311C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-profile/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2125/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-profile.spec import.log 
Log Message:
Initial import


--- NEW FILE django-profile.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define vcsdate 20090813
%define vcstag r420

Name:           django-profile
Version:        0.6
Release:        0.2.%{vcsdate}svn%{vcstag}%{?dist}
Summary:        Django pluggable user profile zone

Group:          Development/Languages
License:        BSD
URL:            http://code.google.com/p/django-profile/
# svn export -%{vcstag} http://django-profile.googlecode.com/svn/trunk/ django-profile-%{version}-%{vcshatag}
# tar zcf django-profile-%{version}-%{vcstag}.tar.gz django-profile-%{version}-%{vcstag} 
Source:         django-profile-%{version}-%{vcstag}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django python-imaging

%description
This is a user private zone/profile management application, allowing
the user to take control of his account and insert information about
him in his profile.

Inside this package you will find a demo application which will show
you what can be accomplished with the rest of the utilities included
in the package.

%prep
%setup -q -n %{name}-%{version}-%{vcstag}

%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 INSTALL.txt CHANGELOG.txt LICENSE.txt README.txt TODO.txt demo/
%{python_sitelib}/*
%exclude %{python_sitelib}/demo

%changelog
* Fri Aug 14 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.2.20090813svnr420
- Added docs
- Fixed version in the previous changelog
- Fixed License to BSD based on the LICENSE.txt file
- Moved demo app to docs
- Excluded demo app from python path

* Thu Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-0.1.20090813svnr420
- Initial RPM


--- NEW FILE import.log ---
django-profile-0_6-0_2_20090813svnr420_fc11:EL-5:django-profile-0.6-0.2.20090813svnr420.fc11.src.rpm:1250539925


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-profile/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:27:57 -0000	1.1
+++ .cvsignore	17 Aug 2009 20:15:03 -0000	1.2
@@ -0,0 +1 @@
+django-profile-0.6-r420.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-profile/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:27:57 -0000	1.1
+++ sources	17 Aug 2009 20:15:03 -0000	1.2
@@ -0,0 +1 @@
+9ff2ba8df5bc8a9517c7f3f36cc7b9ff  django-profile-0.6-r420.tar.gz



From robert at fedoraproject.org  Mon Aug 17 20:15:26 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 20:15:26 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/devel rubygem-fastercsv.spec,1.1,1.2
Message-ID: <20090817201526.B97E511C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2185

Modified Files:
	rubygem-fastercsv.spec 
Log Message:
Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.QGFbrL
+ umask 022
+ cd /builddir/build/BUILD
+ unset DISPLAY
+ ruby -I /builddir/build/BUILDROOT/rubygem-fastercsv-1.5.0-2.fc10.noarch64/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/lib:/builddir/build/BUILDROOT/rubygem-fastercsv-1.5.0-2.fc10.noarch64/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/test /builddir/build/BUILDROOT/rubygem-fastercsv-1.5.0-2.fc10.noarch64/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/test/ts_all.rb
Loaded suite /builddir/build/BUILDROOT/rubygem-fastercsv-1.5.0-2.fc10.noarch64/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/test/ts_all
Started
........................................................................................../usr/lib/ruby/1.8/timeout.rb:58: [BUG] Segmentation fault
ruby 1.8.6 (2008-08-11) [powerpc64-linux]
/var/tmp/rpm-tmp.QGFbrL: line 26:  2513 Aborted                 ruby -I $RPM_BUILD_ROOT/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/lib:$RPM_BUILD_ROOT/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/test $RPM_BUILD_ROOT/usr/lib/ruby/gems/1.8/gems/fastercsv-1.5.0/test/ts_all.rb
error: Bad exit status from /var/tmp/rpm-tmp.QGFbrL (%check)



Index: rubygem-fastercsv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/devel/rubygem-fastercsv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-fastercsv.spec	17 Aug 2009 19:46:34 -0000	1.1
+++ rubygem-fastercsv.spec	17 Aug 2009 20:15:26 -0000	1.2
@@ -41,8 +41,10 @@ for file in $(find $RPM_BUILD_ROOT%{gemi
   fi
 done
 
+%if 0%{?fedora} > 10
 %check
 ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From robert at fedoraproject.org  Mon Aug 17 20:19:54 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 20:19:54 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/F-10 rubygem-fastercsv.spec,1.1,1.2
Message-ID: <20090817201954.36EEF11C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3085/F-10

Modified Files:
	rubygem-fastercsv.spec 
Log Message:
Move previous commit to correct branch (F-12 -> F-10)



Index: rubygem-fastercsv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/F-10/rubygem-fastercsv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-fastercsv.spec	17 Aug 2009 19:46:33 -0000	1.1
+++ rubygem-fastercsv.spec	17 Aug 2009 20:19:54 -0000	1.2
@@ -41,8 +41,10 @@ for file in $(find $RPM_BUILD_ROOT%{gemi
   fi
 done
 
+%if 0%{?fedora} > 10
 %check
 ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From robert at fedoraproject.org  Mon Aug 17 20:19:54 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 20:19:54 +0000 (UTC)
Subject: rpms/rubygem-fastercsv/devel rubygem-fastercsv.spec,1.2,1.3
Message-ID: <20090817201954.4C94F11C0346@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/rubygem-fastercsv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3085/devel

Modified Files:
	rubygem-fastercsv.spec 
Log Message:
Move previous commit to correct branch (F-12 -> F-10)



Index: rubygem-fastercsv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fastercsv/devel/rubygem-fastercsv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-fastercsv.spec	17 Aug 2009 20:15:26 -0000	1.2
+++ rubygem-fastercsv.spec	17 Aug 2009 20:19:54 -0000	1.3
@@ -41,10 +41,8 @@ for file in $(find $RPM_BUILD_ROOT%{gemi
   fi
 done
 
-%if 0%{?fedora} > 10
 %check
 ruby -I $RPM_BUILD_ROOT%{geminstdir}/lib:$RPM_BUILD_ROOT%{geminstdir}/test $RPM_BUILD_ROOT%{geminstdir}/test/ts_all.rb
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From jdieter at fedoraproject.org  Mon Aug 17 20:32:27 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Mon, 17 Aug 2009 20:32:27 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm.spec,1.23,1.24
Message-ID: <20090817203227.4352411C00E4@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5158

Modified Files:
	deltarpm.spec 
Log Message:
Split *deltaiso commands into deltaiso subpackage (#501953)



Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- deltarpm.spec	31 Jul 2009 22:05:13 -0000	1.23
+++ deltarpm.spec	17 Aug 2009 20:32:27 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090729%{?dist}
+Release: 0.git.20090729%{?dist}.1
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -30,6 +30,14 @@ Requires: deltarpm = %{version}-%{releas
 This package contains a tool to sync a file tree with
 deltarpms.
 
+%package -n deltaiso
+Summary: Create deltas between isos containing rpms
+Requires: deltarpm = %{version}-%{release}
+
+%description -n deltaiso
+This package contains tools for creating and using deltasisos,
+a difference between an old and a new iso containing rpms.
+
 %prep
 %setup -q -n %{name}-git-20090729
 
@@ -47,17 +55,23 @@ deltarpms.
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE.BSD README
-%doc %{_mandir}/man8/applydelta*
-%doc %{_mandir}/man8/makedelta*
+%doc %{_mandir}/man8/applydeltarpm*
+%doc %{_mandir}/man8/makedeltarpm*
 %doc %{_mandir}/man8/combinedeltarpm*
-%{_bindir}/applydeltaiso
 %{_bindir}/applydeltarpm
 %{_bindir}/combinedeltarpm
-%{_bindir}/fragiso
-%{_bindir}/makedeltaiso
 %{_bindir}/makedeltarpm
 %{_bindir}/rpmdumpheader
 
+%files -n deltaiso
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD README
+%doc %{_mandir}/man8/applydeltaiso*
+%doc %{_mandir}/man8/makedeltaiso*
+%{_bindir}/applydeltaiso
+%{_bindir}/fragiso
+%{_bindir}/makedeltaiso
+
 %files -n drpmsync
 %defattr(-, root, root, 0755)
 %doc LICENSE.BSD README
@@ -65,8 +79,9 @@ deltarpms.
 %{_bindir}/drpmsync
 
 %changelog
-* Sat Aug  1 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5.0.git.20090729.1
+* Mon Aug 17 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5.0.git.20090729.1
 - Explain where we get the source from
+- Split *deltaiso commands into deltaiso subpackage (#501953)
 
 * Wed Jul 29 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5.0.git.20090729
 - Fix bug in writing Fedora's xz-compressed rpms (surely that's the last one)



From bruno at fedoraproject.org  Mon Aug 17 20:33:33 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Mon, 17 Aug 2009 20:33:33 +0000 (UTC)
Subject: rpms/colossus/devel .cvsignore, 1.5, 1.6 colossus.spec, 1.6,
	1.7 import.log, 1.4, 1.5 sources, 1.5, 1.6 4485.patch, 1.1,
	NONE 4486.patch, 1.1, NONE
Message-ID: <20090817203333.A8F2D11C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5486/devel

Modified Files:
	.cvsignore colossus.spec import.log sources 
Removed Files:
	4485.patch 4486.patch 
Log Message:
Rebasing to new upstream public build (0.9.1).




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Aug 2009 04:53:08 -0000	1.5
+++ .cvsignore	17 Aug 2009 20:33:33 -0000	1.6
@@ -1 +1 @@
-colossus-20090810-4482.tar.gz
+colossus-20090817-4489.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- colossus.spec	16 Aug 2009 15:03:45 -0000	1.6
+++ colossus.spec	17 Aug 2009 20:33:33 -0000	1.7
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4482
-%define         revdate    20090810
-Version:        0.9.0
-Release:        2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4489
+%define         revdate    20090817
+Version:        0.9.1
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,8 +20,6 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
-Patch1:	4485.patch
-Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -66,8 +64,6 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
-%patch1
-%patch2
 
 %build
 
@@ -183,7 +179,12 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
-* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+* Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
+- Rebase to new public release 0.9.1
+- 2 additional bug fixes
+- See http://colossus.sourceforge.net/public-build/docs/RecentChangesDetails.html
+
+* Sun Aug 16 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
 - Patch 4485 Fix creature info popup
 - Patch 4486 Fix Help problem when a logging property is not set
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	11 Aug 2009 04:53:08 -0000	1.4
+++ import.log	17 Aug 2009 20:33:33 -0000	1.5
@@ -2,3 +2,4 @@ colossus-0-0_2_20090710svn4432_fc11:HEAD
 colossus-0-0_4_20090725svn4454_fc11:HEAD:colossus-0-0.4.20090725svn4454.fc11.src.rpm:1248590656
 colossus-0-0_5_20090726svn4462_fc11:HEAD:colossus-0-0.5.20090726svn4462.fc11.src.rpm:1248643266
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 04:53:08 -0000	1.5
+++ sources	17 Aug 2009 20:33:33 -0000	1.6
@@ -1 +1 @@
-22fcc30b7dd9af6b8e01d99db4125b74  colossus-20090810-4482.tar.gz
+3f55310339968f1c885f89678c22c73c  colossus-20090817-4489.tar.gz


--- 4485.patch DELETED ---


--- 4486.patch DELETED ---



From bruno at fedoraproject.org  Mon Aug 17 20:36:04 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Mon, 17 Aug 2009 20:36:04 +0000 (UTC)
Subject: rpms/colossus/F-11 .cvsignore, 1.3, 1.4 colossus.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 4485.patch, 1.1,
	NONE 4486.patch, 1.1, NONE
Message-ID: <20090817203604.5343F11C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5915/F-11

Modified Files:
	.cvsignore colossus.spec import.log sources 
Removed Files:
	4485.patch 4486.patch 
Log Message:
Rebasing to new upstream public build (0.9.1).




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 05:48:58 -0000	1.3
+++ .cvsignore	17 Aug 2009 20:36:03 -0000	1.4
@@ -1 +1 @@
-colossus-20090810-4482.tar.gz
+colossus-20090817-4489.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- colossus.spec	16 Aug 2009 17:39:25 -0000	1.3
+++ colossus.spec	17 Aug 2009 20:36:04 -0000	1.4
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4482
-%define         revdate    20090810
-Version:        0.9.0
-Release:        2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4489
+%define         revdate    20090817
+Version:        0.9.1
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,8 +20,6 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
-Patch1:	4485.patch
-Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -66,8 +64,6 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
-%patch1
-%patch2
 
 %build
 
@@ -183,7 +179,12 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
-* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+* Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
+- Rebase to new public release 0.9.1
+- 2 additional bug fixes
+- See http://colossus.sourceforge.net/public-build/docs/RecentChangesDetails.html
+
+* Sun Aug 16 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
 - Patch 4485 Fix creature info popup
 - Patch 4486 Fix Help problem when a logging property is not set
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Aug 2009 05:48:58 -0000	1.2
+++ import.log	17 Aug 2009 20:36:04 -0000	1.3
@@ -1,2 +1,3 @@
 colossus-0-0_2_20090710svn4432_fc11:F-11:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247454127
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 05:48:59 -0000	1.3
+++ sources	17 Aug 2009 20:36:04 -0000	1.4
@@ -1 +1 @@
-22fcc30b7dd9af6b8e01d99db4125b74  colossus-20090810-4482.tar.gz
+3f55310339968f1c885f89678c22c73c  colossus-20090817-4489.tar.gz


--- 4485.patch DELETED ---


--- 4486.patch DELETED ---



From bruno at fedoraproject.org  Mon Aug 17 20:37:08 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Mon, 17 Aug 2009 20:37:08 +0000 (UTC)
Subject: rpms/colossus/F-10 .cvsignore, 1.3, 1.4 colossus.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 4485.patch, 1.1,
	NONE 4486.patch, 1.1, NONE
Message-ID: <20090817203708.9A5D211C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6357/F-10

Modified Files:
	.cvsignore colossus.spec import.log sources 
Removed Files:
	4485.patch 4486.patch 
Log Message:
Rebase to new upstream public build (0.9.1).




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 05:47:55 -0000	1.3
+++ .cvsignore	17 Aug 2009 20:37:08 -0000	1.4
@@ -1 +1 @@
-colossus-20090810-4482.tar.gz
+colossus-20090817-4489.tar.gz


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- colossus.spec	16 Aug 2009 17:41:02 -0000	1.3
+++ colossus.spec	17 Aug 2009 20:37:08 -0000	1.4
@@ -1,8 +1,8 @@
 Name:           colossus
-%define         rev        4482
-%define         revdate    20090810
-Version:        0.9.0
-Release:        2.%{revdate}svn%{rev}%{?dist}
+%define         rev        4489
+%define         revdate    20090817
+Version:        0.9.1
+Release:        1.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,8 +20,6 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
-Patch1:	4485.patch
-Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -66,8 +64,6 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
-%patch1
-%patch2
 
 %build
 
@@ -183,7 +179,12 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
-* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+* Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
+- Rebase to new public release 0.9.1
+- 2 additional bug fixes
+- See http://colossus.sourceforge.net/public-build/docs/RecentChangesDetails.html
+
+* Sun Aug 16 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
 - Patch 4485 Fix creature info popup
 - Patch 4486 Fix Help problem when a logging property is not set
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Aug 2009 05:47:56 -0000	1.2
+++ import.log	17 Aug 2009 20:37:08 -0000	1.3
@@ -1,2 +1,3 @@
 colossus-0-0_2_20090710svn4432_fc11:F-10:colossus-0-0.2.20090710svn4432.fc11.src.rpm:1247454273
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 05:47:56 -0000	1.3
+++ sources	17 Aug 2009 20:37:08 -0000	1.4
@@ -1 +1 @@
-22fcc30b7dd9af6b8e01d99db4125b74  colossus-20090810-4482.tar.gz
+3f55310339968f1c885f89678c22c73c  colossus-20090817-4489.tar.gz


--- 4485.patch DELETED ---


--- 4486.patch DELETED ---



From robert at fedoraproject.org  Mon Aug 17 20:37:11 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 17 Aug 2009 20:37:11 +0000 (UTC)
Subject: rpms/bitlbee/F-10 bitlbee.spec,1.9,1.10
Message-ID: <20090817203711.B0BD511C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6313

Modified Files:
	bitlbee.spec 
Log Message:
Ugly workaround for still unfixed rpm.org issue...



Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-10/bitlbee.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bitlbee.spec	16 Aug 2009 22:43:43 -0000	1.9
+++ bitlbee.spec	17 Aug 2009 20:37:11 -0000	1.10
@@ -83,6 +83,11 @@ 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



From beekhof at fedoraproject.org  Mon Aug 17 20:37:26 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 17 Aug 2009 20:37:26 +0000 (UTC)
Subject: rpms/heartbeat/devel .cvsignore, 1.10, 1.11 heartbeat.spec, 1.36,
	1.37 sources, 1.10, 1.11
Message-ID: <20090817203726.BE43811C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6511

Modified Files:
	.cvsignore heartbeat.spec sources 
Log Message:
Update to 3.0-beta and new upstream project structure


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Dec 2008 06:01:48 -0000	1.10
+++ .cvsignore	17 Aug 2009 20:37:26 -0000	1.11
@@ -1 +1 @@
-STABLE-2.1.4.tar.bz2
+b37cbb1b036c.tar.bz2


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- heartbeat.spec	25 Jul 2009 02:06:03 -0000	1.36
+++ heartbeat.spec	17 Aug 2009 20:37:26 -0000	1.37
@@ -1,19 +1,25 @@
-%define           ENABLE_SNMP_SUBAGENT 0
-%define           ENABLE_MGMT 1
-%define           uid 24
-%define           gname haclient
-%define           uname hacluster
-Summary:          Heartbeat subsystem for High-Availability Linux
+
+# 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 3
+%global upstreamprefix Linux-HA-Dev-
+%global upstreamversion b37cbb1b036c
+
+%global alphatag %{upstreamversion}.hg
+
+%global           ENABLE_SNMP_SUBAGENT 0
+%global           gname haclient
+%global           uname hacluster
+
+Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.1.4
-Release:          12%{?dist}
+Version:          3.0.0
+Release:          %{?alphatag:0.}3%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
-Source0:          http://hg.linux-ha.org/lha-2.1/archive/STABLE-%{version}.tar.bz2
-Patch0:           heartbeat-fedora-pam.patch
-Patch1:           heartbeat-2.1.4-default-init.patch
-Patch2:           heartbeat-2.1.4-duplicate-drbd.patch
+Source0:          http://hg.linux-ha.org/dev/archive/%{upstreamversion}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -30,26 +36,26 @@ BuildRequires:    bison
 BuildRequires:    flex
 BuildRequires:    zlib-devel
 BuildRequires:    mailx
-%if %{ENABLE_MGMT}
-BuildRequires:    gnutls-devel 
-BuildRequires:    pam-devel
-BuildRequires:    python-devel
-BuildRequires:    swig
-%endif
-Requires:	  PyXML
-Requires(pre):	  shadow-utils
+BuildRequires:    which
+BuildRequires:    cluster-glue-libs-devel
+Requires:         PyXML
+Requires:         resource-agents
+Requires(pre):    shadow-utils
+Requires(pre):    cluster-glue
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
-%if %{ENABLE_MGMT}
-Requires:         gettext
-%endif
+Obsoletes:        heartbeat-gui < %{version}-%{release}
 
 %description
 heartbeat is a basic high-availability subsystem for Linux-HA.
 It will run scripts at initialization, and when machines go up or down.
 This version will also perform IP address takeover using gratuitous ARPs.
-It supports "n-node" clusters with significant capabilities for managing
-resources and dependencies.
+
+Heartbeat contains a cluster membership layer, fencing, and local and
+clusterwide resource management functionality.
+
+When used with Pacemaker, it supports "n-node" clusters with significant 
+capabilities for managing resources and dependencies.
 
 In addition it continues to support the older release 1 style of
 2-node clustering.
@@ -62,52 +68,13 @@ It implements the following kinds of hea
         - "ping" heartbeats (for routers, switches, etc.)
            (to be used for breaking ties in 2-node systems)
 
-%package ldirectord
-Summary:          Monitor daemon for maintaining high availability resources
+%package libs
+Summary:          Heartbeat libraries
 Group:            System Environment/Daemons
-Requires:         ipvsadm
-Requires(post):   /sbin/chkconfig
-Requires(preun):  /sbin/chkconfig
-Provides: ldirectord = %{version}-%{release}
-Obsoletes: ldirectord < 2.1.4-5
-Requires:  ldirectord = %{version}-%{release}
-# removed for now until it's in Fedora
-#Requires:  perl(Net::IMAP::Simple::SSL)
-
-%description ldirectord
-ldirectord is a stand-alone daemon to monitor services of real 
-for virtual services provided by The Linux Virtual Server
-(http://www.linuxvirtualserver.org/). It is simple to install 
-and works with the heartbeat code (http://www.linux-ha.org/).
-
-%package stonith
-Requires:       net-snmp-libs
-Summary:        Provides an interface to Shoot The Other Node In The Head 
-Group:          System Environment/Daemons
-Provides: stonith = %{version}-%{release}
-Obsoletes: stonith < 2.1.4-5
-
-%description stonith
-The STONITH module (a.k.a. STONITH) provides an extensible interface
-for remotely powering down a node in the cluster.  The idea is quite simple:
-When the software running on one machine wants to make sure another
-machine in the cluster is not using a resource, pull the plug on the other 
-machine. It's simple and reliable, albeit admittedly brutal.
+Requires:         heartbeat = %{version}-%{release}
 
-%package pils
-Summary:        Provides a general plugin and interface loading library
-Group:          System Environment/Daemons
-Provides: pils = %{version}-%{release}
-Obsoletes: pils < 2.1.4-5
-
-%description pils
-PILS is an generalized and portable open source Plugin and Interface Loading 
-System. PILS was developed as part of the Open Cluster Framework reference 
-implementation, and is designed to be directly usable by a wide variety of 
-other applications.
-PILS manages both plugins (loadable objects), and the interfaces these plugins 
-implement. PILS is designed to support any number of plugins implementing any 
-number of interfaces.
+%description libs
+Heartbeat library package
 
 %package devel 
 Summary:        Heartbeat development package 
@@ -115,37 +82,15 @@ Group:          System Environment/Daemo
 Requires:       heartbeat = %{version}-%{release}
 
 %description devel
-Heartbeat development package
-
-%package gui
-Summary: Provides a gui interface to manage heartbeat clusters
-Group: System Environment/Daemons
-Requires: heartbeat = %{version}-%{release}
-Requires: PyXML
-Requires: pygtk2-libglade
-
-%description gui
-GUI client for Heartbeat clusters
+Headers and shared libraries for writing programs for Heartbeat
 
 %prep
-%setup -q -n Heartbeat-STABLE-2-1-STABLE-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
- 
+%setup -q -n %{upstreamprefix}%{upstreamversion}
+
 %build
 ./bootstrap
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
-CFLAGS=${RPM_OPT_FLAGS} \
-%configure \
-  --with-ocf-root=%{_datadir}/ocf \
-  --disable-fatal-warnings \
-  --disable-static \
-%if %{ENABLE_MGMT}
-  --enable-mgmt
-%else
-  --disable-mgmt
-%endif
+CFLAGS=${RPM_OPT_FLAGS} %configure  --disable-fatal-warnings --disable-static
 
 # get rid of rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -162,29 +107,15 @@ make DESTDIR=$RPM_BUILD_ROOT install
 [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
 [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool
 find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} ';'
+mv $RPM_BUILD_ROOT/%{_datadir}/doc/packages/%{name} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/heartbeat/cts
 
-sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat-gui/pymgmt.py
-
-# fix some wrong line endings issues
-sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPDatabase
-sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPInstance
-
-%find_lang haclient
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-getent group %{gname} >/dev/null || groupadd -r %{gname}
-getent passwd %{uname} >/dev/null || \
-useradd -r -g %{gname} -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin \
--c "heartbeat user" %{uname}
-exit 0
-
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add heartbeat
@@ -199,154 +130,72 @@ fi
 
 /sbin/ldconfig
 
-%post ldirectord
-/sbin/chkconfig --add ldirectord
-
-%postun ldirectord -p /sbin/ldconfig
-
-%preun ldirectord
-/sbin/chkconfig --del ldirectord
-
-%post stonith -p /sbin/ldconfig
-
-%postun stonith -p /sbin/ldconfig
-
-%post pils -p /sbin/ldconfig
-
-%postun pils -p /sbin/ldconfig
-
-%files -f haclient.lang
-%doc %{_datadir}/doc/%{name}-%{version}
+%files
 %defattr(-,root,root,-)
+%doc %{_datadir}/doc/%{name}-%{version}
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/harc
 %config(noreplace) %{_sysconfdir}/ha.d/shellfuncs
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
-%{_libdir}/heartbeat
-%{_libdir}/libapphb.so.*
-%{_libdir}/libccmclient.so.*
-%{_libdir}/libcib.so.*
-%{_libdir}/libclm.so.*
-%{_libdir}/libcrmcommon.so.*
-%{_libdir}/libtransitioner.so.*
-%{_libdir}/libhbclient.so.*
-%{_libdir}/liblrm.so.*
-%{_libdir}/libpengine.so.*
-%{_libdir}/libplumb.so.*
-%{_libdir}/libplumbgpl.so.*
-%{_libdir}/librecoverymgr.so.*
-%{_libdir}/libstonithd.so.*
-%{_libdir}/libpe_rules.so.*
-%{_libdir}/libpe_status.so.*
 %{_datadir}/heartbeat/
-%{_datadir}/ocf/
 %{_sysconfdir}/ha.d/resource.d/
-%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_sysconfdir}/init.d/heartbeat
 %config(noreplace) %{_sysconfdir}/logrotate.d/heartbeat
 %dir %{_var}/lib/heartbeat
-%dir %{_var}/lib/heartbeat/cores
-%dir %attr (0755, root, root) %{_var}/lib/heartbeat/cores/root
-%dir %attr (0755, nobody, nobody) %{_var}/lib/heartbeat/cores/nobody
-%dir %attr (0755, hacluster, haclient) %{_var}/lib/heartbeat/cores/hacluster
 %dir %{_var}/run/heartbeat
-%attr (2755, hacluster, haclient) %{_bindir}/cl_status
+%attr (2755, %{uname}, %{gname}) %{_bindir}/cl_status
 %{_bindir}/cl_respawn
-%{_sbindir}/ciblint
-%{_sbindir}/hb_report
-%{_sbindir}/crmadmin
-%{_sbindir}/cibadmin
-%{_sbindir}/ccm_tool
-%{_sbindir}/crm_diff
-%{_sbindir}/crm_uuid
-%{_sbindir}/crm_mon
-%{_sbindir}/crm_sh
-%{_sbindir}/iso8601
-%{_sbindir}/crm_master
-%{_sbindir}/crm_standby
-%{_sbindir}/crm_attribute
-%{_sbindir}/crm_resource
-%{_sbindir}/crm_verify
-%{_sbindir}/attrd_updater
-%{_sbindir}/crm_failcount
-%{_sbindir}/ocf-tester
-%{_sbindir}/ha_logger
-%{_sbindir}/ptest
-%dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
-%dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
-%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
-%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
+%dir %attr (755, %{uname}, %{gname}) %{_var}/run/heartbeat/ccm
 %{_mandir}/man1/cl_status.1*
-%{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
 %{_mandir}/man1/hb_takeover.1*
 %{_mandir}/man1/hb_addnode.1*
 %{_mandir}/man1/hb_delnode.1*
 %{_mandir}/man8/heartbeat.8*
 %{_mandir}/man8/apphbd.8*
-%{_mandir}/man8/ha_logd.8*
-%{_mandir}/man8/cibadmin.8.gz
-%{_mandir}/man8/crm_resource.8.gz
 %if %{ENABLE_SNMP_SUBAGENT}
 /LINUX-HA-MIB.mib
 %endif
-%if %{ENABLE_MGMT}
-%{_libdir}/libhbmgmt.so.*
-%{_libdir}/libhbmgmtclient.so.*
-%{_libdir}/libhbmgmtcommon.so.*
-%{_libdir}/libhbmgmttls.so.*
-%config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%endif
 
-%files ldirectord
-%doc doc/COPYING 
-%doc doc/README
-%doc ldirectord/ldirectord.cf
+%files libs
 %defattr(-,root,root,-)
-%{_sbindir}/ldirectord
-%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
-%{_sysconfdir}/init.d/ldirectord
-%{_sysconfdir}/ha.d/resource.d/ldirectord
-%{_mandir}/man8/ldirectord.8*
-
-%files stonith
-%doc doc/COPYING 
-%doc doc/README
-%defattr(-,root,root,-)
-%{_libdir}/libstonith.so.*
-%{_libdir}/stonith/
-%{_sbindir}/stonith
-%{_sbindir}/meatclient
-%{_mandir}/man8/stonith.8*
-%{_mandir}/man8/meatclient.8*
-
-%files pils
-%doc doc/COPYING 
-%doc doc/README
-%defattr(-,root,root,-)
-/usr/include/pils
-%{_libdir}/libpils.*
-%{_libdir}/pils/
+%{_libdir}/heartbeat
+%{_libdir}/libapphb.so.*
+%{_libdir}/libccmclient.so.*
+%{_libdir}/libclm.so.*
+%{_libdir}/libhbclient.so.*
 
 %files devel
-%doc %{_datadir}/doc/%{name}-%{version}
 %defattr(-,root,root,-)
+%doc %{_datadir}/doc/%{name}-%{version}
 %{_includedir}/heartbeat/
-%{_includedir}/clplumbing/
 %{_includedir}/saf/
 %{_includedir}/ocf/
-%{_includedir}/stonith/
-%{_includedir}/pils/
 %{_libdir}/*.so
 
-%files gui
-%defattr(-,root,root)
-%{_libdir}/heartbeat-gui
-%{_datadir}/heartbeat-gui
-%{_bindir}/hb_gui
-
 %changelog
+* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.3.b37cbb1b036c.hg
+- Make use of the uname/gname variables
+- Use global instead of define for variables
+- Remove user/group creation.  This is handled in cluster-glue
+- Add obsoletes directive for gui subpackage which is no longer supplied
+- Move ldirectord subpackage to resource-agents
+- Use the full configure macro
+- Update to upstream version b37cbb1b036c
+  + LVSSyncDaemonSwap syncid
+  + remove the remaining OCF RA which live in the agents repository
+  + High: RA: IPv6addr: support for new nic and cidr_netmask parameters in the OCF RA
+  + Low: Build: findif moved to agents.
+  + Low: Build: move ldirectord to agents.
+  + Low: Build: remove a few hb_report artifacts.
+
+* Thu Aug 13 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.2.11f858f3bc4c.hg
+- Create a libs subpackage to support multi-arch
+
+* Tue Aug 4 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.1.11f858f3bc4c.hg
+- Update to 3.0.0-beta and build against cluster-glue
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -632,9 +481,9 @@ fi
   + Communication Layer
     + netstring encoding format is changed to be more efficient
     + add compression capability for big messages
-  + Add man pages for hb_standby/hb_takeover	
+  + Add man pages for hb_standby/hb_takeover
   + The assert triggered by 2.0.0 has been fixed
-  + CIB can now contain XML comments and/or be in DOS format	
+  + CIB can now contain XML comments and/or be in DOS format
   + Includes implementation of the ISO8601 date format
   + New CLI tools for changing cluster preferences, node attributes 
     and node standby
@@ -663,13 +512,13 @@ fi
 * Fri Jul 29 2005  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 2.0.0 - First stable release of the next generation of the Linux-HA project
   + Basic Characteristics described here:
-	http://linux-ha.org/FactSheetv2
+        http://linux-ha.org/FactSheetv2
   + Core infrastructure improvments:
     + Messaging (message acknowledging and flow control)
     + Logging   (logging daemon)
   + Release 1.x style (2-node) clusters fully supported
   + Multi-node support (so far up to 16-node clusters tested)
-	See http://linux-ha.org/GettingStartedV2 for more information
+        See http://linux-ha.org/GettingStartedV2 for more information
   + New components:
     + Cluster Information Base    (replicated resource configuration)
     + Cluster Resource Manager    (supporting 1->N nodes)
@@ -689,12 +538,12 @@ fi
   Known issues in 2.0.0:
     - Under some rare circumstances the cluster manager will time out
       while stabilizing a new cluster state.  This appears to be
-	otherwise harmless - the cluster is actually fine.
-	http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=770
+        otherwise harmless - the cluster is actually fine.
+        http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=770
     - Under some rare circumstances, a dev assert will be triggered
-	in unpack.c.  This results in the pengine getting restarted.
-	This is annoying, but not a disaster.
-	http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=797
+        in unpack.c.  This results in the pengine getting restarted.
+        This is annoying, but not a disaster.
+        http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=797
 
 * Tue May 23 2005  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 1.99.5 - Near-final beta of 2.0.0 release
@@ -715,7 +564,7 @@ fi
     for basic ideas about getting started.
   + Release 1 style (2-node) clusters still fully supported
   + Release 2 style clusters support 1-N node clusters
-	(where N is probably something like 8-32)
+        (where N is probably something like 8-32)
 
 * Tue Mar 20 2005  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 1.99.3 - Near-final beta "technology preview" of 2.0.0 release
@@ -738,12 +587,12 @@ fi
 + Version 1.99.0 - *early* beta series - preparing for 2.0.0
   + All STABLE changes noted below have been ported to this branch
   + Included in this release is a beta of the next generation of Heartbeat
-	resource manager developed by Andrew Beekhof.  
-	http://linuxha.trick.ca/NewHeartbeatDesign is a good place to learn
-	more about this effort. Please examine crm/README, crm/test/README
-	and crm/crm-1.0.dtd for example usage and configuration.
+        resource manager developed by Andrew Beekhof.  
+        http://linuxha.trick.ca/NewHeartbeatDesign is a good place to learn
+        more about this effort. Please examine crm/README, crm/test/README
+        and crm/crm-1.0.dtd for example usage and configuration.
   + Also included is the L(ocal) R(esource) M(anager) developed by IBM China
-	which is an integral part of the NewHeartbeatDesign.
+        which is an integral part of the NewHeartbeatDesign.
   + Known caveats:
     - STONITH as a whole has seen a code cleanup and should be tested
       carefully.
@@ -838,7 +687,7 @@ fi
   + Significant library restructuring
   + Watchdog device NOWAYOUT is now overridded if defaulted
   + Watchdog device now kills machine instantly after deadtime
- 	instead of after one minute
+         instead of after one minute
   + Hostnames should now be treated case-independently...
   + Added new client status APIs - client_status() and cstatus_callback()
   + Fixed bug with auto_failback and quick full restarts
@@ -847,34 +696,34 @@ fi
   + STONITH operations repeat after a 5 second delay, not immediately...
   + Added hb_takeover command - complement to hb_standby
   + Added documentation on how to use evlog/TCP to enable testing to
-	take place without losing messages due to UDP message forwarding
+        take place without losing messages due to UDP message forwarding
   + Several new tests from Mi, Jun - split brain, bandwidth, failure
-	detection time.
+        detection time.
   + Fix to LVM resource from Harald Milz <hm at muc.de>
 
 * Tue Feb 16 2004  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 1.2.0
   + Replaced the nice_failback option with the auto_failback option.
-	THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW
-	TO UPGRADE SMOOTHLY.
+        THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW
+        TO UPGRADE SMOOTHLY.
   + Added a new feature to hb_standby which allows you to give up
-	  any specific category of resources:  local, foreign, or all.
-	The old behavior is "all" which is the default.
-	This allows you to put a auto_failback no cluster into
-	  an active/active configuration on demand.
+          any specific category of resources:  local, foreign, or all.
+        The old behavior is "all" which is the default.
+        This allows you to put a auto_failback no cluster into
+          an active/active configuration on demand.
   + ipfail now works properly with auto_failback on (active/active)
   + ipfail now has "hysteresis" so that it doesn't respond immediately
-	to a network failure, but waits a little while so that the
-	damage can be properly assessed and extraneous takeovers avoided
+        to a network failure, but waits a little while so that the
+        damage can be properly assessed and extraneous takeovers avoided
   + Added new ping node timeout directive "deadping"
   + Made sure heartbeat preallocated stack and heap, and printed a
-	message if we allocate heap once we're started up...
+        message if we allocate heap once we're started up...
   + IPMILan STONITH plugin added to CVS
   + Added IPaddr2 resource script
   + Made the APC smart UPS ups code compatible with more UPSes
   + Added a (preliminary?) ordered messaging facility from Yi Zhu
   + Changed IPaddr's method of doing ARPs in background so that
-	certain timing windows were closed.
+        certain timing windows were closed.
   + Added OCF (wrapper) resource script
   + Allow respawn programs to take arguments
   + Added pinggroups (where any node being up is OK)
@@ -885,11 +734,11 @@ fi
 * Tue Feb 10 2004  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 1.1.5
   + ipfail now has "hysteresis" so that it doesn't respond immediately
-	to a network failure, but waits a little while so that the
-	damage can be properly assessed and extraneous takeovers avoided
+        to a network failure, but waits a little while so that the
+        damage can be properly assessed and extraneous takeovers avoided
   + Several fixes to cl_poll()
   + More fixes to the IPC code - especially handling data reception
-	after EOF
+        after EOF
   + removed some unclean code from GSource for treating EOF conditions
   + Several bugs concerning hanging when shutting down early during startup
   + A few BasicSanityCheck bug fixes
@@ -901,7 +750,7 @@ fi
   + Made init script handle standby correctly for new config files
   + Improved the fast failure detection test
   + Added some backwards compatibility for nice_failback and some default
-	authentication directives
+        authentication directives
   + Corrected the 1.1.4 change log
   
 
@@ -910,7 +759,7 @@ fi
   + ipfail now works properly with auto_failback on (active/active)
   + Changed the API to use sockets (IPC library) instead of FIFOs.
   + Added new apiauth directives to provide authorization information
-	formerly provided by the FIFO permissions.
+        formerly provided by the FIFO permissions.
   + Added Intel's implementation of the SAF data checkpointing API and daemon
   + Added a cleanup suggested by Emily Ratliff.
   + IPMILan STONITH plugin added to CVS
@@ -987,42 +836,42 @@ fi
 * Mon Jul 13 2003  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 1.1.2
   + Replaced the nice_failback option with the auto_failback option.
-	THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW
-	TO UPGRADE SMOOTHLY.
+        THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW
+        TO UPGRADE SMOOTHLY.
   + Changed IPaddr to not do ARPs in background, and shortened time 
-	between ARPs.  Also made these things tunable...
+        between ARPs.  Also made these things tunable...
   + changed our comm ttys to not become our controlling TTYs
   + Enhanced the ServeRAID script to fix a critical bug by using a new feature
   + Added a new DirectoryMap to CVS - tells where everything is...
   + significantly enhanced the BasicSanityCheck script, and the tests
-	it calls.
+        it calls.
   + added a new option to use a replacement poll function for improved
-	real-time performance.
+        real-time performance.
   + added the ability to have a cluster node's name be different
-	from it's uname -n
+        from it's uname -n
   + Moved where CTS gets installed to /usr/lib/heartbeat/cts
   + Big improvements to the CTS README from IBM test labs in Austin.
   + bug fixes to the WTI NPS power switch
   + new client API calls:
-	return arbitrary configuration parameters
-	return current resource status
+        return arbitrary configuration parameters
+        return current resource status
   + Added a new clplumbing function: mssleep()
   + added new capabilities for supporting pseudo-resources
   + added new messages which come out after initial takeover is done
-	 (improves CTS results)
+         (improves CTS results)
   + LOTS of documentation updates.
   + fixed a security vulnerability
   + fixed a bug where heartbeat would shut down while in the middle
-	of processing resource movement requests.
+        of processing resource movement requests.
   + changed compilation flags to eliminate similar future security
-	issues
+        issues
   + went to even-more-strict gcc flags
   + fixed several "reload" bugs.  Now reload works ;-)
   + fixed STONITH bug when other node never heard from.
   + Minor bug fixes (cleaned up corrupted message)
   + Two different client API bugs fixed.
   + changed the configure script to test which warning flags are
-	supported by the current gcc.
+        supported by the current gcc.
   + enhanced the API test program to test new capabilities...
 
 
@@ -1030,20 +879,20 @@ fi
 + Version 1.1.1
   + Significant restructuring of the processes in heartbeat
   + Added a new feature to hb_standby which allows you to give up
-	  any specific category of resources:  local, foreign, or all.
-	The old behavior is "all" which is the default.
-	This allows you to put a nice_failback cluster into
-	  an active/active configuration
+          any specific category of resources:  local, foreign, or all.
+        The old behavior is "all" which is the default.
+        This allows you to put a nice_failback cluster into
+          an active/active configuration
   + Enhancements to the ServeRAID code to make it work with the new
     (supported) version of IPSSEND from the ServeRAID folks...
   + Added STONITH code for the Dell remote access controller
   + Fixed a major bug which kept it from taking over correctly after 246
-	days or so
+        days or so
   + Fixed a major bug where heartbeat didn't lock itself into memory
-	properly
+        properly
   + Added new ping node timeout directive "deadping"
   + Made sure heartbeat preallocated stack and heap, and printed a
-	message if we allocate heap once we're started up...
+        message if we allocate heap once we're started up...
   + Minor heartbeat API bug fixes
   + Minor documentation fixes
   + Minor fix to allow IP addresses with /32 masks...
@@ -1080,7 +929,7 @@ fi
   + Fixed some compile errors on different platforms, and library versions
   + Disable ccm from running on 'ping' nodes
   + Put in Steve Snodgrass' fix to send_arp to make it work on non-primary
-	interfaces.
+        interfaces.
 
 * Thu Feb 13 2003  Alan Robertson <alanr at unix.sh> (see doc/AUTHORS file)
 + Version 1.0.1 beta series
@@ -1128,7 +977,7 @@ fi
   + Heartbeat API client headers fixup
   + Added new API calls
   + Simplified (and fixed) handling of local status.  This would sometimes cause
-	obscure failures on startup.
+        obscure failures on startup.
   + Added new IPsrcaddr resource script
 
   KNOWN BUGS:
@@ -1161,12 +1010,12 @@ fi
   + changed API code to not 1-char reads from clients
   + Ignored certain error conditions from API clients
   + fixed an obscure error message about trying to retransmit a packet
-	which we haven't sent yet.  This happens after restarts.
+        which we haven't sent yet.  This happens after restarts.
   + made the PILS libraries available in a separate package
   + moved the stonith headers to stonith/... when installed
   + improved debugging for NV failure cases...
   + updated AUTHORS file and simplified the changelog authorship
-	(look in AUTHORS for the real story)
+        (look in AUTHORS for the real story)
   + Added Ram Pai's CCM membership code
   + Added the application heartbeat code
   + Added the Kevin Dwyer's ipfail client code to the distribution
@@ -1185,11 +1034,11 @@ fi
   + Cluster partitioning  now handled correctly (really!)
   + Complete rearchitecture of plugin system
   + Complete restructure of build system to use automake and port things
-	to AIX, FreeBSD and solaris.
+        to AIX, FreeBSD and solaris.
   + Added Lclaudio's "standby" capability to put a node into standby
-	mode on demand.
+        mode on demand.
   + Added code to send out gratuitous ARP requests as well as gratuitous
-	arp replies during IP address takeover.
+        arp replies during IP address takeover.
   + Suppress stonith operations for nodes which went down gracefully.
   + Significantly improved real-time performance
   + Added new unicast heartbeat type.
@@ -1236,12 +1085,12 @@ fi
   + Added several new "plumbing" subsystems (IPC, longclock_t, proctrack, etc.)
   + Added a new "contrib" directory.
   + Fixed serious (but trivial) bug in the process tracking code which caused
-	it to exit heartbeat - this occured repeatably for STONITH operations.
+        it to exit heartbeat - this occured repeatably for STONITH operations.
   + Write a 'v' to the watchdog device to tell it not to reboot us when
-	we close the device.
+        we close the device.
   + Various ldirectord fixes due to Horms
   + Minor patch from Lorn Kay to deal with loopback interfaces which might
-	have been put in by LVS direct routing
+        have been put in by LVS direct routing
   + Updated AUTHORS file and moved list of authors over
 
 * Fri Mar 16 2001  Alan Robertson <alanr at unix.sh>
@@ -1250,12 +1099,12 @@ fi
   + Split into 3 rpms - heartbeat, heartbeat-stonith heartbeat-ldirectord
 
   + Made media modules and authentication modules and stonith modules
-	dynamically loadable.
+        dynamically loadable.
 
   + Added Multicast media support
   + Added ping node/membership/link type for tiebreaking.  This will
-	be useful when implementing quorum on 2-node systems.
-	(not yet compatible with nice_failback(?))
+        be useful when implementing quorum on 2-node systems.
+        (not yet compatible with nice_failback(?))
   + Removed ppp support
 
   + Heartbeat client API support
@@ -1264,14 +1113,14 @@ fi
     +   support for the Baytech RPC-3A power switch
     +   support for the APCsmart UPS
     +   support for the VACM cluster management tool
-    +	support for WTI RPS10
-    +	support for Night/Ware RPC100S
-    +	support for "Meatware" (human intervention) module
-    +	support for "null" (testing only) module
+    +        support for WTI RPS10
+    +        support for Night/Ware RPC100S
+    +        support for "Meatware" (human intervention) module
+    +        support for "null" (testing only) module
 
   + Fixed startup timing bugs
   + Fixed shutdown sequence bugs: takeover occured before
-	resources were released by other system
+        resources were released by other system
   + Fixed various logging bugs
   + Closed holes in protection against replay attacks
 
@@ -1304,8 +1153,8 @@ fi
   + Print the version of heartbeat when starting.
   + Print exhaustive version info when starting with debug on.
   + Hosts now have 3 statuses {down, up, active} active means that it knows
-	that all its links are operational, and it's safe to send cluster
-	messages
+        that all its links are operational, and it's safe to send cluster
+        messages
   + Significant revisions to nice_failback (mainly due to lclaudio)
   + More SuSE-compatibility. Thanks to Friedrich Lobenstock <fl at fl.priv.at>
   + Tidied up logging so it can be to files, to syslog or both (Horms)
@@ -1333,7 +1182,7 @@ fi
 * Sat Dec 25 1999 Alan Robertson <alanr at unix.sh>
 + Version 0.4.7
   + Added the nice_failback feature. If the cluster is running when
-	the primary starts it acts as a secondary. (Luis Claudio Goncalves)
+        the primary starts it acts as a secondary. (Luis Claudio Goncalves)
   + Put in lots of code to make lost packet retransmission happen
   + Stopped trying to use the /proc/ha interface
   + Finished the error recovery in the heartbeat protocol (and got it to work)
@@ -1341,12 +1190,12 @@ fi
   + Raised the maximum length of a node name
   + Added Jacob Rief's ldirectord resource type
   + Added Stefan Salzer's <salt at cin.de> fix for a 'grep' in IPaddr which
-	wasn't specific enough and would sometimes get IPaddr confused on
-	IP addresses that prefix-matched.
+        wasn't specific enough and would sometimes get IPaddr confused on
+        IP addresses that prefix-matched.
   + Added Lars Marowsky-Bree's suggestion to make the code almost completely
-	robust with respect to jumping the clock backwards and forwards
+        robust with respect to jumping the clock backwards and forwards
   + Added code from Michael Moerz <mike at cubit.at> to keep findif from
-	core dumping if /proc/route can't be read.
+        core dumping if /proc/route can't be read.
 
 * Mon Nov 22 1999 Alan Robertson <alanr at unix.sh>
 + Version 0.4.6
@@ -1365,7 +1214,7 @@ fi
 * Wed Oct 13 1999 Alan Robertson <alanr at unix.sh>
 + Version 0.4.5
   + Mijta Sarp added a new feature to authenticate heartbeat packets
-	using a variety of strong authentication techniques
+        using a variety of strong authentication techniques
   + Changed resource acquisition and relinquishment to occur in heartbeat,
        instead of in the start/stop script.  This means you don't *really*
        have to use the start/stop script if you don't want to.
@@ -1385,7 +1234,7 @@ fi
   + Fixed a bug where the FIFO doesn't get created correctly.
   + Fixed a couple of uninitialized variables in heartbeat and /proc/ha code
   + Fixed longstanding crash bug related to getting a SIGALRM while in malloc
-	or free.
+        or free.
   + Implemented new memory management scheme, including memory stats
 
 * Thu Sep 16 1999 Alan Robertson <alanr at unix.sh>
@@ -1398,19 +1247,19 @@ fi
   + Changed startup scripts to create /dev/watchdog if needed
   + Turned off loading of /proc/ha module by default.
   + Incorporated bug fix from Thomas Hepper <th at ant.han.de> to IPaddr for
-	PPP configurations
+        PPP configurations
   + Put in a fix from Gregor Howey <ghowey at bremer-nachrichten.de>
-	where Gregor found that I had stripped off the ::resourceid part
-	of the string in ResourceManager resulting in some bad calls later on.
+        where Gregor found that I had stripped off the ::resourceid part
+        of the string in ResourceManager resulting in some bad calls later on.
   +  Made it compliant with the FHS (filesystem hierarchy standard)
   +  Fixed IP address takeover so we can take over on non-eth0 interface
   +  Fixed IP takeover code so we can specify netmasks and broadcast addrs,
-	or default them at the user's option.
+        or default them at the user's option.
   +  Added code to report on message buffer usage on SIGUSR[12]
   +  Made SIGUSR1 increment debug level, and SIGUSR2 decrement it.
   +  Incorporated Rudy's latest "Getting Started" document
   +  Made it largely Debian-compliant.  Thanks to Guenther Thomsen, Thomas
-	Hepper, I?aki Fern?ndez Villanueva and others.
+        Hepper, I?aki Fern?ndez Villanueva and others.
   +  Made changes to work better with Red Hat 6.1, and SMP code.
   +  Sometimes it seems that the Master Control Process dies :-(
 
@@ -1420,14 +1269,14 @@ fi
   + Implemented application notification for groups starting/stopping
   + Eliminated restriction on floating IPs only being associated with eth0
   + Added a uniform resource model, with IP resources being only one kind.
-	(Thanks to Lars Marowsky-Bree for a good suggestion)
+        (Thanks to Lars Marowsky-Bree for a good suggestion)
   + Largely rewrote the IP address takeover code, making it clearer, fit
-	into the uniform resource model, and removing some restrictions.
+        into the uniform resource model, and removing some restrictions.
   + Preliminary "Getting Started" document by Rudy Pawul
   + Improved the /proc/ha code
   + Fixed memory leak associated with serial ports, and problem with return
-	of control to the "master" node.
-	(Thanks to Holger Kiehl for reporting them, and testing fixes!)
+        of control to the "master" node.
+        (Thanks to Holger Kiehl for reporting them, and testing fixes!)
 
 * Tue Jul 6 1999 Alan Robertson <alanr at unix.sh>
 + Version 0.4.1
@@ -1438,24 +1287,24 @@ fi
   + Made logs more uniform and neater
   + Fixed several other minor bugs
   + Added very preliminary kernel code for monitoring and controlling
-	heartbeat via /proc/ha.  Very cool, but not really done yet.
+        heartbeat via /proc/ha.  Very cool, but not really done yet.
 
 * Wed Jun 30 1999 Alan Robertson <alanr at unix.sh>
 + Version 0.4.0
   + Changed packet format from single line positional parameter style
-	to a collection of {name,value} pairs.  A vital change for the future.
+        to a collection of {name,value} pairs.  A vital change for the future.
   + Fixed some bugs with regard to forwarding data around rings
   + We now modify /etc/ppp/ip-up.local, so PPP-udp works out of the box
-	(at least for Red Hat)
+        (at least for Red Hat)
   + Includes the first version of Volker Wiegand's Hardware Installation Guide
-	(it's pretty good for a first version!)
+        (it's pretty good for a first version!)
 
 * Wed Jun 09 1999 Alan Robertson <alanr at unix.sh>
 + Version 0.3.2
   + Added UDP/PPP bidirectional serial ring heartbeat
-	(PPP ensures data integrity on the serial links)
+        (PPP ensures data integrity on the serial links)
   + fixed a stupid bug which caused shutdown to give unpredictable
-	results
+        results
   + added timestamps to /var/log/ha-log messages
   + fixed a couple of other minor oversights.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Dec 2008 06:01:48 -0000	1.10
+++ sources	17 Aug 2009 20:37:26 -0000	1.11
@@ -1 +1 @@
-2e53a9996beb1ff7611d3f7300586951  STABLE-2.1.4.tar.bz2
+573d6b4a12dbf0175aecb08085358726  b37cbb1b036c.tar.bz2



From jjames at fedoraproject.org  Mon Aug 17 20:40:08 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 17 Aug 2009 20:40:08 +0000 (UTC)
Subject: rpms/automaton/F-10 .cvsignore, 1.4, 1.5 automaton.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090817204008.53D3D11C04D1@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6865/F-10

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Mon Aug 17 2009 Jerry James <loganjerry at gmail.com> - 1.11r2-1
- Upgrade to 1.11-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 23:51:12 -0000	1.4
+++ .cvsignore	17 Aug 2009 20:40:08 -0000	1.5
@@ -1 +1 @@
-automaton-1.11-1.tar.gz
+automaton-1.11-2.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-10/automaton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- automaton.spec	6 Jan 2009 23:51:12 -0000	1.3
+++ automaton.spec	17 Aug 2009 20:40:08 -0000	1.4
@@ -1,7 +1,7 @@
 # Upstream uses version-release.  Control the madness here.
-%define upver 1.11
-%define uprel 1
-%define filever %{upver}-%{uprel}
+%global upver 1.11
+%global uprel 2
+%global filever %{upver}-%{uprel}
 
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -40,6 +40,7 @@ symbolic representation based on interva
 %package javadoc
 Summary:        A Java finite state automata/regular expression library
 Group:          Development/Documentation
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}, jpackage-utils
 
 %description javadoc
@@ -97,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/automaton*
 
 %changelog
+* Mon Aug 17 2009 Jerry James <loganjerry at gmail.com> - 1.11r2-1
+- Upgrade to 1.11-2
+
 * Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
 - Upgrade to 1.11-1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 23:51:12 -0000	1.4
+++ sources	17 Aug 2009 20:40:08 -0000	1.5
@@ -1 +1 @@
-e0a3716a32f997214d42824f6278c1ee  automaton-1.11-1.tar.gz
+b440597d82f16f770cba21c42f1df3fa  automaton-1.11-2.tar.gz



From jjames at fedoraproject.org  Mon Aug 17 20:40:08 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 17 Aug 2009 20:40:08 +0000 (UTC)
Subject: rpms/automaton/F-11 .cvsignore, 1.4, 1.5 automaton.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090817204008.A472A11C04D1@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6865/F-11

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Mon Aug 17 2009 Jerry James <loganjerry at gmail.com> - 1.11r2-1
- Upgrade to 1.11-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 23:51:13 -0000	1.4
+++ .cvsignore	17 Aug 2009 20:40:08 -0000	1.5
@@ -1 +1 @@
-automaton-1.11-1.tar.gz
+automaton-1.11-2.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-11/automaton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- automaton.spec	24 Feb 2009 03:30:27 -0000	1.4
+++ automaton.spec	17 Aug 2009 20:40:08 -0000	1.5
@@ -1,13 +1,13 @@
 # Upstream uses version-release.  Control the madness here.
-%define upver 1.11
-%define uprel 1
-%define filever %{upver}-%{uprel}
+%global upver 1.11
+%global uprel 2
+%global filever %{upver}-%{uprel}
 
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:           automaton
 Version:        %{upver}r%{uprel}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A Java finite state automata/regular expression library
 
 Group:          Development/Libraries/Java
@@ -40,6 +40,7 @@ symbolic representation based on interva
 %package javadoc
 Summary:        A Java finite state automata/regular expression library
 Group:          Development/Documentation
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}, jpackage-utils
 
 %description javadoc
@@ -97,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/automaton*
 
 %changelog
+* Mon Aug 17 2009 Jerry James <loganjerry at gmail.com> - 1.11r2-1
+- Upgrade to 1.11-2
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11r1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 23:51:13 -0000	1.4
+++ sources	17 Aug 2009 20:40:08 -0000	1.5
@@ -1 +1 @@
-e0a3716a32f997214d42824f6278c1ee  automaton-1.11-1.tar.gz
+b440597d82f16f770cba21c42f1df3fa  automaton-1.11-2.tar.gz



From jjames at fedoraproject.org  Mon Aug 17 20:40:08 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 17 Aug 2009 20:40:08 +0000 (UTC)
Subject: rpms/automaton/devel .cvsignore, 1.4, 1.5 automaton.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090817204008.EEF5911C04D1@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6865/devel

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Mon Aug 17 2009 Jerry James <loganjerry at gmail.com> - 1.11r2-1
- Upgrade to 1.11-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 23:51:13 -0000	1.4
+++ .cvsignore	17 Aug 2009 20:40:08 -0000	1.5
@@ -1 +1 @@
-automaton-1.11-1.tar.gz
+automaton-1.11-2.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/automaton.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- automaton.spec	24 Jul 2009 17:39:04 -0000	1.5
+++ automaton.spec	17 Aug 2009 20:40:08 -0000	1.6
@@ -1,13 +1,13 @@
 # Upstream uses version-release.  Control the madness here.
-%define upver 1.11
-%define uprel 1
-%define filever %{upver}-%{uprel}
+%global upver 1.11
+%global uprel 2
+%global filever %{upver}-%{uprel}
 
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:           automaton
 Version:        %{upver}r%{uprel}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        A Java finite state automata/regular expression library
 
 Group:          Development/Libraries/Java
@@ -40,6 +40,7 @@ symbolic representation based on interva
 %package javadoc
 Summary:        A Java finite state automata/regular expression library
 Group:          Development/Documentation
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}, jpackage-utils
 
 %description javadoc
@@ -97,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/automaton*
 
 %changelog
+* Mon Aug 17 2009 Jerry James <loganjerry at gmail.com> - 1.11r2-1
+- Upgrade to 1.11-2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11r1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 23:51:13 -0000	1.4
+++ sources	17 Aug 2009 20:40:08 -0000	1.5
@@ -1 +1 @@
-e0a3716a32f997214d42824f6278c1ee  automaton-1.11-1.tar.gz
+b440597d82f16f770cba21c42f1df3fa  automaton-1.11-2.tar.gz



From overholt at fedoraproject.org  Mon Aug 17 20:42:49 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 17 Aug 2009 20:42:49 +0000 (UTC)
Subject: rpms/aqute-bndlib/devel aqute-bndlib.spec,1.3,1.4
Message-ID: <20090817204249.A049E11C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7770

Modified Files:
	aqute-bndlib.spec 
Log Message:
* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 0.0.203-4.2
- Remove gcj support


Index: aqute-bndlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/aqute-bndlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- aqute-bndlib.spec	17 Aug 2009 20:14:52 -0000	1.3
+++ aqute-bndlib.spec	17 Aug 2009 20:42:49 -0000	1.4
@@ -28,15 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _without_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define section   free
-
 Name:           aqute-bndlib
 Version:        0.0.203
-Release:        4.1%{?dist}
+Release:        4.2%{?dist}
 Epoch:          0
 Summary:        BND Library
 License:        ASL 2.0
@@ -47,22 +41,12 @@ Source1:        http://www.aqute.biz/rep
 Patch0:         aQute-bndlib-Filter.patch
 
 
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  java-devel >= 0:1.5.0
 BuildRequires:  ant >= 0:1.6.5
-#BuildRequires:  ecj
 BuildRequires:  eclipse-ecj
 BuildRequires:  eclipse-jdt
 
@@ -90,7 +74,6 @@ Group:          Development/Documentatio
 %description javadoc
 Javadoc for %{name}.
 
-
 %prep
 %setup -q -c
 mkdir -p target/site/apidocs/
@@ -144,30 +127,14 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(0644,root,root,0755)
@@ -175,11 +142,6 @@ fi
 %{_javadir}/%{name}.jar
 %{_datadir}/maven2/poms/JPP-aqute-bndlib.pom
 %{_mavendepmapfragdir}/aqute-bndlib
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -187,6 +149,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 0.0.203-4.2
+- Remove gcj support
+
 * Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0.0.203-4.1
 - Remove unedded BRs at Andrew Overholt's recommendation
 - Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid



From toshio at fedoraproject.org  Mon Aug 17 20:48:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:48:07 +0000 (UTC)
Subject: rpms/TurboGears/EL-5 feedkid.diff, NONE, 1.1 TurboGears.spec, 1.25,
	1.26
Message-ID: <20090817204807.4FCC811C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8726/EL-5

Modified Files:
	TurboGears.spec 
Added Files:
	feedkid.diff 
Log Message:

* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
- Add patch to make FeedController work when the default template engine is
  not kid.


feedkid.diff:
 feed.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE feedkid.diff ---
Index: turbogears/feed/feed.py
===================================================================
--- turbogears/feed/feed.py	(revision 6599)
+++ turbogears/feed/feed.py	(working copy)
@@ -52,7 +52,7 @@
         feed["href"] = turbogears.url("/") + "atom1.0"
         self.depr_entrys(feed)
         return feed
-    atom1_0 = turbogears.expose(template="turbogears.feed.atom1_0",
+    atom1_0 = turbogears.expose(template="kid:turbogears.feed.atom1_0",
                     format="xml", content_type="application/atom+xml")(atom1_0)
 
     def atom0_3(self, **kwargs):
@@ -61,7 +61,7 @@
         feed["href"] = turbogears.url("/") + "atom0.3"
         self.depr_entrys(feed)
         return feed
-    atom0_3 = turbogears.expose(template="turbogears.feed.atom0_3",
+    atom0_3 = turbogears.expose(template="kid:turbogears.feed.atom0_3",
                     format="xml", content_type="application/atom+xml")(atom0_3)
 
     def rss2_0(self, **kwargs):
@@ -69,5 +69,5 @@
         self.format_dates(feed, 822)
         self.depr_entrys(feed)
         return feed
-    rss2_0 = turbogears.expose(template="turbogears.feed.rss2_0",
+    rss2_0 = turbogears.expose(template="kid:turbogears.feed.rss2_0",
                     format="xml", content_type="application/rss+xml")(rss2_0)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- TurboGears.spec	10 Jun 2009 15:19:39 -0000	1.25
+++ TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -14,25 +14,29 @@ Patch0:         %{name}-%{version}-cherr
 Patch1:         %{name}-%{version}-setup.patch
 # From upstream changeset r6575
 Patch2:         %{name}-%{version}-paginate.patch
+# From upstream bug report: http://trac.turbogears.org/ticket/2348
+# Going into TG-1.1 but not TG-1.0.x
+Patch3: feedkid.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires: python-devel python-setuptools-devel
-BuildRequires:  python-elementtree >= 1.2.6
+
 BuildRequires: python-nose python-configobj python-ruledispatch
 BuildRequires: python-decoratortools python-turbojson python-simplejson python-kid
 BuildRequires: python-formencode python-turbokid python-turbocheetah
 BuildRequires: python-paste-script python-sqlobject python-sqlalchemy
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires:       python-cherrypy2
 BuildRequires:	python-cherrypy2
 %else
-Requires:       python-cherrypy
+BuildRequires:  python-elementtree >= 1.2.6
 BuildRequires:	python-cherrypy
+Requires:       python-elementtree >= 1.2.6
+Requires:       python-cherrypy
 %endif
 
-Requires:       python-elementtree >= 1.2.6
 Requires:       python-sqlalchemy
 Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
@@ -71,7 +75,7 @@ TurboGears is easy to use for a wide ran
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
-
+%patch3 -p0 -b .feedkid
 
 %build
 %{__python} setup.py build
@@ -94,10 +98,17 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
-* Wed Jun 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-5
-- Remove the python-json requirement
+* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
+- Add patch to make FeedController work when the default template engine is
+  not kid.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
+- Remove python-json as a requirement
 
-* Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-4
+* Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
 - Fix from upstream for pagination problem.
 
 * Sat Mar 07 2009 Luke Macken <lmacken at redhat.com> 1.0.8-3



From toshio at fedoraproject.org  Mon Aug 17 20:48:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:48:07 +0000 (UTC)
Subject: rpms/TurboGears/F-10 feedkid.diff, NONE, 1.1 TurboGears.spec, 1.42,
	1.43
Message-ID: <20090817204807.74B3C11C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8726/F-10

Modified Files:
	TurboGears.spec 
Added Files:
	feedkid.diff 
Log Message:

* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
- Add patch to make FeedController work when the default template engine is
  not kid.


feedkid.diff:
 feed.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE feedkid.diff ---
Index: turbogears/feed/feed.py
===================================================================
--- turbogears/feed/feed.py	(revision 6599)
+++ turbogears/feed/feed.py	(working copy)
@@ -52,7 +52,7 @@
         feed["href"] = turbogears.url("/") + "atom1.0"
         self.depr_entrys(feed)
         return feed
-    atom1_0 = turbogears.expose(template="turbogears.feed.atom1_0",
+    atom1_0 = turbogears.expose(template="kid:turbogears.feed.atom1_0",
                     format="xml", content_type="application/atom+xml")(atom1_0)
 
     def atom0_3(self, **kwargs):
@@ -61,7 +61,7 @@
         feed["href"] = turbogears.url("/") + "atom0.3"
         self.depr_entrys(feed)
         return feed
-    atom0_3 = turbogears.expose(template="turbogears.feed.atom0_3",
+    atom0_3 = turbogears.expose(template="kid:turbogears.feed.atom0_3",
                     format="xml", content_type="application/atom+xml")(atom0_3)
 
     def rss2_0(self, **kwargs):
@@ -69,5 +69,5 @@
         self.format_dates(feed, 822)
         self.depr_entrys(feed)
         return feed
-    rss2_0 = turbogears.expose(template="turbogears.feed.rss2_0",
+    rss2_0 = turbogears.expose(template="kid:turbogears.feed.rss2_0",
                     format="xml", content_type="application/rss+xml")(rss2_0)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-10/TurboGears.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- TurboGears.spec	2 May 2009 17:35:45 -0000	1.42
+++ TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.43
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -14,6 +14,9 @@ Patch0:         %{name}-%{version}-cherr
 Patch1:         %{name}-%{version}-setup.patch
 # From upstream changeset r6575
 Patch2:         %{name}-%{version}-paginate.patch
+# From upstream bug report: http://trac.turbogears.org/ticket/2348
+# Going into TG-1.1 but not TG-1.0.x
+Patch3: feedkid.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -24,19 +27,20 @@ BuildRequires: python-decoratortools pyt
 BuildRequires: python-formencode python-turbokid python-turbocheetah
 BuildRequires: python-paste-script python-sqlobject python-sqlalchemy
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires:       python-cherrypy2
 BuildRequires:	python-cherrypy2
 %else
-Requires:       python-cherrypy
+BuildRequires:  python-elementtree >= 1.2.6
 BuildRequires:	python-cherrypy
+Requires:       python-elementtree >= 1.2.6
+Requires:       python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
 Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
-Requires:       python-json >= 3.3
 Requires:       python-setuptools >= 0.6c2
 Requires:       python-turbocheetah >= 1.0
 Requires:       python-turbojson >= 1.1.2
@@ -71,7 +75,7 @@ TurboGears is easy to use for a wide ran
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
-
+%patch3 -p0 -b .feedkid
 
 %build
 %{__python} setup.py build
@@ -94,6 +98,16 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
+- Add patch to make FeedController work when the default template engine is
+  not kid.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
+- Remove python-json as a requirement
+
 * Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
 - Fix from upstream for pagination problem.
 



From toshio at fedoraproject.org  Mon Aug 17 20:48:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:48:07 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears.spec,1.47,1.48
Message-ID: <20090817204807.BFF2511C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8726/devel

Modified Files:
	TurboGears.spec 
Log Message:

* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
- Add patch to make FeedController work when the default template engine is
  not kid.



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- TurboGears.spec	12 Aug 2009 23:24:38 -0000	1.47
+++ TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.48
@@ -27,12 +27,14 @@ BuildRequires: python-decoratortools pyt
 BuildRequires: python-formencode python-turbokid python-turbocheetah
 BuildRequires: python-paste-script python-sqlobject python-sqlalchemy
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires:       python-cherrypy2
 BuildRequires:	python-cherrypy2
 %else
-Requires:       python-cherrypy
+BuildRequires:  python-elementtree >= 1.2.6
 BuildRequires:	python-cherrypy
+Requires:       python-elementtree >= 1.2.6
+Requires:       python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy



From toshio at fedoraproject.org  Mon Aug 17 20:48:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:48:07 +0000 (UTC)
Subject: rpms/TurboGears/F-11 feedkid.diff, NONE, 1.1 TurboGears.spec, 1.44,
	1.45
Message-ID: <20090817204807.9B2AE11C0346@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8726/F-11

Modified Files:
	TurboGears.spec 
Added Files:
	feedkid.diff 
Log Message:

* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
- Add patch to make FeedController work when the default template engine is
  not kid.


feedkid.diff:
 feed.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE feedkid.diff ---
Index: turbogears/feed/feed.py
===================================================================
--- turbogears/feed/feed.py	(revision 6599)
+++ turbogears/feed/feed.py	(working copy)
@@ -52,7 +52,7 @@
         feed["href"] = turbogears.url("/") + "atom1.0"
         self.depr_entrys(feed)
         return feed
-    atom1_0 = turbogears.expose(template="turbogears.feed.atom1_0",
+    atom1_0 = turbogears.expose(template="kid:turbogears.feed.atom1_0",
                     format="xml", content_type="application/atom+xml")(atom1_0)
 
     def atom0_3(self, **kwargs):
@@ -61,7 +61,7 @@
         feed["href"] = turbogears.url("/") + "atom0.3"
         self.depr_entrys(feed)
         return feed
-    atom0_3 = turbogears.expose(template="turbogears.feed.atom0_3",
+    atom0_3 = turbogears.expose(template="kid:turbogears.feed.atom0_3",
                     format="xml", content_type="application/atom+xml")(atom0_3)
 
     def rss2_0(self, **kwargs):
@@ -69,5 +69,5 @@
         self.format_dates(feed, 822)
         self.depr_entrys(feed)
         return feed
-    rss2_0 = turbogears.expose(template="turbogears.feed.rss2_0",
+    rss2_0 = turbogears.expose(template="kid:turbogears.feed.rss2_0",
                     format="xml", content_type="application/rss+xml")(rss2_0)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- TurboGears.spec	2 May 2009 17:35:45 -0000	1.44
+++ TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.45
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -14,6 +14,9 @@ Patch0:         %{name}-%{version}-cherr
 Patch1:         %{name}-%{version}-setup.patch
 # From upstream changeset r6575
 Patch2:         %{name}-%{version}-paginate.patch
+# From upstream bug report: http://trac.turbogears.org/ticket/2348
+# Going into TG-1.1 but not TG-1.0.x
+Patch3: feedkid.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -24,19 +27,20 @@ BuildRequires: python-decoratortools pyt
 BuildRequires: python-formencode python-turbokid python-turbocheetah
 BuildRequires: python-paste-script python-sqlobject python-sqlalchemy
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires:       python-cherrypy2
 BuildRequires:	python-cherrypy2
 %else
-Requires:       python-cherrypy
+BuildRequires:  python-elementtree >= 1.2.6
 BuildRequires:	python-cherrypy
+Requires:       python-elementtree >= 1.2.6
+Requires:       python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
 Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
-Requires:       python-json >= 3.3
 Requires:       python-setuptools >= 0.6c2
 Requires:       python-turbocheetah >= 1.0
 Requires:       python-turbojson >= 1.1.2
@@ -71,7 +75,7 @@ TurboGears is easy to use for a wide ran
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
-
+%patch3 -p0 -b .feedkid
 
 %build
 %{__python} setup.py build
@@ -94,6 +98,16 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
+- Add patch to make FeedController work when the default template engine is
+  not kid.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
+- Remove python-json as a requirement
+
 * Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
 - Fix from upstream for pagination problem.
 



From overholt at fedoraproject.org  Mon Aug 17 20:49:55 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 17 Aug 2009 20:49:55 +0000 (UTC)
Subject: rpms/plexus-classworlds/devel import.log, NONE,
	1.1 plexus-classworlds-1.2-build.xml, 1.1,
	1.2 plexus-classworlds-1.2-jpp-depmap.xml, 1.1,
	1.2 plexus-classworlds-1.2-pom_xml.patch, 1.1,
	1.2 plexus-classworlds-settings.xml, 1.1,
	1.2 plexus-classworlds.spec, 1.1, 1.2 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090817204955.D88FE11C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-classworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9366/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-classworlds-1.2-build.xml 
	plexus-classworlds-1.2-jpp-depmap.xml 
	plexus-classworlds-1.2-pom_xml.patch 
	plexus-classworlds-settings.xml plexus-classworlds.spec 
Log Message:
Initial import of plexus-classworlds (#500246).


--- NEW FILE import.log ---
plexus-classworlds-1_2-0_a9_6_jpp6:HEAD:plexus-classworlds-1.2-0.a9.6.jpp6.src.rpm:1250542121


Index: plexus-classworlds-1.2-build.xml
===================================================================
RCS file: plexus-classworlds-1.2-build.xml
diff -N plexus-classworlds-1.2-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-classworlds-1.2-build.xml	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1,99 @@
+<project name="plexus-classworlds" default="jar" basedir=".">
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="plexus-classworlds-1.2-alpha-9"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="javadocdir" value="target/site/apidocs"></property>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="junit/junit/3.8.2/junit-3.8.2.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-classworlds-1.2-alpha-9/junit/junit/3.8.2"/>
+    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-classworlds-1.2-alpha-9/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar" dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-classworlds-1.2-alpha-9/external_repo/junit/junit/3.8.2/junit-3.8.2.jar" dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-classworlds-1.2-alpha-9/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar" dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://snapshots.maven.codehaus.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/junit/junit/3.8.2/junit-3.8.2.jar" dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
+    <property name="title" value="Plexus Classworlds 1.2-alpha-9 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
+      <classpath>
+        <path refid="build.classpath"></path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: plexus-classworlds-1.2-jpp-depmap.xml
===================================================================
RCS file: plexus-classworlds-1.2-jpp-depmap.xml
diff -N plexus-classworlds-1.2-jpp-depmap.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-classworlds-1.2-jpp-depmap.xml	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1,27 @@
+<dependencies>
+  <dependency>
+    <maven>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </maven>
+    <jpp>
+      <groupId>JPP</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+    </jpp>
+  </dependency>
+  <dependency>
+    <maven>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0.4</version>
+    </maven>
+    <jpp>
+      <groupId>JPP/plexus</groupId>
+      <artifactId>utils</artifactId>
+      <version>1.4.5</version>
+    </jpp>
+  </dependency>
+
+</dependencies>

plexus-classworlds-1.2-pom_xml.patch:
 pom.xml |    7 +++++++
 1 file changed, 7 insertions(+)

Index: plexus-classworlds-1.2-pom_xml.patch
===================================================================
RCS file: plexus-classworlds-1.2-pom_xml.patch
diff -N plexus-classworlds-1.2-pom_xml.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-classworlds-1.2-pom_xml.patch	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1,16 @@
+--- pom.xml.sav	2007-08-14 16:29:45.000000000 +0200
++++ pom.xml	2007-08-14 16:30:40.000000000 +0200
+@@ -31,6 +31,13 @@
+   <inceptionYear>2002</inceptionYear>
+   <dependencies>
+     <dependency>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-utils</artifactId>
++      <version>1.0.4</version>
++      <type>jar</type>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <version>3.8.1</version>


Index: plexus-classworlds-settings.xml
===================================================================
RCS file: plexus-classworlds-settings.xml
diff -N plexus-classworlds-settings.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-classworlds-settings.xml	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1,47 @@
+<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>


Index: plexus-classworlds.spec
===================================================================
RCS file: plexus-classworlds.spec
diff -N plexus-classworlds.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-classworlds.spec	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1,229 @@
+# Copyright (c) 2000-2007, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
+%define parent plexus
+%define subname classworlds
+%define namedversion 1.2-alpha-9
+
+Name:           %{parent}-%{subname}
+Version:        1.2
+Release:        0.a9.6%{?dist}
+Epoch:          0
+Summary:        Plexus Classworlds Classloader Framework
+License:        ASL 2.0 and Plexus
+Group:          Development/Java
+URL:            http://plexus.codehaus.org/
+# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds
+# tar czf plexus-classworlds-1.0-alpha-9.tar.gz plexus-classworlds/
+Source0:        %{name}-%{namedversion}-src.tar.gz
+
+Source1:        plexus-classworlds-1.2-build.xml
+Source3:        plexus-classworlds-settings.xml
+Source4:        plexus-classworlds-1.2-jpp-depmap.xml
+
+Patch0:         plexus-classworlds-1.2-pom_xml.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+
+BuildRequires:  jpackage-utils >= 0:1.7.3
+BuildRequires:  ant >= 0:1.6.5
+BuildRequires:  jakarta-commons-logging
+BuildRequires:  xml-commons-jaxp-1.3-apis
+%if %{with_maven}
+BuildRequires:  maven2 >= 2.0.4-10jpp
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire = 2.3
+BuildRequires:  maven-surefire-provider-junit = 2.3
+BuildRequires:	maven-doxia
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:	maven-release
+%endif
+BuildRequires:  plexus-utils 
+%if %{gcj_support}
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description
+Classworlds is a framework for container developers
+who require complex manipulation of Java's ClassLoaders.
+Java's native ClassLoader mechanims and classes can cause
+much headache and confusion for certain types of
+application developers. Projects which involve dynamic
+loading of components or otherwise represent a 'container'
+can benefit from the classloading control provided by
+classworlds.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
+
+%description javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{namedversion}
+for j in $(find . -name "*.jar" | grep -v /test-data/ | grep -v /test-jars/); do
+        mv $j $j.no
+done
+cp %{SOURCE1} build.xml
+cp %{SOURCE3} settings.xml
+%patch0 -b .sav
+ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) lib/xml-apis-1.3.02.jar
+ln -sf $(build-classpath ant) lib/ant-1.6.5.jar
+ln -sf $(build-classpath commons-logging) lib/commons-logging-1.0.3.jar
+
+%build
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# org.codehaus.plexus.classworlds.strategy.StrategyTest fails 
+# upstream, so ignore failures for now
+
+%if %{with_maven}
+mvn-jpp \
+        -e \
+        -Dmaven.test.failure.ignore=true \
+		-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        install javadoc:javadoc
+
+%else
+export CLASSPATH=
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+
+ant -Dbuild.sysclasspath=only jar javadoc
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+install -pm 644 target/%{name}-%{namedversion}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
+
+(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/%{parent}
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
+%endif
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/*
+
+%changelog
+* Thu May 14 2009 Fernando Nasser <fnasser at redhat.com> 0:1.2-0.a9.6
+- Fix license specification
+
+* Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.5
+- Add BRs maven2-plugin-surfire*, maven-doxia*
+- Rebuild with maven2-2.0.8 built in non-bootstrap mode
+
+* Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
+
+* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.3jpp.1
+- re-build with maven 
+
+* Tue Jan 06 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.2jpp.1
+- Imported into devel from dbhole's maven 2.0.8 packages
+
+* Wed Jan 30 2008 Deepak Bhole <dbhole at redhat.com> 0:1.2-0.a9.1jpp.1
+- Initial build -- merged from JPackage


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-classworlds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2009 04:23:41 -0000	1.1
+++ .cvsignore	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1 @@
+plexus-classworlds-1.2-alpha-9-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-classworlds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2009 04:23:41 -0000	1.1
+++ sources	17 Aug 2009 20:49:55 -0000	1.2
@@ -0,0 +1 @@
+8d47284e931d04d75a264beea546aedc  plexus-classworlds-1.2-alpha-9-src.tar.gz



From toshio at fedoraproject.org  Mon Aug 17 20:56:28 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:56:28 +0000 (UTC)
Subject: rpms/TurboGears/F-10 TurboGears.spec,1.43,1.44
Message-ID: <20090817205628.E6F6911C0346@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10452/F-10

Modified Files:
	TurboGears.spec 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
- Update Requires conditionals so we can share with EPEL



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-10/TurboGears.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.43
+++ TurboGears.spec	17 Aug 2009 20:56:28 -0000	1.44
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
+- Update Requires conditionals so we can share with EPEL
+
 * Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
 - Add patch to make FeedController work when the default template engine is
   not kid.



From toshio at fedoraproject.org  Mon Aug 17 20:56:29 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:56:29 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears.spec,1.48,1.49
Message-ID: <20090817205629.4096E11C0416@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10452/devel

Modified Files:
	TurboGears.spec 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
- Update Requires conditionals so we can share with EPEL



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.48
+++ TurboGears.spec	17 Aug 2009 20:56:29 -0000	1.49
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
+- Update Requires conditionals so we can share with EPEL
+
 * Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
 - Add patch to make FeedController work when the default template engine is
   not kid.



From toshio at fedoraproject.org  Mon Aug 17 20:56:28 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:56:28 +0000 (UTC)
Subject: rpms/TurboGears/EL-5 TurboGears.spec,1.26,1.27
Message-ID: <20090817205628.CF56711C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10452/EL-5

Modified Files:
	TurboGears.spec 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
- Update Requires conditionals so we can share with EPEL



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.26
+++ TurboGears.spec	17 Aug 2009 20:56:28 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
+- Update Requires conditionals so we can share with EPEL
+
 * Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
 - Add patch to make FeedController work when the default template engine is
   not kid.



From toshio at fedoraproject.org  Mon Aug 17 20:56:29 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 17 Aug 2009 20:56:29 +0000 (UTC)
Subject: rpms/TurboGears/F-11 TurboGears.spec,1.45,1.46
Message-ID: <20090817205629.154FC11C034A@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10452/F-11

Modified Files:
	TurboGears.spec 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
- Update Requires conditionals so we can share with EPEL



Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.45
+++ TurboGears.spec	17 Aug 2009 20:56:28 -0000	1.46
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-7
+- Update Requires conditionals so we can share with EPEL
+
 * Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
 - Add patch to make FeedController work when the default template engine is
   not kid.



From jwilson at fedoraproject.org  Mon Aug 17 21:33:04 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 17 Aug 2009 21:33:04 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest86+-2.11-make-gcc4-builds-work.patch, 
	NONE, 1.1 memtest86+.spec, 1.47, 1.48
Message-ID: <20090817213304.6EFA011C00E4@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19106

Modified Files:
	memtest86+.spec 
Added Files:
	memtest86+-2.11-make-gcc4-builds-work.patch 
Log Message:
* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> - 2.11-11
- Fix runtime operation when built with gcc4.2+ (#442285)


memtest86+-2.11-make-gcc4-builds-work.patch:
 test.c |   80 ++++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

--- NEW FILE memtest86+-2.11-make-gcc4-builds-work.patch ---
--- memtest86+-2.11/test.c.orig	2008-11-15 19:18:14.000000000 -0500
+++ memtest86+-2.11/test.c	2009-08-17 17:21:42.904932613 -0400
@@ -13,6 +13,7 @@
 #include "config.h"
 #include <sys/io.h>
 #include "dmi.h"
+#include <inttypes.h>
 
 extern int segs, bail;
 extern volatile ulong *p;
@@ -150,7 +151,7 @@ void addr_tst2()
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
@@ -194,7 +195,7 @@ void addr_tst2()
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
@@ -256,17 +257,19 @@ void addr_tst2()
  */
 void movinvr()
 {
-	int i, j, done, seed1, seed2;
+	int i, seed1, seed2;
+	int j, done;
 	volatile ulong *pe;
 	volatile ulong *start,*end;
 	ulong num;
+	uintptr_t next;
 
 	/* Initialize memory with initial sequence of random numbers.  */
 	if (v->rdtsc) {
 		asm __volatile__ ("rdtsc":"=a" (seed1),"=d" (seed2));
 	} else {
-		seed1 = 521288629 + v->pass;
-		seed2 = 362436069 - v->pass;
+		seed1 = (int)(521288629 + v->pass);
+		seed2 = (int)(362436069 - v->pass);
 	}
 
 	/* Display the current seed */
@@ -277,28 +280,20 @@ void movinvr()
 		end = v->map[j].end;
 		pe = start;
 		p = start;
+		next = (uintptr_t)p;
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if (((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) &&
+			    ((uintptr_t)(pe + SPINSZ) < (uintptr_t)end)) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
-			}
-			if (pe >= end) {
-				pe = end;
 				done++;
 			}
-			if (p == pe ) {
+			if (next == (uintptr_t)pe) {
 				break;
 			}
-/* Original C code replaced with hand tuned assembly code */
-/*
-			for (; p < pe; p++) {
-				*p = rand();
-			}
- */
-
 			asm __volatile__ (
 				"jmp L200\n\t"
 				".p2align 4,,7\n\t"
@@ -310,7 +305,7 @@ void movinvr()
 				"jb L200\n\t"
 				: "=D" (p)
 				: "D" (p), "b" (pe)
-				: "eax"
+				: "eax", "edx"
 			);
 
 			do_tick();
@@ -324,23 +319,28 @@ void movinvr()
 	for (i=0; i<2; i++) {
 		rand_seed(seed1, seed2);
 		for (j=0; j<segs; j++) {
-			start = v->map[j].start;
-			end = v->map[j].end;
+			start = (ulong *)(v->map[j].start);
+			end = (ulong *)(v->map[j].end);
 			pe = start;
 			p = start;
 			done = 0;
 			do {
 				/* Check for overflow */
-				if (pe + SPINSZ > pe) {
+				next = (uintptr_t)(pe + SPINSZ);
+				if ((next > (uintptr_t)pe) &&
+				    (next < (uintptr_t)end)) {
 					pe += SPINSZ;
 				} else {
 					pe = end;
+					done++;
 				}
+#if 0
 				if (pe >= end) {
 					pe = end;
 					done++;
 				}
-				if (p == pe ) {
+#endif
+				if ((uintptr_t)p == (uintptr_t)pe) {
 					break;
 				}
 /* Original C code replaced with hand tuned assembly code */
@@ -359,8 +359,9 @@ void movinvr()
 				if (i) {
 					num = 0xffffffff;
 				} else {
-					num = 0;
+					num = 0x0;
 				}
+	
 				asm __volatile__ (
 					"jmp L26\n\t" \
 
@@ -427,7 +428,7 @@ void movinv1(int iter, ulong p1, ulong p
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
@@ -468,7 +469,7 @@ void movinv1(int iter, ulong p1, ulong p
 			done = 0;
 			do {
 				/* Check for overflow */
-				if (pe + SPINSZ > pe) {
+				if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 					pe += SPINSZ;
 				} else {
 					pe = end;
@@ -534,7 +535,7 @@ void movinv1(int iter, ulong p1, ulong p
 			done = 0;
 			do {
 				/* Check for underflow */
-				if (pe - SPINSZ < pe) {
+				if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) {
 					pe -= SPINSZ;
 				} else {
 					pe = start;
@@ -623,7 +624,7 @@ void movinv32(int iter, ulong p1, ulong 
 		pat = p1;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
@@ -685,7 +686,7 @@ void movinv32(int iter, ulong p1, ulong 
 			pat = p1;
 			do {
 				/* Check for overflow */
-				if (pe + SPINSZ > pe) {
+				if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 					pe += SPINSZ;
 				} else {
 					pe = end;
@@ -798,7 +799,7 @@ void movinv32(int iter, ulong p1, ulong 
 			done = 0;
 			do {
 				/* Check for underflow */
-				if (pe - SPINSZ < pe) {
+				if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) {
 					pe -= SPINSZ;
 				} else {
 					pe = start;
@@ -906,7 +907,7 @@ void modtst(int offset, int iter, ulong 
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
@@ -951,7 +952,7 @@ void modtst(int offset, int iter, ulong 
 			k = 0;
 			do {
 				/* Check for overflow */
-				if (pe + SPINSZ > pe) {
+				if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 					pe += SPINSZ;
 				} else {
 					pe = end;
@@ -1009,7 +1010,7 @@ void modtst(int offset, int iter, ulong 
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ > pe) {
+			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
 				pe += SPINSZ;
 			} else {
 				pe = end;
@@ -1098,8 +1099,9 @@ void block_move(int iter)
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ*4 > pe) {
-				pe += SPINSZ*4;
+			if ((uintptr_t)(pe + SPINSZ * sizeof(ulong)) >
+			    (uintptr_t)pe) {
+				pe += SPINSZ * sizeof(ulong);
 			} else {
 				pe = end;
 			}
@@ -1167,8 +1169,9 @@ void block_move(int iter)
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ*4 > pe) {
-				pe += SPINSZ*4;
+			if ((uintptr_t)(pe + SPINSZ * sizeof(ulong)) >
+			    (uintptr_t)pe) {
+				pe += SPINSZ * sizeof(ulong);
 			} else {
 				pe = end;
 			}
@@ -1234,8 +1237,9 @@ void block_move(int iter)
 		done = 0;
 		do {
 			/* Check for overflow */
-			if (pe + SPINSZ*4 > pe) {
-				pe += SPINSZ*4;
+			if ((uintptr_t)(pe + SPINSZ * sizeof(ulong)) >
+			    (uintptr_t)pe) {
+				pe += SPINSZ * sizeof(ulong);
 			} else {
 				pe = end;
 			}


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- memtest86+.spec	25 Jul 2009 12:02:37 -0000	1.47
+++ memtest86+.spec	17 Aug 2009 21:33:04 -0000	1.48
@@ -7,13 +7,14 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  10%{?dist}
+Release:  11%{?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
+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:
@@ -39,13 +40,14 @@ to add the %{name} entry to your GRUB bo
 
 %prep
 %setup -q 
+%patch0 -p1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
 # 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 +86,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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
 



From davidz at fedoraproject.org  Mon Aug 17 21:49:20 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon, 17 Aug 2009 21:49:20 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec, 1.17,
	1.18 drop-polkit.patch, 1.1, NONE
Message-ID: <20090817214920.1AB4211C00E4@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22365

Modified Files:
	gnome-disk-utility.spec 
Removed Files:
	drop-polkit.patch 
Log Message:
* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
- Drop upstreamed patch




Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gnome-disk-utility.spec	17 Aug 2009 18:16:13 -0000	1.17
+++ gnome-disk-utility.spec	17 Aug 2009 21:49:19 -0000	1.18
@@ -12,7 +12,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -38,8 +38,6 @@ Requires: %{name}-libs = %{version}-%{re
 Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
 
-Patch0: drop-polkit.patch
-
 %description
 This package contains the Palimpsest disk management application.
 Palimpsest supports partitioning, file system creation, encryption,
@@ -94,7 +92,6 @@ develop applications with gnome-disk-uti
 
 %prep
 %setup -q
-%patch0 -p1 -b .drop-polkit
 
 %build
 %configure
@@ -211,6 +208,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-3%{?dist}
+- Drop upstreamed patch
+
 * Mon Aug 17 2009 David Zeuthen <davidz at redhat.com> - 0.5-2%{?dist}
 - Rebuild
 


--- drop-polkit.patch DELETED ---



From pwouters at fedoraproject.org  Mon Aug 17 22:08:44 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 17 Aug 2009 22:08:44 +0000 (UTC)
Subject: rpms/nsd/EL-5 .cvsignore, 1.6, 1.7 nsd.spec, 1.25, 1.26 sources, 1.9,
	1.10
Message-ID: <20090817220844.5580B11C00E4@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27009

Modified Files:
	.cvsignore nsd.spec sources 
Log Message:
* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-2
- Updated to 3.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Apr 2007 03:20:39 -0000	1.6
+++ .cvsignore	17 Aug 2009 22:08:44 -0000	1.7
@@ -1,3 +1,4 @@
 nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
 nsd-2.3.7.tar.gz
+nsd-3.2.3.tar.gz


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- nsd.spec	6 Jun 2009 15:51:03 -0000	1.25
+++ nsd.spec	17 Aug 2009 22:08:44 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.2.2
+Version: 3.2.3
 Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-2
+- Updated to 3.2.3
+
 * Sat Jun 06 2009 Paul Wouters <paul at xelerance.com> - 3.2.2-2
 - Fix %1 error on cronjob. Updated Description:
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 May 2009 22:22:43 -0000	1.9
+++ sources	17 Aug 2009 22:08:44 -0000	1.10
@@ -1 +1,2 @@
 a0dcb0a3b3c1a8d386125eeafe403f58  nsd-3.2.2.tar.gz
+5ddb35dfb7da0defb82cda4f7388cba2  nsd-3.2.3.tar.gz



From jlblanco at fedoraproject.org  Mon Aug 17 22:17:44 2009
From: jlblanco at fedoraproject.org (Jose Luis Blanco)
Date: Mon, 17 Aug 2009 22:17:44 +0000 (UTC)
Subject: rpms/mrpt/devel mrpt.spec,1.4,1.5
Message-ID: <20090817221744.3FB0711C00E4@cvs1.fedora.phx.redhat.com>

Author: jlblanco

Update of /cvs/pkgs/rpms/mrpt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28576

Modified Files:
	mrpt.spec 
Log Message:
Update .spec file for new upstream package version.




Index: mrpt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/mrpt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mrpt.spec	25 Jul 2009 15:15:01 -0000	1.4
+++ mrpt.spec	17 Aug 2009 22:17:44 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Libraries and programs for mobile robot SLAM and navigation
 Name: mrpt
-Version: 0.7.0
-Release: 0.2.20090529svn1047%{?dist}
+Version: 0.7.1
+Release: 0.1.20090817svn1147%{?dist}
 License: GPLv3+
 Group: Development/Libraries
 URL: http://babel.isa.uma.es/mrpt/
@@ -11,11 +11,10 @@ URL: http://babel.isa.uma.es/mrpt/
 # but without the directory "otherlibs/sift-hess", which contains code with a 
 # patent pending for approval.
 
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  svn export http://babel.isa.uma.es/mrpt-browse-code/mrpt-0.7.0 mrpt-0.7.0
-#  tar -czvf mrpt-0.7.0-20090529svn1047.tar.gz mrpt-0.70
-Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.0-20090529svn1047.tar.gz
+# The source for this package was pulled from upstream's vcs, or 
+#  download from: http://babel.isa.uma.es/mrpt/src-repo/
+#
+Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.1-20090817svn1147.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,22 +47,10 @@ applications.
 The MRPT is free software and is released under the GPL. 
 
 
-# Subpackages "ann", "aria", "core", "hwdrivers", and "reactivenav" are provided
-# in order to minimize dependencies of future packages that might depend on a
-# subset only of all the MRPT libraries. The subpackage "libs" can be used as 
-# a shortcut for all the libraries.
-
-%package ann
-Summary: Mobile Robot Programming Toolkit - Approximate Nearest Neighbor library
-Group: Development/Libraries
-%description ann
-The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
-and open source C++ library aimed to help robotics researchers to design and
-implement algorithms in the fields of Simultaneous Localization and Mapping 
-(SLAM), computer vision, and motion planning (obstacle avoidance).
-
-This package provides the MRPT built-in ANN (Approximate Nearest Neighbor) 
-library, by David M. Mount  and Sunil Arya.
+# Subpackages "aria", "core", "hwdrivers", "reactivenav", "monoslam" and 
+# "stereoslam" are provided in order to minimize dependencies of future
+# packages that might depend on a subset only of all the MRPT libraries. 
+# The subpackage "libs" can be used as a shortcut for all the libraries.
 
 %package aria
 Summary: Mobile Robot Programming Toolkit - ActiveMedia's ARIA library
@@ -118,6 +105,27 @@ implement algorithms in the fields of Si
 This package provides the mrpt-reactivenav library, with implementation of 
 reactive navigation algorithms (VFF, ND, PTG-based space transformations).
 
+%package monoslam
+Summary: Mobile Robot Programming Toolkit - Monocular SLAM library
+Group: Development/Libraries
+%description monoslam
+The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
+and open source C++ library aimed to help robotics researchers to design and
+implement algorithms in the fields of Simultaneous Localization and Mapping 
+(SLAM), computer vision, and motion planning (obstacle avoidance).
+
+This package provides the monocular SLAM library.
+
+%package stereoslam
+Summary: Mobile Robot Programming Toolkit - Stereo SLAM library
+Group: Development/Libraries
+%description stereoslam
+The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
+and open source C++ library aimed to help robotics researchers to design and
+implement algorithms in the fields of Simultaneous Localization and Mapping 
+(SLAM), computer vision, and motion planning (obstacle avoidance).
+
+This package provides the stereoscopic SLAM library.
 
 %package apps
 Summary: Mobile Robot Programming Toolkit - Console and GUI applications
@@ -125,6 +133,8 @@ Group: Applications/Engineering
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-reactivenav = %{version}-%{release}
 Requires: %{name}-hwdrivers = %{version}-%{release}
+Requires: %{name}-monoslam = %{version}-%{release}
+Requires: %{name}-stereoslam = %{version}-%{release}
 %description apps
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -142,6 +152,8 @@ Group: Development/Libraries
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-reactivenav = %{version}-%{release}
 Requires: %{name}-hwdrivers = %{version}-%{release}
+Requires: %{name}-monoslam = %{version}-%{release}
+Requires: %{name}-stereoslam = %{version}-%{release}
 %description libs
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -209,11 +221,6 @@ find ${RPM_BUILD_ROOT}%{_datadir}/applic
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files ann
-%defattr(-,root,root,-)
-%doc README COPYING
-%{_libdir}/libmrpt-ann.so.*
-
 %files aria
 %defattr(-,root,root,-)
 %doc README COPYING
@@ -238,6 +245,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING
 %{_libdir}/libmrpt-reactivenav.so.*
 
+%files monoslam
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_libdir}/libmrpt-monoslam.so.*
+
+%files stereoslam
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_libdir}/libmrpt-stereoslam.so.*
 
 %files apps
 %defattr(-,root,root,-)
@@ -276,9 +292,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %ifos linux
-%post ann -p /sbin/ldconfig
-%postun ann -p /sbin/ldconfig
-
 %post aria -p /sbin/ldconfig
 %postun aria -p /sbin/ldconfig
 
@@ -288,6 +301,12 @@ rm -rf $RPM_BUILD_ROOT
 %post reactivenav -p /sbin/ldconfig
 %postun reactivenav -p /sbin/ldconfig
 
+%post monoslam -p /sbin/ldconfig
+%postun monoslam -p /sbin/ldconfig
+
+%post stereoslam -p /sbin/ldconfig
+%postun stereoslam -p /sbin/ldconfig
+
 %post apps
 update-desktop-database &> /dev/null || :
 
@@ -306,6 +325,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 17 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090817svn1147
+- Packaging of new upstream version 0.7.1.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-0.2.20090529svn1047
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jlblanco at fedoraproject.org  Mon Aug 17 22:43:50 2009
From: jlblanco at fedoraproject.org (Jose Luis Blanco)
Date: Mon, 17 Aug 2009 22:43:50 +0000 (UTC)
Subject: rpms/mrpt/devel .cvsignore, 1.3, 1.4 mrpt.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <20090817224350.A3B2511C00E4@cvs1.fedora.phx.redhat.com>

Author: jlblanco

Update of /cvs/pkgs/rpms/mrpt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1897

Modified Files:
	.cvsignore mrpt.spec sources 
Log Message:
New sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Jul 2009 22:31:29 -0000	1.3
+++ .cvsignore	17 Aug 2009 22:43:49 -0000	1.4
@@ -1 +1 @@
-mrpt-0.7.0-20090529svn1047.tar.gz
+mrpt-0.7.1-20090817svn1147.tar.gz


Index: mrpt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/mrpt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mrpt.spec	17 Aug 2009 22:17:44 -0000	1.5
+++ mrpt.spec	17 Aug 2009 22:43:50 -0000	1.6
@@ -68,7 +68,7 @@ mobile bases.
 %package core
 Summary: Mobile Robot Programming Toolkit - The core library
 Group: Development/Libraries
-Requires: %{name}-ann = %{version}-%{release}
+Requires: 
 %description core
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Jul 2009 22:31:29 -0000	1.3
+++ sources	17 Aug 2009 22:43:50 -0000	1.4
@@ -1 +1 @@
-b483f12657ff968220cec6697a050c52  mrpt-0.7.0-20090529svn1047.tar.gz
+4153dbd072461c3f9761e0eeb988501c  mrpt-0.7.1-20090817svn1147.tar.gz



From whot at fedoraproject.org  Mon Aug 17 23:16:57 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 17 Aug 2009 23:16:57 +0000 (UTC)
Subject: rpms/xkeyboard-config/devel xkeyboard-config-1.6-caps-hyper.patch, 
	NONE, 1.1 xkeyboard-config-1.6-caps-super.patch, NONE,
	1.1 xkeyboard-config.spec, 1.39, 1.40
Message-ID: <20090817231657.21A6011C00E4@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7706

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.6-caps-hyper.patch 
	xkeyboard-config-1.6-caps-super.patch 
Log Message:
* Tue Aug 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6-3
- xkeyboard-config-1.6-caps-super.patch: add caps:super option (#505187)
- xkeyboard-config-1.6-caps-hyper.patch: add caps:hyper option (#505187)


xkeyboard-config-1.6-caps-hyper.patch:
 rules/base.o_s.part |    1 +
 rules/base.xml.in   |    6 ++++++
 symbols/capslock    |    7 ++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE xkeyboard-config-1.6-caps-hyper.patch ---
>From 6b99bd6e4dca53a7143b87f5f5a9026ed2a6f00e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 18 Aug 2009 09:04:11 +1000
Subject: [PATCH] add caps:hyper

http://bugs.freedesktop.org/show_bug.cgi?id=23356

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 rules/base.o_s.part |    1 +
 rules/base.xml.in   |    6 ++++++
 symbols/capslock    |    6 ++++++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 175a214..8305bb6 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -54,6 +54,7 @@
   caps:escape		=	+capslock(escape)
   caps:backspace	=	+capslock(backspace)
   caps:super		=	+capslock(super)
+  caps:hyper		=	+capslock(hyper)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 0958687..4628c4c 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4774,6 +4774,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:hyper</name>
+          <_description>Make CapsLock an additional Hyper</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:shiftlock</name>
           <_description>CapsLock toggles Shift so all keys are affected</_description>
         </configItem>
diff --git a/symbols/capslock b/symbols/capslock
index 9a2307e..9a01b4a 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -47,3 +47,9 @@ xkb_symbols "super" {
     modifier_map Mod4   { <CAPS> };
 };
 
+partial hidden modifier_keys
+xkb_symbols "hyper" {
+    key <CAPS> {        [       Hyper_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
-- 
1.6.3.rc1.2.g0164.dirty


xkeyboard-config-1.6-caps-super.patch:
 rules/base.o_s.part |    1 +
 rules/base.xml.in   |    6 ++++++
 symbols/capslock    |    7 ++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE xkeyboard-config-1.6-caps-super.patch ---
>From 0ba57d95704764f7c3d3fb9694e2479d98dac1b8 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Fri, 12 Jun 2009 00:50:57 +0100
Subject: [PATCH] added caps:super

http://bugs.freedesktop.org/show_bug.cgi?id=22184
---
 ChangeLog           |    5 +++++
 rules/base.o_s.part |    1 +
 rules/base.xml.in   |    6 ++++++
 symbols/capslock    |    6 ++++++
 4 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index d3078bf..175a214 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -53,6 +53,7 @@
   caps:swapescape	=	+capslock(swapescape)
   caps:escape		=	+capslock(escape)
   caps:backspace	=	+capslock(backspace)
+  caps:super		=	+capslock(super)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index aaf5358..f4d60e7 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4775,6 +4775,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:super</name>
+          <_description>Make CapsLock an additional Super</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:shiftlock</name>
           <_description>CapsLock toggles Shift so all keys are affected</_description>
         </configItem>
diff --git a/symbols/capslock b/symbols/capslock
index 58599c6..9a2307e 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -41,3 +41,9 @@ xkb_symbols "backspace" {
     key <CAPS> {        [       BackSpace  ]       };
 };
 
+partial hidden modifier_keys
+xkb_symbols "super" {
+    key <CAPS> {        [       Super_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
-- 
1.6.3.rc1.2.g0164.dirty



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- xkeyboard-config.spec	27 Jul 2009 08:07:13 -0000	1.39
+++ xkeyboard-config.spec	17 Aug 2009 23:16:56 -0000	1.40
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -12,6 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
+# Both upstream
+Patch1: xkeyboard-config-1.6-caps-super.patch
+Patch2: xkeyboard-config-1.6-caps-hyper.patch
+
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -52,7 +56,7 @@ fi
 git add .
 git commit -a -q -m "%{version} baseline."
 
-#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 %configure \
@@ -92,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Aug 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6-3
+- xkeyboard-config-1.6-caps-super.patch: add caps:super option (#505187)
+- xkeyboard-config-1.6-caps-hyper.patch: add caps:hyper option (#505187)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From behdad at fedoraproject.org  Mon Aug 17 23:23:05 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 17 Aug 2009 23:23:05 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.93, 1.94 pango.spec, 1.173,
	1.174 sources, 1.94, 1.95
Message-ID: <20090817232305.AAA3B11C00E4@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8568

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Tue Aug 17 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.4-1 
- 1.25.4 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	13 Aug 2009 00:15:41 -0000	1.93
+++ .cvsignore	17 Aug 2009 23:23:05 -0000	1.94
@@ -1 +1 @@
-pango-1.25.3.tar.bz2
+pango-1.25.4.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- pango.spec	13 Aug 2009 00:15:41 -0000	1.173
+++ pango.spec	17 Aug 2009 23:23:05 -0000	1.174
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.25.3
+Version: 1.25.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -226,6 +226,9 @@ fi
 
 
 %changelog
+* Tue Aug 17 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.4-1
+- 1.25.4
+
 * Tue Aug 11 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.3-1
 - 1.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	13 Aug 2009 00:15:42 -0000	1.94
+++ sources	17 Aug 2009 23:23:05 -0000	1.95
@@ -1 +1 @@
-f0ec03e56931f63c9a759a0321164e84  pango-1.25.3.tar.bz2
+c46848c6a065e0a71764626a1fcf995e  pango-1.25.4.tar.bz2



From lmacken at fedoraproject.org  Mon Aug 17 23:30:54 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 17 Aug 2009 23:30:54 +0000 (UTC)
Subject: rpms/python-repoze-what/EL-5 python-repoze-what-sphinx.patch, NONE, 
	1.1 python-repoze-what.spec, 1.3, 1.4
Message-ID: <20090817233054.17AD411C00E4@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-serv9853

Modified Files:
	python-repoze-what.spec 
Added Files:
	python-repoze-what-sphinx.patch 
Log Message:
Apply python-repoze-what-sphinx.patch to disable newer Sphinx extensions

python-repoze-what-sphinx.patch:
 conf.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE python-repoze-what-sphinx.patch ---
diff --git a/docs/source/conf.py.orig b/docs/source/conf.py
index 50cf366..20cf2c4 100644
--- a/docs/source/conf.py.orig
+++ b/docs/source/conf.py
@@ -30,8 +30,7 @@ for item in os.listdir(root):
 # General configuration
 # ---------------------
 
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest',
-              'sphinx.ext.intersphinx']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/EL-5/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:14:17 -0000	1.3
+++ python-repoze-what.spec	17 Aug 2009 23:30:53 -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
@@ -11,6 +11,7 @@ URL:            http://pypi.python.org/p
 Source0:        http://pypi.python.org/packages/source/r/repoze.what/repoze.what-%{version}.tar.gz
 Patch0:         %{name}-setup.patch
 Patch1:         %{name}-release.patch
+Patch2:         %{name}-sphinx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -58,6 +59,7 @@ This package contains documentation for 
 %setup -q -n repoze.what-%{version}
 %patch0 -b .setup
 %patch1 -b .release
+%patch2 -p1 -b .sphinx
 %{__sed} -i -e 's|$VERSION|%{version}|' repoze/what/release.py
 
 %build
@@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+
 * Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-3
 - Get the test suite working
 



From jlblanco at fedoraproject.org  Tue Aug 18 00:16:32 2009
From: jlblanco at fedoraproject.org (Jose Luis Blanco)
Date: Tue, 18 Aug 2009 00:16:32 +0000 (UTC)
Subject: rpms/mrpt/devel mrpt.spec,1.6,1.7
Message-ID: <20090818001632.1EF6F11C00E4@cvs1.fedora.phx.redhat.com>

Author: jlblanco

Update of /cvs/pkgs/rpms/mrpt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18642

Modified Files:
	mrpt.spec 
Log Message:
Fixed error in spec file


Index: mrpt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/mrpt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mrpt.spec	17 Aug 2009 22:43:50 -0000	1.6
+++ mrpt.spec	18 Aug 2009 00:16:31 -0000	1.7
@@ -67,8 +67,7 @@ mobile bases.
 
 %package core
 Summary: Mobile Robot Programming Toolkit - The core library
-Group: Development/Libraries
-Requires: 
+Group: Development/Libraries 
 %description core
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and



From mclasen at fedoraproject.org  Tue Aug 18 00:47:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 18 Aug 2009 00:47:05 +0000 (UTC)
Subject: rpms/control-center/devel .cvsignore, 1.92, 1.93 control-center.spec,
	1.471, 1.472 sources, 1.95, 1.96
Message-ID: <20090818004705.28FA111C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23967

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- .cvsignore	10 Aug 2009 15:34:41 -0000	1.92
+++ .cvsignore	18 Aug 2009 00:47:04 -0000	1.93
@@ -1 +1 @@
-gnome-control-center-2.27.5.tar.bz2
+gnome-control-center-2.27.90.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- control-center.spec	17 Aug 2009 03:36:29 -0000	1.471
+++ control-center.spec	18 Aug 2009 00:47:04 -0000	1.472
@@ -23,8 +23,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.27.5
-Release: 3%{?dist}
+Version: 2.27.90
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -34,8 +34,6 @@ Source1: org.gnome.control-center.defaul
 Patch3: control-center-2.19.3-no-gnome-common.patch
 # http://bugzilla.gnome.org/536531
 Patch7: make-default.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=591824
-Patch8: 0001-Remove-old-code-poking-directly-into-the-pwent.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=475804
 Patch10: gcc-pam-fprintd-avail.patch
@@ -49,9 +47,6 @@ Patch30: default-layout-toggle.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=546036
 Patch33: notification-theme.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=591796
-Patch37: 0001-Port-about-me-to-PolicyKit-1.0.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=588729
 Patch45: mnemonic.patch
 
@@ -193,7 +188,6 @@ utilities.
 %patch99 -p1 -b .default-apps
 
 %patch7 -p1 -b .make-default
-%patch37 -p1 -b .polkit1
 
 autoreconf -f -i
 
@@ -366,6 +360,10 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Aug 17 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
+- Update to 2.27.90
+- Drop upstreamed patches
+
 * Sun Aug 16 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-3
 - Make slide shows visually distinct
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	10 Aug 2009 15:34:42 -0000	1.95
+++ sources	18 Aug 2009 00:47:04 -0000	1.96
@@ -1 +1 @@
-ee1c62f934a1f89aadfe8bdb33cec99a  gnome-control-center-2.27.5.tar.bz2
+e60ba889c281e23079da2889144e5b48  gnome-control-center-2.27.90.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 18 01:09:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 18 Aug 2009 01:09:14 +0000 (UTC)
Subject: rpms/pygtksourceview/devel .cvsignore, 1.12,
	1.13 pygtksourceview.spec, 1.24, 1.25 sources, 1.12, 1.13
Message-ID: <20090818010914.DD5A311C006E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pygtksourceview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27906

Modified Files:
	.cvsignore pygtksourceview.spec sources 
Log Message:
2.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Jun 2009 02:32:55 -0000	1.12
+++ .cvsignore	18 Aug 2009 01:09:14 -0000	1.13
@@ -1 +1 @@
-pygtksourceview-2.6.0.tar.bz2
+pygtksourceview-2.7.0.tar.bz2


Index: pygtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pygtksourceview.spec	26 Jul 2009 19:52:02 -0000	1.24
+++ pygtksourceview.spec	18 Aug 2009 01:09:14 -0000	1.25
@@ -5,15 +5,15 @@
 %define gtksourceview_version 2.3.0
 
 Name:           pygtksourceview
-Version:        2.6.0
-Release:        2%{?dist}
+Version:        2.7.0
+Release:        1%{?dist}
 Summary:        Python bindings for gtksourceview
 
 Group:          Development/Languages
 # No version specified.
 License:        LGPLv2+
 URL:            http://download.gnome.org/sources/pygtksourceview/
-Source0:        http://download.gnome.org/sources/pygtksourceview/2.6/pygtksourceview-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pygtksourceview/2.7/pygtksourceview-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtksourceview2-devel >= %{gtksourceview_version}
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtksourceview2
 
 %changelog
+* Mon Aug 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.0-1
+- Update to 2.7.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Jun 2009 02:32:55 -0000	1.12
+++ sources	18 Aug 2009 01:09:14 -0000	1.13
@@ -1 +1 @@
-5587a1865bd5c785c6f34095c57cc96b  pygtksourceview-2.6.0.tar.bz2
+cc6512592ddadc86fb12c0a53fe1ba9e  pygtksourceview-2.7.0.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 18 01:14:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 18 Aug 2009 01:14:12 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.472,1.473
Message-ID: <20090818011412.A9EDA11C006E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28791

Modified Files:
	control-center.spec 
Log Message:
fix BRs



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -p -r1.472 -r1.473
--- control-center.spec	18 Aug 2009 00:47:04 -0000	1.472
+++ control-center.spec	18 Aug 2009 01:14:12 -0000	1.473
@@ -129,6 +129,7 @@ BuildRequires: dbus-devel >= 0.90
 BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: scrollkeeper
 BuildRequires: libcanberra-devel
+BuildRequires: unique-devel
 
 Requires(preun): GConf2
 Requires(pre): GConf2



From jlblanco at fedoraproject.org  Tue Aug 18 02:08:17 2009
From: jlblanco at fedoraproject.org (Jose Luis Blanco)
Date: Tue, 18 Aug 2009 02:08:17 +0000 (UTC)
Subject: rpms/mrpt/devel .cvsignore, 1.4, 1.5 mrpt.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090818020817.C646711C006E@cvs1.fedora.phx.redhat.com>

Author: jlblanco

Update of /cvs/pkgs/rpms/mrpt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7196

Modified Files:
	.cvsignore mrpt.spec sources 
Log Message:
patched sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 22:43:49 -0000	1.4
+++ .cvsignore	18 Aug 2009 02:08:17 -0000	1.5
@@ -1 +1 @@
-mrpt-0.7.1-20090817svn1147.tar.gz
+mrpt-0.7.1-20090818svn1148.tar.gz


Index: mrpt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/mrpt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mrpt.spec	18 Aug 2009 00:16:31 -0000	1.7
+++ mrpt.spec	18 Aug 2009 02:08:17 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Libraries and programs for mobile robot SLAM and navigation
 Name: mrpt
 Version: 0.7.1
-Release: 0.1.20090817svn1147%{?dist}
+Release: 0.1.20090818svn1148%{?dist}
 License: GPLv3+
 Group: Development/Libraries
 URL: http://babel.isa.uma.es/mrpt/
@@ -14,7 +14,7 @@ URL: http://babel.isa.uma.es/mrpt/
 # The source for this package was pulled from upstream's vcs, or 
 #  download from: http://babel.isa.uma.es/mrpt/src-repo/
 #
-Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.1-20090817svn1147.tar.gz
+Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.1-20090818svn1148.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -324,6 +324,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090818svn1148
+- Packaging of new upstream version 0.7.1, patched.
+
 * Mon Aug 17 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090817svn1147
 - Packaging of new upstream version 0.7.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 22:43:50 -0000	1.4
+++ sources	18 Aug 2009 02:08:17 -0000	1.5
@@ -1 +1 @@
-4153dbd072461c3f9761e0eeb988501c  mrpt-0.7.1-20090817svn1147.tar.gz
+200c1fef0bfe1f5cf5cc3d4cece256e2  mrpt-0.7.1-20090818svn1148.tar.gz



From jlblanco at fedoraproject.org  Tue Aug 18 02:33:40 2009
From: jlblanco at fedoraproject.org (Jose Luis Blanco)
Date: Tue, 18 Aug 2009 02:33:40 +0000 (UTC)
Subject: rpms/mrpt/F-11 .cvsignore, 1.2, 1.3 mrpt.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <20090818023340.3E6F511C006E@cvs1.fedora.phx.redhat.com>

Author: jlblanco

Update of /cvs/pkgs/rpms/mrpt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11179

Modified Files:
	.cvsignore mrpt.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Feb 2009 15:38:56 -0000	1.2
+++ .cvsignore	18 Aug 2009 02:33:39 -0000	1.3
@@ -1 +1 @@
-mrpt-0.6.5-20090213svn807.tar.gz
+mrpt-0.7.1-20090818svn1148.tar.gz


Index: mrpt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/F-11/mrpt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mrpt.spec	26 Feb 2009 03:00:30 -0000	1.2
+++ mrpt.spec	18 Aug 2009 02:33:40 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Libraries and programs for mobile robot SLAM and navigation
 Name: mrpt
-Version: 0.6.5
-Release: 0.4.20090213svn807%{?dist}
+Version: 0.7.1
+Release: 0.1.20090818svn1148%{?dist}
 License: GPLv3+
 Group: Development/Libraries
 URL: http://babel.isa.uma.es/mrpt/
@@ -11,11 +11,10 @@ URL: http://babel.isa.uma.es/mrpt/
 # but without the directory "otherlibs/sift-hess", which contains code with a 
 # patent pending for approval.
 
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  svn export http://babel.isa.uma.es/mrpt-browse-code/mrpt-0.6.5 mrpt-0.6.5
-#  tar -czvf mrpt-0.6.5-20090213svn807.tar.gz mrpt-0.6.5
-Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.6.5-20090213svn807.tar.gz
+# The source for this package was pulled from upstream's vcs, or 
+#  download from: http://babel.isa.uma.es/mrpt/src-repo/
+#
+Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.1-20090818svn1148.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,22 +47,10 @@ applications.
 The MRPT is free software and is released under the GPL. 
 
 
-# Subpackages "ann", "aria", "core", "hwdrivers", and "reactivenav" are provided
-# in order to minimize dependencies of future packages that might depend on a
-# subset only of all the MRPT libraries. The subpackage "libs" can be used as 
-# a shortcut for all the libraries.
-
-%package ann
-Summary: Mobile Robot Programming Toolkit - Approximate Nearest Neighbor library
-Group: Development/Libraries
-%description ann
-The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
-and open source C++ library aimed to help robotics researchers to design and
-implement algorithms in the fields of Simultaneous Localization and Mapping 
-(SLAM), computer vision, and motion planning (obstacle avoidance).
-
-This package provides the MRPT built-in ANN (Approximate Nearest Neighbor) 
-library, by David M. Mount  and Sunil Arya.
+# Subpackages "aria", "core", "hwdrivers", "reactivenav", "monoslam" and 
+# "stereoslam" are provided in order to minimize dependencies of future
+# packages that might depend on a subset only of all the MRPT libraries. 
+# The subpackage "libs" can be used as a shortcut for all the libraries.
 
 %package aria
 Summary: Mobile Robot Programming Toolkit - ActiveMedia's ARIA library
@@ -80,8 +67,7 @@ mobile bases.
 
 %package core
 Summary: Mobile Robot Programming Toolkit - The core library
-Group: Development/Libraries
-Requires: %{name}-ann = %{version}-%{release}
+Group: Development/Libraries 
 %description core
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -118,6 +104,27 @@ implement algorithms in the fields of Si
 This package provides the mrpt-reactivenav library, with implementation of 
 reactive navigation algorithms (VFF, ND, PTG-based space transformations).
 
+%package monoslam
+Summary: Mobile Robot Programming Toolkit - Monocular SLAM library
+Group: Development/Libraries
+%description monoslam
+The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
+and open source C++ library aimed to help robotics researchers to design and
+implement algorithms in the fields of Simultaneous Localization and Mapping 
+(SLAM), computer vision, and motion planning (obstacle avoidance).
+
+This package provides the monocular SLAM library.
+
+%package stereoslam
+Summary: Mobile Robot Programming Toolkit - Stereo SLAM library
+Group: Development/Libraries
+%description stereoslam
+The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
+and open source C++ library aimed to help robotics researchers to design and
+implement algorithms in the fields of Simultaneous Localization and Mapping 
+(SLAM), computer vision, and motion planning (obstacle avoidance).
+
+This package provides the stereoscopic SLAM library.
 
 %package apps
 Summary: Mobile Robot Programming Toolkit - Console and GUI applications
@@ -125,6 +132,8 @@ Group: Applications/Engineering
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-reactivenav = %{version}-%{release}
 Requires: %{name}-hwdrivers = %{version}-%{release}
+Requires: %{name}-monoslam = %{version}-%{release}
+Requires: %{name}-stereoslam = %{version}-%{release}
 %description apps
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -142,6 +151,8 @@ Group: Development/Libraries
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-reactivenav = %{version}-%{release}
 Requires: %{name}-hwdrivers = %{version}-%{release}
+Requires: %{name}-monoslam = %{version}-%{release}
+Requires: %{name}-stereoslam = %{version}-%{release}
 %description libs
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -209,11 +220,6 @@ find ${RPM_BUILD_ROOT}%{_datadir}/applic
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files ann
-%defattr(-,root,root,-)
-%doc README COPYING
-%{_libdir}/libmrpt-ann.so.*
-
 %files aria
 %defattr(-,root,root,-)
 %doc README COPYING
@@ -238,6 +244,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING
 %{_libdir}/libmrpt-reactivenav.so.*
 
+%files monoslam
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_libdir}/libmrpt-monoslam.so.*
+
+%files stereoslam
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_libdir}/libmrpt-stereoslam.so.*
 
 %files apps
 %defattr(-,root,root,-)
@@ -276,9 +291,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %ifos linux
-%post ann -p /sbin/ldconfig
-%postun ann -p /sbin/ldconfig
-
 %post aria -p /sbin/ldconfig
 %postun aria -p /sbin/ldconfig
 
@@ -288,6 +300,12 @@ rm -rf $RPM_BUILD_ROOT
 %post reactivenav -p /sbin/ldconfig
 %postun reactivenav -p /sbin/ldconfig
 
+%post monoslam -p /sbin/ldconfig
+%postun monoslam -p /sbin/ldconfig
+
+%post stereoslam -p /sbin/ldconfig
+%postun stereoslam -p /sbin/ldconfig
+
 %post apps
 update-desktop-database &> /dev/null || :
 
@@ -306,6 +324,18 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090818svn1148
+- Packaging of new upstream version 0.7.1, patched.
+
+* Mon Aug 17 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090817svn1147
+- Packaging of new upstream version 0.7.1.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-0.2.20090529svn1047
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 14 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.0-0.1.20090529svn1047
+- Packaging of new upstream version 0.7.0.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-0.4.20090213svn807
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Feb 2009 15:38:56 -0000	1.2
+++ sources	18 Aug 2009 02:33:40 -0000	1.3
@@ -1 +1 @@
-15796776b1d905fa97556f6642380f1d  mrpt-0.6.5-20090213svn807.tar.gz
+200c1fef0bfe1f5cf5cc3d4cece256e2  mrpt-0.7.1-20090818svn1148.tar.gz



From jlblanco at fedoraproject.org  Tue Aug 18 02:44:25 2009
From: jlblanco at fedoraproject.org (Jose Luis Blanco)
Date: Tue, 18 Aug 2009 02:44:25 +0000 (UTC)
Subject: rpms/mrpt/F-10 .cvsignore, 1.3, 1.4 mrpt.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <20090818024425.9B38211C006E@cvs1.fedora.phx.redhat.com>

Author: jlblanco

Update of /cvs/pkgs/rpms/mrpt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13374

Modified Files:
	.cvsignore mrpt.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Jul 2009 22:37:48 -0000	1.3
+++ .cvsignore	18 Aug 2009 02:44:25 -0000	1.4
@@ -1,2 +1 @@
-mrpt-0.6.5-20090213svn807.tar.gz
-mrpt-0.7.0-20090529svn1047.tar.gz
+mrpt-0.7.1-20090818svn1148.tar.gz


Index: mrpt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/F-10/mrpt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mrpt.spec	14 Jul 2009 22:37:48 -0000	1.2
+++ mrpt.spec	18 Aug 2009 02:44:25 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Libraries and programs for mobile robot SLAM and navigation
 Name: mrpt
-Version: 0.7.0
-Release: 0.1.20090529svn1047%{?dist}
+Version: 0.7.1
+Release: 0.1.20090818svn1148%{?dist}
 License: GPLv3+
 Group: Development/Libraries
 URL: http://babel.isa.uma.es/mrpt/
@@ -11,11 +11,10 @@ URL: http://babel.isa.uma.es/mrpt/
 # but without the directory "otherlibs/sift-hess", which contains code with a 
 # patent pending for approval.
 
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  svn export http://babel.isa.uma.es/mrpt-browse-code/mrpt-0.7.0 mrpt-0.7.0
-#  tar -czvf mrpt-0.7.0-20090529svn1047.tar.gz mrpt-0.70
-Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.0-20090529svn1047.tar.gz
+# The source for this package was pulled from upstream's vcs, or 
+#  download from: http://babel.isa.uma.es/mrpt/src-repo/
+#
+Source: http://babel.isa.uma.es/mrpt/src-repo/mrpt-0.7.1-20090818svn1148.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,22 +47,10 @@ applications.
 The MRPT is free software and is released under the GPL. 
 
 
-# Subpackages "ann", "aria", "core", "hwdrivers", and "reactivenav" are provided
-# in order to minimize dependencies of future packages that might depend on a
-# subset only of all the MRPT libraries. The subpackage "libs" can be used as 
-# a shortcut for all the libraries.
-
-%package ann
-Summary: Mobile Robot Programming Toolkit - Approximate Nearest Neighbor library
-Group: Development/Libraries
-%description ann
-The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
-and open source C++ library aimed to help robotics researchers to design and
-implement algorithms in the fields of Simultaneous Localization and Mapping 
-(SLAM), computer vision, and motion planning (obstacle avoidance).
-
-This package provides the MRPT built-in ANN (Approximate Nearest Neighbor) 
-library, by David M. Mount  and Sunil Arya.
+# Subpackages "aria", "core", "hwdrivers", "reactivenav", "monoslam" and 
+# "stereoslam" are provided in order to minimize dependencies of future
+# packages that might depend on a subset only of all the MRPT libraries. 
+# The subpackage "libs" can be used as a shortcut for all the libraries.
 
 %package aria
 Summary: Mobile Robot Programming Toolkit - ActiveMedia's ARIA library
@@ -80,8 +67,7 @@ mobile bases.
 
 %package core
 Summary: Mobile Robot Programming Toolkit - The core library
-Group: Development/Libraries
-Requires: %{name}-ann = %{version}-%{release}
+Group: Development/Libraries 
 %description core
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -118,6 +104,27 @@ implement algorithms in the fields of Si
 This package provides the mrpt-reactivenav library, with implementation of 
 reactive navigation algorithms (VFF, ND, PTG-based space transformations).
 
+%package monoslam
+Summary: Mobile Robot Programming Toolkit - Monocular SLAM library
+Group: Development/Libraries
+%description monoslam
+The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
+and open source C++ library aimed to help robotics researchers to design and
+implement algorithms in the fields of Simultaneous Localization and Mapping 
+(SLAM), computer vision, and motion planning (obstacle avoidance).
+
+This package provides the monocular SLAM library.
+
+%package stereoslam
+Summary: Mobile Robot Programming Toolkit - Stereo SLAM library
+Group: Development/Libraries
+%description stereoslam
+The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
+and open source C++ library aimed to help robotics researchers to design and
+implement algorithms in the fields of Simultaneous Localization and Mapping 
+(SLAM), computer vision, and motion planning (obstacle avoidance).
+
+This package provides the stereoscopic SLAM library.
 
 %package apps
 Summary: Mobile Robot Programming Toolkit - Console and GUI applications
@@ -125,6 +132,8 @@ Group: Applications/Engineering
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-reactivenav = %{version}-%{release}
 Requires: %{name}-hwdrivers = %{version}-%{release}
+Requires: %{name}-monoslam = %{version}-%{release}
+Requires: %{name}-stereoslam = %{version}-%{release}
 %description apps
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -142,6 +151,8 @@ Group: Development/Libraries
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-reactivenav = %{version}-%{release}
 Requires: %{name}-hwdrivers = %{version}-%{release}
+Requires: %{name}-monoslam = %{version}-%{release}
+Requires: %{name}-stereoslam = %{version}-%{release}
 %description libs
 The Mobile Robot Programming Toolkit (MRPT) is an extensive, cross-platform,
 and open source C++ library aimed to help robotics researchers to design and
@@ -209,11 +220,6 @@ find ${RPM_BUILD_ROOT}%{_datadir}/applic
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files ann
-%defattr(-,root,root,-)
-%doc README COPYING
-%{_libdir}/libmrpt-ann.so.*
-
 %files aria
 %defattr(-,root,root,-)
 %doc README COPYING
@@ -238,6 +244,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING
 %{_libdir}/libmrpt-reactivenav.so.*
 
+%files monoslam
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_libdir}/libmrpt-monoslam.so.*
+
+%files stereoslam
+%defattr(-,root,root,-)
+%doc README COPYING
+%{_libdir}/libmrpt-stereoslam.so.*
 
 %files apps
 %defattr(-,root,root,-)
@@ -276,9 +291,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %ifos linux
-%post ann -p /sbin/ldconfig
-%postun ann -p /sbin/ldconfig
-
 %post aria -p /sbin/ldconfig
 %postun aria -p /sbin/ldconfig
 
@@ -288,6 +300,12 @@ rm -rf $RPM_BUILD_ROOT
 %post reactivenav -p /sbin/ldconfig
 %postun reactivenav -p /sbin/ldconfig
 
+%post monoslam -p /sbin/ldconfig
+%postun monoslam -p /sbin/ldconfig
+
+%post stereoslam -p /sbin/ldconfig
+%postun stereoslam -p /sbin/ldconfig
+
 %post apps
 update-desktop-database &> /dev/null || :
 
@@ -306,6 +324,15 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090818svn1148
+- Packaging of new upstream version 0.7.1, patched.
+
+* Mon Aug 17 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090817svn1147
+- Packaging of new upstream version 0.7.1.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-0.2.20090529svn1047
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 14 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.0-0.1.20090529svn1047
 - Packaging of new upstream version 0.7.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mrpt/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Jul 2009 22:37:48 -0000	1.3
+++ sources	18 Aug 2009 02:44:25 -0000	1.4
@@ -1,2 +1 @@
-15796776b1d905fa97556f6642380f1d  mrpt-0.6.5-20090213svn807.tar.gz
-b483f12657ff968220cec6697a050c52  mrpt-0.7.0-20090529svn1047.tar.gz
+200c1fef0bfe1f5cf5cc3d4cece256e2  mrpt-0.7.1-20090818svn1148.tar.gz



From tgl at fedoraproject.org  Tue Aug 18 02:58:55 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 18 Aug 2009 02:58:55 +0000 (UTC)
Subject: rpms/postgresql/devel .cvsignore, 1.46, 1.47 Makefile.regress, 1.5, 
	1.6 README.rpm-dist, 1.13, 1.14 postgresql-ac-version.patch, 1.7,
	1.8 postgresql-logging.patch, 1.4,
	1.5 postgresql-perl-rpath.patch, 1.4, 1.5 postgresql.init, 1.24,
	1.25 postgresql.spec, 1.112, 1.113 rpm-pgsql.patch, 1.2,
	1.3 sources, 1.47, 1.48 postgresql-test.patch, 1.3, NONE
Message-ID: <20090818025855.B3A0211C006E@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15249

Modified Files:
	.cvsignore Makefile.regress README.rpm-dist 
	postgresql-ac-version.patch postgresql-logging.patch 
	postgresql-perl-rpath.patch postgresql.init postgresql.spec 
	rpm-pgsql.patch sources 
Removed Files:
	postgresql-test.patch 
Log Message:
Update to PostgreSQL 8.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	21 Mar 2009 22:43:49 -0000	1.46
+++ .cvsignore	18 Aug 2009 02:58:54 -0000	1.47
@@ -1,5 +1,5 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.4.0.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.7-US.pdf
+postgresql-8.4.0-US.pdf


Index: Makefile.regress
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/Makefile.regress,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Makefile.regress	18 Jan 2008 20:48:56 -0000	1.5
+++ Makefile.regress	18 Aug 2009 02:58:54 -0000	1.6
@@ -33,10 +33,10 @@ abs_builddir := $(shell pwd)
 check: installcheck-parallel
 
 installcheck: cleandirs
-	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+	./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
 
 installcheck-parallel: cleandirs
-	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
+	./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
 
 # The tests command the server to write into testtablespace and results.
 # On a SELinux-enabled system this will fail unless we mark those directories
@@ -53,10 +53,10 @@ runtest: installcheck
 runtest-parallel: installcheck-parallel
 
 bigtest: cleandirs
-	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
+	./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
 
 bigcheck: cleandirs
-	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
+	./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
 
 
 ##


Index: README.rpm-dist
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/README.rpm-dist,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- README.rpm-dist	20 Sep 2007 20:18:09 -0000	1.13
+++ README.rpm-dist	18 Aug 2009 02:58:54 -0000	1.14
@@ -1,12 +1,12 @@
 README.rpm-dist
 -----------------------------------------------------------------------------
-Version 8.2, for the PostgreSQL 8.2.1-2 RPMset.
-Devrim G?nd?z <devrim at CommandPrompt.com>, Lamar Owen <lowen at pari.edu>
+Version 8.4, for the PostgreSQL 8.4 RPM set.
+Devrim G?nd?z <devrim at CommandPrompt.com>
 -----------------------------------------------------------------------------
 
 Contents:
  0.)	Quick note about '-i'
- 1.)	Introduction, QuickStart, and credits
+ 1.)	Introduction and QuickStart
  2.)	PostgreSQL RPM packages and rationale
  3.)	Starting multiple postmasters
  4.)	Regression Testing
@@ -31,44 +31,49 @@ This document exists to explain the layo
 describe various RPM specifics, and to document special features found
 in the RPMset.
 
-This document is written to be applicable to version 8.2 of PostgreSQL, 
+This document is written to be applicable to version 8.4 of PostgreSQL, 
 which is the current version of the RPMs as of this writing. More to the 
-point, versions prior to 8.2 are not documented here.
+point, versions prior to 8.4 are not documented here.
 
-Official PostgreSQL Global Development Group RPMs have from version 7.1.2
-on carried a 'PGDG' after the release number.  Other RPMsets distributed
-with Linux distributions may have a different release number and initials.
-
-It is preferable for the distribution-specific set to be the one used, as
-the PGDG set is intentionally generic.  So, if your distro has a set of RPMs,
-use them in preference.  If you want to stay up-to-date on the PostgreSQL
-core itself, use the PGDG generic set -- but understand that it is a 
-GENERIC set.
-
-These RPMs no longer support any sort of upgrading process other than that
-documented in the regular documentation.  That is, you must dump, upgrade,
-initdb, and restore your data.  Dump first, then remove the old server
-subpackage, install the new package, and restore the data from dump. (A new
-method of running multiple versions of PostgreSQL, along with the capability
-to run multiple postmasters, is in development, but was not ready for this
-release.)
+Official PostgreSQL Global Development Group RPMs carry a 'PGDG after the
+release number.  Other RPMsets as distributed with Linux distributions may 
+have a different release number and initials.
 
-SuSE has maintained their own RPMset for some time -- their documentation
-supercedes any found in this file.
+If you want to stay up-to-date on the PostgreSQL core itself, you may 
+want to use PGDG set, instead of the binaries supplied by distribution.
+
+These RPMs do not support any sort of major version upgrading process 
+other than that documented in the regular documentation.  That is, you 
+must dump, upgrade,initdb, and restore your data if you are 
+performing a major version update. This is not needed for minor version 
+updates.
+
+For major version upgrade, dump first, then remove the old server 
+subpackage, install the new package, and restore the data from dump. 
+
+This document is intended for use only with Red Hat, CentOS and Fedora.
 
 QUICKSTART
 -----------------------------------------------------------------------------
-For a fresh installation on a recent Red Hat or similar system, a simple
+For a fresh installation, you will need to initialize the cluster first. Run:
+
+	service postgresql initdb
+
+as root, and it will prepare a new database cluster for you. Then you will 
+need to start PostgreSQL. Again as root, run:
+
 	service postgresql start
-as root will prepare a new database (initdb), and start a postmaster that
-will listen on localhost and Unix socket 5432 only.  Edit
-/var/lib/pgsql/data/postgresql.conf and pg_hba.conf if you want to allow
-remote access -- see the section on Grand Unified Configuration.
 
-The file /var/lib/pgsql/.bash_profile is now packaged to help with the 
+This command will start a postmaster that willl listen on localhost and Unix 
+socket 5432 only.  Edit /var/lib/pgsql/data/postgresql.conf and pg_hba.conf 
+if you want to allow remote access -- see the section on Grand Unified 
+Configuration.
+
+The file /var/lib/pgsql/.bash_profile is packaged to help with the 
 setting of environment variables. You may edit this file, and it won't be
-overwritten during an upgrade.  However, enhancements and bugfixes may be added
-to this file, so be sure to check .bash_profile.rpmnew after upgrading.
+overwritten during an upgrade.  However, enhancements and bugfixes may 
+be added to this file, so be sure to check .bash_profile.rpmnew after 
+upgrading.
 
 The user 'postgres' is created during installation of the server subpackage.
 This user by default is UID and GID 26. The user has the default shell set to
@@ -76,26 +81,6 @@ bash, and the home directory set to /var
 default password -- in order to be able to su to it from a non-root account
 or login as 'postgres' you will need to set a password using passwd.
 
-CREDITS
------------------------------------------------------------------------------
-Thomas Lockhart
-Uncle George
-Ryan Kirkpatrick
-Trond Eivind Glomsrd
-Mark Knox
-Mike Mascari
-Nicolas Huillard
-Karl DeBisschop
-Roger Luethi
-Jeff Johnson
-Reinhard Max
-Peter Eisentraut
-Joe Conway
-Andrew Overholt
-David Jee
-Kaj J. Niemi
-Devrim Gunduz
-
 POSTGRESQL RPM PACKAGES AND RATIONALE.
 -----------------------------------------------------------------------------
 PostgreSQL is split up into multiple packages so that users can 'pick and
@@ -139,31 +124,25 @@ various subdirectories.
 
 Different distributions have different ideas of some of these file locations.
 In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
-/usr/share/doc, /usr/share/doc/packages, or some other similar path.  The
-Red Hat / Fedora Core locations are listed below.
+/usr/share/doc, /usr/share/doc/packages, or some other similar path.
+
+However, the Red Hat / CentOS / Fedora RPM's install the files like 
+this:
 
-However, the RPMs install the files like this:
 Executables:		/usr/bin
-Libraries:		/usr/lib
-Documentation:		/usr/share/doc/postgresql-x.y.z
+Libraries:		/usr/lib (or /usr/lib64)
+Documentation:		/usr/share/doc/postgresql-docs-x.y.z/html
 Contrib documentation:	/usr/share/doc/postgresql-contrib-x.y.z
 Source:			not installed
 Data:			/var/lib/pgsql/data
-Backup area:		/var/lib/pgsql/backup
+Backup area:		/var/lib/pgsql/backups
 Templates:		/usr/share/pgsql
-Procedural Languages:	/usr/lib/pgsql
+Procedural Languages:	/usr/lib/pgsql or /usr/lib64/pgsql
 Development Headers:	/usr/include/pgsql
-Localization data:	/usr/share/locale
 Other shared data:	/usr/share/pgsql
 Regression tests:	/usr/lib/pgsql/test/regress  (in the -test package)
-Tutorial:		/usr/lib/pgsql/tutorial (in the -docs package)
-Extra documentation:	/usr/share/doc/postgresql-docs-x.y.z
-
-On some 64-bit architectures, /usr/lib64 is used instead of /usr/lib.
-
-The above list describes the Red Hat / Fedora Core layout.  These locations
-may change for other distributions.  Use of 'rpm -ql' for each package is
-recommended as the 'official' information source.
+			or /usr/lib64/pgsql/test/regress
+Documentation SGML:	/usr/share/doc/postgresql-docs-x.y.z/sgml
 
 While it may seem gratuitous to place these files in different locations, the
 FHS requires it -- distributions should not ever touch /usr/local.  It may
@@ -211,24 +190,26 @@ your database machine is up to the task.
 To run the regression tests under the RPM installation, make sure that
 postmaster has been started (if not, su to root and execute the
 "/etc/rc.d/init.d/postgresql start" init script), cd to
-/usr/lib/pgsql/test/regress, su to postgres, and execute "make check".
+/usr/lib/pgsql/test/regress (or /usr/lib64/pgsql/test/regress),
+su to postgres, and execute "make check".
 This command will start the regression tests and will both show the
 results to the screen and store the results in the file regress.out.
 
 If any tests fail, see the file regression.diffs in that directory for details,
 and read the "Regression Tests" section of the PostgreSQL documentation to
 find out whether the differences are actually significant.  If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org or
-the pgsqlrpms-general list at pgfoundry.org.
+interpreting the results, contact the pgsql-general list at 
+postgresql.org.
 
 After testing, say "make clean" to remove the files generated by the test
 script.
 
 STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
 -------------------------------------------------------------------------------
-Red Hat Linux uses the System V Init package.  A startup script for PostgreSQL
-is provided in the server package, as /etc/rc.d/init.d/postgresql.  To start
-the postmaster, with sanity checking, as root, run
+Fedora / Red Hat / CentOS use the System V Init package.  A startup
+script for PostgreSQL is provided in the server package, as
+/etc/rc.d/init.d/postgresql.  To start the postmaster, with sanity
+checking, as root, run
 	service postgresql start
 To shut the postmaster down,
 	service postgresql stop
@@ -269,12 +250,12 @@ REBUILDING FROM SOURCE RPM
 -------------------------------------------------------------------------------
 If your distribution is not supported by the binary RPMs from PostgreSQL.org, 
 you will need to rebuild from the source RPM.  Download the .src.rpm for this
-release.  You will need to be root to rebuild, unless you have already set up
-a non-root build environment.
+release.  You will need to be root to rebuild, unless you have set up
+a non-root build environment (which is the recommended method anyway).
 
-Install the source RPM with rpm -i, then CD to the rpm building area (on Red
-Hat or Fedora Core this is /usr/src/redhat by default).  You will have to have
-a full development environment to rebuild the full RPM set.
+Install the source RPM with rpm -i, then cd to the rpm building area
+(which is /usr/src/redhat by default).  You will have to have a full
+development environment to rebuild the full RPM set.
 
 This release of the RPMset includes the ability to conditionally build 
 sets of packages.  The parameters, their defaults, and the meanings are:
@@ -283,22 +264,25 @@ beta		0	#build with cassert and do not s
 python		1	#build the postgresql-python package.
 tcl		1	#build the postgresql-tcl package.
 test		1	#build the postgresql-test package.
-plpython	1	#build the PL/Python package
-pltcl		1	#build the PL/Tcl package.
-plperl		1	#build the PL/Perl package.
+plpython	1	#build the PL/Python procedural language package.
+pltcl		1	#build the PL/Tcl procedural language package.
+plperl		1	#build the PL/Perl procedural language package.
 ssl		1	#use OpenSSL support.
 kerberos	1	#use Kerberos 5 support.
 nls		1	#build with national language support.
+ldap		1	#build with LDAP support.
 pam		1	#build with PAM support.
 runselftest	1	#do "make check" during the build.
-xml		1	#build contrib/xml2
+sdt		1	#build with SystemTap support.
+xml		1	#build with XML support
 pgfts		1	#build with --enable-thread-safety
+uuid		1	#build contrib/uuid-ossp
 
 To use these defines, invoke a rebuild like this:
 rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
-	--define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \
-	postgresql-8.2.1-1.src.rpm
-This line would disable the python, tcl, and test subpackages, enable the
+	--define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
+	postgresql-8.4.0-1.src.rpm
+This line would disable the python, tcl, and test subpackages, disable the
 regression test run during build, and disable kerberos support.
 
 You might need to disable runselftest if there is an installed version of
@@ -314,23 +298,16 @@ CONTRIB FILES
 The contents of the contrib tree are packaged into the -contrib subpackage
 and are processed with make and make install.  There is documentation in
 /usr/share/doc/postgresql-contrib-VERSION for these modules.  Most of the
-modules are in /usr/lib/pgsql for loadable modules, and binaries are in 
-/usr/bin.  In the future these files may be split out, depending upon function
-and dependencies.
+modules are in /usr/lib/pgsql (or /usr/lib64/pgsql) for loadable
+modules, and binaries are in /usr/bin.  In the future these files may be
+split out, depending upon function and dependencies.
 
 MORE INFORMATION
 -------------------------------------------------------------------------------
 You can get more information at http://www.postgresql.org and 
-http://pgfoundry.org/projects/pgsqlrpms
+http://yum.pgsqlrpms.org
 
 Please help make this packaging better -- let us know if you find problems, or
-better ways of doing things.  You can reach us by e-mail at
+better ways of doing things. You can reach us by e-mail at
 pgsqlrpms-hackers at pgfoundry.org
-
-SUSE products usually ship with the latest version of PostgreSQL that
-was available at the time they were released. RPMs for newer versions
-of PostgreSQL can be found on the SUSE FTP server and it's mirrors.
-
-ftp://ftp.suse.com/pub/projects/postgresql
-http://www.novell.com/products/linuxprofessional/downloads/ftp/int_mirrors.html
 -------------------------------------------------------------------------------

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-ac-version.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- postgresql-ac-version.patch	21 Mar 2009 22:43:49 -0000	1.7
+++ postgresql-ac-version.patch	18 Aug 2009 02:58:54 -0000	1.8
@@ -4,17 +4,17 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.3.7.orig/configure.in postgresql-8.3.7/configure.in
---- postgresql-8.3.7.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.7/configure.in	2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.4.0.orig/configure.in postgresql-8.4.0/configure.in
+--- postgresql-8.4.0.orig/configure.in	2009-06-26 20:14:47.000000000 -0400
++++ postgresql-8.4.0/configure.in	2009-08-12 23:09:31.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3.7], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs at postgresql.org])
  
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
 -recommended.  You can remove the check from 'configure.in' but it is then
 -your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)

postgresql-logging.patch:
 postgresql.conf.sample |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: postgresql-logging.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-logging.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- postgresql-logging.patch	18 Jan 2008 20:48:56 -0000	1.4
+++ postgresql-logging.patch	18 Aug 2009 02:58:55 -0000	1.5
@@ -1,7 +1,10 @@
-diff -Naur postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.3RC2/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample	2008-01-09 21:50:01.000000000 -0500
-+++ postgresql-8.3RC2/src/backend/utils/misc/postgresql.conf.sample	2008-01-18 11:44:08.000000000 -0500
-@@ -237,17 +237,17 @@
+Select stderr-based logging with a week's worth of daily logfiles.
+
+
+diff -Naur postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.4.0/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample	2009-04-22 20:23:45.000000000 -0400
++++ postgresql-8.4.0/src/backend/utils/misc/postgresql.conf.sample	2009-08-12 23:20:46.000000000 -0400
+@@ -236,17 +236,17 @@
  					# requires logging_collector to be on.
  
  # This is used when logging to stderr:
@@ -23,15 +26,15 @@ diff -Naur postgresql-8.3RC2.orig/src/ba
  					# same name as the new log file will be
  					# truncated rather than appended to.
  					# But such truncation only occurs on
-@@ -255,9 +255,9 @@
+@@ -254,9 +254,9 @@
  					# or size-driven rotation.  Default is
  					# off, meaning append to existing files
  					# in all cases.
 -#log_rotation_age = 1d			# Automatic rotation of logfiles will
 +log_rotation_age = 1d			# Automatic rotation of logfiles will
- 					# happen after that time.  0 to disable.
+ 					# happen after that time.  0 disables.
 -#log_rotation_size = 10MB		# Automatic rotation of logfiles will 
 +log_rotation_size = 0			# Automatic rotation of logfiles will 
  					# happen after that much log output.
- 					# 0 to disable.
+ 					# 0 disables.
  

postgresql-perl-rpath.patch:
 GNUmakefile |    3 +++
 1 file changed, 3 insertions(+)

Index: postgresql-perl-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql-perl-rpath.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- postgresql-perl-rpath.patch	5 Dec 2006 03:01:02 -0000	1.4
+++ postgresql-perl-rpath.patch	18 Aug 2009 02:58:55 -0000	1.5
@@ -7,12 +7,12 @@ So work around it by adding an rpath spe
 Per bug #162198.
 
 
-diff -Naur postgresql-8.2.0.orig/src/pl/plperl/GNUmakefile postgresql-8.2.0/src/pl/plperl/GNUmakefile
---- postgresql-8.2.0.orig/src/pl/plperl/GNUmakefile	2006-07-20 20:24:04.000000000 -0400
-+++ postgresql-8.2.0/src/pl/plperl/GNUmakefile	2006-12-04 20:00:56.000000000 -0500
-@@ -36,6 +36,9 @@
+diff -Naur postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile postgresql-8.4.0/src/pl/plperl/GNUmakefile
+--- postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile	2009-06-05 14:29:56.000000000 -0400
++++ postgresql-8.4.0/src/pl/plperl/GNUmakefile	2009-08-12 23:28:57.000000000 -0400
+@@ -38,6 +38,9 @@
  
- SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
+ SHLIB_LINK = $(perl_embed_ldflags)
  
 +# Force rpath to be used even though we disable it everywhere else
 +SHLIB_LINK += $(rpath)


Index: postgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/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	18 Aug 2009 02:58:55 -0000	1.25
@@ -67,10 +67,15 @@
 # Version 8.2 Devrim Gunduz <devrim at CommandPrompt.com>
 # Set initdb as a seperate option.
 
-# PGVERSION is the full package version, e.g., 8.2.0
+# Version 8.3 Devrim Gunduz <devrim at CommandPrompt.com>
+
+# Version 8.4 Devrim Gunduz <devrim at CommandPrompt.com>
+# Remove "sameuser" from initdb, to match the new hba conf file.
+
+# PGVERSION is the full package version, e.g., 8.4.0
 # Note: the specfile ordinarily updates this during install
 PGVERSION=xxxx
-# PGMAJORVERSION is major version, e.g., 8.2 (this should match PG_VERSION)
+# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION)
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
 
 # Source function library.
@@ -101,13 +106,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
@@ -245,7 +244,7 @@ initdb(){
 	# Clean up SELinux tagging for PGDATA
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
 	# Initialize the database
-	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$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/devel/postgresql.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- postgresql.spec	26 Jul 2009 19:14:39 -0000	1.112
+++ postgresql.spec	18 Aug 2009 02:58:55 -0000	1.113
@@ -1,25 +1,6 @@
-# Conventions for PostgreSQL Global Development Group RPM releases:
-
-# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
-# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
-# test releases.
-
-# Pre-releases are those that are built from CVS snapshots or pre-release
-# tarballs from postgresql.org.  Official beta releases are not 
-# considered pre-releases, nor are release candidates, as their beta or
-# release candidate status is reflected in the version of the tarball. Pre-
-# releases' versions do not change -- the pre-release tarball of 7.0.3, for
-# example, has the same tarball version as the final official release of 7.0.3:
-# but the tarball is different.
-
-# Test releases are where PostgreSQL itself is not in beta, but certain parts of
-# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
-
-# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
-# -- only test releases or full releases should be.
 # This is the PostgreSQL Global Development Group Official RPMset spec file,
 # or a derivative thereof.
-# Copyright 2003 Lamar Owen <lowen at pari.edu> <lamar.owen at wgcr.org>
+# Copyright 2003-2009 Lamar Owen <lowen at pari.edu> <lamar.owen at wgcr.org>
 # and others listed.
 
 # Major Contributors:
@@ -41,18 +22,12 @@
 # This spec file and ancilliary files are licensed in accordance with 
 # The PostgreSQL license.
 
-# In this file you can find the default build package list macros.  These can be overridden by defining
-# on the rpm command line:
+# In this file you can find the default build package list macros.
+# These can be overridden by defining on the rpm command line:
 # rpm --define 'packagename 1' .... to force the package to build.
 # rpm --define 'packagename 0' .... to force the package NOT to build.
-# The base package, the lib package, the devel package, and the server package always get built.
-
-#build7x, build8, and build9 similar
-%{?build7x:%define tcldevel 0}
-%{?build7x:%define aconfver autoconf-2.53}
-%{?build8:%define build89 1}
-%{?build8:%define tcldevel 0}
-%{?build9:%define build89 1}
+# The base package, the lib package, the devel package, and the server package
+# always get built.
 
 %define beta 0
 %{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
@@ -83,8 +58,9 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.7
-Release: 2%{?dist}
+%define majorversion 8.4
+Version: 8.4.0
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -98,7 +74,7 @@ Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.7-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.0-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -106,7 +82,6 @@ Source20: http://pgfoundry.org/projects/
 Patch1: rpm-pgsql.patch
 Patch2: postgresql-ac-version.patch
 Patch3: postgresql-logging.patch
-Patch4: postgresql-test.patch
 Patch5: pgtcl-no-rpath.patch
 Patch6: postgresql-perl-rpath.patch
 
@@ -185,7 +160,7 @@ server over a network connection. This p
 in HTML for the whole package, as well as command-line utilities for
 managing PostgreSQL databases on a PostgreSQL server. 
 
-If you want to manipulate a PostgreSQL database on a remote PostgreSQL
+If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
 server, you need this package. You also need to install this package
 if you're installing the postgresql-server package.
 
@@ -228,8 +203,8 @@ Obsoletes: rh-postgresql-docs
 
 %description docs
 The postgresql-docs package includes some additional documentation for
-PostgreSQL.  Currently, this includes the main documentation in PDF format,
-the FAQ, and source files for the PostgreSQL tutorial.
+PostgreSQL.  Currently, this includes the main documentation in PDF format
+and source files for the PostgreSQL tutorial.
 
 
 %package contrib
@@ -256,7 +231,6 @@ with a PostgreSQL database management se
 Postgres preprocessor. You need to install this package if you want to
 develop applications which will interact with a PostgreSQL server.
 
-#------------
 %if %plperl
 %package plperl
 Summary: The Perl procedural language for PostgreSQL
@@ -272,7 +246,6 @@ system.  The postgresql-plperl package c
 procedural language for the backend.
 %endif
 
-#------------
 %if %plpython
 %package plpython
 Summary: The Python procedural language for PostgreSQL
@@ -287,7 +260,6 @@ system.  The postgresql-plpython package
 procedural language for the backend.
 %endif
 
-#------------
 %if %pltcl
 %package pltcl
 Summary: The Tcl procedural language for PostgreSQL
@@ -302,7 +274,6 @@ system.  The postgresql-pltcl package co
 procedural language for the backend.
 %endif
 
-#------------
 %if %tcl
 %package tcl
 Summary: A Tcl client library for PostgreSQL
@@ -318,7 +289,6 @@ system.  The postgresql-tcl package cont
 and its documentation.
 %endif
 
-#------------
 %if %python
 %package python
 Summary: Development module for Python code to access a PostgreSQL DB
@@ -335,7 +305,6 @@ developers to use when writing Python co
 database.
 %endif
 
-#----------
 %if %test
 %package test
 Summary: The test suite distributed with PostgreSQL
@@ -357,7 +326,6 @@ system, including regression tests and b
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 # patch5 is applied later
 %patch6 -p1
 
@@ -402,10 +370,6 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v 
 CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
 %endif
 
-# Use --as-needed to eliminate unnecessary link dependencies.
-# NB: Postgres 8.4 will do this for itself.
-LDFLAGS="-Wl,--as-needed"; export LDFLAGS
-
 %configure --disable-rpath \
 %if %beta
 	--enable-debug \
@@ -466,11 +430,8 @@ rm -f src/tutorial/GNUmakefile
 %if %runselftest
 	pushd src/test/regress
 	make all
-	cp ../../../contrib/spi/refint.so .
-	cp ../../../contrib/spi/autoinc.so .
 	make MAX_CONNECTIONS=5 check
 	make clean
-	rm refint.so autoinc.so
 	popd
 %endif
 
@@ -572,8 +533,6 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sy
 	# Makefiles, however.
 	mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
 	cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
-	install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
-	install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
 	pushd  $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
 	strip *.so
 	rm -f GNUmakefile Makefile *.o
@@ -597,21 +556,44 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
    popd
 %endif
 
-%find_lang libpq
-%find_lang initdb
-%find_lang pg_config
-%find_lang pg_ctl
-%find_lang pg_dump
-%find_lang postgres
-%find_lang psql
-%find_lang pg_resetxlog
-%find_lang pg_controldata
-%find_lang pgscripts
-
-cat libpq.lang > libpq.lst
-cat pg_config.lang > pg_config.lst
-cat initdb.lang pg_ctl.lang psql.lang pg_dump.lang pgscripts.lang > main.lst
-cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
+%find_lang ecpg-%{majorversion}
+cat ecpg-%{majorversion}.lang >devel.lst
+%find_lang ecpglib6-%{majorversion}
+cat ecpglib6-%{majorversion}.lang >libs.lst
+%find_lang initdb-%{majorversion}
+cat initdb-%{majorversion}.lang >server.lst
+%find_lang libpq5-%{majorversion}
+cat libpq5-%{majorversion}.lang >>libs.lst
+%find_lang pg_config-%{majorversion}
+cat pg_config-%{majorversion}.lang >>devel.lst
+%find_lang pg_controldata-%{majorversion}
+cat pg_controldata-%{majorversion}.lang >>server.lst
+%find_lang pg_ctl-%{majorversion}
+cat pg_ctl-%{majorversion}.lang >>server.lst
+%find_lang pg_dump-%{majorversion}
+cat pg_dump-%{majorversion}.lang >main.lst
+%find_lang pg_resetxlog-%{majorversion}
+cat pg_resetxlog-%{majorversion}.lang >>server.lst
+%find_lang pgscripts-%{majorversion}
+cat pgscripts-%{majorversion}.lang >>main.lst
+%if %plperl
+%find_lang plperl-%{majorversion}
+cat plperl-%{majorversion}.lang >plperl.lst
+%endif
+%find_lang plpgsql-%{majorversion}
+cat plpgsql-%{majorversion}.lang >>server.lst
+%if %plpython
+%find_lang plpython-%{majorversion}
+cat plpython-%{majorversion}.lang >plpython.lst
+%endif
+%if %pltcl
+%find_lang pltcl-%{majorversion}
+cat pltcl-%{majorversion}.lang >pltcl.lst
+%endif
+%find_lang postgres-%{majorversion}
+cat postgres-%{majorversion}.lang >>server.lst
+%find_lang psql-%{majorversion}
+cat psql-%{majorversion}.lang >>main.lst
 
 %post libs -p /sbin/ldconfig 
 %postun libs -p /sbin/ldconfig 
@@ -672,7 +654,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f main.lst
 %defattr(-,root,root)
-%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* 
+%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* 
 %doc COPYRIGHT README HISTORY doc/bug.template
 %doc README.rpm-dist
 %doc doc/html
@@ -707,7 +689,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root)
-%doc doc/src/FAQ
 %doc *-US.pdf
 %{_libdir}/pgsql/tutorial/
 
@@ -716,8 +697,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pgsql/_int.so
 %{_libdir}/pgsql/adminpack.so
 %{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/auto_explain.so
+%{_libdir}/pgsql/btree_gin.so
 %{_libdir}/pgsql/btree_gist.so
 %{_libdir}/pgsql/chkpass.so
+%{_libdir}/pgsql/citext.so
 %{_libdir}/pgsql/cube.so
 %{_libdir}/pgsql/dblink.so
 %{_libdir}/pgsql/dict_int.so
@@ -726,7 +710,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pgsql/fuzzystrmatch.so
 %{_libdir}/pgsql/hstore.so
 %{_libdir}/pgsql/insert_username.so
-%{_libdir}/pgsql/int_aggregate.so
 %{_libdir}/pgsql/isn.so
 %{_libdir}/pgsql/lo.so
 %{_libdir}/pgsql/ltree.so
@@ -738,6 +721,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pgsql/pgcrypto.so
 %{_libdir}/pgsql/pgrowlocks.so
 %{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/pg_stat_statements.so
 %{_libdir}/pgsql/refint.so
 %{_libdir}/pgsql/seg.so
 %{_libdir}/pgsql/sslinfo.so
@@ -756,9 +740,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pg_standby
 %{_bindir}/pgbench
 %{_bindir}/vacuumlo
-%doc contrib/*/README.* contrib/spi/*.example
+%doc contrib/spi/*.example
 
-%files libs -f libpq.lang
+%files libs -f libs.lst
 %defattr(-,root,root)
 %{_libdir}/libpq.so.*
 %{_libdir}/libecpg.so.*
@@ -773,14 +757,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %attr (755,root,root) %dir /etc/sysconfig/pgsql
 %{_bindir}/initdb
-%{_bindir}/ipcclean
 %{_bindir}/pg_controldata
 %{_bindir}/pg_ctl
 %{_bindir}/pg_resetxlog
 %{_bindir}/postgres
 %{_bindir}/postmaster
 %{_mandir}/man1/initdb.*
-%{_mandir}/man1/ipcclean.*
 %{_mandir}/man1/pg_controldata.*
 %{_mandir}/man1/pg_ctl.*
 %{_mandir}/man1/pg_resetxlog.*
@@ -806,7 +788,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pgsql/snowball_create.sql
 %{_datadir}/pgsql/sql_features.txt
 
-%files devel -f pg_config.lst
+%files devel -f devel.lst
 %defattr(-,root,root)
 /usr/include/*
 %{_bindir}/ecpg
@@ -832,13 +814,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %plperl
-%files plperl
+%files plperl -f plperl.lst
 %defattr(-,root,root)
 %{_libdir}/pgsql/plperl.so
 %endif
 
 %if %pltcl
-%files pltcl
+%files pltcl -f pltcl.lst
 %defattr(-,root,root)
 %{_libdir}/pgsql/pltcl.so
 %{_bindir}/pltcl_delmod
@@ -848,7 +830,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %plpython
-%files plpython
+%files plpython -f plpython.lst
 %defattr(-,root,root)
 %{_libdir}/pgsql/plpython.so
 %endif
@@ -870,6 +852,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 17 2009 Tom Lane <tgl at redhat.com> 8.4.0-1
+- Update to PostgreSQL 8.4.0.  See release notes at
+  http://www.postgresql.org/docs/8.4/static/release-8-4.html
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.3.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

rpm-pgsql.patch:
 Makefile.global.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: rpm-pgsql.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/rpm-pgsql.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpm-pgsql.patch	7 Nov 2005 21:54:56 -0000	1.2
+++ rpm-pgsql.patch	18 Aug 2009 02:58:55 -0000	1.3
@@ -1,7 +1,11 @@
-diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Makefile.global.in
---- postgresql-8.1.0.orig/src/Makefile.global.in	2005-09-27 13:39:32.000000000 -0400
-+++ postgresql-8.1.0/src/Makefile.global.in	2005-11-07 14:58:59.000000000 -0500
-@@ -53,7 +53,7 @@
+For the RPMs, we want the custom installation directories to end in
+/pgsql not /postgresql.  This is historical but not worth changing.
+
+
+diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in
+--- postgresql-8.4.0.orig/src/Makefile.global.in	2009-06-22 23:46:00.000000000 -0400
++++ postgresql-8.4.0/src/Makefile.global.in	2009-08-12 23:14:53.000000000 -0400
+@@ -54,7 +54,7 @@
  # Installation directories
  #
  # These are set by the equivalent --xxxdir configure options.  We
@@ -10,7 +14,7 @@ diff -Naur postgresql-8.1.0.orig/src/Mak
  # contain "pgsql" or "postgres", in order to avoid directory clutter.
  #
  # In a PGXS build, we cannot use the values inserted into Makefile.global
-@@ -73,14 +73,14 @@
+@@ -75,14 +75,14 @@
  datadir := @datadir@
  ifeq "$(findstring pgsql, $(datadir))" ""
  ifeq "$(findstring postgres, $(datadir))" ""
@@ -27,7 +31,7 @@ diff -Naur postgresql-8.1.0.orig/src/Mak
  endif
  endif
  
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
  pkglibdir = $(libdir)
  ifeq "$(findstring pgsql, $(pkglibdir))" ""
  ifeq "$(findstring postgres, $(pkglibdir))" ""
@@ -36,7 +40,7 @@ diff -Naur postgresql-8.1.0.orig/src/Mak
  endif
  endif
  
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@
  pkgincludedir = $(includedir)
  ifeq "$(findstring pgsql, $(pkgincludedir))" ""
  ifeq "$(findstring postgres, $(pkgincludedir))" ""
@@ -46,11 +50,11 @@ diff -Naur postgresql-8.1.0.orig/src/Mak
  endif
  
 @@ -109,7 +109,7 @@
- ifneq (,$(docdir))
+ docdir := @docdir@
  ifeq "$(findstring pgsql, $(docdir))" ""
  ifeq "$(findstring postgres, $(docdir))" ""
 -override docdir := $(docdir)/postgresql
 +override docdir := $(docdir)/pgsql
  endif
  endif
- endif
+ 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	21 Mar 2009 22:43:50 -0000	1.47
+++ sources	18 Aug 2009 02:58:55 -0000	1.48
@@ -1,5 +1,5 @@
-7b7e91a2221e55fe1b167e663217a96d  postgresql-8.3.7.tar.bz2
+1f172d5f60326e972837f58fa5acd130  postgresql-8.4.0.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-cf36036b0a973f793b2ba25dfdbcf879  postgresql-8.3.7-US.pdf
+bbed2a7dad711eef335701391b9f112d  postgresql-8.4.0-US.pdf


--- postgresql-test.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Aug 18 03:02:59 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 18 Aug 2009 03:02:59 +0000 (UTC)
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-2.8.2.diff, NONE,
	1.1 .cvsignore, 1.15, 1.16 OpenSceneGraph.spec, 1.45,
	1.46 sources, 1.15, 1.16 OpenSceneGraph-2.8.1.diff, 1.1, NONE
Message-ID: <20090818030259.38DCA11C006E@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15917

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Added Files:
	OpenSceneGraph-2.8.2.diff 
Removed Files:
	OpenSceneGraph-2.8.1.diff 
Log Message:
* Mon Aug 17 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-1
- Upstream update.
- Reflect upstream having changes Source0-URL.


OpenSceneGraph-2.8.2.diff:
 CMakeLists.txt                   |    4 
 CMakeLists.txt.orig              |  847 +++++++++++++++++++++++++++++++++++++++
 CMakeModules/OsgMacroUtils.cmake |    2 
 3 files changed, 850 insertions(+), 3 deletions(-)

--- NEW FILE OpenSceneGraph-2.8.2.diff ---
diff -Naur OpenSceneGraph-2.8.2.orig/CMakeLists.txt OpenSceneGraph-2.8.2/CMakeLists.txt
--- OpenSceneGraph-2.8.2.orig/CMakeLists.txt	2009-07-28 08:02:27.000000000 +0200
+++ OpenSceneGraph-2.8.2/CMakeLists.txt	2009-08-17 17:39:09.000000000 +0200
@@ -717,7 +717,7 @@
         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
     )
     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
+    #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
 
     # now set up openthreads documentation generation
     IF(BUILD_REF_DOCS_TAGFILE)
@@ -733,7 +733,7 @@
         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
     )
     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
+    #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
 
     # Process our other doxyfiles but don't create targets for these
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
diff -Naur OpenSceneGraph-2.8.2.orig/CMakeLists.txt.orig OpenSceneGraph-2.8.2/CMakeLists.txt.orig
--- OpenSceneGraph-2.8.2.orig/CMakeLists.txt.orig	1970-01-01 01:00:00.000000000 +0100
+++ OpenSceneGraph-2.8.2/CMakeLists.txt.orig	2009-07-28 08:02:27.000000000 +0200
@@ -0,0 +1,847 @@
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
+
+IF(WIN32)
+    CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
+ELSE(WIN32)
+    IF(APPLE)
+        CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+    ELSE(APPLE)
+        CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0 FATAL_ERROR)
+    ENDIF(APPLE)
+ENDIF(WIN32)
+
+if(COMMAND cmake_policy)
+    # Works around warnings libraries linked against that don't
+    # have absolute paths (e.g. -lpthreads)
+    cmake_policy(SET CMP0003 NEW)
+
+    # Works around warnings about escaped quotes in ADD_DEFINITIONS
+    # statements.
+    cmake_policy(SET CMP0005 NEW)
+
+    # cmake-2.6.1 introduces policy cmp0008 decide how to treat full path libraries that do not appear to be valid library file names
+    # quote from cvslog "Such libraries worked by accident in the VS IDE and Xcode generators in CMake 2.4 and below."
+    if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
+        cmake_policy(SET CMP0008 OLD)
+    endif(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
+endif(COMMAND cmake_policy)
+
+PROJECT(OpenSceneGraph)
+
+SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
+SET(OPENSCENEGRAPH_MINOR_VERSION 8)
+SET(OPENSCENEGRAPH_PATCH_VERSION 2)
+SET(OPENSCENEGRAPH_SOVERSION 55)
+
+# set to 0 when not a release candidate, non zero means that any generated 
+# svn tags will be treated as release candidates of given number
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
+
+SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
+
+SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
+
+SET(OSG_PLUGIN_PREFIX "")
+
+IF (CYGWIN)
+    SET(OSG_PLUGIN_PREFIX "cygwin_")
+ENDIF(CYGWIN)
+
+IF(MINGW)
+    SET(OSG_PLUGIN_PREFIX "mingw_")
+ENDIF(MINGW)
+
+
+# We want to build SONAMES shared librariess
+SET(OPENSCENEGRAPH_SONAMES TRUE)
+SET(OPENTHREADS_SONAMES TRUE)
+
+SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR})
+
+# We have some custom .cmake scripts not in the official distribution.
+# Maybe this can be used override existing behavior if needed?
+SET(CMAKE_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
+
+
+# Okay, here's the problem: On some platforms, linking against OpenThreads
+# is not enough and explicit linking to the underlying thread library
+# is also required (e.g. FreeBSD). But OpenThreads may be built with different
+# backends (Pthreads, Sproc, Windows) so we don't know what the underlying
+# thread library is because some platforms support multiple backends (e.g.
+# IRIX supports Sproc and Pthreads). Linking all libraries won't work
+# because the libraries may be incompatible.
+# So the current solution is to attempt best guess linking and exempt certain
+# cases. With IRIX, we're going to hope explicit linking to the underlying
+# library is not necessary. We currently don't case for pthreads on Windows
+# which might be an issue on things like Cygwin. This may need to be fixed.
+FIND_PACKAGE(Threads)
+IF(CMAKE_SYSTEM MATCHES IRIX)
+    # Erase CMAKE_THREAD_LIBS_INIT and hope it works
+    SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
+ENDIF(CMAKE_SYSTEM MATCHES IRIX)
+
+OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
+IF (OSG_MAINTAINER)
+
+    #SET(OPENSCENEGRAPH_SVN "trunk")
+    SET(OPENSCENEGRAPH_SVN "branches")
+
+    SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
+
+    #
+    # Provide target for tagging a release
+    #
+    SET(SVNCOMMAND svn)
+    SET(SVNTRUNKDIR     http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk)
+    SET(SVNTAGDIR       http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags)
+    SET(SVNBRANCHDIR    http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches)
+
+    IF   (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNTRUNKDIR})
+    ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH})
+    ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk")
+
+
+    IF   (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
+    ELSE (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
+    ENDIF(OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+
+
+    ADD_CUSTOM_TARGET(tag-test
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+    )
+
+    ADD_CUSTOM_TARGET(tag-run
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+    )
+
+    ADD_CUSTOM_TARGET(branch-test
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+    )
+
+    ADD_CUSTOM_TARGET(branch-run
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+    )
+
+    #
+    # Provide target for generating ChangeLog
+    #
+    SET(GENERATELOGS svn2cl)
+
+    ADD_CUSTOM_TARGET(ChangeLog
+        COMMAND ${SVNCOMMAND} update
+        COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
+    )
+    
+ENDIF(OSG_MAINTAINER)
+
+
+# Find OpenGL
+FIND_PACKAGE(OpenGL)
+
+IF(APPLE)
+    FIND_LIBRARY(CARBON_LIBRARY Carbon)
+    FIND_LIBRARY(COCOA_LIBRARY Cocoa)
+ENDIF(APPLE)
+
+IF(UNIX)
+    # Not sure what this will do on Cygwin and Msys
+    # Also, remember OS X X11 is a user installed option so it may not exist.
+    FIND_PACKAGE(X11)
+    # Some Unicies need explicit linkage to the Math library or the build fails.
+    FIND_LIBRARY(MATH_LIBRARY m)
+ENDIF(UNIX)
+
+# Make the headers visible to everything
+IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
+   INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
+ENDIF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
+
+INCLUDE_DIRECTORIES(
+    ${OpenSceneGraph_SOURCE_DIR}/include
+    ${OPENGL_INCLUDE_DIR}
+)
+
+# Common global definitions
+#ADD_DEFINITIONS(-D)
+# Platform specific definitions
+
+
+IF(WIN32)
+
+    IF(MSVC)
+        # This option is to enable the /MP switch for Visual Studio 2005 and above compilers
+        OPTION(WIN32_USE_MP "Set to ON to build OpenSceneGraph with the /MP option (Visual Studio 2005 and above)." OFF)
+        MARK_AS_ADVANCED(WIN32_USE_MP)
+        IF(WIN32_USE_MP)
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+        ENDIF(WIN32_USE_MP)
+
+        # turn off various warnings
+        # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
+        #     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd${warning}")
+        # endforeach(warning)
+
+        # More MSVC specific compilation flags
+        ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
+        ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
+    ENDIF(MSVC)
+
+    #needed for net plugin
+    SET (OSG_SOCKET_LIBS wsock32)
+    # Both Cygwin and Msys need -DNOMINMAX ???
+    IF(UNIX)
+        ADD_DEFINITIONS(-DNOMINMAX)
+    ENDIF(UNIX)
+########################################################################################################
+# the following options are MSVC specific,
+# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that should allow to run examples and application
+# fron bin folder without requiring installation step.
+# it also prepend "osg${OPENSCENEGRAPH_SOVERSION}-" to only .dll files, leaving .lib files untouched in lib
+# it also use a hack to get rid of Debug and Release folder in MSVC projects
+# all the .dll and .pdb are in bin and all the .lib and .exp are in lib
+#
+# the second option disable incremental linking in debug build , that is enabled by default by CMake
+##########################################################################################################
+
+    IF(MSVC)
+        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
+            MESSAGE("Warning:  disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7")
+            SET(OSG_MSVC_VERSIONED_DLL OFF)
+            SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON)
+        ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
+            OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON)
+            MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL)
+            OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON)
+            MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+            IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+                SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+                SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+                SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+            ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
+    ENDIF(MSVC)
+ENDIF(WIN32)
+
+########################################################################################################
+##### these were settings located in SetupCommon.cmake used in Luigi builds.... find out what are useful
+########################################################################################################
+#luigi#SET(CMAKE_VERBOSE_MAKEFILE TRUE)
+#luigi#SET(CMAKE_SKIP_RPATH TRUE)
+#luigi#SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+#luigi#IF(UNIX)
+#luigi#    LIST_CONTAINS(contains "g++" ${CMAKE_CXX_COMPILER_LIST})
+#luigi#    IF (contains)
+#luigi#        MESSAGE(${MY_MESSAGE_DEFAULT} "${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} setting  CMAKE_CXX_COMPILER to g++")
+#luigi#        SET(CMAKE_CXX_COMPILER "g++")
+#luigi#        SET(CMAKE_CXX_COMPILER_LOADED 2)
+#luigi#        SET(CMAKE_CXX_COMPILER_WORKS 2)
+#luigi#    ENDIF (contains)
+#luigi#    SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+#luigi#    SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb -gstabs")
+#luigi#ENDIF(UNIX)
+########################################################################################################
+
+OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
+MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
+
+OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane instead of double." OFF)
+MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
+
+OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with float BoundingSphere instead of double." ON)
+MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
+
+OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
+MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
+
+OPTION(OSG_USE_UTF8_FILENAME "Set to ON to use a UTF8 locale for filenames instead of the default locale." OFF)
+MARK_AS_ADVANCED(OSG_USE_UTF8_FILENAME)
+
+OPTION(OSG_DISABLE_MSVC_WARNINGS "Set to OFF to not disable MSVC warnings generated by OSG headers." ON)
+MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS)
+
+OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
+
+################################################################################
+# Set Config file
+
+SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
+               "${OPENSCENEGRAPH_CONFIG_HEADER}")
+# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+
+
+################################################################################
+# Optional build components
+
+# OSG Applications
+OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)" ON)
+
+# OSG Examples
+OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF)
+
+################################################################################
+# 3rd Party Dependency Stuff
+IF(WIN32)
+    INCLUDE(Find3rdPartyDependencies)
+ENDIF(WIN32)
+
+# Common to all platforms:
+FIND_PACKAGE(FreeType)
+FIND_PACKAGE(Inventor)
+FIND_PACKAGE(Jasper)
+FIND_PACKAGE(OpenEXR)
+FIND_PACKAGE(COLLADA)
+FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(Xine)
+FIND_PACKAGE(OpenVRML)
+FIND_PACKAGE(Performer)
+FIND_PACKAGE(GDAL)
+FIND_PACKAGE(CURL)
+FIND_PACKAGE(ITK)
+FIND_PACKAGE(LibVNCServer)
+FIND_PACKAGE(OurDCMTK)
+FIND_PACKAGE(XUL)
+
+#use pkg-config to find various modues
+INCLUDE(FindPkgConfig OPTIONAL)
+
+IF(PKG_CONFIG_FOUND)
+
+    INCLUDE(FindPkgConfig)
+
+    PKG_CHECK_MODULES(GTK gtk+-2.0)
+
+    IF(WIN32)
+        PKG_CHECK_MODULES(GTKGL gtkglext-win32-1.0)
+    ELSE(WIN32)
+        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
+    ENDIF(WIN32)
+
+    PKG_CHECK_MODULES(RSVG librsvg-2.0)
+    PKG_CHECK_MODULES(CAIRO cairo)
+    PKG_CHECK_MODULES(POPPLER poppler-glib)
+
+ENDIF(PKG_CONFIG_FOUND)
+
+#optional example related dependencies
+IF   (BUILD_OSG_EXAMPLES)
+
+
+    FIND_PACKAGE(FLTK)
+    FIND_PACKAGE(GLUT)
+    FIND_PACKAGE(SDL)
+    FIND_PACKAGE(FOX)
+
+    SET(wxWidgets_USE_LIBS base core gl net)
+    FIND_PACKAGE(wxWidgets)
+
+    # To select a specific version of QT define DESIRED_QT_VERSION
+    # via cmake -DDESIRED_QT_VERSION=4
+    IF  (DESIRED_QT_VERSION)
+
+        IF  (DESIRED_QT_VERSION MATCHES 4)
+          FIND_PACKAGE(Qt4)
+        ELSE(DESIRED_QT_VERSION MATCHES 4)
+          FIND_PACKAGE(Qt3)
+        ENDIF(DESIRED_QT_VERSION MATCHES 4)
+
+    ELSE(DESIRED_QT_VERSION)
+
+        FIND_PACKAGE(Qt4)
+
+        IF  (NOT QT4_FOUND)
+            FIND_PACKAGE(Qt3)
+        ENDIF(NOT QT4_FOUND)
+
+    ENDIF(DESIRED_QT_VERSION)
+
+ENDIF(BUILD_OSG_EXAMPLES)
+
+
+
+
+
+
+#
+# Test to determine if we want the "tripledot" form of the GLU tesselator callback.
+#
+IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
+    IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+        # Skip the compile check for platforms that never need the variable
+        # form.
+        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT false)
+
+    ELSE(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+        # For other platforms perform the check
+        INCLUDE(CheckCXXSourceCompiles)
+        SET(CMAKE_REQUIRED_DEFINITIONS -DGLU_TESS_CALLBACK_TRIPLEDOT)
+        SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${GL_INCLUDE_DIR})
+        SET(CMAKE_REQUIRED_LIBRARIES ${GLUT_LIBRARY} ${GL_LIBRARY})
+        CHECK_CXX_SOURCE_COMPILES(
+            "#include <osg/GL>
+            #include <osg/GLU>
+            static void testcb(GLvoid *, void*) { }
+            int main() {
+               GLUtesselator *t = gluNewTess();
+               gluTessCallback(t, GLU_TESS_VERTEX_DATA, (GLU_TESS_CALLBACK) testcb);
+               return 0;
+            }"
+            GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No)
+        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT
+            ${GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No})
+
+    ENDIF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
+ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
+
+OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
+IF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
+    ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
+ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
+
+# Platform specific:
+# (We can approach this one of two ways. We can try to FIND everything
+# and simply check if we found the packages before actually building
+# or we can hardcode the cases. The advantage of the former is that
+# packages that are installed on platforms that don't require them
+# will still get built (presuming no compatibility issues). But this
+# also means modules that are redundant may get built. For example,
+# OS X doesn't need GIF, JPEG, PNG, TIFF, etc because it uses QuickTime.
+# Also, it will clutter the CMake menu with "NOT_FOUND".
+# The downside to the latter is that it is harder to build those
+# potentially redundant modules.)
+
+# Image readers/writers depend on 3rd party libraries except for OS X which
+# can use Quicktime.
+IF(NOT APPLE)
+    FIND_PACKAGE(GIFLIB)
+    FIND_PACKAGE(JPEG)
+    FIND_PACKAGE(PNG)
+    FIND_PACKAGE(TIFF)
+
+    # QuickTime is required for OS X, but optional for Windows.
+    IF(WIN32)
+        FIND_PACKAGE(QuickTime)
+    ENDIF(WIN32)
+
+ELSE(NOT APPLE)
+    FIND_PACKAGE(QuickTime)
+ENDIF(NOT APPLE)
+
+################################################################################
+# Create bin and lib directories if required
+
+IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+   FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/lib/${OSG_PLUGINS})
+ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+
+
+################################################################################
+# Installation stuff
+
+SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
+ADD_DEFINITIONS(-DOSG_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX})
+
+IF(UNIX AND NOT WIN32)
+  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    ADD_DEFINITIONS("-D_DEBUG")
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ENDIF(UNIX AND NOT WIN32)
+
+IF(CYGWIN)
+  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    ADD_DEFINITIONS("-D_DEBUG")
+  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ENDIF(CYGWIN)
+
+IF(UNIX AND NOT WIN32 AND NOT APPLE)
+  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
+      MARK_AS_ADVANCED(LIB_POSTFIX)
+  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+IF(NOT DEFINED LIB_POSTFIX)
+    SET(LIB_POSTFIX "")
+ENDIF(NOT DEFINED LIB_POSTFIX)
+
+# Here we apparantly do some funky stuff with making the bin/ and lib/
+# folders which is probably needed to work around a very old CMake bug?
+
+#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
+SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
+MAKE_DIRECTORY(${OUTPUT_BINDIR})
+IF(MSVC AND NOT MSVC_IDE)
+    MAKE_DIRECTORY(${OUTPUT_BINDIR}/${OSG_PLUGINS})
+ENDIF(MSVC AND NOT MSVC_IDE)
+
+#SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
+SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
+MAKE_DIRECTORY(${OUTPUT_LIBDIR})
+IF(NOT MSVC)
+    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
+ENDIF(NOT MSVC)
+
+# On CMake 2.4.x use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH and later
+# we work around the DLL placement by use of the PREFIX target property hack
+#
+# On CMake 2.6.x use the newly minted CMAKE_LIBRARY_OUTPUT_DIRECTORY,
+# CMAKE_ARCHIVE_OUTPUT_DIRECTORY & CMAKE_RUNTIME_OUTPUT_DIRECTORY
+
+IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
+    # If CMake >= 2.6.0
+    SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
+    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
+    IF(WIN32)
+        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
+    ELSE(WIN32)
+        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
+    ENDIF(WIN32)
+ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
+    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
+    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
+ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
+
+#SET(INSTALL_BINDIR OpenSceneGraph/bin)
+#SET(INSTALL_INCDIR OpenSceneGraph/include)
+#SET(INSTALL_LIBDIR OpenSceneGraph/lib)
+#SET(INSTALL_DOCDIR OpenSceneGraph/doc)
+
+################################################################################
+# User Options
+
+
+# Expose CMAKE_INCLUDE_PATH and CMAKE_LIBARY_PATH to the GUI so users
+# may set these values without needing to manipulate the environment.
+SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} CACHE STRING "You may add additional search paths here. Use ; to separate multiple paths.")
+SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE STRING "You may add additional search paths here. Use ; to separate multiple paths.")
+# We are proposing that a new variable called CMAKE_PREFIX_PATH be introduced
+# to CMake to compliment CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
+# A formal feature request has been submited to CMake, Bug #4947.
+# It is intended for those users who have common prefixes for their INCLUDE
+# and LIBRARY locations. So if users have headers in /usr/local/include
+# and libraries in /usr/local/lib, the common prefix is /usr/local.
+# It should also cover the case where headers and libraries are
+# in the same directory.
+# Our proposal expects that FIND_* commands will automatically search for
+# CMAKE_PREFIX_PATH right after CMAKE_INCLUDE_PATH or CMAKE_LIBRARY_PATH.
+# Obviously, since CMake does not currently support this, we must write
+# our Find*.cmake modules to explicitly support this. Otherwise, this variable
+# will have no impact.
+# This is unofficial so this may be removed or changed at anytime.
+SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "(EXPERIMENTAL) You may add additional search paths here. Use ; to separate multiple paths.")
+
+# This is for an advanced option to give aggressive warnings
+# under different compilers. If yours is not implemented, this option
+# will not be made available.
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # To be complete, we might also do GNUCC flags,
+    # but everything here is C++ code.
+    # -Wshadow and -Woverloaded-virtual are also interesting flags, but OSG
+    # returns too many hits.
+    # FYI, if we do implement GNUCC, then -Wmissing-prototypes in another
+    # interesting C-specific flag.
+    # Also, there is a bug in gcc 4.0. Under C++, -pedantic will create
+    # errors instead of warnings for certain issues, including superfluous
+    # semicolons and commas, and the use of long long. -fpermissive seems
+    # to be the workaround.
+    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
+
+    # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
+
+
+ELSE(CMAKE_COMPILER_IS_GNUCXX)
+    IF(MSVC)
+        # FIXME: What are good aggressive warning flags for Visual Studio?
+        # And do we need to further subcase this for different versions of VS?
+        # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
+        SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4706 /wd4127 /wd4100)
+
+
+    ELSE(MSVC)
+        # CMake lacks an elseif, so other non-gcc, non-VS compilers need
+        # to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should
+        # remain unset.
+    ENDIF(MSVC)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+# This part is for the CMake menu option to toggle the warnings on/off.
+# This will only be made available if we set values for OSG_AGGRESSIVE_WARNING_FLAGS.
+IF(OSG_AGGRESSIVE_WARNING_FLAGS)
+
+    IF (APPLE)
+        SET(DEFAULT_USE_AGGRESSIVE_WARNINGS OFF)
+    ELSE(APPLE)
+        SET(DEFAULT_USE_AGGRESSIVE_WARNINGS ON)
+    ENDIF(APPLE)
+
+    OPTION(OSG_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" ${DEFAULT_USE_AGGRESSIVE_WARNINGS})
+    MARK_AS_ADVANCED(OSG_USE_AGGRESSIVE_WARNINGS)
+
+    IF(OSG_USE_AGGRESSIVE_WARNINGS)
+        # Add flags defined by OSG_AGGRESSIVE_WARNING_FLAGS if they aren't already there
+        FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
+            IF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+            ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
+        ENDFOREACH(flag)
+    ELSE(OSG_USE_AGGRESSIVE_WARNINGS)
+        # Remove all flags considered aggresive
+        FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
+            STRING(REGEX REPLACE "${flag}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        ENDFOREACH(flag)
+    ENDIF(OSG_USE_AGGRESSIVE_WARNINGS)
+ENDIF(OSG_AGGRESSIVE_WARNING_FLAGS)
+
+
+# Dynamic vs Static Linking
+OPTION(DYNAMIC_OPENSCENEGRAPH "Set to ON to build OpenSceneGraph for dynamic linking.  Use OFF for static." ON)
+IF   (DYNAMIC_OPENSCENEGRAPH)
+    SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
+ELSE (DYNAMIC_OPENSCENEGRAPH)
+    SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
+ENDIF(DYNAMIC_OPENSCENEGRAPH)
+
+INCLUDE(OsgMacroUtils)
+# OSG Core
+ADD_SUBDIRECTORY(src)
+
+IF   (BUILD_OSG_APPLICATIONS)
+    ADD_SUBDIRECTORY(applications)
+ENDIF(BUILD_OSG_APPLICATIONS)
+
+IF   (BUILD_OSG_EXAMPLES)
+    ADD_SUBDIRECTORY(examples)
+ENDIF(BUILD_OSG_EXAMPLES)
+
+
+# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
+# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
+IF(APPLE)
+    # These are just defaults/recommendations, but how we want to build
+    # out of the box. But the user needs to be able to change these options.
+    # So we must only set the values the first time CMake is run, or we
+    # will overwrite any changes the user sets.
+    # FORCE is used because the options are not reflected in the UI otherwise.
+    # Seems like a good place to add version specific compiler flags too.
+    IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
+        # This is really fragile, but CMake doesn't provide the OS system
+        # version information we need. (Darwin versions can be changed
+        # independently of OS X versions.)
+        # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
+        IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
+            # 64-bit compiles are not supported with Carbon. We should enable 
+            # 64-bit compilation by default once osgviewer has been 
+            # rewritten with Cocoa.
+            #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
+            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+        ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
+            IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ELSE(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+                # No Universal Binary support
+                # Should break down further to set the -mmacosx-version-min,
+                # but the SDK detection is too unreliable here.
+            ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+        ENDIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
+    ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
+
+    OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
+
+ENDIF(APPLE)
+
+
+#
+# Provide target for generating wrappers
+#
+SET(GENWRAPPER genwrapper)
+
+ADD_CUSTOM_TARGET(wrappers
+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
+)
+
+# For Doxygen
+INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
+OPTION(BUILD_DOCUMENTATION "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
+MARK_AS_ADVANCED(CLEAR BUILD_DOCUMENTATION)
+# To build the documention, you will have to enable it
+# and then do the equivalent of "make DoxygenDoc".
+IF(BUILD_DOCUMENTATION)
+
+    OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF)
+    IF(BUILD_REF_DOCS_SEARCHENGINE)
+        SET(SEARCHENGINE YES)
+    ELSE(BUILD_REF_DOCS_SEARCHENGINE)
+        SET(SEARCHENGINE NO)
+    ENDIF(BUILD_REF_DOCS_SEARCHENGINE)
+
+    OPTION(BUILD_REF_DOCS_TAGFILE "Generate a tag file named osg.tag on the documentation web server" OFF)
+    IF(BUILD_REF_DOCS_TAGFILE)
+        SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg.tag")
+    ELSE(BUILD_REF_DOCS_TAGFILE)
+        SET(GENERATE_TAGFILE "")
+    ENDIF(BUILD_REF_DOCS_TAGFILE)
+
+    IF(DOT)
+        SET(HAVE_DOT YES)
+    ELSE(DOT)
+        SET(HAVE_DOT NO)
+    ENDIF(DOT)
+    
+    # If html help generation was requested. DOCUMENTATION_HTML_HELP is defined by Documentation.cmake
+    SET(GENERATE_HTMLHELP "NO")
+    IF(DOCUMENTATION_HTML_HELP)
+        # on windows Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out
+        IF(NOT WIN32)
+            SET(HTML_HELP_COMPILER "" CACHE FILEPATH "Enter location of the HTML help compiler to let doxygen compile html")
+            MARK_AS_ADVANCED(HTML_HELP_COMPILER)
+        ENDIF(NOT WIN32)
+        # this var sets a proper value in .doxygen files when coniguring them below
+        SET(GENERATE_HTMLHELP "YES")
+    endif(DOCUMENTATION_HTML_HELP)
+  
+    # This processes our doxyfile.cmake and substitutes paths to generate
+    # a final Doxyfile
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/doxyfile.cmake
+        ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
+    )
+    # copy the osg logo to documentations target folder
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
+        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+    )
+    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
+
+    # now set up openthreads documentation generation
+    IF(BUILD_REF_DOCS_TAGFILE)
+        SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenThreadsReferenceDocs/ot.tag")
+    ENDIF(BUILD_REF_DOCS_TAGFILE)
+
+    # This processes our openthreads.doxyfile.cmake and generate a final doxyfile
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/openthreads.doxyfile.cmake
+        ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
+    )
+    # copy the osg logo to documentations target folder
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
+        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+    )
+    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
+
+    # Process our other doxyfiles but don't create targets for these
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+        ${PROJECT_BINARY_DIR}/doc/all_Doxyfile)
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/auto_Doxyfile
+        ${PROJECT_BINARY_DIR}/doc/auto_Doxyfile)
+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/core_Doxyfile
+        ${PROJECT_BINARY_DIR}/doc/core_Doxyfile)
+    
+    # This creates a new target to build documentation.
+    # It runs ${DOXYGEN} which is the full path and executable to
+    # Doxygen on your system, set by the FindDoxygen.cmake module
+    # (called by FindDocumentation.cmake).
+    # It runs the final generated Doxyfile against it.
+    # The DOT_PATH is substituted into the Doxyfile.
+    ADD_CUSTOM_TARGET(doc_openscenegraph ${DOXYGEN}
+        ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
+    )
+    ADD_CUSTOM_TARGET(doc_openthreads ${DOXYGEN}
+        ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
+    )
+ENDIF(BUILD_DOCUMENTATION)
+
+OPTION(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of OpenSceneGraph builds here http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph" OFF)
+IF(BUILD_DASHBOARD_REPORTS)
+# The following are required to uses Dart and the Cdash dashboard
+# viewable here : http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph
+    INCLUDE(Dart)
+ENDIF(BUILD_DASHBOARD_REPORTS)
+
+# present the packaging option only if we have the cpack command defined (effectively >= 2.6.0)
+IF(CMAKE_CPACK_COMMAND)
+    OPTION(BUILD_OSG_PACKAGES "Set to ON to generate CPack configuration files and packaging targets" OFF)
+    IF(BUILD_OSG_PACKAGES)
+      INCLUDE(OsgCPack)
+    ENDIF(BUILD_OSG_PACKAGES)
+ENDIF(CMAKE_CPACK_COMMAND)
+
+# Generate pkg-config configuration file
+
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in
+        ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc
+    @ONLY
+    )
+
+INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
+
+# Run this as late as possible so users can easier spot the message
+IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+SET(REQUIRES_LIBPATH_MESSAGE ON)
+ENDIF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") 
+
+IF(REQUIRES_LIBPATH_MESSAGE)
+
+    IF (NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
+ 
+        SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
+
+        MESSAGE("\nThe build system is configured to instal libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n"
+            "Your applications may not be able to find your installed libraries unless you:\n"
+            "    set your LD_LIBRARY_PATH (user specific) or\n"
+            "    update your ld.so configuration (system wide)")
+        IF(IS_DIRECTORY /etc/ld.so.conf.d)
+            MESSAGE("You have an ld.so.conf.d directory on your system, so if you wish to ensure that\n"
+                "applications find the installed osg libraries, system wide, you could install a\n"
+                "openscenegraph specific ld.so configuration with:\n"
+                "    sudo make install_ld_conf\n")
+            CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in
+                ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf
+            )
+            ADD_CUSTOM_TARGET(install_ld_conf ${CMAKE_COMMAND} -E copy_if_different 
+                ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf
+                /etc/ld.so.conf.d/openscenegraph.conf
+                COMMAND ldconfig
+                COMMENT "Copying openscenegraph.conf to /etc/ld.so.conf.d and running ldconfig"
+            )
+        ELSE(IS_DIRECTORY /etc/ld.so.conf.d)
+            IF(EXISTS /etc/ld.so.conf)
+                MESSAGE("You have an ld.so.conf file in /etc, if you wish to ensure \n"
+                "that applications find the installed osg libraries, system wide, you\n"
+                "could add ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX} to it.")
+            ENDIF(EXISTS /etc/ld.so.conf)
+        ENDIF(IS_DIRECTORY /etc/ld.so.conf.d)
+
+        # emit a message during installation.
+        INSTALL(CODE "MESSAGE(\"Libraries were installed to ${CMAKE_INSTALL_PREFIX}lib${LIB_POSTFIX}.\\nYou may need to update your ld.so configuration. \")")
+
+    ENDIF(NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
+
+ELSE(REQUIRES_LIBPATH_MESSAGE)
+
+    SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 0 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
+
+ENDIF(REQUIRES_LIBPATH_MESSAGE)
+
+
+# This needs to be run very last so other parts of the scripts can take
+# advantage of this.
+IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
+    SET(OSG_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")
+ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
+
+#-----------------------------------------------------------------------------
+### uninstall target
+#-----------------------------------------------------------------------------
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+ADD_CUSTOM_TARGET(uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
diff -Naur OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake	2008-12-12 15:54:22.000000000 +0100
+++ OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake	2009-08-17 17:39:09.000000000 +0200
@@ -307,7 +307,7 @@
         IF(APPLE)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
         ELSE(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
         ENDIF(APPLE)
 
 ENDMACRO(SETUP_EXAMPLE)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Jun 2009 08:28:43 -0000	1.15
+++ .cvsignore	18 Aug 2009 03:02:58 -0000	1.16
@@ -1 +1 @@
-OpenSceneGraph-2.8.1.zip
+OpenSceneGraph-2.8.2.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- OpenSceneGraph.spec	24 Jul 2009 15:43:44 -0000	1.45
+++ OpenSceneGraph.spec	18 Aug 2009 03:02:59 -0000	1.46
@@ -4,19 +4,20 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.8.1
-%define srcvers 2.8.1
+%define apivers 2.8.2
+%define srcvers 2.8.2
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 # The OSGPL is just the wxWidgets license.
 License:        wxWidgets
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}/source/OpenSceneGraph-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+
 Patch0:         OpenSceneGraph-%{version}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -399,6 +400,10 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Mon Aug 17 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-1
+- Upstream update.
+- Reflect upstream having changes Source0-URL.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Jun 2009 08:28:44 -0000	1.15
+++ sources	18 Aug 2009 03:02:59 -0000	1.16
@@ -1 +1 @@
-18a8d3f01a72b6027147b3918c18c662  OpenSceneGraph-2.8.1.zip
+99d0b37f403b85b4559514b6b9849d9e  OpenSceneGraph-2.8.2.zip


--- OpenSceneGraph-2.8.1.diff DELETED ---



From corsepiu at fedoraproject.org  Tue Aug 18 03:07:50 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 18 Aug 2009 03:07:50 +0000 (UTC)
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-2.8.2.diff,1.1,1.2
Message-ID: <20090818030750.2D6F611C006E@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17299

Modified Files:
	OpenSceneGraph-2.8.2.diff 
Log Message:
Cleanup.

OpenSceneGraph-2.8.2.diff:
 CMakeLists.txt                   |    4 ++--
 CMakeModules/OsgMacroUtils.cmake |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: OpenSceneGraph-2.8.2.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.8.2.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- OpenSceneGraph-2.8.2.diff	18 Aug 2009 03:02:58 -0000	1.1
+++ OpenSceneGraph-2.8.2.diff	18 Aug 2009 03:07:49 -0000	1.2
@@ -19,857 +19,6 @@ diff -Naur OpenSceneGraph-2.8.2.orig/CMa
  
      # Process our other doxyfiles but don't create targets for these
      CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-diff -Naur OpenSceneGraph-2.8.2.orig/CMakeLists.txt.orig OpenSceneGraph-2.8.2/CMakeLists.txt.orig
---- OpenSceneGraph-2.8.2.orig/CMakeLists.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph-2.8.2/CMakeLists.txt.orig	2009-07-28 08:02:27.000000000 +0200
-@@ -0,0 +1,847 @@
-+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
-+
-+IF(WIN32)
-+    CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
-+ELSE(WIN32)
-+    IF(APPLE)
-+        CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-+    ELSE(APPLE)
-+        CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0 FATAL_ERROR)
-+    ENDIF(APPLE)
-+ENDIF(WIN32)
-+
-+if(COMMAND cmake_policy)
-+    # Works around warnings libraries linked against that don't
-+    # have absolute paths (e.g. -lpthreads)
-+    cmake_policy(SET CMP0003 NEW)
-+
-+    # Works around warnings about escaped quotes in ADD_DEFINITIONS
-+    # statements.
-+    cmake_policy(SET CMP0005 NEW)
-+
-+    # cmake-2.6.1 introduces policy cmp0008 decide how to treat full path libraries that do not appear to be valid library file names
-+    # quote from cvslog "Such libraries worked by accident in the VS IDE and Xcode generators in CMake 2.4 and below."
-+    if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
-+        cmake_policy(SET CMP0008 OLD)
-+    endif(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
-+endif(COMMAND cmake_policy)
-+
-+PROJECT(OpenSceneGraph)
-+
-+SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
-+SET(OPENSCENEGRAPH_MINOR_VERSION 8)
-+SET(OPENSCENEGRAPH_PATCH_VERSION 2)
-+SET(OPENSCENEGRAPH_SOVERSION 55)
-+
-+# set to 0 when not a release candidate, non zero means that any generated 
-+# svn tags will be treated as release candidates of given number
-+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
-+
-+SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
-+
-+SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
-+
-+SET(OSG_PLUGIN_PREFIX "")
-+
-+IF (CYGWIN)
-+    SET(OSG_PLUGIN_PREFIX "cygwin_")
-+ENDIF(CYGWIN)
-+
-+IF(MINGW)
-+    SET(OSG_PLUGIN_PREFIX "mingw_")
-+ENDIF(MINGW)
-+
-+
-+# We want to build SONAMES shared librariess
-+SET(OPENSCENEGRAPH_SONAMES TRUE)
-+SET(OPENTHREADS_SONAMES TRUE)
-+
-+SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR})
-+
-+# We have some custom .cmake scripts not in the official distribution.
-+# Maybe this can be used override existing behavior if needed?
-+SET(CMAKE_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
-+
-+
-+# Okay, here's the problem: On some platforms, linking against OpenThreads
-+# is not enough and explicit linking to the underlying thread library
-+# is also required (e.g. FreeBSD). But OpenThreads may be built with different
-+# backends (Pthreads, Sproc, Windows) so we don't know what the underlying
-+# thread library is because some platforms support multiple backends (e.g.
-+# IRIX supports Sproc and Pthreads). Linking all libraries won't work
-+# because the libraries may be incompatible.
-+# So the current solution is to attempt best guess linking and exempt certain
-+# cases. With IRIX, we're going to hope explicit linking to the underlying
-+# library is not necessary. We currently don't case for pthreads on Windows
-+# which might be an issue on things like Cygwin. This may need to be fixed.
-+FIND_PACKAGE(Threads)
-+IF(CMAKE_SYSTEM MATCHES IRIX)
-+    # Erase CMAKE_THREAD_LIBS_INIT and hope it works
-+    SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
-+ENDIF(CMAKE_SYSTEM MATCHES IRIX)
-+
-+OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
-+IF (OSG_MAINTAINER)
-+
-+    #SET(OPENSCENEGRAPH_SVN "trunk")
-+    SET(OPENSCENEGRAPH_SVN "branches")
-+
-+    SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
-+
-+    #
-+    # Provide target for tagging a release
-+    #
-+    SET(SVNCOMMAND svn)
-+    SET(SVNTRUNKDIR     http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk)
-+    SET(SVNTAGDIR       http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags)
-+    SET(SVNBRANCHDIR    http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches)
-+
-+    IF   (OPENSCENEGRAPH_SVN STREQUAL "trunk")
-+        SET(SVNSOURCEDIR ${SVNTRUNKDIR})
-+    ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk")
-+        SET(SVNSOURCEDIR ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH})
-+    ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk")
-+
-+
-+    IF   (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
-+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
-+    ELSE (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
-+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
-+    ENDIF(OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
-+
-+
-+    ADD_CUSTOM_TARGET(tag-test
-+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
-+    )
-+
-+    ADD_CUSTOM_TARGET(tag-run
-+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
-+    )
-+
-+    ADD_CUSTOM_TARGET(branch-test
-+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
-+    )
-+
-+    ADD_CUSTOM_TARGET(branch-run
-+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
-+    )
-+
-+    #
-+    # Provide target for generating ChangeLog
-+    #
-+    SET(GENERATELOGS svn2cl)
-+
-+    ADD_CUSTOM_TARGET(ChangeLog
-+        COMMAND ${SVNCOMMAND} update
-+        COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
-+    )
-+    
-+ENDIF(OSG_MAINTAINER)
-+
-+
-+# Find OpenGL
-+FIND_PACKAGE(OpenGL)
-+
-+IF(APPLE)
-+    FIND_LIBRARY(CARBON_LIBRARY Carbon)
-+    FIND_LIBRARY(COCOA_LIBRARY Cocoa)
-+ENDIF(APPLE)
-+
-+IF(UNIX)
-+    # Not sure what this will do on Cygwin and Msys
-+    # Also, remember OS X X11 is a user installed option so it may not exist.
-+    FIND_PACKAGE(X11)
-+    # Some Unicies need explicit linkage to the Math library or the build fails.
-+    FIND_LIBRARY(MATH_LIBRARY m)
-+ENDIF(UNIX)
-+
-+# Make the headers visible to everything
-+IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
-+   INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
-+ENDIF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
-+
-+INCLUDE_DIRECTORIES(
-+    ${OpenSceneGraph_SOURCE_DIR}/include
-+    ${OPENGL_INCLUDE_DIR}
-+)
-+
-+# Common global definitions
-+#ADD_DEFINITIONS(-D)
-+# Platform specific definitions
-+
-+
-+IF(WIN32)
-+
-+    IF(MSVC)
-+        # This option is to enable the /MP switch for Visual Studio 2005 and above compilers
-+        OPTION(WIN32_USE_MP "Set to ON to build OpenSceneGraph with the /MP option (Visual Studio 2005 and above)." OFF)
-+        MARK_AS_ADVANCED(WIN32_USE_MP)
-+        IF(WIN32_USE_MP)
-+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-+        ENDIF(WIN32_USE_MP)
-+
-+        # turn off various warnings
-+        # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
-+        #     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd${warning}")
-+        # endforeach(warning)
-+
-+        # More MSVC specific compilation flags
-+        ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
-+        ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
-+    ENDIF(MSVC)
-+
-+    #needed for net plugin
-+    SET (OSG_SOCKET_LIBS wsock32)
-+    # Both Cygwin and Msys need -DNOMINMAX ???
-+    IF(UNIX)
-+        ADD_DEFINITIONS(-DNOMINMAX)
-+    ENDIF(UNIX)
-+########################################################################################################
-+# the following options are MSVC specific,
-+# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that should allow to run examples and application
-+# fron bin folder without requiring installation step.
-+# it also prepend "osg${OPENSCENEGRAPH_SOVERSION}-" to only .dll files, leaving .lib files untouched in lib
-+# it also use a hack to get rid of Debug and Release folder in MSVC projects
-+# all the .dll and .pdb are in bin and all the .lib and .exp are in lib
-+#
-+# the second option disable incremental linking in debug build , that is enabled by default by CMake
-+##########################################################################################################
-+
-+    IF(MSVC)
-+        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-+            MESSAGE("Warning:  disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7")
-+            SET(OSG_MSVC_VERSIONED_DLL OFF)
-+            SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON)
-+        ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-+            OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON)
-+            MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL)
-+            OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON)
-+            MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK)
-+            IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
-+                SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-+                SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-+                SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
-+            ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
-+        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-+    ENDIF(MSVC)
-+ENDIF(WIN32)
-+
-+########################################################################################################
-+##### these were settings located in SetupCommon.cmake used in Luigi builds.... find out what are useful
-+########################################################################################################
-+#luigi#SET(CMAKE_VERBOSE_MAKEFILE TRUE)
-+#luigi#SET(CMAKE_SKIP_RPATH TRUE)
-+#luigi#SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-+#luigi#IF(UNIX)
-+#luigi#    LIST_CONTAINS(contains "g++" ${CMAKE_CXX_COMPILER_LIST})
-+#luigi#    IF (contains)
-+#luigi#        MESSAGE(${MY_MESSAGE_DEFAULT} "${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} setting  CMAKE_CXX_COMPILER to g++")
-+#luigi#        SET(CMAKE_CXX_COMPILER "g++")
-+#luigi#        SET(CMAKE_CXX_COMPILER_LOADED 2)
-+#luigi#        SET(CMAKE_CXX_COMPILER_WORKS 2)
-+#luigi#    ENDIF (contains)
-+#luigi#    SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
-+#luigi#    SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb -gstabs")
-+#luigi#ENDIF(UNIX)
-+########################################################################################################
-+
-+OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
-+MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
-+
-+OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane instead of double." OFF)
-+MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
-+
-+OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with float BoundingSphere instead of double." ON)
-+MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
-+
-+OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
-+MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
-+
-+OPTION(OSG_USE_UTF8_FILENAME "Set to ON to use a UTF8 locale for filenames instead of the default locale." OFF)
-+MARK_AS_ADVANCED(OSG_USE_UTF8_FILENAME)
-+
-+OPTION(OSG_DISABLE_MSVC_WARNINGS "Set to OFF to not disable MSVC warnings generated by OSG headers." ON)
-+MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS)
-+
-+OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
-+
-+################################################################################
-+# Set Config file
-+
-+SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
-+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
-+               "${OPENSCENEGRAPH_CONFIG_HEADER}")
-+# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
-+
-+
-+################################################################################
-+# Optional build components
-+
-+# OSG Applications
-+OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)" ON)
-+
-+# OSG Examples
-+OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF)
-+
-+################################################################################
-+# 3rd Party Dependency Stuff
-+IF(WIN32)
-+    INCLUDE(Find3rdPartyDependencies)
-+ENDIF(WIN32)
-+
-+# Common to all platforms:
-+FIND_PACKAGE(FreeType)
-+FIND_PACKAGE(Inventor)
-+FIND_PACKAGE(Jasper)
-+FIND_PACKAGE(OpenEXR)
-+FIND_PACKAGE(COLLADA)
-+FIND_PACKAGE(ZLIB)
-+FIND_PACKAGE(Xine)
-+FIND_PACKAGE(OpenVRML)
-+FIND_PACKAGE(Performer)
-+FIND_PACKAGE(GDAL)
-+FIND_PACKAGE(CURL)
-+FIND_PACKAGE(ITK)
-+FIND_PACKAGE(LibVNCServer)
-+FIND_PACKAGE(OurDCMTK)
-+FIND_PACKAGE(XUL)
-+
-+#use pkg-config to find various modues
-+INCLUDE(FindPkgConfig OPTIONAL)
-+
-+IF(PKG_CONFIG_FOUND)
-+
-+    INCLUDE(FindPkgConfig)
-+
-+    PKG_CHECK_MODULES(GTK gtk+-2.0)
-+
-+    IF(WIN32)
-+        PKG_CHECK_MODULES(GTKGL gtkglext-win32-1.0)
-+    ELSE(WIN32)
-+        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
-+    ENDIF(WIN32)
-+
-+    PKG_CHECK_MODULES(RSVG librsvg-2.0)
-+    PKG_CHECK_MODULES(CAIRO cairo)
-+    PKG_CHECK_MODULES(POPPLER poppler-glib)
-+
-+ENDIF(PKG_CONFIG_FOUND)
-+
-+#optional example related dependencies
-+IF   (BUILD_OSG_EXAMPLES)
-+
-+
-+    FIND_PACKAGE(FLTK)
-+    FIND_PACKAGE(GLUT)
-+    FIND_PACKAGE(SDL)
-+    FIND_PACKAGE(FOX)
-+
-+    SET(wxWidgets_USE_LIBS base core gl net)
-+    FIND_PACKAGE(wxWidgets)
-+
-+    # To select a specific version of QT define DESIRED_QT_VERSION
-+    # via cmake -DDESIRED_QT_VERSION=4
-+    IF  (DESIRED_QT_VERSION)
-+
-+        IF  (DESIRED_QT_VERSION MATCHES 4)
-+          FIND_PACKAGE(Qt4)
-+        ELSE(DESIRED_QT_VERSION MATCHES 4)
-+          FIND_PACKAGE(Qt3)
-+        ENDIF(DESIRED_QT_VERSION MATCHES 4)
-+
-+    ELSE(DESIRED_QT_VERSION)
-+
-+        FIND_PACKAGE(Qt4)
-+
-+        IF  (NOT QT4_FOUND)
-+            FIND_PACKAGE(Qt3)
-+        ENDIF(NOT QT4_FOUND)
-+
-+    ENDIF(DESIRED_QT_VERSION)
-+
-+ENDIF(BUILD_OSG_EXAMPLES)
-+
-+
-+
-+
-+
-+
-+#
-+# Test to determine if we want the "tripledot" form of the GLU tesselator callback.
-+#
-+IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
-+    IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-+
-+        # Skip the compile check for platforms that never need the variable
-+        # form.
-+        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT false)
-+
-+    ELSE(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-+
-+        # For other platforms perform the check
-+        INCLUDE(CheckCXXSourceCompiles)
-+        SET(CMAKE_REQUIRED_DEFINITIONS -DGLU_TESS_CALLBACK_TRIPLEDOT)
-+        SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${GL_INCLUDE_DIR})
-+        SET(CMAKE_REQUIRED_LIBRARIES ${GLUT_LIBRARY} ${GL_LIBRARY})
-+        CHECK_CXX_SOURCE_COMPILES(
-+            "#include <osg/GL>
-+            #include <osg/GLU>
-+            static void testcb(GLvoid *, void*) { }
-+            int main() {
-+               GLUtesselator *t = gluNewTess();
-+               gluTessCallback(t, GLU_TESS_VERTEX_DATA, (GLU_TESS_CALLBACK) testcb);
-+               return 0;
-+            }"
-+            GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No)
-+        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT
-+            ${GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No})
-+
-+    ENDIF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-+ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
-+
-+OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
-+IF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
-+    ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
-+ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
-+
-+# Platform specific:
-+# (We can approach this one of two ways. We can try to FIND everything
-+# and simply check if we found the packages before actually building
-+# or we can hardcode the cases. The advantage of the former is that
-+# packages that are installed on platforms that don't require them
-+# will still get built (presuming no compatibility issues). But this
-+# also means modules that are redundant may get built. For example,
-+# OS X doesn't need GIF, JPEG, PNG, TIFF, etc because it uses QuickTime.
-+# Also, it will clutter the CMake menu with "NOT_FOUND".
-+# The downside to the latter is that it is harder to build those
-+# potentially redundant modules.)
-+
-+# Image readers/writers depend on 3rd party libraries except for OS X which
-+# can use Quicktime.
-+IF(NOT APPLE)
-+    FIND_PACKAGE(GIFLIB)
-+    FIND_PACKAGE(JPEG)
-+    FIND_PACKAGE(PNG)
-+    FIND_PACKAGE(TIFF)
-+
-+    # QuickTime is required for OS X, but optional for Windows.
-+    IF(WIN32)
-+        FIND_PACKAGE(QuickTime)
-+    ENDIF(WIN32)
-+
-+ELSE(NOT APPLE)
-+    FIND_PACKAGE(QuickTime)
-+ENDIF(NOT APPLE)
-+
-+################################################################################
-+# Create bin and lib directories if required
-+
-+IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-+   FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/lib/${OSG_PLUGINS})
-+ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-+
-+
-+################################################################################
-+# Installation stuff
-+
-+SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
-+ADD_DEFINITIONS(-DOSG_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX})
-+
-+IF(UNIX AND NOT WIN32)
-+  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-+    ADD_DEFINITIONS("-D_DEBUG")
-+  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-+ENDIF(UNIX AND NOT WIN32)
-+
-+IF(CYGWIN)
-+  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-+    ADD_DEFINITIONS("-D_DEBUG")
-+  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-+ENDIF(CYGWIN)
-+
-+IF(UNIX AND NOT WIN32 AND NOT APPLE)
-+  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
-+      MARK_AS_ADVANCED(LIB_POSTFIX)
-+  ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-+ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
-+IF(NOT DEFINED LIB_POSTFIX)
-+    SET(LIB_POSTFIX "")
-+ENDIF(NOT DEFINED LIB_POSTFIX)
-+
-+# Here we apparantly do some funky stuff with making the bin/ and lib/
-+# folders which is probably needed to work around a very old CMake bug?
-+
-+#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
-+SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
-+MAKE_DIRECTORY(${OUTPUT_BINDIR})
-+IF(MSVC AND NOT MSVC_IDE)
-+    MAKE_DIRECTORY(${OUTPUT_BINDIR}/${OSG_PLUGINS})
-+ENDIF(MSVC AND NOT MSVC_IDE)
-+
-+#SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
-+SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
-+MAKE_DIRECTORY(${OUTPUT_LIBDIR})
-+IF(NOT MSVC)
-+    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
-+ENDIF(NOT MSVC)
-+
-+# On CMake 2.4.x use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH and later
-+# we work around the DLL placement by use of the PREFIX target property hack
-+#
-+# On CMake 2.6.x use the newly minted CMAKE_LIBRARY_OUTPUT_DIRECTORY,
-+# CMAKE_ARCHIVE_OUTPUT_DIRECTORY & CMAKE_RUNTIME_OUTPUT_DIRECTORY
-+
-+IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
-+    # If CMake >= 2.6.0
-+    SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
-+    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
-+    IF(WIN32)
-+        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
-+    ELSE(WIN32)
-+        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
-+    ENDIF(WIN32)
-+ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
-+    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
-+    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
-+ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
-+
-+#SET(INSTALL_BINDIR OpenSceneGraph/bin)
-+#SET(INSTALL_INCDIR OpenSceneGraph/include)
-+#SET(INSTALL_LIBDIR OpenSceneGraph/lib)
-+#SET(INSTALL_DOCDIR OpenSceneGraph/doc)
-+
-+################################################################################
-+# User Options
-+
-+
-+# Expose CMAKE_INCLUDE_PATH and CMAKE_LIBARY_PATH to the GUI so users
-+# may set these values without needing to manipulate the environment.
-+SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} CACHE STRING "You may add additional search paths here. Use ; to separate multiple paths.")
-+SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE STRING "You may add additional search paths here. Use ; to separate multiple paths.")
-+# We are proposing that a new variable called CMAKE_PREFIX_PATH be introduced
-+# to CMake to compliment CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
-+# A formal feature request has been submited to CMake, Bug #4947.
-+# It is intended for those users who have common prefixes for their INCLUDE
-+# and LIBRARY locations. So if users have headers in /usr/local/include
-+# and libraries in /usr/local/lib, the common prefix is /usr/local.
-+# It should also cover the case where headers and libraries are
-+# in the same directory.
-+# Our proposal expects that FIND_* commands will automatically search for
-+# CMAKE_PREFIX_PATH right after CMAKE_INCLUDE_PATH or CMAKE_LIBRARY_PATH.
-+# Obviously, since CMake does not currently support this, we must write
-+# our Find*.cmake modules to explicitly support this. Otherwise, this variable
-+# will have no impact.
-+# This is unofficial so this may be removed or changed at anytime.
-+SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "(EXPERIMENTAL) You may add additional search paths here. Use ; to separate multiple paths.")
-+
-+# This is for an advanced option to give aggressive warnings
-+# under different compilers. If yours is not implemented, this option
-+# will not be made available.
-+IF(CMAKE_COMPILER_IS_GNUCXX)
-+    # To be complete, we might also do GNUCC flags,
-+    # but everything here is C++ code.
-+    # -Wshadow and -Woverloaded-virtual are also interesting flags, but OSG
-+    # returns too many hits.
-+    # FYI, if we do implement GNUCC, then -Wmissing-prototypes in another
-+    # interesting C-specific flag.
-+    # Also, there is a bug in gcc 4.0. Under C++, -pedantic will create
-+    # errors instead of warnings for certain issues, including superfluous
-+    # semicolons and commas, and the use of long long. -fpermissive seems
-+    # to be the workaround.
-+    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
-+
-+    # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
-+
-+
-+ELSE(CMAKE_COMPILER_IS_GNUCXX)
-+    IF(MSVC)
-+        # FIXME: What are good aggressive warning flags for Visual Studio?
-+        # And do we need to further subcase this for different versions of VS?
-+        # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
-+        SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4706 /wd4127 /wd4100)
-+
-+
-+    ELSE(MSVC)
-+        # CMake lacks an elseif, so other non-gcc, non-VS compilers need
-+        # to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should
-+        # remain unset.
-+    ENDIF(MSVC)
-+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-+
-+# This part is for the CMake menu option to toggle the warnings on/off.
-+# This will only be made available if we set values for OSG_AGGRESSIVE_WARNING_FLAGS.
-+IF(OSG_AGGRESSIVE_WARNING_FLAGS)
-+
-+    IF (APPLE)
-+        SET(DEFAULT_USE_AGGRESSIVE_WARNINGS OFF)
-+    ELSE(APPLE)
-+        SET(DEFAULT_USE_AGGRESSIVE_WARNINGS ON)
-+    ENDIF(APPLE)
-+
-+    OPTION(OSG_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" ${DEFAULT_USE_AGGRESSIVE_WARNINGS})
-+    MARK_AS_ADVANCED(OSG_USE_AGGRESSIVE_WARNINGS)
-+
-+    IF(OSG_USE_AGGRESSIVE_WARNINGS)
-+        # Add flags defined by OSG_AGGRESSIVE_WARNING_FLAGS if they aren't already there
-+        FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
-+            IF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
-+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-+            ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
-+        ENDFOREACH(flag)
-+    ELSE(OSG_USE_AGGRESSIVE_WARNINGS)
-+        # Remove all flags considered aggresive
-+        FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
-+            STRING(REGEX REPLACE "${flag}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+        ENDFOREACH(flag)
-+    ENDIF(OSG_USE_AGGRESSIVE_WARNINGS)
-+ENDIF(OSG_AGGRESSIVE_WARNING_FLAGS)
-+
-+
-+# Dynamic vs Static Linking
-+OPTION(DYNAMIC_OPENSCENEGRAPH "Set to ON to build OpenSceneGraph for dynamic linking.  Use OFF for static." ON)
-+IF   (DYNAMIC_OPENSCENEGRAPH)
-+    SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
-+ELSE (DYNAMIC_OPENSCENEGRAPH)
-+    SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
-+ENDIF(DYNAMIC_OPENSCENEGRAPH)
-+
-+INCLUDE(OsgMacroUtils)
-+# OSG Core
-+ADD_SUBDIRECTORY(src)
-+
-+IF   (BUILD_OSG_APPLICATIONS)
-+    ADD_SUBDIRECTORY(applications)
-+ENDIF(BUILD_OSG_APPLICATIONS)
-+
-+IF   (BUILD_OSG_EXAMPLES)
-+    ADD_SUBDIRECTORY(examples)
-+ENDIF(BUILD_OSG_EXAMPLES)
-+
-+
-+# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
-+# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-+IF(APPLE)
-+    # These are just defaults/recommendations, but how we want to build
-+    # out of the box. But the user needs to be able to change these options.
-+    # So we must only set the values the first time CMake is run, or we
-+    # will overwrite any changes the user sets.
-+    # FORCE is used because the options are not reflected in the UI otherwise.
-+    # Seems like a good place to add version specific compiler flags too.
-+    IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-+        # This is really fragile, but CMake doesn't provide the OS system
-+        # version information we need. (Darwin versions can be changed
-+        # independently of OS X versions.)
-+        # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
-+        IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
-+            # 64-bit compiles are not supported with Carbon. We should enable 
-+            # 64-bit compilation by default once osgviewer has been 
-+            # rewritten with Cocoa.
-+            #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
-+            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
-+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
-+        ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
-+            IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-+                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
-+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
-+            ELSE(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-+                # No Universal Binary support
-+                # Should break down further to set the -mmacosx-version-min,
-+                # but the SDK detection is too unreliable here.
-+            ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-+        ENDIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
-+    ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-+
-+    OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
-+
-+ENDIF(APPLE)
-+
-+
-+#
-+# Provide target for generating wrappers
-+#
-+SET(GENWRAPPER genwrapper)
-+
-+ADD_CUSTOM_TARGET(wrappers
-+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
-+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
-+)
-+
-+# For Doxygen
-+INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
-+OPTION(BUILD_DOCUMENTATION "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
-+MARK_AS_ADVANCED(CLEAR BUILD_DOCUMENTATION)
-+# To build the documention, you will have to enable it
-+# and then do the equivalent of "make DoxygenDoc".
-+IF(BUILD_DOCUMENTATION)
-+
-+    OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF)
-+    IF(BUILD_REF_DOCS_SEARCHENGINE)
-+        SET(SEARCHENGINE YES)
-+    ELSE(BUILD_REF_DOCS_SEARCHENGINE)
-+        SET(SEARCHENGINE NO)
-+    ENDIF(BUILD_REF_DOCS_SEARCHENGINE)
-+
-+    OPTION(BUILD_REF_DOCS_TAGFILE "Generate a tag file named osg.tag on the documentation web server" OFF)
-+    IF(BUILD_REF_DOCS_TAGFILE)
-+        SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg.tag")
-+    ELSE(BUILD_REF_DOCS_TAGFILE)
-+        SET(GENERATE_TAGFILE "")
-+    ENDIF(BUILD_REF_DOCS_TAGFILE)
-+
-+    IF(DOT)
-+        SET(HAVE_DOT YES)
-+    ELSE(DOT)
-+        SET(HAVE_DOT NO)
-+    ENDIF(DOT)
-+    
-+    # If html help generation was requested. DOCUMENTATION_HTML_HELP is defined by Documentation.cmake
-+    SET(GENERATE_HTMLHELP "NO")
-+    IF(DOCUMENTATION_HTML_HELP)
-+        # on windows Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out
-+        IF(NOT WIN32)
-+            SET(HTML_HELP_COMPILER "" CACHE FILEPATH "Enter location of the HTML help compiler to let doxygen compile html")
-+            MARK_AS_ADVANCED(HTML_HELP_COMPILER)
-+        ENDIF(NOT WIN32)
-+        # this var sets a proper value in .doxygen files when coniguring them below
-+        SET(GENERATE_HTMLHELP "YES")
-+    endif(DOCUMENTATION_HTML_HELP)
-+  
-+    # This processes our doxyfile.cmake and substitutes paths to generate
-+    # a final Doxyfile
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/doxyfile.cmake
-+        ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
-+    )
-+    # copy the osg logo to documentations target folder
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
-+        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
-+    )
-+    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
-+
-+    # now set up openthreads documentation generation
-+    IF(BUILD_REF_DOCS_TAGFILE)
-+        SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenThreadsReferenceDocs/ot.tag")
-+    ENDIF(BUILD_REF_DOCS_TAGFILE)
-+
-+    # This processes our openthreads.doxyfile.cmake and generate a final doxyfile
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/openthreads.doxyfile.cmake
-+        ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
-+    )
-+    # copy the osg logo to documentations target folder
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
-+        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
-+    )
-+    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
-+
-+    # Process our other doxyfiles but don't create targets for these
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-+        ${PROJECT_BINARY_DIR}/doc/all_Doxyfile)
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/auto_Doxyfile
-+        ${PROJECT_BINARY_DIR}/doc/auto_Doxyfile)
-+    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/core_Doxyfile
-+        ${PROJECT_BINARY_DIR}/doc/core_Doxyfile)
-+    
-+    # This creates a new target to build documentation.
-+    # It runs ${DOXYGEN} which is the full path and executable to
-+    # Doxygen on your system, set by the FindDoxygen.cmake module
-+    # (called by FindDocumentation.cmake).
-+    # It runs the final generated Doxyfile against it.
-+    # The DOT_PATH is substituted into the Doxyfile.
-+    ADD_CUSTOM_TARGET(doc_openscenegraph ${DOXYGEN}
-+        ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
-+    )
-+    ADD_CUSTOM_TARGET(doc_openthreads ${DOXYGEN}
-+        ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
-+    )
-+ENDIF(BUILD_DOCUMENTATION)
-+
-+OPTION(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of OpenSceneGraph builds here http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph" OFF)
-+IF(BUILD_DASHBOARD_REPORTS)
-+# The following are required to uses Dart and the Cdash dashboard
-+# viewable here : http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph
-+    INCLUDE(Dart)
-+ENDIF(BUILD_DASHBOARD_REPORTS)
-+
-+# present the packaging option only if we have the cpack command defined (effectively >= 2.6.0)
-+IF(CMAKE_CPACK_COMMAND)
-+    OPTION(BUILD_OSG_PACKAGES "Set to ON to generate CPack configuration files and packaging targets" OFF)
-+    IF(BUILD_OSG_PACKAGES)
-+      INCLUDE(OsgCPack)
-+    ENDIF(BUILD_OSG_PACKAGES)
-+ENDIF(CMAKE_CPACK_COMMAND)
-+
-+# Generate pkg-config configuration file
-+
-+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in
-+        ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc
-+    @ONLY
-+    )
-+
-+INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
-+
-+# Run this as late as possible so users can easier spot the message
-+IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
-+SET(REQUIRES_LIBPATH_MESSAGE ON)
-+ENDIF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") 
-+
-+IF(REQUIRES_LIBPATH_MESSAGE)
-+
-+    IF (NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
-+ 
-+        SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
-+
-+        MESSAGE("\nThe build system is configured to instal libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n"
-+            "Your applications may not be able to find your installed libraries unless you:\n"
-+            "    set your LD_LIBRARY_PATH (user specific) or\n"
-+            "    update your ld.so configuration (system wide)")
-+        IF(IS_DIRECTORY /etc/ld.so.conf.d)
-+            MESSAGE("You have an ld.so.conf.d directory on your system, so if you wish to ensure that\n"
-+                "applications find the installed osg libraries, system wide, you could install a\n"
-+                "openscenegraph specific ld.so configuration with:\n"
-+                "    sudo make install_ld_conf\n")
-+            CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in
-+                ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf
-+            )
-+            ADD_CUSTOM_TARGET(install_ld_conf ${CMAKE_COMMAND} -E copy_if_different 
-+                ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf
-+                /etc/ld.so.conf.d/openscenegraph.conf
-+                COMMAND ldconfig
-+                COMMENT "Copying openscenegraph.conf to /etc/ld.so.conf.d and running ldconfig"
-+            )
-+        ELSE(IS_DIRECTORY /etc/ld.so.conf.d)
-+            IF(EXISTS /etc/ld.so.conf)
-+                MESSAGE("You have an ld.so.conf file in /etc, if you wish to ensure \n"
-+                "that applications find the installed osg libraries, system wide, you\n"
-+                "could add ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX} to it.")
-+            ENDIF(EXISTS /etc/ld.so.conf)
-+        ENDIF(IS_DIRECTORY /etc/ld.so.conf.d)
-+
-+        # emit a message during installation.
-+        INSTALL(CODE "MESSAGE(\"Libraries were installed to ${CMAKE_INSTALL_PREFIX}lib${LIB_POSTFIX}.\\nYou may need to update your ld.so configuration. \")")
-+
-+    ENDIF(NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
-+
-+ELSE(REQUIRES_LIBPATH_MESSAGE)
-+
-+    SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 0 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
-+
-+ENDIF(REQUIRES_LIBPATH_MESSAGE)
-+
-+
-+# This needs to be run very last so other parts of the scripts can take
-+# advantage of this.
-+IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-+    SET(OSG_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")
-+ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-+
-+#-----------------------------------------------------------------------------
-+### uninstall target
-+#-----------------------------------------------------------------------------
-+CONFIGURE_FILE(
-+  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
-+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-+  IMMEDIATE @ONLY)
-+ADD_CUSTOM_TARGET(uninstall
-+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 diff -Naur OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake
 --- OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake	2008-12-12 15:54:22.000000000 +0100
 +++ OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake	2009-08-17 17:39:09.000000000 +0200



From praveenp at fedoraproject.org  Tue Aug 18 03:38:20 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 18 Aug 2009 03:38:20 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/devel import.log, NONE, 1.1 sblim-cmpi-rpm.spec,
	NONE, 1.1 sblim_cmpi_rpm_ldl_library.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818033820.B855111C006E@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22036/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-rpm.spec 
	sblim_cmpi_rpm_ldl_library.patch 
Log Message:
sblim-cmpi-rpm package devel branch



--- NEW FILE import.log ---
sblim-cmpi-rpm-1_0_1-4_fc10:HEAD:sblim-cmpi-rpm-1.0.1-4.fc10.src.rpm:1250566685


--- NEW FILE sblim-cmpi-rpm.spec ---
Name:		sblim-cmpi-rpm
Version:	1.0.1
Release:	4%{?dist}
Summary:	CIM access to installed software packages (currently RPMs)

Group:		Applications/System
License:	CPL
URL:		http://sblim.wiki.sourceforge.net/ProviderCmpiRpm
Source0:	http://downloads.sourceforge.net/project/sblim/sblim-cmpi-rpm/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		sblim_cmpi_rpm_ldl_library.patch
BuildRequires:	sblim-cmpi-base-devel sblim-cmpi-devel rpm-devel
Requires:	sblim-cmpi-base

%description
These providers list the software packages installed in a GNU/Linux system
and provide some more details about them. 

%Package devel 
Summary:	Devel files for sblim-cmpi-rpm
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
SBLIM rpm provider devel package


%prep
%setup -q

# Patch added to fix the missing definitions of dlopen, dlsym, dlerror.
%patch0


%build
%configure --disable-static
make
#make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_libdir}/libcimrpm.so.0
%{_libdir}/libcimrpm.so.0.0.0
%{_libdir}/libcimrpmv4.so.0
%{_libdir}/libcimrpmv4.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0.0.0
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.mof
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.registration
%{_datarootdir}/sblim-cmpi-rpm/provider-register.sh
%doc COPYING NEWS INSTALL README AUTHORS


%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim/cimrpm.h
%{_includedir}/sblim/cimrpmfp.h
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so
%{_libdir}/libcimrpm.so
%{_libdir}/libcimrpmv4.so
%doc COPYING NEWS README AUTHORS


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue Aug 11 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-4
- Added a comment about the patch.
- fixed the description
* Mon Aug 10 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-3
- Added the scriplets
- Fixing some rpmlint errors.
- Added a patch to add ldl library while linking.
- Removed the .la and .a files.
* Mon Jul 13 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-2
- Adding BuildRequries sblim-base-devel
* Thu Jul 02 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-1
- Packaging for Fedora


sblim_cmpi_rpm_ldl_library.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sblim_cmpi_rpm_ldl_library.patch ---
diff -up ./Makefile.am.fix ./Makefile.am
--- ./Makefile.am.fix	2009-08-10 11:46:58.000000000 -0500
+++ ./Makefile.am	2009-08-10 11:47:14.000000000 -0500
@@ -72,7 +72,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 
 libcimrpmv4_la_SOURCES = cimrpmv4.c
diff -up ./Makefile.in.fix ./Makefile.in
--- ./Makefile.in.fix	2009-08-10 11:47:09.000000000 -0500
+++ ./Makefile.in	2009-08-10 11:47:27.000000000 -0500
@@ -321,7 +321,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 libcimrpmv4_la_SOURCES = cimrpmv4.c
 libcimrpmv4_la_LIBADD = -lcmpiOSBase_Common


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:58:51 -0000	1.1
+++ .cvsignore	18 Aug 2009 03:38:20 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-rpm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:58:51 -0000	1.1
+++ sources	18 Aug 2009 03:38:20 -0000	1.2
@@ -0,0 +1 @@
+5a6ebb04abe884b51416054e97777d64  sblim-cmpi-rpm-1.0.1.tar.bz2



From praveenp at fedoraproject.org  Tue Aug 18 03:40:13 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 18 Aug 2009 03:40:13 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/EL-4 import.log, NONE, 1.1 sblim-cmpi-rpm.spec, 
	NONE, 1.1 sblim_cmpi_rpm_ldl_library.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818034013.CD34911C04D1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22409/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-rpm.spec 
	sblim_cmpi_rpm_ldl_library.patch 
Log Message:
sblim-cmpi-rpm package in EL-4 branch



--- NEW FILE import.log ---
sblim-cmpi-rpm-1_0_1-4_fc10:EL-4:sblim-cmpi-rpm-1.0.1-4.fc10.src.rpm:1250566778


--- NEW FILE sblim-cmpi-rpm.spec ---
Name:		sblim-cmpi-rpm
Version:	1.0.1
Release:	4%{?dist}
Summary:	CIM access to installed software packages (currently RPMs)

Group:		Applications/System
License:	CPL
URL:		http://sblim.wiki.sourceforge.net/ProviderCmpiRpm
Source0:	http://downloads.sourceforge.net/project/sblim/sblim-cmpi-rpm/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		sblim_cmpi_rpm_ldl_library.patch
BuildRequires:	sblim-cmpi-base-devel sblim-cmpi-devel rpm-devel
Requires:	sblim-cmpi-base

%description
These providers list the software packages installed in a GNU/Linux system
and provide some more details about them. 

%Package devel 
Summary:	Devel files for sblim-cmpi-rpm
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
SBLIM rpm provider devel package


%prep
%setup -q

# Patch added to fix the missing definitions of dlopen, dlsym, dlerror.
%patch0


%build
%configure --disable-static
make
#make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_libdir}/libcimrpm.so.0
%{_libdir}/libcimrpm.so.0.0.0
%{_libdir}/libcimrpmv4.so.0
%{_libdir}/libcimrpmv4.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0.0.0
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.mof
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.registration
%{_datarootdir}/sblim-cmpi-rpm/provider-register.sh
%doc COPYING NEWS INSTALL README AUTHORS


%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim/cimrpm.h
%{_includedir}/sblim/cimrpmfp.h
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so
%{_libdir}/libcimrpm.so
%{_libdir}/libcimrpmv4.so
%doc COPYING NEWS README AUTHORS


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue Aug 11 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-4
- Added a comment about the patch.
- fixed the description
* Mon Aug 10 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-3
- Added the scriplets
- Fixing some rpmlint errors.
- Added a patch to add ldl library while linking.
- Removed the .la and .a files.
* Mon Jul 13 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-2
- Adding BuildRequries sblim-base-devel
* Thu Jul 02 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-1
- Packaging for Fedora


sblim_cmpi_rpm_ldl_library.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sblim_cmpi_rpm_ldl_library.patch ---
diff -up ./Makefile.am.fix ./Makefile.am
--- ./Makefile.am.fix	2009-08-10 11:46:58.000000000 -0500
+++ ./Makefile.am	2009-08-10 11:47:14.000000000 -0500
@@ -72,7 +72,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 
 libcimrpmv4_la_SOURCES = cimrpmv4.c
diff -up ./Makefile.in.fix ./Makefile.in
--- ./Makefile.in.fix	2009-08-10 11:47:09.000000000 -0500
+++ ./Makefile.in	2009-08-10 11:47:27.000000000 -0500
@@ -321,7 +321,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 libcimrpmv4_la_SOURCES = cimrpmv4.c
 libcimrpmv4_la_LIBADD = -lcmpiOSBase_Common


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:58:51 -0000	1.1
+++ .cvsignore	18 Aug 2009 03:40:13 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-rpm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:58:51 -0000	1.1
+++ sources	18 Aug 2009 03:40:13 -0000	1.2
@@ -0,0 +1 @@
+5a6ebb04abe884b51416054e97777d64  sblim-cmpi-rpm-1.0.1.tar.bz2



From praveenp at fedoraproject.org  Tue Aug 18 03:41:42 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 18 Aug 2009 03:41:42 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/EL-5 import.log, NONE, 1.1 sblim-cmpi-rpm.spec, 
	NONE, 1.1 sblim_cmpi_rpm_ldl_library.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818034142.5825E11C006E@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22753/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-rpm.spec 
	sblim_cmpi_rpm_ldl_library.patch 
Log Message:
sblim-cmpi-rpm package for EL-5 branch



--- NEW FILE import.log ---
sblim-cmpi-rpm-1_0_1-4_fc10:EL-5:sblim-cmpi-rpm-1.0.1-4.fc10.src.rpm:1250566897


--- NEW FILE sblim-cmpi-rpm.spec ---
Name:		sblim-cmpi-rpm
Version:	1.0.1
Release:	4%{?dist}
Summary:	CIM access to installed software packages (currently RPMs)

Group:		Applications/System
License:	CPL
URL:		http://sblim.wiki.sourceforge.net/ProviderCmpiRpm
Source0:	http://downloads.sourceforge.net/project/sblim/sblim-cmpi-rpm/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		sblim_cmpi_rpm_ldl_library.patch
BuildRequires:	sblim-cmpi-base-devel sblim-cmpi-devel rpm-devel
Requires:	sblim-cmpi-base

%description
These providers list the software packages installed in a GNU/Linux system
and provide some more details about them. 

%Package devel 
Summary:	Devel files for sblim-cmpi-rpm
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
SBLIM rpm provider devel package


%prep
%setup -q

# Patch added to fix the missing definitions of dlopen, dlsym, dlerror.
%patch0


%build
%configure --disable-static
make
#make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_libdir}/libcimrpm.so.0
%{_libdir}/libcimrpm.so.0.0.0
%{_libdir}/libcimrpmv4.so.0
%{_libdir}/libcimrpmv4.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0.0.0
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.mof
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.registration
%{_datarootdir}/sblim-cmpi-rpm/provider-register.sh
%doc COPYING NEWS INSTALL README AUTHORS


%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim/cimrpm.h
%{_includedir}/sblim/cimrpmfp.h
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so
%{_libdir}/libcimrpm.so
%{_libdir}/libcimrpmv4.so
%doc COPYING NEWS README AUTHORS


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue Aug 11 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-4
- Added a comment about the patch.
- fixed the description
* Mon Aug 10 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-3
- Added the scriplets
- Fixing some rpmlint errors.
- Added a patch to add ldl library while linking.
- Removed the .la and .a files.
* Mon Jul 13 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-2
- Adding BuildRequries sblim-base-devel
* Thu Jul 02 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-1
- Packaging for Fedora


sblim_cmpi_rpm_ldl_library.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sblim_cmpi_rpm_ldl_library.patch ---
diff -up ./Makefile.am.fix ./Makefile.am
--- ./Makefile.am.fix	2009-08-10 11:46:58.000000000 -0500
+++ ./Makefile.am	2009-08-10 11:47:14.000000000 -0500
@@ -72,7 +72,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 
 libcimrpmv4_la_SOURCES = cimrpmv4.c
diff -up ./Makefile.in.fix ./Makefile.in
--- ./Makefile.in.fix	2009-08-10 11:47:09.000000000 -0500
+++ ./Makefile.in	2009-08-10 11:47:27.000000000 -0500
@@ -321,7 +321,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 libcimrpmv4_la_SOURCES = cimrpmv4.c
 libcimrpmv4_la_LIBADD = -lcmpiOSBase_Common


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:58:51 -0000	1.1
+++ .cvsignore	18 Aug 2009 03:41:42 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-rpm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:58:51 -0000	1.1
+++ sources	18 Aug 2009 03:41:42 -0000	1.2
@@ -0,0 +1 @@
+5a6ebb04abe884b51416054e97777d64  sblim-cmpi-rpm-1.0.1.tar.bz2



From praveenp at fedoraproject.org  Tue Aug 18 03:43:01 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 18 Aug 2009 03:43:01 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/F-10 import.log, NONE, 1.1 sblim-cmpi-rpm.spec, 
	NONE, 1.1 sblim_cmpi_rpm_ldl_library.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818034301.D33C311C006E@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23084/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-rpm.spec 
	sblim_cmpi_rpm_ldl_library.patch 
Log Message:
sblim-cmpi-rpm package for F-10 branch



--- NEW FILE import.log ---
sblim-cmpi-rpm-1_0_1-4_fc10:F-10:sblim-cmpi-rpm-1.0.1-4.fc10.src.rpm:1250566970


--- NEW FILE sblim-cmpi-rpm.spec ---
Name:		sblim-cmpi-rpm
Version:	1.0.1
Release:	4%{?dist}
Summary:	CIM access to installed software packages (currently RPMs)

Group:		Applications/System
License:	CPL
URL:		http://sblim.wiki.sourceforge.net/ProviderCmpiRpm
Source0:	http://downloads.sourceforge.net/project/sblim/sblim-cmpi-rpm/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		sblim_cmpi_rpm_ldl_library.patch
BuildRequires:	sblim-cmpi-base-devel sblim-cmpi-devel rpm-devel
Requires:	sblim-cmpi-base

%description
These providers list the software packages installed in a GNU/Linux system
and provide some more details about them. 

%Package devel 
Summary:	Devel files for sblim-cmpi-rpm
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
SBLIM rpm provider devel package


%prep
%setup -q

# Patch added to fix the missing definitions of dlopen, dlsym, dlerror.
%patch0


%build
%configure --disable-static
make
#make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_libdir}/libcimrpm.so.0
%{_libdir}/libcimrpm.so.0.0.0
%{_libdir}/libcimrpmv4.so.0
%{_libdir}/libcimrpmv4.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0.0.0
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.mof
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.registration
%{_datarootdir}/sblim-cmpi-rpm/provider-register.sh
%doc COPYING NEWS INSTALL README AUTHORS


%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim/cimrpm.h
%{_includedir}/sblim/cimrpmfp.h
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so
%{_libdir}/libcimrpm.so
%{_libdir}/libcimrpmv4.so
%doc COPYING NEWS README AUTHORS


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue Aug 11 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-4
- Added a comment about the patch.
- fixed the description
* Mon Aug 10 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-3
- Added the scriplets
- Fixing some rpmlint errors.
- Added a patch to add ldl library while linking.
- Removed the .la and .a files.
* Mon Jul 13 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-2
- Adding BuildRequries sblim-base-devel
* Thu Jul 02 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-1
- Packaging for Fedora


sblim_cmpi_rpm_ldl_library.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sblim_cmpi_rpm_ldl_library.patch ---
diff -up ./Makefile.am.fix ./Makefile.am
--- ./Makefile.am.fix	2009-08-10 11:46:58.000000000 -0500
+++ ./Makefile.am	2009-08-10 11:47:14.000000000 -0500
@@ -72,7 +72,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 
 libcimrpmv4_la_SOURCES = cimrpmv4.c
diff -up ./Makefile.in.fix ./Makefile.in
--- ./Makefile.in.fix	2009-08-10 11:47:09.000000000 -0500
+++ ./Makefile.in	2009-08-10 11:47:27.000000000 -0500
@@ -321,7 +321,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 libcimrpmv4_la_SOURCES = cimrpmv4.c
 libcimrpmv4_la_LIBADD = -lcmpiOSBase_Common


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:58:51 -0000	1.1
+++ .cvsignore	18 Aug 2009 03:43:01 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-rpm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:58:51 -0000	1.1
+++ sources	18 Aug 2009 03:43:01 -0000	1.2
@@ -0,0 +1 @@
+5a6ebb04abe884b51416054e97777d64  sblim-cmpi-rpm-1.0.1.tar.bz2



From praveenp at fedoraproject.org  Tue Aug 18 03:44:11 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Tue, 18 Aug 2009 03:44:11 +0000 (UTC)
Subject: rpms/sblim-cmpi-rpm/F-11 import.log, NONE, 1.1 sblim-cmpi-rpm.spec, 
	NONE, 1.1 sblim_cmpi_rpm_ldl_library.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818034411.DD67411C006E@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23376/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-rpm.spec 
	sblim_cmpi_rpm_ldl_library.patch 
Log Message:
sblim-cmpi-rpm package for F-11 branch



--- NEW FILE import.log ---
sblim-cmpi-rpm-1_0_1-4_fc10:F-11:sblim-cmpi-rpm-1.0.1-4.fc10.src.rpm:1250567040


--- NEW FILE sblim-cmpi-rpm.spec ---
Name:		sblim-cmpi-rpm
Version:	1.0.1
Release:	4%{?dist}
Summary:	CIM access to installed software packages (currently RPMs)

Group:		Applications/System
License:	CPL
URL:		http://sblim.wiki.sourceforge.net/ProviderCmpiRpm
Source0:	http://downloads.sourceforge.net/project/sblim/sblim-cmpi-rpm/%{version}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		sblim_cmpi_rpm_ldl_library.patch
BuildRequires:	sblim-cmpi-base-devel sblim-cmpi-devel rpm-devel
Requires:	sblim-cmpi-base

%description
These providers list the software packages installed in a GNU/Linux system
and provide some more details about them. 

%Package devel 
Summary:	Devel files for sblim-cmpi-rpm
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
SBLIM rpm provider devel package


%prep
%setup -q

# Patch added to fix the missing definitions of dlopen, dlsym, dlerror.
%patch0


%build
%configure --disable-static
make
#make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_libdir}/libcimrpm.so.0
%{_libdir}/libcimrpm.so.0.0.0
%{_libdir}/libcimrpmv4.so.0
%{_libdir}/libcimrpmv4.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so.0.0.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so.0.0.0
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.mof
%{_datarootdir}/sblim-cmpi-rpm/Linux_RpmPackage.registration
%{_datarootdir}/sblim-cmpi-rpm/provider-register.sh
%doc COPYING NEWS INSTALL README AUTHORS


%files devel
%defattr(-,root,root,-)
%{_includedir}/sblim/cimrpm.h
%{_includedir}/sblim/cimrpmfp.h
%{_libdir}/cmpi/libcmpiOSBase_RpmAssociatedFileProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmFileCheckProvider.so
%{_libdir}/cmpi/libcmpiOSBase_RpmPackageProvider.so
%{_libdir}/libcimrpm.so
%{_libdir}/libcimrpmv4.so
%doc COPYING NEWS README AUTHORS


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue Aug 11 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-4
- Added a comment about the patch.
- fixed the description
* Mon Aug 10 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-3
- Added the scriplets
- Fixing some rpmlint errors.
- Added a patch to add ldl library while linking.
- Removed the .la and .a files.
* Mon Jul 13 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-2
- Adding BuildRequries sblim-base-devel
* Thu Jul 02 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.0.1-1
- Packaging for Fedora


sblim_cmpi_rpm_ldl_library.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sblim_cmpi_rpm_ldl_library.patch ---
diff -up ./Makefile.am.fix ./Makefile.am
--- ./Makefile.am.fix	2009-08-10 11:46:58.000000000 -0500
+++ ./Makefile.am	2009-08-10 11:47:14.000000000 -0500
@@ -72,7 +72,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 
 libcimrpmv4_la_SOURCES = cimrpmv4.c
diff -up ./Makefile.in.fix ./Makefile.in
--- ./Makefile.in.fix	2009-08-10 11:47:09.000000000 -0500
+++ ./Makefile.in	2009-08-10 11:47:27.000000000 -0500
@@ -321,7 +321,7 @@ lib_LTLIBRARIES = libcimrpm.la \
                   libcimrpmv4.la
 
 libcimrpm_la_SOURCES = cimrpm.c
-# libcimrpm_la_LIBADD = -ldl
+libcimrpm_la_LIBADD = -ldl
 libcimrpm_la_LDFLAGS = -Wc,-nostartfiles
 libcimrpmv4_la_SOURCES = cimrpmv4.c
 libcimrpmv4_la_LIBADD = -lcmpiOSBase_Common


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Aug 2009 23:58:51 -0000	1.1
+++ .cvsignore	18 Aug 2009 03:44:11 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-rpm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-rpm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Aug 2009 23:58:51 -0000	1.1
+++ sources	18 Aug 2009 03:44:11 -0000	1.2
@@ -0,0 +1 @@
+5a6ebb04abe884b51416054e97777d64  sblim-cmpi-rpm-1.0.1.tar.bz2



From tgl at fedoraproject.org  Tue Aug 18 04:00:50 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 18 Aug 2009 04:00:50 +0000 (UTC)
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc-bogus-import.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 postgresql-jdbc.spec, 1.18,
	1.19 sources, 1.7, 1.8 postgresql-jdbc-version.patch, 1.3, NONE
Message-ID: <20090818040050.E7B2211C006E@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-jdbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25689

Modified Files:
	.cvsignore postgresql-jdbc.spec sources 
Added Files:
	postgresql-jdbc-bogus-import.patch 
Removed Files:
	postgresql-jdbc-version.patch 
Log Message:
Update to build 8.4-701

postgresql-jdbc-bogus-import.patch:
 MakeGSS.java |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE postgresql-jdbc-bogus-import.patch ---
Remove a debugging leftover.


diff -Naur postgresql-jdbc-8.4-701.src.orig/org/postgresql/gss/MakeGSS.java postgresql-jdbc-8.4-701.src/org/postgresql/gss/MakeGSS.java
--- postgresql-jdbc-8.4-701.src.orig/org/postgresql/gss/MakeGSS.java	2008-11-29 02:43:47.000000000 -0500
+++ postgresql-jdbc-8.4-701.src/org/postgresql/gss/MakeGSS.java	2009-08-17 23:50:41.000000000 -0400
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.sql.SQLException;
 
-import com.sun.security.auth.callback.TextCallbackHandler;
 import org.postgresql.core.PGStream;
 import org.postgresql.core.Logger;
 import org.postgresql.util.*;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Feb 2008 17:09:37 -0000	1.7
+++ .cvsignore	18 Aug 2009 04:00:50 -0000	1.8
@@ -1 +1 @@
-postgresql-jdbc-8.3-603.src.tar.gz
+postgresql-jdbc-8.4-701.src.tar.gz


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- postgresql-jdbc.spec	26 Jul 2009 19:15:30 -0000	1.18
+++ postgresql-jdbc.spec	18 Aug 2009 04:00:50 -0000	1.19
@@ -33,19 +33,18 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section		devel
-%define upstreamver	8.3-603
+%define upstreamver	8.4-701
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:	8.3.603
-Release:	4%{?dist}
-Epoch:		0
+Version:	8.4.701
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://jdbc.postgresql.org/
 
 Source0:	http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
-Patch1:         postgresql-jdbc-version.patch
+Patch1:		postgresql-jdbc-bogus-import.patch
 
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -139,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Tom Lane <tgl at redhat.com> 8.4.701-1
+- Update to build 8.4-701
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:8.3.603-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Feb 2008 17:09:37 -0000	1.7
+++ sources	18 Aug 2009 04:00:50 -0000	1.8
@@ -1 +1 @@
-6e130d3dc307d27757252ff28ce9a9f2  postgresql-jdbc-8.3-603.src.tar.gz
+9e91abdd1139e66d9e8e9ae6f9428e2f  postgresql-jdbc-8.4-701.src.tar.gz


--- postgresql-jdbc-version.patch DELETED ---



From mclasen at fedoraproject.org  Tue Aug 18 04:04:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 18 Aug 2009 04:04:47 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.112, 1.113 gtk2.spec, 1.396,
	1.397 sources, 1.121, 1.122
Message-ID: <20090818040447.A448F11C0262@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9664

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.17.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- .cvsignore	12 Aug 2009 03:12:02 -0000	1.112
+++ .cvsignore	18 Aug 2009 04:04:47 -0000	1.113
@@ -1 +1 @@
-gtk+-2.17.7.tar.bz2
+gtk+-2.17.8.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- gtk2.spec	13 Aug 2009 14:08:20 -0000	1.396
+++ gtk2.spec	18 Aug 2009 04:04:47 -0000	1.397
@@ -11,13 +11,13 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.7
+%define base_version 2.17.8
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -30,9 +30,6 @@ Patch0: gtk+-2.13.5-lib64.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 # Patch1: default_printer.patch
 
-# fixed upstream
-Patch2: appearance-crash.patch
-
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -144,7 +141,6 @@ This package contains developer document
 
 %patch0 -p1 -b .lib64
 # %patch1 -p0 -b .default-printer
-%patch2 -p1 -b .appearance-crash
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -389,6 +385,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.8-1
+- Update to 2.17.8
+
 * Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.7-2
 - Fix a possible crash
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sources	12 Aug 2009 03:12:02 -0000	1.121
+++ sources	18 Aug 2009 04:04:47 -0000	1.122
@@ -1 +1 @@
-94a359d5929a1306bb3267a02f9707d0  gtk+-2.17.7.tar.bz2
+7e0a37e4cc40f74963886031d0df2182  gtk+-2.17.8.tar.bz2



From tgl at fedoraproject.org  Tue Aug 18 04:30:14 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 18 Aug 2009 04:30:14 +0000 (UTC)
Subject: rpms/postgresql-odbc/devel .cvsignore, 1.12, 1.13 64bit-fixes.patch,
	1.1, 1.2 postgresql-odbc.spec, 1.27, 1.28 sources, 1.12, 1.13
Message-ID: <20090818043014.A6DBE11C04D1@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17771

Modified Files:
	.cvsignore 64bit-fixes.patch postgresql-odbc.spec sources 
Log Message:
Update to version 08.04.0100


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	5 Aug 2008 18:05:05 -0000	1.12
+++ .cvsignore	18 Aug 2009 04:30:14 -0000	1.13
@@ -1 +1 @@
-psqlodbc-08.03.0200.tar.gz
+psqlodbc-08.04.0100.tar.gz

64bit-fixes.patch:
 odbcapi30.c  |    6 ------
 odbcapi30w.c |    4 ----
 2 files changed, 10 deletions(-)

Index: 64bit-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/64bit-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 64bit-fixes.patch	20 Feb 2009 18:02:53 -0000	1.1
+++ 64bit-fixes.patch	18 Aug 2009 04:30:14 -0000	1.2
@@ -1,9 +1,9 @@
 Miscellaneous changes to align psqlodbc with unixODBC 64-bit fixes.
 
 
-diff -Naur psqlodbc-08.03.0200.orig/odbcapi30.c psqlodbc-08.03.0200/odbcapi30.c
---- psqlodbc-08.03.0200.orig/odbcapi30.c	2006-11-14 10:29:25.000000000 -0500
-+++ psqlodbc-08.03.0200/odbcapi30.c	2009-02-16 13:05:58.000000000 -0500
+diff -Naur psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c
+--- psqlodbc-08.04.0100.orig/odbcapi30.c	2008-10-06 17:46:09.000000000 -0400
++++ psqlodbc-08.04.0100/odbcapi30.c	2009-08-17 23:40:02.000000000 -0400
 @@ -118,13 +118,7 @@
  			SQLPOINTER CharacterAttribute,
  			SQLSMALLINT BufferLength,
@@ -18,10 +18,10 @@ diff -Naur psqlodbc-08.03.0200.orig/odbc
  			)
  {
  	CSTR	func = "SQLColAttribute";
-diff -Naur psqlodbc-08.03.0200.orig/odbcapi30w.c psqlodbc-08.03.0200/odbcapi30w.c
---- psqlodbc-08.03.0200.orig/odbcapi30w.c	2007-04-03 10:49:02.000000000 -0400
-+++ psqlodbc-08.03.0200/odbcapi30w.c	2009-02-16 13:08:05.000000000 -0500
-@@ -255,11 +255,7 @@
+diff -Naur psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c
+--- psqlodbc-08.04.0100.orig/odbcapi30w.c	2009-03-22 10:17:10.000000000 -0400
++++ psqlodbc-08.04.0100/odbcapi30w.c	2009-08-17 23:40:02.000000000 -0400
+@@ -262,11 +262,7 @@
  	SQLPOINTER	pCharAttr,
  	SQLSMALLINT	cbCharAttrMax,	
  	SQLSMALLINT	*pcbCharAttr,
@@ -33,27 +33,3 @@ diff -Naur psqlodbc-08.03.0200.orig/odbc
  	)
  {
  	CSTR func = "SQLColAttributeW";
-diff -Naur psqlodbc-08.03.0200.orig/psqlodbc.h psqlodbc-08.03.0200/psqlodbc.h
---- psqlodbc-08.03.0200.orig/psqlodbc.h	2008-05-03 01:57:42.000000000 -0400
-+++ psqlodbc-08.03.0200/psqlodbc.h	2009-02-16 13:02:22.000000000 -0500
-@@ -235,9 +235,6 @@
- #else
- #define DRIVER_FILE_NAME			"PSQLODBC25.DLL"
- #endif   /* ODBCVER 0x0300 */
--BOOL isMsAccess();
--BOOL isMsQuery();
--BOOL isSqlServr();
- #else
- #ifdef  UNICODE_SUPPORT
- #define DRIVER_FILE_NAME                        "psqlodbcw.so"
-@@ -246,6 +243,10 @@
- #endif
- #endif   /* WIN32 */
- 
-+BOOL isMsAccess();
-+BOOL isMsQuery();
-+BOOL isSqlServr();
-+
- #define	NULL_CATALOG_NAME				""
- 
- /* ESCAPEs */


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- postgresql-odbc.spec	26 Jul 2009 19:15:48 -0000	1.27
+++ postgresql-odbc.spec	18 Aug 2009 04:30:14 -0000	1.28
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver
-Version: 08.03.0200
-Release: 4%{?dist}
+Version: 08.04.0100
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Applications/Databases
 URL: http://psqlodbc.projects.postgresql.org/
@@ -14,6 +14,8 @@ Source0: http://www.postgresql.org/ftp/o
 # available while building this RPM.)  To generate: in psqlodbc source tree,
 #   aclocal -I . -I $PGSRC/config
 # then strip aclocal.m4 down to just the PGAC macros.
+# BUT: as of 08.04.0100, configure.ac hasn't been updated to use PG8.4
+# macros, so keep using the previous version of acinclude.m4.
 Source1: acinclude.m4
 
 Patch1: 64bit-fixes.patch
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Tue Aug 18 2009 Tom Lane <tgl at redhat.com> 08.04.0100-1
+- Update to version 08.04.0100
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 08.03.0200-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	5 Aug 2008 18:05:05 -0000	1.12
+++ sources	18 Aug 2009 04:30:14 -0000	1.13
@@ -1 +1 @@
-4950e71c215764ff3beeb7a505c1321a  psqlodbc-08.03.0200.tar.gz
+2328c3e97e6a376620a5d317137515ff  psqlodbc-08.04.0100.tar.gz



From tgl at fedoraproject.org  Tue Aug 18 04:46:19 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Tue, 18 Aug 2009 04:46:19 +0000 (UTC)
Subject: rpms/rhdb-utils/devel .cvsignore, 1.7, 1.8 rhdb-utils.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <20090818044619.23ED411C00D7@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/rhdb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20946

Modified Files:
	.cvsignore rhdb-utils.spec sources 
Log Message:
Update pg_filedump to version 8.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhdb-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Feb 2008 00:09:35 -0000	1.7
+++ .cvsignore	18 Aug 2009 04:46:18 -0000	1.8
@@ -1 +1 @@
-pg_filedump-8.3.0.tar
+pg_filedump-8.4.0.tar


Index: rhdb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhdb-utils/devel/rhdb-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- rhdb-utils.spec	27 Jul 2009 03:00:30 -0000	1.18
+++ rhdb-utils.spec	18 Aug 2009 04:46:18 -0000	1.19
@@ -1,17 +1,17 @@
 # Spec file for rhdb-utils.
 # Author: Liam Stewart <liams at redhat.com>, Andrew Overholt
 # <overholt at redhat.com>, Tom Lane <tgl at redhat.com>
-# Copyright (C) 2002-2008 Red Hat, Inc.
+# Copyright (C) 2002-2009 Red Hat, Inc.
 
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition
 Name: rhdb-utils
-Version: 8.3.0
-Release: 3%{?dist}
+Version: 8.4.0
+Release: 1%{?dist}
 URL: http://sources.redhat.com/rhdb/
 License: GPLv2+
 Group: Applications/Databases
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: postgresql-devel >= 8.3
+BuildRequires: postgresql-devel >= 8.4
 
 Source0: http://sources.redhat.com/rhdb/tools/pg_filedump-%{version}.tar
 Source1: pg_crc.c
@@ -50,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Tue Aug 18 2009 Tom Lane <tgl at redhat.com> 8.4.0-1
+- Update pg_filedump to version 8.4.0, to support PostgreSQL 8.4.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhdb-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Feb 2008 00:09:35 -0000	1.8
+++ sources	18 Aug 2009 04:46:18 -0000	1.9
@@ -1 +1 @@
-35fc4822b35f37938f053626c388981f  pg_filedump-8.3.0.tar
+fc7d8960adfcb642eb4db5aa39632380  pg_filedump-8.4.0.tar



From awjb at fedoraproject.org  Tue Aug 18 04:49:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 18 Aug 2009 04:49:12 +0000 (UTC)
Subject: rpms/synce-hal/F-10 synce-hal-sock.patch,NONE,1.1
Message-ID: <20090818044912.4E04F11C00D7@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21573/F-10

Added Files:
	synce-hal-sock.patch 
Log Message:
- add patch


synce-hal-sock.patch:
 Makefile.am               |    3 ++-
 Makefile.in               |    4 +++-
 synce-connection-broker.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE synce-hal-sock.patch ---
diff -Nurp hal.orig/src/Makefile.am hal/src/Makefile.am
--- hal.orig/src/Makefile.am	2009-02-06 18:41:55.000000000 +0000
+++ hal/src/Makefile.am	2009-08-01 11:28:00.000000000 +0100
@@ -1,4 +1,5 @@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
 
 libexec_PROGRAMS = hal-dccm synce-serial-chat
 
diff -Nurp hal.orig/src/Makefile.in hal/src/Makefile.in
--- hal.orig/src/Makefile.in	2009-08-01 11:30:09.000000000 +0100
+++ hal/src/Makefile.in	2009-08-01 11:28:42.000000000 +0100
@@ -211,7 +211,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
+
 BUILT_SOURCES = synce-device-signals-marshal.h \
 		synce-device-signals-marshal.c \
 		synce-device-glue.h
diff -Nurp hal.orig/src/synce-connection-broker.c hal/src/synce-connection-broker.c
--- hal.orig/src/synce-connection-broker.c	2008-10-28 11:23:00.000000000 +0000
+++ hal/src/synce-connection-broker.c	2009-08-01 11:28:00.000000000 +0100
@@ -236,7 +236,7 @@ _synce_connection_broker_take_connection
   priv->conn = conn;
 
   rnd = g_rand_new ();
-  priv->filename = g_strdup_printf ("/tmp/synce-%08x%08x%08x%08x.sock",
+  priv->filename = g_strdup_printf ("%s/run/synce-%08x%08x%08x%08x.sock", LOCALSTATEDIR,
       g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd));
   g_rand_free (rnd);



From awjb at fedoraproject.org  Tue Aug 18 04:49:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 18 Aug 2009 04:49:12 +0000 (UTC)
Subject: rpms/synce-hal/F-11 synce-hal-sock.patch,NONE,1.1
Message-ID: <20090818044912.71B3F11C0262@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-hal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21573/F-11

Added Files:
	synce-hal-sock.patch 
Log Message:
- add patch


synce-hal-sock.patch:
 Makefile.am               |    3 ++-
 Makefile.in               |    4 +++-
 synce-connection-broker.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE synce-hal-sock.patch ---
diff -Nurp hal.orig/src/Makefile.am hal/src/Makefile.am
--- hal.orig/src/Makefile.am	2009-02-06 18:41:55.000000000 +0000
+++ hal/src/Makefile.am	2009-08-01 11:28:00.000000000 +0100
@@ -1,4 +1,5 @@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
 
 libexec_PROGRAMS = hal-dccm synce-serial-chat
 
diff -Nurp hal.orig/src/Makefile.in hal/src/Makefile.in
--- hal.orig/src/Makefile.in	2009-08-01 11:30:09.000000000 +0100
+++ hal/src/Makefile.in	2009-08-01 11:28:42.000000000 +0100
@@ -211,7 +211,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall \
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"
+
 BUILT_SOURCES = synce-device-signals-marshal.h \
 		synce-device-signals-marshal.c \
 		synce-device-glue.h
diff -Nurp hal.orig/src/synce-connection-broker.c hal/src/synce-connection-broker.c
--- hal.orig/src/synce-connection-broker.c	2008-10-28 11:23:00.000000000 +0000
+++ hal/src/synce-connection-broker.c	2009-08-01 11:28:00.000000000 +0100
@@ -236,7 +236,7 @@ _synce_connection_broker_take_connection
   priv->conn = conn;
 
   rnd = g_rand_new ();
-  priv->filename = g_strdup_printf ("/tmp/synce-%08x%08x%08x%08x.sock",
+  priv->filename = g_strdup_printf ("%s/run/synce-%08x%08x%08x%08x.sock", LOCALSTATEDIR,
       g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd), g_rand_int (rnd));
   g_rand_free (rnd);



From awjb at fedoraproject.org  Tue Aug 18 04:54:01 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 18 Aug 2009 04:54:01 +0000 (UTC)
Subject: rpms/synce-sync-engine/F-10 synce-sync-engine.spec,1.12,1.13
Message-ID: <20090818045401.BEB0F11C00D7@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-sync-engine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22332

Modified Files:
	synce-sync-engine.spec 
Log Message:
- exclude pyc pyo files from bindir



Index: synce-sync-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-sync-engine/F-10/synce-sync-engine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- synce-sync-engine.spec	17 Aug 2009 14:57:29 -0000	1.12
+++ synce-sync-engine.spec	18 Aug 2009 04:54:01 -0000	1.13
@@ -87,6 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/SyncEngine/
 %{python_sitelib}/synce_sync_engine-%{version}-py?.?.egg-info/
 %{_datadir}/dbus-1/services/org.synce.SyncEngine.service
+%exclude %{_bindir}/*pyc
+%exclude %{_bindir}/*pyo
 
 %files -n libopensync-plugin-synce-wm5
 %defattr(-,root,root,-)



From lkundrak at fedoraproject.org  Tue Aug 18 05:21:54 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 18 Aug 2009 05:21:54 +0000 (UTC)
Subject: rpms/system-config-keyboard/devel
	system-config-keyboard-1.3.0-instroot.patch, NONE,
	1.1 system-config-keyboard.spec, 1.52, 1.53
Message-ID: <20090818052154.0FDB711C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26977

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.3.0-instroot.patch 
Log Message:
* Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-4
- Wrong keyboard layout after install fix (#517542), Chris Lumens


system-config-keyboard-1.3.0-instroot.patch:
 keyboard.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE system-config-keyboard-1.3.0-instroot.patch ---
>From b567829289bfb98b859aee6327c69603c7c73950 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens at redhat.com>
Date: Tue, 18 Aug 2009 07:17:37 +0200
Subject: [PATCH] Create /etc/sysconfig/keyboard in instroot

https://bugzilla.redhat.com/show_bug.cgi?id=517542
---
 lib/keyboard.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/keyboard.py b/lib/keyboard.py
index 9a0cdc1..5b0ac00 100644
--- a/lib/keyboard.py
+++ b/lib/keyboard.py
@@ -120,7 +120,7 @@ class Keyboard():
 
     def read(self, instPath = "/"):
         try:
-            file = open("/etc/sysconfig/keyboard", "r")
+            file = open(instPath + "/etc/sysconfig/keyboard", "r")
         except:
             return
         self.config = []
@@ -133,7 +133,7 @@ class Keyboard():
         self.beenset = 1
 
     def write(self, instPath = "/"):
-	file = open("/etc/sysconfig/keyboard", "w")
+	file = open(instPath + "/etc/sysconfig/keyboard", "w")
 	for line in self.config:
                 file.write (line[0]);
         try:
-- 
1.6.2.5



Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- system-config-keyboard.spec	5 Aug 2009 11:44:49 -0000	1.52
+++ system-config-keyboard.spec	18 Aug 2009 05:21:53 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:           system-config-keyboard
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
@@ -11,6 +11,7 @@ License:        GPLv2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
 Patch0:         system-config-keyboard-dracut.patch
+Patch1:         system-config-keyboard-1.3.0-instroot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -35,6 +36,7 @@ the user to change the default keyboard 
 %prep
 %setup -q
 %patch0 -p0 -b .dracut
+%patch1 -p1 -b .instroot
 
 
 %build
@@ -84,6 +86,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-4
+- Wrong keyboard layout after install fix (#517542), Chris Lumens
+
 * Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-3
 - Include dracutSetupString() patch by Hans
 



From corsepiu at fedoraproject.org  Tue Aug 18 05:24:52 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 18 Aug 2009 05:24:52 +0000 (UTC)
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.46,1.47
Message-ID: <20090818052452.D912B11C00D7@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27450

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Tue Aug 18 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-2
- Spec file cleanup.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- OpenSceneGraph.spec	18 Aug 2009 03:02:59 -0000	1.46
+++ OpenSceneGraph.spec	18 Aug 2009 05:24:52 -0000	1.47
@@ -9,7 +9,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -44,11 +44,7 @@ BuildRequires:  SDL-devel
 BuildRequires:  fltk-devel
 
 # OSG packaging madness ;)
-%if "%{version}" >= "2.6.0"
 %define OSGSRCDIR       OpenSceneGraph-%{version}
-%else
-%define OSGSRCDIR       OpenSceneGraph
-%endif
 
 %if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
@@ -67,12 +63,6 @@ for rapid development of graphics applic
 %setup -q -c
 cd %{OSGSRCDIR}
 %{?PATCH0:%patch0 -p1}
-%if "%{version}" < "2.8.0"
-sed -i \
-  -e 's,^OUTPUT_DIRECTORY.*doc/,OUTPUT_DIRECTORY = doc,' \
-  -e 's,^HTML_OUTPUT[ ]*= OpenSceneGraphReferenceDocs,HTML_OUTPUT = html,' \
-  doc/Doxyfiles/doxyfile.cmake
-%endif
 cd ..
 
 %build
@@ -82,23 +72,9 @@ pushd BUILD
 %cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON -DBUILD_DOCUMENTATION=ON ../%{OSGSRCDIR}
 make VERBOSE=1 %{?_smp_mflags}
 
-%if "%{version}" >= "2.8.0"
 make doc_openscenegraph doc_openthreads
-%else
-make DoxygenDoc
-%endif
 popd
 
-%if "%{version}" < "2.8.0"
-# HACK: Upstream stuff lacks cmake support and is broken
-sed -i -e 's,^prefix=.*$,prefix=%{_prefix},' \
-  -e 's,^libdir=.*$,libdir=%{_libdir},' \
-  -e 's,^includedir=.*$,includedir=%{_includedir},' \
-  -e '/^Conflicts.*$/d' \
-  %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
-  %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd BUILD
@@ -108,14 +84,6 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
 popd
 
-%if "%{version}" < "2.8.0"
-# Abandoned w/ 2.0 by upstream, re-added to 2.1.*
-install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc \
-  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
-install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
-  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -164,11 +132,7 @@ Development files for OpenSceneGraph.
 
 %files devel
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %doc BUILD/doc/OpenSceneGraphReferenceDocs
-%else
-%doc BUILD/doc/html
-%endif
 %{_includedir}/osg*
 %{_libdir}/pkgconfig/openscenegraph.pc
 %{_libdir}/libosg*.so
@@ -228,7 +192,6 @@ Sample applications for OpenSceneGraph
 
 %files examples
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %{_bindir}/osg2cpp
 %{_bindir}/osganimationmakepath
 %{_bindir}/osganimationnode
@@ -248,7 +211,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgsidebyside
 %{_bindir}/osgwidgetmessagebox
 %{_bindir}/osgwidgetperformance
-%endif
 %{_bindir}/osgfont
 %{_bindir}/osggeometryshaders
 %{_bindir}/osgimagesequence
@@ -392,14 +354,15 @@ Development files for OpenThreads.
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %doc BUILD/doc/OpenThreadsReferenceDocs
-%endif
 %{_libdir}/pkgconfig/openthreads.pc
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
 %changelog
+* Tue Aug 18 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-2
+- Spec file cleanup.
+
 * Mon Aug 17 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-1
 - Upstream update.
 - Reflect upstream having changes Source0-URL.



From pnemade at fedoraproject.org  Tue Aug 18 05:33:13 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 18 Aug 2009 05:33:13 +0000 (UTC)
Subject: rpms/m17n-contrib/F-10 kn-kgp-halantha-ayogavaaha.patch, NONE,
	1.1 pa-jhelum-numeric-503478.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 m17n-contrib.spec, 1.22, 1.23 sources, 1.8, 1.9
Message-ID: <20090818053313.22EEE11C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28664

Modified Files:
	.cvsignore m17n-contrib.spec sources 
Added Files:
	kn-kgp-halantha-ayogavaaha.patch 
	pa-jhelum-numeric-503478.patch 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-2
- Add patch kn-kgp-halantha-ayogavaaha.patch
- update to new upstream release 1.1.10
- Add patch pa-jhelum-numeric-503478.patch



kn-kgp-halantha-ayogavaaha.patch:
 kn-kgp-new.mim |   47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

--- NEW FILE kn-kgp-halantha-ayogavaaha.patch ---
--- im/kn-kgp.mim	2008-07-02 14:32:22.000000000 +0530
+++ im/kn-kgp-new.mim	2009-08-03 12:29:13.000000000 +0530
@@ -2,6 +2,8 @@
 ;;   Copyright (C) 2008
 ;;   Sridhar M.A., Mysore; mas at mylug.org
 
+;; Modified for better visual appeal by Prasad H. L. hlprasu at gmail.com
+
 
 ;; This file is part of the m17n contrib; a sub-part of the m17n
 ;; library.
@@ -35,7 +37,7 @@
   ("A") ("B") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") 
   ("L") ("M") ("N") ("O") ("P") ("Q") ("R") ("S") ("T") ("U")
   ("V") ("W") ("Y") ("Z")
-  ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i")
+  ("a") ("b") ("c") ("d") ("e") ("g") ("h") ("i")
   ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r")
   ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z"))
 
@@ -94,8 +96,6 @@
   ("o" "?")
   ("O" "?")
   ("V" "?")
-  ("M" "?")
-  ("H" "?")
   ("|" "?")
   ("||" "?")
   ("sX" "?")
@@ -110,8 +110,15 @@
   ("8" "?")
   ("9" "?"))
 
+ (halantha
+   ("f" "?")
+   ("ff" "??"))
+ 
+ (ayogavaaha
+  ("M" "?")
+  ("H" "?"))
+
  (dependent
-  ("f" "?")
   ("A" "?")
   ("i" "?")
   ("I" "?")
@@ -124,8 +131,7 @@
   ("Y" "?")
   ("o" "?")
   ("O" "?")
-  ("V" "?")
-  ("ff" "??"))
+  ("V" "?"))
 
  (return
   ((Return)))
@@ -135,23 +141,36 @@
 
 (state
  (init
-  (starter (pushback 1) (shift intermediate)))
+  (starter (pushback 1) (shift start)))
+
+ (start
+  (consonant (shift first))
+  (independent (shift ayogavaaha))
+  (backspace)
+  (return (shift init)))
 
- (intermediate
-  (consonant (shift second))
-  (independent (shift finish))
+ (first
+  (consonant (set a @-1) (undo -1) (commit) (pushback a) (shift start))
+  (ayogavaaha (shift finish))
+  (dependent (shift ayogavaaha))
+  (halantha (shift second))
   (backspace)
   (return (shift init)))
 
  (second
-  (consonant)
-  (dependent (shift finish))
+  (consonant (shift first))
   (backspace)
   (return (shift init)))
 
+ (ayogavaaha
+  (ayogavaaha (shift ayogavaaha))
+  (backspace)
+  (return (shift init))
+
  (finish
-  (return)
-  )
+  (backspace)
+  (return))
+)
 
 ;; (finish
 ;;  (return)

pa-jhelum-numeric-503478.patch:
 pa-jhelum.mim |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE pa-jhelum-numeric-503478.patch ---
--- im/pa-jhelum.mim.orig	2007-05-29 10:35:58.000000000 +0530
+++ im/pa-jhelum.mim	2009-06-01 15:26:40.000000000 +0530
@@ -71,7 +71,18 @@
   ((KP_Multiply) "*")
   ((KP_Add) "+")
   ((KP_Subtract) "-") 
- 
+
+  ((C-A-1) "?")
+  ((C-A-2) "?")
+  ((C-A-3) "?")
+  ((C-A-4) "?")
+  ((C-A-5) "?")
+  ((C-A-6) "?")
+  ((C-A-7) "?")
+  ((C-A-8) "?")
+  ((C-A-9) "?")
+  ((C-A-0) "?")
+
   ("~" ?~)
   ("`" ?`)
   ("!" ?!)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Oct 2008 10:21:42 -0000	1.7
+++ .cvsignore	18 Aug 2009 05:33:12 -0000	1.8
@@ -1,6 +1 @@
-m17n-contrib-1.1.3.tar.gz
-m17n-contrib-1.1.4.tar.gz
-m17n-contrib-1.1.5.tar.gz
-m17n-contrib-1.1.6.tar.gz
-m17n-contrib-1.1.7.tar.gz
-m17n-contrib-1.1.8.tar.gz
+m17n-contrib-1.1.10.tar.gz


Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-10/m17n-contrib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- m17n-contrib.spec	7 Nov 2008 08:59:15 -0000	1.22
+++ m17n-contrib.spec	18 Aug 2009 05:33:12 -0000	1.23
@@ -1,16 +1,19 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
-Version:  1.1.8
+Version:  1.1.10
 Release:  2%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/m17n-contrib-%{version}.tar.gz
+Source1:  mai-inscript.mim
 Patch0:	  bug433416-bn-probhat.patch
 Patch1:	  as-inscript-keysummary-440201.patch
 Patch2:   ml-inscript-keysummary-435259.patch
 Patch3:   kn-inscript-ZWNJ-440007.patch
 Patch4:   or-inscript-ZWJ-ZWNJ-466748.patch
+Patch5:   pa-jhelum-numeric-503478.patch
+Patch6:   kn-kgp-halantha-ayogavaaha.patch
 BuildArch: noarch
 BuildRequires: m17n-db-devel >= 1.5.2-3
 Requires: m17n-db >= 1.4.0
@@ -69,14 +72,18 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 
 %mk_pkg_uses_db assamese as 1
 %mk_pkg_uses_db bengali bn 1
+%mk_pkg czech cs 1
 %mk_pkg esperanto eo 1
 %mk_pkg_uses_db gujarati gu 1
 %mk_pkg_uses_db hindi hi 1
 %mk_pkg_uses_db kannada kn 1
+%mk_pkg kashmiri ks 0
+%mk_pkg maithili mai 0
 %mk_pkg_uses_db malayalam ml 1
 %mk_pkg marathi mr 1
 %mk_pkg nepali ne 1
 %mk_pkg_uses_db oriya or 1
+%mk_pkg pashto ps 1
 %mk_pkg_uses_db punjabi pa 1
 %mk_pkg_uses_db russian ru 0
 %mk_pkg sindhi sd 1
@@ -86,6 +93,7 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 %mk_pkg_uses_db telugu te 1
 %mk_pkg urdu ur 1
 %mk_pkg_uses_db vietnamese vi 1
+%mk_pkg_uses_db chinese zh 1
 
 
 %prep
@@ -95,6 +103,8 @@ for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
+%patch6 -p0
 
 %build
 %configure
@@ -104,6 +114,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 # generate .engine files for ibus-m17n for now
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ibus/engine
@@ -123,6 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/m17n/scripts
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.1.10-2
+- Add patch kn-kgp-halantha-ayogavaaha.patch
+- update to new upstream release 1.1.10 
+- Add patch pa-jhelum-numeric-503478.patch
+
 * Wed Nov 05 2008 Parag Nemade <pnemade at redhat.com> -1.1.8-2.fc10
 - Resolves: Bug 466748-[or_IN] Needed ZWJ & ZWNJ for Oriya Inscript keymap
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Oct 2008 10:21:42 -0000	1.8
+++ sources	18 Aug 2009 05:33:12 -0000	1.9
@@ -1 +1 @@
-1e36885707c854a7b9437c2be628354e  m17n-contrib-1.1.8.tar.gz
+e271af85713ebfaf0bc3a86a2e4248db  m17n-contrib-1.1.10.tar.gz



From pnemade at fedoraproject.org  Tue Aug 18 05:34:57 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 18 Aug 2009 05:34:57 +0000 (UTC)
Subject: rpms/m17n-contrib/F-10 mai-inscript.mim,NONE,1.1
Message-ID: <20090818053457.3138511C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-contrib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29004

Added Files:
	mai-inscript.mim 
Log Message:
- Add mai-inscript.mim to cvs



--- NEW FILE mai-inscript.mim ---
;; mai-inscript.mim -- Maithili input method for inscript layout
;; This file is derived from the Hindi inscript table of scim-tables,
;; which was derived from iiimf unitLE's Hindi inscript layout.
;; Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.

;; This file is part of the m17n contrib; a sub-part of the m17n
;; library.

;; The m17n library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public License
;; as published by the Free Software Foundation; either version 2.1 of
;; the License, or (at your option) any later version.

;; The m17n library is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
;; Lesser General Public License for more details.

;; You should have received a copy of the GNU Lesser General Public
;; License along with the m17n library; if not, write to the Free
;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.

(input-method mai inscript)

(description "Maithili input method for inscript layout.

Reference URL : http://indlinux.org/wiki/index.php/InscriptLayouts#Devanagari

Key Summary:
1. ??? : % 
         This can also be typed as a sequence of following:                 
                ? + ?  + ? i.e. p + d + }
2. ??? : ^
          This can also be typed as a sequence of following:
                 ? + ?  + ? i.e. l + d + j
 
3. ??? : &
          This can also be typed as a sequence of following:
                 ? + ?  + ? i.e. k + d + <
 
4. ??? : *
         This can also be typed as a sequence of following:
                 ? + ?  + ? i.e. M + d + j
                 
Key summary: Rajesh Ranjan <rranjan at redhat.com>                 

")

(title "?")

(map
 (trans
  ((KP_1) "?")
  ((KP_2) "?")
  ((KP_3) "?")
  ((KP_4) "?")
  ((KP_5) "?")
  ((KP_6) "?")
  ((KP_7) "?")
  ((KP_8) "?")
  ((KP_9) "?")
  ((KP_0) "?")
  ((KP_Decimal) ".")
  ((KP_Divide) "/")
  ((KP_Multiply) "*")
  ((KP_Add) "+")
  ((KP_Subtract) "-") 
 
  ("!" ??)
  ("1" ??)
  ("@" ??)
  ("2" ??)
  ("#" ?#)
  ("3" ??)
  ("$" ?$)
  ("4" ??)
  ("5" ??)
  ("6" ??)
  ("7" ??)
  ("8" ??)
  ("(" ?()
  ("9" ??)
  (")" ?))
  ("0" ??)
  ("_" ??)
  ("-" ?-)
  ("+" ??)
  ("=" ??)
  ("Q" ??)
  ("q" ??)
  ("W" ??)
  ("w" ??)
  ("E" ??)
  ("e" ??)
  ("R" ??)
  ("r" ??)
  ("T" ??)
  ("t" ??)
  ("Y" ??)
  ("y" ??)
  ("U" ??)
  ("u" ??)
  ("I" ??)
  ("i" ??)
  ("O" ??)
  ("o" ??)
  ("P" ??)
  ("p" ??)
  ("{" ??)
  ("[" ??)
  ("}" ??)
  ("]" ??)
  ("A" ??)
  ("a" ??)
  ("S" ??)
  ("s" ??)
  ("D" ??)
  ("d" ??)
  ("F" ??)
  ("f" ??)
  ("G" ??)
  ("g" ??)
  ("H" ??)
  ("h" ??)
  ("J" ??)
  ("j" ??)
  ("K" ??)
  ("k" ??)
  ("L" ??)
  ("l" ??)
  (":" ??)
  (";" ??)
  ("\"" ??)
  ("'" ??)
  ("|" ??)
  ("\\" ??)
  ("~" ??)
  ("`" ??)
  ("Z" ??)
  ("z" ??)
  ("X" ??)
  ("x" ??)
  ("C" ??)
  ("c" ??)
  ("V" ??)
  ("v" ??)
  ("B" ??)
  ("b" ??)
  ("N" ??)
  ("n" ??)
  ("M" ??)
  ("m" ??)
  ("<" ??)
  ("," ?,)
  (">" ??)
  ("." ?.)
  ("?" ??)
  ("/" ??)
  ("%" "???")
  ("^" "???")
  ("&" "???")
  ("*" "???")
  ("dd" "??") 
  ))

(state
  (init
    (trans)))



From mmaslano at fedoraproject.org  Tue Aug 18 05:54:29 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 18 Aug 2009 05:54:29 +0000 (UTC)
Subject: rpms/perl-Parse-ExuberantCTags/devel perl-Parse-ExuberantCTags.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818055429.8C8F311C00D7@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv345

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Parse-ExuberantCTags.spec 
Log Message:
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.01-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-Parse-ExuberantCTags.spec ---
Name:           perl-Parse-ExuberantCTags
Version:        1.01
Release:        1%{?dist}
Summary:        Efficiently parse exuberant ctags files
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Parse-ExuberantCTags/
Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/Parse-ExuberantCTags-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This Perl module parses ctags files and handles both traditional ctags as
well as extended ctags files such as produced with Exuberant ctags. To the
best of my knowledge, it does not handle emacs-style "etags" files.

%prep
%setup -q -n Parse-ExuberantCTags-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes perlobject.map README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Parse*
%{_mandir}/man3/*

%changelog
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.01-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:30:15 -0000	1.1
+++ .cvsignore	18 Aug 2009 05:54:27 -0000	1.2
@@ -0,0 +1 @@
+Parse-ExuberantCTags-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ExuberantCTags/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:30:15 -0000	1.1
+++ sources	18 Aug 2009 05:54:27 -0000	1.2
@@ -0,0 +1 @@
+5fd5c5ef9d2fd95cc9b48ff75760374e  Parse-ExuberantCTags-1.01.tar.gz



From mmaslano at fedoraproject.org  Tue Aug 18 05:57:34 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 18 Aug 2009 05:57:34 +0000 (UTC)
Subject: rpms/perl-Locale-Msgfmt/devel perl-Locale-Msgfmt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818055734.8BC3E11C00D7@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1025

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Locale-Msgfmt.spec 
Log Message:
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.14-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-Locale-Msgfmt.spec ---
Name:           perl-Locale-Msgfmt
Version:        0.14
Release:        1%{?dist}
Summary:        Compile .po files to .mo files
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Msgfmt/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZABGAB/Locale-Msgfmt-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module does the same thing as msgfmt from GNU gettext-tools, 
except this is pure Perl. The interface is best explained through
examples on home page.

%prep
%setup -q -n Locale-Msgfmt-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_bindir}/msgfmt.pl
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.14-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:16:55 -0000	1.1
+++ .cvsignore	18 Aug 2009 05:57:34 -0000	1.2
@@ -0,0 +1 @@
+Locale-Msgfmt-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Msgfmt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:16:55 -0000	1.1
+++ sources	18 Aug 2009 05:57:34 -0000	1.2
@@ -0,0 +1 @@
+2fd04fc47a8cff9e2c565d79a1b42599  Locale-Msgfmt-0.14.tar.gz



From mmaslano at fedoraproject.org  Tue Aug 18 06:03:27 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 18 Aug 2009 06:03:27 +0000 (UTC)
Subject: rpms/perl-PPIx-EditorTools/devel perl-PPIx-EditorTools.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818060327.4431611C00D7@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2172

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PPIx-EditorTools.spec 
Log Message:
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.07-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-PPIx-EditorTools.spec ---
Name:           perl-PPIx-EditorTools
Version:        0.07
Release:        1%{?dist}
Summary:        Utility methods and base class for manipulating Perl via PPI
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/PPIx-EditorTools/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZABGAB/PPIx-EditorTools-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::XSAccessor) >= 1.02
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(PPI) >= 1.203
BuildRequires:	perl(Test::More)
BuildRequires:  perl(Test::Differences)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Base class and utility methods for manipulating Perl via PPI. Pulled out
from the Padre::Task::PPI code.

%prep
%setup -q -n PPIx-EditorTools-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Aug 14 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.07-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:15:07 -0000	1.1
+++ .cvsignore	18 Aug 2009 06:03:26 -0000	1.2
@@ -0,0 +1 @@
+PPIx-EditorTools-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPIx-EditorTools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:15:07 -0000	1.1
+++ sources	18 Aug 2009 06:03:27 -0000	1.2
@@ -0,0 +1 @@
+bb0efaf7c203881c390857e0ccd6da88  PPIx-EditorTools-0.07.tar.gz



From elcody02 at fedoraproject.org  Tue Aug 18 06:07:57 2009
From: elcody02 at fedoraproject.org (Marc Grimme)
Date: Tue, 18 Aug 2009 06:07:57 +0000 (UTC)
Subject: rpms/osr-dracut-module/devel .cvsignore, 1.2,
	1.3 osr-dracut-module.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090818060757.107BD11C00D7@cvs1.fedora.phx.redhat.com>

Author: elcody02

Update of /cvs/pkgs/rpms/osr-dracut-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2410

Modified Files:
	.cvsignore osr-dracut-module.spec sources 
Log Message:
* added osr-dracut-chroot to provide a chroot environment (needed for future GFS/GFS2/OCFS2 integration)
* dependency for dracut >= 0.8
* moved functions to lib-dir in order to seperate library from program code
* verified that module osr does not neither need osr-cluster nore osr-chroot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jul 2009 09:22:48 -0000	1.2
+++ .cvsignore	18 Aug 2009 06:07:56 -0000	1.3
@@ -1 +1 @@
-osr-dracut-module-0.7.tar.bz2
+osr-dracut-module-0.8.tar.bz2


Index: osr-dracut-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/osr-dracut-module.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- osr-dracut-module.spec	26 Jul 2009 09:22:48 -0000	1.1
+++ osr-dracut-module.spec	18 Aug 2009 06:07:56 -0000	1.2
@@ -1,13 +1,13 @@
 Name: osr-dracut-module
-Version: 0.7
-Release: 2
+Version: 0.8
+Release: 1
 Summary: Dracut modules for open sharedroot
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://www.open-sharedroot.org/development/osr-dracut-module/
 Source0: http://www.open-sharedroot.org/development/osr-dracut-module/osr-dracut-module-%{version}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: dracut >= 0.7
+Requires: dracut >= 0.8
 BuildArch: noarch
 
 %description
@@ -16,14 +16,24 @@ This is the open-sharedroot module for d
 
 %package cluster
 Summary: Additional base cluster modules for shared booting with open-sharedroot
-Release: 2
-Requires: dracut >= 0.7
+Release: 1
+Requires: dracut >= 0.8
 Requires: osr-dracut-module
 Requires: comoonics-cluster-py
 
 %description cluster
 Additional base cluster modules for shared booting with open-sharedroot
 
+%package chroot
+Summary: Additional chroot modules for chroot required open-sharedroot
+Release: 1
+Requires: dracut >= 0.8
+Requires: osr-dracut-module
+Requires: comoonics-cluster-py
+
+%description chroot
+Additional chroot modules if chroot environment is needed for open-sharedroot
+
 %prep
 %setup -q
 
@@ -47,7 +57,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95osr-cluster
 %doc README.osr-cluster.txt COPYING AUTHORS
 
+%files chroot
+%defattr(-,root,root,0755)
+%{_datadir}/dracut/modules.d/95osr-chroot
+%doc README.osr-chroot.txt COPYING AUTHORS
+
 %changelog
+* Thu Aug 13 2009 Marc Grimme <grimme at atix.de> 0.8-1
+- Dependent on dracut 0.8 and above.
+- Some functions moved to lib dir
+- Added chroot module
 * Tue Jul 23 2009 Marc Grimme <grimme at atix.de> 0.7-2
 - added COPYING, AUTHORS to osr-dracut-module-cluster
 * Wed Jul 22 2009 Marc Grimme <grimme at atix.de> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Jul 2009 09:22:48 -0000	1.2
+++ sources	18 Aug 2009 06:07:56 -0000	1.3
@@ -1 +1 @@
-868150a5d4cc6346e90bc10cc2d971be  osr-dracut-module-0.7.tar.bz2
+b68f91b92fea0a5b06ddf60f0cd51e97  osr-dracut-module-0.8.tar.bz2



From pnemade at fedoraproject.org  Tue Aug 18 06:40:47 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 18 Aug 2009 06:40:47 +0000 (UTC)
Subject: rpms/m17n-db/F-10 .cvsignore, 1.65, 1.66 m17n-db.spec, 1.96,
	1.97 sources, 1.69, 1.70
Message-ID: <20090818064048.08F5B11C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9933

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
- Update to new upstream release 1.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/F-10/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	21 Oct 2008 10:17:44 -0000	1.65
+++ .cvsignore	18 Aug 2009 06:40:46 -0000	1.66
@@ -1,27 +1 @@
-m17n-db-1.3.3.tar.gz
-m17n-db-indic-0.4.28.tar.gz
-m17n-db-indic-0.4.29.tar.gz
-m17n-db-indic-0.4.30.tar.gz
-m17n-db-indic-0.4.31.tar.gz
-m17n-db-indic-0.4.32.tar.gz
-m17n-db-indic-0.4.33.tar.gz
-m17n-db-indic-0.4.34.tar.gz
-m17n-db-indic-0.4.35.tar.gz
-m17n-db-indic-0.4.36.tar.gz
-m17n-db-indic-0.4.37.tar.gz
-m17n-db-indic-0.4.38.tar.gz
-m17n-db-indic-0.4.39.tar.gz
-m17n-db-indic-0.4.40.tar.gz
-m17n-db-indic-0.4.41.tar.gz
-m17n-db-1.3.4.tar.gz
-m17n-db-indic-0.4.42.tar.gz
-m17n-db-indic-0.4.43.tar.gz
-m17n-db-indic-0.4.44.tar.gz
-m17n-db-indic-0.4.45.tar.gz
-m17n-db-indic-0.4.46.tar.gz
-m17n-db-1.4.0.tar.gz
-m17n-contrib-1.1.2.tar.gz
-m17n-db-1.5.0.tar.gz
-m17n-db-1.5.1.tar.gz
-m17n-db-1.5.2.tar.gz
-m17n-db-1.5.3.tar.gz
+m17n-db-1.5.5.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/F-10/m17n-db.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- m17n-db.spec	7 Nov 2008 07:10:23 -0000	1.96
+++ m17n-db.spec	18 Aug 2009 06:40:46 -0000	1.97
@@ -1,6 +1,6 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
-Version:    1.5.3
+Version:    1.5.5
 Release:    1%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
@@ -168,6 +168,7 @@ This package contains m17n-db input maps
 %mk_pkg_uses_contrib oriya or 1
 %mk_pkg_uses_contrib punjabi pa 1
 %mk_pkg_uses_contrib russian ru 1
+%mk_pkg sanskrit sa 0
 %mk_pkg serbian sr 1
 %mk_pkg_uses_contrib sinhala si 1
 %mk_pkg slovak sk 1
@@ -297,6 +298,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/engine/m17n-ug-*.engine
 
 %changelog
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
+- Update to new upstream release 1.5.5
+
 * Tue Oct 21 2008 Parag Nemade <pnemade at redhat.com> -1.5.3-1.fc10
 - Update to new upstream release 1.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/F-10/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	21 Oct 2008 10:17:44 -0000	1.69
+++ sources	18 Aug 2009 06:40:46 -0000	1.70
@@ -1 +1 @@
-0fdf4582389bb8de75de88caffdd0776  m17n-db-1.5.3.tar.gz
+a6fa9486caed6fe2a09d89fe97787696  m17n-db-1.5.5.tar.gz



From akurtakov at fedoraproject.org  Tue Aug 18 06:54:03 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 18 Aug 2009 06:54:03 +0000 (UTC)
Subject: rpms/hamcrest/devel hamcrest-core-MANIFEST.MF, NONE,
	1.1 hamcrest.spec, 1.5, 1.6
Message-ID: <20090818065403.A091611C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/hamcrest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13417/devel

Modified Files:
	hamcrest.spec 
Added Files:
	hamcrest-core-MANIFEST.MF 
Log Message:
- Add OSGi manifest for hamcrest-core.
- Make javadoc package noarch.


--- NEW FILE hamcrest-core-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.core
Export-Package: org.hamcrest;version="1.1.0";core=split;mandatory:=cor
 e,org.hamcrest.core;version="1.1.0",org.hamcrest.internal;version="1.
 1.0";x-internal:=true
Bundle-Version: 1.1.0.v20090501071000
Bundle-ManifestVersion: 2


Index: hamcrest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamcrest/devel/hamcrest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hamcrest.spec	25 Jul 2009 02:00:33 -0000	1.5
+++ hamcrest.spec	18 Aug 2009 06:54:01 -0000	1.6
@@ -53,7 +53,7 @@
 
 Name:           hamcrest
 Version:        1.1
-Release:        9.1%{?dist}
+Release:        9.2%{?dist}
 Epoch:          0
 Summary:        Library of matchers for building test expressions
 License:        BSD
@@ -67,6 +67,7 @@ Source4:        http://repo1.maven.org/m
 Source5:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
 Source6:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.pom
 Source7:        hamcrest-text-1.1.pom
+Source8:        hamcrest-core-MANIFEST.MF
 Patch0:         hamcrest-1.1-build.patch
 Patch1:         hamcrest-1.1-no-jarjar.patch
 Patch2:         hamcrest-1.1-no-integration.patch
@@ -115,6 +116,7 @@ UI validation rules.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+BuildArch:      noarch
 
 %description javadoc
 Javadoc for %{name}.
@@ -133,7 +135,7 @@ Requires:       testng
 Demonstrations and samples for %{name}.
 
 %prep
-%setup -q 
+%setup -q
 find . -type f -name "*.jar" | xargs -t rm
 # BUILD/hamcrest-%{version}/lib/generator/jarjar-1.0rc3.jar.no
 %if %with jarjar
@@ -176,6 +178,12 @@ ant -Dant.build.javac.source=1.5 -Dversi
 ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=first clean core generator library text bigjar javadoc
 %endif
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/%{name}-core-%{version}.jar META-INF/MANIFEST.MF
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
@@ -233,7 +241,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
-%endif 
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -297,6 +305,10 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-9.2
+- Add OSGi manifest for hamcrest-core.
+- Make javadoc package noarch.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1-9.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -396,10 +408,10 @@ fi
 * Fri Sep 06 2002 Henri Gomez <hgomez at users.sourceforge.net> 3.8.1-1jpp
 - 3.8.1
 
-* Sun Sep 01 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 3.8-2jpp 
+* Sun Sep 01 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 3.8-2jpp
 - used original zip file
 
-* Thu Aug 29 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 3.8-1jpp 
+* Thu Aug 29 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 3.8-1jpp
 - 3.8
 - group, vendor and distribution tags
 



From mhlavink at fedoraproject.org  Tue Aug 18 06:56:18 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 18 Aug 2009 06:56:18 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel .cvsignore, 1.28,
	1.29 ecryptfs-utils-75-nocryptdisks.patch, 1.1,
	1.2 ecryptfs-utils.spec, 1.52, 1.53 sources, 1.29, 1.30
Message-ID: <20090818065618.1D0F211C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14069

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
updated to 79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	29 Jul 2009 13:10:41 -0000	1.28
+++ .cvsignore	18 Aug 2009 06:56:17 -0000	1.29
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_78.orig.tar.gz
+ecryptfs-utils_79.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-nocryptdisks.patch	21 May 2009 09:42:20 -0000	1.1
+++ ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 06:56:17 -0000	1.2
@@ -1,9 +1,9 @@
-=== modified file 'src/utils/ecryptfs-setup-swap'
---- src/utils/ecryptfs-setup-swap	2009-03-20 21:44:01 +0000
-+++ src/utils/ecryptfs-setup-swap	2009-05-19 14:50:01 +0000
-@@ -158,13 +158,5 @@
- # Add fstab entry
- echo "/dev/mapper/cryptswap none swap sw 0 0" >> /etc/fstab
+diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
++++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
+@@ -158,13 +158,5 @@ for swap in $swaps; do
+ 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
+ done
  
 -# Turn swap off
 -swapoff -a
@@ -14,7 +14,5 @@
 -# Turn the swap on
 -swapon -a
 -
- info "Successfully setup encrypted swap!"
+ info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"
-\ No newline at end of file
-


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ecryptfs-utils.spec	29 Jul 2009 13:45:10 -0000	1.52
+++ ecryptfs-utils.spec	18 Aug 2009 06:56:17 -0000	1.53
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 78
-Release: 2%{?dist}
+Version: 79
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -58,7 +58,7 @@ the interface supplied by the ecryptfs-u
 %setup -q
 %patch2 -p1 -b .build
 %patch4 -p1 -b .werror
-%patch6 -p0 -b .nocryptdisks
+%patch6 -p1 -b .nocryptdisks
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
@@ -143,6 +143,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ecryptfs-rewrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-rewrite-file.1.gz
 %{_mandir}/man1/ecryptfs-setup-private.1.gz
+%{_mandir}/man1/ecryptfs-setup-swap.1.gz
+%{_mandir}/man1/ecryptfs-stat.1.gz
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz
@@ -153,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ecryptfsd.8.gz
 %{_mandir}/man8/mount.ecryptfs.8.gz
 %{_mandir}/man8/pam_ecryptfs.8.gz
+%{_mandir}/man8/umount.ecryptfs.8.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -172,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
+- updated to 79
+
 * Wed Jul 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 78-2
 - ecryptfs-dot-private is no longer used
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	29 Jul 2009 13:10:42 -0000	1.29
+++ sources	18 Aug 2009 06:56:17 -0000	1.30
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-0ea4f56d7086412f89dc166ee97c2246  ecryptfs-utils_78.orig.tar.gz
+ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz



From mhlavink at fedoraproject.org  Tue Aug 18 07:03:23 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 18 Aug 2009 07:03:23 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-11 .cvsignore, 1.26,
	1.27 ecryptfs-utils-75-nocryptdisks.patch, 1.1,
	1.2 ecryptfs-utils.spec, 1.50, 1.51 sources, 1.29, 1.30
Message-ID: <20090818070323.1562911C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15646

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
updated to 79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	28 Jul 2009 14:41:34 -0000	1.26
+++ .cvsignore	18 Aug 2009 07:03:22 -0000	1.27
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_78.orig.tar.gz
+ecryptfs-utils_79.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-nocryptdisks.patch	22 May 2009 09:56:23 -0000	1.1
+++ ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 07:03:22 -0000	1.2
@@ -1,9 +1,9 @@
-=== modified file 'src/utils/ecryptfs-setup-swap'
---- src/utils/ecryptfs-setup-swap	2009-03-20 21:44:01 +0000
-+++ src/utils/ecryptfs-setup-swap	2009-05-19 14:50:01 +0000
-@@ -158,13 +158,5 @@
- # Add fstab entry
- echo "/dev/mapper/cryptswap none swap sw 0 0" >> /etc/fstab
+diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
++++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
+@@ -158,13 +158,5 @@ for swap in $swaps; do
+ 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
+ done
  
 -# Turn swap off
 -swapoff -a
@@ -14,7 +14,5 @@
 -# Turn the swap on
 -swapon -a
 -
- info "Successfully setup encrypted swap!"
+ info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"
-\ No newline at end of file
-


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ecryptfs-utils.spec	28 Jul 2009 14:41:34 -0000	1.50
+++ ecryptfs-utils.spec	18 Aug 2009 07:03:22 -0000	1.51
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 78
+Version: 79
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -61,7 +61,7 @@ the interface supplied by the ecryptfs-u
 %setup -q
 %patch2 -p1 -b .build
 %patch4 -p1 -b .werror
-%patch6 -p0 -b .nocryptdisks
+%patch6 -p1 -b .nocryptdisks
 %patch9 -p1 -b .rhbz503261
 
 %build
@@ -147,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ecryptfs-rewrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-rewrite-file.1.gz
 %{_mandir}/man1/ecryptfs-setup-private.1.gz
+%{_mandir}/man1/ecryptfs-setup-swap.1.gz
+%{_mandir}/man1/ecryptfs-stat.1.gz
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz
@@ -157,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ecryptfsd.8.gz
 %{_mandir}/man8/mount.ecryptfs.8.gz
 %{_mandir}/man8/pam_ecryptfs.8.gz
+%{_mandir}/man8/umount.ecryptfs.8.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -176,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
+- updated to 79
+
 * Tue Jul 28 2009 Michal Hlavinka <mhlavink at redhat.com> 78-1
 - updated to 78
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	28 Jul 2009 14:41:34 -0000	1.29
+++ sources	18 Aug 2009 07:03:22 -0000	1.30
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-0ea4f56d7086412f89dc166ee97c2246  ecryptfs-utils_78.orig.tar.gz
+ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz



From mhlavink at fedoraproject.org  Tue Aug 18 07:16:19 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 18 Aug 2009 07:16:19 +0000 (UTC)
Subject: rpms/ecryptfs-utils/F-10 .cvsignore, 1.21,
	1.22 ecryptfs-utils-75-nocryptdisks.patch, 1.1,
	1.2 ecryptfs-utils.spec, 1.36, 1.37 sources, 1.24, 1.25
Message-ID: <20090818071619.C024711C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18925

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
updated to 79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	21 Jul 2009 07:34:46 -0000	1.21
+++ .cvsignore	18 Aug 2009 07:16:17 -0000	1.22
@@ -1,2 +1,2 @@
-ecryptfs-utils_76.orig.tar.gz
 ecryptfs-mount-private.png
+ecryptfs-utils_79.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-nocryptdisks.patch	21 May 2009 10:03:32 -0000	1.1
+++ ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 07:16:18 -0000	1.2
@@ -1,9 +1,9 @@
-=== modified file 'src/utils/ecryptfs-setup-swap'
---- src/utils/ecryptfs-setup-swap	2009-03-20 21:44:01 +0000
-+++ src/utils/ecryptfs-setup-swap	2009-05-19 14:50:01 +0000
-@@ -158,13 +158,5 @@
- # Add fstab entry
- echo "/dev/mapper/cryptswap none swap sw 0 0" >> /etc/fstab
+diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
++++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
+@@ -158,13 +158,5 @@ for swap in $swaps; do
+ 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
+ done
  
 -# Turn swap off
 -swapoff -a
@@ -14,7 +14,5 @@
 -# Turn the swap on
 -swapon -a
 -
- info "Successfully setup encrypted swap!"
+ info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"
-\ No newline at end of file
-


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ecryptfs-utils.spec	21 Jul 2009 07:34:47 -0000	1.36
+++ ecryptfs-utils.spec	18 Aug 2009 07:16:18 -0000	1.37
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 76
+Version: 79
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -27,7 +27,7 @@ Patch9: ecryptfs-utils-75-workaround5032
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, e2fsprogs
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
-BuildRequires: trousers-devel nss-devel desktop-file-utils autoconf automake libtool
+BuildRequires: trousers-devel nss-devel desktop-file-utils
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -58,14 +58,13 @@ applications written in the Python progr
 the interface supplied by the ecryptfs-utils library.
 
 %prep
-%setup -q -n %{name}_%{version}.orig
+%setup -q
 %patch2 -p1 -b .build
 %patch4 -p1 -b .werror
-%patch6 -p0 -b .nocryptdisks
+%patch6 -p1 -b .nocryptdisks
 %patch9 -p1 -b .rhbz503261
 
 %build
-autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
 %configure --disable-rpath --enable-tspi --enable-nss --enable-static
 make clean
@@ -99,9 +98,6 @@ touch -r src/desktop/ecryptfs-setup-priv
      $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop
 rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase
 
-#ecryptfs-dot-private should be only sourced, not executed (#500817)
-chmod -x $RPM_BUILD_ROOT%{_bindir}/ecryptfs-dot-private
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -132,7 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-umount-private
 %{_bindir}/ecryptfs-stat
 %{_bindir}/ecryptfsd
-%{_bindir}/ecryptfs-dot-private
 %{_libdir}/ecryptfs
 %{_libdir}/libecryptfs.so.0
 %{_libdir}/libecryptfs.so.0.0.0
@@ -149,6 +144,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ecryptfs-rewrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-rewrite-file.1.gz
 %{_mandir}/man1/ecryptfs-setup-private.1.gz
+%{_mandir}/man1/ecryptfs-setup-swap.1.gz
+%{_mandir}/man1/ecryptfs-stat.1.gz
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz
@@ -159,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ecryptfsd.8.gz
 %{_mandir}/man8/mount.ecryptfs.8.gz
 %{_mandir}/man8/pam_ecryptfs.8.gz
+%{_mandir}/man8/umount.ecryptfs.8.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -178,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
+- updated to 79
+
 * Tue Jul 21 2009 Michal Hlavinka <mhlavink at redhat.com> 76-1
 - updated to 76
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	21 Jul 2009 07:34:47 -0000	1.24
+++ sources	18 Aug 2009 07:16:18 -0000	1.25
@@ -1,2 +1,2 @@
-0e6a58a0730838dc832ecd8bd9e0c463  ecryptfs-utils_76.orig.tar.gz
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
+ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz



From dchen at fedoraproject.org  Tue Aug 18 07:29:46 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue, 18 Aug 2009 07:29:46 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.18, 1.19 ibus-chewing.spec,
	1.21, 1.22 import.log, 1.14, 1.15 sources, 1.19, 1.20
Message-ID: <20090818072946.AA06911C00D7@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-serv21754/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Address google issue 471


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	22 May 2009 05:29:00 -0000	1.18
+++ .cvsignore	18 Aug 2009 07:29:45 -0000	1.19
@@ -1 +1 @@
-ibus-chewing-1.0.10.20090523-Source.tar.gz
+ibus-chewing-1.2.0.20090818-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ibus-chewing.spec	22 May 2009 06:42:11 -0000	1.21
+++ ibus-chewing.spec	18 Aug 2009 07:29:45 -0000	1.22
@@ -1,6 +1,6 @@
 Name:       ibus-chewing
-Version:    1.0.10.20090523
-Release:    2%{?dist}
+Version:    1.2.0.20090818
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -17,7 +17,6 @@ BuildRequires:  gob2
 BuildRequires:  libchewing-devel >= 0.3.2-4
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
-BuildRequires:  libX11-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
 Requires:  libchewing >= 0.3.2-4
@@ -33,8 +32,9 @@ libchewing.
 %setup -q -n %{name}-%{version}-Source
 
 %build
-%cmake -DCMAKE_INSTALL_PREFIX=%{_usr}
-make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
+# $RPM_OPT_FLAGS should be  loaded from cmake macro.
+%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
+make VERBOSE=1  %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +77,20 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Aug 18 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090818-1
+- Merged 1.2 and 1.1 source code.
+- Addressed Upstream (IBUS Google code) issue 471.
+- Remove libX11 dependency.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090624-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 24 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090624-1
+- Lookup table now shows the selection key.
+
+* Mon Jun 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090622-1
+- Update to 1.2.0.20090622.
+
 * Fri May 22 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.10.20090523-2
 - Add back the export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
@@ -174,3 +188,5 @@ Fix the errors which Funda Wang as point
 
 
 
+
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	22 May 2009 06:42:11 -0000	1.14
+++ import.log	18 Aug 2009 07:29:45 -0000	1.15
@@ -12,3 +12,4 @@ ibus-chewing-1_0_9_20090508-1_fc10:F-11:
 ibus-chewing-1_0_10_20090522-1_fc11:F-11:ibus-chewing-1.0.10.20090522-1.fc11.src.rpm:1242968354
 ibus-chewing-1_0_10_20090523-1_fc11:F-11:ibus-chewing-1.0.10.20090523-1.fc11.src.rpm:1242970059
 ibus-chewing-1_0_10_20090523-2_fc11:F-11:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242974190
+ibus-chewing-1_2_0_20090818-1_fc11:F-11:ibus-chewing-1.2.0.20090818-1.fc11.src.rpm:1250580564


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	22 May 2009 06:42:11 -0000	1.19
+++ sources	18 Aug 2009 07:29:45 -0000	1.20
@@ -1 +1 @@
-7cc0eada9c3ac7a77708f092a342d4cc  ibus-chewing-1.0.10.20090523-Source.tar.gz
+e707ae6563e858c8fa381b34436a21e6  ibus-chewing-1.2.0.20090818-Source.tar.gz



From caolanm at fedoraproject.org  Tue Aug 18 07:39:21 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 07:39:21 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.locales32.patch, NONE,
	1.1 openoffice.org.spec, 1.1981,
	1.1982 openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch,
	1.1, NONE
Message-ID: <20090818073921.B2D8011C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23811

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.locales32.patch 
Removed Files:
	openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch 
Log Message:
rename to upstream workspace

workspace.locales32.patch:
 i18npool/source/breakiterator/xdictionary.cxx |   75 +++++++++++++++++---------
 inc/xdictionary.hxx                           |    4 -
 2 files changed, 53 insertions(+), 26 deletions(-)

--- NEW FILE workspace.locales32.patch ---
diff -ru i18npool.orig/source/breakiterator/xdictionary.cxx i18npool/source/breakiterator/xdictionary.cxx
--- i18npool.orig/source/breakiterator/xdictionary.cxx	2009-05-28 10:03:10.000000000 +0100
+++ i18npool/source/breakiterator/xdictionary.cxx	2009-06-18 17:02:37.000000000 +0100
@@ -111,8 +112,9 @@
         japaneseWordBreak = sal_True;
 }
 
-sal_Bool xdictionary::exists(const sal_Unicode c) {
-        sal_Bool exist = existMark ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False;
+sal_Bool xdictionary::exists(const sal_uInt32 c) {
+        // 0x1FFF is the hardcoded limit in gendict for existMarks
+        sal_Bool exist = (existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False;
         if (!exist && japaneseWordBreak)
             return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN;
         else
@@ -169,20 +171,35 @@
  * @param pos : Position of the given character.
  * @return true if CJK.
  */
-sal_Bool xdictionary::seekSegment(const sal_Unicode *text, sal_Int32 pos, 
-                sal_Int32 len, Boundary& segBoundary) {
-        for (segBoundary.startPos = pos - 1; 
-            segBoundary.startPos >= 0 && 
-                (u_isWhitespace((sal_uInt32)text[segBoundary.startPos]) || exists(text[segBoundary.startPos]));
-            segBoundary.startPos--) ;
-        segBoundary.startPos++;
-
-        for (segBoundary.endPos = pos;
-            segBoundary.endPos < len &&
-                    (u_isWhitespace((sal_uInt32)text[segBoundary.endPos]) || exists(text[segBoundary.endPos]));
-            segBoundary.endPos++) ;
+sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos, 
+	Boundary& segBoundary)
+{
+    sal_Int32 indexUtf16;
+    segBoundary.endPos = segBoundary.startPos = pos;
+
+    indexUtf16 = pos;
+    while (indexUtf16 > 0)
+    {
+        sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, -1);
+        if (u_isWhitespace(ch) || exists(ch))
+            segBoundary.startPos = indexUtf16;
+        else
+            break;
+    }
 
-        return segBoundary.endPos > segBoundary.startPos + 1;
+    indexUtf16 = pos;
+    while (indexUtf16 < rText.getLength())
+    {
+        sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1);
+        if (u_isWhitespace(ch) || exists(ch))
+            segBoundary.endPos = indexUtf16;
+        else
+            break;
+    }
+
+    indexUtf16 = segBoundary.startPos;
+    rText.iterateCodePoints(&indexUtf16, 1);
+    return segBoundary.endPos > indexUtf16;
 }
 
 #define KANJA       1
@@ -312,19 +329,24 @@
         sal_Int32 len=rText.getLength();
         if (anyPos >= len || anyPos < 0) {
             boundary.startPos = boundary.endPos = anyPos < 0 ? 0 : len;
-        } else if (seekSegment(text, anyPos, len, boundary)) {          // character in dict
+        } else if (seekSegment(rText, anyPos, boundary)) {          // character in dict
             WordBreakCache& aCache = getCache(text, boundary);
             sal_Int32 i = 0;
 
-            while (aCache.wordboundary[i] <= (sal_Int32)anyPos - boundary.startPos) i++;
+            while (aCache.wordboundary[i] <= anyPos - boundary.startPos) i++;
 
             sal_Int32 startPos = aCache.wordboundary[i - 1];
             // if bDirection is false
-            if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos) &&
-                                                u_isWhitespace((sal_uInt32) text[anyPos - 1]))
-                i--;
-            boundary.endPos = aCache.wordboundary[i] + boundary.startPos;
-            boundary.startPos += aCache.wordboundary[i - 1];
+            if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos))
+            {
+                sal_Int32 indexUtf16 = anyPos-1;
+                sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1);
+                if (u_isWhitespace(ch))
+                    i--;
+            }
+            boundary.endPos = boundary.startPos;
+            rText.iterateCodePoints(&boundary.endPos, aCache.wordboundary[i]);
+            rText.iterateCodePoints(&boundary.startPos, aCache.wordboundary[i-1]);
         } else {
             boundary.startPos = anyPos;
             if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
@@ -332,8 +354,14 @@
         }
         if (wordType == WordType::WORD_COUNT) {
             // skip punctuation for word count.
-            while (boundary.endPos < len && u_ispunct((sal_uInt32)text[boundary.endPos])) 
-                boundary.endPos++;
+            while (boundary.endPos < len)
+            {
+                sal_Int32 indexUtf16 = boundary.endPos;
+                if (u_ispunct(rText.iterateCodePoints(&indexUtf16, 1)))
+                    boundary.endPos = indexUtf16;
+                else
+                    break;
+            }
         }
 
         return boundary;
--- i18npool.orig/inc/xdictionary.hxx	2009-05-28 10:03:15.000000000 +0100
+++ i18npool/inc/xdictionary.hxx	2009-06-18 16:46:15.000000000 +0100
@@ -85,9 +85,9 @@
 private:
 	WordBreakCache cache[CACHE_MAX];
 
-	sal_Bool        seekSegment(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len, Boundary& boundary);
+	sal_Bool        seekSegment(const rtl::OUString& rText, sal_Int32 pos, Boundary& boundary);
 	WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
-    sal_Bool        exists(const sal_Unicode u);
+	sal_Bool        exists(const sal_uInt32 u);
 	sal_Int32       getLongestMatch(const sal_Unicode *text, sal_Int32 len);
 };
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -p -r1.1981 -r1.1982
--- openoffice.org.spec	17 Aug 2009 11:08:12 -0000	1.1981
+++ openoffice.org.spec	18 Aug 2009 07:39:21 -0000	1.1982
@@ -146,7 +146,7 @@ Patch68: openoffice.org-3.1.0.ooo102061.
 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: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
+Patch72: workspace.locales32.patch
 Patch73: workspace.cmcfixes60.patch
 Patch74: workspace.dr72.patch
 Patch75: workspace.vcl103.patch
@@ -1685,7 +1685,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %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 .ooo102920.i18npool.utf16bustage.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


--- openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch DELETED ---



From caolanm at fedoraproject.org  Tue Aug 18 07:47:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 07:47:09 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch, NONE,
	1.1 openoffice.org.spec, 1.1982, 1.1983
Message-ID: <20090818074709.3F07411C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25973

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch 
Log Message:
Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch

openoffice.org-3.1.1.ooo104306.moverecentlyused.patch:
 postprocess/prj/build.lst                                 |    2 -
 sfx2/inc/pch/precompiled_sfx2.hxx                         |    1 
 sfx2/prj/build.lst                                        |    2 -
 sfx2/source/appl/sfxpicklist.cxx                          |    4 --
 sfx2/source/doc/objstor.cxx                               |    3 --
 sfx2/util/makefile.mk                                     |    1 
 shell/prj/d.lst                                           |    4 --
 shell/source/unix/sysshell/makefile.mk                    |    4 --
 shell/source/unix/sysshell/recently_used_file_handler.cxx |    1 
 solenv/inc/libs.mk                                        |    2 -
 vcl/inc/vcl/salinst.hxx                                   |    2 +
 vcl/inc/vcl/svapp.hxx                                     |   14 +++++++++
 vcl/source/app/svapp.cxx                                  |    6 ++++
 vcl/unx/gtk/app/gtkinst.cxx                               |    6 ++++
 vcl/unx/headless/svpinst.cxx                              |    4 ++
 vcl/unx/headless/svpinst.hxx                              |    2 +
 vcl/unx/inc/plugins/gtk/gtkinst.hxx                       |    1 
 vcl/unx/inc/salinst.h                                     |    2 +
 vcl/unx/source/app/salinst.cxx                            |   20 ++++++++++++++
 19 files changed, 61 insertions(+), 20 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104306.moverecentlyused.patch ---
diff -ru vcl.orig/inc/vcl/salinst.hxx vcl/inc/vcl/salinst.hxx
--- vcl.orig/inc/vcl/salinst.hxx	2009-08-17 14:51:16.000000000 +0100
+++ vcl/inc/vcl/salinst.hxx	2009-08-17 15:06:37.000000000 +0100
@@ -171,6 +171,8 @@
 
     enum ConnectionIdentifierType { AsciiCString, Blob };
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
+
+    virtual void        AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
 };
 
 // called from SVMain
diff -ru vcl.orig/inc/vcl/svapp.hxx vcl/inc/vcl/svapp.hxx
--- vcl.orig/inc/vcl/svapp.hxx	2009-08-17 14:51:15.000000000 +0100
+++ vcl/inc/vcl/svapp.hxx	2009-08-17 15:01:49.000000000 +0100
@@ -479,6 +479,20 @@
      */
     static const ::rtl::OUString& GetDesktopEnvironment();
 
+    /** Add a file to the system shells recent document list if there is any.
+          This function may have no effect under Unix because there is no 
+          standard API among the different desktop managers.
+          
+          @param rFileUrl
+                    The file url of the document.
+                    
+          @param rMimeType
+          The mime content type of the document specified by aFileUrl.
+          If an empty string will be provided "application/octet-stream"
+          will be used.
+    */
+    static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
 private:
 
     DECL_STATIC_LINK( Application, PostEventHandler, void* );
diff -ru vcl.orig/source/app/svapp.cxx vcl/source/app/svapp.cxx
--- vcl.orig/source/app/svapp.cxx	2009-08-17 14:51:13.000000000 +0100
+++ vcl/source/app/svapp.cxx	2009-08-17 15:06:40.000000000 +0100
@@ -1989,6 +1989,12 @@
     return SalGetDesktopEnvironment();
 }
 
+void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    ImplSVData* pSVData = ImplGetSVData();
+    pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
+}
+
 BOOL Application::IsAccessibilityEnabled()
 {
     return FALSE;
diff -ru vcl.orig/unx/gtk/app/gtkinst.cxx vcl/unx/gtk/app/gtkinst.cxx
--- vcl.orig/unx/gtk/app/gtkinst.cxx	2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/gtk/app/gtkinst.cxx	2009-08-17 15:12:52.000000000 +0100
@@ -221,6 +221,12 @@
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
+void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+    GtkRecentManager *manager = gtk_recent_manager_get_default ();
+    gtk_recent_manager_add_item (manager, rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+}
+
 GtkYieldMutex::GtkYieldMutex()
 {
 }
diff -ru vcl.orig/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.cxx
--- vcl.orig/unx/headless/svpinst.cxx	2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/headless/svpinst.cxx	2009-08-17 15:14:50.000000000 +0100
@@ -504,6 +504,10 @@
 	}
 }
 
+void SvpSalInstance::AddToRecentDocumentList(const rtl::OUString&, const rtl::OUString&)
+{
+}
+
 SvpSalTimer::~SvpSalTimer()
 {
 }
diff -ru vcl.orig/unx/headless/svpinst.hxx vcl/unx/headless/svpinst.hxx
--- vcl.orig/unx/headless/svpinst.hxx	2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/headless/svpinst.hxx	2009-08-17 15:14:14.000000000 +0100
@@ -193,6 +193,8 @@
     virtual SalSession*		CreateSalSession();
 
     virtual void*			GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 #endif // _SV_SALINST_HXX
diff -ru vcl.orig/unx/inc/plugins/gtk/gtkinst.hxx vcl/unx/inc/plugins/gtk/gtkinst.hxx
--- vcl.orig/unx/inc/plugins/gtk/gtkinst.hxx	2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/inc/plugins/gtk/gtkinst.hxx	2009-08-17 15:09:05.000000000 +0100
@@ -91,6 +91,7 @@
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
     virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
     virtual SalSystem*			CreateSalSystem();
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 class GtkSalSystem : public X11SalSystem
diff -ru vcl.orig/unx/inc/salinst.h vcl/unx/inc/salinst.h
--- vcl.orig/unx/inc/salinst.h	2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/inc/salinst.h	2009-08-17 15:16:21.000000000 +0100
@@ -115,6 +115,8 @@
 
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
 
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
 
     bool isPrinterInit() const 
     {
diff -ru vcl.orig/unx/source/app/salinst.cxx vcl/unx/source/app/salinst.cxx
--- vcl.orig/unx/source/app/salinst.cxx	2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/source/app/salinst.cxx	2009-08-17 15:38:31.000000000 +0100
@@ -35,6 +35,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <osl/module.hxx>
+
 #include <salunx.h>
 
 #ifndef _VOS_MUTEX_HXX
@@ -276,3 +279,21 @@
 {
 	delete pFrame;
 }
+
+extern "C" { static void SAL_CALL thisModule() {} }
+
+void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST(RTL_CONSTASCII_USTRINGPARAM("add_to_recently_used_file_list"));
+    const rtl::OUString LIB_RECENT_FILE(RTL_CONSTASCII_USTRINGPARAM("librecentfile.so"));
+    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
+
+    PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
+
+    osl::Module module;
+    module.loadRelative( &thisModule, LIB_RECENT_FILE );
+    if (module.is())
+        add_to_recently_used_file_list = (PFUNC_ADD_TO_RECENTLY_USED_LIST)module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST);
+    if (add_to_recently_used_file_list)
+        add_to_recently_used_file_list(rFileUrl, rMimeType);
+}
diff -ru shell.orig/prj/d.lst shell/prj/d.lst
--- shell.orig/prj/d.lst	2009-08-17 14:50:14.000000000 +0100
+++ shell/prj/d.lst	2009-08-17 14:53:04.000000000 +0100
@@ -1,7 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\shell
-
-..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx
-
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
diff -ru shell.orig/source/unix/sysshell/makefile.mk shell/source/unix/sysshell/makefile.mk
--- shell.orig/source/unix/sysshell/makefile.mk	2009-08-17 14:50:17.000000000 +0100
+++ shell/source/unix/sysshell/makefile.mk	2009-08-17 15:33:43.000000000 +0100
@@ -48,10 +48,6 @@
 
 .IF "$(OS)" != "MACOSX"
 
-LIB1OBJFILES=$(SLO)$/systemshell.obj
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
-
 SLOFILES=$(SLO)$/recently_used_file.obj \
          $(SLO)$/recently_used_file_handler.obj
 
diff -ru shell.orig/source/unix/sysshell/recently_used_file_handler.cxx shell/source/unix/sysshell/recently_used_file_handler.cxx
--- shell.orig/source/unix/sysshell/recently_used_file_handler.cxx	2009-08-17 14:50:17.000000000 +0100
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx	2009-08-17 15:34:56.000000000 +0100
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
  
-#include "systemshell.hxx"
 #include "osl/process.h"
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
diff -ru sfx2.orig/inc/pch/precompiled_sfx2.hxx sfx2/inc/pch/precompiled_sfx2.hxx
--- sfx2.orig/inc/pch/precompiled_sfx2.hxx	2009-08-17 14:51:35.000000000 +0100
+++ sfx2/inc/pch/precompiled_sfx2.hxx	2009-08-17 15:38:12.000000000 +0100
@@ -484,7 +484,6 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
 #include "sj2/sjapplet.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
diff -ru sfx2.orig/prj/build.lst sfx2/prj/build.lst
--- sfx2.orig/prj/build.lst	2009-08-17 14:51:16.000000000 +0100
+++ sfx2/prj/build.lst	2009-08-17 14:53:21.000000000 +0100
@@ -1,4 +1,4 @@
-sf      sfx2    :       idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg NULL
+sf      sfx2    :       idl basic xmlscript framework setup_native sax SYSTRAY_GTK:libegg NULL
 sf	sfx2									usr1	-	all	sf_mkout NULL
 sf	sfx2\inc								nmake	-	all	sf_inc NULL
 sf	sfx2\prj								get		-	all	sf_prj NULL
diff -ru sfx2.orig/source/appl/sfxpicklist.cxx sfx2/source/appl/sfxpicklist.cxx
--- sfx2.orig/source/appl/sfxpicklist.cxx	2009-08-17 14:51:30.000000000 +0100
+++ sfx2/source/appl/sfxpicklist.cxx	2009-08-17 15:38:30.000000000 +0100
@@ -43,8 +43,6 @@
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <shell/systemshell.hxx>
-
 // ----------------------------------------------------------------------------
 
 #include <sfx2/app.hxx>
@@ -470,7 +468,7 @@
                 pDocSh->Get_Impl()->bWaitingForPicklist = sal_False;
 
                 if ( aURL.GetProtocol() == INET_PROT_FILE )
-                    SystemShell::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
+                    Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
 			}
             break;
 		}
diff -ru sfx2.orig/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
--- sfx2.orig/source/doc/objstor.cxx	2009-08-17 14:51:30.000000000 +0100
+++ sfx2/source/doc/objstor.cxx	2009-08-17 15:38:28.000000000 +0100
@@ -99,7 +99,6 @@
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <shell/systemshell.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/documentconstants.hxx>
@@ -820,7 +819,7 @@
                 if ( aUrl.GetProtocol() == INET_PROT_FILE )
                 {
                     const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
-                    SystemShell::AddToRecentDocumentList(
+                    Application::AddToRecentDocumentList(
                         aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
                         (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
                 }
diff -ru sfx2.orig/util/makefile.mk sfx2/util/makefile.mk
--- sfx2.orig/util/makefile.mk	2009-08-17 14:51:39.000000000 +0100
+++ sfx2/util/makefile.mk	2009-08-17 15:36:35.000000000 +0100
@@ -87,7 +87,6 @@
 		$(TOOLSLIB) \
 		$(I18NISOLANGLIB) \
 		$(SAXLIB) \
-		$(SYSSHELLLIB) \
 		$(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
 		$(CPPUHELPERLIB) \
diff -ru solenv.orig/inc/libs.mk solenv/inc/libs.mk
--- solenv.orig/inc/libs.mk	2009-08-17 14:51:30.000000000 +0100
+++ solenv/inc/libs.mk	2009-08-17 14:51:57.000000000 +0100
@@ -274,7 +274,6 @@
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-SYSSHELLLIB=-lsysshell
 .IF "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -485,7 +484,6 @@
 FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
-SYSSHELLLIB=sysshell.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = cppunit.lib
 XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
diff -ru postprocess.orig/prj/build.lst postprocess/prj/build.lst
--- postprocess.orig/prj/build.lst	2009-08-17 14:53:51.000000000 +0100
+++ postprocess/prj/build.lst	2009-08-17 14:54:09.000000000 +0100
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native shell slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -p -r1.1982 -r1.1983
--- openoffice.org.spec	18 Aug 2009 07:39:21 -0000	1.1982
+++ openoffice.org.spec	18 Aug 2009 07:47:08 -0000	1.1983
@@ -154,6 +154,7 @@ Patch76: workspace.cmcfixes61.patch
 Patch77: workspace.os132.patch
 Patch78: openoffice.org-3.1.1.oooXXXXX.dmake.patch
 Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch80: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1693,6 +1694,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch77 -p0 -b .workspace.os132.patch
 %patch78 -p0 -b .oooXXXXX.dmake.patch
 %patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch80 -p0 -b .ooo104306.moverecentlyused.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4202,8 +4204,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Aug 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.2
+* Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.2
 - add openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+- Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 
 * Fri Aug 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.1
 - Resolves: rhbz#516011 keep help .xsl files as non-docs



From caolanm at fedoraproject.org  Tue Aug 18 07:48:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 07:48:30 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch, NONE,
	1.1 openoffice.org.spec, 1.1926, 1.1927
Message-ID: <20090818074830.5535D11C00D7@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-serv26275

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch 
Log Message:
Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch

openoffice.org-3.1.1.ooo104306.moverecentlyused.patch:
 postprocess/prj/build.lst                                 |    2 -
 sfx2/inc/pch/precompiled_sfx2.hxx                         |    1 
 sfx2/prj/build.lst                                        |    2 -
 sfx2/source/appl/sfxpicklist.cxx                          |    4 --
 sfx2/source/doc/objstor.cxx                               |    3 --
 sfx2/util/makefile.mk                                     |    1 
 shell/prj/d.lst                                           |    4 --
 shell/source/unix/sysshell/makefile.mk                    |    4 --
 shell/source/unix/sysshell/recently_used_file_handler.cxx |    1 
 solenv/inc/libs.mk                                        |    2 -
 vcl/inc/vcl/salinst.hxx                                   |    2 +
 vcl/inc/vcl/svapp.hxx                                     |   14 +++++++++
 vcl/source/app/svapp.cxx                                  |    6 ++++
 vcl/unx/gtk/app/gtkinst.cxx                               |    6 ++++
 vcl/unx/headless/svpinst.cxx                              |    4 ++
 vcl/unx/headless/svpinst.hxx                              |    2 +
 vcl/unx/inc/plugins/gtk/gtkinst.hxx                       |    1 
 vcl/unx/inc/salinst.h                                     |    2 +
 vcl/unx/source/app/salinst.cxx                            |   20 ++++++++++++++
 19 files changed, 61 insertions(+), 20 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104306.moverecentlyused.patch ---
diff -ru vcl.orig/inc/vcl/salinst.hxx vcl/inc/vcl/salinst.hxx
--- vcl.orig/inc/vcl/salinst.hxx	2009-08-17 14:51:16.000000000 +0100
+++ vcl/inc/vcl/salinst.hxx	2009-08-17 15:06:37.000000000 +0100
@@ -171,6 +171,8 @@
 
     enum ConnectionIdentifierType { AsciiCString, Blob };
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
+
+    virtual void        AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
 };
 
 // called from SVMain
diff -ru vcl.orig/inc/vcl/svapp.hxx vcl/inc/vcl/svapp.hxx
--- vcl.orig/inc/vcl/svapp.hxx	2009-08-17 14:51:15.000000000 +0100
+++ vcl/inc/vcl/svapp.hxx	2009-08-17 15:01:49.000000000 +0100
@@ -479,6 +479,20 @@
      */
     static const ::rtl::OUString& GetDesktopEnvironment();
 
+    /** Add a file to the system shells recent document list if there is any.
+          This function may have no effect under Unix because there is no 
+          standard API among the different desktop managers.
+          
+          @param rFileUrl
+                    The file url of the document.
+                    
+          @param rMimeType
+          The mime content type of the document specified by aFileUrl.
+          If an empty string will be provided "application/octet-stream"
+          will be used.
+    */
+    static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
 private:
 
     DECL_STATIC_LINK( Application, PostEventHandler, void* );
diff -ru vcl.orig/source/app/svapp.cxx vcl/source/app/svapp.cxx
--- vcl.orig/source/app/svapp.cxx	2009-08-17 14:51:13.000000000 +0100
+++ vcl/source/app/svapp.cxx	2009-08-17 15:06:40.000000000 +0100
@@ -1989,6 +1989,12 @@
     return SalGetDesktopEnvironment();
 }
 
+void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    ImplSVData* pSVData = ImplGetSVData();
+    pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
+}
+
 BOOL Application::IsAccessibilityEnabled()
 {
     return FALSE;
diff -ru vcl.orig/unx/gtk/app/gtkinst.cxx vcl/unx/gtk/app/gtkinst.cxx
--- vcl.orig/unx/gtk/app/gtkinst.cxx	2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/gtk/app/gtkinst.cxx	2009-08-17 15:12:52.000000000 +0100
@@ -221,6 +221,12 @@
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
+void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+    GtkRecentManager *manager = gtk_recent_manager_get_default ();
+    gtk_recent_manager_add_item (manager, rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+}
+
 GtkYieldMutex::GtkYieldMutex()
 {
 }
diff -ru vcl.orig/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.cxx
--- vcl.orig/unx/headless/svpinst.cxx	2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/headless/svpinst.cxx	2009-08-17 15:14:50.000000000 +0100
@@ -504,6 +504,10 @@
 	}
 }
 
+void SvpSalInstance::AddToRecentDocumentList(const rtl::OUString&, const rtl::OUString&)
+{
+}
+
 SvpSalTimer::~SvpSalTimer()
 {
 }
diff -ru vcl.orig/unx/headless/svpinst.hxx vcl/unx/headless/svpinst.hxx
--- vcl.orig/unx/headless/svpinst.hxx	2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/headless/svpinst.hxx	2009-08-17 15:14:14.000000000 +0100
@@ -193,6 +193,8 @@
     virtual SalSession*		CreateSalSession();
 
     virtual void*			GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 #endif // _SV_SALINST_HXX
diff -ru vcl.orig/unx/inc/plugins/gtk/gtkinst.hxx vcl/unx/inc/plugins/gtk/gtkinst.hxx
--- vcl.orig/unx/inc/plugins/gtk/gtkinst.hxx	2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/inc/plugins/gtk/gtkinst.hxx	2009-08-17 15:09:05.000000000 +0100
@@ -91,6 +91,7 @@
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
     virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
     virtual SalSystem*			CreateSalSystem();
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 class GtkSalSystem : public X11SalSystem
diff -ru vcl.orig/unx/inc/salinst.h vcl/unx/inc/salinst.h
--- vcl.orig/unx/inc/salinst.h	2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/inc/salinst.h	2009-08-17 15:16:21.000000000 +0100
@@ -115,6 +115,8 @@
 
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
 
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
 
     bool isPrinterInit() const 
     {
diff -ru vcl.orig/unx/source/app/salinst.cxx vcl/unx/source/app/salinst.cxx
--- vcl.orig/unx/source/app/salinst.cxx	2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/source/app/salinst.cxx	2009-08-17 15:38:31.000000000 +0100
@@ -35,6 +35,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <osl/module.hxx>
+
 #include <salunx.h>
 
 #ifndef _VOS_MUTEX_HXX
@@ -276,3 +279,21 @@
 {
 	delete pFrame;
 }
+
+extern "C" { static void SAL_CALL thisModule() {} }
+
+void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST(RTL_CONSTASCII_USTRINGPARAM("add_to_recently_used_file_list"));
+    const rtl::OUString LIB_RECENT_FILE(RTL_CONSTASCII_USTRINGPARAM("librecentfile.so"));
+    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
+
+    PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
+
+    osl::Module module;
+    module.loadRelative( &thisModule, LIB_RECENT_FILE );
+    if (module.is())
+        add_to_recently_used_file_list = (PFUNC_ADD_TO_RECENTLY_USED_LIST)module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST);
+    if (add_to_recently_used_file_list)
+        add_to_recently_used_file_list(rFileUrl, rMimeType);
+}
diff -ru shell.orig/prj/d.lst shell/prj/d.lst
--- shell.orig/prj/d.lst	2009-08-17 14:50:14.000000000 +0100
+++ shell/prj/d.lst	2009-08-17 14:53:04.000000000 +0100
@@ -1,7 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\shell
-
-..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx
-
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
diff -ru shell.orig/source/unix/sysshell/makefile.mk shell/source/unix/sysshell/makefile.mk
--- shell.orig/source/unix/sysshell/makefile.mk	2009-08-17 14:50:17.000000000 +0100
+++ shell/source/unix/sysshell/makefile.mk	2009-08-17 15:33:43.000000000 +0100
@@ -48,10 +48,6 @@
 
 .IF "$(OS)" != "MACOSX"
 
-LIB1OBJFILES=$(SLO)$/systemshell.obj
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
-
 SLOFILES=$(SLO)$/recently_used_file.obj \
          $(SLO)$/recently_used_file_handler.obj
 
diff -ru shell.orig/source/unix/sysshell/recently_used_file_handler.cxx shell/source/unix/sysshell/recently_used_file_handler.cxx
--- shell.orig/source/unix/sysshell/recently_used_file_handler.cxx	2009-08-17 14:50:17.000000000 +0100
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx	2009-08-17 15:34:56.000000000 +0100
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
  
-#include "systemshell.hxx"
 #include "osl/process.h"
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
diff -ru sfx2.orig/inc/pch/precompiled_sfx2.hxx sfx2/inc/pch/precompiled_sfx2.hxx
--- sfx2.orig/inc/pch/precompiled_sfx2.hxx	2009-08-17 14:51:35.000000000 +0100
+++ sfx2/inc/pch/precompiled_sfx2.hxx	2009-08-17 15:38:12.000000000 +0100
@@ -484,7 +484,6 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
 #include "sj2/sjapplet.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
diff -ru sfx2.orig/prj/build.lst sfx2/prj/build.lst
--- sfx2.orig/prj/build.lst	2009-08-17 14:51:16.000000000 +0100
+++ sfx2/prj/build.lst	2009-08-17 14:53:21.000000000 +0100
@@ -1,4 +1,4 @@
-sf      sfx2    :       idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg NULL
+sf      sfx2    :       idl basic xmlscript framework setup_native sax SYSTRAY_GTK:libegg NULL
 sf	sfx2									usr1	-	all	sf_mkout NULL
 sf	sfx2\inc								nmake	-	all	sf_inc NULL
 sf	sfx2\prj								get		-	all	sf_prj NULL
diff -ru sfx2.orig/source/appl/sfxpicklist.cxx sfx2/source/appl/sfxpicklist.cxx
--- sfx2.orig/source/appl/sfxpicklist.cxx	2009-08-17 14:51:30.000000000 +0100
+++ sfx2/source/appl/sfxpicklist.cxx	2009-08-17 15:38:30.000000000 +0100
@@ -43,8 +43,6 @@
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <shell/systemshell.hxx>
-
 // ----------------------------------------------------------------------------
 
 #include <sfx2/app.hxx>
@@ -470,7 +468,7 @@
                 pDocSh->Get_Impl()->bWaitingForPicklist = sal_False;
 
                 if ( aURL.GetProtocol() == INET_PROT_FILE )
-                    SystemShell::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
+                    Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
 			}
             break;
 		}
diff -ru sfx2.orig/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
--- sfx2.orig/source/doc/objstor.cxx	2009-08-17 14:51:30.000000000 +0100
+++ sfx2/source/doc/objstor.cxx	2009-08-17 15:38:28.000000000 +0100
@@ -99,7 +99,6 @@
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <shell/systemshell.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/documentconstants.hxx>
@@ -820,7 +819,7 @@
                 if ( aUrl.GetProtocol() == INET_PROT_FILE )
                 {
                     const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
-                    SystemShell::AddToRecentDocumentList(
+                    Application::AddToRecentDocumentList(
                         aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
                         (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
                 }
diff -ru sfx2.orig/util/makefile.mk sfx2/util/makefile.mk
--- sfx2.orig/util/makefile.mk	2009-08-17 14:51:39.000000000 +0100
+++ sfx2/util/makefile.mk	2009-08-17 15:36:35.000000000 +0100
@@ -87,7 +87,6 @@
 		$(TOOLSLIB) \
 		$(I18NISOLANGLIB) \
 		$(SAXLIB) \
-		$(SYSSHELLLIB) \
 		$(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
 		$(CPPUHELPERLIB) \
diff -ru solenv.orig/inc/libs.mk solenv/inc/libs.mk
--- solenv.orig/inc/libs.mk	2009-08-17 14:51:30.000000000 +0100
+++ solenv/inc/libs.mk	2009-08-17 14:51:57.000000000 +0100
@@ -274,7 +274,6 @@
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-SYSSHELLLIB=-lsysshell
 .IF "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -485,7 +484,6 @@
 FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
-SYSSHELLLIB=sysshell.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = cppunit.lib
 XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
diff -ru postprocess.orig/prj/build.lst postprocess/prj/build.lst
--- postprocess.orig/prj/build.lst	2009-08-17 14:53:51.000000000 +0100
+++ postprocess/prj/build.lst	2009-08-17 14:54:09.000000000 +0100
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native shell slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -p -r1.1926 -r1.1927
--- openoffice.org.spec	25 Jul 2009 15:26:04 -0000	1.1926
+++ openoffice.org.spec	18 Aug 2009 07:48:29 -0000	1.1927
@@ -151,6 +151,7 @@ Patch75: workspace.calc311fixes.patch
 Patch76: openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
 Patch77: openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch
 Patch78: workspace.os132.patch
+Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1660,6 +1661,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch76 -p0 -b .oooXXXXX.svx.64bit.patch
 %patch77 -p0 -b .ooo103651.canvas.nosubpixel.patch
 %patch78 -p0 -b .workspace.os132.patch
+%patch79 -p0 -b .openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,9 +4164,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Jul 25 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+* Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
 - Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
 - add workspace.os132.patch to avoid switch html view overwrite horror
+- Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 
 * Thu Jul 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch



From caolanm at fedoraproject.org  Tue Aug 18 07:58:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 07:58:04 +0000 (UTC)
Subject: rpms/hunspell-uk/devel .cvsignore, 1.4, 1.5 hunspell-uk.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090818075804.DBB5711C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-uk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28366

Modified Files:
	.cvsignore hunspell-uk.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Jan 2009 23:00:08 -0000	1.4
+++ .cvsignore	18 Aug 2009 07:58:04 -0000	1.5
@@ -1 +1 @@
-myspell-uk_UA-1.5.7.zip
+myspell-uk_UA-1.6.0.zip


Index: hunspell-uk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/hunspell-uk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hunspell-uk.spec	25 Jul 2009 02:44:47 -0000	1.5
+++ hunspell-uk.spec	18 Aug 2009 07:58:04 -0000	1.6
@@ -1,7 +1,7 @@
 Name: hunspell-uk
 Summary: Ukrainian hunspell dictionaries
-Version: 1.5.7
-Release: 3%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/ispell-uk/myspell-uk_UA-%{version}.zip
 Group: Applications/Text
 URL: http://sourceforge.net/projects/ispell-uk
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Aug 18 2009 Caolan McNamara <caolanm at redhat.com> - 1.6.0-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Jan 2009 23:00:08 -0000	1.4
+++ sources	18 Aug 2009 07:58:04 -0000	1.5
@@ -1 +1 @@
-1e067400ca6a3414d232c10ef1300293  myspell-uk_UA-1.5.7.zip
+a5c6619dc621fd3ef3a2af7f79b7c7b4  myspell-uk_UA-1.6.0.zip



From caolanm at fedoraproject.org  Tue Aug 18 07:59:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 07:59:51 +0000 (UTC)
Subject: rpms/mythes-uk/devel .cvsignore, 1.2, 1.3 mythes-uk.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090818075951.C4D5811C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-uk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28859

Modified Files:
	.cvsignore mythes-uk.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-uk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Feb 2009 23:14:27 -0000	1.2
+++ .cvsignore	18 Aug 2009 07:59:51 -0000	1.3
@@ -1 +1 @@
-spell-uk-1.5.7.tgz
+spell-uk-1.6.0.tgz


Index: mythes-uk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-uk/devel/mythes-uk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mythes-uk.spec	25 Jul 2009 15:41:04 -0000	1.3
+++ mythes-uk.spec	18 Aug 2009 07:59:51 -0000	1.4
@@ -1,7 +1,7 @@
 Name: mythes-uk
 Summary: Ukrainian thesaurus
-Version: 1.5.7
-Release: 3%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/ispell-uk/spell-uk-%{version}.tgz
 Group: Applications/Text
 URL: http://sourceforge.net/projects/ispell-uk
@@ -36,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1.6.0-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-uk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Feb 2009 23:14:27 -0000	1.2
+++ sources	18 Aug 2009 07:59:51 -0000	1.3
@@ -1 +1 @@
-e2a931292b6c740f35668cf5f9f50fdc  spell-uk-1.5.7.tgz
+4177ed3e196e6511513cf358c4a42e1a  spell-uk-1.6.0.tgz



From twaugh at fedoraproject.org  Tue Aug 18 08:03:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 08:03:16 +0000 (UTC)
Subject: rpms/foomatic-db/devel foomatic-db.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090818080316.33BA311C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29765/devel

Modified Files:
	.cvsignore sources 
Added Files:
	foomatic-db.spec import.log 
Log Message:
Initial import.


--- NEW FILE foomatic-db.spec ---
%define dbver_rel 4.0
%define dbver_snap 20090702
%define hpijsver 20090701

Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 3.%{dbver_snap}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-ppds = %{version}-%{release}

Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz

Url: http://www.openprinting.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

# 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
This is the database of printers, printer drivers, and driver options
for Foomatic.

The site http://www.openprinting.org/ is based on this database.

%package filesystem
Summary: Directory layout for the foomatic package
License: Public Domain
Group: System Environment/Base

%description filesystem

Directory layout for the foomatic package.

%package ppds
Summary: PPDs from printer manufacturers
License: GPLv2+ and MIT
Group: System Environment/Libraries
# We ship a symlink in a directory owned by cups
BuildRequires: cups
Requires: cups
Requires: sed
Requires: %{name}-filesystem = %{version}-%{release}

%description ppds
PPDs from printer manufacturers.

%prep
%setup -q -c -a 1

find -type d | xargs chmod g-s

pushd foomatic-db-%{dbver_snap}
cd db/source

# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml

# 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
do
  find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
  rm -f driver/foo2${x}.xml opt/foo2${x}-*
done
# Same for m2300w/m2400w
find printer -name '*.xml' |xargs grep -l '<driver>m2[34]00w<'|xargs rm -vf
rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-*
# Same for all these.
for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j
do
  find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
  rm -vf driver/${x}.xml opt/${x}-*
done

# Use sed instead of perl in the PPDs (bug #512739).
find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
popd

%build
pushd foomatic-db-%{dbver_snap}
%configure
make PREFIX=%{_prefix}
popd

pushd foomatic-db-hpijs-%{hpijsver}
%configure
make PREFIX=%{_prefix}
popd

%install
rm -rf $RPM_BUILD_ROOT

pushd foomatic-db-%{dbver_snap}
make	DESTDIR=%buildroot PREFIX=%{_prefix} \
	install
popd

pushd foomatic-db-hpijs-%{hpijsver}
make	DESTDIR=%buildroot PREFIX=%{_prefix} \
	install
popd

# Remove ghostscript UPP drivers that are gone in 7.07
rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml

find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644

mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom

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

# Convert absolute symlink to relative.
rm -f %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds
ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds

%clean
rm -rf %{buildroot}

%files filesystem
%defattr(-,root,root,-)
%dir %{_datadir}/foomatic
%dir %{_datadir}/foomatic/db
%dir %{_datadir}/foomatic/db/source

%files
%defattr(-,root,root,-)
%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.txt
%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
%doc foomatic-db-%{dbver_snap}/README
%doc foomatic-db-%{dbver_snap}/COPYING
%{_datadir}/foomatic/db/oldprinterids
%{_datadir}/foomatic/db/source/printer
%{_datadir}/foomatic/db/source/driver
%{_datadir}/foomatic/db/source/opt

%files ppds
%defattr(-,root,root,-)
%{_datadir}/foomatic/db/source/PPD
%{_datadir}/cups/model/foomatic-db-ppds

%changelog
* Mon Aug 17 2009 Tim Waugh <twaugh at redhat.com> 4.0-3.20090702
- License for ppds sub-package should include GPLv2+.
- Ship COPYING file in main package.
- Added filesystem sub-package for directory ownership.

* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 4.0-2.20090702
- Move foomatic-db-ppds symlink to ppds sub-package.
- Use sed instead of perl in raster PPDs (bug #512739).
- Removed code to convert old-style printer IDs (there are none).
- Ship README file.

* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 4.0-1.20090702
- Split database out from main foomatic package.


--- NEW FILE import.log ---
foomatic-db-4_0-3_20090702_fc12:HEAD:foomatic-db-4.0-3.20090702.fc12.src.rpm:1250582507


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Aug 2009 18:27:04 -0000	1.1
+++ .cvsignore	18 Aug 2009 08:03:15 -0000	1.2
@@ -0,0 +1,2 @@
+foomatic-db-4.0-20090702.tar.gz
+foomatic-db-hpijs-20090701.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Aug 2009 18:27:04 -0000	1.1
+++ sources	18 Aug 2009 08:03:15 -0000	1.2
@@ -0,0 +1,2 @@
+df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz



From beekhof at fedoraproject.org  Tue Aug 18 08:24:42 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Tue, 18 Aug 2009 08:24:42 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.12,
	1.13 resource-agents.spec, 1.13, 1.14 sources, 1.12, 1.13
Message-ID: <20090818082442.965CA11C00D7@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2531

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
Update Pacemaker resource agents, include ldirectord


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Aug 2009 19:34:00 -0000	1.12
+++ .cvsignore	18 Aug 2009 08:24:40 -0000	1.13
@@ -1,2 +1,2 @@
+2198dc90bec4.tar.bz2
 resource-agents-3.0.0.tar.gz
-3aa338887920.tar.bz2


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- resource-agents.spec	12 Aug 2009 19:34:00 -0000	1.13
+++ resource-agents.spec	18 Aug 2009 08:24:40 -0000	1.14
@@ -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 3aa338887920
+%define altversion 2198dc90bec4
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.0
-Release: 15%{?alphatag:.%{alphatag}}%{?dist}
+Release: 16%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -44,6 +44,35 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 
+%description
+A set of scripts to interface with several services to operate in a
+High Availability environment for both Pacemaker and rgmanager
+service managers.
+
+%package -n ldirectord
+Summary:          Monitor daemon for maintaining high availability resources
+Group:            System Environment/Daemons
+Requires:         ipvsadm
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig
+
+# We were originally ldirectord, then renamed with a heartbeat- prefix.
+# Upstream maintainer wishes to use no prefix, which is consistent with 
+# how it is packaged for other distributions
+Provides:  ldirectord = 3.0.0-15
+Obsoletes: ldirectord < 3.0.0-15
+Provides:  heartbeat-ldirectord = 3.0.0-15
+Obsoletes: heartbeat-ldirectord < 3.0.0-15
+
+# removed for now until it's in Fedora
+#Requires:  perl(Net::IMAP::Simple::SSL)
+
+%description -n ldirectord
+ldirectord is a stand-alone daemon to monitor services of real 
+for virtual services provided by The Linux Virtual Server
+(http://www.linuxvirtualserver.org/). It is simple to install 
+and works with the heartbeat code (http://www.linux-ha.org/).
+
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
@@ -61,9 +90,7 @@ BuildRequires: automake autoconf pkgconf
 # prepare pacemaker RAs
 cd %{altprefix}%{altversion}
 ./autogen.sh
-%{_configure} \
-	CFLAGS="$(echo '%{optflags}')" \
-	--enable-fatal-warnings=no
+%{configure} --enable-fatal-warnings=no
 
 %build
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -88,10 +115,13 @@ chmod 755 %{buildroot}/%{_datadir}/clust
 %clean
 rm -rf %{buildroot}
 
-%description
-A set of scripts to interface with several services to operate in a
-High Availability environment for both Pacemaker and rgmanager
-service managers.
+%post -n ldirectord
+/sbin/chkconfig --add ldirectord
+
+%postun -n ldirectord -p /sbin/ldconfig
+
+%preun -n ldirectord
+/sbin/chkconfig --del ldirectord
 
 %files
 %defattr(-,root,root,-)
@@ -105,14 +135,49 @@ service managers.
 %{_sbindir}/ocf-tester
 %{_sbindir}/sfex_init
 
-%dir %{_datadir}/glue
-%doc %{_datadir}/glue/ra-api-1.dtd
+%dir %{_datadir}/resource-agents
+%doc %{_datadir}/resource-agents/ra-api-1.dtd
 
 %dir %{_libdir}/heartbeat
+%{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
 %{_libdir}/heartbeat/sfex_daemon
 
+%files -n ldirectord
+%defattr(-,root,root,-)
+%doc %{altprefix}%{altversion}/COPYING 
+%doc %{altprefix}%{altversion}/ldirectord/ldirectord.cf
+%{_sbindir}/ldirectord
+%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
+%{_sysconfdir}/init.d/ldirectord
+%{_sysconfdir}/ha.d/resource.d/ldirectord
+%{_mandir}/man8/ldirectord.8*
+/usr/lib/ocf/resource.d/heartbeat/ldirectord
+
 %changelog
+* Tue Aug 18 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-16
+- Create an ldirectord package
+- Update Pacameker agents to upstream version: 2198dc90bec4
+  + Build: Import ldirectord.
+  + Ensure HA_VARRUNDIR has a value to substitute
+  + High: Add findif tool (mandatory for IPaddr/IPaddr2)
+  + High: IPv6addr: new nic and cidr_netmask parameters
+  + High: postfix: new resource agent
+  + Include license information
+  + Low (LF 2159): Squid: make the regexp match more precisely output of netstat
+  + Low: configure: Fix package name.
+  + Low: ldirectord: add dependency on $remote_fs.
+  + Low: ldirectord: add mandatory required header to init script.
+  + Medium (LF 2165): IPaddr2: remove all colons from the mac address before passing it to send_arp
+  + Medium: VirtualDomain: destroy domain shortly before timeout expiry
+  + Medium: shellfuncs: Make the mktemp wrappers work.
+  + Remove references to Echo function
+  + Remove references to heartbeat shellfuncs.
+  + Remove useless path lookups
+  + findif: actually include the right header. Simplify configure.
+  + ldirectord: Remove superfluous configure artifact.
+  + ocf-tester: Fix package reference and path to DTD.
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.0.0-15
 - Use bzipped upstream hg tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 Aug 2009 19:34:00 -0000	1.12
+++ sources	18 Aug 2009 08:24:40 -0000	1.13
@@ -1,2 +1,2 @@
+af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2
 485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
-33048577b70aca705a62677e54c1d339  3aa338887920.tar.bz2



From twaugh at fedoraproject.org  Tue Aug 18 08:42:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 08:42:46 +0000 (UTC)
Subject: rpms/foomatic-db/devel foomatic-db-epson-stylus-color-200.patch,
	NONE, 1.1 foomatic-db.spec, 1.1, 1.2
Message-ID: <20090818084246.2A5BA11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6691

Modified Files:
	foomatic-db.spec 
Added Files:
	foomatic-db-epson-stylus-color-200.patch 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0-4.20090702
- Use stcolor driver for Epson Stylus Color 200 (bug #513676).


foomatic-db-epson-stylus-color-200.patch:
 driver/stcolor.xml                 |    3 +++
 printer/Epson-Stylus_Color_200.xml |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE foomatic-db-epson-stylus-color-200.patch ---
diff -up foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/driver/stcolor.xml
--- foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200	2009-07-02 08:49:20.000000000 +0100
+++ foomatic-db-20090702/db/source/driver/stcolor.xml	2009-08-04 16:08:19.378201381 +0100
@@ -22,6 +22,9 @@ better dithering. Try it.</en>
    <id>printer/Epson-Stylus_Color</id><!-- Epson Stylus Color -->
   </printer>
   <printer>
+   <id>printer/Epson-Stylus_Color_200</id><!-- Epson Stylus Color 200 -->
+  </printer>
+  <printer>
    <id>printer/Epson-Stylus_Color_300</id><!-- Epson Stylus Color 300 -->
    <comments>
     <en>Works with the "-dMicroweave" option.</en>
diff -up foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml
--- foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200	2009-07-02 08:49:23.000000000 +0100
+++ foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml	2009-08-04 16:08:19.382201394 +0100
@@ -19,7 +19,7 @@
   <autodetect></autodetect>
   <functionality>B</functionality>
   <!--not "unverified"-->
-  <driver>mj500c</driver>
+  <driver>stcolor</driver>
   <comments>
     <en>Imported from old Red Hat japanese printer database</en>
     </comments>


Index: foomatic-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/foomatic-db.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- foomatic-db.spec	18 Aug 2009 08:03:15 -0000	1.1
+++ foomatic-db.spec	18 Aug 2009 08:42:45 -0000	1.2
@@ -5,7 +5,7 @@
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 3.%{dbver_snap}%{?dist}
+Release: 4.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -14,6 +14,8 @@ Requires: %{name}-ppds = %{version}-%{re
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
 Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
+Patch1: foomatic-db-epson-stylus-color-200.patch
+
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -57,6 +59,9 @@ PPDs from printer manufacturers.
 find -type d | xargs chmod g-s
 
 pushd foomatic-db-%{dbver_snap}
+
+%patch1 -p1 -b .epson-stylus-color-200
+
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -148,6 +153,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0-4.20090702
+- Use stcolor driver for Epson Stylus Color 200 (bug #513676).
+
 * Mon Aug 17 2009 Tim Waugh <twaugh at redhat.com> 4.0-3.20090702
 - License for ppds sub-package should include GPLv2+.
 - Ship COPYING file in main package.



From twaugh at fedoraproject.org  Tue Aug 18 08:43:37 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 08:43:37 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec, 1.221,
	1.222 foomatic-epson-stylus-color-200.patch, 1.1, NONE
Message-ID: <20090818084337.4977A11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6943

Modified Files:
	foomatic.spec 
Removed Files:
	foomatic-epson-stylus-color-200.patch 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
- Split out foomatic-db into separate source package.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- foomatic.spec	4 Aug 2009 15:27:54 -0000	1.221
+++ foomatic.spec	18 Aug 2009 08:43:37 -0000	1.222
@@ -1,5 +1,3 @@
-%define dbver_rel 4.0
-%define dbver_snap 20090702
 %define enginever 4.0.2
 %define filtersver 4.0.2
 %define hpijsver 20090701
@@ -7,19 +5,13 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
-# Generated by:
-# NOW=`date '+%Y%m%d'`
-# cvs -d:pserver:anonymous at cvs.linuxprinting.org:/usr/local/cvs export -D $NOW foomatic
-# 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-%{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)
 
@@ -39,9 +31,6 @@ Patch102: foomatic-bad-utf8.patch
 
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
-## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)
-Patch301: foomatic-epson-stylus-color-200.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -58,17 +47,7 @@ PreReq: fileutils initscripts
 # foomatic-filters checks for a conversion utility (bug #124931).
 BuildRequires: mpage
 
-# We need ghostscript to have the gimp-print-4.2.0 driver, and hpijs 1.1.
-Conflicts: ghostscript < 7.05
-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.
+Requires: foomatic-db
 
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
@@ -85,7 +64,7 @@ queues (foomatic-configure) and to print
 The site http://www.linuxprinting.org/ is based on this database.
 
 %prep
-%setup -q -c -a 1 -a 2 -a 3
+%setup -q -c -a 1
 
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
@@ -98,36 +77,6 @@ chmod a+x mkinstalldirs
 %patch102 -p1
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-popd
-
-pushd foomatic-db-%{dbver_snap}
-%patch301 -p1 -b .epson-stylus-color-200
-
-cd db/source
-
-# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
-perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml
-
-# 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
-do
-  find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
-  rm -f driver/foo2${x}.xml opt/foo2${x}-*
-done
-# Same for m2300w/m2400w
-find printer -name '*.xml' |xargs grep -l '<driver>m2[34]00w<'|xargs rm -vf
-rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-*
-# Same for all these.
-for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j
-do
-  find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
-  rm -vf driver/${x}.xml opt/${x}-*
-done
-
-popd
-
 %build
 export LIB_CUPS=/usr/lib/cups               # /usr/lib NOT libdir
 export CUPS_BACKENDS=/usr/lib/cups/backend  # /usr/lib NOT libdir
@@ -144,16 +93,6 @@ pushd foomatic-db-engine-%{enginever}
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
-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"
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -175,42 +114,9 @@ make	DESTDIR=%buildroot PREFIX=%{_prefix
 	install
 popd
 
-pushd foomatic-db-%{dbver_snap}
-make	DESTDIR=%buildroot PREFIX=%{_prefix} \
-	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
-	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
-	install
-
-popd
-
-pushd foomatic-db-hpijs-%{hpijsver}
-make	DESTDIR=%buildroot PREFIX=%{_prefix} \
-	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
-	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
-	install
-popd
-
-# Remove ghostscript UPP drivers that are gone in 7.07
-rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
-
-# Remove drivers with no command line.
-pushd foomatic-db-engine-%{enginever}
-perl -Ilib ./foomatic-cleanupdrivers %{buildroot}%{_datadir}/foomatic
-popd
-
-# Update any old-style printer IDs still left around.
-echo '#!/usr/bin/perl -pi' > convert-printerids.pl
-sed -e 's|^\(.*\) \(.*\)$|s,printer/\1,printer/\2,g;|' \
-	%{buildroot}%{_datadir}/foomatic/db/oldprinterids \
-	>> convert-printerids.pl
-chmod a+x convert-printerids.pl
-./convert-printerids.pl %{buildroot}%{_datadir}/foomatic/db/source/{opt,driver}/*.xml
-find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644
-
 # Use relative, not absolute, symlink for CUPS filter.
 ln -sf ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip
 
-mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom
 mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic
 
 echo cups > $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/defaultspooler
@@ -218,11 +124,9 @@ echo cups > $RPM_BUILD_ROOT%{_sysconfdir
 # Remove things we don't ship.
 rm -rf	$RPM_BUILD_ROOT%{_libdir}/perl5/site_perl \
 	$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
+	$RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample \
+	$RPM_BUILD_ROOT%{_datadir}/foomatic/templates
+find $RPM_BUILD_ROOT -name .packlist | xargs rm -f
 
 %post
 /bin/rm -f /var/cache/foomatic/*
@@ -241,12 +145,13 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic
 %dir /usr/lib/cups
 /usr/lib/cups/*
-%{_datadir}/foomatic
-%{_datadir}/cups/model/foomatic-db-ppds
 %{_mandir}/*/*
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
+- Split out foomatic-db into separate source package.
+
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
 - Use stcolor driver for Epson Stylus Color 200 (bug #513676).
 - Don't ship 3-distribution symlink as CUPS already searches


--- foomatic-epson-stylus-color-200.patch DELETED ---



From twaugh at fedoraproject.org  Tue Aug 18 08:49:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 08:49:24 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.222,1.223
Message-ID: <20090818084924.6403E11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8678

Modified Files:
	foomatic.spec 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
- Split out foomatic-db into separate source package (bug #461234).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- foomatic.spec	18 Aug 2009 08:43:37 -0000	1.222
+++ foomatic.spec	18 Aug 2009 08:49:24 -0000	1.223
@@ -150,7 +150,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 
 %changelog
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
-- Split out foomatic-db into separate source package.
+- Split out foomatic-db into separate source package (bug #461234).
 
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
 - Use stcolor driver for Epson Stylus Color 200 (bug #513676).



From pnemade at fedoraproject.org  Tue Aug 18 08:49:25 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 18 Aug 2009 08:49:25 +0000 (UTC)
Subject: rpms/m17n-lib/F-11 .cvsignore, 1.11, 1.12 m17n-lib.spec, 1.24,
	1.25 sources, 1.13, 1.14
Message-ID: <20090818084925.A561A11C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-lib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8627

Modified Files:
	.cvsignore m17n-lib.spec sources 
Log Message:
* Tue Aug 18 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
- update to new upstream release 1.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Mar 2009 04:45:29 -0000	1.11
+++ .cvsignore	18 Aug 2009 08:49:25 -0000	1.12
@@ -1 +1 @@
-m17n-lib-1.5.4.tar.gz
+m17n-lib-1.5.5.tar.gz


Index: m17n-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/F-11/m17n-lib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- m17n-lib.spec	3 Mar 2009 04:45:29 -0000	1.24
+++ m17n-lib.spec	18 Aug 2009 08:49:25 -0000	1.25
@@ -4,7 +4,7 @@
 %define with_examples 0
 
 Name:    m17n-lib
-Version:  1.5.4
+Version:  1.5.5
 Release:  1%{?dist}
 Summary:  Multilingual text library
 
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
+- update to new upstream release 1.5.5
+
 * Tue Mar 03 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-1
 - Update to new upstream release 1.5.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Mar 2009 04:45:29 -0000	1.13
+++ sources	18 Aug 2009 08:49:25 -0000	1.14
@@ -1 +1 @@
-f7ef72fc1e084c6fc6fb3ba9663fd151  m17n-lib-1.5.4.tar.gz
+924875cfc30ac6620744b67385ecc144  m17n-lib-1.5.5.tar.gz



From twaugh at fedoraproject.org  Tue Aug 18 09:03:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 09:03:01 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.218,1.219
Message-ID: <20090818090301.114EC11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11910

Modified Files:
	hplip.spec 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
- Removed unnecessary dependency on PyQt as we only use PyQt4 now.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- hplip.spec	12 Aug 2009 22:20:44 -0000	1.218
+++ hplip.spec	18 Aug 2009 09:03:00 -0000	1.219
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -57,7 +57,6 @@ Libraries needed by HPLIP.
 Summary: HPLIP graphical tools
 Group: Applications/System
 License: BSD
-Requires: PyQt
 Requires: PyQt4
 Requires: python-reportlab
 Requires(post): desktop-file-utils >= 0.2.92
@@ -314,6 +313,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+- Removed unnecessary dependency on PyQt as we only use PyQt4 now.
+
 * Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
 - Upstream patch to fix paper size order and LJColor device class
   color space.



From twaugh at fedoraproject.org  Tue Aug 18 09:03:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 09:03:22 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.216,1.217
Message-ID: <20090818090322.289FA11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12040

Modified Files:
	hplip.spec 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
- Removed unnecessary dependency on PyQt as we only use PyQt4 now.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- hplip.spec	12 Aug 2009 22:21:20 -0000	1.216
+++ hplip.spec	18 Aug 2009 09:03:21 -0000	1.217
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -57,7 +57,6 @@ Libraries needed by HPLIP.
 Summary: HPLIP graphical tools
 Group: Applications/System
 License: BSD
-Requires: PyQt
 Requires: PyQt4
 Requires: python-reportlab
 Requires(post): desktop-file-utils >= 0.2.92
@@ -314,6 +313,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+- Removed unnecessary dependency on PyQt as we only use PyQt4 now.
+
 * Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4
 - Upstream patch to fix paper size order and LJColor device class
   color space.



From jmoskovc at fedoraproject.org  Tue Aug 18 09:06:03 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 18 Aug 2009 09:06:03 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.6, 1.7 abrt.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20090818090603.D3E0211C00D7@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12889

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Aug 2009 15:41:27 -0000	1.6
+++ .cvsignore	18 Aug 2009 09:06:03 -0000	1.7
@@ -1 +1 @@
-abrt-0.0.6.tar.gz
+abrt-0.0.7.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- abrt.spec	17 Aug 2009 15:41:27 -0000	1.8
+++ abrt.spec	18 Aug 2009 09:06:03 -0000	1.9
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 0.0.6
+Version: 0.0.7
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -22,6 +22,7 @@ BuildRequires: xmlrpc-c-devel
 BuildRequires: file-devel
 BuildRequires: python-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 %{name} is a tool to help users to detect defects in applications and
@@ -48,6 +49,9 @@ Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-python, pygtk2, pygtk2-libglade
+Provides: abrt-applet = %{version}-%{release}
+Obsoletes: abrt-applet < 0.0.5
+Conflicts: abrt-applet < 0.0.5
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -326,6 +330,10 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Aug 18 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.7-1
+- new version
+- added status window to show user some info after reporting a bug
+
 * Mon Aug 17 2009  Denys Vlasenko <dvlasenk at redhat.com> 0.0.6-1
 - new version
 - many fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Aug 2009 15:41:27 -0000	1.6
+++ sources	18 Aug 2009 09:06:03 -0000	1.7
@@ -1 +1 @@
-0c7760cb88a2719087846190faf370c6  abrt-0.0.6.tar.gz
+31be7e454451ebf8f173b4f7f851566f  abrt-0.0.7.tar.gz



From pnemade at fedoraproject.org  Tue Aug 18 08:52:22 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Tue, 18 Aug 2009 08:52:22 +0000 (UTC)
Subject: rpms/m17n-lib/devel m17n-lib.spec,1.26,1.27
Message-ID: <20090818085222.573AF11C00D7@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9225

Modified Files:
	m17n-lib.spec 
Log Message:
- remove unnecessary BR: m17n-db
- upstream now uses --without-gui option



Index: m17n-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- m17n-lib.spec	17 Aug 2009 06:43:57 -0000	1.26
+++ m17n-lib.spec	18 Aug 2009 08:52:22 -0000	1.27
@@ -14,7 +14,6 @@ URL:    http://www.m17n.org/m17n-lib/ind
 Source0:  http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  m17n-db >= 1.4.0
 %if %{with_gui}
 BuildRequires:  libxml2-devel, xorg-x11-devel
 BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0
@@ -56,7 +55,7 @@ autoreconf
 %build
 %configure --disable-static \
 %if ! %{with_gui}
-  --with-gui=no
+  --without-gui
 %else
   %{nil}
 %endif



From caolanm at fedoraproject.org  Tue Aug 18 08:40:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 08:40:20 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch,
	1.5, 1.6
Message-ID: <20090818084020.81F8311C04D1@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6187

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
doubled patch

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |   20 +++++++++++++++-----
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 make.c           |   15 ++++++++++-----
 6 files changed, 45 insertions(+), 20 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	10 Aug 2009 15:33:17 -0000	1.5
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	18 Aug 2009 08:40:20 -0000	1.6
@@ -211,17 +211,3 @@ diff -ru dmake.orig/path.c dmake/path.c
  	 p = n;
        }
        /* Look for an escape sequence and replace it by it's corresponding
---- dmake.orig/expand.c	2009-08-10 15:02:31.000000000 +0100
-+++ dmake/expand.c	2009-08-10 15:02:36.000000000 +0100
-@@ -727,8 +727,10 @@
- 	      done = !lev;
- 	      break;
-             } else {
-+	      size_t len;
- 	      s[1] = ' ';
--	      strcpy( s, s+1 );
-+	      len = strlen(s+1)+1;
-+	      memmove( s, s+1, len );
- 	    }
- 	    /*FALLTHRU*/
- 	 case ' ':



From jwrdegoede at fedoraproject.org  Tue Aug 18 09:12:08 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 18 Aug 2009 09:12:08 +0000 (UTC)
Subject: rpms/astromenace/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090818091208.A5C1811C00D7@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/astromenace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14467

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Aug 18 2009 Hans de Goede <hdegoede at redhat.com> - 1.2-13
- Switch to openal-soft



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/astromenace/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Jun 2008 17:47:55 -0000	1.5
+++ .cvsignore	18 Aug 2009 09:12:08 -0000	1.6
@@ -1 +1 @@
-AstroMenaceSourceCode_080519.zip
+AstroMenaceSourceCode_080519-clean.tar.xz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/astromenace/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Jun 2008 17:47:55 -0000	1.5
+++ sources	18 Aug 2009 09:12:08 -0000	1.6
@@ -1 +1 @@
-29c2d1dceafa7bca42b7cc8ce91528d9  AstroMenaceSourceCode_080519.zip
+a3d6fb8b24fb10cd9536fd934cec3194  AstroMenaceSourceCode_080519-clean.tar.xz



From pkgdb at fedoraproject.org  Tue Aug 18 09:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 09:02:37 +0000
Subject: [pkgdb] rome: akurtakov has requested commit
Message-ID: <20090818090237.B011610F881@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on rome (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From pkgdb at fedoraproject.org  Tue Aug 18 09:02:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 09:02:42 +0000
Subject: [pkgdb] rome: akurtakov has requested approveacls
Message-ID: <20090818090242.D23E210F88B@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on rome (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From pkgdb at fedoraproject.org  Tue Aug 18 09:02:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 09:02:36 +0000
Subject: [pkgdb] rome: akurtakov has requested watchcommits
Message-ID: <20090818090236.DEDE810F857@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on rome (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From pkgdb at fedoraproject.org  Tue Aug 18 09:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 09:02:37 +0000
Subject: [pkgdb] rome: akurtakov has requested watchbugzilla
Message-ID: <20090818090237.BE6CE10F882@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on rome (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From jorton at fedoraproject.org  Tue Aug 18 09:36:05 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 18 Aug 2009 09:36:05 +0000 (UTC)
Subject: rpms/subversion/devel subversion.spec,1.149,1.150
Message-ID: <20090818093606.04CDC11C00D7@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20119

Modified Files:
	subversion.spec 
Log Message:
* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 1.6.4-4
- rebuild



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- subversion.spec	12 Aug 2009 15:57:35 -0000	1.149
+++ subversion.spec	18 Aug 2009 09:36:04 -0000	1.150
@@ -15,7 +15,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -237,6 +237,7 @@ sed -i "/^dependency_libs/{
 %check
 export LANG=C LC_ALL=C
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
 make check check-swig-pl check-swig-py CLEANUP=yes
 # check-swig-rb omitted: it runs svnserve
 %endif
@@ -325,6 +326,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 1.6.4-4
+- rebuild
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.6.4-3
 - Use bzipped upstream tarball.
 



From jwrdegoede at fedoraproject.org  Tue Aug 18 09:04:22 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 18 Aug 2009 09:04:22 +0000 (UTC)
Subject: rpms/astromenace/devel astromenace-system-glext.patch, NONE,
	1.1 astromenace.spec, 1.10, 1.11
Message-ID: <20090818090422.E7E0211C00D7@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/astromenace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12345

Modified Files:
	astromenace.spec 
Added Files:
	astromenace-system-glext.patch 
Log Message:
* Tue Aug 18 2009 Hans de Goede <hdegoede at redhat.com> - 1.2-13
- Switch to openal-soft


astromenace-system-glext.patch:
 Base.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE astromenace-system-glext.patch ---
diff -up AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h~ AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h
--- AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h~	2007-09-03 12:42:03.000000000 +0200
+++ AstroMenaceSourceCode/AstroMenaceSource/Core/Base.h	2009-08-18 09:22:10.000000000 +0200
@@ -50,13 +50,15 @@
 	#include <GL/gl.h>	// Header File For The OpenGL32 Library
 	#include <GL/glu.h>	// Header File For The GLu32 Library
 	#undef __glext_h_
+	/* We want / need the OpenGL 1.3 function pointer typedefs */
+	#undef GL_VERSION_1_3
+	#include <GL/glext.h>
 #endif
 
 #include <stdlib.h> // rand, ...
 #include <math.h> // math for core Math
 
 
-#include "RendererInterface/GLext.h"
 #include "SDL/SDL.h"
 #include "SDL/SDL_thread.h"
 #include "SDL/SDL_syswm.h"


Index: astromenace.spec
===================================================================
RCS file: /cvs/extras/rpms/astromenace/devel/astromenace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- astromenace.spec	24 Jul 2009 17:24:55 -0000	1.10
+++ astromenace.spec	18 Aug 2009 09:04:22 -0000	1.11
@@ -1,21 +1,28 @@
 Name: astromenace
 Version:  1.2
-Release:  12%{?dist}
+Release:  13%{?dist}
 Summary: Hardcore 3D space shooter with spaceship upgrade possibilities  
 
 Group: Amusements/Games 
 License: GPLv3
 URL: http://www.viewizard.com/
-Source0: http://www.viewizard.com/download/AstroMenaceSourceCode_080519.zip
+# This is http://www.viewizard.com/download/AstroMenaceSourceCode_080519.zip
+# With the non Free (SGI Free Software License B) licensed:
+# AstroMenaceSource/Core/RendererInterface/GLext.h
+# file removed, instead we use the freely licensed system version
+Source0: AstroMenaceSourceCode_080519-clean.tar.xz
 Source1: astromenace.desktop
 Source2: astromenace.png
 Patch0: astromenace-langvfs.patch
 Patch1: astromenace-640x480.patch
 Patch2: astromenace-programmdir.patch
+# Use system glext.h and work around bug 517959
+Patch3: astromenace-system-glext.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-BuildRequires: cmake, SDL-devel, openal-devel, freealut-devel, libogg-devel
+BuildRequires: cmake, SDL-devel, libogg-devel
 BuildRequires: libvorbis-devel, libjpeg-devel, desktop-file-utils
+BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10
 Requires: astromenace-data = %{version}, opengl-games-utils
 
 %description
@@ -40,6 +47,7 @@ chmod -x gpl-3.0.txt
 %patch0 -p0
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %build
 %cmake .
@@ -85,6 +93,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
 
 %changelog
+* Tue Aug 18 2009 Hans de Goede <hdegoede at redhat.com> - 1.2-13
+- Switch to openal-soft
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jmoskovc at fedoraproject.org  Tue Aug 18 09:03:51 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Tue, 18 Aug 2009 09:03:51 +0000 (UTC)
Subject: rpms/abrt/F-11 .cvsignore, 1.5, 1.6 abrt.spec, 1.7, 1.8 sources, 1.5,
	1.6
Message-ID: <20090818090351.6CE8511C00D7@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12189

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Jun 2009 11:59:41 -0000	1.5
+++ .cvsignore	18 Aug 2009 09:03:51 -0000	1.6
@@ -1 +1 @@
-abrt-0.0.4.tar.gz
+abrt-0.0.7.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-11/abrt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- abrt.spec	25 Jun 2009 12:24:44 -0000	1.7
+++ abrt.spec	18 Aug 2009 09:03:51 -0000	1.8
@@ -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.4
-Release: 3%{?dist}
+Version: 0.0.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -22,10 +22,11 @@ BuildRequires: xmlrpc-c-devel
 BuildRequires: file-devel
 BuildRequires: python-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
-%{name} is a tool to help users to detect defects in applications and 
-to create a bug report with all informations needed by maintainer to fix it. 
+%{name} is a tool to help users to detect defects in applications and
+to create a bug report with all informations needed by maintainer to fix it.
 It uses plugin system to extend its functionality.
 
 %package libs
@@ -43,21 +44,14 @@ Requires: %{name}-libs = %{version}-%{re
 %description devel
 Development libraries and headers for %{name}.
 
-%package applet
-Summary: %{name}'s applet
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gui
-
-%description applet
-Simple systray applet to notify user about new events detected by %{name} 
-daemon.
-
 %package gui
 Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-python, rhpl, pygtk2, pygtk2-libglade
+Requires: dbus-python, pygtk2, pygtk2-libglade
+Provides: abrt-applet = %{version}-%{release}
+Obsoletes: abrt-applet < 0.0.5
+Conflicts: abrt-applet < 0.0.5
 
 %description gui
 GTK+ wizard for convenient bug reporting.
@@ -69,7 +63,7 @@ Requires: gdb
 Requires: %{name} = %{version}-%{release}
 
 %description addon-ccpp
-This package contains hook for C/C++ crashed programs and %{name}'s C/C++ 
+This package contains hook for C/C++ crashed programs and %{name}'s C/C++
 analyzer plugin.
 
 %package addon-kerneloops
@@ -99,7 +93,7 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description plugin-sqlite3
-This package contains SQLite3 database plugin. It is used for storing the data 
+This package contains SQLite3 database plugin. It is used for storing the data
 required for creating a bug report.
 
 %package plugin-logger
@@ -118,7 +112,7 @@ Requires: mailx
 
 %description plugin-mailx
 The simple reporter plugin, which sends a report via mailx to a specified
-email. 
+email.
 
 %package plugin-runapp
 Summary: %{name}'s runapp plugin
@@ -128,6 +122,15 @@ Requires: %{name} = %{version}-%{release
 %description plugin-runapp
 Plugin to run external programs.
 
+%package plugin-sosreport
+Summary: %{name}'s sosreport plugin
+Group: System Environment/Libraries
+Requires: sos
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-sosreport
+Plugin to include an sosreport in an abrt report.
+
 %package plugin-bugzilla
 Summary: %{name}'s bugzilla plugin
 Group: System Environment/Libraries
@@ -162,6 +165,17 @@ Requires: %{name} = %{version}-%{release
 This package contains simple command line client for controling abrt daemon over
 the sockets.
 
+%package desktop
+Summary: Virtual package to install all necessary packages for usage from desktop environment
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-plugin-sqlite3, %{name}-plugin-bugzilla
+Requires: %{name}-gui, %{name}-addon-kerneloops
+Requires: %{name}-addon-ccpp, %{name}-addon-python
+
+%description desktop
+Virtual package to make easy default instalation on desktop environments.
+
 %prep
 %setup -q
 
@@ -186,6 +200,11 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/%{nam
 desktop-file-install \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
         src/Gui/%{name}.desktop
+
+desktop-file-install \
+        --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+        src/Applet/%{name}-applet.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -225,15 +244,13 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 
-%files applet
-%defattr(-,root,root,-)
-%{_bindir}/%{name}-applet
-
 %files gui
 %defattr(-,root,root,-)
 %{_bindir}/%{name}-gui
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_bindir}/%{name}-applet
+%{_sysconfdir}/xdg/autostart/%{name}-applet.desktop
 
 %files addon-ccpp
 %defattr(-,root,root,-)
@@ -244,6 +261,7 @@ fi
 %files addon-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf
+%{_bindir}/dumpoops
 %{_libdir}/%{name}/libKerneloops.so*
 %{_libdir}/%{name}/libKerneloopsScanner.so*
 %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz
@@ -252,6 +270,7 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf
 %{_libdir}/%{name}/libKerneloopsReporter.so*
+%{_libdir}/%{name}/KerneloopsReporter.GTKBuilder
 %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz
 
 %files plugin-sqlite3
@@ -264,12 +283,14 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Logger.conf
 %{_libdir}/%{name}/libLogger.so*
+%{_libdir}/%{name}/Logger.GTKBuilder
 %{_mandir}/man7/%{name}-Logger.7.gz
 
 %files plugin-mailx
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Mailx.conf
 %{_libdir}/%{name}/libMailx.so*
+%{_libdir}/%{name}/Mailx.GTKBuilder
 %{_mandir}/man7/%{name}-Mailx.7.gz
 
 %files plugin-runapp
@@ -277,10 +298,15 @@ fi
 %{_libdir}/%{name}/libRunApp.so*
 %{_mandir}/man7/%{name}-RunApp.7.gz
 
+%files plugin-sosreport
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libSOSreport.so*
+
 %files plugin-bugzilla
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf
 %{_libdir}/%{name}/libBugzilla.so*
+%{_libdir}/%{name}/Bugzilla.GTKBuilder
 %{_mandir}/man7/%{name}-Bugzilla.7.gz
 
 %files plugin-filetransfer
@@ -300,7 +326,21 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/abrt-cli
 
+%files desktop
+%defattr(-,root,root,-)
+
 %changelog
+* Tue Aug 18 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.7-1
+- new version
+- added status window to show user some info after reporting a bug
+
+* Mon Aug 17 2009  Denys Vlasenko <dvlasenk at redhat.com> 0.0.6-1
+- new version
+- many fixes
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 25 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.4-3
 - fixed dependencies in spec file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Jun 2009 11:59:41 -0000	1.5
+++ sources	18 Aug 2009 09:03:51 -0000	1.6
@@ -1 +1 @@
-630cecef41f67558173486e51236129a  abrt-0.0.4.tar.gz
+31be7e454451ebf8f173b4f7f851566f  abrt-0.0.7.tar.gz



From markmc at fedoraproject.org  Tue Aug 18 10:03:38 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 18 Aug 2009 10:03:38 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.120,1.121
Message-ID: <20090818100338.9A13D11C00D7@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24724

Modified Files:
	qemu.spec 
Log Message:
* Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.7.rc1
- Fix permissions on udev rules (#517571)



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- qemu.spec	17 Aug 2009 03:21:08 -0000	1.120
+++ qemu.spec	18 Aug 2009 10:03:38 -0000	1.121
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.6.%{kvmvertag}%{?dist}
+Release: 0.7.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -304,7 +304,7 @@ install -m 0755 kvm/user/kvmtrace $RPM_B
 install -m 0755 kvm/user/kvmtrace_format $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 kvm/kvm_stat $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 qemu-kvm $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 %endif
 
 make prefix="${RPM_BUILD_ROOT}%{_prefix}" \
@@ -484,8 +484,11 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.7.rc1
+- Fix permissions on udev rules (#517571)
+
 * Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 2:0.10.91-0.6.rc1
-- Allow blacklisting of kvm modules
+- Allow blacklisting of kvm modules (#517866)
 
 * Fri Aug  7 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.5.rc1
 - Fix virtio_net with -net user (#516022)



From ltinkl at fedoraproject.org  Tue Aug 18 10:04:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 10:04:20 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-copyrename.patch, NONE,
	1.1 kdelibs.spec, 1.503, 1.504
Message-ID: <20090818100420.A975311C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24819

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-copyrename.patch 
Log Message:
fix KDE bug #195385 - Copy file after rename use old file name


kdelibs-4.3.1-copyrename.patch:
 kio/kfileitem.cpp       |    3 +++
 tests/kdirmodeltest.cpp |    6 ++++++
 tests/kfileitemtest.cpp |   15 +++++++++++++++
 tests/kfileitemtest.h   |    1 +
 4 files changed, 25 insertions(+)

--- NEW FILE kdelibs-4.3.1-copyrename.patch ---
Index: kio/kio/kfileitem.cpp
===================================================================
--- kio/kio/kfileitem.cpp	(revision 1012563)
+++ kio/kio/kfileitem.cpp	(revision 1012564)
@@ -532,6 +532,9 @@
 {
     d->m_strName = name;
     d->m_strText = KIO::decodeFileName( d->m_strName );
+    if (d->m_entry.contains(KIO::UDSEntry::UDS_NAME))
+        d->m_entry.insert(KIO::UDSEntry::UDS_NAME, d->m_strName); // #195385
+
 }
 
 QString KFileItem::linkDest() const
Index: kio/tests/kfileitemtest.cpp
===================================================================
--- kio/tests/kfileitemtest.cpp	(revision 1012563)
+++ kio/tests/kfileitemtest.cpp	(revision 1012564)
@@ -241,6 +241,21 @@
     QVERIFY(fileItem.cmp(fileItem2));
 }
 
+void KFileItemTest::testRename()
+{
+    KIO::UDSEntry entry;
+    const QString origName = QString::fromLatin1("foo");
+    entry.insert(KIO::UDSEntry::UDS_NAME, origName);
+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+    KFileItem fileItem(entry, KUrl("/dir/foo"));
+    QCOMPARE(fileItem.name(), origName);
+    QCOMPARE(fileItem.text(), origName);
+    const QString newName = QString::fromLatin1("FiNeX_rocks");
+    fileItem.setName(newName);
+    QCOMPARE(fileItem.name(), newName);
+    QCOMPARE(fileItem.text(), newName);
+    QCOMPARE(fileItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), newName); // #195385
+}
 
 void KFileItemTest::testDecodeFileName_data()
 {
Index: kio/tests/kdirmodeltest.cpp
===================================================================
--- kio/tests/kdirmodeltest.cpp	(revision 1012563)
+++ kio/tests/kdirmodeltest.cpp	(revision 1012564)
@@ -418,6 +418,12 @@
     // check renaming happened
     QCOMPARE( m_dirModel->itemForIndex( m_secondFileIndex ).url().url(), newUrl.url() );
 
+    // check that KDirLister::cachedItemForUrl won't give a bad name if copying that item (#195385)
+    KFileItem cachedItem = KDirLister::cachedItemForUrl(newUrl);
+    Q_ASSERT(!cachedItem.isNull());
+    QCOMPARE(cachedItem.name(), QString("toplevelfile_2_renamed"));
+    QCOMPARE(cachedItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), QString("toplevelfile_2_renamed"));
+
     // Put things back to normal
     job = KIO::rename(newUrl, url, KIO::HideProgressInfo);
     ok = job->exec();
Index: kio/tests/kfileitemtest.h
===================================================================
--- kio/tests/kfileitemtest.h	(revision 1012563)
+++ kio/tests/kfileitemtest.h	(revision 1012564)
@@ -35,6 +35,7 @@
     void testHiddenFile();
     void testMimeTypeOnDemand();
     void testCmp();
+    void testRename();
 
     void testDecodeFileName_data();
     void testDecodeFileName();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -p -r1.503 -r1.504
--- kdelibs.spec	17 Aug 2009 11:11:29 -0000	1.503
+++ kdelibs.spec	18 Aug 2009 10:04:20 -0000	1.504
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,8 @@ Patch101: kdelibs-4.3.1-kdebug#199557.pa
 Patch102: kdelibs-4.3.1-unmountfix.patch
 # http://bugs.kde.org/170608
 Patch103: kdelibs-4.3.1-copyurls.patch
+#?http://bugs.kde.org/195385
+Patch104: kdelibs-4.3.1-copyrename.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -228,6 +230,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch101 -p4 -b .kdebug#199557
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
+%patch104 -p0 -b .copyrename
 
 %build
 
@@ -409,6 +412,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0.5
+- fix KDE bug #19538, copy file after rename uses old file name
+
 * Mon Aug 17 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
 - fix unmounting devices
 - fix copying URLs to clipboard (kdebug:170608)



From markmc at fedoraproject.org  Tue Aug 18 10:06:18 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 18 Aug 2009 10:06:18 +0000 (UTC)
Subject: rpms/qemu/F-11 kvm.modules,1.1,1.2 qemu.spec,1.99,1.100
Message-ID: <20090818100618.2460E11C00D7@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25338

Modified Files:
	kvm.modules qemu.spec 
Log Message:
* Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-2
- Allow blacklisting of kvm modules (#517866)



Index: kvm.modules
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/kvm.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kvm.modules	4 Mar 2009 00:11:56 -0000	1.1
+++ kvm.modules	18 Aug 2009 10:06:17 -0000	1.2
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then 
-    modprobe kvm-intel >/dev/null 2>&1
+    modprobe -b kvm-intel >/dev/null 2>&1
 fi
 
 if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then 
-    modprobe kvm-amd >/dev/null 2>&1
+    modprobe -b kvm-amd >/dev/null 2>&1
 fi


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- qemu.spec	4 Aug 2009 15:35:42 -0000	1.99
+++ qemu.spec	18 Aug 2009 10:06:17 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -467,6 +467,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-2
+- Allow blacklisting of kvm modules (#517866)
+
 * Tue Aug  4 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-1
 - Update to qemu-kvm-0.10.6; upstream ChangeLog:
    - merge qemu 0.10.6



From jorton at fedoraproject.org  Tue Aug 18 10:07:03 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 18 Aug 2009 10:07:03 +0000 (UTC)
Subject: rpms/httpd/devel httpd-2.2.13.tar.gz.asc, NONE, 1.1 .cvsignore, 1.24,
	1.25 httpd.spec, 1.136, 1.137 sources, 1.20, 1.21 upstream, 1.13,
	1.14 httpd-2.2.10.tar.gz.asc, 1.1, NONE httpd-2.2.11.tar.gz.asc,
	1.1, NONE httpd-2.2.4-oldflush.patch, 1.3,
	NONE httpd-2.2.8.tar.gz.asc, 1.1, NONE httpd-2.2.9.tar.gz.asc,
	1.1, NONE
Message-ID: <20090818100703.3F0BC11C00D7@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25536

Modified Files:
	.cvsignore httpd.spec sources upstream 
Added Files:
	httpd-2.2.13.tar.gz.asc 
Removed Files:
	httpd-2.2.10.tar.gz.asc httpd-2.2.11.tar.gz.asc 
	httpd-2.2.4-oldflush.patch httpd-2.2.8.tar.gz.asc 
	httpd-2.2.9.tar.gz.asc 
Log Message:
* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
- update to 2.2.13



--- NEW FILE httpd-2.2.13.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iQIcBAABAgAGBQJKely6AAoJEBk/GAq1XZl3RCcP/Ar22Dn4gHe0dVVv5lTQOia0
7Tp4S8clhJCVWInVPcUfHBDPHCqgapot5h3NjV9VVqFvxuIhSuTb3Wtzx1Eyh+9Y
hIOLLTnUdAJ/1knjiOOUcmDwDn8UantaGgjKUaRwyuJX6DwdQt4RK52gyRfompJ2
pjaXAAig6oalXBBZWpBwwtRcs0hAU0OrmRriZdVrbtZCcAjJNReBeZTIWJycKsM/
UuGyxLGm4NjaRv6vuiLj02EvBQlMmF3EAvyidTXrF9LGZPTwC3PMZxkoUk+AlgIh
jH7BsiRJmA7bwH2l1L/mpKOj0+GoMXboYPb9t0sNRv7qVS8/62aVx2pmZ0RraPsk
qSpo+N4SdmGRZ9eVHRlGqitz/1a5GpFUJiCjPgRAmmqYxcvOTspCzCAxd+3e9HNu
z2oV2MHhdfmW4wuOyZjtoG4/eCJWQOOl6L0fKmfmZ0QAAe/LFJjoleW6Ebf1Px6w
LRuCWcXhlKR8EQsOv6mJirfRXrK6uV01U74CMnmzaqjHMEsmUQ7Hh/jWUJ5C4Otb
Rf5+20PmSWVaf5sd+u7S/zNPFL0XNk2PUnWW/SShiC6bSDNCBFAwRa4vipDIVRBN
SxifPTjvGJ3bQ+F+4Se6R3c1H8hy83VGLxYmenY03Tebq5wWGJupbu3JIibBKb0s
qvzcW/b7rotkyW6YGFBX
=0OK6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	18 Dec 2008 16:30:23 -0000	1.24
+++ .cvsignore	18 Aug 2009 10:07:02 -0000	1.25
@@ -1 +1 @@
-httpd-2.2.11.tar.gz
+httpd-2.2.13.tar.gz


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- httpd.spec	25 Jul 2009 02:17:16 -0000	1.136
+++ httpd.spec	18 Aug 2009 10:07:03 -0000	1.137
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.11
-Release: 10
+Version: 2.2.13
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -37,7 +37,6 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
-Patch55: httpd-2.2.4-oldflush.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -126,7 +125,6 @@ Security (TLS) protocols.
 %patch26 -p1 -b .suenable
 
 %patch54 -p1 -b .authnoprov
-%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -483,6 +481,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
+- update to 2.2.13
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Dec 2008 16:30:24 -0000	1.20
+++ sources	18 Aug 2009 10:07:03 -0000	1.21
@@ -1 +1 @@
-03e0a99a5de0f3f568a0087fb9993af9  httpd-2.2.11.tar.gz
+2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/upstream,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- upstream	18 Dec 2008 16:30:24 -0000	1.13
+++ upstream	18 Aug 2009 10:07:03 -0000	1.14
@@ -1 +1 @@
-httpd-2.2.11.tar.gz
+httpd-2.2.13.tar.gz


--- httpd-2.2.10.tar.gz.asc DELETED ---


--- httpd-2.2.11.tar.gz.asc DELETED ---


--- httpd-2.2.4-oldflush.patch DELETED ---


--- httpd-2.2.8.tar.gz.asc DELETED ---


--- httpd-2.2.9.tar.gz.asc DELETED ---



From jorton at fedoraproject.org  Tue Aug 18 10:10:39 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 18 Aug 2009 10:10:39 +0000 (UTC)
Subject: rpms/httpd/F-11 httpd.spec, 1.134, 1.135 sources, 1.20,
	1.21 httpd-2.2.10.tar.gz.asc, 1.1, NONE httpd-2.2.11.tar.gz.asc,
	1.1, NONE httpd-2.2.4-oldflush.patch, 1.3,
	NONE httpd-2.2.8.tar.gz.asc, 1.1, NONE httpd-2.2.9.tar.gz.asc,
	1.1, NONE
Message-ID: <20090818101039.A216611C04D1@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26137

Modified Files:
	httpd.spec sources 
Removed Files:
	httpd-2.2.10.tar.gz.asc httpd-2.2.11.tar.gz.asc 
	httpd-2.2.4-oldflush.patch httpd-2.2.8.tar.gz.asc 
	httpd-2.2.9.tar.gz.asc 
Log Message:
* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
- update to 2.2.13



Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-11/httpd.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- httpd.spec	17 Mar 2009 13:09:35 -0000	1.134
+++ httpd.spec	18 Aug 2009 10:10:39 -0000	1.135
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.11
-Release: 8
+Version: 2.2.13
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -37,7 +37,6 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
-Patch55: httpd-2.2.4-oldflush.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -125,7 +124,6 @@ Security (TLS) protocols.
 %patch26 -p1 -b .suenable
 
 %patch54 -p1 -b .authnoprov
-%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -482,6 +480,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
+- update to 2.2.13
+
 * Tue Mar 17 2009 Joe Orton <jorton at redhat.com> 2.2.11-8
 - fix pidfile in httpd.logrotate (thanks to Rainer Traut)
 - don't build mod_mem_cache or mod_file_cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Dec 2008 16:30:24 -0000	1.20
+++ sources	18 Aug 2009 10:10:39 -0000	1.21
@@ -1 +1 @@
-03e0a99a5de0f3f568a0087fb9993af9  httpd-2.2.11.tar.gz
+2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz


--- httpd-2.2.10.tar.gz.asc DELETED ---


--- httpd-2.2.11.tar.gz.asc DELETED ---


--- httpd-2.2.4-oldflush.patch DELETED ---


--- httpd-2.2.8.tar.gz.asc DELETED ---


--- httpd-2.2.9.tar.gz.asc DELETED ---



From corsepiu at fedoraproject.org  Tue Aug 18 10:10:46 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 18 Aug 2009 10:10:46 +0000 (UTC)
Subject: rpms/OpenSceneGraph/F-11 OpenSceneGraph-2.8.2.diff, NONE,
	1.1 .cvsignore, 1.15, 1.16 OpenSceneGraph.spec, 1.44,
	1.45 sources, 1.15, 1.16 OpenSceneGraph-2.8.1.diff, 1.1, NONE
Message-ID: <20090818101046.BAED711C00D7@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26177

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Added Files:
	OpenSceneGraph-2.8.2.diff 
Removed Files:
	OpenSceneGraph-2.8.1.diff 
Log Message:
* Tue Aug 18 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-2
- Spec file cleanup.

* Mon Aug 17 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-1
- Upstream update.
- Reflect upstream having changes Source0-URL.



OpenSceneGraph-2.8.2.diff:
 CMakeLists.txt                   |    4 ++--
 CMakeModules/OsgMacroUtils.cmake |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE OpenSceneGraph-2.8.2.diff ---
diff -Naur OpenSceneGraph-2.8.2.orig/CMakeLists.txt OpenSceneGraph-2.8.2/CMakeLists.txt
--- OpenSceneGraph-2.8.2.orig/CMakeLists.txt	2009-07-28 08:02:27.000000000 +0200
+++ OpenSceneGraph-2.8.2/CMakeLists.txt	2009-08-17 17:39:09.000000000 +0200
@@ -717,7 +717,7 @@
         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
     )
     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
+    #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
 
     # now set up openthreads documentation generation
     IF(BUILD_REF_DOCS_TAGFILE)
@@ -733,7 +733,7 @@
         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
     )
     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
+    #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
 
     # Process our other doxyfiles but don't create targets for these
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
diff -Naur OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-2.8.2.orig/CMakeModules/OsgMacroUtils.cmake	2008-12-12 15:54:22.000000000 +0100
+++ OpenSceneGraph-2.8.2/CMakeModules/OsgMacroUtils.cmake	2009-08-17 17:39:09.000000000 +0200
@@ -307,7 +307,7 @@
         IF(APPLE)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
         ELSE(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
         ENDIF(APPLE)
 
 ENDMACRO(SETUP_EXAMPLE)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Jun 2009 15:21:27 -0000	1.15
+++ .cvsignore	18 Aug 2009 10:10:46 -0000	1.16
@@ -1 +1 @@
-OpenSceneGraph-2.8.1.zip
+OpenSceneGraph-2.8.2.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-11/OpenSceneGraph.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- OpenSceneGraph.spec	29 Jun 2009 04:45:14 -0000	1.44
+++ OpenSceneGraph.spec	18 Aug 2009 10:10:46 -0000	1.45
@@ -4,8 +4,8 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.8.1
-%define srcvers 2.8.1
+%define apivers 2.8.2
+%define srcvers 2.8.2
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
@@ -16,7 +16,8 @@ Group:          Applications/Multimedia
 # The OSGPL is just the wxWidgets license.
 License:        wxWidgets
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}/source/OpenSceneGraph-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+
 Patch0:         OpenSceneGraph-%{version}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,11 +44,7 @@ BuildRequires:  SDL-devel
 BuildRequires:  fltk-devel
 
 # OSG packaging madness ;)
-%if "%{version}" >= "2.6.0"
 %define OSGSRCDIR       OpenSceneGraph-%{version}
-%else
-%define OSGSRCDIR       OpenSceneGraph
-%endif
 
 %if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
@@ -66,12 +63,6 @@ for rapid development of graphics applic
 %setup -q -c
 cd %{OSGSRCDIR}
 %{?PATCH0:%patch0 -p1}
-%if "%{version}" < "2.8.0"
-sed -i \
-  -e 's,^OUTPUT_DIRECTORY.*doc/,OUTPUT_DIRECTORY = doc,' \
-  -e 's,^HTML_OUTPUT[ ]*= OpenSceneGraphReferenceDocs,HTML_OUTPUT = html,' \
-  doc/Doxyfiles/doxyfile.cmake
-%endif
 cd ..
 
 %build
@@ -81,23 +72,9 @@ pushd BUILD
 %cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON -DBUILD_DOCUMENTATION=ON ../%{OSGSRCDIR}
 make VERBOSE=1 %{?_smp_mflags}
 
-%if "%{version}" >= "2.8.0"
 make doc_openscenegraph doc_openthreads
-%else
-make DoxygenDoc
-%endif
 popd
 
-%if "%{version}" < "2.8.0"
-# HACK: Upstream stuff lacks cmake support and is broken
-sed -i -e 's,^prefix=.*$,prefix=%{_prefix},' \
-  -e 's,^libdir=.*$,libdir=%{_libdir},' \
-  -e 's,^includedir=.*$,includedir=%{_includedir},' \
-  -e '/^Conflicts.*$/d' \
-  %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
-  %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd BUILD
@@ -107,14 +84,6 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
 popd
 
-%if "%{version}" < "2.8.0"
-# Abandoned w/ 2.0 by upstream, re-added to 2.1.*
-install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openthreads.pc \
-  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
-install -m 644 -D %{OSGSRCDIR}/packaging/pkgconfig/openscenegraph.pc \
-  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,11 +132,7 @@ Development files for OpenSceneGraph.
 
 %files devel
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %doc BUILD/doc/OpenSceneGraphReferenceDocs
-%else
-%doc BUILD/doc/html
-%endif
 %{_includedir}/osg*
 %{_libdir}/pkgconfig/openscenegraph.pc
 %{_libdir}/libosg*.so
@@ -227,7 +192,6 @@ Sample applications for OpenSceneGraph
 
 %files examples
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %{_bindir}/osg2cpp
 %{_bindir}/osganimationmakepath
 %{_bindir}/osganimationnode
@@ -247,7 +211,6 @@ Sample applications for OpenSceneGraph
 %{_bindir}/osgsidebyside
 %{_bindir}/osgwidgetmessagebox
 %{_bindir}/osgwidgetperformance
-%endif
 %{_bindir}/osgfont
 %{_bindir}/osggeometryshaders
 %{_bindir}/osgimagesequence
@@ -391,14 +354,19 @@ Development files for OpenThreads.
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
-%if "%{version}" >= "2.8.0"
 %doc BUILD/doc/OpenThreadsReferenceDocs
-%endif
 %{_libdir}/pkgconfig/openthreads.pc
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
 %changelog
+* Tue Aug 18 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-2
+- Spec file cleanup.
+
+* Mon Aug 17 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-1
+- Upstream update.
+- Reflect upstream having changes Source0-URL.
+
 * Mon Jun 29 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.1-2
 - Remove /usr/bin/osgfilecache from *-examples.
 - Further spec cleanup.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Jun 2009 15:21:27 -0000	1.15
+++ sources	18 Aug 2009 10:10:46 -0000	1.16
@@ -1 +1 @@
-18a8d3f01a72b6027147b3918c18c662  OpenSceneGraph-2.8.1.zip
+99d0b37f403b85b4559514b6b9849d9e  OpenSceneGraph-2.8.2.zip


--- OpenSceneGraph-2.8.1.diff DELETED ---



From vcrhonek at fedoraproject.org  Tue Aug 18 10:37:37 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 18 Aug 2009 10:37:37 +0000 (UTC)
Subject: rpms/fetchmail/devel fetchmail-6.3.11-regression.patch, NONE,
	1.1 fetchmail.spec, 1.68, 1.69
Message-ID: <20090818103737.8A3CD11C00D7@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31359

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.11-regression.patch 
Log Message:
Regression bug fix for fetchmail 6.3.11

fetchmail-6.3.11-regression.patch:
 socket.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE fetchmail-6.3.11-regression.patch ---
diff -up fetchmail-6.3.11/socket.c_old fetchmail-6.3.11/socket.c
--- fetchmail-6.3.11/socket.c_old	2009-08-18 11:56:15.000000000 +0200
+++ fetchmail-6.3.11/socket.c	2009-08-18 11:58:17.000000000 +0200
@@ -628,9 +628,10 @@ static int SSL_verify_callback( int ok_r
 				report(stdout, GT_("Unknown Issuer CommonName\n"));
 		}
 		if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) {
-			if (outlevel >= O_VERBOSE)
+			if (outlevel >= O_VERBOSE) {
 				report(stdout, GT_("Server CommonName: %s\n"), (tt = sdump(buf, i)));
-			xfree(tt);
+				xfree(tt);
+			}
 			if ((size_t)i >= sizeof(buf) - 1) {
 				/* Possible truncation. In this case, this is a DNS name, so this
 				 * is really bad. We do not tolerate this even in the non-strict case. */


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- fetchmail.spec	6 Aug 2009 08:27:45 -0000	1.68
+++ fetchmail.spec	18 Aug 2009 10:37:37 -0000	1.69
@@ -4,10 +4,13 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.11
-Release: 1%{?dist}
+Release: 2%{?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
@@ -45,6 +48,7 @@ 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 \
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.11-2
+- Regression bug fix for fetchmail 6.3.11
+
 * Thu Aug  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.11-1
 - Update to fetchmail-6.3.11
 - Remove addrconf patch (upstream now)



From than at fedoraproject.org  Tue Aug 18 10:37:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 18 Aug 2009 10:37:45 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, NONE,
	1.1 qt.spec, 1.310, 1.311
Message-ID: <20090818103745.E010811C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31379

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
Log Message:
- security fix for CVE-2009-1725 (bz#513813)



qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch:
 HTMLTokenizer.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp.orig qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp.orig	2009-08-18 12:28:26.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp	2009-08-18 12:33:43.000000000 +0200
@@ -867,7 +867,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
                     }
                 } else {
                     // FIXME: We should eventually colorize entities by sending them as a special token.
-                    checkBuffer(11);
+                    // 12 bytes required: up to 10 bytes in m_cBuffer plus the
+                    // leading '&' and trailing ';'
+                    checkBuffer(12);
                     *dest++ = '&';
                     for (unsigned i = 0; i < cBufferPos; i++)
                         dest[i] = m_cBuffer[i];
@@ -878,7 +880,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
                     }
                 }
             } else {
-                checkBuffer(10);
+                // 11 bytes required: up to 10 bytes in m_cBuffer plus the
+                // leading '&'
+                checkBuffer(11);
                 // ignore the sequence, add it to the buffer as plaintext
                 *dest++ = '&';
                 for (unsigned i = 0; i < cBufferPos; i++)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- qt.spec	16 Aug 2009 13:25:37 -0000	1.310
+++ qt.spec	18 Aug 2009 10:37:45 -0000	1.311
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -71,6 +71,10 @@ Patch0288: 0288-more-x-keycodes.patch
 # http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/4.5.2-patched
 # once they actually contain all the patches from qt-copy (0283 and 0285 are
 # AWOL, 0274 got incorrectly ported to 4.5.2 (one hunk missing))
+
+# security patches
+Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
+
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
@@ -406,6 +410,9 @@ popd
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
+# security fixes
+%patch100 -p1 -b .CVE-2009-1725
+
 %patch287 -p1 -b .287-qmenu-respect-minwidth
 %patch0288 -p1 -b .0288-more-x-keycodes
 
@@ -931,6 +938,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-9
+- security fix for CVE-2009-1725 (bz#513813)
+
 * Sun Aug 16 2009 Than Ngo <than at redhat.com> - 4.5.2-8
 - fix phonon-backend-gstreamer for using pulsaudio (#513421)
 



From than at fedoraproject.org  Tue Aug 18 10:40:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 18 Aug 2009 10:40:20 +0000 (UTC)
Subject: rpms/qt/F-11 qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, NONE, 
	1.1 qt.spec, 1.278, 1.279
Message-ID: <20090818104020.E283D11C04D1@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
Log Message:
security fix for CVE-2009-1725


qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch:
 HTMLTokenizer.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp.orig qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp.orig	2009-08-18 12:28:26.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp	2009-08-18 12:33:43.000000000 +0200
@@ -867,7 +867,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
                     }
                 } else {
                     // FIXME: We should eventually colorize entities by sending them as a special token.
-                    checkBuffer(11);
+                    // 12 bytes required: up to 10 bytes in m_cBuffer plus the
+                    // leading '&' and trailing ';'
+                    checkBuffer(12);
                     *dest++ = '&';
                     for (unsigned i = 0; i < cBufferPos; i++)
                         dest[i] = m_cBuffer[i];
@@ -878,7 +880,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
                     }
                 }
             } else {
-                checkBuffer(10);
+                // 11 bytes required: up to 10 bytes in m_cBuffer plus the
+                // leading '&'
+                checkBuffer(11);
                 // ignore the sequence, add it to the buffer as plaintext
                 *dest++ = '&';
                 for (unsigned i = 0; i < cBufferPos; i++)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- qt.spec	16 Aug 2009 00:10:44 -0000	1.278
+++ qt.spec	18 Aug 2009 10:40:20 -0000	1.279
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}.2
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -62,6 +62,10 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 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
+
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
@@ -378,6 +382,9 @@ test -x apply_patches && ./apply_patches
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
+# security fixes
+%patch100 -p1 -b .CVE-2009-1725
+
 %patch287 -p1 -b .287-qmenu-respect
 %patch0288 -p1 -b .0288-more-x-keycodes
 
@@ -879,6 +886,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-2
+- security fix for CVE-2009-1725
+
 * Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
 - kde-qt: 287-qmenu-respect-minwidth
 - kde-qt: 0288-more-x-keycodes (#475247)



From than at fedoraproject.org  Tue Aug 18 10:42:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 18 Aug 2009 10:42:51 +0000 (UTC)
Subject: rpms/qt/F-10 qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, NONE, 
	1.1 qt.spec, 1.234, 1.235
Message-ID: <20090818104251.B5BCB11C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32353

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
Log Message:
security fix for CVE-2009-1725


qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch:
 HTMLTokenizer.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp.orig qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp.orig	2009-08-18 12:28:26.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp	2009-08-18 12:33:43.000000000 +0200
@@ -867,7 +867,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
                     }
                 } else {
                     // FIXME: We should eventually colorize entities by sending them as a special token.
-                    checkBuffer(11);
+                    // 12 bytes required: up to 10 bytes in m_cBuffer plus the
+                    // leading '&' and trailing ';'
+                    checkBuffer(12);
                     *dest++ = '&';
                     for (unsigned i = 0; i < cBufferPos; i++)
                         dest[i] = m_cBuffer[i];
@@ -878,7 +880,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
                     }
                 }
             } else {
-                checkBuffer(10);
+                // 11 bytes required: up to 10 bytes in m_cBuffer plus the
+                // leading '&'
+                checkBuffer(11);
                 // ignore the sequence, add it to the buffer as plaintext
                 *dest++ = '&';
                 for (unsigned i = 0; i < cBufferPos; i++)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/qt.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- qt.spec	16 Aug 2009 00:10:43 -0000	1.234
+++ qt.spec	18 Aug 2009 10:42:51 -0000	1.235
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}.2
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -62,6 +62,10 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 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
+
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
@@ -378,6 +382,9 @@ test -x apply_patches && ./apply_patches
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .timestamp
 
+# security fixes
+%patch100 -p1 -b .CVE-2009-1725
+
 %patch287 -p1 -b .287-qmenu-respect
 %patch0288 -p1 -b .0288-more-x-keycodes
 
@@ -879,6 +886,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-2
+- security fix for CVE-2009-1725
+
 * Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
 - kde-qt: 287-qmenu-respect-minwidth
 - kde-qt: 0288-more-x-keycodes (#475247)



From lkundrak at fedoraproject.org  Tue Aug 18 11:14:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 18 Aug 2009 11:14:40 +0000 (UTC)
Subject: rpms/sunbird/F-11 .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 sunbird.spec, 1.30, 1.31
Message-ID: <20090818111440.2464A11C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7889/F-11

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Update langpacks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	15 Aug 2009 12:01:36 -0000	1.13
+++ .cvsignore	18 Aug 2009 11:14:39 -0000	1.14
@@ -1 +1,2 @@
 thunderbird-3.0b3-source.tar.bz2
+sunbird-l10n.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Aug 2009 12:01:36 -0000	1.13
+++ sources	18 Aug 2009 11:14:39 -0000	1.14
@@ -1,2 +1,2 @@
-9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar
 84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
+70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sunbird.spec	15 Aug 2009 12:01:36 -0000	1.30
+++ sunbird.spec	18 Aug 2009 11:14:39 -0000	1.31
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.5.20090715hg%{?dist}
+Release:        0.6.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -295,6 +295,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.6.20090715hg
+- Update langpacks
+
 * Sun Jun 28 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.5.20090715hg
 - Sync up with Thunderbird
 



From lkundrak at fedoraproject.org  Tue Aug 18 11:14:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 18 Aug 2009 11:14:40 +0000 (UTC)
Subject: rpms/sunbird/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 sunbird.spec, 1.36, 1.37
Message-ID: <20090818111440.AE86311C00D7@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7889/devel

Modified Files:
	.cvsignore sources sunbird.spec 
Log Message:
Update langpacks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 Aug 2009 15:09:06 -0000	1.13
+++ .cvsignore	18 Aug 2009 11:14:39 -0000	1.14
@@ -1 +1,2 @@
 thunderbird-3.0b3-source.tar.bz2
+sunbird-l10n.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 Aug 2009 15:09:06 -0000	1.13
+++ sources	18 Aug 2009 11:14:40 -0000	1.14
@@ -1,2 +1,2 @@
-9f6fe61412669daeb30158832619d4a3  sunbird-l10n.tar
 84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
+70d060b6f6331c8cf123a39628ee859e  sunbird-l10n.tar


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sunbird.spec	17 Aug 2009 14:44:06 -0000	1.36
+++ sunbird.spec	18 Aug 2009 11:14:40 -0000	1.37
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.10.20090715hg%{?dist}
+Release:        0.11.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -295,6 +295,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.11.20090715hg
+- Update langpacks
+
 * Mon Aug 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.0-0.10.20090715hg
 - Sync up with Thunderbird
 



From akurtakov at fedoraproject.org  Tue Aug 18 11:17:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 18 Aug 2009 11:17:08 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.660,1.661
Message-ID: <20090818111708.D97A911C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8311/devel

Modified Files:
	eclipse.spec 
Log Message:
- Use system hamcrest.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -p -r1.660 -r1.661
--- eclipse.spec	17 Aug 2009 14:16:01 -0000	1.660
+++ eclipse.spec	18 Aug 2009 11:17:08 -0000	1.661
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.7%{?dist}
+Release:        0.8%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -186,6 +186,7 @@ BuildRequires: lucene-contrib >= 2.3.1-3
 BuildRequires: regexp
 BuildRequires: junit >= 3.8.1-3jpp
 BuildRequires: junit4
+BuildRequires: hamcrest >= 0:1.1-9.2
 BuildRequires: sat4j >= 2.1.0-1
 BuildRequires: objectweb-asm
 
@@ -275,6 +276,7 @@ Provides:	eclipse-sdk
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       objectweb-asm
+Requires:       hamcrest >= 0:1.1-9.2
 # For PDE Build wrapper script
 Requires:       bash
 Provides:       %{name}-pde-runtime = 1:%{version}-%{release}
@@ -290,7 +292,7 @@ developing Eclipse plugins.
 %setup -q -n eclipse-build-R0_3_0
 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 
+ant -DbuildId=I20090611-1540 applyPatches
 pushd build/eclipse-I20090611-1540-fetched-src
 
 #sed --in-place "s/java5.home/java.home/" build.xml
@@ -316,7 +318,7 @@ pushd features/org.eclipse.equinox.execu
 zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
 popd
 #-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
-  
+
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -376,7 +378,7 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
-                                                      plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF 
+                                                      plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %ifarch ppc64
@@ -457,7 +459,7 @@ IFS='
     done
   popd
   IFS=$OLDIFS
-  
+
 %endif
 
 arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
@@ -561,14 +563,14 @@ COMMONSELVERSION=$(ls plugins | grep com
 rm plugins/org.apache.commons.el_$COMMONSELVERSION
 ln -s %{_javadir}/commons-el.jar \
   plugins/org.apache.commons.el_$COMMONSELVERSION
-  
+
 # link to commons-codec
 COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
   sed 's/org.apache.commons.codec_//')
 rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
 ln -s %{_javadir}/commons-codec.jar \
   plugins/org.apache.commons.codec_$COMMONSCODECVERSION
-  
+
 # link to commons-httpclient
 COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
   sed 's/org.apache.commons.httpclient_//')
@@ -576,6 +578,13 @@ rm plugins/org.apache.commons.httpclient
 ln -s %{_javadir}/commons-httpclient.jar \
   plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
 
+# link to hamcrest-core
+HAMCRESTCOREVERSION=$(ls plugins | grep org.hamcrest.core_ | \
+  sed 's/org.hamcrest.core_//')
+rm plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
+ln -s %{_javadir}/hamcrest/core.jar \
+  plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
+
 # link to jasper
 JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \
   sed 's/org.apache.jasper_//')
@@ -595,7 +604,7 @@ SERVLETAPIVERSION=$(ls plugins | grep ja
 rm plugins/javax.servlet_2.5*
 ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
   plugins/javax.servlet_2.5$SERVLETAPIVERSION
-  
+
 #
 # link to jsp-api
 JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
@@ -608,7 +617,7 @@ ln -s %{_javadir}/tomcat5-jsp-2.0-api.ja
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
 rm plugins/org.eclipse.swt/extra_jars/exceptions.jar \
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
-   plugins/org.eclipse.osgi/osgi/osgi.core.jar 
+   plugins/org.eclipse.osgi/osgi/osgi.core.jar
 
 # FIXME:  figure out a way to symlink to something.  Alternatively,
 # patch out of package.org.eclipse.sdk*.xml.
@@ -850,7 +859,7 @@ org.eclipse.equinox.p2.director \
 -metadataRepository file:$metadataDir \
 -artifactRepository file:$metadataDir \
 -destination $provisionDir \
--bundlepool $provisionDir 
+-bundlepool $provisionDir
 
 # Stuff in JDT, PDE, SDK
 for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do
@@ -1088,6 +1097,13 @@ rm dropins/sdk/plugins/org.objectweb.asm
 ln -s %{_javadir}/objectweb-asm/asm-all.jar \
   dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
 
+# link to hamcrest-core
+HAMCRESTCOREVERSION=$(ls dropins/sdk/plugins | grep org.hamcrest.core_ | \
+  sed 's/org.hamcrest.core_//')
+rm dropins/sdk/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
+ln -s %{_javadir}/hamcrest/core.jar \
+  dropins/sdk/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
+
 ## BEGIN ANT ##
 ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
 rm $ANTDIR/lib/*
@@ -1160,14 +1176,14 @@ COMMONSELVERSION=$(ls plugins | grep com
 rm plugins/org.apache.commons.el_$COMMONSELVERSION
 ln -s %{_javadir}/commons-el.jar \
   plugins/org.apache.commons.el_$COMMONSELVERSION
-  
+
 # link to commons-el
 COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
   sed 's/org.apache.commons.codec_//')
 rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
 ln -s %{_javadir}/commons-codec.jar \
   plugins/org.apache.commons.codec_$COMMONSCODECVERSION
-  
+
 # link to commons-el
 COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
   sed 's/org.apache.commons.httpclient_//')
@@ -1452,6 +1468,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.8
+- Use system hamcrest.
+
 * Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.7
 - Use o.e.equinox.initializer from SOURCE1 instead of separate one.
 
@@ -1509,7 +1528,7 @@ fi
 - Remove Fedora branding.
 
 * Thu May 7 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.2.7
-- Update patch to tests' library.xml to allow for easy debugging of tests. 
+- Update patch to tests' library.xml to allow for easy debugging of tests.
 
 * Wed Apr 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.6
 - Fix initializer run (sed again).



From mlichvar at fedoraproject.org  Tue Aug 18 11:36:00 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 18 Aug 2009 11:36:00 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.34, 1.35 sources, 1.34,
	1.35 xterm.spec, 1.75, 1.76
Message-ID: <20090818113600.E95A211C00D7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14078

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 246



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	13 Aug 2009 11:34:36 -0000	1.34
+++ .cvsignore	18 Aug 2009 11:35:58 -0000	1.35
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-245.tgz
+xterm-246.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	13 Aug 2009 11:34:36 -0000	1.34
+++ sources	18 Aug 2009 11:35:58 -0000	1.35
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-ad87d0a641da70a3c1196a209c8db70e  xterm-245.tgz
+b0c3aa021031742d6f5009833fc4d800  xterm-246.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- xterm.spec	13 Aug 2009 11:34:36 -0000	1.75
+++ xterm.spec	18 Aug 2009 11:35:58 -0000	1.76
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 245
+Version: 246
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Aug 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 246-1
+- update to 246
+
 * Thu Aug 13 2009 Miroslav Lichvar <mlichvar at redhat.com> 245-1
 - update to 245
 



From caolanm at fedoraproject.org  Tue Aug 18 11:43:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 11:43:50 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch, 1.1, 1.2
Message-ID: <20090818114350.B142711C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16259

Modified Files:
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch 
Log Message:
binfilter references it too

openoffice.org-3.1.1.ooo104306.moverecentlyused.patch:
 bf_sfx2/source/doc/sfx2_objstor.cxx                       |    1 
 postprocess/prj/build.lst                                 |    2 -
 sfx2/inc/pch/precompiled_sfx2.hxx                         |    1 
 sfx2/prj/build.lst                                        |    2 -
 sfx2/source/appl/sfxpicklist.cxx                          |    4 --
 sfx2/source/doc/objstor.cxx                               |    3 --
 sfx2/util/makefile.mk                                     |    1 
 shell/prj/d.lst                                           |    4 --
 shell/source/unix/sysshell/makefile.mk                    |    4 --
 shell/source/unix/sysshell/recently_used_file_handler.cxx |    1 
 solenv/inc/libs.mk                                        |    2 -
 vcl/inc/vcl/salinst.hxx                                   |    2 +
 vcl/inc/vcl/svapp.hxx                                     |   14 +++++++++
 vcl/source/app/svapp.cxx                                  |    6 ++++
 vcl/unx/gtk/app/gtkinst.cxx                               |    6 ++++
 vcl/unx/headless/svpinst.cxx                              |    4 ++
 vcl/unx/headless/svpinst.hxx                              |    2 +
 vcl/unx/inc/plugins/gtk/gtkinst.hxx                       |    1 
 vcl/unx/inc/salinst.h                                     |    2 +
 vcl/unx/source/app/salinst.cxx                            |   20 ++++++++++++++
 20 files changed, 61 insertions(+), 21 deletions(-)

Index: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo104306.moverecentlyused.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo104306.moverecentlyused.patch	18 Aug 2009 07:47:08 -0000	1.1
+++ openoffice.org-3.1.1.ooo104306.moverecentlyused.patch	18 Aug 2009 11:43:48 -0000	1.2
@@ -285,3 +285,13 @@ diff -ru postprocess.orig/prj/build.lst 
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
  po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
+--- binfilter.orig/bf_sfx2/source/doc/sfx2_objstor.cxx	2009-08-18 12:36:03.000000000 +0100
++++ binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx	2009-08-18 12:36:03.000000000 +0100
+@@ -138,7 +138,6 @@
+ #include <unotools/tempfile.hxx>
+ #include <ucbhelper/content.hxx>
+ #include <sot/storinfo.hxx>
+-#include <shell/systemshell.hxx>
+ 
+ #include "objsh.hxx"
+ #include "request.hxx"



From kdudka at fedoraproject.org  Tue Aug 18 11:51:49 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 18 Aug 2009 11:51:49 +0000 (UTC)
Subject: rpms/curl/devel curl.spec,1.109,1.110
Message-ID: <20090818115149.E53F611C00D7@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18687

Modified Files:
	curl.spec 
Log Message:
- let curl package depend on the same version of libcurl


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- curl.spec	14 Aug 2009 09:21:25 -0000	1.109
+++ curl.spec	18 Aug 2009 11:51:47 -0000	1.110
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -17,6 +17,7 @@ BuildRequires: autoconf
 BuildRequires: groff
 BuildRequires: pkgconfig, libidn-devel, zlib-devel, libssh2-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
+Requires: libcurl = %{version}-%{release}
 
 %description
 cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS,
@@ -140,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Aug 18 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-2
+- let curl package depend on the same version of libcurl
+
 * Fri Aug 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-1
 - new upstream release, dropped applied patches
 - changed NSS code to not ignore the value of ssl.verifyhost and produce more



From jorton at fedoraproject.org  Tue Aug 18 11:57:28 2009
From: jorton at fedoraproject.org (jorton)
Date: Tue, 18 Aug 2009 11:57:28 +0000 (UTC)
Subject: rpms/httpd/F-11 httpd.logrotate,1.4,1.5 httpd.spec,1.135,1.136
Message-ID: <20090818115729.5CBEC11C00D7@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21086

Modified Files:
	httpd.logrotate httpd.spec 
Log Message:
* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
- use "delaycompress" in logrotate config (#506381)



Index: httpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-11/httpd.logrotate,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- httpd.logrotate	17 Mar 2009 13:09:35 -0000	1.4
+++ httpd.logrotate	18 Aug 2009 11:57:25 -0000	1.5
@@ -2,6 +2,7 @@
     missingok
     notifempty
     sharedscripts
+    delaycompress
     postrotate
 	/bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
     endscript


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-11/httpd.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- httpd.spec	18 Aug 2009 10:10:39 -0000	1.135
+++ httpd.spec	18 Aug 2009 11:57:27 -0000	1.136
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -480,6 +480,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
+- use "delaycompress" in logrotate config (#506381)
+
 * Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
 - update to 2.2.13
 



From ltinkl at fedoraproject.org  Tue Aug 18 12:02:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 12:02:42 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-copyrename.patch, NONE,
	1.1 kdelibs.spec, 1.436, 1.437
Message-ID: <20090818120243.0B2AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22560/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-copyrename.patch 
Log Message:
backport fix for KDE bug #195385


kdelibs-4.3.1-copyrename.patch:
 kio/kfileitem.cpp       |    3 +++
 tests/kdirmodeltest.cpp |    6 ++++++
 tests/kfileitemtest.cpp |   15 +++++++++++++++
 tests/kfileitemtest.h   |    1 +
 4 files changed, 25 insertions(+)

--- NEW FILE kdelibs-4.3.1-copyrename.patch ---
Index: kio/kio/kfileitem.cpp
===================================================================
--- kio/kio/kfileitem.cpp	(revision 1012563)
+++ kio/kio/kfileitem.cpp	(revision 1012564)
@@ -532,6 +532,9 @@
 {
     d->m_strName = name;
     d->m_strText = KIO::decodeFileName( d->m_strName );
+    if (d->m_entry.contains(KIO::UDSEntry::UDS_NAME))
+        d->m_entry.insert(KIO::UDSEntry::UDS_NAME, d->m_strName); // #195385
+
 }
 
 QString KFileItem::linkDest() const
Index: kio/tests/kfileitemtest.cpp
===================================================================
--- kio/tests/kfileitemtest.cpp	(revision 1012563)
+++ kio/tests/kfileitemtest.cpp	(revision 1012564)
@@ -241,6 +241,21 @@
     QVERIFY(fileItem.cmp(fileItem2));
 }
 
+void KFileItemTest::testRename()
+{
+    KIO::UDSEntry entry;
+    const QString origName = QString::fromLatin1("foo");
+    entry.insert(KIO::UDSEntry::UDS_NAME, origName);
+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+    KFileItem fileItem(entry, KUrl("/dir/foo"));
+    QCOMPARE(fileItem.name(), origName);
+    QCOMPARE(fileItem.text(), origName);
+    const QString newName = QString::fromLatin1("FiNeX_rocks");
+    fileItem.setName(newName);
+    QCOMPARE(fileItem.name(), newName);
+    QCOMPARE(fileItem.text(), newName);
+    QCOMPARE(fileItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), newName); // #195385
+}
 
 void KFileItemTest::testDecodeFileName_data()
 {
Index: kio/tests/kdirmodeltest.cpp
===================================================================
--- kio/tests/kdirmodeltest.cpp	(revision 1012563)
+++ kio/tests/kdirmodeltest.cpp	(revision 1012564)
@@ -418,6 +418,12 @@
     // check renaming happened
     QCOMPARE( m_dirModel->itemForIndex( m_secondFileIndex ).url().url(), newUrl.url() );
 
+    // check that KDirLister::cachedItemForUrl won't give a bad name if copying that item (#195385)
+    KFileItem cachedItem = KDirLister::cachedItemForUrl(newUrl);
+    Q_ASSERT(!cachedItem.isNull());
+    QCOMPARE(cachedItem.name(), QString("toplevelfile_2_renamed"));
+    QCOMPARE(cachedItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), QString("toplevelfile_2_renamed"));
+
     // Put things back to normal
     job = KIO::rename(newUrl, url, KIO::HideProgressInfo);
     ok = job->exec();
Index: kio/tests/kfileitemtest.h
===================================================================
--- kio/tests/kfileitemtest.h	(revision 1012563)
+++ kio/tests/kfileitemtest.h	(revision 1012564)
@@ -35,6 +35,7 @@
     void testHiddenFile();
     void testMimeTypeOnDemand();
     void testCmp();
+    void testRename();
 
     void testDecodeFileName_data();
     void testDecodeFileName();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -p -r1.436 -r1.437
--- kdelibs.spec	17 Aug 2009 12:18:19 -0000	1.436
+++ kdelibs.spec	18 Aug 2009 12:02:42 -0000	1.437
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,8 @@ Patch101: kdelibs-4.3.1-kdebug#199557.pa
 Patch102: kdelibs-4.3.1-unmountfix.patch
 # http://bugs.kde.org/170608
 Patch103: kdelibs-4.3.1-copyurls.patch
+#?http://bugs.kde.org/195385
+Patch104: kdelibs-4.3.1-copyrename.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -228,6 +230,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch101 -p4 -b .kdebug#199557
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
+%patch104 -p0 -b .copyrename
 
 %build
 
@@ -409,6 +412,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0.5
+- fix KDE bug #19538, copy file after rename uses old file name
+
 * Mon Aug 17 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
 - fix unmounting devices
 - fix copying URLs to clipboard (kdebug:170608)



From ltinkl at fedoraproject.org  Tue Aug 18 12:02:43 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 12:02:43 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-copyrename.patch, NONE,
	1.1 kdelibs.spec, 1.490, 1.491
Message-ID: <20090818120243.76FB711C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22560/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-copyrename.patch 
Log Message:
backport fix for KDE bug #195385


kdelibs-4.3.1-copyrename.patch:
 kio/kfileitem.cpp       |    3 +++
 tests/kdirmodeltest.cpp |    6 ++++++
 tests/kfileitemtest.cpp |   15 +++++++++++++++
 tests/kfileitemtest.h   |    1 +
 4 files changed, 25 insertions(+)

--- NEW FILE kdelibs-4.3.1-copyrename.patch ---
Index: kio/kio/kfileitem.cpp
===================================================================
--- kio/kio/kfileitem.cpp	(revision 1012563)
+++ kio/kio/kfileitem.cpp	(revision 1012564)
@@ -532,6 +532,9 @@
 {
     d->m_strName = name;
     d->m_strText = KIO::decodeFileName( d->m_strName );
+    if (d->m_entry.contains(KIO::UDSEntry::UDS_NAME))
+        d->m_entry.insert(KIO::UDSEntry::UDS_NAME, d->m_strName); // #195385
+
 }
 
 QString KFileItem::linkDest() const
Index: kio/tests/kfileitemtest.cpp
===================================================================
--- kio/tests/kfileitemtest.cpp	(revision 1012563)
+++ kio/tests/kfileitemtest.cpp	(revision 1012564)
@@ -241,6 +241,21 @@
     QVERIFY(fileItem.cmp(fileItem2));
 }
 
+void KFileItemTest::testRename()
+{
+    KIO::UDSEntry entry;
+    const QString origName = QString::fromLatin1("foo");
+    entry.insert(KIO::UDSEntry::UDS_NAME, origName);
+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+    KFileItem fileItem(entry, KUrl("/dir/foo"));
+    QCOMPARE(fileItem.name(), origName);
+    QCOMPARE(fileItem.text(), origName);
+    const QString newName = QString::fromLatin1("FiNeX_rocks");
+    fileItem.setName(newName);
+    QCOMPARE(fileItem.name(), newName);
+    QCOMPARE(fileItem.text(), newName);
+    QCOMPARE(fileItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), newName); // #195385
+}
 
 void KFileItemTest::testDecodeFileName_data()
 {
Index: kio/tests/kdirmodeltest.cpp
===================================================================
--- kio/tests/kdirmodeltest.cpp	(revision 1012563)
+++ kio/tests/kdirmodeltest.cpp	(revision 1012564)
@@ -418,6 +418,12 @@
     // check renaming happened
     QCOMPARE( m_dirModel->itemForIndex( m_secondFileIndex ).url().url(), newUrl.url() );
 
+    // check that KDirLister::cachedItemForUrl won't give a bad name if copying that item (#195385)
+    KFileItem cachedItem = KDirLister::cachedItemForUrl(newUrl);
+    Q_ASSERT(!cachedItem.isNull());
+    QCOMPARE(cachedItem.name(), QString("toplevelfile_2_renamed"));
+    QCOMPARE(cachedItem.entry().stringValue(KIO::UDSEntry::UDS_NAME), QString("toplevelfile_2_renamed"));
+
     // Put things back to normal
     job = KIO::rename(newUrl, url, KIO::HideProgressInfo);
     ok = job->exec();
Index: kio/tests/kfileitemtest.h
===================================================================
--- kio/tests/kfileitemtest.h	(revision 1012563)
+++ kio/tests/kfileitemtest.h	(revision 1012564)
@@ -35,6 +35,7 @@
     void testHiddenFile();
     void testMimeTypeOnDemand();
     void testCmp();
+    void testRename();
 
     void testDecodeFileName_data();
     void testDecodeFileName();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- kdelibs.spec	17 Aug 2009 12:18:19 -0000	1.490
+++ kdelibs.spec	18 Aug 2009 12:02:43 -0000	1.491
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -90,6 +90,8 @@ Patch101: kdelibs-4.3.1-kdebug#199557.pa
 Patch102: kdelibs-4.3.1-unmountfix.patch
 # http://bugs.kde.org/170608
 Patch103: kdelibs-4.3.1-copyurls.patch
+#?http://bugs.kde.org/195385
+Patch104: kdelibs-4.3.1-copyrename.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -228,6 +230,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch101 -p4 -b .kdebug#199557
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
+%patch104 -p0 -b .copyrename
 
 %build
 
@@ -409,6 +412,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0.5
+- fix KDE bug #19538, copy file after rename uses old file name
+
 * Mon Aug 17 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
 - fix unmounting devices
 - fix copying URLs to clipboard (kdebug:170608)



From pkgdb at fedoraproject.org  Tue Aug 18 12:03:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:03:05 +0000
Subject: [pkgdb] maven-surefire: akurtakov has requested watchcommits
Message-ID: <20090818120309.2C8D210F89B@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven-surefire (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-surefire



From pkgdb at fedoraproject.org  Tue Aug 18 12:03:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:03:24 +0000
Subject: [pkgdb] maven-surefire: akurtakov has requested watchbugzilla
Message-ID: <20090818120326.58BEA10F859@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven-surefire (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-surefire



From pkgdb at fedoraproject.org  Tue Aug 18 12:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:04:47 +0000
Subject: [pkgdb] maven-surefire: akurtakov has requested commit
Message-ID: <20090818120447.94DF110F857@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven-surefire (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-surefire



From pkgdb at fedoraproject.org  Tue Aug 18 12:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:12:08 +0000
Subject: [pkgdb] easymock: akurtakov has requested watchbugzilla
Message-ID: <20090818121210.2A30310F855@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on easymock (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock



From pkgdb at fedoraproject.org  Tue Aug 18 12:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:12:09 +0000
Subject: [pkgdb] easymock: akurtakov has requested watchcommits
Message-ID: <20090818121215.29F8A10F897@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on easymock (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock



From pkgdb at fedoraproject.org  Tue Aug 18 12:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:12:11 +0000
Subject: [pkgdb] easymock: akurtakov has requested commit
Message-ID: <20090818121217.6AEA110F89A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on easymock (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock



From pkgdb at fedoraproject.org  Tue Aug 18 12:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:13:05 +0000
Subject: [pkgdb] jakarta-commons-configuration: akurtakov has requested
	watchbugzilla
Message-ID: <20090818121306.0984B10F886@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on jakarta-commons-configuration (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Tue Aug 18 12:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:13:06 +0000
Subject: [pkgdb] jakarta-commons-configuration: akurtakov has requested
	watchcommits
Message-ID: <20090818121307.16AC110F895@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on jakarta-commons-configuration (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Tue Aug 18 12:15:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:15:44 +0000
Subject: [pkgdb] jakarta-commons-jxpath: akurtakov has requested
	watchbugzilla
Message-ID: <20090818121544.D5C9D10F85C@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on jakarta-commons-jxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Tue Aug 18 12:15:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:15:45 +0000
Subject: [pkgdb] jakarta-commons-jxpath: akurtakov has requested watchcommits
Message-ID: <20090818121547.9762E10F897@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on jakarta-commons-jxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Tue Aug 18 12:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:15:47 +0000
Subject: [pkgdb] jakarta-commons-jxpath: akurtakov has requested commit
Message-ID: <20090818121550.DD6A010F899@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on jakarta-commons-jxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Tue Aug 18 12:13:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:13:07 +0000
Subject: [pkgdb] jakarta-commons-configuration: akurtakov has requested
	commit
Message-ID: <20090818121307.AE8E010F89A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on jakarta-commons-configuration (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Tue Aug 18 12:17:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:17:47 +0000
Subject: [pkgdb] directory-naming: akurtakov has requested watchcommits
Message-ID: <20090818121748.9491710F859@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on directory-naming (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Tue Aug 18 12:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:17:48 +0000
Subject: [pkgdb] directory-naming: akurtakov has requested commit
Message-ID: <20090818121749.BB14810F890@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on directory-naming (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Tue Aug 18 12:17:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:17:49 +0000
Subject: [pkgdb] directory-naming: akurtakov has requested watchbugzilla
Message-ID: <20090818121750.80E1F10F882@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on directory-naming (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Tue Aug 18 12:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:19:45 +0000
Subject: [pkgdb] dumbster: akurtakov has requested watchbugzilla
Message-ID: <20090818121946.2BC5F10F84F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on dumbster (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Tue Aug 18 12:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:19:51 +0000
Subject: [pkgdb] dumbster: akurtakov has requested watchcommits
Message-ID: <20090818121951.D688310F85A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on dumbster (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Tue Aug 18 12:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:19:54 +0000
Subject: [pkgdb] dumbster: akurtakov has requested commit
Message-ID: <20090818121954.D68B910F886@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on dumbster (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Tue Aug 18 12:21:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:21:41 +0000
Subject: [pkgdb] rome had acl change status
Message-ID: <20090818122142.43FE910F87A@bastion2.fedora.phx.redhat.com>

overholt has set the watchcommits acl on rome (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From pkgdb at fedoraproject.org  Tue Aug 18 12:21:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:21:41 +0000
Subject: [pkgdb] rome had acl change status
Message-ID: <20090818122142.4579810F881@bastion2.fedora.phx.redhat.com>

overholt has set the watchbugzilla acl on rome (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From pkgdb at fedoraproject.org  Tue Aug 18 12:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:21:42 +0000
Subject: [pkgdb] rome had acl change status
Message-ID: <20090818122143.0C0B310F889@bastion2.fedora.phx.redhat.com>

overholt has set the commit acl on rome (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From pkgdb at fedoraproject.org  Tue Aug 18 12:21:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 12:21:43 +0000
Subject: [pkgdb] rome had acl change status
Message-ID: <20090818122143.DF0FC10F890@bastion2.fedora.phx.redhat.com>

overholt has set the approveacls acl on rome (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rome



From nphilipp at fedoraproject.org  Tue Aug 18 12:31:00 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 12:31:00 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.197,1.198
Message-ID: <20090818123101.40E0511C02CB@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29692

Modified Files:
	gimp.spec 
Log Message:
BR: webkitgtk-devel/WebKit-gtk-devel >= 1.1.0



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- gimp.spec	14 Aug 2009 09:58:51 -0000	1.197
+++ gimp.spec	18 Aug 2009 12:30:58 -0000	1.198
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation P
 Name:           gimp
 Epoch:          2
 Version:        2.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -81,9 +81,9 @@ BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5
-BuildRequires:  webkitgtk-devel >= 1.0.0
+BuildRequires:  webkitgtk-devel >= 1.1.0
 %else
-BuildRequires:  WebKit-gtk-devel >= 1.0.0
+BuildRequires:  WebKit-gtk-devel >= 1.1.0
 %endif
 %if %{with modular_x}
 BuildRequires:  libX11-devel
@@ -499,6 +499,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-2
+- BR: webkitgtk-devel/WebKit-gtk-devel >= 1.1.0
+
 * Fri Aug 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-1
 - version 2.6.7
 



From dwalsh at fedoraproject.org  Tue Aug 18 12:32:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 12:32:48 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.427,
	1.428 policycoreutils.spec, 1.621, 1.622
Message-ID: <20090818123248.EF28311C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31661

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-3
- Fix semanage command


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 restorecond/Makefile                        |   20 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  397 +++-------------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  220 +++++++++++++++
 restorecond/walk.c                          |   30 ++
 restorecond/watch.c                         |  346 ++++++++++++++++++++++++
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++++++
 scripts/sandbox.8                           |   22 +
 scripts/sandbox.py                          |   67 ++++
 semanage/semanage                           |   53 +++
 semanage/semanage.8                         |    2 
 semanage/seobject.py                        |  109 +++++++
 19 files changed, 1076 insertions(+), 372 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -p -r1.427 -r1.428
--- policycoreutils-rhat.patch	13 Aug 2009 15:51:52 -0000	1.427
+++ policycoreutils-rhat.patch	18 Aug 2009 12:32:44 -0000	1.428
@@ -1,15 +1,15 @@
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-13 17:57:54.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.71/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.71/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-13 17:57:54.000000000 -0400
 @@ -2,16 +2,23 @@
  PREFIX ?= ${DESTDIR}/usr
  SBINDIR ?= $(PREFIX)/sbin
@@ -51,16 +51,16 @@ diff -b -B --ignore-all-space --exclude-
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.71/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.71/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-13 17:57:54.000000000 -0400
 @@ -48,294 +48,37 @@
  #include <signal.h>
  #include <string.h>
@@ -263,7 +263,7 @@ diff -b -B --ignore-all-space --exclude-
 -{
 -	char *line_buf = NULL;
 -	size_t len = 0;
--
+ 
 -	while (getline(&line_buf, &len, cfg) > 0) {
 -		char *buffer = line_buf;
 -		while (isspace(*buffer))
@@ -282,7 +282,10 @@ diff -b -B --ignore-all-space --exclude-
 -	}
 -	free(line_buf);
 -}
--
++static char *server_watch_file  = "/etc/selinux/restorecond.conf";
++static char *user_watch_file  = "/etc/selinux/restorecond_user.conf";
++static char *watch_file;
+ 
 -/* 
 -   Read config file ignoring Comment lines 
 -   Files specified one per line.  Files with "~" will be expanded to the logged in users
@@ -292,7 +295,7 @@ diff -b -B --ignore-all-space --exclude-
 -static void read_config(int fd)
 -{
 -	char *watch_file_path = "/etc/selinux/restorecond.conf";
- 
+-
 -	FILE *cfg = NULL;
 -	if (debug_mode)
 -		printf("Read Config\n");
@@ -311,9 +314,7 @@ diff -b -B --ignore-all-space --exclude-
 -	if (master_wd == -1)
 -		exitApp("Error watching config file.");
 -}
-+static char *server_watch_file  = "/etc/selinux/restorecond.conf";
-+static char *user_watch_file  = "/etc/selinux/restorecond_user.conf";
-+static char *watch_file;
++#include <selinux/selinux.h>
  
 -/* 
 -   Inotify watch loop 
@@ -348,22 +349,21 @@ diff -b -B --ignore-all-space --exclude-
 -				if (event->len)
 -					watch_list_find(event->wd, event->name);
 -				break;
-+#include <selinux/selinux.h>
- 
+-
 -			case 1:	/* utmp has changed need to reload */
 -				read_config(fd);
 -				break;
+-
+-			default:	/* No users logged in or out */
+-				break;
+-			}
+-		}
 +int debug_mode = 0;
 +int verbose_mode = 0;
 +int terminate = 0;
 +int master_wd = -1;
 +int run_as_user = 0;
  
--			default:	/* No users logged in or out */
--				break;
--			}
--		}
--
 -		i += EVENT_SIZE + event->len;
 -	}
 -	return 0;
@@ -525,9 +525,9 @@ diff -b -B --ignore-all-space --exclude-
  	if (pidfile)
  		unlink(pidfile);
  
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-13 17:57:54.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -538,9 +538,9 @@ diff -b -B --ignore-all-space --exclude-
  /root/.ssh/*
 -
 -
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.71/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.71/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -549,9 +549,9 @@ diff -b -B --ignore-all-space --exclude-
 +Encoding=UTF-8
 +Type=Application
 +StartupNotify=false
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.71/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.71/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-13 17:57:54.000000000 -0400
 @@ -24,7 +24,22 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -577,15 +577,15 @@ diff -b -B --ignore-all-space --exclude-
 +extern void watch_list_free(int fd);
  
  #endif
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.71/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.71/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/user.c	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/user.c	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,220 @@
 +/*
 + * restorecond
@@ -807,9 +807,9 @@ diff -b -B --ignore-all-space --exclude-
 +    return 0;
 +}
 +
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.71/restorecond/walk.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.71/restorecond/walk.c
 --- nsapolicycoreutils/restorecond/walk.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/walk.c	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/walk.c	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,30 @@
 +#define _XOPEN_SOURCE 500
 +#include <ftw.h>
@@ -841,9 +841,9 @@ diff -b -B --ignore-all-space --exclude-
 +    printf("Total Dirs %d\n",ctr);
 +    exit(EXIT_SUCCESS);
 +}
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.71/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.71/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,346 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1191,9 +1191,9 @@ diff -b -B --ignore-all-space --exclude-
 +		exitApp("Error watching config file.");
 +}
 +
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-13 17:57:54.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1203,9 +1203,9 @@ diff -b -B --ignore-all-space --exclude-
      
      sys.exit(errors)
      
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.71/scripts/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.71/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-13 17:57:54.000000000 -0400
 @@ -5,11 +5,12 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1220,9 +1220,9 @@ diff -b -B --ignore-all-space --exclude-
  	install -m 755 fixfiles $(DESTDIR)/sbin
  	install -m 755 genhomedircon  $(SBINDIR)
  	-mkdir -p $(MANDIR)/man8
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.71/scripts/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.71/scripts/sandbox
 --- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
@@ -1363,9 +1363,9 @@ diff -b -B --ignore-all-space --exclude-
 +        error_exit(error.args[1])
 +        
 +    sys.exit(rc)
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.71/scripts/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.71/scripts/sandbox.8
 --- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,22 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1389,9 +1389,9 @@ diff -b -B --ignore-all-space --exclude-
 +.TP
 +runcon(1)
 +.PP
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.71/scripts/sandbox.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.71/scripts/sandbox.py
 --- nsapolicycoreutils/scripts/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-13 17:57:54.000000000 -0400
 @@ -0,0 +1,67 @@
 +#!/usr/bin/python
 +import os, sys, getopt, socket, random, fcntl
@@ -1460,9 +1460,9 @@ diff -b -B --ignore-all-space --exclude-
 +    mount(mount_src, filecon)
 +    umount(filecon)
 +os.execvp(cmds[0], cmds)
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage	2009-08-18 08:16:04.000000000 -0400
 @@ -44,16 +44,17 @@
                 text = _("""
  semanage [ -S store ] -i [ input_file | - ]
@@ -1540,7 +1540,7 @@ diff -b -B --ignore-all-space --exclude-
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -248,9 +261,15 @@
+@@ -248,9 +259,15 @@
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
@@ -1556,7 +1556,7 @@ diff -b -B --ignore-all-space --exclude-
  			if o == "-h" or o == "--help":
                                 raise ValueError(_("%s bad option") % o)
  
-@@ -324,6 +343,9 @@
+@@ -324,6 +341,9 @@
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
  		
@@ -1566,7 +1566,7 @@ diff -b -B --ignore-all-space --exclude-
  		if object == "translation":
  			OBJECT = seobject.setransRecords()
  		
-@@ -341,6 +363,13 @@
+@@ -341,6 +361,13 @@
  			OBJECT.deleteall()
                          return
  			
@@ -1580,7 +1580,7 @@ diff -b -B --ignore-all-space --exclude-
  		if len(cmds) != 1:
                         raise ValueError(_("%s bad option") % o)
                          
-@@ -362,11 +391,17 @@
+@@ -362,11 +389,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -1591,14 +1591,15 @@ diff -b -B --ignore-all-space --exclude-
  				OBJECT.add(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
+-				OBJECT.add(target, setype, ftype, serange, seuser)
 +                                if equal == "":
- 				OBJECT.add(target, setype, ftype, serange, seuser)
++                                       OBJECT.add(target, setype, ftype, serange, seuser)
 +                                else:
 +                                       OBJECT.add_equal(target, equal)
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -386,6 +421,9 @@
+@@ -386,6 +419,9 @@
  				rlist = roles.split()
  				OBJECT.modify(target, rlist, selevel, serange, prefix)
  
@@ -1608,20 +1609,21 @@ diff -b -B --ignore-all-space --exclude-
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -396,7 +434,10 @@
+@@ -396,7 +432,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
+-				OBJECT.modify(target, setype, ftype, serange, seuser)
 +                                if equal == "":
- 				OBJECT.modify(target, setype, ftype, serange, seuser)
++                                       OBJECT.modify(target, setype, ftype, serange, seuser)
 +                                else:
 +                                       OBJECT.modify_equal(target, equal)
  
                          return
  
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.71/semanage/semanage.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.71/semanage/semanage.8
 --- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage.8	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage.8	2009-08-13 17:57:54.000000000 -0400
 @@ -21,6 +21,8 @@
  .br
  .B semanage permissive \-{a|d} type
@@ -1631,9 +1633,9 @@ diff -b -B --ignore-all-space --exclude-
  .B semanage translation \-{a|d|m} [\-T] level
  .P
  
-diff -b -B --ignore-all-space --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.71/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.71/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-13 11:48:14.000000000 -0400
++++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-13 17:57:54.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -p -r1.621 -r1.622
--- policycoreutils.spec	13 Aug 2009 22:22:35 -0000	1.621
+++ policycoreutils.spec	18 Aug 2009 12:32:48 -0000	1.622
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-3
+- Fix semanage command
+
 * Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-2
 - exclude unconfined.if from sepolgen
 



From dwalsh at fedoraproject.org  Tue Aug 18 12:34:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 12:34:26 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.179,
	1.180 booleans-targeted.conf, 1.51, 1.52 nsadiff, 1.17,
	1.18 policy-F12.patch, 1.51, 1.52 selinux-policy.spec, 1.896,
	1.897 sources, 1.199, 1.200
Message-ID: <20090818123426.8620511C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32234

Modified Files:
	.cvsignore booleans-targeted.conf nsadiff policy-F12.patch 
	selinux-policy.spec sources 
Log Message:
* Fri Aug 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.27-1
- Add policycoreutils-python to pre install



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- .cvsignore	30 Jul 2009 21:38:53 -0000	1.179
+++ .cvsignore	18 Aug 2009 12:34:25 -0000	1.180
@@ -182,3 +182,4 @@ serefpolicy-3.6.23.tgz
 serefpolicy-3.6.24.tgz
 serefpolicy-3.6.25.tgz
 serefpolicy-3.6.26.tgz
+serefpolicy-3.6.27.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- booleans-targeted.conf	12 Aug 2009 20:09:21 -0000	1.51
+++ booleans-targeted.conf	18 Aug 2009 12:34:25 -0000	1.52
@@ -122,6 +122,10 @@ nfs_export_all_rw = true
 # 
 nfs_export_all_ro = true
 
+## Allow openvpn to read home directories
+## 
+openvpn_enable_homedirs = true
+
 # Allow pppd to load kernel modules for certain modems
 # 
 pppd_can_insmod = false


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nsadiff	30 Jul 2009 20:30:26 -0000	1.17
+++ nsadiff	18 Aug 2009 12:34:25 -0000	1.18
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.26 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.27 > /tmp/diff

policy-F12.patch:
 Makefile                                           |   20 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.te                         |   15 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  129 ++
 policy/modules/apps/java.te                        |   17 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   38 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   22 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |   56 
 policy/modules/kernel/filesystem.te                |    2 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  141 +-
 policy/modules/services/cups.fc                    |   12 
 policy/modules/services/cups.te                    |   23 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   26 
 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               |   49 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   11 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |    5 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   49 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  138 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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                   |   39 
 policy/modules/services/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   34 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  129 +-
 policy/modules/services/virt.te                    |  270 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   66 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  254 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   66 -
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 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                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 -------
 policy/modules/system/unconfined.te                |  226 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1304 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  129 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 317 files changed, 13794 insertions(+), 2955 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.51 -r 1.52 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- policy-F12.patch	13 Aug 2009 22:33:07 -0000	1.51
+++ policy-F12.patch	18 Aug 2009 12:34:25 -0000	1.52
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.26/config/appconfig-mcs/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.27/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -22,15 +22,15 @@ diff -b -B --ignore-all-space --exclude-
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.26/config/appconfig-mcs/failsafe_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.27/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/failsafe_context	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/failsafe_context	2009-08-14 16:51:06.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.26/config/appconfig-mcs/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/root_default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/root_default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -45,9 +45,9 @@ diff -b -B --ignore-all-space --exclude-
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/securetty_types serefpolicy-3.6.26/config/appconfig-mcs/securetty_types
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/securetty_types serefpolicy-3.6.27/config/appconfig-mcs/securetty_types
 --- nsaserefpolicy/config/appconfig-mcs/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/securetty_types	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/securetty_types	2009-08-14 16:51:06.000000000 -0400
 @@ -1 +1,6 @@
 +auditadm_tty_device_t
 +secadm_tty_device_t
@@ -55,18 +55,18 @@ diff -b -B --ignore-all-space --exclude-
 +sysadm_tty_device_t
 +unconfined_tty_device_t
  user_tty_device_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.26/config/appconfig-mcs/seusers
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.27/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/seusers	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/seusers	2009-08-14 16:51:06.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +root:unconfined_u:s0-mcs_systemhigh
 +__default__:unconfined_u:s0-mcs_systemhigh
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.26/config/appconfig-mcs/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/staff_u_default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/staff_u_default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -81,9 +81,9 @@ diff -b -B --ignore-all-space --exclude-
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.26/config/appconfig-mcs/unconfined_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/unconfined_u_default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/unconfined_u_default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -97,15 +97,15 @@ diff -b -B --ignore-all-space --exclude-
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.26/config/appconfig-mcs/userhelper_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.27/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/userhelper_context	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/userhelper_context	2009-08-14 16:51:06.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.26/config/appconfig-mcs/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mcs/user_u_default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/user_u_default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -118,20 +118,20 @@ diff -b -B --ignore-all-space --exclude-
 -
 +system_r:initrc_su_t:s0		user_r:user_t:s0
 +user_r:user_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.26/config/appconfig-mcs/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.27/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/config/appconfig-mcs/virtual_domain_context	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/virtual_domain_context	2009-08-14 16:51:06.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.26/config/appconfig-mcs/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.27/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/config/appconfig-mcs/virtual_image_context	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mcs/virtual_image_context	2009-08-14 16:51:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.26/config/appconfig-mls/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.27/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mls/default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mls/default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -153,9 +153,9 @@ diff -b -B --ignore-all-space --exclude-
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.26/config/appconfig-mls/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.27/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-mls/root_default_contexts	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mls/root_default_contexts	2009-08-14 16:51:06.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -174,20 +174,20 @@ diff -b -B --ignore-all-space --exclude-
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.26/config/appconfig-mls/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.27/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/config/appconfig-mls/virtual_domain_context	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mls/virtual_domain_context	2009-08-14 16:51:06.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.26/config/appconfig-mls/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.27/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.26/config/appconfig-mls/virtual_image_context	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-mls/virtual_image_context	2009-08-14 16:51:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/securetty_types serefpolicy-3.6.26/config/appconfig-standard/securetty_types
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/securetty_types serefpolicy-3.6.27/config/appconfig-standard/securetty_types
 --- nsaserefpolicy/config/appconfig-standard/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/config/appconfig-standard/securetty_types	2009-07-30 15:33:08.000000000 -0400
++++ serefpolicy-3.6.27/config/appconfig-standard/securetty_types	2009-08-14 16:51:06.000000000 -0400
 @@ -1 +1,6 @@
 +auditadm_tty_device_t
 +secadm_tty_device_t
@@ -195,10 +195,31 @@ diff -b -B --ignore-all-space --exclude-
 +sysadm_tty_device_t
 +unconfined_tty_device_t
  user_tty_device_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.26/Makefile
---- nsaserefpolicy/Makefile	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/Makefile	2009-07-30 15:34:52.000000000 -0400
-@@ -241,7 +241,7 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.27/Makefile
+--- nsaserefpolicy/Makefile	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.27/Makefile	2009-08-14 16:51:06.000000000 -0400
+@@ -102,8 +102,6 @@
+ comment_move_decl := $(SED) -r -f $(support)/comment_move_decl.sed
+ gennetfilter := $(PYTHON) -E $(support)/gennetfilter.py
+ m4iferror := $(support)/iferror.m4
+-m4divert := $(support)/divert.m4
+-m4undivert := $(support)/undivert.m4
+ # use our own genhomedircon to make sure we have a known usable one,
+ # so policycoreutils updates are not required (RHEL4)
+ genhomedircon := $(PYTHON) -E $(support)/genhomedircon
+@@ -233,18 +231,17 @@
+ 
+ CTAGS ?= ctags
+ 
+-m4support := $(m4divert) $(wildcard $(poldir)/support/*.spt)
++m4support := $(wildcard $(poldir)/support/*.spt)
+ ifdef LOCAL_ROOT
+ m4support += $(wildcard $(local_poldir)/support/*.spt)
+ endif
+-m4support += $(m4undivert)
[...5497 lines suppressed...]
-+++ serefpolicy-3.6.26/policy/modules/system/udev.fc	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/udev.fc	2009-08-14 16:51:06.000000000 -0400
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -22995,9 +24088,9 @@ diff -b -B --ignore-all-space --exclude-
  
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /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.te serefpolicy-3.6.26/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/udev.te	2009-08-13 09:56:06.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.27/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/udev.te	2009-08-14 16:51:06.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;
@@ -23107,9 +24200,9 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.26/policy/modules/system/unconfined.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.27/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/unconfined.fc	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/unconfined.fc	2009-08-14 16:51:06.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -23127,9 +24220,9 @@ diff -b -B --ignore-all-space --exclude-
 -ifdef(`distro_gentoo',`
 -/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.26/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.27/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/unconfined.if	2009-08-13 16:47:59.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/unconfined.if	2009-08-14 16:51:06.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -23635,9 +24728,9 @@ diff -b -B --ignore-all-space --exclude-
 -
 -	allow $1 unconfined_t:dbus acquire_svc;
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.26/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.27/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/unconfined.te	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/unconfined.te	2009-08-14 16:51:06.000000000 -0400
 @@ -1,231 +1,9 @@
  
 -policy_module(unconfined, 3.0.0)
@@ -23872,9 +24965,9 @@ diff -b -B --ignore-all-space --exclude-
 -		hal_dbus_chat(unconfined_execmem_t)
 -	')
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.26/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.27/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.fc	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/userdomain.fc	2009-08-14 16:51:06.000000000 -0400
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -23884,9 +24977,9 @@ diff -b -B --ignore-all-space --exclude-
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.26/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.27/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.if	2009-08-12 16:13:59.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/userdomain.if	2009-08-14 16:51:06.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -25752,9 +26845,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 user_home_dir_t:dir search_dir_perms;
 +	files_search_home($1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.26/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/userdomain.te	2009-07-30 15:33:09.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.27/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/userdomain.te	2009-08-14 16:51:06.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -25840,9 +26933,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.26/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.27/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/xen.fc	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/xen.fc	2009-08-14 16:51:06.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -25870,9 +26963,9 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.26/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.27/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/xen.if	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/xen.if	2009-08-14 16:51:06.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -25923,10 +27016,16 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.26/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/modules/system/xen.te	2009-07-30 15:41:16.000000000 -0400
-@@ -6,6 +6,13 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.27/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.27/policy/modules/system/xen.te	2009-08-14 16:51:06.000000000 -0400
+@@ -1,11 +1,18 @@
+ 
+-policy_module(xen, 1.9.0)
++policy_module(xen, 1.8.2)
+ 
+ ########################################
+ #
  # Declarations
  #
  
@@ -26213,9 +27312,9 @@ diff -b -B --ignore-all-space --exclude-
 +manage_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.26/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.27/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/support/obj_perm_sets.spt	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/support/obj_perm_sets.spt	2009-08-14 16:51:06.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -26248,9 +27347,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.26/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.27/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/policy/users	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/policy/users	2009-08-14 16:51:06.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -26275,9 +27374,9 @@ diff -b -B --ignore-all-space --exclude-
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.26/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.27/Rules.modular
 --- nsaserefpolicy/Rules.modular	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/Rules.modular	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/Rules.modular	2009-08-14 16:51:06.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -26307,9 +27406,15 @@ diff -b -B --ignore-all-space --exclude-
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.26/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/divert.m4 serefpolicy-3.6.27/support/divert.m4
+--- nsaserefpolicy/support/divert.m4	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.27/support/divert.m4	1969-12-31 19:00:00.000000000 -0500
+@@ -1 +0,0 @@
+-divert(`-1')
+\ No newline at end of file
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.27/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.26/support/Makefile.devel	2009-07-30 15:33:09.000000000 -0400
++++ serefpolicy-3.6.27/support/Makefile.devel	2009-08-14 16:51:06.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
@@ -26320,3 +27425,9 @@ diff -b -B --ignore-all-space --exclude-
  	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
  
  tmp/%.mod.fc: $(m4support) %.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/undivert.m4 serefpolicy-3.6.27/support/undivert.m4
+--- nsaserefpolicy/support/undivert.m4	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.27/support/undivert.m4	1969-12-31 19:00:00.000000000 -0500
+@@ -1 +0,0 @@
+-divert
+\ No newline at end of file


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -p -r1.896 -r1.897
--- selinux-policy.spec	13 Aug 2009 22:33:07 -0000	1.896
+++ selinux-policy.spec	18 Aug 2009 12:34:25 -0000	1.897
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.26
-Release: 11%{?dist}
+Version: 3.6.27
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -49,7 +49,7 @@ Url: http://oss.tresys.com/repos/refpoli
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils-python >= %{POLICYCOREUTILSVER} bzip2 
-Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
+Requires(pre): policycoreutils-python >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
 Requires(post): /usr/bin/bunzip2 /bin/mktemp /bin/awk
 Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
 Obsoletes: selinux-policy-devel
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.27-1
+- Add policycoreutils-python to pre install
+
 * Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.26-11
 - Make all unconfined_domains permissive so we can see what AVC's happen 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- sources	30 Jul 2009 21:38:54 -0000	1.199
+++ sources	18 Aug 2009 12:34:26 -0000	1.200
@@ -1 +1 @@
-8c707d664792b43fa6c1f1adde8cfd57  serefpolicy-3.6.26.tgz
+7539a9e100f4f48bcd47dd870e03e2c6  serefpolicy-3.6.27.tgz



From nphilipp at fedoraproject.org  Tue Aug 18 12:42:37 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 12:42:37 +0000 (UTC)
Subject: rpms/gimp/F-11 gimp.spec,1.193,1.194
Message-ID: <20090818124238.0CA9711C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32435

Modified Files:
	gimp.spec 
Log Message:
BR: webkitgtk-devel/WebKit-gtk-devel >= 1.1.0



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-11/gimp.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- gimp.spec	14 Aug 2009 10:15:11 -0000	1.193
+++ gimp.spec	18 Aug 2009 12:42:35 -0000	1.194
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation P
 Name:           gimp
 Epoch:          2
 Version:        2.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -81,9 +81,9 @@ BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5
-BuildRequires:  webkitgtk-devel >= 1.0.0
+BuildRequires:  webkitgtk-devel >= 1.1.0
 %else
-BuildRequires:  WebKit-gtk-devel >= 1.0.0
+BuildRequires:  WebKit-gtk-devel >= 1.1.0
 %endif
 %if %{with modular_x}
 BuildRequires:  libX11-devel
@@ -499,6 +499,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-2
+- BR: webkitgtk-devel/WebKit-gtk-devel >= 1.1.0
+
 * Fri Aug 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-1
 - version 2.6.7
 



From nphilipp at fedoraproject.org  Tue Aug 18 12:42:49 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 12:42:49 +0000 (UTC)
Subject: rpms/gimp/F-10 gimp.spec,1.183,1.184
Message-ID: <20090818124249.ABB7311C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1365

Modified Files:
	gimp.spec 
Log Message:
BR: webkitgtk-devel/WebKit-gtk-devel >= 1.1.0



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- gimp.spec	14 Aug 2009 10:20:10 -0000	1.183
+++ gimp.spec	18 Aug 2009 12:42:49 -0000	1.184
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation P
 Name:           gimp
 Epoch:          2
 Version:        2.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -81,9 +81,9 @@ BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5
-BuildRequires:  webkitgtk-devel >= 1.0.0
+BuildRequires:  webkitgtk-devel >= 1.1.0
 %else
-BuildRequires:  WebKit-gtk-devel >= 1.0.0
+BuildRequires:  WebKit-gtk-devel >= 1.1.0
 %endif
 %if %{with modular_x}
 BuildRequires:  libX11-devel
@@ -499,6 +499,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-2
+- BR: webkitgtk-devel/WebKit-gtk-devel >= 1.1.0
+
 * Fri Aug 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.7-1
 - version 2.6.7
 



From dwalsh at fedoraproject.org  Tue Aug 18 12:46:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 12:46:29 +0000 (UTC)
Subject: rpms/setroubleshoot/F-11 setroubleshoot-log.patch, NONE,
	1.1 setroubleshoot.spec, 1.138, 1.139
Message-ID: <20090818124629.C277011C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2098

Modified Files:
	setroubleshoot.spec 
Added Files:
	setroubleshoot-log.patch 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.14-3
- Change sedispatch to complain in /var/log/messages rather then the console.


setroubleshoot-log.patch:
 sedispatch.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE setroubleshoot-log.patch ---
diff -up setroubleshoot-2.1.14/src/sedispatch.c.log setroubleshoot-2.1.14/src/sedispatch.c
--- setroubleshoot-2.1.14/src/sedispatch.c.log	2009-08-18 08:43:43.000000000 -0400
+++ setroubleshoot-2.1.14/src/sedispatch.c	2009-08-18 08:44:04.000000000 -0400
@@ -85,7 +85,7 @@ static 	DBusConnection* init_dbus(void) 
 	// connect to the bus
 	conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
 	if (dbus_error_is_set(&err)) { 
-		syslog(LOG_DAEMON, "Connection Error (%s): AVC Will be dropped\n", err.message); 
+		syslog(LOG_ERR, "Connection Error (%s): AVC Will be dropped\n", err.message); 
 		dbus_error_free(&err); 
 	}
 	return conn;
@@ -108,7 +108,7 @@ int main(int argc __attribute__((unused)
 	/* Initialize the auparse library */
 	au = auparse_init(AUSOURCE_FEED, 0);
 	if (au == NULL) {
-		syslog(LOG_DAEMON,"sedispatch is exiting due to auparse init errors");
+		syslog(LOG_ERR,"sedispatch is exiting due to auparse init errors");
 		return -1;
 	}
 
@@ -135,7 +135,7 @@ int main(int argc __attribute__((unused)
 	if (stop)
 		syslog(LOG_DEBUG,"sedispatch is exiting on stop request\n");
 	else
-		syslog(LOG_DAEMON,"sedispatch is exiting on stdin EOF\n");
+		syslog(LOG_ERR,"sedispatch is exiting on stdin EOF\n");
 
 	return 0;
 }
@@ -159,7 +159,7 @@ static void dump_whole_record(auparse_st
 	const char *tcon = auparse_find_field(au, "tcontext");
 	if (is_setroubleshoot(scon) ||
 	    is_setroubleshoot(tcon)) {
-		syslog(LOG_DAEMON, "AVC Message for setroubleshoot, dropping message"); 
+		syslog(LOG_ERR, "AVC Message for setroubleshoot, dropping message"); 
 		return;
 	}
 			
@@ -168,7 +168,7 @@ static void dump_whole_record(auparse_st
 	  len = asprintf(&tmp, "%s%s\n", 
 			 tmp, auparse_get_record_text(au));
 	  if (len < 0) {
-	    syslog(LOG_DAEMON,"sedispatch out of memory\n");
+	    syslog(LOG_ERR,"sedispatch out of memory\n");
 	    free(tmp);
 	    return;
 	  }


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-11/setroubleshoot.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- setroubleshoot.spec	1 Jul 2009 21:07:12 -0000	1.138
+++ setroubleshoot.spec	18 Aug 2009 12:46:28 -0000	1.139
@@ -1,13 +1,14 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.1.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
 patch: setroubleshoot-lstat.patch
+patch2: setroubleshoot-log.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
@@ -85,6 +86,7 @@ touch --no-create %{_datadir}/icons/hico
 %prep
 %setup -q
 %patch -p1 -b .lstat
+%patch2 -p1 -b .log
 
 %build
 %configure
@@ -197,6 +199,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.14-3
+- Change sedispatch to complain in /var/log/messages rather then the console.
+
 * Wed Jul 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.14-2
 - Change to use os.lstat to look at links
 



From mlichvar at fedoraproject.org  Tue Aug 18 13:38:20 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 18 Aug 2009 13:38:20 +0000 (UTC)
Subject: rpms/exim/devel exim-4.69-strictaliasing.patch, NONE, 1.1 exim.init,
	1.3, 1.4 exim.spec, 1.61, 1.62
Message-ID: <20090818133821.01A4011C00D7@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11766

Modified Files:
	exim.init exim.spec 
Added Files:
	exim-4.69-strictaliasing.patch 
Log Message:
- Move certificate generation to init script (#517013)
- Fix strict aliasing warning


exim-4.69-strictaliasing.patch:
 exim.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE exim-4.69-strictaliasing.patch ---
diff -up exim-4.69/src/exim.h.strictaliasing exim-4.69/src/exim.h
--- exim-4.69/src/exim.h.strictaliasing	2009-08-18 15:10:42.000000000 +0200
+++ exim-4.69/src/exim.h	2009-08-18 15:16:01.000000000 +0200
@@ -484,6 +484,7 @@ union sockaddr_46 {
   #if HAVE_IPV6
   struct sockaddr_in6 v6;
   #endif
+  struct sockaddr g;
 };
 
 /* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined


Index: exim.init
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- exim.init	7 Aug 2009 07:19:06 -0000	1.3
+++ exim.init	18 Aug 2009 13:38:20 -0000	1.4
@@ -28,6 +28,36 @@ fi
 
 [ -f /usr/sbin/exim ] || exit 0
 
+gen_cert() {
+	if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then
+		umask 077
+		FQDN=`hostname`
+		if [ "x${FQDN}" = "x" ]; then
+			FQDN=localhost.localdomain
+		fi
+		echo -n $"Generating exim certificate: "
+		cat << EOF | openssl req -new -x509 -days 365 -nodes \
+			-out /etc/pki/tls/certs/exim.pem \
+			-keyout /etc/pki/tls/private/exim.pem &>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+		if [ $? -eq 0 ]; then
+			success
+			chown exim.exim /etc/pki/tls/{private,certs}/exim.pem
+			chmod 600 /etc/pki/tls/{private,certs}/exim.pem
+		else
+			failure
+		fi
+		echo
+	fi
+}
+
 start() {
 	# check ownerships
 	# do this by seeing if /var/log/exim/main.log exists and is
@@ -39,6 +69,10 @@ start() {
 		chown -R exim:exim /var/log/exim /var/spool/exim
 	    fi
 	fi
+
+	# generate certificate if doesn't exist
+	gen_cert
+
         # Start daemons.
         echo -n $"Starting exim: "
         daemon /usr/sbin/exim $([ "$DAEMON" = yes ] && echo -bd) \


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- exim.spec	12 Aug 2009 13:54:32 -0000	1.61
+++ exim.spec	18 Aug 2009 13:38:20 -0000	1.62
@@ -19,7 +19,7 @@ Group: System Environment/Daemons
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: MTA smtpd smtpdaemon server(smtp) /usr/bin/newaliases
 Provides: /usr/sbin/sendmail /usr/bin/mailq /usr/bin/rmail
-Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives openssl
+Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
 Requires(preun): /sbin/chkconfig /sbin/service %{_sbindir}/alternatives
 Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd
 %if 0%{?buildclam}
@@ -53,6 +53,7 @@ Patch22: exim-4.66-greylist-conf.patch
 Patch23: exim-4.67-smarthost-config.patch
 Patch24: exim-4.69-dynlookup.patch
 Patch25: exim-4.69-dynlookup-config.patch
+Patch26: exim-4.69-strictaliasing.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
@@ -183,6 +184,7 @@ greylisting unconditional.
 %patch23 -p1 -b .smarthost
 %patch24 -p1 -b .dynlookup
 %patch25 -p1 -b .dynconfig
+%patch26 -p1 -b .strictaliasing
 
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -351,27 +353,6 @@ exit 0
 	--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man8/exim.8.gz \
 	--initscript exim
 
-if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then
-	umask 077
-	FQDN=`hostname`
-	if [ "x${FQDN}" = "x" ]; then
-		FQDN=localhost.localdomain
-	fi
-	cat << EOF | openssl req -new -x509 -days 365 -nodes \
-		-out /etc/pki/tls/certs/exim.pem \
-		-keyout /etc/pki/tls/private/exim.pem &>/dev/null
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-${FQDN}
-root@${FQDN}
-EOF
-	chown exim.exim /etc/pki/tls/{private,certs}/exim.pem
-	chmod 600 /etc/pki/tls/{private,certs}/exim.pem
-fi
-
 %preun
 if [ $1 = 0 ]; then
 	/sbin/service exim stop > /dev/null 2>&1
@@ -503,8 +484,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
-* Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com>
-- Require openssl for %post
+* Tue Aug 18 2009 Miroslav Lichvar <mlichvar at redhat.com> - 4.69-14
+- Move certificate generation to init script (#517013)
+- Fix strict aliasing warning
 
 * Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-13
 - Cope with lack of /etc/sysconfig/network (#506330)



From rhughes at fedoraproject.org  Tue Aug 18 13:36:24 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 18 Aug 2009 13:36:24 +0000 (UTC)
Subject: rpms/PackageKit/F-11 .cvsignore, 1.46, 1.47 PackageKit.spec, 1.110, 
	1.111 sources, 1.47, 1.48
Message-ID: <20090818133625.181C011C00D7@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11442

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Tue Aug 18 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.10-0.1.20090818git
- New upstream version, many bugfixes and performance fixes
- Fixes #?



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	3 Aug 2009 13:47:47 -0000	1.46
+++ .cvsignore	18 Aug 2009 13:36:22 -0000	1.47
@@ -1 +1 @@
-PackageKit-0.4.9.tar.gz
+PackageKit-0.4.10-20090818.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/PackageKit.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- PackageKit.spec	3 Aug 2009 13:47:47 -0000	1.110
+++ PackageKit.spec	18 Aug 2009 13:36:22 -0000	1.111
@@ -2,20 +2,20 @@
 %define dbus_version            1.1.1
 %define dbus_glib_version       0.74
 %define policykit_version       0.8
-#%define alphatag                20090324
+%define alphatag                20090818
 
 %{!?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.4.9
-#Release:   0.3.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Version:   0.4.10
+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.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.
@@ -213,8 +213,8 @@ A simple helper that offers to install n
 using PackageKit.
 
 %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
 
@@ -402,6 +402,10 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Aug 18 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.10-0.1.20090818git
+- New upstream version, many bugfixes and performance fixes
+- Fixes #?
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.9-1
 - New upstream version, many bugfixes and performance fixes
 - Fixes #483164, #504377, #499590, #514708, #513376, #510874 and #472876


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	3 Aug 2009 13:47:47 -0000	1.47
+++ sources	18 Aug 2009 13:36:23 -0000	1.48
@@ -1 +1 @@
-24e1e3ea58aff65ba2b31e05cbc2ce6b  PackageKit-0.4.9.tar.gz
+bd641ad886046d25d7d5be7070d365e7  PackageKit-0.4.10-20090818.tar.gz



From dwalsh at fedoraproject.org  Tue Aug 18 13:40:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 13:40:51 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.115,
	1.116 setroubleshoot.spec, 1.153, 1.154 sources, 1.128, 1.129
Message-ID: <20090818134051.1999711C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12242

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.19-1
- Default syscall field in audit_data



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	30 Jul 2009 20:08:03 -0000	1.115
+++ .cvsignore	18 Aug 2009 13:40:50 -0000	1.116
@@ -32,3 +32,4 @@ setroubleshoot-2.2.15.tar.gz
 setroubleshoot-2.2.16.tar.gz
 setroubleshoot-2.2.17.tar.gz
 setroubleshoot-2.2.18.tar.gz
+setroubleshoot-2.2.19.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- setroubleshoot.spec	13 Aug 2009 15:40:50 -0000	1.153
+++ setroubleshoot.spec	18 Aug 2009 13:40:50 -0000	1.154
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.18
-Release: 2%{?dist}
+Version: 2.2.19
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -209,6 +209,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.19-1
+- Default syscall field in audit_data
+
 * Thu Aug 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.18-2
 - Add buildrequires python-slip-dbus
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- sources	30 Jul 2009 20:08:03 -0000	1.128
+++ sources	18 Aug 2009 13:40:50 -0000	1.129
@@ -1 +1 @@
-adcf8da780472ce7a353b34716619a78  setroubleshoot-2.2.18.tar.gz
+f072a687cc80466f42005a92d125de64  setroubleshoot-2.2.19.tar.gz



From hubert at fedoraproject.org  Tue Aug 18 13:42:34 2009
From: hubert at fedoraproject.org (Hubert Plociniczak)
Date: Tue, 18 Aug 2009 13:42:34 +0000 (UTC)
Subject: rpms/rabbitmq-server/EL-5 .cvsignore, 1.2, 1.3 rabbitmq-server.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090818134234.3AB6111C00D7@cvs1.fedora.phx.redhat.com>

Author: hubert

Update of /cvs/pkgs/rpms/rabbitmq-server/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12521

Modified Files:
	.cvsignore rabbitmq-server.spec sources 
Log Message:
New upstream release 1.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 May 2009 16:24:50 -0000	1.2
+++ .cvsignore	18 Aug 2009 13:42:33 -0000	1.3
@@ -1 +1 @@
-rabbitmq-server-1.5.5.tar.gz
+rabbitmq-server-1.6.0.tar.gz


Index: rabbitmq-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/EL-5/rabbitmq-server.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rabbitmq-server.spec	26 May 2009 16:24:50 -0000	1.1
+++ rabbitmq-server.spec	18 Aug 2009 13:42:33 -0000	1.2
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name: rabbitmq-server
-Version: 1.5.5
-Release: 2%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -117,6 +117,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jun 17 2009 Matthias Radestock <matthias at lshift.net> 1.6.0-1
+- New upstream release
+
 * Tue May 26 2009 Hubert Plociniczak <hubert at lshift.net> 1.5.5-2
 - Include dist macro in the release number
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 May 2009 16:24:50 -0000	1.2
+++ sources	18 Aug 2009 13:42:33 -0000	1.3
@@ -1 +1 @@
-1dceb98bb57cd6acef90f58e96a7fce4  rabbitmq-server-1.5.5.tar.gz
+af3b0d868d58e5aefb4f0837b82ca010  rabbitmq-server-1.6.0.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 18 13:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:46:24 +0000
Subject: [pkgdb] maven-surefire had acl change status
Message-ID: <20090818134624.B888710F87A@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven-surefire (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-surefire



From pkgdb at fedoraproject.org  Tue Aug 18 13:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:46:23 +0000
Subject: [pkgdb] maven-surefire had acl change status
Message-ID: <20090818134623.DD0BC10F859@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven-surefire (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-surefire



From pkgdb at fedoraproject.org  Tue Aug 18 13:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:46:24 +0000
Subject: [pkgdb] maven-surefire had acl change status
Message-ID: <20090818134625.175D210F882@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven-surefire (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-surefire



From jakub at fedoraproject.org  Tue Aug 18 13:48:10 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 18 Aug 2009 13:48:10 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.283, 1.284 gcc.spec, 1.61,
	1.62 gcc44-power7.patch, 1.5, 1.6 sources, 1.287,
	1.288 gcc44-pr40971.patch, 1.2, NONE
Message-ID: <20090818134810.EA75211C00D7@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13553

Modified Files:
	.cvsignore gcc.spec gcc44-power7.patch sources 
Removed Files:
	gcc44-pr40971.patch 
Log Message:
4.4.1-6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- .cvsignore	7 Aug 2009 08:40:28 -0000	1.283
+++ .cvsignore	18 Aug 2009 13:48:09 -0000	1.284
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090807.tar.bz2
+gcc-4.4.1-20090818.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- gcc.spec	7 Aug 2009 08:40:28 -0000	1.61
+++ gcc.spec	18 Aug 2009 13:48:09 -0000	1.62
@@ -1,9 +1,9 @@
-%global DATE 20090807
-%global SVNREV 150557
+%global DATE 20090818
+%global SVNREV 150873
 %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 5
+%global gcc_release 6
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -163,7 +163,6 @@ Patch29: gcc44-libstdc++-docs.patch
 Patch30: gcc44-rh503816-1.patch
 Patch31: gcc44-rh503816-2.patch
 Patch32: gcc44-unique-object.patch
-Patch33: gcc44-pr40971.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -475,7 +474,6 @@ which are required to compile with the G
 %patch30 -p0 -b .rh503816-1~
 %patch31 -p0 -b .rh503816-2~
 %patch32 -p0 -b .unique-object~
-%patch33 -p0 -b .pr40971~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1814,6 +1812,12 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Aug 18 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-6
+- update from gcc-4_4-branch
+  - PRs bootstrap/41018, c/41046, debug/37801, debug/40990, fortran/40847,
+	rtl-optimization/41033, target/41015, target/41019, target/8603,
+	tree-optimization/41016
+
 * Fri Aug  7 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-5
 - update from gcc-4_4-branch
   - PRs c++/40948, target/40906

gcc44-power7.patch:
 config.in                                    |    8 
 config/rs6000/aix53.h                        |    8 
 config/rs6000/aix61.h                        |    8 
 config/rs6000/altivec.md                     |  708 +------
 config/rs6000/constraints.md                 |   28 
 config/rs6000/driver-rs6000.c                |  141 +
 config/rs6000/e500.h                         |    2 
 config/rs6000/linux64.h                      |    2 
 config/rs6000/linux64.opt                    |    2 
 config/rs6000/power7.md                      |  318 +++
 config/rs6000/ppc-asm.h                      |  139 +
 config/rs6000/predicates.md                  |   75 
 config/rs6000/rs6000-c.c                     |  103 -
 config/rs6000/rs6000-protos.h                |   11 
 config/rs6000/rs6000.c                       | 2644 ++++++++++++++++++++-------
 config/rs6000/rs6000.h                       |  464 +++-
 config/rs6000/rs6000.md                      |  421 +++-
 config/rs6000/rs6000.opt                     |   56 
 config/rs6000/spe.md                         |    2 
 config/rs6000/sysv4.h                        |    4 
 config/rs6000/sysv4.opt                      |    6 
 config/rs6000/t-rs6000                       |   30 
 config/rs6000/vector.md                      |  664 ++++++
 config/rs6000/vsx.md                         | 1004 ++++++++++
 configure                                    |   54 
 configure.ac                                 |   23 
 doc/invoke.texi                              |   24 
 doc/md.texi                                  |   17 
 reload.c                                     |   10 
 testsuite/gcc.dg/vmx/vmx.exp                 |    2 
 testsuite/gcc.target/powerpc/popcount-2.c    |    9 
 testsuite/gcc.target/powerpc/popcount-3.c    |    9 
 testsuite/gcc.target/powerpc/pr39457.c       |   56 
 testsuite/gcc.target/powerpc/vsx-builtin-1.c |   42 
 testsuite/gcc.target/powerpc/vsx-builtin-2.c |   42 
 testsuite/gcc.target/powerpc/vsx-vector-1.c  |   74 
 testsuite/gcc.target/powerpc/vsx-vector-2.c  |   74 
 testsuite/gcc.target/powerpc/vsx-vector-3.c  |   48 
 testsuite/gcc.target/powerpc/vsx-vector-4.c  |   48 
 testsuite/lib/target-supports.exp            |   60 
 40 files changed, 5999 insertions(+), 1441 deletions(-)

Index: gcc44-power7.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-power7.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gcc44-power7.patch	9 Jun 2009 15:21:28 -0000	1.5
+++ gcc44-power7.patch	18 Aug 2009 13:48:09 -0000	1.6
@@ -4651,7 +4651,7 @@
  
    switch (code)
      {
-@@ -2336,14 +2899,14 @@ rs6000_handle_option (size_t code, const
+@@ -2331,14 +2894,14 @@ rs6000_handle_option (size_t code, const
        rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
        break;
  
@@ -4673,7 +4673,7 @@
        break;
  
      case OPT_mspe:
-@@ -2972,6 +3535,9 @@ output_vec_const_move (rtx *operands)
+@@ -2967,6 +3530,9 @@ output_vec_const_move (rtx *operands)
    vec = operands[1];
    mode = GET_MODE (dest);
  
@@ -4683,7 +4683,7 @@
    if (TARGET_ALTIVEC)
      {
        rtx splat_vec;
-@@ -3195,20 +3761,21 @@ rs6000_expand_vector_init (rtx target, r
+@@ -3190,20 +3756,21 @@ rs6000_expand_vector_init (rtx target, r
    if (n_var == 0)
      {
        rtx const_vec = gen_rtx_CONST_VECTOR (mode, XVEC (vals, 0));
@@ -4708,7 +4708,7 @@
  	;	/* Splat vector element.  */
        else
  	{
-@@ -3218,6 +3785,18 @@ rs6000_expand_vector_init (rtx target, r
+@@ -3213,6 +3780,18 @@ rs6000_expand_vector_init (rtx target, r
  	}
      }
  
@@ -4727,7 +4727,7 @@
    /* Store value to stack temp.  Load vector element.  Splat.  */
    if (all_same)
      {
-@@ -3277,6 +3856,13 @@ rs6000_expand_vector_set (rtx target, rt
+@@ -3272,6 +3851,13 @@ rs6000_expand_vector_set (rtx target, rt
    int width = GET_MODE_SIZE (inner_mode);
    int i;
  
@@ -4741,7 +4741,7 @@
    /* Load single variable value.  */
    mem = assign_stack_temp (mode, GET_MODE_SIZE (inner_mode), 0);
    emit_move_insn (adjust_address_nv (mem, inner_mode, 0), val);
-@@ -3314,6 +3900,13 @@ rs6000_expand_vector_extract (rtx target
+@@ -3309,6 +3895,13 @@ rs6000_expand_vector_extract (rtx target
    enum machine_mode inner_mode = GET_MODE_INNER (mode);
    rtx mem, x;
  
@@ -4755,7 +4755,7 @@
    /* Allocate mode-sized buffer.  */
    mem = assign_stack_temp (mode, GET_MODE_SIZE (mode), 0);
  
-@@ -3632,9 +4225,13 @@ rs6000_legitimate_offset_address_p (enum
+@@ -3627,9 +4220,13 @@ rs6000_legitimate_offset_address_p (enum
      case V8HImode:
      case V4SFmode:
      case V4SImode:
@@ -4771,7 +4771,7 @@
  
      case V4HImode:
      case V2SImode:
-@@ -3651,6 +4248,11 @@ rs6000_legitimate_offset_address_p (enum
+@@ -3646,6 +4243,11 @@ rs6000_legitimate_offset_address_p (enum
        if (TARGET_E500_DOUBLE)
  	return SPE_CONST_OFFSET_OK (offset);
  
@@ -4783,7 +4783,7 @@
      case DDmode:
      case DImode:
        /* On e500v2, we may have:
-@@ -3721,7 +4323,9 @@ avoiding_indexed_address_p (enum machine
+@@ -3716,7 +4318,9 @@ avoiding_indexed_address_p (enum machine
  {
    /* Avoid indexed addressing for modes that have non-indexed
       load/store instruction forms.  */
@@ -4794,25 +4794,33 @@
  }
  
  inline bool
-@@ -3813,25 +4417,30 @@ rtx
+@@ -3808,15 +4412,10 @@ rtx
  rs6000_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
  			   enum machine_mode mode)
  {
 +  rtx ret = NULL_RTX;
 +  rtx orig_x = x;
-+
-   if (GET_CODE (x) == SYMBOL_REF)
-     {
-       enum tls_model model = SYMBOL_REF_TLS_MODEL (x);
-       if (model != 0)
+   unsigned int extra = 0;
+ 
+-  if (GET_CODE (x) == SYMBOL_REF)
+-    {
+-      enum tls_model model = SYMBOL_REF_TLS_MODEL (x);
+-      if (model != 0)
 -	return rs6000_legitimize_tls_address (x, model);
-+	ret = rs6000_legitimize_tls_address (x, model);
+-    }
+-
+   switch (mode)
+     {
+     case DFmode:
+@@ -3838,19 +4437,26 @@ rs6000_legitimize_address (rtx x, rtx ol
+       break;
      }
  
 -  if (GET_CODE (x) == PLUS
 -      && GET_CODE (XEXP (x, 0)) == REG
 -      && GET_CODE (XEXP (x, 1)) == CONST_INT
--      && (unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000) >= 0x10000
+-      && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
+-	  >= 0x10000 - extra)
 -      && !((TARGET_POWERPC64
 -	    && (mode == DImode || mode == TImode)
 -	    && (INTVAL (XEXP (x, 1)) & 3) != 0)
@@ -4821,11 +4829,17 @@
 -	   || (TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
 -				      || mode == DImode || mode == DDmode
 -				      || mode == TDmode))))
++  if (GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_TLS_MODEL (x))
++    {
++      enum tls_model model = SYMBOL_REF_TLS_MODEL (x);
++      ret = rs6000_legitimize_tls_address (x, model);
++    }
++
 +  else if (GET_CODE (x) == PLUS
 +	   && GET_CODE (XEXP (x, 0)) == REG
 +	   && GET_CODE (XEXP (x, 1)) == CONST_INT
 +	   && ((unsigned HOST_WIDE_INT) (INTVAL (XEXP (x, 1)) + 0x8000)
-+	       >= 0x10000)
++	       >= 0x10000 - extra)
 +	   && !((TARGET_POWERPC64
 +		 && (mode == DImode || mode == TImode)
 +		 && (INTVAL (XEXP (x, 1)) & 3) != 0)
@@ -4838,16 +4852,16 @@
      {
        HOST_WIDE_INT high_int, low_int;
        rtx sum;
-@@ -3839,7 +4448,7 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -3860,7 +4466,7 @@ rs6000_legitimize_address (rtx x, rtx ol
        high_int = INTVAL (XEXP (x, 1)) - low_int;
        sum = force_operand (gen_rtx_PLUS (Pmode, XEXP (x, 0),
  					 GEN_INT (high_int)), 0);
--      return gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
-+      ret = gen_rtx_PLUS (Pmode, sum, GEN_INT (low_int));
+-      return plus_constant (sum, low_int);
++      ret = plus_constant (sum, low_int);
      }
    else if (GET_CODE (x) == PLUS
  	   && GET_CODE (XEXP (x, 0)) == REG
-@@ -3855,32 +4464,29 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -3876,32 +4482,29 @@ rs6000_legitimize_address (rtx x, rtx ol
  	   && mode != TFmode
  	   && mode != TDmode)
      {
@@ -4892,7 +4906,7 @@
           rtx op1 = XEXP (x, 0);
           rtx op2 = XEXP (x, 1);
           rtx y;
-@@ -3899,12 +4505,12 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -3920,12 +4523,12 @@ rs6000_legitimize_address (rtx x, rtx ol
           y = gen_rtx_PLUS (Pmode, op1, op2);
  
           if ((GET_MODE_SIZE (mode) > 8 || mode == DDmode) && REG_P (op2))
@@ -4909,7 +4923,7 @@
      }
    else if (TARGET_ELF
  	   && TARGET_32BIT
-@@ -3920,7 +4526,7 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -3941,7 +4544,7 @@ rs6000_legitimize_address (rtx x, rtx ol
      {
        rtx reg = gen_reg_rtx (Pmode);
        emit_insn (gen_elf_high (reg, x));
@@ -4918,7 +4932,7 @@
      }
    else if (TARGET_MACHO && TARGET_32BIT && TARGET_NO_TOC
  	   && ! flag_pic
-@@ -3938,17 +4544,35 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -3959,17 +4562,35 @@ rs6000_legitimize_address (rtx x, rtx ol
      {
        rtx reg = gen_reg_rtx (Pmode);
        emit_insn (gen_macho_high (reg, x));
@@ -4957,7 +4971,7 @@
  }
  
  /* This is called from dwarf2out.c via TARGET_ASM_OUTPUT_DWARF_DTPREL.
-@@ -4237,6 +4861,9 @@ rs6000_legitimize_reload_address (rtx x,
+@@ -4258,6 +4879,9 @@ rs6000_legitimize_reload_address (rtx x,
  				  int opnum, int type,
  				  int ind_levels ATTRIBUTE_UNUSED, int *win)
  {
@@ -4967,7 +4981,7 @@
    /* We must recognize output that we have already generated ourselves.  */
    if (GET_CODE (x) == PLUS
        && GET_CODE (XEXP (x, 0)) == PLUS
-@@ -4248,17 +4875,17 @@ rs6000_legitimize_reload_address (rtx x,
+@@ -4269,17 +4893,17 @@ rs6000_legitimize_reload_address (rtx x,
  		   BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0,
  		   opnum, (enum reload_type)type);
        *win = 1;
@@ -4993,7 +5007,7 @@
      {
        /* Result of previous invocation of this function on Darwin
  	 floating point constant.  */
-@@ -4266,40 +4893,40 @@ rs6000_legitimize_reload_address (rtx x,
+@@ -4287,40 +4911,40 @@ rs6000_legitimize_reload_address (rtx x,
  		   BASE_REG_CLASS, Pmode, VOIDmode, 0, 0,
  		   opnum, (enum reload_type)type);
        *win = 1;
@@ -5055,7 +5069,7 @@
      {
        HOST_WIDE_INT val = INTVAL (XEXP (x, 1));
        HOST_WIDE_INT low = ((val & 0xffff) ^ 0x8000) - 0x8000;
-@@ -4310,42 +4937,45 @@ rs6000_legitimize_reload_address (rtx x,
+@@ -4331,42 +4955,45 @@ rs6000_legitimize_reload_address (rtx x,
        if (high + low != val)
  	{
  	  *win = 0;
@@ -5129,7 +5143,7 @@
      {
  #if TARGET_MACHO
        if (flag_pic)
-@@ -4364,37 +4994,63 @@ rs6000_legitimize_reload_address (rtx x,
+@@ -4385,37 +5012,63 @@ rs6000_legitimize_reload_address (rtx x,
  		   BASE_REG_CLASS, Pmode, VOIDmode, 0, 0,
  		   opnum, (enum reload_type)type);
        *win = 1;
@@ -5210,7 +5224,7 @@
  }
  
  /* GO_IF_LEGITIMATE_ADDRESS recognizes an RTL expression
-@@ -4417,77 +5073,101 @@ rs6000_legitimize_reload_address (rtx x,
+@@ -4438,77 +5091,101 @@ rs6000_legitimize_reload_address (rtx x,
  int
  rs6000_legitimate_address (enum machine_mode mode, rtx x, int reg_ok_strict)
  {
@@ -5375,7 +5389,7 @@
  }
  
  /* Go to LABEL if ADDR (a legitimate address expression)
-@@ -4504,28 +5184,46 @@ rs6000_legitimate_address (enum machine_
+@@ -4525,28 +5202,46 @@ rs6000_legitimate_address (enum machine_
  bool
  rs6000_mode_dependent_address (rtx addr)
  {
@@ -5426,7 +5440,7 @@
  }
  
  /* Implement FIND_BASE_TERM.  */
-@@ -4576,43 +5274,6 @@ rs6000_offsettable_memref_p (rtx op)
+@@ -4597,43 +5292,6 @@ rs6000_offsettable_memref_p (rtx op)
    return rs6000_legitimate_offset_address_p (GET_MODE (op), XEXP (op, 0), 1);
  }
  
@@ -5470,7 +5484,7 @@
  /* Change register usage conditional on target flags.  */
  void
  rs6000_conditional_register_usage (void)
-@@ -4677,14 +5338,14 @@ rs6000_conditional_register_usage (void)
+@@ -4698,14 +5356,14 @@ rs6000_conditional_register_usage (void)
  	= call_really_used_regs[14] = 1;
      }
  
@@ -5487,7 +5501,7 @@
      global_regs[VSCR_REGNO] = 1;
  
    if (TARGET_ALTIVEC_ABI)
-@@ -4902,6 +5563,20 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -4923,6 +5581,20 @@ rs6000_emit_move (rtx dest, rtx source, 
    operands[0] = dest;
    operands[1] = source;
  
@@ -5508,7 +5522,7 @@
    /* Sanity checks.  Check that we get CONST_DOUBLE only when we should.  */
    if (GET_CODE (operands[1]) == CONST_DOUBLE
        && ! FLOAT_MODE_P (mode)
-@@ -5106,6 +5781,8 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -5127,6 +5799,8 @@ rs6000_emit_move (rtx dest, rtx source, 
      case V2SFmode:
      case V2SImode:
      case V1DImode:
@@ -5517,7 +5531,7 @@
        if (CONSTANT_P (operands[1])
  	  && !easy_vector_constant (operands[1], mode))
  	operands[1] = force_const_mem (mode, operands[1]);
-@@ -5275,6 +5952,9 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -5296,6 +5970,9 @@ rs6000_emit_move (rtx dest, rtx source, 
        break;
  
      case TImode:
@@ -5527,7 +5541,7 @@
        rs6000_eliminate_indexed_memrefs (operands);
  
        if (TARGET_POWER)
-@@ -5290,7 +5970,7 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -5311,7 +5988,7 @@ rs6000_emit_move (rtx dest, rtx source, 
        break;
  
      default:
@@ -5536,7 +5550,7 @@
      }
  
    /* Above, we may have called force_const_mem which may have returned
-@@ -5310,10 +5990,10 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -5331,10 +6008,10 @@ rs6000_emit_move (rtx dest, rtx source, 
     && TARGET_HARD_FLOAT && TARGET_FPRS)
  
  /* Nonzero if we can use an AltiVec register to pass this arg.  */
@@ -5551,7 +5565,7 @@
     && (NAMED))
  
  /* Return a nonzero value to say to return the function value in
-@@ -5554,7 +6234,7 @@ function_arg_boundary (enum machine_mode
+@@ -5575,7 +6252,7 @@ function_arg_boundary (enum machine_mode
  	       && int_size_in_bytes (type) >= 8
  	       && int_size_in_bytes (type) < 16))
      return 64;
@@ -5560,7 +5574,7 @@
  	   || (type && TREE_CODE (type) == VECTOR_TYPE
  	       && int_size_in_bytes (type) >= 16))
      return 128;
-@@ -5699,7 +6379,7 @@ function_arg_advance (CUMULATIVE_ARGS *c
+@@ -5720,7 +6397,7 @@ function_arg_advance (CUMULATIVE_ARGS *c
      cum->nargs_prototype--;
  
    if (TARGET_ALTIVEC_ABI
@@ -5569,7 +5583,7 @@
  	  || (type && TREE_CODE (type) == VECTOR_TYPE
  	      && int_size_in_bytes (type) == 16)))
      {
-@@ -6293,7 +6973,7 @@ function_arg (CUMULATIVE_ARGS *cum, enum
+@@ -6314,7 +6991,7 @@ function_arg (CUMULATIVE_ARGS *cum, enum
      else
        return gen_rtx_REG (mode, cum->vregno);
    else if (TARGET_ALTIVEC_ABI
@@ -5578,7 +5592,7 @@
  	       || (type && TREE_CODE (type) == VECTOR_TYPE
  		   && int_size_in_bytes (type) == 16)))
      {
-@@ -7217,10 +7897,13 @@ static const struct builtin_description 
+@@ -7238,10 +7915,13 @@ static const struct builtin_description 
    { MASK_ALTIVEC, CODE_FOR_altivec_vperm_v4si, "__builtin_altivec_vperm_4si", ALTIVEC_BUILTIN_VPERM_4SI },
    { MASK_ALTIVEC, CODE_FOR_altivec_vperm_v8hi, "__builtin_altivec_vperm_8hi", ALTIVEC_BUILTIN_VPERM_8HI },
    { MASK_ALTIVEC, CODE_FOR_altivec_vperm_v16qi, "__builtin_altivec_vperm_16qi", ALTIVEC_BUILTIN_VPERM_16QI },
@@ -5596,7 +5610,7 @@
    { MASK_ALTIVEC, CODE_FOR_altivec_vsldoi_v16qi, "__builtin_altivec_vsldoi_16qi", ALTIVEC_BUILTIN_VSLDOI_16QI },
    { MASK_ALTIVEC, CODE_FOR_altivec_vsldoi_v8hi, "__builtin_altivec_vsldoi_8hi", ALTIVEC_BUILTIN_VSLDOI_8HI },
    { MASK_ALTIVEC, CODE_FOR_altivec_vsldoi_v4si, "__builtin_altivec_vsldoi_4si", ALTIVEC_BUILTIN_VSLDOI_4SI },
-@@ -7242,6 +7925,16 @@ static const struct builtin_description 
+@@ -7263,6 +7943,16 @@ static const struct builtin_description 
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_perm", ALTIVEC_BUILTIN_VEC_PERM },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_sel", ALTIVEC_BUILTIN_VEC_SEL },
  
@@ -5613,7 +5627,7 @@
    { 0, CODE_FOR_paired_msub, "__builtin_paired_msub", PAIRED_BUILTIN_MSUB },
    { 0, CODE_FOR_paired_madd, "__builtin_paired_madd", PAIRED_BUILTIN_MADD },
    { 0, CODE_FOR_paired_madds0, "__builtin_paired_madds0", PAIRED_BUILTIN_MADDS0 },
-@@ -7294,18 +7987,18 @@ static struct builtin_description bdesc_
+@@ -7315,18 +8005,18 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_altivec_vcfux, "__builtin_altivec_vcfux", ALTIVEC_BUILTIN_VCFUX },
    { MASK_ALTIVEC, CODE_FOR_altivec_vcfsx, "__builtin_altivec_vcfsx", ALTIVEC_BUILTIN_VCFSX },
    { MASK_ALTIVEC, CODE_FOR_altivec_vcmpbfp, "__builtin_altivec_vcmpbfp", ALTIVEC_BUILTIN_VCMPBFP },
@@ -5644,7 +5658,7 @@
    { MASK_ALTIVEC, CODE_FOR_altivec_vctsxs, "__builtin_altivec_vctsxs", ALTIVEC_BUILTIN_VCTSXS },
    { MASK_ALTIVEC, CODE_FOR_altivec_vctuxs, "__builtin_altivec_vctuxs", ALTIVEC_BUILTIN_VCTUXS },
    { MASK_ALTIVEC, CODE_FOR_umaxv16qi3, "__builtin_altivec_vmaxub", ALTIVEC_BUILTIN_VMAXUB },
-@@ -7336,7 +8029,7 @@ static struct builtin_description bdesc_
+@@ -7357,7 +8047,7 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_altivec_vmulosb, "__builtin_altivec_vmulosb", ALTIVEC_BUILTIN_VMULOSB },
    { MASK_ALTIVEC, CODE_FOR_altivec_vmulouh, "__builtin_altivec_vmulouh", ALTIVEC_BUILTIN_VMULOUH },
    { MASK_ALTIVEC, CODE_FOR_altivec_vmulosh, "__builtin_altivec_vmulosh", ALTIVEC_BUILTIN_VMULOSH },
@@ -5653,7 +5667,7 @@
    { MASK_ALTIVEC, CODE_FOR_iorv4si3, "__builtin_altivec_vor", ALTIVEC_BUILTIN_VOR },
    { MASK_ALTIVEC, CODE_FOR_altivec_vpkuhum, "__builtin_altivec_vpkuhum", ALTIVEC_BUILTIN_VPKUHUM },
    { MASK_ALTIVEC, CODE_FOR_altivec_vpkuwum, "__builtin_altivec_vpkuwum", ALTIVEC_BUILTIN_VPKUWUM },
-@@ -7384,8 +8077,24 @@ static struct builtin_description bdesc_
+@@ -7405,8 +8095,24 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_altivec_vsumsws, "__builtin_altivec_vsumsws", ALTIVEC_BUILTIN_VSUMSWS },
    { MASK_ALTIVEC, CODE_FOR_xorv4si3, "__builtin_altivec_vxor", ALTIVEC_BUILTIN_VXOR },
  
@@ -5680,7 +5694,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vadduwm", ALTIVEC_BUILTIN_VEC_VADDUWM },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vadduhm", ALTIVEC_BUILTIN_VEC_VADDUHM },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vaddubm", ALTIVEC_BUILTIN_VEC_VADDUBM },
-@@ -7397,8 +8106,8 @@ static struct builtin_description bdesc_
+@@ -7418,8 +8124,8 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vadduhs", ALTIVEC_BUILTIN_VEC_VADDUHS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vaddsbs", ALTIVEC_BUILTIN_VEC_VADDSBS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vaddubs", ALTIVEC_BUILTIN_VEC_VADDUBS },
@@ -5691,7 +5705,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_avg", ALTIVEC_BUILTIN_VEC_AVG },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vavgsw", ALTIVEC_BUILTIN_VEC_VAVGSW },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vavguw", ALTIVEC_BUILTIN_VEC_VAVGUW },
-@@ -7423,8 +8132,8 @@ static struct builtin_description bdesc_
+@@ -7444,8 +8150,8 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vcmpgtub", ALTIVEC_BUILTIN_VEC_VCMPGTUB },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_cmple", ALTIVEC_BUILTIN_VEC_CMPLE },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_cmplt", ALTIVEC_BUILTIN_VEC_CMPLT },
@@ -5702,7 +5716,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmaxsw", ALTIVEC_BUILTIN_VEC_VMAXSW },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmaxuw", ALTIVEC_BUILTIN_VEC_VMAXUW },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmaxsh", ALTIVEC_BUILTIN_VEC_VMAXSH },
-@@ -7439,8 +8148,8 @@ static struct builtin_description bdesc_
+@@ -7460,8 +8166,8 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmrglw", ALTIVEC_BUILTIN_VEC_VMRGLW },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmrglh", ALTIVEC_BUILTIN_VEC_VMRGLH },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmrglb", ALTIVEC_BUILTIN_VEC_VMRGLB },
@@ -5713,7 +5727,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vminsw", ALTIVEC_BUILTIN_VEC_VMINSW },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vminuw", ALTIVEC_BUILTIN_VEC_VMINUW },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vminsh", ALTIVEC_BUILTIN_VEC_VMINSH },
-@@ -7457,8 +8166,8 @@ static struct builtin_description bdesc_
+@@ -7478,8 +8184,8 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmulouh", ALTIVEC_BUILTIN_VEC_VMULOUH },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmulosb", ALTIVEC_BUILTIN_VEC_VMULOSB },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vmuloub", ALTIVEC_BUILTIN_VEC_VMULOUB },
@@ -5724,7 +5738,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_pack", ALTIVEC_BUILTIN_VEC_PACK },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vpkuwum", ALTIVEC_BUILTIN_VEC_VPKUWUM },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vpkuhum", ALTIVEC_BUILTIN_VEC_VPKUHUM },
-@@ -7491,8 +8200,8 @@ static struct builtin_description bdesc_
+@@ -7512,8 +8218,8 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vsrab", ALTIVEC_BUILTIN_VEC_VSRAB },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_srl", ALTIVEC_BUILTIN_VEC_SRL },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_sro", ALTIVEC_BUILTIN_VEC_SRO },
@@ -5735,7 +5749,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vsubuwm", ALTIVEC_BUILTIN_VEC_VSUBUWM },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vsubuhm", ALTIVEC_BUILTIN_VEC_VSUBUHM },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vsububm", ALTIVEC_BUILTIN_VEC_VSUBUBM },
-@@ -7510,7 +8219,10 @@ static struct builtin_description bdesc_
+@@ -7531,7 +8237,10 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vsum4ubs", ALTIVEC_BUILTIN_VEC_VSUM4UBS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_sum2s", ALTIVEC_BUILTIN_VEC_SUM2S },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_sums", ALTIVEC_BUILTIN_VEC_SUMS },
@@ -5747,7 +5761,7 @@
  
    { 0, CODE_FOR_divv2sf3, "__builtin_paired_divv2sf3", PAIRED_BUILTIN_DIVV2SF3 },
    { 0, CODE_FOR_addv2sf3, "__builtin_paired_addv2sf3", PAIRED_BUILTIN_ADDV2SF3 },
-@@ -7755,7 +8467,11 @@ static const struct builtin_description 
+@@ -7776,7 +8485,11 @@ static const struct builtin_description 
    { MASK_ALTIVEC, CODE_FOR_absv16qi2, "__builtin_altivec_abs_v16qi", ALTIVEC_BUILTIN_ABS_V16QI },
    { MASK_ALTIVEC, CODE_FOR_altivec_abss_v4si, "__builtin_altivec_abss_v4si", ALTIVEC_BUILTIN_ABSS_V4SI },
    { MASK_ALTIVEC, CODE_FOR_altivec_abss_v8hi, "__builtin_altivec_abss_v8hi", ALTIVEC_BUILTIN_ABSS_V8HI },
@@ -5760,7 +5774,7 @@
  };
  
  /* Simple unary operations: VECb = foo (unsigned literal) or VECb =
-@@ -7781,6 +8497,18 @@ static struct builtin_description bdesc_
+@@ -7802,6 +8515,18 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_altivec_vupklpx, "__builtin_altivec_vupklpx", ALTIVEC_BUILTIN_VUPKLPX },
    { MASK_ALTIVEC, CODE_FOR_altivec_vupklsh, "__builtin_altivec_vupklsh", ALTIVEC_BUILTIN_VUPKLSH },
  
@@ -5779,7 +5793,7 @@
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_abs", ALTIVEC_BUILTIN_VEC_ABS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_abss", ALTIVEC_BUILTIN_VEC_ABSS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_ceil", ALTIVEC_BUILTIN_VEC_CEIL },
-@@ -7801,6 +8529,20 @@ static struct builtin_description bdesc_
+@@ -7822,6 +8547,20 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vupklsh", ALTIVEC_BUILTIN_VEC_VUPKLSH },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vupklsb", ALTIVEC_BUILTIN_VEC_VUPKLSB },
  
@@ -5800,7 +5814,7 @@
    /* The SPE unary builtins must start with SPE_BUILTIN_EVABS and
       end with SPE_BUILTIN_EVSUBFUSIAAW.  */
    { 0, CODE_FOR_spe_evabs, "__builtin_spe_evabs", SPE_BUILTIN_EVABS },
-@@ -8357,16 +9099,16 @@ altivec_expand_ld_builtin (tree exp, rtx
+@@ -8378,16 +9117,16 @@ altivec_expand_ld_builtin (tree exp, rtx
    switch (fcode)
      {
      case ALTIVEC_BUILTIN_LD_INTERNAL_16qi:
@@ -5821,7 +5835,7 @@
        break;
      default:
        *expandedp = false;
-@@ -8410,16 +9152,16 @@ altivec_expand_st_builtin (tree exp, rtx
+@@ -8431,16 +9170,16 @@ altivec_expand_st_builtin (tree exp, rtx
    switch (fcode)
      {
      case ALTIVEC_BUILTIN_ST_INTERNAL_16qi:
@@ -5842,7 +5856,7 @@
        break;
      default:
        *expandedp = false;
-@@ -8814,6 +9556,26 @@ altivec_expand_builtin (tree exp, rtx ta
+@@ -8835,6 +9574,26 @@ altivec_expand_builtin (tree exp, rtx ta
  /* Expand the builtin in EXP and store the result in TARGET.  Store
     true in *EXPANDEDP if we found a builtin to expand.  */
  static rtx
@@ -5869,7 +5883,7 @@
  paired_expand_builtin (tree exp, rtx target, bool * expandedp)
  {
    tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
-@@ -9325,6 +10087,13 @@ rs6000_expand_builtin (tree exp, rtx tar
+@@ -9346,6 +10105,13 @@ rs6000_expand_builtin (tree exp, rtx tar
        if (success)
  	return ret;
      }
@@ -5883,7 +5897,7 @@
    if (TARGET_SPE)
      {
        ret = spe_expand_builtin (exp, target, &success);
-@@ -9340,7 +10109,7 @@ rs6000_expand_builtin (tree exp, rtx tar
+@@ -9361,7 +10127,7 @@ rs6000_expand_builtin (tree exp, rtx tar
  	return ret;
      }  
  
@@ -5892,7 +5906,7 @@
  
    /* Handle simple unary operations.  */
    d = (struct builtin_description *) bdesc_1arg;
-@@ -9377,6 +10146,8 @@ rs6000_init_builtins (void)
+@@ -9398,6 +10164,8 @@ rs6000_init_builtins (void)
  {
    V2SI_type_node = build_vector_type (intSI_type_node, 2);
    V2SF_type_node = build_vector_type (float_type_node, 2);
@@ -5901,7 +5915,7 @@
    V4HI_type_node = build_vector_type (intHI_type_node, 4);
    V4SI_type_node = build_vector_type (intSI_type_node, 4);
    V4SF_type_node = build_vector_type (float_type_node, 4);
-@@ -9409,7 +10180,10 @@ rs6000_init_builtins (void)
+@@ -9430,7 +10198,10 @@ rs6000_init_builtins (void)
    uintHI_type_internal_node = unsigned_intHI_type_node;
    intSI_type_internal_node = intSI_type_node;
    uintSI_type_internal_node = unsigned_intSI_type_node;
@@ -5912,7 +5926,7 @@
    void_type_internal_node = void_type_node;
  
    (*lang_hooks.decls.pushdecl) (build_decl (TYPE_DECL,
-@@ -9467,13 +10241,18 @@ rs6000_init_builtins (void)
+@@ -9488,13 +10259,18 @@ rs6000_init_builtins (void)
  					    get_identifier ("__vector __pixel"),
  					    pixel_V8HI_type_node));
  
@@ -5932,7 +5946,7 @@
      rs6000_common_init_builtins ();
    if (TARGET_PPC_GFXOPT)
      {
-@@ -9936,6 +10715,8 @@ altivec_init_builtins (void)
+@@ -9957,6 +10733,8 @@ altivec_init_builtins (void)
      = build_function_type_list (V16QI_type_node, V16QI_type_node, NULL_TREE);
    tree v4sf_ftype_v4sf
      = build_function_type_list (V4SF_type_node, V4SF_type_node, NULL_TREE);
@@ -5941,7 +5955,7 @@
    tree void_ftype_pcvoid_int_int
      = build_function_type_list (void_type_node,
  				pcvoid_type_node, integer_type_node,
-@@ -10093,6 +10874,9 @@ altivec_init_builtins (void)
+@@ -10114,6 +10892,9 @@ altivec_init_builtins (void)
  	case V4SFmode:
  	  type = v4sf_ftype_v4sf;
  	  break;
@@ -5951,7 +5965,7 @@
  	default:
  	  gcc_unreachable ();
  	}
-@@ -10412,6 +11196,38 @@ rs6000_common_init_builtins (void)
+@@ -10433,6 +11214,38 @@ rs6000_common_init_builtins (void)
    tree int_ftype_v8hi_v8hi
      = build_function_type_list (integer_type_node,
  				V8HI_type_node, V8HI_type_node, NULL_TREE);
@@ -5990,7 +6004,7 @@
  
    /* Add the simple ternary operators.  */
    d = bdesc_3arg;
-@@ -10448,6 +11264,12 @@ rs6000_common_init_builtins (void)
+@@ -10469,6 +11282,12 @@ rs6000_common_init_builtins (void)
  	    case VOIDmode:
  	      type = opaque_ftype_opaque_opaque_opaque;
  	      break;
@@ -6003,7 +6017,7 @@
  	    case V4SImode:
  	      type = v4si_ftype_v4si_v4si_v4si;
  	      break;
-@@ -10471,6 +11293,12 @@ rs6000_common_init_builtins (void)
+@@ -10492,6 +11311,12 @@ rs6000_common_init_builtins (void)
  	{
  	  switch (mode0)
  	    {
@@ -6016,7 +6030,7 @@
  	    case V4SImode:
  	      type = v4si_ftype_v4si_v4si_v16qi;
  	      break;
-@@ -10556,6 +11384,9 @@ rs6000_common_init_builtins (void)
+@@ -10577,6 +11402,9 @@ rs6000_common_init_builtins (void)
  	    case VOIDmode:
  	      type = opaque_ftype_opaque_opaque;
  	      break;
@@ -6026,7 +6040,7 @@
  	    case V4SFmode:
  	      type = v4sf_ftype_v4sf_v4sf;
  	      break;
-@@ -10705,6 +11536,8 @@ rs6000_common_init_builtins (void)
+@@ -10726,6 +11554,8 @@ rs6000_common_init_builtins (void)
  	type = v16qi_ftype_int;
        else if (mode0 == VOIDmode && mode1 == VOIDmode)
  	type = opaque_ftype_opaque;
@@ -6035,7 +6049,7 @@
        else if (mode0 == V4SFmode && mode1 == V4SFmode)
  	type = v4sf_ftype_v4sf;
        else if (mode0 == V8HImode && mode1 == V16QImode)
-@@ -10726,6 +11559,14 @@ rs6000_common_init_builtins (void)
+@@ -10747,6 +11577,14 @@ rs6000_common_init_builtins (void)
  	type = v2si_ftype_v2sf;
        else if (mode0 == V2SImode && mode1 == QImode)
  	type = v2si_ftype_char;
@@ -6050,7 +6064,7 @@
        else
  	gcc_unreachable ();
  
-@@ -11508,8 +12349,10 @@ rtx
+@@ -11529,8 +12367,10 @@ rtx
  rs6000_secondary_memory_needed_rtx (enum machine_mode mode)
  {
    static bool eliminated = false;
@@ -6062,13 +6076,13 @@
    else
      {
        rtx mem = cfun->machine->sdmode_stack_slot;
-@@ -11521,8 +12364,21 @@ rs6000_secondary_memory_needed_rtx (enum
+@@ -11542,8 +12382,21 @@ rs6000_secondary_memory_needed_rtx (enum
  	  cfun->machine->sdmode_stack_slot = mem;
  	  eliminated = true;
  	}
 -      return mem;
 +      ret = mem;
-     }
++    }
 +
 +  if (TARGET_DEBUG_ADDR)
 +    {
@@ -6079,13 +6093,13 @@
 +      else
 +	debug_rtx (ret);
 +      fprintf (stderr, "\n");
-+    }
+     }
 +
 +  return ret;
  }
  
  static tree
-@@ -11556,6 +12412,282 @@ rs6000_check_sdmode (tree *tp, int *walk
+@@ -11577,6 +12430,282 @@ rs6000_check_sdmode (tree *tp, int *walk
    return NULL_TREE;
  }
  
@@ -6368,7 +6382,7 @@
  
  /* Allocate a 64-bit stack slot to be used for copying SDmode
     values through if this function has any SDmode references.  */
-@@ -11606,15 +12738,146 @@ rs6000_instantiate_decls (void)
+@@ -11627,15 +12756,146 @@ rs6000_instantiate_decls (void)
      instantiate_decl_rtl (cfun->machine->sdmode_stack_slot);
  }
  
@@ -6516,7 +6530,7 @@
    int regno;
  
    if (TARGET_ELF || (DEFAULT_ABI == ABI_DARWIN
-@@ -11635,51 +12898,112 @@ rs6000_secondary_reload_class (enum reg_
+@@ -11656,51 +12916,112 @@ rs6000_secondary_reload_class (enum reg_
  	      || GET_CODE (in) == HIGH
  	      || GET_CODE (in) == LABEL_REF
  	      || GET_CODE (in) == CONST))
@@ -6662,7 +6676,7 @@
  }
  

  /* Given a comparison operation, return the bit number in CCR to test.  We
-@@ -12411,6 +13735,26 @@ print_operand (FILE *file, rtx x, int co
+@@ -12432,6 +13753,26 @@ print_operand (FILE *file, rtx x, int co
        fprintf (file, "%d", i + 1);
        return;
  
@@ -6689,7 +6703,7 @@
      case 'X':
        if (GET_CODE (x) == MEM
  	  && (legitimate_indexed_address_p (XEXP (x, 0), 0)
-@@ -12523,13 +13867,16 @@ print_operand (FILE *file, rtx x, int co
+@@ -12544,13 +13885,16 @@ print_operand (FILE *file, rtx x, int co
  
  	    /* Fall through.  Must be [reg+reg].  */
  	  }
@@ -6708,7 +6722,7 @@
  	else
  	  {
  	    if (!GET_CODE (tmp) == PLUS
-@@ -13301,55 +14648,62 @@ output_e500_flip_gt_bit (rtx dst, rtx sr
+@@ -13322,55 +14666,62 @@ output_e500_flip_gt_bit (rtx dst, rtx sr
    return string;
  }
  
@@ -6810,7 +6824,7 @@
  }
  
  /* Emit vector compare for operands OP0 and OP1 using code RCODE.
-@@ -13360,129 +14714,111 @@ rs6000_emit_vector_compare (enum rtx_cod
+@@ -13381,129 +14732,111 @@ rs6000_emit_vector_compare (enum rtx_cod
  			    rtx op0, rtx op1,
  			    enum machine_mode dmode)
  {
@@ -7029,7 +7043,7 @@
        if (swap_operands)
  	{
  	  rtx tmp;
-@@ -13490,69 +14826,23 @@ rs6000_emit_vector_compare (enum rtx_cod
+@@ -13511,69 +14844,23 @@ rs6000_emit_vector_compare (enum rtx_cod
  	  op0 = op1;
  	  op1 = tmp;
  	}
@@ -7113,7 +7127,7 @@
  }
  
  /* Emit vector conditional expression.
-@@ -13567,15 +14857,29 @@ rs6000_emit_vector_cond_expr (rtx dest, 
+@@ -13588,15 +14875,29 @@ rs6000_emit_vector_cond_expr (rtx dest, 
    enum rtx_code rcode = GET_CODE (cond);
    rtx mask;
  
@@ -7146,7 +7160,7 @@
  }
  
  /* Emit a conditional move: move TRUE_COND to DEST if OP of the
-@@ -13771,8 +15075,8 @@ rs6000_emit_int_cmove (rtx dest, rtx op,
+@@ -13792,8 +15093,8 @@ rs6000_emit_int_cmove (rtx dest, rtx op,
  {
    rtx condition_rtx, cr;
  
@@ -7157,7 +7171,7 @@
      return 0;
  
    /* We still have to do the compare, because isel doesn't do a
-@@ -13781,12 +15085,24 @@ rs6000_emit_int_cmove (rtx dest, rtx op,
+@@ -13802,12 +15103,24 @@ rs6000_emit_int_cmove (rtx dest, rtx op,
    condition_rtx = rs6000_generate_compare (GET_CODE (op));
    cr = XEXP (condition_rtx, 0);
  
@@ -7187,7 +7201,7 @@
  
    return 1;
  }
-@@ -13813,6 +15129,15 @@ rs6000_emit_minmax (rtx dest, enum rtx_c
+@@ -13834,6 +15147,15 @@ rs6000_emit_minmax (rtx dest, enum rtx_c
    enum rtx_code c;
    rtx target;
  
@@ -7203,7 +7217,7 @@
    if (code == SMAX || code == SMIN)
      c = GE;
    else
-@@ -15790,6 +17115,7 @@ emit_frame_save (rtx frame_reg, rtx fram
+@@ -15811,6 +17133,7 @@ emit_frame_save (rtx frame_reg, rtx fram
  
    /* Some cases that need register indexed addressing.  */
    if ((TARGET_ALTIVEC_ABI && ALTIVEC_VECTOR_MODE (mode))
@@ -7211,7 +7225,7 @@
        || (TARGET_E500_DOUBLE && mode == DFmode)
        || (TARGET_SPE_ABI
  	  && SPE_VECTOR_MODE (mode)
-@@ -18804,6 +20130,7 @@ rs6000_adjust_cost (rtx insn, rtx link, 
+@@ -18923,6 +20246,7 @@ rs6000_adjust_cost (rtx insn, rtx link, 
                   || rs6000_cpu_attr == CPU_PPC7450
                   || rs6000_cpu_attr == CPU_POWER4
                   || rs6000_cpu_attr == CPU_POWER5
@@ -7219,7 +7233,7 @@
                   || rs6000_cpu_attr == CPU_CELL)
                  && recog_memoized (dep_insn)
                  && (INSN_CODE (dep_insn) >= 0))
-@@ -19043,6 +20370,35 @@ rs6000_adjust_cost (rtx insn, rtx link, 
+@@ -19162,6 +20486,35 @@ rs6000_adjust_cost (rtx insn, rtx link, 
    return cost;
  }
  
@@ -7255,7 +7269,7 @@
  /* The function returns a true if INSN is microcoded.
     Return false otherwise.  */
  
-@@ -19324,6 +20680,7 @@ rs6000_issue_rate (void)
+@@ -19443,6 +20796,7 @@ rs6000_issue_rate (void)
    case CPU_POWER4:
    case CPU_POWER5:
    case CPU_POWER6:
@@ -7263,7 +7277,7 @@
      return 5;
    default:
      return 1;
-@@ -19925,6 +21282,41 @@ insn_must_be_first_in_group (rtx insn)
+@@ -20044,6 +21398,41 @@ insn_must_be_first_in_group (rtx insn)
            break;
          }
        break;
@@ -7305,7 +7319,7 @@
      default:
        break;
      }
-@@ -19986,6 +21378,23 @@ insn_must_be_last_in_group (rtx insn)
+@@ -20105,6 +21494,23 @@ insn_must_be_last_in_group (rtx insn)
          break;
      }
      break;
@@ -7329,7 +7343,7 @@
    default:
      break;
    }
-@@ -20558,8 +21967,8 @@ rs6000_handle_altivec_attribute (tree *n
+@@ -20677,8 +22083,8 @@ rs6000_handle_altivec_attribute (tree *n
    else if (type == long_long_unsigned_type_node
             || type == long_long_integer_type_node)
      error ("use of %<long long%> in AltiVec types is invalid");
@@ -7340,7 +7354,7 @@
    else if (type == long_double_type_node)
      error ("use of %<long double%> in AltiVec types is invalid");
    else if (type == boolean_type_node)
-@@ -20585,6 +21994,7 @@ rs6000_handle_altivec_attribute (tree *n
+@@ -20704,6 +22110,7 @@ rs6000_handle_altivec_attribute (tree *n
  	  result = (unsigned_p ? unsigned_V16QI_type_node : V16QI_type_node);
  	  break;
  	case SFmode: result = V4SF_type_node; break;
@@ -7348,7 +7362,7 @@
  	  /* If the user says 'vector int bool', we may be handed the 'bool'
  	     attribute _before_ the 'vector' attribute, and so select the
  	     proper type in the 'b' case below.  */
-@@ -22106,6 +23516,43 @@ rs6000_rtx_costs (rtx x, int code, int o
+@@ -22242,6 +23649,43 @@ rs6000_rtx_costs (rtx x, int code, int o
    return false;
  }
  
@@ -7392,7 +7406,7 @@
  /* A C expression returning the cost of moving data from a register of class
     CLASS1 to one of CLASS2.  */
  
-@@ -22120,7 +23567,7 @@ rs6000_register_move_cost (enum machine_
+@@ -22256,7 +23700,7 @@ rs6000_register_move_cost (enum machine_
        if (! reg_classes_intersect_p (to, GENERAL_REGS))
  	from = to;
  
@@ -7401,7 +7415,7 @@
  	return (rs6000_memory_move_cost (mode, from, 0)
  		+ rs6000_memory_move_cost (mode, GENERAL_REGS, 0));
  
-@@ -22140,6 +23587,12 @@ rs6000_register_move_cost (enum machine_
+@@ -22276,6 +23720,12 @@ rs6000_register_move_cost (enum machine_
  	return 2 * hard_regno_nregs[0][mode];
      }
  
@@ -7414,7 +7428,7 @@
    /* Moving between two similar registers is just one instruction.  */
    else if (reg_classes_intersect_p (to, from))
      return (mode == TFmode || mode == TDmode) ? 4 : 2;
-@@ -22380,8 +23833,8 @@ rs6000_emit_swrsqrtsf (rtx dst, rtx src)
+@@ -22516,8 +23966,8 @@ rs6000_emit_swrsqrtsf (rtx dst, rtx src)
    emit_label (XEXP (label, 0));
  }
  
@@ -7425,7 +7439,7 @@
  
  void
  rs6000_emit_popcount (rtx dst, rtx src)
-@@ -22389,6 +23842,16 @@ rs6000_emit_popcount (rtx dst, rtx src)
+@@ -22525,6 +23975,16 @@ rs6000_emit_popcount (rtx dst, rtx src)
    enum machine_mode mode = GET_MODE (dst);
    rtx tmp1, tmp2;
  
@@ -7442,7 +7456,7 @@
    tmp1 = gen_reg_rtx (mode);
  
    if (mode == SImode)
-@@ -22801,7 +24264,7 @@ rs6000_vector_mode_supported_p (enum mac
+@@ -22937,7 +24397,7 @@ rs6000_vector_mode_supported_p (enum mac
    if (TARGET_SPE && SPE_VECTOR_MODE (mode))
      return true;
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- sources	7 Aug 2009 08:40:28 -0000	1.287
+++ sources	18 Aug 2009 13:48:10 -0000	1.288
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-4ca33c6e0f65f7a29a2f8117d025006d  gcc-4.4.1-20090807.tar.bz2
+a280c87e7d0a44a99a6bc84bbe3eb86d  gcc-4.4.1-20090818.tar.bz2


--- gcc44-pr40971.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug 18 13:48:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:48:34 +0000
Subject: [pkgdb] easymock had acl change status
Message-ID: <20090818134835.8579D10F86F@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on easymock (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock



From pkgdb at fedoraproject.org  Tue Aug 18 13:48:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:48:34 +0000
Subject: [pkgdb] easymock had acl change status
Message-ID: <20090818134834.E778510F859@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on easymock (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock



From pkgdb at fedoraproject.org  Tue Aug 18 13:48:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:48:36 +0000
Subject: [pkgdb] easymock had acl change status
Message-ID: <20090818134837.2525110F889@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on easymock (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:05 +0000
Subject: [pkgdb] jakarta-commons-configuration had acl change status
Message-ID: <20090818134908.E66C010F8A3@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jakarta-commons-configuration (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:03 +0000
Subject: [pkgdb] jakarta-commons-configuration had acl change status
Message-ID: <20090818134908.5A5AE10F859@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on jakarta-commons-configuration (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:04 +0000
Subject: [pkgdb] jakarta-commons-configuration had acl change status
Message-ID: <20090818134908.BB3B010F8A1@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on jakarta-commons-configuration (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-configuration



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:11 +0000
Subject: [pkgdb] jakarta-commons-jxpath had acl change status
Message-ID: <20090818134912.1174410F8A2@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on jakarta-commons-jxpath (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:13 +0000
Subject: [pkgdb] jakarta-commons-jxpath had acl change status
Message-ID: <20090818134914.19BB410F8A9@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jakarta-commons-jxpath (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:13 +0000
Subject: [pkgdb] jakarta-commons-jxpath had acl change status
Message-ID: <20090818134914.90C4B10F8AD@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on jakarta-commons-jxpath (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-jxpath



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:17 +0000
Subject: [pkgdb] directory-naming had acl change status
Message-ID: <20090818134917.65BED10F8B2@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on directory-naming (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:17 +0000
Subject: [pkgdb] directory-naming had acl change status
Message-ID: <20090818134918.7FD7610F8B8@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on directory-naming (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:18 +0000
Subject: [pkgdb] directory-naming had acl change status
Message-ID: <20090818134920.5674410F8BE@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on directory-naming (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/directory-naming



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:21 +0000
Subject: [pkgdb] dumbster had acl change status
Message-ID: <20090818134924.5A8C010F8C7@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on dumbster (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:20 +0000
Subject: [pkgdb] dumbster had acl change status
Message-ID: <20090818134923.9A7F610F8C6@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on dumbster (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From pkgdb at fedoraproject.org  Tue Aug 18 13:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 13:49:22 +0000
Subject: [pkgdb] dumbster had acl change status
Message-ID: <20090818134924.D948B10F8BC@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on dumbster (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dumbster



From elcody02 at fedoraproject.org  Tue Aug 18 14:02:51 2009
From: elcody02 at fedoraproject.org (Marc Grimme)
Date: Tue, 18 Aug 2009 14:02:51 +0000 (UTC)
Subject: rpms/osr-dracut-module/devel sources,1.3,1.4
Message-ID: <20090818140252.25F9C11C00D7@cvs1.fedora.phx.redhat.com>

Author: elcody02

Update of /cvs/pkgs/rpms/osr-dracut-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18545

Modified Files:
	sources 
Log Message:
Fixed bug with latest dracut version and root detection.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Aug 2009 06:07:56 -0000	1.3
+++ sources	18 Aug 2009 14:02:50 -0000	1.4
@@ -1 +1 @@
-b68f91b92fea0a5b06ddf60f0cd51e97  osr-dracut-module-0.8.tar.bz2
+b53843a16ab33233b09b5ac258ddebbf  osr-dracut-module-0.8.tar.bz2



From mkasik at fedoraproject.org  Tue Aug 18 14:23:27 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 18 Aug 2009 14:23:27 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel polkit_result.patch, NONE,
	1.1 cups-pk-helper.spec, 1.11, 1.12
Message-ID: <20090818142327.7C27411C00D7@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23161

Modified Files:
	cups-pk-helper.spec 
Added Files:
	polkit_result.patch 
Log Message:
* Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-6
- Check result of polkit_authority_check_authorization_sync() for NULL.


polkit_result.patch:
 cups-pk-helper-mechanism.c                    |    2 -
 org.opensuse.cupspkhelper.mechanism.policy.in |   40 +++++++++++++-------------
 2 files changed, 21 insertions(+), 21 deletions(-)

--- NEW FILE polkit_result.patch ---
--- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c.polkit-result	2009-08-17 14:55:52.000000000 +0200
+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-08-17 14:55:52.000000000 +0200
@@ -278,7 +278,7 @@ _check_polkit_for_action_internal (CphMe
                                                                NULL);
         g_object_unref (pk_caller);
 
-        if (!polkit_authorization_result_get_is_authorized (pk_result)) {
+        if (pk_result == NULL || !polkit_authorization_result_get_is_authorized (pk_result)) {
                 g_set_error (error,
                              CPH_MECHANISM_ERROR,
                              CPH_MECHANISM_ERROR_NOT_PRIVILEGED,
--- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in.polkit-result	2009-08-17 14:55:52.000000000 +0200
+++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-08-17 14:55:52.000000000 +0200
@@ -12,8 +12,8 @@
        operation: if some authorization is required, then the PolicyKit helper
        will fallback on printer-X-edit. -->
   <action id="org.opensuse.cupspkhelper.mechanism.printer-set-default">
-    <_description>Set a printer as default printer</_description>
-    <_message>Privileges are required to set a printer, or a class, as default printer.</_message>
+    <description>Set a printer as default printer</description>
+    <message>Privileges are required to set a printer, or a class, as default printer.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -24,8 +24,8 @@
        operation: if some authorization is required, then the PolicyKit helper
        will fallback on printer-X-edit. -->
   <action id="org.opensuse.cupspkhelper.mechanism.printer-enable">
-    <_description>Enable/Disable a printer</_description>
-    <_message>Privileges are required to enable/disable a printer, or a class.</_message>
+    <description>Enable/Disable a printer</description>
+    <message>Privileges are required to enable/disable a printer, or a class.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -33,8 +33,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.printer-local-edit">
-    <_description>Add/Remove/Edit a local printer</_description>
-    <_message>Privileges are required to add/remove/edit a local printer.</_message>
+    <description>Add/Remove/Edit a local printer</description>
+    <message>Privileges are required to add/remove/edit a local printer.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -42,8 +42,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.printer-remote-edit">
-    <_description>Add/Remove/Edit a remote printer</_description>
-    <_message>Privileges are required to add/remove/edit a remote printer.</_message>
+    <description>Add/Remove/Edit a remote printer</description>
+    <message>Privileges are required to add/remove/edit a remote printer.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -51,8 +51,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.class-edit">
-    <_description>Add/Remove/Edit a class</_description>
-    <_message>Privileges are required to add/remove/edit a class.</_message>
+    <description>Add/Remove/Edit a class</description>
+    <message>Privileges are required to add/remove/edit a class.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -60,8 +60,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.server-settings">
-    <_description>Get/Set server settings</_description>
-    <_message>Privileges are required to get/set server settings.</_message>
+    <description>Get/Set server settings</description>
+    <message>Privileges are required to get/set server settings.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -69,8 +69,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.job-edit">
-    <_description>Restart/Cancel/Edit a job</_description>
-    <_message>Privileges are required to restart/cancel/edit a job.</_message>
+    <description>Restart/Cancel/Edit a job</description>
+    <message>Privileges are required to restart/cancel/edit a job.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
@@ -78,8 +78,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.job-not-owned-edit">
-    <_description>Restart/Cancel/Edit a job owned by another user</_description>
-    <_message>Privileges are required to restart/cancel/edit a job owned by another user.</_message>
+    <description>Restart/Cancel/Edit a job owned by another user</description>
+    <message>Privileges are required to restart/cancel/edit a job owned by another user.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -87,8 +87,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.devices-get">
-    <_description>Get devices</_description>
-    <_message>Privileges are required to get devices.</_message>
+    <description>Get devices</description>
+    <message>Privileges are required to get devices.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -97,8 +97,8 @@
 
   <!-- Deprecated -->
   <action id="org.opensuse.cupspkhelper.mechanism.printeraddremove">
-    <_description>Add/Remove/Edit a printer</_description>
-    <_message>Privileges are required to add/remove/edit a printer.</_message>
+    <description>Add/Remove/Edit a printer</description>
+    <message>Privileges are required to add/remove/edit a printer.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/cups-pk-helper.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cups-pk-helper.spec	13 Aug 2009 14:02:25 -0000	1.11
+++ cups-pk-helper.spec	18 Aug 2009 14:23:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        http://www.vuntz.net/dow
 
 Patch0:         polkit-1.patch
 Patch1:         get_devices.patch
+Patch2:         polkit_result.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@ interfaces available under control of Po
 
 %patch0 -p1 -b .polkit-1
 %patch1 -p1 -b .get-devices
+%patch2 -p1 -b .polkit-result
 
 %build
 # Patch0 modifies configure.ac
@@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-6
+- Check result of polkit_authority_check_authorization_sync() for NULL.
+
 * Thu Aug 13 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
 - Add parameters to DevicesGet method.
 



From mmahut at fedoraproject.org  Tue Aug 18 14:24:01 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue, 18 Aug 2009 14:24:01 +0000 (UTC)
Subject: rpms/gpsd/devel gpsd.init,1.1,1.2 gpsd.spec,1.31,1.32
Message-ID: <20090818142401.7A44211C00D7@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/gpsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23416

Modified Files:
	gpsd.init gpsd.spec 
Log Message:
RHBZ#505588: gpsd has a broken initscript that fails to launch daemon



Index: gpsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpsd.init	16 Mar 2009 13:54:41 -0000	1.1
+++ gpsd.init	18 Aug 2009 14:24:01 -0000	1.2
@@ -29,20 +29,20 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-exec="/usr/bin/gpsd"
+exec="/usr/sbin/gpsd"
 prog=$(basename $exec)
 PIDFILE=/var/run/gpsd.pid
 CONTROL_SOCKET=/var/run/gpsd.sock
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-OPTIONS="-n"
-DEVICE="/dev/ttyUSB0"
+: ${OPTIONS:=-n}
+: ${DEVICE:=/dev/ttyUSB0}
 
 lockfile=/var/lock/subsys/$prog
 
 start() {
     echo -n $"Starting $prog: "
-    daemon $exec -p $PIDFILE -F $CONTROL_SOCKET $OPTIONS $DEVICE
+    daemon $exec -P $PIDFILE -F $CONTROL_SOCKET $OPTIONS $DEVICE
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile


Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gpsd.spec	25 Jul 2009 01:20:42 -0000	1.31
+++ gpsd.spec	18 Aug 2009 14:24:01 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name: gpsd
 Version: 2.39
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Marek Mahut <mmahut at fedoraproject.org> - 2.39-5
+- RHBZ#505588: gpsd has a broken initscript that fails to launch daemon
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.39-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From elcody02 at fedoraproject.org  Tue Aug 18 14:29:34 2009
From: elcody02 at fedoraproject.org (Marc Grimme)
Date: Tue, 18 Aug 2009 14:29:34 +0000 (UTC)
Subject: rpms/osr-dracut-module/devel sources,1.4,1.5
Message-ID: <20090818142934.82EA511C00D7@cvs1.fedora.phx.redhat.com>

Author: elcody02

Update of /cvs/pkgs/rpms/osr-dracut-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25747

Modified Files:
	sources 
Log Message:
Moved rpm version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	18 Aug 2009 14:02:50 -0000	1.4
+++ sources	18 Aug 2009 14:29:34 -0000	1.5
@@ -1 +1 @@
-b53843a16ab33233b09b5ac258ddebbf  osr-dracut-module-0.8.tar.bz2
+e47e155d281938bea2e38c921d8a67f6  osr-dracut-module-0.8.tar.bz2



From mmahut at fedoraproject.org  Tue Aug 18 14:31:50 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Tue, 18 Aug 2009 14:31:50 +0000 (UTC)
Subject: rpms/gpsd/F-11 gpsd.init,1.1,1.2 gpsd.spec,1.30,1.31
Message-ID: <20090818143150.27D7711C00D7@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/gpsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26505

Modified Files:
	gpsd.init gpsd.spec 
Log Message:
RHBZ#505588: gpsd has a broken initscript that fails to launch daemon


Index: gpsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/F-11/gpsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpsd.init	16 Mar 2009 13:54:41 -0000	1.1
+++ gpsd.init	18 Aug 2009 14:31:49 -0000	1.2
@@ -29,20 +29,20 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-exec="/usr/bin/gpsd"
+exec="/usr/sbin/gpsd"
 prog=$(basename $exec)
 PIDFILE=/var/run/gpsd.pid
 CONTROL_SOCKET=/var/run/gpsd.sock
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-OPTIONS="-n"
-DEVICE="/dev/ttyUSB0"
+: ${OPTIONS:=-n}
+: ${DEVICE:=/dev/ttyUSB0}
 
 lockfile=/var/lock/subsys/$prog
 
 start() {
     echo -n $"Starting $prog: "
-    daemon $exec -p $PIDFILE -F $CONTROL_SOCKET $OPTIONS $DEVICE
+    daemon $exec -P $PIDFILE -F $CONTROL_SOCKET $OPTIONS $DEVICE
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile


Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/F-11/gpsd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gpsd.spec	31 Mar 2009 15:48:00 -0000	1.30
+++ gpsd.spec	18 Aug 2009 14:31:49 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name: gpsd
 Version: 2.39
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Marek Mahut <mmahut at fedoraproject.org> - 2.39-4
+- RHBZ#505588: gpsd has a broken initscript that fails to launch daemon
+
 * Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.39-3
 - some of the gpsd client bits went into gpsdclient.h, but that file wasn't getting installed
   specifically, viking needs that header to build. 



From elcody02 at fedoraproject.org  Tue Aug 18 14:35:15 2009
From: elcody02 at fedoraproject.org (Marc Grimme)
Date: Tue, 18 Aug 2009 14:35:15 +0000 (UTC)
Subject: rpms/osr-dracut-module/devel osr-dracut-module.spec,1.2,1.3
Message-ID: <20090818143515.767A011C00D7@cvs1.fedora.phx.redhat.com>

Author: elcody02

Update of /cvs/pkgs/rpms/osr-dracut-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27308

Modified Files:
	osr-dracut-module.spec 
Log Message:
Modified version



Index: osr-dracut-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/osr-dracut-module.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- osr-dracut-module.spec	18 Aug 2009 06:07:56 -0000	1.2
+++ osr-dracut-module.spec	18 Aug 2009 14:35:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name: osr-dracut-module
 Version: 0.8
-Release: 1
+Release: 2
 Summary: Dracut modules for open sharedroot
 Group: System Environment/Base		
 License: GPLv2+	
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.osr-chroot.txt COPYING AUTHORS
 
 %changelog
+* Tue Aug 18 2009 Marc Grimme <grimme at atix.de> 0.8-2
+- Fixed an issue where root.info would not be set when using cluster 
+  configuration
 * Thu Aug 13 2009 Marc Grimme <grimme at atix.de> 0.8-1
 - Dependent on dracut 0.8 and above.
 - Some functions moved to lib dir



From cebbert at fedoraproject.org  Tue Aug 18 14:39:15 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 18 Aug 2009 14:39:15 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-drivers-char-low-latency-removal.patch,
	1.4, 1.5
Message-ID: <20090818143915.2853F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28788

Modified Files:
	linux-2.6-drivers-char-low-latency-removal.patch 
Log Message:
replace with upstream patch for -stable

linux-2.6-drivers-char-low-latency-removal.patch:
 mxser.c  |    2 --
 nozomi.c |    2 --
 2 files changed, 4 deletions(-)

Index: linux-2.6-drivers-char-low-latency-removal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-drivers-char-low-latency-removal.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-drivers-char-low-latency-removal.patch	10 Aug 2009 19:32:52 -0000	1.4
+++ linux-2.6-drivers-char-low-latency-removal.patch	18 Aug 2009 14:39:14 -0000	1.5
@@ -1,24 +1,26 @@
 From: Chuck Ebbert <cebbert at redhat.com>
+Date: Wed, 24 Jun 2009 17:35:13 +0000 (+0100)
+Subject: Remove low_latency flag setting from nozomi and mxser drivers
+X-Git-Tag: v2.6.31-rc1~16
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d8d4d251df8eaaa3dae71c8cfa7fbf4510d967d
+
 Remove low_latency flag setting from nozomi and mxser drivers
 
 The kernel oopses if this flag is set.
 
+[and neither driver should set it as they call tty_flip_buffer_push from IRQ
+ paths so have always been buggy]
+
 Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
+Signed-off-by: Alan Cox <alan at linux.intel.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
 
---- linux-2.6.30.noarch.orig/drivers/char/nozomi.c
-+++ linux-2.6.30.noarch/drivers/char/nozomi.c
-@@ -1591,8 +1591,6 @@ static int ntty_open(struct tty_struct *
- 
- 	/* Enable interrupt downlink for channel */
- 	if (port->port.count == 1) {
--		/* FIXME: is this needed now ? */
--		tty->low_latency = 1;
- 		tty->driver_data = port;
- 		tty_port_tty_set(&port->port, tty);
- 		DBG1("open: %d", port->token_dl);
---- linux-2.6.30.noarch.orig/drivers/char/mxser.c
-+++ linux-2.6.30.noarch/drivers/char/mxser.c
-@@ -1048,8 +1048,6 @@ static int mxser_open(struct tty_struct 
+diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
+index 9533f43..52d953e 100644
+--- a/drivers/char/mxser.c
++++ b/drivers/char/mxser.c
+@@ -1048,8 +1048,6 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
  	if (retval)
  		return retval;
  
@@ -27,3 +29,16 @@ Signed-off-by: Chuck Ebbert <cebbert at red
  	return 0;
  }
  
+diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
+index d6102b6..574f1c7 100644
+--- a/drivers/char/nozomi.c
++++ b/drivers/char/nozomi.c
+@@ -1591,8 +1591,6 @@ static int ntty_open(struct tty_struct *tty, struct file *file)
+ 
+ 	/* Enable interrupt downlink for channel */
+ 	if (port->port.count == 1) {
+-		/* FIXME: is this needed now ? */
+-		tty->low_latency = 1;
+ 		tty->driver_data = port;
+ 		tty_port_tty_set(&port->port, tty);
+ 		DBG1("open: %d", port->token_dl);



From wojdyr at fedoraproject.org  Tue Aug 18 14:38:49 2009
From: wojdyr at fedoraproject.org (Marcin Wojdyr)
Date: Tue, 18 Aug 2009 14:38:49 +0000 (UTC)
Subject: rpms/fityk/devel .cvsignore, 1.2, 1.3 fityk.spec, 1.8, 1.9 sources, 
	1.2, 1.3 fityk-gcc43.patch, 1.1, NONE
Message-ID: <20090818143849.A057211C00D7@cvs1.fedora.phx.redhat.com>

Author: wojdyr

Update of /cvs/pkgs/rpms/fityk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28475

Modified Files:
	.cvsignore fityk.spec sources 
Removed Files:
	fityk-gcc43.patch 
Log Message:
updated to fityk 0.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fityk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Jul 2007 13:21:07 -0000	1.2
+++ .cvsignore	18 Aug 2009 14:38:47 -0000	1.3
@@ -1 +1 @@
-fityk-0.8.1.tar.bz2
+fityk-0.8.8.tar.bz2


Index: fityk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fityk/devel/fityk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fityk.spec	24 Jul 2009 22:50:39 -0000	1.8
+++ fityk.spec	18 Aug 2009 14:38:48 -0000	1.9
@@ -1,20 +1,20 @@
 Name:		fityk
 Summary:	Non-linear curve fitting and data analysis
-Version:	0.8.1
-Release:	16%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 
 Source0:	http://downloads.sourceforge.net/fityk/%{name}-%{version}.tar.bz2
 URL:		http://fityk.sourceforge.net/
-License:	GPLv2
+License:	GPLv2+
 Group:		Applications/Engineering
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch0:		%{name}-gcc43.patch
 
 BuildRequires:	gcc-c++, readline-devel, ncurses-devel, desktop-file-utils
+BuildRequires:	xylib-devel >= 0.4
 %if 0%{?mandriva_version}
-BuildRequires: libwxgtk2.6-devel
+BuildRequires: libwxgtk2.8-devel
 %else
-BuildRequires: wxGTK-devel
+BuildRequires: wxGTK-devel >= 2.8.0
 %endif
 
 Requires:	gnuplot
@@ -36,77 +36,74 @@ use of %{name}, you will need to install
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure CPPFLAGS="-DNDEBUG" %{?__cc:CC="%__cc"} %{?__cxx:CXX="%__cxx"}
+%configure CPPFLAGS="-DNDEBUG" --with-samples
+# 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
-%{?__cc:CC="%__cc"} %{?__cxx:CXX="%__cxx"} make %{?_smp_mflags}
+make %{?_smp_mflags}
 										
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
-
-# tom says we don't want .la files in RPMs:
-rm %{buildroot}/%{_libdir}/*.la
-
-# fix wrong file permissions on dirs to be used in %doc
-chmod 755 samples
-chmod 755 doc/fitykhelp_img
-
-# install the application icon
-install -p -m644 -D %{name}.png %{buildroot}/%{_datadir}/icons/%{name}.png
-rm %{buildroot}/%{_datadir}/pixmaps/%{name}.png
-
-# install the correctly-named tipes file
-install -p -m644 -D src/wxgui/tips.txt %{buildroot}/%{_datadir}/%{name}/fityk_tips.txt
-rm %{buildroot}/%{_datadir}/%{name}/tips.txt
-
-# Fix up the included desktop file
-sed -i 's/False/false/g' fityk.desktop
-sed -i 's/Icon=fityk/Icon=fityk.png/g' fityk.desktop
-
-# Get rid of the broken one that fityk was nice enough to install for us.
-rm -rf %{buildroot}%{_datadir}/applications/fityk.desktop
-
-# Install the fixed one.
-desktop-file-install --vendor="fedora" \
---dir=%{buildroot}%{_datadir}/applications %{name}.desktop
-
-# we include directories in %%doc, but we don't want Makefiles there
-rm -f samples/Makefile* doc/fitykhelp_img/Makefile*
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# Python bindings are experimental and not packaged, remove python sample
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/*.py*
+desktop-file-validate %{buildroot}/%{_datadir}/applications/fityk.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 /sbin/ldconfig 2>/dev/null
 
 %postun
 update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 /sbin/ldconfig 2>/dev/null
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO 
-# Makefile*s from samples/ and doc/fitykhelp_img/ were removed above
-%doc samples/ 
-%doc doc/
+%doc COPYING NEWS README TODO
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/samples
 %{_bindir}/*
-%{_datadir}/%{name}/
+%{_datadir}/%{name}/*.html
+%{_datadir}/%{name}/*.css
+%{_datadir}/%{name}/fitykhelp_img/
+%{_datadir}/%{name}/samples/README
+%{_datadir}/%{name}/samples/*.dat
+%{_datadir}/%{name}/samples/*.fit
 %{_datadir}/applications/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/%{name}.*
-%{_datadir}/icons/*
+%{_datadir}/pixmaps/*
+%{_datadir}/mime/packages/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/*.so
+%{_datadir}/%{name}/samples/*.cc
 
 %changelog
+* Sat Aug 18 2009 Marcin Wojdyr <wojdyr at gmail.com> - 0.8.8-1
+- upstream license was changed from GPLv2 to GPLv2+
+- install mime files and call update-mime-database
+- use configure flag --with-samples to install samples
+- update %%doc
+- do not move program's icon from pixmaps/ to icons/
+- add xylib-devel to BuildRequires
+- add minimal wxGTK version
+- remove not needed CXX and CC variables from configure and make
+- drop obsolete changes to desktop file
+- drop obsolete patch
+- update to 0.8.8. Closes Red Hat Bugzilla bug #511758.
+  Closes Red Hat Bugzilla bug #511307.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fityk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Jul 2007 13:21:07 -0000	1.2
+++ sources	18 Aug 2009 14:38:48 -0000	1.3
@@ -1 +1 @@
-f93d2ce9b9c21e0d79d69f1adb797a66  fityk-0.8.1.tar.bz2
+4b79b69ce7e3a5e10928b826b27ec868  fityk-0.8.8.tar.bz2


--- fityk-gcc43.patch DELETED ---



From twaugh at fedoraproject.org  Tue Aug 18 14:52:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 14:52:00 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint.spec,1.53,1.54
Message-ID: <20090818145200.C644511C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31284

Modified Files:
	gutenprint.spec 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
- Enabled simplified CUPS drivers (bug #518030).



Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gutenprint.spec	3 Aug 2009 08:25:34 -0000	1.53
+++ gutenprint.spec	18 Aug 2009 14:51:58 -0000	1.54
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -144,7 +144,8 @@ Epson, HP and compatible printers..
             --with-user-guide --with-samples \
             --with-escputil --with-test --disable-rpath \
 	    --enable-cups-1_2-enhancements \
-	    --disable-cups-ppds
+	    --disable-cups-ppds \
+	    --enable-simplified-cups-ppds
 
 make %{?_smp_mflags}
  
@@ -261,6 +262,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
+- Enabled simplified CUPS drivers (bug #518030).
+
 * Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
 - Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.
 



From dmach at fedoraproject.org  Tue Aug 18 14:54:47 2009
From: dmach at fedoraproject.org (dmach)
Date: Tue, 18 Aug 2009 14:54:47 +0000 (UTC)
Subject: rpms/kobo/devel .cvsignore, 1.3, 1.4 kobo.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090818145447.0F72B11C00D7@cvs1.fedora.phx.redhat.com>

Author: dmach

Update of /cvs/extras/rpms/kobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31899

Modified Files:
	.cvsignore kobo.spec sources 
Log Message:
update to kobo-0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kobo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jul 2009 17:45:10 -0000	1.3
+++ .cvsignore	18 Aug 2009 14:54:46 -0000	1.4
@@ -1 +1 @@
-kobo-0.1.1.tar.bz2
+kobo-0.1.2.tar.bz2


Index: kobo.spec
===================================================================
RCS file: /cvs/extras/rpms/kobo/devel/kobo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kobo.spec	25 Jul 2009 04:42:19 -0000	1.3
+++ kobo.spec	18 Aug 2009 14:54:46 -0000	1.4
@@ -6,8 +6,8 @@
 %define debug_package %{nil}
 
 
-%define version 0.1.1
-%define release 2
+%define version 0.1.2
+%define release 1
 # set git to %{nil} (release) or to YYYYMMDD.123456 (git build)
 %define git     %{nil}
 
@@ -131,6 +131,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Daniel Mach <dmach at redhat.com> - 0.1.2-1
+- Read default paginate_by value from settings in kobo.django.views.generic.object_list. (Tomas Kopecek)
+- Add read_from_file() and rename save() to save_to_file() in kobo.shortcuts. (Daniel Mach)
+- Reverse FileUpload default ordering. (Daniel Mach)
+- Add kobo.conf.get_dict_value() to support dicts with default values. (Daniel Mach)
+- Add direct access to files via pkgset.RpmWrapper. (Tomas Kopecek)
+- Add documentation to django.auth.krb5. (Daniel Mach)
+- Fix worker key generation in kobo.hub.models.Worker.save(). (Daniel Mach)
+- Fix a security hole in krb5 middleware: a user was able to log in as different user to admin interface. (Daniel Mach)
+- Change Makefile to run tests before creating source tarball. (Daniel Mach)
+- Change HubProxy._hub verification to fix exceptions in Python2.6. (Martin Magr)
+- Another SQL performance improvement in Task admin. (Tomas Kopecek)
+- Set Task.parent as raw_id field to improve admin performance. (Daniel Mach)
+- Add (spent) time method to Task and display it in the admin listing. (Tomas Kopecek)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kobo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jul 2009 17:45:10 -0000	1.3
+++ sources	18 Aug 2009 14:54:46 -0000	1.4
@@ -1 +1 @@
-acea1862311063c9708e9023d5aa79d5  kobo-0.1.1.tar.bz2
+122aa3b0b2a1cec7a71cfbed8b54f51b  kobo-0.1.2.tar.bz2



From dmach at fedoraproject.org  Tue Aug 18 15:03:33 2009
From: dmach at fedoraproject.org (dmach)
Date: Tue, 18 Aug 2009 15:03:33 +0000 (UTC)
Subject: rpms/kobo/EL-5 kobo.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090818150333.C629011C00D7@cvs1.fedora.phx.redhat.com>

Author: dmach

Update of /cvs/extras/rpms/kobo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2274

Modified Files:
	kobo.spec sources 
Log Message:
update to kobo-0.1.2


Index: kobo.spec
===================================================================
RCS file: /cvs/extras/rpms/kobo/EL-5/kobo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kobo.spec	22 Jul 2009 17:45:10 -0000	1.2
+++ kobo.spec	18 Aug 2009 15:03:33 -0000	1.3
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 
 
-%define version 0.1.1
+%define version 0.1.2
 %define release 1
 # set git to %{nil} (release) or to YYYYMMDD.123456 (git build)
 %define git     %{nil}
@@ -131,6 +131,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Daniel Mach <dmach at redhat.com> - 0.1.2-1
+- Read default paginate_by value from settings in kobo.django.views.generic.object_list. (Tomas Kopecek)
+- Add read_from_file() and rename save() to save_to_file() in kobo.shortcuts. (Daniel Mach)
+- Reverse FileUpload default ordering. (Daniel Mach)
+- Add kobo.conf.get_dict_value() to support dicts with default values. (Daniel Mach)
+- Add direct access to files via pkgset.RpmWrapper. (Tomas Kopecek)
+- Add documentation to django.auth.krb5. (Daniel Mach)
+- Fix worker key generation in kobo.hub.models.Worker.save(). (Daniel Mach)
+- Fix a security hole in krb5 middleware: a user was able to log in as different user to admin interface. (Daniel Mach)
+- Change Makefile to run tests before creating source tarball. (Daniel Mach)
+- Change HubProxy._hub verification to fix exceptions in Python2.6. (Martin Magr)
+- Another SQL performance improvement in Task admin. (Tomas Kopecek)
+- Set Task.parent as raw_id field to improve admin performance. (Daniel Mach)
+- Add (spent) time method to Task and display it in the admin listing. (Tomas Kopecek)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Daniel Mach <dmach at redhat.com> - 0.1.1-1
 - Enhance types.Enum to support help_text and additonal options. Update tests for types module. (Daniel Mach)
 - Remove temp directory after file upload. (Tomas Kopecek)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kobo/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jul 2009 17:45:10 -0000	1.3
+++ sources	18 Aug 2009 15:03:33 -0000	1.4
@@ -1 +1 @@
-acea1862311063c9708e9023d5aa79d5  kobo-0.1.1.tar.bz2
+122aa3b0b2a1cec7a71cfbed8b54f51b  kobo-0.1.2.tar.bz2



From nphilipp at fedoraproject.org  Tue Aug 18 15:04:02 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 15:04:02 +0000 (UTC)
Subject: rpms/dcraw/devel .cvsignore, 1.12, 1.13 dcraw.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <20090818150402.D0E0011C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/dcraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2406

Modified Files:
	.cvsignore dcraw.spec sources 
Log Message:
version 8.96



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Mar 2009 16:07:38 -0000	1.12
+++ .cvsignore	18 Aug 2009 15:04:02 -0000	1.13
@@ -1 +1 @@
-dcraw-8.91.tar.gz
+dcraw-8.96.tar.gz


Index: dcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/dcraw.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- dcraw.spec	24 Jul 2009 20:05:07 -0000	1.25
+++ dcraw.spec	18 Aug 2009 15:04:02 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Tool for decoding raw image data from digital cameras
 Name: dcraw
-Version: 8.91
-Release: 2%{?dist}
+Version: 8.96
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://cybercom.net/~dcoffin/dcraw
@@ -62,6 +62,9 @@ rm -rf %buildroot
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com> - 8.96-1
+- version 8.96
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Mar 2009 16:07:38 -0000	1.13
+++ sources	18 Aug 2009 15:04:02 -0000	1.14
@@ -1 +1 @@
-06ab626770e9144f144dc6bac296c44f  dcraw-8.91.tar.gz
+9b852e81319066a5473ae52eb507cd79  dcraw-8.96.tar.gz



From dmach at fedoraproject.org  Tue Aug 18 15:04:38 2009
From: dmach at fedoraproject.org (dmach)
Date: Tue, 18 Aug 2009 15:04:38 +0000 (UTC)
Subject: rpms/kobo/EL-5 .cvsignore,1.3,1.4
Message-ID: <20090818150438.D033B11C00D7@cvs1.fedora.phx.redhat.com>

Author: dmach

Update of /cvs/extras/rpms/kobo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2674

Modified Files:
	.cvsignore 
Log Message:
fix cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kobo/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jul 2009 17:45:10 -0000	1.3
+++ .cvsignore	18 Aug 2009 15:04:38 -0000	1.4
@@ -1 +1 @@
-kobo-0.1.1.tar.bz2
+kobo-0.1.2.tar.bz2



From nphilipp at fedoraproject.org  Tue Aug 18 15:10:05 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 15:10:05 +0000 (UTC)
Subject: rpms/dcraw/F-11 .cvsignore, 1.12, 1.13 dcraw.spec, 1.24,
	1.25 sources, 1.13, 1.14
Message-ID: <20090818151005.2C40B11C04D1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/dcraw/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4036

Modified Files:
	.cvsignore dcraw.spec sources 
Log Message:
version 8.96


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Mar 2009 16:07:38 -0000	1.12
+++ .cvsignore	18 Aug 2009 15:10:03 -0000	1.13
@@ -1 +1 @@
-dcraw-8.91.tar.gz
+dcraw-8.96.tar.gz


Index: dcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/F-11/dcraw.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dcraw.spec	2 Mar 2009 16:07:38 -0000	1.24
+++ dcraw.spec	18 Aug 2009 15:10:04 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Tool for decoding raw image data from digital cameras
 Name: dcraw
-Version: 8.91
+Version: 8.96
 Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
@@ -62,6 +62,12 @@ rm -rf %buildroot
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com> - 8.96-1
+- version 8.96
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.91-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 02 2009 Nils Philippsen <nils at redhat.com> - 8.91-1
 - version 8.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Mar 2009 16:07:38 -0000	1.13
+++ sources	18 Aug 2009 15:10:04 -0000	1.14
@@ -1 +1 @@
-06ab626770e9144f144dc6bac296c44f  dcraw-8.91.tar.gz
+9b852e81319066a5473ae52eb507cd79  dcraw-8.96.tar.gz



From nphilipp at fedoraproject.org  Tue Aug 18 15:10:06 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 15:10:06 +0000 (UTC)
Subject: rpms/dcraw/F-10 .cvsignore, 1.11, 1.12 dcraw.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20090818151006.7B5DE11C04D1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/dcraw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4062

Modified Files:
	.cvsignore dcraw.spec sources 
Log Message:
version 8.96


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Nov 2008 15:00:33 -0000	1.11
+++ .cvsignore	18 Aug 2009 15:10:06 -0000	1.12
@@ -1 +1 @@
-dcraw-8.89.tar.gz
+dcraw-8.96.tar.gz


Index: dcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/F-10/dcraw.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dcraw.spec	27 Nov 2008 15:00:33 -0000	1.22
+++ dcraw.spec	18 Aug 2009 15:10:06 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Tool for decoding raw image data from digital cameras
 Name: dcraw
-Version: 8.89
+Version: 8.96
 Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
@@ -62,6 +62,18 @@ rm -rf %buildroot
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com> - 8.96-1
+- version 8.96
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.91-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Mar 02 2009 Nils Philippsen <nils at redhat.com> - 8.91-1
+- version 8.91
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.89-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 27 2008 Nils Philippsen <nphilipp at redhat.com> - 8.89-1
 - version 8.89
 - remove obsolete gps patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dcraw/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Nov 2008 15:00:33 -0000	1.12
+++ sources	18 Aug 2009 15:10:06 -0000	1.13
@@ -1 +1 @@
-201fd4fb1fe39f7f07a5b2c7315df8f7  dcraw-8.89.tar.gz
+9b852e81319066a5473ae52eb507cd79  dcraw-8.96.tar.gz



From dmach at fedoraproject.org  Tue Aug 18 15:11:01 2009
From: dmach at fedoraproject.org (dmach)
Date: Tue, 18 Aug 2009 15:11:01 +0000 (UTC)
Subject: rpms/kobo/F-11 .cvsignore, 1.3, 1.4 kobo.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <20090818151101.3A4D911C00D7@cvs1.fedora.phx.redhat.com>

Author: dmach

Update of /cvs/extras/rpms/kobo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4401

Modified Files:
	.cvsignore kobo.spec sources 
Log Message:
update to kobo-0.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kobo/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jul 2009 17:38:34 -0000	1.3
+++ .cvsignore	18 Aug 2009 15:11:00 -0000	1.4
@@ -1 +1 @@
-kobo-0.1.1.tar.bz2
+kobo-0.1.2.tar.bz2


Index: kobo.spec
===================================================================
RCS file: /cvs/extras/rpms/kobo/F-11/kobo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kobo.spec	22 Jul 2009 17:38:34 -0000	1.2
+++ kobo.spec	18 Aug 2009 15:11:01 -0000	1.3
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 
 
-%define version 0.1.1
+%define version 0.1.2
 %define release 1
 # set git to %{nil} (release) or to YYYYMMDD.123456 (git build)
 %define git     %{nil}
@@ -131,6 +131,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Daniel Mach <dmach at redhat.com> - 0.1.2-1
+- Read default paginate_by value from settings in kobo.django.views.generic.object_list. (Tomas Kopecek)
+- Add read_from_file() and rename save() to save_to_file() in kobo.shortcuts. (Daniel Mach)
+- Reverse FileUpload default ordering. (Daniel Mach)
+- Add kobo.conf.get_dict_value() to support dicts with default values. (Daniel Mach)
+- Add direct access to files via pkgset.RpmWrapper. (Tomas Kopecek)
+- Add documentation to django.auth.krb5. (Daniel Mach)
+- Fix worker key generation in kobo.hub.models.Worker.save(). (Daniel Mach)
+- Fix a security hole in krb5 middleware: a user was able to log in as different user to admin interface. (Daniel Mach)
+- Change Makefile to run tests before creating source tarball. (Daniel Mach)
+- Change HubProxy._hub verification to fix exceptions in Python2.6. (Martin Magr)
+- Another SQL performance improvement in Task admin. (Tomas Kopecek)
+- Set Task.parent as raw_id field to improve admin performance. (Daniel Mach)
+- Add (spent) time method to Task and display it in the admin listing. (Tomas Kopecek)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Daniel Mach <dmach at redhat.com> - 0.1.1-1
 - Enhance types.Enum to support help_text and additonal options. Update tests for types module. (Daniel Mach)
 - Remove temp directory after file upload. (Tomas Kopecek)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kobo/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jul 2009 17:38:34 -0000	1.3
+++ sources	18 Aug 2009 15:11:01 -0000	1.4
@@ -1 +1 @@
-acea1862311063c9708e9023d5aa79d5  kobo-0.1.1.tar.bz2
+122aa3b0b2a1cec7a71cfbed8b54f51b  kobo-0.1.2.tar.bz2



From jspaleta at fedoraproject.org  Tue Aug 18 15:11:29 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 18 Aug 2009 15:11:29 +0000 (UTC)
Subject: rpms/gpodder/devel gpodder.spec,1.32,1.33
Message-ID: <20090818151129.1946C11C00D7@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gpodder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4615

Modified Files:
	gpodder.spec 
Log Message:
* Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-3
- Fix for desktop file encoding packaging problem



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gpodder.spec	28 Jul 2009 06:22:12 -0000	1.32
+++ gpodder.spec	18 Aug 2009 15:11:28 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           gpodder
 Version:        0.17.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -37,10 +37,6 @@ make messages
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-iconv -f latin1 -t utf-8 $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
-       -o $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop.new
-mv $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop.new $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
 desktop-file-install --vendor fedora --delete-original           \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                 \
   --remove-key Miniicon --add-category Application \
@@ -78,6 +74,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-3
+- Fix for desktop file encoding packaging problem
+
 * Mon Jul 27 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-2
 - New upstream release, fixes multiple bugs since 0.16.1.
 



From elcody02 at fedoraproject.org  Tue Aug 18 15:13:54 2009
From: elcody02 at fedoraproject.org (Marc Grimme)
Date: Tue, 18 Aug 2009 15:13:54 +0000 (UTC)
Subject: rpms/osr-dracut-module/devel osr-dracut-module.spec, 1.3,
	1.4 sources, 1.5, 1.6
Message-ID: <20090818151354.AA81911C00D7@cvs1.fedora.phx.redhat.com>

Author: elcody02

Update of /cvs/pkgs/rpms/osr-dracut-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4998

Modified Files:
	osr-dracut-module.spec sources 
Log Message:
Moved versions of dependent rpms



Index: osr-dracut-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/osr-dracut-module.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- osr-dracut-module.spec	18 Aug 2009 14:35:15 -0000	1.3
+++ osr-dracut-module.spec	18 Aug 2009 15:13:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name: osr-dracut-module
 Version: 0.8
-Release: 2
+Release: 3
 Summary: Dracut modules for open sharedroot
 Group: System Environment/Base		
 License: GPLv2+	
@@ -16,7 +16,7 @@ This is the open-sharedroot module for d
 
 %package cluster
 Summary: Additional base cluster modules for shared booting with open-sharedroot
-Release: 1
+Release: 2
 Requires: dracut >= 0.8
 Requires: osr-dracut-module
 Requires: comoonics-cluster-py
@@ -26,7 +26,7 @@ Additional base cluster modules for shar
 
 %package chroot
 Summary: Additional chroot modules for chroot required open-sharedroot
-Release: 1
+Release: 2
 Requires: dracut >= 0.8
 Requires: osr-dracut-module
 Requires: comoonics-cluster-py
@@ -63,6 +63,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.osr-chroot.txt COPYING AUTHORS
 
 %changelog
+* Tue Aug 18 2009 Marc Grimme <grimme at atix.de> 0.8-3
+- Moved release of all dependent rpms
 * Tue Aug 18 2009 Marc Grimme <grimme at atix.de> 0.8-2
 - Fixed an issue where root.info would not be set when using cluster 
   configuration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osr-dracut-module/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Aug 2009 14:29:34 -0000	1.5
+++ sources	18 Aug 2009 15:13:54 -0000	1.6
@@ -1 +1 @@
-e47e155d281938bea2e38c921d8a67f6  osr-dracut-module-0.8.tar.bz2
+1ba257e72562aca620602d03f685e2be  osr-dracut-module-0.8.tar.bz2



From nphilipp at fedoraproject.org  Tue Aug 18 15:15:03 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 15:15:03 +0000 (UTC)
Subject: rpms/gegl/devel gegl.spec,1.19,1.20
Message-ID: <20090818151503.AA54B11C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5447

Modified Files:
	gegl.spec 
Log Message:
explain patches



Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gegl.spec	24 Jul 2009 23:49:33 -0000	1.19
+++ gegl.spec	18 Aug 2009 15:15:03 -0000	1.20
@@ -7,7 +7,10 @@ License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=587684
+# "building gegl fails in operations/workshop/external"
 Patch0:		gegl-0.1.0-cflags.patch
+# don't run autoreconf while building
 Patch1:		gegl-0.1.0-autoreconf.patch.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc
@@ -105,6 +108,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com>
+- explain patches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From iarnell at fedoraproject.org  Tue Aug 18 15:18:20 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 18 Aug 2009 15:18:20 +0000 (UTC)
Subject: rpms/nopaste/EL-4 nopaste-2.1, NONE, 1.1 nopaste.spec, 1.1,
	1.2 nopaste-2835, 1.1, NONE
Message-ID: <20090818151820.65B9311C00D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/nopaste/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6300

Modified Files:
	nopaste.spec 
Added Files:
	nopaste-2.1 
Removed Files:
	nopaste-2835 
Log Message:
* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 1:2.1-1
- update to latest upstream version (now uses pastebin.com)



--- NEW FILE nopaste-2.1 ---
#!/bin/bash
#
# nopaste -- paste to pastebin.com
#
# Copyright 2005,2007,2009 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

nopaste_version=2.1
pastebin_url=${PASTEBIN_URL:-http://pastebin.com/pastebin.php}

main() {
    declare opt_nick=${PASTEBIN_USER:-${USER:-$(whoami)}}
    declare opt_language=text
    declare opt_diff=false
    declare opt_download=false
    declare opt_xcut=false
    declare opt_parent=
    declare expire=f # set by opt_expire()
    declare shortopts=( n:nick l:language x:xcut p:parent e:expire )
    declare -a parsed_opts parsed_params
    parse_cmdline "$@" || exit
    set -- "${parsed_params[@]}"

    declare -a urls

    if [[ $# -gt 0 ]]; then
        declare f u
        for f; do
            if [[ ! -r $f ]]; then
                echo "nopaste: can't read $f" >&2
                exit 1
            fi
            u=$(docurl --form-string "code2=$(<$f)")
            urls+=( "$u" )
            opt_parent=$(pid "$u")
        done
    else
        declare buf
        if $opt_xcut; then
            buf=$(get_x_clipboard) || exit 1
        else
            read -d '' buf
            [[ -n $buf ]] || exit 1
        fi
        urls=( "$(docurl --form-string "code2=$buf")" )
    fi

    put_x_clipboard <<<"${urls[*]}"
    printf "%s\n" "${urls[@]}"
}

docurl() {
    declare u
    u=$(curl --silent --show-error -o /dev/null -w "%{redirect_url}\n" \
        --form-string "poster=$opt_nick" --form-string "format=$opt_language" \
        --form-string "expiry=$expire" \
        ${opt_parent:+--form-string "parent_pid=$opt_parent"} \
        -F "paste=Send" -F "remember=0" "$@" "$pastebin_url") || exit 1
    if [[ -n $opt_parent ]] && $opt_diff; then
        u="$pastebin_url?diff=$(pid "$u")"
    elif $opt_download; then
        u="$pastebin_url?dl=$(pid "$u")"
    fi
    echo "$u"
}

pid() {
    echo "${1##*[/=]}"
}

get_x_clipboard() {
    if type -P xclip &>/dev/null; then
        xclip -o
    elif type -P xcut &>/dev/null; then
        xcut -p
    else
        echo "nopaste: xclip or xcut required for --xcut" >&2
        return 1
    fi
}

put_x_clipboard() {
    xclip 2>/dev/null || xcut 2>/dev/null
}

opt_expire:() {
    case $1 in
        d*) expire=d ;;     # day
        [fn]*) expire=f ;;  # forever/never
        *) expire=m ;;      # month
    esac
}

opt_private:() {
    pastebin_url=${pastebin_url%%://*}://$1.${pastebin_url#*://}
}

opt_help() { usage; exit; }
opt_version() { echo "nopaste $nopaste_version"; exit; }

usage() {
    cat <<'EOT'
usage: nopaste [options] [files]

    -e --expire WHEN    Set expiry day/month/forever, defaults to forever
    -l --language LANG  Set language, defaults to text
    -n --nick USER      Set nick (honors PASTEBIN_USER)
    -p --parent PID     Set parent paste id, for diffs
       --private STR    Use a private pastebin
    -x --xcut           Paste from X selection (using xclip or xcut)

    --diff       Return diff URL (with --parent or multiple)
    --download   Return download URL

    --help       Show this help
    --version    Show version info
EOT
}

#=============================================================================
# simple bash command-line processing
#
# (c) Copyright 2008 Aron Griffis <agriffis n01se.net>
# Released under the GNU GPL v2
#=============================================================================

parse_cmdline() {
    # extract long options from variable declarations
    declare getopt_long=$(set | \
        sed '/^opt_/!d; s/^opt_//; s/_/-/g;
            s/\(.*\)=false$/\1 no-\1/;
            s/\(.*\)=true$/\1 no-\1/;
            s/=.*/:/; s/()//;' | xargs | sed 's/ /,/g')

    # augment the shortopts array with takes-a-value colon;
    # for example f:file becomes f::file
    declare shortopts=( "${shortopts[@]}" )
    declare i x
    for ((i=0; i<${#shortopts[@]}; i++)); do
        x=${shortopts[i]}
        if [[ ",$getopt_long," == *,"${x#?:}":,* ]]; then
            shortopts[i]=${x/:/::}
        fi
    done
    declare getopt_short=$(IFS=''; echo "${shortopts[*]%:*}")

    declare args
    args=$(getopt -o "$getopt_short" \
        --long "$getopt_long" -n "$0" -- "$@") || return
    eval set -- "$args"

    declare opt var val
    parsed_opts=()
    while true; do
        [[ $1 == -- ]] && { shift; break; }

        # translate short options to long
        if [[ $1 == -? ]]; then
            opt=${1#-}
            for x in "${shortopts[@]}"; do
                if [[ $x == "$opt":* ]]; then
                    opt=${x##*:}
                    break
                fi
            done
        else
            opt=${1#--}
        fi

        # figure out $var and $val; shift positional params
        var=opt_${opt//-/_}
        case ",$getopt_long," in
            # make sure to handle opt_no_something (--no-something) 
            # which has a (silly) negation of --no-no-something
            *",no-$opt,"*)
                val=true
                parsed_opts=( "${parsed_opts[@]}" "$1" )
                shift ;;
            *",$opt,"*)
                if [[ $opt == no-* ]]; then
                    var=${var/no_/}
                    val=false
                else
                    val=true
                fi
                parsed_opts=( "${parsed_opts[@]}" "$1" )
                shift ;;
            *",$opt:,"*) 
                val=$2
                parsed_opts=( "${parsed_opts[@]}" "$1" "$2" )
                shift 2 ;;
            *)
                echo "error processing $1: not in getopt_long?" >&2
                return 1 ;;
        esac

        if [[ $(type -t "$var") == function ]]; then
            $var
        elif [[ $(type -t "$var:") == function ]]; then
            $var: "$val"
        elif is_array "$var"; then
            eval "$var=( \"\${$var[@]}\" $(printf %q "$val") )"
        elif is_var "$var"; then
            eval "$var=\$val"
        else
            echo "error processing $var: no func/array/var?" >&2
            return 1
        fi
    done

    parsed_params=( "$@" )
}

getopt() {
    declare cmd=${cmd:-${0##*/}}
    if [[ $(command getopt --help 2>&1) == *--longoptions* ]]; then
        command getopt "$@"
    elif [[ $OSTYPE == darwin* ]]; then
        if [[ ! -x /opt/local/bin/getopt ]]; then
            echo "Error: $cmd requires GNU getopt" >&2
            echo "Please install from http://getopt.darwinports.com/" >&2
            exit 1
        fi
        /opt/local/bin/getopt "$@"
    else
        echo "Error: $cmd requires GNU getopt" >&2
        exit 1
    fi
}

is_var() {
    declare -p "$1" &>/dev/null
}

is_array() {
    set -- $(declare -p "$1" 2>/dev/null)
    [[ $2 == -*a* ]]
}

main "$@"


Index: nopaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nopaste/EL-4/nopaste.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nopaste.spec	15 Jan 2009 19:15:08 -0000	1.1
+++ nopaste.spec	18 Aug 2009 15:18:20 -0000	1.2
@@ -1,6 +1,8 @@
 Name:           nopaste
-Version:        2835
-Release:        2%{?dist}
+# version numbering change since 2009/06/21
+Epoch:          1
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Command-line interface to rafb.net/paste
 
 Group:          Applications/Internet
@@ -12,13 +14,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 
 %description
-This is a simple script to facilitate sharing text through 
-http://rafb.net/paste/. Like most UNIX utilities, it can take 
-stdin or files on the command-line. Additionally nopaste can 
-use the X cut buffer for input, designed to be used with a 
-window-manager key binding or panel launcher.
-The resulting URLs are printed to stdout and additionally 
-placed in the X cut buffer for quick pasting. 
+This is a simple script to facilitate sharing text through pastebin.com. Like
+most UNIX utilities, it can take stdin or files on the command-line.
+Additionally nopaste can use the X cut buffer for input, designed to be used
+with a window-manager key binding or panel launcher.  The resulting URLs are
+printed to stdout and additionally placed in the X cut buffer for quick
+pasting. 
 
 
 %prep
@@ -40,6 +41,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 1:2.1-1
+- update to latest upstream version (now uses pastebin.com)
+
 * Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
 - Correct License to GPLv2
 - Remove doc in files-section


--- nopaste-2835 DELETED ---



From akurtakov at fedoraproject.org  Tue Aug 18 15:19:05 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 18 Aug 2009 15:19:05 +0000 (UTC)
Subject: rpms/qdox/devel build.xml.tar.gz, NONE, 1.1 qdox-1.8-jpp-depmap.xml,
	NONE, 1.1 qdox-settings.xml, NONE, 1.1 sources, 1.3,
	1.4 qdox.spec, 1.7, 1.8 .cvsignore, 1.3, 1.4
Message-ID: <20090818151905.1BBF611C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/qdox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6585/devel

Modified Files:
	sources qdox.spec .cvsignore 
Added Files:
	build.xml.tar.gz qdox-1.8-jpp-depmap.xml qdox-settings.xml 
Log Message:
Update to 1.9.2.


--- NEW FILE build.xml.tar.gz ---
?
??A,$? ?K?????????????pAY8???^??e
????n????t:??[?
 ?:1?NC?F?
????0?2:rJG????;??h???????
?B?@??+??XR#????[???Y7??O??D??]?*?9?$?O???]5w?P@?
z????5m?X,?Q,?(?W??????nW}.?y5?BU	???????????#?=??????K<e?"G?:#???G???}?O?U!mNTS9j?J?;??1
???ZMa???? A0???6,^O ?$?j?/D???(??Pp7???.J?MR????%??=?4t????????%+N?`???>??p[Y???????`???Y?t%l6?e?p?}QT??dM?+??&?J?@>3?%??Y?ba^?G???<)??????????????K???6??????z#s,???????R?v???h??j?6?????M?l`???+A??3?/???%8?@????? ??TJH???{m???,D?N???}D{P????M?n9B??-&????*??Nn?7??????R? [c?K???????B??Y$]q?????????8??[^(?????NZ?Yu??p??:?Uk=`?Nm????T??`???=?4Yu?Q?W????z-c??m?????@_?~?9J?e??????]N?]??K????2n?v?qe)?~???2??B?q??\????#????X&q?????d%?RS2hN?Ul&??p?
i???kY'?m#??H?z??1w&fz(?????"u??q?<u??~??????????{v_=Y?????????>?t???!??gK??)??D,s
??=?X??????E???S???>???gK?7?bs??O?v??E??[:?u????.???]?^?>?7e'[??x?'?d?
?~7?kD????[????(mG$???c?!?0???D??D???[????d????p[?ur?(?????=b??Ja?#??.?-
V?????
?5/???&?8
v?B'??`M)>&???q??(??bJ??h+?+F\????c???????+q.Fa??q?c1?*1JS?[??????#2~??WM?4w>GM??d?%?}V_U??R2????b????T?
??2Sh?$"?????y??????)??5?L?L(?????A??l??
4??d?lr???5????1O{?$$?sv???Ld???
??I3??????!????yY???q???c????1w?????KTa??2??H]T??z?B?e^dz[[?t?-??K?>og????]L?Y?2	?k?N?r????6?%s}?=???#D?}??^??x???A??\H,???^F???ufY?4?f?????:c?O?
??y
?T??7?Fm??p????>c??W??R?j????$]b?????V&U?Ue????*[?O?\^\???N~?h??	?????
(w????h?fP????????t?????h~a?????Oj?g/?~iQQ+?6*??!?=???s?-UZ?F??iFzk)tM??????8????5u??K?;???	/4%wwJp????BoV{????????????!SH at -U?
TC???<,vlHU[?8??y?X?xX?G?j$z?A?(?Tu????wn?x???+?wz}Q&
Y?e?:m?Q|???h??:??l??!S????a?y?? ?b???F??`.T?|qse?}??e???????1?O??x??ok??Z?M??????????M{W?8???G?/??^??+???????B??Jn*?R|??e?I?*??I?)t????????????"??Y?#??&??Dm??n?T?- ?}???????????<&??k?)7HW????^w???g?K????>?X;?xtb???K?e??
?t??????cl?s?/_Y???`~??IW???(??ov7^wh?YF?l??????b?UG<??Sg%4?p???C?3?&m)??m??7[?i?,???-F?C+?^?
????k??????i?|???6??W??:l?R????Zh??Zh??Zh??Zh??Zh??Zx?7x
??

--- NEW FILE qdox-1.8-jpp-depmap.xml ---
<dependencies>
<!--
	<dependency>
	  <maven>
		<groupId>jetty</groupId>
		<artifactId>jetty</artifactId>
		<version>4.2.10</version>
	  </maven>
	  <jpp>
		<groupId>JPP/jetty5</groupId>
		<artifactId>jetty5</artifactId>
		<version>5.1.12</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>servletapi</groupId>
		<artifactId>servletapi</artifactId>
		<version>2.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>servlet_2_4_api</artifactId>
		<version>2.4</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>org.nanocontainer</groupId>
		<artifactId>nanocontainer</artifactId>
		<version>1.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/nanocontainer</groupId>
		<artifactId>container</artifactId>
		<version>1.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm</artifactId>
		<version>3.0</version>
	  </maven>
	  <jpp>
		<groupId>JPP/objectweb-asm</groupId>
		<artifactId>asm</artifactId>
		<version>3.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm-parent</artifactId>
		<version>2.2.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>asm2-parent</artifactId>
		<version>2.2.3</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm-tree</artifactId>
		<version>2.2.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP/asm2</groupId>
		<artifactId>asm2-tree</artifactId>
		<version>2.2.3</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>freemarker</groupId>
		<artifactId>freemarker</artifactId>
		<version>2.3.9</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>freemarker</artifactId>
		<version>2.3.9</version>
	  </jpp>
	</dependency>
-->
	<dependency>
	  <maven>
		<groupId>slide</groupId>
		<artifactId>slide-webdavlib</artifactId>
		<version>2.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/slide</groupId>
		<artifactId>slide-webdavclient-webdavlib</artifactId>
		<version>2.1</version>
	  </jpp>
	</dependency>
<!--
	<dependency>
	  <maven>
		<groupId>avalon-framework</groupId>
		<artifactId>avalon-framework</artifactId>
		<version>4.1.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>avalon-framework</artifactId>
		<version>4.3.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>logkit</groupId>
		<artifactId>logkit</artifactId>
		<version>1.0.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>avalon-logkit</artifactId>
		<version>2.2.1</version>
	  </jpp>
	</dependency>

 <dependency>
   <maven>
     <groupId>javax.jms</groupId>
     <artifactId>jms</artifactId>
     <version>1.1</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jms_1_1_api</artifactId>
     <version>1.1</version>
   </jpp>
 </dependency>
-->

        <dependency>
                <maven>
                        <groupId>xpp3</groupId>
                        <artifactId>xpp3_min</artifactId>
                        <version>1.1.3.4.O</version>
                </maven>
                <jpp>
                        <groupId>JPP</groupId>
                        <artifactId>xpp3-minimal</artifactId>
                        <version>1.1.3.8</version>
                </jpp>
        </dependency>

</dependencies>


--- NEW FILE qdox-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>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Oct 2008 19:44:10 -0000	1.3
+++ sources	18 Aug 2009 15:19:04 -0000	1.4
@@ -1 +1 @@
-21aec355b29e6ba2743ed90db643dbfc  qdox-1.6.1-src.tar.gz
+1d61cb18731aa74a60d9dd04029b9884  qdox-1.9.2-src.tar.gz


Index: qdox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qdox.spec	27 Jul 2009 02:16:49 -0000	1.7
+++ qdox.spec	18 Aug 2009 15:19:04 -0000	1.8
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2008, JPackage Project
+# Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,140 +28,132 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%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}}
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
 
-%bcond_with maven
-
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define with_maven 0
+%define without_maven 1
 
 %define section free
 
+Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
-Version:        1.6.1
-Release:        7.2%{?dist}
+Version:        1.9.2
+Release:        1%{?dist}
 Epoch:          0
-Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            http://qdox.codehaus.org/
-Group:          Development/Libraries/Java
-# svn co https://svn.codehaus.org/qdox/tags/QDOX_1_6_1/qdox
-# tar czvf qdox-1.6.1-src.tar.gz qdox
-Source0:        qdox-1.6.1-src.tar.gz
-Source1:        pom-maven2jpp-depcat.xsl
-Source2:        pom-maven2jpp-newdepmap.xsl
-Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        qdox-1.6-jpp-depmap.xml
-Source5:        qdox-LocatedDef.java
-Source6:        qdox-build.xml
-Patch0:         qdox-1.6.1-byaccj.patch
-Patch1:         qdox-1.6.1-jflex.patch
-Patch2:         qdox-1.6.1-test.patch
-BuildRequires:  jpackage-utils >= 0:1.6
-%if %with maven
-BuildRequires:  maven >= 0:1.1
-BuildRequires:  maven-plugins-base
-BuildRequires:  maven-plugin-license
-BuildRequires:  maven-plugin-test
-BuildRequires:  maven-plugin-xdoc
-BuildRequires:  saxon
-BuildRequires:  saxon-scripts
-BuildRequires:  jmock >= 0:1.0
-BuildRequires:  mockobjects >= 0:0.09
-%endif
+Group:          Development/Libraries
+Source0:        %{name}-%{version}-src.tar.gz
+# svn export http://svn.codehaus.org/qdox/tags/qdox-1.8/
+
+Source1:        build.xml.tar.gz
+Source2:        qdox-settings.xml
+Source3:        qdox-1.8-jpp-depmap.xml
+
+BuildRequires:  jpackage-utils >= 0:1.7.4
+BuildRequires:  java-devel = 0:1.5.0
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit >= 0:3.8.1
 BuildRequires:  byaccj
-BuildRequires:  java_cup
 BuildRequires:  jflex
-%if ! %{gcj_support}
-BuildArch:      noarch
+%if %{with_maven}
+BuildRequires:  maven2 >= 2.0.7
+BuildRequires:  maven2-plugin-ant
+BuildRequires:  maven2-plugin-antrun
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-dependency
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-release
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire
+BuildRequires:  jmock >= 0:1.0
 %endif
+
+Requires:          java >= 0:1.5.0
+Requires(post):    jpackage-utils >= 0:1.7.4
+Requires(postun):  jpackage-utils >= 0:1.7.4
+
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-%if %{gcj_support}
-BuildRequires:  java-gcj-compat-devel
-%endif
 
 %description
-QDox is a high speed, small footprint parser 
-for extracting class/interface/method definitions 
-from source files complete with JavaDoc @tags. 
-It is designed to be used by active code 
-generators or documentation tools. 
+QDox is a high speed, small footprint parser
+for extracting class/interface/method definitions
+from source files complete with JavaDoc @tags.
+It is designed to be used by active code
+generators or documentation tools.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description javadoc
 %{summary}.
 
+%if %{with_maven}
+%package manual
+Summary:        Documents for %{name}
+Group:          Documentation
+
+%description manual
+%{summary}.
+%endif
+
 %prep
 %setup -q -n %{name}
-chmod -Rf a+rX,u+w,g-w,o-w bootstrap
-rm -r bootstrap
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-cp -p %{SOURCE5} src/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java 
-sed -e "s/@VERSION@/%{version}/g" %{SOURCE6} > build.xml
-
-rm src/test/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java \
-  src/test/com/thoughtworks/qdox/parser/MockBuilder.java \
-  src/test/com/thoughtworks/qdox/parser/MockLexer.java \
-  src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java \
-  src/test/com/thoughtworks/qdox/parser/ParserTest.java
+for j in $(find . -name "*.jar"); do
+    mv $j $j.no
+done
+rm bootstrap/yacc.linux
+ln -s /usr/bin/byaccj bootstrap/yacc.linux
+ln -s $(build-classpath jflex) bootstrap
+#ln -s $(build-classpath java-cup) bootstrap
+mkdir -p .m2/repository/JPP/maven2/default_poms
+tar xzf %{SOURCE1}
+
+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
-%if %with maven
-export DEPCAT=$(pwd)/qdox-1.6-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
-    popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-%{_bindir}/saxon $DEPCAT %{SOURCE2} > qdox-1.6-depmap.new.xml
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    cp project.xml project.xml.orig
-    %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
-    popd
-done
+%if %{with_maven}
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+        -e \
+        -s settings.xml \
+        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        ant:ant install javadoc:javadoc
 
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-export CLASSPATH=$(build-classpath junit)
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven-1.0/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        -Dqdox.byaccj.executable=byaccj \
-        jar javadoc
 %else
-export OPT_JAR_LIST="junit ant/ant-junit"
-mkdir -p target/src/java/com/thoughtworks/qdox/parser/impl
-export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes:$(build-classpath java_cup jflex junit)
-%{java} JFlex.Main \
+mkdir -p src/java/com/thoughtworks/qdox/parser/impl
+export CLASSPATH=$(build-classpath jmock jflex):target/classes:target/test-classes
+java JFlex.Main \
     -d src/java/com/thoughtworks/qdox/parser/impl \
     src/grammar/lexer.flex
-pushd target
-%{_bindir}/byaccj \
+pushd src
+byaccj \
     -Jnorun \
     -Jnoconstruct \
     -Jclass=Parser \
     -Jsemantic=Value \
     -Jpackage=com.thoughtworks.qdox.parser.impl \
-    ../src/grammar/parser.y
+    grammar/parser.y
 popd
-mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl
-ant -Dbuild.sysclasspath=only jar javadoc
+mv src/Parser.java src/java/com/thoughtworks/qdox/parser/impl
+#TODO reenable test when jmock is imported
+ant -Dbuild.sysclasspath=only -Dmaven.test.skip=true -Dmaven.mode.offline=true jar javadoc
 %endif
 
 %install
@@ -173,115 +165,95 @@ cp -p target/%{name}-%{version}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_to_maven_depmap  com.thoughtworks.qdox qdox %{version} JPP %{name}
+
+
+# poms
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
+# manual
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%if %{with_maven}
+rm -rf target/site/apidocs
+cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
+%update_maven_depmap
 
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
-%changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.6.1-7.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+%if %{with_maven}
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}/site
+%endif
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.6.1-6.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+%changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.9.2-1
+- Update to 1.9.2.
 
-* Fri Oct 24 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5.2
-- Fedora-specific: enable GCJ support
+* Fri Apr 03 2009 Ralph Apel <r.apel at r-apel.de> 0:1.8-1.jpp5
+- 1.8 as qdox18 because of qdox frozen at 1.6.1 in JPP-5
 
-* Fri Oct 24 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5.1
-- Fedora-specific: remove repolib
-- Fedora-specific: use java_cup not java-cup
-- Fedora-specific: don't use jmock
-
-* Tue Jul 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5
-- remove bootstrap binaries
-- patch build for newer jflex
-- patch build to disable failing tests on JDK6
-- BuildRequires: jmock
-- fix version in ant build.xml
-- fix location of byaccj and jflex output files
-- fix apidoc location
-- correctly set CLASSPATH and OPT_JAR_LIST
-
-* Mon Jul 28 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-4
-- fix jflex part of build
-- GCJ fixes
-- fix javadoc Requires
-
-* Sat Jul 26 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-3
-- build without maven
-- fix repolib permissions
-
-* Thu May 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-2.jpp5
-- remove spurious gnu-crypto dependency
-- fix empty scriptlets
-- fix License
-- use %%{_bindir}
-
-* Fri Apr 18 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-1jpp.ep1.5
-- patch for byaccj
-- place junit on CLASSPATH
-- remove javadoc scriptlets
+* Tue Jul 01 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-5.jpp5
+- Restore to devel
+- Drop mockobjects BR
+
+* Fri Jun 13 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-4.jpp5
+- Add com.thoughtworks.qdox groupId to depmap frag
+
+* Tue Feb 26 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-3jpp
+- Add settings file
+- Fix pom marking jmock dependency as of scope test
+- Fix -jpp-depmap.xml for asm2-parent
+
+* Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-2jpp
+- Fix maven macro value
+
+* Thu Nov 22 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-1jpp
+- Upgrade to 1.6.3
+
+* Wed May 30 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.2-1jpp
+- Upgrade to 1.6.2
+- Activate tests while building with ant
+- Make Vendor, Distribution based on macro
+- Install depmap frags, poms
 
 * Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.4
 - Rebuild with fixed component-info.xml
 
-* Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.3
-- Add repository.jboss.com as a prefix for repodir
-
-* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.2
-- Add repolib subpackage
-
-* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.1
-- Merge with upstream for upgrade
-
-* Fri Mar 16 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp
-- Upgrade to 1.6.1
-
 * Fri Feb 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5-3jpp
 - Add option to build without maven
 - Omit tests when building without maven
 - Add gcj_support option
 
-* Tue Feb 21 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.5-2jpp_1rh
-- First Red Hat build
-
 * Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.5-2jpp
 - Rebuild for JPP-1.7, adapting to maven-1.1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Oct 2008 19:44:10 -0000	1.3
+++ .cvsignore	18 Aug 2009 15:19:05 -0000	1.4
@@ -1 +1,2 @@
 qdox-1.6.1-src.tar.gz
+qdox-1.9.2-src.tar.gz



From ajax at fedoraproject.org  Tue Aug 18 15:22:02 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 18 Aug 2009 15:22:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-rendition/devel rendition-4.2.2-abi.patch, NONE, 
	1.1 xorg-x11-drv-rendition.spec, 1.28, 1.29
Message-ID: <20090818152202.8292A11C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7486

Modified Files:
	xorg-x11-drv-rendition.spec 
Added Files:
	rendition-4.2.2-abi.patch 
Log Message:
* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 4.2.2-4
- rendition-4.2.2-abi.patch: Fix for RAC removal and etc.


rendition-4.2.2-abi.patch:
 rendition.c |    4 ++--
 rendition.h |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rendition-4.2.2-abi.patch ---
diff --git a/src/rendition.c b/src/rendition.c
index db62f8e..7a9e18b 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
     pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
                pRendition->PciInfo->device, pRendition->PciInfo->func);
-#endif
 
     /*
      * XXX This could be refined if some VGA memory resources are not
@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive))
          return FALSE;
 
+
     /* Operations for which memory access is required. */
     pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
     /* Operations for which I/O access is required. (XXX Check this) */
     pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-    
+#endif
     /* determine depth, bpp, etc. */
     if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
         return FALSE;
diff --git a/src/rendition.h b/src/rendition.h
index 2b43cba..ba0a22e 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,11 +37,13 @@
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
 
 /* Several predefined resource lists */
 #include "xf86Resources.h"
+#endif
 
 /* Needed by the Shadow Framebuffer */
 #include "shadowfb.h"


Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-rendition.spec	7 Aug 2009 15:02:10 -0000	1.28
+++ xorg-x11-drv-rendition.spec	18 Aug 2009 15:22:02 -0000	1.29
@@ -2,17 +2,18 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 rendition video driver
-Name:      xorg-x11-drv-rendition
-Version:   4.2.2
-Release:   3%{?dist}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 rendition video driver
+Name:	    xorg-x11-drv-rendition
+Version:    4.2.2
+Release:    4%{?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:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    rendition.xinf
+Patch0:	    rendition-4.2.2-abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +27,7 @@ X.Org X11 rendition video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 4.2.2-4
+- rendition-4.2.2-abi.patch: Fix for RAC removal and etc.
+
 * Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 4.2.2-3
 - Un-ship the microcode, it doesn't actually get loaded.
 



From iarnell at fedoraproject.org  Tue Aug 18 15:22:08 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 18 Aug 2009 15:22:08 +0000 (UTC)
Subject: rpms/nopaste/EL-5 nopaste-2.1, NONE, 1.1 nopaste.spec, 1.1,
	1.2 nopaste-2835, 1.1, NONE
Message-ID: <20090818152208.CCE6811C00D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/nopaste/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7528

Modified Files:
	nopaste.spec 
Added Files:
	nopaste-2.1 
Removed Files:
	nopaste-2835 
Log Message:
* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 1:2.1-1
- update to latest upstream version (now uses pastebin.com)



--- NEW FILE nopaste-2.1 ---
#!/bin/bash
#
# nopaste -- paste to pastebin.com
#
# Copyright 2005,2007,2009 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

nopaste_version=2.1
pastebin_url=${PASTEBIN_URL:-http://pastebin.com/pastebin.php}

main() {
    declare opt_nick=${PASTEBIN_USER:-${USER:-$(whoami)}}
    declare opt_language=text
    declare opt_diff=false
    declare opt_download=false
    declare opt_xcut=false
    declare opt_parent=
    declare expire=f # set by opt_expire()
    declare shortopts=( n:nick l:language x:xcut p:parent e:expire )
    declare -a parsed_opts parsed_params
    parse_cmdline "$@" || exit
    set -- "${parsed_params[@]}"

    declare -a urls

    if [[ $# -gt 0 ]]; then
        declare f u
        for f; do
            if [[ ! -r $f ]]; then
                echo "nopaste: can't read $f" >&2
                exit 1
            fi
            u=$(docurl --form-string "code2=$(<$f)")
            urls+=( "$u" )
            opt_parent=$(pid "$u")
        done
    else
        declare buf
        if $opt_xcut; then
            buf=$(get_x_clipboard) || exit 1
        else
            read -d '' buf
            [[ -n $buf ]] || exit 1
        fi
        urls=( "$(docurl --form-string "code2=$buf")" )
    fi

    put_x_clipboard <<<"${urls[*]}"
    printf "%s\n" "${urls[@]}"
}

docurl() {
    declare u
    u=$(curl --silent --show-error -o /dev/null -w "%{redirect_url}\n" \
        --form-string "poster=$opt_nick" --form-string "format=$opt_language" \
        --form-string "expiry=$expire" \
        ${opt_parent:+--form-string "parent_pid=$opt_parent"} \
        -F "paste=Send" -F "remember=0" "$@" "$pastebin_url") || exit 1
    if [[ -n $opt_parent ]] && $opt_diff; then
        u="$pastebin_url?diff=$(pid "$u")"
    elif $opt_download; then
        u="$pastebin_url?dl=$(pid "$u")"
    fi
    echo "$u"
}

pid() {
    echo "${1##*[/=]}"
}

get_x_clipboard() {
    if type -P xclip &>/dev/null; then
        xclip -o
    elif type -P xcut &>/dev/null; then
        xcut -p
    else
        echo "nopaste: xclip or xcut required for --xcut" >&2
        return 1
    fi
}

put_x_clipboard() {
    xclip 2>/dev/null || xcut 2>/dev/null
}

opt_expire:() {
    case $1 in
        d*) expire=d ;;     # day
        [fn]*) expire=f ;;  # forever/never
        *) expire=m ;;      # month
    esac
}

opt_private:() {
    pastebin_url=${pastebin_url%%://*}://$1.${pastebin_url#*://}
}

opt_help() { usage; exit; }
opt_version() { echo "nopaste $nopaste_version"; exit; }

usage() {
    cat <<'EOT'
usage: nopaste [options] [files]

    -e --expire WHEN    Set expiry day/month/forever, defaults to forever
    -l --language LANG  Set language, defaults to text
    -n --nick USER      Set nick (honors PASTEBIN_USER)
    -p --parent PID     Set parent paste id, for diffs
       --private STR    Use a private pastebin
    -x --xcut           Paste from X selection (using xclip or xcut)

    --diff       Return diff URL (with --parent or multiple)
    --download   Return download URL

    --help       Show this help
    --version    Show version info
EOT
}

#=============================================================================
# simple bash command-line processing
#
# (c) Copyright 2008 Aron Griffis <agriffis n01se.net>
# Released under the GNU GPL v2
#=============================================================================

parse_cmdline() {
    # extract long options from variable declarations
    declare getopt_long=$(set | \
        sed '/^opt_/!d; s/^opt_//; s/_/-/g;
            s/\(.*\)=false$/\1 no-\1/;
            s/\(.*\)=true$/\1 no-\1/;
            s/=.*/:/; s/()//;' | xargs | sed 's/ /,/g')

    # augment the shortopts array with takes-a-value colon;
    # for example f:file becomes f::file
    declare shortopts=( "${shortopts[@]}" )
    declare i x
    for ((i=0; i<${#shortopts[@]}; i++)); do
        x=${shortopts[i]}
        if [[ ",$getopt_long," == *,"${x#?:}":,* ]]; then
            shortopts[i]=${x/:/::}
        fi
    done
    declare getopt_short=$(IFS=''; echo "${shortopts[*]%:*}")

    declare args
    args=$(getopt -o "$getopt_short" \
        --long "$getopt_long" -n "$0" -- "$@") || return
    eval set -- "$args"

    declare opt var val
    parsed_opts=()
    while true; do
        [[ $1 == -- ]] && { shift; break; }

        # translate short options to long
        if [[ $1 == -? ]]; then
            opt=${1#-}
            for x in "${shortopts[@]}"; do
                if [[ $x == "$opt":* ]]; then
                    opt=${x##*:}
                    break
                fi
            done
        else
            opt=${1#--}
        fi

        # figure out $var and $val; shift positional params
        var=opt_${opt//-/_}
        case ",$getopt_long," in
            # make sure to handle opt_no_something (--no-something) 
            # which has a (silly) negation of --no-no-something
            *",no-$opt,"*)
                val=true
                parsed_opts=( "${parsed_opts[@]}" "$1" )
                shift ;;
            *",$opt,"*)
                if [[ $opt == no-* ]]; then
                    var=${var/no_/}
                    val=false
                else
                    val=true
                fi
                parsed_opts=( "${parsed_opts[@]}" "$1" )
                shift ;;
            *",$opt:,"*) 
                val=$2
                parsed_opts=( "${parsed_opts[@]}" "$1" "$2" )
                shift 2 ;;
            *)
                echo "error processing $1: not in getopt_long?" >&2
                return 1 ;;
        esac

        if [[ $(type -t "$var") == function ]]; then
            $var
        elif [[ $(type -t "$var:") == function ]]; then
            $var: "$val"
        elif is_array "$var"; then
            eval "$var=( \"\${$var[@]}\" $(printf %q "$val") )"
        elif is_var "$var"; then
            eval "$var=\$val"
        else
            echo "error processing $var: no func/array/var?" >&2
            return 1
        fi
    done

    parsed_params=( "$@" )
}

getopt() {
    declare cmd=${cmd:-${0##*/}}
    if [[ $(command getopt --help 2>&1) == *--longoptions* ]]; then
        command getopt "$@"
    elif [[ $OSTYPE == darwin* ]]; then
        if [[ ! -x /opt/local/bin/getopt ]]; then
            echo "Error: $cmd requires GNU getopt" >&2
            echo "Please install from http://getopt.darwinports.com/" >&2
            exit 1
        fi
        /opt/local/bin/getopt "$@"
    else
        echo "Error: $cmd requires GNU getopt" >&2
        exit 1
    fi
}

is_var() {
    declare -p "$1" &>/dev/null
}

is_array() {
    set -- $(declare -p "$1" 2>/dev/null)
    [[ $2 == -*a* ]]
}

main "$@"


Index: nopaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nopaste/EL-5/nopaste.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nopaste.spec	15 Jan 2009 19:17:09 -0000	1.1
+++ nopaste.spec	18 Aug 2009 15:22:08 -0000	1.2
@@ -1,6 +1,8 @@
 Name:           nopaste
-Version:        2835
-Release:        2%{?dist}
+# version numbering change since 2009/06/21
+Epoch:          1
+Version:        2.1
+Release:        1%{?dist}
 Summary:        Command-line interface to rafb.net/paste
 
 Group:          Applications/Internet
@@ -12,13 +14,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 
 %description
-This is a simple script to facilitate sharing text through 
-http://rafb.net/paste/. Like most UNIX utilities, it can take 
-stdin or files on the command-line. Additionally nopaste can 
-use the X cut buffer for input, designed to be used with a 
-window-manager key binding or panel launcher.
-The resulting URLs are printed to stdout and additionally 
-placed in the X cut buffer for quick pasting. 
+This is a simple script to facilitate sharing text through pastebin.com. Like
+most UNIX utilities, it can take stdin or files on the command-line.
+Additionally nopaste can use the X cut buffer for input, designed to be used
+with a window-manager key binding or panel launcher.  The resulting URLs are
+printed to stdout and additionally placed in the X cut buffer for quick
+pasting. 
 
 
 %prep
@@ -40,6 +41,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 1:2.1-1
+- update to latest upstream version (now uses pastebin.com)
+
 * Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
 - Correct License to GPLv2
 - Remove doc in files-section


--- nopaste-2835 DELETED ---



From jspaleta at fedoraproject.org  Tue Aug 18 15:23:36 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 18 Aug 2009 15:23:36 +0000 (UTC)
Subject: rpms/gpodder/F-11 gpodder.spec,1.28,1.29
Message-ID: <20090818152336.4C89111C00D7@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gpodder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7988

Modified Files:
	gpodder.spec 
Log Message:
* Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-3
- Fix for desktop file encoding packaging problem



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-11/gpodder.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gpodder.spec	28 Jul 2009 06:35:15 -0000	1.28
+++ gpodder.spec	18 Aug 2009 15:23:36 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:           gpodder
 Version:        0.17.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -37,10 +37,6 @@ make messages
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-iconv -f latin1 -t utf-8 $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
-       -o $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop.new
-mv $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop.new $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
 desktop-file-install --vendor fedora --delete-original           \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                 \
   --remove-key Miniicon --add-category Application \
@@ -78,6 +74,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Mon Aug 17 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-3
+- Fix for desktop file encoding packaging problem
+
 * Mon Jul 27 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.17.0-2
 - New upstream release, fixes multiple bugs since 0.16.1.
 



From iarnell at fedoraproject.org  Tue Aug 18 15:31:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 18 Aug 2009 15:31:49 +0000 (UTC)
Subject: rpms/nopaste/EL-4 nopaste.spec,1.2,1.3
Message-ID: <20090818153149.DF4F311C00D7@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/nopaste/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10414/EL-4

Modified Files:
	nopaste.spec 
Log Message:
* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 2.1-2
- update summary



Index: nopaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nopaste/EL-4/nopaste.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nopaste.spec	18 Aug 2009 15:18:20 -0000	1.2
+++ nopaste.spec	18 Aug 2009 15:31:49 -0000	1.3
@@ -2,8 +2,8 @@ Name:           nopaste
 # version numbering change since 2009/06/21
 Epoch:          1
 Version:        2.1
-Release:        1%{?dist}
-Summary:        Command-line interface to rafb.net/paste
+Release:        2%{?dist}
+Summary:        Command-line interface to pastebin.com
 
 Group:          Applications/Internet
 License:        GPLv2
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 2.1-2
+- update summary
+
 * Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 1:2.1-1
 - update to latest upstream version (now uses pastebin.com)
 



From iarnell at fedoraproject.org  Tue Aug 18 15:31:50 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 18 Aug 2009 15:31:50 +0000 (UTC)
Subject: rpms/nopaste/EL-5 nopaste.spec,1.2,1.3
Message-ID: <20090818153150.0925511C0262@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/nopaste/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10414/EL-5

Modified Files:
	nopaste.spec 
Log Message:
* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 2.1-2
- update summary



Index: nopaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nopaste/EL-5/nopaste.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nopaste.spec	18 Aug 2009 15:22:08 -0000	1.2
+++ nopaste.spec	18 Aug 2009 15:31:49 -0000	1.3
@@ -2,8 +2,8 @@ Name:           nopaste
 # version numbering change since 2009/06/21
 Epoch:          1
 Version:        2.1
-Release:        1%{?dist}
-Summary:        Command-line interface to rafb.net/paste
+Release:        2%{?dist}
+Summary:        Command-line interface to pastebin.com
 
 Group:          Applications/Internet
 License:        GPLv2
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 2.1-2
+- update summary
+
 * Tue Aug 18 2009 Iain Arnell <iarnell at gmail.com> 1:2.1-1
 - update to latest upstream version (now uses pastebin.com)
 



From jakub at fedoraproject.org  Tue Aug 18 15:32:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 18 Aug 2009 15:32:26 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-power7-3.patch,1.1,1.2
Message-ID: <20090818153226.0B72111C00D7@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10583

Modified Files:
	gcc44-power7-3.patch 
Log Message:
4.4.1-6

gcc44-power7-3.patch:
 config/rs6000/altivec.md                     |   44 
 config/rs6000/predicates.md                  |    3 
 config/rs6000/rs6000-c.c                     |   79 +
 config/rs6000/rs6000-protos.h                |    2 
 config/rs6000/rs6000.c                       | 1273 +++++++++++++--------------
 config/rs6000/rs6000.h                       |   96 +-
 config/rs6000/rs6000.md                      |   15 
 config/rs6000/rs6000.opt                     |   24 
 config/rs6000/vector.md                      |   56 -
 config/rs6000/vsx.md                         |  406 ++++++--
 doc/extend.texi                              |   17 
 testsuite/gcc.target/powerpc/vsx-builtin-3.c |  212 ++++
 12 files changed, 1363 insertions(+), 864 deletions(-)

Index: gcc44-power7-3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-power7-3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-power7-3.patch	14 May 2009 08:52:31 -0000	1.1
+++ gcc44-power7-3.patch	18 Aug 2009 15:32:25 -0000	1.2
@@ -1028,7 +1028,7 @@ testsuite/
  
  	case V4SImode:
  	  if (VECTOR_UNIT_NONE_P (V4SImode) || VECTOR_UNIT_NONE_P (V4SFmode))
-@@ -3785,15 +3846,28 @@ rs6000_expand_vector_init (rtx target, r
+@@ -3780,15 +3841,28 @@ rs6000_expand_vector_init (rtx target, r
  	}
      }
  
@@ -1063,7 +1063,7 @@ testsuite/
        return;
      }
  
-@@ -3856,10 +3930,12 @@ rs6000_expand_vector_set (rtx target, rt
+@@ -3851,10 +3925,12 @@ rs6000_expand_vector_set (rtx target, rt
    int width = GET_MODE_SIZE (inner_mode);
    int i;
  
@@ -1078,7 +1078,7 @@ testsuite/
        return;
      }
  
-@@ -3900,10 +3976,12 @@ rs6000_expand_vector_extract (rtx target
+@@ -3895,10 +3971,12 @@ rs6000_expand_vector_extract (rtx target
    enum machine_mode inner_mode = GET_MODE_INNER (mode);
    rtx mem, x;
  
@@ -1093,7 +1093,7 @@ testsuite/
        return;
      }
  
-@@ -4323,9 +4401,7 @@ avoiding_indexed_address_p (enum machine
+@@ -4318,9 +4396,7 @@ avoiding_indexed_address_p (enum machine
  {
    /* Avoid indexed addressing for modes that have non-indexed
       load/store instruction forms.  */
@@ -1104,8 +1104,8 @@ testsuite/
  }
  
  inline bool
-@@ -4427,6 +4503,16 @@ rs6000_legitimize_address (rtx x, rtx ol
- 	ret = rs6000_legitimize_tls_address (x, model);
+@@ -4443,6 +4519,16 @@ rs6000_legitimize_address (rtx x, rtx ol
+       ret = rs6000_legitimize_tls_address (x, model);
      }
  
 +  else if (VECTOR_MEM_ALTIVEC_OR_VSX_P (mode))
@@ -1121,7 +1121,7 @@ testsuite/
    else if (GET_CODE (x) == PLUS
  	   && GET_CODE (XEXP (x, 0)) == REG
  	   && GET_CODE (XEXP (x, 1)) == CONST_INT
-@@ -4436,8 +4522,6 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -4452,8 +4538,6 @@ rs6000_legitimize_address (rtx x, rtx ol
  		 && (mode == DImode || mode == TImode)
  		 && (INTVAL (XEXP (x, 1)) & 3) != 0)
  		|| (TARGET_SPE && SPE_VECTOR_MODE (mode))
@@ -1130,7 +1130,7 @@ testsuite/
  		|| (TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
  					   || mode == DImode || mode == DDmode
  					   || mode == TDmode))))
-@@ -4467,15 +4551,6 @@ rs6000_legitimize_address (rtx x, rtx ol
+@@ -4485,15 +4569,6 @@ rs6000_legitimize_address (rtx x, rtx ol
        ret = gen_rtx_PLUS (Pmode, XEXP (x, 0),
  			  force_reg (Pmode, force_operand (XEXP (x, 1), 0)));
      }
@@ -1146,7 +1146,7 @@ testsuite/
    else if ((TARGET_SPE && SPE_VECTOR_MODE (mode))
  	   || (TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
  				      || mode == DDmode || mode == TDmode
-@@ -5113,7 +5188,7 @@ rs6000_legitimate_address (enum machine_
+@@ -5131,7 +5206,7 @@ rs6000_legitimate_address (enum machine_
      ret = 1;
    else if (rs6000_legitimate_offset_address_p (mode, x, reg_ok_strict))
      ret = 1;
@@ -1155,7 +1155,7 @@ testsuite/
  	   && mode != TFmode
  	   && mode != TDmode
  	   && ((TARGET_HARD_FLOAT && TARGET_FPRS)
-@@ -5953,7 +6028,13 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -5971,7 +6046,13 @@ rs6000_emit_move (rtx dest, rtx source, 
  
      case TImode:
        if (VECTOR_MEM_ALTIVEC_OR_VSX_P (TImode))
@@ -1170,7 +1170,7 @@ testsuite/
  
        rs6000_eliminate_indexed_memrefs (operands);
  
-@@ -7869,7 +7950,8 @@ def_builtin (int mask, const char *name,
+@@ -7888,7 +7969,8 @@ def_builtin (int mask, const char *name,
    if ((mask & target_flags) || TARGET_PAIRED_FLOAT)
      {
        if (rs6000_builtin_decls[code])
@@ -1180,7 +1180,7 @@ testsuite/
  
        rs6000_builtin_decls[code] =
          add_builtin_function (name, type, code, BUILT_IN_MD,
-@@ -7934,6 +8016,34 @@ static const struct builtin_description 
+@@ -7953,6 +8035,34 @@ static const struct builtin_description 
    { MASK_VSX, CODE_FOR_vsx_fnmaddv4sf4, "__builtin_vsx_xvnmaddsp", VSX_BUILTIN_XVNMADDSP },
    { MASK_VSX, CODE_FOR_vsx_fnmsubv4sf4, "__builtin_vsx_xvnmsubsp", VSX_BUILTIN_XVNMSUBSP },
  
@@ -1215,7 +1215,7 @@ testsuite/
    { 0, CODE_FOR_paired_msub, "__builtin_paired_msub", PAIRED_BUILTIN_MSUB },
    { 0, CODE_FOR_paired_madd, "__builtin_paired_madd", PAIRED_BUILTIN_MADD },
    { 0, CODE_FOR_paired_madds0, "__builtin_paired_madds0", PAIRED_BUILTIN_MADDS0 },
-@@ -8083,6 +8193,9 @@ static struct builtin_description bdesc_
+@@ -8102,6 +8212,9 @@ static struct builtin_description bdesc_
    { MASK_VSX, CODE_FOR_sminv2df3, "__builtin_vsx_xvmindp", VSX_BUILTIN_XVMINDP },
    { MASK_VSX, CODE_FOR_smaxv2df3, "__builtin_vsx_xvmaxdp", VSX_BUILTIN_XVMAXDP },
    { MASK_VSX, CODE_FOR_vsx_tdivv2df3, "__builtin_vsx_xvtdivdp", VSX_BUILTIN_XVTDIVDP },
@@ -1225,7 +1225,7 @@ testsuite/
  
    { MASK_VSX, CODE_FOR_addv4sf3, "__builtin_vsx_xvaddsp", VSX_BUILTIN_XVADDSP },
    { MASK_VSX, CODE_FOR_subv4sf3, "__builtin_vsx_xvsubsp", VSX_BUILTIN_XVSUBSP },
-@@ -8091,6 +8204,21 @@ static struct builtin_description bdesc_
+@@ -8110,6 +8223,21 @@ static struct builtin_description bdesc_
    { MASK_VSX, CODE_FOR_sminv4sf3, "__builtin_vsx_xvminsp", VSX_BUILTIN_XVMINSP },
    { MASK_VSX, CODE_FOR_smaxv4sf3, "__builtin_vsx_xvmaxsp", VSX_BUILTIN_XVMAXSP },
    { MASK_VSX, CODE_FOR_vsx_tdivv4sf3, "__builtin_vsx_xvtdivsp", VSX_BUILTIN_XVTDIVSP },
@@ -1247,7 +1247,7 @@ testsuite/
  
    { MASK_ALTIVEC|MASK_VSX, CODE_FOR_nothing, "__builtin_vec_add", ALTIVEC_BUILTIN_VEC_ADD },
    { MASK_ALTIVEC|MASK_VSX, CODE_FOR_nothing, "__builtin_vec_vaddfp", ALTIVEC_BUILTIN_VEC_VADDFP },
-@@ -8508,6 +8636,47 @@ static struct builtin_description bdesc_
+@@ -8527,6 +8655,47 @@ static struct builtin_description bdesc_
    { MASK_VSX, CODE_FOR_vsx_tsqrtv4sf2, "__builtin_vsx_xvtsqrtsp", VSX_BUILTIN_XVTSQRTSP },
    { MASK_VSX, CODE_FOR_vsx_frev4sf2, "__builtin_vsx_xvresp", VSX_BUILTIN_XVRESP },
  
@@ -1295,7 +1295,7 @@ testsuite/
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_abs", ALTIVEC_BUILTIN_VEC_ABS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_abss", ALTIVEC_BUILTIN_VEC_ABSS },
    { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_ceil", ALTIVEC_BUILTIN_VEC_CEIL },
-@@ -8533,15 +8702,6 @@ static struct builtin_description bdesc_
+@@ -8552,15 +8721,6 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC|MASK_VSX, CODE_FOR_fix_truncv4sfv4si2, "__builtin_vec_fix_sfsi", VECTOR_BUILTIN_FIX_V4SF_V4SI },
    { MASK_ALTIVEC|MASK_VSX, CODE_FOR_fixuns_truncv4sfv4si2, "__builtin_vec_fixuns_sfsi", VECTOR_BUILTIN_FIXUNS_V4SF_V4SI },
  
@@ -1311,7 +1311,7 @@ testsuite/
    /* The SPE unary builtins must start with SPE_BUILTIN_EVABS and
       end with SPE_BUILTIN_EVSUBFUSIAAW.  */
    { 0, CODE_FOR_spe_evabs, "__builtin_spe_evabs", SPE_BUILTIN_EVABS },
-@@ -9046,11 +9206,12 @@ rs6000_expand_ternop_builtin (enum insn_
+@@ -9065,11 +9225,12 @@ rs6000_expand_ternop_builtin (enum insn_
        || arg2 == error_mark_node)
      return const0_rtx;
  
@@ -1328,7 +1328,7 @@ testsuite/
        /* Only allow 4-bit unsigned literals.  */
        STRIP_NOPS (arg2);
        if (TREE_CODE (arg2) != INTEGER_CST
-@@ -9059,6 +9220,40 @@ rs6000_expand_ternop_builtin (enum insn_
+@@ -9078,6 +9239,40 @@ rs6000_expand_ternop_builtin (enum insn_
  	  error ("argument 3 must be a 4-bit unsigned literal");
  	  return const0_rtx;
  	}
@@ -1369,7 +1369,7 @@ testsuite/
      }
  
    if (target == 0
-@@ -9366,8 +9561,10 @@ altivec_expand_builtin (tree exp, rtx ta
+@@ -9385,8 +9580,10 @@ altivec_expand_builtin (tree exp, rtx ta
    enum machine_mode tmode, mode0;
    unsigned int fcode = DECL_FUNCTION_CODE (fndecl);
  
@@ -1382,7 +1382,7 @@ testsuite/
      {
        *expandedp = true;
        error ("unresolved overload for Altivec builtin %qF", fndecl);
-@@ -10156,6 +10353,7 @@ rs6000_init_builtins (void)
+@@ -10175,6 +10372,7 @@ rs6000_init_builtins (void)
    unsigned_V16QI_type_node = build_vector_type (unsigned_intQI_type_node, 16);
    unsigned_V8HI_type_node = build_vector_type (unsigned_intHI_type_node, 8);
    unsigned_V4SI_type_node = build_vector_type (unsigned_intSI_type_node, 4);
@@ -1390,7 +1390,7 @@ testsuite/
  
    opaque_V2SF_type_node = build_opaque_vector_type (float_type_node, 2);
    opaque_V2SI_type_node = build_opaque_vector_type (intSI_type_node, 2);
-@@ -10169,6 +10367,7 @@ rs6000_init_builtins (void)
+@@ -10188,6 +10386,7 @@ rs6000_init_builtins (void)
    bool_char_type_node = build_distinct_type_copy (unsigned_intQI_type_node);
    bool_short_type_node = build_distinct_type_copy (unsigned_intHI_type_node);
    bool_int_type_node = build_distinct_type_copy (unsigned_intSI_type_node);
@@ -1398,7 +1398,7 @@ testsuite/
    pixel_type_node = build_distinct_type_copy (unsigned_intHI_type_node);
  
    long_integer_type_internal_node = long_integer_type_node;
-@@ -10201,6 +10400,7 @@ rs6000_init_builtins (void)
+@@ -10220,6 +10419,7 @@ rs6000_init_builtins (void)
    bool_V16QI_type_node = build_vector_type (bool_char_type_node, 16);
    bool_V8HI_type_node = build_vector_type (bool_short_type_node, 8);
    bool_V4SI_type_node = build_vector_type (bool_int_type_node, 4);
@@ -1406,7 +1406,7 @@ testsuite/
    pixel_V8HI_type_node = build_vector_type (pixel_type_node, 8);
  
    (*lang_hooks.decls.pushdecl) (build_decl (TYPE_DECL,
-@@ -10241,9 +10441,17 @@ rs6000_init_builtins (void)
+@@ -10260,9 +10460,17 @@ rs6000_init_builtins (void)
  					    pixel_V8HI_type_node));
  
    if (TARGET_VSX)
@@ -1427,7 +1427,7 @@ testsuite/
  
    if (TARGET_PAIRED_FLOAT)
      paired_init_builtins ();
-@@ -10818,8 +11026,10 @@ altivec_init_builtins (void)
+@@ -10837,8 +11045,10 @@ altivec_init_builtins (void)
      {
        enum machine_mode mode1;
        tree type;
@@ -1440,7 +1440,7 @@ testsuite/
  
        if (is_overloaded)
  	mode1 = VOIDmode;
-@@ -10982,592 +11192,302 @@ altivec_init_builtins (void)
+@@ -11001,592 +11211,302 @@ altivec_init_builtins (void)
  	       ALTIVEC_BUILTIN_VEC_EXT_V4SF);
  }
  
@@ -2273,7 +2273,7 @@ testsuite/
  
        def_builtin (d->mask, d->name, type, d->code);
      }
-@@ -12618,12 +12538,12 @@ rs6000_secondary_reload_inner (rtx reg, 
+@@ -12637,12 +12557,12 @@ rs6000_secondary_reload_inner (rtx reg, 
  	}
  
        if (GET_CODE (addr) == PLUS
@@ -2288,7 +2288,7 @@ testsuite/
  
  	  if (!REG_P (addr_op2)
  	      && (GET_CODE (addr_op2) != CONST_INT
-@@ -12642,8 +12562,8 @@ rs6000_secondary_reload_inner (rtx reg, 
+@@ -12661,8 +12581,8 @@ rs6000_secondary_reload_inner (rtx reg, 
  	  addr = scratch_or_premodify;
  	  scratch_or_premodify = scratch;
  	}
@@ -2299,7 +2299,7 @@ testsuite/
  	{
  	  rs6000_emit_move (scratch_or_premodify, addr, Pmode);
  	  addr = scratch_or_premodify;
-@@ -12672,24 +12592,24 @@ rs6000_secondary_reload_inner (rtx reg, 
+@@ -12691,24 +12611,24 @@ rs6000_secondary_reload_inner (rtx reg, 
        if (GET_CODE (addr) == PRE_MODIFY
  	  && (!VECTOR_MEM_VSX_P (mode)
  	      || and_op2 != NULL_RTX
@@ -2329,7 +2329,7 @@ testsuite/
  	;
  
        else if (GET_CODE (addr) == PLUS)
-@@ -12709,7 +12629,7 @@ rs6000_secondary_reload_inner (rtx reg, 
+@@ -12728,7 +12648,7 @@ rs6000_secondary_reload_inner (rtx reg, 
  	}
  
        else if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
@@ -2338,7 +2338,7 @@ testsuite/
  	{
  	  rs6000_emit_move (scratch_or_premodify, addr, Pmode);
  	  addr = scratch_or_premodify;
-@@ -12741,7 +12661,7 @@ rs6000_secondary_reload_inner (rtx reg, 
+@@ -12760,7 +12680,7 @@ rs6000_secondary_reload_inner (rtx reg, 
       andi. instruction.  */
    if (and_op2 != NULL_RTX)
      {
@@ -2347,7 +2347,7 @@ testsuite/
  	{
  	  emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
  	  addr = scratch;
-@@ -12776,6 +12696,26 @@ rs6000_secondary_reload_inner (rtx reg, 
+@@ -12795,6 +12715,26 @@ rs6000_secondary_reload_inner (rtx reg, 
    return;
  }
  
@@ -2374,7 +2374,7 @@ testsuite/
  /* Allocate a 64-bit stack slot to be used for copying SDmode
     values through if this function has any SDmode references.  */
  
-@@ -12849,13 +12789,15 @@ rs6000_preferred_reload_class (rtx x, en
+@@ -12868,13 +12808,15 @@ rs6000_preferred_reload_class (rtx x, en
    enum machine_mode mode = GET_MODE (x);
    enum reg_class ret;
  
@@ -2395,7 +2395,7 @@ testsuite/
  
    else if (CONSTANT_P (x) && reg_classes_intersect_p (rclass, FLOAT_REGS))
      ret = NO_REGS;
-@@ -13074,8 +13016,10 @@ rs6000_cannot_change_mode_class (enum ma
+@@ -13093,8 +13035,10 @@ rs6000_cannot_change_mode_class (enum ma
  		       || (((to) == TDmode) + ((from) == TDmode)) == 1
  		       || (((to) == DImode) + ((from) == DImode)) == 1))
  		  || (TARGET_VSX
@@ -2407,7 +2407,7 @@ testsuite/
  		      && (ALTIVEC_VECTOR_MODE (from)
  			  + ALTIVEC_VECTOR_MODE (to)) == 1)
  		  || (TARGET_SPE
-@@ -14953,7 +14897,7 @@ rs6000_emit_vector_cond_expr (rtx dest, 
+@@ -14972,7 +14916,7 @@ rs6000_emit_vector_cond_expr (rtx dest, 
    if (!mask)
      return 0;
  
@@ -2416,7 +2416,7 @@ testsuite/
        || (TARGET_ALTIVEC && ALTIVEC_VECTOR_MODE (dest_mode)))
      {
        rtx cond2 = gen_rtx_fmt_ee (NE, VOIDmode, mask, const0_rtx);
-@@ -22044,7 +21988,8 @@ rs6000_handle_altivec_attribute (tree *n
+@@ -22161,7 +22105,8 @@ rs6000_handle_altivec_attribute (tree *n
    mode = TYPE_MODE (type);
  
    /* Check for invalid AltiVec type qualifiers.  */
@@ -2426,7 +2426,7 @@ testsuite/
      {
      if (TARGET_64BIT)
        error ("use of %<long%> in AltiVec types is invalid for 64-bit code");
-@@ -22082,6 +22027,7 @@ rs6000_handle_altivec_attribute (tree *n
+@@ -22199,6 +22144,7 @@ rs6000_handle_altivec_attribute (tree *n
  	  break;
  	case SFmode: result = V4SF_type_node; break;
  	case DFmode: result = V2DF_type_node; break;
@@ -2434,7 +2434,7 @@ testsuite/
  	  /* If the user says 'vector int bool', we may be handed the 'bool'
  	     attribute _before_ the 'vector' attribute, and so select the
  	     proper type in the 'b' case below.  */
-@@ -22093,6 +22039,7 @@ rs6000_handle_altivec_attribute (tree *n
+@@ -22210,6 +22156,7 @@ rs6000_handle_altivec_attribute (tree *n
      case 'b':
        switch (mode)
  	{
@@ -2442,7 +2442,7 @@ testsuite/
  	case SImode: case V4SImode: result = bool_V4SI_type_node; break;
  	case HImode: case V8HImode: result = bool_V8HI_type_node; break;
  	case QImode: case V16QImode: result = bool_V16QI_type_node;
-@@ -22137,6 +22084,7 @@ rs6000_mangle_type (const_tree type)
+@@ -22254,6 +22201,7 @@ rs6000_mangle_type (const_tree type)
    if (type == bool_short_type_node) return "U6__bools";
    if (type == pixel_type_node) return "u7__pixel";
    if (type == bool_int_type_node) return "U6__booli";
@@ -2450,7 +2450,7 @@ testsuite/
  
    /* Mangle IBM extended float long double as `g' (__float128) on
       powerpc*-linux where long-double-64 previously was the default.  */
-@@ -23647,6 +23595,8 @@ int
+@@ -23781,6 +23729,8 @@ int
  rs6000_register_move_cost (enum machine_mode mode,
  			   enum reg_class from, enum reg_class to)
  {
@@ -2459,7 +2459,7 @@ testsuite/
    /*  Moves from/to GENERAL_REGS.  */
    if (reg_classes_intersect_p (to, GENERAL_REGS)
        || reg_classes_intersect_p (from, GENERAL_REGS))
-@@ -23655,39 +23605,47 @@ rs6000_register_move_cost (enum machine_
+@@ -23789,39 +23739,47 @@ rs6000_register_move_cost (enum machine_
  	from = to;
  
        if (from == FLOAT_REGS || from == ALTIVEC_REGS || from == VSX_REGS)
@@ -2519,7 +2519,7 @@ testsuite/
  }
  
  /* A C expressions returning the cost of moving data of MODE from a register to
-@@ -23697,14 +23655,23 @@ int
+@@ -23831,14 +23789,23 @@ int
  rs6000_memory_move_cost (enum machine_mode mode, enum reg_class rclass,
  			 int in ATTRIBUTE_UNUSED)
  {
@@ -2547,7 +2547,7 @@ testsuite/
  }
  
  /* Returns a code for a target-specific builtin that implements
-@@ -24424,4 +24391,24 @@ rs6000_final_prescan_insn (rtx insn, rtx
+@@ -24546,4 +24513,24 @@ rs6000_final_prescan_insn (rtx insn, rtx
      }
  }
  



From remi at fedoraproject.org  Tue Aug 18 15:36:30 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 18 Aug 2009 15:36:30 +0000 (UTC)
Subject: rpms/glpi/devel glpi-0.72.patch, NONE, 1.1 .cvsignore, 1.15,
	1.16 glpi-config_path.php, 1.2, 1.3 glpi.spec, 1.25,
	1.26 sources, 1.17, 1.18 glpi-check.patch, 1.1, NONE
Message-ID: <20090818153630.D794511C00D7@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11653

Modified Files:
	.cvsignore glpi-config_path.php glpi.spec sources 
Added Files:
	glpi-0.72.patch 
Removed Files:
	glpi-check.patch 
Log Message:
update to 0.72.1 + svn patches

glpi-0.72.patch:
 ajax/comments.php                 |   14 +++----
 ajax/updateTrackingDeviceType.php |    5 +-
 config/define.php                 |    1 
 front/report.dynamic.php          |    3 -
 inc/central.function.php          |    8 +---
 inc/common.function.php           |    6 +--
 inc/contract.function.php         |    6 +--
 inc/display.function.php          |    4 +-
 inc/dropdown.function.php         |    9 +++--
 inc/ocsng.function.php            |    3 +
 inc/profile.class.php             |   11 +++---
 inc/rulesengine.class.php         |    8 ++--
 inc/rulesengine.function.php      |    9 ++---
 inc/search.constant.php           |    7 ++-
 inc/search.function.php           |   42 +++++++++++++++--------
 inc/tracking.function.php         |   67 ++++++++++++++++++++++++++++++++++----
 lib/vcardclass/classes-vcard.php  |    3 +
 17 files changed, 142 insertions(+), 64 deletions(-)

--- NEW FILE glpi-0.72.patch ---
diff -ru glpi/ajax/comments.php svn8743/ajax/comments.php
--- glpi/ajax/comments.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/ajax/comments.php	2009-08-18 16:59:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: comments.php 7936 2009-02-02 20:53:50Z moyo $
+ * @version $Id: comments.php 8708 2009-08-14 09:34:02Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -43,13 +43,13 @@
 
 checkLoginUser();
 
+if (isset($_POST["table"]) && isset($_POST["value"])) {	
 
-// Security
-if (! TableExists($_POST['table']) ){
-	exit();
-}
-
-if (isset($_POST["table"])&&isset($_POST["value"])){	
+   // Security
+   if (! TableExists($_POST['table']) ){
+      exit();
+   }
+   
 	switch ($_POST["table"]){
 		case "glpi_users":
 			if ($_POST['value']==0){
diff -ru glpi/ajax/updateTrackingDeviceType.php svn8743/ajax/updateTrackingDeviceType.php
--- glpi/ajax/updateTrackingDeviceType.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/ajax/updateTrackingDeviceType.php	2009-08-18 16:59:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: updateTrackingDeviceType.php 7762 2009-01-06 18:30:32Z moyo $
+ * @version $Id: updateTrackingDeviceType.php 8709 2009-08-14 10:27:25Z moyo $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -35,8 +35,9 @@
 
 
 	define('GLPI_ROOT','..');
-
+   
 	$AJAX_INCLUDE=1;
+   $NEEDED_ITEMS=array("tracking");
 	include (GLPI_ROOT."/inc/includes.php");
 	header("Content-Type: text/html; charset=UTF-8");
 	header_nocache();
diff -ru glpi/config/define.php svn8743/config/define.php
--- glpi/config/define.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/config/define.php	2009-08-18 16:59:43.000000000 +0200
@@ -307,6 +307,7 @@
 			ENTERPRISE_TYPE => "front/enterprise.php",
 			CONTRACT_TYPE => "front/contract.php",
 			DOCUMENT_TYPE => "front/document.php",
+         OCSNG_TYPE => "front/setup.ocsng.php",
 		);
 
 	define("AUTH_DB_GLPI",1);
diff -ru glpi/front/report.dynamic.php svn8743/front/report.dynamic.php
--- glpi/front/report.dynamic.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/front/report.dynamic.php	2009-08-18 16:59:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: report.dynamic.php 7762 2009-01-06 18:30:32Z moyo $
+ * @version $Id: report.dynamic.php 8674 2009-08-10 10:57:50Z moyo $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -118,7 +118,6 @@
 				} 
 			}
 
-
 			manageGetValuesInSearch($_GET["item_type"]);
 
 			showList($_GET["item_type"],$_GET);
diff -ru glpi/inc/central.function.php svn8743/inc/central.function.php
--- glpi/inc/central.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/central.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: central.function.php 8026 2009-02-28 16:50:46Z moyo $
+ * @version $Id: central.function.php 8652 2009-08-07 12:11:52Z moyo $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -87,11 +87,7 @@
 	if ($_SESSION["glpijobs_at_login"]&&$showticket){
 		echo "<br>";
 
-		echo "<div class='center'><strong>";
-		echo $LANG['central'][10];
-		echo "</strong></div>";
-
-		showTrackingList($_SERVER['PHP_SELF'],0,"","","new");
+		showNewJobList();
 	}
 
 }
diff -ru glpi/inc/common.function.php svn8743/inc/common.function.php
--- glpi/inc/common.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/common.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: common.function.php 8493 2009-07-23 16:22:58Z moyo $
+ * @version $Id: common.function.php 8706 2009-08-14 08:36:44Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -954,8 +954,8 @@
  *@return clean value
  **/
 function cleanPostForTextArea($value){
-	$order   = array('\r\n', '\n', "\\'", '\"');
-	$replace = array("\n",   "\n", "'",   '"');
+   $order   = array('\r\n', '\n', "\\'", '\"', '\\\\');
+   $replace = array("\n",   "\n", "'",   '"',  "\\");
 	//echo rawurldecode($_POST["data"]);
 	return str_replace($order,$replace,$value);
 
diff -ru glpi/inc/contract.function.php svn8743/inc/contract.function.php
--- glpi/inc/contract.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/contract.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: contract.function.php 8465 2009-07-18 07:20:05Z remi $
+ * @version $Id: contract.function.php 8671 2009-08-09 17:21:21Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -668,9 +668,9 @@
 			echo "<tr class='tab_bg_1'><td class='center' colspan='5'>";
 			echo "<div class='software-instal'><input type='hidden' name='entID' value='$ID'>";
 			if ($ent->fields["recursive"]) {
-				dropdownContracts("conID",getEntitySons($ent->fields["FK_entities"]),$used);
+				dropdownContracts("conID",getEntitySons($ent->fields["FK_entities"]),$used,true);
 			} else {
-				dropdownContracts("conID",$ent->fields['FK_entities'],$used);
+				dropdownContracts("conID",$ent->fields['FK_entities'],$used,true);
 			}
 			echo "</div></td><td class='center'>";
 			echo "<input type='submit' name='addcontract' value=\"".$LANG['buttons'][8]."\" class='submit'>";
diff -ru glpi/inc/display.function.php svn8743/inc/display.function.php
--- glpi/inc/display.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/display.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: display.function.php 8398 2009-06-25 16:44:10Z moyo $
+ * @version $Id: display.function.php 8672 2009-08-10 10:49:02Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -1883,7 +1883,7 @@
 		$split=explode("&amp;",$parameters);
 		for ($i=0;$i<count($split);$i++){
 			$pos=strpos($split[$i],'=');
-			echo "<input type='hidden' name=\"".substr($split[$i],0,$pos)."\" value=\"".substr($split[$i],$pos+1)."\">";
+			echo "<input type='hidden' name=\"".substr($split[$i],0,$pos)."\" value=\"".urldecode(substr($split[$i],$pos+1))."\">";
 		}
 		echo "<select name='display_type'>";
 		echo "<option value='".PDF_OUTPUT_LANDSCAPE."'>".$LANG['buttons'][27]." ".$LANG['common'][68]."</option>";
diff -ru glpi/inc/dropdown.function.php svn8743/inc/dropdown.function.php
--- glpi/inc/dropdown.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/dropdown.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: dropdown.function.php 8541 2009-07-27 16:31:36Z moyo $
+ * @version $Id: dropdown.function.php 8671 2009-08-09 17:21:21Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -2620,11 +2620,12 @@
  * @param $name string : HTML select name
  * @param $entity_restrict Restrict to a defined entity
  * @param $alreadyused : already used contract, do not add to dropdown
+ * @param $nochecklimit : true to disable limit for nomber of device (for supplier)
  *
  *@return Nothing (display)
  *
  **/
-function dropdownContracts($name,$entity_restrict=-1,$alreadyused=array()){
+function dropdownContracts($name,$entity_restrict=-1,$alreadyused=array(),$nochecklimit=false){
 
 	global $DB;
 
@@ -2650,7 +2651,9 @@
 	$prev=-1;
 	while ($data=$DB->fetch_array($result)){
 
-		if ($data["device_countmax"]==0||$data["device_countmax"]>countElementsInTable("glpi_contract_device","FK_contract = '".$data['ID']."'" )){
+      if ($nochecklimit
+         || $data["device_countmax"]==0
+         ||$data["device_countmax"]>countElementsInTable("glpi_contract_device","FK_contract = '".$data['ID']."'" )){
 			if ($data["FK_entities"]!=$prev) {
 				if ($prev>=0) {
 					echo "</optgroup>";
diff -ru glpi/inc/ocsng.function.php svn8743/inc/ocsng.function.php
--- glpi/inc/ocsng.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/ocsng.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -2,7 +2,7 @@
 
 
 /*
- * @version $Id: ocsng.function.php 8576 2009-07-30 15:57:22Z moyo $
+ * @version $Id: ocsng.function.php 8702 2009-08-14 07:11:48Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -3003,6 +3003,7 @@
 					//Software dictionnary
 					$rulecollection = new DictionnarySoftwareCollection;
 					$res_rule = $rulecollection->processAllRules(array("name"=>$name,"manufacturer"=>$manufacturer,"old_version"=>$version), array (), array());
+               $res_rule = addslashes_deep($res_rule);
 					
 					if (isset($res_rule["name"]))
 						$modified_name = $res_rule["name"];
diff -ru glpi/inc/profile.class.php svn8743/inc/profile.class.php
--- glpi/inc/profile.class.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/profile.class.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: profile.class.php 8583 2009-07-31 09:58:52Z moyo $
+ * @version $Id: profile.class.php 8743 2009-08-18 14:57:08Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -192,9 +192,12 @@
 	function currentUserHaveMoreRightThan($IDs=array()){
 		global $DB;
 
-		if (count($IDs)==0) {
-			return false;
-		}
+      if (count($IDs)==0) {
+         // Check all profiles (means more right than all possible profiles) 
+         return (countElementsInTable($this->table)
+              == countElementsInTable($this->table, $this->getUnderProfileRetrictRequest('')));
+      }
+
 		$under_profiles=array();
 		$query="SELECT * FROM glpi_profiles ".$this->getUnderProfileRetrictRequest("WHERE");
 		$result=$DB->query($query);
diff -ru glpi/inc/rulesengine.class.php svn8743/inc/rulesengine.class.php
--- glpi/inc/rulesengine.class.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/rulesengine.class.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: rulesengine.class.php 8307 2009-05-17 17:32:16Z jmd $
+ * @version $Id: rulesengine.class.php 8704 2009-08-14 07:44:59Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -2381,7 +2381,8 @@
 		$into_old="";
 		foreach($this->cache_params["input_value"] as $param => $value){
 			$into_old.="`".$value."`, ";
-			$old_values.="\"".$input[$param]."\", ";
+         // Input are slashes protected...
+         $old_values.="'".$input[$param]."', ";
 		}
 		
 		$into_new="";
@@ -2391,7 +2392,8 @@
 				$output[$param]="";
 			}
 			$into_new.=", `".$value."`";
-			$new_values.=" ,\"".$output[$param]."\"";
+         // Output are not slashes protected...
+         $new_values.=" ,'".addslashes($output[$param])."'";
 		}
 		$sql="INSERT INTO `".$this->cache_table."` (".$into_old."`rule_id`".$into_new.") VALUES (".$old_values.$output["_ruleid"].$new_values.")";
 		$DB->query($sql);
diff -ru glpi/inc/rulesengine.function.php svn8743/inc/rulesengine.function.php
--- glpi/inc/rulesengine.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/rulesengine.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: rulesengine.function.php 8026 2009-02-28 16:50:46Z moyo $
+ * @version $Id: rulesengine.function.php 8704 2009-08-14 07:44:59Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -49,9 +49,10 @@
 		return true;
 	}
 
-	// Trim for remove keyboard errors
-	$field=trim($field);
-	$pattern=trim($pattern);
+   // Trim for remove keyboard errors
+   // Input are slashed protected, not output.
+   $field=stripslashes(trim($field));
+   $pattern=trim($pattern);
 	if ($condition != REGEX_MATCH && $condition != REGEX_NOT_MATCH){
 		//Perform comparison with fields in lower case
 		$field = strtolower($field);
diff -ru glpi/inc/search.constant.php svn8743/inc/search.constant.php
--- glpi/inc/search.constant.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/search.constant.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: search.constant.php 8577 2009-07-30 15:58:07Z moyo $
+ * @version $Id: search.constant.php 8692 2009-08-13 12:12:51Z moyo $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -2078,8 +2078,9 @@
 $SEARCH_OPTION[SOFTWARE_TYPE][72]['linkfield']='';
 $SEARCH_OPTION[SOFTWARE_TYPE][72]['name']=$LANG['tracking'][29]." - ".$LANG['software'][19];
 $SEARCH_OPTION[SOFTWARE_TYPE][72]['forcegroupby']=true;
-$SEARCH_OPTION[SOFTWARE_TYPE][72]['usehaving']=true;
-$SEARCH_OPTION[SOFTWARE_TYPE][72]['datatype']='number';
+$SEARCH_OPTION[SOFTWARE_TYPE][72]['nosearch']=true;
+//$SEARCH_OPTION[SOFTWARE_TYPE][72]['usehaving']=true;
+//$SEARCH_OPTION[SOFTWARE_TYPE][72]['datatype']='number';
 
 
 $SEARCH_OPTION[SOFTWARE_TYPE]['versions']=$LANG['software'][5];
diff -ru glpi/inc/search.function.php svn8743/inc/search.function.php
--- glpi/inc/search.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/search.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: search.function.php 8628 2009-08-04 19:04:13Z remi $
+ * @version $Id: search.function.php 8700 2009-08-14 06:33:54Z remi $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -301,9 +301,11 @@
 				else $first_group=false;
 				echo "<optgroup label=\"$val\">";
 			}else {
-				echo "<option value=\"".$key."\"";
-				if(is_array($field)&&isset($field[$i]) && $key == $field[$i]) echo "selected";
-				echo ">". utf8_substr($val["name"],0,32) ."</option>\n";
+            if (!isset($val["nosearch"]) || !$val["nosearch"]){
+               echo "<option value=\"".$key."\"";
+               if(is_array($field)&&isset($field[$i]) && $key == $field[$i]) echo "selected";
+               echo ">". utf8_substr($val["name"],0,32) ."</option>\n";
+            }
 			}
 		}
 		if (!$first_group)
@@ -676,6 +678,7 @@
 	$WHERE="";
 	$HAVING="";
 
+
 	/// TODO do also having here / simplify view - all cases : duplicates
 	// Add search conditions
 	// If there is search items
@@ -754,7 +757,8 @@
 					$first2=true;
 					foreach ($toview as $key2 => $val2){
 						// Add Where clause if not to be done in HAVING CLAUSE
-						if (!isset($SEARCH_OPTION[$type][$val2]["usehaving"])){
+                  if (!isset($SEARCH_OPTION[$type][$val2]["usehaving"]) &&
+                      !isset($SEARCH_OPTION[$type][$val2]["nosearch"])){
 							$tmplink=$LINK;
 							if ($first2) {
 								$tmplink=" ";
@@ -808,7 +812,7 @@
 					foreach ($SEARCH_OPTION[$type] as $key2 => $val2)
 						if (is_array($val2)){
 							// Add Where clause if not to be done ine HAVING CLAUSE
-						if (!isset($val2["usehaving"])){
+                     if (!isset($val2["usehaving"]) && !isset($val2["nosearch"])){
 								$tmplink=$LINK;
 								if ($first2) {
 									$tmplink=" ";
@@ -1185,8 +1189,12 @@
 
 			// Display column Headers for toview items
 			foreach ($toview as $key => $val){
-				$linkto="$target?sort=".$val."&amp;order=".($order=="ASC"?"DESC":"ASC")."&amp;start=$start".$globallinkto;
-				echo displaySearchHeaderItem($output_type,$SEARCH_OPTION[$type][$val]["name"],$header_num,$linkto,$sort==$val,$order);
+            if (isset($SEARCH_OPTION[$type][$val]["nosearch"]) && $SEARCH_OPTION[$type][$val]["nosearch"]){
+              echo displaySearchHeaderItem($output_type,$SEARCH_OPTION[$type][$val]["name"],$header_num);	
+            } else {
+				  $linkto="$target?sort=".$val."&amp;order=".($order=="ASC"?"DESC":"ASC")."&amp;start=$start".$globallinkto;
+				  echo displaySearchHeaderItem($output_type,$SEARCH_OPTION[$type][$val]["name"],$header_num,$linkto,$sort==$val,$order);
+            }
 			}
 
 			// Display columns Headers for meta items
@@ -1788,7 +1796,8 @@
 			return " FLOOR( SUM($table$addtable.$field) * COUNT(DISTINCT $table$addtable.ID) / COUNT($table$addtable.ID) ) AS ".$NAME."_".$num.", MIN($table$addtable.$field) AS ".$NAME."_".$num."_2, ";
 		break;
 		case "glpi_inst_software.count" :
-			return " COUNT(DISTINCT glpi_inst_software$addtable.ID) AS ".$NAME."_".$num.", ";
+         return "";
+//			return " COUNT(DISTINCT glpi_inst_software$addtable.ID) AS ".$NAME."_".$num.", ";
 		break;
 		case "glpi_device_hdd.specif_default" :
 			return " SUM(DEVICE_".HDD_DEVICE.".specificity) / COUNT( DEVICE_".HDD_DEVICE.".ID) * COUNT( DISTINCT DEVICE_".HDD_DEVICE.".ID) AS ".$NAME."_".$num.", ";
@@ -2332,6 +2341,10 @@
 	$linkfield=$SEARCH_OPTION[$type][$ID]["linkfield"];
 
 	switch ($table.'.'.$field){
+		case "glpi_inst_software.count" :
+            
+            return countInstallationsForSoftware($data['ID']);
+
 		case "glpi_users.name" :		
 			// USER search case
 			if (!empty($linkfield)){
@@ -3024,8 +3037,9 @@
 			}
 		break;
 		case "glpi_inst_software":
-			$out=addLeftJoin($type,$rt,$already_link_tables,"glpi_softwareversions",$linkfield,$device_type,$meta,$meta_type);
-		return $out." LEFT JOIN $new_table $AS ON (glpi_softwareversions$addmetanum.ID = $nt.vID) ";
+//			$out=addLeftJoin($type,$rt,$already_link_tables,"glpi_softwareversions",$linkfield,$device_type,$meta,$meta_type);
+//		return $out." LEFT JOIN $new_table $AS ON (glpi_softwareversions$addmetanum.ID = $nt.vID) ";
+      return "";
 		break;
 		case "glpi_computer_device":
 			if ($device_type==0){
@@ -3086,7 +3100,7 @@
 			}
 
 			if (!empty($linkfield)){
-				return " LEFT JOIN $new_table $AS ON ($rt.$linkfield = $nt.ID) ";
+            return " LEFT JOIN $new_table $AS ON ($rt.$linkfield = $nt.ID) ";
 			} else {
 				return "";
 			}
@@ -3176,7 +3190,7 @@
 				case COMPUTER_TYPE :
 					array_push($already_link_tables2,$LINK_ID_TABLE[COMPUTER_TYPE]);
 					return " $LINK glpi_connect_wire AS conn_mon_$to_type ON (conn_mon_$to_type.end1=glpi_printers.ID  AND conn_mon_$to_type.type='".PRINTER_TYPE."') ".
-						" $LINK glpi_computers ON (conn_mon_$to_type.end2=glpi_computers.ID) ";
+						" $LINK glpi_computers ON (conn_mon_$to_type.end2=glpi_computers.ID ".getEntitiesRestrictRequest("AND",'glpi_computers').") ";
 
 					break;
 			}
@@ -3207,7 +3221,7 @@
 					array_push($already_link_tables2,$LINK_ID_TABLE[COMPUTER_TYPE]);
 					return " $LINK glpi_softwareversions as glpi_softwareversions_$to_type ON ( glpi_softwareversions_$to_type.sID = glpi_software.ID ) ".
 						" $LINK glpi_inst_software as inst_$to_type ON (inst_$to_type.vID = glpi_softwareversions_$to_type.ID) ".
-						" $LINK glpi_computers ON (inst_$to_type.cID = glpi_computers.ID)";
+						" $LINK glpi_computers ON (inst_$to_type.cID = glpi_computers.ID ".getEntitiesRestrictRequest("AND",'glpi_computers').")";
 
 					break;
 			}
Seulement dans svn8743/inc: search.function.php.orig
diff -ru glpi/inc/tracking.function.php svn8743/inc/tracking.function.php
--- glpi/inc/tracking.function.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/inc/tracking.function.php	2009-08-18 16:59:45.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /*
- * @version $Id: tracking.function.php 8640 2009-08-05 22:41:27Z moyo $
+ * @version $Id: tracking.function.php 8652 2009-08-07 12:11:52Z moyo $
  -------------------------------------------------------------------------
  GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2009 by the INDEPNET Development Team.
@@ -139,6 +139,10 @@
 	// $show_sort if 
 	$header_num=1;
 
+   // Force nolink on ajax :
+   if (strpos($target,'ajax')>0){
+      $nolink=true;
+   }
 
 	foreach (getTrackingSortOptions() as $key => $val){
 		$issort=0;
@@ -335,8 +339,8 @@
 
 	$query = "SELECT ".getCommonSelectForTrackingSearch()." 
 			FROM glpi_tracking ".getCommonLeftJoinForTrackingSearch()." 
-			WHERE (computer = '$item' and device_type= '$item_type') 
-				ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
+			WHERE (computer = '$item' and device_type= '$item_type') ".getEntitiesRestrictRequest("AND","glpi_tracking").
+				" ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
 
 	$result = $DB->query($query);
 
@@ -402,8 +406,8 @@
 
 	$query = "SELECT ".getCommonSelectForTrackingSearch()." 
 			FROM glpi_tracking ".getCommonLeftJoinForTrackingSearch()." 
-			WHERE (assign_ent = '$entID') 
-				ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
+			WHERE (assign_ent = '$entID') ".getEntitiesRestrictRequest("AND","glpi_tracking").
+				" ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
 
 	$result = $DB->query($query);
 
@@ -453,8 +457,8 @@
 
 	$query = "SELECT ".getCommonSelectForTrackingSearch()." 
 			FROM glpi_tracking ".getCommonLeftJoinForTrackingSearch()." 
-			WHERE (author = '$userID') 
-				ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
+			WHERE (author = '$userID') ".getEntitiesRestrictRequest("AND","glpi_tracking").
+				" ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
 
 	$result = $DB->query($query);
 
@@ -491,6 +495,55 @@
 	}
 }
 
+function showNewJobList() {
+	// $item is required
+	//affiche toutes les vielles intervention pour un $item donn? 
+
+	global $DB,$CFG_GLPI, $LANG;
+
+	if (!haveRight("show_all_ticket","1")) return false;
+
+	$where = "";	
+
+	$query = "SELECT ".getCommonSelectForTrackingSearch()." 
+			FROM glpi_tracking ".getCommonLeftJoinForTrackingSearch()." 
+			WHERE (status = 'new') ".getEntitiesRestrictRequest("AND","glpi_tracking").
+				" ORDER BY glpi_tracking.date_mod DESC LIMIT ".intval($_SESSION['glpilist_limit']);
+
+	$result = $DB->query($query);
+
+	$number = $DB->numrows($result);
+
+	if ($number > 0)
+	{
+		initNavigateListItems(TRACKING_TYPE);
+
+		echo "<div class='center'><table class='tab_cadre_fixe'>";
+		echo "<tr><th colspan='10'>".$LANG['central'][10]." ($number): &nbsp;";
+		echo "<a href='".$CFG_GLPI["root_doc"]."/front/tracking.php?reset=reset_before&amp;status=new'>".$LANG['buttons'][40]."</a>";
+		echo "</th></tr>";
+
+		
+		commonTrackingListHeader(HTML_OUTPUT,$_SERVER['PHP_SELF'],"","","",true);
+
+		while ($data=$DB->fetch_assoc($result)){
+			addToNavigateListItems(TRACKING_TYPE,$data["ID"]);
+			showJobShort($data, 0);
+		}
+		echo "</table></div>";
+	} 
+	else
+	{
+		echo "<div class='center'>";
+		echo "<table class='tab_cadre_fixe'>";
+		echo "<tr><th>".$LANG['joblist'][8]."</th></tr>";
+
+		echo "</table>";
+		echo "</div><br>";
+	}
+}
+
+
 function showJobShort($data, $followups,$output_type=HTML_OUTPUT,$row_num=0) {
 	// Prints a job in short form
 	// Should be called in a <table>-segment
Seulement dans glpi/install/mysql: glpi-0.72.1-empty.sql
diff -ru glpi/lib/vcardclass/classes-vcard.php svn8743/lib/vcardclass/classes-vcard.php
--- glpi/lib/vcardclass/classes-vcard.php	2009-08-06 23:10:00.000000000 +0200
+++ svn8743/lib/vcardclass/classes-vcard.php	2009-08-18 16:59:43.000000000 +0200
@@ -26,6 +26,8 @@
     return str_replace(";","\;",$string);
 }
 
+// Function provided in PHP >= 5.3.0
+if (!function_exists('quoted_printable_encode')) {
 // taken from PHP documentation comments
 function quoted_printable_encode($input, $line_max = 76) {
     $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
@@ -59,6 +61,7 @@
     }
     return trim($output);
 }
+}
 
 class vCard {
     var $properties;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	2 Jun 2009 15:23:56 -0000	1.15
+++ .cvsignore	18 Aug 2009 15:36:29 -0000	1.16
@@ -1 +1 @@
-glpi-0.71.6.tar.gz
+glpi-0.72.1.tar.gz


Index: glpi-config_path.php
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi-config_path.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- glpi-config_path.php	12 Jul 2008 07:21:33 -0000	1.2
+++ glpi-config_path.php	18 Aug 2009 15:36:30 -0000	1.3
@@ -11,6 +11,8 @@ define("GLPI_SESSION_DIR",    "/var/lib/
 define("GLPI_PLUGIN_DOC_DIR", "/var/lib/glpi/files/_plugins");
 define("GLPI_LOCK_DIR",       "/var/lib/glpi/files/_lock/");
 
-define("GLPI_CACHE_LITE_DIR", "Cache");
 define("GLPI_LOG_DIR",        "/var/log/glpi");
+
+define("GLPI_CACHE_LITE_DIR", "Cache");
+define("GLPI_PHPMAILER_DIR",  "PHPMailer");
 ?>


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- glpi.spec	25 Jul 2009 00:24:55 -0000	1.25
+++ glpi.spec	18 Aug 2009 15:36:30 -0000	1.26
@@ -5,8 +5,8 @@
 %endif
 
 Name:           glpi
-Version:        0.71.6
-Release:        2%{?dist}
+Version:        0.72.1
+Release:        1.svn8743%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -19,20 +19,16 @@ Source1:        glpi-httpd.conf
 Source2:        glpi-config_path.php
 Source3:        glpi-logrotate
 
-# Avoid SELinux AVC when testing write access to log file.
-# backport from 0.72 (Changeset 7208)
-Patch0:         glpi-check.patch
+# Upstream Patches up to 8743
+# see tools/make_release.sh 
+Patch0:         glpi-0.72.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       php, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring
-%if 0%{?rhel} == 4
-Requires:       php-domxml
-%else
-Requires:       php-xml
+Requires:       php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json
 Requires:       php-pear(Cache_Lite) >= 1.7.4
-%endif
+Requires:       php-PHPMailer
 Requires:       %{_sysconfdir}/logrotate.d
 Requires(postun): /sbin/service
 Requires(post): /sbin/service
@@ -65,27 +61,27 @@ techniciens gr?ce ? une maintenance pl
 %prep
 %setup -q -n glpi
 
-%patch0 -p0
-
-%if 0%{?rhel} == 4
-
-# use bundled lib
-mv lib/cache_lite/LICENSE   LICENSE.cache_lite
-grep -v GLPI_CACHE_LITE_DIR %{SOURCE2} >config/config_path.php 
-
-%else
+%patch0 -p1
 
 # Use system lib
 rm -rf lib/cache_lite
-cp %{SOURCE2} config/config_path.php 
+rm -rf lib/phpmailer
 
-%endif
+cp %{SOURCE2} config/config_path.php 
 
-mv lib/phpmailer/LICENSE    LICENSE.phpmailer
 mv lib/tiny_mce/license.txt LICENSE.tiny_mce
-dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce
-iconv -f ISO-8859-15 -t UTF-8 LISEZMOI.txt >a && mv a LISEZMOI.txt
-iconv -f ISO-8859-15 -t UTF-8 README.txt   >a && mv a README.txt
+mv lib/extjs/license.txt    LICENSE.extjs
+rm lib/extjs/{CHANGES.html,INCLUDE_ORDER.txt}
+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
+
+dos2unix -o LICENSE.tiny_mce
+for fic in LISEZMOI.txt README.txt
+do
+   iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic
+done
 
 cat >cron <<EOF
 # GLPI core
@@ -103,9 +99,9 @@ rm -rf %{buildroot} 
 
 # ===== application =====
 mkdir -p %{buildroot}/%{_datadir}/%{name}
-cp -a *.php *.js %{buildroot}/%{_datadir}/%{name}/
+cp -a COPYING.txt *.php *.js %{buildroot}/%{_datadir}/%{name}/
 
-for i in ajax css front help inc install lib locales pics plugins scripts
+for i in ajax css front inc install lib locales pics plugins scripts
 do   cp -ar $i %{buildroot}/%{_datadir}/%{name}/$i
 done
 
@@ -164,10 +160,6 @@ rm -rf %{buildroot} 
 %post
 %if %{useselinux}
 (
-# Remove Selinux policy (from previous packaging)
-semodule -s targeted -r %{name} &>/dev/null
-# Remove old httpd_sys_script_rw_t
-semanage fcontext -d "%{_localstatedir}/log/glpi(/.*)?"
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/glpi(/.*)?" 
 semanage fcontext -a -s system_u -t httpd_log_t           -r s0 "%{_localstatedir}/log/glpi(/.*)?"
@@ -198,7 +190,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc *.txt LICENSE.*
+%doc *.txt LICENSE.* README.*
 
 %attr(750,apache,root) %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
@@ -213,11 +205,12 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.php
 %{_datadir}/%{name}/*.js
+# License file required by installation process
+%{_datadir}/%{name}/COPYING.txt
 %{_datadir}/%{name}/ajax
 %{_datadir}/%{name}/config
 %{_datadir}/%{name}/css
 %{_datadir}/%{name}/front
-%{_datadir}/%{name}/help
 %{_datadir}/%{name}/inc
 %{_datadir}/%{name}/install
 %{_datadir}/%{name}/lib
@@ -229,6 +222,11 @@ fi
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	2 Jun 2009 15:23:56 -0000	1.17
+++ sources	18 Aug 2009 15:36:30 -0000	1.18
@@ -1 +1 @@
-d7137027c2a9f79cadd193bbe6ebab92  glpi-0.71.6.tar.gz
+8508b0cb6c459a3728c53f3cb04dd4e3  glpi-0.72.1.tar.gz


--- glpi-check.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Aug 18 15:37:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 18 Aug 2009 15:37:52 +0000 (UTC)
Subject: rpms/csound/devel csound-fixpython.patch, NONE, 1.1 csound.spec,
	1.30, 1.31
Message-ID: <20090818153752.D720811C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12006

Modified Files:
	csound.spec 
Added Files:
	csound-fixpython.patch 
Log Message:
- Further python build fixes

csound-fixpython.patch:
 install.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE csound-fixpython.patch ---
--- Csound5.10.1/install.py.orig	2009-08-18 09:58:32.000000000 +0100
+++ Csound5.10.1/install.py	2009-08-18 09:59:39.000000000 +0100
@@ -269,9 +269,6 @@
             err = installLink(i, concatPath([libDir, 'libcsound.so']))
         elif i[:15] == 'libcsound64.so.':
             err = installLink(i, concatPath([libDir, 'libcsound64.so']))
-        elif i == 'libcsnd.so':
-            err = installLink(concatPath([libDir, i]),
-                              concatPath([pythonDir2, '_csnd.so']))
         elif i == 'lib_CsoundVST.so':
             err = installLink(concatPath([libDir, i]),
                               concatPath([pythonDir2, '_CsoundVST.so']))
@@ -287,7 +284,7 @@
 #err = installFile('opcodes.dir', pluginDir)
 installErrors = installErrors or err
 pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
-for i in ['libcsound.so', 'libcsound64.so']:
+for i in ['libcsound.so', 'libcsound64.so', 'libcsnd.so']:
     if i in pluginList:
         pluginList.remove(i)
 for i in pluginList:
@@ -304,6 +301,7 @@
 
 print ' === Installing language interfaces ==='
 wrapperList = [['csnd\\.py', '0', pythonDir],
+               ['_csnd\\.so', '1', pythonDir],
                ['loris\\.py', '0', pythonDir],
                ['CsoundVST\\.py', '0', pythonDir],
                ['scoregen\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- csound.spec	24 Jul 2009 19:44:17 -0000	1.30
+++ csound.spec	18 Aug 2009 15:37:52 -0000	1.31
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       10%{?dist}
+Release:       11%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -23,7 +23,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-devel
 BuildRequires: python python-devel
 BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel pulseaudio-libs-devel
-BuildRequires: fluidsynth-devel liblo-devel dssi-devel
+BuildRequires: fluidsynth-devel liblo-devel dssi-devel lua-devel
 BuildRequires: fltk-devel fltk-fluid
 BuildRequires: java-devel >= 1.4.0
 BuildRequires: jpackage-utils >= 1.5
@@ -49,6 +49,7 @@ Patch6: csound-5.10.1-fix-conflicts.patc
 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
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -182,6 +183,7 @@ Canonical Reference Manual for Csound.
 
 %prep
 %setup -q -n Csound5.10.1
+%patch0 -p1 -b .fixpython
 %patch1 -p1 -b .no-usr-local
 %patch2 -p1 -b .default-opcodedir
 %patch3 -p1 -b .rtalsa
@@ -218,7 +220,10 @@ scons dynamicCsoundLibrary=1 \
       useFluidsynth=1 \
       generatePdf=0 \
       buildCsound5GUI=1 \
+      pythonVersion=2.6 \
       buildPythonOpcodes=1 \
+      buildPythonWrapper=1 \
+      buildLuaWrapper=1 \
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
@@ -311,7 +316,7 @@ fi
 %{_libdir}/%{name}/plugins/libbarmodel.so
 %{_libdir}/%{name}/plugins/libcompress.so
 %{_libdir}/%{name}/plugins/libcontrol.so
-%{_libdir}/%{name}/plugins/libcsnd.so
+%{_libdir}/%{name}/plugins/libchua.so
 %{_libdir}/%{name}/plugins/libcs_date.so
 %{_libdir}/%{name}/plugins/libcs_pan2.so
 %{_libdir}/%{name}/plugins/libcs_pvs_ops.so
@@ -358,10 +363,10 @@ fi
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
-%{_libdir}/libcsnd.so
 
 %files python
 %defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
 %{_libdir}/python%{pyver}/site-packages/*
 
 %files java
@@ -421,6 +426,9 @@ fi
 %doc manual/examples
 
 %changelog
+* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
+- 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 rajeeshknambiar at fedoraproject.org  Tue Aug 18 15:46:31 2009
From: rajeeshknambiar at fedoraproject.org (Rajeesh K Nambiar)
Date: Tue, 18 Aug 2009 15:46:31 +0000 (UTC)
Subject: rpms/smc-fonts/devel .cvsignore, 1.3, 1.4 smc-fonts.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <20090818154631.7FA3511C00D7@cvs1.fedora.phx.redhat.com>

Author: rajeeshknambiar

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13892

Modified Files:
	.cvsignore smc-fonts.spec sources 
Log Message:
Update to 04.2 with bugfix for RHBZ#484536


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jul 2008 09:14:48 -0000	1.3
+++ .cvsignore	18 Aug 2009 15:46:31 -0000	1.4
@@ -1,2 +1 @@
-malayalam-fonts-04.zip
-malayalam-fonts-04.1.zip
+malayalam-fonts-04.2.zip


Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- smc-fonts.spec	27 Jul 2009 04:29:39 -0000	1.8
+++ smc-fonts.spec	18 Aug 2009 15:46:31 -0000	1.9
@@ -7,8 +7,8 @@ The SMC Fonts package contains fonts for
 traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
-Version:	04.1
-Release:	7%{?dist}
+Version:	04.2
+Release:	1%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
@@ -48,7 +48,7 @@ Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
 Provides: %{fontname}-fonts-meera = %{version}-%{release}
-Obsoletes: %{name}-meera < 04.1-4
+Obsoletes: %{name}-meera < 04.2-1
 %description -n %{fontname}-meera-fonts
 The Meera font package contains fonts for the display of
 traditional Malayalam Scripts.
@@ -152,6 +152,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Tue Aug 18 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.2-1
+- bugfix 484536 for Meera
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 04.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jul 2008 09:14:48 -0000	1.3
+++ sources	18 Aug 2009 15:46:31 -0000	1.4
@@ -1 +1 @@
-492cb9ec6bf69d775e987c1ca06b4003  malayalam-fonts-04.1.zip
+82e50d2bfed3111612e6b36070356a58  malayalam-fonts-04.2.zip



From remi at fedoraproject.org  Tue Aug 18 15:46:51 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 18 Aug 2009 15:46:51 +0000 (UTC)
Subject: rpms/glpi-data-injection/devel .cvsignore, 1.5,
	1.6 glpi-data-injection.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090818154651.CC7A411C00D7@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14026

Modified Files:
	.cvsignore glpi-data-injection.spec sources 
Log Message:
update to 1.6.0 for glpi 0.72.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Apr 2009 16:20:16 -0000	1.5
+++ .cvsignore	18 Aug 2009 15:46:51 -0000	1.6
@@ -1 +1 @@
-glpi-data_injection-1.5.1.tar.gz
+glpi-data_injection-1.6.0.tar.gz


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/glpi-data-injection.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- glpi-data-injection.spec	25 Jul 2009 00:25:10 -0000	1.6
+++ glpi-data-injection.spec	18 Aug 2009 15:46:51 -0000	1.7
@@ -1,8 +1,8 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des donn?es dans GLPI
 
@@ -15,7 +15,7 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
+Requires:       glpi >= 0.72
 
 %description
 Plugin for importing data into GLPI
@@ -39,7 +39,7 @@ Elle pourra servir, par exemple, ? :
 %prep
 %setup -q -c
 
-mv %{pluginname}/test test
+#mv %{pluginname}/test test
 mv %{pluginname}/docs docs
 
 # dos2unix to avoid rpmlint warnings
@@ -89,6 +89,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.6.0-1
+- update to 1.6.0 finale for glpi 0.72
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Apr 2009 16:20:17 -0000	1.5
+++ sources	18 Aug 2009 15:46:51 -0000	1.6
@@ -1 +1 @@
-6965acc29786c38a260b19e2fbc9176e  glpi-data_injection-1.5.1.tar.gz
+f71b05faba6314d04da04c6ae92269b6  glpi-data_injection-1.6.0.tar.gz



From ltinkl at fedoraproject.org  Tue Aug 18 15:47:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 15:47:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec,1.183,1.184
Message-ID: <20090818154719.AA84A11C00D7@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-serv14065/F-10

Modified Files:
	kdebase-workspace.spec 
Log Message:
move akonadi stuff to subpackage



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- kdebase-workspace.spec	5 Aug 2009 00:22:23 -0000	1.183
+++ kdebase-workspace.spec	18 Aug 2009 15:47:19 -0000	1.184
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -205,6 +205,13 @@ Requires: PyKDE4 >= %{version}
 %description python-applet
 %{summary}.
 
+%package akonadi
+Summary: Akonadi integration for KDE Workspace
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: akonadi
+%description akonadi
+%{summary}.
 
 %prep
 
@@ -441,6 +448,9 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
+#?akonadi
+%exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -513,8 +523,15 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_python
 %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
+%files akonadi
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plasma_engine_akonadi.so
+%{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- move akonadi stuff to subpackage
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From ltinkl at fedoraproject.org  Tue Aug 18 15:47:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 15:47:20 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.264,1.265
Message-ID: <20090818154720.463B411C0416@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14065/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
move akonadi stuff to subpackage



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- kdebase-workspace.spec	14 Aug 2009 20:25:31 -0000	1.264
+++ kdebase-workspace.spec	18 Aug 2009 15:47:20 -0000	1.265
@@ -36,7 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < 4.3.0-100 
+Obsoletes: PolicyKit-kde < %{version}-100 
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
@@ -91,7 +91,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 # 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 
+Requires: oxygen-icon-theme >= 4.2.2 
 
 # pkg-splits, upgrade path
 Requires: kdm = %{version}-%{release}
@@ -205,6 +205,13 @@ Requires: PyKDE4 >= %{version}
 %description python-applet
 %{summary}.
 
+%package akonadi
+Summary: Akonadi integration for KDE Workspace
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: akonadi
+%description akonadi
+%{summary}.
 
 %prep
 
@@ -441,6 +448,9 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
+#?akonadi
+%exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -513,10 +523,14 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_python
 %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
+%files akonadi
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plasma_engine_akonadi.so
+%{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
-* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-6
-- Requires: oxygen-icon-theme >= 4.3.0
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- move akonadi stuff to subpackage
 
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin



From nphilipp at fedoraproject.org  Tue Aug 18 15:47:20 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 15:47:20 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.77,1.78
Message-ID: <20090818154720.1C36911C034A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14153

Modified Files:
	xsane.spec 
Log Message:
explain patches



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- xsane.spec	5 Aug 2009 12:41:43 -0000	1.77
+++ xsane.spec	18 Aug 2009 15:47:19 -0000	1.78
@@ -8,8 +8,12 @@ Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
+# distro-specific: use "xdg-open" instead of "netscape" to launch help browser
 Patch0: xsane-0.995-xdg-open.patch
+# submitted to upstream (Oliver Rauch) via email, 2009-08-18
 Patch1: xsane-0.995-close-fds.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=504344
+# distro-specific, upstream won't accept it: "don't show license dialog"
 Patch2: xsane-0.996-no-eula.patch
 License: GPLv2+
 URL: http://www.xsane.org/
@@ -130,6 +134,9 @@ fi
 %{_datadir}/sane/xsane
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com>
+- explain patches
+
 * Wed Aug 05 2009 Nils Philippsen <nils at redhat.com> 0.997-3
 - Merge Review (#226658):
   - replace %%desktop_vendor macro with "fedora"



From ltinkl at fedoraproject.org  Tue Aug 18 15:47:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 15:47:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.233,1.234
Message-ID: <20090818154719.F03FC11C0262@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-serv14065/F-11

Modified Files:
	kdebase-workspace.spec 
Log Message:
move akonadi stuff to subpackage



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- kdebase-workspace.spec	5 Aug 2009 00:22:25 -0000	1.233
+++ kdebase-workspace.spec	18 Aug 2009 15:47:19 -0000	1.234
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -205,6 +205,13 @@ Requires: PyKDE4 >= %{version}
 %description python-applet
 %{summary}.
 
+%package akonadi
+Summary: Akonadi integration for KDE Workspace
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: akonadi
+%description akonadi
+%{summary}.
 
 %prep
 
@@ -441,6 +448,9 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
 %exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
+#?akonadi
+%exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -513,8 +523,15 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_python
 %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
+%files akonadi
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plasma_engine_akonadi.so
+%{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- move akonadi stuff to subpackage
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From nphilipp at fedoraproject.org  Tue Aug 18 15:51:25 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 18 Aug 2009 15:51:25 +0000 (UTC)
Subject: rpms/rss-glx/devel rss-glx.spec,1.34,1.35
Message-ID: <20090818155125.C385411C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15268

Modified Files:
	rss-glx.spec 
Log Message:
explain autofoo patch



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- rss-glx.spec	17 Aug 2009 15:47:30 -0000	1.34
+++ rss-glx.spec	18 Aug 2009 15:51:25 -0000	1.35
@@ -58,6 +58,7 @@ Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.9.0-0.9.0.p.diff
 # https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
 Patch0: rss-glx-0.9.0.p-optflags.patch
+# don't run autoreconf when building
 Patch1: rss-glx-0.9.0-autofoo.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
@@ -317,6 +318,9 @@ fi
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Aug 18 2009 Nils Philippsen <nils at redhat.com>
+- explain autofoo patch
+
 * Mon Aug 17 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-2
 - don't rebuild autofoo files
 



From cebbert at fedoraproject.org  Tue Aug 18 15:51:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 18 Aug 2009 15:51:44 +0000 (UTC)
Subject: rpms/kernel/F-10
	iwl3945-add-debugging-for-wrong-command-queue.patch, 
	NONE, 1.1 iwl3945-fix-rfkill-sw-and-hw-mishmash.patch, NONE,
	1.1 iwl3945-release-resources-before-shutting-down.patch, NONE,
	1.1 linux-2.6-iwlwifi_-fix-TX-queue-race.patch, NONE,
	1.1 kernel.spec, 1.1399, 1.1400
Message-ID: <20090818155144.B1FC711C00D7@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15363

Modified Files:
	kernel.spec 
Added Files:
	iwl3945-add-debugging-for-wrong-command-queue.patch 
	iwl3945-fix-rfkill-sw-and-hw-mishmash.patch 
	iwl3945-release-resources-before-shutting-down.patch 
	linux-2.6-iwlwifi_-fix-TX-queue-race.patch 
Log Message:
Intel wireless fixes from Fedora 11:
   iwl3945-release-resources-before-shutting-down.patch
   iwl3945-add-debugging-for-wrong-command-queue.patch
   iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
   linux-2.6-iwlwifi_-fix-TX-queue-race.patch

iwl3945-add-debugging-for-wrong-command-queue.patch:
 iwl3945-base.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE iwl3945-add-debugging-for-wrong-command-queue.patch ---
commit 638d0eb9197d1e285451f6594184fcfc9c2a5d44
Author: Chatre, Reinette <reinette.chatre at intel.com>
Date:   Mon Jan 19 15:30:24 2009 -0800

    iwl3945: add debugging for wrong command queue

    We encountered a problem related to this BUG and need to obtain more
    debugging information. See bug report at
    http://marc.info/?l=linux-wireless&m=123147215829854&w=2

    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8cb0fa2..5011a79 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3349,7 +3349,14 @@ static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv,
 	int cmd_index;
 	struct iwl3945_cmd *cmd;
 
-	BUG_ON(txq_id != IWL_CMD_QUEUE_NUM);
+	if (WARN(txq_id != IWL_CMD_QUEUE_NUM,
+		 "wrong command queue %d, sequence 0x%X readp=%d writep=%d\n",
+		  txq_id, sequence,
+		  priv->txq[IWL_CMD_QUEUE_NUM].q.read_ptr,
+		  priv->txq[IWL_CMD_QUEUE_NUM].q.write_ptr)) {
+		/* Not in F11: iwl_print_hex_dump(priv, IWL_DL_INFO , rxb, 32); */
+		return;
+	}
 
 	cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge);
 	cmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index];
-- 
1.6.2.5

_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


iwl3945-fix-rfkill-sw-and-hw-mishmash.patch:
 iwl3945-base.c |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

--- NEW FILE iwl3945-fix-rfkill-sw-and-hw-mishmash.patch ---
Disable SW switch regardless of HW switch state (we can only enable
radio when both SW and HW rfkill switches are off). Report to rfkill
subsystem SW switch state before HW switch state to move rfkill subsystem
to SOFT_BLOCK rather than HARD_BLOCK, otherwise in some conditions we
would not be able to turn radio back on.
---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 5011a79..6065921 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -8216,7 +8216,8 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
 	case RFKILL_STATE_UNBLOCKED:
 		if (iwl3945_is_rfkill_hw(priv)) {
 			err = -EBUSY;
-			goto out_unlock;
+			/* pass error to rfkill core to make it state HARD
+			 * BLOCKED and disable software kill switch */
 		}
 		iwl3945_radio_kill_sw(priv, 0);
 		break;
@@ -8227,9 +8228,8 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
 		IWL_WARNING("we received unexpected RFKILL state %d\n", state);
 		break;
 	}
-out_unlock:
-	mutex_unlock(&priv->mutex);
 
+	mutex_unlock(&priv->mutex);
 	return err;
 }
 
@@ -8291,15 +8291,12 @@ void iwl3945_rfkill_set_hw_state(struct iwl3945_priv *priv)
 	if (!priv->rfkill)
 		return;
 
-	if (iwl3945_is_rfkill_hw(priv)) {
+	if (iwl3945_is_rfkill_sw(priv))
+		rfkill_force_state(priv->rfkill, RFKILL_STATE_SOFT_BLOCKED);
+	else if (iwl3945_is_rfkill_hw(priv))
 		rfkill_force_state(priv->rfkill, RFKILL_STATE_HARD_BLOCKED);
-		return;
-	}
-
-	if (!iwl3945_is_rfkill_sw(priv))
-		rfkill_force_state(priv->rfkill, RFKILL_STATE_UNBLOCKED);
 	else
-		rfkill_force_state(priv->rfkill, RFKILL_STATE_SOFT_BLOCKED);
+		rfkill_force_state(priv->rfkill, RFKILL_STATE_UNBLOCKED);
 }
 #endif
 
-- 
1.6.2.5

_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


iwl3945-release-resources-before-shutting-down.patch:
 iwl3945-base.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE iwl3945-release-resources-before-shutting-down.patch ---
commit d552bfb65241a35d48e44ddb0d27e0454f579ab4
Author: Kolekar, Abhijeet <abhijeet.kolekar at intel.com>
Date:   Fri Dec 19 10:37:41 2008 +0800

    iwl3945: release resources before shutting down

    Release resource before shutting down and notify upper stack.

    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
    Signed-off-by: Zhu Yi <yi.zhu at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 22e7e99..8cb0fa2 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -8096,7 +8096,12 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 
 	set_bit(STATUS_EXIT_PENDING, &priv->status);
 
-	iwl3945_down(priv);
+	if (priv->mac80211_registered) {
+		ieee80211_unregister_hw(priv->hw);
+		priv->mac80211_registered = 0;
+	} else {
+		iwl3945_down(priv);
+	}
 
 	/* make sure we flush any pending irq or
 	 * tasklet for the driver
@@ -8121,9 +8126,6 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 	iwl3945_unset_hw_setting(priv);
 	iwl3945_clear_stations_table(priv);
 
-	if (priv->mac80211_registered)
-		ieee80211_unregister_hw(priv->hw);
-
 	/*netif_stop_queue(dev); */
 	flush_workqueue(priv->workqueue);
 
-- 
1.6.2.5

_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


linux-2.6-iwlwifi_-fix-TX-queue-race.patch:
 iwl-tx.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-iwlwifi_-fix-TX-queue-race.patch ---
Backport of the following upstream commit...

commit 3995bd9332a51b626237d6671cfeb7235e6c1305
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Fri Jul 24 11:13:14 2009 -0700

    iwlwifi: fix TX queue race
    
    I had a problem on 4965 hardware (well, probably other hardware too,
    but others don't survive my stress testing right now, unfortunately)
    where the driver was sending invalid commands to the device, but no
    such thing could be seen from the driver's point of view. I could
    reproduce this fairly easily by sending multiple TCP streams with
    iperf on different TIDs, though sometimes a single iperf stream was
    sufficient. It even happened with a single core, but I have forced
    preemption turned on.
    
    The culprit was a queue overrun, where we advanced the queue's write
    pointer over the read pointer. After careful analysis I've come to
    the conclusion that the cause is a race condition between iwlwifi
    and mac80211.
    
    mac80211, of course, checks whether the queue is stopped, before
    transmitting a frame. This effectively looks like this:
    
            lock(queues)
            if (stopped(queue)) {
                    unlock(queues)
                    return busy;
    	}
            unlock(queues)
            ...             <-- this place will be important
    			    there is some more code here
            drv_tx(frame)
    
    The driver, on the other hand, can stop and start queues, which does
    
            lock(queues)
            mark_running/stopped(queue)
            unlock(queues)
    
    	[if marked running: wake up tasklet to send pending frames]
    
    Now, however, once the driver starts the queue, mac80211 can see that
    and end up at the marked place above, at which point for some reason the
    driver seems to stop the queue again (I don't understand that) and then
    we end up transmitting while the queue is actually full.
    
    Now, this shouldn't actually matter much, but for some reason I've seen
    it happen multiple times in a row and the queue actually overflows, at
    which point the queue bites itself in the tail and things go completely
    wrong.
    
    This patch fixes this by just dropping the packet should this have
    happened, and making the lock in iwlwifi cover everything so iwlwifi
    can't race against itself (dropping the lock there might make it more
    likely, but it did seem to happen without that too).
    
    Since we can't hold the lock across drv_tx() above, I see no way to fix
    this in mac80211, but I also don't understand why I haven't seen this
    before -- maybe I just never stress tested it this badly.
    
    With this patch, the device has survived many minutes of simultanously
    sending two iperf streams on different TIDs with combined throughput
    of about 60 Mbps.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c.orig	2009-03-23 19:12:14.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c	2009-08-12 11:56:04.000000000 -0400
@@ -876,8 +876,6 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 		goto drop_unlock;
 	}
 
-	spin_unlock_irqrestore(&priv->lock, flags);
-
 	hdr_len = ieee80211_hdrlen(fc);
 
 	/* Find (or create) index into station table for destination station */
@@ -885,7 +883,7 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 	if (sta_id == IWL_INVALID_STATION) {
 		IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
 			       hdr->addr1);
-		goto drop;
+		goto drop_unlock;
 	}
 
 	IWL_DEBUG_TX("station Id %d\n", sta_id);
@@ -904,14 +902,17 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 		/* aggregation is on for this <sta,tid> */
 		if (info->flags & IEEE80211_TX_CTL_AMPDU)
 			txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
-		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 	}
 
 	txq = &priv->txq[txq_id];
 	q = &txq->q;
 	txq->swq_id = swq_id;
 
-	spin_lock_irqsave(&priv->lock, flags);
+	if (unlikely(iwl_queue_space(q) < q->high_mark))
+		goto drop_unlock;
+
+	if (ieee80211_is_data_qos(fc))
+		priv->stations[sta_id].tid[tid].tfds_in_queue++;
 
 	/* Set up first empty TFD within this queue's circular TFD buffer */
 	tfd = &txq->tfds[q->write_ptr];
@@ -1043,7 +1044,6 @@ int iwl_tx_skb(struct iwl_priv *priv, st
 
 drop_unlock:
 	spin_unlock_irqrestore(&priv->lock, flags);
-drop:
 	return -1;
 }
 EXPORT_SYMBOL(iwl_tx_skb);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -p -r1.1399 -r1.1400
--- kernel.spec	17 Aug 2009 13:57:27 -0000	1.1399
+++ kernel.spec	18 Aug 2009 15:51:44 -0000	1.1400
@@ -664,6 +664,10 @@ Patch684: linux-2.6-iwlagn-fix-hw-rfkill
 Patch685: linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
 Patch686: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
 Patch687: mac80211-don-t-drop-nullfunc-frames-during-software.patch
+Patch690: iwl3945-release-resources-before-shutting-down.patch
+Patch691: iwl3945-add-debugging-for-wrong-command-queue.patch
+Patch692: iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
+Patch693: linux-2.6-iwlwifi_-fix-TX-queue-race.patch
 
 Patch1000: linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
 
@@ -1333,6 +1337,13 @@ ApplyPatch linux-2.6-mac80211-fix-beacon
 
 ApplyPatch mac80211-don-t-drop-nullfunc-frames-during-software.patch
 
+ApplyPatch iwl3945-release-resources-before-shutting-down.patch
+ApplyPatch iwl3945-add-debugging-for-wrong-command-queue.patch
+ApplyPatch iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
+
+# iwlwifi: fix TX queue race
+ApplyPatch linux-2.6-iwlwifi_-fix-TX-queue-race.patch
+
 # neigh: fix state transition INCOMPLETE->FAILED via Netlink request
 ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
 
@@ -2004,6 +2015,13 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Aug 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-99
+- Intel wireless fixes from Fedora 11:
+   iwl3945-release-resources-before-shutting-down.patch
+   iwl3945-add-debugging-for-wrong-command-queue.patch
+   iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
+   linux-2.6-iwlwifi_-fix-TX-queue-race.patch
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-99
 - Fix flub in prior lirc patch update that resulted in no lirc
   drivers getting built



From lmacken at fedoraproject.org  Tue Aug 18 15:54:22 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 18 Aug 2009 15:54:22 +0000 (UTC)
Subject: rpms/python-repoze-who-plugins-sa/EL-5
	python-repoze-who-plugins-sa.spec, 1.2, 1.3
Message-ID: <20090818155422.A7BE011C00D7@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-who-plugins-sa/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15926

Modified Files:
	python-repoze-who-plugins-sa.spec 
Log Message:
Require new python-sqlalchemy0.5 package


Index: python-repoze-who-plugins-sa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-who-plugins-sa/EL-5/python-repoze-who-plugins-sa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-repoze-who-plugins-sa.spec	20 Jul 2009 20:24:38 -0000	1.2
+++ python-repoze-who-plugins-sa.spec	18 Aug 2009 15:54:22 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           python-repoze-who-plugins-sa
 Version:        1.0
-Release:        0.3.%{_rcver}%{?dist}
+Release:        0.4.%{_rcver}%{?dist}
 Summary:        The repoze.who SQLAlchemy plugin
 
 Group:          Development/Languages
@@ -15,10 +15,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 
 BuildRequires:  python-devel python-setuptools-devel python-repoze-who
-BuildRequires:  python-elixir python-sqlalchemy python-coverage python-nose
+BuildRequires:  python-elixir python-sqlalchemy0.5 python-coverage python-nose
 
 Requires:       python-repoze-who
-Requires:       python-sqlalchemy
+Requires:       python-sqlalchemy0.5
 
 %description
 This plugin provides one repoze.who authenticator which works with SQLAlchemy
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.3.rc1
+- Require new python-sqlalchemy0.5 package
+
 * Mon Jul 20 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.3.rc1
 - Remove the test suite, since it conflicts with other packages (#512759)
 



From ltinkl at fedoraproject.org  Tue Aug 18 15:58:31 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 15:58:31 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec,1.184,1.185
Message-ID: <20090818155831.F30A511C00D7@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-serv16816/F-10

Modified Files:
	kdebase-workspace.spec 
Log Message:
sync the recent changes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- kdebase-workspace.spec	18 Aug 2009 15:47:19 -0000	1.184
+++ kdebase-workspace.spec	18 Aug 2009 15:58:31 -0000	1.185
@@ -36,7 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < %{version}-100 
+Obsoletes: PolicyKit-kde < 4.3.0-100
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
@@ -91,7 +91,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme >= 4.2.2 
+Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
 Requires: kdm = %{version}-%{release}



From ltinkl at fedoraproject.org  Tue Aug 18 15:58:32 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 15:58:32 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.234,1.235
Message-ID: <20090818155832.1BEB611C0262@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-serv16816/F-11

Modified Files:
	kdebase-workspace.spec 
Log Message:
sync the recent changes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- kdebase-workspace.spec	18 Aug 2009 15:47:19 -0000	1.234
+++ kdebase-workspace.spec	18 Aug 2009 15:58:31 -0000	1.235
@@ -36,7 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < %{version}-100 
+Obsoletes: PolicyKit-kde < 4.3.0-100
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
@@ -91,7 +91,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme >= 4.2.2 
+Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
 Requires: kdm = %{version}-%{release}



From ltinkl at fedoraproject.org  Tue Aug 18 15:58:32 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 15:58:32 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.265,1.266
Message-ID: <20090818155832.3F4F111C034A@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16816/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
sync the recent changes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- kdebase-workspace.spec	18 Aug 2009 15:47:20 -0000	1.265
+++ kdebase-workspace.spec	18 Aug 2009 15:58:32 -0000	1.266
@@ -36,7 +36,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < %{version}-100 
+Obsoletes: PolicyKit-kde < 4.3.0-100
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
 # frontend implementation of the desktop they are running under
@@ -91,7 +91,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme >= 4.2.2 
+Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
 Requires: kdm = %{version}-%{release}



From remi at fedoraproject.org  Tue Aug 18 16:00:26 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 18 Aug 2009 16:00:26 +0000 (UTC)
Subject: rpms/glpi-mass-ocs-import/devel .cvsignore, 1.5,
	1.6 glpi-mass-ocs-import.spec, 1.7, 1.8 sources, 1.5,
	1.6 glpi-mass-ocs-import.conf, 1.1, NONE
Message-ID: <20090818160026.BC4C311C04D1@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17484

Modified Files:
	.cvsignore glpi-mass-ocs-import.spec sources 
Removed Files:
	glpi-mass-ocs-import.conf 
Log Message:
update to 1.3.0 for glpi 0.72.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Apr 2009 15:18:45 -0000	1.5
+++ .cvsignore	18 Aug 2009 16:00:26 -0000	1.6
@@ -1 +1 @@
-glpi-mass_ocs_import-1.2.2.tar.gz
+glpi-massocsimport-1.3.0.tar.gz


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/glpi-mass-ocs-import.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- glpi-mass-ocs-import.spec	25 Jul 2009 00:25:27 -0000	1.7
+++ glpi-mass-ocs-import.spec	18 Aug 2009 16:00:26 -0000	1.8
@@ -1,9 +1,9 @@
-%define pluginname   mass_ocs_import
-%define lockname     mass_ocs_import.lock
+%define pluginname   massocsimport
+%define lockname     massocsimport.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
 
@@ -12,18 +12,13 @@ License:        GPLv2+
 URL:            http://www.glpi-project.org/
 
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
-Source1:        %{name}.conf
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71.5
-%if 0%{?rhel} == 4
-Requires:       php
-%else
+Requires:       glpi >= 0.72
 Requires:       php-cli
-%endif
 Requires:       %{_sysconfdir}/cron.d
 
 # This plugin is going to be renamed (for 0.72)
@@ -55,11 +50,15 @@ for fic in docs/*; do
 done
 
 cat >README-RPM-POSTINTALL.txt <<EOF
-
 Remember to Install this extension in the Application.
-
 Cron is provided, but disabled. 
+EOF
 
+cat >%{name}.httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
+    Order Allow,Deny
+    Deny from all
+</Directory>
 EOF
 
 cat >cron <<EOF
@@ -91,7 +90,7 @@ touch %{buildroot}%{_localstatedir}/lib/
 # ===== apache =====
 rm %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/.htaccess
 mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-install --mode 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install --mode 644 %{name}.httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 
 %post
@@ -111,7 +110,7 @@ fi
 %check
 # Check the name of the lock file in sources
 grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/ocsng_fullsync.sh || exit 1
-grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/config/plugin_mass_ocs_import.config.php || exit 1
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php || exit 1
 
 
 %clean
@@ -129,6 +128,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3.0-1
+- update to 1.3.0 finale for glpi 0.72
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Apr 2009 15:18:45 -0000	1.5
+++ sources	18 Aug 2009 16:00:26 -0000	1.6
@@ -1 +1 @@
-abe1e280079bdfcfe3ca0e567f241ba7  glpi-mass_ocs_import-1.2.2.tar.gz
+15f00aec2062ce5ca652abe89530a7cd  glpi-massocsimport-1.3.0.tar.gz


--- glpi-mass-ocs-import.conf DELETED ---



From kyle at fedoraproject.org  Tue Aug 18 16:01:35 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 18 Aug 2009 16:01:35 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.86,1.87
Message-ID: <20090818160135.E83B411C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17208

Modified Files:
	comps-f12.xml.in 
Log Message:
add perf subpackage of kernel.
it just contains docs + a wrapper script, the actual logic is in
the kernel packages. this package is only a few kilobytes.



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- comps-f12.xml.in	17 Aug 2009 20:17:10 -0000	1.86
+++ comps-f12.xml.in	18 Aug 2009 16:01:35 -0000	1.87
@@ -800,6 +800,7 @@
            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">perf</packagereq>
       <packagereq type="mandatory">livecd-tools</packagereq>
       <packagereq type="mandatory">mash</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>



From pknirsch at fedoraproject.org  Tue Aug 18 16:06:45 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Tue, 18 Aug 2009 16:06:45 +0000 (UTC)
Subject: rpms/tuned/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tuned.spec, 
	1.6, 1.7
Message-ID: <20090818160645.E3F9F11C00D7@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19611

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
- Update to latest bugfix version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 15:43:24 -0000	1.6
+++ .cvsignore	18 Aug 2009 16:06:45 -0000	1.7
@@ -1 +1 @@
-tuned-0.2.1.tar.bz2
+tuned-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 15:43:24 -0000	1.6
+++ sources	18 Aug 2009 16:06:45 -0000	1.7
@@ -1 +1 @@
-af4b7edaf24e0e9e0d7d44cf52c551c2  tuned-0.2.1.tar.bz2
+ce5a3616ad3abb6fa3a65bed0d394711  tuned-0.2.3.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tuned.spec	4 Aug 2009 15:43:24 -0000	1.6
+++ tuned.spec	18 Aug 2009 16:06:45 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.1
+Version: 0.2.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -78,6 +78,7 @@ fi
 %{_sbindir}/tuned-adm
 %{_sysconfdir}/tune-profiles
 %{_datadir}/tuned
+%{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %attr(0755,root,root) %{_initddir}/ktune
@@ -96,6 +97,14 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Phil Knirsch <pknirsch at redhat.com> 0.2.3-1
+- Updated documentation
+- Few more fixes for tuned-adm
+
+* Fri Aug 14 2009 Phil Knirsch <pknirsch at redhat.com>  0.2.2-1
+- Updates to the ktune scripts
+- Added support for start/stop of the ktune scripts and ktune initscript
+
 * Tue Aug 04 2009 Phil Knirsch <pknirsch at redhat.com> - 0.2.1-1
 - Added first set of profiles
 - Added tuned-adm tool for profile switching



From ltinkl at fedoraproject.org  Tue Aug 18 16:07:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 16:07:14 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec,1.185,1.186
Message-ID: <20090818160714.7749C11C00D7@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-serv19564/F-10

Modified Files:
	kdebase-workspace.spec 
Log Message:
.... aaaand bump the release version everywhere as well



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- kdebase-workspace.spec	18 Aug 2009 15:58:31 -0000	1.185
+++ kdebase-workspace.spec	18 Aug 2009 16:07:14 -0000	1.186
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops



From ltinkl at fedoraproject.org  Tue Aug 18 16:07:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 16:07:14 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.266,1.267
Message-ID: <20090818160714.D076B11C00D7@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19564/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
.... aaaand bump the release version everywhere as well



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- kdebase-workspace.spec	18 Aug 2009 15:58:32 -0000	1.266
+++ kdebase-workspace.spec	18 Aug 2009 16:07:14 -0000	1.267
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops



From ltinkl at fedoraproject.org  Tue Aug 18 16:07:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 18 Aug 2009 16:07:14 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.235,1.236
Message-ID: <20090818160714.A584D11C0262@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-serv19564/F-11

Modified Files:
	kdebase-workspace.spec 
Log Message:
.... aaaand bump the release version everywhere as well



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- kdebase-workspace.spec	18 Aug 2009 15:58:31 -0000	1.235
+++ kdebase-workspace.spec	18 Aug 2009 16:07:14 -0000	1.236
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops



From remi at fedoraproject.org  Tue Aug 18 16:15:38 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 18 Aug 2009 16:15:38 +0000 (UTC)
Subject: rpms/glpi-pdf/devel .cvsignore, 1.3, 1.4 glpi-pdf.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090818161538.43CDF11C00D7@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi-pdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21539

Modified Files:
	.cvsignore glpi-pdf.spec sources 
Log Message:
update to 0.6.1 for glpi 0.72.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jul 2008 08:03:39 -0000	1.3
+++ .cvsignore	18 Aug 2009 16:15:37 -0000	1.4
@@ -1 +1 @@
-glpi-pdf-0.5.tar.gz
+glpi-pdf-0.6.1.tar.gz


Index: glpi-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/devel/glpi-pdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glpi-pdf.spec	25 Jul 2009 00:25:48 -0000	1.4
+++ glpi-pdf.spec	18 Aug 2009 16:15:38 -0000	1.5
@@ -1,10 +1,10 @@
 %define pluginname   pdf
 
 Name:           glpi-pdf
-Version:        0.5
-Release:        3%{?dist}
-Summary:        GLPI Plugin to print PDF of computers
-Summary(fr):    Extension GLPI pour cr?er des PDF des ordinateurs
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        GLPI Plugin to print PDF of equipment
+Summary(fr):    Extension GLPI pour cr?er des PDF des mat?riels
 
 Group:          Applications/Internet
 License:        GPLv2+
@@ -15,16 +15,16 @@ Source0:        http://www.glpi-project.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71
+Requires:       glpi >= 0.72
 
 %description
-This GLPI plugin enables you to print with format pdf all the mitres of a
-card computer or a software of the inventory. 
+This GLPI plugin enables you to print, in pdf format, the information 
+sheet of an equipment or a software of the inventory. 
 
 
 %description -l fr
 Cette extension GLPI vous permet de cr?er un PDF contenant toutes les
-informations sur un ordinateur ou un logiciel de l'inventaire.
+informations sur un ?quipement ou un logiciel de l'inventaire.
 
 
 %prep
@@ -36,6 +36,8 @@ for doc in docs/* ; do
     sed -i -e 's/\r//' $doc
 done
 
+cd %{pluginname}
+
 
 %build
 # empty build
@@ -46,18 +48,33 @@ rm -rf %{buildroot} 
 mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
 cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
 
+for i in %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/locales/*
+do
+  lang=$(basename $i)
+  echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
+done | tee %{name}.lang
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docs/*
-%{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
+%{_datadir}/glpi/plugins/%{pluginname}/*.php
+%{_datadir}/glpi/plugins/%{pluginname}/fonts
+%{_datadir}/glpi/plugins/%{pluginname}/front
+%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/pics
 
 
 %changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.6.1-1
+- update to 0.6.1 finale for glpi 0.72
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -78,5 +95,5 @@ rm -rf %{buildroot} 
 - new SVN snapshot
 
 * Mon Aug 13 2007 Remi Collet <RPMS at FamilleCollet.com> - 0.2-0.20070813
-- Initial RPM	
+- Initial RPM
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-pdf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jul 2008 08:03:39 -0000	1.3
+++ sources	18 Aug 2009 16:15:38 -0000	1.4
@@ -1 +1 @@
-6b10df91a8499f7e67d7a33e3b9085fb  glpi-pdf-0.5.tar.gz
+42972203c0d50689cc246e023a7ff597  glpi-pdf-0.6.1.tar.gz



From epienbro at fedoraproject.org  Tue Aug 18 16:49:42 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 18 Aug 2009 16:49:42 +0000 (UTC)
Subject: rpms/mingw32-pango/devel mingw32-pango.spec, 1.7,
	1.8 pango-87f9fe.patch, 1.1, NONE pango-b4f105.patch, 1.1,
	NONE pango-f48680.patch, 1.1, NONE
Message-ID: <20090818164942.102CB11C00D7@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28668

Modified Files:
	mingw32-pango.spec 
Removed Files:
	pango-87f9fe.patch pango-b4f105.patch pango-f48680.patch 
Log Message:
- Update to 1.25.4
- Drop upstreamed patches



Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-pango.spec	14 Aug 2009 09:48:46 -0000	1.7
+++ mingw32-pango.spec	18 Aug 2009 16:49:41 -0000	1.8
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.25.3
+Version:        1.25.4
 Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
@@ -27,13 +27,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules
 Source1:        pango.modules
 
-# Upstream commit b4f10583ea84d02ed0278fc2cb2846aaf075864d
-Patch0:         pango-b4f105.patch
-# Upstream commit 87f9fedcd27baa62043cb59b03dfd5ce0a9214db
-Patch1:         pango-87f9fe.patch
-# Upstream commit f4868084a55e3abd0b45ee2fb7b477e038a81d1a 
-Patch2:         pango-f48680.patch
-
 Patch1000:      pango_enable_static_build.patch
 
 BuildArch:      noarch
@@ -82,9 +75,6 @@ Static version of the MinGW Windows Pang
 
 %prep
 %setup -q -n pango-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch1000
 
 # Regenerate the configure script
@@ -206,7 +196,11 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
-* Fri Aug 14 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 1.25.3-1
+* Tue Aug 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.4-1
+- Update to 1.25.4
+- Drop upstreamed patches
+
+* Fri Aug 14 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.3-1
 - Update to 1.25.3
 - Drop upstreamed patch
 - Added some (already upstreamed) patches to get pango compiled on mingw32


--- pango-87f9fe.patch DELETED ---


--- pango-b4f105.patch DELETED ---


--- pango-f48680.patch DELETED ---



From epienbro at fedoraproject.org  Tue Aug 18 16:50:04 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 18 Aug 2009 16:50:04 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2.spec,1.10,1.11
Message-ID: <20090818165004.C752811C04BE@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28831

Modified Files:
	mingw32-gtk2.spec 
Log Message:
Update to 2.17.8



Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-gtk2.spec	12 Aug 2009 23:54:45 -0000	1.10
+++ mingw32-gtk2.spec	18 Aug 2009 16:50:04 -0000	1.11
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.17.7
+Version:        2.17.8
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -328,6 +328,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Tue Aug 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.8-1
+- Update to 2.17.8
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.7-1
 - Update to 2.17.7
 - Automatically generate debuginfo subpackage



From twaugh at fedoraproject.org  Tue Aug 18 16:51:18 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 18 Aug 2009 16:51:18 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.501,1.502 pstoraster,1.3,1.4
Message-ID: <20090818165118.4D2B511C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29210

Modified Files:
	cups.spec pstoraster 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
- Use 'exec' to invoke ghostscript in the pstoraster filter.  This
  allows the SIGTERM signal to reach the correct process, as well as
  conserving memory (part of bug #518026).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -p -r1.501 -r1.502
--- cups.spec	11 Aug 2009 08:12:19 -0000	1.501
+++ cups.spec	18 Aug 2009 16:51:18 -0000	1.502
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.15%{?dist}
+Release: 0.%{pre}.16%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -528,6 +528,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
+- Use 'exec' to invoke ghostscript in the pstoraster filter.  This
+  allows the SIGTERM signal to reach the correct process, as well as
+  conserving memory (part of bug #518026).
+
 * Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
 - Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).
 


Index: pstoraster
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/pstoraster,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pstoraster	3 Jan 2008 16:17:10 -0000	1.3
+++ pstoraster	18 Aug 2009 16:51:18 -0000	1.4
@@ -52,7 +52,7 @@ else
 fi
 
 # Now run Ghostscript...
-$bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile
+exec $bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile
 
 #
 # End of "$Id$".



From mkasik at fedoraproject.org  Tue Aug 18 17:06:39 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 18 Aug 2009 17:06:39 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel edit_job.patch, NONE,
	1.1 cups-pk-helper.spec, 1.12, 1.13
Message-ID: <20090818170639.9A8C411C00D7@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv995

Modified Files:
	cups-pk-helper.spec 
Added Files:
	edit_job.patch 
Log Message:
* Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-7
- Fix policies to check when editing a job.


edit_job.patch:
 cups-pk-helper-mechanism.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE edit_job.patch ---
--- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-08-18 18:50:55.000000000 +0200
+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c	2009-08-18 18:51:28.000000000 +0200
@@ -995,7 +995,6 @@ cph_mechanism_job_cancel (CphMechanism  
         switch (job_status) {
                 case CPH_JOB_STATUS_OWNED_BY_USER: {
                         if (!_check_polkit_for_action_v (mechanism, context,
-                                                         "job-not-owned-edit",
                                                          "job-edit",
                                                          NULL))
                                 return FALSE;
@@ -1037,7 +1036,6 @@ cph_mechanism_job_restart (CphMechanism 
         switch (job_status) {
                 case CPH_JOB_STATUS_OWNED_BY_USER: {
                         if (!_check_polkit_for_action_v (mechanism, context,
-                                                         "job-not-owned-edit",
                                                          "job-edit",
                                                          NULL))
                                 return FALSE;
@@ -1080,7 +1078,6 @@ cph_mechanism_job_set_hold_until (CphMec
         switch (job_status) {
                 case CPH_JOB_STATUS_OWNED_BY_USER: {
                         if (!_check_polkit_for_action_v (mechanism, context,
-                                                         "job-not-owned-edit",
                                                          "job-edit",
                                                          NULL))
                                 return FALSE;


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/cups-pk-helper.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cups-pk-helper.spec	18 Aug 2009 14:23:25 -0000	1.12
+++ cups-pk-helper.spec	18 Aug 2009 17:06:39 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -11,6 +11,7 @@ Source0:        http://www.vuntz.net/dow
 Patch0:         polkit-1.patch
 Patch1:         get_devices.patch
 Patch2:         polkit_result.patch
+Patch3:         edit_job.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@ interfaces available under control of Po
 %patch0 -p1 -b .polkit-1
 %patch1 -p1 -b .get-devices
 %patch2 -p1 -b .polkit-result
+%patch3 -p1 -b .edit-job
 
 %build
 # Patch0 modifies configure.ac
@@ -72,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-7
+- Fix policies to check when editing a job.
+
 * Tue Aug 18 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-6
 - Check result of polkit_authority_check_authorization_sync() for NULL.
 



From epienbro at fedoraproject.org  Tue Aug 18 17:06:59 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 18 Aug 2009 17:06:59 +0000 (UTC)
Subject: rpms/mingw32-pango/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090818170659.D1CCF11C00D7@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1121

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Aug 2009 09:58:44 -0000	1.5
+++ .cvsignore	18 Aug 2009 17:06:59 -0000	1.6
@@ -1 +1 @@
-pango-1.25.3.tar.bz2
+pango-1.25.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Aug 2009 09:58:44 -0000	1.5
+++ sources	18 Aug 2009 17:06:59 -0000	1.6
@@ -1 +1 @@
-f0ec03e56931f63c9a759a0321164e84  pango-1.25.3.tar.bz2
+c46848c6a065e0a71764626a1fcf995e  pango-1.25.4.tar.bz2



From dwalsh at fedoraproject.org  Tue Aug 18 17:21:35 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 17:21:35 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.30,
	1.31 setroubleshoot-plugins.spec, 1.35, 1.36 sources, 1.31, 1.32
Message-ID: <20090818172135.EA69711C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4560

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Tue Aug 18 2009  <dwalsh at redhat.com> - 2.1.14-1
  - Change priority on mmap_zero to happen after catchall_booleans



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	11 Aug 2009 23:05:52 -0000	1.30
+++ .cvsignore	18 Aug 2009 17:21:35 -0000	1.31
@@ -20,3 +20,4 @@ setroubleshoot-plugins-2.1.9.tar.gz
 setroubleshoot-plugins-2.1.11.tar.gz
 setroubleshoot-plugins-2.1.12.tar.gz
 setroubleshoot-plugins-2.1.13.tar.gz
+setroubleshoot-plugins-2.1.14.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- setroubleshoot-plugins.spec	11 Aug 2009 23:05:52 -0000	1.35
+++ setroubleshoot-plugins.spec	18 Aug 2009 17:21:35 -0000	1.36
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.13
+Version: 2.1.14
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,8 +52,11 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Aug 18 2009  <dwalsh at redhat.com> - 2.1.14-1
+  - Change priority on mmap_zero to happen after catchall_booleans
+
 * Thu Aug 11 2009  <dwalsh at redhat.com> - 2.1.13-1
-	- Change priority on restorecon and leaks
+  - Change priority on restorecon and leaks
 
 * Thu Jul 30 2009  <dwalsh at redhat.com> - 2.1.12-1
 - Add leaks.py and tftpd_write_content.py plugin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	11 Aug 2009 23:05:52 -0000	1.31
+++ sources	18 Aug 2009 17:21:35 -0000	1.32
@@ -1 +1 @@
-6a88b1991336d3a2a9ce1258e2f2739c  setroubleshoot-plugins-2.1.13.tar.gz
+c2760a7bd732698bcc196ede543c1d89  setroubleshoot-plugins-2.1.14.tar.gz



From epienbro at fedoraproject.org  Tue Aug 18 17:21:58 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue, 18 Aug 2009 17:21:58 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090818172158.F260411C00D7@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4697

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Aug 2009 23:32:45 -0000	1.6
+++ .cvsignore	18 Aug 2009 17:21:57 -0000	1.7
@@ -1 +1 @@
-gtk+-2.17.7.tar.bz2
+gtk+-2.17.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Aug 2009 23:32:45 -0000	1.6
+++ sources	18 Aug 2009 17:21:57 -0000	1.7
@@ -1 +1 @@
-94a359d5929a1306bb3267a02f9707d0  gtk+-2.17.7.tar.bz2
+7e0a37e4cc40f74963886031d0df2182  gtk+-2.17.8.tar.bz2



From wtogami at fedoraproject.org  Tue Aug 18 17:30:02 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 18 Aug 2009 17:30:02 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.31, 1.32 pidgin.spec, 1.92,
	1.93 sources, 1.31, 1.32
Message-ID: <20090818173002.3B1D511C04D1@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6440

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
- CVE-2009-2694
- Voice and Video support via farsight2 (Fedora 11+)
- Numerous other bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	12 Aug 2009 22:10:45 -0000	1.31
+++ .cvsignore	18 Aug 2009 17:30:01 -0000	1.32
@@ -1 +1 @@
-pidgin-2.6.0-devel-20090812.tar.bz2
+pidgin-2.6.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- pidgin.spec	12 Aug 2009 22:10:45 -0000	1.92
+++ pidgin.spec	18 Aug 2009 17:30:01 -0000	1.93
@@ -82,15 +82,14 @@
 
 Name:		pidgin
 Version:	2.6.0
-%define snapshot 20090812
-Release:	0.11.%{snapshot}%{?dist}
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
 # MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
-Source0:	http://downloads.sourceforge.net/pidgin/pidgin-%{version}-devel-%{snapshot}.tar.bz2
+Source0:	http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
 Obsoletes:      gaim < 999:1
 Provides:       gaim = 999:1
 ExcludeArch:    s390 s390x
@@ -367,7 +366,7 @@ Doxygen generated API documentation.
 
 %prep
 echo "FEDORA=%{fedora} RHEL=%{rhel}"
-%setup -q -n pidgin-2.6.0devel
+%setup -q 
 ## Patches 0-99: Fedora specific or upstream wont accept
 %if %{force_sound_aplay}
 %patch0 -p1 -b .aplay
@@ -615,6 +614,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
+- CVE-2009-2694
+- Voice and Video support via farsight2 (Fedora 11+)
+- Numerous other bug fixes
+
 * Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.11.20090812
 - new snapshot at the request of maiku
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Aug 2009 22:10:45 -0000	1.31
+++ sources	18 Aug 2009 17:30:01 -0000	1.32
@@ -1 +1 @@
-592fc737e76149e842e4e33a89e2d45a  pidgin-2.6.0-devel-20090812.tar.bz2
+235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2



From vda at fedoraproject.org  Tue Aug 18 17:30:35 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Tue, 18 Aug 2009 17:30:35 +0000 (UTC)
Subject: rpms/abrt/devel abrt.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <20090818173035.2C1ED11C04D1@cvs1.fedora.phx.redhat.com>

Author: vda

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6595

Modified Files:
	abrt.spec sources 
Log Message:
update to 0.0.7-2




Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- abrt.spec	18 Aug 2009 09:06:03 -0000	1.9
+++ abrt.spec	18 Aug 2009 17:30:35 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 0.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -330,6 +330,14 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+
+* Tue Aug 18 2009  Denys Vlasenko <dvlasenk at redhat.com> 0.0.7-2
+- removed dangerous parameter option
+- minimum plugin activation period is 1 second
+- in case of plugin error, don't delete debug dumps
+- abrt-gui: fix crash when run by root
+- simplify parsing of debuginfo-install output
+
 * Tue Aug 18 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.7-1
 - new version
 - added status window to show user some info after reporting a bug


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Aug 2009 09:06:03 -0000	1.7
+++ sources	18 Aug 2009 17:30:35 -0000	1.8
@@ -1 +1 @@
-31be7e454451ebf8f173b4f7f851566f  abrt-0.0.7.tar.gz
+c908e6174843a7b685203a67d631964f  abrt-0.0.7.tar.gz



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:16 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173617.6EFA310F855@bastion2.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 8) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:19 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173620.2DF6510F882@bastion2.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 9) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:26 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173626.2976010F898@bastion2.fedora.phx.redhat.com>

clumens has set the watchcommits acl on anaconda (Fedora 10) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:27 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173627.7E87710F85C@bastion2.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora 10) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:27 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173627.BE1A910F89F@bastion2.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 10) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:29 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173630.445B710F8AF@bastion2.fedora.phx.redhat.com>

clumens has set the watchbugzilla acl on anaconda (Fedora 11) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:30 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173630.6793510F8B2@bastion2.fedora.phx.redhat.com>

clumens has set the watchcommits acl on anaconda (Fedora 11) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:32 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20090818173632.C610510F8C0@bastion2.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 11) to Approved for kanarip

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From davej at fedoraproject.org  Tue Aug 18 17:38:11 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 18 Aug 2009 17:38:11 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1110, 1.1111 config-generic, 1.317, 1.318 kernel.spec, 1.1725,
	1.1726 sources, 1.1068, 1.1069 upstream, 1.982,
	1.983 patch-2.6.31-rc6-git2.bz2.sign, 1.1, NONE
Message-ID: <20090818173811.535C611C00D7@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8987

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc6-git3.bz2.sign 
Removed Files:
	patch-2.6.31-rc6-git2.bz2.sign 
Log Message:
2.6.31-rc6-git3


--- NEW FILE patch-2.6.31-rc6-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKifDWyGugalF9Dw4RArnDAKCV4RB/H5u3asDVNcofTSi7u2aTXwCeP8Fg
fe5RiaqtFA5xWe7P/QgnlwI=
=BQxt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1110
retrieving revision 1.1111
diff -u -p -r1.1110 -r1.1111
--- .cvsignore	17 Aug 2009 19:51:10 -0000	1.1110
+++ .cvsignore	18 Aug 2009 17:38:10 -0000	1.1111
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git2.bz2
+patch-2.6.31-rc6-git3.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- config-generic	17 Aug 2009 18:33:39 -0000	1.317
+++ config-generic	18 Aug 2009 17:38:10 -0000	1.318
@@ -3993,6 +3993,8 @@ CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_AUDIT=y
 CONFIG_IMA_LSM_RULES=y
 
+CONFIG_LSM_MMAP_MIN_ADDR=65535
+
 # CONFIG_PAGE_POISONING is not set
 
 CONFIG_SLOW_WORK=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -p -r1.1725 -r1.1726
--- kernel.spec	17 Aug 2009 19:55:58 -0000	1.1725
+++ kernel.spec	18 Aug 2009 17:38:10 -0000	1.1726
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1968,6 +1968,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 18 2009 Dave Jones <davej at redhat.com>
+- 2.6.31-rc6-git3
+
 * Mon Aug 17 2009 Dave Jones <davej at redhat.com> 2.6.31-0.161.rc6.git2
 - 2.6.31-rc6-git2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1068
retrieving revision 1.1069
diff -u -p -r1.1068 -r1.1069
--- sources	17 Aug 2009 19:51:10 -0000	1.1068
+++ sources	18 Aug 2009 17:38:10 -0000	1.1069
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-10f2368eb42af734a8b586628cafa1d9  patch-2.6.31-rc6-git2.bz2
+67d0b1917a80534f0a7f3aa2c2897509  patch-2.6.31-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -p -r1.982 -r1.983
--- upstream	17 Aug 2009 19:51:11 -0000	1.982
+++ upstream	18 Aug 2009 17:38:11 -0000	1.983
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git2.bz2
+patch-2.6.31-rc6-git3.bz2


--- patch-2.6.31-rc6-git2.bz2.sign DELETED ---



From wtogami at fedoraproject.org  Tue Aug 18 17:38:23 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 18 Aug 2009 17:38:23 +0000 (UTC)
Subject: rpms/pidgin/F-11 .cvsignore, 1.26, 1.27 pidgin.spec, 1.73,
	1.74 sources, 1.26,
	1.27 pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch, 1.1, NONE
Message-ID: <20090818173823.380B611C00D7@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9051

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch 
Log Message:
- CVE-2009-2694
- Voice and Video support via farsight2 (Fedora 11+)
- Numerous other bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	29 Jun 2009 00:39:43 -0000	1.26
+++ .cvsignore	18 Aug 2009 17:38:22 -0000	1.27
@@ -1 +1 @@
-pidgin-2.5.8.tar.bz2
+pidgin-2.6.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- pidgin.spec	20 Jul 2009 01:15:21 -0000	1.73
+++ pidgin.spec	18 Aug 2009 17:38:23 -0000	1.74
@@ -30,6 +30,8 @@
 %define api_docs		0
 %define krb4_removed		0
 %define nss_md2_disabled	0
+%define vv_support		0
+%define libidn_support		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -61,19 +63,26 @@
 %define perl_embed_separated	1
 %define api_docs		1
 %endif
-# F11+: New NSS (3.12.3) disables weaker MD2 algorithm
+# F10+: New NSS (3.12.3) disables weaker MD2 algorithm
 %if 0%{?fedora} >= 10
 %define nss_md2_disabled	1
 %endif
+# F11+: voice and video support
+%if 0%{?fedora} >= 11
+%define vv_support	1
+%endif
+# F11+: libidn for punycode domain support
+%if 0%{?fedora} >= 11
+%define libidn_support	1
+%endif
 # F12+: krb4 removed
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
 %endif
 
-
 Name:		pidgin
-Version:	2.5.8
-Release:	2%{?dist}
+Version:	2.6.0
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -104,11 +113,9 @@ Source2:        one_time_password.c
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-Patch0: pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch
-Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
+Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.5.8-nss-md2.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -201,6 +208,14 @@ BuildRequires:  perl-devel
 %if %{perl_embed_separated}
 BuildRequires:  perl(ExtUtils::Embed)
 %endif
+# Voice and video support (F11+)
+%if %{vv_support}
+BuildRequires:  farsight2-devel
+%endif
+# libidn punycode domain support (F11+)
+%if %{libidn_support}
+BuildRequires:  libidn-devel
+%endif
 
 %if %{api_docs}
 BuildRequires: doxygen
@@ -351,17 +366,13 @@ Doxygen generated API documentation.
 
 %prep
 echo "FEDORA=%{fedora} RHEL=%{rhel}"
-%setup -q
+%setup -q 
 ## Patches 0-99: Fedora specific or upstream wont accept
-%patch0 -p1 -b .resolv
 %if %{force_sound_aplay}
-%patch1 -p1 -b .aplay
+%patch0 -p1 -b .aplay
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%if %{nss_md2_disabled}
-%patch100 -p0 -b .nssmd2
-%endif
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -398,6 +409,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{meanwhile_integration}
 	SWITCHES="$SWITCHES --disable-meanwhile"
 %endif
+%if ! %{libidn_support}
+	SWITCHES="$SWITCHES --disable-idn"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -429,14 +443,13 @@ install -m 0755 libpurple/plugins/one_ti
 
 desktop-file-install --vendor pidgin --delete-original       \
   --add-category X-Red-Hat-Base                            \
-  --copy-generic-name-to-name                              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
   $RPM_BUILD_ROOT%{_datadir}/applications/pidgin.desktop
 
 # remove libtool libraries and static libraries
 rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
-# remove the old perllocal.pod file
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+# remove the perllocal.pod file
+find $RPM_BUILD_ROOT -name perllocal.pod |xargs rm
 # remove relnot.so plugin since it is unusable for our package
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/relnot.so
 # remove dummy nullclient
@@ -448,6 +461,11 @@ install -m 644 prefs.xml $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
+# remove non-plugin unrequired library symlinks
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+
 # make sure that we can write to all the files we've installed
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*
@@ -513,6 +531,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pidgin
 %{_bindir}/gaim
 %{_libdir}/pidgin/
+%exclude %{_libdir}/pidgin/perl
 %{_mandir}/man1/pidgin.*
 %{_datadir}/applications/pidgin.desktop
 %{_datadir}/pixmaps/pidgin/
@@ -522,9 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 %files perl
 %defattr(-,root,root,-)
 %{_mandir}/man3/Pidgin*
-%{perl_vendorarch}/Pidgin.pm
-%dir %{perl_vendorarch}/auto/Pidgin/
-%{perl_vendorarch}/auto/Pidgin/Pidgin.so
+%{_libdir}/pidgin/perl/
 
 %files devel
 %defattr(-,root,root,-)
@@ -534,6 +551,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f pidgin.lang -n libpurple
 %defattr(-,root,root,-)
 %{_libdir}/purple-2/
+%exclude %{_libdir}/purple-2/perl
 %{_libdir}/libpurple.so.*
 %{_datadir}/sounds/purple/
 %{_datadir}/purple
@@ -550,6 +568,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %exclude %{_libdir}/purple-2/tcl.so
 %exclude %{_libdir}/purple-2/perl.so
+%exclude %{_libdir}/purple-2/perl/
 
 %files -n libpurple-devel
 %defattr(-,root,root,-)
@@ -565,10 +584,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mandir}/man3/Purple*
 %{_libdir}/purple-2/perl.so
-%{perl_vendorarch}/Purple.pm
-%dir %{perl_vendorarch}/auto/Purple/
-%{perl_vendorarch}/auto/Purple/Purple.so
-%{perl_vendorarch}/auto/Purple/autosplit.ix
+%{_libdir}/purple-2/perl/
 
 %files -n libpurple-tcl
 %defattr(-,root,root,-)
@@ -598,6 +614,38 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
+- CVE-2009-2694
+- Voice and Video support via farsight2 (Fedora 11+)
+- Numerous other bug fixes
+
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.11.20090812
+- new snapshot at the request of maiku
+
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.10.20090806
+- new snapshot - theoretically better sound quality in voice chat
+
+* Tue Aug 04 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.9.20090804
+- new snapshot
+
+* Mon Jul 27 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.8.20090727
+- new snapshot
+
+* Mon Jul 27 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.0-0.6.20090721
+- Prevent main libpurple & pidgin packages depending on perl (#513902)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-0.5.20090721
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.4.20090721
+- rebuild
+
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.3.20090721
+- prevent crash with no camera when closing vv window
+
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.1.20090721
+- 2.6.0 snapshot with voice and video support via farsight2
+
 * Sat Jul 11 2009 Stu Tomlison <stu at nosnilmot.com> 2.5.8-2
 - Backport patch from upstream to enable NSS to recognize root CA
   certificates that use MD2 & MD4 algorithms in their signature, as


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Jun 2009 00:39:43 -0000	1.26
+++ sources	18 Aug 2009 17:38:23 -0000	1.27
@@ -1 +1 @@
-c207407dca71c6357c82135875e472f0  pidgin-2.5.8.tar.bz2
+235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2


--- pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch DELETED ---



From wtogami at fedoraproject.org  Tue Aug 18 17:43:51 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 18 Aug 2009 17:43:51 +0000 (UTC)
Subject: rpms/pidgin/F-10 .cvsignore, 1.26, 1.27 pidgin.spec, 1.78,
	1.79 sources, 1.26,
	1.27 pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch, 1.1, NONE
Message-ID: <20090818174351.C9D1C11C00D7@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10252

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch 
Log Message:
- CVE-2009-2694
- Voice and Video support via farsight2 (Fedora 11+)
- Numerous other bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	29 Jun 2009 00:40:28 -0000	1.26
+++ .cvsignore	18 Aug 2009 17:43:51 -0000	1.27
@@ -1 +1 @@
-pidgin-2.5.8.tar.bz2
+pidgin-2.6.0.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- pidgin.spec	20 Jul 2009 01:15:21 -0000	1.78
+++ pidgin.spec	18 Aug 2009 17:43:51 -0000	1.79
@@ -30,6 +30,8 @@
 %define api_docs		0
 %define krb4_removed		0
 %define nss_md2_disabled	0
+%define vv_support		0
+%define libidn_support		0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -61,19 +63,26 @@
 %define perl_embed_separated	1
 %define api_docs		1
 %endif
-# F11+: New NSS (3.12.3) disables weaker MD2 algorithm
+# F10+: New NSS (3.12.3) disables weaker MD2 algorithm
 %if 0%{?fedora} >= 10
 %define nss_md2_disabled	1
 %endif
+# F11+: voice and video support
+%if 0%{?fedora} >= 11
+%define vv_support	1
+%endif
+# F11+: libidn for punycode domain support
+%if 0%{?fedora} >= 11
+%define libidn_support	1
+%endif
 # F12+: krb4 removed
 %if 0%{?fedora} >= 12
 %define krb4_removed	1
 %endif
 
-
 Name:		pidgin
-Version:	2.5.8
-Release:	2%{?dist}
+Version:	2.6.0
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -104,11 +113,9 @@ Source2:        one_time_password.c
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-Patch0: pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch
-Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
+Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.5.8-nss-md2.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -201,6 +208,14 @@ BuildRequires:  perl-devel
 %if %{perl_embed_separated}
 BuildRequires:  perl(ExtUtils::Embed)
 %endif
+# Voice and video support (F11+)
+%if %{vv_support}
+BuildRequires:  farsight2-devel
+%endif
+# libidn punycode domain support (F11+)
+%if %{libidn_support}
+BuildRequires:  libidn-devel
+%endif
 
 %if %{api_docs}
 BuildRequires: doxygen
@@ -351,17 +366,13 @@ Doxygen generated API documentation.
 
 %prep
 echo "FEDORA=%{fedora} RHEL=%{rhel}"
-%setup -q
+%setup -q 
 ## Patches 0-99: Fedora specific or upstream wont accept
-%patch0 -p1 -b .resolv
 %if %{force_sound_aplay}
-%patch1 -p1 -b .aplay
+%patch0 -p1 -b .aplay
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%if %{nss_md2_disabled}
-%patch100 -p0 -b .nssmd2
-%endif
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -398,6 +409,9 @@ SWITCHES="--with-extraversion=%{release}
 %if ! %{meanwhile_integration}
 	SWITCHES="$SWITCHES --disable-meanwhile"
 %endif
+%if ! %{libidn_support}
+	SWITCHES="$SWITCHES --disable-idn"
+%endif
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
@@ -429,14 +443,13 @@ install -m 0755 libpurple/plugins/one_ti
 
 desktop-file-install --vendor pidgin --delete-original       \
   --add-category X-Red-Hat-Base                            \
-  --copy-generic-name-to-name                              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
   $RPM_BUILD_ROOT%{_datadir}/applications/pidgin.desktop
 
 # remove libtool libraries and static libraries
 rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
-# remove the old perllocal.pod file
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+# remove the perllocal.pod file
+find $RPM_BUILD_ROOT -name perllocal.pod |xargs rm
 # remove relnot.so plugin since it is unusable for our package
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/relnot.so
 # remove dummy nullclient
@@ -448,6 +461,11 @@ install -m 644 prefs.xml $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
+# remove non-plugin unrequired library symlinks
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+
 # make sure that we can write to all the files we've installed
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*
@@ -513,6 +531,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pidgin
 %{_bindir}/gaim
 %{_libdir}/pidgin/
+%exclude %{_libdir}/pidgin/perl
 %{_mandir}/man1/pidgin.*
 %{_datadir}/applications/pidgin.desktop
 %{_datadir}/pixmaps/pidgin/
@@ -522,9 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 %files perl
 %defattr(-,root,root,-)
 %{_mandir}/man3/Pidgin*
-%{perl_vendorarch}/Pidgin.pm
-%dir %{perl_vendorarch}/auto/Pidgin/
-%{perl_vendorarch}/auto/Pidgin/Pidgin.so
+%{_libdir}/pidgin/perl/
 
 %files devel
 %defattr(-,root,root,-)
@@ -534,6 +551,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f pidgin.lang -n libpurple
 %defattr(-,root,root,-)
 %{_libdir}/purple-2/
+%exclude %{_libdir}/purple-2/perl
 %{_libdir}/libpurple.so.*
 %{_datadir}/sounds/purple/
 %{_datadir}/purple
@@ -550,6 +568,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %exclude %{_libdir}/purple-2/tcl.so
 %exclude %{_libdir}/purple-2/perl.so
+%exclude %{_libdir}/purple-2/perl/
 
 %files -n libpurple-devel
 %defattr(-,root,root,-)
@@ -565,10 +584,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mandir}/man3/Purple*
 %{_libdir}/purple-2/perl.so
-%{perl_vendorarch}/Purple.pm
-%dir %{perl_vendorarch}/auto/Purple/
-%{perl_vendorarch}/auto/Purple/Purple.so
-%{perl_vendorarch}/auto/Purple/autosplit.ix
+%{_libdir}/purple-2/perl/
 
 %files -n libpurple-tcl
 %defattr(-,root,root,-)
@@ -598,6 +614,38 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
+- CVE-2009-2694
+- Voice and Video support via farsight2 (Fedora 11+)
+- Numerous other bug fixes
+
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.11.20090812
+- new snapshot at the request of maiku
+
+* Tue Aug 06 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.10.20090806
+- new snapshot - theoretically better sound quality in voice chat
+
+* Tue Aug 04 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.9.20090804
+- new snapshot
+
+* Mon Jul 27 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.8.20090727
+- new snapshot
+
+* Mon Jul 27 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.0-0.6.20090721
+- Prevent main libpurple & pidgin packages depending on perl (#513902)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-0.5.20090721
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.4.20090721
+- rebuild
+
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.3.20090721
+- prevent crash with no camera when closing vv window
+
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.1.20090721
+- 2.6.0 snapshot with voice and video support via farsight2
+
 * Sat Jul 11 2009 Stu Tomlison <stu at nosnilmot.com> 2.5.8-2
 - Backport patch from upstream to enable NSS to recognize root CA
   certificates that use MD2 & MD4 algorithms in their signature, as


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	29 Jun 2009 00:40:28 -0000	1.26
+++ sources	18 Aug 2009 17:43:51 -0000	1.27
@@ -1 +1 @@
-c207407dca71c6357c82135875e472f0  pidgin-2.5.8.tar.bz2
+235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2


--- pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch DELETED ---



From davej at fedoraproject.org  Tue Aug 18 17:48:12 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 18 Aug 2009 17:48:12 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.318,
	1.319 config-sparc64-generic, 1.27, 1.28
Message-ID: <20090818174812.3A9E011C00D7@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11240

Modified Files:
	config-generic config-sparc64-generic 
Log Message:
mmap min addr should be 64k


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- config-generic	18 Aug 2009 17:38:10 -0000	1.318
+++ config-generic	18 Aug 2009 17:48:11 -0000	1.319
@@ -3993,7 +3993,7 @@ CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_AUDIT=y
 CONFIG_IMA_LSM_RULES=y
 
-CONFIG_LSM_MMAP_MIN_ADDR=65535
+CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 # CONFIG_PAGE_POISONING is not set
 


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- config-sparc64-generic	12 Aug 2009 02:27:23 -0000	1.27
+++ config-sparc64-generic	18 Aug 2009 17:48:12 -0000	1.28
@@ -199,3 +199,10 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
+
+CONFIG_LIRC_ENE0100=m
+# CONFIG_BATTERY_DS2782 is not set
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:43 +0000
Subject: [pkgdb] anaconda: clumens has requested commit
Message-ID: <20090818173643.C718C10F8C4@bastion2.fedora.phx.redhat.com>

clumens has requested the commit acl on anaconda (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Tue Aug 18 17:36:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 18 Aug 2009 17:36:46 +0000
Subject: [pkgdb] anaconda: clumens has requested approveacls
Message-ID: <20090818173647.0EA9310F8C7@bastion2.fedora.phx.redhat.com>

clumens has requested the approveacls acl on anaconda (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anaconda



From sgrubb at fedoraproject.org  Tue Aug 18 18:13:00 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 18 Aug 2009 18:13:00 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.102, 1.103 audit.spec, 1.213,
	1.214 sources, 1.126, 1.127
Message-ID: <20090818181300.A541C11C00D7@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Tue Aug 18 2009 Steve Grubb <sgrubb at redhat.com> 2.0-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	21 Apr 2009 19:02:43 -0000	1.102
+++ .cvsignore	18 Aug 2009 18:13:00 -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.13.tar.gz
+audit-2.0.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- audit.spec	29 Jul 2009 23:52:26 -0000	1.213
+++ audit.spec	18 Aug 2009 18:13:00 -0000	1.214
@@ -1,23 +1,17 @@
-%define audit_version 1.7.13
-%define audit_release 2%{?dist}
-%define sca_version 0.4.8
-%define sca_release 21
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: %{audit_version}
-Release: %{audit_release}
+Version: 2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext-devel intltool libtool swig python-devel
-BuildRequires: tcp_wrappers-devel 
-BuildRequires: kernel-headers >= 2.6.18
-BuildRequires: automake >= 1.9
-BuildRequires: autoconf >= 2.59
+BuildRequires: swig python-devel
+BuildRequires: tcp_wrappers-devel libcap-ng-devel 
+BuildRequires: kernel-headers >= 2.6.29
 Requires: %{name}-libs = %{version}-%{release}
 Requires: chkconfig
 Requires(pre): coreutils
@@ -41,7 +35,7 @@ Summary: Header files and static library
 License: LGPLv2+
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kernel-headers >= 2.6.18
+Requires: kernel-headers >= 2.6.29
 
 %description libs-devel
 The audit-libs-devel package contains the static libraries and header 
@@ -74,24 +68,11 @@ interface to the audit system, audispd. 
 like relay events to remote machines or analyze events for suspicious
 behavior.
 
-%package -n system-config-audit
-Summary: Utility for editing audit configuration
-Version: %{sca_version}
-Release: %{sca_release}%{?dist}
-License: GPLv2+
-Group: Applications/System
-BuildRequires: desktop-file-utils
-Requires: pygtk2-libglade usermode usermode-gtk
-Requires: %{name}-libs = %{audit_version}-%{audit_release}
-
-%description -n system-config-audit
-A graphical utility for editing audit configuration.
-
 %prep
 %setup -q
 
 %build
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
+%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
 
 %install
@@ -102,7 +83,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
 make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
-make -C system-config-audit DESTDIR=$RPM_BUILD_ROOT install-fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
 # This winds up in the wrong place when libtool is involved
@@ -130,13 +110,6 @@ 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
 
-%find_lang system-config-audit
-
-desktop-file-install					\
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications	\
-	--delete-original				\
-	system-config-audit/system-config-audit.desktop
-
 %ifnarch ppc ppc64
 %check
 make check
@@ -164,13 +137,13 @@ if [ $1 -ge 1 ]; then
 fi
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(755,root,root) /%{_lib}/libaudit.*
 %attr(755,root,root) /%{_lib}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
 
 %files libs-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc contrib/skeleton.c contrib/plugin
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
@@ -182,7 +155,7 @@ fi
 %{_mandir}/man3/*
 
 %files libs-python
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(755,root,root) %{python_sitearch}/_audit.so
 %attr(755,root,root) %{python_sitearch}/auparse.so
 %{python_sitearch}/audit.py*
@@ -242,22 +215,10 @@ fi
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
-%files -n system-config-audit -f system-config-audit.lang
-%defattr(-,root,root,-)
-%doc system-config-audit/AUTHORS
-%doc system-config-audit/COPYING
-%doc system-config-audit/ChangeLog
-%doc system-config-audit/NEWS
-%doc system-config-audit/README
-%{_bindir}/system-config-audit
-%{_datadir}/applications/system-config-audit.desktop
-%{_datadir}/system-config-audit
-%{_libexecdir}/system-config-audit-server-real
-%{_libexecdir}/system-config-audit-server
-%config(noreplace) %{_sysconfdir}/pam.d/system-config-audit-server
-%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
-
 %changelog
+* Tue Aug 18 2009 Steve Grubb <sgrubb at redhat.com> 2.0-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- sources	21 Apr 2009 19:02:44 -0000	1.126
+++ sources	18 Aug 2009 18:13:00 -0000	1.127
@@ -1 +1 @@
-967776cbec046043ef02ffefe0e89cb7  audit-1.7.13.tar.gz
+d0c064c4646f8fe5c50de789c627f2da  audit-2.0.tar.gz



From kkofler at fedoraproject.org  Tue Aug 18 18:26:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 18 Aug 2009 18:26:21 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec,1.186,1.187
Message-ID: <20090818182621.490AE11C00D7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19667/F-10

Modified Files:
	kdebase-workspace.spec 
Log Message:
Restore AWOL changelog entry.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- kdebase-workspace.spec	18 Aug 2009 16:07:14 -0000	1.186
+++ kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.187
@@ -529,9 +529,12 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
-* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage
 
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-6
+- Requires: oxygen-icon-theme >= 4.3.0
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From kkofler at fedoraproject.org  Tue Aug 18 18:26:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 18 Aug 2009 18:26:21 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec,1.236,1.237
Message-ID: <20090818182621.6213511C0262@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19667/F-11

Modified Files:
	kdebase-workspace.spec 
Log Message:
Restore AWOL changelog entry.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- kdebase-workspace.spec	18 Aug 2009 16:07:14 -0000	1.236
+++ kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.237
@@ -529,9 +529,12 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
-* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage
 
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-6
+- Requires: oxygen-icon-theme >= 4.3.0
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From kkofler at fedoraproject.org  Tue Aug 18 18:26:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 18 Aug 2009 18:26:21 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.267,1.268
Message-ID: <20090818182621.8CAF911C00D7@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19667/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
Restore AWOL changelog entry.


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- kdebase-workspace.spec	18 Aug 2009 16:07:14 -0000	1.267
+++ kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.268
@@ -529,9 +529,12 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
-* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+* Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage
 
+* Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-6
+- Requires: oxygen-icon-theme >= 4.3.0
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
 - respin
 



From kyle at fedoraproject.org  Tue Aug 18 18:27:39 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 18 Aug 2009 18:27:39 +0000 (UTC)
Subject: rpms/kernel/devel fix-perf-make-man-failure.patch, NONE,
	1.1 kernel.spec, 1.1726, 1.1727
Message-ID: <20090818182739.DECA211C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20084

Modified Files:
	kernel.spec 
Added Files:
	fix-perf-make-man-failure.patch 
Log Message:
* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
- Fix up perf so that it builds docs now that they are fixed.
- with_docs disables perf docs too. be warned. (logic is that the
  build deps are (mostly) the same, so if you don't want one, odds are...)


fix-perf-make-man-failure.patch:
 b/tools/perf/Documentation/examples.txt    |  225 ++++++++++++++++++++++++++++
 tools/perf/Documentation/perf-examples.txt |  226 -----------------------------
 2 files changed, 225 insertions(+), 226 deletions(-)

--- NEW FILE fix-perf-make-man-failure.patch ---
>From 30cd04d629fed1779dd695a5dc2d38f6f5159bf8 Mon Sep 17 00:00:00 2001
From: Carlos R. Mafra <crmafra at gmail.com>
Date: Mon, 17 Aug 2009 00:36:21 +0200
Subject: [PATCH] perf: Rename perf-examples.txt to examples.txt

Rename it to examples.txt to avoid the perf-*.txt pattern in
the Makefile, otherwise 'make doc' fails because
perf-examples.txt is not formatted to be a man page:

 ERROR: perf-examples.txt: line 1: manpage document title is mandatory

Signed-off-by: Carlos R. Mafra <crmafra at gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Paul Mackerras <paulus at samba.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 tools/perf/Documentation/examples.txt      |  225 ++++++++++++++++++++++++++++
 tools/perf/Documentation/perf-examples.txt |  225 ----------------------------
 2 files changed, 225 insertions(+), 225 deletions(-)
 create mode 100644 tools/perf/Documentation/examples.txt
 delete mode 100644 tools/perf/Documentation/perf-examples.txt

diff --git a/tools/perf/Documentation/examples.txt b/tools/perf/Documentation/examples.txt
new file mode 100644
index 0000000..8eb6c48
--- /dev/null
+++ b/tools/perf/Documentation/examples.txt
@@ -0,0 +1,225 @@
+
+		------------------------------
+		****** perf by examples ******
+		------------------------------
+
+[ From an e-mail by Ingo Molnar, http://lkml.org/lkml/2009/8/4/346 ]
+
+
+First, discovery/enumeration of available counters can be done via
+'perf list':
+
+titan:~> perf list
+  [...]
+  kmem:kmalloc                             [Tracepoint event]
+  kmem:kmem_cache_alloc                    [Tracepoint event]
+  kmem:kmalloc_node                        [Tracepoint event]
+  kmem:kmem_cache_alloc_node               [Tracepoint event]
+  kmem:kfree                               [Tracepoint event]
+  kmem:kmem_cache_free                     [Tracepoint event]
+  kmem:mm_page_free_direct                 [Tracepoint event]
+  kmem:mm_pagevec_free                     [Tracepoint event]
+  kmem:mm_page_alloc                       [Tracepoint event]
+  kmem:mm_page_alloc_zone_locked           [Tracepoint event]
+  kmem:mm_page_pcpu_drain                  [Tracepoint event]
+  kmem:mm_page_alloc_extfrag               [Tracepoint event]
+
+Then any (or all) of the above event sources can be activated and
+measured. For example the page alloc/free properties of a 'hackbench
+run' are:
+
+ titan:~> perf stat -e kmem:mm_page_pcpu_drain -e kmem:mm_page_alloc
+ -e kmem:mm_pagevec_free -e kmem:mm_page_free_direct ./hackbench 10
+ Time: 0.575
+
+ Performance counter stats for './hackbench 10':
+
+          13857  kmem:mm_page_pcpu_drain
+          27576  kmem:mm_page_alloc
+           6025  kmem:mm_pagevec_free
+          20934  kmem:mm_page_free_direct
+
+    0.613972165  seconds time elapsed
+
+You can observe the statistical properties as well, by using the
+'repeat the workload N times' feature of perf stat:
+
+ titan:~> perf stat --repeat 5 -e kmem:mm_page_pcpu_drain -e
+   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
+   kmem:mm_page_free_direct ./hackbench 10
+ Time: 0.627
+ Time: 0.644
+ Time: 0.564
+ Time: 0.559
+ Time: 0.626
+
+ Performance counter stats for './hackbench 10' (5 runs):
+
+          12920  kmem:mm_page_pcpu_drain    ( +-   3.359% )
+          25035  kmem:mm_page_alloc         ( +-   3.783% )
+           6104  kmem:mm_pagevec_free       ( +-   0.934% )
+          18376  kmem:mm_page_free_direct   ( +-   4.941% )
+
+    0.643954516  seconds time elapsed   ( +-   2.363% )
+
+Furthermore, these tracepoints can be used to sample the workload as
+well. For example the page allocations done by a 'git gc' can be
+captured the following way:
+
+ titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc
+ Counting objects: 1148, done.
+ Delta compression using up to 2 threads.
+ Compressing objects: 100% (450/450), done.
+ Writing objects: 100% (1148/1148), done.
+ Total 1148 (delta 690), reused 1148 (delta 690)
+ [ perf record: Captured and wrote 0.267 MB perf.data (~11679 samples) ]
+
+To check which functions generated page allocations:
+
+ titan:~/git> perf report
+ # Samples: 10646
+ #
+ # Overhead          Command               Shared Object
+ # ........  ...............  ..........................
+ #
+    23.57%       git-repack  /lib64/libc-2.5.so
+    21.81%              git  /lib64/libc-2.5.so
+    14.59%              git  ./git
+    11.79%       git-repack  ./git
+     7.12%              git  /lib64/ld-2.5.so
+     3.16%       git-repack  /lib64/libpthread-2.5.so
+     2.09%       git-repack  /bin/bash
+     1.97%               rm  /lib64/libc-2.5.so
+     1.39%               mv  /lib64/ld-2.5.so
+     1.37%               mv  /lib64/libc-2.5.so
+     1.12%       git-repack  /lib64/ld-2.5.so
+     0.95%               rm  /lib64/ld-2.5.so
+     0.90%  git-update-serv  /lib64/libc-2.5.so
+     0.73%  git-update-serv  /lib64/ld-2.5.so
+     0.68%             perf  /lib64/libpthread-2.5.so
+     0.64%       git-repack  /usr/lib64/libz.so.1.2.3
+
+Or to see it on a more finegrained level:
+
+titan:~/git> perf report --sort comm,dso,symbol
+# Samples: 10646
+#
+# Overhead          Command               Shared Object  Symbol
+# ........  ...............  ..........................  ......
+#
+     9.35%       git-repack  ./git                       [.] insert_obj_hash
+     9.12%              git  ./git                       [.] insert_obj_hash
+     7.31%              git  /lib64/libc-2.5.so          [.] memcpy
+     6.34%       git-repack  /lib64/libc-2.5.so          [.] _int_malloc
+     6.24%       git-repack  /lib64/libc-2.5.so          [.] memcpy
+     5.82%       git-repack  /lib64/libc-2.5.so          [.] __GI___fork
+     5.47%              git  /lib64/libc-2.5.so          [.] _int_malloc
+     2.99%              git  /lib64/libc-2.5.so          [.] memset
+
+Furthermore, call-graph sampling can be done too, of page
+allocations - to see precisely what kind of page allocations there
+are:
+
+ titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc
+ Counting objects: 1148, done.
+ Delta compression using up to 2 threads.
+ Compressing objects: 100% (450/450), done.
+ Writing objects: 100% (1148/1148), done.
+ Total 1148 (delta 690), reused 1148 (delta 690)
+ [ perf record: Captured and wrote 0.963 MB perf.data (~42069 samples) ]
+
+ titan:~/git> perf report -g
+ # Samples: 10686
+ #
+ # Overhead          Command               Shared Object
+ # ........  ...............  ..........................
+ #
+    23.25%       git-repack  /lib64/libc-2.5.so
+                |
+                |--50.00%-- _int_free
+                |
+                |--37.50%-- __GI___fork
+                |          make_child
+                |
+                |--12.50%-- ptmalloc_unlock_all2
+                |          make_child
+                |
+                 --6.25%-- __GI_strcpy
+    21.61%              git  /lib64/libc-2.5.so
+                |
+                |--30.00%-- __GI_read
+                |          |
+                |           --83.33%-- git_config_from_file
+                |                     git_config
+                |                     |
+   [...]
+
+Or you can observe the whole system's page allocations for 10
+seconds:
+
+titan:~/git> perf stat -a -e kmem:mm_page_pcpu_drain -e
+kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
+kmem:mm_page_free_direct sleep 10
+
+ Performance counter stats for 'sleep 10':
+
+         171585  kmem:mm_page_pcpu_drain
+         322114  kmem:mm_page_alloc
+          73623  kmem:mm_pagevec_free
+         254115  kmem:mm_page_free_direct
+
+   10.000591410  seconds time elapsed
+
+Or observe how fluctuating the page allocations are, via statistical
+analysis done over ten 1-second intervals:
+
+ titan:~/git> perf stat --repeat 10 -a -e kmem:mm_page_pcpu_drain -e
+   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
+   kmem:mm_page_free_direct sleep 1
+
+ Performance counter stats for 'sleep 1' (10 runs):
+
+          17254  kmem:mm_page_pcpu_drain    ( +-   3.709% )
+          34394  kmem:mm_page_alloc         ( +-   4.617% )
+           7509  kmem:mm_pagevec_free       ( +-   4.820% )
+          25653  kmem:mm_page_free_direct   ( +-   3.672% )
+
+    1.058135029  seconds time elapsed   ( +-   3.089% )
+
+Or you can annotate the recorded 'git gc' run on a per symbol basis
+and check which instructions/source-code generated page allocations:
+
+ titan:~/git> perf annotate __GI___fork
+ ------------------------------------------------
+  Percent |      Source code & Disassembly of libc-2.5.so
+ ------------------------------------------------
+          :
+          :
+          :      Disassembly of section .plt:
+          :      Disassembly of section .text:
+          :
+          :      00000031a2e95560 <__fork>:
+ [...]
+     0.00 :        31a2e95602:   b8 38 00 00 00          mov    $0x38,%eax
+     0.00 :        31a2e95607:   0f 05                   syscall
+    83.42 :        31a2e95609:   48 3d 00 f0 ff ff       cmp    $0xfffffffffffff000,%rax
+     0.00 :        31a2e9560f:   0f 87 4d 01 00 00       ja     31a2e95762 <__fork+0x202>
+     0.00 :        31a2e95615:   85 c0                   test   %eax,%eax
+
+( this shows that 83.42% of __GI___fork's page allocations come from
+  the 0x38 system call it performs. )
+
+etc. etc. - a lot more is possible. I could list a dozen of
+other different usecases straight away - neither of which is
+possible via /proc/vmstat.
+
+/proc/vmstat is not in the same league really, in terms of
+expressive power of system analysis and performance
+analysis.
+
+All that the above results needed were those new tracepoints
+in include/tracing/events/kmem.h.
+
+	Ingo
+
+
diff --git a/tools/perf/Documentation/perf-examples.txt b/tools/perf/Documentation/perf-examples.txt
deleted file mode 100644
index 8eb6c48..0000000
--- a/tools/perf/Documentation/perf-examples.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-
-		------------------------------
-		****** perf by examples ******
-		------------------------------
-
-[ From an e-mail by Ingo Molnar, http://lkml.org/lkml/2009/8/4/346 ]
-
-
-First, discovery/enumeration of available counters can be done via
-'perf list':
-
-titan:~> perf list
-  [...]
-  kmem:kmalloc                             [Tracepoint event]
-  kmem:kmem_cache_alloc                    [Tracepoint event]
-  kmem:kmalloc_node                        [Tracepoint event]
-  kmem:kmem_cache_alloc_node               [Tracepoint event]
-  kmem:kfree                               [Tracepoint event]
-  kmem:kmem_cache_free                     [Tracepoint event]
-  kmem:mm_page_free_direct                 [Tracepoint event]
-  kmem:mm_pagevec_free                     [Tracepoint event]
-  kmem:mm_page_alloc                       [Tracepoint event]
-  kmem:mm_page_alloc_zone_locked           [Tracepoint event]
-  kmem:mm_page_pcpu_drain                  [Tracepoint event]
-  kmem:mm_page_alloc_extfrag               [Tracepoint event]
-
-Then any (or all) of the above event sources can be activated and
-measured. For example the page alloc/free properties of a 'hackbench
-run' are:
-
- titan:~> perf stat -e kmem:mm_page_pcpu_drain -e kmem:mm_page_alloc
- -e kmem:mm_pagevec_free -e kmem:mm_page_free_direct ./hackbench 10
- Time: 0.575
-
- Performance counter stats for './hackbench 10':
-
-          13857  kmem:mm_page_pcpu_drain
-          27576  kmem:mm_page_alloc
-           6025  kmem:mm_pagevec_free
-          20934  kmem:mm_page_free_direct
-
-    0.613972165  seconds time elapsed
-
-You can observe the statistical properties as well, by using the
-'repeat the workload N times' feature of perf stat:
-
- titan:~> perf stat --repeat 5 -e kmem:mm_page_pcpu_drain -e
-   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
-   kmem:mm_page_free_direct ./hackbench 10
- Time: 0.627
- Time: 0.644
- Time: 0.564
- Time: 0.559
- Time: 0.626
-
- Performance counter stats for './hackbench 10' (5 runs):
-
-          12920  kmem:mm_page_pcpu_drain    ( +-   3.359% )
-          25035  kmem:mm_page_alloc         ( +-   3.783% )
-           6104  kmem:mm_pagevec_free       ( +-   0.934% )
-          18376  kmem:mm_page_free_direct   ( +-   4.941% )
-
-    0.643954516  seconds time elapsed   ( +-   2.363% )
-
-Furthermore, these tracepoints can be used to sample the workload as
-well. For example the page allocations done by a 'git gc' can be
-captured the following way:
-
- titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc
- Counting objects: 1148, done.
- Delta compression using up to 2 threads.
- Compressing objects: 100% (450/450), done.
- Writing objects: 100% (1148/1148), done.
- Total 1148 (delta 690), reused 1148 (delta 690)
- [ perf record: Captured and wrote 0.267 MB perf.data (~11679 samples) ]
-
-To check which functions generated page allocations:
-
- titan:~/git> perf report
- # Samples: 10646
- #
- # Overhead          Command               Shared Object
- # ........  ...............  ..........................
- #
-    23.57%       git-repack  /lib64/libc-2.5.so
-    21.81%              git  /lib64/libc-2.5.so
-    14.59%              git  ./git
-    11.79%       git-repack  ./git
-     7.12%              git  /lib64/ld-2.5.so
-     3.16%       git-repack  /lib64/libpthread-2.5.so
-     2.09%       git-repack  /bin/bash
-     1.97%               rm  /lib64/libc-2.5.so
-     1.39%               mv  /lib64/ld-2.5.so
-     1.37%               mv  /lib64/libc-2.5.so
-     1.12%       git-repack  /lib64/ld-2.5.so
-     0.95%               rm  /lib64/ld-2.5.so
-     0.90%  git-update-serv  /lib64/libc-2.5.so
-     0.73%  git-update-serv  /lib64/ld-2.5.so
-     0.68%             perf  /lib64/libpthread-2.5.so
-     0.64%       git-repack  /usr/lib64/libz.so.1.2.3
-
-Or to see it on a more finegrained level:
-
-titan:~/git> perf report --sort comm,dso,symbol
-# Samples: 10646
-#
-# Overhead          Command               Shared Object  Symbol
-# ........  ...............  ..........................  ......
-#
-     9.35%       git-repack  ./git                       [.] insert_obj_hash
-     9.12%              git  ./git                       [.] insert_obj_hash
-     7.31%              git  /lib64/libc-2.5.so          [.] memcpy
-     6.34%       git-repack  /lib64/libc-2.5.so          [.] _int_malloc
-     6.24%       git-repack  /lib64/libc-2.5.so          [.] memcpy
-     5.82%       git-repack  /lib64/libc-2.5.so          [.] __GI___fork
-     5.47%              git  /lib64/libc-2.5.so          [.] _int_malloc
-     2.99%              git  /lib64/libc-2.5.so          [.] memset
-
-Furthermore, call-graph sampling can be done too, of page
-allocations - to see precisely what kind of page allocations there
-are:
-
- titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc
- Counting objects: 1148, done.
- Delta compression using up to 2 threads.
- Compressing objects: 100% (450/450), done.
- Writing objects: 100% (1148/1148), done.
- Total 1148 (delta 690), reused 1148 (delta 690)
- [ perf record: Captured and wrote 0.963 MB perf.data (~42069 samples) ]
-
- titan:~/git> perf report -g
- # Samples: 10686
- #
- # Overhead          Command               Shared Object
- # ........  ...............  ..........................
- #
-    23.25%       git-repack  /lib64/libc-2.5.so
-                |
-                |--50.00%-- _int_free
-                |
-                |--37.50%-- __GI___fork
-                |          make_child
-                |
-                |--12.50%-- ptmalloc_unlock_all2
-                |          make_child
-                |
-                 --6.25%-- __GI_strcpy
-    21.61%              git  /lib64/libc-2.5.so
-                |
-                |--30.00%-- __GI_read
-                |          |
-                |           --83.33%-- git_config_from_file
-                |                     git_config
-                |                     |
-   [...]
-
-Or you can observe the whole system's page allocations for 10
-seconds:
-
-titan:~/git> perf stat -a -e kmem:mm_page_pcpu_drain -e
-kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
-kmem:mm_page_free_direct sleep 10
-
- Performance counter stats for 'sleep 10':
-
-         171585  kmem:mm_page_pcpu_drain
-         322114  kmem:mm_page_alloc
-          73623  kmem:mm_pagevec_free
-         254115  kmem:mm_page_free_direct
-
-   10.000591410  seconds time elapsed
-
-Or observe how fluctuating the page allocations are, via statistical
-analysis done over ten 1-second intervals:
-
- titan:~/git> perf stat --repeat 10 -a -e kmem:mm_page_pcpu_drain -e
-   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
-   kmem:mm_page_free_direct sleep 1
-
- Performance counter stats for 'sleep 1' (10 runs):
-
-          17254  kmem:mm_page_pcpu_drain    ( +-   3.709% )
-          34394  kmem:mm_page_alloc         ( +-   4.617% )
-           7509  kmem:mm_pagevec_free       ( +-   4.820% )
-          25653  kmem:mm_page_free_direct   ( +-   3.672% )
-
-    1.058135029  seconds time elapsed   ( +-   3.089% )
-
-Or you can annotate the recorded 'git gc' run on a per symbol basis
-and check which instructions/source-code generated page allocations:
-
- titan:~/git> perf annotate __GI___fork
- ------------------------------------------------
-  Percent |      Source code & Disassembly of libc-2.5.so
- ------------------------------------------------
-          :
-          :
-          :      Disassembly of section .plt:
-          :      Disassembly of section .text:
-          :
-          :      00000031a2e95560 <__fork>:
- [...]
-     0.00 :        31a2e95602:   b8 38 00 00 00          mov    $0x38,%eax
-     0.00 :        31a2e95607:   0f 05                   syscall
-    83.42 :        31a2e95609:   48 3d 00 f0 ff ff       cmp    $0xfffffffffffff000,%rax
-     0.00 :        31a2e9560f:   0f 87 4d 01 00 00       ja     31a2e95762 <__fork+0x202>
-     0.00 :        31a2e95615:   85 c0                   test   %eax,%eax
-
-( this shows that 83.42% of __GI___fork's page allocations come from
-  the 0x38 system call it performs. )
-
-etc. etc. - a lot more is possible. I could list a dozen of
-other different usecases straight away - neither of which is
-possible via /proc/vmstat.
-
-/proc/vmstat is not in the same league really, in terms of
-expressive power of system analysis and performance
-analysis.
-
-All that the above results needed were those new tracepoints
-in include/tracing/events/kmem.h.
-
-	Ingo
-
-
-- 
1.6.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -p -r1.1726 -r1.1727
--- kernel.spec	18 Aug 2009 17:38:10 -0000	1.1726
+++ kernel.spec	18 Aug 2009 18:27:39 -0000	1.1727
@@ -484,6 +484,9 @@ BuildRequires: gcc >= 3.4.2, binutils >=
 BuildRequires: net-tools
 %if %{with_doc}
 BuildRequires: xmlto
+%if %{with_perf}
+BuildRequires: asciidoc
+%endif
 %endif
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
@@ -715,6 +718,9 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
+# perf userspace tool patches
+Patch13000: fix-perf-make-man-failure.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1324,6 +1330,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+ApplyPatch fix-perf-make-man-failure.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1438,7 +1446,6 @@ BuildKernel() {
 # make sure the scripts are executable... won't be in tarball until 2.6.31 :/
     chmod +x util/generate-cmdlist.sh util/PERF-VERSION-GEN
     make -s V=1 %{?_smp_mflags} perf
-#later#    make -s V=1 %{?_smp_mflags} doc
     mkdir -p $RPM_BUILD_ROOT/usr/libexec/
     install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf.$KernelVer
     popd
@@ -1639,6 +1646,10 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 # 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
+
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
 find Documentation -type d | xargs chmod u+w
@@ -1687,10 +1698,26 @@ 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
+
+# perf docs
+%if %{with_perf}
+mandir=$RPM_BUILD_ROOT%{_datadir}/man
+man1dir=$mandir/man1
+pushd tools/perf/Documentation
+make install-man mandir=$mandir
+popd
+
+pushd $man1dir
+for d in *.1; do
+ gzip $d;
+done
+popd
+
+%endif
 %endif
 
+# perf shell wrapper
 %if %{with_perf}
-# perf docs and shell wrapper.
 mkdir -p $RPM_BUILD_ROOT/usr/sbin/
 cp $RPM_SOURCE_DIR/perf $RPM_BUILD_ROOT/usr/sbin/perf
 chmod 0755 $RPM_BUILD_ROOT/usr/sbin/perf
@@ -1891,6 +1918,9 @@ 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,
@@ -1968,6 +1998,11 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+- Fix up perf so that it builds docs now that they are fixed.
+- with_docs disables perf docs too. be warned. (logic is that the
+  build deps are (mostly) the same, so if you don't want one, odds are...)
+
 * Tue Aug 18 2009 Dave Jones <davej at redhat.com>
 - 2.6.31-rc6-git3
 



From rdieter at fedoraproject.org  Tue Aug 18 18:38:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 18 Aug 2009 18:38:56 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.59, 1.60 kde-settings.spec,
	1.81, 1.82 sources, 1.61, 1.62
Message-ID: <20090818183856.ABE0511C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23283

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4
- KPackageKit: [CheckUpdate] interval=86400



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	12 Aug 2009 15:56:34 -0000	1.59
+++ .cvsignore	18 Aug 2009 18:38:56 -0000	1.60
@@ -1 +1 @@
-kde-settings-4.3-3.tar.bz2
+kde-settings-4.3-4.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- kde-settings.spec	12 Aug 2009 15:54:07 -0000	1.81
+++ kde-settings.spec	18 Aug 2009 18:38:56 -0000	1.82
@@ -3,7 +3,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: 3
+Release: 4
 
 Group:   System Environment/Base
 License: Public Domain
@@ -150,6 +150,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4
+- KPackageKit: [CheckUpdate] interval=86400
+
 * Wed Aug 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-3
 - kdm/ksplash: use default/air until constantine-themed bits land
 - plasma-desktop-appletsrc: constantine slideshow


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	12 Aug 2009 15:56:34 -0000	1.61
+++ sources	18 Aug 2009 18:38:56 -0000	1.62
@@ -1 +1 @@
-a562632cf4f56e3e7992fafc421450d5  kde-settings-4.3-3.tar.bz2
+e5d095626685f9c211ae44efc00dab66  kde-settings-4.3-4.tar.bz2



From rdieter at fedoraproject.org  Tue Aug 18 18:41:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 18 Aug 2009 18:41:41 +0000 (UTC)
Subject: rpms/kde-settings/F-11 .cvsignore, 1.57, 1.58 kde-settings.spec,
	1.76, 1.77 sources, 1.58, 1.59
Message-ID: <20090818184141.C7A0911C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24154

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-12
- KPackageKit: [CheckUpdate] interval=86400



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	7 Aug 2009 18:28:42 -0000	1.57
+++ .cvsignore	18 Aug 2009 18:41:41 -0000	1.58
@@ -1 +1 @@
-kde-settings-4.2-11.tar.bz2
+kde-settings-4.2-12.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- kde-settings.spec	7 Aug 2009 18:28:42 -0000	1.76
+++ kde-settings.spec	18 Aug 2009 18:41:41 -0000	1.77
@@ -3,7 +3,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 11
+Release: 12
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
@@ -151,6 +151,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-12
+- KPackageKit: [CheckUpdate] interval=86400
+
 * Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-11
 - add default plasmarc, plasma-desktop-appletrc (#516263)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	7 Aug 2009 18:28:42 -0000	1.58
+++ sources	18 Aug 2009 18:41:41 -0000	1.59
@@ -1 +1 @@
-ba7561b87f789f8472019ee9a2087224  kde-settings-4.2-11.tar.bz2
+c7f319fa6844425b01a5415ffd0d7857  kde-settings-4.2-12.tar.bz2



From rdieter at fedoraproject.org  Tue Aug 18 18:42:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 18 Aug 2009 18:42:48 +0000 (UTC)
Subject: rpms/kde-settings/F-10 .cvsignore, 1.49, 1.50 kde-settings.spec,
	1.67, 1.68 sources, 1.49, 1.50
Message-ID: <20090818184248.7225511C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24570

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-8
- KPackageKit: [CheckUpdate] interval=86400



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	7 Aug 2009 18:30:53 -0000	1.49
+++ .cvsignore	18 Aug 2009 18:42:48 -0000	1.50
@@ -1 +1 @@
-kde-settings-4.1-7.tar.bz2
+kde-settings-4.1-8.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/kde-settings.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kde-settings.spec	7 Aug 2009 18:30:53 -0000	1.67
+++ kde-settings.spec	18 Aug 2009 18:42:48 -0000	1.68
@@ -3,7 +3,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.1
-Release: 7 
+Release: 8 
 
 Group:   System Environment/Base
 License: Public Domain
@@ -152,6 +152,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-8
+- KPackageKit: [CheckUpdate] interval=86400
+
 * Fri Aug 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1-7
 - add default plasmarc, plasma-desktop-appletrc (#516263)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	7 Aug 2009 18:30:54 -0000	1.49
+++ sources	18 Aug 2009 18:42:48 -0000	1.50
@@ -1 +1 @@
-dd1af06adc935b9a254484c015bb879f  kde-settings-4.1-7.tar.bz2
+d03dca771ae57b486a2cfdfe238f4faa  kde-settings-4.1-8.tar.bz2



From akurtakov at fedoraproject.org  Tue Aug 18 18:43:59 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 18 Aug 2009 18:43:59 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire-2.3-junit4-pom.patch, NONE,
	1.1 maven-surefire-buildonlyjunit3.patch, NONE,
	1.1 maven-surefire-plexus12.patch, NONE,
	1.1 maven-surefire-buildskiptestng.patch, NONE,
	1.1 maven-surefire-jpp-depmap.xml, 1.1, 1.2 sources, 1.2,
	1.3 maven-surefire.spec, 1.12, 1.13 .cvsignore, 1.2, 1.3
Message-ID: <20090818184359.658F911C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24898/devel

Modified Files:
	maven-surefire-jpp-depmap.xml sources maven-surefire.spec 
	.cvsignore 
Added Files:
	maven-surefire-2.3-junit4-pom.patch 
	maven-surefire-buildonlyjunit3.patch 
	maven-surefire-plexus12.patch 
	maven-surefire-buildskiptestng.patch 
Log Message:
- Update to 2.3 - sync with jpackage.

maven-surefire-2.3-junit4-pom.patch:
 pom.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maven-surefire-2.3-junit4-pom.patch ---
--- surefire-providers/surefire-junit4/pom.xml.sav3	2007-12-10 13:38:57.000000000 +0100
+++ surefire-providers/surefire-junit4/pom.xml	2007-12-10 13:39:15.000000000 +0100
@@ -29,7 +29,7 @@
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <artifactId>junit4</artifactId>
       <version>4.0</version>
     </dependency>
   </dependencies>

maven-surefire-buildonlyjunit3.patch:
 pom.xml |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE maven-surefire-buildonlyjunit3.patch ---
--- ./surefire-providers/pom.xml.sav	2007-06-19 14:49:51.000000000 -0400
+++ ./surefire-providers/pom.xml	2007-06-19 14:50:10.000000000 -0400
@@ -30,8 +30,10 @@
   <name>SureFire Providers</name>
   <modules>
     <module>surefire-junit</module>
+<!--
     <module>surefire-junit4</module>
     <module>surefire-testng</module>
+-->
   </modules>
   <dependencies>
     <dependency>

maven-surefire-plexus12.patch:
 ForkConfiguration.java |    1 +
 SurefireBooter.java    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE maven-surefire-plexus12.patch ---
--- ./surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java.sav	2007-06-19 14:21:38.000000000 -0400
+++ ./surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java	2007-06-19 14:23:10.000000000 -0400
@@ -24,6 +24,7 @@ import org.codehaus.plexus.archiver.jar.
 import org.codehaus.plexus.archiver.jar.Manifest;
 import org.codehaus.plexus.archiver.jar.ManifestException;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.Commandline; 
 
 import java.io.File;
 import java.io.IOException;
--- ./surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java.sav	2007-06-19 14:23:20.000000000 -0400
+++ ./surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java	2007-06-19 14:23:48.000000000 -0400
@@ -31,6 +31,7 @@ import org.apache.maven.surefire.util.Ne
 import org.apache.maven.surefire.util.UrlUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.StreamConsumer;

maven-surefire-buildskiptestng.patch:
 pom.xml |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE maven-surefire-buildskiptestng.patch ---
--- ./surefire-providers/pom.xml.sav	2007-06-19 14:49:51.000000000 -0400
+++ ./surefire-providers/pom.xml	2007-06-19 14:50:10.000000000 -0400
@@ -31,7 +31,9 @@
   <modules>
     <module>surefire-junit</module>
     <module>surefire-junit4</module>
+<!--
     <module>surefire-testng</module>
+-->
   </modules>
   <dependencies>
     <dependency>


Index: maven-surefire-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-surefire-jpp-depmap.xml	13 Mar 2007 23:19:51 -0000	1.1
+++ maven-surefire-jpp-depmap.xml	18 Aug 2009 18:43:58 -0000	1.2
@@ -1,80 +1,23 @@
 <dependencies>
   <dependency>
 	<maven>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>3.8.1</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>3.8.1</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.codehaus.plexus</groupId>
-	  <artifactId>plexus-utils</artifactId>
-	  <version>1.0.5</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/plexus</groupId>
-	  <artifactId>utils</artifactId>
-	  <version>1.0.5</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>3.8.1</version>
-	  <scope>compile</scope>
-	</maven>
-	<jpp>
-	  <groupId>JPP</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>3.8.1</version>
-	</jpp>
-  </dependency>
+	  <groupId>jmock</groupId>
+	  <artifactId>jmock</artifactId>
+	  <version>1.0.1</version>
+	</maven>
+  </dependency>
+    
+    <dependency>
+        <maven>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-parent</artifactId>
+            <version>5</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/maven2</groupId>
+            <artifactId>parent</artifactId>
+            <version>1</version>
+        </jpp>
+    </dependency>
 
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.surefire</groupId>
-	  <artifactId>surefire</artifactId>
-	  <version>1.5.3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-surefire</groupId>
-	  <artifactId>surefire</artifactId>
-	  <version>1.5.3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.surefire</groupId>
-	  <artifactId>surefire-booter</artifactId>
-	  <version>1.5.3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-surefire</groupId>
-	  <artifactId>booter</artifactId>
-	  <version>1.5.3</version>
-	</jpp>
-  </dependency>
-
-  <dependency>
-	<maven>
-	  <groupId>org.apache.maven.surefire</groupId>
-	  <artifactId>surefire-root</artifactId>
-	  <version>1.5.3</version>
-	</maven>
-	<jpp>
-	  <groupId>JPP/maven-surefire</groupId>
-	  <artifactId>surefire-root</artifactId>
-	  <version>1.5.3</version>
-	</jpp>
-  </dependency>
 </dependencies>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 23:19:51 -0000	1.2
+++ sources	18 Aug 2009 18:43:59 -0000	1.3
@@ -1,2 +1 @@
-b48c9fb18cf60058b1bbbed5c3a1b327  maven-surefire-1.5.3.tar.gz
-da776321221b3c475ac9dda19332ee14  maven-surefire-booter-1.5.3.tar.gz
+c6b313ed539c040f1a64115c6c150421  maven-surefire-2.3-src.tar.gz


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- maven-surefire.spec	25 Jul 2009 11:51:38 -0000	1.12
+++ maven-surefire.spec	18 Aug 2009 18:43:59 -0000	1.13
@@ -30,67 +30,78 @@
 
 %define _with_gcj_support 1
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define gcj_support 0
 
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
-
-%define _without_maven 1
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
-%define maven_settings_file %{_builddir}/%{name}/settings.xml
+%define with_maven 1
+%define with_junit4 1
+%define without_junit4 0
 
 Name:           maven-surefire
-Version:        1.5.3
-Release:        4.8%{?dist}
+Version:        2.3
+Release:        7.1%{?dist}
 Epoch:          0
 Summary:        Test framework project
-License:        ASL 2.0
+License:        Apache Software License
 Group:          Development/Java
 URL:            http://maven.apache.org/surefire/
 
 # svn export
-#    http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-1.5.3/ 
-#    surefire/
-# tar czf surefire-tar.gz surefire/
-# svn export 
-#    http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-booter-1.5.3/
-#    surefire-booter/
-# tar czf surefire-booter-tar.gz surefire-booter/
-Source0:        %{name}-%{version}.tar.gz
-Source1:        %{name}-booter-%{version}.tar.gz
-
+#    http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.3 maven-surefire
+# tar czf surefire-2.3-tar.gz maven-surefire/
+Source0:        %{name}-%{version}-src.tar.gz
+#Source1:        %{name}-settings.xml
 Source2:        %{name}-build.xml
 Source3:        %{name}-booter-build.xml
 Source4:        %{name}-jpp-depmap.xml
 
+Patch0:         %{name}-plexus12.patch
+Patch1:         %{name}-buildonlyjunit3.patch
+Patch2:         maven-surefire-buildskiptestng.patch
+Patch3:         maven-surefire-2.3-junit4-pom.patch
+
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
 BuildRequires:  classworlds
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  junit >= 3.8.2
 BuildRequires:  plexus-utils
+%if %{with_junit4}
+BuildRequires:  junit4
+#BuildRequires:  testng
+%endif
 
 %if %{with_maven}
-BuildRequires:  maven2 >= 2.0.4-9
+BuildRequires:  maven2 >= 2.0.4
+#BuildRequires:  maven2-common-poms
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:	maven2-plugin-site
+BuildRequires:  maven2-plugin-plugin
+BuildRequires:  plexus-containers-component-api >= 1.0-0.a34
+BuildRequires:  tomcat5
+BuildRequires:  tomcat5-servlet-2.4-api
+#BuildRequires:  excalibur-avalon-logkit
+#BuildRequires:  excalibur-avalon-framework
+BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  maven2-plugin-surefire < 2.3.1
+BuildRequires:  bsf
 %endif
 
 Requires:       classworlds
-Requires:       plexus-utils
+Requires:       maven2
 Requires:       junit
+Requires:       plexus-utils
 
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
@@ -101,13 +112,18 @@ Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
 %endif
 
+Obsoletes:      maven-surefire-booter <= 0:1.5.3
+Provides:       maven-surefire-booter = %{epoch}:%{version}-%{release}
+
 %description
 Surefire is a test framework project.
 
-%package booter
-Summary:                Booter for %{name}
+%package maven-plugin
+Summary:                Surefire plugin for maven
 Group:                  Development/Java
 Requires:               maven-surefire = %{epoch}:%{version}-%{release}
+Obsoletes:              maven2-plugin-surefire <= 0:2.0.4
+Provides :              maven2-plugin-surefire = %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
 BuildRequires:          java-gcj-compat-devel
@@ -115,42 +131,103 @@ Requires(post):         java-gcj-compat
 Requires(postun):       java-gcj-compat
 %endif
 
-%description booter
-Surefire is a test framework project.
+%description maven-plugin
+Maven surefire plugin for running tests via the surefire framework.
+
+%package report-maven-plugin
+Summary:                Surefire reports plugin for maven
+Group:                  Development/Java
+Requires:               maven-surefire = %{epoch}:%{version}-%{release}
+Obsoletes:              maven2-plugin-surefire-report <= 0:2.0.4
+Provides :              maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
+
+%if %{gcj_support}
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description report-maven-plugin
+Plugin for generating reports from surefire test runs.
+
+%package provider-junit
+Summary:                JUnit3 provider for Maven Surefire
+Group:                  Development/Java
+Requires:               maven-surefire = %{epoch}:%{version}-%{release}
+Obsoletes:              maven2-plugin-surefire-report <= 0:2.0.4O
+#Obsoletes:              maven-surefire-junit = 2.3.1
+Provides:              maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
+#Provides:              maven-surefire-junit = 2.3.1
+
+
+%if %{gcj_support}
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description provider-junit
+JUnit3 provider for Maven Surefire.
+
+%if %with junit4
+%package provider-junit4
+Summary:                JUnit4 provider for Maven Surefire
+Group:                  Development/Java
+Requires:               maven-surefire = %{epoch}:%{version}-%{release}
+
+%if %{gcj_support}
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description provider-junit4
+JUnit4 provider for Maven Surefire.
+%endif
+
 
-%if %{with_maven}
 %package javadoc
 Summary:          Javadoc for %{name}
 Group:            Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
 
-%package booter-javadoc
-Summary:          Javadoc for %{name}
-Group:            Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+%prep
+%setup -q -n %{name}
 
-%description booter-javadoc
-Javadoc for %{name}.
-%endif
+#find / -name JPP.maven2-parent.pom
 
-%prep
-%setup -q -c -n %{name}
+#sed -i "s|<version>5</version>|<version>1</version>|" pom.xml
+#sed -i "s|<relativePath>../pom/maven/pom.xml</relativePath>||" pom.xml
+#rpm -ql maven2-common-poms
 
-tar xzf %{SOURCE1}
+#cat /etc/maven/maven2-versionless-depmap.xml
 
-cp -p %{SOURCE2} surefire/build.xml
-cp -p %{SOURCE3} surefire-booter/build.xml
 
-sed -i -e s:"static private void failSame(":"static public void failSame(":g surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java
-sed -i -e s:"static private void failNotSame(":"static public void failNotSame(":g surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java
-sed -i -e s:"static private void failNotEquals(":"static public void failNotEquals(":g surefire/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java
+
+# We use plexus 1.2. Delete deprecated files accordingly.
+rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CommandShell.java
+rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/Shell.java
+rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CmdShell.java
+rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/Commandline.java
+
+%patch0 -b .sav
+%patch2 -b .sav
+%if %{without_junit4}
+%patch1 -b .sav
+%endif
+
+# Replace doxia package names
+for i in maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java \
+         maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java; do
+
+    sed -i -e s:org.codehaus.doxia.sink.Sink:org.apache.maven.doxia.sink.Sink:g $i
+    sed -i -e s:org.codehaus.doxia.site.renderer.SiteRenderer:org.apache.maven.doxia.siterenderer.Renderer:g $i
+    sed -i -r -e s:\(\\s+\)SiteRenderer\(\\s+\):\\1Renderer\\2:g $i
+done
 
 %build
 
@@ -165,24 +242,36 @@ sed -i -e s:"static private void failNot
 %endif
 
 
-for project in surefire surefire-booter; do
+%if %{with_maven}
 
-        pushd $project
+cat %{SOURCE4}
 
-                %if %{with_maven}
-                        mvn-jpp \
-                                -e \
-                                -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-                                -Dmaven2.jpp.depmap.file=%{SOURCE4} \
-                                install javadoc:javadoc
-                %else
-
-                        ant -Dmaven.mode.offline=true
-                        cp -p target/*jar ../lib/$project.jar
-                %endif
-        popd
+    mvn-jpp \
+        -e \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+        -Dmaven.test.skip=true \
+        install
+#        -s %{SOURCE1} \
+
+    for dir in maven-surefire-plugin \
+               maven-surefire-report-plugin \
+               surefire-api \
+               surefire-booter \
+               surefire-providers/surefire-junit; do
+        (cd $dir
+          mvn-jpp \
+              -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+              -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+              javadoc:javadoc
+        )
+    done
 
-done
+
+%else
+    ant -Dmaven.mode.offline=true
+    cp -p target/*jar ../lib/$project.jar
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -190,19 +279,35 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-surefire
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 
-for p in surefire \
-        surefire-booter; do
-
-        installname=`echo $p | sed -e s:^surefire-::g`
-        install -pm 644 $p/target/$p-%{version}.jar \
-          $RPM_BUILD_ROOT%{_javadir}/maven-surefire/$installname-%{version}.jar
-
-        %add_to_maven_depmap org.apache.maven.surefire $p 1.5.3 JPP/maven-surefire $installname
-
-        install -pm 644 $p/pom.xml \
-          $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-$installname.pom
+install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin-%{version}.jar
+%add_to_maven_depmap org.apache.maven.surefire maven-surefire-plugin 2.3 JPP/maven-surefire maven-plugin
+install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-maven-plugin.pom
+install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-plugin.pom
+
+install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin-%{version}.jar
+%add_to_maven_depmap org.apache.maven.surefire maven-surefire-report-plugin 2.3 JPP/maven-surefire report-maven-plugin
+install -pm 644 maven-surefire-report-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-report-maven-plugin.pom
+
+install -pm 644 surefire-api/target/surefire-api-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api-%{version}.jar
+%add_to_maven_depmap org.apache.maven.surefire surefire-api 2.3 JPP/maven-surefire api
+install -pm 644 surefire-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-api.pom
+
+install -pm 644 surefire-booter/target/surefire-booter-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/booter-%{version}.jar
+%add_to_maven_depmap org.apache.maven.surefire surefire-booter 2.3 JPP/maven-surefire booter
+install -pm 644 surefire-booter/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-booter.pom
+
+install -pm 644 surefire-providers/surefire-junit/target/surefire-junit-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit-%{version}.jar
+%add_to_maven_depmap org.apache.maven.surefire surefire-junit 2.3 JPP/maven-surefire junit
+install -pm 644 surefire-providers/surefire-junit/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-junit.pom
+
+%if %{with_junit4}
+install -pm 644 surefire-providers/surefire-junit4/target/surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4-%{version}.jar
+%add_to_maven_depmap org.apache.maven.surefire surefire-junit4 2.3 JPP/maven-surefire junit4
+install -pm 644 surefire-providers/surefire-junit4/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-junit4.pom
+%endif
 
-done
+%add_to_maven_depmap org.apache.maven.surefire providers 2.3 JPP/maven-surefire providers
+install -pm 644 surefire-providers/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-providers.pom
 
 (cd $RPM_BUILD_ROOT%{_javadir}/maven-surefire && for jar in *-%{version}*; \
   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
@@ -210,20 +315,38 @@ done
 %if %{with_maven}
 # javadoc
 
-for p in surefire \
-        surefire-booter;  do
-
-        project=`basename $p | sed -e s:surefire-::g`
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/maven-plugin
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/report-maven-plugin
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/api
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/booter
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/junit
+%if %{with_junit4}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/junit4
+%endif
+
+cp -pr maven-surefire-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/maven-plugin/
+cp -pr maven-surefire-report-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/report-maven-plugin/
+cp -pr surefire-api/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/api/
+cp -pr surefire-booter/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/booter/
+cp -pr surefire-providers/surefire-junit/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/junit/
+%if %{with_junit4}
+# FIXME: where are the junit4 javadocs?
+#cp -pr surefire-providers/surefire-junit4/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/maven-surefire/junit4/
+%endif
 
-        install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/maven-$p-%{version}
+%endif
 
-        cp -pr $p/target/site/apidocs/* \
-          $RPM_BUILD_ROOT%{_javadocdir}/maven-$p-%{version}/
+# Create compatibility links
+ln -s %{_javadir}/maven-surefire/api.jar \
+      $RPM_BUILD_ROOT%{_javadir}/maven-surefire/surefire.jar
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
+ln -s %{_javadir}/maven-surefire/maven-surefire-plugin.jar \
+      $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-plugin.jar
 
-        ln -s maven-$p-%{version} $RPM_BUILD_ROOT%{_javadocdir}/maven-$p 
-done
-
-%endif
+ln -s %{_javadir}/maven-surefire/maven-surefire-report-plugin.jar \
+      $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin.jar
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -259,61 +382,59 @@ then
 fi
 %endif
 
-%if %{gcj_support}
-%post booter
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun booter
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}/maven-surefire
-%{_javadir}/maven-surefire/surefire*
-%dir %{_datadir}/maven2
-%dir %{_datadir}/maven2/poms
-%{_datadir}/maven2/poms/JPP.maven-surefire-surefire.pom
+%{_javadir}/maven-surefire/api*
+%{_javadir}/maven-surefire/booter*
+%{_javadir}/maven-surefire/surefire.jar
+%{_datadir}/maven2/poms
 %{_mavendepmapfragdir}
-%{_libdir}/gcj/%{name}/booter*
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/surefire-1.5.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/api*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/booter*
 %endif
 
-%files booter
-%defattr(-,root,root,-)
-%{_javadir}/maven-surefire/booter*
-%dir %{_datadir}/maven2
-%dir %{_datadir}/maven2/poms
-%{_datadir}/maven2/poms/JPP.maven-surefire-booter.pom
+%files maven-plugin
+%{_javadir}/maven-surefire/maven-plugin*
+%dir %{_datadir}/maven2/plugins
+%{_datadir}/maven2/plugins/surefire-plugin.jar
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin*
+%endif
 
-%if %{with_maven}
+%files report-maven-plugin
+%{_javadir}/maven-surefire/report-maven-plugin*
+%dir %{_datadir}/maven2/plugins
+%{_datadir}/maven2/plugins/surefire-report-plugin.jar
 %if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/booter-1.5.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/report-maven-plugin*
 %endif
 
-%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%files provider-junit
+%{_javadir}/maven-surefire/junit[^4]*
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/junit[^4]*
+%endif
 
-%files booter-javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%if %{with_junit4}
+%files provider-junit4
+%{_javadir}/maven-surefire/junit4*
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/junit4*
+%endif
 %endif
 
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/*
 
 %changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.1
+- Update to 2.3 - sync with jpackage.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.5.3-4.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -358,4 +479,3 @@ fi
 
 * Mon Jun 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.5.3-1jpp
 - Initial build
-


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 23:19:51 -0000	1.2
+++ .cvsignore	18 Aug 2009 18:43:59 -0000	1.3
@@ -1,2 +1,3 @@
 maven-surefire-1.5.3.tar.gz
 maven-surefire-booter-1.5.3.tar.gz
+maven-surefire-2.3-src.tar.gz



From jkratoch at fedoraproject.org  Tue Aug 18 18:51:18 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 18 Aug 2009 18:51:18 +0000 (UTC)
Subject: rpms/gdb/devel .cvsignore, 1.35,
	1.36 gdb-6.3-readnever-20050907.patch, 
	1.7, 1.8 gdb-6.8-fortran-tag-constant.patch, 1.6,
	1.7 gdb-archer.patch, 1.23, 1.24 gdb.spec, 1.374, 1.375 sources,
	1.34, 1.35 gdb-6.6-multifork-debugreg.patch, 1.10, NONE
Message-ID: <20090818185118.77CA211C00D7@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26587

Modified Files:
	.cvsignore gdb-6.3-readnever-20050907.patch 
	gdb-6.8-fortran-tag-constant.patch gdb-archer.patch gdb.spec 
	sources 
Removed Files:
	gdb-6.6-multifork-debugreg.patch 
Log Message:
* Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-1
- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090818
- archer-jankratochvil-fedora12 commit: 5e0d1cc74f119391a2c3ae25ef5749fc28674f06



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	11 Aug 2009 14:42:46 -0000	1.35
+++ .cvsignore	18 Aug 2009 18:51:17 -0000	1.36
@@ -1 +1 @@
-gdb-6.8.50.20090811.tar.bz2
+gdb-6.8.50.20090818.tar.bz2

gdb-6.3-readnever-20050907.patch:
 doc/gdb.texinfo |    6 ++++++
 dwarf2read.c    |    4 +++-
 main.c          |    2 ++
 symfile.c       |    1 +
 top.h           |    1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

Index: gdb-6.3-readnever-20050907.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-readnever-20050907.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gdb-6.3-readnever-20050907.patch	4 Aug 2009 05:37:27 -0000	1.7
+++ gdb-6.3-readnever-20050907.patch	18 Aug 2009 18:51:17 -0000	1.8
@@ -11,10 +11,10 @@
 
         * gdb.texinfo (File Options): Document --readnever.
 
-Index: gdb-6.8.50.20090802/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090811/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/doc/gdb.texinfo	2009-08-03 09:50:57.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/doc/gdb.texinfo	2009-08-03 12:29:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/doc/gdb.texinfo	2009-08-13 10:14:15.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/doc/gdb.texinfo	2009-08-13 10:14:18.000000000 +0200
 @@ -991,6 +991,12 @@ Read each symbol file's entire symbol ta
  the default, which is to read it incrementally as it is needed.
  This makes startup slower, but makes future operations faster.
@@ -28,10 +28,10 @@ Index: gdb-6.8.50.20090802/gdb/doc/gdb.t
  @end table
  
  @node Mode Options
-Index: gdb-6.8.50.20090802/gdb/main.c
+Index: gdb-6.8.50.20090811/gdb/main.c
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/main.c	2009-08-03 12:29:03.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/main.c	2009-08-03 12:29:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/main.c	2009-08-13 10:14:15.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/main.c	2009-08-13 10:14:18.000000000 +0200
 @@ -382,6 +382,7 @@ captured_main (void *data)
        {"xdb", no_argument, &xdb_commands, 1},
        {"dbx", no_argument, &dbx_commands, 1},
@@ -48,11 +48,11 @@ Index: gdb-6.8.50.20090802/gdb/main.c
  "), stream);
    fputs_unfiltered (_("\
    --se=FILE          Use FILE as symbol file and executable file.\n\
-Index: gdb-6.8.50.20090802/gdb/symfile.c
+Index: gdb-6.8.50.20090811/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/symfile.c	2009-08-03 12:28:14.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/symfile.c	2009-08-03 12:29:58.000000000 +0200
-@@ -78,6 +78,7 @@ static void clear_symtab_users_cleanup (
+--- gdb-6.8.50.20090811.orig/gdb/symfile.c	2009-08-13 10:14:15.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/symfile.c	2009-08-13 10:14:18.000000000 +0200
+@@ -79,6 +79,7 @@ static void clear_symtab_users_cleanup (
  
  /* Global variables owned by this file */
  int readnow_symbol_files;	/* Read full symbols immediately */
@@ -60,19 +60,19 @@ Index: gdb-6.8.50.20090802/gdb/symfile.c
  
  /* External variables and functions referenced. */
  
-Index: gdb-6.8.50.20090802/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/dwarf2read.c	2009-08-03 09:50:57.000000000 +0200
-+++ gdb-6.8.50.20090802/gdb/dwarf2read.c	2009-08-03 12:31:01.000000000 +0200
-@@ -52,6 +52,7 @@
- #include "jv-lang.h"
+--- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-13 10:14:15.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-13 10:14:29.000000000 +0200
+@@ -53,6 +53,7 @@
  #include "typeprint.h"
  #include "vec.h"
+ #include "block.h"
 +#include "top.h"
  
  #include <fcntl.h>
  #include "gdb_string.h"
-@@ -1225,7 +1226,8 @@ dwarf2_has_info (struct objfile *objfile
+@@ -1245,7 +1246,8 @@ dwarf2_has_info (struct objfile *objfile
  
        bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, NULL);
      }
@@ -82,10 +82,10 @@ Index: gdb-6.8.50.20090802/gdb/dwarf2rea
  	  && dwarf2_per_objfile->abbrev.asection != NULL);
  }
  
-Index: gdb-6.8.50.20090802/gdb/top.h
+Index: gdb-6.8.50.20090811/gdb/top.h
 ===================================================================
---- gdb-6.8.50.20090802.orig/gdb/top.h	2009-01-03 06:57:53.000000000 +0100
-+++ gdb-6.8.50.20090802/gdb/top.h	2009-08-03 12:29:58.000000000 +0200
+--- gdb-6.8.50.20090811.orig/gdb/top.h	2009-01-03 06:57:53.000000000 +0100
++++ gdb-6.8.50.20090811/gdb/top.h	2009-08-13 10:14:18.000000000 +0200
 @@ -59,6 +59,7 @@ extern void set_prompt (char *);
  
  /* From random places.  */

gdb-6.8-fortran-tag-constant.patch:
 dwarf2read.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Index: gdb-6.8-fortran-tag-constant.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.8-fortran-tag-constant.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdb-6.8-fortran-tag-constant.patch	4 Aug 2009 05:37:28 -0000	1.6
+++ gdb-6.8-fortran-tag-constant.patch	18 Aug 2009 18:51:17 -0000	1.7
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20090803/gdb/dwarf2read.c
+Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090803.orig/gdb/dwarf2read.c	2009-08-04 06:32:58.000000000 +0200
-+++ gdb-6.8.50.20090803/gdb/dwarf2read.c	2009-08-04 06:33:18.000000000 +0200
-@@ -2459,6 +2459,7 @@ scan_partial_symbols (struct partial_die
+--- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-13 10:14:45.000000000 +0200
++++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-13 10:22:36.000000000 +0200
+@@ -2480,6 +2480,7 @@ scan_partial_symbols (struct partial_die
  	      add_partial_subprogram (pdi, lowpc, highpc, need_pc, cu);
  	      break;
  	    case DW_TAG_variable:
@@ -10,7 +10,7 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
  	    case DW_TAG_typedef:
  	    case DW_TAG_union_type:
  	      if (!pdi->is_declaration)
-@@ -2654,6 +2655,7 @@ add_partial_symbol (struct partial_die_i
+@@ -2675,6 +2676,7 @@ add_partial_symbol (struct partial_die_i
  	}
        break;
      case DW_TAG_variable:
@@ -18,7 +18,15 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
        if (pdi->is_external)
  	{
  	  /* Global Variable.
-@@ -4790,7 +4792,8 @@ dwarf2_add_field (struct field_info *fip
+@@ -2805,6 +2807,7 @@ die_needs_namespace (struct die_info *di
+       return 1;
+ 
+     case DW_TAG_variable:
++    case DW_TAG_constant:
+       {
+ 	struct attribute *attr;
+ 	attr = dwarf2_attr (die, DW_AT_specification, cu);
+@@ -4741,7 +4744,8 @@ dwarf2_add_field (struct field_info *fip
  	  fip->non_public_fields = 1;
  	}
      }
@@ -28,7 +36,7 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
      {
        /* C++ static member.  */
  
-@@ -5297,7 +5300,8 @@ read_structure_type (struct die_info *di
+@@ -5233,7 +5237,8 @@ read_structure_type (struct die_info *di
        while (child_die && child_die->tag)
  	{
  	  if (child_die->tag == DW_TAG_member
@@ -38,7 +46,7 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
  	    {
  	      /* NOTE: carlton/2002-11-05: A C++ static data member
  		 should be a DW_TAG_member that is a declaration, but
-@@ -5416,6 +5420,7 @@ process_structure_scope (struct die_info
+@@ -5352,6 +5357,7 @@ process_structure_scope (struct die_info
      {
        if (child_die->tag == DW_TAG_member
  	  || child_die->tag == DW_TAG_variable
@@ -46,15 +54,15 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
  	  || child_die->tag == DW_TAG_inheritance)
  	{
  	  /* Do nothing.  */
-@@ -6926,6 +6931,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
+@@ -6980,6 +6986,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
  	  && abbrev->tag != DW_TAG_subprogram
  	  && abbrev->tag != DW_TAG_lexical_block
  	  && abbrev->tag != DW_TAG_variable
 +	  && abbrev->tag != DW_TAG_constant
  	  && abbrev->tag != DW_TAG_namespace
+ 	  && abbrev->tag != DW_TAG_module
  	  && abbrev->tag != DW_TAG_member)
- 	{
-@@ -7033,6 +7039,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
+@@ -7088,6 +7095,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
        if (load_all
  	  || abbrev->tag == DW_TAG_subprogram
  	  || abbrev->tag == DW_TAG_variable
@@ -62,7 +70,7 @@ Index: gdb-6.8.50.20090803/gdb/dwarf2rea
  	  || abbrev->tag == DW_TAG_namespace
  	  || part_die->is_declaration)
  	{
-@@ -8840,6 +8847,11 @@ new_symbol (struct die_info *die, struct
+@@ -8901,6 +8909,11 @@ new_symbol (struct die_info *die, struct
  	  /* Do not add the symbol to any lists.  It will be found via
  	     BLOCK_FUNCTION from the blockvector.  */
  	  break;

gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  102 
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 +-
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  245 +
 cp-support.c                                             |   88 
 cp-support.h                                             |   49 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   28 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  357 ++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1842 ++++++++++-----
 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                                                  |   19 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 ++++
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 m2-lang.c                                                |    1 
 machoread.c                                              |    1 
 main.c                                                   |   80 
 maint.c                                                  |    8 
 mdebugread.c                                             |    2 
 mi/mi-cmd-var.c                                          |  165 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 objfiles.h                                               |   21 
 parse.c                                                  |  154 +
 parser-defs.h                                            |   25 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 +++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 ++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 ++
 python/python-symtab.c                                   |  322 ++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |   55 
 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                                                |   42 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.h                                                 |   22 
 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.cp/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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                  |   30 
 testsuite/gdb.cp/namespace-recursive.exp                 |   66 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 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/callframecfa.S                      |  309 ++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 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.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   96 
 testsuite/gdb.python/python-prettyprint.c                |   13 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 testsuite/gdb.python/python.exp                          |   27 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   86 
 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                                                 |  254 +-
 valprint.c                                               |    3 
 value.c                                                  |  145 +
 value.h                                                  |    8 
 varobj.c                                                 |  610 +++-
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 226 files changed, 17007 insertions(+), 2595 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.23 -r 1.24 gdb-archer.patchIndex: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gdb-archer.patch	11 Aug 2009 21:15:13 -0000	1.23
+++ gdb-archer.patch	18 Aug 2009 18:51:17 -0000	1.24
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 2888fafe63889757c6fd27ccc2f25661d43fd1a4
+commit 5e0d1cc74f119391a2c3ae25ef5749fc28674f06
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -12,10 +12,12 @@ archer-jankratochvil-vla
 archer-jankratochvil-misc
 archer-keiths-expr-cumulative
 archer-tromey-python
+archer-jankratochvil-fortran-module
+archer-jankratochvil-watchpoint
 
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index ccc4db8..496c9f2 100644
+index 9c2b9c7..032b0cf 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
 @@ -166,6 +166,13 @@ INTL_CFLAGS = @INCINTL@
@@ -70,7 +72,7 @@ index ccc4db8..496c9f2 100644
  	python/python-type.c \
  	python/python-utils.c \
  	python/python-value.c
-@@ -746,7 +769,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
+@@ -745,7 +768,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
  annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h	\
  remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
  sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
@@ -79,7 +81,7 @@ index ccc4db8..496c9f2 100644
  
  # Header files that already have srcdir in them, or which are in objdir.
  
-@@ -863,7 +886,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c \
+@@ -862,7 +885,7 @@ generated_files = config.h observer.h observer.inc ada-lex.c \
  	$(COMPILE) $<
  	$(POSTCOMPILE)
  
@@ -88,11 +90,11 @@ index ccc4db8..496c9f2 100644
  	@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
  .PHONY: all-tui
  all-tui: $(TUI)$(EXEEXT)
-@@ -1219,6 +1242,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -1218,6 +1241,12 @@ stamp-h: $(srcdir)/config.in config.status
  	  CONFIG_LINKS= \
  	  $(SHELL) config.status
  
-+.gdbinit: gdbinit.in config.status
++.gdbinit: $(srcdir)/gdbinit.in config.status
 +	CONFIG_FILES=".gdbinit:gdbinit.in" \
 +	  CONFIG_COMMANDS= \
 +	  CONFIG_HEADERS= \
@@ -101,7 +103,7 @@ index ccc4db8..496c9f2 100644
  config.status: $(srcdir)/configure configure.tgt configure.host
  	$(SHELL) config.status --recheck
  
-@@ -1918,6 +1947,14 @@ python.o: $(srcdir)/python/python.c
+@@ -1917,6 +1946,14 @@ python.o: $(srcdir)/python/python.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python.c
  	$(POSTCOMPILE)
  
@@ -116,7 +118,7 @@ index ccc4db8..496c9f2 100644
  python-cmd.o: $(srcdir)/python/python-cmd.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-cmd.c
  	$(POSTCOMPILE)
-@@ -1930,14 +1967,38 @@ python-function.o: $(srcdir)/python/python-function.c
+@@ -1929,14 +1966,38 @@ python-function.o: $(srcdir)/python/python-function.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-function.c
  	$(POSTCOMPILE)
  
@@ -155,7 +157,7 @@ index ccc4db8..496c9f2 100644
  python-type.o: $(srcdir)/python/python-type.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-type.c
  	$(POSTCOMPILE)
-@@ -1950,6 +2011,36 @@ python-value.o: $(srcdir)/python/python-value.c
+@@ -1949,6 +2010,36 @@ python-value.o: $(srcdir)/python/python-value.c
  	$(COMPILE) $(PYTHON_CFLAGS) $(srcdir)/python/python-value.c
  	$(POSTCOMPILE)
  
@@ -289,7 +291,7 @@ index 9b5d2c6..61676a9 100644
    ada_dump_subexp_body,
    ada_evaluate_subexp
 diff --git a/gdb/block.c b/gdb/block.c
-index 1889ecd..498e710 100644
+index 1889ecd..37fa342 100644
 --- a/gdb/block.c
 +++ b/gdb/block.c
 @@ -223,8 +223,9 @@ block_set_scope (struct block *block, const char *scope,
@@ -304,7 +306,11 @@ index 1889ecd..498e710 100644
  
  struct using_direct *
  block_using (const struct block *block)
-@@ -317,3 +318,21 @@ allocate_block (struct obstack *obstack)
+@@ -314,6 +315,25 @@ allocate_block (struct obstack *obstack)
+   BLOCK_SUPERBLOCK (bl) = NULL;
+   BLOCK_DICT (bl) = NULL;
+   BLOCK_NAMESPACE (bl) = NULL;
++  BLOCK_FORTRAN_USE (bl) = NULL;
  
    return bl;
  }
@@ -327,10 +333,34 @@ index 1889ecd..498e710 100644
 +  return SYMBOL_SYMTAB (func)->objfile;
 +}
 diff --git a/gdb/block.h b/gdb/block.h
-index 53e7371..8290adc 100644
+index 53e7371..d373f8a 100644
 --- a/gdb/block.h
 +++ b/gdb/block.h
-@@ -166,4 +166,6 @@ extern const struct block *block_global_block (const struct block *block);
+@@ -96,6 +96,15 @@ struct block
+     cplus_specific;
+   }
+   language_specific;
++
++  /* FIXME: It should be in the LANGUAGE_SPECIFIC region but the
++     BLOCK_NAMESPACE accessor is not protected by the C language check.  */
++
++  struct
++    {
++      struct fortran_using *use;
++    }
++  fortran_specific;
+ };
+ 
+ #define BLOCK_START(bl)		(bl)->startaddr
+@@ -104,6 +113,7 @@ struct block
+ #define BLOCK_SUPERBLOCK(bl)	(bl)->superblock
+ #define BLOCK_DICT(bl)		(bl)->dict
+ #define BLOCK_NAMESPACE(bl)   (bl)->language_specific.cplus_specific.namespace
++#define BLOCK_FORTRAN_USE(bl)	(bl)->fortran_specific.use
+ 
+ /* Macro to loop through all symbols in a block BL, in no particular
+    order.  ITER helps keep track of the iteration, and should be a
+@@ -166,4 +176,6 @@ extern const struct block *block_global_block (const struct block *block);
  
  extern struct block *allocate_block (struct obstack *obstack);
  
@@ -1718,26 +1748,30 @@ index 62800b8..97d587b 100644
  			{ $$ = $1.comp;
  			  if ($2) $$ = fill_comp (DEMANGLE_COMPONENT_LOCAL_NAME, $$, $2); }
 diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
-index d2d8f2e..cc259e7 100644
+index d2d8f2e..5805a30 100644
 --- a/gdb/cp-namespace.c
 +++ b/gdb/cp-namespace.c
-@@ -35,15 +35,7 @@
- static struct using_direct *cp_copy_usings (struct using_direct *using,
+@@ -36,14 +36,17 @@ static struct using_direct *cp_copy_usings (struct using_direct *using,
  					    struct obstack *obstack);
  
--static struct symbol *lookup_namespace_scope (const char *name,
+ static struct symbol *lookup_namespace_scope (const char *name,
 -					      const char *linkage_name,
--					      const struct block *block,
--					      const domain_enum domain,
--					      const char *scope,
--					      int scope_len);
--
+ 					      const struct block *block,
+ 					      const domain_enum domain,
+ 					      const char *scope,
+ 					      int scope_len);
+ 
++static struct symbol *cp_lookup_symbol_in_namespace (const char *namespace,
++                                                     const char *name,
++                                                     const struct block *block,
++                                                     const domain_enum domain);
++
  static struct symbol *lookup_symbol_file (const char *name,
 -					  const char *linkage_name,
  					  const struct block *block,
  					  const domain_enum domain,
  					  int anonymous_namespace);
-@@ -119,7 +111,7 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
+@@ -119,7 +122,7 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
  		 anonymous namespace.  So add symbols in it to the
  		 namespace given by the previous component if there is
  		 one, or to the global namespace if there isn't.  */
@@ -1746,7 +1780,7 @@ index d2d8f2e..cc259e7 100644
  	    }
  	  /* The "+ 2" is for the "::".  */
  	  previous_component = next_component + 2;
-@@ -134,7 +126,8 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
+@@ -134,7 +137,8 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
     has already been added, don't add it twice.  */
  
  void
@@ -1756,7 +1790,7 @@ index d2d8f2e..cc259e7 100644
[...4856 lines suppressed...]
+ char *
+ varobj_get_formatted_value (struct varobj *var,
+ 			    enum varobj_display_formats format)
+@@ -1159,6 +1279,115 @@ varobj_set_value (struct varobj *var, char *expression)
    return 1;
  }
  
@@ -26114,7 +26795,28 @@ index 4a94988..f2654f0 100644
  /* Assign a new value to a variable object.  If INITIAL is non-zero,
     this is the first assignement after the variable object was just
     created, or changed type.  In that case, just assign the value 
-@@ -1274,7 +1488,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1199,10 +1428,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+      that in C++ a reference is not rebindable, it cannot
+      meaningfully change.  So, get hold of the real value.  */
+   if (value)
+-    {
+-      value = coerce_ref (value);
+-      release_value (value);
+-    }
++    value = coerce_ref (value);
+ 
+   if (var->type && TYPE_CODE (var->type) == TYPE_CODE_UNION)
+     /* For unions, we need to fetch the value implicitly because
+@@ -1249,7 +1475,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+      values.  Don't get string rendering if the value is
+      lazy -- if it is, the code above has decided that the value
+      should not be fetched.  */
+-  if (value && !value_lazy (value))
++  if (value && !value_lazy (value) && !var->pretty_printer)
+     print_value = value_get_print_value (value, var->format, var);
+ 
+   /* If the type is changeable, compare the old and the new values.
+@@ -1265,7 +1491,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
  	{
  	  changed = 1;
  	}
@@ -26123,7 +26825,16 @@ index 4a94988..f2654f0 100644
  	{
  	  /* Try to compare the values.  That requires that both
  	     values are non-lazy.  */
-@@ -1328,65 +1542,32 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+@@ -1310,6 +1536,8 @@ install_new_value (struct varobj *var, struct value *value, int initial)
+   if (var->value != NULL && var->value != value)
+     value_free (var->value);
+   var->value = value;
++  if (value != NULL)
++    value_incref (value);
+   if (var->print_value)
+     xfree (var->print_value);
+   var->print_value = print_value;
+@@ -1319,65 +1547,32 @@ install_new_value (struct varobj *var, struct value *value, int initial)
      var->not_fetched = 0;
    var->updated = 0;
  
@@ -26206,7 +26917,7 @@ index 4a94988..f2654f0 100644
  }
  
  void 
-@@ -1404,31 +1585,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
+@@ -1395,31 +1590,19 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
    make_cleanup_py_decref (globals);
  
    constructor = PyRun_String (visualizer, Py_eval_input, globals, globals);
@@ -26219,9 +26930,9 @@ index 4a94988..f2654f0 100644
 -    }
 -  else
 -    pretty_printer = instantiate_pretty_printer (constructor, var->value);
- 
--  Py_XDECREF (constructor);
 -
+-  Py_XDECREF (constructor);
+ 
 -  if (! pretty_printer)
 +  if (! constructor)
      {
@@ -26244,7 +26955,7 @@ index 4a94988..f2654f0 100644
  
    do_cleanups (back_to);
  #else
-@@ -1543,7 +1712,7 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+@@ -1534,7 +1717,7 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
  	 UI, so we need not bother getting it.  */
        if (v->pretty_printer)
  	{
@@ -26253,7 +26964,7 @@ index 4a94988..f2654f0 100644
  	  int i, children_changed;
  	  varobj_p tmp;
  
-@@ -1555,28 +1724,28 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
+@@ -1546,28 +1729,28 @@ VEC(varobj_update_result) *varobj_update (struct varobj **varp, int explicit)
  
  	  /* If update_dynamic_varobj_children returns 0, then we have
  	     a non-conforming pretty-printer, so we skip it.  */
@@ -26294,7 +27005,7 @@ index 4a94988..f2654f0 100644
  	      continue;
  	    }
  	}
-@@ -1864,7 +2033,12 @@ new_variable (void)
+@@ -1855,7 +2038,12 @@ new_variable (void)
    var->frozen = 0;
    var->not_fetched = 0;
    var->children_requested = 0;
@@ -26307,7 +27018,7 @@ index 4a94988..f2654f0 100644
  
    return var;
  }
-@@ -1894,7 +2068,10 @@ free_variable (struct varobj *var)
+@@ -1885,7 +2073,10 @@ free_variable (struct varobj *var)
    if (var->pretty_printer)
      {
        struct cleanup *cleanup = varobj_ensure_python_env (var);
@@ -26319,7 +27030,7 @@ index 4a94988..f2654f0 100644
        do_cleanups (cleanup);
      }
  #endif
-@@ -1927,6 +2104,18 @@ make_cleanup_free_variable (struct varobj *var)
+@@ -1918,6 +2109,18 @@ make_cleanup_free_variable (struct varobj *var)
    return make_cleanup (do_free_variable_cleanup, var);
  }
  
@@ -26338,7 +27049,7 @@ index 4a94988..f2654f0 100644
  /* This returns the type of the variable. It also skips past typedefs
     to return the real type of the variable.
  
-@@ -2141,6 +2330,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
+@@ -2132,6 +2335,8 @@ value_of_root (struct varobj **var_handle, int *type_changed)
        else
  	{
  	  tmp_var->obj_name = xstrdup (var->obj_name);
@@ -26347,7 +27058,32 @@ index 4a94988..f2654f0 100644
  	  varobj_delete (var, NULL, 0);
  
  	  install_variable (tmp_var);
-@@ -3173,6 +3364,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+@@ -2166,7 +2371,11 @@ static char *
+ my_value_of_variable (struct varobj *var, enum varobj_display_formats format)
+ {
+   if (var->root->is_valid)
+-    return (*var->root->lang->value_of_variable) (var, format);
++    {
++      if (var->pretty_printer)
++	return value_get_print_value (var->value, var->format, var);
++      return (*var->root->lang->value_of_variable) (var, format);
++    }
+   else
+     return NULL;
+ }
+@@ -2954,10 +3163,7 @@ cplus_describe_child (struct varobj *parent, int index,
+ 	    *cname = xstrdup (TYPE_FIELD_NAME (type, index));
+ 
+ 	  if (cvalue && value)
+-	    {
+-	      *cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
+-	      release_value (*cvalue);
+-	    }
++	    *cvalue = value_cast (TYPE_FIELD_TYPE (type, index), value);
+ 
+ 	  if (ctype)
+ 	    {
+@@ -3163,6 +3369,19 @@ java_value_of_variable (struct varobj *var, enum varobj_display_formats format)
    return cplus_value_of_variable (var, format);
  }
  
@@ -26367,7 +27103,7 @@ index 4a94988..f2654f0 100644
  /* Iterate all the existing _root_ VAROBJs and call the FUNC callback for them
     with an arbitrary caller supplied DATA pointer.  */
  
-@@ -3190,6 +3394,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
+@@ -3180,6 +3399,43 @@ all_root_varobjs (void (*func) (struct varobj *var, void *data), void *data)
        (*func) (var_root->rootvar, data);
      }
  }
@@ -26412,7 +27148,7 @@ index 4a94988..f2654f0 100644
  extern void _initialize_varobj (void);
  void
 diff --git a/gdb/varobj.h b/gdb/varobj.h
-index 7297243..0744cc3 100644
+index 7297243..f43c593 100644
 --- a/gdb/varobj.h
 +++ b/gdb/varobj.h
 @@ -78,6 +78,12 @@ typedef struct varobj_update_result_t
@@ -26456,7 +27192,7 @@ index 7297243..0744cc3 100644
  
  extern char *varobj_get_type (struct varobj *var);
  
-@@ -149,6 +166,11 @@ extern int varobj_editable_p (struct varobj *var);
+@@ -149,6 +166,13 @@ extern int varobj_editable_p (struct varobj *var);
  
  extern int varobj_floating_p (struct varobj *var);
  
@@ -26467,6 +27203,8 @@ index 7297243..0744cc3 100644
 +extern void varobj_enable_pretty_printing (void);
 +
 +extern int varobj_has_more (struct varobj *var, int to);
++
++extern int varobj_pretty_printed_p (struct varobj *var);
  
  #endif /* VAROBJ_H */
 diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -p -r1.374 -r1.375
--- gdb.spec	12 Aug 2009 14:36:09 -0000	1.374
+++ gdb.spec	18 Aug 2009 18:51:17 -0000	1.375
@@ -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.50.20090811
+Version: 6.8.50.20090818
 
 # 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: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -218,8 +218,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.20090811 snapshot fixups.
-#Patch232: gdb-6.8.50.20090811-upstream.patch
+# Backported post gdb-6.8.50.20090818 snapshot fixups.
+#Patch232: gdb-6.8.50.20090818-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -265,11 +265,6 @@ Patch271: gdb-6.5-bz243845-stale-testing
 Patch274: gdb-6.6-buildid-locate.patch
 Patch353: gdb-6.6-buildid-locate-rpm.patch
 
-# Fix hardware watchpoints after inferior forks-off some process.
-# Threaded `set follow-fork-mode child' still not fixed there, glibc fixes reqd.
-# `set detach-on-fork off' not fixed there in general - it already assert-fails.
-Patch280: gdb-6.6-multifork-debugreg.patch
-
 # Fix displaying of numeric char arrays as strings (BZ 224128).
 Patch282: gdb-6.7-charsign-test.patch
 
@@ -521,7 +516,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch271 -p1
 %patch274 -p1
 %patch353 -p1
-%patch280 -p1
 %patch282 -p1
 %patch284 -p1
 %patch287 -p1
@@ -827,6 +821,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-1
+- Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090818
+- archer-jankratochvil-fedora12 commit: 5e0d1cc74f119391a2c3ae25ef5749fc28674f06
+
 * Wed Aug 12 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090811-4
 - Fix minor regressions introduced by the rebase from F-11 (6.8.50.20090302).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	11 Aug 2009 14:42:47 -0000	1.34
+++ sources	18 Aug 2009 18:51:17 -0000	1.35
@@ -1 +1 @@
-f3e0cfce127982d0f14777188d8fa4c5  gdb-6.8.50.20090811.tar.bz2
+63d848cfdd9a43a9b2b412a220d00366  gdb-6.8.50.20090818.tar.bz2


--- gdb-6.6-multifork-debugreg.patch DELETED ---



From cweyl at fedoraproject.org  Tue Aug 18 18:56:55 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 18:56:55 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/devel .cvsignore, 1.3,
	1.4 perl-DateTime-Format-Pg.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090818185655.01A8511C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27883

Modified Files:
	.cvsignore perl-DateTime-Format-Pg.spec sources 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16004-1
- auto-update to 0.16004 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new req on perl(DateTime) (version 0.10)
- added a new req on perl(DateTime::Format::Builder) (version 0.72)
- added a new req on perl(DateTime::TimeZone) (version 0.05)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Apr 2009 07:24:38 -0000	1.3
+++ .cvsignore	18 Aug 2009 18:56:54 -0000	1.4
@@ -1 +1 @@
-DateTime-Format-Pg-0.16003.tar.gz
+DateTime-Format-Pg-0.16004.tar.gz


Index: perl-DateTime-Format-Pg.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/perl-DateTime-Format-Pg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-DateTime-Format-Pg.spec	26 Jul 2009 05:38:29 -0000	1.5
+++ perl-DateTime-Format-Pg.spec	18 Aug 2009 18:56:54 -0000	1.6
@@ -1,11 +1,11 @@
 Name:           perl-DateTime-Format-Pg
-Version:        0.16003
-Release:        2%{?dist}
+Version:        0.16004
+Release:        1%{?dist}
 Summary:        Parse and format PostgreSQL dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime-Format-Pg/
-Source0:        http://www.cpan.org/authors/id/D/DM/DMAKI/DateTime-Format-Pg-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DM/DMAKI/DateTime-Format-Pg-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -13,7 +13,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 BuildRequires:  perl(DateTime)                  >= 0.10
 BuildRequires:  perl(DateTime::Format::Builder) >= 0.72
 BuildRequires:  perl(DateTime::TimeZone)        >= 0.05
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 # tests
 BuildRequires:  perl(Test::More)
 # optional tests
@@ -24,6 +24,11 @@ BuildRequires:  perl(Test::Pod::Coverage
 #Requires:       perl(DateTime::Format::Builder) >= 0.72
 #Requires:       perl(DateTime::TimeZone) >= 0.05
 
+### auto-added reqs!
+Requires:       perl(DateTime) >= 0.10
+Requires:       perl(DateTime::Format::Builder) >= 0.72
+Requires:       perl(DateTime::TimeZone) >= 0.05
+
 %description
 This module understands the formats used by PostgreSQL for its DATE, TIME,
 TIMESTAMP, and INTERVAL data types. It can be used to parse these formats
@@ -65,6 +70,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16004-1
+- auto-update to 0.16004 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(DateTime) (version 0.10)
+- added a new req on perl(DateTime::Format::Builder) (version 0.72)
+- added a new req on perl(DateTime::TimeZone) (version 0.05)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16003-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Apr 2009 07:24:38 -0000	1.3
+++ sources	18 Aug 2009 18:56:54 -0000	1.4
@@ -1 +1 @@
-160b19e83e304ec077f4f12f39f65d57  DateTime-Format-Pg-0.16003.tar.gz
+50421a0de9321bd3462f9e755878531e  DateTime-Format-Pg-0.16004.tar.gz



From cweyl at fedoraproject.org  Tue Aug 18 18:57:32 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 18:57:32 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Pg/F-11 perl-DateTime-Format-Pg.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090818185732.9813E11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Pg/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28171

Modified Files:
	perl-DateTime-Format-Pg.spec sources 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16004-1
- auto-update to 0.16004 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new req on perl(DateTime) (version 0.10)
- added a new req on perl(DateTime::Format::Builder) (version 0.72)
- added a new req on perl(DateTime::TimeZone) (version 0.05)



Index: perl-DateTime-Format-Pg.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-11/perl-DateTime-Format-Pg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-DateTime-Format-Pg.spec	2 Apr 2009 07:24:38 -0000	1.4
+++ perl-DateTime-Format-Pg.spec	18 Aug 2009 18:57:32 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           perl-DateTime-Format-Pg
-Version:        0.16003
+Version:        0.16004
 Release:        1%{?dist}
 Summary:        Parse and format PostgreSQL dates and times
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime-Format-Pg/
-Source0:        http://www.cpan.org/authors/id/D/DM/DMAKI/DateTime-Format-Pg-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DM/DMAKI/DateTime-Format-Pg-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -13,7 +13,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 BuildRequires:  perl(DateTime)                  >= 0.10
 BuildRequires:  perl(DateTime::Format::Builder) >= 0.72
 BuildRequires:  perl(DateTime::TimeZone)        >= 0.05
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 # tests
 BuildRequires:  perl(Test::More)
 # optional tests
@@ -24,6 +24,11 @@ BuildRequires:  perl(Test::Pod::Coverage
 #Requires:       perl(DateTime::Format::Builder) >= 0.72
 #Requires:       perl(DateTime::TimeZone) >= 0.05
 
+### auto-added reqs!
+Requires:       perl(DateTime) >= 0.10
+Requires:       perl(DateTime::Format::Builder) >= 0.72
+Requires:       perl(DateTime::TimeZone) >= 0.05
+
 %description
 This module understands the formats used by PostgreSQL for its DATE, TIME,
 TIMESTAMP, and INTERVAL data types. It can be used to parse these formats
@@ -65,6 +70,16 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16004-1
+- auto-update to 0.16004 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new req on perl(DateTime) (version 0.10)
+- added a new req on perl(DateTime::Format::Builder) (version 0.72)
+- added a new req on perl(DateTime::TimeZone) (version 0.05)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16003-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16003-1
 - update to 0.16003
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Pg/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Apr 2009 07:24:38 -0000	1.3
+++ sources	18 Aug 2009 18:57:32 -0000	1.4
@@ -1 +1 @@
-160b19e83e304ec077f4f12f39f65d57  DateTime-Format-Pg-0.16003.tar.gz
+50421a0de9321bd3462f9e755878531e  DateTime-Format-Pg-0.16004.tar.gz



From mbarnes at fedoraproject.org  Tue Aug 18 19:01:04 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 18 Aug 2009 19:01:04 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.13,
	1.116.2.14 evolution.spec, 
	1.394.2.25, 1.394.2.26 sources, 1.116.2.17, 1.116.2.18
Message-ID: <20090818190104.CDB1111C00D7@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29090

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Tue Aug 18 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-3.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit 0cc0035.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.13
retrieving revision 1.116.2.14
diff -u -p -r1.116.2.13 -r1.116.2.14
--- .cvsignore	12 Aug 2009 02:08:38 -0000	1.116.2.13
+++ .cvsignore	18 Aug 2009 19:01:04 -0000	1.116.2.14
@@ -1 +1 @@
-evolution-2.27.90-kill-bonobo-26072c8.tar.bz2
+evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.25
retrieving revision 1.394.2.26
diff -u -p -r1.394.2.25 -r1.394.2.26
--- evolution.spec	12 Aug 2009 10:37:43 -0000	1.394.2.25
+++ evolution.spec	18 Aug 2009 19:01:04 -0000	1.394.2.26
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 26072c8
+%define hash 0cc0035
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.27.90
-Release: 2.kb.1%{?dist}
+Release: 3.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Aug 18 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-3.kb.1.fc12
+- Snapshot of "kill-bonobo" branch at commit 0cc0035.
+
 * Tue Aug 11 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-2.kb.1.fc12
 - Snapshot of "kill-bonobo" branch at commit 26072c8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.17
retrieving revision 1.116.2.18
diff -u -p -r1.116.2.17 -r1.116.2.18
--- sources	12 Aug 2009 02:08:38 -0000	1.116.2.17
+++ sources	18 Aug 2009 19:01:04 -0000	1.116.2.18
@@ -1 +1 @@
-8713138264a2a82b8a749ebb26ba2f06  evolution-2.27.90-kill-bonobo-26072c8.tar.bz2
+8354380b462d71b8c28a937a74588e18  evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2



From tmraz at fedoraproject.org  Tue Aug 18 19:03:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 18 Aug 2009 19:03:09 +0000 (UTC)
Subject: rpms/ipsec-tools/devel ipsec-tools-0.7.3-aliasing.patch, NONE,
	1.1 ipsec-tools.spec, 1.66, 1.67 ipsec-tools-0.7.2-review.patch,
	1.1, NONE
Message-ID: <20090818190309.7DC6D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29594

Modified Files:
	ipsec-tools.spec 
Added Files:
	ipsec-tools-0.7.3-aliasing.patch 
Removed Files:
	ipsec-tools-0.7.2-review.patch 
Log Message:
* Tue Aug 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-1
- update to a new upstream version
- fix service stop in preun (#515880)


ipsec-tools-0.7.3-aliasing.patch:
 ipsec_doi.c |   74 +++++++++++++++++++++++++-----------------------------------
 isakmp.c    |   27 ++++++++-------------
 sockmisc.c  |   35 +++++++++++++---------------
 sockmisc.h  |   12 +++++----
 4 files changed, 66 insertions(+), 82 deletions(-)

--- NEW FILE ipsec-tools-0.7.3-aliasing.patch ---
diff -up ipsec-tools-0.7.3/src/racoon/ipsec_doi.c.review ipsec-tools-0.7.3/src/racoon/ipsec_doi.c
--- ipsec-tools-0.7.3/src/racoon/ipsec_doi.c.review	2009-06-19 09:32:52.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/ipsec_doi.c	2009-08-18 20:59:00.000000000 +0200
@@ -750,7 +750,7 @@ t2isakmpsa(trns, sa)
 			int error = -1;
 			iconv_t cd = (iconv_t) -1;
 			size_t srcleft, dstleft, rv;
-			__iconv_const char *src;
+			char *src;
 			char *dst;
 			int len = ntohs(d->lorv);
 
@@ -799,13 +799,13 @@ t2isakmpsa(trns, sa)
 				goto out;
 			}
 
-			src = (__iconv_const char *)(d + 1);
+			src = (char *)(d + 1);
 			srcleft = len;
 
 			dst = sa->gssid->v;
 			dstleft = len / 2;
 
-			rv = iconv(cd, (__iconv_const char **)&src, &srcleft, 
+			rv = iconv(cd, &src, &srcleft, 
 				   &dst, &dstleft);
 			if (rv != 0) {
 				if (rv == -1) {
@@ -2880,7 +2880,7 @@ setph1attr(sa, buf)
 			} else {
 				size_t dstleft = sa->gssid->l * 2;
 				size_t srcleft = sa->gssid->l;
-				const char *src = (const char *)sa->gssid->v;
+				char *src = (char *)sa->gssid->v;
 				char *odst, *dst = racoon_malloc(dstleft);
 				iconv_t cd;
 				size_t rv;
@@ -2896,7 +2896,7 @@ setph1attr(sa, buf)
 					goto gssid_done;
 				}
 				odst = dst;
-				rv = iconv(cd, (__iconv_const char **)&src, 
+				rv = iconv(cd, &src, 
 				    &srcleft, &dst, &dstleft);
 				if (rv != 0) {
 					if (rv == -1) {
@@ -4381,29 +4381,20 @@ ipsecdoi_id2str(id)
 	char *dat;
 	static char buf[BUFLEN];
 	struct ipsecdoi_id_b *id_b = (struct ipsecdoi_id_b *)id->v;
-	struct sockaddr_storage saddr_storage;
-	struct sockaddr        *saddr;
-	struct sockaddr_in     *saddr_in;
-	struct sockaddr_in6    *saddr_in6;
+	union allsaddr saddr;
 	u_int plen = 0;
 
-	saddr     = (struct sockaddr *)&saddr_storage;
-	saddr_in  = (struct sockaddr_in *)&saddr_storage;
-	saddr_in6 = (struct sockaddr_in6 *)&saddr_storage;
-
-	
 	switch (id_b->type) {
 	case IPSECDOI_ID_IPV4_ADDR:
 	case IPSECDOI_ID_IPV4_ADDR_SUBNET:
 	case IPSECDOI_ID_IPV4_ADDR_RANGE:
 
 #ifndef __linux__
-		saddr->sa_len = sizeof(struct sockaddr_in);
+		saddr.sa.sa_len = sizeof(struct sockaddr_in);
 #endif
-		saddr->sa_family = AF_INET;
-
-		saddr_in->sin_port = IPSEC_PORT_ANY;
-		memcpy(&saddr_in->sin_addr,
+		saddr.sa.sa_family = AF_INET;
+		saddr.sin.sin_port = IPSEC_PORT_ANY;
+		memcpy(&saddr.sin.sin_addr,
 			id->v + sizeof(*id_b), sizeof(struct in_addr));
 		break;
 #ifdef INET6
@@ -4412,15 +4403,14 @@ ipsecdoi_id2str(id)
 	case IPSECDOI_ID_IPV6_ADDR_RANGE:
 
 #ifndef __linux__
-		saddr->sa_len = sizeof(struct sockaddr_in6);
+		saddr.sa.sa_len = sizeof(struct sockaddr_in6);
 #endif
-		saddr->sa_family = AF_INET6;
-
-		saddr_in6->sin6_port = IPSEC_PORT_ANY;
-		memcpy(&saddr_in6->sin6_addr,
+		saddr.sa.sa_family = AF_INET6;
+		saddr.sin6.sin6_port = IPSEC_PORT_ANY;
+		memcpy(&saddr.sin6.sin6_addr,
 			id->v + sizeof(*id_b), sizeof(struct in6_addr));
-		saddr_in6->sin6_scope_id =
-			(IN6_IS_ADDR_LINKLOCAL(&saddr_in6->sin6_addr)
+		saddr.sin6.sin6_scope_id =
+			(IN6_IS_ADDR_LINKLOCAL(&saddr.sin6.sin6_addr)
 				? ((struct sockaddr_in6 *)id_b)->sin6_scope_id
 				: 0);
 		break;
@@ -4432,7 +4422,7 @@ ipsecdoi_id2str(id)
 #ifdef INET6
 	case IPSECDOI_ID_IPV6_ADDR:
 #endif
-		len = snprintf( buf, BUFLEN, "%s", saddrwop2str(saddr));
+		len = snprintf( buf, BUFLEN, "%s", saddrwop2str(&saddr.sa));
 		break;
 
 	case IPSECDOI_ID_IPV4_ADDR_SUBNET:
@@ -4488,46 +4478,46 @@ ipsecdoi_id2str(id)
 			plen += l;
 		}
 
-		len = snprintf( buf, BUFLEN, "%s/%i", saddrwop2str(saddr), plen);
+		len = snprintf( buf, BUFLEN, "%s/%i", saddrwop2str(&saddr.sa), plen);
 	    }
 		break;
 
 	case IPSECDOI_ID_IPV4_ADDR_RANGE:
 
-		len = snprintf( buf, BUFLEN, "%s-", saddrwop2str(saddr));
+		len = snprintf( buf, BUFLEN, "%s-", saddrwop2str(&saddr.sa));
 
 #ifndef __linux__
-		saddr->sa_len = sizeof(struct sockaddr_in);
+		saddr.sa.sa_len = sizeof(struct sockaddr_in);
 #endif
-		saddr->sa_family = AF_INET;
-		saddr_in->sin_port = IPSEC_PORT_ANY;
-		memcpy(&saddr_in->sin_addr,
+		saddr.sa.sa_family = AF_INET;
+		saddr.sin.sin_port = IPSEC_PORT_ANY;
+		memcpy(&saddr.sin.sin_addr,
 			id->v + sizeof(*id_b) + sizeof(struct in_addr),
 			sizeof(struct in_addr));
 
-		len += snprintf( buf + len, BUFLEN - len, "%s", saddrwop2str(saddr));
+		len += snprintf( buf + len, BUFLEN - len, "%s", saddrwop2str(&saddr.sa));
 
 		break;
 
 #ifdef INET6
 	case IPSECDOI_ID_IPV6_ADDR_RANGE:
 
-		len = snprintf( buf, BUFLEN, "%s-", saddrwop2str(saddr));
+		len = snprintf( buf, BUFLEN, "%s-", saddrwop2str(&saddr.sa));
 
 #ifndef __linux__
-		saddr->sa_len = sizeof(struct sockaddr_in6);
+		saddr.sa.sa_len = sizeof(struct sockaddr_in6);
 #endif
-		saddr->sa_family = AF_INET6;
-		saddr_in6->sin6_port = IPSEC_PORT_ANY;
-		memcpy(&saddr_in6->sin6_addr,
+		saddr.sa.sa_family = AF_INET6;
+		saddr.sin6.sin6_port = IPSEC_PORT_ANY;
+		memcpy(&saddr.sin6.sin6_addr,
 			id->v + sizeof(*id_b) + sizeof(struct in6_addr),
 			sizeof(struct in6_addr));
-		saddr_in6->sin6_scope_id =
-			(IN6_IS_ADDR_LINKLOCAL(&saddr_in6->sin6_addr)
+		saddr.sin6.sin6_scope_id =
+			(IN6_IS_ADDR_LINKLOCAL(&saddr.sin6.sin6_addr)
 				? ((struct sockaddr_in6 *)id_b)->sin6_scope_id
 				: 0);
 
-		len += snprintf( buf + len, BUFLEN - len, "%s", saddrwop2str(saddr));
+		len += snprintf( buf + len, BUFLEN - len, "%s", saddrwop2str(&saddr.sa));
 
 		break;
 #endif
diff -up ipsec-tools-0.7.3/src/racoon/isakmp.c.review ipsec-tools-0.7.3/src/racoon/isakmp.c
--- ipsec-tools-0.7.3/src/racoon/isakmp.c.review	2009-08-18 19:02:21.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/isakmp.c	2009-08-18 19:02:21.000000000 +0200
@@ -198,13 +198,15 @@ isakmp_handler(so_isakmp)
 	union {
 		char		buf[sizeof (isakmp) + 4];
 		u_int32_t	non_esp[2];
-		char		lbuf[sizeof(struct udphdr) + 
+		struct		{
+				     struct udphdr udp;
 #ifdef __linux
-				     sizeof(struct iphdr) + 
+				     struct iphdr ip;
 #else
-				     sizeof(struct ip) + 
+				     struct ip ip;
 #endif
-				     sizeof(isakmp) + 4];
+				     char buf[sizeof(isakmp) + 4];
+				} lbuf;
 	} x;
 	struct sockaddr_storage remote;
 	struct sockaddr_storage local;
@@ -240,22 +242,13 @@ isakmp_handler(so_isakmp)
 
 	/* Lucent IKE in UDP encapsulation */
 	{
-		struct udphdr *udp;
 #ifdef __linux__
-		struct iphdr *ip;
-
-		udp = (struct udphdr *)&x.lbuf[0];
-		if (ntohs(udp->dest) == 501) {
-			ip = (struct iphdr *)(x.lbuf + sizeof(*udp));
-			extralen += sizeof(*udp) + ip->ihl;
+		if (ntohs(x.lbuf.udp.dest) == 501) {
+			extralen += sizeof(x.lbuf.udp) + x.lbuf.ip.ihl;
 		}
 #else
-		struct ip *ip;
-
-		udp = (struct udphdr *)&x.lbuf[0];
-		if (ntohs(udp->uh_dport) == 501) {
-			ip = (struct ip *)(x.lbuf + sizeof(*udp));
-			extralen += sizeof(*udp) + ip->ip_hl;
+		if (ntohs(lbuf.udp.uh_dport) == 501) {
+			extralen += sizeof(x.lbuf.udp) + x.lbuf.ip.ip_hl;
 		}
 #endif
 	}	
diff -up ipsec-tools-0.7.3/src/racoon/sockmisc.c.review ipsec-tools-0.7.3/src/racoon/sockmisc.c
--- ipsec-tools-0.7.3/src/racoon/sockmisc.c.review	2007-08-01 13:52:22.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/sockmisc.c	2009-08-18 19:02:21.000000000 +0200
@@ -317,8 +317,9 @@ recvfromto(s, buf, buflen, flags, from, 
 	u_int *tolen;
 {
 	int otolen;
-	u_int len;
-	struct sockaddr_storage ss;
+	socklen_t slen;
+	int len;
+	union allsaddr sa;
 	struct msghdr m;
 	struct cmsghdr *cm;
 	struct iovec iov[2];
@@ -331,8 +332,8 @@ recvfromto(s, buf, buflen, flags, from, 
 	struct sockaddr_in6 *sin6;
 #endif
 
-	len = sizeof(ss);
-	if (getsockname(s, (struct sockaddr *)&ss, &len) < 0) {
+	slen = sizeof(sa);
+	if (getsockname(s, &sa.sa, &slen) < 0) {
 		plog(LLV_ERROR, LOCATION, NULL,
 			"getsockname (%s)\n", strerror(errno));
 		return -1;
@@ -365,7 +366,7 @@ recvfromto(s, buf, buflen, flags, from, 
 			"cmsg %d %d\n", cm->cmsg_level, cm->cmsg_type);)
 #endif
 #if defined(INET6) && defined(INET6_ADVAPI)
-		if (ss.ss_family == AF_INET6
+		if (sa.sa.sa_family == AF_INET6
 		 && cm->cmsg_level == IPPROTO_IPV6
 		 && cm->cmsg_type == IPV6_PKTINFO
 		 && otolen >= sizeof(*sin6)) {
@@ -384,14 +385,13 @@ recvfromto(s, buf, buflen, flags, from, 
 				sin6->sin6_scope_id = pi->ipi6_ifindex;
 			else
 				sin6->sin6_scope_id = 0;
-			sin6->sin6_port =
-				((struct sockaddr_in6 *)&ss)->sin6_port;
+			sin6->sin6_port = sa.sin6.sin6_port;
 			otolen = -1;	/* "to" already set */
 			continue;
 		}
 #endif
 #ifdef __linux__
-		if (ss.ss_family == AF_INET
+		if (sa.sa.sa_family == AF_INET
 		 && cm->cmsg_level == IPPROTO_IP
 		 && cm->cmsg_type == IP_PKTINFO
 		 && otolen >= sizeof(sin)) {
@@ -402,14 +402,13 @@ recvfromto(s, buf, buflen, flags, from, 
 			sin->sin_family = AF_INET;
 			memcpy(&sin->sin_addr, &pi->ipi_addr,
 				sizeof(sin->sin_addr));
-			sin->sin_port =
-				((struct sockaddr_in *)&ss)->sin_port;
+			sin->sin_port = sa.sin.sin_port;
 			otolen = -1;	/* "to" already set */
 			continue;
 		}
 #endif
 #if defined(INET6) && defined(IPV6_RECVDSTADDR)
-		if (ss.ss_family == AF_INET6
+		if (sa.sa.sa_family == AF_INET6
 		      && cm->cmsg_level == IPPROTO_IPV6
 		      && cm->cmsg_type == IPV6_RECVDSTADDR
 		      && otolen >= sizeof(*sin6)) {
@@ -420,14 +419,13 @@ recvfromto(s, buf, buflen, flags, from, 
 			sin6->sin6_len = sizeof(*sin6);
 			memcpy(&sin6->sin6_addr, CMSG_DATA(cm),
 				sizeof(sin6->sin6_addr));
-			sin6->sin6_port =
-				((struct sockaddr_in6 *)&ss)->sin6_port;
+			sin6->sin6_port = sa.sin6.sin6_port;
 			otolen = -1;	/* "to" already set */
 			continue;
 		}
 #endif
 #ifndef __linux__
-		if (ss.ss_family == AF_INET
+		if (sa.sa.sa_family == AF_INET
 		 && cm->cmsg_level == IPPROTO_IP
 		 && cm->cmsg_type == IP_RECVDSTADDR
 		 && otolen >= sizeof(*sin)) {
@@ -438,7 +436,7 @@ recvfromto(s, buf, buflen, flags, from, 
 			sin->sin_len = sizeof(*sin);
 			memcpy(&sin->sin_addr, CMSG_DATA(cm),
 				sizeof(sin->sin_addr));
-			sin->sin_port = ((struct sockaddr_in *)&ss)->sin_port;
+			sin->sin_port = sa.sin.sin_port;
 			otolen = -1;	/* "to" already set */
 			continue;
 		}
@@ -458,7 +456,8 @@ sendfromto(s, buf, buflen, src, dst, cnt
 	struct sockaddr *dst;
 {
 	struct sockaddr_storage ss;
-	u_int len;
+	socklen_t slen;
+	int len = 0;
 	int i;
 
 	if (src->sa_family != dst->sa_family) {
@@ -467,8 +466,8 @@ sendfromto(s, buf, buflen, src, dst, cnt
 		return -1;
 	}
 
-	len = sizeof(ss);
-	if (getsockname(s, (struct sockaddr *)&ss, &len) < 0) {
+	slen = sizeof(ss);
+	if (getsockname(s, (struct sockaddr *)&ss, &slen) < 0) {
 		plog(LLV_ERROR, LOCATION, NULL,
 			"getsockname (%s)\n", strerror(errno));
 		return -1;
diff -up ipsec-tools-0.7.3/src/racoon/sockmisc.h.review ipsec-tools-0.7.3/src/racoon/sockmisc.h
--- ipsec-tools-0.7.3/src/racoon/sockmisc.h.review	2006-09-09 18:22:10.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/sockmisc.h	2009-08-18 19:02:21.000000000 +0200
@@ -34,12 +34,14 @@
 #ifndef _SOCKMISC_H
 #define _SOCKMISC_H
 
+union allsaddr {
+	struct sockaddr sa;
+	struct sockaddr_in sin;
+	struct sockaddr_in6 sin6;
+};
+
 struct netaddr {
-	union {
-		struct sockaddr sa;
-		struct sockaddr_in sin;
-		struct sockaddr_in6 sin6;
-	} sa;
+	union allsaddr sa;
 	unsigned long prefix;
 };
 


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- ipsec-tools.spec	25 Jul 2009 03:32:20 -0000	1.66
+++ ipsec-tools.spec	18 Aug 2009 19:03:09 -0000	1.67
@@ -1,6 +1,6 @@
 Name: ipsec-tools
-Version: 0.7.2
-Release: 3%{?dist}
+Version: 0.7.3
+Release: 1%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -20,7 +20,7 @@ Patch10: ipsec-tools-0.7.2-natt-linux.pa
 Patch11: ipsec-tools-0.7.1-pie.patch
 Patch13: ipsec-tools-0.7.1-dpd-fixes.patch
 Patch14: ipsec-tools-0.7.2-moreleaks.patch
-Patch15: ipsec-tools-0.7.2-review.patch
+Patch15: ipsec-tools-0.7.3-aliasing.patch
 Patch16: ipsec-tools-0.7.2-nodevel.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
@@ -101,7 +101,7 @@ fi
 
 %preun
 if [ $1 = 0 ]; then
-        service %{name} stop > /dev/null 2>&1
+        service racoon stop > /dev/null 2>&1
         /sbin/chkconfig --del racoon
 fi
 
@@ -123,6 +123,10 @@ fi
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Tue Aug 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-1
+- update to a new upstream version
+- fix service stop in preun (#515880)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- ipsec-tools-0.7.2-review.patch DELETED ---



From rdieter at fedoraproject.org  Tue Aug 18 19:06:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 18 Aug 2009 19:06:42 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.15, 1.16 sources, 1.9,
	1.10 kde-plasma-networkmanagement-0.1-version-check.patch, 1.1, NONE
Message-ID: <20090818190642.7F61011C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31064

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Removed Files:
	kde-plasma-networkmanagement-0.1-version-check.patch 
Log Message:
* Sat Aug 15 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.20.20090815svn
- New snapshot
- optimize scriptlets
- -libs subpkg, multilib-friendly



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kde-plasma-networkmanagement.spec	27 Jul 2009 14:15:30 -0000	1.15
+++ kde-plasma-networkmanagement.spec	18 Aug 2009 19:06:42 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           kde-plasma-networkmanagement
 Version:        0.1
-Release:        0.19.20090726svn%{?dist}
+Release:        0.20.20090815svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          User Interface/Desktops
@@ -8,20 +8,22 @@ License:        (GPLv2 or GPLv3) and GPL
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1002781 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
+#  svn export -r 1011744 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
 #  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:         %{name}-%{version}-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-experimental-devel
-BuildRequires:  kdebase-workspace-devel >= 4.2.98
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
 
 # manual dep, until something better comes along -- Rex
 Requires: NetworkManager
 
+Obsoletes: kde-plasma-networkmanagement < 0.1-20
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 Obsoletes:      kde-plasma-networkmanager < %{version}-%{release}
 Provides:       kde-plasma-networkmanager = %{version}-%{release}
 %if 0%{?fedora} > 10
@@ -34,10 +36,19 @@ A Plasma applet to control your wired an
 the default NetworkManager service. This is alpha software with known issues.
 We still recommend nm-applet from NetworkManager-gnome for production use.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%description libs
+%{summary}.
+
+
 %package devel
 Summary:        Files needed to develop programs which use the Network Manager plasmoid
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       kdebase-workspace-devel
 Requires:       NetworkManager-glib-devel
 
@@ -86,7 +97,6 @@ Provides:       knetworkmanager-vpnc = 1
 
 %prep
 %setup -q
-%patch0
 
 
 %build
@@ -94,7 +104,7 @@ 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
@@ -107,13 +117,25 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 
 %files
@@ -122,27 +144,33 @@ xdg-icon-resource forceupdate --theme ox
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
 %{_kde4_libdir}/kde4/kcm_networkmanagement.so
 %{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/networkmanagement_pptpui.so
 %{_kde4_libdir}/kde4/plasma_applet_networkmanagement.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
 %{_kde4_libexecdir}/networkmanagement_configshell
-%{_kde4_iconsdir}/*/*/*/*.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/networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
 %{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.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 libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libknmclient.so.4*
+%{_kde4_libdir}/libknminternals.so.4*
+%{_kde4_libdir}/libknmservice.so.4*
+%{_kde4_libdir}/libknmui.so.4*
+
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libknmclient.so
@@ -162,6 +190,11 @@ xdg-icon-resource forceupdate --theme ox
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Jul 2009 14:03:20 -0000	1.9
+++ sources	18 Aug 2009 19:06:42 -0000	1.10
@@ -1 +1 @@
-4cfec4d31d38b62e2874334cedc97e58  kde-plasma-networkmanagement-0.1.tar.bz2
+8a072d778cda60990c4670d85cad2f0c  kde-plasma-networkmanagement-0.1.tar.bz2


--- kde-plasma-networkmanagement-0.1-version-check.patch DELETED ---



From jkratoch at fedoraproject.org  Tue Aug 18 19:10:33 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 18 Aug 2009 19:10:33 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.5-bz190810-gdbserver-arch-advice.patch, 1.4,
	1.5 gdb-6.6-buildid-locate.patch, 1.24, 1.25 gdb.spec, 1.375, 1.376
Message-ID: <20090818191033.A952211C04D1@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31865

Modified Files:
	gdb-6.5-bz190810-gdbserver-arch-advice.patch 
	gdb-6.6-buildid-locate.patch gdb.spec 
Log Message:
* Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-2
- Fix patch fuzz 0.


gdb-6.5-bz190810-gdbserver-arch-advice.patch:
 remote.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: gdb-6.5-bz190810-gdbserver-arch-advice.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz190810-gdbserver-arch-advice.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdb-6.5-bz190810-gdbserver-arch-advice.patch	14 Dec 2008 14:05:16 -0000	1.4
+++ gdb-6.5-bz190810-gdbserver-arch-advice.patch	18 Aug 2009 19:10:33 -0000	1.5
@@ -7,23 +7,22 @@ https://bugzilla.redhat.com/bugzilla/sho
 	(remote_async_wait): Likewise.
 
 
-Index: gdb-6.8.50.20081128/gdb/remote.c
+Index: gdb-6.8.50.20090818/gdb/remote.c
 ===================================================================
---- gdb-6.8.50.20081128.orig/gdb/remote.c	2008-12-09 16:59:51.000000000 +0100
-+++ gdb-6.8.50.20081128/gdb/remote.c	2008-12-09 17:00:04.000000000 +0100
-@@ -4329,8 +4329,13 @@ Packet: '%s'\n"),
- 		VEC_safe_push (cached_reg_t, event->regcache, &cached_reg);
- 	      }
+--- gdb-6.8.50.20090818.orig/gdb/remote.c	2009-08-18 21:00:35.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/remote.c	2009-08-18 21:04:46.000000000 +0200
+@@ -4408,8 +4408,13 @@ Packet: '%s'\n"),
+ 	      VEC_safe_push (cached_reg_t, event->regcache, &cached_reg);
+ 	    }
  
--	    if (*p != ';')
--	      error (_("Remote register badly formatted: %s\nhere: %s"),
-+	    /* It may also occur on amd64 which defaults to 32-bit i386
-+	       target.  gdbserver(1) is not aware of the `set architecture'
-+	       name itself as it is not using libbfd.  */
-+	    if (*p != ';')
-+	      error (_("Remote register badly formatted: %s\nhere: %s"
-+		       "\nTry to load the executable by `file' first,"
-+		       "\nyou may also check `set/show architecture'."),
- 		     buf, p);
- 	    ++p;
- 	  }
++	  /* It may also occur on amd64 which defaults to 32-bit i386
++	     target.  gdbserver(1) is not aware of the `set architecture'
++	     name itself as it is not using libbfd.  */
+ 	  if (*p != ';')
+-	    error (_("Remote register badly formatted: %s\nhere: %s"),
++	    error (_("Remote register badly formatted: %s\nhere: %s"
++		     "\nTry to load the executable by `file' first,"
++		     "\nyou may also check `set/show architecture'."),
+ 		   buf, p);
+ 	  ++p;
+ 	}

gdb-6.6-buildid-locate.patch:
 corelow.c                    |   61 ++++
 doc/gdb.texinfo              |   21 +
 solib-svr4.c                 |   30 +-
 symfile.c                    |  637 +++++++++++++++++++++++++++++++++++++++----
 symfile.h                    |    7 
 testsuite/lib/gdb.exp        |   10 
 testsuite/lib/mi-support.exp |   10 
 7 files changed, 723 insertions(+), 53 deletions(-)

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gdb-6.6-buildid-locate.patch	10 Aug 2009 13:22:51 -0000	1.24
+++ gdb-6.6-buildid-locate.patch	18 Aug 2009 19:10:33 -0000	1.25
@@ -1,7 +1,7 @@
-Index: gdb-6.8.50.20090809/gdb/corelow.c
+Index: gdb-6.8.50.20090818/gdb/corelow.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/corelow.c	2009-08-10 14:56:11.000000000 +0200
+--- gdb-6.8.50.20090818.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/corelow.c	2009-08-18 21:07:23.000000000 +0200
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -89,10 +89,10 @@ Index: gdb-6.8.50.20090809/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-6.8.50.20090809/gdb/doc/gdb.texinfo
+Index: gdb-6.8.50.20090818/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/doc/gdb.texinfo	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/doc/gdb.texinfo	2009-08-10 14:56:11.000000000 +0200
+--- gdb-6.8.50.20090818.orig/gdb/doc/gdb.texinfo	2009-08-18 21:07:05.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/doc/gdb.texinfo	2009-08-18 21:07:23.000000000 +0200
 @@ -13733,6 +13733,27 @@ information files.
  
  @end table
@@ -121,10 +121,10 @@ Index: gdb-6.8.50.20090809/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.50.20090809/gdb/solib-svr4.c
+Index: gdb-6.8.50.20090818/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/solib-svr4.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/solib-svr4.c	2009-08-10 14:56:11.000000000 +0200
+--- gdb-6.8.50.20090818.orig/gdb/solib-svr4.c	2009-08-18 21:07:04.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/solib-svr4.c	2009-08-18 21:07:23.000000000 +0200
 @@ -1101,9 +1101,33 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
@@ -162,11 +162,11 @@ Index: gdb-6.8.50.20090809/gdb/solib-svr
  	    }
  	  xfree (buffer);
  
-Index: gdb-6.8.50.20090809/gdb/symfile.c
+Index: gdb-6.8.50.20090818/gdb/symfile.c
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/symfile.c	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/symfile.c	2009-08-10 14:58:53.000000000 +0200
-@@ -55,6 +55,7 @@
+--- gdb-6.8.50.20090818.orig/gdb/symfile.c	2009-08-18 21:07:05.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/symfile.c	2009-08-18 21:08:31.000000000 +0200
+@@ -56,6 +56,7 @@
  #include "elf-bfd.h"
  #include "solib.h"
  #include "remote.h"
@@ -174,7 +174,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -1195,16 +1196,65 @@ symbol_file_clear (int from_tty)
+@@ -1193,16 +1194,65 @@ symbol_file_clear (int from_tty)
      printf_unfiltered (_("No symbol file now.\n"));
  }
  
@@ -242,7 +242,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  {
    struct build_id *retval;
  
-@@ -1220,6 +1270,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -1218,6 +1268,348 @@ build_id_bfd_get (bfd *abfd)
    return retval;
  }
  
@@ -591,7 +591,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value.  */
  
  static int
-@@ -1237,7 +1629,7 @@ build_id_verify (const char *filename, s
+@@ -1235,7 +1627,7 @@ build_id_verify (const char *filename, s
    if (abfd == NULL)
      return 0;
  
@@ -600,7 +600,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1256,8 +1648,9 @@ build_id_verify (const char *filename, s
+@@ -1254,8 +1646,9 @@ build_id_verify (const char *filename, s
    return retval;
  }
  
@@ -612,7 +612,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  {
    char *link, *s, *retval = NULL;
    gdb_byte *data = build_id->data;
-@@ -1265,7 +1658,9 @@ build_id_to_debug_filename (struct build
+@@ -1263,7 +1656,9 @@ build_id_to_debug_filename (struct build
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
    link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
@@ -623,7 +623,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
    s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
    if (size > 0)
      {
-@@ -1276,12 +1671,14 @@ build_id_to_debug_filename (struct build
+@@ -1274,12 +1669,14 @@ build_id_to_debug_filename (struct build
      *s++ = '/';
    while (size-- > 0)
      s += sprintf (s, "%02x", (unsigned) *data++);
@@ -640,7 +640,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1289,9 +1686,150 @@ build_id_to_debug_filename (struct build
+@@ -1287,9 +1684,150 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -791,7 +791,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1374,32 +1912,36 @@ static char *
+@@ -1372,32 +1910,36 @@ static char *
  find_separate_debug_file (struct objfile *objfile)
  {
    asection *sect;
@@ -836,7 +836,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1407,7 +1949,7 @@ find_separate_debug_file (struct objfile
+@@ -1405,7 +1947,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.  */
@@ -845,7 +845,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    dir = xstrdup (objfile->name);
  
-@@ -1429,24 +1971,19 @@ find_separate_debug_file (struct objfile
+@@ -1427,24 +1969,19 @@ find_separate_debug_file (struct objfile
    if (canon_name && strlen (canon_name) > i)
      i = strlen (canon_name);
  
@@ -877,7 +877,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
    strcpy (debugfile, dir);
-@@ -1455,12 +1992,7 @@ find_separate_debug_file (struct objfile
+@@ -1453,12 +1990,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -891,7 +891,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
-@@ -1469,12 +2001,7 @@ find_separate_debug_file (struct objfile
+@@ -1467,12 +1999,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -905,7 +905,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  
    /* If the file is in the sysroot, try using its base path in the
       global debugfile directory.  */
-@@ -1488,21 +2015,18 @@ find_separate_debug_file (struct objfile
+@@ -1486,20 +2013,18 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, basename);
  
        if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -913,7 +913,6 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
 -	  xfree (canon_name);
 -	  xfree (basename);
 -	  xfree (dir);
--	  xfree (canon_name);
 -	  return xstrdup (debugfile);
 -	}
 +	goto cleanup_return_debugfile;
@@ -934,7 +933,7 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
  }
  
  
-@@ -4254,4 +4778,16 @@ Show printing of symbol loading messages
+@@ -4255,4 +4780,16 @@ Show printing of symbol loading messages
                             NULL,
                             NULL,
                             &setprintlist, &showprintlist);
@@ -951,10 +950,10 @@ Index: gdb-6.8.50.20090809/gdb/symfile.c
 +
 +  observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-6.8.50.20090809/gdb/symfile.h
+Index: gdb-6.8.50.20090818/gdb/symfile.h
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/symfile.h	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/symfile.h	2009-08-10 14:56:11.000000000 +0200
+--- gdb-6.8.50.20090818.orig/gdb/symfile.h	2009-08-18 21:07:04.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/symfile.h	2009-08-18 21:07:23.000000000 +0200
 @@ -388,6 +388,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);
@@ -969,10 +968,10 @@ Index: gdb-6.8.50.20090809/gdb/symfile.h
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
-Index: gdb-6.8.50.20090809/gdb/testsuite/lib/gdb.exp
+Index: gdb-6.8.50.20090818/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/testsuite/lib/gdb.exp	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/testsuite/lib/gdb.exp	2009-08-10 14:56:11.000000000 +0200
+--- gdb-6.8.50.20090818.orig/gdb/testsuite/lib/gdb.exp	2009-08-18 21:07:04.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/testsuite/lib/gdb.exp	2009-08-18 21:07:23.000000000 +0200
 @@ -1248,6 +1248,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
@@ -990,10 +989,10 @@ Index: gdb-6.8.50.20090809/gdb/testsuite
      return 0;
  }
  
-Index: gdb-6.8.50.20090809/gdb/testsuite/lib/mi-support.exp
+Index: gdb-6.8.50.20090818/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-6.8.50.20090809.orig/gdb/testsuite/lib/mi-support.exp	2009-08-10 00:50:30.000000000 +0200
-+++ gdb-6.8.50.20090809/gdb/testsuite/lib/mi-support.exp	2009-08-10 14:56:11.000000000 +0200
+--- gdb-6.8.50.20090818.orig/gdb/testsuite/lib/mi-support.exp	2009-08-18 21:07:04.000000000 +0200
++++ gdb-6.8.50.20090818/gdb/testsuite/lib/mi-support.exp	2009-08-18 21:07:23.000000000 +0200
 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } {
  	    }
      	}


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- gdb.spec	18 Aug 2009 18:51:17 -0000	1.375
+++ gdb.spec	18 Aug 2009 19:10:33 -0000	1.376
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # 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
@@ -821,6 +821,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-2
+- Fix patch fuzz 0.
+
 * Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-1
 - Upgrade to the FSF GDB gdb-6.8.50 snapshot: 6.8.50.20090818
 - archer-jankratochvil-fedora12 commit: 5e0d1cc74f119391a2c3ae25ef5749fc28674f06



From ajax at fedoraproject.org  Tue Aug 18 19:12:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 18 Aug 2009 19:12:05 +0000 (UTC)
Subject: rpms/at/devel at.spec,1.76,1.77
Message-ID: <20090818191205.9883311C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/at/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32212

Modified Files:
	at.spec 
Log Message:
* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 3.1.10-36
- Remove Requires: pm-utils-filesystem, dead package



Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- at.spec	24 Jul 2009 17:27:25 -0000	1.76
+++ at.spec	18 Aug 2009 19:12:05 -0000	1.77
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -41,7 +41,6 @@ Patch20: at-3.1.10-different_shell.patch
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
 BuildRequires: libselinux-devel >= 1.27.9
-Requires: pm-utils-filesystem
 
 %if %{WITH_PAM}
 BuildRequires: pam-devel
@@ -197,6 +196,9 @@ fi
 %attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 3.1.10-36
+- Remove Requires: pm-utils-filesystem, dead package
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.10-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Tue Aug 18 19:14:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 18 Aug 2009 19:14:46 +0000 (UTC)
Subject: rpms/ipsec-tools/devel .cvsignore,1.14,1.15 sources,1.14,1.15
Message-ID: <20090818191446.0952A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv350

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Aug 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-1
- update to a new upstream version
- fix service stop in preun (#515880)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	23 Apr 2009 16:02:32 -0000	1.14
+++ .cvsignore	18 Aug 2009 19:14:45 -0000	1.15
@@ -1 +1 @@
-ipsec-tools-0.7.2.tar.bz2
+ipsec-tools-0.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	23 Apr 2009 16:02:32 -0000	1.14
+++ sources	18 Aug 2009 19:14:45 -0000	1.15
@@ -1 +1 @@
-72861f005746ee27984b2ee715ecc629  ipsec-tools-0.7.2.tar.bz2
+821bd84e8d4ad5a93bf594b8b3d66e1e  ipsec-tools-0.7.3.tar.bz2



From bagnara at fedoraproject.org  Tue Aug 18 19:17:48 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 18 Aug 2009 19:17:48 +0000 (UTC)
Subject: rpms/ppl/F-10 ppl.spec,1.22,1.23
Message-ID: <20090818191748.6A13D11C00D7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv985

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ppl.spec	19 Jun 2009 18:41:54 -0000	1.22
+++ ppl.spec	18 Aug 2009 19:17:48 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Tue Aug 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-4
+- Force rebuild.
+
 * Fri Jun 19 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-3
 - The `gprolog' and `yap' packages are not available on the sparc64 and
   sparcv9 architectures: so do `ppl-gprolog', `ppl-gprolog-static' and



From bagnara at fedoraproject.org  Tue Aug 18 19:24:09 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 18 Aug 2009 19:24:09 +0000 (UTC)
Subject: rpms/ppl/F-11 ppl.spec,1.31,1.32
Message-ID: <20090818192409.DF97511C00D7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2541

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ppl.spec	19 Jun 2009 07:51:47 -0000	1.31
+++ ppl.spec	18 Aug 2009 19:24:09 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Tue Aug 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-4
+- Force rebuild.
+
 * Fri Jun 19 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-3
 - The `gprolog' and `yap' packages are not available on the sparc64 and
   sparcv9 architectures: so do `ppl-gprolog', `ppl-gprolog-static' and



From bagnara at fedoraproject.org  Tue Aug 18 19:25:04 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Tue, 18 Aug 2009 19:25:04 +0000 (UTC)
Subject: rpms/ppl/F-11 ppl.spec,1.32,1.33
Message-ID: <20090818192504.4E94411C00D7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2835

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ppl.spec	18 Aug 2009 19:24:09 -0000	1.32
+++ ppl.spec	18 Aug 2009 19:25:04 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Tue Aug 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-5
+- Force rebuild.
+
 * Tue Aug 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-4
 - Force rebuild.
 



From dwalsh at fedoraproject.org  Tue Aug 18 19:25:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 19:25:07 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.200,
	1.201 policycoreutils-rhat.patch, 1.428,
	1.429 policycoreutils-sepolgen.patch, 1.25,
	1.26 policycoreutils.spec, 1.622, 1.623 sources, 1.208, 1.209
Message-ID: <20090818192507.2602411C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2867

Modified Files:
	.cvsignore policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec sources 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-4
- Add --boot flag to audit2allow to get all AVC messages since last boot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- .cvsignore	13 Aug 2009 15:51:51 -0000	1.200
+++ .cvsignore	18 Aug 2009 19:25:04 -0000	1.201
@@ -205,3 +205,4 @@ policycoreutils-2.0.68.tgz
 policycoreutils-2.0.70.tgz
 policycoreutils_man_ru2.tar.bz2
 policycoreutils-2.0.71.tgz
+sepolgen-1.0.17.tgz

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 restorecond/Makefile                        |   20 +
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  397 +++-------------------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 +
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  220 +++++++++++++++
 restorecond/walk.c                          |   30 ++
 restorecond/watch.c                         |  346 ++++++++++++++++++++++++
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++++++
 scripts/sandbox.8                           |   22 +
 scripts/sandbox.py                          |   67 ++++
 semanage/semanage                           |   53 +++
 semanage/semanage.8                         |    2 
 semanage/seobject.py                        |  109 +++++++
 20 files changed, 1087 insertions(+), 375 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -p -r1.428 -r1.429
--- policycoreutils-rhat.patch	18 Aug 2009 12:32:44 -0000	1.428
+++ policycoreutils-rhat.patch	18 Aug 2009 19:25:04 -0000	1.429
@@ -1,3 +1,43 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.71/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-18 15:19:58.000000000 -0400
+@@ -42,6 +42,8 @@
+         from optparse import OptionParser
+ 
+         parser = OptionParser(version=self.VERSION)
++        parser.add_option("-b", "--boot", action="store_true", dest="boot", default=False,
++                          help="audit messages since last boot conflicts with -i")
+         parser.add_option("-a", "--all", action="store_true", dest="audit", default=False,
+                           help="read input from audit log - conflicts with -i")
+         parser.add_option("-d", "--dmesg", action="store_true", dest="dmesg", default=False,
+@@ -80,11 +82,11 @@
+         options, args = parser.parse_args()
+ 
+         # Make -d, -a, and -i conflict
+-        if options.audit is True:
++        if options.audit is True or options.boot:
+             if options.input is not None:
+-                sys.stderr.write("error: --all conflicts with --input\n")
++                sys.stderr.write("error: --all/--boot conflicts with --input\n")
+             if options.dmesg is True:
+-                sys.stderr.write("error: --all conflicts with --dmesg\n")
++                sys.stderr.write("error: --all/--boot conflicts with --dmesg\n")
+         if options.input is not None and options.dmesg is True:
+             sys.stderr.write("error: --input conflicts with --dmesg\n")
+ 
+@@ -129,6 +131,12 @@
+             except OSError, e:
+                 sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
+                 sys.exit(1)
++        elif self.__options.boot:
++            try:
++                messages = audit.get_audit_boot_msgs()
++            except OSError, e:
++                sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
++                sys.exit(1)
+         else:
+             # This is the default if no input is specified
+             f = sys.stdin
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.71/Makefile	2009-08-13 17:57:54.000000000 -0400

policycoreutils-sepolgen.patch:
 audit.py     |   32 ++++++++++++++++++++++++++++++++
 refparser.py |    2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- policycoreutils-sepolgen.patch	13 Aug 2009 22:22:35 -0000	1.25
+++ policycoreutils-sepolgen.patch	18 Aug 2009 19:25:06 -0000	1.26
@@ -1,19 +1,35 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py
---- nsasepolgen/src/sepolgen/access.py	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py	2009-04-21 14:54:12.000000000 -0400
-@@ -313,7 +313,7 @@
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/audit.py
+--- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/audit.py	2009-08-18 15:21:13.000000000 -0400
+@@ -23,6 +23,27 @@
  
-     def __len__(self):
-         """Return the unique number of role allow statements."""
--        return len(self.role_type.keys())
-+        return len(self.role_types.keys())
+ # Convenience functions
  
-     def add(self, role, type):
-         if self.role_types.has_key(role):
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py
---- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/audit.py	2009-04-24 13:19:39.000000000 -0400
-@@ -47,6 +47,17 @@
++def get_audit_boot_msgs():
++    """Obtain all of the avc and policy load messages from the audit
++    log. This function uses ausearch and requires that the current
++    process have sufficient rights to run ausearch.
++
++    Returns:
++       string contain all of the audit messages returned by ausearch.
++    """
++    import subprocess
++    import time
++    fd=open("/proc/uptime", "r")
++    off=float(fd.read().split()[0])
++    fd.close
++    s = time.localtime(time.time() - off)
++    date = time.strftime("%D/%Y", s).split("/")
++    bootdate="%s/%s/%s" % (date[0], date[1], date[3])
++    boottime = time.strftime("%X", s)
++    output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime],
++                              stdout=subprocess.PIPE).communicate()[0]
++    return output
++
+ def get_audit_msgs():
+     """Obtain all of the avc and policy load messages from the audit
+     log. This function uses ausearch and requires that the current
+@@ -47,6 +68,17 @@
                                stdout=subprocess.PIPE).communicate()[0]
      return output
  
@@ -31,15 +47,15 @@ diff --exclude-from=exclude -N -u -r nsa
  # Classes representing audit messages
  
  class AuditMessage:
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-04-21 14:54:12.000000000 -0400
++++ policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-08-13 17:57:55.000000000 -0400
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []
      support_macros = None
 -    blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
-+    blacklist = ["uml.if", "thunderbird.if", "unconfined.if"]
++    blacklist = ["uml.if", "thunderbird.if, unconfined.if"]
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.622
retrieving revision 1.623
diff -u -p -r1.622 -r1.623
--- policycoreutils.spec	18 Aug 2009 12:32:48 -0000	1.622
+++ policycoreutils.spec	18 Aug 2009 19:25:06 -0000	1.623
@@ -2,11 +2,11 @@
 %define	libsepolver	2.0.19-1
 %define	libsemanagever	2.0.28-2
 %define	libselinuxver	2.0.46-5
-%define	sepolgenver	1.0.16
+%define	sepolgenver	1.0.17
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-4
+- Add --boot flag to audit2allow to get all AVC messages since last boot
+
 * Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-3
 - Fix semanage command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- sources	13 Aug 2009 22:08:59 -0000	1.208
+++ sources	18 Aug 2009 19:25:06 -0000	1.209
@@ -1,3 +1,3 @@
-e1b5416c3e0d76e5d702b3f54f4def45  sepolgen-1.0.16.tgz
 00fd9d86bd6a8066da710d6fda910b01  policycoreutils-2.0.71.tgz
 59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2
+480cc64a050735fa1163a87dc89c4f49  sepolgen-1.0.17.tgz



From caolanm at fedoraproject.org  Tue Aug 18 19:25:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 18 Aug 2009 19:25:07 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch,
	1.6, 1.7
Message-ID: <20090818192507.9744511C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2889

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
yet more overlapping strcpys

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |   26 +++++++++++++++++++-------
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 make.c           |   15 ++++++++++-----
 6 files changed, 49 insertions(+), 22 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	18 Aug 2009 08:40:20 -0000	1.6
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	18 Aug 2009 19:25:07 -0000	1.7
@@ -73,7 +73,27 @@ diff -ru dmake.orig/expand.c dmake/expan
     }
  }
  
-@@ -727,8 +730,10 @@
+@@ -365,7 +368,8 @@
+       if( (e = Basename(s)) != s) {
+ 	 if( !(mod & DIRECTORY_FLAG) ) {
+ 	    /* Move the basename to the start. */
+-	    strcpy(s, e);
++	    size_t len = strlen(e)+1;
++	    memmove(s, e, len);
+ 	 }
+ 	 else
+ 	    s = e;
+@@ -382,7 +386,8 @@
+ 
+       if( !(mod & FILE_FLAG) ) {
+ 	 /* Move the suffix to the start. */
+-	 strcpy( s, e );
++	 size_t len = strlen(e)+1;
++         memmove(s, e, len);
+       }
+       else
+ 	 s = e;
+@@ -725,8 +730,10 @@
  	      done = !lev;
  	      break;
              } else {
@@ -85,7 +105,7 @@ diff -ru dmake.orig/expand.c dmake/expan
  	    }
  	    /*FALLTHRU*/
  	 case ' ':
-@@ -837,8 +842,10 @@
+@@ -835,8 +842,10 @@
         * converted them to a real space. Let's verify this. */
        for( p=s; *p && *p != edelim && *p; p++ ) {
  	if( p[0] == '\\' && p[1] == '\n' ) {
@@ -97,7 +117,7 @@ diff -ru dmake.orig/expand.c dmake/expan
  	}
        }
        if( !*p )
-@@ -1122,7 +1129,10 @@
+@@ -1120,7 +1129,10 @@
        *flag = 1;
        res   = Expand( start );
  



From myoung at fedoraproject.org  Tue Aug 18 19:26:56 2009
From: myoung at fedoraproject.org (myoung)
Date: Tue, 18 Aug 2009 19:26:56 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6-git3.bz2.sign, NONE,
	1.1.2.2 .cvsignore, 1.1014.2.23, 1.1014.2.24 Makefile.config,
	1.70.6.2, 1.70.6.3 config-generic, 1.238.6.34,
	1.238.6.35 config-sparc64-generic, 1.21.6.6,
	1.21.6.7 config-x86-generic, 1.68.6.17,
	1.68.6.18 config-x86_64-generic, 1.68.2.15,
	1.68.2.16 kernel.spec, 1.1294.2.52,
	1.1294.2.53 linux-2.6.31-lirc.patch, 1.2.2.4, 1.2.2.5 perf,
	1.2.2.2, 1.2.2.3 sources, 1.976.2.24, 1.976.2.25 upstream,
	1.888.2.23, 1.888.2.24 xen.pvops.patch, 1.1.2.33,
	1.1.2.34 xen.pvops.post.patch, 1.1.2.20,
	1.1.2.21 config-powerpc64-kdump, 1.1, NONE
Message-ID: <20090818192656.B335B11C00D7@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3035

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore Makefile.config config-generic 
	config-sparc64-generic config-x86-generic 
	config-x86_64-generic kernel.spec linux-2.6.31-lirc.patch perf 
	sources upstream xen.pvops.patch xen.pvops.post.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc6-git3.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	config-powerpc64-kdump 
Log Message:
Try pvops STACKPROTECTOR fixes. Also adds MCA/MCE support



--- NEW FILE patch-2.6.31-rc6-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKifDWyGugalF9Dw4RArnDAKCV4RB/H5u3asDVNcofTSi7u2aTXwCeP8Fg
fe5RiaqtFA5xWe7P/QgnlwI=
=BQxt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.23
retrieving revision 1.1014.2.24
diff -u -p -r1.1014.2.23 -r1.1014.2.24
--- .cvsignore	14 Aug 2009 18:31:25 -0000	1.1014.2.23
+++ .cvsignore	18 Aug 2009 19:26:44 -0000	1.1014.2.24
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
+patch-2.6.31-rc6-git3.bz2


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.70.6.2
retrieving revision 1.70.6.3
diff -u -p -r1.70.6.2 -r1.70.6.3
--- Makefile.config	13 Aug 2009 18:13:03 -0000	1.70.6.2
+++ Makefile.config	18 Aug 2009 19:26:44 -0000	1.70.6.3
@@ -11,7 +11,7 @@ CONFIGFILES	= \
 	$(CFG)-s390x.config $(CFG)-arm.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-sparc64.config  \
-	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ppc64-debug.config \
+	$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ia64.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
@@ -86,9 +86,6 @@ kernel-$(VERSION)-sparc64.config: /dev/n
 kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic
 	perl merge.pl $^ powerpc > $@
 
-kernel-$(VERSION)-ppc64-kdump.config: config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
-	perl merge.pl $^ powerpc > $@
-
 kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generic
 	perl merge.pl $^ powerpc > $@
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.34
retrieving revision 1.238.6.35
diff -u -p -r1.238.6.34 -r1.238.6.35
--- config-generic	13 Aug 2009 18:13:03 -0000	1.238.6.34
+++ config-generic	18 Aug 2009 19:26:45 -0000	1.238.6.35
@@ -3787,6 +3787,7 @@ CONFIG_DEFAULT_RELATIME=y
 CONFIG_INPUT_LIRC=y
 CONFIG_LIRC_DEV=m
 CONFIG_LIRC_BT829=m
+CONFIG_LIRC_ENE0100=m
 CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
@@ -3992,6 +3993,8 @@ CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_AUDIT=y
 CONFIG_IMA_LSM_RULES=y
 
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+
 # CONFIG_PAGE_POISONING is not set
 
 CONFIG_SLOW_WORK=y


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.21.6.6
retrieving revision 1.21.6.7
diff -u -p -r1.21.6.6 -r1.21.6.7
--- config-sparc64-generic	13 Aug 2009 18:13:03 -0000	1.21.6.6
+++ config-sparc64-generic	18 Aug 2009 19:26:45 -0000	1.21.6.7
@@ -199,3 +199,10 @@ CONFIG_LEDS_SUNFIRE=m
 CONFIG_TADPOLE_TS102_UCTRL=m
 
 CONFIG_RCU_FANOUT=64
+
+CONFIG_LIRC_ENE0100=m
+# CONFIG_BATTERY_DS2782 is not set
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.17
retrieving revision 1.68.6.18
diff -u -p -r1.68.6.17 -r1.68.6.18
--- config-x86-generic	10 Aug 2009 21:22:18 -0000	1.68.6.17
+++ config-x86-generic	18 Aug 2009 19:26:45 -0000	1.68.6.18
@@ -115,7 +115,7 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
 
 CONFIG_SECCOMP=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.15
retrieving revision 1.68.2.16
diff -u -p -r1.68.2.15 -r1.68.2.16
--- config-x86_64-generic	10 Aug 2009 21:22:18 -0000	1.68.2.15
+++ config-x86_64-generic	18 Aug 2009 19:26:45 -0000	1.68.2.16
@@ -243,7 +243,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_CS5535 is not set
 
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_ALL is not set
 
 CONFIG_SGI_IOC4=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.52
retrieving revision 1.1294.2.53
diff -u -p -r1.1294.2.52 -r1.1294.2.53
--- kernel.spec	14 Aug 2009 18:31:25 -0000	1.1294.2.52
+++ kernel.spec	18 Aug 2009 19:26:45 -0000	1.1294.2.53
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -433,7 +433,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, grubby >= 7.0.2-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -534,7 +534,6 @@ Source50: config-powerpc-generic
 Source51: config-powerpc32-generic
 Source52: config-powerpc32-smp
 Source53: config-powerpc64
-Source54: config-powerpc64-kdump
 
 Source60: config-ia64-generic
 
@@ -544,7 +543,7 @@ Source90: config-sparc64-generic
 
 Source100: config-arm
 
-Source999: perf
+Source200: perf
 
 # Here should be only the patches up to the upstream canonical Linus tree.
 
@@ -1292,8 +1291,8 @@ ApplyPatch hdpvr-ir-enable.patch
 ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Add kernel KSM support
-ApplyPatch linux-2.6-ksm.patch
-ApplyPatch linux-2.6-ksm-updates.patch
+#ApplyPatch linux-2.6-ksm.patch
+#ApplyPatch linux-2.6-ksm-updates.patch
 # Optimize KVM for KSM support
 #ApplyPatch linux-2.6-ksm-kvm.patch
 
@@ -1978,6 +1977,32 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 18 2009 Michael Young <m.a.young at durham.ac.uk>
+- another rebase/master update
+  - try upstream STACKPROTECTOR fixes
+  - MCE/MCA support
+- remove grubby dependency to make it more F11 friendly, it isn't needed
+  until dracut is re-enabled
+
+* Tue Aug 18 2009 Dave Jones <davej at redhat.com>
+- 2.6.31-rc6-git3
+
+* Mon Aug 17 2009 Dave Jones <davej at redhat.com> 2.6.31-0.161.rc6.git2
+- 2.6.31-rc6-git2
+
+* Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com>
+- Stop generating the (unused) ppc64-kdump.config file.
+
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com>
+- Add new lirc driver for built-in ENE0100 device on some laptops
+
+* Sun Aug 16 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.158.rc6
+- Improve the perf script so it prints something helpful if the
+  perf binary doesn't exist.
+
+* Sat Aug 15 2009 Dave Jones <davej at redhat.com> 2.6.31-0.157.rc6
+- Disable KSM patches on a hunch.  Chasing the "encrypted VGs don't work" bug.
+
 * Fri Aug 14 2009 Michael Young <m.a.young at durham.ac.uk>
 - another rebase/master update
 - make perf a Source file so the kernel builds

linux-2.6.31-lirc.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         |  852 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  450 ++++++
 drivers/input/lirc/lirc_ene0100.h     |  100 +
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2297 ++++++++++++++++++++++++++++++++++
 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      | 1225 ++++++++++++++++++
 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   |  777 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
 26 files changed, 15291 insertions(+)

Index: linux-2.6.31-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.31-lirc.patch,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -p -r1.2.2.4 -r1.2.2.5
--- linux-2.6.31-lirc.patch	10 Aug 2009 21:22:19 -0000	1.2.2.4
+++ linux-2.6.31-lirc.patch	18 Aug 2009 19:26:45 -0000	1.2.2.5
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Monday, August 10, 2009
+Last updated: Monday, August 17, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -10,15 +10,17 @@ Signed-off-by: Jarod Wilson <jarod at redha
  MAINTAINERS                           |    9 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  112 ++
- drivers/input/lirc/Makefile           |   20 +
+ 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         |  851 ++++++++++++
+ drivers/input/lirc/lirc_dev.c         |  852 ++++++++++++
  drivers/input/lirc/lirc_dev.h         |  184 +++
+ drivers/input/lirc/lirc_ene0100.c     |  450 +++++++
+ drivers/input/lirc/lirc_ene0100.h     |  100 ++
  drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 2298 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2297 +++++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 ++
  drivers/input/lirc/lirc_ite8709.c     |  539 ++++++++
@@ -31,13 +33,13 @@ Signed-off-by: Jarod Wilson <jarod at redha
  drivers/input/lirc/lirc_streamzap.c   |  777 +++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1374 ++++++++++++++++++++
- 24 files changed, 14733 insertions(+), 0 deletions(-)
+ 26 files changed, 15291 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b1114cf..eb86f8e 100644
+index 2c4326c..15d1ac5 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3122,6 +3122,15 @@ W:	http://www.pasemi.com/
+@@ -3130,6 +3130,15 @@ W:	http://www.pasemi.com/
  L:	linuxppc-dev at ozlabs.org
  S:	Supported
  
@@ -78,10 +80,10 @@ index 4c9c745..99e2b5e 100644
 +obj-$(CONFIG_INPUT_LIRC)       += lirc/
 diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
 new file mode 100644
-index 0000000..6ef8622
+index 0000000..ab13cfe
 --- /dev/null
 +++ b/drivers/input/lirc/Kconfig
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,119 @@
 +#
 +# LIRC driver(s) configuration
 +#
@@ -106,6 +108,14 @@ index 0000000..6ef8622
 +	help
 +	  Driver for the IR interface on BT829-based hardware
 +
++config LIRC_ENE0100
++	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
++	depends on LIRC_DEV
++	help
++	  This is a driver for CIR port handled by ENE KB3924 embedded
++	  controller found on some notebooks.
++	  It appears on PNP list as ENE0100.
++
 +config LIRC_I2C
 +	tristate "I2C Based IR Receivers"
 +	depends on LIRC_DEV
@@ -192,14 +202,13 @@ index 0000000..6ef8622
 +	help
 +	  Driver for the Zilog/Hauppauge IR Transmitter, found on
 +	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
-+
 +endif
 diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
 new file mode 100644
-index 0000000..7b1386e
+index 0000000..8da7aa9
 --- /dev/null
 +++ b/drivers/input/lirc/Makefile
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,21 @@
 +# Makefile for the lirc drivers.
 +#
 +
@@ -207,6 +216,7 @@ index 0000000..7b1386e
 +
 +obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
 +obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
++obj-$(CONFIG_LIRC_ENE0100)	+= lirc_ene0100.o
 +obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
 +obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
 +obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
@@ -717,10 +727,10 @@ index 0000000..0485884
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
 new file mode 100644
-index 0000000..0510b4e
+index 0000000..fa0d169
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,851 @@
+@@ -0,0 +1,852 @@
 +/*
 + * LIRC base driver
 + *
@@ -1019,6 +1029,7 @@ index 0000000..0510b4e
 +	}
 +	init_irctl(ir);
 +	irctls[minor] = ir;
++	d->minor = minor;
 +
 +	if (d->sample_rate) {
 +		ir->jiffies_to_wait = HZ / d->sample_rate;
@@ -1100,8 +1111,8 @@ index 0000000..0510b4e
 +
 +	if (minor < 0 || minor >= MAX_IRCTL_DEVICES) {
 +		printk(KERN_ERR "lirc_dev: lirc_unregister_driver: "
-+		       "\"minor\" must be between 0 and %d!\n",
-+		       MAX_IRCTL_DEVICES-1);
++		       "\"minor (%d)\" must be between 0 and %d!\n",
++		       minor, MAX_IRCTL_DEVICES-1);
 +		return -EBADRQC;
 +	}
 +
@@ -1762,6 +1773,568 @@ index 0000000..8eeffa2
 +			       unsigned long arg);
 +
 +#endif
+diff --git a/drivers/input/lirc/lirc_ene0100.c b/drivers/input/lirc/lirc_ene0100.c
+new file mode 100644
+index 0000000..e6f1617
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ene0100.c
+@@ -0,0 +1,450 @@
++/*
++ * driver for ENE KB3924 CIR (also known as ENE0100)
++ *
++ * Copyright (C) 2009 Maxim Levitsky <maximlevitsky at gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ * USA
++ */
++
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/pnp.h>
++#include <linux/io.h>
++#include <linux/interrupt.h>
++#include "lirc_ene0100.h"
++
++
++static int sample_period = 50;
++static int enable_idle = 1;
++
++static void ene_set_idle(struct ene_device *dev, int idle);
++
++/* read a hardware register */
++static u8 ene_hw_read_reg(struct ene_device *dev, u16 reg)
++{
++	outb(reg >> 8   , dev->hw_io + ENE_ADDR_HI);
++	outb(reg & 0xFF , dev->hw_io + ENE_ADDR_LO);
++	return inb(dev->hw_io + ENE_IO);
++}
++
++/* write a hardware register */
++static void ene_hw_write_reg(struct ene_device *dev, u16 reg, u8 value)
++{
++	outb(reg >> 8   , dev->hw_io + ENE_ADDR_HI);
++	outb(reg & 0xFF , dev->hw_io + ENE_ADDR_LO);
++	outb(value, dev->hw_io + ENE_IO);
++}
++
++/* change specific bits in hardware register */
++static void ene_hw_write_reg_mask(struct ene_device *dev,
++						u16 reg, u8 value, u8 mask)
++{
++	u8 regvalue;
++
++	outb(reg >> 8   , dev->hw_io + ENE_ADDR_HI);
++	outb(reg & 0xFF , dev->hw_io + ENE_ADDR_LO);
++
++	regvalue = inb(dev->hw_io + ENE_IO) & ~mask;
++	regvalue |= (value & mask);
++	outb(regvalue, dev->hw_io + ENE_IO);
++}
++
++
++/* which half of hardware buffer we read now ?*/
++static int hw_get_buf_pointer(struct ene_device *dev)
++{
++	return 4 * (ene_hw_read_reg(dev, ENE_FW_BUFFER_POINTER)
++				& ENE_FW_BUFFER_POINTER_HIGH);
++}
++
++
++/* read irq status and ack it */
++static int ene_hw_irq_status(struct ene_device *dev)
++{
++	u8 irq_status = ene_hw_read_reg(dev, ENE_IRQ_STATUS);
++
++	if (!irq_status & ENE_IRQ_STATUS_IR)
++		return 0;
++
++	ene_hw_write_reg(dev, ENE_IRQ_STATUS, irq_status & ~ENE_IRQ_STATUS_IR);
++	return 1;
++}
++
++
++/* hardware initialization */
++static int ene_hw_init(void *data)
++{
++	struct ene_device *dev = (struct ene_device *)data;
++	dev->in_use = 1;
++
++	ene_hw_write_reg(dev, ENE_IRQ, dev->irq << 1);
++	ene_hw_write_reg(dev, ENE_ADC_UNK2, 0x00);
++	ene_hw_write_reg(dev, ENE_ADC_SAMPLE_PERIOD, sample_period);
++	ene_hw_write_reg(dev, ENE_ADC_UNK1, 0x07);
++	ene_hw_write_reg(dev, ENE_UNK1, 0x01);
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, ENE_FW_ENABLE | ENE_FW_IRQ,
++		ENE_FW_ENABLE | ENE_FW_IRQ);
++
++	/* ack any pending irqs - just in case */
++	ene_hw_irq_status(dev);
++
++	/* enter idle mode */
++	ene_set_idle(dev, 1);
++
++	/* clear stats */
++	dev->sample = 0;
++	return 0;
++}
++
++/* deinitialization */
++static void ene_hw_deinit(void *data)
++{
++	struct ene_device *dev = (struct ene_device *)data;
++
++	/* disable hardware IRQ and firmware flag */
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, 0,
++		ENE_FW_ENABLE | ENE_FW_IRQ);
++
++	ene_set_idle(dev, 1);
++	dev->in_use = 0;
++}
++
++/*  sends current sample to userspace */
++static void send_sample(struct ene_device *dev)
++{
++	int value = abs(dev->sample) & PULSE_MASK;
++
++	if (dev->sample > 0)
++		value |= PULSE_BIT;
++
++	if (!lirc_buffer_full(dev->lirc_driver->rbuf)) {
++		lirc_buffer_write(dev->lirc_driver->rbuf, (void *) &value);
++		wake_up(&dev->lirc_driver->rbuf->wait_poll);
++	}
++	dev->sample = 0;
++}
++
++/*  this updates current sample */
++static void update_sample(struct ene_device *dev, int sample)
++{
++	if (!dev->sample)
++		dev->sample = sample;
++	else if (same_sign(dev->sample, sample))
++		dev->sample += sample;
++	else {
++		send_sample(dev);
++		dev->sample = sample;
++	}
++}
++
++/* enable or disable idle mode */
++static void ene_set_idle(struct ene_device *dev, int idle)
++{
++	struct timeval now;
++
++	ene_hw_write_reg_mask(dev, ENE_ADC_SAMPLE_PERIOD,
++		idle & enable_idle ? 0 : ENE_ADC_SAMPLE_OVERFLOW,
++		ENE_ADC_SAMPLE_OVERFLOW);
++
++	dev->idle = idle;
++
++
++	/* remember when we have entered the idle mode */
++	if (idle) {
++		do_gettimeofday(&dev->gap_start);
++		return;
++	}
++
++	/* send the gap between keypresses now */
++	do_gettimeofday(&now);
++
++	if (now.tv_sec - dev->gap_start.tv_sec > 16)
++		dev->sample = space(PULSE_MASK);
++	else
++		dev->sample = dev->sample + 
++			space(1000000ull * (now.tv_sec - dev->gap_start.tv_sec))
++				+ space(now.tv_usec - dev->gap_start.tv_usec);
++
++	if (abs(dev->sample) > PULSE_MASK)
++		dev->sample = space(PULSE_MASK);
++	send_sample(dev);
++}
++
++
++/* interrupt handler */
++static irqreturn_t ene_hw_irq(int irq, void *data)
++{
++	u16 hw_address;
++	u8 hw_value;
++	int i, hw_sample;
++	int space;
++
++	struct ene_device *dev = (struct ene_device *)data;
++
++	if (!ene_hw_irq_status(dev))
++		return IRQ_NONE;
++
++	hw_address = ENE_SAMPLE_BUFFER + hw_get_buf_pointer(dev);
++
++	for (i = 0 ; i < ENE_SAMPLES_SIZE ; i++) {
++
++		hw_value = ene_hw_read_reg(dev, hw_address + i);
++		space = hw_value & ENE_SAMPLE_LOW_MASK;
++		hw_value &= ~ENE_SAMPLE_LOW_MASK;
++
++		/* no more data */
++		if (!(hw_value))
++			break;
++
++		/* calculate hw sample */
++		hw_sample = hw_value * sample_period;
++
++		if (space)
++			hw_sample *= -1;
++
++		/* overflow sample recieved, handle it */
++		if (hw_value == ENE_SAMPLE_OVERFLOW) {
++
++			if (dev->idle)
++				continue;
++
++			if (dev->sample > 0 || abs(dev->sample) <= ENE_MAXGAP)
++				update_sample(dev, hw_sample);
++			else
++				ene_set_idle(dev, 1);
++
++			continue;
++		}
++
++		/* normal first sample recieved*/
++		if (dev->idle) {
++			ene_set_idle(dev, 0);
++
++			/* discard first recieved value, its random
++			   since its the time signal was off before
++			   first pulse if idle mode is enabled, HW
++			   does that for us */
++
++			if (!enable_idle)
++				continue;
++		}
++
++		update_sample(dev, hw_sample);
++		send_sample(dev);
++	}
++	return IRQ_HANDLED;
++}
++
++static int ene_probe(struct pnp_dev *pnp_dev,
++					const struct pnp_device_id *dev_id)
++{
++	struct resource *res;
++	struct ene_device *dev;
++	struct lirc_driver *lirc_driver;
++	int error = -ENOMEM;
++
++	dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);
++
++	if (!dev)
++		goto err1;
++
++	dev->pnp_dev = pnp_dev;
++	pnp_set_drvdata(pnp_dev, dev);
++
++	error = -EINVAL;
++	if (sample_period < 5) {
++
++		printk(KERN_ERR ENE_DRIVER_NAME ": sample period must be at "
++		       "least 5 ms, (at least 30 recommended)\n");
++
++		goto err1;
++	}
++
++	/* validate and read resources */
++	error = -ENODEV;
++	res = pnp_get_resource(pnp_dev, IORESOURCE_IO, 0);
++	if (!pnp_resource_valid(res))
++		goto err2;
++
++	dev->hw_io = res->start;
++
++	if (pnp_resource_len(res) < ENE_MAX_IO)
++		goto err2;
++
++
++	res = pnp_get_resource(pnp_dev, IORESOURCE_IRQ, 0);
++	if (!pnp_resource_valid(res))
++		goto err2;
++
++	dev->irq = res->start;
++
++	/* prepare lirc interface */
++	error = -ENOMEM;
++	lirc_driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
++
++	if (!lirc_driver)
++		goto err2;
++
++	dev->lirc_driver = lirc_driver;
++
++	strcpy(lirc_driver->name, ENE_DRIVER_NAME);
++	lirc_driver->minor = -1;
++	lirc_driver->code_length = sizeof(int) * 8;
++	lirc_driver->features = LIRC_CAN_REC_MODE2;
++	lirc_driver->data = dev;
++	lirc_driver->set_use_inc = ene_hw_init;
++	lirc_driver->set_use_dec = ene_hw_deinit;
++	lirc_driver->dev = &pnp_dev->dev;
++	lirc_driver->owner = THIS_MODULE;
++
++	lirc_driver->rbuf = kzalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
++
++	if (!lirc_driver->rbuf)
++		goto err3;
++
++	if (lirc_buffer_init(lirc_driver->rbuf,
++					sizeof(int), sizeof(int) * 256))
++		goto err4;
++
++	error = -ENODEV;
++	if (lirc_register_driver(lirc_driver))
++		goto err5;
++
++	/* claim the resources */
++	error = -EBUSY;
++	if (!request_region(dev->hw_io, ENE_MAX_IO, ENE_DRIVER_NAME))
++		goto err6;
++
++	if (request_irq(dev->irq, ene_hw_irq,
++			IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev))
++		goto err7;
++
++
++	/* check firmware version */
++	error = -ENODEV;
++	if (ene_hw_read_reg(dev, ENE_FW_VERSION) != ENE_FW_VER_SUPP) {
++		printk(KERN_WARNING ENE_DRIVER_NAME ": "
++		       "unsupported firmware found, aborting\n");
++		goto err8;
++	}
++
++	printk(KERN_NOTICE ENE_DRIVER_NAME ": "
++	       "driver has been succesfully loaded\n");
++	return 0;
++
++err8:
++	free_irq(dev->irq, dev);
++err7:
++	release_region(dev->hw_io, ENE_MAX_IO);
++err6:
++	lirc_unregister_driver(lirc_driver->minor);
++err5:
++	lirc_buffer_free(lirc_driver->rbuf);
++err4:
++	kfree(lirc_driver->rbuf);
++err3:
++	kfree(lirc_driver);
++err2:
++	kfree(dev);
++err1:
++	return error;
++}
++
++
++static void ene_remove(struct pnp_dev *pnp_dev)
++{
++	struct ene_device *dev = pnp_get_drvdata(pnp_dev);
++	ene_hw_deinit(dev);
++	free_irq(dev->irq, dev);
++	release_region(dev->hw_io, ENE_MAX_IO);
++	lirc_unregister_driver(dev->lirc_driver->minor);
++	lirc_buffer_free(dev->lirc_driver->rbuf);
++	kfree(dev->lirc_driver);
++	kfree(dev);
++}
++
++
++#ifdef CONFIG_PM
++static int ene_suspend(struct pnp_dev *pnp_dev, pm_message_t state)
++{
++	struct ene_device *dev = pnp_get_drvdata(pnp_dev);
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, ENE_FW_WAKE, ENE_FW_WAKE);
++	return 0;
++}
++
++
++static int ene_resume(struct pnp_dev *pnp_dev)
++{
++	struct ene_device *dev = pnp_get_drvdata(pnp_dev);
++	if (dev->in_use)
++		ene_hw_init(dev);
++
++	ene_hw_write_reg_mask(dev, ENE_FW_SETTINGS, 0, ENE_FW_WAKE);
++	return 0;
++}
++
++#endif
++
++
++static const struct pnp_device_id ene_ids[] = {
++	{ .id = "ENE0100", },
++	{ },
++};
++
++static struct pnp_driver ene_driver = {
++	.name = ENE_DRIVER_NAME,
++	.id_table = ene_ids,
++	.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
++
++	.probe = ene_probe,
++	.remove = __devexit_p(ene_remove),
++
++#ifdef CONFIG_PM
++	.suspend = ene_suspend,
++	.resume = ene_resume,
++#endif
++};
++
++
++static int __init ene_init(void)
++{
++	return pnp_register_driver(&ene_driver);
++}
++
++static void ene_exit(void)
++{
++	pnp_unregister_driver(&ene_driver);
++}
++
++
++module_param(sample_period, int, S_IRUGO);
++MODULE_PARM_DESC(sample_period, "Hardware sample period (50 us default)");
++
++
++module_param(enable_idle, bool, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(enable_idle,
++"Allow hardware to signal when IR pulse starts, disable if your remote"
++"doesn't send a sync pulse");
++
++
++MODULE_DEVICE_TABLE(pnp, ene_ids);
++MODULE_DESCRIPTION("LIRC driver for KB3924/ENE0100 CIR port");
++MODULE_AUTHOR("Maxim Levitsky");
++MODULE_LICENSE("GPL");
++
++module_init(ene_init);
++module_exit(ene_exit);
+diff --git a/drivers/input/lirc/lirc_ene0100.h b/drivers/input/lirc/lirc_ene0100.h
+new file mode 100644
+index 0000000..7db3545
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ene0100.h
+@@ -0,0 +1,100 @@
++/*
++ * driver for ENE KB3924 CIR (also known as ENE0100)
++ *
++ * Copyright (C) 2009 Maxim Levitsky <maximlevitsky at gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++ * USA
++ */
++
++#include "lirc.h"
++#include "lirc_dev.h"
++
++/* hardware address */
++#define ENE_STATUS		0	/* hardware status - unused */
++#define ENE_ADDR_HI		1	/* hi byte of register address */
++#define ENE_ADDR_LO		2	/* low byte of register address */
++#define ENE_IO			3	/* read/write window */
++#define ENE_MAX_IO		3
++
++
++/* 8 bytes of samples, divided in 2 halfs*/
++#define ENE_SAMPLE_BUFFER		0xF8F0
++#define ENE_SAMPLE_LOW_MASK		(1 << 7)
++#define ENE_SAMPLE_VALUE_MASK		0x7F
++#define ENE_SAMPLE_OVERFLOW		0x7F
++#define ENE_SAMPLES_SIZE		4
++
++
++/* firmware settings */
++#define ENE_FW_SETTINGS			0xF8F8
++#define	ENE_FW_ENABLE			(1 << 0) /* enable fw processing */
++#define ENE_FW_WAKE			(1 << 6) /* enable wake from S3 */
++#define ENE_FW_IRQ			(1 << 7) /* enable interrupt */
++
++
++/* buffer pointer, tells which half of ENE_SAMPLE_BUFFER to read */
++#define ENE_FW_BUFFER_POINTER		0xF8F9
++#define ENE_FW_BUFFER_POINTER_HIGH	(1 << 0)
++
++
++/* IRQ registers block */
++#define ENE_IRQ				0xFD09	 /* IRQ number */
++#define ENE_UNK1			0xFD17   /* unknown setting = 1 */
++#define ENE_IRQ_STATUS			0xFD80   /* irq status */
++#define ENE_IRQ_STATUS_IR		(1 << 5) /* IR irq */
++
++
++/* ADC settings */
++#define ENE_ADC_UNK1			0xFEC0	 /* unknown setting = 7 */
++#define ENE_ADC_UNK2			0xFEC1   /* unknown setting = 0 */
++#define ENE_ADC_SAMPLE_PERIOD		0xFEC8   /* sample period in us */
++#define ENE_ADC_SAMPLE_OVERFLOW		(1 << 7) /* interrupt on
++						    overflows if set */
++
++/* fimware version */
++#define ENE_FW_VERSION			0xFF00
++#define ENE_FW_VER_SUPP			0xC0
++
++
++#define same_sign(a, b) ((((a) > 0) && (b) > 0) || ((a) < 0 && (b) < 0))
++
++#define ENE_DRIVER_NAME			"enecir"
++
++#define ENE_MAXGAP			5000000	/* this is amount of
++						   time we wait before
++						   turning the
++						   sampler, chosen
++						   arbitry */
++
++#define space(len)			(-(len))   /* add a space */
++
++
++struct ene_device {
++	struct pnp_dev *pnp_dev;
++	struct lirc_driver *lirc_driver;
++
++	/* hw settings */
++	unsigned long hw_io;
++	int irq;
++
++	/* device data */
++	int idle;
++	int sample;
++	int in_use;
++
++	struct timeval gap_start;
++};
++
 diff --git a/drivers/input/lirc/lirc_i2c.c b/drivers/input/lirc/lirc_i2c.c
 new file mode 100644
 index 0000000..e27d937
@@ -2869,10 +3442,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..3c87d94
+index 0000000..05fe0c7
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2298 @@
+@@ -0,0 +1,2297 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -3273,8 +3846,7 @@ index 0000000..3c87d94
 +		 "open. 0=don't disable, 1=disable. (default: don't disable)");
 +module_param(pad_thresh, int, S_IRUGO | S_IWUSR);
 +MODULE_PARM_DESC(pad_thresh, "Threshold at which a pad push registers as an "
-+		 "arrow key in kbd mode (default 80 on newer devices, 15 on "
-+		 "older devices)");
++		 "arrow key in kbd mode (default: 28)");
 +
 +static void free_imon_context(struct imon_context *context)
 +{
@@ -4288,7 +4860,7 @@ index 0000000..3c87d94
 +		len = 8;
 +		timeout = 500;	/* in msecs */
 +		/* (2*threshold) x (2*threshold) square */
-+		threshold = pad_thresh ? pad_thresh : 80;
++		threshold = pad_thresh ? pad_thresh : 28;
 +		rel_x = buf[2];
 +		rel_y = buf[3];
 +


Index: perf
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/perf,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.2 -r1.2.2.3
--- perf	13 Aug 2009 21:26:09 -0000	1.2.2.2
+++ perf	18 Aug 2009 19:26:45 -0000	1.2.2.3
@@ -1,2 +1,12 @@
 #!/bin/sh
-exec /usr/libexec/perf.$(uname -r)
+
+# In pathological situations, this will print some error about uname.
+kverrel="`uname -r`" || exit
+
+exec "/usr/libexec/perf.$kverrel" ${1+"$@"}
+rc=$?
+
+# We're still here, so the exec failed.
+echo >&2 "Sorry, your kernel ($kverrel) doesn't support perf."
+
+exit $rc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.24
retrieving revision 1.976.2.25
diff -u -p -r1.976.2.24 -r1.976.2.25
--- sources	14 Aug 2009 18:31:26 -0000	1.976.2.24
+++ sources	18 Aug 2009 19:26:45 -0000	1.976.2.25
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
+67d0b1917a80534f0a7f3aa2c2897509  patch-2.6.31-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.23
retrieving revision 1.888.2.24
diff -u -p -r1.888.2.23 -r1.888.2.24
--- upstream	14 Aug 2009 18:31:26 -0000	1.888.2.23
+++ upstream	18 Aug 2009 19:26:45 -0000	1.888.2.24
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
+patch-2.6.31-rc6-git3.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 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             |   13 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   37 
 arch/x86/kernel/cpu/Makefile               |    5 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    6 
 arch/x86/xen/apic.c                        |   60 +
 arch/x86/xen/enlighten.c                   |   96 +
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |   86 +
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/pci.h                          |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   36 
 drivers/xen/Makefile                       |   19 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  152 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  322 +++++-
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 ++++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/pci.h                        |    6 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   21 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen-mca.h            |  429 ++++++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 133 files changed, 10574 insertions(+), 1315 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -p -r1.1.2.33 -r1.1.2.34
--- xen.pvops.patch	14 Aug 2009 18:31:26 -0000	1.1.2.33
+++ xen.pvops.patch	18 Aug 2009 19:26:45 -0000	1.1.2.34
@@ -1757,18 +1757,19 @@ index 7f3eba0..e4fc8ea 100644
  extern void flush_tlb_current_task(void);
  extern void flush_tlb_mm(struct mm_struct *);
 diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
-index 9c371e4..3da450b 100644
+index 9c371e4..7de93f3 100644
 --- a/arch/x86/include/asm/xen/hypercall.h
 +++ b/arch/x86/include/asm/xen/hypercall.h
-@@ -45,6 +45,7 @@
+@@ -45,6 +45,8 @@
  #include <xen/interface/xen.h>
  #include <xen/interface/sched.h>
  #include <xen/interface/physdev.h>
 +#include <xen/interface/platform.h>
++#include <xen/interface/xen-mca.h>
  
  /*
   * The hypercall asms have to meet several constraints:
-@@ -200,6 +201,23 @@ extern struct { char _entry[32]; } hypercall_page[];
+@@ -200,6 +202,23 @@ extern struct { char _entry[32]; } hypercall_page[];
  	(type)__res;							\
  })
  
@@ -1792,10 +1793,17 @@ index 9c371e4..3da450b 100644
  static inline int
  HYPERVISOR_set_trap_table(struct trap_info *table)
  {
-@@ -282,6 +300,13 @@ HYPERVISOR_set_timer_op(u64 timeout)
+@@ -282,6 +301,20 @@ HYPERVISOR_set_timer_op(u64 timeout)
  }
  
  static inline int
++HYPERVISOR_mca(struct xen_mc *mc_op)
++{
++	mc_op->interface_version = XEN_MCA_INTERFACE_VERSION;
++	return _hypercall1(int, mca, mc_op);
++}
++
++static inline int
 +HYPERVISOR_dom0_op(struct xen_platform_op *platform_op)
 +{
 +	platform_op->interface_version = XENPF_INTERFACE_VERSION;
@@ -1806,7 +1814,7 @@ index 9c371e4..3da450b 100644
  HYPERVISOR_set_debugreg(int reg, unsigned long value)
  {
  	return _hypercall2(int, set_debugreg, reg, value);
-@@ -424,6 +449,14 @@ MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)
+@@ -424,6 +457,14 @@ MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)
  	mcl->args[0] = set;
  }
  
@@ -1821,7 +1829,7 @@ index 9c371e4..3da450b 100644
  static inline void
  MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
  			pte_t new_val, unsigned long flags)
-@@ -432,12 +465,11 @@ MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
+@@ -432,12 +473,11 @@ MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
  	mcl->args[0] = va;
  	if (sizeof(new_val) == sizeof(long)) {
  		mcl->args[1] = new_val.pte;
@@ -2156,6 +2164,22 @@ index d2ed6c5..205e277 100644
  	ioapic_res = ioapic_setup_resources();
  	for (i = 0; i < nr_ioapics; i++) {
  		if (smp_found_config) {
+diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
+index 3efcb2b..3e058a1 100644
+--- a/arch/x86/kernel/cpu/Makefile
++++ b/arch/x86/kernel/cpu/Makefile
+@@ -7,6 +7,11 @@ ifdef CONFIG_FUNCTION_TRACER
+ CFLAGS_REMOVE_common.o = -pg
+ endif
+ 
++ifdef CONFIG_CC_STACKPROTECTOR
++# Also, load_percpu_segment shouldn't have stack-protector on it
++CFLAGS_REMOVE_common.o += -fstack-protector -fstack-protector-all
++endif
++
+ obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
+ obj-y			+= proc.o capflags.o powerflags.o common.o
+ obj-y			+= vmware.o hypervisor.o
 diff --git a/arch/x86/kernel/cpu/mtrr/Makefile b/arch/x86/kernel/cpu/mtrr/Makefile
 index f4361b5..404e458 100644
 --- a/arch/x86/kernel/cpu/mtrr/Makefile
@@ -3491,10 +3515,19 @@ index b83e119..951c924 100644
 +       depends on XEN_DOM0 && MICROCODE
 \ No newline at end of file
 diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
-index 172438f..6d697e5 100644
+index 172438f..e19c48e 100644
 --- a/arch/x86/xen/Makefile
 +++ b/arch/x86/xen/Makefile
-@@ -12,3 +12,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
+@@ -5,6 +5,8 @@ CFLAGS_REMOVE_time.o = -pg
+ CFLAGS_REMOVE_irq.o = -pg
+ endif
+ 
++CFLAGS_REMOVE_enlighten.o += -fstack-protector -fstack-protector-all
++
+ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
+ 			time.o xen-asm.o xen-asm_$(BITS).o \
+ 			grant-table.o suspend.o
+@@ -12,3 +14,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
  obj-$(CONFIG_SMP)		+= smp.o
  obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
  obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
@@ -3570,7 +3603,7 @@ index 0000000..496f07d
 +#endif
 +}
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 0a1700a..6ba04d4 100644
+index 0a1700a..2e58099 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -64,6 +64,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
@@ -3621,19 +3654,32 @@ index 0a1700a..6ba04d4 100644
  	}
  
  	asm(XEN_EMULATE_PREFIX "cpuid"
-@@ -207,8 +221,11 @@ static __init void xen_init_cpuid_mask(void)
- 	cpuid_leaf1_edx_mask =
- 		~((1 << X86_FEATURE_MCE)  |  /* disable MCE */
- 		  (1 << X86_FEATURE_MCA)  |  /* disable MCA */
-+		  (1 << X86_FEATURE_PAT)  |  /* disable PAT */
- 		  (1 << X86_FEATURE_ACC));   /* thermal monitoring */
+@@ -205,16 +219,20 @@ static __init void xen_init_cpuid_mask(void)
+ 	unsigned int ax, bx, cx, dx;
  
-+	cpuid_leaf81_edx_mask = ~(1 << (X86_FEATURE_GBPAGES % 32));
+ 	cpuid_leaf1_edx_mask =
+-		~((1 << X86_FEATURE_MCE)  |  /* disable MCE */
+-		  (1 << X86_FEATURE_MCA)  |  /* disable MCA */
+-		  (1 << X86_FEATURE_ACC));   /* thermal monitoring */
++		~((1 << X86_FEATURE_ACC)    |  /* thermal monitoring */
++		  (1 << X86_FEATURE_PAT));     /* disable PAT */
 +
++	cpuid_leaf81_edx_mask = ~(1 << (X86_FEATURE_GBPAGES % 32));
+ 
  	if (!xen_initial_domain())
  		cpuid_leaf1_edx_mask &=
- 			~((1 << X86_FEATURE_APIC) |  /* disable local APIC */
-@@ -597,6 +614,18 @@ static void xen_set_iopl_mask(unsigned mask)
+-			~((1 << X86_FEATURE_APIC) |  /* disable local APIC */
++			~((1 << X86_FEATURE_MCE)  |  /* disable MCE */
++			  (1 << X86_FEATURE_MCA)  |  /* disable MCA */
++			  (1 << X86_FEATURE_APIC) |  /* disable local APIC */
+ 			  (1 << X86_FEATURE_ACPI));  /* disable ACPI */
+ 
+ 	ax = 1;
++	cx = 0;
+ 	xen_cpuid(&ax, &bx, &cx, &dx);
+ 
+ 	/* cpuid claims we support xsave; try enabling it to see what happens */
+@@ -597,6 +615,18 @@ static void xen_set_iopl_mask(unsigned mask)
  	HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl);
  }
  
@@ -3652,7 +3698,16 @@ index 0a1700a..6ba04d4 100644
  static void xen_io_delay(void)
  {
  }
-@@ -906,6 +935,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -634,7 +664,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
+         return 0;
+ }
+ 
+-static void set_xen_basic_apic_ops(void)
++static __init void set_xen_basic_apic_ops(void)
+ {
+ 	apic->read = xen_apic_read;
+ 	apic->write = xen_apic_write;
+@@ -906,6 +936,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  	.load_sp0 = xen_load_sp0,
  
  	.set_iopl_mask = xen_set_iopl_mask,
@@ -3660,16 +3715,60 @@ index 0a1700a..6ba04d4 100644
  	.io_delay = xen_io_delay,
  
  	/* Xen takes care of %gs when switching to usermode for us */
-@@ -978,6 +1008,8 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -974,10 +1005,6 @@ asmlinkage void __init xen_start_kernel(void)
  
- 	xen_setup_features();
+ 	xen_domain_type = XEN_PV_DOMAIN;
  
-+	xen_setup_machphys_mapping();
-+
+-	BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
+-
+-	xen_setup_features();
+-
  	/* Install Xen paravirt ops */
  	pv_info = xen_info;
  	pv_init_ops = xen_init_ops;
-@@ -1031,6 +1063,8 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -986,8 +1013,15 @@ asmlinkage void __init xen_start_kernel(void)
+ 	pv_apic_ops = xen_apic_ops;
+ 	pv_mmu_ops = xen_mmu_ops;
+ 
+-	xen_init_irq_ops();
++#ifdef CONFIG_X86_64
++	/*
++	 * Setup percpu state.  We only need to do this for 64-bit
++	 * because 32-bit already has %fs set properly.
++	 */
++	load_percpu_segment(0);
++#endif
+ 
++	xen_init_irq_ops();
+ 	xen_init_cpuid_mask();
+ 
+ #ifdef CONFIG_X86_LOCAL_APIC
+@@ -997,6 +1031,10 @@ asmlinkage void __init xen_start_kernel(void)
+ 	set_xen_basic_apic_ops();
+ #endif
+ 
++	xen_setup_machphys_mapping();
++
++	xen_setup_features();
++
+ 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
+ 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
+ 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
+@@ -1004,13 +1042,6 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	machine_ops = xen_machine_ops;
+ 
+-#ifdef CONFIG_X86_64
+-	/*
+-	 * Setup percpu state.  We only need to do this for 64-bit
+-	 * because 32-bit already has %fs set properly.
+-	 */
+-	load_percpu_segment(0);
+-#endif
+ 	/*
+ 	 * The only reliable way to retain the initial address of the
+ 	 * percpu gdt_page is to remember it here, so we can go and
+@@ -1031,6 +1062,8 @@ asmlinkage void __init xen_start_kernel(void)
  	if (!xen_initial_domain())
  		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
  
@@ -3678,7 +3777,7 @@ index 0a1700a..6ba04d4 100644
  #ifdef CONFIG_X86_64
  	/* Work out if we support NX */
  	check_efer();
-@@ -1045,6 +1079,7 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1045,6 +1078,7 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_raw_console_write("mapping kernel into physical memory\n");
  	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
@@ -3686,7 +3785,7 @@ index 0a1700a..6ba04d4 100644
  
  	init_mm.pgd = pgd;
  
-@@ -1054,9 +1089,21 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1054,9 +1088,21 @@ asmlinkage void __init xen_start_kernel(void)
  	if (xen_feature(XENFEAT_supervisor_mode_kernel))
  		pv_info.kernel_rpl = 0;
  
@@ -3708,7 +3807,7 @@ index 0a1700a..6ba04d4 100644
  #ifdef CONFIG_X86_32
  	/* set up basic CPUID stuff */
  	cpu_detect(&new_cpu_data);
-@@ -1075,6 +1122,16 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1075,6 +1121,16 @@ asmlinkage void __init xen_start_kernel(void)
  		add_preferred_console("xenboot", 0, NULL);
  		add_preferred_console("tty", 0, NULL);
  		add_preferred_console("hvc", 0, NULL);
@@ -5430,7 +5529,7 @@ index 0000000..b1a7d93
 +}
 +
 diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
-index cab100a..3b1c421 100644
+index cab100a..84c3553 100644
 --- a/drivers/xen/Kconfig
 +++ b/drivers/xen/Kconfig
 @@ -28,6 +28,29 @@ config XEN_DEV_EVTCHN
@@ -5463,7 +5562,7 @@ index cab100a..3b1c421 100644
  config XENFS
  	tristate "Xen filesystem"
  	depends on XEN
-@@ -60,4 +83,11 @@ config XEN_SYS_HYPERVISOR
+@@ -60,4 +83,15 @@ config XEN_SYS_HYPERVISOR
           Create entries under /sys/hypervisor describing the Xen
  	 hypervisor environment.  When running native or in another
  	 virtual environment, /sys/hypervisor will still be present,
@@ -5477,12 +5576,15 @@ index cab100a..3b1c421 100644
 +config XEN_S3
 +       def_bool y
 +       depends on XEN_DOM0 && ACPI
-\ No newline at end of file
++       
++config XEN_MCE
++       def_bool y
++       depends on XEN_DOM0 && X86_64 && X86_MCE_INTEL
 diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
-index ec2a39b..7ff6d27 100644
+index ec2a39b..2d4f7b1 100644
 --- a/drivers/xen/Makefile
 +++ b/drivers/xen/Makefile
-@@ -1,9 +1,13 @@
+@@ -1,9 +1,14 @@
 -obj-y	+= grant-table.o features.o events.o manage.o
 +obj-y	+= grant-table.o features.o events.o manage.o biomerge.o
  obj-y	+= xenbus/
@@ -5504,7 +5606,7 @@ index ec2a39b..7ff6d27 100644
 +obj-$(CONFIG_XENFS)			+= xenfs/
 +obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 +obj-$(CONFIG_XEN_S3)			+= acpi.o
-\ No newline at end of file
++obj-$(CONFIG_XEN_MCE)			+= mce.o
 diff --git a/drivers/xen/acpi.c b/drivers/xen/acpi.c
 new file mode 100644
 index 0000000..e6d3d0e
@@ -7945,6 +8047,31 @@ index abad71b..8bcbf6b 100644
 +
 +	xen_setup_pirqs();
  }
+diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
+index af03195..79bedba 100644
+--- a/drivers/xen/evtchn.c
++++ b/drivers/xen/evtchn.c
+@@ -38,7 +38,6 @@
+ #include <linux/string.h>
+ #include <linux/errno.h>
+ #include <linux/fs.h>
+-#include <linux/errno.h>
+ #include <linux/miscdevice.h>
+ #include <linux/major.h>
+ #include <linux/proc_fs.h>
+diff --git a/drivers/xen/features.c b/drivers/xen/features.c
+index 99eda16..9e2b64f 100644
+--- a/drivers/xen/features.c
++++ b/drivers/xen/features.c
+@@ -18,7 +18,7 @@
+ u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly;
+ EXPORT_SYMBOL_GPL(xen_features);
+ 
+-void xen_setup_features(void)
++void __init xen_setup_features(void)
+ {
+ 	struct xen_feature_info fi;
+ 	int i, j;
 diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
 index 7d8f531..58996c9 100644
 --- a/drivers/xen/grant-table.c
@@ -8059,6 +8186,225 @@ index 7d8f531..58996c9 100644
  int gnttab_resume(void)
  {
  	if (max_nr_grant_frames() < nr_grant_frames)
+diff --git a/drivers/xen/mce.c b/drivers/xen/mce.c
+new file mode 100644
+index 0000000..ef838f2
+--- /dev/null
++++ b/drivers/xen/mce.c
+@@ -0,0 +1,213 @@
++/******************************************************************************
++ * mce.c
++ * Add Machine Check event Logging support in DOM0
++ *
++ * Driver for receiving and logging machine check event
++ *
++ * Copyright (c) 2008, 2009 Intel Corporation
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License version 2
++ * as published by the Free Software Foundation; or, when distributed
++ * separately from the Linux kernel or incorporated into other
++ * software packages, subject to the following license:
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this source file (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use, copy, modify,
++ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
++ * IN THE SOFTWARE.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <xen/interface/xen.h>
++#include <asm/xen/hypervisor.h>
++#include <xen/events.h>
++#include <xen/interface/vcpu.h>
++#include <asm/xen/hypercall.h>
++#include <asm/mce.h>
++
++static mc_info_t *g_mi;
++static mcinfo_logical_cpu_t *g_physinfo;
++static uint32_t ncpus;
++
++static int convert_log(struct mc_info *mi)
++{
++	struct mcinfo_common *mic = NULL;
++	struct mcinfo_global *mc_global;
++	struct mcinfo_bank *mc_bank;
++	struct mce m;
++	int i, found = 0;
++
++	x86_mcinfo_lookup(&mic, mi, MC_TYPE_GLOBAL);
++	WARN_ON(!mic);
++
++	mce_setup(&m);
++	mc_global = (struct mcinfo_global *)mic;
++	m.mcgstatus = mc_global->mc_gstatus;
++	m.apicid = mc_global->mc_apicid;
++	for (i = 0; i < ncpus; i++) {
++		if (g_physinfo[i].mc_apicid == m.apicid) {
++			found = 1;
++			break;
++		}
++	}
++	WARN_ON(!found);
++
++	m.socketid = g_physinfo[i].mc_chipid;
++	m.cpu = m.extcpu = g_physinfo[i].mc_cpunr;
++	m.cpuvendor = (__u8)g_physinfo[i].mc_vendor;
++	x86_mcinfo_lookup(&mic, mi, MC_TYPE_BANK);
++	do {
++		if (mic == NULL || mic->size == 0)
++			break;
++		if (mic->type == MC_TYPE_BANK) {
++			mc_bank = (struct mcinfo_bank *)mic;
++			m.misc = mc_bank->mc_misc;
++			m.status = mc_bank->mc_status;
++			m.addr = mc_bank->mc_addr;
++			m.tsc = mc_bank->mc_tsc;
++			m.bank = mc_bank->mc_bank;
++			/*log this record*/
++			mce_log(&m);
++		}
++		mic = x86_mcinfo_next(mic);
++	} while (1);
++
++	return 0;
++}
++
++/*pv_ops domain mce virq handler, logging physical mce error info*/
++static irqreturn_t mce_dom_interrupt(int irq, void *dev_id)
++{
++	xen_mc_t mc_op;
++	int result = 0;
++
++	mc_op.cmd = XEN_MC_fetch;
++	mc_op.interface_version = XEN_MCA_INTERFACE_VERSION;
++	set_xen_guest_handle(mc_op.u.mc_fetch.data, g_mi);
++urgent:
++	mc_op.u.mc_fetch.flags = XEN_MC_URGENT;
++	result = HYPERVISOR_mca(&mc_op);
++	if (result || mc_op.u.mc_fetch.flags & XEN_MC_NODATA ||
++			mc_op.u.mc_fetch.flags & XEN_MC_FETCHFAILED)
++		goto nonurgent;
++	else {
++		result = convert_log(g_mi);
++		if (result)
++			goto end;
++		/* After fetching the error event log entry from DOM0,
++		 * we need to dec the refcnt and release the entry.
++		 * The entry is reserved and inc refcnt when filling
++		 * the error log entry.
++		 */
++		mc_op.u.mc_fetch.flags = XEN_MC_URGENT | XEN_MC_ACK;
++		result = HYPERVISOR_mca(&mc_op);
++		goto urgent;
++	}
++nonurgent:
++	mc_op.u.mc_fetch.flags = XEN_MC_NONURGENT;
++	result = HYPERVISOR_mca(&mc_op);
++	if (result || mc_op.u.mc_fetch.flags & XEN_MC_NODATA ||
++			mc_op.u.mc_fetch.flags & XEN_MC_FETCHFAILED)
++		goto end;
++	else {
++		result = convert_log(g_mi);
++		if (result)
++			goto end;
++		/* After fetching the error event log entry from DOM0,
++		 * we need to dec the refcnt and release the entry. The
++		 * entry is reserved and inc refcnt when filling the
++		 * error log entry.
++		 */
++		mc_op.u.mc_fetch.flags = XEN_MC_NONURGENT | XEN_MC_ACK;
++		result = HYPERVISOR_mca(&mc_op);
++		goto nonurgent;
++	}
++end:
++	return IRQ_HANDLED;
++}
++
++static int bind_virq_for_mce(void)
++{
++	int ret;
++	xen_mc_t mc_op;
++
++	ret  = bind_virq_to_irqhandler(VIRQ_MCA, 0,
++		mce_dom_interrupt, 0, "mce", NULL);
++
++	if (ret < 0) {
++		printk(KERN_ERR "MCE_DOM0_LOG: bind_virq for DOM0 failed\n");
++		return ret;
++	}
++
++	g_mi = kmalloc(sizeof(struct mc_info), GFP_KERNEL);
++
++	if (!g_mi)
++		return -ENOMEM;
++
++	/* Fetch physical CPU Numbers */
++	mc_op.cmd = XEN_MC_physcpuinfo;
++	mc_op.interface_version = XEN_MCA_INTERFACE_VERSION;
++	set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
++	ret = HYPERVISOR_mca(&mc_op);
++	if (ret) {
++		printk(KERN_ERR "MCE_DOM0_LOG: Fail to get physical CPU numbers\n");
++		kfree(g_mi);
++		return ret;
++	}
++
++	/* Fetch each CPU Physical Info for later reference*/
++	ncpus = mc_op.u.mc_physcpuinfo.ncpus;
++	g_physinfo = kmalloc(sizeof(struct mcinfo_logical_cpu)*ncpus,
++					GFP_KERNEL);
++	if (!g_physinfo) {
++		kfree(g_mi);
++		return -ENOMEM;
++	}
++	set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
++	ret = HYPERVISOR_mca(&mc_op);
++	if (ret) {
++		printk(KERN_ERR "MCE_DOM0_LOG: Fail to get physical CPUs info\n");
++		kfree(g_mi);
++		kfree(g_physinfo);
++		return ret;
++	}
++
++	return 0;
++}
++
++static int __init mcelog_init(void)
++{
++	/* Only DOM0 is responsible for MCE logging */
++	if (xen_initial_domain())
++		return bind_virq_for_mce();
++
++	return 0;
++}
++
++
++static void __exit mcelog_cleanup(void)
++{
++	kfree(g_mi);
++	kfree(g_physinfo);
++}
++module_init(mcelog_init);
++module_exit(mcelog_cleanup);
++
++MODULE_LICENSE("GPL");
 diff --git a/drivers/xen/netback/Makefile b/drivers/xen/netback/Makefile
 new file mode 100644
 index 0000000..a01a1a3
@@ -13498,6 +13844,441 @@ index 0000000..83e4714
 +DEFINE_GUEST_HANDLE_STRUCT(xen_platform_op_t);
 +
 +#endif /* __XEN_PUBLIC_PLATFORM_H__ */
+diff --git a/include/xen/interface/xen-mca.h b/include/xen/interface/xen-mca.h
+new file mode 100644
+index 0000000..f31fdab
+--- /dev/null
++++ b/include/xen/interface/xen-mca.h
+@@ -0,0 +1,429 @@
++/******************************************************************************
++ * arch-x86/mca.h
++ *
++ * Contributed by Advanced Micro Devices, Inc.
++ * Author: Christoph Egger <Christoph.Egger at amd.com>
++ *
++ * Guest OS machine check interface to x86 Xen.
++ *
++ * 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.
++ */
++
++/* Full MCA functionality has the following Usecases from the guest side:
++ *
++ * Must have's:
++ * 1. Dom0 and DomU register machine check trap callback handlers
++ *    (already done via "set_trap_table" hypercall)
++ * 2. Dom0 registers machine check event callback handler
++ *    (doable via EVTCHNOP_bind_virq)
++ * 3. Dom0 and DomU fetches machine check data
++ * 4. Dom0 wants Xen to notify a DomU
++ * 5. Dom0 gets DomU ID from physical address
++ * 6. Dom0 wants Xen to kill DomU (already done for "xm destroy")
++ *
++ * Nice to have's:
++ * 7. Dom0 wants Xen to deactivate a physical CPU
++ *    This is better done as separate task, physical CPU hotplugging,
++ *    and hypercall(s) should be sysctl's
++ * 8. Page migration proposed from Xen NUMA work, where Dom0 can tell Xen to
++ *    move a DomU (or Dom0 itself) away from a malicious page
++ *    producing correctable errors.
++ * 9. offlining physical page:
++ *    Xen free's and never re-uses a certain physical page.
++ * 10. Testfacility: Allow Dom0 to write values into machine check MSR's
++ *     and tell Xen to trigger a machine check
++ */
++
++#ifndef __XEN_PUBLIC_ARCH_X86_MCA_H__
++#define __XEN_PUBLIC_ARCH_X86_MCA_H__
++
++/* Hypercall */
++#define __HYPERVISOR_mca __HYPERVISOR_arch_0
++
++/*
++ * The xen-unstable repo has interface version 0x03000001; out interface
++ * is incompatible with that and any future minor revisions, so we
++ * choose a different version number range that is numerically less
++ * than that used in xen-unstable.
++ */
++#define XEN_MCA_INTERFACE_VERSION 0x01ecc003
++
++/* IN: Dom0 calls hypercall to retrieve nonurgent error log entry */
++#define XEN_MC_NONURGENT  0x0001
++/* IN: Dom0/DomU calls hypercall to retrieve urgent error log entry */
++#define XEN_MC_URGENT     0x0002
++/* IN: Dom0 acknowledges previosly-fetched error log entry */
++#define XEN_MC_ACK        0x0004
++
++/* OUT: All is ok */
++#define XEN_MC_OK           0x0
++/* OUT: Domain could not fetch data. */
++#define XEN_MC_FETCHFAILED  0x1
++/* OUT: There was no machine check data to fetch. */
++#define XEN_MC_NODATA       0x2
++/* OUT: Between notification time and this hypercall an other
++ *  (most likely) correctable error happened. The fetched data,
++ *  does not match the original machine check data. */
++#define XEN_MC_NOMATCH      0x4
++
++/* OUT: DomU did not register MC NMI handler. Try something else. */
++#define XEN_MC_CANNOTHANDLE 0x8
++/* OUT: Notifying DomU failed. Retry later or try something else. */
++#define XEN_MC_NOTDELIVERED 0x10
++/* Note, XEN_MC_CANNOTHANDLE and XEN_MC_NOTDELIVERED are mutually exclusive. */
++
++
++#ifndef __ASSEMBLY__
++
++#define VIRQ_MCA VIRQ_ARCH_0 /* G. (DOM0) Machine Check Architecture */
++
++/*
++ * Machine Check Architecure:
++ * structs are read-only and used to report all kinds of
++ * correctable and uncorrectable errors detected by the HW.
++ * Dom0 and DomU: register a handler to get notified.
++ * Dom0 only: Correctable errors are reported via VIRQ_MCA
++ */
++#define MC_TYPE_GLOBAL          0
++#define MC_TYPE_BANK            1
++#define MC_TYPE_EXTENDED        2
++#define MC_TYPE_RECOVERY        3
++
++struct mcinfo_common {
++	uint16_t type;      /* structure type */
++	uint16_t size;      /* size of this struct in bytes */
++};
++
++
++#define MC_FLAG_CORRECTABLE     (1 << 0)
++#define MC_FLAG_UNCORRECTABLE   (1 << 1)
++#define MC_FLAG_RECOVERABLE	(1 << 2)
++#define MC_FLAG_POLLED		(1 << 3)
++#define MC_FLAG_RESET		(1 << 4)
++#define MC_FLAG_CMCI		(1 << 5)
++#define MC_FLAG_MCE		(1 << 6)
++/* contains global x86 mc information */
++struct mcinfo_global {
++	struct mcinfo_common common;
++
++	/* running domain at the time in error (most likely
++	 * the impacted one) */
++	uint16_t mc_domid;
++	uint16_t mc_vcpuid; /* virtual cpu scheduled for mc_domid */
++	uint32_t mc_socketid; /* physical socket of the physical core */
++	uint16_t mc_coreid; /* physical impacted core */
++	uint16_t mc_core_threadid; /* core thread of physical core */
++	uint32_t mc_apicid;
++	uint32_t mc_flags;
++	uint64_t mc_gstatus; /* global status */
++};
++
++/* contains bank local x86 mc information */
++struct mcinfo_bank {
++	struct mcinfo_common common;
++
++	uint16_t mc_bank; /* bank nr */
++	uint16_t mc_domid; /* Usecase 5: domain referenced by mc_addr on
++			* privileged pv-ops dom and if mc_addr is valid.
++			* Never valid on DomU. */
++	uint64_t mc_status; /* bank status */
++	uint64_t mc_addr;   /* bank address, only valid
++					 * if addr bit is set in mc_status */
++	uint64_t mc_misc;
++	uint64_t mc_ctrl2;
++	uint64_t mc_tsc;
++};
++
++
++struct mcinfo_msr {
++	uint64_t reg;   /* MSR */
++	uint64_t value; /* MSR value */
++};
++
++/* contains mc information from other
++ * or additional mc MSRs */
++struct mcinfo_extended {
++	struct mcinfo_common common;
++
++	/* You can fill up to five registers.
++	 * If you need more, then use this structure
++	 * multiple times. */
++
++	uint32_t mc_msrs; /* Number of msr with valid values. */
++	/*
++	 * Currently Intel extended MSR (32/64) include all gp registers
++	 * and E(R)FLAGS, E(R)IP, E(R)MISC, up to 11/19 of them might be
++	 * useful at present. So expand this array to 16/32 to leave room.
++	 */
++	struct mcinfo_msr mc_msr[sizeof(void *) * 4];
++};
++
++/* Recovery Action flags. Giving recovery result information to DOM0 */
++
++/* Xen takes successful recovery action, the error is recovered */
++#define REC_ACTION_RECOVERED (0x1 << 0)
++/* No action is performed by XEN */
++#define REC_ACTION_NONE (0x1 << 1)
++/* It's possible DOM0 might take action ownership in some case */
++#define REC_ACTION_NEED_RESET (0x1 << 2)
++
++/* Different Recovery Action types, if the action is performed successfully,
++ * REC_ACTION_RECOVERED flag will be returned.
++ */
++
++/* Page Offline Action */
++#define MC_ACTION_PAGE_OFFLINE (0x1 << 0)
++/* CPU offline Action */
++#define MC_ACTION_CPU_OFFLINE (0x1 << 1)
++/* L3 cache disable Action */
++#define MC_ACTION_CACHE_SHRINK (0x1 << 2)
++
++/* Below interface used between XEN/DOM0 for passing XEN's recovery action
++ * information to DOM0.
++ * usage Senario: After offlining broken page, XEN might pass its page offline
++ * recovery action result to DOM0. DOM0 will save the information in
++ * non-volatile memory for further proactive actions, such as offlining the
++ * easy broken page earlier when doing next reboot.
++*/
++struct page_offline_action {
++	/* Params for passing the offlined page number to DOM0 */
++	uint64_t mfn;
++	uint64_t status;
++};
++
++struct cpu_offline_action {
++	/* Params for passing the identity of the offlined CPU to DOM0 */
++	uint32_t mc_socketid;
++	uint16_t mc_coreid;
++	uint16_t mc_core_threadid;
++};
++
++#define MAX_UNION_SIZE 16
++struct mcinfo_recovery {
++	struct mcinfo_common common;
++	uint16_t mc_bank; /* bank nr */
++	/* Recovery Action Flags defined above such as REC_ACTION_DONE */
++	uint8_t action_flags;
++	/* Recovery Action types defined above such as MC_ACTION_PAGE_OFFLINE */
++	uint8_t action_types;
++	/* In future if more than one recovery action permitted per error bank,
++	 * a mcinfo_recovery data array will be returned
++	 */
++	union {
++		struct page_offline_action page_retire;
++		struct cpu_offline_action cpu_offline;
++		uint8_t pad[MAX_UNION_SIZE];
++	} action_info;
++};
++
++
++#define MCINFO_HYPERCALLSIZE	1024
++#define MCINFO_MAXSIZE		768
++
++struct mc_info {
++	/* Number of mcinfo_* entries in mi_data */
++	uint32_t mi_nentries;
++	uint32_t _pad0;
++	uint64_t mi_data[(MCINFO_MAXSIZE - 1) / 8];
++};
++typedef struct mc_info mc_info_t;
++DEFINE_GUEST_HANDLE_STRUCT(mc_info);
++
++#define __MC_MSR_ARRAYSIZE 8
++#define __MC_NMSRS 1
++#define MC_NCAPS	7	/* 7 CPU feature flag words */
++#define MC_CAPS_STD_EDX	0	/* cpuid level 0x00000001 (%edx) */
++#define MC_CAPS_AMD_EDX	1	/* cpuid level 0x80000001 (%edx) */
++#define MC_CAPS_TM	2	/* cpuid level 0x80860001 (TransMeta) */
++#define MC_CAPS_LINUX	3	/* Linux-defined */
++#define MC_CAPS_STD_ECX	4	/* cpuid level 0x00000001 (%ecx) */
++#define MC_CAPS_VIA	5	/* cpuid level 0xc0000001 */
++#define MC_CAPS_AMD_ECX	6	/* cpuid level 0x80000001 (%ecx) */
++
++struct mcinfo_logical_cpu {
++	uint32_t mc_cpunr;
++	uint32_t mc_chipid;
++	uint16_t mc_coreid;
++	uint16_t mc_threadid;
++	uint32_t mc_apicid;
++	uint32_t mc_clusterid;
++	uint32_t mc_ncores;
++	uint32_t mc_ncores_active;
++	uint32_t mc_nthreads;
++	int32_t mc_cpuid_level;
++	uint32_t mc_family;
++	uint32_t mc_vendor;
++	uint32_t mc_model;
++	uint32_t mc_step;
++	char mc_vendorid[16];
++	char mc_brandid[64];
++	uint32_t mc_cpu_caps[MC_NCAPS];
++	uint32_t mc_cache_size;
++	uint32_t mc_cache_alignment;
++	int32_t mc_nmsrvals;
++	struct mcinfo_msr mc_msrvalues[__MC_MSR_ARRAYSIZE];
++};
++typedef struct mcinfo_logical_cpu mcinfo_logical_cpu_t;
++DEFINE_GUEST_HANDLE_STRUCT(mcinfo_logical_cpu);
++
++
++/*
++ * OS's should use these instead of writing their own lookup function
++ * each with its own bugs and drawbacks.
++ * We use macros instead of static inline functions to allow guests
++ * to include this header in assembly files (*.S).
++ */
++/* Prototype:
++ *    uint32_t x86_mcinfo_nentries(struct mc_info *mi);
++ */
++#define x86_mcinfo_nentries(_mi)    \
++    ((_mi)->mi_nentries)
++/* Prototype:
++ *    struct mcinfo_common *x86_mcinfo_first(struct mc_info *mi);
++ */
++#define x86_mcinfo_first(_mi)       \
++    ((struct mcinfo_common *)(_mi)->mi_data)
++/* Prototype:
++ *    struct mcinfo_common *x86_mcinfo_next(struct mcinfo_common *mic);
++ */
++#define x86_mcinfo_next(_mic)       \
++    ((struct mcinfo_common *)((uint8_t *)(_mic) + (_mic)->size))
++
++/* Prototype:
++ *    void x86_mcinfo_lookup(void *ret, struct mc_info *mi, uint16_t type);
++ */
++
++static inline void x86_mcinfo_lookup
++	(struct mcinfo_common **ret, struct mc_info *mi, uint16_t type)
++{
++	uint32_t found = 0, i;
++	struct mcinfo_common *mic;
++
++	*ret = NULL;
++	if (!mi)
++		return;
++	mic = x86_mcinfo_first(mi);
++
++	for (i = 0; i < x86_mcinfo_nentries(mi); i++) {
++		if (mic->type == type) {
++			found = 1;
++			break;
++		}
++		mic = x86_mcinfo_next(mic);
++	}
++
++	*ret = found ? mic : NULL;
++}
++/* Usecase 1
++ * Register machine check trap callback handler
++ *    (already done via "set_trap_table" hypercall)
++ */
++
++/* Usecase 2
++ * Dom0 registers machine check event callback handler
++ * done by EVTCHNOP_bind_virq
++ */
++
++/* Usecase 3
++ * Fetch machine check data from hypervisor.
++ * Note, this hypercall is special, because both Dom0 and DomU must use this.
++ */
++#define XEN_MC_fetch            1
++struct xen_mc_fetch {
++    /* IN/OUT variables.
++	 * IN: XEN_MC_NONURGENT, XEN_MC_URGENT,
++	 * XEN_MC_ACK if ack'king an earlier fetch
++	 * OUT: XEN_MC_OK, XEN_MC_FETCHAILED,
++	 * XEN_MC_NODATA, XEN_MC_NOMATCH
++	*/
++	uint32_t flags;
++	uint32_t _pad0;
++	/* OUT: id for ack, IN: id we are ack'ing */
++	uint64_t fetch_id;
++
++	/* OUT variables. */
++	GUEST_HANDLE(mc_info) data;
++};
++typedef struct xen_mc_fetch xen_mc_fetch_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_mc_fetch);
++
++
++/* Usecase 4
++ * This tells the hypervisor to notify a DomU about the machine check error
++ */
++#define XEN_MC_notifydomain     2
++struct xen_mc_notifydomain {
++	/* IN variables. */
++	uint16_t mc_domid;/* The unprivileged domain to notify. */
++	uint16_t mc_vcpuid;/* The vcpu in mc_domid to notify.
++			* Usually echo'd value from the fetch hypercall. */
++
++	/* IN/OUT variables. */
++	uint32_t flags;
++
++/* OUT: XEN_MC_OK, XEN_MC_CANNOTHANDLE, XEN_MC_NOTDELIVERED, XEN_MC_NOMATCH */
++};
++typedef struct xen_mc_notifydomain xen_mc_notifydomain_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_mc_notifydomain);
++
++#define XEN_MC_physcpuinfo 3
++struct xen_mc_physcpuinfo {
++	/* IN/OUT */
++	uint32_t ncpus;
++	uint32_t _pad0;
++	/* OUT */
++	GUEST_HANDLE(mcinfo_logical_cpu) info;
++};
++
++#define XEN_MC_msrinject    4
++#define MC_MSRINJ_MAXMSRS       8
++struct xen_mc_msrinject {
++	/* IN */
++	uint32_t mcinj_cpunr;/* target processor id */
++	uint32_t mcinj_flags;/* see MC_MSRINJ_F_* below */
++	uint32_t mcinj_count;/* 0 .. count-1 in array are valid */
++	uint32_t _pad0;
++	struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS];
++};
++
++/* Flags for mcinj_flags above; bits 16-31 are reserved */
++#define MC_MSRINJ_F_INTERPOSE   0x1
++
++#define XEN_MC_mceinject    5
++struct xen_mc_mceinject {
++	unsigned int mceinj_cpunr;      /* target processor id */
++};
++
++struct xen_mc {
++	uint32_t cmd;
++	uint32_t interface_version; /* XEN_MCA_INTERFACE_VERSION */
++	union {
++		struct xen_mc_fetch        mc_fetch;
++		struct xen_mc_notifydomain mc_notifydomain;
++		struct xen_mc_physcpuinfo  mc_physcpuinfo;
++		struct xen_mc_msrinject    mc_msrinject;
++		struct xen_mc_mceinject    mc_mceinject;
++	} u;
++};
++typedef struct xen_mc xen_mc_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_mc);
++
++#endif /* __ASSEMBLY__ */
++
++#endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */
 diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
 index 2befa3e..327db61 100644
 --- a/include/xen/interface/xen.h

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/pci-swiotlb.c         |    5 ++---
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -p -r1.1.2.20 -r1.1.2.21
--- xen.pvops.post.patch	10 Aug 2009 21:22:20 -0000	1.1.2.20
+++ xen.pvops.post.patch	18 Aug 2009 19:26:48 -0000	1.1.2.21
@@ -1,5 +1,4 @@
 Reapply and merge in Fedora changes
-Test some patches to get STACKPROTECTOR working
 
 --- a/drivers/pci/pci.h	2009-02-25 20:16:13.000000000 +0000
 +++ b/drivers/pci/pci.h	2009-02-25 20:40:21.000000000 +0000
@@ -84,47 +83,3 @@ index 6af96ee..1e66b18 100644
  #endif
  	if (xen_wants_swiotlb())
  		swiotlb = 1;
---- linux-2.6.29.x86_64/arch/x86/xen/Makefile.orig	2009-04-24 22:54:26.000000000 +0100
-+++ linux-2.6.29.x86_64/arch/x86/xen/Makefile	2009-04-26 16:46:57.000000000 +0100
-@@ -4,6 +4,10 @@
- CFLAGS_REMOVE_time.o = -pg
- CFLAGS_REMOVE_irq.o = -pg
- endif
-+nostackp := $(call cc-option, -fno-stack-protector)
-+CFLAGS_enlighten.o		:= $(nostackp)
-+CFLAGS_mmu.o			:= $(nostackp)
-+CFLAGS_irq.o			:= $(nostackp)
- 
- obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
- 			time.o xen-asm.o xen-asm_$(BITS).o \
---- linux-2.6.29.x86_64/arch/x86/xen/enlighten.c.orig	2009-04-26 16:49:24.000000000 +0100
-+++ linux-2.6.29.x86_64/arch/x86/xen/enlighten.c	2009-04-26 21:57:28.000000000 +0100
-@@ -965,7 +965,7 @@
- 
- 	xen_domain_type = XEN_PV_DOMAIN;
- 
--	BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
-+/*	BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); */
- 
- 	xen_setup_features();
- 
---- linux-2.6.29.x86_64/drivers/xen/Makefile.orig	2009-04-26 16:49:25.000000000 +0100
-+++ linux-2.6.29.x86_64/drivers/xen/Makefile	2009-04-26 22:26:55.000000000 +0100
-@@ -1,3 +1,6 @@
-+nostackp := $(call cc-option, -fno-stack-protector)
-+CFLAGS_features.o		:= $(nostackp)
-+
- obj-y	+= grant-table.o features.o events.o manage.o biomerge.o
- obj-y	+= xenbus/
- 
---- vanilla-2.6.30-rc3/arch/x86/kernel/cpu/Makefile	2009-04-23 20:13:34.000000000 +0100
-+++ linux-2.6.29.x86_64/arch/x86/kernel/cpu/Makefile	2009-04-27 21:47:28.000000000 +0100
-@@ -6,6 +6,8 @@
- ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_common.o = -pg
- endif
-+nostackp := $(call cc-option, -fno-stack-protector)
-+CFLAGS_common.o		:= $(nostackp)
- 
- obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
- obj-y			+= proc.o capflags.o powerflags.o common.o


--- config-powerpc64-kdump DELETED ---



From dwalsh at fedoraproject.org  Tue Aug 18 19:27:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 19:27:58 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.116,
	1.117 setroubleshoot.spec, 1.154, 1.155 sources, 1.129, 1.130
Message-ID: <20090818192758.454A511C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3798

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.20-1
-Update to upstream 
	2009-8-18 Thomas Liu <tliu at redhat.com>
		  - Added check for new policy.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- .cvsignore	18 Aug 2009 13:40:50 -0000	1.116
+++ .cvsignore	18 Aug 2009 19:27:57 -0000	1.117
@@ -33,3 +33,4 @@ setroubleshoot-2.2.16.tar.gz
 setroubleshoot-2.2.17.tar.gz
 setroubleshoot-2.2.18.tar.gz
 setroubleshoot-2.2.19.tar.gz
+setroubleshoot-2.2.20.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- setroubleshoot.spec	18 Aug 2009 13:40:50 -0000	1.154
+++ setroubleshoot.spec	18 Aug 2009 19:27:57 -0000	1.155
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.19
+Version: 2.2.20
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -209,6 +209,11 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.20-1
+-Update to upstream 
+	2009-8-18 Thomas Liu <tliu at redhat.com>
+		  - Added check for new policy.
+
 * Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.19-1
 - Default syscall field in audit_data
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	18 Aug 2009 13:40:50 -0000	1.129
+++ sources	18 Aug 2009 19:27:57 -0000	1.130
@@ -1 +1 @@
-f072a687cc80466f42005a92d125de64  setroubleshoot-2.2.19.tar.gz
+6367af7f7ba87cedbfd9bd0aa41cccdd  setroubleshoot-2.2.20.tar.gz



From mbarnes at fedoraproject.org  Tue Aug 18 19:31:49 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 18 Aug 2009 19:31:49 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.26,1.394.2.27
Message-ID: <20090818193149.776F811C00D7@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4653

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.26
retrieving revision 1.394.2.27
diff -u -p -r1.394.2.26 -r1.394.2.27
--- evolution.spec	18 Aug 2009 19:01:04 -0000	1.394.2.26
+++ evolution.spec	18 Aug 2009 19:31:49 -0000	1.394.2.27
@@ -501,9 +501,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-audio-inline.so
 %endif
 
-#%{evo_plugin_dir}/org-gnome-backup-restore.eplug
-#%{evo_plugin_dir}/org-gnome-backup-restore.xml
-#%{evo_plugin_dir}/liborg-gnome-backup-restore.so
+%{evo_plugin_dir}/org-gnome-backup-restore.eplug
+%{evo_plugin_dir}/org-gnome-backup-restore.xml
+%{evo_plugin_dir}/liborg-gnome-backup-restore.so
 
 %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
@@ -514,8 +514,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-calendar-http.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-http.so
 
-#%{evo_plugin_dir}/org-gnome-calendar-weather.eplug
-#%{evo_plugin_dir}/liborg-gnome-calendar-weather.so
+%{evo_plugin_dir}/org-gnome-calendar-weather.eplug
+%{evo_plugin_dir}/liborg-gnome-calendar-weather.so
 
 %{evo_plugin_dir}/org-gnome-default-mailer.eplug
 %{evo_plugin_dir}/liborg-gnome-default-mailer.so
@@ -565,8 +565,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-imap-features.eplug
 %{evo_plugin_dir}/liborg-gnome-imap-features.so
 
-#%{evo_plugin_dir}/org-gnome-itip-formatter.eplug
-#%{evo_plugin_dir}/liborg-gnome-itip-formatter.so
+%{evo_plugin_dir}/org-gnome-itip-formatter.eplug
+%{evo_plugin_dir}/liborg-gnome-itip-formatter.so
 
 #%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
 #%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so



From jkratoch at fedoraproject.org  Tue Aug 18 19:37:35 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 18 Aug 2009 19:37:35 +0000 (UTC)
Subject: rpms/gdb/devel gdb-archer.patch,1.24,1.25 gdb.spec,1.376,1.377
Message-ID: <20090818193735.EAD2311C00D7@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6618

Modified Files:
	gdb-archer.patch gdb.spec 
Log Message:
* Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-3
- archer-jankratochvil-fedora12 commit: 850e3cb38a25cb7fdfa4cef667626ffbde51bcac
- Fix the hardware watchpoints.


gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  137 -
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 +-
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  245 +
 cp-support.c                                             |   88 
 cp-support.h                                             |   49 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   28 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  357 ++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1842 ++++++++++-----
 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                                                  |   19 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 ++++
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infrun.c                                                 |    8 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 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                                          |  165 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 +++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 ++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 ++
 python/python-symtab.c                                   |  322 ++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |   55 
 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                                                |   42 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 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/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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                  |   30 
 testsuite/gdb.cp/namespace-recursive.exp                 |   66 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 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/callframecfa.S                      |  309 ++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 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.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   96 
 testsuite/gdb.python/python-prettyprint.c                |   13 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 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           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   86 
 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                                                 |  254 +-
 valprint.c                                               |    3 
 value.c                                                  |  145 +
 value.h                                                  |    8 
 varobj.c                                                 |  610 +++-
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 243 files changed, 18341 insertions(+), 2642 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gdb-archer.patch	18 Aug 2009 18:51:17 -0000	1.24
+++ gdb-archer.patch	18 Aug 2009 19:37:35 -0000	1.25
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 5e0d1cc74f119391a2c3ae25ef5749fc28674f06
+commit 850e3cb38a25cb7fdfa4cef667626ffbde51bcac
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -290,6 +290,102 @@ index 9b5d2c6..61676a9 100644
    ada_op_name,
    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
+--- 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)
+   return value;
+ }
+ 
++/* Set debug register REGNUM to VALUE in only the one LWP of PTID.  */
++
+ static void
+ amd64_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
+ {
+@@ -286,6 +288,8 @@ amd64_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
+     perror_with_name (_("Couldn't write debug register"));
+ }
+ 
++/* Set DR_CONTROL to ADDR in all LWPs of LWP_LIST.  */
++
+ static void
+ amd64_linux_dr_set_control (unsigned long control)
+ {
+@@ -297,6 +301,8 @@ amd64_linux_dr_set_control (unsigned long control)
+     amd64_linux_dr_set (ptid, DR_CONTROL, control);
+ }
+ 
++/* Set address REGNUM (zero based) to ADDR in all LWPs of LWP_LIST.  */
++
+ static void
+ amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr)
+ {
+@@ -310,18 +316,55 @@ amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr)
+     amd64_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr);
+ }
+ 
++/* Set address REGNUM (zero based) to zero in all LWPs of LWP_LIST.  */
++
+ static void
+ amd64_linux_dr_reset_addr (int regnum)
+ {
+   amd64_linux_dr_set_addr (regnum, 0);
+ }
+ 
++/* Get DR_STATUS from only the one LWP of INFERIOR_PTID.  */
++
+ static unsigned long
+ amd64_linux_dr_get_status (void)
+ {
+   return amd64_linux_dr_get (inferior_ptid, DR_STATUS);
+ }
+ 
++/* Unset VALUE bits in DR_STATUS in all LWPs of LWP_LIST.  */
++
++static void
++amd64_linux_dr_unset_status (unsigned long mask)
++{
++  struct lwp_info *lp;
++  ptid_t ptid;
++
++  ALL_LWPS (lp, ptid)
++    {
++      unsigned long value;
++      
++      value = amd64_linux_dr_get (ptid, DR_STATUS);
++      value &= ~mask;
++      amd64_linux_dr_set (ptid, DR_STATUS, value);
++    }
++}
++
++/* See i386_dr_low_type.detach.  Do not use wrappers amd64_linux_dr_set_control
++   or amd64_linux_dr_reset_addr as they would modify the register cache
++   (amd64_linux_dr).  */
++
++static void
++amd64_linux_dr_detach (void)
++{
++  int regnum;
++
++  amd64_linux_dr_set (inferior_ptid, DR_CONTROL, 0);
++  amd64_linux_dr_unset_status (~0UL);
++  for (regnum = DR_FIRSTADDR; regnum <= DR_LASTADDR; regnum++)
++    amd64_linux_dr_set (inferior_ptid, regnum, 0);
++}
++
+ static void
+ amd64_linux_new_thread (ptid_t ptid)
+ {
+@@ -672,6 +715,8 @@ _initialize_amd64_linux_nat (void)
+   i386_dr_low.set_addr = amd64_linux_dr_set_addr;
+   i386_dr_low.reset_addr = amd64_linux_dr_reset_addr;
+   i386_dr_low.get_status = amd64_linux_dr_get_status;
++  i386_dr_low.unset_status = amd64_linux_dr_unset_status;
++  i386_dr_low.detach = amd64_linux_dr_detach;
+   i386_set_debug_register_length (8);
+ 
+   /* Override the GNU/Linux inferior startup hook.  */
 diff --git a/gdb/block.c b/gdb/block.c
 index 1889ecd..37fa342 100644
 --- a/gdb/block.c
@@ -368,7 +464,7 @@ index 53e7371..d373f8a 100644
 +
  #endif /* BLOCK_H */
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index f3940e1..70222a4 100644
+index f3940e1..2349fbc 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
 @@ -59,6 +59,7 @@
@@ -477,7 +573,97 @@ index f3940e1..70222a4 100644
  	return;
        }
  
-@@ -8843,6 +8856,22 @@ all_tracepoints ()
+@@ -1690,6 +1703,7 @@ detach_breakpoints (int pid)
+     if (b->inserted)
+       val |= remove_breakpoint (b, mark_inserted);
+   }
++  val |= target_detach_watchpoints ();
+   do_cleanups (old_chain);
+   return val;
+ }
+@@ -1782,12 +1796,14 @@ remove_breakpoint (struct bp_location *b, insertion_state_t is)
+ 	return val;
+       b->inserted = (is == mark_inserted);
+     }
+-  else if (b->loc_type == bp_loc_hardware_watchpoint)
++  /* bp_loc_hardware_watchpoint with mark_inserted is being handled by
++     target_detach_watchpoints.  */
++  else if (b->loc_type == bp_loc_hardware_watchpoint && is == mark_uninserted)
+     {
+       struct value *v;
+       struct value *n;
+ 
+-      b->inserted = (is == mark_inserted);
++      b->inserted = 0;
+       val = target_remove_watchpoint (b->address, b->length, 
+ 				      b->watchpoint_type);
+ 
+@@ -2961,8 +2977,12 @@ bpstat_check_location (const struct bp_location *bl, CORE_ADDR bp_addr)
+ 
+ /* If BS refers to a watchpoint, determine if the watched values
+    has actually changed, and we should stop.  If not, set BS->stop
+-   to 0.  */
+-static void
++   to 0.
++   Return 0 for watchpoints which could not be the cause of this trap.
++   In such case PRINT_IT will be print_it_noop and STOP will be 0.
++   Otherwise return 1 but in such case it is not guaranteed whether this
++   breakpoint did or did not trigger this trap.  */
++static int
+ bpstat_check_watchpoint (bpstat bs)
+ {
+   const struct bp_location *bl = bs->breakpoint_at;
+@@ -3051,8 +3071,10 @@ bpstat_check_watchpoint (bpstat bs)
+ 	     anything for this watchpoint.  */
+ 	  bs->print_it = print_it_noop;
+ 	  bs->stop = 0;
++	  return 0;
+ 	}
+     }
++  return 1;
+ }
+ 
+ 
+@@ -3156,6 +3178,8 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
+ 
+   ALL_BP_LOCATIONS (bl)
+   {
++    bpstat bs_prev = bs;
++
+     b = bl->owner;
+     gdb_assert (b);
+     if (!breakpoint_enabled (b) && b->enable_state != bp_permanent)
+@@ -3176,6 +3200,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
+     /* Come here if it's a watchpoint, or if the break address matches */
+ 
+     bs = bpstat_alloc (bl, bs);	/* Alloc a bpstat to explain stop */
++    gdb_assert (bs_prev->next == bs);
+ 
+     /* Assume we stop.  Should we find watchpoint that is not actually
+        triggered, or if condition of breakpoint is false, we'll reset
+@@ -3183,9 +3208,18 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
+     bs->stop = 1;
+     bs->print = 1;
+ 
+-    bpstat_check_watchpoint (bs);
+-    if (!bs->stop)
+-      continue;
++    if (!bpstat_check_watchpoint (bs))
++      {
++	/* Ensure bpstat_explains_signal stays false if this BL could not be
++	   the cause of this trap.  */
++
++	gdb_assert (bs->print_it == print_it_noop);
++	gdb_assert (!bs->stop);
++	xfree (bs);
++	bs = bs_prev;
++	bs->next = NULL;
++	continue;
++      }
+ 
+     if (b->type == bp_thread_event || b->type == bp_overlay_event
+ 	|| b->type == bp_longjmp_master)
+@@ -8843,6 +8877,22 @@ all_tracepoints ()
    return tp_vec;
  }
  
@@ -500,7 +686,7 @@ index f3940e1..70222a4 100644
  

  /* This help string is used for the break, hbreak, tbreak and thbreak commands.
     It is defined as a macro to prevent duplication.
-@@ -9345,4 +9374,5 @@ inferior in all-stop mode, gdb behaves as if always-inserted mode is off."),
+@@ -9345,4 +9395,5 @@ inferior in all-stop mode, gdb behaves as if always-inserted mode is off."),
    automatic_hardware_breakpoints = 1;
  
    observer_attach_about_to_proceed (breakpoint_about_to_proceed);
@@ -10362,6 +10548,274 @@ index 5e55573..5439aba 100644
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
+diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
+index 991b27f..411b41b 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,
+ 
+ static unsigned long i386_linux_dr[DR_CONTROL + 1];
+ 
++/* Get debug register REGNUM value from only the one LWP of PTID.  */
++
+ static unsigned long
+ i386_linux_dr_get (ptid_t ptid, int regnum)
+ {
+@@ -614,6 +616,8 @@ i386_linux_dr_get (ptid_t ptid, int regnum)
+   return value;
+ }
+ 
++/* Set debug register REGNUM to VALUE in only the one LWP of PTID.  */
++
+ static void
+ i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
+ {
+@@ -630,6 +634,8 @@ i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
+     perror_with_name (_("Couldn't write debug register"));
+ }
+ 
++/* Set DR_CONTROL to ADDR in all LWPs of LWP_LIST.  */
++
+ static void
+ i386_linux_dr_set_control (unsigned long control)
+ {
+@@ -641,6 +647,8 @@ i386_linux_dr_set_control (unsigned long control)
+     i386_linux_dr_set (ptid, DR_CONTROL, control);
+ }
+ 
++/* Set address REGNUM (zero based) to ADDR in all LWPs of LWP_LIST.  */
++
+ static void
+ i386_linux_dr_set_addr (int regnum, CORE_ADDR addr)
+ {
+@@ -654,18 +662,55 @@ i386_linux_dr_set_addr (int regnum, CORE_ADDR addr)
+     i386_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr);
+ }
+ 
++/* Set address REGNUM (zero based) to zero in all LWPs of LWP_LIST.  */
++
+ static void
+ i386_linux_dr_reset_addr (int regnum)
+ {
+   i386_linux_dr_set_addr (regnum, 0);
+ }
+ 
++/* Get DR_STATUS from only the one LWP of INFERIOR_PTID.  */
++
+ static unsigned long
+ i386_linux_dr_get_status (void)
+ {
+   return i386_linux_dr_get (inferior_ptid, DR_STATUS);
+ }
+ 
++/* Unset VALUE bits in DR_STATUS in all LWPs of LWP_LIST.  */
++
++static void
++i386_linux_dr_unset_status (unsigned long mask)
++{
++  struct lwp_info *lp;
++  ptid_t ptid;
++
++  ALL_LWPS (lp, ptid)
++    {
++      unsigned long value;
++      
++      value = i386_linux_dr_get (ptid, DR_STATUS);
++      value &= ~mask;
++      i386_linux_dr_set (ptid, DR_STATUS, value);
++    }
++}
++
++/* See i386_dr_low_type.detach.  Do not use wrappers i386_linux_dr_set_control
++   or i386_linux_dr_reset_addr as they would modify the register cache
++   (i386_linux_dr).  */
++
++static void
++i386_linux_dr_detach (void)
++{
++  int regnum;
++
++  i386_linux_dr_set (inferior_ptid, DR_CONTROL, 0);
++  i386_linux_dr_unset_status (~0UL);
++  for (regnum = DR_FIRSTADDR; regnum <= DR_LASTADDR; regnum++)
++    i386_linux_dr_set (inferior_ptid, regnum, 0);
++}
++
+ static void
+ i386_linux_new_thread (ptid_t ptid)
+ {
+@@ -832,6 +877,8 @@ _initialize_i386_linux_nat (void)
+   i386_dr_low.set_addr = i386_linux_dr_set_addr;
+   i386_dr_low.reset_addr = i386_linux_dr_reset_addr;
+   i386_dr_low.get_status = i386_linux_dr_get_status;
++  i386_dr_low.unset_status = i386_linux_dr_unset_status;
++  i386_dr_low.detach = i386_linux_dr_detach;
+   i386_set_debug_register_length (4);
+ 
+   /* Override the default ptrace resume method.  */
+diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
+index ab1bd8a..ee330b8 100644
+--- a/gdb/i386-nat.c
++++ b/gdb/i386-nat.c
+@@ -137,8 +137,11 @@ struct i386_dr_low_type i386_dr_low;
+ #define I386_DR_GET_RW_LEN(i) \
+   ((dr_control_mirror >> (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))) & 0x0f)
+ 
++/* Mask that this I'th watchpoint has triggered.  */
++#define I386_DR_WATCH_MASK(i)	(1 << (i))
++
+ /* Did the watchpoint whose address is in the I'th register break?  */
+-#define I386_DR_WATCH_HIT(i)	(dr_status_mirror & (1 << (i)))
++#define I386_DR_WATCH_HIT(i)	(dr_status_mirror & I386_DR_WATCH_MASK (i))
+ 
+ /* A macro to loop over all debug registers.  */
+ #define ALL_DEBUG_REGISTERS(i)	for (i = 0; i < DR_NADDR; i++)
+@@ -358,6 +361,10 @@ i386_insert_aligned_watchpoint (CORE_ADDR addr, unsigned len_rw_bits)
+   i386_dr_low.set_addr (i, addr);
+   i386_dr_low.set_control (dr_control_mirror);
+ 
++  /* Only a sanity check for leftover bits (set possibly only by inferior).  */
++  if (i386_dr_low.unset_status)
++    i386_dr_low.unset_status (I386_DR_WATCH_MASK (i));
++
+   return 0;
+ }
+ 
+@@ -387,6 +394,11 @@ i386_remove_aligned_watchpoint (CORE_ADDR addr, unsigned len_rw_bits)
+ 	      i386_dr_low.set_control (dr_control_mirror);
+ 	      if (i386_dr_low.reset_addr)
+ 		i386_dr_low.reset_addr (i);
++
++	      /* Status must be already queried for each LWP.  Otherwise it will
++	         be lost in all-stop mode + breakpoint always-inserted off.  */
++	      if (i386_dr_low.unset_status)
++		i386_dr_low.unset_status (I386_DR_WATCH_MASK (i));
+ 	    }
+ 	  retval = 0;
+ 	}
+@@ -520,6 +532,17 @@ i386_remove_watchpoint (CORE_ADDR addr, int len, int type)
+   return retval;
+ }
+ 
++/* See target_detach_watchpoints.  */
++
++static int
++i386_detach_watchpoints (void)
++{
++  if (i386_dr_low.detach)
++    i386_dr_low.detach ();
++
++  return 0;
++}
++
+ /* 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
+ i386_stopped_by_watchpoint (void)
+ {
+   CORE_ADDR addr = 0;
+-  return i386_stopped_data_address (&current_target, &addr);
+-}
+-
+-/* Return non-zero if the inferior has some break/watchpoint that
+-   triggered.  */
+-
+-static int
+-i386_stopped_by_hwbp (void)
+-{
+-  int i;
+-
+-  dr_status_mirror = i386_dr_low.get_status ();
+-  if (maint_show_dr)
+-    i386_show_dr ("stopped_by_hwbp", 0, 0, hw_execute);
+-
+-  ALL_DEBUG_REGISTERS(i)
+-    {
+-      if (I386_DR_WATCH_HIT (i))
+-	return 1;
+-    }
+-
+-  return 0;
++  return target_stopped_data_address (&current_target, &addr);
+ }
+ 
+ /* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
+@@ -690,6 +692,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;
++  t->to_detach_watchpoints = i386_detach_watchpoints;
+   t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint;
+   t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint;
+ }
+diff --git a/gdb/i386-nat.h b/gdb/i386-nat.h
+index f49b9f6..cd31958 100644
+--- a/gdb/i386-nat.h
++++ b/gdb/i386-nat.h
+@@ -49,16 +49,23 @@ extern void i386_use_watchpoints (struct target_ops *);
+    functions are:
+ 
+       set_control              -- set the debug control (DR7)
+-				  register to a given value
++				  register to a given value for all LWPs
+ 
+       set_addr                 -- put an address into one debug
+-				  register
++				  register for all LWPs
+ 
+       reset_addr               -- reset the address stored in
+-				  one debug register
++				  one debug register for all LWPs
+ 
+       get_status               -- return the value of the debug
+-				  status (DR6) register.
++				  status (DR6) register for current LWP
++
++      unset_status             -- unset the specified bits of the debug
++				  status (DR6) register for all LWPs
++
++      detach                   -- clear all debug registers of only the
++				  INFERIOR_PTID task without affecting any
++				  register caches.
+ 
+    Additionally, the native file should set the debug_register_length
+    field to 4 or 8 depending on the number of bytes used for
+@@ -70,6 +77,8 @@ struct i386_dr_low_type
+     void (*set_addr) (int, CORE_ADDR);
+     void (*reset_addr) (int);
+     unsigned long (*get_status) (void);
++    void (*unset_status) (unsigned long);
++    void (*detach) (void);
+     int debug_register_length;
+   };
+ 
+diff --git a/gdb/infrun.c b/gdb/infrun.c
+index e3eddce..8917ac9 100644
+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -2630,6 +2630,10 @@ handle_inferior_event (struct execution_control_state *ecs)
+ 
+       stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
+ 
++      /* Clear WATCHPOINT_TRIGGERED values from previous stop which could
++	 confuse bpstat_stop_status and bpstat_explains_signal.  */
++      watchpoints_triggered (&ecs->ws);
++
+       ecs->event_thread->stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid);
+ 
+       ecs->random_signal = !bpstat_explains_signal (ecs->event_thread->stop_bpstat);
+@@ -2667,6 +2671,10 @@ handle_inferior_event (struct execution_control_state *ecs)
+ 
+       stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
+ 
++      /* Clear WATCHPOINT_TRIGGERED values from previous stop which could
++	 confuse bpstat_stop_status and bpstat_explains_signal.  */
++      watchpoints_triggered (&ecs->ws);
++
+       /* This causes the eventpoints and symbol table to be reset.
+          Must do this now, before trying to determine whether to
+          stop.  */
 diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
 index 6b68e7d..5095180 100644
 --- a/gdb/jv-lang.c
@@ -10507,6 +10961,158 @@ index 3e943a1..3b8956c 100644
  	    build_canonical_line_spec (values.sals, copy, canonical);
  	}
        return values;
+diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
+index 1308844..e6fad24 100644
+--- a/gdb/linux-nat.c
++++ b/gdb/linux-nat.c
+@@ -1629,6 +1629,7 @@ resume_callback (struct lwp_info *lp, void *data)
+       lp->stopped = 0;
+       lp->step = 0;
+       memset (&lp->siginfo, 0, sizeof (lp->siginfo));
++      lp->watchpoint_hit_set = 0;
+     }
+   else if (lp->stopped && debug_linux_nat)
+     fprintf_unfiltered (gdb_stdlog, "RC: Not resuming sibling %s (has pending)\n",
+@@ -1766,6 +1767,7 @@ linux_nat_resume (struct target_ops *ops,
+ 
+   linux_ops->to_resume (linux_ops, ptid, step, signo);
+   memset (&lp->siginfo, 0, sizeof (lp->siginfo));
++  lp->watchpoint_hit_set = 0;
+ 
+   if (debug_linux_nat)
+     fprintf_unfiltered (gdb_stdlog,
+@@ -2164,6 +2166,78 @@ maybe_clear_ignore_sigint (struct lwp_info *lp)
+     }
+ }
+ 
++/* Fetch the possible triggered data watchpoint info and store it to LP.
++   The hardware data watchpoint trigger gets cleared during this fetch.  */
++
++static void
++save_sigtrap (struct lwp_info *lp)
++{
++  struct cleanup *old_chain;
++
++  /* linux_nat_stopped_data_address is not even installed in this case.  */
++  if (linux_ops->to_stopped_data_address == NULL)
++    return;
++
++  old_chain = save_inferior_ptid ();
++  inferior_ptid = lp->ptid;
++
++  lp->watchpoint_hit_set =
++    linux_ops->to_stopped_data_address (&current_target, &lp->watchpoint_hit);
++
++  do_cleanups (old_chain);
++}
++
++/* Wrap target_stopped_data_address where the GNU/Linux native target may be
++   directed by the watchpoint/debug register number.  Base the reported value
++   on the triggered data address instead.  During inferior stop the assignment
++   of watchpoint/debug registers may change making the register number specific
++   trigger info stale.  */
++
++static int
++linux_nat_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
++{
++  struct lwp_info *lp = find_lwp_pid (inferior_ptid);
++
++  gdb_assert (lp != NULL);
++
++  *addr_p = lp->watchpoint_hit;
++
++  return lp->watchpoint_hit_set;
++}
++
++/* In `set follow-fork-mode child' with multithreaded parent we need to detach
++   watchpoints from all the LWPs.  In such case INFERIOR_PTID will be the
++   non-threaded new child while LWP_LIST will still contain all the threads of
++   the parent being detached.  */
++
++static int
++linux_nat_detach_watchpoints (void)
++{
++  struct lwp_info *lp;
++  int found = 0, retval = 0;
++  ptid_t filter = pid_to_ptid (ptid_get_pid (inferior_ptid));
++  struct cleanup *old_chain = save_inferior_ptid ();
++
++  for (lp = lwp_list; lp; lp = lp->next)
++    if (ptid_match (lp->ptid, filter))
++      {
++	inferior_ptid = lp->ptid;
++	retval |= linux_ops->to_detach_watchpoints ();
++	found = 1;
++      }
++
++  do_cleanups (old_chain);
++
++  if (!found)
++    {
++      gdb_assert (!is_lwp (inferior_ptid));
++
++      retval |= linux_ops->to_detach_watchpoints ();
++    }
++
++  return retval;
++}
++
+ /* Wait until LP is stopped.  */
+ 
+ static int
+@@ -2215,6 +2289,8 @@ stop_wait_callback (struct lwp_info *lp, void *data)
+ 	      /* Save the trap's siginfo in case we need it later.  */
+ 	      save_siginfo (lp);
+ 
++	      save_sigtrap (lp);
++
+ 	      /* Now resume this LWP and get the SIGSTOP event. */
+ 	      errno = 0;
+ 	      ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0, 0);
+@@ -2579,9 +2655,13 @@ linux_nat_filter_event (int lwpid, int status, int options)
+       add_thread (lp->ptid);
+     }
+ 
+-  /* Save the trap's siginfo in case we need it later.  */
+   if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP)
+-    save_siginfo (lp);
++    {
++      /* Save the trap's siginfo in case we need it later.  */
++      save_siginfo (lp);
++
++      save_sigtrap (lp);
++    }
+ 
+   /* Handle GNU/Linux's extended waitstatus for trace events.  */
+   if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP && status >> 16 != 0)
+@@ -4871,6 +4951,10 @@ linux_nat_add_target (struct target_ops *t)
+   t->to_thread_alive = linux_nat_thread_alive;
+   t->to_pid_to_str = linux_nat_pid_to_str;
+   t->to_has_thread_control = tc_schedlock;
++  if (linux_ops->to_stopped_data_address)
++    t->to_stopped_data_address = linux_nat_stopped_data_address;
++  if (linux_ops->to_detach_watchpoints)
++    t->to_detach_watchpoints = linux_nat_detach_watchpoints;
+ 
+   t->to_can_async_p = linux_nat_can_async_p;
+   t->to_is_async_p = linux_nat_is_async_p;
+diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
+index d1ed6fc..faf68bb 100644
+--- a/gdb/linux-nat.h
++++ b/gdb/linux-nat.h
+@@ -62,6 +62,12 @@ struct lwp_info
+      be the address of a hardware watchpoint.  */
+   struct siginfo siginfo;
+ 
++  /* WATCHPOINT_HIT_SET is non-zero if this LWP stopped with a trap and a data
++     watchpoint has been found as triggered.  In such case WATCHPOINT_HIT
++     contains data address of the triggered data watchpoint.  */
++  unsigned watchpoint_hit_set : 1;
++  CORE_ADDR watchpoint_hit;
++
+   /* Non-zero if we expect a duplicated SIGINT.  */
+   int ignore_sigint;
+ 
 diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
 index 88c7e5e..2d0b3ca 100644
 --- a/gdb/m2-lang.c
@@ -11406,6 +12012,43 @@ index cbda9c3..a07e6f2 100644
 +extern void exp_types_mark_used (struct expression *exp);
 +
  #endif /* PARSER_DEFS_H */
+diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
+index 47b74ad..22fb2fc 100644
+--- a/gdb/ppc-linux-nat.c
++++ b/gdb/ppc-linux-nat.c
+@@ -1391,6 +1391,24 @@ ppc_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw)
+   return 0;
+ }
+ 
++/* See target_detach_watchpoints.  Do not use wrapper
++   ppc_linux_remove_watchpoint as it would modify the register cache
++   (saved_dabr_value).  */
++
++static int
++ppc_linux_detach_watchpoints (void)
++{
++  pid_t tid;
++
++  tid = TIDGET (inferior_ptid);
++  if (tid == 0)
++    tid = PIDGET (inferior_ptid);
++
++  if (ptrace (PTRACE_SET_DEBUGREG, tid, NULL, NULL) < 0)
++    return -1;
++  return 0;
++}
++
+ static void
+ ppc_linux_new_thread (ptid_t ptid)
+ {
+@@ -1648,6 +1666,7 @@ _initialize_ppc_linux_nat (void)
+   t->to_region_ok_for_hw_watchpoint = ppc_linux_region_ok_for_hw_watchpoint;
+   t->to_insert_watchpoint = ppc_linux_insert_watchpoint;
+   t->to_remove_watchpoint = ppc_linux_remove_watchpoint;
++  t->to_detach_watchpoints = ppc_linux_detach_watchpoints;
+   t->to_stopped_by_watchpoint = ppc_linux_stopped_by_watchpoint;
+   t->to_stopped_data_address = ppc_linux_stopped_data_address;
+   t->to_watchpoint_addr_within_range = ppc_linux_watchpoint_addr_within_range;
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
 index 5d8b936..fb0a455 100644
 --- a/gdb/printcmd.c
@@ -18928,11 +19571,94 @@ index 740d4e0..461ff95 100644
  						  const domain_enum domain);
  
  extern struct symtabs_and_lines
+diff --git a/gdb/target.c b/gdb/target.c
+index 7ee444f..631e5f8 100644
+--- a/gdb/target.c
++++ b/gdb/target.c
+@@ -124,6 +124,8 @@ static int debug_to_insert_watchpoint (CORE_ADDR, int, int);
+ 
+ static int debug_to_remove_watchpoint (CORE_ADDR, int, int);
+ 
++static int debug_to_detach_watchpoints (void);
++
+ static int debug_to_stopped_by_watchpoint (void);
+ 
+ static int debug_to_stopped_data_address (struct target_ops *, CORE_ADDR *);
+@@ -584,6 +586,7 @@ update_current_target (void)
+       INHERIT (to_remove_hw_breakpoint, t);
+       INHERIT (to_insert_watchpoint, t);
+       INHERIT (to_remove_watchpoint, t);
++      INHERIT (to_detach_watchpoints, t);
+       INHERIT (to_stopped_data_address, t);
+       INHERIT (to_have_steppable_watchpoint, t);
+       INHERIT (to_have_continuable_watchpoint, t);
+@@ -694,6 +697,9 @@ update_current_target (void)
+   de_fault (to_remove_watchpoint,
+ 	    (int (*) (CORE_ADDR, int, int))
+ 	    return_minus_one);
++  de_fault (to_detach_watchpoints,
++	    (int (*) (void))
++	    return_zero);
+   de_fault (to_stopped_by_watchpoint,
+ 	    (int (*) (void))
+ 	    return_zero);
+@@ -3095,6 +3101,19 @@ debug_to_remove_watchpoint (CORE_ADDR addr, int len, int type)
+   return retval;
+ }
+ 
++static int
++debug_to_detach_watchpoints (void)
++{
++  int retval;
++
++  retval = debug_target.to_detach_watchpoints ();
++
++  fprintf_unfiltered (gdb_stdlog,
++		      "target_detach_watchpoints () = %ld\n",
++		      (unsigned long) retval);
++  return retval;
++}
++
+ static void
+ debug_to_terminal_init (void)
+ {
+@@ -3342,6 +3361,7 @@ setup_target_debug (void)
+   current_target.to_remove_hw_breakpoint = debug_to_remove_hw_breakpoint;
+   current_target.to_insert_watchpoint = debug_to_insert_watchpoint;
+   current_target.to_remove_watchpoint = debug_to_remove_watchpoint;
++  current_target.to_detach_watchpoints = debug_to_detach_watchpoints;
+   current_target.to_stopped_by_watchpoint = debug_to_stopped_by_watchpoint;
+   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 2c743e9..ef29610 100644
+index 2c743e9..dbbce12 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
-@@ -1157,6 +1157,20 @@ extern int target_search_memory (CORE_ADDR start_addr,
+@@ -376,6 +376,7 @@ struct target_ops
+     int (*to_remove_hw_breakpoint) (struct gdbarch *, struct bp_target_info *);
+     int (*to_remove_watchpoint) (CORE_ADDR, int, int);
+     int (*to_insert_watchpoint) (CORE_ADDR, int, int);
++    int (*to_detach_watchpoints) (void);
+     int (*to_stopped_by_watchpoint) (void);
+     int to_have_steppable_watchpoint;
+     int to_have_continuable_watchpoint;
+@@ -1120,6 +1121,15 @@ extern char *normal_pid_to_str (ptid_t ptid);
+ #define	target_remove_watchpoint(addr, len, type)	\
+      (*current_target.to_remove_watchpoint) (addr, len, type)
+ 
++/* Clear all debug registers without affecting any register caches.  Function
++   acts on INFERIOR_PTID which should be the forked-off process, either the
++   non-threaded child one or the threaded parent one, depending on `set
++   follow-fork-mode'.  Both watchpoints and hardware breakpoints get removed.
++   Return 0 on success, -1 on failure.  */
++
++#define	target_detach_watchpoints()	\
++     (*current_target.to_detach_watchpoints) ()
++
+ #define target_insert_hw_breakpoint(gdbarch, bp_tgt) \
+      (*current_target.to_insert_hw_breakpoint) (gdbarch, bp_tgt)
+ 
+@@ -1157,6 +1167,20 @@ extern int target_search_memory (CORE_ADDR start_addr,
                                   ULONGEST pattern_len,
                                   CORE_ADDR *found_addrp);
  
@@ -18953,7 +19679,7 @@ index 2c743e9..ef29610 100644
  /* Command logging facility.  */
  
  #define target_log_command(p)						\
-@@ -1276,6 +1290,14 @@ extern struct target_ops *find_target_beneath (struct target_ops *);
+@@ -1276,6 +1300,14 @@ extern struct target_ops *find_target_beneath (struct target_ops *);
  
  extern char *target_get_osdata (const char *type);
  
@@ -20519,26 +21245,111 @@ index 0000000..5da7378
 +gdb_test "p temp1" " = '1' <repeats 78 times>" "second: print temp1"
 +gdb_test "p temp2" " = '2' <repeats 78 times>" "second: print temp2"
 +gdb_test "p temp3" " = '3' <repeats 48 times>" "second: print temp3"
-diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp
-index 4095ccf..03c07d5 100644
---- a/gdb/testsuite/gdb.cp/cp-relocate.exp
-+++ b/gdb/testsuite/gdb.cp/cp-relocate.exp
-@@ -30,7 +30,7 @@ proc get_func_address { func } {
-     global gdb_prompt hex
+diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.c b/gdb/testsuite/gdb.base/watchpoint-hw.c
+index 8da9af5..e2de53a 100644
+--- a/gdb/testsuite/gdb.base/watchpoint-hw.c
++++ b/gdb/testsuite/gdb.base/watchpoint-hw.c
+@@ -20,5 +20,11 @@ int watchee;
+ int
+ main (void)
+ {
++  volatile int dummy;
++
++  dummy = watchee;
++  dummy = 1;
++  dummy = 2;	/* break-at-exit */
++
+   return 0;
+ }
+diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp
+index a2bb731..d74d6c7 100644
+--- a/gdb/testsuite/gdb.base/watchpoint-hw.exp
++++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp
+@@ -21,19 +21,12 @@ if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
+     return
+ }
  
-     set rfunc [string_to_regexp $func]
--    gdb_test_multiple "print '${func}'" "get address of ${func}" {
-+    gdb_test_multiple "print ${func}" "get address of ${func}" {
- 	-re "\\\$\[0-9\]+ = \\{.*\\} (0|($hex) <${rfunc}>)\[\r\n\]+${gdb_prompt} $" {
- 	    # $1 = {int ()} 0x24 <function_bar>
- 	    # But if the function is at zero, the name may be omitted.
-@@ -130,7 +130,7 @@ gdb_test "add-symbol-file ${binfile} 0 -s ${func1_sec} 0x10000 -s ${func2_sec} 0
- 	"y"
+-set testfile watchpoint-hw
+-set srcfile ${testfile}.c
+-set binfile ${objdir}/${subdir}/${testfile}
+-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+-    untested "Couldn't compile test program"
++set test watchpoint-hw
++set srcfile ${test}.c
++if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } {
+     return -1
+ }
  
- # Make sure the function addresses were updated.
--gdb_test "break *'$func1_name'" \
-+gdb_test "break *$func1_name" \
-     "Breakpoint $decimal at 0x1....: file .*"
+-gdb_exit
+-gdb_start
+-gdb_reinitialize_dir $srcdir/$subdir
+-gdb_load ${binfile}
+-
+ # Create the watchpoint before the inferior gets started.  Now the native CPU
+ # target is still not active and its `to_can_use_hw_breakpoint' is not
+ # installed, therefore only a software watchpoint gets created.
+@@ -43,10 +36,40 @@ gdb_test "watch watchee" "atchpoint 1: watchee"
+ # `runto_main' or `runto main' would delete the watchpoint created above.
+ 
+ if { [gdb_start_cmd] < 0 } {
+-    untested start
++    untested ${test}.exp
+     return -1
+ }
+ gdb_test "" "main .* at .*" "start"
+ 
+ # Check it is really a `hw'-watchpoint.
+ gdb_test "info watchpoints" "1 *hw watchpoint .* watchee"
++
++# Before the inferior gets started we would get:
++# 	Target does not support this type of hardware watchpoint.
++gdb_test "delete 1"
++gdb_test "rwatch watchee"
++
++set breakline [gdb_get_line_number "break-at-exit"]
++gdb_breakpoint $breakline
++
++gdb_test "continue" "Continuing.\r\nHardware read watchpoint 3: watchee\r\n\r\nValue = 0\r\n.*"
++
++# Here should be no repeated notification of the read watchpoint.
++gdb_test "continue" \
++	 "Continuing\\.\[ \r\n\]+Breakpoint \[0-9\]+, .*break-at-exit.*" \
++	 "continue to break-at-exit after rwatch"
++
++clean_restart ${test}
++
++if ![runto_main] {
++    untested ${test}.exp
++    return -1
++}
++
++gdb_test "hbreak ${srcfile}:${breakline}" \
++	 "Hardware assisted breakpoint 2 at 0x\[0-9a-f\]+: file .*${srcfile}, line ${breakline}\\." \
++	 "hbreak"
++
++gdb_test "continue" \
++	 "Continuing\\.\[ \r\n\]+Breakpoint \[0-9\]+, .*break-at-exit.*" \
++	 "continue to break-at-exit after hbreak"
+diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp
+index 4095ccf..03c07d5 100644
+--- a/gdb/testsuite/gdb.cp/cp-relocate.exp
++++ b/gdb/testsuite/gdb.cp/cp-relocate.exp
+@@ -30,7 +30,7 @@ proc get_func_address { func } {
+     global gdb_prompt hex
+ 
+     set rfunc [string_to_regexp $func]
+-    gdb_test_multiple "print '${func}'" "get address of ${func}" {
++    gdb_test_multiple "print ${func}" "get address of ${func}" {
+ 	-re "\\\$\[0-9\]+ = \\{.*\\} (0|($hex) <${rfunc}>)\[\r\n\]+${gdb_prompt} $" {
+ 	    # $1 = {int ()} 0x24 <function_bar>
+ 	    # But if the function is at zero, the name may be omitted.
+@@ -130,7 +130,7 @@ gdb_test "add-symbol-file ${binfile} 0 -s ${func1_sec} 0x10000 -s ${func2_sec} 0
+ 	"y"
+ 
+ # Make sure the function addresses were updated.
+-gdb_test "break *'$func1_name'" \
++gdb_test "break *$func1_name" \
+     "Breakpoint $decimal at 0x1....: file .*"
 -gdb_test "break *'$func2_name'" \
 +gdb_test "break *$func2_name" \
      "Breakpoint $decimal at 0x2....: file .*"
@@ -24965,6 +25776,1028 @@ index 5223fc8..03e1eab 100644
  }
  
  gdb_py_test_multiple "multi-line python command" \
+diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c b/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c
+new file mode 100644
+index 0000000..4dc308b
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c
+@@ -0,0 +1,175 @@
++/* Test case for forgotten hw-watchpoints after fork()-off of a process.
++
++   Copyright 2008, 2009 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 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 <string.h>
++#include <errno.h>
++
++static void
++delay (void)
++{
++  int i = usleep (1000000 / 100);
++  assert (i == 0 || errno == EINTR);
++}
++
++#if defined FOLLOW_PARENT
++
++static void
++forkoff (int nr)
++{
++  pid_t child, pid_got;
++  int exit_code = 42 + nr;
++  int status, i;
++
++  child = fork ();
++  switch (child)
++    {
++    case -1:
++      assert (0);
++    case 0:
++      printf ("child%d: %d\n", nr, (int) getpid ());
++      /* Delay to get both the "child%d" and "parent%d" message printed without
++	 a race breaking expect by its endless wait on `$gdb_prompt$':
++	 Breakpoint 3, breakpoint () at ../../../gdb/testsuite/gdb.threads/watchpoint-fork.c:33
++	 33      }
++	 (gdb) parent2: 14223  */
++      i = sleep (1);
++      assert (i == 0);
++
++      /* We must not get caught here (against a forgotten breakpoint).  */
++      var++;
++      breakpoint ();
++
++      _exit (exit_code);
++    default:
++      printf ("parent%d: %d\n", nr, (int) child);
++      /* Delay to get both the "child%d" and "parent%d" message printed, see
++	 above.  */
++      i = sleep (1);
++      assert (i == 0);
++
++      pid_got = wait (&status);
++      assert (pid_got == child);
++      assert (WIFEXITED (status));
++      assert (WEXITSTATUS (status) == exit_code);
++
++      /* We must get caught here (against a false watchpoint removal).  */
++      breakpoint ();
++    }
++}
++
++#elif defined FOLLOW_CHILD
++
++static volatile int usr1_got;
++
++static void
++handler_usr1 (int signo)
++{
++  usr1_got++;
++}
++
++static void
++forkoff (int nr)
++{
++  pid_t child;
++  int i, loop;
++  struct sigaction act, oldact;
++#ifdef THREAD
++  void *thread_result;
++#endif
++
++  memset (&act, 0, sizeof act);
++  act.sa_flags = SA_RESTART;
++  act.sa_handler = handler_usr1;
++  sigemptyset (&act.sa_mask);
++  i = sigaction (SIGUSR1, &act, &oldact);
++  assert (i == 0);
++
++  child = fork ();
++  switch (child)
++    {
++    case -1:
++      assert (0);
++    default:
++      printf ("parent%d: %d\n", nr, (int) child);
++
++      /* Sleep for a while to possibly get incorrectly ATTACH_THREADed by GDB
++	 tracing the child fork with no longer valid thread/lwp entries of the
++	 parent.  */
++
++      i = sleep (2);
++      assert (i == 0);
++
++      /* We must not get caught here (against a forgotten breakpoint).  */
++
++      var++;
++      breakpoint ();
++
++#ifdef THREAD
++      /* And neither got caught our thread.  */
++
++      step = 99;
++      i = pthread_join (thread, &thread_result);
++      assert (i == 0);
++      assert (thread_result == (void *) 99UL);
++#endif
++
++      /* Be sure our child knows we did not get caught above.  */
++
++      i = kill (child, SIGUSR1);
++      assert (i == 0);
++
++      /* Sleep for a while to check GDB's `info threads' no longer tracks us in
++	 the child fork.  */
++
++      i = sleep (2);
++      assert (i == 0);
++
++      _exit (0);
++    case 0:
++      printf ("child%d: %d\n", nr, (int) getpid ());
++
++      /* Let the parent signal us about its success.  Be careful of races.  */
++
++      for (loop = 0; loop < 1000; loop++)
++	{
++	  /* Parent either died (and USR1_GOT is zero) or it succeeded.  */
++	  if (kill (getppid (), 0) != 0)
++	    break;
++	  /* Parent succeeded?  */
++	  if (usr1_got)
++	    break;
++
++	  delay ();
++	}
++      assert (usr1_got);
++
++      /* We must get caught here (against a false watchpoint removal).  */
++
++      breakpoint ();
++    }
++
++  i = sigaction (SIGUSR1, &oldact, NULL);
++  assert (i == 0);
++}
++
++#else
++# error "!FOLLOW_PARENT && !FOLLOW_CHILD"
++#endif
+diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c b/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
+new file mode 100644
+index 0000000..edacfc0
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
+@@ -0,0 +1,157 @@
++/* Test case for forgotten hw-watchpoints after fork()-off of a process.
++
++   Copyright 2008, 2009 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 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 <assert.h>
++#include <unistd.h>
++#include <sys/wait.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <pthread.h>
++
++#include <asm/unistd.h>
++#include <unistd.h>
++#define gettid() syscall (__NR_gettid)
++
++/* Non-atomic `var++' should not hurt as we synchronize the threads by the STEP
++   variable.  Hit-comments need to be duplicite there to catch both at-stops
++   and behind-stops, depending on the target.  */
++
++static volatile int var;
++
++static void
++dummy (void)
++{
++}
++
++static void
++breakpoint (void)
++{
++}
++
++/* Include here the functions:
++   static void forkoff (int nr);
++   static void delay (void);  */
++
++static pthread_t thread;
++static volatile int step;
++#define THREAD
++
++#include "watchpoint-fork-forkoff.c"
++
++static void *
++start (void *arg)
++{
++  if (step >= 3)
++    goto step_3;
++
++  while (step != 1)
++    delay ();
++
++  var++;	/* validity-thread-B */
++  dummy ();	/* validity-thread-B */
++  step = 2;
++  while (step != 3)
++    {
++      if (step == 99)
++	goto step_99;
++      delay ();
++    }
++
++step_3:
++  if (step >= 5)
++    goto step_5;
++
++  var++;	/* after-fork1-B */
++  dummy ();	/* after-fork1-B */
++  step = 4;
++  while (step != 5)
++    {
++      if (step == 99)
++	goto step_99;
++      delay ();
++    }
++
++step_5:
++  var++;	/* after-fork2-B */
++  dummy ();	/* after-fork2-B */
++  return (void *) 5UL;
++
++step_99:
++  /* We must not get caught here (against a forgotten breakpoint).  */
++  var++;
++  breakpoint ();
++  return (void *) 99UL;
++}
++
++int
++main (void)
++{
++  int i;
++  void *thread_result;
++
++  setbuf (stdout, NULL);
++  printf ("main: %d\n", (int) gettid ());
++
++  /* General watchpoints validity.  */
++  var++;	/* validity-first */
++  dummy ();	/* validity-first */
++
++  i = pthread_create (&thread, NULL, start, NULL);
++  assert (i == 0);
++
++  var++;	/* validity-thread-A */
++  dummy ();	/* validity-thread-A */
++  step = 1;
++  while (step != 2)
++    delay ();
++
++  /* Hardware watchpoints got disarmed here.  */
++  forkoff (1);
++
++  var++;	/* after-fork1-A */
++  dummy ();	/* after-fork1-A */
++  step = 3;
++#ifdef FOLLOW_CHILD
++  /* Spawn new thread as it was deleted in the child of FORK.  */
++  i = pthread_create (&thread, NULL, start, NULL);
++  assert (i == 0);
++#endif
++  while (step != 4)
++    delay ();
++
++  /* A sanity check for double hardware watchpoints removal.  */
++  forkoff (2);
++
++  var++;	/* after-fork2-A */
++  dummy ();	/* after-fork2-A */
++  step = 5;
++#ifdef FOLLOW_CHILD
++  /* Spawn new thread as it was deleted in the child of FORK.  */
++  i = pthread_create (&thread, NULL, start, NULL);
++  assert (i == 0);
++#endif
++
++  i = pthread_join (thread, &thread_result);
++  assert (i == 0);
++  assert (thread_result == (void *) 5UL);
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.c b/gdb/testsuite/gdb.threads/watchpoint-fork.c
+new file mode 100644
+index 0000000..5f62e7f
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchpoint-fork.c
+@@ -0,0 +1,57 @@
++/* Test case for forgotten hw-watchpoints after fork()-off of a process.
++
++   Copyright 2008, 2009 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 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 <assert.h>
++#include <unistd.h>
++#include <sys/wait.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++static volatile int var;
++
++static void
++breakpoint (void)
++{
++}
++
++/* Include here the function:
++   static void forkoff (int nr);  */
++
++#include "watchpoint-fork-forkoff.c"
++
++int
++main (void)
++{
++  setbuf (stdout, NULL);
++  printf ("main: %d\n", (int) getpid ());
++
++  /* General watchpoints validity.  */
++  var++;
++  /* Hardware watchpoints got disarmed here.  */
++  forkoff (1);
++  /* This watchpoint got lost before.  */
++  var++;
++  /* A sanity check for double hardware watchpoints removal.  */
++  forkoff (2);
++  var++;
++
++  return 0;
++}
+diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.exp b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+new file mode 100644
+index 0000000..1dc93ab
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+@@ -0,0 +1,130 @@
++# Copyright 2008, 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Test case for forgotten hw-watchpoints after fork()-off of a process.
++
++proc test {type symbol} {
++    global objdir subdir srcdir
++
++    set test watchpoint-fork
++
++    global pf_prefix
++    set prefix_test $pf_prefix
++    lappend pf_prefix "$type:"
++    set prefix_mt $pf_prefix
++
++    # no threads
++
++    set pf_prefix $prefix_mt
++    lappend pf_prefix "singlethreaded:"
++
++    set executable ${test}-${type}
++    if { [gdb_compile ${srcdir}/${subdir}/${test}.c ${objdir}/${subdir}/${executable} executable [list debug additional_flags=-D$symbol]] != "" } {
++	untested ${test}.exp
++	return -1
++    }
++    clean_restart $executable
++
++    gdb_test "show detach-on-fork" "Whether gdb will detach the child of a fork is on."
++    gdb_test "set follow-fork-mode $type"
++    gdb_test "show follow-fork-mode" "Debugger response to a program call of fork or vfork is \"$type\"."
++    # Testcase uses it for the `follow-fork-mode child' type.
++    gdb_test "handle SIGUSR1 nostop noprint pass"
++
++    if { ![runto_main] } then {
++	gdb_suppress_tests
++	return
++    }
++
++    # Install the watchpoint only after getting into MAIN - workaround some PPC
++    # problem.
++    gdb_test "watch var" "atchpoint 2: var" "Set the watchpoint"
++
++    # It is never hit but it should not be left over in the fork()ed-off child.
++    gdb_breakpoint "breakpoint"
++
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 0.*New value = 1.*forkoff *\\(1\\).*" "watchpoints work"
++    gdb_test "continue" \
++	     "reakpoint 3, breakpoint.*" "breakpoint after the first fork"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 1.*New value = 2.*forkoff *\\(2\\).*" "watchpoint after the first fork"
++    gdb_test "continue" \
++	     "reakpoint 3, breakpoint.*" "breakpoint after the second fork"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 2.*New value = 3.*return *0;" "watchpoint after the second fork"
++    gdb_test "continue" "Continuing..*Program exited normally." "finish"
++
++
++    # threads
++
++    set pf_prefix $prefix_mt
++    lappend pf_prefix "multithreaded:"
++
++    set executable ${test}-mt-${type}
++    if { [gdb_compile_pthreads ${srcdir}/${subdir}/${test}-mt.c ${objdir}/${subdir}/${executable} executable [list debug additional_flags=-D$symbol]] != "" } {
++	untested ${test}.exp
++	return -1
++    }
++    clean_restart $executable
++
++    gdb_test "set follow-fork-mode $type"
++    # Testcase uses it for the `follow-fork-mode child' type.
++    gdb_test "handle SIGUSR1 nostop noprint pass"
++
++    if { ![runto_main] } then {
++	gdb_suppress_tests
++	return
++    }
++
++    # Install the watchpoint only after getting into MAIN - workaround some PPC
++    # problem.
++    gdb_test "watch var" "atchpoint 2: var" "Set the watchpoint"
++
++    # It is never hit but it should not be left over in the fork()ed-off child.
++    gdb_breakpoint "breakpoint"
++
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 0.*New value = 1.*validity-first.*" "singlethread watchpoints work"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 1.*New value = 2.*validity-thread-A.*" "multithreaded watchpoints work at A"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 2.*New value = 3.*validity-thread-B.*" "multithreaded watchpoints work at B"
++    gdb_test "continue" \
++	     "reakpoint 3, breakpoint.*" "breakpoint (A) after the first fork"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 3.*New value = 4.*after-fork1-A.*" "watchpoint A after the first fork"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 4.*New value = 5.*after-fork1-B.*" "watchpoint B after the first fork"
++    gdb_test "continue" \
++	     "reakpoint 3, breakpoint.*" "breakpoint (A) after the second fork"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 5.*New value = 6.*after-fork2-A.*" "watchpoint A after the second fork"
++    gdb_test "continue" \
++	     "atchpoint 2: var.*Old value = 6.*New value = 7.*after-fork2-B.*" "watchpoint B after the second fork"
++    gdb_test "continue" "Continuing..*Program exited normally." "finish"
++
++
++    # cleanup
++
++    set pf_prefix $prefix_test
++}
++
++test parent FOLLOW_PARENT
++
++# Only GNU/Linux is known to support `set follow-fork-mode child'.
++if {[istarget "*-*-linux*"]} {
++    test child FOLLOW_CHILD
++}
+diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.c b/gdb/testsuite/gdb.threads/watchthreads-reorder.c
+new file mode 100644
+index 0000000..14f42d6
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.c
+@@ -0,0 +1,366 @@
++/* 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/>.  */
++
++#define _GNU_SOURCE
++#include <pthread.h>
++#include <stdio.h>
++#include <limits.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <string.h>
++#include <assert.h>
++#include <sys/types.h>
++#include <signal.h>
++#include <unistd.h>
++#include <asm/unistd.h>
++
++#define gettid() syscall (__NR_gettid)
++
++/* Terminate always in the main task, it can lock up with SIGSTOPped GDB
++   otherwise.  */
++#define TIMEOUT (gettid () == getpid() ? 10 : 15)
++
++static pthread_mutex_t gdbstop_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
++
++static pid_t thread1_tid;
++static pthread_cond_t thread1_tid_cond = PTHREAD_COND_INITIALIZER;
++static pthread_mutex_t thread1_tid_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
++
++static pid_t thread2_tid;
++static pthread_cond_t thread2_tid_cond = PTHREAD_COND_INITIALIZER;
++static pthread_mutex_t thread2_tid_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
++
++static pthread_mutex_t terminate_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
++
++static volatile int thread1_rwatch;
++static volatile int thread2_rwatch;
++
++static int unused1_rwatch;
++static int unused2_rwatch;
++
++/* Do not use alarm as it would create a ptrace event which would hang up us if
++ * we are being traced by GDB which we stopped ourselves.  */
++
++static void timed_mutex_lock (pthread_mutex_t *mutex)
++{
++  int i;
++  struct timespec start, now;
++
++  i = clock_gettime (CLOCK_MONOTONIC, &start);
++  assert (i == 0);
++
++  do
++    {
++      i = pthread_mutex_trylock (mutex);
++      if (i == 0)
++	return;
++      assert (i == EBUSY);
++
++      i = clock_gettime (CLOCK_MONOTONIC, &now);
++      assert (i == 0);
++      assert (now.tv_sec >= start.tv_sec);
++    }
++  while (now.tv_sec - start.tv_sec < TIMEOUT);
++
++  fprintf (stderr, "Timed out waiting for internal lock!\n");
++  exit (EXIT_FAILURE);
++}
++
++static void *
++thread1_func (void *unused)
++{
++  int i;
++  volatile int rwatch_store;
++
++  thread1_tid = gettid ();
++  i = pthread_cond_signal (&thread1_tid_cond);
++  assert (i == 0);
++
++  /* Be sure GDB is already stopped before continuing.  */
++  timed_mutex_lock (&gdbstop_mutex);
++  i = pthread_mutex_unlock (&gdbstop_mutex);
++  assert (i == 0);
++
++  rwatch_store = thread1_rwatch;
++
++  /* Be sure the "T (tracing stop)" test can proceed for both threads.  */
++  timed_mutex_lock (&terminate_mutex);
++  i = pthread_mutex_unlock (&terminate_mutex);
++  assert (i == 0);
++
++  return NULL;
++}
++
++static void *
++thread2_func (void *unused)
++{
++  int i;
++  volatile int rwatch_store;
++
++  thread2_tid = gettid ();
++  i = pthread_cond_signal (&thread2_tid_cond);
++  assert (i == 0);
++
++  /* Be sure GDB is already stopped before continuing.  */
++  timed_mutex_lock (&gdbstop_mutex);
++  i = pthread_mutex_unlock (&gdbstop_mutex);
++  assert (i == 0);
++
++  rwatch_store = thread2_rwatch;
++
++  /* Be sure the "T (tracing stop)" test can proceed for both threads.  */
++  timed_mutex_lock (&terminate_mutex);
++  i = pthread_mutex_unlock (&terminate_mutex);
++  assert (i == 0);
++
++  return NULL;
++}
++
++static const char *
++proc_string (const char *filename, const char *line)
++{
++  FILE *f;
++  static char buf[LINE_MAX];
++  size_t line_len = strlen (line);
++
++  f = fopen (filename, "r");
++  if (f == NULL)
++    {
++      fprintf (stderr, "fopen (\"%s\") for \"%s\": %s\n", filename, line,
++	       strerror (errno));
++      exit (EXIT_FAILURE);
++    }
++  while (errno = 0, fgets (buf, sizeof (buf), f))
++    {
++      char *s;
++
++      s = strchr (buf, '\n');
++      assert (s != NULL);
++      *s = 0;
++
++      if (strncmp (buf, line, line_len) != 0)
++	continue;
++
++      if (fclose (f))
++	{
++	  fprintf (stderr, "fclose (\"%s\") for \"%s\": %s\n", filename, line,
++		   strerror (errno));
++	  exit (EXIT_FAILURE);
++	}
++
++      return &buf[line_len];
++    }
++  if (errno != 0)
++    {
++      fprintf (stderr, "fgets (\"%s\": %s\n", filename, strerror (errno));
++      exit (EXIT_FAILURE);
++    }
++  fprintf (stderr, "\"%s\": No line \"%s\" found.\n", filename, line);
++  exit (EXIT_FAILURE);
++}
++
++static unsigned long
++proc_ulong (const char *filename, const char *line)
++{
++  const char *s = proc_string (filename, line);
++  long retval;
++  char *end;
++
++  errno = 0;
++  retval = strtol (s, &end, 10);
++  if (retval < 0 || retval >= LONG_MAX || (end && *end))
++    {
++      fprintf (stderr, "\"%s\":\"%s\": %ld, %s\n", filename, line, retval,
++	       strerror (errno));
++      exit (EXIT_FAILURE);
++    }
++  return retval;
++}
++
++static void
++state_wait (pid_t process, const char *wanted)
++{
++  char *filename;
++  int i;
++  struct timespec start, now;
++  const char *state;
++
++  i = asprintf (&filename, "/proc/%lu/status", (unsigned long) process);
++  assert (i > 0);
++
++  i = clock_gettime (CLOCK_MONOTONIC, &start);
++  assert (i == 0);
++
++  do
++    {
++      state = proc_string (filename, "State:\t");
++      if (strcmp (state, wanted) == 0)
++	{
++	  free (filename);
++	  return;
++	}
++
++      if (sched_yield ())
++	{
++	  perror ("sched_yield()");
++	  exit (EXIT_FAILURE);
++	}
++
++      i = clock_gettime (CLOCK_MONOTONIC, &now);
++      assert (i == 0);
++      assert (now.tv_sec >= start.tv_sec);
++    }
++  while (now.tv_sec - start.tv_sec < TIMEOUT);
++
++  fprintf (stderr, "Timed out waiting for PID %lu \"%s\" (now it is \"%s\")!\n",
++	   (unsigned long) process, wanted, state);
++  exit (EXIT_FAILURE);
++}
++
++static volatile pid_t tracer = 0;
++static pthread_t thread1, thread2;
++
++static void
++cleanup (void)
++{
++  printf ("Resuming GDB PID %lu.\n", (unsigned long) tracer);
++
++  if (tracer)
++    {
++      int i;
++      int tracer_save = tracer;
++
++      tracer = 0;
++
++      i = kill (tracer_save, SIGCONT);
++      assert (i == 0);
++    }
++}
++
++int
++main (int argc, char **argv)
++{
++  int i;
++  int standalone = 0;
++
++  if (argc == 2 && strcmp (argv[1], "-s") == 0)
++    standalone = 1;
++  else
++    assert (argc == 1);
++
++  setbuf (stdout, NULL);
++
++  timed_mutex_lock (&gdbstop_mutex);
++
++  timed_mutex_lock (&terminate_mutex);
++
++  i = pthread_create (&thread1, NULL, thread1_func, NULL);
++  assert (i == 0);
++
++  i = pthread_create (&thread2, NULL, thread2_func, NULL);
++  assert (i == 0);
++
++  if (!standalone)
++    {
++      tracer = proc_ulong ("/proc/self/status", "TracerPid:\t");
++      if (tracer == 0)
++	{
++	  fprintf (stderr, "The testcase must be run by GDB!\n");
++	  exit (EXIT_FAILURE);
++	}
++      if (tracer != getppid ())
++	{
++	  fprintf (stderr, "The testcase parent must be our GDB tracer!\n");
++	  exit (EXIT_FAILURE);
++	}
++    }
++
++  /* SIGCONT our debugger in the case of our crash as we would deadlock
++     otherwise.  */
++
++  atexit (cleanup);
++
++  printf ("Stopping GDB PID %lu.\n", (unsigned long) tracer);
++
++  if (tracer)
++    {
++      i = kill (tracer, SIGSTOP);
++      assert (i == 0);
++      state_wait (tracer, "T (stopped)");
++    }
++
++  timed_mutex_lock (&thread1_tid_mutex);
++  timed_mutex_lock (&thread2_tid_mutex);
++
++  /* Let the threads start.  */
++  i = pthread_mutex_unlock (&gdbstop_mutex);
++  assert (i == 0);
++
++  printf ("Waiting till the threads initialize their TIDs.\n");
++
++  if (thread1_tid == 0)
++    {
++      i = pthread_cond_wait (&thread1_tid_cond, &thread1_tid_mutex);
++      assert (i == 0);
++
++      assert (thread1_tid > 0);
++    }
++
++  if (thread2_tid == 0)
++    {
++      i = pthread_cond_wait (&thread2_tid_cond, &thread2_tid_mutex);
++      assert (i == 0);
++
++      assert (thread2_tid > 0);
++    }
++
++  printf ("Thread 1 TID = %lu, thread 2 TID = %lu, PID = %lu.\n",
++	  (unsigned long) thread1_tid, (unsigned long) thread2_tid,
++	  (unsigned long) getpid ());
++
++  printf ("Waiting till the threads get trapped by the watchpoints.\n");
++
++  if (tracer)
++    {
++      /* s390x-unknown-linux-gnu will fail with "R (running)".  */
++
++      state_wait (thread1_tid, "T (tracing stop)");
++
++      state_wait (thread2_tid, "T (tracing stop)");
++    }
++
++  cleanup ();
++
++  printf ("Joining the threads.\n");
++
++  i = pthread_mutex_unlock (&terminate_mutex);
++  assert (i == 0);
++
++  i = pthread_join (thread1, NULL);
++  assert (i == 0);
++
++  i = pthread_join (thread2, NULL);
++  assert (i == 0);
++
++  printf ("Exiting.\n");	/* break-at-exit */
++
++  /* Just prevent compiler `warning: $B!F(BunusedX_rwatch$B!G(B defined but not used'.  */
++  unused1_rwatch = 1;
++  unused2_rwatch = 2;
++
++  return EXIT_SUCCESS;
++}
+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
+--- /dev/null
++++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
+@@ -0,0 +1,101 @@
++# This testcase is part of GDB, the GNU debugger.
++
++# Copyright 2009 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# Test GDB can cope with two watchpoints being hit by different threads at the
++# same time, GDB reports one of them and after "continue" to report the other
++# one GDB should not be confused by differently set watchpoints that time.
++# This is the goal of "reorder1".  "reorder0" tests the basic functionality of
++# two watchpoint being hit at the same time, without reordering them during the
++# stop.  The formerly broken functionality is due to the all-stop mode default
++# "show breakpoint always-inserted" being "off".  Formerly the remembered hit
++# could be assigned during continuation of a thread with pending SIGTRAP to the
++# different/new watchpoint, just based on the watchpoint/debug register number.
++
++if {[target_info exists gdb,no_hardware_watchpoints]
++    || ![istarget *-*-linux*]} {
++    return 0;
++}
++
++set testfile "watchthreads-reorder"
++set srcfile ${testfile}.c
++set binfile ${objdir}/${subdir}/${testfile}
++if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" ${binfile} executable [list debug additional_flags=-lrt]] != "" } {
++    return -1
++}
++
++foreach reorder {0 1} {
++
++    global pf_prefix
++    set prefix_test $pf_prefix
++    lappend pf_prefix "reorder$reorder:"
++
++    clean_restart $testfile
++
++    gdb_test "set can-use-hw-watchpoints 1"
++
++    if ![runto_main] {
++	gdb_suppress_tests
++    }
++
++    # Use "rwatch" as "watch" would report the watchpoint changed just based on its
++    # read memory value during a stop by unrelated event.  We are interested to not
++    # to lose the hardware watchpoint trigger.
++
++    gdb_test "rwatch thread1_rwatch" "Hardware read watchpoint \[0-9\]+: thread1_rwatch"
++    gdb_test {set $rwatch1=$bpnum}
++    set test "rwatch thread2_rwatch"
++    gdb_test_multiple $test $test {
++	-re "Target does not support this type of hardware watchpoint\\.\r\n$gdb_prompt $" {
++	    # ppc64 supports at most 1 hw watchpoints.
++	    unsupported $test
++	    return
++	}
++	-re "Hardware read watchpoint \[0-9\]+: thread2_rwatch\r\n$gdb_prompt $" {
++	    pass $test
++	}
++    }
++    gdb_test {set $rwatch2=$bpnum}
++    gdb_breakpoint [gdb_get_line_number "break-at-exit"]
++
++    # The watchpoints can happen in arbitrary order depending on random:
++    # SEL: Found 2 SIGTRAP events, selecting #[01]
++    # As GDB contains no srand() on the specific host/OS it will behave always the
++    # same.  Such order cannot be guaranteed for GDB in general.
++
++    gdb_test "continue" \
++	     "Hardware read watchpoint \[0-9\]+: thread\[12\]_rwatch\r\n\r\nValue = 0\r\n0x\[0-9a-f\]+ in thread\[12\]_func .*" \
++	     "continue a"
++
++    if $reorder {
++	gdb_test {delete $rwatch1}
++	gdb_test {delete $rwatch2}
++
++	gdb_test "rwatch unused1_rwatch" "Hardware read watchpoint \[0-9\]+: unused1_rwatch"
++	gdb_test "rwatch unused2_rwatch" "Hardware read watchpoint \[0-9\]+: unused2_rwatch"
++
++	gdb_test "rwatch thread1_rwatch" "Hardware read watchpoint \[0-9\]+: thread1_rwatch"
++	gdb_test "rwatch thread2_rwatch" "Hardware read watchpoint \[0-9\]+: thread2_rwatch"
++    }
++
++    gdb_test "continue" \
++	     "Hardware read watchpoint \[0-9\]+: thread\[12\]_rwatch\r\n\r\nValue = 0\r\n0x\[0-9a-f\]+ in thread\[12\]_func .*" \
++	     "continue b"
++
++    gdb_continue_to_breakpoint "break-at-exit" ".*break-at-exit.*"
++
++    set pf_prefix $prefix_test
++}
 diff --git a/gdb/testsuite/lib/cp-support.exp b/gdb/testsuite/lib/cp-support.exp
 index dbd2f59..44e1b51 100644
 --- a/gdb/testsuite/lib/cp-support.exp


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- gdb.spec	18 Aug 2009 19:10:33 -0000	1.376
+++ gdb.spec	18 Aug 2009 19:37:35 -0000	1.377
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # 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
@@ -821,6 +821,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-3
+- archer-jankratochvil-fedora12 commit: 850e3cb38a25cb7fdfa4cef667626ffbde51bcac
+- Fix the hardware watchpoints.
+
 * Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-2
 - Fix patch fuzz 0.
 



From akurtakov at fedoraproject.org  Tue Aug 18 19:39:29 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 18 Aug 2009 19:39:29 +0000 (UTC)
Subject: rpms/eclipse-subclipse/devel .cvsignore, 1.10,
	1.11 subclipse-fetch.sh, 
	1.3, 1.4 sources, 1.10, 1.11 eclipse-subclipse.spec, 1.34, 1.35
Message-ID: <20090818193929.6284011C00D7@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7211/devel

Modified Files:
	.cvsignore subclipse-fetch.sh sources eclipse-subclipse.spec 
Log Message:
Update to upstream 1.6.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Aug 2009 14:41:35 -0000	1.10
+++ .cvsignore	18 Aug 2009 19:39:29 -0000	1.11
@@ -1,3 +1,4 @@
 subclipse-1.6.0.tgz
 subclipse-1.6.2.tgz
 subclipse-1.6.4.tgz
+subclipse-1.6.5.tgz


Index: subclipse-fetch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/subclipse-fetch.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- subclipse-fetch.sh	10 Aug 2009 14:41:35 -0000	1.3
+++ subclipse-fetch.sh	18 Aug 2009 19:39:29 -0000	1.4
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=1.6.4
+VERSION=1.6.5
 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
 rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win32
 tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Aug 2009 14:41:35 -0000	1.10
+++ sources	18 Aug 2009 19:39:29 -0000	1.11
@@ -1 +1 @@
-bf1c5a0a2cb4741881817614672a330c  subclipse-1.6.4.tgz
+03296c36c10d4b855efa0a7505bea6f5  subclipse-1.6.5.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- eclipse-subclipse.spec	10 Aug 2009 14:41:35 -0000	1.34
+++ eclipse-subclipse.spec	18 Aug 2009 19:39:29 -0000	1.35
@@ -1,11 +1,11 @@
 %define eclipse_name       eclipse
 %define eclipse_base       %{_libdir}/%{eclipse_name}
 %define install_loc        %{_datadir}/eclipse/dropins
-%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.6.4
+%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.6.4.1
 
 
 Name:           eclipse-subclipse
-Version:        1.6.4
+Version:        1.6.5
 Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{install_loc}/subclipse
 %{install_loc}/subclipse-clientadapter*
-%doc org.tigris.subversion.subclipse.graph/icons/readme.txt 
+%doc org.tigris.subversion.subclipse.graph/icons/readme.txt
 
 
 %files graph
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.5-1
+- Update to upstream 1.6.5.
+
 * Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.4-1
 - Update to upstream 1.6.4.
 
@@ -225,7 +228,7 @@ automatically activating bundle org.tigr
 
 * Thu Jun 01 2006 Robert Marcano <robert at marcanoonline.com> 1.0.1-5
 - Use package-build from eclipse SDK
- 
+
 * Sun May 28 2006 Robert Marcano <robert at marcanoonline.com> 1.0.1-4
 - Integrated svnClientAdapter inside this package
 



From terjeros at fedoraproject.org  Tue Aug 18 19:46:09 2009
From: terjeros at fedoraproject.org (terjeros)
Date: Tue, 18 Aug 2009 19:46:09 +0000 (UTC)
Subject: rpms/extrema/devel extrema.spec,1.11,1.12
Message-ID: <20090818194609.2ECD711C00D7@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/extrema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8602

Modified Files:
	extrema.spec 
Log Message:
* Tue Aug 18 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.3.6-5
- Split out documentation



Index: extrema.spec
===================================================================
RCS file: /cvs/extras/rpms/extrema/devel/extrema.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- extrema.spec	24 Jul 2009 22:27:28 -0000	1.11
+++ extrema.spec	18 Aug 2009 19:46:08 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:   Extrema is a powerful visualization and data analysis tool
 Name:      extrema
 Version:   4.3.6
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     Applications/Engineering
 URL:       http://exsitewebware.com/extrema/
@@ -20,13 +20,25 @@ power allow you to easily develop your o
 customized graphs.
 
 %package help
-Summary:  Help files for Extrema
-Group:    Applications/Engineering
-Requires: %{name} = %{version}
+Summary:   Help files for Extrema
+Group:     Applications/Engineering
+BuildArch: noarch
+Requires:  %{name} = %{version}-%{release}
+Obsoletes: %{name}-help < 4.3.6-5
 
 %description help
 This package contains help files for Extrema.
 
+%package doc
+Summary:   Extrema documentation in PDF format
+Group:     Applications/Engineering
+BuildArch: noarch
+Requires:  %{name} = %{version}-%{release}
+
+%description doc
+This package contains Getting Started, User Guide and other
+documentation in PDF format for Extrema.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -49,7 +61,7 @@ desktop-file-install --vendor=fedora \
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/Images
@@ -60,7 +72,14 @@ desktop-file-install --vendor=fedora \
 %defattr(-, root, root, -)
 %{_datadir}/%{name}/Help
 
+%files doc
+%defattr(-, root, root, -)
+%doc doc/*.pdf
+
 %changelog
+* Tue Aug 18 2009 Terje Rosten <terje.rosten at ntnu.no> - 4.3.6-5
+- Split out documentation
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Aug 18 19:49:14 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 18 Aug 2009 19:49:14 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver-2.27.0-gamma.patch, 
	NONE, 1.1 gnome-screensaver.spec, 1.222, 1.223
Message-ID: <20090818194915.053F311C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9307

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.27.0-gamma.patch 
Log Message:
* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.27.0-9
- gnome-screensaver-2.27.0-gamma.patch: Backport patch to fix gamma fadeout
  (#508513)


gnome-screensaver-2.27.0-gamma.patch:
 gs-fade.c |   53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

--- NEW FILE gnome-screensaver-2.27.0-gamma.patch ---
commit 1edd5817ac177e4f73ff8578746510abd3541390
Author: Michel D?nzer <daenzer at debian.org>
Date:   Wed Aug 12 17:52:07 2009 -0400

    Fix gamma fadeout when X reports 0-size gamma ramp (#581995)

diff --git a/src/gs-fade.c b/src/gs-fade.c
index f591ab8..75595a7 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -308,32 +308,15 @@ gamma_info_init (GSFade *fade)
         */
         for (screen = 0; screen < fade->priv->num_screens; screen++) {
 
-                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) {
-                                goto FAIL;
-                        }
-                        gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
-                                  screen,
-                                  info [screen].vmg.red,
-                                  info [screen].vmg.green,
-                                  info [screen].vmg.blue);
-                }
-
 # ifdef HAVE_XF86VMODE_GAMMA_RAMP
 
-                else if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
+                if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
                         /* have ramps */
 
                         res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen, &info [screen].size);
-                        if (! res) {
-                                goto FAIL;
-                        }
-
-                        if (info [screen].size <= 0) {
-                                goto FAIL;
+                        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);
@@ -341,7 +324,8 @@ gamma_info_init (GSFade *fade)
                         info [screen].b = g_new0 (unsigned short, info[screen].size);
 
                         if (! (info [screen].r && info [screen].g && info [screen].b)) {
-                                goto FAIL;
+                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                                goto test_number;
                         }
 
                         res = XF86VidModeGetGammaRamp (GDK_DISPLAY (),
@@ -351,15 +335,32 @@ gamma_info_init (GSFade *fade)
                                                        info [screen].g,
                                                        info [screen].b);
                         if (! res) {
-                                goto FAIL;
+                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                                goto test_number;
                         }
                         gs_debug ("Initialized gamma ramp fade");
                 }
 # endif /* HAVE_XF86VMODE_GAMMA_RAMP */
-                else if (FADE_TYPE_NONE == fade->priv->fade_type) {
+
+ 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);
+                }
+
+ test_none:
+                if (FADE_TYPE_NONE == fade->priv->fade_type) {
                         goto FAIL;
-                } else {
-                        g_assert_not_reached ();
                 }
         }
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- gnome-screensaver.spec	15 Aug 2009 21:07:12 -0000	1.222
+++ gnome-screensaver.spec	18 Aug 2009 19:49:14 -0000	1.223
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -31,6 +31,8 @@ Patch8: gnome-screensaver-2.20.0-selinux
 Patch9: use-gtkbuilder.patch
 # from upstream
 Patch10: button-images.patch
+# from upstream
+Patch11: gnome-screensaver-2.27.0-gamma.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -86,6 +88,7 @@ simple, sane, secure defaults and be wel
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .use-gtkbuilder
 %patch10 -p1 -b .button-images
+%patch11 -p1 -b .gamma
 
 libtoolize --force --copy
 
@@ -162,6 +165,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.27.0-9
+- gnome-screensaver-2.27.0-gamma.patch: Backport patch to fix gamma fadeout
+  (#508513)
+
 * Sat Aug 15 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-8
 - Manual XML editing considered harmful...
 



From overholt at fedoraproject.org  Tue Aug 18 19:53:55 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 18 Aug 2009 19:53:55 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel maven2-common-poms.spec, 1.6,
	1.7 sources, 1.2, 1.3 maven2-common-poms-jpp-depmap.xml, 1.2, NONE
Message-ID: <20090818195355.4AC3C11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10383

Modified Files:
	maven2-common-poms.spec sources 
Removed Files:
	maven2-common-poms-jpp-depmap.xml 
Log Message:
* Tue Aug 18 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-7
- Changes from Deepak Bhole:
- Updated depmap
- Update for maven 2.0.8


Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- maven2-common-poms.spec	25 Jul 2009 11:52:25 -0000	1.6
+++ maven2-common-poms.spec	18 Aug 2009 19:53:55 -0000	1.7
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           6.4%{?dist}
+Release:           7%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -53,7 +53,7 @@ BuildRequires:     jpackage-utils >= 0:1
 Requires:          jpackage-utils >= 0:1.7.2
 
 %description
-This package is a collection of poms required by various maven2-dependent 
+This package is a collection of poms required by various maven2-dependent
 packages.
 
 %prep
@@ -88,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2
 
 %changelog
+* Tue Aug 18 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-7
+- Changes from Deepak Bhole:
+- Updated depmap
+- Update for maven 2.0.8
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-6.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Mar 2007 15:25:51 -0000	1.2
+++ sources	18 Aug 2009 19:53:55 -0000	1.3
@@ -1,2 +1,2 @@
 e1a697356772cf0dc7badade59aa922b  maven2-common-poms-docs.tar.gz
-d2a002146837474e38af818a0049ff83  maven2-common-poms-src.tar.gz
+1c5984e16007290912b8eaaeaaf27c14  maven2-common-poms-src.tar.gz


--- maven2-common-poms-jpp-depmap.xml DELETED ---



From overholt at fedoraproject.org  Tue Aug 18 19:54:23 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 18 Aug 2009 19:54:23 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel maven2-common-poms-jpp-depmap.xml, 1.3,
	1.4
Message-ID: <20090818195423.3439E11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10514

Added Files:
	maven2-common-poms-jpp-depmap.xml 
Log Message:
Re-add maven2-common-poms-jpp-depmap.xml


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 maven2-common-poms-jpp-depmap.xmlIndex: maven2-common-poms-jpp-depmap.xml
===================================================================
RCS file: maven2-common-poms-jpp-depmap.xml
diff -N maven2-common-poms-jpp-depmap.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven2-common-poms-jpp-depmap.xml	18 Aug 2009 19:54:22 -0000	1.4
@@ -0,0 +1,4126 @@
+<dependencies>
+	<dependency>
+		<maven>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>2.1</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>2.1</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.0</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.0</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>1.1.0</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>1.1.0</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>clover</groupId>
+			<artifactId>clover</artifactId>
+			<version>1.3.11</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>clover</artifactId>
+			<version>1.3.11</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>com.cenqua.clover</groupId>
+			<artifactId>clover</artifactId>
+			<version>1.3.12</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>clover</artifactId>
+			<version>1.3.12</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>doxia</groupId>
+			<artifactId>doxia-sink-api</artifactId>
+			<version>1.0-alpha-4</version>
+		</maven>
+		<jpp>
+			<groupId>JPP/maven-doxia</groupId>
+			<artifactId>sink-api</artifactId>
+			<version>1.0-alpha-4</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>doxia</groupId>
+			<artifactId>doxia-core</artifactId>
+			<version>1.0-alpha-4</version>
+		</maven>
+		<jpp>
+			<groupId>JPP/maven-doxia</groupId>
+			<artifactId>core</artifactId>
+			<version>1.0-alpha-4</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>bsh</groupId>
+			<artifactId>bsh</artifactId>
+			<version>1.3.0</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>bsh</artifactId>
+			<version>1.3.0</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>checkstyle</groupId>
+			<artifactId>checkstyle</artifactId>
+			<version>4.1</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>checkstyle</artifactId>
+			<version>4.1</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>checkstyle</groupId>
+			<artifactId>checkstyle-optional</artifactId>
+			<version>4.1</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>checkstyle</artifactId>
+			<version>1.4</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>saxpath</groupId>
+			<artifactId>saxpath</artifactId>
+			<version>1.0-FCS</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>1.0-FCS</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>oro</groupId>
+			<artifactId>oro</artifactId>
+			<version>2.0.7</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>oro</artifactId>
+			<version>2.0.7</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.7.0</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.7.0</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils-core</artifactId>
+			<version>1.7.0</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.7.0</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.3</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.3</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging-api</artifactId>
+			<version>1.0.4</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-logging-api</artifactId>
+			<version>1.0.4</version>
+		</jpp>
+	</dependency>
[...3733 lines suppressed...]
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-core</artifactId>
+            <version>1.0-alpha-15</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>core</artifactId>
+            <version>1.0-alpha-15</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-site</artifactId>
+            <version>1.0-alpha-15</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>site</artifactId>
+            <version>1.0-alpha-15</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-ojb</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-ojb</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-jpa</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-jpa</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-hibernate-store</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-hibernate-store</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-ldap</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-ldap</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-prevayler</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-prevayler</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-dom4j</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-dom4j</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugins-sandbox</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugins-sandbox</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-stash</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-stash</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-dtd</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-dtd</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-velocity</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-velocity</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello-plugin-jdbc</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>plugin-jdbc</artifactId>
+            <version>1.0-alpha-4-SNAPSHOT</version>
+        </jpp>
+        </dependency>
+
+        <dependency>
+        <maven>
+            <groupId>org.codehaus.modello</groupId>
+            <artifactId>modello</artifactId>
+            <version>1.0-alpha-15</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/modello</groupId>
+            <artifactId>modello</artifactId>
+            <version>1.0-alpha-15</version>
+        </jpp>
+        </dependency>
+
+    <!-- Wagon WEBDAV support is disabled in fedora because we do not wish to 
+         import a dependency of it (jakarta slide, which is now officially 
+         a dead project) 
+    -->
+    <dependency>
+        <maven>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav</artifactId>
+            <version>1.0-beta-1</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/maven2</groupId>
+            <artifactId>empty-dep</artifactId>
+            <version>1.0-beta-1</version>
+        </jpp>
+    </dependency>
+</dependencies>



From lmacken at fedoraproject.org  Tue Aug 18 19:58:33 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 18 Aug 2009 19:58:33 +0000 (UTC)
Subject: rpms/python-repoze-what-plugins-sql/EL-5
	python-repoze-what-plugins-sql.spec, 1.1, 1.2
Message-ID: <20090818195833.A2F8F11C00D7@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what-plugins-sql/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11371

Modified Files:
	python-repoze-what-plugins-sql.spec 
Log Message:
Require new python-sqlalchemy0.5 package


Index: python-repoze-what-plugins-sql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-plugins-sql/EL-5/python-repoze-what-plugins-sql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-what-plugins-sql.spec	29 Jul 2009 15:31:17 -0000	1.1
+++ python-repoze-what-plugins-sql.spec	18 Aug 2009 19:58:33 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-repoze-what-plugins-sql
 Version:        1.0
-Release:        0.6.%{rcver}%{?dist}
+Release:        0.7.%{rcver}%{?dist}
 Summary:        The repoze.what SQL plugin
 
 Group:          Development/Languages
@@ -18,10 +18,10 @@ BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools-devel python-nose
 BuildRequires:  python-nose python-coverage
 BuildRequires:  python-repoze-what 
-BuildRequires:  python-sqlalchemy >= 0.5
+BuildRequires:  python-sqlalchemy0.5
 
 Requires:       python-repoze-what >= 1.0.3
-Requires:       python-sqlalchemy >= 0.5
+Requires:       python-sqlalchemy0.5
 Requires:       python-zope-interface
 Requires:       python-repoze-who-plugins-sa
 
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.7.rc1
+- Require the new python-sqlalchemy0.5 package
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.6.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Aug 18 20:13:16 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 18 Aug 2009 20:13:16 +0000 (UTC)
Subject: rpms/pygtk2/devel pygtk2.spec,1.31,1.32
Message-ID: <20090818201316.2579811C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14931

Modified Files:
	pygtk2.spec 
Log Message:
* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.15.2-4
- Drop the explicit Requires: numpy as per new packaging guidelines.  If
  your app calls gtk.gdk.get_pixels_array() you need to pull numpy in
  yourself.



Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- pygtk2.spec	13 Aug 2009 21:37:06 -0000	1.31
+++ pygtk2.spec	18 Aug 2009 20:13:15 -0000	1.32
@@ -15,7 +15,7 @@
 
 Name: pygtk2
 Version: 2.15.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -38,7 +38,6 @@ Patch2: pygtk-2.15.2-gtk-2.16.defs.patch
 
 # Leave these requirements alone!  RPM isn't smart enough
 # to derive these from the build requirements below.
-Requires: numpy
 Requires: pycairo
 Requires: pygobject2
 
@@ -168,6 +167,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.15.2-4
+- Drop the explicit Requires: numpy as per new packaging guidelines.  If
+  your app calls gtk.gdk.get_pixels_array() you need to pull numpy in
+  yourself.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.15.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Aug 18 20:16:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 18 Aug 2009 20:16:33 +0000 (UTC)
Subject: rpms/poppler/devel .cvsignore, 1.40, 1.41 poppler.spec, 1.99,
	1.100 sources, 1.44, 1.45
Message-ID: <20090818201633.665DC11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15634

Modified Files:
	.cvsignore poppler.spec sources 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.3-1
- Update to 0.11.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	3 Aug 2009 16:08:45 -0000	1.40
+++ .cvsignore	18 Aug 2009 20:16:33 -0000	1.41
@@ -1 +1 @@
-poppler-0.11.2.tar.gz
+poppler-0.11.3.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- poppler.spec	3 Aug 2009 16:18:30 -0000	1.99
+++ poppler.spec	18 Aug 2009 20:16:33 -0000	1.100
@@ -1,7 +1,7 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.11.2
+Version: 0.11.3
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
@@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.3-1
+- Update to 0.11.3
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.11.2-1
 - Update to 0.11.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	3 Aug 2009 16:08:45 -0000	1.44
+++ sources	18 Aug 2009 20:16:33 -0000	1.45
@@ -1 +1 @@
-40dde7c6ff7ae4fe61752fdcef077e52  poppler-0.11.2.tar.gz
+28f9dbdc74e9aadbf27aff16d06f4990  poppler-0.11.3.tar.gz



From jwilson at fedoraproject.org  Tue Aug 18 20:26:26 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 18 Aug 2009 20:26:26 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest86+-2.11-make-gcc4-builds-work.patch,
	1.1, 1.2 memtest86+.spec, 1.48, 1.49
Message-ID: <20090818202626.11C9A11C00D7@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17566

Modified Files:
	memtest86+-2.11-make-gcc4-builds-work.patch memtest86+.spec 
Log Message:
Put in the version of the gcc4.2+ patch that is being sent upstream

memtest86+-2.11-make-gcc4-builds-work.patch:
 test.c |  102 +++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 53 insertions(+), 49 deletions(-)

Index: memtest86+-2.11-make-gcc4-builds-work.patch
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+-2.11-make-gcc4-builds-work.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- memtest86+-2.11-make-gcc4-builds-work.patch	17 Aug 2009 21:33:04 -0000	1.1
+++ memtest86+-2.11-make-gcc4-builds-work.patch	18 Aug 2009 20:26:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- memtest86+-2.11/test.c.orig	2008-11-15 19:18:14.000000000 -0500
-+++ memtest86+-2.11/test.c	2009-08-17 17:21:42.904932613 -0400
++++ memtest86+-2.11/test.c	2009-08-18 16:01:33.845957770 -0400
 @@ -13,6 +13,7 @@
  #include "config.h"
  #include <sys/io.h>
@@ -8,7 +8,7 @@
  
  extern int segs, bail;
  extern volatile ulong *p;
-@@ -150,7 +151,7 @@ void addr_tst2()
+@@ -150,16 +151,16 @@ void addr_tst2()
  		done = 0;
  		do {
  			/* Check for overflow */
@@ -17,7 +17,18 @@
  				pe += SPINSZ;
  			} else {
  				pe = end;
-@@ -194,7 +195,7 @@ void addr_tst2()
+ 			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ 
+@@ -194,16 +195,16 @@ void addr_tst2()
  		done = 0;
  		do {
  			/* Check for overflow */
@@ -26,63 +37,50 @@
  				pe += SPINSZ;
  			} else {
  				pe = end;
-@@ -256,17 +257,19 @@ void addr_tst2()
-  */
- void movinvr()
- {
--	int i, j, done, seed1, seed2;
-+	int i, seed1, seed2;
-+	int j, done;
+ 			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ /* Original C code replaced with hand tuned assembly code
+@@ -260,6 +261,7 @@ void movinvr()
  	volatile ulong *pe;
  	volatile ulong *start,*end;
  	ulong num;
-+	uintptr_t next;
++	uintptr_t seg_start;
  
  	/* Initialize memory with initial sequence of random numbers.  */
  	if (v->rdtsc) {
- 		asm __volatile__ ("rdtsc":"=a" (seed1),"=d" (seed2));
- 	} else {
--		seed1 = 521288629 + v->pass;
--		seed2 = 362436069 - v->pass;
-+		seed1 = (int)(521288629 + v->pass);
-+		seed2 = (int)(362436069 - v->pass);
- 	}
- 
- 	/* Display the current seed */
-@@ -277,28 +280,20 @@ void movinvr()
+@@ -277,19 +279,20 @@ void movinvr()
  		end = v->map[j].end;
  		pe = start;
  		p = start;
-+		next = (uintptr_t)p;
++		seg_start = (uintptr_t)p;
  		done = 0;
  		do {
  			/* Check for overflow */
 -			if (pe + SPINSZ > pe) {
-+			if (((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) &&
-+			    ((uintptr_t)(pe + SPINSZ) < (uintptr_t)end)) {
++			if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
  				pe += SPINSZ;
  			} else {
  				pe = end;
--			}
+ 			}
 -			if (pe >= end) {
--				pe = end;
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
  				done++;
  			}
 -			if (p == pe ) {
-+			if (next == (uintptr_t)pe) {
++			if (seg_start == (uintptr_t)pe) {
  				break;
  			}
--/* Original C code replaced with hand tuned assembly code */
--/*
--			for (; p < pe; p++) {
--				*p = rand();
--			}
-- */
--
- 			asm __volatile__ (
- 				"jmp L200\n\t"
- 				".p2align 4,,7\n\t"
-@@ -310,7 +305,7 @@ void movinvr()
+ /* Original C code replaced with hand tuned assembly code */
+@@ -310,7 +313,7 @@ void movinvr()
  				"jb L200\n\t"
  				: "=D" (p)
  				: "D" (p), "b" (pe)
@@ -91,51 +89,31 @@
  			);
  
  			do_tick();
-@@ -324,23 +319,28 @@ void movinvr()
- 	for (i=0; i<2; i++) {
- 		rand_seed(seed1, seed2);
- 		for (j=0; j<segs; j++) {
--			start = v->map[j].start;
--			end = v->map[j].end;
-+			start = (ulong *)(v->map[j].start);
-+			end = (ulong *)(v->map[j].end);
+@@ -328,19 +331,20 @@ void movinvr()
+ 			end = v->map[j].end;
  			pe = start;
  			p = start;
++			seg_start = (uintptr_t)p;
  			done = 0;
  			do {
  				/* Check for overflow */
 -				if (pe + SPINSZ > pe) {
-+				next = (uintptr_t)(pe + SPINSZ);
-+				if ((next > (uintptr_t)pe) &&
-+				    (next < (uintptr_t)end)) {
++				if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) {
  					pe += SPINSZ;
  				} else {
  					pe = end;
-+					done++;
  				}
-+#if 0
- 				if (pe >= end) {
+-				if (pe >= end) {
++				if ((uintptr_t)pe >= (uintptr_t)end) {
  					pe = end;
  					done++;
  				}
 -				if (p == pe ) {
-+#endif
-+				if ((uintptr_t)p == (uintptr_t)pe) {
++				if (seg_start == (uintptr_t)pe) {
  					break;
  				}
  /* Original C code replaced with hand tuned assembly code */
-@@ -359,8 +359,9 @@ void movinvr()
- 				if (i) {
- 					num = 0xffffffff;
- 				} else {
--					num = 0;
-+					num = 0x0;
- 				}
-+	
- 				asm __volatile__ (
- 					"jmp L26\n\t" \
- 
-@@ -427,7 +428,7 @@ void movinv1(int iter, ulong p1, ulong p
+@@ -427,17 +431,17 @@ void movinv1(int iter, ulong p1, ulong p
  		done = 0;
  		do {
  			/* Check for overflow */
@@ -144,7 +122,19 @@
  				pe += SPINSZ;
  			} else {
  				pe = end;
-@@ -468,7 +469,7 @@ void movinv1(int iter, ulong p1, ulong p
+ 			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+ 			len = pe - p;
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ /* Original C code replaced with hand tuned assembly code
+@@ -468,16 +472,16 @@ void movinv1(int iter, ulong p1, ulong p
  			done = 0;
  			do {
  				/* Check for overflow */
@@ -153,7 +143,18 @@
  					pe += SPINSZ;
  				} else {
  					pe = end;
-@@ -534,7 +535,7 @@ void movinv1(int iter, ulong p1, ulong p
+ 				}
+-				if (pe >= end) {
++				if ((uintptr_t)pe >= (uintptr_t)end) {
+ 					pe = end;
+ 					done++;
+ 				}
+-				if (p == pe ) {
++				if ((uintptr_t)p == (uintptr_t)pe) {
+ 					break;
+ 				}
+ /* Original C code replaced with hand tuned assembly code
+@@ -534,16 +538,16 @@ void movinv1(int iter, ulong p1, ulong p
  			done = 0;
  			do {
  				/* Check for underflow */
@@ -162,7 +163,18 @@
  					pe -= SPINSZ;
  				} else {
  					pe = start;
-@@ -623,7 +624,7 @@ void movinv32(int iter, ulong p1, ulong 
+ 				}
+-				if (pe <= start) {
++				if ((uintptr_t)pe <= (uintptr_t)start) {
+ 					pe = start;
+ 					done++;
+ 				}
+-				if (p == pe ) {
++				if ((uintptr_t)p == (uintptr_t)pe) {
+ 					break;
+ 				}
+ /* Original C code replaced with hand tuned assembly code
+@@ -623,16 +627,16 @@ void movinv32(int iter, ulong p1, ulong 
  		pat = p1;
  		do {
  			/* Check for overflow */
@@ -171,7 +183,18 @@
  				pe += SPINSZ;
  			} else {
  				pe = end;
-@@ -685,7 +686,7 @@ void movinv32(int iter, ulong p1, ulong 
+ 			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ 			/* Do a SPINSZ section of memory */
+@@ -685,16 +689,16 @@ void movinv32(int iter, ulong p1, ulong 
  			pat = p1;
  			do {
  				/* Check for overflow */
@@ -180,7 +203,18 @@
  					pe += SPINSZ;
  				} else {
  					pe = end;
-@@ -798,7 +799,7 @@ void movinv32(int iter, ulong p1, ulong 
+ 				}
+-				if (pe >= end) {
++				if ((uintptr_t)pe >= (uintptr_t)end) {
+ 					pe = end;
+ 					done++;
+ 				}
+-				if (p == pe ) {
++				if ((uintptr_t)p == (uintptr_t)pe) {
+ 					break;
+ 				}
+ /* Original C code replaced with hand tuned assembly code
+@@ -798,16 +802,16 @@ void movinv32(int iter, ulong p1, ulong 
  			done = 0;
  			do {
  				/* Check for underflow */
@@ -189,7 +223,18 @@
  					pe -= SPINSZ;
  				} else {
  					pe = start;
-@@ -906,7 +907,7 @@ void modtst(int offset, int iter, ulong 
+ 				}
+-				if (pe <= start) {
++				if ((uintptr_t)pe <= (uintptr_t)start) {
+ 					pe = start;
+ 					done++;
+ 				}
+-				if (p == pe ) {
++				if ((uintptr_t)p == (uintptr_t)pe) {
+ 					break;
+ 				}
+ /* Original C code replaced with hand tuned assembly code
+@@ -906,16 +910,16 @@ void modtst(int offset, int iter, ulong 
  		done = 0;
  		do {
  			/* Check for overflow */
@@ -198,7 +243,18 @@
  				pe += SPINSZ;
  			} else {
  				pe = end;
-@@ -951,7 +952,7 @@ void modtst(int offset, int iter, ulong 
+ 			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ /* Original C code replaced with hand tuned assembly code
+@@ -951,16 +955,16 @@ void modtst(int offset, int iter, ulong 
  			k = 0;
  			do {
  				/* Check for overflow */
@@ -207,7 +263,18 @@
  					pe += SPINSZ;
  				} else {
  					pe = end;
-@@ -1009,7 +1010,7 @@ void modtst(int offset, int iter, ulong 
+ 				}
+-				if (pe >= end) {
++				if ((uintptr_t)pe >= (uintptr_t)end) {
+ 					pe = end;
+ 					done++;
+ 				}
+-				if (p == pe ) {
++				if ((uintptr_t)p == (uintptr_t)pe) {
+ 					break;
+ 				}
+ /* Original C code replaced with hand tuned assembly code
+@@ -1009,16 +1013,16 @@ void modtst(int offset, int iter, ulong 
  		done = 0;
  		do {
  			/* Check for overflow */
@@ -216,39 +283,74 @@
  				pe += SPINSZ;
  			} else {
  				pe = end;
-@@ -1098,8 +1099,9 @@ void block_move(int iter)
+ 			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ /* Original C code replaced with hand tuned assembly code
+@@ -1098,16 +1102,16 @@ void block_move(int iter)
  		done = 0;
  		do {
  			/* Check for overflow */
 -			if (pe + SPINSZ*4 > pe) {
--				pe += SPINSZ*4;
-+			if ((uintptr_t)(pe + SPINSZ * sizeof(ulong)) >
-+			    (uintptr_t)pe) {
-+				pe += SPINSZ * sizeof(ulong);
++			if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) {
+ 				pe += SPINSZ*4;
  			} else {
  				pe = end;
  			}
-@@ -1167,8 +1169,9 @@ void block_move(int iter)
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ 			len  = ((ulong)pe - (ulong)p) / 64;
+@@ -1167,16 +1171,16 @@ void block_move(int iter)
  		done = 0;
  		do {
  			/* Check for overflow */
 -			if (pe + SPINSZ*4 > pe) {
--				pe += SPINSZ*4;
-+			if ((uintptr_t)(pe + SPINSZ * sizeof(ulong)) >
-+			    (uintptr_t)pe) {
-+				pe += SPINSZ * sizeof(ulong);
++			if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) {
+ 				pe += SPINSZ*4;
  			} else {
  				pe = end;
  			}
-@@ -1234,8 +1237,9 @@ void block_move(int iter)
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ 			pp = p + ((pe - p) / 2);
+@@ -1234,16 +1238,16 @@ void block_move(int iter)
  		done = 0;
  		do {
  			/* Check for overflow */
 -			if (pe + SPINSZ*4 > pe) {
--				pe += SPINSZ*4;
-+			if ((uintptr_t)(pe + SPINSZ * sizeof(ulong)) >
-+			    (uintptr_t)pe) {
-+				pe += SPINSZ * sizeof(ulong);
++			if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) {
+ 				pe += SPINSZ*4;
  			} else {
  				pe = end;
  			}
+-			if (pe >= end) {
++			if ((uintptr_t)pe >= (uintptr_t)end) {
+ 				pe = end;
+ 				done++;
+ 			}
+-			if (p == pe ) {
++			if ((uintptr_t)p == (uintptr_t)pe) {
+ 				break;
+ 			}
+ 			asm __volatile__ (


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- memtest86+.spec	17 Aug 2009 21:33:04 -0000	1.48
+++ memtest86+.spec	18 Aug 2009 20:26:25 -0000	1.49
@@ -40,7 +40,7 @@ to add the %{name} entry to your GRUB bo
 
 %prep
 %setup -q 
-%patch0 -p1
+#patch0 -p1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build



From steved at fedoraproject.org  Tue Aug 18 20:33:44 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 18 Aug 2009 20:33:44 +0000 (UTC)
Subject: rpms/libevent/devel libevent-1.4.12-stable-configure.patch, NONE,
	1.1 libevent-1.4.12-stable-epoll.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 libevent.spec, 1.20, 1.21 sources, 1.8, 1.9
Message-ID: <20090818203344.2BB3711C00D7@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19094

Modified Files:
	.cvsignore libevent.spec sources 
Added Files:
	libevent-1.4.12-stable-configure.patch 
	libevent-1.4.12-stable-epoll.patch 
Log Message:
- Updated to latest stable upstream version: 1.4.12
- API documentation is now installed (bz 487977)
- libevent-devel multilib conflict (bz 477685)
- epoll backend allocates too much memory (bz 517918)


libevent-1.4.12-stable-configure.patch:
 configure.in |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE libevent-1.4.12-stable-configure.patch ---
diff -up libevent-1.4.12-stable/configure.in.orig libevent-1.4.12-stable/configure.in
--- libevent-1.4.12-stable/configure.in.orig	2009-07-24 22:16:55.000000000 -0400
+++ libevent-1.4.12-stable/configure.in	2009-08-18 15:54:26.925112000 -0400
@@ -138,8 +138,6 @@ AC_HEADER_TIME
 dnl Checks for library functions.
 AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop signal sigaction strtoll)
 
-AC_CHECK_SIZEOF(long)
-
 if test "x$ac_cv_func_clock_gettime" = "xyes"; then
    AC_DEFINE(DNS_USE_CPU_CLOCK_FOR_ID, 1, [Define if clock_gettime is available in libc])
 else
@@ -309,9 +307,6 @@ AC_CHECK_TYPES([uint64_t, uint32_t, uint
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif])
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(short)
 AC_CHECK_TYPES([struct in6_addr], , ,
 [#ifdef WIN32
 #include <winsock2.h>

libevent-1.4.12-stable-epoll.patch:
 epoll.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE libevent-1.4.12-stable-epoll.patch ---
diff -up libevent-1.4.12-stable/epoll.c.orig libevent-1.4.12-stable/epoll.c
--- libevent-1.4.12-stable/epoll.c.orig	2009-07-02 02:05:28.000000000 -0400
+++ libevent-1.4.12-stable/epoll.c	2009-08-18 16:13:31.672097000 -0400
@@ -115,6 +115,7 @@ epoll_init(struct event_base *base)
 	if (getenv("EVENT_NOEPOLL"))
 		return (NULL);
 
+#ifndef linux
 	if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
 	    rl.rlim_cur != RLIM_INFINITY) {
 		/*
@@ -124,6 +125,7 @@ epoll_init(struct event_base *base)
 		 */
 		nfiles = rl.rlim_cur - 1;
 	}
+#endif
 
 	/* Initalize the kernel queue */
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Apr 2009 16:10:05 -0000	1.8
+++ .cvsignore	18 Aug 2009 20:33:43 -0000	1.9
@@ -5,3 +5,4 @@ libevent-1.3e.tar.gz
 libevent-1.4.4-stable.tar.gz
 libevent-1.4.5-stable.tar.gz
 libevent-1.4.10-stable.tar.gz
+libevent-1.4.12-stable.tar.gz


Index: libevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libevent.spec	25 Jul 2009 05:35:20 -0000	1.20
+++ libevent.spec	18 Aug 2009 20:33:43 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libevent
-Version:        1.4.10
-Release:        2%{?dist}
+Version:        1.4.12
+Release:        1%{?dist}
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -9,6 +9,9 @@ URL:            http://monkey.org/~provo
 Source0:        http://monkey.org/~provos/libevent-%{version}-stable.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch00: libevent-1.4.12-stable-configure.patch
+Patch01: libevent-1.4.12-stable-epoll.patch
+
 %description
 The libevent API provides a mechanism to execute a callback function
 when a specific event occurs on a file descriptor or after a timeout
@@ -31,16 +34,40 @@ you will need to install %{name}-devel.
 %prep
 %setup -q -n libevent-%{version}-stable
 
+# 477685 -  libevent-devel multilib conflict
+%patch00 -p1
+# 517918 -  epoll backend allocates too much memory
+%patch01 -p1
+
 %build
 %configure \
     --disable-dependency-tracking
 make %{?_smp_mflags}
 
+# Create the docs
+make doxygen
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html
+(cd doxygen/html; \
+	install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex
+(cd doxygen/latex; \
+	install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3
+(cd doxygen/man/man3; \
+	install *.3 $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample
+(cd sample; \
+	install *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample)
+
 %check
 make verify
 
@@ -60,7 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,0755)
-%doc sample/*.c
 %{_includedir}/event.h
 %{_includedir}/evdns.h
 %{_includedir}/evhttp.h
@@ -78,7 +104,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man3/*
 
+%{_docdir}/%{name}-devel-%{version}/html/*
+%{_docdir}/%{name}-devel-%{version}/latex/*
+%{_docdir}/%{name}-devel-%{version}/man/man3/*
+%{_docdir}/%{name}-devel-%{version}/sample/*
+
 %changelog
+* Tue Aug 18 2009 Steve Dickson <steved at redhat.com> 1.4.12-1
+- Updated to latest stable upstream version: 1.4.12
+- API documentation is now installed (bz 487977)
+- libevent-devel multilib conflict (bz 477685)
+- epoll backend allocates too much memory (bz 517918)
+
 * Fri Jul 24 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/libevent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Apr 2009 16:10:05 -0000	1.8
+++ sources	18 Aug 2009 20:33:43 -0000	1.9
@@ -1 +1 @@
-20611535f26d415bd6ad380a673d9ea2  libevent-1.4.10-stable.tar.gz
+77b0d8b9885496871bb083165b35ba11  libevent-1.4.12-stable.tar.gz



From jwilson at fedoraproject.org  Tue Aug 18 20:40:03 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 18 Aug 2009 20:40:03 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest86+.spec,1.49,1.50
Message-ID: <20090818204003.8087A11C04D1@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21161

Modified Files:
	memtest86+.spec 
Log Message:
add note re: patch submitted upstream


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- memtest86+.spec	18 Aug 2009 20:26:25 -0000	1.49
+++ memtest86+.spec	18 Aug 2009 20:40:03 -0000	1.50
@@ -14,6 +14,7 @@ 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)



From cweyl at fedoraproject.org  Tue Aug 18 20:41:06 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 20:41:06 +0000 (UTC)
Subject: rpms/perl-File-ChangeNotify/F-11 perl-File-ChangeNotify.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090818204106.D611E11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-File-ChangeNotify/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21399

Modified Files:
	perl-File-ChangeNotify.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
- auto-update to 0.07 (by cpan-spec-update 0.01)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(Class::MOP) (version 0)
- added a new req on perl(File::Find) (version 0)
- added a new req on perl(File::Spec) (version 0)
- added a new req on perl(Module::Pluggable::Object) (version 0)
- added a new req on perl(Moose) (version 0)
- added a new req on perl(MooseX::Params::Validate) (version 0.08)
- added a new req on perl(MooseX::SemiAffordanceAccessor) (version 0)
- added a new req on perl(Time::HiRes) (version 0)



Index: perl-File-ChangeNotify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ChangeNotify/F-11/perl-File-ChangeNotify.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-File-ChangeNotify.spec	10 Jun 2009 04:54:36 -0000	1.1
+++ perl-File-ChangeNotify.spec	18 Aug 2009 20:41:06 -0000	1.2
@@ -1,17 +1,17 @@
-Name:       perl-File-ChangeNotify 
-Version:    0.06 
+Name:       perl-File-ChangeNotify
+Version:    0.07
 Release:    1%{?dist}
 # lib/File/ChangeNotify.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Event.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher/Default.pm -> GPL+ or Artistic
 # lib/File/ChangeNotify/Watcher/Inotify.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Watch for changes to files, cross-platform style 
-Source:     http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-ChangeNotify-%{version}.tar.gz 
+Summary:    Watch for changes to files, cross-platform style
+Source:     http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-ChangeNotify-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/File-ChangeNotify
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 BuildRequires: perl(Carp)
@@ -29,6 +29,17 @@ BuildRequires: perl(MooseX::SemiAffordan
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Time::HiRes)
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(Class::MOP)
+Requires:       perl(File::Find)
+Requires:       perl(File::Spec)
+Requires:       perl(Module::Pluggable::Object)
+Requires:       perl(Moose)
+Requires:       perl(MooseX::Params::Validate) >= 0.08
+Requires:       perl(MooseX::SemiAffordanceAccessor)
+Requires:       perl(Time::HiRes)
+
 %description
 Watch for changes to files, easily, cleanly, and across different platforms.
 
@@ -53,19 +64,33 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README 
+%doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
+- auto-update to 0.07 (by cpan-spec-update 0.01)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Class::MOP) (version 0)
+- added a new req on perl(File::Find) (version 0)
+- added a new req on perl(File::Spec) (version 0)
+- added a new req on perl(Module::Pluggable::Object) (version 0)
+- added a new req on perl(Moose) (version 0)
+- added a new req on perl(MooseX::Params::Validate) (version 0.08)
+- added a new req on perl(MooseX::SemiAffordanceAccessor) (version 0)
+- added a new req on perl(Time::HiRes) (version 0)
+
+* 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
+
 * Mon Jun 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
 - submission
 
 * Sun Jun 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-ChangeNotify/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jun 2009 04:54:36 -0000	1.2
+++ sources	18 Aug 2009 20:41:06 -0000	1.3
@@ -1 +1 @@
-87f970acdfce7fbacba63aa3746b4cfb  File-ChangeNotify-0.06.tar.gz
+1459d99d91420d14d75bb5d000aa3aa2  File-ChangeNotify-0.07.tar.gz



From cweyl at fedoraproject.org  Tue Aug 18 20:42:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 20:42:48 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel .cvsignore, 1.6,
	1.7 perl-Catalyst-Plugin-ConfigLoader.spec, 1.12, 1.13 sources,
	1.7, 1.8
Message-ID: <20090818204248.69BF311C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21845

Modified Files:
	.cvsignore perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
- auto-update to 0.27 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Aug 2009 06:41:13 -0000	1.6
+++ .cvsignore	18 Aug 2009 20:42:48 -0000	1.7
@@ -1 +1 @@
-Catalyst-Plugin-ConfigLoader-0.25.tar.gz
+Catalyst-Plugin-ConfigLoader-0.27.tar.gz


Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Catalyst-Plugin-ConfigLoader.spec	8 Aug 2009 18:31:46 -0000	1.12
+++ perl-Catalyst-Plugin-ConfigLoader.spec	18 Aug 2009 20:42:48 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.27
+Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.27-1
+- auto-update to 0.27 (by cpan-spec-update 0.01)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-2
 - add BR on parent (and open RT#48547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 06:41:13 -0000	1.7
+++ sources	18 Aug 2009 20:42:48 -0000	1.8
@@ -1 +1 @@
-d6ad7bd4d7ae010d1e310d4de3518b9b  Catalyst-Plugin-ConfigLoader-0.25.tar.gz
+f1f58fa0f4c3cfb45cc204c9ace6a09b  Catalyst-Plugin-ConfigLoader-0.27.tar.gz



From steved at fedoraproject.org  Tue Aug 18 20:45:10 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 18 Aug 2009 20:45:10 +0000 (UTC)
Subject: rpms/libevent/devel libevent.spec,1.21,1.22
Message-ID: <20090818204510.5E1A311C00D7@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22314

Modified Files:
	libevent.spec 
Log Message:
Added doxygen to BuildRequires




Index: libevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libevent.spec	18 Aug 2009 20:33:43 -0000	1.21
+++ libevent.spec	18 Aug 2009 20:45:10 -0000	1.22
@@ -9,6 +9,8 @@ URL:            http://monkey.org/~provo
 Source0:        http://monkey.org/~provos/libevent-%{version}-stable.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: doxygen
+
 Patch00: libevent-1.4.12-stable-configure.patch
 Patch01: libevent-1.4.12-stable-epoll.patch
 



From cweyl at fedoraproject.org  Tue Aug 18 21:04:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 21:04:02 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-DateTime-Epoch/F-11
	perl-DBIx-Class-DateTime-Epoch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090818210402.6636F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25777

Modified Files:
	perl-DBIx-Class-DateTime-Epoch.spec sources 
Log Message:
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



Index: perl-DBIx-Class-DateTime-Epoch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-11/perl-DBIx-Class-DateTime-Epoch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-DBIx-Class-DateTime-Epoch.spec	12 Apr 2009 19:30:29 -0000	1.1
+++ perl-DBIx-Class-DateTime-Epoch.spec	18 Aug 2009 21:04:02 -0000	1.2
@@ -1,19 +1,19 @@
-Name:       perl-DBIx-Class-DateTime-Epoch 
-Version:    0.03 
-Release:    1%{?dist}
+Name:       perl-DBIx-Class-DateTime-Epoch
+Version:    0.05
+Release:    3%{?dist}
 # lib/DBIx/Class/DateTime/Epoch.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Automatic inflation/deflation of epoch-based DateTime objects for DBIx::Class 
-Source:     http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/DBIx-Class-DateTime-Epoch-%{version}.tar.gz 
+Summary:    Automatic inflation/deflation of epoch-based DateTime objects for DBIx::Class
+Source:     http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/DBIx-Class-DateTime-Epoch-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/DBIx-Class-DateTime-Epoch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
 BuildRequires: perl(DateTime)
-BuildRequires: perl(DBIx::Class)
-BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(DBIx::Class) >= 0.08103
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires: perl(Module::Build::Compat)
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Pod)
@@ -21,6 +21,10 @@ BuildRequires: perl(Test::Pod::Coverage)
 
 Requires:      perl(DBIx::Class)
 
+### auto-added brs!
+BuildRequires:  perl(DBIx::Class::TimeStamp) >= 0.07
+BuildRequires:  perl(DBICx::TestDatabase)
+
 %description
 This module automatically inflates/deflates DateTime objects
 corresponding to applicable columns. Columns may also be defined to
@@ -49,19 +53,31 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README 
-%{perl_vendorlib}/*
+%doc Changes README
+%{perl_vendorlib}/DBIx/Class/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.05-2
+- fix duplicate	directory ownership (perl-DBIx-Class owns %{perl_vendorlib}/DBIx/Class/)
+
+* Wed Jun 03 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- auto-update to 0.05 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- altered br on perl(DBIx::Class) (0 => 0.08103)
+- added a new br on perl(DBIx::Class::TimeStamp) (version 0.07)
+- added a new br on perl(DBICx::TestDatabase) (version 0)
+
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
 - update for submission
 
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-Class-DateTime-Epoch/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 19:30:30 -0000	1.2
+++ sources	18 Aug 2009 21:04:02 -0000	1.3
@@ -1 +1 @@
-09506b137eee4050c8283dafbd3a98bb  DBIx-Class-DateTime-Epoch-0.03.tar.gz
+091a52906a005569f0a8711a4fc5baac  DBIx-Class-DateTime-Epoch-0.05.tar.gz



From rdieter at fedoraproject.org  Tue Aug 18 21:05:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 18 Aug 2009 21:05:54 +0000 (UTC)
Subject: rpms/sbcl/devel sbcl-1.0.30-optflags.patch, NONE, 1.1 sbcl.spec,
	1.110, 1.111 sbcl-1.0.28-optflags.patch, 1.1, NONE
Message-ID: <20090818210554.8D63511C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26204

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-1.0.30-optflags.patch 
Removed Files:
	sbcl-1.0.28-optflags.patch 
Log Message:
* 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
  a chance to work


sbcl-1.0.30-optflags.patch:
 contrib/asdf-module.mk          |    2 ++
 src/runtime/Config.ppc-linux    |    5 +++--
 src/runtime/Config.sparc-linux  |    1 +
 src/runtime/Config.x86-linux    |    2 ++
 src/runtime/Config.x86_64-linux |    2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE sbcl-1.0.30-optflags.patch ---
diff -up sbcl-1.0.30/contrib/asdf-module.mk.optflags sbcl-1.0.30/contrib/asdf-module.mk
--- sbcl-1.0.30/contrib/asdf-module.mk.optflags	2009-04-28 11:02:13.000000000 -0500
+++ sbcl-1.0.30/contrib/asdf-module.mk	2009-08-02 09:37:51.185577992 -0500
@@ -20,6 +20,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
   CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
 endif
 
+EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
+
 export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
 
 all: $(EXTRA_ALL_TARGETS)
diff -up sbcl-1.0.30/src/runtime/Config.ppc-linux.optflags sbcl-1.0.30/src/runtime/Config.ppc-linux
--- sbcl-1.0.30/src/runtime/Config.ppc-linux.optflags	2006-11-19 05:26:16.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.ppc-linux	2009-08-03 14:22:26.131354239 -0500
@@ -9,8 +9,9 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-CFLAGS = -g
-LINKFLAGS += -v -rdynamic
+CFLAGS += $(RPM_OPT_FLAGS)
+LINKFLAGS += -v -rdynamic -Wl,--relax
+ASFLAGS += -Wa,--longcalls
 NM = ./linux-nm
 
 ASSEM_SRC = ppc-assem.S ldso-stubs.S
diff -up sbcl-1.0.30/src/runtime/Config.sparc-linux.optflags sbcl-1.0.30/src/runtime/Config.sparc-linux
--- sbcl-1.0.30/src/runtime/Config.sparc-linux.optflags	2005-09-16 08:26:39.000000000 -0500
+++ sbcl-1.0.30/src/runtime/Config.sparc-linux	2009-08-02 09:37:51.186577770 -0500
@@ -10,6 +10,7 @@
 # files for more information.
 
 ASFLAGS = -g -Wall
+CFLAGS += $(RPM_OPT_FLAGS)
 LINKFLAGS += -v -rdynamic
 NM = ./linux-nm
 
diff -up sbcl-1.0.30/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.30/src/runtime/Config.x86_64-linux
--- sbcl-1.0.30/src/runtime/Config.x86_64-linux.optflags	2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.x86_64-linux	2009-08-02 09:37:51.186577770 -0500
@@ -34,7 +34,7 @@ ifdef LISP_FEATURE_SB_THREAD
   OS_LIBS += -lpthread
 endif
 
-CFLAGS += -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS)
 
 GC_SRC = gencgc.c
 
diff -up sbcl-1.0.30/src/runtime/Config.x86-linux.optflags sbcl-1.0.30/src/runtime/Config.x86-linux
--- sbcl-1.0.30/src/runtime/Config.x86-linux.optflags	2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.x86-linux	2009-08-02 09:37:51.187577619 -0500
@@ -38,6 +38,8 @@ ifdef LISP_FEATURE_SB_THREAD
   OS_LIBS += -lpthread
 endif
 
+CFLAGS += $(RPM_OPT_FLAGS)
+
 GC_SRC = gencgc.c
 
 # Nothing to do for after-grovel-headers.


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sbcl.spec	28 Jul 2009 16:55:35 -0000	1.110
+++ sbcl.spec	18 Aug 2009 21:05:54 -0000	1.111
@@ -8,12 +8,15 @@
 %define sbcl_shell /bin/bash
 
 # threading support
+## Enable sb-thread
+%ifarch %{ix86} x86_64
 %{?!_without_threads:%global _with_threads --with-threads}
+%endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 1.0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -28,7 +31,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 %endif
 
 # Pre-generated html docs (not used)
-#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-documentation-html.tar.bz2
 Source2: customize-target-features.lisp 
 
 ## x86 section
@@ -83,7 +86,7 @@ Source202: sbcl-install-clc.lisp
 
 Patch1: sbcl-1.0.25-default_sbcl_home.patch
 Patch2: sbcl-0.9.5-personality.patch
-Patch3: sbcl-1.0.28-optflags.patch
+Patch3: sbcl-1.0.30-optflags.patch
 Patch4: sbcl-0.9.17-LIB_DIR.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
@@ -105,14 +108,14 @@ interpreter, and debugger.
 
 
 %prep
-%setup -q %{?sbcl_bootstrap_src} 
+%setup -q %{?sbcl_bootstrap_src}
 
 # Handle pre-generated docs
 if [ -d %{name}-%{version}/doc/manual ]; then
   mv %{name}-%{version}/doc/manual/* doc/manual/
 fi
 
-#sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
+#sed -i -e "s|/usr/local/lib/sbcl/|%{_prefix}/lib/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
 %patch1 -p1 -b .default_sbcl_home
 %patch2 -p1 -b .personality
@@ -123,12 +126,10 @@ fi
 
 %if 0%{?_with_threads:1}
 ## Enable sb-thread
-%ifarch %{ix86} x86_64
 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
 # or
 install -m644 -p %{SOURCE2} ./customize-target-features.lisp
 %endif
-%endif
 
 # "install" local bootstrap
 %if "x%{?sbcl_bootstrap_src}" != "x%{nil}"
@@ -141,6 +142,9 @@ popd
 # fix permissions (some have eXecute bit set)
 find . -name '*.c' | xargs chmod 644
 
+# set version.lisp-expr
+sed -i.rpmver -e "s|\"%{version}\"|\"%{version}-%{release}\"|" version.lisp-expr
+
 
 %build
 
@@ -161,7 +165,13 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${P
 # http://bugzilla.redhat.com/214568
 #touch contrib/sb-bsd-sockets/test-passed
 
-export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
+# WORKAROUND ppc linker issue
+%ifarch ppc
+#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"; 
+#echo "RPM_OPT_FLAGS: $RPM_OPT_FLAGS"
+%endif
+
+export DEFAULT_SBCL_HOME=%{_prefix}/lib/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
 %{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
@@ -174,7 +184,7 @@ ERROR=0
 # santity check, essential contrib modules get built/included? 
 CONTRIBS="sb-posix sb-bsd-sockets"
 for CONTRIB in $CONTRIBS ; do
-  if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then
+  if [ ! -d %{buildroot}%{_prefix}/lib/sbcl/$CONTRIB ]; then
     echo "WARNING: ${CONTRIB} awol!"
     ERROR=1 
     echo "ulimit -a"
@@ -193,19 +203,19 @@ exit $ERROR
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}}
+mkdir -p %{buildroot}{%{_bindir},%{_prefix}/lib,%{_mandir}}
 
 unset SBCL_HOME 
 export INSTALL_ROOT=%{buildroot}%{_prefix} 
-export LIB_DIR=%{buildroot}%{_libdir} 
+export LIB_DIR=%{buildroot}%{_prefix}/lib
 %{?sbcl_shell} ./install.sh 
 
 %if 0%{?common_lisp_controller}
-install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin/sbcl.sh
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_prefix}/lib/common-lisp/bin/sbcl.sh
 install -m644 -p -D %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
-install -m644 -p -D %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+install -m644 -p -D %{SOURCE202} %{buildroot}%{_prefix}/lib/sbcl/install-clc.lisp
 # linking ok? -- Rex
-cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+cp -p %{buildroot}%{_prefix}/lib/sbcl/sbcl.core %{buildroot}%{_prefix}/lib/sbcl/sbcl-dist.core
 %endif
 
 ## Unpackaged files
@@ -218,6 +228,7 @@ find %{buildroot} -name .cvsignore | xar
 find %{buildroot} -name 'test-passed' | xargs rm -vf
 
 
+## FIXME! register-common-lisp-implementation fails (at least on x86_64)
 %post
 /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
 /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
@@ -236,13 +247,13 @@ fi
 %doc BUGS COPYING README CREDITS NEWS TLA TODO
 %doc STYLE PRINCIPLES
 %{_bindir}/*
-%{_libdir}/sbcl/
+%{_prefix}/lib/sbcl/
 %{_mandir}/man?/*
 %doc doc/manual/sbcl
 %doc doc/manual/asdf
 %{_infodir}/*
 %if 0%{?common_lisp_controller}
-%{_libdir}/common-lisp/bin/*
+%{_prefix}/lib/common-lisp/bin/*
 %{_sysconfdir}/*
 %endif
 
@@ -252,6 +263,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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
+  a chance to work
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1
 - sbcl-1.0.30
 


--- sbcl-1.0.28-optflags.patch DELETED ---



From cweyl at fedoraproject.org  Tue Aug 18 21:25:57 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 21:25:57 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/devel perl-Git-CPAN-Patch.spec,1.6,1.7
Message-ID: <20090818212557.3305811C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30531

Modified Files:
	perl-Git-CPAN-Patch.spec 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-2
- add a BR on git, for command paths



Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/devel/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Git-CPAN-Patch.spec	11 Aug 2009 07:52:02 -0000	1.6
+++ perl-Git-CPAN-Patch.spec	18 Aug 2009 21:25:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,6 +17,8 @@ BuildRequires:  perl(Parse::BACKPAN::Pac
 BuildRequires:  perl(Pod::Usage)
 # testing
 BuildRequires:  perl(Test::More)
+# for install paths
+BuildRequires:  git
 
 ### auto-added reqs!
 Requires:       perl(CPANPLUS)
@@ -85,6 +87,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-2
+- add a BR on git, for command paths
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-1
 - auto-update to 0.2.0 (by cpan-spec-update 0.01)
 - added a new req on perl(CPANPLUS) (version 0)



From cweyl at fedoraproject.org  Tue Aug 18 21:37:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 18 Aug 2009 21:37:30 +0000 (UTC)
Subject: rpms/perl-Git-CPAN-Patch/F-11 perl-Git-CPAN-Patch.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090818213730.E769C11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Git-CPAN-Patch/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32617

Modified Files:
	perl-Git-CPAN-Patch.spec sources 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-2
- add a BR on git, for command paths



Index: perl-Git-CPAN-Patch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-11/perl-Git-CPAN-Patch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Git-CPAN-Patch.spec	22 Jun 2009 05:37:34 -0000	1.4
+++ perl-Git-CPAN-Patch.spec	18 Aug 2009 21:37:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Git-CPAN-Patch
-Version:        0.1.7
-Release:        1%{?dist}
+Version:        0.2.0
+Release:        2%{?dist}
 Summary:        Patch CPAN modules using Git
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,6 +17,17 @@ BuildRequires:  perl(Parse::BACKPAN::Pac
 BuildRequires:  perl(Pod::Usage)
 # testing
 BuildRequires:  perl(Test::More)
+# for install paths
+BuildRequires:  git
+
+### auto-added reqs!
+Requires:       perl(CPANPLUS)
+Requires:       perl(Module::Build)
+Requires:       perl(Parse::BACKPAN::Packages)
+Requires:       perl(Pod::Usage)
+Requires:       perl(autodie)
+
+Requires:       git-cpan-patch = %{version}-%{release}
 
 %description
 Git::CPAN::Patch provides a suite of git commands aimed at making trivially
@@ -72,10 +83,24 @@ rm -rf %{buildroot}
 %files -n git-cpan-patch
 %defattr(-,root,root,-)
 %doc Changes README
-%{_bindir}/*
+%{_libexecdir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-2
+- add a BR on git, for command paths
+
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.2.0-1
+- auto-update to 0.2.0 (by cpan-spec-update 0.01)
+- added a new req on perl(CPANPLUS) (version 0)
+- added a new req on perl(Module::Build) (version 0)
+- added a new req on perl(Parse::BACKPAN::Packages) (version 0)
+- added a new req on perl(Pod::Usage) (version 0)
+- added a new req on perl(autodie) (version 0)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.7-1
 - auto-update to 0.1.7 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Git-CPAN-Patch/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jun 2009 05:37:34 -0000	1.5
+++ sources	18 Aug 2009 21:37:30 -0000	1.6
@@ -1 +1 @@
-d474e79d76497950eb2fdcfd9f957b06  Git-CPAN-Patch-0.1.7.tar.gz
+058d90fcde4516d8ed7b1def3fad0610  Git-CPAN-Patch-0.2.0.tar.gz



From michich at fedoraproject.org  Tue Aug 18 21:46:08 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 18 Aug 2009 21:46:08 +0000 (UTC)
Subject: rpms/icecream/devel icecream.spec,1.23,1.24 icecream.te,1.9,1.10
Message-ID: <20090818214608.DCD6811C00D7@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2452

Modified Files:
	icecream.spec icecream.te 
Log Message:
* 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.)



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- icecream.spec	14 Aug 2009 12:51:28 -0000	1.23
+++ icecream.spec	18 Aug 2009 21:46:08 -0000	1.24
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -233,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* 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.)
+
 * Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
 - Create the logfile for the scheduler in the initscript.
 - Allow the scheduler to write to the log in the SELinux policy (BZ#517251).


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.te,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- icecream.te	14 Aug 2009 12:51:28 -0000	1.9
+++ icecream.te	18 Aug 2009 21:46:08 -0000	1.10
@@ -1,5 +1,5 @@
 
-policy_module(icecream,0.1.3)
+policy_module(icecream,0.1.4)
 
 ########################################
 #
@@ -183,6 +183,8 @@ manage_files_pattern(iceccd_untrusted_t,
 
 can_exec(iceccd_untrusted_t, iceccd_cache_t)
 
+fs_getattr_all_fs(iceccd_untrusted_t)
+
 ########################################
 #
 # icecc_scheduler policy



From michich at fedoraproject.org  Tue Aug 18 21:50:11 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 18 Aug 2009 21:50:11 +0000 (UTC)
Subject: rpms/icecream/F-11 icecream.spec,1.22,1.23 icecream.te,1.9,1.10
Message-ID: <20090818215011.3ACB511C0382@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3234

Modified Files:
	icecream.spec icecream.te 
Log Message:
* 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.)



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- icecream.spec	15 Aug 2009 21:41:45 -0000	1.22
+++ icecream.spec	18 Aug 2009 21:50:11 -0000	1.23
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -233,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* 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.)
+
 * Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
 - Create the logfile for the scheduler in the initscript.
 - Allow the scheduler to write to the log in the SELinux policy (BZ#517251).


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.te,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- icecream.te	15 Aug 2009 21:41:45 -0000	1.9
+++ icecream.te	18 Aug 2009 21:50:11 -0000	1.10
@@ -1,5 +1,5 @@
 
-policy_module(icecream,0.1.3)
+policy_module(icecream,0.1.4)
 
 ########################################
 #
@@ -183,6 +183,8 @@ manage_files_pattern(iceccd_untrusted_t,
 
 can_exec(iceccd_untrusted_t, iceccd_cache_t)
 
+fs_getattr_all_fs(iceccd_untrusted_t)
+
 ########################################
 #
 # icecc_scheduler policy



From orion at fedoraproject.org  Tue Aug 18 21:50:20 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 18 Aug 2009 21:50:20 +0000 (UTC)
Subject: devel/shorewall .cvsignore, 1.57, 1.58 shorewall.spec, 1.87,
	1.88 sources, 1.57, 1.58
Message-ID: <20090818215020.BCE7611C0382@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/devel/shorewall
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3288

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Tue Aug 18 2009 Orion Poplawski <orion at cora.nwra.com> - 4.4.0-1
- Update to 4.4.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/shorewall/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	7 Jul 2009 22:40:35 -0000	1.57
+++ .cvsignore	18 Aug 2009 21:50:20 -0000	1.58
@@ -1,4 +1,4 @@
-shorewall-4.4.0-Beta3.tar.bz2
-shorewall6-4.4.0-Beta3.tar.bz2
-shorewall6-lite-4.4.0-Beta3.tar.bz2
-shorewall-lite-4.4.0-Beta3.tar.bz2
+shorewall-4.4.0.tar.bz2
+shorewall6-4.4.0.tar.bz2
+shorewall6-lite-4.4.0.tar.bz2
+shorewall-lite-4.4.0.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/pkgs/devel/shorewall/shorewall.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- shorewall.spec	27 Jul 2009 04:17:06 -0000	1.87
+++ shorewall.spec	18 Aug 2009 21:50:20 -0000	1.88
@@ -1,20 +1,20 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-%global major_ver 4.4.0-Beta3
+%global major_ver 4.4.0
 %global lite_ver %{major_ver}
 %global shorewall6_ver %{major_ver}
 %global lite6_ver %{major_ver}
 
 Name:           shorewall
 Version:        4.4.0
-Release:        0.2.Beta3%{?dist}
+Release:        1%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.shorewall.net/
 
-%global _baseurl http://www.shorewall.net/pub/shorewall/development/4.4/shorewall-%{major_ver}/
+%global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{major_ver}/
 Source0:        %{_baseurl}/%{name}-%{major_ver}.tar.bz2
 Source1:        %{_baseurl}/%{name}-lite-%{lite_ver}.tar.bz2
 Source2:        %{_baseurl}/%{name}6-%{shorewall6_ver}.tar.bz2
@@ -333,6 +333,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Tue Aug 18 2009 Orion Poplawski <orion at cora.nwra.com> - 4.4.0-1
+- Update to 4.4.0 final
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.0-0.2.Beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/shorewall/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	7 Jul 2009 22:40:35 -0000	1.57
+++ sources	18 Aug 2009 21:50:20 -0000	1.58
@@ -1,4 +1,4 @@
-7ec01e06f96ddb837a99b7d26a95a85c  shorewall-4.4.0-Beta3.tar.bz2
-e3812d7df83bb4dfe20df77bcd5a422e  shorewall6-4.4.0-Beta3.tar.bz2
-3cbdcab1646b755222f095d6afc1649f  shorewall6-lite-4.4.0-Beta3.tar.bz2
-3fa51acbdf84949af80ef7b99c187a7e  shorewall-lite-4.4.0-Beta3.tar.bz2
+6f8bda1da529fbe8d726297de445d4a9  shorewall-4.4.0.tar.bz2
+8733153bf6012fb9ff5e981e78044ba8  shorewall6-4.4.0.tar.bz2
+e18bb2541267169ad4240effa89fb993  shorewall6-lite-4.4.0.tar.bz2
+aa9b157e27cffb950fa0c7f7dce2902a  shorewall-lite-4.4.0.tar.bz2



From jgu at fedoraproject.org  Tue Aug 18 22:02:53 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 18 Aug 2009 22:02:53 +0000 (UTC)
Subject: rpms/shorewall/devel shorewall.spec,1.88,1.89
Message-ID: <20090818220253.0925511C00D7@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5757

Modified Files:
	shorewall.spec 
Log Message:
* Tue Jul  7 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.0-2
- Spec file cleanups with respect to package versioning



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- shorewall.spec	18 Aug 2009 21:50:20 -0000	1.88
+++ shorewall.spec	18 Aug 2009 22:02:52 -0000	1.89
@@ -2,20 +2,21 @@
 # which is found at http://www.shorewall.net/Anatomy.html
 
 %global major_ver 4.4.0
+%global shorewall_ver %{major_ver}
 %global lite_ver %{major_ver}
 %global shorewall6_ver %{major_ver}
 %global lite6_ver %{major_ver}
 
 Name:           shorewall
-Version:        4.4.0
-Release:        1%{?dist}
+Version:        %{shorewall_ver}
+Release:        2%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.shorewall.net/
 
 %global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{major_ver}/
-Source0:        %{_baseurl}/%{name}-%{major_ver}.tar.bz2
+Source0:        %{_baseurl}/%{name}-%{shorewall_ver}.tar.bz2
 Source1:        %{_baseurl}/%{name}-lite-%{lite_ver}.tar.bz2
 Source2:        %{_baseurl}/%{name}6-%{shorewall6_ver}.tar.bz2
 Source3:        %{_baseurl}/%{name}6-lite-%{lite6_ver}.tar.bz2
@@ -45,8 +46,8 @@ standalone GNU/Linux system.
 %package -n shorewall6
 Summary:        Files for the IPV6 Shorewall Firewall
 Group:          Applications/System
-Version:        %{version}
-Requires:       shorewall = %{version}-%{release}
+Version:        %{shorewall6_ver}
+Requires:       shorewall = %{shorewall_ver}-%{release}
 Requires:       iptables-ipv6 iproute
 Requires(post): /sbin/chkconfig
 Requires(preun):/sbin/chkconfig
@@ -59,7 +60,7 @@ Shoreline Firewall (shorewall).
 %package lite
 Group:          Applications/System
 Summary:        Shorewall firewall for compiled rulesets
-Version:        %{version}
+Version:        %{lite_ver}
 Requires:       iptables iproute
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -75,7 +76,7 @@ Lite does not need to have a Shorewall r
 %package -n shorewall6-lite
 Group:          Applications/System
 Summary:        Shorewall firewall for compiled IPV6 rulesets
-Version:        %{version}
+Version:        %{lite6_ver}
 Requires:       iptables iproute
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -93,7 +94,7 @@ Shorewall rule compiler installed.
 %setup -q -c -n %{name}-%{major_ver} -T -a0 -a1 -a2 -a3
 
 # Overwrite default init files with Fedora specific ones
-cp %{SOURCE10} shorewall-%{major_ver}
+cp %{SOURCE10} shorewall-%{shorewall_ver}
 
 cp %{SOURCE10} shorewall-lite-%{lite_ver}
 sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{lite_ver}/init.sh
@@ -117,7 +118,7 @@ export PREFIX=$RPM_BUILD_ROOT
 export DEST=%{_initrddir}
 
 #### Build shorewall
-pushd shorewall-%{major_ver}
+pushd shorewall-%{shorewall_ver}
 ./install.sh
 popd
 
@@ -189,7 +190,7 @@ fi
 
 %files
 %defattr(0644,root,root,0755)
-%doc shorewall-%{major_ver}/{COPYING,changelog.txt,releasenotes.txt,Samples}
+%doc shorewall-%{shorewall_ver}/{COPYING,changelog.txt,releasenotes.txt,Samples}
 %attr(0755,root,root) %{_initrddir}/shorewall
 %attr(0755,root,root) /sbin/shorewall
 %dir %{_sysconfdir}/shorewall
@@ -333,6 +334,9 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Tue Jul  7 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.0-2
+- Spec file cleanups with respect to package versioning
+
 * Tue Aug 18 2009 Orion Poplawski <orion at cora.nwra.com> - 4.4.0-1
 - Update to 4.4.0 final
 



From jgu at fedoraproject.org  Tue Aug 18 22:03:44 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 18 Aug 2009 22:03:44 +0000 (UTC)
Subject: rpms/shorewall/devel shorewall.spec,1.89,1.90
Message-ID: <20090818220344.0DF4F11C00D7@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5966

Modified Files:
	shorewall.spec 
Log Message:
* Tue Aug 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.0-2
- Spec file cleanups with respect to package versioning



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- shorewall.spec	18 Aug 2009 22:02:52 -0000	1.89
+++ shorewall.spec	18 Aug 2009 22:03:43 -0000	1.90
@@ -334,7 +334,7 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
-* Tue Jul  7 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.0-2
+* Tue Aug 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.0-2
 - Spec file cleanups with respect to package versioning
 
 * Tue Aug 18 2009 Orion Poplawski <orion at cora.nwra.com> - 4.4.0-1



From dwalsh at fedoraproject.org  Tue Aug 18 22:29:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 22:29:11 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.27,
	1.28 modules-targeted.conf, 1.136, 1.137 nsadiff, 1.18,
	1.19 policy-F12.patch, 1.52, 1.53 selinux-policy.spec, 1.897, 1.898
Message-ID: <20090818222911.C0CD111C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11665

Modified Files:
	modules-minimum.conf modules-targeted.conf nsadiff 
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-1
- Allow cupsd_config_t to be started by dbus
- Add smoltclient policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- modules-minimum.conf	12 Aug 2009 20:09:21 -0000	1.27
+++ modules-minimum.conf	18 Aug 2009 22:29:11 -0000	1.28
@@ -1337,6 +1337,13 @@ slocate = module
 # 
 smartmon = module
 
+# Layer: admin
+# Module: smoltclient
+#
+# The Fedora hardware profiler client
+# 
+smoltclient = module
+
 # Layer: services
 # Module: snmp
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- modules-targeted.conf	12 Aug 2009 20:09:21 -0000	1.136
+++ modules-targeted.conf	18 Aug 2009 22:29:11 -0000	1.137
@@ -1337,6 +1337,13 @@ slocate = module
 # 
 smartmon = module
 
+# Layer: admin
+# Module: smoltclient
+#
+# The Fedora hardware profiler client
+# 
+smoltclient = module
+
 # Layer: services
 # Module: snmp
 #


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- nsadiff	18 Aug 2009 12:34:25 -0000	1.18
+++ nsadiff	18 Aug 2009 22:29:11 -0000	1.19
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.27 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.28 > /tmp/diff

policy-F12.patch:
 Changelog                                          |    2 
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    2 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   38 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   22 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   89 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  143 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   26 
 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               |   49 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   11 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   48 
 policy/modules/services/policykit.te               |   52 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  138 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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                   |   39 
 policy/modules/services/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   34 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  129 +-
 policy/modules/services/virt.te                    |  270 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   66 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  254 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   82 -
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 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                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 -------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1304 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  136 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 323 files changed, 13977 insertions(+), 2973 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.52 -r 1.53 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- policy-F12.patch	18 Aug 2009 12:34:25 -0000	1.52
+++ policy-F12.patch	18 Aug 2009 22:29:11 -0000	1.53
@@ -1,6 +1,15 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.27/config/appconfig-mcs/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.6.28/Changelog
+--- nsaserefpolicy/Changelog	2009-08-18 11:41:14.000000000 -0400
++++ serefpolicy-3.6.28/Changelog	2009-08-18 13:23:29.000000000 -0400
+@@ -1,5 +1,3 @@
+-- Debian policykit fixes from Martin Orr.
+-- Fix unconfined_r use of unconfined_java_t.
+ - Add missing x_device rules for XI2 functions, from Eamon Walsh.
+ - Add missing rules to make unconfined_cronjob_t a valid cron job domain.
+ - Add btrfs and ext4 to labeling targets.
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.28/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -22,15 +31,15 @@ diff -b -B --ignore-all-space --exclude-
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.27/config/appconfig-mcs/failsafe_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/failsafe_context	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context	2009-08-18 13:23:29.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/root_default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -45,9 +54,9 @@ diff -b -B --ignore-all-space --exclude-
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/securetty_types serefpolicy-3.6.27/config/appconfig-mcs/securetty_types
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/securetty_types serefpolicy-3.6.28/config/appconfig-mcs/securetty_types
 --- nsaserefpolicy/config/appconfig-mcs/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/securetty_types	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/securetty_types	2009-08-18 13:23:29.000000000 -0400
 @@ -1 +1,6 @@
 +auditadm_tty_device_t
 +secadm_tty_device_t
@@ -55,18 +64,18 @@ diff -b -B --ignore-all-space --exclude-
 +sysadm_tty_device_t
 +unconfined_tty_device_t
  user_tty_device_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.27/config/appconfig-mcs/seusers
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.28/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/seusers	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/seusers	2009-08-18 13:23:29.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
 -__default__:user_u:s0
 +root:unconfined_u:s0-mcs_systemhigh
 +__default__:unconfined_u:s0-mcs_systemhigh
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/staff_u_default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -81,9 +90,9 @@ diff -b -B --ignore-all-space --exclude-
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/unconfined_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/unconfined_u_default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -97,15 +106,15 @@ diff -b -B --ignore-all-space --exclude-
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.27/config/appconfig-mcs/userhelper_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/userhelper_context	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context	2009-08-18 13:23:29.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.27/config/appconfig-mcs/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mcs/user_u_default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -118,20 +127,20 @@ diff -b -B --ignore-all-space --exclude-
 -
 +system_r:initrc_su_t:s0		user_r:user_t:s0
 +user_r:user_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.27/config/appconfig-mcs/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.27/config/appconfig-mcs/virtual_domain_context	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context	2009-08-18 13:23:29.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.27/config/appconfig-mcs/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.27/config/appconfig-mcs/virtual_image_context	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context	2009-08-18 13:23:29.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.27/config/appconfig-mls/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.28/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mls/default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -153,9 +162,9 @@ diff -b -B --ignore-all-space --exclude-
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.27/config/appconfig-mls/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-mls/root_default_contexts	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts	2009-08-18 13:23:29.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -174,20 +183,20 @@ diff -b -B --ignore-all-space --exclude-
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.27/config/appconfig-mls/virtual_domain_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.27/config/appconfig-mls/virtual_domain_context	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context	2009-08-18 13:23:29.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.27/config/appconfig-mls/virtual_image_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.27/config/appconfig-mls/virtual_image_context	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context	2009-08-18 13:23:29.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/securetty_types serefpolicy-3.6.27/config/appconfig-standard/securetty_types
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/securetty_types serefpolicy-3.6.28/config/appconfig-standard/securetty_types
 --- nsaserefpolicy/config/appconfig-standard/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/config/appconfig-standard/securetty_types	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-standard/securetty_types	2009-08-18 13:23:29.000000000 -0400
 @@ -1 +1,6 @@
 +auditadm_tty_device_t
 +secadm_tty_device_t
@@ -195,9 +204,9 @@ diff -b -B --ignore-all-space --exclude-
 +sysadm_tty_device_t
 +unconfined_tty_device_t
  user_tty_device_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.27/Makefile
---- nsaserefpolicy/Makefile	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.27/Makefile	2009-08-14 16:51:06.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.28/Makefile
+--- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
++++ serefpolicy-3.6.28/Makefile	2009-08-18 13:23:29.000000000 -0400
 @@ -102,8 +102,6 @@
  comment_move_decl := $(SED) -r -f $(support)/comment_move_decl.sed
  gennetfilter := $(PYTHON) -E $(support)/gennetfilter.py
@@ -247,6 +256,15 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
+@@ -541,7 +537,7 @@
+ #
+ install-headers: $(layerxml) $(tunxml) $(boolxml)
+ 	@mkdir -p $(headerdir)
[...4063 lines suppressed...]
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -24220,9 +24517,9 @@ diff -b -B --ignore-all-space --exclude-
 -ifdef(`distro_gentoo',`
 -/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.27/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.28/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/unconfined.if	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/unconfined.if	2009-08-18 13:23:29.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -24728,15 +25025,10 @@ diff -b -B --ignore-all-space --exclude-
 -
 -	allow $1 unconfined_t:dbus acquire_svc;
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.27/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/unconfined.te	2009-08-14 16:51:06.000000000 -0400
-@@ -1,231 +1,9 @@
- 
--policy_module(unconfined, 3.0.0)
-+policy_module(unconfined, 3.0.1)
- 
- ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.28/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/unconfined.te	2009-08-18 13:23:29.000000000 -0400
+@@ -5,227 +5,5 @@
  #
  # Declarations
  #
@@ -24859,7 +25151,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 -
 -optional_policy(`
--	java_domtrans_unconfined(unconfined_t)
+-	java_run_unconfined(unconfined_t, unconfined_r)
 -')
 -
 -optional_policy(`
@@ -24965,9 +25257,9 @@ diff -b -B --ignore-all-space --exclude-
 -		hal_dbus_chat(unconfined_execmem_t)
 -	')
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.27/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.28/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/userdomain.fc	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.fc	2009-08-18 13:23:29.000000000 -0400
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -24977,9 +25269,9 @@ diff -b -B --ignore-all-space --exclude-
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.27/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/userdomain.if	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-18 13:23:29.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -26845,9 +27137,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 user_home_dir_t:dir search_dir_perms;
 +	files_search_home($1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.27/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.28/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/userdomain.te	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.te	2009-08-18 13:23:29.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -26933,9 +27225,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.27/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.28/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/xen.fc	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/xen.fc	2009-08-18 13:23:29.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -26963,9 +27255,9 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.27/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.28/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/xen.if	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/xen.if	2009-08-18 13:23:29.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -27016,9 +27308,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.27/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.28/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.27/policy/modules/system/xen.te	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/xen.te	2009-08-18 18:28:36.000000000 -0400
 @@ -1,11 +1,18 @@
  
 -policy_module(xen, 1.9.0)
@@ -27248,7 +27540,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_runtime_files(xm_t)
  files_read_usr_files(xm_t)
-@@ -339,15 +389,62 @@
+@@ -339,15 +389,69 @@
  
  storage_raw_read_fixed_disk(xm_t)
  
@@ -27312,9 +27604,16 @@ diff -b -B --ignore-all-space --exclude-
 +manage_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.27/policy/support/obj_perm_sets.spt
++
++fs_manage_xenfs_dirs(xend_t)
++fs_manage_xenfs_files(xend_t)
++fs_manage_xenfs_dirs(xenstored_t)
++fs_manage_xenfs_files(xenstored_t)
++fs_manage_xenfs_dirs(xm_t)
++fs_manage_xenfs_files(xm_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.28/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/support/obj_perm_sets.spt	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/support/obj_perm_sets.spt	2009-08-18 13:23:29.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -27347,9 +27646,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.27/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.28/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/policy/users	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/users	2009-08-18 13:23:29.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -27374,9 +27673,9 @@ diff -b -B --ignore-all-space --exclude-
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.27/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.28/Rules.modular
 --- nsaserefpolicy/Rules.modular	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/Rules.modular	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/Rules.modular	2009-08-18 13:23:29.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -27406,15 +27705,15 @@ diff -b -B --ignore-all-space --exclude-
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/divert.m4 serefpolicy-3.6.27/support/divert.m4
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/divert.m4 serefpolicy-3.6.28/support/divert.m4
 --- nsaserefpolicy/support/divert.m4	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.27/support/divert.m4	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.28/support/divert.m4	1969-12-31 19:00:00.000000000 -0500
 @@ -1 +0,0 @@
 -divert(`-1')
 \ No newline at end of file
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.27/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.28/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.27/support/Makefile.devel	2009-08-14 16:51:06.000000000 -0400
++++ serefpolicy-3.6.28/support/Makefile.devel	2009-08-18 13:23:29.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
@@ -27425,9 +27724,9 @@ diff -b -B --ignore-all-space --exclude-
  	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
  
  tmp/%.mod.fc: $(m4support) %.fc
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/undivert.m4 serefpolicy-3.6.27/support/undivert.m4
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/undivert.m4 serefpolicy-3.6.28/support/undivert.m4
 --- nsaserefpolicy/support/undivert.m4	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.27/support/undivert.m4	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.28/support/undivert.m4	1969-12-31 19:00:00.000000000 -0500
 @@ -1 +0,0 @@
 -divert
 \ No newline at end of file


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -p -r1.897 -r1.898
--- selinux-policy.spec	18 Aug 2009 12:34:25 -0000	1.897
+++ selinux-policy.spec	18 Aug 2009 22:29:11 -0000	1.898
@@ -19,7 +19,7 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.27
+Version: 3.6.28
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -475,6 +475,10 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-1
+- Allow cupsd_config_t to be started by dbus
+- Add smoltclient policy
+
 * Fri Aug 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.27-1
 - Add policycoreutils-python to pre install
 



From alexlan at fedoraproject.org  Tue Aug 18 22:41:37 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 18 Aug 2009 22:41:37 +0000 (UTC)
Subject: rpms/python-biopython/devel python-biopython-1.51-enable-flex.patch,
	NONE, 1.1 .cvsignore, 1.7, 1.8 python-biopython.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20090818224137.C886D11C00D7@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14562

Modified Files:
	.cvsignore python-biopython.spec sources 
Added Files:
	python-biopython-1.51-enable-flex.patch 
Log Message:
* 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
- Remove Martel modules, no longer distributed upstream
- Add flex to BuildRequires, patch setup to build
  Bio.PDB.mmCIF.MMCIFlex as per upstream:
  http://bugzilla.open-bio.org/show_bug.cgi?id=2619


python-biopython-1.51-enable-flex.patch:
 setup.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE python-biopython-1.51-enable-flex.patch ---
--- setup.py.orig	2009-08-18 18:23:01.000000000 -0400
+++ setup.py	2009-08-18 18:23:22.000000000 -0400
@@ -304,12 +304,12 @@
               include_dirs=["Bio"]
               ),
 #Commented out due to the build dependency on flex, see Bug 2619
-#   Extension('Bio.PDB.mmCIF.MMCIFlex',
-#              ['Bio/PDB/mmCIF/lex.yy.c',
-#               'Bio/PDB/mmCIF/MMCIFlexmodule.c'],
-#              include_dirs=["Bio"],
-#              libraries=["fl"]
-#              ),
+   Extension('Bio.PDB.mmCIF.MMCIFlex',
+              ['Bio/PDB/mmCIF/lex.yy.c',
+               'Bio/PDB/mmCIF/MMCIFlexmodule.c'],
+              include_dirs=["Bio"],
+              libraries=["fl"]
+              ),
     Extension('Bio.Nexus.cnexus',
               ['Bio/Nexus/cnexus.c']
               ),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Dec 2008 13:57:10 -0000	1.7
+++ .cvsignore	18 Aug 2009 22:41:36 -0000	1.8
@@ -1 +1 @@
-biopython-1.49.tar.gz
+biopython-1.51.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/python-biopython.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-biopython.spec	26 Jul 2009 20:10:46 -0000	1.16
+++ python-biopython.spec	18 Aug 2009 22:41:37 -0000	1.17
@@ -2,22 +2,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.49
-Release:          3%{?dist}
+Version:          1.51
+Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
+Patch0:           python-biopython-1.51-enable-flex.patch
 License:          MIT
 Url:              http://www.biopython.org/
 Group:            Development/Libraries
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    python-devel
+BuildRequires:    flex
 BuildRequires:    python-reportlab
-BuildRequires:    mx
 BuildRequires:    numpy
 BuildRequires:    MySQL-python
 BuildRequires:    python-psycopg2
 Requires:         python-reportlab
-Requires:         mx
 Requires:         numpy
 Requires:         MySQL-python
 Requires:         python-psycopg2
@@ -29,6 +29,8 @@ biology.
 
 %prep
 %setup -q -n biopython-%{version}
+# enable build of Bio.PDB.mmCIF.MMCIFlex (requires flex)
+%patch0 -p0
 
 # remove all execute bits from documentation and fix line endings
 find Scripts -type f -exec chmod -x {} 2>/dev/null ';'
@@ -63,12 +65,18 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %dir %{python_sitearch}/Bio
 %{python_sitearch}/Bio/*
-%dir %{python_sitearch}/Martel
-%{python_sitearch}/Martel/*
 %dir %{python_sitearch}/BioSQL
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* 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
+- Remove Martel modules, no longer distributed upstream
+- Add flex to BuildRequires, patch setup to build
+  Bio.PDB.mmCIF.MMCIFlex as per upstream:
+  http://bugzilla.open-bio.org/show_bug.cgi?id=2619
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.49-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Dec 2008 13:57:10 -0000	1.7
+++ sources	18 Aug 2009 22:41:37 -0000	1.8
@@ -1 +1 @@
-d233d4944f0c17d5927ca32c5a30d5b3  biopython-1.49.tar.gz
+e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz



From dwalsh at fedoraproject.org  Tue Aug 18 22:43:34 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 18 Aug 2009 22:43:34 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.180, 1.181 policy-F12.patch,
	1.53, 1.54 sources, 1.200, 1.201
Message-ID: <20090818224334.E38F511C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15001

Modified Files:
	.cvsignore policy-F12.patch sources 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-1
- Allow cupsd_config_t to be started by dbus
- Add smoltclient policy



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- .cvsignore	18 Aug 2009 12:34:25 -0000	1.180
+++ .cvsignore	18 Aug 2009 22:43:34 -0000	1.181
@@ -183,3 +183,4 @@ serefpolicy-3.6.24.tgz
 serefpolicy-3.6.25.tgz
 serefpolicy-3.6.26.tgz
 serefpolicy-3.6.27.tgz
+serefpolicy-3.6.28.tgz

policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   38 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   22 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   89 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  143 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.if                    |   26 
 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               |   49 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   11 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   45 
 policy/modules/services/policykit.te               |   52 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  138 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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                   |   39 
 policy/modules/services/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   34 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  129 +-
 policy/modules/services/virt.te                    |  270 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   66 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  254 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   82 -
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 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                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 -------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1304 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  136 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 322 files changed, 13978 insertions(+), 2969 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- policy-F12.patch	18 Aug 2009 22:29:11 -0000	1.53
+++ policy-F12.patch	18 Aug 2009 22:43:34 -0000	1.54
@@ -1,12 +1,3 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.6.28/Changelog
---- nsaserefpolicy/Changelog	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.28/Changelog	2009-08-18 13:23:29.000000000 -0400
-@@ -1,5 +1,3 @@
--- Debian policykit fixes from Martin Orr.
--- Fix unconfined_r use of unconfined_java_t.
- - Add missing x_device rules for XI2 functions, from Eamon Walsh.
- - Add missing rules to make unconfined_cronjob_t a valid cron job domain.
- - Add btrfs and ext4 to labeling targets.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.28/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.28/config/appconfig-mcs/default_contexts	2009-08-18 13:23:29.000000000 -0400
@@ -639,9 +630,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.28/policy/modules/admin/portage.te
---- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-14 16:14:31.000000000 -0400
+--- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/admin/portage.te	2009-08-18 13:23:29.000000000 -0400
-@@ -195,7 +195,7 @@
+@@ -196,7 +195,7 @@
  # - for rsync and distfile fetching
  #
  
@@ -1485,8 +1476,17 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/awstats.te serefpolicy-3.6.28/policy/modules/apps/awstats.te
 --- nsaserefpolicy/policy/modules/apps/awstats.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/apps/awstats.te	2009-08-18 13:23:29.000000000 -0400
-@@ -51,6 +51,8 @@
++++ serefpolicy-3.6.28/policy/modules/apps/awstats.te	2009-08-18 18:38:21.000000000 -0400
+@@ -28,6 +28,8 @@
+ awstats_rw_pipes(awstats_t)
+ awstats_cgi_exec(awstats_t)
+ 
++can_exec(awstats_t, awstats_exec_t)
++
+ manage_dirs_pattern(awstats_t, awstats_tmp_t, awstats_tmp_t)
+ manage_files_pattern(awstats_t, awstats_tmp_t, awstats_tmp_t)
+ files_tmp_filetrans(awstats_t, awstats_tmp_t, { dir file })
+@@ -51,6 +53,8 @@
  
  libs_read_lib_files(awstats_t)
  
@@ -10804,7 +10804,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.28/policy/modules/services/dbus.te
---- nsaserefpolicy/policy/modules/services/dbus.te	2009-08-14 16:14:31.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/dbus.te	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/dbus.te	2009-08-18 13:23:29.000000000 -0400
 @@ -86,6 +86,7 @@
  dev_read_sysfs(system_dbusd_t)
@@ -13587,7 +13587,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/PolicyKit(/.*)?			gen_context(system_u:object_r:policykit_var_run_t,s0)
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.6.28/policy/modules/services/policykit.if
---- nsaserefpolicy/policy/modules/services/policykit.if	2009-07-23 14:11:04.000000000 -0400
+--- nsaserefpolicy/policy/modules/services/policykit.if	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/policykit.if	2009-08-18 13:23:29.000000000 -0400
 @@ -17,6 +17,8 @@
  		class dbus send_msg;
@@ -13598,23 +13598,6 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 policykit_t:dbus send_msg;
  	allow policykit_t $1:dbus send_msg;
  ')
-@@ -41,7 +43,6 @@
- 
- ########################################
- ## <summary>
--##	Execute a policy_auth in the policy_auth domain, and
- ##	allow the specified role the policy_auth domain,
- ## </summary>
- ## <param name="domain">
-@@ -167,7 +168,7 @@
- 
- 	domtrans_pattern($1, policykit_resolve_exec_t, policykit_resolve_t)
- 
--	ps_process_pattern(policykit_resolve_t $1)
-+	ps_process_pattern(policykit_resolve_t, $1)
- ')
- 
- ########################################
 @@ -206,4 +207,47 @@
  
  	files_search_var_lib($1)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- sources	18 Aug 2009 12:34:26 -0000	1.200
+++ sources	18 Aug 2009 22:43:34 -0000	1.201
@@ -1 +1 @@
-7539a9e100f4f48bcd47dd870e03e2c6  serefpolicy-3.6.27.tgz
+7ce2872c7c331710af3741606add5664  serefpolicy-3.6.28.tgz



From alexlan at fedoraproject.org  Tue Aug 18 22:45:19 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 18 Aug 2009 22:45:19 +0000 (UTC)
Subject: rpms/python-biopython/F-11 python-biopython-1.51-enable-flex.patch, 
	NONE, 1.1 .cvsignore, 1.7, 1.8 python-biopython.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20090818224519.B1F9311C00D7@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-serv15343

Modified Files:
	.cvsignore python-biopython.spec sources 
Added Files:
	python-biopython-1.51-enable-flex.patch 
Log Message:
- Update to upstream 1.51
- Drop mx {Build}Requires, no longer used upstream
- Remove Martel modules, no longer distributed upstream
- Add flex to BuildRequires, patch setup to build
  Bio.PDB.mmCIF.MMCIFlex as per upstream:
  http://bugzilla.open-bio.org/show_bug.cgi?id=2619


python-biopython-1.51-enable-flex.patch:
 setup.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE python-biopython-1.51-enable-flex.patch ---
--- setup.py.orig	2009-08-18 18:23:01.000000000 -0400
+++ setup.py	2009-08-18 18:23:22.000000000 -0400
@@ -304,12 +304,12 @@
               include_dirs=["Bio"]
               ),
 #Commented out due to the build dependency on flex, see Bug 2619
-#   Extension('Bio.PDB.mmCIF.MMCIFlex',
-#              ['Bio/PDB/mmCIF/lex.yy.c',
-#               'Bio/PDB/mmCIF/MMCIFlexmodule.c'],
-#              include_dirs=["Bio"],
-#              libraries=["fl"]
-#              ),
+   Extension('Bio.PDB.mmCIF.MMCIFlex',
+              ['Bio/PDB/mmCIF/lex.yy.c',
+               'Bio/PDB/mmCIF/MMCIFlexmodule.c'],
+              include_dirs=["Bio"],
+              libraries=["fl"]
+              ),
     Extension('Bio.Nexus.cnexus',
               ['Bio/Nexus/cnexus.c']
               ),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Dec 2008 13:57:10 -0000	1.7
+++ .cvsignore	18 Aug 2009 22:45:19 -0000	1.8
@@ -1 +1 @@
-biopython-1.49.tar.gz
+biopython-1.51.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/python-biopython.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-biopython.spec	26 Feb 2009 20:50:53 -0000	1.15
+++ python-biopython.spec	18 Aug 2009 22:45:19 -0000	1.16
@@ -2,22 +2,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.49
-Release:          2%{?dist}
+Version:          1.51
+Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
+Patch0:           python-biopython-1.51-enable-flex.patch
 License:          MIT
 Url:              http://www.biopython.org/
 Group:            Development/Libraries
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    python-devel
+BuildRequires:    flex
 BuildRequires:    python-reportlab
-BuildRequires:    mx
 BuildRequires:    numpy
 BuildRequires:    MySQL-python
 BuildRequires:    python-psycopg2
 Requires:         python-reportlab
-Requires:         mx
 Requires:         numpy
 Requires:         MySQL-python
 Requires:         python-psycopg2
@@ -29,6 +29,8 @@ biology.
 
 %prep
 %setup -q -n biopython-%{version}
+# enable build of Bio.PDB.mmCIF.MMCIFlex (requires flex)
+%patch0 -p0
 
 # remove all execute bits from documentation and fix line endings
 find Scripts -type f -exec chmod -x {} 2>/dev/null ';'
@@ -63,12 +65,21 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %dir %{python_sitearch}/Bio
 %{python_sitearch}/Bio/*
-%dir %{python_sitearch}/Martel
-%{python_sitearch}/Martel/*
 %dir %{python_sitearch}/BioSQL
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* 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
+- Remove Martel modules, no longer distributed upstream
+- Add flex to BuildRequires, patch setup to build
+  Bio.PDB.mmCIF.MMCIFlex as per upstream:
+  http://bugzilla.open-bio.org/show_bug.cgi?id=2619
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.49-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.49-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Dec 2008 13:57:10 -0000	1.7
+++ sources	18 Aug 2009 22:45:19 -0000	1.8
@@ -1 +1 @@
-d233d4944f0c17d5927ca32c5a30d5b3  biopython-1.49.tar.gz
+e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz



From bpepple at fedoraproject.org  Tue Aug 18 22:58:35 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 18 Aug 2009 22:58:35 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.34, 1.35 sources, 1.34,
	1.35 telepathy-glib.spec, 1.43, 1.44
Message-ID: <20090818225835.E2B4511C00D7@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17771

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.35-1
- Update to 0.7.35.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	17 Aug 2009 14:48:13 -0000	1.34
+++ .cvsignore	18 Aug 2009 22:58:35 -0000	1.35
@@ -1 +1 @@
-telepathy-glib-0.7.34.tar.gz
+telepathy-glib-0.7.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	17 Aug 2009 14:48:13 -0000	1.34
+++ sources	18 Aug 2009 22:58:35 -0000	1.35
@@ -1 +1 @@
-a655531426dabd8cf453590069497d04  telepathy-glib-0.7.34.tar.gz
+651251a6707698d3c8e0a2c39880cf19  telepathy-glib-0.7.35.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- telepathy-glib.spec	17 Aug 2009 14:48:13 -0000	1.43
+++ telepathy-glib.spec	18 Aug 2009 22:58:35 -0000	1.44
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.34
+Version:        0.7.35
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.35-1
+- Update to 0.7.35.
+
 * Mon Aug 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.34-1
 - Update to 0.7.34.
 



From alexlan at fedoraproject.org  Tue Aug 18 23:05:42 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 18 Aug 2009 23:05:42 +0000 (UTC)
Subject: rpms/python-biopython/F-10 python-biopython-1.51-enable-flex.patch, 
	NONE, 1.1 .cvsignore, 1.6, 1.7 python-biopython.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <20090818230542.3ABAF11C00D7@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-serv19023

Modified Files:
	.cvsignore python-biopython.spec sources 
Added Files:
	python-biopython-1.51-enable-flex.patch 
Log Message:
* 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
- Remove Martel modules, no longer distributed upstream
- Add flex to BuildRequires, patch setup to build
  Bio.PDB.mmCIF.MMCIFlex as per upstream:
  http://bugzilla.open-bio.org/show_bug.cgi?id=2619


python-biopython-1.51-enable-flex.patch:
 setup.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE python-biopython-1.51-enable-flex.patch ---
--- setup.py.orig	2009-08-18 18:23:01.000000000 -0400
+++ setup.py	2009-08-18 18:23:22.000000000 -0400
@@ -304,12 +304,12 @@
               include_dirs=["Bio"]
               ),
 #Commented out due to the build dependency on flex, see Bug 2619
-#   Extension('Bio.PDB.mmCIF.MMCIFlex',
-#              ['Bio/PDB/mmCIF/lex.yy.c',
-#               'Bio/PDB/mmCIF/MMCIFlexmodule.c'],
-#              include_dirs=["Bio"],
-#              libraries=["fl"]
-#              ),
+   Extension('Bio.PDB.mmCIF.MMCIFlex',
+              ['Bio/PDB/mmCIF/lex.yy.c',
+               'Bio/PDB/mmCIF/MMCIFlexmodule.c'],
+              include_dirs=["Bio"],
+              libraries=["fl"]
+              ),
     Extension('Bio.Nexus.cnexus',
               ['Bio/Nexus/cnexus.c']
               ),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Sep 2008 08:07:25 -0000	1.6
+++ .cvsignore	18 Aug 2009 23:05:41 -0000	1.7
@@ -1 +1 @@
-biopython-1.48.tar.gz
+biopython-1.51.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-10/python-biopython.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-biopython.spec	29 Sep 2008 08:07:25 -0000	1.11
+++ python-biopython.spec	18 Aug 2009 23:05:41 -0000	1.12
@@ -2,25 +2,25 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.48
+Version:          1.51
 Release:          1%{?dist}
 Summary:          Python tools for computational molecular biology
 Source0:          http://biopython.org/DIST/biopython-%{version}.tar.gz
+Patch0:           python-biopython-1.51-enable-flex.patch
 License:          MIT
 Url:              http://www.biopython.org/
 Group:            Development/Libraries
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    python-devel
+BuildRequires:    flex
 BuildRequires:    python-reportlab
-BuildRequires:    mx
-BuildRequires:    python-numeric
+BuildRequires:    numpy
 BuildRequires:    MySQL-python
-BuildRequires:    python-psycopg
+BuildRequires:    python-psycopg2
 Requires:         python-reportlab
-Requires:         mx
-Requires:         python-numeric
+Requires:         numpy
 Requires:         MySQL-python
-Requires:         python-psycopg
+Requires:         python-psycopg2
 Requires:         wise2
 
 %description
@@ -29,6 +29,8 @@ biology.
 
 %prep
 %setup -q -n biopython-%{version}
+# enable build of Bio.PDB.mmCIF.MMCIFlex (requires flex)
+%patch0 -p0
 
 # remove all execute bits from documentation and fix line endings
 find Scripts -type f -exec chmod -x {} 2>/dev/null ';'
@@ -40,17 +42,12 @@ find Bio -type f -exec chmod -x {} 2>/de
 # remove she-bang lines in .py files to keep rpmlint happy
 find Bio -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/.*$/ d' {} 2>/dev/null ';'
 
-# answer interactive question "yes" to build Bio.KDTree
 %build
-env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build <<EOF
-y
-EOF
+env 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 --install-data=%{_datadir}/python-biopython  <<EOF
-y
-EOF
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT --install-data=%{_datadir}/python-biopython
 
 ## disable tests for the moment
 %check
@@ -68,12 +65,37 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %dir %{python_sitearch}/Bio
 %{python_sitearch}/Bio/*
-%dir %{python_sitearch}/Martel
-%{python_sitearch}/Martel/*
 %dir %{python_sitearch}/BioSQL
 %{python_sitearch}/BioSQL/*
 
 %changelog
+* 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
+- Remove Martel modules, no longer distributed upstream
+- Add flex to BuildRequires, patch setup to build
+  Bio.PDB.mmCIF.MMCIFlex as per upstream:
+  http://bugzilla.open-bio.org/show_bug.cgi?id=2619
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.49-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.49-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec  1 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.49-1
+- Update to latest upstream (1.49) uses numpy and new API for psycopg2
+- [Build]Requires python-numeric -> numpy 
+- [Build]Requires python-psycopg -> python-psycopg2
+- Remove interactive question hack, no longer needed
+
+* Sun Nov 30 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.48-3
+- Temporarily disable python-psycopg dependency until it is rebuilt
+  for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.48-2
+- Rebuild for Python 2.6
+
 * Mon Sep 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.48-1
 - Update to latest upstream (1.48)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Sep 2008 08:07:25 -0000	1.6
+++ sources	18 Aug 2009 23:05:42 -0000	1.7
@@ -1 +1 @@
-b049e3af8128bea68e4e86b55c6d0996  biopython-1.48.tar.gz
+e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz



From bpepple at fedoraproject.org  Tue Aug 18 23:17:36 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 18 Aug 2009 23:17:36 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.20,
	1.21 python-telepathy.spec, 1.32, 1.33 sources, 1.20, 1.21
Message-ID: <20090818231736.8AD4611C00D7@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21998

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.11-1
- Update to 0.15.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	15 Aug 2009 02:18:43 -0000	1.20
+++ .cvsignore	18 Aug 2009 23:17:36 -0000	1.21
@@ -1 +1 @@
-telepathy-python-0.15.10.tar.gz
+telepathy-python-0.15.11.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- python-telepathy.spec	15 Aug 2009 02:18:43 -0000	1.32
+++ python-telepathy.spec	18 Aug 2009 23:17:36 -0000	1.33
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.10
+Version:        0.15.11
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.11-1
+- Update to 0.15.11.
+
 * Fri Aug 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.10-1
 - Update to 0.15.10.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	15 Aug 2009 02:18:43 -0000	1.20
+++ sources	18 Aug 2009 23:17:36 -0000	1.21
@@ -1 +1 @@
-0c79eb7023a2c5124d38a60b9fc21881  telepathy-python-0.15.10.tar.gz
+6ab0d05717d05889d4018dd43f071ff0  telepathy-python-0.15.11.tar.gz



From bpepple at fedoraproject.org  Tue Aug 18 23:41:50 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 18 Aug 2009 23:41:50 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.50, 1.51 sources, 1.50,
	1.51 telepathy-gabble.spec, 1.61, 1.62
Message-ID: <20090818234150.5A26711C00D7@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26558

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.
- Bump min version of tp-glib needed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	11 Aug 2009 00:08:55 -0000	1.50
+++ .cvsignore	18 Aug 2009 23:41:49 -0000	1.51
@@ -1 +1 @@
-telepathy-gabble-0.7.32.tar.gz
+telepathy-gabble-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	11 Aug 2009 00:08:55 -0000	1.50
+++ sources	18 Aug 2009 23:41:49 -0000	1.51
@@ -1 +1 @@
-9341e04d213129dbb797cda9f2fe60c0  telepathy-gabble-0.7.32.tar.gz
+e69113294db17c3b43777a7cb699b931  telepathy-gabble-0.8.0.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- telepathy-gabble.spec	11 Aug 2009 00:08:55 -0000	1.61
+++ telepathy-gabble.spec	18 Aug 2009 23:41:50 -0000	1.62
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.32
+Version:        0.8.0
 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.31
+BuildRequires:  telepathy-glib-devel >= 0.7.34
 BuildRequires:  glib2-devel >= 2.16
 BuildRequires:	libsoup-devel
 BuildRequires:  libxslt
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+- Bump min version of tp-glib needed.
+
 * Sun Aug  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.32-1
 - Update to 0.7.32.
 



From alexlan at fedoraproject.org  Tue Aug 18 23:44:45 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 18 Aug 2009 23:44:45 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.72,1.73
Message-ID: <20090818234445.972FA11C00D7@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27557

Modified Files:
	octave-forge.spec 
Log Message:
* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-3
- Temporarily remove ftp because of build problems with SWIG upstream.



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- octave-forge.spec	1 Aug 2009 04:06:55 -0000	1.72
+++ octave-forge.spec	18 Aug 2009 23:44:45 -0000	1.73
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -43,7 +43,8 @@ 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
-Provides: octave-ftp = 1.0.2
+# 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
@@ -137,7 +138,8 @@ 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
 
 #Unpack everything
 for pkg in main extra language
@@ -229,6 +231,9 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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.
 



From dcantrel at fedoraproject.org  Wed Aug 19 01:09:23 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 19 Aug 2009 01:09:23 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.658, 1.659 anaconda.spec, 1.808, 
	1.809 sources, 1.792, 1.793
Message-ID: <20090819010923.7885C11C00D7@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9047

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 12.16-1
- correctly deactivate zFCP LUN on s390 (maier)
- correctly activate zFCP LUN on s390 (maier)
- prevent getting started up or shutdown again while already in such state
  (maier)
- Remove unused reipl code in linuxrc.s390 (maier)
- Fix copying of shutdown to initrd.img in mk-images for s390x (#517888)
  (maier)
- 64 bit sparc linux does not define __sparc64__ we need to use
  "(defined(__sparc__) && defined(__arch64__))" fixes building 64 bit sparc
  (dennis)
- make tftp images as small as possible. we have a 10mb hardware limitation
  on there size (dennis)
- make sure we correctly make the sparc tftp image (dennis)
- make sure we have glibc.sparcv9 installed in sparc installers not
  glibc.sparcv9v (dennis)
- add the sparc screen font (dennis)
- add the files for sparc boot config setup configure.ac to define IS_SPARC
  (dennis)
-  add mk-images.sparc script (dennis)
- add support for making sparc images (dennis)
- sparc no longer needs and special keyboard handling.  it uses the standard
  api's interfaces (dennis)
- setup termcap for sparc (dennis)
- Close %packages with a %end (#518063) (katzj)
- Call udev_settle from DiskLabel.commit to ensure it happens. (dlehman)
- Fix traceback in text mode upgrade. (#505435) (dlehman)
- Don't traceback if Delete button is hit when no device is selected.
  (dlehman)
- Clean up management of extended partitions we create. (#497293) (dlehman)
- Don't use StorageDevice for partitions w/ biosraid formatting. (#504002)
  (dlehman)
- Don't try to get the size of fstypes w/ no infofsProg defined. (dlehman)
- Change all disklabel manipulations to use the DiskLabel format class.
  (dlehman)
- Create a DiskLabel format class for partition tables. (dlehman)
- Add support for specifying a tag to makeupdates. (dlehman)
- Include changed files from the top level in the updates. (dlehman)
- If asked, put the system SN (as given by dmidecode) into an HTTP header.
  (clumens)
- Add dmidecode to the initrd. (clumens)
- Add the kssendsn parameter and corresponding flag. (clumens)
- Don't keep testing if we're doing URL_METHOD_HTTP. (clumens)
- Later pyparted will define DEVICE_DM, so change the test to use it.
  (clumens)
- Use the new GTK Tooltip API (#517389). (clumens)
- Fix a typo in a kickstart error string (#517760). (clumens)
- Be sure we have a sorted list of mountpoints for live mangling (#504986)
  (katzj)
- Fix askmethod to work with stage= being specified (#516973) (katzj)
- Fix ordering on device list returned from identifyMultipaths() (pjones)
- Fix typo in mpath support. (pjones)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -p -r1.658 -r1.659
--- .cvsignore	13 Aug 2009 04:21:00 -0000	1.658
+++ .cvsignore	19 Aug 2009 01:09:22 -0000	1.659
@@ -1 +1 @@
-anaconda-12.15.tar.bz2
+anaconda-12.16.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -p -r1.808 -r1.809
--- anaconda.spec	13 Aug 2009 04:21:00 -0000	1.808
+++ anaconda.spec	19 Aug 2009 01:09:23 -0000	1.809
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.15
+Version: 12.16
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define slangver 2.0.6-2
 %define yumver 2.9.2
 %define partedver 1.8.1
-%define pypartedver 2.0.0
+%define pypartedver 2.1.2
 %define syscfgdatever 1.9.0
 %define pythonpyblockver 0.24-1
 %define libbdevidver 5.1.2-1
@@ -209,6 +209,59 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 12.16-1
+- correctly deactivate zFCP LUN on s390 (maier)
+- correctly activate zFCP LUN on s390 (maier)
+- prevent getting started up or shutdown again while already in such state
+  (maier)
+- Remove unused reipl code in linuxrc.s390 (maier)
+- Fix copying of shutdown to initrd.img in mk-images for s390x (#517888)
+  (maier)
+- 64 bit sparc linux does not define __sparc64__ we need to use
+  "(defined(__sparc__) && defined(__arch64__))" fixes building 64 bit sparc
+  (dennis)
+- make tftp images as small as possible. we have a 10mb hardware limitation
+  on there size (dennis)
+- make sure we correctly make the sparc tftp image (dennis)
+- make sure we have glibc.sparcv9 installed in sparc installers not
+  glibc.sparcv9v (dennis)
+- add the sparc screen font (dennis)
+- add the files for sparc boot config setup configure.ac to define IS_SPARC
+  (dennis)
+-  add mk-images.sparc script (dennis)
+- add support for making sparc images (dennis)
+- sparc no longer needs and special keyboard handling.  it uses the standard
+  api's interfaces (dennis)
+- setup termcap for sparc (dennis)
+- Close %%packages with a %%end (#518063) (katzj)
+- Call udev_settle from DiskLabel.commit to ensure it happens. (dlehman)
+- Fix traceback in text mode upgrade. (#505435) (dlehman)
+- Don't traceback if Delete button is hit when no device is selected.
+  (dlehman)
+- Clean up management of extended partitions we create. (#497293) (dlehman)
+- Don't use StorageDevice for partitions w/ biosraid formatting. (#504002)
+  (dlehman)
+- Don't try to get the size of fstypes w/ no infofsProg defined. (dlehman)
+- Change all disklabel manipulations to use the DiskLabel format class.
+  (dlehman)
+- Create a DiskLabel format class for partition tables. (dlehman)
+- Add support for specifying a tag to makeupdates. (dlehman)
+- Include changed files from the top level in the updates. (dlehman)
+- If asked, put the system SN (as given by dmidecode) into an HTTP header.
+  (clumens)
+- Add dmidecode to the initrd. (clumens)
+- Add the kssendsn parameter and corresponding flag. (clumens)
+- Don't keep testing if we're doing URL_METHOD_HTTP. (clumens)
+- Later pyparted will define DEVICE_DM, so change the test to use it.
+  (clumens)
+- Use the new GTK Tooltip API (#517389). (clumens)
+- Fix a typo in a kickstart error string (#517760). (clumens)
+- Be sure we have a sorted list of mountpoints for live mangling (#504986)
+  (katzj)
+- Fix askmethod to work with stage= being specified (#516973) (katzj)
+- Fix ordering on device list returned from identifyMultipaths() (pjones)
+- Fix typo in mpath support. (pjones)
+
 * Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12.15-1
 - Make sure we have the ca cert to handle https repo connections. (517171)
   (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -p -r1.792 -r1.793
--- sources	13 Aug 2009 04:21:00 -0000	1.792
+++ sources	19 Aug 2009 01:09:23 -0000	1.793
@@ -1 +1 @@
-909540f75411355f3157d06f4a39e012  anaconda-12.15.tar.bz2
+d79c42a7963a58fd27535470f69289f0  anaconda-12.16.tar.bz2



From rdieter at fedoraproject.org  Wed Aug 19 01:14:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 01:14:38 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.135,1.136
Message-ID: <20090819011438.1AECA11C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10749

Modified Files:
	maxima.spec 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-2
- safer evaluation of %sbcl_ver macro



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- maxima.spec	29 Jul 2009 20:16:17 -0000	1.135
+++ maxima.spec	19 Aug 2009 01:14:37 -0000	1.136
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.18.1
+Version: 5.19.0
 
-Release: 6%{?dist} 
+Release: 2%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -187,7 +187,7 @@ Group:   Applications/Engineering
 BuildRequires: sbcl
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
-%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
+%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2 | cut -d- -f1)
 %if "x%{?sbcl_ver}" != "x%{nil}" 
 Requires: sbcl = %{sbcl_ver}
 %endif
@@ -355,14 +355,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/misc/ doc/implementation/
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
-%doc macref.pdf
 %{_bindir}/maxima
 %dir %{_datadir}/maxima
 %dir %{_datadir}/maxima/%{maxima_ver}
 %{_datadir}/maxima/%{maxima_ver}/[a-c,f-r,t-w,y-z,A-Z]*
 %{_datadir}/maxima/%{maxima_ver}/demo/
 %dir %{_datadir}/maxima/%{maxima_ver}/doc/
-%doc %{_datadir}/maxima/%{maxima_ver}/doc/*.h*
+%dir %{_datadir}/maxima/%{maxima_ver}/doc/html/
+%{_datadir}/maxima/%{maxima_ver}/doc/html/figures/
+%doc %lang(en) %{_datadir}/maxima/%{maxima_ver}/doc/html/*.h*
+%doc %lang(en) %{_datadir}/maxima/%{maxima_ver}/doc/share/
 %doc %lang(es) %{_datadir}/maxima/%{maxima_ver}/doc/html/es/
 %doc %lang(es) %{_datadir}/maxima/%{maxima_ver}/doc/html/es.utf8/
 %doc %lang(pt) %{_datadir}/maxima/%{maxima_ver}/doc/html/pt/
@@ -427,6 +429,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-2
+- safer evaluation of %%sbcl_ver macro
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-1
+- maxima-5.19.0
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.18.1-6
 - rebuild (sbcl)
 



From dcantrel at fedoraproject.org  Wed Aug 19 01:14:35 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 19 Aug 2009 01:14:35 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.1.0p1-capability.patch, NONE, 1.1 dhcp.spec, 
	1.269, 1.270
Message-ID: <20090819011435.CB90111C00D7@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10728

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0p1-capability.patch 
Log Message:
* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-5
- Drop unnecessary capabilities in dhclient (#517649)


dhcp-4.1.0p1-capability.patch:
 client/Makefile.am |    2 +-
 client/dhclient.c  |   12 ++++++++++++
 configure.ac       |    3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE dhcp-4.1.0p1-capability.patch ---
diff -urp dhcp-4.1.0p1.orig/client/dhclient.c dhcp-4.1.0p1/client/dhclient.c
--- dhcp-4.1.0p1.orig/client/dhclient.c	2009-08-15 11:44:33.000000000 -0400
+++ dhcp-4.1.0p1/client/dhclient.c	2009-08-15 12:32:52.000000000 -0400
@@ -37,6 +37,9 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <limits.h>
+#ifdef HAVE_LIBCAP_NG
+#include <cap-ng.h>
+#endif
 
 /*
  * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
@@ -422,6 +425,15 @@ main(int argc, char **argv) {
 		path_dhclient_script = s;
 	}
 
+#ifdef HAVE_LIBCAP_NG
+	/* Drop capabilities */
+	capng_clear(CAPNG_SELECT_BOTH);
+	capng_updatev(CAPNG_ADD,
+			CAPNG_EFFECTIVE|CAPNG_PERMITTED|CAPNG_BOUNDING_SET,
+			CAP_NET_ADMIN, CAP_NET_RAW, CAP_NET_BIND_SERVICE, -1);
+	capng_apply(CAPNG_SELECT_BOTH);
+#endif
+
 	/* Set up the initial dhcp option universe. */
 	initialize_common_option_spaces();
 
diff -urp dhcp-4.1.0p1.orig/client/Makefile.am dhcp-4.1.0p1/client/Makefile.am
--- dhcp-4.1.0p1.orig/client/Makefile.am	2009-08-15 11:44:33.000000000 -0400
+++ dhcp-4.1.0p1/client/Makefile.am	2009-08-15 12:32:34.000000000 -0400
@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c 
 		   scripts/netbsd scripts/nextstep scripts/openbsd \
 		   scripts/solaris scripts/openwrt
 dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \
-		 ../omapip/libomapi.a ../dst/libdst.a
+		 ../omapip/libomapi.a ../dst/libdst.a $(CAPNG_LDADD)
 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
 EXTRA_DIST = $(man_MANS)
 
diff -urp dhcp-4.1.0p1.orig/configure.ac dhcp-4.1.0p1/configure.ac
--- dhcp-4.1.0p1.orig/configure.ac	2009-08-15 11:44:33.000000000 -0400
+++ dhcp-4.1.0p1/configure.ac	2009-08-15 12:32:34.000000000 -0400
@@ -388,6 +388,9 @@ AC_TRY_LINK(
 # Look for optional headers.
 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
 
+# look for capabilities library
+LIBCAP_NG_PATH
+
 # find an MD5 library
 AC_SEARCH_LIBS(MD5_Init, [crypto])
 AC_SEARCH_LIBS(MD5Init, [crypto])


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- dhcp.spec	15 Aug 2009 01:10:42 -0000	1.269
+++ dhcp.spec	19 Aug 2009 01:14:35 -0000	1.270
@@ -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.
@@ -54,6 +54,7 @@ Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
 Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
 Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
+Patch23:  %{name}-4.1.0p1-capability.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -212,6 +213,9 @@ libdhcpctl and libomapi static libraries
 # http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
 %patch22 -p1
 
+# Drop unnecessary capabilities in dhclient (#517649)
+%patch23 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -471,6 +475,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-5
+- Drop unnecessary capabilities in dhclient (#517649)
+
 * Fri Aug 14 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-4
 - Upgrade to latest ldap-for-dhcp patch which makes sure that only
   dhcpd links with OpenLDAP (#517474)



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:24 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchbugzilla
Message-ID: <20090819013824.614ED10F855@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-contact-form (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:28 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchcommits
Message-ID: <20090819013828.CCABF10F85C@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-contact-form (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:30 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested commit
Message-ID: <20090819013830.EAA2F10F882@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-contact-form (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:31 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested approveacls
Message-ID: <20090819013837.B87D110F890@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-contact-form (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:42 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchbugzilla
Message-ID: <20090819013842.562BA10F889@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-contact-form (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:43 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchcommits
Message-ID: <20090819013844.C99C310F899@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-contact-form (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:45 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested approveacls
Message-ID: <20090819013845.BE82A10F89F@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-contact-form (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:45 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested commit
Message-ID: <20090819013845.D4F4310F8A0@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-contact-form (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:55 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchcommits
Message-ID: <20090819013855.97FFB10F85A@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-contact-form (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:56 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested commit
Message-ID: <20090819013857.0D52F10F8A3@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-contact-form (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:55 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchbugzilla
Message-ID: <20090819013856.95F7C10F881@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-contact-form (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:38:58 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested approveacls
Message-ID: <20090819013859.1DB2D10F8A6@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-contact-form (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:04 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchcommits
Message-ID: <20090819013904.702B110F888@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-contact-form (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:04 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested commit
Message-ID: <20090819013904.F217710F8B1@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-contact-form (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:12 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested watchbugzilla
Message-ID: <20090819013912.6095F10F898@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-contact-form (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:15 +0000
Subject: [pkgdb] django-contact-form: diegobz has requested approveacls
Message-ID: <20090819013915.41CDE10F85B@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-contact-form (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:41 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchcommits
Message-ID: <20090819013942.12D5610F889@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-notification (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:42 +0000
Subject: [pkgdb] django-notification: diegobz has requested commit
Message-ID: <20090819013942.D7C9E10F89F@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-notification (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:42 +0000
Subject: [pkgdb] django-notification: diegobz has requested approveacls
Message-ID: <20090819013943.A307110F89C@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-notification (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:48 +0000
Subject: [pkgdb] django-notification: diegobz has requested approveacls
Message-ID: <20090819013949.0130610F8C0@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-notification (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:50 +0000
Subject: [pkgdb] django-notification: diegobz has requested commit
Message-ID: <20090819013950.C493810F8C3@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-notification (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:51 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchcommits
Message-ID: <20090819013951.7D06810F8A1@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-notification (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:42 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchbugzilla
Message-ID: <20090819013954.1C69310F85A@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-notification (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:55 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchbugzilla
Message-ID: <20090819013957.B280210F8CD@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-notification (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:59 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchcommits
Message-ID: <20090819014004.6979910F8D2@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-notification (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:58 +0000
Subject: [pkgdb] django-notification: diegobz has requested commit
Message-ID: <20090819013959.67CB710F8D6@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-notification (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:39:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:39:57 +0000
Subject: [pkgdb] django-notification: diegobz has requested approveacls
Message-ID: <20090819013958.66A5110F8D1@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-notification (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:08 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchcommits
Message-ID: <20090819014009.8A9E010F8EB@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-notification (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:07 +0000
Subject: [pkgdb] django-notification: diegobz has requested commit
Message-ID: <20090819014008.9993310F8DB@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-notification (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:10 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchbugzilla
Message-ID: <20090819014011.6A3C510F8EE@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-notification (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:06 +0000
Subject: [pkgdb] django-notification: diegobz has requested approveacls
Message-ID: <20090819014009.0E41F10F8DE@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-notification (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:01 +0000
Subject: [pkgdb] django-notification: diegobz has requested watchbugzilla
Message-ID: <20090819014006.45F2B10F85C@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-notification (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:25 +0000
Subject: [pkgdb] django-tagging: diegobz has requested approveacls
Message-ID: <20090819014025.5C3F110F8AA@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-tagging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:26 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchcommits
Message-ID: <20090819014027.14E7610F8DA@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-tagging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:27 +0000
Subject: [pkgdb] django-tagging: diegobz has requested commit
Message-ID: <20090819014027.4BA0710F8F2@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-tagging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:28 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchbugzilla
Message-ID: <20090819014029.198AE10F8FC@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-tagging (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:31 +0000
Subject: [pkgdb] django-tagging: diegobz has requested approveacls
Message-ID: <20090819014031.8640310F8B0@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-tagging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:32 +0000
Subject: [pkgdb] django-tagging: diegobz has requested commit
Message-ID: <20090819014032.E5D8B10F8FE@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-tagging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:33 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchcommits
Message-ID: <20090819014033.B77EF10F902@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-tagging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:34 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchbugzilla
Message-ID: <20090819014035.022F210F903@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-tagging (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:40 +0000
Subject: [pkgdb] django-tagging: diegobz has requested approveacls
Message-ID: <20090819014040.8398210F909@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-tagging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:41 +0000
Subject: [pkgdb] django-tagging: diegobz has requested commit
Message-ID: <20090819014041.7F73710F90B@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-tagging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:42 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchcommits
Message-ID: <20090819014042.5908710F90E@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-tagging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:44 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchbugzilla
Message-ID: <20090819014045.0DE3210F910@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-tagging (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:46 +0000
Subject: [pkgdb] django-tagging: diegobz has requested approveacls
Message-ID: <20090819014049.62C3210F916@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-tagging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:47 +0000
Subject: [pkgdb] django-tagging: diegobz has requested commit
Message-ID: <20090819014049.6B9F810F917@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-tagging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:48 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchcommits
Message-ID: <20090819014050.4532B10F91B@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-tagging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:40:51 +0000
Subject: [pkgdb] django-tagging: diegobz has requested watchbugzilla
Message-ID: <20090819014051.5796810F91D@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-tagging (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:08 +0000
Subject: [pkgdb] django-pagination: diegobz has requested approveacls
Message-ID: <20090819014108.E0C3D10F855@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-pagination (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:09 +0000
Subject: [pkgdb] django-pagination: diegobz has requested commit
Message-ID: <20090819014110.1862910F897@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-pagination (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:10 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchcommits
Message-ID: <20090819014110.966A710F923@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-pagination (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:11 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchbugzilla
Message-ID: <20090819014111.EAF5010F8C1@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-pagination (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:11 +0000
Subject: [pkgdb] django-pagination: diegobz has requested approveacls
Message-ID: <20090819014112.6AE6210F925@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-pagination (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:13 +0000
Subject: [pkgdb] django-pagination: diegobz has requested commit
Message-ID: <20090819014113.2803A10F92A@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-pagination (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:13 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchcommits
Message-ID: <20090819014114.323BB10F92B@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-pagination (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:15 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchbugzilla
Message-ID: <20090819014115.5032110F92C@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-pagination (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:17 +0000
Subject: [pkgdb] django-pagination: diegobz has requested approveacls
Message-ID: <20090819014118.489AF10F895@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-pagination (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:19 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchcommits
Message-ID: <20090819014120.03FDC10F899@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-pagination (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:20 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchbugzilla
Message-ID: <20090819014121.403F210F936@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-pagination (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:23 +0000
Subject: [pkgdb] django-pagination: diegobz has requested approveacls
Message-ID: <20090819014123.8936A10F939@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-pagination (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:23 +0000
Subject: [pkgdb] django-pagination: diegobz has requested commit
Message-ID: <20090819014123.E567C10F93B@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-pagination (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:24 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchcommits
Message-ID: <20090819014124.E9FCD10F93E@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-pagination (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:18 +0000
Subject: [pkgdb] django-pagination: diegobz has requested commit
Message-ID: <20090819014125.08C5010F941@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-pagination (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:26 +0000
Subject: [pkgdb] django-pagination: diegobz has requested watchbugzilla
Message-ID: <20090819014127.8F2B410F940@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-pagination (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:41 +0000
Subject: [pkgdb] django-evolution: diegobz has requested approveacls
Message-ID: <20090819014142.2F3ED10F89C@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-evolution (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:43 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchbugzilla
Message-ID: <20090819014145.EE19410F93D@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-evolution (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:46 +0000
Subject: [pkgdb] django-evolution: diegobz has requested approveacls
Message-ID: <20090819014147.7EA1910F8BF@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-evolution (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:48 +0000
Subject: [pkgdb] django-evolution: diegobz has requested commit
Message-ID: <20090819014148.5480510F8C0@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-evolution (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:49 +0000
Subject: [pkgdb] django-evolution: diegobz has requested commit
Message-ID: <20090819014150.C577410F951@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-evolution (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:48 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchcommits
Message-ID: <20090819014148.B8FD710F94E@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-evolution (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:48 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchcommits
Message-ID: <20090819014149.95C4E10F8C3@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-evolution (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:51 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchbugzilla
Message-ID: <20090819014152.0E3C310F959@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-evolution (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:53 +0000
Subject: [pkgdb] django-evolution: diegobz has requested approveacls
Message-ID: <20090819014153.D930510F94D@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-evolution (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:56 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchbugzilla
Message-ID: <20090819014156.F37C710F953@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-evolution (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:57 +0000
Subject: [pkgdb] django-evolution: diegobz has requested commit
Message-ID: <20090819014157.CE84A10F95E@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-evolution (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:41:58 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchcommits
Message-ID: <20090819014158.AB87810F961@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-evolution (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:00 +0000
Subject: [pkgdb] django-evolution: diegobz has requested approveacls
Message-ID: <20090819014201.0022510F8C9@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on django-evolution (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:00 +0000
Subject: [pkgdb] django-evolution: diegobz has requested commit
Message-ID: <20090819014201.36DC410F964@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on django-evolution (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:01 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchcommits
Message-ID: <20090819014201.F143C10F965@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on django-evolution (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:03 +0000
Subject: [pkgdb] django-evolution: diegobz has requested watchbugzilla
Message-ID: <20090819014203.CBE0E10F966@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on django-evolution (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:43 +0000
Subject: [pkgdb] python-polib: diegobz has requested approveacls
Message-ID: <20090819014243.61E2410F8CF@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on python-polib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:45 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchcommits
Message-ID: <20090819014245.4E1DF10F8D7@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on python-polib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:45 +0000
Subject: [pkgdb] python-polib: diegobz has requested commit
Message-ID: <20090819014245.5403310F8DC@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on python-polib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:49 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchbugzilla
Message-ID: <20090819014249.822AB10F96F@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on python-polib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:00 +0000
Subject: [pkgdb] python-polib: diegobz has requested commit
Message-ID: <20090819014300.5C00610F973@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on python-polib (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:42:59 +0000
Subject: [pkgdb] python-polib: diegobz has requested approveacls
Message-ID: <20090819014259.6BEBA10F8E1@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on python-polib (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:00 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchcommits
Message-ID: <20090819014301.31A1C10F977@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on python-polib (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:02 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchbugzilla
Message-ID: <20090819014303.B94B210F8D4@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on python-polib (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:08 +0000
Subject: [pkgdb] python-polib: diegobz has requested approveacls
Message-ID: <20090819014312.2A12310F8EE@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on python-polib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:09 +0000
Subject: [pkgdb] python-polib: diegobz has requested commit
Message-ID: <20090819014312.47EF710F983@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on python-polib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:09 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchcommits
Message-ID: <20090819014312.6C80710F980@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on python-polib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:14 +0000
Subject: [pkgdb] python-polib: diegobz has requested approveacls
Message-ID: <20090819014315.C75BC10F98A@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on python-polib (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:15 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchcommits
Message-ID: <20090819014316.AF11310F98F@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on python-polib (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:17 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchbugzilla
Message-ID: <20090819014318.EA7CF10F97E@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on python-polib (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:11 +0000
Subject: [pkgdb] python-polib: diegobz has requested watchbugzilla
Message-ID: <20090819014314.0C8A010F987@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on python-polib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 01:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 01:43:14 +0000
Subject: [pkgdb] python-polib: diegobz has requested commit
Message-ID: <20090819014316.769BC10F98C@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on python-polib (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From kyle at fedoraproject.org  Wed Aug 19 01:49:03 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 01:49:03 +0000 (UTC)
Subject: rpms/kernel/F-10 execve-must-clear-current-clear_child_tid.patch,
	NONE, 1.1 kernel.spec, 1.1400, 1.1401
Message-ID: <20090819014903.3F16611C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16774

Modified Files:
	kernel.spec 
Added Files:
	execve-must-clear-current-clear_child_tid.patch 
Log Message:
* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
- CVE-2009-2848: execve: must clear current->clear_child_tid


execve-must-clear-current-clear_child_tid.patch:
 fork.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE execve-must-clear-current-clear_child_tid.patch ---
From: Eric Dumazet <eric.dumazet at gmail.com>
Date: Thu, 6 Aug 2009 22:09:28 +0000 (-0700)
Subject: execve: must clear current->clear_child_tid
X-Git-Tag: v2.6.31-rc6~52
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9c8a8228d0827e0d91d28527209988f672f97d28

execve: must clear current->clear_child_tid

While looking at Jens Rosenboom bug report
(http://lkml.org/lkml/2009/7/27/35) about strange sys_futex call done from
a dying "ps" program, we found following problem.

clone() syscall has special support for TID of created threads.  This
support includes two features.

One (CLONE_CHILD_SETTID) is to set an integer into user memory with the
TID value.

One (CLONE_CHILD_CLEARTID) is to clear this same integer once the created
thread dies.

The integer location is a user provided pointer, provided at clone()
time.

kernel keeps this pointer value into current->clear_child_tid.

At execve() time, we should make sure kernel doesnt keep this user
provided pointer, as full user memory is replaced by a new one.

As glibc fork() actually uses clone() syscall with CLONE_CHILD_SETTID and
CLONE_CHILD_CLEARTID set, chances are high that we might corrupt user
memory in forked processes.

Following sequence could happen:

1) bash (or any program) starts a new process, by a fork() call that
   glibc maps to a clone( ...  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID
   ...) syscall

2) When new process starts, its current->clear_child_tid is set to a
   location that has a meaning only in bash (or initial program) context
   (&THREAD_SELF->tid)

3) This new process does the execve() syscall to start a new program.
   current->clear_child_tid is left unchanged (a non NULL value)

4) If this new program creates some threads, and initial thread exits,
   kernel will attempt to clear the integer pointed by
   current->clear_child_tid from mm_release() :

        if (tsk->clear_child_tid
            && !(tsk->flags & PF_SIGNALED)
            && atomic_read(&mm->mm_users) > 1) {
                u32 __user * tidptr = tsk->clear_child_tid;
                tsk->clear_child_tid = NULL;

                /*
                 * We don't check the error code - if userspace has
                 * not set up a proper pointer then tough luck.
                 */
<< here >>      put_user(0, tidptr);
                sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);
        }

5) OR : if new program is not multi-threaded, but spied by /proc/pid
   users (ps command for example), mm_users > 1, and the exiting program
   could corrupt 4 bytes in a persistent memory area (shm or memory mapped
   file)

If current->clear_child_tid points to a writeable portion of memory of the
new program, kernel happily and silently corrupts 4 bytes of memory, with
unexpected effects.

Fix is straightforward and should not break any sane program.

Reported-by: Jens Rosenboom <jens at mcbone.net>
Acked-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Sonny Rao <sonnyrao at us.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ulrich Drepper <drepper at redhat.com>
Cc: Oleg Nesterov <oleg at redhat.com>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 466531e..021e113 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -568,18 +568,18 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
 	 * the value intact in a core dump, and to save the unnecessary
 	 * trouble otherwise.  Userland only wants this done for a sys_exit.
 	 */
-	if (tsk->clear_child_tid
-	    && !(tsk->flags & PF_SIGNALED)
-	    && atomic_read(&mm->mm_users) > 1) {
-		u32 __user * tidptr = tsk->clear_child_tid;
+	if (tsk->clear_child_tid) {
+		if (!(tsk->flags & PF_SIGNALED) &&
+		    atomic_read(&mm->mm_users) > 1) {
+			/*
+			 * We don't check the error code - if userspace has
+			 * not set up a proper pointer then tough luck.
+			 */
+			put_user(0, tsk->clear_child_tid);
+			sys_futex(tsk->clear_child_tid, FUTEX_WAKE,
+					1, NULL, NULL, 0);
+		}
 		tsk->clear_child_tid = NULL;
-
-		/*
-		 * We don't check the error code - if userspace has
-		 * not set up a proper pointer then tough luck.
-		 */
-		put_user(0, tidptr);
-		sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);
 	}
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1400
retrieving revision 1.1401
diff -u -p -r1.1400 -r1.1401
--- kernel.spec	18 Aug 2009 15:51:44 -0000	1.1400
+++ kernel.spec	19 Aug 2009 01:49:02 -0000	1.1401
@@ -761,6 +761,7 @@ Patch11030: linux-2.6-x86-delay-tsc-barr
 Patch11040: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 Patch11050: security-use-mmap_min_addr-indepedently-of-security-models.patch
 Patch11060: personality-fix-per_clear_on_setid.patch
+Patch11070: execve-must-clear-current-clear_child_tid.patch
 
 %endif
 
@@ -1439,6 +1440,9 @@ ApplyPatch add-fno-delete-null-pointer-c
 ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
 ApplyPatch personality-fix-per_clear_on_setid.patch
 
+# CVE-2009-2848
+ApplyPatch execve-must-clear-current-clear_child_tid.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -2015,6 +2019,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+- CVE-2009-2848: execve: must clear current->clear_child_tid
+
 * Tue Aug 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-99
 - Intel wireless fixes from Fedora 11:
    iwl3945-release-resources-before-shutting-down.patch



From kyle at fedoraproject.org  Wed Aug 19 01:49:15 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 01:49:15 +0000 (UTC)
Subject: rpms/kernel/F-11 execve-must-clear-current-clear_child_tid.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1679.2.9, 1.1679.2.10
Message-ID: <20090819014915.0102811C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	execve-must-clear-current-clear_child_tid.patch 
Log Message:
* Sat Aug 15 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.8
- CVE-2009-2767: Fix clock_nanosleep NULL ptr deref.


execve-must-clear-current-clear_child_tid.patch:
 fork.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE execve-must-clear-current-clear_child_tid.patch ---
From: Eric Dumazet <eric.dumazet at gmail.com>
Date: Thu, 6 Aug 2009 22:09:28 +0000 (-0700)
Subject: execve: must clear current->clear_child_tid
X-Git-Tag: v2.6.31-rc6~52
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9c8a8228d0827e0d91d28527209988f672f97d28

execve: must clear current->clear_child_tid

While looking at Jens Rosenboom bug report
(http://lkml.org/lkml/2009/7/27/35) about strange sys_futex call done from
a dying "ps" program, we found following problem.

clone() syscall has special support for TID of created threads.  This
support includes two features.

One (CLONE_CHILD_SETTID) is to set an integer into user memory with the
TID value.

One (CLONE_CHILD_CLEARTID) is to clear this same integer once the created
thread dies.

The integer location is a user provided pointer, provided at clone()
time.

kernel keeps this pointer value into current->clear_child_tid.

At execve() time, we should make sure kernel doesnt keep this user
provided pointer, as full user memory is replaced by a new one.

As glibc fork() actually uses clone() syscall with CLONE_CHILD_SETTID and
CLONE_CHILD_CLEARTID set, chances are high that we might corrupt user
memory in forked processes.

Following sequence could happen:

1) bash (or any program) starts a new process, by a fork() call that
   glibc maps to a clone( ...  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID
   ...) syscall

2) When new process starts, its current->clear_child_tid is set to a
   location that has a meaning only in bash (or initial program) context
   (&THREAD_SELF->tid)

3) This new process does the execve() syscall to start a new program.
   current->clear_child_tid is left unchanged (a non NULL value)

4) If this new program creates some threads, and initial thread exits,
   kernel will attempt to clear the integer pointed by
   current->clear_child_tid from mm_release() :

        if (tsk->clear_child_tid
            && !(tsk->flags & PF_SIGNALED)
            && atomic_read(&mm->mm_users) > 1) {
                u32 __user * tidptr = tsk->clear_child_tid;
                tsk->clear_child_tid = NULL;

                /*
                 * We don't check the error code - if userspace has
                 * not set up a proper pointer then tough luck.
                 */
<< here >>      put_user(0, tidptr);
                sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);
        }

5) OR : if new program is not multi-threaded, but spied by /proc/pid
   users (ps command for example), mm_users > 1, and the exiting program
   could corrupt 4 bytes in a persistent memory area (shm or memory mapped
   file)

If current->clear_child_tid points to a writeable portion of memory of the
new program, kernel happily and silently corrupts 4 bytes of memory, with
unexpected effects.

Fix is straightforward and should not break any sane program.

Reported-by: Jens Rosenboom <jens at mcbone.net>
Acked-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Sonny Rao <sonnyrao at us.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ulrich Drepper <drepper at redhat.com>
Cc: Oleg Nesterov <oleg at redhat.com>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 466531e..021e113 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -568,18 +568,18 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
 	 * the value intact in a core dump, and to save the unnecessary
 	 * trouble otherwise.  Userland only wants this done for a sys_exit.
 	 */
-	if (tsk->clear_child_tid
-	    && !(tsk->flags & PF_SIGNALED)
-	    && atomic_read(&mm->mm_users) > 1) {
-		u32 __user * tidptr = tsk->clear_child_tid;
+	if (tsk->clear_child_tid) {
+		if (!(tsk->flags & PF_SIGNALED) &&
+		    atomic_read(&mm->mm_users) > 1) {
+			/*
+			 * We don't check the error code - if userspace has
+			 * not set up a proper pointer then tough luck.
+			 */
+			put_user(0, tsk->clear_child_tid);
+			sys_futex(tsk->clear_child_tid, FUTEX_WAKE,
+					1, NULL, NULL, 0);
+		}
 		tsk->clear_child_tid = NULL;
-
-		/*
-		 * We don't check the error code - if userspace has
-		 * not set up a proper pointer then tough luck.
-		 */
-		put_user(0, tidptr);
-		sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);
 	}
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.9
retrieving revision 1.1679.2.10
diff -u -p -r1.1679.2.9 -r1.1679.2.10
--- kernel.spec	17 Aug 2009 13:15:50 -0000	1.1679.2.9
+++ kernel.spec	19 Aug 2009 01:49:14 -0000	1.1679.2.10
@@ -821,6 +821,9 @@ Patch11130: via-hwmon-temp-sensor.patch
 Patch12000: security-use-mmap_min_addr-indepedently-of-security-models.patch
 Patch12010: personality-fix-per_clear_on_setid.patch
 
+# CVE-2009-2848
+Patch12020: execve-must-clear-current-clear_child_tid.patch
+
 # make gcc stop optimizing away null pointer tests
 Patch13000: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -1541,6 +1544,9 @@ ApplyPatch linux-2.6-x86-delay-tsc-barri
 ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
 ApplyPatch personality-fix-per_clear_on_setid.patch
 
+# CVE-2009-2848
+ApplyPatch execve-must-clear-current-clear_child_tid.patch
+
 # don't optimize out null pointer tests
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -2144,6 +2150,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+- CVE-2009-2848: execve: must clear current->clear_child_tid
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9
 - Fix flub in prior lirc patch update that resulted in no lirc
   drivers getting built



From kyle at fedoraproject.org  Wed Aug 19 01:51:11 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 01:51:11 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1679.2.10,1.1679.2.11
Message-ID: <20090819015111.62B5911C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17137

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Log Message:
set tag


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.10
retrieving revision 1.1679.2.11
diff -u -p -r1.1679.2.10 -r1.1679.2.11
--- kernel.spec	19 Aug 2009 01:49:14 -0000	1.1679.2.10
+++ kernel.spec	19 Aug 2009 01:51:10 -0000	1.1679.2.11
@@ -2150,7 +2150,7 @@ fi
 # and build.
 
 %changelog
-* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.10
 - CVE-2009-2848: execve: must clear current->clear_child_tid
 
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9



From kyle at fedoraproject.org  Wed Aug 19 01:52:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 01:52:04 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1401,1.1402
Message-ID: <20090819015204.62B4311C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17303

Modified Files:
	kernel.spec 
Log Message:
set tag


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1401
retrieving revision 1.1402
diff -u -p -r1.1401 -r1.1402
--- kernel.spec	19 Aug 2009 01:49:02 -0000	1.1401
+++ kernel.spec	19 Aug 2009 01:52:04 -0000	1.1402
@@ -2019,7 +2019,7 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-102
 - CVE-2009-2848: execve: must clear current->clear_child_tid
 
 * Tue Aug 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-99



From mbarnes at fedoraproject.org  Wed Aug 19 01:57:17 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 19 Aug 2009 01:57:17 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.27,1.394.2.28
Message-ID: <20090819015717.6FFAD11C00D7@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18718

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix file list, again.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.27
retrieving revision 1.394.2.28
diff -u -p -r1.394.2.27 -r1.394.2.28
--- evolution.spec	18 Aug 2009 19:31:49 -0000	1.394.2.27
+++ evolution.spec	19 Aug 2009 01:57:17 -0000	1.394.2.28
@@ -502,7 +502,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %{evo_plugin_dir}/org-gnome-backup-restore.eplug
-%{evo_plugin_dir}/org-gnome-backup-restore.xml
 %{evo_plugin_dir}/liborg-gnome-backup-restore.so
 
 %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug



From cweyl at fedoraproject.org  Wed Aug 19 02:21:31 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 02:21:31 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.34, 1.35 perl-Class-MOP.spec,
	1.40, 1.41 sources, 1.32, 1.33
Message-ID: <20090819022131.8129311C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23019

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.92-1
- auto-update to 0.92 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	31 Jul 2009 06:09:21 -0000	1.34
+++ .cvsignore	19 Aug 2009 02:21:31 -0000	1.35
@@ -1 +1 @@
-Class-MOP-0.91.tar.gz
+Class-MOP-0.92.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- perl-Class-MOP.spec	31 Jul 2009 06:09:22 -0000	1.40
+++ perl-Class-MOP.spec	19 Aug 2009 02:21:31 -0000	1.41
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.91
+Version:        0.92
 Release:        1%{?dist}
 Summary:        Meta object programming model for Perl 5
 License:        GPL+ or Artistic
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.92-1
+- auto-update to 0.92 (by cpan-spec-update 0.01)
+
 * Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.91-1
 - auto-update to 0.91 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	31 Jul 2009 06:09:22 -0000	1.32
+++ sources	19 Aug 2009 02:21:31 -0000	1.33
@@ -1 +1 @@
-8cd5d2b4bb502557a5f1f0ffaabe3fb3  Class-MOP-0.91.tar.gz
+b9cfa44c995e315a7ce7d7acc50d0517  Class-MOP-0.92.tar.gz



From cweyl at fedoraproject.org  Wed Aug 19 02:24:15 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 02:24:15 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/F-11 perl-Text-SimpleTable.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090819022415.6BF7311C043A@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Text-SimpleTable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23618

Modified Files:
	perl-Text-SimpleTable.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
- auto-update to 2.0 (by cpan-spec-update 0.01)



Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/F-11/perl-Text-SimpleTable.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Text-SimpleTable.spec	27 Feb 2009 03:28:52 -0000	1.7
+++ perl-Text-SimpleTable.spec	19 Aug 2009 02:24:15 -0000	1.8
@@ -1,13 +1,13 @@
 %define _default_patch_fuzz 2
 
 Name:           perl-Text-SimpleTable
-Version:        0.05
-Release:        3%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Text-SimpleTable/
-Source0:        http://www.cpan.org/authors/id/S/SR/SRI/Text-SimpleTable-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/K/KR/KRAIH/Text-SimpleTable-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -57,6 +57,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
+- auto-update to 2.0 (by cpan-spec-update 0.01)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Sep 2008 02:36:53 -0000	1.3
+++ sources	19 Aug 2009 02:24:15 -0000	1.4
@@ -1 +1 @@
-90f884fec82f85df903ad7934b5351a6  Text-SimpleTable-0.05.tar.gz
+b57b6e60b5ee3cd5209d4bad510d0d2d  Text-SimpleTable-2.0.tar.gz



From rdieter at fedoraproject.org  Wed Aug 19 02:26:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 02:26:55 +0000 (UTC)
Subject: rpms/kdepim/devel kmail-fonts-4.3.patch, NONE, 1.1 kdepim.spec,
	1.231, 1.232
Message-ID: <20090819022656.0471011C00D7@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24296

Modified Files:
	kdepim.spec 
Added Files:
	kmail-fonts-4.3.patch 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- kmail: upstream fix for custom font settings (#kdebug#178402)


kmail-fonts-4.3.patch:
 core/delegate.cpp      |    2 
 core/messageitem.h     |   14 ++
 core/model.cpp         |   24 -----
 core/theme.cpp         |   49 ----------
 core/theme.h           |  107 ----------------------
 core/themedelegate.cpp |  211 ++++++++++++++++++++------------------------
 core/themedelegate.h   |   10 +-
 core/themeeditor.cpp   |    6 -
 core/themeeditor.h     |    2 
 storagemodel.cpp       |  232 +++++++++++++++++++++----------------------------
 storagemodel.h         |   15 ++-
 11 files changed, 241 insertions(+), 431 deletions(-)

--- NEW FILE kmail-fonts-4.3.patch ---
Index: kmail/messagelistview/storagemodel.cpp
===================================================================
--- kmail/messagelistview/storagemodel.cpp	(revision 1011070)
+++ kmail/messagelistview/storagemodel.cpp	(revision 1011071)
@@ -154,6 +154,21 @@
     mColorToDoMessage = config.readEntry( "TodoMessage", mColorToDoMessage );
   }
 
+  if ( GlobalSettings::self()->useDefaultFonts() )
+  {
+    mFont = mFontImportantMessage = mFontNewMessage = mFontUnreadMessage =
+      mFontToDoMessage = KGlobalSettings::generalFont();
+  }
+  else
+  {
+    KConfigGroup fonts( KMKernel::config(), "Fonts" );
+    mFont = fonts.readEntry( "list-font",  KGlobalSettings::generalFont() );
+
+    mFontImportantMessage = fonts.readEntry( "list-important-font", mFont );
+    mFontNewMessage       = fonts.readEntry( "list-new-font",       mFont );
+    mFontUnreadMessage    = fonts.readEntry( "list-unread-font",    mFont );
+    mFontToDoMessage      = fonts.readEntry( "list-toact-font",     mFont );
+  }
 }
 
 StorageModel::~StorageModel()
@@ -290,46 +305,15 @@
   return mFolder->whoField().toLower() == "to";
 }
 
-bool StorageModel::initializeMessageItem( Core::MessageItem * mi, int row, bool bUseReceiver ) const
+/**
+ * Uses the KMMsgBase to fill a list of tags. It also picks out
+ * the colors the message should use.
+ */
+QList< Core::MessageItem::Tag * > * fillTagList( KMMsgBase * msg,
+    QColor & textColor, QColor & backgroundColor )
 {
-  KMMsgBase * msg = mFolder->getMsgBase( row );
-  if ( !msg )
-    return false;
-
-  QString sender = msg->fromStrip();
-  QString receiver = msg->toStrip();
-
-  // Static for speed reasons
-  static const QString noSubject = i18nc( "displayed as subject when the subject of a mail is empty", "No Subject" );
-  static const QString unknown( i18nc( "displayed when a mail has unknown sender, receiver or date", "Unknown" ) );
-
-  if ( sender.isEmpty() )
-    sender = unknown;
-  if ( receiver.isEmpty() )
-    receiver = unknown;
-
-  mi->initialSetup(
-      msg->date(),
-      mFolder->folderType() == KMFolderTypeImap ? msg->msgSizeServer() : msg->msgSize(),
-      sender, receiver,
-      bUseReceiver ? receiver : sender
-    );
-
-  mi->setUniqueId( msg->getMsgSerNum() );
-
-  KPIM::MessageStatus stat = msg->messageStatus();
-
-  QString subject = msg->subject();
-  if ( subject.isEmpty() )
-    subject = '(' + noSubject + ')';
-  mi->setSubjectAndStatus(
-      subject,
-      stat
-    );
-
-  QColor clr;
-
   // FIXME: Tags should be sorted by priority!
+  QList< Core::MessageItem::Tag * > * tagList = 0;
 
   if ( msg->tagList() )
   {
@@ -337,15 +321,16 @@
     {
       int bestPriority = -0xfffff;
 
-      QList< Core::MessageItem::Tag * > * tagList = new QList< Core::MessageItem::Tag * >();
+      tagList = new QList< Core::MessageItem::Tag * >();
       for ( KMMessageTagList::Iterator it = msg->tagList()->begin(); it != msg->tagList()->end(); ++it )
       {
         const KMMessageTagDescription * description = kmkernel->msgTagMgr()->find( *it );
         if ( description )
         {
-          if ( ( bestPriority < description->priority() ) || ( !clr.isValid() ) )
+          if ( ( bestPriority < description->priority() ) || ( !textColor.isValid() ) )
           {
-            clr = description->textColor();
+            textColor = description->textColor();
+            backgroundColor = description->backgroundColor();
             bestPriority = description->priority();
           }
 
@@ -358,14 +343,18 @@
         }
       }
       if ( tagList->isEmpty() )
+      {
         delete tagList;
-      else
-        mi->setTagList( tagList );
+        tagList = 0;
+      }
     }
   }
 
+  return tagList;
+}
 
-
+static void setMessageItemEncryptionState( Core::MessageItem * mi, KMMsgBase * msg )
+{
   switch ( msg->encryptionState() )
   {
     case KMMsgFullyEncrypted:
@@ -375,13 +364,17 @@
       mi->setEncryptionState( Core::MessageItem::PartiallyEncrypted );
     break;
     case KMMsgEncryptionStateUnknown:
+    case KMMsgEncryptionProblematic:
       mi->setEncryptionState( Core::MessageItem::EncryptionStateUnknown );
     break;
     default:
       mi->setEncryptionState( Core::MessageItem::NotEncrypted );
     break;
   }
+}
 
+static void setMessageItemSignatureState( Core::MessageItem * mi, KMMsgBase * msg )
+{
   switch ( msg->signatureState() )
   {
     case KMMsgFullySigned:
@@ -391,28 +384,51 @@
       mi->setSignatureState( Core::MessageItem::PartiallySigned );
     break;
     case KMMsgSignatureStateUnknown:
+    case KMMsgSignatureProblematic:
       mi->setSignatureState( Core::MessageItem::SignatureStateUnknown );
     break;
     default:
       mi->setSignatureState( Core::MessageItem::NotSigned );
     break;
   }
+}
 
-  if ( !clr.isValid() )
-  {
-    if ( stat.isNew() )
-      clr = mColorNewMessage;
-    else if ( stat.isUnread() )
-      clr = mColorUnreadMessage;
-    else if ( stat.isImportant() )
-      clr = mColorImportantMessage;
-    else if ( stat.isToAct() )
-      clr = mColorToDoMessage;
-  }
+bool StorageModel::initializeMessageItem( Core::MessageItem * mi, int row, bool bUseReceiver ) const
+{
+  KMMsgBase * msg = mFolder->getMsgBase( row );
+  if ( !msg )
+    return false;
 
-  if ( clr.isValid() )
-    mi->setTextColor( clr );
+  QString sender = msg->fromStrip();
+  QString receiver = msg->toStrip();
 
+  // Static for speed reasons
+  static const QString noSubject = i18nc( "displayed as subject when the subject of a mail is empty", "No Subject" );
+  static const QString unknown( i18nc( "displayed when a mail has unknown sender, receiver or date", "Unknown" ) );
+
+  if ( sender.isEmpty() )
+    sender = unknown;
+  if ( receiver.isEmpty() )
+    receiver = unknown;
+
+  mi->initialSetup(
+      msg->date(),
+      mFolder->folderType() == KMFolderTypeImap ? msg->msgSizeServer() : msg->msgSize(),
+      sender, receiver,
+      bUseReceiver ? receiver : sender
+    );
+
+  mi->setUniqueId( msg->getMsgSerNum() );
+
+  KPIM::MessageStatus stat = msg->messageStatus();
+
+  QString subject = msg->subject();
+  if ( subject.isEmpty() )
+    subject = '(' + noSubject + ')';
+  mi->setSubjectAndStatus( subject, stat );
+
+  setMessageItemData( mi, msg );
+
   return true;
 }
 
@@ -429,99 +445,53 @@
     mi->recomputeMaxDate();
   }
 
-  QColor clr;
-
   KPIM::MessageStatus stat = msg->messageStatus();
 
   mi->setStatus( stat );
 
-  switch ( msg->encryptionState() )
-  {
-    case KMMsgFullyEncrypted:
-      mi->setEncryptionState( Core::MessageItem::FullyEncrypted );
-    break;
-    case KMMsgPartiallyEncrypted:
-      mi->setEncryptionState( Core::MessageItem::PartiallyEncrypted );
-    break;
-    case KMMsgEncryptionStateUnknown:
-    case KMMsgEncryptionProblematic:
-      mi->setEncryptionState( Core::MessageItem::EncryptionStateUnknown );
-    break;
-    default:
-      mi->setEncryptionState( Core::MessageItem::NotEncrypted );
-    break;
-  }
+  setMessageItemData( mi, msg );
+}
 
-  switch ( msg->signatureState() )
-  {
-    case KMMsgFullySigned:
-      mi->setSignatureState( Core::MessageItem::FullySigned );
-    break;
-    case KMMsgPartiallySigned:
-      mi->setSignatureState( Core::MessageItem::PartiallySigned );
-    break;
-    case KMMsgSignatureStateUnknown:
-    case KMMsgSignatureProblematic:
-      mi->setSignatureState( Core::MessageItem::SignatureStateUnknown );
-    break;
-    default:
-      mi->setSignatureState( Core::MessageItem::NotSigned );
-    break;
-  }
+void StorageModel::setMessageItemData( Core::MessageItem * mi, KMMsgBase * msg ) const
+{
+  setMessageItemEncryptionState( mi, msg );
+  setMessageItemSignatureState( mi, msg );
 
-  QList< Core::MessageItem::Tag * > * tagList = 0;
-
-  if ( msg->tagList() )
-  {
-    if ( !msg->tagList()->isEmpty() )
-    {
-      int bestPriority = -0xfffff;
-
-      tagList = new QList< Core::MessageItem::Tag * >();
-      for ( KMMessageTagList::Iterator it = msg->tagList()->begin(); it != msg->tagList()->end(); ++it )
-      {
-        const KMMessageTagDescription * description = kmkernel->msgTagMgr()->find( *it );
-        if ( description )
-        {
-          if ( ( bestPriority < description->priority() ) || ( !clr.isValid() ) )
-          {
-            clr = description->textColor();
-            bestPriority = description->priority();
-          }
-
-          Core::MessageItem::Tag * tag;
-          if ( description->toolbarIconName().isEmpty() )
-            tag = new Core::MessageItem::Tag( SmallIcon( "feed-subscribe" ), description->name(), *it );
-          else
-            tag = new Core::MessageItem::Tag( SmallIcon( description->toolbarIconName() ), description->name(), *it );
-          tagList->append( tag );
-        }
-      }
-      if ( tagList->isEmpty() )
-      {
-        delete tagList;
-        tagList = 0;
-      }
-    }
-  }
-
+  QColor clr;
+  QColor backClr;
+  QList< Core::MessageItem::Tag * > * tagList;
+  tagList = fillTagList( msg, clr, backClr );
   mi->setTagList( tagList );
 
+  KPIM::MessageStatus stat = msg->messageStatus();
+
   if ( !clr.isValid() )
   {
-    if ( stat.isNew() )
+    // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+    if ( stat.isImportant() )
+      clr = mColorImportantMessage;
+    else if ( stat.isNew() )
       clr = mColorNewMessage;
     else if ( stat.isUnread() )
       clr = mColorUnreadMessage;
-    else if ( stat.isImportant() )
-      clr = mColorImportantMessage;
     else if ( stat.isToAct() )
       clr = mColorToDoMessage;
   }
 
   mi->setTextColor( clr ); // set even if invalid (->default color)
+  mi->setBackgroundColor( backClr );
 
-  // FIXME: Handle MDN State ?
+  // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+  if ( stat.isImportant() )
+    mi->setFont( mFontImportantMessage );
+  else if ( stat.isNew() )
+    mi->setFont( mFontNewMessage );
+  else if ( stat.isUnread() )
+    mi->setFont( mFontUnreadMessage );
+  else if ( stat.isToAct() )
+    mi->setFont( mFontToDoMessage );
+  else
+    mi->setFont( mFont );
 }
 
 void StorageModel::fillMessageItemThreadingData( Core::MessageItem * mi, int row, ThreadingDataSubset subset ) const
Index: kmail/messagelistview/core/model.cpp
===================================================================
--- kmail/messagelistview/core/model.cpp	(revision 1011070)
+++ kmail/messagelistview/core/model.cpp	(revision 1011071)
@@ -3237,8 +3237,6 @@
   // The end index of our work.
   int endIndex = job->endIndex();
 
-  bool viewportNeedsUpdate = false;
-
   while( curIndex <= endIndex )
   {
     // Get the underlying storage message data...
@@ -3269,6 +3267,8 @@
 
     // Do update
     mStorageModel->updateMessageItemData( message, row );
+    QModelIndex idx = index( message, 0 );
+    emit dataChanged( idx, idx );
 
     // Reinsert the item to the cache, if needed
     if( mAggregation->threading() == Aggregation::PerfectReferencesAndSubject )
@@ -3289,22 +3289,6 @@
     if ( propertyChangeMask )
     {
       // Some message data has changed
-      // We could emit dataChanged() so the viewport would be updated...
-      // but this is AGAIN a huge performance cost. Since we don't actually
-      // use the standard painting code nothing will screw up if we don't
-      // emit this signal (I hope.. :D). We just set a flag that will cause
-      // us to update the viewport on exit instead.
-      //
-      // ... hm.. now that I think of it.. what the heck is the meaning of
-      // topLeft and bottomRight parameters of dataChanged() in a tree ?
-      // I guess that it should be always topLeft == bottomRight == itemIndex...
-      // But anyway, the view jumps like crazy when this signal is emitted.
-
-      // QModelIndex idx = index( message, 0 );
-      // emit dataChanged( idx, idx );
-
-      viewportNeedsUpdate = true;
-
       // now we need to handle the changes that might cause re-grouping/re-sorting
       // and propagate them to the parents.
 
@@ -3374,16 +3358,12 @@
         if ( curIndex <= endIndex )
         {
           job->setCurrentIndex( curIndex );
-          if ( viewportNeedsUpdate )
-            mView->viewport()->update();
           return ViewItemJobInterrupted;
         }
       }
     }
   }
 
-  if ( viewportNeedsUpdate )
-    mView->viewport()->update();
   return ViewItemJobCompleted;
 }
 
Index: kmail/messagelistview/core/theme.h
===================================================================
--- kmail/messagelistview/core/theme.h	(revision 1011070)
+++ kmail/messagelistview/core/theme.h	(revision 1011071)
@@ -237,10 +237,6 @@
 
      QFont mFont;                     ///< The font to use with this content item, meaningful only if displaysText() returns true.
      QColor mCustomColor;             ///< The color to use with this content item, meaningful only if canUseCustomColor() return true.
-     // Cache stuff
-     QPaintDevice * mLastPaintDevice; ///< The last paint device that used this content item (this is usually set only once)
-     QFontMetrics mFontMetrics;       ///< Our font metrics cache (kept updated to the last QPaintDevice that uses this ContentItem)
-     int mLineSpacing;                ///< The line spacing in mFontMetrics, this is a value we use a lot (so by caching it we can avoid a function call)
 
   public:
     /**
@@ -437,46 +433,6 @@
     // so for portability we're using a public interface also here.
 
     /**
-     * The last QPaintDevice that made use of this item.
-     * This function is used by ThemeDelegate for QFontMetrics caching purposes.
-     */
-    const QPaintDevice * lastPaintDevice() const
-      { return mLastPaintDevice; };
-
-    /**
-     * Updates the font metrics cache for this item by recreating them
-     * for the currently set font and the specified QPaintDevice.
-     * This function will also reset the font to the KGlobalSettings::generalFont()
-     * if you haven't called setUseCustomFont().
-     * This function is used by ThemeDelegate, you usually don't need to care.
-     */
-    void updateFontMetrics( QPaintDevice * device );
-
-    /**
-     * Returns the cached font metrics attacched to this content item.
-     * The font metrics must be kept up-to-date by the means of the updateFontMetrics()
-     * function whenever the QPaintDevice that this ContentItem is painted
-     * on is different than lastPaintDevice(). This is done by ThemeDelegate
-     * and in fact you shouldn't care.
-     */
-    const QFontMetrics & fontMetrics() const
-      { return mFontMetrics; };
-
-    /**
-     * Returns the cached font metrics line spacing for this content item.
-     * The line spacing is used really often in ThemeDelegate so this
-     * inlineable getter will help the compiler in optimizing stuff.
-     */
-    int lineSpacing() const
-      { return mLineSpacing; };
-
-    /**
-     * Resets the cache of this content item.
-     * This is called by the Theme::Row resetCache() method.
-     */
-    void resetCache();
-
-    /**
      * Handles content item saving (used by Theme::Row::save())
      */
     void save( QDataStream &stream ) const;
@@ -502,7 +458,6 @@
   private:
     QList< ContentItem * > mLeftItems;   ///< The list of left aligned items
     QList< ContentItem * > mRightItems;  ///< The list of right aligned items
-    QSize mSizeHint;                     ///< The size hint for this row: the height is the sufficient minimum, the width is a guess, invalid size when not computed
 
   public:
     /**
@@ -569,19 +524,6 @@
       { mRightItems.removeAll( item ); };
 
     /**
-     * Returns the cached size hint for this row. The returned size is invalid
-     * if no cached size hint has been set yet.
-     */
-    QSize sizeHint() const
-      { return mSizeHint; };
-
-    /**
-     * Sets the cached size hint for this row.
-     */
-    void setSizeHint( const QSize &s )
-      { mSizeHint = s; };
-
-    /**
      * Returns true if this row contains text items.
      * This is useful if you want to know if the column should just get
      * its minimum allowable space or it should get more.
@@ -589,11 +531,6 @@
     bool containsTextItems() const;
 
     /**
-     * Called from the Column's resetCache() method. You shouldn't need to care.
-     */
-    void resetCache();
-
-    /**
      * Handles row saving (used by Theme::Column::save())
      */
     void save( QDataStream &stream ) const;
@@ -712,9 +649,7 @@
     SortOrder::MessageSorting mMessageSorting;        ///< The message sort order we switch to when clicking on this column
     QList< Row * > mGroupHeaderRows;                  ///< The list of rows we display in this column for a GroupHeaderItem
     QList< Row * > mMessageRows;                      ///< The list of rows we display in this column for a MessageItem
-    // cache
-    QSize mGroupHeaderSizeHint;                       ///< The cached size hint for group header rows: invalid if not computed yet
-    QSize mMessageSizeHint;                           ///< The cached size hint for message rows: invalid if not computed yet
+
     SharedRuntimeData * mSharedRuntimeData;           ///< A pointer to the shared runtime data: shared between all instances of a theme with the same id
   public:
     /**
@@ -872,38 +807,6 @@
     bool containsTextItems() const;
 
     /**
-     * This is called by the Theme when it's resetCache() method is called.
-     * You shouldn't need to care about this.
-     */
-    void resetCache();
-
-    /**
-     * Returns the cached size hint for group header rows in this column
-     * or an invalid QSize if the cached size hint hasn't been set yet.
-     */
-    QSize groupHeaderSizeHint() const
-      { return mGroupHeaderSizeHint; };
-
-    /**
-     * Sets the cached size hint for group header rows in this column.
-     */
-    void setGroupHeaderSizeHint( const QSize &sh )
-      { mGroupHeaderSizeHint = sh; };
-
-    /**
-     * Returns the cached size hint for message rows in this column
-     * or an invalid QSize if the cached size hint hasn't been set yet.
-     */
-    QSize messageSizeHint() const
-      { return mMessageSizeHint; };
-
-    /**
-     * Sets the cached size hint for message rows in this column.
-     */
-    void setMessageSizeHint( const QSize &sh )
-      { mMessageSizeHint = sh; };
-
-    /**
      * Handles column saving (used by Theme::save())
      */
     void save( QDataStream &stream ) const;
@@ -1113,14 +1016,6 @@
    */
   static QList< QPair< QString, int > > enumerateViewHeaderPolicyOptions();
 
-  /**
-   * Resets the cache for this theme. This is called by the ThemeDelegate
-   * when the theme is applied and must be called before any changes to this
-   * theme are going to be painted (that is, apply a chunk of changes, call
-   * resetCache() then repaint.
-   */
-  void resetCache();
-
 protected:
   /**
    * Pure virtual reimplemented from OptionSet.
Index: kmail/messagelistview/core/messageitem.h
===================================================================
--- kmail/messagelistview/core/messageitem.h	(revision 1011070)
+++ kmail/messagelistview/core/messageitem.h	(revision 1011071)
@@ -101,6 +101,8 @@
   SignatureState mSignatureState;
   QList< Tag * > * mTagList;        ///< Usually 0....
   QColor mTextColor;                ///< If invalid, use default text color
+  QColor mBackgroundColor;          ///< If invalid, use default background color
+  QFont  mFont;
   unsigned long mUniqueId;          ///< The unique id of this message (serial number of KMMsgBase at the moment of writing)
   
   bool mAboutToBeRemoved;           ///< Set to true when this item is going to be deleted and shouldn't be selectable
@@ -130,9 +132,21 @@
   const QColor & textColor() const
     { return mTextColor; };
 
+  const QColor & backgroundColor() const
+    { return mBackgroundColor; };
+
+  const QFont &font() const
+    { return mFont; }
+
   void setTextColor( const QColor &clr )
     { mTextColor = clr; };
 
+  void setBackgroundColor( const QColor &clr )
+    { mBackgroundColor = clr; };
+
+  void setFont( const QFont &f )
+    { mFont = f; }
+
   SignatureState signatureState() const
     { return mSignatureState; };
 
Index: kmail/messagelistview/core/themeeditor.cpp
===================================================================
--- kmail/messagelistview/core/themeeditor.cpp	(revision 1011070)
+++ kmail/messagelistview/core/themeeditor.cpp	(revision 1011071)
@@ -189,8 +189,8 @@
   drag->exec( Qt::CopyAction, Qt::CopyAction );
 }
 
-ThemePreviewDelegate::ThemePreviewDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice )
-  : ThemeDelegate( parent, paintDevice )
+ThemePreviewDelegate::ThemePreviewDelegate( QAbstractItemView * parent )
+  : ThemeDelegate( parent )
 {
   mRowMapper = new ModelInvariantRowMapper();
 
@@ -263,7 +263,7 @@
   mSelectedThemeColumn = 0;
   mFirstShow = true;
 
-  mDelegate = new ThemePreviewDelegate( this, viewport() );
+  mDelegate = new ThemePreviewDelegate( this );
   setItemDelegate( mDelegate );
   setRootIsDecorated( false );
   viewport()->setAcceptDrops( true );
Index: kmail/messagelistview/core/delegate.cpp
===================================================================
--- kmail/messagelistview/core/delegate.cpp	(revision 1011070)
+++ kmail/messagelistview/core/delegate.cpp	(revision 1011071)
@@ -34,7 +34,7 @@
 {
 
 Delegate::Delegate( View *pParent )
-  : ThemeDelegate( pParent, pParent->viewport() )
+  : ThemeDelegate( pParent )
 {
 }
 
Index: kmail/messagelistview/core/themedelegate.h
===================================================================
--- kmail/messagelistview/core/themedelegate.h	(revision 1011070)
+++ kmail/messagelistview/core/themedelegate.h	(revision 1011071)
@@ -29,7 +29,6 @@
 #include "messagelistview/core/item.h"
 
 class QAbstractItemView;
-class QPaintDevice;
 
 namespace KMail
 {
@@ -49,13 +48,12 @@
 class ThemeDelegate : public QStyledItemDelegate
 {
 public:
-  ThemeDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice );
+  ThemeDelegate( QAbstractItemView * parent );
   ~ThemeDelegate();
 
 private:
   const Theme * mTheme; ///< Shallow pointer to the current theme
   QAbstractItemView * mItemView;
-  QPaintDevice * mPaintDevice;
 
   QColor mGroupHeaderBackgroundColor; // cache
 
@@ -71,6 +69,7 @@
   bool mHitContentItemRight;
   const Theme::ContentItem * mHitContentItem;
   QRect mHitContentItemRect;
+
 public:
   const Theme * theme() const
     { return mTheme; };
@@ -80,7 +79,7 @@
    * Returns a heuristic sizeHint() for the specified item type and column.
    * The hint is based on the contents of the theme (and not of any message or group header).
    */
-  QSize sizeHintForItemTypeAndColumn( Item::Type type, int column ) const;
+  QSize sizeHintForItemTypeAndColumn( Item::Type type, int column, const Item *item = 0) const;
 
   /**
    * Performs a hit test on the specified viewport point.
@@ -195,6 +194,9 @@
   QRect hitContentItemRect() const
     { return mHitContentItemRect; };
 
+  /// return the font to paint given item with, checking global kmail settings and theme settings
+  static QFont itemFont( const Theme::ContentItem *ci, const Item *item );
+
 protected:
   /**
    * Returns the Item for the specified model index. Pure virtual: must be reimplemented
Index: kmail/messagelistview/core/theme.cpp
===================================================================
--- kmail/messagelistview/core/theme.cpp	(revision 1011070)
+++ kmail/messagelistview/core/theme.cpp	(revision 1011071)
@@ -62,7 +62,7 @@
 
 
 Theme::ContentItem::ContentItem( Type type )
-  : mType( type ), mFlags( 0 ), mLastPaintDevice( 0 ), mFontMetrics( QFont() )
+  : mType( type ), mFlags( 0 )
 {
 }
 
@@ -70,10 +70,7 @@
   : mType( src.mType ),
     mFlags( src.mFlags ),
     mFont( src.mFont ),
-    mCustomColor( src.mCustomColor ),
-    mLastPaintDevice( src.mLastPaintDevice ),
-    mFontMetrics( src.mFontMetrics ),
-    mLineSpacing( src.mLineSpacing )
+    mCustomColor( src.mCustomColor )
 {
 }
 
@@ -164,27 +161,11 @@
   return ( static_cast< int >( type ) & ApplicableToGroupHeaderItems );
 }
 
-
-void Theme::ContentItem::updateFontMetrics( QPaintDevice * device )
-{
-  if ( !( mFlags & UseCustomFont ) )
-    mFont = KGlobalSettings::generalFont();
-  mLastPaintDevice = device;
-  mFontMetrics = QFontMetrics( mFont, device );
-  mLineSpacing = mFontMetrics.lineSpacing();
-}
-
 void Theme::ContentItem::setFont( const QFont &font )
 {
   mFont = font;
-  mLastPaintDevice = 0; // will force regeneration of font metrics
 }
 
-void Theme::ContentItem::resetCache()
-{
-  mLastPaintDevice = 0; // will force regeneration of font metrics
-}
-
 void Theme::ContentItem::save( QDataStream &stream ) const
 {
   stream << (int)mType;
@@ -296,15 +277,6 @@
   mRightItems.insert( idx, item );
 }
 
-void Theme::Row::resetCache()
-{
-  mSizeHint = QSize();
-  for ( QList< ContentItem * >::ConstIterator it = mLeftItems.constBegin(); it != mLeftItems.constEnd() ; ++it )
-    ( *it )->resetCache();
-  for ( QList< ContentItem * >::ConstIterator it = mRightItems.constBegin(); it != mRightItems.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::Row::containsTextItems() const
 {
   for ( QList< ContentItem * >::ConstIterator it = mLeftItems.constBegin(); it != mLeftItems.constEnd() ; ++it )
@@ -508,17 +480,6 @@
   mGroupHeaderRows.insert( idx, row );
 }
 
-void Theme::Column::resetCache()
-{
-  mGroupHeaderSizeHint = QSize();
-  mMessageSizeHint = QSize();
-
-  for ( QList< Row * >::ConstIterator it = mMessageRows.constBegin(); it != mMessageRows.constEnd() ; ++it )
-    ( *it )->resetCache();
-  for ( QList< Row * >::ConstIterator it = mGroupHeaderRows.constBegin(); it != mGroupHeaderRows.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::Column::containsTextItems() const
 {
   for ( QList< Row * >::ConstIterator it = mMessageRows.constBegin(); it != mMessageRows.constEnd() ; ++it )
@@ -769,12 +730,6 @@
     mIconSize = gThemeDefaultIconSize;
 }
 
-void Theme::resetCache()
-{
-  for ( QList< Column * >::ConstIterator it = mColumns.constBegin(); it != mColumns.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::load( QDataStream &stream )
 {
   removeAllColumns();
Index: kmail/messagelistview/core/themeeditor.h
===================================================================
--- kmail/messagelistview/core/themeeditor.h	(revision 1011070)
+++ kmail/messagelistview/core/themeeditor.h	(revision 1011071)
@@ -73,7 +73,7 @@
 {
   Q_OBJECT
 public:
-  ThemePreviewDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice );
+  ThemePreviewDelegate( QAbstractItemView * parent );
   ~ThemePreviewDelegate();
 
 private:
Index: kmail/messagelistview/core/themedelegate.cpp
===================================================================
--- kmail/messagelistview/core/themedelegate.cpp	(revision 1011070)
+++ kmail/messagelistview/core/themedelegate.cpp	(revision 1011071)
@@ -31,6 +31,7 @@
 #include <QPixmap>
 #include <QLinearGradient>
 #include <KColorScheme>
+#include <KGlobalSettings>
 
 namespace KMail
 {
@@ -50,11 +51,10 @@
 static const int gHorizontalItemSpacing = 2;
 
 
-ThemeDelegate::ThemeDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice )
+ThemeDelegate::ThemeDelegate( QAbstractItemView * parent )
   : QStyledItemDelegate( parent )
 {
   mItemView = parent;
-  mPaintDevice = paintDevice;
   mTheme = 0;
 }
 
@@ -69,12 +69,6 @@
   if ( !mTheme )
     return; // hum
 
-  // yep..we're violating const here
-  // But most of the QStyledItemDelegate virtual methods are const and expect
-  // const behaviour. So we need the const pointer to avoid compiler complains
-  // but on the other side we're NOT really const... well...
-  const_cast< Theme * >( mTheme )->resetCache();
-
   // Rebuild the group header background color cache
   switch( mTheme->groupHeaderBackgroundMode() )
   {
@@ -104,14 +98,13 @@
 //        about function growth limit reached. Consider using macros
 //        or just convert to member functions.
 
-static inline void paint_right_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir )
+static inline void paint_right_aligned_elided_text( const QString &text, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
-  painter->setFont( ci->font() );
+  painter->setFont( font );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   QRect outRct;
 
   if ( ci->softenByBlending() )
@@ -129,15 +122,14 @@
     left += outRct.width() + gHorizontalItemSpacing;
 }
 
-static inline void compute_bounding_rect_for_right_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir )
+static inline void compute_bounding_rect_for_right_aligned_elided_text( const QString &text, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   Qt::AlignmentFlag af = layoutDir == Qt::LeftToRight ? Qt::AlignRight : Qt::AlignLeft;
-  outRect = ci->fontMetrics().boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
+  outRect = fontMetrics.boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
   if ( layoutDir == Qt::LeftToRight )
     right -= outRect.width() + gHorizontalItemSpacing;
   else
@@ -145,14 +137,13 @@
 }
 
 
-static inline void paint_left_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir )
+static inline void paint_left_aligned_elided_text( const QString &text, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
-  painter->setFont( ci->font() );
+  painter->setFont( font );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   QRect outRct;
   if ( ci->softenByBlending() )
   {
@@ -169,15 +160,14 @@
     right -= outRct.width() + gHorizontalItemSpacing;
 }
 
-static inline void compute_bounding_rect_for_left_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir )
+static inline void compute_bounding_rect_for_left_aligned_elided_text( const QString &text, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   Qt::AlignmentFlag af = layoutDir == Qt::LeftToRight ? Qt::AlignLeft : Qt::AlignRight;
-  outRect = ci->fontMetrics().boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
+  outRect = fontMetrics.boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
   if ( layoutDir == Qt::LeftToRight )
     left += outRect.width() + gHorizontalItemSpacing;
   else
@@ -485,15 +475,15 @@
   }
 }
 
-static inline void compute_size_hint_for_item( Theme::ContentItem * ci, QPaintDevice * pd,
-                                               int &maxh, int &totalw, int iconSize )
+static inline void compute_size_hint_for_item( Theme::ContentItem * ci,
+                                               int &maxh, int &totalw, int iconSize, const Item *item )
 {
   if ( ci->displaysText() )
   {
-    if ( ci->lastPaintDevice() != pd )
-      ci->updateFontMetrics( pd );
-    if ( ci->lineSpacing() > maxh )
-      maxh = ci->lineSpacing();
+    QFont font = ThemeDelegate::itemFont( ci, item );
+    QFontMetrics fontMetrics( font );
+    if ( fontMetrics.height() > maxh )
+      maxh = fontMetrics.height();
     totalw += ci->displaysLongText() ? 128 : 64;
     return;
   }
@@ -520,7 +510,7 @@
   totalw += gHorizontalItemSpacing;
 }
 
-static inline void compute_size_hint_for_row( const Theme::Row * r, QPaintDevice * pd, int iconSize )
+static inline QSize compute_size_hint_for_row( const Theme::Row * r, int iconSize, const Item *item )
 {
   int maxh = 8; // at least 8 pixels for a pixmap
   int totalw = 0;
@@ -530,15 +520,15 @@
   QList< Theme::ContentItem * >::ConstIterator itemit;
 
   for ( itemit = items->begin(); itemit != items->end() ; ++itemit )
-    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), pd, maxh, totalw, iconSize );
+    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), maxh, totalw, iconSize, item );
 
   // then left aligned stuff
   items = &( r->leftItems() );
 
   for ( itemit = items->begin(); itemit != items->end() ; ++itemit )
-    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), pd, maxh, totalw, iconSize );
+    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), maxh, totalw, iconSize, item );
 
-  const_cast< Theme::Row * >( r )->setSizeHint( QSize( totalw, maxh ) );
+  return QSize( totalw, maxh );
 }
 
 void ThemeDelegate::paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const
@@ -555,6 +545,13 @@
 
   opt.text.clear(); // draw no text for me, please.. I'll do it in a while
 
+  // Set background color of control if necessary
+  if ( item->type() == Item::Message ) {
+    MessageItem * msgItem = static_cast< MessageItem * >( item );
+    if ( msgItem->backgroundColor().isValid() )
+      opt.backgroundBrush = QBrush( msgItem->backgroundColor() );
+  }
+
   QStyle * style = mItemView->style();
   style->drawControl( QStyle::CE_ItemViewItem, &opt, painter, mItemView );
 
@@ -806,12 +803,7 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    QSize rowSizeHint = ( *rowit )->sizeHint();
-    if ( !rowSizeHint.isValid() )
-    {
-      compute_size_hint_for_row( ( *rowit ), mPaintDevice, mTheme->iconSize() );
-      rowSizeHint = ( *rowit )->sizeHint();
-    }
+    QSize rowSizeHint = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), item );
 
     int bottom = top + rowSizeHint.height();
 
@@ -848,32 +840,34 @@
           painter->setPen( defaultPen );
       } // otherwise setting a pen is useless at this time
 
+      QFont font = itemFont( ci, item );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          paint_right_aligned_elided_text( item->subject(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->subject(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          paint_right_aligned_elided_text( item->senderOrReceiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->senderOrReceiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          paint_right_aligned_elided_text( item->receiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->receiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          paint_right_aligned_elided_text( item->sender(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->sender(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          paint_right_aligned_elided_text( item->formattedDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          paint_right_aligned_elided_text( item->formattedMaxDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedMaxDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          paint_right_aligned_elided_text( item->formattedSize(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedSize(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            paint_right_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+            paint_right_aligned_elided_text( groupHeaderItem->label(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
             paint_permanent_icon( get_read_state_icon( item ), ci, painter, l, top, r,
@@ -1001,32 +995,34 @@
         }
       } // otherwise setting a pen is useless at this time
 
+      QFont font = itemFont( ci, item );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          paint_left_aligned_elided_text( item->subject(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->subject(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          paint_left_aligned_elided_text( item->senderOrReceiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->senderOrReceiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          paint_left_aligned_elided_text( item->receiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->receiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          paint_left_aligned_elided_text( item->sender(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->sender(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          paint_left_aligned_elided_text( item->formattedDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          paint_left_aligned_elided_text( item->formattedMaxDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedMaxDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          paint_left_aligned_elided_text( item->formattedSize(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedSize(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            paint_left_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+            paint_left_aligned_elided_text( groupHeaderItem->label(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
             paint_permanent_icon( get_read_state_icon( item ), ci, painter, l, top, r,
@@ -1203,12 +1199,7 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    QSize rowSizeHint = ( *rowit )->sizeHint();
-    if ( !rowSizeHint.isValid() )
-    {
-      compute_size_hint_for_row( ( *rowit ), mPaintDevice, mTheme->iconSize() );
-      rowSizeHint = ( *rowit )->sizeHint();
-    }
+    QSize rowSizeHint = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), mHitItem );
 
     if ( ( viewportPoint.y() < top ) && ( rowIdx > 0 ) )
       break; // not this row (tough we should have already found it... probably clicked upper margin)
@@ -1246,32 +1237,34 @@
 
       mHitContentItemRect = QRect();
 
+      QFont font = itemFont( ci, mHitItem );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->subject(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->subject(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->senderOrReceiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->senderOrReceiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->receiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->receiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->sender(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->sender(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedMaxDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedMaxDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedSize(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedSize(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            compute_bounding_rect_for_right_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+            compute_bounding_rect_for_right_aligned_elided_text( groupHeaderItem->label(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
           compute_bounding_rect_for_permanent_icon( ci, l, top, r, mHitContentItemRect, layoutDir == Qt::LeftToRight, mTheme->iconSize() );
@@ -1387,32 +1380,34 @@
 
       mHitContentItemRect = QRect();
 
+      QFont font = itemFont( ci, mHitItem );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->subject(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->subject(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->senderOrReceiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->senderOrReceiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->receiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->receiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->sender(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->sender(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedMaxDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedMaxDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedSize(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedSize(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            compute_bounding_rect_for_left_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+            compute_bounding_rect_for_left_aligned_elided_text( groupHeaderItem->label(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
           compute_bounding_rect_for_permanent_icon( ci, l, top, r, mHitContentItemRect, layoutDir != Qt::LeftToRight, mTheme->iconSize() );
@@ -1527,7 +1522,7 @@
   return true;
 }
 
-QSize ThemeDelegate::sizeHintForItemTypeAndColumn( Item::Type type, int column ) const
+QSize ThemeDelegate::sizeHintForItemTypeAndColumn( Item::Type type, int column, const Item *item ) const
 {
   if ( !mTheme )
     return QSize( 16, 16 ); // bleah
@@ -1547,9 +1542,6 @@
   {
     case Item::Message:
     {
-      QSize cached = skcolumn->messageSizeHint();
-      if ( cached.isValid() )
-        return cached;
       rows = &( skcolumn->messageRows() );
 
       marginh = gMessageVerticalMargin << 1;
@@ -1558,9 +1550,6 @@
     break;
     case Item::GroupHeader:
     {
-      QSize cached = skcolumn->groupHeaderSizeHint();
-      if ( cached.isValid() )
-        return cached;
       rows = &( skcolumn->groupHeaderRows() );
 
       marginh = ( gGroupHeaderOuterVerticalMargin + gGroupHeaderInnerVerticalMargin ) << 1;
@@ -1577,34 +1566,15 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    compute_size_hint_for_row( *rowit, mPaintDevice, mTheme->iconSize() );
-
-    QSize sh = ( *rowit )->sizeHint();
+    QSize sh = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), item );
     totalh += sh.height();
     if ( sh.width() > maxw )
       maxw = sh.width();
   }
 
-  QSize ret( maxw + marginw , totalh + marginh );
-
-  // cache it
-  switch ( type )
-  {
-    case Item::Message:
-      const_cast< Theme::Column * >( skcolumn )->setMessageSizeHint( ret );
-    break;
-    case Item::GroupHeader:
-      const_cast< Theme::Column * >( skcolumn )->setGroupHeaderSizeHint( ret );
-    break;
-    default:
-      // make gcc happy
-    break;
-  }
-
-  return ret;
+  return QSize( maxw + marginw , totalh + marginh );
 }
 
-
 QSize ThemeDelegate::sizeHint( const QStyleOptionViewItem &, const QModelIndex & index ) const
 {
   if ( !mTheme )
@@ -1619,9 +1589,20 @@
 
   //Item::Type type = item->type();
 
-  return sizeHintForItemTypeAndColumn( item->type(), index.column() );
+  return sizeHintForItemTypeAndColumn( item->type(), index.column(), item );
 }
 
+QFont ThemeDelegate::itemFont( const Theme::ContentItem *ci, const Item *item )
+{
+  if ( ci && ci->useCustomFont() )
+    return ci->font();
+
+  if ( item && ( item->type() == Item::Message ) )
+    return static_cast< const MessageItem * >( item )->font();
+
+  return KGlobalSettings::generalFont();
+}
+
 } // namespace Core
 
 } // namespace MessageListView
Index: kmail/messagelistview/storagemodel.h
===================================================================
--- kmail/messagelistview/storagemodel.h	(revision 1011070)
+++ kmail/messagelistview/storagemodel.h	(revision 1011071)
@@ -28,10 +28,11 @@
 class KMMsgBase;
 
 #include <QColor>
+#include <QFont>
 
 namespace KPIM
 {
-	class MessageStatus;
+  class MessageStatus;
 }
 
 namespace KMail
@@ -65,6 +66,13 @@
   QColor mColorUnreadMessage;
   QColor mColorImportantMessage;
   QColor mColorToDoMessage;
+
+  QFont mFont;
+  QFont mFontNewMessage;
+  QFont mFontUnreadMessage;
+  QFont mFontImportantMessage;
+  QFont mFontToDoMessage;
+
 public:
 
   // When porting to Akonadi the stuff below will be simply killed as it serves
@@ -239,6 +247,11 @@
    */
   void slotMessageHeaderChanged( KMFolder *folder, int idx );
 
+private:
+  /**
+    *  set MessageItem's color and font, etc. to reflect given mail message's state
+    */
+  void setMessageItemData( Core::MessageItem * mi, KMMsgBase * msg ) const;
 };
 
 } // namespace MessageListView


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- kdepim.spec	11 Aug 2009 14:30:58 -0000	1.231
+++ kdepim.spec	19 Aug 2009 02:26:55 -0000	1.232
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,12 +15,15 @@ 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
+## upstream 
+# https://bugs.kde.org/show_bug.cgi?id=178402
+Patch100: kmail-fonts-4.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Upgrade path
 %if 0%{?fedora} < 12
@@ -85,7 +88,6 @@ Install %{name}-devel if you want to wri
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
@@ -95,10 +97,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-
-# omit conflict with oxygen-icons, working on a better long-term fix with
-# oxygen folk to get all the icons/temporary stuff out of kdepim
-rm -fv icons/temporary/ox16-status-meeting-organizer.png
+%patch100 -p0 -b .kmail-fonts
 
 
 %build
@@ -217,6 +216,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- kmail: upstream fix for custom font settings (#kdebug#178402)
+
 * Tue Aug 11 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix kmail default save dir regression (#496988)
 



From cweyl at fedoraproject.org  Wed Aug 19 02:29:10 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 02:29:10 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/devel perl-Text-SimpleTable.spec, 1.9,
	1.10 simpletable.patch, 1.1, NONE
Message-ID: <20090819022910.CE3D911C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Text-SimpleTable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24786

Modified Files:
	perl-Text-SimpleTable.spec 
Removed Files:
	simpletable.patch 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-2
- drop old patch



Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Text-SimpleTable.spec	11 Aug 2009 08:11:26 -0000	1.9
+++ perl-Text-SimpleTable.spec	19 Aug 2009 02:29:10 -0000	1.10
@@ -1,8 +1,6 @@
-%define _default_patch_fuzz 2
-
 Name:           perl-Text-SimpleTable
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,15 +10,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# see http://rt.cpan.org/Public/Bug/Display.html?id=22371
-Patch0:         simpletable.patch
-
-# Note pod coverage tests fail at the moment, so we disable them for now.
 
 # core
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # testing
 BuildRequires:  perl(Test::More)
+# Note pod coverage tests fail at the moment, so we disable them for now.
 #BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 %description
@@ -28,7 +23,6 @@ Simple eyecandy ASCII tables, as seen in
 
 %prep
 %setup -q -n Text-SimpleTable-%{version}
-%patch0
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-2
+- drop old patch
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
 - auto-update to 2.0 (by cpan-spec-update 0.01)
 


--- simpletable.patch DELETED ---



From kyle at fedoraproject.org  Wed Aug 19 02:33:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 02:33:24 +0000 (UTC)
Subject: rpms/kernel/F-11 make-mmap_min_addr-suck-less.patch, NONE,
	1.1 kernel.spec, 1.1711, 1.1712
Message-ID: <20090819023324.F241311C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25753

Modified Files:
	kernel.spec 
Added Files:
	make-mmap_min_addr-suck-less.patch 
Log Message:
* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
- Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
  to improve mmap_min_addr.


make-mmap_min_addr-suck-less.patch:
 include/linux/mm.h       |   15 --------------
 include/linux/security.h |   24 ++++++++++++++++++++---
 kernel/sysctl.c          |    7 +++---
 mm/Kconfig               |    6 ++---
 mm/mmap.c                |    3 --
 mm/nommu.c               |    3 --
 security/Kconfig         |   16 +++++++++++++++
 security/Makefile        |    2 -
 security/capability.c    |    9 --------
 security/commoncap.c     |   30 ++++++++++++++++++++++++++++
 security/min_addr.c      |   49 +++++++++++++++++++++++++++++++++++++++++++++++
 security/selinux/hooks.c |   14 ++++++++++++-
 12 files changed, 137 insertions(+), 41 deletions(-)

--- NEW FILE make-mmap_min_addr-suck-less.patch ---
commit 24e10f79d1a597eb2fc6979c09f247ed1549527d
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Aug 7 14:53:57 2009 -0400

    security: define round_hint_to_min in !CONFIG_SECURITY
    
    Fix the header files to define round_hint_to_min() and to define
    mmap_min_addr_handler() in the !CONFIG_SECURITY case.
    
    Built and tested with !CONFIG_SECURITY
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 1d9959734a1949ea4f2427bd2d8b21ede6b2441c)

commit 29a61b816c37acb091956a4790d0f7eb27c48145
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:11 2009 -0400

    Security/SELinux: seperate lsm specific mmap_min_addr
    
    Currently SELinux enforcement of controls on the ability to map low memory
    is determined by the mmap_min_addr tunable.  This patch causes SELinux to
    ignore the tunable and instead use a seperate Kconfig option specific to how
    much space the LSM should protect.
    
    The tunable will now only control the need for CAP_SYS_RAWIO and SELinux
    permissions will always protect the amount of low memory designated by
    CONFIG_LSM_MMAP_MIN_ADDR.
    
    This allows users who need to disable the mmap_min_addr controls (usual reason
    being they run WINE as a non-root user) to do so and still have SELinux
    controls preventing confined domains (like a web server) from being able to
    map some area of low memory.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 788084aba2ab7348257597496befcbccabdc98a3)

commit 6fe371722a805b1352a8b8be4fe1ed04427fb4b1
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:05 2009 -0400

    SELinux: call cap_file_mmap in selinux_file_mmap
    
    Currently SELinux does not check CAP_SYS_RAWIO in the file_mmap hook.  This
    means there is no DAC check on the ability to mmap low addresses in the
    memory space.  This function adds the DAC check for CAP_SYS_RAWIO while
    maintaining the selinux check on mmap_zero.  This means that processes
    which need to mmap low memory will need CAP_SYS_RAWIO and mmap_zero but will
    NOT need the SELinux sys_rawio capability.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 8cf948e744e0218af604c32edecde10006dc8e9e)

commit cd821c1226aea84379fddf835ba8b9ca7e34745f
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:53:58 2009 -0400

    Capabilities: move cap_file_mmap to commoncap.c
    
    Currently we duplicate the mmap_min_addr test in cap_file_mmap and in
    security_file_mmap if !CONFIG_SECURITY.  This patch moves cap_file_mmap
    into commoncap.c and then calls that function directly from
    security_file_mmap ifndef CONFIG_SECURITY like all of the other capability
    checks are done.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Acked-by: Serge Hallyn <serue at us.ibm.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 9c0d90103c7e0eb6e638e5b649e9f6d8d9c1b4b3)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0c21af6..334bd8a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -34,8 +34,6 @@ extern int sysctl_legacy_va_layout;
 #define sysctl_legacy_va_layout 0
 #endif
 
-extern unsigned long mmap_min_addr;
-
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -575,19 +573,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
 }
 
 /*
- * If a hint addr is less than mmap_min_addr change hint to be as
- * low as possible but still greater than mmap_min_addr
- */
-static inline unsigned long round_hint_to_min(unsigned long hint)
-{
-	hint &= PAGE_MASK;
-	if (((void *)hint != NULL) &&
-	    (hint < mmap_min_addr))
-		return PAGE_ALIGN(mmap_min_addr);
-	return hint;
-}
-
-/*
  * Some inline functions in vmstat.h depend on page_zone()
  */
 #include <linux/vmstat.h>
diff --git a/include/linux/security.h b/include/linux/security.h
index 5eff459..1f16eea 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -28,6 +28,7 @@
 #include <linux/resource.h>
 #include <linux/sem.h>
 #include <linux/shm.h>
+#include <linux/mm.h> /* PAGE_ALIGN */
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
@@ -66,6 +67,9 @@ extern int cap_inode_setxattr(struct dentry *dentry, const char *name,
 extern int cap_inode_removexattr(struct dentry *dentry, const char *name);
 extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
+extern int cap_file_mmap(struct file *file, unsigned long reqprot,
+			 unsigned long prot, unsigned long flags,
+			 unsigned long addr, unsigned long addr_only);
 extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5);
@@ -92,6 +96,7 @@ extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
 extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 
 extern unsigned long mmap_min_addr;
+extern unsigned long dac_mmap_min_addr;
 /*
  * Values used in the task_security_ops calls
  */
@@ -116,6 +121,21 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE	2
 #define LSM_UNSAFE_PTRACE_CAP	4
 
+/*
+ * If a hint addr is less than mmap_min_addr change hint to be as
+ * low as possible but still greater than mmap_min_addr
+ */
+static inline unsigned long round_hint_to_min(unsigned long hint)
+{
+	hint &= PAGE_MASK;
+	if (((void *)hint != NULL) &&
+	    (hint < mmap_min_addr))
+		return PAGE_ALIGN(mmap_min_addr);
+	return hint;
+}
+extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+				 void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #ifdef CONFIG_SECURITY
 
 struct security_mnt_opts {
@@ -2197,9 +2217,7 @@ static inline int security_file_mmap(struct file *file, unsigned long reqprot,
 				     unsigned long addr,
 				     unsigned long addr_only)
 {
-	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
-		return -EACCES;
-	return 0;
+	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 }
 
 static inline int security_file_mprotect(struct vm_area_struct *vma,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e5bfcc7..6e776bd 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -48,6 +48,7 @@
 #include <linux/acpi.h>
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
+#include <linux/security.h>
 #include <linux/slow-work.h>
 
 #include <asm/uaccess.h>
@@ -1228,10 +1229,10 @@ static struct ctl_table vm_table[] = {
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "mmap_min_addr",
-		.data		= &mmap_min_addr,
-		.maxlen         = sizeof(unsigned long),
+		.data		= &dac_mmap_min_addr,
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0644,
-		.proc_handler	= &proc_doulongvec_minmax,
+		.proc_handler	= &mmap_min_addr_handler,
 	},
 #ifdef CONFIG_NUMA
 	{
diff --git a/mm/Kconfig b/mm/Kconfig
index 71830ba..b959dae 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -237,9 +237,9 @@ config DEFAULT_MMAP_MIN_ADDR
 	  For most ia64, ppc64 and x86 users with lots of address space
 	  a value of 65536 is reasonable and should cause no problems.
 	  On arm and other archs it should not be higher than 32768.
-	  Programs which use vm86 functionality would either need additional
-	  permissions from either the LSM or the capabilities module or have
-	  this protection disabled.
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need CAP_SYS_RAWIO or disable this
+	  protection by setting the value to 0.
 
 	  This value can be changed after boot using the
 	  /proc/sys/vm/mmap_min_addr tunable.
diff --git a/mm/mmap.c b/mm/mmap.c
index 2b43fa1..6b7b1a9 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -87,9 +87,6 @@ int sysctl_overcommit_ratio = 50;	/* default is 50% */
 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
 struct percpu_counter vm_committed_as;
 
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
-
 /*
  * Check that a process has enough memory to allocate a new virtual
  * mapping. 0 means there is enough memory for the allocation to
diff --git a/mm/nommu.c b/mm/nommu.c
index 2fd2ad5..b571ef7 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -69,9 +69,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
 int heap_stack_gap = 0;
 
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
-
 atomic_long_t mmap_pages_allocated;
 
 EXPORT_SYMBOL(mem_map);
diff --git a/security/Kconfig b/security/Kconfig
index d23c839..9c60c34 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -113,6 +113,22 @@ config SECURITY_ROOTPLUG
 
 	  If you are unsure how to answer this question, answer N.
 
+config LSM_MMAP_MIN_ADDR
+	int "Low address space for LSM to from user allocation"
+	depends on SECURITY && SECURITY_SELINUX
+	default 65535
+	help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+	  can help reduce the impact of kernel NULL pointer bugs.
+
+	  For most ia64, ppc64 and x86 users with lots of address space
+	  a value of 65536 is reasonable and should cause no problems.
+	  On arm and other archs it should not be higher than 32768.
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need the permission specific to the
+	  systems running LSM.
+
 source security/selinux/Kconfig
 source security/smack/Kconfig
 source security/tomoyo/Kconfig
diff --git a/security/Makefile b/security/Makefile
index fa77021..12ab811 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -8,7 +8,7 @@ subdir-$(CONFIG_SECURITY_SMACK)		+= smack
 subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
 
 # always enable default capabilities
-obj-y		+= commoncap.o
+obj-y		+= commoncap.o min_addr.o
 
 # Object file lists
 obj-$(CONFIG_SECURITY)			+= security.o capability.o
diff --git a/security/capability.c b/security/capability.c
index 21b6cea..88f752e 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -330,15 +330,6 @@ static int cap_file_ioctl(struct file *file, unsigned int command,
 	return 0;
 }
 
-static int cap_file_mmap(struct file *file, unsigned long reqprot,
-			 unsigned long prot, unsigned long flags,
-			 unsigned long addr, unsigned long addr_only)
-{
-	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
-		return -EACCES;
-	return 0;
-}
-
 static int cap_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
 			     unsigned long prot)
 {
diff --git a/security/commoncap.c b/security/commoncap.c
index beac025..42bb7c0 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -952,3 +952,33 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
 		cap_sys_admin = 1;
 	return __vm_enough_memory(mm, pages, cap_sys_admin);
 }
+
+/*
+ * cap_file_mmap - check if able to map given addr
+ * @file: unused
+ * @reqprot: unused
+ * @prot: unused
+ * @flags: unused
+ * @addr: address attempting to be mapped
+ * @addr_only: unused
+ *
+ * If the process is attempting to map memory below mmap_min_addr they need
+ * CAP_SYS_RAWIO.  The other parameters to this function are unused by the
+ * capability security module.  Returns 0 if this mapping should be allowed
+ * -EPERM if not.
+ */
+int cap_file_mmap(struct file *file, unsigned long reqprot,
+		  unsigned long prot, unsigned long flags,
+		  unsigned long addr, unsigned long addr_only)
+{
+	int ret = 0;
+
+	if (addr < dac_mmap_min_addr) {
+		ret = cap_capable(current, current_cred(), CAP_SYS_RAWIO,
+				  SECURITY_CAP_AUDIT);
+		/* set PF_SUPERPRIV if it turns out we allow the low mmap */
+		if (ret == 0)
+			current->flags |= PF_SUPERPRIV;
+	}
+	return ret;
+}
diff --git a/security/min_addr.c b/security/min_addr.c
new file mode 100644
index 0000000..14cc7b3
--- /dev/null
+++ b/security/min_addr.c
@@ -0,0 +1,49 @@
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/security.h>
+#include <linux/sysctl.h>
+
+/* amount of vm to protect from userspace access by both DAC and the LSM*/
+unsigned long mmap_min_addr;
+/* amount of vm to protect from userspace using CAP_SYS_RAWIO (DAC) */
+unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+/* amount of vm to protect from userspace using the LSM = CONFIG_LSM_MMAP_MIN_ADDR */
+
+/*
+ * Update mmap_min_addr = max(dac_mmap_min_addr, CONFIG_LSM_MMAP_MIN_ADDR)
+ */
+static void update_mmap_min_addr(void)
+{
+#ifdef CONFIG_LSM_MMAP_MIN_ADDR
+	if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
+		mmap_min_addr = dac_mmap_min_addr;
+	else
+		mmap_min_addr = CONFIG_LSM_MMAP_MIN_ADDR;
+#else
+	mmap_min_addr = dac_mmap_min_addr;
+#endif
+}
+
+/*
+ * sysctl handler which just sets dac_mmap_min_addr = the new value and then
+ * calls update_mmap_min_addr() so non MAP_FIXED hints get rounded properly
+ */
+int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+			  void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	int ret;
+
+	ret = proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos);
+
+	update_mmap_min_addr();
+
+	return ret;
+}
+
+int __init init_mmap_min_addr(void)
+{
+	update_mmap_min_addr();
+
+	return 0;
+}
+pure_initcall(init_mmap_min_addr);
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 2fcad7c..4337ec7 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3037,9 +3037,21 @@ static int selinux_file_mmap(struct file *file, unsigned long reqprot,
 	int rc = 0;
 	u32 sid = current_sid();
 
-	if (addr < mmap_min_addr)
+	/*
+	 * notice that we are intentionally putting the SELinux check before
+	 * the secondary cap_file_mmap check.  This is such a likely attempt
+	 * at bad behaviour/exploit that we always want to get the AVC, even
+	 * if DAC would have also denied the operation.
+	 */
+	if (addr < CONFIG_LSM_MMAP_MIN_ADDR) {
 		rc = avc_has_perm(sid, sid, SECCLASS_MEMPROTECT,
 				  MEMPROTECT__MMAP_ZERO, NULL);
+		if (rc)
+			return rc;
+	}
+
+	/* do DAC check on address space usage */
+	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 	if (rc || addr_only)
 		return rc;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -p -r1.1711 -r1.1712
--- kernel.spec	17 Aug 2009 20:10:45 -0000	1.1711
+++ kernel.spec	19 Aug 2009 02:33:24 -0000	1.1712
@@ -712,6 +712,8 @@ Patch13000: linux-2.6-kvm-skip-pit-check
 Patch13001: linux-2.6.29-xen-disable-gbpages.patch
 Patch13002: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
+Patch14000: make-mmap_min_addr-suck-less.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1310,6 +1312,8 @@ ApplyPatch linux-2.6.29-xen-disable-gbpa
 # v12n
 ApplyPatch linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
+ApplyPatch make-mmap_min_addr-suck-less.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1895,6 +1899,10 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+- Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
+  to improve mmap_min_addr.
+
 * Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-32
 - Change config options:
   CONFIG_SCSI_DEBUG=m



From kyle at fedoraproject.org  Wed Aug 19 02:33:33 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 02:33:33 +0000 (UTC)
Subject: rpms/kernel/F-10 make-mmap_min_addr-suck-less.patch, NONE,
	1.1 kernel.spec, 1.1402, 1.1403
Message-ID: <20090819023333.7978F11C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25801

Modified Files:
	kernel.spec 
Added Files:
	make-mmap_min_addr-suck-less.patch 
Log Message:
* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-102
- CVE-2009-2848: execve: must clear current->clear_child_tid
- Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
  to improve mmap_min_addr.


make-mmap_min_addr-suck-less.patch:
 include/linux/mm.h       |   17 ----------------
 include/linux/security.h |   22 ++++++++++++++++++++-
 kernel/sysctl.c          |    9 +++-----
 mm/Kconfig               |   18 +++++++++++++++++
 security/Kconfig         |   22 ++++++++-------------
 security/Makefile        |    2 -
 security/capability.c    |    9 --------
 security/commoncap.c     |   30 ++++++++++++++++++++++++++++
 security/min_addr.c      |   49 +++++++++++++++++++++++++++++++++++++++++++++++
 security/security.c      |    3 --
 security/selinux/hooks.c |   14 ++++++++++++-
 11 files changed, 145 insertions(+), 50 deletions(-)

--- NEW FILE make-mmap_min_addr-suck-less.patch ---
commit 954cd03196be852d3a471daec79bf7cbdaf93d65
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Aug 7 14:53:57 2009 -0400

    security: define round_hint_to_min in !CONFIG_SECURITY
    
    Fix the header files to define round_hint_to_min() and to define
    mmap_min_addr_handler() in the !CONFIG_SECURITY case.
    
    Built and tested with !CONFIG_SECURITY
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 1d9959734a1949ea4f2427bd2d8b21ede6b2441c)

commit 020d8d2dc7b9fae32f9e259cc5227cad108bac17
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:11 2009 -0400

    Security/SELinux: seperate lsm specific mmap_min_addr
    
    Currently SELinux enforcement of controls on the ability to map low memory
    is determined by the mmap_min_addr tunable.  This patch causes SELinux to
    ignore the tunable and instead use a seperate Kconfig option specific to how
    much space the LSM should protect.
    
    The tunable will now only control the need for CAP_SYS_RAWIO and SELinux
    permissions will always protect the amount of low memory designated by
    CONFIG_LSM_MMAP_MIN_ADDR.
    
    This allows users who need to disable the mmap_min_addr controls (usual reason
    being they run WINE as a non-root user) to do so and still have SELinux
    controls preventing confined domains (like a web server) from being able to
    map some area of low memory.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 788084aba2ab7348257597496befcbccabdc98a3)

commit 141173509c591056154077288f3657b7750b4629
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:05 2009 -0400

    SELinux: call cap_file_mmap in selinux_file_mmap
    
    Currently SELinux does not check CAP_SYS_RAWIO in the file_mmap hook.  This
    means there is no DAC check on the ability to mmap low addresses in the
    memory space.  This function adds the DAC check for CAP_SYS_RAWIO while
    maintaining the selinux check on mmap_zero.  This means that processes
    which need to mmap low memory will need CAP_SYS_RAWIO and mmap_zero but will
    NOT need the SELinux sys_rawio capability.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 8cf948e744e0218af604c32edecde10006dc8e9e)

commit 5b6a9b164793aa837e8cf813cae0f1ec3c5e4c7d
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:53:58 2009 -0400

    Capabilities: move cap_file_mmap to commoncap.c
    
    Currently we duplicate the mmap_min_addr test in cap_file_mmap and in
    security_file_mmap if !CONFIG_SECURITY.  This patch moves cap_file_mmap
    into commoncap.c and then calls that function directly from
    security_file_mmap ifndef CONFIG_SECURITY like all of the other capability
    checks are done.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Acked-by: Serge Hallyn <serue at us.ibm.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 9c0d90103c7e0eb6e638e5b649e9f6d8d9c1b4b3)

commit d464b4a55b8dafeb94d8a14d3c609b7b635ab291
Author: Christoph Lameter <cl at linux-foundation.org>
Date:   Wed Jun 3 16:04:31 2009 -0400

    security: use mmap_min_addr indepedently of security models
    
    commit e0a94c2a63f2644826069044649669b5e7ca75d3 upstream.
    
    This patch removes the dependency of mmap_min_addr on CONFIG_SECURITY.
    It also sets a default mmap_min_addr of 4096.
    
    mmapping of addresses below 4096 will only be possible for processes
    with CAP_SYS_RAWIO.
    
    Signed-off-by: Christoph Lameter <cl at linux-foundation.org>
    Acked-by: Eric Paris <eparis at redhat.com>
    Looks-ok-by: Linus Torvalds <torvalds at linux-foundation.org>
    Signed-off-by: James Morris <jmorris at namei.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
    (cherry picked from commit 2401fe3fbc5bd7db741867102fe355babce76506)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 93d0a69..190c298 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -34,8 +34,6 @@ extern int sysctl_legacy_va_layout;
 #define sysctl_legacy_va_layout 0
 #endif
 
-extern unsigned long mmap_min_addr;
-
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -585,21 +583,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
 }
 
 /*
- * If a hint addr is less than mmap_min_addr change hint to be as
- * low as possible but still greater than mmap_min_addr
- */
-static inline unsigned long round_hint_to_min(unsigned long hint)
-{
-#ifdef CONFIG_SECURITY
-	hint &= PAGE_MASK;
-	if (((void *)hint != NULL) &&
-	    (hint < mmap_min_addr))
-		return PAGE_ALIGN(mmap_min_addr);
-#endif
-	return hint;
-}
-
-/*
  * Some inline functions in vmstat.h depend on page_zone()
  */
 #include <linux/vmstat.h>
diff --git a/include/linux/security.h b/include/linux/security.h
index 1f2ab63..f12649b 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -28,6 +28,7 @@
 #include <linux/resource.h>
 #include <linux/sem.h>
 #include <linux/shm.h>
+#include <linux/mm.h> /* PAGE_ALIGN */
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
@@ -65,6 +66,9 @@ extern int cap_inode_setxattr(struct dentry *dentry, const char *name,
 extern int cap_inode_removexattr(struct dentry *dentry, const char *name);
 extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
+extern int cap_file_mmap(struct file *file, unsigned long reqprot,
+			 unsigned long prot, unsigned long flags,
+			 unsigned long addr, unsigned long addr_only);
 extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5);
@@ -91,6 +95,7 @@ extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
 extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 
 extern unsigned long mmap_min_addr;
+extern unsigned long dac_mmap_min_addr;
 /*
  * Values used in the task_security_ops calls
  */
@@ -115,6 +120,21 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE	2
 #define LSM_UNSAFE_PTRACE_CAP	4
 
+/*
+ * If a hint addr is less than mmap_min_addr change hint to be as
+ * low as possible but still greater than mmap_min_addr
+ */
+static inline unsigned long round_hint_to_min(unsigned long hint)
+{
+	hint &= PAGE_MASK;
+	if (((void *)hint != NULL) &&
+	    (hint < mmap_min_addr))
+		return PAGE_ALIGN(mmap_min_addr);
+	return hint;
+}
+extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+				 void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #ifdef CONFIG_SECURITY
 
 struct security_mnt_opts {
@@ -2203,7 +2223,7 @@ static inline int security_file_mmap(struct file *file, unsigned long reqprot,
 				     unsigned long addr,
 				     unsigned long addr_only)
 {
-	return 0;
+	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 }
 
 static inline int security_file_mprotect(struct vm_area_struct *vma,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 7755ae7..a3eead3 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -48,6 +48,7 @@
 #include <linux/acpi.h>
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
+#include <linux/security.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -1210,16 +1211,14 @@ static struct ctl_table vm_table[] = {
 		.strategy	= &sysctl_jiffies,
 	},
 #endif
-#ifdef CONFIG_SECURITY
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "mmap_min_addr",
-		.data		= &mmap_min_addr,
-		.maxlen         = sizeof(unsigned long),
+		.data		= &dac_mmap_min_addr,
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0644,
-		.proc_handler	= &proc_doulongvec_minmax,
+		.proc_handler	= &mmap_min_addr_handler,
 	},
-#endif
 #ifdef CONFIG_NUMA
 	{
 		.ctl_name	= CTL_UNNUMBERED,
diff --git a/mm/Kconfig b/mm/Kconfig
index a5b7781..be3ae9a 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -216,3 +216,21 @@ config UNEVICTABLE_LRU
 
 config MMU_NOTIFIER
 	bool
+
+config DEFAULT_MMAP_MIN_ADDR
+        int "Low address space to protect from user allocation"
+        default 4096
+        help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+	  can help reduce the impact of kernel NULL pointer bugs.
+
+	  For most ia64, ppc64 and x86 users with lots of address space
+	  a value of 65536 is reasonable and should cause no problems.
+	  On arm and other archs it should not be higher than 32768.
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need CAP_SYS_RAWIO or disable this
+	  protection by setting the value to 0.
+
+	  This value can be changed after boot using the
+	  /proc/sys/vm/mmap_min_addr tunable.
diff --git a/security/Kconfig b/security/Kconfig
index 9438535..05da5ae 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -109,14 +109,14 @@ config SECURITY_ROOTPLUG
 
 	  See <http://www.linuxjournal.com/article.php?sid=6279> for
 	  more information about this module.
-	  
+
 	  If you are unsure how to answer this question, answer N.
 
-config SECURITY_DEFAULT_MMAP_MIN_ADDR
-        int "Low address space to protect from user allocation"
-        depends on SECURITY
-        default 0
-        help
+config LSM_MMAP_MIN_ADDR
+	int "Low address space for LSM to from user allocation"
+	depends on SECURITY && SECURITY_SELINUX
+	default 65535
+	help
 	  This is the portion of low virtual memory which should be protected
 	  from userspace allocation.  Keeping a user from writing to low pages
 	  can help reduce the impact of kernel NULL pointer bugs.
@@ -124,13 +124,9 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
 	  For most ia64, ppc64 and x86 users with lots of address space
 	  a value of 65536 is reasonable and should cause no problems.
 	  On arm and other archs it should not be higher than 32768.
-	  Programs which use vm86 functionality would either need additional
-	  permissions from either the LSM or the capabilities module or have
-	  this protection disabled.
-
-	  This value can be changed after boot using the
-	  /proc/sys/vm/mmap_min_addr tunable.
-
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need the permission specific to the
+	  systems running LSM.
 
 source security/selinux/Kconfig
 source security/smack/Kconfig
diff --git a/security/Makefile b/security/Makefile
index c05c127..e457ea7 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -7,7 +7,7 @@ subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
 subdir-$(CONFIG_SECURITY_SMACK)		+= smack
 
 # always enable default capabilities
-obj-y		+= commoncap.o
+obj-y		+= commoncap.o min_addr.o
 
 # Object file lists
 obj-$(CONFIG_SECURITY)			+= security.o capability.o
diff --git a/security/capability.c b/security/capability.c
index c545bd1..2408d60 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -330,15 +330,6 @@ static int cap_file_ioctl(struct file *file, unsigned int command,
 	return 0;
 }
 
-static int cap_file_mmap(struct file *file, unsigned long reqprot,
-			 unsigned long prot, unsigned long flags,
-			 unsigned long addr, unsigned long addr_only)
-{
-	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
-		return -EACCES;
-	return 0;
-}
-
 static int cap_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
 			     unsigned long prot)
 {
diff --git a/security/commoncap.c b/security/commoncap.c
index beac025..42bb7c0 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -952,3 +952,33 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
 		cap_sys_admin = 1;
 	return __vm_enough_memory(mm, pages, cap_sys_admin);
 }
+
+/*
+ * cap_file_mmap - check if able to map given addr
+ * @file: unused
+ * @reqprot: unused
+ * @prot: unused
+ * @flags: unused
+ * @addr: address attempting to be mapped
+ * @addr_only: unused
+ *
+ * If the process is attempting to map memory below mmap_min_addr they need
+ * CAP_SYS_RAWIO.  The other parameters to this function are unused by the
+ * capability security module.  Returns 0 if this mapping should be allowed
+ * -EPERM if not.
+ */
+int cap_file_mmap(struct file *file, unsigned long reqprot,
+		  unsigned long prot, unsigned long flags,
+		  unsigned long addr, unsigned long addr_only)
+{
+	int ret = 0;
+
+	if (addr < dac_mmap_min_addr) {
+		ret = cap_capable(current, current_cred(), CAP_SYS_RAWIO,
+				  SECURITY_CAP_AUDIT);
+		/* set PF_SUPERPRIV if it turns out we allow the low mmap */
+		if (ret == 0)
+			current->flags |= PF_SUPERPRIV;
+	}
+	return ret;
+}
diff --git a/security/min_addr.c b/security/min_addr.c
new file mode 100644
index 0000000..14cc7b3
--- /dev/null
+++ b/security/min_addr.c
@@ -0,0 +1,49 @@
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/security.h>
+#include <linux/sysctl.h>
+
+/* amount of vm to protect from userspace access by both DAC and the LSM*/
+unsigned long mmap_min_addr;
+/* amount of vm to protect from userspace using CAP_SYS_RAWIO (DAC) */
+unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+/* amount of vm to protect from userspace using the LSM = CONFIG_LSM_MMAP_MIN_ADDR */
+
+/*
+ * Update mmap_min_addr = max(dac_mmap_min_addr, CONFIG_LSM_MMAP_MIN_ADDR)
+ */
+static void update_mmap_min_addr(void)
+{
+#ifdef CONFIG_LSM_MMAP_MIN_ADDR
+	if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
+		mmap_min_addr = dac_mmap_min_addr;
+	else
+		mmap_min_addr = CONFIG_LSM_MMAP_MIN_ADDR;
+#else
+	mmap_min_addr = dac_mmap_min_addr;
+#endif
+}
+
+/*
+ * sysctl handler which just sets dac_mmap_min_addr = the new value and then
+ * calls update_mmap_min_addr() so non MAP_FIXED hints get rounded properly
+ */
+int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+			  void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	int ret;
+
+	ret = proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos);
+
+	update_mmap_min_addr();
+
+	return ret;
+}
+
+int __init init_mmap_min_addr(void)
+{
+	update_mmap_min_addr();
+
+	return 0;
+}
+pure_initcall(init_mmap_min_addr);
diff --git a/security/security.c b/security/security.c
index c3586c0..c024b5d 100644
--- a/security/security.c
+++ b/security/security.c
@@ -26,9 +26,6 @@ extern void security_fixup_ops(struct security_operations *ops);
 
 struct security_operations *security_ops;	/* Initialized to NULL */
 
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR;
-
 static inline int verify(struct security_operations *ops)
 {
 	/* verify the security_operations structure exists */
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9d62f29..64e6fe0 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3045,9 +3045,21 @@ static int selinux_file_mmap(struct file *file, unsigned long reqprot,
 	int rc = 0;
 	u32 sid = current_sid();
 
-	if (addr < mmap_min_addr)
+	/*
+	 * notice that we are intentionally putting the SELinux check before
+	 * the secondary cap_file_mmap check.  This is such a likely attempt
+	 * at bad behaviour/exploit that we always want to get the AVC, even
+	 * if DAC would have also denied the operation.
+	 */
+	if (addr < CONFIG_LSM_MMAP_MIN_ADDR) {
 		rc = avc_has_perm(sid, sid, SECCLASS_MEMPROTECT,
 				  MEMPROTECT__MMAP_ZERO, NULL);
+		if (rc)
+			return rc;
+	}
+
+	/* do DAC check on address space usage */
+	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 	if (rc || addr_only)
 		return rc;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1402
retrieving revision 1.1403
diff -u -p -r1.1402 -r1.1403
--- kernel.spec	19 Aug 2009 01:52:04 -0000	1.1402
+++ kernel.spec	19 Aug 2009 02:33:33 -0000	1.1403
@@ -759,9 +759,10 @@ Patch11020: linux-2.6-usb-remove-low-lat
 Patch11030: linux-2.6-x86-delay-tsc-barrier.patch
 # security fixes from the F-11 2.6.29.6 kernel
 Patch11040: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
-Patch11050: security-use-mmap_min_addr-indepedently-of-security-models.patch
+#Patch11050: security-use-mmap_min_addr-indepedently-of-security-models.patch
 Patch11060: personality-fix-per_clear_on_setid.patch
 Patch11070: execve-must-clear-current-clear_child_tid.patch
+Patch11080: make-mmap_min_addr-suck-less.patch
 
 %endif
 
@@ -1437,12 +1438,14 @@ ApplyPatch linux-2.6-x86-delay-tsc-barri
 # fix test-after-use of null pointers
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 # mmap zero page fixes
-ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
+#ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
 ApplyPatch personality-fix-per_clear_on_setid.patch
 
 # CVE-2009-2848
 ApplyPatch execve-must-clear-current-clear_child_tid.patch
 
+ApplyPatch make-mmap_min_addr-suck-less.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -2021,6 +2024,8 @@ fi
 %changelog
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-102
 - CVE-2009-2848: execve: must clear current->clear_child_tid
+- Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
+  to improve mmap_min_addr.
 
 * Tue Aug 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-99
 - Intel wireless fixes from Fedora 11:



From kyle at fedoraproject.org  Wed Aug 19 02:33:42 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 02:33:42 +0000 (UTC)
Subject: rpms/kernel/F-11 make-mmap_min_addr-suck-less.patch, NONE,
	1.1.2.2 kernel.spec, 1.1679.2.11, 1.1679.2.12
Message-ID: <20090819023342.D1FAA11C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25843

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	make-mmap_min_addr-suck-less.patch 
Log Message:
* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.10
- CVE-2009-2848: execve: must clear current->clear_child_tid
- Cherry pick upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
  which improve mmap_min_addr.


make-mmap_min_addr-suck-less.patch:
 include/linux/mm.h       |   17 ----------------
 include/linux/security.h |   22 ++++++++++++++++++++-
 kernel/sysctl.c          |    9 +++-----
 mm/Kconfig               |   18 +++++++++++++++++
 security/Kconfig         |   22 ++++++++-------------
 security/Makefile        |    2 -
 security/capability.c    |    9 --------
 security/commoncap.c     |   30 ++++++++++++++++++++++++++++
 security/min_addr.c      |   49 +++++++++++++++++++++++++++++++++++++++++++++++
 security/security.c      |    3 --
 security/selinux/hooks.c |   14 ++++++++++++-
 11 files changed, 145 insertions(+), 50 deletions(-)

--- NEW FILE make-mmap_min_addr-suck-less.patch ---
commit 954cd03196be852d3a471daec79bf7cbdaf93d65
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Aug 7 14:53:57 2009 -0400

    security: define round_hint_to_min in !CONFIG_SECURITY
    
    Fix the header files to define round_hint_to_min() and to define
    mmap_min_addr_handler() in the !CONFIG_SECURITY case.
    
    Built and tested with !CONFIG_SECURITY
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 1d9959734a1949ea4f2427bd2d8b21ede6b2441c)

commit 020d8d2dc7b9fae32f9e259cc5227cad108bac17
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:11 2009 -0400

    Security/SELinux: seperate lsm specific mmap_min_addr
    
    Currently SELinux enforcement of controls on the ability to map low memory
    is determined by the mmap_min_addr tunable.  This patch causes SELinux to
    ignore the tunable and instead use a seperate Kconfig option specific to how
    much space the LSM should protect.
    
    The tunable will now only control the need for CAP_SYS_RAWIO and SELinux
    permissions will always protect the amount of low memory designated by
    CONFIG_LSM_MMAP_MIN_ADDR.
    
    This allows users who need to disable the mmap_min_addr controls (usual reason
    being they run WINE as a non-root user) to do so and still have SELinux
    controls preventing confined domains (like a web server) from being able to
    map some area of low memory.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 788084aba2ab7348257597496befcbccabdc98a3)

commit 141173509c591056154077288f3657b7750b4629
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:05 2009 -0400

    SELinux: call cap_file_mmap in selinux_file_mmap
    
    Currently SELinux does not check CAP_SYS_RAWIO in the file_mmap hook.  This
    means there is no DAC check on the ability to mmap low addresses in the
    memory space.  This function adds the DAC check for CAP_SYS_RAWIO while
    maintaining the selinux check on mmap_zero.  This means that processes
    which need to mmap low memory will need CAP_SYS_RAWIO and mmap_zero but will
    NOT need the SELinux sys_rawio capability.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 8cf948e744e0218af604c32edecde10006dc8e9e)

commit 5b6a9b164793aa837e8cf813cae0f1ec3c5e4c7d
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:53:58 2009 -0400

    Capabilities: move cap_file_mmap to commoncap.c
    
    Currently we duplicate the mmap_min_addr test in cap_file_mmap and in
    security_file_mmap if !CONFIG_SECURITY.  This patch moves cap_file_mmap
    into commoncap.c and then calls that function directly from
    security_file_mmap ifndef CONFIG_SECURITY like all of the other capability
    checks are done.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Acked-by: Serge Hallyn <serue at us.ibm.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 9c0d90103c7e0eb6e638e5b649e9f6d8d9c1b4b3)

commit d464b4a55b8dafeb94d8a14d3c609b7b635ab291
Author: Christoph Lameter <cl at linux-foundation.org>
Date:   Wed Jun 3 16:04:31 2009 -0400

    security: use mmap_min_addr indepedently of security models
    
    commit e0a94c2a63f2644826069044649669b5e7ca75d3 upstream.
    
    This patch removes the dependency of mmap_min_addr on CONFIG_SECURITY.
    It also sets a default mmap_min_addr of 4096.
    
    mmapping of addresses below 4096 will only be possible for processes
    with CAP_SYS_RAWIO.
    
    Signed-off-by: Christoph Lameter <cl at linux-foundation.org>
    Acked-by: Eric Paris <eparis at redhat.com>
    Looks-ok-by: Linus Torvalds <torvalds at linux-foundation.org>
    Signed-off-by: James Morris <jmorris at namei.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
    (cherry picked from commit 2401fe3fbc5bd7db741867102fe355babce76506)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 93d0a69..190c298 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -34,8 +34,6 @@ extern int sysctl_legacy_va_layout;
 #define sysctl_legacy_va_layout 0
 #endif
 
-extern unsigned long mmap_min_addr;
-
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -585,21 +583,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
 }
 
 /*
- * If a hint addr is less than mmap_min_addr change hint to be as
- * low as possible but still greater than mmap_min_addr
- */
-static inline unsigned long round_hint_to_min(unsigned long hint)
-{
-#ifdef CONFIG_SECURITY
-	hint &= PAGE_MASK;
-	if (((void *)hint != NULL) &&
-	    (hint < mmap_min_addr))
-		return PAGE_ALIGN(mmap_min_addr);
-#endif
-	return hint;
-}
-
-/*
  * Some inline functions in vmstat.h depend on page_zone()
  */
 #include <linux/vmstat.h>
diff --git a/include/linux/security.h b/include/linux/security.h
index 1f2ab63..f12649b 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -28,6 +28,7 @@
 #include <linux/resource.h>
 #include <linux/sem.h>
 #include <linux/shm.h>
+#include <linux/mm.h> /* PAGE_ALIGN */
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
@@ -65,6 +66,9 @@ extern int cap_inode_setxattr(struct dentry *dentry, const char *name,
 extern int cap_inode_removexattr(struct dentry *dentry, const char *name);
 extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
+extern int cap_file_mmap(struct file *file, unsigned long reqprot,
+			 unsigned long prot, unsigned long flags,
+			 unsigned long addr, unsigned long addr_only);
 extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5);
@@ -91,6 +95,7 @@ extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
 extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 
 extern unsigned long mmap_min_addr;
+extern unsigned long dac_mmap_min_addr;
 /*
  * Values used in the task_security_ops calls
  */
@@ -115,6 +120,21 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE	2
 #define LSM_UNSAFE_PTRACE_CAP	4
 
+/*
+ * If a hint addr is less than mmap_min_addr change hint to be as
+ * low as possible but still greater than mmap_min_addr
+ */
+static inline unsigned long round_hint_to_min(unsigned long hint)
+{
+	hint &= PAGE_MASK;
+	if (((void *)hint != NULL) &&
+	    (hint < mmap_min_addr))
+		return PAGE_ALIGN(mmap_min_addr);
+	return hint;
+}
+extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+				 void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #ifdef CONFIG_SECURITY
 
 struct security_mnt_opts {
@@ -2203,7 +2223,7 @@ static inline int security_file_mmap(struct file *file, unsigned long reqprot,
 				     unsigned long addr,
 				     unsigned long addr_only)
 {
-	return 0;
+	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 }
 
 static inline int security_file_mprotect(struct vm_area_struct *vma,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 7755ae7..a3eead3 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -48,6 +48,7 @@
 #include <linux/acpi.h>
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
+#include <linux/security.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -1210,16 +1211,14 @@ static struct ctl_table vm_table[] = {
 		.strategy	= &sysctl_jiffies,
 	},
 #endif
-#ifdef CONFIG_SECURITY
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "mmap_min_addr",
-		.data		= &mmap_min_addr,
-		.maxlen         = sizeof(unsigned long),
+		.data		= &dac_mmap_min_addr,
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0644,
-		.proc_handler	= &proc_doulongvec_minmax,
+		.proc_handler	= &mmap_min_addr_handler,
 	},
-#endif
 #ifdef CONFIG_NUMA
 	{
 		.ctl_name	= CTL_UNNUMBERED,
diff --git a/mm/Kconfig b/mm/Kconfig
index a5b7781..be3ae9a 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -216,3 +216,21 @@ config UNEVICTABLE_LRU
 
 config MMU_NOTIFIER
 	bool
+
+config DEFAULT_MMAP_MIN_ADDR
+        int "Low address space to protect from user allocation"
+        default 4096
+        help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+	  can help reduce the impact of kernel NULL pointer bugs.
+
+	  For most ia64, ppc64 and x86 users with lots of address space
+	  a value of 65536 is reasonable and should cause no problems.
+	  On arm and other archs it should not be higher than 32768.
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need CAP_SYS_RAWIO or disable this
+	  protection by setting the value to 0.
+
+	  This value can be changed after boot using the
+	  /proc/sys/vm/mmap_min_addr tunable.
diff --git a/security/Kconfig b/security/Kconfig
index 9438535..05da5ae 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -109,14 +109,14 @@ config SECURITY_ROOTPLUG
 
 	  See <http://www.linuxjournal.com/article.php?sid=6279> for
 	  more information about this module.
-	  
+
 	  If you are unsure how to answer this question, answer N.
 
-config SECURITY_DEFAULT_MMAP_MIN_ADDR
-        int "Low address space to protect from user allocation"
-        depends on SECURITY
-        default 0
-        help
+config LSM_MMAP_MIN_ADDR
+	int "Low address space for LSM to from user allocation"
+	depends on SECURITY && SECURITY_SELINUX
+	default 65535
+	help
 	  This is the portion of low virtual memory which should be protected
 	  from userspace allocation.  Keeping a user from writing to low pages
 	  can help reduce the impact of kernel NULL pointer bugs.
@@ -124,13 +124,9 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
 	  For most ia64, ppc64 and x86 users with lots of address space
 	  a value of 65536 is reasonable and should cause no problems.
 	  On arm and other archs it should not be higher than 32768.
-	  Programs which use vm86 functionality would either need additional
-	  permissions from either the LSM or the capabilities module or have
-	  this protection disabled.
-
-	  This value can be changed after boot using the
-	  /proc/sys/vm/mmap_min_addr tunable.
-
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need the permission specific to the
+	  systems running LSM.
 
 source security/selinux/Kconfig
 source security/smack/Kconfig
diff --git a/security/Makefile b/security/Makefile
index c05c127..e457ea7 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -7,7 +7,7 @@ subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
 subdir-$(CONFIG_SECURITY_SMACK)		+= smack
 
 # always enable default capabilities
-obj-y		+= commoncap.o
+obj-y		+= commoncap.o min_addr.o
 
 # Object file lists
 obj-$(CONFIG_SECURITY)			+= security.o capability.o
diff --git a/security/capability.c b/security/capability.c
index c545bd1..2408d60 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -330,15 +330,6 @@ static int cap_file_ioctl(struct file *file, unsigned int command,
 	return 0;
 }
 
-static int cap_file_mmap(struct file *file, unsigned long reqprot,
-			 unsigned long prot, unsigned long flags,
-			 unsigned long addr, unsigned long addr_only)
-{
-	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
-		return -EACCES;
-	return 0;
-}
-
 static int cap_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
 			     unsigned long prot)
 {
diff --git a/security/commoncap.c b/security/commoncap.c
index beac025..42bb7c0 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -952,3 +952,33 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
 		cap_sys_admin = 1;
 	return __vm_enough_memory(mm, pages, cap_sys_admin);
 }
+
+/*
+ * cap_file_mmap - check if able to map given addr
+ * @file: unused
+ * @reqprot: unused
+ * @prot: unused
+ * @flags: unused
+ * @addr: address attempting to be mapped
+ * @addr_only: unused
+ *
+ * If the process is attempting to map memory below mmap_min_addr they need
+ * CAP_SYS_RAWIO.  The other parameters to this function are unused by the
+ * capability security module.  Returns 0 if this mapping should be allowed
+ * -EPERM if not.
+ */
+int cap_file_mmap(struct file *file, unsigned long reqprot,
+		  unsigned long prot, unsigned long flags,
+		  unsigned long addr, unsigned long addr_only)
+{
+	int ret = 0;
+
+	if (addr < dac_mmap_min_addr) {
+		ret = cap_capable(current, current_cred(), CAP_SYS_RAWIO,
+				  SECURITY_CAP_AUDIT);
+		/* set PF_SUPERPRIV if it turns out we allow the low mmap */
+		if (ret == 0)
+			current->flags |= PF_SUPERPRIV;
+	}
+	return ret;
+}
diff --git a/security/min_addr.c b/security/min_addr.c
new file mode 100644
index 0000000..14cc7b3
--- /dev/null
+++ b/security/min_addr.c
@@ -0,0 +1,49 @@
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/security.h>
+#include <linux/sysctl.h>
+
+/* amount of vm to protect from userspace access by both DAC and the LSM*/
+unsigned long mmap_min_addr;
+/* amount of vm to protect from userspace using CAP_SYS_RAWIO (DAC) */
+unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+/* amount of vm to protect from userspace using the LSM = CONFIG_LSM_MMAP_MIN_ADDR */
+
+/*
+ * Update mmap_min_addr = max(dac_mmap_min_addr, CONFIG_LSM_MMAP_MIN_ADDR)
+ */
+static void update_mmap_min_addr(void)
+{
+#ifdef CONFIG_LSM_MMAP_MIN_ADDR
+	if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
+		mmap_min_addr = dac_mmap_min_addr;
+	else
+		mmap_min_addr = CONFIG_LSM_MMAP_MIN_ADDR;
+#else
+	mmap_min_addr = dac_mmap_min_addr;
+#endif
+}
+
+/*
+ * sysctl handler which just sets dac_mmap_min_addr = the new value and then
+ * calls update_mmap_min_addr() so non MAP_FIXED hints get rounded properly
+ */
+int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+			  void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	int ret;
+
+	ret = proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos);
+
+	update_mmap_min_addr();
+
+	return ret;
+}
+
+int __init init_mmap_min_addr(void)
+{
+	update_mmap_min_addr();
+
+	return 0;
+}
+pure_initcall(init_mmap_min_addr);
diff --git a/security/security.c b/security/security.c
index c3586c0..c024b5d 100644
--- a/security/security.c
+++ b/security/security.c
@@ -26,9 +26,6 @@ extern void security_fixup_ops(struct security_operations *ops);
 
 struct security_operations *security_ops;	/* Initialized to NULL */
 
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR;
-
 static inline int verify(struct security_operations *ops)
 {
 	/* verify the security_operations structure exists */
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9d62f29..64e6fe0 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3045,9 +3045,21 @@ static int selinux_file_mmap(struct file *file, unsigned long reqprot,
 	int rc = 0;
 	u32 sid = current_sid();
 
-	if (addr < mmap_min_addr)
+	/*
+	 * notice that we are intentionally putting the SELinux check before
+	 * the secondary cap_file_mmap check.  This is such a likely attempt
+	 * at bad behaviour/exploit that we always want to get the AVC, even
+	 * if DAC would have also denied the operation.
+	 */
+	if (addr < CONFIG_LSM_MMAP_MIN_ADDR) {
 		rc = avc_has_perm(sid, sid, SECCLASS_MEMPROTECT,
 				  MEMPROTECT__MMAP_ZERO, NULL);
+		if (rc)
+			return rc;
+	}
+
+	/* do DAC check on address space usage */
+	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 	if (rc || addr_only)
 		return rc;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.11
retrieving revision 1.1679.2.12
diff -u -p -r1.1679.2.11 -r1.1679.2.12
--- kernel.spec	19 Aug 2009 01:51:10 -0000	1.1679.2.11
+++ kernel.spec	19 Aug 2009 02:33:42 -0000	1.1679.2.12
@@ -818,7 +818,8 @@ Patch11120: via-padlock-fix-might-sleep.
 Patch11130: via-hwmon-temp-sensor.patch
 
 # CVE-2009-1895
-Patch12000: security-use-mmap_min_addr-indepedently-of-security-models.patch
+Patch12000: make-mmap_min_addr-suck-less.patch
+#Patch12000: security-use-mmap_min_addr-indepedently-of-security-models.patch
 Patch12010: personality-fix-per_clear_on_setid.patch
 
 # CVE-2009-2848
@@ -1541,7 +1542,8 @@ ApplyPatch linux-2.6-usb-remove-low-late
 ApplyPatch linux-2.6-x86-delay-tsc-barrier.patch
 
 # CVE-2009-1895
-ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
+ApplyPatch make-mmap_min_addr-suck-less.patch
+#ApplyPatch security-use-mmap_min_addr-indepedently-of-security-models.patch
 ApplyPatch personality-fix-per_clear_on_setid.patch
 
 # CVE-2009-2848
@@ -2152,6 +2154,8 @@ fi
 %changelog
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.10
 - CVE-2009-2848: execve: must clear current->clear_child_tid
+- Cherry pick upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
+  which improve mmap_min_addr.
 
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9
 - Fix flub in prior lirc patch update that resulted in no lirc



From kyle at fedoraproject.org  Wed Aug 19 02:33:58 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 02:33:58 +0000 (UTC)
Subject: rpms/kernel/F-10 make-mmap_min_addr-suck-less.patch, NONE,
	1.1.2.2 kernel.spec, 1.1206.2.82, 1.1206.2.83
Message-ID: <20090819023358.E7EC811C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25893

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	make-mmap_min_addr-suck-less.patch 
Log Message:
* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
- Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
  to improve mmap_min_addr.


make-mmap_min_addr-suck-less.patch:
 include/linux/mm.h       |   15 --------------
 include/linux/security.h |   24 ++++++++++++++++++++---
 kernel/sysctl.c          |    7 +++---
 mm/Kconfig               |    6 ++---
 mm/mmap.c                |    3 --
 security/Kconfig         |   16 +++++++++++++++
 security/Makefile        |    2 -
 security/capability.c    |    9 --------
 security/commoncap.c     |   29 +++++++++++++++++++++++++++
 security/min_addr.c      |   49 +++++++++++++++++++++++++++++++++++++++++++++++
 security/selinux/hooks.c |   14 ++++++++++++-
 11 files changed, 136 insertions(+), 38 deletions(-)

--- NEW FILE make-mmap_min_addr-suck-less.patch ---
commit 8a8c4e2108856c8131ad9a535f56f7e44abc2f03
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Aug 7 14:53:57 2009 -0400

    security: define round_hint_to_min in !CONFIG_SECURITY
    
    Fix the header files to define round_hint_to_min() and to define
    mmap_min_addr_handler() in the !CONFIG_SECURITY case.
    
    Built and tested with !CONFIG_SECURITY
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 1d9959734a1949ea4f2427bd2d8b21ede6b2441c)

commit bbf567418c37aedd8c9e8af0cad9fff76d1fb59d
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:11 2009 -0400

    Security/SELinux: seperate lsm specific mmap_min_addr
    
    Currently SELinux enforcement of controls on the ability to map low memory
    is determined by the mmap_min_addr tunable.  This patch causes SELinux to
    ignore the tunable and instead use a seperate Kconfig option specific to how
    much space the LSM should protect.
    
    The tunable will now only control the need for CAP_SYS_RAWIO and SELinux
    permissions will always protect the amount of low memory designated by
    CONFIG_LSM_MMAP_MIN_ADDR.
    
    This allows users who need to disable the mmap_min_addr controls (usual reason
    being they run WINE as a non-root user) to do so and still have SELinux
    controls preventing confined domains (like a web server) from being able to
    map some area of low memory.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (upstream 788084aba2ab7348257597496befcbccabdc98a3)

commit b66e4a1f3aa74602479ce8c7e3d099a425c4299a
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:54:05 2009 -0400

    SELinux: call cap_file_mmap in selinux_file_mmap
    
    Currently SELinux does not check CAP_SYS_RAWIO in the file_mmap hook.  This
    means there is no DAC check on the ability to mmap low addresses in the
    memory space.  This function adds the DAC check for CAP_SYS_RAWIO while
    maintaining the selinux check on mmap_zero.  This means that processes
    which need to mmap low memory will need CAP_SYS_RAWIO and mmap_zero but will
    NOT need the SELinux sys_rawio capability.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (cherry picked from commit 8cf948e744e0218af604c32edecde10006dc8e9e)

commit 6f5bd804dbb3bebe28ee7fe0e8d6db547408467e
Author: Eric Paris <eparis at redhat.com>
Date:   Fri Jul 31 12:53:58 2009 -0400

    Capabilities: move cap_file_mmap to commoncap.c
    
    Currently we duplicate the mmap_min_addr test in cap_file_mmap and in
    security_file_mmap if !CONFIG_SECURITY.  This patch moves cap_file_mmap
    into commoncap.c and then calls that function directly from
    security_file_mmap ifndef CONFIG_SECURITY like all of the other capability
    checks are done.
    
    Signed-off-by: Eric Paris <eparis at redhat.com>
    Acked-by: Serge Hallyn <serue at us.ibm.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    (upstream 9c0d90103c7e0eb6e638e5b649e9f6d8d9c1b4b3)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index eeb7e56..e13a1f8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -33,8 +33,6 @@ extern int sysctl_legacy_va_layout;
 #define sysctl_legacy_va_layout 0
 #endif
 
-extern unsigned long mmap_min_addr;
-
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -567,19 +565,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
 }
 
 /*
- * If a hint addr is less than mmap_min_addr change hint to be as
- * low as possible but still greater than mmap_min_addr
- */
-static inline unsigned long round_hint_to_min(unsigned long hint)
-{
-	hint &= PAGE_MASK;
-	if (((void *)hint != NULL) &&
-	    (hint < mmap_min_addr))
-		return PAGE_ALIGN(mmap_min_addr);
-	return hint;
-}
-
-/*
  * Some inline functions in vmstat.h depend on page_zone()
  */
 #include <linux/vmstat.h>
diff --git a/include/linux/security.h b/include/linux/security.h
index 1638afd..5daab9e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -28,6 +28,7 @@
 #include <linux/resource.h>
 #include <linux/sem.h>
 #include <linux/shm.h>
+#include <linux/mm.h> /* PAGE_ALIGN */
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
@@ -61,6 +62,9 @@ extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
 extern int cap_task_post_setuid(uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
 extern void cap_task_reparent_to_init(struct task_struct *p);
+extern int cap_file_mmap(struct file *file, unsigned long reqprot,
+			 unsigned long prot, unsigned long flags,
+			 unsigned long addr, unsigned long addr_only);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5, long *rc_p);
 extern int cap_task_setscheduler(struct task_struct *p, int policy, struct sched_param *lp);
@@ -86,6 +90,7 @@ extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
 extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 
 extern unsigned long mmap_min_addr;
+extern unsigned long dac_mmap_min_addr;
 /*
  * Values used in the task_security_ops calls
  */
@@ -110,6 +115,21 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE	2
 #define LSM_UNSAFE_PTRACE_CAP	4
 
+/*
+ * If a hint addr is less than mmap_min_addr change hint to be as
+ * low as possible but still greater than mmap_min_addr
+ */
+static inline unsigned long round_hint_to_min(unsigned long hint)
+{
+	hint &= PAGE_MASK;
+	if (((void *)hint != NULL) &&
+	    (hint < mmap_min_addr))
+		return PAGE_ALIGN(mmap_min_addr);
+	return hint;
+}
+extern int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+				 void __user *buffer, size_t *lenp, loff_t *ppos);
+
 #ifdef CONFIG_SECURITY
 
 struct security_mnt_opts {
@@ -2134,9 +2154,7 @@ static inline int security_file_mmap(struct file *file, unsigned long reqprot,
 				     unsigned long addr,
 				     unsigned long addr_only)
 {
-	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
-		return -EACCES;
-	return 0;
+	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 }
 
 static inline int security_file_mprotect(struct vm_area_struct *vma,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 1228d65..2daf773 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -48,6 +48,7 @@
 #include <linux/acpi.h>
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
+#include <linux/security.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -1135,10 +1136,10 @@ static struct ctl_table vm_table[] = {
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "mmap_min_addr",
-		.data		= &mmap_min_addr,
-		.maxlen         = sizeof(unsigned long),
+		.data		= &dac_mmap_min_addr,
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0644,
-		.proc_handler	= &proc_doulongvec_minmax,
+		.proc_handler	= &mmap_min_addr_handler,
 	},
 #ifdef CONFIG_NUMA
 	{
diff --git a/mm/Kconfig b/mm/Kconfig
index 07b4ec4..2f17993 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -220,9 +220,9 @@ config DEFAULT_MMAP_MIN_ADDR
 	  For most ia64, ppc64 and x86 users with lots of address space
 	  a value of 65536 is reasonable and should cause no problems.
 	  On arm and other archs it should not be higher than 32768.
-	  Programs which use vm86 functionality would either need additional
-	  permissions from either the LSM or the capabilities module or have
-	  this protection disabled.
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need CAP_SYS_RAWIO or disable this
+	  protection by setting the value to 0.
 
 	  This value can be changed after boot using the
 	  /proc/sys/vm/mmap_min_addr tunable.
diff --git a/mm/mmap.c b/mm/mmap.c
index d330758..2ae093e 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -86,9 +86,6 @@ int sysctl_overcommit_ratio = 50;	/* default is 50% */
 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
 atomic_long_t vm_committed_space = ATOMIC_LONG_INIT(0);
 
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
-
 /*
  * Check that a process has enough memory to allocate a new virtual
  * mapping. 0 means there is enough memory for the allocation to
diff --git a/security/Kconfig b/security/Kconfig
index 38411dd..88d26c6 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -95,6 +95,22 @@ config SECURITY_ROOTPLUG
 
 	  If you are unsure how to answer this question, answer N.
 
+config LSM_MMAP_MIN_ADDR
+	int "Low address space for LSM to from user allocation"
+	depends on SECURITY && SECURITY_SELINUX
+	default 65535
+	help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+	  can help reduce the impact of kernel NULL pointer bugs.
+
+	  For most ia64, ppc64 and x86 users with lots of address space
+	  a value of 65536 is reasonable and should cause no problems.
+	  On arm and other archs it should not be higher than 32768.
+	  Programs which use vm86 functionality or have some need to map
+	  this low address space will need the permission specific to the
+	  systems running LSM.
+
 source security/selinux/Kconfig
 source security/smack/Kconfig
 
diff --git a/security/Makefile b/security/Makefile
index f654260..2d7234c 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -7,7 +7,7 @@ subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
 subdir-$(CONFIG_SECURITY_SMACK)		+= smack
 
 # always enable default capabilities
-obj-y		+= commoncap.o
+obj-y		+= commoncap.o min_addr.o
 
 # Object file lists
 obj-$(CONFIG_SECURITY)			+= security.o capability.o inode.o
diff --git a/security/capability.c b/security/capability.c
index 2458748..1010bed 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -288,15 +288,6 @@ static int cap_file_ioctl(struct file *file, unsigned int command,
 	return 0;
 }
 
-static int cap_file_mmap(struct file *file, unsigned long reqprot,
-			 unsigned long prot, unsigned long flags,
-			 unsigned long addr, unsigned long addr_only)
-{
-	if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO))
-		return -EACCES;
-	return 0;
-}
-
 static int cap_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
 			     unsigned long prot)
 {
diff --git a/security/commoncap.c b/security/commoncap.c
index 378172b..c91ccfc 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -710,3 +710,32 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
 	return __vm_enough_memory(mm, pages, cap_sys_admin);
 }
 
+/*
+ * cap_file_mmap - check if able to map given addr
+ * @file: unused
+ * @reqprot: unused
+ * @prot: unused
+ * @flags: unused
+ * @addr: address attempting to be mapped
+ * @addr_only: unused
+ *
+ * If the process is attempting to map memory below mmap_min_addr they need
+ * CAP_SYS_RAWIO.  The other parameters to this function are unused by the
+ * capability security module.  Returns 0 if this mapping should be allowed
+ * -EPERM if not.
+ */
+int cap_file_mmap(struct file *file, unsigned long reqprot,
+		  unsigned long prot, unsigned long flags,
+		  unsigned long addr, unsigned long addr_only)
+{
+	int ret = 0;
+
+	if (addr < dac_mmap_min_addr) {
+		ret = cap_capable(current, current_cred(), CAP_SYS_RAWIO,
+				  SECURITY_CAP_AUDIT);
+		/* set PF_SUPERPRIV if it turns out we allow the low mmap */
+		if (ret == 0)
+			current->flags |= PF_SUPERPRIV;
+	}
+	return ret;
+}
diff --git a/security/min_addr.c b/security/min_addr.c
new file mode 100644
index 0000000..14cc7b3
--- /dev/null
+++ b/security/min_addr.c
@@ -0,0 +1,49 @@
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/security.h>
+#include <linux/sysctl.h>
+
+/* amount of vm to protect from userspace access by both DAC and the LSM*/
+unsigned long mmap_min_addr;
+/* amount of vm to protect from userspace using CAP_SYS_RAWIO (DAC) */
+unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+/* amount of vm to protect from userspace using the LSM = CONFIG_LSM_MMAP_MIN_ADDR */
+
+/*
+ * Update mmap_min_addr = max(dac_mmap_min_addr, CONFIG_LSM_MMAP_MIN_ADDR)
+ */
+static void update_mmap_min_addr(void)
+{
+#ifdef CONFIG_LSM_MMAP_MIN_ADDR
+	if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
+		mmap_min_addr = dac_mmap_min_addr;
+	else
+		mmap_min_addr = CONFIG_LSM_MMAP_MIN_ADDR;
+#else
+	mmap_min_addr = dac_mmap_min_addr;
+#endif
+}
+
+/*
+ * sysctl handler which just sets dac_mmap_min_addr = the new value and then
+ * calls update_mmap_min_addr() so non MAP_FIXED hints get rounded properly
+ */
+int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+			  void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	int ret;
+
+	ret = proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos);
+
+	update_mmap_min_addr();
+
+	return ret;
+}
+
+int __init init_mmap_min_addr(void)
+{
+	update_mmap_min_addr();
+
+	return 0;
+}
+pure_initcall(init_mmap_min_addr);
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index e2d25da..524d497 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2998,9 +2998,21 @@ static int selinux_file_mmap(struct file *file, unsigned long reqprot,
 	int rc = 0;
 	u32 sid = ((struct task_security_struct *)(current->security))->sid;
 
-	if (addr < mmap_min_addr)
+	/*
+	 * notice that we are intentionally putting the SELinux check before
+	 * the secondary cap_file_mmap check.  This is such a likely attempt
+	 * at bad behaviour/exploit that we always want to get the AVC, even
+	 * if DAC would have also denied the operation.
+	 */
+	if (addr < CONFIG_LSM_MMAP_MIN_ADDR) {
 		rc = avc_has_perm(sid, sid, SECCLASS_MEMPROTECT,
 				  MEMPROTECT__MMAP_ZERO, NULL);
+		if (rc)
+			return rc;
+	}
+
+	/* do DAC check on address space usage */
+	rc = cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
 	if (rc || addr_only)
 		return rc;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.82
retrieving revision 1.1206.2.83
diff -u -p -r1.1206.2.82 -r1.1206.2.83
--- kernel.spec	17 Aug 2009 11:43:33 -0000	1.1206.2.82
+++ kernel.spec	19 Aug 2009 02:33:58 -0000	1.1206.2.83
@@ -786,6 +786,8 @@ Patch11010: linux-2.6-dev-zero-avoid-oom
 
 Patch12000: linux-2.6-virtio-blk-dont-bounce-highmem-requests.patch
 
+Patch13000: make-mmap_min_addr-suck-less.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1423,6 +1425,8 @@ ApplyPatch linux-2.6-dev-zero-avoid-oom-
 # fix oops with virtio block driver requests (#510304)
 ApplyPatch linux-2.6-virtio-blk-dont-bounce-highmem-requests.patch
 
+ApplyPatch make-mmap_min_addr-suck-less.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1998,6 +2002,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+- Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
+  to improve mmap_min_addr.
+
 * Mon Aug 17 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.82
 - Backport F-11 patch to fix oopses in USB serial drivers. (#517259)
 



From cweyl at fedoraproject.org  Wed Aug 19 02:38:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 02:38:51 +0000 (UTC)
Subject: rpms/perl-Text-SimpleTable/F-11 perl-Text-SimpleTable.spec,1.8,1.9
Message-ID: <20090819023852.053B611C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Text-SimpleTable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26588

Modified Files:
	perl-Text-SimpleTable.spec 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-2
- drop old patch



Index: perl-Text-SimpleTable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-SimpleTable/F-11/perl-Text-SimpleTable.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Text-SimpleTable.spec	19 Aug 2009 02:24:15 -0000	1.8
+++ perl-Text-SimpleTable.spec	19 Aug 2009 02:38:51 -0000	1.9
@@ -1,8 +1,6 @@
-%define _default_patch_fuzz 2
-
 Name:           perl-Text-SimpleTable
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Eyecandy ASCII Tables
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,15 +10,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# see http://rt.cpan.org/Public/Bug/Display.html?id=22371
-Patch0:         simpletable.patch
-
-# Note pod coverage tests fail at the moment, so we disable them for now.
 
 # core
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # testing
 BuildRequires:  perl(Test::More)
+# Note pod coverage tests fail at the moment, so we disable them for now.
 #BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 %description
@@ -28,7 +23,6 @@ Simple eyecandy ASCII tables, as seen in
 
 %prep
 %setup -q -n Text-SimpleTable-%{version}
-%patch0
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-2
+- drop old patch
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 2.0-1
 - auto-update to 2.0 (by cpan-spec-update 0.01)
 



From cweyl at fedoraproject.org  Wed Aug 19 02:40:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 02:40:03 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.32, 1.33 perl-Moose.spec, 1.44, 
	1.45 sources, 1.32, 1.33
Message-ID: <20090819024003.70A2711C0439@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26894

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.89-1
- auto-update to 0.89 (by cpan-spec-update 0.01)
- altered br on perl(Class::MOP) (0.89 => 0.92)
- altered req on perl(Class::MOP) (0.89 => 0.92)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	27 Jul 2009 22:32:12 -0000	1.32
+++ .cvsignore	19 Aug 2009 02:40:03 -0000	1.33
@@ -1 +1 @@
-Moose-0.88.tar.gz
+Moose-0.89.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- perl-Moose.spec	27 Jul 2009 22:32:12 -0000	1.44
+++ perl-Moose.spec	19 Aug 2009 02:40:03 -0000	1.45
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.88
+Version:        0.89
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
@@ -12,7 +12,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(Class::MOP)         >= 0.89
+BuildRequires:  perl(Class::MOP)         >= 0.92
 BuildRequires:  perl(Data::OptList)
 BuildRequires:  perl(Filter::Simple)
 BuildRequires:  perl(List::MoreUtils)    >= 0.12
@@ -54,7 +54,7 @@ BuildRequires:  perl(Test::Warn)
 BuildRequires:  perl(Test::Output)
 
 Requires:  perl(Carp)
-Requires:  perl(Class::MOP) >= 0.89
+Requires:  perl(Class::MOP) >= 0.92
 Requires:  perl(Data::OptList)
 Requires:  perl(List::MoreUtils) >= 0.12
 Requires:  perl(Scalar::Util) >= 1.19
@@ -135,6 +135,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Test::Moose*
 
 %changelog
+* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.89-1
+- auto-update to 0.89 (by cpan-spec-update 0.01)
+- altered br on perl(Class::MOP) (0.89 => 0.92)
+- altered req on perl(Class::MOP) (0.89 => 0.92)
+
 * Mon Jul 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.88-1
 - auto-update to 0.88 (by cpan-spec-update 0.01)
 - altered br on perl(Class::MOP) (0.85 => 0.89)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Jul 2009 22:32:12 -0000	1.32
+++ sources	19 Aug 2009 02:40:03 -0000	1.33
@@ -1 +1 @@
-a9842e4bdf2ffceef7990d1edf14d033  Moose-0.88.tar.gz
+c44543e38e4a77557771ef4ad15a2fa6  Moose-0.89.tar.gz



From mbarnes at fedoraproject.org  Wed Aug 19 02:44:46 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed, 19 Aug 2009 02:44:46 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.28,1.394.2.29
Message-ID: <20090819024446.2D58A11C00D7@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27609

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Try again...



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.28
retrieving revision 1.394.2.29
diff -u -p -r1.394.2.28 -r1.394.2.29
--- evolution.spec	19 Aug 2009 01:57:17 -0000	1.394.2.28
+++ evolution.spec	19 Aug 2009 02:44:45 -0000	1.394.2.29
@@ -478,7 +478,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/evolution/%{evo_major}
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
 %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
-#%{_libexecdir}/evolution/%{evo_major}/evolution-backup
+%{_libexecdir}/evolution/%{evo_major}/evolution-backup
 %{_libexecdir}/evolution/%{evo_major}/killev
 
 # The plugin directory:



From lennart at fedoraproject.org  Wed Aug 19 02:58:53 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 19 Aug 2009 02:58:53 +0000 (UTC)
Subject: rpms/pulseaudio/devel default.pa-for-gdm, NONE, 1.1 .cvsignore, 1.38,
	1.39 pulseaudio.spec, 1.89, 1.90 sources, 1.40, 1.41
Message-ID: <20090819025853.CB81F11C00D7@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30963

Modified Files:
	.cvsignore pulseaudio.spec sources 
Added Files:
	default.pa-for-gdm 
Log Message:
New test release


--- NEW FILE default.pa-for-gdm ---
load-module module-device-restore
load-module module-card-restore
load-module module-udev-detect
load-module module-bluetooth-discover
load-module module-native-protocol-unix
load-module module-default-device-restore
load-module module-rescue-streams
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
load-module module-console-kit
load-module module-x11-xsmp
load-module module-position-event-sounds


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	5 Aug 2009 02:07:48 -0000	1.38
+++ .cvsignore	19 Aug 2009 02:58:53 -0000	1.39
@@ -1 +1 @@
-pulseaudio-0.9.16-test4.tar.gz
+pulseaudio-0.9.16-test5.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- pulseaudio.spec	5 Aug 2009 02:07:48 -0000	1.89
+++ pulseaudio.spec	19 Aug 2009 02:58:53 -0000	1.90
@@ -1,10 +1,11 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        5.test4%{?dist}
+Release:        6.test5%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
-Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test4.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test5.tar.gz
+Source1:        default.pa-for-gdm
 URL:            http://pulseaudio.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m4
@@ -44,7 +45,7 @@ BuildRequires:  libudev-devel >= 143
 Obsoletes:      pulseaudio-devel
 Obsoletes:      pulseaudio-core-libs
 Provides:       pulseaudio-core-libs
-Requires:       udev >= 143
+Requires:       udev >= 145-3
 Requires:       rtkit
 Requires:	kernel >= 2.6.30
 
@@ -185,11 +186,24 @@ Requires:       %{name}-libs = %{version
 %description utils
 This package contains command line utilities for the PulseAudio sound server.
 
+%package gdm-hooks
+Summary:	PulseAudio GDM integration
+License:	LGPLv2+
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}-%{release}
+Requires:	gdm >= 1:2.22.0
+Requires:	pulseaudio-module-bluetooth
+Requires:	pulseaudio-module-x11
+
+%description gdm-hooks
+This package contains GDM integration hooks for the PulseAudio sound server.
+
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.16-test4
+%setup -q -T -b0 -n pulseaudio-0.9.16-test5
 
 %build
 %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access --disable-hal
+# we really should preopen here --preopen-mods=module-udev-detect.la, --force-preopen
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 make doxygen
 
@@ -212,6 +226,8 @@ touch -r man/default.pa.5.xml.in $RPM_BU
 touch -r man/pulse-client.conf.5.xml.in $RPM_BUILD_ROOT%{_mandir}/man5/pulse-client.conf.5
 touch -r man/pulse-daemon.conf.5.xml.in $RPM_BUILD_ROOT%{_mandir}/man5/pulse-daemon.conf.5
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/pulse
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse
+cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %find_lang %{name}
 
@@ -246,6 +262,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %config(noreplace) %{_sysconfdir}/pulse/system.pa
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
 %{_bindir}/pulseaudio
 %{_libdir}/libpulsecore-%{version}.so
 %dir %{_libdir}/pulse-%{version}/
@@ -271,6 +288,7 @@ exit 0
 %{_libdir}/pulse-%{version}/modules/module-esound-protocol-unix.so
 %{_libdir}/pulse-%{version}/modules/module-esound-sink.so
 %{_libdir}/pulse-%{version}/modules/module-udev-detect.so
+%{_libdir}/pulse-%{version}/modules/module-hal-detect.so
 %{_libdir}/pulse-%{version}/modules/module-http-protocol-tcp.so
 %{_libdir}/pulse-%{version}/modules/module-http-protocol-unix.so
 %{_libdir}/pulse-%{version}/modules/module-match.so
@@ -309,9 +327,9 @@ exit 0
 %{_mandir}/man5/default.pa.5.gz
 %{_mandir}/man5/pulse-client.conf.5.gz
 %{_mandir}/man5/pulse-daemon.conf.5.gz
+/lib/udev/rules.d/90-pulseaudio.rules
 %dir %{_libexecdir}/pulse
 %attr(0700, pulse, pulse) %dir %{_localstatedir}/lib/pulse
-/lib/udev/rules.d/90-pulseaudio.rules
 
 %files esound-compat
 %defattr(-,root,root)
@@ -410,7 +428,15 @@ exit 0
 %{_mandir}/man1/padsp.1.gz
 %{_mandir}/man1/pax11publish.1.gz
 
+%files gdm-hooks
+%defattr(-,root,root)
+%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
+%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
+
 %changelog
+* Wed Aug 19 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-6.test5
+- New test release
+
 * Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-5.test4
 - New test release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	5 Aug 2009 02:07:48 -0000	1.40
+++ sources	19 Aug 2009 02:58:53 -0000	1.41
@@ -1 +1 @@
-6aff18f0840fb39fa35313f0f5e1f7bb  pulseaudio-0.9.16-test4.tar.gz
+4c3cf86f8759a5900aced24f3ecad742  pulseaudio-0.9.16-test5.tar.gz



From kyle at fedoraproject.org  Wed Aug 19 03:16:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 03:16:13 +0000 (UTC)
Subject: rpms/kernel/F-10 make-mmap_min_addr-suck-less.patch, 1.1.2.2,
	1.1.2.3
Message-ID: <20090819031613.615AF11C00D7@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1196

Modified Files:
      Tag: private-fedora-10-2_6_27
	make-mmap_min_addr-suck-less.patch 
Log Message:
oops, cap_capable doesn't take creds in 2.6.27

make-mmap_min_addr-suck-less.patch:
 include/linux/mm.h       |   15 --------------
 include/linux/security.h |   24 ++++++++++++++++++++---
 kernel/sysctl.c          |    7 +++---
 mm/Kconfig               |    6 ++---
 mm/mmap.c                |    3 --
 security/Kconfig         |   16 +++++++++++++++
 security/Makefile        |    2 -
 security/capability.c    |    9 --------
 security/commoncap.c     |   28 ++++++++++++++++++++++++++
 security/min_addr.c      |   49 +++++++++++++++++++++++++++++++++++++++++++++++
 security/selinux/hooks.c |   14 ++++++++++++-
 11 files changed, 135 insertions(+), 38 deletions(-)

Index: make-mmap_min_addr-suck-less.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/make-mmap_min_addr-suck-less.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
--- make-mmap_min_addr-suck-less.patch	19 Aug 2009 02:33:58 -0000	1.1.2.2
+++ make-mmap_min_addr-suck-less.patch	19 Aug 2009 03:16:13 -0000	1.1.2.3
@@ -71,6 +71,7 @@ Date:   Fri Jul 31 12:53:58 2009 -0400
     Signed-off-by: James Morris <jmorris at namei.org>
     (upstream 9c0d90103c7e0eb6e638e5b649e9f6d8d9c1b4b3)
 
+
 diff --git a/include/linux/mm.h b/include/linux/mm.h
 index eeb7e56..e13a1f8 100644
 --- a/include/linux/mm.h
@@ -285,10 +286,10 @@ index 2458748..1010bed 100644
  			     unsigned long prot)
  {
 diff --git a/security/commoncap.c b/security/commoncap.c
-index 378172b..c91ccfc 100644
+index 378172b..bf33ca9 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
-@@ -710,3 +710,32 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
+@@ -710,3 +710,31 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
  	return __vm_enough_memory(mm, pages, cap_sys_admin);
  }
  
@@ -313,8 +314,7 @@ index 378172b..c91ccfc 100644
 +	int ret = 0;
 +
 +	if (addr < dac_mmap_min_addr) {
-+		ret = cap_capable(current, current_cred(), CAP_SYS_RAWIO,
-+				  SECURITY_CAP_AUDIT);
++		ret = cap_capable(current, CAP_SYS_RAWIO);
 +		/* set PF_SUPERPRIV if it turns out we allow the low mmap */
 +		if (ret == 0)
 +			current->flags |= PF_SUPERPRIV;



From pkgdb at fedoraproject.org  Wed Aug 19 03:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:47:53 +0000
Subject: [pkgdb] transifex: diegobz has requested watchbugzilla
Message-ID: <20090819034753.7049010F857@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on transifex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:47:54 +0000
Subject: [pkgdb] transifex: diegobz has requested watchcommits
Message-ID: <20090819034755.194BF10F85C@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on transifex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:47:55 +0000
Subject: [pkgdb] transifex: diegobz has requested commit
Message-ID: <20090819034755.882AC10F882@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on transifex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:47:55 +0000
Subject: [pkgdb] transifex: diegobz has requested approveacls
Message-ID: <20090819034756.04C4010F889@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on transifex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:01 +0000
Subject: [pkgdb] transifex: diegobz has requested watchbugzilla
Message-ID: <20090819034805.356E510F89F@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on transifex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:00 +0000
Subject: [pkgdb] transifex: diegobz has requested watchcommits
Message-ID: <20090819034804.B0E5210F89C@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on transifex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:01 +0000
Subject: [pkgdb] transifex: diegobz has requested commit
Message-ID: <20090819034804.911C610F89A@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on transifex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:07 +0000
Subject: [pkgdb] transifex: diegobz has requested watchbugzilla
Message-ID: <20090819034808.B915F10F857@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on transifex (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:08 +0000
Subject: [pkgdb] transifex: diegobz has requested commit
Message-ID: <20090819034810.B6C7B10F8AD@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on transifex (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:08 +0000
Subject: [pkgdb] transifex: diegobz has requested watchcommits
Message-ID: <20090819034810.A213910F8A6@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on transifex (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:13 +0000
Subject: [pkgdb] transifex: diegobz has requested watchcommits
Message-ID: <20090819034813.2CFF510F8AA@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchcommits acl on transifex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:14 +0000
Subject: [pkgdb] transifex: diegobz has requested commit
Message-ID: <20090819034814.404C110F8B4@bastion2.fedora.phx.redhat.com>

diegobz has requested the commit acl on transifex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:17 +0000
Subject: [pkgdb] transifex: diegobz has requested approveacls
Message-ID: <20090819034817.EF4D610F8B9@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on transifex (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:13 +0000
Subject: [pkgdb] transifex: diegobz has requested watchbugzilla
Message-ID: <20090819034819.169B310F8BA@bastion2.fedora.phx.redhat.com>

diegobz has requested the watchbugzilla acl on transifex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:19 +0000
Subject: [pkgdb] transifex: diegobz has requested approveacls
Message-ID: <20090819034824.519B310F85A@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on transifex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 03:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 03:48:25 +0000
Subject: [pkgdb] transifex: diegobz has requested approveacls
Message-ID: <20090819034825.C55F310F865@bastion2.fedora.phx.redhat.com>

diegobz has requested the approveacls acl on transifex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From dcantrel at fedoraproject.org  Wed Aug 19 03:58:54 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 19 Aug 2009 03:58:54 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.26, 1.27 dhcpv6.spec, 1.105,
	1.106 sources, 1.26, 1.27
Message-ID: <20090819035854.1998B11C00D7@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8869

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-1
- Upgraded to dhcpv6-2.0.0-alpha2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	4 Aug 2009 04:39:15 -0000	1.26
+++ .cvsignore	19 Aug 2009 03:58:53 -0000	1.27
@@ -1 +1 @@
-dhcpv6-2.0.0-alpha1.tar.gz
+dhcpv6-2.0.0-alpha2.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- dhcpv6.spec	4 Aug 2009 22:16:24 -0000	1.105
+++ dhcpv6.spec	19 Aug 2009 03:58:53 -0000	1.106
@@ -2,12 +2,12 @@
 %define libnlver 1.1
 
 # archive version number
-%define archivever 2.0.0-alpha1
+%define archivever 2.0.0-alpha2
 
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
-Version: 2.0.0alpha1
-Release: 2%{?dist}
+Version: 2.0.0alpha2
+Release: 1%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
@@ -122,6 +122,9 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-1
+- Upgraded to dhcpv6-2.0.0-alpha2
+
 * Tue Aug 04 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha1-2
 - BuildRequires glib2-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	4 Aug 2009 04:39:15 -0000	1.26
+++ sources	19 Aug 2009 03:58:53 -0000	1.27
@@ -1 +1 @@
-4784eebc29e872adfdb69ba6303adc36  dhcpv6-2.0.0-alpha1.tar.gz
+8d0d2431ef3d416c40f2a7b9262cd4e3  dhcpv6-2.0.0-alpha2.tar.gz



From dcantrel at fedoraproject.org  Wed Aug 19 04:04:22 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 19 Aug 2009 04:04:22 +0000 (UTC)
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.106,1.107
Message-ID: <20090819040422.1C98C11C02CB@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25522

Modified Files:
	dhcpv6.spec 
Log Message:
* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-2
- Remove LICENSE from the %doc line



Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- dhcpv6.spec	19 Aug 2009 03:58:53 -0000	1.106
+++ dhcpv6.spec	19 Aug 2009 04:04:21 -0000	1.107
@@ -7,7 +7,7 @@
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
 Version: 2.0.0alpha2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
@@ -97,7 +97,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING.LIB LICENSE README TODO
+%doc AUTHORS ChangeLog COPYING.LIB README TODO
 %attr(754,root,root) %{_sbindir}/dhcp6s
 %attr(754,root,root) %{_sbindir}/dhcp6r
 %attr(755,root,root) %config %{_initrddir}/dhcp6s
@@ -122,6 +122,9 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-2
+- Remove LICENSE from the %%doc line
+
 * Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-1
 - Upgraded to dhcpv6-2.0.0-alpha2
 



From kyle at fedoraproject.org  Wed Aug 19 04:05:47 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 04:05:47 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic,1.288,1.289
Message-ID: <20090819040547.141FD11C02CB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13324

Modified Files:
	config-generic 
Log Message:
LSM_MMAP_MIN_ADDR=65536


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- config-generic	17 Aug 2009 20:10:44 -0000	1.288
+++ config-generic	19 Aug 2009 04:05:46 -0000	1.289
@@ -3335,6 +3335,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VAL
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_AUDIT=y



From kyle at fedoraproject.org  Wed Aug 19 04:06:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 04:06:02 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic,1.232,1.233
Message-ID: <20090819040602.8002C11C02CB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19572

Modified Files:
	config-generic 
Log Message:
LSM_MMAP_MIN_ADDR=65536


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- config-generic	17 Aug 2009 13:50:45 -0000	1.232
+++ config-generic	19 Aug 2009 04:06:02 -0000	1.233
@@ -3333,6 +3333,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VAL
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y



From kyle at fedoraproject.org  Wed Aug 19 04:06:32 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 04:06:32 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic,1.202.2.2,1.202.2.3
Message-ID: <20090819040632.26CFA11C02CB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28142

Modified Files:
      Tag: private-fedora-10-2_6_27
	config-generic 
Log Message:
LSM_MMAP_MIN_ADDR=65536


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.202.2.2
retrieving revision 1.202.2.3
diff -u -p -r1.202.2.2 -r1.202.2.3
--- config-generic	27 Jul 2009 21:32:16 -0000	1.202.2.2
+++ config-generic	19 Aug 2009 04:06:31 -0000	1.202.2.3
@@ -3202,6 +3202,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VAL
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y



From kyle at fedoraproject.org  Wed Aug 19 04:06:59 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 04:06:59 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic,1.286.2.1,1.286.2.2
Message-ID: <20090819040659.A374611C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29849

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	config-generic 
Log Message:
LSM_MMAP_MIN_ADDR=65536


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.286.2.1
retrieving revision 1.286.2.2
diff -u -p -r1.286.2.1 -r1.286.2.2
--- config-generic	29 Jul 2009 17:08:18 -0000	1.286.2.1
+++ config-generic	19 Aug 2009 04:06:59 -0000	1.286.2.2
@@ -3280,6 +3280,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VAL
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y



From pkgdb at fedoraproject.org  Wed Aug 19 04:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:19:27 +0000
Subject: [pkgdb] ipod-sharp ownership updated
Message-ID: <20090819041927.8B67410F85B@bastion2.fedora.phx.redhat.com>

Package ipod-sharp in Fedora devel was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipod-sharp



From pkgdb at fedoraproject.org  Wed Aug 19 04:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:19:45 +0000
Subject: [pkgdb] ipod-sharp ownership updated
Message-ID: <20090819041945.9D9AE10F85B@bastion2.fedora.phx.redhat.com>

Package ipod-sharp in Fedora 10 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipod-sharp



From pkgdb at fedoraproject.org  Wed Aug 19 04:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:19:46 +0000
Subject: [pkgdb] ipod-sharp ownership updated
Message-ID: <20090819041947.02AA410F865@bastion2.fedora.phx.redhat.com>

Package ipod-sharp in Fedora 11 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipod-sharp



From pkgdb at fedoraproject.org  Wed Aug 19 04:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:19:53 +0000
Subject: [pkgdb] libipoddevice ownership updated
Message-ID: <20090819041953.9701A10F859@bastion2.fedora.phx.redhat.com>

Package libipoddevice in Fedora devel was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libipoddevice



From pkgdb at fedoraproject.org  Wed Aug 19 04:19:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:19:57 +0000
Subject: [pkgdb] libipoddevice ownership updated
Message-ID: <20090819041957.4EF9410F882@bastion2.fedora.phx.redhat.com>

Package libipoddevice in Fedora 11 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libipoddevice



From pkgdb at fedoraproject.org  Wed Aug 19 04:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:19:59 +0000
Subject: [pkgdb] libipoddevice ownership updated
Message-ID: <20090819042000.31FBA10F888@bastion2.fedora.phx.redhat.com>

Package libipoddevice in Fedora 10 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libipoddevice



From pkgdb at fedoraproject.org  Wed Aug 19 04:20:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:20:16 +0000
Subject: [pkgdb] podsleuth ownership updated
Message-ID: <20090819042017.3065310F897@bastion2.fedora.phx.redhat.com>

Package podsleuth in Fedora devel was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/podsleuth



From pkgdb at fedoraproject.org  Wed Aug 19 04:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:20:20 +0000
Subject: [pkgdb] podsleuth ownership updated
Message-ID: <20090819042020.8693C10F865@bastion2.fedora.phx.redhat.com>

Package podsleuth in Fedora 11 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/podsleuth



From pkgdb at fedoraproject.org  Wed Aug 19 04:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:20:23 +0000
Subject: [pkgdb] podsleuth ownership updated
Message-ID: <20090819042023.42D4410F882@bastion2.fedora.phx.redhat.com>

Package podsleuth in Fedora 10 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/podsleuth



From pkgdb at fedoraproject.org  Wed Aug 19 04:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:20:52 +0000
Subject: [pkgdb] waf: salimma has requested watchbugzilla
Message-ID: <20090819042054.76D7810F865@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on waf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:20:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:20:58 +0000
Subject: [pkgdb] waf: salimma has requested commit
Message-ID: <20090819042059.B204010F888@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on waf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:06 +0000
Subject: [pkgdb] waf: salimma has requested watchcommits
Message-ID: <20090819042106.CD07810F85B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on waf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:22 +0000
Subject: [pkgdb] waf: salimma has requested watchbugzilla
Message-ID: <20090819042122.9912A10F888@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on waf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:12 +0000
Subject: [pkgdb] waf: salimma has requested approveacls
Message-ID: <20090819042112.B792010F886@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on waf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:24 +0000
Subject: [pkgdb] waf: salimma has requested watchcommits
Message-ID: <20090819042124.6047510F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on waf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:26 +0000
Subject: [pkgdb] waf: salimma has requested commit
Message-ID: <20090819042127.2208510F895@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on waf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:28 +0000
Subject: [pkgdb] waf: salimma has requested approveacls
Message-ID: <20090819042128.CCFEF10F897@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on waf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:37 +0000
Subject: [pkgdb] waf: salimma has requested watchcommits
Message-ID: <20090819042140.9E50210F8A6@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on waf (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:36 +0000
Subject: [pkgdb] waf: salimma has requested watchbugzilla
Message-ID: <20090819042146.0E18F10F8B0@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on waf (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:39 +0000
Subject: [pkgdb] waf: salimma has requested commit
Message-ID: <20090819042147.E8F9B10F8B6@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on waf (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:48 +0000
Subject: [pkgdb] waf: salimma has requested commit
Message-ID: <20090819042150.0676B10F8AA@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on waf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:50 +0000
Subject: [pkgdb] waf: salimma has requested approveacls
Message-ID: <20090819042150.C7B8D10F8B9@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on waf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:41 +0000
Subject: [pkgdb] waf: salimma has requested approveacls
Message-ID: <20090819042148.6724A10F8B8@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on waf (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:45 +0000
Subject: [pkgdb] waf: salimma has requested watchbugzilla
Message-ID: <20090819042148.3656710F865@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on waf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:21:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:21:46 +0000
Subject: [pkgdb] waf: salimma has requested watchcommits
Message-ID: <20090819042149.4577B10F888@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on waf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:33 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042233.ED72110F85B@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on waf (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:37 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042237.2C41010F895@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on waf (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:39 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042239.45D3C10F89F@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on waf (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:41 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042242.3430110F8A6@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on waf (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:54 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042254.A52E810F8BC@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on waf (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:56 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042257.637F210F8AD@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on waf (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:22:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:22:57 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042259.43E8410F8AA@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on waf (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:00 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042300.E260310F8C1@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on waf (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:06 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042306.5381E10F8C8@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on waf (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:09 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042309.957F010F8C6@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on waf (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:13 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042318.AC88A10F8B8@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on waf (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:22 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042323.1AC5910F8C9@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on waf (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:24 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042324.C1BF310F8CD@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on waf (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:26 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042326.F0E3210F8D6@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on waf (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:28 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042328.6E79610F8DA@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on waf (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:31 +0000
Subject: [pkgdb] waf had acl change status
Message-ID: <20090819042332.7A23310F8D7@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on waf (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:39 +0000
Subject: [pkgdb] waf ownership updated
Message-ID: <20090819042340.7D1BD10F85C@bastion2.fedora.phx.redhat.com>

Package waf in Fedora devel is now owned by thm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:23:54 +0000
Subject: [pkgdb] waf ownership updated
Message-ID: <20090819042356.A65BB10F882@bastion2.fedora.phx.redhat.com>

Package waf in Fedora EPEL 5 is now owned by thm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:24:01 +0000
Subject: [pkgdb] waf ownership updated
Message-ID: <20090819042406.44CF010F8ED@bastion2.fedora.phx.redhat.com>

Package waf in Fedora 10 is now owned by thm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:24:04 +0000
Subject: [pkgdb] waf ownership updated
Message-ID: <20090819042407.BF34210F8E0@bastion2.fedora.phx.redhat.com>

Package waf in Fedora 11 is now owned by thm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/waf



From pkgdb at fedoraproject.org  Wed Aug 19 04:24:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:24:25 +0000
Subject: [pkgdb] pidgin-rhythmbox ownership updated
Message-ID: <20090819042426.08BFB10F890@bastion2.fedora.phx.redhat.com>

Package pidgin-rhythmbox in Fedora devel is now owned by nosnilmot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-rhythmbox



From pkgdb at fedoraproject.org  Wed Aug 19 04:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:24:33 +0000
Subject: [pkgdb] pidgin-rhythmbox ownership updated
Message-ID: <20090819042433.B07D610F8B4@bastion2.fedora.phx.redhat.com>

Package pidgin-rhythmbox in Fedora 10 is now owned by nosnilmot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-rhythmbox



From pkgdb at fedoraproject.org  Wed Aug 19 04:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:24:38 +0000
Subject: [pkgdb] pidgin-rhythmbox ownership updated
Message-ID: <20090819042438.DC44610F8BD@bastion2.fedora.phx.redhat.com>

Package pidgin-rhythmbox in Fedora 11 is now owned by nosnilmot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-rhythmbox



From nb at fedoraproject.org  Wed Aug 19 04:25:14 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Wed, 19 Aug 2009 04:25:14 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 znc.spec, 1.11,
	1.12
Message-ID: <20090819042514.1D9DB11C00E4@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv401

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade Rawhide to ZNC 0.075 20090817svn1602



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Aug 2009 05:34:02 -0000	1.7
+++ .cvsignore	19 Aug 2009 04:25:13 -0000	1.8
@@ -1 +1 @@
-znc-0.075.20090807svn1594.tar.bz2
+znc-0.075.20090818svn1602.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 05:34:02 -0000	1.7
+++ sources	19 Aug 2009 04:25:13 -0000	1.8
@@ -1 +1 @@
-813421017497d34ca371e61bfd248410  znc-0.075.20090807svn1594.tar.bz2
+43899b05816ce74bb9da8e4e82480e15  znc-0.075.20090818svn1602.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- znc.spec	8 Aug 2009 05:34:02 -0000	1.11
+++ znc.spec	19 Aug 2009 04:25:14 -0000	1.12
@@ -1,12 +1,12 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        3.20090807svn1594%{?dist}
+Release:        4.20090818svn1602%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1594 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.20090807svn1594.tar.bz2 
+# SVN 1602 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.20090818svn1602.tar.bz2 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -67,6 +67,9 @@ modules.
 %{_includedir}/znc/
 
 %changelog
+* Tue Aug 18 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-4.20090818svn1602
+- Upgrade to svn 1602
+
 * Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-3.20090807svn1594
 - Fix source filename
 



From whot at fedoraproject.org  Wed Aug 19 04:24:54 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 19 Aug 2009 04:24:54 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xserver-1.6.99-eventtime.patch, NONE,
	1.1 xorg-x11-server.spec, 1.457, 1.458
Message-ID: <20090819042454.05EBD11C00E4@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-serv441

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-eventtime.patch 
Log Message:
* Tue Aug 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-4
- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
  screen saver activates.


xserver-1.6.99-eventtime.patch:
 window.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE xserver-1.6.99-eventtime.patch ---
>From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Mon, 17 Aug 2009 09:15:32 +0100
Subject: [PATCH] Do not reset lastDeviceEventTime when we do dixSaveScreens

When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
event time else session clients using IDLETIME will be reset.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/window.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index 32e26d9..1a645f6 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode)
 
     if (on == SCREEN_SAVER_FORCER)
     {
-	UpdateCurrentTimeIf();
-	lastDeviceEventTime = currentTime;
 	if (mode == ScreenSaverReset)
 	    what = SCREEN_SAVER_OFF;
 	else
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- xorg-x11-server.spec	17 Aug 2009 04:38:08 -0000	1.457
+++ xorg-x11-server.spec	19 Aug 2009 04:24:53 -0000	1.458
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.3
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -113,8 +113,10 @@ Patch6047: xserver-1.6.2-vboxvideo.patch
 
 # 501601, upstream, nominated for 1.6.4
 Patch6048: xserver-1.6.3-sync-conditions.patch
-# 501601, part 2.
+# 501601, part 2, upstream.
 Patch6049: xserver-1.6.99-dpms.patch
+# 501601, part 3, upstream.
+Patch6050: xserver-1.6.99-eventtime.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -532,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-4
+- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
+  screen saver activates.
+
 * Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-3
 - xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.
 



From pkgdb at fedoraproject.org  Wed Aug 19 04:25:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:25:18 +0000
Subject: [pkgdb] gaim-rhythmbox ownership updated
Message-ID: <20090819042518.9396810F8BF@bastion2.fedora.phx.redhat.com>

Package gaim-rhythmbox in Fedora devel was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-rhythmbox



From pkgdb at fedoraproject.org  Wed Aug 19 04:25:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:25:18 +0000
Subject: [pkgdb] gaim-rhythmbox (un)retirement
Message-ID: <20090819042519.69E2B10F8C2@bastion2.fedora.phx.redhat.com>

Package gaim-rhythmbox in Fedora devel has been retired by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-rhythmbox



From pkgdb at fedoraproject.org  Wed Aug 19 04:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:25:30 +0000
Subject: [pkgdb] gaim-rhythmbox ownership updated
Message-ID: <20090819042533.9270910F8A2@bastion2.fedora.phx.redhat.com>

Package gaim-rhythmbox in Fedora 10 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-rhythmbox



From pkgdb at fedoraproject.org  Wed Aug 19 04:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:25:30 +0000
Subject: [pkgdb] gaim-rhythmbox (un)retirement
Message-ID: <20090819042535.9EB7710F8C7@bastion2.fedora.phx.redhat.com>

Package gaim-rhythmbox in Fedora 10 has been retired by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-rhythmbox



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:13 +0000
Subject: [pkgdb] banshee: salimma has requested watchbugzilla
Message-ID: <20090819042713.B1EA610F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:14 +0000
Subject: [pkgdb] banshee: salimma has requested watchcommits
Message-ID: <20090819042715.1908D10F899@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:16 +0000
Subject: [pkgdb] banshee: salimma has requested commit
Message-ID: <20090819042716.9869410F89F@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:16 +0000
Subject: [pkgdb] banshee: salimma has requested approveacls
Message-ID: <20090819042717.3B5DC10F8D0@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:29 +0000
Subject: [pkgdb] banshee: salimma has requested watchbugzilla
Message-ID: <20090819042729.DFDC610F8A3@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:31 +0000
Subject: [pkgdb] banshee: salimma has requested commit
Message-ID: <20090819042731.BF30210F8A8@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:30 +0000
Subject: [pkgdb] banshee: salimma has requested watchcommits
Message-ID: <20090819042735.C3CD410F8D7@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:27:33 +0000
Subject: [pkgdb] banshee: salimma has requested approveacls
Message-ID: <20090819042736.795CB10F8D6@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:05 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042807.4C8FB10F8B4@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on banshee (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:07 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042808.9285410F8E0@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on banshee (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:07 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042808.61C4B10F8B5@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on banshee (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From tagoh at fedoraproject.org  Wed Aug 19 04:28:10 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 19 Aug 2009 04:28:10 +0000 (UTC)
Subject: rpms/w3m-el/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 w3m-el.spec,
	1.11, 1.12
Message-ID: <20090819042810.82E5011C00E4@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/w3m-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1076

Modified Files:
	.cvsignore sources w3m-el.spec 
Log Message:
* Wed Aug 19 2009 Akira TAGOH <tagoh at redhat.com> - 1.4.367-0.1.20090819cvs
- Snapshot from CVS to fix #518058.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3m-el/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 May 2005 10:52:45 -0000	1.3
+++ .cvsignore	19 Aug 2009 04:28:10 -0000	1.4
@@ -1,2 +1,3 @@
 emacs-w3m-1.4.3.tar.gz
 emacs-w3m-1.4.4.tar.gz
+emacs-w3m-1.4.367.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3m-el/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 May 2005 10:52:45 -0000	1.3
+++ sources	19 Aug 2009 04:28:10 -0000	1.4
@@ -1 +1 @@
-6e592a9c0ab22fb532ebc3bcb21a45b1  emacs-w3m-1.4.4.tar.gz
+43602bfc10c859ed1741cb1b8e7e86a8  emacs-w3m-1.4.367.tar.gz


Index: w3m-el.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3m-el/devel/w3m-el.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- w3m-el.spec	27 Jul 2009 07:01:36 -0000	1.11
+++ w3m-el.spec	19 Aug 2009 04:28:10 -0000	1.12
@@ -1,8 +1,9 @@
 %define	xemacsver	21.4.11
+%define	alphatag	20090819cvs
 
 Name:		w3m-el
-Version:	1.4.4
-Release:	9%{?dist}
+Version:	1.4.367
+Release:	0.1.%{alphatag}%{?dist}
 License:	BSD
 URL:		http://emacs-w3m.namazu.org/
 BuildArch:	noarch
@@ -72,9 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 #
 %configure --with-icondir=\$\(prefix\)/share/pixmaps/w3m-el
 make
-make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir}
+make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir} INSTALL="/usr/bin/install -p"
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir}
+make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} INSTALL="/usr/bin/install -p"
 
 make distclean
 
@@ -83,7 +84,7 @@ make distclean
 #
 %configure --with-xemacs --with-packagedir=\$\(datadir\)/xemacs/xemacs-packages --with-lispdir=\$\(datadir\)/xemacs/xemacs-packages/lisp/w3m --with-icondir=\$\(datadir\)/pixmaps/w3m-el
 make
-make install-package prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir}
+make install-package prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} INSTALL="/usr/bin/install -p"
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
 
 ## remove unpackaged files.
@@ -134,6 +135,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Wed Aug 19 2009 Akira TAGOH <tagoh at redhat.com> - 1.4.367-0.1.20090819cvs
+- Snapshot from CVS to fix #518058.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:10 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042811.1334310F8ED@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on banshee (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:11 +0000
Subject: [pkgdb] banshee ownership updated
Message-ID: <20090819042811.D3E1F10F8F0@bastion2.fedora.phx.redhat.com>

Package banshee in Fedora devel is now owned by spot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:33 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042839.416A810F902@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on banshee (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:33 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042838.5D76610F90A@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on banshee (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:36 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042838.76DCA10F90B@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on banshee (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:36 +0000
Subject: [pkgdb] banshee ownership updated
Message-ID: <20090819042839.5117A10F90C@bastion2.fedora.phx.redhat.com>

Package banshee in Fedora 11 is now owned by spot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:32 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090819042838.3BDE310F909@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on banshee (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Wed Aug 19 04:28:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 04:28:28 +0000
Subject: [pkgdb] banshee ownership updated
Message-ID: <20090819042836.1F37510F8BF@bastion2.fedora.phx.redhat.com>

Package banshee in Fedora 10 is now owned by spot

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From tagoh at fedoraproject.org  Wed Aug 19 04:30:04 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 19 Aug 2009 04:30:04 +0000 (UTC)
Subject: rpms/w3m-el/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 w3m-el.spec,
	1.10, 1.11
Message-ID: <20090819043004.5670411C0417@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/w3m-el/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1464

Modified Files:
	.cvsignore sources w3m-el.spec 
Log Message:
* Wed Aug 19 2009 Akira TAGOH <tagoh at redhat.com> - 1.4.367-0.1.20090819cvs
- Snapshot from CVS to fix #518058.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3m-el/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 May 2005 10:52:45 -0000	1.3
+++ .cvsignore	19 Aug 2009 04:30:04 -0000	1.4
@@ -1,2 +1,3 @@
 emacs-w3m-1.4.3.tar.gz
 emacs-w3m-1.4.4.tar.gz
+emacs-w3m-1.4.367.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3m-el/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 May 2005 10:52:45 -0000	1.3
+++ sources	19 Aug 2009 04:30:04 -0000	1.4
@@ -1 +1 @@
-6e592a9c0ab22fb532ebc3bcb21a45b1  emacs-w3m-1.4.4.tar.gz
+43602bfc10c859ed1741cb1b8e7e86a8  emacs-w3m-1.4.367.tar.gz


Index: w3m-el.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3m-el/F-11/w3m-el.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- w3m-el.spec	25 Feb 2009 18:03:16 -0000	1.10
+++ w3m-el.spec	19 Aug 2009 04:30:04 -0000	1.11
@@ -1,8 +1,9 @@
 %define	xemacsver	21.4.11
+%define	alphatag	20090819cvs
 
 Name:		w3m-el
-Version:	1.4.4
-Release:	8%{?dist}
+Version:	1.4.367
+Release:	0.1.%{alphatag}%{?dist}
 License:	BSD
 URL:		http://emacs-w3m.namazu.org/
 BuildArch:	noarch
@@ -72,9 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 #
 %configure --with-icondir=\$\(prefix\)/share/pixmaps/w3m-el
 make
-make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir}
+make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir} INSTALL="/usr/bin/install -p"
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir}
+make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} INSTALL="/usr/bin/install -p"
 
 make distclean
 
@@ -83,7 +84,7 @@ make distclean
 #
 %configure --with-xemacs --with-packagedir=\$\(datadir\)/xemacs/xemacs-packages --with-lispdir=\$\(datadir\)/xemacs/xemacs-packages/lisp/w3m --with-icondir=\$\(datadir\)/pixmaps/w3m-el
 make
-make install-package prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir}
+make install-package prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} INSTALL="/usr/bin/install -p"
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
 
 ## remove unpackaged files.
@@ -134,6 +135,12 @@ fi
 %{_infodir}/*
 
 %changelog
+* Wed Aug 19 2009 Akira TAGOH <tagoh at redhat.com> - 1.4.367-0.1.20090819cvs
+- Snapshot from CVS to fix #518058.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From whot at fedoraproject.org  Wed Aug 19 04:50:35 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 19 Aug 2009 04:50:35 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-eventtime.patch, NONE,
	1.1 xorg-x11-server.spec, 1.472, 1.473
Message-ID: <20090819045035.7AB6D11C0417@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4787

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-eventtime.patch 
Log Message:
* Wed Aug 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-36.20090814
- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
  screen saver activates.


xserver-1.6.99-eventtime.patch:
 window.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE xserver-1.6.99-eventtime.patch ---
>From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Mon, 17 Aug 2009 09:15:32 +0100
Subject: [PATCH] Do not reset lastDeviceEventTime when we do dixSaveScreens

When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
event time else session clients using IDLETIME will be reset.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/window.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index 32e26d9..1a645f6 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode)
 
     if (on == SCREEN_SAVER_FORCER)
     {
-	UpdateCurrentTimeIf();
-	lastDeviceEventTime = currentTime;
 	if (mode == ScreenSaverReset)
 	    what = SCREEN_SAVER_OFF;
 	else
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -p -r1.472 -r1.473
--- xorg-x11-server.spec	17 Aug 2009 03:29:47 -0000	1.472
+++ xorg-x11-server.spec	19 Aug 2009 04:50:35 -0000	1.473
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   35.%{gitdate}%{?dist}
+Release:   36.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,8 +82,10 @@ Patch6029: xserver-1.6.1-proc-cmdline.pa
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
-# dpms/idlecounter race condition. upstream soon
+# dpms/idlecounter race condition. upstream
 Patch6032: xserver-1.6.99-dpms.patch
+# screen saver/idlecounter race condition. upstream
+Patch6033: xserver-1.6.99-eventtime.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -510,6 +512,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Aug 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-36.20090814
+- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
+  screen saver activates.
+
 * Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-35.20090814
 - xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.
 



From akurtakov at fedoraproject.org  Wed Aug 19 04:58:55 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 04:58:55 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.13,1.14
Message-ID: <20090819045855.901FF11C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5876/devel

Modified Files:
	maven-surefire.spec 
Log Message:
- Don't install JPP.maven2.plugins-surefire-plugin.pom to fix conflict with maven2 2.0.4.


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- maven-surefire.spec	18 Aug 2009 18:43:59 -0000	1.13
+++ maven-surefire.spec	19 Aug 2009 04:58:55 -0000	1.14
@@ -28,10 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define gcj_support 0
-
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 %define with_maven 1
@@ -40,7 +36,7 @@
 
 Name:           maven-surefire
 Version:        2.3
-Release:        7.1%{?dist}
+Release:        7.2%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -64,9 +60,7 @@ Patch3:         maven-surefire-2.3-junit
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
 BuildRequires:  classworlds
@@ -106,12 +100,6 @@ Requires:       plexus-utils
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 Obsoletes:      maven-surefire-booter <= 0:1.5.3
 Provides:       maven-surefire-booter = %{epoch}:%{version}-%{release}
 
@@ -125,12 +113,6 @@ Requires:               maven-surefire =
 Obsoletes:              maven2-plugin-surefire <= 0:2.0.4
 Provides :              maven2-plugin-surefire = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description maven-plugin
 Maven surefire plugin for running tests via the surefire framework.
 
@@ -141,12 +123,6 @@ Requires:               maven-surefire =
 Obsoletes:              maven2-plugin-surefire-report <= 0:2.0.4
 Provides :              maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description report-maven-plugin
 Plugin for generating reports from surefire test runs.
 
@@ -159,13 +135,6 @@ Obsoletes:              maven2-plugin-su
 Provides:              maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
 #Provides:              maven-surefire-junit = 2.3.1
 
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description provider-junit
 JUnit3 provider for Maven Surefire.
 
@@ -175,12 +144,6 @@ Summary:                JUnit4 provider 
 Group:                  Development/Java
 Requires:               maven-surefire = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description provider-junit4
 JUnit4 provider for Maven Surefire.
 %endif
@@ -282,7 +245,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin-%{version}.jar
 %add_to_maven_depmap org.apache.maven.surefire maven-surefire-plugin 2.3 JPP/maven-surefire maven-plugin
 install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-maven-plugin.pom
-install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-plugin.pom
+# Do not install due to conflict with maven2-2.0.4
+#install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-plugin.pom
 
 install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin-%{version}.jar
 %add_to_maven_depmap org.apache.maven.surefire maven-surefire-report-plugin 2.3 JPP/maven-surefire report-maven-plugin
@@ -348,40 +312,15 @@ ln -s %{_javadir}/maven-surefire/maven-s
 ln -s %{_javadir}/maven-surefire/maven-surefire-report-plugin.jar \
       $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin.jar
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
-
 %update_maven_depmap
 
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
 %postun
-
 %update_maven_depmap
 
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}/maven-surefire
@@ -391,40 +330,22 @@ fi
 %{_datadir}/maven2/poms
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/api*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/booter*
-%endif
-
 %files maven-plugin
 %{_javadir}/maven-surefire/maven-plugin*
 %dir %{_datadir}/maven2/plugins
 %{_datadir}/maven2/plugins/surefire-plugin.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin*
-%endif
 
 %files report-maven-plugin
 %{_javadir}/maven-surefire/report-maven-plugin*
 %dir %{_datadir}/maven2/plugins
 %{_datadir}/maven2/plugins/surefire-report-plugin.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/report-maven-plugin*
-%endif
 
 %files provider-junit
 %{_javadir}/maven-surefire/junit[^4]*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/junit[^4]*
-%endif
 
 %if %{with_junit4}
 %files provider-junit4
 %{_javadir}/maven-surefire/junit4*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/junit4*
-%endif
 %endif
 
 %files javadoc
@@ -432,6 +353,9 @@ fi
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.2
+- Don't install JPP.maven2.plugins-surefire-plugin.pom to fix conflict with maven2 2.0.4.
+
 * Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.1
 - Update to 2.3 - sync with jpackage.
 



From mclasen at fedoraproject.org  Wed Aug 19 05:01:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 19 Aug 2009 05:01:45 +0000 (UTC)
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.66,
	1.67 gnome-icon-theme.spec, 1.104, 1.105 sources, 1.70, 1.71
Message-ID: <20090819050145.68A3D11C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6322

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
Add extra print icons



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	14 Aug 2009 22:38:47 -0000	1.66
+++ .cvsignore	19 Aug 2009 05:01:45 -0000	1.67
@@ -1 +1 @@
-gnome-icon-theme-2.27.90.tar.bz2
+gtk_print_icons.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gnome-icon-theme.spec	14 Aug 2009 22:38:47 -0000	1.104
+++ gnome-icon-theme.spec	19 Aug 2009 05:01:45 -0000	1.105
@@ -1,11 +1,12 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.27/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-5.tar.bz2
 Source2: legacy-icon-mapping.xml
 Source3: window.png
+Source4: gtk_print_icons.tar.bz2
 License: GPL+
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -56,6 +57,8 @@ tar xj -C $RPM_BUILD_ROOT/usr/share/icon
 
 cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/icons/gnome/16x16/apps
 
+tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE4}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,6 +79,9 @@ done
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Aug 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-2
+- Add gtk print icons.
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	14 Aug 2009 22:38:48 -0000	1.70
+++ sources	19 Aug 2009 05:01:45 -0000	1.71
@@ -1,2 +1,3 @@
 4abd68866f7d3763644c21c0eaf4dfea  gnome-icon-theme-2.27.90.tar.bz2
 824f011a845100714eb8a47199cf4398  gnome-icon-theme-extra-device-icons-5.tar.bz2
+3a2837cf20fc206d3a7b963661fcf4ce  gtk_print_icons.tar.bz2



From kyle at fedoraproject.org  Wed Aug 19 05:13:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 05:13:13 +0000 (UTC)
Subject: rpms/kernel/F-11
	md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch, 
	NONE, 1.1.2.1 kernel.spec, 1.1679.2.12, 1.1679.2.13
Message-ID: <20090819051313.7676411C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7993

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch 
Log Message:
add patch to fix CVE-2009-2849

md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch:
 md.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch ---
>From b7288e0c6f2ecdf49dcb14129217ca42c8949e68 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb at suse.de>
Date: Wed, 1 Jul 2009 11:14:04 +1000
Subject: md: avoid dereferencing NULL pointer when accessing suspend_* sysfs attributes.

commit b8d966efd9a46a9a35beac50cbff6e30565125ef upstream.

If we try to modify one of the md/ sysfs files
  suspend_lo or suspend_hi
when the array is not active, we dereference a NULL.
Protect against that.

Signed-off-by: NeilBrown <neilb at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

(cherry picked from commit 3c92900d9a4afb176d3de335dc0da0198660a244)
---
 drivers/md/md.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index dc85211..e2d617f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3353,7 +3353,8 @@ suspend_lo_store(mddev_t *mddev, const char *buf, size_t len)
 	char *e;
 	unsigned long long new = simple_strtoull(buf, &e, 10);
 
-	if (mddev->pers->quiesce == NULL)
+	if (mddev->pers == NULL ||
+	    mddev->pers->quiesce == NULL)
 		return -EINVAL;
 	if (buf == e || (*e && *e != '\n'))
 		return -EINVAL;
@@ -3381,7 +3382,8 @@ suspend_hi_store(mddev_t *mddev, const char *buf, size_t len)
 	char *e;
 	unsigned long long new = simple_strtoull(buf, &e, 10);
 
-	if (mddev->pers->quiesce == NULL)
+	if (mddev->pers == NULL ||
+	    mddev->pers->quiesce == NULL)
 		return -EINVAL;
 	if (buf == e || (*e && *e != '\n'))
 		return -EINVAL;
-- 
1.6.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.12
retrieving revision 1.1679.2.13
diff -u -p -r1.1679.2.12 -r1.1679.2.13
--- kernel.spec	19 Aug 2009 02:33:42 -0000	1.1679.2.12
+++ kernel.spec	19 Aug 2009 05:13:13 -0000	1.1679.2.13
@@ -825,6 +825,9 @@ Patch12010: personality-fix-per_clear_on
 # CVE-2009-2848
 Patch12020: execve-must-clear-current-clear_child_tid.patch
 
+# CVE-2009-2849
+Patch12030: md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
+
 # make gcc stop optimizing away null pointer tests
 Patch13000: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -1549,6 +1552,9 @@ ApplyPatch personality-fix-per_clear_on_
 # CVE-2009-2848
 ApplyPatch execve-must-clear-current-clear_child_tid.patch
 
+# CVE-2009-2849
+ApplyPatch md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
+
 # don't optimize out null pointer tests
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -2152,10 +2158,12 @@ fi
 # and build.
 
 %changelog
-* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-217.2.10
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - CVE-2009-2848: execve: must clear current->clear_child_tid
 - Cherry pick upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   which improve mmap_min_addr.
+- CVE-2009-2849: md: avoid dereferencing null ptr when accessing suspend
+  sysfs attributes.
 
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9
 - Fix flub in prior lirc patch update that resulted in no lirc



From kyle at fedoraproject.org  Wed Aug 19 05:13:15 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 05:13:15 +0000 (UTC)
Subject: rpms/kernel/F-10
	md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch, 
	NONE, 1.1 kernel.spec, 1.1403, 1.1404
Message-ID: <20090819051315.9A13E11C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011

Modified Files:
	kernel.spec 
Added Files:
	md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch 
Log Message:
add patch to fix CVE-2009-2849

md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch:
 md.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch ---
>From b7288e0c6f2ecdf49dcb14129217ca42c8949e68 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb at suse.de>
Date: Wed, 1 Jul 2009 11:14:04 +1000
Subject: md: avoid dereferencing NULL pointer when accessing suspend_* sysfs attributes.

commit b8d966efd9a46a9a35beac50cbff6e30565125ef upstream.

If we try to modify one of the md/ sysfs files
  suspend_lo or suspend_hi
when the array is not active, we dereference a NULL.
Protect against that.

Signed-off-by: NeilBrown <neilb at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

(cherry picked from commit 3c92900d9a4afb176d3de335dc0da0198660a244)
---
 drivers/md/md.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index dc85211..e2d617f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3353,7 +3353,8 @@ suspend_lo_store(mddev_t *mddev, const char *buf, size_t len)
 	char *e;
 	unsigned long long new = simple_strtoull(buf, &e, 10);
 
-	if (mddev->pers->quiesce == NULL)
+	if (mddev->pers == NULL ||
+	    mddev->pers->quiesce == NULL)
 		return -EINVAL;
 	if (buf == e || (*e && *e != '\n'))
 		return -EINVAL;
@@ -3381,7 +3382,8 @@ suspend_hi_store(mddev_t *mddev, const char *buf, size_t len)
 	char *e;
 	unsigned long long new = simple_strtoull(buf, &e, 10);
 
-	if (mddev->pers->quiesce == NULL)
+	if (mddev->pers == NULL ||
+	    mddev->pers->quiesce == NULL)
 		return -EINVAL;
 	if (buf == e || (*e && *e != '\n'))
 		return -EINVAL;
-- 
1.6.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1403
retrieving revision 1.1404
diff -u -p -r1.1403 -r1.1404
--- kernel.spec	19 Aug 2009 02:33:33 -0000	1.1403
+++ kernel.spec	19 Aug 2009 05:13:15 -0000	1.1404
@@ -763,6 +763,7 @@ Patch11040: add-fno-delete-null-pointer-
 Patch11060: personality-fix-per_clear_on_setid.patch
 Patch11070: execve-must-clear-current-clear_child_tid.patch
 Patch11080: make-mmap_min_addr-suck-less.patch
+Patch11090: md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
 
 %endif
 
@@ -1446,6 +1447,9 @@ ApplyPatch execve-must-clear-current-cle
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
+# CVE-2009-2849
+ApplyPatch md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -2022,10 +2026,12 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.6-102
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - CVE-2009-2848: execve: must clear current->clear_child_tid
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   to improve mmap_min_addr.
+- CVE-2009-2849: md: avoid dereferencing null ptr when accessing suspend
+  sysfs attributes.
 
 * Tue Aug 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-99
 - Intel wireless fixes from Fedora 11:



From rayvd at fedoraproject.org  Wed Aug 19 06:07:32 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Wed, 19 Aug 2009 06:07:32 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.init.d, 1.1, 1.2 syslog-ng.spec, 1.42,
	1.43
Message-ID: <20090819060732.6B7A811C00E4@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16792

Modified Files:
	syslog-ng.init.d syslog-ng.spec 
Log Message:
Fix for bz #517339


Index: syslog-ng.init.d
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- syslog-ng.init.d	24 Mar 2009 13:52:29 -0000	1.1
+++ syslog-ng.init.d	19 Aug 2009 06:07:30 -0000	1.2
@@ -67,8 +67,10 @@ stop()
 {
 	echo -n $"Stopping syslog-ng: "
 	REMOVE_COMPAT_PID=0
-	if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
-		REMOVE_COMPAT_PID=1
+	if [ -e $SYSLOGNG_PID ]; then
+		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
+			REMOVE_COMPAT_PID=1
+		fi
 	fi
 	killproc syslog-ng
 	RETVAL=$?


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- syslog-ng.spec	27 Jul 2009 05:20:17 -0000	1.42
+++ syslog-ng.spec	19 Aug 2009 06:07:30 -0000	1.43
@@ -219,8 +219,8 @@ fi
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-2
+- Init script fix (bug#517339)
 
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4



From cweyl at fedoraproject.org  Wed Aug 19 06:08:05 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 06:08:05 +0000 (UTC)
Subject: rpms/redhat-rpm-config/devel
	redhat-rpm-config-9.0.3-filtering-macros.patch, NONE,
	1.1 redhat-rpm-config.spec, 1.71, 1.72
Message-ID: <20090819060805.B970111C00E4@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/redhat-rpm-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16906

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-9.0.3-filtering-macros.patch 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-16
- add the filtering framework approved by the FPC/FESCo. (#516240)


redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

--- NEW FILE redhat-rpm-config-9.0.3-filtering-macros.patch ---
--- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
+++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
@@ -224,3 +224,37 @@
 	fi \
 	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
 )}
+
+#==============================================================================
+# ---- Generic auto req/prov filtering macros 
+#
+# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
+
+# prevent anything matching from being scanned for provides
+%filter_provides_in(P) %{expand: \
+%global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# prevent anything matching from being scanned for requires
+%filter_requires_in(P) %{expand: \
+%global __filter_req_cmd %{?__filter_req_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# filter anything matching out of the provides stream
+%filter_from_provides() %{expand: \
+%global __filter_from_prov %{?__filter_from_prov} | %{__sed} -e '%*' \
+}
+
+# filter anything matching out of the requires stream
+%filter_from_requires() %{expand: \
+%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
+}
+
+# actually set up the filtering bits 
+%filter_setup %{expand: \
+%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 "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
+%global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
+}
+


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- redhat-rpm-config.spec	13 Aug 2009 17:24:04 -0000	1.71
+++ redhat-rpm-config.spec	19 Aug 2009 06:08:05 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -15,6 +15,7 @@ Patch5: redhat-rpm-config-9.0.3-always_d
 Patch6:	redhat-rpm-config-9.0.3-xz-payload.patch
 Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch
 Patch8: redhat-rpm-config-9.0.3-brpssa-speedup.patch
+Patch9: redhat-rpm-config-9.0.3-filtering-macros.patch 
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -33,6 +34,7 @@ Red Hat specific rpm configuration files
 %patch6 -p1
 %patch7 -p5
 %patch8 -p1
+%patch9 -p1
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -45,6 +47,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-16
+- add the filtering framework approved by the FPC/FESCo. (#516240)
+
 * Thu Aug 13 2009 Adam Jackson <ajax at redhat.com> 9.0.3-15
 - redhat-rpm-config-9.0.4-brpssa-speedup.patch: When looking for static
   archives, only run file(1) on files named *.a. (#517101)



From beekhof at fedoraproject.org  Wed Aug 19 06:36:16 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed, 19 Aug 2009 06:36:16 +0000 (UTC)
Subject: rpms/heartbeat/devel .cvsignore, 1.11, 1.12 heartbeat.spec, 1.37,
	1.38 sources, 1.11, 1.12
Message-ID: <20090819063617.1C94B11C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21703

Modified Files:
	.cvsignore heartbeat.spec sources 
Log Message:
Update requires. Source most C-defines from cluster-glue to ensure build consistency.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Aug 2009 20:37:26 -0000	1.11
+++ .cvsignore	19 Aug 2009 06:36:15 -0000	1.12
@@ -1 +1 @@
-b37cbb1b036c.tar.bz2
+0daab7da36a8.tar.bz2


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- heartbeat.spec	17 Aug 2009 20:37:26 -0000	1.37
+++ heartbeat.spec	19 Aug 2009 06:36:15 -0000	1.38
@@ -2,9 +2,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 "Linux-HA-Dev-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 3
+%global specversion 4
 %global upstreamprefix Linux-HA-Dev-
-%global upstreamversion b37cbb1b036c
+%global upstreamversion 0daab7da36a8
 
 %global alphatag %{upstreamversion}.hg
 
@@ -15,7 +15,7 @@
 Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          3.0.0
-Release:          %{?alphatag:0.}3%{?alphatag:.%{alphatag}}%{?dist}
+Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -40,6 +40,7 @@ BuildRequires:    which
 BuildRequires:    cluster-glue-libs-devel
 Requires:         PyXML
 Requires:         resource-agents
+Requires:         cluster-glue-libs
 Requires(pre):    shadow-utils
 Requires(pre):    cluster-glue
 Requires(post):   /sbin/chkconfig
@@ -175,6 +176,13 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.4.0daab7da36a8.hg
+- Make use of the specversion variable
+- Add explicit dependancy on cluster-glue-libs to prevent yum from trying to use 
+  the deprecated heartbeat-{pils|stonith} packages
+- Update to upstream version 0daab7da36a8
+  + Clean up configure. Source most variables from cluster-glue to ensure build consistency
+
 * Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.3.b37cbb1b036c.hg
 - Make use of the uname/gname variables
 - Use global instead of define for variables


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Aug 2009 20:37:26 -0000	1.11
+++ sources	19 Aug 2009 06:36:15 -0000	1.12
@@ -1 +1 @@
-573d6b4a12dbf0175aecb08085358726  b37cbb1b036c.tar.bz2
+278681d62d2c39b1748ac0eb8ae234d8  0daab7da36a8.tar.bz2



From transif at fedoraproject.org  Wed Aug 19 06:45:23 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed, 19 Aug 2009 06:45:23 +0000 (UTC)
Subject: comps/po ko.po,1.24,1.25
Message-ID: <20090819064523.4BFE111C00E4@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23216/po

Modified Files:
	ko.po 
Log Message:
Sending translation for Korean


Index: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ko.po	29 Apr 2009 20:00:20 -0000	1.24
+++ ko.po	19 Aug 2009 06:45:22 -0000	1.25
@@ -1,4 +1,4 @@
-# translation of comps.HEAD.ko.po to Korean
+# translation of comps.HEAD.po to Korean
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2002 Red Hat, Inc.
 #
@@ -8,17 +8,17 @@
 # Eunju Kim <eukim at redhat.com>, 2006, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.ko\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-04-01 20:51+1000\n"
+"PO-Revision-Date: 2009-08-19 16:43+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\n"
@@ -415,36 +415,30 @@ msgstr "?????????????????? ??????"
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
-msgstr ""
-"GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
+msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:76
 #: ../comps-f10.xml.in.h:80 ../comps-f11.xml.in.h:91
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
-msgstr ""
-"GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
+msgstr "GTK+??? GNOME??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:77
 #: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:92 ../comps-el4.xml.in.h:28
 #: ../comps-el5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
-msgstr ""
-"QT??? KDE??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
+msgstr "QT??? KDE??? ????????? ?????? ??????????????? ?????????????????? ??? ???????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
+msgid "Install these tools to enable the system to print or act as a print server."
+msgstr "??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 "?????? ????????? (X) ????????? ?????????????????? ?????????????????? ??? ????????? ????????? ???????????????"
 "???."
@@ -692,8 +686,7 @@ msgstr "??????"
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:169
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????? ???????????? ????????? ???????????? ?????? ????????? ????????? ??????????????????. "
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
@@ -819,15 +812,12 @@ msgstr "Eclipse ?????? ?????? ??????"
 #: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:199
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr ""
-"??? ?????? ??????????????? ????????? ???????????? ??????, PDF ?????? ???????????? ?????? ???????????????."
+msgstr "??? ?????? ??????????????? ????????? ???????????? ??????, PDF ?????? ???????????? ?????? ???????????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:200
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
-msgstr ""
-"??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
+msgid "The packages in this group are core libraries needed to develop applications."
+msgstr "??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:201
@@ -837,21 +827,18 @@ msgstr "??? ???????????? IMAP??? SMTP ??
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:202
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ???????????? X ????????? ???????????? ?????? ???????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ???????????? ??? ?????? ?????????????????? ??? ????????? ????????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:204
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr ""
 "??? ??????????????? DHCP, Kerberos, NIS??? ?????? ????????????-?????? ????????? ???????????? ?????????"
 "???."
@@ -922,8 +909,7 @@ msgstr "??? ????????? ???????????? ?????
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
 #: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:214
 msgid "This group contains all of Red Hat's custom server configuration tools."
-msgstr ""
-"??? ???????????? Red Hat??? ????????? ?????? ?????? ?????? ????????? ?????? ???????????? ????????????."
+msgstr "??? ???????????? Red Hat??? ????????? ?????? ?????? ?????? ????????? ?????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
 #: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:215
@@ -979,15 +965,13 @@ msgstr ""
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:221
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ?????????????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:222
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ?????? ???????????? ??????????????? ?????? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
@@ -1002,8 +986,7 @@ msgstr ""
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:225
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr ""
 "??? ????????? ????????? ???????????? ????????? ????????? DNS ?????? ?????? (BIND)??? ???????????? ??? ???"
 "?????????."
@@ -1296,19 +1279,16 @@ msgid "Amazigh Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "??????????????? ??????"
+msgstr "????????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "????????? ??????"
+msgstr "???????????? ??????  "
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "?????????????????? ??????"
+msgstr "????????? ??????  "
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1319,9 +1299,8 @@ msgid "Electronic Lab"
 msgstr "?????? ?????? "
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "??????????????? ??????   "
+msgstr "????????? ??????        "
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1336,47 +1315,40 @@ msgid "Friulian Support"
 msgstr "?????????????????? ??????   "
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "???????????? ?????? "
+msgstr "?????????????????? ??????   "
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "??????????????? ??????"
+msgstr "?????????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "???????????? ??????"
+msgstr "???????????? ?????? "
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "?????????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "??????????????? ??????  "
+msgstr "????????? ??????       "
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "????????? ??????"
+msgstr "?????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "??????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "???????????? ??????"
+msgstr "????????? ??????  "
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "???????????? ??????"
+msgstr "???????????? ??????  "
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1395,14 +1367,12 @@ msgid "Online Help and Documentation"
 msgstr "????????? ????????? ??? ?????? "
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "???????????? ??????"
+msgstr "?????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "?????????????????? ??????"
+msgstr "?????????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1425,21 +1395,18 @@ msgstr ""
 "???   "
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "???????????? ??????"
+msgstr "??????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "???????????? ??????"
+msgstr "????????? ??????  "
 
 #: ../comps-f11.xml.in.h:223
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr ""
-"??? ????????? ?????? ?????????, ??????, ?????? ??? ???????????? ???????????? ?????? ???????????????.  "
+msgstr "??? ????????? ?????? ?????????, ??????, ?????? ??? ???????????? ???????????? ?????? ???????????????.  "
 
 #: ../comps-f11.xml.in.h:235
 msgid "Turkmen Support"
@@ -1498,18 +1465,15 @@ msgid "This group is a collection of net
 msgstr "??? ????????? ?????? ????????? ?????? ???????????? ?????? ???????????????.  "
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??? ????????? ???????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1517,6 +1481,6 @@ msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ????????? ????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
+



From bruno at fedoraproject.org  Wed Aug 19 06:47:16 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Wed, 19 Aug 2009 06:47:16 +0000 (UTC)
Subject: rpms/colossus/devel 4495.patch,NONE,1.1 colossus.spec,1.7,1.8
Message-ID: <20090819064716.15AE211C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23571

Modified Files:
	colossus.spec 
Added Files:
	4495.patch 
Log Message:
Fix for desert LOS bug



4495.patch:
 client/Strike.java |   13 +++++++------
 game/Battle.java   |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE 4495.patch ---
Index: trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java
===================================================================
--- trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
+++ trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
@@ -392,7 +392,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -401,7 +401,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -417,7 +417,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -430,7 +430,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -439,7 +439,7 @@
             {
                 return true;
             }
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -467,7 +467,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' || 
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }
Index: trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java
===================================================================
--- trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
+++ trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
@@ -293,7 +293,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -303,7 +303,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -320,7 +320,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -335,7 +335,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -346,7 +346,7 @@
                 return true;
             }
 
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -382,7 +382,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' ||
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- colossus.spec	17 Aug 2009 20:33:33 -0000	1.7
+++ colossus.spec	19 Aug 2009 06:47:15 -0000	1.8
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4489
 %define         revdate    20090817
 Version:        0.9.1
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,7 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +65,7 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
 
 %build
 
@@ -179,6 +181,9 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
+- Fix for desert LOS bug
+
 * Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
 - Rebase to new public release 0.9.1
 - 2 additional bug fixes



From mtasaka at fedoraproject.org  Wed Aug 19 06:49:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 19 Aug 2009 06:49:11 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.394, 1.395 jd.spec, 1.454, 1.455 sources,
	1.395, 1.396
Message-ID: <20090819064911.5222E11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24005/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- .cvsignore	16 Aug 2009 06:14:20 -0000	1.394
+++ .cvsignore	19 Aug 2009 06:49:10 -0000	1.395
@@ -1 +1 @@
-jd-2.4.2-svn3043_trunk.tgz
+jd-2.4.2-svn3047_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- jd.spec	16 Aug 2009 06:14:20 -0000	1.454
+++ jd.spec	19 Aug 2009 06:49:10 -0000	1.455
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3043_trunk
+%define         strtag        svn3047_trunk
 %define         repoid        43007
 # 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 Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3043
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3047
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- sources	16 Aug 2009 06:14:21 -0000	1.395
+++ sources	19 Aug 2009 06:49:10 -0000	1.396
@@ -1 +1 @@
-1620d352ab45129c51d457cf86a3e5eb  jd-2.4.2-svn3043_trunk.tgz
+918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz



From mtasaka at fedoraproject.org  Wed Aug 19 06:49:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 19 Aug 2009 06:49:11 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.388, 1.389 jd.spec, 1.450, 1.451 sources,
	1.389, 1.390
Message-ID: <20090819064911.7DD3611C02CB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24005/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- .cvsignore	16 Aug 2009 06:14:21 -0000	1.388
+++ .cvsignore	19 Aug 2009 06:49:11 -0000	1.389
@@ -1 +1 @@
-jd-2.4.2-svn3043_trunk.tgz
+jd-2.4.2-svn3047_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -p -r1.450 -r1.451
--- jd.spec	16 Aug 2009 06:14:21 -0000	1.450
+++ jd.spec	19 Aug 2009 06:49:11 -0000	1.451
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3043_trunk
+%define         strtag        svn3047_trunk
 %define         repoid        43007
 # 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 Aug 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3043
+* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3047
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- sources	16 Aug 2009 06:14:21 -0000	1.389
+++ sources	19 Aug 2009 06:49:11 -0000	1.390
@@ -1 +1 @@
-1620d352ab45129c51d457cf86a3e5eb  jd-2.4.2-svn3043_trunk.tgz
+918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz



From bruno at fedoraproject.org  Wed Aug 19 06:57:48 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Wed, 19 Aug 2009 06:57:48 +0000 (UTC)
Subject: rpms/colossus/devel 4495.patch,1.1,1.2
Message-ID: <20090819065748.8EBA411C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095

Modified Files:
	4495.patch 
Log Message:
Fix patch fuzz



4495.patch:
 client/Strike.java |   13 +++++++------
 game/Battle.java   |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

Index: 4495.patch
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/4495.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 4495.patch	19 Aug 2009 06:47:15 -0000	1.1
+++ 4495.patch	19 Aug 2009 06:57:48 -0000	1.2
@@ -1,5 +1,3 @@
-Index: trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java
-===================================================================
 --- trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
 +++ trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
 @@ -392,7 +392,7 @@
@@ -57,8 +55,6 @@ Index: trunk/Colossus/core/src/main/java
                  {
                      midCliff = true;
                  }
-Index: trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java
-===================================================================
 --- trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
 +++ trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
 @@ -293,7 +293,7 @@



From alexlan at fedoraproject.org  Wed Aug 19 06:59:10 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 19 Aug 2009 06:59:10 +0000 (UTC)
Subject: rpms/sqlite2/devel sqlite2.spec,1.5,1.6
Message-ID: <20090819065910.3043F11C02CB@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/sqlite2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26362/devel

Modified Files:
	sqlite2.spec 
Log Message:
* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-5
- Install tcl subpackage in correct place, thanks to hkoba for patch (#516411)
- Use new tclver define, depend on at least tcl 8.5



Index: sqlite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite2/devel/sqlite2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sqlite2.spec	27 Jul 2009 04:43:59 -0000	1.5
+++ sqlite2.spec	19 Aug 2009 06:59:10 -0000	1.6
@@ -1,6 +1,8 @@
+%define tclver 8.5
+
 Name:           sqlite2
 Version:        2.8.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Embeddable SQL engine in a C library
 Group:          System Environment/Libraries
@@ -44,7 +46,7 @@ applications using sqlite.
 %package        tcl
 Summary:        Tcl bindings for sqlite
 Group:          System Environment/Libraries
-Requires:       tcl >= 8.3.3, %{name} = %{version}-%{release}
+Requires:       tcl >= %{tclver}, %{name} = %{version}-%{release}
 Obsoletes:      sqlite-tcl < 3
 
 %description    tcl
@@ -85,6 +87,8 @@ echo 'package ifneeded sqlite 2 [list lo
 
 %makeinstall
 install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/tcl%{tclver}
+mv $DIRECTORY $RPM_BUILD_ROOT%{_libdir}/tcl%{tclver}/sqlite2
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -111,9 +115,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %{_bindir}/tclsqlite
-%{_libdir}/sqlite-%version
+%{_libdir}/tcl%{tclver}/sqlite2
 
 %changelog
+* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-5
+- Install tcl subpackage in correct place, thanks to hkoba for patch (#516411)
+- Use new tclver define, depend on at least tcl 8.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Wed Aug 19 06:59:09 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 19 Aug 2009 06:59:09 +0000 (UTC)
Subject: rpms/sqlite2/F-11 sqlite2.spec,1.4,1.5
Message-ID: <20090819065909.E3C5811C00E4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/sqlite2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26362/F-11

Modified Files:
	sqlite2.spec 
Log Message:
* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-5
- Install tcl subpackage in correct place, thanks to hkoba for patch (#516411)
- Use new tclver define, depend on at least tcl 8.5



Index: sqlite2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite2/F-11/sqlite2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sqlite2.spec	24 Mar 2009 04:14:46 -0000	1.4
+++ sqlite2.spec	19 Aug 2009 06:59:09 -0000	1.5
@@ -1,6 +1,8 @@
+%define tclver 8.5
+
 Name:           sqlite2
 Version:        2.8.17
-Release:        3%{?dist}
+Release:        5%{?dist}
 
 Summary:        Embeddable SQL engine in a C library
 Group:          System Environment/Libraries
@@ -44,7 +46,7 @@ applications using sqlite.
 %package        tcl
 Summary:        Tcl bindings for sqlite
 Group:          System Environment/Libraries
-Requires:       tcl >= 8.3.3, %{name} = %{version}-%{release}
+Requires:       tcl >= %{tclver}, %{name} = %{version}-%{release}
 Obsoletes:      sqlite-tcl < 3
 
 %description    tcl
@@ -85,6 +87,8 @@ echo 'package ifneeded sqlite 2 [list lo
 
 %makeinstall
 install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/tcl%{tclver}
+mv $DIRECTORY $RPM_BUILD_ROOT%{_libdir}/tcl%{tclver}/sqlite2
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -111,9 +115,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/tclsqlite.html
 %exclude %{_bindir}/tclsqlite
-%{_libdir}/sqlite-%version
+%{_libdir}/tcl%{tclver}/sqlite2
 
 %changelog
+* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-5
+- Install tcl subpackage in correct place, thanks to hkoba for patch (#516411)
+- Use new tclver define, depend on at least tcl 8.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.17-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 23 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.8.17-3
 - Add patches to build with new TCL and fix tests (#491726)
   thanks to D. Marlin.



From bruno at fedoraproject.org  Wed Aug 19 07:08:22 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Wed, 19 Aug 2009 07:08:22 +0000 (UTC)
Subject: rpms/colossus/devel 4495.patch,1.2,1.3
Message-ID: <20090819070822.CACE811C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27878

Modified Files:
	4495.patch 
Log Message:
Try fixing paths this time.



4495.patch:
 client/Strike.java |   13 +++++++------
 game/Battle.java   |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

Index: 4495.patch
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/4495.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 4495.patch	19 Aug 2009 06:57:48 -0000	1.2
+++ 4495.patch	19 Aug 2009 07:08:18 -0000	1.3
@@ -1,5 +1,5 @@
---- trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
-+++ trunk/Colossus/core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
+--- core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
++++ core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
 @@ -392,7 +392,7 @@
              {
                  strikerAtop = true;
@@ -55,8 +55,8 @@
                  {
                      midCliff = true;
                  }
---- trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
-+++ trunk/Colossus/core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
+--- core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
++++ core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
 @@ -293,7 +293,7 @@
              {
                  strikerAtop = true;



From alexlan at fedoraproject.org  Wed Aug 19 07:26:03 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 19 Aug 2009 07:26:03 +0000 (UTC)
Subject: rpms/Miro/F-11 Miro-2.5.2-fhs.patch, NONE, 1.1 .cvsignore, 1.19,
	1.20 Miro.spec, 1.58, 1.59 sources, 1.19,
	1.20 Miro-2.0.2-fhs.patch, 1.1,
	NONE Miro-2.0.3-disable-xine-hack.patch, 1.1, NONE
Message-ID: <20090819072603.7967511C00E4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30806

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-2.5.2-fhs.patch 
Removed Files:
	Miro-2.0.2-fhs.patch Miro-2.0.3-disable-xine-hack.patch 
Log Message:
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary
- Include new icons in files list


Miro-2.5.2-fhs.patch:
 plat/renderers/xinerenderer.py |    4 ++--
 setup.py                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE Miro-2.5.2-fhs.patch ---
diff -up Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py
--- Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig	2009-08-04 01:32:18.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-08-04 01:36:20.000000000 -0400
@@ -247,8 +247,8 @@ class AudioRenderer(Renderer):
         Renderer.on_eos(self)
 
 def movie_data_program_info(movie_path, thumbnail_path):
-    if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
-        path = resources.path('../../../lib/miro/xine_extractor')
+    if os.path.exists(resources.path('/usr/libexec/xine_extractor')):
+        path = resources.path('/usr/libexec/xine_extractor')
         return ((path, movie_path, thumbnail_path), None)
     else:
         logging.error("xine_extractor cannot be found.")
diff -up Miro-2.5.2/platform/gtk-x11/setup.py.orig Miro-2.5.2/platform/gtk-x11/setup.py
--- Miro-2.5.2/platform/gtk-x11/setup.py.orig	2009-08-04 01:32:05.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/setup.py	2009-08-04 01:35:39.000000000 -0400
@@ -673,7 +673,7 @@ data_files += [
      [os.path.join(platform_dir, 'miro.1.gz')]),
     ('/usr/share/man/man1',
      [os.path.join(platform_dir, 'miro.real.1.gz')]),
-    ('/usr/lib/miro/',
+    ('/usr/libexec//',
      [os.path.join(platform_dir, 'xine/xine_extractor')]),
 ]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Jul 2009 21:33:08 -0000	1.19
+++ .cvsignore	19 Aug 2009 07:26:02 -0000	1.20
@@ -1 +1 @@
-Miro-2.0.5.tar.gz
+Miro-2.5.2.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Miro.spec	3 Aug 2009 23:04:53 -0000	1.58
+++ Miro.spec	19 Aug 2009 07:26:02 -0000	1.59
@@ -4,7 +4,7 @@
 %define gecko_ver 1.9.1.2
 
 Name:           Miro
-Version:        2.0.5
+Version:        2.5.2
 Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 
@@ -12,9 +12,8 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
 Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
-Patch0:         %{name}-2.0.2-fhs.patch
+Patch0:         %{name}-2.5.2-fhs.patch
 Patch1:         %{name}-2.0-videodir.patch
-Patch2:         %{name}-2.0.3-disable-xine-hack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel xine-lib-devel Pyrex 
@@ -48,7 +47,6 @@ releasing bug fixes on a regular basis.
 # (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 
 %build
@@ -83,6 +81,7 @@ update-desktop-database %{_datadir}/appl
 %{_libexecdir}/xine_extractor
 %exclude %{_datadir}/miro/resources/testdata
 %{_datadir}/miro
+%{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
 %{_mandir}/man1/*
@@ -95,10 +94,22 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
-* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-3
 - Rebuild against newer gecko
 
-* Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-2
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-2
+- Rebuild against newer gecko
+
+* Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
+- Update to latest upstream (2.5.2)
+- Drop xine hack patch, now upstream
+- Rebase remaining patches to 2.5.2 where necessary
+- Include new icons in files list
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-2
 - Rebuild against newer gecko
 
 * Wed Jul  1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-1
@@ -145,7 +156,7 @@ update-desktop-database %{_datadir}/appl
 - rebuild with new openssl
 
 * Tue Dec 23 2008 Caol?n McNamara <caolanm at redhat.com> - 1.2.8-4
-- Rebuild against newer gecko 1.9.1.2
+- Rebuild against newer gecko 1.9.1
 
 * Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-3
 - Enable patch for new boost 1.37 for F-11+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Jul 2009 21:33:08 -0000	1.19
+++ sources	19 Aug 2009 07:26:02 -0000	1.20
@@ -1 +1 @@
-bb589058844b441c8f0bd0b79532ca87  Miro-2.0.5.tar.gz
+e4e6a6979949c001ab06e813db7da06f  Miro-2.5.2.tar.gz


--- Miro-2.0.2-fhs.patch DELETED ---


--- Miro-2.0.3-disable-xine-hack.patch DELETED ---



From cweyl at fedoraproject.org  Wed Aug 19 07:33:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 07:33:36 +0000 (UTC)
Subject: rpms/perl-MooseX-Getopt/devel .cvsignore, 1.6,
	1.7 perl-MooseX-Getopt.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090819073336.1D75011C00E4@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Getopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32211

Modified Files:
	.cvsignore perl-MooseX-Getopt.spec sources 
Log Message:
* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- auto-update to 0.20 (by cpan-spec-update 0.01)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- altered br on perl(Getopt::Long) (2.35 => 2.37)
- added a new req on perl(Getopt::Long) (version 2.37)
- added a new req on perl(Getopt::Long::Descriptive) (version 0)
- added a new req on perl(Moose) (version 0.56)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Apr 2009 03:47:29 -0000	1.6
+++ .cvsignore	19 Aug 2009 07:33:35 -0000	1.7
@@ -1 +1 @@
-MooseX-Getopt-0.18.tar.gz
+MooseX-Getopt-0.20.tar.gz


Index: perl-MooseX-Getopt.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-MooseX-Getopt.spec	26 Jul 2009 11:26:28 -0000	1.10
+++ perl-MooseX-Getopt.spec	19 Aug 2009 07:33:35 -0000	1.11
@@ -1,19 +1,19 @@
 Name:           perl-MooseX-Getopt
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Moose role for processing command line options
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/MooseX-Getopt/
-Source0:        http://www.cpan.org/modules/by-module/MooseX/MooseX-Getopt-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MooseX-Getopt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(Getopt::Long::Descriptive)
 # 2.35 is what we have in F-8 perl -- tests all pass
-BuildRequires:  perl(Getopt::Long)              >= 2.35
+BuildRequires:  perl(Getopt::Long)              >= 2.37
 BuildRequires:  perl(Moose)                     >= 0.56
 
 # tests...
@@ -25,8 +25,13 @@ BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
 
+### auto-added reqs!
+Requires:       perl(Getopt::Long) >= 2.37
+Requires:       perl(Getopt::Long::Descriptive)
+Requires:       perl(Moose) >= 0.56
+
 %description
-This is a Moose role which provides an alternate constructor for creating 
+This is a Moose role which provides an alternate constructor for creating
 objects using parameters passed in from the command line.
 
 %prep
@@ -61,6 +66,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
+- auto-update to 0.20 (by cpan-spec-update 0.01)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- altered br on perl(Getopt::Long) (2.35 => 2.37)
+- added a new req on perl(Getopt::Long) (version 2.37)
+- added a new req on perl(Getopt::Long::Descriptive) (version 0)
+- added a new req on perl(Moose) (version 0.56)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Getopt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Apr 2009 03:47:29 -0000	1.6
+++ sources	19 Aug 2009 07:33:35 -0000	1.7
@@ -1 +1 @@
-10dff3c6b5c5dfb3f1dafed05229437c  MooseX-Getopt-0.18.tar.gz
+ff4321b78f1d26cef3a18af4c5f18057  MooseX-Getopt-0.20.tar.gz



From cweyl at fedoraproject.org  Wed Aug 19 07:33:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 07:33:36 +0000 (UTC)
Subject: rpms/perl-MooseX-App-Cmd/devel .cvsignore, 1.2,
	1.3 perl-MooseX-App-Cmd.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090819073336.CAB2911C02CB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32227

Modified Files:
	.cvsignore perl-MooseX-App-Cmd.spec sources 
Log Message:
* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- auto-update to 0.05 (by cpan-spec-update 0.01)
- altered br on perl(Moose) (0 => 0.86)
- altered br on perl(MooseX::Getopt) (0.09 => 0.18)
- added a new req on perl(Getopt::Long::Descriptive) (version 0)
- added a new req on perl(Moose) (version 0.86)
- altered req on perl(MooseX::Getopt) (0.09 => 0.18)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-App-Cmd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Dec 2008 22:17:20 -0000	1.2
+++ .cvsignore	19 Aug 2009 07:33:36 -0000	1.3
@@ -1 +1 @@
-MooseX-App-Cmd-0.04.tar.gz
+MooseX-App-Cmd-0.05.tar.gz


Index: perl-MooseX-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-App-Cmd/devel/perl-MooseX-App-Cmd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-App-Cmd.spec	26 Jul 2009 11:24:07 -0000	1.3
+++ perl-MooseX-App-Cmd.spec	19 Aug 2009 07:33:36 -0000	1.4
@@ -1,22 +1,21 @@
-
-Name:       perl-MooseX-App-Cmd 
-Version:    0.04 
-Release:    4%{?dist}
+Name:       perl-MooseX-App-Cmd
+Version:    0.05
+Release:    1%{?dist}
 # see lib/MooseX/App/Cmd.pm
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Mashes up MooseX::Getopt and App::Cmd 
-Source:     http://search.cpan.org/CPAN/authors/id/D/DM/DMAKI/MooseX-App-Cmd-%{version}.tar.gz 
+Summary:    Mashes up MooseX::Getopt and App::Cmd
+Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/MooseX-App-Cmd-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-App-Cmd
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
-BuildRequires: perl(ExtUtils::MakeMaker) 
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(App::Cmd)
 BuildRequires: perl(Getopt::Long::Descriptive)
-BuildRequires: perl(Moose)
-BuildRequires: perl(MooseX::Getopt) >= 0.09
+BuildRequires: perl(Moose) >= 0.86
+BuildRequires: perl(MooseX::Getopt) >= 0.18
 BuildRequires: perl(MooseX::ConfigFromFile)
 # testing
 BuildRequires: perl(YAML)
@@ -26,14 +25,18 @@ BuildRequires: perl(Test::use::ok)
 # we don't pick up Moose keywords automagically yet
 Requires: perl(App::Cmd)
 Requires: perl(App::Cmd::Command)
-Requires: perl(MooseX::Getopt) >= 0.09
+Requires: perl(MooseX::Getopt) >= 0.18
 Requires: perl(MooseX::ConfigFromFile)
 
+### auto-added reqs!
+Requires:       perl(Getopt::Long::Descriptive)
+Requires:       perl(Moose) >= 0.86
+
 %description
 This module marries App::Cmd with MooseX::Getopt.
 
 Use it like the App::Cmd manpage advises (especially see the
-App::Cmd::Tutorial manpage), swapping App::Cmd::Command for 
+App::Cmd::Tutorial manpage), swapping App::Cmd::Command for
 MooseX::App::Cmd::Command.
 
 Then you can write your commands as Moose classes, with the
@@ -81,7 +84,7 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -90,6 +93,14 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- auto-update to 0.05 (by cpan-spec-update 0.01)
+- altered br on perl(Moose) (0 => 0.86)
+- altered br on perl(MooseX::Getopt) (0.09 => 0.18)
+- added a new req on perl(Getopt::Long::Descriptive) (version 0)
+- added a new req on perl(Moose) (version 0.86)
+- altered req on perl(MooseX::Getopt) (0.09 => 0.18)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -105,4 +116,3 @@ rm -rf %{buildroot} 
 * Mon Oct 27 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0.1
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-App-Cmd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Dec 2008 22:17:20 -0000	1.2
+++ sources	19 Aug 2009 07:33:36 -0000	1.3
@@ -1 +1 @@
-b397bbe8cdc2d81fefbbfc0647ea7852  MooseX-App-Cmd-0.04.tar.gz
+6f0c80da54fca81e6e8a57c735e40375  MooseX-App-Cmd-0.05.tar.gz



From cweyl at fedoraproject.org  Wed Aug 19 07:37:38 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 07:37:38 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel .cvsignore, 1.6,
	1.7 perl-MooseX-Role-Parameterized.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090819073738.E6CC611C00E4@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv749

Modified Files:
	.cvsignore perl-MooseX-Role-Parameterized.spec sources 
Log Message:
* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
- auto-update to 0.10 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Jun 2009 05:15:47 -0000	1.6
+++ .cvsignore	19 Aug 2009 07:37:38 -0000	1.7
@@ -1 +1 @@
-MooseX-Role-Parameterized-0.09.tar.gz
+MooseX-Role-Parameterized-0.10.tar.gz


Index: perl-MooseX-Role-Parameterized.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/perl-MooseX-Role-Parameterized.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-MooseX-Role-Parameterized.spec	26 Jul 2009 11:30:14 -0000	1.8
+++ perl-MooseX-Role-Parameterized.spec	19 Aug 2009 07:37:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Role-Parameterized
-Version:    0.09
-Release:    3%{?dist}
+Version:    0.10
+Release:    1%{?dist}
 # see LICENSE
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10-1
+- auto-update to 0.10 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Jun 2009 05:15:47 -0000	1.6
+++ sources	19 Aug 2009 07:37:38 -0000	1.7
@@ -1 +1 @@
-96182fb33721341802bf00c9a35ba98e  MooseX-Role-Parameterized-0.09.tar.gz
+bf25ac188760bc94f9b71442392cbd79  MooseX-Role-Parameterized-0.10.tar.gz



From caolanm at fedoraproject.org  Wed Aug 19 07:40:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 19 Aug 2009 07:40:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1983,1.1984
Message-ID: <20090819074029.9BA5B11C0439@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1398

Modified Files:
	openoffice.org.spec 
Log Message:
Related: rhbz#517822 add hyphen-mr


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -p -r1.1983 -r1.1984
--- openoffice.org.spec	18 Aug 2009 07:47:08 -0000	1.1983
+++ openoffice.org.spec	19 Aug 2009 07:40:29 -0000	1.1984
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 18
-%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}
@@ -1293,7 +1293,7 @@ Provides additional assamese translation
 Summary: Marathi language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-mr
+Requires: hunspell-mr, hyphen-mr
 Requires: lohit-fonts-marathi
 Obsoletes: openoffice.org2-langpack-mr_IN < 1:3.0.0
 
@@ -4204,6 +4204,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.3
+- Related: rhbz#517822 add hyphen-mr
+
 * Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.2
 - add openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 - Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch



From jorton at fedoraproject.org  Wed Aug 19 07:59:54 2009
From: jorton at fedoraproject.org (jorton)
Date: Wed, 19 Aug 2009 07:59:54 +0000 (UTC)
Subject: rpms/neon/devel neon-0.28.6.tar.gz.asc, NONE, 1.1 .cvsignore, 1.17, 
	1.18 neon.spec, 1.51, 1.52 sources, 1.16, 1.17 upstream, 1.10,
	1.11 neon-0.28.5.tar.gz.asc, 1.1, NONE
Message-ID: <20090819075954.3657D11C00E4@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5291

Modified Files:
	.cvsignore neon.spec sources upstream 
Added Files:
	neon-0.28.6.tar.gz.asc 
Removed Files:
	neon-0.28.5.tar.gz.asc 
Log Message:
* Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
- update to 0.28.6



--- NEW FILE neon-0.28.6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkqKwb4ACgkQR/aWnQ5EzwwWCwCcC+/DJW/YwrllDVLEZHgqXn8Z
DIYAn2pkdBenN+aLULVCkce4AhD3wmsh
=diM8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	9 Jul 2009 14:40:38 -0000	1.17
+++ .cvsignore	19 Aug 2009 07:59:52 -0000	1.18
@@ -1 +1 @@
-neon-0.28.5.tar.gz
+neon-0.28.6.tar.gz


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- neon.spec	25 Jul 2009 15:56:46 -0000	1.51
+++ neon.spec	19 Aug 2009 07:59:52 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.28.5
-Release: 2%{?dist}
+Version: 0.28.6
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
+- update to 0.28.6
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	9 Jul 2009 14:40:38 -0000	1.16
+++ sources	19 Aug 2009 07:59:52 -0000	1.17
@@ -1 +1 @@
-8c160bc0e358a3b58645acbba40fe873  neon-0.28.5.tar.gz
+252578ed555552b71d15909641484951  neon-0.28.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/upstream,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- upstream	9 Jul 2009 14:40:38 -0000	1.10
+++ upstream	19 Aug 2009 07:59:52 -0000	1.11
@@ -1 +1 @@
-neon-0.28.5.tar.gz
+neon-0.28.6.tar.gz


--- neon-0.28.5.tar.gz.asc DELETED ---



From caolanm at fedoraproject.org  Wed Aug 19 07:37:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 19 Aug 2009 07:37:31 +0000 (UTC)
Subject: rpms/hyphen-sa/devel hyphen-sa.spec,1.3,1.4
Message-ID: <20090819073731.927AD11C00E4@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-sa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv705

Modified Files:
	hyphen-sa.spec 
Log Message:
Related: rhbz#517821 drop hyphen-bn alias


Index: hyphen-sa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-sa/devel/hyphen-sa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-sa.spec	25 Jul 2009 02:56:59 -0000	1.3
+++ hyphen-sa.spec	19 Aug 2009 07:37:31 -0000	1.4
@@ -2,7 +2,7 @@ Name: hyphen-sa
 Summary: Sanskrit hyphenation rules
 %define upstreamid 20090412
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/hyph-sa.tex
 Group: Applications/Text
 URL: http://tug.org/tex-hyphen
@@ -11,7 +11,6 @@ License: LPPL
 BuildArch: noarch
 BuildRequires: hyphen-devel
 Requires: hyphen
-Provides: hyphen-bn = %{version}-%{release}
 Patch0: hyphen-sa-cleantex.patch
 
 %description
@@ -34,12 +33,6 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
 cp -p hyph_sa_IN.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
 
-pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
-sa_IN_aliases="bn_IN bn_BD"
-for lang in $sa_IN_aliases; do
-        ln -s hyph_sa_IN.dic "hyph_"$lang".dic"
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -47,9 +40,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README
 %{_datadir}/hyphen/hyph_sa_IN.dic
-%{_datadir}/hyphen/hyph_bn_*.dic
 
 %changelog
+* Wed Aug 19 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090412-3
+- Related: rhbz#517821 drop hyphen-bn alias
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090412-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Wed Aug 19 07:37:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 19 Aug 2009 07:37:25 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/devel .cvsignore, 1.6,
	1.7 perl-MooseX-MethodAttributes.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090819073725.CD0CE11C00E4@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv665

Modified Files:
	.cvsignore perl-MooseX-MethodAttributes.spec sources 
Log Message:
* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- auto-update to 0.15 (by cpan-spec-update 0.01)
- added a new br on perl(MRO::Compat) (version 0)
- added a new req on perl(MRO::Compat) (version 0)
- added a new req on perl(Moose) (version 0.79)
- added a new req on perl(MooseX::Types) (version 0.06)
- added a new req on perl(namespace::clean) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jun 2009 08:30:55 -0000	1.6
+++ .cvsignore	19 Aug 2009 07:37:25 -0000	1.7
@@ -1 +1 @@
-MooseX-MethodAttributes-0.14.tar.gz
+MooseX-MethodAttributes-0.15.tar.gz


Index: perl-MooseX-MethodAttributes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/perl-MooseX-MethodAttributes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-MooseX-MethodAttributes.spec	26 Jul 2009 11:28:11 -0000	1.6
+++ perl-MooseX-MethodAttributes.spec	19 Aug 2009 07:37:25 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-MethodAttributes
-Version:    0.14
-Release:    2%{?dist}
+Version:    0.15
+Release:    1%{?dist}
 # lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -14,11 +14,18 @@ BuildArch:  noarch
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Moose) >= 0.79
 BuildRequires: perl(MooseX::Types) >= 0.06
+BuildRequires: perl(MRO::Compat)
 BuildRequires: perl(namespace::clean)
 # testing
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Exception)
 
+### auto-added reqs!
+Requires:       perl(MRO::Compat)
+Requires:       perl(Moose) >= 0.79
+Requires:       perl(MooseX::Types) >= 0.06
+Requires:       perl(namespace::clean)
+
 %description
 This module allows code attributes of methods to be introspected using
 Moose meta method objects.
@@ -53,6 +60,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
+- auto-update to 0.15 (by cpan-spec-update 0.01)
+- added a new br on perl(MRO::Compat) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+- added a new req on perl(Moose) (version 0.79)
+- added a new req on perl(MooseX::Types) (version 0.06)
+- added a new req on perl(namespace::clean) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jun 2009 08:30:55 -0000	1.6
+++ sources	19 Aug 2009 07:37:25 -0000	1.7
@@ -1 +1 @@
-a59f37947f93e9d54da849670467fbe7  MooseX-MethodAttributes-0.14.tar.gz
+c89f2e09781bae3ea17f4421d5c6097b  MooseX-MethodAttributes-0.15.tar.gz



From jorton at fedoraproject.org  Wed Aug 19 08:09:20 2009
From: jorton at fedoraproject.org (jorton)
Date: Wed, 19 Aug 2009 08:09:20 +0000 (UTC)
Subject: rpms/neon/F-11 neon.spec,1.50,1.51 sources,1.16,1.17
Message-ID: <20090819080920.5F7D011C00E4@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7132

Modified Files:
	neon.spec sources 
Log Message:
* Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
- update to 0.26.1



Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/F-11/neon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- neon.spec	10 Jul 2009 07:20:49 -0000	1.50
+++ neon.spec	19 Aug 2009 08:09:19 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.28.5
+Version: 0.28.6
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
+- update to 0.26.1
+
 * Thu Jul  9 2009 Joe Orton <jorton at redhat.com> 0.28.5-1
 - update to 0.28.5 (#502451, #491839)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	10 Jul 2009 07:20:49 -0000	1.16
+++ sources	19 Aug 2009 08:09:19 -0000	1.17
@@ -1 +1 @@
-8c160bc0e358a3b58645acbba40fe873  neon-0.28.5.tar.gz
+252578ed555552b71d15909641484951  neon-0.28.6.tar.gz



From bruno at fedoraproject.org  Wed Aug 19 08:15:20 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Wed, 19 Aug 2009 08:15:20 +0000 (UTC)
Subject: rpms/colossus/F-10 4495.patch,NONE,1.1 colossus.spec,1.4,1.5
Message-ID: <20090819081520.6598411C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8178

Modified Files:
	colossus.spec 
Added Files:
	4495.patch 
Log Message:
Desert LOS bug fix



4495.patch:
 client/Strike.java |   13 +++++++------
 game/Battle.java   |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE 4495.patch ---
--- core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
+++ core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
@@ -392,7 +392,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -401,7 +401,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -417,7 +417,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -430,7 +430,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -439,7 +439,7 @@
             {
                 return true;
             }
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -467,7 +467,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' || 
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }
--- core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
+++ core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
@@ -293,7 +293,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -303,7 +303,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -320,7 +320,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -335,7 +335,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -346,7 +346,7 @@
                 return true;
             }
 
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -382,7 +382,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' ||
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- colossus.spec	17 Aug 2009 20:37:08 -0000	1.4
+++ colossus.spec	19 Aug 2009 08:15:20 -0000	1.5
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4489
 %define         revdate    20090817
 Version:        0.9.1
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,7 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +65,7 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
 
 %build
 
@@ -179,6 +181,9 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
+- Fix for desert LOS bug
+
 * Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
 - Rebase to new public release 0.9.1
 - 2 additional bug fixes



From bruno at fedoraproject.org  Wed Aug 19 08:15:32 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Wed, 19 Aug 2009 08:15:32 +0000 (UTC)
Subject: rpms/colossus/F-11 4495.patch,NONE,1.1 colossus.spec,1.4,1.5
Message-ID: <20090819081532.7226711C00E4@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8247

Modified Files:
	colossus.spec 
Added Files:
	4495.patch 
Log Message:
Desert LOS bug fix



4495.patch:
 client/Strike.java |   13 +++++++------
 game/Battle.java   |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE 4495.patch ---
--- core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4494)
+++ core/src/main/java/net/sf/colossus/game/Battle.java	(revision 4495)
@@ -392,7 +392,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -401,7 +401,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -417,7 +417,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -430,7 +430,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -439,7 +439,7 @@
             {
                 return true;
             }
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -467,7 +467,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' || 
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }
--- core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4494)
+++ core/src/main/java/net/sf/colossus/client/Strike.java	(revision 4495)
@@ -293,7 +293,7 @@
             {
                 strikerAtop = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     strikerAtopCliff = true;
                 }
@@ -303,7 +303,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     midCliff = true;
                 }
@@ -320,7 +320,7 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c')
+                if (hexside == 'c' || hexside == 'd')
                 {
                     midCliff = true;
                 }
@@ -335,7 +335,7 @@
             {
                 targetAtop = true;
                 totalObstacles++;
-                if (hexside2 == 'c')
+                if (hexside2 == 'c' || hexside2 == 'd')
                 {
                     targetAtopCliff = true;
                 }
@@ -346,7 +346,7 @@
                 return true;
             }
 
-            if (midCliff && !strikerAtopCliff && !targetAtopCliff)
+            if (midCliff && (!strikerAtopCliff || !targetAtopCliff))
             {
                 return true;
             }
@@ -382,7 +382,8 @@
             {
                 midObstacle = true;
                 totalObstacles++;
-                if (hexside == 'c' || hexside2 == 'c')
+                if (hexside == 'c' || hexside2 == 'c' || hexside == 'd' ||
+                    hexside2 == 'd')
                 {
                     midCliff = true;
                 }


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- colossus.spec	17 Aug 2009 20:36:04 -0000	1.4
+++ colossus.spec	19 Aug 2009 08:15:32 -0000	1.5
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4489
 %define         revdate    20090817
 Version:        0.9.1
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,7 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:         4495.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +65,7 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
 
 %build
 
@@ -179,6 +181,9 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Wed Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-2.20090817svn4489
+- Fix for desert LOS bug
+
 * Mon Aug 17 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.1-1.20090817svn4489
 - Rebase to new public release 0.9.1
 - 2 additional bug fixes



From jorton at fedoraproject.org  Wed Aug 19 08:16:06 2009
From: jorton at fedoraproject.org (jorton)
Date: Wed, 19 Aug 2009 08:16:06 +0000 (UTC)
Subject: rpms/neon/F-10 neon.spec, 1.49, 1.50 sources, 1.15,
	1.16 neon-0.28.4-trustv1ca.patch, 1.1, NONE
Message-ID: <20090819081606.0BBE711C00E4@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8562

Modified Files:
	neon.spec sources 
Removed Files:
	neon-0.28.4-trustv1ca.patch 
Log Message:
* Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
- update to 0.28.6



Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/F-10/neon.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- neon.spec	29 May 2009 10:31:22 -0000	1.49
+++ neon.spec	19 Aug 2009 08:16:05 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.28.4
-Release: 1.1%{?dist}
+Version: 0.28.6
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
@@ -34,7 +34,6 @@ The development library for the C langua
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .trustv1ca
 
 %build
 export CC="%{__cc} -pthread"
@@ -77,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 19 2009 Joe Orton <jorton at redhat.com> 0.28.6-1
+- update to 0.28.6
+
 * Fri May 29 2009 Joe Orton <jorton at redhat.com> 0.28.4-1.1
 - trust V1 CA certs by default (#502451)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Mar 2009 13:32:48 -0000	1.15
+++ sources	19 Aug 2009 08:16:05 -0000	1.16
@@ -1 +1 @@
-6c3b94362af743d046e198e9fcbe4a85  neon-0.28.4.tar.gz
+252578ed555552b71d15909641484951  neon-0.28.6.tar.gz


--- neon-0.28.4-trustv1ca.patch DELETED ---



From caolanm at fedoraproject.org  Wed Aug 19 08:20:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 19 Aug 2009 08:20:39 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, NONE,
	1.1 openoffice.org.spec, 1.1734, 1.1735
Message-ID: <20090819082039.3DF2B11C0417@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9578/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 
Log Message:
Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch

openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
 dbaccess/source/ui/misc/WCopyTable.cxx              |    2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx     |    2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx  |    2 +-
 wizards/com/sun/star/wizards/db/DBMetaData.java     |    4 ++--
 wizards/com/sun/star/wizards/table/TableWizard.java |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch ---
diff -ru wizards.orig/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
--- wizards.orig/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:33:22.000000000 +0100
@@ -748,11 +748,11 @@
         }
     }
 
-    public boolean supportsCoreSQLGrammar()
+    public boolean supportsPrimaryKey()
     {
         try
         {
-            return xDBMetaData.supportsCoreSQLGrammar();
+            return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
         }
         catch (SQLException e)
         {
diff -ru wizards.orig/com/sun/star/wizards/table/TableWizard.java wizards/com/sun/star/wizards/table/TableWizard.java
--- wizards.orig/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:29:50.000000000 +0100
@@ -250,7 +250,7 @@
     {
         curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
         curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
-        if (this.curTableDescriptor.supportsCoreSQLGrammar())
+        if (this.curTableDescriptor.supportsPrimaryKey())
         {
             curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
         }
@@ -264,7 +264,7 @@
         boolean bTableCreated = false;
         String schemaname = curFinalizer.getSchemaName();
         String catalogname = curFinalizer.getCatalogName();
-        if (curTableDescriptor.supportsCoreSQLGrammar())
+        if (curTableDescriptor.supportsPrimaryKey())
         {
             String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
             if (keyfieldnames != null)
@@ -359,7 +359,7 @@
         int i = 0;
         i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE);
         i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE);
-        if (this.curTableDescriptor.supportsCoreSQLGrammar())
+        if (this.curTableDescriptor.supportsPrimaryKey())
         {
             i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE);
         }
diff -ru dbaccess.orig/source/ui/misc/WCopyTable.cxx dbaccess/source/ui/misc/WCopyTable.cxx
--- dbaccess.orig/source/ui/misc/WCopyTable.cxx	2009-07-30 12:58:32.000000000 +0100
+++ dbaccess/source/ui/misc/WCopyTable.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1364,7 +1364,7 @@
 		try
 		{
 			Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW );
-			bSupports = xMetaData->supportsCoreSQLGrammar();
+			bSupports = xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar();
 		}
 		catch(const Exception&)
 		{
diff -ru dbaccess.orig/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableController.cxx
--- dbaccess.orig/source/ui/tabledesign/TableController.cxx	2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TableController.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1119,7 +1119,7 @@
 	}
 	if(!bFoundPKey)
 	{
-		if(_bNew && xMetaData.is() && xMetaData->supportsCoreSQLGrammar())
+		if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
 		{
             String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
 		    String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
diff -ru dbaccess.orig/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.cxx
--- dbaccess.orig/source/ui/tabledesign/TEditControl.cxx	2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TEditControl.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1527,7 +1527,7 @@
 		Reference<XConnection> xCon = rController.getConnection();
 
 		Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
-		if(!xMetaData.is() || !xMetaData->supportsCoreSQLGrammar())
+		if(!xMetaData.is() || (!xMetaData->supportsCoreSQLGrammar() && !xMetaData->supportsMinimumSQLGrammar()))
 			return sal_False; // no primary keys allowed
 
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1734
retrieving revision 1.1735
diff -u -p -r1.1734 -r1.1735
--- openoffice.org.spec	16 Jun 2009 11:59:08 -0000	1.1734
+++ openoffice.org.spec	19 Aug 2009 08:20:38 -0000	1.1735
@@ -151,6 +151,7 @@ Patch77: openoffice.org-3.1.0.ooo101354.
 Patch78: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 Patch79: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 Patch80: workspace.pdfextfix02.patch
+Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1425,6 +1426,7 @@ tar xzf %{PATCH21}
 %patch78 -p0 -b .ooo101379.vcl.qstart.SM.patch
 %patch79 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
 %patch80 -p0 -b .workspace.pdfextfix02.patch
+%patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3800,10 +3802,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jun 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5.UNRELEASED
+* Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5.UNRELEASED
 - Resolves: rhbz#499474 soffice and .recently-used.xbel
 - Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
+- Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 * Fri May 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
 - Resolves: rhbz#494643 EMF polypolygons issue



From caolanm at fedoraproject.org  Wed Aug 19 08:20:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 19 Aug 2009 08:20:39 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, NONE,
	1.1 openoffice.org.spec, 1.1927, 1.1928
Message-ID: <20090819082039.C66FF11C0417@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-serv9578/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 
Log Message:
Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch

openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
 dbaccess/source/ui/misc/WCopyTable.cxx              |    2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx     |    2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx  |    2 +-
 wizards/com/sun/star/wizards/db/DBMetaData.java     |    4 ++--
 wizards/com/sun/star/wizards/table/TableWizard.java |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch ---
diff -ru wizards.orig/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
--- wizards.orig/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:33:22.000000000 +0100
@@ -748,11 +748,11 @@
         }
     }
 
-    public boolean supportsCoreSQLGrammar()
+    public boolean supportsPrimaryKey()
     {
         try
         {
-            return xDBMetaData.supportsCoreSQLGrammar();
+            return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
         }
         catch (SQLException e)
         {
diff -ru wizards.orig/com/sun/star/wizards/table/TableWizard.java wizards/com/sun/star/wizards/table/TableWizard.java
--- wizards.orig/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:29:50.000000000 +0100
@@ -250,7 +250,7 @@
     {
         curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
         curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
-        if (this.curTableDescriptor.supportsCoreSQLGrammar())
+        if (this.curTableDescriptor.supportsPrimaryKey())
         {
             curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
         }
@@ -264,7 +264,7 @@
         boolean bTableCreated = false;
         String schemaname = curFinalizer.getSchemaName();
         String catalogname = curFinalizer.getCatalogName();
-        if (curTableDescriptor.supportsCoreSQLGrammar())
+        if (curTableDescriptor.supportsPrimaryKey())
         {
             String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
             if (keyfieldnames != null)
@@ -359,7 +359,7 @@
         int i = 0;
         i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE);
         i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE);
-        if (this.curTableDescriptor.supportsCoreSQLGrammar())
+        if (this.curTableDescriptor.supportsPrimaryKey())
         {
             i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE);
         }
diff -ru dbaccess.orig/source/ui/misc/WCopyTable.cxx dbaccess/source/ui/misc/WCopyTable.cxx
--- dbaccess.orig/source/ui/misc/WCopyTable.cxx	2009-07-30 12:58:32.000000000 +0100
+++ dbaccess/source/ui/misc/WCopyTable.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1364,7 +1364,7 @@
 		try
 		{
 			Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW );
-			bSupports = xMetaData->supportsCoreSQLGrammar();
+			bSupports = xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar();
 		}
 		catch(const Exception&)
 		{
diff -ru dbaccess.orig/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableController.cxx
--- dbaccess.orig/source/ui/tabledesign/TableController.cxx	2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TableController.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1119,7 +1119,7 @@
 	}
 	if(!bFoundPKey)
 	{
-		if(_bNew && xMetaData.is() && xMetaData->supportsCoreSQLGrammar())
+		if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
 		{
             String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
 		    String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
diff -ru dbaccess.orig/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.cxx
--- dbaccess.orig/source/ui/tabledesign/TEditControl.cxx	2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TEditControl.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1527,7 +1527,7 @@
 		Reference<XConnection> xCon = rController.getConnection();
 
 		Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
-		if(!xMetaData.is() || !xMetaData->supportsCoreSQLGrammar())
+		if(!xMetaData.is() || (!xMetaData->supportsCoreSQLGrammar() && !xMetaData->supportsMinimumSQLGrammar()))
 			return sal_False; // no primary keys allowed
 
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1927
retrieving revision 1.1928
diff -u -p -r1.1927 -r1.1928
--- openoffice.org.spec	18 Aug 2009 07:48:29 -0000	1.1927
+++ openoffice.org.spec	19 Aug 2009 08:20:39 -0000	1.1928
@@ -152,6 +152,7 @@ Patch76: openoffice.org-3.1.0.oooXXXXX.s
 Patch77: openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch
 Patch78: workspace.os132.patch
 Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1661,7 +1662,8 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch76 -p0 -b .oooXXXXX.svx.64bit.patch
 %patch77 -p0 -b .ooo103651.canvas.nosubpixel.patch
 %patch78 -p0 -b .workspace.os132.patch
-%patch79 -p0 -b .openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+%patch79 -p0 -b .ooo104306.moverecentlyused.patch
+%patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4164,10 +4166,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+* Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
 - Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
 - add workspace.os132.patch to avoid switch html view overwrite horror
 - Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+- Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 * Thu Jul 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch



From caolanm at fedoraproject.org  Wed Aug 19 08:20:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 19 Aug 2009 08:20:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, NONE,
	1.1 openoffice.org.spec, 1.1984, 1.1985
Message-ID: <20090819082040.3436511C04D9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9578/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 
Log Message:
Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch

openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
 dbaccess/source/ui/misc/WCopyTable.cxx              |    2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx     |    2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx  |    2 +-
 wizards/com/sun/star/wizards/db/DBMetaData.java     |    4 ++--
 wizards/com/sun/star/wizards/table/TableWizard.java |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch ---
diff -ru wizards.orig/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
--- wizards.orig/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:33:22.000000000 +0100
@@ -748,11 +748,11 @@
         }
     }
 
-    public boolean supportsCoreSQLGrammar()
+    public boolean supportsPrimaryKey()
     {
         try
         {
-            return xDBMetaData.supportsCoreSQLGrammar();
+            return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
         }
         catch (SQLException e)
         {
diff -ru wizards.orig/com/sun/star/wizards/table/TableWizard.java wizards/com/sun/star/wizards/table/TableWizard.java
--- wizards.orig/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:29:50.000000000 +0100
@@ -250,7 +250,7 @@
     {
         curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
         curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
-        if (this.curTableDescriptor.supportsCoreSQLGrammar())
+        if (this.curTableDescriptor.supportsPrimaryKey())
         {
             curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
         }
@@ -264,7 +264,7 @@
         boolean bTableCreated = false;
         String schemaname = curFinalizer.getSchemaName();
         String catalogname = curFinalizer.getCatalogName();
-        if (curTableDescriptor.supportsCoreSQLGrammar())
+        if (curTableDescriptor.supportsPrimaryKey())
         {
             String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
             if (keyfieldnames != null)
@@ -359,7 +359,7 @@
         int i = 0;
         i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE);
         i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE);
-        if (this.curTableDescriptor.supportsCoreSQLGrammar())
+        if (this.curTableDescriptor.supportsPrimaryKey())
         {
             i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE);
         }
diff -ru dbaccess.orig/source/ui/misc/WCopyTable.cxx dbaccess/source/ui/misc/WCopyTable.cxx
--- dbaccess.orig/source/ui/misc/WCopyTable.cxx	2009-07-30 12:58:32.000000000 +0100
+++ dbaccess/source/ui/misc/WCopyTable.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1364,7 +1364,7 @@
 		try
 		{
 			Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW );
-			bSupports = xMetaData->supportsCoreSQLGrammar();
+			bSupports = xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar();
 		}
 		catch(const Exception&)
 		{
diff -ru dbaccess.orig/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableController.cxx
--- dbaccess.orig/source/ui/tabledesign/TableController.cxx	2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TableController.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1119,7 +1119,7 @@
 	}
 	if(!bFoundPKey)
 	{
-		if(_bNew && xMetaData.is() && xMetaData->supportsCoreSQLGrammar())
+		if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
 		{
             String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
 		    String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
diff -ru dbaccess.orig/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.cxx
--- dbaccess.orig/source/ui/tabledesign/TEditControl.cxx	2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TEditControl.cxx	2009-07-30 14:18:18.000000000 +0100
@@ -1527,7 +1527,7 @@
 		Reference<XConnection> xCon = rController.getConnection();
 
 		Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
-		if(!xMetaData.is() || !xMetaData->supportsCoreSQLGrammar())
+		if(!xMetaData.is() || (!xMetaData->supportsCoreSQLGrammar() && !xMetaData->supportsMinimumSQLGrammar()))
 			return sal_False; // no primary keys allowed
 
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -p -r1.1984 -r1.1985
--- openoffice.org.spec	19 Aug 2009 07:40:29 -0000	1.1984
+++ openoffice.org.spec	19 Aug 2009 08:20:39 -0000	1.1985
@@ -155,6 +155,7 @@ Patch77: workspace.os132.patch
 Patch78: openoffice.org-3.1.1.oooXXXXX.dmake.patch
 Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 Patch80: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1695,6 +1696,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch78 -p0 -b .oooXXXXX.dmake.patch
 %patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 %patch80 -p0 -b .ooo104306.moverecentlyused.patch
+%patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4206,6 +4208,7 @@ fi
 %changelog
 * Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.3
 - Related: rhbz#517822 add hyphen-mr
+- Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 * Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.2
 - add openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch



From beekhof at fedoraproject.org  Wed Aug 19 08:25:30 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed, 19 Aug 2009 08:25:30 +0000 (UTC)
Subject: rpms/pacemaker/devel pacemaker.spec,1.3,1.4
Message-ID: <20090819082530.6134111C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362

Modified Files:
	pacemaker.spec 
Log Message:
Add heartbeat support


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pacemaker.spec	17 Aug 2009 19:14:09 -0000	1.3
+++ pacemaker.spec	19 Aug 2009 08:25:30 -0000	1.4
@@ -1,13 +1,13 @@
 %global gname haclient
 %global uname hacluster
 %global with_ais_support	1
-%global with_heartbeat_support	0
+%global with_heartbeat_support	1
 # Enable heartbeat support once it builds against cluster-glue
 
 # 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 1
+%global specversion 2
 %global upstreamprefix Pacemaker-1-0-
 %global upstreamversion 462f1569a437
 
@@ -26,9 +26,10 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{na
 AutoReqProv:	on
 Requires(pre):	cluster-glue
 Requires:	resource-agents
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # Required for core functionality
-BuildRequires:  automake autoconf libtool pkgconfig chrpath libtool-ltdl-devel
+BuildRequires:  automake autoconf libtool pkgconfig libtool-ltdl-devel
 BuildRequires:	glib2-devel cluster-glue-libs-devel libxml2-devel libxslt-devel 
 BuildRequires:	pkgconfig python-devel gcc-c++ bzip2-devel gnutls-devel pam-devel
 
@@ -41,8 +42,8 @@ BuildRequires:	corosynclib-devel
 Requires:	corosync
 %endif
 %if %with_heartbeat_support
-BuildRequires:	heartbeat-devel
-Requires:	heartbeat
+BuildRequires:	heartbeat-devel heartbeat-libs
+Requires:	heartbeat >= 3.0.0
 %endif
 
 %description
@@ -79,6 +80,12 @@ Summary:	Pacemaker development package
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	cluster-glue-libs-devel
+%if %with_ais_support
+Requires:	corosynclib-devel
+%endif
+%if %with_heartbeat_support
+Requires:	heartbeat-devel
+%endif
 
 %description -n pacemaker-libs-devel
 Headers and shared libraries for developing tools for Pacemaker.
@@ -111,9 +118,6 @@ chmod a+x %{buildroot}/%{_datadir}/pacem
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/OCFIPraTest.py
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/extracttests.py
 
-# Remove RPATH information
-find %{buildroot} -type f -exec chrpath -d {} >/dev/null 2>&1 \;
-
 # These are not actually scripts
 find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
 find %{buildroot} -name '*.xsl' -type f -print0 | xargs -0 chmod a-x
@@ -212,6 +216,15 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Wed Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-2
+- Add versioned perl dependancy as specified by
+    https://fedoraproject.org/wiki/Packaging/Perl#Packages_that_link_to_libperl
+- No longer remove RPATH data, it prevents us finding libperl.so and no other
+  libraries were being hardcoded
+- Compile in support for heartbeat
+- Conditionally add heartbeat-devel and corosynclib-devel to the -devel requirements 
+  depending on which stacks are supported
+
 * Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-1
 - Add dependancy on resource-agents
 - Use the version of the configure macro that supplies --prefix, --libdir, etc



From beekhof at fedoraproject.org  Wed Aug 19 08:26:12 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed, 19 Aug 2009 08:26:12 +0000 (UTC)
Subject: rpms/pacemaker/devel pacemaker.spec,1.4,1.5
Message-ID: <20090819082612.E9F3B11C00E4@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11907

Modified Files:
	pacemaker.spec 
Log Message:
Fix changelog date


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pacemaker.spec	19 Aug 2009 08:25:30 -0000	1.4
+++ pacemaker.spec	19 Aug 2009 08:26:12 -0000	1.5
@@ -216,7 +216,7 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
-* Wed Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-2
+* Wed Aug 19 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-2
 - Add versioned perl dependancy as specified by
     https://fedoraproject.org/wiki/Packaging/Perl#Packages_that_link_to_libperl
 - No longer remove RPATH data, it prevents us finding libperl.so and no other



From jorton at fedoraproject.org  Wed Aug 19 08:29:10 2009
From: jorton at fedoraproject.org (jorton)
Date: Wed, 19 Aug 2009 08:29:10 +0000 (UTC)
Subject: rpms/neon/F-10 neon.spec,1.50,1.51
Message-ID: <20090819082910.39CF311C00E4@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12441

Modified Files:
	neon.spec 
Log Message:
- remove old patch



Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/F-10/neon.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- neon.spec	19 Aug 2009 08:16:05 -0000	1.50
+++ neon.spec	19 Aug 2009 08:29:10 -0000	1.51
@@ -7,7 +7,6 @@ Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
-Patch1: neon-0.28.4-trustv1ca.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig, pakchois-devel



From bagnara at fedoraproject.org  Wed Aug 19 08:32:24 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Wed, 19 Aug 2009 08:32:24 +0000 (UTC)
Subject: rpms/ppl/devel ppl.spec,1.36,1.37
Message-ID: <20090819083224.9595511C00E4@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13243

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/devel/ppl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ppl.spec	14 Aug 2009 07:46:43 -0000	1.36
+++ ppl.spec	19 Aug 2009 08:32:24 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Wed Aug 19 2009 Roberto Bagnara <bagnara at cs.unipr.it> - 0.10.2-9
+- Force rebuild.
+
 * Fri Aug 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> - 0.10.2-8
 - Force rebuild.
 



From robert at fedoraproject.org  Wed Aug 19 08:40:48 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 08:40:48 +0000 (UTC)
Subject: rpms/arj/devel arj.spec,1.9,1.10
Message-ID: <20090819084048.BC5A011C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/arj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15207

Modified Files:
	arj.spec 
Log Message:
Disabled the even with patches broken parallel builds again



Index: arj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arj/devel/arj.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- arj.spec	24 Jul 2009 17:04:04 -0000	1.9
+++ arj.spec	19 Aug 2009 08:40:48 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	Archiver for .arj files
 Name:		arj
 Version:	3.10.22
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL+
 Group:		Applications/Archiving
 URL:		http://arj.sourceforge.net/
@@ -42,8 +42,8 @@ pushd gnu
   %configure
 popd
 
-# Disable binary strippings
-make %{?_smp_mflags} ADD_LDFLAGS=""
+# No %{?_smp_mflags}, arj is not parallel build clean, no stripping
+make ADD_LDFLAGS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*arj*1.*
 
 %changelog
+* Wed Aug 19 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-10
+- Disabled the even with patches broken parallel builds again
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.22-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From vcrhonek at fedoraproject.org  Wed Aug 19 08:53:19 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 19 Aug 2009 08:53:19 +0000 (UTC)
Subject: rpms/fetchmail/F-11 fetchmail-6.3.9-CVE-2009-2666.patch, NONE,
	1.1 fetchmail.spec, 1.65, 1.66
Message-ID: <20090819085320.14BAB11C00E4@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18224

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.9-CVE-2009-2666.patch 
Log Message:
Fix SSL null terminator bypass (CVE-2009-2666)

fetchmail-6.3.9-CVE-2009-2666.patch:
 socket.c |   26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

--- NEW FILE fetchmail-6.3.9-CVE-2009-2666.patch ---
diff -up fetchmail-6.3.9/socket.c_orig fetchmail-6.3.9/socket.c
--- fetchmail-6.3.9/socket.c_orig	2009-08-06 11:34:12.000000000 +0200
+++ fetchmail-6.3.9/socket.c	2009-08-06 11:47:25.000000000 +0200
@@ -632,6 +632,13 @@ static int SSL_verify_callback( int ok_r
 				report(stderr, GT_("Bad certificate: Subject CommonName too long!\n"));
 				return (0);
 			}
+			if ((size_t)i > strlen(buf)) {
+				/* Name contains embedded NUL characters, so we complain. This is likely
+				 * a certificate spoofing attack. */
+				report(stderr, GT_("Bad certificate: Subject CommonName contains NUL, aborting!\n"));
+				return 0;
+			}
+
 			if (_ssl_server_cname != NULL) {
 				char *p1 = buf;
 				char *p2 = _ssl_server_cname;
@@ -643,12 +650,19 @@ static int SSL_verify_callback( int ok_r
 				 * first find a match among alternative names */
 				gens = X509_get_ext_d2i(x509_cert, NID_subject_alt_name, NULL, NULL);
 				if (gens) {
-					int i, r;
-					for (i = 0, r = sk_GENERAL_NAME_num(gens); i < r; ++i) {
-						const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, i);
-						if (gn->type == GEN_DNS) {
-							char *p1 = (char *)gn->d.ia5->data;
-							char *p2 = _ssl_server_cname;
+					int j, r;
+					for (j = 0, r = sk_GENERAL_NAME_num(gens); j < r; ++j) {
+						const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, j);
+ 						if (gn->type == GEN_DNS) {
+ 							char *p1 = (char *)gn->d.ia5->data;
+ 							char *p2 = _ssl_server_cname;
+							/* Name contains embedded NUL characters, so we complain. This
+							 * is likely a certificate spoofing attack. */
+							if ((size_t)gn->d.ia5->length != strlen(p1)) {
+								report(stderr, GT_("Bad certificate: Subject Alternative Name contains NUL, aborting!\n"));
+								sk_GENERAL_NAME_free(gens);
+								return 0;
+							}
 							if (outlevel >= O_VERBOSE)
 								report(stderr, "Subject Alternative Name: %s\n", p1);
 							if (*p1 == '*') {


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/F-11/fetchmail.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- fetchmail.spec	9 Jun 2009 21:03:45 -0000	1.65
+++ fetchmail.spec	19 Aug 2009 08:53:18 -0000	1.66
@@ -4,11 +4,12 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.9-CVE-2009-2666.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -47,6 +48,7 @@ need to have Python and Tk installed in 
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .cve_2009_2666
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 19 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.9-5
+- Fix SSL null terminator bypass (CVE-2009-2666)
+
 * Tue Jun 09 2009 Adam Jackson <ajax at redhat.com> 6.3.9-4
 - Rebuild to get rid of libkrb4 dependency.
 



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:03 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085603.5839D10F859@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on transifex (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:05 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085605.9D5BE10F865@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on transifex (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:08 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085608.AF09510F888@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on transifex (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:11 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085611.7980810F890@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on transifex (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:19 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085619.304C010F895@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on transifex (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:21 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085621.279F910F899@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on transifex (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:23 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085623.78E3910F89C@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on transifex (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:26 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085626.363A710F8A1@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on transifex (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:32 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085632.6748B10F85B@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on transifex (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:38 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085638.D87E210F889@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on transifex (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:35 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085638.DC34A10F8A6@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on transifex (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:41 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085641.F0E0210F8A2@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on transifex (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:46 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085646.6F17C10F8A9@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on transifex (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:49 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085649.C122B10F890@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on transifex (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:54 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085654.473BD10F8AA@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on transifex (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 08:56:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 08:56:57 +0000
Subject: [pkgdb] transifex had acl change status
Message-ID: <20090819085657.9B97610F8B2@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on transifex (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/transifex



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:16 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090016.5C47410F85C@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on python-polib (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:16 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090016.8E9CD10F865@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on python-polib (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:22 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090023.0040910F881@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on python-polib (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:27 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090028.050DC10F898@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on python-polib (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:29 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090029.C89B510F889@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on python-polib (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:33 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090033.75A2210F89C@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on python-polib (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:32 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090032.C84BF10F88B@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on python-polib (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:39 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090040.30A1A10F8A1@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on python-polib (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:50 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090050.C952610F8A5@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on python-polib (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:56 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090056.4A46910F87A@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on python-polib (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:00:56 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090056.897E010F8A6@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on python-polib (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:01:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:01:05 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090105.3412F10F8AF@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on python-polib (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:01:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:01:00 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090106.5FA6310F898@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on python-polib (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:01:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:01:07 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090107.5AB0510F8B2@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on python-polib (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:01:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:01:41 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090142.1B39810F89B@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on python-polib (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:01:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:01:42 +0000
Subject: [pkgdb] python-polib had acl change status
Message-ID: <20090819090147.907BB10F8A1@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on python-polib (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-polib



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:26 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090326.B6DF510F888@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-evolution (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:27 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090327.5340810F89A@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-evolution (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:28 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090328.A14BD10F8A0@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-evolution (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:32 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090333.1E4D410F8C6@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-evolution (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:32 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090333.1997410F8C4@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-evolution (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:34 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090334.B27B710F8D6@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-evolution (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:34 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090334.B5AF310F8D8@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-evolution (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:34 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090335.01DB710F8D9@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-evolution (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:41 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090341.2549F10F8DC@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-evolution (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:41 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090341.3E53B10F8DE@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-evolution (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:41 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090342.007C210F8E0@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-evolution (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:42 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090342.CEF4210F8ED@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-evolution (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:48 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090348.62EB010F8FC@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-evolution (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:48 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090348.59E1710F8FA@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-evolution (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:48 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090348.A72B010F8FF@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-evolution (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:03:49 +0000
Subject: [pkgdb] django-evolution had acl change status
Message-ID: <20090819090349.3C96310F902@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-evolution (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-evolution



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:38 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090438.7010610F899@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-pagination (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:38 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090438.8865210F8C0@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-pagination (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:39 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090439.5A1DA10F903@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-pagination (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:39 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090440.1BB1310F906@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-pagination (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:42 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090443.022E710F907@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-pagination (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:43 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090443.9027510F90A@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-pagination (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:44 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090444.7D77410F90D@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-pagination (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:52 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090452.D5DF010F881@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-pagination (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:44 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090444.B2C0810F910@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-pagination (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:52 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090452.E97FC10F912@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-pagination (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:54 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090454.4D43410F915@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-pagination (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:54 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090454.ADFAE10F918@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-pagination (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:58 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090458.07ED810F920@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-pagination (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:58 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090458.78E4610F923@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-pagination (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:59 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090459.18BD310F926@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-pagination (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:04:59 +0000
Subject: [pkgdb] django-pagination had acl change status
Message-ID: <20090819090459.9695410F929@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-pagination (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-pagination



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:34 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090534.9620110F8A9@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-tagging (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:34 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090535.0DBC110F8BA@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-tagging (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:35 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090536.0422C10F8C6@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-tagging (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:36 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090536.38B0210F8C8@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-tagging (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:39 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090539.57CCA10F92C@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-tagging (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:39 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090539.5AAA310F92D@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-tagging (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:40 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090540.5E44F10F930@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-tagging (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:41 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090541.1AF6110F933@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-tagging (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:47 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090548.398C910F8CE@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-tagging (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:47 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090548.31F6910F8D1@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-tagging (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:48 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090548.C525F10F936@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-tagging (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:49 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090550.0E32F10F93A@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-tagging (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:54 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090554.36BA910F93E@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-tagging (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:54 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090554.C754110F944@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-tagging (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:54 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090554.CA12110F945@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-tagging (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:05:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:05:58 +0000
Subject: [pkgdb] django-tagging had acl change status
Message-ID: <20090819090558.A058810F8D6@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-tagging (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-tagging



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:39 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090639.5D8FF10F8D7@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-notification (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:40 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090640.D3F4210F8D9@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-notification (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:40 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090640.DB22310F8DC@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-notification (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:41 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090641.D991E10F8E1@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-notification (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:44 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090644.A4F0410F8ED@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-notification (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:45 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090645.BBEB310F94B@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-notification (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:45 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090645.1945D10F949@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-notification (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:47 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090647.6855E10F94E@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-notification (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:54 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090655.11AC010F953@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-notification (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:54 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090655.0F79210F952@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-notification (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:55 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090655.82CD410F954@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-notification (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:06:55 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090655.CAFFF10F957@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-notification (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:01 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090701.3359810F959@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-notification (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:01 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090701.8BB6010F95C@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-notification (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:01 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090701.DBA2B10F95F@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-notification (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:02 +0000
Subject: [pkgdb] django-notification had acl change status
Message-ID: <20090819090702.383F210F963@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-notification (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-notification



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:57 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090758.00E1510F899@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-contact-form (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:58 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090758.3F4FB10F8B2@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-contact-form (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:58 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090758.7695C10F8B6@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-contact-form (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:03 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090803.EB81A10F8B9@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-contact-form (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:07:58 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090758.B9FE010F8BF@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-contact-form (Fedora devel) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:04 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090804.290F510F901@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-contact-form (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:04 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090804.AFB0610F969@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-contact-form (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:04 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090804.478DA10F966@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-contact-form (Fedora 10) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:13 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090813.4BBB510F904@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-contact-form (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:13 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090813.9A75910F96C@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-contact-form (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:14 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090814.751A410F96F@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-contact-form (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:17 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090817.5042210F973@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchcommits acl on django-contact-form (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:17 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090817.6AB3710F976@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-contact-form (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:17 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090817.D209010F979@bastion2.fedora.phx.redhat.com>

ivazquez has set the commit acl on django-contact-form (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:18 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090818.22E2F10F97C@bastion2.fedora.phx.redhat.com>

ivazquez has set the approveacls acl on django-contact-form (Fedora 11) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From pkgdb at fedoraproject.org  Wed Aug 19 09:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 09:08:13 +0000
Subject: [pkgdb] django-contact-form had acl change status
Message-ID: <20090819090818.5E0E910F97F@bastion2.fedora.phx.redhat.com>

ivazquez has set the watchbugzilla acl on django-contact-form (Fedora EPEL 5) to Approved for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-contact-form



From tbzatek at fedoraproject.org  Wed Aug 19 09:22:31 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 19 Aug 2009 09:22:31 +0000 (UTC)
Subject: rpms/sabayon/devel .cvsignore, 1.22, 1.23 sabayon.spec, 1.62,
	1.63 sources, 1.22, 1.23 sabayon-lockdown-save.patch, 1.2, NONE
Message-ID: <20090819092231.1C67211C00E4@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25322

Modified Files:
	.cvsignore sabayon.spec sources 
Removed Files:
	sabayon-lockdown-save.patch 
Log Message:
* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.91-1
- Update to 2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	11 Aug 2009 14:42:37 -0000	1.22
+++ .cvsignore	19 Aug 2009 09:22:30 -0000	1.23
@@ -1 +1 @@
-sabayon-2.27.0.tar.bz2
+sabayon-2.27.91.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sabayon.spec	11 Aug 2009 14:42:38 -0000	1.62
+++ sabayon.spec	19 Aug 2009 09:22:30 -0000	1.63
@@ -7,7 +7,7 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.27.0
+Version: 2.27.91
 Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
@@ -21,9 +21,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # http://bugzilla.gnome.org/show_bug.cgi?id=486218 
 Patch3:  selinux.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=551535
-Patch4:  sabayon-lockdown-save.patch
-
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -92,21 +89,11 @@ that need to be installed on the client 
 %setup -q
 
 %patch3 -p1 -b .selinux
-%patch4 -p1 -b .gconfsave
 
 
 %build
-
-sed -i s/GNOME_COMPILE_WARNINGS.*// configure.ac
-
-aclocal
-libtoolize --force
-intltoolize --force
-automake --add-missing
-autoconf
-
 %configure					\
-	--enable-consolehelper=yes		\
+	--enable-console-helper=yes		\
 	 --with-prototype-user=%{name}
 make %{?_smp_mflags}
 gzip -9 ChangeLog
@@ -282,6 +269,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.0-1
 - Update to 2.27.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	11 Aug 2009 14:42:38 -0000	1.22
+++ sources	19 Aug 2009 09:22:30 -0000	1.23
@@ -1 +1 @@
-6595e9dfeead14ad1ce73b63e62cd499  sabayon-2.27.0.tar.bz2
+3afeb3e4e352c2ab54fa38d7a0da047b  sabayon-2.27.91.tar.bz2


--- sabayon-lockdown-save.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Aug 19 09:39:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 19 Aug 2009 09:39:14 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-toolbarEditCrash.patch, NONE,
	1.1 kdelibs.spec, 1.437, 1.438
Message-ID: <20090819093914.9932A11C00E4@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29747/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-toolbarEditCrash.patch 
Log Message:
fix crash when editting toolbars (KDE bug #200815)


kdelibs-4.3.1-toolbarEditCrash.patch:
 kstandardaction.cpp |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE kdelibs-4.3.1-toolbarEditCrash.patch ---
Index: kdeui/actions/kstandardaction.cpp
===================================================================
--- kdeui/actions/kstandardaction.cpp	(revision 1013099)
+++ kdeui/actions/kstandardaction.cpp	(revision 1013100)
@@ -198,12 +198,15 @@
   }
 
   if (recvr && slot) {
-    if (id != OpenRecent)
-      QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
-    else
-      // FIXME KAction port: probably a good idea to find a cleaner way to do this
-      // Open Recent is a special case - provide the selected URL
-      QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      if (id == OpenRecent) {
+          // FIXME KAction port: probably a good idea to find a cleaner way to do this
+          // Open Recent is a special case - provide the selected URL
+          QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      } else if (id == ConfigureToolbars) { // #200815
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot, Qt::QueuedConnection);
+      } else {
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
+      }
   }
 
   KActionCollection *collection = qobject_cast<KActionCollection *>(parent);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -p -r1.437 -r1.438
--- kdelibs.spec	18 Aug 2009 12:02:42 -0000	1.437
+++ kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.438
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -92,6 +92,8 @@ Patch102: kdelibs-4.3.1-unmountfix.patch
 Patch103: kdelibs-4.3.1-copyurls.patch
 #?http://bugs.kde.org/195385
 Patch104: kdelibs-4.3.1-copyrename.patch
+#?http://bugs.kde.org/200815
+Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -231,6 +233,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
 %patch104 -p0 -b .copyrename
+%patch105 -p0 -b .toolbarEditCrash
 
 %build
 
@@ -412,6 +415,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- fix crash when editting toolbars (kdebug:200815)
+
 * Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0.5
 - fix KDE bug #19538, copy file after rename uses old file name
 



From ltinkl at fedoraproject.org  Wed Aug 19 09:39:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 19 Aug 2009 09:39:14 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-toolbarEditCrash.patch, NONE,
	1.1 kdelibs.spec, 1.491, 1.492
Message-ID: <20090819093914.BCB4311C02CB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29747/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-toolbarEditCrash.patch 
Log Message:
fix crash when editting toolbars (KDE bug #200815)


kdelibs-4.3.1-toolbarEditCrash.patch:
 kstandardaction.cpp |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE kdelibs-4.3.1-toolbarEditCrash.patch ---
Index: kdeui/actions/kstandardaction.cpp
===================================================================
--- kdeui/actions/kstandardaction.cpp	(revision 1013099)
+++ kdeui/actions/kstandardaction.cpp	(revision 1013100)
@@ -198,12 +198,15 @@
   }
 
   if (recvr && slot) {
-    if (id != OpenRecent)
-      QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
-    else
-      // FIXME KAction port: probably a good idea to find a cleaner way to do this
-      // Open Recent is a special case - provide the selected URL
-      QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      if (id == OpenRecent) {
+          // FIXME KAction port: probably a good idea to find a cleaner way to do this
+          // Open Recent is a special case - provide the selected URL
+          QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      } else if (id == ConfigureToolbars) { // #200815
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot, Qt::QueuedConnection);
+      } else {
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
+      }
   }
 
   KActionCollection *collection = qobject_cast<KActionCollection *>(parent);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -p -r1.491 -r1.492
--- kdelibs.spec	18 Aug 2009 12:02:43 -0000	1.491
+++ kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.492
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -92,6 +92,8 @@ Patch102: kdelibs-4.3.1-unmountfix.patch
 Patch103: kdelibs-4.3.1-copyurls.patch
 #?http://bugs.kde.org/195385
 Patch104: kdelibs-4.3.1-copyrename.patch
+#?http://bugs.kde.org/200815
+Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -231,6 +233,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
 %patch104 -p0 -b .copyrename
+%patch105 -p0 -b .toolbarEditCrash
 
 %build
 
@@ -412,6 +415,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- fix crash when editting toolbars (kdebug:200815)
+
 * Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0.5
 - fix KDE bug #19538, copy file after rename uses old file name
 



From ltinkl at fedoraproject.org  Wed Aug 19 09:39:15 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 19 Aug 2009 09:39:15 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-toolbarEditCrash.patch, NONE,
	1.1 kdelibs.spec, 1.504, 1.505
Message-ID: <20090819093915.0E01A11C00E4@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29747/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-toolbarEditCrash.patch 
Log Message:
fix crash when editting toolbars (KDE bug #200815)


kdelibs-4.3.1-toolbarEditCrash.patch:
 kstandardaction.cpp |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE kdelibs-4.3.1-toolbarEditCrash.patch ---
Index: kdeui/actions/kstandardaction.cpp
===================================================================
--- kdeui/actions/kstandardaction.cpp	(revision 1013099)
+++ kdeui/actions/kstandardaction.cpp	(revision 1013100)
@@ -198,12 +198,15 @@
   }
 
   if (recvr && slot) {
-    if (id != OpenRecent)
-      QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
-    else
-      // FIXME KAction port: probably a good idea to find a cleaner way to do this
-      // Open Recent is a special case - provide the selected URL
-      QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      if (id == OpenRecent) {
+          // FIXME KAction port: probably a good idea to find a cleaner way to do this
+          // Open Recent is a special case - provide the selected URL
+          QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      } else if (id == ConfigureToolbars) { // #200815
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot, Qt::QueuedConnection);
+      } else {
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
+      }
   }
 
   KActionCollection *collection = qobject_cast<KActionCollection *>(parent);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- kdelibs.spec	18 Aug 2009 10:04:20 -0000	1.504
+++ kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.505
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -92,6 +92,8 @@ Patch102: kdelibs-4.3.1-unmountfix.patch
 Patch103: kdelibs-4.3.1-copyurls.patch
 #?http://bugs.kde.org/195385
 Patch104: kdelibs-4.3.1-copyrename.patch
+#?http://bugs.kde.org/200815
+Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -231,6 +233,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
 %patch104 -p0 -b .copyrename
+%patch105 -p0 -b .toolbarEditCrash
 
 %build
 
@@ -412,6 +415,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- fix crash when editting toolbars (kdebug:200815)
+
 * Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0.5
 - fix KDE bug #19538, copy file after rename uses old file name
 



From hadess at fedoraproject.org  Wed Aug 19 10:09:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 19 Aug 2009 10:09:53 +0000 (UTC)
Subject: rpms/totem/F-11 totem.spec, 1.240,
	1.241 totem-use-pulsesink-volume.patch, 1.5, NONE
Message-ID: <20090819100953.10D0211C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4065

Modified Files:
	totem.spec 
Removed Files:
	totem-use-pulsesink-volume.patch 
Log Message:
* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-3
- Update PA volume patch, don't restore the volume when
  using Pulseaudio (#512090)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- totem.spec	31 Jul 2009 18:35:19 -0000	1.240
+++ totem.spec	19 Aug 2009 10:09:52 -0000	1.241
@@ -9,14 +9,14 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.25/totem-%{version}.tar.bz2
 Source1: totem-bin-backend-ondemand.sh
 # Will be removed when we switch to playbin2
-Patch0: totem-use-pulsesink-volume.patch
+Patch0: 0001-Set-the-PA-stream-volume-from-Totem.patch
 Patch1: 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -485,6 +485,10 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-3
+- Update PA volume patch, don't restore the volume when
+  using Pulseaudio (#512090)
+
 * Fri Jul 31 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-2
 - Fix crash when a drive has an emblemed icon (#514914)
 


--- totem-use-pulsesink-volume.patch DELETED ---



From hadess at fedoraproject.org  Wed Aug 19 10:11:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 19 Aug 2009 10:11:12 +0000 (UTC)
Subject: rpms/totem/F-11 0001-Set-the-PA-stream-volume-from-Totem.patch, NONE,
	1.1
Message-ID: <20090819101112.C2C9611C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4398

Added Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch 
Log Message:
* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-3
- Update PA volume patch, don't restore the volume when
  using Pulseaudio (#512090)


0001-Set-the-PA-stream-volume-from-Totem.patch:
 bacon-video-widget-gst-0.10.c |   98 +++++++++++++++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 20 deletions(-)

--- NEW FILE 0001-Set-the-PA-stream-volume-from-Totem.patch ---
>From c303cf285622fe8ded8e46b0a7c61a756501156d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 18 Aug 2009 17:11:18 +0100
Subject: [PATCH] Set the PA stream volume from Totem

...instead of having a separate one.

- 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
---
 src/backend/bacon-video-widget-gst-0.10.c |   97 +++++++++++++++++++++++------
 1 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index e43e068..0440777 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
   gboolean                     cursor_shown;
   gboolean                     fullscreen_mode;
   gboolean                     auto_resize;
-  gboolean                     uses_fakesink;
+  gboolean                     uses_audio_fakesink;
+  GstElement                  *pulse_audio_sink;
+  gdouble                      volume;
   
   gint                         video_width; /* Movie width */
   gint                         video_height; /* Movie height */
@@ -1105,6 +1107,7 @@ bacon_video_widget_init (BaconVideoWidget * bvw)
   priv->audiotags = NULL;
   priv->videotags = NULL;
   priv->zoom = 100;
+  priv->volume = -1.0;
 
   priv->lock = g_mutex_new ();
 
@@ -1879,6 +1882,11 @@ bacon_video_widget_finalize (GObject * object)
   g_free (bvw->priv->vis_element_name);
   bvw->priv->vis_element_name = NULL;
 
+  if (bvw->priv->pulse_audio_sink) {
+    g_object_unref (bvw->priv->pulse_audio_sink);
+    bvw->priv->pulse_audio_sink = NULL;
+  }
+
   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,
       bacon_video_widget_get_show_cursor (bvw));
       break;
     case PROP_VOLUME:
-      g_value_set_double (value, bacon_video_widget_get_volume (bvw));
+      g_value_set_double (value, bvw->priv->volume);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -3133,7 +3141,7 @@ bacon_video_widget_can_set_volume (BaconVideoWidget * bvw)
   if (bvw->priv->speakersetup == BVW_AUDIO_SOUND_AC3PASSTHRU)
     return FALSE;
 
-  return !bvw->priv->uses_fakesink;
+  return !bvw->priv->uses_audio_fakesink;
 }
 
 void
@@ -3142,11 +3150,32 @@ 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));
 
+  if (bvw->priv->volume < 0.0 && bvw->priv->pulse_audio_sink != NULL) {
+    bvw->priv->volume = volume;
+    return;
+  }
+
   if (bacon_video_widget_can_set_volume (bvw) != FALSE)
   {
     volume = CLAMP (volume, 0.0, 1.0);
-    g_object_set (bvw->priv->play, "volume",
-	          (gdouble) volume, NULL);
+    if (bvw->priv->pulse_audio_sink) {
+      GstState cur_state;
+
+      gst_element_get_state (bvw->priv->pulse_audio_sink, &cur_state, NULL, 0);
+      if (cur_state == GST_STATE_READY || cur_state == GST_STATE_PLAYING)
+      {
+	gdouble new_vol;
+	g_object_set (bvw->priv->pulse_audio_sink, "volume",
+		      (gdouble) volume, NULL);
+
+        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
+      }
+    } else {
+      g_object_set (bvw->priv->play, "volume",
+		    (gdouble) volume, NULL);
+    }
+
+    bvw->priv->volume = volume;
     g_object_notify (G_OBJECT (bvw), "volume");
   }
 }
@@ -3154,14 +3183,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
 double
 bacon_video_widget_get_volume (BaconVideoWidget * bvw)
 {
-  double vol;
-
   g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
   g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
 
-  g_object_get (G_OBJECT (bvw->priv->play), "volume", &vol, NULL);
-
-  return vol;
+  return bvw->priv->volume;
 }
 
 void
@@ -4940,6 +4965,27 @@ got_new_video_sink_bin_element (GstBin *video_sink, GstElement *element,
   g_mutex_unlock (bvw->priv->lock);
 }
 
+static gboolean
+notify_volume_idle_cb (BaconVideoWidget *bvw)
+{
+  gdouble vol;
+
+  g_object_get (G_OBJECT (bvw->priv->pulse_audio_sink), "volume", &vol, NULL);
+  bvw->priv->volume = vol;
+
+  g_object_notify (G_OBJECT (bvw), "volume");
+
+  return FALSE;
+}
+
+static void
+notify_volume_cb (GObject             *object,
+		  GParamSpec          *pspec,
+		  BaconVideoWidget    *bvw)
+{
+  g_idle_add ((GSourceFunc) notify_volume_idle_cb, bvw);
+}
+
 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,
       cb_gconf, bvw, NULL, NULL);
 
   if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
-    audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
+    audio_sink = gst_element_factory_make ("pulsesink", "audio-sink");
     if (audio_sink == NULL) {
-      g_warning ("Could not create element 'gconfaudiosink'");
-      /* Try to fallback on autoaudiosink */
-      audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
-    } else {
-      /* set the profile property on the gconfaudiosink to "music and movies" */
-      if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "profile"))
-        g_object_set (G_OBJECT (audio_sink), "profile", 1, NULL);
+      audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
+      if (audio_sink == NULL) {
+	g_warning ("Could not create element 'gconfaudiosink'");
+	/* Try to fallback on autoaudiosink */
+	audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
+      } else {
+	/* set the profile property on the gconfaudiosink to "music and movies" */
+	if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "profile"))
+	  g_object_set (G_OBJECT (audio_sink), "profile", 1, NULL);
+      }
     }
   } else {
     audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
@@ -5160,9 +5209,19 @@ 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");
-      bvw->priv->uses_fakesink = TRUE;
+      bvw->priv->uses_audio_fakesink = TRUE;
     }
     gst_object_unref (bus);
+
+    /* If we're using a sink that has a volume property, then that's what
+     * we need to modify, not playbin's one */
+    if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "volume")) {
+      bvw->priv->pulse_audio_sink = g_object_ref (audio_sink);
+      g_object_set (bvw->priv->play, "volume",
+		    (gdouble) 1.0, NULL);
+      g_signal_connect (G_OBJECT (bvw->priv->pulse_audio_sink), "notify::volume",
+			G_CALLBACK (notify_volume_cb), bvw);
+    }
   } else {
     g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
                  _("Could not find the audio output. "
-- 
1.6.2.5




From vcrhonek at fedoraproject.org  Wed Aug 19 10:11:31 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 19 Aug 2009 10:11:31 +0000 (UTC)
Subject: rpms/fetchmail/F-10 fetchmail-6.3.9-CVE-2009-2666.patch, NONE,
	1.1 fetchmail.spec, 1.61, 1.62
Message-ID: <20090819101131.68D1211C00E4@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4517

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.9-CVE-2009-2666.patch 
Log Message:
Fix SSL null terminator bypass (CVE-2009-2666)

fetchmail-6.3.9-CVE-2009-2666.patch:
 socket.c |   26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

--- NEW FILE fetchmail-6.3.9-CVE-2009-2666.patch ---
diff -up fetchmail-6.3.9/socket.c_orig fetchmail-6.3.9/socket.c
--- fetchmail-6.3.9/socket.c_orig	2009-08-06 11:34:12.000000000 +0200
+++ fetchmail-6.3.9/socket.c	2009-08-06 11:47:25.000000000 +0200
@@ -632,6 +632,13 @@ static int SSL_verify_callback( int ok_r
 				report(stderr, GT_("Bad certificate: Subject CommonName too long!\n"));
 				return (0);
 			}
+			if ((size_t)i > strlen(buf)) {
+				/* Name contains embedded NUL characters, so we complain. This is likely
+				 * a certificate spoofing attack. */
+				report(stderr, GT_("Bad certificate: Subject CommonName contains NUL, aborting!\n"));
+				return 0;
+			}
+
 			if (_ssl_server_cname != NULL) {
 				char *p1 = buf;
 				char *p2 = _ssl_server_cname;
@@ -643,12 +650,19 @@ static int SSL_verify_callback( int ok_r
 				 * first find a match among alternative names */
 				gens = X509_get_ext_d2i(x509_cert, NID_subject_alt_name, NULL, NULL);
 				if (gens) {
-					int i, r;
-					for (i = 0, r = sk_GENERAL_NAME_num(gens); i < r; ++i) {
-						const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, i);
-						if (gn->type == GEN_DNS) {
-							char *p1 = (char *)gn->d.ia5->data;
-							char *p2 = _ssl_server_cname;
+					int j, r;
+					for (j = 0, r = sk_GENERAL_NAME_num(gens); j < r; ++j) {
+						const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, j);
+ 						if (gn->type == GEN_DNS) {
+ 							char *p1 = (char *)gn->d.ia5->data;
+ 							char *p2 = _ssl_server_cname;
+							/* Name contains embedded NUL characters, so we complain. This
+							 * is likely a certificate spoofing attack. */
+							if ((size_t)gn->d.ia5->length != strlen(p1)) {
+								report(stderr, GT_("Bad certificate: Subject Alternative Name contains NUL, aborting!\n"));
+								sk_GENERAL_NAME_free(gens);
+								return 0;
+							}
 							if (outlevel >= O_VERBOSE)
 								report(stderr, "Subject Alternative Name: %s\n", p1);
 							if (*p1 == '*') {


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/F-10/fetchmail.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- fetchmail.spec	18 Sep 2008 09:56:41 -0000	1.61
+++ fetchmail.spec	19 Aug 2009 10:11:31 -0000	1.62
@@ -4,13 +4,14 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
 Patch1: fetchmail-6.3.8-CVE-2007-4565.patch
 Patch2: fetchmail-6.3.8-CVE-2008-2711.patch
+Patch3: fetchmail-6.3.9-CVE-2009-2666.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -51,6 +52,7 @@ need to have Python and Tk installed in 
 %patch0 -p1 -b .addrconf
 %patch1 -p1 -b .cve_2007_4565
 %patch2 -p1 -b .cve_2008_2711
+%patch3 -p1 -b .cve_2009_2666
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 19 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-9
+- Fix SSL null terminator bypass (CVE-2009-2666)
+
 * Tue Sep 18 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.8-8
 - Rediff all patches to work with patch --fuzz=0
 - Replace server(smtp) requires by procmail



From twaugh at fedoraproject.org  Wed Aug 19 10:14:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 10:14:08 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.219,1.220 hplip.fdi,1.4,NONE
Message-ID: <20090819101408.65A3B11C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5032

Modified Files:
	hplip.spec 
Removed Files:
	hplip.fdi 
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
- Use upstream udev rules instead of hal policy (bug #518172).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- hplip.spec	18 Aug 2009 09:03:00 -0000	1.219
+++ hplip.spec	19 Aug 2009 10:14:08 -0000	1.220
@@ -13,7 +13,6 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Source1: hplip.fdi
 Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
@@ -111,7 +110,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install --enable-dbus \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install
+	--enable-hpijs-install --enable-udev-acl-rules
 
 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
@@ -126,7 +125,7 @@ make install DESTDIR=%{buildroot}
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
 	%{buildroot}%{_docdir} \
-	%{buildroot}%{_sysconfdir}/udev/rules.d/*
+	%{buildroot}%{_datadir}/hal/fdi
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -148,9 +147,6 @@ desktop-file-install --vendor HP				\
 	--add-category Application				\
 	hplip.desktop
 
-mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
 
@@ -164,16 +160,13 @@ rm -f %{buildroot}%{_datadir}/hplip/hpij
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
-# Remove the hal preprobe rules as they were causing breakage (bug #479648).
-rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
-
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%{_sysconfdir}/udev/rules.d/*
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -313,7 +306,8 @@ fi
 exit 0
 
 %changelog
-* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+- Use upstream udev rules instead of hal policy (bug #518172).
 - Removed unnecessary dependency on PyQt as we only use PyQt4 now.
 
 * Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4


--- hplip.fdi DELETED ---



From hadess at fedoraproject.org  Wed Aug 19 10:37:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 19 Aug 2009 10:37:09 +0000 (UTC)
Subject: rpms/totem/F-11 totem.spec,1.241,1.242
Message-ID: <20090819103709.22B8711C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9727

Modified Files:
	totem.spec 
Log Message:
* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-3
- Update PA volume patch, don't restore the volume when
  using Pulseaudio (#512090)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- totem.spec	19 Aug 2009 10:09:52 -0000	1.241
+++ totem.spec	19 Aug 2009 10:37:08 -0000	1.242
@@ -210,7 +210,7 @@ audio and video files in the properties 
 %prep
 %setup -q -c
 pushd totem-%{version}/
-%patch0 -p0 -b .pulsesink-vol
+%patch1 -p0 -b .pulsesink-vol
 %patch1 -p1 -b .emblemed-drive-crash
 popd
 # Whatever needs to be changed in both copies do here



From twaugh at fedoraproject.org  Wed Aug 19 10:38:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 10:38:57 +0000 (UTC)
Subject: rpms/hplip/devel hplip-no-asm.patch, NONE, 1.1 hplip.spec, 1.220,
	1.221
Message-ID: <20090819103857.0843E11C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10100

Modified Files:
	hplip.spec 
Added Files:
	hplip-no-asm.patch 
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
- Make sure to avoid handwritten asm.
- Don't use obsolete configure options.


hplip-no-asm.patch:
 ipmain.c |    3 ---
 xfax.c   |   13 -------------
 2 files changed, 16 deletions(-)

--- NEW FILE hplip-no-asm.patch ---
diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
--- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-19 11:35:39.770825475 +0100
+++ hplip-3.9.8/ip/ipmain.c	2009-08-19 11:36:25.767828346 +0100
@@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
 void fatalBreakPoint (void)
 {
    /* do nothing */
-#if defined _DEBUG
-    __asm int 3;
-#endif
    PRINT0 (_T("\nhit fatalBreakPoint!\n"));
 }
 
diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
--- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-19 11:35:45.484827783 +0100
+++ hplip-3.9.8/ip/xfax.c	2009-08-19 11:36:39.815701961 +0100
@@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
                  & ((1u<<n_bits) - 1u);                                      \
 }
 
-#if 0
-
-#define BITS_LOAD(g, num_bits, par_result) {                                 \
-    int n_bits = (int)(num_bits);                                            \
-                                                                             \
-    par_result = g->gb_cache;                                                \
-                                                                             \
-    asm ("extract %1,%2,%0"                                                  \
-        : "=d" (par_result)                                                  \
-        : "dI" (g->gb_cache_cnt - n_bits), "dI" (n_bits), "0" (par_result)); \
-}
-
-#endif
 
 
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- hplip.spec	19 Aug 2009 10:14:08 -0000	1.220
+++ hplip.spec	19 Aug 2009 10:38:56 -0000	1.221
@@ -16,6 +16,7 @@ Source0: http://kent.dl.sourceforge.net/
 Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
+Patch4: hplip-no-asm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -105,10 +106,13 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
 %patch3 -p1 -b .ui-optional
 
+# Make sure to avoid handwritten asm.
+%patch4 -p1 -b .no-asm
+
 %build
-%configure --disable-foomatic-xml-install --disable-cups-install \
+%configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-dbus \
+	--disable-foomatic-rip-hplip-install \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
 	--enable-hpijs-install --enable-udev-acl-rules
 
@@ -306,6 +310,10 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
+- Make sure to avoid handwritten asm.
+- Don't use obsolete configure options.
+
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
 - Use upstream udev rules instead of hal policy (bug #518172).
 - Removed unnecessary dependency on PyQt as we only use PyQt4 now.



From twaugh at fedoraproject.org  Wed Aug 19 10:39:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 10:39:26 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.221,1.222
Message-ID: <20090819103926.67D6911C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270

Modified Files:
	hplip.spec 
Log Message:
3.9.8-6


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- hplip.spec	19 Aug 2009 10:38:56 -0000	1.221
+++ hplip.spec	19 Aug 2009 10:39:26 -0000	1.222
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132



From twaugh at fedoraproject.org  Wed Aug 19 10:56:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 10:56:46 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-no-asm.patch, NONE, 1.1 hplip.spec, 1.217,
	1.218 hplip.fdi, 1.4, NONE
Message-ID: <20090819105647.03D7211C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13389

Modified Files:
	hplip.spec 
Added Files:
	hplip-no-asm.patch 
Removed Files:
	hplip.fdi 
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
- Make sure to avoid handwritten asm.
- Don't use obsolete configure options.
- Use upstream udev rules instead of hal policy (bug #518172).


hplip-no-asm.patch:
 ipmain.c |    3 ---
 xfax.c   |   13 -------------
 2 files changed, 16 deletions(-)

--- NEW FILE hplip-no-asm.patch ---
diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
--- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-19 11:35:39.770825475 +0100
+++ hplip-3.9.8/ip/ipmain.c	2009-08-19 11:36:25.767828346 +0100
@@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
 void fatalBreakPoint (void)
 {
    /* do nothing */
-#if defined _DEBUG
-    __asm int 3;
-#endif
    PRINT0 (_T("\nhit fatalBreakPoint!\n"));
 }
 
diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
--- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-19 11:35:45.484827783 +0100
+++ hplip-3.9.8/ip/xfax.c	2009-08-19 11:36:39.815701961 +0100
@@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
                  & ((1u<<n_bits) - 1u);                                      \
 }
 
-#if 0
-
-#define BITS_LOAD(g, num_bits, par_result) {                                 \
-    int n_bits = (int)(num_bits);                                            \
-                                                                             \
-    par_result = g->gb_cache;                                                \
-                                                                             \
-    asm ("extract %1,%2,%0"                                                  \
-        : "=d" (par_result)                                                  \
-        : "dI" (g->gb_cache_cnt - n_bits), "dI" (n_bits), "0" (par_result)); \
-}
-
-#endif
 
 
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- hplip.spec	18 Aug 2009 09:03:21 -0000	1.217
+++ hplip.spec	19 Aug 2009 10:56:45 -0000	1.218
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,10 +13,10 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Source1: hplip.fdi
 Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
+Patch4: hplip-no-asm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -106,12 +106,15 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
 %patch3 -p1 -b .ui-optional
 
+# Make sure to avoid handwritten asm.
+%patch4 -p1 -b .no-asm
+
 %build
-%configure --disable-foomatic-xml-install --disable-cups-install \
+%configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-dbus \
+	--disable-foomatic-rip-hplip-install \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install
+	--enable-hpijs-install --enable-udev-acl-rules
 
 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
@@ -126,7 +129,7 @@ make install DESTDIR=%{buildroot}
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
 	%{buildroot}%{_docdir} \
-	%{buildroot}%{_sysconfdir}/udev/rules.d/*
+	%{buildroot}%{_datadir}/hal/fdi
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -148,9 +151,6 @@ desktop-file-install --vendor HP				\
 	--add-category Application				\
 	hplip.desktop
 
-mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
 
@@ -164,16 +164,13 @@ rm -f %{buildroot}%{_datadir}/hplip/hpij
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
-# Remove the hal preprobe rules as they were causing breakage (bug #479648).
-rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
-
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%{_sysconfdir}/udev/rules.d/*
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -313,7 +310,12 @@ fi
 exit 0
 
 %changelog
-* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
+- Make sure to avoid handwritten asm.
+- Don't use obsolete configure options.
+
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
+- Use upstream udev rules instead of hal policy (bug #518172).
 - Removed unnecessary dependency on PyQt as we only use PyQt4 now.
 
 * Wed Aug 12 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-4


--- hplip.fdi DELETED ---



From hadess at fedoraproject.org  Wed Aug 19 11:00:59 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 19 Aug 2009 11:00:59 +0000 (UTC)
Subject: rpms/totem/F-11 totem.spec,1.242,1.243
Message-ID: <20090819110100.0422911C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14957

Modified Files:
	totem.spec 
Log Message:
* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-3
- Update PA volume patch, don't restore the volume when
  using Pulseaudio (#512090)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- totem.spec	19 Aug 2009 10:37:08 -0000	1.242
+++ totem.spec	19 Aug 2009 11:00:59 -0000	1.243
@@ -210,7 +210,7 @@ audio and video files in the properties 
 %prep
 %setup -q -c
 pushd totem-%{version}/
-%patch1 -p0 -b .pulsesink-vol
+%patch0 -p1 -b .pulsesink-vol
 %patch1 -p1 -b .emblemed-drive-crash
 popd
 # Whatever needs to be changed in both copies do here



From mhlavink at fedoraproject.org  Wed Aug 19 11:15:35 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 19 Aug 2009 11:15:35 +0000 (UTC)
Subject: rpms/squirrelmail/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 squirrelmail-1.4.17-biguid.patch, 1.1,
	1.2 squirrelmail.spec, 1.75, 1.76
Message-ID: <20090819111535.9772C11C00E4@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17008

Modified Files:
	.cvsignore sources squirrelmail-1.4.17-biguid.patch 
	squirrelmail.spec 
Log Message:
updated to 1.4.20-RC2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	17 Aug 2009 07:47:26 -0000	1.27
+++ .cvsignore	19 Aug 2009 11:15:35 -0000	1.28
@@ -1,2 +1,2 @@
 all_locales-1.4.13-20071220.tar.bz2
-squirrelmail-1.4.20RC1.tar.bz2
+squirrelmail-1.4.20-RC2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	17 Aug 2009 07:47:26 -0000	1.27
+++ sources	19 Aug 2009 11:15:35 -0000	1.28
@@ -1,2 +1,2 @@
 c6463312afcd602ae60fd8f388dfb8c2  all_locales-1.4.13-20071220.tar.bz2
-7632177bd3618cd9965e548fd196f737  squirrelmail-1.4.20RC1.tar.bz2
+94015fb018cb2165fdfb3c41fd2b8065  squirrelmail-1.4.20-RC2.tar.bz2

squirrelmail-1.4.17-biguid.patch:
 functions/global.php               |   13 +++++++++++++
 functions/imap_messages.php        |    2 +-
 plugins/delete_move_next/setup.php |   18 +++++++++---------
 src/compose.php                    |    2 +-
 src/download.php                   |    2 +-
 src/image.php                      |    2 +-
 src/printer_friendly_main.php      |    2 +-
 src/read_body.php                  |    2 +-
 src/view_header.php                |    2 +-
 9 files changed, 29 insertions(+), 16 deletions(-)

Index: squirrelmail-1.4.17-biguid.patch
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail-1.4.17-biguid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squirrelmail-1.4.17-biguid.patch	23 Feb 2009 11:51:24 -0000	1.1
+++ squirrelmail-1.4.17-biguid.patch	19 Aug 2009 11:15:35 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up squirrelmail/functions/global.php.biguid squirrelmail/functions/global.php
---- squirrelmail/functions/global.php.biguid	2009-01-22 11:35:17.000000000 +0100
-+++ squirrelmail/functions/global.php	2009-01-23 12:12:31.570024148 +0100
-@@ -520,3 +520,16 @@ function is_ssl_secured_connection()
+diff -up squirrelmail-1.4.20-RC2/functions/global.php.biguid squirrelmail-1.4.20-RC2/functions/global.php
+--- squirrelmail-1.4.20-RC2/functions/global.php.biguid	2009-07-16 23:33:48.000000000 +0200
++++ squirrelmail-1.4.20-RC2/functions/global.php	2009-08-19 13:11:36.178560548 +0200
+@@ -603,3 +603,16 @@ function file_has_long_lines($filename, 
      return FALSE;
  }
  
@@ -18,10 +18,10 @@ diff -up squirrelmail/functions/global.p
 +{
 +  return preg_match('/^[0-9]+$/', $value) ? $value : '0';
 +}
-diff -up squirrelmail/functions/imap_messages.php.biguid squirrelmail/functions/imap_messages.php
---- squirrelmail/functions/imap_messages.php.biguid	2009-01-22 11:35:17.000000000 +0100
-+++ squirrelmail/functions/imap_messages.php	2009-01-23 12:11:13.912875541 +0100
-@@ -1006,7 +1006,7 @@ function sqimap_get_message($imap_stream
+diff -up squirrelmail-1.4.20-RC2/functions/imap_messages.php.biguid squirrelmail-1.4.20-RC2/functions/imap_messages.php
+--- squirrelmail-1.4.20-RC2/functions/imap_messages.php.biguid	2009-07-29 04:21:06.000000000 +0200
++++ squirrelmail-1.4.20-RC2/functions/imap_messages.php	2009-08-19 13:11:36.181336281 +0200
+@@ -1017,7 +1017,7 @@ function sqimap_get_message($imap_stream
      global $uid_support;
  
      // typecast to int to prohibit 1:* msgs sets
@@ -30,9 +30,9 @@ diff -up squirrelmail/functions/imap_mes
      $flags = array();
      $read = sqimap_run_command($imap_stream, "FETCH $id (FLAGS BODYSTRUCTURE)", true, $response, $message, $uid_support);
      if ($read) {
-diff -up squirrelmail/plugins/delete_move_next/setup.php.biguid squirrelmail/plugins/delete_move_next/setup.php
---- squirrelmail/plugins/delete_move_next/setup.php.biguid	2009-01-22 11:35:10.000000000 +0100
-+++ squirrelmail/plugins/delete_move_next/setup.php	2009-01-23 12:11:13.913875492 +0100
+diff -up squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php.biguid squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php
+--- squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php.biguid	2009-08-18 01:17:41.000000000 +0200
++++ squirrelmail-1.4.20-RC2/plugins/delete_move_next/setup.php	2009-08-19 13:13:59.459247532 +0200
 @@ -166,11 +166,11 @@ function delete_move_next_read($currloc)
          $prev_if_del = $prev;
          $next_if_del = $next;
@@ -55,14 +55,14 @@ diff -up squirrelmail/plugins/delete_mov
  
 -        if ($prev > 0){
 +        if (((float)$prev) > 0){
-             echo "<a href=\"read_body.php?passed_id=$prev_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id\">" . _("Delete &amp; Prev") . "</a>" . "&nbsp;|&nbsp;\n";
+             echo "<a href=\"read_body.php?passed_id=$prev_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id&amp;smtoken=" . sm_generate_security_token() . "\">" . _("Delete &amp; Prev") . "</a>" . "&nbsp;|&nbsp;\n";
          }
          else {
              echo _("Delete &amp; Prev") . "&nbsp;|&nbsp;";
          }
 -        if ($next > 0){
 +        if (((float)$next) > 0){
-             echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id\">" . _("Delete &amp; Next") . "</a>\n";
+             echo "<a href=\"read_body.php?passed_id=$next_if_del&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;delete_id=$passed_id&amp;smtoken=" . sm_generate_security_token() . "\">" . _("Delete &amp; Next") . "</a>\n";
          } else {
              echo _("Delete &amp; Next");
          }
@@ -86,10 +86,10 @@ diff -up squirrelmail/plugins/delete_mov
                  delete_move_next_moveNextForm($next_if_del);
              } else {
                  delete_move_next_moveRightMainForm();
-diff -up squirrelmail/src/compose.php.biguid squirrelmail/src/compose.php
---- squirrelmail/src/compose.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/compose.php	2009-01-23 12:11:13.913875492 +0100
-@@ -92,7 +92,7 @@ sqgetGlobalVar('ent_num',$ent_num, $SQ_G
+diff -up squirrelmail-1.4.20-RC2/src/compose.php.biguid squirrelmail-1.4.20-RC2/src/compose.php
+--- squirrelmail-1.4.20-RC2/src/compose.php.biguid	2009-08-18 01:17:41.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/compose.php	2009-08-19 13:11:36.182560530 +0200
+@@ -95,7 +95,7 @@ sqgetGlobalVar('ent_num',$ent_num, $SQ_G
  sqgetGlobalVar('saved_draft',$saved_draft, SQ_FORM);
  
  if ( sqgetGlobalVar('delete_draft',$delete_draft) ) {
@@ -98,9 +98,9 @@ diff -up squirrelmail/src/compose.php.bi
  }
  
  if ( sqgetGlobalVar('startMessage',$startMessage) ) {
-diff -up squirrelmail/src/download.php.biguid squirrelmail/src/download.php
---- squirrelmail/src/download.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/download.php	2009-01-23 12:11:13.914875446 +0100
+diff -up squirrelmail-1.4.20-RC2/src/download.php.biguid squirrelmail-1.4.20-RC2/src/download.php
+--- squirrelmail-1.4.20-RC2/src/download.php.biguid	2009-04-16 00:00:49.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/download.php	2009-08-19 13:11:36.182560530 +0200
 @@ -38,7 +38,7 @@ sqgetGlobalVar('mailbox',    $mailbox,  
  sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
  sqgetGlobalVar('absolute_dl',$absolute_dl,  SQ_GET);
@@ -110,9 +110,9 @@ diff -up squirrelmail/src/download.php.b
  }
  
  global $default_charset;
-diff -up squirrelmail/src/image.php.biguid squirrelmail/src/image.php
---- squirrelmail/src/image.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/image.php	2009-01-23 12:11:13.914875446 +0100
+diff -up squirrelmail-1.4.20-RC2/src/image.php.biguid squirrelmail-1.4.20-RC2/src/image.php
+--- squirrelmail-1.4.20-RC2/src/image.php.biguid	2009-04-16 00:00:49.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/image.php	2009-08-19 13:11:36.189622810 +0200
 @@ -32,7 +32,7 @@ displayPageHeader($color, 'None');
  
  /* globals */
@@ -122,9 +122,9 @@ diff -up squirrelmail/src/image.php.bigu
  }
  sqgetGlobalVar('mailbox',       $mailbox,       SQ_GET);
  sqgetGlobalVar('ent_id',        $ent_id,        SQ_GET);
-diff -up squirrelmail/src/printer_friendly_main.php.biguid squirrelmail/src/printer_friendly_main.php
---- squirrelmail/src/printer_friendly_main.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/printer_friendly_main.php	2009-01-23 12:11:13.914875446 +0100
+diff -up squirrelmail-1.4.20-RC2/src/printer_friendly_main.php.biguid squirrelmail-1.4.20-RC2/src/printer_friendly_main.php
+--- squirrelmail-1.4.20-RC2/src/printer_friendly_main.php.biguid	2009-04-16 00:00:49.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/printer_friendly_main.php	2009-08-19 13:11:36.190247022 +0200
 @@ -29,7 +29,7 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox
       ! sqgetGlobalVar('passed_id',$passed_id,SQ_GET)) {
      error_box(_("Invalid URL"),$color);
@@ -134,9 +134,9 @@ diff -up squirrelmail/src/printer_friend
      $view_unsafe_images = (bool) $_GET['view_unsafe_images'];
  /* end globals */
      displayHtmlHeader( _("Printer Friendly"), '', false, true );
-diff -up squirrelmail/src/read_body.php.biguid squirrelmail/src/read_body.php
---- squirrelmail/src/read_body.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/read_body.php	2009-01-23 12:11:13.915796109 +0100
+diff -up squirrelmail-1.4.20-RC2/src/read_body.php.biguid squirrelmail-1.4.20-RC2/src/read_body.php
+--- squirrelmail-1.4.20-RC2/src/read_body.php.biguid	2009-08-18 01:17:41.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/read_body.php	2009-08-19 13:11:36.190247022 +0200
 @@ -750,7 +750,7 @@ sqgetGlobalVar('passed_ent_id', $passed_
  sqgetGlobalVar('mailbox',       $mailbox);
  
@@ -146,10 +146,10 @@ diff -up squirrelmail/src/read_body.php.
  }
  if ( sqgetGlobalVar('sort', $temp) ) {
      $sort = (int) $temp;
-diff -up squirrelmail/src/view_header.php.biguid squirrelmail/src/view_header.php
---- squirrelmail/src/view_header.php.biguid	2009-01-22 11:35:13.000000000 +0100
-+++ squirrelmail/src/view_header.php	2009-01-23 12:11:13.915796109 +0100
-@@ -119,7 +119,7 @@ function view_header($header, $mailbox, 
+diff -up squirrelmail-1.4.20-RC2/src/view_header.php.biguid squirrelmail-1.4.20-RC2/src/view_header.php
+--- squirrelmail-1.4.20-RC2/src/view_header.php.biguid	2009-07-29 04:21:06.000000000 +0200
++++ squirrelmail-1.4.20-RC2/src/view_header.php	2009-08-19 13:11:36.190247022 +0200
+@@ -120,7 +120,7 @@ function view_header($header, $mailbox, 
  
  /* get global vars */
  if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- squirrelmail.spec	13 Aug 2009 13:42:56 -0000	1.75
+++ squirrelmail.spec	19 Aug 2009 11:15:35 -0000	1.76
@@ -6,11 +6,11 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.20
-Release: 0.rc1%{?dist}
+Release: 0.rc2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
-Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}RC1.tar.bz2
+Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}-RC2.tar.bz2
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
@@ -50,7 +50,7 @@ compatibility across browsers.  It has v
 easy to configure and install.
 
 %prep
-%setup -q -n squirrelmail-%{version}RC1
+%setup -q -n squirrelmail-%{version}-RC2
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -61,7 +61,7 @@ tar xfj %SOURCE4
 %patch4 -p2
 popd
 
-%patch5 -p1
+%patch5 -p1 -b .biguid
 %patch6 -p1
 
 %build
@@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Aug 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20RC2-1
+- updated to 1.4.20RC2
+
 * Thu Aug 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.20RC1-1
 - updated to 1.4.20RC1
 - fixes #517312 - CSRF issues in all forms (SA34627)



From pfrields at fedoraproject.org  Wed Aug 19 11:30:21 2009
From: pfrields at fedoraproject.org (Paul W. Frields)
Date: Wed, 19 Aug 2009 11:30:21 +0000 (UTC)
Subject: rpms/nautilus-open-terminal/F-11
	nautilus-open-terminal-0.13-header+vars.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 nautilus-open-terminal.spec, 1.30,
	1.31 sources, 1.8, 1.9
Message-ID: <20090819113021.5EA0511C0439@cvs1.fedora.phx.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-open-terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19437

Modified Files:
	.cvsignore nautilus-open-terminal.spec sources 
Added Files:
	nautilus-open-terminal-0.13-header+vars.patch 
Log Message:
Update to 0.13 (#498175, #505747)

nautilus-open-terminal-0.13-header+vars.patch:
 nautilus-open-terminal.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nautilus-open-terminal-0.13-header+vars.patch ---
diff -uNr nautilus-open-terminal-0.13-orig/src/nautilus-open-terminal.c nautilus-open-terminal-0.13/src/nautilus-open-terminal.c
--- nautilus-open-terminal-0.13-orig/src/nautilus-open-terminal.c	2009-05-23 05:15:17.000000000 -0400
+++ nautilus-open-terminal-0.13/src/nautilus-open-terminal.c	2009-07-14 07:49:09.000000000 -0400
@@ -42,6 +42,7 @@
 #include <fcntl.h>
 #include <string.h> /* for strcmp */
 #include <unistd.h> /* for chdir */
+#include <stdlib.h> /* for atoi */
 #include <sys/stat.h>
 
 static void nautilus_open_terminal_instance_init (NautilusOpenTerminal      *cvs);
@@ -125,8 +126,6 @@
 {
 	char *tmp, *save;
 	char *uri;
-	char *u, *h, *s, *p;
-	char *h_end;
 
 	uri = g_file_get_uri (file);
 	g_assert (uri != NULL);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 May 2009 14:10:26 -0000	1.8
+++ .cvsignore	19 Aug 2009 11:30:20 -0000	1.9
@@ -1 +1 @@
-nautilus-open-terminal-0.12.tar.bz2
+nautilus-open-terminal-0.13.tar.bz2


Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/F-11/nautilus-open-terminal.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nautilus-open-terminal.spec	21 May 2009 14:11:52 -0000	1.30
+++ nautilus-open-terminal.spec	19 Aug 2009 11:30:21 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           nautilus-open-terminal
-Version:        0.12
+Version:        0.13
 Release:	1%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
@@ -8,6 +8,7 @@ License:       	GPLv2+
 URL:            http://download.gnome.org/sources/%{name}/
 Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch0:		nautilus-open-terminal-0.12-eelheader.patch
+Patch1:		nautilus-open-terminal-0.13-header+vars.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnome-desktop-devel
@@ -24,6 +25,7 @@ Terminal" option for nautilus users who 
 %prep
 %setup -q
 %patch0 -p1 -b .eelheader
+%patch1 -p1 -b .headervars
 libtoolize --force --copy
 autoreconf
 
@@ -59,6 +61,9 @@ gconftool-2 \
 %{_libdir}/nautilus/extensions-2.0/*.so*
 
 %changelog
+* Tue Jul 14 2009 Paul W. Frields <stickster at gmail.com> - 0.13-1
+- Update to upstream 0.13
+
 * Thu May 21 2009 Paul W. Frields <stickster at gmail.com> - 0.12-1
 - Update to upstream 0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 May 2009 14:10:26 -0000	1.8
+++ sources	19 Aug 2009 11:30:21 -0000	1.9
@@ -1 +1 @@
-4c1e1674282836de718e7537da748d81  nautilus-open-terminal-0.12.tar.bz2
+412d61dc1a6c70235afd3735476f3401  nautilus-open-terminal-0.13.tar.bz2



From pfrields at fedoraproject.org  Wed Aug 19 11:31:52 2009
From: pfrields at fedoraproject.org (Paul W. Frields)
Date: Wed, 19 Aug 2009 11:31:52 +0000 (UTC)
Subject: rpms/nautilus-open-terminal/F-11
	nautilus-open-terminal-0.8-truthvalue.patch, 1.1,
	NONE nautilus-open-terminal-0.9-gnome-vfs.patch, 1.1,
	NONE nautilus-open-terminal-svn-20080114.patch, 1.1, NONE
Message-ID: <20090819113152.EB5B211C00E4@cvs1.fedora.phx.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-open-terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20004

Removed Files:
	nautilus-open-terminal-0.8-truthvalue.patch 
	nautilus-open-terminal-0.9-gnome-vfs.patch 
	nautilus-open-terminal-svn-20080114.patch 
Log Message:
Remove obsolete patches


--- nautilus-open-terminal-0.8-truthvalue.patch DELETED ---


--- nautilus-open-terminal-0.9-gnome-vfs.patch DELETED ---


--- nautilus-open-terminal-svn-20080114.patch DELETED ---



From kasal at fedoraproject.org  Wed Aug 19 11:33:47 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 19 Aug 2009 11:33:47 +0000 (UTC)
Subject: rpms/perl-Padre/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090819113347.101F511C00E4@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Padre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20339

Modified Files:
	.cvsignore sources 
Log Message:
remove 0.28.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Padre/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	31 Mar 2009 09:12:47 -0000	1.11
+++ .cvsignore	19 Aug 2009 11:33:46 -0000	1.12
@@ -1,3 +1,2 @@
-Padre-0.28.tar.gz
 Padre.desktop
 Padre-0.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Padre/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	31 Mar 2009 09:12:47 -0000	1.11
+++ sources	19 Aug 2009 11:33:46 -0000	1.12
@@ -1,3 +1,2 @@
-6a0351313076c42bc6bbb020f61c757b  Padre-0.28.tar.gz
 e9457439b1f0c929ab3141197294e061  Padre.desktop
 fe5999b413637bab2c80ffa46819d068  Padre-0.32.tar.gz



From tagoh at fedoraproject.org  Wed Aug 19 11:37:43 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 19 Aug 2009 11:37:43 +0000 (UTC)
Subject: rpms/uim/F-11 .cvsignore, 1.24, 1.25 sources, 1.23, 1.24 uim.spec, 
	1.72, 1.73 uim-1.5.5-applet.patch, 1.1,
	NONE uim-qt-destdir.patch, 1.1, NONE
Message-ID: <20090819113743.AAC8111C00E4@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21022

Modified Files:
	.cvsignore sources uim.spec 
Removed Files:
	uim-1.5.5-applet.patch uim-qt-destdir.patch 
Log Message:
* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
- New upstream release.
- Remove patches because it has been applied in this release.
  - uim-qt-destdir.patch
  - uim-1.5.5-applet.patch
- Update the usage of alternatives according to PackagingDrafts/UsingAlternatives.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	27 Feb 2009 12:07:14 -0000	1.24
+++ .cvsignore	19 Aug 2009 11:37:43 -0000	1.25
@@ -24,3 +24,4 @@ uim-1.5.0.tar.bz2
 uim-1.5.2.tar.bz2
 uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
+uim-1.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	27 Feb 2009 12:07:14 -0000	1.23
+++ sources	19 Aug 2009 11:37:43 -0000	1.24
@@ -1 +1 @@
-b7403fa4ae78229f31ca49df283502da  uim-1.5.5.tar.bz2
+2bd5a9095d6354a2a23c908b0d6e7861  uim-1.5.6.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-11/uim.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- uim.spec	27 Feb 2009 09:02:14 -0000	1.72
+++ uim.spec	19 Aug 2009 11:37:43 -0000	1.73
@@ -1,8 +1,8 @@
-%define inst_xinput alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
-%define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
+%define inst_xinput %{_sbindir}/update-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
+%define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.5
+Version:	1.5.6
 Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
@@ -28,14 +28,12 @@ Source0:	http://uim.googlecode.com/files
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 Patch0:		uim-1.4.2-emacs23.patch
-Patch1:		uim-qt-destdir.patch
-Patch2:		uim-1.5.5-applet.patch
 
 
 Summary:	A multilingual input method library
 Group:		System Environment/Libraries
-Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
-Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
+Requires(post): %{_sbindir}/update-alternatives /sbin/ldconfig
+Requires(postun): %{_sbindir}/update-alternatives /sbin/ldconfig
 Requires:	imsettings im-chooser
 
 %package	devel
@@ -215,12 +213,6 @@ many languages using the input table map
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .emacs23
-%patch1 -p1 -b .qt-destdir
-%patch2 -p1 -b .applet
-libtoolize -f
-aclocal -Im4
-automake --add-missing
-autoconf
 
 
 %build
@@ -282,6 +274,8 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/l
 ln -sf %{_localstatedir}/lib/uim/installed-modules.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 ln -sf %{_localstatedir}/lib/uim/loader.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 
+# https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
+touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
@@ -403,6 +397,7 @@ fi
 %exclude %{_datadir}/uim/pixmaps/wnn.png
 %exclude %{_datadir}/uim/pixmaps/wnn.svg
 %{_sysconfdir}/X11/xinit/xinput.d
+%ghost %{_sysconfdir}/X11/xinit/xinputrc
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
 %{_libdir}/uim/plugin/libuim-look.so
 %{_libexecdir}/uim-helper-server
@@ -518,6 +513,16 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
+- New upstream release.
+- Remove patches because it has been applied in this release.
+  - uim-qt-destdir.patch
+  - uim-1.5.5-applet.patch
+- Update the usage of alternatives according to PackagingDrafts/UsingAlternatives.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.5-1
 - New upstream release.
 


--- uim-1.5.5-applet.patch DELETED ---


--- uim-qt-destdir.patch DELETED ---



From jmoskovc at fedoraproject.org  Wed Aug 19 11:43:14 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Wed, 19 Aug 2009 11:43:14 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.7, 1.8 abrt.spec, 1.10, 1.11 sources, 
	1.8, 1.9
Message-ID: <20090819114314.3320011C00E4@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21877

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
version 0.0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Aug 2009 09:06:03 -0000	1.7
+++ .cvsignore	19 Aug 2009 11:43:13 -0000	1.8
@@ -1 +1 @@
-abrt-0.0.7.tar.gz
+abrt-0.0.7.1.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- abrt.spec	18 Aug 2009 17:30:35 -0000	1.10
+++ abrt.spec	19 Aug 2009 11:43:13 -0000	1.11
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 0.0.7
+Version: 0.0.7.1
 Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -330,6 +330,8 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Aug 19 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.7.1-1
+- fixes to bugzilla plugin and gui to make the report message more user-friendly
 
 * Tue Aug 18 2009  Denys Vlasenko <dvlasenk at redhat.com> 0.0.7-2
 - removed dangerous parameter option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Aug 2009 17:30:35 -0000	1.8
+++ sources	19 Aug 2009 11:43:14 -0000	1.9
@@ -1 +1 @@
-c908e6174843a7b685203a67d631964f  abrt-0.0.7.tar.gz
+4ba81fa12b181c5d286f44a2890c6de3  abrt-0.0.7.1.tar.gz



From twaugh at fedoraproject.org  Wed Aug 19 11:49:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 11:49:13 +0000 (UTC)
Subject: rpms/foomatic-db/devel .cvsignore, 1.2, 1.3 foomatic-db.spec, 1.2, 
	1.3 sources, 1.2, 1.3 foomatic-db-epson-stylus-color-200.patch,
	1.1, NONE
Message-ID: <20090819114913.428D311C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22832

Modified Files:
	.cvsignore foomatic-db.spec sources 
Removed Files:
	foomatic-db-epson-stylus-color-200.patch 
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 4.0-5.20090819
- Updated to foomatic-db-4.0-20090819.
- Removed deprecated foomatic-db-hpijs tarball.
- Use buildroot macro throughout.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Aug 2009 08:03:15 -0000	1.2
+++ .cvsignore	19 Aug 2009 11:49:12 -0000	1.3
@@ -1,2 +1,3 @@
 foomatic-db-4.0-20090702.tar.gz
 foomatic-db-hpijs-20090701.tar.gz
+foomatic-db-4.0-20090819.tar.gz


Index: foomatic-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/foomatic-db.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- foomatic-db.spec	18 Aug 2009 08:42:45 -0000	1.2
+++ foomatic-db.spec	19 Aug 2009 11:49:13 -0000	1.3
@@ -1,20 +1,16 @@
 %define dbver_rel 4.0
-%define dbver_snap 20090702
-%define hpijsver 20090701
+%define dbver_snap 20090819
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 4.%{dbver_snap}%{?dist}
+Release: 5.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
 Requires: %{name}-ppds = %{version}-%{release}
 
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
-Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
-
-Patch1: foomatic-db-epson-stylus-color-200.patch
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,14 +50,10 @@ Requires: %{name}-filesystem = %{version
 PPDs from printer manufacturers.
 
 %prep
-%setup -q -c -a 1
+%setup -q -n %{name}-%{dbver_snap}
 
 find -type d | xargs chmod g-s
 
-pushd foomatic-db-%{dbver_snap}
-
-%patch1 -p1 -b .epson-stylus-color-200
-
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -86,42 +78,27 @@ done
 
 # Use sed instead of perl in the PPDs (bug #512739).
 find PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
-popd
 
 %build
-pushd foomatic-db-%{dbver_snap}
 %configure
 make PREFIX=%{_prefix}
-popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-%configure
-make PREFIX=%{_prefix}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd foomatic-db-%{dbver_snap}
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	install
-popd
-
-pushd foomatic-db-hpijs-%{hpijsver}
-make	DESTDIR=%buildroot PREFIX=%{_prefix} \
-	install
-popd
 
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
 
 find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644
 
-mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom
+mkdir %{buildroot}%{_datadir}/foomatic/db/source/PPD/Custom
 
-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
+rm -f	%{buildroot}%{_datadir}/foomatic/db/source/PPD/Kyocera/*.htm \
+	%{buildroot}%{_datadir}/cups/model/3-distribution
 
 # Convert absolute symlink to relative.
 rm -f %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds
@@ -138,10 +115,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.txt
-%doc foomatic-db-%{dbver_snap}/db/source/PPD/Kyocera/*.htm
-%doc foomatic-db-%{dbver_snap}/README
-%doc foomatic-db-%{dbver_snap}/COPYING
+%doc db/source/PPD/Kyocera/*.htm
+%doc README
+%doc COPYING
 %{_datadir}/foomatic/db/oldprinterids
 %{_datadir}/foomatic/db/source/printer
 %{_datadir}/foomatic/db/source/driver
@@ -153,6 +129,11 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 4.0-5.20090819
+- Updated to foomatic-db-4.0-20090819.
+- Removed deprecated foomatic-db-hpijs tarball.
+- Use buildroot macro throughout.
+
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 4.0-4.20090702
 - Use stcolor driver for Epson Stylus Color 200 (bug #513676).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Aug 2009 08:03:15 -0000	1.2
+++ sources	19 Aug 2009 11:49:13 -0000	1.3
@@ -1,2 +1 @@
-df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
-2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
+b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz


--- foomatic-db-epson-stylus-color-200.patch DELETED ---



From jmoskovc at fedoraproject.org  Wed Aug 19 11:49:37 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Wed, 19 Aug 2009 11:49:37 +0000 (UTC)
Subject: rpms/abrt/devel abrt.spec,1.11,1.12
Message-ID: <20090819114937.893B111C00E4@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22989

Modified Files:
	abrt.spec 
Log Message:
fixed typo in release


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- abrt.spec	19 Aug 2009 11:43:13 -0000	1.11
+++ abrt.spec	19 Aug 2009 11:49:37 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 0.0.7.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/



From pkgdb at fedoraproject.org  Wed Aug 19 11:51:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 11:51:08 +0000
Subject: [pkgdb] aqute-bndlib: akurtakov has requested commit
Message-ID: <20090819115108.4864110F86F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Wed Aug 19 11:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 11:51:09 +0000
Subject: [pkgdb] aqute-bndlib: akurtakov has requested watchcommits
Message-ID: <20090819115109.9BD6C10F888@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Wed Aug 19 11:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 11:51:12 +0000
Subject: [pkgdb] aqute-bndlib: akurtakov has requested watchbugzilla
Message-ID: <20090819115112.89FF710F897@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on aqute-bndlib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From kaigai at fedoraproject.org  Wed Aug 19 12:00:31 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Wed, 19 Aug 2009 12:00:31 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql-8.4.patch, NONE, 1.1 .cvsignore,
	1.14, 1.15 sepostgresql.init, 1.34, 1.35 sepostgresql.spec, 1.38,
	1.39 sources, 1.11, 1.12 sepostgresql-core-8.3.patch, 1.3,
	NONE sepostgresql-test-8.3.patch, 1.2,
	NONE sepostgresql-utils-8.3.patch, 1.1, NONE
Message-ID: <20090819120031.18D6C11C0439@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25126

Modified Files:
	.cvsignore sepostgresql.init sepostgresql.spec sources 
Added Files:
	sepostgresql-8.4.patch 
Removed Files:
	sepostgresql-core-8.3.patch sepostgresql-test-8.3.patch 
	sepostgresql-utils-8.3.patch 
Log Message:
update SE-PostgreSQL to the v8.4.x series


sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   15 
 src/backend/bootstrap/bootparse.y                                  |    9 
 src/backend/bootstrap/bootstrap.c                                  |    8 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   22 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   83 
 src/backend/catalog/index.c                                        |   26 
 src/backend/catalog/namespace.c                                    |   20 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_proc.c                                      |   30 
 src/backend/catalog/pg_security.c                                  |  680 +++++
 src/backend/catalog/toasting.c                                     |    9 
 src/backend/commands/aggregatecmds.c                               |    4 
 src/backend/commands/alter.c                                       |   33 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |    4 
 src/backend/commands/copy.c                                        |  252 !!
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |    7 
 src/backend/commands/functioncmds.c                                |   88 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/proclang.c                                    |   15 
 src/backend/commands/schemacmds.c                                  |   60 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  192 +
 src/backend/commands/trigger.c                                     |    4 
 src/backend/commands/tsearchcmds.c                                 |    7 
 src/backend/commands/typecmds.c                                    |    9 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  141 +
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   67 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  105 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   43 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 +
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  889 +++++++
 src/backend/security/sepgsql/checker.c                             |  420 +++
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               | 1170 ++++++++++
 src/backend/security/sepgsql/label.c                               |  685 +++++
 src/backend/security/sepgsql/misc.c                                |  304 ++
 src/backend/security/sepgsql/perms.c                               |  463 +++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  119 +
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 !
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    4 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   25 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |   11 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/backend/utils/misc/superuser.c                                 |   15 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  161 !
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  104 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  514 ++++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/expected/sanity_check.out                         |    3 
 127 files changed, 7638 insertions(+), 1 deletion(-), 595 modifications(!)

--- NEW FILE sepostgresql-8.4.patch ---
diff -Nrpc base/configure sepgsql/configure
*** base/configure	Tue Jun 30 01:26:47 2009
--- sepgsql/configure	Wed Jul 15 21:17:18 2009
*************** with_libxml
*** 710,715 ****
--- 710,716 ----
  with_libxslt
  with_system_tzdata
  with_zlib
+ enable_selinux
  GREP
  EGREP
  ELF_SYS
*************** Optional Features:
*** 1378,1383 ****
--- 1379,1385 ----
    --enable-thread-safety  make client libraries thread-safe
    --enable-thread-safety-force
                            force thread-safety despite thread test failure
+   --enable-selinux        enable to build with SELinux support
    --disable-float4-byval  disable float4 passed by value
    --disable-float8-byval  disable float8 passed by value
    --disable-largefile     omit support for large files
*************** fi
*** 5532,5537 ****
--- 5534,5645 ----
  
  
  #
+ # SELinux support
+ #
+ 
+ pgac_args="$pgac_args enable_selinux"
+ 
+ # Check whether --enable-selinux was given.
+ if test "${enable_selinux+set}" = set; then
+   enableval=$enable_selinux;
+   case $enableval in
+     yes)
+       :
+       ;;
+     no)
+       :
+       ;;
+     *)
+       { { echo "$as_me:$LINENO: error: no argument expected for --enable-selinux option" >&5
+ echo "$as_me: error: no argument expected for --enable-selinux option" >&2;}
+    { (exit 1); exit 1; }; }
+       ;;
+   esac
+ 
+ else
+   enable_selinux=no
+ 
+ fi
+ 
+ 
+ if test "$enable_selinux" = yes; then
+     { echo "$as_me:$LINENO: checking for avc_netlink_loop in -lselinux" >&5
+ echo $ECHO_N "checking for avc_netlink_loop in -lselinux... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_selinux_avc_netlink_loop+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lselinux  $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 avc_netlink_loop ();
+ int
+ main ()
+ {
+ return avc_netlink_loop ();
+   ;
+   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_selinux_avc_netlink_loop=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_cv_lib_selinux_avc_netlink_loop=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_selinux_avc_netlink_loop" >&5
+ echo "${ECHO_T}$ac_cv_lib_selinux_avc_netlink_loop" >&6; }
+ if test $ac_cv_lib_selinux_avc_netlink_loop = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SELINUX 1
+ _ACEOF
+ 
+ 
+ else
+   { { echo "$as_me:$LINENO: error: \"--enable-selinux requires libselinux.\"" >&5
+ echo "$as_me: error: \"--enable-selinux requires libselinux.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ fi
+ 
+ #
  # Elf
  #
  
*************** with_libxml!$with_libxml$ac_delim
*** 28137,28147 ****
  with_libxslt!$with_libxslt$ac_delim
  with_system_tzdata!$with_system_tzdata$ac_delim
  with_zlib!$with_zlib$ac_delim
  GREP!$GREP$ac_delim
  EGREP!$EGREP$ac_delim
  ELF_SYS!$ELF_SYS$ac_delim
  LDFLAGS_SL!$LDFLAGS_SL$ac_delim
- LD!$LD$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
--- 28245,28255 ----
  with_libxslt!$with_libxslt$ac_delim
  with_system_tzdata!$with_system_tzdata$ac_delim
  with_zlib!$with_zlib$ac_delim
+ enable_selinux!$enable_selinux$ac_delim
  GREP!$GREP$ac_delim
  EGREP!$EGREP$ac_delim
  ELF_SYS!$ELF_SYS$ac_delim
  LDFLAGS_SL!$LDFLAGS_SL$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
*************** _ACEOF
*** 28183,28188 ****
--- 28291,28297 ----
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+ LD!$LD$ac_delim
  with_gnu_ld!$with_gnu_ld$ac_delim
  ld_R_works!$ld_R_works$ac_delim
  RANLIB!$RANLIB$ac_delim
*************** vpath_build!$vpath_build$ac_delim
*** 28245,28251 ****
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- 28354,28360 ----
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -Nrpc base/configure.in sepgsql/configure.in
*** base/configure.in	Tue Jun 30 01:26:47 2009
--- sepgsql/configure.in	Wed Jul 15 19:35:52 2009
*************** PGAC_ARG_BOOL(with, zlib, yes,
*** 764,769 ****
--- 764,782 ----
  AC_SUBST(with_zlib)
  
  #
[...13978 lines suppressed...]
+ #define sepgsqlExecScan(a,b,c)					(true)
+ #define sepgsqlSetupTuplePerms(a)				(0)
+ #define sepgsqlHeapTupleInsert(a,b,c)			do {} while(0)
+ #define sepgsqlHeapTupleUpdate(a,b,c)			do {} while(0)
+ 
+ /* core.c */
+ #define sepgsqlIsEnabled()						(false)
+ #define sepgsqlInitialize()						do {} while(0)
+ 
+ /* hooks.c */
+ #define sepgsqlCheckDatabaseCreate(a,b)			(InvalidOid)
+ #define sepgsqlCheckDatabaseDrop(a)				do {} while(0)
+ #define sepgsqlCheckDatabaseSetattr(a)			do {} while(0)
+ #define sepgsqlCheckDatabaseRelabel(a,b)		(InvalidOid)
+ #define sepgsqlCheckDatabaseAccess(a)			(true)
+ #define sepgsqlCheckDatabaseSuperuser()			(true)
+ #define sepgsqlCheckDatabaseInstallModule(a,b)	do {} while(0)
+ #define sepgsqlCheckDatabaseLoadModule(a)		do {} while(0)
+ 
+ #define sepgsqlCheckSchemaCreate(a,b,c)			(InvalidOid)
+ #define sepgsqlCheckSchemaDrop(a)				do {} while(0)
+ #define sepgsqlCheckSchemaSetattr(a)			do {} while(0)
+ #define sepgsqlCheckSchemaRelabel(a,b)			(InvalidOid)
+ #define sepgsqlCheckSchemaUsage(a)				(true)
+ 
+ #define sepgsqlCheckTableDrop(a)				do {} while(0)
+ #define sepgsqlCheckTableSetattr(a)				do {} while(0)
+ #define sepgsqlCheckTableRelabel(a,b)			(InvalidOid)
+ #define sepgsqlCheckTableLock(a)				do {} while(0)
+ #define sepgsqlCheckTableTruncate(a)			do {} while(0)
+ #define sepgsqlCheckTableReference(a,b,c)		do {} while(0)
+ 
+ #define sepgsqlCheckSequenceGetValue(a)			do {} while(0)
+ #define sepgsqlCheckSequenceNextValue(a)		do {} while(0)
+ #define sepgsqlCheckSequenceSetValue(a)			do {} while(0)
+ 
+ #define sepgsqlCheckColumnCreate(a,b,c)			(InvalidOid)
+ #define sepgsqlCheckColumnDrop(a,b)				do {} while(0)
+ #define sepgsqlCheckColumnSetattr(a,b)			do {} while(0)
+ #define sepgsqlCheckColumnRelabel(a,b,c)		(InvalidOid)
+ 
+ #define sepgsqlCheckProcedureCreate(a,b,c)		(InvalidOid)
+ #define sepgsqlCheckProcedureDrop(a)			do {} while(0)
+ #define sepgsqlCheckProcedureSetattr(a)			do {} while(0)
+ #define sepgsqlCheckProcedureRelabel(a,b)		(InvalidOid)
+ #define sepgsqlCheckProcedureExecute(a)			(true)
+ #define sepgsqlCheckProcedureEntrypoint(a,b)	do {} while(0)
+ #define sepgsqlCheckProcedureInstall(a)			do {} while(0)
+ 
+ #define sepgsqlCheckBlobCreate(a,b)				do {} while(0)
+ #define sepgsqlCheckBlobDrop(a,b)				do {} while(0)
+ #define sepgsqlCheckBlobRead(a)					do {} while(0)
+ #define sepgsqlCheckBlobWrite(a)				do {} while(0)
+ #define sepgsqlCheckBlobGetattr(a)				do {} while(0)
+ #define sepgsqlCheckBlobSetattr(a)				do {} while(0)
+ #define sepgsqlCheckBlobExport(a,b,c)			do {} while(0)
+ #define sepgsqlCheckBlobImport(a,b,c)			do {} while(0)
+ #define sepgsqlCheckBlobRelabel(a,b)			do {} while(0)
+ #define sepgsqlCheckFileRead(a,b)				do {} while(0)
+ #define sepgsqlCheckFileWrite(a,b)				do {} while(0)
+ 
+ #define sepgsqlCheckObjectDrop(a)				do {} while(0)
+ 
+ #define sepgsqlAllowFunctionInlined(a)			(true)
+ 
+ /* label.c */
+ #define sepgsqlTupleDescHasSecLabel(a,b)		(false)
+ #define sepgsqlSetDefaultSecLabel(a,b)			do {} while(0)
+ #define sepgsqlCreateTableColumns(a,b,c,d,e)	(NULL)
+ #define sepgsqlCopyTableColumns(a)				(NULL)
+ #define sepgsqlMetaSecurityLabel()				(NULL)
+ #define sepgsqlTransSecLabelIn(a)				(a)
+ #define sepgsqlTransSecLabelOut(a)				(a)
+ #define sepgsqlRawSecLabelIn(a)					(a)
+ #define sepgsqlRawSecLabelOut(a)				(a)
+ 
+ #endif	/* HAVE_SELINUX */
+ 
+ extern Datum sepgsql_getcon(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_server_getcon(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_get_user(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_get_role(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_get_type(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_get_range(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_set_user(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_set_role(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_set_type(PG_FUNCTION_ARGS);
+ extern Datum sepgsql_set_range(PG_FUNCTION_ARGS);
+ 
+ #endif	/* SEPGSQL_H */
diff -Nrpc base/src/include/storage/fd.h sepgsql/src/include/storage/fd.h
*** base/src/include/storage/fd.h	Tue Jan 13 09:22:28 2009
--- sepgsql/src/include/storage/fd.h	Wed Jul 15 19:48:58 2009
*************** extern int	FileWrite(File file, char *bu
*** 68,73 ****
--- 68,74 ----
  extern int	FileSync(File file);
  extern off_t FileSeek(File file, off_t offset, int whence);
  extern int	FileTruncate(File file, off_t offset);
+ extern int	FileRawDescriptor(File file);
  
  /* Operations that allow use of regular stdio --- USE WITH CAUTION */
  extern FILE *AllocateFile(const char *name, const char *mode);
diff -Nrpc base/src/include/storage/large_object.h sepgsql/src/include/storage/large_object.h
*** base/src/include/storage/large_object.h	Sat Jan  3 12:25:21 2009
--- sepgsql/src/include/storage/large_object.h	Wed Jul 15 19:48:58 2009
*************** typedef struct LargeObjectDesc
*** 44,49 ****
--- 44,50 ----
  #define IFS_RDLOCK		(1 << 0)
  #define IFS_WRLOCK		(1 << 1)
  
+ 	Oid			secid;			/* security identifier of largeobject */
  } LargeObjectDesc;
  
  
*************** extern int	inv_tell(LargeObjectDesc *obj
*** 79,83 ****
--- 80,86 ----
  extern int	inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes);
  extern int	inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes);
  extern void inv_truncate(LargeObjectDesc *obj_desc, int len);
+ extern Oid	inv_get_security(Oid loid);
+ extern void	inv_set_security(Oid loid, Oid secid);
  
  #endif   /* LARGE_OBJECT_H */
diff -Nrpc base/src/include/storage/lwlock.h sepgsql/src/include/storage/lwlock.h
*** base/src/include/storage/lwlock.h	Fri Mar  6 09:45:33 2009
--- sepgsql/src/include/storage/lwlock.h	Wed Jul 15 19:35:52 2009
*************** typedef enum LWLockId
*** 67,72 ****
--- 67,73 ----
  	AutovacuumLock,
  	AutovacuumScheduleLock,
  	SyncScanLock,
+ 	SepgsqlAvcLock,
  	/* Individual lock IDs end here */
  	FirstBufMappingLock,
  	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
diff -Nrpc base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
*** base/src/include/utils/errcodes.h	Fri Mar  6 09:45:33 2009
--- sepgsql/src/include/utils/errcodes.h	Wed Jul 15 19:35:52 2009
***************
*** 347,352 ****
--- 347,357 ----
  #define ERRCODE_NO_DATA_FOUND				MAKE_SQLSTATE('P','0', '0','0','2')
  #define ERRCODE_TOO_MANY_ROWS				MAKE_SQLSTATE('P','0', '0','0','3')
  
+ /* Class SE - SE-PostgreSQL Error */
+ #define ERRCODE_SELINUX_ERROR				MAKE_SQLSTATE('S','E', '0','0','1')
+ #define ERRCODE_SELINUX_AUDIT				MAKE_SQLSTATE('S','E', '0','0','2')
+ #define ERRCODE_SELINUX_INFO				MAKE_SQLSTATE('S','E', '0','0','3')
+ 
  /* Class XX - Internal Error (PostgreSQL-specific error class) */
  /* (this is for "can't-happen" conditions and software bugs) */
  #define ERRCODE_INTERNAL_ERROR				MAKE_SQLSTATE('X','X', '0','0','0')
diff -Nrpc base/src/include/utils/syscache.h sepgsql/src/include/utils/syscache.h
*** base/src/include/utils/syscache.h	Sat Jan  3 12:25:21 2009
--- sepgsql/src/include/utils/syscache.h	Thu Jul 16 23:18:11 2009
*************** enum SysCacheIdentifier
*** 69,74 ****
--- 69,76 ----
  	RELNAMENSP,
  	RELOID,
  	RULERELNAME,
+ 	SECURITYATTR,
+ 	SECURITYSECID,
  	STATRELATT,
  	TSCONFIGMAP,
  	TSCONFIGNAMENSP,
diff -Nrpc base/src/test/regress/expected/sanity_check.out sepgsql/src/test/regress/expected/sanity_check.out
*** base/src/test/regress/expected/sanity_check.out	Tue Feb 10 10:10:02 2009
--- sepgsql/src/test/regress/expected/sanity_check.out	Thu Jul 16 23:18:11 2009
*************** SELECT relname, relhasindex
*** 112,117 ****
--- 112,118 ----
   pg_pltemplate           | t
   pg_proc                 | t
   pg_rewrite              | t
+  pg_security             | t
   pg_shdepend             | t
   pg_shdescription        | t
   pg_statistic            | t
*************** SELECT relname, relhasindex
*** 151,157 ****
   timetz_tbl              | f
   tinterval_tbl           | f
   varchar_tbl             | f
! (140 rows)
  
  --
  -- another sanity check: every system catalog that has OIDs should have
--- 152,158 ----
   timetz_tbl              | f
   tinterval_tbl           | f
   varchar_tbl             | f
! (141 rows)
  
  --
  -- another sanity check: every system catalog that has OIDs should have


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Mar 2009 03:54:13 -0000	1.14
+++ .cvsignore	19 Aug 2009 12:00:29 -0000	1.15
@@ -1 +1 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.4.0.tar.bz2


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sepostgresql.init	9 Jun 2009 07:29:38 -0000	1.34
+++ sepostgresql.init	19 Aug 2009 12:00:30 -0000	1.35
@@ -79,7 +79,7 @@ do_start() {
     test -x /sbin/restorecon && /sbin/restorecon ${SEPGSQL_LOG}
 
     cd ${SEPGSQL_BIN}
-    /sbin/runuser sepgsql -c "./sepg_ctl -l ${SEPGSQL_LOG} -D ${SEPGSQL_DATA} -o '${SEPGSQL_OPTS}' start" \
+    /sbin/runuser sepgsql -c "./sepg_ctl -w -t 10 -l ${SEPGSQL_LOG} -D ${SEPGSQL_DATA} -o '${SEPGSQL_OPTS}' start" \
         >> ${SEPGSQL_STARTUP_LOG} 2>&1 < /dev/null
     sleep 1
     PID=`/sbin/runuser sepgsql -c "./sepg_ctl -D ${SEPGSQL_DATA} status 2>/dev/null \
@@ -165,7 +165,7 @@ do_initdb() {
 	test -x /sbin/restorecon && /sbin/restorecon -R "${SEPGSQL_DATA}"
 	# Initialize the database
         cd ${SEPGSQL_BIN}
-	/sbin/runuser -- sepgsql -c "./initdb.sepgsql --enable-selinux -A 'ident sameuser' ${SEPGSQL_DATA}" \
+	/sbin/runuser -- sepgsql -c "./initdb.sepgsql --enable-selinux --pgdata='${SEPGSQL_DATA}' --auth='ident'" \
 	    >> "${SEPGSQL_STARTUP_LOG}" 2>&1 < /dev/null
 	if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
 	    echo_success


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sepostgresql.spec	27 Jul 2009 04:09:56 -0000	1.38
+++ sepostgresql.spec	19 Aug 2009 12:00:30 -0000	1.39
@@ -11,8 +11,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.3.7
-Release: 1991%{?dist}
+Version: 8.4.0
+Release: 2237%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -21,13 +21,11 @@ Source0: ftp://ftp.postgresql.org/pub/so
 Source1: sepostgresql.init
 Source2: sepostgresql.8
 Source3: sepostgresql.logrotate
-Patch0: sepostgresql-core-8.3.patch
-Patch1: sepostgresql-utils-8.3.patch
-Patch2: sepostgresql-test-8.3.patch
-Patch3: sepostgresql-fedora-prefix.patch
+Patch0: sepostgresql-8.4.patch
+Patch1: sepostgresql-fedora-prefix.patch
 BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4
 BuildRequires: checkpolicy libselinux-devel >= 2.0.80
-BuildRequires: selinux-policy >= 3.4.2
+BuildRequires: selinux-policy >= 3.6.8
 %if %{ssl}
 BuildRequires: openssl-devel
 %endif
@@ -36,8 +34,8 @@ Requires(post): policycoreutils /sbin/ch
 Requires(preun): /sbin/chkconfig /sbin/service
 Requires(postun): policycoreutils
 Requires: postgresql-server = %{version}
-Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.43
-Requires: selinux-policy >= 3.4.2
+Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.80
+Requires: selinux-policy >= 3.6.8
 Requires: tzdata logrotate
 
 %description
@@ -52,8 +50,6 @@ reference monitor to check any SQL query
 %setup -q -n postgresql-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
@@ -81,12 +77,9 @@ rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
 
-for store in %{selinux_policy_stores}
-do
-    install -d %{buildroot}%{_datadir}/selinux/${store}
-    install -p -m 644 src/backend/security/sepgsql/policy/sepostgresql-devel.pp.${store} \
-               %{buildroot}%{_datadir}/selinux/${store}/sepostgresql-devel.pp
-done
+install -d %{buildroot}%{_datadir}/selinux/packages
+install -p -m 644 src/backend/security/sepgsql/policy/sepostgresql-devel.pp \
+                  %{buildroot}%{_datadir}/selinux/packages
 
 # avoid to conflict with native postgresql package
 mv %{buildroot}%{_bindir}  %{buildroot}%{_bindir}.orig
@@ -142,7 +135,7 @@ do
     %{_sbindir}/semodule -s ${store} -r sepostgresql >& /dev/null || :
     if %{_sbindir}/semodule -s ${store} -l 2>/dev/null | grep -Eq "^sepostgresql-devel"; then
         %{_sbindir}/semodule -s ${store}    \
-            -i %{_datadir}/selinux/${store}/sepostgresql-devel.pp >& /dev/null || :
+            -i %{_datadir}/selinux/packages/sepostgresql-devel.pp >& /dev/null || :
     fi
 done
 
@@ -193,12 +186,15 @@ fi
 %{_datadir}/sepgsql/conversion_create.sql
 %{_datadir}/sepgsql/information_schema.sql
 %{_datadir}/sepgsql/sql_features.txt
-%attr(644,root,root) %{_datadir}/selinux/*/sepostgresql-devel.pp
+%attr(644,root,root) %{_datadir}/selinux/packages/sepostgresql-devel.pp
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/data
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Wed Aug 19 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.0-2237
+- Upgrade SE-PostgreSQL to 8.4.x series
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.3.7-1991
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Mar 2009 03:54:13 -0000	1.11
+++ sources	19 Aug 2009 12:00:30 -0000	1.12
@@ -1 +1 @@
-7b7e91a2221e55fe1b167e663217a96d  postgresql-8.3.7.tar.bz2
+1f172d5f60326e972837f58fa5acd130  postgresql-8.4.0.tar.bz2


--- sepostgresql-core-8.3.patch DELETED ---


--- sepostgresql-test-8.3.patch DELETED ---


--- sepostgresql-utils-8.3.patch DELETED ---



From cebbert at fedoraproject.org  Wed Aug 19 12:24:34 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 19 Aug 2009 12:24:34 +0000 (UTC)
Subject: rpms/kernel/devel/scripts sort-config,1.3,1.4
Message-ID: <20090819122434.3AE6B11C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30379

Modified Files:
	sort-config 
Log Message:
show what the input option became in the target


Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/sort-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sort-config	17 Aug 2009 10:36:31 -0000	1.3
+++ sort-config	19 Aug 2009 12:24:33 -0000	1.4
@@ -78,7 +78,7 @@ cat ${SRCFILE} | while read TEXT ; do
          if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
             OPTNAME=${TEXT%%=*}
          elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
-            OPTNAME=${TEXT%"is not set"}
+            OPTNAME=${TEXT%" is not set"}
             OPTNAME=${OPTNAME#\# }
          fi
          if [ "$OPTNAME" ] ; then
@@ -87,12 +87,18 @@ cat ${SRCFILE} | while read TEXT ; do
                   [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
                   LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
                   if [ "$LINE" ] ; then
+                     CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
                      if [ "$FORCE" ] ; then
-                        TEXT=$(grep "$FINDTEXT" $TGTFILE | head -1)
+                        TEXT="$CHANGED"
                         [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
                      else
                         if [ "$ADDCOMMENT" ] ; then
-                           COMMENT="# -- Next option was changed in target line $LINE --"
+                           if [ ${CHANGED:0:1} = '#' ] ; then
+                              NEWOPT="not set"
+                           else
+                              NEWOPT=${CHANGED#$OPTNAME}
+                           fi
+                           COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                         fi
                      fi
                   fi



From kaigai at fedoraproject.org  Wed Aug 19 12:26:11 2009
From: kaigai at fedoraproject.org (KaiGai Kohei)
Date: Wed, 19 Aug 2009 12:26:11 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql-fedora-prefix.patch, 1.1,
	1.2 sepostgresql.spec, 1.39, 1.40
Message-ID: <20090819122611.484AF11C00E4@cvs1.fedora.phx.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30587

Modified Files:
	sepostgresql-fedora-prefix.patch sepostgresql.spec 
Log Message:
update: sepostgresql-fedora-prefix.patch for 8.4.x
 and fixes in sepostgresql.spec


sepostgresql-fedora-prefix.patch:
 Makefile.global.in       |   10 +++++-----
 bin/initdb/initdb.c      |    2 +-
 bin/pg_ctl/pg_ctl.c      |    2 +-
 bin/pg_dump/pg_dumpall.c |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

Index: sepostgresql-fedora-prefix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-fedora-prefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sepostgresql-fedora-prefix.patch	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql-fedora-prefix.patch	19 Aug 2009 12:26:11 -0000	1.2
@@ -1,8 +1,8 @@
-Index: trunk/src/Makefile.global.in
+Index: sepgsql/src/Makefile.global.in
 ===================================================================
---- trunk/src/Makefile.global.in	(revision 430)
-+++ trunk/src/Makefile.global.in	(working copy)
-@@ -73,14 +73,14 @@
+--- sepgsql/src/Makefile.global.in	(revision 2237)
++++ sepgsql/src/Makefile.global.in	(working copy)
+@@ -75,14 +75,14 @@
  datadir := @datadir@
  ifeq "$(findstring pgsql, $(datadir))" ""
  ifeq "$(findstring postgres, $(datadir))" ""
@@ -19,7 +19,7 @@ Index: trunk/src/Makefile.global.in
  endif
  endif
  
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
  pkglibdir = $(libdir)
  ifeq "$(findstring pgsql, $(pkglibdir))" ""
  ifeq "$(findstring postgres, $(pkglibdir))" ""
@@ -28,7 +28,7 @@ Index: trunk/src/Makefile.global.in
  endif
  endif
  
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@
  pkgincludedir = $(includedir)
  ifeq "$(findstring pgsql, $(pkgincludedir))" ""
  ifeq "$(findstring postgres, $(pkgincludedir))" ""
@@ -38,45 +38,45 @@ Index: trunk/src/Makefile.global.in
  endif
  
 @@ -109,7 +109,7 @@
- ifneq (,$(docdir))
+ docdir := @docdir@
  ifeq "$(findstring pgsql, $(docdir))" ""
  ifeq "$(findstring postgres, $(docdir))" ""
 -override docdir := $(docdir)/postgresql
 +override docdir := $(docdir)/sepgsql
  endif
  endif
- endif
-Index: trunk/src/bin/pg_ctl/pg_ctl.c
+ 
+Index: sepgsql/src/bin/pg_ctl/pg_ctl.c
 ===================================================================
---- trunk/src/bin/pg_ctl/pg_ctl.c	(revision 429)
-+++ trunk/src/bin/pg_ctl/pg_ctl.c	(working copy)
-@@ -557,7 +557,7 @@
+--- sepgsql/src/bin/pg_ctl/pg_ctl.c	(revision 2237)
++++ sepgsql/src/bin/pg_ctl/pg_ctl.c	(working copy)
+@@ -643,7 +643,7 @@
  
  		postmaster_path = pg_malloc(MAXPGPATH);
  
--		if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR,
-+		if ((ret = find_other_exec(argv0, "sepostgres", PM_VERSIONSTR,
+-		if ((ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,
++		if ((ret = find_other_exec(argv0, "sepostgres", PG_BACKEND_VERSIONSTR,
  								   postmaster_path)) < 0)
  		{
  			char		full_path[MAXPGPATH];
-Index: trunk/src/bin/initdb/initdb.c
+Index: sepgsql/src/bin/initdb/initdb.c
 ===================================================================
---- trunk/src/bin/initdb/initdb.c	(revision 429)
-+++ trunk/src/bin/initdb/initdb.c	(working copy)
-@@ -2646,7 +2646,7 @@
+--- sepgsql/src/bin/initdb/initdb.c	(revision 2237)
++++ sepgsql/src/bin/initdb/initdb.c	(working copy)
+@@ -2763,7 +2763,7 @@
  	sprintf(pgdenv, "PGDATA=%s", pg_data);
  	putenv(pgdenv);
  
--	if ((ret = find_other_exec(argv[0], "postgres", PG_VERSIONSTR,
-+	if ((ret = find_other_exec(argv[0], "sepostgres", PG_VERSIONSTR,
+-	if ((ret = find_other_exec(argv[0], "postgres", PG_BACKEND_VERSIONSTR,
++	if ((ret = find_other_exec(argv[0], "sepostgres", PG_BACKEND_VERSIONSTR,
  							   backend_exec)) < 0)
  	{
  		char		full_path[MAXPGPATH];
-Index: trunk/src/bin/pg_dump/pg_dumpall.c
+Index: sepgsql/src/bin/pg_dump/pg_dumpall.c
 ===================================================================
---- trunk/src/bin/pg_dump/pg_dumpall.c	(revision 429)
-+++ trunk/src/bin/pg_dump/pg_dumpall.c	(working copy)
-@@ -139,7 +139,7 @@
+--- sepgsql/src/bin/pg_dump/pg_dumpall.c	(revision 2237)
++++ sepgsql/src/bin/pg_dump/pg_dumpall.c	(working copy)
+@@ -157,7 +157,7 @@
  		}
  	}
  


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sepostgresql.spec	19 Aug 2009 12:00:30 -0000	1.39
+++ sepostgresql.spec	19 Aug 2009 12:26:11 -0000	1.40
@@ -94,7 +94,7 @@ mv %{buildroot}%{_bindir}.orig/pg_dumpal
 rm -rf %{buildroot}%{_bindir}.orig
 rm -rf %{buildroot}%{_libdir}
 rm -rf %{buildroot}%{_includedir}
-rm -rf %{buildroot}%{_usr}/doc
+rm -rf %{buildroot}%{_datadir}/doc
 rm -rf %{buildroot}%{_datadir}/sepgsql/timezone
 rm -rf %{buildroot}%{_mandir}
 



From silfreed at fedoraproject.org  Wed Aug 19 12:30:50 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Wed, 19 Aug 2009 12:30:50 +0000 (UTC)
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.43,1.44
Message-ID: <20090819123050.9489111C00E4@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31896

Modified Files:
	syslog-ng.spec 
Log Message:
fixing changelog and revision


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- syslog-ng.spec	19 Aug 2009 06:07:30 -0000	1.43
+++ syslog-ng.spec	19 Aug 2009 12:30:50 -0000	1.44
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -219,9 +219,12 @@ fi
 
 
 %changelog
-* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-2
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
 - Init script fix (bug#517339)
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically



From cebbert at fedoraproject.org  Wed Aug 19 12:46:27 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 19 Aug 2009 12:46:27 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.1111, 1.1112 kernel.spec, 1.1727,
	1.1728 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.3,
	1.4 sources, 1.1069, 1.1070 upstream, 1.983,
	1.984 patch-2.6.31-rc6-git3.bz2.sign, 1.1, NONE
Message-ID: <20090819124627.AF03D11C00E4@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3856

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-debug-vm-would-have-oomkilled.patch sources upstream 
Added Files:
	patch-2.6.31-rc6-git5.bz2.sign 
Removed Files:
	patch-2.6.31-rc6-git3.bz2.sign 
Log Message:
2.6.31-rc6-git5
Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2
  because upstream changes to oom-kill.c were all reverted.


--- NEW FILE patch-2.6.31-rc6-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKi+n3yGugalF9Dw4RAmtPAJ9MrnT+S9WZG49Gxiey0YVOYXuf0gCfdmZF
Gd4a9i65mtKqTyWxP6K+/qk=
=YMyk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1111
retrieving revision 1.1112
diff -u -p -r1.1111 -r1.1112
--- .cvsignore	18 Aug 2009 17:38:10 -0000	1.1111
+++ .cvsignore	19 Aug 2009 12:46:26 -0000	1.1112
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git3.bz2
+patch-2.6.31-rc6-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1727
retrieving revision 1.1728
diff -u -p -r1.1727 -r1.1728
--- kernel.spec	18 Aug 2009 18:27:39 -0000	1.1727
+++ kernel.spec	19 Aug 2009 12:46:26 -0000	1.1728
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1998,6 +1998,11 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 19 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc6-git5
+- Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2
+  because upstream changes to oom-kill.c were all reverted.
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Fix up perf so that it builds docs now that they are fixed.
 - with_docs disables perf docs too. be warned. (logic is that the

linux-2.6-debug-vm-would-have-oomkilled.patch:
 kernel/sysctl.c |    9 +++++++++
 mm/oom_kill.c   |   13 +++++++++++++
 2 files changed, 22 insertions(+)

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-debug-vm-would-have-oomkilled.patch	8 Jul 2009 17:28:48 -0000	1.3
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	19 Aug 2009 12:46:27 -0000	1.4
@@ -1,18 +1,8 @@
-From a0e012e118c2b0eba399e213a7989fd2b880f8b7 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Wed, 8 Jul 2009 13:05:46 -0400
-Subject: [PATCH 5/6] fedora: linux-2.6-debug-vm-would-have-oomkilled.patch
-
----
- kernel/sysctl.c |    9 +++++++++
- mm/oom_kill.c   |   14 ++++++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 98e0232..0cfe3ab 100644
+index b2a2d68..3b132ee 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -73,6 +73,7 @@ extern int sysctl_overcommit_ratio;
+@@ -67,6 +67,7 @@ extern int sysctl_overcommit_ratio;
  extern int sysctl_panic_on_oom;
  extern int sysctl_oom_kill_allocating_task;
  extern int sysctl_oom_dump_tasks;
@@ -20,7 +10,7 @@ index 98e0232..0cfe3ab 100644
  extern int max_threads;
  extern int core_uses_pid;
  extern int suid_dumpable;
-@@ -1031,6 +1032,14 @@ static struct ctl_table vm_table[] = {
+@@ -861,6 +862,14 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -36,7 +26,7 @@ index 98e0232..0cfe3ab 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index 175a67a..4ab4bdb 100644
+index f255eda..3335a94 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -47,9 +37,9 @@ index 175a67a..4ab4bdb 100644
  static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
-@@ -328,6 +329,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
- 	if (!p->mm)
+@@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
  		return;
+ 	}
  
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
@@ -60,11 +50,10 @@ index 175a67a..4ab4bdb 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -355,6 +362,13 @@ static int oom_kill_task(struct task_struct *p)
- 		return 1;
- 	}
- 	task_unlock(p);
-+
+@@ -363,6 +370,12 @@ static int oom_kill_task(struct task_struct *p)
+ 			return 1;
+ 	} while_each_thread(g, q);
+ 
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
 +				task_pid_nr(p), p->comm);
@@ -74,6 +63,3 @@ index 175a67a..4ab4bdb 100644
  	__oom_kill_task(p, 1);
  
  	/*
--- 
-1.6.2.5
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1069
retrieving revision 1.1070
diff -u -p -r1.1069 -r1.1070
--- sources	18 Aug 2009 17:38:10 -0000	1.1069
+++ sources	19 Aug 2009 12:46:27 -0000	1.1070
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-67d0b1917a80534f0a7f3aa2c2897509  patch-2.6.31-rc6-git3.bz2
+6128f58fd777f9b64ea5c2fa13049021  patch-2.6.31-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -p -r1.983 -r1.984
--- upstream	18 Aug 2009 17:38:11 -0000	1.983
+++ upstream	19 Aug 2009 12:46:27 -0000	1.984
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git3.bz2
+patch-2.6.31-rc6-git5.bz2


--- patch-2.6.31-rc6-git3.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Wed Aug 19 12:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 12:48:17 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090819124817.536C410F85B@bastion2.fedora.phx.redhat.com>

overholt has set the watchbugzilla acl on aqute-bndlib (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Wed Aug 19 12:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 12:48:17 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090819124818.EF03410F888@bastion2.fedora.phx.redhat.com>

overholt has set the watchcommits acl on aqute-bndlib (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Wed Aug 19 12:48:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 12:48:18 +0000
Subject: [pkgdb] aqute-bndlib had acl change status
Message-ID: <20090819124819.0EE1510F897@bastion2.fedora.phx.redhat.com>

overholt has set the commit acl on aqute-bndlib (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/aqute-bndlib



From cwickert at fedoraproject.org  Wed Aug 19 13:06:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 19 Aug 2009 13:06:17 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xfce4-dev-tools.spec, 1.11, 1.12
Message-ID: <20090819130617.9FE6311C00E4@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dev-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
* Wed Aug 19 2009 Christoph Wickert <fedora christoph-wickert de> - 4.7.0-1
- Update to 4.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	27 Feb 2009 20:51:38 -0000	1.8
+++ .cvsignore	19 Aug 2009 13:06:17 -0000	1.9
@@ -1 +1 @@
-xfce4-dev-tools-4.6.0.tar.bz2
+xfce4-dev-tools-4.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	27 Feb 2009 20:51:37 -0000	1.8
+++ sources	19 Aug 2009 13:06:17 -0000	1.9
@@ -1 +1 @@
-c9587fa78e877eee858a33391d0afd62  xfce4-dev-tools-4.6.0.tar.bz2
+6077a9d0b64e89f213520eb7d9b2aa91  xfce4-dev-tools-4.7.0.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xfce4-dev-tools.spec	27 Jul 2009 07:50:48 -0000	1.11
+++ xfce4-dev-tools.spec	19 Aug 2009 13:06:17 -0000	1.12
@@ -1,12 +1,12 @@
 Name:		xfce4-dev-tools
-Version:	4.6.0
-Release:	2%{?dist}
+Version:	4.7.0
+Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://xfce.org/~benny/projects/xfce4-dev-tools/
-Source0: 	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+Source0: 	http://archive.xfce.org/src/xfce/xfce4-dev-tools/4.7/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	glib2-devel, gettext-devel, gtk-doc, libtool, intltool, make
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Aug 19 2009 Christoph Wickert <fedora christoph-wickert de> - 4.7.0-1
+- Update to 4.7.0
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Wed Aug 19 13:07:41 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 19 Aug 2009 13:07:41 +0000 (UTC)
Subject: rpms/maven2-common-poms/devel maven2-common-poms.spec,1.7,1.8
Message-ID: <20090819130741.7B8C811C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9982

Modified Files:
	maven2-common-poms.spec 
Log Message:
* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.0-8
- From Yong Yang:
- Fix JPP.excalibur-logkit.pom's version by sed


Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- maven2-common-poms.spec	18 Aug 2009 19:53:55 -0000	1.7
+++ maven2-common-poms.spec	19 Aug 2009 13:07:41 -0000	1.8
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           7%{?dist}
+Release:           8%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -59,6 +59,9 @@ packages.
 %prep
 %setup -q -n %{name}
 
+# update logkit version to 1.2.2
+sed -i "s|1.0.1|1.2.2|" JPP.excalibur-logkit.pom
+
 tar xzf %{SOURCE2}
 
 %build
@@ -88,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2
 
 %changelog
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.0-8
+- From Yong Yang:
+- Fix JPP.excalibur-logkit.pom's version by sed
+
 * Tue Aug 18 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-7
 - Changes from Deepak Bhole:
 - Updated depmap



From dwalsh at fedoraproject.org  Wed Aug 19 13:08:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 19 Aug 2009 13:08:28 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.26,
	1.27
Message-ID: <20090819130828.A01DE11C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10257

Modified Files:
	policycoreutils-sepolgen.patch 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-4
- Add --boot flag to audit2allow to get all AVC messages since last boot


policycoreutils-sepolgen.patch:
 audit.py     |   32 ++++++++++++++++++++++++++++++++
 refparser.py |    2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- policycoreutils-sepolgen.patch	18 Aug 2009 19:25:06 -0000	1.26
+++ policycoreutils-sepolgen.patch	19 Aug 2009 13:08:28 -0000	1.27
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/audit.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/audit.py
 --- nsasepolgen/src/sepolgen/audit.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/audit.py	2009-08-18 15:21:13.000000000 -0400
++++ policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/audit.py	2009-08-18 15:21:13.000000000 -0400
 @@ -23,6 +23,27 @@
  
  # Convenience functions
@@ -47,9 +47,9 @@ diff --exclude-from=exclude -N -u -r nsa
  # Classes representing audit messages
  
  class AuditMessage:
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/refparser.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/sepolgen-1.0.16/src/sepolgen/refparser.py	2009-08-13 17:57:55.000000000 -0400
++++ policycoreutils-2.0.71/sepolgen-1.0.17/src/sepolgen/refparser.py	2009-08-13 17:57:55.000000000 -0400
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []



From cwickert at fedoraproject.org  Wed Aug 19 13:10:40 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 19 Aug 2009 13:10:40 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel xfce4-dev-tools.spec,1.12,1.13
Message-ID: <20090819131040.1FD8D11C0439@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dev-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10802

Modified Files:
	xfce4-dev-tools.spec 
Log Message:
use %{?_smp_mflags}


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xfce4-dev-tools.spec	19 Aug 2009 13:06:17 -0000	1.12
+++ xfce4-dev-tools.spec	19 Aug 2009 13:10:39 -0000	1.13
@@ -21,7 +21,7 @@ that want to build Xfce from SVN.
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT



From akurtakov at fedoraproject.org  Wed Aug 19 13:22:17 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 13:22:17 +0000 (UTC)
Subject: rpms/directory-naming/devel naming-management-0.8.pom, NONE,
	1.1 directory-naming.spec, NONE, 1.1 naming-core-0.8.pom, NONE,
	1.1 directory-naming-0.8-project.patch, NONE,
	1.1 naming-resources-0.8.pom, NONE, 1.1 naming-java-0.8.pom,
	NONE, 1.1 naming-config-0.8.pom, NONE,
	1.1 naming-factory-0.8.pom, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090819132217.BFA9511C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14020/devel

Modified Files:
	.cvsignore sources 
Added Files:
	naming-management-0.8.pom directory-naming.spec 
	naming-core-0.8.pom directory-naming-0.8-project.patch 
	naming-resources-0.8.pom naming-java-0.8.pom 
	naming-config-0.8.pom naming-factory-0.8.pom 
Log Message:
Initial import.


--- NEW FILE naming-management-0.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>directory-naming</groupId>
  <artifactId>naming-management</artifactId>
  <name>Naming Management</name>
  <version>0.8</version>
  <dependencies>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-core</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>mx4j</groupId>
      <artifactId>mx4j-jmx</artifactId>
      <version>1.1.1</version>
    </dependency>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-java</artifactId>
      <version>${pom.version}</version>
    </dependency>
  </dependencies>
</project>

--- NEW FILE directory-naming.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

Name:           directory-naming
Version:        0.8
Release:        4%{?dist}
Epoch:          0
Summary:        Directory Naming
License:        ASL 2.0
URL:            http://directory.apache.org
Group:          Development/Libraries/Java

Source0:        directory-naming-0.8.tar.gz
# svn export -r 124846 http://svn.apache.org/repos/asf/directory/sandbox/dormant-subprojects/naming/ directory-naming-0.8

Source5:        http://repo1.maven.org/maven2/directory-naming/naming-core/0.8/naming-core-0.8.pom
Source6:        http://repo1.maven.org/maven2/directory-naming/naming-config/0.8/naming-config-0.8.pom
Source7:        http://repo1.maven.org/maven2/directory-naming/naming-factory/0.8/naming-factory-0.8.pom
Source8:        http://repo1.maven.org/maven2/directory-naming/naming-java/0.8/naming-java-0.8.pom
Source9:        http://repo1.maven.org/maven2/directory-naming/naming-management/0.8/naming-management-0.8.pom
Source10:       http://repo1.maven.org/maven2/directory-naming/naming-resources/0.8/naming-resources-0.8.pom

Patch0:         directory-naming-0.8-project.patch

BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  java-devel >= 0:1.4.2
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  hsqldb
BuildRequires:  junit
BuildRequires:  ant-junit
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-dbcp
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-lang
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-pool
BuildRequires:  classpathx-mail
BuildRequires:  mx4j

Requires:  jakarta-commons-beanutils
Requires:  jakarta-commons-collections
Requires:  jakarta-commons-dbcp
Requires:  jakarta-commons-digester
Requires:  jakarta-commons-lang
Requires:  jakarta-commons-logging
Requires:  jakarta-commons-pool
Requires:  classpathx-mail
Requires:  mx4j
Requires(post):    jpackage-utils >= 0:1.7.3
Requires(postun):  jpackage-utils >= 0:1.7.3

%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{gcj_support}
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif

%description
Old directory/naming module.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post): /bin/rm /bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%prep
%setup -q 
# remove all binary libs
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
%patch0 -b .sav0

%build
export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-collections \
commons-dbcp \
commons-digester \
commons-lang \
commons-logging \
commons-pool \
hsqldb \
javamail \
junit \
mx4j/mx4j-jmx \
)

CLASSPATH=$CLASSPATH:$(pwd)/naming-config/target/classes:$(pwd)/naming-config/target/test-classes
CLASSPATH=$CLASSPATH:$(pwd)/naming-core/target/classes:$(pwd)/naming-core/target/test-classes
CLASSPATH=$CLASSPATH:$(pwd)/naming-factory/target/classes:$(pwd)/naming-factory/target/test-classes
CLASSPATH=$CLASSPATH:$(pwd)/naming-java/target/classes:$(pwd)/naming-java/target/test-classes
CLASSPATH=$CLASSPATH:$(pwd)/naming-management/target/classes:$(pwd)/naming-management/target/test-classes
CLASSPATH=$CLASSPATH:$(pwd)/naming-resources/target/classes:$(pwd)/naming-resources/target/test-classes

#FIXME failed to create task or type setproxy
for f in $(find . -name build.xml); do
    sed -i "s|<setproxy>|<!-- <setproxy> -->|g" $f
    sed -i "s|</setproxy>|<!-- </setproxy> -->|g" $f
done;

#sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
#sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml

#sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
#sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml


export OPT_JAR_LIST="junit ant/ant-junit"

#ant -Dbuild.sysclasspath=only jar javadoc
ant jar javadoc

%install
rm -rf %{buildroot}
# jars
%__mkdir_p %{buildroot}%{_javadir}/%{name}
for p in \
         naming-config \
         naming-core \
         naming-factory \
         naming-java \
         naming-management \
         naming-resources \
         ; do
%__install -m 644 $p/target/$p-%{version}.jar %{buildroot}%{_javadir}/%{name}/$p-%{version}.jar
done
(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
%__mkdir_p %{buildroot}%{_datadir}/maven2/poms
%__install -m 644 %{SOURCE5}  %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-naming-core.pom
%add_to_maven_depmap %{name} naming-core %{version} JPP/%{name} naming-core
%__install -m 644 %{SOURCE6}  %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-naming-config.pom
%add_to_maven_depmap %{name} naming-config %{version} JPP/%{name} naming-config
%__install -m 644 %{SOURCE7}  %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-naming-factory.pom
%add_to_maven_depmap %{name} naming-factory %{version} JPP/%{name} naming-factory
%__install -m 644 %{SOURCE8}  %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-naming-java.pom
%add_to_maven_depmap %{name} naming-java %{version} JPP/%{name} naming-java
%__install -m 644 %{SOURCE9}  %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-naming-management.pom
%add_to_maven_depmap %{name} naming-management %{version} JPP/%{name} naming-management
%__install -m 644 %{SOURCE10} %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-naming-resources.pom
%add_to_maven_depmap %{name} naming-resources %{version} JPP/%{name} naming-resources

# docs
%__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
%__cp LICENSE.txt  %{buildroot}%{_docdir}/%{name}-%{version}

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
%__rm -rf %{buildroot}

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}/LICENSE.txt 
%{_javadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%changelog
* Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> - 0.8-4
- Fix license

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> - 0.8-3
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 0.8-2
- Initial building on JPP6

* Wed Apr 09 2008 Deepak Bhole <dbhole at redhat.com> 0.8-1jpp.1
- Import from jpp, remove maven (1.x) build, update per Fedora guidelines

* Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> 0:0.8-1jpp
- First release



--- NEW FILE naming-core-0.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>directory-naming</groupId>
  <artifactId>naming-core</artifactId>
  <name>Naming Core</name>
  <version>0.8</version>
  <dependencies>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0.3</version>
    </dependency>
  </dependencies>
</project>
directory-naming-0.8-project.patch:
 project.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE directory-naming-0.8-project.patch ---
--- project.xml.sav	2007-11-28 17:40:39.000000000 +0100
+++ project.xml	2007-11-28 17:44:26.000000000 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project>
   
-  <version>3</version>
+  <pomVersion>3</pomVersion>
   <name>directory-naming</name>
   <artifactId>naming-parent</artifactId>
   <groupId>incubator-directory</groupId>


--- NEW FILE naming-resources-0.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>directory-naming</groupId>
  <artifactId>naming-resources</artifactId>
  <name>Naming Resources</name>
  <version>0.8</version>
  <dependencies>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-core</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0.3</version>
    </dependency>
  </dependencies>
</project>

--- NEW FILE naming-java-0.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>directory-naming</groupId>
  <artifactId>naming-java</artifactId>
  <name>Naming Java</name>
  <version>0.8</version>
  <dependencies>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-core</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0.3</version>
    </dependency>
  </dependencies>
</project>

--- NEW FILE naming-config-0.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>directory-naming</groupId>
  <artifactId>naming-config</artifactId>
  <name>Naming Config</name>
  <version>0.8</version>
  <dependencies>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-core</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-factory</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0.3</version>
    </dependency>
    <dependency>
      <groupId>commons-lang</groupId>
      <artifactId>commons-lang</artifactId>
      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>commons-digester</groupId>
      <artifactId>commons-digester</artifactId>
      <version>1.4.1</version>
    </dependency>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-java</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>commons-beanutils</groupId>
      <artifactId>commons-beanutils</artifactId>
      <version>1.6.1</version>
    </dependency>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>3.1</version>
    </dependency>
    <dependency>
      <groupId>commons-dbcp</groupId>
      <artifactId>commons-dbcp</artifactId>
      <version>1.0</version>
    </dependency>
    <dependency>
      <groupId>commons-pool</groupId>
      <artifactId>commons-pool</artifactId>
      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>hsqldb</groupId>
      <artifactId>hsqldb</artifactId>
      <version>1.7.1</version>
    </dependency>
  </dependencies>
</project>

--- NEW FILE naming-factory-0.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>directory-naming</groupId>
  <artifactId>naming-factory</artifactId>
  <name>Naming Factories</name>
  <version>0.8</version>
  <dependencies>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0.3</version>
    </dependency>
    <dependency>
      <groupId>${pom.groupId}</groupId>
      <artifactId>naming-core</artifactId>
      <version>${pom.version}</version>
    </dependency>
    <dependency>
      <groupId>javax.mail</groupId>
      <artifactId>javamail</artifactId>
      <version>1.3.1-rc1</version>
    </dependency>
  </dependencies>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 May 2009 23:48:56 -0000	1.1
+++ .cvsignore	19 Aug 2009 13:22:17 -0000	1.2
@@ -0,0 +1 @@
+directory-naming-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 May 2009 23:48:56 -0000	1.1
+++ sources	19 Aug 2009 13:22:17 -0000	1.2
@@ -0,0 +1 @@
+28d16d012ced076f84c986fed13b87ef  directory-naming-0.8.tar.gz



From diegobz at fedoraproject.org  Wed Aug 19 13:35:43 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Wed, 19 Aug 2009 13:35:43 +0000 (UTC)
Subject: rpms/python-polib/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-polib.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090819133543.EE10211C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17884/devel

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.4.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Mar 2009 13:28:52 -0000	1.2
+++ .cvsignore	19 Aug 2009 13:35:43 -0000	1.3
@@ -1 +1 @@
-polib-0.4.0-r60.tar.gz
+polib-0.4.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Mar 2009 13:28:53 -0000	1.1
+++ import.log	19 Aug 2009 13:35:43 -0000	1.2
@@ -1 +1,2 @@
 python-polib-0_4_0-1_20080217svnr60:HEAD:python-polib-0.4.0-1.20080217svnr60.src.rpm:1236173174
+python-polib-0_4_2-1_fc11:HEAD:python-polib-0.4.2-1.fc11.src.rpm:1250689023


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/python-polib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-polib.spec	26 Jul 2009 20:52:00 -0000	1.2
+++ python-polib.spec	19 Aug 2009 13:35:43 -0000	1.3
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define alphatag r60
+#%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.0
-Release:        2%{?dist}.20080217svn%{alphatag}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
 Group:          Development/Languages
@@ -12,7 +12,8 @@ License:        MIT
 URL:            http://code.google.com/p/polib/
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
-Source0:        polib-%{version}-%{alphatag}.tar.gz
+#Source0:        polib-%{version}-%{alphatag}.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,7 @@ functions 'pofile', 'mofile' and 'detect
 POFile, MOFile, POEntry and MOEntry for creating new files/entries.
 
 %prep
-%setup -q -n polib-%{version}-%{alphatag}
+%setup -q -n polib-%{version}
 
 %build
 %{__python} setup.py build
@@ -43,10 +44,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE README docs/
+%doc LICENSE README docs/
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
+- Updated to 0.4.2 release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2.20080217svnr60
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Mar 2009 13:28:53 -0000	1.2
+++ sources	19 Aug 2009 13:35:43 -0000	1.3
@@ -1 +1 @@
-3ccfa697940893f48107689b5f0ddebf  polib-0.4.0-r60.tar.gz
+1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 19 13:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 13:36:29 +0000
Subject: [pkgdb] easymock2 was added for akurtakov
Message-ID: <20090819133629.A444E10F859@bastion2.fedora.phx.redhat.com>

ausil has added Package easymock2 with summary Easy mock objects
ausil has approved Package easymock2
ausil has added a Fedora devel branch for easymock2 with an owner of akurtakov
ausil has approved easymock2 in Fedora devel
ausil has approved Package easymock2
ausil has set commit to Approved for 107427 on easymock2 (Fedora devel)
ausil has set checkout to Approved for 107427 on easymock2 (Fedora devel)
ausil has set build to Approved for 107427 on easymock2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock2



From pkgdb at fedoraproject.org  Wed Aug 19 13:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 13:36:30 +0000
Subject: [pkgdb] easymock2 summary updated by ausil
Message-ID: <20090819133630.8997810F865@bastion2.fedora.phx.redhat.com>

ausil set package easymock2 summary to Easy mock objects

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/easymock2



From ausil at fedoraproject.org  Wed Aug 19 13:36:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 19 Aug 2009 13:36:37 +0000 (UTC)
Subject: rpms/easymock2 - New directory
Message-ID: <20090819133637.2A1BB11C00E4@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/easymock2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH18366/rpms/easymock2

Log Message:
Directory /cvs/pkgs/rpms/easymock2 added to the repository




From ausil at fedoraproject.org  Wed Aug 19 13:36:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 19 Aug 2009 13:36:37 +0000 (UTC)
Subject: rpms/easymock2/devel - New directory
Message-ID: <20090819133637.4968711C02CB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/easymock2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH18366/rpms/easymock2/devel

Log Message:
Directory /cvs/pkgs/rpms/easymock2/devel added to the repository




From ausil at fedoraproject.org  Wed Aug 19 13:36:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 19 Aug 2009 13:36:43 +0000 (UTC)
Subject: rpms/easymock2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819133643.8E52F11C02CB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/easymock2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH18366/rpms/easymock2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module easymock2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: easymock2
# $Id: Makefile,v 1.1 2009/08/19 13:36:43 ausil Exp $
NAME := easymock2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ausil at fedoraproject.org  Wed Aug 19 13:36:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 19 Aug 2009 13:36:43 +0000 (UTC)
Subject: rpms/easymock2 Makefile,NONE,1.1
Message-ID: <20090819133643.6430011C00E4@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/easymock2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsH18366/rpms/easymock2

Added Files:
	Makefile 
Log Message:
Setup of module easymock2


--- NEW FILE Makefile ---
# Top level Makefile for module easymock2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From diegobz at fedoraproject.org  Wed Aug 19 13:41:04 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Wed, 19 Aug 2009 13:41:04 +0000 (UTC)
Subject: rpms/python-polib/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-polib.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090819134104.BA2BD11C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19524/F-11

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.4.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Mar 2009 13:28:52 -0000	1.2
+++ .cvsignore	19 Aug 2009 13:41:04 -0000	1.3
@@ -1 +1 @@
-polib-0.4.0-r60.tar.gz
+polib-0.4.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Mar 2009 13:28:53 -0000	1.1
+++ import.log	19 Aug 2009 13:41:04 -0000	1.2
@@ -1 +1,2 @@
 python-polib-0_4_0-1_20080217svnr60:HEAD:python-polib-0.4.0-1.20080217svnr60.src.rpm:1236173174
+python-polib-0_4_2-1_fc11:F-11:python-polib-0.4.2-1.fc11.src.rpm:1250689348


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/python-polib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-polib.spec	4 Mar 2009 13:28:53 -0000	1.1
+++ python-polib.spec	19 Aug 2009 13:41:04 -0000	1.2
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define alphatag r60
+#%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.0
-Release:        1%{?dist}.20080217svn%{alphatag}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
 Group:          Development/Languages
@@ -12,7 +12,8 @@ License:        MIT
 URL:            http://code.google.com/p/polib/
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
-Source0:        polib-%{version}-%{alphatag}.tar.gz
+#Source0:        polib-%{version}-%{alphatag}.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,7 @@ functions 'pofile', 'mofile' and 'detect
 POFile, MOFile, POEntry and MOEntry for creating new files/entries.
 
 %prep
-%setup -q -n polib-%{version}-%{alphatag}
+%setup -q -n polib-%{version}
 
 %build
 %{__python} setup.py build
@@ -43,10 +44,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE README docs/
+%doc LICENSE README docs/
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
+- Updated to 0.4.2 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2.20080217svnr60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 18 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.4.0-1.20080217svnr60
 - Initial RPM release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Mar 2009 13:28:53 -0000	1.2
+++ sources	19 Aug 2009 13:41:04 -0000	1.3
@@ -1 +1 @@
-3ccfa697940893f48107689b5f0ddebf  polib-0.4.0-r60.tar.gz
+1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz



From diegobz at fedoraproject.org  Wed Aug 19 13:43:39 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Wed, 19 Aug 2009 13:43:39 +0000 (UTC)
Subject: rpms/python-polib/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-polib.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090819134339.104A711C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20269/F-10

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.4.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Mar 2009 13:56:20 -0000	1.2
+++ .cvsignore	19 Aug 2009 13:43:38 -0000	1.3
@@ -1 +1 @@
-polib-0.4.0-r60.tar.gz
+polib-0.4.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Mar 2009 13:56:20 -0000	1.1
+++ import.log	19 Aug 2009 13:43:38 -0000	1.2
@@ -1 +1,2 @@
 python-polib-0_4_0-1_fc11_20080217svnr60:F-10:python-polib-0.4.0-1.fc11.20080217svnr60.src.rpm:1236174944
+python-polib-0_4_2-1_fc11:F-10:python-polib-0.4.2-1.fc11.src.rpm:1250689497


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-10/python-polib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-polib.spec	4 Mar 2009 13:56:20 -0000	1.1
+++ python-polib.spec	19 Aug 2009 13:43:38 -0000	1.2
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define alphatag r60
+#%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.0
-Release:        1%{?dist}.20080217svn%{alphatag}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
 Group:          Development/Languages
@@ -12,7 +12,8 @@ License:        MIT
 URL:            http://code.google.com/p/polib/
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
-Source0:        polib-%{version}-%{alphatag}.tar.gz
+#Source0:        polib-%{version}-%{alphatag}.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,7 @@ functions 'pofile', 'mofile' and 'detect
 POFile, MOFile, POEntry and MOEntry for creating new files/entries.
 
 %prep
-%setup -q -n polib-%{version}-%{alphatag}
+%setup -q -n polib-%{version}
 
 %build
 %{__python} setup.py build
@@ -43,10 +44,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE README docs/
+%doc LICENSE README docs/
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
+- Updated to 0.4.2 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2.20080217svnr60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 18 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.4.0-1.20080217svnr60
 - Initial RPM release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Mar 2009 13:56:20 -0000	1.2
+++ sources	19 Aug 2009 13:43:38 -0000	1.3
@@ -1 +1 @@
-3ccfa697940893f48107689b5f0ddebf  polib-0.4.0-r60.tar.gz
+1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz



From diegobz at fedoraproject.org  Wed Aug 19 13:46:37 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Wed, 19 Aug 2009 13:46:37 +0000 (UTC)
Subject: rpms/python-polib/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-polib.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090819134637.5116111C00E4@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/python-polib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21120/EL-5

Modified Files:
	.cvsignore import.log python-polib.spec sources 
Log Message:
Updated to 0.4.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Mar 2009 13:59:04 -0000	1.2
+++ .cvsignore	19 Aug 2009 13:46:37 -0000	1.3
@@ -1 +1 @@
-polib-0.4.0-r60.tar.gz
+polib-0.4.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Mar 2009 13:59:04 -0000	1.1
+++ import.log	19 Aug 2009 13:46:37 -0000	1.2
@@ -1 +1,2 @@
 python-polib-0_4_0-1_fc11_20080217svnr60:EL-5:python-polib-0.4.0-1.fc11.20080217svnr60.src.rpm:1236175108
+python-polib-0_4_2-1_fc11:EL-5:python-polib-0.4.2-1.fc11.src.rpm:1250689665


Index: python-polib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/python-polib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-polib.spec	4 Mar 2009 13:59:04 -0000	1.1
+++ python-polib.spec	19 Aug 2009 13:46:37 -0000	1.2
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define alphatag r60
+#%define alphatag r60
 
 Name:           python-polib
-Version:        0.4.0
-Release:        1%{?dist}.20080217svn%{alphatag}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        A library to parse and manage gettext catalogs
 
 Group:          Development/Languages
@@ -12,7 +12,8 @@ License:        MIT
 URL:            http://code.google.com/p/polib/
 # svn export -r60 http://polib.googlecode.com/svn/trunk/ polib-0.4.0-r60
 # tar zcf polib-0.4.0-r60.tar.gz polib-0.4.0-r60
-Source0:        polib-%{version}-%{alphatag}.tar.gz
+#Source0:        polib-%{version}-%{alphatag}.tar.gz
+Source0:	http://polib.googlecode.com/files/polib-0.4.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,7 @@ functions 'pofile', 'mofile' and 'detect
 POFile, MOFile, POEntry and MOEntry for creating new files/entries.
 
 %prep
-%setup -q -n polib-%{version}-%{alphatag}
+%setup -q -n polib-%{version}
 
 %build
 %{__python} setup.py build
@@ -43,10 +44,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE README docs/
+%doc LICENSE README docs/
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 19 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> - 0.4.2-1
+- Updated to 0.4.2 release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2.20080217svnr60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 18 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0.4.0-1.20080217svnr60
 - Initial RPM release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polib/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Mar 2009 13:59:04 -0000	1.2
+++ sources	19 Aug 2009 13:46:37 -0000	1.3
@@ -1 +1 @@
-3ccfa697940893f48107689b5f0ddebf  polib-0.4.0-r60.tar.gz
+1a06c04444486271c3119953128a4844  polib-0.4.2.tar.gz



From twaugh at fedoraproject.org  Wed Aug 19 13:52:30 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 13:52:30 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.506,1.507 pstoraster,1.3,1.4
Message-ID: <20090819135230.86BC011C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22660

Modified Files:
	cups.spec pstoraster 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
- Use 'exec' to invoke ghostscript in the pstoraster filter.  This
  allows the SIGTERM signal to reach the correct process, as well as
  conserving memory (part of bug #518026).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -p -r1.506 -r1.507
--- cups.spec	11 Aug 2009 08:04:37 -0000	1.506
+++ cups.spec	19 Aug 2009 13:52:30 -0000	1.507
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.15%{?dist}
+Release: 0.%{pre}.16%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -528,6 +528,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
+- Use 'exec' to invoke ghostscript in the pstoraster filter.  This
+  allows the SIGTERM signal to reach the correct process, as well as
+  conserving memory (part of bug #518026).
+
 * Tue Aug 11 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
 - Avoid empty BrowseLocalProtocols setting (bug #516460, STR #3287).
 - Fixed ppds.dat handling of drv files (bug #515027, STR #3279).


Index: pstoraster
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/pstoraster,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pstoraster	3 Jan 2008 16:17:10 -0000	1.3
+++ pstoraster	19 Aug 2009 13:52:30 -0000	1.4
@@ -52,7 +52,7 @@ else
 fi
 
 # Now run Ghostscript...
-$bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile
+exec $bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $ifile
 
 #
 # End of "$Id$".



From lennart at fedoraproject.org  Wed Aug 19 13:52:40 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 19 Aug 2009 13:52:40 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.480,1.481
Message-ID: <20090819135240.DB1F311C00E4@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22726

Modified Files:
	gdm.spec 
Log Message:
Add pulseaudio-gdm-hooks to dependencies


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- gdm.spec	6 Aug 2009 21:27:12 -0000	1.480
+++ gdm.spec	19 Aug 2009 13:52:40 -0000	1.481
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.27.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -54,6 +54,7 @@ Requires: polkit-gnome
 # since we use it, and pam spams the log if the module is missing
 Requires: gnome-keyring-pam
 Requires: plymouth-gdm-hooks
+Requires: pulseaudio-gdm-hooks
 # We need 1.0.4-5 since it lets us use "localhost" in auth cookies
 Requires: libXau >= 1.0.4-4
 Requires(post): scrollkeeper
@@ -390,6 +391,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Aug 19 2009 Lennart Poettering <lpoetter at redhat.com> 1:2.27.4-6
+- Add pulseaudio-gdm-hooks to dependencies
+
 * Thu Aug 06 2009 Ray Strode <rstrode at redhat.com> 1:2.27.4-5
 - rebuild
 



From tmraz at fedoraproject.org  Wed Aug 19 13:54:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 19 Aug 2009 13:54:10 +0000 (UTC)
Subject: rpms/ipsec-tools/devel racoon.pam, NONE, 1.1 ipsec-tools.spec, 1.67,
	1.68 p1_up_down, 1.2, 1.3
Message-ID: <20090819135410.65AA811C00E4@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23176

Modified Files:
	ipsec-tools.spec p1_up_down 
Added Files:
	racoon.pam 
Log Message:
* Wed Aug 19 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-2
- enable xauth over PAM (#470793)
- add TMPDIR setting to the p1_up_down script



--- NEW FILE racoon.pam ---
#%PAM-1.0
# do not allow ipsec xauth for root
auth       required     pam_succeed_if.so user != root
auth       include      system-auth
account    required     pam_nologin.so
account    include      system-auth
password   include      system-auth
session    include      system-auth


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- ipsec-tools.spec	18 Aug 2009 19:03:09 -0000	1.67
+++ ipsec-tools.spec	19 Aug 2009 13:54:10 -0000	1.68
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -10,6 +10,7 @@ Source1: racoon.conf
 Source2: psk.txt
 Source3: p1_up_down
 Source4: racoon.init
+Source5: racoon.pam
 Patch3: ipsec-tools-0.7-acquires.patch
 Patch4: ipsec-tools-0.7.1-loopback.patch
 # the following patches were also submitted upstream:
@@ -24,18 +25,20 @@ Patch15: ipsec-tools-0.7.3-aliasing.patc
 Patch16: ipsec-tools-0.7.2-nodevel.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
-BuildRequires: libselinux-devel >= 1.30.28-2
+BuildRequires: libselinux-devel >= 1.30.28-2, pam-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: initscripts >= 7.31.11.EL-1
+Requires: initscripts >= 7.31.11.EL-1, pam
 BuildRequires: audit-libs-devel >= 1.3.1
-	
+
+%global racoonconfdir %{_sysconfdir}/racoon
+
 %description
 This is the IPsec-Tools package.  You need this package in order to
 really use the IPsec functionality in the linux-2.5+ kernels.  This
 package builds:
- 
-	- setkey, a program to directly manipulate policies and SAs
-	- racoon, an IKEv1 keying daemon
+
+- setkey, a program to directly manipulate policies and SAs
+- racoon, an IKEv1 keying daemon
 
 %prep
 %setup -q
@@ -60,7 +63,7 @@ LDFLAGS="-Wl,--as-needed"
 export LDFLAGS
 %configure \
  --with-kernel-headers=/usr/include \
- --sysconfdir=/etc/racoon \
+ --sysconfdir=%{racoonconfdir} \
  --without-readline \
  --enable-adminport \
  --enable-hybrid \
@@ -69,27 +72,29 @@ export LDFLAGS
  --enable-gssapi \
  --enable-natt \
  --enable-security-context \
- --enable-audit
+ --enable-audit \
+ --with-libpam
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/etc/racoon
+mkdir -p $RPM_BUILD_ROOT%{racoonconfdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -m 600 %{SOURCE1} \
-  $RPM_BUILD_ROOT/etc/racoon/racoon.conf
+  $RPM_BUILD_ROOT%{racoonconfdir}/racoon.conf
 install -m 600 %{SOURCE2} \
-  $RPM_BUILD_ROOT/etc/racoon/psk.txt
+  $RPM_BUILD_ROOT%{racoonconfdir}/psk.txt
 
 mv $RPM_BUILD_ROOT%{_sbindir}/setkey $RPM_BUILD_ROOT/sbin
 
-mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/certs
-mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/scripts
+mkdir -m 0700 -p $RPM_BUILD_ROOT%{racoonconfdir}/certs
+mkdir -m 0700 -p $RPM_BUILD_ROOT%{racoonconfdir}/scripts
 install -m 700 %{SOURCE3} \
-  $RPM_BUILD_ROOT/etc/racoon/scripts/p1_up_down
-install -D -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/racoon
+  $RPM_BUILD_ROOT%{racoonconfdir}/scripts/p1_up_down
+install -D -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/racoon
+install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/racoon
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,16 +118,21 @@ fi
 /sbin/*
 %{_sbindir}/*
 %{_mandir}/man*/*
-%{_sysconfdir}/racoon/scripts/*
 %{_initrddir}/racoon
-%dir /etc/racoon
-%dir /etc/racoon/certs
-%dir /etc/racoon/scripts
-%dir /var/racoon
-%config(noreplace) /etc/racoon/psk.txt
-%config(noreplace) /etc/racoon/racoon.conf
+%dir %{racoonconfdir}
+%{racoonconfdir}/scripts/*
+%dir %{racoonconfdir}/certs
+%dir %{racoonconfdir}/scripts
+%dir %{_localstatedir}/racoon
+%config(noreplace) %{racoonconfdir}/psk.txt
+%config(noreplace) %{racoonconfdir}/racoon.conf
+%config(noreplace) %{_sysconfdir}/pam.d/racoon
 
 %changelog
+* Wed Aug 19 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-2
+- enable xauth over PAM (#470793)
+- add TMPDIR setting to the p1_up_down script
+
 * Tue Aug 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-1
 - update to a new upstream version
 - fix service stop in preun (#515880)


Index: p1_up_down
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/p1_up_down,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- p1_up_down	28 Feb 2008 16:05:36 -0000	1.2
+++ p1_up_down	19 Aug 2009 13:54:10 -0000	1.3
@@ -13,6 +13,8 @@ shopt -s nocasematch
 umask 0022
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
+# we must not touch /tmp
+TMPDIR="/var/racoon"
 
 # set up NAT-T
 case "${NAT_T}" in



From jnovy at fedoraproject.org  Wed Aug 19 13:54:41 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 19 Aug 2009 13:54:41 +0000 (UTC)
Subject: rpms/libgphoto2/devel .cvsignore, 1.9, 1.10 libgphoto2.spec, 1.23, 
	1.24 sources, 1.9, 1.10 libgphoto2.udev-136.patch, 1.1, NONE
Message-ID: <20090819135441.1258E11C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23364

Modified Files:
	.cvsignore libgphoto2.spec sources 
Removed Files:
	libgphoto2.udev-136.patch 
Log Message:
* Tue Aug 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-1
- update to 2.4.7
- drop udev patch, applied upstream
- update storage patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	18 May 2009 09:50:45 -0000	1.9
+++ .cvsignore	19 Aug 2009 13:54:40 -0000	1.10
@@ -1 +1 @@
-libgphoto2-2.4.6.tar.bz2
+libgphoto2-2.4.7.tar.bz2


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libgphoto2.spec	10 Aug 2009 12:35:17 -0000	1.23
+++ libgphoto2.spec	19 Aug 2009 13:54:40 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
-Version: 2.4.6
-Release: 3%{?dist}
+Version: 2.4.7
+Release: 1%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,7 +11,6 @@ Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
-Patch5: libgphoto2.udev-136.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -55,7 +54,6 @@ use libgphoto2.
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
-%patch5 -p1 -b .udev136
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -162,6 +160,11 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-1
+- update to 2.4.7
+- drop udev patch, applied upstream
+- update storage patch
+
 * Sun Aug 09 2009 David Zeuthen <davidz at redhat.com> 2.4.6-3
 - Add patch from http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874
   and generate generic udev rules for device identification (ID_GPHOTO2* properties)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	18 May 2009 09:50:45 -0000	1.9
+++ sources	19 Aug 2009 13:54:40 -0000	1.10
@@ -1 +1 @@
-f55c95b676023368317e1e867397e62c  libgphoto2-2.4.6.tar.bz2
+3c1f1b1e56214e83b97e2bc7aadba4c5  libgphoto2-2.4.7.tar.bz2


--- libgphoto2.udev-136.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Aug 19 13:59:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 19 Aug 2009 13:59:58 +0000 (UTC)
Subject: rpms/rest/devel .cvsignore, 1.4, 1.5 rest.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20090819135958.1C15411C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24562

Modified Files:
	.cvsignore rest.spec sources 
Log Message:
- New upstream 0.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Jul 2009 10:51:47 -0000	1.4
+++ .cvsignore	19 Aug 2009 13:59:57 -0000	1.5
@@ -1 +1 @@
-librest-0.5.tar.bz2
+librest-0.6.tar.bz2


Index: rest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/rest.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rest.spec	7 Aug 2009 12:05:30 -0000	1.5
+++ rest.spec	19 Aug 2009 13:59:57 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           rest
-Version:        0.5
+Version:        0.6
 Release:        3%{?dist}
 Summary:        A library for access to RESTful web services
 
@@ -31,7 +31,6 @@ Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 Files for development with %{name}.
@@ -75,6 +74,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-1
+- New upstream 0.6 release
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5-3
 - A few minor spec file cleanups
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Jul 2009 10:51:48 -0000	1.4
+++ sources	19 Aug 2009 13:59:57 -0000	1.5
@@ -1 +1 @@
-294635fe499313b92a371a9c6dd55e2c  librest-0.5.tar.bz2
+47f9357835885f4cfa0087eeda31659b  librest-0.6.tar.bz2



From akurtakov at fedoraproject.org  Wed Aug 19 14:02:42 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 14:02:42 +0000 (UTC)
Subject: rpms/directory-naming/devel directory-naming.spec,1.1,1.2
Message-ID: <20090819140242.8EDDE11C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25271/devel

Modified Files:
	directory-naming.spec 
Log Message:
- Remove gcj support.
- Build with build.sysclasspath=only.



Index: directory-naming.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/directory-naming.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- directory-naming.spec	19 Aug 2009 13:22:17 -0000	1.1
+++ directory-naming.spec	19 Aug 2009 14:02:42 -0000	1.2
@@ -28,11 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 Name:           directory-naming
 Version:        0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Directory Naming
 License:        ASL 2.0
@@ -79,17 +77,9 @@ Requires:  mx4j
 Requires(post):    jpackage-utils >= 0:1.7.3
 Requires(postun):  jpackage-utils >= 0:1.7.3
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
 %description
 Old directory/naming module.
 
@@ -103,7 +93,7 @@ Requires(postun): /bin/rm
 %{summary}.
 
 %prep
-%setup -q 
+%setup -q
 # remove all binary libs
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
@@ -147,8 +137,7 @@ done;
 
 export OPT_JAR_LIST="junit ant/ant-junit"
 
-#ant -Dbuild.sysclasspath=only jar javadoc
-ant jar javadoc
+ant -Dbuild.sysclasspath=only jar javadoc
 
 %install
 rm -rf %{buildroot}
@@ -185,42 +174,27 @@ done
 %__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
 %__cp LICENSE.txt  %{buildroot}%{_docdir}/%{name}-%{version}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 %__rm -rf %{buildroot}
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(0644,root,root,0755)
-%{_docdir}/%{name}-%{version}/LICENSE.txt 
+%{_docdir}/%{name}-%{version}/LICENSE.txt
 %{_javadir}/%{name}
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %changelog
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-5
+- Remove gcj support.
+- Build with build.sysclasspath=only.
+
 * Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> - 0.8-4
 - Fix license
 
@@ -235,4 +209,3 @@ fi
 
 * Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> 0:0.8-1jpp
 - First release
-



From twaugh at fedoraproject.org  Wed Aug 19 14:07:06 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 14:07:06 +0000 (UTC)
Subject: rpms/cups/devel cups-str3292.patch,NONE,1.1 cups.spec,1.502,1.503
Message-ID: <20090819140706.7F85E11C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26931

Modified Files:
	cups.spec 
Added Files:
	cups-str3292.patch 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
- Fixed JobKillDelay handling for cancelled jobs (bug #518026,
  STR #3292).


cups-str3292.patch:
 job.c  |   12 +++++++-----
 main.c |    7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3292.patch ---
diff -up cups-1.4rc1/scheduler/job.c.cancel-job cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.cancel-job	2009-08-19 14:48:55.733825903 +0100
+++ cups-1.4rc1/scheduler/job.c	2009-08-19 14:49:01.813826101 +0100
@@ -2359,19 +2359,21 @@ cupsdSetJobState(
         break;
 
     case IPP_JOB_ABORTED :
-    case IPP_JOB_CANCELED :
     case IPP_JOB_COMPLETED :
        /*
-        * Expire job subscriptions since the job is now "completed"...
+	* Remove the job from the active list...
 	*/
 
-        cupsdExpireSubscriptions(NULL, job);
+	cupsArrayRemove(ActiveJobs, job);
+
+	/* fall through... */
 
+    case IPP_JOB_CANCELED :
        /*
-	* Remove the job from the active list...
+        * Expire job subscriptions since the job is now "completed"...
 	*/
 
-	cupsArrayRemove(ActiveJobs, job);
+        cupsdExpireSubscriptions(NULL, job);
 
 #ifdef __APPLE__
        /*
diff -up cups-1.4rc1/scheduler/main.c.cancel-job cups-1.4rc1/scheduler/main.c
--- cups-1.4rc1/scheduler/main.c.cancel-job	2009-08-19 14:48:55.451701014 +0100
+++ cups-1.4rc1/scheduler/main.c	2009-08-19 14:49:01.817825841 +0100
@@ -1803,6 +1803,13 @@ process_children(void)
 	    cupsdContinueJob(job);
 	  }
 	}
+	else if (job->state_value == IPP_JOB_CANCELED)
+	{
+	  for (i = 0; job->filters[i] < 0; i++);
+
+	  if (!job->filters[i] && job->backend < 0)
+	    cupsArrayRemove(ActiveJobs, job);
+	}
       }
     }
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -p -r1.502 -r1.503
--- cups.spec	18 Aug 2009 16:51:18 -0000	1.502
+++ cups.spec	19 Aug 2009 14:07:05 -0000	1.503
@@ -67,6 +67,7 @@ Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
+Patch43: cups-str3292.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -234,6 +235,7 @@ module. 
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
 %patch42 -p1 -b .str3287
+%patch43 -p1 -b .str3292
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -529,6 +531,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
+- Fixed JobKillDelay handling for cancelled jobs (bug #518026,
+  STR #3292).
 - Use 'exec' to invoke ghostscript in the pstoraster filter.  This
   allows the SIGTERM signal to reach the correct process, as well as
   conserving memory (part of bug #518026).



From twaugh at fedoraproject.org  Wed Aug 19 14:08:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 14:08:52 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3292.patch,NONE,1.1 cups.spec,1.507,1.508
Message-ID: <20090819140852.7087F11C00E4@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27275

Modified Files:
	cups.spec 
Added Files:
	cups-str3292.patch 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
- Fixed JobKillDelay handling for cancelled jobs (bug #518026,
  STR #3292).


cups-str3292.patch:
 job.c  |   12 +++++++-----
 main.c |    7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3292.patch ---
diff -up cups-1.4rc1/scheduler/job.c.cancel-job cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.cancel-job	2009-08-19 14:48:55.733825903 +0100
+++ cups-1.4rc1/scheduler/job.c	2009-08-19 14:49:01.813826101 +0100
@@ -2359,19 +2359,21 @@ cupsdSetJobState(
         break;
 
     case IPP_JOB_ABORTED :
-    case IPP_JOB_CANCELED :
     case IPP_JOB_COMPLETED :
        /*
-        * Expire job subscriptions since the job is now "completed"...
+	* Remove the job from the active list...
 	*/
 
-        cupsdExpireSubscriptions(NULL, job);
+	cupsArrayRemove(ActiveJobs, job);
+
+	/* fall through... */
 
+    case IPP_JOB_CANCELED :
        /*
-	* Remove the job from the active list...
+        * Expire job subscriptions since the job is now "completed"...
 	*/
 
-	cupsArrayRemove(ActiveJobs, job);
+        cupsdExpireSubscriptions(NULL, job);
 
 #ifdef __APPLE__
        /*
diff -up cups-1.4rc1/scheduler/main.c.cancel-job cups-1.4rc1/scheduler/main.c
--- cups-1.4rc1/scheduler/main.c.cancel-job	2009-08-19 14:48:55.451701014 +0100
+++ cups-1.4rc1/scheduler/main.c	2009-08-19 14:49:01.817825841 +0100
@@ -1803,6 +1803,13 @@ process_children(void)
 	    cupsdContinueJob(job);
 	  }
 	}
+	else if (job->state_value == IPP_JOB_CANCELED)
+	{
+	  for (i = 0; job->filters[i] < 0; i++);
+
+	  if (!job->filters[i] && job->backend < 0)
+	    cupsArrayRemove(ActiveJobs, job);
+	}
       }
     }
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- cups.spec	19 Aug 2009 13:52:30 -0000	1.507
+++ cups.spec	19 Aug 2009 14:08:52 -0000	1.508
@@ -67,6 +67,7 @@ Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
+Patch43: cups-str3292.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -234,6 +235,7 @@ module. 
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
 %patch42 -p1 -b .str3287
+%patch43 -p1 -b .str3292
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -529,6 +531,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
+- Fixed JobKillDelay handling for cancelled jobs (bug #518026,
+  STR #3292).
 - Use 'exec' to invoke ghostscript in the pstoraster filter.  This
   allows the SIGTERM signal to reach the correct process, as well as
   conserving memory (part of bug #518026).



From jnovy at fedoraproject.org  Wed Aug 19 14:14:21 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 19 Aug 2009 14:14:21 +0000 (UTC)
Subject: rpms/libgphoto2/devel gphoto2-storage.patch,1.2,1.3
Message-ID: <20090819141421.EBF6211C00E4@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28470

Modified Files:
	gphoto2-storage.patch 
Log Message:
- update storage patch


gphoto2-storage.patch:
 print-camera-list.c |   84 +++++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

Index: gphoto2-storage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/gphoto2-storage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gphoto2-storage.patch	2 Jun 2008 09:20:38 -0000	1.2
+++ gphoto2-storage.patch	19 Aug 2009 14:14:20 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage libgphoto2-2.4.1/packaging/generic/print-camera-list.c
---- libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage	2008-03-24 12:47:00.000000000 +0100
-+++ libgphoto2-2.4.1/packaging/generic/print-camera-list.c	2008-06-02 10:44:29.000000000 +0200
-@@ -793,6 +793,8 @@ fdi_begin_func (const func_params_t *par
+diff -up libgphoto2-2.4.7/packaging/generic/print-camera-list.c.storage libgphoto2-2.4.7/packaging/generic/print-camera-list.c
+--- libgphoto2-2.4.7/packaging/generic/print-camera-list.c.storage	2009-08-11 17:11:27.000000000 +0200
++++ libgphoto2-2.4.7/packaging/generic/print-camera-list.c	2009-08-19 15:44:41.000000000 +0200
+@@ -819,6 +819,8 @@ fdi_begin_func (const func_params_t *par
  	printf("<deviceinfo version=\"0.2\">\n");
  	printf(" <device>\n");
  	printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
@@ -10,7 +10,7 @@ diff -up libgphoto2-2.4.1/packaging/gene
  	return 0;
  }
  
-@@ -832,52 +834,52 @@ fdi_camera_func (const func_params_t *pa
+@@ -858,62 +860,62 @@ fdi_camera_func (const func_params_t *pa
  			return 0;
  		}
  		if (a->usb_vendor) { /* usb product id might be 0! */
@@ -18,13 +18,21 @@ diff -up libgphoto2-2.4.1/packaging/gene
 -			printf("    <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
 +			printf("    <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
 +			printf("     <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
+ 			if (a->usb_vendor == 0x05ac) { /* Apple iPhone, PTP user. */
+-				printf("     <match key=\"usb.interface.class\" int=\"6\">\n");
+-				printf("      <match key=\"usb.interface.subclass\" int=\"1\">\n");
+-				printf("       <match key=\"usb.interface.protocol\" int=\"1\">\n");
++				printf("      <match key=\"usb.interface.class\" int=\"6\">\n");
++				printf("       <match key=\"usb.interface.subclass\" int=\"1\">\n");
++				printf("        <match key=\"usb.interface.protocol\" int=\"1\">\n");
+ 			}
  			if (a->device_type & GP_DEVICE_AUDIO_PLAYER) {
 -				printf("     <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
--				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
+-				printf("     <addset key=\"info.capabilities\" type=\"strlist\">portable_audio_player</addset>\n");
 -				printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
 -				printf("     <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
 +				printf("      <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
-+				printf("      <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
++				printf("      <addset key=\"info.capabilities\" type=\"strlist\">portable_audio_player</addset>\n");
 +				printf("      <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
 +				printf("      <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
  				
@@ -33,10 +41,10 @@ diff -up libgphoto2-2.4.1/packaging/gene
 +				printf("      <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
  			} else {
 -				printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
--				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+-				printf("     <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
 +				printf("      <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-+				printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
- 				
++				printf("      <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
+ 
  				/* HACK alert ... but the HAL / gnome-volume-manager guys want that */
  				if (NULL!=strstr(a->library,"ptp"))
 -					printf("     <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
@@ -50,6 +58,12 @@ diff -up libgphoto2-2.4.1/packaging/gene
 -			printf("     <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
 +			printf("      <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model);
 +			printf("      <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n");
+ 			if (a->usb_vendor == 0x05ac) { /* Apple iPhone */
++				printf("        </match>\n");
+ 				printf("       </match>\n");
+ 				printf("      </match>\n");
+-				printf("     </match>\n");
+ 			}
 +			printf("     </match>\n");
  			printf("    </match>\n");
 -			printf("   </match>\n");
@@ -59,12 +73,12 @@ diff -up libgphoto2-2.4.1/packaging/gene
 -			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
 -			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
 -			printf("      <merge key=\"info.category\" type=\"string\">camera</merge>\n");
--			printf("      <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
+-			printf("      <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
 +			printf("    <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
 +			printf("     <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
 +			printf("      <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
 +			printf("       <merge key=\"info.category\" type=\"string\">camera</merge>\n");
-+			printf("       <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
++			printf("       <addset key=\"info.capabilities\" type=\"strlist\">camera</addset>\n");
  			if (a->usb_class == 6) {
 -				printf("      <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
 +				printf("       <merge key=\"camera.access_method\" type=\"string\">ptp</merge>\n");
@@ -88,7 +102,7 @@ diff -up libgphoto2-2.4.1/packaging/gene
  		}
  	} /* camera has USB connection */
  	return 0;
-@@ -886,6 +888,7 @@ fdi_camera_func (const func_params_t *pa
+@@ -922,6 +924,7 @@ fdi_camera_func (const func_params_t *pa
  static int
  fdi_end_func (const func_params_t *params, void *data)
  {
@@ -96,7 +110,7 @@ diff -up libgphoto2-2.4.1/packaging/gene
  	printf("  </match>\n");
  	printf(" </device>\n");
  	printf("</deviceinfo>\n");
-@@ -912,6 +915,8 @@ fdi_device_begin_func (const func_params
+@@ -948,6 +951,8 @@ fdi_device_begin_func (const func_params
  	printf("<deviceinfo version=\"0.2\">\n");
  	printf(" <device>\n");
  	printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
@@ -105,7 +119,7 @@ diff -up libgphoto2-2.4.1/packaging/gene
  	return 0;
  }
  
-@@ -955,28 +960,28 @@ fdi_device_camera_func (const func_param
+@@ -991,28 +996,28 @@ fdi_device_camera_func (const func_param
  			/* do not set category. We don't really know what this device really is.
  			 * But we do now that is capable of being a camera, so add to capabilities
  			 */
@@ -144,7 +158,7 @@ diff -up libgphoto2-2.4.1/packaging/gene
  		}
  #endif
  	}
-@@ -986,6 +991,7 @@ fdi_device_camera_func (const func_param
+@@ -1022,6 +1027,7 @@ fdi_device_camera_func (const func_param
  static int
  fdi_device_end_func (const func_params_t *params, void *data)
  {



From schwab at fedoraproject.org  Wed Aug 19 14:20:22 2009
From: schwab at fedoraproject.org (schwab)
Date: Wed, 19 Aug 2009 14:20:22 +0000 (UTC)
Subject: rpms/glibc/F-11 .cvsignore, 1.281, 1.282 glibc-fedora.patch, 1.315, 
	1.316 glibc.spec, 1.405, 1.406 import.log, 1.25, 1.26 sources,
	1.306, 1.307
Message-ID: <20090819142023.08A0111C0417@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30069/F-11

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.1-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/.cvsignore,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- .cvsignore	4 Aug 2009 11:05:20 -0000	1.281
+++ .cvsignore	19 Aug 2009 14:20:20 -0000	1.282
@@ -1,2 +1,2 @@
-glibc-2.10.1-68-gc87c885-fedora.tar.bz2
-glibc-2.10.1-68-gc87c885.tar.bz2
+glibc-2.10.1-69-gaa152ec-fedora.tar.bz2
+glibc-2.10.1-69-gaa152ec.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   20 +
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 posix/Makefile                                 |   15 -
 posix/getconf.speclist.h                       |   39 ++
 streams/Makefile                               |    2 
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/i386/Makefile                          |    8 
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 55 files changed, 750 insertions(+), 463 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc-fedora.patch,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- glibc-fedora.patch	4 Aug 2009 11:05:20 -0000	1.315
+++ glibc-fedora.patch	19 Aug 2009 14:20:21 -0000	1.316
@@ -1,6 +1,6 @@
---- glibc-2.10.1-68-gc87c885/ChangeLog
+--- glibc-2.10.1-69-gaa152ec/ChangeLog
 +++ glibc-2.10.1-4/ChangeLog
-@@ -8060,6 +8060,13 @@
+@@ -8066,6 +8066,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -8355,6 +8362,10 @@
+@@ -8361,6 +8368,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -9612,6 +9623,15 @@
+@@ -9618,6 +9629,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,7 +41,7 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10.1-68-gc87c885/ChangeLog.15
+--- glibc-2.10.1-69-gaa152ec/ChangeLog.15
 +++ glibc-2.10.1-4/ChangeLog.15
 @@ -477,6 +477,14 @@
  
@@ -108,7 +108,7 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10.1-68-gc87c885/ChangeLog.16
+--- glibc-2.10.1-69-gaa152ec/ChangeLog.16
 +++ glibc-2.10.1-4/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
@@ -281,7 +281,7 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10.1-68-gc87c885/csu/Makefile
+--- glibc-2.10.1-69-gaa152ec/csu/Makefile
 +++ glibc-2.10.1-4/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
@@ -293,7 +293,7 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10.1-68-gc87c885/csu/elf-init.c
+--- glibc-2.10.1-69-gaa152ec/csu/elf-init.c
 +++ glibc-2.10.1-4/csu/elf-init.c
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -319,7 +319,7 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10.1-68-gc87c885/debug/tst-chk1.c
+--- glibc-2.10.1-69-gaa152ec/debug/tst-chk1.c
 +++ glibc-2.10.1-4/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -349,7 +349,7 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10.1-68-gc87c885/elf/ldconfig.c
+--- glibc-2.10.1-69-gaa152ec/elf/ldconfig.c
 +++ glibc-2.10.1-4/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
@@ -432,7 +432,7 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10.1-68-gc87c885/elf/tst-stackguard1.c
+--- glibc-2.10.1-69-gaa152ec/elf/tst-stackguard1.c
 +++ glibc-2.10.1-4/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -458,15 +458,15 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10.1-68-gc87c885/include/bits/stdlib-ldbl.h
+--- glibc-2.10.1-69-gaa152ec/include/bits/stdlib-ldbl.h
 +++ glibc-2.10.1-4/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10.1-68-gc87c885/include/bits/wchar-ldbl.h
+--- glibc-2.10.1-69-gaa152ec/include/bits/wchar-ldbl.h
 +++ glibc-2.10.1-4/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10.1-68-gc87c885/include/features.h
+--- glibc-2.10.1-69-gaa152ec/include/features.h
 +++ glibc-2.10.1-4/include/features.h
 @@ -299,8 +299,13 @@
  #endif
@@ -484,7 +484,7 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10.1-68-gc87c885/intl/locale.alias
+--- glibc-2.10.1-69-gaa152ec/intl/locale.alias
 +++ glibc-2.10.1-4/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
@@ -495,7 +495,7 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10.1-68-gc87c885/libio/stdio.h
+--- glibc-2.10.1-69-gaa152ec/libio/stdio.h
 +++ glibc-2.10.1-4/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
@@ -510,7 +510,7 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10.1-68-gc87c885/locale/iso-4217.def
+--- glibc-2.10.1-69-gaa152ec/locale/iso-4217.def
 +++ glibc-2.10.1-4/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
@@ -603,7 +603,7 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10.1-68-gc87c885/locale/programs/locarchive.c
+--- glibc-2.10.1-69-gaa152ec/locale/programs/locarchive.c
 +++ glibc-2.10.1-4/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
@@ -636,7 +636,7 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10.1-68-gc87c885/localedata/Makefile
+--- glibc-2.10.1-69-gaa152ec/localedata/Makefile
 +++ glibc-2.10.1-4/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
@@ -646,7 +646,7 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10.1-68-gc87c885/localedata/SUPPORTED
+--- glibc-2.10.1-69-gaa152ec/localedata/SUPPORTED
 +++ glibc-2.10.1-4/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
@@ -689,7 +689,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10.1-68-gc87c885/localedata/locales/cy_GB
+--- glibc-2.10.1-69-gaa152ec/localedata/locales/cy_GB
 +++ glibc-2.10.1-4/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>"
@@ -705,7 +705,7 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10.1-68-gc87c885/localedata/locales/en_GB
+--- glibc-2.10.1-69-gaa152ec/localedata/locales/en_GB
 +++ glibc-2.10.1-4/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>"
@@ -718,7 +718,7 @@
  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.1-68-gc87c885/localedata/locales/no_NO
+--- glibc-2.10.1-69-gaa152ec/localedata/locales/no_NO
 +++ glibc-2.10.1-4/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
@@ -790,7 +790,7 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10.1-68-gc87c885/localedata/locales/zh_TW
+--- glibc-2.10.1-69-gaa152ec/localedata/locales/zh_TW
 +++ glibc-2.10.1-4/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
@@ -819,7 +819,7 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10.1-68-gc87c885/malloc/mcheck.c
+--- glibc-2.10.1-69-gaa152ec/malloc/mcheck.c
 +++ glibc-2.10.1-4/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
@@ -896,7 +896,7 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10.1-68-gc87c885/manual/libc.texinfo
+--- glibc-2.10.1-69-gaa152ec/manual/libc.texinfo
 +++ glibc-2.10.1-4/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
@@ -907,7 +907,7 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10.1-68-gc87c885/misc/sys/cdefs.h
+--- glibc-2.10.1-69-gaa152ec/misc/sys/cdefs.h
 +++ glibc-2.10.1-4/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
@@ -952,7 +952,7 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10.1-68-gc87c885/nis/nss
+--- glibc-2.10.1-69-gaa152ec/nis/nss
 +++ glibc-2.10.1-4/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
@@ -960,7 +960,7 @@
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10.1-68-gc87c885/nptl/ChangeLog
+--- glibc-2.10.1-69-gaa152ec/nptl/ChangeLog
 +++ glibc-2.10.1-4/nptl/ChangeLog
 @@ -3508,6 +3508,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
@@ -1002,7 +1002,7 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10.1-68-gc87c885/nptl/Makefile
+--- glibc-2.10.1-69-gaa152ec/nptl/Makefile
 +++ glibc-2.10.1-4/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
@@ -1036,7 +1036,7 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10.1-68-gc87c885/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10.1-69-gaa152ec/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 +++ glibc-2.10.1-4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -187,4 +187,7 @@
  /* Typed memory objects are not available.  */
@@ -1046,7 +1046,7 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10.1-68-gc87c885/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10.1-69-gaa152ec/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 +++ glibc-2.10.1-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
@@ -1055,7 +1055,7 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10.1-68-gc87c885/nptl/tst-stackguard1.c
+--- glibc-2.10.1-69-gaa152ec/nptl/tst-stackguard1.c
 +++ glibc-2.10.1-4/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -1081,7 +1081,7 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10.1-68-gc87c885/nscd/nscd.conf
+--- glibc-2.10.1-69-gaa152ec/nscd/nscd.conf
 +++ glibc-2.10.1-4/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
@@ -1092,7 +1092,7 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10.1-68-gc87c885/nscd/nscd.init
+--- glibc-2.10.1-69-gaa152ec/nscd/nscd.init
 +++ glibc-2.10.1-4/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
@@ -1150,7 +1150,7 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10.1-68-gc87c885/posix/Makefile
+--- glibc-2.10.1-69-gaa152ec/posix/Makefile
 +++ glibc-2.10.1-4/posix/Makefile
 @@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
@@ -1172,7 +1172,7 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10.1-68-gc87c885/posix/getconf.speclist.h
+--- glibc-2.10.1-69-gaa152ec/posix/getconf.speclist.h
 +++ glibc-2.10.1-4/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
@@ -1214,7 +1214,7 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10.1-68-gc87c885/streams/Makefile
+--- glibc-2.10.1-69-gaa152ec/streams/Makefile
 +++ glibc-2.10.1-4/streams/Makefile
 @@ -21,7 +21,7 @@
  #
@@ -1225,7 +1225,7 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10.1-68-gc87c885/sysdeps/generic/dl-cache.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/generic/dl-cache.h
 +++ glibc-2.10.1-4/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
@@ -1242,7 +1242,7 @@
  #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.1-68-gc87c885/sysdeps/i386/Makefile
+--- glibc-2.10.1-69-gaa152ec/sysdeps/i386/Makefile
 +++ glibc-2.10.1-4/sysdeps/i386/Makefile
 @@ -64,6 +64,14 @@ endif
  
@@ -1259,7 +1259,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10.1-68-gc87c885/sysdeps/ia64/Makefile
+--- glibc-2.10.1-69-gaa152ec/sysdeps/ia64/Makefile
 +++ glibc-2.10.1-4/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
@@ -1272,7 +1272,7 @@
  endif
  endif
  
---- glibc-2.10.1-68-gc87c885/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10.1-69-gaa152ec/sysdeps/ia64/ia64libgcc.S
 +++ glibc-2.10.1-4/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -1625,7 +1625,7 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10.1-68-gc87c885/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10.1-69-gaa152ec/sysdeps/ia64/libgcc-compat.c
 +++ glibc-2.10.1-4/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
@@ -1712,7 +1712,7 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10.1-68-gc87c885/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10.1-69-gaa152ec/sysdeps/powerpc/powerpc64/Makefile
 +++ glibc-2.10.1-4/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
@@ -1722,7 +1722,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/nice.c
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/nice.c
 +++ glibc-2.10.1-4/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
@@ -1738,7 +1738,7 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/check_pf.c
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
@@ -1755,7 +1755,7 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/dl-osinfo.h
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -1804,7 +1804,7 @@
      }
    else
  #endif
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/futimesat.c
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
@@ -1848,7 +1848,7 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/i386/clone.S
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
@@ -1868,7 +1868,7 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/i386/dl-cache.h
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
@@ -1930,7 +1930,7 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
@@ -1964,7 +1964,7 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -1972,7 +1972,7 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -1980,12 +1980,12 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 +++ glibc-2.10.1-4/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.1-68-gc87c885/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/netlinkaccess.h
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
@@ -2012,7 +2012,7 @@
  
  struct netlink_res
  {
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/paths.h
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
@@ -2023,7 +2023,7 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/tcsetattr.c
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
@@ -2070,7 +2070,7 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10.1-68-gc87c885/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/x86_64/clone.S
 +++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/glibc.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- glibc.spec	4 Aug 2009 11:05:21 -0000	1.405
+++ glibc.spec	19 Aug 2009 14:20:22 -0000	1.406
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10.1-68-gc87c885
+%define glibcsrcdir glibc-2.10.1-69-gaa152ec
 %define glibcversion 2.10.1
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 4
+Release: 5
 # 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
@@ -1016,6 +1016,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Aug 19 2009 Andreas Schwab <schwab at redhat.com> - 2.10.1-5
+- Update from release/2.10/master.
+  - handle missing nss module for biarch systems (#512309)
+
 * Tue Aug  4 2009 Andreas Schwab <schwab at redhat.com> - 2.10.1-4
 - Reenable setuid on pt_chown.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- import.log	4 Aug 2009 11:05:21 -0000	1.25
+++ import.log	19 Aug 2009 14:20:22 -0000	1.26
@@ -23,3 +23,4 @@ glibc-2_10-2:F-11:glibc-2.10-2.src.rpm:1
 glibc-2_10_1-1:F-11:glibc-2.10.1-1.src.rpm:1241982035
 glibc-2_10_1-3:F-11:glibc-2.10.1-3.src.rpm:1249041173
 glibc-2_10_1-4:F-11:glibc-2.10.1-4.src.rpm:1249380620
+glibc-2_10_1-5:F-11:glibc-2.10.1-5.src.rpm:1250691493


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-11/sources,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- sources	4 Aug 2009 11:05:21 -0000	1.306
+++ sources	19 Aug 2009 14:20:22 -0000	1.307
@@ -1,2 +1,2 @@
-29d5ae58d197e43f113b1f0702edc5aa  glibc-2.10.1-68-gc87c885-fedora.tar.bz2
-d526906ac356f9eeb802da508cd0998f  glibc-2.10.1-68-gc87c885.tar.bz2
+38fc321acecfbd74a3e5c05f8da5c964  glibc-2.10.1-69-gaa152ec-fedora.tar.bz2
+8ba9a3a7cb89a6aea3a27818b78d3ede  glibc-2.10.1-69-gaa152ec.tar.bz2



From kyle at fedoraproject.org  Wed Aug 19 14:21:16 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 14:21:16 +0000 (UTC)
Subject: rpms/kernel/F-10
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch,
	NONE, 1.1 kernel.spec, 1.1404, 1.1405
Message-ID: <20090819142116.2BA8911C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30444

Modified Files:
	kernel.spec 
Added Files:
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch 
Log Message:
CVE-2009-2847 fix kernel information leak in sigaltstack

do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch:
 signal.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat, 1 Aug 2009 17:34:56 +0000 (-0700)
Subject: do_sigaltstack: avoid copying 'stack_t' as a structure to user space
X-Git-Tag: v2.6.31-rc6~89
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0083fc2c50e6c5127c2802ad323adf8143ab7856

do_sigaltstack: avoid copying 'stack_t' as a structure to user space

Ulrich Drepper correctly points out that there is generally padding in
the structure on 64-bit hosts, and that copying the structure from
kernel to user space can leak information from the kernel stack in those
padding bytes.

Avoid the whole issue by just copying the three members one by one
instead, which also means that the function also can avoid the need for
a stack frame.  This also happens to match how we copy the new structure
from user space, so it all even makes sense.

[ The obvious solution of adding a memset() generates horrid code, gcc
  does really stupid things. ]

Reported-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/signal.c b/kernel/signal.c
index ccf1cee..f268372 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2454,11 +2454,9 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 	stack_t oss;
 	int error;
 
-	if (uoss) {
-		oss.ss_sp = (void __user *) current->sas_ss_sp;
-		oss.ss_size = current->sas_ss_size;
-		oss.ss_flags = sas_ss_flags(sp);
-	}
+	oss.ss_sp = (void __user *) current->sas_ss_sp;
+	oss.ss_size = current->sas_ss_size;
+	oss.ss_flags = sas_ss_flags(sp);
 
 	if (uss) {
 		void __user *ss_sp;
@@ -2501,13 +2499,16 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 		current->sas_ss_size = ss_size;
 	}
 
+	error = 0;
 	if (uoss) {
 		error = -EFAULT;
-		if (copy_to_user(uoss, &oss, sizeof(oss)))
+		if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
 			goto out;
+		error = __put_user(oss.ss_sp, &uoss->ss_sp) |
+			__put_user(oss.ss_size, &uoss->ss_size) |
+			__put_user(oss.ss_flags, &uoss->ss_flags);
 	}
 
-	error = 0;
 out:
 	return error;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1404
retrieving revision 1.1405
diff -u -p -r1.1404 -r1.1405
--- kernel.spec	19 Aug 2009 05:13:15 -0000	1.1404
+++ kernel.spec	19 Aug 2009 14:21:15 -0000	1.1405
@@ -754,7 +754,6 @@ Patch9600: linux-2.6-bluetooth-submit-bu
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
 
 Patch11000: linux-2.6-parport-quickfix-the-proc-registration-bug.patch
-Patch11100: linux-2.6-dev-zero-avoid-oom-lockup.patch
 Patch11020: linux-2.6-usb-remove-low-latency-hack.patch
 Patch11030: linux-2.6-x86-delay-tsc-barrier.patch
 # security fixes from the F-11 2.6.29.6 kernel
@@ -764,6 +763,9 @@ Patch11060: personality-fix-per_clear_on
 Patch11070: execve-must-clear-current-clear_child_tid.patch
 Patch11080: make-mmap_min_addr-suck-less.patch
 Patch11090: md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
+Patch11091: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
+Patch11100: linux-2.6-dev-zero-avoid-oom-lockup.patch
 
 %endif
 
@@ -1450,6 +1452,9 @@ ApplyPatch make-mmap_min_addr-suck-less.
 # CVE-2009-2849
 ApplyPatch md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
 
+# CVE-2009-2847
+ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
 # ======= END OF PATCH APPLICATIONS =============================
 
 %endif
@@ -2032,6 +2037,8 @@ fi
   to improve mmap_min_addr.
 - CVE-2009-2849: md: avoid dereferencing null ptr when accessing suspend
   sysfs attributes.
+- CVE-2009-2847: do_sigaltstack: avoid copying 'stack_t' as a structure
+  to user space
 
 * Tue Aug 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-99
 - Intel wireless fixes from Fedora 11:



From kyle at fedoraproject.org  Wed Aug 19 14:21:40 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 14:21:40 +0000 (UTC)
Subject: rpms/kernel/F-11
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch,
	NONE, 1.1 kernel.spec, 1.1712, 1.1713
Message-ID: <20090819142140.0057311C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30553

Modified Files:
	kernel.spec 
Added Files:
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch 
Log Message:
CVE-2009-2847 fix kernel information leak in sigaltstack

do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch:
 signal.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat, 1 Aug 2009 17:34:56 +0000 (-0700)
Subject: do_sigaltstack: avoid copying 'stack_t' as a structure to user space
X-Git-Tag: v2.6.31-rc6~89
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0083fc2c50e6c5127c2802ad323adf8143ab7856

do_sigaltstack: avoid copying 'stack_t' as a structure to user space

Ulrich Drepper correctly points out that there is generally padding in
the structure on 64-bit hosts, and that copying the structure from
kernel to user space can leak information from the kernel stack in those
padding bytes.

Avoid the whole issue by just copying the three members one by one
instead, which also means that the function also can avoid the need for
a stack frame.  This also happens to match how we copy the new structure
from user space, so it all even makes sense.

[ The obvious solution of adding a memset() generates horrid code, gcc
  does really stupid things. ]

Reported-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/signal.c b/kernel/signal.c
index ccf1cee..f268372 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2454,11 +2454,9 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 	stack_t oss;
 	int error;
 
-	if (uoss) {
-		oss.ss_sp = (void __user *) current->sas_ss_sp;
-		oss.ss_size = current->sas_ss_size;
-		oss.ss_flags = sas_ss_flags(sp);
-	}
+	oss.ss_sp = (void __user *) current->sas_ss_sp;
+	oss.ss_size = current->sas_ss_size;
+	oss.ss_flags = sas_ss_flags(sp);
 
 	if (uss) {
 		void __user *ss_sp;
@@ -2501,13 +2499,16 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 		current->sas_ss_size = ss_size;
 	}
 
+	error = 0;
 	if (uoss) {
 		error = -EFAULT;
-		if (copy_to_user(uoss, &oss, sizeof(oss)))
+		if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
 			goto out;
+		error = __put_user(oss.ss_sp, &uoss->ss_sp) |
+			__put_user(oss.ss_size, &uoss->ss_size) |
+			__put_user(oss.ss_flags, &uoss->ss_flags);
 	}
 
-	error = 0;
 out:
 	return error;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1712
retrieving revision 1.1713
diff -u -p -r1.1712 -r1.1713
--- kernel.spec	19 Aug 2009 02:33:24 -0000	1.1712
+++ kernel.spec	19 Aug 2009 14:21:39 -0000	1.1713
@@ -713,6 +713,7 @@ Patch13001: linux-2.6.29-xen-disable-gbp
 Patch13002: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
 Patch14000: make-mmap_min_addr-suck-less.patch
+Patch14001: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
 %endif
 
@@ -1314,6 +1315,9 @@ ApplyPatch linux-2.6-virtio_blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
+# CVE-2009-2847
+ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1902,6 +1906,8 @@ fi
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   to improve mmap_min_addr.
+- CVE-2009-2847: do_sigaltstack: avoid copying 'stack_t' as a
+  structure to user space
 
 * Mon Aug 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-32
 - Change config options:



From kyle at fedoraproject.org  Wed Aug 19 14:21:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 14:21:52 +0000 (UTC)
Subject: rpms/kernel/F-11
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch,
	NONE, 1.1.2.2 kernel.spec, 1.1679.2.13, 1.1679.2.14
Message-ID: <20090819142152.65DFA11C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30615

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch 
Log Message:
CVE-2009-2847 fix kernel information leak in sigaltstack

do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch:
 signal.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat, 1 Aug 2009 17:34:56 +0000 (-0700)
Subject: do_sigaltstack: avoid copying 'stack_t' as a structure to user space
X-Git-Tag: v2.6.31-rc6~89
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0083fc2c50e6c5127c2802ad323adf8143ab7856

do_sigaltstack: avoid copying 'stack_t' as a structure to user space

Ulrich Drepper correctly points out that there is generally padding in
the structure on 64-bit hosts, and that copying the structure from
kernel to user space can leak information from the kernel stack in those
padding bytes.

Avoid the whole issue by just copying the three members one by one
instead, which also means that the function also can avoid the need for
a stack frame.  This also happens to match how we copy the new structure
from user space, so it all even makes sense.

[ The obvious solution of adding a memset() generates horrid code, gcc
  does really stupid things. ]

Reported-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/signal.c b/kernel/signal.c
index ccf1cee..f268372 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2454,11 +2454,9 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 	stack_t oss;
 	int error;
 
-	if (uoss) {
-		oss.ss_sp = (void __user *) current->sas_ss_sp;
-		oss.ss_size = current->sas_ss_size;
-		oss.ss_flags = sas_ss_flags(sp);
-	}
+	oss.ss_sp = (void __user *) current->sas_ss_sp;
+	oss.ss_size = current->sas_ss_size;
+	oss.ss_flags = sas_ss_flags(sp);
 
 	if (uss) {
 		void __user *ss_sp;
@@ -2501,13 +2499,16 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 		current->sas_ss_size = ss_size;
 	}
 
+	error = 0;
 	if (uoss) {
 		error = -EFAULT;
-		if (copy_to_user(uoss, &oss, sizeof(oss)))
+		if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
 			goto out;
+		error = __put_user(oss.ss_sp, &uoss->ss_sp) |
+			__put_user(oss.ss_size, &uoss->ss_size) |
+			__put_user(oss.ss_flags, &uoss->ss_flags);
 	}
 
-	error = 0;
 out:
 	return error;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.13
retrieving revision 1.1679.2.14
diff -u -p -r1.1679.2.13 -r1.1679.2.14
--- kernel.spec	19 Aug 2009 05:13:13 -0000	1.1679.2.13
+++ kernel.spec	19 Aug 2009 14:21:52 -0000	1.1679.2.14
@@ -828,6 +828,9 @@ Patch12020: execve-must-clear-current-cl
 # CVE-2009-2849
 Patch12030: md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
 
+# CVE-2009-2847
+Patch12040: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
 # make gcc stop optimizing away null pointer tests
 Patch13000: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -1555,6 +1558,9 @@ ApplyPatch execve-must-clear-current-cle
 # CVE-2009-2849
 ApplyPatch md-avoid-dereferencing-NULL-ptr-suspend-sysfs.patch
 
+# CVE-2009-2847
+ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
 # don't optimize out null pointer tests
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -2164,6 +2170,8 @@ fi
   which improve mmap_min_addr.
 - CVE-2009-2849: md: avoid dereferencing null ptr when accessing suspend
   sysfs attributes.
+- CVE-2009-2847: do_sigaltstack: avoid copying 'stack_t' as a structure
+  to userspace
 
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.6-217.2.9
 - Fix flub in prior lirc patch update that resulted in no lirc



From kyle at fedoraproject.org  Wed Aug 19 14:22:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 19 Aug 2009 14:22:02 +0000 (UTC)
Subject: rpms/kernel/F-10
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch,
	NONE, 1.1.2.2 kernel.spec, 1.1206.2.83, 1.1206.2.84
Message-ID: <20090819142202.F3B5411C00E4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30672

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch 
Log Message:
CVE-2009-2847 fix kernel information leak in sigaltstack

do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch:
 signal.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat, 1 Aug 2009 17:34:56 +0000 (-0700)
Subject: do_sigaltstack: avoid copying 'stack_t' as a structure to user space
X-Git-Tag: v2.6.31-rc6~89
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0083fc2c50e6c5127c2802ad323adf8143ab7856

do_sigaltstack: avoid copying 'stack_t' as a structure to user space

Ulrich Drepper correctly points out that there is generally padding in
the structure on 64-bit hosts, and that copying the structure from
kernel to user space can leak information from the kernel stack in those
padding bytes.

Avoid the whole issue by just copying the three members one by one
instead, which also means that the function also can avoid the need for
a stack frame.  This also happens to match how we copy the new structure
from user space, so it all even makes sense.

[ The obvious solution of adding a memset() generates horrid code, gcc
  does really stupid things. ]

Reported-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/signal.c b/kernel/signal.c
index ccf1cee..f268372 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2454,11 +2454,9 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 	stack_t oss;
 	int error;
 
-	if (uoss) {
-		oss.ss_sp = (void __user *) current->sas_ss_sp;
-		oss.ss_size = current->sas_ss_size;
-		oss.ss_flags = sas_ss_flags(sp);
-	}
+	oss.ss_sp = (void __user *) current->sas_ss_sp;
+	oss.ss_size = current->sas_ss_size;
+	oss.ss_flags = sas_ss_flags(sp);
 
 	if (uss) {
 		void __user *ss_sp;
@@ -2501,13 +2499,16 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 		current->sas_ss_size = ss_size;
 	}
 
+	error = 0;
 	if (uoss) {
 		error = -EFAULT;
-		if (copy_to_user(uoss, &oss, sizeof(oss)))
+		if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
 			goto out;
+		error = __put_user(oss.ss_sp, &uoss->ss_sp) |
+			__put_user(oss.ss_size, &uoss->ss_size) |
+			__put_user(oss.ss_flags, &uoss->ss_flags);
 	}
 
-	error = 0;
 out:
 	return error;
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.83
retrieving revision 1.1206.2.84
diff -u -p -r1.1206.2.83 -r1.1206.2.84
--- kernel.spec	19 Aug 2009 02:33:58 -0000	1.1206.2.83
+++ kernel.spec	19 Aug 2009 14:22:02 -0000	1.1206.2.84
@@ -787,6 +787,7 @@ Patch11010: linux-2.6-dev-zero-avoid-oom
 Patch12000: linux-2.6-virtio-blk-dont-bounce-highmem-requests.patch
 
 Patch13000: make-mmap_min_addr-suck-less.patch
+Patch13001: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
 %endif
 
@@ -1427,6 +1428,8 @@ ApplyPatch linux-2.6-virtio-blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
+ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2005,6 +2008,8 @@ fi
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   to improve mmap_min_addr.
+- CVE-2009-2847: do_sigaltstack: avoid copying 'stack_t' as a structure
+  to user space
 
 * Mon Aug 17 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.30-170.2.82
 - Backport F-11 patch to fix oopses in USB serial drivers. (#517259)



From akurtakov at fedoraproject.org  Wed Aug 19 14:31:28 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 14:31:28 +0000 (UTC)
Subject: rpms/dumbster/devel dumbster.spec, NONE, 1.1 dumbster-1.6.pom, NONE,
	1.1 dumbster-SimpleSmtpServer.patch, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090819143128.876E411C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/dumbster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv691/devel

Modified Files:
	sources .cvsignore 
Added Files:
	dumbster.spec dumbster-1.6.pom dumbster-SimpleSmtpServer.patch 
Log Message:
Initial import.


--- NEW FILE dumbster.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Summary:        Fake SMTP Server
Name:           dumbster
Version:        1.6
Release:        8%{?dist}
Epoch:          0
License:        ASL 2.0
URL:            http://quintanasoft.com/dumbster/
Group:          Development/Testing
# cvs -z3 -d:pserver:anonymous at dumbster.cvs.sourceforge.net:/cvsroot/dumbster export -r RELEASE_1_6 dumbster
# tar czf dumbster-1.6-src.tgz dumbster
Source0:        %{name}-%{version}-src.tgz
Source1:        %{name}-1.6.pom
Patch0:         %{name}-SimpleSmtpServer.patch
BuildRequires:  ant >= 0:1.6
BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  jaf
BuildRequires:  javamail
BuildRequires:  junit
Requires:       jaf
Requires:       java-sasl
Requires:       javamail

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The Dumbster is a very simple fake SMTP server designed for
unit and system testing applications that send email messages.
It responds to all standard SMTP commands but does not deliver
messages to the user. The messages are stored within the
Dumbster for later extraction and verification.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%prep
%setup -q -n %{name}
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;

%patch0
rm -f src/com/dumbster/smtp/SimpleSmtpServer.java.orig

%build
pushd lib
ln -sf $(build-classpath javamail)
ln -sf $(build-classpath jaf)
ln -sf $(build-classpath junit)
ln -sf $(build-classpath sasl)
popd

export OPT_JAT_LIST=:
export CLASSPATH=

ant jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}

install -m 0644 build/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# pom
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
cp -pr %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap dumbster %{name} 1.6 JPP %{name}

install -dm 755 $RPM_BUILD_ROOT%{_javadir}/maven2
ln -s %{_datadir}/maven2/poms $RPM_BUILD_ROOT%{_javadir}/maven2/poms

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc license.txt
%{_javadir}/*.jar
%{_datadir}/maven2/poms
%{_javadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.6-8
- Drop gcj support.
- Fix javadoc build error.
- Remove javadoc ghost dirs.

* Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> 0:1.6-7
- Fix license
- Add upstream fix to race condition

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.6-6
- bump release number

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.6-5
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.6-4
- Fix release tag

* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 0:1.6-3jpp.2
- re-build with gcj

* Thu Jan 08 2009 Yong Yang <yyang at redhat.com> - 0:1.6-3jpp.1
- Import from dbhole's maven 2.0.8 packages, Initial building on JPP6

* Mon Jan 07 2008 Deepak Bhole <dbhole at redhat.com> 1.6-2jpp.1
- Merge with JPackage
- Update as per Fedora spec

* Wed May 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6-2jpp
- Fix date in copyright notice
- Fix aot build
- Make Vendor, Distribution based on macro
- Fix BR for java-sasl to gnu-crypto-sasl-jdk1.4

* Wed Sep 13 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.6-1jpp
- First JPackage build
- Add post/postun Requires for javadoc
- Add gcj_support option


--- NEW FILE dumbster-1.6.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>dumbster</groupId>
  <artifactId>dumbster</artifactId>
  <name>Dumbster: Fake SMTP Server</name>
  <version>1.6</version>
  <dependencies>
    <dependency>
      <groupId>javax.activation</groupId>
      <artifactId>activation</artifactId>
      <version>1.0.2</version>
    </dependency>
    <dependency>
      <groupId>javax.mail</groupId>
      <artifactId>mail</artifactId>
      <version>1.3.2</version>
    </dependency>
  </dependencies>
</project>
dumbster-SimpleSmtpServer.patch:
 ./src/com/dumbster/smtp/SimpleSmtpServer.java |   13 ++++++++-----
 src/com/dumbster/smtp/SimpleSmtpServer.java   |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE dumbster-SimpleSmtpServer.patch ---
diff -up ./src/com/dumbster/smtp/SimpleSmtpServer.java.sav ./src/com/dumbster/smtp/SimpleSmtpServer.java
--- ./src/com/dumbster/smtp/SimpleSmtpServer.java.sav	2008-01-09 18:03:50.000000000 -0500
+++ ./src/com/dumbster/smtp/SimpleSmtpServer.java	2008-01-09 18:08:21.000000000 -0500
@@ -145,11 +145,14 @@ public class SimpleSmtpServer implements
   public synchronized void stop() {
     // Mark us closed
     stopped = true;
-    try {
-      // Kick the server accept loop
-      serverSocket.close();
-    } catch (IOException e) {
-      // Ignore
+
+    if (serverSocket != null) {
+        try {
+          // Kick the server accept loop
+          serverSocket.close();
+        } catch (IOException e) {
+          // Ignore
+        }
     }
   }
 
# revision 1.8
# date: 2005/04/14 14:09:38;  author: jasonkitchen;  state: Exp;  lines: +1 -1
# Move thread start inside of synchronized block to prevent notifications being sent before anyone is waiting.
#
diff -r -u --exclude=CVS dumbster.1.6/src/com/dumbster/smtp/SimpleSmtpServer.java dumbster/src/com/dumbster/smtp/SimpleSmtpServer.java
--- src/com/dumbster/smtp/SimpleSmtpServer.java	2005-03-23 10:59:42.000000000 -0500
+++ src/com/dumbster/smtp/SimpleSmtpServer.java	2005-04-14 10:09:38.000000000 -0400
@@ -252,11 +252,11 @@
   public static SimpleSmtpServer start(int port) {
     SimpleSmtpServer server = new SimpleSmtpServer(port);
     Thread t = new Thread(server);
-    t.start();
     
     // Block until the server socket is created
     synchronized (server) {
       try {
+        t.start();
         server.wait();
       } catch (InterruptedException e) {
         // Ignore don't care.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dumbster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 May 2009 23:49:18 -0000	1.1
+++ sources	19 Aug 2009 14:31:27 -0000	1.2
@@ -0,0 +1 @@
+674d9a142ed5d6a998f7da2d352f7614  dumbster-1.6-src.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dumbster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 May 2009 23:49:18 -0000	1.1
+++ .cvsignore	19 Aug 2009 14:31:27 -0000	1.2
@@ -0,0 +1 @@
+dumbster-1.6-src.tgz



From buc at fedoraproject.org  Wed Aug 19 14:46:27 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 19 Aug 2009 14:46:27 +0000 (UTC)
Subject: rpms/dvdisaster/devel .cvsignore, 1.9, 1.10 dvdisaster.spec, 1.29, 
	1.30 sources, 1.12, 1.13
Message-ID: <20090819144627.2A37311C00E4@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4219

Modified Files:
	.cvsignore dvdisaster.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 Jul 2009 16:56:46 -0000	1.9
+++ .cvsignore	19 Aug 2009 14:46:25 -0000	1.10
@@ -1 +1 @@
-dvdisaster-0.72.tar.bz2
+dvdisaster-0.72.1.tar.bz2


Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- dvdisaster.spec	24 Jul 2009 20:39:50 -0000	1.29
+++ dvdisaster.spec	19 Aug 2009 14:46:25 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Additional error protection for CD/DVD media
 Name: dvdisaster
-Version: 0.72
-Release: 2%{?dist}
+Version: 0.72.1
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPLv2+
 URL: http://www.dvdisaster.com
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.72.1-1
+- Update to 0.72.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Jul 2009 16:56:46 -0000	1.12
+++ sources	19 Aug 2009 14:46:25 -0000	1.13
@@ -1 +1 @@
-efa35607d91412a7ff185722f270fb8a  dvdisaster-0.72.tar.bz2
+4da96566bc003be93d9dfb0109b4aa1d  dvdisaster-0.72.1.tar.bz2



From tuxbrewr at fedoraproject.org  Wed Aug 19 14:53:17 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 19 Aug 2009 14:53:17 +0000 (UTC)
Subject: rpms/kpackagekit/devel .cvsignore, 1.13, 1.14 kpackagekit.spec, 1.39,
	1.40 sources, 1.17, 1.18
Message-ID: <20090819145317.2F5E711C00E4@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5808

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
New release with PolicyKit 1 integration


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	11 Jun 2009 12:21:54 -0000	1.13
+++ .cvsignore	19 Aug 2009 14:53:16 -0000	1.14
@@ -1 +1 @@
-kpackagekit-0.4.1.1.tar.bz2
+kpackagekit-0.5.0.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- kpackagekit.spec	25 Jul 2009 04:45:28 -0000	1.39
+++ kpackagekit.spec	19 Aug 2009 14:53:16 -0000	1.40
@@ -1,15 +1,15 @@
 
-%define pk_version 0.5.0
+%define pk_version 0.5.2
 
 Name:	  	kpackagekit
-Version:	0.4.1.1
-Release:	4%{?dist}
+Version:	0.5.0
+Release:	0%{?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.4.1.1.tar.bz2
+Source0:	kpackagekit-0.5.0.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0
+- New upstream release with PolicyKit 1 integration
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 Jul 2009 13:52:56 -0000	1.17
+++ sources	19 Aug 2009 14:53:17 -0000	1.18
@@ -1 +1 @@
-ec1f85ef73405a79afbffc50e9c3ab79  kpackagekit-0.4.1.1.tar.bz2
+efa37a905ed99236ff644987679907fa  kpackagekit-0.5.0.tar.bz2



From vcrhonek at fedoraproject.org  Wed Aug 19 14:59:26 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 19 Aug 2009 14:59:26 +0000 (UTC)
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.73,1.74
Message-ID: <20090819145926.C0AF911C00E4@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7266

Modified Files:
	tog-pegasus.spec 
Log Message:
Fix Source


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- tog-pegasus.spec	27 Jul 2009 06:04:09 -0000	1.73
+++ tog-pegasus.spec	19 Aug 2009 14:59:26 -0000	1.74
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.9.0
-Release: 		3%{?dist}
+Release: 		4%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -53,7 +53,7 @@ License:   		MIT
 #
 BuildRoot: 		%{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}-%(%{__id} -u -n)
 #
-Source:			http://www.openpegasus.org/uploads/40/14280/pegasus-%{version}.tar.gz
+Source:			http://www.openpegasus.org/uploads/40/18361/pegasus-%{version}.tar.gz
 Source1:        	README.RedHat.Security
 Source2:		genOpenPegasusSSLCerts
 Source3:		pegasus_arch_alternatives
@@ -461,6 +461,10 @@ fi
 
 
 %changelog
+* Wed Aug 19 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.9.0-4
+- Fix Source (but I'm afraid it's not very persistent and it will
+  not work again after some time)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.9.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Aug 19 15:02:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 15:02:38 +0000
Subject: [pkgdb] maven-wagon: akurtakov has requested watchbugzilla
Message-ID: <20090819150238.31F2510F888@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven-wagon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-wagon



From pkgdb at fedoraproject.org  Wed Aug 19 15:02:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 15:02:40 +0000
Subject: [pkgdb] maven-wagon: akurtakov has requested watchcommits
Message-ID: <20090819150240.5710B10F895@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven-wagon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-wagon



From pkgdb at fedoraproject.org  Wed Aug 19 15:02:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 15:02:41 +0000
Subject: [pkgdb] maven-wagon: akurtakov has requested commit
Message-ID: <20090819150241.CD33A10F89A@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven-wagon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-wagon



From jcollie at fedoraproject.org  Wed Aug 19 15:05:30 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 19 Aug 2009 15:05:30 +0000 (UTC)
Subject: rpms/pitivi/devel .cvsignore, 1.16, 1.17 pitivi.spec, 1.37,
	1.38 sources, 1.16, 1.17
Message-ID: <20090819150530.CEA6B11C00E4@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8863

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Fri Aug 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-2
- Bump required version of gstreamer-python



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	28 Jul 2009 05:59:25 -0000	1.16
+++ .cvsignore	19 Aug 2009 15:05:30 -0000	1.17
@@ -1 +1 @@
-pitivi-0.13.1.2.tar.bz2
+pitivi-0.13.2.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- pitivi.spec	28 Jul 2009 05:59:26 -0000	1.37
+++ pitivi.spec	19 Aug 2009 15:05:30 -0000	1.38
@@ -1,8 +1,8 @@
 %define major   0.13
-%define minor   1.2
+%define minor   2
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -12,22 +12,23 @@ Source0:        http://ftp.gnome.org/pub
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       gnonlin >= 0.10.11.2
-Requires:       gstreamer-python >= 0.10.15
-Requires:       gstreamer >= 0.10.23
-Requires:       pygtk2 >= 2.12.0
+Requires:       gnonlin >= 0.10.12
+Requires:       gstreamer-python >= 0.10.16
+Requires:       gstreamer >= 0.10.24
+Requires:       gstreamer-plugins-base >= 0.10.24
+Requires:       pygtk2 >= 2.14.0
 Requires:       python-zope-interface
 Requires:       python-setuptools
 Requires:       pygoocanvas
 
-BuildRequires:  gstreamer-devel >= 0.10.23
-BuildRequires:  gstreamer-plugins-base-devel >= 0.10.23
-BuildRequires:  gnonlin >= 0.10.11.2
-BuildRequires:  gstreamer-python >= 0.10.15
+BuildRequires:  gnonlin >= 0.10.12
+BuildRequires:  gstreamer-python >= 0.10.16
+BuildRequires:  gstreamer-devel >= 0.10.24
+BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
 BuildRequires:  GConf2-devel
 BuildRequires:  gtk2-devel >= 2.8
-BuildRequires:  pygtk2-devel >= 2.12.0
-BuildRequires:  pygtk2-libglade >= 2.12.0
+BuildRequires:  pygtk2-devel >= 2.14.0
+BuildRequires:  pygtk2-libglade >= 2.14.0
 BuildRequires:  gtk-doc
 BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils
@@ -79,6 +80,29 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Fri Aug 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-2
+- Bump required version of gstreamer-python
+
+* Thu Aug 13 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-1
+- Update to 0.13.2 "Jailbreak (out of Deadlock City)"
+- 
+- The PiTiVi team is proud to announce the second release in the
+- unstable 0.13 PiTiVi series.
+- 
+- Due to its dependency on GStreamer, The PiTiVi team strongly
+- recommends users have all official latest gstreamer libraries and
+- plugins installed for the best user experience.
+- 
+- Features of this release
+- 
+-    * Undo/Redo support
+-    * Audio mixing
+-    * Ripple/Roll edit
+-    * misc fixes everywhere 
+
+* Wed Aug 12 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.1.3-1
+- Update to latest prerelease.
+
 * Mon Jul 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.1.2-1
 - Update to prerelease
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	28 Jul 2009 05:59:26 -0000	1.16
+++ sources	19 Aug 2009 15:05:30 -0000	1.17
@@ -1 +1 @@
-d642eb3c2aa2d8497598948162a0ddfc  pitivi-0.13.1.2.tar.bz2
+bb5053faf283fd5ba1f77fce50143184  pitivi-0.13.2.tar.bz2



From tbzatek at fedoraproject.org  Wed Aug 19 15:08:47 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 19 Aug 2009 15:08:47 +0000 (UTC)
Subject: rpms/gvfs/F-11
	mount-prefix-0001-Include-mount-prefix-when-constructing-fuse-path.patch,
	NONE, 1.1
	mount-prefix-0002-GDaemonMount-calculates-wrong-root-path-when-mount_p.patch,
	NONE, 1.1
	mount-prefix-0003-Canonicalize-mount-prefix-to-prevent-mountspec-match.patch,
	NONE, 1.1 gvfs.spec, 1.142,
	1.143 gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch,
	1.1, NONE
Message-ID: <20090819150847.8507C11C00E4@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10242

Modified Files:
	gvfs.spec 
Added Files:
	mount-prefix-0001-Include-mount-prefix-when-constructing-fuse-path.patch 
	mount-prefix-0002-GDaemonMount-calculates-wrong-root-path-when-mount_p.patch 
	mount-prefix-0003-Canonicalize-mount-prefix-to-prevent-mountspec-match.patch 
Removed Files:
	gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch 
Log Message:
* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-12
- Fix remaining mount prefix issues (#509612)


mount-prefix-0001-Include-mount-prefix-when-constructing-fuse-path.patch:
 gdaemonvfs.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE mount-prefix-0001-Include-mount-prefix-when-constructing-fuse-path.patch ---
>From 2faf6d93fc2833d5b7f6da9288db1c8b98e4b7bd Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 18 Aug 2009 15:00:17 +0200
Subject: [PATCH 1/3] Include mount prefix when constructing fuse path

On complex URIs like 'dav://server/gallery/w/TestAlbum',
g_file_get_path () would return incomplete path without the
middle '/gallery/w' part (mount prefix). This patch ensures
full path to be returned.

See bug 590862 for details.
---
 client/gdaemonvfs.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 5a138b3..0382727 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -386,7 +386,6 @@ convert_fuse_path (GVfs     *vfs,
       if (mount_info)
 	{
 	  g_object_unref (file);
-	  /* TODO: Do we need to look at the prefix of the mount_spec? */
 	  file = g_daemon_file_new (mount_info->mount_spec, mount_path);
 	  g_free (mount_path);
 	  g_mount_info_unref (mount_info);
@@ -993,6 +992,7 @@ _g_daemon_vfs_get_mount_info_by_fuse_sync (const char *fuse_path,
   DBusMessageIter iter;
   DBusError derror;
   int len;
+  const char *mount_path_end;
 	
   info = lookup_mount_info_by_fuse_path_in_cache (fuse_path,
 						  mount_path);
@@ -1031,9 +1031,12 @@ _g_daemon_vfs_get_mount_info_by_fuse_sync (const char *fuse_path,
 	{
 	  len = strlen (info->fuse_mountpoint);
 	  if (fuse_path[len] == 0)
-	    *mount_path = g_strdup ("/");
+	    mount_path_end = "/";
 	  else
-	    *mount_path = g_strdup (fuse_path + len);
+	    mount_path_end = fuse_path + len;
+
+	  *mount_path = g_build_filename (info->mount_spec->mount_prefix,
+					  mount_path_end, NULL);
 	}
       else
 	{
-- 
1.6.4


mount-prefix-0002-GDaemonMount-calculates-wrong-root-path-when-mount_p.patch:
 gdaemonmount.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mount-prefix-0002-GDaemonMount-calculates-wrong-root-path-when-mount_p.patch ---
>From d77a5385a407264e5a62c629f847bd559e8ad598 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 18 Aug 2009 15:30:07 +0200
Subject: [PATCH 2/3] GDaemonMount calculates wrong root path when mount_prefix is set

When a mount is mounted with a mount_prefix != "/", GDaemonMount calculates
wrong root path, causing breakage of the .gvfs FUSE mount, and making the
mounts unclickable in Nautilus.

Patch by Mads Chr. Olesen, see bug 590730 for details.
---
 client/gdaemonmount.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
index 703cbd6..2f7e2d6 100644
--- a/client/gdaemonmount.c
+++ b/client/gdaemonmount.c
@@ -110,7 +110,8 @@ g_daemon_mount_get_root (GMount *mount)
 {
   GDaemonMount *daemon_mount = G_DAEMON_MOUNT (mount);
 
-  return g_daemon_file_new (daemon_mount->mount_info->mount_spec, "/");
+  return g_daemon_file_new (daemon_mount->mount_info->mount_spec, 
+        daemon_mount->mount_info->mount_spec->mount_prefix);
 }
 
 static GIcon *
-- 
1.6.4


mount-prefix-0003-Canonicalize-mount-prefix-to-prevent-mountspec-match.patch:
 gmountspec.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE mount-prefix-0003-Canonicalize-mount-prefix-to-prevent-mountspec-match.patch ---
>From 7f167552dec842b74e71bdd91ee67a5b321cacd8 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 18 Aug 2009 15:33:51 +0200
Subject: [PATCH 3/3] Canonicalize mount prefix to prevent mountspec matching issues

This prevents mismatches during mount spec comparation, e.g. with
trailing slash in mount_prefix ("/subdir" vs. "/subdir/").

See bug 590730 for details.
---
 common/gmountspec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/gmountspec.c b/common/gmountspec.c
index d72e189..c55f996 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -71,7 +71,7 @@ g_mount_spec_new_from_data (GArray *items,
   if (mount_prefix == NULL)
     spec->mount_prefix = g_strdup ("/");
   else
-    spec->mount_prefix = mount_prefix;
+    spec->mount_prefix = g_mount_spec_canonicalize_path (mount_prefix);
 
   g_array_sort (spec->items, item_compare);
   
@@ -112,7 +112,7 @@ g_mount_spec_set_mount_prefix  (GMountSpec      *spec,
 				const char      *mount_prefix)
 {
   g_free (spec->mount_prefix);
-  spec->mount_prefix = g_strdup (mount_prefix);
+  spec->mount_prefix = g_mount_spec_canonicalize_path (mount_prefix);
 }
 
 
-- 
1.6.4



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- gvfs.spec	17 Aug 2009 14:52:33 -0000	1.142
+++ gvfs.spec	19 Aug 2009 15:08:47 -0000	1.143
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -43,9 +43,6 @@ Patch5: gvfs-1.2.3-sftp-40sec-timeout.pa
 # smb url don't work in the run application dialog 
 # http://bugzilla.gnome.org/show_bug.cgi?id=573994 
 Patch6: gvfs-1.3.4-smb-browse-fake-content-type.patch
-# Bad mount prefix stripping in g_daemon_file_get_path()
-# http://bugzilla.gnome.org/show_bug.cgi?id=590862
-Patch7: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
 # 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
@@ -98,6 +95,16 @@ Patch122: gvfs-1.3.1-audiocd-automount.p
 Patch200: webdav-username.patch
 Patch201: gvfs-1.2.4-fix-gphoto2-for-canon-5d.patch
 
+# Backported from master:
+#  Bad mount prefix stripping in g_daemon_file_get_path()
+#  http://bugzilla.gnome.org/show_bug.cgi?id=590862
+Patch301: mount-prefix-0001-Include-mount-prefix-when-constructing-fuse-path.patch
+#  GDaemonMount calculates wrong root path when mount_prefix is set
+#  http://bugzilla.gnome.org/show_bug.cgi?id=590730
+Patch302: mount-prefix-0002-GDaemonMount-calculates-wrong-root-path-when-mount_p.patch
+Patch303: mount-prefix-0003-Canonicalize-mount-prefix-to-prevent-mountspec-match.patch
+
+
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -184,7 +191,6 @@ media players (Media Transfer Protocol) 
 %patch4 -p1 -b .cdda-query
 %patch5 -p1 -b .sftp-timeout
 %patch6 -p1 -b .smb-fake-content-type
-%patch7 -p1 -b .mount-prefix
 %patch8 -p1 -b .sftp-mkdir
 
 %patch101 -p1 -b .gdu-volume-monitor
@@ -209,6 +215,10 @@ media players (Media Transfer Protocol) 
 %patch200 -p1 -b .webdav-username
 %patch201 -p1 -b .gphoto2-basedir
 
+%patch301 -p1 -b .mount-prefix-path
+%patch302 -p1 -b .mount-prefix-gdaemonmount
+%patch303 -p1 -b .canonicalize-mountspec
+
 %build
 
 # Needed for gvfs-0.2.1-archive-integration.patch
@@ -351,6 +361,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-12
+- Fix remaining mount prefix issues (#509612)
+
 * Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-11
 - Fix Nautilus can't create "untitled folder" on sftp mounts (#512611)
 


--- gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Aug 19 15:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 15:26:14 +0000
Subject: [pkgdb] maven-wagon had acl change status
Message-ID: <20090819152620.4066C10F882@bastion2.fedora.phx.redhat.com>

fnasser has set the commit acl on maven-wagon (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-wagon



From pkgdb at fedoraproject.org  Wed Aug 19 15:26:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 15:26:23 +0000
Subject: [pkgdb] maven-wagon had acl change status
Message-ID: <20090819152624.0A5C310F898@bastion2.fedora.phx.redhat.com>

fnasser has set the watchbugzilla acl on maven-wagon (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-wagon



From pkgdb at fedoraproject.org  Wed Aug 19 15:26:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 15:26:25 +0000
Subject: [pkgdb] maven-wagon had acl change status
Message-ID: <20090819152625.0D6EC10F89C@bastion2.fedora.phx.redhat.com>

fnasser has set the watchcommits acl on maven-wagon (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-wagon



From akurtakov at fedoraproject.org  Wed Aug 19 15:32:56 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 15:32:56 +0000 (UTC)
Subject: rpms/jakarta-commons-jxpath/devel commons-jxpath-1.2.pom, NONE,
	1.1 jakarta-commons-jxpath.spec, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090819153256.CD2E911C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-jxpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14924/devel

Modified Files:
	sources .cvsignore 
Added Files:
	commons-jxpath-1.2.pom jakarta-commons-jxpath.spec 
Log Message:
Initial import.


--- NEW FILE commons-jxpath-1.2.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-jxpath</groupId>
  <artifactId>commons-jxpath</artifactId>
  <name>JXPath</name>
  <version>1.2</version>
  <description>A package of Java utility methods for accessing and modifying object properties</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev at jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user at jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>dmitri</id>
      <name>Dmitri Plotnikov</name>
      <email>dmitri at apache.org</email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email>Craig.McClanahan at eng.sun.com</email>
      <organization>Sun Microsystems</organization>
    </developer>
  </developers>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:cvs:pserver:anoncvs at cvs.apache.org:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}/</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <testResources>
      <testResource>
        <directory>${pom.build.unitTestSourceDirectory}</directory>
        <includes>
          <include>**/*.xml</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*Test.java</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xerces</artifactId>
      <version>1.2.3</version>
    </dependency>
    <dependency>
      <groupId>servletapi</groupId>
      <artifactId>servletapi</artifactId>
      <version>2.2</version>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8</version>
    </dependency>
    <dependency>
      <groupId>ant</groupId>
      <artifactId>ant-optional</artifactId>
      <version>1.5.1</version>
    </dependency>
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>2.0.2</version>
    </dependency>
    <dependency>
      <groupId>jdom</groupId>
      <artifactId>jdom</artifactId>
      <version>b9</version>
    </dependency>
    <dependency>
      <groupId>commons-beanutils</groupId>
      <artifactId>commons-beanutils</artifactId>
      <version>1.4</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0</version>
    </dependency>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>2.0</version>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
  </distributionManagement>
</project>

--- NEW FILE jakarta-commons-jxpath.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section   devel
%define base_name commons-jxpath

Name:           jakarta-%{base_name}
Version:        1.2
Release:        7%{?dist}
Epoch:          0
Summary:        Simple XPath interpreter

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://jakarta.apache.org/commons/jxpath/
# svn export http://svn.apache.org/repos/asf/commons/proper/jxpath/tags/JXPATH_1_2 commons-jxpath-1.2
# Note: Exported revision 775993.
# tar czf commons-jxpath-1.2-src.tgz commons-jxpath-1.2
Source0:        commons-jxpath-1.2-src.tgz
Source1:        http://repo1.maven.org/maven2/commons-jxpath/commons-jxpath/1.2/commons-jxpath-1.2.pom

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant >= 0:1.6, ant-junit >= 0:1.6, junit
BuildRequires:  xml-commons-apis
BuildRequires:  xerces-j2
BuildRequires:  servletapi5
BuildRequires:  jdom >= 0:1.0
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-collections >= 0:2.1.1
BuildRequires:  tomcat5-jsp-2.0-api
Requires:       xml-commons-apis
Requires:       xerces-j2
Requires:       servletapi5
Requires:       jdom >= 0:1.0
Requires:       jakarta-commons-beanutils
Requires:       jakarta-commons-logging
Requires:       jakarta-commons-collections >= 0:2.1.1
Requires:       tomcat5-jsp-2.0-api

Requires(post):   jpackage-utils >= 1.7.2
Requires(postun): jpackage-utils >= 1.7.2

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Defines a simple interpreter of an expression language called XPath.
JXPath applies  XPath  expressions to graphs of objects of all kinds:
JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description    javadoc
Javadoc for %{name}

%prep
%setup -q -n %{base_name}-%{version}

%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=$(build-classpath \
xerces-j2 \
tomcat5-jsp-2.0-api \
servletapi5 \
xml-commons-apis \
jdom \
commons-beanutils \
commons-logging \
commons-collections)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only -Dant.build.javac.source=1.4 test jar javadoc


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 644 target/%{base_name}.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}/%{base_name}-%{version}.jar
ln -s %{base_name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar

install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# Install pom
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms
%add_to_maven_depmap commons-jxpath commons-jxpath %{version} JPP %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_datadir}/maven2
%{_mavendepmapfragdir}
%doc LICENSE.txt
%{_javadir}/*.jar

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}

%changelog
* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-7
- Initial package for Fedora.

* Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> - 0:1.2-6
- Fix License
- Provide intructions for obtaining source and refresh source tar ball

* Wed Mar 18 2009 Yong Yang <yyang at redhat.com> - 0:1.2-5
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.2-4
- Fix release tag

* Thu Jan 08 2009 Yong Yang <yyang at redhat.com> - 0:1.2-3jpp.1
- Import from dbhole's maven 2.0.8 packages, initial building

* Wed Apr 09 2008 Deepak Bhole <dbhole at redhat.com> - 0:1.2-2jpp.1
- Import from JPackage
- Added pom file

* Wed Jun 07 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2-2jpp
- First JPP 1.7 build

* Sat Sep 18 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- Upgrade to 1.2
- Use jdom-1.0-0.rc1.1jpp
- Relax some versioned dependencies

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
- Rebuild with ant-1.6.2

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.1-2jpp
- Upgrade to Ant 1.6.X

* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
- First JPackage release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-jxpath/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 May 2009 23:50:04 -0000	1.1
+++ sources	19 Aug 2009 15:32:56 -0000	1.2
@@ -0,0 +1 @@
+e1e376eb6d485c52c521096a307a9846  commons-jxpath-1.2-src.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-jxpath/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 May 2009 23:50:04 -0000	1.1
+++ .cvsignore	19 Aug 2009 15:32:56 -0000	1.2
@@ -0,0 +1 @@
+commons-jxpath-1.2-src.tgz



From toshio at fedoraproject.org  Wed Aug 19 15:39:25 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 19 Aug 2009 15:39:25 +0000 (UTC)
Subject: rpms/krecipes/devel .cvsignore, 1.7, 1.8 krecipes.spec, 1.19,
	1.20 sources, 1.7, 1.8 krecipes-0.9.1-gcc43.patch, 1.1,
	NONE krecipes-X11.patch, 1.1, NONE
Message-ID: <20090819153925.127F811C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/krecipes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17473

Modified Files:
	.cvsignore krecipes.spec sources 
Removed Files:
	krecipes-0.9.1-gcc43.patch krecipes-X11.patch 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.beta2
- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting
  with sqlite backend.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	31 Mar 2008 16:52:58 -0000	1.7
+++ .cvsignore	19 Aug 2009 15:39:23 -0000	1.8
@@ -1 +1 @@
-krecipes-0.9.1.tar.gz
+krecipes-1.0-beta2.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- krecipes.spec	25 Jul 2009 04:47:18 -0000	1.19
+++ krecipes.spec	19 Aug 2009 15:39:24 -0000	1.20
@@ -1,12 +1,12 @@
 Name:           krecipes
-Version:        0.9.1
-Release:        12%{?dist}
+Version:        1.0
+Release:        0.1.beta2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://krecipes.sourceforge.net/
-Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}-beta2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -16,9 +16,6 @@ BuildRequires:  sqlite-devel
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
 
-Patch1:		krecipes-X11.patch
-Patch2:         krecipes-0.9.1-gcc43.patch
-
 %description
 Krecipes is a program that lets you to manage your recipes, create
 shopping lists, choose a recipe based on available ingredients and plan
@@ -26,15 +23,7 @@ your menu/diet in advance.
 
 
 %prep
-%setup -q
-
-# autoconf tools check for X is a file in libXt-devel  and Xt lib
-# we dont use or link against libXt so rather than adding an extra
-# BuildRequires I patched configure to look for something thats there
-%patch1 -p1 -b .X11
-
-%patch2 -p1 -b .gcc43
-
+%setup -q -n %{name}-%{version}-beta2
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -97,6 +86,10 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting
+  with sqlite backend.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Mar 2008 16:52:58 -0000	1.7
+++ sources	19 Aug 2009 15:39:24 -0000	1.8
@@ -1 +1 @@
-7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz
+ad02ed6225cff51d8688cf4ab16bd82f  krecipes-1.0-beta2.tar.gz


--- krecipes-0.9.1-gcc43.patch DELETED ---


--- krecipes-X11.patch DELETED ---



From pvrabec at fedoraproject.org  Wed Aug 19 15:40:55 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Wed, 19 Aug 2009 15:40:55 +0000 (UTC)
Subject: rpms/openscap/devel .cvsignore, 1.5, 1.6 openscap.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090819154055.C554F11C00E4@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/openscap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18036

Modified Files:
	.cvsignore openscap.spec sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Aug 2009 13:59:47 -0000	1.5
+++ .cvsignore	19 Aug 2009 15:40:55 -0000	1.6
@@ -1 +1 @@
-openscap-0.5.1.tar.gz
+openscap-0.5.2.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/openscap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openscap.spec	3 Aug 2009 14:23:52 -0000	1.6
+++ openscap.spec	19 Aug 2009 15:40:55 -0000	1.7
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.2-1
+- upgrade
+
 * Mon Aug 03 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.1-2
 - add rpm-devel requirement
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Aug 2009 13:59:47 -0000	1.5
+++ sources	19 Aug 2009 15:40:55 -0000	1.6
@@ -1 +1 @@
-5cd265229008e8c25468014fbc99b062  openscap-0.5.1.tar.gz
+b4b98f8ddb092c1a8dc8e1b6552034dd  openscap-0.5.2.tar.gz



From pghmcfc at fedoraproject.org  Wed Aug 19 15:41:05 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 19 Aug 2009 15:41:05 +0000 (UTC)
Subject: rpms/proftpd/EL-4 .cvsignore, 1.9, 1.10 proftpd.conf, 1.9,
	1.10 proftpd.pam, 1.2, 1.3 proftpd.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20090819154105.5BEB611C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18023/EL-4

Modified Files:
	.cvsignore proftpd.conf proftpd.pam proftpd.spec sources 
Log Message:
Use mod_vroot to work around PAM/chroot issues (#477120, #506735)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Aug 2009 12:46:15 -0000	1.9
+++ .cvsignore	19 Aug 2009 15:41:05 -0000	1.10
@@ -1 +1,2 @@
 proftpd-1.3.2a.tar.bz2
+proftpd-mod-vroot-0.8.5.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- proftpd.conf	3 Aug 2009 12:46:15 -0000	1.9
+++ proftpd.conf	19 Aug 2009 15:41:05 -0000	1.10
@@ -11,7 +11,11 @@ ServerAdmin			root at localhost
 DefaultServer			on
 
 # Cause every FTP user except adm to be chrooted into their home directory
+# Aliasing /etc/security/pam_env.conf into the chroot allows pam_env to
+# work at session-end time (http://bugzilla.redhat.com/477120)
+VRootEngine			on
 DefaultRoot			~ !adm
+VRootAlias			etc/security/pam_env.conf /etc/security/pam_env.conf
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- proftpd.pam	3 Aug 2009 12:46:15 -0000	1.2
+++ proftpd.pam	19 Aug 2009 15:41:05 -0000	1.3
@@ -4,6 +4,5 @@ auth       required	pam_listfile.so item
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
-# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- proftpd.spec	3 Aug 2009 12:46:15 -0000	1.13
+++ proftpd.spec	19 Aug 2009 15:41:05 -0000	1.14
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -26,6 +26,7 @@ Source6:		proftpd.pam
 Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
+Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -77,7 +78,10 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever} -a 10
+
+# Copy mod_vroot source into place
+%{__cp} -p mod_vroot/mod_vroot.c contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -143,7 +147,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
 	--enable-shadow \
 	--with-libraries="%{_libdir}/mysql" \
 	--with-includes="%{_includedir}/mysql" \
-	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls:mod_vroot \
 	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
 
 %{__make} %{?_smp_mflags}
@@ -274,6 +278,9 @@ fi
 
 
 %changelog
+* Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
+- Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
+
 * Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
 - Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Aug 2009 12:46:15 -0000	1.9
+++ sources	19 Aug 2009 15:41:05 -0000	1.10
@@ -1 +1,2 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz



From pghmcfc at fedoraproject.org  Wed Aug 19 15:41:05 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 19 Aug 2009 15:41:05 +0000 (UTC)
Subject: rpms/proftpd/EL-5 .cvsignore, 1.12, 1.13 proftpd.conf, 1.10,
	1.11 proftpd.pam, 1.2, 1.3 proftpd.spec, 1.33, 1.34 sources,
	1.12, 1.13
Message-ID: <20090819154105.E596E11C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18023/EL-5

Modified Files:
	.cvsignore proftpd.conf proftpd.pam proftpd.spec sources 
Log Message:
Use mod_vroot to work around PAM/chroot issues (#477120, #506735)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Aug 2009 12:46:15 -0000	1.12
+++ .cvsignore	19 Aug 2009 15:41:05 -0000	1.13
@@ -1 +1,2 @@
 proftpd-1.3.2a.tar.bz2
+proftpd-mod-vroot-0.8.5.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- proftpd.conf	3 Aug 2009 12:46:16 -0000	1.10
+++ proftpd.conf	19 Aug 2009 15:41:05 -0000	1.11
@@ -11,7 +11,11 @@ ServerAdmin			root at localhost
 DefaultServer			on
 
 # Cause every FTP user except adm to be chrooted into their home directory
+# Aliasing /etc/security/pam_env.conf into the chroot allows pam_env to
+# work at session-end time (http://bugzilla.redhat.com/477120)
+VRootEngine			on
 DefaultRoot			~ !adm
+VRootAlias			etc/security/pam_env.conf /etc/security/pam_env.conf
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- proftpd.pam	3 Aug 2009 12:46:16 -0000	1.2
+++ proftpd.pam	19 Aug 2009 15:41:05 -0000	1.3
@@ -4,6 +4,5 @@ auth       required	pam_listfile.so item
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
-# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- proftpd.spec	3 Aug 2009 12:46:16 -0000	1.33
+++ proftpd.spec	19 Aug 2009 15:41:05 -0000	1.34
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -26,6 +26,7 @@ Source6:		proftpd.pam
 Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
+Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -77,7 +78,10 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever} -a 10
+
+# Copy mod_vroot source into place
+%{__cp} -p mod_vroot/mod_vroot.c contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -143,7 +147,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
 	--enable-shadow \
 	--with-libraries="%{_libdir}/mysql" \
 	--with-includes="%{_includedir}/mysql" \
-	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls:mod_vroot \
 	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
 
 %{__make} %{?_smp_mflags}
@@ -274,6 +278,9 @@ fi
 
 
 %changelog
+* Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
+- Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
+
 * Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
 - Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Aug 2009 12:46:16 -0000	1.12
+++ sources	19 Aug 2009 15:41:05 -0000	1.13
@@ -1 +1,2 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz



From pghmcfc at fedoraproject.org  Wed Aug 19 15:41:07 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 19 Aug 2009 15:41:07 +0000 (UTC)
Subject: rpms/proftpd/devel .cvsignore, 1.14, 1.15 proftpd.conf, 1.10,
	1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.51, 1.52 sources,
	1.14, 1.15
Message-ID: <20090819154107.6B26B11C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18023/devel

Modified Files:
	.cvsignore proftpd.conf proftpd.pam proftpd.spec sources 
Log Message:
Use mod_vroot to work around PAM/chroot issues (#477120, #506735)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Jul 2009 10:02:40 -0000	1.14
+++ .cvsignore	19 Aug 2009 15:41:06 -0000	1.15
@@ -1 +1,2 @@
 proftpd-1.3.2a.tar.bz2
+proftpd-mod-vroot-0.8.5.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- proftpd.conf	30 Jul 2009 10:02:40 -0000	1.10
+++ proftpd.conf	19 Aug 2009 15:41:06 -0000	1.11
@@ -11,7 +11,11 @@ ServerAdmin			root at localhost
 DefaultServer			on
 
 # Cause every FTP user except adm to be chrooted into their home directory
+# Aliasing /etc/security/pam_env.conf into the chroot allows pam_env to
+# work at session-end time (http://bugzilla.redhat.com/477120)
+VRootEngine			on
 DefaultRoot			~ !adm
+VRootAlias			etc/security/pam_env.conf /etc/security/pam_env.conf
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- proftpd.pam	6 Jan 2009 10:08:09 -0000	1.3
+++ proftpd.pam	19 Aug 2009 15:41:07 -0000	1.4
@@ -4,6 +4,5 @@ auth       required	pam_listfile.so item
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
-# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- proftpd.spec	31 Jul 2009 12:33:11 -0000	1.51
+++ proftpd.spec	19 Aug 2009 15:41:07 -0000	1.52
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -26,6 +26,7 @@ Source6:		proftpd.pam
 Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
+Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -77,7 +78,10 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever} -a 10
+
+# Copy mod_vroot source into place
+%{__cp} -p mod_vroot/mod_vroot.c contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -143,7 +147,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
 	--enable-shadow \
 	--with-libraries="%{_libdir}/mysql" \
 	--with-includes="%{_includedir}/mysql" \
-	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls:mod_vroot \
 	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
 
 %{__make} %{?_smp_mflags}
@@ -274,6 +278,9 @@ fi
 
 
 %changelog
+* Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
+- Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
+
 * Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
 - Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	30 Jul 2009 10:02:40 -0000	1.14
+++ sources	19 Aug 2009 15:41:07 -0000	1.15
@@ -1 +1,2 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz



From pghmcfc at fedoraproject.org  Wed Aug 19 15:41:06 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 19 Aug 2009 15:41:06 +0000 (UTC)
Subject: rpms/proftpd/F-10 .cvsignore, 1.13, 1.14 proftpd.conf, 1.10,
	1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.45, 1.46 sources,
	1.13, 1.14
Message-ID: <20090819154106.4334B11C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18023/F-10

Modified Files:
	.cvsignore proftpd.conf proftpd.pam proftpd.spec sources 
Log Message:
Use mod_vroot to work around PAM/chroot issues (#477120, #506735)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Aug 2009 12:46:16 -0000	1.13
+++ .cvsignore	19 Aug 2009 15:41:05 -0000	1.14
@@ -1 +1,2 @@
 proftpd-1.3.2a.tar.bz2
+proftpd-mod-vroot-0.8.5.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- proftpd.conf	3 Aug 2009 12:46:16 -0000	1.10
+++ proftpd.conf	19 Aug 2009 15:41:06 -0000	1.11
@@ -11,7 +11,11 @@ ServerAdmin			root at localhost
 DefaultServer			on
 
 # Cause every FTP user except adm to be chrooted into their home directory
+# Aliasing /etc/security/pam_env.conf into the chroot allows pam_env to
+# work at session-end time (http://bugzilla.redhat.com/477120)
+VRootEngine			on
 DefaultRoot			~ !adm
+VRootAlias			etc/security/pam_env.conf /etc/security/pam_env.conf
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- proftpd.pam	6 Jan 2009 10:08:08 -0000	1.3
+++ proftpd.pam	19 Aug 2009 15:41:06 -0000	1.4
@@ -4,6 +4,5 @@ auth       required	pam_listfile.so item
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
-# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- proftpd.spec	3 Aug 2009 12:46:16 -0000	1.45
+++ proftpd.spec	19 Aug 2009 15:41:06 -0000	1.46
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -26,6 +26,7 @@ Source6:		proftpd.pam
 Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
+Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -77,7 +78,10 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever} -a 10
+
+# Copy mod_vroot source into place
+%{__cp} -p mod_vroot/mod_vroot.c contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -143,7 +147,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
 	--enable-shadow \
 	--with-libraries="%{_libdir}/mysql" \
 	--with-includes="%{_includedir}/mysql" \
-	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls:mod_vroot \
 	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
 
 %{__make} %{?_smp_mflags}
@@ -274,6 +278,9 @@ fi
 
 
 %changelog
+* Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
+- Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
+
 * Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
 - Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	3 Aug 2009 12:46:16 -0000	1.13
+++ sources	19 Aug 2009 15:41:06 -0000	1.14
@@ -1 +1,2 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz



From pghmcfc at fedoraproject.org  Wed Aug 19 15:41:06 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 19 Aug 2009 15:41:06 +0000 (UTC)
Subject: rpms/proftpd/F-11 .cvsignore, 1.14, 1.15 proftpd.conf, 1.10,
	1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.48, 1.49 sources,
	1.14, 1.15
Message-ID: <20090819154106.BDEF411C00E4@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18023/F-11

Modified Files:
	.cvsignore proftpd.conf proftpd.pam proftpd.spec sources 
Log Message:
Use mod_vroot to work around PAM/chroot issues (#477120, #506735)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	3 Aug 2009 12:46:16 -0000	1.14
+++ .cvsignore	19 Aug 2009 15:41:06 -0000	1.15
@@ -1 +1,2 @@
 proftpd-1.3.2a.tar.bz2
+proftpd-mod-vroot-0.8.5.tar.gz


Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- proftpd.conf	3 Aug 2009 12:46:16 -0000	1.10
+++ proftpd.conf	19 Aug 2009 15:41:06 -0000	1.11
@@ -11,7 +11,11 @@ ServerAdmin			root at localhost
 DefaultServer			on
 
 # Cause every FTP user except adm to be chrooted into their home directory
+# Aliasing /etc/security/pam_env.conf into the chroot allows pam_env to
+# work at session-end time (http://bugzilla.redhat.com/477120)
+VRootEngine			on
 DefaultRoot			~ !adm
+VRootAlias			etc/security/pam_env.conf /etc/security/pam_env.conf
 
 # Use pam to authenticate (default) and be authoritative
 AuthPAMConfig			proftpd


Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- proftpd.pam	6 Jan 2009 10:08:09 -0000	1.3
+++ proftpd.pam	19 Aug 2009 15:41:06 -0000	1.4
@@ -4,6 +4,5 @@ auth       required	pam_listfile.so item
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
-# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- proftpd.spec	3 Aug 2009 12:46:16 -0000	1.48
+++ proftpd.spec	19 Aug 2009 15:41:06 -0000	1.49
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -26,6 +26,7 @@ Source6:		proftpd.pam
 Source7:		proftpd-mod_quotatab_ldap.ldif
 Source8:		proftpd-mod_quotatab_ldap.schema
 Source9:		proftpd.sysconfig
+Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
@@ -77,7 +78,10 @@ Module to add PostgreSQL support to the 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever} -a 10
+
+# Copy mod_vroot source into place
+%{__cp} -p mod_vroot/mod_vroot.c contrib/
 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
@@ -143,7 +147,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
 	--enable-shadow \
 	--with-libraries="%{_libdir}/mysql" \
 	--with-includes="%{_includedir}/mysql" \
-	--with-modules=mod_readme:mod_auth_pam:mod_tls \
+	--with-modules=mod_readme:mod_auth_pam:mod_tls:mod_vroot \
 	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
 
 %{__make} %{?_smp_mflags}
@@ -274,6 +278,9 @@ fi
 
 
 %changelog
+* Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
+- Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
+
 * Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
 - Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	3 Aug 2009 12:46:16 -0000	1.14
+++ sources	19 Aug 2009 15:41:06 -0000	1.15
@@ -1 +1,2 @@
 ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz



From spot at fedoraproject.org  Wed Aug 19 15:54:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 15:54:45 +0000 (UTC)
Subject: rpms/ql2400-firmware/devel .cvsignore, 1.4, 1.5 ql2400-firmware.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090819155445.4D80211C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2400-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20955/devel

Modified Files:
	.cvsignore ql2400-firmware.spec sources 
Log Message:
update to 4.04.09


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Nov 2008 21:53:08 -0000	1.4
+++ .cvsignore	19 Aug 2009 15:54:45 -0000	1.5
@@ -1,2 +1,2 @@
-ql2400_fw.bin_mid
 ql2400_fw.bin
+ql2400_fw.bin_mid


Index: ql2400-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/devel/ql2400-firmware.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ql2400-firmware.spec	27 Jul 2009 02:27:52 -0000	1.5
+++ ql2400-firmware.spec	19 Aug 2009 15:54:45 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		ql2400-firmware
 Summary: 	Firmware for qlogic 2400 devices
-Version:	4.04.05
-Release:	3%{?dist}
+Version:	4.04.09
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
 Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2400_fw.bin
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ql2400_fw.bin_mid
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.04.09-1
+- update to 4.04.09
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.04.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 21:53:08 -0000	1.4
+++ sources	19 Aug 2009 15:54:45 -0000	1.5
@@ -1,2 +1,2 @@
-ce5beb9664b5169206aca0af85d7e695  ql2400_fw.bin_mid
-9a6fafbb4325fdd6784a9a1a5505a415  ql2400_fw.bin
+067a92cabbf4d22761c5f4be3e98d5eb  ql2400_fw.bin
+5ad17e4e9e102d14104b06a01cd0d075  ql2400_fw.bin_mid



From spot at fedoraproject.org  Wed Aug 19 15:54:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 15:54:44 +0000 (UTC)
Subject: rpms/ql2400-firmware/F-10 ql2400-firmware.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090819155444.DBF2A11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2400-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20955/F-10

Modified Files:
	ql2400-firmware.spec sources 
Log Message:
update to 4.04.09


Index: ql2400-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/F-10/ql2400-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ql2400-firmware.spec	20 Nov 2008 21:53:07 -0000	1.3
+++ ql2400-firmware.spec	19 Aug 2009 15:54:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		ql2400-firmware
 Summary: 	Firmware for qlogic 2400 devices
-Version:	4.04.05
+Version:	4.04.09
 Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
@@ -38,6 +38,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ql2400_fw.bin_mid
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.04.09-1
+- update to 4.04.09
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.04.05-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.04.05-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.04.05-1
 - update to 4.04.05
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 21:53:07 -0000	1.4
+++ sources	19 Aug 2009 15:54:44 -0000	1.5
@@ -1,2 +1,2 @@
-ce5beb9664b5169206aca0af85d7e695  ql2400_fw.bin_mid
-9a6fafbb4325fdd6784a9a1a5505a415  ql2400_fw.bin
+067a92cabbf4d22761c5f4be3e98d5eb  ql2400_fw.bin
+5ad17e4e9e102d14104b06a01cd0d075  ql2400_fw.bin_mid



From spot at fedoraproject.org  Wed Aug 19 15:54:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 15:54:45 +0000 (UTC)
Subject: rpms/ql2400-firmware/F-11 ql2400-firmware.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090819155445.0302211C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2400-firmware/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20955/F-11

Modified Files:
	ql2400-firmware.spec sources 
Log Message:
update to 4.04.09


Index: ql2400-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/F-11/ql2400-firmware.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ql2400-firmware.spec	25 Feb 2009 17:40:14 -0000	1.4
+++ ql2400-firmware.spec	19 Aug 2009 15:54:44 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		ql2400-firmware
 Summary: 	Firmware for qlogic 2400 devices
-Version:	4.04.05
-Release:	2%{?dist}
+Version:	4.04.09
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
 Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2400_fw.bin
@@ -38,6 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ql2400_fw.bin_mid
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.04.09-1
+- update to 4.04.09
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.04.05-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.04.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2400-firmware/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 21:53:08 -0000	1.4
+++ sources	19 Aug 2009 15:54:44 -0000	1.5
@@ -1,2 +1,2 @@
-ce5beb9664b5169206aca0af85d7e695  ql2400_fw.bin_mid
-9a6fafbb4325fdd6784a9a1a5505a415  ql2400_fw.bin
+067a92cabbf4d22761c5f4be3e98d5eb  ql2400_fw.bin
+5ad17e4e9e102d14104b06a01cd0d075  ql2400_fw.bin_mid



From toshio at fedoraproject.org  Wed Aug 19 15:55:21 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 19 Aug 2009 15:55:21 +0000 (UTC)
Subject: rpms/krecipes/F-11 .cvsignore, 1.7, 1.8 krecipes.spec, 1.17,
	1.18 sources, 1.7, 1.8 krecipes-0.9.1-gcc43.patch, 1.1,
	NONE krecipes-X11.patch, 1.1, NONE krecipes-gcc4.patch, 1.1, NONE
Message-ID: <20090819155521.3E91911C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/krecipes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20900

Modified Files:
	.cvsignore krecipes.spec sources 
Removed Files:
	krecipes-0.9.1-gcc43.patch krecipes-X11.patch 
	krecipes-gcc4.patch 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.beta2
- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting
  with sqlite backend.
- Enable the mysql and postgresql backends



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	31 Mar 2008 16:52:58 -0000	1.7
+++ .cvsignore	19 Aug 2009 15:55:20 -0000	1.8
@@ -1 +1 @@
-krecipes-0.9.1.tar.gz
+krecipes-1.0-beta2.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/F-11/krecipes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- krecipes.spec	25 Feb 2009 12:00:15 -0000	1.17
+++ krecipes.spec	19 Aug 2009 15:55:20 -0000	1.18
@@ -1,22 +1,20 @@
 Name:           krecipes
-Version:        0.9.1
-Release:        10%{?dist}
+Version:        1.0
+Release:        0.1.beta2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://krecipes.sourceforge.net/
-Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}-beta2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs3-devel
 BuildRequires:  sqlite-devel
-
-Patch0:		krecipes-gcc4.patch
-Patch1:		krecipes-X11.patch
-Patch2:         krecipes-0.9.1-gcc43.patch
+BuildRequires:  mysql-devel
+BuildRequires:  postgresql-devel
 
 %description
 Krecipes is a program that lets you to manage your recipes, create
@@ -25,25 +23,16 @@ your menu/diet in advance.
 
 
 %prep
-%setup -q
-
-## Neither patch0 or patch1 should be required anymore -- Rex
-#patch0 -p1 -b .gcc4
-# autoconf tools check for X is a file in libXt-devel  and Xt lib
-# we dont use or link against libXt so rather than adding an extra
-# BuildRequires I patched configure to look for something thats there
-#patch1 -p1 -b .X11
-
-%patch2 -p1 -b .gcc43
-
+%setup -q -n %{name}-%{version}-beta2
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
   --disable-rpath \
-  --without-mysql \
-  --without-postgresql
+  --with-mysql \
+  --with-postgresql \
+  --with-sqlite
 
 make %{?_smp_mflags}
 
@@ -97,6 +86,17 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting
+  with sqlite backend.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.1-11
+- re-enable mysql/postgresql support
+- re-enable mostly harmless X11 patch 
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Mar 2008 16:52:58 -0000	1.7
+++ sources	19 Aug 2009 15:55:21 -0000	1.8
@@ -1 +1 @@
-7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz
+ad02ed6225cff51d8688cf4ab16bd82f  krecipes-1.0-beta2.tar.gz


--- krecipes-0.9.1-gcc43.patch DELETED ---


--- krecipes-X11.patch DELETED ---


--- krecipes-gcc4.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug 19 16:00:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 16:00:44 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.95-default-applets.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.268, 1.269
Message-ID: <20090819160044.189F711C0439@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22643

Modified Files:
	kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
- adjust default-applets patch to not load plasma-networkmanagement


kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

Index: kdebase-workspace-4.2.95-default-applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.2.95-default-applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.2.95-default-applets.patch	2 Jul 2009 23:11:06 -0000	1.1
+++ kdebase-workspace-4.2.95-default-applets.patch	19 Aug 2009 16:00:43 -0000	1.2
@@ -25,8 +25,8 @@ diff -ur kdebase-workspace-4.2.95/plasma
 +       engines->unloadEngine("powermanagement");
 +    }
 +
-+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
-+       loadDefaultApplet("networkmanagement", panel);
++    //if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
++    //   loadDefaultApplet("networkmanagement", panel);
      }
 -    engines->unloadEngine("powermanagement");
  


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.268
+++ kdebase-workspace.spec	19 Aug 2009 16:00:43 -0000	1.269
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -528,7 +528,11 @@ fi
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
+
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- adjust default-applets patch to not load plasma-networkmanagement
+
 * Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage
 



From spot at fedoraproject.org  Wed Aug 19 16:01:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 16:01:32 +0000 (UTC)
Subject: rpms/ql2500-firmware/F-10 ql2500-firmware.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090819160132.A87D611C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2500-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22875/F-10

Modified Files:
	ql2500-firmware.spec sources 
Log Message:
update to 4.04.09


Index: ql2500-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/F-10/ql2500-firmware.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ql2500-firmware.spec	20 Nov 2008 21:57:23 -0000	1.2
+++ ql2500-firmware.spec	19 Aug 2009 16:01:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		ql2500-firmware
 Summary: 	Firmware for qlogic 2500 devices
-Version:	4.04.05
+Version:	4.04.09
 Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
@@ -38,6 +38,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ql2500_fw.bin_mid
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.04.09-1
+- update to 4.04.09
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.04.05-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.04.05-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.04.05-1
 - update to 4.04.05
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2008 21:57:23 -0000	1.3
+++ sources	19 Aug 2009 16:01:32 -0000	1.4
@@ -1,2 +1,2 @@
-0a2686ab78c8a970c30ca2859ed54238  ql2500_fw.bin_mid
-63da48bbd850711229e6ae3ab6980ff5  ql2500_fw.bin
+d015e2a7e9f171e6158f9dc8b54499a0  ql2500_fw.bin
+cb13374a4c7b832e9a25ef6429a9b66d  ql2500_fw.bin_mid



From spot at fedoraproject.org  Wed Aug 19 16:01:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 16:01:32 +0000 (UTC)
Subject: rpms/ql2500-firmware/F-11 ql2500-firmware.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090819160132.DEE1F11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2500-firmware/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22875/F-11

Modified Files:
	ql2500-firmware.spec sources 
Log Message:
update to 4.04.09


Index: ql2500-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/F-11/ql2500-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ql2500-firmware.spec	25 Feb 2009 17:41:57 -0000	1.3
+++ ql2500-firmware.spec	19 Aug 2009 16:01:32 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		ql2500-firmware
 Summary: 	Firmware for qlogic 2500 devices
-Version:	4.04.05
-Release:	2%{?dist}
+Version:	4.04.09
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
 Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin
@@ -38,6 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ql2500_fw.bin_mid
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.04.09-1
+- update to 4.04.09
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.04.05-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.04.05-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2008 21:57:24 -0000	1.3
+++ sources	19 Aug 2009 16:01:32 -0000	1.4
@@ -1,2 +1,2 @@
-0a2686ab78c8a970c30ca2859ed54238  ql2500_fw.bin_mid
-63da48bbd850711229e6ae3ab6980ff5  ql2500_fw.bin
+d015e2a7e9f171e6158f9dc8b54499a0  ql2500_fw.bin
+cb13374a4c7b832e9a25ef6429a9b66d  ql2500_fw.bin_mid



From spot at fedoraproject.org  Wed Aug 19 16:01:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 16:01:33 +0000 (UTC)
Subject: rpms/ql2500-firmware/devel .cvsignore, 1.3, 1.4 ql2500-firmware.spec,
	1.4, 1.5 ql2500_fw.bin_mid, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090819160133.59EED11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ql2500-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22875/devel

Modified Files:
	.cvsignore ql2500-firmware.spec ql2500_fw.bin_mid sources 
Log Message:
update to 4.04.09


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Nov 2008 21:57:24 -0000	1.3
+++ .cvsignore	19 Aug 2009 16:01:32 -0000	1.4
@@ -1,2 +1,2 @@
-ql2500_fw.bin_mid
 ql2500_fw.bin
+ql2500_fw.bin_mid


Index: ql2500-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/devel/ql2500-firmware.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ql2500-firmware.spec	27 Jul 2009 02:28:10 -0000	1.4
+++ ql2500-firmware.spec	19 Aug 2009 16:01:33 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		ql2500-firmware
 Summary: 	Firmware for qlogic 2500 devices
-Version:	4.04.05
-Release:	3%{?dist}
+Version:	4.04.09
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
 Source0:	ftp://ftp.qlogic.com/outgoing/linux/firmware/ql2500_fw.bin
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ql2500_fw.bin_mid
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.04.09-1
+- update to 4.04.09
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.04.05-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: ql2500_fw.bin_mid
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/devel/ql2500_fw.bin_mid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
Binary files /tmp/cvsBhwPpx and /tmp/cvsd5p8yB differ


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ql2500-firmware/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2008 21:57:24 -0000	1.3
+++ sources	19 Aug 2009 16:01:33 -0000	1.4
@@ -1,2 +1,2 @@
-0a2686ab78c8a970c30ca2859ed54238  ql2500_fw.bin_mid
-63da48bbd850711229e6ae3ab6980ff5  ql2500_fw.bin
+d015e2a7e9f171e6158f9dc8b54499a0  ql2500_fw.bin
+cb13374a4c7b832e9a25ef6429a9b66d  ql2500_fw.bin_mid



From rdieter at fedoraproject.org  Wed Aug 19 16:06:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 16:06:22 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore,1.35,1.36
Message-ID: <20090819160622.8622A11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24247

Modified Files:
	.cvsignore 
Log Message:
drop old crud



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	29 Jul 2009 22:29:36 -0000	1.35
+++ .cvsignore	19 Aug 2009 16:06:22 -0000	1.36
@@ -1,5 +1 @@
-kdebase-workspace-4.2.90.tar.bz2
-kdebase-workspace-4.2.95.tar.bz2
-kdebase-workspace-4.2.96.tar.bz2
-kdebase-workspace-4.2.98.tar.bz2
 kdebase-workspace-4.3.0.tar.bz2



From hadess at fedoraproject.org  Wed Aug 19 16:09:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 19 Aug 2009 16:09:22 +0000 (UTC)
Subject: rpms/rhythmbox/devel 0001-Fix-audio-CD-activation.patch, NONE,
	1.1 rhythmbox.spec, 1.255, 1.256
Message-ID: <20090819160922.0751B11C00E4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25678

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Fix-audio-CD-activation.patch 
Log Message:
* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.3-3
- Fix audio CD activation (#517685)


0001-Fix-audio-CD-activation.patch:
 rb-shell.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0001-Fix-audio-CD-activation.patch ---
>From 78fa390630523c0b2e1eeb5f1e321b9783918836 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 19 Aug 2009 17:06:28 +0100
Subject: [PATCH] Fix audio CD activation

again! This time, make totem-pl-parser ignore the cdda scheme,
because it does know how to parse it.
---
 shell/rb-shell.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index 0c95880..c15eeab 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -2966,6 +2966,7 @@ rb_shell_load_uri (RBShell *shell,
 
 		totem_pl_parser_add_ignored_mimetype (parser, "x-directory/normal");
 		totem_pl_parser_add_ignored_mimetype (parser, "inode/directory");
+		totem_pl_parser_add_ignored_scheme (parser, "cdda");
 		g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
 
 		result = totem_pl_parser_parse (parser, uri, FALSE);
-- 
1.6.2.5



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- rhythmbox.spec	27 Jul 2009 03:02:35 -0000	1.255
+++ rhythmbox.spec	19 Aug 2009 16:09:21 -0000	1.256
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -47,6 +47,8 @@ BuildRequires: perl(XML::Parser) intltoo
 
 ExcludeArch:    s390 s390x
 
+Patch0: 0001-Fix-audio-CD-activation.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
@@ -78,6 +80,7 @@ from, and sending media to UPnP/DLNA net
 
 %prep
 %setup -q
+%patch0 -p1 -b .audiocd
 
 # 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/' '{}' ';'
@@ -215,6 +218,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.3-3
+- Fix audio CD activation (#517685)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Aug 19 16:11:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 16:11:49 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 .cvsignore, 1.26,
	1.27 kdebase-workspace-4.2.95-default-applets.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.187, 1.188
Message-ID: <20090819161149.E40B111C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26564

Modified Files:
	.cvsignore kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
- adjust default-applets patch to not load plasma-networkmanagement



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	5 Aug 2009 00:22:21 -0000	1.26
+++ .cvsignore	19 Aug 2009 16:11:49 -0000	1.27
@@ -1,5 +1 @@
-kdebase-workspace-4.2.90.tar.bz2
-kdebase-workspace-4.2.95.tar.bz2
-kdebase-workspace-4.2.96.tar.bz2
-kdebase-workspace-4.2.98.tar.bz2
 kdebase-workspace-4.3.0.tar.bz2

kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

Index: kdebase-workspace-4.2.95-default-applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace-4.2.95-default-applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.2.95-default-applets.patch	5 Aug 2009 00:22:23 -0000	1.1
+++ kdebase-workspace-4.2.95-default-applets.patch	19 Aug 2009 16:11:49 -0000	1.2
@@ -25,8 +25,8 @@ diff -ur kdebase-workspace-4.2.95/plasma
 +       engines->unloadEngine("powermanagement");
 +    }
 +
-+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
-+       loadDefaultApplet("networkmanagement", panel);
++    //if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
++    //   loadDefaultApplet("networkmanagement", panel);
      }
 -    engines->unloadEngine("powermanagement");
  


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.187
+++ kdebase-workspace.spec	19 Aug 2009 16:11:49 -0000	1.188
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -528,7 +528,11 @@ fi
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
+
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- adjust default-applets patch to not load plasma-networkmanagement
+
 * Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage
 



From markmc at fedoraproject.org  Wed Aug 19 16:15:46 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 19 Aug 2009 16:15:46 +0000 (UTC)
Subject: rpms/libvirt/F-11 libvirt-add-space-to-nodedev-list-tree.patch, NONE,
	1.1 libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch,
	NONE, 1.1 libvirt-allow-pm-reset-on-multi-function-pci-devices.patch, 
	NONE, 1.1 libvirt-do-not-overwrite-error-in-wait-for-monitor.patch,
	NONE, 1.1 libvirt-fix-device-list-update-after-detach.patch,
	NONE, 1.1 libvirt-improve-pci-hostdev-reset-error-message.patch, NONE,
	1.1 libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch,
	NONE, 1.1 libvirt-0.6.2-svirt-sound.patch, 1.2, 1.3 libvirt.spec,
	1.138, 1.139
Message-ID: <20090819161546.BA4F611C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27568

Modified Files:
	libvirt-0.6.2-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-add-space-to-nodedev-list-tree.patch 
	libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch 
	libvirt-allow-pm-reset-on-multi-function-pci-devices.patch 
	libvirt-do-not-overwrite-error-in-wait-for-monitor.patch 
	libvirt-fix-device-list-update-after-detach.patch 
	libvirt-improve-pci-hostdev-reset-error-message.patch 
	libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch 
Log Message:
* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-16.fc11
- Allow PCI bus reset to reset other devices (#499678)
- Fix stupid PCI reset error message (bug #499678)
- Allow PM reset on multi-function PCI devices (bug #515689)
- Re-attach PCI host devices after guest shuts down (bug #499561)
- Fixes list corruption after disk hot-unplug
- Fix minor 'virsh nodedev-list --tree' annoyance


libvirt-add-space-to-nodedev-list-tree.patch:
 virsh.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE libvirt-add-space-to-nodedev-list-tree.patch ---
>From b77d11b221862343d304e11ed878e2f176101f24 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Tue, 28 Apr 2009 10:55:45 +0000
Subject: [PATCH] Cosmetic change to 'virsh nodedev-list --tree' output

Maybe it's just me, but I try to select an item from the tree using
double-click and get annoyed when "+-" gets included in the selection.

* src/virsh.c: add a space between "+-" and the node device name
  in 'virsh nodedev-list --tree'

(cherry picked from commit cb4a6614fae48d05f09b7b15328ea6ef4071ccb3)
(cherry picked from commit 097c818bf00b3777778ffc32fea3a6ed1e741e2b)

Fedora-patch: libvirt-add-space-to-nodedev-list-tree.patch
---
 src/virsh.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/virsh.c b/src/virsh.c
index 26764a7..c92bb8f 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -4460,10 +4460,12 @@ cmdNodeListDevicesPrint(vshControl *ctl,
     if (depth && depth < MAX_DEPTH) {
         indentBuf[indentIdx] = '+';
         indentBuf[indentIdx+1] = '-';
+        indentBuf[indentIdx+2] = ' ';
+        indentBuf[indentIdx+3] = '\0';
     }
 
     /* Print this device */
-    vshPrint(ctl, indentBuf);
+    vshPrint(ctl, "%s", indentBuf);
     vshPrint(ctl, "%s\n", devices[devid]);
 
 
@@ -4487,8 +4489,8 @@ cmdNodeListDevicesPrint(vshControl *ctl,
 
     /* If there is a child device, then print another blank line */
     if (nextlastdev != -1) {
-        vshPrint(ctl, indentBuf);
-        vshPrint(ctl, "  |\n");
+        vshPrint(ctl, "%s", indentBuf);
+        vshPrint(ctl, " |\n");
     }
 
     /* Finally print all children */
@@ -4511,7 +4513,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
     /* If there was no child device, and we're the last in
      * a list of devices, then print another blank line */
     if (nextlastdev == -1 && devid == lastdev) {
-        vshPrint(ctl, indentBuf);
+        vshPrint(ctl, "%s", indentBuf);
         vshPrint(ctl, "\n");
     }
 }
-- 
1.6.2.5


libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch:
 libvirt_private.syms |    7 +
 pci.c                |  211 ++++++++++++++++++++++++++++++++++++---------
 pci.h                |   23 ++++
 qemu_conf.h          |    3 
 qemu_driver.c        |  237 +++++++++++++++++++++++++++++----------------------
 xen_unified.c        |    3 
 6 files changed, 339 insertions(+), 145 deletions(-)

--- NEW FILE libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch ---
>From 6878a049e27f2eaea7bd3d5c266a2d2b39e444f1 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 17 Aug 2009 15:05:23 +0100
Subject: [PATCH] Maintain a list of active PCI hostdevs and use it in pciResetDevice()

https://bugzilla.redhat.com/499678

First we add a pciDeviceList type and add a qemuGetPciHostDeviceList()
function to build a list from a domain definition. Use this in
prepare/re-attach to simplify things and eliminate the multiple
pciGetDevice() calls.

Then, as we start/shutdown guests we can add or delete devices as
appropriate from a list of active devices.

Finally, in pciReset(), we can use this to determine whether its safe to
reset a device as a side effect of resetting another device.

(cherry picked from commit 78675b228b76a83f83d64856bfb63b9e14c103a0)
(cherry picked from commit e8ad33931296c67de0538e78d12e21706a826d37)

Fedora-patch: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
---
 src/libvirt_private.syms |    7 +-
 src/pci.c                |  211 +++++++++++++++++++++++++++++++++--------
 src/pci.h                |   23 +++++-
 src/qemu_conf.h          |    3 +
 src/qemu_driver.c        |  237 +++++++++++++++++++++++++++-------------------
 src/xen_unified.c        |    2 +-
 6 files changed, 339 insertions(+), 144 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 9249a1a..75ddda8 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -240,7 +240,12 @@ pciFreeDevice;
 pciDettachDevice;
 pciReAttachDevice;
 pciResetDevice;
-
+pciDeviceSetManaged;
+pciDeviceGetManaged;
+pciDeviceListNew;
+pciDeviceListFree;
+pciDeviceListAdd;
+pciDeviceListDel;
 
 # qparams.h
 qparam_get_query;
diff --git a/src/pci.c b/src/pci.c
index 1dddb08..1e68261 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -58,6 +58,7 @@ struct _pciDevice {
     unsigned      pci_pm_cap_pos;
     unsigned      has_flr : 1;
     unsigned      has_pm_reset : 1;
+    unsigned      managed : 1;
 };
 
 /* For virReportOOMError()  and virReportSystemError() */
@@ -220,7 +221,7 @@ pciWrite32(pciDevice *dev, unsigned pos, uint32_t val)
     pciWrite(dev, pos, &buf[0], sizeof(buf));
 }
 
-typedef int (*pciIterPredicate)(pciDevice *, pciDevice *);
+typedef int (*pciIterPredicate)(pciDevice *, pciDevice *, void *);
 
 /* Iterate over available PCI devices calling @predicate
  * to compare each one to @dev.
@@ -231,7 +232,8 @@ static int
 pciIterDevices(virConnectPtr conn,
                pciIterPredicate predicate,
                pciDevice *dev,
-               pciDevice **matched)
+               pciDevice **matched,
+               void *data)
 {
     DIR *dir;
     struct dirent *entry;
@@ -249,7 +251,7 @@ pciIterDevices(virConnectPtr conn,
 
     while ((entry = readdir(dir))) {
         unsigned domain, bus, slot, function;
-        pciDevice *try;
+        pciDevice *check;
 
         /* Ignore '.' and '..' */
         if (entry->d_name[0] == '.')
@@ -261,18 +263,18 @@ pciIterDevices(virConnectPtr conn,
             continue;
         }
 
-        try = pciGetDevice(conn, domain, bus, slot, function);
-        if (!try) {
+        check = pciGetDevice(conn, domain, bus, slot, function);
+        if (!check) {
             ret = -1;
             break;
         }
 
-        if (predicate(try, dev)) {
-            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, try->name);
-            *matched = try;
+        if (predicate(dev, check, data)) {
+            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, check->name);
+            *matched = check;
             break;
         }
-        pciFreeDevice(conn, try);
+        pciFreeDevice(conn, check);
     }
     closedir(dir);
     return ret;
@@ -374,63 +376,70 @@ pciDetectPowerManagementReset(pciDevice *dev)
     return 0;
 }
 
-/* Any devices other than the one supplied on the same domain/bus ? */
+/* Any active devices other than the one supplied on the same domain/bus ? */
 static int
-pciSharesBus(pciDevice *a, pciDevice *b)
+pciSharesBusWithActive(pciDevice *dev, pciDevice *check, void *data)
 {
-    return
-        a->domain == b->domain &&
-        a->bus == b->bus &&
-        (a->slot != b->slot ||
-         a->function != b->function);
-}
+    pciDeviceList *activeDevs = data;
 
-static int
-pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
-{
-    pciDevice *matched = NULL;
-    if (pciIterDevices(conn, pciSharesBus, dev, &matched) < 0)
-        return 1;
-    if (!matched)
+    if (dev->domain != check->domain ||
+        dev->bus != check->bus ||
+        (check->slot == check->slot &&
+         check->function == check->function))
+        return 0;
+
+    if (activeDevs && !pciDeviceListFind(activeDevs, check))
         return 0;
-    pciFreeDevice(conn, matched);
+
     return 1;
 }
 
-/* Is @a the parent of @b ? */
+static pciDevice *
+pciBusContainsActiveDevices(virConnectPtr conn,
+                            pciDevice *dev,
+                            pciDeviceList *activeDevs)
+{
+    pciDevice *active = NULL;
+    if (pciIterDevices(conn, pciSharesBusWithActive,
+                       dev, &active, activeDevs) < 0)
+        return NULL;
+    return active;
+}
+
+/* Is @check the parent of @dev ? */
 static int
-pciIsParent(pciDevice *a, pciDevice *b)
+pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED)
 {
     uint16_t device_class;
     uint8_t header_type, secondary, subordinate;
 
-    if (a->domain != b->domain)
+    if (dev->domain != check->domain)
         return 0;
 
     /* Is it a bridge? */
-    device_class = pciRead16(a, PCI_CLASS_DEVICE);
+    device_class = pciRead16(check, PCI_CLASS_DEVICE);
     if (device_class != PCI_CLASS_BRIDGE_PCI)
         return 0;
 
     /* Is it a plane? */
-    header_type = pciRead8(a, PCI_HEADER_TYPE);
+    header_type = pciRead8(check, PCI_HEADER_TYPE);
     if ((header_type & PCI_HEADER_TYPE_MASK) != PCI_HEADER_TYPE_BRIDGE)
         return 0;
 
-    secondary   = pciRead8(a, PCI_SECONDARY_BUS);
-    subordinate = pciRead8(a, PCI_SUBORDINATE_BUS);
+    secondary   = pciRead8(check, PCI_SECONDARY_BUS);
+    subordinate = pciRead8(check, PCI_SUBORDINATE_BUS);
 
-    VIR_DEBUG("%s %s: found parent device %s\n", b->id, b->name, a->name);
+    VIR_DEBUG("%s %s: found parent device %s\n", dev->id, dev->name, check->name);
 
     /* No, it's superman! */
-    return (b->bus >= secondary && b->bus <= subordinate);
+    return (dev->bus >= secondary && dev->bus <= subordinate);
 }
 
 static pciDevice *
 pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
 {
     pciDevice *parent = NULL;
-    pciIterDevices(conn, pciIsParent, dev, &parent);
+    pciIterDevices(conn, pciIsParent, dev, &parent, NULL);
     return parent;
 }
 
@@ -438,9 +447,11 @@ pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
  * devices behind a bus.
  */
 static int
-pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
+pciTrySecondaryBusReset(virConnectPtr conn,
+                        pciDevice *dev,
+                        pciDeviceList *activeDevs)
 {
-    pciDevice *parent;
+    pciDevice *parent, *conflict;
     uint8_t config_space[PCI_CONF_LEN];
     uint16_t ctl;
     int ret = -1;
@@ -450,10 +461,10 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
      * In future, we could allow it so long as those devices
      * are not in use by the host or other guests.
      */
-    if (pciBusContainsOtherDevices(conn, dev)) {
+    if ((conflict = pciBusContainsActiveDevices(conn, dev, activeDevs))) {
         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                       _("Other devices on bus with %s, not doing bus reset"),
-                       dev->name);
+                       _("Active %s devices on bus with %s, not doing bus reset"),
+                       conflict->name, dev->name);
         return -1;
     }
 
@@ -567,10 +578,18 @@ pciInitDevice(virConnectPtr conn, pciDevice *dev)
 }
 
 int
-pciResetDevice(virConnectPtr conn, pciDevice *dev)
+pciResetDevice(virConnectPtr conn,
+               pciDevice *dev,
+               pciDeviceList *activeDevs)
 {
     int ret = -1;
 
+    if (activeDevs && pciDeviceListFind(activeDevs, dev)) {
+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
+                       _("Not resetting active device %s"), dev->name);
+        return -1;
+    }
+
     if (!dev->initted && pciInitDevice(conn, dev) < 0)
         return -1;
 
@@ -589,7 +608,7 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
 
     /* Bus reset is not an option with the root bus */
     if (ret < 0 && dev->bus != 0)
-        ret = pciTrySecondaryBusReset(conn, dev);
+        ret = pciTrySecondaryBusReset(conn, dev, activeDevs);
 
     if (ret < 0) {
         virErrorPtr err = virGetLastError();
@@ -885,8 +904,116 @@ pciGetDevice(virConnectPtr conn,
 void
 pciFreeDevice(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 {
+    if (!dev)
+        return;
     VIR_DEBUG("%s %s: freeing", dev->id, dev->name);
     if (dev->fd >= 0)
         close(dev->fd);
     VIR_FREE(dev);
 }
+
+void pciDeviceSetManaged(pciDevice *dev, unsigned managed)
+{
+    dev->managed = !!managed;
+}
+
+unsigned pciDeviceGetManaged(pciDevice *dev)
+{
+    return dev->managed;
+}
+
+pciDeviceList *
+pciDeviceListNew(virConnectPtr conn)
+{
+    pciDeviceList *list;
+
+    if (VIR_ALLOC(list) < 0) {
+        virReportOOMError(conn);
+        return NULL;
+    }
+
+    return list;
+}
+
+void
+pciDeviceListFree(virConnectPtr conn,
+                  pciDeviceList *list)
+{
+    int i;
+
+    if (!list)
+        return;
+
+    for (i = 0; i < list->count; i++) {
+        pciFreeDevice(conn, list->devs[i]);
+        list->devs[i] = NULL;
+    }
+
+    list->count = 0;
+    VIR_FREE(list->devs);
+    VIR_FREE(list);
+}
+
+int
+pciDeviceListAdd(virConnectPtr conn,
+                 pciDeviceList *list,
+                 pciDevice *dev)
+{
+    if (pciDeviceListFind(list, dev)) {
+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
+                       _("Device %s is already in use"), dev->name);
+        return -1;
+    }
+
+    if (VIR_REALLOC_N(list->devs, list->count+1) < 0) {
+        virReportOOMError(conn);
+        return -1;
+    }
+
+    list->devs[list->count++] = dev;
+
+    return 0;
+}
+
+void
+pciDeviceListDel(virConnectPtr conn ATTRIBUTE_UNUSED,
+                 pciDeviceList *list,
+                 pciDevice *dev)
+{
+    int i;
+
+    for (i = 0; i < list->count; i++) {
+        if (list->devs[i]->domain   != dev->domain ||
+            list->devs[i]->bus      != dev->bus    ||
+            list->devs[i]->slot     != dev->slot   ||
+            list->devs[i]->function != dev->function)
+            continue;
+
+        pciFreeDevice(conn, list->devs[i]);
+
+        if (i != --list->count)
+            memmove(&list->devs[i],
+                    &list->devs[i+1],
+                    sizeof(*list->devs) * (list->count-i));
+
+        if (VIR_REALLOC_N(list->devs, list->count) < 0) {
+            ; /* not fatal */
+        }
+
+        break;
+    }
+}
+
+pciDevice *
+pciDeviceListFind(pciDeviceList *list, pciDevice *dev)
+{
+    int i;
+
+    for (i = 0; i < list->count; i++)
+        if (list->devs[i]->domain   == dev->domain &&
+            list->devs[i]->bus      == dev->bus    &&
+            list->devs[i]->slot     == dev->slot   &&
+            list->devs[i]->function == dev->function)
+            return list->devs[i];
+    return NULL;
+}
diff --git a/src/pci.h b/src/pci.h
index 47882ef..685b0af 100644
--- a/src/pci.h
+++ b/src/pci.h
@@ -27,6 +27,11 @@
 
 typedef struct _pciDevice pciDevice;
 
+typedef struct {
+    unsigned count;
+    pciDevice **devs;
+} pciDeviceList;
+
 pciDevice *pciGetDevice      (virConnectPtr  conn,
                               unsigned       domain,
                               unsigned       bus,
@@ -39,6 +44,22 @@ int        pciDettachDevice  (virConnectPtr  conn,
 int        pciReAttachDevice (virConnectPtr  conn,
                               pciDevice     *dev);
 int        pciResetDevice    (virConnectPtr  conn,
-                              pciDevice     *dev);
+                              pciDevice     *dev,
+                              pciDeviceList *activeDevs);
+void      pciDeviceSetManaged(pciDevice     *dev,
+                              unsigned       managed);
+unsigned  pciDeviceGetManaged(pciDevice     *dev);
+
+pciDeviceList *pciDeviceListNew  (virConnectPtr conn);
+void           pciDeviceListFree (virConnectPtr conn,
+                                  pciDeviceList *list);
+int            pciDeviceListAdd  (virConnectPtr conn,
+                                  pciDeviceList *list,
+                                  pciDevice *dev);
+void           pciDeviceListDel  (virConnectPtr conn,
+                                  pciDeviceList *list,
+                                  pciDevice *dev);
+pciDevice *    pciDeviceListFind (pciDeviceList *list,
+                                  pciDevice *dev);
 
 #endif /* __VIR_PCI_H__ */
diff --git a/src/qemu_conf.h b/src/qemu_conf.h
index 70fe9c8..cde326d 100644
--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
@@ -34,6 +34,7 @@
 #include "domain_event.h"
 #include "threads.h"
 #include "security.h"
+#include "pci.h"
 
 #define qemudDebug(fmt, ...) do {} while(0)
 
@@ -90,6 +91,8 @@ struct qemud_driver {
 
     char *securityDriverName;
     virSecurityDriverPtr securityDriver;
+
+    pciDeviceList *activePciHostdevs;
 };
 
 /* Status needed to reconenct to running VMs */
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 9f87d2a..7dbf4a2 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -126,6 +126,9 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
                                        virDomainObjPtr vm,
                                        unsigned long newmem);
 
+static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
+                                       virDomainDefPtr def);
+
 static struct qemud_driver *qemu_driver = NULL;
 
 
@@ -334,6 +337,10 @@ qemudReconnectVMs(struct qemud_driver *driver)
         if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0)
             goto next_error;
 
+        if (qemuUpdateActivePciHostdevs(driver, vm->def) < 0) {
+            goto next_error;
+        }
+
         if (vm->def->id >= driver->nextvmid)
             driver->nextvmid = vm->def->id + 1;
 
@@ -515,6 +522,9 @@ qemudStartup(void) {
     if ((qemu_driver->caps = qemudCapsInit()) == NULL)
         goto out_of_memory;
 
+    if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL)
+        goto error;
+
     if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
         goto error;
     }
@@ -627,6 +637,7 @@ qemudShutdown(void) {
         return -1;
 
     qemuDriverLock(qemu_driver);
+    pciDeviceListFree(NULL, qemu_driver->activePciHostdevs);
     virCapabilitiesFree(qemu_driver->caps);
 
     virDomainObjListFree(&qemu_driver->domains);
@@ -1209,48 +1220,16 @@ static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) {
     return -1;
 }
 
-static int qemuPrepareHostDevices(virConnectPtr conn,
-                                  virDomainDefPtr def) {
+static pciDeviceList *
+qemuGetPciHostDeviceList(virConnectPtr conn,
+                         virDomainDefPtr def)
+{
+    pciDeviceList *list;
     int i;
 
-    /* We have to use 2 loops here. *All* devices must
-     * be detached before we reset any of them, because
-     * in some cases you have to reset the whole PCI,
-     * which impacts all devices on it
-     */
-
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-
-        if (hostdev->managed) {
-            pciDevice *dev = pciGetDevice(conn,
-                                          hostdev->source.subsys.u.pci.domain,
-                                          hostdev->source.subsys.u.pci.bus,
-                                          hostdev->source.subsys.u.pci.slot,
-                                          hostdev->source.subsys.u.pci.function);
-            if (!dev)
-                goto error;
-
-            if (pciDettachDevice(conn, dev) < 0) {
-                pciFreeDevice(conn, dev);
-                goto error;
-            }
-
-            pciFreeDevice(conn, dev);
-        } /* else {
-             XXX validate that non-managed device isn't in use, eg
-             by checking that device is either un-bound, or bound
-             to pci-stub.ko
-        } */
-    }
+    if (!(list = pciDeviceListNew(conn)))
+        return NULL;
 
-    /* Now that all the PCI hostdevs have be dettached, we can safely
-     * reset them */
     for (i = 0 ; i < def->nhostdevs ; i++) {
         virDomainHostdevDefPtr hostdev = def->hostdevs[i];
         pciDevice *dev;
@@ -1265,95 +1244,151 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
                            hostdev->source.subsys.u.pci.bus,
                            hostdev->source.subsys.u.pci.slot,
                            hostdev->source.subsys.u.pci.function);
-        if (!dev)
-            goto error;
+        if (!dev) {
+            pciDeviceListFree(conn, list);
+            return NULL;
+        }
 
-        if (pciResetDevice(conn, dev) < 0) {
+        if (pciDeviceListAdd(conn, list, dev) < 0) {
             pciFreeDevice(conn, dev);
-            goto error;
+            pciDeviceListFree(conn, list);
+            return NULL;
         }
 
-        pciFreeDevice(conn, dev);
+        pciDeviceSetManaged(dev, hostdev->managed);
     }
 
-    return 0;
+    return list;
+}
 
-error:
-    return -1;
+static int
+qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
+                            virDomainDefPtr def)
+{
+    pciDeviceList *pcidevs;
+    int i, ret;
+
+    if (!def->nhostdevs)
+        return 0;
+
+    if (!(pcidevs = qemuGetPciHostDeviceList(NULL, def)))
+        return -1;
+
+    ret = 0;
+
+    for (i = 0; i < pcidevs->count; i++) {
+        if (pciDeviceListAdd(NULL,
+                             driver->activePciHostdevs,
+                             pcidevs->devs[i]) < 0) {
+            ret = -1;
+            break;
+        }
+        pcidevs->devs[i] = NULL;
+    }
+
+    pciDeviceListFree(NULL, pcidevs);
+    return ret;
 }
 
-static void
-qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
+static int
+qemuPrepareHostDevices(virConnectPtr conn,
+                       struct qemud_driver *driver,
+                       virDomainDefPtr def)
 {
+    pciDeviceList *pcidevs;
     int i;
 
-    /* Again 2 loops; reset all the devices before re-attach */
+    if (!def->nhostdevs)
+        return 0;
 
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-        pciDevice *dev;
+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def)))
+        return -1;
 
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
+    /* We have to use 3 loops here. *All* devices must
+     * be detached before we reset any of them, because
+     * in some cases you have to reset the whole PCI,
+     * which impacts all devices on it. Also, all devices
+     * must be reset before being marked as active.
+     */
 
-        dev = pciGetDevice(conn,
-                           hostdev->source.subsys.u.pci.domain,
-                           hostdev->source.subsys.u.pci.bus,
-                           hostdev->source.subsys.u.pci.slot,
-                           hostdev->source.subsys.u.pci.function);
-        if (!dev) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-                      err ? err->message : "");
-            virResetError(err);
-            continue;
-        }
+    /* XXX validate that non-managed device isn't in use, eg
+     * by checking that device is either un-bound, or bound
+     * to pci-stub.ko
+     */
 
-        if (pciResetDevice(conn, dev) < 0) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-                      err ? err->message : "");
-            virResetError(err);
-        }
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
+            pciDettachDevice(conn, pcidevs->devs[i]) < 0)
+            goto error;
+
+    /* Now that all the PCI hostdevs have be dettached, we can safely
+     * reset them */
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciResetDevice(conn, pcidevs->devs[i],
+                           driver->activePciHostdevs) < 0)
+            goto error;
 
-        pciFreeDevice(conn, dev);
+    /* Now mark all the devices as active */
+    for (i = 0; i < pcidevs->count; i++) {
+        if (pciDeviceListAdd(conn,
+                             driver->activePciHostdevs,
+                             pcidevs->devs[i]) < 0)
+            goto error;
+        pcidevs->devs[i] = NULL;
     }
 
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-        pciDevice *dev;
+    pciDeviceListFree(conn, pcidevs);
+    return 0;
 
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-        if (!hostdev->managed)
-            continue;
+error:
+    pciDeviceListFree(conn, pcidevs);
+    return -1;
+}
 
-        dev = pciGetDevice(conn,
-                           hostdev->source.subsys.u.pci.domain,
-                           hostdev->source.subsys.u.pci.bus,
-                           hostdev->source.subsys.u.pci.slot,
-                           hostdev->source.subsys.u.pci.function);
-        if (!dev) {
+static void
+qemuDomainReAttachHostDevices(virConnectPtr conn,
+                              struct qemud_driver *driver,
+                              virDomainDefPtr def)
+{
+    pciDeviceList *pcidevs;
+    int i;
+
+    if (!def->nhostdevs)
+        return;
+
+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def))) {
+        virErrorPtr err = virGetLastError();
+        VIR_ERROR(_("Failed to allocate pciDeviceList: %s\n"),
+                  err ? err->message : "");
+        virResetError(err);
+        return;
+    }
+
+    /* Again 3 loops; mark all devices as inactive before reset
+     * them and reset all the devices before re-attach */
+
+    for (i = 0; i < pcidevs->count; i++)
+        pciDeviceListDel(conn, driver->activePciHostdevs, pcidevs->devs[i]);
+
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciResetDevice(conn, pcidevs->devs[i],
+                           driver->activePciHostdevs) < 0) {
             virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
                       err ? err->message : "");
             virResetError(err);
-            continue;
         }
 
-        if (pciReAttachDevice(conn, dev) < 0) {
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
+            pciReAttachDevice(conn, pcidevs->devs[i]) < 0) {
             virErrorPtr err = virGetLastError();
             VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
                       err ? err->message : "");
             virResetError(err);
         }
 
-        pciFreeDevice(conn, dev);
-    }
+    pciDeviceListFree(conn, pcidevs);
 }
 
 static int qemudDomainSetSecurityLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm)
@@ -1468,7 +1503,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
                                 &qemuCmdFlags) < 0)
         goto cleanup;
 
-    if (qemuPrepareHostDevices(conn, vm->def) < 0)
+    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
         goto cleanup;
 
     vm->def->id = driver->nextvmid++;
@@ -1634,7 +1669,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
         VIR_FREE(vm->def->seclabel.imagelabel);
     }
 
-    qemuDomainReAttachHostDevices(conn, vm->def);
+    qemuDomainReAttachHostDevices(conn, driver, vm->def);
 
     if (qemudRemoveDomainStatus(conn, driver, vm) < 0) {
         VIR_WARN(_("Failed to remove domain status for %s"),
@@ -5247,6 +5282,7 @@ out:
 static int
 qemudNodeDeviceReset (virNodeDevicePtr dev)
 {
+    struct qemud_driver *driver = dev->conn->privateData;
     pciDevice *pci;
     unsigned domain, bus, slot, function;
     int ret = -1;
@@ -5258,11 +5294,14 @@ qemudNodeDeviceReset (virNodeDevicePtr dev)
     if (!pci)
         return -1;
 
-    if (pciResetDevice(dev->conn, pci) < 0)
+    qemuDriverLock(driver);
+
+    if (pciResetDevice(dev->conn, pci, driver->activePciHostdevs) < 0)
         goto out;
 
     ret = 0;
 out:
+    qemuDriverUnlock(driver);
     pciFreeDevice(dev->conn, pci);
     return ret;
 }
diff --git a/src/xen_unified.c b/src/xen_unified.c
index e708980..ba8c769 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1529,7 +1529,7 @@ xenUnifiedNodeDeviceReset (virNodeDevicePtr dev)
     if (!pci)
         return -1;
 
-    if (pciResetDevice(dev->conn, pci) < 0)
+    if (pciResetDevice(dev->conn, pci, NULL) < 0)
         goto out;
 
     ret = 0;
-- 
1.6.2.5


libvirt-allow-pm-reset-on-multi-function-pci-devices.patch:
 pci.c |   49 +++++++++----------------------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

--- NEW FILE libvirt-allow-pm-reset-on-multi-function-pci-devices.patch ---
>From d79f35fbd4eaf610972621b042993d00f3247d5c Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:11 +0100
Subject: [PATCH] Allow PM reset on multi-function PCI devices

https://bugzilla.redhat.com/515689

It turns out that a PCI Power Management reset only affects individual
functions, and not the whole device.

The PCI Power Management spec talks about resetting the 'device' rather
than the 'function', but Intel's Dexuan Cui informs me that it is
actually a per-function reset.

Also, Yu Zhao has added pci_pm_reset() to the kernel, and it doesn't
reject multi-function devices, so it must be true! :-)

(A side issue is that we could defer the PM reset to the kernel if we
could detect that the kernel has PM reset support, but barring version
number checks we don't have a way to detect that support)

* src/pci.c: remove the pciDeviceContainsOtherFunctions() check from
  pciTryPowerManagementReset() and prefer PM reset over bus reset
  where both are available

Cc: Cui, Dexuan <dexuan.cui at intel.com>
Cc: Yu Zhao <yu.zhao at intel.com>

(cherry picked from commit 64a6682b93a2a8aa38067a43979c9eaf993d2b41)

Fedora-patch: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
---
 src/pci.c |   48 +++++++++---------------------------------------
 1 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/pci.c b/src/pci.c
index 68a380d..f78ab9f 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -397,29 +397,6 @@ pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
     return 1;
 }
 
-/* Any other functions on this device ? */
-static int
-pciSharesDevice(pciDevice *a, pciDevice *b)
-{
-    return
-        a->domain == b->domain &&
-        a->bus == b->bus &&
-        a->slot == b->slot &&
-        a->function != b->function;
-}
-
-static int
-pciDeviceContainsOtherFunctions(virConnectPtr conn, pciDevice *dev)
-{
-    pciDevice *matched = NULL;
-    if (pciIterDevices(conn, pciSharesDevice, dev, &matched) < 0)
-        return 1;
-    if (!matched)
-        return 0;
-    pciFreeDevice(conn, matched);
-    return 1;
-}
-
 /* Is @a the parent of @b ? */
 static int
 pciIsParent(pciDevice *a, pciDevice *b)
@@ -524,7 +501,7 @@ out:
  * above we require the device supports a full internal reset.
  */
 static int
-pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
+pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 {
     uint8_t config_space[PCI_CONF_LEN];
     uint32_t ctl;
@@ -532,16 +509,6 @@ pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
     if (!dev->pci_pm_cap_pos)
         return -1;
 
-    /* For now, we just refuse to do a power management reset
-     * if there are other functions on this device.
-     * In future, we could allow it so long as those functions
-     * are not in use by the host or other guests.
-     */
-    if (pciDeviceContainsOtherFunctions(conn, dev)) {
-        VIR_WARN("%s contains other functions, not resetting", dev->name);
-        return -1;
-    }
-
     /* Save and restore the device's config space. */
     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
         VIR_WARN("Failed to save PCI config space for %s", dev->name);
@@ -599,14 +566,17 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
     if (dev->has_flr)
         return 0;
 
+    /* If the device supports PCI power management reset,
+     * that's the next best thing because it only resets
+     * the function, not the whole device.
+     */
+    if (dev->has_pm_reset)
+        ret = pciTryPowerManagementReset(conn, dev);
+
     /* Bus reset is not an option with the root bus */
-    if (dev->bus != 0)
+    if (ret < 0 && dev->bus != 0)
         ret = pciTrySecondaryBusReset(conn, dev);
 
-    /* Next best option is a PCI power management reset */
-    if (ret < 0 && dev->has_pm_reset)
-        ret = pciTryPowerManagementReset(conn, dev);
-
     if (ret < 0)
         pciReportError(conn, VIR_ERR_NO_SUPPORT,
                        _("No PCI reset capability available for %s"),
-- 
1.6.2.5


libvirt-do-not-overwrite-error-in-wait-for-monitor.patch:
 qemu_driver.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-do-not-overwrite-error-in-wait-for-monitor.patch ---
>From 1319852c443c432d44a2e73508f3be742027f780 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 19 Aug 2009 11:28:02 +0100
Subject: [PATCH] Don't overwrite error in qemudWaitForMonitor()

May help diagnose https://bugzilla.redhat.com/515054

Fedora-patch: libvirt-do-not-overwrite-error-in-wait-for-monitor.patch
---
 src/qemu_driver.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index dfd19c5..74e106a 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -985,8 +985,9 @@ static int qemudWaitForMonitor(virConnectPtr conn,
         return 0;
 
     /* Unexpected end of file - inform user of QEMU log data */
-    qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                     _("unable to start guest: %s"), buf);
+    if (!virGetLastError())
+        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                         _("unable to start guest: %s"), buf);
     return -1;
 }
 
-- 
1.6.2.5


libvirt-fix-device-list-update-after-detach.patch:
 qemu_driver.c |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

--- NEW FILE libvirt-fix-device-list-update-after-detach.patch ---
>From 2754da03d65f216271c81ece791b96a19272c812 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Sat, 15 Aug 2009 19:38:15 +0100
Subject: [PATCH] Fix list updating after disk hot-unplug

The current code makes a poor effort at updating the device arrays after
hot-unplug. Fix that and combine the two code paths into one.

* src/qemu_driver.c: fix list updating in qemudDomainDetachPciDiskDevice()

(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)

Fedora-patch: libvirt-fix-device-list-update-after-detach.patch
---
 src/qemu_driver.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index dfd19c5..ce04beb 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4123,18 +4123,17 @@ try_command:
         goto cleanup;
     }
 
-    if (vm->def->ndisks > 1) {
-        vm->def->disks[i] = vm->def->disks[--vm->def->ndisks];
-        if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
-            virReportOOMError(conn);
-            goto cleanup;
-        }
-        qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
-              virDomainDiskQSort);
-    } else {
-        VIR_FREE(vm->def->disks[0]);
-        vm->def->ndisks = 0;
+    if (i != --vm->def->ndisks)
+        memmove(&vm->def->disks[i],
+                &vm->def->disks[i+1],
+                sizeof(*vm->def->disks) * (vm->def->ndisks-i));
+    if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
+        virReportOOMError(conn);
+        goto cleanup;
     }
+    qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
+          virDomainDiskQSort);
+
     ret = 0;
 
 cleanup:
-- 
1.6.2.5


libvirt-improve-pci-hostdev-reset-error-message.patch:
 pci.c         |   44 +++++++++++++++++++++++++++++++-------------
 qemu_driver.c |    5 ++---
 2 files changed, 33 insertions(+), 16 deletions(-)

--- NEW FILE libvirt-improve-pci-hostdev-reset-error-message.patch ---
>From 9f80bab3829b97ac2802c15b9f3e4a6bbbb24627 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:11 +0100
Subject: [PATCH] Improve PCI host device reset error message

https://bugzilla.redhat.com/499678

Currently, if we are unable to reset a PCI device we return a fairly
generic 'No PCI reset capability available' error message.

Fix that by returning an error from the individual reset messages and
using that error to construct the higher level error mesage.

* src/pci.c: set errors in pciTryPowerManagementReset() and
  pciTrySecondaryBusReset() on failure; use those error messages
  in pciResetDevice(), or explain that no reset support is available

(cherry picked from commit ebea34185612c3b96d7d3bbd8b7c2ce6c9f4fe6f)

Fedora-patch: libvirt-improve-pci-hostdev-reset-error-message.patch
---
 src/pci.c         |   44 +++++++++++++++++++++++++++++++-------------
 src/qemu_driver.c |    4 ++--
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/pci.c b/src/pci.c
index f78ab9f..1dddb08 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -451,15 +451,18 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
      * are not in use by the host or other guests.
      */
     if (pciBusContainsOtherDevices(conn, dev)) {
-        VIR_WARN("Other devices on bus with %s, not doing bus reset",
-                 dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Other devices on bus with %s, not doing bus reset"),
+                       dev->name);
         return -1;
     }
 
     /* Find the parent bus */
     parent = pciGetParentDevice(conn, dev);
     if (!parent) {
-        VIR_WARN("Failed to find parent device for %s", dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to find parent device for %s"),
+                       dev->name);
         return -1;
     }
 
@@ -470,7 +473,9 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
      * are multiple devices/functions
      */
     if (pciRead(dev, 0, config_space, PCI_CONF_LEN) < 0) {
-        VIR_WARN("Failed to save PCI config space for %s", dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to save PCI config space for %s"),
+                       dev->name);
         goto out;
     }
 
@@ -487,9 +492,12 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
 
     usleep(200 * 1000); /* sleep 200ms */
 
-    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0)
-        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
-
+    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0) {
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to restore PCI config space for %s"),
+                       dev->name);
+        goto out;
+    }
     ret = 0;
 out:
     pciFreeDevice(conn, parent);
@@ -511,7 +519,9 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 
     /* Save and restore the device's config space. */
     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-        VIR_WARN("Failed to save PCI config space for %s", dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to save PCI config space for %s"),
+                       dev->name);
         return -1;
     }
 
@@ -528,8 +538,12 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 
     usleep(10 * 1000); /* sleep 10ms */
 
-    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0)
-        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
+    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to restore PCI config space for %s"),
+                       dev->name);
+        return -1;
+    }
 
     return 0;
 }
@@ -577,10 +591,14 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
     if (ret < 0 && dev->bus != 0)
         ret = pciTrySecondaryBusReset(conn, dev);
 
-    if (ret < 0)
+    if (ret < 0) {
+        virErrorPtr err = virGetLastError();
         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                       _("No PCI reset capability available for %s"),
-                       dev->name);
+                       _("Unable to reset PCI device %s: %s"),
+                       dev->name,
+                       err ? err->message : _("no FLR, PM reset or bus reset available"));
+    }
+
     return ret;
 }
 
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index ddd3693..9f87d2a 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1345,9 +1345,9 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
             continue;
         }
 
-        if (pciDettachDevice(conn, dev) < 0) {
+        if (pciReAttachDevice(conn, dev) < 0) {
             virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
+            VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
                       err ? err->message : "");
             virResetError(err);
         }
-- 
1.6.2.5


libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch:
 qemu_driver.c |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch ---
>From 1e44604c0d4c2d4c1347c2a1027f1ea02a6499f9 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:11 +0100
Subject: [PATCH] Reset and re-attach PCI host devices on guest shutdown

https://bugzilla.redhat.com/499561

When the guest shuts down, we should attempt to restore all PCI host
devices to a sane state.

In the case of managed hostdevs, we should reset and re-attach the
devices. In the case of unmanaged hostdevs, we should just reset them.

Note, KVM will already reset assigned devices when the guest shuts
down using whatever means it can, so we are only doing it to cover the
cases the kernel can't handle.

* src/qemu_driver.c: add qemuDomainReAttachHostDevices() and call
  it from qemudShutdownVMDaemon()

(cherry picked from commit 4035152a8767e72fd4e26a91cb4d5afa75b72e61)

Fedora-patch: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
---
 src/qemu_driver.c |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index ce04beb..ddd3693 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1282,6 +1282,80 @@ error:
     return -1;
 }
 
+static void
+qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
+{
+    int i;
+
+    /* Again 2 loops; reset all the devices before re-attach */
+
+    for (i = 0 ; i < def->nhostdevs ; i++) {
+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
+        pciDevice *dev;
+
+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+            continue;
+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+            continue;
+
+        dev = pciGetDevice(conn,
+                           hostdev->source.subsys.u.pci.domain,
+                           hostdev->source.subsys.u.pci.bus,
+                           hostdev->source.subsys.u.pci.slot,
+                           hostdev->source.subsys.u.pci.function);
+        if (!dev) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+            continue;
+        }
+
+        if (pciResetDevice(conn, dev) < 0) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+        }
+
+        pciFreeDevice(conn, dev);
+    }
+
+    for (i = 0 ; i < def->nhostdevs ; i++) {
+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
+        pciDevice *dev;
+
+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+            continue;
+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+            continue;
+        if (!hostdev->managed)
+            continue;
+
+        dev = pciGetDevice(conn,
+                           hostdev->source.subsys.u.pci.domain,
+                           hostdev->source.subsys.u.pci.bus,
+                           hostdev->source.subsys.u.pci.slot,
+                           hostdev->source.subsys.u.pci.function);
+        if (!dev) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+            continue;
+        }
+
+        if (pciDettachDevice(conn, dev) < 0) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+        }
+
+        pciFreeDevice(conn, dev);
+    }
+}
+
 static int qemudDomainSetSecurityLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm)
 {
     if (vm->def->seclabel.label != NULL)
@@ -1560,6 +1634,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
         VIR_FREE(vm->def->seclabel.imagelabel);
     }
 
+    qemuDomainReAttachHostDevices(conn, vm->def);
+
     if (qemudRemoveDomainStatus(conn, driver, vm) < 0) {
         VIR_WARN(_("Failed to remove domain status for %s"),
                  vm->def->name);
-- 
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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvirt-0.6.2-svirt-sound.patch	17 Aug 2009 08:08:57 -0000	1.2
+++ libvirt-0.6.2-svirt-sound.patch	19 Aug 2009 16:15:46 -0000	1.3
@@ -1,4 +1,4 @@
-From 02f85e2c6b3b53f89d8b4b3e5cb70b1700719516 Mon Sep 17 00:00:00 2001
+From e76837af35d692cb947db3a47058bcfbbf77b46a 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.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- libvirt.spec	17 Aug 2009 08:08:57 -0000	1.138
+++ libvirt.spec	19 Aug 2009 16:15:46 -0000	1.139
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 15%{?dist}%{?extra_release}
+Release: 16%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -118,6 +118,18 @@ Patch21: libvirt-0.6.2-qemu-name-uniquen
 Patch22: libvirt-0.6.2-buf-locale-escape.patch
 # rhbz #506590
 Patch23: libvirt-0.6.2-numa-ignore-fail.patch
+# Minor 'virsh nodedev-list --tree' annoyance, fix from upstream
+Patch24: libvirt-add-space-to-nodedev-list-tree.patch
+# Fixes list corruption after disk hot-unplug
+Patch25: libvirt-fix-device-list-update-after-detach.patch
+# Re-attach PCI host devices after guest shuts down (bug #499561)
+Patch26: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
+# Allow PM reset on multi-function PCI devices (bug #515689)
+Patch27: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
+# Fix stupid PCI reset error message (#499678)
+Patch28: libvirt-improve-pci-hostdev-reset-error-message.patch
+# Allow PCI bus reset to reset other devices (#499678)
+Patch29: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -293,6 +305,12 @@ of recent versions of Linux (and other O
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
 
 %patch200 -p1
 
@@ -616,6 +634,14 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-16.fc11
+- Allow PCI bus reset to reset other devices (#499678)
+- Fix stupid PCI reset error message (bug #499678)
+- Allow PM reset on multi-function PCI devices (bug #515689)
+- Re-attach PCI host devices after guest shuts down (bug #499561)
+- Fixes list corruption after disk hot-unplug
+- Fix minor 'virsh nodedev-list --tree' annoyance
+
 * Thu Aug 13 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.2-15.fc11
 - Log and ignore NUMA topology problems (rhbz #506590)
 



From pbrobinson at fedoraproject.org  Wed Aug 19 16:17:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 19 Aug 2009 16:17:54 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.7, 1.8 mojito.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090819161755.1232411C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28129

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Aug 2009 16:32:54 -0000	1.7
+++ .cvsignore	19 Aug 2009 16:17:54 -0000	1.8
@@ -1 +1 @@
-mojito-0.19.2.tar.bz2
+mojito-0.20.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mojito.spec	10 Aug 2009 19:30:30 -0000	1.11
+++ mojito.spec	19 Aug 2009 16:17:54 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           mojito
-Version:        0.19.2
-Release:        2%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -16,7 +16,6 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: rest-devel
-BuildRequires: twitter-glib-devel
 BuildRequires: intltool
 BuildRequires: gtk-doc
 
@@ -101,6 +100,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-1
+- Update to 0.20
+
 * Wed Aug  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.2-2
 - A few minor spec file cleanups
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Aug 2009 16:32:54 -0000	1.7
+++ sources	19 Aug 2009 16:17:54 -0000	1.8
@@ -1 +1 @@
-82060180703522e2477b5066ffae8d08  mojito-0.19.2.tar.bz2
+b5d435e3e665fac50f5e78e1b56770c3  mojito-0.20.tar.bz2



From jkratoch at fedoraproject.org  Wed Aug 19 16:19:16 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Wed, 19 Aug 2009 16:19:16 +0000 (UTC)
Subject: rpms/gdb/devel gdb-6.8.50.20090818-upstream.patch, NONE,
	1.1 gdb-archer.patch, 1.25, 1.26 gdb.spec, 1.377, 1.378
Message-ID: <20090819161916.2B8EA11C00E4@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28413

Modified Files:
	gdb-archer.patch gdb.spec 
Added Files:
	gdb-6.8.50.20090818-upstream.patch 
Log Message:
* Wed Aug 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-4
- Fixup "bad type" internal error, import from FSF GDB.
- archer-jankratochvil-fedora12 commit: 2ba2bc451eb832182ef84c3934115de7a329da7c


gdb-6.8.50.20090818-upstream.patch:
 testsuite/gdb.base/gdbvars.c   |   16 +++++++
 testsuite/gdb.base/gdbvars.exp |   19 +++++++++
 value.c                        |   85 ++++++++++++++++++++++-------------------
 3 files changed, 81 insertions(+), 39 deletions(-)

--- NEW FILE gdb-6.8.50.20090818-upstream.patch ---
http://sourceware.org/ml/gdb-patches/2009-08/msg00310.html
http://sourceware.org/ml/gdb-cvs/2009-08/msg00092.html

2009-08-19  Ulrich Weigand  <uweigand at de.ibm.com>

	* value.c (enum internalvar_kind): Replace INTERNALVAR_SCALAR by
	INTERNALVAR_INTEGER and INTERNALVAR_POINTER.
	(union internalvar_data): Replace "scalar" member by "integer"
	and "pointer".
	(value_of_internalvar): Handle INTERNALVAR_INTEGER and
	INTERNALVAR_POINTER instead of INTERNALVAR_SCALAR.
	(get_internalvar_integer): Likewise.
	(set_internalvar): Likewise.
	(set_internalvar_integer): Likewise.
	(preserve_one_internalvar): Likewise.
	(value_from_pointer): Handle typedef'd pointer types.

2009-08-19  Doug Evans  <dje at google.com>

	* gdb.base/gdbvars.c: New file.
	* gdb.base/gdbvars.exp: Test convenience vars with program variables.

--- src/gdb/value.c	2009/08/13 18:39:20	1.92
+++ src/gdb/value.c	2009/08/19 13:00:28	1.93
@@ -920,8 +920,11 @@
       /* The internal variable holds a GDB internal convenience function.  */
       INTERNALVAR_FUNCTION,
 
-      /* The variable holds a simple scalar value.  */
-      INTERNALVAR_SCALAR,
+      /* The variable holds an integer value.  */
+      INTERNALVAR_INTEGER,
+
+      /* The variable holds a pointer value.  */
+      INTERNALVAR_POINTER,
 
       /* The variable holds a GDB-provided string.  */
       INTERNALVAR_STRING,
@@ -944,19 +947,22 @@
 	  int canonical;
 	} fn;
 
-      /* A scalar value used with INTERNALVAR_SCALAR.  */
+      /* An integer value used with INTERNALVAR_INTEGER.  */
       struct
         {
 	  /* If type is non-NULL, it will be used as the type to generate
 	     a value for this internal variable.  If type is NULL, a default
 	     integer type for the architecture is used.  */
 	  struct type *type;
-	  union
-	    {
-	      LONGEST l;    /* Used with TYPE_CODE_INT and NULL types.  */
-	      CORE_ADDR a;  /* Used with TYPE_CODE_PTR types.  */
-	    } val;
-        } scalar;
+	  LONGEST val;
+        } integer;
+
+      /* A pointer value used with INTERNALVAR_POINTER.  */
+      struct
+        {
+	  struct type *type;
+	  CORE_ADDR val;
+        } pointer;
 
       /* A string value used with INTERNALVAR_STRING.  */
       char *string;
@@ -1082,16 +1088,16 @@
       val = allocate_value (builtin_type (gdbarch)->internal_fn);
       break;
 
-    case INTERNALVAR_SCALAR:
-      if (!var->u.scalar.type)
+    case INTERNALVAR_INTEGER:
+      if (!var->u.integer.type)
 	val = value_from_longest (builtin_type (gdbarch)->builtin_int,
-				  var->u.scalar.val.l);
-      else if (TYPE_CODE (var->u.scalar.type) == TYPE_CODE_INT)
-	val = value_from_longest (var->u.scalar.type, var->u.scalar.val.l);
-      else if (TYPE_CODE (var->u.scalar.type) == TYPE_CODE_PTR)
-	val = value_from_pointer (var->u.scalar.type, var->u.scalar.val.a);
+				  var->u.integer.val);
       else
-        internal_error (__FILE__, __LINE__, "bad type");
+	val = value_from_longest (var->u.integer.type, var->u.integer.val);
+      break;
+
+    case INTERNALVAR_POINTER:
+      val = value_from_pointer (var->u.pointer.type, var->u.pointer.val);
       break;
 
     case INTERNALVAR_STRING:
@@ -1145,14 +1151,9 @@
 {
   switch (var->kind)
     {
-    case INTERNALVAR_SCALAR:
-      if (var->u.scalar.type == NULL
-	  || TYPE_CODE (var->u.scalar.type) == TYPE_CODE_INT)
-	{
-	  *result = var->u.scalar.val.l;
-	  return 1;
-	}
-      /* Fall through.  */
+    case INTERNALVAR_INTEGER:
+      *result = var->u.integer.val;
+      return 1;
 
     default:
       return 0;
@@ -1224,15 +1225,15 @@
       break;
 
     case TYPE_CODE_INT:
-      new_kind = INTERNALVAR_SCALAR;
-      new_data.scalar.type = value_type (val);
-      new_data.scalar.val.l = value_as_long (val);
+      new_kind = INTERNALVAR_INTEGER;
+      new_data.integer.type = value_type (val);
+      new_data.integer.val = value_as_long (val);
       break;
 
     case TYPE_CODE_PTR:
-      new_kind = INTERNALVAR_SCALAR;
-      new_data.scalar.type = value_type (val);
-      new_data.scalar.val.a = value_as_address (val);
+      new_kind = INTERNALVAR_POINTER;
+      new_data.pointer.type = value_type (val);
+      new_data.pointer.val = value_as_address (val);
       break;
 
     default:
@@ -1269,9 +1270,9 @@
   /* Clean up old contents.  */
   clear_internalvar (var);
 
-  var->kind = INTERNALVAR_SCALAR;
-  var->u.scalar.type = NULL;
-  var->u.scalar.val.l = l;
+  var->kind = INTERNALVAR_INTEGER;
+  var->u.integer.type = NULL;
+  var->u.integer.val = l;
 }
 
 void
@@ -1426,10 +1427,16 @@
 {
   switch (var->kind)
     {
-    case INTERNALVAR_SCALAR:
-      if (var->u.scalar.type && TYPE_OBJFILE (var->u.scalar.type) == objfile)
-	var->u.scalar.type
-	  = copy_type_recursive (objfile, var->u.scalar.type, copied_types);
+    case INTERNALVAR_INTEGER:
+      if (var->u.integer.type && TYPE_OBJFILE (var->u.integer.type) == objfile)
+	var->u.integer.type
+	  = copy_type_recursive (objfile, var->u.integer.type, copied_types);
+      break;
+
+    case INTERNALVAR_POINTER:
+      if (TYPE_OBJFILE (var->u.pointer.type) == objfile)
+	var->u.pointer.type
+	  = copy_type_recursive (objfile, var->u.pointer.type, copied_types);
       break;
 
     case INTERNALVAR_VALUE:
@@ -2164,7 +2171,7 @@
 value_from_pointer (struct type *type, CORE_ADDR addr)
 {
   struct value *val = allocate_value (type);
-  store_typed_address (value_contents_raw (val), type, addr);
+  store_typed_address (value_contents_raw (val), check_typedef (type), addr);
   return val;
 }
 
--- src/gdb/testsuite/gdb.base/gdbvars.c
+++ src/gdb/testsuite/gdb.base/gdbvars.c	2009-08-19 15:10:47.270783000 +0000
@@ -0,0 +1,16 @@
+/* Simple program to help exercise gdb's convenience variables.  */
+
+typedef void *ptr;
+
+ptr p = &p;
+
+int
+main ()
+{
+#ifdef usestubs
+    set_debug_traps ();
+    breakpoint ();
+#endif
+
+  return 0;
+}
--- src/gdb/testsuite/gdb.base/gdbvars.exp	2009/01/03 05:58:03	1.6
+++ src/gdb/testsuite/gdb.base/gdbvars.exp	2009/08/19 13:00:29	1.7
@@ -22,6 +22,15 @@
 set prms_id 0
 set bug_id 0
 
+set testfile "gdbvars"
+set srcfile  ${testfile}.c
+set binfile  ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested gdbvars.exp
+    return -1
+}
+
 proc test_convenience_variables {} {
     global gdb_prompt
 
@@ -101,13 +110,23 @@
 	"Use value-history element in arithmetic expression"
 }
 
+proc test_with_program {} {
+    global hex
+    gdb_test "set \$prog_var = p" "" \
+	"Set a new convenience variable to a program variable"
+    gdb_test "print /x \$prog_var" " = $hex" \
+	"Print contents of new convenience variable of program variable"
+}
+
 # Start with a fresh gdb.
 
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
 
 send_gdb "set print sevenbit-strings\n" ; gdb_expect -re ".*$gdb_prompt $"
 
 test_value_history
 test_convenience_variables
+test_with_program

gdb-archer.patch:
 Makefile.in                                              |   95 
 NEWS                                                     |    7 
 ada-lang.c                                               |   43 
 amd64-linux-nat.c                                        |   45 
 block.c                                                  |   24 
 block.h                                                  |   12 
 breakpoint.c                                             |  137 -
 breakpoint.h                                             |    3 
 c-exp.y                                                  |  252 +-
 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                                                |   79 
 configure.ac                                             |   47 
 cp-name-parser.y                                         |    5 
 cp-namespace.c                                           |  245 +
 cp-support.c                                             |   88 
 cp-support.h                                             |   49 
 dbxread.c                                                |    1 
 doc/gdb.texinfo                                          |  504 ++++
 doc/gdbint.texinfo                                       |   62 
 doc/observer.texi                                        |    5 
 dwarf2-frame.c                                           |   28 
 dwarf2-frame.h                                           |    4 
 dwarf2expr.c                                             |   86 
 dwarf2expr.h                                             |   68 
 dwarf2loc.c                                              |  357 ++
 dwarf2loc.h                                              |    6 
 dwarf2read.c                                             | 1842 ++++++++++-----
 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                                                  |   19 
 frame.h                                                  |    6 
 gdbinit.in                                               |   10 
 gdbserver/linux-i386-low.c                               |  210 +
 gdbserver/linux-x86-64-low.c                             |  184 +
 gdbthread.h                                              |    3 
 gdbtypes.c                                               |  596 ++++
 gdbtypes.h                                               |  146 +
 gnu-v3-abi.c                                             |   18 
 gnulib/Makefile.in                                       |    4 
 i386-linux-nat.c                                         |   47 
 i386-nat.c                                               |   49 
 i386-nat.h                                               |   17 
 infrun.c                                                 |    8 
 jv-lang.c                                                |    1 
 language.h                                               |    1 
 linespec.c                                               |   62 
 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                                          |  165 -
 mi/mi-cmds.c                                             |    2 
 mi/mi-cmds.h                                             |    2 
 mi/mi-main.c                                             |    5 
 mipsread.c                                               |    1 
 objfiles.c                                               |   21 
 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/python-block.c                                    |  265 ++
 python/python-breakpoint.c                               |  665 +++++
 python/python-cmd.c                                      |   17 
 python/python-frame.c                                    |  116 
 python/python-hooks.c                                    |   50 
 python/python-inferior.c                                 |  926 +++++++
 python/python-infthread.c                                |  285 ++
 python/python-internal.h                                 |   69 
 python/python-membuf.c                                   |  268 ++
 python/python-param.c                                    |  606 ++++
 python/python-prettyprint.c                              |   21 
 python/python-symbol.c                                   |  336 ++
 python/python-symtab.c                                   |  322 ++
 python/python-type.c                                     |  170 +
 python/python-utils.c                                    |   46 
 python/python-value.c                                    |   55 
 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                                                |   42 
 symfile.h                                                |   12 
 symmisc.c                                                |    4 
 symtab.c                                                 |  321 +-
 symtab.h                                                 |   20 
 target.c                                                 |   20 
 target.h                                                 |   32 
 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/cp-relocate.exp                         |    6 
 testsuite/gdb.cp/cplusfuncs.cc                           |    6 
 testsuite/gdb.cp/cplusfuncs.exp                          |  195 +
 testsuite/gdb.cp/expand-sals.exp                         |    2 
 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                  |   30 
 testsuite/gdb.cp/namespace-recursive.exp                 |   66 
 testsuite/gdb.cp/namespace-using.cc                      |  128 -
 testsuite/gdb.cp/namespace-using.exp                     |  130 +
 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/callframecfa.S                      |  309 ++
 testsuite/gdb.dwarf2/callframecfa.exp                    |   55 
 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.mi/gdb701.exp                              |    2 
 testsuite/gdb.mi/mi-var-display.exp                      |    4 
 testsuite/gdb.mi/mi2-var-display.exp                     |    4 
 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.python/Makefile.in                         |    2 
 testsuite/gdb.python/python-cmd.exp                      |   27 
 testsuite/gdb.python/python-frame.exp                    |   48 
 testsuite/gdb.python/python-function.exp                 |   27 
 testsuite/gdb.python/python-inferior.c                   |   49 
 testsuite/gdb.python/python-inferior.exp                 |  201 +
 testsuite/gdb.python/python-infthread.c                  |   14 
 testsuite/gdb.python/python-infthread.exp                |   58 
 testsuite/gdb.python/python-mi.exp                       |   96 
 testsuite/gdb.python/python-prettyprint.c                |   13 
 testsuite/gdb.python/python-prettyprint.exp              |   11 
 testsuite/gdb.python/python-prettyprint.py               |   12 
 testsuite/gdb.python/python-template.exp                 |   25 
 testsuite/gdb.python/python-value.exp                    |   68 
 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           |  101 
 testsuite/lib/cp-support.exp                             |    3 
 testsuite/lib/gdb.exp                                    |    1 
 testsuite/lib/mi-support.exp                             |   86 
 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                                                 |  254 +-
 valprint.c                                               |    3 
 value.c                                                  |  150 +
 value.h                                                  |    8 
 varobj.c                                                 |  610 +++-
 varobj.h                                                 |   32 
 xcoffread.c                                              |    1 
 243 files changed, 18345 insertions(+), 2643 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-archer.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gdb-archer.patch	18 Aug 2009 19:37:35 -0000	1.25
+++ gdb-archer.patch	19 Aug 2009 16:19:15 -0000	1.26
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 850e3cb38a25cb7fdfa4cef667626ffbde51bcac
+commit 2ba2bc451eb832182ef84c3934115de7a329da7c
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -27214,10 +27214,10 @@ index bf9915c..233206c 100644
  extern long ui_file_read (struct ui_file *file, char *buf, long length_buf);
  
 diff --git a/gdb/utils.c b/gdb/utils.c
-index 5fa2f26..f985fa9 100644
+index 16ad084..3021a43 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
-@@ -2604,7 +2604,10 @@ fprintf_symbol_filtered (struct ui_file *stream, char *name,
+@@ -2610,7 +2610,10 @@ fprintf_symbol_filtered (struct ui_file *stream, char *name,
     As an extra hack, string1=="FOO(ARGS)" matches string2=="FOO".
     This "feature" is useful when searching for matching C++ function names
     (such as if the user types 'break FOO', where FOO is a mangled C++
@@ -27229,7 +27229,7 @@ index 5fa2f26..f985fa9 100644
  
  int
  strcmp_iw (const char *string1, const char *string2)
-@@ -2629,7 +2632,7 @@ strcmp_iw (const char *string1, const char *string2)
+@@ -2635,7 +2638,7 @@ strcmp_iw (const char *string1, const char *string2)
  	  string2++;
  	}
      }
@@ -27732,7 +27732,7 @@ index cbb5d94..cf35bf0 100644
  	  ++reps;
  	  ++rep1;
 diff --git a/gdb/value.c b/gdb/value.c
-index 97f236c..8af6ae1 100644
+index 48fedfd..5c207e3 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
 @@ -37,8 +37,10 @@
@@ -27857,7 +27857,7 @@ index 97f236c..8af6ae1 100644
  

  /* Internal variables.  These are variables within the debugger
     that hold values assigned by debugger commands.
-@@ -1363,6 +1413,37 @@ call_internal_function (struct gdbarch *gdbarch,
+@@ -1364,6 +1414,40 @@ call_internal_function (struct gdbarch *gdbarch,
    return (*ifn->handler) (gdbarch, language, ifn->cookie, argc, argv);
  }
  
@@ -27876,10 +27876,13 @@ index 97f236c..8af6ae1 100644
 +	type_mark_used (value_type (var->u.value));
 +	break;
 +
-+      case INTERNALVAR_SCALAR:
-+	type_mark_used (var->u.scalar.type);
++      case INTERNALVAR_INTEGER:
++	type_mark_used (var->u.integer.type);
 +	break;
 +
++      case INTERNALVAR_POINTER:
++	type_mark_used (var->u.pointer.type);
++	break;
 +      }
 +
 +  for (chunk = value_history_chain; chunk != NULL; chunk = chunk->next)
@@ -27895,7 +27898,7 @@ index 97f236c..8af6ae1 100644
  /* The 'function' command.  This does nothing -- it is just a
     placeholder to let "help function NAME" work.  This is also used as
     the implementation of the sub-command that is created when
-@@ -1410,11 +1491,10 @@ preserve_one_value (struct value *value, struct objfile *objfile,
+@@ -1411,11 +1495,10 @@ preserve_one_value (struct value *value, struct objfile *objfile,
  		    htab_t copied_types)
  {
    if (TYPE_OBJFILE (value->type) == objfile)
@@ -27909,16 +27912,23 @@ index 97f236c..8af6ae1 100644
  						 copied_types);
  }
  
-@@ -1429,7 +1509,7 @@ preserve_one_internalvar (struct internalvar *var, struct objfile *objfile,
-     case INTERNALVAR_SCALAR:
-       if (var->u.scalar.type && TYPE_OBJFILE (var->u.scalar.type) == objfile)
- 	var->u.scalar.type
--	  = copy_type_recursive (objfile, var->u.scalar.type, copied_types);
-+	  = copy_type_recursive (var->u.scalar.type, copied_types);
+@@ -1430,13 +1513,13 @@ preserve_one_internalvar (struct internalvar *var, struct objfile *objfile,
+     case INTERNALVAR_INTEGER:
+       if (var->u.integer.type && TYPE_OBJFILE (var->u.integer.type) == objfile)
+ 	var->u.integer.type
+-	  = copy_type_recursive (objfile, var->u.integer.type, copied_types);
++	  = copy_type_recursive (var->u.integer.type, copied_types);
+       break;
+ 
+     case INTERNALVAR_POINTER:
+       if (TYPE_OBJFILE (var->u.pointer.type) == objfile)
+ 	var->u.pointer.type
+-	  = copy_type_recursive (objfile, var->u.pointer.type, copied_types);
++	  = copy_type_recursive (var->u.pointer.type, copied_types);
        break;
  
      case INTERNALVAR_VALUE:
-@@ -1831,6 +1911,8 @@ value_change_enclosing_type (struct value *val, struct type *new_encl_type)
+@@ -1838,6 +1921,8 @@ value_change_enclosing_type (struct value *val, struct type *new_encl_type)
      val->contents =
        (gdb_byte *) xrealloc (val->contents, TYPE_LENGTH (new_encl_type));
  
@@ -27927,7 +27937,7 @@ index 97f236c..8af6ae1 100644
    val->enclosing_type = new_encl_type;
    return val;
  }
-@@ -1895,6 +1977,8 @@ value_primitive_field (struct value *arg1, int offset,
+@@ -1902,6 +1987,8 @@ value_primitive_field (struct value *arg1, int offset,
  	  memcpy (value_contents_all_raw (v), value_contents_all_raw (arg1),
  		  TYPE_LENGTH (value_enclosing_type (arg1)));
  	}
@@ -27936,7 +27946,7 @@ index 97f236c..8af6ae1 100644
        v->type = type;
        v->offset = value_offset (arg1);
        v->embedded_offset = (offset + value_embedded_offset (arg1)
-@@ -2145,6 +2229,42 @@ pack_long (gdb_byte *buf, struct type *type, LONGEST num)
+@@ -2152,6 +2239,42 @@ pack_long (gdb_byte *buf, struct type *type, LONGEST num)
  }
  
  
@@ -27979,7 +27989,7 @@ index 97f236c..8af6ae1 100644
  /* Convert C numbers into newly allocated values.  */
  
  struct value *
-@@ -2158,6 +2278,19 @@ value_from_longest (struct type *type, LONGEST num)
+@@ -2165,6 +2288,19 @@ value_from_longest (struct type *type, LONGEST num)
  }
  
  
@@ -27999,7 +28009,7 @@ index 97f236c..8af6ae1 100644
  /* Create a value representing a pointer of type TYPE to the address
     ADDR.  */
  struct value *
-@@ -2316,4 +2449,8 @@ VARIABLE is already initialized."));
+@@ -2323,4 +2459,8 @@ VARIABLE is already initialized."));
    add_prefix_cmd ("function", no_class, function_command, _("\
  Placeholder command for showing help on convenience functions."),
  		  &functionlist, "function ", 0, &cmdlist);


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- gdb.spec	18 Aug 2009 19:37:35 -0000	1.377
+++ gdb.spec	19 Aug 2009 16:19:15 -0000	1.378
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # 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
@@ -219,7 +219,7 @@ Patch229: gdb-6.3-bz140532-ppc-unwinding
 Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
 # Backported post gdb-6.8.50.20090818 snapshot fixups.
-#Patch232: gdb-6.8.50.20090818-upstream.patch
+Patch232: gdb-6.8.50.20090818-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -444,7 +444,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-#patch232 -p1
+%patch232 -p1
 %patch349 -p1
 %patch1 -p1
 %patch3 -p1
@@ -821,6 +821,10 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-4
+- Fixup "bad type" internal error, import from FSF GDB.
+- archer-jankratochvil-fedora12 commit: 2ba2bc451eb832182ef84c3934115de7a329da7c
+
 * Tue Aug 18 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-3
 - archer-jankratochvil-fedora12 commit: 850e3cb38a25cb7fdfa4cef667626ffbde51bcac
 - Fix the hardware watchpoints.



From akurtakov at fedoraproject.org  Wed Aug 19 16:24:47 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 16:24:47 +0000 (UTC)
Subject: rpms/jakarta-commons-jxpath/devel jakarta-commons-jxpath.spec, 1.1, 
	1.2
Message-ID: <20090819162447.93AB711C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-jxpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29435/devel

Modified Files:
	jakarta-commons-jxpath.spec 
Log Message:
- BuildRequires java-devel >= 1.6.0.


Index: jakarta-commons-jxpath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-jxpath/devel/jakarta-commons-jxpath.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jakarta-commons-jxpath.spec	19 Aug 2009 15:32:56 -0000	1.1
+++ jakarta-commons-jxpath.spec	19 Aug 2009 16:24:47 -0000	1.2
@@ -33,7 +33,7 @@
 
 Name:           jakarta-%{base_name}
 Version:        1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 Summary:        Simple XPath interpreter
 
@@ -57,6 +57,7 @@ BuildRequires:  jakarta-commons-beanutil
 BuildRequires:  jakarta-commons-logging
 BuildRequires:  jakarta-commons-collections >= 0:2.1.1
 BuildRequires:  tomcat5-jsp-2.0-api
+BuildRequires:  java-devel >= 1.6.0
 Requires:       xml-commons-apis
 Requires:       xerces-j2
 Requires:       servletapi5
@@ -140,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-8
+- BuildRequires java-devel >= 1.6.0.
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-7
 - Initial package for Fedora.
 



From markmc at fedoraproject.org  Wed Aug 19 16:26:28 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 19 Aug 2009 16:26:28 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-add-pci-hostdev-hotplug-support.patch,
	NONE, 1.1 libvirt-add-space-to-nodedev-list-tree.patch, NONE,
	1.1 libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch,
	NONE, 1.1 libvirt-allow-pm-reset-on-multi-function-pci-devices.patch, 
	NONE, 1.1 libvirt-fix-device-list-update-after-detach.patch,
	NONE, 1.1 libvirt-improve-pci-hostdev-reset-error-message.patch, NONE,
	1.1 libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch,
	NONE, 1.1 libvirt-0.6.4-svirt-sound.patch, 1.2, 1.3 libvirt.spec,
	1.170, 1.171
Message-ID: <20090819162628.572CF11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29802

Modified Files:
	libvirt-0.6.4-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-add-pci-hostdev-hotplug-support.patch 
	libvirt-add-space-to-nodedev-list-tree.patch 
	libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch 
	libvirt-allow-pm-reset-on-multi-function-pci-devices.patch 
	libvirt-fix-device-list-update-after-detach.patch 
	libvirt-improve-pci-hostdev-reset-error-message.patch 
	libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch 
Log Message:
* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-5
- Add PCI host device hotplug support
- Allow PCI bus reset to reset other devices (#499678)
- Fix stupid PCI reset error message (bug #499678)
- Allow PM reset on multi-function PCI devices (bug #515689)
- Re-attach PCI host devices after guest shuts down (bug #499561)
- Fix list corruption after disk hot-unplug
- Fix minor 'virsh nodedev-list --tree' annoyance


libvirt-add-pci-hostdev-hotplug-support.patch:
 domain_conf.c        |   33 +++++-
 domain_conf.h        |   13 ++
 libvirt_private.syms |    2 
 qemu_driver.c        |  267 ++++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 300 insertions(+), 15 deletions(-)

--- NEW FILE libvirt-add-pci-hostdev-hotplug-support.patch ---
>From 332979bb680d833529ab9cecac6828c6ce54d731 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:10 +0100
Subject: [PATCH] Add host PCI device hotplug support

Attaching a host PCI device to a qemu guest is done with a
straightforward 'pci_add pci_addr auto host host=XX:XX.X' command.

Like with NIC and disk hotplug, we need to retain the guest PCI address
assigned by qemu so that we can use it for hot-unplug.

Identifying a device for detach is done using the host PCI address.

Managed mode is handled by detaching/resetting the device before
attaching it to the guest and re-attaching it after detaching it from
the guest.

(cherry picked from commit 7636ef4630fc15c3d559eceb5b5c4fb1524b7c5a)
(cherry picked from commit 0c5b7b93a3cdb197c55d79c2605e9e19e3af43f5)
(cherry picked from commit 60ff07585ca8f7e639fed477e2e2cf79ce1c5c21)
(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)
(cherry picked from commit 4dbecff9fbd5b5d1154bc7a41a5d4dd00533b359)
(cherry picked from commit 12edef9a6aca5bd9a2ea18b73ca862f615684d84)
(cherry picked from commit 457e05062863a35c7efb35470886b9b83a49d04d)
(cherry picked from commit e8ad33931296c67de0538e78d12e21706a826d37)

Fedora-patch: libvirt-add-pci-hostdev-hotplug-support.patch
---
 src/domain_conf.c        |   33 +++++-
 src/domain_conf.h        |   13 +++
 src/libvirt_private.syms |    2 +
 src/qemu_driver.c        |  266 ++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 300 insertions(+), 14 deletions(-)

diff --git a/src/domain_conf.c b/src/domain_conf.c
index 2301a96..bad53f7 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -1977,7 +1977,8 @@ out:
 static int
 virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
                                      const xmlNodePtr node,
-                                     virDomainHostdevDefPtr def) {
+                                     virDomainHostdevDefPtr def,
+                                     int flags) {
 
     int ret = -1;
     xmlNodePtr cur;
@@ -2049,6 +2050,20 @@ virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
                                          _("pci address needs function id"));
                     goto out;
                 }
+            } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
+                       xmlStrEqual(cur->name, BAD_CAST "state")) {
+                char *devaddr = virXMLPropString(cur, "devaddr");
+                if (devaddr &&
+                    sscanf(devaddr, "%x:%x:%x",
+                           &def->source.subsys.u.pci.guest_addr.domain,
+                           &def->source.subsys.u.pci.guest_addr.bus,
+                           &def->source.subsys.u.pci.guest_addr.slot) < 3) {
+                    virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
+                                         _("Unable to parse devaddr parameter '%s'"),
+                                         devaddr);
+                    VIR_FREE(devaddr);
+                    goto out;
+                }
             } else {
                 virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
                                      _("unknown pci source type '%s'"),
@@ -2123,7 +2138,7 @@ virDomainHostdevDefParseXML(virConnectPtr conn,
                 }
                 if (def->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
                     def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-                        if (virDomainHostdevSubsysPciDefParseXML(conn, cur, def) < 0)
+                        if (virDomainHostdevSubsysPciDefParseXML(conn, cur, def, flags) < 0)
                             goto error;
                 }
             } else {
@@ -3937,7 +3952,8 @@ virDomainGraphicsDefFormat(virConnectPtr conn,
 static int
 virDomainHostdevDefFormat(virConnectPtr conn,
                           virBufferPtr buf,
-                          virDomainHostdevDefPtr def)
+                          virDomainHostdevDefPtr def,
+                          int flags)
 {
     const char *mode = virDomainHostdevModeTypeToString(def->mode);
     const char *type;
@@ -3978,6 +3994,15 @@ virDomainHostdevDefFormat(virConnectPtr conn,
                           def->source.subsys.u.pci.bus,
                           def->source.subsys.u.pci.slot,
                           def->source.subsys.u.pci.function);
+        if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) {
+            virBufferAddLit(buf, "      <state");
+            if (virHostdevHasValidGuestAddr(def))
+                virBufferVSprintf(buf, " devaddr='%.4x:%.2x:%.2x'",
+                                  def->source.subsys.u.pci.guest_addr.domain,
+                                  def->source.subsys.u.pci.guest_addr.bus,
+                                  def->source.subsys.u.pci.guest_addr.slot);
+            virBufferAddLit(buf, "/>\n");
+        }
     }
 
     virBufferAddLit(buf, "      </source>\n");
@@ -4192,7 +4217,7 @@ char *virDomainDefFormat(virConnectPtr conn,
             goto cleanup;
 
     for (n = 0 ; n < def->nhostdevs ; n++)
-        if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n]) < 0)
+        if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n], flags) < 0)
             goto cleanup;
 
     virBufferAddLit(&buf, "  </devices>\n");
diff --git a/src/domain_conf.h b/src/domain_conf.h
index 63fca76..44302be 100644
--- a/src/domain_conf.h
+++ b/src/domain_conf.h
@@ -391,6 +391,11 @@ struct _virDomainHostdevDef {
                      unsigned bus;
                      unsigned slot;
                      unsigned function;
+                    struct {
+                        unsigned domain;
+                        unsigned bus;
+                        unsigned slot;
+                    } guest_addr;
                 } pci;
             } u;
         } subsys;
@@ -404,6 +409,14 @@ struct _virDomainHostdevDef {
     char* target;
 };
 
+static inline int
+virHostdevHasValidGuestAddr(virDomainHostdevDefPtr def)
+{
+    return def->source.subsys.u.pci.guest_addr.domain ||
+           def->source.subsys.u.pci.guest_addr.bus ||
+           def->source.subsys.u.pci.guest_addr.slot;
+}
+
 /* Flags for the 'type' field in next struct */
 enum virDomainDeviceType {
     VIR_DOMAIN_DEVICE_DISK,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4f1b01f..22131c4 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -88,6 +88,8 @@ virDomainGetRootFilesystem;
 virDomainGraphicsTypeFromString;
 virDomainGraphicsDefFree;
 virDomainHostdevDefFree;
+virDomainHostdevModeTypeToString;
+virDomainHostdevSubsysTypeToString;
 virDomainInputDefFree;
 virDomainLifecycleTypeFromString;
 virDomainLifecycleTypeToString;
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index cbc27c4..99dac52 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5258,9 +5258,91 @@ cleanup:
     return -1;
 }
 
-static int qemudDomainAttachHostDevice(virConnectPtr conn,
-                                       virDomainObjPtr vm,
-                                       virDomainDeviceDefPtr dev)
+static int qemudDomainAttachHostPciDevice(virConnectPtr conn,
+                                          struct qemud_driver *driver,
+                                          virDomainObjPtr vm,
+                                          virDomainDeviceDefPtr dev)
+{
+    virDomainHostdevDefPtr hostdev = dev->data.hostdev;
+    char *cmd, *reply;
+    unsigned domain, bus, slot;
+    pciDevice *pci;
+
+    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) < 0) {
+        virReportOOMError(conn);
+        return -1;
+    }
+
+    pci = pciGetDevice(conn,
+                       hostdev->source.subsys.u.pci.domain,
+                       hostdev->source.subsys.u.pci.bus,
+                       hostdev->source.subsys.u.pci.slot,
+                       hostdev->source.subsys.u.pci.function);
+    if (!dev)
+        return -1;
+
+    if ((hostdev->managed && pciDettachDevice(conn, pci) < 0) ||
+        pciResetDevice(conn, pci, driver->activePciHostdevs) < 0) {
+        pciFreeDevice(conn, pci);
+        return -1;
+    }
+
+    if (pciDeviceListAdd(conn, driver->activePciHostdevs, pci) < 0) {
+        pciFreeDevice(conn, pci);
+        return -1;
+    }
+
+    cmd = reply = NULL;
+
+    if (virAsprintf(&cmd, "pci_add pci_addr=auto host host=%.2x:%.2x.%.1x",
+                    hostdev->source.subsys.u.pci.bus,
+                    hostdev->source.subsys.u.pci.slot,
+                    hostdev->source.subsys.u.pci.function) < 0) {
+        virReportOOMError(conn);
+        goto error;
+    }
+
+    if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
+        qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+                         "%s", _("cannot attach host pci device"));
+        goto error;
+    }
+
+    if (strstr(reply, "invalid type: host")) {
+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s",
+                         _("PCI device assignment is not supported by this version of qemu"));
+        goto error;
+    }
+
+    if (qemudParsePciAddReply(vm, reply, &domain, &bus, &slot) < 0) {
+        qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+                         _("parsing pci_add reply failed: %s"), reply);
+        goto error;
+    }
+
+    hostdev->source.subsys.u.pci.guest_addr.domain = domain;
+    hostdev->source.subsys.u.pci.guest_addr.bus    = bus;
+    hostdev->source.subsys.u.pci.guest_addr.slot   = slot;
+
+    vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
+
+    VIR_FREE(reply);
+    VIR_FREE(cmd);
+
+    return 0;
+
+error:
+    pciDeviceListDel(conn, driver->activePciHostdevs, pci);
+
+    VIR_FREE(reply);
+    VIR_FREE(cmd);
+
+    return -1;
+}
+
+static int qemudDomainAttachHostUsbDevice(virConnectPtr conn,
+                                          virDomainObjPtr vm,
+                                          virDomainDeviceDefPtr dev)
 {
     int ret;
     char *cmd, *reply;
@@ -5310,6 +5392,36 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
     return 0;
 }
 
+static int qemudDomainAttachHostDevice(virConnectPtr conn,
+                                       struct qemud_driver *driver,
+                                       virDomainObjPtr vm,
+                                       virDomainDeviceDefPtr dev)
+{
+    virDomainHostdevDefPtr hostdev = dev->data.hostdev;
+
+    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
+                         _("hostdev mode '%s' not supported"),
+                         virDomainHostdevModeTypeToString(hostdev->mode));
+        return -1;
+    }
+
+    if (qemuDomainSetDeviceOwnership(conn, driver, dev, 0) < 0)
+        return -1;
+
+    switch (hostdev->source.subsys.type) {
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
+        return qemudDomainAttachHostPciDevice(conn, driver, vm, dev);
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+        return qemudDomainAttachHostUsbDevice(conn, vm, dev);
+    default:
+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
+                         _("hostdev subsys type '%s' not supported"),
+                         virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
+        return -1;
+    }
+}
+
 static int qemudDomainAttachDevice(virDomainPtr dom,
                                    const char *xml) {
     struct qemud_driver *driver = dom->conn->privateData;
@@ -5411,13 +5523,8 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
         }
     } else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
         ret = qemudDomainAttachNetDevice(dom->conn, driver, vm, dev, qemuCmdFlags);
-    } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
-               dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
-               dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
-        if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 0) < 0)
-            goto cleanup;
-
-        ret = qemudDomainAttachHostDevice(dom->conn, vm, dev);
+    } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
+        ret = qemudDomainAttachHostDevice(dom->conn, driver, vm, dev);
     } else {
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
                          _("device type '%s' cannot be attached"),
@@ -5630,6 +5737,143 @@ cleanup:
     return ret;
 }
 
+static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
+                                          struct qemud_driver *driver,
+                                          virDomainObjPtr vm,
+                                          virDomainDeviceDefPtr dev)
+{
+    virDomainHostdevDefPtr detach;
+    char *cmd, *reply;
+    int i, ret;
+    pciDevice *pci;
+
+    for (i = 0 ; i < vm->def->nhostdevs ; i++) {
+        unsigned domain   = vm->def->hostdevs[i]->source.subsys.u.pci.domain;
+        unsigned bus      = vm->def->hostdevs[i]->source.subsys.u.pci.bus;
+        unsigned slot     = vm->def->hostdevs[i]->source.subsys.u.pci.slot;
+        unsigned function = vm->def->hostdevs[i]->source.subsys.u.pci.function;
+
+        if (dev->data.hostdev->source.subsys.u.pci.domain   == domain &&
+            dev->data.hostdev->source.subsys.u.pci.bus      == bus &&
+            dev->data.hostdev->source.subsys.u.pci.slot     == slot &&
+            dev->data.hostdev->source.subsys.u.pci.function == function) {
+            detach = vm->def->hostdevs[i];
+            break;
+        }
+    }
+
+    if (!detach) {
+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                         _("host pci device %.4x:%.2x:%.2x.%.1x not found"),
+                         dev->data.hostdev->source.subsys.u.pci.domain,
+                         dev->data.hostdev->source.subsys.u.pci.bus,
+                         dev->data.hostdev->source.subsys.u.pci.slot,
+                         dev->data.hostdev->source.subsys.u.pci.function);
+        return -1;
+    }
+
+    if (!virHostdevHasValidGuestAddr(detach)) {
+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                         "%s", _("hostdev cannot be detached - device state missing"));
+        return -1;
+    }
+
+    if (virAsprintf(&cmd, "pci_del pci_addr=%.4x:%.2x:%.2x",
+                    detach->source.subsys.u.pci.guest_addr.domain,
+                    detach->source.subsys.u.pci.guest_addr.bus,
+                    detach->source.subsys.u.pci.guest_addr.slot) < 0) {
+        virReportOOMError(conn);
+        return -1;
+    }
+
+    if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
+        qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+                         "%s", _("cannot detach host pci device"));
+        VIR_FREE(cmd);
+        return -1;
+    }
+
+    DEBUG("%s: pci_del reply: %s", vm->def->name,  reply);
+
+    /* If the command fails due to a wrong PCI address qemu prints
+     * 'invalid pci address'; nothing is printed on success */
+    if (strstr(reply, "Invalid pci address")) {
+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                         _("failed to detach host pci device: invalid PCI address %.4x:%.2x:%.2x: %s"),
+                         detach->source.subsys.u.pci.guest_addr.domain,
+                         detach->source.subsys.u.pci.guest_addr.bus,
+                         detach->source.subsys.u.pci.guest_addr.slot,
+                         reply);
+        VIR_FREE(reply);
+        VIR_FREE(cmd);
+        return -1;
+    }
+
+    VIR_FREE(reply);
+    VIR_FREE(cmd);
+
+    ret = 0;
+
+    pci = pciGetDevice(conn,
+                       detach->source.subsys.u.pci.domain,
+                       detach->source.subsys.u.pci.bus,
+                       detach->source.subsys.u.pci.slot,
+                       detach->source.subsys.u.pci.function);
+    if (!pci)
+        ret = -1;
+    else {
+        pciDeviceListDel(conn, driver->activePciHostdevs, pci);
+        if (pciResetDevice(conn, pci, driver->activePciHostdevs) < 0)
+            ret = -1;
+        if (detach->managed && pciReAttachDevice(conn, pci) < 0)
+            ret = -1;
+        pciFreeDevice(conn, pci);
+    }
+
+    if (i != --vm->def->nhostdevs)
+        memmove(&vm->def->hostdevs[i],
+                &vm->def->hostdevs[i+1],
+                sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
+    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
+        virReportOOMError(conn);
+        ret = -1;
+    }
+
+    return ret;
+}
+
+static int qemudDomainDetachHostDevice(virConnectPtr conn,
+                                       struct qemud_driver *driver,
+                                       virDomainObjPtr vm,
+                                       virDomainDeviceDefPtr dev)
+{
+    virDomainHostdevDefPtr hostdev = dev->data.hostdev;
+    int ret;
+
+    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
+                         _("hostdev mode '%s' not supported"),
+                         virDomainHostdevModeTypeToString(hostdev->mode));
+        return -1;
+    }
+
+    switch (hostdev->source.subsys.type) {
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
+        ret = qemudDomainDetachHostPciDevice(conn, driver, vm, dev);
+        break;
+    default:
+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
+                         _("hostdev subsys type '%s' not supported"),
+                         virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
+        return -1;
+    }
+
+    if (qemuDomainSetDeviceOwnership(conn, driver, dev, 1) < 0)
+        VIR_WARN0("Fail to restore disk device ownership");
+
+    return ret;
+}
+
 static int qemudDomainDetachDevice(virDomainPtr dom,
                                    const char *xml) {
     struct qemud_driver *driver = dom->conn->privateData;
@@ -5670,6 +5914,8 @@ static int qemudDomainDetachDevice(virDomainPtr dom,
             VIR_WARN0("Fail to restore disk device ownership");
     } else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
         ret = qemudDomainDetachNetDevice(dom->conn, vm, dev);
+    } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
+        ret = qemudDomainDetachHostDevice(dom->conn, driver, vm, dev);
     } else
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
                          "%s", _("only SCSI or virtio disk device can be detached dynamically"));
-- 
1.6.2.5


libvirt-add-space-to-nodedev-list-tree.patch:
 virsh.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libvirt-add-space-to-nodedev-list-tree.patch ---
>From 100eb35a80932cd9a162c38ecd2ab8b01894fb61 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 17 Aug 2009 15:05:22 +0100
Subject: [PATCH] Cosmetic change to 'virsh nodedev-list --tree' output

Maybe it's just me, but I try to select an item from the tree using
double-click and get annoyed when "+-" gets included in the selection.

* src/virsh.c: add a space between "+-" and the node device name
  in 'virsh nodedev-list --tree'

(cherry picked from commit 097c818bf00b3777778ffc32fea3a6ed1e741e2b)

Fedora-patch: libvirt-add-space-to-nodedev-list-tree.patch
---
 src/virsh.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/virsh.c b/src/virsh.c
index 94c3c4e..2d0cf81 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -5370,6 +5370,8 @@ cmdNodeListDevicesPrint(vshControl *ctl,
     if (depth && depth < MAX_DEPTH) {
         indentBuf[indentIdx] = '+';
         indentBuf[indentIdx+1] = '-';
+        indentBuf[indentIdx+2] = ' ';
+        indentBuf[indentIdx+3] = '\0';
     }
 
     /* Print this device */
@@ -5398,7 +5400,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
     /* If there is a child device, then print another blank line */
     if (nextlastdev != -1) {
         vshPrint(ctl, "%s", indentBuf);
-        vshPrint(ctl, "  |\n");
+        vshPrint(ctl, " |\n");
     }
 
     /* Finally print all children */
-- 
1.6.2.5


libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch:
 libvirt_private.syms |    7 +
 pci.c                |  211 ++++++++++++++++++++++++++++++++++++---------
 pci.h                |   23 ++++
 qemu_conf.h          |    3 
 qemu_driver.c        |  237 +++++++++++++++++++++++++++++----------------------
 xen_unified.c        |    3 
 6 files changed, 339 insertions(+), 145 deletions(-)

--- NEW FILE libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch ---
>From 89eefbd116ae74c3a5cfcfc74a31a40b83c726c3 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 17 Aug 2009 15:05:23 +0100
Subject: [PATCH] Maintain a list of active PCI hostdevs and use it in pciResetDevice()

https://bugzilla.redhat.com/499678

First we add a pciDeviceList type and add a qemuGetPciHostDeviceList()
function to build a list from a domain definition. Use this in
prepare/re-attach to simplify things and eliminate the multiple
pciGetDevice() calls.

Then, as we start/shutdown guests we can add or delete devices as
appropriate from a list of active devices.

Finally, in pciReset(), we can use this to determine whether its safe to
reset a device as a side effect of resetting another device.

(cherry picked from commit 78675b228b76a83f83d64856bfb63b9e14c103a0)
(cherry picked from commit e8ad33931296c67de0538e78d12e21706a826d37)

Fedora-patch: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
---
 src/libvirt_private.syms |    7 +-
 src/pci.c                |  211 +++++++++++++++++++++++++++++++++--------
 src/pci.h                |   23 +++++-
 src/qemu_conf.h          |    3 +
 src/qemu_driver.c        |  237 +++++++++++++++++++++++++++-------------------
 src/xen_unified.c        |    2 +-
 6 files changed, 339 insertions(+), 144 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index bd63692..4f1b01f 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -278,7 +278,12 @@ pciFreeDevice;
 pciDettachDevice;
 pciReAttachDevice;
 pciResetDevice;
-
+pciDeviceSetManaged;
+pciDeviceGetManaged;
+pciDeviceListNew;
+pciDeviceListFree;
+pciDeviceListAdd;
+pciDeviceListDel;
 
 # qparams.h
 qparam_get_query;
diff --git a/src/pci.c b/src/pci.c
index 74f7ef0..96e5d6d 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -63,6 +63,7 @@ struct _pciDevice {
     unsigned      pci_pm_cap_pos;
     unsigned      has_flr : 1;
     unsigned      has_pm_reset : 1;
+    unsigned      managed : 1;
 };
 
 /* For virReportOOMError()  and virReportSystemError() */
@@ -225,7 +226,7 @@ pciWrite32(pciDevice *dev, unsigned pos, uint32_t val)
     pciWrite(dev, pos, &buf[0], sizeof(buf));
 }
 
-typedef int (*pciIterPredicate)(pciDevice *, pciDevice *);
+typedef int (*pciIterPredicate)(pciDevice *, pciDevice *, void *);
 
 /* Iterate over available PCI devices calling @predicate
  * to compare each one to @dev.
@@ -236,7 +237,8 @@ static int
 pciIterDevices(virConnectPtr conn,
                pciIterPredicate predicate,
                pciDevice *dev,
-               pciDevice **matched)
+               pciDevice **matched,
+               void *data)
 {
     DIR *dir;
     struct dirent *entry;
@@ -254,7 +256,7 @@ pciIterDevices(virConnectPtr conn,
 
     while ((entry = readdir(dir))) {
         unsigned domain, bus, slot, function;
-        pciDevice *try;
+        pciDevice *check;
 
         /* Ignore '.' and '..' */
         if (entry->d_name[0] == '.')
@@ -266,18 +268,18 @@ pciIterDevices(virConnectPtr conn,
             continue;
         }
 
-        try = pciGetDevice(conn, domain, bus, slot, function);
-        if (!try) {
+        check = pciGetDevice(conn, domain, bus, slot, function);
+        if (!check) {
             ret = -1;
             break;
         }
 
-        if (predicate(try, dev)) {
-            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, try->name);
-            *matched = try;
+        if (predicate(dev, check, data)) {
+            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, check->name);
+            *matched = check;
             break;
         }
-        pciFreeDevice(conn, try);
+        pciFreeDevice(conn, check);
     }
     closedir(dir);
     return ret;
@@ -379,63 +381,70 @@ pciDetectPowerManagementReset(pciDevice *dev)
     return 0;
 }
 
-/* Any devices other than the one supplied on the same domain/bus ? */
+/* Any active devices other than the one supplied on the same domain/bus ? */
 static int
-pciSharesBus(pciDevice *a, pciDevice *b)
+pciSharesBusWithActive(pciDevice *dev, pciDevice *check, void *data)
 {
-    return
-        a->domain == b->domain &&
-        a->bus == b->bus &&
-        (a->slot != b->slot ||
-         a->function != b->function);
-}
+    pciDeviceList *activeDevs = data;
 
-static int
-pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
-{
-    pciDevice *matched = NULL;
-    if (pciIterDevices(conn, pciSharesBus, dev, &matched) < 0)
-        return 1;
-    if (!matched)
+    if (dev->domain != check->domain ||
+        dev->bus != check->bus ||
+        (check->slot == check->slot &&
+         check->function == check->function))
+        return 0;
+
+    if (activeDevs && !pciDeviceListFind(activeDevs, check))
         return 0;
-    pciFreeDevice(conn, matched);
+
     return 1;
 }
 
-/* Is @a the parent of @b ? */
+static pciDevice *
+pciBusContainsActiveDevices(virConnectPtr conn,
+                            pciDevice *dev,
+                            pciDeviceList *activeDevs)
+{
+    pciDevice *active = NULL;
+    if (pciIterDevices(conn, pciSharesBusWithActive,
+                       dev, &active, activeDevs) < 0)
+        return NULL;
+    return active;
+}
+
+/* Is @check the parent of @dev ? */
 static int
-pciIsParent(pciDevice *a, pciDevice *b)
+pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED)
 {
     uint16_t device_class;
     uint8_t header_type, secondary, subordinate;
 
-    if (a->domain != b->domain)
+    if (dev->domain != check->domain)
         return 0;
 
     /* Is it a bridge? */
-    device_class = pciRead16(a, PCI_CLASS_DEVICE);
+    device_class = pciRead16(check, PCI_CLASS_DEVICE);
     if (device_class != PCI_CLASS_BRIDGE_PCI)
         return 0;
 
     /* Is it a plane? */
-    header_type = pciRead8(a, PCI_HEADER_TYPE);
+    header_type = pciRead8(check, PCI_HEADER_TYPE);
     if ((header_type & PCI_HEADER_TYPE_MASK) != PCI_HEADER_TYPE_BRIDGE)
         return 0;
 
-    secondary   = pciRead8(a, PCI_SECONDARY_BUS);
-    subordinate = pciRead8(a, PCI_SUBORDINATE_BUS);
+    secondary   = pciRead8(check, PCI_SECONDARY_BUS);
+    subordinate = pciRead8(check, PCI_SUBORDINATE_BUS);
 
-    VIR_DEBUG("%s %s: found parent device %s\n", b->id, b->name, a->name);
+    VIR_DEBUG("%s %s: found parent device %s\n", dev->id, dev->name, check->name);
 
     /* No, it's superman! */
-    return (b->bus >= secondary && b->bus <= subordinate);
+    return (dev->bus >= secondary && dev->bus <= subordinate);
 }
 
 static pciDevice *
 pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
 {
     pciDevice *parent = NULL;
-    pciIterDevices(conn, pciIsParent, dev, &parent);
+    pciIterDevices(conn, pciIsParent, dev, &parent, NULL);
     return parent;
 }
 
@@ -443,9 +452,11 @@ pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
  * devices behind a bus.
  */
 static int
-pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
+pciTrySecondaryBusReset(virConnectPtr conn,
+                        pciDevice *dev,
+                        pciDeviceList *activeDevs)
 {
-    pciDevice *parent;
+    pciDevice *parent, *conflict;
     uint8_t config_space[PCI_CONF_LEN];
     uint16_t ctl;
     int ret = -1;
@@ -455,10 +466,10 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
      * In future, we could allow it so long as those devices
      * are not in use by the host or other guests.
      */
-    if (pciBusContainsOtherDevices(conn, dev)) {
+    if ((conflict = pciBusContainsActiveDevices(conn, dev, activeDevs))) {
         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                       _("Other devices on bus with %s, not doing bus reset"),
-                       dev->name);
+                       _("Active %s devices on bus with %s, not doing bus reset"),
+                       conflict->name, dev->name);
         return -1;
     }
 
@@ -572,10 +583,18 @@ pciInitDevice(virConnectPtr conn, pciDevice *dev)
 }
 
 int
-pciResetDevice(virConnectPtr conn, pciDevice *dev)
+pciResetDevice(virConnectPtr conn,
+               pciDevice *dev,
+               pciDeviceList *activeDevs)
 {
     int ret = -1;
 
+    if (activeDevs && pciDeviceListFind(activeDevs, dev)) {
+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
+                       _("Not resetting active device %s"), dev->name);
+        return -1;
+    }
+
     if (!dev->initted && pciInitDevice(conn, dev) < 0)
         return -1;
 
@@ -594,7 +613,7 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
 
     /* Bus reset is not an option with the root bus */
     if (ret < 0 && dev->bus != 0)
-        ret = pciTrySecondaryBusReset(conn, dev);
+        ret = pciTrySecondaryBusReset(conn, dev, activeDevs);
 
     if (ret < 0) {
         virErrorPtr err = virGetLastError();
@@ -890,8 +909,116 @@ pciGetDevice(virConnectPtr conn,
 void
 pciFreeDevice(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 {
+    if (!dev)
+        return;
     VIR_DEBUG("%s %s: freeing", dev->id, dev->name);
     if (dev->fd >= 0)
         close(dev->fd);
     VIR_FREE(dev);
 }
+
+void pciDeviceSetManaged(pciDevice *dev, unsigned managed)
+{
+    dev->managed = !!managed;
+}
+
+unsigned pciDeviceGetManaged(pciDevice *dev)
+{
+    return dev->managed;
+}
+
+pciDeviceList *
+pciDeviceListNew(virConnectPtr conn)
+{
+    pciDeviceList *list;
+
+    if (VIR_ALLOC(list) < 0) {
+        virReportOOMError(conn);
+        return NULL;
+    }
+
+    return list;
+}
+
+void
+pciDeviceListFree(virConnectPtr conn,
+                  pciDeviceList *list)
+{
+    int i;
+
+    if (!list)
+        return;
+
+    for (i = 0; i < list->count; i++) {
+        pciFreeDevice(conn, list->devs[i]);
+        list->devs[i] = NULL;
+    }
+
+    list->count = 0;
+    VIR_FREE(list->devs);
+    VIR_FREE(list);
+}
+
+int
+pciDeviceListAdd(virConnectPtr conn,
+                 pciDeviceList *list,
+                 pciDevice *dev)
+{
+    if (pciDeviceListFind(list, dev)) {
+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
+                       _("Device %s is already in use"), dev->name);
+        return -1;
+    }
+
+    if (VIR_REALLOC_N(list->devs, list->count+1) < 0) {
+        virReportOOMError(conn);
+        return -1;
+    }
+
+    list->devs[list->count++] = dev;
+
+    return 0;
+}
+
+void
+pciDeviceListDel(virConnectPtr conn ATTRIBUTE_UNUSED,
+                 pciDeviceList *list,
+                 pciDevice *dev)
+{
+    int i;
+
+    for (i = 0; i < list->count; i++) {
+        if (list->devs[i]->domain   != dev->domain ||
+            list->devs[i]->bus      != dev->bus    ||
+            list->devs[i]->slot     != dev->slot   ||
+            list->devs[i]->function != dev->function)
+            continue;
+
+        pciFreeDevice(conn, list->devs[i]);
+
+        if (i != --list->count)
+            memmove(&list->devs[i],
+                    &list->devs[i+1],
+                    sizeof(*list->devs) * (list->count-i));
+
+        if (VIR_REALLOC_N(list->devs, list->count) < 0) {
+            ; /* not fatal */
+        }
+
+        break;
+    }
+}
+
+pciDevice *
+pciDeviceListFind(pciDeviceList *list, pciDevice *dev)
+{
+    int i;
+
+    for (i = 0; i < list->count; i++)
+        if (list->devs[i]->domain   == dev->domain &&
+            list->devs[i]->bus      == dev->bus    &&
+            list->devs[i]->slot     == dev->slot   &&
+            list->devs[i]->function == dev->function)
+            return list->devs[i];
+    return NULL;
+}
diff --git a/src/pci.h b/src/pci.h
index 47882ef..685b0af 100644
--- a/src/pci.h
+++ b/src/pci.h
@@ -27,6 +27,11 @@
 
 typedef struct _pciDevice pciDevice;
 
+typedef struct {
+    unsigned count;
+    pciDevice **devs;
+} pciDeviceList;
+
 pciDevice *pciGetDevice      (virConnectPtr  conn,
                               unsigned       domain,
                               unsigned       bus,
@@ -39,6 +44,22 @@ int        pciDettachDevice  (virConnectPtr  conn,
 int        pciReAttachDevice (virConnectPtr  conn,
                               pciDevice     *dev);
 int        pciResetDevice    (virConnectPtr  conn,
-                              pciDevice     *dev);
+                              pciDevice     *dev,
+                              pciDeviceList *activeDevs);
+void      pciDeviceSetManaged(pciDevice     *dev,
+                              unsigned       managed);
+unsigned  pciDeviceGetManaged(pciDevice     *dev);
+
+pciDeviceList *pciDeviceListNew  (virConnectPtr conn);
+void           pciDeviceListFree (virConnectPtr conn,
+                                  pciDeviceList *list);
+int            pciDeviceListAdd  (virConnectPtr conn,
+                                  pciDeviceList *list,
+                                  pciDevice *dev);
+void           pciDeviceListDel  (virConnectPtr conn,
+                                  pciDeviceList *list,
+                                  pciDevice *dev);
+pciDevice *    pciDeviceListFind (pciDeviceList *list,
+                                  pciDevice *dev);
 
 #endif /* __VIR_PCI_H__ */
diff --git a/src/qemu_conf.h b/src/qemu_conf.h
index 517626a..ab9d5e1 100644
--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
@@ -35,6 +35,7 @@
 #include "threads.h"
 #include "security.h"
 #include "cgroup.h"
+#include "pci.h"
 
 #define qemudDebug(fmt, ...) do {} while(0)
 
@@ -107,6 +108,8 @@ struct qemud_driver {
 
     char *securityDriverName;
     virSecurityDriverPtr securityDriver;
+
+    pciDeviceList *activePciHostdevs;
 };
 
 
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index fd39fc2..cbc27c4 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -128,6 +128,9 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
 static int qemudDetectVcpuPIDs(virConnectPtr conn,
                                virDomainObjPtr vm);
 
+static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
+                                       virDomainDefPtr def);
+
 static struct qemud_driver *qemu_driver = NULL;
 
 static int qemuCgroupControllerActive(struct qemud_driver *driver,
@@ -320,6 +323,10 @@ qemuReconnectDomain(struct qemud_driver *driver,
         goto error;
     }
 
+    if (qemuUpdateActivePciHostdevs(driver, obj->def) < 0) {
+        goto error;
+    }
+
     if (obj->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC &&
         driver->securityDriver &&
         driver->securityDriver->domainReserveSecurityLabel &&
@@ -524,6 +531,9 @@ qemudStartup(int privileged) {
     if ((qemu_driver->caps = qemudCapsInit(NULL)) == NULL)
         goto out_of_memory;
 
+    if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL)
+        goto error;
+
     if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
         goto error;
     }
@@ -648,6 +658,7 @@ qemudShutdown(void) {
         return -1;
 
     qemuDriverLock(qemu_driver);
+    pciDeviceListFree(NULL, qemu_driver->activePciHostdevs);
     virCapabilitiesFree(qemu_driver->caps);
 
     virDomainObjListFree(&qemu_driver->domains);
@@ -1329,48 +1340,16 @@ static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) {
     return -1;
 }
 
-static int qemuPrepareHostDevices(virConnectPtr conn,
-                                  virDomainDefPtr def) {
+static pciDeviceList *
+qemuGetPciHostDeviceList(virConnectPtr conn,
+                         virDomainDefPtr def)
+{
+    pciDeviceList *list;
     int i;
 
-    /* We have to use 2 loops here. *All* devices must
-     * be detached before we reset any of them, because
-     * in some cases you have to reset the whole PCI,
-     * which impacts all devices on it
-     */
-
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-
-        if (hostdev->managed) {
-            pciDevice *dev = pciGetDevice(conn,
-                                          hostdev->source.subsys.u.pci.domain,
-                                          hostdev->source.subsys.u.pci.bus,
-                                          hostdev->source.subsys.u.pci.slot,
-                                          hostdev->source.subsys.u.pci.function);
-            if (!dev)
-                goto error;
-
-            if (pciDettachDevice(conn, dev) < 0) {
-                pciFreeDevice(conn, dev);
-                goto error;
-            }
-
-            pciFreeDevice(conn, dev);
-        } /* else {
-             XXX validate that non-managed device isn't in use, eg
-             by checking that device is either un-bound, or bound
-             to pci-stub.ko
-        } */
-    }
+    if (!(list = pciDeviceListNew(conn)))
+        return NULL;
 
-    /* Now that all the PCI hostdevs have be dettached, we can safely
-     * reset them */
     for (i = 0 ; i < def->nhostdevs ; i++) {
         virDomainHostdevDefPtr hostdev = def->hostdevs[i];
         pciDevice *dev;
@@ -1385,95 +1364,151 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
                            hostdev->source.subsys.u.pci.bus,
                            hostdev->source.subsys.u.pci.slot,
                            hostdev->source.subsys.u.pci.function);
-        if (!dev)
-            goto error;
+        if (!dev) {
+            pciDeviceListFree(conn, list);
+            return NULL;
+        }
 
-        if (pciResetDevice(conn, dev) < 0) {
+        if (pciDeviceListAdd(conn, list, dev) < 0) {
             pciFreeDevice(conn, dev);
-            goto error;
+            pciDeviceListFree(conn, list);
+            return NULL;
         }
 
-        pciFreeDevice(conn, dev);
+        pciDeviceSetManaged(dev, hostdev->managed);
     }
 
-    return 0;
+    return list;
+}
 
-error:
-    return -1;
+static int
+qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
+                            virDomainDefPtr def)
+{
+    pciDeviceList *pcidevs;
+    int i, ret;
+
+    if (!def->nhostdevs)
+        return 0;
+
+    if (!(pcidevs = qemuGetPciHostDeviceList(NULL, def)))
+        return -1;
+
+    ret = 0;
+
+    for (i = 0; i < pcidevs->count; i++) {
+        if (pciDeviceListAdd(NULL,
+                             driver->activePciHostdevs,
+                             pcidevs->devs[i]) < 0) {
+            ret = -1;
+            break;
+        }
+        pcidevs->devs[i] = NULL;
+    }
+
+    pciDeviceListFree(NULL, pcidevs);
+    return ret;
 }
 
-static void
-qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
+static int
+qemuPrepareHostDevices(virConnectPtr conn,
+                       struct qemud_driver *driver,
+                       virDomainDefPtr def)
 {
+    pciDeviceList *pcidevs;
     int i;
 
-    /* Again 2 loops; reset all the devices before re-attach */
+    if (!def->nhostdevs)
+        return 0;
 
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-        pciDevice *dev;
+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def)))
+        return -1;
 
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
+    /* We have to use 3 loops here. *All* devices must
+     * be detached before we reset any of them, because
+     * in some cases you have to reset the whole PCI,
+     * which impacts all devices on it. Also, all devices
+     * must be reset before being marked as active.
+     */
 
-        dev = pciGetDevice(conn,
-                           hostdev->source.subsys.u.pci.domain,
-                           hostdev->source.subsys.u.pci.bus,
-                           hostdev->source.subsys.u.pci.slot,
-                           hostdev->source.subsys.u.pci.function);
-        if (!dev) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-                      err ? err->message : "");
-            virResetError(err);
-            continue;
-        }
+    /* XXX validate that non-managed device isn't in use, eg
+     * by checking that device is either un-bound, or bound
+     * to pci-stub.ko
+     */
 
-        if (pciResetDevice(conn, dev) < 0) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-                      err ? err->message : "");
-            virResetError(err);
-        }
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
+            pciDettachDevice(conn, pcidevs->devs[i]) < 0)
+            goto error;
+
+    /* Now that all the PCI hostdevs have be dettached, we can safely
+     * reset them */
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciResetDevice(conn, pcidevs->devs[i],
+                           driver->activePciHostdevs) < 0)
+            goto error;
 
-        pciFreeDevice(conn, dev);
+    /* Now mark all the devices as active */
+    for (i = 0; i < pcidevs->count; i++) {
+        if (pciDeviceListAdd(conn,
+                             driver->activePciHostdevs,
+                             pcidevs->devs[i]) < 0)
+            goto error;
+        pcidevs->devs[i] = NULL;
     }
 
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-        pciDevice *dev;
+    pciDeviceListFree(conn, pcidevs);
+    return 0;
 
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-        if (!hostdev->managed)
-            continue;
+error:
+    pciDeviceListFree(conn, pcidevs);
+    return -1;
+}
 
-        dev = pciGetDevice(conn,
-                           hostdev->source.subsys.u.pci.domain,
-                           hostdev->source.subsys.u.pci.bus,
-                           hostdev->source.subsys.u.pci.slot,
-                           hostdev->source.subsys.u.pci.function);
-        if (!dev) {
+static void
+qemuDomainReAttachHostDevices(virConnectPtr conn,
+                              struct qemud_driver *driver,
+                              virDomainDefPtr def)
+{
+    pciDeviceList *pcidevs;
+    int i;
+
+    if (!def->nhostdevs)
+        return;
+
+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def))) {
+        virErrorPtr err = virGetLastError();
+        VIR_ERROR(_("Failed to allocate pciDeviceList: %s\n"),
+                  err ? err->message : "");
+        virResetError(err);
+        return;
+    }
+
+    /* Again 3 loops; mark all devices as inactive before reset
+     * them and reset all the devices before re-attach */
+
+    for (i = 0; i < pcidevs->count; i++)
+        pciDeviceListDel(conn, driver->activePciHostdevs, pcidevs->devs[i]);
+
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciResetDevice(conn, pcidevs->devs[i],
+                           driver->activePciHostdevs) < 0) {
             virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
                       err ? err->message : "");
             virResetError(err);
-            continue;
         }
 
-        if (pciReAttachDevice(conn, dev) < 0) {
+    for (i = 0; i < pcidevs->count; i++)
+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
+            pciReAttachDevice(conn, pcidevs->devs[i]) < 0) {
             virErrorPtr err = virGetLastError();
             VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
                       err ? err->message : "");
             virResetError(err);
         }
 
-        pciFreeDevice(conn, dev);
-    }
+    pciDeviceListFree(conn, pcidevs);
 }
 
 static const char *const defaultDeviceACL[] = {
@@ -2001,7 +2036,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
     if (qemuSetupCgroup(conn, driver, vm) < 0)
         goto cleanup;
 
-    if (qemuPrepareHostDevices(conn, vm->def) < 0)
+    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
         goto cleanup;
 
     if (VIR_ALLOC(vm->monitor_chr) < 0) {
@@ -2183,7 +2218,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
         VIR_WARN("Failed to restore all device ownership for %s",
                  vm->def->name);
 
-    qemuDomainReAttachHostDevices(conn, vm->def);
+    qemuDomainReAttachHostDevices(conn, driver, vm->def);
 
 retry:
     if ((ret = qemuRemoveCgroup(conn, driver, vm)) < 0) {
@@ -6791,6 +6826,7 @@ out:
 static int
 qemudNodeDeviceReset (virNodeDevicePtr dev)
 {
+    struct qemud_driver *driver = dev->conn->privateData;
     pciDevice *pci;
     unsigned domain, bus, slot, function;
     int ret = -1;
@@ -6802,11 +6838,14 @@ qemudNodeDeviceReset (virNodeDevicePtr dev)
     if (!pci)
         return -1;
 
-    if (pciResetDevice(dev->conn, pci) < 0)
+    qemuDriverLock(driver);
+
+    if (pciResetDevice(dev->conn, pci, driver->activePciHostdevs) < 0)
         goto out;
 
     ret = 0;
 out:
+    qemuDriverUnlock(driver);
     pciFreeDevice(dev->conn, pci);
     return ret;
 }
diff --git a/src/xen_unified.c b/src/xen_unified.c
index f2ffc25..dfa9ca5 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1641,7 +1641,7 @@ xenUnifiedNodeDeviceReset (virNodeDevicePtr dev)
     if (!pci)
         return -1;
 
-    if (pciResetDevice(dev->conn, pci) < 0)
+    if (pciResetDevice(dev->conn, pci, NULL) < 0)
         goto out;
 
     ret = 0;
-- 
1.6.2.5


libvirt-allow-pm-reset-on-multi-function-pci-devices.patch:
 pci.c |   49 +++++++++----------------------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

--- NEW FILE libvirt-allow-pm-reset-on-multi-function-pci-devices.patch ---
>From 5aad00b08cadc4d9da8bffd3d255ffaac98d36dd Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:11 +0100
Subject: [PATCH] Allow PM reset on multi-function PCI devices

https://bugzilla.redhat.com/515689

It turns out that a PCI Power Management reset only affects individual
functions, and not the whole device.

The PCI Power Management spec talks about resetting the 'device' rather
than the 'function', but Intel's Dexuan Cui informs me that it is
actually a per-function reset.

Also, Yu Zhao has added pci_pm_reset() to the kernel, and it doesn't
reject multi-function devices, so it must be true! :-)

(A side issue is that we could defer the PM reset to the kernel if we
could detect that the kernel has PM reset support, but barring version
number checks we don't have a way to detect that support)

* src/pci.c: remove the pciDeviceContainsOtherFunctions() check from
  pciTryPowerManagementReset() and prefer PM reset over bus reset
  where both are available

Cc: Cui, Dexuan <dexuan.cui at intel.com>
Cc: Yu Zhao <yu.zhao at intel.com>

(cherry picked from commit 64a6682b93a2a8aa38067a43979c9eaf993d2b41)

Fedora-patch: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
---
 src/pci.c |   48 +++++++++---------------------------------------
 1 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/pci.c b/src/pci.c
index 2dc2e1c..11b3e8b 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -402,29 +402,6 @@ pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
     return 1;
 }
 
-/* Any other functions on this device ? */
-static int
-pciSharesDevice(pciDevice *a, pciDevice *b)
-{
-    return
-        a->domain == b->domain &&
-        a->bus == b->bus &&
-        a->slot == b->slot &&
-        a->function != b->function;
-}
-
-static int
-pciDeviceContainsOtherFunctions(virConnectPtr conn, pciDevice *dev)
-{
-    pciDevice *matched = NULL;
-    if (pciIterDevices(conn, pciSharesDevice, dev, &matched) < 0)
-        return 1;
-    if (!matched)
-        return 0;
-    pciFreeDevice(conn, matched);
-    return 1;
-}
-
 /* Is @a the parent of @b ? */
 static int
 pciIsParent(pciDevice *a, pciDevice *b)
@@ -529,7 +506,7 @@ out:
  * above we require the device supports a full internal reset.
  */
 static int
-pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
+pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 {
     uint8_t config_space[PCI_CONF_LEN];
     uint32_t ctl;
@@ -537,16 +514,6 @@ pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
     if (!dev->pci_pm_cap_pos)
         return -1;
 
-    /* For now, we just refuse to do a power management reset
-     * if there are other functions on this device.
-     * In future, we could allow it so long as those functions
-     * are not in use by the host or other guests.
-     */
-    if (pciDeviceContainsOtherFunctions(conn, dev)) {
-        VIR_WARN("%s contains other functions, not resetting", dev->name);
-        return -1;
-    }
-
     /* Save and restore the device's config space. */
     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
         VIR_WARN("Failed to save PCI config space for %s", dev->name);
@@ -604,14 +571,17 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
     if (dev->has_flr)
         return 0;
 
+    /* If the device supports PCI power management reset,
+     * that's the next best thing because it only resets
+     * the function, not the whole device.
+     */
+    if (dev->has_pm_reset)
+        ret = pciTryPowerManagementReset(conn, dev);
+
     /* Bus reset is not an option with the root bus */
-    if (dev->bus != 0)
+    if (ret < 0 && dev->bus != 0)
         ret = pciTrySecondaryBusReset(conn, dev);
 
-    /* Next best option is a PCI power management reset */
-    if (ret < 0 && dev->has_pm_reset)
-        ret = pciTryPowerManagementReset(conn, dev);
-
     if (ret < 0)
         pciReportError(conn, VIR_ERR_NO_SUPPORT,
                        _("No PCI reset capability available for %s"),
-- 
1.6.2.5


libvirt-fix-device-list-update-after-detach.patch:
 qemu_driver.c |   39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

--- NEW FILE libvirt-fix-device-list-update-after-detach.patch ---
>From 165fb333c9d954fec636dc0f1917ba50417478c0 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Sat, 15 Aug 2009 19:38:15 +0100
Subject: [PATCH] Fix list updating after disk/network hot-unplug

The current code makes a poor effort at updating the device arrays after
hot-unplug. Fix that and combine the two code paths into one.

* src/qemu_driver.c: fix list updating in qemudDomainDetachNetDevice() and
  qemudDomainDetachPciDiskDevice()

(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)

Fedora-patch: libvirt-fix-device-list-update-after-detach.patch
---
 src/qemu_driver.c |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index bd58435..2c4fd6f 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5404,18 +5404,17 @@ try_command:
         goto cleanup;
     }
 
-    if (vm->def->ndisks > 1) {
-        vm->def->disks[i] = vm->def->disks[--vm->def->ndisks];
-        if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
-            virReportOOMError(conn);
-            goto cleanup;
-        }
-        qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
-              virDomainDiskQSort);
-    } else {
-        VIR_FREE(vm->def->disks[0]);
-        vm->def->ndisks = 0;
+    if (i != --vm->def->ndisks)
+        memmove(&vm->def->disks[i],
+                &vm->def->disks[i+1],
+                sizeof(*vm->def->disks) * (vm->def->ndisks-i));
+    if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
+        virReportOOMError(conn);
+        goto cleanup;
     }
+    qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
+          virDomainDiskQSort);
+
     ret = 0;
 
 cleanup:
@@ -5503,16 +5502,15 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
 
     DEBUG("%s: host_net_remove reply: %s", vm->def->name,  reply);
 
-    if (vm->def->nnets > 1) {
-        vm->def->nets[i] = vm->def->nets[--vm->def->nnets];
-        if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets) < 0) {
-            virReportOOMError(conn);
-            goto cleanup;
-        }
-    } else {
-        VIR_FREE(vm->def->nets[0]);
-        vm->def->nnets = 0;
+    if (i != --vm->def->nnets)
+        memmove(&vm->def->nets[i],
+                &vm->def->nets[i+1],
+                sizeof(*vm->def->nets) * (vm->def->nnets-i));
+    if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets) < 0) {
+        virReportOOMError(conn);
+        goto cleanup;
     }
+
     ret = 0;
 
 cleanup:
-- 
1.6.2.5


libvirt-improve-pci-hostdev-reset-error-message.patch:
 pci.c         |   44 +++++++++++++++++++++++++++++++-------------
 qemu_driver.c |    5 ++---
 2 files changed, 33 insertions(+), 16 deletions(-)

--- NEW FILE libvirt-improve-pci-hostdev-reset-error-message.patch ---
>From c8a9dbe131713de83bdc67c563c4ab149e32c489 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:11 +0100
Subject: [PATCH] Improve PCI host device reset error message

https://bugzilla.redhat.com/499678

Currently, if we are unable to reset a PCI device we return a fairly
generic 'No PCI reset capability available' error message.

Fix that by returning an error from the individual reset messages and
using that error to construct the higher level error mesage.

* src/pci.c: set errors in pciTryPowerManagementReset() and
  pciTrySecondaryBusReset() on failure; use those error messages
  in pciResetDevice(), or explain that no reset support is available

(cherry picked from commit ebea34185612c3b96d7d3bbd8b7c2ce6c9f4fe6f)

Fedora-patch: libvirt-improve-pci-hostdev-reset-error-message.patch
---
 src/pci.c         |   44 +++++++++++++++++++++++++++++++-------------
 src/qemu_driver.c |    4 ++--
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/pci.c b/src/pci.c
index 11b3e8b..74f7ef0 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -456,15 +456,18 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
      * are not in use by the host or other guests.
      */
     if (pciBusContainsOtherDevices(conn, dev)) {
-        VIR_WARN("Other devices on bus with %s, not doing bus reset",
-                 dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Other devices on bus with %s, not doing bus reset"),
+                       dev->name);
         return -1;
     }
 
     /* Find the parent bus */
     parent = pciGetParentDevice(conn, dev);
     if (!parent) {
-        VIR_WARN("Failed to find parent device for %s", dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to find parent device for %s"),
+                       dev->name);
         return -1;
     }
 
@@ -475,7 +478,9 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
      * are multiple devices/functions
      */
     if (pciRead(dev, 0, config_space, PCI_CONF_LEN) < 0) {
-        VIR_WARN("Failed to save PCI config space for %s", dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to save PCI config space for %s"),
+                       dev->name);
         goto out;
     }
 
@@ -492,9 +497,12 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
 
     usleep(200 * 1000); /* sleep 200ms */
 
-    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0)
-        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
-
+    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0) {
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to restore PCI config space for %s"),
+                       dev->name);
+        goto out;
+    }
     ret = 0;
 out:
     pciFreeDevice(conn, parent);
@@ -516,7 +524,9 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 
     /* Save and restore the device's config space. */
     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-        VIR_WARN("Failed to save PCI config space for %s", dev->name);
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to save PCI config space for %s"),
+                       dev->name);
         return -1;
     }
 
@@ -533,8 +543,12 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
 
     usleep(10 * 1000); /* sleep 10ms */
 
-    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0)
-        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
+    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
+                       _("Failed to restore PCI config space for %s"),
+                       dev->name);
+        return -1;
+    }
 
     return 0;
 }
@@ -582,10 +596,14 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
     if (ret < 0 && dev->bus != 0)
         ret = pciTrySecondaryBusReset(conn, dev);
 
-    if (ret < 0)
+    if (ret < 0) {
+        virErrorPtr err = virGetLastError();
         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                       _("No PCI reset capability available for %s"),
-                       dev->name);
+                       _("Unable to reset PCI device %s: %s"),
+                       dev->name,
+                       err ? err->message : _("no FLR, PM reset or bus reset available"));
+    }
+
     return ret;
 }
 
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 4ce7a54..fd39fc2 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1465,9 +1465,9 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
             continue;
         }
 
-        if (pciDettachDevice(conn, dev) < 0) {
+        if (pciReAttachDevice(conn, dev) < 0) {
             virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
+            VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
                       err ? err->message : "");
             virResetError(err);
         }
-- 
1.6.2.5


libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch:
 qemu_driver.c |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch ---
>From 8f26acc66ca90eea67fd5e84be5a76e3b8aa7fbf Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 14 Aug 2009 08:31:11 +0100
Subject: [PATCH] Reset and re-attach PCI host devices on guest shutdown

https://bugzilla.redhat.com/499561

When the guest shuts down, we should attempt to restore all PCI host
devices to a sane state.

In the case of managed hostdevs, we should reset and re-attach the
devices. In the case of unmanaged hostdevs, we should just reset them.

Note, KVM will already reset assigned devices when the guest shuts
down using whatever means it can, so we are only doing it to cover the
cases the kernel can't handle.

* src/qemu_driver.c: add qemuDomainReAttachHostDevices() and call
  it from qemudShutdownVMDaemon()

(cherry picked from commit 4035152a8767e72fd4e26a91cb4d5afa75b72e61)

Fedora-patch: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
---
 src/qemu_driver.c |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 2c4fd6f..4ce7a54 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1402,6 +1402,80 @@ error:
     return -1;
 }
 
+static void
+qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
+{
+    int i;
+
+    /* Again 2 loops; reset all the devices before re-attach */
+
+    for (i = 0 ; i < def->nhostdevs ; i++) {
+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
+        pciDevice *dev;
+
+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+            continue;
+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+            continue;
+
+        dev = pciGetDevice(conn,
+                           hostdev->source.subsys.u.pci.domain,
+                           hostdev->source.subsys.u.pci.bus,
+                           hostdev->source.subsys.u.pci.slot,
+                           hostdev->source.subsys.u.pci.function);
+        if (!dev) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+            continue;
+        }
+
+        if (pciResetDevice(conn, dev) < 0) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+        }
+
+        pciFreeDevice(conn, dev);
+    }
+
+    for (i = 0 ; i < def->nhostdevs ; i++) {
+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
+        pciDevice *dev;
+
+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+            continue;
+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+            continue;
+        if (!hostdev->managed)
+            continue;
+
+        dev = pciGetDevice(conn,
+                           hostdev->source.subsys.u.pci.domain,
+                           hostdev->source.subsys.u.pci.bus,
+                           hostdev->source.subsys.u.pci.slot,
+                           hostdev->source.subsys.u.pci.function);
+        if (!dev) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+            continue;
+        }
+
+        if (pciDettachDevice(conn, dev) < 0) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
+                      err ? err->message : "");
+            virResetError(err);
+        }
+
+        pciFreeDevice(conn, dev);
+    }
+}
+
 static const char *const defaultDeviceACL[] = {
     "/dev/null", "/dev/full", "/dev/zero",
     "/dev/random", "/dev/urandom",
@@ -2109,6 +2183,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
         VIR_WARN("Failed to restore all device ownership for %s",
                  vm->def->name);
 
+    qemuDomainReAttachHostDevices(conn, vm->def);
+
 retry:
     if ((ret = qemuRemoveCgroup(conn, driver, vm)) < 0) {
         if (ret == -EBUSY && (retries++ < 5)) {
-- 
1.6.2.5


libvirt-0.6.4-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libvirt-0.6.4-svirt-sound.patch	17 Aug 2009 08:08:46 -0000	1.2
+++ libvirt-0.6.4-svirt-sound.patch	19 Aug 2009 16:26:27 -0000	1.3
@@ -1,4 +1,4 @@
-From f9355301cf4dda452308b616e8c00e59be5aec0a Mon Sep 17 00:00:00 2001
+From 1e99b2edee0eb3ca1c600e5bd5c55741cb95a29a Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 17 Aug 2009 08:32:08 +0100
 Subject: [PATCH] Disable sound cards when running sVirt


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- libvirt.spec	17 Aug 2009 08:08:46 -0000	1.170
+++ libvirt.spec	19 Aug 2009 16:26:27 -0000	1.171
@@ -96,6 +96,27 @@ Patch03: libvirt-0.7.0-policy-kit-rewrit
 # Log and ignore NUMA topology problems (rhbz #506590)
 Patch04: libvirt-0.7.0-numa-ignore-fail.patch
 
+# Minor 'virsh nodedev-list --tree' annoyance, fix from upstream
+Patch05: libvirt-add-space-to-nodedev-list-tree.patch
+
+# Fixes list corruption after disk hot-unplug
+Patch06: libvirt-fix-device-list-update-after-detach.patch
+
+# Re-attach PCI host devices after guest shuts down (bug #499561)
+Patch07: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
+
+# Allow PM reset on multi-function PCI devices (bug #515689)
+Patch08: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
+
+# Fix stupid PCI reset error message (#499678)
+Patch09: libvirt-improve-pci-hostdev-reset-error-message.patch
+
+# Allow PCI bus reset to reset other devices (#499678)
+Patch10: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
+
+# Add PCI host device hotplug support
+Patch11: libvirt-add-pci-hostdev-hotplug-support.patch
+
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
 Patch200: libvirt-0.6.4-svirt-sound.patch
@@ -281,6 +302,13 @@ of recent versions of Linux (and other O
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
+%patch05 -p1
+%patch06 -p1
+%patch07 -p1
+%patch08 -p1
+%patch09 -p1
+%patch10 -p1
+%patch11 -p1
 
 %patch200 -p1
 
@@ -649,6 +677,15 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-5
+- Add PCI host device hotplug support
+- Allow PCI bus reset to reset other devices (#499678)
+- Fix stupid PCI reset error message (bug #499678)
+- Allow PM reset on multi-function PCI devices (bug #515689)
+- Re-attach PCI host devices after guest shuts down (bug #499561)
+- Fix list corruption after disk hot-unplug
+- Fix minor 'virsh nodedev-list --tree' annoyance
+
 * Thu Aug 13 2009 Daniel P. Berrange <berrange at redhat.com> - 0.7.0-4
 - Rewrite policykit support (rhbz #499970)
 - Log and ignore NUMA topology problems (rhbz #506590)



From pkgdb at fedoraproject.org  Wed Aug 19 16:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 16:28:33 +0000
Subject: [pkgdb] gnome-user-share: tbzatek has requested commit
Message-ID: <20090819162833.5302C10F85A@bastion2.fedora.phx.redhat.com>

tbzatek has requested the commit acl on gnome-user-share (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-user-share



From pkgdb at fedoraproject.org  Wed Aug 19 16:28:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 16:28:46 +0000
Subject: [pkgdb] gnome-user-share: tbzatek has requested commit
Message-ID: <20090819162852.202C810F888@bastion2.fedora.phx.redhat.com>

tbzatek has requested the commit acl on gnome-user-share (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-user-share



From rhughes at fedoraproject.org  Wed Aug 19 16:28:42 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Wed, 19 Aug 2009 16:28:42 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.51, 1.52 PackageKit.spec, 1.110,
	1.111 sources, 1.52, 1.53
Message-ID: <20090819162842.35C0F11C00E4@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30263

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Wed Aug 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090819git
- Update to a git snapshot from the 0.5.x series.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	3 Aug 2009 11:35:40 -0000	1.51
+++ .cvsignore	19 Aug 2009 16:28:41 -0000	1.52
@@ -1 +1 @@
-PackageKit-0.5.1.tar.gz
+PackageKit-0.5.2-20090819.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- PackageKit.spec	3 Aug 2009 11:35:40 -0000	1.110
+++ PackageKit.spec	19 Aug 2009 16:28:42 -0000	1.111
@@ -3,20 +3,20 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090727
+%define alphatag			20090819
 
 %{!?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.1
-#Release:   0.1.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Version:   0.5.2
+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.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.
@@ -224,8 +224,8 @@ A simple helper that offers to install n
 using PackageKit.
 
 %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
 
@@ -419,6 +419,9 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed Aug 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090819git
+- Update to a git snapshot from the 0.5.x series.
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.1-1
 - New upstream version, many bugfixes and performance fixes
 - Fixes #491859, #513856, #510874, #513376, #472876, #514708 and #513557


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	3 Aug 2009 11:35:41 -0000	1.52
+++ sources	19 Aug 2009 16:28:42 -0000	1.53
@@ -1 +1 @@
-8575a23e406fffa8d11ba2ad4b5d99f3  PackageKit-0.5.1.tar.gz
+4be61177f1608e0c67e2dc53177fb170  PackageKit-0.5.2-20090819.tar.gz



From akurtakov at fedoraproject.org  Wed Aug 19 16:30:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 16:30:41 +0000 (UTC)
Subject: rpms/maven-wagon/devel wagon-1.0-wagon-webdav-pom_xml.patch, 1.1,
	1.2 wagon-1.0-http-shared-provider-build.xml, 1.1,
	1.2 wagon-1.0-wagon-ftp-pom_xml.patch, 1.1,
	1.2 wagon-1.0-site.xml, 1.1,
	1.2 wagon-1.0-wagon-http-lightweight-pom_xml.patch, 1.1,
	1.2 wagon-1.0-ssh-common-test-provider-build.xml, 1.1,
	1.2 wagon-1.0-ssh-external-provider-build.xml, 1.1,
	1.2 wagon-1.0-wagon-http-pom_xml.patch, 1.1,
	1.2 wagon-1.0-ssh-ganymed-provider-build.xml, 1.1,
	1.2 wagon-1.0-ssh-common-provider-build.xml, 1.1,
	1.2 wagon-1.0-ftp-provider-build.xml, 1.1,
	1.2 wagon-1.0-webdav-provider-build.xml, 1.1,
	1.2 wagon-1.0-file-provider-build.xml, 1.1,
	1.2 wagon-1.0-WebDavWagon.patch, 1.1,
	1.2 wagon-1.0-ServletServer.patch, 1.1,
	1.2 wagon-1.0-jpp-depmap.xml, 1.1,
	1.2 wagon-1.0-http-lightweight-provider-build.xml, 1.1,
	1.2 wagon-1.0-disable-webdav.patch, 1.1,
	1.2 wagon-1.0-provider-api-build.xml, 1.1,
	1.2 wagon-1.0-pom_xml.patch, 1.1,
	1.2 wagon-1.0-ssh-provider-build.xml, 1.1,
	1.2 wagon-1.0-provider-test-build.xml, 1.1,
	1.2 wagon-1.0-http-provider-build.xml, 1.1, 1.2 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 maven-wagon.spec, 1.7,
	1.8 wagon-1.0-alpha5-providers-ssh-external-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-providers-ftp-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-provider-api-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-provider-api-build.xml, 1.1,
	NONE wagon-1.0-alpha5-provider-test-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-providers-scm-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-providers-ssh-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-providers-ssh-build.xml, 1.1,
	NONE wagon-1.0-alpha5-providers-scm-build.xml, 1.1,
	NONE wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch,
	1.1, NONE wagon-1.0-alpha5-providers-http-lightweight-build.xml,
	1.1, NONE wagon-1.0-alpha5-providers-file-build.xml, 1.1,
	NONE wagon-1.0-alpha5-providers-http-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-providers-ssh-external-build.xml, 1.1,
	NONE wagon-1.0-alpha5-providers-http-build.xml, 1.1,
	NONE wagon-1.0-alpha5-providers-file-build_xml.patch, 1.1,
	NONE wagon-1.0-alpha5-provider-test-build.xml, 1.1,
	NONE wagon-1.0-alpha5-providers-ftp-build.xml, 1.1, NONE
Message-ID: <20090819163041.939E511C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-wagon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30670/devel

Modified Files:
	.cvsignore sources maven-wagon.spec 
Added Files:
	wagon-1.0-wagon-webdav-pom_xml.patch 
	wagon-1.0-http-shared-provider-build.xml 
	wagon-1.0-wagon-ftp-pom_xml.patch wagon-1.0-site.xml 
	wagon-1.0-wagon-http-lightweight-pom_xml.patch 
	wagon-1.0-ssh-common-test-provider-build.xml 
	wagon-1.0-ssh-external-provider-build.xml 
	wagon-1.0-wagon-http-pom_xml.patch 
	wagon-1.0-ssh-ganymed-provider-build.xml 
	wagon-1.0-ssh-common-provider-build.xml 
	wagon-1.0-ftp-provider-build.xml 
	wagon-1.0-webdav-provider-build.xml 
	wagon-1.0-file-provider-build.xml wagon-1.0-WebDavWagon.patch 
	wagon-1.0-ServletServer.patch wagon-1.0-jpp-depmap.xml 
	wagon-1.0-http-lightweight-provider-build.xml 
	wagon-1.0-disable-webdav.patch 
	wagon-1.0-provider-api-build.xml wagon-1.0-pom_xml.patch 
	wagon-1.0-ssh-provider-build.xml 
	wagon-1.0-provider-test-build.xml 
	wagon-1.0-http-provider-build.xml 
Removed Files:
	wagon-1.0-alpha5-providers-ssh-external-build_xml.patch 
	wagon-1.0-alpha5-providers-ftp-build_xml.patch 
	wagon-1.0-alpha5-provider-api-build_xml.patch 
	wagon-1.0-alpha5-provider-api-build.xml 
	wagon-1.0-alpha5-provider-test-build_xml.patch 
	wagon-1.0-alpha5-providers-scm-build_xml.patch 
	wagon-1.0-alpha5-providers-ssh-build_xml.patch 
	wagon-1.0-alpha5-providers-ssh-build.xml 
	wagon-1.0-alpha5-providers-scm-build.xml 
	wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch 
	wagon-1.0-alpha5-providers-http-lightweight-build.xml 
	wagon-1.0-alpha5-providers-file-build.xml 
	wagon-1.0-alpha5-providers-http-build_xml.patch 
	wagon-1.0-alpha5-providers-ssh-external-build.xml 
	wagon-1.0-alpha5-providers-http-build.xml 
	wagon-1.0-alpha5-providers-file-build_xml.patch 
	wagon-1.0-alpha5-provider-test-build.xml 
	wagon-1.0-alpha5-providers-ftp-build.xml 
Log Message:
- Update to beta2 - sync with jpackage.

wagon-1.0-wagon-webdav-pom_xml.patch:
 pom.xml |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

Index: wagon-1.0-wagon-webdav-pom_xml.patch
===================================================================
RCS file: wagon-1.0-wagon-webdav-pom_xml.patch
diff -N wagon-1.0-wagon-webdav-pom_xml.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-wagon-webdav-pom_xml.patch	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,23 @@
+--- wagon-providers/wagon-webdav/pom.xml.sav	2006-12-12 22:51:47.000000000 +0100
++++ wagon-providers/wagon-webdav/pom.xml	2007-03-12 17:51:47.000000000 +0100
+@@ -46,5 +46,20 @@
+       <version>4.2.12</version>
+       <scope>test</scope>
+     </dependency>
++    <dependency>
++      <groupId>commons-httpclient</groupId>
++      <artifactId>commons-httpclient</artifactId>
++      <version>3.0</version>
++    </dependency>
++    <dependency>
++      <groupId>jetty</groupId>
++      <artifactId>jetty</artifactId>
++      <version>4.2.10</version>
++    </dependency>
++    <dependency>
++      <groupId>servletapi</groupId>
++      <artifactId>servletapi</artifactId>
++      <version>2.3</version>
++    </dependency>
+   </dependencies>
+ </project>


Index: wagon-1.0-http-shared-provider-build.xml
===================================================================
RCS file: wagon-1.0-http-shared-provider-build.xml
diff -N wagon-1.0-http-shared-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-http-shared-provider-build.xml	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,111 @@
+<project name="wagon-http-shared" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-http-shared-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/jtidy/jtidy/4aug2000r7-dev"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon HTTP Provider Shared 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>

wagon-1.0-wagon-ftp-pom_xml.patch:
 pom.xml |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Index: wagon-1.0-wagon-ftp-pom_xml.patch
===================================================================
RCS file: wagon-1.0-wagon-ftp-pom_xml.patch
diff -N wagon-1.0-wagon-ftp-pom_xml.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-wagon-ftp-pom_xml.patch	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,20 @@
+--- wagon-providers/wagon-ftp/pom.xml.sav	2007-04-04 17:49:01.000000000 +0200
++++ wagon-providers/wagon-ftp/pom.xml	2007-04-04 17:50:04.000000000 +0200
+@@ -29,4 +29,15 @@
+       <scope>test</scope>
+     </dependency>
+   </dependencies>
+-</project>
+\ No newline at end of file
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-surefire-plugin</artifactId>
++        <configuration>
++          <skip>true</skip>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>


Index: wagon-1.0-site.xml
===================================================================
RCS file: wagon-1.0-site.xml
diff -N wagon-1.0-site.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-site.xml	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Wagon">
+  <bannerLeft>
+    <name>Wagon</name>
+    <src>http://maven.apache.org/maven2/images/apache-maven-project-2.png</src>
+    <href>http://maven.apache.org/wagon</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://maven.apache.org/maven2/images/maven-logo-2.gif</src>
+  </bannerRight>
+   <skin>
+     <groupId>org.apache.maven.skins</groupId>
+     <artifactId>maven-default-skin</artifactId>
+     <version>1.0</version>
+   </skin>
+  <body>
+
+    <links>
+      <item name="Apache" href="http://www.apache.org/"/>
+      <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
+      <item name="Maven 2.x" href="http://maven.apache.org/"/>
+      <item name="Continuum" href="http://maven.apache.org/continuum"/>
+      <item name="SCM" href="http://maven.apache.org/scm"/>
+      <item name="Wagon" href="http://maven.apache.org/wagon"/>
+      <item name="JXR" href="http://maven.apache.org/jxr"/>
+    </links>
+    <!--
+    <menu name="Quick Links">
+      <item name="Features" href="/maven-features.html"/>
+      <item name="Download" href="/download.html"/>
+    </menu>
+    -->
+
+    ${reports}
+  </body>
+</project>

wagon-1.0-wagon-http-lightweight-pom_xml.patch:
 pom.xml |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

Index: wagon-1.0-wagon-http-lightweight-pom_xml.patch
===================================================================
RCS file: wagon-1.0-wagon-http-lightweight-pom_xml.patch
diff -N wagon-1.0-wagon-http-lightweight-pom_xml.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-wagon-http-lightweight-pom_xml.patch	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,34 @@
+--- wagon-providers/wagon-http-lightweight/pom.xml.sav	2006-12-12 22:51:47.000000000 +0100
++++ wagon-providers/wagon-http-lightweight/pom.xml	2007-03-15 10:21:29.000000000 +0100
+@@ -19,9 +19,9 @@
+ 
+   <dependencies>
+     <dependency>
+-      <groupId>${pom.groupId}</groupId>
++      <groupId>org.apache.maven.wagon</groupId>
+       <artifactId>wagon-http-shared</artifactId>
+-      <version>${pom.version}</version>
++      <version>1.0-beta-2</version>
+     </dependency>
+     <dependency>
+       <groupId>xml-apis</groupId>
+@@ -40,5 +40,17 @@
+         </exclusion>
+       </exclusions>
+     </dependency>
++    <dependency>
++      <groupId>jetty</groupId>
++      <artifactId>jetty</artifactId>
++      <version>4.2.10</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>servletapi</groupId>
++      <artifactId>servletapi</artifactId>
++      <version>2.3</version>
++      <scope>test</scope>
++    </dependency>
+   </dependencies>
+-</project>
+\ No newline at end of file
++</project>


Index: wagon-1.0-ssh-common-test-provider-build.xml
===================================================================
RCS file: wagon-1.0-ssh-common-test-provider-build.xml
diff -N wagon-1.0-ssh-common-test-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ssh-common-test-provider-build.xml	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,106 @@
+<project name="wagon-ssh-common-test" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-ssh-common-test-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="classworlds/classworlds/1.4/classworlds-1.4.jar"/>
+      <include name="plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar"/>
+      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
+      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
+      <include name="org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar"/>
+      <include name="org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"/>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/classworlds/classworlds/1.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/plexus/plexus-utils/1.0.3"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/junit/junit/3.8.1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon SSH Provider Common Test 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-ssh-external-provider-build.xml
===================================================================
RCS file: wagon-1.0-ssh-external-provider-build.xml
diff -N wagon-1.0-ssh-external-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ssh-external-provider-build.xml	19 Aug 2009 16:30:38 -0000	1.2
@@ -0,0 +1,131 @@
+<project name="wagon-ssh-external" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-ssh-external-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="classworlds/classworlds/1.4/classworlds-1.4.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar"/>
+      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
+      <include name="org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar"/>
+      <include name="org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/classworlds/classworlds/1.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/plexus/plexus-utils/1.0.3"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon SSH Provider External 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>

wagon-1.0-wagon-http-pom_xml.patch:
 pom.xml |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

Index: wagon-1.0-wagon-http-pom_xml.patch
===================================================================
RCS file: wagon-1.0-wagon-http-pom_xml.patch
diff -N wagon-1.0-wagon-http-pom_xml.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-wagon-http-pom_xml.patch	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,34 @@
+--- wagon-providers/wagon-http/pom.xml.sav	2006-12-12 22:51:47.000000000 +0100
++++ wagon-providers/wagon-http/pom.xml	2007-03-15 10:23:14.000000000 +0100
+@@ -18,9 +18,9 @@
+ 
+   <dependencies>
+     <dependency>
+-      <groupId>${pom.groupId}</groupId>
++      <groupId>org.apache.maven.wagon</groupId>
+       <artifactId>wagon-http-shared</artifactId>
+-      <version>${pom.version}</version>
++      <version>1.0-beta-2</version>
+     </dependency>
+     <dependency>
+       <groupId>plexus</groupId>
+@@ -45,5 +45,17 @@
+       <artifactId>commons-httpclient</artifactId>
+       <version>2.0.2</version>
+     </dependency>
++    <dependency>
++      <groupId>jetty</groupId>
++      <artifactId>jetty</artifactId>
++      <version>4.2.10</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>servletapi</groupId>
++      <artifactId>servletapi</artifactId>
++      <version>2.3</version>
++      <scope>test</scope>
++    </dependency>
+   </dependencies>
+-</project>
+\ No newline at end of file
++</project>


Index: wagon-1.0-ssh-ganymed-provider-build.xml
===================================================================
RCS file: wagon-1.0-ssh-ganymed-provider-build.xml
diff -N wagon-1.0-ssh-ganymed-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ssh-ganymed-provider-build.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,136 @@
+<project name="wagon-ssh-ganymed" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-ssh-ganymed-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="classworlds/classworlds/1.4/classworlds-1.4.jar"/>
+      <include name="plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar"/>
+      <include name="ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar"/>
+      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
+      <include name="org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar"/>
+      <include name="org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="false" haltonfailure="false" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/classworlds/classworlds/1.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/plexus/plexus-utils/1.0.3"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/ch/ethz/ganymed/ganymed-ssh2/210"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar" dest="${maven.repo.local}/ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar" dest="${maven.repo.local}/ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar" dest="${maven.repo.local}/ch/ethz/ganymed/ganymed-ssh2/210/ganymed-ssh2-210.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon SSH Provider Ganymed 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-ssh-common-provider-build.xml
===================================================================
RCS file: wagon-1.0-ssh-common-provider-build.xml
diff -N wagon-1.0-ssh-common-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ssh-common-provider-build.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,126 @@
+<project name="wagon-ssh-common" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-ssh-common-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="classworlds/classworlds/1.4/classworlds-1.4.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar"/>
+      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
+      <include name="org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/classworlds/classworlds/1.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/plexus/plexus-utils/1.0.3"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon SSH Provider Common 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-ftp-provider-build.xml
===================================================================
RCS file: wagon-1.0-ftp-provider-build.xml
diff -N wagon-1.0-ftp-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ftp-provider-build.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,120 @@
+<project name="wagon-ftp" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-ftp-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="commons-net/commons-net/1.1.0/commons-net-1.1.0.jar"/>
+      <include name="oro/oro/2.0.7/oro-2.0.7.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="false" haltonfailure="false" fork="true" dir=".">
+      <jvmarg value="-Xmx128m"/>
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/commons-net/commons-net/1.1.0"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/commons-net/commons-net/1.1.0/commons-net-1.1.0.jar" dest="${maven.repo.local}/commons-net/commons-net/1.1.0/commons-net-1.1.0.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/commons-net/commons-net/1.1.0/commons-net-1.1.0.jar" dest="${maven.repo.local}/commons-net/commons-net/1.1.0/commons-net-1.1.0.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/commons-net/commons-net/1.1.0/commons-net-1.1.0.jar" dest="${maven.repo.local}/commons-net/commons-net/1.1.0/commons-net-1.1.0.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/oro/oro/2.0.7"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/oro/oro/2.0.7/oro-2.0.7.jar" dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/oro/oro/2.0.7/oro-2.0.7.jar" dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/oro/oro/2.0.7/oro-2.0.7.jar" dest="${maven.repo.local}/oro/oro/2.0.7/oro-2.0.7.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon FTP Provider 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-webdav-provider-build.xml
===================================================================
RCS file: wagon-1.0-webdav-provider-build.xml
diff -N wagon-1.0-webdav-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-webdav-provider-build.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,134 @@
+<project name="wagon-webdav" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-webdav-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="slide/slide-webdavlib/1/slide-webdavlib-1.jar"/>
+      <include name="servletapi/servletapi/2.4/servletapi-2.4.jar"/>
+      <include name="commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+      <include name="jetty/jetty/5.1.11/jetty-5.1.11.jar"/>
+      <include name="commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="false" haltonfailure="false" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/slide/slide-webdavlib/1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/slide/slide-webdavlib/1/slide-webdavlib-1.jar" dest="${maven.repo.local}/slide/slide-webdavlib/1/slide-webdavlib-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/slide/slide-webdavlib/1/slide-webdavlib-1.jar" dest="${maven.repo.local}/slide/slide-webdavlib/1/slide-webdavlib-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/slide/slide-webdavlib/1/slide-webdavlib-1.jar" dest="${maven.repo.local}/slide/slide-webdavlib/1/slide-webdavlib-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/servletapi/servletapi/2.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/commons-logging/commons-logging/1.0.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/jetty/jetty/5.1.11"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/commons-httpclient/commons-httpclient/3.0.1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon WebDAV Provider 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-file-provider-build.xml
===================================================================
RCS file: wagon-1.0-file-provider-build.xml
diff -N wagon-1.0-file-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-file-provider-build.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,106 @@
+<project name="wagon-file" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-file-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon File Provider 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>

wagon-1.0-WebDavWagon.patch:
 WebDavWagon.java |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Index: wagon-1.0-WebDavWagon.patch
===================================================================
RCS file: wagon-1.0-WebDavWagon.patch
diff -N wagon-1.0-WebDavWagon.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-WebDavWagon.patch	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,18 @@
+--- wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java.sav	2006-06-13 00:14:37.000000000 +0200
++++ wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java	2006-12-08 17:07:57.000000000 +0100
+@@ -138,13 +138,9 @@
+             throw new ConnectionException( "Connection Exception: " + url + " " + he.getReasonCode() + " "
+                 + HttpStatus.getStatusText( he.getReasonCode() ), he );
+         }
+-        catch ( URIException urie )
++        catch ( Exception e )
+         {
+-            throw new ConnectionException( "Connection Exception: " + urie.getReason(), urie );
+-        }
+-        catch ( IOException ioe )
+-        {
+-            throw new ConnectionException( "Connection Exception: " + ioe.getMessage(), ioe );
++            throw new ConnectionException( "Connection Exception: " , e );
+         }
+     }
+ 

wagon-1.0-ServletServer.patch:
 ServletServer.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: wagon-1.0-ServletServer.patch
===================================================================
RCS file: wagon-1.0-ServletServer.patch
diff -N wagon-1.0-ServletServer.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ServletServer.patch	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,11 @@
+--- wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/ServletServer.java.sav	2006-12-09 10:14:44.000000000 +0100
++++ wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/ServletServer.java	2006-12-09 10:15:17.000000000 +0100
+@@ -128,7 +128,7 @@
+         {
+             server.start();
+         }
+-        catch ( MultiException e )
++        catch ( Exception e )
+         {
+             throw new StartingException( "Error starting the jetty webdav server: ", e );
+         }


Index: wagon-1.0-jpp-depmap.xml
===================================================================
RCS file: wagon-1.0-jpp-depmap.xml
diff -N wagon-1.0-jpp-depmap.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-jpp-depmap.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,271 @@
+<dependencies>
+  <dependency>
+	<maven>
+	  <groupId>org.codehaus.plexus</groupId>
+	  <artifactId>plexus-ftpd</artifactId>
+	  <version>1.0-alpha-1</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/plexus</groupId>
+	  <artifactId>ftpd</artifactId>
+	  <version>1.0-alpha-1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>plexus</groupId>
+	  <artifactId>plexus-jetty-httpd</artifactId>
+	  <version>1.0-beta-1</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/plexus</groupId>
+	  <artifactId>jetty-httpd</artifactId>
+	  <version>1.0-beta-2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>servletapi</groupId>
+	  <artifactId>servletapi</artifactId>
+	  <version>2.3</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>servletapi5</artifactId>
+	  <version>2.4</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>ch.ethz.ganymed</groupId>
+	  <artifactId>ganymed-ssh2</artifactId>
+	  <version>build210</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>ganymed-ssh2</artifactId>
+	  <version>210</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>commons-httpclient</groupId>
+	  <artifactId>commons-httpclient</artifactId>
+	  <version>3.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>commons-httpclient</artifactId>
+	  <version>3.0.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>it.could</groupId>
+	  <artifactId>webdav</artifactId>
+	  <version>0.4</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>it-could-webdav</artifactId>
+	  <version>0.4</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.apache.maven.skins</groupId>
+	  <artifactId>maven-default-skin</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/maven2</groupId>
+	  <artifactId>default-skin</artifactId>
+	  <version>1.0</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>avalon</groupId>
+	  <artifactId>avalon-framework</artifactId>
+	  <version>4.1.4</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>avalon-framework</artifactId>
+	  <version>4.3.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>cornerstone-sockets</groupId>
+	  <artifactId>cornerstone-sockets-api</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>cornerstone-sockets-api</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>cornerstone-threads</groupId>
+	  <artifactId>cornerstone-threads-api</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>cornerstone-threads-api</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>cornerstone-threads</groupId>
+	  <artifactId>cornerstone-threads-impl</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>cornerstone-threads-impl</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>excalibur-pool</groupId>
+	  <artifactId>excalibur-pool-api</artifactId>
+	  <version>2.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>excalibur-pool-api</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>cornerstone-sockets</groupId>
+	  <artifactId>cornerstone-sockets-impl</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>cornerstone-sockets-impl</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>excalibur-thread</groupId>
+	  <artifactId>excalibur-thread-api</artifactId>
+	  <version>1.1.1</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>excalibur-thread-api</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>concurrent</groupId>
+	  <artifactId>concurrent</artifactId>
+	  <version>1.3.4</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>concurrent</artifactId>
+	  <version>1.3.4</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>excalibur-pool</groupId>
+	  <artifactId>excalibur-pool-impl</artifactId>
+	  <version>2.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>excalibur-pool-impl</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>excalibur-thread</groupId>
+	  <artifactId>excalibur-thread-impl</artifactId>
+	  <version>1.1.1</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>excalibur-thread-impl</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>cornerstone-connection</groupId>
+	  <artifactId>cornerstone-connection-api</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>cornerstone-connection-api</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>plexus</groupId>
+	  <artifactId>plexus-container-default</artifactId>
+	  <version>1.0-alpha-9</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/plexus</groupId>
+	  <artifactId>container-default</artifactId>
+	  <version>1.0</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>cornerstone-connection</groupId>
+	  <artifactId>cornerstone-connection-impl</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/excalibur</groupId>
+	  <artifactId>cornerstone-connection-impl</artifactId>
+	  <version>2.2.1</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+    <maven>
+      <artifactId>plexus-ftpd</artifactId>
+      <groupId>org.codehaus.plexus</groupId>
+      <version>1.0-alpha-1</version>
+    </maven>
+  </dependency>
+  <dependency>
+    <maven>
+      <artifactId>jetty</artifactId>
+      <groupId>jetty</groupId>
+      <version>4.2.10</version>
+    </maven>
+  </dependency>
+  <dependency>
+    <maven>
+      <artifactId>plexus-jetty-httpd</artifactId>
+      <groupId>plexus</groupId>
+      <version>1.0-beta-1</version>
+    </maven>
+  </dependency>
+  <dependency>
+    <maven>
+      <groupId>slide</groupId>
+      <artifactId>slide-webdavlib</artifactId>
+      <version>2.1</version>
+    </maven>
+  </dependency>
+</dependencies>


Index: wagon-1.0-http-lightweight-provider-build.xml
===================================================================
RCS file: wagon-1.0-http-lightweight-provider-build.xml
diff -N wagon-1.0-http-lightweight-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-http-lightweight-provider-build.xml	19 Aug 2009 16:30:39 -0000	1.2
@@ -0,0 +1,134 @@
+<project name="wagon-http-lightweight" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-http-lightweight-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="servletapi/servletapi/2.4/servletapi-2.4.jar"/>
+      <include name="org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar"/>
+      <include name="jetty/jetty/5.1.11/jetty-5.1.11.jar"/>
+      <include name="xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/jtidy/jtidy/4aug2000r7-dev"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/servletapi/servletapi/2.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/jetty/jetty/5.1.11"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/xml-apis/xml-apis/2.0.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" dest="${maven.repo.local}/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon HTTP Lightweight Provider 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>

wagon-1.0-disable-webdav.patch:
 pom.xml |    2 ++
 1 file changed, 2 insertions(+)

Index: wagon-1.0-disable-webdav.patch
===================================================================
RCS file: wagon-1.0-disable-webdav.patch
diff -N wagon-1.0-disable-webdav.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-disable-webdav.patch	19 Aug 2009 16:30:40 -0000	1.2
@@ -0,0 +1,13 @@
+diff -up ./wagon-providers/pom.xml.sav ./wagon-providers/pom.xml
+--- ./wagon-providers/pom.xml.sav	2006-12-12 16:51:47.000000000 -0500
++++ ./wagon-providers/pom.xml	2008-11-25 23:54:54.000000000 -0500
+@@ -20,7 +20,9 @@
+     <module>wagon-ssh-common-test</module>
+     <module>wagon-ssh</module>
+     <module>wagon-ssh-ganymed</module>
++<!--
+     <module>wagon-webdav</module>
++-->
+   </modules>
+   <dependencyManagement>
+     <dependencies>


Index: wagon-1.0-provider-api-build.xml
===================================================================
RCS file: wagon-1.0-provider-api-build.xml
diff -N wagon-1.0-provider-api-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-provider-api-build.xml	19 Aug 2009 16:30:40 -0000	1.2
@@ -0,0 +1,101 @@
+<project name="wagon-provider-api" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-provider-api-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>

wagon-1.0-pom_xml.patch:
 pom.xml |    1 +
 1 file changed, 1 insertion(+)

Index: wagon-1.0-pom_xml.patch
===================================================================
RCS file: wagon-1.0-pom_xml.patch
diff -N wagon-1.0-pom_xml.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-pom_xml.patch	19 Aug 2009 16:30:40 -0000	1.2
@@ -0,0 +1,10 @@
+--- pom.xml.sav	2007-03-13 16:07:47.000000000 +0100
++++ pom.xml	2007-03-13 16:08:10.000000000 +0100
+@@ -72,6 +72,7 @@
+     <module>wagon-provider-api</module>
+     <module>wagon-provider-test</module>
+     <module>wagon-providers</module>
++    <module>wagon-site</module>
+   </modules>
+   <dependencies>
+     <dependency>


Index: wagon-1.0-ssh-provider-build.xml
===================================================================
RCS file: wagon-1.0-ssh-provider-build.xml
diff -N wagon-1.0-ssh-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-ssh-provider-build.xml	19 Aug 2009 16:30:40 -0000	1.2
@@ -0,0 +1,139 @@
+<project name="wagon-ssh" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-ssh-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="classworlds/classworlds/1.4/classworlds-1.4.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar"/>
+      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
+      <include name="com/jcraft/jsch/0.1.24/jsch-0.1.24.jar"/>
+      <include name="org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar"/>
+      <include name="org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="false" haltonfailure="false" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/classworlds/classworlds/1.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/plexus/plexus-utils/1.0.3"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" dest="${maven.repo.local}/plexus/plexus-utils/1.0.3/plexus-utils-1.0.3.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/com/jcraft/jsch/0.1.24"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" dest="${maven.repo.local}/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-1/plexus-interactivity-api-1.0-alpha-1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon SSH Provider 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-provider-test-build.xml
===================================================================
RCS file: wagon-1.0-provider-test-build.xml
diff -N wagon-1.0-provider-test-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-provider-test-build.xml	19 Aug 2009 16:30:40 -0000	1.2
@@ -0,0 +1,91 @@
+<project name="wagon-provider-test" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-provider-test-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="classworlds/classworlds/1.4/classworlds-1.4.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
+      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"/>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/classworlds/classworlds/1.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/junit/junit/3.8.1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon Test 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: wagon-1.0-http-provider-build.xml
===================================================================
RCS file: wagon-1.0-http-provider-build.xml
diff -N wagon-1.0-http-provider-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wagon-1.0-http-provider-build.xml	19 Aug 2009 16:30:40 -0000	1.2
@@ -0,0 +1,139 @@
+<project name="wagon-http" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="wagon-http-1.0-beta-2"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar"/>
+      <include name="commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+      <include name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
+      <include name="servletapi/servletapi/2.4/servletapi-2.4.jar"/>
+      <include name="org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar"/>
+      <include name="jetty/jetty/5.1.11/jetty-5.1.11.jar"/>
+      <include name="commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
+      <include name="org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/jtidy/jtidy/4aug2000r7-dev"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" dest="${maven.repo.local}/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/commons-logging/commons-logging/1.0.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/codehaus/plexus/plexus-utils/1.2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/servletapi/servletapi/2.4"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/servletapi/servletapi/2.4/servletapi-2.4.jar" dest="${maven.repo.local}/servletapi/servletapi/2.4/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/jetty/jetty/5.1.11"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/jetty/jetty/5.1.11/jetty-5.1.11.jar" dest="${maven.repo.local}/jetty/jetty/5.1.11/jetty-5.1.11.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/commons-httpclient/commons-httpclient/3.0.1"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" dest="${maven.repo.local}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/wagon-1.0-beta-2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6"/>
+    <get src="http://svn.apache.org/maven-snapshot-repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="file:///usr/share/maven2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" dest="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="target/site/apidocs">
+    </mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Maven Wagon HTTP Provider 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="target/site/apidocs" author="true" version="true" sourcepath="src/main/java" packagenames="org.apache.maven.wagon.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-wagon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Mar 2007 19:48:51 -0000	1.2
+++ .cvsignore	19 Aug 2009 16:30:38 -0000	1.3
@@ -1 +1,2 @@
 wagon-1.0-alpha-5-src.tar.gz
+wagon-1.0-beta-2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-wagon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Mar 2007 19:48:51 -0000	1.2
+++ sources	19 Aug 2009 16:30:40 -0000	1.3
@@ -1 +1 @@
-6713a6f7329e35958d2b339e372b7424  wagon-1.0-alpha-5-src.tar.gz
+d00d2cf71f010f238da1e175398f762c  wagon-1.0-beta-2-src.tar.gz


Index: maven-wagon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-wagon/devel/maven-wagon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- maven-wagon.spec	25 Jul 2009 11:51:52 -0000	1.7
+++ maven-wagon.spec	19 Aug 2009 16:30:40 -0000	1.8
@@ -1,101 +1,147 @@
-# Needs to be re-enabled when spec files starts building with maven2
-## If you don't want to build with maven, and use straight ant instead,
-## give rpmbuild option '--without maven'
+# Copyright (c) 2000-2007, JPackage Project
+# All rights reserved.
 #
-#%define _without_maven 1
-#%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-#%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven 0
+%define without_maven 1
+
+%define bname     wagon
+%define blevel    beta-2
 
 %define bname     wagon
 
 # FIXME1: wagon-scm has been disabled for now due to maven-scm dependency
-# FIXME2: haltOnFailure/Error has been set to false for 
+# FIXME2: haltOnFailure/Error has been set to false for
 # wagon-http/wagon-ssh-external tests due to failures.
 # FIXME3: Change spec file to build with maven2
 # FIXME4: Add javadoc options ant build
 
 Name:           maven-%{bname}
 Version:        1.0
-Release:        0.3.a5.3.5%{?dist}
+Release:        0.2.b2.6%{?dist}
 Epoch:          0
 Summary:        Tools to manage artifacts and deployment
 License:        ASL 2.0
 Group:          Development/Java
 URL:            http://maven.apache.org/wagon
-Source0:        wagon-1.0-alpha-5-src.tar.gz
-# svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-alpha-5/
-# tar czvf wagon-1.0-alpha-5-src.tar.gz wagon-1.0-alpha-5
-
-# The following sources (1-17) were generated by running the maven2 ant task
+Source0:        wagon-1.0-%{blevel}-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-2/
+# tar czvf wagon-1.0-beta-2-src.tar.gz wagon-1.0-beta-2
+
+Source1:        wagon-1.0-jpp-depmap.xml
+Source2:        wagon-1.0-site.xml
+# The following sources (3-15) were generated by running the maven2 ant task
 # inside the root directory of Source0: "mvn ant:ant"
-Source1:        wagon-1.0-alpha5-provider-api-build.xml
-Source3:        wagon-1.0-alpha5-provider-test-build.xml
-Source5:        wagon-1.0-alpha5-providers-file-build.xml
-Source7:        wagon-1.0-alpha5-providers-ftp-build.xml
-Source9:        wagon-1.0-alpha5-providers-http-build.xml
-Source11:       wagon-1.0-alpha5-providers-http-lightweight-build.xml
-Source13:       wagon-1.0-alpha5-providers-scm-build.xml
-Source15:       wagon-1.0-alpha5-providers-ssh-build.xml
-Source17:       wagon-1.0-alpha5-providers-ssh-external-build.xml
-
-Patch0:         wagon-1.0-provider-api-index.patch
-Patch1:         wagon-1.0-FtpWagon.patch
-Patch2:         wagon-1.0-ScmWagon.patch
-Patch3:         wagon-1.0-TraditionalUIKeyboardInteractive.patch
-Patch4:         maven-wagon-AbstractSshWagon.patch
-
-Patch5:         wagon-1.0-alpha5-provider-api-build_xml.patch
-Patch6:         wagon-1.0-alpha5-providers-file-build_xml.patch
-Patch7:         wagon-1.0-alpha5-providers-ftp-build_xml.patch
-Patch8:         wagon-1.0-alpha5-providers-http-build_xml.patch
-Patch9:         wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch
-Patch10:        wagon-1.0-alpha5-providers-scm-build_xml.patch
-Patch11:        wagon-1.0-alpha5-providers-ssh-build_xml.patch
-Patch12:        wagon-1.0-alpha5-providers-ssh-external-build_xml.patch
-Patch13:        wagon-1.0-alpha5-provider-test-build_xml.patch
-Patch14:	maven-wagon-jsch.patch
+Source3:        wagon-1.0-file-provider-build.xml
+Source4:        wagon-1.0-ftp-provider-build.xml
+Source5:        wagon-1.0-http-lightweight-provider-build.xml
+Source6:        wagon-1.0-http-provider-build.xml
+Source7:        wagon-1.0-http-shared-provider-build.xml
+Source8:        wagon-1.0-provider-api-build.xml
+Source9:        wagon-1.0-provider-test-build.xml
+Source10:       wagon-1.0-ssh-common-provider-build.xml
+Source11:       wagon-1.0-ssh-common-test-provider-build.xml
+Source12:       wagon-1.0-ssh-external-provider-build.xml
+Source13:       wagon-1.0-ssh-ganymed-provider-build.xml
+Source14:       wagon-1.0-ssh-provider-build.xml
+Source15:       wagon-1.0-webdav-provider-build.xml
+
+Patch0:         wagon-1.0-wagon-http-lightweight-pom_xml.patch
+Patch1:         wagon-1.0-wagon-http-pom_xml.patch
+Patch2:         wagon-1.0-wagon-webdav-pom_xml.patch
+Patch3:         wagon-1.0-WebDavWagon.patch
+Patch4:         wagon-1.0-ServletServer.patch
+Patch5:         wagon-1.0-pom_xml.patch
+Patch6:         wagon-1.0-wagon-ftp-pom_xml.patch
+Patch7:         wagon-1.0-disable-webdav.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant
+%endif
+BuildRequires:  jpackage-utils >= 0:1.7.2
+BuildRequires:  ant >= 0:1.6
 BuildRequires:  junit
+%if %{with_maven}
+BuildRequires:  maven2 >= 0:2.0.8
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-project-info-reports
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-site
+BuildRequires:  maven2-plugin-surefire = 2.3
+BuildRequires:  maven-surefire-provider-junit = 2.3
+BuildRequires:  maven2-default-skin
+%endif
 BuildRequires:  classworlds
 BuildRequires:  concurrent
-BuildRequires:  jakarta-commons-net
+BuildRequires:  ganymed-ssh2
 BuildRequires:  jakarta-commons-codec
 BuildRequires:  jakarta-commons-collections
+BuildRequires:  jakarta-commons-net
 BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  jakarta-commons-logging
-BuildRequires:  jsch >= 0:0.1.31-2jpp.3
-BuildRequires:  oro
+#BuildRequires:  jakarta-slide-webdavclient
+BuildRequires:  jsch
+BuildRequires:  jtidy
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-interactivity
 BuildRequires:  plexus-utils
 BuildRequires:  servletapi5
-BuildRequires:  jline
-
-# Commented until wagon-scm subproject can be built.
-#BuildRequires:  excalibur-avalon-framework-api
-#BuildRequires:  excalibur-avalon-framework-impl
-#BuildRequires:  excalibur-cornerstone-connection-api
-#BuildRequires:  excalibur-cornerstone-connection-impl
-#BuildRequires:  excalibur-cornerstone-sockets-api
-#BuildRequires:  excalibur-cornerstone-sockets-impl
-#BuildRequires:  excalibur-cornerstone-threads-api
-#BuildRequires:  excalibur-cornerstone-threads-impl
-#BuildRequires:  excalibur-pool-api
-#BuildRequires:  excalibur-pool-impl
-#BuildRequires:  excalibur-thread-api
-#BuildRequires:  excalibur-thread-impl
-#BuildRequires:  maven-scm
-#BuildRequires:  plexus-avalon-personality
-#BuildRequires:  plexus-ftpd
-#BuildRequires:  plexus-jetty-httpd
+BuildRequires:  xml-commons-apis
+%if %{gcj_support}
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+
+Requires:       ganymed-ssh2
+Requires:       jakarta-commons-httpclient
+Requires:       jakarta-commons-net
+#Requires:       jakarta-slide-webdavclient
+Requires:       jsch
+Requires:       jtidy
+Requires:       plexus-interactivity
+Requires:       plexus-utils
+Requires:       xml-commons-apis
 
 %description
-Maven Wagon is a transport abstraction that is used in Maven's 
-artifact and repository handling code. Currently wagon has the 
+Maven Wagon is a transport abstraction that is used in Maven's
+artifact and repository handling code. Currently wagon has the
 following providers:
 * File
 * HTTP
@@ -103,301 +149,421 @@ following providers:
 * SSH/SCP
 * WebDAV (in progress)
 
-# Needs to be re-enabled when spec files starts building with maven2
-#%package javadoc
-#Summary:        Javadoc for %{name}
-#Group:          Development/Documentation
-#
-#%description javadoc
-#Javadoc for %{name}.
-#
-#%if %{with_maven}
-#%package manual
-#Summary:        Documents for %{name}
-#Group:          Development/Documentation
-
-#%description manual
-#Documents for %{name}.
-#%endif
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
+
+%description javadoc
+Javadoc for %{name}.
+
+%if %{with_maven}
+%package manual
+Summary:        Documents for %{name}
+Group:          Development/Documentation
+
+%description manual
+Documents for %{name}.
+%endif
 
 %prep
-%setup -q -n %{bname}-%{version}-alpha-5
-cp %{SOURCE1} wagon-provider-api/build.xml
-cp %{SOURCE3} wagon-provider-test/build.xml
-cp %{SOURCE5} wagon-providers/wagon-file/build.xml
-cp %{SOURCE7} wagon-providers/wagon-ftp/build.xml
-cp %{SOURCE9} wagon-providers/wagon-http/build.xml
-cp %{SOURCE11} wagon-providers/wagon-http-lightweight/build.xml
-cp %{SOURCE13} wagon-providers/wagon-scm/build.xml
-cp %{SOURCE15} wagon-providers/wagon-ssh/build.xml
-cp %{SOURCE17} wagon-providers/wagon-ssh-external/build.xml
+%setup -q -n %{bname}-%{version}-%{blevel}
+cp %{SOURCE3} wagon-providers/wagon-file/build.xml
+cp %{SOURCE4} wagon-providers/wagon-ftp/build.xml
+cp %{SOURCE5} wagon-providers/wagon-http-lightweight/build.xml
+cp %{SOURCE6} wagon-providers/wagon-http/build.xml
+cp %{SOURCE7} wagon-providers/wagon-http-shared/build.xml
+cp %{SOURCE8} wagon-provider-api/build.xml
+cp %{SOURCE9} wagon-provider-test/build.xml
+cp %{SOURCE10} wagon-providers/wagon-ssh-common/build.xml
+cp %{SOURCE11} wagon-providers/wagon-ssh-common-test/build.xml
+cp %{SOURCE12} wagon-providers/wagon-ssh-external/build.xml
+cp %{SOURCE13} wagon-providers/wagon-ssh-ganymed/build.xml
+cp %{SOURCE14} wagon-providers/wagon-ssh/build.xml
+cp %{SOURCE15} wagon-providers/wagon-webdav/build.xml
+
+# FIXME: the following should not be necessary with a newer site-plugin
+mkdir -p src/site
+cp %{SOURCE2} src/site/site.xml
+cp %{SOURCE2} wagon-provider-api/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-file/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-ftp/src/site/site.xml
+mkdir -p wagon-providers/wagon-http-shared/src/site
+cp %{SOURCE2} wagon-providers/wagon-http-shared/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-http-lightweight/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-http/src/site/site.xml
+mkdir -p wagon-providers/wagon-ssh-common/src/site
+cp %{SOURCE2} wagon-providers/wagon-ssh-common/src/site/site.xml
+mkdir -p wagon-providers/wagon-ssh-common-test/src/site
+cp %{SOURCE2} wagon-providers/wagon-ssh-common-test/src/site/site.xml
+mkdir -p wagon-providers/wagon-ssh-ganymed/src/site
+cp %{SOURCE2} wagon-providers/wagon-ssh-ganymed/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-ssh-external/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-ssh/src/site/site.xml
+cp %{SOURCE2} wagon-providers/wagon-webdav/src/site/site.xml
+cp %{SOURCE2} wagon-provider-test/src/site/site.xml
+cp %{SOURCE2} wagon-site/src/site/site.xml
+
 
 %patch0 -b .sav
 %patch1 -b .sav
 %patch2 -b .sav
 %patch3 -b .sav
 %patch4 -b .sav
-
 %patch5 -b .sav
 %patch6 -b .sav
 %patch7 -b .sav
-%patch8 -b .sav
-%patch9 -b .sav
-%patch10 -b .sav
-%patch11 -b .sav
-%patch12 -b .sav
-%patch13 -b .sav
-%patch14 -b .sav
+
+# To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement
+rm -f wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
+rm -f wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
+rm -f wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonGzipTest.java
+rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
+rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonGzipTest.java
 
 %build
+%if %{with_maven}
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+        -e \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+        -Dmaven.test.failure.ignore=true \
+        -Dmaven.test.skip=true \
+        install javadoc:javadoc
+
+%else
+
 pushd wagon-provider-api
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/utils
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc
+export CLASSPATH=$(build-classpath plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
 pushd wagon-provider-test
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils junit
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc
+export CLASSPATH=../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath plexus/container-default plexus/utils junit)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
 pushd wagon-providers/wagon-file
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds
-ant  -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
-pushd wagon-providers/wagon-http-lightweight
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY
-# We don't ship Jetty
-# so we removed 'jetty4' and 'plexus/jetty-httpd' from the list below
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds servletapi5
-
-# Since we don't ship jetty, we also need to remove tests that need it
-rm -f src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
-
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc
+pushd wagon-providers/wagon-ftp
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds concurrent commons-collections commons-net \
+plexus/container-default \
+plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
-# commented until wagon-scm can be built
-#pushd wagon-providers/wagon-scm
-#%if %{with_maven}
-#maven \
-#        -Dmaven.repo.remote=file:/usr/share/maven-1.0/repository \
-#        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-#        jar:install javadoc
-#%else
-#mkdir -p target/lib
-#cp ../../wagon-provider-api/target/wagon-provider-api*.jar target/lib
-#cp ../../wagon-provider-test/target/wagon-provider-test*.jar target/lib
-#build-jar-repository -s -p target/lib plexus/container-default plexus/utils classworlds \
-#maven-scm/api \
-#maven-scm/test \
-#maven-scm/manager-plexus \
-#maven-scm/provider-cvs \
-#maven-scm/provider-svn \
+pushd wagon-providers/wagon-http-shared
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath jtidy plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
+popd
 
-#ant jar javadoc
-#%endif
-#popd
+pushd wagon-providers/wagon-http-lightweight
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils commons-logging servletapi5)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
+popd
 
-pushd wagon-providers/wagon-ssh-external
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds
-export ANT_OPTS="-Dtest.host=$(hostname)"
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY -Dtest.host=$(hostname) jar #javadoc
+pushd wagon-providers/wagon-http
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils commons-codec commons-httpclient commons-logging servletapi5)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
-pushd wagon-providers/wagon-ssh
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds \
-plexus/interactivity-api plexus/interactivity-jline jsch jline
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY -Dtest.host=$(hostname) jar #javadoc
+pushd wagon-providers/wagon-ssh-common
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath plexus/interactivity-api plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
-pushd wagon-providers/wagon-http
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY
-# We don't ship Jetty
-# so we removed 'jetty4' and 'plexus/jetty-httpd' from the list below
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds \
-commons-httpclient commons-logging servletapi5
+pushd wagon-providers/wagon-ssh-common-test
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath junit plexus/container-default plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
+popd
 
-# Since we don't ship jetty, we also need to remove tests that need it
-rm -f src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
+pushd wagon-providers/wagon-ssh-external
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
+popd
 
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc
+pushd wagon-providers/wagon-ssh-ganymed
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds ganymed-ssh2 plexus/container-default plexus/interactivity-api plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
-pushd wagon-providers/wagon-ftp
-export MAVEN_REPOSITORY=$PWD/.m2/respository
-mkdir -p $MAVEN_REPOSITORY
-cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY
-cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY
-# FIXME we don't ship plexus ftpd
-# After we get Excalibur, it would be nice to ship it also
-# and add plexus/ftpd back into the list below
-
-build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds \
-concurrent \
-commons-collections commons-net \
-oro
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc
+pushd wagon-providers/wagon-ssh
+export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:../wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar
+CLASSPATH=$CLASSPATH:$(build-classpath classworlds jsch plexus/container-default plexus/interactivity-api plexus/utils)
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 popd
 
+## FIXME: webdav disabled until jakarta-slide-webdav and it-could-webdav are in Fedora
+
+#pushd wagon-providers/wagon-webdav
+#export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar
+#CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar
+#CLASSPATH=$CLASSPATH:$(build-classpath classworlds commons-codec commons-httpclient commons-logging it-could-webdav jetty5/jetty5 plexus/container-default plexus/utils slide/slide-webdavclient-webdavlib servletapi5)
+#CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+#ant -Dbuild.sysclasspath=only jar javadoc
+#popd
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -m 644 wagon-provider-api/target/wagon-provider-api-1.0-alpha-5.jar \
+install -m 644 \
+  wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api-%{version}.jar
-install -m 644 wagon-providers/wagon-file/target/wagon-file-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-provider-api %{version} JPP/%{name} provider-api
+install -m 644 \
+  wagon-providers/wagon-file/target/wagon-file-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/file-%{version}.jar
-install -m 644 wagon-providers/wagon-ftp/target/wagon-ftp-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-file %{version} JPP/%{name} file
+install -m 644 \
+  wagon-providers/wagon-ftp/target/wagon-ftp-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp-%{version}.jar
-install -m 644 wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-ftp %{version} JPP/%{name} ftp
+install -m 644 \
+  wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight-%{version}.jar
-install -m 644 wagon-providers/wagon-http/target/wagon-http-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-http-lightweight %{version} JPP/%{name} http-lightweight
+install -m 644 \
+  wagon-providers/wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared-%{version}.jar
+%add_to_maven_depmap org.apache.maven.wagon wagon-http-shared %{version} JPP/%{name} http-shared
+install -m 644 \
+  wagon-providers/wagon-http/target/wagon-http-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/http-%{version}.jar
 
-# commented until wabon-scm can be built
-#install -m 644 wagon-providers/wagon-scm/target/wagon-scm-1.0-alpha-5.jar \
-#  $RPM_BUILD_ROOT%{_javadir}/%{name}/scm-%{version}.jar
-
-install -m 644 wagon-providers/wagon-ssh-external/target/wagon-ssh-external-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-http %{version} JPP/%{name} http
+install -m 644 \
+  wagon-providers/wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-%{version}.jar
+%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common %{version} JPP/%{name} ssh-common
+install -m 644 \
+  wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test-%{version}.jar
+%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common-test %{version} JPP/%{name} ssh-common-test
+install -m 644 \
+  wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external-%{version}.jar
-install -m 644 wagon-providers/wagon-ssh/target/wagon-ssh-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-external %{version} JPP/%{name} ssh-external
+install -m 644 \
+  wagon-providers/wagon-ssh-ganymed/target/wagon-ssh-ganymed-%{version}-%{blevel}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-ganymed-%{version}.jar
+%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-ganymed %{version} JPP/%{name} ssh-ganymed
+install -m 644 \
+  wagon-providers/wagon-ssh/target/wagon-ssh-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-%{version}.jar
-install -m 644 wagon-provider-test/target/wagon-provider-test-1.0-alpha-5.jar \
+%add_to_maven_depmap org.apache.maven.wagon wagon-ssh %{version} JPP/%{name} ssh
+#install -m 644 \
+#  wagon-providers/wagon-webdav/target/wagon-webdav-%{version}-%{blevel}.jar \
+#  $RPM_BUILD_ROOT%{_javadir}/%{name}/webdav-%{version}.jar
+#%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/%{name} webdav
+
+# Until webdav is available, map it to an empty dep
+%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/maven2 empty-dep
+
+install -m 644 \
+  wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test-%{version}.jar
+%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
 
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 wagon-provider-api/LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+# poms
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-wagon.pom
+install -m 644 wagon-provider-api/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-provider-api.pom
+install -m 644 wagon-provider-test/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-provider-test.pom
+install -m 644 wagon-providers/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-providers.pom
+install -m 644 wagon-providers/wagon-file/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-file.pom
+install -m 644 wagon-providers/wagon-ftp/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ftp.pom
+install -m 644 wagon-providers/wagon-http-shared/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http-shared.pom
+install -m 644 wagon-providers/wagon-http-lightweight/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http-lightweight.pom
+install -m 644 wagon-providers/wagon-http/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http.pom
+install -m 644 wagon-providers/wagon-ssh-common/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-common.pom
+install -m 644 wagon-providers/wagon-ssh-common-test/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-common-test.pom
+install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-external.pom
+install -m 644 wagon-providers/wagon-ssh-ganymed/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-ganymed.pom
+install -m 644 wagon-providers/wagon-ssh/pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh.pom
+#install -m 644 wagon-providers/wagon-webdav/pom.xml \
+#    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-webdav.pom
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api
+
+ls -lR wagon-provider-api/target/
+
+cp -pr wagon-provider-api/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file
+cp -pr wagon-providers/wagon-file/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp
+cp -pr wagon-providers/wagon-ftp/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight
+cp -pr wagon-providers/wagon-http-lightweight/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-shared
+cp -pr wagon-providers/wagon-http-shared/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-shared
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http
+cp -pr wagon-providers/wagon-http/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common
+cp -pr wagon-providers/wagon-ssh-common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common-test
+cp -pr wagon-providers/wagon-ssh-common-test/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common-test
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external
+cp -pr wagon-providers/wagon-ssh-external/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-ganymed
+cp -pr wagon-providers/wagon-ssh-ganymed/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-ganymed
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
+cp -pr wagon-providers/wagon-ssh/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
+
+##install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/webdav
+##cp -pr wagon-providers/wagon-webdav/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
+cp -pr wagon-provider-test/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
+
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-# Needs to be re-enabled when spec files starts building with maven2
-## javadoc
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api
-#cp -pr wagon-provider-api/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api
-#rm -rf wagon-provider-api/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file
-#cp -pr wagon-providers/wagon-file/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file
-#rm -rf wagon-providers/wagon-file/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp
-#cp -pr wagon-providers/wagon-ftp/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp
-#rm -rf wagon-providers/wagon-ftp/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight
-#cp -pr wagon-providers/wagon-http-lightweight/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight
-#rm -rf wagon-providers/wagon-http-lightweight/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http
-#cp -pr wagon-providers/wagon-http/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http
-#rm -rf wagon-providers/wagon-http/target/docs/apidocs
-#
-## commented until wagon-scm can be build
-##install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/scm
-##cp -pr wagon-providers/wagon-scm/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/scm
-##rm -rf wagon-providers/wagon-scm/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external
-#cp -pr wagon-providers/wagon-ssh-external/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external
-#rm -rf wagon-providers/wagon-ssh-external/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
-#cp -pr wagon-providers/wagon-ssh/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
-#rm -rf wagon-providers/wagon-ssh/target/docs/apidocs
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
-#cp -pr wagon-provider-test/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
-#rm -rf wagon-provider-test/target/docs/apidocs
-#
-#ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
-#
 # manual
-#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-#install -m 644 wagon-provider-api/LICENSE.txt \
-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 wagon-provider-api/LICENSE.txt \
+                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 #%if %{with_maven}
-#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/provider-api
-#cp -pr wagon-provider-api/target/docs/* \
-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/provider-api
-#
-## commented until wagon-scm can be built
-##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/file
-##cp -pr wagon-providers/wagon-file/target/docs/* \
-##               $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/file
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ftp
-#cp -pr wagon-providers/wagon-ftp/target/docs/* \
-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ftp
-#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http
-#cp -pr wagon-providers/wagon-http/target/docs/* \
-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http
-#
-## commented until wagon-scm can be built
-##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http-lightweight
-##cp -pr wagon-providers/wagon-http-lightweight/target/docs/* \
-##               $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http-lightweight
-##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/scm
-##cp -pr wagon-providers/wagon-scm/target/docs/* \
-##               $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/scm
-#
-#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh
-#cp -pr wagon-providers/wagon-ssh/target/docs/* \
-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh
-#
-## commented until wagon-scm can be built
-##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh-external
-##cp -pr wagon-providers/wagon-ssh-external/target/docs/* \
-##               $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh-external
+#cp -pr wagon-site/target/site/* \
+#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 #%endif
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
+
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
-%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%{_datadir}/maven2/poms/*.pom
+%{_mavendepmapfragdir}
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*%{version}.jar.*
+%endif
 
-# Needs to be re-enabled when spec files starts building with maven2
-#%files javadoc
-#%defattr(-,root,root,-)
-#%doc %{_javadocdir}/*
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
-# Needs to be re-enabled when spec files starts building with maven2
-#%if %{with_maven}
-#%files manual
-#%defattr(-,root,root,-)
-#%doc %{_docdir}/%{name}-%{version}
-#%endif
+%if %{with_maven}
+%files manual
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}
+%endif
 
 %changelog
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.2.b2.6
+- Update to beta2 - sync with jpackage.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.3.a5.3.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -432,8 +598,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Dec 22 2005 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a5.2jpp
 - Commented out potentially superfluous dependencies.
-- Disabled wagon-scm 
+- Disabled wagon-scm
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a5.1jpp
 - First JPackage build
-


--- wagon-1.0-alpha5-providers-ssh-external-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-providers-ftp-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-provider-api-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-provider-api-build.xml DELETED ---


--- wagon-1.0-alpha5-provider-test-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-providers-scm-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-providers-ssh-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-providers-ssh-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-scm-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-providers-http-lightweight-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-file-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-http-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-providers-ssh-external-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-http-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-file-build_xml.patch DELETED ---


--- wagon-1.0-alpha5-provider-test-build.xml DELETED ---


--- wagon-1.0-alpha5-providers-ftp-build.xml DELETED ---



From rdieter at fedoraproject.org  Wed Aug 19 16:09:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 16:09:20 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 .cvsignore, 1.32,
	1.33 kdebase-workspace-4.2.95-default-applets.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.237, 1.238
Message-ID: <20090819160920.19CCB11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25557

Modified Files:
	.cvsignore kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
- adjust default-applets patch to not load plasma-networkmanagement



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	5 Aug 2009 00:22:24 -0000	1.32
+++ .cvsignore	19 Aug 2009 16:08:56 -0000	1.33
@@ -1,5 +1 @@
-kdebase-workspace-4.2.90.tar.bz2
-kdebase-workspace-4.2.95.tar.bz2
-kdebase-workspace-4.2.96.tar.bz2
-kdebase-workspace-4.2.98.tar.bz2
 kdebase-workspace-4.3.0.tar.bz2

kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

Index: kdebase-workspace-4.2.95-default-applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace-4.2.95-default-applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.2.95-default-applets.patch	5 Aug 2009 00:22:25 -0000	1.1
+++ kdebase-workspace-4.2.95-default-applets.patch	19 Aug 2009 16:09:12 -0000	1.2
@@ -25,8 +25,8 @@ diff -ur kdebase-workspace-4.2.95/plasma
 +       engines->unloadEngine("powermanagement");
 +    }
 +
-+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
-+       loadDefaultApplet("networkmanagement", panel);
++    //if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
++    //   loadDefaultApplet("networkmanagement", panel);
      }
 -    engines->unloadEngine("powermanagement");
  


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.237
+++ kdebase-workspace.spec	19 Aug 2009 16:09:19 -0000	1.238
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -528,7 +528,11 @@ fi
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
+
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- adjust default-applets patch to not load plasma-networkmanagement
+
 * Tue Aug 18 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage
 



From victorv at fedoraproject.org  Wed Aug 19 16:48:01 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed, 19 Aug 2009 16:48:01 +0000 (UTC)
Subject: rpms/cobertura/devel cobertura.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090819164801.1B39311C00E4@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2393/devel

Modified Files:
	cobertura.spec import.log 
Log Message:
Fix B(R) according to guidelines



Index: cobertura.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/cobertura.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cobertura.spec	13 Aug 2009 00:23:09 -0000	1.1
+++ cobertura.spec	19 Aug 2009 16:48:00 -0000	1.2
@@ -1,7 +1,15 @@
+# Prevent brp-java-repack-jars from being run
+%global __jar_repack %{nil}
+
+# Links the system JAR
+# %1 - the sys jar
+# %2 - the symlink (optional)
+%global lnSysJAR() %__ln_s -f %{_javadir}/%{*} ;
+
 Name:           cobertura
 Version:        1.9
-Release:        2%{?dist}
-Summary:        Free Java tool that calculates the percentage of code accessed by tests
+Release:        3%{?dist}
+Summary:        Java tool that calculates the percentage of code accessed by tests
 
 Group:          Development/Libraries
 License:        ASL 1.1 and GPLv2+
@@ -15,12 +23,12 @@ Patch1:         cobertura-scripts.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ant >= 0:1.6.5
+BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  ant-trax
 BuildRequires:  asm2
 BuildRequires:  dos2unix
-BuildRequires:  jpackage-utils >= 0:1.7.3
+BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  jakarta-oro
 BuildRequires:  jaxen
@@ -31,16 +39,16 @@ BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-jaxp-1.3-apis
 
-Requires:       ant >= 0:1.6.5
+Requires:       ant
 Requires:       asm2
-Requires:       jpackage-utils >= 0:1.7.3
+Requires:       jpackage-utils
 Requires:       java
 Requires:       jakarta-oro
 Requires:       junit
 Requires:       log4j
 
-Requires(post): jpackage-utils >= 0:1.7.3
-Requires(postun): jpackage-utils >= 0:1.7.3
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
 
 BuildArch:      noarch
 
@@ -49,31 +57,11 @@ Cobertura is a free Java tool that calcu
 accessed by tests. It can be used to identify which parts of your 
 Java program are lacking test coverage. It is based on jcoverage.
 
-Features
-
-    * Can be executed from ant or from the command line.
-    * Instruments Java bytecode after it has been compiled.
-    * Can generate reports in HTML or XML.
-    * Shows percent of lines coveraged and branches coveraged for each
-      class, package, and for the overall project.
-    * Shows the McCabe cyclomatic code complexity of each class, and
-      the average cyclomatic code complexity for each package, and for
-      the overall product.
-    * Can sort HTML results by class name, percent of lines covered,
-      percent of branches covered, etc. And can sort in ascending or
-      decending order.
-
-NOTE: Due to asm version conflicts, if you use Cobertura as an ant
-      task you MUST add manually a classpath element 
-
-        <classpath location="/usr/share/java/asm2/asm2.jar"/>
-
-      to all Cobertura tasks requiring bytecode manipulation.
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name}-%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Requires:       jpackage-utils
 
 %description    javadoc
 This package contains the API documentation for %{name}.
@@ -88,17 +76,17 @@ dos2unix -k ChangeLog COPYING COPYRIGHT 
 
 %build
 pushd lib
-%__ln_s -f %{_javadir}/asm2/asm2.jar
-%__ln_s -f %{_javadir}/asm2/asm2-tree.jar
-%__ln_s -f %{_javadir}/jaxen.jar
-%__ln_s -f %{_javadir}/jdom.jar
-%__ln_s -f %{_javadir}/junit.jar
-%__ln_s -f %{_javadir}/oro.jar
-%__ln_s -f %{_javadir}/log4j.jar
-%__ln_s -f %{_javadir}/xalan-j2.jar
+%lnSysJAR asm2/asm2.jar
+%lnSysJAR asm2/asm2-tree.jar
+%lnSysJAR jaxen.jar
+%lnSysJAR jdom.jar
+%lnSysJAR junit.jar
+%lnSysJAR oro.jar
+%lnSysJAR log4j.jar
+%lnSysJAR xalan-j2.jar
 pushd xerces
-%__ln_s -f %{_javadir}/xerces-j2.jar
-%__ln_s -f %{_javadir}/xml-commons-jaxp-1.3-apis.jar
+%lnSysJAR xerces-j2.jar
+%lnSysJAR xml-commons-jaxp-1.3-apis.jar
 popd
 popd
 
@@ -163,6 +151,10 @@ EOF
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 19 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-3
+- Fix B(R) according to guidelines
+- Use the  lnSysJAR macro
+- Prevent brp-java-repack-jars from being run
 * Sun Aug 09 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-2
 - The license tag is changed according to http://cobertura.sourceforge.net/license.html
 * Fri Jun 19 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Aug 2009 00:23:09 -0000	1.1
+++ import.log	19 Aug 2009 16:48:00 -0000	1.2
@@ -1 +1,2 @@
 cobertura-1_9-2_fc12:HEAD:cobertura-1.9-2.fc12.src.rpm:1250123324
+cobertura-1_9-3_fc12:HEAD:cobertura-1.9-3.fc12.src.rpm:1250700796



From clumens at fedoraproject.org  Wed Aug 19 17:01:51 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 19 Aug 2009 17:01:51 +0000 (UTC)
Subject: rpms/python-meh/devel .cvsignore, 1.2, 1.3 python-meh.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090819170151.D3F4111C00E4@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5164

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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 02:46:01 -0000	1.2
+++ .cvsignore	19 Aug 2009 17:01:51 -0000	1.3
@@ -1 +1,2 @@
 python-meh-0.1.tar.gz
+python-meh-0.2.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/python-meh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-meh.spec	29 Jul 2009 02:46:28 -0000	1.1
+++ python-meh.spec	19 Aug 2009 17:01:51 -0000	1.2
@@ -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.1
+Version: 0.2
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -34,16 +34,23 @@ make
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
 %{python_sitelib}/*
 %{_datadir}/python-meh
 
 %changelog
+* Wed Aug 19 2009 Chris Lumens <clumens at redhat.com> - 0.2-1
+- Add a title to the main exception dialog so it looks right in anaconda.
+- Don't include an extra '/' in the displayed bug URL (#517515).
+- Now that there's .po files, package them.
+- Use the new exception icon (#517164).
+
 * Tue Jul 28 2009 Chris Lumens <clumens at redhat.com> - 0.1-1
 - Initial package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 02:46:01 -0000	1.2
+++ sources	19 Aug 2009 17:01:51 -0000	1.3
@@ -1 +1 @@
-54f97e1a32d9614b17509364aeb3d8bb  python-meh-0.1.tar.gz
+dbc5bc5e15f79913d079a6f80be38717  python-meh-0.2.tar.gz



From rjones at fedoraproject.org  Wed Aug 19 17:02:28 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:02:28 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.55,1.56
Message-ID: <20090819170228.135CA11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5345/F-11

Modified Files:
	libguestfs.spec 
Log Message:
Comment updated.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libguestfs.spec	13 Aug 2009 18:09:04 -0000	1.55
+++ libguestfs.spec	19 Aug 2009 17:02:27 -0000	1.56
@@ -337,7 +337,7 @@ export LIBGUESTFS_DEBUG=1
 # 507066   all          F-12   sequence of chroot calls (FIXED)
 # 513249   all          F-12   guestfwd broken in qemu
 # 516022   all          F-12   virtio-net gives "Network is unreachable" errors
-#                                 (WORKAROUND ENABLED)
+#                                 (FIXED)
 # 516096   ?            F-11   race condition in swapoff/blockdev --rereadpt
 # 516543   ?            F-12   qemu-kvm segfaults when run inside a VM
 



From twaugh at fedoraproject.org  Wed Aug 19 17:05:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 17:05:16 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-scp-git.patch, 
	NONE, 1.1 system-config-printer.spec, 1.280,
	1.281 system-config-printer-getdevices.patch, 1.3, NONE
Message-ID: <20090819170516.47B6311C00E4@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-serv5955

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-scp-git.patch 
Removed Files:
	system-config-printer-getdevices.patch 
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-5
- Applied patch from 1.1.x (3f45e96):
  - Show a 'paused' emblem for rejecting/disabled printers
    (bug #518020).
  - Set appropriate tooltip when configuring printer (bug #518007).
  - Use separate thread for verifying IPP queue (part of bug #518065).
  - Better driver preference order (bug #518045).


system-config-printer-scp-git.patch:
 ChangeLog-OLD                 |    5 
 Makefile.am                   |    1 
 PhysicalDevice.py             |    3 
 ToolbarSearchEntry.py         |    2 
 applet.py                     |    3 
 authconn.py                   |    4 
 cupshelpers/cupshelpers.py    |    4 
 cupshelpers/ppds.py           |   17 
 cupspk.py                     |   78 ++++
 jobviewer.py                  |    5 
 optionwidgets.py              |    3 
 po/de.po                      |    9 
 po/hu.po                      |  731 +++++++++++++++---------------------------
 system-config-printer.py      |  147 +++++---
 timedops.py                   |    5 
 udev/udev-configure-printer.c |    4 
 16 files changed, 488 insertions(+), 533 deletions(-)

--- NEW FILE system-config-printer-scp-git.patch ---
diff -up system-config-printer-1.1.11/applet.py.scp-git system-config-printer-1.1.11/applet.py
--- system-config-printer-1.1.11/applet.py.scp-git	2009-08-07 17:42:59.000000000 +0100
+++ system-config-printer-1.1.11/applet.py	2009-08-19 17:51:49.110701234 +0100
@@ -88,7 +88,8 @@ class NewPrinterNotification(dbus.servic
     def GetReady (self):
         self.wake_up ()
         if self.getting_ready == 0:
-            viewer.set_special_statusicon (SEARCHING_ICON)
+            viewer.set_special_statusicon (SEARCHING_ICON,
+                                           tooltip=_("Configuring new printer"))
 
         self.getting_ready += 1
         gobject.timeout_add (60 * 1000, self.timeout_ready)
diff -up system-config-printer-1.1.11/authconn.py.scp-git system-config-printer-1.1.11/authconn.py
--- system-config-printer-1.1.11/authconn.py.scp-git	2009-07-21 15:10:03.000000000 +0100
+++ system-config-printer-1.1.11/authconn.py	2009-08-19 17:51:49.112701196 +0100
@@ -22,6 +22,7 @@ import cups
 import cupspk
 import gobject
 import gtk
+import os
 from errordialogs import *
 from debug import *
 
@@ -155,7 +156,8 @@ class Connection:
         cups.setUser (self._use_user)
 
         self._use_pk = ((self._server[0] == '/' or self._server == 'localhost')
-                        and not self._lock)
+                        and not self._lock
+                        and os.getuid () != 0)
         if self._use_pk:
             create_object = cupspk.Connection
         else:
diff -up system-config-printer-1.1.11/ChangeLog-OLD.scp-git system-config-printer-1.1.11/ChangeLog-OLD
--- system-config-printer-1.1.11/ChangeLog-OLD.scp-git	2009-07-21 15:10:03.000000000 +0100
+++ system-config-printer-1.1.11/ChangeLog-OLD	2009-08-19 17:51:49.101700079 +0100
@@ -1,3 +1,8 @@
+2009-08-11  Tim Waugh  <twaugh at redhat.com>
+
+	* cupshelpers/cupshelpers.py (missingPackagesAndExecutables):
+	Accept a filter of "-" (Ubuntu #411376).
+
 2009-06-23  Tim Waugh  <twaugh at redhat.com>
 
 	* system-config-printer.py (NewPrinterGUI.nextNPTab): Don't log
diff -up system-config-printer-1.1.11/cupshelpers/cupshelpers.py.scp-git system-config-printer-1.1.11/cupshelpers/cupshelpers.py
--- system-config-printer-1.1.11/cupshelpers/cupshelpers.py.scp-git	2009-08-05 11:33:24.000000000 +0100
+++ system-config-printer-1.1.11/cupshelpers/cupshelpers.py	2009-08-19 17:51:49.114700998 +0100
@@ -642,6 +642,10 @@ def missingPackagesAndExecutables(ppd):
     # First, a local function.  How to check that something exists
     # in a path:
     def pathcheck (name, path="/usr/bin:/bin"):
+        if name == "-":
+            # A filter of "-" means that no filter is required,
+            # i.e. the device accepts the given format as-is.
+            return "builtin"
         # Strip out foomatic '%'-style place-holders.
         p = name.find ('%')
         if p != -1:
diff -up system-config-printer-1.1.11/cupshelpers/ppds.py.scp-git system-config-printer-1.1.11/cupshelpers/ppds.py
--- system-config-printer-1.1.11/cupshelpers/ppds.py.scp-git	2009-08-07 17:50:41.000000000 +0100
+++ system-config-printer-1.1.11/cupshelpers/ppds.py	2009-08-19 17:51:49.116700675 +0100
@@ -180,6 +180,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   "_bt",
                    ","]:
         s = modell.find (suffix)
         if s != -1:
@@ -208,14 +209,14 @@ def ppdMakeModelSplit (ppd_make_and_mode
 # Some drivers are just generally better than others.
 # Here is the preference list:
 DRIVER_TYPE_DOWNLOADED_NOW = 5
-DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT = 8
 DRIVER_TYPE_VENDOR = 10
-DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 15
 DRIVER_TYPE_HPCUPS = 16
 DRIVER_TYPE_FOOMATIC_HPIJS_ON_HP = 17
 DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED = 20
 DRIVER_TYPE_GUTENPRINT_NATIVE = 25
 DRIVER_TYPE_SPLIX = 27
+DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT = 28
+DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 29
 DRIVER_TYPE_FOOMATIC_PS = 30
 DRIVER_TYPE_FOOMATIC_HPIJS = 40
 DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED = 50
@@ -229,12 +230,6 @@ def _getDriverType (ppdname, ppds=None):
     """Decides which of the above types ppdname is."""
     if ppdname.find ("turboprint") != -1:
         return DRIVER_TYPE_3RD_PARTY_NONFREE
-    if ppdname.find ("gutenprint") != -1:
-        if (ppdname.find ("/simple/") != -1 or
-            ppdname.find (".sim-") != -1):
-            return DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED
-        else:
-            return DRIVER_TYPE_GUTENPRINT_NATIVE
     if ppdname.find ("splix")!= -1:
         return DRIVER_TYPE_SPLIX
     if ppdname.find ("hpcups") != -1:
@@ -264,6 +259,12 @@ def _getDriverType (ppdname, ppds=None):
                 return DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED
             return DRIVER_TYPE_FOOMATIC_GUTENPRINT
         return DRIVER_TYPE_FOOMATIC
+    if ppdname.find ("gutenprint") != -1:
+        if (ppdname.find ("/simple") != -1 or
+            ppdname.find (".sim-") != -1):
+            return DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED
+        else:
+            return DRIVER_TYPE_GUTENPRINT_NATIVE
     if ppdname.find ("-hpijs") != -1:
         if ppdname.find ("hpijs-rss") == -1:
             return DRIVER_TYPE_FOOMATIC_HPIJS
diff -up system-config-printer-1.1.11/cupspk.py.scp-git system-config-printer-1.1.11/cupspk.py
--- system-config-printer-1.1.11/cupspk.py.scp-git	2009-08-05 11:33:24.000000000 +0100
+++ system-config-printer-1.1.11/cupspk.py	2009-08-19 17:51:49.119702393 +0100
@@ -1,8 +1,8 @@
 # vim: set ts=4 sw=4 et: coding=UTF-8
 #
 # Copyright (C) 2008 Novell, Inc.
-# Copyright (C) 2009, 2009 Red Hat, Inc.
-# Copyright (C) 2009, 2009 Tim Waugh <twaugh at redhat.com>
+# Copyright (C) 2008, 2009 Red Hat, Inc.
+# Copyright (C) 2008, 2009 Tim Waugh <twaugh at redhat.com>
 #
 # Authors: Vincent Untz
 #
@@ -30,7 +30,6 @@ import os
 import sys
 
 import tempfile
-import string
 
 import cups
 import dbus
@@ -152,7 +151,7 @@ class Connection:
         pk_auth_running = False
 
         if pk_auth_error != None:
-            if string.find(pk_auth_error, 'org.freedesktop.DBus.Error.NoReply') == 0:
+            if pk_auth_error.find('org.freedesktop.DBus.Error.NoReply') == 0:
                 return False
             raise dbus.exceptions.DBusException(pk_auth_error)
 
@@ -300,7 +299,74 @@ class Connection:
 #    getPPDs
 #    getServerPPD
 #    getDocument
-#    getDevices
+
+
+    def getDevices(self, *args, **kwds):
+        use_pycups = False
+
+        timeout = 0
+        include_schemes = ''
+        exclude_schemes = ''
+
+        if len(args) == 3:
+            (use_pycups, timeout, include_schemes, exclude_schemes) = self._args_to_tuple([int, str, str], *args)
+        else:
+            if kwds.has_key('timeout'):
+                timeout = kwds['timeout']
+
+            if kwds.has_key('include_schemes'):
+                include_schemes = kwds['include_schemes']
+
+            if kwds.has_key('exclude_schemes'):
+                exclude_schemes = kwds['exclude_schemes']
+
+        pk_args = (timeout, include_schemes, exclude_schemes)
+
+        result = self._call_with_pk_and_fallback(use_pycups,
+                                                 'DevicesGet', pk_args,
+                                                 self._connection.getDevices,
+                                                 *args, **kwds)
+
+        # return 'result' if fallback was called
+        if len (result.keys()) > 0 and type (result[result.keys()[0]]) == dict:
+             return result
+
+        result_str = {}
+        if result != None:
+            for i in result.keys():
+                if type(i) == dbus.String:
+                    result_str[str(i)] = str(result[i])
+                else:
+                    result_str[i] = result[i]
+
+        # cups-pk-helper returns all devices in one dictionary.
+        # Keys of different devices are distinguished by ':n' postfix.
+
+        devices = {}
+        n = 0
+        postfix = ':' + str (n)
+        device_keys = [x for x in result_str.keys() if x.endswith(postfix)]
+        while len (device_keys) > 0:
+
[...2021 lines suppressed...]
         ppd_filter = gtk.FileFilter()
         ppd_filter.set_name(_("PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"))
@@ -3873,7 +3896,12 @@ class NewPrinterGUI(GtkGUI):
                 self.auto_model = 'Queue'
 
             try:
-                self.loadPPDs ()
+                if self.dialog_mode == "ppd":
+                    parent = self.mainapp.PrinterPropertiesDialog
+                else:
+                    parent = self.NewPrinterWindow
+
+                self.loadPPDs (parent=parent)
             except cups.IPPError, (e, m):
                 show_IPP_Error (e, m, parent=self.mainapp.PrintersWindow)
                 return
@@ -3953,9 +3981,10 @@ class NewPrinterGUI(GtkGUI):
                                          _('Searching') + '</span>\n\n' +
                                          _('Searching for downloadable drivers'))
                 if not parent:
-                    parent = self.mainapp.PrintersWindow
+                    parent = self.NewPrinterWindow
                 self.WaitWindow.set_transient_for (parent)
                 self.WaitWindow.show ()
+                self.busy (self.WaitWindow)
 
             if self.mainapp.cups == None:
                 debugprint("CUPS connection lost, reconnecting ...")
@@ -4032,9 +4061,10 @@ class NewPrinterGUI(GtkGUI):
                                          _('Searching') + '</span>\n\n' +
                                          _('Searching for drivers'))
                 if not parent:
-                    parent = self.mainapp.PrintersWindow
+                    parent = self.NewPrinterWindow
                 self.WaitWindow.set_transient_for (parent)
-                self.WaitWindow.show_now ()
+                self.WaitWindow.show ()
+                self.busy (self.WaitWindow)
 
             while gtk.events_pending ():
                 gtk.main_iteration ()
@@ -4347,6 +4377,7 @@ class NewPrinterGUI(GtkGUI):
                                          _('Searching for drivers'))
                 self.WaitWindow.set_transient_for (self.NewPrinterWindow)
                 self.WaitWindow.show ()
+                self.busy (self.WaitWindow)
                 self.busy (self.NewPrinterWindow)
 
                 # Keep the UI refreshed while we wait for the drivers
@@ -4547,6 +4578,7 @@ class NewPrinterGUI(GtkGUI):
             parent = self.mainapp.PrintersWindow
         self.WaitWindow.set_transient_for (parent)
         self.WaitWindow.show_now ()
+        self.busy (self.WaitWindow)
         while gtk.events_pending ():
             gtk.main_iteration ()
 
@@ -4629,7 +4661,7 @@ class NewPrinterGUI(GtkGUI):
             return True # assume plugin not required
         # Check whether the plugin is already installed
         if hplip_version.startswith("3"):
-            os.environ["hp_model"] = hpmodel;
+            os.environ["hp_model"] = hpmodel
             cmd = 'LC_ALL=C hp-mkuri -c'
             debugprint (uri + ": " + hpmodel)
             try:
@@ -5397,22 +5429,36 @@ class NewPrinterGUI(GtkGUI):
         verified = False
         if hostport != None:
             (host, port) = urllib.splitnport (hostport, defport=631)
-            oldserver = cups.getServer ()
-            try:
-                if uri.startswith ("https:"):
-                    encryption = cups.HTTP_ENCRYPT_ALWAYS
-                else:
-                    encryption = cups.HTTP_ENCRYPT_IF_REQUESTED
+            if uri.startswith ("https:"):
+                encryption = cups.HTTP_ENCRYPT_ALWAYS
+            else:
+                encryption = cups.HTTP_ENCRYPT_IF_REQUESTED
 
+            def get_attributes():
                 c = cups.Connection (host=host, port=port,
                                      encryption=encryption)
-                attributes = c.getPrinterAttributes (uri = uri)
+                return c.getPrinterAttributes (uri=uri)
+                
+            op = TimedOperation (get_attributes)
+            self.lblWait.set_markup ('<span weight="bold" size="larger">' +
+                                     _('Verifying') + '</span>\n\n' +
+                                     _('Verifying printer'))
+            self.WaitWindow.set_transient_for (self.NewPrinterWindow)
+            self.WaitWindow.show ()
+            self.busy (self.WaitWindow)
+            source = gobject.timeout_add (10000, op.cancel)
+            try:
+                attributes = op.run ()
                 verified = True
+            except OperationCanceled:
+                pass
             except cups.IPPError, (e, msg):
                 debugprint ("Failed to get attributes: %s (%d)" % (msg, e))
             except:
                 nonfatalException ()
-            cups.setServer (oldserver)
+
+            gobject.source_remove (source)
+            self.WaitWindow.hide ()
         else:
             debugprint (uri)
 
@@ -5733,6 +5779,7 @@ class NewPrinterGUI(GtkGUI):
                                  _('Searching for printers'))
         self.WaitWindow.set_transient_for (self.NewPrinterWindow)
         self.WaitWindow.show_now ()
+        self.busy (self.WaitWindow)
         printers = server.probe()
         self.WaitWindow.hide ()
 
@@ -6131,14 +6178,26 @@ class NewPrinterGUI(GtkGUI):
                 model.append((driver, ))
         self.tvNPDrivers.columns_autosize()
 
-    def NPDriversTooltips(self, model, path, col):
+    def on_NPDrivers_query_tooltip(self, tv, x, y, keyboard_mode, tooltip):
+        if keyboard_mode:
+            path = tv.get_cursor()[0]
+            if path is None:
+                return False
+        else:
+            bin_x, bin_y = tv.convert_widget_to_bin_window_coords(x, y)
+            ret = tv.get_path_at_pos (bin_x, bin_y)
+            if ret is None:
+                return False
+            path = ret[0]
+
         drivername = self.NPDrivers[path[0]]
         ppddict = self.ppds.getInfoFromPPDName(drivername)
         markup = ppddict['ppd-make-and-model']
         if (drivername.startswith ("foomatic:")):
             markup += " "
             markup += _("This PPD is generated by foomatic.")
-        return markup
+        tooltip.set_markup(markup)
+        return True
 
     def on_tvNPModels_cursor_changed(self, widget):
         path, column = widget.get_cursor()
diff -up system-config-printer-1.1.11/timedops.py.scp-git system-config-printer-1.1.11/timedops.py
--- system-config-printer-1.1.11/timedops.py.scp-git	2009-07-21 15:10:03.000000000 +0100
+++ system-config-printer-1.1.11/timedops.py	2009-08-19 17:51:49.150700369 +0100
@@ -32,7 +32,7 @@ class Timed:
         pass
 
     def cancel (self):
-        pass
+        return False
 
 class TimedSubprocess(Timed):
     def __init__ (self, timeout=60000, parent=None, show_dialog=True,
@@ -119,6 +119,8 @@ class TimedSubprocess(Timed):
             gtk.main_quit ()
             self.watchers = 0
 
+        return False
+
 class OperationThread(threading.Thread):
     def __init__ (self, target=None, args=(), kwargs={}):
         threading.Thread.__init__ (self)
@@ -200,3 +202,4 @@ class TimedOperation(Timed):
     def cancel (self):
         debugprint ("Command canceled")
         gtk.main_quit ()
+        return False
diff -up system-config-printer-1.1.11/ToolbarSearchEntry.py.scp-git system-config-printer-1.1.11/ToolbarSearchEntry.py
--- system-config-printer-1.1.11/ToolbarSearchEntry.py.scp-git	2009-07-21 15:10:03.000000000 +0100
+++ system-config-printer-1.1.11/ToolbarSearchEntry.py	2009-08-19 17:51:49.108701241 +0100
@@ -68,7 +68,7 @@ class ToolbarSearchEntry (gtk.HBox):
         label = gtk.Label ()
         label.set_text_with_mnemonic (_("_Filter:"))
         label.set_justify (gtk.JUSTIFY_RIGHT)
-        self.pack_start (label, False, True, 0);
+        self.pack_start (label, False, True, 0)
 
         self.entry = gtk.Entry()
         if gtk.__dict__.has_key ('ENTRY_ICON_PRIMARY'):
diff -up system-config-printer-1.1.11/udev/udev-configure-printer.c.scp-git system-config-printer-1.1.11/udev/udev-configure-printer.c
--- system-config-printer-1.1.11/udev/udev-configure-printer.c.scp-git	2009-08-07 17:42:55.000000000 +0100
+++ system-config-printer-1.1.11/udev/udev-configure-printer.c	2009-08-19 17:51:49.153701536 +0100
@@ -791,8 +791,8 @@ find_matching_device_uris (struct device
 
       /* Now check the manufacturer and model names. */
       if (device_uri && this_id.mfg && this_id.mdl &&
-	  !strcmp (this_id.mfg, id->mfg) &&
-	  !strcmp (this_id.mdl, id->mdl))
+	  !strcasecmp (this_id.mfg, id->mfg) &&
+	  !strcasecmp (this_id.mdl, id->mdl))
 	{
 	  /* We've checked everything except the serial numbers.  This
 	   * is more complicated.  Some devices include a serial


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- system-config-printer.spec	14 Aug 2009 15:03:14 -0000	1.280
+++ system-config-printer.spec	19 Aug 2009 17:05:16 -0000	1.281
@@ -7,15 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-getdevices.patch
-Patch2: system-config-printer-hplip-hack.patch
+Patch1: system-config-printer-scp-git.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -26,6 +25,7 @@ BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
 BuildRequires: xmlto
 BuildRequires: epydoc
+BuildRequires: autoconf, automake
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,8 +76,11 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .getdevices
-%patch2 -p1 -b .hplip-hack
+# Applied patch from 1.1.x (3f45e96).
+%patch1 -p1 -b .scp-git
+aclocal
+automake --copy --add-missing
+autoconf
 
 %build
 %configure --with-udev-rules
@@ -173,7 +176,6 @@ rm -rf %buildroot
 %{_datadir}/%{name}/userdefault.py*
 %{_datadir}/%{name}/XmlHelper.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
-%{_datadir}/%{name}/gtk_treeviewtooltips.py*
 %{_datadir}/%{name}/applet.py*
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/icons
@@ -190,6 +192,14 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-5
+- Applied patch from 1.1.x (3f45e96):
+  - Show a 'paused' emblem for rejecting/disabled printers
+    (bug #518020).
+  - Set appropriate tooltip when configuring printer (bug #518007).
+  - Use separate thread for verifying IPP queue (part of bug #518065).
+  - Better driver preference order (bug #518045).
+
 * Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-4
 - Compare MFG and MDL fields case insensitively when adding automatic
   queues, because HPLIP provides them with different case than the


--- system-config-printer-getdevices.patch DELETED ---



From twaugh at fedoraproject.org  Wed Aug 19 17:07:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 19 Aug 2009 17:07:15 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-hplip-hack.patch, 1.1, NONE
Message-ID: <20090819170715.6CE4A11C00E4@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-serv6440

Removed Files:
	system-config-printer-hplip-hack.patch 
Log Message:
No longer need this patch.


--- system-config-printer-hplip-hack.patch DELETED ---



From markmc at fedoraproject.org  Wed Aug 19 17:09:00 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 19 Aug 2009 17:09:00 +0000 (UTC)
Subject: rpms/libvirt/F-11
	libvirt-fix-migration-completion-with-newer-qemu.patch, NONE,
	1.1 libvirt-fix-xen-driver-segfault-with-newer-xen.patch, NONE,
	1.1 libvirt-0.6.2-svirt-sound.patch, 1.3, 1.4 libvirt.spec,
	1.139, 1.140
Message-ID: <20090819170900.216FC11C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6824

Modified Files:
	libvirt-0.6.2-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-fix-migration-completion-with-newer-qemu.patch 
	libvirt-fix-xen-driver-segfault-with-newer-xen.patch 
Log Message:
* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-17
- Fix migration completion with newer versions of qemu (#516187)
- Fix dumpxml segfault with newer versions of Xen (#518091)


libvirt-fix-migration-completion-with-newer-qemu.patch:
 qemu_driver.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-fix-migration-completion-with-newer-qemu.patch ---
>From 21ef933dfdd64c754d184d41d87ecd94eaddf697 Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance at redhat.com>
Date: Wed, 5 Aug 2009 13:42:07 +0200
Subject: [PATCH] Run 'cont' on successful migration finish.

https://bugzilla.redhat.com/516187

As of qemu 0.10.6, qemu now honors the -S flag on incoming migration.
That means that when the migration completes, we have to issue a
'cont' command to get the VM running again.  We do it unconditionally
since it won't hurt on older qemu.

(cherry picked from commit d1ec4d7a5a4f50c9492137eaab4f021caa075f95)

Fedora-patch: libvirt-fix-migration-completion-with-newer-qemu.patch
---
 src/qemu_driver.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 7dbf4a2..ff56f61 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5162,7 +5162,18 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
      */
     if (retcode == 0) {
         dom = virGetDomain (dconn, vm->def->name, vm->def->uuid);
+
+        /* run 'cont' on the destination, which allows migration on qemu
+         * >= 0.10.6 to work properly.  This isn't strictly necessary on
+         * older qemu's, but it also doesn't hurt anything there
+         */
+        if (qemudMonitorCommand(vm, "cont", &info) < 0) {
+            qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                             "%s", _("resume operation failed"));
+            goto cleanup;
+        }
         VIR_FREE(info);
+
         vm->state = VIR_DOMAIN_RUNNING;
         event = virDomainEventNewFromObj(vm,
                                          VIR_DOMAIN_EVENT_RESUMED,
-- 
1.6.2.5


libvirt-fix-xen-driver-segfault-with-newer-xen.patch:
 xend_internal.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE libvirt-fix-xen-driver-segfault-with-newer-xen.patch ---
>From 0878a15ad937449b5dfc4cf49888cc7753473e33 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Fri, 26 Jun 2009 18:14:16 +0000
Subject: [PATCH] Fix xen driver segfault with newer Xen

https://bugzilla.redhat.com/518091

(cherry picked from commit 14435163a086c0bcdff04308077fa46a5fa08bb0)

Fedora-patch: libvirt-fix-xen-driver-segfault-with-newer-xen.patch
---
 src/xend_internal.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 2e2fd21..c3a9836 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -2077,7 +2077,15 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn,
         if (sexpr_lookup(node, "device/vfb")) {
             /* New style graphics config for PV guests in >= 3.0.4,
              * or for HVM guests in >= 3.0.5 */
-            tmp = sexpr_node(node, "device/vfb/type");
+            if (sexpr_node(node, "device/vfb/type")) {
+                tmp = sexpr_node(node, "device/vfb/type");
+            } else if (sexpr_node(node, "device/vfb/vnc")) {
+                tmp = "vnc";
+            } else if (sexpr_node(node, "device/vfb/sdl")) {
+                tmp = "sdl";
+            } else {
+                tmp = "unknown";
+            }
 
             if (VIR_ALLOC(graphics) < 0)
                 goto no_memory;
-- 
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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-0.6.2-svirt-sound.patch	19 Aug 2009 16:15:46 -0000	1.3
+++ libvirt-0.6.2-svirt-sound.patch	19 Aug 2009 17:08:59 -0000	1.4
@@ -1,4 +1,4 @@
-From e76837af35d692cb947db3a47058bcfbbf77b46a Mon Sep 17 00:00:00 2001
+From 0d72b6fb7d4aa5e55294eb3222e7156d3d75a9e7 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.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- libvirt.spec	19 Aug 2009 16:15:46 -0000	1.139
+++ libvirt.spec	19 Aug 2009 17:08:59 -0000	1.140
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 16%{?dist}%{?extra_release}
+Release: 17%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -130,6 +130,10 @@ Patch27: libvirt-allow-pm-reset-on-multi
 Patch28: libvirt-improve-pci-hostdev-reset-error-message.patch
 # Allow PCI bus reset to reset other devices (#499678)
 Patch29: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
+# Fix migration completion with newer versions of qemu (#516187)
+Patch30: libvirt-fix-migration-completion-with-newer-qemu.patch
+# Fix dumpxml segfault with newer versions of Xen (#518091)
+Patch31: libvirt-fix-xen-driver-segfault-with-newer-xen.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -311,6 +315,8 @@ of recent versions of Linux (and other O
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %patch200 -p1
 
@@ -634,6 +640,10 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-17
+- Fix migration completion with newer versions of qemu (#516187)
+- Fix dumpxml segfault with newer versions of Xen (#518091)
+
 * Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-16.fc11
 - Allow PCI bus reset to reset other devices (#499678)
 - Fix stupid PCI reset error message (bug #499678)



From rjones at fedoraproject.org  Wed Aug 19 17:09:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:09:56 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.56,1.57
Message-ID: <20090819170956.7A1E311C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7589

Modified Files:
	libguestfs.spec 
Log Message:
New upstream release 1.0.68.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- libguestfs.spec	19 Aug 2009 17:02:27 -0000	1.56
+++ libguestfs.spec	19 Aug 2009 17:09:56 -0000	1.57
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.67
+Version:     1.0.68
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -537,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-1
+- New upstream release 1.0.68.
+
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.
 



From rjones at fedoraproject.org  Wed Aug 19 17:09:55 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:09:55 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.92,1.93
Message-ID: <20090819170955.1D4BD11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7565

Modified Files:
	libguestfs.spec 
Log Message:
New upstream release 1.0.68.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- libguestfs.spec	13 Aug 2009 18:15:35 -0000	1.92
+++ libguestfs.spec	19 Aug 2009 17:09:54 -0000	1.93
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.67
-Release:     2%{?dist}
+Version:     1.0.68
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -541,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-1
+- New upstream release 1.0.68.
+
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-2
 - New upstream release 1.0.67.
 



From rjones at fedoraproject.org  Wed Aug 19 17:09:57 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:09:57 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.58,1.59
Message-ID: <20090819170957.DBCAF11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7640

Modified Files:
	libguestfs.spec 
Log Message:
New upstream release 1.0.68.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- libguestfs.spec	13 Aug 2009 18:09:00 -0000	1.58
+++ libguestfs.spec	19 Aug 2009 17:09:57 -0000	1.59
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.67
+Version:     1.0.68
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-1
+- New upstream release 1.0.68.
+
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.
 



From markmc at fedoraproject.org  Wed Aug 19 17:13:01 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 19 Aug 2009 17:13:01 +0000 (UTC)
Subject: rpms/libvirt/devel
	libvirt-fix-migration-completion-with-newer-qemu.patch, NONE,
	1.1 libvirt-0.6.4-svirt-sound.patch, 1.3, 1.4 libvirt.spec,
	1.171, 1.172
Message-ID: <20090819171302.05F4911C00E4@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8381

Modified Files:
	libvirt-0.6.4-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-fix-migration-completion-with-newer-qemu.patch 
Log Message:
* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-6
- Fix migration completion with newer versions of qemu (#516187)


libvirt-fix-migration-completion-with-newer-qemu.patch:
 qemu_driver.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-fix-migration-completion-with-newer-qemu.patch ---
>From f2eb2ad5163d5bae2392a8bfc6040c45426c9f5f Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance at redhat.com>
Date: Wed, 5 Aug 2009 13:42:07 +0200
Subject: [PATCH] Run 'cont' on successful migration finish.

https://bugzilla.redhat.com/516187

As of qemu 0.10.6, qemu now honors the -S flag on incoming migration.
That means that when the migration completes, we have to issue a
'cont' command to get the VM running again.  We do it unconditionally
since it won't hurt on older qemu.

(cherry picked from commit d1ec4d7a5a4f50c9492137eaab4f021caa075f95)

Fedora-patch: libvirt-fix-migration-completion-with-newer-qemu.patch
---
 src/qemu_driver.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 99dac52..bf9a0b2 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -6951,7 +6951,18 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
      */
     if (retcode == 0) {
         dom = virGetDomain (dconn, vm->def->name, vm->def->uuid);
+
+        /* run 'cont' on the destination, which allows migration on qemu
+         * >= 0.10.6 to work properly.  This isn't strictly necessary on
+         * older qemu's, but it also doesn't hurt anything there
+         */
+        if (qemudMonitorCommand(vm, "cont", &info) < 0) {
+            qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                             "%s", _("resume operation failed"));
+            goto cleanup;
+        }
         VIR_FREE(info);
+
         vm->state = VIR_DOMAIN_RUNNING;
         event = virDomainEventNewFromObj(vm,
                                          VIR_DOMAIN_EVENT_RESUMED,
-- 
1.6.2.5


libvirt-0.6.4-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-0.6.4-svirt-sound.patch	19 Aug 2009 16:26:27 -0000	1.3
+++ libvirt-0.6.4-svirt-sound.patch	19 Aug 2009 17:13:01 -0000	1.4
@@ -1,4 +1,4 @@
-From 1e99b2edee0eb3ca1c600e5bd5c55741cb95a29a Mon Sep 17 00:00:00 2001
+From 5f8d720b5f1393ee333a5fa8375ffe9ac954d48b Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 17 Aug 2009 08:32:08 +0100
 Subject: [PATCH] Disable sound cards when running sVirt


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- libvirt.spec	19 Aug 2009 16:26:27 -0000	1.171
+++ libvirt.spec	19 Aug 2009 17:13:01 -0000	1.172
@@ -78,7 +78,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 5%{?dist}%{?extra_release}
+Release: 6%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -117,6 +117,9 @@ Patch10: libvirt-allow-pci-hostdev-reset
 # Add PCI host device hotplug support
 Patch11: libvirt-add-pci-hostdev-hotplug-support.patch
 
+# Fix migration completion with newer versions of qemu (#516187)
+Patch12: libvirt-fix-migration-completion-with-newer-qemu.patch
+
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
 Patch200: libvirt-0.6.4-svirt-sound.patch
@@ -309,6 +312,7 @@ of recent versions of Linux (and other O
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %patch200 -p1
 
@@ -677,6 +681,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-6
+- Fix migration completion with newer versions of qemu (#516187)
+
 * Wed Aug 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.0-5
 - Add PCI host device hotplug support
 - Allow PCI bus reset to reset other devices (#499678)



From tuxbrewr at fedoraproject.org  Wed Aug 19 17:17:34 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 19 Aug 2009 17:17:34 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec,1.40,1.41
Message-ID: <20090819171734.AAF8611C00E4@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9263

Modified Files:
	kpackagekit.spec 
Log Message:
fix release tag


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kpackagekit.spec	19 Aug 2009 14:53:16 -0000	1.40
+++ kpackagekit.spec	19 Aug 2009 17:17:34 -0000	1.41
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.5.0
-Release:	0%{?dist}
+Release:	0.1.20090819svn%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0
+* Wed Aug 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090819svn
 - New upstream release with PolicyKit 1 integration
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1.1-4



From sgrubb at fedoraproject.org  Wed Aug 19 17:30:20 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 19 Aug 2009 17:30:20 +0000 (UTC)
Subject: rpms/amtu/devel amtu.spec,1.29,1.30
Message-ID: <20090819173020.8F34311C0439@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/amtu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11266

Modified Files:
	amtu.spec 
Log Message:
* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-2
- rebuild for new audit-libs



Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- amtu.spec	26 Jul 2009 16:39:49 -0000	1.29
+++ amtu.spec	19 Aug 2009 17:30:20 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
@@ -56,6 +56,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-2
+- rebuild for new audit-libs
+
 * Sun Jul 26 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-1
 - new upstream version
 - Add init script for bootup system check



From rjones at fedoraproject.org  Wed Aug 19 17:35:08 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:35:08 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore,1.46,1.47 sources,1.46,1.47
Message-ID: <20090819173508.9AD1D11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12167

Modified Files:
	.cvsignore sources 
Log Message:
New upstream release 1.0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	13 Aug 2009 18:09:07 -0000	1.46
+++ .cvsignore	19 Aug 2009 17:35:08 -0000	1.47
@@ -1 +1 @@
-libguestfs-1.0.67.tar.gz
+libguestfs-1.0.68.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	13 Aug 2009 18:09:07 -0000	1.46
+++ sources	19 Aug 2009 17:35:08 -0000	1.47
@@ -1 +1 @@
-ce1896a1faa9a19642d5a19aa4f09c4b  libguestfs-1.0.67.tar.gz
+2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz



From rjones at fedoraproject.org  Wed Aug 19 17:35:14 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:35:14 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore,1.27,1.28 sources,1.27,1.28
Message-ID: <20090819173514.8ABAD11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12219

Modified Files:
	.cvsignore sources 
Log Message:
New upstream release 1.0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	13 Aug 2009 18:09:00 -0000	1.27
+++ .cvsignore	19 Aug 2009 17:35:14 -0000	1.28
@@ -1 +1 @@
-libguestfs-1.0.67.tar.gz
+libguestfs-1.0.68.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	13 Aug 2009 18:09:00 -0000	1.27
+++ sources	19 Aug 2009 17:35:14 -0000	1.28
@@ -1 +1 @@
-ce1896a1faa9a19642d5a19aa4f09c4b  libguestfs-1.0.67.tar.gz
+2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz



From rjones at fedoraproject.org  Wed Aug 19 17:35:16 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:35:16 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore,1.33,1.34 sources,1.33,1.34
Message-ID: <20090819173516.B49A011C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12236

Modified Files:
	.cvsignore sources 
Log Message:
New upstream release 1.0.68.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	13 Aug 2009 18:09:04 -0000	1.33
+++ .cvsignore	19 Aug 2009 17:35:16 -0000	1.34
@@ -1 +1 @@
-libguestfs-1.0.67.tar.gz
+libguestfs-1.0.68.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	13 Aug 2009 18:09:04 -0000	1.33
+++ sources	19 Aug 2009 17:35:16 -0000	1.34
@@ -1 +1 @@
-ce1896a1faa9a19642d5a19aa4f09c4b  libguestfs-1.0.67.tar.gz
+2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz



From akurtakov at fedoraproject.org  Wed Aug 19 17:37:07 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 19 Aug 2009 17:37:07 +0000 (UTC)
Subject: rpms/maven-wagon/devel maven-wagon.spec,1.8,1.9
Message-ID: <20090819173707.24A7311C00E4@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-wagon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12712/devel

Modified Files:
	maven-wagon.spec 
Log Message:
- Remove gcj parts.


Index: maven-wagon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-wagon/devel/maven-wagon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- maven-wagon.spec	19 Aug 2009 16:30:40 -0000	1.8
+++ maven-wagon.spec	19 Aug 2009 17:37:06 -0000	1.9
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
@@ -49,7 +47,7 @@
 
 Name:           maven-%{bname}
 Version:        1.0
-Release:        0.2.b2.6%{?dist}
+Release:        0.2.b2.7%{?dist}
 Epoch:          0
 Summary:        Tools to manage artifacts and deployment
 License:        ASL 2.0
@@ -88,9 +86,7 @@ Patch7:         wagon-1.0-disable-webdav
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  junit
@@ -123,11 +119,6 @@ BuildRequires:  plexus-interactivity
 BuildRequires:  plexus-utils
 BuildRequires:  servletapi5
 BuildRequires:  xml-commons-apis
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
 
 Requires:       ganymed-ssh2
 Requires:       jakarta-commons-httpclient
@@ -493,7 +484,7 @@ cp -pr wagon-providers/wagon-ssh/target/
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
 cp -pr wagon-provider-test/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
 
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # manual
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -505,38 +496,15 @@ install -m 644 wagon-provider-api/LICENS
 #                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 #%endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
-fi
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(-,root,root,-)
@@ -544,15 +512,11 @@ fi
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 %{_datadir}/maven2/poms/*.pom
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %if %{with_maven}
 %files manual
@@ -561,6 +525,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.2.b2.7
+- Remove gcj parts.
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.2.b2.6
 - Update to beta2 - sync with jpackage.
 



From ajax at fedoraproject.org  Wed Aug 19 17:46:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 19 Aug 2009 17:46:32 +0000 (UTC)
Subject: rpms/xorg-x11-drv-chips/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-chips.spec, 1.22, 1.23
Message-ID: <20090819174632.6051311C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-chips/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15042

Modified Files:
	.cvsignore sources xorg-x11-drv-chips.spec 
Log Message:
* Wed Aug 19 2009 Adam Jackson <ajax at redhat.com> 1.2.2-1
- chips 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Dec 2008 04:30:57 -0000	1.9
+++ .cvsignore	19 Aug 2009 17:46:32 -0000	1.10
@@ -1 +1 @@
-xf86-video-chips-1.2.1.tar.bz2
+xf86-video-chips-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Dec 2008 04:30:57 -0000	1.9
+++ sources	19 Aug 2009 17:46:32 -0000	1.10
@@ -1 +1 @@
-2f2643fca6335f18024bffa6c4e0c12f  xf86-video-chips-1.2.1.tar.bz2
+a3969c28c3b36ab2caa852a9324e9b70  xf86-video-chips-1.2.2.tar.bz2


Index: xorg-x11-drv-chips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/devel/xorg-x11-drv-chips.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xorg-x11-drv-chips.spec	27 Jul 2009 08:24:08 -0000	1.22
+++ xorg-x11-drv-chips.spec	19 Aug 2009 17:46:32 -0000	1.23
@@ -2,18 +2,17 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 chips video driver
-Name:      xorg-x11-drv-chips
-Version: 1.2.1
-Release: 4%{?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
-Source1:   chips.xinf
-Patch0:	abi.patch
+Summary:    Xorg X11 chips video driver
+Name:	    xorg-x11-drv-chips
+Version:    1.2.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
+Source1:    chips.xinf
 
 ExcludeArch: s390 s390x
 
@@ -27,7 +26,6 @@ X.Org X11 chips video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -55,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Wed Aug 19 2009 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- chips 1.2.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From wtogami at fedoraproject.org  Wed Aug 19 17:46:42 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 19 Aug 2009 17:46:42 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.32, 1.33 pidgin.spec, 1.93,
	1.94 sources, 1.32, 1.33
Message-ID: <20090819174642.3D97611C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15080

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
2.6.1: Fix a crash when some users send you a link in a Yahoo IM



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	18 Aug 2009 17:30:01 -0000	1.32
+++ .cvsignore	19 Aug 2009 17:46:41 -0000	1.33
@@ -1 +1 @@
-pidgin-2.6.0.tar.bz2
+pidgin-2.6.1.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- pidgin.spec	18 Aug 2009 17:30:01 -0000	1.93
+++ pidgin.spec	19 Aug 2009 17:46:42 -0000	1.94
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.0
+Version:	2.6.1
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -614,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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
+
 * Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
 - CVE-2009-2694
 - Voice and Video support via farsight2 (Fedora 11+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	18 Aug 2009 17:30:01 -0000	1.32
+++ sources	19 Aug 2009 17:46:42 -0000	1.33
@@ -1 +1 @@
-235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2
+306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2



From ajax at fedoraproject.org  Wed Aug 19 17:47:28 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 19 Aug 2009 17:47:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-chips/F-11 sources, 1.9,
	1.10 xorg-x11-drv-chips.spec, 1.20, 1.21
Message-ID: <20090819174728.5149311C00E4@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-chips/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15383

Modified Files:
	sources xorg-x11-drv-chips.spec 
Log Message:
* Wed Aug 19 2009 Adam Jackson <ajax at redhat.com> 1.2.2-1
- chips 1.2.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Dec 2008 04:30:57 -0000	1.9
+++ sources	19 Aug 2009 17:47:28 -0000	1.10
@@ -1 +1 @@
-2f2643fca6335f18024bffa6c4e0c12f  xf86-video-chips-1.2.1.tar.bz2
+a3969c28c3b36ab2caa852a9324e9b70  xf86-video-chips-1.2.2.tar.bz2


Index: xorg-x11-drv-chips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/F-11/xorg-x11-drv-chips.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-drv-chips.spec	26 Feb 2009 10:42:50 -0000	1.20
+++ xorg-x11-drv-chips.spec	19 Aug 2009 17:47:28 -0000	1.21
@@ -2,17 +2,17 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 chips video driver
-Name:      xorg-x11-drv-chips
-Version: 1.2.1
-Release: 2%{?dist}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 chips video driver
+Name:	    xorg-x11-drv-chips
+Version:    1.2.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
-Source1:   chips.xinf
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:    chips.xinf
 
 ExcludeArch: s390 s390x
 
@@ -53,6 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Wed Aug 19 2009 Adam Jackson <ajax at redhat.com> 1.2.2-1
+- chips 1.2.2
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 1.2.1-3
+- Fix ABI for new server
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Aug 19 17:50:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:50:59 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.59,1.60
Message-ID: <20090819175059.A28E311C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15996

Modified Files:
	libguestfs.spec 
Log Message:
BR genisoimage.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libguestfs.spec	19 Aug 2009 17:09:57 -0000	1.59
+++ libguestfs.spec	19 Aug 2009 17:50:59 -0000	1.60
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.68
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -22,7 +22,7 @@ BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 2.3
 #BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
-BuildRequires: squashfs-tools
+BuildRequires: genisoimage
 %ifarch %{ix86} x86_64
 BuildRequires: qemu-system-x86 >= 0.10.5
 %endif
@@ -534,8 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-1
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-2
 - New upstream release 1.0.68.
+- BR genisoimage.
 
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.



From rjones at fedoraproject.org  Wed Aug 19 17:51:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:51:25 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.57,1.58
Message-ID: <20090819175125.A2A5611C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16074

Modified Files:
	libguestfs.spec 
Log Message:
BR genisoimage.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- libguestfs.spec	19 Aug 2009 17:09:56 -0000	1.57
+++ libguestfs.spec	19 Aug 2009 17:51:25 -0000	1.58
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.68
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -18,7 +18,7 @@ BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 2.3
 BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
-BuildRequires: squashfs-tools
+BuildRequires: genisoimage
 BuildRequires: qemu-kvm >= 0.10-7
 BuildRequires: createrepo
 BuildRequires: glibc-static
@@ -537,8 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-1
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-2
 - New upstream release 1.0.68.
+- BR genisoimage.
 
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.



From rjones at fedoraproject.org  Wed Aug 19 17:51:29 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 17:51:29 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.93,1.94
Message-ID: <20090819175129.D6E2111C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16096

Modified Files:
	libguestfs.spec 
Log Message:
BR genisoimage.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- libguestfs.spec	19 Aug 2009 17:09:54 -0000	1.93
+++ libguestfs.spec	19 Aug 2009 17:51:29 -0000	1.94
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.68
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -18,7 +18,7 @@ BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 2.3
 BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
-BuildRequires: squashfs-tools
+BuildRequires: genisoimage
 BuildRequires: qemu-kvm >= 0.10-7
 BuildRequires: createrepo
 BuildRequires: glibc-static
@@ -541,8 +541,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-1
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-2
 - New upstream release 1.0.68.
+- BR genisoimage.
 
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-2
 - New upstream release 1.0.67.



From gemi at fedoraproject.org  Wed Aug 19 17:56:59 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Wed, 19 Aug 2009 17:56:59 +0000 (UTC)
Subject: rpms/pl/devel pl-5.7.11-pc.patch,NONE,1.1 pl.spec,1.62,1.63
Message-ID: <20090819175659.2555F11C00E4@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17162

Modified Files:
	pl.spec 
Added Files:
	pl-5.7.11-pc.patch 
Log Message:
move include files to expected place

pl-5.7.11-pc.patch:
 pl.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pl-5.7.11-pc.patch ---
diff -up pl-5.7.11/src/pl.pc.in.pc pl-5.7.11/src/pl.pc.in
--- pl-5.7.11/src/pl.pc.in.pc	2009-08-14 18:00:33.000000000 +0200
+++ pl-5.7.11/src/pl.pc.in	2009-08-14 18:01:03.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=${libdir}/@PL at -@PLVERSION@/include
 
 PLBASE=${libdir}/@PL at -@PLVERSION@
 PLARCH=@ARCH@


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- pl.spec	26 Jul 2009 18:51:37 -0000	1.62
+++ pl.spec	19 Aug 2009 17:56:58 -0000	1.63
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.7.11
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -17,6 +17,7 @@ Patch0:         %{name}-5.7.11-rpath.pat
 Patch1:         %{name}-5.7.11-jpl-configure.patch
 Patch2:         %{name}-5.7.11-man-files.patch
 Patch3:         %{name}-5.6.60-jni.patch
+Patch4:         %{name}-5.7.11-pc.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
@@ -103,6 +104,7 @@ in Prolog.  In both setups it provides a
 %patch1 -p1 -b .libjvm
 %patch2 -p1 -b .man-files
 %patch3 -p1 -b .jni
+%patch4 -p1 -b .pc
 (
    mkdir doc-install
    cd doc-install
@@ -166,13 +168,13 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{v
         $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/
 
 # Move the various include files into /usr/include
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include/*.h \
-        $RPM_BUILD_ROOT%{_includedir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \
-        $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
+#mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
+#mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include/*.h \
+#        $RPM_BUILD_ROOT%{_includedir}/%{name}
+#mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \
+#        $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
 
 # Move the binaries into %{_bindir} directly instead of using links
 rm -f $RPM_BUILD_ROOT%{_bindir}/*
@@ -205,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/%{name}-%{version}/library/jpl.pl
 # Devel
 %exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so
+%exclude %{_libdir}/%{name}-%{version}/include
+%exclude %{_libdir}/%{name}-%{version}/xpce-*/include
 # Static
 %exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.a
 # XPCE
@@ -226,9 +230,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/*.h
-%{_includedir}/%{name}/xpce
+%{_libdir}/%{name}-%{version}/include
+%{_libdir}/%{name}-%{version}/xpce-*/include
 %{_libdir}/%{name}-%{version}/lib/*/libpl.so
 %{_libdir}/pkgconfig/pl.pc
 
@@ -244,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 14 2009 Gerard Milmeister <gemi at bluewin.ch> - 5.7.11-4
+- move include files to expected place
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From wtogami at fedoraproject.org  Wed Aug 19 18:11:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 19 Aug 2009 18:11:00 +0000 (UTC)
Subject: rpms/pidgin/F-11 .cvsignore, 1.27, 1.28 pidgin.spec, 1.74,
	1.75 sources, 1.27, 1.28
Message-ID: <20090819181100.C3B1011C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19379

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
2.6.1: Fix a crash when some users send you a link in a Yahoo IM



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	18 Aug 2009 17:38:22 -0000	1.27
+++ .cvsignore	19 Aug 2009 18:11:00 -0000	1.28
@@ -1 +1 @@
-pidgin-2.6.0.tar.bz2
+pidgin-2.6.1.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- pidgin.spec	18 Aug 2009 17:38:23 -0000	1.74
+++ pidgin.spec	19 Aug 2009 18:11:00 -0000	1.75
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.0
+Version:	2.6.1
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -614,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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
+
 * Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
 - CVE-2009-2694
 - Voice and Video support via farsight2 (Fedora 11+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	18 Aug 2009 17:38:23 -0000	1.27
+++ sources	19 Aug 2009 18:11:00 -0000	1.28
@@ -1 +1 @@
-235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2
+306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2



From wtogami at fedoraproject.org  Wed Aug 19 18:12:02 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 19 Aug 2009 18:12:02 +0000 (UTC)
Subject: rpms/pidgin/F-10 .cvsignore, 1.27, 1.28 pidgin.spec, 1.79,
	1.80 sources, 1.27, 1.28
Message-ID: <20090819181202.AB05011C00E4@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20217

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
2.6.1: Fix a crash when some users send you a link in a Yahoo IM



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	18 Aug 2009 17:43:51 -0000	1.27
+++ .cvsignore	19 Aug 2009 18:12:02 -0000	1.28
@@ -1 +1 @@
-pidgin-2.6.0.tar.bz2
+pidgin-2.6.1.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- pidgin.spec	18 Aug 2009 17:43:51 -0000	1.79
+++ pidgin.spec	19 Aug 2009 18:12:02 -0000	1.80
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.0
+Version:	2.6.1
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -614,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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
+
 * Tue Aug 18 2009 Warren Togami <wtogami at redhat.com> 2.6.0-1
 - CVE-2009-2694
 - Voice and Video support via farsight2 (Fedora 11+)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	18 Aug 2009 17:43:51 -0000	1.27
+++ sources	19 Aug 2009 18:12:02 -0000	1.28
@@ -1 +1 @@
-235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2
+306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2



From dbhole at fedoraproject.org  Wed Aug 19 18:30:12 2009
From: dbhole at fedoraproject.org (Deepak Bhole)
Date: Wed, 19 Aug 2009 18:30:12 +0000 (UTC)
Subject: rpms/system-switch-java/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 system-switch-java.spec, 1.19, 1.20
Message-ID: <20090819183012.39E0E11C0439@cvs1.fedora.phx.redhat.com>

Author: dbhole

Update of /cvs/pkgs/rpms/system-switch-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22996

Modified Files:
	.cvsignore sources system-switch-java.spec 
Log Message:

- Update to 1.1.5 which fixes rhbz 493898 and adds more translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Oct 2008 18:49:48 -0000	1.7
+++ .cvsignore	19 Aug 2009 18:30:11 -0000	1.8
@@ -1 +1 @@
-system-switch-java-1.1.4.tar.gz
+system-switch-java-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Oct 2008 18:49:48 -0000	1.7
+++ sources	19 Aug 2009 18:30:12 -0000	1.8
@@ -1 +1 @@
-4821d0f9ff8e8f2020ebf599fe73cfcc  system-switch-java-1.1.4.tar.gz
+37975e70343a2d04d9ae69c1bdf7a65e  system-switch-java-1.1.5.tar.gz


Index: system-switch-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-switch-java/devel/system-switch-java.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- system-switch-java.spec	27 Jul 2009 05:26:48 -0000	1.19
+++ system-switch-java.spec	19 Aug 2009 18:30:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: system-switch-java
-Version: 1.1.4
-Release: 4%{?dist}
+Version: 1.1.5
+Release: 1%{?dist}
 Summary: A tool for changing the default Java toolset
 
 %define url https://fedorahosted.org
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/security/console.apps/%{name}
 
 %changelog
+* Wed Aug 19 2009 Deepak Bhole <dbhole at redhat.com>  - 1.1.5-1-1
+- Update to 1.1.5 which fixes rhbz 493898 and adds more translations
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Wed Aug 19 18:31:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 18:31:37 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.60,1.61
Message-ID: <20090819183137.526CA11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23280

Modified Files:
	libguestfs.spec 
Log Message:
BR should be mkisofs, not genisoimage, for EPEL.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- libguestfs.spec	19 Aug 2009 17:50:59 -0000	1.60
+++ libguestfs.spec	19 Aug 2009 18:31:37 -0000	1.61
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.68
-Release:     2%{?dist}
+Release:     3%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -22,7 +22,7 @@ BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 2.3
 #BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
-BuildRequires: genisoimage
+BuildRequires: mkisofs
 %ifarch %{ix86} x86_64
 BuildRequires: qemu-system-x86 >= 0.10.5
 %endif
@@ -534,9 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-2
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-3
 - New upstream release 1.0.68.
-- BR genisoimage.
+- BR mkisofs.
 
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.



From overholt at fedoraproject.org  Wed Aug 19 18:33:55 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 19 Aug 2009 18:33:55 +0000 (UTC)
Subject: rpms/pmd/devel pmd.spec,1.8,1.9
Message-ID: <20090819183355.C052711C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/pmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23722/devel

Modified Files:
	pmd.spec 
Log Message:
* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:4.2.5-4
- Install POM file and depmap entry


Index: pmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/pmd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pmd.spec	26 Jul 2009 18:59:17 -0000	1.8
+++ pmd.spec	19 Aug 2009 18:33:55 -0000	1.9
@@ -29,7 +29,7 @@
 #
 Name:           pmd
 Version:        4.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Scans Java source code and looks for potential problems
 License:        BSD
@@ -59,6 +59,8 @@ Requires:       objectweb-asm >= 0:3.1
 Requires:       xerces-j2
 Requires:       xml-commons-apis >= 1.3.02
 Requires:       jakarta-oro
+Requires(post):       jpackage-utils
+Requires(postun):     jpackage-utils
 Group:          Development/Tools
 Buildarch:      noarch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -117,6 +119,12 @@ cp -pr etc/xslt $RPM_BUILD_ROOT%{_datadi
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
 cp -pr rulesets/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
 
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -125,6 +133,12 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt etc/changelog.txt etc/fr_docs etc/readme.txt
@@ -132,12 +146,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/*.jar
 %{_datadir}/%{name}-%{version}
 %config(noreplace) %{_sysconfdir}/pmd-nicerhtml.xsl
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/*
 
 %changelog
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:4.2.5-4
+- Install POM file and depmap entry
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:4.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Wed Aug 19 18:51:56 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 19 Aug 2009 18:51:56 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.103, 1.104 audit.spec, 1.214,
	1.215 sources, 1.127, 1.128
Message-ID: <20090819185156.C207B11C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27163

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
add temporary compat package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	18 Aug 2009 18:13:00 -0000	1.103
+++ .cvsignore	19 Aug 2009 18:51:56 -0000	1.104
@@ -100,3 +100,4 @@ audit-1.7.11.tar.gz
 audit-1.7.12.tar.gz
 audit-1.7.13.tar.gz
 audit-2.0.tar.gz
+audit-1.8.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- audit.spec	18 Aug 2009 18:13:00 -0000	1.214
+++ audit.spec	19 Aug 2009 18:51:56 -0000	1.215
@@ -3,11 +3,12 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
+Source1: %{name}-1.8.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: swig python-devel
 BuildRequires: tcp_wrappers-devel libcap-ng-devel 
@@ -68,12 +69,25 @@ interface to the audit system, audispd. 
 like relay events to remote machines or analyze events for suspicious
 behavior.
 
+%package libs-compat
+Summary: Dynamic library for libaudit
+License: LGPLv2+
+Group: Development/Libraries
+
+%description libs-compat
+The audit-libs-compat package contains the dynamic libraries needed for 
+applications to use the audit 1.0 framework.
+
 %prep
 %setup -q
+tar -xzf %{SOURCE1}
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
+cd ../audit-1.8
+%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,6 +96,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
+cd ../audit-1.8
+make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
+cd ../%{name}-%{version}
 make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
@@ -90,9 +107,9 @@ mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $R
 mv $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir}
 curdir=`pwd`
 cd $RPM_BUILD_ROOT/%{_libdir}
-LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libaudit.so.*.*.*\``
+LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libaudit.so.1.*.*\``
 ln -s ../../%{_lib}/$LIBNAME libaudit.so
-LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*\``
+LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libauparse.so.0.*.*\``
 ln -s ../../%{_lib}/$LIBNAME libauparse.so
 cd $curdir
 # Remove these items so they don't get picked up.
@@ -136,9 +153,14 @@ if [ $1 -ge 1 ]; then
    /sbin/service auditd condrestart > /dev/null 2>&1 || :
 fi
 
+%files libs-compat
+%defattr(-,root,root,-)
+%attr(755,root,root) /%{_lib}/libaudit.so.0*
+%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+
 %files libs
 %defattr(-,root,root,-)
-%attr(755,root,root) /%{_lib}/libaudit.*
+%attr(755,root,root) /%{_lib}/libaudit.so.1*
 %attr(755,root,root) /%{_lib}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
 
@@ -216,7 +238,7 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
-* Tue Aug 18 2009 Steve Grubb <sgrubb at redhat.com> 2.0-1
+* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 2.0-2
 - New upstream release
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.13-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- sources	18 Aug 2009 18:13:00 -0000	1.127
+++ sources	19 Aug 2009 18:51:56 -0000	1.128
@@ -1 +1,2 @@
 d0c064c4646f8fe5c50de789c627f2da  audit-2.0.tar.gz
+26a74bb90c7f8c28705a90aed01e1ff2  audit-1.8.tar.gz



From mclasen at fedoraproject.org  Wed Aug 19 18:55:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 19 Aug 2009 18:55:36 +0000 (UTC)
Subject: rpms/control-center/devel unique-ids.patch, NONE,
	1.1 control-center.spec, 1.473, 1.474
Message-ID: <20090819185536.C598411C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27814

Modified Files:
	control-center.spec 
Added Files:
	unique-ids.patch 
Log Message:
make appearance capplet work again


unique-ids.patch:
 appearance.ui |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE unique-ids.patch ---
diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
index 61e02cf..5a77e1f 100644
--- a/capplets/appearance/data/appearance.ui
+++ b/capplets/appearance/data/appearance.ui
@@ -9,7 +9,7 @@
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
@@ -627,7 +627,7 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
@@ -2276,7 +2276,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label1">
+                      <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">_Input boxes:</property>


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -p -r1.473 -r1.474
--- control-center.spec	18 Aug 2009 01:14:12 -0000	1.473
+++ control-center.spec	19 Aug 2009 18:55:36 -0000	1.474
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -59,6 +59,9 @@ Patch47: save-as.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591375
 Patch50: slideshow-ui.patch
 
+# from upstream
+Patch55: unique-ids.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
@@ -182,6 +185,7 @@ utilities.
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .slideshow-ui
+%patch55 -p1 -b .unique-ids
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -361,6 +365,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
+- Make the appearance capplet work again
+
 * Mon Aug 17 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
 - Update to 2.27.90
 - Drop upstreamed patches



From toshio at fedoraproject.org  Wed Aug 19 18:57:46 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 19 Aug 2009 18:57:46 +0000 (UTC)
Subject: rpms/krecipes/F-10 .cvsignore, 1.7, 1.8 krecipes.spec, 1.16,
	1.17 sources, 1.7, 1.8 krecipes-0.9.1-gcc43.patch, 1.1,
	NONE krecipes-X11.patch, 1.1, NONE krecipes-gcc4.patch, 1.1, NONE
Message-ID: <20090819185746.6CF6511C00E4@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/krecipes/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28259

Modified Files:
	.cvsignore krecipes.spec sources 
Removed Files:
	krecipes-0.9.1-gcc43.patch krecipes-X11.patch 
	krecipes-gcc4.patch 
Log Message:

* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.beta2
- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting
  with sqlite backend.
- Reenable mysql and postgresql backends



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	31 Mar 2008 16:52:58 -0000	1.7
+++ .cvsignore	19 Aug 2009 18:57:46 -0000	1.8
@@ -1 +1 @@
-krecipes-0.9.1.tar.gz
+krecipes-1.0-beta2.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/F-10/krecipes.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- krecipes.spec	31 Mar 2008 16:52:58 -0000	1.16
+++ krecipes.spec	19 Aug 2009 18:57:46 -0000	1.17
@@ -1,22 +1,20 @@
 Name:           krecipes
-Version:        0.9.1
-Release:        9%{?dist}
+Version:        1.0
+Release:        0.1.beta2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://krecipes.sourceforge.net/
-Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}-beta2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs3-devel
 BuildRequires:  sqlite-devel
-
-Patch0:		krecipes-gcc4.patch
-Patch1:		krecipes-X11.patch
-Patch2:         krecipes-0.9.1-gcc43.patch
+BuildRequires:  mysql-devel
+BuildRequires:  postgresql-devel
 
 %description
 Krecipes is a program that lets you to manage your recipes, create
@@ -25,25 +23,16 @@ your menu/diet in advance.
 
 
 %prep
-%setup -q
-
-## Neither patch0 or patch1 should be required anymore -- Rex
-#patch0 -p1 -b .gcc4
-# autoconf tools check for X is a file in libXt-devel  and Xt lib
-# we dont use or link against libXt so rather than adding an extra
-# BuildRequires I patched configure to look for something thats there
-#patch1 -p1 -b .X11
-
-%patch2 -p1 -b .gcc43
-
+%setup -q -n %{name}-%{version}-beta2
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
   --disable-rpath \
-  --without-mysql \
-  --without-postgresql
+  --with-mysql \
+  --with-postgresql \
+  --with-sqlite
 
 make %{?_smp_mflags}
 
@@ -97,6 +86,20 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-0.1.beta2
+- Update to 1.0beta2 as it fixes a crash that prevents krecipes from starting
+  with sqlite backend.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.1-11
+- re-enable mysql/postgresql support
+- re-enable mostly harmless X11 patch 
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Mar 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.1-9
 - gcc43 patch (#433986)
 - BR: gettext


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krecipes/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Mar 2008 16:52:58 -0000	1.7
+++ sources	19 Aug 2009 18:57:46 -0000	1.8
@@ -1 +1 @@
-7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz
+ad02ed6225cff51d8688cf4ab16bd82f  krecipes-1.0-beta2.tar.gz


--- krecipes-0.9.1-gcc43.patch DELETED ---


--- krecipes-X11.patch DELETED ---


--- krecipes-gcc4.patch DELETED ---



From dwalsh at fedoraproject.org  Wed Aug 19 19:02:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 19 Aug 2009 19:02:30 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-sepolgen.patch, 1.27,
	1.28 policycoreutils.spec, 1.623, 1.624
Message-ID: <20090819190230.413DB11C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29139

Modified Files:
	policycoreutils-sepolgen.patch policycoreutils.spec 
Log Message:
* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-5
- Fix sepolgen again


policycoreutils-sepolgen.patch:
 audit.py     |   32 ++++++++++++++++++++++++++++++++
 refparser.py |    2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- policycoreutils-sepolgen.patch	19 Aug 2009 13:08:28 -0000	1.27
+++ policycoreutils-sepolgen.patch	19 Aug 2009 19:02:29 -0000	1.28
@@ -55,7 +55,7 @@ diff --exclude-from=exclude -N -u -r nsa
      modules = []
      support_macros = None
 -    blacklist = ["init.if", "inetd.if", "uml.if", "thunderbird.if"]
-+    blacklist = ["uml.if", "thunderbird.if, unconfined.if"]
++    blacklist = ["uml.if", "thunderbird.if", "unconfined.if"]
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -p -r1.623 -r1.624
--- policycoreutils.spec	18 Aug 2009 19:25:06 -0000	1.623
+++ policycoreutils.spec	19 Aug 2009 19:02:29 -0000	1.624
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-5
+- Fix sepolgen again
+
 * Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-4
 - Add --boot flag to audit2allow to get all AVC messages since last boot
 



From tmraz at fedoraproject.org  Wed Aug 19 19:06:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 19 Aug 2009 19:06:40 +0000 (UTC)
Subject: rpms/pam/devel pam.spec,1.201,1.202
Message-ID: <20090819190640.88DB511C00E4@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29867

Modified Files:
	pam.spec 
Log Message:
* Wed Aug 19 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-4
- rebuild with new libaudit



Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- pam.spec	11 Aug 2009 11:50:50 -0000	1.201
+++ pam.spec	19 Aug 2009 19:06:40 -0000	1.202
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 # pam_rhosts_auth module is BSD with advertising
@@ -327,6 +327,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Wed Aug 19 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-4
+- rebuild with new libaudit
+
 * Mon Jul 27 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-3
 - fix for pam_cracklib from upstream
 



From sgrubb at fedoraproject.org  Wed Aug 19 19:06:41 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 19 Aug 2009 19:06:41 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.215,1.216
Message-ID: <20090819190641.6D00211C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29889

Modified Files:
	audit.spec 
Log Message:
* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 2.0-2
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- audit.spec	19 Aug 2009 18:51:56 -0000	1.215
+++ audit.spec	19 Aug 2009 19:06:41 -0000	1.216
@@ -96,10 +96,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
-cd ../audit-1.8
-make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
-cd ../%{name}-%{version}
-make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
+cd %_sourcedir/audit-1.8
+make DESTDIR=$RPM_BUILD_ROOT install
+cd %_sourcedir/%{name}-%{version}
+make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
 # This winds up in the wrong place when libtool is involved



From rjones at fedoraproject.org  Wed Aug 19 19:11:53 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 19:11:53 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.61,1.62
Message-ID: <20090819191153.F401A11C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30754

Modified Files:
	libguestfs.spec 
Log Message:
For EPEL only we need e4fsprogs.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- libguestfs.spec	19 Aug 2009 18:31:37 -0000	1.61
+++ libguestfs.spec	19 Aug 2009 19:11:53 -0000	1.62
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.68
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -41,6 +41,7 @@ BuildRequires: kernel, bash, coreutils, 
 BuildRequires: MAKEDEV, net-tools, file
 BuildRequires: module-init-tools, procps, strace, iputils
 BuildRequires: dosfstools, lsof, scrub, libselinux
+BuildRequires: e4fsprogs
 # Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree
 # Not working: augeas-libs
 %ifarch %{ix86} x86_64
@@ -52,6 +53,7 @@ Requires:      kernel, bash, coreutils, 
 Requires:      MAKEDEV, net-tools, file
 Requires:      module-init-tools, procps, strace, iputils
 Requires:      dosfstools, lsof, scrub, libselinux
+Requires:      e4fsprogs
 # Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree
 # Not working: augeas-libs
 %ifarch %{ix86} x86_64
@@ -534,9 +536,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-3
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-4
 - New upstream release 1.0.68.
 - BR mkisofs.
+- For EPEL only we need e4fsprogs.
 
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.



From sgrubb at fedoraproject.org  Wed Aug 19 19:16:54 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 19 Aug 2009 19:16:54 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.216,1.217
Message-ID: <20090819191654.E76A511C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32229

Modified Files:
	audit.spec 
Log Message:
* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 2.0-2
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- audit.spec	19 Aug 2009 19:06:41 -0000	1.216
+++ audit.spec	19 Aug 2009 19:16:54 -0000	1.217
@@ -96,9 +96,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
-cd %_sourcedir/audit-1.8
+cd %_buildrootdir/audit-1.8
 make DESTDIR=$RPM_BUILD_ROOT install
-cd %_sourcedir/%{name}-%{version}
+cd %_buildrootdir/%{name}-%{version}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}



From sgrubb at fedoraproject.org  Wed Aug 19 19:23:25 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 19 Aug 2009 19:23:25 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.217,1.218
Message-ID: <20090819192325.76BE211C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv875

Modified Files:
	audit.spec 
Log Message:
* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 2.0-2
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- audit.spec	19 Aug 2009 19:16:54 -0000	1.217
+++ audit.spec	19 Aug 2009 19:23:25 -0000	1.218
@@ -85,7 +85,7 @@ tar -xzf %{SOURCE1}
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
-cd ../audit-1.8
+cd audit-1.8
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
 
@@ -96,9 +96,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
-cd %_buildrootdir/audit-1.8
+cd audit-1.8
 make DESTDIR=$RPM_BUILD_ROOT install
-cd %_buildrootdir/%{name}-%{version}
+cd .. 
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}



From nhosoi at fedoraproject.org  Wed Aug 19 19:34:51 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Wed, 19 Aug 2009 19:34:51 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 389-ds-base.spec,1.2,1.3
Message-ID: <20090819193451.DA6F011C00E4@cvs1.fedora.phx.redhat.com>

Author: nhosoi

Update of /cvs/extras/rpms/389-ds-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921/F-10

Modified Files:
	389-ds-base.spec 
Log Message:
- added template-initconfig to %files



Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base.spec	12 Aug 2009 19:46:53 -0000	1.2
+++ 389-ds-base.spec	19 Aug 2009 19:34:51 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -150,6 +150,7 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -173,6 +174,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-2
+- added template-initconfig to %files
+
 * Mon May 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-1
 - uses pcre
 - change name to 389



From nhosoi at fedoraproject.org  Wed Aug 19 19:34:51 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Wed, 19 Aug 2009 19:34:51 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 389-ds-base.spec,1.2,1.3
Message-ID: <20090819193451.EF56711C02CB@cvs1.fedora.phx.redhat.com>

Author: nhosoi

Update of /cvs/extras/rpms/389-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921/F-11

Modified Files:
	389-ds-base.spec 
Log Message:
- added template-initconfig to %files



Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base.spec	12 Aug 2009 19:46:53 -0000	1.2
+++ 389-ds-base.spec	19 Aug 2009 19:34:51 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -150,6 +150,7 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -173,6 +174,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-2
+- added template-initconfig to %files
+
 * Mon May 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-1
 - uses pcre
 - change name to 389



From nhosoi at fedoraproject.org  Wed Aug 19 19:34:52 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Wed, 19 Aug 2009 19:34:52 +0000 (UTC)
Subject: rpms/389-ds-base/devel 389-ds-base.spec,1.3,1.4
Message-ID: <20090819193452.41C1911C02CB@cvs1.fedora.phx.redhat.com>

Author: nhosoi

Update of /cvs/extras/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921/devel

Modified Files:
	389-ds-base.spec 
Log Message:
- added template-initconfig to %files



Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base.spec	12 Aug 2009 19:46:53 -0000	1.3
+++ 389-ds-base.spec	19 Aug 2009 19:34:52 -0000	1.4
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -150,6 +150,7 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -173,6 +174,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-4
+- added template-initconfig to %files
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-3
 - added BuildRequires pcre
 



From nhosoi at fedoraproject.org  Wed Aug 19 19:34:52 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Wed, 19 Aug 2009 19:34:52 +0000 (UTC)
Subject: rpms/389-ds-base/F-9 389-ds-base.spec,1.1,1.2
Message-ID: <20090819193452.2054411C00E4@cvs1.fedora.phx.redhat.com>

Author: nhosoi

Update of /cvs/extras/rpms/389-ds-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921/F-9

Modified Files:
	389-ds-base.spec 
Log Message:
- added template-initconfig to %files



Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-9/389-ds-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base.spec	4 Jun 2009 16:20:09 -0000	1.1
+++ 389-ds-base.spec	19 Aug 2009 19:34:52 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -149,6 +149,7 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -172,6 +173,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-2
+- added template-initconfig to %files
+
 * Mon May 18 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.1-1
 - change name to 389
 - change version to 1.2.1



From rrati at fedoraproject.org  Wed Aug 19 19:46:26 2009
From: rrati at fedoraproject.org (rrati)
Date: Wed, 19 Aug 2009 19:46:26 +0000 (UTC)
Subject: rpms/condor-ec2-enhanced/devel .cvsignore, 1.2,
	1.3 condor-ec2-enhanced.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3 chkconfig_off.patch, 1.1, NONE
Message-ID: <20090819194626.BC13A11C00E4@cvs1.fedora.phx.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/condor-ec2-enhanced/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5485/devel

Modified Files:
	.cvsignore condor-ec2-enhanced.spec import.log sources 
Removed Files:
	chkconfig_off.patch 
Log Message:
- caroniad checks condor_config for its configuration before looking
  in configuration files
- Removed the init script as the daemon is controlled by condor now
- Split the documentation into two files, one for the AMI and one for
  the submit machine
- Added conflict with condor-low-latency



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 14:52:09 -0000	1.2
+++ .cvsignore	19 Aug 2009 19:46:26 -0000	1.3
@@ -1 +1 @@
-condor-ec2-enhanced-1.0-16.tar.gz
+condor-ec2-enhanced-1.0-17.tar.gz


Index: condor-ec2-enhanced.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/condor-ec2-enhanced.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- condor-ec2-enhanced.spec	29 Jul 2009 14:52:09 -0000	1.1
+++ condor-ec2-enhanced.spec	19 Aug 2009 19:46:26 -0000	1.2
@@ -1,5 +1,5 @@
 %{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
-%define rel 16
+%define rel 17
 
 Summary: EC2 Enhanced
 Name: condor-ec2-enhanced
@@ -12,7 +12,6 @@ URL: http://www.redhat.com/mrg
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}-%{rel}.tar.gz
-Patch0: chkconfig_off.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: python >= 2.4
@@ -22,11 +21,7 @@ Requires: python-condor-job-hooks-common
 Requires: python-condor-ec2-enhanced-hooks-common
 Requires: python-boto >= 1.7a
 Requires: openssl
-
-Requires(post):/sbin/chkconfig
-Requires(preun):/sbin/chkconfig
-Requires(preun):/sbin/service
-Requires(postun):/sbin/service
+Conflicts: condor-low-latency
 
 %description
 The EC2 Enhanced feature allows for near seamless translation of Condor jobs
@@ -41,9 +36,6 @@ feature.
 
 %prep
 %setup -q
-%if 0%{?is_fedora} != 0
-%patch0 -p1
-%endif
 
 %build
 
@@ -51,43 +43,37 @@ feature.
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/%{_sysconfdir}/condor
-mkdir -p %{buildroot}/%{_initrddir}
 cp -f caroniad %{buildroot}/%_sbindir
 cp -f config/caroniad.conf %{buildroot}/%{_sysconfdir}/condor
-cp -f config/condor-ec2-enhanced.init %{buildroot}/%{_initrddir}/condor-ec2-enhanced
 
 %clean
 rm -rf %{buildroot}
 
 %post
-/sbin/chkconfig --add condor-ec2-enhanced
 %if 0%{?is_fedora} == 0
 if [[ -f /etc/opt/grid/caroniad.conf ]]; then
    mv -f /etc/opt/grid/caroniad.conf /etc/condor
    rmdir --ignore-fail-on-non-empty -p /etc/opt/grid
 fi
 %endif
-
-%preun
-if [ $1 = 0 ]; then
-  /sbin/service condor-ec2-enhanced stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del condor-ec2-enhanced
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
-  /sbin/service condor-ec2-enhanced condrestart >/dev/null 2>&1 || :
-fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt
+%doc LICENSE-2.0.txt INSTALL
 %config(noreplace) %_sysconfdir/condor/caroniad.conf
 %defattr(0755,root,root,-)
-%_initrddir/condor-ec2-enhanced
 %_sbindir/caroniad
 
 %changelog
+* Tue Aug 18 2009  <rrati at redhat> - 1.0-17
+- caroniad checks condor_config for its configuration before looking
+  in configuration files
+- Removed the init script as the daemon is controlled by condor now
+- Split the documentation into two files, one for the AMI and one for
+  the submit machine
+- Added conflict with condor-low-latency
+
 * Mon Jul 27 2009  <rrati at redhat> - 1.0-16
 - Fixed missed dependency renames
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 14:52:09 -0000	1.1
+++ import.log	19 Aug 2009 19:46:26 -0000	1.2
@@ -1 +1,2 @@
 condor-ec2-enhanced-1_0-16_fc10:HEAD:condor-ec2-enhanced-1.0-16.fc10.src.rpm:1248879115
+condor-ec2-enhanced-1_0-17_fc10:HEAD:condor-ec2-enhanced-1.0-17.fc10.src.rpm:1250711089


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 14:52:09 -0000	1.2
+++ sources	19 Aug 2009 19:46:26 -0000	1.3
@@ -1 +1 @@
-762c914ad6fc8fd3e5a9eef47eef852b  condor-ec2-enhanced-1.0-16.tar.gz
+e46a92c91f052c05b826bd2b5908d1a2  condor-ec2-enhanced-1.0-17.tar.gz


--- chkconfig_off.patch DELETED ---



From rrati at fedoraproject.org  Wed Aug 19 19:48:50 2009
From: rrati at fedoraproject.org (rrati)
Date: Wed, 19 Aug 2009 19:48:50 +0000 (UTC)
Subject: rpms/condor-ec2-enhanced-hooks/devel .cvsignore, 1.3,
	1.4 condor-ec2-enhanced-hooks.spec, 1.2, 1.3 import.log, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090819194850.0C21D11C00E4@cvs1.fedora.phx.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/condor-ec2-enhanced-hooks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5993/devel

Modified Files:
	.cvsignore condor-ec2-enhanced-hooks.spec import.log sources 
Log Message:
- Removed reading the amazonsqsqueuename and stopped using GlobalJobId
  in the SQS queue name.  Instead, Cluster ID, Proc ID, and QDate are used so
  now SQS queues are:
  <AWS_ID>-<ClusterId><ProcId><Qdate>[-status]
- Split the documentation into two files, one for the AMI and one for
  the submit machine



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced-hooks/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 12:35:58 -0000	1.3
+++ .cvsignore	19 Aug 2009 19:48:49 -0000	1.4
@@ -1 +1 @@
-condor-ec2-enhanced-hooks-1.0-18.tar.gz
+condor-ec2-enhanced-hooks-1.0-19.tar.gz


Index: condor-ec2-enhanced-hooks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced-hooks/devel/condor-ec2-enhanced-hooks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- condor-ec2-enhanced-hooks.spec	30 Jul 2009 12:35:58 -0000	1.2
+++ condor-ec2-enhanced-hooks.spec	19 Aug 2009 19:48:49 -0000	1.3
@@ -1,5 +1,5 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define rel 18
+%define rel 19
 
 Summary: Condor EC2 Enhanced hooks
 Name: condor-ec2-enhanced-hooks
@@ -37,7 +37,7 @@ Summary: Common functions/utilities for 
 Group: Applications/System
 BuildRequires: python-devel
 Requires: python >= 2.3
-Obsoletes: condor-ec2-enhanced-common
+Obsoletes: condor-ec2-enhanced-hooks-common
 
 %description -n python-%{name}-common
 Common functions and utilities used by MRG condor job hooks.
@@ -76,6 +76,16 @@ rm -rf %{buildroot}
 %{python_sitelib}/ec2enhanced/__init__.py*
 
 %changelog
+* Tue Aug 18 2009  <rrati at redhat> - 1.0-19
+- Split the documentation into two files, one for the AMI and one for
+  the submit machine
+- Fixed obsolete issue with common package
+- SQS/S3 queues/buckets no longer use GlobalJobId because they can be too
+  long for AWS.  Instead, ClusterId, ProcId, and QDate is used.
+
+* Mon Jul 27 2009  <rrati at redhat> - 1.0-18
+- Fixed dependency issue
+
 * Mon Jul 27 2009  <rrati at redhat> - 1.0-17
 - Fixed missed dependency renames
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced-hooks/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	30 Jul 2009 12:35:58 -0000	1.2
+++ import.log	19 Aug 2009 19:48:49 -0000	1.3
@@ -1,2 +1,3 @@
 condor-ec2-enhanced-hooks-1_0-17_fc10:HEAD:condor-ec2-enhanced-hooks-1.0-17.fc10.src.rpm:1248879764
 condor-ec2-enhanced-hooks-1_0-18_fc10:HEAD:condor-ec2-enhanced-hooks-1.0-18.fc10.src.rpm:1248957343
+condor-ec2-enhanced-hooks-1_0-19_fc10:HEAD:condor-ec2-enhanced-hooks-1.0-19.fc10.src.rpm:1250711261


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor-ec2-enhanced-hooks/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 12:35:58 -0000	1.3
+++ sources	19 Aug 2009 19:48:49 -0000	1.4
@@ -1 +1 @@
-6875713d3f5fb211c6d590088f1ac3cb  condor-ec2-enhanced-hooks-1.0-18.tar.gz
+40f9205f907e8f03c59743170fbbc0eb  condor-ec2-enhanced-hooks-1.0-19.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 19 19:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 19:49:36 +0000
Subject: [pkgdb] smarteiffel ownership updated
Message-ID: <20090819194936.5585710F857@bastion2.fedora.phx.redhat.com>

Package smarteiffel in Fedora 11 was orphaned by gemi

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/smarteiffel



From pkgdb at fedoraproject.org  Wed Aug 19 19:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 19:49:45 +0000
Subject: [pkgdb] smarteiffel ownership updated
Message-ID: <20090819194945.B57E210F87A@bastion2.fedora.phx.redhat.com>

Package smarteiffel in Fedora devel was orphaned by gemi

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/smarteiffel



From pkgdb at fedoraproject.org  Wed Aug 19 19:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 19:49:38 +0000
Subject: [pkgdb] smarteiffel ownership updated
Message-ID: <20090819194938.E7B7F10F85B@bastion2.fedora.phx.redhat.com>

Package smarteiffel in Fedora 10 was orphaned by gemi

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/smarteiffel



From ensc at fedoraproject.org  Wed Aug 19 19:50:38 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 19:50:38 +0000 (UTC)
Subject: rpms/milter-greylist/devel .cvsignore, 1.6, 1.7 lastver, 1.5,
	1.6 sources, 1.14, 1.15
Message-ID: <20090819195038.DD46D11C0417@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6629

Modified Files:
	.cvsignore lastver sources 
Log Message:
updated to 4.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Apr 2009 12:01:30 -0000	1.6
+++ .cvsignore	19 Aug 2009 19:50:38 -0000	1.7
@@ -1 +1 @@
-milter-greylist-4.2.2.tgz
+milter-greylist-4.2.3.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lastver	11 Apr 2009 12:01:30 -0000	1.5
+++ lastver	19 Aug 2009 19:50:38 -0000	1.6
@@ -1 +1 @@
-4.2.2
+4.3.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Apr 2009 12:01:30 -0000	1.14
+++ sources	19 Aug 2009 19:50:38 -0000	1.15
@@ -1 +1 @@
-ed287c8371b9a5818835387dc101d02a  milter-greylist-4.2.2.tgz
+e821a8a4527c1e313f21fe36dbde4a24  milter-greylist-4.2.3.tgz



From rrati at fedoraproject.org  Wed Aug 19 19:52:00 2009
From: rrati at fedoraproject.org (rrati)
Date: Wed, 19 Aug 2009 19:52:00 +0000 (UTC)
Subject: rpms/condor-job-hooks/devel .cvsignore, 1.2,
	1.3 condor-job-hooks.spec, 
	1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090819195200.236B011C00E4@cvs1.fedora.phx.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/condor-job-hooks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6840/devel

Modified Files:
	.cvsignore condor-job-hooks.spec import.log sources 
Log Message:
- Hooks use JOB_HOOK as keyword instead of LL_HOOK
- Split documentation into two files, one for carod and one for
  the job-hooks



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor-job-hooks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 15:04:21 -0000	1.2
+++ .cvsignore	19 Aug 2009 19:51:59 -0000	1.3
@@ -1 +1 @@
-condor-job-hooks-1.0-9.tar.gz
+condor-job-hooks-1.0-12.tar.gz


Index: condor-job-hooks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor-job-hooks/devel/condor-job-hooks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- condor-job-hooks.spec	29 Jul 2009 15:04:21 -0000	1.1
+++ condor-job-hooks.spec	19 Aug 2009 19:51:59 -0000	1.2
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
-%define rel 9
+%define rel 12
 
 Summary: Condor Job Hooks
 Name: condor-job-hooks
@@ -64,7 +64,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt
+%doc LICENSE-2.0.txt INSTALL
 %config(noreplace) %{_sysconfdir}/condor/job-hooks.conf
 %defattr(0755,root,root,-)
 %_libexecdir/condor/hooks/hook_fetch_work.py*
@@ -80,6 +80,17 @@ rm -rf %{buildroot}
 %{python_sitelib}/jobhooks/__init__.py*
 
 %changelog
+* Tue Aug 18 2009  <rrati at redhat> - 1.0-12
+- Job hooks use JOB_HOOK as keyword instead of LL_HOOK
+- Fixed version numbering
+
+* Tue Aug 18 2009  <rrati at redhat> - 1.0-11
+- Split documentation into two files, one for carod and one for
+  the job-hooks
+
+* Mon Aug 17 2009  <rrati at redhat> - 1.0-10
+- Minor cleanup in common functions
+
 * Mon Jul 27 2009  <rrati at redhat> - 1.0-9
 - Renamed condor-job-hooks-common to python-condor-job-hooks-common to
   conform to packaging guidelines since the package installs in


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/condor-job-hooks/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 15:04:21 -0000	1.1
+++ import.log	19 Aug 2009 19:51:59 -0000	1.2
@@ -1 +1,2 @@
 condor-job-hooks-1_0-9_fc10:HEAD:condor-job-hooks-1.0-9.fc10.src.rpm:1248879849
+condor-job-hooks-1_0-12_fc10:HEAD:condor-job-hooks-1.0-12.fc10.src.rpm:1250711441


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor-job-hooks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 15:04:21 -0000	1.2
+++ sources	19 Aug 2009 19:51:59 -0000	1.3
@@ -1 +1 @@
-2dbad442f90772d32bf0b37860efc09f  condor-job-hooks-1.0-9.tar.gz
+8aa785ccc871c30c0f81ca8e4307bb8e  condor-job-hooks-1.0-12.tar.gz



From ensc at fedoraproject.org  Wed Aug 19 19:52:04 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 19:52:04 +0000 (UTC)
Subject: rpms/milter-greylist/devel milter-greylist.upstart,1.1,1.2
Message-ID: <20090819195204.45AA511C00E4@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7128

Modified Files:
	milter-greylist.upstart 
Log Message:
simplified upstart script as #501155 is solved



Index: milter-greylist.upstart
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.upstart,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- milter-greylist.upstart	7 Mar 2009 12:22:30 -0000	1.1
+++ milter-greylist.upstart	19 Aug 2009 19:52:04 -0000	1.2
@@ -1,12 +1,8 @@
 ### Uncomment matching 'start' lines below.
 
 ### Uncomment these two lines when you want milter-greylist to be a
-### milter for a remote machine. 
-### 'starting\ local' and 'starting local' should be uncommented
-### together as former is required due to broken Fedora initscripts
-### and later is the correct one
+### milter for a remote machine.
 
-#start on starting\ local
 #start on starting local
 
 



From ensc at fedoraproject.org  Wed Aug 19 19:54:01 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 19:54:01 +0000 (UTC)
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.32,1.33
Message-ID: <20090819195401.5B95211C00E4@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	milter-greylist.spec 
Log Message:
- updated to 4.2.3
- use conditionalized %%noarch macro to mark noarch subpackages
- simplified upstart initscript because #501155 is solved



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- milter-greylist.spec	25 Jul 2009 12:11:58 -0000	1.32
+++ milter-greylist.spec	19 Aug 2009 19:54:01 -0000	1.33
@@ -2,11 +2,12 @@
 ##   --with spf        ...  enable SPF support
 
 ## Fedora Extras specific customization below...
-%bcond_without 			fedora
-%bcond_with			spf
+%bcond_without		fedora
+%bcond_without		noarch
+%bcond_with		spf
 ##
 
-#global beta		b1
+%{?with_noarch:%global noarch	BuildArch:	noarch}
 
 %global username	grmilter
 %global vardir		%_var/lib/%name
@@ -18,7 +19,7 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	4.2.2
+Version:	4.2.3
 Release:	%release_func 1%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
@@ -50,7 +51,7 @@ Requires(post):		%__chkconfig
 Requires(preun):	%__chkconfig
 Provides:		%name-sysv = %version-%release
 Obsoletes:		%name-sysv < %version-%release
-BuildArch:		noarch
+%{?noarch}
 
 %package upstart
 Summary:		upstart initscripts for %name
@@ -59,10 +60,11 @@ Source10:		%name.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
-BuildArch:		noarch
+%{?noarch}
+
 
 %description
 Greylisting is a new method of blocking significant amounts of spam at
@@ -212,6 +214,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1
+- updated to 4.2.3
+- use conditionalized %%noarch macro to mark noarch subpackages
+- simplified upstart initscript because #501155 is solved
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -246,7 +253,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.0-2
 - Autorebuild for GCC 4.3
-
+g
 * Sat Nov 10 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.0-1
 - updated to final 4.0
 - fixed conflicts between libbind and libresolv by linking them manually



From rrati at fedoraproject.org  Wed Aug 19 19:54:11 2009
From: rrati at fedoraproject.org (rrati)
Date: Wed, 19 Aug 2009 19:54:11 +0000 (UTC)
Subject: rpms/condor-low-latency/devel .cvsignore, 1.2,
	1.3 condor-low-latency.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090819195411.AC8E511C00E4@cvs1.fedora.phx.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/condor-low-latency/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7495/devel

Modified Files:
	.cvsignore condor-low-latency.spec import.log sources 
Log Message:
- Split documentation into two files, one for carod and one for
  the job-hooks
- Added conflict with condor-ec2-enhanced
- Removed ll_condor_config and pulled its contents into the INSTALL
  documentation
- Better exception handling when dealing with broker connection issues
- Fixed typo that allows correct usage of --help
- carod handles broker restart while running



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor-low-latency/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 15:05:35 -0000	1.2
+++ .cvsignore	19 Aug 2009 19:54:11 -0000	1.3
@@ -1 +1 @@
-condor-low-latency-1.0-17.tar.gz
+condor-low-latency-1.0-19.tar.gz


Index: condor-low-latency.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor-low-latency/devel/condor-low-latency.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- condor-low-latency.spec	29 Jul 2009 15:05:35 -0000	1.1
+++ condor-low-latency.spec	19 Aug 2009 19:54:11 -0000	1.2
@@ -1,5 +1,5 @@
 %{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
-%define rel 17
+%define rel 19
 
 Summary: Low Latency Scheduling
 Name: condor-low-latency
@@ -19,6 +19,7 @@ Requires: condor >= 7.0.2-4
 Requires: condor-job-hooks
 Requires: python-condor-job-hooks-common
 Requires: python-qpid
+Conflicts: condor-ec2-enhanced
 
 %description
 Low Latency Scheduling provides a means for bypassing condor's normal
@@ -51,12 +52,23 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt ll_condor_config
+%doc LICENSE-2.0.txt INSTALL
 %config(noreplace) %_sysconfdir/condor/carod.conf
 %defattr(0755,root,root,-)
 %_sbindir/carod
 
 %changelog
+* Tue Aug 18 2009  <rrati at redhat> - 1.0-19
+- Split documentation into two files, one for carod and one for
+  the job-hooks
+- Added conflict with condor-ec2-enhanced
+- Removed ll_condor_config and pulled its contents into the INSTALL
+  documentation
+
+* Mon Aug 17 2009  <rrati at redhat> - 1.0-18
+- Handle AMQP broker restarts (BZ488998)
+- Fixed typo that allows correct usage of --help (BZ491826)
+
 * Mon Jul 27 2009  <rrati at redhat> - 1.0-17
 - Clean up buildroot in install section
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/condor-low-latency/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 15:05:35 -0000	1.1
+++ import.log	19 Aug 2009 19:54:11 -0000	1.2
@@ -1 +1,2 @@
 condor-low-latency-1_0-17_fc10:HEAD:condor-low-latency-1.0-17.fc10.src.rpm:1248879923
+condor-low-latency-1_0-19_fc10:HEAD:condor-low-latency-1.0-19.fc10.src.rpm:1250711579


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor-low-latency/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 15:05:35 -0000	1.2
+++ sources	19 Aug 2009 19:54:11 -0000	1.3
@@ -1 +1 @@
-6942773751dcd775eda0778c7057aa86  condor-low-latency-1.0-17.tar.gz
+61ce92ed917f8199b1ec40bd90eb3a7a  condor-low-latency-1.0-19.tar.gz



From ensc at fedoraproject.org  Wed Aug 19 19:59:29 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 19:59:29 +0000 (UTC)
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.33,1.34
Message-ID: <20090819195929.A262011C00E4@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9088

Modified Files:
	milter-greylist.spec 
Log Message:
fixed typo


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- milter-greylist.spec	19 Aug 2009 19:54:01 -0000	1.33
+++ milter-greylist.spec	19 Aug 2009 19:59:29 -0000	1.34
@@ -253,7 +253,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.0-2
 - Autorebuild for GCC 4.3
-g
+
 * Sat Nov 10 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.0-1
 - updated to final 4.0
 - fixed conflicts between libbind and libresolv by linking them manually



From ensc at fedoraproject.org  Wed Aug 19 20:00:47 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 20:00:47 +0000 (UTC)
Subject: rpms/milter-greylist/F-11 .cvsignore, 1.6, 1.7 lastver, 1.5,
	1.6 milter-greylist.spec, 1.31, 1.32 sources, 1.14, 1.15 verinfo,
	1.2, 1.3
Message-ID: <20090819200047.34C0411C00E4@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9405

Modified Files:
	.cvsignore lastver milter-greylist.spec sources verinfo 
Log Message:
updated to 4.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Apr 2009 12:01:30 -0000	1.6
+++ .cvsignore	19 Aug 2009 20:00:46 -0000	1.7
@@ -1 +1 @@
-milter-greylist-4.2.2.tgz
+milter-greylist-4.2.3.tgz


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-11/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lastver	11 Apr 2009 12:01:30 -0000	1.5
+++ lastver	19 Aug 2009 20:00:46 -0000	1.6
@@ -1 +1 @@
-4.2.2
+4.2.3


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-11/milter-greylist.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- milter-greylist.spec	11 Apr 2009 12:01:30 -0000	1.31
+++ milter-greylist.spec	19 Aug 2009 20:00:46 -0000	1.32
@@ -18,7 +18,7 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	4.2.2
+Version:	4.2.3
 Release:	%release_func 0%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
@@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1
+- updated to 4.2.3
+
 * Sat Apr 11 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.2-0.
 - updated to 4.2.2
 - removed patches which where applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Apr 2009 12:01:30 -0000	1.14
+++ sources	19 Aug 2009 20:00:47 -0000	1.15
@@ -1 +1 @@
-ed287c8371b9a5818835387dc101d02a  milter-greylist-4.2.2.tgz
+e821a8a4527c1e313f21fe36dbde4a24  milter-greylist-4.2.3.tgz


Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-11/verinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- verinfo	10 Nov 2007 17:09:09 -0000	1.2
+++ verinfo	19 Aug 2009 20:00:47 -0000	1.3
@@ -1,2 +1,2 @@
 ftp://ftp.espci.fr/pub/milter-greylist/
-milter-greylist-([0-9.]*?)\.t(?:gz|ar)
+milter-greylist-(4\.2\.[0-9.]*?)\.t(?:gz|ar)



From ensc at fedoraproject.org  Wed Aug 19 20:06:51 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 20:06:51 +0000 (UTC)
Subject: rpms/milter-greylist/devel ChangeLog.rpm, NONE,
	1.1 milter-greylist.spec, 1.34, 1.35
Message-ID: <20090819200651.73AB211C00E4@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10867

Modified Files:
	milter-greylist.spec 
Added Files:
	ChangeLog.rpm 
Log Message:
moved pre-2007 %changelog entries into ChangeLog.rpm



--- NEW FILE ChangeLog.rpm ---
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.12-3
- rebuilt for unwind info generation, broken in gcc-4.1.1-21

* Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-2
- updated to 2.1.12
- use new fedora-usermgmt stuff

* Sat Apr 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.4-1
- updated to 2.1.4

* Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-3
- rebuilt for FC5

* Sat Dec 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-2
- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
- do not set user and socket in the sysv-initscript anymore; instead
  of uncomment the configfile entries
- ship minit params file as SOURCE instead of generating it on-the-fly
- added -initng subpackage
- minor specfile cleanups

* Sat Oct 22 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-1
- updated to 2.0.2

* Sat Jun 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0-2
- updated to final 2.0

* Sat Jun 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0-0.1.rc5
- updated to 2.0rc5
- added patch which changes the way how the user will be switched in
  the SysV initscript
- removed all other patches as they are upstream now

* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-3
- set %%dist
- use %%global instead of %%define
- do not require 'setuidgid' for -minit anymore

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Thu Feb  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.6
- updated to 1.6

* Thu Oct  7 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4-0.fdr.2
- rebuilt
- applied patch to build with libspf-1.0.0

* Tue Jun 15 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4-0.fdr.1
- updated to 1.4

* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.3.9-0.fdr.1
- updated to 1.3.9

* Thu Apr 29 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.2.1-1
- Initial build.


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- milter-greylist.spec	19 Aug 2009 19:59:29 -0000	1.34
+++ milter-greylist.spec	19 Aug 2009 20:06:51 -0000	1.35
@@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+- moved pre-2007 %%changelog entries into ChangeLog.rpm
+
 * Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1
 - updated to 4.2.3
 - use conditionalized %%noarch macro to mark noarch subpackages
@@ -276,60 +279,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Tue Jan 30 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-3
 - removed -minit subpackage
-
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.12-3
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-2
-- updated to 2.1.12
-- use new fedora-usermgmt stuff
-
-* Sat Apr 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.4-1
-- updated to 2.1.4
-
-* Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-3
-- rebuilt for FC5
-
-* Sat Dec 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-2
-- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
-- do not set user and socket in the sysv-initscript anymore; instead
-  of uncomment the configfile entries
-- ship minit params file as SOURCE instead of generating it on-the-fly
-- added -initng subpackage
-- minor specfile cleanups
-
-* Sat Oct 22 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-1
-- updated to 2.0.2
-
-* Sat Jun 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0-2
-- updated to final 2.0
-
-* Sat Jun 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0-0.1.rc5
-- updated to 2.0rc5
-- added patch which changes the way how the user will be switched in
-  the SysV initscript
-- removed all other patches as they are upstream now
-
-* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.6-3
-- set %%dist
-- use %%global instead of %%define
-- do not require 'setuidgid' for -minit anymore
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Feb  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.6
-- updated to 1.6
-
-* Thu Oct  7 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4-0.fdr.2
-- rebuilt
-- applied patch to build with libspf-1.0.0
-
-* Tue Jun 15 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4-0.fdr.1
-- updated to 1.4
-
-* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.3.9-0.fdr.1
-- updated to 1.3.9
-
-* Thu Apr 29 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.2.1-1
-- Initial build.



From myoung at fedoraproject.org  Wed Aug 19 20:22:57 2009
From: myoung at fedoraproject.org (myoung)
Date: Wed, 19 Aug 2009 20:22:57 +0000 (UTC)
Subject: rpms/kernel/devel fix-perf-make-man-failure.patch, NONE,
	1.1.2.2 patch-2.6.31-rc6-git5.bz2.sign, NONE, 1.1.2.2 .cvsignore,
	1.1014.2.24, 1.1014.2.25 kernel.spec, 1.1294.2.53,
	1.1294.2.54 linux-2.6-debug-vm-would-have-oomkilled.patch,
	1.2.6.1, 1.2.6.2 sources, 1.976.2.25, 1.976.2.26 upstream,
	1.888.2.24, 1.888.2.25 xen.pvops.patch, 1.1.2.34,
	1.1.2.35 patch-2.6.31-rc6-git3.bz2.sign, 1.1.2.2, NONE
Message-ID: <20090819202257.96EE611C00E4@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14511

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore kernel.spec 
	linux-2.6-debug-vm-would-have-oomkilled.patch sources upstream 
	xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	fix-perf-make-man-failure.patch patch-2.6.31-rc6-git5.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc6-git3.bz2.sign 
Log Message:
pvops update to test i686 stackprotector issue


fix-perf-make-man-failure.patch:
 b/tools/perf/Documentation/examples.txt    |  225 ++++++++++++++++++++++++++++
 tools/perf/Documentation/perf-examples.txt |  226 -----------------------------
 2 files changed, 225 insertions(+), 226 deletions(-)

--- NEW FILE fix-perf-make-man-failure.patch ---
>From 30cd04d629fed1779dd695a5dc2d38f6f5159bf8 Mon Sep 17 00:00:00 2001
From: Carlos R. Mafra <crmafra at gmail.com>
Date: Mon, 17 Aug 2009 00:36:21 +0200
Subject: [PATCH] perf: Rename perf-examples.txt to examples.txt

Rename it to examples.txt to avoid the perf-*.txt pattern in
the Makefile, otherwise 'make doc' fails because
perf-examples.txt is not formatted to be a man page:

 ERROR: perf-examples.txt: line 1: manpage document title is mandatory

Signed-off-by: Carlos R. Mafra <crmafra at gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Paul Mackerras <paulus at samba.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 tools/perf/Documentation/examples.txt      |  225 ++++++++++++++++++++++++++++
 tools/perf/Documentation/perf-examples.txt |  225 ----------------------------
 2 files changed, 225 insertions(+), 225 deletions(-)
 create mode 100644 tools/perf/Documentation/examples.txt
 delete mode 100644 tools/perf/Documentation/perf-examples.txt

diff --git a/tools/perf/Documentation/examples.txt b/tools/perf/Documentation/examples.txt
new file mode 100644
index 0000000..8eb6c48
--- /dev/null
+++ b/tools/perf/Documentation/examples.txt
@@ -0,0 +1,225 @@
+
+		------------------------------
+		****** perf by examples ******
+		------------------------------
+
+[ From an e-mail by Ingo Molnar, http://lkml.org/lkml/2009/8/4/346 ]
+
+
+First, discovery/enumeration of available counters can be done via
+'perf list':
+
+titan:~> perf list
+  [...]
+  kmem:kmalloc                             [Tracepoint event]
+  kmem:kmem_cache_alloc                    [Tracepoint event]
+  kmem:kmalloc_node                        [Tracepoint event]
+  kmem:kmem_cache_alloc_node               [Tracepoint event]
+  kmem:kfree                               [Tracepoint event]
+  kmem:kmem_cache_free                     [Tracepoint event]
+  kmem:mm_page_free_direct                 [Tracepoint event]
+  kmem:mm_pagevec_free                     [Tracepoint event]
+  kmem:mm_page_alloc                       [Tracepoint event]
+  kmem:mm_page_alloc_zone_locked           [Tracepoint event]
+  kmem:mm_page_pcpu_drain                  [Tracepoint event]
+  kmem:mm_page_alloc_extfrag               [Tracepoint event]
+
+Then any (or all) of the above event sources can be activated and
+measured. For example the page alloc/free properties of a 'hackbench
+run' are:
+
+ titan:~> perf stat -e kmem:mm_page_pcpu_drain -e kmem:mm_page_alloc
+ -e kmem:mm_pagevec_free -e kmem:mm_page_free_direct ./hackbench 10
+ Time: 0.575
+
+ Performance counter stats for './hackbench 10':
+
+          13857  kmem:mm_page_pcpu_drain
+          27576  kmem:mm_page_alloc
+           6025  kmem:mm_pagevec_free
+          20934  kmem:mm_page_free_direct
+
+    0.613972165  seconds time elapsed
+
+You can observe the statistical properties as well, by using the
+'repeat the workload N times' feature of perf stat:
+
+ titan:~> perf stat --repeat 5 -e kmem:mm_page_pcpu_drain -e
+   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
+   kmem:mm_page_free_direct ./hackbench 10
+ Time: 0.627
+ Time: 0.644
+ Time: 0.564
+ Time: 0.559
+ Time: 0.626
+
+ Performance counter stats for './hackbench 10' (5 runs):
+
+          12920  kmem:mm_page_pcpu_drain    ( +-   3.359% )
+          25035  kmem:mm_page_alloc         ( +-   3.783% )
+           6104  kmem:mm_pagevec_free       ( +-   0.934% )
+          18376  kmem:mm_page_free_direct   ( +-   4.941% )
+
+    0.643954516  seconds time elapsed   ( +-   2.363% )
+
+Furthermore, these tracepoints can be used to sample the workload as
+well. For example the page allocations done by a 'git gc' can be
+captured the following way:
+
+ titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc
+ Counting objects: 1148, done.
+ Delta compression using up to 2 threads.
+ Compressing objects: 100% (450/450), done.
+ Writing objects: 100% (1148/1148), done.
+ Total 1148 (delta 690), reused 1148 (delta 690)
+ [ perf record: Captured and wrote 0.267 MB perf.data (~11679 samples) ]
+
+To check which functions generated page allocations:
+
+ titan:~/git> perf report
+ # Samples: 10646
+ #
+ # Overhead          Command               Shared Object
+ # ........  ...............  ..........................
+ #
+    23.57%       git-repack  /lib64/libc-2.5.so
+    21.81%              git  /lib64/libc-2.5.so
+    14.59%              git  ./git
+    11.79%       git-repack  ./git
+     7.12%              git  /lib64/ld-2.5.so
+     3.16%       git-repack  /lib64/libpthread-2.5.so
+     2.09%       git-repack  /bin/bash
+     1.97%               rm  /lib64/libc-2.5.so
+     1.39%               mv  /lib64/ld-2.5.so
+     1.37%               mv  /lib64/libc-2.5.so
+     1.12%       git-repack  /lib64/ld-2.5.so
+     0.95%               rm  /lib64/ld-2.5.so
+     0.90%  git-update-serv  /lib64/libc-2.5.so
+     0.73%  git-update-serv  /lib64/ld-2.5.so
+     0.68%             perf  /lib64/libpthread-2.5.so
+     0.64%       git-repack  /usr/lib64/libz.so.1.2.3
+
+Or to see it on a more finegrained level:
+
+titan:~/git> perf report --sort comm,dso,symbol
+# Samples: 10646
+#
+# Overhead          Command               Shared Object  Symbol
+# ........  ...............  ..........................  ......
+#
+     9.35%       git-repack  ./git                       [.] insert_obj_hash
+     9.12%              git  ./git                       [.] insert_obj_hash
+     7.31%              git  /lib64/libc-2.5.so          [.] memcpy
+     6.34%       git-repack  /lib64/libc-2.5.so          [.] _int_malloc
+     6.24%       git-repack  /lib64/libc-2.5.so          [.] memcpy
+     5.82%       git-repack  /lib64/libc-2.5.so          [.] __GI___fork
+     5.47%              git  /lib64/libc-2.5.so          [.] _int_malloc
+     2.99%              git  /lib64/libc-2.5.so          [.] memset
+
+Furthermore, call-graph sampling can be done too, of page
+allocations - to see precisely what kind of page allocations there
+are:
+
+ titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc
+ Counting objects: 1148, done.
+ Delta compression using up to 2 threads.
+ Compressing objects: 100% (450/450), done.
+ Writing objects: 100% (1148/1148), done.
+ Total 1148 (delta 690), reused 1148 (delta 690)
+ [ perf record: Captured and wrote 0.963 MB perf.data (~42069 samples) ]
+
+ titan:~/git> perf report -g
+ # Samples: 10686
+ #
+ # Overhead          Command               Shared Object
+ # ........  ...............  ..........................
+ #
+    23.25%       git-repack  /lib64/libc-2.5.so
+                |
+                |--50.00%-- _int_free
+                |
+                |--37.50%-- __GI___fork
+                |          make_child
+                |
+                |--12.50%-- ptmalloc_unlock_all2
+                |          make_child
+                |
+                 --6.25%-- __GI_strcpy
+    21.61%              git  /lib64/libc-2.5.so
+                |
+                |--30.00%-- __GI_read
+                |          |
+                |           --83.33%-- git_config_from_file
+                |                     git_config
+                |                     |
+   [...]
+
+Or you can observe the whole system's page allocations for 10
+seconds:
+
+titan:~/git> perf stat -a -e kmem:mm_page_pcpu_drain -e
+kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
+kmem:mm_page_free_direct sleep 10
+
+ Performance counter stats for 'sleep 10':
+
+         171585  kmem:mm_page_pcpu_drain
+         322114  kmem:mm_page_alloc
+          73623  kmem:mm_pagevec_free
+         254115  kmem:mm_page_free_direct
+
+   10.000591410  seconds time elapsed
+
+Or observe how fluctuating the page allocations are, via statistical
+analysis done over ten 1-second intervals:
+
+ titan:~/git> perf stat --repeat 10 -a -e kmem:mm_page_pcpu_drain -e
+   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
+   kmem:mm_page_free_direct sleep 1
+
+ Performance counter stats for 'sleep 1' (10 runs):
+
+          17254  kmem:mm_page_pcpu_drain    ( +-   3.709% )
+          34394  kmem:mm_page_alloc         ( +-   4.617% )
+           7509  kmem:mm_pagevec_free       ( +-   4.820% )
+          25653  kmem:mm_page_free_direct   ( +-   3.672% )
+
+    1.058135029  seconds time elapsed   ( +-   3.089% )
+
+Or you can annotate the recorded 'git gc' run on a per symbol basis
+and check which instructions/source-code generated page allocations:
+
+ titan:~/git> perf annotate __GI___fork
+ ------------------------------------------------
+  Percent |      Source code & Disassembly of libc-2.5.so
+ ------------------------------------------------
+          :
+          :
+          :      Disassembly of section .plt:
+          :      Disassembly of section .text:
+          :
+          :      00000031a2e95560 <__fork>:
+ [...]
+     0.00 :        31a2e95602:   b8 38 00 00 00          mov    $0x38,%eax
+     0.00 :        31a2e95607:   0f 05                   syscall
+    83.42 :        31a2e95609:   48 3d 00 f0 ff ff       cmp    $0xfffffffffffff000,%rax
+     0.00 :        31a2e9560f:   0f 87 4d 01 00 00       ja     31a2e95762 <__fork+0x202>
+     0.00 :        31a2e95615:   85 c0                   test   %eax,%eax
+
+( this shows that 83.42% of __GI___fork's page allocations come from
+  the 0x38 system call it performs. )
+
+etc. etc. - a lot more is possible. I could list a dozen of
+other different usecases straight away - neither of which is
+possible via /proc/vmstat.
+
+/proc/vmstat is not in the same league really, in terms of
+expressive power of system analysis and performance
+analysis.
+
+All that the above results needed were those new tracepoints
+in include/tracing/events/kmem.h.
+
+	Ingo
+
+
diff --git a/tools/perf/Documentation/perf-examples.txt b/tools/perf/Documentation/perf-examples.txt
deleted file mode 100644
index 8eb6c48..0000000
--- a/tools/perf/Documentation/perf-examples.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-
-		------------------------------
-		****** perf by examples ******
-		------------------------------
-
-[ From an e-mail by Ingo Molnar, http://lkml.org/lkml/2009/8/4/346 ]
-
-
-First, discovery/enumeration of available counters can be done via
-'perf list':
-
-titan:~> perf list
-  [...]
-  kmem:kmalloc                             [Tracepoint event]
-  kmem:kmem_cache_alloc                    [Tracepoint event]
-  kmem:kmalloc_node                        [Tracepoint event]
-  kmem:kmem_cache_alloc_node               [Tracepoint event]
-  kmem:kfree                               [Tracepoint event]
-  kmem:kmem_cache_free                     [Tracepoint event]
-  kmem:mm_page_free_direct                 [Tracepoint event]
-  kmem:mm_pagevec_free                     [Tracepoint event]
-  kmem:mm_page_alloc                       [Tracepoint event]
-  kmem:mm_page_alloc_zone_locked           [Tracepoint event]
-  kmem:mm_page_pcpu_drain                  [Tracepoint event]
-  kmem:mm_page_alloc_extfrag               [Tracepoint event]
-
-Then any (or all) of the above event sources can be activated and
-measured. For example the page alloc/free properties of a 'hackbench
-run' are:
-
- titan:~> perf stat -e kmem:mm_page_pcpu_drain -e kmem:mm_page_alloc
- -e kmem:mm_pagevec_free -e kmem:mm_page_free_direct ./hackbench 10
- Time: 0.575
-
- Performance counter stats for './hackbench 10':
-
-          13857  kmem:mm_page_pcpu_drain
-          27576  kmem:mm_page_alloc
-           6025  kmem:mm_pagevec_free
-          20934  kmem:mm_page_free_direct
-
-    0.613972165  seconds time elapsed
-
-You can observe the statistical properties as well, by using the
-'repeat the workload N times' feature of perf stat:
-
- titan:~> perf stat --repeat 5 -e kmem:mm_page_pcpu_drain -e
-   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
-   kmem:mm_page_free_direct ./hackbench 10
- Time: 0.627
- Time: 0.644
- Time: 0.564
- Time: 0.559
- Time: 0.626
-
- Performance counter stats for './hackbench 10' (5 runs):
-
-          12920  kmem:mm_page_pcpu_drain    ( +-   3.359% )
-          25035  kmem:mm_page_alloc         ( +-   3.783% )
-           6104  kmem:mm_pagevec_free       ( +-   0.934% )
-          18376  kmem:mm_page_free_direct   ( +-   4.941% )
-
-    0.643954516  seconds time elapsed   ( +-   2.363% )
-
-Furthermore, these tracepoints can be used to sample the workload as
-well. For example the page allocations done by a 'git gc' can be
-captured the following way:
-
- titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc
- Counting objects: 1148, done.
- Delta compression using up to 2 threads.
- Compressing objects: 100% (450/450), done.
- Writing objects: 100% (1148/1148), done.
- Total 1148 (delta 690), reused 1148 (delta 690)
- [ perf record: Captured and wrote 0.267 MB perf.data (~11679 samples) ]
-
-To check which functions generated page allocations:
-
- titan:~/git> perf report
- # Samples: 10646
- #
- # Overhead          Command               Shared Object
- # ........  ...............  ..........................
- #
-    23.57%       git-repack  /lib64/libc-2.5.so
-    21.81%              git  /lib64/libc-2.5.so
-    14.59%              git  ./git
-    11.79%       git-repack  ./git
-     7.12%              git  /lib64/ld-2.5.so
-     3.16%       git-repack  /lib64/libpthread-2.5.so
-     2.09%       git-repack  /bin/bash
-     1.97%               rm  /lib64/libc-2.5.so
-     1.39%               mv  /lib64/ld-2.5.so
-     1.37%               mv  /lib64/libc-2.5.so
-     1.12%       git-repack  /lib64/ld-2.5.so
-     0.95%               rm  /lib64/ld-2.5.so
-     0.90%  git-update-serv  /lib64/libc-2.5.so
-     0.73%  git-update-serv  /lib64/ld-2.5.so
-     0.68%             perf  /lib64/libpthread-2.5.so
-     0.64%       git-repack  /usr/lib64/libz.so.1.2.3
-
-Or to see it on a more finegrained level:
-
-titan:~/git> perf report --sort comm,dso,symbol
-# Samples: 10646
-#
-# Overhead          Command               Shared Object  Symbol
-# ........  ...............  ..........................  ......
-#
-     9.35%       git-repack  ./git                       [.] insert_obj_hash
-     9.12%              git  ./git                       [.] insert_obj_hash
-     7.31%              git  /lib64/libc-2.5.so          [.] memcpy
-     6.34%       git-repack  /lib64/libc-2.5.so          [.] _int_malloc
-     6.24%       git-repack  /lib64/libc-2.5.so          [.] memcpy
-     5.82%       git-repack  /lib64/libc-2.5.so          [.] __GI___fork
-     5.47%              git  /lib64/libc-2.5.so          [.] _int_malloc
-     2.99%              git  /lib64/libc-2.5.so          [.] memset
-
-Furthermore, call-graph sampling can be done too, of page
-allocations - to see precisely what kind of page allocations there
-are:
-
- titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc
- Counting objects: 1148, done.
- Delta compression using up to 2 threads.
- Compressing objects: 100% (450/450), done.
- Writing objects: 100% (1148/1148), done.
- Total 1148 (delta 690), reused 1148 (delta 690)
- [ perf record: Captured and wrote 0.963 MB perf.data (~42069 samples) ]
-
- titan:~/git> perf report -g
- # Samples: 10686
- #
- # Overhead          Command               Shared Object
- # ........  ...............  ..........................
- #
-    23.25%       git-repack  /lib64/libc-2.5.so
-                |
-                |--50.00%-- _int_free
-                |
-                |--37.50%-- __GI___fork
-                |          make_child
-                |
-                |--12.50%-- ptmalloc_unlock_all2
-                |          make_child
-                |
-                 --6.25%-- __GI_strcpy
-    21.61%              git  /lib64/libc-2.5.so
-                |
-                |--30.00%-- __GI_read
-                |          |
-                |           --83.33%-- git_config_from_file
-                |                     git_config
-                |                     |
-   [...]
-
-Or you can observe the whole system's page allocations for 10
-seconds:
-
-titan:~/git> perf stat -a -e kmem:mm_page_pcpu_drain -e
-kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
-kmem:mm_page_free_direct sleep 10
-
- Performance counter stats for 'sleep 10':
-
-         171585  kmem:mm_page_pcpu_drain
-         322114  kmem:mm_page_alloc
-          73623  kmem:mm_pagevec_free
-         254115  kmem:mm_page_free_direct
-
-   10.000591410  seconds time elapsed
-
-Or observe how fluctuating the page allocations are, via statistical
-analysis done over ten 1-second intervals:
-
- titan:~/git> perf stat --repeat 10 -a -e kmem:mm_page_pcpu_drain -e
-   kmem:mm_page_alloc -e kmem:mm_pagevec_free -e
-   kmem:mm_page_free_direct sleep 1
-
- Performance counter stats for 'sleep 1' (10 runs):
-
-          17254  kmem:mm_page_pcpu_drain    ( +-   3.709% )
-          34394  kmem:mm_page_alloc         ( +-   4.617% )
-           7509  kmem:mm_pagevec_free       ( +-   4.820% )
-          25653  kmem:mm_page_free_direct   ( +-   3.672% )
-
-    1.058135029  seconds time elapsed   ( +-   3.089% )
-
-Or you can annotate the recorded 'git gc' run on a per symbol basis
-and check which instructions/source-code generated page allocations:
-
- titan:~/git> perf annotate __GI___fork
- ------------------------------------------------
-  Percent |      Source code & Disassembly of libc-2.5.so
- ------------------------------------------------
-          :
-          :
-          :      Disassembly of section .plt:
-          :      Disassembly of section .text:
-          :
-          :      00000031a2e95560 <__fork>:
- [...]
-     0.00 :        31a2e95602:   b8 38 00 00 00          mov    $0x38,%eax
-     0.00 :        31a2e95607:   0f 05                   syscall
-    83.42 :        31a2e95609:   48 3d 00 f0 ff ff       cmp    $0xfffffffffffff000,%rax
-     0.00 :        31a2e9560f:   0f 87 4d 01 00 00       ja     31a2e95762 <__fork+0x202>
-     0.00 :        31a2e95615:   85 c0                   test   %eax,%eax
-
-( this shows that 83.42% of __GI___fork's page allocations come from
-  the 0x38 system call it performs. )
-
-etc. etc. - a lot more is possible. I could list a dozen of
-other different usecases straight away - neither of which is
-possible via /proc/vmstat.
-
-/proc/vmstat is not in the same league really, in terms of
-expressive power of system analysis and performance
-analysis.
-
-All that the above results needed were those new tracepoints
-in include/tracing/events/kmem.h.
-
-	Ingo
-
-
-- 
1.6.4



--- NEW FILE patch-2.6.31-rc6-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKi+n3yGugalF9Dw4RAmtPAJ9MrnT+S9WZG49Gxiey0YVOYXuf0gCfdmZF
Gd4a9i65mtKqTyWxP6K+/qk=
=YMyk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.24
retrieving revision 1.1014.2.25
diff -u -p -r1.1014.2.24 -r1.1014.2.25
--- .cvsignore	18 Aug 2009 19:26:44 -0000	1.1014.2.24
+++ .cvsignore	19 Aug 2009 20:22:46 -0000	1.1014.2.25
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git3.bz2
+patch-2.6.31-rc6-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.53
retrieving revision 1.1294.2.54
diff -u -p -r1.1294.2.53 -r1.1294.2.54
--- kernel.spec	18 Aug 2009 19:26:45 -0000	1.1294.2.53
+++ kernel.spec	19 Aug 2009 20:22:46 -0000	1.1294.2.54
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -487,6 +487,9 @@ BuildRequires: gcc >= 3.4.2, binutils >=
 BuildRequires: net-tools
 %if %{with_doc}
 BuildRequires: xmlto
+%if %{with_perf}
+BuildRequires: asciidoc
+%endif
 %endif
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
@@ -718,6 +721,9 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
+# perf userspace tool patches
+Patch13000: fix-perf-make-man-failure.patch
+
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
 Patch19999: xen.pvops.post.patch
@@ -1330,6 +1336,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+ApplyPatch fix-perf-make-man-failure.patch
+
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
 ApplyPatch xen.pvops.post.patch
@@ -1447,7 +1455,6 @@ BuildKernel() {
 # make sure the scripts are executable... won't be in tarball until 2.6.31 :/
     chmod +x util/generate-cmdlist.sh util/PERF-VERSION-GEN
     make -s V=1 %{?_smp_mflags} perf
-#later#    make -s V=1 %{?_smp_mflags} doc
     mkdir -p $RPM_BUILD_ROOT/usr/libexec/
     install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf.$KernelVer
     popd
@@ -1647,6 +1654,9 @@ 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
 
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
@@ -1696,10 +1706,26 @@ 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
+
+# perf docs
+%if %{with_perf}
+mandir=$RPM_BUILD_ROOT%{_datadir}/man
+man1dir=$mandir/man1
+pushd tools/perf/Documentation
+make install-man mandir=$mandir
+popd
+
+pushd $man1dir
+for d in *.1; do
+ gzip $d;
+done
+popd
+
+%endif
 %endif
 
+# perf shell wrapper
 %if %{with_perf}
-# perf docs and shell wrapper.
 mkdir -p $RPM_BUILD_ROOT/usr/sbin/
 cp $RPM_SOURCE_DIR/perf $RPM_BUILD_ROOT/usr/sbin/perf
 chmod 0755 $RPM_BUILD_ROOT/usr/sbin/perf
@@ -1900,6 +1926,9 @@ 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,
@@ -1977,6 +2006,19 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 19 2009 Michael Young <m.a.young at durham.ac.uk>
+- update rebase/master to test i686 stackprotector issue
+
+* Wed Aug 19 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc6-git5
+- Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2
+  because upstream changes to oom-kill.c were all reverted.
+
+* Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
+- Fix up perf so that it builds docs now that they are fixed.
+- with_docs disables perf docs too. be warned. (logic is that the
+  build deps are (mostly) the same, so if you don't want one, odds are...)
+
 * Tue Aug 18 2009 Michael Young <m.a.young at durham.ac.uk>
 - another rebase/master update
   - try upstream STACKPROTECTOR fixes

linux-2.6-debug-vm-would-have-oomkilled.patch:
 kernel/sysctl.c |    9 +++++++++
 mm/oom_kill.c   |   13 +++++++++++++
 2 files changed, 22 insertions(+)

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -p -r1.2.6.1 -r1.2.6.2
--- linux-2.6-debug-vm-would-have-oomkilled.patch	9 Jul 2009 22:53:01 -0000	1.2.6.1
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	19 Aug 2009 20:22:46 -0000	1.2.6.2
@@ -1,18 +1,8 @@
-From a0e012e118c2b0eba399e213a7989fd2b880f8b7 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Wed, 8 Jul 2009 13:05:46 -0400
-Subject: [PATCH 5/6] fedora: linux-2.6-debug-vm-would-have-oomkilled.patch
-
----
- kernel/sysctl.c |    9 +++++++++
- mm/oom_kill.c   |   14 ++++++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 98e0232..0cfe3ab 100644
+index b2a2d68..3b132ee 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -73,6 +73,7 @@ extern int sysctl_overcommit_ratio;
+@@ -67,6 +67,7 @@ extern int sysctl_overcommit_ratio;
  extern int sysctl_panic_on_oom;
  extern int sysctl_oom_kill_allocating_task;
  extern int sysctl_oom_dump_tasks;
@@ -20,7 +10,7 @@ index 98e0232..0cfe3ab 100644
  extern int max_threads;
  extern int core_uses_pid;
  extern int suid_dumpable;
-@@ -1031,6 +1032,14 @@ static struct ctl_table vm_table[] = {
+@@ -861,6 +862,14 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -36,7 +26,7 @@ index 98e0232..0cfe3ab 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index 175a67a..4ab4bdb 100644
+index f255eda..3335a94 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -47,9 +37,9 @@ index 175a67a..4ab4bdb 100644
  static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
-@@ -328,6 +329,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
- 	if (!p->mm)
+@@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
  		return;
+ 	}
  
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
@@ -60,11 +50,10 @@ index 175a67a..4ab4bdb 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -355,6 +362,13 @@ static int oom_kill_task(struct task_struct *p)
- 		return 1;
- 	}
- 	task_unlock(p);
-+
+@@ -363,6 +370,12 @@ static int oom_kill_task(struct task_struct *p)
+ 			return 1;
+ 	} while_each_thread(g, q);
+ 
 +	if (sysctl_would_have_oomkilled == 1) {
 +		printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
 +				task_pid_nr(p), p->comm);
@@ -74,6 +63,3 @@ index 175a67a..4ab4bdb 100644
  	__oom_kill_task(p, 1);
  
  	/*
--- 
-1.6.2.5
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.25
retrieving revision 1.976.2.26
diff -u -p -r1.976.2.25 -r1.976.2.26
--- sources	18 Aug 2009 19:26:45 -0000	1.976.2.25
+++ sources	19 Aug 2009 20:22:46 -0000	1.976.2.26
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-67d0b1917a80534f0a7f3aa2c2897509  patch-2.6.31-rc6-git3.bz2
+6128f58fd777f9b64ea5c2fa13049021  patch-2.6.31-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.24
retrieving revision 1.888.2.25
diff -u -p -r1.888.2.24 -r1.888.2.25
--- upstream	18 Aug 2009 19:26:45 -0000	1.888.2.24
+++ upstream	19 Aug 2009 20:22:46 -0000	1.888.2.25
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git3.bz2
+patch-2.6.31-rc6-git5.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 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             |   13 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   37 
 arch/x86/kernel/cpu/Makefile               |    4 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    8 
 arch/x86/xen/apic.c                        |   60 +
 arch/x86/xen/enlighten.c                   |   96 +
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |   86 +
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/pci.h                          |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   36 
 drivers/xen/Makefile                       |   19 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  152 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  322 +++++-
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 ++++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/pci.h                        |    6 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   21 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen-mca.h            |  429 ++++++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 133 files changed, 10575 insertions(+), 1315 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -p -r1.1.2.34 -r1.1.2.35
--- xen.pvops.patch	18 Aug 2009 19:26:45 -0000	1.1.2.34
+++ xen.pvops.patch	19 Aug 2009 20:22:46 -0000	1.1.2.35
@@ -2165,17 +2165,16 @@ index d2ed6c5..205e277 100644
  	for (i = 0; i < nr_ioapics; i++) {
  		if (smp_found_config) {
 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index 3efcb2b..3e058a1 100644
+index 3efcb2b..c1f253d 100644
 --- a/arch/x86/kernel/cpu/Makefile
 +++ b/arch/x86/kernel/cpu/Makefile
-@@ -7,6 +7,11 @@ ifdef CONFIG_FUNCTION_TRACER
+@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER
  CFLAGS_REMOVE_common.o = -pg
  endif
  
-+ifdef CONFIG_CC_STACKPROTECTOR
-+# Also, load_percpu_segment shouldn't have stack-protector on it
-+CFLAGS_REMOVE_common.o += -fstack-protector -fstack-protector-all
-+endif
++# Make sure load_percpu_segment has no stackprotector
++nostackp := $(call cc-option, -fno-stack-protector)
++CFLAGS_common.o		:= $(nostackp)
 +
  obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
@@ -3515,19 +3514,21 @@ index b83e119..951c924 100644
 +       depends on XEN_DOM0 && MICROCODE
 \ No newline at end of file
 diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
-index 172438f..e19c48e 100644
+index 172438f..8c2c266 100644
 --- a/arch/x86/xen/Makefile
 +++ b/arch/x86/xen/Makefile
-@@ -5,6 +5,8 @@ CFLAGS_REMOVE_time.o = -pg
+@@ -5,6 +5,10 @@ CFLAGS_REMOVE_time.o = -pg
  CFLAGS_REMOVE_irq.o = -pg
  endif
  
-+CFLAGS_REMOVE_enlighten.o += -fstack-protector -fstack-protector-all
++# Make sure early boot has no stackprotector
++nostackp := $(call cc-option, -fno-stack-protector)
++CFLAGS_enlighten.o		:= $(nostackp)
 +
  obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
  			time.o xen-asm.o xen-asm_$(BITS).o \
  			grant-table.o suspend.o
-@@ -12,3 +14,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
+@@ -12,3 +16,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
  obj-$(CONFIG_SMP)		+= smp.o
  obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
  obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
@@ -8188,7 +8189,7 @@ index 7d8f531..58996c9 100644
  	if (max_nr_grant_frames() < nr_grant_frames)
 diff --git a/drivers/xen/mce.c b/drivers/xen/mce.c
 new file mode 100644
-index 0000000..ef838f2
+index 0000000..b354dc8
 --- /dev/null
 +++ b/drivers/xen/mce.c
 @@ -0,0 +1,213 @@
@@ -8342,14 +8343,6 @@ index 0000000..ef838f2
 +	int ret;
 +	xen_mc_t mc_op;
 +
-+	ret  = bind_virq_to_irqhandler(VIRQ_MCA, 0,
-+		mce_dom_interrupt, 0, "mce", NULL);
-+
-+	if (ret < 0) {
-+		printk(KERN_ERR "MCE_DOM0_LOG: bind_virq for DOM0 failed\n");
-+		return ret;
-+	}
-+
 +	g_mi = kmalloc(sizeof(struct mc_info), GFP_KERNEL);
 +
 +	if (!g_mi)
@@ -8383,6 +8376,14 @@ index 0000000..ef838f2
 +		return ret;
 +	}
 +
++	ret  = bind_virq_to_irqhandler(VIRQ_MCA, 0,
++		mce_dom_interrupt, 0, "mce", NULL);
++
++	if (ret < 0) {
++		printk(KERN_ERR "MCE_DOM0_LOG: bind_virq for DOM0 failed\n");
++		return ret;
++	}
++
 +	return 0;
 +}
 +


--- patch-2.6.31-rc6-git3.bz2.sign DELETED ---



From dwalsh at fedoraproject.org  Wed Aug 19 20:25:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 19 Aug 2009 20:25:21 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.429,
	1.430 policycoreutils.spec, 1.624, 1.625
Message-ID: <20090819202521.EBA4411C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15342

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-6
- Redesign restorecond to use setfiles/restore functionality


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 restorecond/Makefile                        |   20 
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  423 +++--------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 
 restorecond/restorecond.o                   |binary
 restorecond/restorecond_user.conf           |    2 
 restorecond/stringslist.o                   |binary
 restorecond/user.c                          |  220 +++++++++
 restorecond/user.o                          |binary
 restorecond/utmpwatcher.o                   |binary
 restorecond/walk.c                          |   30 +
 restorecond/watch.c                         |  253 ++++++++++
 restorecond/watch.o                         |binary
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++
 scripts/sandbox.8                           |   22 
 scripts/sandbox.py                          |   67 ++
 semanage/semanage                           |   61 +-
 semanage/semanage.8                         |    4 
 semanage/seobject.py                        |  109 ++++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  531 ++++++++++++++++++++++
 setfiles/restore.h                          |   50 ++
 setfiles/restore.o                          |binary
 setfiles/restorecon                         |binary
 setfiles/setfiles                           |binary
 setfiles/setfiles.c                         |  672 +++-------------------------
 32 files changed, 1674 insertions(+), 988 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.429 -r 1.430 policycoreutils-rhat.patchIndex: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -p -r1.429 -r1.430
--- policycoreutils-rhat.patch	18 Aug 2009 19:25:04 -0000	1.429
+++ policycoreutils-rhat.patch	19 Aug 2009 20:25:21 -0000	1.430
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.71/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.71/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-18 15:19:58.000000000 -0400
++++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-19 15:01:34.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -38,18 +38,18 @@ diff --exclude-from=exclude --exclude=se
          else:
              # This is the default if no input is specified
              f = sys.stdin
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-13 17:57:54.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-19 15:01:34.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.71/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.71/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-13 17:57:54.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-19 15:42:48.000000000 -0400
 @@ -2,16 +2,23 @@
  PREFIX ?= ${DESTDIR}/usr
  SBINDIR ?= $(PREFIX)/sbin
@@ -64,16 +64,16 @@ diff --exclude-from=exclude --exclude=se
  CFLAGS ?= -g -Werror -Wall -W
 -override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
 -LDLIBS += -lselinux -L$(PREFIX)/lib
-+override CFLAGS += -I$(PREFIX)/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include  -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include
++override CFLAGS += -I$(PREFIX)/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include
 +
-+LDLIBS += -lselinux -ldbus-glib-1 -lglib-2.0 -L$(PREFIX)/lib 
++LDLIBS += -lselinux -ldbus-glib-1 -lglib-2.0 -L$(LIBDIR)
  
  all: restorecond
  
 -restorecond:  restorecond.o utmpwatcher.o stringslist.o
 +restorecond.o utmpwatcher.o stringslist.o user.o watch.o: restorecond.h 
 +
-+restorecond:  restorecond.o utmpwatcher.o stringslist.o user.o watch.o
++restorecond:  ../setfiles/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
  	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
  
  install: all
@@ -91,21 +91,22 @@ diff --exclude-from=exclude --exclude=se
  
  relabel: install
  	/sbin/restorecon $(SBINDIR)/restorecond 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-13 17:57:54.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-19 12:25:41.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.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.71/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.71/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-13 17:57:54.000000000 -0400
-@@ -48,294 +48,37 @@
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-19 15:42:48.000000000 -0400
+@@ -48,294 +48,39 @@
  #include <signal.h>
  #include <string.h>
  #include <unistd.h>
 -#include <ctype.h>
++#include "../setfiles/restore.h"
  #include <sys/types.h>
 -#include <sys/stat.h>
  #include <syslog.h>
@@ -303,7 +304,7 @@ diff --exclude-from=exclude --exclude=se
 -{
 -	char *line_buf = NULL;
 -	size_t len = 0;
- 
+-
 -	while (getline(&line_buf, &len, cfg) > 0) {
 -		char *buffer = line_buf;
 -		while (isspace(*buffer))
@@ -322,20 +323,21 @@ diff --exclude-from=exclude --exclude=se
 -	}
 -	free(line_buf);
 -}
-+static char *server_watch_file  = "/etc/selinux/restorecond.conf";
-+static char *user_watch_file  = "/etc/selinux/restorecond_user.conf";
-+static char *watch_file;
- 
+-
 -/* 
 -   Read config file ignoring Comment lines 
 -   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;
+ 
 -	FILE *cfg = NULL;
 -	if (debug_mode)
 -		printf("Read Config\n");
@@ -415,7 +417,7 @@ diff --exclude-from=exclude --exclude=se
  }
  
  static const char *pidfile = "/var/run/restorecond.pid";
-@@ -374,7 +117,7 @@
+@@ -374,7 +119,7 @@
  
  static void usage(char *program)
  {
@@ -424,7 +426,7 @@ diff --exclude-from=exclude --exclude=se
  	exit(0);
  }
  
-@@ -390,74 +133,13 @@
+@@ -390,74 +135,35 @@
     to see if it is one that we are watching.
  */
  
@@ -496,12 +498,34 @@ diff --exclude-from=exclude --exclude=se
 -		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
 -		return 1;
 -	}
++	memset(&r_opts, 0, sizeof(r_opts));
++
++	r_opts.progress = 0;
++	r_opts.count = 0;
++	r_opts.debug = 0;
++	r_opts.change = 1;
++	r_opts.verbose = 0;
++	r_opts.logging = 0;
++	r_opts.rootpath = NULL;
++	r_opts.expand_realpath = 0;
++	r_opts.rootpathlen = 0;
++	r_opts.outfile = NULL;
++	r_opts.force = 0;
++	r_opts.hard_links = 0;
++	r_opts.expand_realpath = 1;
++	r_opts.abort_on_error = 0;
++	r_opts.add_assoc = 0;
++	r_opts.fts_flags = FTS_PHYSICAL;
++	r_opts.selabel_opt_validate = NULL;
++	r_opts.selabel_opt_path = NULL;
++	
++	restore_init(&r_opts);
 +	/* If we are not running SELinux then just exit */
 +	if (is_selinux_enabled() != 1) return 0;
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -467,15 +149,18 @@
+@@ -467,15 +173,18 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
@@ -525,7 +549,7 @@ diff --exclude-from=exclude --exclude=se
  		case 'v':
  			verbose_mode = 1;
  			break;
-@@ -483,20 +168,36 @@
+@@ -483,22 +192,40 @@
  			usage(argv[0]);
  		}
  	}
@@ -565,9 +589,13 @@ diff --exclude-from=exclude --exclude=se
  	if (pidfile)
  		unlink(pidfile);
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
+ 	return 0;
+ }
++
++
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-13 17:57:54.000000000 -0400
[...1849 lines suppressed...]
+-		add_assoc = 1;
+-		fts_flags = FTS_PHYSICAL | FTS_XDEV;
++		r_opts.expand_realpath = 0;
++		r_opts.abort_on_error = 1;
++		r_opts.add_assoc = 1;
++		r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV;
+ 		ctx_validate = 1;
+ 	} else {
+ 		/*
+@@ -772,14 +263,14 @@
+ 		 * Follows mounts,
+ 		 * Does lazy validation of contexts upon use. 
+ 		 */
+-		if (strcmp(base, RESTORECON) && !quiet) 
++		if (strcmp(base, RESTORECON) && !r_opts.quiet) 
+ 			printf("Executed with an unrecognized name (%s), defaulting to %s behavior.\n", base, RESTORECON);
+ 		iamrestorecon = 1;
+ 		recurse = 0;
+-		expand_realpath = 1;
+-		abort_on_error = 0;
+-		add_assoc = 0;
+-		fts_flags = FTS_PHYSICAL;
++		r_opts.expand_realpath = 1;
++		r_opts.abort_on_error = 0;
++		r_opts.add_assoc = 0;
++		r_opts.fts_flags = FTS_PHYSICAL;
+ 		ctx_validate = 0;
+ 
+ 		/* restorecon only:  silent exit if no SELinux.
+@@ -828,11 +319,6 @@
+ 			}
+ 		case 'e':
+ 			remove_exclude(optarg);
+-			if (lstat(optarg, &sb) < 0 && errno != EACCES) {
+-				fprintf(stderr, "Can't stat exclude path \"%s\", %s - ignoring.\n",
+-					optarg, strerror(errno));
+-				break;
+-			}
+ 			if (add_exclude(optarg))
+ 				exit(1);
+ 			break;
+@@ -841,37 +327,37 @@
+ 			input_filename = optarg;
+ 			break;			
+ 		case 'd':
+-			debug = 1;
++			r_opts.debug = 1;
+ 			break;
+ 		case 'i':
+ 			ignore_enoent = 1;
+ 			break;
+ 		case 'l':
+-			logging = 1;
++			r_opts.logging = 1;
+ 			break;
+ 		case 'F':
+-			force = 1;
++			r_opts.force = 1;
+ 			break;
+ 		case 'n':
+-			change = 0;
++			r_opts.change = 0;
+ 			break;
+ 		case 'o':
+ 			if (strcmp(optarg, "-") == 0) {
+-				outfile = stdout;
++				r_opts.outfile = stdout;
+ 				break;
+ 			}
+ 
+-			outfile = fopen(optarg, "w");
+-			if (!outfile) {
++			r_opts.outfile = fopen(optarg, "w");
++			if (!r_opts.outfile) {
+ 				fprintf(stderr, "Error opening %s: %s\n",
+ 					optarg, strerror(errno));
+ 
+ 				usage(argv[0]);
+ 			}
+-			__fsetlocking(outfile, FSETLOCKING_BYCALLER);
++			__fsetlocking(r_opts.outfile, FSETLOCKING_BYCALLER);
+ 			break;
+ 		case 'q':
+-			quiet = 1;
++			r_opts.quiet = 1;
+ 			break;
+ 		case 'R':
+ 		case 'r':
+@@ -880,11 +366,11 @@
+ 				break;
+ 			}
+ 			if (optind + 1 >= argc) {
+-				fprintf(stderr, "usage:  %s -r rootpath\n",
++				fprintf(stderr, "usage:  %s -r r_opts.rootpath\n",
+ 					argv[0]);
+ 				exit(1);
+ 			}
+-			if (NULL != rootpath) {
++			if (NULL != r_opts.rootpath) {
+ 				fprintf(stderr,
+ 					"%s: only one -r can be specified\n",
+ 					argv[0]);
+@@ -895,23 +381,23 @@
+ 		case 's':
+ 			use_input_file = 1;
+ 			input_filename = "-";
+-			add_assoc = 0;
++			r_opts.add_assoc = 0;
+ 			break;
+ 		case 'v':
+-			if (progress) {
++			if (r_opts.progress) {
+ 				fprintf(stderr,
+ 					"Progress and Verbose mutually exclusive\n");
+ 				exit(1);
+ 			}
+-			verbose++;
++			r_opts.verbose++;
+ 			break;
+ 		case 'p':
+-			if (verbose) {
++			if (r_opts.verbose) {
+ 				fprintf(stderr,
+ 					"Progress and Verbose mutually exclusive\n");
+ 				usage(argv[0]);
+ 			}
+-			progress = 1;
++			r_opts.progress = 1;
+ 			break;
+ 		case 'W':
+ 			warn_no_match = 1;
+@@ -959,18 +445,13 @@
+ 	}
+ 
+ 	/* Load the file contexts configuration and check it. */
+-	opts[0].value = (ctx_validate ? (char*)1 : NULL);
+-	opts[1].value = altpath;
+-
+-	hnd = selabel_open(SELABEL_CTX_FILE, opts, 2);
+-	if (!hnd) {
+-		perror(altpath);
+-		exit(1);
+-	}
++	r_opts.selabel_opt_validate = (ctx_validate ? (char *)1 : NULL);
++	r_opts.selabel_opt_path = altpath;
+ 
+ 	if (nerr)
+ 		exit(1);
+ 
++	restore_init(&r_opts);
+ 	if (use_input_file) {
+ 		FILE *f = stdin;
+ 		ssize_t len;
+@@ -987,31 +468,34 @@
+ 		delim = (null_terminated != 0) ? '\0' : '\n';
+ 		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
+ 			buf[len - 1] = 0;
+-			errors |= process_one(buf);
++			if (!strcmp(buf, "/"))
++				mass_relabel = 1;
++			errors |= process_one(buf, recurse) < 0;
+ 		}
+ 		if (strcmp(input_filename, "-") != 0)
+ 			fclose(f);
+ 	} else {
+ 		for (i = optind; i < argc; i++) {
+-			errors |= process_one(argv[i]);
++			if (!strcmp(argv[i], "/"))
++				mass_relabel = 1;
++			errors |= process_one(argv[i], recurse) < 0;
+ 		}
+ 	}
+-
++	
++	if (mass_relabel)
++		mass_relabel_errs = errors;
+ 	maybe_audit_mass_relabel();
+ 
+ 	if (warn_no_match)
+-		selabel_stats(hnd);
+-
+-	selabel_close(hnd);
++		selabel_stats(r_opts.hnd);
+ 
+-	if (outfile)
+-		fclose(outfile);
++	selabel_close(r_opts.hnd);
++	restore_finish();
+ 
+-	for (i = 0; i < excludeCtr; i++) {
+-		free(excludeArray[i].directory);
+-	}
++	if (r_opts.outfile)
++		fclose(r_opts.outfile);
+ 
+-       if (progress && count >= STAR_COUNT)
++       if (r_opts.progress && r_opts.count >= STAR_COUNT)
+                printf("\n");
+ 	exit(errors);
+ }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.624
retrieving revision 1.625
diff -u -p -r1.624 -r1.625
--- policycoreutils.spec	19 Aug 2009 19:02:29 -0000	1.624
+++ policycoreutils.spec	19 Aug 2009 20:25:21 -0000	1.625
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-6
+- Redesign restorecond to use setfiles/restore functionality
+
 * Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-5
 - Fix sepolgen again
 



From overholt at fedoraproject.org  Wed Aug 19 20:26:37 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 19 Aug 2009 20:26:37 +0000 (UTC)
Subject: rpms/plexus-utils/devel plexus-utils-1.4.5-build.xml, 1.1,
	1.2 plexus-utils.spec, 1.4, 1.5 sources, 1.1, 1.2
Message-ID: <20090819202637.6F6EE11C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15746

Modified Files:
	plexus-utils.spec sources 
Added Files:
	plexus-utils-1.4.5-build.xml 
Log Message:
* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.4.5-1.2
- Update to 1.4.5 from JPackage and Deepak Bhole
- Remove gcj bits


Index: plexus-utils-1.4.5-build.xml
===================================================================
RCS file: plexus-utils-1.4.5-build.xml
diff -N plexus-utils-1.4.5-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-utils-1.4.5-build.xml	19 Aug 2009 20:26:37 -0000	1.2
@@ -0,0 +1,90 @@
+<project name="plexus-utils" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="plexus-utils-1.4.5"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${basedir}/.m2/repository"/>
+  <property name="javadocdir" value="target/site/apidocs"></property>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}"/>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
+    <property name="title" value="Plexus Common Utilities 1.4.5 API"></property>    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.util.*">
+      <classpath>
+        <path refid="build.classpath"></path>
+      </classpath>
+    </javadoc>
+  </target>
+</project>


Index: plexus-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-utils/devel/plexus-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- plexus-utils.spec	26 Jul 2009 18:56:42 -0000	1.4
+++ plexus-utils.spec	19 Aug 2009 20:26:37 -0000	1.5
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,25 +28,21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# If you want to build with maven,
-# give rpmbuild option '--with maven'
+%define with_maven 0
 
-%define with_maven %{!?_with_maven:0}%{?_with_maven:1}
-%define without_maven %{?_with_maven:0}%{!?_with_maven:1}
+%define parent plexus
+%define subname utils
 
 Name:           plexus-utils
-Version:        1.2
-Release:        4.2%{?dist}
-Epoch:          0
+Version:        1.4.5
+Release:        1.2%{?dist}
 Summary:        Plexus Common Utilities
 License:        ASL 1.1 and ASL 2.0 and MIT
-Group:          Development/Java
+Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-utils-1.2/
-# tar xzf plexus-utils-1.2.tar.gz plexus-utils-1.2
-Source0:        plexus-utils-1.2.tar.gz
-Source1:        plexus-utils-1.2-build.xml
-# build it with maven2-generated ant build.xml
+Source0:        plexus-utils-%{version}.tar.gz
+# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.4.5/
+Source1:        plexus-utils-1.4.5-build.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,15 +52,19 @@ BuildRequires:  jpackage-utils >= 0:1.6
 Requires:       jpackage-utils
 Requires(postun): jpackage-utils
 %if %{with_maven}
-BuildRequires:  maven2
+BuildRequires:  maven2 >= 0:2.0.4
+BuildRequires:  maven2-plugin-surefire
 %endif
 
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
+
 %description
-The Plexus project seeks to create end-to-end developer tools for 
-writing applications. At the core is the container, which can be 
-embedded or for a full scale application server. There are many 
-reusable components for hibernate, form processing, jndi, i18n, 
-velocity, etc. Plexus also includes an application server which 
+The Plexus project seeks to create end-to-end developer tools for
+writing applications. At the core is the container, which can be
+embedded or for a full scale application server. There are many
+reusable components for hibernate, form processing, jndi, i18n,
+velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
 %package javadoc
@@ -76,9 +76,8 @@ Requires(postun): jpackage-utils
 %description javadoc
 Javadoc for %{name}.
 
-
 %prep
-%setup -q -n plexus-utils-1.2
+%setup -q -n %{name}-%{version}
 cp %{SOURCE1} build.xml
 
 # Disable file utils test cases. See:
@@ -90,18 +89,15 @@ rm -f src/test/java/org/codehaus/plexus/
 
 %build
 %if %{with_maven}
-mkdir -p .maven/repository/maven/jars
-build-jar-repository .maven/repository/maven/jars \
-maven-jelly-tags
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        jar:install javadoc 
+export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
+
+mvn-jpp -e \
+    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+    install javadoc:javadoc
 
 %else
-ant jar javadoc
+export CLASSPATH=target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
 %endif
 
 %install
@@ -110,18 +106,32 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/utils-%{version}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
 (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $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,-)
 %{_javadir}/*
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -129,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.4.5-1.2
+- Update to 1.4.5 from JPackage and Deepak Bhole
+- Remove gcj bits
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-4.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -139,6 +153,15 @@ rm -rf $RPM_BUILD_ROOT
 - fix license tag
 - drop repotag
 
+* Thu Aug 23 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4.5-1jpp
+- Upgrade to 1.4.5
+- Now build with maven2 by default
+
+* Wed Mar 21 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
+- Fix build classpath
+- Optionally build with maven2
+- Add gcj_support option
+
 * Mon Feb 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.2-2jpp.1.fc7
 - Fix spec per Fedora guidelines
 
@@ -150,4 +173,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0.4-1jpp
 - First JPackage build
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Mar 2007 15:03:37 -0000	1.1
+++ sources	19 Aug 2009 20:26:37 -0000	1.2
@@ -1 +1 @@
-fe3685edd13bf01d7b7013eb8c031389  plexus-utils-1.2.tar.gz
+89ed0f643168016776809507f94a16b3  plexus-utils-1.4.5.tar.gz



From overholt at fedoraproject.org  Wed Aug 19 20:27:33 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 19 Aug 2009 20:27:33 +0000 (UTC)
Subject: rpms/plexus-utils/devel plexus-utils-1.2-build.xml,1.1,NONE
Message-ID: <20090819202733.5FA1B11C00E4@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16022

Removed Files:
	plexus-utils-1.2-build.xml 
Log Message:
Remove old build.xml


--- plexus-utils-1.2-build.xml DELETED ---



From ianweller at fedoraproject.org  Wed Aug 19 20:35:18 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 19 Aug 2009 20:35:18 +0000 (UTC)
Subject: rpms/tremfusion/devel tremfusion.spec,1.2,1.3
Message-ID: <20090819203518.9723911C00E4@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/tremfusion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17789

Modified Files:
	tremfusion.spec 
Log Message:
openal-soft


Index: tremfusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tremfusion/devel/tremfusion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tremfusion.spec	27 Jul 2009 06:16:12 -0000	1.2
+++ tremfusion.spec	19 Aug 2009 20:35:18 -0000	1.3
@@ -12,7 +12,7 @@
 
 Name:           tremfusion
 Version:        0.99
-Release:        5.r3%{?dist}
+Release:        6.r3%{?dist}
 Summary:        Enhanced modification of the free software first person shooter Tremulous
 
 Group:          Amusements/Games
@@ -33,7 +33,7 @@ Source2:        lakitu7-qvm-r%{lakitu7_r
 Patch0:         tremfusion-lakitu7-qvm-remove-lcc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcurl-devel ncurses-devel freetype-devel SDL-devel openal-devel libvorbis-devel desktop-file-utils zlib-devel
+BuildRequires:  libcurl-devel ncurses-devel freetype-devel SDL-devel openal-soft-devel libvorbis-devel desktop-file-utils zlib-devel
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       opengl-games-utils
 Requires(post):     desktop-file-utils
@@ -165,6 +165,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Aug 19 2009 Ian Weller <ian at ianweller.org> 0.99-6.r3
+- Change dependency from openal to openal-soft
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-5.r3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From szpak at fedoraproject.org  Wed Aug 19 20:37:49 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Wed, 19 Aug 2009 20:37:49 +0000 (UTC)
Subject: rpms/pyxattr/EL-5 pyxattr.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20090819203749.8F64311C00E4@cvs1.fedora.phx.redhat.com>

Author: szpak

Update of /cvs/extras/rpms/pyxattr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18153

Modified Files:
	pyxattr.spec sources 
Log Message:
Backported version 0.4.0 to EL-5 (bug 518013)




Index: pyxattr.spec
===================================================================
RCS file: /cvs/extras/rpms/pyxattr/EL-5/pyxattr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pyxattr.spec	27 Aug 2007 19:31:39 -0000	1.4
+++ pyxattr.spec	19 Aug 2009 20:37:49 -0000	1.5
@@ -1,9 +1,9 @@
 Name: 		pyxattr
 Summary: 	Extended attributes library wrapper for Python
-Version: 	0.2.2
-Release: 	1%{?dist}
+Version: 	0.4.0
+Release: 	2%{?dist}
 #license version is precised on a website
-License: 	GPLv2+
+License: 	LGPLv2+
 Group: 		Development/Libraries
 URL: 		http://pyxattr.sourceforge.net/
 Source:		http://downloads.sourceforge.net/pyxattr/pyxattr-%{version}.tar.gz
@@ -13,7 +13,8 @@ Provides:	python-xattr = %{version}-%{re
 Obsoletes:	python-xattr <= %{version}-%{release}
 #libattr package is already forced by RPM
 Requires: 	python >= 2.2
-BuildRequires:	python-devel, libattr-devel
+#python-setuptools package is required since 0.4.0
+BuildRequires:	python-devel, libattr-devel, python-setuptools
 
 %description
 Python extension module wrapper for libattr. It allows to query, list,
@@ -35,9 +36,30 @@ CFLAGS="%{optflags}" %{__python} setup.p
 %files
 %defattr(0644,root,root,0755)
 %{_libdir}/python*/site-packages/xattr.so
-%doc ChangeLog MANIFEST NEWS README *.html *.txt
+#Python Eggs already in source distribution
+#(without compiled content, can be simple included in RPM package)
+%{_libdir}/python*/site-packages/*egg-info
+%doc COPYING NEWS README
 
 %changelog
+* Sat Dec 6 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4.0-2
+- added python-setuptools in BuildRequires which is needed in build process
+since version 0.4.0 (thanks to Kevin Fenzi)
+
+* Fri Dec 5 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4.0-1
+- updated to 0.4.0
+- License Tag adjusted to current licensing LGPLv2+
+- modified Python Eggs support due to its usage in source distribution 
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
+- Rebuild for Python 2.6
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.2-3
+- Autorebuild for GCC 4.3
+
+* Tue Jan 15 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.2.2-2
+- added compatibility with Python Eggs forced in F9 
+
 * Mon Aug 27 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.2.2-1
 - upgraded to 0.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyxattr/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2007 19:31:39 -0000	1.3
+++ sources	19 Aug 2009 20:37:49 -0000	1.4
@@ -1 +1 @@
-33d722b0c67fcee42bb3c6455f135f94  pyxattr-0.2.2.tar.gz
+8e54ffa2ca575232d57213efcbcee289  pyxattr-0.4.0.tar.gz



From dwalsh at fedoraproject.org  Wed Aug 19 20:38:20 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 19 Aug 2009 20:38:20 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.430,1.431
Message-ID: <20090819203820.3863A11C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18621

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-6
- Redesign restorecond to use setfiles/restore functionality


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 restorecond/Makefile                        |   20 
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  423 +++--------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   19 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  220 +++++++++
 restorecond/walk.c                          |   30 +
 restorecond/watch.c                         |  253 ++++++++++
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++
 scripts/sandbox.8                           |   22 
 scripts/sandbox.py                          |   67 ++
 semanage/semanage                           |   34 +
 semanage/seobject.py                        |   66 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  531 ++++++++++++++++++++++
 setfiles/restore.h                          |   50 ++
 setfiles/setfiles.c                         |  672 +++-------------------------
 23 files changed, 1621 insertions(+), 967 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -p -r1.430 -r1.431
--- policycoreutils-rhat.patch	19 Aug 2009 20:25:21 -0000	1.430
+++ policycoreutils-rhat.patch	19 Aug 2009 20:38:19 -0000	1.431
@@ -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.71/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-19 16:30:32.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/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-19 16:30:32.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -645,14 +645,12 @@ diff --exclude-from=exclude --exclude=se
 +extern void watch_list_free(int fd);
  
  #endif
-Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.71/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.71/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-19 12:25:41.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.71/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.71/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.71/restorecond/user.c	2009-08-19 12:25:41.000000000 -0400
@@ -877,11 +875,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.71/restorecond/user.o differ
-Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.71/restorecond/utmpwatcher.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.71/restorecond/walk.c
 --- nsapolicycoreutils/restorecond/walk.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/walk.c	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/walk.c	2009-08-19 16:30:32.000000000 -0400
 @@ -0,0 +1,30 @@
 +#define _XOPEN_SOURCE 500
 +#include <ftw.h>
@@ -1170,10 +1166,9 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.71/restorecond/watch.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-19 16:30:32.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1185,7 +1180,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/Makefile policycoreutils-2.0.71/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-19 16:30:32.000000000 -0400
 @@ -5,11 +5,12 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1202,7 +1197,7 @@ diff --exclude-from=exclude --exclude=se
  	-mkdir -p $(MANDIR)/man8
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.71/scripts/sandbox
 --- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox	2009-08-19 16:30:32.000000000 -0400
 @@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
@@ -1345,7 +1340,7 @@ diff --exclude-from=exclude --exclude=se
 +    sys.exit(rc)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.71/scripts/sandbox.8
 --- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-19 16:30:32.000000000 -0400
 @@ -0,0 +1,22 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1371,7 +1366,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/scripts/sandbox.py policycoreutils-2.0.71/scripts/sandbox.py
 --- nsapolicycoreutils/scripts/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-19 15:01:34.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-19 16:30:32.000000000 -0400
 @@ -0,0 +1,67 @@
 +#!/usr/bin/python
 +import os, sys, getopt, socket, random, fcntl
@@ -1441,31 +1436,9 @@ diff --exclude-from=exclude --exclude=se
 +    umount(filecon)
 +os.execvp(cmds[0], cmds)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2009-08-19 16:18:21.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage	2009-08-19 15:01:34.000000000 -0400
-@@ -44,17 +44,17 @@
-                text = _("""
- semanage [ -S store ] -i [ input_file | - ]
- 
--semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
-+semanage {module,boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
- semanage login -{a|d|m} [-sr] login_name | %groupname
- semanage user -{a|d|m} [-LrRP] selinux_name
- semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
- semanage interface -{a|d|m} [-tr] interface_spec
- semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
--semanage fcontext -{a|d|m} [-frst] file_spec
-+semanage fcontext -{a|d|m} [-frst] [-e path ] file_spec
- semanage translation -{a|d|m} [-T] level
- semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
--semanage permissive -{d|a} type
--semanage dontaudit [ on | off ]
-+semanage permissive -{a|d} type
-+semanage module -{a|d|} module
- 
- Primary Options:
- 
-@@ -69,6 +69,7 @@
+--- nsapolicycoreutils/semanage/semanage	2009-08-19 16:35:03.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage	2009-08-19 16:30:32.000000000 -0400
+@@ -68,6 +68,7 @@
  	-h, --help       Display this message
  	-n, --noheading  Do not print heading when listing OBJECTS
          -S, --store      Select and alternate SELinux store to manage
@@ -1473,7 +1446,7 @@ diff --exclude-from=exclude --exclude=se
  
  Object-specific Options (see above):
  
-@@ -85,6 +86,7 @@
+@@ -84,6 +85,7 @@
          -F, --file       Treat target as an input file for command, change multiple settings
  	-p, --proto      Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
  	-M, --mask       Netmask
@@ -1481,24 +1454,7 @@ 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")
-@@ -116,12 +118,14 @@
- 		valid_option["node"] = []
- 		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
- 		valid_option["fcontext"] = []
--		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
--		valid_option["dontaudit"] = [ '-S', '--store' ]
-+		valid_option["fcontext"] += valid_everyone + [ '-e', '--equal', '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
- 		valid_option["translation"] = []
- 		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
- 		valid_option["boolean"] = []
- 		valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] 
-+		valid_option["module"] = []
-+		valid_option["module"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '--dontaudit']
-+
- 		valid_option["permissive"] = []
- 		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
- 		return valid_option
-@@ -194,6 +198,9 @@
+@@ -192,6 +194,9 @@
  		locallist = False
  		use_file = False
                  store = ""
@@ -1508,7 +1464,7 @@ diff --exclude-from=exclude --exclude=se
  			
  		object = argv[0]
  		option_dict=get_options()
-@@ -203,10 +210,12 @@
+@@ -201,10 +206,12 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
@@ -1522,7 +1478,7 @@ diff --exclude-from=exclude --exclude=se
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -250,9 +259,15 @@
+@@ -248,9 +255,15 @@
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
@@ -1538,7 +1494,7 @@ diff --exclude-from=exclude --exclude=se
  			if o == "-h" or o == "--help":
                                 raise ValueError(_("%s bad option") % o)
  
-@@ -326,6 +341,9 @@
+@@ -324,6 +337,9 @@
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
  		
@@ -1548,32 +1504,7 @@ diff --exclude-from=exclude --exclude=se
  		if object == "translation":
  			OBJECT = seobject.setransRecords()
  		
-@@ -343,17 +361,18 @@
- 			OBJECT.deleteall()
-                         return
- 			
-+		if dontaudit != "":
-+			if object == "module":
-+                               OBJECT.dontaudit(dontaudit)
-+                        else:
-+                               raise ValueError(_("%s bad option") % o)
-+                        return
-+
- 		if len(cmds) != 1:
-                        raise ValueError(_("%s bad option") % o)
-                         
-                 target = cmds[0]
- 
--
--		if object == "dontaudit":
--			OBJECT = seobject.dontauditClass(store)
--                        OBJECT.toggle(target)
--                        return
--                              
- 		if add:
- 			if object == "login":
- 				OBJECT.add(target, seuser, serange)
-@@ -370,11 +389,17 @@
+@@ -362,11 +378,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -1592,7 +1523,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -394,6 +419,9 @@
+@@ -386,6 +408,9 @@
  				rlist = roles.split()
  				OBJECT.modify(target, rlist, selevel, serange, prefix)
  
@@ -1602,7 +1533,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -404,7 +432,10 @@
+@@ -396,7 +421,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -1614,30 +1545,9 @@ diff --exclude-from=exclude --exclude=se
  
                          return
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.71/semanage/semanage.8
---- nsapolicycoreutils/semanage/semanage.8	2009-08-19 16:20:57.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage.8	2009-08-19 15:01:34.000000000 -0400
-@@ -21,7 +21,7 @@
- .br
- .B semanage permissive \-{a|d} type
- .br
--.B semanage dontaudit [ on | off ]
-+.B semanage module \-{a|d} policy_package
- .br
- .B semanage translation \-{a|d|m} [\-T] level
- .P
-@@ -119,8 +119,6 @@
- $ semanage port -a -t http_port_t -p tcp 81
- # Change apache to a permissive domain
- $ semanage permissive -a httpd_t
--# Turn off dontaudit rules
--$ semanage dontaudit off
- .fi
- 
- .SH "AUTHOR"
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.71/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2009-08-19 16:14:31.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-19 15:01:34.000000000 -0400
+--- nsapolicycoreutils/semanage/seobject.py	2009-08-19 16:35:03.000000000 -0400
++++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-19 16:30:32.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 
@@ -1662,63 +1572,7 @@ diff --exclude-from=exclude --exclude=se
  		os.rename(newfilename, self.filename)
                  os.system("/sbin/service mcstrans reload > /dev/null")
  
-@@ -314,18 +315,49 @@
-                self.transaction = False
-                self.commit()
- 
--class dontauditClass(semanageRecords):
-+class moduleRecords(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'"))
-+	def get_all(self):
-+               l = []
-+               (rc, mlist, number) = semanage_module_list(self.sh)
-+               if rc < 0:
-+                      raise ValueError(_("Could not list SELinux modules"))
-+
-+               for i in range(number):
-+                      mod = semanage_module_list_nth(mlist, i)
-+                      name = semanage_module_get_name(mod)
-+                      l.append(name)
-+               return l
-+
-+	def dontaudit(self, dontaudit = 0):
-                self.begin()
--               rc = semanage_set_disable_dontaudit(self.sh, dontaudit == "on")
-+               rc = semanage_set_disable_dontaudit(self.sh, dontaudit)
-                self.commit()
-                rc = semanage_reload_policy(self.sh)
--               
-+
-+	def list(self, heading = 1, locallist = 0):
-+		if heading:
-+			print "\n%-25s\n" % (_("Modules"))
-+                for t in self.get_all():
-+                       print t
-+
-+	def add(self, modules):
-+               import glob
-+               for m in modules.split():
-+                      rc = semanage_module_install_file(self.sh, m);
-+               if rc >= 0:
-+                      self.commit()
-+
-+	def delete(self, modules):
-+               for m in modules.split():
-+                      rc = semanage_module_remove(self.sh, m)
-+                      if rc < 0:
-+                             raise ValueError(_("Could not remove module %s (remove failed)") % name)
-+                      
-+               self.commit()
-+			
- class permissiveRecords(semanageRecords):
- 	def __init__(self, store):
-                semanageRecords.__init__(self, store)
-@@ -995,7 +1027,7 @@
+@@ -983,7 +984,7 @@
  			proto_str = semanage_port_get_proto_str(proto)
  			low = semanage_port_get_low(port)
  			high = semanage_port_get_high(port)
@@ -1727,7 +1581,7 @@ diff --exclude-from=exclude --exclude=se
  		return ddict
  
  	def get_all_by_type(self, locallist = 0):
-@@ -1420,6 +1452,48 @@
+@@ -1408,6 +1409,48 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
@@ -1776,7 +1630,7 @@ diff --exclude-from=exclude --exclude=se
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1586,9 +1660,16 @@
+@@ -1574,9 +1617,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -1793,7 +1647,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 +1725,11 @@
+@@ -1632,11 +1682,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -1807,7 +1661,7 @@ diff --exclude-from=exclude --exclude=se
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1657,6 +1738,12 @@
+@@ -1645,6 +1695,12 @@
  					print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
  			else:
  				print "%-50s %-18s <<None>>" % (k[0], k[1])
@@ -2376,7 +2230,6 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 +
-Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.71/setfiles/restorecon differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.71/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-19 15:42:48.000000000 -0400
@@ -2431,8 +2284,6 @@ diff --exclude-from=exclude --exclude=se
 +int process_one(char *name, int recurse);
 +
 +#endif
-Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.71/setfiles/restore.o differ
-Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.71/setfiles/setfiles differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.71/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-08-12 12:08:15.000000000 -0400
 +++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-19 15:42:48.000000000 -0400



From rjones at fedoraproject.org  Wed Aug 19 20:41:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 20:41:21 +0000 (UTC)
Subject: rpms/libguestfs/EL-5
	0001-tests-Found-three-more-references-to-the-squashfs.patch,
	NONE, 1.1 libguestfs.spec, 1.62, 1.63
Message-ID: <20090819204121.A092411C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19429

Modified Files:
	libguestfs.spec 
Added Files:
	0001-tests-Found-three-more-references-to-the-squashfs.patch 
Log Message:
Pull in upstream patch to fix tests.

0001-tests-Found-three-more-references-to-the-squashfs.patch:
 perl/t/510-lib-file-arch.t                               |    4 ++--
 regressions/test-cancellation-download-librarycancels.sh |    4 ++--
 regressions/test-read_file.sh                            |    5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE 0001-tests-Found-three-more-references-to-the-squashfs.patch ---
>From 0c92c583d5291e1a3a966b36f107bf48e4bfad93 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Wed, 19 Aug 2009 21:37:56 +0100
Subject: [PATCH] tests: Found three more references to the squashfs, replaced with ISO.

---
 perl/t/510-lib-file-arch.t                         |    4 ++--
 .../test-cancellation-download-librarycancels.sh   |    4 ++--
 regressions/test-read_file.sh                      |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/perl/t/510-lib-file-arch.t b/perl/t/510-lib-file-arch.t
index c4b9d31..5c70449 100644
--- a/perl/t/510-lib-file-arch.t
+++ b/perl/t/510-lib-file-arch.t
@@ -35,7 +35,7 @@ use Sys::Guestfs::Lib;
 my $h = Sys::Guestfs->new ();
 ok ($h);
 
-$h->add_drive_ro ("../images/test.sqsh");
+$h->add_drive_ro ("../images/test.iso");
 ok (1);
 
 $h->launch ();
@@ -43,7 +43,7 @@ ok (1);
 $h->wait_ready ();
 ok (1);
 
-$h->mount_vfs ("ro", "squashfs", "/dev/sda", "/");
+$h->mount_ro ("/dev/sda", "/");
 ok (1);
 
 is (Sys::Guestfs::Lib::file_architecture ($h, "/bin-i586-dynamic"),
diff --git a/regressions/test-cancellation-download-librarycancels.sh b/regressions/test-cancellation-download-librarycancels.sh
index b0d78c9..73c5469 100755
--- a/regressions/test-cancellation-download-librarycancels.sh
+++ b/regressions/test-cancellation-download-librarycancels.sh
@@ -25,10 +25,10 @@ set -e
 rm -f test.img
 
 ../fish/guestfish <<'EOF'
-add ../images/test.sqsh
+add ../images/test.iso
 run
 
-mount-vfs ro squashfs /dev/sda /
+mount-ro /dev/sda /
 
 # Download a file to /dev/full.
 echo "Expect: write: /dev/full: No space left on device"
diff --git a/regressions/test-read_file.sh b/regressions/test-read_file.sh
index 5840da3..3b9c6ef 100755
--- a/regressions/test-read_file.sh
+++ b/regressions/test-read_file.sh
@@ -23,9 +23,9 @@ set -e
 rm -f test.out
 
 ../fish/guestfish <<'EOF' > test.out
-add-ro ../images/test.sqsh
+add-ro ../images/test.iso
 run
-mount-vfs ro squashfs /dev/sda /
+mount-ro /dev/sda /
 read-file /helloworld.tar
 EOF
 
-- 
1.6.2.5



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- libguestfs.spec	19 Aug 2009 19:11:53 -0000	1.62
+++ libguestfs.spec	19 Aug 2009 20:41:21 -0000	1.63
@@ -5,13 +5,16 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.68
-Release:     4%{?dist}
+Release:     5%{?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
 
+# This patch upstream in 1.0.69.
+Patch0:      0001-tests-Found-three-more-references-to-the-squashfs.patch
+
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -307,6 +310,8 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+%patch0 -p1
+
 mkdir -p daemon/m4
 
 
@@ -540,6 +545,7 @@ rm -rf $RPM_BUILD_ROOT
 - New upstream release 1.0.68.
 - BR mkisofs.
 - For EPEL only we need e4fsprogs.
+- Pull in upstream patch to fix tests.
 
 * Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
 - New upstream release 1.0.67.



From rjones at fedoraproject.org  Wed Aug 19 20:41:44 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 19 Aug 2009 20:41:44 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.63,1.64
Message-ID: <20090819204144.053C311C00E4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19534

Modified Files:
	libguestfs.spec 
Log Message:
Bump release number.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- libguestfs.spec	19 Aug 2009 20:41:21 -0000	1.63
+++ libguestfs.spec	19 Aug 2009 20:41:43 -0000	1.64
@@ -541,7 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-4
+* Wed Aug 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.68-5
 - New upstream release 1.0.68.
 - BR mkisofs.
 - For EPEL only we need e4fsprogs.



From dwalsh at fedoraproject.org  Wed Aug 19 20:48:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 19 Aug 2009 20:48:18 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.31,
	1.32 setroubleshoot-plugins.spec, 1.36, 1.37 sources, 1.32, 1.33
Message-ID: <20090819204818.B9C7011C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21617

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Wed Aug 19 2009  <dwalsh at redhat.com> - 2.1.15-1
  - Fix mislabeled_file.py



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	18 Aug 2009 17:21:35 -0000	1.31
+++ .cvsignore	19 Aug 2009 20:48:18 -0000	1.32
@@ -21,3 +21,4 @@ setroubleshoot-plugins-2.1.11.tar.gz
 setroubleshoot-plugins-2.1.12.tar.gz
 setroubleshoot-plugins-2.1.13.tar.gz
 setroubleshoot-plugins-2.1.14.tar.gz
+setroubleshoot-plugins-2.1.15.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- setroubleshoot-plugins.spec	18 Aug 2009 17:21:35 -0000	1.36
+++ setroubleshoot-plugins.spec	19 Aug 2009 20:48:18 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.14
+Version: 2.1.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Wed Aug 19 2009  <dwalsh at redhat.com> - 2.1.15-1
+  - Fix mislabeled_file.py
+
 * Tue Aug 18 2009  <dwalsh at redhat.com> - 2.1.14-1
   - Change priority on mmap_zero to happen after catchall_booleans
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	18 Aug 2009 17:21:35 -0000	1.32
+++ sources	19 Aug 2009 20:48:18 -0000	1.33
@@ -1 +1 @@
-c2760a7bd732698bcc196ede543c1d89  setroubleshoot-plugins-2.1.14.tar.gz
+dc3996581624a09cf0a3fae794e58a52  setroubleshoot-plugins-2.1.15.tar.gz



From ensc at fedoraproject.org  Wed Aug 19 20:50:51 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 20:50:51 +0000 (UTC)
Subject: rpms/milter-greylist/F-11 milter-greylist.spec,1.32,1.33
Message-ID: <20090819205051.6807011C0417@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22264

Modified Files:
	milter-greylist.spec 
Log Message:
- do not link against libbind anymore; recent glibc seems to have
  fixed its resolver API so that -lresolv can be used by dnsrbl. Old
  -lbind conflicts with this library in a subtly way causing segfaults
  (#518274).



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-11/milter-greylist.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- milter-greylist.spec	19 Aug 2009 20:00:46 -0000	1.32
+++ milter-greylist.spec	19 Aug 2009 20:50:51 -0000	1.33
@@ -19,7 +19,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.2.3
-Release:	%release_func 0%{?beta}
+Release:	%release_func 1%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -32,7 +32,6 @@ Requires:		init(%name)
 Provides:		user(%username)  = 7
 Provides:		group(%username) = 7
 BuildRequires:		bison flex m4
-BuildRequires:		%_libdir/libbind.so
 BuildRequires:		sendmail-devel %{?with_spf:libspf-devel}
 BuildRequires:		fedora-usermgmt-devel
 BuildRequires:		curl-devel GeoIP-devel
@@ -120,8 +119,8 @@ done
 
 %define makeflags	TEST=false BINDIR=%_sbindir
 %build
-export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_GNU_SOURCE -D_REENTRANT $(pkg-config --cflags-only-I libcurl libbind)"
-export LDFLAGS="-Wl,--as-needed -lbind -lcurl -lGeoIP"
+export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_GNU_SOURCE -D_REENTRANT $(pkg-config --cflags-only-I libcurl)"
+export LDFLAGS="-Wl,--as-needed $(pkg-config --libs libcurl) -lGeoIP"
 %configure \
 	--disable-rpath				\
 	--with-user=%username			\
@@ -213,6 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1
+- do not link against libbind anymore; recent glibc seems to have
+  fixed its resolver API so that -lresolv can be used by dnsrbl. Old
+  -lbind conflicts with this library in a subtly way causing segfaults
+  (#518274).
+
+* Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-0
 - updated to 4.2.3
 
 * Sat Apr 11 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.2-0.



From ensc at fedoraproject.org  Wed Aug 19 20:53:46 2009
From: ensc at fedoraproject.org (ensc)
Date: Wed, 19 Aug 2009 20:53:46 +0000 (UTC)
Subject: rpms/milter-greylist/devel milter-greylist.spec,1.35,1.36
Message-ID: <20090819205346.C661111C00E4@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22975

Modified Files:
	milter-greylist.spec 
Log Message:
- do not link against libbind anymore; recent glibc seems to have
  fixed its resolver API so that -lresolv can be used by dnsrbl. Old
  -lbind conflicts with this library in a subtly way causing segfaults
  (#518274).



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- milter-greylist.spec	19 Aug 2009 20:06:51 -0000	1.35
+++ milter-greylist.spec	19 Aug 2009 20:53:46 -0000	1.36
@@ -20,7 +20,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.2.3
-Release:	%release_func 1%{?beta}
+Release:	%release_func 2%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -33,7 +33,6 @@ Requires:		init(%name)
 Provides:		user(%username)  = 7
 Provides:		group(%username) = 7
 BuildRequires:		bison flex m4
-BuildRequires:		%_libdir/libbind.so
 BuildRequires:		sendmail-devel %{?with_spf:libspf-devel}
 BuildRequires:		fedora-usermgmt-devel
 BuildRequires:		curl-devel GeoIP-devel
@@ -122,8 +121,8 @@ done
 
 %define makeflags	TEST=false BINDIR=%_sbindir
 %build
-export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_GNU_SOURCE -D_REENTRANT $(pkg-config --cflags-only-I libcurl libbind)"
-export LDFLAGS="-Wl,--as-needed -lbind -lcurl -lGeoIP"
+export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_GNU_SOURCE -D_REENTRANT $(pkg-config --cflags-only-I libcurl)"
+export LDFLAGS="-Wl,--as-needed $(pkg-config --libs libcurl) -lGeoIP"
 %configure \
 	--disable-rpath				\
 	--with-user=%username			\
@@ -214,8 +213,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+* Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-2
 - moved pre-2007 %%changelog entries into ChangeLog.rpm
+- do not link against libbind anymore; recent glibc seems to have
+  fixed its resolver API so that -lresolv can be used by dnsrbl. Old
+  -lbind conflicts with this library in a subtly way causing segfaults
+  (#518274).
 
 * Wed Aug 19 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1
 - updated to 4.2.3



From pkgdb at fedoraproject.org  Wed Aug 19 21:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:03:30 +0000
Subject: [pkgdb] o3read (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819210331.18A3D10F854@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for o3read
tibbs has set commit to Approved for 107427 on o3read (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on o3read (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on o3read (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/o3read



From pkgdb at fedoraproject.org  Wed Aug 19 21:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:03:30 +0000
Subject: [pkgdb] o3read (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819210331.2B04710F86F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for o3read
tibbs has set commit to Approved for 107427 on o3read (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on o3read (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on o3read (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/o3read



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:02 +0000
Subject: [pkgdb] sugar-record was added for fab
Message-ID: <20090819210402.AB4A410F854@bastion2.fedora.phx.redhat.com>

tibbs has added Package sugar-record with summary Recording tool for Sugar
tibbs has approved Package sugar-record
tibbs has added a Fedora devel branch for sugar-record with an owner of fab
tibbs has approved sugar-record in Fedora devel
tibbs has approved Package sugar-record
tibbs has set commit to Approved for 107427 on sugar-record (Fedora devel)
tibbs has set checkout to Approved for 107427 on sugar-record (Fedora devel)
tibbs has set build to Approved for 107427 on sugar-record (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-record



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:03 +0000
Subject: [pkgdb] sugar-record summary updated by tibbs
Message-ID: <20090819210403.F159610F86F@bastion2.fedora.phx.redhat.com>

tibbs set package sugar-record summary to Recording tool for Sugar

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-record



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:03 +0000
Subject: [pkgdb] sugar-record (Fedora, 10) updated by tibbs
Message-ID: <20090819210404.0DFBC10F889@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for sugar-record
tibbs has set commit to Approved for 107427 on sugar-record (Fedora 10)
tibbs has set checkout to Approved for 107427 on sugar-record (Fedora 10)
tibbs has set build to Approved for 107427 on sugar-record (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-record



From tibbs at fedoraproject.org  Wed Aug 19 21:04:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:10 +0000 (UTC)
Subject: rpms/sugar-record - New directory
Message-ID: <20090819210410.12C0F11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sugar-record
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx25597/rpms/sugar-record

Log Message:
Directory /cvs/pkgs/rpms/sugar-record added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:04:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:10 +0000 (UTC)
Subject: rpms/sugar-record/devel - New directory
Message-ID: <20090819210410.3E29811C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sugar-record/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx25597/rpms/sugar-record/devel

Log Message:
Directory /cvs/pkgs/rpms/sugar-record/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:03 +0000
Subject: [pkgdb] sugar-record (Fedora, 10) updated by tibbs
Message-ID: <20090819210404.23CE510F895@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for sugar-record
tibbs has set commit to Approved for 107427 on sugar-record (Fedora 11)
tibbs has set checkout to Approved for 107427 on sugar-record (Fedora 11)
tibbs has set build to Approved for 107427 on sugar-record (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sugar-record



From tibbs at fedoraproject.org  Wed Aug 19 21:04:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:16 +0000 (UTC)
Subject: rpms/sugar-record Makefile,NONE,1.1
Message-ID: <20090819210416.7CA8611C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sugar-record
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx25597/rpms/sugar-record

Added Files:
	Makefile 
Log Message:
Setup of module sugar-record


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-record
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:04:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:16 +0000 (UTC)
Subject: rpms/sugar-record/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819210416.AEAB611C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sugar-record/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsx25597/rpms/sugar-record/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-record


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-record
# $Id: Makefile,v 1.1 2009/08/19 21:04:16 tibbs Exp $
NAME := sugar-record
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:41 +0000
Subject: [pkgdb] sys_basher was added for bjrosen
Message-ID: <20090819210441.4342F10F888@bastion2.fedora.phx.redhat.com>

tibbs has added Package sys_basher with summary Hardware reliability and performance tester
tibbs has approved Package sys_basher
tibbs has added a Fedora devel branch for sys_basher with an owner of bjrosen
tibbs has approved sys_basher in Fedora devel
tibbs has approved Package sys_basher
tibbs has set commit to Approved for 107427 on sys_basher (Fedora devel)
tibbs has set checkout to Approved for 107427 on sys_basher (Fedora devel)
tibbs has set build to Approved for 107427 on sys_basher (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sys_basher



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:42 +0000
Subject: [pkgdb] sys_basher summary updated by tibbs
Message-ID: <20090819210442.53EB810F86F@bastion2.fedora.phx.redhat.com>

tibbs set package sys_basher summary to Hardware reliability and performance tester

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sys_basher



From tibbs at fedoraproject.org  Wed Aug 19 21:04:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:49 +0000 (UTC)
Subject: rpms/sys_basher - New directory
Message-ID: <20090819210449.1D7E411C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sys_basher
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw25940/rpms/sys_basher

Log Message:
Directory /cvs/pkgs/rpms/sys_basher added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:42 +0000
Subject: [pkgdb] sys_basher (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819210442.59BB410F895@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for sys_basher
tibbs has set commit to Approved for 107427 on sys_basher (Fedora 11)
tibbs has set checkout to Approved for 107427 on sys_basher (Fedora 11)
tibbs has set build to Approved for 107427 on sys_basher (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sys_basher



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:42 +0000
Subject: [pkgdb] sys_basher (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819210442.678E910F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for sys_basher
tibbs has set commit to Approved for 107427 on sys_basher (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on sys_basher (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on sys_basher (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sys_basher



From tibbs at fedoraproject.org  Wed Aug 19 21:04:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:49 +0000 (UTC)
Subject: rpms/sys_basher/devel - New directory
Message-ID: <20090819210449.3B2F811C0381@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sys_basher/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw25940/rpms/sys_basher/devel

Log Message:
Directory /cvs/pkgs/rpms/sys_basher/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:04:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:55 +0000 (UTC)
Subject: rpms/sys_basher Makefile,NONE,1.1
Message-ID: <20090819210455.184D411C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sys_basher
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw25940/rpms/sys_basher

Added Files:
	Makefile 
Log Message:
Setup of module sys_basher


--- NEW FILE Makefile ---
# Top level Makefile for module sys_basher
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug 19 21:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:04:42 +0000
Subject: [pkgdb] sys_basher (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819210442.77E3710F8C3@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for sys_basher
tibbs has set commit to Approved for 107427 on sys_basher (Fedora 10)
tibbs has set checkout to Approved for 107427 on sys_basher (Fedora 10)
tibbs has set build to Approved for 107427 on sys_basher (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sys_basher



From tibbs at fedoraproject.org  Wed Aug 19 21:04:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:04:55 +0000 (UTC)
Subject: rpms/sys_basher/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819210455.7D61611C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sys_basher/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw25940/rpms/sys_basher/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sys_basher


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sys_basher
# $Id: Makefile,v 1.1 2009/08/19 21:04:55 tibbs Exp $
NAME := sys_basher
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:07:05 +0000
Subject: [pkgdb] gpx-viewer was added for fab
Message-ID: <20090819210705.77C6710F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package gpx-viewer with summary A simple gpx viewer
tibbs has approved Package gpx-viewer
tibbs has added a Fedora devel branch for gpx-viewer with an owner of fab
tibbs has approved gpx-viewer in Fedora devel
tibbs has approved Package gpx-viewer
tibbs has set commit to Approved for 107427 on gpx-viewer (Fedora devel)
tibbs has set checkout to Approved for 107427 on gpx-viewer (Fedora devel)
tibbs has set build to Approved for 107427 on gpx-viewer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpx-viewer



From pkgdb at fedoraproject.org  Wed Aug 19 21:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:07:06 +0000
Subject: [pkgdb] gpx-viewer summary updated by tibbs
Message-ID: <20090819210706.603F610F889@bastion2.fedora.phx.redhat.com>

tibbs set package gpx-viewer summary to A simple gpx viewer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpx-viewer



From tibbs at fedoraproject.org  Wed Aug 19 21:07:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:07:13 +0000 (UTC)
Subject: rpms/gpx-viewer - New directory
Message-ID: <20090819210713.25D6111C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpx-viewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE26790/rpms/gpx-viewer

Log Message:
Directory /cvs/pkgs/rpms/gpx-viewer added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:07:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:07:13 +0000 (UTC)
Subject: rpms/gpx-viewer/devel - New directory
Message-ID: <20090819210713.4262311C0381@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpx-viewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE26790/rpms/gpx-viewer/devel

Log Message:
Directory /cvs/pkgs/rpms/gpx-viewer/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:07:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:07:19 +0000 (UTC)
Subject: rpms/gpx-viewer Makefile,NONE,1.1
Message-ID: <20090819210719.C303B11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpx-viewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE26790/rpms/gpx-viewer

Added Files:
	Makefile 
Log Message:
Setup of module gpx-viewer


--- NEW FILE Makefile ---
# Top level Makefile for module gpx-viewer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:07:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:07:20 +0000 (UTC)
Subject: rpms/gpx-viewer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819210720.0B62F11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/gpx-viewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE26790/rpms/gpx-viewer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpx-viewer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gpx-viewer
# $Id: Makefile,v 1.1 2009/08/19 21:07:19 tibbs Exp $
NAME := gpx-viewer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:07:06 +0000
Subject: [pkgdb] gpx-viewer (Fedora, 11) updated by tibbs
Message-ID: <20090819210706.6CC0A10F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for gpx-viewer
tibbs has set commit to Approved for 107427 on gpx-viewer (Fedora 11)
tibbs has set checkout to Approved for 107427 on gpx-viewer (Fedora 11)
tibbs has set build to Approved for 107427 on gpx-viewer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpx-viewer



From pkgdb at fedoraproject.org  Wed Aug 19 21:09:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:09:12 +0000
Subject: [pkgdb] liblastfm was added for rdieter
Message-ID: <20090819210912.BBA4C10F85A@bastion2.fedora.phx.redhat.com>

tibbs has added Package liblastfm with summary Libraries to integrate Last.fm services
tibbs has approved Package liblastfm
tibbs has added a Fedora devel branch for liblastfm with an owner of rdieter
tibbs has approved liblastfm in Fedora devel
tibbs has approved Package liblastfm
tibbs has set commit to Approved for 107427 on liblastfm (Fedora devel)
tibbs has set checkout to Approved for 107427 on liblastfm (Fedora devel)
tibbs has set build to Approved for 107427 on liblastfm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/liblastfm



From pkgdb at fedoraproject.org  Wed Aug 19 21:09:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:09:13 +0000
Subject: [pkgdb] liblastfm summary updated by tibbs
Message-ID: <20090819210914.1C93E10F881@bastion2.fedora.phx.redhat.com>

tibbs set package liblastfm summary to Libraries to integrate Last.fm services

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/liblastfm



From pkgdb at fedoraproject.org  Wed Aug 19 21:09:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:09:13 +0000
Subject: [pkgdb] liblastfm (Fedora, 11) updated by tibbs
Message-ID: <20090819210914.25C1D10F889@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for liblastfm
tibbs has set commit to Approved for 107427 on liblastfm (Fedora 11)
tibbs has set checkout to Approved for 107427 on liblastfm (Fedora 11)
tibbs has set build to Approved for 107427 on liblastfm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/liblastfm



From tibbs at fedoraproject.org  Wed Aug 19 21:09:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:09:20 +0000 (UTC)
Subject: rpms/liblastfm - New directory
Message-ID: <20090819210920.148AF11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/liblastfm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ27435/rpms/liblastfm

Log Message:
Directory /cvs/pkgs/rpms/liblastfm added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:09:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:09:13 +0000
Subject: [pkgdb] liblastfm (Fedora, 11) updated by tibbs
Message-ID: <20090819210914.3036C10F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for liblastfm
tibbs has set commit to Approved for 107427 on liblastfm (Fedora 10)
tibbs has set checkout to Approved for 107427 on liblastfm (Fedora 10)
tibbs has set build to Approved for 107427 on liblastfm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/liblastfm



From tibbs at fedoraproject.org  Wed Aug 19 21:09:20 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:09:20 +0000 (UTC)
Subject: rpms/liblastfm/devel - New directory
Message-ID: <20090819210920.40F2E11C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/liblastfm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ27435/rpms/liblastfm/devel

Log Message:
Directory /cvs/pkgs/rpms/liblastfm/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:09:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:09:28 +0000 (UTC)
Subject: rpms/liblastfm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819210928.0E9B811C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/liblastfm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ27435/rpms/liblastfm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module liblastfm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: liblastfm
# $Id: Makefile,v 1.1 2009/08/19 21:09:27 tibbs Exp $
NAME := liblastfm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Aug 19 21:09:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:09:27 +0000 (UTC)
Subject: rpms/liblastfm Makefile,NONE,1.1
Message-ID: <20090819210927.A132F11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/liblastfm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ27435/rpms/liblastfm

Added Files:
	Makefile 
Log Message:
Setup of module liblastfm


--- NEW FILE Makefile ---
# Top level Makefile for module liblastfm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug 19 21:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:13:29 +0000
Subject: [pkgdb] nss-util summary updated by tibbs
Message-ID: <20090819211330.0516410F889@bastion2.fedora.phx.redhat.com>

tibbs set package nss-util summary to Network Security Services Utility Module

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-util



From pkgdb at fedoraproject.org  Wed Aug 19 21:13:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:13:28 +0000
Subject: [pkgdb] nss-util was added for emaldonado
Message-ID: <20090819211328.3C24A10F85A@bastion2.fedora.phx.redhat.com>

tibbs has added Package nss-util with summary Network Security Services Utility Module
tibbs has approved Package nss-util
tibbs has added a Fedora devel branch for nss-util with an owner of emaldonado
tibbs has approved nss-util in Fedora devel
tibbs has approved Package nss-util
tibbs has set commit to Approved for 107427 on nss-util (Fedora devel)
tibbs has set checkout to Approved for 107427 on nss-util (Fedora devel)
tibbs has set build to Approved for 107427 on nss-util (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-util



From pkgdb at fedoraproject.org  Wed Aug 19 21:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:13:29 +0000
Subject: [pkgdb] nss-util (Fedora, devel) updated by tibbs
Message-ID: <20090819211330.177FD10F898@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on nss-util (Fedora devel) for emaldonado
tibbs approved watchcommits on nss-util (Fedora devel) for emaldonado
tibbs approved watchbugzilla on nss-util (Fedora devel) for kengert
tibbs approved watchcommits on nss-util (Fedora devel) for kengert
tibbs approved watchbugzilla on nss-util (Fedora devel) for rrelyea
tibbs approved watchcommits on nss-util (Fedora devel) for rrelyea
tibbs approved watchbugzilla on nss-util (Fedora devel) for kengert
tibbs approved watchcommits on nss-util (Fedora devel) for kengert
tibbs approved commit on nss-util (Fedora devel) for kengert
tibbs approved build on nss-util (Fedora devel) for kengert
tibbs approved approveacls on nss-util (Fedora devel) for kengert
tibbs approved watchbugzilla on nss-util (Fedora devel) for rrelyea
tibbs approved watchcommits on nss-util (Fedora devel) for rrelyea
tibbs approved commit on nss-util (Fedora devel) for rrelyea
tibbs approved build on nss-util (Fedora devel) for rrelyea
tibbs approved approveacls on nss-util (Fedora devel) for rrelyea

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-util



From tibbs at fedoraproject.org  Wed Aug 19 21:13:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:13:36 +0000 (UTC)
Subject: rpms/nss-util - New directory
Message-ID: <20090819211336.221A311C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-util
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz28707/rpms/nss-util

Log Message:
Directory /cvs/pkgs/rpms/nss-util added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:13:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:13:36 +0000 (UTC)
Subject: rpms/nss-util/devel - New directory
Message-ID: <20090819211336.3BFB211C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz28707/rpms/nss-util/devel

Log Message:
Directory /cvs/pkgs/rpms/nss-util/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:13:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:13:42 +0000 (UTC)
Subject: rpms/nss-util Makefile,NONE,1.1
Message-ID: <20090819211342.D21F511C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-util
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz28707/rpms/nss-util

Added Files:
	Makefile 
Log Message:
Setup of module nss-util


--- NEW FILE Makefile ---
# Top level Makefile for module nss-util
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:13:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:13:43 +0000 (UTC)
Subject: rpms/nss-util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819211343.1971F11C0381@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz28707/rpms/nss-util/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nss-util


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nss-util
# $Id: Makefile,v 1.1 2009/08/19 21:13:42 tibbs Exp $
NAME := nss-util
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:18:45 +0000
Subject: [pkgdb] nss-softokn was added for emaldonado
Message-ID: <20090819211845.48B3910F7E5@bastion2.fedora.phx.redhat.com>

tibbs has added Package nss-softokn with summary Network Security Services Cryptographic Module
tibbs has approved Package nss-softokn
tibbs has added a Fedora devel branch for nss-softokn with an owner of emaldonado
tibbs has approved nss-softokn in Fedora devel
tibbs has approved Package nss-softokn
tibbs has set commit to Approved for 107427 on nss-softokn (Fedora devel)
tibbs has set checkout to Approved for 107427 on nss-softokn (Fedora devel)
tibbs has set build to Approved for 107427 on nss-softokn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-softokn



From pkgdb at fedoraproject.org  Wed Aug 19 21:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:18:46 +0000
Subject: [pkgdb] nss-softokn summary updated by tibbs
Message-ID: <20090819211846.CDD5C10F86F@bastion2.fedora.phx.redhat.com>

tibbs set package nss-softokn summary to Network Security Services Cryptographic Module

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-softokn



From pkgdb at fedoraproject.org  Wed Aug 19 21:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:18:46 +0000
Subject: [pkgdb] nss-softokn (Fedora, devel) updated by tibbs
Message-ID: <20090819211846.D8D1D10F890@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on nss-softokn (Fedora devel) for emaldonado
tibbs approved watchcommits on nss-softokn (Fedora devel) for emaldonado
tibbs approved watchbugzilla on nss-softokn (Fedora devel) for kengert
tibbs approved watchcommits on nss-softokn (Fedora devel) for kengert
tibbs approved watchbugzilla on nss-softokn (Fedora devel) for rrelyea
tibbs approved watchcommits on nss-softokn (Fedora devel) for rrelyea
tibbs approved watchbugzilla on nss-softokn (Fedora devel) for kengert
tibbs approved watchcommits on nss-softokn (Fedora devel) for kengert
tibbs approved commit on nss-softokn (Fedora devel) for kengert
tibbs approved build on nss-softokn (Fedora devel) for kengert
tibbs approved approveacls on nss-softokn (Fedora devel) for kengert
tibbs approved watchbugzilla on nss-softokn (Fedora devel) for rrelyea
tibbs approved watchcommits on nss-softokn (Fedora devel) for rrelyea
tibbs approved commit on nss-softokn (Fedora devel) for rrelyea
tibbs approved build on nss-softokn (Fedora devel) for rrelyea
tibbs approved approveacls on nss-softokn (Fedora devel) for rrelyea

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nss-softokn



From tibbs at fedoraproject.org  Wed Aug 19 21:18:52 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:18:52 +0000 (UTC)
Subject: rpms/nss-softokn - New directory
Message-ID: <20090819211852.157F411C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-softokn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz30788/rpms/nss-softokn

Log Message:
Directory /cvs/pkgs/rpms/nss-softokn added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:18:52 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:18:52 +0000 (UTC)
Subject: rpms/nss-softokn/devel - New directory
Message-ID: <20090819211852.3533411C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz30788/rpms/nss-softokn/devel

Log Message:
Directory /cvs/pkgs/rpms/nss-softokn/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:18:58 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:18:58 +0000 (UTC)
Subject: rpms/nss-softokn Makefile,NONE,1.1
Message-ID: <20090819211858.432DC11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-softokn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz30788/rpms/nss-softokn

Added Files:
	Makefile 
Log Message:
Setup of module nss-softokn


--- NEW FILE Makefile ---
# Top level Makefile for module nss-softokn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:18:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:18:59 +0000 (UTC)
Subject: rpms/nss-softokn/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819211859.0CEB611C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsz30788/rpms/nss-softokn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nss-softokn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nss-softokn
# $Id: Makefile,v 1.1 2009/08/19 21:18:58 tibbs Exp $
NAME := nss-softokn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:19:43 +0000
Subject: [pkgdb] perl-DateTime-Format-Excel (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819211943.DE0D210F85A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for perl-DateTime-Format-Excel
tibbs has set commit to Approved for 107427 on perl-DateTime-Format-Excel (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on perl-DateTime-Format-Excel (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on perl-DateTime-Format-Excel (Fedora EPEL 5)
tibbs changed owner of perl-DateTime-Format-Excel in Fedora EPEL 5 to robert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Excel



From pkgdb at fedoraproject.org  Wed Aug 19 21:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:19:43 +0000
Subject: [pkgdb] perl-DateTime-Format-Excel (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090819211944.0223010F882@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for perl-DateTime-Format-Excel
tibbs has set commit to Approved for 107427 on perl-DateTime-Format-Excel (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on perl-DateTime-Format-Excel (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on perl-DateTime-Format-Excel (Fedora EPEL 4)
tibbs changed owner of perl-DateTime-Format-Excel in Fedora EPEL 4 to robert

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Excel



From pkgdb at fedoraproject.org  Wed Aug 19 21:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:20:20 +0000
Subject: [pkgdb] hyphen-mr was added for pnemade
Message-ID: <20090819212020.3829D10F85A@bastion2.fedora.phx.redhat.com>

tibbs has added Package hyphen-mr with summary Marathi hyphenation rules
tibbs has approved Package hyphen-mr
tibbs has added a Fedora devel branch for hyphen-mr with an owner of pnemade
tibbs has approved hyphen-mr in Fedora devel
tibbs has approved Package hyphen-mr
tibbs has set commit to Approved for 107427 on hyphen-mr (Fedora devel)
tibbs has set checkout to Approved for 107427 on hyphen-mr (Fedora devel)
tibbs has set build to Approved for 107427 on hyphen-mr (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-mr



From pkgdb at fedoraproject.org  Wed Aug 19 21:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:20:21 +0000
Subject: [pkgdb] hyphen-mr summary updated by tibbs
Message-ID: <20090819212021.73D6B10F889@bastion2.fedora.phx.redhat.com>

tibbs set package hyphen-mr summary to Marathi hyphenation rules

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-mr



From pkgdb at fedoraproject.org  Wed Aug 19 21:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:20:21 +0000
Subject: [pkgdb] hyphen-mr (Fedora, 11) updated by tibbs
Message-ID: <20090819212021.7C85310F895@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on hyphen-mr (Fedora devel) for pnemade
tibbs approved watchcommits on hyphen-mr (Fedora devel) for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-mr



From pkgdb at fedoraproject.org  Wed Aug 19 21:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:20:21 +0000
Subject: [pkgdb] hyphen-mr (Fedora, 11) updated by tibbs
Message-ID: <20090819212021.88B8F10F899@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for hyphen-mr
tibbs has set commit to Approved for 107427 on hyphen-mr (Fedora 11)
tibbs has set checkout to Approved for 107427 on hyphen-mr (Fedora 11)
tibbs has set build to Approved for 107427 on hyphen-mr (Fedora 11)
tibbs approved watchbugzilla on hyphen-mr (Fedora 11) for pnemade
tibbs approved watchcommits on hyphen-mr (Fedora 11) for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-mr



From tibbs at fedoraproject.org  Wed Aug 19 21:20:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:20:26 +0000 (UTC)
Subject: rpms/hyphen-mr - New directory
Message-ID: <20090819212026.186E311C0417@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-mr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU31329/rpms/hyphen-mr

Log Message:
Directory /cvs/pkgs/rpms/hyphen-mr added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:20:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:20:26 +0000 (UTC)
Subject: rpms/hyphen-mr/devel - New directory
Message-ID: <20090819212026.377AE11C04F0@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-mr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU31329/rpms/hyphen-mr/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-mr/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:20:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:20:32 +0000 (UTC)
Subject: rpms/hyphen-mr Makefile,NONE,1.1
Message-ID: <20090819212032.A07EB11C0417@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-mr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU31329/rpms/hyphen-mr

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-mr


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-mr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:20:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:20:32 +0000 (UTC)
Subject: rpms/hyphen-mr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819212032.CF3CB11C0417@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-mr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU31329/rpms/hyphen-mr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-mr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-mr
# $Id: Makefile,v 1.1 2009/08/19 21:20:32 tibbs Exp $
NAME := hyphen-mr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:25:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:25:34 +0000
Subject: [pkgdb] hyphen-bn was added for pnemade
Message-ID: <20090819212535.4D97E10F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package hyphen-bn with summary Bengali hyphenation rules
tibbs has approved Package hyphen-bn
tibbs has added a Fedora devel branch for hyphen-bn with an owner of pnemade
tibbs has approved hyphen-bn in Fedora devel
tibbs has approved Package hyphen-bn
tibbs has set commit to Approved for 107427 on hyphen-bn (Fedora devel)
tibbs has set checkout to Approved for 107427 on hyphen-bn (Fedora devel)
tibbs has set build to Approved for 107427 on hyphen-bn (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-bn



From pkgdb at fedoraproject.org  Wed Aug 19 21:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:25:36 +0000
Subject: [pkgdb] hyphen-bn summary updated by tibbs
Message-ID: <20090819212536.6A48810F888@bastion2.fedora.phx.redhat.com>

tibbs set package hyphen-bn summary to Bengali hyphenation rules

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-bn



From pkgdb at fedoraproject.org  Wed Aug 19 21:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:25:36 +0000
Subject: [pkgdb] hyphen-bn (Fedora, 11) updated by tibbs
Message-ID: <20090819212536.7261E10F890@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on hyphen-bn (Fedora devel) for pnemade
tibbs approved watchcommits on hyphen-bn (Fedora devel) for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-bn



From tibbs at fedoraproject.org  Wed Aug 19 21:25:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:25:43 +0000 (UTC)
Subject: rpms/hyphen-bn/devel - New directory
Message-ID: <20090819212543.39C1E11C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-bn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE32557/rpms/hyphen-bn/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-bn/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:25:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:25:43 +0000 (UTC)
Subject: rpms/hyphen-bn - New directory
Message-ID: <20090819212543.18FD711C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-bn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE32557/rpms/hyphen-bn

Log Message:
Directory /cvs/pkgs/rpms/hyphen-bn added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:25:36 +0000
Subject: [pkgdb] hyphen-bn (Fedora, 11) updated by tibbs
Message-ID: <20090819212536.7CA5710F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for hyphen-bn
tibbs has set commit to Approved for 107427 on hyphen-bn (Fedora 11)
tibbs has set checkout to Approved for 107427 on hyphen-bn (Fedora 11)
tibbs has set build to Approved for 107427 on hyphen-bn (Fedora 11)
tibbs approved watchbugzilla on hyphen-bn (Fedora 11) for pnemade
tibbs approved watchcommits on hyphen-bn (Fedora 11) for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-bn



From tibbs at fedoraproject.org  Wed Aug 19 21:25:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:25:49 +0000 (UTC)
Subject: rpms/hyphen-bn Makefile,NONE,1.1
Message-ID: <20090819212549.6CE9711C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-bn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE32557/rpms/hyphen-bn

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-bn


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-bn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:25:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:25:49 +0000 (UTC)
Subject: rpms/hyphen-bn/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819212549.E1F3D11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hyphen-bn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsE32557/rpms/hyphen-bn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-bn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-bn
# $Id: Makefile,v 1.1 2009/08/19 21:25:49 tibbs Exp $
NAME := hyphen-bn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:26:06 +0000
Subject: [pkgdb] eclipse-anyedit was added for rmyers
Message-ID: <20090819212606.C945910F889@bastion2.fedora.phx.redhat.com>

tibbs has added Package eclipse-anyedit with summary AnyEdit plugin for eclipse
tibbs has approved Package eclipse-anyedit
tibbs has added a Fedora devel branch for eclipse-anyedit with an owner of rmyers
tibbs has approved eclipse-anyedit in Fedora devel
tibbs has approved Package eclipse-anyedit
tibbs has set commit to Approved for 107427 on eclipse-anyedit (Fedora devel)
tibbs has set checkout to Approved for 107427 on eclipse-anyedit (Fedora devel)
tibbs has set build to Approved for 107427 on eclipse-anyedit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-anyedit



From pkgdb at fedoraproject.org  Wed Aug 19 21:26:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:26:09 +0000
Subject: [pkgdb] eclipse-anyedit summary updated by tibbs
Message-ID: <20090819212609.399B010F88B@bastion2.fedora.phx.redhat.com>

tibbs set package eclipse-anyedit summary to AnyEdit plugin for eclipse

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-anyedit



From pkgdb at fedoraproject.org  Wed Aug 19 21:26:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:26:09 +0000
Subject: [pkgdb] eclipse-anyedit (Fedora, 11) updated by tibbs
Message-ID: <20090819212609.416B310F8A6@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on eclipse-anyedit (Fedora devel) for overholt
tibbs approved watchcommits on eclipse-anyedit (Fedora devel) for overholt
tibbs approved watchbugzilla on eclipse-anyedit (Fedora devel) for joshkayse
tibbs approved watchcommits on eclipse-anyedit (Fedora devel) for joshkayse
tibbs approved commit on eclipse-anyedit (Fedora devel) for joshkayse
tibbs approved build on eclipse-anyedit (Fedora devel) for joshkayse
tibbs approved approveacls on eclipse-anyedit (Fedora devel) for joshkayse

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-anyedit



From tibbs at fedoraproject.org  Wed Aug 19 21:26:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:26:15 +0000 (UTC)
Subject: rpms/eclipse-anyedit - New directory
Message-ID: <20090819212615.1A8F311C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-anyedit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOOo402/rpms/eclipse-anyedit

Log Message:
Directory /cvs/pkgs/rpms/eclipse-anyedit added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:26:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:26:15 +0000 (UTC)
Subject: rpms/eclipse-anyedit/devel - New directory
Message-ID: <20090819212615.45F1C11C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-anyedit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOOo402/rpms/eclipse-anyedit/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-anyedit/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:26:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:26:09 +0000
Subject: [pkgdb] eclipse-anyedit (Fedora, 11) updated by tibbs
Message-ID: <20090819212609.4E21510F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for eclipse-anyedit
tibbs has set commit to Approved for 107427 on eclipse-anyedit (Fedora 11)
tibbs has set checkout to Approved for 107427 on eclipse-anyedit (Fedora 11)
tibbs has set build to Approved for 107427 on eclipse-anyedit (Fedora 11)
tibbs approved watchbugzilla on eclipse-anyedit (Fedora 11) for overholt
tibbs approved watchcommits on eclipse-anyedit (Fedora 11) for overholt
tibbs approved watchbugzilla on eclipse-anyedit (Fedora 11) for joshkayse
tibbs approved watchcommits on eclipse-anyedit (Fedora 11) for joshkayse
tibbs approved commit on eclipse-anyedit (Fedora 11) for joshkayse
tibbs approved build on eclipse-anyedit (Fedora 11) for joshkayse
tibbs approved approveacls on eclipse-anyedit (Fedora 11) for joshkayse

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-anyedit



From tibbs at fedoraproject.org  Wed Aug 19 21:26:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:26:21 +0000 (UTC)
Subject: rpms/eclipse-anyedit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819212621.941A111C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-anyedit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOOo402/rpms/eclipse-anyedit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-anyedit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-anyedit
# $Id: Makefile,v 1.1 2009/08/19 21:26:21 tibbs Exp $
NAME := eclipse-anyedit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Aug 19 21:26:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:26:21 +0000 (UTC)
Subject: rpms/eclipse-anyedit Makefile,NONE,1.1
Message-ID: <20090819212621.5ABFD11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-anyedit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsOOo402/rpms/eclipse-anyedit

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-anyedit


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-anyedit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From dcantrel at fedoraproject.org  Wed Aug 19 21:37:37 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 19 Aug 2009 21:37:37 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.27, 1.28 dhcpv6.spec, 1.107,
	1.108 sources, 1.27, 1.28
Message-ID: <20090819213737.7CDF811C00E4@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3051

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Wed Aug 19 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha3-1
- Upgraded to dhcpv6-2.0.0-alpha3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	19 Aug 2009 03:58:53 -0000	1.27
+++ .cvsignore	19 Aug 2009 21:37:37 -0000	1.28
@@ -1 +1 @@
-dhcpv6-2.0.0-alpha2.tar.gz
+dhcpv6-2.0.0-alpha3.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- dhcpv6.spec	19 Aug 2009 04:04:21 -0000	1.107
+++ dhcpv6.spec	19 Aug 2009 21:37:37 -0000	1.108
@@ -2,12 +2,12 @@
 %define libnlver 1.1
 
 # archive version number
-%define archivever 2.0.0-alpha2
+%define archivever 2.0.0-alpha3
 
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
-Version: 2.0.0alpha2
-Release: 2%{?dist}
+Version: 2.0.0alpha3
+Release: 1%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
 URL:     http://fedorahosted.org/dhcpv6/
@@ -114,7 +114,7 @@ fi
 %files -n dhcpv6-client
 %defattr(-,root,root,-)
 %attr(750,root,root) /sbin/dhcp6c
-%doc AUTHORS ChangeLog COPYING.LIB LICENSE README TODO
+%doc AUTHORS ChangeLog COPYING.LIB README TODO
 %config(noreplace) %{_sysconfdir}/dhcp6c.conf
 %{_mandir}/man8/dhcp6c.8.gz
 %{_mandir}/man5/dhcp6c.conf.5.gz
@@ -122,6 +122,9 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Wed Aug 19 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha3-1
+- Upgraded to dhcpv6-2.0.0-alpha3
+
 * Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha2-2
 - Remove LICENSE from the %%doc line
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	19 Aug 2009 03:58:53 -0000	1.27
+++ sources	19 Aug 2009 21:37:37 -0000	1.28
@@ -1 +1 @@
-8d0d2431ef3d416c40f2a7b9262cd4e3  dhcpv6-2.0.0-alpha2.tar.gz
+5bb32c0cf67627842b0f7111b89fc58f  dhcpv6-2.0.0-alpha3.tar.gz



From pkgdb at fedoraproject.org  Wed Aug 19 21:37:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:37:54 +0000
Subject: [pkgdb] mipv6-daemon was added for tgraf
Message-ID: <20090819213754.2C8E410F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package mipv6-daemon with summary IPv6 mobility daemon
tibbs has approved Package mipv6-daemon
tibbs has added a Fedora devel branch for mipv6-daemon with an owner of tgraf
tibbs has approved mipv6-daemon in Fedora devel
tibbs has approved Package mipv6-daemon
tibbs has set commit to Approved for 107427 on mipv6-daemon (Fedora devel)
tibbs has set checkout to Approved for 107427 on mipv6-daemon (Fedora devel)
tibbs has set build to Approved for 107427 on mipv6-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Wed Aug 19 21:37:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:37:55 +0000
Subject: [pkgdb] mipv6-daemon summary updated by tibbs
Message-ID: <20090819213755.9B3CA10F888@bastion2.fedora.phx.redhat.com>

tibbs set package mipv6-daemon summary to IPv6 mobility daemon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Wed Aug 19 21:37:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:37:55 +0000
Subject: [pkgdb] mipv6-daemon (Fedora, 11) updated by tibbs
Message-ID: <20090819213755.ADBEC10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for mipv6-daemon
tibbs has set commit to Approved for 107427 on mipv6-daemon (Fedora 11)
tibbs has set checkout to Approved for 107427 on mipv6-daemon (Fedora 11)
tibbs has set build to Approved for 107427 on mipv6-daemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From tibbs at fedoraproject.org  Wed Aug 19 21:38:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:38:02 +0000 (UTC)
Subject: rpms/mipv6-daemon - New directory
Message-ID: <20090819213802.1686F11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mipv6-daemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspd3245/rpms/mipv6-daemon

Log Message:
Directory /cvs/pkgs/rpms/mipv6-daemon added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:38:02 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:38:02 +0000 (UTC)
Subject: rpms/mipv6-daemon/devel - New directory
Message-ID: <20090819213802.3D5F211C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mipv6-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspd3245/rpms/mipv6-daemon/devel

Log Message:
Directory /cvs/pkgs/rpms/mipv6-daemon/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:37:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:37:55 +0000
Subject: [pkgdb] mipv6-daemon (Fedora, 11) updated by tibbs
Message-ID: <20090819213755.E49C710F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for mipv6-daemon
tibbs has set commit to Approved for 107427 on mipv6-daemon (Fedora 10)
tibbs has set checkout to Approved for 107427 on mipv6-daemon (Fedora 10)
tibbs has set build to Approved for 107427 on mipv6-daemon (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From tibbs at fedoraproject.org  Wed Aug 19 21:38:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:38:08 +0000 (UTC)
Subject: rpms/mipv6-daemon Makefile,NONE,1.1
Message-ID: <20090819213808.51CEC11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mipv6-daemon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspd3245/rpms/mipv6-daemon

Added Files:
	Makefile 
Log Message:
Setup of module mipv6-daemon


--- NEW FILE Makefile ---
# Top level Makefile for module mipv6-daemon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:38:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:38:08 +0000 (UTC)
Subject: rpms/mipv6-daemon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819213808.A238811C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mipv6-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspd3245/rpms/mipv6-daemon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mipv6-daemon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mipv6-daemon
# $Id: Makefile,v 1.1 2009/08/19 21:38:08 tibbs Exp $
NAME := mipv6-daemon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From robert at fedoraproject.org  Wed Aug 19 21:39:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 21:39:13 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Excel/EL-4 import.log,1.1,NONE
Message-ID: <20090819213913.467CE11C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Excel/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632/EL-4

Removed Files:
	import.log 
Log Message:
Remove old import logs



--- import.log DELETED ---



From robert at fedoraproject.org  Wed Aug 19 21:39:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 21:39:13 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Excel/EL-5 import.log,1.1,NONE
Message-ID: <20090819213913.7785811C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Excel/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632/EL-5

Removed Files:
	import.log 
Log Message:
Remove old import logs



--- import.log DELETED ---



From robert at fedoraproject.org  Wed Aug 19 21:39:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 21:39:13 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Excel/F-10 import.log,1.1,NONE
Message-ID: <20090819213913.B051A11C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Excel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632/F-10

Removed Files:
	import.log 
Log Message:
Remove old import logs



--- import.log DELETED ---



From robert at fedoraproject.org  Wed Aug 19 21:39:14 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 21:39:14 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Excel/devel import.log,1.1,NONE
Message-ID: <20090819213914.2158611C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Excel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632/devel

Removed Files:
	import.log 
Log Message:
Remove old import logs



--- import.log DELETED ---



From robert at fedoraproject.org  Wed Aug 19 21:39:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 21:39:13 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Excel/F-11 import.log,1.1,NONE
Message-ID: <20090819213913.E8BDE11C02CB@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Excel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632/F-11

Removed Files:
	import.log 
Log Message:
Remove old import logs



--- import.log DELETED ---



From tibbs at fedoraproject.org  Wed Aug 19 21:40:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:40:34 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/devel - New directory
Message-ID: <20090819214034.38E6C11C04D9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-cmpi-network/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspG4188/rpms/sblim-cmpi-network/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-network/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:40:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:40:34 +0000 (UTC)
Subject: rpms/sblim-cmpi-network - New directory
Message-ID: <20090819214034.1502011C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-cmpi-network
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspG4188/rpms/sblim-cmpi-network

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-network added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:40:26 +0000
Subject: [pkgdb] sblim-cmpi-network was added for vcrhonek
Message-ID: <20090819214027.1062510F80B@bastion2.fedora.phx.redhat.com>

tibbs has added Package sblim-cmpi-network with summary Standards Based Linux Instrumentation Network Providers
tibbs has approved Package sblim-cmpi-network
tibbs has added a Fedora devel branch for sblim-cmpi-network with an owner of vcrhonek
tibbs has approved sblim-cmpi-network in Fedora devel
tibbs has approved Package sblim-cmpi-network
tibbs has set commit to Approved for 107427 on sblim-cmpi-network (Fedora devel)
tibbs has set checkout to Approved for 107427 on sblim-cmpi-network (Fedora devel)
tibbs has set build to Approved for 107427 on sblim-cmpi-network (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From pkgdb at fedoraproject.org  Wed Aug 19 21:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:40:27 +0000
Subject: [pkgdb] sblim-cmpi-network summary updated by tibbs
Message-ID: <20090819214028.1FB0D10F85A@bastion2.fedora.phx.redhat.com>

tibbs set package sblim-cmpi-network summary to Standards Based Linux Instrumentation Network Providers

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sblim-cmpi-network



From tibbs at fedoraproject.org  Wed Aug 19 21:40:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:40:40 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090819214040.F3A8311C04EF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-cmpi-network/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspG4188/rpms/sblim-cmpi-network/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-network


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-network
# $Id: Makefile,v 1.1 2009/08/19 21:40:40 tibbs Exp $
NAME := sblim-cmpi-network
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Aug 19 21:40:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:40:40 +0000 (UTC)
Subject: rpms/sblim-cmpi-network Makefile,NONE,1.1
Message-ID: <20090819214040.CC05211C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/sblim-cmpi-network
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvspG4188/rpms/sblim-cmpi-network

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-network


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-network
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug 19 21:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:41:05 +0000
Subject: [pkgdb] mutter-moblin summary updated by tibbs
Message-ID: <20090819214105.08B9F10F854@bastion2.fedora.phx.redhat.com>

tibbs set package mutter-moblin summary to Moblin Netbook plugin for Mutter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Wed Aug 19 21:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:41:05 +0000
Subject: [pkgdb] mutter-moblin (Fedora, 11) updated by tibbs
Message-ID: <20090819214105.16C8E10F85C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for mutter-moblin
tibbs has set commit to Approved for 107427 on mutter-moblin (Fedora 11)
tibbs has set checkout to Approved for 107427 on mutter-moblin (Fedora 11)
tibbs has set build to Approved for 107427 on mutter-moblin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From tibbs at fedoraproject.org  Wed Aug 19 21:41:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:41:10 +0000 (UTC)
Subject: rpms/mutter-moblin - New directory
Message-ID: <20090819214110.1D58511C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mutter-moblin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQN4473/rpms/mutter-moblin

Log Message:
Directory /cvs/pkgs/rpms/mutter-moblin added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:41:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:41:10 +0000 (UTC)
Subject: rpms/mutter-moblin/devel - New directory
Message-ID: <20090819214110.518CF11C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQN4473/rpms/mutter-moblin/devel

Log Message:
Directory /cvs/pkgs/rpms/mutter-moblin/devel added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:41:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:41:16 +0000 (UTC)
Subject: rpms/mutter-moblin Makefile,NONE,1.1
Message-ID: <20090819214116.5971411C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mutter-moblin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQN4473/rpms/mutter-moblin

Added Files:
	Makefile 
Log Message:
Setup of module mutter-moblin


--- NEW FILE Makefile ---
# Top level Makefile for module mutter-moblin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug 19 21:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:41:03 +0000
Subject: [pkgdb] mutter-moblin was added for pbrobinson
Message-ID: <20090819214109.2F90110F882@bastion2.fedora.phx.redhat.com>

tibbs has added Package mutter-moblin with summary Moblin Netbook plugin for Mutter
tibbs has approved Package mutter-moblin
tibbs has added a Fedora devel branch for mutter-moblin with an owner of pbrobinson
tibbs has approved mutter-moblin in Fedora devel
tibbs has approved Package mutter-moblin
tibbs has set commit to Approved for 107427 on mutter-moblin (Fedora devel)
tibbs has set checkout to Approved for 107427 on mutter-moblin (Fedora devel)
tibbs has set build to Approved for 107427 on mutter-moblin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From tibbs at fedoraproject.org  Wed Aug 19 21:41:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:41:16 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090819214116.C07AD11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQN4473/rpms/mutter-moblin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mutter-moblin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mutter-moblin
# $Id: Makefile,v 1.1 2009/08/19 21:41:16 tibbs Exp $
NAME := mutter-moblin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 19 21:42:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:42:25 +0000
Subject: [pkgdb] QtDMM was added for zap
Message-ID: <20090819214225.F038610F7F0@bastion2.fedora.phx.redhat.com>

tibbs has added Package QtDMM with summary DMM readout software including a configurable recorder
tibbs has approved Package QtDMM
tibbs has added a Fedora devel branch for QtDMM with an owner of zap
tibbs has approved QtDMM in Fedora devel
tibbs has approved Package QtDMM
tibbs has set commit to Approved for 107427 on QtDMM (Fedora devel)
tibbs has set checkout to Approved for 107427 on QtDMM (Fedora devel)
tibbs has set build to Approved for 107427 on QtDMM (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/QtDMM



From pkgdb at fedoraproject.org  Wed Aug 19 21:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:42:27 +0000
Subject: [pkgdb] QtDMM summary updated by tibbs
Message-ID: <20090819214227.44DE810F85A@bastion2.fedora.phx.redhat.com>

tibbs set package QtDMM summary to DMM readout software including a configurable recorder

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/QtDMM



From pkgdb at fedoraproject.org  Wed Aug 19 21:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:42:27 +0000
Subject: [pkgdb] QtDMM (Fedora, 11) updated by tibbs
Message-ID: <20090819214227.4F35C10F888@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for QtDMM
tibbs has set commit to Approved for 107427 on QtDMM (Fedora 11)
tibbs has set checkout to Approved for 107427 on QtDMM (Fedora 11)
tibbs has set build to Approved for 107427 on QtDMM (Fedora 11)
tibbs approved watchbugzilla on QtDMM (Fedora 11) for chitlesh
tibbs approved watchcommits on QtDMM (Fedora 11) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/QtDMM



From pkgdb at fedoraproject.org  Wed Aug 19 21:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:42:27 +0000
Subject: [pkgdb] QtDMM (Fedora, 11) updated by tibbs
Message-ID: <20090819214227.53D1310F88B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for QtDMM
tibbs has set commit to Approved for 107427 on QtDMM (Fedora 10)
tibbs has set checkout to Approved for 107427 on QtDMM (Fedora 10)
tibbs has set build to Approved for 107427 on QtDMM (Fedora 10)
tibbs approved watchbugzilla on QtDMM (Fedora 10) for chitlesh
tibbs approved watchcommits on QtDMM (Fedora 10) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/QtDMM



From tibbs at fedoraproject.org  Wed Aug 19 21:42:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:42:34 +0000 (UTC)
Subject: rpms/QtDMM - New directory
Message-ID: <20090819214234.1B03C11C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/QtDMM
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWc5050/rpms/QtDMM

Log Message:
Directory /cvs/pkgs/rpms/QtDMM added to the repository




From tibbs at fedoraproject.org  Wed Aug 19 21:42:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:42:34 +0000 (UTC)
Subject: rpms/QtDMM/devel - New directory
Message-ID: <20090819214234.3434311C0346@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/QtDMM/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWc5050/rpms/QtDMM/devel

Log Message:
Directory /cvs/pkgs/rpms/QtDMM/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:42:27 +0000
Subject: [pkgdb] QtDMM (Fedora, 11) updated by tibbs
Message-ID: <20090819214227.5AF0510F897@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on QtDMM (Fedora devel) for chitlesh
tibbs approved watchcommits on QtDMM (Fedora devel) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/QtDMM



From tibbs at fedoraproject.org  Wed Aug 19 21:42:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:42:40 +0000 (UTC)
Subject: rpms/QtDMM/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090819214240.4E2FE11C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/QtDMM/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWc5050/rpms/QtDMM/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module QtDMM


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: QtDMM
# $Id: Makefile,v 1.1 2009/08/19 21:42:40 tibbs Exp $
NAME := QtDMM
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Wed Aug 19 21:42:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:42:40 +0000 (UTC)
Subject: rpms/QtDMM Makefile,NONE,1.1
Message-ID: <20090819214240.258BA11C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/QtDMM
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWc5050/rpms/QtDMM

Added Files:
	Makefile 
Log Message:
Setup of module QtDMM


--- NEW FILE Makefile ---
# Top level Makefile for module QtDMM
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Wed Aug 19 21:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:43:18 +0000
Subject: [pkgdb] anjal was added for pbrobinson
Message-ID: <20090819214318.8139B10F888@bastion2.fedora.phx.redhat.com>

tibbs has added Package anjal with summary An email client for small screen devices
tibbs has approved Package anjal
tibbs has added a Fedora devel branch for anjal with an owner of pbrobinson
tibbs has approved anjal in Fedora devel
tibbs has approved Package anjal
tibbs has set commit to Approved for 107427 on anjal (Fedora devel)
tibbs has set checkout to Approved for 107427 on anjal (Fedora devel)
tibbs has set build to Approved for 107427 on anjal (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anjal



From tibbs at fedoraproject.org  Wed Aug 19 21:43:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:43:26 +0000 (UTC)
Subject: rpms/anjal/devel - New directory
Message-ID: <20090819214326.4391711C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIe5444/rpms/anjal/devel

Log Message:
Directory /cvs/pkgs/rpms/anjal/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:43:19 +0000
Subject: [pkgdb] anjal (Fedora, 11) updated by tibbs
Message-ID: <20090819214319.A417B10F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for anjal
tibbs has set commit to Approved for 107427 on anjal (Fedora 11)
tibbs has set checkout to Approved for 107427 on anjal (Fedora 11)
tibbs has set build to Approved for 107427 on anjal (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anjal



From tibbs at fedoraproject.org  Wed Aug 19 21:43:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:43:26 +0000 (UTC)
Subject: rpms/anjal - New directory
Message-ID: <20090819214326.1C15911C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anjal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIe5444/rpms/anjal

Log Message:
Directory /cvs/pkgs/rpms/anjal added to the repository




From pkgdb at fedoraproject.org  Wed Aug 19 21:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 19 Aug 2009 21:43:19 +0000
Subject: [pkgdb] anjal summary updated by tibbs
Message-ID: <20090819214319.9A9E610F895@bastion2.fedora.phx.redhat.com>

tibbs set package anjal summary to An email client for small screen devices

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/anjal



From tibbs at fedoraproject.org  Wed Aug 19 21:43:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:43:32 +0000 (UTC)
Subject: rpms/anjal Makefile,NONE,1.1
Message-ID: <20090819214332.334A611C00E4@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anjal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIe5444/rpms/anjal

Added Files:
	Makefile 
Log Message:
Setup of module anjal


--- NEW FILE Makefile ---
# Top level Makefile for module anjal
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Wed Aug 19 21:43:32 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Wed, 19 Aug 2009 21:43:32 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090819214332.6108F11C02CB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIe5444/rpms/anjal/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module anjal


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: anjal
# $Id: Makefile,v 1.1 2009/08/19 21:43:32 tibbs Exp $
NAME := anjal
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sgrubb at fedoraproject.org  Wed Aug 19 21:44:33 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Wed, 19 Aug 2009 21:44:33 +0000 (UTC)
Subject: rpms/aide/devel aide.conf,1.3,1.4 aide.spec,1.31,1.32
Message-ID: <20090819214433.5699811C00E4@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5821

Modified Files:
	aide.conf aide.spec 
Log Message:
* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 0.13.1-11
- rebuild for new audit-libs
- Correct regex for root's dot files (#509370)



Index: aide.conf
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- aide.conf	8 Jun 2009 15:22:16 -0000	1.3
+++ aide.conf	19 Aug 2009 21:44:33 -0000	1.4
@@ -218,4 +218,4 @@ DATAONLY =  p+n+u+g+s+acl+selinux+xattrs
 !/var/log/and-httpd
 
 # Admins dot files constantly change, just check perms
-/root/.* PERMS
+/root/\..* PERMS


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- aide.spec	24 Jul 2009 16:39:15 -0000	1.31
+++ aide.spec	19 Aug 2009 21:44:33 -0000	1.32
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -85,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 0.13.1-11
+- rebuild for new audit-libs
+- Correct regex for root's dot files (#509370)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Wed Aug 19 21:50:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 19 Aug 2009 21:50:59 +0000 (UTC)
Subject: rpms/anjal/devel anjal-toolbar.patch, NONE, 1.1 anjal.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090819215059.B274E11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8286/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anjal-toolbar.patch anjal.spec import.log 
Log Message:
- initial import


anjal-toolbar.patch:
 mail-shell.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE anjal-toolbar.patch ---
diff --git a/src/mail-shell.c b/src/mail-shell.c
index 88cb76f..8e3e5e7 100644
--- a/src/mail-shell.c
+++ b/src/mail-shell.c
@@ -409,7 +409,8 @@ mail_shell_construct (MailShell *shell)
 		g_signal_connect (priv->top_bar, "expose-event",
 						  G_CALLBACK (color_expose),
 						  shell);
-		gtk_widget_set_size_request (priv->top_bar, -1, 42);	
+		/* Leave it to the theme to decide the height */
+		/* gtk_widget_set_size_request (priv->top_bar, -1, 42);	*/
 	}
 
 	/* Check mail button and the spinner */


--- NEW FILE anjal.spec ---
# 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 20090813
%define git_version 2d4e6a0
%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
%define snapshot %{gitdate}git%{git_version}

Name:           anjal
Version:        0.1.0
Release:        0.4.%{snapshot}%{?dist}
Summary:        An email client for small screen devices

Group:          Applications/Productivity
License:        LGPLv2 or LGPLv3
URL:            http://live.gnome.org/Anjal/
Source0:        %{tarfile}
Patch0:         anjal-toolbar.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: anerley-devel
BuildRequires: clutter-devel
BuildRequires: clutter-gtk-devel
BuildRequires: evolution-devel
BuildRequires: evolution-data-server-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: nbtk-devel
BuildRequires: webkitgtk-devel
BuildRequires: unique-devel
BuildRequires: sqlite-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
BuildRequires: libtool

%description
Anjal is a mail client for small screen devices like NetBooks. It 
features a nice multi-line message list, with text-preview of the 
latest messages in the thread. It supports a tab interface for 
folders, new mail and config. Being based on evolution it supports 
all the mail backends including POP3, IMAP4, Exchange and GroupWare.

%prep
%setup -q
%patch0 -p1 -b .toolbar

# 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

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 TODO README
%{_bindir}/anjal
%{_datadir}/anjal
%{_datadir}/applications/anjal.desktop

%changelog
* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.4
- Update to latest git head.

* Tue Aug 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.3
- Update to latest upstream git head for final fixes for build

* Wed Jul  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.2
- Spec file updates

* Wed Jun 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.1
- Initial build


--- NEW FILE import.log ---
anjal-0_1_0-0_4_20090813git2d4e6a0_fc11:HEAD:anjal-0.1.0-0.4.20090813git2d4e6a0.fc11.src.rpm:1250718564


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:43:32 -0000	1.1
+++ .cvsignore	19 Aug 2009 21:50:59 -0000	1.2
@@ -0,0 +1 @@
+anjal-0.1.0-20090813.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:43:32 -0000	1.1
+++ sources	19 Aug 2009 21:50:59 -0000	1.2
@@ -0,0 +1 @@
+29828c0f3dd5b5caa3fc050a8c202394  anjal-0.1.0-20090813.tar.bz2



From pbrobinson at fedoraproject.org  Wed Aug 19 21:53:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 19 Aug 2009 21:53:16 +0000 (UTC)
Subject: rpms/mutter-moblin/devel import.log, NONE, 1.1 mutter-moblin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090819215316.76A8F11C00E4@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8564/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mutter-moblin.spec 
Log Message:
- Initial import



--- NEW FILE import.log ---
mutter-moblin-0_34_0-1_fc11:HEAD:mutter-moblin-0.34.0-1.fc11.src.rpm:1250718608


--- NEW FILE mutter-moblin.spec ---
Name:           mutter-moblin
Version:        0.34.0
Release:        1%{?dist}
Summary:        Moblin Netbook plugin for Mutter

Group:          User Interface/Desktops
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)

BuildRequires: dbus-glib-devel
BuildRequires: GConf2-devel
BuildRequires: gnome-menus-devel
BuildRequires: gtk2-devel
BuildRequires: mutter-devel
BuildRequires: nbtk-devel
BuildRequires: startup-notification-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: redhat-menus

%description
Moblin Netbook plugin for Mutter. This is the main gui interface to Moblin.

%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

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%build
%configure --disable-static --enable-scaled-background
export LD_AS_NEEDED=1
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%find_lang mutter-moblin-netbook-plugin

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f mutter-moblin-netbook-plugin.lang
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/lib*.so.*
%{_libdir}/mutter/plugins/moblin-netbook.so.*
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_libdir}/mutter/plugins/moblin-netbook.so
%{_libdir}/pkgconfig/moblin-panel.pc
%{_includedir}/libmoblin-panel

%changelog
* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.0-1
- New 0.34.0 upstream release.
- Drop bits that have split to sub packages and associated deps

* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.32.3-1
- New 0.32.3 upstream release, spec file cleanups

* Thu Aug  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.32.2-1
- New 0.32.2 upstream release, add new build requirements

* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.30.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:41:16 -0000	1.1
+++ .cvsignore	19 Aug 2009 21:53:16 -0000	1.2
@@ -0,0 +1 @@
+mutter-moblin-0.34.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:41:16 -0000	1.1
+++ sources	19 Aug 2009 21:53:16 -0000	1.2
@@ -0,0 +1 @@
+ed5d2cd53457692c587158494def3e9a  mutter-moblin-0.34.0.tar.bz2



From cwickert at fedoraproject.org  Wed Aug 19 21:57:52 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 19 Aug 2009 21:57:52 +0000 (UTC)
Subject: rpms/mtpaint/devel .cvsignore, 1.3, 1.4 mtpaint.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090819215752.E8FDF11C00E4@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/mtpaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270

Modified Files:
	.cvsignore mtpaint.spec sources 
Log Message:
* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.31-1
- Update to 3.31
- Make handbook package noarch
- New gtk-update-icon-cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 17:29:45 -0000	1.3
+++ .cvsignore	19 Aug 2009 21:57:52 -0000	1.4
@@ -1,2 +1,2 @@
-mtpaint-3.21.tar.bz2
-mtpaint_handbook-3.21.zip
+mtpaint-3.31.tar.bz2
+mtpaint_handbook-3.31.zip


Index: mtpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/mtpaint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mtpaint.spec	25 Jul 2009 15:20:10 -0000	1.5
+++ mtpaint.spec	19 Aug 2009 21:57:52 -0000	1.6
@@ -1,8 +1,8 @@
-%define docver 3.21
+%define docver 3.31
 
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint
-Version:       3.21
+Version:       3.31
 Release:       3%{?dist}
 License:       GPLv3+
 Group:         Applications/Multimedia
@@ -28,6 +28,7 @@ Summary:  Handbook for the mtpaint paint
 Group:    Applications/Multimedia
 License:  GFDL
 Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description handbook
 Install this package is want to read the handbook for the painting
@@ -39,7 +40,7 @@ application mtpaint.
 %patch1 -p1
 
 # We have moved docs
-%{__sed} -i 's,#define HANDBOOK_LOCATION "/usr/doc/mtpaint/index.html",#define HANDBOOK_LOCATION "%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
+%{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
 
 %{__chmod} 0755 %{name}_handbook-%{docver}/docs/{en_GB,img,files,cs}
 dos2unix -k %{name}_handbook-%{docver}/docs/index.html
@@ -67,25 +68,25 @@ desktop-file-install --delete-original  
 %{__rm} -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 if [ -x %{_bindir}/update-desktop-database ] ; then
   %{_bindir}/update-desktop-database &> /dev/null
 fi
 exit 0
 
 %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
 if [ -x %{_bindir}/update-desktop-database ] ; then
   %{_bindir}/update-desktop-database &> /dev/null
 fi
 exit 0
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc COPYING NEWS README
@@ -99,6 +100,11 @@ exit 0
 %doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*
 
 %changelog
+* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.31-1
+- Update to 3.31
+- Make handbook package noarch
+- New gtk-update-icon-cache scriptlets
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Aug 2008 17:29:45 -0000	1.3
+++ sources	19 Aug 2009 21:57:52 -0000	1.4
@@ -1,2 +1,2 @@
-f685b6fbb16966dc5d343f0e63932027  mtpaint-3.21.tar.bz2
-6618cf04036226bfbf2993e86abe9b6c  mtpaint_handbook-3.21.zip
+fbe34eb25f96b6092403115f1f6ab387  mtpaint-3.31.tar.bz2
+40de347afa76e869f8251eb6134c3065  mtpaint_handbook-3.31.zip



From cwickert at fedoraproject.org  Wed Aug 19 22:02:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 19 Aug 2009 22:02:02 +0000 (UTC)
Subject: rpms/mtpaint/devel mtpaint.spec,1.6,1.7
Message-ID: <20090819220202.BEFA011C00E4@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/mtpaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11325

Modified Files:
	mtpaint.spec 
Log Message:
%global instead of %define


Index: mtpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/mtpaint.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mtpaint.spec	19 Aug 2009 21:57:52 -0000	1.6
+++ mtpaint.spec	19 Aug 2009 22:02:02 -0000	1.7
@@ -1,4 +1,4 @@
-%define docver 3.31
+%global docver 3.31
 
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint



From spot at fedoraproject.org  Wed Aug 19 22:05:24 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 22:05:24 +0000 (UTC)
Subject: rpms/amanith/devel amanith.spec,1.9,1.10
Message-ID: <20090819220524.DBC8211C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/amanith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12186

Modified Files:
	amanith.spec 
Log Message:
remove URL from Source0


Index: amanith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amanith/devel/amanith.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- amanith.spec	24 Jul 2009 16:49:38 -0000	1.9
+++ amanith.spec	19 Aug 2009 22:05:24 -0000	1.10
@@ -1,11 +1,13 @@
 Name:          amanith
 Version:       0.3
-Release:       12%{?dist}
+Release:       13%{?dist}
 Summary:       Crossplatform framework for 2d/3d vector graphics
 Group:         Development/Libraries
 License:       QPL
 URL:           http://www.amanith.org
-Source0:       http://www.amanith.org/download/files/amanith_03.tar.gz
+# Upstream no longer offers this code
+# It originally came from: http://www.amanith.org/download/files/amanith_03.tar.gz
+Source0:       amanith_03.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: qt3-devel, freetype-devel, libjpeg-devel, libpng-devel, zlib-devel
 BuildRequires: libXmu-devel, glew-devel, mesa-libGLU-devel
@@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/amanith/
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3-13
+- note that upstream is gone, drop URL from Source0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Wed Aug 19 22:11:19 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 22:11:19 +0000 (UTC)
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel
	perl-Class-DBI-Loader-Relationship.spec, 1.12, 1.13
Message-ID: <20090819221119.981E711C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13795

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:
fix source0 url


Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Class-DBI-Loader-Relationship.spec	26 Jul 2009 04:24:52 -0000	1.12
+++ perl-Class-DBI-Loader-Relationship.spec	19 Aug 2009 22:11:19 -0000	1.13
@@ -1,11 +1,11 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHUNZI/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-10
+- fix source0 url
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mtasaka at fedoraproject.org  Wed Aug 19 22:13:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 19 Aug 2009 22:13:59 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria-0.6.5-glib_convert-syntax.patch,
	NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 alexandria.spec, 1.26, 1.27 sources,
	1.9, 1.10 alexandria-0.6.4.1-right-click-left-pane-morefix.patch,
	1.1, NONE alexandria-0.6.4.1-right-click-left-pane.patch, 1.2, NONE
Message-ID: <20090819221359.6DC1911C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14613/F-10

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Removed Files:
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch 
	alexandria-0.6.4.1-right-click-left-pane.patch 
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
- Update to 0.6.5
- Remove 2 upstreamed patches (1 patch still unremoved)
- Add 2 patches, will report upstream


alexandria-0.6.5-glib_convert-syntax.patch:
 utils.rb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE alexandria-0.6.5-glib_convert-syntax.patch ---
Index: lib/alexandria/utils.rb
===================================================================
--- lib/alexandria/utils.rb	(revision 1085)
+++ lib/alexandria/utils.rb	(working copy)
@@ -20,7 +20,11 @@
 
 class String
   def convert(charset_from, charset_to)
-    GLib.convert(self, charset_from, charset_to)
+#
+# Ask upstream!! Perhaps from <-> to are reverse
+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
+#
+    GLib.convert(self, charset_to, charset_from)
   end
 end
 

alexandria-0.6.5-search-result-sanity-check.patch:
 book_providers.rb |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE alexandria-0.6.5-search-result-sanity-check.patch ---
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb	(revision 1085)
+++ lib/alexandria/book_providers.rb	(working copy)
@@ -46,6 +46,9 @@
         self.instance.notify_observers(:searching, factory.fullname) # new
         results = factory.search(criterion, type)
 
+        # sanity check if at least one valid result is actually found
+        results.delete_if { |book, cover| ((!book) || (!cover)) }
+
         if results.length == 0
           self.instance.changed
           self.instance.notify_observers(:not_found, factory.fullname) # new


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Mar 2009 18:30:09 -0000	1.9
+++ .cvsignore	19 Aug 2009 22:13:58 -0000	1.10
@@ -1 +1 @@
-alexandria-0.6.4.1.tar.gz
+alexandria-0.6.5.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- alexandria.spec	16 Apr 2009 17:41:50 -0000	1.26
+++ alexandria.spec	19 Aug 2009 22:13:58 -0000	1.27
@@ -1,11 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		53230
+%define		repoid		62178
 
-%define		majorver	0.6.4.1
+%define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,16 +19,15 @@ Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Use 2 arguments format for bindtextdomain() instead of
-# deprecated 4 arguments format
-# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
-Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Fix for issue with right click on left pane
-# ref: alexandria-Bugs-25021
-Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
+# Need ask to upstream
+# perhaps there is some confusion about GLib.convert...
+Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+# Need ask to upstream
+# Sometimes search result has empty book or cover entry
+Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,9 +77,9 @@ Alexandria is a GNOME application to hel
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-%patch0 -p0 -b .up24882
-%patch1 -p0 -b .up25021
 %patch2 -p0 -b .up25348
+%patch3 -p0 -b .glib
+%patch4 -p0 -b .result
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -207,6 +206,14 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
+- Update to 0.6.5
+- Remove 2 upstreamed patches (1 patch still unremoved)
+- Add 2 patches, will report upstream
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-12: Mass rebuild
+
 * Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
 - Trial fix to fix hang when importing list containing invalid
   isdn (alexandria-Bugs-25348)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Mar 2009 18:30:09 -0000	1.9
+++ sources	19 Aug 2009 22:13:58 -0000	1.10
@@ -1 +1 @@
-80e4def0f0890460eb0689489a05c745  alexandria-0.6.4.1.tar.gz
+9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz


--- alexandria-0.6.4.1-right-click-left-pane-morefix.patch DELETED ---


--- alexandria-0.6.4.1-right-click-left-pane.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Aug 19 22:14:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 19 Aug 2009 22:14:00 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria-0.6.5-glib_convert-syntax.patch,
	NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 alexandria.spec, 1.34, 1.35 sources,
	1.9, 1.10 alexandria-0.6.4.1-right-click-left-pane-morefix.patch,
	1.1, NONE alexandria-0.6.4.1-right-click-left-pane.patch, 1.2, NONE
Message-ID: <20090819221400.45A3B11C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14613/devel

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Removed Files:
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch 
	alexandria-0.6.4.1-right-click-left-pane.patch 
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
- Update to 0.6.5
- Remove 2 upstreamed patches (1 patch still unremoved)
- Add 2 patches, will report upstream


alexandria-0.6.5-glib_convert-syntax.patch:
 utils.rb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE alexandria-0.6.5-glib_convert-syntax.patch ---
Index: lib/alexandria/utils.rb
===================================================================
--- lib/alexandria/utils.rb	(revision 1085)
+++ lib/alexandria/utils.rb	(working copy)
@@ -20,7 +20,11 @@
 
 class String
   def convert(charset_from, charset_to)
-    GLib.convert(self, charset_from, charset_to)
+#
+# Ask upstream!! Perhaps from <-> to are reverse
+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
+#
+    GLib.convert(self, charset_to, charset_from)
   end
 end
 

alexandria-0.6.5-search-result-sanity-check.patch:
 book_providers.rb |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE alexandria-0.6.5-search-result-sanity-check.patch ---
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb	(revision 1085)
+++ lib/alexandria/book_providers.rb	(working copy)
@@ -46,6 +46,9 @@
         self.instance.notify_observers(:searching, factory.fullname) # new
         results = factory.search(criterion, type)
 
+        # sanity check if at least one valid result is actually found
+        results.delete_if { |book, cover| ((!book) || (!cover)) }
+
         if results.length == 0
           self.instance.changed
           self.instance.notify_observers(:not_found, factory.fullname) # new


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Mar 2009 18:30:10 -0000	1.9
+++ .cvsignore	19 Aug 2009 22:13:59 -0000	1.10
@@ -1 +1 @@
-alexandria-0.6.4.1.tar.gz
+alexandria-0.6.5.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- alexandria.spec	24 Jul 2009 15:05:09 -0000	1.34
+++ alexandria.spec	19 Aug 2009 22:14:00 -0000	1.35
@@ -1,34 +1,33 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		53230
+%define		repoid		62178
 
-%define		majorver	0.6.4.1
+%define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}.1
+Release:	%{rel}%{?dist}
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Use 2 arguments format for bindtextdomain() instead of
-# deprecated 4 arguments format
-# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
-Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Fix for issue with right click on left pane
-# ref: alexandria-Bugs-25021
-Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
+# Need ask to upstream
+# perhaps there is some confusion about GLib.convert...
+Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+# Need ask to upstream
+# Sometimes search result has empty book or cover entry
+Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,9 +77,9 @@ Alexandria is a GNOME application to hel
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-%patch0 -p0 -b .up24882
-%patch1 -p0 -b .up25021
 %patch2 -p0 -b .up25348
+%patch3 -p0 -b .glib
+%patch4 -p0 -b .result
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -207,6 +206,11 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
+- Update to 0.6.5
+- Remove 2 upstreamed patches (1 patch still unremoved)
+- Add 2 patches, will report upstream
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Mar 2009 18:30:10 -0000	1.9
+++ sources	19 Aug 2009 22:14:00 -0000	1.10
@@ -1 +1 @@
-80e4def0f0890460eb0689489a05c745  alexandria-0.6.4.1.tar.gz
+9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz


--- alexandria-0.6.4.1-right-click-left-pane-morefix.patch DELETED ---


--- alexandria-0.6.4.1-right-click-left-pane.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Aug 19 22:13:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 19 Aug 2009 22:13:59 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria-0.6.5-glib_convert-syntax.patch,
	NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 alexandria.spec, 1.33, 1.34 sources,
	1.9, 1.10 alexandria-0.6.4.1-right-click-left-pane-morefix.patch,
	1.1, NONE alexandria-0.6.4.1-right-click-left-pane.patch, 1.2, NONE
Message-ID: <20090819221359.AE13811C00E4@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14613/F-11

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.5-glib_convert-syntax.patch 
	alexandria-0.6.5-search-result-sanity-check.patch 
Removed Files:
	alexandria-0.6.4.1-right-click-left-pane-morefix.patch 
	alexandria-0.6.4.1-right-click-left-pane.patch 
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
- Update to 0.6.5
- Remove 2 upstreamed patches (1 patch still unremoved)
- Add 2 patches, will report upstream


alexandria-0.6.5-glib_convert-syntax.patch:
 utils.rb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE alexandria-0.6.5-glib_convert-syntax.patch ---
Index: lib/alexandria/utils.rb
===================================================================
--- lib/alexandria/utils.rb	(revision 1085)
+++ lib/alexandria/utils.rb	(working copy)
@@ -20,7 +20,11 @@
 
 class String
   def convert(charset_from, charset_to)
-    GLib.convert(self, charset_from, charset_to)
+#
+# Ask upstream!! Perhaps from <-> to are reverse
+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
+#
+    GLib.convert(self, charset_to, charset_from)
   end
 end
 

alexandria-0.6.5-search-result-sanity-check.patch:
 book_providers.rb |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE alexandria-0.6.5-search-result-sanity-check.patch ---
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb	(revision 1085)
+++ lib/alexandria/book_providers.rb	(working copy)
@@ -46,6 +46,9 @@
         self.instance.notify_observers(:searching, factory.fullname) # new
         results = factory.search(criterion, type)
 
+        # sanity check if at least one valid result is actually found
+        results.delete_if { |book, cover| ((!book) || (!cover)) }
+
         if results.length == 0
           self.instance.changed
           self.instance.notify_observers(:not_found, factory.fullname) # new


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Mar 2009 18:30:10 -0000	1.9
+++ .cvsignore	19 Aug 2009 22:13:59 -0000	1.10
@@ -1 +1 @@
-alexandria-0.6.4.1.tar.gz
+alexandria-0.6.5.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- alexandria.spec	12 Apr 2009 15:32:25 -0000	1.33
+++ alexandria.spec	19 Aug 2009 22:13:59 -0000	1.34
@@ -1,11 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		53230
+%define		repoid		62178
 
-%define		majorver	0.6.4.1
+%define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	6
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,16 +19,15 @@ Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Use 2 arguments format for bindtextdomain() instead of
-# deprecated 4 arguments format
-# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
-Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Fix for issue with right click on left pane
-# ref: alexandria-Bugs-25021
-Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
+# Need ask to upstream
+# perhaps there is some confusion about GLib.convert...
+Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+# Need ask to upstream
+# Sometimes search result has empty book or cover entry
+Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,9 +77,9 @@ Alexandria is a GNOME application to hel
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
-%patch0 -p0 -b .up24882
-%patch1 -p0 -b .up25021
 %patch2 -p0 -b .up25348
+%patch3 -p0 -b .glib
+%patch4 -p0 -b .result
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -207,6 +206,14 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
+- Update to 0.6.5
+- Remove 2 upstreamed patches (1 patch still unremoved)
+- Add 2 patches, will report upstream
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-12: Mass rebuild
+
 * Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
 - Trial fix to fix hang when importing list containing invalid
   isdn (alexandria-Bugs-25348)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Mar 2009 18:30:10 -0000	1.9
+++ sources	19 Aug 2009 22:13:59 -0000	1.10
@@ -1 +1 @@
-80e4def0f0890460eb0689489a05c745  alexandria-0.6.4.1.tar.gz
+9c8655f361e6a0c6f8cdc97f36bd2d0f  alexandria-0.6.5.tar.gz


--- alexandria-0.6.4.1-right-click-left-pane-morefix.patch DELETED ---


--- alexandria-0.6.4.1-right-click-left-pane.patch DELETED ---



From spot at fedoraproject.org  Wed Aug 19 22:16:07 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 22:16:07 +0000 (UTC)
Subject: rpms/ebtables/devel ebtables.spec,1.25,1.26
Message-ID: <20090819221607.449C111C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ebtables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15139

Modified Files:
	ebtables.spec 
Log Message:
fix source0 url


Index: ebtables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ebtables.spec	27 Jul 2009 17:49:45 -0000	1.25
+++ ebtables.spec	19 Aug 2009 22:16:06 -0000	1.26
@@ -1,11 +1,11 @@
 Name:			ebtables
 Version:		2.0.9
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Ethernet Bridge frame table administration tool
 License:		GPLv2+
 Group:			System Environment/Base
 URL:			http://ebtables.sourceforge.net/
-Source0:		http://dl.sf.net/ebtables/ebtables-v%{version}-1.tar.gz
+Source0:		http://dl.sourceforge.net/ebtables/ebtables-v%{version}-1.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre):		/sbin/chkconfig
 Requires(postun):	/sbin/service
@@ -79,6 +79,9 @@ fi
 %ghost %{_sysconfdir}/sysconfig/ebtables.broute
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.9-2
+- fix source0 url
+
 * Mon Jul 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.9-1
 - update to 2.0.9
 



From robert at fedoraproject.org  Wed Aug 19 22:24:01 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 19 Aug 2009 22:24:01 +0000 (UTC)
Subject: rpms/perl-Class-Singleton/EL-4 perl-Class-Singleton.spec,1.2,1.3
Message-ID: <20090819222401.C6C0E11C00E4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-Class-Singleton/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17820

Modified Files:
	perl-Class-Singleton.spec 
Log Message:
Port a fix from EL-5 to EL-4



Index: perl-Class-Singleton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Singleton/EL-4/perl-Class-Singleton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Class-Singleton.spec	8 Sep 2005 16:29:29 -0000	1.2
+++ perl-Class-Singleton.spec	19 Aug 2009 22:24:01 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Class-Singleton
 Version:        1.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Class::Singleton Perl module
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-Singleton/
-Source0:        http://www.cpan.org/modules/by-module/Class/Class-Singleton-1.03.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AB/ABW/Class-Singleton-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -34,7 +34,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 -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
@@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.03-3
+- Canonicalize Source0 URL.
+- Fix find option order.
+
 * Thu Sep 08 2005 Steven Pritchard <steve at kspei.com> 1.03-2
 - Fix permissions on Singleton.pm.
 



From spot at fedoraproject.org  Wed Aug 19 22:24:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 19 Aug 2009 22:24:36 +0000 (UTC)
Subject: rpms/gxemul/devel gxemul.spec,1.18,1.19
Message-ID: <20090819222436.BA36F11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gxemul/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18067

Modified Files:
	gxemul.spec 
Log Message:
fix urls


Index: gxemul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxemul/devel/gxemul.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gxemul.spec	25 Jul 2009 01:57:21 -0000	1.18
+++ gxemul.spec	19 Aug 2009 22:24:36 -0000	1.19
@@ -1,11 +1,11 @@
 Name:		gxemul
 Version:	0.4.7.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Instruction-level machine emulator
-URL:		http://gavare.se/gxemul
-Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
+URL:		http://gxemul.sourceforge.net/
+Source0:	http://gxemul.sourceforge.net/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, xorg-x11-proto-devel
 
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.7.2-3
+- fix urls
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Wed Aug 19 22:36:19 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 22:36:19 +0000 (UTC)
Subject: rpms/nss-util/devel nss-split-util.sh, NONE, 1.1 nss-util-config.in,
	NONE, 1.1 nss-util.pc.in, NONE, 1.1 nss-util.spec, NONE, 1.1
Message-ID: <20090819223619.8F70A11C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21138

Added Files:
	nss-split-util.sh nss-util-config.in nss-util.pc.in 
	nss-util.spec 
Log Message:
Initial commit for nss-util package - rhbz# 515032


--- NEW FILE nss-split-util.sh ---
#!/bin/sh
#
# Splits NSS into nss-util 
# Takes as command line input the version of nss
# and assumes that a file nss-${nss_version}-stripped.tar.bz2
# exits in the current directory

set -e

if test -z $1
then
  echo "usage: $0 nss-version"
  exit
fi

export name=nss
export version=$1

echo "Extracting ${name}-${version}-stripped.tar.bz2"

tar -xjf ${name}-${version}-stripped.tar.bz2

# the directory will be named ${name}-${version}

nss_source_dir=${name}-${version}
util_dir=${name}-util-${version}
softokn_dir=${name}-softokn-${version}

# make_nss_util
#-------------------------------------------------
# create the nss-util subset consisting of
#   mozilla/dbm                   --- full directory
#   mozilla/security              --- top empty
#   mozilla/security/coreconf     --- full directory
#   mozilla/security/nss          --- top files only
#   mozilla/security/nss/lib      --- top files only
#   mozilla/security/nss/lib/util --- full directory
#--------------------------------------------------

UTIL_WORK=${util_dir}-work
rm -rf ${UTIL_WORK}
mkdir ${UTIL_WORK}

# copy everything
cp -a ${nss_source_dir} ${UTIL_WORK}/${util_dir}

# remove subdirectories that we don't want
rm -rf ${UTIL_WORK}/${util_dir}/mozilla/security/nss/cmd
rm -rf ${UTIL_WORK}/${util_dir}/mozilla/security/nss/tests
rm -rf ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib

# start with an empty lib directory to be filled
mkdir ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
# copy some files at the top and the util subdirectory recursively
cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
cp -a ${nss_source_dir}/mozilla/security/nss/lib/util ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib/util
pushd ${UTIL_WORK}
# the compressed tar ball for nss-util
tar -cjf ../${name}-util-${version}.tar.bz2 ${util_dir}
popd

# cleanup after ourselves
rm -fr ${nss_source_dir}
rm -fr ${UTIL_WORK}





--- NEW FILE nss-util-config.in ---
#!/bin/sh

prefix=@prefix@

major_version=@MOD_MAJOR_VERSION@
minor_version=@MOD_MINOR_VERSION@
patch_version=@MOD_PATCH_VERSION@

usage()
{
	cat <<EOF
Usage: nss-util-config [OPTIONS] [LIBRARIES]
Options:
	[--prefix[=DIR]]
	[--exec-prefix[=DIR]]
	[--includedir[=DIR]]
	[--libdir[=DIR]]
	[--version]
	[--libs]
	[--cflags]
Dynamic Libraries:
	nssutil
EOF
	exit $1
}

if test $# -eq 0; then
	usage 1 1>&2
fi

lib_ssl=no
lib_smime=no
lib_nss=no
lib_nssutil=yes

while test $# -gt 0; do
  case "$1" in
  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  *) optarg= ;;
  esac

  case $1 in
    --prefix=*)
      prefix=$optarg
      ;;
    --prefix)
      echo_prefix=yes
      ;;
    --exec-prefix=*)
      exec_prefix=$optarg
      ;;
    --exec-prefix)
      echo_exec_prefix=yes
      ;;
    --includedir=*)
      includedir=$optarg
      ;;
    --includedir)
      echo_includedir=yes
      ;;
    --libdir=*)
      libdir=$optarg
      ;;
    --libdir)
      echo_libdir=yes
      ;;
    --version)
      echo ${major_version}.${minor_version}.${patch_version}
      ;;
    --cflags)
      echo_cflags=yes
      ;;
    --libs)
      echo_libs=yes
      ;;
    ssl)
      lib_ssl=no
      ;;
    smime)
      lib_smime=no
      ;;
    nss)
      lib_nss=no
      ;;
    nssutil)
      lib_nssutil=yes
      ;;
    *)
      usage 1 1>&2
      ;;
  esac
  shift
done

# Set variables that may be dependent upon other variables
if test -z "$exec_prefix"; then
    exec_prefix=`pkg-config --variable=exec_prefix nssutil`
fi
if test -z "$includedir"; then
    includedir=`pkg-config --variable=includedir nssutil`
fi
if test -z "$libdir"; then
    libdir=`pkg-config --variable=libdir nssutil`
fi

if test "$echo_prefix" = "yes"; then
    echo $prefix
fi

if test "$echo_exec_prefix" = "yes"; then
    echo $exec_prefix
fi

if test "$echo_includedir" = "yes"; then
    echo $includedir
fi

if test "$echo_libdir" = "yes"; then
    echo $libdir
fi

if test "$echo_cflags" = "yes"; then
    echo -I$includedir
fi

if test "$echo_libs" = "yes"; then
      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
      if test -n "$lib_ssl"; then
	libdirs="$libdirs -lssl${major_version}"
      fi
      if test -n "$lib_smime"; then
	libdirs="$libdirs -lsmime${major_version}"
      fi
      if test -n "$lib_nss"; then
	libdirs="$libdirs -lnss${major_version}"
      fi
      if test -n "$lib_nssutil"; then
	libdirs="$libdirs -lnssutil${major_version}"
      fi
      echo $libdirs
fi      



--- NEW FILE nss-util.pc.in ---
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: NSS-UTIL
Description: Network Security Services Utility Library
Version: %NSSUTIL_VERSION%
Requires: nspr >= %NSPR_VERSION%
Libs: -lnssutil3
Cflags: -I${includedir}


--- NEW FILE nss-util.spec ---
%global nspr_version 4.8

Summary:          Network Security Services Utilities Library
Name:             nss-util
Version:          3.12.3.99.3
Release:          8%{?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:         sqlite
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    nspr-devel >= %{nspr_version}
BuildRequires:    zlib-devel
BuildRequires:    pkgconfig
BuildRequires:    gawk
BuildRequires:    psmisc
BuildRequires:    perl

Source0:          %{name}-%{version}.tar.bz2
# The nss-util tar ball is a subset of nss-%{version}-stripped.tar.bz2, 
# Therefore we use the nss-split-util.sh script to keeping only what we need.
# Download the nss tarball via CVS from the nss propect and follow these
# steps to make the r tarball for nss-util out of the for nss:
# cvs co nss
# cvs nss-util (as soon as it is in cvs - for now extract the srpm)
# cd nss-util/devel
# cp ../../nss/devel/${version}-stripped.tar.bz2  .
# (use 3.12.3.99.3 for version above until 3.12.4 comes out)
# sh ./nss-split-util.sh ${version}
# A %{name}-%{version}.tar.bz2 should appear
Source1:          nss-split-util.sh
Source2:          nss-util.pc.in
Source3:          nss-util-config.in


%description
Utilities for Network Security Services and the Softoken module

# We shouln't need to have a devel subpackage as util will be used in the
# context of nss or nss-softoken. keeping to please rpmlint.
# 
%package devel
Summary:          Development libraries for Network Security Services Utilities
Group:            Development/Libraries
Requires:         nss-util = %{version}-%{release}
Requires:         nspr-devel >= %{nspr_version}
Requires:         pkgconfig

%description devel
Header and utility library files for doing development with Network Security Services.


%prep
%setup -q

%build

# Enable compiler optimizations and disable debugging code
BUILD_OPT=1
export BUILD_OPT

# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
export XCFLAGS


PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1

export PKG_CONFIG_ALLOW_SYSTEM_LIBS
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS

NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`

export NSPR_INCLUDE_DIR
export NSPR_LIB_DIR


%ifarch x86_64 ppc64 ia64 s390x sparc64
USE_64=1
export USE_64
%endif

# make util
%{__make} -C ./mozilla/security/coreconf
%{__make} -C ./mozilla/security/nss

# Set up our package file
%{__mkdir_p} ./mozilla/dist/pkgconfig
%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
                          -e "s,%%prefix%%,%{_prefix},g" \
                          -e "s,%%exec_prefix%%,%{_prefix},g" \
                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \
                          ./mozilla/dist/pkgconfig/nss-util.pc

NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`

export NSSUTIL_VMAJOR 
export NSSUTIL_VMINOR 
export NSSUTIL_VPATCH

%{__cat} %{SOURCE3} | sed -e "s, at libdir@,%{_libdir},g" \
                          -e "s, at prefix@,%{_prefix},g" \
                          -e "s, at exec_prefix@,%{_prefix},g" \
                          -e "s, at includedir@,%{_includedir}/nss3,g" \
                          -e "s, at MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \
                          -e "s, at MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \
                          -e "s, at MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \
                          > ./mozilla/dist/pkgconfig/nss-util-config

chmod 755 ./mozilla/dist/pkgconfig/nss-util-config


%install

%{__rm} -rf $RPM_BUILD_ROOT

# There is no make install target so we'll do it ourselves.

%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/nss3
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}

# Copy the binary libraries we want
for file in libnssutil3.so
do
  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done

# Copy the include files we want
# The util headers, the rest come from softokn and nss
for file in mozilla/dist/public/nss/*.h
do
  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
done

# Copy the package configuration files
%{__install} -p ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
%{__install} -p ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config

%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig >/dev/null 2>/dev/null


%postun
/sbin/ldconfig >/dev/null 2>/dev/null


%files
%defattr(-,root,root)
/%{_lib}/libnssutil3.so
%{_includedir}/nss3

%files devel
%defattr(-,root,root)
%{_libdir}/libnssutil3.so
%{_libdir}/pkgconfig/nss-util.pc
%{_bindir}/nss-util-config

# co-owned with nss
%dir %{_includedir}/nss3
# these are marked as public export in
# mozilla/security/nss/lib/util/manifest.mk
%{_includedir}/nss3/base64.h
%{_includedir}/nss3/ciferfam.h
%{_includedir}/nss3/nssb64.h
%{_includedir}/nss3/nssb64t.h
%{_includedir}/nss3/nsslocks.h
%{_includedir}/nss3/nssilock.h
%{_includedir}/nss3/nssilckt.h
%{_includedir}/nss3/nssrwlk.h
%{_includedir}/nss3/nssrwlkt.h
%{_includedir}/nss3/nssutil.h
%{_includedir}/nss3/pkcs11.h
%{_includedir}/nss3/pkcs11f.h
%{_includedir}/nss3/pkcs11n.h
%{_includedir}/nss3/pkcs11p.h
%{_includedir}/nss3/pkcs11t.h
%{_includedir}/nss3/pkcs11u.h
%{_includedir}/nss3/portreg.h
%{_includedir}/nss3/secasn1.h
%{_includedir}/nss3/secasn1t.h
%{_includedir}/nss3/seccomon.h
%{_includedir}/nss3/secder.h
%{_includedir}/nss3/secdert.h
%{_includedir}/nss3/secdig.h
%{_includedir}/nss3/secdigt.h
%{_includedir}/nss3/secerr.h
%{_includedir}/nss3/secitem.h
%{_includedir}/nss3/secoid.h
%{_includedir}/nss3/secoidt.h
%{_includedir}/nss3/secport.h
%{_includedir}/nss3/utilrename.h

%changelog
* Thu Aug 13 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
- Initial build



From emaldonado at fedoraproject.org  Wed Aug 19 23:01:58 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:01:58 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-3.12.3.99.3.tar.bz2,NONE,1.1
Message-ID: <20090819230158.9CF3511C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27850

Added Files:
	nss-util-3.12.3.99.3.tar.bz2 
Log Message:
Initial commit


--- NEW FILE nss-util-3.12.3.99.3.tar.bz2 ---
BZh91AY&SY?)|?????????????????????
????????P1
45??????{?
?????l=]?r?{?@
>??????m????w??E?7?4[Uin????B?z
??9???sJ???E%????_=??????????z???>?????=}}?H?U
??V??.?&?}??????????&??;??}?2:o{wMy??yw?V??u?}???;?????yx
gw?g? .??l<?^cA?
+A@

?????{????????????#??{?????y???Q????f{??????^??>???>????????????????|4o????j????[{?#??????y???'U?Kf?X?????U??s?????O?v??qCo?2Q?
'????Wv??/???;?s?\?{????.??[????N?O??[gz???wn?W]?f???????.????[??w4?q????5??????+s???????????l????????m?m=?]z??Md
;?G???w??{[v??????j[?b??G??k^L????w??????T?x?????????????(?????v5?m@???a??^?sI??ttQ ?]?????>?s????C??q?????kZ?7^?*???????{???;?r)mKjc?
????S?L?????vn?}??{?^;?????P?nY???f????m??{?2??????Z?????
1YV??v??w[????T?(.????j?????????}?
??7m??@?V?qmH????]????5R?P
$`????W?]{?t???=-Z??:r???A?5??w?Q??&?l??d}?{vd???>??]?svV?w6??M?nv???]{?w??*?
?s??Z?v??;f??9]h???E?E????N????S??V????}??z???F@?u?? 
y4?5<?)??????MQ???z????=O??

l)???4EO????T???ML???S?yOji???4
JdC at MB?54i=L?LJ???O?iS?O?O?T~?S?4?)?Q??6??#???i?


?
y]?A??@???"
*1[	L????3(b?0?T???((P?N?
???W??+?T?Q@??u^;??j??0?~uG_????????Ex?????r=j??m?[?=nU,?;?????U?vB??&?????
??4??????n
?z???
??T??q??f??Fi?X??????8??/w??j??A???$?"9??4&Q????z5?@?4??X???1??"?F4?????P?D
d????A5	??
>
K??
6z????9?V??1$RD?????!?L??6?`DL??R
Y???d?\?????J(??@I0IAP???)`P??
4EAS0???M??J?s?AD?
ET4BRLP%P?D$AC????b&?r2"Jh?1+?
?J?yd?????????????8B
?>N?+=?B????_?<X??????m??>J??'?^??3?	?>)?"??_t?i?:k+???[??}?+R!?*E??.??9??????rQ?Q????i?]?S???FFG?????(???T?[????Gl|p?????(????????D???'??1S???B>p???K??B?S?????{??????m????<cO??;4%C?????a?????[?-NV?O6????$?G?d??H???m?=?"??|?j?Rh?JBb?????0>NO7???G??)??q?4???#,???1???d?8?-eAQ$
L_9LMD??????a?b?p9??	
 wk?AEE?r?? ???b??b????O???o??J^?0?TPSIS4UP?ERR?0?5?1????\\??)?l"#3i???1'81??
????i?*?-?I?T$?%5RHI
JD?TEP?AUW???0?(9?(I????M?<aB??(??	??????1W?	%#??1#???F?YF??t??w	Q$?T?P?T%}????( ?????????6????b?? ?(???9J?M+JQ$??M?$?!LLDJ10J????BU"EHUL?Q	BSB?R?B?,?
?*?RD???sb???^?x?8>??w??b.??l???H?	????C?W??B?U?Jp?<J?f?*S!+%	???5T?U34?Q%T?TT?TA?%S?CE4PT?Z?
?b?bIi??*(("??????*Y??rT(?V???-4??o?????E?5?%?{?/?B??wL!?Q??Y??V0? ?L??? @AQ?Hvm
b??G#,R??
 ??#^R??dn?V?{???(???
?"io(??X?I?J?=??ib?	7n?????e??i=?O?Wc??
S?K?
?"[UceV(5m??????h	f`???)?*@$?6<XA?Q???r??????S????J)??3BA)<?0?P?TSA
"V0,?/?A0BRE%??#y??N5?(H? ??"??8?!UW?3 `0QE1DDK3%G?K&#k(???=??n??^??:??H?j?)?r?????????I
)????(??? ?&??&????J?"F?&?
?*(?&*???????(i????j*?E????? ?j???? ?d?Dx???Z*S?4?JR???G??EP??[*H???) ??l?fb?c?sLL?????"!
?`??UC3R??a1??? ?baT4CDFfe??fQQ??0,?3^??zw15U??????""?I
XP?? (
h?)	?;J?Y#??9PL??DY??	v??`?(???0??
)"e????Z???h?4T?3J	0??R?P???B@?E?a?????My?h&i??bPM$??|????h*?j?8\	?H()*
F???S??
4????i??rG??Bb?Q???%L? Z=R?L???????????????7???????????k?W/1????*?C?=?rz????bN??e????v?q??????*????????K?r??]??????|?<??Y??-????cJ?k:o?<|?7i?}?I	??42O8&wgF???+R??$[/0R!????J???x[?D????????????6??dLT?]??B?w??m?s??3A??3k???KG<??g?????V?_??
?hY
?K>[y?l??f?z[4???@?????pf??]???G?"HD??}?;	?b
????]?:??????????.?C???e??5???6&n???B;????)80?r?Dt%??yV?W-j?&I??d???nJ??
????N?1sU??\?<?thsB+V?e?????a??
?}?v?Z	??u??8?4FJ@??!?j\??????cl?&?S??|??$<C?\?D]\???"??-?^???????????+???gJ????1O?????IhF\m??????)???:';?}??%&eZ?"???????L1???2$m?L	478q??????????f????W_c??????Fk???R???!Y]qh?????7z??{?????d??3???3??????=|?)?/???_8??tv?????;M?8?e%+9?n?3R???
?????"`?A??!???:????G-????`w?v?i3?;p?Fc???q???4.??QhaPK??1?'????
&?M?[h?
?cA?fhz??r~?]yU5?\O????D?lY?f?rZCM*?8??&k?7?'?V?n?Up?$y'?'+Z???W?Z???m???:???7?FI?	ts?gV#???E?a?t?Z??c%PE?/r???Q???9?
???'??j?j'?$
???U<?1?#o??>'?
S??p)???P?!??6"jf]
??t?Q"??fnm???D?s????`a?H?}?lJ66???Q???d???????D#??0??9???;w?(U?%???S????hpHv0C?Z?V?c??~g?6?a	??m?
??5?3
?%?	pH8?	?eKRda)*eZ??$???f???*??6??,??#h??}?0|?BD?????J?S???GLY??LO|k^#???,?Bu?O?
????????C????H??g??"?????Qa?zYF??/S??oi??7.RZ%?H?tJ?l?!?C?R?'???IOoA?{??i$a%,Yd??B?z??I??E?J
????p?l?U??	$?kSsB?:?y??U???*???!??)?V???=H?AE~$p??????6? 5???q???z8u????(**
?((?W????*
???
?'&j?
??
?x??=IlB;=z??Qz?}???WqH`???^m[
?u??
]?nWY[ve???c???|?b?o]?#XdZiVL$<{?L??7hA??M?4A\Y???'F??<??OJ?	5Z.
?I,?3P??u?SL?!??~??nF????2$??@]??r??8?yF???!6?c2??V???G?^??7 3????w?f??^;??#??????_???8Wp??1??}??Zg????|G??????H???????Cc?? s???sh???????
<g?8???x??2????(n?????z??a?@???L&
."9j??YG???m8?s?Y-???n	??0/9?
(???????<r#s?????f?@??<?N"???}?x[1?????l??6??ad??Z?O??n?dm???Ff?B??<rc?@?E??9"?+??
?"g:)?7;??????/???Aab
????d?L?W2}$Sw??:m?,?>-l6?????k?"??mcO??7??)e???W-??(MBM?????>	?5??[???b?;?m???E????q6c??????"?????C%?0?1?d?????m?fR?5.2?Z??5N|????j$4m?"YD??:??ky ???z???7?x?|???|v?o$??R?t???.?????=???5=?[????Rh?L???cm??WfX?????j??q?L??B(?q?jv???V?Q?Smme???$s??\j_{??????Q?A????E? ??w
V?<<??????v????Q\6S??D|?N4?????CGY???u?TST-uBeO?2?(n???I?Y	???KKY@???i)?	I	?lg<|-??yM???1?o???Y???;?
AF??
?%"i**????4:?&??????????(?7a??|?
??7'??7??]??o?Q?\:#?5?PW???D@:????????@>X???;?-[o????]v?u?Ht??"	b"k3)))	?)we???????Nqf?p??#?z??????!???$??#h?4kqA?1:a??	??3???D?o7dj??d9?0S2W?.Q??
C#
?	)?j????
a?Y
E3Q1$QMQ9g?Z?c4TSF??(B??k05
?DXgB?Y$?d?kSD?2?????i??????_???
x?????{h?kY?;H5?T??A??"??c?#??+^|??Dg?\?J??9`???
K?Ro?y?v?K??^??????4???l?????????$???q??.?Y??A?x8?
?,a9?xGi+LS	U?6kWuQ???l?ho??e???.HG???????Gu???]`??2F_????[?nuS*?R??-:r]?L????;??H?~?;?_N{m???;??Z:C??C??*v?+?+?L?B6
???????????O3?o???
??????G?{T?/??F1???$?u?a????????ji??!??T:1???<TR?.]??J?NVdD"]?3 ZC9?oy?kY?e??+X?y???[3s?)6Ta?_??7>??????V+Z??u?FD?;?_????7?x?????g????$???????&???*9{???7u)??S?s?\;???30;?*??????!?&JuCD??3??j??v???*JP???!??ICu
????v?8SN???N?2m??O??R??/F????FD?|?f?"0????W???V&|1E??|/?ft??
??]?Q_q?>????Z}-? ?T???????7?sD?
??-?????M?%?,z?%
?/E????q?%B???0????>_????C????~???lcskN???E?6#h???R????^??DM1????Bb?A?2????5??5?	??v????????>)?v???6 ??S??Yvd
???9$=????????????h??l??V?t_???????
m}?Z?????!????L?E??Q???K
i??I)?~(????iz?#??;?aV??????WG?8??q??vIf}=???? w?W??????@???6.U??'$
???c?H~??o?&?;?G?'xm??"=?$????-+?	?_?X??
J???t?S?????~C\????J???+?&AFY??&???k?)??5?V?P%YgR?J??E????!l????2??1?? ?M???7???`>?T=???V
0?U????dRoQFVL?%???!
????????3I0DAEj?h?A?Q??L????C'"?L??q\?%iL?!2?j?2L???T?????rR????w[??lle-Tv??P??:%F$???48?1??????!Y?&??3?V;#D{????M?ajX?+?m?m@?
eX?k??,?[L??E"??S??????&??l??!?jj?+#(???????7???b??L??7?j?2(;
???9$????c
?U?	??-???Nr???*?e-?3xx??k?b?l?$s?qX???z0??r2?;??!?S? p	T?t?s3r??o????s????????,?2?"rL??Es?
????@?#??l?q???4!???o?_-]^[%??O???R???yVq?????V?M?A?d{Et?91??n??SM??]~we*?;?
\?`??DU?pI???kD????????B??????@?????Y<dl?$Hl!?rI*bHP?T??x?@??AJ?(??hr?(H????;F?H????,pv?D?????=?0?j
?1???_i???-??l????"m???@??
??3Z ???Ub]U??Ha??
L?J
???c???FG?nZ?6?(7?!
[!????z|k-P?]???{?
VJ6Pz???f?(?@c?o6??v?b	?b??
_??????(??????
W???A??gmV??|???E??JC?M??3#WB}???w?
DQ??H:?+h_/???w^~X???g9G?+?O\???	??\ja?????~???Vx????.?y
W0:B?S???X&??0????U/B?r??2,?(????Xg8??@? +">?
o??(??Y????C??Q???l???J???A?
?>?N?$?<??<?t5???~?J10D??????7??????
?D?AS?????A1?E<4>??b??J??8?^S1?,?3,0?J"@?
OL/???????B???????}??k ??a????NP?%???p&z5???Tn?)??j??<
??c?z???z?`??p?.?bH???y^0??A ??Q??c?\!?
,i?G?b??D{z??i????q?Iq??k?@t??w?zr&?????'jsEtP,?????1		?5?
?@??\??????U,??|9O?Ck????? a?P=#????vB???@??e??R?TZ??y?????????????<??(?e???P?G????@????_F?V????|G??>???((?P>?g??E??s	?????&?x???
?~.G??@?"?~??:N??????5?????2W??b^???L;???YX2??????>??Go?Y??$????
?v??&?d?q?w;?t)?](?pwr
R?a?9??0???U4U3???d?w?????????w?~N??8i????h?
?bb?l\??????c????????-.5]??7+??juS???7?l|8x??V?f?0?	Clr?LP????eUS??e??	U??-?wF5Y???^???W????*L?!??q??eoC??-???Jj?(N?/?????g?O??1|?QJ??s???Q???UUUUUWUUX??#(?I????LC?:0K?("??L^>7???]k????^????H?8????W??????y??????????u????????????6?^-??u%??3?????????.7??{?U\???????????????z?????{x???Qq?Z?????\>????o???u?q6????1???ww???%?>?s\7?}??7???!??[7?H??????;?|??????t??Tg?????\?H? ?;g????Da	g????8?HU:??E????H????vy?????????M??TY??YIW?Sk,???
k??_\g?????3????e?8???fm?8???????g ?9j2?????c???????Q??A??\"??D?n????%??????????]?y??9???1:?i~^O?PZe????1?q\??127H?????hd????3?j?QB~"PXuA3??v5?H~?KS8????Y}?a??15????#?#?6?W>f}?yM???/?l5M?
"?E pm?????V?x???r?!??+??!?%???~?
3???:?2 |8?$?uW/??<c??}??	??
n?xa??owl?4eE????Xe?P?F5'?????y??Po?P&?????lN	
??Cg??l????>(V?????ww?zq?6/
#;}???B~0:??[???b????zK?,?Ol??????\~??x???"??-?F
???{z3?????p:?s?D?%??'??????ZDP???9Q"B? iaC??r?D?????>Bd?Iqx??!???!????/+O?:*"Z|?.G?^?'z_u???J??&??8
?#*???????t,}~u_?2?#??????3????;?E?X??,?k?z????G??q?O}9????iw??}?$G,?????`??8^m}*[???K?|?h?X'???
?H????<|?d>?????
PTDDE%T4U4?]???r???=$???
C???$h"S???????????7??v(??MDw?
?_?8&`??0??\c??j
g$?6?N??Y?????????_??????=???g?<?[??Z??b+ ?Z(rr???&?C$y??? ?)?#1?
Ji??i*1?J
_???8q??,l[???d9J?cY???X?l?S&?
?UI
????c3G??cI&K?4E+?b?+??O?	h(H??h???7w?n?y???????????zr?ub?j??VZ??\?NL?????6????????????????$[?3uk??s5K?7???C?U
??p??5A?5?E0???1??
%???D???~M?R4?
H?	%????[?;m???!??5?H???U?,#J<????Hf?k?m\l-:?y)?,?_ij#?wH7V\r???r?????HL???;A3??q?	^????L}m~+j!"2?*s<D??????&??"?"q"&??r6|n?S??Af?A??'@QV?????-D=..=g????~#???E????r???(
?P5$B????]?m???)j??d?*$????e82%?+w?????n?l??b~?A?5????????n??e?xaqy ??(????/	?8??:??L?P??
?h6?$"K????X? "????l?Z?rx'd
OHIe
??Ik??7?N???
QADL?E$HPO?}z}??????m7g???
E?~? *??N????~?g???"??(??P ?@?Q?B p??
A????~???t?-??? ;??y"G??>???F??	}??$!$??F??+2x	???????\|:?'c??}]<sO?????&)??9~?x??HS2E?h{????D?9?n?????n"gO??=?Gc
??&????J:?fI	$3S^?z??4/Ww?$??9?B?"?1:x???????`|<?3A??????/1# ]??\?????J?9?F??/??W?r?"??"`?T??? Q?a_??#d??m????98??#,????*???e?y0????^?P?*?%??#T??HXVY??????}??V_????????+Cs&??Ey?b~~???"?
?

?P??QmEw??)????}D??-?V?0D7\J??????S!P???b?]???7??Ioq?
F???R/a)?^&Q
???"@ 
???=?????ae???R?tz??/??d??y>f?1J???<??|???.?j??????&Q
??????"D?|t?``?(????H???"?a??YRN>????M??RS?d6)D~R_?D?H?
????wwhL?C "+7?
Q??"?????a"J)?????*)?b?	(????b???????`?
?????????@???z~/{?????0?>l??U^r7???c???mT?i+???U????A#u?F?9Ax?????/u??4of?? ????KV???????`??O???????"b??
???D<D?C?%8F!??u?u>?????d(?V??>?h?????U4DH?QUK?0`H???;?Gx@??{?????~??RP%P?j?M(K,0;?x?0!?H???mLNGn?t>?=;t?rc???w??!?????~j??????OW????2I	$??????^G9????Y???j(1? ?ZT f ?????????y??`i??r?2???n?A
'=4??h???<??????Ix??hj%???Y<??? ?a?Cs?4@?{%l?Jf?0??
gLJC?^?q?L??M?????[???f??4j#?3??8?R??xx/6??j(zw??a??5r??8?Q?S{yW??Gk??u?)?:???E?<+??3?LjL?Qc????y`?Z????>?????3????j
?R?/O?
???g??4?W??+????1k-????u?????????7?Xe?I???????'!f\??!????2?<
UF??p?7R??;?x?=[y?2??m???x??????CU^???4f?d$
???6L?
??s?(k??u???1?:?~?=??[?|?j??*?Z??"???[8??:h??W??a???`?w??vo??z?N???ez??q?.K?%c)??n??}<???_???<=:_sg??????6??>??'t$??dCT??H??>??
??M?>{??'	?4B?s??M?#sa??f???o6??.k?"[_?v??_r?%e?|?^$o?C????x??U???t$ZT??3?=???W?C?n			N}?$d??b*?x??r??*u????Oh???j?M?x6??hYg?M???????]ML?G?r?*??%w4
?w??G?!??=???
??gt????i$?/w?????????)?L?{|???E??r:?????X?'?~?_????`??w?Ac??u?S8M???AE??QO??	0U4??i?????m??q??????t???h;^?u???X?>r/??>(n??M????d?*?09?4??&^??oE'??????????wr??z????J?]
???.G?Yv
d?????M??v?K??????G??????>
?Z?H?K[??)1???/P!	???C*?b???GE[KOY#?}?a#? 9??t~W~?r?Cj??&???!vp
?6")???h?:????????;??bF1?X??????v?<?(?I?,?G??^0??? RE
??t?i?h??%?@?g?f???V????	???|?J!?`u?'????}?aJN??o?xP?????3?????"; ???C?PG?U?d?^??????(???????y???????C??!)??! m?l???S?3??!:.?LG?;?S??a??
8?-a??I???c??55L??8???2?
=gZ?@;7??C????hZ*???'Wvd#?{P(- ?~h?>???ls???????+??V~9?6?????rU???	?7?@N?????Y??	L???:?????-?N!?u???d	?
=.?A???~W??(O"'???b??S??????8?r????>???????????????????n?????I??Q?9??J?Z???m?I?????H&??  l??e?+vB???????g??u!??wtN??????t^?i????]?(8?n?.H?ms??/#uN^?'#????????AF l??
????;+?????m2!??u??????Gh???"b`D?}??y!
{??A??????gC?d
xD?r??E?n????WG??~??p??W???????????l?Q???O,??_f??^?
?}:&?e~{>?b??w?'???}giw=?^?:???G?U????m?hp???	^>|?J@???)??X?}??tV???d?wm~G3?:g?
?????n~?t?<?X[9????~???????+o??@gLl????du
,.???$/?/8???????g???`f
l?????y
mB"?2?l?+M?/b8??</D???????G:m
)g?#???5??????????????p?a?w 6???5??~????-?Y?E?&g?6n?????????<?GJ?=?K??K1y?{S`?????????[???4.?w?????J?_???|o??l?????P1??`?ZLb??=8]n??(?X?E????@?af
	?%???6?1i?ID?G??? ?????DYl??n?m+????`Rm?<N2?q;???)??O!?y??{??l????b5??-??f4L$'I2 ?????B???D?nI???????T??n???q?'?????????????V?A?3B??r?????#?/?????7???/?p???7?D$
???K.b???P(?:d???J?x?uB???q?&!??U?$Du at p??:H????
7c?v;?v?????!
/??D?'bg????[??)??1??M?o??7#????6Zu???v???Os???vR?s?0???
??????????E.??????!??HM????'5??z???????e???*)$C.Jvz?M?{2?|??~?e#?S1???@?
?sv?3??I#m)
???L??:I?K?????????Y!K_`?
?X4
???(+GZ*???MrQ???O????N????q??T??k
?
???N??9??#T???:?~?????v?????
?s???4??R_?Kh?]??8]wtn+j??p?1?H|U??S?6???????e|?????Bm?ri?<
??,S?Sh?L4	;4??mAP?hB0?,?0L"L?bb??^`??T??`???H%??}???E???5'uE	?f???t???g?8p ?q?M?8???)/\????
?J???Ycp!?2???h0??????
|a????~2

??I?q(?DT?y?\??r???????g	a????c?????|I?d?d??N???Bmd???????w?.l?J#2????U 4?u????")*h??<u?K^?0?,?D")x?aa???Eo????9?DK?YL??L*?
?}|???:E?v?6??Y3*?(?xQEELM"?P?xkF???????kq???? r5Ud*A/?kVq?u???)?"?(??z=?*??'giy?^?mHa???E??h??cI?]$???~?4GNz?K?8G	?=?h?	?gT?a??2s??8PI?H??X?Af???6?(? ???2??
D
?? ???;&3M?H?7"#*O5c+?<&?S? '?
@?@S??G?e???D??;?>FB
*w?!??A-);?ss?d???eD??=??k8`?
:?V?W\?|k????F???C@??SD??*Q1Q??9?fk.???????A? ?r:??1??_????:2??Ke?5????v??Fxaz,?P??F1?n????????N?????&??M??v?
?0!??(D????b?6?]5tq7?????d?n?&?_)???????????_?}??0?LQ2aE?????????;??=??
?%??9??L?Z???i?^??,????}???_??w?$??Z? X?(??n?S{????{??3?@?&???;????*UE	?=kRl???h???V?bW?>(??M??c*???????Q?AL????7??3F?
fD9??[ ?BC?LSb,c?-$?N?l^????Wq<?TQ?{??????Y???X?D\?r??3l??f?BE????AMn?	?A??^?|?SA??MT?O??????u{W??!y????m[????V???xN\?^?b????M}?????/????~?}-?8R???dc?I?i?>*??? O?C?"?p?j???????#??o-
p?_?X??	?@?h??X???????~W???????Mk???O)>?>??)?}F?e???%Ay?X/???.?v95??]?????$~.a?????`????_7???sn?M???<{?"??C$???*h???
?????Y??]c?????>???=??~uxW_?g????Qf??_w???N9z?M2??
?KNt?%???
0)#?z?K?????*w$???<?X??"b
-??Pi?S???5 ?#???K?>W_s?@?}????j
`?+???l?????m??h?x|h?}?h??mf?j?+??k>;??????{dE?te????????^I???k????$},???|??j[L?@??vL&???+?L??-(3?&?3??
j? &?
???????U???\?VU`?????W?Y???dV0ZDt;??ngL?d;N??V??`?/~?p????????C?XE?@q??od6???G?
9?&?d???????_&OqM?9UJ???\H?<KB?{??E?7B???o
??z?????O4???L?I\J,???M?E??TE??
^???D?Y???-I3$?HB:?&?v@???i??X???99?t?<t????C3?)JR?6
???o????????J3??1??E??3?g?zwH??u??o?SI?H??/?))?7???+?'I??\?5:&?k?k?[<I
?B????M?b??U?;?????????????}??$c$???yb,a?T#-$*???^????v?j??5?nwMo??A?t??O??V+?v?0????????]+?}v????????~~??l}?Y?99?AS????3?!?OH?U]E?u??i??]9?+?|!^}????? a???????f*zn?BE\??	?7?^???l???]??u{???/???????_????D
P?
?/???????N???	??????v5??z?
|]?4??W??iA-???????????8?Rr^?A???g!??i????LM.0?kmo?K? ?{KS:eg2??w??^??S14?????????
?{?????{???a???????????Op?#??:???XR'??H?1sT???3e?C I}N??????g?(??
???9????1?l?X?????t??4??O?????<??|??JA$u?j4i;M'td???K???[?7?;??R@??????
?x??p2??????x??|,b??<???!??#?5S>nK??f?&?A????,]??f-?6?z???1??m??A??F??\?????*"??F?46?0?b5ST?X???a:?L?e?b?v]??/?q??v`??
+v?{??0????W???ZBBBC??kIj???
z~???{?!???????^?
9???
?Z
"?P(
+VpvL!?j?84???dL?~9????\??r+?!=d6?t?Z??3Q?A????]?e~G???i?c:?:)x%?R?TX?Hz;8??$q??Qi?_>?cf?S?Pn??*`????bywGN?????7??????<?S?T?
??+??!??04?n?????7????pp?f??Z?j???3]U???KMO?I$?]????=')???r?o???????q!;???hcA?@>?????(xx??^1DkU??UU?7?<(?y??3??U_???U_g??????5??0????????UUUU~?3???cUUUU~??e??W?????f????????????{?????4|??
x??3?/?????
6?q?it?.mE???E??0?$2^??
IM)?HL?"??\AA9??????h???-??9n???r?i`?Vl?2?fH4?9??D???^??,S???}{|???
9D?	?????????w^?U??jo??;?????*?????:??z?x??s???fA??>?;j??1?F1?p??|??#???z?E-?Q?????d?*?J??'?H?Yq?????
?????H? l?{??p?
?$???-n?B?????1??BRa?}??-4???*?>??RN?????R???D??:7X??????sCU1?`XZ=??????]??=l\?o?y?\o?a$$?T?;????t?LF????6S??lO???
?QUh)]_3???*?U;?N???I$????????Wb?d	?? wI'??5?]?????Z?F^|0????+??I$?^/??U?rO??U???|??UW?8?????&?h????\?
??a)???IyY?$?I???V??????2?????'?~^??Vlnc??R?^ff???????m??????^?????t??/??{i#?s???e??
U??u?0d?h??FP?di-XD??>??m??vk?????#46V??JBU5u4?:????t??,??.?o????o:n??aa??
?q??K?`???
?????@3	???p?wq?gZ??C???;????L|P??y????l????|q???????t???????M?5?;??P????uk_C???c?c???Cq??L?T?????.k???K5?t??????q?35??h4?c2?o???V?`???^???^???L$?L?-M?&?D%????U?D
?e?,L?|?q#?j9<??<$V>??m?=??`Hna?H?{?n2?!????????!Z?d?h???v?s?tK(o???3??Y?R?H?????7??k:?9?$q|-??YT???k5????1"???????>???}{??)+?????N?Ff
iD)?X????B??4?^??_??j??;?F??m??;?????????v4+???4$??????????e?x??k{?y??C	e????R???U"??(a?e9:??:?vW?l?E{??:=/??????L?????7^??0???{???????n???`_??x??????0????X_^?U?^<?7

tXX? W:wB????w?Ne??RX????????T?????6???[??$?X?z?'??H?????1q?YoQ<?$????1 ??????5??&c.??A???e??75?!??y?X??6Z*P?D?2~???????N?R????X??d?;??hZ at Bk??ayu)5??~
??3?dHG???{?W?a???e??@o:/??.Q???c:	????????
?E?!????i*?Q????k_?H=??z!??,x?W.?*-MThU2W]?W=&5i?U?@8q
H????H?J?u[76yw:??-Fr???ZO???t0?????
Csg??B??Z??2h?I??????4+~?-ym??
???YY??fn??s??v????Ue???b????3??m??d?~7?TZd7"?Y??y??????F~???????p?>???????k[??`???.d?????
????8?`????y?:`?????v??H!}???D?MP???d??6e???S??P???!?

????p{?
?l???B8k???Ve?f4?????p{?
?*2(????d??? ??>?o??BZ?#??	???|???s?=?????l??E%?AN8???	?jR?R!?
F???r??-U?QZ??q????????????*??7??]FK?j?[??vY?n???????#S?Z??(?f??YU)?Xr
?-F??e??*?r????eU?U?j??E????!?,???e??(5eYd???V?0?
?p?|???v?????z???????u?L?!2?h????|????y???dl4????+??g??q??Q??o?{?????Tp???(C???3??ffI????o?k?OL???`z?i??n?M?2???fa{?3rov??1&???v?
?$??3_d??P4&o????!??Uf???a???^y
&?c6????	???=Q?????????3?I?r?fI??&j|=???UT?????t??`?>S;??QUS$??J)????fffygw???L??;<6?

??7?@?8??4????l?!-9?7??QAU$4EUU??AD????}?3?k??g??+?????l?$?v???$I??
?p}uF$?k_???M?"d???????ZzM?wG???U?A??????kp??.?wYQ?>t?????]????3<
?8??\bv_??)p?=sc_??pzbk???>q???Hq?^?=l??4?Q???7??;%?s????3?@???^??.???+??!?y?I?]?~?o????>PH	???sr??????=K??GLB?????qF at 9??l????????????X6???&?0?????O??~??x?R??~6O?x$????o???jY-jln??X??GlL??^0???D?GL????G?|???~>&|?#??=?b}
?8c?k?%?$?!?0???(????/?~mU3???>??1??k:??.?j:????*???E?>?~?4??~o??}`??tn?p '?&???6C?????3?_mMS????&h?a?y;???_??????u??
?????d?Pm&H??"j???????7??@L??@K??-Qj??;?H?d#??????8KYAX?Tx?g??=???G???	?g?2L$??!"???
?M?t?tf^??_3
B2!
O?f=o??!?_?V?????u4?R|???SL?? >?????/]?_bs?&y??|a '???t?	"?}@?=??&?_l?
????a]=??hY???Y???V?&:^?zGh1???X??Y??I$?K?Vo at JP????{??>??{$?M?i???ytM??r?y6?2????`-?7???u6????4??9?T
Q???c?;6U??
??????>????+^Hl???D`32??i?k??zAr2=??~?
26?u?5?7(U???I???@??P??9s???!???oe>8q??k9?@?*j&j)*??J???fz-f??Yt??m??N?CK
?Kz??iY?m\??B?CD???a?'A??9j.G??1>_??? O?	????'??I
???????<o???|?B-h%???~????sR#??#???|m??S?QT?????????????P%? $?>pO5?m?W???@H'??
??????]?!?o?i&?H?????????e?w?x?8u???j??P#X???L?C?Ci?qj?-???????????Ix??_?k?p?U?B?h?\ZV8=?C??:??U???	??+?W}??G?Oi?rD??
.?~S????t~z????????]7v??r):I?#?????????"????#?)p????Lp$a??
?:?O9$????;?????N]g???b?W?'????????N??
?????2g?
>@O/?	?7?wbL?HpK??jy???4???u???:?}0<?h??Q??f?cR????8?35-a?x?t????]??
??"#y?u???$0WN?a?7??Zs??_~?\??C???0?:?`???
?x}T??;&??wmouWw;1~?f??,w?c
???<Kd?3?{?!B???/rW;?s<?wzF?]WT??E??"=>Z?W?^V;u=???s?w???~ws?v???]??q??t??C{?Ke????03?Z??????????U?M??Q&??26?Ec?FT?2??2\
ax?~???l2i?h???F??3???FGY1sQ&?(^????J??Y^?j(dJTV=0?M?h?,71??lM??d?a? E D?Y?W??????`c~u?
5??*??Q3*? |d2`???l?m??X??2??E E"?A?????vI?X?M??G?q??~?o??["????\)/??j?b:Yi??`I?????T?? ??????R-X0??;?h??D+???[&@?X'wB&>q>??h?}d&K?????w2+my?"?J??@???????k($VA?9?????_??Y???F???N?N[??L?D%\~?e?U???????A?~?b??o????|?}???????5?2??~
?_??1T??9hN4i???V|8CG?l, 3+?0b??h??3Y?a?iJ?#B??K&?m??\,?"1?( ??0?D/<????FP?+??????O?Ft??PjkM??I??????!?P?>~
?J???t??p?ky9?)??a??M+?26?>?\??qz?=??
B??"R)??y=??@O?^
?e?oWjK???a???BQ?s???;T*????????V?4?N$?_e??????I$???3m??$????I$?I$????o?*Fa??~??|???Z?:?J???f?????p?eKu??
n???<;???e?1I$??u?[?z?????????"RI???????????:?pc?buV????Dvr???ry????o??WE?o??d??G????IN?k??0???(.????Y??O?8????dNi??0`kC:?i?0??e7C??y??X?G?1????t?H??|?5??\???6
?3????/???P?}Y?y?&?C?3???(*????P???;r??Q?????+?e:?P??zD??wq?????D#Ix1?Xl???u????????M?(G???e???1?s3??4??I??Z#?P??? ???7?????6?=?L?oY????|???????<?<?x???}??{abf?]W7h"?,?%??????m,l????h??8???]?::?????a???j at Ie?
X??'??9??l?aO?74??K??g}??c$?????,K?B#Z???m [????
????F???Y;??'???????D??C??z??l?8k????n*????????("???????? bq?O	x?)F??]>?i??????:???}??~~Cf?8???hr????<?7?_v!?c????q
W??
??Bf8 at A????3?U	?9????#?R??/y+9s?????Z??^?Z???m![?T
?????6C?}r???dg????>?3????:,@???w??c=D???-H?>V`>D?
??9O5R?????1`???M?K,????????v:?????4~??F?
?(h??kp?^??J?????????`??Mb*??q???8??X?????)T?#???a&
?%????
??iv?(?????????\??$?w?????uS?y?[??=r????G<VS1?[??{???3?? ???n?q?X?#?'?W??????f?????,???z?lO?)?G??b&???
5?uvGA??d??n??vP?Qf??*?z??1??]??^WU_;=?[????D???u?g??~?(tZ???????-|?c^???gc?B???7P??R???""C??v??h?%;?|~?????)?Z?Q???'\%\?]	Tt7??t0??~?8???????????'Ls?;??*t??X??*U?l@???G?M???{??j????F????
??9?#?m?????!xv?UK??vZV?n??Q??c?aL?Z???a????f??>?I???\ZI:p??J,??,?[ #?0???z0???2Ah?g???~?M?c??$???UR?,-??????+??Y?S??o?3??_??????4.?u6?v?l??????????????=p5???R?ii
Xx??V??|YNQ?W_75r?Z?H?I&3?D?C:????(??
Rr???*Hj]c????kX????.?#?o?u??4dx?q
b??J?f??c*E??W
??
tY???5?-VcS?+r	`D=5-}^K5-qw???-S?\E?nxJ?????E??/??)???=???_?z???K??k?Y?Z??????o?????J+S2F?)>=f? ??????=;0bVJ??V??!D?????e??d??hlo?n??;?C0Fx?c??4/??L|k??t?j?????????NT?P?????{=???~?????v??????fU8???<"???????64X???(8????F??R????|??v?9?; ??p??L????$6i??*wjgk
7?G?k????@?~????&?r???U??m??*/?E???hEx?M?n????{??`paO}?7j?7???y?`???r\i?=K??iL?a"?k???v?M
ktU??`$?Dx???|?`??Y?I-9????c??z????V??=???W????r?(XP4(???"??h=h?*0o?f???B?kY"??#9?_?z??r??
U??HF_[?g?eRE?))?9$Cm?j????t?`u:??w(
??we\??c??v\n???????7?,?`????	wfE??'??V2?e?r0[?Q?[?%Mp??4
?.68??r??[?f??m?9?????C?K?w????p??*??u??e??Q
?????J???P2E???t??9-?
UNKiKil??kJbU?X?G3a???<??	???1 ??|<?/?mZ????T?[9?%?a7??dn?j?I?A???n<??2?I4P0?RDDP?????{?)??7???>?8?????P?SK^??H?l?	??(;??
-Y(D????RF
??????????+?U?y6?n?
??????<??{??-
^?EN:B?(??A
?(????i???4?9V?1zOaK??????X????[W?]U?q"??0?K?
1-9???fB?????F?2?????b??+?*?tb8????sm???
9S????
	??x???}????R?>??e??!???
???5??EeHZ??>??]w?????Q??????"?c_?+f??5?+?u?[z*!?:
????????????aU?^??6?L?????za??<Z=3?l?O?N??`??????Z_?|z,??US???R%,????A?T????????z???<????d7???????!?o???~?z+{k?N???_??
?#ez???????Fx??&?<??30x=},?2??g8??ii?~7X?W??????cI?
???t?

K??h*?
I?Z?g??kX?5???}??8jX? f??????+Mf`??M?&???kL]Y]??	,??/??5!j??h?|.??X?1?TZ.m??~????D??im???
?l[	%?\??QYB?@	
ZoB"????BMT[z?K?????9?????.?=???#?o-L?2??????-?L?u???+??px??v:{?!???m.?1!lc??@????U???wxA??[o?????W??_??zH?Ro???????9Sw??????X?S?`?,?:??s???x???`|?M????}\q?j?Li????\?y???P???<?p????'f???rf?M?6??>??;???????Q????????????????f????Ta?-?q??????g?$F?'??W??N}=)?%^=?a?zs????O*\?NI??a~???l????#>#?>a??_g??????m?tG??
}?O?o?a	M?Z?*+???
?y4:49???H?????,?l?p?kW"k??????2CBL???????>?$]????e?X???~????k???b????-8?N9hD}?+???f?5?W????g????mcAs????R-??,??!oj????a!!0 ?+???)2>??t??Z^???m?????*_?{???E?#p??yF?d?{????E1X????0TRJ??s??~|q??)?
???????]?9?K?`????	?)?I7R??G?|T9??DJ??MVg?j??????_??????w???O????FJ??!<?
OO5T?oX???"??jI_????w?q?????h@?V`*?????B?f???82?z?{?	Nq:??n???E??a?F^?	?9????Ywx?:?q??????p8?g???[?OB?9sevcQ<???&????g??k?6E???'????U?[']O?i3?n????y#?Z???M?\??????63???#?|{S_??^???C?8?9[????S?b1??r??vX?6s???X>~????????G?h?5?X!?
?o8????$,c?!?zy?4?????K??lKIX??9????$???I?C?0?+w??,$gGd-TB?A%?r??\Xq?C?%f&????????$1??s????8W?E?<?g6pS?;?"??????T
nr??g??L?h)?
?2?
????C??9?H{?? A?[?e??xLq?u@?~5m?_?e??	{+?_?;??wC?J'?D5;|??L???g?W?	?R??????q;??%"=??|u??o?????
?C?9UYg?V?'?????$v
W?< ?/?$%?????t#rw???N???a?
?????Q??o?.??#???DS$w?A*??Qk-??????7O#??U??|???!
?<?#~??XY?	?	G?<p?9q8:{'8D??6~?????=Fo0x?CG_?>Z???????la?'.?e???5T?????PzY???`?? D?)M??Nj?Y?'l\s??oc
|s?F?Q?=3$????c?8s????R?t\Gk?F????4???"?J??	G?????w?0W???s????}j?-C??}P?????H0W??_??????????????Y?G?&m?????s???d$c???1?k???w3w7???=?	O???s?:??&??~~??\y?????^z;UWoY+f?y???z>f+sto?7?G?U????!?NZsV?;???=??	?IK?:?i_1?????X??N??}{?+,?P?????U??]e?e:[w
/????nSD:?r?C?DO_
?a?{?6?]IB?_m}?[
???`3[?Jq~W[G?U?
????3????jL?~??)?P???h@???~-?l?cd??B?????)"?zA+H??_?????8?2????fI{?"?z???BEC&I2
?4???*FA??????S?G.W?i7?"@???hw??r??Bw????G?T;?=B*?X?n0????"h???:?;?????^??X?8
M????`?<??z?
[???)s`??N?
??.p2@<d?h??9??Us	?,v?!????n???<vp???P?X}????n??*??Es?N#l?"@?&k??ME???&C??C?sMj???I/a?V'+???Ro`????9D?&??????LR?&:???s??7?d???s???&`?j??;&??8/D?|FtZ^H ?u?|Na?????r???eV1?P???s0?YCX???0?????9Dic?u?N???M?CU????????????h????S#?n?<????0?<??C???????V???el?l??D,zY?\?Q^?5?z??tF8R?gZ?f?<?j?U2?FB??????x??-?A???g[(??x???$B[c?J%??b??C?,?j?8J)?b?I`??<`8?p?F
?T?`GL?"~?zT??LG\???cs????k?&(??G??M?t??q??5?(g???'? Wn???[n?WC??_????}a=??|a???L??m?S?6)??N???!?p5???????`?^?I? ??$?y?}N4.?goj?4???u??[?X?8;?`1T?????s>????v??rn????8I?=9??sQJ????

??????a?]et?~?|;/m??$?I?????%
3??!?Te?4?????qC??"P?sa?C
??4??(??
?\??	O???? %[??G
?i??e????T4?L44
???????r5?xU?K?#1??????|???3?????)???$?El?a???Pmj?U???{?>?????A3?????????(??????r?bmh?????-??h??jbf9??m???M????B??(,T??B?????vs%??????R\??a???l???
?,0???<jGtu??>x?????Gv??7rx?:?/3??0S)?
A?R?=4k??hgS??#ev??f?C0.?moE???????mL	??	?^???Ka???{?????y??q&???o??C??y???]???TUUUQUUUUUUU?????:O??y????a??y+F????L?$?q?N??7p?j4??A??".?|n4?c?!
????>?Zb?????)??|???qG)?3?g?F ???`??g??W??vD?*??????/])?'??>Q\??? MD?`}?pZoh?[????S{??????R??????K\mZ7M?
:?5@?\??fz#???\?;?????o)??.z?xJ??W??YU:_FL?0????P????[???f?#?P2?)?j5$?b????
??o&?U??F~b,??I|????>????k??3PN??/'??CO??d?/????????E?$??f??ME?#XY?E?s??@??&?	?	?{ %?????di6??M=?e??N3??l??? ???g???????;r?????J??uH????|Tk?*s>???t????f	??M?3Y??xZ???z?DWd?1^Q??????3 ?????GB???,??T3?V?Z????v~??]??????Y!?U'5???G?/?
???0????
?Fu:
?8?HH?
?f??w??J??I??4S??3?ed??t~?\-??46&?W0????Al??????"R?_n??[???	????4W??/"Z]??%l^??p?????:OBq????F????(?R?????Z,

yCF???24X????????f`B?x???0????????We??U|o?mO??w??????u????&n00??????r=?
 n?k?-o+?\8??vW?
?N???I??p}?q??4????Dhh????"W?}]c?J??p?????[?S
????????????pA[?2?????`???????;X))??/t?I?L[?????????????????*?????????*?????????????/?????o?8?????n??j????#?F??Q????f?????{'=u0?@)8p0?7?oGN?U?o~%oF????*
:??c<?i?!?B?W??A??a?
?0?'J?????+?[??W;??'4?????;r?????{?????????]I??????x?d?E?????l???=t???r???$?w?f?k??????X???L>?URUr
????}t??[??G??0?&??c?&wof;u=??U???u7H73?Ut???]??????????V?6????d@:H?~????X?????i???`gpc0Bv?Ql???>???
2???i?b_???y|
??????o8?Y?A?????I??6??z3w?4????
?h2???aRPU?(=V??6?QK_???g??|??????v??z?I%????@X?n???k???????g??fUu????K2Lk????p~8{?????mC$.2?0??d?b
?>???f?Y????u????oc?-q?b????Gc??????~|??On??????A??&W??s?vs???Fq?:?
?]?uU'?.0??`???{hr??|yx??RQ*??r??cu?<:??5???!2cw???4\\"?8?i#???U????9U??.???'??0?v??$???????2????4?#P????6??????Q
????\L??Q
|???6????q?????uKD?Z?
??9???h?7?????????*
?? JL?=????|[Z????F?[?^??#Q??)??l???9JTM?????=???/.9^e\?t??J?B>??]	?w??4G?|*VsJ&?B?z?EJt?Q???ZyR?????0c??8?u\]G?Z%??????(:PG????r?????w?xI?
???|YfJ???n?U"?T(?o?ws??A??U?B???????????&??B???0??m??????????k?7b?W?a?\???A??q?$?????>?$Jz???G??????(?)<?f4X9#?S???f`v7?B??r???i????G?G??F??U??2???'?0??^???K?.??R??????Y??q0|s?sL???	??4???@?????z??L???"?Z&?U?eJ??T?????1U??
?????8?7?3?v???T/ ?|z???????I
?/??????w??J/???I?i??
??lz?9?e??lUg?U??F?=r???????l??]?:6w??W#??A????^S"?Q???ki??;w?P?7
????Cs??l?j#?r]6?=G4u??!|J????
??.4????^?
JC?g??A??C_??=CG?????????d-?o.Mi??!1?N???K???????N?d???u&???z6?L???"?X?+A?F{P???4?????90yM?|F????g??T;?????????????1
??????U??_???????????	!s?"?1?@4:?xt[?p?s??ec????/??%C?=.?????(?HQV?ueM????-?~~%=?w	?H*,??
??l?r???)?{?8?9'?[??+4??X[??t
??k?,?H???0M3^????!??{?O%???!?? ??]???O???3+????}?i?k??|$?b?B????-i{?]T?SUEH????M?????=?'g?Q??.O??@?#?.????u?w?a?W6?y????TA?O?8?????/???;\;ew????cM?=???;
6?
(Ud???2S???U???{???????g?/uK?g?????<W???z?rV?OH??O??????a????L?d?YuH?>??Y?I???O4?hwOl|?|???|???{?:??????3?s2????583?{???x?;?
????Y??{??6??L??f7^??i??q>????s0q??K?34??????f??@M?z`"@S
???0 at M)
"Rf
f?K	}?	?w?;?!?qD1?z?]?????T3|?g??????b?????????????????H~???6am?.35q??p??x?P???o?5?????????8??`?R?S?5'??????????FYN?X??x`???????4???K?_Ns???c5????J?????lg???W6{?????;?E^?|0w???????S+'Fq??y????Y????????;t?K?3?x~<g?s?O?:??K??v???<?e?\'l??;?y?????@b??M\?	X??G???Y?????????8????0??h????E?2t?Z???9?ad??????C?u??[????m?[z?????EF???_?Y?2???#???w
?Gt????1?7???;???;??}|?e?F[??5Q?????5?????3?
8
D9?r???;???/?
w???m??B???f???;R$??)?$?Q|?>??R????N??x??R?cy&?$???N?t??Hos?
??<L?????*?^a?]n??8q???TV!?O?:???i??f?????#?83?`???g???z???U???<???b?#1???z???Z]??.Ss???7? ?r?????x?f.?C??V~(r??fE???4?LMF??5?a?????"H?y??8}?F?~?[&ek?q?%#KB?2	?{?r7?E?????.?x???J??.<????0\??g:??W?????????? gi??????%e?????>????zhu??3Z?m????n|!??i?+<?\
3
b|???ci?[?4Y?????+??6??I	>?|?g!???G??N?m???(?M???D?^??M?
f?]Ls?P|?????????H~?#Z1?rOY???I ??A????????????>?
???????{G? V???}L?pg???0????__?D/2??!?h??s(????i?fq?J???J??[
4v???+?FB??f?(??_?%?v??hp?+?|{??#?Dg????[v?k??S$AX?????ag????????L?$?????8"??j??M????"n?i??>?,k??????,???A?7^?3???`?$`+W?w?10???????R?? 6>
???YKM?,?H??.?i?yh??????j????	?_O??T??0???7????T!?(?9rhSgd?1???N?zc9?V?_N???4??<?|??XX?$%?1(#C??q?E???mAe?+??OG?2?	?,}??[
DD1w?]??&\@??mk?q?j??;???X?U"?e?`??s}~[???????L???/1\6#;k??l?Sm?<h	l?3pT2???b????
\jxr????W5X?z}??{??ICWh?
B ?*???F?T?????P?t?K?????o?7?????d??^??????RP:?J????7J>_b????&?_7CEE!???????r?"???@?F????????F??o???:g???????wA?5???;e??_id?Y???s
\??????U?J?BG^?k??UUf???D)?
TEI?2????U??/????t??9?,??v?q;?UA'?l?Y?)????R=?????{S?l?034??r;8???5??t???N??(T?g?f?)??!G?#?EKpD???=W???1??
)??N?1?_L??E??????C??J.sJ
Y??R?
???:???0:???:???D{G???n?\U?#+?zK?x?;???_y?~????\???L\????_????d???#??nm+~?
??]?????6?????7????y??n????2T??\c?Le,??S???H????}???V?%;?GJ4??w+??????????%h?????6f?W?1??#?1??J?X??<f??+=??%??G????5?d????9?|?|q???g?>)???Fq?8??f????/?89j[??7???T??(!9?V???D???V?mY???~?k?.????cBL????f????6?%W>???g?"G????? ??R?Iu8n???rnZ?@?"???y$??3d}*?-?DDyG?mF?_??=?EKI???g??tu'???|???[??3?vM?52a+?/?~}??f`???u????Rf? ???NV}??Y?L?vue??y?)????1??????k1?,?>W?
??m?d"???fbm??+%\c???r#L?????i???????????m`??K??']Ng??R?zmx%??l?7?,q????$??????1xi???=?6]_??????
?????*????????uW??}?;?????v?}?u)?1???Ru??F??a??? $???~??l????e?bZh	w`??cG????_<C??C?W?x???'?????_????w?????cj??,l????p???12\??2?3
Z??aRD?UC?L???iui
)?2u :?!0??p???X???JT?#s??E41 Q???????????i(????T?????fS@IIJMQD???A????????Y?;7D6<??m?
Q$J?C?!?.`?[D??0??_3:"$J
.y???9F????r$&o??vc??????1b?t?1?U?]1???(??(???L(??
??t][??V???tBR???
?
???????n????????Y?HS9QP@?ZU???n???}???????	$?1u-J??B?UT?J??F?UU,????
UUR?J??F)UUK1J??A?UUH5*???UU#5*??km???????;3????(??)
??i??

feK??wW\????x???S7???^????Oo^???????uu???=??<???<=?=C?	??k?????:??g???????32a	h?=-?????????=????{S?d?-?MS?? ?=??v???????" ??*????~???N??
l??(??	???KT?AS^??u????}?g????????q?????/tL?31?3w??????>~??y9?????{?Y?{??w??}?zs?{????uw??????>,??????8?~??(~n-?U`?Yw?z9Nm????????9?? ????zl??VY????lc????2?j??0?\(????h?P??$?5?r^?(R*p??!
??Y>+:bWU???????n_e?s?_???f?>???? R???
UUR1J??Y?UUR????UUR?33,??H???????wwu2
8w??f!?????-???fJ?UMS?"??Z?UT?*??b?UT?L??5*???UT?R????UUR?m??G?>'??????}?wV???????
6 z?<???E4?????G???????`??????y??A??x???C?^?7wi?[?
@?F%??!
??(?N@???
?4p???|????_???T? M???n~W/??W,??o?
i????8?M|????X:?0"ua?6N:??:z???!X ("??+?&???????Ie$?????c?f?~?K??O????@??mg???IID!??y 4???^???aY?X??#??w^?]dX????
;R?????+??cnJc?$???3?xq??????P,|?"???Fh6?N?????Q????C?#?T??
?w?7???}???3b???~U???8?h??E
??a?????9*?S??~???	??U%Ri?6,f??'
?X!?]?g?y?F???K?	??v'?????m??Zf?ZmL??=?2b
??r???j?U???Q?!??R?q
BmA??u??
??U^}4?T??;|d
U?5?G??[????????rPe??I?w???????G???(?????3???,?6??{C??v?~?p?????i???>????UL
????ck?C?Q<O'?2~?K?H-??0???????{?x *I??)ymA??5x?????????$???f???*???r??G??? ???????8???C??wa??????r????L????s?|????????J	??]x?
?`dce?}?????6??"??TRx[
???C?L&???gwM
?>Xw~?l??<?C@?CE$M1A?
">?8?dX{z?
????tdE?????nX]?[? ?@??u??f~?. I?h|???*?>??s??`????)i"? ?m??IASs1????\??v?V?+???I???#????{l9??w?U?GZ?t{'?wE?y??]?????~w??z?2L$?>t?p??ze???Z??U?
??Dk??jM????80P-?bm(%?D!-?X??!?G|"P?._)???t??-?????OI??0X???	6%???E????n?>e???ddn??^]tc a???7??&sZ@??????@?l???{.?,??????d????:?C?A??L?{Ou??:?k??8r&?C??
?xX??D????8?u?,H?r???Sk?3???$?????I
x?]
?

>YB<??#??L???!?=??H?(???p"~,_?E6?Z???5?_7S&)l`X?s?A??$??-n?AWh????R???B??????^V=
??Cl??k????
?L??	G7????51T??????!?pZ?DS???q????kodX????7`? p?dN???v????1?????@??H?)?Ma??S??py?i??H9%?a??C?-??O????4?/?O????N??A?? M?>k?!????wO?????????G1???=???c}l?U???
.'w????|{E???\?<O?????M??-??|??????{&?|M??7?FP?G??
??M1?????JR"??????(???r?CO?~^_??Ql??z???C?:*Ww????6??.???T?+`?Oy??]?????y??/6?e????v?????co`????;[T?D?????!???p?|/?l2~?%??V???M??}Y??Rz6j??Z?#?9I????oZ5?U.???u???d9I???Z??YV?v?&?<????????
r????y?2{un??t???g/9????{?bb0??@????F?p?w?z|???????v???????D??????lh??y??>?K??X_e?F?])???&Q?CqiM?Waf?????0Z?6R??????tWgW??????G????E?M???v?w????z??L}???jq??|?SZo>??B?c???????Vyi????#?t???!x???IV{??&?????m??R?d?????J????!KwW"?;}??????????GR????<~i>???-K???m????,<M???=P??mw???DRN?????vv'B}?U????q????.S?r:W????0??S+???:????????x?5?3cUs?RxF9??????`1?????3??L^8??=?
?.????5&?1f??t?
???2o???????Su#?Y?)%\[??+??X??V?T8?*?<?c!??^???y??tMi???????????'v?.?&?????w
??G/???????sy?J4??????*n???s?C?????3t?,I???!??A?p)??a?koGC??f??I??7W]?{??W??????????=????m????q???L??Q??????2f??????
E??C????????i<zu?l5b??~__A??i??S?y????^??????????S???=?n>?k?t	7?N,KN?????o???5l???????\WW7
?VC??-?m(s??\S}??|=U1N?z"???e?y?C?&?|l?g????@}??4??
?dvf?B???
??m??	8n?????????C??d???-?m??:??1?HMse?tZZ1??????&?O??6i+?!??\O"?f???
kf1?z?q?Z?[?7c;c?x??????W?<
gi?j5???]?k
???????eq????&???{ry<???????ww?te?xr\O??Js\e??????.V?1^?????YV??i?????q????$/?Z???<pm6??8V??=1??u??????????Q??7?r6x?7!W_?}P?????p?zA?????w	m??????Q?????n??l?fO?&5?y??
????"??o??+???c|-?-?9?H?^>~?gS?=????g?V??WT?
?e??????;?R????K}EXi?\$y%\yz!?????F??~ON4??liW??????8?|?P?r?5?R????5??eo???A???B8?Nl????[?????=6?ze??t?F???0?@??+?,c?q?U?iU?_N??%?`g???????"	?'??}u????]9????mrj????8*#?=?4"?<_??w	???S???I#d^????C?_T?I??YvU?^Uh???IR`"?????????0X{?k????V??#D^??(?s??:?3???D????'#??K?7??2>?=2?S????|????o????}'M?NZ????????0WS??V??K??y1??U?????}w0??l?_??^H?x???U???Y??????1
?+1????r???~,??A?*???]
'3cQ/?R??P4?|:?r?????y>~?sp?[??j~?rU}P?\-?(??????*?2?>?]???????O?=0uUi!hM?_
??^???m????u?<}??-???8??9S?????e?+7?F??s????m ???G}g/???{2??y?b?w??im?<\??????]?l?E}?y??#??_??_w_??
?{!P????5???%?y?<??E?p??K4]?S?g[w???yI????9????]0???0??|??de5
'L??????$??A?q??F?*.?l?w?2??W?
]????@???0??:???'S??y??|fRX??T%?>]hy?????u3y????9??9?1Zz?gY?R??.??n??=Jn?WI?R??????q?????Q?z>???????
?????????G????oa??1???k????yO{w?-?????s?}?[?ma$??SF?F2???M@
0???q1<? ?e?Q????????G?????5Y???lOmMQ'????V?S?????s??Y?C?P??v?????N????????c????y?A2p???9t??l?F(i????

n??7d??2???C?>?????@?E??u@????YH??????m??F?k??Tz)V???T?eo???????5):N?A5????x?????x????O;n???m????z???v????(?x?R?U[?iP???1?JBB?{?[kNva??s.7????j?Q??<,????m:t?Q?U"B?9??>??!???0?26???\?B???]]?W^SZ?z?Lf?i;??]??5?w???????&zoX??Lk???1??>?????????U?#??jl???dx???f"???i??R?F6C]{??q?p??R?k???<?????-??o???<??F??R??N?o?'+z???$???o?X?????RM?[?h3GwS????DDy??Z???f??o.?Z??!???????i?d-d???3?m%2???q??);??????%?6??iw5?:Qs?e??T?j?Rs?(u?8W?j??'?????5??~n?????jz?t??M(??	?=9??!?]_]w???}?y:???q???QUw??}m???????dj?1M?N?E?n?B?$???;??o1??\m{<Ij?5??/%?jf%V?W?y]?_]v????1Hp??[S95g
???]9?x??m??3??=??&???.0p?:.~???O??U?~???v?m?0??q??*?'O?>??as?????????k?????????-?~D?$?;??Z?r4????E?4	@??w=?c@@????ii?J??5L??uQ???R??\??k<?i???k???????7=??N?pZ??2????5??????d??>?t?n?Q?z??x[?4??nk[???n??????:#z+?N???*?{?-w{?E6Z[????c?<???W
??^?@CHv>kN????c86w,????n??}G.?xl*?dj???
??S?]??R???fX3
H
?~N????z???
P?6??5?v?$ca?o?I|?k?`\?"D?J?????X??1???""?#G
*?
d??2'??8?8?S?!??bJX)%d
U?.8?R?+HRcH?R??????hV???R?
??2h @???`Rh&??`?V
?
?*
$??$??"b*"@`?!?R?Jb")?*J)(I???(bm?
???
?????QIRb???	H?D2???+Fj?:???B$
$d???h????
?%
`9??e?Y?E-H?L?IMP at E?PPQ3T?EP?DRR????&????s R???P1?$??@h?q,\???
??2???2?B??,????i??j??4W,E?VV?&?Jh?g0d0&??,??? ???:0????$?&Y?(L??ELZ?a?L?
???5??h?0?L??*?N???P???r##Di?,??$??3Y8a??8???h??p!j?&
?F"?i??!"+????DafT9???yX??'?E ??$`??$Nf1??"??L?2,D????i?b???Z?? ??X?0tvR?6?cNH?74I?Q?,+?(?"??I
?C,""?KJ+Y4?UE(?0? 1?0??E?De??0??c5?P?*????Pl?3L??m??????Nf?Ipo??L???qZ1A??? ??|?h'E9??}???O?\?%TQ??W??u?JX??:?Q?b??y?_j*?????(y???s#?4kk???"?T?)2?
????Q????64da"?.?$??e?f[g_?3x??0??"31???Q??????T?FQe???=??G8?w?E.?n??&>?9S??Va"2?4???k????????Fx??9?$<???p???Uk?R?3$?z??????????A"?^a?c?c?????a?Q;,
I?(d?-?????#Y?$?Y\	??aLj	????(??????'?4??w?^?saTEE?
$??G?b??%?q?`??
???2?P@#?????@y?	
??`??Z0??v?RU?V?=??a+[??"?A>PK5(+?J?1
?N?4)???LR?S?
DJ;O(2Zh?O?????[???6??J?)?9?6K?4?d3?aT?3 at R?P`?a!???!?Eq?Wv? ??@?Pz??O???i???
jH??)?)?(X??(? ?H%$??8???G?????,???i0??=L?w
?=
?3a"?k????4H.H`?4e???-`'?Q?????y?h????0?]@??%??3??H8 ?aP????a4VP????f??;?mc? ?+C?????P?rA"W?r?|m????C????????_????q?	?B(??&}???@???S??h??|???PC%?Cgkq/?>O??4?[??G?~?9?R?????????????a!?i??]y-Eu?"t?J?I??7dC??:Ix???;'\?\??4-%n?h?>K.gt
?J???@???j"$?>c?????RsJX???6i
????(d?;??=?????'Q9?m ?_??+w??????>\6?)?H???L?B?{???(?U?61?P?P??rs^?????????v?X??v??{??4pS??rC?1??W???c?????????????@???"|,?(}??o???N???????
^_mk,/1y???????a?yq???qo???g1????s??k9?^bt??g"?MR??W???g8?]?5?]^2<?^???????>?B????7??w?|?cN??????t?j??gO??????j??1???S?cY?S?s?cU??1??Z???V0g7X?rN1?1y???:?#???1?o?d??K?????]E?????z???M???/?\k5?p??
Cl?TB??f??[
X??"?@???????>}(??????Y??,?|?????q?`a?6?K???%O???uwQ??O???nV??N??f#	}??w?@?u??Z_??g:}]?}0??i)??c???wX&PMe???????4?s?#?
??k?f??D?;??6????8???<???h0???+9????????????????=??!R?ya?? KT}i??????h?Xb??#??"?!?2??D??L?????2??{;?MnM$=3???jzy??px?]????.???????%?
"y0z>??=??!0YD?B(??$
EQ#"?(?A?EQD??"?(?@(EQD?"?(?A?EQ#1????????jj??????jo?]??5??????>????jc???D??????9??????????????!???:???^N-]???}~	????=????3??|?c???!B?
??H=?4gt???v?a ??e[??_??m?0???????4?????[??;?????????'?r??E???EQT?ES????(?1??OW???????M?????n^??(?M??j^??Im????g???????2,??E@??????s
?;?-??s?y?}^?q??
???????uj??*:?,?;g1??yr???????U;<????L??\'????<?L??z?%I???, ??????????.`??tW??`>?UzoZ?>^???????z????33+33ff,??Fff,??K33ff`??????330Fff????????b0F1?XU+vE??EW????m????Q\??.???MY???z?>L?A?z?7j?Gp????q?BK????P?????67=?!3q????d??v??????BJ_????9??Y?????\jHI%'E#r?S???\+O9J????{u???E191e?c?L?a?
?3y?c??h??g?N??????E?<????A?
?8??'?????!?y*??T?*?????t???? ??)b???dZ?\???????.iv3?????@????r??9?46?Hu???j??M6????A????9:???v?X<????4?Rh?V??,.??$?Dk?v
????XT8=%
#?J?~????????/x?;?????????D???/?F
\>???|$????cKu?
u?2w?z!^??W??I????#????
g76?}8?mBN???	Yp??>G??????????-?y{7????|?X<??E??A:????'??????mj?'?????h???W???*???(
??D?+?2?!EP=???O??a`q?]xB??yagUlcP0?Z??h`??X?????????9m???;?[??????ND???E??gP????i??{?o?}??'B?i???x???\F??is??Sh?l?~??6???)?I???*@?e????d?0???????Xr????????'Y[?'At??4>?f?j?(m?Fn??I???-?F?K
D??IL?}????I*?[u?n???,????D1?????]l?7 ]g?l??????^d?[L5??{w?!R??.?U?3Y=???\?????\??5g?[W???0Y'4"MG?+???w
?6p7X????w?,?>??70?ko?5????;+?????7KP???????~r??P??fx??h3???m<Z?yYQ?=v?A$4P??j%a#??????d!s?H?Vk|f?8j8???B??f???#?cg?(c????L???(]???????5??9?Y???9?b
?$?
?hHF??????a?"??PaQd8????Kv|"+?4???H???c&9????lPF?Y?)>4i?????
^S?????K?j!?4??????????@?????
vhX[?m??K?g%???r??)U,?????????:?B?Ff`????g?????F|a_????????Y|????n??"G?:p??L`X?<?94c]|???6?ro???H???y?n?
P?vZ'????J???xln\!???????=??C??@p/??\??????f????<?I???s?3?}5U?M?S2,yY??h????-???aX??nH?|?7??^j5?v???B?6???R)b??????#S??;h?K	?=M<{?FcZ???
?k?U?
EUUQUU@?UT
EUUP~	?O???????o?7?m??&?[7i=????znZ??????Hv?L???oq?:??7g?e^SF???%}?????o??%.? U;????%?wx?+??9)?U??/+?@??????WZ?S????(a$E
?	?
?KM??Bh??H?j?"a???`I?4?y?q?F3l{j??

|{?{????????c????J??y?'y???r~?bwoA???A???1@??p>a??X?D????~?? ~@?N}?y?x,?8D@?R?i|{UW?aG???????$G??*7???? )??>??#?i?~?p?pD??% qH?$P??K??=I??Y??7:61?!??T?m???V1????????2R?/b?D at gc??*??rF?<?@??w)???j?b(ii$????y?3?6??LFA?7?????Q
L	0?G?L?>??L???"??BS?]a
???]p1?%??????Db?"%1?5eq???5Q???NM?????A?qEz:???$??std?M?53???8V??C?????
?w?!TW??1]???F F?^$8ar
.?7?4?F?8J????f?!FO+?]?6??(?q?|GL?H??R??L;?|4?Z?F
???n??`??0W???f?MU?
}#?Q??o?d???0q??-N{?G??w<m???:???n???y |?X;e??k??G??2?=??A???5????rT?,??y????J?d???J?wm??I????????????RV#??x???W??,???.[:=I+?????^ ?????:S??03Ab?0??Bx=0???????sZ?GK?V9_??U?A?C f:??hp?[?k???Qpb?b?;u*\~]??n???
???s?D?f????&?l??u???5??\}??2^7???g+6??Y?'^K????9???S????cw?>?E?*S??R?M?j=?U^?jEF
?K%?
?+{gV?%???W'X???C?n????pG??R?B?
${???f????M??W??????\?]??`?&??Qm?TR?=?g?F???m???E???X??????y?x?+J????/?m??0?6O?Z>?????;?m???z???QG6{?.?DN1??X,??>?bX??????OH?Oz?????[??i??c???a?3?&????*)???????/
(???)??????Z?h?4I?g?????3???4?????S??,3?C????P?[???5S?O?u?6SM?k??	??Rz??*??/????}??????4V??>?o???1???=_h?<?S??y???k[??rO}???????z<??vAl????8E??????????q?????9?2??&MR??4*??<?D#???o?Le?Y?H??<}?????????nO?p?&?1(@???????}[5VG?M???A?}0P?s??V<???????Vv????	?	?y:H??s9?X!)sZn?d????t????Y2,????B??o?OM???*??????9ag?C??GU???+?K??"zk?}?'???wY??l?fS ???/?%0?f?q??6?t
????Dc??#X&	(B???	??~\U
bb	??>??
>?@K}kH??~T?`??EN?9?????
T2?c,dy?!N(3l?R7?W?~????	??????;{?}y?={????tJ=]O?^??????9+?;_?????
??e]UYd*??EN?1????]u????U???q?????????1Es2?o???<M??{A>p??^~Z???????????&??i+??9o??bG??-???V5??y3W?????BR?a:??y+`h?/??Wk??Ll??Uz^?:??F?a???|e??S?|-?
6?????cu?6]?????V?	Z?O?V?rK???o????O??uU?7??????JV?q???kJ??fR??????3]????r???G?????%??w?	?h?x2u?3;/cy?$<M_|v?0?'!u?<#?????????nW|bd9?????.'?1???'????
L???:??g???czy?C?0?U?8??A????:???????g?w3K_??_?a???I?&????(??o?,qv?????>??????????i??&|nux???y ?bH??rJZS?
C at S????uh?O__?$?:2wt?
?,+D?mGa?EXM?(?????
?qN??
?5?B?&zb??d?E?I?)?e?|??g?????vW?a4??	K[m?????hi??k???iV??Gq;?"1??1???xcssp???????????ClV???	M??i??N?61???G?"i??M?u??I?????.i????8???<?I?u`V1??DT?&(i?%???]w?Nb????????????;S.Y??Dc??7r/G????mu;3??y;?5?]??kGS????00???????+???
???D,?????F?I???f?g???+r?[?????81??)?Mv??G#????}Uxi??ox'-?P?cB\;??????;???{????7??tvMn?[?%??.?q0????
$???J?6????jjCoZ#g????7|??02???
??!"?O?_??????"J)??}Ds08P%?H????????????>???????[D?oz???c~?M??0I?`?1M???????&?8?Q?8??7??_?? ?0X?1?^?
??o??b????~?@?I$???t?c??#???:??????
>????X?????UUUUU$?I$??_???,??>?Q
??z?A?k[s(nz?|?31?e]3r???C
y??~??{??m??	??v?qB?????*???a?~????????`e$?2^?3{?ae??@UE
??d??A??x;'A?=]??G'?!??!Rq;+???"'???? /g????xVJg??G?or?qs`'0??Ye&0?????V????$??{??W?o??????38M??????????X`(?p?(
MS??????&?=????^2^0??o?
Ue???+??9?+{????k???(i?
+D$?&??u?X?1????gJ???2fm?`?5???.]????q<?E?3L???1??(0?$#9~??tz?|????????M??L)?a?l$tU^?v??htHnzGu?4C???????????c33$?f,????Fff33???331ff ?????????330KF???+I????JH??D?IH?"5???	"D??
H%$?j?P?) I$?) DD??H????bbhix4??KmC?????
VZ????K@?'?<4y@f?8???	2@??c??;2L?!6>?6?q???y????a? ??1(?"????eKL/q?&????4o%
#?	}qo?h?????y'1??Z????B??{N9??=????I$?HI$?H?I&a??0?Xa?%?a?Y??ff
???ff`???q???;???z??~?^y??c?1?b????????????&???I????j???????&???Hb???&b???&c????9??Pa?,]?5?JfLa<0?<m?)H?1?H?9?3333???????31,??33
?"??????	:????
<!???J5(#b??????w????9?????t?v??????o??V*?;6??,???HM?_???tr?z????/????L;?&
	?????kZ?p?B??B4?*??|?8!?bi?h??L?*??"???"?#,?$???B??u??a?h??@H??????I?????{?{???	!0 at r;x???:?|	.1!??????xfI????N+?
H%$6????$+A???;v?w
+??????8q?-Uw?!??p?*?pj	j~8??"????????;J?Bs?????M?G~??????????3n1??|?C!?????}<=?9$$?H??\?AI?
$?r?!$RE?q?,?l??%??jc+??$?$R@?)"l8?DY?"H?"VDI???DY?e??H?
?Y$
??:?b?(??(??)????1???E?j?1|?zdxPZZ<?Q??K??!;??????q?T??4H0f?
??;???????1???????ajIOS?g|i???m??J????s????s?5???K?U??S=%??X??NX?D??<?il?f?
?r?
??^???<>]????????&?????^?]n:???|6U?N??(???X????ad
????o??r??k?????P???6????J?6}??*?^}|??q??^?????V? S?W????????]?????9?~5U??????0v``J?3?y?-P!???????a??3?F?O*"? 9
F??As??%r?.??7?s??j??-JU@??ws?\?"???Q?;?:?g????+??W?
V?8?$F??5t??2??V/6?????o???a'\/
??5zan8U?FK?e?? )d??(??F???O-w?{?oU??_??*?w}?c?d?g?????]N???pq???~+???Zw?4???I??A?F_9?I?????#?HIBHI%??i?w???????!+*???4i??r?3B_K??D?tL(???e???q??%?hsT at 8??s@?~??
1c??????]?0?????Mi?=?S0;??zh{?????m?C????h????g????i???K?????Ah\nd?l??Pm1}?y??
]???v6???V?t?N??n0>lLk?'??)???'?<?z?cV?q&? xqG??M???,S?b??e#N
?du?:???|w??F?????U??-?"p?sv[P??>l4??????s?Yn4??@?;3?a?????????k?D(c??O?:?????????
~?1T>?O?BP???RW?5_K???#?i	&???????E8??A??W7?????HGT"M?????????^=	|?????????d<?????,??????O<z????Z?_|?h??"?p??\!?b?????Kj?%!???????W????}?W??e??f????????b?,% M??V????)F????*???{>??sL5+?J???^Z?V?3???\?J?V??
%?c?`??:?V?y???k?Gy?F,A??????1??-]U[?+??????d#?61??}n??Bj?%???1?????+?]tI??pv??6?bf?~??_mH???c[sJ??,???~????h_????7?fM???? UFv'????}?`V??F~^Y????E!~?
?1????	3????N??R?A2???v?7$????
?????0)?G????L??$A??vj"?npY??o7!???????G}|???o???1????????j$/v?(;?F??Xj??CP??(?U?!???D?
$RB?Pdw?x?uW#r?"
?I??|Y?F?$?????????A??)??#v?????{H?o?v???r???R-??Z?i????&}&N]?}?.????2???????3????}?%%?y?A????f.?H?qOPF?s?75????
??s
$??????????t{??F?"?%?B?[?
.?D?????/?L???Y?l?[@n???{!????Lo?Mv?6??????V?@H??s)\??? ?????$
?H???N???h9??B?s6jp?H[
]'???L,?r???t??}??M:HHm???HX?s+??Gf;0?F?????$???B??(?
?o???w?Y? ???'G@?oNkaH????@	$^??[?????p?????R?
???dZ????{???????l?rio????????:<????????????D?SU^??{bf`|?????b?(??(????"???O?????
V??]
???#?pj)@???M&J??0!??Z1u?)@<?&?-??
??q??jz,/?F?Y?1E?????zMu(z??&?	
O???-??wHP???ab?)?s??C??g?qS?"Y?I.~a????0?????"???3?g<?rf??H???X?%)?w?{)?hF????????1?_Y??'??)w??????#i>??h?>,.?.N?7^?B?ik?Q????Mg/?$?2????[?
P???W?e'??s>Out?9?L?D?`?3?tx????w?k?:???2}?i??+)?.8??Dq?Z4?K?i*????$?	?j??;qg?4?
?c?????0?#?f?5??????]??-r$???"???q?Mae??>-f??tC???$>+~????~? )??*K?4A???????N???h??c?
?4??
????P??/Q?C????f?
9A???y????o?[?_??^?f?_??"1???4??g?8??????W?,?(?~?,???{???w?!????bS???2?u?@??????|?>(?~X}??9???iG?e4?gC???gh??n?#J?x?DH?h1?<?v?*?|???Nj_~? ????u?q|?y?n?393K??!=???;|hq?|4?=*?????*????MS??H??R9?32??????S?\?????b?????I{?}??
?o????_?k?Y???????6?a3t*-?F?3337_?Dc??y?p?v??]??Rn?9C????]u????CKiCW
1Z???mb?*??_??
`??vHZL??n???????
?I~#??&r?Y??-0T??{???7??5?f???5/!??BS???
??nc`gc???
?#?6???y??8d0?+@????WK<??????q6?.?2BV??r???????}n?Ll4??
(Y?K8>#F'??????{?j?1??s?_ ??X?C5???z??~xC??6????????}'?????|??!lN4????s?c????,??g??????~
???UHUHP?}}KR?[!|'(F	?m<?)=%u0J@'????????s??>{?a??c?H?q+$x???????Ww???+9????_??]??????6?X~\u???
n?K???_???X??W?/#?\i?@?+J?\?????O?<g?!c??? u????@??E????F????$r?%?^?????u?L??
<????8????Z????i???qw?????^?@?V1x
!?-?%?B????7?+?wq-m
4????3???n??9?e?J-wR????6?OCi1??_?????
?hq????1?
?v??qG,t??g??$v~??f\95??~TM??RP[?p?I??j
?<c??Vw_?f?O]?{16Z???|*?IT???4?2??d??>??j??Plllll{!!	O?q?r?-??mA?(w~r?
??`??yk7?d????9??9BD???"W?	??%?xx??	???'M??????_[???X??Nb?i/???k?????:???????!Tn??	??U2???J	???????:J2????$?o	??071??|??a??N?????????????o??????{/?????Nz????/Q/X?????E!v??p/?wk?>??f??df ????=??Z????V?z<b???/'Mp E?K??xUL,<??}?CJB??	
3?BvN%??3WN.~????????
T?????`?Tv???el*?*?M??K??????jdz??fk????}(y?;?uz?q?w????
V?BL;?????C7?34??N?
p\/rs??8???o4????D?s
?P?j?????6B?????O?;?}??:???6V?N??e5%b9?fd???
???)??A?fsr???	??Hsq?qe4?MJ 
A???T?
5?p?i]?3?G'2??l5:?
?Y?(w(S?{??n??(h????.??\????????????L??I??m;??1??9Z?s?]#1?d????B??(H3
`???s??:????M????LD?E??DF????:?%???dY?	?2I?Y?r???JN???A/bE2?3?}?z???w??u?????~TY??&X@?1A3?f?z$?q?F?%(????D????5?sS????Mk??r??3??#q+????$K?\??^o??)??i?g~??4?TD?2?>??r??4??^??,,?o?w??+?I???l???O[??C??Dn??0C$???^?I?;???????Z?][33????=?=w??	E!5=??3?,??UoZ?6sN??X??????Ek??? ZO?5??.c???????>T	?Q<?lJ?????????5?Y??f??
?GI?????uA1UW>?v?????.???0N?UIL?w4`?,>c?X??????S???L?l~	?`?3?n+?
@??[?`?p?????rs??7<??/????????9??????q?bz??9?]c?Sw?????h@???l????M????I3&??L^+????`f???{????]?????0?????gbXe??q??????s?%?aUUH??s??9?q????w?????T???Km'?????????a???b??Z?2?6?h?z??????????\3??, C=S?@7?????p?.kPH@|??ofac??fc:X?9???????au?Ke!?`@F?6???q?3hs)???K6^???e?p?\oO??0???????c?Y10q?t??*??=??Z q??}
?5[?B?o?
???-?c?2B??K???>???B??
?I?t?(m?E????<`???<????;???F2?????_Z??8???U??c?!^?C??o???of??????????]??
??g?{\?7X?W??:????V??*?#???????+T?<?w`????????f>:K?~????.?
]T	x?46????kH?????g??vk???????L?
?4?
?[?ri4y?6?o6???m?Z?`??O?zNC?????6|\?????/????????f+?????"OM??1??*7?*????|I????x6????X????u?tfJ????xG??m??.3??S}?(zc???^^n????????{?z?z/{??e+??????u2^^???a??vLa?Li'??v8v??g??l???z@?X?^8?$?????I
E???"???Z?p?	j???wRB?:???8?\{???Y?2%k?
??????????)X??"p4jX?^3?n'	???!?G~rU?*b^@??
?|???
4?DN??SE??d?H?B??I$?I(?1?]?k??????*?`T??-??k=?'???p?k?9]'??1?\]??k??[?m?U2?g??{9??r?d??,!?[??F??=dm??????;??5?;%?7N??S??R?xXHG?m?M????$"?F??c?gT?V}]Q??cb??b?C?X?????W6?m?DZ?#??[??nB?>?yA??6o?]s?WA?g?[?pI?\a\k???[???9??????$?W^?(?;????]??<??g?L=?????4G???Em??=??[?va?U?h:h?H?x?*
B4??v???;F??*????#??}7?B???@J??D)??p???K?gs?`>?b???e?g+\??O*y?G???3[??D% R??y??wi?*?*?,??[?N???}%?MN????s??:CRZ????x?]??<?*???J?!?6?q??aE?C<u???UIV?l???f^???????v?b??0~2??????=??wU?'^b{!?0?{`?i@AB ???D???????{???i?I?G23?)RK?3??6|????0????(??h?]*W??<?$?[a?o??????n??0?9P??W?c_Dw?Q???	g'?%???UU???D???????+;?T\I?M??<?2?K?)????^???rAo at KR?v???*?^?f??? #?}?s???)??e}Q9f??*=jn?Y5;NN??!?l?	???m{S7 ?Vv?D!'?Bo????5??%
?o???PE9?CryQB?N<R
????v??vh??????&?G???V25?d'??????W#?n?Tt??krI?I??:???????'|5Y.+??????U?]RW??*?D|?Q?um??=d?j????-???Q???8?V??t?)?5x?a???]?|m????f?.???Fsta(?{???!7\??U?3?"??+?B?6H%??M?|??E?????6????_?}?,u??w~?|1?G?F???[?Pi?x?w?:N?c?4??+??v#
?kE????]??5??p?v?`?@?6?j????$???(??
$???l`&7(?kny?c??????{
?#?,?8??n.?w??[?????T??T;?UU&????E??UL5Zy??Z?o?8????z?k?pZUK??cr5?S?\z!
?~???8?K!Z	??S??>V??f??~????WV?B?WB0,W?]q??0??s????%7(???dC^?\???N6U????w$?I4???J=1#I?Y?UL??edyaN????p??H?{^J?W:?zO?????*??
??M???q?]#.?ra?0?????????????6???k?ey??"%V???U@?d???3?+?:4L?#^?U_Sa??????|J?????L???
????????????z??}tE??K??78??;????~?????&???*r??P?N?D?~??+?M?Y?A1??\?wI???1?????	??mf????=_??
?Pfm????g2@;??x?G????????66??B???Z???W;?z????i?k??}~???????e??$SI??Z??N$'????_???h??(H?	???A??Z???EZ2?6?g&?S?t???i??2I$WG2wi?????sQW?*E???D?)#?D????=Rf?9y)??\G?o??f?1C?r?U?|???\?#
?SV9
???`<?????????|?ubh6VZu?g?y	?????6?|?$??<R??ZZ&U??????V???
?????x?h??I?R?'?j??&?????A??|?????I{??0??? H??!??F(?x????!?eUO?_????????
??d8fW?????4n??l?g-\X??Z??s????????WB?m	??Nx?[4??A)??5=??(????Ua???????????F????m??j???%*??:?6?=P$t??C???wA9?	?s????B}1??.L???N_T????tK???Y.xm?????k,????H???P???Xm?1?[dMcS????e ,????A]??1?d?b?4]e???40?
L?V????'??pM4?z+??x????(?????z??3?hNd?5?q|ll??Tn?.?}(Z??@m ?<?Eoa??Z???H]?????w??B?????]-[?$?C9?'??	y8?p??T???.O?v?X?o&.?irb??/Xt\???&n]a(?	$?W at L???????v>M3?:????EQk??-{`??j?M6?^?{?????:Qf??{ ??
"e?t?????6??????V?Vx?c??"sK$??G?Nn?x:??tA<??y??P
8?[?????#??#P???a??y??).??/{>????n??r ??Jf?6????i???+6????VhZq}??M?K??6[;k=?l0???,@??O?K?{???????r?s_?p??i:.???C??Q?0?b?4????7-??????/??S?1??*V??UY??#4{'???.zr4;>??k+?i?ov??????c???:????]?KF??j???^???a?:?h?z;5??Y??o??kx?A???_?0??B	??!%?$?)@?q?h??N-?2??NrrO?_??/???r_?WX!??S??o?4?_??:????????o?r???w?
????1??i?????????Y?R6?0??#Y???FNN?x? ??iiP?c?
\!h<??F??2?????[?}??I????=?O??e?mt?AD?i??	????? E}?????E}?????_?e?????'???h??xv???&?z???L"zHb?H?a}#???????Y#?ft?n??W?L4???????????-??F?)???id?"I??D??&??"?? ?????????*
???%"??@?G??XJ?X? ??N???
?is?	N?l?????j???0???&!????o?ZLy???#????8?Xh:$?=#?C??`)V?(?&)??????h_??m?!|?L:???8=?	?L??0??NfF%?5)?$HE?4V?]??+?.cc6B??
?t???wb??9??{??!??????
?????m
["???}?L?&?h????0;hL(?fd????q[?N~#C???vv?s|Q?=?HHL???dZHfi????:????????e??vm
???|?y?*/><z%_??[.T?.??????????(??e)vO(F????`'??G??E?s??kO?7??!???Q?9???????
????w.???O??s^???????HI$?"
?}-??Q?????CN??W#?????(?
S??	???)?>

????,	?	?@J????[?,??????v|?'D?%????H?M
?i?????$;4?e"?????.???"F??a?P
@??w??6\?_?
?7D=
?"h???Ea?-???1?{???????63??i?)?P?+PD?????b?8???K??QC???Me??y???@?et?A7>?d3
???>o?{G

?????5?&B
 C???m?}?		1e??? ??N8v?4#?GQ,(%33dS?
?$??
EFQ?z????vw@?????
???????w
z???Ph???]?q?6kV?fi?y??Od?{???u?j9?ga?"&???#?????d?q
H??Q?U?
??,??2??<??@?{N?OrL#}b???????M????\?G?]??8l?`???#3???f??s
??f?7kG

KBPr!??]?G?3???^???????$??$?RBI$?ca???\??s???KCu"xOyDU-LF(7????,?D??:??6???`??P?7???,	????]4?]????????~n/??P??"$?
V&!????O?h?y?Z????
??o?????	???3?@-*!k?{7,?{?_????A/
??u_?]f????m??
 	w??n?y,?k&??)??o???xs?z?<?N?R F??G??np??????????@IDL?D5????????(8????6??????L?????6"zA????"?I?]OH'P?s????C?????\_??*?????B5?I5?$????_?l+f
????:?P	??c????%i
@B?5????h?
???C?	??B?O??_???????????on??@?q~=?;?"???
?????????x?as???j_v5v6??b????W??c?S?7u?o?]?wNXK?9??D??~???N????????cl??
{?|?w~/???UUUUZ???~?_???}u?m?G?'2??????(<`???????G?q?0?YH?z??c@???t?]Oo???;T???5??$Lp?;?!?~?8I??{G??nC + ??6?4't?P?Up??r?Au??&!?OWR?-?,/???`
???"tsn?\
?6H`(?d
????T!
>?=~?3????	PK'?!8?'B???7???}??m[??}?k?r?yC?!?????V?1C??[n?*t?h
p@^?+??h!???Zh???????Bab!UUMrfSIB?a*y?{?t1?x??Rn
)V?v??"$???????P<`K\?????_?
?O???i?j???????p,
?_r??"??0cp&????????!?;bw??C3
??._?????;?w ;?x&Hr3c???}???HR?\???w?????Ta4???h
J?`???`|???????3B???0?
?
8O???~?r0?8?A?&5L?_??
??#?????46??8??3f&"?????k;?Z0??#?
???s2??&?s?????
??`
B??ST-??f??t@?T?
:?4
?B??}??bjYbB??;c??/_??,?\???
r??????$5@??M??pz????Y??|"?_K??{?Z?Z,M?	?uR`H08#+?6????@D?
?=???EG??M?z????9~????K?}????a?e?.??
?V?P???z???X@?C?$?H??B??
T?
?(???+?e?*?\?'8h?[
?y??	@?N$???,P$
?x?}da?
?9????:" ??d??=?J?#???0?!??jO???{s??????0}????????y=??Cd???[D??-??B
?C???(E??4??R?y?E?QC?!?????????????J???b???`??%?:???N??j!?{??
?A?#Hoq U?U"Y??????????|??a_v?;^???H?)??	??7?xiFqP?E?u?79????q?H1`?$9
???.^P-?p%
??b???=? ?dn?6??
acB???i9??2?E~?????w0c
???:???C<?G??dE????? ?Y???A???J???D?i???x?n}?#?P?????.?S?9
"<??P?8?pW	?`??=;??????????????Z???/???7n35??
_??:?1?P^
 ????
???1[0?	MCp\??????!
86e?????c???.?+q?8y?sb???H'?u??hk?????r?\@???{> ?d?Az@??h?H?b ?X?????n??t???6H
????"
?"b??Z?tN??i??
??^r??r??p? ?p??>cB
*?<l?q?vg??C?) "-`??;v?????D{)?M,
??KV4?I?%?????h?c??O?p?aX???;`?HM?%"`?I?????<??vb;?|???
?)???B?QUQA?P?2
	?(>9???s?M?`E,?fVc?(0$?"?w
?b????"???3?
6A?4?5
?$??.?&??	?@I??????
??
?9?J?~C??JX?.????"I?????????e?FYh???v??6????@???I/?wr????H?KB,U
#???I
J?F????^??]K?]???k}C?5D\?N???Q??\???w?=!?E?}?z#>??!??3??/Q?o}u(??om?@??$

5??D??/'???mu~?@UT4(??7?
???o??
????g??,
????????1?`???????LT+?/??? c&?P??%
`cX:&??v???N*???????$??1???o??????6P?ju?f?i}?"???
?????L??N?\l???????iJR????fq#N?i0????????B\??8u???;??????6???????
?y?Xr?}*}????Q???i?????????M????R???^`N??N??????!?
????)???P?TKt???????R
 (??d??J????:0??qF???$D;?,][?t????!"/?????OI??;`H?????I?l}??@f?|
?^?-
?
W??Z,p*A9ZAQ4?A?ny)????X???
???J?R?B???IUA?????V??#%?
5?\)?
H???"?%t't~(?????q??	?@]??????+?PwD3.?%????&
4(i?evO????-??j
>?????
1?C???H?|?ThB???	
??F?l
GB?E???
?L?;?4@B??8?OgGw??? ' ???
&??O4?H$e????'A&o???
Ly?3F?c???o??Q7g?y?e????G???w`?????< <?S?R??n???;??t?$??WH?m??JT??Q?L?GH>? kpO^?!?? ?0"	??P?T?M^????'??;??R??a?v?_?C?
?9?^??.-)_Ve??~?E??n
??6<?VJJ????%?"?R?VB??U?????f	P&
??k?X.??.?B
0?G?P
?`tx:%=?c???N ?@?`?
?.?A/w
[????
s
=??q0N???n??@/o?U9????>?&II(?T?/?g??
?n?	1
?n?j@,?????O???*?0?e?]?+????G??g???F1??n?Z?_??1n|d?%
????[X?j,
?}EUc4S???6?z?U????7??Y|?VOq??6?
$?/?~?H????m??k??U-????@?(E??}?#\b??g?=??? ?
T?Q??=_&]3??Ax?????P?P?{?PP?D?L??Q?z/?r?zO???L`??+?HQ????U??{>
??????I????
??????e??J ??[#w?????_?e^??!C?W8?]?b?????+??J???tg??[7u??????????sF??*^?.????
'Ol??b?f??]??????@L????n??M?L?L
??E
A%)KGt
?*u??4	(8???@?n???
?)@?@JN?4o?"RY?f
A?B0????"_?L=????G??!
%s7M1=A??;3,A?lu????0?A	%??z?
u??????
0/Q??eCA??zark???I?x???!?*[??!2LCLD??i?C?|??V?????tI???J	
b??yV?
?j@qJ?[,I?n?
L??1??09(~?????	?!?????G?????????u????lj??b?"G???;3U?)b?????n??P0R???w??k??a????????evYUt?S???,-??}??6???=|??i?yI)!a??????$?u??h	??
aU???????EgC?F???D?sH?r(% ????,???'??????Y?:~?f~?A??E{?uB2?k?c?,??????R??g??a?????$:hLK??!?
4
<u????9??mA?????r??6d??0?!Q?@?
?????@??7oA?1x?6oT??t?J??
????&
A??kPy??`.?`^????
g???f????j??7]??(+???????
K`$????`????Ao
0,A?O??}_?}??~????
(????C??'??A????z?9??
Z?!D??`}?Hh??Q?|??????	?B; ?E5?zJ???K??
e?3?H6z????m????jL???Pb?C.?Ntg?1s?M?H???????A??N?????????@??t???????#?i??????t+?CQ?(	c`
4(w?P?H??d???bDZH??9O9T??@?&@ba?"r?K???2?????v??
?'6???????????X?-??B0
?31K(?$H?G$6?[B8,z8????CBH??{?????T??	(???e????w?h?$AB[
?C?QC_??Z?U?dy??0!??3D??"y<4n??4/PH#???My??? 7#?r??3??
??????{`??C???t ?4C???'???^???D???O\$[(????r?*
????6D"?W???i?????
??
r`L?????????q??3???|?ne.f_N/???
Q?g??I,t?[/?|?p?DW???Ga??
.????F??2?h??Fe[?I?r?R??W???[????=?HS??cr?
?J ??V????	
????E?
??a????`0??C
?9?????hN?IQ????7.*?? ??
H??K??I???9>?@???#?7K??0	B?R?<c?gF?P???vz?H%(?qHnO?M?????? u
??#?????[+?@??QJ at J7??
z???p$??Q?yfInN+3Q?"?????????@7
{????P???)?]?S??
???/??y?
X??U?_
:z??V?U??1A????/mD??i????]???T-L?&?-m??F??I???k?nu?lz?93{?s3>???mST?aet??SUUU?!?UUUUSUUUUUUTE?~V??]\??q???}?RIE??&'Q?NM?SR??8????R3?????[???8??{I?/j?????>????'???	BPro????c_NfZ7????p?????X]?V?z?3wQi?'J|?kg??3?WF;???6:[???e?CT??&?!??C???
??s??0a??e<???0m?H???%?,?G?OLd???
??
??vj???
Y?0????Q???????)?2(??f ??DE?s?kQb??b?A??0v?0?>
?L?u????hz??3P??AI#`???B?bMo????GgU?9????v ??>n@?,"uyA)T???T?C??'
DCRH??V??o)
????@Q?<A#?N??}???4eI?D???m&t??jY???!?98_???????*?"d???
?/
-?L8?J???f???n3V??c?????Q??C?1??dP????????????f?,?????
??)?.??l?	5b)????1?P????~???"?$52?7???G?;V??e{_??s#O:??S!?jH????#V
)i[??C??"???p a7????tz?PON
w???bh-???eSE6p?L????????
M???-??C?G0??????}%?g??-??2?!??6?,??1?i??^?Z?dc?B???????????V_??2??`?z?I??Zc?a?u?U??{ ???yfc?n????~C???????wz??=?U;?? ??2??[$?x????I??2W`???6Z??/^????}???v	?"???,?<?ME?|^???g????E??S??!?j??0??f?_??kPD????Cp?h??5?*t?&??]l?"?
3x?0??
A???2'??C
?R`??&??????????F_?$?<?
??
?K??g??
?nE?!????d??S"*;@?x*??W?C?jk
?&Hp?Dv>M???? 0?<YL(0 ???8y@f?
"'0~??Sv8f?@
NB at H<???=
?,?D??nWA?x~?u???z
rUI?*?4/???*????Y?BHBla2??z?'w?N$?n*?,????/??P??!r*S???????? G?DW??y??!?Wr?>A
?q?r<E??????:???=??v???@?wn???@=?0k?I2v???/?8:?P???U,
@H at B????~=(?*????D?'[2'?h"???.?T2H??p??????A???1R1??44j	?,?/
??i
?{F1?%??*?MR?'?J????iD?I
??CX[Q??U?$???I?6?4?a

(??"???EE`??t?;)?Qvf?KPb???????
?'N?????!?????@?1?v???????????????}?|%7**????!4pW???A??????????+??C?
?	o???P???\?c?!??lagD????|???H? w???P? 
??bN1???dr?86???????????B?????_??5???#T???lP~@+)????c
??5?\ky??)???????,????$??(u? ?T
??Q??0<?/??}=?ss???3? ?7???6A??)3&?(???[E?????M???N???f?L
S? ??#?}<I-??v????O$A? ?%?&q;X?1D??1???r? ??`?????'L$n?j??[]#q1&3?p?????q`J??????
?Y?????i??;?n?cg???s????F????R6e?I?oQ???J\Kl?f??BNqy??
?
?????u1(????????&?????????CX-??T@?as"??
:Hw????4=??t???URE9)7 ??
0???a
????CS????g??F??Hn	??"????	o{?;?,?x 6?0c?/T>']t????????????I!
????s1????G??
?E?' ?: ?+?A_?of}???3}?c?3U?? ?3?J?V?d???1?0????8#!tT8?A	??E??0?!"?ik???Q?D?ZN$?J)??!??IAAO6Z?!?i??i?T???`d?M;??J1Q??H?$i? ???*n ?
hFG??n
???????l?q
M:3N?4A?d ?4NTNTFI?*<u?q ?????%	BP?%	D?%	BP?%	Bf?L?d?$CF?Td@?
F?A???FJ?	??K?%RU???????$2???R???????????????????*??????UU??UU#UUT?T?UUUUVA?UT?EU?UUR1"TUT?????*?
?????+?H??	??
?7??2\"!2?2
???=???8???????"???UC????s???h????\?Wqj0k?.Xq`d#?S???p????s?????k?% ?K?t
?(??.?;&?g?@DR???B??? ????T???@??"?'q?W:?
?"?,WP??-??o???`.	
??.?!?\
?Z?
?????X????N????2???A7?bR;$?l@?P???D????????i -$?UG? ?A?UF!?	

D-	? ?c??m?+@???N???#
Gb
?(???s?	 f???'??wC??
?;?'????v!s?????+j\?=RJ"???????+??P????1P??????a???\????~???????|???F?%?B>??CoE??Xn?F?D?u#???CMf??:{????G?a??71???u???QP??N"\RA??h??9
???4$K??????????*=?DA^?8^?
??bx??'??????I$'
?gTu???:~?2?0??????H????B?@??C??????gD?
??&?cQ???i0????;y?|???=Q`pGP?1-????{H?t???C&aL??}*;8`???>??????=?b!Ik?????Z???????W??F?????j?I$?????R2???oz??>Et$!?&??????Q??Mk???{???wM?C??????x*?n?t?up]?????Qwq?????]?v?wsv???m?op??x?#?D{?<?1~?B?xA,w??S?????R~???[?????(?uI????????Fs?J	V???X7?bU????[|?s{M?"kw?????2;?0??n(((?W?y?f?
d??S?????PM??K%?1Q??? ??????*
??V??@???BDR?????l???E?V?
%[:?! j???T???SY3}?????ZRk?kY+???x??
vn????=?]?R??.n9?????	??v?X? >!?o?fa??I?:????V????,?????.?@?QD??A`M?;C?<?	??C?@??&?T6???f?!??{?/Xv?b?1???pNq?8?s5

?c0k?r??k{?t?fC\?o
??
???~g!???"?[M=H??$>???E?I??e-?A?(a2?W	??5?T?!`N??wD??
?"?/??L???Z?
?@?~&C?P?P?I?+?f?)?A?
?a??dg???T??
?E?G	?`$0?	?&b?]26?dRi??]?(?vJ )??J

#D????p:*????a??1??F1??1?~ssq??Sa??1?iM?3??Vsq??0??F1?iA??Lc???X??1?i@????Y??1?DaJ?>1???9???<?n?-??p ??H!???a'?H?2&0????A>6	?f??G?N?>???{???????IfikP??7??zM?^N?:d????N???>???:?`?
10aATG5?#0,????a?c??4<?3z???s7M??EEQETETU&	?UUX=E?}]?A??C?~_c?FF?p?A?AA?u????c?E!?????v??w???j????????~^>?]%6.Q?I_???,?w>a???
??A???y?(???c+ d'?!???????'??}?@}Dl{?????R!b?K??^7V4???YrT3?;D
?X?TStR??? `)d????5?Gr'?????~<}6????c<???(J???x????<`?B?Y%@??9c???^??
??%???
?l#{??u?.E???l???q?G????????b9?b?d?w@?'
`???@??MwP?$ ??????T???^??
?
#?v6??o??fa?(???!#?\O_??-???T????'??E?:I?Io\q?W;*??,j{?6'????????
*Z???J??
HW at s??bh???k?C?/?~???????>R?????7?2?.XH??????M4??K7??
8\???4??/???9???o?/?{B?}??????'??A?t?=\fH??~????+O,I"M
??:N????nV?!???oq? 9????%?W?@Oh`??=??b}?S??'`?X{?????W?q#B?t??4?.??v?i????n?XE?%Q@?]???w??????	O??#?Sav--:tI?$??TQ>?:?:?????DQ?IL?3!???????$yO??
?@?}???`???f???otE}0}???N?p]???'?BQ???G?-K?3???????y?.???1:UE?B*?~?????<??>B????C???J'?Q?JO??|C??????_k?q?????t????(
B?"?Dw?OD?5
`|b?4?J1???:???z???/?=+? ???i??c?Bk%,?U??S??t????@?AYt	???m??7??Q????4?(? N???Lk??w???`#L??5???C9M??c?8???&z>?y7?x?????A "h?=????J|N??/j?A??[&i?Q???F7?
??8???Gw?????(?	!????}?O?r???/?m????l??uF??w??I??e???+??? BcR$??
$
=??<?e????9`??]XX ?&
??_?5?f??Z	?*?fr?!?@?t
?G????|gw?U?S??T??I]?k????/??<$?H}36??????????z??????;=9[?Mtc??E?????6?v/????????e???w5??k??>??3232??????=}????333?ET?L??32?33#324T?w??[??332L??L??L??327?????'??y?{??332L??L??L??nw????n??a?H?q??k?????f[m?Im?I'X?????&b3333$??????.#3332I????l??33-??????ff#32?????R???ff[^?V?mff#32????>?
?;j\ff#32?w???hp??m?3??????	m?5`n???m9??ffw???1%~@yy?I???7u??????1?b\-????@`*???'?F?~*1?,???&??0?m?????G?Y???P?????!!zO?]}??????	+|???\3a?j?A??1??:{?G??{,?$o?g ??a?????t??????4?e?wD?t???x?f?!??4?T`?!???P?`^?>S?o??{?u?q?3?&??v???d???????E?C?7???1	p?(p?a????X?????#5?o???:9y(??o??[s?c??xDrp?#?>NA{??)?g?????^*'?????LV/Fm?O?SF8Q????HI6/?M????jJ?{?????Pk-?????~T??jRq\???Od.????? ?5x???????Z?t?
???;??I#+??=V??e????????{????QE???o?:!&o??)CX_?????")?8????'??!????????????6??????nu??L?+????A??=H7?4?E$#??\???????????#rF?P?9#r~ay8??????~??	?a?]?a:?+???????zF??
?g???I??$??t??e?r??O
?; r??&=?,9????
??8Z6?0n??a6?5S?h1?L????d)?}?????B?f?!???w??s?????"M?r?????a??G??oI????@??)]=??2?????????>,??>??pN?z???>?Vp???s?????n??rI??m??a???Y???t??:c?Kb??9?@?;??M?rLDs?4D?g?9?b??
?????pP?,?s???(??u?nh?.??N???N
?2?4B6E?8	d?FL?P"V5??q8r???]?'?.?Y?Y?V8?:J????{}???????$??@?7????<O?d??p???S???'??(??;?????l??i?DPRS!U????

hHZ????l?`,n^(B?'???	??@8D??$r???!??A!x&X|???	3?3???U???7[nc?<??0?u55"l??n ??? 	*'?OL?x?)??????:?v3??R?Bo?7?C???`?"0;????{?Ehli?U:1???pH??P ????
=??5?????8/Q?:?a?a??z???$?c:?!?sFoS????+<???U?T:
?i??(????8??????.{?????"j???l????+????C?-EA?????`C??%?TL?5?H:????2??y????ZfjILW??'??~k??????Y?\???
!F??j?'ZYK\??:?????^k????=H??B???RI$????#?m?!?b???????R>??????R2h(s??P8?;?e???(??\????8!??_4?=???Y?]y6wq??&)??????;F`.w?Ye? ??Hc???E?????5?'E?b?
r?E?y??!???_`???e???>?^;W?ZN?-3Vs?y?eZq???S?????'?36?
[???&i	?0e??v??!?q.E
"?b9>,(C
??5?F???????@8 @?Fa??M????8?
:-?@??"Tj??D??M?!a????0??)\1;?6???
A?r?0???#???H???o???dw??????V?I??a?72
??}??w?
]??(?,?wd?Rx
$;???	]?`n?cBJ?w
?WI??????3???
T@??r?H?;
4?1?3L6?-?
?T????K????H`?i?*+l??P2>Yy??9@???
??????T??o?7??????????6BH???M5???
0 ??{?}G????d??l???v????-?r????
,r?nL???????jI^>0?O at vt}@k????i??????{{?Fs??C?I??7D?RPv??l?!????N????J?6??????zt??3?w?R0]4?i???'f7"r???2 |??]??h~?~?M;<??}`P ?d|E?:"?KWE`V?? @f5k?l?&k.G??>?4wa??
???M4aU|?*~?%??0?h???lu?5Z~??
?GO????????????hD?C??ft????*???-??????9h???L?????MF:???v?W^9??U??B??Bv??<????~
?
f?b
?[d!?4
A??Is???G??T0?'
}????U?>?04??y????=?L@???H&?%?aX?Ya?0?!?$j??????W?;s_3?!|?W??Fv'?mD?'%???*?q?A9N[?A%Y	I??9??}
??????6????g65?-???6??2`?RM0??#?p!"?
?)=It++?U??!E
9??????rm??U???^?S?Q0~?N[?8?D??????1?M?g?8[???2??????qp??V?Qhu6?'?Ha??<?9f
?(?????=<???k?s??Q???b???I??%(?T?j???hD at D??1C!36W??O??f?U{?G1cSMf??? ?|????=???>	?W??s:M??2	?}????(?5g???7I7?P?p????G????{D?Q.?,?$?f]W&<???V?:!?(?A@?"?m:??8??i???N<??????>1?
3k?4{???@?%x??I??^6??c????????e?-?ev??et??Y?,Letn??v???????????>5++?Tk1%??^?X?p?#??H?X?f?\p$D*?q????Q?#????>??R?+?????? ]????:?Ce2p&3??
??P?y???O?
Q7???]? ?P\2F? ?i~??UT?Ev?????D?l!???,T???O??????6Uxe??`Ra?r????*?"??????,,??
;?W~d???t(??N?
2?)*????7???#K??I?| KZ?g9???J?	a?ZP?wI?UEJ?<(?????;z?z????7k_?????Y?0r%?	???(?G?F?N??I??x>n)!"???p???w?,????!<zC?;??7?L|
??^^D?qD?x??????xZ??N&??u?????????????$6{?u??HD???/!?&??87h??H?]??u{I	'Q?=zI??????8{?ob03?????C??n?\ 0?r, ??$),?2'???#Y???*R??C?
?Qy
????RI?????f??hp??&?Q??????	???F1?+????????a
?e???H?#??F?Z
????=???????+u?%)??px?,(????@?$2nq??]???)?y4?qUTOz??E4?)??????Tt`?z?y
D3 at U??????N?3{?????wo?Y?:?1vS?p???5?@RIE?Xi?O"?""i??@???H??2?s22???85?
(???,?!???$?$!??m?*q?6`?1??uH??1S??I????i!?z??????????v???p*5?????S-?`o?!2N??zP??v?d??'?;?ZJ???(?
J*?<Cf?'G`?>??V??a?????y
?M??af9??L:?$!?Pt/./????(U???V???
2?VHDI?5?}o????<???vg??m?KD?Q-ER?x!??dK?
?@(]???????'??????W?U]??	?4E????????g?????E"_y?A?e4)????E???%_L}[???K]????bbC??-#????{?h?kt?
EK?"?F?
D?D?AB{???NH?d???:m??T???*?vt?4B?J?0????F?hI?b\)?#??????}?C?g???
???a?I??\#???MEa???EE???????1420???\
???"????d?C)%?''?q???|?#? ???e??@wC?:?d???>O??J??a?F??zM?ZH?O?qd?FU$Q??c????????S??O????G?4?H??q?	???7?????Q??t2o?????????^????(?8?????VO?
tS??zs?~?IJJ?????
/X?|^?????Z
??r??gl
q???0=RF&"	??A?????s?0-Q?I?_???5rN>W8?hm?,???qC?????1Fld?T?b?.??yM????Xno%?NiFq??x"m?6?j&(???=2!?r*?p|???????1?$n???+?@??(??L7GmB????????`???C?u??)?O??N?N_???;??8Y?E2++??7???"B"?
G?
?q,B4?B?!???E???.?????
????&????Q???:(?a?????~^?4(8K? ?!d?4
H?y!?

R at SH)KA?<?????/???1?E??!j?A*????2
F???)?*%?4??\?p/??!Ekp R?l??X???XeHw?o8C?s??????U]?\&b?
4HQd?F?f??dSd????H"?????8|M???C????)???????@??|?7??\?<????"{#?q;????w??r??)T4?R%'zY??| rR??Z%??????C??????hp?	F?k?~|W???rw??g?|
5?
?
??zB???
yT-??
+?-I? ??#?s???pI???o?9?v??&P0??a?????/?L@?H8?q\???a??4D
.,d?l???8??EBK"A,A
$??;"024K?:(5?[18??(U(L?2????B??D
*(??,??Db?nL???4?Ho?i1??}?r:s\?l?
???|Kb[?1?:m????4b0dcD???k	?d?E;???|?+SX??q-6??Zd???~??!?K??}.??@"r?v???cl?85
l???H???%w????B?R?U???TD2BE	?)'???`B??$??"=]k?????\ ?*?[?c1???jq?x.
?l??????????? ?I???]-3?O<:'/???_??
??m?;a???$ah?us]h???????0???^tRf
?f?+6??,\?j?^?'.??p?\s?hP?(A?`5?2B?Dv?u#?P???????S??#??
?
`??
???%<O??KAk??2c?_?*<3??wy??7????q?	?&6$V???S?U?)X??c??\???h??:q_???WBw??H??O????~%PXD??(q??n{M ???/????P>?????P? ?^P??\c3,??,??6O????RQ?C??	??"$i??O:??z?????G?C?????P?E?>?7????3?h?C??;QS??)HA?K????=ZjF??z`?!%q'??N??	Y??Z??a?=f]D\????Q!???w?tm??6??-??????Iw???2V?08D?$b?A???|b'@<??z2?Y?
E????????-?????$"'??@Hs?U??9|V???|?k2?s?????x????Z?.n??Zr???0$0,4???
?&^?2p?+{Nk?fpetTn???\p?@?S??gB(J?>??
???4?Dco?E`Y?,?.????;j}'?????	??[?0h,?A??????^????J???G?<??:???z?.???RQ??Y?!??
?'????]????hi?^??	f?Fy?T?(v:_?H????5??P?hcCJ C?Mh;????&-#?x8"????????LmI??GY?^??L1????j???5?o????Ii??,?EMh?u?D?4?21???9?G,c?Q?c?'?ls4Qf?]?????Q???????R=?)<??<? )?T????,??IC->??@v?$??\?{????6??4?;fD?Z?V? ??+uPV|?
?M?UZ??????x?????m??ip??BC:h?f*Bj0Euw?D?x\?u???'??K?
?2? ;dH5??
~??{?Rc??ac??????|D???Z.-?M?????????R??d
??|?????En?P?J
*(?"(? "(???????V???3???Q?]??U?5?
?h,M?t??o^?1k?????'?\?;w?????R?
,Q$h@-nRX??W?+A?4D???(?D*R??@e?16??
 ????aP?"e?aD?8kR@%fa??XN?:H???,*
?Q?L?A:O|??t at 0??u??????uL??? ???4?j?c??R)???jr??4??d1?jy?l@A!B?&1E
?4??????:?|???7?8??&5L??????;as??LOb!"??y?SZcv?q>
??LQ??
?}Q.p???DU?D/?,J?L??mF`??2P ( "Z

?K?????$i??"\??)?B?????j?<?=??H?
??%X?kP"0G?W?B?4sHBl???b????
?A?r:j??p????9?Qj??????H	??H?x?x?~
	AT??TDA2Q???L?9?.8$V5??V???sX??1?&?(*R?J,M4QLC4?0
C?2???UCA?"????WL??
?L?n]??2
??%????%?V<???)???!0?1???@$V?b?D<q!????????U??;9???UQ??f??l???D?`
O?UV>?z????W???H???1i$?6L+X1D???z??t???????F?iY?5:??????\??1?w?i??R&??if	?j???Jf??"?
V??a??)???H?"?*?B?*(???*??$???"?????*???*??(?*????dbG??V
??GO<}VM???e?	d??9??f??Y??7????oU??l8?UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU\????( ?1?s|a?h?Z?i????aS????(??vF72???ov???????H@,h7v?
?A?@zy?g??FB1h?D?H[H???????K?#???Q?? ???S????B?U?"??7??Y7?k????UHa?,?:??????|?
?|?'C]?+?
	?k:?[t?M?Eh?S?????b?M#?A?f%?3_ &J???x(q?u?	x???f?A???V?@d|????Xw1{????Nn!c??I
???L?UADJ?4?ET"ly ?om?O???Y??	"/???????B\???j????A??#?(v?j
??gu?$ab?
3,?????????T??H?f?bXI?dwU?????????????,$!)G??3???7??l?T???hJ7??R?7*V???*
? G?,?F?X????go?D?[&?(D7?G??l??C?o?pI? P?B?A???????Q?B?
Xa?8?`P(???? B	?\&$??

I?kY??????z?!:? Br2??????????L?hK?<?{??o?8??:??f5D??p1?}????0?*??O?????7??K?T??1,??j!???4 ?DK??2?cP?????MT??l?[??6???D?"?r?V6 ?v??????????;t???(?Q?r!?T?L?b^?
?E?^?
??2OXR?????D8?R??
??(fH0c?T??&????I%h?"8b?A?b????{Z-x???????[8??????6v|L1?hF??!x??B36?D?????xb???@??
???g?s@?@j\????)?i?fb?F)??z?E??-I")? ????t?;??\??p?4f~??
;???1??
?*wB.?2`??N?'?
?s`K8???&?[h
3J?	??????????f<??9??F?uU??Y?]X
????w?	??3H??(????NM`?B??2??LG??$?JFpkM?pa??3Y?e
?-??c??>&??qlQ ?????p?^???@h
B??hq?AMsn??
?&@?Q{??a?;5X??	KPF??^Gt?i??5???,aF*4????????0?e??JMfu???e4;?!??V?$
L(??y?
?y???c?$?$DL?)BQ?p????-J5?F6??,bA^?
???.[?&???k?????M?l?????????$??f?y???N?c??7?&8Y?i0?p?V?|?(?y?????
pU+91FH?????B:?u??5??nzYnrkf
?e?[m?2Q
??B?9?r?n#q??8??b"ao????s.G\9????:I???:????????_nd>?T?}??0??@?@:y_i?*???H??????|?a?$M???
??$?J??l?|66W?4F?\j?l%J??"???pJH?$??????nrj ?
????F??n
)????)@?G????2?6???Fy?.??
}1V?\?-`???p^K??tC????4?G1????$???????O'?N?~?.S?da?|:?W??
??!????<??i=?????????L?{9E1BEH???B???????#X?XI??8?_???C?!??F<???l?@??S??m?a:???/(
Ad???w@????Z??Y???8???????????w>???EC#?r??{DZ?6???8?`???????????!(??RD}I'??
JT??'????V?2???0???3V?~AS?6?E??@??X at BD?#7!6G ??5MK?"?4)????&?WF??Atj>?E7?z??????q\;??<???^*??/&v`x?'??j???Q??|u#A??y???"????$?hn?d???T???.?,8?1??ob???x>1??!??J???m???[9!?)??~P?01?QqP??H?"(???2???"i???J?B??*?j???A?"12?`??|?:?yv??^????'?a?`?(4#?
???@?? ?b.??)L
48
68?D????Pz
:E??+3?
??LF??D??????lBS?; ??u/?<????G	?^?P???'???}L[??#@?:ic???E>T?T<]?URRt???|?z??Y^z???PC?:QF"5?B+2??a]k??a?^????v
.A??!B??R?>zG?
???????l???8!???q
?|)S?
???LN???????r
?q
?;???@???*?tm???????8?????
?????????]@?3??c?d??~??;$?O??Y????8??SH?#???=W?Z?????P?,?ORr?U?????4??0?oZ????c?6??????4??v"???"?H?R%??T???>?"I?D?&\?g???????j*"q[fm?????8????????CXN?9L?????	wO??R?	???L?o\M??????L?E? 50 .N?*???%?i??????&n?9??????n????2??????X????g?33=?0;!??Xv?:jx?#?&t??&?G'??92u?1?????q?<?w?	???Lp?s???y#']/?aw??? 3????,?????y??1|?H??K????f??Yi?cN?&??I?&????c.uIt!IL0?j?E??????E=?m5R?`?

??a?OU7??"??hV????????g?
??t?baG???D?8?h%C?CI2?1q&AA
4QIAAFZfi?X??i?A?0?% P?J?4??.?0u????wp?.?hI&^S?O7?@#ux? IL??a??]?????7,???D????|??J?<F??j????_cs??k]?%???b??????A??cL??^jX?}??0???????
?[??	?p??lF]???d?!t`?C?i??
<?m??Ov?KK@???j?9?x!???S?;?ym?+???JX?B????????m}?????Wg?@???v?
???Bn?',?s<T?;?G??@4y?d?=????~T?1???????u]v?;?YP??W?!v??2;????X???V??VF????x)?(w?	&??0?V????
L?p?-?j?????q?????j?wn&Gi^?MJ?`?+]?f?3?vjh??(???$?w2?A??K5N?f??2????3?o1#U???p5N??4???\Q??C?s???D???}1?8Z?????S??N?O?sB?????b??D????L??o'$s??h??m??a??C????w?M??????????m?qD?I???????????G?????c??C????!1??!??O
<`~#{??????2?k????h
&?p?????e???u?u???6?Xpb)C?@??????c?O?JF?(B;~??.???%?1???]??
?A??L??,4?3Y??-?
???zr?'$?s3s?????&???0??????Am82??0???-
?e?t$????r"u??]B?I?t???6??<???v?CK???R]0kf?=T?Q6/P??!o5;? ??W?/?+?p????0?#???*wE???v??a????1?UJ?????\?a?????#1?n^???X?o1???????M^???*?J)1J!sP&?ko-??u?`???9	???????IVY	e
?0?0<???	p,"?$i2M????{~???Wy?3?????6?????T?v;	?&8?>R=? ?q??Pr?;e?,"?j??2???'??"????2v??q0??&??xX???M-Fx3?xoKn??%v??%T?x}KLd????=????H??d?P????????!????M???0?pg???w?????VT?L?????????????-??%?????kw????p??|;????b1?f%I??n|?????r??qW?:8 ?l?S?l??f?0??C?f3?p?+(??
?Nd5??3?l??p???Alr??!.??R??q??5??5=\?7?.0????^.???{??????D?E]?T????
n?W&???A???]+?r,??h`(?N_?qA
IH?b?b?6??$???}?A?'??'???89?[[???4??HG???0n???zch??["?T???@???
`??????1??B)?i???h??\3?%?Sx????%??a6?????1?-C?L??Q?S?SP???o)?Y???EI?0`??1O??1$??M>?3??B96g??c???
???=?.St??4yR?I?A?f???2????A???,??1t`6
?????p#??I?(-x!??6?0??7?x?r<H??!
????9?c?????
?\?B?Hib???F??O	?D?f?????*??S?1?b
??@u??????;?
??Gv$6?m:[x?v?K????u
2?|?$5????????????m??*@M???Y???:?G at L??I??%??9?B08?]?m?????A???(l??+???H0z???9?m%???RU]??????????I?=N?ET?
m{??<??A?3^ @??? ?u?"?B??J????^?v	)?##$??????F :??A?4SC
h?q?O?F???'Zp???0B??? 70@??d?hQ{?:Gd??
?@!?x?&b??(GT??Nt?FD??R??dc?"?
???G????$??<??&?u??0v
??RB?*?lD	?D?`,y? R??	??d|d??
\???C???@?
P?? $@L??"??{&??8?a??&
??%???^??N?`?2???M????
?r ?
??'??2??.?7???????t?L?
???1????N???Uk????t???j?]???$??]???gO/?zU????????r???^5:?????'>B?9??<???????
0gY??j1?????!?3L^w?A?%(??S}Js?M??a=?+?}????j9???????Y+R?kr???Z0R?"????=????}t??%=k?qM'??I?w??l`?i?I??t:d1
)p??Uq?o17?y?=?2??#???[?!?f?09???????K???A??h?I???????A??.8?0???{? ?B????cC????j?X0?????t???Y??BpbmF;(?????
C?D??Q?)?L6:r?m???I??'(?Q?o??h;????F????{??e????? ?a
?@X??%?f???????????5?7???d?v????h	????	!|l8?i?D?$pJ???c??9??????H]p3iV??0?4????`?????!?????????:0?.??*)eQl???_B?]C?	??*??A|?p?,?0% l ?k*p??"??Sx6e??j?8oL?4`??br@???#"??7?b!h(?^??v?^!??????y?"?/?P???k`L??~?zUH
B??E ]j?w?b*D??????????FS4?Z?5Q??? ??hj?w??k,??\?7f?'?(
m???????^???bj4B?(&????x?.??x?w???
$?Yi?a???tBAT?E_
?H	??0????f???"31Od??8FH????????Uy?=(LD2?L??z?<??U #s????K????
?"J%$43?Kt????
?aB%Zp?y?5u(?<?6?"???+7KkMHb??"@5?;?B???H??!?N!??44?L?Dy?aE
1?N*?4??/Z??#???	??6??	M
 ?S!LKA1/???u???Pr	|?p?@5C?z???+"????&?'???8Va4.?????
?~???
?/*????B???9?&???\&??2??f???@??z??_U??@?lC??b?i??i????H?<y????~>???V??

c??
@2L?%@G0U%
jda?]
???y????D???r&d??
<????
C2?0?TS]????SLL??*PT?LQ)KD?3$ED00A?v????rC??
!???*??z??
???{5??/jG??1??=F?R
???L#???J4?L??
n??-??y?r??1,?`?u;L9??jpQ??8F?qD?X???
	#'n_?r????}?/pQ?=cTD??????A4T?????:!?4?j%g~???i????????}v?????+?d2????c???i?k?0>?-?>?t?5?;!?1?.K?U6
?"???MoQ
?2??5??^D?p???@?????7Y{
8?Oj"??NL!?YL??c.
?????(?;???)?????r???m
B
?8?.??O?C?Fs???1?????a?????9E??h??????;
?rU????lh???P,2?$7A?$???# ?:&?????@#X?h]???0?B???kZ7[?{????Y?YE?r
?w??KVC???tH?[??R??
??`?? ?	2T?@??B?K? n
?n
&?6??O@???<?
?yyM4?????????.?E?=j?Vl
4??B???'?^??	??%T?{d???G1+N????????????@??WaN}?	?pd???@C<l6pe#????AC?@9dl??E&???^???1??$??????U??
??!?e'?N???>-??}E??Y?I?h1R"????i?N??????s?Ib#A?D?OgL;<?????^??????fG?Y?????kq{?g??????
,?w???;?n???Dy?h???!??????~?%?`??`?????5?#?v?O1??a?W?%??"*?A??I,K??!?i?!?w?5|n?F<8'>sy?Wl??[V?xZ/O???]?e?1
??f`t*??????A?D??|x??uGXL?i?\?Jq??\???Aj?ydg9C7yA"
?mVx?.!M??GQ?F?????B??D??$O?%?H%"C???P?nS???o??I??z8P????"???fY@?0A,???Z?X???*W??S???h#
5WN?	??p?r?E?&J?"9??XFe??_R/jL|W ?=?(?u?v?????????O???/??b?\?+?H? a(:Cb?B?V?i
'zfz?&???

6P?&??I&??>k??h?d???6?$???7mpcm?d3???>l??m??k??#???(???????EFH?7????F"?W&8u????V?	?F"??u?:??d?o2J!?PEPDdkFL?AN?`kM?A?'?&??E?Q??V????vGM?m?? P?Q?e?$"A(???Y?aa?B]??????wo?L?l??^??9?L+?c7:*?:?m??$,?9A???<Ora??Z?^?a
#	?R?C??5??PS?*Ds?w?^?H?>?A*??	(?"X?(*?Hv
?C??!??:Ni?Gr`?$??@m?46??_U
?E?	?????ePxv=CHzg$???nZF,?J?EL??E!`>?-uPu??z??
??h%????4??????}?I?A????o.X????????}??????a?}??
&??~??????@ 	VX#g??Q?)??"@?Os?Ny9
&@E ????6?M??J?L'???a????
?8?????,di?H%dll
?r?$l@? ?0?XQ?C?B/???}??????W?bw?@?ZIO???*t????i@???????9?!??G?|?????z?????B????????(?f???pk</??
H&u?yAd?@?F??7??F?????G?P??14?l/??;&??H?(???f??	UT?P)?B?R?J??.?Mj??0?b:F??#D?m??-O?H;On?	??2?udz{`t??Dy?A-b)T??f`?P%	????MP?)Ka at d?Tc at FYa???U?D????N???.1??f?h???4of??&!?qA8/?O.??*?3?&"?I
	?BN?13??(???H?T,iA5??	?t?????BiC??9?e(Hb '???!???????????"p???k?S`?G??=???'.???m????9?J?|??? ?
???6??
? /??????n?(*f??????m?h?>?C????rP.???'?K??fj|F??>K??\??1??b ?ty??Y2??Z???H?	`??)???.?`??????????????? R??M?P?A?>?x?^<????(??	u?
?mN?fELD?}?5?Ww ;N?y??b?>0P?!???L;U?1Aw)?)~^??JA?l?!Q?)?8????2q??`+7?? ???
??<s&?h??-B$?M??\?&???Ge`?t?n?Mt?4??
(9?d??I]z)?
?c4
??dX?H?=q-#H?{,??,??&_??>>A:<B
?!?n??t?<pwy??@?H"?o??
+?g+Xd?D"nAH?J?A<
???|?=?("c?G???I??I?V$??<C 8M??????6j	?[NQ?>??(???&	*?z<?p?p?J?9Z?0??V???)n????4C?
??"F?K??h???EV?x|??Cz?zL?!""(6??
UUwn?I(??6<?1?D?V?ho?
>:2M???6????=??I??????G?>?6?n0P??????R?????<#???%?@x?Q??rJ????~??????	Tp???	a????*?}l:?|e?????8?"???]???
?H+?:????K???pj?H??????eSBD??4??m@????a.@ AR2J???????
?)4??G?0???w:5??`cN?{>	?s?j
C#u
v9????????????D??x(fH?A0Q??pa??Y??,?75m
?e9?/g>???-????.ABQHVB?!M"QH?????
J?#??	??
C
E
"?H?B?	?&0{????????m???Q???n?@???D???@??
>&? ?Qp?????4?' ?@(??
?$@P?5??CP??omQ?s
???p??f??E<@?U|$??!a?r>?|?IR???h?S?????V~??f$??@N?????B?pG???<G??????p?????{????^.SBU?kF?0??{??(?AEQF??%????3N5?
U
?5`???DT??Yp??l???????	???{$???}Y]#???*@4??6?j?FE?f?TA?<???,?810CZ??h=cZcNp0??7?+??E],?D?F??`??IY
?le6?5?Q?????!-jB'\J??``?F?
tkc?4???*?
*????????J5eH
C?u?M???'ZQ6???@m?1!?(J	QY%:@KA????????1?WU8?Y4F??&?BMu???r?!?0h?>?3????o	????Y????m?e?P???&??6?TaSl???%?????p?8?7DZd"????(??(b1[4??? ???F???JL?
?oA?'g???????????{?M)
s6????v-J?Ti???w7??>?+?!r?h?]?I
)"@0K"?N8?c?#i
?U?hi1??Gh8Ea????H??>?f?b???????m??mW????>???}u4b%wX????vU?]?w?#mA????@?!B?.Sm??
?N?m???][?ff? w{?JR
B?
^???)???\??(?H0?(o Dq?Nz??4.???t??????	?l?{?V??T??H{%F &B?
P?JB-P??4??JT??4???*?R?R???1	T?
?P?HR4?O?f /??C??-jL????d$??L???????g???2FF2?,H? ?!v6??_	??PK@???$G????
???)?-9??0??1?'#????33?*?~??2B??????. &C??(?@?????d22?4a:?BE?P?V?m?J??"Q??4??e?LI????V?????$?*w???M4EUD?DR?S??
??T?o?Y?????o|6+??????P?L??	???l?"?|?x??vPty?6m%	IHC?"???????U%DB?H????$DE%U#RP?IE??
??????&???
???@?HSl???
bD|.?M??/#?1????wtom?b?s?X?? ?
H%y?'2?4?????Ad"?????P??
5a?F??&??A???@?4?;?-}??Q$^?o?=?!?Fa9Rd~???h?B!"]F?W??7oNjL?h!?)&x??"??0?#pL?*#?$??????Vf? ?0?e#?S%Nf\a?
E
	Ik0?"X?s 5cI?[?4?
RS??"?GjbJ?Y
KSP??@0?SUSRMj0??%??1VYA!fLI$?DdPc40K?9M15fa??QS???
???v???`b??
?z`?B??????GHI?p?????????Aca?5??i?4??u.?cUj^8?rDu?O2A$b3?H?y??C??^<
/????'?L2?+H>?0??R??N5?0????P?	?E6????y?w?k???????##IED?H?K???9}????
???L?JH!5?t}???N??%>???????D????M??????Sn5!P0?bD????&BR!EL?%*L?|A?7NPa?'?A?A?8? 2*"AID????l???????? A5L?B?R?2?2$?I?a???@???? U2:H?H??p????2?n!{D???K at Bn??9z????i?????)????SZ?
M
??
j?????B???b{'AM??"l????H{???????vdC?LQ$?Bj	?L?VE?????`?% ?`?SHHB@?????61
*$?g@
????????l?I?l`_?F)?0?q???D$j?)?%?S?Ra$??rO???\!?g???
??8XqB?????)0)??????????vC?>i??F????M?	@??L?h?U"P=??VfX?4??"?'?n^|h?&5??B??}?J\?@S??4o?t?Y?bU1`Tr???>?&? et?? =_c?e??LHH[??A?C[~|?Q??e?H????x?>?.??????????j&T??5??IEz	?"?	?7?<p?F?@?a?x??M1?1??BF2???5\??,~??J?+ at M?Kx?f?Zz?5???*?M????b6?m?<?b998M???w?f??'8~P????u(??OL??
??_???*w???!*?????uf;?aR?7W4???R????: ?6???????F[S?V??????q?c??
???ct?D`wd
S?:??cq??K???+;2???t?,XS?e???s??U?a??p?^z????a?A?l?vu??Og?k]?vk??w?,t?????=?n?i]??/???D?????S"Y?5tz6@??L"??"???q??????m=?kUi?Po?i
??o7?3m
H(4az"lmw??6wu??j??}p??e??@?.????+?N??"i??Q48?U.??8?mJ?T
?Ii??
?5?d6w?K??b?B?8Z5?C??th?w#?>???D(?0??!?`<??<??b?D?.
R3?T?????E
?9m???????\=??p???:?9??)?????c??;#????&Zd???wc????]?>E4??{B??~??? X*b????.?
?	??????%-^7MoZ?
??p<PP?#??'?q.????au?Di??9?l?XS s~??s.Aq`Nc?h3???s?1a??p?????T???@jF
?r?(4?R??P??BP???Xx??ce???Q???c?9?D`Y??<???(??m?3
??h#x2f??)?=>???????yt?OO??????????	??MV|?>???????7dC?W\???s?
???A?	?Bu~????"?0??????I ??D?%B?SEJ??	?HR(?RE+E#H?$A"??+QJ?r4?!ED???,BL	JKJ????	KJ#
3F0b?T?!@???$R"?	I01%PH?(	R?AE
-
J	
 $(?T$?IL?#?B^??d???????_??~&??(
???dV?V1???z???>??U??HHfI?b????9??[??????$F('?^????i??'?	??????R
?? ?h???N????p?\?(
e `&
?6??*j|>a??????p
??? nL?W' ??v???	??8pH????Q?
#r??~Jy`?F????M??{?????
p????i
??V?D???bJ?b%A?8e?)?q
??:j?T??????$ 	w6i???a,-
??e??M??WO"m2??-n??(??p?%_6??U???#4?N`E?-i]??*!x!?T6?:??_iQ?V??+?r??l?????9$?Xx2
?/Y???6?]@88c?????Q??aB?'I????/	h?@??h?0?-??hB)?C?DJG??j??P?t???x????2R?(R&C?8?"t????%???2dh??l6?=??Vk??UN???GCb)?#????????*????1?a?v?C?0???<5?a?DJ=?9?k
?<ES?
?~?Ap?'???Z??
?G?[v
??44!?_????`??\????b5??]`?M
??
?Hy
#~K7?,zf?F?C?08y???0k??r?*???r ????
@?F??"GCl??.a?
?%?	???
?ex??"<??I????G[?D?$?,HD?z?;???Fo?$	?<?????????/??????;?? V??7l|x4jX5c??L4?? ??I??^C??
J ? ???J?TO???
M???B???????????^????(?a(7?I7?	??c0r2WP??!??N??:l?.f
?8fQ
g?A?/	??k5I 6?^h????.Ja???>?:?D.<?e????}???d???v??j???T????p?6????y|Ijb?0?}_4
?7?^Y??Z?I?.:H^?%&???
?p{????hY????3?7??)1HZ??+Cht????;J?eZ?R?)?X??<"H?IG??ZaP
2`<??F??4????3v?E?f??v??n?d?NF????:?d=???? ?S?0????Q???aA??
XB1D??L?2??a?E??XdTu?>2?
?.V??eo?
??i 
??Fd???`*???a?O??
:?'?O?`?Mi???^vT
m??Y?????
??d?82Z6??5g??I%?(??3?YE????4???9y???N
J?}????????IQ???[?I???j?6??L??G?
A??H
N" ?X: L-???????x??)?pBZ0?
??a\?uCMp?U?Z0%ED?P"?D??qW?? JFd?fH?
Q?"??W?C^=?;D3G	???YX9????u???n??
?F??D??
?B?~w6%???zeh1?D??? b$?V4??-
???	??Dt?oc?#?oN?of???)?O~???7?`\D
???@(???0	d????:F`??a????7?s??T?E+?!1???lbli?6
(??h{???c?
pl?KF?O??=?P]3kGL2"?A#????8??A;???`??47.ui?|e=?????GNv??D?????????h?q?Z1Y???e@?%?waFj.Q?l j?5?
`?????????=L?k??qL?
????2!7D?H????,&?????*`?QDg???????0:C?.?!
?W???9???m???b??f*?q?H?S-(??&U?.W?????????????????utr?{?H85??^?1%1?????e???;?_Bg??p??<p??V?>?????#?x??e0???;??<
?K??4???G ??-??c?;??`?An;?$/?,?sPW?CR)a???????_q%?ZA?:g


?R\?????@3N??
M?7?6??Ua???c?
?v?5?g????????z?????
N
??;>?-i??M???x`x?#?s@?Pk?kq'B0?(
?K?d???aMH?9
?????=?W???2?=?5Q?M?j??:??}?????
?u"?????|8`????.?LAQ
$?Jh??$??XT?B|?M???m?~?~}?????BCQ?Q0?!	?D{%j?????A??????aS??(_
????? ?h???)Q8???y:@?j??0??$vA??2}????#^8X5W?L??mi???Q??3?>)Q[%?2@??uU?|?nRju???wR????EG|Z?p???,?????4,?"????'???M5?Y?HH|p D!I?di?Q???K\?1?B8DL??'-?????%P???(66FX???
@??,3R?!?
?`G&?c??Lh????7?|??????zo?m??d>?$?c?3R~???:N!???0???????_Ha???;??X?!|???b??#?k-ic@?b?D/U???4??)?j
*PdD???8?????C?/??L?0%?<?.	uS?&??????+???A}?m?U???A92J???ZB$????_??0^?t]???t????????m0T}??D;?A4!???'?:o??}b???Gk??no?`?Q1??it|X? ?TY??);????]???]D=?!?(dG{8?D??N"u???????v
x?;???bH?? ??Z
?0?bF0	3!?? ??_F%?*$`c?7JT sn?A???M$?:qI)8?Q0'???7?F?????LQf???D?R?+???E?n??
???HJ?CK??9K>??Xp1???&?e????<x?)???o
?CX??J?h?????|?????m;?:?6?V?q??9???.CGL?????E&!??6)???v!yFc8???????Z#??4?DaUj?}p*???2????~p+?;X?L??K??C?F????M????x????z%k?"?????q
4.ip??
1
?P???C*z?C`[Q6r???MG2q\????c?s??5???j???`??2?????
 ???;gm]? p?4lC?M'???
?B???QL@G???????O?Y=???d?i?E??B?-??>?E??T3??{?!?a?J??zI??x40?????D?=?Q?v&?G?<K?R?<B

????\??}?e?????@????>7??????u??	cw???????!?=??E%5UDEU?O????2}'????O:?&?H
4G??@???????]?G????/???)????m8L??????????C?n4k
??vm$??????E3?.?O??B?|Y????????????H?????X?`!??
?????
??:???$????;k$g????w?#0?1?rL???????i?I?0?a??i?"D????h??k4?4?2?/L??:??0??7?V???	?
??6 at eT?N????L??A&????"!
AH???d?8%O?@'??N??Pd4?im?X???I?'\?;vi?{???j?5?lo???2C!?a?.>?"Y{?~?{?c?=???/?,?g)???K??$+l?p??x?CA?o|)?99aJ??bq??
i1#Uk??3??????7?
?yU9s(?f??00?
?%G??C?M??
6A#?a?)??y???v?Y;?7??;??-???uw????p W??bgr?h?n??AD?b???XR???	E??tU?!=|z=?????{?q<?T?
??P??J>e??????)?????}???B??>??;?????A???5:??|=Q?????#???-D5RN
go??&???
4T???}??????N?U????L????d?MS0Z? F'?"l??qJ?????P
!??T?"? ED?W???yo;??`fl-k?
?1???p?k??$<??2?G`@NUx??RJP1XD???????$BY
??b?N?A??(?E?B???D???y?G
??????I@?????9{??Xv>?5??Kc0cu?x?5??L???H1??"~???$?
??1????L???8????????h?????i???G??b
???JnCd
?"n?+q???s?'m??e2??@??m???? ????r?{???????V????z???-?????4?!??:G?3-K??????? ??f????'??$T??K?a??ZSA??*4??\@E`i??%Kq???f?????3?Mn?[????pD??$??z,???C@#O0j?U"?6??1?{b?}E???q??u??@LP?c???X#Ab??-??D?Ze??Pc,i?
H???$??Z???2???)?,??2??U&6????#7???t?I??2??YY?c??n+G%?0?`b"?(?M1?????,F*?q?6??UkB?ih????Op??c??????c]t???Z???????hsRD5?oC??x???????.??D????&??.2?F?????8?????(????"???p?c?C5&??E?L???r??X?u?a5ez&?4A?[????1??U????X?2?9qa????<
?z??;???T4:??Z$?U?????(D-4?sD?@s4;??($`A??a#YZ????g??;g2?H???%@?Hc I?1?FO?	????????i?????H?r(??|id!?
?u8?{?A???t?b,

m?v?5
H??$w*p?
??c3???)
!D????8PWc?YU?AYQ??`?a????8s?q`??%,deM??LK?\2

1??ME
?????O at 0Sp????#wJA(Wp%???6s(KeE?G??|?9aaD?r#???C`?"`???????v?????@L1"y?jXpp4Y
??LlM&6?Wk!V(>??;???
u??g21=?pG??>-
?a??A%OJ($c&??Q??????4\
I?q?????Ac??jI???gp?v$?"?F "?k?M)2????4?

??D1BA2}?OgD?'=Mi"?l??a?F?g<
???I??f$??KdE??Z?8?@??~?.1U.?,??? ,i"?1?`lznpc?Z???SP;?G???"??6s???5d9??
??sl?q?? ?TJ??Y?Ci
????8?l4?AEA?n7:a7??????P??\d? ??
e=XaI?A???G??1@???N??f?kZy?u
?9?hv?31???@p???^?R???j?/?^?w????Cnv?wX??D?kRg?4f???????FC???Y#?@?AcCS??D???B at H?<??????^,af,??4???b??h225?????ppk????I?%?!& ??*$?????Q<??@???2?J??B)Q*B4D!@???$?5B
$4T?P?1%-D?C?D???@?
(?J4+(?11 AD??@?(??
@?J??
S
/???*"
!KA"c ?PK-?$?4
?@F??k??????l;T3?L??R?M)?h?n?!$r/?j???3?
Z$???
?$?2 at 4/???^%eF
Jq:?nJ??`?!?%????????9????K????p????tuN?? {?m?`Hv???(?B?
N&??1?????c?A?8??=v?????mSc?@?y6????(??$9??.R@??D~????.H	??p?@G%??P)?$H)IT
H?|#? U>?g~|Pt@????
!z?1O@Sa?c?!#??
u?C??c????????????o2?????????R????!H??
E6?k4%`???8?f?F??
i>Wh8AP&J?!??9F?	*???:????&(E??A?NIA2
????????6?????t[i??????.?????CW??(F?"?@??,Kb?U???!q????8???>???D?)?)M?x??hU????`B1!? ??X?db?????b!?	?JX82?I???,L??"
a ?Z?L3?&"?
ItfQ?q?"?L!??H?	 B	
(?4?-P?
?T??2?'7ji-8?dAA?9,?2D?@
?E
0?#???	H??e	m???0???D??0xJp?h:
3?M?B???9A???G($?k??#
?Q?"?]???
?,?L?.?MH???3"1??!?????$??HN??
???_)?>k?>???<???V?w
8c)?P;9???Z???=?????"?????n????8???????~#?a?@,?4?s?????T?#?X?^?*???.?m.?s?Q'?g?@?~??P ??'?????M?W???S?
???????3Z?????L?"????h??????L??t<??J????2W?
N?1?
?]??? 7??????<??9?u1	??u??3I???A??
>?"!d42l????5 sr??4f?N??h??J>a?m|??g
?C???6????F24A?????V?\4
?7?A?K??D6?CI6y=q??r@?Q????hQf???+?$
?,H"DV?zbP?dV???u?G;"?&1!?????Hl?Zrp????]?lf?
???r?W???@?Nr??g6T?????,?T?%/P??8?"j?x>R&????t?S??3?c?n???x&I4?????????4????7???w?P??{IL
?
??0`%??$?W?2?L?l;??
?UR?1MS0)
C?A
TQA2SLE,H?
4???DCK@?URQQB,???#???H?s?471?W????!?%???????B????B?A$`?D	?$?K
?exq??X4H?????? rT
$??E??"?!]
?	 ??%i????<?????n?1*A?????U"???C???U??}&??s?@w3???=?M??????|?/?T8?|'?m??????oO?(&* b
??C?^??@?%?4n?????&b?G'0?rf?t@!?8:1?Il	1XG?z??/i?8I?T???;o:yz*TE@(B?a?P0A2J?QT6??"P?	?
Y?A??????*?.R??b
>d?%/??????)?
O??$
C?'J9?P7
??/??U??00?>???b"wo?%???????C?(,?6??????fh?L??b/^?<??P?????%????>??+???D?Dw?????????G??H???)?'B7_A??A??8?H*??-$,?BB??,>
?	??4??&??A?%R?&I?d4wxt=+???
&?/?_?H}??:?C??9??@???8CPh?i?V??h?m`H?P?M????2?D
??? X????j??%?]??#R????_?/
?{M &??1"?Q~YMap??{?} ??S?,??p?T?*??0%?S????8?p6 at M?JA)8 ???D',????]?`?A?T???????u??y+??dc???/3T???>9 at TH?HP?!
.?&WB9+?H?l%s???t???
0?|?`Q??0?YIe?Lf!????e????a????d????? ?-n???7 ?Q?e?`?ka?&i??????*HsR?,D*??c?Vj?K|`?F??:??? ???????m0?J+?m\zM?D?'?Ip??? b?X?	R.foszkr???J???]C8n????{?????KT?W?????@???????t8?1Pr~
?4?????%MU?*??([ ?=??8d?,_??????S??O(X{???M??c]B?^?????)<dlM?@???!??((???G?O?	K?A?????;?h?(?? /? ????=0???R?K z??
???(???Js<#F????}|???X ??fdPa?X9d??D
??Q 'G?????7???
???~[?ox????e?!?<?????`B?)?%
?
<?&E
h?	??R?{0???P?|??t~??C????h?????D?P?$DM4(2?(A(D??? ?B?T???N ?NPD8??P>????IA!??gc???j?,	2???%d???1A??H?????Y>i???mA???g???bA?!S5???zP?<01$&a ????@=> ?"wv'??
???e?PV?n_???}?Y?BH&#D??x????? }P???'h[S???;???S?Q?n??O?d~?
f???Jo??C?????JB?U??O?? ???7?????????????:??{HIAC>\%k??B.???d$?<?C4?O!??W?
??!????>3?T ? ???4XJVH?R?J???So???4,
?)Cp??_??D-4	
???#?????????@??/?97b?h? ?'??????@H???????y???????????????B???DS???
????M??B?z?7
6?:?68-?
??\???e??-?i??>>??\Q?"Hf??b?v?	?.<????</cVx??????5??.??t??R,#??????<;x???gW?S?o)??3?^0y?$Q?q?{?=?u8?Us???+W????EK?6???i?+#B?,???????I?!??#?nZ??.|?????<4??????????;?t?y??|`p_?
]?
>R^????$;???-yo??O????r?k?t?C+?F?!*OvyvoB???????<??f"???????5??* ??N???G???s?t8>f???6??06=0??f=
?L?P%??]o??f?|E(L??????
???k
?m???O?
{??FfhCs?
?)???}?2m?c?"??;)??ux??_3"?????:?H??iR?J???:#v?0?L	??@??2??;??? ?4?
 ?=??)??PH?o!???o?	?a?R?P???
T??9???(????~??4+??)@
$?Q ?F?:@h ?????O?(?p;?A@?????????A4q?n???????./?}?1
'?y??,?7?y?e?@%?Jh??u???u???~?????=??	?%?=y6?7???????????#?Y?XFaa??H???9??
??!??????I$!cN
?|???
??aE/7x?*?JK?_???w<b	c?f????.?J1}%B??O"???#?W????vo}x(?H?X`?R@u ?x???(?!	$PA???^??!??A?z??dA??????6:??4????0%?2???H??*?????;?$z??	?1	6C?Fh???pI??x?
?{??p;?C?????,?P?????#?.??S{`?????-S9!]FBX?t??????i????z?\3|????(J(?a?B?"c????p?????????ec??????????????}?)????7S?a()??
/???k
x?#?p??_!??G??:	i?`???~?gO??L?B???t?<t????@?D?l???D?'?????????T	????K?????4_?y??vq/p??NK7?.A??8X?_?{Hb
?-? 'p?#\=?`???Kj "?pNE?????c?J?	X?D ???g??
?p>`t|?T??
y??s??	??Hu???V)?=?'??Zr??f?x??K???`??k???wK?{6jM! x??=???M???????`?2??
1B"??j????*???2????!?Q$D?v?D?l???"J")????/?????*??????????M>????lD5H???????????6?	?
)H?1?B??D?Y[R?D0SR??????>&M?pW
????m??h?????2?@????n!#??u?y????\sF?dE;?N_M? ?q???1??;a?"B (??#?H?0?2T?2??8??+???b?Q"T??????DJM?F7???????A?1??
Y??+??H&fa?7hM?T?,??&QP?HTh??A7`.??Wd??"Zw??????hM?6gD?%$??ku??m???"?0?
N$??(?U2??D??l?8;c?tQ0?e
F@?cL??#,,??<?UWb?+ >YFE??E:???K??E@SMT)@?D?? $??I??????iA(??(????0^M`????w??F???ZH
p??J
?C9??? ?? ???I8?J@?LX??g???4`?8D ?H??????
$z"?E??+U@"??"?*s????]6?u???^?L\??LF?????c5(of?;p5R?Q?`?@Lh?m??
	???bQ?`?F?????????0
5Gd???d7?\<8i???cZ?5\?m?i??P&TU9&j???Z?4???KK?????YU?/&?XhG
?vD?*g
????"??u?7???n???-?Vb!?%f???F?Q??@?["
?x?7*??????La*?z ?0{!?NH??8?
5jC[?yfI?0?D?e2)\;N?*;?????0??QD?P?L?Ri:q?8????????Bf???M??l-	"?`t??<?lD????>??*h?e???#g?????g??????
G&?????|????????Q?N?8 at i$"?A@??PuB???	???n?3~8??????]@?}*9	 D(h`N??0S:??J);p????A??=
??4?0I???6]???b????????L y$~H]H<??DISAD???q?j?+VE?bp*i1?????`1?????8T?6:M??
?70????N8???x9??$?*????????w ?"RpT????1?C#?jEY?&1?V????V?acjF?`?Z?I0??
??%??^dl*y???
?6?SZ?
J	??x?!+\??#?X?$?XB"i? ???c?H??Z:??]???8B??9?????Z?0?R??4c???qve<?&?4?8??@b`A
\??H?j<???b)?:1?"
#?W/b??}?Q {?/O?4????"h?X@}
+?????a?
)c?pk?? ?2??|sy?M???w?:???????HD>????:P?
	,?
?'?S
????@p/??4?e?????b&a?]vzu????X
t?UI	??`el???_?\:b?,
?N k?F?@??? lQ?
@?????<??&??mV.hT03?????"m`?1F??4i???%?H`$??r???S??
?p?M???|?V?/?f?q??PH/`?????b&?2C%>?F??@?b???????3?4???????a??r???E:B??? $L?aw???Y???,Y???N??.?7SB9(??"8???????TC???KIb????`?
*,U(??I*?	
,2????@? ?r???'
@?&sJV$#p27?? JW0jZw.???SN?E?SRJq.??
????????pL???\e?DU >?|??>KW:?:Q
??V?3qM??? 
4?e???U???M
f8?`feD8??4JF???@???S?D??b?+,Jb?0YR)?@FF`b?)?%??L?c
%6??l$aA???N??$ ??wf??XV!?F?,$
????|???X?]s????;?-H??O?2?P??`?1?z*.?Hg
???K?>?Q?
ZL?	??D??? ?Z?a?cW_O&i(?R????m
D@?18o]`?? ?|??!f+?,??~-O????U?RB?}=????????????X??????R?j?:	M?cG??	?x'?C7h???3?m5?;????
?4???,?K?a??/E??????V??~??
?[??D?:??????3???%?/??????Cy
"5ADf??)?F?aQd?b?_{IA&?`(?$??Kg?;?Pl??F??u???C?/??????;(9{=%R?xw????J??n?r?K?t????o?d?sk?SO??B{????lzK?+Al???9???^c?c?g;?I??2g?9?N??1X???/<q%~????@~?Y??Z?	cR??
`??D]??6??h;F&??????m?#V?]8?,??G@?yT*?4R?Oi?K??xs???Z?U????GZ??????.?vd???
??R[?????=3?j??#?'??7????zW???h??a???z?q?7?L???
Z
R?????emu???????h ???hy?I?m?F'?rE?(?xLW??'mW???Z???JV?D?4s?R??E???????$^/??2?=?Z?G?????57????,u?C??c?|-kR??'z?yo1?4ye??>f??@#SY??i????A?D??$??2??????8)???/k??b?????Vq?p??#?q??k???J??I?`p???hY)K???S?????c]???wg??????79} ????O{~?E-?@???Vo:???|ypN????&?72????%?|nl?t?xL6???%Z9u?GF?e??r?O???b?q???5?:/???	'87HL????,w??sN???7>h!???X??E7????g??v_?????*??"??.?c?\?;?u
3?3???????f?@#??P??{
??h3])?T9@"??u???1#
2??q??a?Vd,?,I??~^2u????=?C??X"?S??JD/I?w??vr??????Gl@?$?(??M?ap?;???nN
?? ?g?	???????}?{?i??5S?tK?@?
2?'-u?$??SB&?????????h?;8V2P?L!.??????]G a9?a?
?	?????)??8GK;?0?i??0?Cz?w?J?b??tC??i?Y?o???S?{l????>D?&8
?O?E?$????9"l???g7m??R??"??sG?	i???c~?uO1??????W?>???????L????3???9E?pb1x???J5??\?#h??????n?#S?_?;???(??s????z???0c???-??1?=]??6???????z?
v?+iX?0?*?~R!5??3?zM/?t?$?}??s9??E??$a?????Z??7B??;?&!?Q,?<??0??????Z?
???Ex???L?? ?x??CYt'~?????7?&o?UU?^?'b_1?????y??????a?0?1ly^?Lm(]a??
?HA?a????n$?zv??n?w?y?VJE??"?p??A??S???9!?,?X???}?O???B??h?w???L???)n	??=l?O???????P?(?e?sVT.??????|??
L?RqH????$	H?4D????L??F4

?>g?(9jO???8??w??x?]@?4?a????y???h1%?kx
JY?v?L????????ktb
(??F????7?EUtI?i4??Q?D?????k?\<8Z0?-&?j??l@????0?u???RSNW?f??1K?B	?*%??V??(x??f`??@%y??hn$Vv@?0$4??a???A??6?C??m@?9:??? ITz??L???L#f????>???Y0??????=?{4??B~?]?+???V???????2???g;????????V?z?e?U???????Z?a????3\XPFNKUA??qk\????V???,?+3?6??Hx?fE?e?0?BfVefea2??U??>t???U??????
?G
?c7i??b
??????,??4??????P'?-JnH?N(??~??`.????2N?m,??r;C??*?DUBY??<X3???????m?g??>C?????:?4>?k.?c?C???)???4f??Q?%??:?zP??E? S??$ZUJ)
6?b0I????R??>??4o??D?c????1~+P????%???
??:1MdgL??Y??"?k
????<1Wz<?qh?????+?,?-#f?p?@???;?b?6??m?c?fV8?b?	??1
???????#?H???LB@?zQU?q???C]R[??f?.?2???
|?jt=Tm%z?>? ??v?m\|???D@=z{??? ?0??$???X`?C???w?|0??_{??????R?V???
?$?G???}\k??C ?
??SE??
??o?
2q????&8
?aT???H	??R*??D0BS???'?????t??
??$??J @?Ri??)??Bh/??mA?j?!???M???g:??????v@}??{??"
``?1???0Ti?`X"???Ay?B?p5?a?i?*?U?"?6?mf?????????e?D?:????????(??f
#
?z1??F??
?740H?5??p?Z?5?q?????5?L8hc???0??W??????Xd?q?A??p?J`???C
E?-?\Hmoq?&??18!???C"??????\?????bpa]?"?%%	$ ?]?p5?????{$?7?!?h#?}?~?Qn??P?U???o??LUEN?p]?J":?gD nL6?	0kt??2
T??V??dKm??Jc3(????)?q??????.
???9o?M???rvZ??0??c??	!4?Ge?Lze??LL?x?????pV????5F?E%Q4?CSwc?S1??1???me?oj?A]p??$9eh`z(%?casV?N????'?I?a?RH?r?????b?N?#?I??4i?D??$?v%?-H??????2?? ?C??4?K@??R?
?????	??@??jk@?Ha*'?????!??'07???????Ei?)???g???|????;??%8G??N_?Z_/wG??W??w<?1???F5PP??,??w??
?:?????M???????n??sxi?8?[CM??&???A)J7??A????'|?REQa?au??x?1????5%?X??Gbm?#`4!|2
??
????L???????O????'?v???l&???Ip????d0 at o:S4@%?G?b???IL@??N,?x?N?K?????????p?D ?=??O&|?????6+?"R??;.z??i=???????( ???9?C???tWYGU5c?? c?? ?X?? K??
??c?Q?(?????M????a???2???a??hrKd??o.????9FGX?,?????p??
l%??6??r?	????-]???|*f???@??
{p?5?	?/?RlJ$?~q?????h=?<??_J#Y
??????z??9?N1n??)?8????v??!??3???$ 8??q?"?lM	???c9*?1? IX?X?\?;$?0'n+9?v?[:~??h???9?
l?,?`??6'w??z?3?)2???F?7?#I;E?>?-?&??<(n?>??7??"8???
N??l???????3?????{?v???u?v9)??`?&I?{m?UOT5b???B?Y6?E?v?u??"?<s????@???g}?pT?
r?1X?9?b??x|6u??]????Q?2K)?J:0e???S??ML??`Of?Z|g?
??*??F?3??L?L"???m??s$#M?gc'#|m?3?xn>?R?????E../4?M?	"i=?f?(?Y"*??????u?I?7?E?`|????(??y0??H???m?iUv?f?S?:B??k?????!3???F]???4Cy?"?E?OO.?LP?????y??_+???8?bN9c(ny??o?#v?^6b]vz?Rn&2??????o??`[???[T???eG	?>C??g
v??3&?Y??k??[?7???&iu?s???(+????D?T???[?GM?Nx5+?le?s:s
U8??w?M!????^??"???v??????^{C
U?????I??????I?
?$D?(???6+%??]??a
"??????#'?u[????
?g[???`X??+)$	???Bm?0??I?O?#G7?~??b
????$]qg4???<-m?{H?0?m1g??i.??o???
'??B|???7??#???`?i??N?????K
??C???.??
>??C,*??H??YP?IJ]UrW???D}["??? I????^???4??p???TPD?8????F(??T(??A???9qp???nK)????!?FGo'2`n????BI	
?B??[p?%e?K????3????9p??zT??w?????????p?=?o??}1?!.?????3??\??????M?WpF-?0o?????tsG?Rv?YN22[ ??
].?$?7e!???????,??R<??L?9??d4??[???
Ne????)??VU???????E at B?)!b4??FcE?Bl??7?S??E'5BP?`?kE??k???6?jQ:?*?F+T#W6?E?n?D~??>k??????c,??xZc??e
A?i????!?2????*?32`??\N?,43?]?+??????f??{??)R??c0y??x|?#?Z}?}p?G?[N?_a?+???hrK????N?n???y??O???????a?q?t?V?i??0??v?:pG#?l??M2??????ld?l????'$0?!#sC??2?K
H,??>C%9??????????
&f at h??:\`?`??6?????dJ??????hH2?6Q???X?
'Pb?b??"???(???'q?vV)?tQM??????QJMV
CWQ??&J??"?GD0?@?L? 6<
]R??p?4A?l?:`????Q??+?p???Z7@???1!T1?A?<???Cgs??).?n???
???P?w?1?X?Y)IdF?????L at .?T?Om??Oe??!?z???_????m????X?F?Pe?d?l???r???U??a??83?<<?< L??ih??B6: |O7???f??|??E%!-?z???W??????~Q?7?
 ????{??DKA at DJ)()$?/G1?
D?????
t???!?oY9?7??(B?}voj???f?WRP?UP??z?a?"5!f??R?@?????%gP???#?3SA?`d??)0?i?S?6	?????$?J5?r5b??$?$?A74????`'1LeP?b?b??de?LLY!? ?45 ??A???P????)?5?p?P???%\BCC 
P??f)&]b??(??H?:??????????\???^ yqrY%?v????6?)?`?a?9??C???I??ic?9:?
.y?b?
????	p???K]??&???????%
`?r&?v(6?J?9K???&J?E?']??u
"?
?=??5?=??<????"i?1????%}z?i???`e?TT`I???A??ME?2??d?#?{??p???s?????U[???V?I?G???p?d??&?J?,???$?< E:?????T???9"??=?;????gK%)????8????I??AN?2?j?a?Bn%5?H?1??Y? ?$5K?^r?????qf)"C??"???(B???~???EG???iP4i;?;B??????q.??Q?$?QH?U?()?-&?D?@J!Q5
Z
???@?
?H???
?????G?????yvV?4N"\??@7???x?
??.l???-?h?dESBw1??
?6?50?!??H??E@? h?QNk???h?
p5?`????=eR?4?>?????d6?.\d??6@??*??????? XDw???IqL?g?5
????????wM^?)?????????
8?l??:Bh?1-?`?\?X??\0??(O????
Eb?fa?>??M?F?????
'r33*?|H$V????F;[?4??dM?5
???9?0?4!??VWy8?B?0p?C??S?9?s?'c*d6? ??`??P?)&VGA?? ??"`??"5J??r8	??,r?P?
!0???k
???I3
3^?y?????q%???????}B??	(?@N?/??1??D?E>??Q?w?????f?QRS????o??????p????n??043?}?c?
???Ef??>Ut???oXo>???y???????&?D?"(PC??&?
|Y??0B??D4 d?%H:W????M?d?c*????b?f
(P4??
???e
??O??3|?L
W
%"?" ?U??"?$T%B?G? jR????T?Q?}??~|M?R??B"D?
2?dHW?v???W??~Y9W?R<????|SV?4???4?Z??!!?(???rHBDA????3?k\??r?![?:?4# #3??Y??8????????????6?????9`??Y{%eo?5h???S|bR??"N??Xpo?
??:??-
AD???h??
^?F?f[?:i5?x????,0q?(??P8
%????A0???6|?S
1$[????AJ??????3Bn???!Lv?4????PV?E???(I?Y	??	??#?\@v?????}"+
i@?.B??-??^?????y??&?P??<C{??????w?@\?v7
1???Hp?$U?????8???!??-
?? ???Tb?TV
!?E?p?'[
`ii4?|a??\R????$x?AW?W?:???8?`z??H??4h5?R!"?????h????3-A?"!?#RmP0?d?=o$?IZM?Jt3x!? 
$???????X?"$?IZJ
R?x???$?????????????????????a???Zg???s?i?p?Z?%???J?eQ??u??Z?7????i??8Z?	?????5??B???'<?m?8kr?,??????????0??&??????>w><g??f?X????T???i!""????
???'?C?@?!??!???c?????X????!FH?zd??q1???I ?
????P?"6?@?b?`????L?? P?0L!J?@???!?PNR0>???
?H	??{od
N????>?????"G?'????s?)A?t???????????k???u??*W?BDj?C?#??C?]M?????$?0;?}??M??jvF????Da`D?Q*???????U?????D?d>r?Cz}z???h???t:?A?O?K?C???X????G???5???G@)?,H????L0x?*s??7B??????;??CF??*?????	I?D??@??
?=	??? &???'??@??j??
T??+??w?pC?:?)W?"??A
H??Q?c+
?a???!jB?1?Id	
?fc?2?Y?T?#H?P??J?6?$?G??
??B$'??GaD??X?2?,e??????7TN?F?T?? j{???yC??C?aN(???n?a8_?1y??<???1?A??>v!?????{????{????UV?Q???=H?/J%*?????>
?4??$C???<??!,??2
?o???%???E,??????*I???>"l? hE??&????p[??N?????????????S??mn7?MV???]?3???A??$???4??Y??q?A$O~P at q??<?_
,?8??<???Bo???Y@??<?(?w6?h
d????#"q???i??}?!?b?t????#?p""n0?P?!? ???.?Q??,X????? El???TL??&
?? ??????3D?:y:k?88????\a??6L?0??v???P:PM?D:?????]J?(?O?`|??}>???|?l\PJ?O?^'F:??Pfs?"Z???
M?????EfBl??Q?dkXh??b1???YBz)?
Hz?????g???wWBIE>?EP?
S$Q5A ?@@@R?D?"L???!D?@??R?? u??DLT9W??|?q?P?G??3??3C*?b?2??8?J:?4??????Br?J{p??
?F?	?
?????~?2
???Y???
\S??B? H????<D8?F?LV&O?50??K???@"2??`~YG??68?i%??	????f&@???0?GZt$??'??#D9??`?f ???<_????>???R'r?(?
?? ???\?[??1?=
?Vc?y???m?*??WT?8?lm???????|}f%?M????C???j?B6Ed}k???U{??~+?Er?w?t\?/!0<n?\V;?[83?>
9.Cvv?IT????qp?_
:F?\{!?T???? 	?+? ?*D?RD@??B??R???%X???d
E
?
@?4!Kb?@BL??(#E????;@??E\s???XQr?0UH?T"ECn?Jhf
?????
x{?s??????r?P????z|8???:N-??KHV1{?|?????????c?3???LH??w?rB0?K???
iv?????=?????T8?FZK
%?J??Il?cn??E?0?B?.;:??
?v?????f?!?+?*?+\?h~V_Zj?b?0.??3p9?:S??????? ??????~j	%"?R"???%?bE??"???"??? aD??S'?"?r???"?s??????"k00	???	??\?P?J??O\??(4HU(?D??c?QLgR?.?y???>={?p?????e??4u~??????B}$!??]B??	???'???}Z???Z?yID.?
w??R????	?D{?
r\?
EJD??@&?mF?]???
4	H?53,?-J??e?A	???1@??IR??CQD?@RB?EA1
"?_&3??????J2P?<?????@??f??
(???[?????]?N????T>???Z
??(+$?k'?? ?_???????????????????????A6
>;?????q?????z?????s??Qvtw_E????????{&?}t??y???r? ??6??.??}{?"?F?
{??i??S??}+M
#????}?????7?q????:{c?
???}????>???????m???=M?z?$???
_F?^???kG???????h{:?}???
Z?C??????????=???v?}??*????5?m??N??vB?
?@???`??>????????7f????.y????S???y?t????>J
???{e?Z?(1?{?P=*??<?u?{?????WwOvzv	og]??????$?u???R?5?u9??w?(B????`[}??	M ?
y????
?Q??
@4
?S?D?`??=
??Jz1?y&OS???
??(??????G?.?O?Ai??"?r?[|&~?$:??*2?f
TDE
G??????<v?%??"?^A
3ML?E??@%Y?U?E?
?*DU=?\@>?????)?-/?_??.??f??2]?0?V?^Jb ?????uu??1UV??ER?#p?i??]?.cuV?V'+x???D[?I?5?v????,?B?$|	!?fN
 ?????$?qL?$r????\T?2?L????L? %	????
@?)???b?????W?????SwX?U[%	?????;(??2??C??? 8k{??q??!2c?7w??????p?????\???d?	"?Lf?8>*T??*S????U&(???K?N???LE???!"???E'V?a?$?2?????+?q??
???m??f??`?? ?"OD??%Z
P??)??????@Lh1!?s0)H??(s2U?Z@%Aw%	?1I&?2Q" U?H?(T???%%?B5???? V$A?E?5*??N?0?iRe@????4?(??J??	?_?(l?t?aWYU??)U?gb&`???bLt?(?C????????B?;?M??*4?@)?:?!?.?????x??j?PM2????MB?<

"hT??????~??J
0G?O?|Zl?????1?}.?????6?8??????i{?3?
?"??g,=?X???~??????{[????????jR2?/??>??qf6??0={?B]??|CJfB`??xP8????^?q6X'K???D#+??????????%\bj?
a?V??^4?D?@?4%D?\?
????"`?*??g???UDEPD?C1E!AD5LLU$~??12jL???&UC4??????&????`????
((?
???x???i?????,J?Xa?u?* ???!`hZf?????z]?DS@??Na?PH at P?	T?CC?? b????X??
*??"?d??R????
(b??$T?D?IJD?4??T5AR?`J?!?dD?T?K?KR1??i?X???????J	?%?N??b
??????$?????)????J?,KHR??KO??-?O???JDJ
?O?	|??K
D??+5?4?v;??q?E`?z???t??[r??bk
??"F
???? ??Me???????A???=?E2A)2?Fq?????y-??6????T????U?FQ?~?X????j?H2I????*????1??ST?ac??k?????y=]??%?e?????+???A??c?Z??x?Y???6PY1D4?$???C?????????h<?+????[g?4?1!?4??T?	N???@???L
0sP??2vTDT?UT?CEDACE4QT?xH?Q?U??
*?*{1?????4DG?1?? ??"?????XD????IT?T?
??????m=?q??,?9?????g?????'??O????}p?????????jN????r?=
]?????Q?3G=?8?????????$#??nP????v???+A?????5K?=Te?V?%?????Z!??Tk?t9???:????x6U???
_???t??;?a2???8c_d{?????Ml?????????k???%0???????,?
0???D`?
?R???j?!?????b?^???T????>
(?D?m?/??3??D??????u?^?????U#??B?>????2??:?v?=2&6? ??.(?so<8Y????$L??????@dG???Zb-??c<?~?W|<??????m3&????b??	????L?e?3A?HB???h??M?C?????X<;SI?4cK?.A?F???{??(??
?._)!'0?O0<?)?E1?+??fi?3??&??=??H?D???2??????E!;9k?M?]????+8?wz%?????H?b?J???.f?????	??05??e?y?(???'BI:??[x??\a?D???P????????g?R?'8/2????x?	??(???u???^??N??z?M4?)B??J??E0??z??&_1???????????
G?[Y?????H???o???Y?x?C???????B?Q?zb?&!?????	????W???c)z?C???????5??????i?9?????!Fi?q(??Y????C??????Oe????jo?????4:?\3??\{D=?E?Q??`m?tP?????7-??e?f?5??	?;E?d?8??C?????c?????R??O????M??????E?O??eh??:?F????pTI?IYN-Y?q??7??yO???w???A7Ti???;???mS?jJ\??",	?7???\
?`	????7on??????>+
D?9?3?e=?/?w???L????/??
?+TNp1??P?)L$?2?m??8?2?6?`?3?Y???>?&0S??w???um???????n%s?N?}?-?" ?Y?gw?I??$`? H"	$?$?*?fo5?I??3*?????g<?dQB?gL?L??=mX???:X??J9.?c???????????|??????x?o?T@??c??/?'b7.????tvrd???&?????_?m?Z??[???O"???c??????
L#E(M????????wB"?	??]??X?n?????7irc?>?????q??q-?[??????s?|}?\?p??d?m?n???<????m?3?-=?Z????aj????wF-??v??:????n?d?;H?>l?9?A?U????,tsza??*??o2???????C?????D??`EM8?	*??????>?4J???bP?-???s?La????Yi?2???O%??m?
M?sO??:??
"???0???\w@?.?T0??D?#g?0?B???R????"??glF?X?C?$??3F*????f!?9|???qV?
?&??????'??>{?????????{?}??S????B?
4L4%D??P?IKH?????Q???
?>@S?????:#\??6J?w???OX?R???D??4A????~???h?????'|d??_???D?4$?M$AM?=?F????????????qI??6?h6[@?J?5??
???)s??>3???(]??Ty?"?????t?????V??;;????1?'&?Pd?e?P_Q??
4?Y?XL5E?Y???????b???='
??p?aSIA???OK!?i?<?wo
?Y1?Y'K"`?????????C[????0A	$?(L?????N5?Z}??????x>9e????e?c?,#]??????i????l3??4e@???$???????|????{%u?,>??Up?s?c?2???WoTx??h?D???Y?8?\"?#{?z?7!7??OR?????,G.?@??????/pC????p?+w}]?;
D??i?+.M???e??y?O??Lt?Z?U?d ?F*???:u???[M?/:?oiAx?~??7g7iJ????]|^6??????t??$b?b?_??5	?ix?LI?fv??%m??q?*_??h
Rf(A&?P?????-?? ?'?D??W???5???~????|??[Q?$?>d?J?\C???1???Leg???uV?/????:i?F$PB?$(I@?8??<k?Kt#??????.?h.?o?R????w??n???R?E%[B???Nb??cI;{??????w>?????0?????#?n??i?p&??y?????`J??k???F????U?????[??:??????V
|?\|L\i?Km?????:?l???wU?d]??E????????z?? ??????'m?^?f9?O?D*??,?>y?????Ux??}Q??SbyO????6x?G[?3?`G????b????>??QD?*???;2M?\K?,/?/??jo*j??Y??s???????QUs?????????Z|e
H????`<(?h????i???:???L[L?gX(?O%????Xf?O?~?imXyY????$?J@?L?n??	????)v8????!I]?;?_??H????????_'????(?m?,e>+????7?@???????{8?i?q???Y-D???!Z??|?????j?5??n?	??
???g?*??H?;??W?????L?4GO???.!?8?>H??EB"q??B?????>I??????S???
UE??R?nM$??.T0????????;?%??%?ft???KDt/&
?????yz??*??#??|?????S????sfkM??P?????????]?????:fd?B&???~=!?59f??
 Y?????f_?@6???o?!?G?s?bM??;?I??????B
T????\????"E?????,??H?MaHq?O???$?a
 ?
?V?{??W(6J?????O?P??;????`}???_?(<?b???????{?L??7G?????=?????*;??f???a?X??G?????$m?FE??L??B?S????2?l??aU1dQd??cJtx???????u??vBa.&?2??H??I?+*!??@???9ng]!7??*u?:h??Y\V?=??????P?6F?+??LU??G???jR?b??????
?k?#??????=?j?{(?x???(U1?qI}?????!?["S??c???T??y?Y'?"
??????4YGZ*?*?3Z?????F???1??!??m??X??cl#	
m?k+4???T???(?6SA???X?Ak<?????'2??2??????d?y?2??N?QM!AIA?UEVYHSHQ?dW?%???7QICT?@?t?k????????q?|?E%Rw?
?g?U&Z?3????Q+X?????????ch??*4??cL????K??g7????????H??V?mH?SF??????_?V?G? ??fv?????BA_Df?O.??????Z??X?????D???
??c!y7?????3 ???x?tc?7;? ?D0??/??b-??	??T??#s??@h?[???7*_?;<?*??
Z.???rD?`?p|??4??m~.M??z??N???????B%?b|?}Wm???y~i]????
i?????? ????A?????LT?4P?0?=????l?$#???WNm??C???yC??4?????w?0(??a?V???[????q6??QHE?z?????AZn??`?Y?U?V??E??GD&?	??D?o?????>??L/?????Y???????e?{&q???H?????z?w????u???a!2 at B??Mrm?<?gmq??H??????V??}?7?#??q?????b?y?'?a?v,XV[?0ZK*Z?H??
G???Oqo45|??9?I?i?tg#C?\.?w9MrI??
??+??:?+??>?W??aLUK}??sS'???Y?qw???_M??e?oG?R?G???
???_h?M????v??3?2<??W?K?????H8??KbZ????<%~a	%????F??M??????r???v???`?????{????]z?js?C?v`?fo??????_?080{F?0???
,?BFa?b*D:4???&Y$KV??H?"????	7????x??????z???GJ????`?Z.t?F@??????l;v
T???:"?F???Y????c?&???H;?
????2N?????G?4????`?6????.?k??6?`??L??8F
*???, b0)f??|?G??5??%H}5?n?<?V<???0y?r`?0J??cU,??d?
Ju?DMV??????/????R????A:??
?A?\?T?????#?1??o7O??????k/?$?vJ0jh??W?>?
d?8Gt?F???9??????;???i?y?u??1?L???~U.3???~n??/?|??? I4????Q>?
?p?????s???	:[??"??5H??"???@@$3q?P ??l?2<?A??L???w
O??p??C??????L'??????~?z?#???????????????(????B?
?5e?U.??Vr{}?3B2??[?X\?$?eP???r?ogm??Y???"AAAAAA?'<?U;``???/??&ZF?N??f??E??6XO50=3m???????p???i?????????6???????L??HIOT???? ?69??MUST?-{6?Vf??}S??_ ??B~?
?~\?????N?
c
b+T?????Hp??W?? ?b?j?????
??????n?^n??n?c???;t???o9?????.Sc????Q_??=??????x?+}???8c
c?g3?%??A?A?k???e?W??n??E?????m?	?0??z????Y?37????????eN???:?f??@???:??J?;9?a????_Q? ???????????W!?^l???? ??="+XG?????M?????u??M)7?E1B`????'???>???|?&????}????yg???_w;??8?????????2????B??x?g??????:?????y%???B?L.???5??oK?????R\?P*8G?(?6f?U???ui?????:{,?b8????5G?q??????n??Q???$\??).8?q=?;??<???kM2?/?)%???8?	3$?D$??<?N?yKY?????$9't^?#??E?D?g,1?3#????g
w?/?{+?
?????!?? ?$?~=jM?.\??]]?????v?~??&?7?=L)?w??@jL?G??<i|????rJ?~?????=?$?oq*?z??BIs"g??A????:e?????&?W?s???#????????????}?6?C??`
i???>?}gs????h???b?????{ >_???/
xf?u??;???u{a"?????[?cX? ~x?r????<?>??Z??????M??z;????^t?F?r? ??08&j+z_??B?T?.??6?oc?d1]oZ^DS)????t:??T?????))VQ?????b???h>j??r?????[???????U%N????nO_W?	7?/??????7?sr%	h?>?6??]????|??tIx?| TO?
???m???_nt?r'9?7?Q>}??6??,
???
<????Dh?t???T?gF?P??W?F?r?W?t??AZ???]{??<??9'????31??[??????@z???????????&?S??0?WJ?*<????c?7g?'?6h????~???????U??&?Pn?O??Q???5?;6)?30??????????P}_??o?.?<p
???vc??bK?b?m?}Ptwq????]???^c?????????aX?Xb?"?????~?w???9??f??3u??^Y?U???G??<?????7iv3?????`z?zI?!!???%?8??au??>?B^????A?	?o?@?H?MV???gT???rj?`???|vgU=?H????QHR????R?L??MIcV??`?+?Lp?x??????Y?Q(L?r??V#????????????d?1????6N?g??l6?PI$?d?Yc???Z?[??v???u??`??f??,????o?l?ps??nCJy~??s????????=j{?6~??R??9j*?9"??J??R???]?(I???~Z?h???m?F??f???{in?c?]?Qro???????>?8Vk(=-g?I?^????^m??G????N????y??????n???o?????|w???f??|?zG??>q"i#???Uc at B"#A2?r?(??%?????a+6gt???[?eo???E?????I_?O?I????z?7???z???W?Q?sN?z??&.??8U????????J????M?}l??|??|_???*??xz~|a???94?-?&??y?????H4?????I7?P?k?`???8?%p???%??????n(?/<'oC4?S???|?_?Q?????????Ik?r?wdN???r???[r?:/?4zI[?????9?(?S?qht???np?8??????????
T+?"??tC??x?N????Z?JM??&?c(7??QsBLuM?s?????:5y??K?w?'d???<???B???K?E?????9'??KsM???zy??i?#?<??J?Q?)??/?=???sT?IHaE;wI??UK??y???~?P?I@???5??p| ?,??????-"???.?4?????
=NBT0?pq?&
O??Gy??????2KXN??^`???????????>W@????)?I????#??y??gf????_??A?*???T?)E#^?M%m??k??????)q/3?????0031)???/zu????????
D?3k?j?????mI??q8??3z<.~??O? ?(?n?`??????{?4M????N?^H?w???
??????T????????>?6f?Z??#}/?&?=*??9??v
G???i??^?Lh????#?l2
E095a??_????I???S?T?f?????????2_V?R??????????E2???J??g??\"??^?f?A?DT??{4g??c???<	?Q??O	R?(V?"+????05 H???@?Vb?T?E#UAQ%K?@?????|?9B~L?l?%???z??
?????*????b?????m?w????~???z???v???0UcL?S?
??????+??$?cS,3??<??9??;??N??*????a:?,oJm??!z?T&x?w"?4????h`e???u??kQ???D?????)??L!DE
a??~???????\2J"?0????[????22^`?
RLQ|~?	???b"?C?	??@PEDMP??)??t?_vG????7??:$x?{#DC?S0I??N%
x???:?X??"B?B??
I)??PD?$?T
?;,??"!????1?$b?Y#?Q???????j\h????
2?0???H?S
LDS5Q!J?QS?3LT?R?UR??%1
RD???r
?????b*JFSDq
Y	??~o????u??
	L at R?d?@?
?s?)bGF_???>?|?7??bM??@???T??????P?'	?BBBmr)?$?4[??v??L%???(??H???;J????1?k/^e??;;9????B?lq$`???
???y??	????/7??<O?O????????[^?SF?????mG?????
 h?T??@@?N
???H??H?%??5 ?!F:v??????H??'s????

????`7i???%?8???nE?d@?1NFe??g???????@?9?P|???h&??p?P???
??|??4?h@*(y??|fG|??9:??h?a?\?R?A"??!?i?"?!?????8??v?1C?(@?N?!4??Tia??s????&???!??3Rq0?"(

???}?????}b????+??????????*?????E?M4?????=P(???6????7??<?x?(??5?j]???h?O$???n??G??1D?n12~???!9_???vvb????>?2?X?Bt???U?f_??f?c???E?6f??9??C??;?y????>\
?????)5?K-eG:???G?w??Y??
???DL??$>_c?I????????#O Uy?/????S?d??|(???????-?????}??=?>P?0'????>???k>SO??X98_aAa,??t????/?n?qxte?q?U?U???P??l?G????]?????'??#g??'?tI1???ej??;?I?!;m?3A??_!???B
F??Kq??!???
n?H?bi????]$????

??3
????W????????K?:???g???-Y
??Ee?.????????????????????xL??q?9??<h???V|??e
??????0??m??j?49???44pr????b:?g?St\??H?C??_3{??{???:sT????-??6_:|?3Q??mV???+j={?C????D?T?X?HC&?????D?C?&|??k?I??????[?L9?H)4T?%????GQZ?^?>????????~?#?
B???]???kF
?	,?
????*?@K????v'm?l?u?lD???Q?Y??;Q??1t<"?]???<?.?T~6??pF?e??=??????W_?'????f??p?6$?pq?8?:?(3_?Z?C???>?\????]??=PMC????M)j??&????bmC??V?S??s?Dg_/???m????t??w??u??
???????D?^B??/?w??o??ZnD
?7L?$?"
?G??@??c?
? ??u??a??g%I?|?<????i?C?????2????#O??QH?
_?i?pk*
??$E?Asx}^?0?6?p?
#A???h?q"?7???>????cqIS????E????xG!??,k?I??]?Ol?J????P]}????X??2?j??Q?cK?G?&???+j31?<????5R?A?5J?a
/Y??d???n,???<???P?e.'q?q??
)0?W?ja&??s?e?wYO5$|?8?&?Mc? ?KN?\x????z?f=ke?l?:AS????????b??]??:[??<??&:?n?.?c?4?(>???e??n??T???*?8u??vt??i?e?????`????mMz????A?
?m"E?
?jq?BBD?s?w????_E?_d+?QA????????x?.?K?B?3?j??$?&??m?? ?W&???=?JG&e,I
?N9??U?'?A?@??I7D?C???O?????I??e?J_@?????p??a?	?fi??;+?*H?J??{K4?B??!\????-???@??n?a@???"!$??e???W$??{i
??Ch?{?@????e?P??
:?J???v??[x???j???H??!V?`??
dB?2L??	???z?6 G6w?????d??b?v?J????4??.???????C?|r?N???Q?l,QXZ????)?1?TR?<H?0{?w??3?? ??\???&9QP?D??21??O?????/4%S?j^??lB?'I??????@?2Y?U?|?l?????}??v?e?tm?K?dkd#
??B???A??C?H/?3?P1>nz$??)/|?^???L:
???|??????&?F???,????E???+?M?#?p???ly??I0Q4??!????????vA???vw(?1?????SS?>?=?I? x??ccl??n;???kRs??t0???\^8T?\?????A??
@??
IS8???????????D?6?V??(L??]-G?6??]6??
??~????o??
?????Y
??2?D~I~??py??W^~??%???(?f???
D?Iwi!????"?	?nY?d$'?J???m???l?^c_Q?????%}?4?$ `?
K=??y?I?`????
V?j???L0?\??!?????=$!??w?3???2?52?JiV??????
C:???I
#$M???&?E????M8=ls??ai2??/?????
iB?)?<*?>-	{?f>j]?Qc1<?????$8M??8?K/T??=??P???9eY??W??9;C?U??L??;??	I?K.???:?I??|???(@??(??>???17?N?z?*?l
?? p?$??f
??_???%??{
????
[???G'???4h??V?ugo???SW}?+^+%???n??hR?]??s???9;4?(?????FP3?,?%v???D#?5??~7???????K???????xc???????~j??j[?}^??????0?L?	??$[`???~??3k???h/D??>?[D???????=?{??<7G?;?uD?"???????!~1RMK??M?{;y?wzK??^?E?b7??T???T?C?^????n????N??u??????????????9???k?\???????Om??????z?F??K???{?_???????N???w??#?t????v?? H????n??????Q?>hP????????gw????????@???=[l?P??!???M???M,&????#???M??9???? ?
[??|???????WE?r?//?????N0<?VO?E?q??:?v?!?t??"_{S)c?+f?&7?s??0????hhI[NE?q?le?*???/?tr??	q???[7B@?????`}?3o?
R0?D????
?Q3?'Q?6?MN5
MtH??}?r???@????????>??G???(8??!?N??G???p??_??;G?G?I?#9m??mgO??7???K???X[?v????h????????5??_?~?HE?w?\???????4???;zp?+?Y??H????nC??V
????%????U?"?????r????
????r??gq?Q?0$b????b??$???????:?P?~o	???m??
a?[1???n?3v t?;d?z
???b??@??cxL
=;?[?=??f?k3???????FY????ol??a6OD??0H?M??OLG.?
P???|??	?pp??a?B???-????ewU}??????@P?~f??,H
C??r(7?(\S?Gdz??????V?i?+Q?$?5{????????>Q????1??5????????V?g?w?????)????+i?=3??????$?l@|c3!??????b?60?????<Tf[?[D????e??11?TZ??\Rn2??"fx???0?vk;?????D??w?M???.?T?\?:???l?????9I??("??k?N??J?????pb?????q?z:?F?	?C?R????Si?V?ce??????47u??xs??`???????u?x????9?O20^??h?nI??n?????M???GS?Ah&0???n>??c
????Q??????g??N?????AJ?W?[|?ty?<?%A?*8?a]=???????A????9???8??@??????//YW??2????aI?M?z??w?X???}<
79??????8?2p?G<
?)n??F?\???????2<?
V)????????23?(??0bb?Z???D?*?L???"=????5>ZR ?X?v|?3oA??p=???q???n=p??0?????????o????/o?C?E}??~_?
??,>?????us?s?????e?H?*??????2?x}6TMf?Mt??n??Z???-
333w???r?????4???"?GJ??W]u?pH|] ?}?C???>{f?f6W?w??Y??*??(?H?zp<]G?G???%I??R'??q?L:?q???bG.??	????D???/p?k??'~u??GL?);????????>wktt?????O>?H???D??w??????Q3??l	|?x:i?y?h?1m?B ??'d%??e=?????h???h?6
i????^^?UX????7??
8qz#??Hf?a?????????*A??V?df?~?'P???=???6????G???G?ZW at z
O$?O?y?????d?????#?5?P??????????~?????,J?[{d?#?'???5&?<
?P???E????%?U?"b??8if??Bo?I??{??!0nsR;?c?????????\????AlC?
????c????Gh>???[BMB????vs?t???(????^APt~:[??)?!?
	???e?
?V??J??3h???}??:f???5E\/TZ
??
7?/j?>E<m[?o1)2k??????}?c??VZ?1?x?eMeu?A?"{??@?]?ZNrj???\hQe???<v7??qB?%[e[
Bp?
<???)#L?N)1?
e????:??l???I?????X??0?y???P????y?N'????QTT?QF?
<?i?T???y???U?iF??E
M1?TF??f??^????w?u?c?D??rf?f???'?'?k??g????
??v?3?ag?0?-????????r3??i?J?rS???Z?wV??{kf?M%?N?q???9:???1h??(?-a?kf???/?F??m?rKQ-w?>?????3??*?gr???(??u?I??C-y?8?xP?????#a
?k?p??????2Z???]Z???I??????Y$?`?W?????5??gl?)8?Y(Dx??a????;gn?X?????54??N?8?P?m??u?T'???h>????m?@?@??9??{d???'??BCi??cF?l5?#i?No???A?b??h??EzZ-*bm(3?z?m???i?KT E?u?pC?_T*?BU?
8'?1	?10?<?B???]c?<4]??c??p??????8?+4a??i???\
??xOu?Hz??y*?`b?'?U?ixm?7?f??.6U?U???R?????&?tr??xR]????,!?n?D"0t?7Rk??7????9x?????????A??I????P?~??c??%_?????$B???Z?2?????4=?t?O~????j????p?8???\?"
??s??P,??o????????98}?P+???B?\)????1?Pv??\q??Q?????a`????1o???)?1???V??Y???(i?*m???M????:???#68?
o???g!V(+?7?l???????2??[?m?q1???u???????
(??w?+>B??:??h?#s?9j?Hb??u????^???K????O?+1?"?\??I???co?C?z~???i?G?H^???????3:?????_Y}??+B?
 n5?
d???i*?R??4T	,??F?,S??)-k|??v?y??Yg?XH???Xj]'0
?????????D?W??????a?w$??U??S7D???k?I$?q??8?t?%/???W???????????w
Gb?;o????Fr?t???G??n?]m?V??:i??H????0????f??Y?F??s?}???
'<+??d?pc?nc?|?g/R?i?G??-?8???????????N??hH?E???????I?f?A?=c?g??n??? ~W?%??Pd;??T?n~?)?????[???U?zj????@??`(n?>[J"??Cu)??t???,BI#??E?3?s?w?**??~?????6{?~?%??a???s+\??@h?v???N?&?????5?-???
6?}`l

??$?
??&??c3j??<?w??????_u?????n<
C??xjg?<???U??!??o1???????????X@????O?????????z@?'S????YdX{??#???$P=@??=;???k????@?????A"????V?@?M<??????^z????i????"?F|G???S?V?CF?W???y2??v?gGw?%a?VSi??l??N?????@??f?b?	?g?'b?????DM+?
?7???"?n??:???I?$?M????F?$D??g???????UM?3???%t?t???z?
H???i???b???1??W???????
?q?l??!
?????????A???\ZN???8D?E????F=??????????n6[e??0?5]?{??w

??z?@?"Zo??x????$)"?hI)??f%??y????>_?6???"?P@?;???=%?Z??Z????? ????????09?G????N??3x(|???5hP???????*??^ls#?1?IWs?"??O7Z"@???`????	?]?????????c}~??kZ?bz???WVR?`?V?A??.?M3?6f?k??1???W?-?????c0??A?????`r
d?????R??U???'1??)?I???#?3????M?L?Hu6`?[?9v?"k?m$,?~????K?w???@?????Ho?r????3?????j
?
?d???`??c?S'$y?y?%??R.?w~:<?j????!B?7>??=??nqa??y?~O??????V??VI?????????r(??}???vs?5+n??%??F?h??w??????5?W,???5?yf??<?q[???^?l??n?
n?W??&???? @???????????z??????+0?$7?m?/Yx???N?	L ?|U??????"??P?GD?18??7???o???7?d=<
J;?<C
[kC?d
4??A	B??uTt?>y?4?D1+\??????Z???1);???;??n?c?PG????Q^]??d?????1*`?z??ClBh
???????2
????n??#C?????Q_??????v?P?NA??pu???????_~c?????j???g
?T\??{?????J????m???&?^????????c*?UK?Vz??m$???%?TQ??*??{hS8??~??
?!??#s5?oj??HEh??&??>za?_H???:?????-????????>a?6L??F??o??ww??
cc??^o???????f??????um??bs?P(B???tP7`?*z=???`R;<?~:KG?S'??????e*t?J?T?v????ad?P??C??&1?0Ls?Y??Wc?T??*?Z??~?-?Qf?[Z??iO?;??HN"?#k???/??M???????I??H{";??????????
????}!u??K??R?z????4\?.??Q#&?v????????)d??X??v??~?u[z??a????M>7?[^N??>W O?9?e?>X?a3Ur??Q?US|.?(?\y??J?})?I2?m2??|9???#???;{x=V????^I{???g?qE?????d????.I??????:c?[-|??GER?c?????8???QP:>???Q]????<??r?8?P6????\?f2?S?S
n\?R?<[5??2,???????%r?
??D???I?UAn?
??O	??`*???1??h?c??X+?4?,??f ???@?Z?3?,|?]??????GJ(????????KC?`2???e?R3??/?^?D$??r?Sc\kT?j?????qO?AH?????h/?~?????j??,?-?]?`?
?s<?~??3??r???|???{-P?>%?/NB?5?IX???N???????]????y??6l@?6W;Q??P??0??M?e?e?:?M=S?)J^??????}r?q?<????@WX??-??Y??Xn??^??j?=?F??l<??Gdc ?????'???k?2??L3
%?v????\5?4??T??,????]k?Q??f0?%??/?v.???jT??L?wp???.f?it???!KI??M?s????a?&>????????????Ir+?>B+?p????$h?d?f|??????*??vY?IxR???l]Y???6?vX?Z????Eq??L??)W??ud??????Er????F6????"0??
?@?x'&?.?I???????<w?E??bc.y?w??/???V???I??#`k?????GV?I~?8UE7??"W>???'?7-?7??~??+2?ix??????s???Nr?<??<RfE???X??????'?5?k????w_??4??	>lj?'#?
?\0?2????
?? ????0??
Uy???VP?t]??@$`??f????2E	MuY???t???????*???????
	?0?!M*o????(???eg??Zi?y?.=VSE?`?Uxa
"SO??tU????E}F5?r?+?????b???Z?Q??m4N?wqA???	??jdU:'??	??>??4?
???NC<y	?\?z?HM???8?f`?8ha["()??-?i-??CV??z1?R?? =@????E??_J?u?uf???P\A??c#fko???[i??i?R
???`L??vZ]?X?c
?*+?s??]~.???????????"?y??
????	'?????4Q?b
????W??<???q?3{?z??c?UL=14????\??f"????l??????%????aq?7/T[????~????h?}<?}?.?????????{??|7E1]4P?C0????]7??H??>W?P?????l??i??(;??Y?1L??Cx????F?
<?i??D???*?N???2F????P)?)?Bq?u4?V??mP???xf:Y????FX??EQ1D??Ba&?$?avE>P#	q?<:_]]?????+???????Yc?0??k?_?M;g??Se[??E?????M?.i??????'&i???~D? ?x
P??<??X'mI?????j>N??W?\?N9m???????zy?}2?[??o?(4??d ?.??9??>3E?Y??z[n5S
r??I?/C?9???=??9-4CCi??.??k?{n?:g??p??^??Cl?c??{??,?m?G?|??????a
MQz#?MxF?_?P??7 UI?/ly??H?3???-???????7?if??B3?x??8US??v???(??sQ]?@???M???????:g?!Gd?m???
???Z+9d?X?o;}??I?F;????c9?7<?L?w??S???3I??h??{>1???????'k????;S?g?????;
`?7?????????j#:?4??c?<?u^?W??????ZQ9Z?{?j????a???u??XY\V?F9???-#3?????u???x?5ae%? ???L?Xyd
Gp?jY?5?d@?2?{YA?9???*<?9O??c???mX?W??-,?7???X?????tv???g?*?w?H?mp????????T3
?<#T??h
0v????j???>r??a??????U??????????C}ReOD?'8????lY;v?????0Z?B??o??k?3th????Pv???????_??Wc??G?&??W?t???k.sG!e?}q???m??
8??Op?????????q&[y?;????Q???)0o????U8???O?^???P?d?+v????g??????6?dHU??<K??e??\v.
?????L???;?J??s?e7T{_7?|???m?M?=??????7?,Z?????W??????n%<V[{????G?????????????b??
IK<??+???a~??<?ky??W*?????gm?????????P?9n}???????s???}C?`rdu|<N.>eT?kQq??????d???_r???.???>_???T?%6?P{-?
?.i;Iz4?"E?
?D???Jz??tS??a8?????Fz????n?dN??b?6?cm&0?e?J?????3
?????&0?????K???B???>
???|???3??\??J??^?????>?h??J????jyDP?#???T?v??e????'3N?!?H???Q???Q????Qw??TTj??g???z?'?@?)?~????B???????e?te2???1
??!??'&??o-??/9c?N??
Q^???????o??X????2?r???????V5t??tGU????5?(?7cgK??;?|???qg?b?&??*????ua?vN?C?ko?r???Q??????????n?*?????$?V9?g??????c?7?6?k?.???????L???????Tku?k???p=7<b^_?u????O????w??gt?	???U??#?Qs??????JuR??A~??}???8f????G??`??????u??3????T??Mm???^4??P?9??|Sa??
?h?E???hb?N??????????
??????8??ug?~?46??
2'??)?????;c!h??U?N?#~21?Y?1~?`?\HiU??-S
l???02y?t???H?^j?????q_??0?Pt??O???^Ox??
p}?G???????g??f)g?Y>7??	D?0????T?x???Uw??!?
ZE???S???m4B?????\Q??Q???K????n?$\z??P????z?f?$9???%p????=?'?????[?H9%?$?_??????????g??sR?p'f#Y?????????O\????<???q?a??9xK??????????s????
^Nw????i??]???)P???zc7??M??<????s/?:?;????7?mW?9^???0d[?1???E??m?W???9Z??}???o?]1???&5?V&????1????????????}???????f?q)?Zi8????:4???}g????1h??Sm???
????????u3
???uH??F??hH????f??5_m&?< xS-??D???Ry????aF???5&?O<?m???)W?*??/??u?8f ?3=????????4???????`%
H??*??t?/???Y*??[cC???m?C1????\?F?lQPt9????q????s?"???????_?l?w?UK?????4RV_V#,
?????!?"l???yX??[_??G?0???A_6?????.?????4???vj???,????E4"?6`?~??|$U??(?KT???&?5??,?<nB
Q????g?"??E?/????1?y????!N?i[??d[c`?W?v?8p;?v?B??w?CB3?????XI??s???w?i???.4?? Q??"???txx??6?5Z???#E??}??agF?R???????U?^?R	?????)Y???Kr?f??O??????,"!??b??h??g??(???y??h?Fm?0????_~?j????C?0??Q?um
???U:n???o?f????bi???E?r'??
??v:????(x%???????U?.}[?????G??u??m?v?m??	K???d?t;7=?k??rr?????`/?0?#?Q??4???a??B at o?	
?_/??/Ho6VdEx???P?	?2?%<v?+?#??>??1?n0?J??1:????????d??N????gg??b???3?Hg+wh,?v??a?
N??(g?.na??????e?U]??L?
?????>????&?,{???7??2????Wk5,'?-
?S????q??????PV<M?`??;??v.?Ha?x*?j?[?3?3?|K???j?????i????????I??*"?@?(?b?f????#???????{En?Cd??y??5?;???????8????!?Ethq???[??_????
?<e??te??????U???/??e?z]??Y$?z[?/???x???T+q????L?k0?y?j#?x?PQ???vq??J?0??Jv??t???????+??f??????zn??L3
^???NQ????vF???????\NT?}?
??7??<_???aL??cR8???g????????.?O?d?)?r?????????+????"???*k?F6???Iw???????;????????T
z?l??b(???8?a95?\?q4#????3
=<?f?v}??0=?5????q??r(????@??????????]??o?e??F????rXS???hz_????~??<<?q??^?q?w..t??3????????=?:S\Q??C???4?E?;?V???*,;;?;????j??f{`?-?_L?_aCz??e??^???Ii???e+???$??G,bE0???pt?V??????J?F???{e?????3???^VZRtW~??]?w??-5?t?I?~m????W????6?(?~??8?+`?2?A.??|	4?~?4h?T9????5?#~??Us4p!?9a^}?%k????S.[#]?q??

??;M6??P??=??S*????0?g??f?JI<<J;??L??M$T)nOR5?z\v#+?????o???KTKX*???o?p??r??!????R???K?????@?r????7????^????e?Q?<@0:z??L?7Dy?c??????sc	?7B?I*SgW???????{?????N?*?? q}???s?ij??????c??M?{'????K4U?R????[?y??	Z_XX????6]-?????.S=2?	?????????D??E??8???%?9?q?Fvw??/?/?????k?K??d???f?&?E?;???{O????
e???????????Fg"?`???? ???oI]g{)GWW"M??`r?:h??U??b??.??2-?-??(?z??s?j?=?!?Oow??!????cCF?1??xS??
?K&???B???????????Q
??U)????\?? ;?B???-??"??A???9??1?R7?qb/?@??????_?z<
I????p??N????wQ????ihp}?S5Z????P???4!????}??z?? ??=+?T8MZ}kE\?;???Vj'???H?????????*n??tM;??Z?????????=U?>{^?euzw??#?B??k 9????X?U?!?<??????h??????W?l-??n???(???@?fuW??Q?Dj?????????oK4????tJ?#?Nf?Jn:?[??????!????jXt<
?6??2,?)>%o$$??ogn?V?>????^?i?Y5
3e}?-??,???6??b???}t?%?????A'9,???6W_4????G?;c?m?m??K?E??|Z?0?67B?eC&??y]?{??;X?v????Nii
???>~"
7a??z?-?
???w??d|????[t??#i????|Z?p???????????52O??B
??{?lN?T?<??^x?????3??_9m7?,?;?#?(??/(?????Za?SBf??D_'??y???\MJ?>|??3??UmTR????&???S?F{d3??e??=b$?????.!? o5??|sW?????????2?cs????9?0?????e????k.l?
?R??N8?????
?????m??5oQ???W;???Qw?/4??,g$o?;?pcF????????m?1?Z8???|??%???Q??=?w???,?|!?G:??ws?kN???2o~\?????x???m?\>C?+??<?[?CG????I??;>?????9~?0?p?00{3?3
?????g????;?????]?
V\??L???<?x"????|xs?[?\w!???????r??+J??@?B?Z???l??<?5???Kw???1??^???z?u??"?tbf?>?~M{;???? O?????B>?)??=?
@?:r?C?g???g>??!?#'?????<?K9K?iR???L|??????????Y?"(bP??q*V?
????cQ????H?=?????$??b?N??3
Z??=??%?$i??'??a?Li?3T?4??Z6???4??????94?S
Vf(?????Y????w?????QQq_aq
??(Ey???????yyy??|?P?P1%!T?4?5J?4??l??!IAfd??#?CT
2?!F???h?1?T8??z?HP?L?	2s/?N?VI??1????4?>????Z????a?dRE?8?"!!????m????k?~?????3J??????g??)?
O??d?1k	??i?{2??
???????????zN?8M
?????_?2Zp?????eo3+}?????6?r[$??QG?t?????$e???.???O??~O???w???B??S,?6????????????1??<'9'??Y??|?U???k????e???B???4s????.U??????W???)?L????U??yf????7???\?5h?????????<$'??>]??wg}?????????O??>????=??2j?W???C?o??^
%?^?????X?N???????x<??j~?R???|??87z?F?A?bc?pH????B?g7Q!T?GBvBC2G???VdXV??`??????)&		?N	??K?l???"
[??ny?vq???_>?(??:?A??????Ri????`9???M???r?oA4)&?q??4?k????w(??Z?(D?\?T??,??4???&,g???????
(???F	???
???2???!?b?[??Gh?%?Z?8??
?&+Z??J:??63P?hi:~A??????Df???b???2????(HN?*lu??:/?1= /?a?Jp?:0??I?Lo
?:?	?
?@q
??e]s
DCV?/D?????"??? ?
???
?B+B+F??Eh2U\?V???G?b&?????N?D;? ??8???|??|6?nE
??N?0???h??(?????<bx]???_0?K??y???b???.?qGa??D????$G\?p,??5
?1?Q??f??]T?
n"????G
????k]???????Z?g?0??A@?~?l???!?y????SyM
S?1`U5??T???gI?L?
?kp??]rQ??g@`?b4;}/?????N?0?G?HZk??}?.=??k>ga????????Px?y?sN9Vpk???o???J????n??]1x6?R???9??
xiL!?
????2???0?p?A?????w?????????z?\?^?v?s>w??tiOT	0?a4??d5*j????#???????+???z????2C$ ??IS#m??9f?6?t?-	?>????!?/?8?5?_b>?`?4`f8???9?r2G?j$)????e?x?.????<d?lB?S ????9?W4?y?? ?????
+??
??(??
J;?q?%?lAX?:E???????u? ?1???H?YK?R?F??M?#?L?
v?????i???0?)????8????C????G??-?4"?@J???????y??	?C?8/M4???ZLS???pp?P??????Dqbg59???B\??`???!??????1??G?UjQ([@>?A?T#I??]?6%?MDFMvvmc?fOJ???y????(?D????,?r??c????tJb_?p54?i6o?"??H??tkv?;j\U??????*NE2S??O???????+GM?'???4?MC??s4????P?dpu?_?%
4?4??aC?*?4
S=?????? ??7
$

F{O???JE??b`P?V????<	?r???R??	?>n?????????@?????T#t??????%YA:?~?/???~<?gG???Kxn???5r????^??~?=?jb(f?L??n?????Bp??c??w?>???)?????&??c????????S
??=K??P?T?????=>6:???????u?W?<0???z????<^qr??V_?w]?????L?Oy???~??p??*?,?????3@???N:~Cr1?????O?_??????'????????_???o???6}>}??????*???N??w??8r??yG??{???e~_?i?7?0??O??V??????????????[?????Ba?????G??GwM?LX??2??l???,?f???>g?????sI@D???
?`???XU<????	
??vL.??????5k?]?H???}??F:???????
E?C????:?W1???a}?"???W???r?OM?2!
???nJ(P???&x
b???k?Qz?]CT???R??i?????????E_???D?R?|z?[????=?zC???_U?1V?0?A??8???j+?
 A?0????4XE?H???????kk?DWtNx?@$?M??????5??/2@?22??????f??Jv]??G??????=?`A?8?b??5I????h ?#nL?&b?x??7s>??5???????????J#???qUN?B]HC???????^?????&o???5 ???:?EI(?+ztY?NN????Y[?Mv?j$i?
???E??WH)?8a??(??/|????{?a???;??>]`__?E??5???&?:c?ZBz??V??)?K>??p??2!?s?%??0!#??????}??,??6 s$? Sk??#[???X?\B%????F??0??I????KB?c???R???/I?M8s???@?#':p?l&R??=??????????T9ER??'
???]?????Y?Fy*D???AG?r?
?2??ZiB?vJ?????????HY???l?$??1??W1?`?O??1?Q???,?*=R?R&?>'W??????n????K??t?y???????u??o??????9????M???~?K???"????*Jsr?EU'??h>j??b??? (6K??Lp+r?4F????Ni*???+#_6??)?[?,??{?v
r?????OiQ?[$????|???;???$?????a?go???N?S?0??r??EH???`??????7?????]c%??]@Hw???]?]??DK???\d???<Y??z?3}?Q??]??v??	Q\q??8??{??|??
?5C}
c2By~k????
?????????/r???*???????AKm9?4?fl4???FG??v???V?,)???o?A????K???~]|??oA??}???o???q;l??G?~?K?Ey?
*6p>?ND??g??Sq???W@?<W?????l(?r???0??y2?%????t!??(B.?[x+???	??????E?????d?jS?Tc????!d?R??r?????I|?^NN|??oa?1??????g?????9?yx????W??????lx9Gx=3?????????:?K?M?w}?Rce?z?x??J????W??9???????Y??T??xl????u2oE0???(?8?]K???z!M???????^M_!a???W-OF?]p*IU	%?'???????$??{9??rW???_?????V???QYn?7WY?.m?j???5??~?x?????;QrgG.?[?Hza??S?>a%????5???
oR???i???????
	?tR?R????X??uk?OP?v????????A
????;G?q?_??c?????aB'H????4????%_??a???,???|?{,+?O
?????xUH?`??$?????lj??y?A?PMu%?T??<Q?
???????=eb?3???r?????4??=????Eww?R*??&??Q??~J'?j???_Hb?????K??????~g<?M}?????????????#??O|?O??@?????f/oCX??3?h\???????Z?X???k????\??q?D??4?3U??"??OUs?????U??
&z??~?
u????I?n??VS??9???O?x?3?????	7??@P????(????
/?g?j|????????k^???????????>?8??????|2h#????LFMX??P????3P?????'?v??:?+?*?b??vuPl
k????q?
Xo}~???C?Bx ?=?HWS????.????"????-?????mE???j???46????????H?+?]~s?wc??U?m???
?#J4w?hj1??LuK?w'/7/7?????????@?h?7???~?C??g?]?B}v??o???K??\??
9wr????'r??gI?m????
Q??*f9?????????G;?k????????n???O,'G?(?N1^??????)|{?#???G??4?J????y?(??OCF0EY?+=??dT????"?@?,z??u??(o???????????Ty???_O<Lu????+?^???C?Q+??????n?;4p??????????H?Zm?mq??i?V?HH???w???Y?????S???.??{?????\?u??i????y??Uy?-UT?????3??R?m?????
m]U?\??
????v??A???Q?1??[????V{??????Cj6.:?(??b#?;?M??d.n?Pn???'*9?,???q?	?)????O????+?K??O?????I.iuh???o??W;??R??F}??????Hm??!??6????t(I?*????7?t??3????Swp7??<S$0??????#?4???h??z??93?>?U&???U?v/O???Wm?pG??
?s??M?x$?$y?"?H?)?bP??????Q@????He??????????????fq:??????p}????Vxp6
7?$^5??B?????b?Wn????
e?HD&
??x?4??????hs??c9?D 4?#DC_s?DDirBf?L????Gw??1?#??Q????_??:?=Dqj??`???0??{!/????>???xXs?????>$sX}?<???I??(;???????;6?D???Ab?&??W??3?n??8?Y?i?q?
???`Z jF?;0?? fe?O\V?Z???a?R?4????????x?????52????'G-EM0???Y?????#M?:??I????"?_O?q?H??v?no`Ah~?%65??-?r?>P???l?Zi"b?_;e*1?v??T@{a???P???e?Vv?.?K|?]?????ets_Q???Nz.?k?o{??:w1k4?1???\O?????Ft<??-??3E0?????F????bp?K?-???B?auo?????(?_IMy??$YB?f'?u???e>*l?????=]yz???f???'????Nf?
z)
???K?????r?-?3?z?.?$+???z???
=L???QMT\[n???D??R>xw]?=o??VTf????y?su??wn???N?r<?CF??s??$7?J?[<??9??4?+,???f8??}I????v?0J:??g????????t??(??3]?m??c1??????
Cy-??,?????p??????%????-?'54W?~?[?o?[]
?v(q??@???Z??b?qYEt??/M??oWV;.?u???l????5Xe2???`d??C>=?????????lq?B???0??Q1&|?o??~Q/???1?W|fzyX??B? ??"??9?gq=U???B9-????u??<^?U??\9?^???	???????ef???KdmZ?sKgC<?-??f?)?O:k?8]X??m?e?????k????CcM?m??#	c?q??{?Eh?d6H???Q???<?#??+?mUf}?Q???g?N?ZS??????a??????????5??B;?.<?]?W#???j?~???pS3??A??F>????$Z???E???????:?'????k???|???pO???FQku	?c?dz????l3??T????H?(Q??P"%"??~??&?R I!?%??dHQ?"???l?$
Z?#)"
?Fe!F"R??r??b	?U? ?&???hB(???Z7?RH?%?m?5,*?????N?*??j?#,?(?0????2e??E?Q?-d?V8??aV??!??????8@:4?!j8?A?$??	?SA??r???Q?DBQ???Vmc*2&?Q???=?`PUE?C????8
?B
^(c???h?????@?Z?3?? ???!>Yl?"U?	?R????-K??r\ ????22b???
??T??zX???H??w
n?f?xg*X<3t4??cTu?? ?$H?? X;A??
??
????%-??????O?DyP{`???/:?/?Ch??L?X??y_@?Jjbt????`o????
?#???p
%??L?P?l]"?A??!!??)?8???HP;??2?8????E@?Q@??DE??????TD?4?#	D?>?N?|??S?????+:t??
W?4?H??(?aGpS?????k$? ?%????????^????????8???zL(%?a?B*()??i?b^r=US
2?t?????w?Q?A??8P?x4f??h??	??Uh???C???AI?p?A';?e?@?????
?O?2v@?qg?p?t[?????%N?U??7??4D?d? ??q05Y#5lu(<lgF)g
#^?l??Y?n??aF ?P??1?R???4nuDl2J"??r#V
?URn5I(??k$??#??#df4????b3???=?.?0Pt????Y
+5&??X????(?1?Pe?-?
9???@??????$?G?????~s???r+
?Ew[?????BJ"*??????^????^.7?G???z|.?D(?5l??????|$?R?:??P?9??*?BK?`??WT???|?|~7?d??.8?=???=???_:)??g?_??%
e??????\#????W?E??}x6i???T)9?.?P?Y????~? ?OG??m|?$??X??q-???bH???B???9??>J9w??f<:v+????J)?Xc???N!!$?	S#6Z#W????????u??????Q,`?K:t?L?GRD?4?PB?fkc|??U#l?????UW????6}7s??8dj?]???b?.??V?I??^P????????????????f???
?f;?????K{????
??I?b9?????
{^$???|DRg$?E???????3???oF???Y?on8?Kq????
b\????3Ra????A??xc?}?}???y?S?s?P????I3\??fo????#"?5???????????????????????????{?Vr???t,+H??9???m2?'4sc?????u5?rHI?$??`??4eV+???=@S?7?????*#?
??u#?5N?0?2|?K?B??U???uVBb????(??2??T?v??E??~c5<?m?iz*x?|?`??$E?u!6????,?Vozs?h?p,??R?O?A????P?+s?s????q?h?l?-9?"5????a??j????>M<????q?d?/M-"?
?O?z????5???????J?j????????3W?q_F????X
\??dA?s&ia??U}??Q??????a?
??[ ??!?;2??>u??T??U???~???H?%x?x?=R??1?Z)?RBSBq?_e?0k?r?hk?8??3?z m
^kl???XU??8????f??Kh~[?k?i??^*?N.??s?(f?TF???/fM	B??????2?????wh???`??3?L?'d???S?<??g-?
?z?'u??G?? ????gje!?$???l??>????b?
p??XsO?????j?v[]M&?$d0R&a????2?@/??0	?U_yW#?R?????L????r?'??????f?(?\???'tjUR?u???B??????b3^????????z0??V6f???uHEKb0?6?s?
O
??Fd?$
X	#t????^??4?'???f?j??0??7??iT???T at J\p???Z5??8o??F?i???.ou??>\%?????HC?L?$??"?&??	???`[v??ML?1??g??T??`?k?????t?d??????????????-?zL??W?k?4?x?J???i?
?~?x
????????w?n????W??L?Nx??r?w??
$????Z?}?????2?*????????????Q?[??TN
?????!??^h?????n??VD`?A?Y5???
G????[xD#????BK?o?:?Gg???0???????@O???+2?????#H?!H<fJ&?j?dCL{????d0
N1y??p{?c0?^??0M
+ at HP???c_??1:??LO4~?vBBn????]??<P?k???|\Y???@?F p7???3??
??????h???5ZZ3U????1?Jb)??I?z(?QS?u??U??f????^?5??y?????A?~??1????]?x{??_??w???|??=?NQ>MP?E:SP?hz??@p?B
?????m???&??ij??????\???YL?C??=??k???R?*????!c??tmI??u?c??n0?9??1?n??F?n?v?m??*???;]???;????_?c?o???:?wp???Fh??
8%$??6+. s?[d????F????h?w?w;???g"\<G??O????>????????????5?#1d?`?,Q?
????"??J?? ????gYpb?B-T?wX,??C8? m?????&??
i?:
5????Ff????5??k????
Stj?;??H?
???`h?C???.????]??u?A?q?.
?
?>?I?;a0??ad?+?p??
rp??+?]?T?<>
?h?????9??(?L???E?N?5Ufw?F?
>?{M???????????<B+?b+~v?EQ???3.+??I??????[????/:?j+/?{1????u???x?3C??WPL???^x?u?y??~???N?B?L,?vS	[???t\??k??f???????b???Ny]i8???'?????9??_6/????_Mw????s?|/?>)??H.:???W?.(N?WP??????B???F?????V?3gQ ??yL??~?<????{u_*!!c{?]?Is?G>?,??
?<m??E?H??K??L??Q!????]???%??8???[??A?????7?????????(?|???W?m???H???;s??r?o???=??|/?ZP?v??Y#?(????b??x]??t???!#????X7@????Gc?o????:91?0T!*?(???
?12/"?Ge?86??4Nr{?i????	:??PeG?<P?k?o?????`~9	???????T$??&?'?G?	l????}e?????\??DP1.??\hHS.??[???f~?*?v?	?????!?jh???p{????v?01??c&/4????%??!?7t??CLl5D???O?7??6???Oe?????????Z??_?Z????
 \?6????~?F????K,a???????)e?
'\??5???Wf|?sue9??-???Z???[?,N???k?????9?????%?=??????>Q??????????/??K)b??WoM.{?ja_???gx,q?5????>???f?y$?r?5?LC??
	3To!|6??k?t???????$m?hj(?;??????zc????E? ?Z?G??<I?Q_o?g??iz(?2????Z?|???I???????|'ef_??xl?|J???6?
-%Dp#A ?1p??	0?l?????md???QL???7C????z??=^?1z?`Fu?l?L????JElF?,?l?8???Xf?"y},?])b/Y~?????z???_~??????c????????[?6v?9?4??S?H?)z????????????w???@?????S?g?p?Q??,!H$_?0U9????
?~?s8T??(?????????1/??=`t4???1Q	???q?#?y?'????9??Q~??A???t??E! /????s??]|?w?s??rrAOyh????J?@???v	F?2d?[#r!????P?L*??mpl?aO???R?1??Zj^
?%m?????4???
P???S?T????v?6?|9??????????T?>?????l!s???(?
??n)?W?J?WPxe?T?m?*??~?2?U????????c0???v????!??g???????=c????????'??[g???o!MQ??????ul0,??
?"???qP???m-Y?`8??.*c????D\?S!(p?x??S?g????d]O?T*??@??m???????#;???????pQ?`?????C%M,?0D???$?J?U at k2*??I%????????????.??6?.
??C$u??2h?L?3???3????\K	??s????EW<?3_???????l??n?8hBO???@(D??????D?6
?_??l?e?9?
????!??????5E?h??`/???z
KS2?)??9p^J????t???UT??Bp?d??g???4???G?????i?.h??.?#?	lY!????_HaNz???z
L?N?%61??????3??<???S??X
???*????k?f\??bQO?t
z?2??0??/?S.)3?????H????????CR^XX?????DUb?2??9??O&?
?$?U~???;???"hz@%??uW??d??d???@???????Nth?-?6?u??'	?Xy?????+mHlkg]
???b2#"?H??^??????????U???C??m?`??,?0?6?*F6
?????? Z?@?76?B?????=y??q?i[;!??V.??&?}?C4i	
?_?
G??
d@
Xo?W??$Pc:t? D67y@
I??O????????Y?????{???1???u??????????
G???lBS??
w??WY0N???4??????u??f??]G'???*6=v(??5???????Q??^????T}?0mL0???7{;??????
1?T5A?C?20? $????v???L?mksZ7yP???y??q??"???2;????(?
L@?5??4gx<?*???W???????h ?9B????nxst2B??_??^??????ol???[??+oL6+?h?6??s????I
?6???j??g?lZJ?mK?F??U????Fu??J???h???d??V?x????hZ	?S7G|50K??????????`p? ?L?+?!
?%1
?0?*B @??A?R??>????::
??Hh2{e:??&&?c??(???C#F??cu?D?(Q????CT?)$??"???n4}?????X|??????Ix?>??????]?y?,
??*??????(?????h?????v?8?????s?X??G????????EK??%????b?$,?5E"2?]ug?j)
f?????rn??&I	???J?O+3
??????o?0???=0??U?Om????.u/?r2v???????!????z??L????'Ph1?c/4????????~	?K??HIBHI%????E?(????u?h??????PQQU}?x??{b?D>????>??~~z?3?U?Y{hE?^???py????????fBH??Y??S???7??????????>^t?=?+=??H?OSO?"S?J?&c?R???l[?'W]??Z????????}???g?????????L;"H?8???
?a
?PL3??$??
8???PXP?4?????\?Lj?x!=??Yo??i???f???o?G??<?8?h????s?&
??m?k6?3??F????Syj-??OP???eF??c?/~~!?<??P?jR??????[?M6&1??????Wt?7p?M?k00y?(f????j?"???????????f?????|?5)j/kC??MxN?w????M?C??-^O<?w??%OY?$dCW2???9dy???????{R??"??@r.??`???H/??<??EX??6????C6D??}????-??N?I??????~u?????1QqTf$WR?$D?? ?RO??P~%????f!???????<?g??=?????
??r?Z???(?????5????-"40/K=?f	QggV?A?????k^ND;<???X?	?Y???????L?o?C??V?]5
0????p???i?^O?\s"??!??t??Q?6???*????+<LDHX 0?en?.?m?Q???hZ^\????q???&2?ff???O!??????0?i?????'??&bu?3\??DxsR(?N?
????g??faH?????{????me??zzj?z?+???
???k,????o?????Q???dDQa?"h?|+g?2?;?az?~???\A?}?;??n?`??????<Z??
GUM?A??f?ry?}V=???????x???LC?#?+?H????	?d????O>&Jd?m???~Q???
????xwj?
Y?????????UT???$v?0???{"t?i?
?
I??F?D???78[U>Da,z?g?
???6??p6?~??E.?wp?mEX?h7?
3??r????????<1???w?$]???U
;;???>m?F~
?
P????? ?/???lM???{????0\&cz????r??d?|??0Na???@kM?p?i?j???}??%??l
?U???y205w\?a??<?0L?Km7?)??^e?<??qJJ?:??i??#????K??Y???6???fY??f]??k??
?????kO??WR??G?????I?QR?6?,??X??k???n??mw???!???
?1B'X??w?L???y9??S?Wf??G?7??2?cy??j ?p0/??pl?$=??j?k#?3??b?]??M???
????t??
??F?R/??(?(DD?????BT?D??lN?ym??s?}aI%?Z~??3"??0|*W?QYYr%)?{gJI8?c?;??fH?)$?j]???)?FI?a<?!?*??.??????E??3???FF???8??,??#0?	??
?j????=?M??!?G??\???L$t?H??S?q??c?C?BH??;0???\??]???Zo???m???????&e7?c????'9wt?wy??N?7??o?O??S?R??y??b?
??A?T?'9j\???8{?T*4??????l?L?5M?>t1??-5d?C?,???Z-?dX? ?r`]?1,}??>Of?|?Ifs?M?????Z?????*?c?r??F(?uU?;?<.?)?jS????M8`B???????2???\~oy???????5'ww?7?Id?`[??|@???kp????o???????????=`?:]8>4A?2?bf???33Yh???Ne?m03??R???}?$#y?s?A??Q\?
???v?????????i?,? ??b~j?	?	??al
?;B?kE??B?>5??v2ni=???+?7??????????!G??G??4?B?e^???N^?	?$	??d}????}???????-v??d?,?U???L?mLf???2???"??obW"??e???|???7?????Wo?8??y`??????E??????
G???~?*??????0m
??wE????0P?
?WJ??u????
?Ef???-???0??_q??
G?/???u?rHHo???Q????????w?Q?T??
??@??-??????lC"??U?H????G0M
?Nj4???
"???>,?o??BIq[k???K???<nF#dby?)B&+?^????e?V?????_???~?>?P?????F5???1??????G??W:lUu??Y?V???9?o??????5^?-?l???????m?????xva?|
?^;?5Po?!?#?D??Np??Cp?????g?s??s??#??Ik?????X??37???
vA?;???'%?S?Y?
??.??9?U?o??!??*t;U?"??
4??
?v?K}??6?[?{V??X?"?-?=<??o?h???"2??b ??<?'ra??l??g?%%?H?????_]z??f`??|???u?<wi??????1?
6z?<?q?F1f!??S4?G@S??????>y?b9????$*o??\?@n}?
E\o??8??}?	?x?XwZ????*weNq.????x??$4?=?3?"=x??????l?????k?????????:?e??S??+f??d?w??(??
4?o????[??&Y?w??5c??0|?*??t????R??5??gA?o?U?Y??,?G2?A?!?n?????t??????P2??????_???d??????g????m	????E#?T?W?E??????"n)??????e?????????H???A BaG.??????h??BG?V????????????/B1?!?x????
?3
#?"???c???2?E/?n/nl\?B?j	A???	????;??O?>??U??rST~_Y0??eYu_`,c?8???C?aS????	??t 1????Rhcl<?.?	????M?w+|5??a?WN??e??-hy????:??w<?@If?$???.f???L??z???S?^cfmE?e?6X??!????????2F??????k?'?0?B9?zerh?
????]
??????s?xn?M?Dvi?*(???hs?n
?Eu?cM?X?C???)54t
,?;????0??u??u^?ps+?k?Z???d6G_C?Nc??&?b??B;2?Ua?????O?q?N?o??[??/s??????G??C?#?*~???Ip?j(????Z,D?7???-?e???C?????fau;?q????~/??+???????^x?|<?<"?? ??????Y?zz??p????c???5#}R??
?,??6[+?????g,??q??4&?KJ?=r	hZ)b?U?oc??*U?_?3?U???]?t??}??????wb?p?,??
v?Z?/?b?zuW?-?A?????PR?}??[??)<hq????NW5.M`??.???ku?????????e????:u~?6????}u>i?_>?1)????s?R?
?-?K?x????G?/]??fOI??z)T??j"?l??C??????P?N?{?Md??	?C1????$l??,.)????@?e?p????<???F?i???6???1mV?T???jT??I?qN??V???e???ug??D??(?*??[:c?Z2??%???$kL???????W]q?$?R;?????g???/???{<?W?Hn?{???C l?o?k??n???????????r?|??n??]e?3?w4a???;G????$*??\	:?]h?s?Z??i?>????}uW]x??9?v
?
?pt???a`?	??l???@??.j?rY??&??_???j6;?????MY??GyK?UUF??B??M38???x??\??mZ?6???,ST?Cu???G-}F?W???k?|+??? ????J???V\????7j???J_?wl?p+ ????3????h???????k????B?-Zv???y31??????Y???????f?????]??.|??>?%.
!]8y^n5D^!y'W??????6v?K??????*G??=?4Kg
?+?3k?????Y??p???(l\e???X?????D?????%??`/?????!0?CgL?4??
6-9?h?D~3SDv??3s4{????;??rq?G?{2?????j6???A??H??%
?????*hX?+??Y?+??1??Wv?????
?V`????(L!?|?n?Ic??,x?d?`*???j?E?X??*??=M?=rd??L`K%L?]h?u?d??fk??d????? ??" ??)b)??1P?X	?
?I#c<**??=6?i?d7\???Tf|?gt?y?Lw`sD????o/gv!??@?{?g??????&d_???????b1	J?@???f???J,~??????F?
?T??M?U???J?H?<m	?G??dzxNS??@???}?]?/)????????c_?????????q??e?g???2aE?????=????w?O???}G&????7????j??????????/????~1???'mq?????????r????? ??????3?|?"F??0??E1D0r?t??_??Qw??N	?I?M/?f,m-?Z ?2??S??QD ??kK??}?&??5@{?????AB??F?{5??????(}lP?u???m?h}???:0???8c??\o5P???A2?Z-
?H2?idG#;?,.????u????
??_FG.?????r????^??q?f????	?
???'q??]??X????I?A?i?P?y?ru??f?`?"@v?6?$
!"?14[???~O???????
?
:??$??ND;?i8QE??|CDIhO?.??E???Qv?????O?&K????)?
z??)L.
$?3^???h??'70?D??,??zj,??<? ???o$??7]????Y????G)?E?98Y????Ry?o??/??uX??????<?>?1????y?ix??@?m?????U?Q?s?D8???O?5f???\:mU^s<??z4x??????G?a?H???V????J? 4?5y??d??;`a???A^R?3/%?<rg$E?????????=^?f!? ???^?C??7??*??*?N???
???<?????????9AH)?????c?{????(_
??&*>??l",?&?FE @|>?????aQ??Q??i?????Nz?q\P???w?R?@????%?|???0>???!"??~??d3??9T??5???
`:?7-???[???D????)aC??g???Y??=????U4PJDA??p!?"???u??j
a?x
F???????????d?k}????t	????+?,??2?$3??E?/?Z???????33?O???(?^		g??\??.E$ C??3?[?Yt?jrJ?H???CP?
???:2M??I	lI??????
??,w?^??1?`???????*Y??9??8??ch??

??P,?S?
???0#??2 ?
R?r4? l?X??d
p?d?K$?e$IL?>??/W??A? 

	?~`?}?H9?]c?7Kp?s???????q
22?#????/??????	7???Rc
4DC?v??.?Nv?Q'TQU????'???q?
J??JQ_$D??`?9??????F?8??
6?`??@?w9[??Al?) ?;?????????md #??C????O|??7?L?D?mPP1P?H?????????w?&? ???JI????_lI
??U?????X???#?@?}(??t?{A??jk???Z??"=?
`???w??B??en)N??)vj?_-??????bG-?yOf?=.w????lD~et?:???.?P??$?6I????6qY?i?}?T???H??.Yb?????[?
3?S???c???6???5T?}?????A?K?>?r??oE_%l?l?????8>????s?o?S?????[X
?????
X? H???O???7L
?E???)???H&x?	?G?e??Y]??IT"wO?????k8?2?
Q???[???M?j?#???7??geX???D?????;jdn?e?T
??B?CT.%N1%?ZO?8?
??W??????????tA0????@h$4\?Ip_?????es?p????p??wC?k?v>0
??A????H?n?!tPP1???t??:?`2
?? ????
??.?[?4E)a?_.?p?j??6j?i?????P? pY?{fDD?? IR?R????0???p ??^?0?K?96I?g`iP????Da ??	?6 ??aX??!?:???t??d?>*
?8?{???Q??A???1U????~:??:??lQ?S?-U
????
,d[??????~}?s?????T"
8P??&???{?q??n?CpZ?}?}f?.@?]OI?`?u(
#??,?kDq?????-?`?g%?nt?~??????4???p?U??Rs?D?g??(??b??&?
?SC???>b??
???5kAb???7e5
Y?K?.b\?0???;??'nO=?!?1??r?#d??`??=??,??????????5/!F?s???j?o?km3???&??4?#???%?D_?O??ZXhs???!?gd??????G	.???jn4mm??d???k??D?
?????W?)??Cv??R?o?
???k#df2??9rt!cGya?iF?0'c?8K=V?4?{??7r'???cp}lGl?r?9M?$Gw?W`
?:y??<o3?,;u??5?%????!Y????7&X?x??,?8Q?
40UZ.?
?@?TfHs??
:k?b??u?2???%?;?*^??B?`???v?B?
.X!`i
?5?
b??^????x??P:)?e??????Q??!????F????????
????????0?
raB??R??a-`???!?)F?f?.*????????C	3#}L'?0'
?=?cs?iR??J ?????[?PK??#	??`/S????y???????????f?P?X[???c?p?F?dB??L??P?T?G?B?B?f?b
????3
I???Wq??y?nCJ??$??q?`h???tA????z<V????U??
R?}?q??L?3??????	?u8Bt???C??R?a??6+4B?cb???A??<?*F?];??Y?x+$????@?p??? ?????4D??p?C?o(&9>S??T?1???7]2a0??"?`a|#MA??i?c?3?N?L??p?t:
???>S??J`?`?I-???<?D5	W
R?'x!???',?O?o?T??I?????
g????!:?-???#
?n?
???G???????????+1Aep?????po?9????
?3??y?????n??~????????????#c??v???N??]?f????DmTz|?=8???~a.)%o????2?????l9?4!1?s???:?kM?T?q?j`?"??
,

r\u##fA???7??????0?Q?6?Sj4}?Q????KO{??2??
J>,V$??\'?V???=B???"Bpp
?N?Id1?d?m???	
!????'?????1f?{w?q?

'	?R??AQ??P?)?k?w?$?}8?@{????M	?4?U?r?;????8^?LCj"???@?6l?iX?	?J@???{?V??yD??I)?aP|	?6????
Lq$??
???O
Hw?N?	??K?{??[
??l?YW"???*????T?7?????????????G?^Y????????:-??????-fH?????B? ?N)??C=?R??C?V/????3D
cp?H?+?q?m???8?q???? ??D???sa0???
??!E?C?O?}>??Q
+???"$?@"f	???5???%oBX?)?????,
g ?????4?? ??+????????1??iN??????=!???qB?=~?N??>???O??Y??	?8??$?L?????<??$D?u
?CcZ??A??=?>\??
}
0&???"a
????.A?H??FIM?uP??:?@:?p??f?N'RS????A?c?
???u4s???	?$
????A???j??
?8?],?
'a??
	??Y????
??m?$?????~?G??s????Ti?{<?
1aH??RZ???#f?~?????I??5x?D?
?vP?.??_???6??h??0?_???-?

?H	F	 ??i?0???Lw??Kw?_??4h??1)3???F?yy%%?$?q???'??s?i?e?T?D?
??????????$??z???*????
?P7Q?2??V(??T
???D??}W?G?A?9???
$,????y?1B?*??h?c"?"?????Q@??L1???
???w??
>q?????Wj???s?f?e"??:@0?)???????????H????????}H?EA????4;?a?~x??X8?bn?F
??s??c??4??<4SA?~?
?Y?D?T???F?,? ?(?D????
?=?d????;?9I7
?g(?:??<?????
!1D?`n??"0??@?	HD????Jn?(Z
?iCb?M??@?Dn?D)?x?????Kq??6??=??(?1?9?a??F?
??
8?Gj?4?'Jg{??????P??|????|*?PC??PG?E@?I?pmY???????*???????8?
?)?T?!?`_lh`??5,p(??1??knE??M??QDN??W(%???w??????m?B@!?r??(?a??[g2UA?Um??a?h??j????~7?!??P??eq<?&???&H:`??z?#w????7?AQQ?A?N"0???X??$
q???ob?@q{
w???\?8?????00e??2?$??????X??2]??(?N???0%?$5?x6'?IT 9?Ia?UUUUU^??!?O7?6??&?ji~?????)????E?D?w^"??PG?
?Z	??
/OTSv??p
??s
?R?"0??Cg???-??? ?C??f?,\? ??m?h??A1
?-??C???~??3???K?h(J??wIN?j
)?????Gg???X7Z???$Y@Gs?S^?$??
????v	?	??????J?^SH?C??$?B??@??l??!? ??????|
???b????$)??&?A?)?Q@n@??????3J<rEC??|??@?]o~?O\??n??"??0?7?R)??D?C??p???:Ie?h?mb???7??n\????9&?9?t?;?PV???W??D!??Z?l?df??F[
D1!1?;q ?8??,??&11B??I??
	???f?????!?&	?\?b?M)?/?f??o??*E:??KY7
???
!?x??ro??#??????X???}f?l?At??Lx?b?3?hC?O?????zg1????E????bo?m???@??C?B???-@$	?x?k~T<	?????fF@??~	(|
??<\??c?4????1O?'?by?[???U
????~MZmM?????7?
???<?3?+b?n????_?P?4x?pj????Y?I???!???@! ??r??U=???)??
?]?BeFH.?2"2
??(??g,b?E 
=??`???8!?
??k???!???g???????~? ??q????!4|a?`	`#?V?(L+a?
?oM}
?r???n at u
?hjN??@@!9"^e????iC??:JST?/3?6K?fF??`?P???$!b?r?g.K??,b	??2.?
??r???Iq;Y??????c???~??P??x@???"B??j???????t\3
:?ILr?R????.??{Y?????
4?[??/?N8?????o
F}I?r??@??B=>?
?l?K???X
S?D?Ry????dD,zQ???~m?\????B??	S???.?,??!v??$
??"B?5?JTd1?B?5?Y>?}?#?}??="?d???Z"?
????'g??]J????,??d4? ?\??*??????*(*
|???(???H????F?o???;???M???0????c??a?Y?9b??q??Z???Qt?Tt??'P
?Q9??J
b?tR?Ys????"D?x:K\q?
??p
-??[?g?{???
?U?=???d?(
?+d?|A?-????	:????????#??W???????S(??S?CR(??<@?*??"?@?'??)????Y`?j?2?#o?!?4?>??????v9f)???I#j>???8?@??`ke/?f'??/?r?????_gN?T?<?2#+???????ka&?????????
?h???`"?N?8:Aw?.?u?4?c	c???A
o{?
??? ?$?e??
??V??y+?(??p(?O(?.???F@^X????dZs?L,? ?,?_8{??q?l;??:?IO?????=Z:
 ????
???>??
?M?h?]??l???"J)?T??hhEI:8?`???7???2JJbe??? ^M@?w??????%?9?W?FA?,j
Y??%????s????Q??B??l???
?????#????P&j??"??U??????~????\;a?}$
=??#???????[#6?????????B???g?'#.???A
x??:??_szt?v}7>r`6f??#rc??:??R<?z?p/A??6l?:???#,??@8?\Y?@a?t?9????'A???<?Ju?O*?

?{"?
LWg:??RR
??5
??M????.??t???$>???h@?
p?+M???z5?p??
????`????wiF???v??~??43>8Y\4?V?G???
??????=?????B"?0n4????1hf??F&?B0???
?H??<?S#???????YA?4?4q?  ???'#??
#$H?????????H??B?QH?Bxa??t
????1T?o????$JB??A?????G?????????1?????b?87/?]r[\?m0?^????GY???m?rI??????C???l??Q\??7r%??aiL:??v?????:??xPi???x*?:d+?+?tUZx??/??a0A?q????_7'???=????D4D?B at O??u???W1???w??I?????*g<??cq;P
TrC???z???-3??8h;?????0?#?J:#g#????I?5!?????<#,4?(??{oXn7??d?l???Ye??M?Z????i?K?!?#Xi??[??????C.?Mc?Y??z?4?!{:???\<???IY?W??"Y????E? ?P??R????=$???]?A??H!?H???-?	7?Y??[7??}?ns@?C??????Xf<???E[c-???p??c?V?w???\q?tk?U-?o`??Th*
V%C4C1d
?(????j???'??cg??pw&-A???.?????wj2	?????G?;z>2?m= ???e>
? PK?#????Z6??`???????<x?N?&??????D?$g:?%?
I?	A(???*!P??
h??s?p]?;
???b?R??cjT?X???U????????????{U
?
C??5Vt?r?\??,[?????t?v
B ?`k
??????l??2_????%?buQ?b???xB?X8?A.????3c
?\???
w?{r??Z????<`a
B??~51?:?.Huc=?mSA%!d?D?~@?O?7S$8u?A??"?m??q??|??P`u????

t??\?%MR1XV8DP9?~V?<f|?,??;oP???U??j
h%???Q????x??f
?:??
??C?Y???>??~g=????TC?B??,[??8?(??0??B?t?~??V}???????LvJ???c?{??@/?C*?H|w??h?C???? D"	??j)_??4~???xh??g???(?|8d? ???W???f
P??:?j;?Zy???#?????=M?O?O?.Gvtn=?[mx?W???????????K# b????a??K?*???$?;????

???[5?5????ns-w)??	?5?A?&4
?_X2/23Ga?????>H9??$?t:?|?=???????TW
bh?J??p?Cvn?EC??x?ds????+{???2A???sLS
!	$??pNv???R?P7?%???R"??b?CDU?A7#	?oy?dgxC
???SB??T?3?t????r?
?[@k??jX?
	"??(lX?v.?.hA$ud?W?#d?V?D??3????k6????|?%???0??v???M??n??5'???U??d?????mj*?m???,????????>1??????1??}??J*?G???d??I???/??4?H?PjL??@?<~??`??}^?????H?G????O?
??g3???	r??KZ?tC????d?u??BS??Vz4??Vo??k??<?D?<?~/???(?^?\???????
1/??hCQ???<???*?
?H????hU?(w_?\~?

????s?~>? k

??K????yzh:I?I?N?7F
t
5?MD?N
?y???Hb?*uHHM???'?d?f??????????`7??
?2{?C??^o>a???f??P?jA?o?q?t?|??????H	aQ?????"??$B+?08[?????m?Vj??yZ?7????6?????
?I|Z?D???S%<0Y?&??N?8_???
?U??S???d-u?Q?bYw?p}??9?6!?6'S???9???=??%??[??

h?Q?&????1??:??????h???>B?a??????c!,DD"?ld???s?_??4?D????z?M
?????CKN?[	
0??????s?K???????
????1??????p?Q(C??w??J?wp?>E?8??LHz????uYX????{-?[t+_????V;X|K??R????u?2L$??&L3{????????FP????g1?????j???",q??4)'?a???m?2?a??3vj???_7?????0bt????????????<??6.?:N??9?_?%E??@?????????'i????)O-??>r???3???????&+c?,??e=?Hr?9????p??o?)??.?&??????????????????TC.>???g??a?2?7??t?Ji?g?=?$???Y?_?B???l?????R&???/??????Du?"?B?f???t?B ?????"5?T??U????$??P?Q?^?'??pz???d2??N3????Q??Q8a}X?A?ja?P??L?????D?)p????<????:????.??G?@?G????s?Q??????1????s&??<	???3?4???B?AJ<~&???T?[?$	?NjR????()?Z????? ?n?????????-?????i4?[.f?w)DtcCB(t?_??U4?EA??????P??2?s??>;???w<????~?I&?pwJ??	??P???al0????KH????]6\??
????2Id?Z??????^E,-????????	?_???73[]?o+?f?H at 9??7???????mD????nO???3???9??bB?/
?3?HY?^??O?uPe??gBU*X?x?H??????4?)zK??
A?FD3P?AJI9??{??z?p?n=J?qG"???3
G???8W????3?N
?]?d?s0?>?????<A
0w???????P??P?.(?????U?.!1
?m?b+W??{?PMUr???5k0
0S5h???B[?$
?q?(?
\??YeC\g??0?Kn?n
??XL??j?CXH?!??@r?????`??20M?D????????5Cs??{????
??W?p?%X?X???,,Ac??
?|??RIJ?.??b??#????B5	?????????^????????j08,1
N??	Q?&5???????q??Hy?.?
???+???6#e\i?[n?v3h2?????%0?<r?F_?9;???????.b?@??>???\?tnp?l:?c?????0F??x??K??!????P??u????&rlJ?<??Dw??>dL?u?,V??)v?q??ri?>??????W?A???j?aUL?T?J????K6??)c|^?$A?q?Ghf??I[?s?&?i`?I	??pp1=G?$c?,?[i#???W?3	"?$?F?0???W%s??????N?!?=??h5??<]K,q????+??]???c] R`C ChN?;?F??9?4bE???73j?3???4HM?A??k????P??????L???{??n3
(@?????n?
f6??$????Qx?9.?W??y1??z?A???mn??K7Sa???Lu`{?'y????5>?TL?TTH???u?@?{$?(?&:?~??[?=????k????:????}$?
??n?t?Fs?m$??????????P????4?Lq????#?^??B?@A?3
k~???];?"LS????i??<[?rb?G?Q1U	BNF?tfc??#k^8U??E?11????j"4??{d??	A?h??m?????L??_q?????	0?,??????&3gH-?Bd$????!$5?YB????1??~v?r?]?=??64|y?A?mz?t?qyX?kC?ozj?4M
H?[U9?*??_)b<q?bg?VO?eO??V?U
?z+?????????Vl?
???fh7f ?tv??9?9?m?0l8|
;??a???????HI$?/???????p????	$???????????P?))?4???l1?y}?????????
Ct7????A??(?sL???a*I0<|?'??4z???G???x???	K????'????!
?0?N??\??L????????}????:?{????f???}?B???\
M??i?$&??5?<?H1?<?dm?????
???M?? ;P?????A????o?gly]??$???~???5F?$???.??
????{s?)?????	^???6???=?	??z>?=%?x3???N????z??X?l??2????Fp0?B????K?\??I?F
H?o???j?)??Q?6"3??^vC?0G??T7?-G\G?!(l?w?$w??d??8!)O?PibhL??????3??????????}(??@s?????n"><.???4?B??X1??J(
Iba????"??+?@uH|?????EO??3
-)?MA?vB?f???????-?$eC?X??3?#?! ,|Hb_?Q?g=&?????,H??&V????M??(?????????-BBsD
?	????3???8k?RV'?????????Nf???K
????0)?D????i???k?f?????m'??
???L??9?/H?~??7?"7??C??m#?!&?T<![??!"<p	????>???p??A?]nb?	?l??@0???<?!?h?J at M?!O@????O?H{????Y?%K???"X???
?*???N??	??P6?T]E???P8????A?G7??
?.?b?? >?P?CU?d;b????}Y??-AlNlq/j?????Af@??/?(vI??K:????i?!?\?????(V%!??M????z<	??fPj?H?*?????pa???7
????jM&??]??????&?-??? p?V?
?|gn????I=?#??D?.???L?I#?????rU9?????uU~?[???I'??a?????$&?@?H`?(????
@?~9}????^T?C????#}|?LH?"}]!I'?RPZ	,
?,?????9?sa?-?????Fu"Y3?????V??}V??????*?;??#)????e?V?t??0y?=?>??|?R.ck?#?u?\?yV?VF?????-???e?8??=
?E4??jA?Vw0???U?c?
	?ZB?iZ?????B?h$?|??z??G???`??I???bb?h????o&??2?6&???b?????N?S??0zXg??????p]???)j??j?????Q@??1???(@u???@1?w?6??L?
?)E??\3???QQ8"???!?	??*???{???I??Q]"]~P???td????(??s?v?!?-J?? S(z?H
X??j1QXi+
X?VKw?&q`???BJI??]?6??@??e"?VkPr'??(x?&P???R?j?U9??	I??j5?H?PS?T5??X???.???d?^0`,?H0xA?;?"?;?w??w?O???&?&??L???eU)>???;}g?<?N???mQ
J 
>?]???pp?*j?[?M????!?K??'?????T??X_I??6??mDd?2??D,??o?@jm??O???ef?~?q?}
?nd?A-??lc|1R??5??
(
.:Y?h??	ER<}S?*?*?*??20D?0??!?d<?
?????`j??9?NGu?!se??B??o?|Nr4?)u/<????F?????z8t??h??
????
??7???`?/6???(F.h??H?%??[k?rz<X?(fhI ?s???+? ??j???r?5??pq?$eUG.iD9#?0???<?p?@?J?{?????:	?
J?]p??9??2????ra????U???????a??g???A?N????Ky???K?L??"?????Pl?%GY?????q???I?Q6Z???^??D?G???7w7???y_PH?????|?6????i????U)o??v???*p??x}7
.g?@???'u?h?c?
????=
??N???p?D?
?ez???!?AY?'?Sf??J?
???j?7?EE4???:T???!??>U????T<??)?a??z&?+?Q??!!C9H~???Y?d???????A@?A5???`?h!???????y~_?O!?j??>Vd???F/????q??U?O,|????r?X7FO?????9???h*(8?:acb@?????"???	?gD??\0?~?H?????Z?1???i
? ?T??'cn??IHB(6?hZ?d?*?B)
?`V???) ????+v
(?Ej?C???(??6?M???SM1?I??7??4?? ??R?7CS-hhq?&|b?
mp?X ??a?R#?\U???#?g??=	Kf?ae??D????)	mQQ?c+i??????E???/na?4?F????-4nj?l@???i???&?b>?!Sb???F??SR?PATDE?-????
?db(?pO?
??]???7a:"I?8?17????QND?@K??
???4fT/!QHSAe{?
?!?;????2=?t??Gp0?iTJ????uaP????<\@???
I??2x?X?t??5?\?+8"?j
?g????*??C3??B?U??I0????
&?Zh
B9J??
r>?D??b??>?
D$?|?????~????%2?WR?$?K??
??{??0???'
{Y??????:?s?{??N?f????	 ??c?C??<??????$?iks??x?????q?r????T?m??9#@?]?|1???ekN?@?F?? *?&H`?J?J&?jh(??C?????i?
?|Z}?????!$S??,?s? ????(:?}????P?
T?U*???>????
???j)Ly?a4<	_??f??T???k8?q??{a???&??(?~???Q???&?.1CQ??5??baD?'???A???0C???3?-:???A???7?dK??`??W?X??i??????)?@?
?C?H&$<#?b??W?K??j???
????dgWI??w?hN??????-2*?1L?/ 
Hx??
!?????&???k?1C??-1m$B#i3?Us?	Sg?D??"?
|????Q???X??0??D~?`?R?[?)(?)??8;?????f R?J?f# !E..??L

]?_n:?f
??a??a?
?="L?m???QX??I????dL?(+x?y??2??

6
??H???ADH?eM?,???2"Q?q???q????TA?D
W????;????R#??F?V5??]??
?????cish? ?s????d=?-????F? jP?H?@o?5??l?<i????oho7??Um
?\????I?
??Xvk\k!
X???????Sd??F/#@J>YWH4??K????QK????=????~??l?@?i?#?\?]?/iur?* X???qf?S???nu4?i!???fhg?&????S?n??MJ???H?q???#I+?*!???7?E?`ux???Dk??????e?
??0??ot
??LZ????Q? a???$
?	q??r?i$?_???????O??~??i6??,?g?,@??C?????n???u?SfA???V?????P????3"5<?Tc???Z??????T???QTT.MbJ?.?J	??k5??"?}}%??+7m?????3?J??X?????@DWic???
??w?7????&K???????<>????!(ZoDi?T?/S???h?M)?????.a???^??Q,(?UJ????6???[???u???+xq??5X???TI4y?bw???k???h@1??{?G?@A??7;?Y?q?n
i??
?F?9J???1"?X(??!?b???
?a4<?	?????F?a$D!"l?0???%P"??+\??rd???	5???h?(?(i(	?? ?l??X?
?i?E2????8
?>?j!????`??{??-?H???T???????&0`?b?a$n?0hf ?54??3F(??K2c??	?2???'??\P???1?6???t?50$$?L??4?H5D??2?5B?MP?RTD$?AR?R???R?
??	"\1???[??& ???0???!???D#Y?jv<??C????l3????????j?^
`????j?7 ?8D??a>!?nHK????p?_9??i?J4???02?Q???$FH?? $:
?_?>???r
i????????Y????&??mEQ^=??P2]??g
O??????1C??????5{?????-??F?
?!?
! ???@Xy??U
?+??????29??4!I
??
wG6??F?P~]??\8.???~3?i6???O?)]????1?o53A	p?	???YU?}???y???<????????-??>X$?u}?;q??????O,?d@??Z?n!?????h?@(?????$?
??-|?bXEz?Yq?"???WXr????3?SP;aW???]??6A$Ta=x3?f7YT7????p"xam3
?M8?S??d??T????(?2?0X??nF
?4^????T?AG$h;???`5
?P^i????}?m-???0??n?N???&4?t"?q7!?S?M?w/?fE?`G|?QL??0?/?A??2C?Tm??2?ZelH?:C0???0m?????	??U????b]?od????qP??a1
????I3%??l	?4m??
???7Gk??1??W??vI??Q|)?u?f?\n????:??????Lh!B&'???@?????h

????B?!?????????wu??m?)????!??LOV%???u?Yf??
???D?](?6??06?L	????v?0??
?1??(????4???k9?i????
??
????9??9??"&???T?*?J?s??P7?i?A??r?0??@Ue(m?3&x?@tGs0?7C?X??{???????5???K?Sr?&?\%???????+LC?*?g????m??%????i? M??.v/]?1??u????E^
?]A???gQzs<8{?s|r???-:S??Q????ru?7n%s?4????a??X??v3?f????P8??????^?\?*??d?c?M????
L??fz??u??[xf?lqk?H??;7?"o?[9m?1?????j?w?p!"??B??????Nj:BG*?3i7e??J??V???"????8??@??St???4HI?q??s?	???g a?HKnpr?a?`???t??v)??5???f?ge??(?7ot?Z??f??J)Q??$?U???q?vU?ya3?x
?;????:?l??30M???b4???&7??qOI5??#w??4?	MbyE&6???g~vz????>??&&[m6???
qpj????lD??m?~q??`%?9?f;??I6??N??`???WF?km0??<AV??]??;r??c??P7?????r????t??xA???L?<???s?m	
??Xx?+?HoU.?;o??@?r0?-?`JE0??Y??{?-?\?#?????0rK?????F??!6P??=8?E.?? K?s?v ?D?????` f%;e??
?7?&\.5?b?????F?U??lPF??D$???;N????)??-1?	?1!?0???4?Nvu?6?zA?O]???vl??42^1????????????%m???C3
|????n?z??4??x?2??K?L??????3
/?50*????I???p?0&g????c??Ge??v???0??
?m?po??;>x8(???(??x???? ]??3??|b???3v??C?7?g:?Z`Yv?2??Xfd?0?5}??|??U#\;l??a???x??[Y??????????I0??[??x%
_>??M??r???`??K?{??6?Z
L?Z3?O?
???fgfjq???????V??d????%i??????m???c?(.
#?[?wY???-~b\z????a?2??c?ol?
P??"h??oQ5?F??????? ??^??4?Nl^??m??ch)?{2]&Xr??d?:C?6-??????8?????m'[oG?w???M}D6????(u??????"?+d?r?v7????M<!p8
???#W?l?$	??#M?y-q??;???t????&E)??6cZ?H???$Zw0??O??? I?3Uz?????M?S?shCP?&???H?? /$??]?t`G6"
3?egN?x????jtcr?$?km?a>?_g?8????K???U#'
??Lo??8???	??X????I6y:Z???)ibbS???(? f\51*?Q??u?????y}???s?:?t??g ???{n9??Pi??n????\???????
?????I(\???Sy? 0
??-?v2?T????]?
HBhD???3ihao??3??	?X????M???B?9?K???A??@??{d??????J-??$3$I?O???0???????????`I?v??V?7?(f?ci$??EluX??1HD?qn?}?VA???	??(?q?jZ?q?5?v??
'R+I??$???f<?b:??A?p6	??.XF'	L?1???[Da??SC?J!??E??)???	Z??Xa??H]??J?HWN?b?a&??h????$??	??14???$??4??/n(????<X
2y?a????R at 9??0???t??*x??B? ?n?c???9?f?'NgY15???,nY\?4?)|????\??J_???????I?5?h0?????Og???Z???U:??????l9@?(5???6????%? ?
&P?4?{???=???(f??n1|UH at oD?9?EP0??+?:?#??q!??9???"bzLD[???(C?U????
??m?JM??????qs???1]=????*X?;???xkKg???z??X?????
Y)????Tznnmh??1?????A?|?,??q?lgj*???nE??{x??g??]?^!?h??{?\)??????L?8???5+(?2?????C?mC?;?&???@??5?6????M?+M#0????m??8?f
B??-??f???y???swu???6F+?f?	'??[J}?????Fw???@????:.GG??c6??j.?L?I
RH?h???M???mn?C??S;&
????a0??H?Qe?e;j???a???}?$?8Mv????aP?	??U??1*??t!?H???Zm?y??\XT?????M[??s??f?6?R? ????Y6??&8l?^?{L!?p-???6T?Y???0}??=zLk?,<fV????????????
g???vk??t
?@`V?????-?<??????R ]!?@?MTJ!a!?
s??)J4?*?"????Z??{????????????Aa\??,<??	?Hl ?KqB??p??'"??????og???????DK??h0?`A$VE?'0

)>~???)?`~???s?^?tl[rD?o???$?J'????u??W?i??R??E??=??2B??:?'?V??AAI5,?1???	??A??w?
JF`???q?????o??<???????k?E????HIS???
G?9?DI"?
H&Ufb??dD?H?? &?N??	?4@???T?i???^?~???~-
d@??jF?Ca<?tu??s?8????
E?4-/A?@???!??SF??X?v??j?
?h?4??`	?1}???H!8???S],p????yL??
????????z??'?E??
?}?}g??
]wS???sW	???D????k?1???h?3???pu+??1?????}??,??x????q!4X???0T	?YD($???sX??#_w_???????.??I32?????.Z?1?$?
?i??EEh????D?i?8?}j??1?y??q6?A??@?`c
`???9??`?E ?jl}?????.L?@*??!?K`'9?Hw???X5`s`?:0???B?GmEd83L?=
?H^??U??&????w? ?A??c?4d???L+o?????c1%O0????U?(4Q$Q???Tl??
??cF?r??3??p5?nE?????G???L?|???/R^?????l"?@D??@???B??y?????YQ???R!?(??o
?\???	?|<-?eR???2
-?????
s)???T ??$
?\cg???L?xE,?]U?h|???H???????????p???2?DC?%E??S%?tV?;?F?Cv[d???H.?o;??09?}m?-???T????????\]??v????$d?Gw????7?%??"?8??p?e8???B?o??<????Ads?S2,?
im.e??u?uh?%?/Kko$p???????&???0A??C3o????	?	??????f??W#?/_?|??c?g?G?I?{c#?_N???)'J
???Q@?bG=A,???=M????U2`&Q>?P5?!
?ZmQ?"?&?????/VK??n???,?8Y ??s????&=m?????S??xf'??v\??X?5-
?<???#^????0?????n!v?zw<?b?k2?`??v??qK3x??
RU]??o?GmQ??t??.???z??)b????{??K?)M??bs????:?R?,?R
?0?A??%($H?0???rS,
!'???A?~jM`nH???%|?yf?>Z???%?|^;?s??jy?Ve??\><3??????I??8??C?^?X`?^?&A?#???C??=d}s????8M?
???O?)?U\?"??|??|?#&n??????H(??????"~??83??|??7?~?`AJ?X?:?QiU|(L?@?h????? YE`JQCv@?B?T????C_ln[??3Z?0?
4????:Q?(?tAa?!??-??b?H?n?,??o2Q&V%
Z+p9??!J"SB$2?(?	h?.????#$?	?u-??
?a:?MZ???dS?E??bY??l???J?(rkZO?/EM??????vI??8H????3LH????7?%E??HA??@n?l???f)??3
7AM
??4?d49!???AC?N?
ef???ZM?w2?M???*I
A?M
?&~??d8Y????'r@$$=?.??
!Z?????!f?E????J%??{U???#d`E?U??*??????n??K??????f??
?%A~??0:??????????? ?(!??M?:d?4a??o??????k+??[?p?V?\>d??????L	Z+
:??X?~??1??
d??
2?8'??\??Y^?Rafu???m??*Oq?6Q????|Xqg&.Zb?=???????r????a?????PVw??K,T#?&?^>E??\???3&AE[???d?z9w?G{Q??{|>??~???MLN?3?Yw
??0J?6b?F??*'??i?E??}}w??|Cr??????\??-?'??z
?r???????l??B?
????t??_(Gy?M??2?1
K:? !?C?????fP??<LOs3??*Oz?q??a????*?4=#'??`?P4??t?q??G?????????0??6?????I??+_A??h??R6p???d\??
y
?%??Ft??zt:??4O??r'?0a???L?D?????e?????/	?TH???^UE;??%????^???g 
)???z?s	(
4???Z?????U?y??:???h?? ???? ??-=?_?p?
u???UH1???+???(Ff??1?V80?M??)+?rG?$:B9(?/H? t?: $7
j
GL??T?c
??V@,:`'zW??:?Z?B#?B?U?iq?J??N0x?N?;?['
!
??M???&!??bT????u???z??IT????sQ-?H}??l????6G??(>5????:PM??????9?MPF}Y???=?
??M?N?!Wa?-x?	?t|?????{V
?i31????!rX????Cj<@???`?
;<?@?`??=?y??D?&?R?k??RLc5??
?+&?7JL??KF????c?$??i280??????U%?c]"?d???pp?@??s?3??r "#L???;I$@ ??? 1??=E?K?Z?(?sDd?EF???R?9:?Q??&YC`??$h?"p?H
Q?F?5?a? 3=??(?g{G?`??C#??'?y??+#?d$C??{!??????????RY?`???b??F??6??XfI????H?Z?2?)??ZT(???1
A??{?#gQm???
2?
qn??`=U??iJ?CS???Ei?R??e?6?????\jo??????BI?????"n0?
P*??
hJ"??Q ?f??#}??PsS?I
h(???QBEE?TF?@?@??
Lq??i?*?*??	Jdb
?B?

&R!=?e?=l????QH?UuVO????33'??,???RdQ???}??~???b3t??b?Q?I?#r9}???x??b?u??#a4?FA??%1JX?
?K)????-D?Fh>???$??e?phM??k?v??E'
Y?5=??{??$'?$
I&?A;S????????H?YT????V??k????e??P?%???G+U?-?"???h??
?;oeZ???I%@A??????|}??pJ??~?i??????]??1?*{??u?
!?????T?i*e{UTn??a??a??F?Dm??C^ ?1?H?U	

???
??????PG???X????????aP????AC?bk?"B????W??j?wQ?>??Q??>??????{???Q?4D?x?t????-x}?FGBp????
;<gxdg?Q{?????????o??+'?p???,????g????n???(?$
bf#???v?9?BBr5b?!H?J???q01&(?n???)r`?????ZAHz?R????n
??pE?2zf
?CBR'??
A'?????iI?8??"????k???n1?sR?\:7?f??r?? ?aPJj?x???lu?U1??<?5?$[???d????8+
?DG<??Q'H?SRDRASS???????9???????V``D`???Zj??xHxq1!??I?+???Ny??u??r??v????1??????h????+??l???x???S?,??;;?^???6C??E???@L;v????E_???R???L+0??
 
I6??FE?JF??,$p7oCN?l???)???|?????
?.g?\&?2???8C?	?C??9???????hxh1
2??FCh?XZ??k???|R:?F?%5!?:??????S???A??><???U?@?M?B??*I??H!c>b??}??????<?P,???o?E!)???????t?vz?VA"?I
?s?j??C?b?W?,??? ?E???p???
?O????y??g?t???>?
??4,????X&C????0$(??4}???:?m?v
&??*??N?~u+e@???DC????pt??s?|?-?????J$!7???????????>	s?^X-l~P?%B*p??,C!????>?4'????????#?8<??DD?N???)?'?iF[km??6??7?OaJ?@?B?8?T?5?U5??iz?(?
??????s?_?6???,i??jQ?}?]????V?A7???$??????	?`oi4?d??Z?Pt<???J???,?D;#{# ???p/??0?|??k??????????=?w??N???T?.???<Y?????
@?Fkc?(?(?3?4?q?8~?8(`?????D???*?e??D?}??????x22?+V?w?????j?g?1???>?5(?n2+?i????F???P?^")Qf??-3Jl?H?8_??
?[V[Xi0?T/????"??w_?m?k??r??????S????????Jl ??e?[????86???z??f?#?j?<A??,s???V?TSeJ?;o]?k[,?W
?n5O;29L??N????c?\Pt?f?qM?e?f
???o??(u^4Y??q???k!??3
F??j/^@?????h*??#???WO?M??D
6??pX?h???uq??????I?]?O?~??,????0?Efa4?*O? ???
????h??Y?????Y0=p=z'?A?[?UP??E$*!QJ?(C$?
?|!?T+E2????
?P?5EY?0?DPC?$??D
DKJ?RD?@????%
??????X?:E??????'?~?3??????L?P???
3?
???t?HI|:D????@?Q???'L??q??s?.D??UZ 	Q?!J1???????????G???J?	j,6'0?0??o???5??L?????r???????<?/>"+g???? (0?^??:?6(?L\N?:5??"5?syB???*???J%??=?^g??D?"hNq??!?K????R????2?D?	??!?(v?(?=<??p??AX?D-(;(????I??W??p??<???h'?haR?P?HoZ????KP.?@]??;??;1??|eBU#R?O???,?	??,?@2??%
b???????UTy`w??zKx???:?z??????*?M?^?xTP?<?(??C???J*???{?5???	<?k???>_-?1?+ ?V??`??BV?Z	B?!??
?Q	2t;!?S?}?I?A?+?b???@?,?XX??[S?????=7????z???>?~??D?y~??
????2)	*N$8?)
?m???%?.c+"???Cx?U^,???????
6?????6~??t???a?@?K%?@?aL
?z??E"OE?$ ?F???^????f?F??+i??Hb<!????JF?R?????yFFQ???
8??N???N@?$Cr&?<?<?a????Ay?R??1?:?s?gw ?#1i?.'J)h0$???
????Wy??
??	????w????????^??&c?4kI?????2??C$Mf?2???#P??m?n??


??Y????l?7?q?
u'f???C ?p?^"???
?y3{^??)??0G8Q?4}?uA??y!gk$??????<K?????/?6??b????
?	???H?q?r???1y????}?&?? ??&???;?
??
???$,? ?bH?y???v?0?y???wK]???67&u' ?J?L4?E'j?u	@R??(?@?????R??1??????1?D=KL?S??dRZ???c???-??C14?	??$????DTAD??
?/ldTL???v^t?8?h*"???Q??#???(????^3???n???h???b??|??!????JQ ?Q??2B?
PD???0#?~>h?W1?'C??;???F>?`E????a???Igi?%?!2??6,S???w???1B??????y?C????c)-'????N	?'i?????/??)F?$BK4h$o/????O???M?G???y:???????)??2J( "????%+221
8?)?q+?<:?<o?%j?B?]?????9???6u@???CQX??j?
Q?eC??x?wA=c?k_??'?\????*??`YG?????<?u?Mw?<#??h?>?|??`?????N?G??G?kxh?P??l???3?~eAC?<f????S?-?;????????Ct???t????$nHT??????l???(?????y??
?????9|???1$E????-?@C???Mp?3?3ZOz?.?????Yw<? r????h???????8{??S0rh??(F?{?q???A????>?)??$ ?^hhH	?acC?0????\uX??a?E???dDL#?m&?@?m?)h??????K")D!?)?^????M??M?(?4m0v?&???$?j?(g??`??
????(*??$??jCR???	??????+q?r??#???????O"???8?c?c0>kvCt?	'??g???q??a?
$?,????A?>?????c*?~??r??{???????
3?
?6?6??^???=?x??
?=?F?D?&?"?n;`F??	bAJ	.????P5??-i???R??-M#?????*@#?:?w??>??k?<?( ?????????A[?d7?? F0?8M??o???)<<:????????33D%?G?=Mj ?,R????C?EV??Z[=?['EN???4?tF????!0?YS?Fh????U?????'??
rj1?e?!	??9?X??-?.??@>??$w???F?:?????0?????q???PB?8??C?{%91?1??8Rm?1?d??]?g|?c?"?w??@4??????rI?/
??????:<3A???$??vj?O?L??w-b|1????p?????
???????????q?vC	0???????5??X???9??Xz3dE0g?M"?)???(B?WIYC?:?-]?c-?;?5Xc?w?*????az?t?C?LqI?*5C????1?P?Kq????_Hn9???)???v???zb>??$????m??]??{????E?y????w?Y$}~?:-Q??U????O??d????-C+?????????T??A6v????@?	????p~^??k?nA??;????}??????_?U^???%?u?8'??@?	????r?B?|???e?$ ?(?S?O|??K???v]?th?P@%?
?d?IP`wB????}a??,C??[??WR0??L??}W?a?ad????`R?@?<HAx at cX??Tx????????????Q???[f?{D???9?KU$?,??"JhD?i?F)?I?hl???M)]??R?7j?? mYjU]??k?Q??A
??2?	H???L?EQD?
?qBY??&bD?16 ?!y<s
U(?p?|???;&^?t;@?2?c?V?K2?b?tS??@aH(??????p!??&?x?RG\
?%??=?/-p???h?$?}SGm???`$??gNz??w-cd#M??????J??}??`a?h??????Q/?|*??
??@??)??DTB??T=HH????D9?.[??????B???Ey]???8?Y6????????"H}?????	?????~????!???-??e????G"??F?,Q?B~????9??$???%
b?O????8
??????`??cyumVB???8??X 	??
?pTwHC???i?=eu`???R?5R?q??BL?????r?(?J?-??? ?|?v;?P,???n?6??pC???D?
i?wm??R[??D$Z???F????
?H3b{f?)9?b?m?H;-?R?l???E?U??IT?4??2l+?7V??q q???,?R??ch??d14?
?(?Hx???????2fq?65??:??{x?c?"1Bft??0?v??]??C?Pe??]1rU??,+RT?q4)(fKD?p+%?L??H????V????"%?/N??k@?EUB?Y??M9q?6$???n<e=?a
r?=?Y??^a?Yp?X?hh?d??I a&Y??d_????!?3???9
?
t?FZL?!???????YKYZ??d????qq?`p?1N??1??1)???Z?dP???4?????J?c??A??E???m??{Bn$#??A???a|FfETa?P???'?L?`098?????4c????f`??Q\?AJVD?6???x:d?lS8?o@?"w??t??`?????3?&I???????
RV?(h????>(J,??Hy???W/?j?X???? mtO``?	u&??"Q~???@`3@?!B?[Z??	i???}????<?d??7???????}?????9?|????8??????AjJ?v?????BV{p???y??Gu".?x?H?C2??f??s?.?i?7???N?????????D ?+?C??????5E)???N#aZ?~?I at a(?q$z?!w???t?=??mq\r????@?S???
(p00??????I	<????6dI??
z?t?wG?????U???Z?5l?????0eV???fW?
1x?f??!???@?&Y?
K?5????-(RP_??W?A???M"??T(
?????HA$S4JG /?2?<???'B??X?o
?w??	?_Q??P???t????zd??C?`pP????s$?b??:????h??e}R?;???`N?????B??J|???lXR???Q??VJ?"F!
&?
bV$????F 
ZPB"?bD?ebhR`?$iiE?@>xJ
-?mjW
??Q?U?D}lqphn??(_PC: !?H>8a}\??????Nn???"(S
?6????
??<????~??00???7p?G9e?j ?Q2-7#K?]|???6????A???(??
C!?
)?2cT2AM??A		P?=??8????????3???{?O?(?z(?|?$O??L?@)???D??
?~?? '??D=[?X?r}#?G$-? ?`k???E(F??KA9&?M??"??wf?A?????UpC?
C?K?D?X?|T6?4?(?XX?2???????????????????????z????????g???M???j???????????????t???????????'????/?????8?s????????5~?F????e????????????????????????G??????=?????????????????c????????]?N_?????????????????o??4<??????^????}??7n???_???Vf???????????g?????/?????;aJ?IIm?????4	*? ?jO?*4$???????02F?B?
R??X5D?2?????`CYf5&I?PQ#
E$?h)
f)K,?6a??:????VD?C??@I?'??m?$BL?
D-
?"!?R???H?1?
?"??,?1?B?X?"
$?a???
?? ?2pQ?b??\?0
??`q?hO????D?
?@??7?P.???Z?d %??i?,?3@?-CDI@??? ?P!

????uksNc# ?c?-?X?????L6S??A??4e'??????{?'????M
<?+????y`?Ln??g?y???E
????????????????k3 ?????N??4hg(????E#w?????hl*Z:??QG}fju
??Ze??l???V???Q???????4H?9j???-?v??!??#? ????+D m?r???3nS??Qp?	a?0?]>n^?????F`lo?M?L?????!?!???RA+???{??N
*J??b?)?X???B)?%b?B??F*Z*?,P?????D??<??(?N@?g?)
?D?@?P$??#????2G1???U59"2H0???_H:E???H
???&?????????$Q??)???
Fde
???!?(
XX?=???B???????1F??e)??)i?????J??????n??????{2????{@?>w?>????@E???<????@?????v?#P???? ??h?))??'t?T?D?2??(Y.?b???
????4?????C??f???
@??? ?HY
(d ne&?$;??301%
4??!?f	?????9? 	??N|?
??k#-H%":?1??Y`??L??
?`?
????N?J???????&hG?U???'??H????E
n	
?C???`??L?/i??????3?+?*!??I??q?
"???	1$f?C??????e'?J'??W??0????'??h????rNa????0T???\v?H?x?=c?;)LS????Ql???????cjd???:??s?????c=?O???8??F?b???u???;?s{?t=PO?"p?o"???????)??_??QR???}/?]D(???k??9!G???
\??
b??
????b???tN:`&G?k?
?+0??jX??PlA?PiF?#?K???)?L?n??I?f?UCBP%?fofe?s??.?$?u??;L???8?D?=?`"?(n2@.?6ok?????3?mMf
5E."?8????$s??S??Mf??#??_
,?? 
6|?8~???CWb???Y>??3?A:@??	??Z?p???@?4}??!????z@?/|x????6?@??:HQh!G@??xb??,?@L?+H??r?{????rKq??????W?"k^T?x?E?V-??\??$??	?@?7????`>n???/_?cje?n????S????????`B?3P?????S??LBA??????bZ????y?????
?EH??:tOq?2z<Vc%K?&?{0??!f(?032?~M8???Co+=???C???????d??N??
??&"5??b???|
	???<????{???!3-|3?y7cj????'??eL?4H?S??|??l?L? S????6?sk'?M$???m?O?m?????
:??Z??(y?!D????K??HMX?8&?

??G?0sn?C1B?@?4P????Ed*??*P????????Y>2?????$?:??(w?G??$?????,?f?0L?P#m?HdlI
+
????
?????@???p??/
????	???=xe?;:?U?!?rrr??? ?E?>]~??O?_??*5????d?/????? ?qwC?
?X?1u
??L?a???_??&Zj?_??}\3??q??S}??z??sl?:\?|n^??Om;%X3?My????7?S$??8??N?s???5^ZZE?+???Ba @???o?J?1???AJ?4??7O?????`bW???|?w34?????????qWAq+??	?????u?????
??Q?1;??t?VR3m??-???????"^??M???I?N3F\.???c~??HI??^?????hs??????1?';b??!?:u?x??????4??
d?
|?j??_?(w????????o?9???D;5?p??v??r?Fl"W~?l?-V??Q?I*??T?????4?????U???????"?dx???;??d\?zT?eB;\??;???
??&vX???/?
M44????????sZ????zd??a?2c??????r4??T?????
S?P?|????
?
????????mY?????S???[??qT??M?8C?q??0?5?R?Q"??E??!AA?L?????=?N~?`jsp??
??%d?Nm6gZ?T????X???????H'????#?0???64=??EPSM%??C@?	??v.FC?c?0??????$?c?T?J?6-I%%??0?bG?????????R?????
Jb8x7????K?~?5?s????ovf?*?n6mp??Rnd2?????++x???S?????5???^q?h_?th???|????P>???
?D?}?????(???@???uH!%??o??D????R?
?s'FU)O?????:??u??9?8&?
v?l??>???????????CO????9??sZ?Qk\^\?j?/?Cp???@??
&L/????}A??S\^h=??R???0??0P-)MJv?m?????VMa?7'Q9?
??????mHc?i??X??FW?s?????g???A???~?0??????c???Oc?v2???????f??B????l?1?~???s??C?b'&(Tq??M {Xq?u?&??
Jt?rX?????????? w???????s?'?Ni????C1????q?f}???Q??
,???l!?Sx?k???~??	?;
@??hB?_?????V&`F	L
???Q?(T??B?YkCbI
F?i??6Y?\??R?"<??yDL`?q?d?B????6???-??AH|8??9
?)(??TBa@?@?$??QF?
??G IL-d?$!? B??6??!u?Q?	??	cmj?\???h%??_??p??6??4Hw????4?c??
?a??uN???9??gph??ju??c????	???!X-???
Q?9&??????????(SP?jH,?iL??j?+????0M?
h??$?i  >L?`?a?G?J3"?_?S??`:@!?/?@??Qk?W???<p~?????W?+?~???????#?B^??????mg???@??f??I??e0???(3CG{?t??S?RLbBB?D'?h:??8X???x???>:??!?g??'Y<Q?D??C??'?O\\jk3*??R??????
GX?x?v77??P.???#o?$|g?????? :??8???=???6!S?~??? ???
_???fG?=9?????????#???yH????'[!?I??????a????uk3?????
??j????`???i?98I
?vMx
?(??	`???? ???!????J??yUHR	!???@L?RBP????<?@???C\?@'??? R6????*?0A???@??a??-k?40d!?E)d???G)
???Q??b?
?i	??$L?5???$????r???p??"??^ 	?????0O???8hG?L#?G$?? ??<?????A?I?:C
{?????lG?

?31s??&4,?b2 at dc??A8a?Dv??& ????C???$i,??7?*??DB??
?????L???1?0z":j??????????
b'?Ahy?c?+??z????P9?n??ofQ&{`??&?A?s?x????.??4vBx?n??
?y?c
?<W?<?|????#??$6?0?F?F??x??????:?????????1????%????|:?c?&=ShEO????\;?L??|;????$?????P??*\?	????	?? lU??
s??,???I\D?&G??yV?????"??1z?????5?x???n?N	?r???????
?[??x??R[??R????t?q
?X?;a?	W???a???9?b:?M?~???u?J ?V?
|Q?>9=2?]?eT@?k??("	?3f??I%??X!?vu??{?|+?=??2???+??r?qz?????????c?+?=Y?h#k?p???F????Y?e4?;??Oo?????6Y??h}???/??LEr?-0i4.?MvT?t?????k??g???+?0 ??hb???????8????	
|?#???	
?B at h?Y?I
N8???????I;A?1^Y??\K?Ve?????????	;?H?kra??:???M?=??e???4$???bR????$@:K??i.e?'?f?v??9Y???J2?w*??????2?S
?Mr??
???r?{.mR??M?7?G}H:fH???JE^?? ?0???}??$&}?????wO{?????m??????~2s
???1C??D???F?Mg??_????w:?G*???0?qY???]~8QI$???#??!?fzt??r?*???3???????4?7??E????b?CGLX4?U|~????o?rR?
?u?z??Gj???8??gk??-&QSN??O?A??2?O???fw??6E??U?k?<?[?6????*?3??G?>?j???
??A?{w????K?Yvab???4?G?R"?T????/;?;
?????e,????X?;?@f?uS?g?!??-???aFxI? V.B)?M??.	X?H&A????????????1S?J{??rD~8=MJ???S*???Bx?z????b3q?e?8??i$|??9????Y???????0oB???l8R??<5
?Mp?l?(??'f??B?'?uHG??9v???3?s?????b?9hzvt????01????}>tH???c?oG??(<'?$?:}?%?	v?????'(???<?????? >b$???V
?G???6a?n at S
?ak?M?? gF?$??????0??"?`??p?h/
Y???k?F??.D?#??P?#?2J?W?A???$??????	
q????V ?Cf??HT?e????.??\J	 4$=p????%??5?(H
s???0?<E?yS|?<N
?!%?q	
?B?	L???*???0?C	?pb$iN??|??_O?/'?? ????k3u?A??F????3
?????UUUQUE]su?7UUUUUUURIj?WQ'>'ds(??>?U6???????[??"?????K4SP2?	  ?z4???y8M?v????]*?N??J?:??J*$<????_?Rvt???l
???<.?Px???=??J?$^i(\????*fG?I
??|ipBG????c?"?V????	K??]?;??>??$???I???{??\?0?2Y2?????~?~~h???7?V???S0?&
2Zs????g?cx(??h?\??
$vJ?5??4?2?]??|??	
?$=SCM(TtOq??h%???t??8????
8??[!??<???WQ??:??n????????P4???Xk8?;;?X???pT$>8OT??~
?e?4x?+?????6d|?:????????1??
6???E
?$Z0?D3X?2r?????:@??p?q?P?s???!?
?>s??|
)?????=^???m7?g_???N??pm83K??t7?eCw??+QI??f??r P??z?X?????????f?=Mi????c?H??
?4?4???24????|Y0U?UPL?
|???Ro?na?|?@?} ????????8???|?7???7w(?!???K?pC??u??????3???@?7?HD???	?8i??5?5|dT?k??????????
DF?(??)	??9?q?;?t???GI"M??????W?7?H??K?????a/?f?[??????!d'?(?V?????%?FcnQ??7?j?m???l??E??qM???
X?SXC?D?533S[?be??,s???;7???ox?.SXQT???????????U??
y?
?:??av?I?-????S?f=d?&F?Qf(?????b/v????4	?V+gz??????x????>a?b6 8A^Y???hEi???%C+w?J?q?zMq@???6?J
1F?R????<\V???/hX?r7?<????? ;????T1l????B
?3??|??^??	??4?;??!???{]?4>?u?9?????h??#??x?d?N,`2X?#?Quc?>?H;~????C??l??
?h8?Z<?@??h0?&
,??5
??I:?<t?|?W???BI??Pm	???|Y??D??|???|(??x?[????R????f;
?w}x?#????????p??!SI????T??W1?%??gS??2a?????C?Kr
?:~?Y?b?s??GB`?<??u?!@d??P????9?f?l?7?????2??'?s?F???,?S???T???M???\2<\B?????????tO
ck?@s?r???L??1??tW:?^??5;??EL?Q?0qMb,?xr??u&4'[o??L,??	?u?`Glg?\?wf??r?s&8W??
#| Zj?S?N+?!?????'??r?P????m??vQ?????`%?<?+}u'?O?-b?9???
?S2m???X????=???mc??h?x???|?5??j.??e?&V??Yyx??Q?Z??
??Y?:7N0??4"??;?!	?jh???a2???l;?<j????C?G?%'b@?/L???B?M??12 ??R!D??M?QvKB??\???T?w?U	
=?L???x????;??j6I?i??2????c??'???O???????E????????ut?$`O??W?]??y???jV??O7+?z}??3F??9?????]???@K?^?
+?
t	y?$Z
T
(????@??
+(?/?~?e
?'|?M$?%0CDb|g``?\? A}???)t?6?

9??#??1?*????H???$}vC?N&HK_6???3\?E?"H&b??4YZ"??tZ5G?7??wbR"dh"x?LE?t??
&((f?0?? ?r????&?b?Xd??pCQ?^??????`?T?F?g????ER?iN? ???(#??S?B?,*nd?"'2???p*(h(a?KA?!?z?{c?	?"?f
aUT?ZAC???*???;?}?C3,???`?????P y%????
?]?'Cr???*Zy?Y??
X??
?c1?	
r?t??a???Wz???A??,?#?,??q A;?H?8?,fa0????6&???TnH7a
CD????3N?$?HB*
Z
??k?T??;`?	BE?TG?)?"???V6I?h??~?O?/????=??=>$??=X0[??$E?9?B1??O?/???[??x:?!&@?;?@???

=Fh@: ????A?*zDo???????1?	???Q?/????\??
?
?_????3?*?d????@w?C?+?WR??????9?Uf???k???j_j? *???.i?????????R?3??????\?t?&a??43?Sf7??X8??4????????Y0?&??H?8{???7^??z?qBI?v?J?????bwTNdf)?B?I?@QJAL??Kf?Ue#?@?/D??D0	?t??H"rN???I?z??j?w??fD??]>??'
P	?d?$???@??????????????*?\??cDA?j?A???x?@????w??eG&?)??
,,*??v?Ddgx??

?H?O???P)?????mm???Z?!
[?????
>;UN?Sm ????R?4eT32?[?J:?Q?R\1??1Q???\??Q?Vt????W?y????
|?`???#(??k-S
a?-???[?Ke?&\X?2,2??*?
?"E?? ?7?o?fIS?a????IEq0H?v
z????
P??9?
??Db(?{???E9BiN?K??.EAP????;?(?9>?6??"H;?"???Z??????f!?
??d??*?_2("????{??R??k?p???3???T?E9???
V????&
?o??????=3L??\?????z_>fg?)L?????(M0?-?0?M??T???e2?s0s#??NK
??V????%C0a?G???4>1?g??
??|
???'Cs?!???6???????????'?????j"iB=
V??7?]	?T
}???????Qn??C???Qr;?Y?
?SE???;?c??t6?%????4?!~????jo?0??3?n?w?%???G???????
?u???T=Q
?%?????"????
??????????z?=-?D??)?b????V1{?; L??f?w({??????=<?1GZm}DDx`????v?
??7k?M&?=???D?2T?	rP??)?R"&?J(?)?'#!?(u?T???B at J?HDHJLP????PQCH?4??\$?
?@??8%?*



From emaldonado at fedoraproject.org  Wed Aug 19 23:03:21 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:03:21 +0000 (UTC)
Subject: rpms/nss-util/devel sources,1.1,1.2
Message-ID: <20090819230321.B864211C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28229

Modified Files:
	sources 
Log Message:
Added nss-util source tar


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:13:42 -0000	1.1
+++ sources	19 Aug 2009 23:03:21 -0000	1.2
@@ -0,0 +1 @@
+405ec2373d85f45c1afd79b9005f7513  nss-util-3.12.3.99.3.tar.bz2



From itamarjp at fedoraproject.org  Wed Aug 19 23:03:15 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed, 19 Aug 2009 23:03:15 +0000 (UTC)
Subject: rpms/dahdi-tools/devel dahdi-tools-modprobe_warn.diff, NONE,
	1.1 dahdi-tools.spec, 1.8, 1.9 import.log, 1.1, 1.2
Message-ID: <20090819230315.D52FD11C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/dahdi-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28083/devel

Modified Files:
	dahdi-tools.spec import.log 
Added Files:
	dahdi-tools-modprobe_warn.diff 
Log Message:
- fix 495453


dahdi-tools-modprobe_warn.diff:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dahdi-tools-modprobe_warn.diff ---
diff -ruNp a/dahdi-tools-2.1.0.2/Makefile b/dahdi-tools-2.1.0.2/Makefile
--- a/dahdi-tools-2.1.0.2/Makefile	2008-12-15 18:19:07.000000000 -0200
+++ b/dahdi-tools-2.1.0.2/Makefile	2009-08-19 19:37:35.489155883 -0300
@@ -69,8 +69,8 @@ endif
 
 RCCONF_FILE	= /etc/dahdi/init.conf
 MODULES_FILE	= /etc/dahdi/modules
-MODPROBE_FILE	= /etc/modprobe.d/dahdi
-BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist
+MODPROBE_FILE	= /etc/modprobe.d/dahdi.conf
+BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist.conf
 
 NETSCR_DIR	:= $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts ))
 ifneq (,$(NETSCR_DIR))


Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/dahdi-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dahdi-tools.spec	24 Jul 2009 19:55:59 -0000	1.8
+++ dahdi-tools.spec	19 Aug 2009 23:03:15 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           dahdi-tools
 Version:        %{tools_version}
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Userspace tools to configure the DAHDI kernel modules
 
 Group:          System Environment/Libraries
@@ -30,6 +30,8 @@ Requires(preun): /sbin/service
 
 Conflicts:      zaptel-utils
 
+#patch from https://issues.asterisk.org/view.php?id=15454
+Patch0: dahdi-tools-modprobe_warn.diff
 
 %description
 DAHDI stands for Digium Asterisk Hardware Device Interface. This
@@ -59,6 +61,8 @@ developing applications that use DAHDI h
 ln -s dahdi-linux-%{linux_version}/include include
 %{__perl} -pi -e 's/chkconfig:\s([0-9]+)\s([0-9]+)\s([0-9]+)/chkconfig: - \2 \3/' dahdi.init
 
+%patch0 -p2
+
 %build
 
 pushd menuselect/mxml
@@ -112,8 +116,8 @@ fi
 %config(noreplace) %{_sysconfdir}/dahdi/system.conf
 %{_sysconfdir}/hotplug/usb/xpp_fxloader
 %config(noreplace) %{_sysconfdir}/hotplug/usb/xpp_fxloader.usermap
-%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi
-%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist
+%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.conf
+%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist.conf
 %{_initrddir}/dahdi
 %{_sbindir}/dahdi_cfg
 %{_sbindir}/dahdi_genconf
@@ -160,6 +164,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.1.0.2-8
+- fix bz 495453 (/etc/modprobe.d/dahdi.blacklist and /etc/modprobe.d/dahdi doesn't end with.conf)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Oct 2008 12:31:18 -0000	1.1
+++ import.log	19 Aug 2009 23:03:15 -0000	1.2
@@ -1 +1,2 @@
 dahdi-tools-2_0_0-1_fc9:HEAD:dahdi-tools-2.0.0-1.fc9.src.rpm:1223641844
+dahdi-tools-2_1_0_2-8_fc12:HEAD:dahdi-tools-2.1.0.2-8.fc12.src.rpm:1250722881



From emaldonado at fedoraproject.org  Wed Aug 19 23:04:01 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:04:01 +0000 (UTC)
Subject: rpms/nss-util/devel .cvsignore,1.1,1.2
Message-ID: <20090819230401.2936F11C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28439

Modified Files:
	.cvsignore 
Log Message:
Added nss-util source tar


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:13:42 -0000	1.1
+++ .cvsignore	19 Aug 2009 23:04:00 -0000	1.2
@@ -0,0 +1 @@
+nss-util-3.12.3.99.3.tar.bz2



From rdieter at fedoraproject.org  Wed Aug 19 23:10:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 23:10:02 +0000 (UTC)
Subject: rpms/liblastfm/devel import.log, NONE,
	1.1 liblastfm-0.3.0-qmake.patch, 
	NONE, 1.1 liblastfm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090819231002.0918F11C043E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/liblastfm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29845/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log liblastfm-0.3.0-qmake.patch liblastfm.spec 
Log Message:
import



--- NEW FILE import.log ---
liblastfm-0_3_0-2_fc11:HEAD:liblastfm-0.3.0-2.fc11.src.rpm:1250723377

liblastfm-0.3.0-qmake.patch:
 fingerprint/fingerprint.pro |    2 +-
 lastfm.pro                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE liblastfm-0.3.0-qmake.patch ---
diff -up liblastfm-0.3.0/src/fingerprint/fingerprint.pro.qmake liblastfm-0.3.0/src/fingerprint/fingerprint.pro
--- liblastfm-0.3.0/src/fingerprint/fingerprint.pro.qmake	2009-06-04 11:41:27.000000000 -0500
+++ liblastfm-0.3.0/src/fingerprint/fingerprint.pro	2009-06-09 10:33:58.450048690 -0500
@@ -26,4 +26,4 @@ else{
 }
 
 INSTALLS = target
-target.path = /lib
+target.path = /$$(LIB)
diff -up liblastfm-0.3.0/src/lastfm.pro.qmake liblastfm-0.3.0/src/lastfm.pro
--- liblastfm-0.3.0/src/lastfm.pro.qmake	2009-06-04 11:41:27.000000000 -0500
+++ liblastfm-0.3.0/src/lastfm.pro	2009-06-09 10:33:16.349797021 -0500
@@ -18,4 +18,4 @@ else{
     }
 }
 
-target.path = /lib
\ No newline at end of file
+target.path = /$$(LIB)


--- NEW FILE liblastfm.spec ---

Name:		liblastfm
Version:	0.3.0
Release:	2%{?dist}
Summary:	Libraries to integrate Last.fm services

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://github.com/mxcl/liblastfm/tree/master 
Source0:	http://cdn.last.fm/src/liblastfm-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: liblastfm-0.3.0-qmake.patch

BuildRequires: fftw3-devel
BuildRequires: libsamplerate-devel
BuildRequires: qt4-devel
BuildRequires: ruby

%description
Liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software.

%package devel
Summary: Development files for %{name}
Group:	 Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .qmake


%build
# hack around hard-coded libdir, see qmake patch
LIB=%{_lib} ; export LIB
# no autofoo
./configure \
  --prefix %{_prefix} \
  --release

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/liblastfm.so.0*
%{_libdir}/liblastfm_fingerprint.so.0*

%files devel
%defattr(-,root,root,-)
%{_libdir}/liblastfm.so
%{_libdir}/liblastfm_fingerprint.so
%{_includedir}/lastfm.h
%{_includedir}/lastfm/


%changelog
* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
- rpmlint clean(er)
- BR: libsamplerate-devel
- -devel: fix Requires (typo, +%%?_isa)

* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-1
- liblfastfm-0.3.0

* Tue May 05 2009 Rex Dieter <rdieter at fedoraproject.org> 0.2.1-1
- liblastfm-0.2.1, first try


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblastfm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:09:27 -0000	1.1
+++ .cvsignore	19 Aug 2009 23:10:01 -0000	1.2
@@ -0,0 +1 @@
+liblastfm-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblastfm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:09:27 -0000	1.1
+++ sources	19 Aug 2009 23:10:01 -0000	1.2
@@ -0,0 +1 @@
+3f73222ebc31635941832b01e7a494b6  liblastfm-0.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug 19 23:20:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 23:20:21 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.3.0-default_applets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.269,
	1.270 kdebase-workspace-4.2.95-default-applets.patch, 1.2, NONE
Message-ID: <20090819232022.1625D11C0417@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv314

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-default_applets.patch 
Removed Files:
	kdebase-workspace-4.2.95-default-applets.patch 
Log Message:
rebase default applets patch


kdebase-workspace-4.3.0-default_applets.patch:
 desktopcorona.cpp |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.3.0-default_applets.patch ---
diff -up kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets	2009-06-17 15:07:42.000000000 -0500
+++ kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp	2009-08-19 18:18:03.571937055 -0500
@@ -259,15 +259,18 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
+         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- kdebase-workspace.spec	19 Aug 2009 16:00:43 -0000	1.269
+++ kdebase-workspace.spec	19 Aug 2009 23:20:21 -0000	1.270
@@ -21,7 +21,7 @@ Patch8: kdebase-workspace-4.2.85-klipper
 #?434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.95-default-applets.patch
+Patch12: kdebase-workspace-4.3.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
@@ -227,7 +227,7 @@ Requires: akonadi
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default-applets
+%patch12 -p1 -b .default_applets
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo


--- kdebase-workspace-4.2.95-default-applets.patch DELETED ---



From rdieter at fedoraproject.org  Wed Aug 19 23:30:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 23:30:53 +0000 (UTC)
Subject: rpms/liblastfm/F-10 liblastfm-0.3.0-qmake.patch, NONE,
	1.1 liblastfm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090819233053.C4ECE11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/liblastfm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2841/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	liblastfm-0.3.0-qmake.patch liblastfm.spec 
Log Message:
import


liblastfm-0.3.0-qmake.patch:
 fingerprint/fingerprint.pro |    2 +-
 lastfm.pro                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE liblastfm-0.3.0-qmake.patch ---
diff -up liblastfm-0.3.0/src/fingerprint/fingerprint.pro.qmake liblastfm-0.3.0/src/fingerprint/fingerprint.pro
--- liblastfm-0.3.0/src/fingerprint/fingerprint.pro.qmake	2009-06-04 11:41:27.000000000 -0500
+++ liblastfm-0.3.0/src/fingerprint/fingerprint.pro	2009-06-09 10:33:58.450048690 -0500
@@ -26,4 +26,4 @@ else{
 }
 
 INSTALLS = target
-target.path = /lib
+target.path = /$$(LIB)
diff -up liblastfm-0.3.0/src/lastfm.pro.qmake liblastfm-0.3.0/src/lastfm.pro
--- liblastfm-0.3.0/src/lastfm.pro.qmake	2009-06-04 11:41:27.000000000 -0500
+++ liblastfm-0.3.0/src/lastfm.pro	2009-06-09 10:33:16.349797021 -0500
@@ -18,4 +18,4 @@ else{
     }
 }
 
-target.path = /lib
\ No newline at end of file
+target.path = /$$(LIB)


--- NEW FILE liblastfm.spec ---

Name:		liblastfm
Version:	0.3.0
Release:	2%{?dist}
Summary:	Libraries to integrate Last.fm services

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://github.com/mxcl/liblastfm/tree/master 
Source0:	http://cdn.last.fm/src/liblastfm-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: liblastfm-0.3.0-qmake.patch

BuildRequires: fftw3-devel
BuildRequires: libsamplerate-devel
BuildRequires: qt4-devel
BuildRequires: ruby

%description
Liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software.

%package devel
Summary: Development files for %{name}
Group:	 Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .qmake


%build
# hack around hard-coded libdir, see qmake patch
LIB=%{_lib} ; export LIB
# no autofoo
./configure \
  --prefix %{_prefix} \
  --release

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/liblastfm.so.0*
%{_libdir}/liblastfm_fingerprint.so.0*

%files devel
%defattr(-,root,root,-)
%{_libdir}/liblastfm.so
%{_libdir}/liblastfm_fingerprint.so
%{_includedir}/lastfm.h
%{_includedir}/lastfm/


%changelog
* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
- rpmlint clean(er)
- BR: libsamplerate-devel
- -devel: fix Requires (typo, +%%?_isa)

* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-1
- liblfastfm-0.3.0

* Tue May 05 2009 Rex Dieter <rdieter at fedoraproject.org> 0.2.1-1
- liblastfm-0.2.1, first try


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblastfm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:09:27 -0000	1.1
+++ .cvsignore	19 Aug 2009 23:30:53 -0000	1.2
@@ -0,0 +1 @@
+liblastfm-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblastfm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:09:27 -0000	1.1
+++ sources	19 Aug 2009 23:30:53 -0000	1.2
@@ -0,0 +1 @@
+3f73222ebc31635941832b01e7a494b6  liblastfm-0.3.0.tar.bz2



From rdieter at fedoraproject.org  Wed Aug 19 23:30:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 19 Aug 2009 23:30:54 +0000 (UTC)
Subject: rpms/liblastfm/F-11 liblastfm-0.3.0-qmake.patch, NONE,
	1.1 liblastfm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090819233054.40A1611C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/liblastfm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2841/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	liblastfm-0.3.0-qmake.patch liblastfm.spec 
Log Message:
import


liblastfm-0.3.0-qmake.patch:
 fingerprint/fingerprint.pro |    2 +-
 lastfm.pro                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE liblastfm-0.3.0-qmake.patch ---
diff -up liblastfm-0.3.0/src/fingerprint/fingerprint.pro.qmake liblastfm-0.3.0/src/fingerprint/fingerprint.pro
--- liblastfm-0.3.0/src/fingerprint/fingerprint.pro.qmake	2009-06-04 11:41:27.000000000 -0500
+++ liblastfm-0.3.0/src/fingerprint/fingerprint.pro	2009-06-09 10:33:58.450048690 -0500
@@ -26,4 +26,4 @@ else{
 }
 
 INSTALLS = target
-target.path = /lib
+target.path = /$$(LIB)
diff -up liblastfm-0.3.0/src/lastfm.pro.qmake liblastfm-0.3.0/src/lastfm.pro
--- liblastfm-0.3.0/src/lastfm.pro.qmake	2009-06-04 11:41:27.000000000 -0500
+++ liblastfm-0.3.0/src/lastfm.pro	2009-06-09 10:33:16.349797021 -0500
@@ -18,4 +18,4 @@ else{
     }
 }
 
-target.path = /lib
\ No newline at end of file
+target.path = /$$(LIB)


--- NEW FILE liblastfm.spec ---

Name:		liblastfm
Version:	0.3.0
Release:	2%{?dist}
Summary:	Libraries to integrate Last.fm services

Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://github.com/mxcl/liblastfm/tree/master 
Source0:	http://cdn.last.fm/src/liblastfm-%{version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Patch1: liblastfm-0.3.0-qmake.patch

BuildRequires: fftw3-devel
BuildRequires: libsamplerate-devel
BuildRequires: qt4-devel
BuildRequires: ruby

%description
Liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software.

%package devel
Summary: Development files for %{name}
Group:	 Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .qmake


%build
# hack around hard-coded libdir, see qmake patch
LIB=%{_lib} ; export LIB
# no autofoo
./configure \
  --prefix %{_prefix} \
  --release

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/liblastfm.so.0*
%{_libdir}/liblastfm_fingerprint.so.0*

%files devel
%defattr(-,root,root,-)
%{_libdir}/liblastfm.so
%{_libdir}/liblastfm_fingerprint.so
%{_includedir}/lastfm.h
%{_includedir}/lastfm/


%changelog
* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
- rpmlint clean(er)
- BR: libsamplerate-devel
- -devel: fix Requires (typo, +%%?_isa)

* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-1
- liblfastfm-0.3.0

* Tue May 05 2009 Rex Dieter <rdieter at fedoraproject.org> 0.2.1-1
- liblastfm-0.2.1, first try


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblastfm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:09:27 -0000	1.1
+++ .cvsignore	19 Aug 2009 23:30:53 -0000	1.2
@@ -0,0 +1 @@
+liblastfm-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblastfm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:09:27 -0000	1.1
+++ sources	19 Aug 2009 23:30:54 -0000	1.2
@@ -0,0 +1 @@
+3f73222ebc31635941832b01e7a494b6  liblastfm-0.3.0.tar.bz2



From emaldonado at fedoraproject.org  Wed Aug 19 23:47:13 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:47:13 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-disable-freebl-execstack.patch, NONE,
	1.1 nss-softokn-config.in, NONE, 1.1 nss-softokn.pc.in, NONE,
	1.1 nss-softokn-prelink.conf, NONE, 1.1 nss-split-softokn.sh,
	NONE, 1.1 nss-stubs-bug502133.patch, NONE, 1.1
Message-ID: <20090819234713.E264911C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6296

Added Files:
	nss-disable-freebl-execstack.patch nss-softokn-config.in 
	nss-softokn.pc.in nss-softokn-prelink.conf 
	nss-split-softokn.sh nss-stubs-bug502133.patch 
Log Message:
Initial checkin - rhbz# 515034

nss-disable-freebl-execstack.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nss-disable-freebl-execstack.patch ---
--- softoken-3.12.4.0/mozilla/security/nss/lib/freebl/Makefile-save	2009-04-02 08:46:32.083530732 -0700
+++ softoken-3.12.4.0/mozilla/security/nss/lib/freebl/Makefile	2009-04-02 08:46:51.740542226 -0700
@@ -133,7 +133,7 @@
 ifeq ($(OS_TARGET),Linux)
 ifeq ($(CPU_ARCH),x86_64)
     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
-    ASFLAGS += -march=opteron -m64 -fPIC
+    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
     DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
     DEFINES += -DNSS_USE_COMBA
     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN


--- NEW FILE nss-softokn-config.in ---
#!/bin/sh

prefix=@prefix@

major_version=@MOD_MAJOR_VERSION@
minor_version=@MOD_MINOR_VERSION@
patch_version=@MOD_PATCH_VERSION@

usage()
{
	cat <<EOF
Usage: nss-softokn-config [OPTIONS] [LIBRARIES]
Options:
	[--prefix[=DIR]]
	[--exec-prefix[=DIR]]
	[--includedir[=DIR]]
	[--libdir[=DIR]]
	[--version]
	[--libs]
	[--cflags]
Dynamic Libraries:
	softokn3
EOF
	exit $1
}

if test $# -eq 0; then
	usage 1 1>&2
fi

lib_ssl=no
lib_smime=no
lib_nss=no
lib_nssutil=yes

while test $# -gt 0; do
  case "$1" in
  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  *) optarg= ;;
  esac

  case $1 in
    --prefix=*)
      prefix=$optarg
      ;;
    --prefix)
      echo_prefix=yes
      ;;
    --exec-prefix=*)
      exec_prefix=$optarg
      ;;
    --exec-prefix)
      echo_exec_prefix=yes
      ;;
    --includedir=*)
      includedir=$optarg
      ;;
    --includedir)
      echo_includedir=yes
      ;;
    --libdir=*)
      libdir=$optarg
      ;;
    --libdir)
      echo_libdir=yes
      ;;
    --version)
      echo ${major_version}.${minor_version}.${patch_version}
      ;;
    --cflags)
      echo_cflags=yes
      ;;
    --libs)
      echo_libs=yes
      ;;
    ssl)
      lib_ssl=no
      ;;
    smime)
      lib_smime=no
      ;;
    nss)
      lib_nss=no
      ;;
    nssutil)
      lib_nssutil=yes
      ;;
    *)
      usage 1 1>&2
      ;;
  esac
  shift
done

# Set variables that may be dependent upon other variables
if test -z "$exec_prefix"; then
    exec_prefix=`pkg-config --variable=exec_prefix nss`
fi
if test -z "$includedir"; then
    includedir=`pkg-config --variable=includedir nss`
fi
if test -z "$libdir"; then
    libdir=`pkg-config --variable=libdir nss`
fi

if test "$echo_prefix" = "yes"; then
    echo $prefix
fi

if test "$echo_exec_prefix" = "yes"; then
    echo $exec_prefix
fi

if test "$echo_includedir" = "yes"; then
    echo $includedir
fi

if test "$echo_libdir" = "yes"; then
    echo $libdir
fi

if test "$echo_cflags" = "yes"; then
    echo -I$includedir
fi

if test "$echo_libs" = "yes"; then
      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
      if test -n "$lib_ssl"; then
	libdirs="$libdirs -lssl${major_version}"
      fi
      if test -n "$lib_smime"; then
	libdirs="$libdirs -lsmime${major_version}"
      fi
      if test -n "$lib_nss"; then
	libdirs="$libdirs -lnss${major_version}"
      fi
      if test -n "$lib_nssutil"; then
	libdirs="$libdirs -lnssutil${major_version}"
      fi
      echo $libdirs
fi      



--- NEW FILE nss-softokn.pc.in ---
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: SOFTKN
Description: Network Security Services Softoken PKCS #11 Module
Version: %SOFTOKEN_VERSION%
Requires: nspr >= %NSPR_VERSION%
Requires: nss-util >= %NSSUTIL_VERSION%
Cflags: -I${includedir}


--- NEW FILE nss-softokn-prelink.conf ---
-b /lib{,64}/libfreebl3.so
-b /lib{,64}/libsoftokn3.so


--- NEW FILE nss-split-softokn.sh ---
#!/bin/sh
#
# Splits NSS into nss-util and nss-softokn
# Takes as command line input the version of nss
# and assumes that a file nss-${nss_version}-stripped.tar.bz2
# exits in the current directory

set -e

if test -z $1
then
  echo "usage: $0 nss-version"
  exit
fi

export name=nss
export version=$1

echo "Extracting ${name}-${version}-stripped.tar.bz2"

tar -xjf ${name}-${version}-stripped.tar.bz2

# the directory will be named ${name}-${version}

nss_source_dir=${name}-${version}
softokn_dir=${name}-softokn-${version}

# make_nss_softokn
#-------------------------------------------------
# create the nss-softokn subset consisting of
#   mozilla/dbm                      --- full directory
#   mozilla/security                 --- top empty
#   mozilla/security/coreconf        --- full directory
#   mozilla/security/nss             --- top files only
#   mozilla/security/nss/lib         --- top files only
#   mozilla/security/nss/lib/freebl  --- full directory
#   mozilla/security/nss/lib/softoken --- full directory
#   mozilla/security/nss/lib/softoken/dbm --- full directory
#-------------------------------------------------------

SOFTOKN_WORK=${softokn_dir}-work
rm -rf ${SOFTOKN_WORK}
mkdir ${SOFTOKN_WORK}

# copy everything
cp -a ${nss_source_dir} ${SOFTOKN_WORK}/${softokn_dir}

# remove subdirectories that we don't want
rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/pkg
# rstart with an empty lib directory and copy only what we need
mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
# copy entire freebl and softoken directories recursively
cp -a ${nss_source_dir}/mozilla/security/nss/lib/freebl ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/freebl
cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/softoken
cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/softoken/dbm

# and some Makefiles and related files
cp ${nss_source_dir}/mozilla/security/nss/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
cp ${nss_source_dir}/mozilla/security/nss/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
cp ${nss_source_dir}/mozilla/security/nss/trademarks.txt ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib

# we do need shlibsign from cmd
mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
# copy some files at the top and the slhlib subdirectory
cp -p ${nss_source_dir}/mozilla/security/nss/cmd/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
cp -p ${nss_source_dir}/mozilla/security/nss/cmd/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platlibs.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platrules.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd

cp -a ${nss_source_dir}/mozilla/security/nss/cmd/shlibsign ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/shlibsign

pushd ${SOFTOKN_WORK}
# the compressed tar ball for nss-softokn
tar -cjf ../${name}-softokn-${version}-stripped.tar.bz2 ${softokn_dir}
popd

# cleanup after ourselves
rm -fr ${nss_source_dir}
rm -rf ${SOFTOKN_WORK}




nss-stubs-bug502133.patch:
 stubs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE nss-stubs-bug502133.patch ---
diff -rupN nss-3.12.3.99.3-orig/mozilla/security/nss/lib/freebl/stubs.c nss-3.12.3.99.3/mozilla/security/nss/lib/freebl/stubs.c
--- ./mozilla/security/nss/lib/freebl/stubs.c	2009-03-28 19:21:50.000000000 -0700
+++ ./mozilla/security/nss/lib/freebl/stubs.c	2009-06-08 20:37:20.000000000 -0700
@@ -558,8 +558,8 @@ FREEBL_InitStubs()
 	    return SECFailure;
 	}
 	rv = freebl_InitNSPR(nspr);
-	freebl_releaseLibrary(nspr);
 	if (rv != SECSuccess) {
+	    freebl_releaseLibrary(nspr);
 	    return rv;
 	}
     }
@@ -570,8 +570,8 @@ FREEBL_InitStubs()
 	    return SECFailure;
 	}
 	rv = freebl_InitNSSUtil(nssutil);
-	freebl_releaseLibrary(nssutil);
 	if (rv != SECSuccess) {
+	    freebl_releaseLibrary(nssutil);
 	    return rv;
 	}
     }



From emaldonado at fedoraproject.org  Wed Aug 19 23:48:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:48:06 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,NONE,1.1
Message-ID: <20090819234806.9A64A11C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6434

Added Files:
	nss-softokn.spec 
Log Message:
Initial checkin - rhbz# 515034


--- NEW FILE nss-softokn.spec ---
%global nspr_version 4.8
%global nss_name nss
%global nssutil_version 3.12.3.99.3
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved

# Produce .chk files for the final stripped binaries
%define __spec_install_post \
    %{?__debug_package:%{__debug_install_post}} \
    %{__arch_install_post} \
    %{__os_install_post} \
    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
%{nil}

Summary:          Network Security Services Soktoken Module
Name:             nss-softokn
Version:          3.12.3.99.3
Release:          8%{?dist}
License:          MPLv1.1 or GPLv2+ or LGPLv2+
URL:              http://www.mozilla.org/projects/security/pki/nss/
Group:            System Environment/Libraries
Requires:         nspr >= %{nspr_version}
Requires:         nss-softokn-freebl%{_isa} >= %{version}
Requires:         sqlite
Requires:         nss-util >= %{nssutil_version}
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    nspr-devel >= %{nspr_version}
BuildRequires:    sqlite-devel
BuildRequires:    zlib-devel
BuildRequires:    pkgconfig
BuildRequires:    gawk
BuildRequires:    psmisc
BuildRequires:    perl

Source0:          %{name}-%{version}-stripped.tar.bz2
# The nss-softokn tar ball is a subset of nss-%{version}-stripped.tar.bz2, 
# Therefore we use the nss-split-softokn.sh script to keep only what we need.
# Download the nss tarball via CVS from the nss propect and follow these
# steps to make the r tarball for nss-util out of the for nss:
# cvs co nss
# cvs nss-softokn (as soon as it is in cvs - for now extract the srpm)
# cd nss-softokn/devel
# cp ../../nss/devel/${version}-stripped.tar.bz2  .
# (use 3.12.3.99.3 for version above until 3.12.4 comes out)
# sh ./nss-split-softokn.sh ${version}
# A %{name}-%{version}--stripped.tar.bz2 should appear
Source1:          nss-split-softokn.sh
Source2:          nss-softokn.pc.in
Source3:          nss-softokn-config.in
Source4:          nss-softokn-prelink.conf

# patches moved here from nss because they affect softoken only
# won't be needed when we upgrade to 3.12.4
Patch1:           nss-nolocalsql.patch
Patch2:           nss-stubs-bug502133.patch

%description
Network Security Services Softoken Cryptographic Module

%package freebl
Summary:          Freebl library for the Network Security Services
Group:            System Environment/Base
Conflicts:        nss < 3.12.2.99.3-5

%description freebl
Network Security Services Softoken Cryptographic Module Freelb Library.

Install the nss-softokn-freebl package if you need the freebl 
library.

%package devel
Summary:          Development libraries for Network Security Services
Group:            Development/Libraries
Requires:         nss-softokn = %{version}-%{release}
Requires:         nspr-devel >= %{nspr_version}
Requires:         nss-util-devel >= %{nsutil_version}
Requires:         pkgconfig

%description devel
Header and Library files for doing development with Network Security Services.


%prep
%setup -q

# patches moved here from nss because they affect softokn only
# they won't be needed when we upgrade to 3.12.4
%patch1 -p0
%patch2 -p0 -b .502133

%build

FREEBL_NO_DEPEND=1
export FREEBL_NO_DEPEND

# Enable compiler optimizations and disable debugging code
BUILD_OPT=1
export BUILD_OPT

# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
export XCFLAGS


PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1

export PKG_CONFIG_ALLOW_SYSTEM_LIBS
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS

NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`

export NSPR_INCLUDE_DIR
export NSPR_LIB_DIR

NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`

export NSS_INCLUDE_DIR
export NSS_LIB_DIR


%ifarch x86_64 ppc64 ia64 s390x sparc64
USE_64=1
export USE_64
%endif

# Compile softkn plus needed support
%{__make} -C ./mozilla/security/coreconf
%{__make} -C ./mozilla/security/dbm
%{__make} -C ./mozilla/security/nss

# Set up our package file
%{__mkdir_p} ./mozilla/dist/pkgconfig
%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
                          -e "s,%%prefix%%,%{_prefix},g" \
                          -e "s,%%exec_prefix%%,%{_prefix},g" \
                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                          -e "s,%%SOFTKN_VERSION%%,%{version},g" > \
                          ./mozilla/dist/pkgconfig/nss-softokn.pc

SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`

export SOFTOKEN_VMAJOR 
export SOFTOKEN_VMINOR 
export SOFTOKEN_VPATCH

%{__cat} %{SOURCE3} | sed -e "s, at libdir@,%{_libdir},g" \
                          -e "s, at prefix@,%{_prefix},g" \
                          -e "s, at exec_prefix@,%{_prefix},g" \
                          -e "s, at includedir@,%{_includedir}/nss3,g" \
                          -e "s, at MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
                          -e "s, at MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
                          -e "s, at MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
                          > ./mozilla/dist/pkgconfig/nss-softokn-config

chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config

# save a copy in a safe place in case there is a preelink install or unistall
%{__cp} -p %{SOURCE4} ./mozilla/dist/pkgconfig/nss-softokn-prelink.conf

# enable the following line to force a test failure
# find ./mozilla -name \*.chk | xargs rm -f

#
# We can't run a subset of the tests because the tools have
# dependencies on nss libraries outside of softokn. 
# Let's leave this as a place holder.
#


%install

%{__rm} -rf $RPM_BUILD_ROOT

# There is no make install target so we'll do it ourselves.

%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}

# Copy the binary libraries we want
for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
do
  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done

# Make sure chk files can be found in both places
for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
do
  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done

# install our prelink configuration file
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
# and stash a copy away in a safe place
%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf

# Copy the binaries we ship as unsupported
for file in shlibsign
do
  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done

# Copy the include files we want
for file in mozilla/dist/public/nss/*.h
do
  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
done

# Copy the package configuration files
%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config

%clean
%{__rm} -rf $RPM_BUILD_ROOT

# Trigger scriptlets to install or remove nss-softokn-prelink.conf
# when prelink is ether installed or removed in the user's system

# This trigger scriptlet is run when:
# 1) nss-softokn is already installed, and prelink is installed or upgraded
# 2) prelink is already installed, and nss-softokn is installed or upgraded
%triggerin -- prelink
%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
 %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf

# This trigger scriptlet is run when:
# 1) prelink is installed, and nss-softokn removed
# 2) nss-softokn is installed, and prelink gets removed
%triggerun -- prelink
[ $2 = 0 ] || exit 0
%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf


%post
/sbin/ldconfig >/dev/null 2>/dev/null

%postun
/sbin/ldconfig >/dev/null 2>/dev/null
[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf


%files
%defattr(-,root,root)
/%{_lib}/libnssdbm3.so
/%{_lib}/libnssdbm3.chk
/%{_lib}/libsoftokn3.so
/%{_lib}/libsoftokn3.chk
# shared with nss-tools
%dir %{_libdir}/nss
%dir %{saved_files_dir}
%dir %{unsupported_tools_directory}
%{unsupported_tools_directory}/shlibsign
%{saved_files_dir}/nss-softokn-prelink.conf
# we don't own %{_sysconfdir}/prelink.conf.d and
# must rely on triggers to install and remove our
# configuration file
%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf

%files freebl
%defattr(-,root,root)
/%{_lib}/libfreebl3.so
/%{_lib}/libfreebl3.chk

%files devel
%defattr(-,root,root)
%{_libdir}/libsoftokn3.so
%{_libdir}/libsoftokn3.chk
%{_libdir}/libfreebl3.so
%{_libdir}/libfreebl3.chk
%{_libdir}/libnssdbm3.so
%{_libdir}/libnssdbm3.chk
%{_libdir}/pkgconfig/nss-softokn.pc
%{_bindir}/nss-softokn-config

# co-owned with nss
%dir %{_includedir}/nss3
#
# The following headers are those exported public in
# mozilla/security/nss/lib/freebl/manifest.mn and
# mozilla/security/nss/lib/softoken/manifest.mn
#
# The following list is short because many headers, such as
# the pkcs #11 ones, have been provided by nss-util-devel
# which installed them before us.
#
%{_includedir}/nss3/blapit.h
%{_includedir}/nss3/ecl-exp.h
%{_includedir}/nss3/hasht.h
%{_includedir}/nss3/sechash.h
%{_includedir}/nss3/nsslowhash.h
%{_includedir}/nss3/secmodt.h
%{_includedir}/nss3/shsign.h

%changelog
* Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
- Initial build



From emaldonado at fedoraproject.org  Wed Aug 19 23:49:39 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:49:39 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-3.12.3.99.3-stripped.tar.bz2,
	NONE, 1.1
Message-ID: <20090819234939.36EA911C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6734

Added Files:
	nss-softokn-3.12.3.99.3-stripped.tar.bz2 
Log Message:
Initial checkin


--- NEW FILE nss-softokn-3.12.3.99.3-stripped.tar.bz2 ---
BZh91AY&SY??!??????????????????????P?5??J?v?b??y?p2?0
?}<)?h?????g?EV?s?S????-{???y?b??r[?j?^?v
{??-?\??????????[T{}w?N??Yv
g????????G??a?1?}???U{5????^??????T???K?e*???C'e?????
?
?@u/m?????-?v?h4@???????
???>??N?????=?{z???????O?;?u??[?????? 
z?l?
??????/6???s????@C?N?
m?;t?????X??i?
??
.??????<????zb???xE }?????????o??G???q??{?R??ul?????:?????k7????JJ?X3?h???2PP???;?????????
L????????WV??????????o|?;????y?

x?
????h?



??
?D@
?
???t?????(*??4?k????Qj?'?a1????87?*??t?ox??gq?q???[K???oxc??q+??k[???z???.??w6?????J?V???;M?\D:?????6f??J??.??/l?.??t^1??y#fn?C??4$?J??HL??$?!4
????-?$??.?4??$F3????mbd/??(V *??"?i(? ?@?w?#$??p?0R	@?4
R?m!??4#?U??:??-??X7\??G??M?????=??z????????+???ckx;?5D<?l?cp5?o#???L?:???s7???TMXS??2-?4??5?P?g$?Q&uL??*UZ???'.????Z???e;?N??i?V?xJ??"?{ZZ?z?Us?If??3;t??Y??Us3F?;???9???#?n??-s?Hl
	??????
E???4???49???T?KA?(?R?9?KLJ?(
*?*?L?
*??$??d P	0QBdDP
AD?3B?+ at P?R??B??"??? ?&T?T?kF?D
D?P?.?p?(R %?h?H?` ?u ?L at P!?R#?0? ?bedb* Y?4??d???d???
(`??T@?nW?QC5?y'?B??>??:*?bw?H???H?V`$?!??p	??????kVC??<iG??:?P0?Y?Sq!H?%L?4?$%c\?t?p???S@?R?w?Gt
??(??R%/,D???r?$tA?I]??B*aQ@
??C@!?_?J?????'?WD4z[???????t4?0B?E?J!?
c??????????2??J???SM???s????v??h0^?W????{?L?B$
b(
B???hu????O??S??P?K!????[?:?9_??C ??a>?8?DS??a??P??3 ???-?E?e??Ys??'{?f????'pD?@; !?@
$P?@C?"/????????R??2/W????7??K?a,LMPQ at T????S??IQ
UL-SP at A??MJ@UCTBP-T??DA3GtaUEe?QY?4E?,%i(A?)"???W?a?S,???^|?Z???0????F???Nx?]??-ST{}??`?4&?M2 at p	??????}?z9?q>J|6L??D?s?H3???m}???fi?:k
?#o??S????W?n4?ZE?v?Q????}?P??0????q??*??z??p??????????9zx?N?V?n?'l8?i??d"?D?B??JaZ?????<?!???<K?$?/,>?/
`??lr1???g?.????P????!3+Y??e_????{?1koi7???F???????F,"?j??
?'????8?u???;
???????^?L05DTPRET0L?ECP?$?T?
E%MSD$TT?????R???LL????D?R????E5t?(b?2????6*
1??m?&5"?{?\??v"j?b5e???bJAt???u5M
%$$?%5RHI
JD?UTPT?KQzc???\?d?f'?0?????{??vj`?E????k at Q>??+?
????(??H?"!?"?????)?!L?9??????j?????b%!?????????#A?eHRK?ED+D-?(,~?j;??3{???&?????I?,????%	?0sX?55L?QL?Q4UE
QAAU??d?`?h?? ??

ONao???~???OZ???_?q?v:`?l???r?e???+I??P?????P??iE	??h/?0Cy??? ?"h=? 
??????>???MF5

<?S?$??j#?@dk0??l&??5?????????????K?p?PD??_??OE1EUPs9%I at RA??i?-{|?
f:3Gw?????#V???a???o?0;3Dc?????q???????1??2???????c?{???)??*?)?.T ?+g??????b2
???????g??vj????TKY}??????4?saf?\i?,???E?????
??`2?)b?<???c?0m?g?6??B?F??a[??%l???gj-'??????,c>U?s?B??hA??N??Q8??V?o&???`C!7\????9?R?O???	F/?g?x?G?????q?qUVJ??*????5????%w'qt?????O??9nv????=g????#U1Q=?K4??fb?,??? ???k?G?!'X?014A????!??&G?g???O?~?q?	?1?5A?Jk?????/2E[x??????$"X&?????*k	L?:?1???s??%?0pC??v???????<fR???azO??.???cm?u?b#&5F@?DZ0A:?C??(fEZgg:??n#CDN>-$?U?	n3???2&?!aUIH?At??3}??k?0q m????U?^?+?q?!|???
?c9
?R?????LI?=UsKO?\???????f???FyC?iFt???s???(~??u?????/H?y???C?3KQ~V????O????wK??
??f??
,?S31t?+??????l???f?(
??{?g?:??TDT?UT?M4QRP?AL?ERW^?
^??C??*???s?C2U\???&???????fUqXj?LA
??j??y?b
J*?b)???(?F?i???b*????bJ?&?bj?&??JF???*???J?* ??"7?y?j???$???????Z?"?b???"? ???
??f??`a?R
??c }???h?T???1
M1JR?+?PQG??B]?$C?H6?
??????&0???7E?#??6?!?(?rC?@?????0??f?????xaF???
f}ICD0D?o8??????@??A??|??,????l~?d?w????j?????H#??bTV?I
Y??a??)??I)d()e??{?%"JfbY&bb*"?0?I"X'??t8?Q4o0(*?)???????????t??4?xN???c?`Q4?PGb?Bq.Y??@?x>C5ADQ??
???$?Nv??PU?g???.???-P?SD????F;??H)*<???5hO1??w:???S?ANDn???B???xJ;?`???|?j??? xH?T??"?u
?????}?????3??(?6??.$??%Vx?&?{<?D??&>B>?????	???3?-???_f1???T?}???/????5?? i???>????V?q_?.R??g??L?9?[m??????A?????????_"fL?L???9IY{k;?~????8??2??????/??#t3j????Ei~G??&?5?fn???C:j3C??dP???e??aW?l?1r??????????Z
?6j>??M???|?9??`rF?c?,#*u?f?}p?a@???T?6
T???9?A6???lF?o4?G?leu?<Y?????q?zde.Q??^?H??T???`?O????,<?$?k???*G:??8s
?d?F??8/?E?d??JI??????f*??f?U?y?-???n~}?????5?t???-?"???BZS ?"(F?m??????t?????jC?T???)??Rp-????d???D??!$???V??m?c8f??,z?S?j???Mus??yB???????5	?????cyzl!?y4?QdBwC?????$?J"?Y?a?=?uz??M%Ok?vGH?
o??9????j	???e????????9??UNZ?????m?Fc???8??g?j^??????B??n]`6l_???4U<?????+!???]hW?W???u???S?>&??????!
????????t.0K??????Kw?a/?h???k?e{?g???lY?f?rJ?|CL
3OL????<???]f?;?]???[??r??	 ????}?M-j?a?]??d??U?w?o&???{???%??{9p3???
?"?8%j}????"????)??1?????6?(?Iz???F?Y0????ul??R???<????K??? ?Op&H6I?????n???3???f?? ??;/
? ????T
x???y??????E?yN??c?<??(8?????3F4
???%U?d?:???W?4?V??*"????????d???????V_e?????d??q?k?#,?H???\|?a???@X?t?p???zp?<~?Pz?\p??Y??
!;:hcy?d?o?S???k{?[?pk
?1?_??gMG????????n??~x?/?'	??_???4 ?W?w?;???H&6J?[)??WGJ	?lm6??????????+N???:???H??:?9??_d[*s?;???D?2?D^S'*?~????G???^?ol?;??;?B???tIM?G???I?LIu?????(?j?'??7?^?????,
?E%X?D??
?q?????j4?|`@<
?p	??yP7???>j-???<?[Md???T4???$?3???E??((?????????a??r?D?8b??I
??@6 ?d^?????????V?4??v
v?rZI????
???)?l??A0H-???}1*????????KVa?Ue??????.9L?xt?T?\D?EM?;[r6??i_?s??gv????FY9TQt??Z]?_F?j%???(??3?
6????5???????@E2?F??a??? ME??lF??F?\?eE?`&.?V?G !&?Kt?%M_f?l????,??h:????L?~y?7???+???+8?3;???v???Z4???Z?????m6?#???+cq at p?+????4uu???kX
??d
w??k???H
?????}??? ?I.Q?T??G??"?????s?n??mil?n*tRq%?[????%????\1??s{?v?8?WV?p?!|?f:H?+dj:???d??K????4??6??/???6????&e????????1h???34A????|?u?&??^?
??a?xF??7?????H???s:n.?y???m???n=????[?
?d4???ZNY??G??Zcp#?;?z?????	4??"??A????
%:?????f?q?W?{?7?f?w?3L??'+?? &P???#2??k????MFe&a?q???????????~???PyL?a\	???m??ms?#?v?????DC?<>g???u
?q??Xu}???V/@?????$a;??????????{'?)eo???????)?5?i?????V????:?:?;?????????0?o???-]?F.?"?A?????xI? ?k??YY??
?v????3??H$ZE??t????}?:#??p????^?F.??{???}po?5>??_y?q>|i???^y1??W?s?????>???????0J?????&M??2??X?i"i?K?P?/??$???`??SR
;?:?p??7????|??UU??4UU?}????????w=????+VO????3?X????y?E????oC???Wm??h)?8]3??(5???????Q??vC??3A??!_??:???pe?Q-U1^?i???
C?%???o2?&???????)??>?1:??=??Rp?KnM?j?n6?U?????%+?H??S???????@??x?????C}?V?Y??u?d???L???'?)?C/??f8BH|?V??1k?!0??c????1p??F`0`?Y3F??	??fs??TT?y
?B??v)2Y?h???"???y%?E[??E]\?????QI7???????	?uC?"$????y??}9{?fL???7??????j1+??Z?
?u????r4\?x?oi60??'^)F????????Q?N??kFf?	? ??>????
?????? ?FILQ=???l#?FT?I??&t4E
?Bx9?UUtwF?h??v?X?c	?&???L?%g?8??e??:&?[W?????O?/d??~TQ}_???^???h??7???G?=?t?m]?=U????Q=J?4?#???w?G7???7?5]????;??s???7?1??l??u?osuEUWV R?H?5c@?4]?
??dQ?E???c??M?J???X??Qh?????\Xf?3????????9??G?@??9??6???(?2?ktt??T?*????Jrr?????,?jm}??S?????#?7C?	-HHC??q6??O???\o;?xWXNb'??+?%????i<?}=???J???x"????I??g????s??<z?1Kx???qs??R???@rD=H???t	$$??+n??g5????????G?#?ny?}l?ppW?J1?fv?J?5??j7Z??P)j?I????R??q???????I,????{{????_/?E????-?*Z???.???????????
Lo?\?@??wf	3?Bm???????Vg+	???@????S?=g?s~???7?d????u?? S?UX???^??.?TC??U???????S?
?/?w????*?n????? ?P$m?i??[7
??W?(???S1A????
98J???$?_d*?B
??W?0?:`q??v?|}?]???p?{??????}B?6?????L	
????b??V*
?lz?<?WS?C,2?pY??h}???_?P;sU??K?C??{?=??r??????O??{r:O?V???x??	?F?c??e??]?Q??~F???[?Z8?U??t?F???F??F??uS!?u????jfY!???-?yo?
`"?X??G??????Y???-?????????????7?T?}R??!????? ???g???M???s??@?????8?DB|?TN??e??Lu?r|	??)e?
?8???{??m??$a??dVNu?Th??*>???????^n?H???Z:]??u??!T3k()??X???
?.??TK????*?#?Q?0V at N?L??,%f?~gnL??'?x???????%????E?h?A%?????X?(
?YDd?*w0X?????_???n?????G>2X,V?
?H}?!
i?6?!?n7x??.{[?????8???8{?=???A?2_??}?SNi??%(W7h??)??,T??-9????Fy?)?
??bo??a?~A??c1Si?????????0{???#?!?????o?=c??q???p??c?0?	????x?????)B@?L0??@[?O?$v??8?Y*??u?T????/?R?G?}?????Q?y?
Z?????]?\????7#k'???i?4A(7??z?7?N?????d?M?ZT?????{???+?8)?n???+?????e?	E?3?I??x~?g???{`1?E??+VT0j???qfo?;<???(??Y????>?Y???,@|????=??N???$,Q????
???l ?d	`N`?
??q???
?????m+0J]c???:B????,/?}???$?_??G????
??	`~?8???E????^???~???????h??&???t?(?zO<??_O???&E?D?????J?u????????U???n???+F?`-?.54?
?8e?1?$?C7?^???~^f??j???n^c?O???g???????[l??/>[?xJ?Ws9?????W???E????d?????f?D?E9?v?DnQDZ?/???????B?????x??
?1R4???????k?j????G????`??????-???????????$??(Hq[?????I???????v???$??8???'???????w]]??D?????R?<??O????Y?????d?Wx??@?Tw?
?0?iI?r)??*?K????K??

?l?"?r('?? )?p:	?*???#3?|?^	?U????h????????d?	?|#??????4????e%???????7S?Qg????>4Pg+8??*]???????3B2???[???2I>??	R?F???????3??MB?=??????~~???b?|????j??~??y
[`,Z_ce?y????nDl??%??
????
?????????}??xV?l-
??$?'?qTM??m????I????Cb@E?"??;??o???V?s?XPZ?ALa?P
??z~?8`BC?%

?v?"??R?_zi??,???|H
??
2???o?n9??@=??B({??A[0T?R?p?4?B?f(???????????h?
q?eM]??i?TbS??N??i?&????L??6EK???#H???>zO??i???az?6?? 9?
#???a?K?/Z?#?2S?%4?]?* ????/?t?bA?????[#?I3l?o??
j??????????w?q?Q?]??Pwr
L?b???T???c?????q>???B???Z?<}??????F8/???u.?O??r'K=???=}N
??F??R?.:y???engW????W?	????D)?v?t??/]????Z#??rx???<p???!???-<?j?M>L>>?z?$?an?F?(*
?`e????Wf|??
ebie??????R???{~9J.?+?J
Oe??o((???zrX?t2MHY?q(?AO?z?c?q????Yx?T???9?G,?{????;???W\?qp?"I????d?{?,???e?<???{??k?j%?1zwh?7?_zF>???3??{WY??M?`?r?iS?eOR?0lre?SL? oZ.yZ??AK?$<@d??uc???s????o???>?~7??U??<??CN??q???g???3E?'?????#????W??:?Y5?3???.S?Y??.??o??k?>c
??9??Z`?,?bg?^?^_d?????_*_??Lr??? ?????do????+yk}???.?K????4??Xv?j???(???>?s???????0LS??????j?????i??????????'M?6?j?(x????
i???????_? ?D?J?d?$???,??????(CD?R??#???N4#??x
??v6i???????t:?E?O???????(?x??}?D???=U?pd??T?at&?M???1?JII????,#?n
_???~??c:f??.mD?,???
?kWe?yj?W?U]??:?????C???4?A?C??*[???r???)
??
????????p????y??6HpHP???z8G?????~?8?Z???[?G?????????????????"?6????W??#??????i?\??g?????G[?????'l??'<?X?(?????S_?3?z????????g??FF^?+??b?e?f??e#?[???F?Mu??ye????????=	?d??U?p?H5?,?<)?^:???Mx??????????ri??2?r?a?bz??&J?2???Emm/b?0?7??o??).k]?+???B???q??n?;3?^??/D?????:'????=?|j???f???pc8????s?n_?	&??Hn???M??'i?Z?d3??%???OG???MG@???l?????^?????$1Z?74"?wL?-??(r?H?1?e?tk??
??????]???)k????j??????y???XT?'!K?$?????)???&h?
?W3?7?+w??/g??2&?$?W?a????I???.MT?q???l?.?gX?s????[??3i????7!Zy~??9????
?????P???^?Yg??H?O?v?M?|?????`????N?s??U?&?7??-61Rf??h??_,??+?c?u]?7}h-???????M????6HK?????y?Y???~????d4f]G4?s???????[???D{??>??z??lY|?$8?2?+?Y?ZT??b????*o???q???(J?????U??S	?_????lD? ?FqS?A?\??4??$?=Y?3?a??f????_??>VW{/?-????
J?yi??&???&?WZ?*>??|?~???9*??	????_D?????g
?\/_l=?I]c?}D?E?s?{4??{?????o?_i?WD4C?W??$?T
G(K??a	
7??;?;?
????'<?I?-??[3t?????Y?G??r"?
?>??4?????	???5?7?=????Q???????sj?Z???G??G??????g?4??*??V??7??#h?S?e?~?7???????_7f?g???(i??PT?G?D??+?:<$R?	yV??i)6W?M??4?V?uE?I0E?V??"K<o??~?6T?]???.?:?<??^<T?:?!?bM7???~??P??n%
4T&????e?O?>????k"Z5?A??E???!?\Tq5IT???tA???3:d?g
?????y?S5{j?j)???????B?p| 6v@?A?1??
[??P?T??s?)?9aC6B??o
	???d??{?m6??????%?;????c?=???C???+?a?=?dwFA??eu4'??0?%??w7I??a????Px"U??v
F)??ZrQ?2?3IG?kd?hBL?@??K??y?g??G?1fLnu??U???ZC???t???~y????wzp???E4(?QD!R(????8?????????????49t???]xz????#??c? {?}04
	?C?D<qg?$?t???>???g5{?x??u?VE????2.T?T??K?b+????1Y?A?m??I?6??~??q???>???,r?j?????

?HP?Y?s???`e??????????z????{??a???r??u5???
??T"?I?tH????G1?(?\ r?$?j?;?2?P!?P
?H+?`????@??
?+b???_#??f>???O??fn+0 ?`??M|????.f??=???H?k?>_
}?n#??*
MMDT
L?A??4?@SST??-CT?@,?	p`
?? Q2?@R?L?
?G
K???T???y??i???2??%ZJo?,?T??i")???&?h?K??
???[?'?~?d??^!??aC??i?/????dRo??8?
?a){>?????[??_q???-?{O?iO]?????L????<?u(?H~??!?????3?'?WQb9?ik+???w??
N??o??z???W*{?OTxtuWOQ??p?!Q?W?XR?????hnE??????O?K??6/?8????v??6?#?,?xES9^4?}>?c	?
??-?^*??Z??B??q9w?`?D???|??Z(?1???/Vdh?E$?Q?7?v?6??MN?k<?1GM?2????????<?XY??w?Cj?*'D?&??c??4?"????s}????>}g/??8)??;6p???C??0@???mj	?>?,??t|?_????-????????b??????Fo=??C??i??rD??%?7>:t???tW:???d1;??M?k<????K????<??a}{?^???adK????
????4?I?????ZG?Dd????SB+ 
 ???2?L-???z?}?Y?	q????*\
?????_???E??5g??&???=7?vL!???N?M???x`??C???a3n9???0t??	?~??$???t?P=G)?mhK???%?(??|`(??
?s????O?.
????sB??]^|?<	??????#???q?~??F???O?4??B?Y????c?? p?n?z????A??a??$3r??G??Cc?k<????l?????Qcq#??????%_?0f
?_T_J#r?K?om????I????(?>{??????????&
?g???n?? ?'$?Z??
???J???p4.
????}?i?0f??????(2fH<???N???}???^?_?} g???8???85u?>??'A???4D?nN??m?	E
??????????"`?????H?H?@???{?5??????????'?:I???Li?L?>W????A????c?i?Kt??g:U*?-?D??????u??6???C?:??? ????E<????_???o_f?T?????L?0cN?}7Cp?h?e?Q6;??^????($???a?e?M=??~??&k????@?:?????.??D???j\B???0??7?3??Sa!6?alKd???4p??H??"?3??j8?HA?t???????\.a??x??}????????H????u???wM?K??'/??#aOR???9,?H?Z???P??$?nt???I??\??,9????
	Vw6r???n?
??:}?u&!
3DR?U
ph?$?&??<KO???????)-9???????7???L??,K +???i?/????aI?!<?h?L^.??@??+;?CQ???&???T?<
?3~8?f??????3+??fBh?_?[??????P?(????????????	?_s?
??A?VK??Y?c??????A}0w???N??>?K?????3?
?^????w3=[t(:sMo??>????_?<4l?S??X?-???.V?{??cFV?`'*b???s???>}?a?y??7-?g%?8???q????a??h&??t??(???^????????/????t?6,?2 ???Wu?_?????"?S@{?{
x??y~?t?o???x???6?wfVfUUR?Ih?????$?`@:?|*@SN?h?$9
.???g????/??1????jy??dHg???:k?P\???r?uw?-l?Q?[?u?l?????wS?????3s[L8?1?h	&?7?ldq??#q????W@??
N?v?<?N?AC????)?i?V?I?4?mP!??3,{D?e????mL?????&?:?|M^8U.?????C???
nS0??9$o4???a?*???N?|?
?!T?? ??`0?3??????96PB?c'???????????9(?O|Y?p<????k??#???2????F?+?-??????<-???6???4??????&??	
?@$g8?l?.$_??P?f????m)*}???????/?????D?N??	????R}????s?T?>L&???F4=dw?D??{J????q?????2O5X??A?5???
XF??????G6'??F??{";=????L??x???[<????G9s4????A?M??MO?Tx*aBB$9??b????:??]"5xZY?t???k|R???????????2??D)?$?(?a?]&fR?0?????P??]d????(#N?jB??;????:u??,x?Y?TO)?CfN2?S??p?D!?y?&9j?V?y=B{???l???cB?#???b?&}??
??|Z???
????:??
?
r 	????L??-j?5????"????gl		Y?
????
????????????+?????^??i
??o ??????z%???w???jm?|oW?????@???
8??~w??-(?1f??y?=_,.U???.fn???6!?5p?????m?5`X[5BQ???x?7L$'I2 ?l02@????3?k????gq????????????)?iW?-d??*V'w???ym???huSQ?M?Q#?0rc!Y??2>2?q?$;???9l[Y]?????
PT?'????`???g?*??M?M??r?6??g??]?>C=??[s?o&hoY?B?2k?sc?O:
???TRy.?x?`??????0E?6??????0><??|??kx?????????_?Z?}g?d??C??? ?iS??&g<*]??}H/??
?s9?????rK?/=2??`F??l????i???Z??	?p4??*C??<Y??=?Y????o?!h???????K@?X??8??^)?????v?7UG??(? ?CQ??<??8??????}?9?J???|?"w?8K'??X???=
?
d?v?0?;????+Vh??????kO1F????o??^?S
?2U#?q??????o0?"@??
?Px:$%?
????1]?/T??9?W??3????????rXC
RjeE?Ijj?.fE??_????Ja*w???Q
??	?O?o???????lbI????????H???im???Y?????Ci?H@?o???(N]]GraY??:??^
?7???? ?B_????t??=???4r;?!??JyCL?????Du?h4@$??B?~??7I???????m?Q?
e^??pL??P?&???A?I|O??cd
??&<??_??k????M???/V?vw????8?e??yt?????pB????S??`M?my?<????????|i??L?e?&F?^??7?2?>**??`?w|??X=?F??Mb?}??C??
?(;0v?29Us????~??SS???(?<{(y^?C?,??:??????{G?{"???!p?e??1?O_???\??!Q??+{ht?!???^???/??dB?:*??zm?|??}???????????k?g?o?z?k]?D?U36??)2?????1???????4?W??="?Gs?Xu;h?WC?J ????Lh? ?92I??-I	???????????
U??	??7>???&d!?b??f?FG%	W#?j??zvU
????bW
P??mc:

??yc?JG?e-5?????}r?^??;?z?B=i??????t?????r?D?zj??!????a????ke???Ej?m??8W?1???????iQh14M~l?!3S:? }???~????@J*?0W??	???v1?%$?2j?( ?l??.?B{??A4????????;????2q?%u?0$???n?M??v??]$?<?O??c?z??TA=??R%?????m????^dv?2?????6?a??Z~?.??H?f?mN?8?E>#
?^0??ch?5c}N?????i7d&=????
???}
P??v?j????X????7????G??cx??$????S??	?hr$?Nu9?:????<?dH?'{!J????=??2??????jS4Gv????]???c??????;?-?????g\(`t1????!????E??2(?4???CrL????B6?N?!?
^??6Z?oB:???G??t|^?m???? ?#7%??y??[I????M??h?474??o1????????2?C???y????~????S|??Gqm2?"?Q???Y??;??>?????+???????????}????;CD??T????5????????9@?9AN3?C?u?--X???????W???F?EL??: 
?6???????k???D?2f?@????$??????
?iC?@?6?9???QI??ch??h?"f/?/?1???	?^????????w?w???>???/U?x?p???>?N?U???????eo?G???Bf??;=&?LL
C??r(7&)\3?Gdz???????v?@??Z"P?-hvN??{p???d_x????	u?b=??!}??????&??????}?	?????????? ?.?w6?/{?
??`??}??}?h?]W?
??}U??-V???f??}?m????_?f?&q?;y??Z?T???*]?
?p??|x?s
?P0x_/9?
???}???OMH??Cej?^??4?c???j?5??2??;??h??H??i??`?4??}Hl+?W????|??W?/WD?f?"l????v???l8w???M?#
??+???2?X??N??y""&j^?I?????W:???=V7?_?????T#??(WOf????}NJ??v???k?x???SQ&+N%?@???s?i
???0????????G?U???&#X*??,m????'x????>`?z?{Q??R??L>?\??>$!7U
?
??8???0K??d?
R????);F@:???R?Z(?ZB??@????
??|??~n????z`?M?Smlm???????f?:?0m?<R)>h????R?|~4l?	x/1@>`D?_?|???'?	??????y?j??????~?g|?o???<^CZ?E?]??!??\n???????????!??l??!??????m ??(!
$C!2I?$jPr?}\5????V???N???(!?w????f??E??{???0?????	r?(<?+?n??w??u|???^?;???e????n\{?????????????Cx???8????}??ByL???????o??/nT???$Ti???2??Rk???5
7G'?x?e?:1?????#[?R?XD|A?#r>?dM9?O?????N??N?_P?z??1?Fl??????o?q??`Xg??
??6??:p*?
?z6d?????????????i?h*^<???H},??=??j??q??`???pu??tR?[?$?&4B??*???=??i???A??m&?(7?#p???t??[??????X????G?????I??kys?z=TRZ???,???{?g?4?v???/????O?Z??IG	??[????6/?EO*?bh??
???????H?P???B^?;???	??T?na??E?????9$?A??pf?1C*??x??
?)-??4??w????|o??0??????{?n??H????M6??(???T??tb??<QJg?ga????????????4VC??~??Q??_?:?3p??????a?J?s?{?????C0?\?#T?N?vV?Q?a
:?,??\?:f??Tw&???VDSNp@!8V?(?`o&??o??B?d?x??l??0?k???????wmCf?T?
(a?7<???V?s?62gh????????X?k???!?K??I)<I?)BV?)?~G2n=?(2lW??????G?\?8]??L9FA	??1??+.bPQ?!??"c??z??I?9(4iv??v?F&??????r{=CT?k????{?=?E(p??
??^7?O6f??d?J??O??_uc?B?c??K?LzN#?y?????s??+Mf?3???#??o??????w?????j?w?;?6?"["x?.L??Yt?Y?Xe?P??K?'?W%?X?+?3???"?[M?Z?aQ??r?/???????f=?(?b?Y at Q?x(q?m@?????
??`????YK??fp?wd#??)?>????m???Fz?(?PSkzh?%T%??Q?c??f??=MA,???J???k?,????l#h?$???WI??^???S];???#???!m??????G
?? ?{?	(&
?S8q?(Dx??)?H??????F????g?W)???K@?
fN??7-??P5	?Y??Is&?h}????]W?
O^{ [?j?J??????f38??::?"L?2?TTV??9?m????1H????0k_???-Cc	?3y??)?
???!??Eg??x????m{?*??|?<?z??????M????vFi/*?@???y??f?UP???1????@??_>?:/?A?Fk?$sZGnc?5???????:.uh)&*:w?j??<?c? ?Wa[Y?t??l????sn?+?T+m<?iqh????n;?L?Y?x?
???????t???@;????F?????L}<9?{7?Xm?7????B?????Az$x??S7???????3?5??Z?q3s?.???s?4??s?????OU???Q?u(?8?k??()-?.Md ?H?\????Vb????C??????N??d?Q????????(????????M?|?Zq?AQaM???????"BL?'se????1}<Q?g?zA`WG?#?M?x?z??%?-??a;??<k3????zS?U	?#N??[?????6?4????A=!F???(rlV???ID???u`??Kg?.?J?4n???!?,y?3]????{?7??J9W?$???!!
???w???D?0T?)Y?k?F?.???a!?\R???k.????+??8?????)V??S?M?r??~?Qu4???????]Uvnf>&?_A??,????-??6UF
????@??L?'????cE
??5?????|E7=?9<?z! ???5???D8??l??????????????9????>?@39??L????8W????qy?v5????#\??W?C????????+mx???s?h1 at 1?)??N?a?S?a?+?'`*n
:1??Y??Pa???V??????B"???{?????|?~?7??!9T?fUh?X|5??}??????????}??00?M<?o????B??~?1??%?????(????Y{????;??^?(??s?cV??3 ?[??=??k??*?@??)???????^)??@?v?a?b?$SW?5??t?O^???~`o?????(?;????yYc???d>???<Z-)????W{~???0??^??!ts/??bp?q? H???tP?HAJ?:??{?BU??~ 1?m'My?/?c?)?Yw:
???X?sJ#?ow?4??l?3??!?$v>{f??,?q?P??????.???z?D:	?*z??Rk?@??????I5*
}??:!}??A?S?F\?&:q?
2?:?????'?G
Kx=^Hd
??
-v?7?????	IRCDUU_^9?\/??}?}?5??D???J%?*@?U(6????$??w?H?<i?"?;3??`????Hg?]???`n???c??vZ???(??9jo1?MEd?U[	p~?l?????1??;C? ?Q?
9???o
W???!?0?SF??Z???S?jfnm;?????q?^?Y????H????h???Q?&??Y???????Lu?[?o??:u??uK?l/H????d???????????1?
7T!
>????????{_??H????~?=?O0w?fA???xlWG%$
???W?n??}???Tm????
?3 b? j,G?^??t??V Bt @$:I?? ? !??????zu??{
?>?A???Lv5????P?6?1?????~t???a???/?z?'??j?@????R??????N?? ?g??o???1??/?????[
?K??
??
?#C'?/?Y????A??w6_???~W??}~0??"?U!????|_
?G????|zs??????;?????????W??K?k??D???_?jF???I?T????4gJ?;??w?????3w^*???y????????Qm?/?e5C$
?]s???N?{>IE?????DP???5??y??a????????Q???~?{>T?z~??$c$?????:(?2U??
?:??450?l??v?6?????????.?????sP0??????C?_?t?sh????Pu?M?uT9n?? ?P%??~?\???UdF?{????`D???d\?n???^dh??n?d???wA??4?USB?$0!/??-???	?????l?@?????v?????3Qc??

(cZ?t??????8?????zB?P??????@L>??fq???>???Pq????	???????=&???38?????z??dL
h????PD?v???9z?O????=?$J???]-rh????kr??U?(??fb?k???pb?S?Q??@	???ZRo?j/kq!????dqyn#?????
?]?Qd?5C??9u????k?F??u??+????L?
V?n???\V?^'?!=Y?x3Y??p????zf?L??|????????E?
???{?G(q?$Z.?Ry??|???.pa???(??<?\??;??+s??????:g?????8??a???l???\n3Df

_?7??Y?"@b????M?????
g5??u?g<??(A?:??yzA???j<??`??6??l}=YG????B???A<?_?G?????$????a?gys??????QD????_????C?%???~???P$7?`wvJ?7???m?h?a?v?6N?{??????c~?m?iF??j.?!??-?b????+?,h??`?hz?]?N3???$"??????? ?.?9A??7??Iw??	&L?d?y?????k?????*?1?mm?????????9??????vd
/???g?_?nhJ??????GP!?$?????
??I?K(???46c)y?cE<???[????,?v???T?????IJD ?=>????t??I[m?*????u?I??{`?K?Nl??<?l&????F?@?I%6????	yh???O
?D???Z(??d*?E?B?F>???~d???h?)?A??\N.F???r@?8??????????eb??Uw?????????X??|f?o??=?Ih??,5?$\?|????V??y}???\?;N{b	?
? IX?"#??tA?v?S?|?6???
?h
%3??b??
??_^q0?^???;YZ=z??l????(?.?~<X???Ib????O
?
%?P?eL??=Y??<?h?-?,!?Y?Y??????<q??????G
??N~?Q???3Wvda?????4?C?Bz?	Q???3m????pm?\{???a???da?un?%Q????B?>J(?w??Pk?lV[?9?!??|??????Y???????|guV??gO[UV???p?'afg~B?p??Q?|j????IW%E??S?}H??????? ??1Tf$??????yz??&A??@???4g??????B?rH???`?ja?V|5Ivx???JZ??0l?)l??\?}?K??x???;?????`k?Ch(?f?<????ZZjr"??l??o??.?7?????1?So<??6?C??r?W?SZH?T7???\g?l0??8??J?Z?m?5g???.>Zv??DO??yc?y?l??)?????c#?g'?>?????xxJ]?N??w:]`"A
? 3MO?Skv?cEg:??F"?ZF'[Z?YS??Y??U??\Z[c?#(?x?st?!???[+??SaM??a?????1?}V??G?=u??_?:z?Uq?^???N?lK#?;d?,?]
?$(r[!?'?i?qG?E=`????F??@??~?}??K|?\???M?7ml????|l?G??t???Y*??????c?o????Ox(\?T????0B?e??0??#????f)????
qjx??8?aY??{???`9w?K?#?
?FH???t????h??????????[?_<?"P!6??qBh,2???1y9?lr9Z??}?,????&A?????t?f?1??h`v?/???,y?n
CZ3
3A?v?y?Q??H??x?^'wg??7??????y`??^???Qa?T???????tz???1??6??n|v??Oc]?9	?;??T??l???n??M????bo?G*2?d
?	?wv????????A?T~.??>?]F???W???]??_~???#????????}?[)
]{3I?Fcd$?FYAXc?I$P at T??DQC
R??????=_7?M9=1?;ksZ
M.Aj???0???
{?????[??[
?*????G?7????e}yb
?c??5>?*??4A?1????R??(i'g??z>Nv???lh]????????3?C????<?rS2;?2g4;???(???qD???A
"???M?dD??">w%???.{???}??H??7?~*?????
?11y
=??DA??d??Zu)???KXuq??v?????????0D1B?D???B7?Q?P0?*?J??"Sd<??
\Y'????
??	??ev?????D{'?I???^?x:?tA??f?;|83?}????M??5??&????WZ|??P?&^?y???v??6^=K?E-a?xh??????9j?9??(??<[??e??m??o??M;???K?#?$?aLj??>?}e???	?Zc
???x?
?#????2?????ng?/0???f<l;?n?/???@?D2??<ze???????04+??0????a???Ey4CTpT?????x1?????Z?u2???i]?>[_???Xs?
Co?P}?????
H?8hZu?D[???Ro?^Mm??>y?????~??`Fu????????????jX??#fc?
??c?+u?
???Qh?????>}0?V-?VKa at 0??}+??????$5??l????LI?1???*????????ay??6?Ly??L??????NZHB0???>>???6sG?????r?#???9?I?<x????MB?
??d???vY?8Yv(>???????????0 at E>||2Gu`?.?-?A???e????8????@???b?]?U?Q???f?j*MF??????<?8b?a?2?(?o???????0??SB#???{???{?0??1?%?,?*????r?(??@0?a?^????| /???i?j?x??q?X??l7w??1?#???Yo?3ORl`K?F|v&????'(?????U??{?&??????5&?V(???_??\j??1A???A?d?]
????:G??(S??e?*|K??T??b%?]?FY1/?7<;7<66?;??l(?4??J?9?T??T?i???G??OGq*?A
?%????+???YD??Ce??X??S)gO?3x?^^?-=^<-a???\?0`??p?
;?<Z?2???R?????	?"?g?9?~?O???R	l_?a?	???X??/??kI??k?X??7w?oj?Z????Kj?w?>U????W?jo??U???|???L?????????*??R?V?.?????5?qGng??OA?3r3
^?4????q??M??"???y{?
??F?]??+? ??????eR?%Y???Z??,!??????????b????G?8?WJ?N?u??????k?y??t??{~??&g???vw~???????uhL?\???(????9!???????S_????1??.5???(??F|??95??7C???Z?zSp18?60?b?j??VJ/??j???l??????f?TF2?dI6?%.<?^?k??STl-qt?bQK????4F???Y/ls??*!M?sY>#F\4f???????5o?8?#????u??$????^;kH????7-??x0???_????????o?s???1?d??? ???0??v???L??"??0?????\h????I5?BP??*?<?82e?l???\?I?eE/?g???n??h??IO??
?B
?JO?WD????E???/??????o?5A]?????,????#??r???Q?????;??????=??\?x]Gl%<\
?????N??0??????j??N?']?A0x3???????r?!?????&
???"?\?>j??????f?O???[k????ub?G?/,??7<LY?????5????7	????$?V??8?>??????x{?.??i??????????iY???Qu???Um????znv{?n??5?|S5?????wD?j&??&GO|9bx*?3?q??{x^"B??Pf)`RF?????r?0`??????}??\K?\??z?oo?,?JB0D:? ?
?I???z??,???q??n?"?????c???9?Um???C?"?pJ?? ?v5???f
[??o?}??????L?6,???1v8j????5L5?Y?????-?bgS&?N2?????A??_]`???0?????F?t?&??b???
?swf?\z?<???(??????rt??tM<????????4?F??Ro~8r??8?a?.?2???????'????[??X#D???Bv??w?n?????kV?F8??Q9R??"?p?^?
??<??6?c"?#???C<?g??y??Y?<]%nB?1????
?ufr=?U?t?qqygA???v??]??j???
k????s??????XA???_:??/?L?J?7L0?rL?y_>??&;?F??K>O]@B??XOyj??R^??????????m??3<;????h??[L?7?+g"o?*??/;?-???FM???????=?_u7??=??i?q?k?v?S[M??E?$?a{?S????f?!?*lE'?NFT???4?N?O?
m???'z???a????&?W%9?2V8???
??}i???-????\??????????M?H ?+c???O2??t??	?o?;K<?}??H?k
?h?????iD?P??	$?jQ??B??\o.?t?T?b???E?4??h#I??k?A?	
)m~z7W?;?K???:????0?X?t????]???I?A?NQI?2????eMw9????y????e6|???"?????~k_??;y???????&_???36+?o[???[1?"?z????>n{?_??-???VK??);h??)2>_??0/1???1D??/????[???Ls-oL????/??,??no+?5X??????????,??????O?????s>Y?37~1??f?????{L\?????N]??.j\???????}?o?3F??????JA??:??????IW?>?LR?????r?\?:????????h???x????????f1??^?n??n???;??(????u???r?]7?C^??(?tF?J???Rf;}?N,6u?????:c??.?"??$]??r&z??R?=Q?X?^?a?
(??3YD?a?s?C$A??/2??????+?f????[?5?~?????/Ib	?n??1??Y<???N?xH??}J?k?W?E???#S??rB{??[8r???y$?pl4)?Bc??}?ya9C7NB???*2?Z(??~n??????R.?R?d_?"7??????=?!??HB:m?K?g>Z
?????ar8,??4?*?\Z???\?7?9?{?,???699?C;s?P?Q?8js?p???4?/???????^??]?????j\f8?DV-Y?AD1??"?l3Qu??c|?8?=-????
?0???.????]@sbm?#!?28$?????V??q?c???T'????
O??)?@z???h$?z???C?9K???+R??9Ka?qN???_%??h?_d???IS????]?lxL????(???:?l?;???g?Yz?CFNE7=}
f%?e?3?{?r*????g=?7l??^k?A????????<vJGq?:???w??f?j???????n?}????Ew?d?H
@0?? *???Dt???h;T?$`?j`(?{EDs?K?>??|????
?A????V??[?
???+F_??(?S
??W?oqNE??#????|????????F%??r??-?(N?&d??:??Ti??F?~W?aPnB??4c??/
?T??a??

kzq?r{?????Y????g?:"?????(?}??l?vgzDU???D?b??y?r,G5(?x7??6?Y????/??,s8??@#??c??Y?
 6uz[4+??m?:Z???n*?74j?K??,|d??W?h1(h(?L???
?`z6??6???o~?????!
?"?"?`??P??????-z?Dk???!?1c?}?w?????????e??D??h
??/%?b???P???????O7ztk????}?????????T!
+2?C?Y?m??e?
Z???|?????ru?/??;????????3v?a???W???(???{?????4UO?|.??hn???9",0?
?eL?|+?????sg??kYx-u???L?V0_???O??QrJY??S
???????<ut????,??0?0p]+???w?????0g?????#??t?
Y/?r????M?5?;??S????0n??a??c????ZL???:???L???4S?yA?g?O?d?M?)???s}?[?jVp?4bwa?f8?go/?y?/?????'??#???????(??]?4?!??!??i.D????
??v????^?)?4\U?|?L??"{)?{O???N??6????f??9??$	???ZM;?4?;;??A???{?P????BJ?^?<U????\??J?v???T?Y?)7?K?Q\y??;????[o????h?D?P&l?;;)?t??I?????}??a?:tP??uE$?&??~??=S???7?0O??7D?<pz????.-4d?\K"?`???6???L???,A??????????N?&?4V^'?-????aw55?????Yi?x???T??f?':?o??s?p?5p?.??4a?t???]???K?B.??z?l$?&??f?	P??i??"?}i?????.5??)????w???7?????%??8?_???v??91?3V???A?fZs9
?\i?v~?[??????l?????????*?Cb?yX????????Y?~?T??,?#8??q??5D!?
N?X??*m?N??:!u??P"???????v![??.????Gk~???f???c?y?,??t??=[?
??"A?(??Y?.??????i???~?c???

?2]??????s???Wh/wG5x?,?0\??????nZ?.S?=?<s??f7????n?e?????
?tx????>?]?8????=eQRa?Tj??S?F????`1S??Z???Uf??%??5?-??x???-????]??(???/?ZrZ"???^<??????9&?0`g???????=_?!????c??y?9??F?Fs?u?Y?+?;;??S????rx???S7g?5O
??hD??(j?????@\?!U
?9?BCO?????E??-?????bq???????7????????????g?w?.g??-C?1I3????=??X#????h?{?????{???;W?9?|?TL)0c?????[J??`8??E?G??4jU?r?n???_}Svhu??;?N??(?M?3]YU?.S?g????pv??????4??,?$M/8???-?4??Y??????J???????[{?nVL?I.c?$
H??~M??"b??,P%?????.??6??(=??s???l??????tBE?48?????n at f??I???^???V?,????zam?N?+#??|?3?S?ug??`?QM?;????K,?????H???????????Lk??Z.?C9?51??????g.%?6S?i?????wL/z?%????M?1???'??:???}4Rd?Z?9J???"3?'%??Wd]??V??=???D????J??????u?59?/?\,?VZ!? 2!?????UW???R?UebU2=q=6???z
?v?[?0???V"?4????C??X????1yJk?u??~z?P???:?g,V???Y???A????T6?????	NyY???D??
?)??U~|?g?q????)*??y?'wm1??6?k???C+s?^??0^<?
???????m???O>?WV?????Y?\??{_??mw??>???`[LS
??^C&Y????X?5?
?j?f??S? ?????????
?U????q?`?fL????y=?9E5???	U???]??$???????*j????^^!???????i?f??????u?`?qzp?7??????A?R??W??9???
?ss
???????????9???????v	?
????K?X??a}???9?????'GK??Z?n ?_?@c?N??rv\???Y?????(7{?^?nR2 ???DMkDg%?Y?>????
Y?k*???M??'_%$
?:?G=%??U????z??KP?kG}O-xi?T????C????ze????sQG??s?
18T??ajygC?S??BPD?ej?mV?(`?J ???{?IZ/d:;/Uy????*o?????<8/??gP????}A??@8??B????????s??mz??}?2???J???b"j??b?%?q?dY7???????=X?c??????R%???5?mpq???o????t?!?@B??pC0D6^i,?B?(????DC0D(E?P
lCj	???]?^??D
??d`??y??i?6?@O???W????1??????n???Q??
?|M???E?a]?S????M????!???;:v?M?)?x?????m???e??uT?*E=Y??
?????B?l??k%???8???E??x-??e??]?	??|qW???????y??C??n?"?<8???-??"8a???b?E?0m???.????????????Ps????X??????sV?&?????j
??I??=??mmA??????0????9?75??!9???<GTP1??????i?"??
?
???
?B??m?o?\??4>w??+???d?BX8a4"j s???J?????.??????0????3
?N
????0??sANU??8T]@???>????0?C:4????%L?n?-???(U%??V<	2i??Bf;tA?=?o??i?\8????w
?&/&?I?H?=??????\??W??zu?
??Ua?;?j???gY?(wia??0??O]???k??o??_[??.??	??jJ^?/Z?L??u?W?|wH????Y???K??E?i??fY??](?A
?9??oC}?hYl?+??N???????W???1????t??yy???j??83k??q????M?`?;?*???FPU????????|?????Z???mT??{=P;DE???Z?U
??'???1???;,??v[))??ee~P_n?n}}u(?JIM???v?y??R?O?.??v????dG????b:???+?'Q???gi)x??9?0P?????y?j?????U@?n???????g??fj`??xB???y??D?-?????????8T1????)b?	?P]???.??Xg??c?^5?????6?D+??G????x?"?}??X-?
?
???C?)?#q??K?X?qN????=E
???-y/fM????LK{h4[[??<??!???f?e`USV????VK??J?TY?i?E??!V?)=
??]?S??o?v??\x=???`{?2W?t??????Q3?f?+w??????!?U?C?b/?>[?3MT?t?D??o????%8?p?k?A??j)???M?????uUf2??\??2??ek????!?w??*?d?J??`>???Hz?l?|????i??????Y]r ?Ye?????EV-=?\???x???-?PW=!
>j{?~O0???g?B?-??.???G*??+?*
?z?????"????????klN???m??!??j??eyu?&?????TW?_^?7??T?z?.?????K>??????????TAv??G[?W.2d????p8?5M?w?,???x?[?w?X???????t&[j4????D??GG???w????a??U@?Z
????T}????C?+{gO??????7?,?
???^:7??m?'N?C<?qA?B?a?????U??????L7?;?$?N\?$Vr?8W?????6????#DdfQN?????bf&Bd
?d?efSBRP?????@&.??d&INA???jP2L%?q?V??%:???,?????1|?{????@<?9?9????N'?;?!????,??%???????c^Bh?F???L?R??i??!?????ow'?jna$Z?5Q????v??/V?u*?C?>_X??????X?_??q?z???s,????@??????<?@?r&????5?d?~????Z??F??=j???:D?b)??m??-???}.?b?K{????;I??i?????Q=?:9?G??Z??gV???o?>.?
KQ???|????";9?I??????t&??~?????U??????o1?:????
???#:g?v%????~???
F????{?X0???9?s?2q??4?6*;Q??h;???*J(?S	???MvA?$?0??8??I?????????(??I?V??????r?Pw?d8?C@}????4??f]???
*>???x:?X`d<kT???b?C?cE?Jtg??wW??7?????)H??????5\g?=?????????0p?a???h?x?d??)?RnG??/????????7???p???|q??????Yd?r???7???{?aY??Sr,?.?L??(8??4I??S???j-L?Zb??a??,???????w??OA?f?0b??&a?1?????2?8??~18,?????}_V?:Z???QG?~????VCy}??m????????yt}\??&????wQyFW2??g?2?s???S>,?????]??w>~????7x???o??n?????zwt?-<q??????????l?????^???g???c?????6???v????????C???c???{?#??C
LN??H41?x?H?W?E?f|?(:C??X?Ev??X?Ad=u??{??OY??6??kA?XDI$?!4O?`????????Q??*t?l#??W??v??????@??E?	??*????Rwi????
9?wM??q???7N?????r?$P?&>?6?]??t?|?5?B????????????r?????P????[?6?@E????&!4m????"!?3" 7!f?Yd?I???,V???Ln?~?~????oi?c??M}?M?{???????m?c?D2??0P3uA&e?^k?U????IjC?=??&??????wK??N???#????6??7Hg??j}???p??$????23#L???]??q6???+?;???r????XM??m??}???td1??c??z ????^??3
G?}_????????p?9??j????Tj?7????E??.?2?t9??????F?k?]???7}R??
???????/??y????Hs????!?Ae6?
????????n??uo??v?[?!??Y?SQ?}?/G"??F??(a ?(?I
???h!??6???O??9m5?
?????n??gf=???_??^?o???????P?EY??S?
??t??
*??o8?@? ?n?(,'p?*??P??????NC????
F??Q 
T@?]??~??7q4MH#??fY?T{???'
???2&?Dm???93?S??d????? ???P*c?D at P?P
D?@???J	?
9d?]qT??H?R?;?UM??U?????W???	E??a?A???w??G
*L~???	?Ei}?~??u!??M.?jGuP??1??LBE????7?y???A#0 ????v??-@?
?????Jk??b?(????)Q?`t???l???)r????X?A?c+{?7????X?c??:??8d8@???N???
&il4QEQ?t???k?2??
?????]?6?Fv?a
??_P?2??K&?+!:?2"?jCg?>LiN@???H???u?"?+l??XMbG???o`{?z$m??`MH???9?sN9VpkN??0??????6???0
????n??G?????Q????2y?K???k???H(???	?Z?%
???B4SA????A??p?fSB?1??.|o???N?#???{?
?????7Q3? 
?+??J???B????&???jp?Vz?)Y???v-!??7?J!B!~)	K c)w?W?k4????gPk??<,)X??;>Qi?QH.???8?????3??y??nY?e
(n;??9?'?Y???]?)??8???Iq8??K?pp?P??????Dqbg59????????Ba~??q]?7??????h?????YT?B?
??? ]1G??G	??"??d??????;6??3'??\Zv??Iqr?[f???y>????Cl:???Fc<U?F2???q????j??????q?"?????ax
,(?}4>???.???p?
;???:X?3?bYQ??????yvI??&??l???!n	???1S?????`?a?~??f??kx?
rB0?hhsx??x'?d?????C ? R????))Rd??bYO??@?}?
??6<?)?	??r?$P??dA$B!??
 ????l??=????Y?zXV??Vz
OM#?s~l?~???Ed:`??????Y???JFc???@?????Oj?/??;??????~o??-??a??2???f7???@????{}_??6???V????G?;(??1??%??8?e??W???pv{???/??5?????	`?"a????!???c?h1?6?f?S???????G??????sO?W?4??&?_$???)L*????L??Ky?r??f??5,??@\???t???iZ}?1??w~?e?G^K?y9?1	|g??????:
?e?O?|??H??]?,	?s?k ??1K?C34??Ly????r???????o????^}l?|???S??????o7?o?_??'?(???z????/??x?Q??Q??????W????m?|?7?i????7?????;??@???????r#?o"b?

?A??
`````,
)G??QUV??=Zr??I$i&f.`h4!(??C/OLH?J?!B?!E	AA>t????1?x[???~FH??Z??T?~a?O??	????te??J??1P#????p?AE?
??;????k	??h????R?dL???P?iN?7????3??vJR??p??8x?os|??	????H??L.?t8+??%???1s??q????C]??C_?{?ec???)??c??tO?l3?z????9??sHi??e?/iP (J?avJ??zg??~??????Gs????? ?5???=P<??k????????????-UZ&L?>?o?Myw????L?????????? o???!??cVs?}R?????{??x<?h??0????u?7~????Mb<"*FH'???e??q?[?n"??3
??J????/?u?,???%???|!6M?d0F????????pp???o?:??b?o?4?34/?????T??i%g?x>???C?R??\h?N0??1?@\????!??Ae??j???????U???@
?D???1??-p?$?]<B?}o??????v?????mE???8??<????
?;z:??o@???I?$?????.?#???Cs??(J)?????????-)/D?,?=?*gx??3"????
?h
2%??H?w??X:???Ia??C???u?z+?????F?
?~4?z#I????<
?b?!!CA???U?F;?(m%m??j?7????$?;??'4??lL????j???1?q?(?w0D!U2*??????L??AG?Y+?5
f~:+?N?%??&?$A?K?<?-:B?4??&??B?N???2?|3: ???#???>?????'N????y@*??q?g?????????DR,??W??H!?F?+??+?_2?%Yo????????7Rj?z??^?+???????H%4??\??n???????b<z?????????z?~v????
UoQ\\????I$?IX????n??^v??~(eG|A$=?B?k??Q`??><??4??	??+C?hL???p??~?d>?~????*??m?????x???Z?d<???e???pA?r]v?=??\????gX8lY??]?^k??Z+k?
=`??gw1?~?A???8t?$??A??????xA(0@?GG`%???k\??>c;e??b????{?K?5nW??[??og??u?`M9s at h???????H(.T?????p?#?1?Tr??????e?
7n?Nn?1Fz-{^????"?????????????p?x???!?I????/????,?wa?7mN???W??w^,?h?lnF?}????????~?x?3NdN:&~?
<??&?*T$?
???yG???????:<???qP??????l%G?z<???wEy???}?
??(|48?6pk?.?vtR?~???I?BA?}|1?$???}??????*?;6??D<q?U???t?uJ?X???M??>JyI????????D??zm"??mvc?????_$????_???hs????????~?\?p?????????'4?F?a,;Z?J??HA?*??????0?q???@Ue??$?????e??2;?k?Q	?A?Jn?d????PI???Ma???is3???<?^????CA?;}???a*Z??RaHP??|Z?iHH??
??.	???\#?p?{??~#g_)?{c????????`???,?.???z?1L?&??5?		?W??)6?????~??c?fSp?-????)???{L?!?o??43|???2
????8??=???5
?_?@?
???????????$??"p?/??????????]?!?t????=jE??N?V??_m??t%Dc$?Y??#??q}?????fO^Toh\?s?|????{/?S?e??B?6
??p?5C?U*??fnso??`?m?B??l??q#=u"W?D???c?k{0{"
AA07??hsx??????PP0???T??U??$	?Ga?3z9??%$?1?!?.?.oL????
 ?gF?=???o/?<X??Qw?,????_r??^<????+5??V????#?g??????????}_6??????????o?||?}??>p??9I?=?d???Yl?)??2c?(?U8??E??e?Q???tZ??F?#8?	????.?'3)o?$???Z{???.!~/?F??2U??4|)??{}
???i?w?^
?D:???D|^)?????j>Kr,???M
?	p~???????#<????@"F???L?[??SF:??&?v?????2???'Ax?K<%<T??Oj
?\??"??79a?N????di?M6?A???n?5??~%?41?I7?%U?_????O}Q?9???T??#?%JR??))????o=????K?u????=}????????|N???^c?<???=???)?5?>???8%Eq?rH??I?'????
?5C}
c2By?????)?zl?1????,??_??<???<??%J
[)??-?F\4???FG???????Of?J?x
<????!?u??By?????????:`l?<{????.???Y???/?F~???????]??4!?o???d??O?Q"?7???D?l??????|???vn*H??????R??
?F8N??!????dP?{!?+?v???I2???g????*:????c.??B2?j_??zK<2OJ8?y?6??7,?D?3U\?3*a???_?????-3l?R??????*"?y?"???3?U?J?kvC]|?W??l??????/???~???????>?3yM???????;k?n???o?'.???(;?@j{~?|?E?,??}?W/????2????G5Z?.????RTn?~nw??4U?p</?<??Q
?9I?(???4wyu?W?J?.H?n?R??^.?a????{???!?5????5??!?Uh??0?I?j??;?Z?o?'[5?2io-???+?M??Q????????,Z? X???0?O?(k|??X???z??=???(?????.??V?jV{h?c?ZE?<*????<I????"g?o????????PM?e?T??y#j????????U???5'??f,??4$t4c?
b?_(Q??Mr???$???????	??S1z??>
?ucL+?*(??vW?N<??????iKL?q?`???^??_)?C????s?&??fc??K???#?QH??T,???4l???8y8???I.6dF'?w?y????:M~]:?i??in?????
??	?8??|$?EZ??j\?Y13??x82?/?(???????????????>o?SE??b?0???l=N???uBs?u??z>?w?o??????Q?G|uA????y???O#????.?g?k?C:N??6????F?5[z?l??3k?Y????}???????xy2[?o??,?F?#P|?^6???? ?=<S?;?W???n???N??F??~????V??^6yr?????v2??M?!??????J$n?
?
BH
&K??? ;?
H??R6?/??r?C??^???}?o?oc%?d?????ZP(]FI_???=?_G??>=????	?
??g?<?N^-9?"?????0?nwc?1??(??a#?i ?O?1??<?Z?,?ko?7v??A??????????????N?J$$Q???'???m?T??u??????+~??/?G??y?L?????>3???gEb??G??8??v?0[?V&??#9?????=??a????????;?2R?T#*^?????HY??b,?2_T????zl??eVW?{?2?T????]>??????????????F????V<??1????o?s???e?FA?_??Y~?c??m??j?q??rv???8?O??wM?-Y2a?v?n?C??UN???S??????o????>??y???|2G50t_O-????R?!3pN??k??9???v?M??Y??dJ?cv6sW?????b???RgUc???zu???CV???????[6w???l2?B?o??i??????e??/?`5.`NY^?6????t??b??????????Ew?nU???2?O5?,H??h??I?jz|,9B?-$?[6{?b?iy??}??d?YP]??#???????e???X]x?xA????o??????5?'?????????~?zzOl}????#???Ke????????d?`??????M????|???????N?????n???$J??'&????I?z?|"????1?p???Dy>?$"?????lgf}????.???56Qo8`'Zo???ri
2?]4?!??+????_I?B????%???????G/5?????MY?_=x?	?"??&Q?aM6?y?yc??T???&?m???2?? ?8b?}XX?'T????+?sm4B}+??????{9 ??Ptp?????|???E??v2?A???B#???M?*??!?z36x??a?q???o?d??W1 at p??XmR???F?c?]l-?????????y???u???n???s9Fx_$??t?'?Nj%A.(????????U?B?6?}???tV??&?=?;????.??6i"??#?6?tI7?@????
?A?c???^4j??:{?^SQ????"?!??????i?4????[?so2E(Jx?u??????P???qL???)???P@??W?:0???!<??f?vm83????S=??
???\F???J??II?q?????;???t ??.u???Y???`fq??o?3???'<?`??2???)Yg
H??d????o8`N??f=??7Z?OVU?$&m?j????vF?UXx???????N]3?,?e0???)??
x	?Q??E]RDv????g?#?]?4+??(5??!?|?[r???6s?F4$?0&?2)????:9???a?/?+?????
Y????z<??L
???????????&? ??;?(b#??bT??????!<l????!????/]8??.????L]X?/
?Tjp?3?PL?68P??p>?h?9 at u??w?m????<P[???J"D0??MJ,???D?????????]?"??(???|????>??s??c.??????B???M??o???x?????I@??????????????qO9?n?%
?M?/??/q?i5\??????W
y?k?????<,?w>?$?*=?s??4?????|s??????Q?m?J0L??i??nT????2u!A?c??????z??3????x+Tt?A?x?7?|1??????F?	5????O7??y?*???????k??????????	?!??/???N?V?v?%F?*`y???'?N???:~*???<?gmd????b????_??Zt??Fg?t????r?U(???v
e??{1u??)h?????#?Z??????????9?????????i7?lq???I?2?????]f?Kk?3?????l<ak??[Tx?LJ??eUQ????T?;?V????T???%f??!6????p?uwa????6e???1PH??h??jp????x?/398_N~k?"?z????]?rD?=wQ?MU?wI_-W]??]?>c6???mUt??7i?LalwCFG??;????[?2?i??CR?8d??+?Q?c	?????fC???q?F?????????x??0c3`?O?0?G7???:]?f$!?h???7f!_+???~?m.??L?_
Hy??~]??2{%?????w????@?_????d?&????X?Q?
??-?!_E4p????IB???om7lwf ???b/????C?9???Z???[??*s_?(P????i???>?e7?????tzs)<zk???n???m ?-?#?a????\?S=?oFt?E
??Eu?3?n|R??L??;?9??[V????b!????%T8??+m??(???XE??(BDzP?w?_??fH?t[EP;????ta?????	?W??V?:S?(???M)??Z;?-??)G%\????z/???amd{n????~?^)?Q?8J?{??????F?v??'I?G??????h???6?RF????????		?????l???h???3q?????;??D??>??FJd???I?og?R?.8?????m????2-?+yWqh)??s?w}Q??a????])???e)????o?
t?L?r?o6??{?{n+??sY?]Dh????~-?O??`?w????|?l?&\????yi 0e?S??(
mv???a???K??
[...3191 lines suppressed...]
@/?\?^"?
?.>?t??mM??m???3x?G???4d?
?????X??)
?@6u.|??9?ht???
+8
??n0
?@*?
uc???K
s??
??`Iy???? ?
l2??:?w(tsh|???e?5???.*?7??`??_?I*Z??8'???C?t??????`>=;1fO?????`?h ??A??7Q{v?,X?b???23 ??C??
??????#*?"?w??&?l?9oX?L??????y?]? M?????3311??M4?WX?i4?7v???????5?Y???????????????6o???/Bee
???H???Q5Y7??D?????u???|u??]Z???J??n??4???mWwwvn???Y6BM?
???V
????O????O????M?m???t:8AA,??J?I)I% $????V????G??}t+???:::??g3??` ?A?JI*
$?$???J?J
,?h??QP?bO;??*X???t??$??:??w?|w?h??c@?F
	??BIh'
$?????????I$?I$?I$?I$?I$?I$?I$I$?I$?I$?I ?I$?I$?I$?I?I$?I$?I$?H$?I$?I$?I$?A$?I$?I$?I$?	$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$I$?I$?I$?I ?I$?I$?I$?I?I$?I$?I$?H$?I$?I$?I$?A$?I$?I$?I$?	$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$I$?I$?I$?I ?I$?I$?I$?I?I$?I$?I$?H$?I$?I$?I$?A$?I$?I$?I$?	$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$?I$I$?I$?I$?I ?I$?I$?I$?I?I$?I$?I$?H$?I$?I$?I$?A$?I$?I$?I$?J)?!?IfjI%33)$?IL??I$?S32?I$?????I%33)$?I???????J???%??wwu$????In-???I$????[?wwwRI'wI-????I$??$?wwwu$?wt???????I?f"RI$?????I$??)??I$?I$???F???I$?X3331$?I+???I$?J???$?I)??I$?J"!$?I'wI$?H??I$?I$?L? ?I$?I%mmmb??????????????????????????w$ ?$?I$?Icccc`?? ?I$?I$?????, ?$?I$?ISP?B?A?I$?I)$H?? ?I$?I% ?	$?I$?N8AI$?I$? ?A?I$?I*(P?AI$?I$????h?3???I$?55
(&??9?s??IUUUL??Ipp2?????????s??u?????[c?3???E?
 ?wb2PB!??,XA&?$?""?%	$?ffqjxt?K*???"?$?Ywwwz??4??????????t?In?????.?$???I%????Z?I$????$?I%WI)?i-E"RI)?I*??j)'wI%	$??E$?"I??I,???S32?.?I%???J??? p@F??RI-E$?Wwwv?T????KQI$?????Y-???8vp??.\???????M6o????H?cF0`??B4h??Fn???fffffffffffffffffffe???????RRIL????$????IBI%336???Jffm%	$????JI)????$?S33i(I$?ff?P?IL????$????IBI%336???Jffm%	$????JI)????$?S33i-????QI$???I%?]$?Z?I$?$?I$???KQI$???I$?t?Ij)$?X?I$?N?I-E$?KI$?I?I%???IbI$?I:I$??I,I$?I'I$???I%?$?I$?$??RI$?$?I$?$?Z?I$?$?I$???KQI$???I$?t?Ij)$?X?I$?N?I-E$?KI$?I?I%???IbI$?I:I$??I,I$?I'I$???I%?$?I$?$??RI$?$?I$?$?Z?I$?$?I,[???RIj)$?X?I$?N?I-E$?KI$?I?I%???IbI$?I:I$??I,I$?I'I$???I%?$?I$?$??RI$?$?I$?$?Z?I$?$?I$???KQI$???I$?t?Ij)$?X?I$?N?I-E$?KI$?b???RIj)$?X?I$?N?I-E$?KI$?I?I%???IbI$?I:I$??I,I$?U?b"?7wFfff]<???o????
f??!?v?>I??#?<???:915
Az?gb???a?u??q1TH?r?/?o?;{{83????d3???????e????Ye?Y};C?ro<!6\I
?K??fB??T????Sn??
?p??u??ZZ??j~?8	?8?
"??Y????[?"I???33339??fPT(??
?l
??ffN?????fb??[??s1nf-?????3?b?&?2??!8_????G??????????1xt????~? ?>
b$d9^?1F?????5?
?$?r	??E???2v????t?	b'N???????<v???Aw?9?f?x???I?D??'???|?!?;4!0%?]O????'?w???3W?D?*???D*???22q(??f????0[|HI&c?S8?Q=7ix????7~?l4`??2?vom?^O?H??	?4z??????t;?X!
?
=???N???x!?<?;??IU
i(??&??O
?C?`@(A]?? ??????Xu?????n?Z{6???C< #????l?
??fTC???76?s???t??+?H???P?N???r??D>o^G?:??Wh????;??Z????????~??`p????>W?}?P3????k???l@?4?,:??_?k?????4z?&b?<H???
k$k?????E???o??V????~@??????????u?????MIp?~E????VO??n????s???????r?-??
(??bl?5SA?:?? ?(?Qlw|?,@??Q ?e????i$K?!???q???d?l?7]z:?9?w???$(5?K41Lw
??wt7???j'@??((h??DN??
?H?
?P|a!?( F$
?s#Ek}f@???
???5N?;???p?(tM?d???I 
/?D_??{G?????1??1???
??}>?g?\?????o?&??????r???8>hfD?1?L?i???????|?W??|?}??Gxv???wt??;???N%X??
???0Y?'??Q9?s?p)"@???_???#EV??v?Y{???k?LC('???_?????H???6?u	????
???~??????f)`??pY?wX????	??5?c?`??r?0
E???
\?		&f
1?vs??*J?Z?q'?"????????99??MJD?,?#s???	?p??P?^???????????6=?????A

[???
`?????Z??R??6????[???f????M???55eKY?k,??ke-?-?[?Y??U????????5i?????T?@AX=?v
4?UCS?-EI
dJ??P?b%@
???Qk?3a??:?
P|???@?O??j'?9D}????$??????k??	?\?V?
i??????I	?K???W66????J???9????*!?H?Cj????%?d.CIJ ?e?I%???G(?0;??}u?rw?vHe??8??%?]??%?n?l?*?2TdeP>0q?????f???D&M%?????~B at 9b?????H?q??
?L?}?t?@?J????.?;??E?H?????????\??W?k?{e???cH??????e
??K?r@?%FiY??c:???73??????uh
?bldw?3?R???!T??[??????????~????<=??^?F?n)?q?????J????A???Gs?^?????????1???!?????E4???y/?Xu???U????`?
~??.???????i@??`?&SS<{44? ?@?I?

??H%?B?-y3?V??&?????o]??i?4???4???"
??}9????=^???>????f*??????{?n???x at Jy???+|???&??A?6??L?<M5???9E??'?F?V3H?
?~??????nr3??P<X??b?	?D?H??
?qpsOe????X.B?5U???'???k??6g#9??$T?#$1#k?????t??=?+?*?D?????
o=js????H	 ?"?jM?}??o???{=????V??X?^??s???f?a'?????W?s??~?|???????,fp??????W?U???q$Ud?=??????y?A?~???Fd?z?
??NV,???6{??G??X{$?	O????$??:?)^??????????D?}?ED??@??????????AW?
't	???x?l?$E	
?Kf0???????.w????|9V:?7{\??.?},??=Ru??:	;J?asV}???f????I??x??????[C???O/???fN??0??:Q???9Z???^???HD?P?k?3f?j??5?,???O?d0?1u%^p?%z.sk??9?Zb???;?.?q7?4?f??e&?1k?8??8?2???,/l?r????8}?/???}??+?u?N??E?xgg?9?_?_9?s??9?s??9?s??9?s??9?s??9?s??8?1?c?1?c9?s??9?s?c?1?c?3???1?c?1?g9?s??9?s??9?s?????cv1?c??i?s??9?s??9?s??9?s??9?s??9?s??9?s??9?1?c?/{???1?c?s?g9?s??9?o?G9?s??9?s??9?s??9?s??9?s??5;=?rT?<?'`P???p???0???@E??#$??
H??$??=?????7???y"?????7~??#???0?I*T??:F?z?ux?/H????J??[~????M??4]????@cx?"??$?OKC?B_???&r/b)\#???C?joP?3??D?1?d:??X?????PM ?T!?A?[8?????O?GP??%K?~?8??&?b?V?$d???p?O3Wcj???????[fp&?p
	?f?,X?n+??"F}?z??\U??U??????/????????z;}?s? tr??Q*??F??@dx*?U at M?s???l???.?4?)???????+g?}-jV?<???a????P:???p{?ig??iS?fN?>d?2O??7J<m<???:h-?E&1??!E?z?&$,l?x^pH>????v{u?z????v?MC)Rx?|?????m7c??5!H I?\?%
?
.@??S?f?t???e?n/??`??????km???Fs?????Vj?T???OQ
????A?hE#?'
???|]???\ez?W???s2?>?V?D	su???<?y??BJ????6??Y???c?=??B??eQ$?P"xH??^??"???<C?????I???3?m??"???r67i?d!?e????gz{{=]5????q? ??c=8??WBq6$????$??????9?}??]????ZZ	X*D$n???*??@1	?6?0U8Z?H?%?|#?Bhf???=??sj&C?8????=}?.???$???????????6????????b?
???d p!?D???????q????+6?hQ??M_>U??P0?
d?RD??H?e?0???K,?t?,(?P?X0?U&(????G?????s???}??`??V?????P?H"?NI??$?H.??Dj?????N?T????"l??a?-??Y??Fr??????+?hI??(h?
?OA
6??RBq???i9?????P????n????j??I???^5??8#y|qP????l??v0c]?cv]?q????T???r?%?C???!??za???
?w????$)XM??d'a????{??`?}?>?????? x?c&Pg????cO?l??2e9??W??O???kwi%5UES
B%4UZ2?
\??dj?Z?J%jT\?t[????4Z??TQ?!?X????*?J??go????????q`o??*?2A?c?+z{%?Ce@;?#p<<???T??h at O~?
,??G?Ep?$??G??UXSr?C%??G(?(.????%??]F7am?
?2??1Yk(?wX2?
???fFe?i?k?Ln?6?X??
?&?
P?hF??J*??Q???hhJ?
bX60?o?$?LP@?@2???45?R@?(0?KP????A???Z+e+Q??m?6)KR??D?d?M???T??Y??Y5?Y6??T??}??}]??????*???T????R?-???????J4Z?5K)?I?6???
???eK?:??`???Ku?T???=4??
?bp3???h5??jB???\w?g?l?Mx??%?????,E???5??sp??4???/>??n?Y??????
?F?k:9B$>??J??-S???Iq??o??ZKa??8?.|\S=?YIy??3?I!0???9p??w??^g????'>?4??.???V?F`5?c?^?\????77?@?]?J????f?4q1A?????R?aQ.)?i?S????p3P6$?
0?!%?e??j+!?fC"<Z%??
h??U??????8?e??
C<?fr??q???*??D&cD?b??p??????(?Lns?'7???5?m?ld??C?Y%?.
@?VT?7T_f,???_?
hN
Oa???P$;[?V?@"==
?QP??\??"s?:g?J?cl???o
7????pjw????M?Ux*??N1??n?c?W ????
???!?YP??H??x???G??l?hfCZ2=7<?aw?,????????9?k(f??)??q?????b????e????B??m?<s??;??S?
???AT=e
t.???+?GJ
??\??z|???<?F?? !F??Y?#?
>?5?;?jd??(?
 m?9?Q???fU:???@m????f?
]??!?\?A???$??&??I?G??=Z?a???"}???)8k }?O??s??q??y?;A???e??Hk??D?pN?E~?y?
????????O@??{????????	e?,?????kw????9?C?"?	????s?
Pn??????/<?4j?????^SU???????0i??Q??s??b???.^i??_??GA!	Bs%"aBf-y?Hg?????????R??!=?x???????)F???0?T$e*h??!???+??? H?I???
f%?|W?T?$???4d?5??:?????'?w???E?-n?q^?G?(??$`?*?)JT8iI?>??z? ?mN
^&?wg?????!Bj?f???<?IB
'?^???????G?;F???
??P?t?!R]DJ?%?wP?????q?	e!??EG??b)"?B}T?7E?r?.?!0N?l????k????[???qZ?(?I?i_??v????.?t?
???:?`????P?$?"??
?`????$???p????9??V]?,?J?#RD<> ^O???B? tP?J4%
~A???8'@3]WD~??7??(?t~???o??0
????"3??8?9??^

??9N\??\u????f??|!?&?\?????W???o"M???????lac??2???p>Z?}??`?mtq?
????pPM
??????r?&????%??(;(??m?b???
?????`??V?pS+?
?x?

?tf????p
?<y?H??d5?X??
o?{@??%.q???j(?????*	?H???Y+?? ???Z?OG?	'.?,
?l???????
??????V?3f!?????
<{???-{[?F????p`?"?Cak?(?[C|x??dWH?????n?j]????{e?=5-%?Vj??u at 0?HRn???*G??*?o?#?????vu0?X????uq?53+?a?s????9V???{CH?e*??J?G??^J?!?J;6r%???	????.Q2
G????e?
Wc???vwer??`2??`?O/?]q??h?Pp???]?4??#??`F?|"?@??D
dM}??S?o?II?Q???
K?w??}?????g??Bo/???3?H?(?"?$?#]3	]s?I????Y???+wF?b?Z?K?
?(??RKTS
>??	?
`
5"=?95???u,?=?!^???[???{??????J at M????(??L??{{??xAK?????I???\=T\?A<'???e??>C?????&+??<#????]Z@????M?o???dG???g,	]??W?=???'??EYT1??5g?? !GW=?A	:??????T????CB%?J?)5??r8???????f??>g??j????gC????k?vg9?q?b???oW%PW??TIC???7??i???2n?xp??Q^[?Yb???gq?i???;???;?.???F?\??B?s
]????9'[??J#? P???u7S?
am?0??y??
???c???????
??xi|?y???Q?????k'P?pae`?qG?j!??DuM????7:N??eS, ?
???g????h*??i?;;$??????'?<	?L????m?%J?U?Qd ?-8P??4?OLZ
?qV
??&??f??j?"-x\??	"?
??
z?@?"??w{??d??r???F?M??
?????????\?7>a??3x?v?:0??S????(?????? ?<6?:h#??oz???(?R?n?????- at L?3?1?r?r?^p? q??!??
C?Y6Q{?D???F?K=
~?
?^c%3??mb,??E??P6D?? ?!n(????+Yn?;?o_<r?o???o?r?<
?&??j???y???w??{?q?X?,??b4cR???"?ue??w?Y,!L?\\@?)
??lh?I???@?_?????PK??(??i??t???7G??????7??*???%?*LS&?{???>??w?J????jJ?h???m}?W??~?_?b????$P??=?Q7?
}?G??fa?f??Ne?^?R??L??^f*x?2?A?iUaP?o??l???. 9`?
?Y!f????d#&)?qu"z??	?Xg??????//-???G?(?&?#q<
???);L?@sy.?U???y?
'???B??^???
?
?
?????v?X???*?ny?,?o???>?3?????j?|??N'@?d???x?
L?
????z8"
;?`
?5?q??O^H???EP??{3?&???Q??md?C?!?k?i?/}e n????+?@??V??I9S?8?d?
?z-?????"n????0????=?M????????j?hsbI?a??F?P?$?????TS???.????e?:?w?~?|?P??FIF?MxW?!6?~H??4?(?|9L4k?px???p]5??G??s'!?????????7BD|?j????m?B?Y?????J ?R ?T???
???
-?w??CRfA
@;?BA(,$?"r?P?E?(j&??->.*d?]?????i???C???\???W??_?????????+??`??hs=?H?a??!?q9?#@aA??K!H_2%>?SK?Nz????~#??P^???uo??????a}:?R????G??I?J???????'????<?;
?5d5?
??L?M]?%?????t??x?'?	??????`?????;"A?8Qw?.??/?>(????NZ????&?
(?(???x?
0???fz?&?@u??????H??k7????_?
?u???Q$`??9?y?4????3???
?>??	??H
#? ?]
g+??cw?H'R?????>????$?1e-@????:???@6??(X??p???????L?$C$?2???????5 ?
???(?U	?C?N????$??M"D?J??4?1|?%D$|?s?8??Jk54
 ???
??I
?????H?b"od???A??N?$L?D??!
??P/6??f???F???TU?i"??
fPs
*???D??lN?92_/8?v?nzj??lm=o??^ojR,??-
BMX?:?wQ
??
?j?X??M ? 
n????>??????UC:
$??H??X}'???m
?a?q
4????????????w???x??gg??%???P??????&??]??E%?-??????????\??][?xzn??v???G]uZ?F??{?x??F???
???T? ???;?;oi?4??R	?S?TO????v?@It?!@a?U?:?????U?H?Q@?d??X???:?????.*?!aKC?E,,?Y$?,j!?!0?&??tmj?|????0TY?@B? ??
`
D?s$?
3?????/????2u??HX?`???-*????fs??P??C?
?#C??\<
?M"T??`yZ(???(^?????<9?
8????A????Q2?
?
???@I$PB?$n?I~????Q?????
?Bh?PEh??
?C?hW_???xDb??IGp???????t$G??R?I???X???t?
,?Xh??Y:????????L??DQ!( ?T
?#????"?rQI?
????j?%LC??U4?j?(?+?_????????$????K???;?<A?Vq0$B*?])@??h??m(??P??:?
"??3L?????/0
<?W?
?J??J Q?/?&??A??I@?X?#a?w?
?(?"(`;>??h;????????E??J??Z?^Mnj?????z
??j*?F??????e(3?
??Ki???!??Mm??w?x??????x
?F?: u?y??2L???%I$>??*?`UJ???%(?~r?
;(2n?T?"9?:??Q?t??????5?TDpE(?%?A>??`
?C$j?X??w??????BH.*?d)?
??MD?
[#U?&cX?(?Wn?S?h/;??y?y?]??	/SuzcskW.M?HQ???A????*??
*,??r?%?c??9????2$?@????R?I????f?2
???????Q??W
?h????X??I?Cn\??m??W*?Z?Z]?M???sI??l?&?h,j??h??r??6??h??"??6??Z?d?0??????5???m6???
???]5??65<?t??Z5?Qlj E$I	R????G?T???&?&?C?8??SN~????9UJ?uE??Yt
?1TY??Hp??v(??s?W?^???'x??$d??BI	4??s{?Qw|?T???,?A?a?????V?
??t at 3??d???e??0??+K?!?7???>?b??P?&??&???&?j	??%)D?"?? ,$?Y`?(?@ ?H?gv???LR(B\[`??Z?3?
?S?5?!?;??6?m?P?W?????????????0????[?~???m??3M?4f???x?7?g?|`]??l;?!???V^}F?????b????sO6?Z?????@O?[(*YT+'
?-j'?ek?*??????/GI!???=n??jdx??<S??d??5?????1??:|?Gb
?Y?Z?{? ?F)  ?(s??Yum??cB?4Q4,?'0?3??????????w?2)a???Si????~IT??????B?,?8???'???
??????t
?????9????Jb???Pu???
??B;?=P(~M:?!!\?X??k?f]$
?>?@????l(?q??L??????9?+???(??????9p??a4?
Q??"?????Vdj6??m?T???r???(??m?J???????}m?F?qS???)?H0|?uy ??? l?E"$
?D*Py?"??@???????,??X?@?A???S????0F??kt?
>?f
:?'?^???<??=??	??J$@?`?b1???J??\??Y???KQt?????mH??v?e6?6"$
??|$?????S#=~3???!?7???k?
$.??????????Od?K??@???????HK?.?~????Jh?P*"??\+??r??w5"x????M?;????_????iii???????X\?Y??????????S?w??*????o??V?????Z??5????3J?#??M?F??S??w?,??Ry?3??c????????z???j*z->????k?i?4??<??u]GD/&?????F??l
??	.?9??h+
2];??D?!????&k?WR[?????y?????F?b???+??_J?W?????
$??T<???>?W??????F
????)(??v;J1!
$?&?k???#d?@???SV?E??j?bSM))??k1?F???+W?\'????????v?y?????Sj?)?bK??{?]??	+{?????y	y??O?=?h/\????? }?%40?j?K?b!T
???????kSDjkV8???2G??ga???i?f????!????#???
???CM`?2??)?P???U???]JW????j?R?8i+?????	0???X?b?{.????V????Q??*{?&???Yl?!n???l?m1?$???3?wB????#dY#$??FB"?r
??J>??I?D^]???????L?!?$?:?
"???
?B?XU+q}n??C?O?.????????????1??!??=?	o?V~??6?e2?:?[;????JFf??F??6X?SD?????u??(
KQ7????~????!?????50V????????????@H??'1?????<?3?G???N05HkC??`O?j*D%B?2:?q~c?u???{??3??l?Y+??(?????I??00???o???/???\?&???0#???b??????Gc????REDk7??B?????e??P??
?]?T??*??????{?u?qDY???u????????`???_q?\??f??Q?>a?Y???c??E?a??#43G?-?$j?r?p@?????'w???$H???d
?}$?g	b?Qi_?????LB??z?fC??P???[I?6?]3?h??TI1???o?
8??3??a	?V??????j??T??1y????t???2??<??d#?[??$?[d??????%?Y?+0?l???a?XPK??|!??}r?mw??
O?v?(???TV?XI?%??D??4?66??_????????>4??A???????!???bb??B????????9????"?E?" L??R.??8
EE?
)}-{1? ??4?H??????????Q?-?Jj4???P?B
?jbIR !:UBB???SbPL???D?jP?3\?YXR?.??^ ?X??@??
?0F*?L-?n??j]?k?????X%(??n`?X?L?q?S`???`?'9???`_D<?j;??????^?_??+?h??e?[??#?}I???D7??????qlv??EJ?""?c) EG?5?Y[?7????e???????u:?d1?D??????1g???.?v}???3??hw`???????oh??]7??m???w?#?-?o???t??>M????]\)X??H??
?#"z?V???aJ`+)???j?yPC2 ?t?6???d!;????????TBU+P??A??k?|??J?? ????;&Q
?@?@d("?DIi???$n??s8?	???"H?C????G8:f?U{?m????????????????6<u???O?D8??=E$H??d $?
? ?????%|??Y???T	?&6!p??\?0?\!a??????vB+d?K&??j?????A??;Dw\Z???s?L?D??????@#?????|???Q????XD?5??!? ?D</E?????p|??	?+X?8a;?!?Q???C??3<??? D;?Q?UH??O?G?h{?????Q]??`s?<??S?MW??LT3"	?'?(??p]???\?$#??}!??#???t???W?$A??j?Uhj?7???c?>?????????A?b?????q????d?(??4Jjde?>?[?h?? ?????g?|???????j?~d? Y?????J
Ob'?%nU@??Q?@s??xf??????h?"t
 ??BB

&n`D_??T?
????[sn???????I%??$	x?',???xe???L'???S????	?1E5A$*R???Vh?8?'???? D&I?@??i??4??)s3zVm???P??C???Aq??'?=???????
??S[??B-???t?EFQ.??ZJh??A:?<??u9N[??.?4?i?!p?D QL?
&o?"r?d"?c?BU?7???? ????h{??=???s?t;4(?VV]6c???O)d????k?2u\??M%k]???E??g?
4??????vJ?	??@z??C=???t5??jp<7???=?w??&
?P?,????qPB????s#???D1??_?????b??????????3]??T???LYei???9*?????&?????
??I&?B?0????=?(?.KN#????@????????l??????K?6?)???V????
??3 {?"{?(???Ub?C?,{x???x??>??j#???wgn????????r?TZ??N?g=P????L? o8??.??
?s
^3????DO?ph??#t?????$-?&?u
Qd????!hB0?{?d~X??U???
?Y?8?,l1MD???6QT?L?U^??????d8???	?z!.?5
(?>9??U??f?+&?[?2Y
1?%;?F}{??z?n???.I-.??0?????TsX8!?N?U??????b???(?p??i??@p?!?JJ??ETB???????yI???}J??y=?P?]P??*??SL?	??(???+??my??VL??&?j$???kjc?D??Rd=.`A??J7z?t??r??W??????
7?/2J?h????<x<??Z?mx????v??k?ir??G?k2z.g*8?3&Q??
c??Qq?Y^U??FI
3(*?.X?C?4?bp??$??f????????3????
Q?????????`????M??t??(???F0???!
!?????8?q??9:?8
?	???N5v^??C?s;o?.??!V?UFX?
B??j????,?!A???(?C?]??????+???`?{w??#??ict^S????~?D"?y?o?@????//?U:????a???}??????k?#;?????w??T?-???g????Z?U?gr$WQ?HK+)?1&?K?T3U"\???????b?!X???!?JrB??I?@???Q?,3j?$?\???3?&,?aD???? C0U???R?V??H&?*!@?????2?Gf&I?..
????7?j??>?$??]????9?d
?0K??X?L]`bTc?Q$@?6f?s|%????}???n????y(I*`?b&&?P?#(?????X???,????/2?J?T*$?b+pnA?r
??qd`????????DH@?({4;)??T??U??M)?^l:z?R???/h?+061X?>??G?2???/y??i?
?Q*?4[?5??d??1?t?a?6(??C?uqva???l?|???_G?;?s?1???
4Q??*????`D.?0E?LA?
??2T?????-??????^6???n]=?zk?S-^?s%?k??????P?E??2?4(???b
?
?C!?@?+2??b
p?\t?0???`???+s?????????w?;W????$??;???
^?)???
?]?\?`?(!??2]g`	r????BA?(%?!j	#r???6?]5
$t	???@1?6B?#??d???_??w7??????????
?????????????}????????????O????/?????O?/???????????????????_?O??????????????????????????~O?/??????o???????D_?u?L@?t??H?0?!??????????T??[b?F?U?gu????????[????M??U??????+?]r?i.r_?%m??Kx????l0?^???z????.?sr?x????.M?!BE?nUd?dC$)D??x???C%?-?Zr??&d?6)$???a??%D`?P-????AX"???i?R??_?!??w??&H?????,E?hC
?S??????k??,X%??????0??	s!??????????G_???NjdM???WPq?
???r?0?#???????i?0C"? ?#?JP?z;Lh/??$B?????9????????????T??H?x?H?]+??
??{?????8?7???CF!??M??U0t?4??2E??;t????p????gA?K??Ch%??	??.&?h8Li~??&u?X??
X*??P?B<??l???D??N*?3?
9?B?
?<????????d???H?\?
I")M?????X???`??@?F?RA?????e?ob??~???|?T??/h???
?2
?s???R,<??????"?D???U???V?m?v?-V?
? 
7t?p???G?l'Da???-?%wn??$??n?'o6?????D?
&-?!_O???_6???5slX????C
??Z???*K???e???s;???T?$?zh????????H???OQAQ?
?	?3 ? ??D\4r!?-2y????A??@??	?????Q-???y<?Q/???W2?_??[Rm?"[??B??A?n?q??@??q???*?E?}???P?DI
?m KZ??@H?"O?x?~?%{'??Yd??hh??X???!??
rE
C???]????\?3??
#,?&`x?P??;???m?/k?g
?????
'[
?R?C@?S?A<&???7Lce?H?9?0i??8?53+?4b
??$?BJGf?y"???]???=<??iK?=?t?H?]??wC?Tp?
?VQi>d???>8??P?	???*? ,??k??s???FT
&??c???>C?$??r?*#?A?l?	??!B@???? #?=38O-??d?
?z??@224??K??)??S???T=?G?Xnj??R@?X?5U?????!?H
Tj??d?? |p????0??j<K??P???f"
?"!?A#P?l?????@y?h!Zh???B i?:??Uj?Q???`?????e??Rc,??(?.p??*%b?????$?R!?SDH????5?B?H??\
??UU???QR?{T?pO????s??B
???
???????=?
?SL??,+?d?%CA2??QRg
5Ca??E?&??@3???F

??????:?*??S?5?	??????Q?*????"p'???n?????	?L?? zZXJ?h??q?????P??v?yeD??????}T?sfx6?????
??&;%
q?M?mr9{N??d?W0?yN?<?4?P?Rb???HP?A3t
UB?P!?*@1?(???????FAC?A??$E??Z ?????0	"*??9?
???????@?J??!$"?)?> ?????H}a???O!?????Q????%??`?? RDL)??i?Oe??
???,?????i?????T?
?5
??U??"?I(P?I????A??????a%??GB??
h?
%*8;i)?f":??!j?Mm_MZ??&?R7?Y*?B??,1?zd=dn???6?D?$		?
	#j??we??<??????*???78?W?Y?dH<???n????@W????y?zd]????B(??"????C?????N%O?9'?????,??|>???!"x%O?@?'???">4?I78}Si??*	?????;p????????????????3?J????X?	
?B??j??
?G?T?<u]???U?
?N?????P>m?G???T??????V&??f?YE1M???H???J?j????"c??????d????)f#??%c?-?I,?v3M?V(?I	?u?-?|G??Q!!?^????U5???txb!??8????N??????
??Gu(?y????Q?F?Q???_?C?q?5?dt'??/`>PW???"F?$?????6?v????T?}?3???????M???nqD??>?m???!!???w<????g?MFE?%R?Y?y???AI??/??2??cHI???[?pDL???~m?][,??? ??Ao{C??<??$Y?(?T?o??????5??????\?,V? ??V
z??m?Al?h?g??~Z??v???	&?l?*??0?	??.8?1???M??f??]mr?"NZzGIf??.?|ZGs
n?PQ65CP???I?!z?u??U?vM?{-^&??
J??R???&L?D??bj??B?IPn T?+?c????
????K????????5J#eMJ?*???57?5Z?e%)Se{?5???V?
??x?bg?u??7????,?u????J?????????AF???~?????JBX??????e????oS??Ja????_]o/????0?i? ??)>)??FD????:g	???pP.)H)!?@????NQ	5???
0?"???
?/????????ssn????J?z??h(??
"???E {?KSar?&J????(V]?MK-??????$???Y09%]%?%?AP?? ?!?????"?d?????b??rL?1?FWu?????8?v8h?s?E??%?$eI.[?K3?#f?F???Zv7k2R0??8???????S?Ny?oH_~&^??????%??4??? @?X?????F
??4 ]?PTAh)?!MT#l??@????V!??^0???nG?
?N?!
?? ??? B?L,?S??.I?C3?>R?(?p?q11??9??rq??I,l?D"??KB"???!?d?????????7?zh?????Q?"???U????h$UA?:&OH?~?h?Dzz??????????*??E????
??B1??Q?/x?nL?$
b?-(??M?6?c?|????????e
????
?#???!?!@P??R?
???Sh??"?V??????A?h#????HD??v6???QF??I??U??W Y0DR????~?P?AL>?'BzMU{b??????~h	????OH?????2
??k?????}w??)?U??ci6?a??qF`??P?D?)??V??2(?tPg!?0*UQO\?}oW%<??Z.W?y?????GxKH]"O?#?	uF?,z}??/D???<OyD?? 
0I\?D??N?<`?v?? ????cw6?.?P!B??????????9?Qy???????]?6h\????,?C
+??K??I HI%]?v8
V??????P?
??p{y????????f8$?C?%???_t?]??????!?z??Ye??????Z{$l????????*?e?>??"?C?D??'?ZiI???? ?
b??????#??>???Cq2
g?"?E>1{??H????@?pp#N{&??\?f[V?x??ehG5?c*??7??i?????y{?mE?.? ??`
P{=??V???IT?R7D?PB
$oC???M5?S)?????w?]?g??l??GA?6w}w2L??<pDU?h-??0I?/$????v$?O??y[???????????O{?C?uO'y7?8x?F????c?n?o%EmvG??????*#V
????d?@?? 7D
????)??=??X???Xy-rASQ/???????M??RE?}[l??[??`H??	W?8?:?????!12
8?B?`
[6?x??h~X??????e??\??????d?$<??@?f<??N<?q?W?pTMj??$U&????Y?????Vm???;Czp7?.???Pn????"????
 ??L??????????r	??9Q]??@?w ?"?g?5Q?i?b?????????!bvJ?*I?N????????HM????I?[f??/i?fe\0??@???%
?zzI????????????{??E'YZ?w?????[P6I???.z?<g?v?s?1?=2{W`?@???????o
]~T???[???O?p?'?`?Z2;L??x??l??%??/$?H?K!???I_?;?B
&;?@???@??<?????~?
??L?{??,?	-?
?Y?5??.??z????y?y?4C???^???n?2$Q?N??O?????QE??H??? (????BH?o?P?`A?????U3?<_?x?????O C???H????(?
?????AF???!3?D?t??JD?!f???l"?+?t??h?Fh??u??qG\hh?GV?ap?*??1?qx????3???)b?#???????*?4 ?4?&?2??????!
???3????????r?Bw!??o
?w???0?????x@?y
??
?Q??]?5G???Cs*??H?$??aG?<?W{N???)?/????9????????a58\??|?&
(?(???fV???ji{?>ZR=???@?C?0??B0?8??? ???#??z`i??
??$I ????.:
?!,`k^??P??????????	<er?nO?
P2?*?k???tP$Ah??'IQM#!GH?-???v?]c"?????*H?+??`]QD+??tPs
)???!J???v?????kkz????/;?? ?D?A
*>{??????}(<Q=Y????????s?[	
?$4???5?g??u??U{x??$???(????d?3(?C????5 ???u????e?D?w@?5k??\Ut>????o??
?yl?@t@;??B?_?? ?k??$ B$d$?????&o/
"?/q???p[?%Bk?W?Yb????>????_?????V?[v?Ut??-???[Qj??oW?,?U?'n??P??H???L???????R?f	?D9t?1?><?;c?J?BEz ????????|?0v?;???ePH??0??'?R??gA?*?v??$$
J?K,?m?i'E???IJ???5?\?&Ip?D?*??4,?1)
???(]p??:	???????M?i;`???
?*u~??1T?=?T????>??`?????'??<??(?????*.*??}??P?????O?D????	"
?a,???!"?3B?????
G????l????=
N??S?!???A
!Nhn????I????J??C??Z?S5?????
???2?6?G?-?e(~??i?3?? u:??
3'?	??????{?????8???????Qu????
?+M???]??>d?N,l4????fz???????0?x?v[??-X???)???8????? ?Wqd??,??K??i???/???V??p??e?v?L2	1????ecBfV????.??65TQ??pP?bB??2]???i?? ?C;?TX?????!?Z-TR
?qw?\?Z?&?
?DZ ?
U???j??%%??E?D!??{^??????$P?0???.???$?? `@??JZ@????,#??c?s?&D?
??B?N ?&??{A????C????
A?????#r?#P/6Y?!???????K?K???<9?!??l?]T
.??g??m?7e???\<?????
?7??=?;q???FE??O???|?xH?xk{?y
0'??a#:??x?-V6??<?"3??C?U????E?0?u?n???y??????????0????A ??<x??(D?g???an?:r???????.l?a-?)???mjw?
?k?????h?pq???G\?:c??C8D???>?tH=???(C??H?2??;D????l}a?"????Q???J??&???Gn???d??n?????US?i??{=????(e????g?}'???\}??KCX[?50=?????<?p/{?b at y
?I?P???]??p?n?c&?U+JQ???a(i??RRT?dCbEm??R?H& +?? n???t?????bD????????vUw????h.>?@5?Y?Yw?????s??u?
???]??;??????????,8?c??H??NU??'-(?I at f
?nb?e??q????^@v?:,a?{"\p
#S?;???;????OQ$?????m?k????$
?m[$?T??T5?????:??&>,??y1????U2RUq ???)T2?Q?(]??\?k??t??d???,I??'?3??Zm(?H???Uf 1??;h???7?;??L+: 0??d##;B??
H???:?
\???
j
X????2)$?
?,&?d????P?Y???x???o!????0eT??9??:?2rr?? ?9??Wx?D?+??EW?G?c'}??!?VGD"`????5I?5?)?{?UU?9&h
fW?a-?}??l??????@??d??hBBJ@??y[,a?lHB???B4???y?-??7	,]??C0aqR???Cd???q?z????(???????????"?????W?)???P? 
??????F&?RSP?Fx:BHH?awi"'??D?????z-???>??<0?XY?E???1?Zw\t?.?2^LMk&??u]2!]?^b???Gl???PC>t0;?$wv??EYz??U?g???7???Z_[?[?o??G???????1??$?H?
|????!??$??2?????e???????????TURc?
?lq?;???r??(?[?K
?8?Wk???R&??[???
$?`?????@??^??T?u??????:??B???F????`?\???H??P>????[?t
k+*
P?iB\TLbe!??paK?GzQa??=?
?$
b
0?????
??B ??"&??^:m????j?j????**??O???s.????b?aED*4@??[??F at E????????{?]??c????f??*?0j????`????????lq?L 
??R?8?C? C)
F{??????zWe?????K?\????k??\?I?????????????w9\??j????K???n&e??$%E? ]???.?|E]L]??XfM4??D??K^????
~EV??)$?O??????pG?P$N??pK0???N2?_??2{???3F???;:??r??I-?K???U?????%
????o????????????n[?Z?K#)?X??*}??_??_??k??Y1X???? ?????;???Y?DZ1~????oh??^??=^?0?$8?D"?PB5	?S2$???$??A?e
?z?!n??o?+????AO:?z3A:?P?
"???u?@??9y???;?0???'D????x
)dH???k|?{^?8;?|???5~??o$K=!u?X?2????!8??p???E'$K???IG?#/&??f??Z??$?l??_{??e8q?v?H
W)?h?d???mYLM?P2A????i??9?|?????v??sV?n?y?y\?WRJd??R???@?8Y	AR?"8???D)?? j????4?(
Dl
?$??????uG?(`rnD???vn??`S1_! H????{F?>?S?T|saa??9?!???????zx??w?-??!??%,H?PH*????VI????A???+C~?????<D9?yd?U
?1?<??2A???b?:???EVF??????o????U[??.???M?L?TZ?????E??NQ?)??D????
m(??$ h9??????
K_?|??Q`e???Bk)?VMKI?$????N%"?C???z?a???R??@	p??4Oa??;??V
??
?{???'?$??r@??(????? R????~???[??i:DM??(?i??????t?mu?y?W?i.
Gm&??2Bb????&??5?U?~wmzh?b0
?H??&?`A??+??]P????]
=?????#???&c????
e%($ 	?????????-?>??7??w?C???	?H??
T!#%??}????w?U???????vd?d???XC?o0LA???c?)!????????#"??'?;,??id e$????Xl??????a?<'???Y??D????~W
????????s??9??%I???F!??!?4??N??????t	?1?????????}5?>????????~??w?????w:??i?NV?+.?????f?ZY"?2?l?/??]????h<H??^P4B:?=V	8??dS???e??{?#$?T?%Ws?9
aj?X?,b
C??H?y??b?v??*??qx?G+?0b????Q.?Zn????C?
?2Jaae o?lu?????hZYia.M?C.??/n?+?H?Z??us?`????#P?G?????????*J??+D???????RPB2.?d?`??IR?@?D???b?3??	?X
?? ALW??C?n-?wd?mY?J???'?s
??F?*?dN???*????
?&q?5.2T?R?p5?C? ?F??2j?o?6l2??[??-???????vb???IUUT?p??q>?
?Sw?MB
uT?* ??L??8C?>?!??Q
??z`???z??? ?'z4???Tq?F??
n?N?'><g at H???C?E:?????;?=?(T9????U=?^??NEj}?bb?$F?d1??`0W;? <??4$2?(??9??Ov?;0?="??=???r????????W+???v??j??-?j?M$h????B?k3BbVT?	;]?5?
9??????]]?????k??Mmu????????]3??s$o;?????:?B5?Q?@???-*?????F?V]??+?Q8????M*???m????J N3!?z???3@~???;????
`??z???????,o???4?@?qY???? ??.;?Y?^t?r??(
?8?L8????#?,????????#?GX$?V?T?w|hV?
?(.HhfPk
??dh9?r?:?
?:R?.?
,????hp5?)F[p??d	??Q?rB?T$??YWr
(?&0BF??0?4????)?MQ:??"@?(??????
E?)"??zpUPZ?'F?#?P? ?b??????
?'`???D???}??.?B????,??;?AVm?&9??
??f?????y?:??????s?4??3x
??\
?q ?S4-??A/??
?P!?
F???????S?I|?q?H?a"
?H?p]?u?b??B???k???d????<?<vU?V1t??
?4?#.?{z????1????????^&J?zu??8?
??(??LD?
?????SM??V?gH??t??%???*]f???!?F??}?
??uS???\?????d??#??lK???#R;C$???
?(s?d?D??????mu?????P&(
0ce??{?;?VP??zh??z?~[8??h62???????|?n??$%!O?!??v[?????$?/???=????,?Z?'?c?K6d?7??LB8???9?r?o
aqruB??m?\<??`??\s?$<?
1?ukNy??l?39??`?k?a?U?Y?????AFK$???/????J8@??7TiaR?b??iQU?J????D]??r???mi?b???i????3?{????[7o?
???oA?TO? ?H
?????0???.?!??q??`?Xk????jV-?KE?T???
*{?????<?????
???f???D????????a???4??QG??]??B@?22?



From emaldonado at fedoraproject.org  Wed Aug 19 23:50:25 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:50:25 +0000 (UTC)
Subject: rpms/nss-softokn/devel sources,1.1,1.2
Message-ID: <20090819235025.4A6D611C0417@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6942

Modified Files:
	sources 
Log Message:
Initial checkin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:18:58 -0000	1.1
+++ sources	19 Aug 2009 23:50:25 -0000	1.2
@@ -0,0 +1 @@
+8ce48b882e74d1be03aced9d455b834f  nss-softokn-3.12.3.99.3-stripped.tar.bz2



From emaldonado at fedoraproject.org  Wed Aug 19 23:52:31 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 19 Aug 2009 23:52:31 +0000 (UTC)
Subject: rpms/nss-softokn/devel .cvsignore,1.1,1.2
Message-ID: <20090819235231.6402711C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8074

Modified Files:
	.cvsignore 
Log Message:
Initial checkin


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:18:58 -0000	1.1
+++ .cvsignore	19 Aug 2009 23:52:31 -0000	1.2
@@ -0,0 +1 @@
+nss-softokn-3.12.3.99.3-stripped.tar.bz2



From itamarjp at fedoraproject.org  Wed Aug 19 23:22:29 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed, 19 Aug 2009 23:22:29 +0000 (UTC)
Subject: rpms/dahdi-tools/F-11 dahdi-tools-modprobe_warn.diff, NONE,
	1.1 dahdi-tools.spec, 1.6, 1.7 import.log, 1.1, 1.2
Message-ID: <20090819232229.3E74311C00E4@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/dahdi-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31245/F-11

Modified Files:
	dahdi-tools.spec import.log 
Added Files:
	dahdi-tools-modprobe_warn.diff 
Log Message:
fix 495453 


dahdi-tools-modprobe_warn.diff:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dahdi-tools-modprobe_warn.diff ---
diff -ruNp a/dahdi-tools-2.1.0.2/Makefile b/dahdi-tools-2.1.0.2/Makefile
--- a/dahdi-tools-2.1.0.2/Makefile	2008-12-15 18:19:07.000000000 -0200
+++ b/dahdi-tools-2.1.0.2/Makefile	2009-08-19 19:37:35.489155883 -0300
@@ -69,8 +69,8 @@ endif
 
 RCCONF_FILE	= /etc/dahdi/init.conf
 MODULES_FILE	= /etc/dahdi/modules
-MODPROBE_FILE	= /etc/modprobe.d/dahdi
-BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist
+MODPROBE_FILE	= /etc/modprobe.d/dahdi.conf
+BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist.conf
 
 NETSCR_DIR	:= $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts ))
 ifneq (,$(NETSCR_DIR))


Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/F-11/dahdi-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dahdi-tools.spec	24 Feb 2009 10:42:09 -0000	1.6
+++ dahdi-tools.spec	19 Aug 2009 23:22:28 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           dahdi-tools
 Version:        %{tools_version}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Userspace tools to configure the DAHDI kernel modules
 
 Group:          System Environment/Libraries
@@ -28,6 +28,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+#patch from https://issues.asterisk.org/view.php?id=15454
+Patch0: dahdi-tools-modprobe_warn.diff
+
 %description
 DAHDI stands for Digium Asterisk Hardware Device Interface. This
 package contains the userspace tools to configure the DAHDI kernel
@@ -55,6 +58,7 @@ developing applications that use DAHDI h
 %setup0 -q -n dahdi-tools-%{tools_version} -a 1
 ln -s dahdi-linux-%{linux_version}/include include
 %{__perl} -pi -e 's/chkconfig:\s([0-9]+)\s([0-9]+)\s([0-9]+)/chkconfig: - \2 \3/' dahdi.init
+%patch0 -p2
 
 %build
 
@@ -109,8 +113,8 @@ fi
 %config(noreplace) %{_sysconfdir}/dahdi/system.conf
 %{_sysconfdir}/hotplug/usb/xpp_fxloader
 %config(noreplace) %{_sysconfdir}/hotplug/usb/xpp_fxloader.usermap
-%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi
-%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist
+%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.conf
+%config(noreplace) %{_sysconfdir}/modprobe.d/dahdi.blacklist.conf
 %{_initrddir}/dahdi
 %{_sbindir}/dahdi_cfg
 %{_sbindir}/dahdi_genconf
@@ -157,6 +161,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.1.0.2-6
+- fix bz 495453 (/etc/modprobe.d/dahdi.blacklist and /etc/modprobe.d/dahdi doesn't end with.conf)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Oct 2008 12:31:18 -0000	1.1
+++ import.log	19 Aug 2009 23:22:28 -0000	1.2
@@ -1 +1,2 @@
 dahdi-tools-2_0_0-1_fc9:HEAD:dahdi-tools-2.0.0-1.fc9.src.rpm:1223641844
+dahdi-tools-2_1_0_2-6_fc12:F-11:dahdi-tools-2.1.0.2-6.fc12.src.rpm:1250723687



From dwalsh at fedoraproject.org  Thu Aug 20 00:02:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 20 Aug 2009 00:02:38 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.54,
	1.55 selinux-policy.spec, 1.898, 1.899
Message-ID: <20090820000238.2039511C00E4@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9938

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-2
- Allow libvirt to change user componant of virt_domain


policy-F12.patch:
 Changelog                                          |    3 
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    1 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    5 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   22 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   89 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  279 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  395 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   19 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  143 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 policy/modules/services/dbus.if                    |   26 
 policy/modules/services/dbus.te                    |   27 
 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               |   49 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpsd.fc                    |    5 
 policy/modules/services/gpsd.if                    |   27 
 policy/modules/services/gpsd.te                    |   12 
 policy/modules/services/hal.fc                     |    1 
 policy/modules/services/hal.if                     |   18 
 policy/modules/services/hal.te                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   46 
 policy/modules/services/policykit.te               |   52 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  138 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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                   |   39 
 policy/modules/services/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   34 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   66 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   66 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  254 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   96 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 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                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 -------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1304 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  139 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 324 files changed, 14003 insertions(+), 2981 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- policy-F12.patch	18 Aug 2009 22:43:34 -0000	1.54
+++ policy-F12.patch	20 Aug 2009 00:02:37 -0000	1.55
@@ -1,3 +1,13 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.6.28/Changelog
+--- nsaserefpolicy/Changelog	2009-08-18 18:39:50.000000000 -0400
++++ serefpolicy-3.6.28/Changelog	2009-08-18 13:23:29.000000000 -0400
+@@ -1,6 +1,3 @@
+-- Misc Gentoo fixes from Corentin Labbe.
+-- Debian policykit fixes from Martin Orr.
+-- Fix unconfined_r use of unconfined_java_t.
+ - Add missing x_device rules for XI2 functions, from Eamon Walsh.
+ - Add missing rules to make unconfined_cronjob_t a valid cron job domain.
+ - Add btrfs and ext4 to labeling targets.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.28/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.28/config/appconfig-mcs/default_contexts	2009-08-18 13:23:29.000000000 -0400
@@ -632,6 +642,21 @@ diff -b -B --ignore-all-space --exclude-
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.28/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/admin/portage.te	2009-08-18 13:23:29.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(portage, 1.8.1)
++policy_module(portage, 1.8.0)
+ 
+ ########################################
+ #
+@@ -119,7 +119,6 @@
+ # - setfscreate for merging to live fs
+ # - setexec to run portage fetch
+ allow portage_t self:process { setfscreate setexec };
+-allow portage_t self:capability sys_nice;
+ 
+ allow portage_t portage_log_t:file manage_file_perms;
+ logging_log_filetrans(portage_t, portage_log_t, file)
 @@ -196,7 +195,7 @@
  # - for rsync and distfile fetching
  #
@@ -3482,8 +3507,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.6.28/policy/modules/apps/ptchown.te
 --- nsaserefpolicy/policy/modules/apps/ptchown.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/apps/ptchown.te	2009-08-18 13:23:29.000000000 -0400
-@@ -0,0 +1,38 @@
++++ serefpolicy-3.6.28/policy/modules/apps/ptchown.te	2009-08-19 17:37:18.000000000 -0400
+@@ -0,0 +1,39 @@
 +policy_module(ptchown,1.0.0)
 +
 +########################################
@@ -3503,7 +3528,7 @@ diff -b -B --ignore-all-space --exclude-
 +# ptchown local policy
 +#
 +
-+allow ptchown_t self:capability { fowner chown setuid };
++allow ptchown_t self:capability { chown fowner fsetid setuid };
 +allow ptchown_t self:process { getcap setcap };
 +
 +# Init script handling
@@ -3517,9 +3542,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +fs_rw_anon_inodefs_files(ptchown_t)
 +
-+term_use_generic_ptys(ptchown_t)
 +term_setattr_generic_ptys(ptchown_t)
 +term_setattr_all_user_ptys(ptchown_t)
++term_use_generic_ptys(ptchown_t)
++term_use_ptmx(ptchown_t)
 +
 +miscfiles_read_localization(ptchown_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te
@@ -5137,7 +5163,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.28/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/domain.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/domain.if	2009-08-19 16:58:54.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -10709,6 +10735,25 @@ diff -b -B --ignore-all-space --exclude-
  	manage_files_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
 +	files_tmp_filetrans(httpd_cvs_script_t, cvs_tmp_t, { file dir })
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.6.28/policy/modules/services/dbus.fc
+--- nsaserefpolicy/policy/modules/services/dbus.fc	2009-08-18 18:39:50.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/dbus.fc	2009-08-18 11:41:45.000000000 -0400
+@@ -1,13 +1,12 @@
+ /etc/dbus-1(/.*)?		gen_context(system_u:object_r:dbusd_etc_t,s0)
+ 
++# Sorting does not work correctly if I combine these next two roles
++/usr/bin/dbus-daemon(-1)? --	gen_context(system_u:object_r:dbusd_exec_t,s0)
+ /bin/dbus-daemon 	--	gen_context(system_u:object_r:dbusd_exec_t,s0)
+ 
+ /lib/dbus-1/dbus-daemon-launch-helper -- gen_context(system_u:object_r:dbusd_exec_t,s0)
+ /lib64/dbus-1/dbus-daemon-launch-helper -- gen_context(system_u:object_r:dbusd_exec_t,s0)
+ 
+-/usr/bin/dbus-daemon(-1)? --	gen_context(system_u:object_r:dbusd_exec_t,s0)
+-/usr/libexec/dbus-daemon-launch-helper -- gen_context(system_u:object_r:dbusd_exec_t,s0)
+-
+ /var/lib/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_lib_t,s0)
+ 
+ /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.28/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/dbus.if	2009-08-18 13:23:29.000000000 -0400
@@ -10806,6 +10851,13 @@ diff -b -B --ignore-all-space --exclude-
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.28/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/dbus.te	2009-08-18 13:23:29.000000000 -0400
+@@ -1,5 +1,5 @@
+ 
+-policy_module(dbus, 1.11.1)
++policy_module(dbus, 1.11.0)
+ 
+ gen_require(`
+ 	class dbus all_dbus_perms;
 @@ -86,6 +86,7 @@
  dev_read_sysfs(system_dbusd_t)
  
@@ -13443,7 +13495,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.28/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/openvpn.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/openvpn.te	2009-08-19 17:17:15.000000000 -0400
 @@ -86,6 +86,7 @@
  corenet_udp_bind_openvpn_port(openvpn_t)
  corenet_tcp_connect_openvpn_port(openvpn_t)
@@ -13452,7 +13504,16 @@ diff -b -B --ignore-all-space --exclude-
  corenet_rw_tun_tap_dev(openvpn_t)
  corenet_sendrecv_openvpn_server_packets(openvpn_t)
  corenet_sendrecv_openvpn_client_packets(openvpn_t)
-@@ -114,6 +115,16 @@
+@@ -98,6 +99,8 @@
+ files_read_etc_files(openvpn_t)
+ files_read_etc_runtime_files(openvpn_t)
+ 
++auth_use_pam(openvpn_t)
++
+ logging_send_syslog_msg(openvpn_t)
+ 
+ miscfiles_read_localization(openvpn_t)
+@@ -114,6 +117,16 @@
  	userdom_read_user_home_content_files(openvpn_t)
  ')
  
@@ -13598,6 +13659,14 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 policykit_t:dbus send_msg;
  	allow policykit_t $1:dbus send_msg;
  ')
+@@ -41,7 +43,6 @@
+ 
+ ########################################
+ ## <summary>
+-##	Execute a policy_auth in the policy_auth domain, and
+ ##	allow the specified role the policy_auth domain,
+ ## </summary>
+ ## <param name="domain">
 @@ -206,4 +207,47 @@
  
  	files_search_var_lib($1)
@@ -15590,7 +15659,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.6.28/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/sasl.te	2009-08-18 13:25:10.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/sasl.te	2009-08-19 17:16:45.000000000 -0400
 @@ -31,7 +31,7 @@
  # Local policy
  #
@@ -17610,7 +17679,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.28/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/virt.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/virt.if	2009-08-19 17:01:25.000000000 -0400
 @@ -103,7 +103,7 @@
  
  ########################################
@@ -17708,7 +17777,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an virt environment
  ## </summary>
-@@ -327,3 +364,77 @@
+@@ -327,3 +364,79 @@
  
  	virt_manage_log($1)
  ')
@@ -17734,6 +17803,8 @@ diff -b -B --ignore-all-space --exclude-
 +	domain_type($1_t)
 +	role system_r types $1_t;
 +
++	domain_user_exemption_target($1_t)
++
 +	type $1_tmp_t;
 +	files_tmp_file($1_tmp_t)
 +
@@ -17788,7 +17859,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.28/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/virt.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/virt.te	2009-08-19 17:26:56.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -17897,7 +17968,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -96,30 +152,51 @@
+@@ -96,30 +152,52 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -17934,6 +18005,7 @@ diff -b -B --ignore-all-space --exclude-
 +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)
@@ -17952,7 +18024,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -129,7 +206,14 @@
+@@ -129,7 +207,14 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -17967,7 +18039,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -167,22 +251,35 @@
+@@ -167,22 +252,35 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -18008,7 +18080,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -195,8 +292,159 @@
+@@ -195,8 +293,159 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -21221,7 +21293,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.28/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/ipsec.te	2009-08-18 13:42:27.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/ipsec.te	2009-08-19 20:01:37.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -21246,7 +21318,17 @@ diff -b -B --ignore-all-space --exclude-
  # type for file(s) containing ipsec keys - RSA or preshared
  type ipsec_key_file_t;
  files_type(ipsec_key_file_t)
-@@ -53,21 +63,23 @@
+@@ -43,6 +53,9 @@
+ init_daemon_domain(racoon_t, racoon_exec_t)
+ role system_r types racoon_t;
+ 
++type racoon_tmp_t;
++files_tmp_file(racoon_tmp_t)
++
+ type setkey_t;
+ type setkey_exec_t;
+ init_system_domain(setkey_t, setkey_exec_t)
+@@ -53,21 +66,23 @@
  # ipsec Local policy
  #
  
@@ -21273,7 +21355,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)
-@@ -76,7 +88,7 @@
+@@ -76,13 +91,13 @@
  
  can_exec(ipsec_t, ipsec_mgmt_exec_t)
  
@@ -21282,7 +21364,14 @@ diff -b -B --ignore-all-space --exclude-
  # a shell script, we need to find a way to make things work without
  # letting all sorts of stuff possibly be run...
  # so try flipping back into the ipsec_mgmt_t domain
-@@ -95,9 +107,6 @@
+ corecmd_shell_domtrans(ipsec_t, ipsec_mgmt_t)
+ allow ipsec_mgmt_t ipsec_t:fd use;
+-allow ipsec_mgmt_t ipsec_t:fifo_file rw_file_perms;
++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)
+@@ -95,9 +110,6 @@
  kernel_getattr_core_if(ipsec_t)
  kernel_getattr_message_if(ipsec_t)
  
@@ -21292,7 +21381,20 @@ diff -b -B --ignore-all-space --exclude-
  # Pluto needs network access
  corenet_all_recvfrom_unlabeled(ipsec_t)
  corenet_tcp_sendrecv_all_if(ipsec_t)
-@@ -118,21 +127,26 @@
+@@ -107,10 +119,11 @@
+ corenet_tcp_sendrecv_all_ports(ipsec_t)
+ corenet_tcp_bind_all_nodes(ipsec_t)
+ corenet_udp_bind_all_nodes(ipsec_t)
++corenet_udp_bind_isakmp_port(ipsec_t)
+ corenet_tcp_bind_reserved_port(ipsec_t)
+ corenet_tcp_bind_isakmp_port(ipsec_t)
+-corenet_udp_bind_isakmp_port(ipsec_t)
+ corenet_udp_bind_ipsecnat_port(ipsec_t)
++
+ corenet_sendrecv_generic_server_packets(ipsec_t)
+ corenet_sendrecv_isakmp_server_packets(ipsec_t)
+ 
+@@ -118,21 +131,26 @@
  dev_read_rand(ipsec_t)
  dev_read_urand(ipsec_t)
  
@@ -21324,7 +21426,7 @@ diff -b -B --ignore-all-space --exclude-
  logging_send_syslog_msg(ipsec_t)
  
  miscfiles_read_localization(ipsec_t)
-@@ -154,12 +168,12 @@
+@@ -154,12 +172,12 @@
  #
  
  allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
@@ -21339,7 +21441,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)
-@@ -209,15 +223,21 @@
+@@ -209,15 +227,21 @@
  files_read_kernel_symbol_table(ipsec_mgmt_t)
  files_getattr_kernel_modules(ipsec_mgmt_t)
  
@@ -21364,7 +21466,7 @@ diff -b -B --ignore-all-space --exclude-
  domain_use_interactive_fds(ipsec_mgmt_t)
  # denials when ps tries to search /proc. Do not audit these denials.
  domain_dontaudit_list_all_domains_state(ipsec_mgmt_t)
-@@ -232,12 +252,6 @@
+@@ -232,12 +256,6 @@
  files_dontaudit_getattr_default_dirs(ipsec_mgmt_t)
  files_dontaudit_getattr_default_files(ipsec_mgmt_t)
  
@@ -21377,17 +21479,21 @@ diff -b -B --ignore-all-space --exclude-
  init_use_script_ptys(ipsec_mgmt_t)
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
-@@ -280,6 +294,9 @@
+@@ -280,6 +298,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;
 +allow racoon_t self:fifo_file rw_fifo_file_perms;
 +
++manage_dirs_pattern(racoon_t, racoon_tmp_t, racoon_tmp_t)
++manage_files_pattern(racoon_t, racoon_tmp_t, racoon_tmp_t)
++files_tmp_filetrans(racoon_t, racoon_tmp_t, { dir file }) 
++
 +can_exec(racoon_t, setkey_exec_t)
  
  # manage pid file
  manage_files_pattern(racoon_t, ipsec_var_run_t, ipsec_var_run_t)
-@@ -297,6 +314,13 @@
+@@ -297,6 +322,13 @@
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
  
@@ -21401,7 +21507,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,13 +338,15 @@
+@@ -314,13 +346,15 @@
  
  files_read_etc_files(racoon_t)
  
@@ -21419,10 +21525,12 @@ diff -b -B --ignore-all-space --exclude-
  locallogin_use_fds(racoon_t)
  
  logging_send_syslog_msg(racoon_t)
-@@ -328,6 +354,11 @@
+@@ -328,6 +362,13 @@
  
  miscfiles_read_localization(racoon_t)
  
++auth_use_pam(racoon_t)
++
 +auth_can_read_shadow_passwords(racoon_t)
 +tunable_policy(`racoon_read_shadow',`
 +	auth_tunable_read_shadow(racoon_t) 
@@ -21431,7 +21539,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -347,6 +378,7 @@
+@@ -347,6 +388,7 @@
  files_read_etc_files(setkey_t)
  
  init_dontaudit_use_fds(setkey_t)
@@ -27293,7 +27401,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.28/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.te	2009-08-18 18:28:36.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/xen.te	2009-08-19 17:23:15.000000000 -0400
 @@ -1,11 +1,18 @@
  
 -policy_module(xen, 1.9.0)
@@ -27432,16 +27540,18 @@ diff -b -B --ignore-all-space --exclude-
  	consoletype_exec(xend_t)
  ')
  
-@@ -239,6 +270,8 @@
+@@ -239,6 +270,10 @@
  
  files_read_usr_files(xenconsoled_t)
  
 +fs_list_tmpfs(xenconsoled_t)
++fs_manage_xenfs_dirs(xenconsoled_t)
++fs_manage_xenfs_files(xenconsoled_t)
 +
  term_create_pty(xenconsoled_t, xen_devpts_t)
  term_use_generic_ptys(xenconsoled_t)
  term_use_console(xenconsoled_t)
-@@ -248,7 +281,7 @@
+@@ -248,7 +283,7 @@
  
  miscfiles_read_localization(xenconsoled_t)
  
@@ -27450,7 +27560,7 @@ diff -b -B --ignore-all-space --exclude-
  xen_stream_connect_xenstore(xenconsoled_t)
  
  ########################################
-@@ -256,21 +289,33 @@
+@@ -256,21 +291,33 @@
  # Xen store local policy
  #
  
@@ -27485,7 +27595,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_write_xen_state(xenstored_t)
  kernel_read_xen_state(xenstored_t)
  
-@@ -304,6 +349,7 @@
+@@ -304,6 +351,7 @@
  #
  
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
@@ -27493,7 +27603,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # internal communication is often done using fifo and unix sockets.
  allow xm_t self:fifo_file rw_fifo_file_perms;
-@@ -312,24 +358,28 @@
+@@ -312,24 +360,28 @@
  
  manage_files_pattern(xm_t, xend_var_lib_t, xend_var_lib_t)
  manage_fifo_files_pattern(xm_t, xend_var_lib_t, xend_var_lib_t)
@@ -27523,11 +27633,13 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_runtime_files(xm_t)
  files_read_usr_files(xm_t)
-@@ -339,15 +389,69 @@
+@@ -339,15 +391,70 @@
  
  storage_raw_read_fixed_disk(xm_t)
  
 +fs_getattr_all_fs(xm_t)
++fs_manage_xenfs_dirs(xm_t)
++fs_manage_xenfs_files(xm_t)
 +
  term_use_all_terms(xm_t)
  
@@ -27557,6 +27669,9 @@ diff -b -B --ignore-all-space --exclude-
 +kernel_read_xen_state(xm_ssh_t)
 +kernel_write_xen_state(xm_ssh_t)
 +
++fs_manage_xenfs_dirs(xm_ssh_t)
++fs_manage_xenfs_files(xm_ssh_t)
++
 +userdom_search_admin_dir(xm_ssh_t)
 +
 +#Should have a boolean wrapping these
@@ -27564,6 +27679,8 @@ diff -b -B --ignore-all-space --exclude-
 +files_search_mnt(xend_t)
 +fs_getattr_all_fs(xend_t)
 +fs_read_dos_files(xend_t)
++fs_manage_xenfs_dirs(xend_t)
++fs_manage_xenfs_files(xend_t)
 +
 +tunable_policy(`xen_use_nfs',`
 +	fs_manage_nfs_files(xend_t)
@@ -27588,12 +27705,6 @@ diff -b -B --ignore-all-space --exclude-
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
-+fs_manage_xenfs_dirs(xend_t)
-+fs_manage_xenfs_files(xend_t)
-+fs_manage_xenfs_dirs(xenstored_t)
-+fs_manage_xenfs_files(xenstored_t)
-+fs_manage_xenfs_dirs(xm_t)
-+fs_manage_xenfs_files(xm_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.28/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.28/policy/support/obj_perm_sets.spt	2009-08-18 13:23:29.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -p -r1.898 -r1.899
--- selinux-policy.spec	18 Aug 2009 22:29:11 -0000	1.898
+++ selinux-policy.spec	20 Aug 2009 00:02:37 -0000	1.899
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-2
+- Allow libvirt to change user componant of virt_domain
+
 * Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-1
 - Allow cupsd_config_t to be started by dbus
 - Add smoltclient policy



From emaldonado at fedoraproject.org  Thu Aug 20 00:08:14 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 00:08:14 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-nolocalsql.patch,NONE,1.1
Message-ID: <20090820000814.8644611C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11025

Added Files:
	nss-nolocalsql.patch 
Log Message:
Initial checkin

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE nss-nolocalsql.patch ---
diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
+++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
 DIRS := $(filter-out fortcrypt,$(DIRS))
 endif
 
-ifndef MOZILLA_CLIENT
-ifndef NSS_USE_SYSTEM_SQLITE
-DIRS := sqlite $(DIRS)
-endif
-endif
+#ifndef MOZILLA_CLIENT
+#ifndef NSS_USE_SYSTEM_SQLITE
+#DIRS := sqlite $(DIRS)
+#endif
+#endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 CSRCS = \
 	dbmshim.c \
diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
+++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 EXPORTS = \
 	secmodt.h \



From rdieter at fedoraproject.org  Thu Aug 20 00:12:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 00:12:48 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.3.0-default_applets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.188,
	1.189 kdebase-workspace-4.2.95-default-applets.patch, 1.2, NONE
Message-ID: <20090820001248.85A2E11C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11826/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-default_applets.patch 
Removed Files:
	kdebase-workspace-4.2.95-default-applets.patch 
Log Message:
rebase default applets patch


kdebase-workspace-4.3.0-default_applets.patch:
 desktopcorona.cpp |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.3.0-default_applets.patch ---
diff -up kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets	2009-06-17 15:07:42.000000000 -0500
+++ kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp	2009-08-19 18:18:03.571937055 -0500
@@ -259,15 +259,18 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
+         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- kdebase-workspace.spec	19 Aug 2009 16:11:49 -0000	1.188
+++ kdebase-workspace.spec	20 Aug 2009 00:12:48 -0000	1.189
@@ -21,7 +21,7 @@ Patch8: kdebase-workspace-4.2.85-klipper
 #?434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.95-default-applets.patch
+Patch12: kdebase-workspace-4.3.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
@@ -227,7 +227,7 @@ Requires: akonadi
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default-applets
+%patch12 -p1 -b .default_applets
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo


--- kdebase-workspace-4.2.95-default-applets.patch DELETED ---



From rdieter at fedoraproject.org  Thu Aug 20 00:12:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 00:12:48 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11
	kdebase-workspace-4.3.0-default_applets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.238,
	1.239 kdebase-workspace-4.2.95-default-applets.patch, 1.2, NONE
Message-ID: <20090820001248.CD78011C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11826/F-11

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-default_applets.patch 
Removed Files:
	kdebase-workspace-4.2.95-default-applets.patch 
Log Message:
rebase default applets patch


kdebase-workspace-4.3.0-default_applets.patch:
 desktopcorona.cpp |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.3.0-default_applets.patch ---
diff -up kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets	2009-06-17 15:07:42.000000000 -0500
+++ kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp	2009-08-19 18:18:03.571937055 -0500
@@ -259,15 +259,18 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
+         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- kdebase-workspace.spec	19 Aug 2009 16:09:19 -0000	1.238
+++ kdebase-workspace.spec	20 Aug 2009 00:12:48 -0000	1.239
@@ -21,7 +21,7 @@ Patch8: kdebase-workspace-4.2.85-klipper
 #?434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.95-default-applets.patch
+Patch12: kdebase-workspace-4.3.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
@@ -227,7 +227,7 @@ Requires: akonadi
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default-applets
+%patch12 -p1 -b .default_applets
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo


--- kdebase-workspace-4.2.95-default-applets.patch DELETED ---



From emaldonado at fedoraproject.org  Thu Aug 20 00:41:40 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 00:41:40 +0000 (UTC)
Subject: rpms/nss/devel nss.pc.in, 1.3, 1.4 nss.spec, 1.81,
	1.82 nss-nolocalsql.patch, 1.2, NONE nss-stubs-bug502133.patch,
	1.1, NONE
Message-ID: <20090820004140.ACDE111C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17764

Modified Files:
	nss.pc.in nss.spec 
Removed Files:
	nss-nolocalsql.patch nss-stubs-bug502133.patch 
Log Message:
Split off nss-softokn and nss-util as their own packages rhbz# 508479


Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss.pc.in	25 Jan 2008 12:29:12 -0000	1.3
+++ nss.pc.in	20 Aug 2009 00:41:40 -0000	1.4
@@ -7,5 +7,7 @@ Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
 Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Requires: nss-util >= %NSSUTIL_VERSION%
+Requires: nss-softokn >= %SOFTOKEN_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3
 Cflags: -I${includedir}


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- nss.spec	16 Aug 2009 16:31:55 -0000	1.81
+++ nss.spec	20 Aug 2009 00:41:40 -0000	1.82
@@ -1,27 +1,25 @@
-%global nspr_version 4.7
+%global nspr_version 4.8
+# Eventually we will have 3.12.4
+# for now we test with 3.12.3.99.3
+%global nss_softokn_version 3.12.3.99.3
+%global nss_util_version 3.12.3.99.3
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
-# Produce .chk files for the final stripped binaries
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
-%{nil}
-
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          7.1%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
-Requires:         nss-softokn-freebl%{_isa} >= %{version}
+Requires:         nss-softokn%{_isa} >= %{nss_softokn_version}
+Requires:         nss-util >= %{nss_util_version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    nss-softokn-devel >= %{nss_softokn_version}
+BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -36,15 +34,12 @@ Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-Source8:          nss-prelink.conf
-Source12:         %{name}-pem-20090622.tar.bz2
-Source13:         PayPalEE.cert
-Source14:         PayPalICA.cert
+Source6:         %{name}-pem-20090622.tar.bz2
+Source7:         PayPalEE.cert
+Source8:         PayPalICA.cert
 
 Patch1:           nss-no-rpath.patch
-Patch2:           nss-nolocalsql.patch
-Patch6:           nss-enable-pem.patch
-Patch7:           nss-stubs-bug502133.patch
+Patch2:           nss-enable-pem.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -53,21 +48,6 @@ server applications. Applications built 
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
-%package softokn-freebl
-Summary:          Freebl library for the Network Security Services
-Group:            System Environment/Base
-Conflicts:        nss < 3.12.2.99.3-5
-
-%description softokn-freebl
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled client and
-server applications. Applications built with NSS can support SSL v2
-and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
-v3 certificates, and other security standards.
-
-Install the nss-softokn-freebl package if you need the freebl 
-library.
-
 
 %package tools
 Summary:          Tools for the Network Security Services
@@ -91,6 +71,8 @@ Summary:          Development libraries 
 Group:            Development/Libraries
 Requires:         nss = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
+Requires:         nss-softokn-devel >= %{nss_softkn_version}
+Requires:         nss-util-devel >= %{nss_util_version}
 Requires:         pkgconfig
 
 %description devel
@@ -109,16 +91,14 @@ low level services.
 
 %prep
 %setup -q
-%setup -q -T -D -n %{name}-%{version} -a 12
+%setup -q -T -D -n %{name}-%{version} -a 6
 
 %patch1 -p0
-%patch2 -p0
-%patch6 -p0 -b .libpem
-%patch7 -p0 -b .502133
-
-#need newer certs to make test suite work
-#remove once we update to NSS 3.12.4
-cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
+%patch2 -p0 -b .libpem
+
+# need newer certs to make test suite work
+# remove once we update to NSS 3.12.4
+cp %{SOURCE7} %{SOURCE8} mozilla/security/nss/tests/libpkix/certs
 
 
 %build
@@ -134,8 +114,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-#export NSPR_INCLUDE_DIR=`nspr-config --includedir`
-#export NSPR_LIB_DIR=`nspr-config --libdir`
 
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@@ -149,14 +127,25 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
+NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
+NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
+
+export NSS_INCLUDE_DIR
+export NSS_LIB_DIR
+
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
 export USE_64
 %endif
 
-# NSS_ENABLE_ECC=1
-# export NSS_ENABLE_ECC
-
+#
+# Though we only ship the nss proper libraries, no
+# softoken nor util, we actually compile everything
+# as we are using the entire source tree. It is a bit
+# a waste but this is the only way we can find the
+# private exports from util. Let's keep it simple
+# for now.
+#
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
 %{__make} -C ./mozilla/security/nss
@@ -179,6 +168,7 @@ export NSS_VMAJOR 
 export NSS_VMINOR 
 export NSS_VPATCH
 
+%{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE2} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
@@ -228,7 +218,13 @@ killall $RANDSERV || :
 rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
+
+%define all_tests "cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
+%define nossl_tests "cipher libpkix cert dbtests tools fips sdr crmf smime ocsp merge pkits chains"
+%define cipher_suite "cipher"
+%define fips_suite "fips"
+
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_TESTS=%{all_tests} ./all.sh
 cd ../../../../
 
 killall $RANDSERV || :
@@ -254,49 +250,68 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-            libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
+for file in libnss3.so \
+            libssl3.so libsmime3.so libnssckbi.so libnsspem.so
 do
   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
-# Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk
-do
-  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
 
 # Install the empty NSS db files
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
 %{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
 %{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
 %{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-%{__install} -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
-  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  %{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Copy the binaries we want
 for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
 done
 
 # Copy the binaries we ship as unsupported
-for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
+for file in atob btoa derdump ocspclnt pp selfserv strsclnt symkeyutil tstclnt vfyserv vfychain
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+done
+
+# Before installing public headers romove the ones that nss-util-devel
+# and nss-softokn-devel have already installed
+
+# query the installed devel packages
+util_includes=`rpm -ql nss-util-devel | grep "%{_includedir}/nss3/"`
+softokn_includes=`rpm -ql nss-softokn-devel | grep "%{_includedir}/nss3/"`
+
+# make a more convenient list
+uslist=
+for f in ${util_includes}; do
+  bn=`basename ${f}`
+  uslist+="${bn} "
+done
+for f in ${softokn_includes}; do 
+  bn=`basename ${f}`
+  uslist+="${bn} "
+done
+
+# remove the headers we don't need
+for file in ${uslist}; do
+  if [ -f mozilla/dist/public/nss/${file} ]
+  then
+    rm mozilla/dist/public/nss/${file}
+  fi
 done
 
 # Copy the include files we want
 for file in mozilla/dist/public/nss/*.h
 do
-  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
 # Copy the package configuration files
@@ -318,28 +333,17 @@ done
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
-/%{_lib}/libnssutil3.so
-/%{_lib}/libnssdbm3.so
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
 /%{_lib}/libnssckbi.so
 /%{_lib}/libnsspem.so
-%{unsupported_tools_directory}/shlibsign
 %dir %{_libdir}/nss
 %dir %{unsupported_tools_directory}
 %dir %{_sysconfdir}/pki/nssdb
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
-%dir %{_sysconfdir}/prelink.conf.d
-%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
-%files softokn-freebl
-%defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
 
 %files tools
 %defattr(-,root,root)
@@ -367,27 +371,20 @@ done
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
-%{_libdir}/libnssutil3.so
-%{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
 %{_libdir}/libnssckbi.so
 %{_libdir}/libnsspem.so
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
 
+
+# shared with nss-util and nss-softokn
 %dir %{_includedir}/nss3
-%{_includedir}/nss3/base64.h
-%{_includedir}/nss3/blapit.h
 %{_includedir}/nss3/cert.h
 %{_includedir}/nss3/certdb.h
 %{_includedir}/nss3/certt.h
-%{_includedir}/nss3/ciferfam.h
 %{_includedir}/nss3/cmmf.h
 %{_includedir}/nss3/cmmft.h
 %{_includedir}/nss3/cms.h
@@ -397,8 +394,6 @@ done
 %{_includedir}/nss3/crmft.h
 %{_includedir}/nss3/cryptohi.h
 %{_includedir}/nss3/cryptoht.h
-%{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/hasht.h
 %{_includedir}/nss3/jar-ds.h
 %{_includedir}/nss3/jar.h
 %{_includedir}/nss3/jarfile.h
@@ -407,17 +402,8 @@ done
 %{_includedir}/nss3/keyt.h
 %{_includedir}/nss3/keythi.h
 %{_includedir}/nss3/nss.h
-%{_includedir}/nss3/nssb64.h
-%{_includedir}/nss3/nssb64t.h
 %{_includedir}/nss3/nssckbi.h
-%{_includedir}/nss3/nssilckt.h
-%{_includedir}/nss3/nssilock.h
-%{_includedir}/nss3/nsslocks.h
-%{_includedir}/nss3/nsslowhash.h
 %{_includedir}/nss3/nsspem.h
-%{_includedir}/nss3/nssrwlk.h
-%{_includedir}/nss3/nssrwlkt.h
-%{_includedir}/nss3/nssutil.h
 %{_includedir}/nss3/ocsp.h
 %{_includedir}/nss3/ocspt.h
 %{_includedir}/nss3/p12.h
@@ -428,42 +414,19 @@ done
 %{_includedir}/nss3/pk11priv.h
 %{_includedir}/nss3/pk11pub.h
 %{_includedir}/nss3/pk11sdr.h
-%{_includedir}/nss3/pkcs11.h
-%{_includedir}/nss3/pkcs11f.h
-%{_includedir}/nss3/pkcs11n.h
-%{_includedir}/nss3/pkcs11p.h
-%{_includedir}/nss3/pkcs11t.h
-%{_includedir}/nss3/pkcs11u.h
 %{_includedir}/nss3/pkcs12.h
 %{_includedir}/nss3/pkcs12t.h
 %{_includedir}/nss3/pkcs7t.h
-%{_includedir}/nss3/portreg.h
 %{_includedir}/nss3/preenc.h
-%{_includedir}/nss3/secasn1.h
-%{_includedir}/nss3/secasn1t.h
-%{_includedir}/nss3/seccomon.h
-%{_includedir}/nss3/secder.h
-%{_includedir}/nss3/secdert.h
-%{_includedir}/nss3/secdig.h
-%{_includedir}/nss3/secdigt.h
-%{_includedir}/nss3/secerr.h
-%{_includedir}/nss3/sechash.h
-%{_includedir}/nss3/secitem.h
 %{_includedir}/nss3/secmime.h
 %{_includedir}/nss3/secmod.h
-%{_includedir}/nss3/secmodt.h
-%{_includedir}/nss3/secoid.h
-%{_includedir}/nss3/secoidt.h
 %{_includedir}/nss3/secpkcs5.h
 %{_includedir}/nss3/secpkcs7.h
-%{_includedir}/nss3/secport.h
-%{_includedir}/nss3/shsign.h
 %{_includedir}/nss3/smime.h
 %{_includedir}/nss3/ssl.h
 %{_includedir}/nss3/sslerr.h
 %{_includedir}/nss3/sslproto.h
 %{_includedir}/nss3/sslt.h
-%{_includedir}/nss3/utilrename.h
 
 
 %files pkcs11-devel
@@ -483,6 +446,9 @@ done
 
 
 %changelog
+* Tue Aug 19 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-8
+- Split off nss-softokn and nss-util as their own packages (508479)
+
 * Sat Aug 06 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-7.1
 - Fix spec file problems uncovered by Fedora_12_Mass_Rebuild
 


--- nss-nolocalsql.patch DELETED ---


--- nss-stubs-bug502133.patch DELETED ---



From spot at fedoraproject.org  Thu Aug 20 00:57:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 00:57:53 +0000 (UTC)
Subject: rpms/irrlicht/devel irrlicht-1.5.1-glext.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 irrlicht.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090820005753.E372D11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21358

Modified Files:
	.cvsignore irrlicht.spec sources 
Added Files:
	irrlicht-1.5.1-glext.patch 
Log Message:
update to 1.5.1

irrlicht-1.5.1-glext.patch:
 COpenGLExtensionHandler.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE irrlicht-1.5.1-glext.patch ---
diff -up irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h.glext irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h
--- irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h.glext	2009-08-01 11:01:40.000000000 -0400
+++ irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h	2009-08-19 20:51:18.891059362 -0400
@@ -53,9 +53,10 @@
 	#include <GL/gl.h>
 	#include <GL/glx.h>
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-	#include "glext.h"
+	#include <GL/glext.h>
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
-	#include "glxext.h"
+	#include <GL/glxext.h>
 	#endif
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jan 2009 16:31:56 -0000	1.2
+++ .cvsignore	20 Aug 2009 00:57:53 -0000	1.3
@@ -1 +1 @@
-irrlicht-1.5.zip
+irrlicht-1.5.1.zip


Index: irrlicht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/irrlicht.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- irrlicht.spec	25 Jul 2009 03:36:58 -0000	1.3
+++ irrlicht.spec	20 Aug 2009 00:57:53 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
-Version:	1.5
-Release:	4%{?dist}
+Version:	1.5.1
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
@@ -9,14 +9,13 @@ Source0:	http://downloads.sourceforge.ne
 # Don't call ldconfig during make install.
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
 Patch0:		irrlicht-1.5-optflags.patch
-# Fix how we call libpng so we can use system libpng
-Patch1:		irrlicht-1.5-pngfix.patch 
+# Get the code compiling
+Patch1:		irrlicht-1.5.1-glext.patch
 URL:		http://irrlicht.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
 BuildRequires:	libjpeg-devel, zlib-devel
-# XXX: is libpng broken?
-BuildRequires: libpng-devel
+BuildRequires:	libpng-devel
 
 %description
 The Irrlicht Engine is an open source high performance realtime 3D engine 
@@ -38,7 +37,7 @@ Development headers and libraries for ir
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .glext
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
 mv readme.txt.iso88591 readme.txt
@@ -83,6 +82,9 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrlicht*.so
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jan 2009 16:31:56 -0000	1.2
+++ sources	20 Aug 2009 00:57:53 -0000	1.3
@@ -1 +1 @@
-e3bc8c1074fc0ec2810dc48f94c05d5a  irrlicht-1.5.zip
+0174959bf5dc97fd645d2b714ba9bf6a  irrlicht-1.5.1.zip



From pkgdb at fedoraproject.org  Thu Aug 20 00:59:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 00:59:31 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820005931.9F18F10F854@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on gnome-do (Fedora devel) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 00:59:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 00:59:35 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820005935.92D6410F882@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on gnome-do (Fedora devel) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 00:59:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 00:59:38 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820005938.23FB310F88B@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on gnome-do (Fedora devel) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 00:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 00:59:42 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820005942.D3DE410F898@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on gnome-do (Fedora devel) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:00:00 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010000.CA13610F8A3@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on gnome-do (Fedora 11) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 00:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 00:59:56 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820005956.E30DE10F85C@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on gnome-do (Fedora 11) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:00:04 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010004.74C8C10F8A9@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on gnome-do (Fedora 11) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:00:06 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010006.7785C10F8B0@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on gnome-do (Fedora 11) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:05:50 +0000
Subject: [pkgdb] gnome-do: nushio has requested watchcommits
Message-ID: <20090820010550.EB8A210F881@bastion2.fedora.phx.redhat.com>

nushio has requested the watchcommits acl on gnome-do (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:05:52 +0000
Subject: [pkgdb] gnome-do: nushio has requested commit
Message-ID: <20090820010552.6370C10F889@bastion2.fedora.phx.redhat.com>

nushio has requested the commit acl on gnome-do (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:05:54 +0000
Subject: [pkgdb] gnome-do: nushio has requested watchbugzilla
Message-ID: <20090820010554.DE71D10F897@bastion2.fedora.phx.redhat.com>

nushio has requested the watchbugzilla acl on gnome-do (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:05:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:05:55 +0000
Subject: [pkgdb] gnome-do: nushio has requested approveacls
Message-ID: <20090820010555.CCDA310F89B@bastion2.fedora.phx.redhat.com>

nushio has requested the approveacls acl on gnome-do (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From spot at fedoraproject.org  Thu Aug 20 01:06:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 01:06:56 +0000 (UTC)
Subject: rpms/libconfig/devel .cvsignore, 1.4, 1.5 libconfig.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090820010656.2739A11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23129

Modified Files:
	.cvsignore libconfig.spec sources 
Log Message:
update to 1.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libconfig/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Sep 2008 16:15:48 -0000	1.4
+++ .cvsignore	20 Aug 2009 01:06:55 -0000	1.5
@@ -1 +1 @@
-libconfig-1.3.1.tar.gz
+libconfig-1.3.2.tar.gz


Index: libconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconfig/devel/libconfig.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libconfig.spec	25 Jul 2009 05:28:04 -0000	1.8
+++ libconfig.spec	20 Aug 2009 01:06:55 -0000	1.9
@@ -1,7 +1,7 @@
 Name:			libconfig
 Summary: 		C/C++ configuration file library
-Version:		1.3.1
-Release:		4%{?dist}
+Version:		1.3.2
+Release:		1%{?dist}
 License:		LGPLv2+
 Group:			System Environment/Libraries
 Source0:		http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz
@@ -76,6 +76,9 @@ fi
 %{_infodir}/libconfig.info*
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.2-1
+- update to 1.3.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libconfig/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Sep 2008 16:15:48 -0000	1.4
+++ sources	20 Aug 2009 01:06:55 -0000	1.5
@@ -1 +1 @@
-f02bfa27a21b3040089026975b9dc0b8  libconfig-1.3.1.tar.gz
+094a82afd382aa2305c6cc3c06025c2d  libconfig-1.3.2.tar.gz



From pkgdb at fedoraproject.org  Thu Aug 20 01:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:08:12 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010812.8F42610F857@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on gnome-do (Fedora 10) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:08:12 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010812.B366C10F886@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on gnome-do (Fedora 10) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:08:13 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010813.EB0EF10F895@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on gnome-do (Fedora 10) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From pkgdb at fedoraproject.org  Thu Aug 20 01:08:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 01:08:21 +0000
Subject: [pkgdb] gnome-do had acl change status
Message-ID: <20090820010821.DD8A310F899@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on gnome-do (Fedora 10) to Approved for nushio

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do



From emaldonado at fedoraproject.org  Thu Aug 20 01:18:24 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 01:18:24 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.1,1.2
Message-ID: <20090820011824.6B5F011C00E4@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25401

Modified Files:
	nss-softokn.spec 
Log Message:
Build requires nss-util-devel


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-softokn.spec	19 Aug 2009 23:48:06 -0000	1.1
+++ nss-softokn.spec	20 Aug 2009 01:18:24 -0000	1.2
@@ -27,6 +27,7 @@ Requires:         sqlite
 Requires:         nss-util >= %{nssutil_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    nss-util-devel >= %{nssutil_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig



From spot at fedoraproject.org  Thu Aug 20 01:32:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 01:32:09 +0000 (UTC)
Subject: rpms/allgeyer-fonts/devel allgeyer-fonts.spec,1.3,1.4
Message-ID: <20090820013209.CCDC711C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28787

Modified Files:
	allgeyer-fonts.spec 
Log Message:
fix urls


Index: allgeyer-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/allgeyer-fonts/devel/allgeyer-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- allgeyer-fonts.spec	24 Jul 2009 16:44:42 -0000	1.3
+++ allgeyer-fonts.spec	20 Aug 2009 01:32:09 -0000	1.4
@@ -9,10 +9,14 @@ embedded in PDF files.
 Name:		%{fontname}-fonts
 Summary: 	Musical Notation True Type Fonts
 Version:	5.002
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	OFL
 Group:		User Interface/X
-Source0:	http://www.icogitate.com/~ergosum/fonts/musiqwik_musisync_y6.zip
+# The source was originally downloaded from:
+# http://www.icogitate.com/~ergosum/fonts/musiqwik_musisync_y6.zip
+# But the website is gone now.
+Source0:	musiqwik_musisync_y6.zip
+# This website is gone. :(
 URL:		http://www.icogitate.com/~ergosum/fonts/musicfonts.htm
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -86,6 +90,9 @@ rm -rf %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 5.002-4
+- fix urls
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.002-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From salimma at fedoraproject.org  Thu Aug 20 01:34:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 01:34:27 +0000 (UTC)
Subject: rpms/bti/EL-5 .cvsignore,1.5,1.6 bti.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090820013427.346BB11C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29358/EL-5

Modified Files:
	.cvsignore bti.spec sources 
Log Message:
* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
- Update to 023
- Build against readline v5, due to licensing incompatibilities with v6
  (bug #511301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bti/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2009 05:22:48 -0000	1.5
+++ .cvsignore	20 Aug 2009 01:34:26 -0000	1.6
@@ -1 +1 @@
-bti-015.tar.bz2
+bti-023.tar.bz2


Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/EL-5/bti.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bti.spec	13 Mar 2009 05:37:00 -0000	1.5
+++ bti.spec	20 Aug 2009 01:34:26 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           bti
-Version:        015
+Version:        023
 Release:        1%{?dist}
 Summary:        Bash Twitter/Identi.ca Idiocy
 
@@ -9,7 +9,7 @@ URL:            http://www.kernel.org/pu
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# still supporting EL-5 and F-8, rename to libcurl-devel once this changes
+# still supporting EL-5, rename to libcurl-devel once this changes
 BuildRequires:  curl-devel readline-devel libxml2-devel
 #Requires:       
 
@@ -45,14 +45,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%dir %{_sysconfdir}/bash_completion.d
-%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
+%config %{_sysconfdir}/bash_completion.d
 %{_bindir}/bti
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
+- Update to 023
+
 * Fri Mar 13 2009 Michel Salim <salimma at fedoraproject.org> - 015-1
 - Update to 015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bti/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 05:22:48 -0000	1.5
+++ sources	20 Aug 2009 01:34:26 -0000	1.6
@@ -1 +1 @@
-29c02e0ac16c8eaf73fad9fbba40eca2  bti-015.tar.bz2
+93b86457e13b838d3118b7eed4e0a38b  bti-023.tar.bz2



From salimma at fedoraproject.org  Thu Aug 20 01:34:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 01:34:28 +0000 (UTC)
Subject: rpms/bti/F-11 .cvsignore,1.5,1.6 bti.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090820013428.1F12911C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29358/F-11

Modified Files:
	.cvsignore bti.spec sources 
Log Message:
* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
- Update to 023
- Build against readline v5, due to licensing incompatibilities with v6
  (bug #511301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2009 05:22:49 -0000	1.5
+++ .cvsignore	20 Aug 2009 01:34:27 -0000	1.6
@@ -1 +1 @@
-bti-015.tar.bz2
+bti-023.tar.bz2


Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-11/bti.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bti.spec	13 Mar 2009 05:37:01 -0000	1.6
+++ bti.spec	20 Aug 2009 01:34:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           bti
-Version:        015
+Version:        023
 Release:        1%{?dist}
 Summary:        Bash Twitter/Identi.ca Idiocy
 
@@ -9,7 +9,7 @@ URL:            http://www.kernel.org/pu
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# still supporting EL-5 and F-8, rename to libcurl-devel once this changes
+# still supporting EL-5, rename to libcurl-devel once this changes
 BuildRequires:  curl-devel readline-devel libxml2-devel
 #Requires:       
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
+- Update to 023
+
 * Fri Mar 13 2009 Michel Salim <salimma at fedoraproject.org> - 015-1
 - Update to 015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 05:22:49 -0000	1.5
+++ sources	20 Aug 2009 01:34:27 -0000	1.6
@@ -1 +1 @@
-29c02e0ac16c8eaf73fad9fbba40eca2  bti-015.tar.bz2
+93b86457e13b838d3118b7eed4e0a38b  bti-023.tar.bz2



From salimma at fedoraproject.org  Thu Aug 20 01:34:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 01:34:27 +0000 (UTC)
Subject: rpms/bti/F-10 .cvsignore,1.5,1.6 bti.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090820013427.9523311C02CB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29358/F-10

Modified Files:
	.cvsignore bti.spec sources 
Log Message:
* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
- Update to 023
- Build against readline v5, due to licensing incompatibilities with v6
  (bug #511301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2009 05:22:49 -0000	1.5
+++ .cvsignore	20 Aug 2009 01:34:27 -0000	1.6
@@ -1 +1 @@
-bti-015.tar.bz2
+bti-023.tar.bz2


Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-10/bti.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bti.spec	13 Mar 2009 05:37:00 -0000	1.5
+++ bti.spec	20 Aug 2009 01:34:27 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           bti
-Version:        015
+Version:        023
 Release:        1%{?dist}
 Summary:        Bash Twitter/Identi.ca Idiocy
 
@@ -9,7 +9,7 @@ URL:            http://www.kernel.org/pu
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# still supporting EL-5 and F-8, rename to libcurl-devel once this changes
+# still supporting EL-5, rename to libcurl-devel once this changes
 BuildRequires:  curl-devel readline-devel libxml2-devel
 #Requires:       
 
@@ -45,14 +45,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%dir %{_sysconfdir}/bash_completion.d
-%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
+%config %{_sysconfdir}/bash_completion.d
 %{_bindir}/bti
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
+- Update to 023
+
 * Fri Mar 13 2009 Michel Salim <salimma at fedoraproject.org> - 015-1
 - Update to 015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 05:22:49 -0000	1.5
+++ sources	20 Aug 2009 01:34:27 -0000	1.6
@@ -1 +1 @@
-29c02e0ac16c8eaf73fad9fbba40eca2  bti-015.tar.bz2
+93b86457e13b838d3118b7eed4e0a38b  bti-023.tar.bz2



From salimma at fedoraproject.org  Thu Aug 20 01:34:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 01:34:28 +0000 (UTC)
Subject: rpms/bti/devel .cvsignore,1.5,1.6 bti.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <20090820013428.605C911C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29358/devel

Modified Files:
	.cvsignore bti.spec sources 
Log Message:
* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
- Update to 023
- Build against readline v5, due to licensing incompatibilities with v6
  (bug #511301)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bti/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Mar 2009 05:22:49 -0000	1.5
+++ .cvsignore	20 Aug 2009 01:34:28 -0000	1.6
@@ -1 +1 @@
-bti-015.tar.bz2
+bti-023.tar.bz2


Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/devel/bti.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bti.spec	24 Jul 2009 18:27:36 -0000	1.7
+++ bti.spec	20 Aug 2009 01:34:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bti
-Version:        015
-Release:        2%{?dist}
+Version:        023
+Release:        1%{?dist}
 Summary:        Bash Twitter/Identi.ca Idiocy
 
 Group:          Applications/Internet
@@ -9,8 +9,8 @@ URL:            http://www.kernel.org/pu
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# still supporting EL-5 and F-8, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel readline-devel libxml2-devel
+# still supporting EL-5, rename to libcurl-devel once this changes
+BuildRequires:  curl-devel compat-readline5-devel libxml2-devel
 #Requires:       
 
 %description
@@ -23,7 +23,8 @@ and fast manner to annoy the whole world
 
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+CFLAGS=$RPM_OPT_FLAGS -I%{_includedir}/readline5 \
+  LDFLAGS="-L%{_libdir}/readline5" make %{?_smp_mflags}
 
 
 %install
@@ -52,6 +53,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
+- Update to 023
+- Build against readline v5, due to licensing incompatibilities with v6
+  (bug #511301)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 015-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bti/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Mar 2009 05:22:49 -0000	1.5
+++ sources	20 Aug 2009 01:34:28 -0000	1.6
@@ -1 +1 @@
-29c02e0ac16c8eaf73fad9fbba40eca2  bti-015.tar.bz2
+93b86457e13b838d3118b7eed4e0a38b  bti-023.tar.bz2



From spot at fedoraproject.org  Thu Aug 20 01:42:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 01:42:41 +0000 (UTC)
Subject: rpms/perl-Pod-POM/devel .cvsignore, 1.3, 1.4 perl-Pod-POM.spec, 1.11,
	1.12 sources, 1.3, 1.4
Message-ID: <20090820014241.E9DDA11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Pod-POM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31030

Modified Files:
	.cvsignore perl-Pod-POM.spec sources 
Log Message:
update to 0.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-POM/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Mar 2009 22:47:48 -0000	1.3
+++ .cvsignore	20 Aug 2009 01:42:41 -0000	1.4
@@ -1 +1 @@
-Pod-POM-0.18.tar.gz
+Pod-POM-0.25.tar.gz


Index: perl-Pod-POM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-POM/devel/perl-Pod-POM.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Pod-POM.spec	26 Jul 2009 16:15:06 -0000	1.11
+++ perl-Pod-POM.spec	20 Aug 2009 01:42:41 -0000	1.12
@@ -1,19 +1,19 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Pod-POM
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.25
+Release:        1%{?dist}
 
 Summary:        Object-oriented interface to Perl POD documents
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Pod-POM/
-Source0:        http://www.cpan.org/authors/id/A/AB/ABW/Pod-POM-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AN/ANDREWF/Pod-POM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More), perl(File::Slurp), perl(Text::Wrap)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes README TODO
+%{_bindir}/pomdump
 %{_bindir}/podlint
 %{_bindir}/pom2
 %{perl_vendorlib}/Pod
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.25-1
+- update to 0.25
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Pod-POM/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Mar 2009 22:47:48 -0000	1.3
+++ sources	20 Aug 2009 01:42:41 -0000	1.4
@@ -1 +1 @@
-602c7a04ea261baf7c8140e7711f1ede  Pod-POM-0.18.tar.gz
+02f62bc9115a4931aa316ba16d65d013  Pod-POM-0.25.tar.gz



From salimma at fedoraproject.org  Thu Aug 20 01:44:47 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 01:44:47 +0000 (UTC)
Subject: rpms/bti/devel bti.spec,1.8,1.9
Message-ID: <20090820014447.BF5C611C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31401

Modified Files:
	bti.spec 
Log Message:
Group CFLAGS options within quotes



Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/devel/bti.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bti.spec	20 Aug 2009 01:34:28 -0000	1.8
+++ bti.spec	20 Aug 2009 01:44:47 -0000	1.9
@@ -23,7 +23,7 @@ and fast manner to annoy the whole world
 
 
 %build
-CFLAGS=$RPM_OPT_FLAGS -I%{_includedir}/readline5 \
+CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/readline5" \
   LDFLAGS="-L%{_libdir}/readline5" make %{?_smp_mflags}
 
 



From spot at fedoraproject.org  Thu Aug 20 01:47:04 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 01:47:04 +0000 (UTC)
Subject: rpms/physfs/devel .cvsignore, 1.2, 1.3 physfs.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <20090820014704.307FB11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/physfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32007

Modified Files:
	.cvsignore physfs.spec sources 
Log Message:
update to 1.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/physfs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Sep 2005 18:44:58 -0000	1.2
+++ .cvsignore	20 Aug 2009 01:47:03 -0000	1.3
@@ -1 +1 @@
-physfs-1.0.1.tar.gz
+physfs-1.0.2.tar.gz


Index: physfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/physfs/devel/physfs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- physfs.spec	26 Jul 2009 18:40:39 -0000	1.10
+++ physfs.spec	20 Aug 2009 01:47:03 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		physfs
-Version:	1.0.1
-Release:	11%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Summary:	Library to provide abstract access to various archives
 URL:		http://www.icculus.org/physfs/
 Source0:	http://www.icculus.org/physfs/downloads/physfs-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	doxygen, zlib-devel, readline-devel
+BuildRequires:	doxygen, zlib-devel, readline-devel, libtool
 
 %description
 PhysicsFS is a library to provide abstract access to various archives. It is
@@ -40,7 +40,7 @@ packages with physfs functionality.
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 doxygen
 
 %install
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.2-1
+- update to 1.0.2 (last in 1.0 series)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/physfs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Sep 2005 18:44:58 -0000	1.2
+++ sources	20 Aug 2009 01:47:03 -0000	1.3
@@ -1 +1 @@
-d0bd118c6b55fb1e020fe982d6ec6957  physfs-1.0.1.tar.gz
+175c4f134611229421c9ac8e4ed8f1f7  physfs-1.0.2.tar.gz



From spot at fedoraproject.org  Thu Aug 20 01:58:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 01:58:40 +0000 (UTC)
Subject: rpms/python-cerealizer/devel .cvsignore, 1.2,
	1.3 python-cerealizer.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090820015840.E1C1411C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-cerealizer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2450

Modified Files:
	.cvsignore python-cerealizer.spec sources 
Log Message:
update to 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cerealizer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Nov 2007 16:35:47 -0000	1.2
+++ .cvsignore	20 Aug 2009 01:58:39 -0000	1.3
@@ -1 +1 @@
-Cerealizer-0.6.tar.bz2
+Cerealizer-0.7.tar.bz2


Index: python-cerealizer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cerealizer/devel/python-cerealizer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-cerealizer.spec	26 Jul 2009 20:11:56 -0000	1.5
+++ python-cerealizer.spec	20 Aug 2009 01:58:39 -0000	1.6
@@ -2,8 +2,8 @@
 
 Name:			python-cerealizer
 Summary: 		Secure pickle-like module
-Version:		0.6
-Release:		6%{?dist}
+Version:		0.7
+Release:		1%{?dist}
 License:		Python
 Group:			Development/Tools
 Source0:		http://download.gna.org/soya/Cerealizer-%{version}.tar.bz2
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/Cerealizer-*.egg-info
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7-1
+- update to 0.7
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cerealizer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Nov 2007 16:35:47 -0000	1.2
+++ sources	20 Aug 2009 01:58:39 -0000	1.3
@@ -1 +1 @@
-c8dc088abeb99693a8192fd7c054df55  Cerealizer-0.6.tar.bz2
+0c6ad2e64797fe3adc264c67894b78d3  Cerealizer-0.7.tar.bz2



From spot at fedoraproject.org  Thu Aug 20 02:05:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:05:03 +0000 (UTC)
Subject: rpms/python-coverage/devel .cvsignore, 1.2, 1.3 python-coverage.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090820020504.025C911C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-coverage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3801

Modified Files:
	.cvsignore python-coverage.spec sources 
Log Message:
update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 May 2009 17:38:15 -0000	1.2
+++ .cvsignore	20 Aug 2009 02:05:03 -0000	1.3
@@ -1 +1 @@
-coverage-2.85.tar.gz
+coverage-3.0.1.tar.gz


Index: python-coverage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/python-coverage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-coverage.spec	26 Jul 2009 20:14:50 -0000	1.3
+++ python-coverage.spec	20 Aug 2009 02:05:03 -0000	1.4
@@ -1,15 +1,14 @@
-%{!?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:			python-coverage
 Summary:		Code coverage testing module for Python
-Version:		2.85
-Release:		3%{?dist}
+Version:		3.0.1
+Release:		1%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
 URL:			http://nedbatchelder.com/code/modules/coverage.html
-Source0:		http://nedbatchelder.com/code/modules/coverage-%{version}.tar.gz
+Source0:		http://pypi.python.org/packages/source/c/coverage/coverage-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:		noarch
 BuildRequires:		python-setuptools, python-devel
 
 %description
@@ -30,7 +29,6 @@ chmod -x coverage.egg-info/*.txt
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-chmod +x %{buildroot}%{python_sitelib}/coverage.py
 
 %clean
 rm -rf %{buildroot}
@@ -39,10 +37,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README.txt
 %{_bindir}/coverage
-%{python_sitelib}/coverage.py*
-%{python_sitelib}/coverage*.egg-info/
+%{python_sitearch}/coverage/
+%{python_sitearch}/coverage*.egg-info/
 
 %changelog
+* Wed Aug 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.1-1
+- update to 3.0.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.85-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 May 2009 17:38:16 -0000	1.2
+++ sources	20 Aug 2009 02:05:03 -0000	1.3
@@ -1 +1 @@
-bb6f4ce9fbd0011dd8d93eaf58ee9d04  coverage-2.85.tar.gz
+b299c33b169bd796a6186a1f0f42a7da  coverage-3.0.1.tar.gz



From mclasen at fedoraproject.org  Thu Aug 20 02:09:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 20 Aug 2009 02:09:04 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.61, 1.62 gnome-terminal.spec,
	1.126, 1.127 sources, 1.62, 1.63
Message-ID: <20090820020904.80B9E11C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4545

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	20 May 2009 19:06:06 -0000	1.61
+++ .cvsignore	20 Aug 2009 02:09:03 -0000	1.62
@@ -1 +1 @@
-gnome-terminal-2.26.2.tar.bz2
+gnome-terminal-2.27.91.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- gnome-terminal.spec	25 Jul 2009 00:48:30 -0000	1.126
+++ gnome-terminal.spec	20 Aug 2009 02:09:03 -0000	1.127
@@ -10,12 +10,12 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.26.2
-Release: 3%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/2.26/gnome-terminal-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-terminal/2.27/gnome-terminal-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=588732
 Source1: profile-new-dialog.ui
 # Fix gnome.org Bug 338913 ? Terminal resized when switching tabs
@@ -136,6 +136,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	20 May 2009 19:06:06 -0000	1.62
+++ sources	20 Aug 2009 02:09:03 -0000	1.63
@@ -1 +1 @@
-f4f64b9b67c7a3147799ee10f7cf00e1  gnome-terminal-2.26.2.tar.bz2
+42b643e0d1940c473af31e752e17a482  gnome-terminal-2.27.91.tar.bz2



From spot at fedoraproject.org  Thu Aug 20 02:09:25 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:09:25 +0000 (UTC)
Subject: rpms/pyxdg/devel .cvsignore, 1.4, 1.5 pyxdg.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <20090820020925.B02E911C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyxdg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4738

Modified Files:
	.cvsignore pyxdg.spec sources 
Log Message:
update to 0.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyxdg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Oct 2008 19:01:19 -0000	1.4
+++ .cvsignore	20 Aug 2009 02:09:25 -0000	1.5
@@ -1 +1 @@
-pyxdg-0.16.tar.gz
+pyxdg-0.17.tar.gz


Index: pyxdg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxdg/devel/pyxdg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pyxdg.spec	27 Jul 2009 01:38:59 -0000	1.12
+++ pyxdg.spec	20 Aug 2009 02:09:25 -0000	1.13
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyxdg
-Version:        0.16
-Release:        4%{?dist}
+Version:        0.17
+Release:        1%{?dist}
 Summary:        Python library to access freedesktop.org standards
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://freedesktop.org/Software/pyxdg
 Source0:        http://www.freedesktop.org/~lanius/%{name}-%{version}.tar.gz
-Patch0:		pyxdg-0.16-indentfix-bz469229.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -19,7 +18,6 @@ PyXDG is a python library to access free
 
 %prep
 %setup -q
-%patch0 -p1 -b .indentfix
 
 %build
 %{__python} setup.py build
@@ -38,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT 
 %{python_sitelib}/pyxdg-*.egg-info
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.17-1
+- update to 0.17
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyxdg/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Oct 2008 19:01:20 -0000	1.5
+++ sources	20 Aug 2009 02:09:25 -0000	1.6
@@ -1 +1 @@
-55b71ec0df9509e05e562ac402b119f7  pyxdg-0.16.tar.gz
+a086de99cc536095684d87f15594e4db  pyxdg-0.17.tar.gz



From spot at fedoraproject.org  Thu Aug 20 02:17:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:17:28 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.33,1.34
Message-ID: <20090820021728.7EEF211C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6447

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
fix url, drop old macros


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- R-RScaLAPACK.spec	7 Aug 2009 02:42:37 -0000	1.33
+++ R-RScaLAPACK.spec	20 Aug 2009 02:17:27 -0000	1.34
@@ -1,11 +1,5 @@
 %define packname RScaLAPACK
 
-%ifarch x86_64 ia64 ppc64 sparc64
-%define bitsize 64
-%else
-%define bitsize 32
-%endif
-
 # These macros will go away soon. Hopefully.
 %global _openmpi_load \
  . /etc/profile.d/modules.sh; \
@@ -35,10 +29,10 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 21%{?dist}
+Release: 22%{?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: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel
@@ -128,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-22
+- fix url, drop old bitsize macros
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com>  - 0.5.1-21
 - Update for new MPI scheme
 



From spot at fedoraproject.org  Thu Aug 20 02:19:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:19:38 +0000 (UTC)
Subject: rpms/librx/devel librx.spec,1.14,1.15
Message-ID: <20090820021938.DA9CC11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/librx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6989

Modified Files:
	librx.spec 
Log Message:
drop url from source0


Index: librx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librx/devel/librx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- librx.spec	25 Jul 2009 08:34:35 -0000	1.14
+++ librx.spec	20 Aug 2009 02:19:38 -0000	1.15
@@ -1,11 +1,13 @@
 Summary: POSIX regexp functions
 Name: librx
 Version: 1.5
-Release: 13%{?dist}.1
+Release: 14%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/rx/rx.html
 Group: Applications/Text
-Source0: ftp://ftp.gnu.org/gnu/rx/rx-%{version}.tar.bz2
+# Originally downloaded from ftp://ftp.gnu.org/gnu/rx/rx-1.5.tar.bz2
+# The FSF no longer offers this code.
+Source0: rx-%{version}.tar.bz2
 Patch0: rx-1.5-shared.patch
 Patch1: rx-1.5-texinfo.patch
 Patch2: librx-1.5-libdir64.patch
@@ -86,6 +88,9 @@ fi
 %{_libdir}/*.a
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5-14
+- take URL out of Source0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-13.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Thu Aug 20 02:22:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:22:02 +0000 (UTC)
Subject: rpms/perl-Test-Differences/devel perl-Test-Differences.spec, 1.9,
	1.10
Message-ID: <20090820022202.D1C0011C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Test-Differences/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7588

Modified Files:
	perl-Test-Differences.spec 
Log Message:
fix source url


Index: perl-Test-Differences.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Differences/devel/perl-Test-Differences.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Test-Differences.spec	26 Jul 2009 16:48:33 -0000	1.9
+++ perl-Test-Differences.spec	20 Aug 2009 02:22:02 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           perl-Test-Differences
 Version:        0.4801
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Test strings and data structures and show differences if not ok
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Test-Differences/
-Source0:        http://www.cpan.org/authors/id/R/RB/RBS/Test-Differences-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/O/OV/OVID/Test-Differences-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4801-3
+- fix source url
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4801-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Thu Aug 20 02:23:00 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 20 Aug 2009 02:23:00 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-parallel-build.patch, 
	NONE, 1.1 octave-forge.spec, 1.73, 1.74
Message-ID: <20090820022300.D177411C00E4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7875

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-parallel-build.patch 
Log Message:
* 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)


octave-forge-20090607-parallel-build.patch:
 DESCRIPTION    |    4 ++--
 src/pserver.cc |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE octave-forge-20090607-parallel-build.patch ---
--- main/parallel-2.0.0/src/pserver.cc	2009/08/19 05:01:22	6115
+++ main/parallel-2.0.0/src/pserver.cc	2009/08/19 08:30:19	6116
@@ -61,8 +61,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 +97,7 @@
 do_octave_atexit_server (void)
 {
   static bool deja_vu = false;
+  extern bool quitting_gracefully;
 
   while (! octave_atexit_functions.empty ())
     {
--- main/parallel-2.0.0/DESCRIPTION	2009/08/19 05:01:22	6115
+++ main/parallel-2.0.0/DESCRIPTION	2009/08/19 08:30:19	6116
@@ -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: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- octave-forge.spec	18 Aug 2009 23:44:45 -0000	1.73
+++ octave-forge.spec	20 Aug 2009 02:23:00 -0000	1.74
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -20,6 +20,7 @@ Source0:        %{name}-bundle-%{version
 #Patch0:         %{name}-image-1.0.8-build.patch
 Patch0:		octave-forge-20090607-includes.patch
 Patch1:		octave-forge-20090607-ann-swig-build.patch
+Patch2:		octave-forge-20090607-parallel-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -64,7 +65,7 @@ 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.0
+Provides: octave-parallel = 2.0.1
 Provides: octave-physicalconstants = 0.1.7
 Provides: octave-plot = 1.0.7
 Provides: octave-quaternion = 1.0.0
@@ -158,6 +159,7 @@ done
 #apply patches
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -231,6 +233,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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.
 



From spot at fedoraproject.org  Thu Aug 20 02:37:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:37:35 +0000 (UTC)
Subject: rpms/tcl-zlib/devel tcl-zlib.spec,1.5,1.6
Message-ID: <20090820023735.4C11311C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11500

Modified Files:
	tcl-zlib.spec 
Log Message:
drop url from source0


Index: tcl-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/devel/tcl-zlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tcl-zlib.spec	27 Jul 2009 05:36:16 -0000	1.5
+++ tcl-zlib.spec	20 Aug 2009 02:37:33 -0000	1.6
@@ -8,13 +8,14 @@
 
 Name:		tcl-%{realname}
 Version:	2.0.1
-Release:	0.4.svn40%{?dist}
+Release:	0.5.svn40%{?dist}
 Summary:	Tcl extension for zlib support
 Group:		System Environment/Libraries
 License:	MIT
 URL:		http://svn.scheffers.net/
 # Snapshot of SVN40 downloaded on June 26, 2008
-Source0:	http://svn.scheffers.net/%{realname}.tar.gz
+# Originally found at http://svn.scheffers.net/zlib.tar.gz
+Source0:	%{realname}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	tcl-devel, tk-devel, zlib-devel
 Requires:	tcl(abi) = %{tcl_version}
@@ -64,6 +65,9 @@ rm -rf %{buildroot}
 %{_includedir}/*.h
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.5.svn40
+- drop url from source0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.4.svn40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:13 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested watchbugzilla
Message-ID: <20090820024113.19D1C10F7F0@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on gnome-do-plugins (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:13 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested watchcommits
Message-ID: <20090820024113.E953B10F85A@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on gnome-do-plugins (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:16 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested commit
Message-ID: <20090820024116.425AE10F888@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on gnome-do-plugins (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:21 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested approveacls
Message-ID: <20090820024121.9137110F7F0@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on gnome-do-plugins (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:27 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested watchbugzilla
Message-ID: <20090820024128.0EE2F10F890@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on gnome-do-plugins (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:29 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested watchcommits
Message-ID: <20090820024129.37F0F10F898@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on gnome-do-plugins (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:30 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested commit
Message-ID: <20090820024130.F237110F89A@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on gnome-do-plugins (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 02:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 02:41:35 +0000
Subject: [pkgdb] gnome-do-plugins: salimma has requested approveacls
Message-ID: <20090820024135.4ADDE10F86F@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on gnome-do-plugins (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From spot at fedoraproject.org  Thu Aug 20 02:42:25 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:42:25 +0000 (UTC)
Subject: rpms/perl-XML-RSS/devel .cvsignore, 1.7, 1.8 perl-XML-RSS.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <20090820024225.1479D11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-XML-RSS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12526

Modified Files:
	.cvsignore perl-XML-RSS.spec sources 
Log Message:
update to 1.45


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-RSS/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	15 May 2009 14:26:23 -0000	1.7
+++ .cvsignore	20 Aug 2009 02:42:24 -0000	1.8
@@ -1 +1 @@
-XML-RSS-1.44.tar.gz
+XML-RSS-1.45.tar.gz


Index: perl-XML-RSS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-RSS/devel/perl-XML-RSS.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-XML-RSS.spec	26 Jul 2009 17:36:47 -0000	1.13
+++ perl-XML-RSS.spec	20 Aug 2009 02:42:24 -0000	1.14
@@ -1,21 +1,23 @@
 Name:           perl-XML-RSS
-Version:        1.44
-Release:        2%{?dist}
+Version:        1.45
+Release:        1%{?dist}
 Summary:        Perl module for managing RDF Site Summary (RSS) files
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/XML-RSS/
-Source0:        http://www.cpan.org/authors/id/A/AB/ABH/XML-RSS-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-RSS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Test::Manifest)
 BuildRequires:  perl(Test::Pod), perl(Test::More)
+BuildRequires:	perl(HTML::Entities)
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(DateTime::Format::Mail)
 BuildRequires:  perl(DateTime::Format::W3CDTF)
 BuildRequires:  perl(Test::Differences)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.45-1
+- update to 1.45
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.44-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-RSS/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 May 2009 14:26:23 -0000	1.7
+++ sources	20 Aug 2009 02:42:24 -0000	1.8
@@ -1 +1 @@
-c70c285142e45f7a9cbd4b0a9ba428cf  XML-RSS-1.44.tar.gz
+7745e89c9092e9233bf9b9e46d583bc2  XML-RSS-1.45.tar.gz



From spot at fedoraproject.org  Thu Aug 20 02:47:15 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 02:47:15 +0000 (UTC)
Subject: rpms/udunits/devel udunits.spec,1.21,1.22
Message-ID: <20090820024715.E3B1D11C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/udunits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13484

Modified Files:
	udunits.spec 
Log Message:
fix upstream URL


Index: udunits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- udunits.spec	27 Jul 2009 06:28:08 -0000	1.21
+++ udunits.spec	20 Aug 2009 02:47:15 -0000	1.22
@@ -1,10 +1,10 @@
 Name: udunits
 Version: 1.12.9
-Release: 4%{?dist}.1
+Release: 5%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
-URL: http://my.unidata.ucar.edu/content/software/udunits/index.html
+URL: http://www.unidata.ucar.edu/software/udunits/
 Source0: ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-1.12.9.tar.gz
 Source1: udunits-wrapper.inc
 Patch0: udunits-1.12.4-linuxfixes.patch
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-5
+- fix upstream URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.9-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Thu Aug 20 02:51:08 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 20 Aug 2009 02:51:08 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.74,1.75
Message-ID: <20090820025108.23D8A11C00E4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14274

Modified Files:
	octave-forge.spec 
Log Message:
* 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)



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- octave-forge.spec	20 Aug 2009 02:23:00 -0000	1.74
+++ octave-forge.spec	20 Aug 2009 02:51:07 -0000	1.75
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -65,7 +65,8 @@ 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
+# temporarily disable: still not yet ported to Octave 3.2.x
+# Provides: octave-parallel = 2.0.1
 Provides: octave-physicalconstants = 0.1.7
 Provides: octave-plot = 1.0.7
 Provides: octave-quaternion = 1.0.0
@@ -141,6 +142,8 @@ rm extra/windows-*.tar.gz
 rm main/database-*.tar.gz
 # 6. exclude ftp -- SWIG wrappers are broken
 rm main/ftp-*.tar.gz
+# 7. exclude parallel -- not yet ported to build against Octave 3.2
+rm main/parallel-*.tar.gz
 
 #Unpack everything
 for pkg in main extra language
@@ -157,9 +160,11 @@ do
 done
 
 #apply patches
-%patch0 -p0
+#disable patch for the moment, not building 'parallel'
+#patch0 -p0
 %patch1 -p0
-%patch2 -p0
+#disable patch for the moment, not building 'parallel'
+#patch2 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -233,6 +238,11 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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)



From rdieter at fedoraproject.org  Thu Aug 20 03:04:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 03:04:24 +0000 (UTC)
Subject: rpms/kmymoney2/devel .cvsignore, 1.15, 1.16 kmymoney2.spec, 1.40,
	1.41 sources, 1.14, 1.15
Message-ID: <20090820030424.C4DC211C00E4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17367

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
- kmymoney2-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Feb 2009 21:26:10 -0000	1.15
+++ .cvsignore	20 Aug 2009 03:04:23 -0000	1.16
@@ -1 +1 @@
-kmymoney2-0.9.3.tar.bz2
+kmymoney2-1.0.0.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kmymoney2.spec	25 Jul 2009 04:40:58 -0000	1.40
+++ kmymoney2.spec	20 Aug 2009 03:04:23 -0000	1.41
@@ -17,8 +17,8 @@ BuildRequires: libutempter-devel
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.9.3
-Release: 4%{?dist}
+Version: 1.0.0 
+Release: 1%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -30,11 +30,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
 
+# multilib upgrades, when -libs became unconditional
+Obsoletes: kmymoney2 < 0.9.3-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: curl-devel
-buildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
+BuildRequires: html2ps
 BuildRequires: gettext
 BuildRequires: ghostscript
 BuildRequires: %{kdelibs3}-devel
@@ -80,6 +83,9 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
+# to help doc generation
+export LANG=en_US.UTF-8
+
 make %{?_smp_mflags}
 
 
@@ -110,6 +116,7 @@ fi
 
 # Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
+rm -rf %{buildroot}%{_datadir}/icons/*/scalable
 
 
 %check 
@@ -125,14 +132,21 @@ desktop-file-validate %{buildroot}%{_dat
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
+touch --no-create %{_datadir}/icons/Tango &> /dev/null || :
+
 
 %postun
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null 
   touch --no-create %{_datadir}/icons/locolor &> /dev/null
+  touch --no-create %{_datadir}/icons/oxygen &> /dev/null
+  touch --no-create %{_datadir}/icons/Tango &> /dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
   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
 
@@ -140,7 +154,8 @@ fi
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 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 || :
 
 
 %files -f %{name}.lang
@@ -152,6 +167,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/config.kcfg/kmymoney2.kcfg
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
+%{_datadir}/icons/Tango/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %if 0%{?_enable_ofxbanking:1}
@@ -166,12 +183,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libkmm_kdchart.so.0*
+%{_libdir}/libkmm_mymoney.so.5*
+%{_libdir}/libkmm_plugin.so.0*
+%{_libdir}/qt-3.3/plugins/sqldrivers/*.so
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/kmymoney
+%{_libdir}/libkmm_*.so
 
 
 %clean
@@ -179,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- kmymoney2-1.0.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Feb 2009 21:26:10 -0000	1.14
+++ sources	20 Aug 2009 03:04:23 -0000	1.15
@@ -1 +1 @@
-d33041029530091c4ac6196cd8408bda  kmymoney2-0.9.3.tar.bz2
+f702ea77ff5bf6aec727768da34d98ec  kmymoney2-1.0.0.tar.bz2



From alexlan at fedoraproject.org  Thu Aug 20 03:06:51 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 20 Aug 2009 03:06:51 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.75,1.76
Message-ID: <20090820030651.2645811C00E4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17855

Modified Files:
	octave-forge.spec 
Log Message:
* 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.



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- octave-forge.spec	20 Aug 2009 02:51:07 -0000	1.75
+++ octave-forge.spec	20 Aug 2009 03:06:49 -0000	1.76
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -92,7 +92,8 @@ Provides: octave-civil-engineering = 1.0
 # octave-engine is removed
 Provides: octave-fpl = 0.1.6
 Provides: octave-generate_html = 0.0.9
-Provides: octave-graceplot = 1.0.8
+# 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
@@ -144,6 +145,8 @@ rm main/database-*.tar.gz
 rm main/ftp-*.tar.gz
 # 7. exclude parallel -- not yet ported to build against Octave 3.2
 rm main/parallel-*.tar.gz
+# 8. exclude graceplot --  doesn't build against Octave 3.2
+rm main/graceplot-*.tar.gz
 
 #Unpack everything
 for pkg in main extra language
@@ -238,6 +241,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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



From alexlan at fedoraproject.org  Thu Aug 20 03:14:19 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 20 Aug 2009 03:14:19 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.76,1.77
Message-ID: <20090820031419.B346111C00E4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19240

Modified Files:
	octave-forge.spec 
Log Message:
Graceplot is in extra



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- octave-forge.spec	20 Aug 2009 03:06:49 -0000	1.76
+++ octave-forge.spec	20 Aug 2009 03:14:19 -0000	1.77
@@ -146,7 +146,7 @@ rm main/ftp-*.tar.gz
 # 7. exclude parallel -- not yet ported to build against Octave 3.2
 rm main/parallel-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
-rm main/graceplot-*.tar.gz
+rm extra/graceplot-*.tar.gz
 
 #Unpack everything
 for pkg in main extra language



From mclasen at fedoraproject.org  Thu Aug 20 03:15:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 20 Aug 2009 03:15:47 +0000 (UTC)
Subject: rpms/rhythmbox/devel spinner.patch, NONE, 1.1 rhythmbox.spec, 1.256,
	1.257
Message-ID: <20090820031547.5BA4711C00E4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19517

Modified Files:
	rhythmbox.spec 
Added Files:
	spinner.patch 
Log Message:
Use the right spinner icon


spinner.patch:
 __init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spinner.patch ---
diff -up rhythmbox-0.12.3/plugins/artdisplay/artdisplay/__init__.py.spinner rhythmbox-0.12.3/plugins/artdisplay/artdisplay/__init__.py
--- rhythmbox-0.12.3/plugins/artdisplay/artdisplay/__init__.py.spinner	2009-08-19 22:38:11.530107823 -0400
+++ rhythmbox-0.12.3/plugins/artdisplay/artdisplay/__init__.py	2009-08-19 22:38:59.350863236 -0400
@@ -36,7 +36,7 @@ FADE_TOTAL_TIME = 1000
 ART_MISSING_ICON = 'rhythmbox-missing-artwork'
 WORKING_DELAY = 500
 THROBBER_RATE = 10
-THROBBER = 'gnome-spinner'
+THROBBER = 'process-working'
 ASPECT_RATIO_MIN = 0.9
 ASPECT_RATIO_MAX = 1.1
 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- rhythmbox.spec	19 Aug 2009 16:09:21 -0000	1.256
+++ rhythmbox.spec	20 Aug 2009 03:15:46 -0000	1.257
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -48,6 +48,8 @@ BuildRequires: perl(XML::Parser) intltoo
 ExcludeArch:    s390 s390x
 
 Patch0: 0001-Fix-audio-CD-activation.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592404
+Patch1: spinner.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -81,6 +83,7 @@ from, and sending media to UPnP/DLNA net
 %prep
 %setup -q
 %patch0 -p1 -b .audiocd
+%patch1 -p1 -b .spinner
 
 # 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/' '{}' ';'
@@ -218,6 +221,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-4
+- Use the right spinner icon
+
 * Wed Aug 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.3-3
 - Fix audio CD activation (#517685)
 



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:35 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033335.5F97E10F85A@bastion2.fedora.phx.redhat.com>

nushio has set the watchbugzilla acl on gnome-do-plugins (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:36 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033336.761EC10F85C@bastion2.fedora.phx.redhat.com>

nushio has set the watchcommits acl on gnome-do-plugins (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:37 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033337.62E5F10F888@bastion2.fedora.phx.redhat.com>

nushio has set the commit acl on gnome-do-plugins (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:38 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033339.26EEC10F890@bastion2.fedora.phx.redhat.com>

nushio has set the approveacls acl on gnome-do-plugins (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:45 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033345.5D2A610F899@bastion2.fedora.phx.redhat.com>

nushio has set the watchbugzilla acl on gnome-do-plugins (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:45 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033346.237C710F89B@bastion2.fedora.phx.redhat.com>

nushio has set the watchcommits acl on gnome-do-plugins (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:49 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033349.11CB610F80B@bastion2.fedora.phx.redhat.com>

nushio has set the approveacls acl on gnome-do-plugins (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From pkgdb at fedoraproject.org  Thu Aug 20 03:33:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 03:33:48 +0000
Subject: [pkgdb] gnome-do-plugins had acl change status
Message-ID: <20090820033353.584BF10F8A2@bastion2.fedora.phx.redhat.com>

nushio has set the commit acl on gnome-do-plugins (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-do-plugins



From spot at fedoraproject.org  Thu Aug 20 03:46:00 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 03:46:00 +0000 (UTC)
Subject: rpms/xbsql/devel xbsql-0.11-xbase64.patch, NONE, 1.1 xbsql.spec,
	1.10, 1.11
Message-ID: <20090820034600.AC9F311C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xbsql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26397

Modified Files:
	xbsql.spec 
Added Files:
	xbsql-0.11-xbase64.patch 
Log Message:
rebuild against new xbase

xbsql-0.11-xbase64.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 xbsql.cpp   |    4 ++--
 xbsql.h     |    3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE xbsql-0.11-xbase64.patch ---
diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am
--- xbsql-0.11/xbsql/Makefile.am.BAD	2009-08-19 23:32:27.481185284 -0400
+++ xbsql-0.11/xbsql/Makefile.am	2009-08-19 23:32:47.157206308 -0400
@@ -17,10 +17,10 @@ libxbsql_la_SOURCES	= xb_value.cpp xb_el
 			  xb_assignlist.cpp xb_create.cpp \
 			  xbsql.tab.c xb_datetime.cpp
 
-libxbsql_la_LDFLAGS	= -lxbase $(DEBUG)
+libxbsql_la_LDFLAGS	= -lxbase64 $(DEBUG)
 
 xql_SOURCES		= xql.cpp
-xql_LDADD		= -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD		= -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
 
 #
 #
diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in
--- xbsql-0.11/xbsql/Makefile.in.BAD	2009-08-19 23:32:54.384058775 -0400
+++ xbsql-0.11/xbsql/Makefile.in	2009-08-19 23:33:03.928059382 -0400
@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el
 			  xbsql.tab.c xb_datetime.cpp
 
 
-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
+libxbsql_la_LDFLAGS = -lxbase64 $(DEBUG)
 
 xql_SOURCES = xql.cpp
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
 
 
 #install-data-hook:
diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp
--- xbsql-0.11/xbsql/xbsql.cpp.BAD	2009-08-19 23:34:23.880063863 -0400
+++ xbsql-0.11/xbsql/xbsql.cpp	2009-08-19 23:34:47.393184432 -0400
@@ -207,7 +207,7 @@ void	XBaseSQL::setError
 			break	;
 
 		default	:
-			e	= xbStrError (rc) ;
+			e	= GetErrorMessage (rc) ;
 			break	;
 	}
 
@@ -230,7 +230,7 @@ void	XBaseSQL::setError
 	char	t[1024]	;
 	va_list	aptr	;
 
-	strcpy	  (t, xbStrError (rc)) ;
+	strcpy	  (t, GetErrorMessage (rc)) ;
 	strcat	  (t, ": ") ;
 	int	  l = strlen(t) ;
 
diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h
--- xbsql-0.11/xbsql/xbsql.h.BAD	2009-08-19 23:35:45.087088919 -0400
+++ xbsql-0.11/xbsql/xbsql.h	2009-08-19 23:34:06.949184421 -0400
@@ -43,8 +43,7 @@ XBSQL_API int	strncasecmp (const char *s
 
 #endif
 
-#include	<xbase/xbase.h>
-#include	<xbase/xbexcept.h>
+#include	<xbase64/xbase64.h>
 
 class	XBaseSQL	;
 class	XBSQLTable	;


Index: xbsql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xbsql/devel/xbsql.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xbsql.spec	27 Jul 2009 07:38:06 -0000	1.10
+++ xbsql.spec	20 Aug 2009 03:46:00 -0000	1.11
@@ -1,14 +1,15 @@
 Name:		xbsql
 Summary:	A SQL wrapper for xbase
 Version:	0.11
-Release:	13%{?dist}
+Release:	14%{?dist}
 Group:		Development/Libraries
 License:	LGPLv2+
 URL:		http://www.quaking.demon.co.uk/xbsql/
 Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tgz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbase-devel, ncurses-devel, readline-devel, bison
+BuildRequires:	xbase-devel >= 3.1.2, ncurses-devel, readline-devel, bison, libtool
 Patch0:		xbsql-0.11-ncurses64.patch
+Patch1:		xbsql-0.11-xbase64.patch
 
 %description
 XBSQL is a wrapper library which provides an SQL-subset interface to Xbase 
@@ -26,10 +27,11 @@ Headers and libraries for compiling prog
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-14
+- update for new xbase
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Thu Aug 20 03:46:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 03:46:20 +0000 (UTC)
Subject: rpms/xbase/devel xbase-3.1.2-fixconfig.patch, NONE,
	1.1 xbase-3.1.2-gcc44.patch, NONE, 1.1 xbase-3.1.2-xbnode.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xbase.spec,
	1.14, 1.15
Message-ID: <20090820034620.CFF4311C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xbase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26522

Modified Files:
	.cvsignore sources xbase.spec 
Added Files:
	xbase-3.1.2-fixconfig.patch xbase-3.1.2-gcc44.patch 
	xbase-3.1.2-xbnode.patch 
Log Message:
update to 3.1.2

xbase-3.1.2-fixconfig.patch:
 xbase64-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xbase-3.1.2-fixconfig.patch ---
diff -up xbase64-3.1.2/xbase64-config.in.BAD xbase64-3.1.2/xbase64-config.in
--- xbase64-3.1.2/xbase64-config.in.BAD	2009-08-19 22:58:42.081087534 -0400
+++ xbase64-3.1.2/xbase64-config.in	2009-08-19 22:58:45.604090002 -0400
@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
 exec_prefix_set=no
 CC="@CC@"
 CXX="@CXX@"
-LD="@SHARED_LD@"
+LD="@LD@"
 
 usage="\
 Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"

xbase-3.1.2-gcc44.patch:
 xbase64.cpp |    2 ++
 xblock.cpp  |    2 ++
 2 files changed, 4 insertions(+)

--- NEW FILE xbase-3.1.2-gcc44.patch ---
diff -up xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 xbase64-3.1.2/xbase64/xbase64.cpp
--- xbase64-3.1.2/xbase64/xbase64.cpp.gcc44	2006-07-17 12:54:42.000000000 -0400
+++ xbase64-3.1.2/xbase64/xbase64.cpp	2009-08-19 23:08:14.724079392 -0400
@@ -66,6 +66,8 @@
 #include <dos.h>
 #endif
 
+#include <cerrno>
+
 
 /*! \file xbase64.cpp
 */
diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc44 xbase64-3.1.2/xbase64/xblock.cpp
--- xbase64-3.1.2/xbase64/xblock.cpp.gcc44	2009-08-19 23:08:59.408186578 -0400
+++ xbase64-3.1.2/xbase64/xblock.cpp	2009-08-19 23:09:11.416184844 -0400
@@ -65,6 +65,8 @@
 //#include <stdio.h>
 //#include <stdlib.h>
 
+#include <cerrno>
+
 /*! \file xblock.cpp
 */
 #ifdef XB_LOCKING_ON

xbase-3.1.2-xbnode.patch:
 xbnode.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xbase-3.1.2-xbnode.patch ---
diff -up xbase64-3.1.2/xbase64/xbnode.cpp.BAD xbase64-3.1.2/xbase64/xbnode.cpp
--- xbase64-3.1.2/xbase64/xbnode.cpp.BAD	2009-08-19 23:10:38.444059289 -0400
+++ xbase64-3.1.2/xbase64/xbnode.cpp	2009-08-19 23:10:47.348202984 -0400
@@ -1,4 +1,4 @@
-#include "xbNode.h"
+#include "xbnode.h"
 
 void xbNodeLink::AddNode(xbNodeLink* node)
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xbase/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jul 2005 14:54:32 -0000	1.2
+++ .cvsignore	20 Aug 2009 03:46:20 -0000	1.3
@@ -1 +1 @@
-xbase-2.0.0.tar.gz
+xbase64-3.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xbase/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jul 2005 14:54:32 -0000	1.2
+++ sources	20 Aug 2009 03:46:20 -0000	1.3
@@ -1 +1 @@
-9b29362031716a12491beb9f8cc882f2  xbase-2.0.0.tar.gz
+7f3a727c142b4339faa781e1f6d5871c  xbase64-3.1.2.tar.gz


Index: xbase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xbase/devel/xbase.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xbase.spec	27 Jul 2009 07:36:20 -0000	1.14
+++ xbase.spec	20 Aug 2009 03:46:20 -0000	1.15
@@ -1,18 +1,18 @@
 Name:		xbase
 Summary: 	XBase compatible database library
-Version: 	2.0.0
-Release: 	15%{?dist}
+Version: 	3.1.2
+Release: 	1%{?dist}
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
 URL:		http://linux.techass.com/projects/xdb/
-Source0:	http://downloads.sourceforge.net/xdb/%{name}-%{version}.tar.gz
-Patch0:		xbase-2.0.0-fixconfig.patch
-Patch1:		xbase-2.0.0-fixheader.patch
+Source0:	http://downloads.sourceforge.net/xdb/%{name}64-%{version}.tar.gz
+Patch0:		xbase-3.1.2-fixconfig.patch
+Patch1:		xbase-3.1.2-gcc44.patch
 Patch2:		xbase-2.0.0-ppc.patch
-Patch3:         xbase-2.0.0-gcc43.patch
-Patch4:		xbase-2.0.0-x86_64.patch
+Patch3:		xbase-3.1.2-xbnode.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	doxygen
+BuildRequires:	doxygen, libtool
+Provides:	xbase64 = %{version}-%{release}
 
 %description
 XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library
@@ -28,6 +28,7 @@ OS's.
 Summary: XBase development libraries and headers
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: xbase64-devel = %{version}-%{release}
 
 %description devel
 Headers and libraries for compiling programs that use the XBase library.
@@ -36,6 +37,7 @@ Headers and libraries for compiling prog
 Summary: XBase utilities / tools
 Group: Applications/Databases
 License: GPLv2+
+Provides: xbase64-utils = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 %description utils
@@ -47,14 +49,16 @@ reindex (rebuild an index), undelall (un
 zap (remove all records from a DBF file).
 
 %prep
-%setup -q
+%setup -q -n %{name}64-%{version}
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .gcc44
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
+touch AUTHORS README NEWS
+cp -p copying COPYING
+autoreconf -i
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -64,8 +68,18 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Fix files for multilib
-touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/xbase-config
-touch -r NEWS docs/html/*.html
+touch -r COPYING $RPM_BUILD_ROOT%{_bindir}/xbase-config
+touch -r COPYING docs/html/*.html
+
+pushd $RPM_BUILD_ROOT%{_libdir}
+ln -s libxbase64.so.1.0.0 libxbase.so.1.0.0
+ln -s libxbase64.so.1 libxbase.so.1
+ln -s libxbase64.so libxbase.so
+popd
+
+pushd $RPM_BUILD_ROOT%{_includedir}
+ln -s xbase64 xbase
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,15 +90,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, 0755)
-%doc NEWS README TODO AUTHORS COPYING ChangeLog
+%doc COPYING ChangeLog
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc docs/html
-%{_includedir}/xbase
-%{_bindir}/xbase-config
-%{_libdir}/libxbase.so
+%{_includedir}/xbase*
+%{_bindir}/xbase*-config
+%{_libdir}/libxbase*.so
 
 %files utils
 %defattr(-, root, root, 0755)
@@ -101,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/dbfutil1
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.2-1
+- update to 3.1.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Thu Aug 20 03:46:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 03:46:49 +0000 (UTC)
Subject: rpms/xbsql/devel xbsql.spec,1.11,1.12
Message-ID: <20090820034649.AC5B611C00E4@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xbsql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26679

Modified Files:
	xbsql.spec 
Log Message:
rebuild against new xbase


Index: xbsql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xbsql/devel/xbsql.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xbsql.spec	20 Aug 2009 03:46:00 -0000	1.11
+++ xbsql.spec	20 Aug 2009 03:46:49 -0000	1.12
@@ -58,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
-* Wed aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-14
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-14
 - update for new xbase
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-13



From alexlan at fedoraproject.org  Thu Aug 20 04:12:22 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 20 Aug 2009 04:12:22 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.77,1.78
Message-ID: <20090820041222.E96DC11C006E@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19142

Modified Files:
	octave-forge.spec 
Log Message:
- More build failures: remove java, report upstream as (yet) another
  broken package.



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- octave-forge.spec	20 Aug 2009 03:14:19 -0000	1.77
+++ octave-forge.spec	20 Aug 2009 04:12:22 -0000	1.78
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -95,7 +95,8 @@ 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
+# temporarily disable: doesn't yet build
+# Provides: octave-java = 1.2.6
 # octave-jhandles is removed
 Provides: octave-mapping = 1.0.7
 Provides: octave-msh = 0.1.1
@@ -147,6 +148,9 @@ rm main/ftp-*.tar.gz
 rm main/parallel-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
+# 9. exclude java --  doesn't build against Octave 3.2
+rm extra/java-*.tar.gz
+
 
 #Unpack everything
 for pkg in main extra language
@@ -241,6 +245,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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.



From alexlan at fedoraproject.org  Thu Aug 20 04:33:54 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 20 Aug 2009 04:33:54 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-java-build.patch, NONE,
	1.1 octave-forge.spec, 1.78, 1.79
Message-ID: <20090820043354.DF66811C006E@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23744

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-java-build.patch 
Log Message:
* 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


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)


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- octave-forge.spec	20 Aug 2009 04:12:22 -0000	1.78
+++ octave-forge.spec	20 Aug 2009 04:33:54 -0000	1.79
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -21,6 +21,7 @@ Source0:        %{name}-bundle-%{version
 Patch0:		octave-forge-20090607-includes.patch
 Patch1:		octave-forge-20090607-ann-swig-build.patch
 Patch2:		octave-forge-20090607-parallel-build.patch
+Patch3:		octave-forge-20090607-java-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -96,7 +97,7 @@ Provides: octave-generate_html = 0.0.9
 # Provides: octave-graceplot = 1.0.8
 Provides: octave-integration = 1.0.7
 # temporarily disable: doesn't yet build
-# Provides: octave-java = 1.2.6
+Provides: octave-java = 1.2.6
 # octave-jhandles is removed
 Provides: octave-mapping = 1.0.7
 Provides: octave-msh = 0.1.1
@@ -116,7 +117,8 @@ Provides: octave-tsa = 4.0.1
 Provides: octave-xraylib = 1.0.8
 
 # Language
-Provides: octave-spanish = 1.0.1
+# temporarily disable, doesn't build
+# Provides: octave-spanish = 1.0.1
 Provides: octave-pt_br = 1.0.8
 
 
@@ -149,8 +151,9 @@ rm main/parallel-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
 # 9. exclude java --  doesn't build against Octave 3.2
-rm extra/java-*.tar.gz
-
+#rm extra/java-*.tar.gz
+# 10. exclude spanish -- doesn't build against Octave 3.2
+rm language/spanish-*.tar.gz
 
 #Unpack everything
 for pkg in main extra language
@@ -172,6 +175,7 @@ done
 %patch1 -p0
 #disable patch for the moment, not building 'parallel'
 #patch2 -p0
+%patch3 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -245,6 +249,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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.



From emaldonado at fedoraproject.org  Thu Aug 20 04:35:38 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 04:35:38 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.1,1.2
Message-ID: <20090820043538.4797911C006E@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24192

Modified Files:
	nss-util.spec 
Log Message:
nss-util-devel obsoletes nss-devel < nss-3.12.3.99.8


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-util.spec	19 Aug 2009 22:36:19 -0000	1.1
+++ nss-util.spec	20 Aug 2009 04:35:38 -0000	1.2
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-Release:          8%{?dist}
+Release:          8.1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -43,6 +43,7 @@ Utilities for Network Security Services 
 %package devel
 Summary:          Development libraries for Network Security Services Utilities
 Group:            Development/Libraries
+Obsoletes:        nss-devel < 3.12.3.99.3-8
 Requires:         nss-util = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
@@ -206,5 +207,8 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
-* Thu Aug 13 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
+* Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8.1
+- nss-util-devel obsoletes nss-devel < 3.12.3.99.3-8
+
+* Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
 - Initial build



From akurtakov at fedoraproject.org  Thu Aug 20 04:42:19 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 04:42:19 +0000 (UTC)
Subject: rpms/jakarta-commons-configuration/devel
	commons-configuration-1.4-build_xml.patch, NONE,
	1.1 jakarta-commons-configuration.spec, NONE,
	1.1 commons-configuration-1.4.pom, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090820044219.5655011C0381@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-configuration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25600/devel

Modified Files:
	sources .cvsignore 
Added Files:
	commons-configuration-1.4-build_xml.patch 
	jakarta-commons-configuration.spec 
	commons-configuration-1.4.pom 
Log Message:
Initial import.

commons-configuration-1.4-build_xml.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE commons-configuration-1.4-build_xml.patch ---
diff -up ./build.xml.sav ./build.xml
--- ./build.xml.sav	2008-04-09 17:21:25.000000000 -0400
+++ ./build.xml	2008-04-09 17:24:18.000000000 -0400
@@ -97,13 +97,13 @@
     </copy>
   </target>
 
-  <target name="jar" description="o Create the jar" depends="compile,test">
+  <target name="jar" description="o Create the jar" depends="compile">
     <mkdir dir="${classesdir}/META-INF"/>
     <copy file="LICENSE.txt" todir="${metadir}"/>
     <copy file="NOTICE.txt" todir="${metadir}"/>
-    <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>
+    <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>
     <jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"
-       manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
+       manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
     </jar>
   </target>
   <target name="clean" description="o Clean up the generated directories">
@@ -280,4 +280,4 @@
     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
     </unjar>
   </target>
-</project>
\ No newline at end of file
+</project>


--- NEW FILE jakarta-commons-configuration.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define base_name commons-configuration

Name:           jakarta-commons-configuration
Version:        1.4
Release:        6%{?dist}
Epoch:          0
Summary:        Commons Configuration Package

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://commons.apache.org/configuration/
Source0:        http://archive.apache.org/dist/commons/configuration/source/commons-configuration-1.4-src.tar.gz
Source1:        http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.pom

Patch0:         commons-configuration-1.4-build_xml.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel
BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  junit
BuildRequires:  ant >= 0:1.6

BuildRequires:  xalan-j2
#
BuildRequires:  jakarta-commons-beanutils >= 0:1.7.0
BuildRequires:  jakarta-commons-codec
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-dbcp
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-jxpath
BuildRequires:  jakarta-commons-lang
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-pool
BuildRequires:  servletapi5
BuildRequires:  xerces-j2
BuildRequires:  xml-commons-apis
BuildRequires:  dos2unix

Requires:  jakarta-commons-beanutils >= 0:1.7.0
Requires:  jakarta-commons-codec
Requires:  jakarta-commons-collections
Requires:  jakarta-commons-dbcp
Requires:  jakarta-commons-digester
Requires:  jakarta-commons-jxpath
Requires:  jakarta-commons-lang
Requires:  jakarta-commons-logging
Requires:  jakarta-commons-pool
Requires:  servletapi5
Requires:  xerces-j2
Requires:  xml-commons-apis

Requires(post):   jpackage-utils >= 1.7.2
Requires(postun): jpackage-utils >= 1.7.2

%description
Configuration is a project to provide a generic Configuration
interface and allow the source of the values to vary. It
provides easy typed access to single, as well as lists of
configuration values based on a 'key'.
Right now you can load properties from a simple properties
file, a properties file in a jar, an XML file, JNDI settings,
as well as use a mix different sources using a
ConfigurationFactory and CompositeConfiguration.
Custom configuration objects are very easy to create now
by just subclassing AbstractConfiguration. This works
similar to how AbstractList works.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description    javadoc
Javadoc for %{name}


%prep
%setup -q -n %{base_name}-%{version}-src
%patch0 -b .sav
dos2unix LICENSE.txt

%build
export CLASSPATH=$(build-classpath \
servletapi5 \
commons-beanutils \
commons-codec \
commons-collections \
commons-dbcp \
commons-digester \
commons-jxpath \
commons-lang \
commons-pool \
hsqldb \
commons-logging \
):target/classes:target/test-classes:target/conf
ant -Dbuild.sysclasspath=only jar javadoc

%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 644 target/%{base_name}-%{version}.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}/%{base_name}-%{version}.jar
ln -s %{base_name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar

install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# Install pom
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap commons-configuration commons-configuration %{version} JPP %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_datadir}/maven2
%{_mavendepmapfragdir}
%doc LICENSE.txt
%{_javadir}/*.jar

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}


%changelog
* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-6
- Remove gcj support.
- Initial build for Fedora.

* Mon May 18 2009 Fernando Nasser <fnasser at redhat.com> - 0:1.4-5
- Fix license
- Fix source URL

* Wed Mar 18 2009 Yong Yang <yyang at redhat.com> - 0:1.4-4
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.4-3
- Fix release tag

* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 0:1.4-2jpp
- Import from dbhole's maven 2.0.8 packages, initial building

* Mon Aug 13 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
- Upgrade to 1.4
- Add pom file

* Thu May 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-3jpp
- Patch one test

* Wed Mar 07 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
- Add gcj_support option
- Optionally build without maven

* Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- Upgrade to 1.2

* Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1-2jpp
- Rebuild for JPP-1.7 and maven-1.1

* Thu Sep 15 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
- Upgrade to 1.1
- Omit findbugs and tasks reports: don't have these plugins yet
- Requires java 1.4.2 to build

* Mon Feb 21 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0.f-1jpp
- Upgrade to 1.0 final, letter in version can be bumped with 1.1
- Prepare for build with maven, but still build with ant

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0.d3-2jpp
- Rebuild with ant-1.6.2
- Upgrade to Ant 1.6.X
* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.d3-1jpp
- First JPackage release


--- NEW FILE commons-configuration-1.4.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-configuration</groupId>
  <artifactId>commons-configuration</artifactId>
  <name>Commons Configuration</name>
  <version>1.4</version>
  <description>Tools to assist in the reading of configuration/preferences files in
    various formats</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/jira/browse/CONFIGURATION</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>dlr</id>
      <name>Daniel Rall</name>
      <email>dlr at finemaltcoding.com</email>
      <organization>CollabNet, Inc.</organization>
    </developer>
    <developer>
      <id>jvanzyl</id>
      <name>Jason van Zyl</name>
      <email>jason at zenplex.com</email>
      <organization>Zenplex</organization>
    </developer>
    <developer>
      <id>mpoeschl</id>
      <name>Martin Poeschl</name>
      <email>mpoeschl at marmot.at</email>
      <organization>tucana.at</organization>
    </developer>
    <developer>
      <id>dion</id>
      <name>dIon Gillard</name>
      <email>dion at multitask.com.au</email>
      <organization>Multitask Consulting</organization>
    </developer>
    <developer>
      <id>henning</id>
      <name>Henning P. Schmiedehausen</name>
      <email>hps at intermeta.de</email>
      <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
      <timezone>2</timezone>
    </developer>
    <developer>
      <id>epugh</id>
      <name>Eric Pugh</name>
      <email>epugh at upstate.com</email>
      <organization>upstate.com</organization>
    </developer>
    <developer>
      <id>bdunbar</id>
      <name>Brian E. Dunbar</name>
      <email>bdunbar at dunbarconsulting.org</email>
      <organization>dunbarconsulting.org</organization>
    </developer>
    <developer>
      <id>ebourg</id>
      <name>Emmanuel Bourg</name>
      <email>smanux at lfjr.net</email>
    </developer>
    <developer>
      <id>oheger</id>
      <name>Oliver Heger</name>
      <email>oheger at apache.org</email>
      <organization>Agfa HealthCare</organization>
      <timezone>+1</timezone>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>J?rg Schaible</name>
      <email>joerg.schaible at gmx.de</email>
      <organization>Elsag-Solutions AG</organization>
      <timezone>+1</timezone>
    </contributor>
    <contributor>
      <name>Konstantin Shaposhnikov</name>
      <email>ksh at scand.com</email>
      <organization>scand.com</organization>
    </contributor>
    <contributor>
      <name>Jamie M. Guillemette</name>
      <email>JMGuillemette at gmail.com</email>
      <organization>TD Bank</organization>
    </contributor>
    <contributor>
      <name>Jorge Ferrer</name>
      <email>jorge.ferrer at gmail.com</email>
      <organization></organization>
    </contributor>
    <contributor>
      <name>Gabriele Garuglieri</name>
      <email>gabriele.garuglieri at infoblu.it</email>
      <organization>Infoblu S.p.A</organization>
    </contributor>
    <contributor>
      <name>Nicolas De Loof</name>
      <email>nicolas.deloof at gmail.com</email>
      <organization>capgemini</organization>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <directory>conf</directory>
        <includes>
          <include>digesterRules.xml</include>
          <include>properties.dtd</include>
        </includes>
      </resource>
      <resource>
        <targetPath>META-INF</targetPath>
        <directory>${basedir}</directory>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>conf</directory>
        <includes>
          <include>*.xml</include>
        </includes>
      </testResource>
      <testResource>
        <directory>conf</directory>
        <includes>
          <include>testClasspath.properties</include>
          <include>testdb.script</include>
          <include>*.properties</include>
          <include>*.dtd</include>
        </includes>
      </testResource>
      <testResource>
        <targetPath>org/apache/commons/configuration</targetPath>
        <directory>conf</directory>
        <includes>
          <include>test.properties</include>
          <include>include.properties</include>
        </includes>
      </testResource>
      <testResource>
        <targetPath>config</targetPath>
        <directory>conf/config</directory>
        <includes>
          <include>**/*.properties</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*Test*.java</include>
          </includes>
          <excludes>
            <exclude>**/TestBasePropertiesConfiguration.java</exclude>
            <exclude>**/NonStringTestHolder.java</exclude>
            <exclude>**/TestAbstractConfiguration.java</exclude>
            <exclude>**/AbstractXPathTest.java</exclude>
            <exclude>**/AbstractCombinerTest.java</exclude>
            <exclude>**/AbstractTestConfigurationEvents.java</exclude>
            <exclude>**/AbstractTestFileConfigurationEvents.java</exclude>
          </excludes>
        </configuration>
      </plugin>
      <plugin>
        <groupId>maven-plugins</groupId>
        <artifactId>maven-tasks-plugin</artifactId>
        <version>1.1.0</version>
        <configuration />
      </plugin>
      <plugin>
        <groupId>maven-plugins</groupId>
        <artifactId>maven-findbugs-plugin</artifactId>
        <version>0.8.4</version>
        <configuration />
      </plugin>
      <plugin>
        <groupId>maven-plugins</groupId>
        <artifactId>maven-cobertura-plugin</artifactId>
        <version>1.2</version>
        <configuration />
      </plugin>
      <plugin>
        <artifactId>maven-changes-plugin</artifactId>
        <version>1.6</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.6 (minimum)
              required for building the site documentation.</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-xdoc-plugin</artifactId>
        <version>1.9.2</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)
              required for building the site documentation.</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-scm-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jdiff-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment>&lt;strong>Site Only&lt;/strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>3.2</version>
    </dependency>
    <dependency>
      <groupId>commons-lang</groupId>
      <artifactId>commons-lang</artifactId>
      <version>2.3</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging-api</artifactId>
      <version>1.0.4</version>
    </dependency>
    <dependency>
      <groupId>commons-digester</groupId>
      <artifactId>commons-digester</artifactId>
      <version>1.8</version>
    </dependency>
    <dependency>
      <groupId>commons-beanutils</groupId>
      <artifactId>commons-beanutils-core</artifactId>
      <version>1.7.0</version>
    </dependency>
    <dependency>
      <groupId>commons-codec</groupId>
      <artifactId>commons-codec</artifactId>
      <version>1.3</version>
    </dependency>
    <dependency>
      <groupId>commons-jxpath</groupId>
      <artifactId>commons-jxpath</artifactId>
      <version>1.2</version>
    </dependency>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xerces</artifactId>
      <version>2.2.1</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>xalan</groupId>
      <artifactId>xalan</artifactId>
      <version>2.7.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>1.0.b2</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>servletapi</groupId>
      <artifactId>servletapi</artifactId>
      <version>2.4</version>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>commons-dbcp</groupId>
      <artifactId>commons-dbcp</artifactId>
      <version>1.2.2</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>commons-pool</groupId>
      <artifactId>commons-pool</artifactId>
      <version>1.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>hsqldb</groupId>
      <artifactId>hsqldb</artifactId>
      <version>1.7.2.2</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>dbunit</groupId>
      <artifactId>dbunit</artifactId>
      <version>2.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>junit-addons</groupId>
      <artifactId>junit-addons</artifactId>
      <version>1.4</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>mockobjects</groupId>
      <artifactId>mockobjects-core</artifactId>
      <version>0.09</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>mockobjects</groupId>
      <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
      <version>0.09</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>www.apache.org//www/www.apache.org/dist/java-repository/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
    <status>converted</status>
  </distributionManagement>
</project>

Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-configuration/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 May 2009 23:51:00 -0000	1.1
+++ sources	20 Aug 2009 04:42:18 -0000	1.2
@@ -0,0 +1 @@
+02a2d151958d5d3006da88353736f6c4  commons-configuration-1.4-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-configuration/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 May 2009 23:51:00 -0000	1.1
+++ .cvsignore	20 Aug 2009 04:42:19 -0000	1.2
@@ -0,0 +1 @@
+commons-configuration-1.4-src.tar.gz



From bskeggs at fedoraproject.org  Thu Aug 20 05:14:50 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 20 Aug 2009 05:14:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.40,
	1.41 nouveau-bicubic-2x.patch, 1.7,
	1.8 nouveau-multiple-xserver.patch, 1.9,
	1.10 nouveau-transition-hack.patch, 1.10, 1.11 sources, 1.41,
	1.42 xorg-x11-drv-nouveau.spec, 1.50, 1.51
Message-ID: <20090820051450.4B31A11C006E@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv384

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090810gitfe2b5e6
- various fixes from upstream, build pending new xorg-x11-server update




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	11 Aug 2009 05:56:20 -0000	1.40
+++ .cvsignore	20 Aug 2009 05:14:49 -0000	1.41
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090810git85b1c86.tar.bz2
+xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.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/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-bicubic-2x.patch	11 Aug 2009 05:56:20 -0000	1.7
+++ nouveau-bicubic-2x.patch	20 Aug 2009 05:14:49 -0000	1.8
@@ -1,4 +1,4 @@
-From 58dffb9cb3dc7a59de6f75d585eade46379fe3f0 Mon Sep 17 00:00:00 2001
+From 6c5e207795dd9039d163ff25e3ac4daf78503de5 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 3/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-multiple-xserver.patch	11 Aug 2009 05:56:20 -0000	1.9
+++ nouveau-multiple-xserver.patch	20 Aug 2009 05:14:49 -0000	1.10
@@ -1,4 +1,4 @@
-From c0f1f35be5e2060793a2f63bd2da8ffce5300842 Mon Sep 17 00:00:00 2001
+From 5fe2f30825888a714ba5e68af3182b60c40de1f9 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

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-transition-hack.patch	11 Aug 2009 05:56:21 -0000	1.10
+++ nouveau-transition-hack.patch	20 Aug 2009 05:14:49 -0000	1.11
@@ -1,4 +1,4 @@
-From b6008818340b477344f5e4420c6e95e21ce8c8bd Mon Sep 17 00:00:00 2001
+From 740c4ee30f4886dd2af36aa25137ad05862a273c Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
@@ -8,10 +8,10 @@ Subject: [PATCH 2/3] f12: transitions
  1 files changed, 169 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 3f04be1..2220d04 100644
+index e7c20a8..27a2e09 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -172,6 +172,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -183,6 +183,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
  }
  
  static void
@@ -178,7 +178,7 @@ index 3f04be1..2220d04 100644
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -184,6 +344,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -195,6 +355,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	if (!src_id || !dst_id)
  		return;
  
@@ -193,7 +193,7 @@ index 3f04be1..2220d04 100644
  	pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
  	if (!pspix)
  		return;
-@@ -285,8 +453,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -296,8 +464,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		x = 0;
  		y = 0;
  	} else


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	11 Aug 2009 05:56:21 -0000	1.41
+++ sources	20 Aug 2009 05:14:49 -0000	1.42
@@ -1 +1 @@
-fb94b12b8909f306d12244cddcd814ac  xf86-video-nouveau-0.0.15-20090810git85b1c86.tar.bz2
+d4c67bb03a03a3c4adf16f732c258f3a  xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-nouveau.spec	11 Aug 2009 05:56:21 -0000	1.50
+++ xorg-x11-drv-nouveau.spec	20 Aug 2009 05:14:49 -0000	1.51
@@ -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 20090810
-%define git_version 85b1c86
+%define gitdate 20090819
+%define git_version fe2b5e6
 
 %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:   3.%{snapshot}%{?dist}
+Release:   4.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,13 +31,13 @@ Source0:   %{tarfile}
 ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
-BuildRequires: xorg-x11-server-devel >= 1.6.99-29
+BuildRequires: xorg-x11-server-devel > 1.6.99-36
 BuildRequires: libdrm-devel >= 2.4.12-0.4
 BuildRequires: mesa-libGL-devel
 BuildRequires: kernel-headers >= 2.6.31
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg >= 1.6.99-29
+Requires:  xorg-x11-server-Xorg > 1.6.99-36
 Requires:  libdrm >= 2.4.12-0.4
 Requires:  kernel-drm-nouveau = 15
 
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090810gitfe2b5e6
+- various fixes from upstream, build pending new xorg-x11-server update
+
 * Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-3.20090810git85b1c86
 - wfb fixes, driver pixmaps enabled by default
 



From salimma at fedoraproject.org  Thu Aug 20 05:30:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:30:15 +0000 (UTC)
Subject: rpms/bti/EL-5 bti.spec,1.6,1.7
Message-ID: <20090820053015.61A8A11C0439@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836/EL-5

Modified Files:
	bti.spec 
Log Message:
Adjust build process to use bti's new configure system



Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/EL-5/bti.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bti.spec	20 Aug 2009 01:34:26 -0000	1.6
+++ bti.spec	20 Aug 2009 05:30:15 -0000	1.7
@@ -10,7 +10,7 @@ Source0:        http://www.kernel.org/pu
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel readline-devel libxml2-devel
+BuildRequires:  curl-devel readline-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -23,14 +23,13 @@ and fast manner to annoy the whole world
 
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p bti $RPM_BUILD_ROOT%{_bindir}/
-cp -p bti.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
 # bash completion
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bti-bashcompletion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/bti
@@ -42,11 +41,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
+%doc bti.example ChangeLog COPYING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%config %{_sysconfdir}/bash_completion.d
+%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
 %{_bindir}/bti
+%{_bindir}/bti-shrink-urls
 %{_mandir}/man1/*
 
 



From salimma at fedoraproject.org  Thu Aug 20 05:30:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:30:15 +0000 (UTC)
Subject: rpms/bti/devel bti.spec,1.9,1.10
Message-ID: <20090820053015.F3EE411C0439@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836/devel

Modified Files:
	bti.spec 
Log Message:
Adjust build process to use bti's new configure system



Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/devel/bti.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bti.spec	20 Aug 2009 01:44:47 -0000	1.9
+++ bti.spec	20 Aug 2009 05:30:15 -0000	1.10
@@ -7,10 +7,11 @@ Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.kernel.org/pub/linux/kernel/people/gregkh/bti
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
+Patch0:         bti-023-readline5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel compat-readline5-devel libxml2-devel
+BuildRequires:  curl-devel compat-readline5-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -20,18 +21,17 @@ and fast manner to annoy the whole world
 
 %prep
 %setup -q
+%patch0 -p1 -b .readline5
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/readline5" \
-  LDFLAGS="-L%{_libdir}/readline5" make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags} LDFLAGS="-L%{_libdir}/readline5"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p bti $RPM_BUILD_ROOT%{_bindir}/
-cp -p bti.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
 # bash completion
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bti-bashcompletion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/bti
@@ -43,11 +43,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
+%doc bti.example ChangeLog COPYING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%config %{_sysconfdir}/bash_completion.d
+%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
 %{_bindir}/bti
+%{_bindir}/bti-shrink-urls
 %{_mandir}/man1/*
 
 



From salimma at fedoraproject.org  Thu Aug 20 05:30:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:30:15 +0000 (UTC)
Subject: rpms/bti/F-10 bti.spec,1.6,1.7
Message-ID: <20090820053015.9345F11C04D9@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836/F-10

Modified Files:
	bti.spec 
Log Message:
Adjust build process to use bti's new configure system



Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-10/bti.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bti.spec	20 Aug 2009 01:34:27 -0000	1.6
+++ bti.spec	20 Aug 2009 05:30:15 -0000	1.7
@@ -10,7 +10,7 @@ Source0:        http://www.kernel.org/pu
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel readline-devel libxml2-devel
+BuildRequires:  curl-devel readline-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -23,14 +23,13 @@ and fast manner to annoy the whole world
 
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p bti $RPM_BUILD_ROOT%{_bindir}/
-cp -p bti.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
 # bash completion
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bti-bashcompletion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/bti
@@ -42,11 +41,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
+%doc bti.example ChangeLog COPYING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%config %{_sysconfdir}/bash_completion.d
+%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
 %{_bindir}/bti
+%{_bindir}/bti-shrink-urls
 %{_mandir}/man1/*
 
 



From salimma at fedoraproject.org  Thu Aug 20 05:30:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:30:15 +0000 (UTC)
Subject: rpms/bti/F-11 bti.spec,1.7,1.8
Message-ID: <20090820053015.CC78D11C0439@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836/F-11

Modified Files:
	bti.spec 
Log Message:
Adjust build process to use bti's new configure system



Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/F-11/bti.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bti.spec	20 Aug 2009 01:34:27 -0000	1.7
+++ bti.spec	20 Aug 2009 05:30:15 -0000	1.8
@@ -10,7 +10,7 @@ Source0:        http://www.kernel.org/pu
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel readline-devel libxml2-devel
+BuildRequires:  curl-devel readline-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -23,14 +23,13 @@ and fast manner to annoy the whole world
 
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p bti $RPM_BUILD_ROOT%{_bindir}/
-cp -p bti.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
 # bash completion
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bti-bashcompletion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/bti
@@ -42,11 +41,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
+%doc bti.example ChangeLog COPYING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%config %{_sysconfdir}/bash_completion.d
+%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
 %{_bindir}/bti
+%{_bindir}/bti-shrink-urls
 %{_mandir}/man1/*
 
 



From pnemade at fedoraproject.org  Thu Aug 20 05:30:43 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 20 Aug 2009 05:30:43 +0000 (UTC)
Subject: rpms/hyphen-mr/devel hyph_mr_IN.dic, NONE, 1.1 hyphen-mr.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090820053043.00EA911C0348@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-mr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3174/devel

Added Files:
	hyph_mr_IN.dic hyphen-mr.spec import.log 
Log Message:
-Initial Fedora release




--- NEW FILE hyph_mr_IN.dic ---
UTF-8
%  Hyphenation for Marathi
%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
2?2
2?2
% Break before or after any independent vowel.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Break after any dependent vowel but not before.
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
% Break before or after any consonant.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Do not break before a final consonant or conjunct.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2????.
2????.
2????.
2????.
% Do not break before chandrabindu, anusvara, visarga, avagraha
% and accents.
2?
2?
2?
2?
2?
2?
% Do not break either side of virama (may be within conjunct).
2?2


--- NEW FILE hyphen-mr.spec ---
Name: hyphen-mr
Summary: Marathi hyphenation rules
%define upstreamid 20090813
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_mr_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Marathi hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- initial version


--- NEW FILE import.log ---
hyphen-mr-0_20090813-1_fc11:HEAD:hyphen-mr-0.20090813-1.fc11.src.rpm:1250746201



From salimma at fedoraproject.org  Thu Aug 20 05:41:18 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:41:18 +0000 (UTC)
Subject: rpms/bti/devel bti-023-readline5.patch,NONE,1.1
Message-ID: <20090820054118.5B41011C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5131

Added Files:
	bti-023-readline5.patch 
Log Message:
Include the patch needed to build against readline 5


bti-023-readline5.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bti-023-readline5.patch ---
--- bti-023/Makefile.in.readline5	2009-05-27 16:41:17.000000000 -0400
+++ bti-023/Makefile.in	2009-08-20 01:12:59.124938760 -0400
@@ -54,7 +54,7 @@
 bti_LDADD = $(LDADD)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. at am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I/usr/include/readline5
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \



From salimma at fedoraproject.org  Thu Aug 20 05:46:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:46:16 +0000 (UTC)
Subject: rpms/python-sphinx/F-11 .cvsignore, 1.6, 1.7 python-sphinx.spec,
	1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090820054616.3C55311C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8110

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.2-1
- Update to 0.6.2 -- upstream bugfix requested inside bz#512438



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Jan 2009 18:35:34 -0000	1.6
+++ .cvsignore	20 Aug 2009 05:46:15 -0000	1.7
@@ -1 +1 @@
-Sphinx-0.5.1.tar.gz
+Sphinx-0.6.2.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-11/python-sphinx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-sphinx.spec	26 Feb 2009 23:33:07 -0000	1.10
+++ python-sphinx.spec	20 Aug 2009 05:46:15 -0000	1.11
@@ -4,19 +4,20 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        Python documentation generator
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://sphinx.pocoo.org/
 Source0:        http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Patch0:         %{name}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-docutils python-jinja python-setuptools
-Requires:       python-docutils python-jinja python-pygments
+BuildRequires:  python-devel python-docutils python-jinja2 python-setuptools
+Requires:       python-docutils python-jinja2 python-pygments
 
 
 %description
@@ -68,6 +69,7 @@ This package contains documentation in r
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
+%patch0 -p0 -b .setuptools
 
 
 %build
@@ -107,6 +109,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
+
+* Fri Jun 05 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-2
+- Add a patch to use our own setuptools package
+
+* Fri Apr 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Jan 2009 18:35:34 -0000	1.6
+++ sources	20 Aug 2009 05:46:16 -0000	1.7
@@ -1 +1 @@
-11456e362d75c1a4c5a5847921d3f4c7  Sphinx-0.5.1.tar.gz
+c8f79e171addc73342cc2e775dc78880  Sphinx-0.6.2.tar.gz



From salimma at fedoraproject.org  Thu Aug 20 05:53:56 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 05:53:56 +0000 (UTC)
Subject: rpms/bti/devel bti-023-readline5.patch,1.1,1.2
Message-ID: <20090820055356.8032111C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9444

Modified Files:
	bti-023-readline5.patch 
Log Message:
Commit the correct version of readline patch


bti-023-readline5.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: bti-023-readline5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bti/devel/bti-023-readline5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bti-023-readline5.patch	20 Aug 2009 05:41:18 -0000	1.1
+++ bti-023-readline5.patch	20 Aug 2009 05:53:56 -0000	1.2
@@ -1,5 +1,5 @@
 --- bti-023/Makefile.in.readline5	2009-05-27 16:41:17.000000000 -0400
-+++ bti-023/Makefile.in	2009-08-20 01:12:59.124938760 -0400
++++ bti-023/Makefile.in	2009-08-20 01:51:23.388938140 -0400
 @@ -54,7 +54,7 @@
  bti_LDADD = $(LDADD)
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -9,3 +9,12 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -105,7 +105,7 @@
+ LIBCURL = @LIBCURL@
+ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lreadline
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@



From pnemade at fedoraproject.org  Thu Aug 20 06:02:01 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 20 Aug 2009 06:02:01 +0000 (UTC)
Subject: rpms/hyphen-bn/devel hyph_bn_IN.dic, NONE, 1.1 hyphen-bn.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090820060201.C62D611C006E@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-bn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12152/devel

Added Files:
	hyph_bn_IN.dic hyphen-bn.spec import.log 
Log Message:
- Initial Fedora Release



--- NEW FILE hyph_bn_IN.dic ---
UTF-8
%  Hyphenation for Bengali
%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
2?2
2?2
% Break before or after any independent vowel.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Break after any dependent vowel, but not before.
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
% Break before or after any consonant.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Do not break after khanda ta.
1?2
% Do not break before a final consonant or conjunct.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2???.
2???.
2???.
2???.
% Do not break before chandrabindu, anusvara, visarga, avagraha,
% nukta and au length mark.
2?
2?
2?
2?
2?
2?
% Do not break either side of virama (may be within conjunct).
2?2


--- NEW FILE hyphen-bn.spec ---
Name: hyphen-bn
Summary: Bengali hyphenation rules
%define upstreamid 20090813
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_bn_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch
Requires: hyphen

%description
Bengali hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
bn_IN_aliases="bn_BD"
for lang in $bn_IN_aliases; do
        ln -s hyph_bn_IN.dic hyph_$lang.dic
done
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- initial version


--- NEW FILE import.log ---
hyphen-bn-0_20090813-1_fc11:HEAD:hyphen-bn-0.20090813-1.fc11.src.rpm:1250748302



From salimma at fedoraproject.org  Thu Aug 20 06:03:04 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 06:03:04 +0000 (UTC)
Subject: rpms/python-sphinx/F-11 python-sphinx-setuptools.patch,NONE,1.1
Message-ID: <20090820060304.7C3EB11C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12427

Added Files:
	python-sphinx-setuptools.patch 
Log Message:
Include patch for F-11 branch


python-sphinx-setuptools.patch:
 setup.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE python-sphinx-setuptools.patch ---
--- setup.py.orig	2009-06-05 07:42:36.000000000 -0400
+++ setup.py	2009-06-05 07:42:40.000000000 -0400
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import ez_setup
-ez_setup.use_setuptools()
 
 import os
 import sys



From bskeggs at fedoraproject.org  Thu Aug 20 06:23:07 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 20 Aug 2009 06:23:07 +0000 (UTC)
Subject: rpms/libdrm/devel .cvsignore, 1.25, 1.26 libdrm.spec, 1.83,
	1.84 sources, 1.25, 1.26
Message-ID: <20090820062307.9E53211C006E@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16446

Modified Files:
	.cvsignore libdrm.spec sources 
Log Message:
* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.12-0.8
- rebase to new libdrm snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	6 Aug 2009 09:15:09 -0000	1.25
+++ .cvsignore	20 Aug 2009 06:23:05 -0000	1.26
@@ -1 +1 @@
-libdrm-20090806.tar.bz2
+libdrm-20090820.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- libdrm.spec	6 Aug 2009 09:15:09 -0000	1.83
+++ libdrm.spec	20 Aug 2009 06:23:05 -0000	1.84
@@ -1,9 +1,9 @@
-%define gitdate 20090806
+%define gitdate 20090820
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.12
-Release: 0.7%{?dist}
+Release: 0.8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.12-0.8
+- rebase to new libdrm snapshot
+
 * Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.7
 - rebase to new libdrm snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	6 Aug 2009 09:15:09 -0000	1.25
+++ sources	20 Aug 2009 06:23:05 -0000	1.26
@@ -1 +1 @@
-bb6ed358a4ee3e2520d582af19ec713c  libdrm-20090806.tar.bz2
+5809b178402f94c8ae1eadb9c3afdecb  libdrm-20090820.tar.bz2



From akurtakov at fedoraproject.org  Thu Aug 20 06:31:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 06:31:33 +0000 (UTC)
Subject: rpms/easymock/devel easymock.spec, NONE,
	1.1 easymock-component-info.xml, NONE,
	1.1 easymock-1.2_Java1.5.pom, NONE,
	1.1 easymock-1.2-build_xml.patch, NONE, 1.1 sources, 1.1,
	1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090820063133.87D4D11C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/easymock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18207/devel

Modified Files:
	sources .cvsignore 
Added Files:
	easymock.spec easymock-component-info.xml 
	easymock-1.2_Java1.5.pom easymock-1.2-build_xml.patch 
Log Message:
Initial import.


--- NEW FILE easymock.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:           easymock
Version:        1.2
Release:        9%{?dist}
Epoch:          0
Summary:        Easy mock objects
Group:          Development/Libraries
License:        MIT
URL:            http://www.easymock.org/
# cvs -d:pserver:anonymous at easymock.cvs.sourceforge.net:/cvsroot/easymock login
# cvs -z3 -d:pserver:anonymous at easymock.cvs.sourceforge.net:/cvsroot/easymock export -r EasyMock1_2_Java1_3 easymock
# tar czf easymock-1.2-src.tar.gz easymock
Source0:        easymock-1.2-src.tar.gz
Source1:        http://repo1.maven.org/maven2/easymock/easymock/1.2_Java1.5/easymock-1.2_Java1.5.pom
Source2:        easymock-component-info.xml
Patch0:         easymock-1.2-build_xml.patch
Requires(post): jpackage-utils >= 1.7.2
Requires(postun): jpackage-utils >= 1.7.2
BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  ant >= 0:1.6
BuildRequires:  ant-junit >= 0:1.6
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  java-devel >= 0:1.5.0
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
EasyMock provides Mock Objects for interfaces in JUnit tests by generating
them on the fly using Java's proxy mechanism. Due to EasyMock's unique style
of recording expectations, most refactorings will not affect the Mock Objects.
So EasyMock is a perfect fit for Test-Driven Development.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description    javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}
%patch0 -p0
mkdir lib
pushd lib
ln -sf $(build-classpath junit) .
popd

# We no longer ship a 1.3/1.4 VM, Set it to generic javahome
rm easymockbuild.properties
echo "java\ 1.3=%{java}" >> easymockbuild.properties
echo "java\ 1.4=%{java}" >> easymockbuild.properties
echo "java\ 1.5=%{java}" >> easymockbuild.properties
echo "java\ compiler=%{javac}" >> easymockbuild.properties

%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=
%{ant} -Dbuild.sysclasspath=first

%install
rm -rf $RPM_BUILD_ROOT

unzip -qq %{name}%{version}_Java1.3.zip
install -dm 755 $RPM_BUILD_ROOT%{_javadir}

install -pm 644 %{name}%{version}_Java1.3/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{name}%{version}_Java1.3/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# pom
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/
%add_to_maven_depmap easymock easymock %{version}_Java1.5 JPP easymock

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc %{name}%{version}_Java1.3/{Documentation,License}.html
%{_datadir}/maven2/*
%{_mavendepmapfragdir}/*
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Mon May 18 2009 Fernando Nasser <fnasser at redhat.com> 0:1.2-9
- Update instructions for obtaining source tar ball

* Mon May 04 2009 Yong Yang <yyang at redhat.com> 0:1.2-8
- Rebuild with maven2-2.0.8 built in non-bootstrap mode

* Wed Mar 18 2009 Yong Yang <yyang at redhat.com>  0:1.2-7
- merge from JPP-6
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.2-6
- fix component-info.xml

* Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.2-5
- remove unneeded maven flag

* Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.2-4
- add repolib

* Fri Jan 30 2009 Will Tatam <will.tatam at red61.com> 1.2-3.jpp5
- Inital JPP-5 Build

* Fri Jan 09 2009 Yong Yang <yyang at redhat.com> 1.2-2jpp.1
- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6

* Fri Apr 11 2008 Deepak Bhole <dbhole at redhat.com> 1.2-1jpp.1
- Import from JPackage
- Add pom file

* Fri Feb 24 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- Update to 1.2 keeping only java 1.4 requirement

* Fri Feb 24 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1-3jpp
- drop java-1.3.1 requirement

* Mon Oct 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-2jpp
- Fixed Url, Summary, Description and License

* Mon Oct 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
- First JPackage release


--- NEW FILE easymock-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="easymock"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="easymock.jar"/>
    <artifact id="easymockclassextension.jar"/>


    <export>
      <include input="easymockclassextension.jar"/>
      <include input="easymock.jar"/>

    </export>
  </component>
</project>


--- NEW FILE easymock-1.2_Java1.5.pom ---
<project>
    <modelVersion>4.0.0</modelVersion>
    <groupId>easymock</groupId>
    <artifactId>easymock</artifactId>
    <name>EasyMock 1.2_Java1.5</name>
    <version>1.2_Java1.5</version>
</project>

easymock-1.2-build_xml.patch:
 build.xml |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE easymock-1.2-build_xml.patch ---
--- build.xml.sav	2005-08-07 17:53:29.000000000 +0200
+++ build.xml	2006-02-24 16:25:45.000000000 +0100
@@ -17,7 +17,7 @@
 		<property name="clover build directory" value="${temp directory}/bin-clover" />
 		<property name="clover report directory" value="${temp directory}/clover" />
 
-		<property file="${user.home}/easymockbuild.properties" />
+		<property file="easymockbuild.properties" />
 		<property name="java 1.3" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.3/Commands/java" />
 		<property name="java 1.4" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Commands/java" />
 		<property name="java 1.5" value="" />
@@ -99,14 +99,16 @@
 	</junit>
 </target>
 
-<target name="test distribution" depends="test distribution 1.3, test distribution 1.4">
+<target name="test distribution" depends="test distribution 1.4">
 </target>
 
-<target name="all" depends="clean, build, javadoc, (clover), pack distribution, test distribution">
+<target name="all" depends="clean, build, javadoc, pack distribution, test distribution">
 <antcall target="clean" />
 </target>
 
+<!--
 <taskdef resource="clovertasks" />
+-->
 
 <target name="(clover)" depends="(init clover), (build for clover), (test clover), (clover html), (check full coverage),(delete clover build)">
 </target>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/easymock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 May 2009 23:54:20 -0000	1.1
+++ sources	20 Aug 2009 06:31:33 -0000	1.2
@@ -0,0 +1 @@
+f6a02c912ad98d485141d240faf68440  easymock-1.2-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/easymock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 May 2009 23:54:20 -0000	1.1
+++ .cvsignore	20 Aug 2009 06:31:33 -0000	1.2
@@ -0,0 +1 @@
+easymock-1.2-src.tar.gz



From pnemade at fedoraproject.org  Thu Aug 20 06:36:40 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 20 Aug 2009 06:36:40 +0000 (UTC)
Subject: rpms/hyphen-mr/F-11 hyph_mr_IN.dic, NONE, 1.1 hyphen-mr.spec, NONE,
	1.1
Message-ID: <20090820063640.6D70311C006E@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-mr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20084

Added Files:
	hyph_mr_IN.dic hyphen-mr.spec 
Log Message:
- Intitial release for F-11



--- NEW FILE hyph_mr_IN.dic ---
UTF-8
%  Hyphenation for Marathi
%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
2?2
2?2
% Break before or after any independent vowel.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Break after any dependent vowel but not before.
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
% Break before or after any consonant.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Do not break before a final consonant or conjunct.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2????.
2????.
2????.
2????.
% Do not break before chandrabindu, anusvara, visarga, avagraha
% and accents.
2?
2?
2?
2?
2?
2?
% Do not break either side of virama (may be within conjunct).
2?2


--- NEW FILE hyphen-mr.spec ---
Name: hyphen-mr
Summary: Marathi hyphenation rules
%define upstreamid 20090813
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_mr_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Marathi hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- initial version



From salimma at fedoraproject.org  Thu Aug 20 06:39:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 06:39:15 +0000 (UTC)
Subject: rpms/bti/EL-5 bti-023-editline.patch,NONE,1.1 bti.spec,1.7,1.8
Message-ID: <20090820063915.A7F7711C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/bti/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20696

Modified Files:
	bti.spec 
Added Files:
	bti-023-editline.patch 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
- Update to 023
- Build against libedit, since the version of readline shipped with RHEL5 is
  too old


bti-023-editline.patch:
 Makefile.in |    4 ++--
 bti.c       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bti-023-editline.patch ---
--- bti-023/Makefile.in.editline	2009-05-27 16:41:17.000000000 -0400
+++ bti-023/Makefile.in	2009-08-20 02:31:39.903685450 -0400
@@ -54,7 +54,7 @@
 bti_LDADD = $(LDADD)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. at am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I/usr/include/editline
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -105,7 +105,7 @@
 LIBCURL = @LIBCURL@
 LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -ledit -lcurses
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
--- bti-023/bti.c.editline	2009-05-27 16:40:23.000000000 -0400
+++ bti-023/bti.c	2009-08-20 02:32:43.088938899 -0400
@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <curl/curl.h>
-#include <readline/readline.h>
+#include <editline/readline.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>


Index: bti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bti/EL-5/bti.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- bti.spec	20 Aug 2009 05:30:15 -0000	1.7
+++ bti.spec	20 Aug 2009 06:39:15 -0000	1.8
@@ -7,10 +7,11 @@ Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.kernel.org/pub/linux/kernel/people/gregkh/bti
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
+Patch0:         bti-023-editline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel readline-devel libxml2-devel pcre-devel
+BuildRequires:  curl-devel libedit-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -20,6 +21,7 @@ and fast manner to annoy the whole world
 
 %prep
 %setup -q
+%patch0 -p1 -b .editline
 
 
 %build
@@ -53,12 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 19 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 023-1
 - Update to 023
+- Build against libedit, since the version of readline shipped with RHEL5 is
+  too old
 
 * Fri Mar 13 2009 Michel Salim <salimma at fedoraproject.org> - 015-1
 - Update to 015
 
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 014-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 23 2009 Michel Salim <salimma at fedoraproject.org> - 014-1
 - Update to 014
 



From pnemade at fedoraproject.org  Thu Aug 20 06:42:51 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Thu, 20 Aug 2009 06:42:51 +0000 (UTC)
Subject: rpms/hyphen-bn/F-11 hyph_bn_IN.dic, NONE, 1.1 hyphen-bn.spec, NONE,
	1.1
Message-ID: <20090820064251.61F8211C006E@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-bn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21366

Added Files:
	hyph_bn_IN.dic hyphen-bn.spec 
Log Message:
- Initiail Fedora Release



--- NEW FILE hyph_bn_IN.dic ---
UTF-8
%  Hyphenation for Bengali
%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
2?2
2?2
% Break before or after any independent vowel.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Break after any dependent vowel, but not before.
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
% Break before or after any consonant.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Do not break after khanda ta.
1?2
% Do not break before a final consonant or conjunct.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2???.
2???.
2???.
2???.
% Do not break before chandrabindu, anusvara, visarga, avagraha,
% nukta and au length mark.
2?
2?
2?
2?
2?
2?
% Do not break either side of virama (may be within conjunct).
2?2


--- NEW FILE hyphen-bn.spec ---
Name: hyphen-bn
Summary: Bengali hyphenation rules
%define upstreamid 20090813
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_bn_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch
Requires: hyphen

%description
Bengali hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
bn_IN_aliases="bn_BD"
for lang in $bn_IN_aliases; do
        ln -s hyph_bn_IN.dic hyph_$lang.dic
done
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Mon Aug 17 2009 Parag <pnemade at redhat.com> - 0.20090813-1
- initial version



From akurtakov at fedoraproject.org  Thu Aug 20 06:51:22 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 06:51:22 +0000 (UTC)
Subject: rpms/easymock/devel easymock.spec, 1.1,
	1.2 easymock-1.2-build_xml.patch, 1.1, 1.2
Message-ID: <20090820065122.DC07411C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/easymock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23007/devel

Modified Files:
	easymock.spec easymock-1.2-build_xml.patch 
Log Message:
- Disable tests.



Index: easymock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easymock/devel/easymock.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- easymock.spec	20 Aug 2009 06:31:33 -0000	1.1
+++ easymock.spec	20 Aug 2009 06:51:20 -0000	1.2
@@ -30,7 +30,7 @@
 
 Name:           easymock
 Version:        1.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Easy mock objects
 Group:          Development/Libraries
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-10
+- Disable tests.
+
 * Mon May 18 2009 Fernando Nasser <fnasser at redhat.com> 0:1.2-9
 - Update instructions for obtaining source tar ball
 

easymock-1.2-build_xml.patch:
 build.xml |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: easymock-1.2-build_xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/easymock/devel/easymock-1.2-build_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- easymock-1.2-build_xml.patch	20 Aug 2009 06:31:33 -0000	1.1
+++ easymock-1.2-build_xml.patch	20 Aug 2009 06:51:20 -0000	1.2
@@ -3,7 +3,7 @@
 @@ -17,7 +17,7 @@
  		<property name="clover build directory" value="${temp directory}/bin-clover" />
  		<property name="clover report directory" value="${temp directory}/clover" />
- 
+
 -		<property file="${user.home}/easymockbuild.properties" />
 +		<property file="easymockbuild.properties" />
  		<property name="java 1.3" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.3/Commands/java" />
@@ -12,19 +12,19 @@
 @@ -99,14 +99,16 @@
  	</junit>
  </target>
- 
+
 -<target name="test distribution" depends="test distribution 1.3, test distribution 1.4">
 +<target name="test distribution" depends="test distribution 1.4">
  </target>
- 
+
 -<target name="all" depends="clean, build, javadoc, (clover), pack distribution, test distribution">
-+<target name="all" depends="clean, build, javadoc, pack distribution, test distribution">
++<target name="all" depends="clean, build, javadoc, pack distribution">
  <antcall target="clean" />
  </target>
- 
+
 +<!--
  <taskdef resource="clovertasks" />
 +-->
- 
+
  <target name="(clover)" depends="(init clover), (build for clover), (test clover), (clover html), (check full coverage),(delete clover build)">
  </target>



From tagoh at fedoraproject.org  Thu Aug 20 07:09:48 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 20 Aug 2009 07:09:48 +0000 (UTC)
Subject: rpms/anthy/devel anthy-corpus.patch,NONE,1.1 anthy.spec,1.59,1.60
Message-ID: <20090820070948.98AB911C006E@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26997

Modified Files:
	anthy.spec 
Added Files:
	anthy-corpus.patch 
Log Message:
* Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
- Stop updating corpus at the build time to avoid creating different dictionary
  among arch. (#816563)

anthy-corpus.patch:
 corpus_info |95949 ++++++++++++++++++++++++++++++++++++++++++++----------------
 weak_words  |  777 
 2 files changed, 71592 insertions(+), 25134 deletions(-)

--- NEW FILE anthy-corpus.patch ---
diff -pruN anthy-9100h.orig/calctrans/corpus_info anthy-9100h/calctrans/corpus_info
--- anthy-9100h.orig/calctrans/corpus_info	2008-01-28 21:39:26.000000000 +0900
+++ anthy-9100h/calctrans/corpus_info	2009-08-20 15:52:24.000000000 +0900
@@ -1,24764 +1,70557 @@
-section anthy.trans_info 90368 8497 total_line_weight,count
-1, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,350
-1, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,88
-1, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1912
-1, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1838
-1, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,554
-1, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,7668
-1, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1006
-1, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-1, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,472
-1, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,56
-1, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,6070
-1, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,26
-1, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,736
-1, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1314
-1, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,100
-2, 20, 32, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-2, 20, 236, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-2, 26, 32, 543, 547, 548, 549, 1268, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 32, 543, 548, 549, 1429, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1395, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1429, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1573, 0, 0, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 547, 548, 549, 921, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 547, 548, 549, 1214, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 547, 548, 549, 1471, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 548, 549, 1112, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 548, 727, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 671, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 168, 543, 548, 549, 779, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 202, 543, 548, 1547, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 236, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 270, 543, 547, 548, 549, 1429, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 287, 543, 547, 548, 549, 1081, 0, 0, 0, 0, 0, 0,0,4
-2, 26, 287, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,2,2
-2, 26, 287, 543, 548, 549, 1338, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 33, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,4,0
-3, 23, 33, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,8,190
-3, 23, 67, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,0
-3, 23, 67, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,12
-3, 23, 84, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 84, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,2
-3, 23, 101, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 118, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,14
-3, 23, 135, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 152, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,4,6
-3, 23, 152, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 152, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,28
-3, 23, 169, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 203, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 220, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 237, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,32
-3, 23, 271, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 288, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,6
-3, 23, 288, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 544, 549, 954, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1018, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1066, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1082, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 960, 0, 0, 0, 0, 0, 0, 0, 0,4,0
-4, 22, 34, 542, 544, 970, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 544, 1018, 0, 0, 0, 0, 0, 0, 0, 0,6,8
-4, 22, 34, 542, 544, 1066, 0, 0, 0, 0, 0, 0, 0, 0,4,12
-4, 22, 34, 542, 544, 1544, 0, 0, 0, 0, 0, 0, 0, 0,2,2
-4, 22, 34, 542, 547, 549, 808, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 547, 549, 1082, 0, 0, 0, 0, 0, 0, 0,0,8
-4, 22, 34, 542, 547, 549, 1542, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 549, 621, 0, 0, 0, 0, 0, 0, 0,0,2
+section anthy.trans_info 179488 15235 total_line_weight,count
+1, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,722
+1, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,207
+1, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,3878
+1, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,3721
+1, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1104
+1, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,15322
+1, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1792
+1, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+1, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,945
+1, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,131
+1, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,12170
+1, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,52
+1, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1510
+1, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2603
+1, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,223
+2, 20, 32, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+2, 20, 236, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,0,6
+2, 20, 236, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
+2, 26, 32, 543, 547, 548, 549, 1268, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 32, 543, 547, 548, 1268, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 32, 543, 548, 549, 1429, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 32, 543, 548, 1429, 0, 0, 0, 0, 0, 0, 0, 0,1,1
+2, 26, 32, 543, 548, 1573, 0, 0, 0, 0, 0, 0, 0, 0,4,0
+2, 26, 32, 543, 1257, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 32, 543, 1395, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 32, 543, 1429, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 547, 548, 549, 1121, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 547, 548, 549, 1214, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 100, 543, 547, 548, 549, 1471, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 100, 543, 547, 548, 1121, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 547, 548, 1214, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 100, 543, 548, 549, 1112, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 100, 543, 548, 549, 1188, 0, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 100, 543, 548, 727, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 548, 1112, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 100, 543, 548, 1188, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 548, 1587, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 671, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 168, 543, 548, 779, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 202, 543, 547, 548, 1257, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 202, 543, 547, 548, 1471, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 202, 543, 548, 549, 1547, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 202, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 202, 543, 548, 1547, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 236, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 236, 543, 547, 548, 738, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 236, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 236, 543, 548, 1421, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 270, 543, 547, 548, 549, 1429, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 270, 543, 547, 548, 1429, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 287, 543, 547, 548, 549, 1081, 0, 0, 0, 0, 0, 0,0,6
+2, 26, 287, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,2,3
+2, 26, 287, 543, 547, 548, 1081, 0, 0, 0, 0, 0, 0, 0,0,2
+2, 26, 287, 543, 547, 548, 1257, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 287, 543, 548, 1338, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+3, 23, 33, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,9,27
+3, 23, 33, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,414
+3, 23, 67, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 67, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 67, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,5,0
+3, 23, 67, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,25
+3, 23, 84, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,3
+3, 23, 84, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,7
+3, 23, 101, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 101, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,0
+3, 23, 101, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,41
+3, 23, 118, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,28
+3, 23, 135, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+3, 23, 152, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,3,9
+3, 23, 152, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,3
+3, 23, 152, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,34
+3, 23, 152, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,56
+3, 23, 169, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,3
+3, 23, 169, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,29
+3, 23, 203, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,11
+3, 23, 220, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,1
+3, 23, 237, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 237, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,113
+3, 23, 271, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,5
+3, 23, 288, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,5,11
+3, 23, 288, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,20
+4, 22, 34, 542, 544, 548, 960, 0, 0, 0, 0, 0, 0, 0,4,0
+4, 22, 34, 542, 544, 548, 1018, 0, 0, 0, 0, 0, 0, 0,0,12
+4, 22, 34, 542, 544, 548, 1066, 0, 0, 0, 0, 0, 0, 0,0,4
+4, 22, 34, 542, 544, 549, 954, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 544, 549, 1018, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 549, 1082, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 960, 0, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 970, 0, 0, 0, 0, 0, 0, 0, 0,1,4
+4, 22, 34, 542, 544, 1018, 0, 0, 0, 0, 0, 0, 0, 0,10,4
+4, 22, 34, 542, 544, 1066, 0, 0, 0, 0, 0, 0, 0, 0,9,20
+4, 22, 34, 542, 544, 1082, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 544, 1544, 0, 0, 0, 0, 0, 0, 0, 0,4,4
+4, 22, 34, 542, 547, 549, 808, 0, 0, 0, 0, 0, 0, 0,0,3
+4, 22, 34, 542, 547, 549, 1082, 0, 0, 0, 0, 0, 0, 0,0,12
+4, 22, 34, 542, 547, 549, 1420, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 547, 549, 1542, 0, 0, 0, 0, 0, 0, 0,0,3
+4, 22, 34, 542, 547, 808, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+4, 22, 34, 542, 547, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+4, 22, 34, 542, 547, 1542, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+4, 22, 34, 542, 548, 549, 621, 0, 0, 0, 0, 0, 0, 0,0,25
 4, 22, 34, 542, 548, 549, 954, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 549, 1552, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 548, 621, 0, 0, 0, 0, 0, 0, 0, 0,0,30
-4, 22, 34, 542, 548, 970, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 548, 1018, 0, 0, 0, 0, 0, 0, 0, 0,0,24
-4, 22, 34, 542, 548, 1058, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 1066, 0, 0, 0, 0, 0, 0, 0, 0,0,28
-4, 22, 34, 542, 548, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-4, 22, 34, 542, 548, 1296, 0, 0, 0, 0, 0, 0, 0, 0,4,2
-4, 22, 34, 542, 548, 1420, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 1544, 0, 0, 0, 0, 0, 0, 0, 0,0,28
-4, 22, 34, 542, 549, 621, 0, 0, 0, 0, 0, 0, 0, 0,4,16
-4, 22, 34, 542, 549, 954, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 549, 970, 0, 0, 0, 0, 0, 0, 0, 0,6,2
-4, 22, 34, 542, 549, 1018, 0, 0, 0, 0, 0, 0, 0, 0,0,14
-4, 22, 34, 542, 549, 1066, 0, 0, 0, 0, 0, 0, 0, 0,14,32
-4, 22, 34, 542, 549, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 549, 1296, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-4, 22, 34, 542, 549, 1544, 0, 0, 0, 0, 0, 0, 0, 0,14,6
-4, 22, 34, 542, 582, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 595, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 614, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
[...98337 lines suppressed...]
 1892685924
 1892697971
+1892698309
+1892698421
 1892698437
+1892698453
 1892722431
+1892736174
 1892736350
 1892737443
+1892742510
 1892769265
+1892770624
+1892781408
 1892826150
-1892829714
 1892848547
-1893039087
+1893050465
 1893051905
 1893061586
+1893177408
 1893181010
+1893191617
 1893234672
 1893236112
 1893236224
 1893259206
 1893327486
 1893327807
+1893328610
+1893328755
 1893337376
+1893338350
 1893340335
-1893345489
+1893350927
 1893359603
+1893369487
 1893377456
 1893418114
+1893427378
 1893433442
 1893436851
+1893437028
+1893438740
 1893487551
 1893535857
 1893610644
+1893800943
+1893806546
+1893811936
+1893821216
 1893824320
-1893836945
 1893844657
+1893844898
 1893845283
+1893849715
 1893892931
 1894062421
 1894238324
+1894243391
+1894249188
+1894257504
+1894258195
 1894279232
 1894297205
 1894332725
 1894348904
+1894350739
 1894350883
 1894355246
 1894469863
 1894893124
 1894965588
 1894979566
-1895146527
 1895146655
 1895185141
 1895201474
-1895267544
 1895297183
 1895297376
+1895297649
+1895595488
+1895595633
 1895598496
+1895601713
 1895621648
 1895627985
+1895637152
+1895637200
+1895638946
+1895643794
 1895645202
 1895672454
+1895756463
 1895780450
+1895780466
 1895780514
 1895780547
 1895787744
-1895804769
+1895798561
+1895798802
 1895806321
 1895806835
 1895811073
-1895856355
+1895850003
+1895851555
 1895856918
-1895916416
+1895928961
 1896014885
 1896069459
+1896085681
 1896209856
 1896209985
 1896210049
@@ -1066,25 +1681,39 @@ section anthy.weak_words 0 1116
 1896210306
 1896210852
 1896252870
+1896263332
+1896263380
 1896272018
+1896274839
+1896298467
+1896520144
 1896520690
+1896525796
 1896528001
 1896540417
+1896543521
+1896556757
 1897110048
 1897110337
-1897204964
+1897127281
+1897128004
+1897140517
 1897212756
+1897219365
+1897226692
 1897260881
 1897421856
+1897515396
 1897516948
 1898150078
+1898174849
 1898196433
 1898200774
+1899696885
 1909059043
 1915884098
 1917060901
 1919355469
-1925010699
 1925527244
 1927981381
 1940401638
@@ -1095,22 +1724,36 @@ section anthy.weak_words 0 1116
 1959331382
 1964652145
 1968632556
+1971128786
 1977972628
 1980582816
+1991825278
+2005419375
 2026898733
 2038748837
+2045491851
 2045680923
+2045777850
+2046429382
 2047200861
 2048866241
 2050991901
+2056110326
 2058704142
 2064577913
 2077396807
 2078627682
 2086228525
 2086657987
+2095341347
 2096047462
 2112367323
+2113445522
+2116425473
+2118197365
+2121483607
+2121499994
+2125704585
 2125705854
 2134277693
 2134908500


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- anthy.spec	24 Jul 2009 16:54:24 -0000	1.59
+++ anthy.spec	20 Aug 2009 07:09:44 -0000	1.60
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	6%{?dist}
+Release:	7%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -34,6 +34,7 @@ BuildRequires:	xemacs
 Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
+Patch1:		anthy-corpus.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -102,6 +103,7 @@ package to use Anthy with XEmacs.
 %prep
 %setup -q #-a 2
 %patch0 -p1 -b .0-typo
+%patch1 -p1 -b .1-corpus
 
 %if	%{use_utf8_dict}
 function normalize_extra_dict() {
@@ -163,11 +165,11 @@ gen_dict_args
 # fix rpath issue
 sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags}
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -236,6 +238,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
+- Stop updating corpus at the build time to avoid creating different dictionary
+  among arch. (#816563)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9100h-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Thu Aug 20 07:12:09 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 20 Aug 2009 07:12:09 +0000 (UTC)
Subject: rpms/anthy/F-11 anthy-corpus.patch,NONE,1.1 anthy.spec,1.57,1.58
Message-ID: <20090820071209.A9A3A11C006E@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27472

Modified Files:
	anthy.spec 
Added Files:
	anthy-corpus.patch 
Log Message:
* Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
- Stop updating corpus at the build time to avoid creating different dictionary
  among arch. (#816563)

anthy-corpus.patch:
 corpus_info |95949 ++++++++++++++++++++++++++++++++++++++++++++----------------
 weak_words  |  777 
 2 files changed, 71592 insertions(+), 25134 deletions(-)

--- NEW FILE anthy-corpus.patch ---
diff -pruN anthy-9100h.orig/calctrans/corpus_info anthy-9100h/calctrans/corpus_info
--- anthy-9100h.orig/calctrans/corpus_info	2008-01-28 21:39:26.000000000 +0900
+++ anthy-9100h/calctrans/corpus_info	2009-08-20 15:52:24.000000000 +0900
@@ -1,24764 +1,70557 @@
-section anthy.trans_info 90368 8497 total_line_weight,count
-1, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,350
-1, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,88
-1, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1912
-1, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1838
-1, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,554
-1, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,7668
-1, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1006
-1, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-1, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,472
-1, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,56
-1, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,6070
-1, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,26
-1, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,736
-1, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1314
-1, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,100
-2, 20, 32, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-2, 20, 236, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-2, 26, 32, 543, 547, 548, 549, 1268, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 32, 543, 548, 549, 1429, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1395, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1429, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1573, 0, 0, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 547, 548, 549, 921, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 547, 548, 549, 1214, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 547, 548, 549, 1471, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 548, 549, 1112, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 548, 727, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 671, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 168, 543, 548, 549, 779, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 202, 543, 548, 1547, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 236, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 270, 543, 547, 548, 549, 1429, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 287, 543, 547, 548, 549, 1081, 0, 0, 0, 0, 0, 0,0,4
-2, 26, 287, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,2,2
-2, 26, 287, 543, 548, 549, 1338, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 33, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,4,0
-3, 23, 33, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,8,190
-3, 23, 67, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,0
-3, 23, 67, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,12
-3, 23, 84, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 84, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,2
-3, 23, 101, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 118, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,14
-3, 23, 135, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 152, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,4,6
-3, 23, 152, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 152, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,28
-3, 23, 169, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 203, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 220, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 237, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,32
-3, 23, 271, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 288, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,6
-3, 23, 288, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 544, 549, 954, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1018, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1066, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1082, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 960, 0, 0, 0, 0, 0, 0, 0, 0,4,0
-4, 22, 34, 542, 544, 970, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 544, 1018, 0, 0, 0, 0, 0, 0, 0, 0,6,8
-4, 22, 34, 542, 544, 1066, 0, 0, 0, 0, 0, 0, 0, 0,4,12
-4, 22, 34, 542, 544, 1544, 0, 0, 0, 0, 0, 0, 0, 0,2,2
-4, 22, 34, 542, 547, 549, 808, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 547, 549, 1082, 0, 0, 0, 0, 0, 0, 0,0,8
-4, 22, 34, 542, 547, 549, 1542, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 549, 621, 0, 0, 0, 0, 0, 0, 0,0,2
+section anthy.trans_info 179488 15235 total_line_weight,count
+1, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,722
+1, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,207
+1, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,3878
+1, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,3721
+1, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1104
+1, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,15322
+1, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1792
+1, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+1, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,945
+1, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,131
+1, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,12170
+1, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,52
+1, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1510
+1, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2603
+1, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,223
+2, 20, 32, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+2, 20, 236, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,0,6
+2, 20, 236, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
+2, 26, 32, 543, 547, 548, 549, 1268, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 32, 543, 547, 548, 1268, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 32, 543, 548, 549, 1429, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 32, 543, 548, 1429, 0, 0, 0, 0, 0, 0, 0, 0,1,1
+2, 26, 32, 543, 548, 1573, 0, 0, 0, 0, 0, 0, 0, 0,4,0
+2, 26, 32, 543, 1257, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 32, 543, 1395, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 32, 543, 1429, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 547, 548, 549, 1121, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 547, 548, 549, 1214, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 100, 543, 547, 548, 549, 1471, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 100, 543, 547, 548, 1121, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 547, 548, 1214, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 100, 543, 548, 549, 1112, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 100, 543, 548, 549, 1188, 0, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 100, 543, 548, 727, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 548, 1112, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 100, 543, 548, 1188, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 548, 1587, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 671, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 168, 543, 548, 779, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 202, 543, 547, 548, 1257, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 202, 543, 547, 548, 1471, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 202, 543, 548, 549, 1547, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 202, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 202, 543, 548, 1547, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 236, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 236, 543, 547, 548, 738, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 236, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 236, 543, 548, 1421, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 270, 543, 547, 548, 549, 1429, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 270, 543, 547, 548, 1429, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 287, 543, 547, 548, 549, 1081, 0, 0, 0, 0, 0, 0,0,6
+2, 26, 287, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,2,3
+2, 26, 287, 543, 547, 548, 1081, 0, 0, 0, 0, 0, 0, 0,0,2
+2, 26, 287, 543, 547, 548, 1257, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 287, 543, 548, 1338, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+3, 23, 33, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,9,27
+3, 23, 33, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,414
+3, 23, 67, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 67, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 67, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,5,0
+3, 23, 67, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,25
+3, 23, 84, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,3
+3, 23, 84, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,7
+3, 23, 101, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 101, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,0
+3, 23, 101, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,41
+3, 23, 118, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,28
+3, 23, 135, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+3, 23, 152, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,3,9
+3, 23, 152, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,3
+3, 23, 152, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,34
+3, 23, 152, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,56
+3, 23, 169, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,3
+3, 23, 169, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,29
+3, 23, 203, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,11
+3, 23, 220, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,1
+3, 23, 237, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 237, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,113
+3, 23, 271, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,5
+3, 23, 288, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,5,11
+3, 23, 288, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,20
+4, 22, 34, 542, 544, 548, 960, 0, 0, 0, 0, 0, 0, 0,4,0
+4, 22, 34, 542, 544, 548, 1018, 0, 0, 0, 0, 0, 0, 0,0,12
+4, 22, 34, 542, 544, 548, 1066, 0, 0, 0, 0, 0, 0, 0,0,4
+4, 22, 34, 542, 544, 549, 954, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 544, 549, 1018, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 549, 1082, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 960, 0, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 970, 0, 0, 0, 0, 0, 0, 0, 0,1,4
+4, 22, 34, 542, 544, 1018, 0, 0, 0, 0, 0, 0, 0, 0,10,4
+4, 22, 34, 542, 544, 1066, 0, 0, 0, 0, 0, 0, 0, 0,9,20
+4, 22, 34, 542, 544, 1082, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 544, 1544, 0, 0, 0, 0, 0, 0, 0, 0,4,4
+4, 22, 34, 542, 547, 549, 808, 0, 0, 0, 0, 0, 0, 0,0,3
+4, 22, 34, 542, 547, 549, 1082, 0, 0, 0, 0, 0, 0, 0,0,12
+4, 22, 34, 542, 547, 549, 1420, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 547, 549, 1542, 0, 0, 0, 0, 0, 0, 0,0,3
+4, 22, 34, 542, 547, 808, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+4, 22, 34, 542, 547, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+4, 22, 34, 542, 547, 1542, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+4, 22, 34, 542, 548, 549, 621, 0, 0, 0, 0, 0, 0, 0,0,25
 4, 22, 34, 542, 548, 549, 954, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 549, 1552, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 548, 621, 0, 0, 0, 0, 0, 0, 0, 0,0,30
-4, 22, 34, 542, 548, 970, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 548, 1018, 0, 0, 0, 0, 0, 0, 0, 0,0,24
-4, 22, 34, 542, 548, 1058, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 1066, 0, 0, 0, 0, 0, 0, 0, 0,0,28
-4, 22, 34, 542, 548, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-4, 22, 34, 542, 548, 1296, 0, 0, 0, 0, 0, 0, 0, 0,4,2
-4, 22, 34, 542, 548, 1420, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 1544, 0, 0, 0, 0, 0, 0, 0, 0,0,28
-4, 22, 34, 542, 549, 621, 0, 0, 0, 0, 0, 0, 0, 0,4,16
-4, 22, 34, 542, 549, 954, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 549, 970, 0, 0, 0, 0, 0, 0, 0, 0,6,2
-4, 22, 34, 542, 549, 1018, 0, 0, 0, 0, 0, 0, 0, 0,0,14
-4, 22, 34, 542, 549, 1066, 0, 0, 0, 0, 0, 0, 0, 0,14,32
-4, 22, 34, 542, 549, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 549, 1296, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-4, 22, 34, 542, 549, 1544, 0, 0, 0, 0, 0, 0, 0, 0,14,6
-4, 22, 34, 542, 582, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 595, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 614, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
[...98337 lines suppressed...]
 1892685924
 1892697971
+1892698309
+1892698421
 1892698437
+1892698453
 1892722431
+1892736174
 1892736350
 1892737443
+1892742510
 1892769265
+1892770624
+1892781408
 1892826150
-1892829714
 1892848547
-1893039087
+1893050465
 1893051905
 1893061586
+1893177408
 1893181010
+1893191617
 1893234672
 1893236112
 1893236224
 1893259206
 1893327486
 1893327807
+1893328610
+1893328755
 1893337376
+1893338350
 1893340335
-1893345489
+1893350927
 1893359603
+1893369487
 1893377456
 1893418114
+1893427378
 1893433442
 1893436851
+1893437028
+1893438740
 1893487551
 1893535857
 1893610644
+1893800943
+1893806546
+1893811936
+1893821216
 1893824320
-1893836945
 1893844657
+1893844898
 1893845283
+1893849715
 1893892931
 1894062421
 1894238324
+1894243391
+1894249188
+1894257504
+1894258195
 1894279232
 1894297205
 1894332725
 1894348904
+1894350739
 1894350883
 1894355246
 1894469863
 1894893124
 1894965588
 1894979566
-1895146527
 1895146655
 1895185141
 1895201474
-1895267544
 1895297183
 1895297376
+1895297649
+1895595488
+1895595633
 1895598496
+1895601713
 1895621648
 1895627985
+1895637152
+1895637200
+1895638946
+1895643794
 1895645202
 1895672454
+1895756463
 1895780450
+1895780466
 1895780514
 1895780547
 1895787744
-1895804769
+1895798561
+1895798802
 1895806321
 1895806835
 1895811073
-1895856355
+1895850003
+1895851555
 1895856918
-1895916416
+1895928961
 1896014885
 1896069459
+1896085681
 1896209856
 1896209985
 1896210049
@@ -1066,25 +1681,39 @@ section anthy.weak_words 0 1116
 1896210306
 1896210852
 1896252870
+1896263332
+1896263380
 1896272018
+1896274839
+1896298467
+1896520144
 1896520690
+1896525796
 1896528001
 1896540417
+1896543521
+1896556757
 1897110048
 1897110337
-1897204964
+1897127281
+1897128004
+1897140517
 1897212756
+1897219365
+1897226692
 1897260881
 1897421856
+1897515396
 1897516948
 1898150078
+1898174849
 1898196433
 1898200774
+1899696885
 1909059043
 1915884098
 1917060901
 1919355469
-1925010699
 1925527244
 1927981381
 1940401638
@@ -1095,22 +1724,36 @@ section anthy.weak_words 0 1116
 1959331382
 1964652145
 1968632556
+1971128786
 1977972628
 1980582816
+1991825278
+2005419375
 2026898733
 2038748837
+2045491851
 2045680923
+2045777850
+2046429382
 2047200861
 2048866241
 2050991901
+2056110326
 2058704142
 2064577913
 2077396807
 2078627682
 2086228525
 2086657987
+2095341347
 2096047462
 2112367323
+2113445522
+2116425473
+2118197365
+2121483607
+2121499994
+2125704585
 2125705854
 2134277693
 2134908500


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-11/anthy.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- anthy.spec	8 Jul 2009 12:45:51 -0000	1.57
+++ anthy.spec	20 Aug 2009 07:12:09 -0000	1.58
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	5%{?dist}
+Release:	7%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -34,6 +34,7 @@ BuildRequires:	xemacs
 Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
+Patch1:		anthy-corpus.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -102,6 +103,7 @@ package to use Anthy with XEmacs.
 %prep
 %setup -q #-a 2
 %patch0 -p1 -b .0-typo
+%patch1 -p1 -b .1-corpus
 
 %if	%{use_utf8_dict}
 function normalize_extra_dict() {
@@ -163,11 +165,11 @@ gen_dict_args
 # fix rpath issue
 sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags}
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -236,6 +238,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
+- Stop updating corpus at the build time to avoid creating different dictionary
+  among arch. (#816563)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9100h-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul  8 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-5
 - Update the corpus.
 - Fix typos in dictionary. (#509534)



From tagoh at fedoraproject.org  Thu Aug 20 07:12:52 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 20 Aug 2009 07:12:52 +0000 (UTC)
Subject: rpms/anthy/F-10 anthy.spec,1.52,1.53
Message-ID: <20090820071252.5495111C006E@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27687

Modified Files:
	anthy.spec 
Log Message:
* Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
- Stop updating corpus at the build time to avoid creating different dictionary
  among arch. (#816563)


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-10/anthy.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- anthy.spec	8 Jul 2009 13:10:35 -0000	1.52
+++ anthy.spec	20 Aug 2009 07:12:52 -0000	1.53
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	5%{?dist}
+Release:	7%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -34,6 +34,7 @@ BuildRequires:	xemacs
 Source0:	http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Patch0:		anthy-fix-typo-in-dict.patch
+Patch1:		anthy-corpus.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -102,6 +103,7 @@ package to use Anthy with XEmacs.
 %prep
 %setup -q #-a 2
 %patch0 -p1 -b .0-typo
+%patch1 -p1 -b .1-corpus
 
 %if	%{use_utf8_dict}
 function normalize_extra_dict() {
@@ -163,11 +165,11 @@ gen_dict_args
 # fix rpath issue
 sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags}
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params0
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} update_params2
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -236,6 +238,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
+- Stop updating corpus at the build time to avoid creating different dictionary
+  among arch. (#816563)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9100h-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul  8 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-5
 - Update the corpus.
 - Fix typos in dictionary. (#509534)



From tagoh at fedoraproject.org  Thu Aug 20 07:15:41 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 20 Aug 2009 07:15:41 +0000 (UTC)
Subject: rpms/anthy/F-10 anthy-corpus.patch,NONE,1.1
Message-ID: <20090820071541.CD1F611C006E@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28246

Added Files:
	anthy-corpus.patch 
Log Message:


anthy-corpus.patch:
 corpus_info |95949 ++++++++++++++++++++++++++++++++++++++++++++----------------
 weak_words  |  777 
 2 files changed, 71592 insertions(+), 25134 deletions(-)

--- NEW FILE anthy-corpus.patch ---
diff -pruN anthy-9100h.orig/calctrans/corpus_info anthy-9100h/calctrans/corpus_info
--- anthy-9100h.orig/calctrans/corpus_info	2008-01-28 21:39:26.000000000 +0900
+++ anthy-9100h/calctrans/corpus_info	2009-08-20 15:52:24.000000000 +0900
@@ -1,24764 +1,70557 @@
-section anthy.trans_info 90368 8497 total_line_weight,count
-1, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,350
-1, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,88
-1, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1912
-1, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1838
-1, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,554
-1, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,7668
-1, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1006
-1, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-1, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,472
-1, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,56
-1, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,6070
-1, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,26
-1, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,736
-1, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1314
-1, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,100
-2, 20, 32, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-2, 20, 236, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-2, 26, 32, 543, 547, 548, 549, 1268, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 32, 543, 548, 549, 1429, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1395, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1429, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 32, 543, 548, 1573, 0, 0, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 547, 548, 549, 921, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 547, 548, 549, 1214, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 547, 548, 549, 1471, 0, 0, 0, 0, 0, 0,2,0
-2, 26, 100, 543, 548, 549, 1112, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 548, 727, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 100, 543, 671, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 168, 543, 548, 549, 779, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 202, 543, 548, 1547, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 236, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 270, 543, 547, 548, 549, 1429, 0, 0, 0, 0, 0, 0,0,2
-2, 26, 287, 543, 547, 548, 549, 1081, 0, 0, 0, 0, 0, 0,0,4
-2, 26, 287, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,2,2
-2, 26, 287, 543, 548, 549, 1338, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 33, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,4,0
-3, 23, 33, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,8,190
-3, 23, 67, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,0
-3, 23, 67, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,12
-3, 23, 84, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 84, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,2
-3, 23, 101, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 118, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,14
-3, 23, 135, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 152, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,4,6
-3, 23, 152, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 152, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,28
-3, 23, 169, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-3, 23, 203, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 220, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 237, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,32
-3, 23, 271, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-3, 23, 288, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,6
-3, 23, 288, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 544, 549, 954, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1018, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1066, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 549, 1082, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 544, 960, 0, 0, 0, 0, 0, 0, 0, 0,4,0
-4, 22, 34, 542, 544, 970, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 544, 1018, 0, 0, 0, 0, 0, 0, 0, 0,6,8
-4, 22, 34, 542, 544, 1066, 0, 0, 0, 0, 0, 0, 0, 0,4,12
-4, 22, 34, 542, 544, 1544, 0, 0, 0, 0, 0, 0, 0, 0,2,2
-4, 22, 34, 542, 547, 549, 808, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 547, 549, 1082, 0, 0, 0, 0, 0, 0, 0,0,8
-4, 22, 34, 542, 547, 549, 1542, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 549, 621, 0, 0, 0, 0, 0, 0, 0,0,2
+section anthy.trans_info 179488 15235 total_line_weight,count
+1, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,722
+1, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,207
+1, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,3878
+1, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,3721
+1, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1104
+1, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,15322
+1, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1792
+1, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+1, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,945
+1, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,131
+1, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,12170
+1, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,52
+1, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,1510
+1, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2603
+1, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,223
+2, 20, 32, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+2, 20, 236, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,0,6
+2, 20, 236, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
+2, 26, 32, 543, 547, 548, 549, 1268, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 32, 543, 547, 548, 1268, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 32, 543, 548, 549, 1429, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 32, 543, 548, 1429, 0, 0, 0, 0, 0, 0, 0, 0,1,1
+2, 26, 32, 543, 548, 1573, 0, 0, 0, 0, 0, 0, 0, 0,4,0
+2, 26, 32, 543, 1257, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 32, 543, 1395, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 32, 543, 1429, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 547, 548, 549, 1121, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 547, 548, 549, 1214, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 100, 543, 547, 548, 549, 1471, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 100, 543, 547, 548, 1121, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 547, 548, 1214, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 100, 543, 548, 549, 1112, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 100, 543, 548, 549, 1188, 0, 0, 0, 0, 0, 0, 0,3,0
+2, 26, 100, 543, 548, 727, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 548, 1112, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 100, 543, 548, 1188, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 548, 1587, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 100, 543, 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 100, 543, 671, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 168, 543, 548, 779, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+2, 26, 202, 543, 547, 548, 1257, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 202, 543, 547, 548, 1471, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 202, 543, 548, 549, 1547, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 202, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 202, 543, 548, 1547, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 236, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 236, 543, 547, 548, 738, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 236, 543, 548, 1257, 0, 0, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 236, 543, 548, 1421, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+2, 26, 270, 543, 547, 548, 549, 1429, 0, 0, 0, 0, 0, 0,0,3
+2, 26, 270, 543, 547, 548, 1429, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 287, 543, 547, 548, 549, 1081, 0, 0, 0, 0, 0, 0,0,6
+2, 26, 287, 543, 547, 548, 549, 1257, 0, 0, 0, 0, 0, 0,2,3
+2, 26, 287, 543, 547, 548, 1081, 0, 0, 0, 0, 0, 0, 0,0,2
+2, 26, 287, 543, 547, 548, 1257, 0, 0, 0, 0, 0, 0, 0,0,1
+2, 26, 287, 543, 548, 1338, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+3, 23, 33, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,9,27
+3, 23, 33, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,414
+3, 23, 67, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 67, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 67, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,5,0
+3, 23, 67, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,25
+3, 23, 84, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,3
+3, 23, 84, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,7
+3, 23, 101, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 101, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,0
+3, 23, 101, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,41
+3, 23, 118, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,28
+3, 23, 135, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,8
+3, 23, 152, 547, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0,3,9
+3, 23, 152, 547, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,3
+3, 23, 152, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,34
+3, 23, 152, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,56
+3, 23, 169, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,3,3
+3, 23, 169, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,29
+3, 23, 203, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,11
+3, 23, 220, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,1
+3, 23, 237, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+3, 23, 237, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,113
+3, 23, 271, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,5
+3, 23, 288, 549, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0,5,11
+3, 23, 288, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2,20
+4, 22, 34, 542, 544, 548, 960, 0, 0, 0, 0, 0, 0, 0,4,0
+4, 22, 34, 542, 544, 548, 1018, 0, 0, 0, 0, 0, 0, 0,0,12
+4, 22, 34, 542, 544, 548, 1066, 0, 0, 0, 0, 0, 0, 0,0,4
+4, 22, 34, 542, 544, 549, 954, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 544, 549, 1018, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 549, 1082, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 960, 0, 0, 0, 0, 0, 0, 0, 0,3,0
+4, 22, 34, 542, 544, 970, 0, 0, 0, 0, 0, 0, 0, 0,1,4
+4, 22, 34, 542, 544, 1018, 0, 0, 0, 0, 0, 0, 0, 0,10,4
+4, 22, 34, 542, 544, 1066, 0, 0, 0, 0, 0, 0, 0, 0,9,20
+4, 22, 34, 542, 544, 1082, 0, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 544, 1544, 0, 0, 0, 0, 0, 0, 0, 0,4,4
+4, 22, 34, 542, 547, 549, 808, 0, 0, 0, 0, 0, 0, 0,0,3
+4, 22, 34, 542, 547, 549, 1082, 0, 0, 0, 0, 0, 0, 0,0,12
+4, 22, 34, 542, 547, 549, 1420, 0, 0, 0, 0, 0, 0, 0,1,0
+4, 22, 34, 542, 547, 549, 1542, 0, 0, 0, 0, 0, 0, 0,0,3
+4, 22, 34, 542, 547, 808, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+4, 22, 34, 542, 547, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,4
+4, 22, 34, 542, 547, 1542, 0, 0, 0, 0, 0, 0, 0, 0,0,1
+4, 22, 34, 542, 548, 549, 621, 0, 0, 0, 0, 0, 0, 0,0,25
 4, 22, 34, 542, 548, 549, 954, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 549, 1552, 0, 0, 0, 0, 0, 0, 0,2,0
-4, 22, 34, 542, 548, 621, 0, 0, 0, 0, 0, 0, 0, 0,0,30
-4, 22, 34, 542, 548, 970, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 548, 1018, 0, 0, 0, 0, 0, 0, 0, 0,0,24
-4, 22, 34, 542, 548, 1058, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 1066, 0, 0, 0, 0, 0, 0, 0, 0,0,28
-4, 22, 34, 542, 548, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,16
-4, 22, 34, 542, 548, 1296, 0, 0, 0, 0, 0, 0, 0, 0,4,2
-4, 22, 34, 542, 548, 1420, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 548, 1544, 0, 0, 0, 0, 0, 0, 0, 0,0,28
-4, 22, 34, 542, 549, 621, 0, 0, 0, 0, 0, 0, 0, 0,4,16
-4, 22, 34, 542, 549, 954, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 549, 970, 0, 0, 0, 0, 0, 0, 0, 0,6,2
-4, 22, 34, 542, 549, 1018, 0, 0, 0, 0, 0, 0, 0, 0,0,14
-4, 22, 34, 542, 549, 1066, 0, 0, 0, 0, 0, 0, 0, 0,14,32
-4, 22, 34, 542, 549, 1082, 0, 0, 0, 0, 0, 0, 0, 0,0,6
-4, 22, 34, 542, 549, 1296, 0, 0, 0, 0, 0, 0, 0, 0,0,4
-4, 22, 34, 542, 549, 1544, 0, 0, 0, 0, 0, 0, 0, 0,14,6
-4, 22, 34, 542, 582, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 595, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
-4, 22, 34, 542, 614, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,2
[...98337 lines suppressed...]
 1892685924
 1892697971
+1892698309
+1892698421
 1892698437
+1892698453
 1892722431
+1892736174
 1892736350
 1892737443
+1892742510
 1892769265
+1892770624
+1892781408
 1892826150
-1892829714
 1892848547
-1893039087
+1893050465
 1893051905
 1893061586
+1893177408
 1893181010
+1893191617
 1893234672
 1893236112
 1893236224
 1893259206
 1893327486
 1893327807
+1893328610
+1893328755
 1893337376
+1893338350
 1893340335
-1893345489
+1893350927
 1893359603
+1893369487
 1893377456
 1893418114
+1893427378
 1893433442
 1893436851
+1893437028
+1893438740
 1893487551
 1893535857
 1893610644
+1893800943
+1893806546
+1893811936
+1893821216
 1893824320
-1893836945
 1893844657
+1893844898
 1893845283
+1893849715
 1893892931
 1894062421
 1894238324
+1894243391
+1894249188
+1894257504
+1894258195
 1894279232
 1894297205
 1894332725
 1894348904
+1894350739
 1894350883
 1894355246
 1894469863
 1894893124
 1894965588
 1894979566
-1895146527
 1895146655
 1895185141
 1895201474
-1895267544
 1895297183
 1895297376
+1895297649
+1895595488
+1895595633
 1895598496
+1895601713
 1895621648
 1895627985
+1895637152
+1895637200
+1895638946
+1895643794
 1895645202
 1895672454
+1895756463
 1895780450
+1895780466
 1895780514
 1895780547
 1895787744
-1895804769
+1895798561
+1895798802
 1895806321
 1895806835
 1895811073
-1895856355
+1895850003
+1895851555
 1895856918
-1895916416
+1895928961
 1896014885
 1896069459
+1896085681
 1896209856
 1896209985
 1896210049
@@ -1066,25 +1681,39 @@ section anthy.weak_words 0 1116
 1896210306
 1896210852
 1896252870
+1896263332
+1896263380
 1896272018
+1896274839
+1896298467
+1896520144
 1896520690
+1896525796
 1896528001
 1896540417
+1896543521
+1896556757
 1897110048
 1897110337
-1897204964
+1897127281
+1897128004
+1897140517
 1897212756
+1897219365
+1897226692
 1897260881
 1897421856
+1897515396
 1897516948
 1898150078
+1898174849
 1898196433
 1898200774
+1899696885
 1909059043
 1915884098
 1917060901
 1919355469
-1925010699
 1925527244
 1927981381
 1940401638
@@ -1095,22 +1724,36 @@ section anthy.weak_words 0 1116
 1959331382
 1964652145
 1968632556
+1971128786
 1977972628
 1980582816
+1991825278
+2005419375
 2026898733
 2038748837
+2045491851
 2045680923
+2045777850
+2046429382
 2047200861
 2048866241
 2050991901
+2056110326
 2058704142
 2064577913
 2077396807
 2078627682
 2086228525
 2086657987
+2095341347
 2096047462
 2112367323
+2113445522
+2116425473
+2118197365
+2121483607
+2121499994
+2125704585
 2125705854
 2134277693
 2134908500



From mmaslano at fedoraproject.org  Thu Aug 20 07:26:25 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 20 Aug 2009 07:26:25 +0000 (UTC)
Subject: rpms/perl-Compress-Raw-Bzip2/EL-5 .cvsignore, 1.3,
	1.4 perl-Compress-Raw-Bzip2.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090820072625.374E111C006E@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30191

Modified Files:
	.cvsignore perl-Compress-Raw-Bzip2.spec sources 
Log Message:
* Thu Aug 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.020-1
- 518278 update to 2.020 - CVE-2009-1391



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 03:13:54 -0000	1.3
+++ .cvsignore	20 Aug 2009 07:26:24 -0000	1.4
@@ -1 +1 @@
-Compress-Raw-Bzip2-2.005.tar.gz
+Compress-Raw-Bzip2-2.020.tar.gz


Index: perl-Compress-Raw-Bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/EL-5/perl-Compress-Raw-Bzip2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Compress-Raw-Bzip2.spec	5 Mar 2008 22:32:17 -0000	1.6
+++ perl-Compress-Raw-Bzip2.spec	20 Aug 2009 07:26:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Compress-Raw-Bzip2
-Version:        2.005
-Release:        5%{?dist}
+Version:        2.020
+Release:        1%{?dist}
 Summary:        Low-Level Interface to bzip2 compression library
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.020-1
+- 518278 update to 2.020 - CVE-2009-1391
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.005-5
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 03:13:54 -0000	1.3
+++ sources	20 Aug 2009 07:26:24 -0000	1.4
@@ -1 +1 @@
-fe1ec38a0faa79e2fc18c5bc8e44c9ad  Compress-Raw-Bzip2-2.005.tar.gz
+50f85a3ecab19fa6d2ca18b8f990f219  Compress-Raw-Bzip2-2.020.tar.gz



From mmaslano at fedoraproject.org  Thu Aug 20 07:36:02 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 20 Aug 2009 07:36:02 +0000 (UTC)
Subject: rpms/perl-Compress-Raw-Bzip2/F-10 .cvsignore, 1.3,
	1.4 perl-Compress-Raw-Bzip2.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090820073602.3FC7F11C006E@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32519

Modified Files:
	.cvsignore perl-Compress-Raw-Bzip2.spec sources 
Log Message:
* Thu Aug 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.020-1
- 518278 CVE-2009-1884, update to the latest release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 03:13:54 -0000	1.3
+++ .cvsignore	20 Aug 2009 07:36:01 -0000	1.4
@@ -1 +1 @@
-Compress-Raw-Bzip2-2.005.tar.gz
+Compress-Raw-Bzip2-2.020.tar.gz


Index: perl-Compress-Raw-Bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-10/perl-Compress-Raw-Bzip2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Compress-Raw-Bzip2.spec	5 Mar 2008 22:32:17 -0000	1.6
+++ perl-Compress-Raw-Bzip2.spec	20 Aug 2009 07:36:01 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Compress-Raw-Bzip2
-Version:        2.005
-Release:        5%{?dist}
+Version:        2.020
+Release:        1%{?dist}
 Summary:        Low-Level Interface to bzip2 compression library
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.020-1
+- 518278 CVE-2009-1884, update to the latest release
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.005-5
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 03:13:54 -0000	1.3
+++ sources	20 Aug 2009 07:36:01 -0000	1.4
@@ -1 +1 @@
-fe1ec38a0faa79e2fc18c5bc8e44c9ad  Compress-Raw-Bzip2-2.005.tar.gz
+50f85a3ecab19fa6d2ca18b8f990f219  Compress-Raw-Bzip2-2.020.tar.gz



From mmaslano at fedoraproject.org  Thu Aug 20 07:36:49 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 20 Aug 2009 07:36:49 +0000 (UTC)
Subject: rpms/perl-Compress-Raw-Bzip2/F-11 .cvsignore, 1.3,
	1.4 perl-Compress-Raw-Bzip2.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20090820073649.2FF6A11C006E@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32763

Modified Files:
	.cvsignore perl-Compress-Raw-Bzip2.spec sources 
Log Message:
* Thu Aug 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.020-1
- 518278 CVE-2009-1884, update to the latest release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Jul 2007 03:13:54 -0000	1.3
+++ .cvsignore	20 Aug 2009 07:36:48 -0000	1.4
@@ -1 +1 @@
-Compress-Raw-Bzip2-2.005.tar.gz
+Compress-Raw-Bzip2-2.020.tar.gz


Index: perl-Compress-Raw-Bzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-11/perl-Compress-Raw-Bzip2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Compress-Raw-Bzip2.spec	26 Feb 2009 13:22:10 -0000	1.7
+++ perl-Compress-Raw-Bzip2.spec	20 Aug 2009 07:36:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Compress-Raw-Bzip2
-Version:        2.005
-Release:        6%{?dist}
+Version:        2.020
+Release:        1%{?dist}
 Summary:        Low-Level Interface to bzip2 compression library
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.020-1
+- 518278 CVE-2009-1884, update to the latest release
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.005-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jul 2007 03:13:54 -0000	1.3
+++ sources	20 Aug 2009 07:36:49 -0000	1.4
@@ -1 +1 @@
-fe1ec38a0faa79e2fc18c5bc8e44c9ad  Compress-Raw-Bzip2-2.005.tar.gz
+50f85a3ecab19fa6d2ca18b8f990f219  Compress-Raw-Bzip2-2.020.tar.gz



From zprikryl at fedoraproject.org  Thu Aug 20 07:37:29 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 20 Aug 2009 07:37:29 +0000 (UTC)
Subject: rpms/bc/devel bc.spec,1.41,1.42
Message-ID: <20090820073729.17D1B11C006E@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv489

Modified Files:
	bc.spec 
Log Message:
Don't complain if installing with --excludedocs (#515934)



Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- bc.spec	24 Jul 2009 17:54:08 -0000	1.41
+++ bc.spec	20 Aug 2009 07:37:28 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator)
 Name: bc
 Version: 1.06
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
@@ -47,13 +47,19 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/bc.info %{_infodir}/dir --entry="* bc: (bc).                      The GNU calculator language." || :
-/sbin/install-info %{_infodir}/dc.info %{_infodir}/dir --entry="* dc: (dc).                      The GNU RPN calculator."|| :
+if [ -e %{_infodir}/bc.info.gz -a -e %{_infodir}/dc.info.gz ]; then
+  /sbin/install-info %{_infodir}/bc.info.gz %{_infodir}/dir \
+  --entry="* bc: (bc).                      The GNU calculator language." || :
+  /sbin/install-info %{_infodir}/dc.info.gz %{_infodir}/dir \
+  --entry="* dc: (dc).                      The GNU RPN calculator." || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/bc.info %{_infodir}/dir --entry="* bc: (bc).                      The GNU calculator language." || :
-  /sbin/install-info --delete %{_infodir}/dc.info %{_infodir}/dir --entry="* dc: (dc).                      The GNU RPN calculator." || :
+if [ $1 = 0 -a -e %{_infodir}/bc.info.gz -a -e %{_infodir}/dc.info.gz ]; then
+  /sbin/install-info --delete %{_infodir}/bc.info.gz %{_infodir}/dir \
+  --entry="* bc: (bc).                      The GNU calculator language." || :
+  /sbin/install-info --delete %{_infodir}/dc.info.gz %{_infodir}/dir \
+  --entry="* dc: (dc).                      The GNU RPN calculator." || :
 fi
 
 %files
@@ -65,6 +71,10 @@ fi
 %{_infodir}/*
 
 %changelog
+<<<<<<< bc.spec
+* Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.06-36
+- Don't complain if installing with --excludedocs (#515934)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.06-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From zprikryl at fedoraproject.org  Thu Aug 20 07:38:00 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 20 Aug 2009 07:38:00 +0000 (UTC)
Subject: rpms/bc/devel bc.spec,1.42,1.43
Message-ID: <20090820073800.D5CB811C006E@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/bc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv582

Modified Files:
	bc.spec 
Log Message:
removed conflict indicator



Index: bc.spec
===================================================================
RCS file: /cvs/extras/rpms/bc/devel/bc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- bc.spec	20 Aug 2009 07:37:28 -0000	1.42
+++ bc.spec	20 Aug 2009 07:38:00 -0000	1.43
@@ -71,7 +71,6 @@ fi
 %{_infodir}/*
 
 %changelog
-<<<<<<< bc.spec
 * Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.06-36
 - Don't complain if installing with --excludedocs (#515934)
 



From zprikryl at fedoraproject.org  Thu Aug 20 07:39:28 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 20 Aug 2009 07:39:28 +0000 (UTC)
Subject: rpms/nasm/devel nasm.spec,1.30,1.31
Message-ID: <20090820073928.08AFE11C0381@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/nasm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv896

Modified Files:
	nasm.spec 
Log Message:
Don't complain if installing with --excludedocs (#515944)



Index: nasm.spec
===================================================================
RCS file: /cvs/extras/rpms/nasm/devel/nasm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nasm.spec	25 Jul 2009 15:45:23 -0000	1.30
+++ nasm.spec	20 Aug 2009 07:39:27 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
 Version: 2.07
-Release: 2%{?dist}
+Release: 3%{?dist}
 # No version specified.
 License: LGPLv2+
 Group: Development/Languages
@@ -58,10 +58,12 @@ install -t $RPM_BUILD_ROOT/%{_infodir} d
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/nasm.info.gz  %{_infodir}/dir || :
+if [ -e %{_infodir}/nasm.info.gz ]; then
+  /sbin/install-info %{_infodir}/nasm.info.gz  %{_infodir}/dir || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -e %{_infodir}/nasm.info.gz ]; then
   /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir || :
 fi
 
@@ -90,6 +92,9 @@ fi
 %{_bindir}/rdf2srec
 
 %changelog
+* Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> - 2.07-3
+- Don't complain if installing with --excludedocs (#515944)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From zprikryl at fedoraproject.org  Thu Aug 20 07:41:12 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 20 Aug 2009 07:41:12 +0000 (UTC)
Subject: rpms/units/devel units.spec,1.28,1.29
Message-ID: <20090820074112.1686B11C006E@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/units/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1167

Modified Files:
	units.spec 
Log Message:
Don't complain if installing with --excludedocs (#515941)



Index: units.spec
===================================================================
RCS file: /cvs/extras/rpms/units/devel/units.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- units.spec	27 Jul 2009 06:33:33 -0000	1.28
+++ units.spec	20 Aug 2009 07:41:11 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
 Version: 1.87
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/units/units.html
 License: GPLv2+
@@ -35,14 +35,14 @@ gzip $RPM_BUILD_ROOT%{_infodir}/units.in
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/units.info.gz %{_infodir}/dir
-exit 0
+if [ -e %{_infodir}/units.info.gz ]; then
+  /sbin/install-info %{_infodir}/units.info.gz %{_infodir}/dir || :
+fi
 
 %preun
-if [ "$1" = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/units.info.gz %{_infodir}/dir
+if [ $1 = 0 -a -e %{_infodir}/units.info.gz ]; then
+  /sbin/install-info --delete %{_infodir}/units.info.gz %{_infodir}/dir || :
 fi
-exit 0
 
 %files
 %defattr(-,root,root)
@@ -53,6 +53,9 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.87-5
+- Don't complain if installing with --excludedocs (#515941)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.87-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Aug 20 07:52:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 07:52:41 +0000
Subject: [pkgdb] sbackup: twaugh has requested watchbugzilla
Message-ID: <20090820075242.0DF8A10F85A@bastion2.fedora.phx.redhat.com>

twaugh has requested the watchbugzilla acl on sbackup (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Thu Aug 20 07:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 07:52:43 +0000
Subject: [pkgdb] sbackup: twaugh has requested watchcommits
Message-ID: <20090820075244.06D8910F80B@bastion2.fedora.phx.redhat.com>

twaugh has requested the watchcommits acl on sbackup (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Thu Aug 20 07:53:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 07:53:03 +0000
Subject: [pkgdb] sbackup: twaugh has requested commit
Message-ID: <20090820075303.AADE510F882@bastion2.fedora.phx.redhat.com>

twaugh has requested the commit acl on sbackup (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From hno at fedoraproject.org  Thu Aug 20 08:26:36 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 20 Aug 2009 08:26:36 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.49, 1.50 bzr.spec, 1.69, 1.70 sources, 
	1.49, 1.50
Message-ID: <20090820082636.DE22C11C006E@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.18rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	20 Jul 2009 18:01:39 -0000	1.49
+++ .cvsignore	20 Aug 2009 08:26:34 -0000	1.50
@@ -1,2 +1,2 @@
-bzr-1.17.tar.gz
-bzr-1.17.tar.gz.sig
+bzr-1.18rc1.tar.gz
+bzr-1.18rc1.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- bzr.spec	24 Jul 2009 18:32:50 -0000	1.69
+++ bzr.spec	20 Aug 2009 08:26:34 -0000	1.70
@@ -6,9 +6,9 @@
 #   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 1.17
-#define bzrrc rc1
-%define release 2
+%define bzrmajor 1.18
+%define bzrrc rc1
+%define release 0.1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -91,13 +91,16 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-0.1.rc1
+- Update to 1.18rc1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jul 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.17-1
-- Upgade to 1.17
+- Update to 1.17
 
-* Mon Jul 13 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.17-0.1
+* Mon Jul 13 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.17-0.1.rc1
 - Update to 1.17rc1
 
 * Fri Jun 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.16.1-1
@@ -112,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.15-2
 - Update to 1.15final
 
-* Sat May 16 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.15-0.1
+* Sat May 16 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.15-0.1.rc1
 - Update to 1.15rc1
 
 * Sat May 02 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	20 Jul 2009 18:01:39 -0000	1.49
+++ sources	20 Aug 2009 08:26:34 -0000	1.50
@@ -1,2 +1,2 @@
-d772508e60b47a1641fa487c5cf7e08e  bzr-1.17.tar.gz
-4be8b74d4501934f8bea62839203c42c  bzr-1.17.tar.gz.sig
+aad4fd062ae62346c1d5d6efd9cc3763  bzr-1.18rc1.tar.gz
+79be731b4603bc0753a24731f84d0cc3  bzr-1.18rc1.tar.gz.sig



From tgraf at fedoraproject.org  Thu Aug 20 08:26:48 2009
From: tgraf at fedoraproject.org (Thomas Graf)
Date: Thu, 20 Aug 2009 08:26:48 +0000 (UTC)
Subject: rpms/mipv6-daemon/devel import.log, NONE, 1.1 mip6d.conf, NONE,
	1.1 mip6d.init, NONE, 1.1 mip6d.sysconfig, NONE,
	1.1 mipv6-daemon-header-fix.patch, NONE, 1.1 mipv6-daemon.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820082648.3069B11C006E@cvs1.fedora.phx.redhat.com>

Author: tgraf

Update of /cvs/pkgs/rpms/mipv6-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9847/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mip6d.conf mip6d.init mip6d.sysconfig 
	mipv6-daemon-header-fix.patch mipv6-daemon.spec 
Log Message:
Initial Import (#517183)



--- NEW FILE import.log ---
mipv6-daemon-0_4-1_fc11:HEAD:mipv6-daemon-0.4-1.fc11.src.rpm:1250756670


--- NEW FILE mip6d.conf ---
# This is an example of mip6d Mobile Node configuration file

NodeConfig MN;

## If set to > 0, will not detach from tty
DebugLevel 0;

## Support route optimization with other MNs
DoRouteOptimizationCN enabled;

## Use route optimization with CNs
DoRouteOptimizationMN enabled;

UseCnBuAck disabled;

MnDiscardHaParamProb enabled;

#Interface "eth0";

MnRouterProbes 1;

#MnHomeLink "eth0" {
#	HomeAgentAddress 3ffe:2620:6:1::1;
#	HomeAddress 3ffe:2620:6:1::1234/64;
#
#	#		address			opt.
#	MnRoPolicy 	3ffe:2060:6:1::3	enabled;
#	MnRoPolicy				disabled;
#}

##
## IPsec configuration
##

UseMnHaIPsec enabled;

## Key Management Mobility Capability
KeyMngMobCapability disabled;

#IPsecPolicySet {
#	HomeAgentAddress 3ffe:2620:6:1::1;
#	HomeAddress 3ffe:2620:6:1::1234/64;
#
#	IPsecPolicy Mh UseESP;
#	IPsecPolicy TunnelMh UseESP;
#
#	IPsecPolicy Mh UseESP 1 2;
#	IPsecPolicy ICMP UseESP 5;
#	IPsecPolicy TunnelMh UseESP 3 4;
#}


--- NEW FILE mip6d.init ---
#!/bin/bash
#
# mip6d		Start script for the Mobile IPv6 daemon
#
# chkconfig:	- 55 25
# description:	The mobile IPv6 daemon allows nodes to remain \
#		reachable while moving around in the IPv6 Internet.
# processname:	mip6d
# config:	/etc/mip6d.conf
# config:	/etc/sysconfig/mip6d
#
### BEGIN INIT INFO
# Provides: mipv6-daemon
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: $syslog
# Should-Stop: $network $syslog
# Default-Start: 
# Default-Stop: 0 1 6
# Short-Description: Start and stop Mobile IPV6 daemon
# Description:	The mobile IPv6 daemon allows nodes to remain
#		reachable while moving around in the IPv6 Internet.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

if [ -f /etc/sysconfig/mip6d ]; then
	. /etc/sysconfig/mip6d
fi

mip6d=/usr/sbin/mip6d
prog="mip6d"
lockfile=/var/lock/subsys/mip6d
RETVAL=0

start() {
	echo -n $"Starting $prog: "
	daemon ${mip6d} ${ARGS} && success || failure
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch ${lockfile}
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc -d 10 $mip6d
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f ${lockfile} 
	return $RETVAL
}

reload()
{
	echo -n $"Reloading $prog configuration: "
	killproc $mip6d -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

rh_status() {
	status $prog
}

rh_status_q() {
	rh_status > /dev/null 2>&1
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	stop
	start
	;;
  reload)
	rh_status_q || exit 7
	$1
	;;
  status)
	rh_status
	;;
  *)
	echo $"Usage: $prog {start|stop|restart}"
	RETVAL=3
esac

exit $RETVAL


--- NEW FILE mip6d.sysconfig ---
ARGS=

mipv6-daemon-header-fix.patch:
 inet6_rth_getaddr.c |    1 +
 inet6_rth_init.c    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE mipv6-daemon-header-fix.patch ---
diff -Nru mipv6-daemon-umip-0.4/libmissing/inet6_rth_getaddr.c mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_getaddr.c
--- mipv6-daemon-umip-0.4/libmissing/inet6_rth_getaddr.c	2007-09-13 11:42:42.000000000 +0200
+++ mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_getaddr.c	2009-04-23 10:57:11.521890685 +0200
@@ -2,6 +2,7 @@
 
 /* This is a substitute for a missing inet6_rth_getaddr(). */
 
+#include <stddef.h>
 #include <netinet/in.h>
 
 struct in6_addr *inet6_rth_getaddr(const void *bp, int index)
diff -Nru mipv6-daemon-umip-0.4/libmissing/inet6_rth_init.c mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_init.c
--- mipv6-daemon-umip-0.4/libmissing/inet6_rth_init.c	2007-09-13 11:42:42.000000000 +0200
+++ mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_init.c	2009-04-23 10:56:58.110800384 +0200
@@ -2,6 +2,7 @@
 
 /* This is a substitute for a missing inet6_rth_init(). */
 
+#include <stddef.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>


--- NEW FILE mipv6-daemon.spec ---
Name:		mipv6-daemon
Version:	0.4
Release:	1%{?dist}
Summary:	Mobile IPv6 (MIPv6) Daemon

Group:		System Environment/Daemons
License:	GPLv2
URL:		http://www.linux-ipv6.org/memo/mipv6/
Source0:	ftp://ftp.linux-ipv6.org/pub/usagi/patch/mipv6/umip-%{version}/daemon/tarball/mipv6-daemon-umip-%{version}.tar.gz
Source1:	mip6d.init
Source2:	mip6d.sysconfig
Source3:	mip6d.conf
Patch0:		mipv6-daemon-header-fix.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	flex bison indent
Requires:	initscripts, chkconfig

%description
The mobile IPv6 daemon allows nodes to remain
reachable while moving around in the IPv6 Internet.

%prep
%setup -q -n mipv6-daemon-umip-%{version}
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_initrddir}
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/mip6d
install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mip6d
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mip6d.conf

%clean
rm -rf $RPM_BUILD_ROOT

%preun
if [ "$1" = 0 ]
then
	/sbin/service mip6d stop > /dev/null 2>&1 ||:
	/sbin/chkconfig --del mip6d
fi

%post
/sbin/chkconfig --add mip6d

%postun
if [ "$1" -ge "1" ]; then
	/sbin/service mip6d condrestart > /dev/null 2>&1 ||:
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS README README.IPsec THANKS extras
%{_initrddir}/mip6d
%config(noreplace) %{_sysconfdir}/sysconfig/mip6d
%config(noreplace) %{_sysconfdir}/mip6d.conf
%{_sbindir}/*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man7/*

%changelog
* Tue Aug 17 2009 Thomas Graf <tgraf at, redhat.com> 0.4-1
- initial package release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mipv6-daemon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:38:08 -0000	1.1
+++ .cvsignore	20 Aug 2009 08:26:47 -0000	1.2
@@ -0,0 +1 @@
+mipv6-daemon-umip-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mipv6-daemon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:38:08 -0000	1.1
+++ sources	20 Aug 2009 08:26:48 -0000	1.2
@@ -0,0 +1 @@
+a8ebeb4f41ceed71037d0f5596ccc11d  mipv6-daemon-umip-0.4.tar.gz



From hno at fedoraproject.org  Thu Aug 20 08:26:55 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 20 Aug 2009 08:26:55 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.31, 1.32 bzrtools.spec, 1.50,
	1.51 sources, 1.32, 1.33
Message-ID: <20090820082655.4F34A11C006E@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10216

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
1.18.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	13 Jul 2009 23:50:22 -0000	1.31
+++ .cvsignore	20 Aug 2009 08:26:55 -0000	1.32
@@ -1,2 +1,2 @@
-bzrtools-1.17.0.tar.gz
-bzrtools-1.17.0.tar.gz.sig
+bzrtools-1.18.0.tar.gz
+bzrtools-1.18.0.tar.gz.sig


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- bzrtools.spec	24 Jul 2009 18:33:19 -0000	1.50
+++ bzrtools.spec	20 Aug 2009 08:26:55 -0000	1.51
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.17
-%define bzrnextver 1.18
+%define bzrver 1.18
+%define bzrnextver 1.19
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18.0-2
+- Update to 1.18.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	13 Jul 2009 23:50:22 -0000	1.32
+++ sources	20 Aug 2009 08:26:55 -0000	1.33
@@ -1,2 +1,2 @@
-e03c8528ca5f455968957c44d72a6f61  bzrtools-1.17.0.tar.gz
-49490b59ffc054752a3c078fa92881b7  bzrtools-1.17.0.tar.gz.sig
+c442eacab5173b0ddc4094c6daf32c17  bzrtools-1.18.0.tar.gz
+4a673cae1e1d4e0b11cac9a5f07d8848  bzrtools-1.18.0.tar.gz.sig



From pghmcfc at fedoraproject.org  Thu Aug 20 08:37:15 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 20 Aug 2009 08:37:15 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.20,
	1.21 perl-IO-Socket-SSL.spec, 1.24, 1.25 sources, 1.20, 1.21
Message-ID: <20090820083715.7462311C006E@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12258

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Update to 1.30 (fix memleak when SSL handshake failed)
Add buildreq procps needed for memleak test



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	28 Jul 2009 08:36:40 -0000	1.20
+++ .cvsignore	20 Aug 2009 08:37:15 -0000	1.21
@@ -1 +1 @@
-IO-Socket-SSL-1.27.tar.gz
+IO-Socket-SSL-1.30.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-IO-Socket-SSL.spec	28 Jul 2009 08:36:40 -0000	1.24
+++ perl-IO-Socket-SSL.spec	20 Aug 2009 08:37:15 -0000	1.25
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.27
+Version:	1.30
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -15,6 +15,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::Simple)
 BuildRequires:	perl(IO::Socket::INET6), perl(Net::LibIDN), perl(Net::SSLeay) >= 1.21
+BuildRequires:	procps
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(Net::LibIDN)
 
@@ -60,6 +61,10 @@ done
 %{_mandir}/man3/IO::Socket::SSL.3pm*
 
 %changelog
+* Thu Aug 20 2009 Paul Howarth <paul at city-fan.org> - 1.30-1
+- Update to 1.30 (fix memleak when SSL handshake failed)
+- Add buildreq procps needed for memleak test
+
 * Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> - 1.27-1
 - Update to 1.27
   - various regex fixes for i18n and service names


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	28 Jul 2009 08:36:40 -0000	1.20
+++ sources	20 Aug 2009 08:37:15 -0000	1.21
@@ -1 +1 @@
-0099e07f576a84b5f34b6511138652c8  IO-Socket-SSL-1.27.tar.gz
+374f74487ef6fedc9326e20ac1e20dc0  IO-Socket-SSL-1.30.tar.gz



From zprikryl at fedoraproject.org  Thu Aug 20 08:39:54 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Thu, 20 Aug 2009 08:39:54 +0000 (UTC)
Subject: rpms/gpm/devel gpm-1.20.6-capability.patch, NONE, 1.1 gpm.spec, 1.76,
	1.77
Message-ID: <20090820083954.1A41A11C006E@cvs1.fedora.phx.redhat.com>

Author: zprikryl

Update of /cvs/extras/rpms/gpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13395

Modified Files:
	gpm.spec 
Added Files:
	gpm-1.20.6-capability.patch 
Log Message:
Don't complain if installing with --excludedocs (#515927)
Drop unnecessary capabilities in gpm (#517659)


gpm-1.20.6-capability.patch:
 configure.ac      |    3 +++
 src/Makefile.in   |    3 ++-
 src/daemon/main.c |    9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE gpm-1.20.6-capability.patch ---
diff -urp gpm-1.20.6.orig/configure.ac gpm-1.20.6/configure.ac
--- gpm-1.20.6.orig/configure.ac	2009-08-15 13:39:33.000000000 -0400
+++ gpm-1.20.6/configure.ac	2009-08-15 13:51:14.000000000 -0400
@@ -129,6 +129,9 @@ No|no|N|n) SHARED_LIBS=-lc ;;
     LIBS=$SAVELIBS ;;
 esac    
 
+# look for capabilities library
+LIBCAP_NG_PATH
+
 GPMXTERM=
 AC_SUBST(GPMXTERM)
 AC_SUBST(abi_lev)
diff -urp gpm-1.20.6.orig/src/daemon/main.c gpm-1.20.6/src/daemon/main.c
--- gpm-1.20.6.orig/src/daemon/main.c	2009-08-15 13:39:33.000000000 -0400
+++ gpm-1.20.6/src/daemon/main.c	2009-08-15 13:47:39.000000000 -0400
@@ -26,9 +26,18 @@
 
 #include "headers/daemon.h"
 #include "headers/gpmInt.h"
+#ifdef HAVE_LIBCAP_NG
+#include <cap-ng.h>
+#endif
 
 int main(int argc, char **argv)
 {
+#ifdef HAVE_LIBCAP_NG
+   capng_clear(CAPNG_SELECT_BOTH);
+   capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
+      CAP_SYS_ADMIN, CAP_SYS_TTY_CONFIG, -1);
+   capng_apply(CAPNG_SELECT_BOTH);
+#endif
    startup(argc,argv);  /* setup configurations */
    old_main();          /* LATER: exit(daemon()); */
    return 0;            /* if we didn't exit before, just give back success */
diff -urp gpm-1.20.6.orig/src/Makefile.in gpm-1.20.6/src/Makefile.in
--- gpm-1.20.6.orig/src/Makefile.in	2009-08-15 13:39:33.000000000 -0400
+++ gpm-1.20.6/src/Makefile.in	2009-08-15 13:49:45.000000000 -0400
@@ -82,7 +82,8 @@ prog/%:	prog/%.o
 all:	gpm lib/libgpm.so. at abi_lev@ lib/libgpm.a $(PROG)
 
 gpm:	$(GOBJ)
-	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
+	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) \
+		-lm $(CAPNG_LDADD)
 
 # construct dependings of sourcefiles and link sourcefiles
 $(DEPFILE) dep: prog/gpm-root.c


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- gpm.spec	12 Aug 2009 17:10:26 -0000	1.76
+++ gpm.spec	20 Aug 2009 08:39:53 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -14,6 +14,7 @@ Patch3: gpm-1.20.3-gcc4.3.patch
 Patch4: gpm-1.20.5-close-fds.patch
 Patch5: gpm-1.20.1-weak-wgetch.patch
 Patch6: gpm-1.20.6-libtool.patch
+Patch7: gpm-1.20.6-capability.patch
 Requires(post): /sbin/chkconfig /sbin/install-info /sbin/ldconfig 
 Requires(preun): /sbin/chkconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig 
@@ -65,6 +66,7 @@ mouse support to text-based Linux applic
 %patch4 -p1 -b .close-fds
 %patch5 -p1 -b .weak-wgetch
 %patch6 -p1 -b .libtool
+%patch7 -p1 -b .capability
 
 iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
 touch -c -r TODO TODO.utf8
@@ -107,21 +109,25 @@ rm -rf %{buildroot}
 %ifnarch s390 s390x
 /sbin/chkconfig --add gpm
 %endif
-/sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir
+if [ -e %{_infodir}/gpm.info.gz ]; then
+  /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir || :
+fi
 /sbin/ldconfig
 
 %preun
 %ifnarch s390 s390x   
-if [ "$1" = "0" ]; then
+if [ $1 = 0 ]; then
     /sbin/service gpm stop >/dev/null 2>&1
     /sbin/chkconfig --del gpm
 fi
 %endif
-/sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir || :
+if [ $1 = 0 -a -e %{_infodir}/gpm.info.gz ]; then
+  /sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir || :
+fi
 
 %postun
 %ifnarch s390 s390x
-if [ "$1" -ge "1" ]; then
+if [ $1 -ge 1 ]; then
     /sbin/service gpm condrestart >/dev/null 2>&1
 fi
 %endif
@@ -154,6 +160,10 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Thu Aug 20 2009 Zdenek Prikryl <zprikryl at redhat.com> 1.20.6-6
+- Don't complain if installing with --excludedocs (#515927)
+- Drop unnecessary capabilities in gpm (#517659)
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.20.6-5
 - Use lzma compressed upstream tarball.
 



From tgraf at fedoraproject.org  Thu Aug 20 08:45:54 2009
From: tgraf at fedoraproject.org (Thomas Graf)
Date: Thu, 20 Aug 2009 08:45:54 +0000 (UTC)
Subject: rpms/mipv6-daemon/F-11 mip6d.conf, NONE, 1.1 mip6d.init, NONE,
	1.1 mip6d.sysconfig, NONE, 1.1 mipv6-daemon-header-fix.patch,
	NONE, 1.1 mipv6-daemon.spec, NONE, 1.1
Message-ID: <20090820084554.962CB11C006E@cvs1.fedora.phx.redhat.com>

Author: tgraf

Update of /cvs/pkgs/rpms/mipv6-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14343

Added Files:
	mip6d.conf mip6d.init mip6d.sysconfig 
	mipv6-daemon-header-fix.patch mipv6-daemon.spec 
Log Message:
Initial F-11 import (#517183)



--- NEW FILE mip6d.conf ---
# This is an example of mip6d Mobile Node configuration file

NodeConfig MN;

## If set to > 0, will not detach from tty
DebugLevel 0;

## Support route optimization with other MNs
DoRouteOptimizationCN enabled;

## Use route optimization with CNs
DoRouteOptimizationMN enabled;

UseCnBuAck disabled;

MnDiscardHaParamProb enabled;

#Interface "eth0";

MnRouterProbes 1;

#MnHomeLink "eth0" {
#	HomeAgentAddress 3ffe:2620:6:1::1;
#	HomeAddress 3ffe:2620:6:1::1234/64;
#
#	#		address			opt.
#	MnRoPolicy 	3ffe:2060:6:1::3	enabled;
#	MnRoPolicy				disabled;
#}

##
## IPsec configuration
##

UseMnHaIPsec enabled;

## Key Management Mobility Capability
KeyMngMobCapability disabled;

#IPsecPolicySet {
#	HomeAgentAddress 3ffe:2620:6:1::1;
#	HomeAddress 3ffe:2620:6:1::1234/64;
#
#	IPsecPolicy Mh UseESP;
#	IPsecPolicy TunnelMh UseESP;
#
#	IPsecPolicy Mh UseESP 1 2;
#	IPsecPolicy ICMP UseESP 5;
#	IPsecPolicy TunnelMh UseESP 3 4;
#}


--- NEW FILE mip6d.init ---
#!/bin/bash
#
# mip6d		Start script for the Mobile IPv6 daemon
#
# chkconfig:	- 55 25
# description:	The mobile IPv6 daemon allows nodes to remain \
#		reachable while moving around in the IPv6 Internet.
# processname:	mip6d
# config:	/etc/mip6d.conf
# config:	/etc/sysconfig/mip6d
#
### BEGIN INIT INFO
# Provides: mipv6-daemon
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: $syslog
# Should-Stop: $network $syslog
# Default-Start: 
# Default-Stop: 0 1 6
# Short-Description: Start and stop Mobile IPV6 daemon
# Description:	The mobile IPv6 daemon allows nodes to remain
#		reachable while moving around in the IPv6 Internet.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

if [ -f /etc/sysconfig/mip6d ]; then
	. /etc/sysconfig/mip6d
fi

mip6d=/usr/sbin/mip6d
prog="mip6d"
lockfile=/var/lock/subsys/mip6d
RETVAL=0

start() {
	echo -n $"Starting $prog: "
	daemon ${mip6d} ${ARGS} && success || failure
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch ${lockfile}
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc -d 10 $mip6d
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f ${lockfile} 
	return $RETVAL
}

reload()
{
	echo -n $"Reloading $prog configuration: "
	killproc $mip6d -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

rh_status() {
	status $prog
}

rh_status_q() {
	rh_status > /dev/null 2>&1
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	stop
	start
	;;
  reload)
	rh_status_q || exit 7
	$1
	;;
  status)
	rh_status
	;;
  *)
	echo $"Usage: $prog {start|stop|restart}"
	RETVAL=3
esac

exit $RETVAL


--- NEW FILE mip6d.sysconfig ---
ARGS=

mipv6-daemon-header-fix.patch:
 inet6_rth_getaddr.c |    1 +
 inet6_rth_init.c    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE mipv6-daemon-header-fix.patch ---
diff -Nru mipv6-daemon-umip-0.4/libmissing/inet6_rth_getaddr.c mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_getaddr.c
--- mipv6-daemon-umip-0.4/libmissing/inet6_rth_getaddr.c	2007-09-13 11:42:42.000000000 +0200
+++ mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_getaddr.c	2009-04-23 10:57:11.521890685 +0200
@@ -2,6 +2,7 @@
 
 /* This is a substitute for a missing inet6_rth_getaddr(). */
 
+#include <stddef.h>
 #include <netinet/in.h>
 
 struct in6_addr *inet6_rth_getaddr(const void *bp, int index)
diff -Nru mipv6-daemon-umip-0.4/libmissing/inet6_rth_init.c mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_init.c
--- mipv6-daemon-umip-0.4/libmissing/inet6_rth_init.c	2007-09-13 11:42:42.000000000 +0200
+++ mipv6-daemon-umip-0.4.new/libmissing/inet6_rth_init.c	2009-04-23 10:56:58.110800384 +0200
@@ -2,6 +2,7 @@
 
 /* This is a substitute for a missing inet6_rth_init(). */
 
+#include <stddef.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>


--- NEW FILE mipv6-daemon.spec ---
Name:		mipv6-daemon
Version:	0.4
Release:	1%{?dist}
Summary:	Mobile IPv6 (MIPv6) Daemon

Group:		System Environment/Daemons
License:	GPLv2
URL:		http://www.linux-ipv6.org/memo/mipv6/
Source0:	ftp://ftp.linux-ipv6.org/pub/usagi/patch/mipv6/umip-%{version}/daemon/tarball/mipv6-daemon-umip-%{version}.tar.gz
Source1:	mip6d.init
Source2:	mip6d.sysconfig
Source3:	mip6d.conf
Patch0:		mipv6-daemon-header-fix.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	flex bison indent
Requires:	initscripts, chkconfig

%description
The mobile IPv6 daemon allows nodes to remain
reachable while moving around in the IPv6 Internet.

%prep
%setup -q -n mipv6-daemon-umip-%{version}
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_initrddir}
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/mip6d
install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mip6d
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mip6d.conf

%clean
rm -rf $RPM_BUILD_ROOT

%preun
if [ "$1" = 0 ]
then
	/sbin/service mip6d stop > /dev/null 2>&1 ||:
	/sbin/chkconfig --del mip6d
fi

%post
/sbin/chkconfig --add mip6d

%postun
if [ "$1" -ge "1" ]; then
	/sbin/service mip6d condrestart > /dev/null 2>&1 ||:
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS README README.IPsec THANKS extras
%{_initrddir}/mip6d
%config(noreplace) %{_sysconfdir}/sysconfig/mip6d
%config(noreplace) %{_sysconfdir}/mip6d.conf
%{_sbindir}/*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man7/*

%changelog
* Tue Aug 17 2009 Thomas Graf <tgraf at, redhat.com> 0.4-1
- initial package release



From mtasaka at fedoraproject.org  Thu Aug 20 08:47:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 08:47:00 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria.spec,1.27,1.28
Message-ID: <20090820084700.2EF6A11C006E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14763/F-10

Modified Files:
	alexandria.spec 
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
- Kill the previous 2 patches (for now)



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- alexandria.spec	19 Aug 2009 22:13:58 -0000	1.27
+++ alexandria.spec	20 Aug 2009 08:46:59 -0000	1.28
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -24,10 +24,10 @@ Source0:	http://rubyforge.org/frs/downlo
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 # Need ask to upstream
 # perhaps there is some confusion about GLib.convert...
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+#Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 # Need ask to upstream
 # Sometimes search result has empty book or cover entry
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+#Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,8 +78,8 @@ Alexandria is a GNOME application to hel
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .result
+#%%patch3 -p0 -b .glib
+#%%patch4 -p0 -b .result
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,6 +206,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
+- Kill the previous 2 patches (for now)
+
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
 - Update to 0.6.5
 - Remove 2 upstreamed patches (1 patch still unremoved)



From mtasaka at fedoraproject.org  Thu Aug 20 08:47:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 08:47:00 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria.spec,1.35,1.36
Message-ID: <20090820084700.8AF6911C006E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14763/devel

Modified Files:
	alexandria.spec 
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
- Kill the previous 2 patches (for now)



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- alexandria.spec	19 Aug 2009 22:14:00 -0000	1.35
+++ alexandria.spec	20 Aug 2009 08:47:00 -0000	1.36
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -24,10 +24,10 @@ Source0:	http://rubyforge.org/frs/downlo
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 # Need ask to upstream
 # perhaps there is some confusion about GLib.convert...
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+#Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 # Need ask to upstream
 # Sometimes search result has empty book or cover entry
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+#Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,8 +78,8 @@ Alexandria is a GNOME application to hel
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .result
+#%%patch3 -p0 -b .glib
+#%%patch4 -p0 -b .result
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,6 +206,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
+- Kill the previous 2 patches (for now)
+
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
 - Update to 0.6.5
 - Remove 2 upstreamed patches (1 patch still unremoved)



From mtasaka at fedoraproject.org  Thu Aug 20 08:47:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 08:47:00 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria.spec,1.34,1.35
Message-ID: <20090820084700.6927A11C006E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14763/F-11

Modified Files:
	alexandria.spec 
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
- Kill the previous 2 patches (for now)



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- alexandria.spec	19 Aug 2009 22:13:59 -0000	1.34
+++ alexandria.spec	20 Aug 2009 08:47:00 -0000	1.35
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -24,10 +24,10 @@ Source0:	http://rubyforge.org/frs/downlo
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 # Need ask to upstream
 # perhaps there is some confusion about GLib.convert...
-Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+#Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 # Need ask to upstream
 # Sometimes search result has empty book or cover entry
-Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+#Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,8 +78,8 @@ Alexandria is a GNOME application to hel
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .glib
-%patch4 -p0 -b .result
+#%%patch3 -p0 -b .glib
+#%%patch4 -p0 -b .result
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,6 +206,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
+- Kill the previous 2 patches (for now)
+
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
 - Update to 0.6.5
 - Remove 2 upstreamed patches (1 patch still unremoved)



From pghmcfc at fedoraproject.org  Thu Aug 20 08:48:20 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 20 Aug 2009 08:48:20 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/F-10 .cvsignore, 1.14,
	1.15 perl-IO-Socket-SSL.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20090820084820.64B5511C006E@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15197/F-10

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Resync with devel (fix memleak, i18n, and error handling)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Jul 2009 21:41:27 -0000	1.14
+++ .cvsignore	20 Aug 2009 08:48:20 -0000	1.15
@@ -1 +1 @@
-IO-Socket-SSL-1.26.tar.gz
+IO-Socket-SSL-1.30.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-10/perl-IO-Socket-SSL.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-IO-Socket-SSL.spec	4 Jul 2009 21:41:27 -0000	1.17
+++ perl-IO-Socket-SSL.spec	20 Aug 2009 08:48:20 -0000	1.18
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.26
+Version:	1.30
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -15,6 +15,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::Simple)
 BuildRequires:	perl(IO::Socket::INET6), perl(Net::LibIDN), perl(Net::SSLeay) >= 1.21
+BuildRequires:	procps
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(Net::LibIDN)
 
@@ -60,10 +61,23 @@ done
 %{_mandir}/man3/IO::Socket::SSL.3pm*
 
 %changelog
+* Thu Aug 20 2009 Paul Howarth <paul at city-fan.org> - 1.30-1
+- Update to 1.30 (fix memleak when SSL handshake failed)
+- Add buildreq procps needed for memleak test
+
+* Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> - 1.27-1
+- Update to 1.27
+  - various regex fixes for i18n and service names
+  - fix warnings from perl -w (CPAN RT#48131)
+  - improve handling of errors from Net::ssl_write_all
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul  4 2009 Paul Howarth <paul at city-fan.org> - 1.26-1
 - Update to 1.26 (verify_hostname_of_cert matched only the prefix for the
   hostname when no wildcard was given, e.g. www.example.org matched against a
-  certificate with name www.exam in it)
+  certificate with name www.exam in it [#509819])
 
 * Fri Jul  3 2009 Paul Howarth <paul at city-fan.org> - 1.25-1
 - Update to 1.25 (fix t/nonblock.t for OS X 10.5 - CPAN RT#47240)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Jul 2009 21:41:27 -0000	1.14
+++ sources	20 Aug 2009 08:48:20 -0000	1.15
@@ -1 +1 @@
-096319c7ceea6d4f42a264c55a3ea318  IO-Socket-SSL-1.26.tar.gz
+374f74487ef6fedc9326e20ac1e20dc0  IO-Socket-SSL-1.30.tar.gz



From pghmcfc at fedoraproject.org  Thu Aug 20 08:48:20 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 20 Aug 2009 08:48:20 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/F-11 .cvsignore, 1.18,
	1.19 perl-IO-Socket-SSL.spec, 1.21, 1.22 sources, 1.18, 1.19
Message-ID: <20090820084820.AE2AF11C006E@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15197/F-11

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Resync with devel (fix memleak, i18n, and error handling)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	4 Jul 2009 21:33:18 -0000	1.18
+++ .cvsignore	20 Aug 2009 08:48:20 -0000	1.19
@@ -1 +1 @@
-IO-Socket-SSL-1.26.tar.gz
+IO-Socket-SSL-1.30.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-11/perl-IO-Socket-SSL.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-IO-Socket-SSL.spec	4 Jul 2009 21:33:18 -0000	1.21
+++ perl-IO-Socket-SSL.spec	20 Aug 2009 08:48:20 -0000	1.22
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.26
+Version:	1.30
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -15,6 +15,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::Simple)
 BuildRequires:	perl(IO::Socket::INET6), perl(Net::LibIDN), perl(Net::SSLeay) >= 1.21
+BuildRequires:	procps
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(Net::LibIDN)
 
@@ -60,10 +61,23 @@ done
 %{_mandir}/man3/IO::Socket::SSL.3pm*
 
 %changelog
+* Thu Aug 20 2009 Paul Howarth <paul at city-fan.org> - 1.30-1
+- Update to 1.30 (fix memleak when SSL handshake failed)
+- Add buildreq procps needed for memleak test
+
+* Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> - 1.27-1
+- Update to 1.27
+  - various regex fixes for i18n and service names
+  - fix warnings from perl -w (CPAN RT#48131)
+  - improve handling of errors from Net::ssl_write_all
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul  4 2009 Paul Howarth <paul at city-fan.org> - 1.26-1
 - Update to 1.26 (verify_hostname_of_cert matched only the prefix for the
   hostname when no wildcard was given, e.g. www.example.org matched against a
-  certificate with name www.exam in it)
+  certificate with name www.exam in it [#509819])
 
 * Fri Jul  3 2009 Paul Howarth <paul at city-fan.org> - 1.25-1
 - Update to 1.25 (fix t/nonblock.t for OS X 10.5 - CPAN RT#47240)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	4 Jul 2009 21:33:18 -0000	1.18
+++ sources	20 Aug 2009 08:48:20 -0000	1.19
@@ -1 +1 @@
-096319c7ceea6d4f42a264c55a3ea318  IO-Socket-SSL-1.26.tar.gz
+374f74487ef6fedc9326e20ac1e20dc0  IO-Socket-SSL-1.30.tar.gz



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:25 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested watchcommits
Message-ID: <20090820085125.A758C10F857@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:27 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested approveacls
Message-ID: <20090820085127.4569710F888@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:29 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested commit
Message-ID: <20090820085129.E3D9710F897@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:31 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested watchbugzilla
Message-ID: <20090820085131.E447410F89C@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:37 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested watchbugzilla
Message-ID: <20090820085138.08E0110F8A3@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:38 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested commit
Message-ID: <20090820085139.3FBA110F8AA@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:41 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested approveacls
Message-ID: <20090820085142.00DA810F8B2@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 08:51:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 08:51:43 +0000
Subject: [pkgdb] mingw32-libjpeg: epienbro has requested watchcommits
Message-ID: <20090820085143.2582410F8B8@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libjpeg (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From denis at fedoraproject.org  Thu Aug 20 08:52:31 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 20 Aug 2009 08:52:31 +0000 (UTC)
Subject: rpms/gstreamermm/devel .cvsignore, 1.7, 1.8 gstreamermm.spec, 1.12, 
	1.13 sources, 1.7, 1.8
Message-ID: <20090820085231.62DEA11C006E@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15962

Modified Files:
	.cvsignore gstreamermm.spec sources 
Log Message:
Update to upstream 0.10.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Jun 2009 05:00:52 -0000	1.7
+++ .cvsignore	20 Aug 2009 08:52:30 -0000	1.8
@@ -1 +1 @@
-gstreamermm-0.10.2.tar.bz2
+gstreamermm-0.10.4.tar.bz2


Index: gstreamermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/devel/gstreamermm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gstreamermm.spec	25 Jul 2009 01:37:56 -0000	1.12
+++ gstreamermm.spec	20 Aug 2009 08:52:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gstreamermm
-Version:        0.10.2
-Release:        2%{?dist}
+Version:        0.10.4
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for GStreamer library
 
@@ -10,9 +10,9 @@ URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: glibmm24-devel >= 2.18.1
-BuildRequires: gstreamer-devel >= 0.10.23
-BuildRequires: gstreamer-plugins-base-devel >= 0.10.23
+BuildRequires: glibmm24-devel >= 2.21.1
+BuildRequires: gstreamer-devel >= 0.10.24
+BuildRequires: gstreamer-plugins-base-devel >= 0.10.24
 BuildRequires: libxml++-devel >= 2.14.0
 BuildRequires: doxygen graphviz m4
 
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Denis Leroy <denis at poolshark.org> - 0.10.4-1
+- Update to upstream 0.10.4
+
 * Fri Jul 24 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/gstreamermm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Jun 2009 05:00:52 -0000	1.7
+++ sources	20 Aug 2009 08:52:31 -0000	1.8
@@ -1 +1 @@
-6c62dcfe1e12d1ad05a9fa4cad19d3fc  gstreamermm-0.10.2.tar.bz2
+390e3e5d86be85021a51f59d80bb3448  gstreamermm-0.10.4.tar.bz2



From ingvar at fedoraproject.org  Thu Aug 20 09:06:49 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 09:06:49 +0000 (UTC)
Subject: rpms/varnish/devel varnish.sparc_pagesize.patch, NONE,
	1.1 varnish.spec, 1.21, 1.22
Message-ID: <20090820090649.ADFF511C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18371

Modified Files:
	varnish.spec 
Added Files:
	varnish.sparc_pagesize.patch 
Log Message:
Added a sparc specific patch to jemalloc

varnish.sparc_pagesize.patch:
 jemalloc_linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.sparc_pagesize.patch ---
--- lib/libjemalloc/jemalloc_linux.c.old	2009-08-14 10:38:53.783906580 +0200
+++ lib/libjemalloc/jemalloc_linux.c	2009-08-14 10:39:04.215906982 +0200
@@ -243,7 +243,7 @@
 #  define SIZEOF_PTR_2POW	3
 #  define NO_TLS
 #endif
-#ifdef __sparc64__
+#ifdef __sparc__
 #  define PAGESIZE_2POW		13
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	3


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- varnish.spec	27 Jul 2009 06:44:13 -0000	1.21
+++ varnish.spec	20 Aug 2009 09:06:49 -0000	1.22
@@ -1,13 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
 Patch1: varnish.s390x_pagesize.patch
+Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,6 +72,7 @@ Varnish is a high-performance HTTP accel
 
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -237,6 +239,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:15 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090716.4129510F857@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libjpeg (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:16 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090716.83D8A10F895@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libjpeg (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:16 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090716.D955F10F89B@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-libjpeg (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:18 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090718.517FC10F8A2@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-libjpeg (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:23 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090723.95C3E10F8A6@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libjpeg (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:23 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090724.1DCA910F8B2@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libjpeg (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:23 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090724.05B8510F8B0@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-libjpeg (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Aug 20 09:07:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 09:07:26 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090820090726.6D38010F8B9@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-libjpeg (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From ingvar at fedoraproject.org  Thu Aug 20 09:18:13 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 09:18:13 +0000 (UTC)
Subject: rpms/varnish/F-10 varnish.spec,1.18,1.19
Message-ID: <20090820091813.5A43811C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20953

Modified Files:
	varnish.spec 
Log Message:
2.0.4-4: Synced specfile with devel and f11


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-10/varnish.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- varnish.spec	16 Apr 2009 08:31:56 -0000	1.18
+++ varnish.spec	20 Aug 2009 09:18:13 -0000	1.19
@@ -1,12 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.s390x_pagesize.patch
+Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -69,6 +71,8 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -91,7 +95,7 @@ cp bin/varnishd/default.vcl etc/zope-plo
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
 %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 %else
@@ -235,6 +239,15 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
 * Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
   New upstream release 2.0.4 
 



From ingvar at fedoraproject.org  Thu Aug 20 09:19:45 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 09:19:45 +0000 (UTC)
Subject: rpms/varnish/F-10 varnish.s390x_pagesize.patch,NONE,1.1
Message-ID: <20090820091945.9DD5511C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21241

Added Files:
	varnish.s390x_pagesize.patch 
Log Message:
Added the s390 pagesize patch for jemalloc

varnish.s390x_pagesize.patch:
 jemalloc_linux.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE varnish.s390x_pagesize.patch ---
diff -Naur ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c ./lib/libjemalloc/jemalloc_linux.c
--- ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c	2009-02-12 12:15:24.000000000 +0100
+++ ./lib/libjemalloc/jemalloc_linux.c	2009-06-04 15:27:34.000000000 +0200
@@ -272,6 +272,11 @@
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	2
 #endif
+#ifdef __s390x__
+#  define PAGESIZE_2POW		12
+#  define QUANTUM_2POW		4
+#  define SIZEOF_PTR_2POW	3
+#endif
 
 #define	QUANTUM			((size_t)(1U << QUANTUM_2POW))
 #define	QUANTUM_MASK		(QUANTUM - 1)



From ingvar at fedoraproject.org  Thu Aug 20 09:20:49 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 09:20:49 +0000 (UTC)
Subject: rpms/varnish/F-10 varnish.sparc_pagesize.patch,NONE,1.1
Message-ID: <20090820092049.968D311C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21416

Added Files:
	varnish.sparc_pagesize.patch 
Log Message:
Added the sparc pagesize patch for jemalloc

varnish.sparc_pagesize.patch:
 jemalloc_linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.sparc_pagesize.patch ---
--- lib/libjemalloc/jemalloc_linux.c.old	2009-08-14 10:38:53.783906580 +0200
+++ lib/libjemalloc/jemalloc_linux.c	2009-08-14 10:39:04.215906982 +0200
@@ -243,7 +243,7 @@
 #  define SIZEOF_PTR_2POW	3
 #  define NO_TLS
 #endif
-#ifdef __sparc64__
+#ifdef __sparc__
 #  define PAGESIZE_2POW		13
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	3



From eseyman at fedoraproject.org  Thu Aug 20 09:40:02 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Thu, 20 Aug 2009 09:40:02 +0000 (UTC)
Subject: rpms/perl-Sub-WrapPackages/devel .cvsignore, 1.2,
	1.3 perl-Sub-WrapPackages.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090820094002.4766411C0439@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Sub-WrapPackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24930

Modified Files:
	.cvsignore perl-Sub-WrapPackages.spec sources 
Log Message:
Update to 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-WrapPackages/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jun 2009 20:28:51 -0000	1.2
+++ .cvsignore	20 Aug 2009 09:40:01 -0000	1.3
@@ -1 +1 @@
-Sub-WrapPackages-1.2.tar.gz
+Sub-WrapPackages-1.3.tar.gz


Index: perl-Sub-WrapPackages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-WrapPackages/devel/perl-Sub-WrapPackages.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Sub-WrapPackages.spec	26 Jul 2009 16:36:45 -0000	1.2
+++ perl-Sub-WrapPackages.spec	20 Aug 2009 09:40:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-WrapPackages
-Version:        1.2
-Release:        2%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Add wrappers around all the subroutines in packages
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 20 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.3-1
+- Update to 1.3
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sub-WrapPackages/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jun 2009 20:28:51 -0000	1.2
+++ sources	20 Aug 2009 09:40:02 -0000	1.3
@@ -1 +1 @@
-a9a08c1208dd42f615fdc5dac897f45a  Sub-WrapPackages-1.2.tar.gz
+5fc8afd4f644ca5842d084a5d616c132  Sub-WrapPackages-1.3.tar.gz



From pbrobinson at fedoraproject.org  Thu Aug 20 09:51:24 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 20 Aug 2009 09:51:24 +0000 (UTC)
Subject: rpms/olpc-powerd/devel .cvsignore, 1.3, 1.4 olpc-powerd.spec, 1.2, 
	1.3 sources, 1.3, 1.4 import.log, 1.2, NONE
Message-ID: <20090820095124.EC75F11C006E@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/olpc-powerd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27323

Modified Files:
	.cvsignore olpc-powerd.spec sources 
Removed Files:
	import.log 
Log Message:
- new upstream 10 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 21:23:13 -0000	1.3
+++ .cvsignore	20 Aug 2009 09:51:24 -0000	1.4
@@ -1 +1 @@
-olpc-powerd-9-gitb61ec99.tar.gz
+olpc-powerd-10-git34fc8ac.tar.gz


Index: olpc-powerd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/devel/olpc-powerd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- olpc-powerd.spec	30 Jul 2009 21:23:13 -0000	1.2
+++ olpc-powerd.spec	20 Aug 2009 09:51:24 -0000	1.3
@@ -1,13 +1,13 @@
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 9
+Version: 10
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/powerd/tree/powerd
 # Source0: the source tarball is created by "make tarball" from within
 # a clone of this git tree: git://dev.laptop.org/users/pgf/powerd
-Source0: olpc-powerd-9-gitb61ec99.tar.gz
+Source0: olpc-powerd-10-git34fc8ac.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: kernel-headers
 Requires: olpc-kbdshim, upstart
@@ -104,9 +104,16 @@ fi
 exit 0
 
 %changelog
+* Thu Aug 13 2009 Paul Fox <pgf at laptop.org>
+- 10-1
+- prevent running on non-XO hardware
+- workaround rtcwake bug
+- prevent console spew, by redirecting stderr weven when not logging.
+
 * Thu Jul 30 2009 Paul Fox <pgf at laptop.org>
 - 9-1
-- disable tracing, by default.  use "powerd-control =tracing-on" to enable at runtime.
+- disable tracing, by default.  use "powerd-control =tracing-on"
+    to enable at runtime.
 - create the inhibit file so that root owns it and can make it writeable.
 - don't brighten the screen on wlan wakeups.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-powerd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 21:23:13 -0000	1.3
+++ sources	20 Aug 2009 09:51:24 -0000	1.4
@@ -1 +1 @@
-7cc49b84ae66f9ed0c2dc841ce3c9b9a  olpc-powerd-9-gitb61ec99.tar.gz
+6cdb70a4e754b3dac45090ca98b143d9  olpc-powerd-10-git34fc8ac.tar.gz


--- import.log DELETED ---



From twaugh at fedoraproject.org  Thu Aug 20 09:56:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 20 Aug 2009 09:56:41 +0000 (UTC)
Subject: rpms/foomatic-db/devel foomatic-db.spec,1.3,1.4
Message-ID: <20090820095641.D5A5F11C006E@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28279

Modified Files:
	foomatic-db.spec 
Log Message:
* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 4.0-6.20090819
- Removed references to foo2slx and foo2hiperc (bug #518267).



Index: foomatic-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic-db/devel/foomatic-db.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- foomatic-db.spec	19 Aug 2009 11:49:13 -0000	1.3
+++ foomatic-db.spec	20 Aug 2009 09:56:41 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 5.%{dbver_snap}%{?dist}
+Release: 6.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -61,7 +61,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}-*
@@ -129,6 +130,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 4.0-6.20090819
+- Removed references to foo2slx and foo2hiperc (bug #518267).
+
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 4.0-5.20090819
 - Updated to foomatic-db-4.0-20090819.
 - Removed deprecated foomatic-db-hpijs tarball.



From twaugh at fedoraproject.org  Thu Aug 20 09:57:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 20 Aug 2009 09:57:56 +0000 (UTC)
Subject: rpms/foomatic/F-11 foomatic.spec,1.220,1.221
Message-ID: <20090820095756.B759C11C006E@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28543

Modified Files:
	foomatic.spec 
Log Message:
* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
- Removed references to foo2slx and foo2hiperc (bug #518267).



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- foomatic.spec	4 Aug 2009 15:27:56 -0000	1.220
+++ foomatic.spec	20 Aug 2009 09:57:56 -0000	1.221
@@ -111,7 +111,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}-*
@@ -247,7 +248,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
+* 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).



From rhughes at fedoraproject.org  Thu Aug 20 10:02:43 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 20 Aug 2009 10:02:43 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-11
	gnome-power-manager-2.26.4-work-around-xsync-bug.patch, NONE,
	1.1 gnome-power-manager.spec, 1.160, 1.161
Message-ID: <20090820100243.77D3911C006E@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29250

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.4-work-around-xsync-bug.patch 
Log Message:
* Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-2
- Use a larger DPMS idletime timeout to mitigate an XSync bug


gnome-power-manager-2.26.4-work-around-xsync-bug.patch:
 gpm-idle.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE gnome-power-manager-2.26.4-work-around-xsync-bug.patch ---
commit bebf24f41c43f0b2338aefea87f39ba7423d02be
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Aug 14 11:17:45 2009 +0100

    Use a larger DPMS idletime timeout to mitigate an XSync bug

diff --git a/src/gpm-idle.c b/src/gpm-idle.c
index 852f0f3..abe6075 100644
--- a/src/gpm-idle.c
+++ b/src/gpm-idle.c
@@ -51,6 +51,11 @@
 #define GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE	1.0f /* seconds */
 #define	GPM_IDLE_IDLETIME_ID			1
 
+/* XSync seems to be unreliable when setting small values of time.
+ * Ideally we want this to be 1ms (or smaller!) to reduce the chance of a race,
+ * but this fails to trigger on some systems. */
+#define GPM_IDLE_SMALLEST_RESET_VALUE		500 /* ms */
+
 struct GpmIdlePrivate
 {
 	EggIdletime	*idletime;
@@ -366,8 +371,8 @@ gpm_idle_idletime_reset_cb (EggIdletime *idletime, GpmIdle *idle)
 	if (idle->priv->mode == GPM_IDLE_MODE_BLANK &&
 	    elapsed < GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE) {
 		egg_debug ("ignoring reset, as we've just done a state change");
-		/* make sure we trigger a short 1ms timeout so we can get the expired signal */
-		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, 1);
+		/* make sure we trigger a short timeout so we can get the expired signal */
+		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, GPM_IDLE_SMALLEST_RESET_VALUE);
 		return;
 	}
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- gnome-power-manager.spec	3 Aug 2009 16:26:20 -0000	1.160
+++ gnome-power-manager.spec	20 Aug 2009 10:02:43 -0000	1.161
@@ -4,7 +4,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.26/gnome-power-manager-%{version}.tar.gz
@@ -12,6 +12,9 @@ Source: http://download.gnome.org/source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
+# upstream, bebf24f41c43f0b2338aefea87f39ba7423d02be
+Patch1:    gnome-power-manager-2.26.4-work-around-xsync-bug.patch
+
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -56,6 +59,7 @@ change preferences.
 
 %prep
 %setup -q
+%patch1 -p1 -b .xsync-bug
 
 %build
 %configure \
@@ -162,6 +166,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-2
+- Use a larger DPMS idletime timeout to mitigate an XSync bug
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-1
 - Update to 2.26.4
 - Fixes #514275, #512962 and #514249



From tgraf at fedoraproject.org  Thu Aug 20 10:04:58 2009
From: tgraf at fedoraproject.org (Thomas Graf)
Date: Thu, 20 Aug 2009 10:04:58 +0000 (UTC)
Subject: rpms/mipv6-daemon/F-11 mipv6-daemon.spec,1.1,1.2 sources,1.1,1.2
Message-ID: <20090820100458.7A51011C006E@cvs1.fedora.phx.redhat.com>

Author: tgraf

Update of /cvs/pkgs/rpms/mipv6-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29777

Modified Files:
	mipv6-daemon.spec sources 
Log Message:
updated sources file



Index: mipv6-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mipv6-daemon/F-11/mipv6-daemon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mipv6-daemon.spec	20 Aug 2009 08:45:54 -0000	1.1
+++ mipv6-daemon.spec	20 Aug 2009 10:04:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		mipv6-daemon
 Version:	0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mobile IPv6 (MIPv6) Daemon
 
 Group:		System Environment/Daemons


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mipv6-daemon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:38:08 -0000	1.1
+++ sources	20 Aug 2009 10:04:58 -0000	1.2
@@ -0,0 +1 @@
+a8ebeb4f41ceed71037d0f5596ccc11d  mipv6-daemon-umip-0.4.tar.gz



From ingvar at fedoraproject.org  Thu Aug 20 10:04:49 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 10:04:49 +0000 (UTC)
Subject: rpms/varnish/F-11 varnish.sparc_pagesize.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 sources, 1.9, 1.10 varnish.spec, 1.19, 1.20
Message-ID: <20090820100449.66A0911C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29800

Modified Files:
	.cvsignore sources varnish.spec 
Added Files:
	varnish.sparc_pagesize.patch 
Log Message:
New upstream release 2.0.4. Added arch specific patches to jemalloc

varnish.sparc_pagesize.patch:
 jemalloc_linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.sparc_pagesize.patch ---
--- lib/libjemalloc/jemalloc_linux.c.old	2009-08-14 10:38:53.783906580 +0200
+++ lib/libjemalloc/jemalloc_linux.c	2009-08-14 10:39:04.215906982 +0200
@@ -243,7 +243,7 @@
 #  define SIZEOF_PTR_2POW	3
 #  define NO_TLS
 #endif
-#ifdef __sparc64__
+#ifdef __sparc__
 #  define PAGESIZE_2POW		13
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 Feb 2009 16:17:51 -0000	1.9
+++ .cvsignore	20 Aug 2009 10:04:49 -0000	1.10
@@ -1 +1 @@
-varnish-2.0.3.tar.gz
+varnish-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	12 Feb 2009 16:17:51 -0000	1.9
+++ sources	20 Aug 2009 10:04:49 -0000	1.10
@@ -1 +1 @@
-4233ad2fc3d0c2fcf7bf399f6ccf50b2  varnish-2.0.3.tar.gz
+8044d59cb6d2ec6d09b7ae6033f06bbf  varnish-2.0.4.tar.gz


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/F-11/varnish.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- varnish.spec	5 Jun 2009 09:59:06 -0000	1.19
+++ varnish.spec	20 Aug 2009 10:04:49 -0000	1.20
@@ -1,13 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 2.0.4
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
 Patch1: varnish.s390x_pagesize.patch
+Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -65,13 +66,14 @@ Varnish is a high-performance HTTP accel
 %setup -q
 #%setup -q -n varnish-cache
 
-%patch0 -p0
-%patch1 -p0
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
 	ppc64 | s390x | x86_64 | sparc64 )
@@ -237,9 +239,18 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.3-3
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
 - Added a s390 specific patch to libjemalloc.
 
+* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
+  New upstream release 2.0.4 
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From salimma at fedoraproject.org  Thu Aug 20 10:25:52 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 10:25:52 +0000 (UTC)
Subject: rpms/scheme2js/F-10 scheme2js.spec,1.1,1.2
Message-ID: <20090820102552.9E67F11C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/scheme2js/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1639/F-10

Modified Files:
	scheme2js.spec 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3
- Rebuild for Bigloo update



Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/F-10/scheme2js.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scheme2js.spec	9 Mar 2009 15:42:53 -0000	1.1
+++ scheme2js.spec	20 Aug 2009 10:25:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           scheme2js
 Version:        20081219
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Scheme to JavaScript compiler
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3
+- Rebuild for Bigloo update
+
 * Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-2
 - Not building on ppc64, as bigloo is not available
 



From salimma at fedoraproject.org  Thu Aug 20 10:25:52 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 10:25:52 +0000 (UTC)
Subject: rpms/scheme2js/F-11 scheme2js.spec,1.1,1.2
Message-ID: <20090820102552.BF73811C0347@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/scheme2js/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1639/F-11

Modified Files:
	scheme2js.spec 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3
- Rebuild for Bigloo update



Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/F-11/scheme2js.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scheme2js.spec	9 Mar 2009 15:42:54 -0000	1.1
+++ scheme2js.spec	20 Aug 2009 10:25:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           scheme2js
 Version:        20081219
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Scheme to JavaScript compiler
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3
+- Rebuild for Bigloo update
+
 * Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-2
 - Not building on ppc64, as bigloo is not available
 



From pkgdb at fedoraproject.org  Thu Aug 20 10:33:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 10:33:04 +0000
Subject: [pkgdb] jakarta-commons-fileupload: akurtakov has requested
	watchcommits
Message-ID: <20090820103304.A625310F855@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on jakarta-commons-fileupload (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-fileupload



From pkgdb at fedoraproject.org  Thu Aug 20 10:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 10:33:05 +0000
Subject: [pkgdb] jakarta-commons-fileupload: akurtakov has requested
	watchbugzilla
Message-ID: <20090820103305.6590610F881@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on jakarta-commons-fileupload (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-fileupload



From pkgdb at fedoraproject.org  Thu Aug 20 10:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 10:33:05 +0000
Subject: [pkgdb] jakarta-commons-fileupload: akurtakov has requested commit
Message-ID: <20090820103306.033D510F888@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on jakarta-commons-fileupload (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-fileupload



From caolanm at fedoraproject.org  Thu Aug 20 10:47:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 20 Aug 2009 10:47:39 +0000 (UTC)
Subject: rpms/hunspell-hil/devel .cvsignore, 1.2, 1.3 hunspell-hil.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090820104739.BDBDA11C006E@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-hil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5943

Modified Files:
	.cvsignore hunspell-hil.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-hil/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Nov 2008 09:25:06 -0000	1.2
+++ .cvsignore	20 Aug 2009 10:47:38 -0000	1.3
@@ -1 +1 @@
-aspell5-hil-0.11-0.tar.bz2
+hunspell-hil-0.13.oxt


Index: hunspell-hil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-hil/devel/hunspell-hil.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hunspell-hil.spec	25 Jul 2009 02:28:21 -0000	1.4
+++ hunspell-hil.spec	20 Aug 2009 10:47:38 -0000	1.5
@@ -1,15 +1,14 @@
 Name: hunspell-hil
 Summary: Hiligaynon hunspell dictionaries
-%define upstreamid 20050406
-Version: 0.%{upstreamid}
-Release: 4%{?dist}
+Epoch: 1
+Version: 0.13
+Release: 1%{?dist}
 Group: Applications/Text
-Source: http://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-0.11-0.tar.bz2
-URL: http://borel.slu.edu/crubadan/apps.html
+Source: http://borel.slu.edu/obair/%{name}-%{version}.oxt
+URL: http://extensions.services.openoffice.org/project/hunspell-hil
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL+
+License: GPLv3+
 BuildArch: noarch
-BuildRequires: aspell, hunspell-devel
 
 Requires: hunspell
 
@@ -17,14 +16,10 @@ Requires: hunspell
 Hiligaynon hunspell dictionaries.
 
 %prep
-%setup -q -n aspell5-hil-0.11-0
+%setup -q -c
 
 %build
-export LANG=hil_PH.utf8
-preunzip -d *.cwl
-cat *.wl > hiligaynon.wordlist
-wordlist2hunspell hiligaynon.wordlist hil_PH
-for i in Copyright doc/Crawler.txt; do
+for i in dictionaries/README_hil_PH.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
@@ -38,17 +33,20 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cp -p dictionaries/hil_PH.* $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING Copyright README doc/Crawler.txt
+%doc LICENSES-en.txt dictionaries/README_hil_PH.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Aug 20 2009 Caolan McNamara <caolanm at redhat.com> - 1:0.13-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20050406-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-hil/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Nov 2008 09:25:06 -0000	1.2
+++ sources	20 Aug 2009 10:47:38 -0000	1.3
@@ -1 +1 @@
-6ce553007a773a1c2ffd68b660ddb60b  aspell5-hil-0.11-0.tar.bz2
+365fed8431561bae423d031108f87033  hunspell-hil-0.13.oxt



From sharkcz at fedoraproject.org  Thu Aug 20 10:55:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 20 Aug 2009 10:55:38 +0000 (UTC)
Subject: rpms/scribus/devel .cvsignore, 1.21, 1.22 scribus.spec, 1.47,
	1.48 sources, 1.21, 1.22
Message-ID: <20090820105538.5A76911C006E@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7381

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
* Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
- update to final 1.3.5.1
- drop the upstreamed "install-headers" patch
- always install doc subpackage (#464148)
- full changelog: http://www.scribus.net/?q=node/193



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	21 Jul 2009 18:53:02 -0000	1.21
+++ .cvsignore	20 Aug 2009 10:55:37 -0000	1.22
@@ -1 +1 @@
-scribus-1.3.5.rc3.tar.bz2
+scribus-1.3.5.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- scribus.spec	29 Jul 2009 11:19:16 -0000	1.47
+++ scribus.spec	20 Aug 2009 10:55:38 -0000	1.48
@@ -1,15 +1,14 @@
 Name:           scribus
-Version:        1.3.5
-Release:        0.17.rc3%{?dist}
+Version:        1.3.5.1
+Release:        1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-1.3.5-system-hyphen.patch
-Patch1:         %{name}-1.3.5-install-headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -23,7 +22,7 @@ BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel >= 2.3
+BuildRequires:  python-devel
 BuildRequires:  python-imaging-devel
 BuildRequires:  qt-devel
 BuildRequires:  zlib-devel
@@ -34,11 +33,12 @@ BuildRequires:  aspell-devel
 BuildRequires:  boost-devel
 BuildRequires:  podofo-devel
 BuildRequires:  hyphen-devel
-Requires:       ghostscript >= 7.07
-Requires:       python >= 2.3
+Requires:       ghostscript
+Requires:       python
 Requires:       python-imaging
 Requires:       tkinter
 Requires:       shared-mime-info
+Requires:       %{name}-doc = %{version}-%{release}
 
 
 %description
@@ -74,9 +74,8 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}.rc3
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .system-hyphen
-%patch1 -p1 -b .install-headers
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -92,7 +91,7 @@ chmod a-x scribus/pageitem_latexframe.h
 %build
 mkdir build
 pushd build
-%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} ..
+%cmake ..
 
 %ifnarch s390x
 make VERBOSE=1 %{?_smp_mflags}
@@ -115,9 +114,6 @@ install -p -D -m0644 ${RPM_BUILD_ROOT}%{
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
-# remove empty dirs in %{_includedir}
-rm -rf ${RPM_BUILD_ROOT}%{_includedir}/%{name}/{dicts,doc,dtd,editorconfig,icons,keysets,loremipsum,manpages,profiles,swatches,templates,unicodemap}
-
 # install the global desktop file
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
 desktop-file-install --vendor="fedora"                      \
@@ -139,7 +135,12 @@ update-mime-database %{_datadir}/mime > 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO
+%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLogSVN
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/TODO
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
@@ -157,26 +158,27 @@ update-mime-database %{_datadir}/mime > 
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5.rc3
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc3/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc3/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc3/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc3/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc3/pl
-%{_datadir}/doc/%{name}-1.3.5.rc3/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5.rc3/BUILDING
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5.rc3/COPYING
-%{_datadir}/doc/%{name}-1.3.5.rc3/NEWS
-%{_datadir}/doc/%{name}-1.3.5.rc3/README*
-%{_datadir}/doc/%{name}-1.3.5.rc3/TODO
-%{_datadir}/doc/%{name}-1.3.5.rc3/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5.rc3/LINKS
-%{_datadir}/doc/%{name}-1.3.5.rc3/TRANSLATION
+%dir %{_datadir}/doc/%{name}-%{version}
+%lang(cs) %{_datadir}/doc/%{name}-%{version}/cs
+%lang(de) %{_datadir}/doc/%{name}-%{version}/de
+%lang(en) %{_datadir}/doc/%{name}-%{version}/en
+%lang(fr) %{_datadir}/doc/%{name}-%{version}/fr
+%lang(pl) %{_datadir}/doc/%{name}-%{version}/pl
+%{_datadir}/doc/%{name}-%{version}/BUILDING
+%{_datadir}/doc/%{name}-%{version}/NEWS
+%{_datadir}/doc/%{name}-%{version}/README*
+%{_datadir}/doc/%{name}-%{version}/PACKAGING
+%{_datadir}/doc/%{name}-%{version}/LINKS
+%{_datadir}/doc/%{name}-%{version}/TRANSLATION
 
 
 %changelog
+* Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
+- update to final 1.3.5.1
+- drop the upstreamed "install-headers" patch
+- always install doc subpackage (#464148)
+- full changelog: http://www.scribus.net/?q=node/193
+
 * Wed Jul 29 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5-0.17.rc3
 - don't use parallel build on s390x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	21 Jul 2009 18:53:02 -0000	1.21
+++ sources	20 Aug 2009 10:55:38 -0000	1.22
@@ -1 +1 @@
-4c030bbec4405743fd2d3f842622351c  scribus-1.3.5.rc3.tar.bz2
+4cadca0c780491ad61dc2d815776f10b  scribus-1.3.5.1.tar.bz2



From fabbione at fedoraproject.org  Thu Aug 20 11:04:56 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 20 Aug 2009 11:04:56 +0000 (UTC)
Subject: rpms/fence-agents/devel .cvsignore, 1.11, 1.12 fence-agents.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <20090820110456.8296611C006E@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980

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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	8 Jul 2009 21:18:02 -0000	1.11
+++ .cvsignore	20 Aug 2009 11:04:56 -0000	1.12
@@ -1 +1 @@
-fence-agents-3.0.0.tar.gz
+fence-agents-3.0.1.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fence-agents.spec	24 Jul 2009 22:41:04 -0000	1.13
+++ fence-agents.spec	20 Aug 2009 11:04:56 -0000	1.14
@@ -18,8 +18,8 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.0
-Release: 15%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -83,6 +83,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	8 Jul 2009 21:18:02 -0000	1.11
+++ sources	20 Aug 2009 11:04:56 -0000	1.12
@@ -1 +1 @@
-7bc650a9654a4e5059120243666b5eb5  fence-agents-3.0.0.tar.gz
+6e4349514e78860082df7eb61bc91bf5  fence-agents-3.0.1.tar.gz



From kanarip at fedoraproject.org  Thu Aug 20 11:06:05 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Thu, 20 Aug 2009 11:06:05 +0000 (UTC)
Subject: rpms/rubygem-fattr/F-10 import.log, NONE, 1.1 license.txt, NONE,
	1.1 rubygem-fattr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090820110605.BA0DC11C006E@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-fattr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license.txt rubygem-fattr.spec 
Log Message:
1.0.3-3


--- NEW FILE import.log ---
rubygem-fattr-1_0_3-3_fc11:F-10:rubygem-fattr-1.0.3-3.fc11.src.rpm:1250766344


--- 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-fattr.spec ---
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname fattr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Summary:        Fatter attribute for Ruby
Version:        1.0.3
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2 or Ruby
URL:            http://rubyforge.org/projects/codeforpeople/
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:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
The fattr gem is a Fatter attribute for Ruby

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}/%{gemdir} \
            --force %{SOURCE0}

install -p -m 644 %{SOURCE1} %{buildroot}%{geminstdir}/

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Delete zero-length files
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/license.txt
%doc %{geminstdir}/README
%doc %{geminstdir}/README.tmpl
%doc %{geminstdir}/samples
%dir %{geminstdir}/
%{geminstdir}/lib
%{geminstdir}/*.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Thu Aug 13 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-3
- Really fix license
- Include license

* Wed Aug 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-2
- Fix license (Ruby)
- Fix URL

* Tue Jul 28 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-1
- First build of this package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fattr/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:17:59 -0000	1.1
+++ .cvsignore	20 Aug 2009 11:06:05 -0000	1.2
@@ -0,0 +1 @@
+fattr-1.0.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fattr/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:17:59 -0000	1.1
+++ sources	20 Aug 2009 11:06:05 -0000	1.2
@@ -0,0 +1 @@
+681345f63e8f0159159f3f8228385158  fattr-1.0.3.gem



From kanarip at fedoraproject.org  Thu Aug 20 11:07:10 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Thu, 20 Aug 2009 11:07:10 +0000 (UTC)
Subject: rpms/rubygem-fattr/F-11 import.log, NONE, 1.1 license.txt, NONE,
	1.1 rubygem-fattr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090820110710.0068A11C006E@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-fattr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9740/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license.txt rubygem-fattr.spec 
Log Message:
1.0.3-3


--- NEW FILE import.log ---
rubygem-fattr-1_0_3-3_fc11:F-11:rubygem-fattr-1.0.3-3.fc11.src.rpm:1250766409


--- 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-fattr.spec ---
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname fattr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Summary:        Fatter attribute for Ruby
Version:        1.0.3
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2 or Ruby
URL:            http://rubyforge.org/projects/codeforpeople/
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:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
The fattr gem is a Fatter attribute for Ruby

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}/%{gemdir} \
            --force %{SOURCE0}

install -p -m 644 %{SOURCE1} %{buildroot}%{geminstdir}/

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Delete zero-length files
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/license.txt
%doc %{geminstdir}/README
%doc %{geminstdir}/README.tmpl
%doc %{geminstdir}/samples
%dir %{geminstdir}/
%{geminstdir}/lib
%{geminstdir}/*.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Thu Aug 13 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-3
- Really fix license
- Include license

* Wed Aug 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-2
- Fix license (Ruby)
- Fix URL

* Tue Jul 28 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-1
- First build of this package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fattr/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:17:59 -0000	1.1
+++ .cvsignore	20 Aug 2009 11:07:09 -0000	1.2
@@ -0,0 +1 @@
+fattr-1.0.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fattr/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:17:59 -0000	1.1
+++ sources	20 Aug 2009 11:07:09 -0000	1.2
@@ -0,0 +1 @@
+681345f63e8f0159159f3f8228385158  fattr-1.0.3.gem



From kanarip at fedoraproject.org  Thu Aug 20 11:08:24 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Thu, 20 Aug 2009 11:08:24 +0000 (UTC)
Subject: rpms/rubygem-fattr/devel import.log, NONE, 1.1 license.txt, NONE,
	1.1 rubygem-fattr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090820110824.AEC7B11C006E@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-fattr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10145/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license.txt rubygem-fattr.spec 
Log Message:
1.0.3-3


--- NEW FILE import.log ---
rubygem-fattr-1_0_3-3_fc11:HEAD:rubygem-fattr-1.0.3-3.fc11.src.rpm:1250766482


--- 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-fattr.spec ---
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname fattr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Name:           rubygem-%{gemname}
Summary:        Fatter attribute for Ruby
Version:        1.0.3
Release:        3%{?dist}
Group:          Development/Languages
License:        GPLv2 or Ruby
URL:            http://rubyforge.org/projects/codeforpeople/
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:       rubygems
Requires:       ruby(abi) = 1.8
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
The fattr gem is a Fatter attribute for Ruby

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}/%{gemdir} \
            --force %{SOURCE0}

install -p -m 644 %{SOURCE1} %{buildroot}%{geminstdir}/

# Remove backup files
find %{buildroot}/%{geminstdir} -type f -name "*~" -delete

# Delete zero-length files
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Fix anything executable that does not have a shebang
for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
    [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
done

# Find files with a shebang that do not have executable permissions
for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
    [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
done

# Find files that have non-standard-executable-perm
find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;

# Find files that are not readable
find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/license.txt
%doc %{geminstdir}/README
%doc %{geminstdir}/README.tmpl
%doc %{geminstdir}/samples
%dir %{geminstdir}/
%{geminstdir}/lib
%{geminstdir}/*.rb
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Thu Aug 13 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-3
- Really fix license
- Include license

* Wed Aug 05 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-2
- Fix license (Ruby)
- Fix URL

* Tue Jul 28 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1.0.3-1
- First build of this package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fattr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:17:59 -0000	1.1
+++ .cvsignore	20 Aug 2009 11:08:24 -0000	1.2
@@ -0,0 +1 @@
+fattr-1.0.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-fattr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:17:59 -0000	1.1
+++ sources	20 Aug 2009 11:08:24 -0000	1.2
@@ -0,0 +1 @@
+681345f63e8f0159159f3f8228385158  fattr-1.0.3.gem



From fabbione at fedoraproject.org  Thu Aug 20 11:08:45 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 20 Aug 2009 11:08:45 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.27, 1.28 cluster.spec, 1.56,
	1.57 sources, 1.28, 1.29
Message-ID: <20090820110845.7BECB11C006E@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10298

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.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	8 Jul 2009 21:07:06 -0000	1.27
+++ .cvsignore	20 Aug 2009 11:08:45 -0000	1.28
@@ -1 +1 @@
-cluster-3.0.0.tar.gz
+cluster-3.0.1.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- cluster.spec	24 Jul 2009 19:08:21 -0000	1.56
+++ cluster.spec	20 Aug 2009 11:08:45 -0000	1.57
@@ -18,8 +18,8 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.0
-Release: 21%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -191,6 +191,7 @@ The Red Hat Cluster libraries developmen
 %{_includedir}/libcman.h
 %{_includedir}/libdlm*.h
 %{_includedir}/libfence.h
+%{_includedir}/libfenced.h
 %{_includedir}/liblogthread.h
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
@@ -300,6 +301,9 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	8 Jul 2009 21:07:06 -0000	1.28
+++ sources	20 Aug 2009 11:08:45 -0000	1.29
@@ -1 +1 @@
-93101d0f3c724a46caee1f9f16abe4af  cluster-3.0.0.tar.gz
+77252edca5f1d11d74610bf9a89d7445  cluster-3.0.1.tar.gz



From fabbione at fedoraproject.org  Thu Aug 20 11:09:30 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 20 Aug 2009 11:09:30 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.13,
	1.14 resource-agents.spec, 1.14, 1.15 sources, 1.13, 1.14
Message-ID: <20090820110930.1AC2311C006E@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10586

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New rgmanager resource agents



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Aug 2009 08:24:40 -0000	1.13
+++ .cvsignore	20 Aug 2009 11:09:29 -0000	1.14
@@ -1,2 +1,2 @@
 2198dc90bec4.tar.bz2
-resource-agents-3.0.0.tar.gz
+resource-agents-3.0.1.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- resource-agents.spec	18 Aug 2009 08:24:40 -0000	1.14
+++ resource-agents.spec	20 Aug 2009 11:09:29 -0000	1.15
@@ -24,8 +24,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.0
-Release: 16%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -155,6 +155,9 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
+- New rgmanager resource agents upstream release
+
 * Tue Aug 18 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-16
 - Create an ldirectord package
 - Update Pacameker agents to upstream version: 2198dc90bec4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	18 Aug 2009 08:24:40 -0000	1.13
+++ sources	20 Aug 2009 11:09:29 -0000	1.14
@@ -1,2 +1,2 @@
 af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2
-485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
+c9fcac80111a360605faecc3b8baa89d  resource-agents-3.0.1.tar.gz



From akurtakov at fedoraproject.org  Thu Aug 20 11:13:16 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 11:13:16 +0000 (UTC)
Subject: rpms/easymock2/devel build.xml.tar.gz, NONE, 1.1 fetch-easymock.sh, 
	NONE, 1.1 easymock2.spec, NONE, 1.1 easymock-MANIFEST.MF, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820111316.7BF5D11C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/easymock2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12090/devel

Modified Files:
	.cvsignore sources 
Added Files:
	build.xml.tar.gz fetch-easymock.sh easymock2.spec 
	easymock-MANIFEST.MF 
Log Message:
Initial import.


--- NEW FILE build.xml.tar.gz ---
?
??????}????>5
~`0??C|>??
??x??????
??F???g???/'{{?F?B?8'??i?`??,????R????X?$!???\\y??)???=t??????P2*???|{?????? &?(?????=?????P?krE{0!?L?zn??,??(?BADnh?L??+jF?O????\?*q?G5Kf???jb?<=??????	`$_???oB?SN&???J??3a?g"*%????!DO? ??a ????1J<?,/??^?z????_6?J?P??{???????~??????????wA?1D?
?p?o?\?a??????????S???5?????????????aA??@w???T??l???v'k?+?NYL??:sdw??A???p??f
????s~?????8??????$??We)&ib??D??
=??kFmd?%UZW???i?b:??PVU?wGZ?1?{??????w<?#%?em??????Jl???t????#Pm????????,??lB????wA]??,?v?????B??-,???'*x????D??I???&?~??`J!?o????[????{?}???G???n?KJ? ?b?A??81\?mp??????z??_?
dg*x??5~?Z?W?*4?a??QVg????r0g?U?KY?????Y?W?\??????B??onH????ip}???h?b?M???)??bd{???[???*?????z?I?K??TI?W???ho?vY?"
?????UV??U??5?????V?k??V1?U?J?^?,%6???*???L???5??U5?P??&_?v??5??F??YB??.x??C????5n!f~??
?f??aa????>n??0
hf?'?'"?q?Y????i?'
???7	>?1??4??C???ok%??;?
)1??~?????E}-???/X?LEbV`??-Z at q*??+?!U?j?r,??nO?<JXh??A?FZ????8???9?C?
`;?+
f???kTo???y???
??l????WRD????[i
?$??????Q??????J?u?]??X?]T?T?p??K?????Zn`??{Rt2h??k?S
-V??r?4????????@ ?7?j
<??
???u?9"v??d??Et?Ril???K?{#??JZ%?Y?6?*	??AU?V??6???j??r??b,???6u)v?\<?????^?k?hZ???yz?]???4?&r?*c??#??R??	?$O??????F00=$4hG???]A??F?b+???	???eED?G?9??	??\??kM	S??-YH???N?sY?D?9g=E????EDa?j?`[?~@ckbA?????G???qz?Y???0?G????q-??&-??8bI?5??E?I???e?Oo??????{>?]7??
]??7?R?}:?J???Tj(?????5???????u????????`??Z?E$??%?l?!8!?i?^?K??Yw*??g?|wl@/???=??Pf?M.QiK??.?????T?.B??zH????A???PE?j</???j??-??[e&?Zas?/?p???j(?L?|???+???s5????:???c^x:?d?????????d'??????z?c?]???a??<:}?????wo??MG
??[??????????[??V?w?i???p?[_??Q???J[;???????????I?$??s???d???q???J?
??\ii???????????[?$??u???^?H??k-D?a?X	?.?`q??\??N??H?f?D??&Q????~i?2?y-H?d.w	?Z?)A?V??B??%[cr3!??YR?H?Z?3"??f?//???^8?z????y???c"(?f??@?B?E???????P?|?????????w??J?|?%?`W3?I??|88|?R?q7p?kwpqvv~??$?8???$}
oi,??&!?7CPDGLu?jg?
z?
h??e?SoSk?H?Q??|??i?SW??y??K??|??\?Vq?]!????W??????*+ at W,?
????y????????57%??[P??>????????,??&?????}??r?S??????_-????26
?LUX??>??*?;???O???:%1?:??P?C????l????CN?LND?????q?G7N~??"[?n?f?V{?$??)B6 ??"????a??????i????iM?????C??2?d?l???
+n:b*??zu?j???0?fL?F???)=f?????)?mX^?^--H?dI???#?0?S??6???*????3Y???????:????:????:????:????:????:?????????

--- NEW FILE fetch-easymock.sh ---
#!/bin/sh
VERSION=2.5
svn export https://easymock.svn.sourceforge.net/svnroot/easymock/tags/easymock-2.5/ easymock
tar -czf easymock-$VERSION.tgz easymock

--- NEW FILE easymock2.spec ---
Name:           easymock2
Version:        2.5
Release:        3%{?dist}
Summary:        Easy mock objects
License:        MIT
Group:          Development/Languages
URL:            http://easymock.org/
# generated by sh fetch-easymock.sh
Source0:        easymock-%{version}.tgz
# extracted from http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.easymock_2.4.0.v20090202-0900.jar#META-INF/MANIFEST.MF
Source1:        easymock-MANIFEST.MF
# generated by mvn ant:ant
Source2:        build.xml.tar.gz
Source3:        fetch-easymock.sh

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  ant >= 0:1.6
BuildRequires:  junit >= 3.8.1
BuildRequires:  java-javadoc
Requires:       java
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       jpackage-utils >= 0:1.7.2

%description
EasyMock provides Mock Objects for interfaces in JUnit tests by generating
them on the fly using Java's proxy mechanism. Due to EasyMock's unique style
of recording expectations, most refactorings will not affect the Mock Objects.
So EasyMock is a perfect fit for Test-Driven Development.

%package javadoc
Summary:    Javadoc for %{name}
Group:      Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n easymock
mkdir -p .m2/repository/JPP/maven2/default_poms
tar xzf %{SOURCE2}

# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;

%build
ant -Dmaven.mode.offline=true -Dmaven.repo.local=.m2 -Dmaven.test.skip=true package javadoc

# inject OSGi manifests
mkdir -p META-INF
cp -p %{SOURCE1} META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF

%install
rm -rf %{buildroot}

# jars
install -d -m 755 %{buildroot}%{_javadir}
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}

install -m 644 target/%{name}-%{version}.jar \
    %{buildroot}%{_javadir}/%{name}-%{version}.jar

(cd %{buildroot}%{_javadir} &&
    for jar in *-%{version}*;
        do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`;
    done
)

# pom
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/apidocs

%clean
rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadir}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/*

%changelog
* Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-3
- Renamed to easymock2.

* Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-2
- Use %%{buildroot} instead of $RPM_BUILD_ROOT.
- Add comment for MANIFEST.MF origin.

* Fri Aug 14 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-1
- Initial package.


--- NEW FILE easymock-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %bundleName
Bundle-SymbolicName: org.easymock
Export-Package: org.easymock;version="2.4.0",org.easymock.internal;ver
 sion="2.4.0",org.easymock.internal.matchers;version="2.4.0"
Bundle-Version: 2.4.0.v20090202-0900
Bundle-ManifestVersion: 2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/easymock2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 13:36:43 -0000	1.1
+++ .cvsignore	20 Aug 2009 11:13:16 -0000	1.2
@@ -0,0 +1 @@
+easymock-2.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/easymock2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 13:36:43 -0000	1.1
+++ sources	20 Aug 2009 11:13:16 -0000	1.2
@@ -0,0 +1 @@
+9f34ecd463ecfa4d70a9f4cf028897df  easymock-2.5.tgz



From ingvar at fedoraproject.org  Thu Aug 20 11:15:52 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 11:15:52 +0000 (UTC)
Subject: rpms/varnish/EL-5 varnish.s390x_pagesize.patch, NONE,
	1.1 varnish.sparc_pagesize.patch, NONE, 1.1 varnish.spec, 1.8, 1.9
Message-ID: <20090820111552.2CCD511C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12568

Modified Files:
	varnish.spec 
Added Files:
	varnish.s390x_pagesize.patch varnish.sparc_pagesize.patch 
Log Message:
Added arch specific patches to jemalloc.

varnish.s390x_pagesize.patch:
 jemalloc_linux.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE varnish.s390x_pagesize.patch ---
diff -Naur ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c ./lib/libjemalloc/jemalloc_linux.c
--- ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c	2009-02-12 12:15:24.000000000 +0100
+++ ./lib/libjemalloc/jemalloc_linux.c	2009-06-04 15:27:34.000000000 +0200
@@ -272,6 +272,11 @@
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	2
 #endif
+#ifdef __s390x__
+#  define PAGESIZE_2POW		12
+#  define QUANTUM_2POW		4
+#  define SIZEOF_PTR_2POW	3
+#endif
 
 #define	QUANTUM			((size_t)(1U << QUANTUM_2POW))
 #define	QUANTUM_MASK		(QUANTUM - 1)

varnish.sparc_pagesize.patch:
 jemalloc_linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.sparc_pagesize.patch ---
--- lib/libjemalloc/jemalloc_linux.c.old	2009-08-14 10:38:53.783906580 +0200
+++ lib/libjemalloc/jemalloc_linux.c	2009-08-14 10:39:04.215906982 +0200
@@ -243,7 +243,7 @@
 #  define SIZEOF_PTR_2POW	3
 #  define NO_TLS
 #endif
-#ifdef __sparc64__
+#ifdef __sparc__
 #  define PAGESIZE_2POW		13
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	3


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- varnish.spec	15 Apr 2009 12:40:37 -0000	1.8
+++ varnish.spec	20 Aug 2009 11:15:51 -0000	1.9
@@ -1,12 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.s390x_pagesize.patch
+Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -69,6 +71,8 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -91,7 +95,7 @@ cp bin/varnishd/default.vcl etc/zope-plo
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
 %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 %else
@@ -235,6 +239,15 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
 * Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
   New upstream release 2.0.4 
 



From pkgdb at fedoraproject.org  Thu Aug 20 11:19:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 11:19:34 +0000
Subject: [pkgdb] gnome-user-share had acl change status
Message-ID: <20090820111934.3D1F610F86F@bastion2.fedora.phx.redhat.com>

hadess has set the commit acl on gnome-user-share (Fedora devel) to Approved for tbzatek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-user-share



From pkgdb at fedoraproject.org  Thu Aug 20 11:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 11:19:43 +0000
Subject: [pkgdb] gnome-user-share had acl change status
Message-ID: <20090820111949.5FC5910F80B@bastion2.fedora.phx.redhat.com>

hadess has set the commit acl on gnome-user-share (Fedora 11) to Approved for tbzatek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-user-share



From tbzatek at fedoraproject.org  Thu Aug 20 11:21:58 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu, 20 Aug 2009 11:21:58 +0000 (UTC)
Subject: rpms/gnome-user-share/F-11 do-not-localize-realms.patch, NONE,
	1.1 gnome-user-share.spec, 1.53, 1.54
Message-ID: <20090820112158.96FA511C006E@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-user-share/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13647

Modified Files:
	gnome-user-share.spec 
Added Files:
	do-not-localize-realms.patch 
Log Message:
* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-3
- Do not localize realm in passwd files (#500123)


do-not-localize-realms.patch:
 file-share-properties.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE do-not-localize-realms.patch ---
>From f77498214f945c988a0bcbe570782dcaf37e771d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 26 Jun 2009 09:30:42 +0000
Subject: Bug 586755 ? Localized realm in the passwd file doesn't work

And apparently, they're not supposed to either... So remove the
translation for the realm instead.
---
diff --git a/src/file-share-properties.c b/src/file-share-properties.c
index 2b9cd2e..4d69a62 100644
--- a/src/file-share-properties.c
+++ b/src/file-share-properties.c
@@ -32,7 +32,7 @@
 
 #include "user_share-private.h"
 
-#define REALM N_("Please log in as the user guest")
+#define REALM "Please log in as the user guest"
 #define USER "guest"
 
 static GtkBuilder* builder;
@@ -47,10 +47,10 @@ write_out_password (const char *password)
     char *filename;
     FILE *file;
 
-    to_hash = g_strdup_printf ("%s:%s:%s", USER, _(REALM), password);
+    to_hash = g_strdup_printf ("%s:%s:%s", USER, REALM, password);
     ascii_digest = g_compute_checksum_for_string (G_CHECKSUM_MD5, to_hash, strlen (to_hash));
     g_free (to_hash);
-    line = g_strdup_printf ("%s:%s:%s\n", USER, _(REALM), ascii_digest);
+    line = g_strdup_printf ("%s:%s:%s\n", USER, REALM, ascii_digest);
     g_free (ascii_digest);
 
     filename = g_build_filename (g_get_user_config_dir (), "user-share", "passwd", NULL);
--
cgit v0.8.2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-share/F-11/gnome-user-share.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnome-user-share.spec	6 Apr 2009 03:11:59 -0000	1.53
+++ gnome-user-share.spec	20 Aug 2009 11:21:58 -0000	1.54
@@ -1,13 +1,16 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.26.0
-Release: 2%{?dist}
+Release: 3%{?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
 # 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -46,6 +49,7 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
+%patch1 -p1 -b .realm-localization
 
 %build
 %configure
@@ -123,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-3
+- Do not localize realm in passwd files (#500123)
+
 * Sun Apr  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Fix a menu reference in the docs (#494253)
 



From jzeleny at fedoraproject.org  Thu Aug 20 11:22:40 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu, 20 Aug 2009 11:22:40 +0000 (UTC)
Subject: rpms/dcbd/devel dcbd.spec,1.3,1.4
Message-ID: <20090820112240.D95B811C006E@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13819

Modified Files:
	dcbd.spec 
Log Message:
rebuild in order to match new libconfig


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dcbd.spec	17 Aug 2009 11:48:11 -0000	1.3
+++ dcbd.spec	20 Aug 2009 11:22:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dcbd
 Version:        0.9.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-2
+- rebuild in order to match new libconfig
+
 * Mon Aug 17 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-1
 - rebase to 0.9.15
 



From ingvar at fedoraproject.org  Thu Aug 20 11:25:39 2009
From: ingvar at fedoraproject.org (Ingvar Hagelund)
Date: Thu, 20 Aug 2009 11:25:39 +0000 (UTC)
Subject: rpms/varnish/EL-4 varnish.s390x_pagesize.patch, NONE,
	1.1 varnish.sparc_pagesize.patch, NONE, 1.1 varnish.spec, 1.18, 1.19
Message-ID: <20090820112539.B130A11C006E@cvs1.fedora.phx.redhat.com>

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419

Modified Files:
	varnish.spec 
Added Files:
	varnish.s390x_pagesize.patch varnish.sparc_pagesize.patch 
Log Message:
Added arch specific patches to jemalloc.

varnish.s390x_pagesize.patch:
 jemalloc_linux.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE varnish.s390x_pagesize.patch ---
diff -Naur ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c ./lib/libjemalloc/jemalloc_linux.c
--- ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c	2009-02-12 12:15:24.000000000 +0100
+++ ./lib/libjemalloc/jemalloc_linux.c	2009-06-04 15:27:34.000000000 +0200
@@ -272,6 +272,11 @@
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	2
 #endif
+#ifdef __s390x__
+#  define PAGESIZE_2POW		12
+#  define QUANTUM_2POW		4
+#  define SIZEOF_PTR_2POW	3
+#endif
 
 #define	QUANTUM			((size_t)(1U << QUANTUM_2POW))
 #define	QUANTUM_MASK		(QUANTUM - 1)

varnish.sparc_pagesize.patch:
 jemalloc_linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE varnish.sparc_pagesize.patch ---
--- lib/libjemalloc/jemalloc_linux.c.old	2009-08-14 10:38:53.783906580 +0200
+++ lib/libjemalloc/jemalloc_linux.c	2009-08-14 10:39:04.215906982 +0200
@@ -243,7 +243,7 @@
 #  define SIZEOF_PTR_2POW	3
 #  define NO_TLS
 #endif
-#ifdef __sparc64__
+#ifdef __sparc__
 #  define PAGESIZE_2POW		13
 #  define QUANTUM_2POW		4
 #  define SIZEOF_PTR_2POW	3


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-4/varnish.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- varnish.spec	15 Apr 2009 13:30:10 -0000	1.18
+++ varnish.spec	20 Aug 2009 11:25:39 -0000	1.19
@@ -1,12 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.s390x_pagesize.patch
+Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -69,6 +71,8 @@ Varnish is a high-performance HTTP accel
 #./autogen.sh
 
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -91,7 +95,7 @@ cp bin/varnishd/default.vcl etc/zope-plo
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
 %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 %else
@@ -235,6 +239,15 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
 * Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
   New upstream release 2.0.4 
 



From mgrepl at fedoraproject.org  Thu Aug 20 11:27:42 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 20 Aug 2009 11:27:42 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 booleans-targeted.conf, 1.49,
	1.50 policy-20090521.patch, 1.45, 1.46 selinux-policy.spec,
	1.899, 1.900
Message-ID: <20090820112742.C0BA911C006E@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-serv14743

Modified Files:
	booleans-targeted.conf policy-20090521.patch 
	selinux-policy.spec 
Log Message:
- Fixes for racoon 
- Fixes for ptchown
- Fixes for openvpn




Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/booleans-targeted.conf,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- booleans-targeted.conf	20 May 2009 17:28:16 -0000	1.49
+++ booleans-targeted.conf	20 Aug 2009 11:27:42 -0000	1.50
@@ -122,6 +122,10 @@ nfs_export_all_rw = true
 # 
 nfs_export_all_ro = true
 
+# Allow openvpn to read home directories
+# 
+openvpn_enable_homedirs = true
+
 # Allow pppd to load kernel modules for certain modems
 # 
 pppd_can_insmod = false

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.if               |   18 +
 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/usermanage.te        |    1 
 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/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 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          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   30 +++
 policy/modules/kernel/files.if            |    3 
 policy/modules/kernel/kernel.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    |    9 
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/apache.fc         |    4 
 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/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/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    6 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |    7 
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   17 +
 policy/modules/services/hal.te            |   14 +
 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/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/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/rpc.te            |   12 +
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/sasl.te           |    2 
 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/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |    4 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 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             |    2 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 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       |   30 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 138 files changed, 2304 insertions(+), 644 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- policy-20090521.patch	14 Aug 2009 06:45:12 -0000	1.45
+++ policy-20090521.patch	20 Aug 2009 11:27:42 -0000	1.46
@@ -1,3 +1,21 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.12/man/man8/samba_selinux.8
+--- nsaserefpolicy/man/man8/samba_selinux.8	2009-04-07 21:54:45.000000000 +0200
++++ serefpolicy-3.6.12/man/man8/samba_selinux.8	2009-08-19 18:01:06.000000000 +0200
+@@ -20,7 +20,7 @@
+ .TP
+ This command adds the following entry to /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local:
+ .TP
+-/var/eng(/.*)? system_u:object_r:samba_share_t
++/var/eng(/.*)? system_u:object_r:samba_share_t:s0
+ .TP
+ Run the restorecon command to apply the changes:
+ .TP
+@@ -53,4 +53,4 @@
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+ 
+ .SH "SEE ALSO"
+-selinux(8), samba(7), chcon(1), setsebool(8)
++selinux(8), samba(7), chcon(1), setsebool(8), semanage(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.12/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/mcs	2009-07-08 21:09:33.000000000 +0200
@@ -550,6 +568,18 @@ diff -b -B --ignore-all-space --exclude-
  
  # Execute /usr/bin/{passwd,chfn,chsh} and /usr/sbin/{useradd,vipw}.
  corecmd_exec_bin(groupadd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/awstats.te serefpolicy-3.6.12/policy/modules/apps/awstats.te
+--- nsaserefpolicy/policy/modules/apps/awstats.te	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/awstats.te	2009-08-19 18:08:12.000000000 +0200
+@@ -28,6 +28,8 @@
+ awstats_rw_pipes(awstats_t)
+ awstats_cgi_exec(awstats_t)
+ 
++can_exec(awstats_t, awstats_exec_t)
++
+ manage_dirs_pattern(awstats_t, awstats_tmp_t, awstats_tmp_t)
+ manage_files_pattern(awstats_t, awstats_tmp_t, awstats_tmp_t)
+ files_tmp_filetrans(awstats_t, awstats_tmp_t, { dir file })
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/calamaris.te serefpolicy-3.6.12/policy/modules/apps/calamaris.te
 --- nsaserefpolicy/policy/modules/apps/calamaris.te	2009-04-07 21:54:49.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/calamaris.te	2009-08-05 23:27:19.000000000 +0200
@@ -718,6 +748,29 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	ssh_rw_pipes(gitosis_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.6.12/policy/modules/apps/gpg.if
+--- nsaserefpolicy/policy/modules/apps/gpg.if	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/gpg.if	2009-08-18 15:05:46.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ 	# allow ps to show gpg
+ 	ps_process_pattern($2, gpg_t)
+-	allow $2 gpg_t:process { signal sigkill };
++	allow $2 gpg_t:process { signull sigstop signal sigkill };
+ 
+ 	# communicate with the user 
+ 	allow gpg_helper_t $2:fd use;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.6.12/policy/modules/apps/gpg.te
+--- nsaserefpolicy/policy/modules/apps/gpg.te	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/gpg.te	2009-08-18 15:06:47.000000000 +0200
+@@ -90,6 +90,7 @@
+ corenet_tcp_connect_all_ports(gpg_t)
+ corenet_sendrecv_all_client_packets(gpg_t)
+ 
++dev_read_generic_usb_dev(gpg_t)
+ dev_read_rand(gpg_t)
+ dev_read_urand(gpg_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.6.12/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/mozilla.if	2009-07-08 21:12:05.000000000 +0200
@@ -856,8 +909,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.6.12/policy/modules/apps/ptchown.te
 --- nsaserefpolicy/policy/modules/apps/ptchown.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.6.12/policy/modules/apps/ptchown.te	2009-08-14 08:31:55.000000000 +0200
-@@ -0,0 +1,39 @@
++++ serefpolicy-3.6.12/policy/modules/apps/ptchown.te	2009-08-20 09:35:25.000000000 +0200
+@@ -0,0 +1,40 @@
 +policy_module(ptchown,1.0.0)
 +
 +########################################
@@ -877,7 +930,7 @@ diff -b -B --ignore-all-space --exclude-
 +# ptchown local policy
 +#
 +
-+allow ptchown_t self:capability { fowner chown setuid };
++allow ptchown_t self:capability { chown fowner fsetid setuid };
 +allow ptchown_t self:process { getcap setcap };
 +
 +# Init script handling
@@ -891,9 +944,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +fs_rw_anon_inodefs_files(ptchown_t)
 +
-+term_use_generic_ptys(ptchown_t)
 +term_setattr_generic_ptys(ptchown_t)
 +term_setattr_all_user_ptys(ptchown_t)
++term_use_generic_ptys(ptchown_t)
++term_use_ptmx(ptchown_t)
 +
 +miscfiles_read_localization(ptchown_t)
 +
@@ -3305,7 +3359,7 @@ diff -b -B --ignore-all-space --exclude-
 +logging_send_syslog_msg(nslcd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.12/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-04-07 21:54:45.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/openvpn.te	2009-07-08 21:10:15.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/openvpn.te	2009-08-20 09:42:28.000000000 +0200
 @@ -86,6 +86,7 @@
  corenet_udp_bind_openvpn_port(openvpn_t)
  corenet_tcp_connect_openvpn_port(openvpn_t)
@@ -3314,6 +3368,39 @@ diff -b -B --ignore-all-space --exclude-
  corenet_rw_tun_tap_dev(openvpn_t)
  corenet_sendrecv_openvpn_server_packets(openvpn_t)
  corenet_sendrecv_openvpn_client_packets(openvpn_t)
+@@ -98,6 +99,8 @@
+ files_read_etc_files(openvpn_t)
+ files_read_etc_runtime_files(openvpn_t)
+ 
++auth_use_pam(openvpn_t)
++
+ logging_send_syslog_msg(openvpn_t)
+ 
+ miscfiles_read_localization(openvpn_t)
+@@ -114,6 +117,16 @@
+ 	userdom_read_user_home_content_files(openvpn_t)
+ ')
+ 
++tunable_policy(`openvpn_enable_homedirs && use_nfs_home_dirs',`
++        fs_read_nfs_files(openvpn_t)
++        fs_read_nfs_symlinks(openvpn_t)
++')
++
++tunable_policy(`openvpn_enable_homedirs && use_samba_home_dirs',`
++        fs_read_cifs_files(openvpn_t)
++        fs_read_cifs_symlinks(openvpn_t)
++')
++
+ optional_policy(`
+ 	daemontools_service_domain(openvpn_t, openvpn_exec_t)
+ ')
+@@ -122,5 +135,6 @@
+ 	dbus_system_bus_client(openvpn_t)
+ 	dbus_connect_system_bus(openvpn_t)
+ 
++	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.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
@@ -3630,6 +3717,18 @@ diff -b -B --ignore-all-space --exclude-
  	auth_read_all_dirs_except_shadow(rsync_t)
  	auth_read_all_files_except_shadow(rsync_t)
  	auth_read_all_symlinks_except_shadow(rsync_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.6.12/policy/modules/services/sasl.te
+--- nsaserefpolicy/policy/modules/services/sasl.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/sasl.te	2009-08-18 14:47:01.000000000 +0200
+@@ -31,7 +31,7 @@
+ # Local policy
+ #
+ 
+-allow saslauthd_t self:capability setuid;
++allow saslauthd_t self:capability { setgid setuid };
+ dontaudit saslauthd_t self:capability sys_tty_config;
+ allow saslauthd_t self:process signal_perms;
+ allow saslauthd_t self:fifo_file rw_fifo_file_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/sendmail.if	2009-07-31 13:22:05.000000000 +0200
@@ -4029,7 +4128,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.fc serefpolicy-3.6.12/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/spamassassin.fc	2009-07-07 08:44:02.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/spamassassin.fc	2009-08-19 17:48:56.000000000 +0200
 @@ -1,13 +1,15 @@
 +/root/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
  HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
@@ -4047,6 +4146,14 @@ diff -b -B --ignore-all-space --exclude-
  /usr/sbin/spamd		--	gen_context(system_u:object_r:spamd_exec_t,s0)
  /usr/bin/mimedefang-multiplexor --	gen_context(system_u:object_r:spamd_exec_t,s0)
  
+@@ -20,5 +22,5 @@
+ 
+ /var/spool/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
+ /var/spool/spamd(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
+-/var/spool/MD-Quarantine(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
+-/var/spool/MIMEDefang(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
++/var/spool/MD-Quarantine(/.*)?		gen_context(system_u:object_r:spamd_var_run_t,s0)
++/var/spool/MIMEDefang(/.*)?		gen_context(system_u:object_r:spamd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/spamassassin.te	2009-07-13 11:32:30.000000000 +0200
@@ -4380,8 +4487,62 @@ 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-04 12:46:42.000000000 +0200
-@@ -42,8 +42,7 @@
++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-08-20 10:24:42.000000000 +0200
+@@ -30,6 +30,53 @@
+ 	dontaudit $2 shadow_t:file read_file_perms;
+ ')
+ 
++#######################################
++## <summary>
++##      Make the specified domain used for a login program.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain type used for a login program domain.
++##      </summary>
++## </param>
++#
++interface(`auth_use_pam',`
++
++	# for SSP/ProPolice
++	dev_read_urand($1)
++	# for encrypted homedir
++	dev_read_sysfs($1)
++
++	auth_domtrans_chk_passwd($1)
++        auth_domtrans_upd_passwd($1)
++        auth_dontaudit_read_shadow($1)
++        auth_read_login_records($1)
++        auth_append_login_records($1)
++        auth_rw_lastlog($1)
++        auth_rw_faillog($1)
++        auth_exec_pam($1)
++        auth_use_nsswitch($1)
++
++        logging_send_audit_msgs($1)
++        logging_send_syslog_msg($1)
++
++        optional_policy(`
++                dbus_system_bus_client($1)
++                optional_policy(`
++                        consolekit_dbus_chat($1)
++                ')
++        ')
++
++        optional_policy(`
++                kerberos_manage_host_rcache($1)
++                kerberos_read_config($1)
++        ')
++
++        optional_policy(`
++                nis_authenticate($1)
++        ')
++')
++
+ ########################################
+ ## <summary>
+ ##	Make the specified domain used for a login program.
+@@ -42,8 +89,7 @@
  #
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -4391,7 +4552,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	domain_type($1)
-@@ -77,6 +76,8 @@
+@@ -77,6 +123,8 @@
  
  	# for SSP/ProPolice
  	dev_read_urand($1)
@@ -4400,7 +4561,7 @@ diff -b -B --ignore-all-space --exclude-
  	# for fingerprint readers
  	dev_rw_input_dev($1)
  	dev_rw_generic_usb_dev($1)
-@@ -143,6 +144,11 @@
+@@ -143,6 +191,11 @@
  	')
  
  	optional_policy(`
@@ -4412,7 +4573,7 @@ diff -b -B --ignore-all-space --exclude-
  		fprintd_dbus_chat($1)
  	')
  
-@@ -153,6 +159,7 @@
+@@ -153,6 +206,7 @@
  	optional_policy(`
  		ssh_agent_exec($1)
  		userdom_read_user_home_content_files($1)
@@ -4420,7 +4581,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  ')
-@@ -238,6 +245,97 @@
+@@ -238,6 +292,97 @@
  
  ########################################
  ## <summary>
@@ -4518,7 +4679,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Run unix_chkpwd to check a password.
  ## </summary>
  ## <param name="domain">
-@@ -726,7 +824,7 @@
+@@ -726,7 +871,7 @@
  
  ########################################
  ## <summary>
@@ -4527,7 +4688,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1258,6 +1356,25 @@
+@@ -1258,6 +1403,25 @@
  
  ########################################
  ## <summary>
@@ -4553,7 +4714,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write to
  ##	login records files.
  ## </summary>
-@@ -1415,6 +1532,10 @@
+@@ -1415,6 +1579,10 @@
  	')
  
  	optional_policy(`
@@ -4564,7 +4725,7 @@ diff -b -B --ignore-all-space --exclude-
  		sssd_stream_connect($1)
  	')
  
-@@ -1456,99 +1577,3 @@
+@@ -1456,99 +1624,3 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -4796,15 +4957,38 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.12/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-06-25 10:21:01.000000000 +0200
-@@ -1,5 +1,5 @@
++++ serefpolicy-3.6.12/policy/modules/system/ipsec.te	2009-08-20 13:08:01.000000000 +0200
+@@ -1,11 +1,18 @@
  
 -policy_module(ipsec, 1.9.0)
 +policy_module(ipsec, 1.9.1)
  
  ########################################
  #
-@@ -53,7 +53,7 @@
+ # Declarations
+ #
+ 
++## <desc>
++## <p>
++## Allow racoon to read shadow
++## </p>
++## </desc>
++gen_tunable(racoon_read_shadow, false)
++
+ type ipsec_t;
+ type ipsec_exec_t;
+ init_daemon_domain(ipsec_t,ipsec_exec_t)
+@@ -43,6 +50,9 @@
+ init_daemon_domain(racoon_t,racoon_exec_t)
+ role system_r types racoon_t;
+ 
++type racoon_tmp_t;
++files_tmp_file(racoon_tmp_t)
++
+ type setkey_t;
+ type setkey_exec_t;
+ init_system_domain(setkey_t,setkey_exec_t)
+@@ -53,7 +63,7 @@
  # ipsec Local policy
  #
  
@@ -4813,7 +4997,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit ipsec_t self:capability sys_tty_config;
  allow ipsec_t self:process { getsched signal setsched };
  allow ipsec_t self:tcp_socket create_stream_socket_perms;
-@@ -67,7 +67,7 @@
+@@ -67,7 +77,7 @@
  read_lnk_files_pattern(ipsec_t,ipsec_conf_file_t,ipsec_conf_file_t)
  
  allow ipsec_t ipsec_key_file_t:dir list_dir_perms;
@@ -4822,7 +5006,16 @@ 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)
-@@ -103,13 +103,11 @@
+@@ -82,7 +92,7 @@
+ # 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;
+-allow ipsec_mgmt_t ipsec_t:fifo_file rw_file_perms;
++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)
+@@ -103,13 +113,11 @@
  corenet_raw_sendrecv_all_nodes(ipsec_t)
  corenet_tcp_sendrecv_all_ports(ipsec_t)
  corenet_tcp_bind_all_nodes(ipsec_t)
@@ -4837,7 +5030,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_sendrecv_generic_server_packets(ipsec_t)
  corenet_sendrecv_isakmp_server_packets(ipsec_t)
  
-@@ -130,7 +128,7 @@
+@@ -130,7 +138,7 @@
  
  files_read_etc_files(ipsec_t)
  files_read_usr_files(ipsec_t)
@@ -4846,7 +5039,7 @@ diff -b -B --ignore-all-space --exclude-
  
  init_use_fds(ipsec_t)
  init_use_script_ptys(ipsec_t)
-@@ -158,12 +156,12 @@
+@@ -158,12 +166,12 @@
  #
  
  allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
@@ -4861,7 +5054,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)
-@@ -171,8 +169,6 @@
+@@ -171,8 +179,6 @@
  allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
  files_pid_filetrans(ipsec_mgmt_t,ipsec_mgmt_var_run_t,file)
  
@@ -4870,7 +5063,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
  manage_lnk_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
  
-@@ -248,6 +244,8 @@
+@@ -248,6 +254,8 @@
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
  
@@ -4879,15 +5072,21 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(ipsec_mgmt_t)
  
  modutils_domtrans_insmod(ipsec_mgmt_t)
-@@ -284,6 +282,7 @@
+@@ -284,6 +292,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;
 +allow racoon_t self:fifo_file rw_fifo_file_perms;
++
++manage_dirs_pattern(racoon_t, racoon_tmp_t, racoon_tmp_t)
++manage_files_pattern(racoon_t, racoon_tmp_t, racoon_tmp_t)
++files_tmp_filetrans(racoon_t, racoon_tmp_t, { dir file })
++
++can_exec(racoon_t, setkey_exec_t)
  
  # manage pid file
  manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
-@@ -301,11 +300,21 @@
+@@ -301,11 +316,21 @@
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
  
@@ -4910,7 +5109,30 @@ diff -b -B --ignore-all-space --exclude-
  corenet_udp_bind_ipsecnat_port(racoon_t)
  
  dev_read_urand(racoon_t)
-@@ -348,6 +357,7 @@
+@@ -315,6 +340,8 @@
+ 
+ files_read_etc_files(racoon_t)
+ 
++fs_dontaudit_getattr_xattr_fs(racoon_t)
++
+ # allow racoon to use avc_has_perm to check context on proposed SA
+ selinux_compute_access_vector(racoon_t)
+ 
+@@ -329,6 +356,13 @@
+ 
+ miscfiles_read_localization(racoon_t)
+ 
++auth_use_pam(racoon_t)
++
++auth_can_read_shadow_passwords(racoon_t)
++tunable_policy(`racoon_read_shadow',`
++        auth_tunable_read_shadow(racoon_t)
++')
++
+ ########################################
+ #
+ # Setkey local policy
+@@ -348,6 +382,7 @@
  files_read_etc_files(setkey_t)
  
  init_dontaudit_use_fds(setkey_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -p -r1.899 -r1.900
--- selinux-policy.spec	14 Aug 2009 06:45:12 -0000	1.899
+++ selinux-policy.spec	20 Aug 2009 11:27:42 -0000	1.900
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 78%{?dist}
+Release: 79%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,11 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 20 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-79
+- Fixes for racoon 
+- Fixes for ptchown
+- Fixes for openvpn
+
 * Fri Aug 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-78
 - Add ptchown policy from Dan Walsh
 



From karsten at fedoraproject.org  Thu Aug 20 11:31:48 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 20 Aug 2009 11:31:48 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.174,1.175
Message-ID: <20090820113148.C57E411C006E@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15716

Modified Files:
	pango.spec 
Log Message:
- fix autoconf host on s390x


Index: pango.spec
===================================================================
RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- pango.spec	17 Aug 2009 23:23:05 -0000	1.174
+++ pango.spec	20 Aug 2009 11:31:48 -0000	1.175
@@ -9,7 +9,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.25.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -95,6 +95,8 @@ esac
 
 # autoconf uses powerpc not ppc
 host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux on s390x
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
 
 # Make sure that the host value that is passed to the compile
 # is the same as the host that we're using in the spec file
@@ -226,6 +228,9 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2
+- fix autoconf host on s390x
+
 * Tue Aug 17 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.4-1
 - 1.25.4
 



From dwalsh at fedoraproject.org  Thu Aug 20 11:39:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 20 Aug 2009 11:39:48 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.117,
	1.118 setroubleshoot.spec, 1.155, 1.156 sources, 1.130, 1.131
Message-ID: <20090820113948.CD95C11C006E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17067

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.21-1
- Turn on copy to clipboard button



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- .cvsignore	18 Aug 2009 19:27:57 -0000	1.117
+++ .cvsignore	20 Aug 2009 11:39:48 -0000	1.118
@@ -34,3 +34,4 @@ setroubleshoot-2.2.17.tar.gz
 setroubleshoot-2.2.18.tar.gz
 setroubleshoot-2.2.19.tar.gz
 setroubleshoot-2.2.20.tar.gz
+setroubleshoot-2.2.21.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- setroubleshoot.spec	18 Aug 2009 19:27:57 -0000	1.155
+++ setroubleshoot.spec	20 Aug 2009 11:39:48 -0000	1.156
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.20
+Version: 2.2.21
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -209,6 +209,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.21-1
+- Turn on copy to clipboard button
+
 * Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.20-1
 -Update to upstream 
 	2009-8-18 Thomas Liu <tliu at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- sources	18 Aug 2009 19:27:57 -0000	1.130
+++ sources	20 Aug 2009 11:39:48 -0000	1.131
@@ -1 +1 @@
-6367af7f7ba87cedbfd9bd0aa41cccdd  setroubleshoot-2.2.20.tar.gz
+535e0277b89dce5486c42b6dbb05b033  setroubleshoot-2.2.21.tar.gz



From tbzatek at fedoraproject.org  Thu Aug 20 12:00:01 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu, 20 Aug 2009 12:00:01 +0000 (UTC)
Subject: rpms/gnome-user-share/devel do-not-localize-realms.patch, NONE,
	1.1 gnome-user-share.spec, 1.56, 1.57
Message-ID: <20090820120001.2AD0111C006E@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21170

Modified Files:
	gnome-user-share.spec 
Added Files:
	do-not-localize-realms.patch 
Log Message:
* Thu Aug 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-6
- Do not localize realm in passwd files (#500123)


do-not-localize-realms.patch:
 file-share-properties.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE do-not-localize-realms.patch ---
>From f77498214f945c988a0bcbe570782dcaf37e771d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 26 Jun 2009 09:30:42 +0000
Subject: Bug 586755 ? Localized realm in the passwd file doesn't work

And apparently, they're not supposed to either... So remove the
translation for the realm instead.
---
diff --git a/src/file-share-properties.c b/src/file-share-properties.c
index 2b9cd2e..4d69a62 100644
--- a/src/file-share-properties.c
+++ b/src/file-share-properties.c
@@ -32,7 +32,7 @@
 
 #include "user_share-private.h"
 
-#define REALM N_("Please log in as the user guest")
+#define REALM "Please log in as the user guest"
 #define USER "guest"
 
 static GtkBuilder* builder;
@@ -47,10 +47,10 @@ write_out_password (const char *password)
     char *filename;
     FILE *file;
 
-    to_hash = g_strdup_printf ("%s:%s:%s", USER, _(REALM), password);
+    to_hash = g_strdup_printf ("%s:%s:%s", USER, REALM, password);
     ascii_digest = g_compute_checksum_for_string (G_CHECKSUM_MD5, to_hash, strlen (to_hash));
     g_free (to_hash);
-    line = g_strdup_printf ("%s:%s:%s\n", USER, _(REALM), ascii_digest);
+    line = g_strdup_printf ("%s:%s:%s\n", USER, REALM, ascii_digest);
     g_free (ascii_digest);
 
     filename = g_build_filename (g_get_user_config_dir (), "user-share", "passwd", NULL);
--
cgit v0.8.2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gnome-user-share.spec	11 Aug 2009 21:44:01 -0000	1.56
+++ gnome-user-share.spec	20 Aug 2009 12:00:00 -0000	1.57
@@ -1,13 +1,16 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.26.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.26/%{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 work
+# http://bugzilla.gnome.org/show_bug.cgi?id=586755
+Patch1: do-not-localize-realms.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -46,6 +49,7 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
+%patch1 -p1 -b .realm-localization
 
 %build
 %configure
@@ -123,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Thu Aug 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-6
+- Do not localize realm in passwd files (#500123)
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.26.0-5
 - Fix source URL
 



From sharkcz at fedoraproject.org  Thu Aug 20 12:01:07 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 20 Aug 2009 12:01:07 +0000 (UTC)
Subject: rpms/scribus/devel scribus.spec, 1.48,
	1.49 scribus-1.3.5-install-headers.patch, 1.1, NONE
Message-ID: <20090820120107.13EDC11C006E@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21340

Modified Files:
	scribus.spec 
Removed Files:
	scribus-1.3.5-install-headers.patch 
Log Message:
- remove dropped patch from CVS
- fix bug number



Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- scribus.spec	20 Aug 2009 10:55:38 -0000	1.48
+++ scribus.spec	20 Aug 2009 12:01:06 -0000	1.49
@@ -176,7 +176,7 @@ update-mime-database %{_datadir}/mime > 
 * Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
 - update to final 1.3.5.1
 - drop the upstreamed "install-headers" patch
-- always install doc subpackage (#464148)
+- always install doc subpackage (#446148)
 - full changelog: http://www.scribus.net/?q=node/193
 
 * Wed Jul 29 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5-0.17.rc3


--- scribus-1.3.5-install-headers.patch DELETED ---



From sharkcz at fedoraproject.org  Thu Aug 20 12:05:47 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 20 Aug 2009 12:05:47 +0000 (UTC)
Subject: rpms/scribus/F-11 .cvsignore, 1.21, 1.22 scribus.spec, 1.44,
	1.45 sources, 1.21, 1.22 scribus-1.3.5-install-headers.patch,
	1.1, NONE
Message-ID: <20090820120547.F07EF11C006E@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22169

Modified Files:
	.cvsignore scribus.spec sources 
Removed Files:
	scribus-1.3.5-install-headers.patch 
Log Message:
* Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
- update to final 1.3.5.1
- drop the upstreamed "install-headers" patch
- always install doc subpackage (#446148)
- full changelog: http://www.scribus.net/?q=node/193



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	21 Jul 2009 19:59:10 -0000	1.21
+++ .cvsignore	20 Aug 2009 12:05:47 -0000	1.22
@@ -1 +1 @@
-scribus-1.3.5.rc3.tar.bz2
+scribus-1.3.5.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/scribus.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- scribus.spec	21 Jul 2009 19:59:10 -0000	1.44
+++ scribus.spec	20 Aug 2009 12:05:47 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           scribus
-Version:        1.3.5
-Release:        0.14.rc3%{?dist}
+Version:        1.3.5.1
+Release:        1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -8,7 +8,6 @@ Group:          Applications/Productivit
 License:        GPLv2+
 URL:            http://www.scribus.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
-Patch1:         %{name}-1.3.5-install-headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -36,6 +35,7 @@ Requires:       python >= 2.3
 Requires:       python-imaging
 Requires:       tkinter
 Requires:       shared-mime-info
+Requires:       %{name}-doc = %{version}-%{release}
 
 
 %description
@@ -72,7 +72,6 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 
 %prep
 %setup -q -n %{name}-%{version}.rc3
-%patch1 -p1 -b .install-headers
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -129,7 +128,12 @@ update-mime-database %{_datadir}/mime > 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO
+%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLogSVN
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/TODO
 %{_bindir}/scribus
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
@@ -147,26 +151,27 @@ update-mime-database %{_datadir}/mime > 
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5.rc3
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc3/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc3/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc3/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc3/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc3/pl
-%{_datadir}/doc/%{name}-1.3.5.rc3/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5.rc3/BUILDING
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5.rc3/COPYING
-%{_datadir}/doc/%{name}-1.3.5.rc3/NEWS
-%{_datadir}/doc/%{name}-1.3.5.rc3/README*
-%{_datadir}/doc/%{name}-1.3.5.rc3/TODO
-%{_datadir}/doc/%{name}-1.3.5.rc3/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5.rc3/LINKS
-%{_datadir}/doc/%{name}-1.3.5.rc3/TRANSLATION
+%dir %{_datadir}/doc/%{name}-%{version}
+%lang(cs) %{_datadir}/doc/%{name}-%{version}/cs
+%lang(de) %{_datadir}/doc/%{name}-%{version}/de
+%lang(en) %{_datadir}/doc/%{name}-%{version}/en
+%lang(fr) %{_datadir}/doc/%{name}-%{version}/fr
+%lang(pl) %{_datadir}/doc/%{name}-%{version}/pl
+%{_datadir}/doc/%{name}-%{version}/BUILDING
+%{_datadir}/doc/%{name}-%{version}/NEWS
+%{_datadir}/doc/%{name}-%{version}/README*
+%{_datadir}/doc/%{name}-%{version}/PACKAGING
+%{_datadir}/doc/%{name}-%{version}/LINKS
+%{_datadir}/doc/%{name}-%{version}/TRANSLATION
 
 
 %changelog
+* Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
+- update to final 1.3.5.1
+- drop the upstreamed "install-headers" patch
+- always install doc subpackage (#446148)
+- full changelog: http://www.scribus.net/?q=node/193
+
 * Tue Jul 21 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5-0.14.rc3
 - update to 1.3.5-rc3
 - fix update path for the doc subpackage (#512498)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	21 Jul 2009 19:59:10 -0000	1.21
+++ sources	20 Aug 2009 12:05:47 -0000	1.22
@@ -1 +1 @@
-4c030bbec4405743fd2d3f842622351c  scribus-1.3.5.rc3.tar.bz2
+4cadca0c780491ad61dc2d815776f10b  scribus-1.3.5.1.tar.bz2


--- scribus-1.3.5-install-headers.patch DELETED ---



From akurtakov at fedoraproject.org  Thu Aug 20 12:11:29 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 12:11:29 +0000 (UTC)
Subject: rpms/dumbster/devel dumbster.spec,1.1,1.2
Message-ID: <20090820121129.907D711C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/dumbster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23209/devel

Modified Files:
	dumbster.spec 
Log Message:
- Fix groups.
- Remove javadoc Requires(post/postun).


Index: dumbster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dumbster/devel/dumbster.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dumbster.spec	19 Aug 2009 14:31:27 -0000	1.1
+++ dumbster.spec	20 Aug 2009 12:11:29 -0000	1.2
@@ -31,11 +31,11 @@
 Summary:        Fake SMTP Server
 Name:           dumbster
 Version:        1.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://quintanasoft.com/dumbster/
-Group:          Development/Testing
+Group:          Development/Tools
 # cvs -z3 -d:pserver:anonymous at dumbster.cvs.sourceforge.net:/cvsroot/dumbster export -r RELEASE_1_6 dumbster
 # tar czf dumbster-1.6-src.tgz dumbster
 Source0:        %{name}-%{version}-src.tgz
@@ -63,9 +63,7 @@ Dumbster for later extraction and verifi
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Group:          Documentation
 
 %description javadoc
 %{summary}.
@@ -86,9 +84,6 @@ ln -sf $(build-classpath junit)
 ln -sf $(build-classpath sasl)
 popd
 
-export OPT_JAT_LIST=:
-export CLASSPATH=
-
 ant jar javadoc
 
 %install
@@ -137,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.6-9
+- Fix groups.
+- Remove javadoc Requires(post/postun).
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.6-8
 - Drop gcj support.
 - Fix javadoc build error.



From akurtakov at fedoraproject.org  Thu Aug 20 12:12:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 12:12:41 +0000 (UTC)
Subject: rpms/directory-naming/devel directory-naming.spec,1.2,1.3
Message-ID: <20090820121241.A37F611C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23830/devel

Modified Files:
	directory-naming.spec 
Log Message:
- Remove patch and sed lines -not needed.


Index: directory-naming.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/directory-naming.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- directory-naming.spec	19 Aug 2009 14:02:42 -0000	1.2
+++ directory-naming.spec	20 Aug 2009 12:12:41 -0000	1.3
@@ -30,12 +30,12 @@
 
 Name:           directory-naming
 Version:        0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Directory Naming
 License:        ASL 2.0
 URL:            http://directory.apache.org
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 
 Source0:        directory-naming-0.8.tar.gz
 # svn export -r 124846 http://svn.apache.org/repos/asf/directory/sandbox/dormant-subprojects/naming/ directory-naming-0.8
@@ -47,8 +47,6 @@ Source8:        http://repo1.maven.org/m
 Source9:        http://repo1.maven.org/maven2/directory-naming/naming-management/0.8/naming-management-0.8.pom
 Source10:       http://repo1.maven.org/maven2/directory-naming/naming-resources/0.8/naming-resources-0.8.pom
 
-Patch0:         directory-naming-0.8-project.patch
-
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  ant >= 0:1.6.5
@@ -85,7 +83,7 @@ Old directory/naming module.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires(post): /bin/rm /bin/ln
 Requires(postun): /bin/rm
 
@@ -98,7 +96,7 @@ Requires(postun): /bin/rm
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
 done
-%patch0 -b .sav0
+sed -i "s/\r//" LICENSE.txt
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -122,19 +120,6 @@ CLASSPATH=$CLASSPATH:$(pwd)/naming-java/
 CLASSPATH=$CLASSPATH:$(pwd)/naming-management/target/classes:$(pwd)/naming-management/target/test-classes
 CLASSPATH=$CLASSPATH:$(pwd)/naming-resources/target/classes:$(pwd)/naming-resources/target/test-classes
 
-#FIXME failed to create task or type setproxy
-for f in $(find . -name build.xml); do
-    sed -i "s|<setproxy>|<!-- <setproxy> -->|g" $f
-    sed -i "s|</setproxy>|<!-- </setproxy> -->|g" $f
-done;
-
-#sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
-#sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml
-
-#sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
-#sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml
-
-
 export OPT_JAR_LIST="junit ant/ant-junit"
 
 ant -Dbuild.sysclasspath=only jar javadoc
@@ -191,6 +176,9 @@ done
 %{_mavendepmapfragdir}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-6
+- Remove patch and sed lines -not needed.
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-5
 - Remove gcj support.
 - Build with build.sysclasspath=only.



From sharkcz at fedoraproject.org  Thu Aug 20 12:17:34 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 20 Aug 2009 12:17:34 +0000 (UTC)
Subject: rpms/scribus/F-10 .cvsignore, 1.20, 1.21 scribus.spec, 1.38,
	1.39 sources, 1.20, 1.21 scribus-1.3.5-install-headers.patch,
	1.1, NONE
Message-ID: <20090820121734.7CA0911C006E@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24920

Modified Files:
	.cvsignore scribus.spec sources 
Removed Files:
	scribus-1.3.5-install-headers.patch 
Log Message:
* Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
- update to final 1.3.5.1
- drop the upstreamed "install-headers" patch
- always install doc subpackage (#446148)
- full changelog: http://www.scribus.net/?q=node/193



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	21 Jul 2009 20:00:30 -0000	1.20
+++ .cvsignore	20 Aug 2009 12:17:34 -0000	1.21
@@ -1 +1 @@
-scribus-1.3.5.rc3.tar.bz2
+scribus-1.3.5.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/scribus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- scribus.spec	21 Jul 2009 20:00:30 -0000	1.38
+++ scribus.spec	20 Aug 2009 12:17:34 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           scribus
-Version:        1.3.5
-Release:        0.14.rc3%{?dist}
+Version:        1.3.5.1
+Release:        1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -8,7 +8,6 @@ Group:          Applications/Productivit
 License:        GPLv2+
 URL:            http://www.scribus.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
-Patch1:         %{name}-1.3.5-install-headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -36,6 +35,7 @@ Requires:       python >= 2.3
 Requires:       python-imaging
 Requires:       tkinter
 Requires:       shared-mime-info
+Requires:       %{name}-doc = %{version}-%{release}
 
 
 %description
@@ -72,7 +72,6 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 
 %prep
 %setup -q -n %{name}-%{version}.rc3
-%patch1 -p1 -b .install-headers
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -129,7 +128,12 @@ update-mime-database %{_datadir}/mime > 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO
+%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
+%doc %{_datadir}/doc/%{name}-%{version}/ChangeLogSVN
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/TODO
 %{_bindir}/scribus
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
@@ -147,26 +151,27 @@ update-mime-database %{_datadir}/mime > 
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5.rc3
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc3/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc3/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc3/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc3/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc3/pl
-%{_datadir}/doc/%{name}-1.3.5.rc3/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5.rc3/BUILDING
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5.rc3/COPYING
-%{_datadir}/doc/%{name}-1.3.5.rc3/NEWS
-%{_datadir}/doc/%{name}-1.3.5.rc3/README*
-%{_datadir}/doc/%{name}-1.3.5.rc3/TODO
-%{_datadir}/doc/%{name}-1.3.5.rc3/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5.rc3/LINKS
-%{_datadir}/doc/%{name}-1.3.5.rc3/TRANSLATION
+%dir %{_datadir}/doc/%{name}-%{version}
+%lang(cs) %{_datadir}/doc/%{name}-%{version}/cs
+%lang(de) %{_datadir}/doc/%{name}-%{version}/de
+%lang(en) %{_datadir}/doc/%{name}-%{version}/en
+%lang(fr) %{_datadir}/doc/%{name}-%{version}/fr
+%lang(pl) %{_datadir}/doc/%{name}-%{version}/pl
+%{_datadir}/doc/%{name}-%{version}/BUILDING
+%{_datadir}/doc/%{name}-%{version}/NEWS
+%{_datadir}/doc/%{name}-%{version}/README*
+%{_datadir}/doc/%{name}-%{version}/PACKAGING
+%{_datadir}/doc/%{name}-%{version}/LINKS
+%{_datadir}/doc/%{name}-%{version}/TRANSLATION
 
 
 %changelog
+* Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
+- update to final 1.3.5.1
+- drop the upstreamed "install-headers" patch
+- always install doc subpackage (#446148)
+- full changelog: http://www.scribus.net/?q=node/193
+
 * Tue Jul 21 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5-0.14.rc3
 - update to 1.3.5-rc3
 - fix update path for the doc subpackage (#512498)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	21 Jul 2009 20:00:31 -0000	1.20
+++ sources	20 Aug 2009 12:17:34 -0000	1.21
@@ -1 +1 @@
-4c030bbec4405743fd2d3f842622351c  scribus-1.3.5.rc3.tar.bz2
+4cadca0c780491ad61dc2d815776f10b  scribus-1.3.5.1.tar.bz2


--- scribus-1.3.5-install-headers.patch DELETED ---



From marx at fedoraproject.org  Thu Aug 20 12:21:00 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Thu, 20 Aug 2009 12:21:00 +0000 (UTC)
Subject: rpms/system-config-lvm/devel .cvsignore, 1.25, 1.26 sources, 1.27, 
	1.28 system-config-lvm.spec, 1.40, 1.41
Message-ID: <20090820122100.798DE11C006E@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25553

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New upstream version 1.1.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	12 Aug 2009 19:03:40 -0000	1.25
+++ .cvsignore	20 Aug 2009 12:21:00 -0000	1.26
@@ -1 +1 @@
-system-config-lvm-1.1.7.tar.gz
+system-config-lvm-1.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	12 Aug 2009 19:03:40 -0000	1.27
+++ sources	20 Aug 2009 12:21:00 -0000	1.28
@@ -1 +1 @@
-007d08bd266a610b444b54828c7f6caa  system-config-lvm-1.1.7.tar.gz
+dcf4c1711eadc7bf5dbe676514d4aea2  system-config-lvm-1.1.8.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- system-config-lvm.spec	12 Aug 2009 19:09:24 -0000	1.40
+++ system-config-lvm.spec	20 Aug 2009 12:21:00 -0000	1.41
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.7
-Release: 2%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -61,6 +61,14 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Thu Aug 20 2009 Marek Grac <mgrac at redhat.com> - 1.1.8-1
+- Updated translations for several languages (transifex)
+- Resolves: #243646 - Unable to modify logical partition with or_IN locale
+- Resolves: #513322 - LVM volume cannot be created with Japanese locale
+- Resolves: #243790 - Cannot delete LVM snapshot
+- Resolves: #508898 - Bad label in left tree view
+- Resolves: #508904 - (partially) add missing space '2TB' -> '2 TB'
+
 * Wed Aug 12 2009 Marek Grac <mgrac at redhat.com> - 1.1.7-2
 - Updated translations for several languages (transifex)
 - Resolves: #432065 - Add ext4 and xfs functionality



From jzeleny at fedoraproject.org  Thu Aug 20 12:26:42 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu, 20 Aug 2009 12:26:42 +0000 (UTC)
Subject: rpms/dcbd/devel dcbd-0.9.15-lookup-string.patch, NONE, 1.1 dcbd.spec,
	1.4, 1.5
Message-ID: <20090820122642.34CFF11C006E@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26780

Modified Files:
	dcbd.spec 
Added Files:
	dcbd-0.9.15-lookup-string.patch 
Log Message:
update of config_lookup_string() function calls

dcbd-0.9.15-lookup-string.patch:
 config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dcbd-0.9.15-lookup-string.patch ---
--- 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 *
 		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 (result) {
@@ -951,7 +951,7 @@ dcb_result get_persistent(char *device_n
 	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);


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dcbd.spec	20 Aug 2009 11:22:40 -0000	1.4
+++ dcbd.spec	20 Aug 2009 12:26:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           dcbd
 Version:        0.9.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
@@ -10,6 +10,7 @@ Source0:        http://downloads.sourcef
 Patch0:         dcbd-0.9.7-make.patch
 Patch1:         dcbd-0.9.15-sysconfig.patch
 Patch2:         dcbd-0.9.7-init.patch
+Patch3:         dcbd-0.9.15-lookup-string.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kernel >= 2.6.31
@@ -36,6 +37,7 @@ that use %{name}.
 %patch0 -p1 -b .make
 %patch1 -p1 -b .sysconfig
 %patch2 -p1 -b .init
+%patch3 -p1 -b .lookup-string
 
 
 %build
@@ -90,6 +92,9 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-3
+- update of config_lookup_string() function calls
+
 * Thu Aug 20 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-2
 - rebuild in order to match new libconfig
 



From rhughes at fedoraproject.org  Thu Aug 20 12:33:16 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 20 Aug 2009 12:33:16 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-11
	gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch,
	NONE, 1.1 gnome-power-manager.spec, 1.161, 1.162
Message-ID: <20090820123316.C019811C006E@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28133

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch 
Log Message:
* Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-3
- Actually apply the patch in #497743


gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch:
 gpm-button.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch ---
diff -up gnome-power-manager-2.26.1/src/gpm-button.c~ gnome-power-manager-2.26.1/src/gpm-button.c
--- gnome-power-manager-2.26.1/src/gpm-button.c~	2009-04-21 11:43:28.000000000 +0100
+++ gnome-power-manager-2.26.1/src/gpm-button.c	2009-04-26 20:28:35.000000000 +0100
@@ -326,6 +326,10 @@ emit_button_pressed (GpmButton *button, 
 	/* we need to get the button state for lid buttons */
 	if (strcmp (type, "lid") == 0)
 		hal_device_get_bool (device, "button.state.value", &state, NULL);
+	else {
+		g_free (type);
+		return;
+	}
 
 	/* abstact away that HAL has an extra parameter */
 	if (strcmp (type, GPM_BUTTON_LID_DEP) == 0 && state == FALSE)


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- gnome-power-manager.spec	20 Aug 2009 10:02:43 -0000	1.161
+++ gnome-power-manager.spec	20 Aug 2009 12:33:16 -0000	1.162
@@ -4,7 +4,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.26/gnome-power-manager-%{version}.tar.gz
@@ -15,6 +15,9 @@ URL: http://projects.gnome.org/gnome-pow
 # upstream, bebf24f41c43f0b2338aefea87f39ba7423d02be
 Patch1:    gnome-power-manager-2.26.4-work-around-xsync-bug.patch
 
+# fedora bodge, already fixed a better way upstream
+Patch2:    gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch
+
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -60,6 +63,7 @@ change preferences.
 %prep
 %setup -q
 %patch1 -p1 -b .xsync-bug
+%patch2 -p1 -b ignore-hal-buttons
 
 %build
 %configure \
@@ -166,6 +170,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-3
+- Actually apply the patch in #497743
+
 * Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-2
 - Use a larger DPMS idletime timeout to mitigate an XSync bug
 



From pkgdb at fedoraproject.org  Thu Aug 20 12:33:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 12:33:48 +0000
Subject: [pkgdb] jakarta-commons-fileupload had acl change status
Message-ID: <20090820123349.347D810F854@bastion2.fedora.phx.redhat.com>

pcheung has set the watchbugzilla acl on jakarta-commons-fileupload (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-fileupload



From pkgdb at fedoraproject.org  Thu Aug 20 12:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 12:33:49 +0000
Subject: [pkgdb] jakarta-commons-fileupload had acl change status
Message-ID: <20090820123349.6B06510F86F@bastion2.fedora.phx.redhat.com>

pcheung has set the watchcommits acl on jakarta-commons-fileupload (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-fileupload



From pkgdb at fedoraproject.org  Thu Aug 20 12:33:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 12:33:50 +0000
Subject: [pkgdb] jakarta-commons-fileupload had acl change status
Message-ID: <20090820123350.EA1E710F889@bastion2.fedora.phx.redhat.com>

pcheung has set the commit acl on jakarta-commons-fileupload (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-fileupload



From mildew at fedoraproject.org  Thu Aug 20 12:38:43 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu, 20 Aug 2009 12:38:43 +0000 (UTC)
Subject: rpms/sudo/devel sudo-1.7.1-sudoers,NONE,1.1 sudo.spec,1.78,1.79
Message-ID: <20090820123843.7F09E11C006E@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29096

Modified Files:
	sudo.spec 
Added Files:
	sudo-1.7.1-sudoers 
Log Message:
moved secure_path from compile-time option to sudoers file (#517428)



--- NEW FILE sudo-1.7.1-sudoers ---
## Sudoers allows particular users to run various commands as
## the root user, without needing the root password.
##
## Examples are provided at the bottom of the file for collections
## of related commands, which can then be delegated out to particular
## users or groups.
## 
## This file must be edited with the 'visudo' command.

## Host Aliases
## Groups of machines. You may prefer to use hostnames (perhaps using 
## wildcards for entire domains) or IP addresses instead.
# Host_Alias     FILESERVERS = fs1, fs2
# Host_Alias     MAILSERVERS = smtp, smtp2

## User Aliases
## These aren't often necessary, as you can use regular groups
## (ie, from files, LDAP, NIS, etc) in this file - just use %groupname 
## rather than USERALIAS
# User_Alias ADMINS = jsmith, mikem


## Command Aliases
## These are groups of related commands...

## Networking
Cmnd_Alias NETWORKING = /sbin/route, /sbin/ifconfig, /bin/ping, /sbin/dhclient, /usr/bin/net, /sbin/iptables, /usr/bin/rfcomm, /usr/bin/wvdial, /sbin/iwconfig, /sbin/mii-tool

## Installation and management of software
Cmnd_Alias SOFTWARE = /bin/rpm, /usr/bin/up2date, /usr/bin/yum

## Services
Cmnd_Alias SERVICES = /sbin/service, /sbin/chkconfig

## Updating the locate database
Cmnd_Alias LOCATE = /usr/bin/updatedb

## Storage
Cmnd_Alias STORAGE = /sbin/fdisk, /sbin/sfdisk, /sbin/parted, /sbin/partprobe, /bin/mount, /bin/umount

## Delegating permissions
Cmnd_Alias DELEGATING = /usr/sbin/visudo, /bin/chown, /bin/chmod, /bin/chgrp 

## Processes
Cmnd_Alias PROCESSES = /bin/nice, /bin/kill, /usr/bin/kill, /usr/bin/killall

## Drivers
Cmnd_Alias DRIVERS = /sbin/modprobe

# Defaults specification

#
# Disable "ssh hostname sudo <cmd>", because it will show the password in clear. 
#         You have to run "ssh -t hostname sudo <cmd>".
#
Defaults    requiretty

Defaults    env_reset
Defaults    env_keep =  "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR LS_COLORS"
Defaults    env_keep += "MAIL PS1 PS2 QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE"
Defaults    env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES"
Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"

Defaults    secure_path = /sbin:/bin:/usr/sbin:/usr/bin

## Next comes the main part: which users can run what software on 
## which machines (the sudoers file can be shared between multiple
## systems).
## Syntax:
##
## 	user	MACHINE=COMMANDS
##
## The COMMANDS section may have other options added to it.
##
## Allow root to run any commands anywhere 
root	ALL=(ALL) 	ALL

## Allows members of the 'sys' group to run networking, software, 
## service management apps and more.
# %sys ALL = NETWORKING, SOFTWARE, SERVICES, STORAGE, DELEGATING, PROCESSES, LOCATE, DRIVERS

## Allows people in group wheel to run all commands
# %wheel	ALL=(ALL)	ALL

## Same thing without a password
# %wheel	ALL=(ALL)	NOPASSWD: ALL

## Allows members of the users group to mount and unmount the 
## cdrom as root
# %users  ALL=/sbin/mount /mnt/cdrom, /sbin/umount /mnt/cdrom

## Allows members of the users group to shutdown this system
# %users  localhost=/sbin/shutdown -h now



Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sudo.spec	27 Jul 2009 04:58:19 -0000	1.78
+++ sudo.spec	20 Aug 2009 12:38:43 -0000	1.79
@@ -1,12 +1,12 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
 Source0: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
-Source1: sudo-1.6.8p12-sudoers
+Source1: sudo-1.7.1-sudoers
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /etc/pam.d/system-auth, vim-minimal
 
@@ -80,8 +80,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LD
         --with-tty-tickets \
         --with-ldap \
 	--with-selinux \
-	--with-passprompt="[sudo] password for %p: " \
-	--with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin"
+	--with-passprompt="[sudo] password for %p: "
 #	--without-kerb5 \
 #	--without-kerb4
 make
@@ -139,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Thu Aug 20 2009 Daniel Kopecek <dkopecek at redhat.com> 1.7.1-6
+- moved secure_path from compile-time option to sudoers file (#517428)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From marx at fedoraproject.org  Thu Aug 20 12:39:14 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Thu, 20 Aug 2009 12:39:14 +0000 (UTC)
Subject: rpms/system-config-lvm/F-11 .cvsignore, 1.23, 1.24 sources, 1.25,
	1.26 system-config-lvm.spec, 1.34, 1.35
Message-ID: <20090820123914.80C3011C006E@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29253

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	8 Apr 2008 19:55:40 -0000	1.23
+++ .cvsignore	20 Aug 2009 12:39:14 -0000	1.24
@@ -1 +1 @@
-system-config-lvm-1.1.4.tar.gz
+system-config-lvm-1.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	8 Apr 2008 19:55:40 -0000	1.25
+++ sources	20 Aug 2009 12:39:14 -0000	1.26
@@ -1 +1 @@
-c561f2698dde15ec853faa18cef3adab  system-config-lvm-1.1.4.tar.gz
+dcf4c1711eadc7bf5dbe676514d4aea2  system-config-lvm-1.1.8.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/system-config-lvm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- system-config-lvm.spec	26 Feb 2009 05:10:09 -0000	1.34
+++ system-config-lvm.spec	20 Aug 2009 12:39:14 -0000	1.35
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.4
-Release: 5.1%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -62,6 +62,25 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Thu Aug 20 2009 Marek Grac <mgrac at redhat.com> - 1.1.8
+- Updated translations for several languages (transifex)
+- Resolves: #243646 - Unable to modify logical partition with or_IN locale
+- Resolves: #513322 - LVM volume cannot be created with Japanese locale
+- Resolves: #243790 - Cannot delete LVM snapshot
+- Resolves: #508898 - Bad label in left tree view
+- Resolves: #508904 - (partially) add missing space '2TB' -> '2 TB'
+- Resolves: #432065 - Add ext4 and xfs functionality
+- Resolves: #466812 - missing files from POTFILES.in (again)
+- Resolves: #443581 - Use human readable sizing units
+- Resolves: #443579 - traceback trying to add volume to VG with no selection
+- Resolves: #474996 - extremely slow start with cluster.conf
+- Resolves: #486699 - crashes when "command_names = 1" in lvm.conf
+- Resolves: #466899 - system-config-lvm online resize fix
+- Resolves: #494127 - system-config-lvm crashes on lvs with corelog
+- Resolves: #475997 - crashed with 'IndexError: list index out of range'
+- Resolves: #432065 - Add ext4 and xfs functionality
+- Resolves: #447886, #466812 - minor l10n problems
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kwizart at fedoraproject.org  Thu Aug 20 12:43:00 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 20 Aug 2009 12:43:00 +0000 (UTC)
Subject: rpms/filezilla/devel sources, 1.42, 1.43 .cvsignore, 1.38,
	1.39 filezilla.spec, 1.47, 1.48
Message-ID: <20090820124300.154C611C006E@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30081

Modified Files:
	sources .cvsignore filezilla.spec 
Log Message:
Update to 3.2.7



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	3 Aug 2009 11:39:56 -0000	1.42
+++ sources	20 Aug 2009 12:42:59 -0000	1.43
@@ -1 +1 @@
-dd65331810a127400fbc47c9feae4949  FileZilla_3.2.7-rc1_src.tar.bz2
+fcbcb291ec6f4dd821670a4498b5ad35  FileZilla_3.2.7_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	3 Aug 2009 11:39:56 -0000	1.38
+++ .cvsignore	20 Aug 2009 12:42:59 -0000	1.39
@@ -1 +1 @@
-FileZilla_3.2.7-rc1_src.tar.bz2
+FileZilla_3.2.7_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- filezilla.spec	3 Aug 2009 11:39:56 -0000	1.47
+++ filezilla.spec	20 Aug 2009 12:42:59 -0000	1.48
@@ -1,8 +1,8 @@
-%define fz_rc   rc1
+#global fz_rc   rc1
 
 Name:           filezilla
 Version:        3.2.7
-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
@@ -21,7 +21,7 @@ BuildRequires:  desktop-file-utils
 
 BuildRequires:  dbus-devel
 BuildRequires:  gettext
-BuildRequires:  gnutls-devel >= 2.0.4
+BuildRequires:  gnutls-devel >= 2.8.3
 BuildRequires:  libidn-devel
 BuildRequires:  tinyxml-devel >= 2.5.3
 BuildRequires:  wxGTK-devel >= 2.8.9
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Thu Aug 20 2009 kwizart < kwizart at gmail.com > - 3.2.7-1
+- Update to 3.2.7
+
 * Mon Aug  3 2009 kwizart < kwizart at gmail.com > - 3.2.7-0.1_rc1
 - Update to 3.2.7-rc1
 



From mildew at fedoraproject.org  Thu Aug 20 12:46:33 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu, 20 Aug 2009 12:46:33 +0000 (UTC)
Subject: rpms/sudo/devel .cvsignore,1.19,1.20 sources,1.22,1.23
Message-ID: <20090820124633.17E7011C006E@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31500

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	22 Jun 2009 14:27:32 -0000	1.19
+++ .cvsignore	20 Aug 2009 12:46:32 -0000	1.20
@@ -1,2 +1,2 @@
 sudo-1.7.1.tar.gz
-sudo-1.6.8p12-sudoers
+sudo-1.7.1-sudoers


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	22 Jun 2009 14:27:32 -0000	1.22
+++ sources	20 Aug 2009 12:46:32 -0000	1.23
@@ -1,2 +1,2 @@
 af672524b2c854a67612bf4c743f58b8  sudo-1.7.1.tar.gz
-f9b28fbbb09ec22ca543c758db44d2cd  sudo-1.6.8p12-sudoers
+02d6d836b41e3049fc33d56cef2e6c4e  sudo-1.7.1-sudoers



From rdieter at fedoraproject.org  Thu Aug 20 12:52:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 12:52:05 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.200,1.201
Message-ID: <20090820125205.5C9B011C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32562

Modified Files:
	kdeedu.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
- add Obsoletes to help multilib upgrades)
- -marble-libs: move marble plugins here



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- kdeedu.spec	9 Aug 2009 17:07:01 -0000	1.200
+++ kdeedu.spec	20 Aug 2009 12:52:05 -0000	1.201
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -54,6 +54,8 @@ BuildRequires: xplanet
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+# help multilib upgrades 
+Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
@@ -114,8 +116,8 @@ Requires: %{name}-libs%{?_isa} = %{versi
 Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
-# multilib, when marble-libs was introduced
-Obsoletes: %{name}-marble < 4.3.0-3
+# help multilib upgrades 
+Obsoletes: kdeedu-marble < 4.3.0-5
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -379,10 +381,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.4*
 %{_kde4_libdir}/libkiten.so.4*
 %{_kde4_libdir}/libscience.so.4*
-# needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules
@@ -416,7 +416,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
@@ -426,6 +425,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libmarble*.so.*
 %{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
 
 %files math
 %defattr(-,root,root,-)
@@ -469,6 +469,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
+- add Obsoletes to help multilib upgrades)
+- -marble-libs: move marble plugins here
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
 - *really* make -marble-libs
 



From rjones at fedoraproject.org  Thu Aug 20 12:56:38 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 20 Aug 2009 12:56:38 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-no-kvm-segfault.patch, NONE, 1.1 qemu.spec,
	1.121, 1.122
Message-ID: <20090820125638.32FF211C006E@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1116

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-no-kvm-segfault.patch 
Log Message:
Fix segfault when qemu-kvm is invoked inside a VM (#516543)

qemu-fix-no-kvm-segfault.patch:
 exec.c |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE qemu-fix-no-kvm-segfault.patch ---
>From add286b6e753f14e4ae0ab6b831441aea0d35497 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at f12rawhidex64.home.annexia.org>
Date: Thu, 20 Aug 2009 13:52:20 +0100
Subject: [PATCH] Workaround segfault when qemu-kvm runs inside a VM (RHBZ#516543).

Regression was introduced by this commit:
http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commitdiff;h=b8083e930efc1ee85a7ad7e700dbd0f52ebb32dd

Upstream discussion:
http://www.mail-archive.com/kvm at vger.kernel.org/msg19890.html

Note: NOT UPSTREAM and this is something of a hack.  Upstream are
still debating how they really want to fix this.
---
 exec.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/exec.c b/exec.c
index 705bcf2..2091516 100644
--- a/exec.c
+++ b/exec.c
@@ -422,9 +422,6 @@ static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE];
 
 static void code_gen_alloc(unsigned long tb_size)
 {
-    if (kvm_enabled())
-        return;
-
 #ifdef USE_STATIC_CODE_GEN_BUFFER
     code_gen_buffer = static_code_gen_buffer;
     code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE;
-- 
1.6.4



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- qemu.spec	18 Aug 2009 10:03:38 -0000	1.121
+++ qemu.spec	20 Aug 2009 12:56:37 -0000	1.122
@@ -34,6 +34,19 @@ Patch05: qemu-fix-extboot-signrom.patch
 # Fix virtio_net with -net user (bug #516022)
 Patch06: qemu-fix-vnet-hdr-slirp-bustage.patch
 
+# Fix segfault when qemu-kvm is invoked inside a VM (where HVM is not
+# available).  RHBZ#516543
+#
+# Regression was introduced by this commit:
+# http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commitdiff;h=b8083e930efc1ee85a7ad7e700dbd0f52ebb32dd
+#
+# Upstream discussion:
+# http://www.mail-archive.com/kvm at vger.kernel.org/msg19890.html
+#
+# Note: NOT UPSTREAM and this is something of a hack.  Upstream are
+# still debating how they really want to fix this.
+Patch07: qemu-fix-no-kvm-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
@@ -220,6 +233,7 @@ such as kvmtrace and kvm_stat.
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -484,6 +498,9 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Aug 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2:0.10.91-0.8.rc1
+- Fix segfault when qemu-kvm is invoked inside a VM (#516543)
+
 * Tue Aug 18 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.7.rc1
 - Fix permissions on udev rules (#517571)
 



From marx at fedoraproject.org  Thu Aug 20 12:56:58 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Thu, 20 Aug 2009 12:56:58 +0000 (UTC)
Subject: rpms/system-config-lvm/F-10 .cvsignore, 1.23, 1.24 sources, 1.25,
	1.26 system-config-lvm.spec, 1.32, 1.33
Message-ID: <20090820125658.E89D711C006E@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1169

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New upstream version that fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	8 Apr 2008 19:55:40 -0000	1.23
+++ .cvsignore	20 Aug 2009 12:56:58 -0000	1.24
@@ -1 +1 @@
-system-config-lvm-1.1.4.tar.gz
+system-config-lvm-1.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	8 Apr 2008 19:55:40 -0000	1.25
+++ sources	20 Aug 2009 12:56:58 -0000	1.26
@@ -1 +1 @@
-c561f2698dde15ec853faa18cef3adab  system-config-lvm-1.1.4.tar.gz
+dcf4c1711eadc7bf5dbe676514d4aea2  system-config-lvm-1.1.8.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/system-config-lvm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- system-config-lvm.spec	27 Oct 2008 14:34:16 -0000	1.32
+++ system-config-lvm.spec	20 Aug 2009 12:56:58 -0000	1.33
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.4
-Release: 3.1%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -62,6 +62,25 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Thu Aug 20 2009 Marek Grac <mgrac at redhat.com> 1.1.8-1
+- Updated translations for several languages (transifex)
+- Resolves: #243646 - Unable to modify logical partition with or_IN locale
+- Resolves: #513322 - LVM volume cannot be created with Japanese locale
+- Resolves: #243790 - Cannot delete LVM snapshot
+- Resolves: #508898 - Bad label in left tree view
+- Resolves: #508904 - (partially) add missing space '2TB' -> '2 TB'
+- Resolves: #432065 - Add ext4 and xfs functionality
+- Resolves: #466812 - missing files from POTFILES.in (again)
+- Resolves: #443581 - Use human readable sizing units
+- Resolves: #443579 - traceback trying to add volume to VG with no selection
+- Resolves: #474996 - extremely slow start with cluster.conf
+- Resolves: #486699 - crashes when "command_names = 1" in lvm.conf
+- Resolves: #466899 - system-config-lvm online resize fix
+- Resolves: #494127 - system-config-lvm crashes on lvs with corelog
+- Resolves: #475997 - crashed with 'IndexError: list index out of range'
+- Resolves: #432065 - Add ext4 and xfs functionality
+- Resolves: #447886, #466812 - minor l10n problems
+
 * Mon Oct 27 2008 Matthias Clasen  <mclasen at redhat.com> 1.1.4-3.1
 - Require usermode-gtk
 



From rjones at fedoraproject.org  Thu Aug 20 12:57:48 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 20 Aug 2009 12:57:48 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.122,1.123
Message-ID: <20090820125748.3F3BE11C006E@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1563

Modified Files:
	qemu.spec 
Log Message:
Forgot to upstream release.


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- qemu.spec	20 Aug 2009 12:56:37 -0000	1.122
+++ qemu.spec	20 Aug 2009 12:57:48 -0000	1.123
@@ -4,7 +4,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.91
-Release: 0.7.%{kvmvertag}%{?dist}
+Release: 0.8.%{kvmvertag}%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD



From mildew at fedoraproject.org  Thu Aug 20 13:01:47 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu, 20 Aug 2009 13:01:47 +0000 (UTC)
Subject: rpms/sudo/devel sudo.spec, 1.79, 1.80 sudo-1.6.8p12-sudoers, 1.5,
	NONE sudo-1.6.9p12-noPam.patch, 1.1,
	NONE sudo-1.6.9p13-audit.patch, 1.3,
	NONE sudo-1.6.9p17-Makefile.patch, 1.1,
	NONE sudo-1.6.9p17-runas.patch, 1.1,
	NONE sudo-1.6.9p4-getgrouplist.patch, 1.3,
	NONE sudo-1.6.9p4-login.patch, 1.3, NONE sudo-1.7.1-sudoers, 1.1, NONE
Message-ID: <20090820130147.2DB3511C006E@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2419

Modified Files:
	sudo.spec 
Removed Files:
	sudo-1.6.8p12-sudoers sudo-1.6.9p12-noPam.patch 
	sudo-1.6.9p13-audit.patch sudo-1.6.9p17-Makefile.patch 
	sudo-1.6.9p17-runas.patch sudo-1.6.9p4-getgrouplist.patch 
	sudo-1.6.9p4-login.patch sudo-1.7.1-sudoers 
Log Message:
cleanup



Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sudo.spec	20 Aug 2009 12:38:43 -0000	1.79
+++ sudo.spec	20 Aug 2009 13:01:46 -0000	1.80
@@ -55,7 +55,7 @@ on many different machines.
 %patch8 -p1 -b .auditfix
 
 %build
-#hande newer autoconf
+# handle newer autoconf
 libtoolize --force && rm acsite.m4 && mv aclocal.m4 acinclude.m4 && autoreconf
 
 %ifarch s390 s390x sparc64


--- sudo-1.6.8p12-sudoers DELETED ---


--- sudo-1.6.9p12-noPam.patch DELETED ---


--- sudo-1.6.9p13-audit.patch DELETED ---


--- sudo-1.6.9p17-Makefile.patch DELETED ---


--- sudo-1.6.9p17-runas.patch DELETED ---


--- sudo-1.6.9p4-getgrouplist.patch DELETED ---


--- sudo-1.6.9p4-login.patch DELETED ---


--- sudo-1.7.1-sudoers DELETED ---



From ausil at fedoraproject.org  Thu Aug 20 13:06:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 13:06:12 +0000 (UTC)
Subject: rpms/mercurial/EL-5 mercurial.spec,1.16,1.17 sources,1.12,1.13
Message-ID: <20090820130612.63F1C11C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mercurial/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3219

Modified Files:
	mercurial.spec sources 
Log Message:
update to latest version fixes an issue being seen in transifex



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/mercurial.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mercurial.spec	19 Mar 2009 19:25:19 -0000	1.16
+++ mercurial.spec	20 Aug 2009 13:06:12 -0000	1.17
@@ -2,14 +2,14 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.2
-Release: 2%{?dist}.1
+Version: 1.3.1
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python python-devel asciidoc xmlto
+BuildRequires: python python-devel
 Requires: python
 Provides: hg = %{version}-%{release}
 
@@ -41,7 +41,6 @@ documentation.
 
 %prep
 %setup -q
-#%patch0 -p1
 
 %build
 make all
@@ -68,8 +67,10 @@ mkdir -p $zsh_completion_dir
 install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
 
 
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
+mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
 
 cat >hgk.rc <<EOF
 [extensions]
@@ -105,16 +106,37 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
+
 %files hgk -f %{name}-hgk.files
 %{_libexecdir}/mercurial/
 %{_sysconfdir}/mercurial/hgrc.d/hgk.rc
 
-#%%check
-#cd tests && %{__python} run-tests.py
+##%%check
+##cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.1-3
+- port over for EPEL
+- remove emacs packages
+
+* Fri Jul 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3.1-3
+- Disable self-tests
+
+* Fri Jul 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3.1-2
+- Update to 1.3.1
+
+* Wed Jul  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3-2
+- Re-enable tests since they now pass
+
+* Wed Jul  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3-1
+- Update to 1.3
+
+* Sat Mar 21 2009 Neal Becker <ndbecker2 at gmail.com> - 1.2.1-1
+- Update to 1.2.1
+- Tests remain disabled due to failures
+
 * Thu Mar 19 2009 Dennis Gilmore <dennis at ausil.us> - 1.2-2.1
-- port over for EPEL 
+- port over for EPEL
 - fixes CVE's is current releases
 - remove emacs packages
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Mar 2009 19:25:19 -0000	1.12
+++ sources	20 Aug 2009 13:06:12 -0000	1.13
@@ -1 +1 @@
-ac9d16b078f99f7a89d6865421570f05  mercurial-1.2.tar.gz
+6504f0dc32bd7ecf59a9f7f719432e76  mercurial-1.3.1.tar.gz



From ausil at fedoraproject.org  Thu Aug 20 13:18:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 13:18:35 +0000 (UTC)
Subject: rpms/mercurial/EL-5 mercurial.spec,1.17,1.18
Message-ID: <20090820131835.948C711C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mercurial/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6377

Modified Files:
	mercurial.spec 
Log Message:
remove a remnant of emacs



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/mercurial.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mercurial.spec	20 Aug 2009 13:06:12 -0000	1.17
+++ mercurial.spec	20 Aug 2009 13:18:35 -0000	1.18
@@ -70,7 +70,6 @@ install -m 644 contrib/zsh_completion $z
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
 
 cat >hgk.rc <<EOF
 [extensions]



From rdieter at fedoraproject.org  Thu Aug 20 13:25:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 13:25:04 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.113,1.114
Message-ID: <20090820132504.3535011C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7764

Modified Files:
	kdeartwork.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- kde-style-phase subpkg (multilib'd)
- %files: cleanup some dir ownership



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- kdeartwork.spec	29 Jul 2009 22:13:00 -0000	1.113
+++ kdeartwork.spec	20 Aug 2009 13:25:03 -0000	1.114
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -15,17 +15,23 @@ BuildRequires:  kdebase-workspace-devel 
 
 Requires: kdebase-workspace >= %{version}
 
-%if 0%{fedora} < 11
-# upgrade path
+# upgrade paths
+%if 0%{?fedora} < 11
 Requires: %{name}-sounds = %{version}-%{release}
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
+%if 0%{?fedora} < 12
+Requires: kde-style-phase = %{version}-%{release}
+%endif
 
 %if ! 0%{?kdeclassic_icons}
 Obsoletes: kdeclassic-icon-theme < %{version}%{release}
 Obsoletes: kdeartwork-icons < 4.2.2-3
 %endif
 
+# help multilib upgrades, when kde-style-phase was split-out
+Obsoletes: kdeartwork < 4.3.0-2
+
 %description
 %{summary}, including additional styles, themes.
 
@@ -49,6 +55,12 @@ BuildArch: noarch
 %description -n kdeclassic-icon-theme
 %{summary}.
 
+%package -n kde-style-phase
+Summary: Classic GUI style for KDE
+Group:   User Interface/Desktops
+%description -n kde-style-phase
+%{summary}.
+
 %package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
@@ -147,11 +159,20 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/color-schemes/*.colors
-%{_kde4_appsdir}/desktoptheme/
-%{_kde4_appsdir}/kstyle/
+%{_kde4_appsdir}/desktoptheme/Aya
+%{_kde4_appsdir}/desktoptheme/Clean-Blend/
+%{_kde4_appsdir}/desktoptheme/Elegance/
+%{_kde4_appsdir}/desktoptheme/heron/
+%{_kde4_appsdir}/desktoptheme/Silicon/
+%{_kde4_appsdir}/desktoptheme/slim-glow/
 %{_kde4_datadir}/emoticons/*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/*.so
+
+# split for multilib'ing
+%files -n kde-style-phase
+%defattr(-,root,root,-)
+%{_kde4_appsdir}/kstyle/themes/phase.themerc
+%{_kde4_libdir}/kde4/kstyle_phase_config.so
+%{_kde4_libdir}/kde4/plugins/styles/phasestyle.so
 
 %if 0%{?kdeclassic_icons}
 %files -n kdeclassic-icon-theme
@@ -185,6 +206,10 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- kde-style-phase subpkg (multilib'd)
+- %%files: cleanup some dir ownership
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Thu Aug 20 13:26:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 13:26:04 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.201,1.202
Message-ID: <20090820132604.4B5EF11C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8067

Modified Files:
	kdeedu.spec 
Log Message:
typo



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdeedu.spec	20 Aug 2009 12:52:05 -0000	1.201
+++ kdeedu.spec	20 Aug 2009 13:26:04 -0000	1.202
@@ -470,7 +470,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
-- add Obsoletes to help multilib upgrades)
+- add Obsoletes to help multilib upgrades
 - -marble-libs: move marble plugins here
 
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4



From scop at fedoraproject.org  Thu Aug 20 13:26:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 20 Aug 2009 13:26:10 +0000 (UTC)
Subject: rpms/dvb-apps/devel .cvsignore, 1.12, 1.13 dvb-apps.spec, 1.20,
	1.21 sources, 1.12, 1.13
Message-ID: <20090820132610.E498911C006E@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/dvb-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8108

Modified Files:
	.cvsignore dvb-apps.spec sources 
Log Message:
* Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-18
- Update tuning files to 20090820.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Jul 2009 21:27:31 -0000	1.12
+++ .cvsignore	20 Aug 2009 13:26:10 -0000	1.13
@@ -1,2 +1,2 @@
 linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20090702.tar.bz2
+dvb-apps-tuningfiles-20090820.tar.bz2


Index: dvb-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/dvb-apps.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- dvb-apps.spec	24 Jul 2009 20:39:05 -0000	1.20
+++ dvb-apps.spec	20 Aug 2009 13:26:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
 Source0:        http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2
 # Source1 created with Source99
-Source1:        %{name}-tuningfiles-20090702.tar.bz2
+Source1:        %{name}-tuningfiles-20090820.tar.bz2
 Source99:       %{name}-tuningfiles-snapshot.sh
 Patch0:         %{name}-1.1.1-optflags.patch
 Patch1:         %{name}-paths.patch
@@ -78,52 +78,55 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-18
+- Update tuning files to 20090820.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-16
+* Thu Jul  2 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-16
 - Update tuning files to 20090702.
 - Drop no longer needed workaround for #483644.
 
-* Thu Feb 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-15
+* Thu Feb 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-15
 - Add workaround for #483644.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Feb 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-13
+* Sun Feb 22 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-13
 - Update tuning files to 20090222.
 
-* Sat Aug 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-12
+* Sat Aug 30 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-12
 - Update tuning files to 20080830.
 - Convert data files to UTF-8.
 - Unfuzz optflags patch.
 
-* Thu Feb 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-11
+* Thu Feb 14 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-11
 - Update tuning files to 20080214.
 
-* Tue Aug 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-10
+* Tue Aug 21 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-10
 - Update tuning files to 20070821.
 
-* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-9
+* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-9
 - Do not build test binaries we don't run or ship.
 - Update tuning files to 20070806.
 - Change License tag to GPLv2+.
 
-* Sun May 13 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-8
+* Sun May 13 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-8
 - Update tuning files to 20070513.
 - Drop non-upstream license file.
 
-* Mon Oct  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-7
+* Mon Oct  2 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-7
 - Rebuild.
 
-* Sat Sep 23 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-6
+* Sat Sep 23 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-6
 - Include updated set of initial tuning data files from upstream hg (#203328).
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-5
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-5
 - Rebuild.
 
-* Thu May 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-4
+* Thu May 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.1-4
 - Include ATSC initial tuning data files.
 
 * Thu May 18 2006 David Woodhouse <dwmw2 at infradead.org> - 1.1.1-2
@@ -133,24 +136,24 @@ rm -rf $RPM_BUILD_ROOT
 - Update to dvb-apps 1.1.1 (add ATSC functionality)
 - Fix kernel-headers BR
 
-* Tue Feb 21 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-2
+* Tue Feb 21 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-2
 - Rebuild.
 
-* Sun Jul 17 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-1
+* Sun Jul 17 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-1
 - Include a copy of the GPL.
 
-* Thu Jun 30 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-0.4
+* Thu Jun 30 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-0.4
 - Update URL.
 
-* Sun May 29 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-0.3
+* Sun May 29 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-0.3
 - Rebuild for FC4.
 
-* Wed Apr 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-0.2
+* Wed Apr 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 1.1.0-0.2
 - Switch to recent glibc-kernheaders which includes userspace DVB headers.
 
-* Sun Dec 26 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:1.1.0-0.1
+* Sun Dec 26 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:1.1.0-0.1
 - Remove unnecessary Epochs.
 
-* Mon Oct  4 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:1.1.0-0.scop.1
+* Mon Oct  4 2004 Ville Skytt? <ville.skytta at iki.fi> - 0:1.1.0-0.scop.1
 - First build, loosely based on Mandrake's 1.1.0-4mdk.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Jul 2009 21:27:31 -0000	1.12
+++ sources	20 Aug 2009 13:26:10 -0000	1.13
@@ -1,2 +1,2 @@
 de958cdb8d00e74792dd69f3c945b037  linuxtv-dvb-apps-1.1.1.tar.bz2
-fea2a32800405a25f3d1cd31fb0fbd42  dvb-apps-tuningfiles-20090702.tar.bz2
+81b363e38abcfa83b1414ef82e6fe74e  dvb-apps-tuningfiles-20090820.tar.bz2



From kwizart at fedoraproject.org  Thu Aug 20 13:27:48 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Thu, 20 Aug 2009 13:27:48 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla-3.2.7-bp_check_ipaddress.patch, NONE,
	1.1 filezilla.spec, 1.48, 1.49
Message-ID: <20090820132748.83CB811C006E@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7957

Modified Files:
	filezilla.spec 
Added Files:
	filezilla-3.2.7-bp_check_ipaddress.patch 
Log Message:
Fix make check


filezilla-3.2.7-bp_check_ipaddress.patch:
 ipaddress.cpp |  107 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 52 insertions(+), 55 deletions(-)

--- NEW FILE filezilla-3.2.7-bp_check_ipaddress.patch ---
--- FileZilla3/trunk/tests/ipaddress.cpp	2009/08/16 20:28:41	3326
+++ FileZilla3/trunk/tests/ipaddress.cpp	2009/08/20 13:17:54	3327
@@ -2,9 +2,6 @@
 #include "directorylistingparser.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include <list>
-#ifndef __WXMSW__
-#include <sys/socket.h>
-#endif
 
 /*
  * This testsuite asserts the correctness of the
@@ -73,84 +70,84 @@
 void CIPAddressTest::testIsRoutableAddress4()
 {
 	// 127.0.0.0/8
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("126.255.255.255"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.0.0.0"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.255.255.255"), AF_INET));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("128.0.0.0"), AF_INET));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("126.255.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.0.0.0"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("127.255.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("128.0.0.0"), CSocket::ipv4));
 
 	// 10.0.0.0/8
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("9.255.255.255"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.0.0.0"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.255.255.255"), AF_INET));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("11.0.0.0"), AF_INET));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("9.255.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.0.0.0"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("10.255.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("11.0.0.0"), CSocket::ipv4));
 
 	// 169.254.0.0/16
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("169.253.255.255"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.0.0"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.255.255"), AF_INET));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("169.255.0.0"), AF_INET));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("169.253.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.0.0"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("169.254.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("169.255.0.0"), CSocket::ipv4));
 
 	// 192.168.0.0/16
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("192.167.255.255"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.0.0"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.255.255"), AF_INET));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("102.169.0.0"), AF_INET));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("192.167.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.0.0"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("192.168.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("102.169.0.0"), CSocket::ipv4));
 
 	// 172.16.0.0/20
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("172.15.255.255"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.16.0.0"), AF_INET));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.31.255.255"), AF_INET));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("172.32.0.0"), AF_INET));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("172.15.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.16.0.0"), CSocket::ipv4));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("172.31.255.255"), CSocket::ipv4));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("172.32.0.0"), CSocket::ipv4));
 }
 
 void CIPAddressTest::testIsRoutableAddress6()
 {
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::1"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::0"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::2"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("1234:ABCD::1234:ef01"), AF_INET6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::1"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::0"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::2"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("1234:ABCD::1234:ef01"), CSocket::ipv6));
 
 	// fe80::/10 (link local)
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("fe7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("fe80:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("fec0:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("fe7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("fe80:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("fec0:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
 
 	// fc00::/7 (site local)
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("fbff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("fc00:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("fe00:0000:0000:0000:0000:0000:0000:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("fbff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("fc00:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("fe00:0000:0000:0000:0000:0000:0000:0000"), CSocket::ipv6));
 
 	// IPv4 mapped
 
 	// 127.0.0.0/8
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:7eff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7f00:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7fff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:8000:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:7eff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7f00:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:7fff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:8000:0000"), CSocket::ipv6));
 
 	// 10.0.0.0/8
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:9ff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0a00:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0aff:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:0b00:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:9ff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0a00:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:0aff:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:0b00:0000"), CSocket::ipv6));
 
 	// 169.254.0.0/16
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9fd:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9ff:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9fd:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:a9fe:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:a9ff:0000"), CSocket::ipv6));
 
 	// 192.168.0.0/16
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a7:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a9:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a7:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:c0a8:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:c0a9:0000"), CSocket::ipv6));
 
 	// 172.16.0.0/20
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac0f:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac10:0000"), AF_INET6));
-	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac1f:ffff"), AF_INET6));
-	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac20:0000"), AF_INET6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac0f:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac10:0000"), CSocket::ipv6));
+	CPPUNIT_ASSERT(!IsRoutableAddress(_T("::ffff:ac1f:ffff"), CSocket::ipv6));
+	CPPUNIT_ASSERT(IsRoutableAddress(_T("::ffff:ac20:0000"), CSocket::ipv6));
 }



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- filezilla.spec	20 Aug 2009 12:42:59 -0000	1.48
+++ filezilla.spec	20 Aug 2009 13:27:47 -0000	1.49
@@ -2,13 +2,14 @@
 
 Name:           filezilla
 Version:        3.2.7
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Release:        2%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://filezilla-project.org/
 Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}%{?fz_rc:-%{?fz_rc}}_src.tar.bz2
+Patch0:         filezilla-3.2.7-bp_check_ipaddress.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Needed if autogen.sh is invoked
@@ -43,6 +44,7 @@ FileZilla is a FTP, FTPS and SFTP client
 
 %prep
 %setup -q -n %{name}-%{version}%{?fz_rc:-%{?fz_rc}}
+%patch0 -p2 -b bp
 
 # Run autotools if needed
 # sh autoconf
@@ -119,8 +121,9 @@ fi || :
 
 
 %changelog
-* Thu Aug 20 2009 kwizart < kwizart at gmail.com > - 3.2.7-1
+* Thu Aug 20 2009 kwizart < kwizart at gmail.com > - 3.2.7-2
 - Update to 3.2.7
+- Backport Fix for ipaddress.cpp at make check
 
 * Mon Aug  3 2009 kwizart < kwizart at gmail.com > - 3.2.7-0.1_rc1
 - Update to 3.2.7-rc1



From cebbert at fedoraproject.org  Thu Aug 20 13:30:14 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 20 Aug 2009 13:30:14 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6-git6.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1112, 1.1113 drm-r600-kms.patch, 1.2, 1.3 kernel.spec, 1.1728,
	1.1729 sources, 1.1070, 1.1071 upstream, 1.984,
	1.985 fix-perf-make-man-failure.patch, 1.1,
	NONE patch-2.6.31-rc6-git5.bz2.sign, 1.1, NONE
Message-ID: <20090820133014.8154C11C0439@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9038

Modified Files:
	.cvsignore drm-r600-kms.patch kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc6-git6.bz2.sign 
Removed Files:
	fix-perf-make-man-failure.patch patch-2.6.31-rc6-git5.bz2.sign 
Log Message:
2.6.31-rc6-git5
Fix up drm-r600-kms.patch
Drop fix-perf-make-man-failure.patch


--- NEW FILE patch-2.6.31-rc6-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKjOD+yGugalF9Dw4RAuluAJ0apmkqCm9MDipwL6ORh60fDrAU0wCfWd71
WxhBmKqP35ul/Oi1jVkkmfI=
=TDlk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1112
retrieving revision 1.1113
diff -u -p -r1.1112 -r1.1113
--- .cvsignore	19 Aug 2009 12:46:26 -0000	1.1112
+++ .cvsignore	20 Aug 2009 13:30:13 -0000	1.1113
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git5.bz2
+patch-2.6.31-rc6-git6.bz2

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    3 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  139 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  340 ++++----
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  981 +++++++++++++++++++++++-
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 19 files changed, 3366 insertions(+), 498 deletions(-)

Index: drm-r600-kms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-r600-kms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-r600-kms.patch	7 Aug 2009 10:47:28 -0000	1.2
+++ drm-r600-kms.patch	20 Aug 2009 13:30:13 -0000	1.3
@@ -2062,9 +2062,9 @@ index b1d945b..0c5c63a 100644
 @@ -712,6 +739,7 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
  #define RREG8(reg) readb(((void __iomem *)rdev->rmmio) + (reg))
  #define WREG8(reg, v) writeb(v, ((void __iomem *)rdev->rmmio) + (reg))
- #define RREG32(reg) rdev->mm_rreg(rdev, (reg))
+ #define RREG32(reg) r100_mm_rreg(rdev, (reg))
 +#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", rdev->mm_rreg(rdev, (reg)))
- #define WREG32(reg, v) rdev->mm_wreg(rdev, (reg), (v))
+ #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v))
  #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
  #define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
 @@ -735,6 +763,7 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
@@ -2073,8 +2073,8 @@ index b1d945b..0c5c63a 100644
  	} while (0)
 +#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", (rdev)->mm_rreg((rdev), (reg)))
  
- void r100_pll_errata_after_index(struct radeon_device *rdev);
- 
+ /*
+  * Indirect registers accessor
 @@ -844,6 +873,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
   * ASICs macro.
   */
@@ -2170,8 +2170,8 @@ index 9a75876..7e9bb12 100644
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
  	.irq_set = &rs600_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -331,7 +349,10 @@ static struct radeon_asic rs690_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2181,8 +2181,8 @@ index 9a75876..7e9bb12 100644
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
  	.irq_set = &rs600_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -380,7 +401,10 @@ static struct radeon_asic rv515_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2191,9 +2191,9 @@ index 9a75876..7e9bb12 100644
  	.ring_start = &rv515_ring_start,
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
- 	.irq_set = &r100_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_set = &rs600_irq_set,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -422,7 +446,10 @@ static struct radeon_asic r520_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2202,9 +2202,9 @@ index 9a75876..7e9bb12 100644
  	.ring_start = &rv515_ring_start,
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
- 	.irq_set = &r100_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_set = &rs600_irq_set,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -440,9 +467,119 @@ static struct radeon_asic r520_asic = {
  };
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1728
retrieving revision 1.1729
diff -u -p -r1.1728 -r1.1729
--- kernel.spec	19 Aug 2009 12:46:26 -0000	1.1728
+++ kernel.spec	20 Aug 2009 13:30:13 -0000	1.1729
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -718,9 +718,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
-# perf userspace tool patches
-Patch13000: fix-perf-make-man-failure.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1330,8 +1327,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
-ApplyPatch fix-perf-make-man-failure.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1998,6 +1993,11 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 20 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc6-git5
+- Fix up drm-r600-kms.patch
+- Drop fix-perf-make-man-failure.patch
+
 * Wed Aug 19 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc6-git5
 - Revert linux-2.6-debug-vm-would-have-oomkilled.patch to v1.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -u -p -r1.1070 -r1.1071
--- sources	19 Aug 2009 12:46:27 -0000	1.1070
+++ sources	20 Aug 2009 13:30:13 -0000	1.1071
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-6128f58fd777f9b64ea5c2fa13049021  patch-2.6.31-rc6-git5.bz2
+bf8a969c68cb72946782195934e6f183  patch-2.6.31-rc6-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -p -r1.984 -r1.985
--- upstream	19 Aug 2009 12:46:27 -0000	1.984
+++ upstream	20 Aug 2009 13:30:14 -0000	1.985
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git5.bz2
+patch-2.6.31-rc6-git6.bz2


--- fix-perf-make-man-failure.patch DELETED ---


--- patch-2.6.31-rc6-git5.bz2.sign DELETED ---



From pbrobinson at fedoraproject.org  Thu Aug 20 13:38:38 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 20 Aug 2009 13:38:38 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.2, 1.3 mutter-moblin.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090820133838.168DA11C006E@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10652

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.34.2 upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Aug 2009 21:53:16 -0000	1.2
+++ .cvsignore	20 Aug 2009 13:38:37 -0000	1.3
@@ -1 +1 @@
-mutter-moblin-0.34.0.tar.bz2
+mutter-moblin-0.34.2.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mutter-moblin.spec	19 Aug 2009 21:53:16 -0000	1.1
+++ mutter-moblin.spec	20 Aug 2009 13:38:37 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.34.0
+Version:        0.34.2
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Thu Aug 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.2-1
+- New 0.34.2 upstream release.
+
 * Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.0-1
 - New 0.34.0 upstream release.
 - Drop bits that have split to sub packages and associated deps


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Aug 2009 21:53:16 -0000	1.2
+++ sources	20 Aug 2009 13:38:37 -0000	1.3
@@ -1 +1 @@
-ed5d2cd53457692c587158494def3e9a  mutter-moblin-0.34.0.tar.bz2
+50575c091f2ed7b047acff77772dee71  mutter-moblin-0.34.2.tar.bz2



From akurtakov at fedoraproject.org  Thu Aug 20 13:45:24 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 13:45:24 +0000 (UTC)
Subject: rpms/jakarta-commons-jxpath/devel jakarta-commons-jxpath.spec, 1.2, 
	1.3
Message-ID: <20090820134524.B218F11C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-jxpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12762/devel

Modified Files:
	jakarta-commons-jxpath.spec 
Log Message:
- Fix random spaces.


Index: jakarta-commons-jxpath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-jxpath/devel/jakarta-commons-jxpath.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jakarta-commons-jxpath.spec	19 Aug 2009 16:24:47 -0000	1.2
+++ jakarta-commons-jxpath.spec	20 Aug 2009 13:45:24 -0000	1.3
@@ -33,7 +33,7 @@
 
 Name:           jakarta-%{base_name}
 Version:        1.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          0
 Summary:        Simple XPath interpreter
 
@@ -74,7 +74,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 %description
 Defines a simple interpreter of an expression language called XPath.
-JXPath applies  XPath  expressions to graphs of objects of all kinds:
+JXPath applies XPath expressions to graphs of objects of all kinds:
 JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
 
 %package        javadoc
@@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-9
+- Fix random spaces.
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-8
 - BuildRequires java-devel >= 1.6.0.
 



From tmraz at fedoraproject.org  Thu Aug 20 13:47:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 20 Aug 2009 13:47:10 +0000 (UTC)
Subject: rpms/passwd/devel passwd.spec,1.39,1.40
Message-ID: <20090820134710.D026B11C006E@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/passwd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13144

Modified Files:
	passwd.spec 
Log Message:
* Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.76-4
- rebuilt with new audit library



Index: passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- passwd.spec	25 Jul 2009 23:17:15 -0000	1.39
+++ passwd.spec	20 Aug 2009 13:47:10 -0000	1.40
@@ -7,7 +7,7 @@
 Summary: An utility for setting or changing passwords using PAM
 Name: passwd
 Version: 0.76
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://fedorahosted.org/passwd
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.76-4
+- rebuilt with new audit library
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.76-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From scop at fedoraproject.org  Thu Aug 20 13:59:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 20 Aug 2009 13:59:57 +0000 (UTC)
Subject: rpms/hdparm/devel hdparm.spec, 1.48, 1.49 hdparm-9.16-nostrip.patch,
	1.1, NONE
Message-ID: <20090820135957.9BF5311C006E@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hdparm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15942

Modified Files:
	hdparm.spec 
Removed Files:
	hdparm-9.16-nostrip.patch 
Log Message:
* Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 9.16-3
- Let rpmbuild strip the executable (#513025).



Index: hdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- hdparm.spec	25 Jul 2009 02:05:00 -0000	1.48
+++ hdparm.spec	20 Aug 2009 13:59:57 -0000	1.49
@@ -1,12 +1,11 @@
 Summary: A utility for displaying and/or setting hard disk parameters
 Name: hdparm
 Version: 9.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
 Source: http://download.sourceforge.net/hdparm/hdparm-%{version}.tar.gz
-Patch0: hdparm-9.16-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x
 
@@ -17,16 +16,13 @@ performance and to spin down hard drives
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-perl -pi -e "s/-O2/$RPM_OPT_FLAGS/g" Makefile
-make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} STRIP=/bin/true LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/doc
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 install -c -m 755 hdparm $RPM_BUILD_ROOT/sbin/hdparm
 install -c -m 644 hdparm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
@@ -41,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 9.16-3
+- Let rpmbuild strip the executable (#513025).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- hdparm-9.16-nostrip.patch DELETED ---



From rdieter at fedoraproject.org  Thu Aug 20 14:03:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:03:58 +0000 (UTC)
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.41,1.42
Message-ID: <20090820140358.C9D0C11C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16903

Modified Files:
	kmymoney2.spec 
Log Message:
allow --enable-sqlite3 option, but disable by default



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- kmymoney2.spec	20 Aug 2009 03:04:23 -0000	1.41
+++ kmymoney2.spec	20 Aug 2009 14:03:58 -0000	1.42
@@ -43,6 +43,10 @@ BuildRequires: ghostscript
 BuildRequires: %{kdelibs3}-devel
 BuildRequires: libxml2-devel
 %{?_enable_ofxbanking:BuildRequires: %{ofx_deps}}
+# FIXME/TODO: consider packaging qt-sqlite3, 
+# http://www.kde-apps.org/content/show.php?content=23011
+# so not be tempted to use the embedded copy here
+%{?_enable_sqlite3:BuildRequires:sqlite-devel}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
 
 %description
@@ -79,6 +83,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final \
+  %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -186,7 +191,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/libkmm_kdchart.so.0*
 %{_libdir}/libkmm_mymoney.so.5*
 %{_libdir}/libkmm_plugin.so.0*
-%{_libdir}/qt-3.3/plugins/sqldrivers/*.so
+%{?_enable_sqlite3:%{_libdir}/qt-3.3/plugins/sqldrivers/*.so}
 
 %files devel
 %defattr(-,root,root,-)



From rdieter at fedoraproject.org  Thu Aug 20 14:12:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:12:53 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 kdeartwork.spec,1.100,1.101
Message-ID: <20090820141253.0BA3F11C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18921

Modified Files:
	kdeartwork.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- kde-style-phase subpkg (multilib'd)
- %files: cleanup some dir ownership



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kdeartwork.spec	5 Aug 2009 02:57:17 -0000	1.100
+++ kdeartwork.spec	20 Aug 2009 14:12:52 -0000	1.101
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -15,17 +15,23 @@ BuildRequires:  kdebase-workspace-devel 
 
 Requires: kdebase-workspace >= %{version}
 
-%if 0%{fedora} < 11
-# upgrade path
+# upgrade paths
+%if 0%{?fedora} < 11
 Requires: %{name}-sounds = %{version}-%{release}
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
+%if 0%{?fedora} < 12
+Requires: kde-style-phase = %{version}-%{release}
+%endif
 
 %if ! 0%{?kdeclassic_icons}
 Obsoletes: kdeclassic-icon-theme < %{version}%{release}
 Obsoletes: kdeartwork-icons < 4.2.2-3
 %endif
 
+# help multilib upgrades, when kde-style-phase was split-out
+Obsoletes: kdeartwork < 4.3.0-2
+
 %description
 %{summary}, including additional styles, themes.
 
@@ -49,6 +55,12 @@ BuildArch: noarch
 %description -n kdeclassic-icon-theme
 %{summary}.
 
+%package -n kde-style-phase
+Summary: Classic GUI style for KDE
+Group:   User Interface/Desktops
+%description -n kde-style-phase
+%{summary}.
+
 %package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
@@ -147,11 +159,20 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/color-schemes/*.colors
-%{_kde4_appsdir}/desktoptheme/
-%{_kde4_appsdir}/kstyle/
+%{_kde4_appsdir}/desktoptheme/Aya
+%{_kde4_appsdir}/desktoptheme/Clean-Blend/
+%{_kde4_appsdir}/desktoptheme/Elegance/
+%{_kde4_appsdir}/desktoptheme/heron/
+%{_kde4_appsdir}/desktoptheme/Silicon/
+%{_kde4_appsdir}/desktoptheme/slim-glow/
 %{_kde4_datadir}/emoticons/*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/*.so
+
+# split for multilib'ing
+%files -n kde-style-phase
+%defattr(-,root,root,-)
+%{_kde4_appsdir}/kstyle/themes/phase.themerc
+%{_kde4_libdir}/kde4/kstyle_phase_config.so
+%{_kde4_libdir}/kde4/plugins/styles/phasestyle.so
 
 %if 0%{?kdeclassic_icons}
 %files -n kdeclassic-icon-theme
@@ -185,6 +206,10 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- kde-style-phase subpkg (multilib'd)
+- %%files: cleanup some dir ownership
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Thu Aug 20 14:13:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:13:24 +0000 (UTC)
Subject: rpms/kdeartwork/F-11 kdeartwork.spec,1.108,1.109
Message-ID: <20090820141324.18FBA11C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19132

Modified Files:
	kdeartwork.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- kde-style-phase subpkg (multilib'd)
- %files: cleanup some dir ownership



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-11/kdeartwork.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- kdeartwork.spec	5 Aug 2009 02:57:17 -0000	1.108
+++ kdeartwork.spec	20 Aug 2009 14:13:23 -0000	1.109
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -15,17 +15,23 @@ BuildRequires:  kdebase-workspace-devel 
 
 Requires: kdebase-workspace >= %{version}
 
-%if 0%{fedora} < 11
-# upgrade path
+# upgrade paths
+%if 0%{?fedora} < 11
 Requires: %{name}-sounds = %{version}-%{release}
 Requires: %{name}-wallpapers = %{version}-%{release}
 %endif
+%if 0%{?fedora} < 12
+Requires: kde-style-phase = %{version}-%{release}
+%endif
 
 %if ! 0%{?kdeclassic_icons}
 Obsoletes: kdeclassic-icon-theme < %{version}%{release}
 Obsoletes: kdeartwork-icons < 4.2.2-3
 %endif
 
+# help multilib upgrades, when kde-style-phase was split-out
+Obsoletes: kdeartwork < 4.3.0-2
+
 %description
 %{summary}, including additional styles, themes.
 
@@ -49,6 +55,12 @@ BuildArch: noarch
 %description -n kdeclassic-icon-theme
 %{summary}.
 
+%package -n kde-style-phase
+Summary: Classic GUI style for KDE
+Group:   User Interface/Desktops
+%description -n kde-style-phase
+%{summary}.
+
 %package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
@@ -147,11 +159,20 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/color-schemes/*.colors
-%{_kde4_appsdir}/desktoptheme/
-%{_kde4_appsdir}/kstyle/
+%{_kde4_appsdir}/desktoptheme/Aya
+%{_kde4_appsdir}/desktoptheme/Clean-Blend/
+%{_kde4_appsdir}/desktoptheme/Elegance/
+%{_kde4_appsdir}/desktoptheme/heron/
+%{_kde4_appsdir}/desktoptheme/Silicon/
+%{_kde4_appsdir}/desktoptheme/slim-glow/
 %{_kde4_datadir}/emoticons/*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/styles/*.so
+
+# split for multilib'ing
+%files -n kde-style-phase
+%defattr(-,root,root,-)
+%{_kde4_appsdir}/kstyle/themes/phase.themerc
+%{_kde4_libdir}/kde4/kstyle_phase_config.so
+%{_kde4_libdir}/kde4/plugins/styles/phasestyle.so
 
 %if 0%{?kdeclassic_icons}
 %files -n kdeclassic-icon-theme
@@ -185,6 +206,10 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- kde-style-phase subpkg (multilib'd)
+- %%files: cleanup some dir ownership
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Thu Aug 20 14:15:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:15:16 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.181,1.182
Message-ID: <20090820141516.CB59B11C0348@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19652

Modified Files:
	kdeedu.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
- add Obsoletes to help multilib upgrades
- -marble-libs: move marble plugins here



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- kdeedu.spec	9 Aug 2009 17:08:26 -0000	1.181
+++ kdeedu.spec	20 Aug 2009 14:15:16 -0000	1.182
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -54,6 +54,8 @@ BuildRequires: xplanet
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+# help multilib upgrades 
+Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
@@ -114,8 +116,8 @@ Requires: %{name}-libs%{?_isa} = %{versi
 Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
-# multilib, when marble-libs was introduced
-Obsoletes: %{name}-marble < 4.3.0-3
+# help multilib upgrades 
+Obsoletes: kdeedu-marble < 4.3.0-5
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -379,10 +381,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.4*
 %{_kde4_libdir}/libkiten.so.4*
 %{_kde4_libdir}/libscience.so.4*
-# needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules
@@ -416,7 +416,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
@@ -426,6 +425,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libmarble*.so.*
 %{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
 
 %files math
 %defattr(-,root,root,-)
@@ -469,6 +469,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
+- add Obsoletes to help multilib upgrades
+- -marble-libs: move marble plugins here
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
 - *really* make -marble-libs
 



From rdieter at fedoraproject.org  Thu Aug 20 14:15:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:15:47 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.153,1.154
Message-ID: <20090820141547.E00A211C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20220

Modified Files:
	kdeedu.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
- add Obsoletes to help multilib upgrades
- -marble-libs: move marble plugins here



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdeedu.spec	9 Aug 2009 18:50:01 -0000	1.153
+++ kdeedu.spec	20 Aug 2009 14:15:47 -0000	1.154
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -54,6 +54,8 @@ BuildRequires: xplanet
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+# help multilib upgrades 
+Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
@@ -114,8 +116,8 @@ Requires: %{name}-libs%{?_isa} = %{versi
 Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
-# multilib, when marble-libs was introduced
-Obsoletes: %{name}-marble < 4.3.0-3
+# help multilib upgrades 
+Obsoletes: kdeedu-marble < 4.3.0-5
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -379,10 +381,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.4*
 %{_kde4_libdir}/libkiten.so.4*
 %{_kde4_libdir}/libscience.so.4*
-# needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules
@@ -416,7 +416,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
@@ -426,6 +425,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libmarble*.so.*
 %{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
 
 %files math
 %defattr(-,root,root,-)
@@ -469,6 +469,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
+- add Obsoletes to help multilib upgrades
+- -marble-libs: move marble plugins here
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
 - *really* make -marble-libs
 



From overholt at fedoraproject.org  Thu Aug 20 14:15:49 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 14:15:49 +0000 (UTC)
Subject: rpms/aqute-bndlib/devel aqute-bndlib.spec,1.4,1.5
Message-ID: <20090820141549.6397811C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285

Modified Files:
	aqute-bndlib.spec 
Log Message:
* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:0.0.203-4.3
- Add LICENSE
- Clean up Group tag


Index: aqute-bndlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/aqute-bndlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- aqute-bndlib.spec	17 Aug 2009 20:42:49 -0000	1.4
+++ aqute-bndlib.spec	20 Aug 2009 14:15:49 -0000	1.5
@@ -30,11 +30,11 @@
 
 Name:           aqute-bndlib
 Version:        0.0.203
-Release:        4.2%{?dist}
+Release:        4.3%{?dist}
 Epoch:          0
 Summary:        BND Library
 License:        ASL 2.0
-Group:          Development/Java
+Group:          Development/Tools
 URL:            http://www.aQute.biz/Code/Bnd
 Source0:        http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.jar
 Source1:        http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.pom
@@ -69,7 +69,7 @@ The tool is capable of acting as: 
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -109,6 +109,8 @@ pushd target/classes
 %{jar} cmf ../../META-INF/MANIFEST.MF ../%{name}-%{version}.jar *
 popd
 
+sed -i "s|\r||g" LICENSE
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -138,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644,root,root,0755)
+%doc LICENSE
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %{_datadir}/maven2/poms/JPP-aqute-bndlib.pom
@@ -149,10 +152,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
-* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 0.0.203-4.2
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:0.0.203-4.3
+- Add LICENSE
+- Clean up Group tag
+
+* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 0:0.0.203-4.2
 - Remove gcj support
 
-* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0.0.203-4.1
+* Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0:0.0.203-4.1
 - Remove unedded BRs at Andrew Overholt's recommendation
 - Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid
   noarch on 64-bit arches problem



From scop at fedoraproject.org  Thu Aug 20 14:16:23 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 20 Aug 2009 14:16:23 +0000 (UTC)
Subject: rpms/hddtemp/devel hddtemp.init, 1.4, 1.5 hddtemp.spec, 1.28,
	1.29 hddtemp.sysconfig, 1.2, 1.3
Message-ID: <20090820141623.945A511C006E@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20751

Modified Files:
	hddtemp.init hddtemp.spec hddtemp.sysconfig 
Log Message:
* Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.19.beta15
- Try to start daemon for all disks if none are specified in sysconfig.
- Update URLs.



Index: hddtemp.init
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hddtemp.init	4 Sep 2007 21:23:29 -0000	1.4
+++ hddtemp.init	20 Aug 2009 14:16:23 -0000	1.5
@@ -33,6 +33,13 @@ lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
     if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        # Try all disks
+        for disk in /dev/hd[a-z] /dev/sd[a-z] ; do
+            [ -b "$disk" ] && HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $disk"
+        done
+    fi
+    if [[ "$HDDTEMP_OPTIONS" != */dev/* ]] ; then
+        # Still no disks, bail out
         action $"Unconfigured: $prog, see __ETCDIR__/sysconfig/hddtemp: " /bin/false
         retval=6
     else


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- hddtemp.spec	25 Jul 2009 02:03:57 -0000	1.28
+++ hddtemp.spec	20 Aug 2009 14:16:23 -0000	1.29
@@ -2,14 +2,14 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.18.%{beta}%{?dist}
+Release:        0.19.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
 License:        GPLv2+
-URL:            http://www.guzu.net/linux/hddtemp.php
-Source0:        http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2
-Source1:        http://www.guzu.net/linux/hddtemp.db
+URL:            http://savannah.nongnu.org/projects/hddtemp/
+Source0:        http://download.savannah.nongnu.org/releases/hddtemp/%{name}-%{version}-%{beta}.tar.bz2
+Source1:        http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db
 Source2:        %{name}.init
 Source3:        %{name}.sysconfig
 Source4:        %{name}.pam
@@ -93,50 +93,54 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.19.beta15
+- Try to start daemon for all disks if none are specified in sysconfig.
+- Update URLs.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.18.beta15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.17.beta15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Oct  1 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.16.beta15
+* Wed Oct  1 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.16.beta15
 - Sync with Debian's 0.3-beta15-45 for a fix for undesired spin-ups with
   most current drives (#464912).
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.15.beta15
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.15.beta15
 - Sync with Debian's 0.3-beta15-38.
 - Update drive database to 2007-09-14.
 - Trim pre-2006 changelog entries.
 
-* Wed Sep  5 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.14.beta15
+* Wed Sep  5 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.14.beta15
 - Adjust server chkconfig start/stop priorities to start before gkrellmd,
   other cosmetic init script tweaks.
 - Mark hddtemp.db as %%config(noreplace).
 
-* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.13.beta15
+* Mon Aug  6 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.13.beta15
 - License: GPLv2+
 
-* Tue Jul 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.12.beta15
+* Tue Jul 10 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.12.beta15
 - Improve init script LSB compliance.
 
-* Tue Jan  9 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.11.beta15
+* Tue Jan  9 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.11.beta15
 - SATA sense fix (#221100, Jens Axboe).
 
-* Sun Dec 31 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.10.beta15
+* Sun Dec 31 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.10.beta15
 - Apply patches from Debian containing bunch of hddtemp.db updates and
   guess mode improvements for drives not in the database.
 
-* Wed Aug 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.9.beta15
+* Wed Aug 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.9.beta15
 - Rebuild.
 
-* Wed May  3 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.8.beta15
+* Wed May  3 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.8.beta15
 - 0.3-beta15, drive database 2006-04-26.
 - Specfile cleanups.
 
-* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.8.beta14
+* Wed Feb  8 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.8.beta14
 - Update drive database to 2006-02-07.
 
-* Wed Jan 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.7.beta14
+* Wed Jan 18 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.3-0.7.beta14
 - Update drive database to 2006-01-18.
 - Init script is not a config file.
 - Mark console.perms snippet as noreplace.


Index: hddtemp.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/devel/hddtemp.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hddtemp.sysconfig	4 Dec 2004 22:43:31 -0000	1.2
+++ hddtemp.sysconfig	20 Aug 2009 14:16:23 -0000	1.3
@@ -1,4 +1,5 @@
 #
-# hddtemp(8) daemon options.  Add at least the disk(s) you want to monitor here.
+# hddtemp(8) daemon options.  If no disks are specified here, the init script
+# will try to autodetect and start monitoring all of them.
 #
 HDDTEMP_OPTIONS="-l 127.0.0.1"



From pkgdb at fedoraproject.org  Thu Aug 20 14:17:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 14:17:29 +0000
Subject: [pkgdb] saxpath: akurtakov has requested watchbugzilla
Message-ID: <20090820141729.A730F10F857@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on saxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/saxpath



From pkgdb at fedoraproject.org  Thu Aug 20 14:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 14:17:30 +0000
Subject: [pkgdb] saxpath: akurtakov has requested commit
Message-ID: <20090820141730.3980E10F882@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on saxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/saxpath



From pkgdb at fedoraproject.org  Thu Aug 20 14:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 14:17:34 +0000
Subject: [pkgdb] saxpath: akurtakov has requested watchcommits
Message-ID: <20090820141734.802F910F895@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on saxpath (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/saxpath



From tmraz at fedoraproject.org  Thu Aug 20 14:18:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 20 Aug 2009 14:18:42 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-cipher-change.patch, NONE,
	1.1 openssl-1.0.0-beta3-default-paths.patch, NONE,
	1.1 openssl-1.0.0-beta3-defaults.patch, NONE,
	1.1 openssl-1.0.0-beta3-enginesdir.patch, NONE,
	1.1 openssl-1.0.0-beta3-fips.patch, NONE,
	1.1 openssl-1.0.0-beta3-fipscheck.patch, NONE,
	1.1 openssl-1.0.0-beta3-fipsmode.patch, NONE,
	1.1 openssl-1.0.0-beta3-fipsrng.patch, NONE,
	1.1 openssl-1.0.0-beta3-ipv6-apps.patch, NONE,
	1.1 openssl-1.0.0-beta3-krb5.patch, NONE,
	1.1 openssl-1.0.0-beta3-namingblk.patch, NONE,
	1.1 openssl-1.0.0-beta3-namingstr.patch, NONE,
	1.1 openssl-1.0.0-beta3-redhat.patch, NONE,
	1.1 openssl-1.0.0-beta3-soversion.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 README.FIPS, 1.1, 1.2 hobble-openssl, 1.7,
	1.8 openssl.spec, 1.133, 1.134 sources, 1.20,
	1.21 openssl-0.9.8a-defaults.patch, 1.3,
	NONE openssl-0.9.8a-enginesdir.patch, 1.1,
	NONE openssl-0.9.8a-link-krb5.patch, 1.1,
	NONE openssl-0.9.8a-reuse-cipher-change.patch, 1.1,
	NONE openssl-0.9.8g-default-paths.patch, 1.1,
	NONE openssl-0.9.8g-ipv6-apps.patch, 1.1,
	NONE openssl-0.9.8g-no-extssl.patch, 1.2,
	NONE openssl-0.9.8j-eap-fast.patch, 1.1,
	NONE openssl-0.9.8j-enginesdir.patch, 1.1,
	NONE openssl-0.9.8j-fips-no-pairwise.patch, 1.1,
	NONE openssl-0.9.8j-nocanister.patch, 1.1,
	NONE openssl-0.9.8j-redhat.patch, 1.1,
	NONE openssl-0.9.8j-soversion.patch, 1.1,
	NONE openssl-0.9.8k-dtls-compat.patch, 1.1,
	NONE openssl-0.9.8k-dtls-dos.patch, 1.1,
	NONE openssl-0.9.8k-fips-rng-seed.patch, 1.1,
	NONE openssl-0.9.8k-fipscheck-hmac.patch, 1.1,
	NONE openssl-0.9.8k-kernel-fipsmode.patch, 1.1,
	NONE openssl-0.9.8k-multi-crl.patch, 1.1,
	NONE openssl-0.9.8k-shlib-version.patch, 1.1,
	NONE openssl-0.9.8k-use-fipscheck.patch, 1.1,
	NONE openssl-0.9.8k-x509-name-cmp.patch, 1.1, NONE
Message-ID: <20090820141842.E6DDA11C006E@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21444

Modified Files:
	.cvsignore README.FIPS hobble-openssl openssl.spec sources 
Added Files:
	openssl-1.0.0-beta3-cipher-change.patch 
	openssl-1.0.0-beta3-default-paths.patch 
	openssl-1.0.0-beta3-defaults.patch 
	openssl-1.0.0-beta3-enginesdir.patch 
	openssl-1.0.0-beta3-fips.patch 
	openssl-1.0.0-beta3-fipscheck.patch 
	openssl-1.0.0-beta3-fipsmode.patch 
	openssl-1.0.0-beta3-fipsrng.patch 
	openssl-1.0.0-beta3-ipv6-apps.patch 
	openssl-1.0.0-beta3-krb5.patch 
	openssl-1.0.0-beta3-namingblk.patch 
	openssl-1.0.0-beta3-namingstr.patch 
	openssl-1.0.0-beta3-redhat.patch 
	openssl-1.0.0-beta3-soversion.patch 
Removed Files:
	openssl-0.9.8a-defaults.patch openssl-0.9.8a-enginesdir.patch 
	openssl-0.9.8a-link-krb5.patch 
	openssl-0.9.8a-reuse-cipher-change.patch 
	openssl-0.9.8g-default-paths.patch 
	openssl-0.9.8g-ipv6-apps.patch openssl-0.9.8g-no-extssl.patch 
	openssl-0.9.8j-eap-fast.patch openssl-0.9.8j-enginesdir.patch 
	openssl-0.9.8j-fips-no-pairwise.patch 
	openssl-0.9.8j-nocanister.patch openssl-0.9.8j-redhat.patch 
	openssl-0.9.8j-soversion.patch 
	openssl-0.9.8k-dtls-compat.patch openssl-0.9.8k-dtls-dos.patch 
	openssl-0.9.8k-fips-rng-seed.patch 
	openssl-0.9.8k-fipscheck-hmac.patch 
	openssl-0.9.8k-kernel-fipsmode.patch 
	openssl-0.9.8k-multi-crl.patch 
	openssl-0.9.8k-shlib-version.patch 
	openssl-0.9.8k-use-fipscheck.patch 
	openssl-0.9.8k-x509-name-cmp.patch 
Log Message:
* Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.1.beta3
- update to new major upstream release


openssl-1.0.0-beta3-cipher-change.patch:
 ssl.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-cipher-change.patch ---
diff -up openssl-1.0.0-beta3/ssl/ssl.h.cipher-change openssl-1.0.0-beta3/ssl/ssl.h
--- openssl-1.0.0-beta3/ssl/ssl.h.cipher-change	2009-08-05 18:22:45.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl.h	2009-08-05 18:27:32.000000000 +0200
@@ -511,7 +511,7 @@ typedef struct ssl_session_st
 
 #define SSL_OP_MICROSOFT_SESS_ID_BUG			0x00000001L
 #define SSL_OP_NETSCAPE_CHALLENGE_BUG			0x00000002L
-#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L
+#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L /* can break some security expectations */
 #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L
 #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L
 #define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x00000040L /* no effect since 0.9.7h and 0.9.8b */
@@ -528,7 +528,7 @@ typedef struct ssl_session_st
 
 /* SSL_OP_ALL: various bug workarounds that should be rather harmless.
  *             This used to be 0x000FFFFFL before 0.9.7. */
-#define SSL_OP_ALL					0x80000FFFL
+#define SSL_OP_ALL					0x80000FF7L
 
 /* DTLS options */
 #define SSL_OP_NO_QUERY_MTU                 0x00001000L

openssl-1.0.0-beta3-default-paths.patch:
 s_client.c |    9 +++++----
 s_server.c |   16 ++++++++++------
 s_time.c   |    9 +++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-default-paths.patch ---
diff -up openssl-1.0.0-beta3/apps/s_client.c.default-paths openssl-1.0.0-beta3/apps/s_client.c
--- openssl-1.0.0-beta3/apps/s_client.c.default-paths	2009-06-30 18:10:24.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_client.c	2009-08-05 18:17:52.000000000 +0200
@@ -888,12 +888,13 @@ bad:
 	if (!set_cert_key_stuff(ctx,cert,key))
 		goto end;
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(ctx)))
+	if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
+		{
+		ERR_print_errors(bio_err);
+		}
+	if (!SSL_CTX_set_default_verify_paths(ctx))
 		{
-		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
 		ERR_print_errors(bio_err);
-		/* goto end; */
 		}
 
 #ifndef OPENSSL_NO_TLSEXT
diff -up openssl-1.0.0-beta3/apps/s_server.c.default-paths openssl-1.0.0-beta3/apps/s_server.c
--- openssl-1.0.0-beta3/apps/s_server.c.default-paths	2009-06-30 18:10:24.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_server.c	2009-08-05 18:18:40.000000000 +0200
@@ -1403,12 +1403,13 @@ bad:
 		}
 #endif
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(ctx)))
+	if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
+		{
+		ERR_print_errors(bio_err);
+		}
+	if (!SSL_CTX_set_default_verify_paths(ctx))
 		{
-		/* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
 		ERR_print_errors(bio_err);
-		/* goto end; */
 		}
 	if (vpm)
 		SSL_CTX_set1_param(ctx, vpm);
@@ -1457,8 +1458,11 @@ bad:
 
 		SSL_CTX_sess_set_cache_size(ctx2,128);
 
-		if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
-			(!SSL_CTX_set_default_verify_paths(ctx2)))
+		if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath))
+			{
+			ERR_print_errors(bio_err);
+			}
+		if (!SSL_CTX_set_default_verify_paths(ctx2))
 			{
 			ERR_print_errors(bio_err);
 			}
diff -up openssl-1.0.0-beta3/apps/s_time.c.default-paths openssl-1.0.0-beta3/apps/s_time.c
--- openssl-1.0.0-beta3/apps/s_time.c.default-paths	2006-04-17 14:22:13.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_time.c	2009-08-05 18:00:35.000000000 +0200
@@ -373,12 +373,13 @@ int MAIN(int argc, char **argv)
 
 	SSL_load_error_strings();
 
-	if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(tm_ctx)))
+	if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
+		{
+		ERR_print_errors(bio_err);
+		}
+	if (!SSL_CTX_set_default_verify_paths(tm_ctx))
 		{
-		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
 		ERR_print_errors(bio_err);
-		/* goto end; */
 		}
 
 	if (tm_cipher == NULL)

openssl-1.0.0-beta3-defaults.patch:
 openssl.cnf |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-defaults.patch ---
diff -up openssl-1.0.0-beta3/apps/openssl.cnf.defaults openssl-1.0.0-beta3/apps/openssl.cnf
--- openssl-1.0.0-beta3/apps/openssl.cnf.defaults	2009-04-04 20:09:43.000000000 +0200
+++ openssl-1.0.0-beta3/apps/openssl.cnf	2009-08-04 22:57:16.000000000 +0200
@@ -103,7 +103,8 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 1024
+default_bits		= 2048
+default_md		= sha1
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
@@ -126,17 +127,18 @@ string_mask = utf8only
 
 [ req_distinguished_name ]
 countryName			= Country Name (2 letter code)
-countryName_default		= AU
+countryName_default		= XX
 countryName_min			= 2
 countryName_max			= 2
 
 stateOrProvinceName		= State or Province Name (full name)
-stateOrProvinceName_default	= Some-State
+#stateOrProvinceName_default	= Default Province
 
 localityName			= Locality Name (eg, city)
+localityName_default	= Default City
 
 0.organizationName		= Organization Name (eg, company)
-0.organizationName_default	= Internet Widgits Pty Ltd
+0.organizationName_default	= Default Company Ltd
 
 # we can do this but it is not needed normally :-)
 #1.organizationName		= Second Organization Name (eg, company)
@@ -145,7 +147,7 @@ localityName			= Locality Name (eg, city
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (eg, YOUR name)
+commonName			= Common Name (eg, your name or your server\'s hostname)
 commonName_max			= 64
 
 emailAddress			= Email Address

openssl-1.0.0-beta3-enginesdir.patch:
 Configure        |    9 +++++++--
 engines/Makefile |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-enginesdir.patch ---
diff -up openssl-1.0.0-beta3/Configure.enginesdir openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.enginesdir	2009-08-10 19:46:32.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-10 19:46:32.000000000 +0200
@@ -616,6 +616,7 @@ my $idx_multilib = $idx++;
 
 my $prefix="";
 my $openssldir="";
+my $enginesdir="";
 my $exe_ext="";
 my $install_prefix="";
 my $cross_compile_prefix="";
@@ -820,6 +821,10 @@ PROCESS_ARGS:
 				{
 				$openssldir=$1;
 				}
+			elsif (/^--enginesdir=(.*)$/)
+				{
+				$enginesdir=$1;
+				}
 			elsif (/^--install.prefix=(.*)$/)
 				{
 				$install_prefix=$1;
@@ -1037,7 +1042,7 @@ chop $prefix if $prefix =~ /.\/$/;
 
 $openssldir=$prefix . "/ssl" if $openssldir eq "";
 $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
-
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
 
 print "IsMK1MF=$IsMK1MF\n";
 
@@ -1645,7 +1650,7 @@ while (<IN>)
 		# $foo is to become "$prefix/lib$multilib/engines";
 		# as Makefile.org and engines/Makefile are adapted for
 		# $multilib suffix.
-		my $foo = "$prefix/lib/engines";
+		my $foo = "$enginesdir";
 		$foo =~ s/\\/\\\\/g;
 		print OUT "#define ENGINESDIR \"$foo\"\n";
 		}
diff -up openssl-1.0.0-beta3/engines/Makefile.enginesdir openssl-1.0.0-beta3/engines/Makefile
--- openssl-1.0.0-beta3/engines/Makefile.enginesdir	2009-06-14 04:37:22.000000000 +0200
+++ openssl-1.0.0-beta3/engines/Makefile	2009-08-10 19:46:48.000000000 +0200
@@ -123,7 +123,7 @@ install:
 				sfx=".so"; \
 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
 			  fi; \
-			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
+			  chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx ); \
 		done; \
 	fi

openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_misc.c        |   13 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   48 +
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   23 
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  101 +++
 crypto/fips/fips_des_selftest.c    |  137 +++++
 crypto/fips/fips_dsa_selftest.c    |  180 +++++++
 crypto/fips/fips_hmac_selftest.c   |  135 +++++
 crypto/fips/fips_rand.c            |  410 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  371 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  432 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   97 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    5 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  158 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |   99 +++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 114 files changed, 9984 insertions(+), 177 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-fips.patch ---
diff -up openssl-1.0.0-beta3/Configure.fips openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-11 18:07:30.000000000 +0200
@@ -654,6 +654,7 @@ my $cmll_enc="camellia.o cmll_misc.o cml
 my $processor="";
 my $default_ranlib;
 my $perl;
+my $fips=0;
 
 
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
@@ -797,6 +798,10 @@ PROCESS_ARGS:
 			}
 		elsif (/^386$/)
 			{ $processor=386; }
+		elsif (/^fips$/)
+			{
+			$fips=1;
+		        }
 		elsif (/^rsaref$/)
 			{
 			# No RSAref support any more since it's not needed.
@@ -1349,6 +1354,11 @@ $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no
 
 $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/);
 
+if ($fips)
+	{
+	$openssl_other_defines.="#define OPENSSL_FIPS\n";
+	}
+
 $cpuid_obj="mem_clr.o"	unless ($cpuid_obj =~ /\.o$/);
 $des_obj=$des_enc	unless ($des_obj =~ /\.o$/);
 $bf_obj=$bf_enc		unless ($bf_obj =~ /\.o$/);
@@ -1504,6 +1514,10 @@ while (<IN>)
 	s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
 	s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
 	s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
+	if ($fips)
+		{
+		s/^FIPS=.*/FIPS=yes/;
+		}
 	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
 	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
 	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
diff -up openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips openssl-1.0.0-beta3/crypto/bf/bf_skey.c
--- openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips	2008-11-12 04:57:52.000000000 +0100
+++ openssl-1.0.0-beta3/crypto/bf/bf_skey.c	2009-08-11 18:07:30.000000000 +0200
@@ -59,10 +59,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <openssl/blowfish.h>
+#include <openssl/crypto.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #include "bf_locl.h"
 #include "bf_pi.h"
 
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+FIPS_NON_FIPS_VCIPHER_Init(BF)
 	{
 	int i;
 	BF_LONG *p,ri,in[2];
diff -up openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips openssl-1.0.0-beta3/crypto/bf/blowfish.h
--- openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/bf/blowfish.h	2009-08-11 18:07:30.000000000 +0200
@@ -104,7 +104,9 @@ typedef struct bf_key_st
 	BF_LONG S[4*256];
 	} BF_KEY;
 
- 
+#ifdef OPENSSL_FIPS 
+void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
+#endif
 void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
 
 void BF_encrypt(BF_LONG *data,const BF_KEY *key);
diff -up openssl-1.0.0-beta3/crypto/bn/bn.h.fips openssl-1.0.0-beta3/crypto/bn/bn.h
--- openssl-1.0.0-beta3/crypto/bn/bn.h.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/bn/bn.h	2009-08-11 18:07:30.000000000 +0200
@@ -540,6 +540,17 @@ int	BN_is_prime_ex(const BIGNUM *p,int n
 int	BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
 		int do_trial_division, BN_GENCB *cb);
 
+int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
+
+int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
+			const BIGNUM *Xp, const BIGNUM *Xp1, const BIGNUM *Xp2,
+			const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb);
+int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
+			BIGNUM *Xp1, BIGNUM *Xp2,
+			const BIGNUM *Xp,
+			const BIGNUM *e, BN_CTX *ctx,
+			BN_GENCB *cb);
+
 BN_MONT_CTX *BN_MONT_CTX_new(void );
 void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
 int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
diff -up /dev/null openssl-1.0.0-beta3/crypto/bn/bn_x931p.c
--- /dev/null	2009-07-27 08:39:22.849064505 +0200
+++ openssl-1.0.0-beta3/crypto/bn/bn_x931p.c	2009-08-11 18:07:30.000000000 +0200
@@ -0,0 +1,272 @@
+/* bn_x931p.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
+ * project 2005.
+ */
+/* ====================================================================
+ * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing at OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <openssl/bn.h>
+
+/* X9.31 routines for prime derivation */
+
+/* X9.31 prime derivation. This is used to generate the primes pi
+ * (p1, p2, q1, q2) from a parameter Xpi by checking successive odd
+ * integers.
+ */
+
+static int bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx,
+			BN_GENCB *cb)
+	{
+	int i = 0;
+	if (!BN_copy(pi, Xpi))
+		return 0;
+	if (!BN_is_odd(pi) && !BN_add_word(pi, 1))
+		return 0;
+	for(;;)
+		{
+		i++;
+		BN_GENCB_call(cb, 0, i);
+		/* NB 27 MR is specificed in X9.31 */
+		if (BN_is_prime_fasttest_ex(pi, 27, ctx, 1, cb))
+			break;
+		if (!BN_add_word(pi, 2))
+			return 0;
+		}
+	BN_GENCB_call(cb, 2, i);
+	return 1;
+	}
+
+/* This is the main X9.31 prime derivation function. From parameters
+ * Xp1, Xp2 and Xp derive the prime p. If the parameters p1 or p2 are
+ * not NULL they will be returned too: this is needed for testing.
+ */
+
[...11497 lines suppressed...]
+#endif
+
 	if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
 		{
 		/* we have SSLv3/TLSv1 in an SSLv2 header
diff -up openssl-1.0.0-beta3/ssl/s3_clnt.c.fips openssl-1.0.0-beta3/ssl/s3_clnt.c
--- openssl-1.0.0-beta3/ssl/s3_clnt.c.fips	2009-06-16 18:39:20.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_clnt.c	2009-08-11 18:07:30.000000000 +0200
@@ -156,6 +156,10 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
@@ -1524,6 +1528,8 @@ int ssl3_get_key_exchange(SSL *s)
 			q=md_buf;
 			for (num=2; num > 0; num--)
 				{
+				EVP_MD_CTX_set_flags(&md_ctx,
+					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 				EVP_DigestInit_ex(&md_ctx,(num == 2)
 					?s->ctx->md5:s->ctx->sha1, NULL);
 				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
diff -up openssl-1.0.0-beta3/ssl/s3_enc.c.fips openssl-1.0.0-beta3/ssl/s3_enc.c
--- openssl-1.0.0-beta3/ssl/s3_enc.c.fips	2009-04-16 19:22:50.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_enc.c	2009-08-11 18:07:30.000000000 +0200
@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
 #endif
 	k=0;
 	EVP_MD_CTX_init(&m5);
+	EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 	EVP_MD_CTX_init(&s1);
 	for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
 		{
@@ -614,6 +615,8 @@ int ssl3_digest_cached_records(SSL *s)
 		if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
 			{
 			s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
+			EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
+				EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 			EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
 			EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
 			} 
@@ -670,6 +673,7 @@ static int ssl3_handshake_mac(SSL *s, in
 		return 0;
 	}	
 	EVP_MD_CTX_init(&ctx);
+	EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 	EVP_MD_CTX_copy_ex(&ctx,d);
 	n=EVP_MD_CTX_size(&ctx);
 	if (n < 0)
diff -up openssl-1.0.0-beta3/ssl/s3_srvr.c.fips openssl-1.0.0-beta3/ssl/s3_srvr.c
--- openssl-1.0.0-beta3/ssl/s3_srvr.c.fips	2009-06-26 17:04:22.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_srvr.c	2009-08-11 18:07:30.000000000 +0200
@@ -1674,6 +1674,8 @@ int ssl3_send_server_key_exchange(SSL *s
 				j=0;
 				for (num=2; num > 0; num--)
 					{
+					EVP_MD_CTX_set_flags(&md_ctx,
+						EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 					EVP_DigestInit_ex(&md_ctx,(num == 2)
 						?s->ctx->md5:s->ctx->sha1, NULL);
 					EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips openssl-1.0.0-beta3/ssl/ssl_ciph.c
--- openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips	2009-04-07 14:10:59.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-11 18:07:30.000000000 +0200
@@ -727,6 +727,9 @@ static void ssl_cipher_collect_ciphers(c
 		    !(c->algorithm_auth & disabled_auth) &&
 		    !(c->algorithm_enc & disabled_enc) &&
 		    !(c->algorithm_mac & disabled_mac) &&
+#ifdef OPENSSL_FIPS
+			(!FIPS_mode() || (c->algo_strength & SSL_FIPS)) &&
+#endif
 		    !(c->algorithm_ssl & disabled_ssl))
 			{
 			co_list[co_list_num].cipher = c;
@@ -1423,7 +1426,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
 	 */
 	for (curr = head; curr != NULL; curr = curr->next)
 		{
+#ifdef OPENSSL_FIPS
+		if (curr->active && (!FIPS_mode() || curr->cipher->algo_strength & SSL_FIPS))
+#else
 		if (curr->active)
+#endif
 			{
 			sk_SSL_CIPHER_push(cipherstack, curr->cipher);
 #ifdef CIPHER_DEBUG
diff -up openssl-1.0.0-beta3/ssl/ssl_lib.c.fips openssl-1.0.0-beta3/ssl/ssl_lib.c
--- openssl-1.0.0-beta3/ssl/ssl_lib.c.fips	2009-06-30 13:57:24.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-08-11 18:07:30.000000000 +0200
@@ -1470,6 +1470,14 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
 		return(NULL);
 		}
 
+#ifdef OPENSSL_FIPS
+	if (FIPS_mode() && (meth->version < TLS1_VERSION))	
+		{
+		SSLerr(SSL_F_SSL_CTX_NEW, SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+		return NULL;
+		}
+#endif
+
 	if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0)
 		{
 		SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
diff -up openssl-1.0.0-beta3/ssl/ssltest.c.fips openssl-1.0.0-beta3/ssl/ssltest.c
--- openssl-1.0.0-beta3/ssl/ssltest.c.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssltest.c	2009-08-11 18:07:30.000000000 +0200
@@ -265,6 +265,9 @@ static void sv_usage(void)
 	{
 	fprintf(stderr,"usage: ssltest [args ...]\n");
 	fprintf(stderr,"\n");
+#ifdef OPENSSL_FIPS
+	fprintf(stderr,"-F             - run test in FIPS mode\n");
+#endif
 	fprintf(stderr," -server_auth  - check server certificate\n");
 	fprintf(stderr," -client_auth  - do client authentication\n");
 	fprintf(stderr," -proxy        - allow proxy certificates\n");
@@ -484,6 +487,9 @@ int main(int argc, char *argv[])
 #endif
 	STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
 	int test_cipherlist = 0;
+#ifdef OPENSSL_FIPS
+	int fips_mode=0;
+#endif
 
 	verbose = 0;
 	debug = 0;
@@ -515,7 +521,16 @@ int main(int argc, char *argv[])
 
 	while (argc >= 1)
 		{
-		if	(strcmp(*argv,"-server_auth") == 0)
+		if(!strcmp(*argv,"-F"))
+			{
+#ifdef OPENSSL_FIPS
+			fips_mode=1;
+#else
+			fprintf(stderr,"not compiled with FIPS support, so exitting without running.\n");
+			EXIT(0);
+#endif
+			}
+		else if	(strcmp(*argv,"-server_auth") == 0)
 			server_auth=1;
 		else if	(strcmp(*argv,"-client_auth") == 0)
 			client_auth=1;
@@ -711,6 +726,20 @@ bad:
 		EXIT(1);
 		}
 
+#ifdef OPENSSL_FIPS
+	if(fips_mode)
+		{
+		if(!FIPS_mode_set(1))
+			{
+			ERR_load_crypto_strings();
+			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
+			EXIT(1);
+			}
+		else
+			fprintf(stderr,"*** IN FIPS MODE ***\n");
+		}
+#endif
+
 	if (print_time)
 		{
 		if (!bio_pair)
@@ -2153,12 +2182,12 @@ static int MS_CALLBACK app_verify_callba
 		}
 
 #ifndef OPENSSL_NO_X509_VERIFY
-# ifdef OPENSSL_FIPS
+# if 0
 	if(s->version == TLS1_VERSION)
 		FIPS_allow_md5(1);
 # endif
 	ok = X509_verify_cert(ctx);
-# ifdef OPENSSL_FIPS
+# if 0
 	if(s->version == TLS1_VERSION)
 		FIPS_allow_md5(0);
 # endif
diff -up openssl-1.0.0-beta3/ssl/t1_enc.c.fips openssl-1.0.0-beta3/ssl/t1_enc.c
--- openssl-1.0.0-beta3/ssl/t1_enc.c.fips	2009-04-19 20:03:13.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/t1_enc.c	2009-08-11 18:07:30.000000000 +0200
@@ -169,6 +169,8 @@ static void tls1_P_hash(const EVP_MD *md
 
 	HMAC_CTX_init(&ctx);
 	HMAC_CTX_init(&ctx_tmp);
+	HMAC_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+	HMAC_CTX_set_flags(&ctx_tmp, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 	HMAC_Init_ex(&ctx,sec,sec_len,md, NULL);
 	HMAC_Init_ex(&ctx_tmp,sec,sec_len,md, NULL);
 	if (seed1 != NULL) HMAC_Update(&ctx,seed1,seed1_len);

openssl-1.0.0-beta3-fipscheck.patch:
 Makefile               |   13 ++
 fips.c                 |  218 +++++++++++++++++++++++++++++++++++++++++++++++++
 fips_standalone_sha1.c |   42 ++++-----
 3 files changed, 251 insertions(+), 22 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-fipscheck.patch ---
diff -up openssl-1.0.0-beta3/crypto/fips/fips.c.fipscheck openssl-1.0.0-beta3/crypto/fips/fips.c
--- openssl-1.0.0-beta3/crypto/fips/fips.c.fipscheck	2009-08-10 20:11:59.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-08-10 20:11:59.000000000 +0200
@@ -47,6 +47,7 @@
  *
  */
 
+#define _GNU_SOURCE
 
 #include <openssl/rand.h>
 #include <openssl/fips_rand.h>
@@ -56,6 +57,9 @@
 #include <openssl/rsa.h>
 #include <string.h>
 #include <limits.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
@@ -165,6 +169,204 @@ int FIPS_selftest()
 	&& FIPS_selftest_dsa();
     }
 
+/* we implement what libfipscheck does ourselves */
+
+static int
+get_library_path(const char *libname, const char *symbolname, char *path, size_t pathlen)
+{
+	Dl_info info;
+	void *dl, *sym;
+	int rv = -1;
+
+        dl = dlopen(libname, RTLD_LAZY);
+        if (dl == NULL) {
+	        return -1;
+        }       
+
+	sym = dlsym(dl, symbolname);
+
+	if (sym != NULL && dladdr(sym, &info)) {
+		strncpy(path, info.dli_fname, pathlen-1);
+		path[pathlen-1] = '\0';
+		rv = 0;
+	}
+
+	dlclose(dl);	
+	
+	return rv;
+}
+
+static const char conv[] = "0123456789abcdef";
+
+static char *
+bin2hex(void *buf, size_t len)
+{
+	char *hex, *p;
+	unsigned char *src = buf;
+	
+	hex = malloc(len * 2 + 1);
+	if (hex == NULL)
+		return NULL;
+
+	p = hex;
+
+	while (len > 0) {
+		unsigned c;
+
+		c = *src;
+		src++;
+
+		*p = conv[c >> 4];
+		++p;
+		*p = conv[c & 0x0f];
+		++p;
+		--len;
+	}
+	*p = '\0';
+	return hex;
+}
+
+#define HMAC_PREFIX "." 
+#define HMAC_SUFFIX ".hmac" 
+#define READ_BUFFER_LENGTH 16384
+
+static char *
+make_hmac_path(const char *origpath)
+{
+	char *path, *p;
+	const char *fn;
+
+	path = malloc(sizeof(HMAC_PREFIX) + sizeof(HMAC_SUFFIX) + strlen(origpath));
+	if(path == NULL) {
+		return NULL;
+	}
+
+	fn = strrchr(origpath, '/');
+	if (fn == NULL) {
+		fn = origpath;
+	} else {
+		++fn;
+	}
+
+	strncpy(path, origpath, fn-origpath);
+	p = path + (fn - origpath);
+	p = stpcpy(p, HMAC_PREFIX);
+	p = stpcpy(p, fn);
+	p = stpcpy(p, HMAC_SUFFIX);
+
+	return path;
+}
+
+static const char hmackey[] = "orboDeJITITejsirpADONivirpUkvarP";
+
+static int
+compute_file_hmac(const char *path, void **buf, size_t *hmaclen)
+{
+	FILE *f = NULL;
+	int rv = -1;
+	unsigned char rbuf[READ_BUFFER_LENGTH];
+	size_t len;
+	unsigned int hlen;
+	HMAC_CTX c;
+
+	HMAC_CTX_init(&c);
+
+	f = fopen(path, "r");
+
+	if (f == NULL) {
+		goto end;
+	}
+
+	HMAC_Init(&c, hmackey, sizeof(hmackey)-1, EVP_sha256());
+
+	while ((len=fread(rbuf, 1, sizeof(rbuf), f)) != 0) {
+		HMAC_Update(&c, rbuf, len);
+	}
+
+	len = sizeof(rbuf);
+	/* reuse rbuf for hmac */
+	HMAC_Final(&c, rbuf, &hlen);
+
+	*buf = malloc(hlen);
+	if (*buf == NULL) {
+		goto end;
+	}
+
+	*hmaclen = hlen;
+
+	memcpy(*buf, rbuf, hlen);
+
+	rv = 0;
+end:
+	HMAC_CTX_cleanup(&c);
+
+	if (f)
+		fclose(f);
+
+	return rv;
+}
+
+static int
+FIPSCHECK_verify(const char *libname, const char *symbolname)
+{
+	char path[PATH_MAX+1];
+	int rv;
+	FILE *hf;
+	char *hmacpath, *p;
+	char *hmac = NULL;
+	size_t n;
+	
+	rv = get_library_path(libname, symbolname, path, sizeof(path));
+
+	if (rv < 0)
+		return 0;
+
+	hmacpath = make_hmac_path(path);
+
+	hf = fopen(hmacpath, "r");
+	if (hf == NULL) {
+		free(hmacpath);
+		return 0;
+	}
+
+	if (getline(&hmac, &n, hf) > 0) {
+		void *buf;
+		size_t hmaclen;
+		char *hex;
+
+		if ((p=strchr(hmac, '\n')) != NULL)
+			*p = '\0';
+
+		if (compute_file_hmac(path, &buf, &hmaclen) < 0) {
+			rv = -4;
+			goto end;
+		}
+
+		if ((hex=bin2hex(buf, hmaclen)) == NULL) {
+			free(buf);
+			rv = -5;
+			goto end;
+		}
+
+		if (strcmp(hex, hmac) != 0) {
+			rv = -1;
+		}
+		free(buf);
+		free(hex);
+	}
+
+end:
+	free(hmac);
+	free(hmacpath);
+	fclose(hf);
+
+	if (rv < 0)
+		return 0;
+
+	/* check successful */
+	return 1;	
+}
+
 int FIPS_mode_set(int onoff)
     {
     int fips_set_owning_thread();
@@ -201,6 +403,22 @@ int FIPS_mode_set(int onoff)
 	    }
 #endif
 
+	if(!FIPSCHECK_verify("libcrypto.so." SHLIB_VERSION_NUMBER,"FIPS_mode_set"))
+	    {
+	    FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FINGERPRINT_DOES_NOT_MATCH);
+	    fips_selftest_fail = 1;
+	    ret = 0;
+	    goto end;
+	    }
+
+	if(!FIPSCHECK_verify("libssl.so." SHLIB_VERSION_NUMBER,"SSL_CTX_new"))
+	    {
+	    FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FINGERPRINT_DOES_NOT_MATCH);
+	    fips_selftest_fail = 1;
+	    ret = 0;
+	    goto end;
+	    }
+
 	/* Perform RNG KAT before seeding */
 	if (!FIPS_selftest_rng())
 	    {
diff -up openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c.fipscheck openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c
--- openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c.fipscheck	2009-08-10 20:11:59.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c	2009-08-10 20:11:59.000000000 +0200
@@ -62,7 +62,7 @@ void OPENSSL_cleanse(void *p,size_t len)
 
 #ifdef OPENSSL_FIPS
 
-static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
+static void hmac_init(SHA256_CTX *md_ctx,SHA256_CTX *o_ctx,
 		      const char *key)
     {
     size_t len=strlen(key);
@@ -72,10 +72,10 @@ static void hmac_init(SHA_CTX *md_ctx,SH
 
     if (len > SHA_CBLOCK)
 	{
-	SHA1_Init(md_ctx);
-	SHA1_Update(md_ctx,key,len);
-	SHA1_Final(keymd,md_ctx);
-	len=20;
+	SHA256_Init(md_ctx);
+	SHA256_Update(md_ctx,key,len);
+	SHA256_Final(keymd,md_ctx);
+	len=SHA256_DIGEST_LENGTH;
 	}
     else
 	memcpy(keymd,key,len);
@@ -83,22 +83,22 @@ static void hmac_init(SHA_CTX *md_ctx,SH
 
     for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
 	pad[i]=0x36^keymd[i];
-    SHA1_Init(md_ctx);
-    SHA1_Update(md_ctx,pad,SHA_CBLOCK);
+    SHA256_Init(md_ctx);
+    SHA256_Update(md_ctx,pad,SHA256_CBLOCK);
 
     for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
 	pad[i]=0x5c^keymd[i];
-    SHA1_Init(o_ctx);
-    SHA1_Update(o_ctx,pad,SHA_CBLOCK);
+    SHA256_Init(o_ctx);
+    SHA256_Update(o_ctx,pad,SHA256_CBLOCK);
     }
 
-static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx)
+static void hmac_final(unsigned char *md,SHA256_CTX *md_ctx,SHA256_CTX *o_ctx)
     {
-    unsigned char buf[20];
+    unsigned char buf[SHA256_DIGEST_LENGTH];
 
-    SHA1_Final(buf,md_ctx);
-    SHA1_Update(o_ctx,buf,sizeof buf);
-    SHA1_Final(md,o_ctx);
+    SHA256_Final(buf,md_ctx);
+    SHA256_Update(o_ctx,buf,sizeof buf);
+    SHA256_Final(md,o_ctx);
     }
 
 #endif
@@ -106,7 +106,7 @@ static void hmac_final(unsigned char *md
 int main(int argc,char **argv)
     {
 #ifdef OPENSSL_FIPS
-    static char key[]="etaonrishdlcupfm";
+    static char key[]="orboDeJITITejsirpADONivirpUkvarP";
     int n,binary=0;
 
     if(argc < 2)
@@ -125,8 +125,8 @@ int main(int argc,char **argv)
     for(; n < argc ; ++n)
 	{
 	FILE *f=fopen(argv[n],"rb");
-	SHA_CTX md_ctx,o_ctx;
-	unsigned char md[20];
+	SHA256_CTX md_ctx,o_ctx;
+	unsigned char md[SHA256_DIGEST_LENGTH];
 	int i;
 
 	if(!f)
@@ -151,18 +151,18 @@ int main(int argc,char **argv)
 		else
 		    break;
 		}
-	    SHA1_Update(&md_ctx,buf,l);
+	    SHA256_Update(&md_ctx,buf,l);
 	    }
 	hmac_final(md,&md_ctx,&o_ctx);
 
 	if (binary)
 	    {
-	    fwrite(md,20,1,stdout);
+	    fwrite(md,SHA256_DIGEST_LENGTH,1,stdout);
 	    break;	/* ... for single(!) file */
 	    }
 
-	printf("HMAC-SHA1(%s)= ",argv[n]);
-	for(i=0 ; i < 20 ; ++i)
+/*	printf("HMAC-SHA1(%s)= ",argv[n]); */
+	for(i=0 ; i < SHA256_DIGEST_LENGTH ; ++i)
 	    printf("%02x",md[i]);
 	printf("\n");
 	}
diff -up openssl-1.0.0-beta3/crypto/fips/Makefile.fipscheck openssl-1.0.0-beta3/crypto/fips/Makefile
--- openssl-1.0.0-beta3/crypto/fips/Makefile.fipscheck	2009-08-10 20:11:59.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/Makefile	2009-08-10 20:27:45.000000000 +0200
@@ -16,6 +16,9 @@ GENERAL=Makefile
 TEST=fips_test_suite.c fips_randtest.c
 APPS=
 
+PROGRAM= fips_standalone_sha1
+EXE= $(PROGRAM)$(EXE_EXT)
+
 LIB=$(TOP)/libcrypto.a
 LIBSRC=fips_aes_selftest.c fips_des_selftest.c fips_hmac_selftest.c fips_rand_selftest.c \
     fips_rsa_selftest.c fips_sha1_selftest.c fips.c fips_dsa_selftest.c  fips_rand.c \
@@ -25,6 +28,8 @@ LIBOBJ=fips_aes_selftest.o fips_des_self
     fips_rsa_selftest.o fips_sha1_selftest.o fips.o fips_dsa_selftest.o  fips_rand.o \
     fips_rsa_x931g.o
 
+LIBCRYPTO=-L.. -lcrypto
+
 SRC= $(LIBSRC) fips_standalone_sha1.c
 
 EXHEADER= fips.h fips_rand.h
@@ -35,13 +40,15 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
 
-all:	lib
+all:	lib exe
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib
 
+exe:	$(EXE)
+
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -77,5 +84,9 @@ dclean:
 clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
+$(EXE): $(PROGRAM).o
+	FIPS_SHA_ASM=""; for i in $(SHA1_ASM_OBJ) sha256.o ; do FIPS_SHA_ASM="$$FIPS_SHA_ASM ../sha/$$i" ; done; \
+	$(CC) -o $@ $(CFLAGS) $(PROGRAM).o $$FIPS_SHA_ASM
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

openssl-1.0.0-beta3-fipsmode.patch:
 crypto/engine/eng_all.c |   14 ++++++++++
 crypto/evp/c_allc.c     |   62 ++++++++++++++++++++++++++++++++++++++++++++++++
 crypto/evp/c_alld.c     |   33 +++++++++++++++++++++++++
 crypto/o_init.c         |   38 +++++++++++++++++++++++++++++
 ssl/ssl_algs.c          |   38 +++++++++++++++++++++++++++++
 5 files changed, 185 insertions(+)

--- NEW FILE openssl-1.0.0-beta3-fipsmode.patch ---
diff -up openssl-1.0.0-beta3/crypto/engine/eng_all.c.fipsmode openssl-1.0.0-beta3/crypto/engine/eng_all.c
--- openssl-1.0.0-beta3/crypto/engine/eng_all.c.fipsmode	2009-07-01 16:55:58.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/engine/eng_all.c	2009-08-11 17:37:16.000000000 +0200
@@ -58,9 +58,23 @@
 
 #include "cryptlib.h"
 #include "eng_int.h"
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 void ENGINE_load_builtin_engines(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if (FIPS_mode()) {
+		/* We allow loading dynamic engine as a third party
+		   engine might be FIPS validated.
+		   User is disallowed to load non-validated engines
+		   by security policy. */
+		ENGINE_load_dynamic();
+		return;
+	}
+#endif
 #if 0
 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
 	 * it is the *only* way for standard builtin implementations to be be
diff -up openssl-1.0.0-beta3/crypto/evp/c_allc.c.fipsmode openssl-1.0.0-beta3/crypto/evp/c_allc.c
--- openssl-1.0.0-beta3/crypto/evp/c_allc.c.fipsmode	2007-04-24 01:48:28.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/evp/c_allc.c	2009-08-11 17:42:34.000000000 +0200
@@ -65,6 +65,11 @@
 void OpenSSL_add_all_ciphers(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if(!FIPS_mode()) 
+		{
+#endif
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cfb());
 	EVP_add_cipher(EVP_des_cfb1());
@@ -219,4 +224,61 @@ void OpenSSL_add_all_ciphers(void)
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede_cfb());
+	EVP_add_cipher(EVP_des_ede3_cfb());
+
+	EVP_add_cipher(EVP_des_ede_ofb());
+	EVP_add_cipher(EVP_des_ede3_ofb());
+
+	EVP_add_cipher(EVP_des_ede_cbc());
+	EVP_add_cipher(EVP_des_ede3_cbc());
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
+
+	EVP_add_cipher(EVP_des_ede());
+	EVP_add_cipher(EVP_des_ede3());
+#endif
+
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_ecb());
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_128_cfb());
+	EVP_add_cipher(EVP_aes_128_cfb1());
+	EVP_add_cipher(EVP_aes_128_cfb8());
+	EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_128_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
+	EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
+	EVP_add_cipher(EVP_aes_192_ecb());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_192_cfb());
+	EVP_add_cipher(EVP_aes_192_cfb1());
+	EVP_add_cipher(EVP_aes_192_cfb8());
+	EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_192_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
+	EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
+	EVP_add_cipher(EVP_aes_256_ecb());
+	EVP_add_cipher(EVP_aes_256_cbc());
+	EVP_add_cipher(EVP_aes_256_cfb());
+	EVP_add_cipher(EVP_aes_256_cfb1());
+	EVP_add_cipher(EVP_aes_256_cfb8());
+	EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_256_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#endif
+		}
+#endif
 	}
diff -up openssl-1.0.0-beta3/crypto/evp/c_alld.c.fipsmode openssl-1.0.0-beta3/crypto/evp/c_alld.c
--- openssl-1.0.0-beta3/crypto/evp/c_alld.c.fipsmode	2009-07-08 10:50:53.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/evp/c_alld.c	2009-08-11 17:54:08.000000000 +0200
@@ -64,6 +64,11 @@
 
 void OpenSSL_add_all_digests(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if (!FIPS_mode())
+		{
+#endif
 #ifndef OPENSSL_NO_MD4
 	EVP_add_digest(EVP_md4());
 #endif
@@ -110,5 +115,33 @@ void OpenSSL_add_all_digests(void)
 #endif
 #ifndef OPENSSL_NO_WHIRLPOOL
 	EVP_add_digest(EVP_whirlpool());
+#endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+	EVP_add_digest(EVP_sha1());
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#ifndef OPENSSL_NO_DSA
+	EVP_add_digest(EVP_dss1());
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+#endif
+#ifndef OPENSSL_NO_SHA256
+	EVP_add_digest(EVP_sha224());
+	EVP_add_digest(EVP_sha256());
+#endif
+#ifndef OPENSSL_NO_SHA512
+	EVP_add_digest(EVP_sha384());
+	EVP_add_digest(EVP_sha512());
+#endif
+		}
 #endif
 	}
diff -up openssl-1.0.0-beta3/crypto/o_init.c.fipsmode openssl-1.0.0-beta3/crypto/o_init.c
--- openssl-1.0.0-beta3/crypto/o_init.c.fipsmode	2009-08-11 17:28:25.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/o_init.c	2009-08-11 17:39:06.000000000 +0200
@@ -59,6 +59,43 @@
 #include <e_os.h>
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <openssl/fips.h>
+
+#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
+
+static void init_fips_mode(void)
+	{
+	char buf[2] = "0";
+	int fd;
+	
+	if (getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
+		{
+		buf[0] = '1';
+		}
+	else if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0)
+		{
+		while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR);
+		close(fd);
+		}
+	/* Failure reading the fips mode switch file means just not
+	 * switching into FIPS mode. We would break too many things
+	 * otherwise. 
+	 */
+	
+	if (buf[0] == '1')
+		{
+		FIPS_mode_set(1);
+		}
+	}
+#endif
+
 /* Perform any essential OpenSSL initialization operations.
  * Currently only sets FIPS callbacks
  */
@@ -72,6 +109,7 @@ void OPENSSL_init_library(void)
 #ifdef CRYPTO_MDEBUG
 		CRYPTO_malloc_debug_init();
 #endif
+		init_fips_mode();
 		done = 1;
 		}
 #endif
diff -up openssl-1.0.0-beta3/ssl/ssl_algs.c.fipsmode openssl-1.0.0-beta3/ssl/ssl_algs.c
--- openssl-1.0.0-beta3/ssl/ssl_algs.c.fipsmode	2009-07-08 10:50:53.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_algs.c	2009-08-11 18:01:13.000000000 +0200
@@ -64,6 +64,12 @@
 int SSL_library_init(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if (!FIPS_mode())
+		{
+#endif
+
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cbc());
 	EVP_add_cipher(EVP_des_ede3_cbc());
@@ -115,6 +121,38 @@ int SSL_library_init(void)
 	EVP_add_digest(EVP_sha());
 	EVP_add_digest(EVP_dss());
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede3_cbc());
+#endif
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_256_cbc());
+#endif
+#ifndef OPENSSL_NO_MD5
+	/* needed even in the FIPS mode for TLS MAC */
+	EVP_add_digest(EVP_md5());
+#endif
+#ifndef OPENSSL_NO_SHA
+	EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#endif
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_DSA)
+	EVP_add_digest(EVP_dss1()); /* DSA with sha1 */
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+		}
+#endif
 #ifndef OPENSSL_NO_COMP
 	/* This will initialise the built-in compression algorithms.
 	   The value returned is a STACK_OF(SSL_COMP), but that can

openssl-1.0.0-beta3-fipsrng.patch:
 fips/fips.c      |   12 ++++++------
 fips/fips_rand.c |   14 +++++++++++++-
 rand/rand_lcl.h  |    5 ++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-fipsrng.patch ---
diff -up openssl-1.0.0-beta3/crypto/fips/fips.c.fipsrng openssl-1.0.0-beta3/crypto/fips/fips.c
--- openssl-1.0.0-beta3/crypto/fips/fips.c.fipsrng	2009-08-11 18:12:14.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-08-11 18:14:36.000000000 +0200
@@ -427,22 +427,22 @@ int FIPS_mode_set(int onoff)
 	    goto end;
 	    }
 
+	/* now switch the RNG into FIPS mode */
+	fips_set_rand_check(FIPS_rand_method());
+	RAND_set_rand_method(FIPS_rand_method());
+
 	/* automagically seed PRNG if not already seeded */
 	if(!FIPS_rand_status())
 	    {
-	    if(RAND_bytes(buf,sizeof buf) <= 0)
+	    RAND_poll();
+	    if (!FIPS_rand_status())
 		{
 		fips_selftest_fail = 1;
 		ret = 0;
 		goto end;
 		}
-	    FIPS_rand_set_key(buf,32);
-	    FIPS_rand_seed(buf+32,16);
 	    }
 
-	/* now switch into FIPS mode */
-	fips_set_rand_check(FIPS_rand_method());
-	RAND_set_rand_method(FIPS_rand_method());
 	if(FIPS_selftest())
 	    fips_set_mode(1);
 	else
diff -up openssl-1.0.0-beta3/crypto/fips/fips_rand.c.fipsrng openssl-1.0.0-beta3/crypto/fips/fips_rand.c
--- openssl-1.0.0-beta3/crypto/fips/fips_rand.c.fipsrng	2009-08-11 18:12:14.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips_rand.c	2009-08-11 18:16:48.000000000 +0200
@@ -155,7 +155,18 @@ static int fips_set_prng_seed(FIPS_PRNG_
 	{
 	int i;
 	if (!ctx->keyed)
-		return 0;
+		{
+		FIPS_RAND_SIZE_T keylen = 16;
+
+		if (seedlen - keylen < AES_BLOCK_LENGTH)
+			return 0;
+		if (seedlen - keylen - 8 >= AES_BLOCK_LENGTH)
+			keylen += 8;
+		if (seedlen - keylen - 8 >= AES_BLOCK_LENGTH)
+			keylen += 8;
+		seedlen -= keylen;
+		fips_set_prng_key(ctx, seed+seedlen, keylen);
+		}
 	/* In test mode seed is just supplied data */
 	if (ctx->test_mode)
 		{
@@ -276,6 +287,7 @@ static int fips_rand(FIPS_PRNG_CTX *ctx,
 	unsigned char R[AES_BLOCK_LENGTH], I[AES_BLOCK_LENGTH];
 	unsigned char tmp[AES_BLOCK_LENGTH];
 	int i;
+	FIPS_selftest_check();
 	if (ctx->error)
 		{
 		RANDerr(RAND_F_FIPS_RAND,RAND_R_PRNG_ERROR);
diff -up openssl-1.0.0-beta3/crypto/rand/rand_lcl.h.fipsrng openssl-1.0.0-beta3/crypto/rand/rand_lcl.h
--- openssl-1.0.0-beta3/crypto/rand/rand_lcl.h.fipsrng	2009-08-11 18:12:13.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/rand/rand_lcl.h	2009-08-11 18:18:13.000000000 +0200
@@ -112,8 +112,11 @@
 #ifndef HEADER_RAND_LCL_H
 #define HEADER_RAND_LCL_H
 
+#ifndef OPENSSL_FIPS
 #define ENTROPY_NEEDED 32  /* require 256 bits = 32 bytes of randomness */
-
+#else
+#define ENTROPY_NEEDED 48  /* we need 48 bytes of randomness for FIPS rng */
+#endif
 
 #if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)

openssl-1.0.0-beta3-ipv6-apps.patch:
 s_apps.h   |    7 -
 s_client.c |    9 -
 s_server.c |    9 -
 s_socket.c |  315 ++++++++++++++++++++++++-------------------------------------
 4 files changed, 140 insertions(+), 200 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-ipv6-apps.patch ---
diff -up openssl-1.0.0-beta3/apps/s_apps.h.ipv6-apps openssl-1.0.0-beta3/apps/s_apps.h
--- openssl-1.0.0-beta3/apps/s_apps.h.ipv6-apps	2009-08-05 21:29:58.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_apps.h	2009-08-05 21:29:58.000000000 +0200
@@ -148,7 +148,7 @@ typedef fd_mask fd_set;
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
+int do_server(char *port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
@@ -156,10 +156,9 @@ int MS_CALLBACK verify_callback(int ok, 
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
 #endif
-int init_client(int *sock, char *server, int port, int type);
+int init_client(int *sock, char *server, char *port, int type);
 int should_retry(int i);
-int extract_port(char *str, short *port_ptr);
-int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
+int extract_host_port(char *str,char **host_ptr,char **port_ptr);
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 				   int argi, long argl, long ret);
diff -up openssl-1.0.0-beta3/apps/s_client.c.ipv6-apps openssl-1.0.0-beta3/apps/s_client.c
--- openssl-1.0.0-beta3/apps/s_client.c.ipv6-apps	2009-08-05 21:29:58.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_client.c	2009-08-05 22:33:44.000000000 +0200
@@ -388,7 +388,7 @@ int MAIN(int argc, char **argv)
 	int cbuf_len,cbuf_off;
 	int sbuf_len,sbuf_off;
 	fd_set readfds,writefds;
-	short port=PORT;
+	char *port_str = PORT_STR;
 	int full_log=1;
 	char *host=SSL_HOST_NAME;
 	char *cert_file=NULL,*key_file=NULL;
@@ -486,13 +486,12 @@ int MAIN(int argc, char **argv)
 		else if	(strcmp(*argv,"-port") == 0)
 			{
 			if (--argc < 1) goto bad;
-			port=atoi(*(++argv));
-			if (port == 0) goto bad;
+			port_str= *(++argv);
 			}
 		else if (strcmp(*argv,"-connect") == 0)
 			{
 			if (--argc < 1) goto bad;
-			if (!extract_host_port(*(++argv),&host,NULL,&port))
+			if (!extract_host_port(*(++argv),&host,&port_str))
 				goto bad;
 			}
 		else if	(strcmp(*argv,"-verify") == 0)
@@ -956,7 +955,7 @@ bad:
 
 re_start:
 
-	if (init_client(&s,host,port,socket_type) == 0)
+	if (init_client(&s,host,port_str,socket_type) == 0)
 		{
 		BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
 		SHUTDOWN(s);
diff -up openssl-1.0.0-beta3/apps/s_server.c.ipv6-apps openssl-1.0.0-beta3/apps/s_server.c
--- openssl-1.0.0-beta3/apps/s_server.c.ipv6-apps	2009-08-05 21:29:58.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_server.c	2009-08-05 21:29:58.000000000 +0200
@@ -837,7 +837,7 @@ int MAIN(int argc, char *argv[])
 	{
 	X509_VERIFY_PARAM *vpm = NULL;
 	int badarg = 0;
-	short port=PORT;
+	char *port_str = PORT_STR;
 	char *CApath=NULL,*CAfile=NULL;
 	unsigned char *context = NULL;
 	char *dhfile = NULL;
@@ -907,8 +907,7 @@ int MAIN(int argc, char *argv[])
 			 (strcmp(*argv,"-accept") == 0))
 			{
 			if (--argc < 1) goto bad;
-			if (!extract_port(*(++argv),&port))
-				goto bad;
+			port_str= *(++argv);
 			}
 		else if	(strcmp(*argv,"-verify") == 0)
 			{
@@ -1685,9 +1684,9 @@ bad:
 	BIO_printf(bio_s_out,"ACCEPT\n");
 	(void)BIO_flush(bio_s_out);
 	if (www)
-		do_server(port,socket_type,&accept_socket,www_body, context);
+		do_server(port_str,socket_type,&accept_socket,www_body, context);
 	else
-		do_server(port,socket_type,&accept_socket,sv_body, context);
+		do_server(port_str,socket_type,&accept_socket,sv_body, context);
 	print_stats(bio_s_out,ctx);
 	ret=0;
 end:
diff -up openssl-1.0.0-beta3/apps/s_socket.c.ipv6-apps openssl-1.0.0-beta3/apps/s_socket.c
--- openssl-1.0.0-beta3/apps/s_socket.c.ipv6-apps	2008-11-12 04:57:47.000000000 +0100
+++ openssl-1.0.0-beta3/apps/s_socket.c	2009-08-05 21:29:58.000000000 +0200
@@ -96,9 +96,7 @@ static struct hostent *GetHostByName(cha
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
-static int init_server(int *sock, int port, int type);
-static int init_server_long(int *sock, int port,char *ip, int type);
+static int init_server(int *sock, char *port, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int host_ip(char *str, unsigned char ip[4]);
 
@@ -228,58 +226,70 @@ static int ssl_sock_init(void)
 	return(1);
 	}
 
-int init_client(int *sock, char *host, int port, int type)
+int init_client(int *sock, char *host, char *port, int type)
 	{
-	unsigned char ip[4];
-
-	if (!host_ip(host,&(ip[0])))
-		{
-		return(0);
-		}
-	return(init_client_ip(sock,ip,port,type));
-	}
-
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
-	{
-	unsigned long addr;
-	struct sockaddr_in them;
-	int s,i;
+	struct addrinfo *res, *res0, hints;
+	char * failed_call = NULL;
+	int s;
+	int e;
 
 	if (!ssl_sock_init()) return(0);
 
-	memset((char *)&them,0,sizeof(them));
-	them.sin_family=AF_INET;
-	them.sin_port=htons((unsigned short)port);
-	addr=(unsigned long)
-		((unsigned long)ip[0]<<24L)|
-		((unsigned long)ip[1]<<16L)|
-		((unsigned long)ip[2]<< 8L)|
-		((unsigned long)ip[3]);
-	them.sin_addr.s_addr=htonl(addr);
-
-	if (type == SOCK_STREAM)
-		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-	else /* ( type == SOCK_DGRAM) */
-		s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
-			
-	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+	memset(&hints, '\0', sizeof(hints));
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_ADDRCONFIG;
+
+	e = getaddrinfo(host, port, &hints, &res);
+	if (e)
+	{
+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(e));
+		if (e == EAI_SYSTEM)
+			perror("getaddrinfo");
+		return (0);
+		}
 
+	res0 = res;
+	while (res)
+		{
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s == INVALID_SOCKET)
+			{
+			failed_call = "socket";
+			goto nextres;
+			}
 #if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
 	if (type == SOCK_STREAM)
 		{
-		i=0;
-		i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
-		if (i < 0) { perror("keepalive"); return(0); }
+			int i=0;
+			i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,
+				(char *)&i,sizeof(i));
+			if (i < 0) {
+				failed_call = "keepalive";
+				goto nextres;
+				}
 		}
 #endif
-
-	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-		{ closesocket(s); perror("connect"); return(0); }
+		if (connect(s,(struct sockaddr *)res->ai_addr,
+			res->ai_addrlen) == 0)
+			{
+			freeaddrinfo(res0);
 	*sock=s;
 	return(1);
 	}
 
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
+		failed_call = "socket";
+nextres:
+		if (s != INVALID_SOCKET)
+			close(s);
+		res = res->ai_next;
+		}
+	freeaddrinfo(res0);
+
+	perror(failed_call);
+	return(0);
+	}
+
+int do_server(char *port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
 	{
 	int sock;
 	char *name = NULL;
@@ -317,33 +327,38 @@ int do_server(int port, int type, int *r
 		}
 	}
 
-static int init_server_long(int *sock, int port, char *ip, int type)
+static int init_server(int *sock, char *port, int type)
 	{
-	int ret=0;
-	struct sockaddr_in server;
-	int s= -1,i;
+	struct addrinfo *res, *res0, hints;
+	char * failed_call = NULL;
+	char port_name[8];
+	int s;
+	int e;
 
 	if (!ssl_sock_init()) return(0);
 
-	memset((char *)&server,0,sizeof(server));
-	server.sin_family=AF_INET;
-	server.sin_port=htons((unsigned short)port);
-	if (ip == NULL)
-		server.sin_addr.s_addr=INADDR_ANY;
-	else
-/* Added for T3E, address-of fails on bit field (beckman at acl.lanl.gov) */
-#ifndef BIT_FIELD_LIMITS
-		memcpy(&server.sin_addr.s_addr,ip,4);
-#else
-		memcpy(&server.sin_addr,ip,4);
-#endif
+	memset(&hints, '\0', sizeof(hints));
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
 	
-		if (type == SOCK_STREAM)
-			s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-		else /* type == SOCK_DGRAM */
-			s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
+	e = getaddrinfo(NULL, port, &hints, &res);
+	if (e)
+		{
+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(e));
+		if (e == EAI_SYSTEM)
+			perror("getaddrinfo");
+		return (0);
+		}
 
-	if (s == INVALID_SOCKET) goto err;
+	res0 = res;
+	while (res)
+		{
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s == INVALID_SOCKET)
+			{
+			failed_call = "socket";
+			goto nextres;
+			}
 #if defined SOL_SOCKET && defined SO_REUSEADDR
 		{
 		int j = 1;
@@ -351,36 +366,39 @@ static int init_server_long(int *sock, i
 			   (void *) &j, sizeof j);
 		}
 #endif
-	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
+
+		if (bind(s,(struct sockaddr *)res->ai_addr, res->ai_addrlen) == -1)
 		{
-#ifndef OPENSSL_SYS_WINDOWS
-		perror("bind");
-#endif
-		goto err;
+			failed_call = "bind";
+			goto nextres;
 		}
-	/* Make it 128 for linux */
-	if (type==SOCK_STREAM && listen(s,128) == -1) goto err;
-	i=0;
-	*sock=s;
-	ret=1;
-err:
-	if ((ret == 0) && (s != -1))
+		if (type==SOCK_STREAM && listen(s,128) == -1)
 		{
-		SHUTDOWN(s);
+			failed_call = "listen";
+			goto nextres;
 		}
-	return(ret);
+
+		*sock=s;
+		return(1);
+
+nextres:
+		if (s != INVALID_SOCKET)
+			close(s);
+		res = res->ai_next;
 	}
+	freeaddrinfo(res0);
 
-static int init_server(int *sock, int port, int type)
-	{
-	return(init_server_long(sock, port, NULL, type));
+	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+
+	perror(failed_call);
+	return(0);
 	}
 
 static int do_accept(int acc_sock, int *sock, char **host)
 	{
-	int ret,i;
-	struct hostent *h1,*h2;
-	static struct sockaddr_in from;
+	static struct sockaddr_storage from;
+	char buffer[NI_MAXHOST];
+	int ret;
 	int len;
 /*	struct linger ling; */
 
@@ -425,137 +443,62 @@ redoit:
 	if (i < 0) { perror("keepalive"); return(0); }
 */
 
-	if (host == NULL) goto end;
-#ifndef BIT_FIELD_LIMITS
-	/* I should use WSAAsyncGetHostByName() under windows */
-	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
-		sizeof(from.sin_addr.s_addr),AF_INET);
-#else
-	h1=gethostbyaddr((char *)&from.sin_addr,
-		sizeof(struct in_addr),AF_INET);
-#endif
-	if (h1 == NULL)
+	if (host == NULL)
 		{
-		BIO_printf(bio_err,"bad gethostbyaddr\n");
-		*host=NULL;
-		/* return(0); */
-		}
-	else
-		{
-		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
-			{
-			perror("OPENSSL_malloc");
+		*sock=ret;
 			return(0);
 			}
-		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
 
-		h2=GetHostByName(*host);
-		if (h2 == NULL)
+	if (getnameinfo((struct sockaddr *)&from, sizeof(from),
+		buffer, sizeof(buffer),
+		NULL, 0, 0))
 			{
-			BIO_printf(bio_err,"gethostbyname failure\n");
+		BIO_printf(bio_err,"getnameinfo failed\n");
+		*host=NULL;
 			return(0);
 			}
-		i=0;
-		if (h2->h_addrtype != AF_INET)
+	else
 			{
-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
+		if ((*host=(char *)OPENSSL_malloc(strlen(buffer)+1)) == NULL)
+			{
+			perror("OPENSSL_malloc");
 			return(0);
 			}
-		}
-end:
+		strcpy(*host, buffer);
 	*sock=ret;
 	return(1);
 	}
+	}
 
-int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
-	     short *port_ptr)
+int extract_host_port(char *str, char **host_ptr, 
+	     char **port_ptr)
 	{
-	char *h,*p;
+	char *h,*p,*x;
 
-	h=str;
-	p=strchr(str,':');
+	x=h=str;
+	if (*h == '[')
+		{
+		h++;
+		p=strchr(h,']');
 	if (p == NULL)
 		{
-		BIO_printf(bio_err,"no port defined\n");
+			BIO_printf(bio_err,"no ending bracket for IPv6 address\n");
 		return(0);
 		}
 	*(p++)='\0';
-
-	if ((ip != NULL) && !host_ip(str,ip))
-		goto err;
-	if (host_ptr != NULL) *host_ptr=h;
-
-	if (!extract_port(p,port_ptr))
-		goto err;
-	return(1);
-err:
-	return(0);
+		x = p;
 	}
-
-static int host_ip(char *str, unsigned char ip[4])
-	{
-	unsigned int in[4]; 
-	int i;
-
-	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
-		{
-		for (i=0; i<4; i++)
-			if (in[i] > 255)
-				{
-				BIO_printf(bio_err,"invalid IP address\n");
-				goto err;
-				}
-		ip[0]=in[0];
-		ip[1]=in[1];
-		ip[2]=in[2];
-		ip[3]=in[3];
-		}
-	else
-		{ /* do a gethostbyname */
-		struct hostent *he;
-
-		if (!ssl_sock_init()) return(0);
-
-		he=GetHostByName(str);
-		if (he == NULL)
-			{
-			BIO_printf(bio_err,"gethostbyname failure\n");
-			goto err;
-			}
-		/* cast to short because of win16 winsock definition */
-		if ((short)he->h_addrtype != AF_INET)
+	p=strchr(x,':');
+	if (p == NULL)
 			{
-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
-			return(0);
-			}
-		ip[0]=he->h_addr_list[0][0];
-		ip[1]=he->h_addr_list[0][1];
-		ip[2]=he->h_addr_list[0][2];
-		ip[3]=he->h_addr_list[0][3];
-		}
-	return(1);
-err:
+		BIO_printf(bio_err,"no port defined\n");
 	return(0);
 	}
+	*(p++)='\0';
 
-int extract_port(char *str, short *port_ptr)
-	{
-	int i;
-	struct servent *s;
+	if (host_ptr != NULL) *host_ptr=h;
+	if (port_ptr != NULL) *port_ptr=p;
 
-	i=atoi(str);
-	if (i != 0)
-		*port_ptr=(unsigned short)i;
-	else
-		{
-		s=getservbyname(str,"tcp");
-		if (s == NULL)
-			{
-			BIO_printf(bio_err,"getservbyname failure for %s\n",str);
-			return(0);
-			}
-		*port_ptr=ntohs((unsigned short)s->s_port);
-		}
 	return(1);
 	}
 

openssl-1.0.0-beta3-krb5.patch:
 Makefile.org |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-krb5.patch ---
diff -up openssl-1.0.0-beta3/Makefile.org.krb5 openssl-1.0.0-beta3/Makefile.org
--- openssl-1.0.0-beta3/Makefile.org.krb5	2009-04-23 18:12:09.000000000 +0200
+++ openssl-1.0.0-beta3/Makefile.org	2009-08-04 23:01:16.000000000 +0200
@@ -299,7 +299,7 @@ build-shared: do_$(SHLIB_TARGET) link-sh
 
 do_$(SHLIB_TARGET):
 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
-		if [ "$(SHLIBDIRS)" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+		if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \

openssl-1.0.0-beta3-namingblk.patch:
 asn1/a_set.c      |   37 +++++++++++++++++++------------------
 asn1/asn1.h       |   13 +++++++------
 asn1/asn_pack.c   |    8 ++++----
 stack/safestack.h |   48 ++++++++++++++++++++++++------------------------
 4 files changed, 54 insertions(+), 52 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-namingblk.patch ---
Index: openssl/crypto/asn1/a_set.c
RCS File: /v/openssl/cvs/openssl/crypto/asn1/a_set.c,v
rcsdiff -q -kk '-r1.20' '-r1.20.2.1' -u '/v/openssl/cvs/openssl/crypto/asn1/a_set.c,v' 2>/dev/null
--- openssl/crypto/asn1/a_set.c 2009/01/01 18:30:50 1.20
+++ openssl/crypto/asn1/a_set.c 2009/07/27 21:21:25 1.20.2.1
@@ -85,7 +85,7 @@
     }
 
 /* int is_set:  if TRUE, then sort the contents (i.e. it isn't a SEQUENCE)    */
-int i2d_ASN1_SET(STACK_OF(BLOCK) *a, unsigned char **pp,
+int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
 		 i2d_of_void *i2d, int ex_tag, int ex_class,
 		 int is_set)
 	{
@@ -97,8 +97,8 @@
         int totSize;
 
 	if (a == NULL) return(0);
-	for (i=sk_BLOCK_num(a)-1; i>=0; i--)
-		ret+=i2d(sk_BLOCK_value(a,i),NULL);
+	for (i=sk_OPENSSL_BLOCK_num(a)-1; i>=0; i--)
+		ret+=i2d(sk_OPENSSL_BLOCK_value(a,i),NULL);
 	r=ASN1_object_size(1,ret,ex_tag);
 	if (pp == NULL) return(r);
 
@@ -109,10 +109,10 @@
 	/* And then again by Ben */
 	/* And again by Steve */
 
-	if(!is_set || (sk_BLOCK_num(a) < 2))
+	if(!is_set || (sk_OPENSSL_BLOCK_num(a) < 2))
 		{
-		for (i=0; i<sk_BLOCK_num(a); i++)
-                	i2d(sk_BLOCK_value(a,i),&p);
+		for (i=0; i<sk_OPENSSL_BLOCK_num(a); i++)
+                	i2d(sk_OPENSSL_BLOCK_value(a,i),&p);
 
 		*pp=p;
 		return(r);
@@ -120,17 +120,17 @@
 
         pStart  = p; /* Catch the beg of Setblobs*/
 		/* In this array we will store the SET blobs */
-		rgSetBlob = OPENSSL_malloc(sk_BLOCK_num(a) * sizeof(MYBLOB));
+		rgSetBlob = OPENSSL_malloc(sk_OPENSSL_BLOCK_num(a) * sizeof(MYBLOB));
 		if (rgSetBlob == NULL)
 			{
 			ASN1err(ASN1_F_I2D_ASN1_SET,ERR_R_MALLOC_FAILURE);
 			return(0);
 			}
 
-        for (i=0; i<sk_BLOCK_num(a); i++)
+        for (i=0; i<sk_OPENSSL_BLOCK_num(a); i++)
 	        {
                 rgSetBlob[i].pbData = p;  /* catch each set encode blob */
-                i2d(sk_BLOCK_value(a,i),&p);
+                i2d(sk_OPENSSL_BLOCK_value(a,i),&p);
                 rgSetBlob[i].cbData = p - rgSetBlob[i].pbData; /* Length of this
 SetBlob
 */
@@ -140,7 +140,7 @@
 
  /* Now we have to sort the blobs. I am using a simple algo.
     *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/
-        qsort( rgSetBlob, sk_BLOCK_num(a), sizeof(MYBLOB), SetBlobCmp);
+        qsort( rgSetBlob, sk_OPENSSL_BLOCK_num(a), sizeof(MYBLOB), SetBlobCmp);
 		if (!(pTempMem = OPENSSL_malloc(totSize)))
 			{
 			ASN1err(ASN1_F_I2D_ASN1_SET,ERR_R_MALLOC_FAILURE);
@@ -149,7 +149,7 @@
 
 /* Copy to temp mem */
         p = pTempMem;
-        for(i=0; i<sk_BLOCK_num(a); ++i)
+        for(i=0; i<sk_OPENSSL_BLOCK_num(a); ++i)
 		{
                 memcpy(p, rgSetBlob[i].pbData, rgSetBlob[i].cbData);
                 p += rgSetBlob[i].cbData;
@@ -163,17 +163,18 @@
         return(r);
         }
 
-STACK_OF(BLOCK) *d2i_ASN1_SET(STACK_OF(BLOCK) **a, const unsigned char **pp,
+STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
+			      const unsigned char **pp,
 			      long length, d2i_of_void *d2i,
-			      void (*free_func)(BLOCK), int ex_tag,
+			      void (*free_func)(OPENSSL_BLOCK), int ex_tag,
 			      int ex_class)
 	{
 	ASN1_const_CTX c;
-	STACK_OF(BLOCK) *ret=NULL;
+	STACK_OF(OPENSSL_BLOCK) *ret=NULL;
 
 	if ((a == NULL) || ((*a) == NULL))
 		{
-		if ((ret=sk_BLOCK_new_null()) == NULL)
+		if ((ret=sk_OPENSSL_BLOCK_new_null()) == NULL)
 			{
 			ASN1err(ASN1_F_D2I_ASN1_SET,ERR_R_MALLOC_FAILURE);
 			goto err;
@@ -221,7 +222,7 @@
 			asn1_add_error(*pp,(int)(c.p- *pp));
 			goto err;
 			}
-		if (!sk_BLOCK_push(ret,s)) goto err;
+		if (!sk_OPENSSL_BLOCK_push(ret,s)) goto err;
 		}
 	if (a != NULL) (*a)=ret;
 	*pp=c.p;
@@ -230,9 +231,9 @@
 	if ((ret != NULL) && ((a == NULL) || (*a != ret)))
 		{
 		if (free_func != NULL)
-			sk_BLOCK_pop_free(ret,free_func);
+			sk_OPENSSL_BLOCK_pop_free(ret,free_func);
 		else
-			sk_BLOCK_free(ret);
+			sk_OPENSSL_BLOCK_free(ret);
 		}
 	return(NULL);
 	}
Index: openssl/crypto/asn1/asn1.h
RCS File: /v/openssl/cvs/openssl/crypto/asn1/asn1.h,v
rcsdiff -q -kk '-r1.166.2.3' '-r1.166.2.4' -u '/v/openssl/cvs/openssl/crypto/asn1/asn1.h,v' 2>/dev/null
--- openssl/crypto/asn1/asn1.h 2009/07/24 11:15:55 1.166.2.3
+++ openssl/crypto/asn1/asn1.h 2009/07/27 21:21:25 1.166.2.4
@@ -887,12 +887,13 @@
 ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
 
-int i2d_ASN1_SET(STACK_OF(BLOCK) *a, unsigned char **pp,
+int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
 		 i2d_of_void *i2d, int ex_tag, int ex_class,
 		 int is_set);
-STACK_OF(BLOCK) *d2i_ASN1_SET(STACK_OF(BLOCK) **a, const unsigned char **pp,
+STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
+			      const unsigned char **pp,
 			      long length, d2i_of_void *d2i,
-			      void (*free_func)(BLOCK), int ex_tag,
+			      void (*free_func)(OPENSSL_BLOCK), int ex_tag,
 			      int ex_class);
 
 #ifndef OPENSSL_NO_BIO
@@ -1045,9 +1046,9 @@
 int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
 	unsigned char *data, int max_len);
 
-STACK_OF(BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-				 d2i_of_void *d2i, void (*free_func)(BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(BLOCK) *safes, i2d_of_void *i2d,
+STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
+				 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));
+unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
 			     unsigned char **buf, int *len );
 void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
 void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
Index: openssl/crypto/asn1/asn_pack.c
RCS File: /v/openssl/cvs/openssl/crypto/asn1/asn_pack.c,v
rcsdiff -q -kk '-r1.19' '-r1.19.2.1' -u '/v/openssl/cvs/openssl/crypto/asn1/asn_pack.c,v' 2>/dev/null
--- openssl/crypto/asn1/asn_pack.c 2008/11/12 03:57:49 1.19
+++ openssl/crypto/asn1/asn_pack.c 2009/07/27 21:21:25 1.19.2.1
@@ -66,10 +66,10 @@
 
 /* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
 
-STACK_OF(BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-				 d2i_of_void *d2i, void (*free_func)(BLOCK))
+STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
+			 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK))
 {
-    STACK_OF(BLOCK) *sk;
+    STACK_OF(OPENSSL_BLOCK) *sk;
     const unsigned char *pbuf;
     pbuf =  buf;
     if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
@@ -82,7 +82,7 @@
  * OPENSSL_malloc'ed buffer
  */
 
-unsigned char *ASN1_seq_pack(STACK_OF(BLOCK) *safes, i2d_of_void *i2d,
+unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
 			     unsigned char **buf, int *len)
 {
 	int safelen;
Index: openssl/crypto/stack/safestack.h
RCS File: /v/openssl/cvs/openssl/crypto/stack/safestack.h,v
rcsdiff -q -kk '-r1.72.2.4' '-r1.72.2.5' -u '/v/openssl/cvs/openssl/crypto/stack/safestack.h,v' 2>/dev/null
--- openssl/crypto/stack/safestack.h 2009/07/27 21:08:50 1.72.2.4
+++ openssl/crypto/stack/safestack.h 2009/07/27 21:21:25 1.72.2.5
@@ -128,8 +128,8 @@
  * nul-terminated. These should also be distinguished from "normal"
  * stacks. */
 
-typedef void *BLOCK;
-DECLARE_SPECIAL_STACK_OF(BLOCK, void)
+typedef void *OPENSSL_BLOCK;
+DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 
 /* SKM_sk_... stack macros are internal to safestack.h:
  * never use them directly, use sk_<type>_... instead */
@@ -2055,29 +2055,29 @@
 #define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
 
 
-#define sk_BLOCK_new(cmp) ((STACK_OF(BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_BLOCK_new_null() ((STACK_OF(BLOCK) *)sk_new_null())
-#define sk_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_value(st, i) ((BLOCK)sk_value(CHECKED_PTR_OF(STACK_OF(BLOCK), st), i))
-#define sk_BLOCK_num(st) SKM_sk_num(BLOCK, st)
-#define sk_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_SK_FREE_FUNC2(BLOCK, free_func))
-#define sk_BLOCK_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val), i)
-#define sk_BLOCK_free(st) SKM_sk_free(BLOCK, st)
-#define sk_BLOCK_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), i, CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_zero(st) SKM_sk_zero(BLOCK, (st))
-#define sk_BLOCK_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-#define sk_BLOCK_delete(st, i) SKM_sk_delete(BLOCK, (st), (i))
-#define sk_BLOCK_delete_ptr(st, ptr) (BLOCK *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, ptr))
-#define sk_BLOCK_set_cmp_func(st, cmp)  \
+#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
+#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
+#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i))
+#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
+#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val), i)
+#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i, CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
+#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, ptr))
+#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
 	((int (*)(const void * const *,const void * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_BLOCK_dup(st) SKM_sk_dup(BLOCK, st)
-#define sk_BLOCK_shift(st) SKM_sk_shift(BLOCK, (st))
-#define sk_BLOCK_pop(st) (void *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st))
-#define sk_BLOCK_sort(st) SKM_sk_sort(BLOCK, (st))
-#define sk_BLOCK_is_sorted(st) SKM_sk_is_sorted(BLOCK, (st))
+	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_CMP_FUNC(void, cmp)))
+#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st))
+#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
 
 
 #define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))

openssl-1.0.0-beta3-namingstr.patch:
 apps/apps.c              |   16 ++--
 apps/apps.h              |    6 -
 apps/asn1pars.c          |   16 ++--
 apps/ca.c                |   22 +++---
 apps/cms.c               |   64 ++++++++---------
 apps/crl2p7.c            |   12 +--
 apps/dgst.c              |   22 +++---
 apps/engine.c            |   40 +++++------
 apps/ocsp.c              |   18 ++---
 apps/pkcs12.c            |   12 +--
 apps/req.c               |   12 +--
 apps/s_server.c          |    6 -
 apps/smime.c             |   36 +++++-----
 apps/x509.c              |    6 -
 crypto/cryptlib.c        |   10 +-
 crypto/engine/eng_dyn.c  |   12 +--
 crypto/lhash/lhash.h     |    4 -
 crypto/stack/safestack.h |  168 +++++++++++++++++++++++------------------------
 crypto/txt_db/txt_db.c   |   60 ++++++++--------
 crypto/txt_db/txt_db.h   |   18 ++---
 crypto/x509v3/v3_utl.c   |   36 +++++-----
 crypto/x509v3/x509v3.h   |    8 +-
 22 files changed, 302 insertions(+), 302 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-namingstr.patch ---
Index: openssl/apps/apps.c
RCS File: /v/openssl/cvs/openssl/apps/apps.c,v
rcsdiff -q -kk '-r1.133.2.6' '-r1.133.2.7' -u '/v/openssl/cvs/openssl/apps/apps.c,v' 2>/dev/null
--- openssl/apps/apps.c 2009/06/29 16:09:58 1.133.2.6
+++ openssl/apps/apps.c 2009/07/27 21:08:43 1.133.2.7
@@ -1488,7 +1488,7 @@
 	return p;
 	}
 
-static unsigned long index_serial_hash(const CSTRING *a)
+static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
 	{
 	const char *n;
 
@@ -1497,7 +1497,7 @@
 	return(lh_strhash(n));
 	}
 
-static int index_serial_cmp(const CSTRING *a, const CSTRING *b)
+static int index_serial_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
 	{
 	const char *aa,*bb;
 
@@ -1509,16 +1509,16 @@
 static int index_name_qual(char **a)
 	{ return(a[0][0] == 'V'); }
 
-static unsigned long index_name_hash(const CSTRING *a)
+static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
 	{ return(lh_strhash(a[DB_name])); }
 
-int index_name_cmp(const CSTRING *a, const CSTRING *b)
+int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
 	{ return(strcmp(a[DB_name], b[DB_name])); }
 
-static IMPLEMENT_LHASH_HASH_FN(index_serial, CSTRING)
-static IMPLEMENT_LHASH_COMP_FN(index_serial, CSTRING)
-static IMPLEMENT_LHASH_HASH_FN(index_name, CSTRING)
-static IMPLEMENT_LHASH_COMP_FN(index_name, CSTRING)
+static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
 
 #undef BSIZE
 #define BSIZE 256
Index: openssl/apps/apps.h
RCS File: /v/openssl/cvs/openssl/apps/apps.h,v
rcsdiff -q -kk '-r1.91' '-r1.91.2.1' -u '/v/openssl/cvs/openssl/apps/apps.h,v' 2>/dev/null
--- openssl/apps/apps.h 2008/11/24 17:27:05 1.91
+++ openssl/apps/apps.h 2009/07/27 21:08:44 1.91.2.1
@@ -295,9 +295,9 @@
 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
 void free_index(CA_DB *db);
 #define index_name_cmp_noconst(a, b) \
-	index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \
-	(const CSTRING *)CHECKED_PTR_OF(STRING, b))
-int index_name_cmp(const CSTRING *a, const CSTRING *b);
+	index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
+	(const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
+int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(char *str, long chtype, int multirdn);
Index: openssl/apps/asn1pars.c
RCS File: /v/openssl/cvs/openssl/apps/asn1pars.c,v
rcsdiff -q -kk '-r1.26' '-r1.26.2.1' -u '/v/openssl/cvs/openssl/apps/asn1pars.c,v' 2>/dev/null
--- openssl/apps/asn1pars.c 2008/11/05 18:38:51 1.26
+++ openssl/apps/asn1pars.c 2009/07/27 21:08:44 1.26.2.1
@@ -96,7 +96,7 @@
 	unsigned char *tmpbuf;
 	const unsigned char *ctmpbuf;
 	BUF_MEM *buf=NULL;
-	STACK_OF(STRING) *osk=NULL;
+	STACK_OF(OPENSSL_STRING) *osk=NULL;
 	ASN1_TYPE *at=NULL;
 
 	informat=FORMAT_PEM;
@@ -113,7 +113,7 @@
 	prog=argv[0];
 	argc--;
 	argv++;
-	if ((osk=sk_STRING_new_null()) == NULL)
+	if ((osk=sk_OPENSSL_STRING_new_null()) == NULL)
 		{
 		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto end;
@@ -169,7 +169,7 @@
 		else if (strcmp(*argv,"-strparse") == 0)
 			{
 			if (--argc < 1) goto bad;
-			sk_STRING_push(osk,*(++argv));
+			sk_OPENSSL_STRING_push(osk,*(++argv));
 			}
 		else if (strcmp(*argv,"-genstr") == 0)
 			{
@@ -302,18 +302,18 @@
 
 	/* If any structs to parse go through in sequence */
 
-	if (sk_STRING_num(osk))
+	if (sk_OPENSSL_STRING_num(osk))
 		{
 		tmpbuf=(unsigned char *)str;
 		tmplen=num;
-		for (i=0; i<sk_STRING_num(osk); i++)
+		for (i=0; i<sk_OPENSSL_STRING_num(osk); i++)
 			{
 			ASN1_TYPE *atmp;
 			int typ;
-			j=atoi(sk_STRING_value(osk,i));
+			j=atoi(sk_OPENSSL_STRING_value(osk,i));
 			if (j == 0)
 				{
-				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_STRING_value(osk,i));
+				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_OPENSSL_STRING_value(osk,i));
 				continue;
 				}
 			tmpbuf+=j;
@@ -378,7 +378,7 @@
 		ERR_print_errors(bio_err);
 	if (buf != NULL) BUF_MEM_free(buf);
 	if (at != NULL) ASN1_TYPE_free(at);
-	if (osk != NULL) sk_STRING_free(osk);
+	if (osk != NULL) sk_OPENSSL_STRING_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
Index: openssl/apps/ca.c
RCS File: /v/openssl/cvs/openssl/apps/ca.c,v
rcsdiff -q -kk '-r1.167' '-r1.167.2.1' -u '/v/openssl/cvs/openssl/apps/ca.c,v' 2>/dev/null
--- openssl/apps/ca.c 2009/03/09 13:59:07 1.167
+++ openssl/apps/ca.c 2009/07/27 21:08:44 1.167.2.1
@@ -883,9 +883,9 @@
 	if (db == NULL) goto err;
 
 	/* Lets check some fields */
-	for (i=0; i<sk_PSTRING_num(db->db->data); i++)
+	for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
 		{
-		pp=sk_PSTRING_value(db->db->data,i);
+		pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
 		if ((pp[DB_type][0] != DB_TYPE_REV) &&
 			(pp[DB_rev_date][0] != '\0'))
 			{
@@ -938,7 +938,7 @@
 #endif
 		TXT_DB_write(out,db->db);
 		BIO_printf(bio_err,"%d entries loaded from the database\n",
-			   sk_PSTRING_num(db->db->data));
+			   sk_OPENSSL_PSTRING_num(db->db->data));
 		BIO_printf(bio_err,"generating index\n");
 		}
 	
@@ -1408,9 +1408,9 @@
 
 		ASN1_TIME_free(tmptm);
 
-		for (i=0; i<sk_PSTRING_num(db->db->data); i++)
+		for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
 			{
-			pp=sk_PSTRING_value(db->db->data,i);
+			pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
 			if (pp[DB_type][0] == DB_TYPE_REV)
 				{
 				if ((r=X509_REVOKED_new()) == NULL) goto err;
@@ -1685,9 +1685,9 @@
 	int ok= -1,i,j,last,nid;
 	const char *p;
 	CONF_VALUE *cv;
-	STRING row[DB_NUMBER];
-	STRING *irow=NULL;
-	STRING *rrow=NULL;
+	OPENSSL_STRING row[DB_NUMBER];
+	OPENSSL_STRING *irow=NULL;
+	OPENSSL_STRING *rrow=NULL;
 	char buf[25];
 
 	tmptm=ASN1_UTCTIME_new();
@@ -1929,7 +1929,7 @@
 
 	if (db->attributes.unique_subject)
 		{
-		STRING *crow=row;
+		OPENSSL_STRING *crow=row;
 
 		rrow=TXT_DB_get_by_index(db->db,DB_name,crow);
 		if (rrow != NULL)
@@ -2632,9 +2632,9 @@
 	else
 		a_y2k = 0;
 
-	for (i = 0; i < sk_PSTRING_num(db->db->data); i++)
+	for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++)
 		{
-		rrow = sk_PSTRING_value(db->db->data, i);
+		rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
 
 		if (rrow[DB_type][0] == 'V')
 		 	{
Index: openssl/apps/cms.c
RCS File: /v/openssl/cvs/openssl/apps/cms.c,v
rcsdiff -q -kk '-r1.23.2.1' '-r1.23.2.2' -u '/v/openssl/cvs/openssl/apps/cms.c,v' 2>/dev/null
--- openssl/apps/cms.c 2009/04/16 17:22:47 1.23.2.1
+++ openssl/apps/cms.c 2009/07/27 21:08:44 1.23.2.2
@@ -71,9 +71,9 @@
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
 static int cms_cb(int ok, X509_STORE_CTX *ctx);
 static void receipt_request_print(BIO *out, CMS_ContentInfo *cms);
-static CMS_ReceiptRequest *make_receipt_request(STACK_OF(STRING) *rr_to,
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to,
 						int rr_allorfirst,
-						STACK_OF(STRING) *rr_from);
+					STACK_OF(OPENSSL_STRING) *rr_from);
 
 #define SMIME_OP	0x10
 #define SMIME_IP	0x20
@@ -108,7 +108,7 @@
 	const char *inmode = "r", *outmode = "w";
 	char *infile = NULL, *outfile = NULL, *rctfile = NULL;
 	char *signerfile = NULL, *recipfile = NULL;
-	STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
+	STACK_OF(OPENSSL_STRING) *sksigners = NULL, *skkeys = NULL;
 	char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
 	char *certsoutfile = NULL;
 	const EVP_CIPHER *cipher = NULL;
@@ -122,7 +122,7 @@
 	int flags = CMS_DETACHED, noout = 0, print = 0;
 	int verify_retcode = 0;
 	int rr_print = 0, rr_allorfirst = -1;
-	STACK_OF(STRING) *rr_to = NULL, *rr_from = NULL;
+	STACK_OF(OPENSSL_STRING) *rr_to = NULL, *rr_from = NULL;
 	CMS_ReceiptRequest *rr = NULL;
 	char *to = NULL, *from = NULL, *subject = NULL;
 	char *CAfile = NULL, *CApath = NULL;
@@ -281,8 +281,8 @@
 				goto argerr;
 			args++;
 			if (!rr_from)
-				rr_from = sk_STRING_new_null();
-			sk_STRING_push(rr_from, *args);
+				rr_from = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(rr_from, *args);
 			}
 		else if (!strcmp(*args,"-receipt_request_to"))
 			{
@@ -290,8 +290,8 @@
 				goto argerr;
 			args++;
 			if (!rr_to)
-				rr_to = sk_STRING_new_null();
-			sk_STRING_push(rr_to, *args);
+				rr_to = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(rr_to, *args);
 			}
 		else if (!strcmp (*args, "-print"))
 				{
@@ -387,13 +387,13 @@
 			if (signerfile)
 				{
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				if (!keyfile)
 					keyfile = signerfile;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				keyfile = NULL;
 				}
 			signerfile = *++args;
@@ -435,12 +435,12 @@
 					goto argerr;
 					}
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				signerfile = NULL;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				}
 			keyfile = *++args;
 			}
@@ -539,13 +539,13 @@
 		if (signerfile)
 			{
 			if (!sksigners)
-				sksigners = sk_STRING_new_null();
-			sk_STRING_push(sksigners, signerfile);
+				sksigners = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(sksigners, signerfile);
 			if (!skkeys)
-				skkeys = sk_STRING_new_null();
+				skkeys = sk_OPENSSL_STRING_new_null();
 			if (!keyfile)
 				keyfile = signerfile;
-			sk_STRING_push(skkeys, keyfile);
+			sk_OPENSSL_STRING_push(skkeys, keyfile);
 			}
 		if (!sksigners)
 			{
@@ -980,11 +980,11 @@
 			}
 		else
 			flags |= CMS_REUSE_DIGEST;
-		for (i = 0; i < sk_STRING_num(sksigners); i++)
+		for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++)
 			{
 			CMS_SignerInfo *si;
-			signerfile = sk_STRING_value(sksigners, i);
-			keyfile = sk_STRING_value(skkeys, i);
+			signerfile = sk_OPENSSL_STRING_value(sksigners, i);
+			keyfile = sk_OPENSSL_STRING_value(skkeys, i);
 			signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
 					e, "signer certificate");
 			if (!signer)
@@ -1160,9 +1160,9 @@
 	if (vpm)
 		X509_VERIFY_PARAM_free(vpm);
 	if (sksigners)
-		sk_STRING_free(sksigners);
+		sk_OPENSSL_STRING_free(sksigners);
 	if (skkeys)
-		sk_STRING_free(skkeys);
+		sk_OPENSSL_STRING_free(skkeys);
 	if (secret_key)
 		OPENSSL_free(secret_key);
 	if (secret_keyid)
@@ -1172,9 +1172,9 @@
 	if (rr)
 		CMS_ReceiptRequest_free(rr);
 	if (rr_to)
-		sk_STRING_free(rr_to);
+		sk_OPENSSL_STRING_free(rr_to);
 	if (rr_from)
-		sk_STRING_free(rr_from);
+		sk_OPENSSL_STRING_free(rr_from);
 	X509_STORE_free(store);
 	X509_free(cert);
 	X509_free(recip);
@@ -1296,7 +1296,7 @@
 		}
 	}
 
-static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(STRING) *ns)
+static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(OPENSSL_STRING) *ns)
 	{
 	int i;
 	STACK_OF(GENERAL_NAMES) *ret;
@@ -1305,9 +1305,9 @@
 	ret = sk_GENERAL_NAMES_new_null();
 	if (!ret)
 		goto err;
-	for (i = 0; i < sk_STRING_num(ns); i++)
+	for (i = 0; i < sk_OPENSSL_STRING_num(ns); i++)
 		{
-		char *str = sk_STRING_value(ns, i);
+		char *str = sk_OPENSSL_STRING_value(ns, i);
 		gen = a2i_GENERAL_NAME(NULL, NULL, NULL, GEN_EMAIL, str, 0);
 		if (!gen)
 			goto err;
@@ -1335,9 +1335,9 @@
 	}
 
 
-static CMS_ReceiptRequest *make_receipt_request(STACK_OF(STRING) *rr_to,
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to,
 						int rr_allorfirst,
-						STACK_OF(STRING) *rr_from)
+						STACK_OF(OPENSSL_STRING) *rr_from)
 	{
 	STACK_OF(GENERAL_NAMES) *rct_to, *rct_from;
 	CMS_ReceiptRequest *rr;
Index: openssl/apps/crl2p7.c
RCS File: /v/openssl/cvs/openssl/apps/crl2p7.c,v
rcsdiff -q -kk '-r1.19' '-r1.19.2.1' -u '/v/openssl/cvs/openssl/apps/crl2p7.c,v' 2>/dev/null
--- openssl/apps/crl2p7.c 2008/06/04 11:00:45 1.19
+++ openssl/apps/crl2p7.c 2009/07/27 21:08:45 1.19.2.1
@@ -92,7 +92,7 @@
 	PKCS7 *p7 = NULL;
 	PKCS7_SIGNED *p7s = NULL;
 	X509_CRL *crl=NULL;
-	STACK_OF(STRING) *certflst=NULL;
+	STACK_OF(OPENSSL_STRING) *certflst=NULL;
 	STACK_OF(X509_CRL) *crl_stack=NULL;
 	STACK_OF(X509) *cert_stack=NULL;
 	int ret=1,nocrl=0;
@@ -140,8 +140,8 @@
 		else if (strcmp(*argv,"-certfile") == 0)
 			{
 			if (--argc < 1) goto bad;
-			if(!certflst) certflst = sk_STRING_new_null();
-			sk_STRING_push(certflst,*(++argv));
+			if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(certflst,*(++argv));
 			}
 		else
 			{
@@ -226,8 +226,8 @@
 	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
 	p7s->cert=cert_stack;
 
-	if(certflst) for(i = 0; i < sk_STRING_num(certflst); i++) {
-		certfile = sk_STRING_value(certflst, i);
+	if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+		certfile = sk_OPENSSL_STRING_value(certflst, i);
 		if (add_certs_from_file(cert_stack,certfile) < 0)
 			{
 			BIO_printf(bio_err, "error loading certificates\n");
@@ -236,7 +236,7 @@
 			}
 	}
 
-	sk_STRING_free(certflst);
+	sk_OPENSSL_STRING_free(certflst);
 
 	if (outfile == NULL)
 		{
Index: openssl/apps/dgst.c
RCS File: /v/openssl/cvs/openssl/apps/dgst.c,v
rcsdiff -q -kk '-r1.54.2.3' '-r1.54.2.4' -u '/v/openssl/cvs/openssl/apps/dgst.c,v' 2>/dev/null
--- openssl/apps/dgst.c 2009/04/26 12:16:12 1.54.2.3
+++ openssl/apps/dgst.c 2009/07/27 21:08:45 1.54.2.4
@@ -127,7 +127,7 @@
 #endif
 	char *hmac_key=NULL;
 	char *mac_name=NULL;
-	STACK_OF(STRING) *sigopts = NULL, *macopts = NULL;
+	STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
 
 	apps_startup();
 
@@ -230,8 +230,8 @@
 			if (--argc < 1)
 				break;
 			if (!sigopts)
-				sigopts = sk_STRING_new_null();
-			if (!sigopts || !sk_STRING_push(sigopts, *(++argv)))
+				sigopts = sk_OPENSSL_STRING_new_null();
+			if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
 				break;
 			}
 		else if (strcmp(*argv,"-macopt") == 0)
@@ -239,8 +239,8 @@
 			if (--argc < 1)
 				break;
 			if (!macopts)
-				macopts = sk_STRING_new_null();
-			if (!macopts || !sk_STRING_push(macopts, *(++argv)))
+				macopts = sk_OPENSSL_STRING_new_null();
+			if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv)))
 				break;
 			}
 		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
@@ -365,9 +365,9 @@
 		if (macopts)
 			{
 			char *macopt;
-			for (i = 0; i < sk_STRING_num(macopts); i++)
+			for (i = 0; i < sk_OPENSSL_STRING_num(macopts); i++)
 				{
-				macopt = sk_STRING_value(macopts, i);
+				macopt = sk_OPENSSL_STRING_value(macopts, i);
 				if (pkey_ctrl_string(mac_ctx, macopt) <= 0)
 					{
 					BIO_printf(bio_err,
@@ -424,9 +424,9 @@
 		if (sigopts)
 			{
 			char *sigopt;
-			for (i = 0; i < sk_STRING_num(sigopts); i++)
+			for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++)
 				{
-				sigopt = sk_STRING_value(sigopts, i);
+				sigopt = sk_OPENSSL_STRING_value(sigopts, i);
 				if (pkey_ctrl_string(pctx, sigopt) <= 0)
 					{
 					BIO_printf(bio_err,
@@ -531,9 +531,9 @@
 	BIO_free_all(out);
 	EVP_PKEY_free(sigkey);
 	if (sigopts)
-		sk_STRING_free(sigopts);
+		sk_OPENSSL_STRING_free(sigopts);
 	if (macopts)
-		sk_STRING_free(macopts);
+		sk_OPENSSL_STRING_free(macopts);
 	if(sigbuf) OPENSSL_free(sigbuf);
 	if (bmd != NULL) BIO_free(bmd);
 	apps_shutdown();
Index: openssl/apps/engine.c
RCS File: /v/openssl/cvs/openssl/apps/engine.c,v
rcsdiff -q -kk '-r1.34' '-r1.34.2.1' -u '/v/openssl/cvs/openssl/apps/engine.c,v' 2>/dev/null
--- openssl/apps/engine.c 2009/02/15 15:29:59 1.34
+++ openssl/apps/engine.c 2009/07/27 21:08:45 1.34.2.1
@@ -200,7 +200,7 @@
 	char *desc = NULL;
 	int flags;
 	int xpos = 0;
-	STACK_OF(STRING) *cmds = NULL;
+	STACK_OF(OPENSSL_STRING) *cmds = NULL;
 	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
 			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
 					0, NULL, NULL)) <= 0))
@@ -211,7 +211,7 @@
 		return 1;
 		}
 
-	cmds = sk_STRING_new_null();
+	cmds = sk_OPENSSL_STRING_new_null();
 
 	if(!cmds)
 		goto err;
@@ -284,16 +284,16 @@
 		BIO_printf(bio_out, "\n");
 	ret = 1;
 err:
-	if(cmds) sk_STRING_pop_free(cmds, identity);
+	if(cmds) sk_OPENSSL_STRING_pop_free(cmds, identity);
 	if(name) OPENSSL_free(name);
 	if(desc) OPENSSL_free(desc);
 	return ret;
 	}
 
-static void util_do_cmds(ENGINE *e, STACK_OF(STRING) *cmds, BIO *bio_out,
-			 const char *indent)
+static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
+			BIO *bio_out, const char *indent)
 	{
-	int loop, res, num = sk_STRING_num(cmds);
+	int loop, res, num = sk_OPENSSL_STRING_num(cmds);
 
 	if(num < 0)
 		{
@@ -304,7 +304,7 @@
 		{
 		char buf[256];
 		const char *cmd, *arg;
-		cmd = sk_STRING_value(cmds, loop);
+		cmd = sk_OPENSSL_STRING_value(cmds, loop);
 		res = 1; /* assume success */
 		/* Check if this command has no ":arg" */
 		if((arg = strstr(cmd, ":")) == NULL)
@@ -344,9 +344,9 @@
 	const char **pp;
 	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
 	ENGINE *e;
-	STACK_OF(STRING) *engines = sk_STRING_new_null();
-	STACK_OF(STRING) *pre_cmds = sk_STRING_new_null();
-	STACK_OF(STRING) *post_cmds = sk_STRING_new_null();
+	STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
+	STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
+	STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
 	int badops=1;
 	BIO *bio_out=NULL;
 	const char *indent = "     ";
@@ -393,20 +393,20 @@
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-			sk_STRING_push(pre_cmds,*argv);
+			sk_OPENSSL_STRING_push(pre_cmds,*argv);
 			}
 		else if (strcmp(*argv,"-post") == 0)
 			{
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-			sk_STRING_push(post_cmds,*argv);
+			sk_OPENSSL_STRING_push(post_cmds,*argv);
 			}
 		else if ((strncmp(*argv,"-h",2) == 0) ||
 				(strcmp(*argv,"-?") == 0))
 			goto skip_arg_loop;
 		else
-			sk_STRING_push(engines,*argv);
+			sk_OPENSSL_STRING_push(engines,*argv);
 		argc--;
 		argv++;
 		}
@@ -421,17 +421,17 @@
 		goto end;
 		}
 
-	if (sk_STRING_num(engines) == 0)
+	if (sk_OPENSSL_STRING_num(engines) == 0)
 		{
 		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
 			{
-			sk_STRING_push(engines,(char *)ENGINE_get_id(e));
+			sk_OPENSSL_STRING_push(engines,(char *)ENGINE_get_id(e));
 			}
 		}
 
-	for (i=0; i<sk_STRING_num(engines); i++)
+	for (i=0; i<sk_OPENSSL_STRING_num(engines); i++)
 		{
-		const char *id = sk_STRING_value(engines,i);
+		const char *id = sk_OPENSSL_STRING_value(engines,i);
 		if ((e = ENGINE_by_id(id)) != NULL)
 			{
 			const char *name = ENGINE_get_name(e);
@@ -533,9 +533,9 @@
 end:
 
 	ERR_print_errors(bio_err);
-	sk_STRING_pop_free(engines, identity);
-	sk_STRING_pop_free(pre_cmds, identity);
-	sk_STRING_pop_free(post_cmds, identity);
+	sk_OPENSSL_STRING_pop_free(engines, identity);
+	sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
+	sk_OPENSSL_STRING_pop_free(post_cmds, identity);
 	if (bio_out != NULL) BIO_free_all(bio_out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
Index: openssl/apps/ocsp.c
RCS File: /v/openssl/cvs/openssl/apps/ocsp.c,v
rcsdiff -q -kk '-r1.54.2.1' '-r1.54.2.2' -u '/v/openssl/cvs/openssl/apps/ocsp.c,v' 2>/dev/null
--- openssl/apps/ocsp.c 2009/04/02 15:19:03 1.54.2.1
+++ openssl/apps/ocsp.c 2009/07/27 21:08:45 1.54.2.2
@@ -99,7 +99,7 @@
 static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD * cert_id_md, X509 *issuer,
 				STACK_OF(OCSP_CERTID) *ids);
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-			      STACK_OF(STRING) *names,
+			      STACK_OF(OPENSSL_STRING) *names,
 			      STACK_OF(OCSP_CERTID) *ids, long nsec,
 			      long maxage);
 
@@ -153,7 +153,7 @@
 	int badarg = 0;
 	int i;
 	int ignore_err = 0;
-	STACK_OF(STRING) *reqnames = NULL;
+	STACK_OF(OPENSSL_STRING) *reqnames = NULL;
 	STACK_OF(OCSP_CERTID) *ids = NULL;
 
 	X509 *rca_cert = NULL;
@@ -170,7 +170,7 @@
 	SSL_load_error_strings();
 	OpenSSL_add_ssl_algorithms();
 	args = argv + 1;
-	reqnames = sk_STRING_new_null();
+	reqnames = sk_OPENSSL_STRING_new_null();
 	ids = sk_OCSP_CERTID_new_null();
 	while (!badarg && *args && *args[0] == '-')
 		{
@@ -432,7 +432,7 @@
 				if (!cert_id_md) cert_id_md = EVP_sha1();
 				if(!add_ocsp_cert(&req, cert, cert_id_md, issuer, ids))
 					goto end;
-				if(!sk_STRING_push(reqnames, *args))
+				if(!sk_OPENSSL_STRING_push(reqnames, *args))
 					goto end;
 				}
 			else badarg = 1;
@@ -445,7 +445,7 @@
 				if (!cert_id_md) cert_id_md = EVP_sha1();
 				if(!add_ocsp_serial(&req, *args, cert_id_md, issuer, ids))
 					goto end;
-				if(!sk_STRING_push(reqnames, *args))
+				if(!sk_OPENSSL_STRING_push(reqnames, *args))
 					goto end;
 				}
 			else badarg = 1;
@@ -901,7 +901,7 @@
 	OCSP_REQUEST_free(req);
 	OCSP_RESPONSE_free(resp);
 	OCSP_BASICRESP_free(bs);
-	sk_STRING_free(reqnames);
+	sk_OPENSSL_STRING_free(reqnames);
 	sk_OCSP_CERTID_free(ids);
 	sk_X509_pop_free(sign_other, X509_free);
 	sk_X509_pop_free(verify_other, X509_free);
@@ -971,7 +971,7 @@
 	}
 
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-			      STACK_OF(STRING) *names,
+			      STACK_OF(OPENSSL_STRING) *names,
 			      STACK_OF(OCSP_CERTID) *ids, long nsec,
 			      long maxage)
 	{
@@ -983,13 +983,13 @@
 
 	ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
 
-	if (!bs || !req || !sk_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
+	if (!bs || !req || !sk_OPENSSL_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
 		return 1;
 
 	for (i = 0; i < sk_OCSP_CERTID_num(ids); i++)
 		{
 		id = sk_OCSP_CERTID_value(ids, i);
-		name = sk_STRING_value(names, i);
+		name = sk_OPENSSL_STRING_value(names, i);
 		BIO_printf(out, "%s: ", name);
 
 		if(!OCSP_resp_find_status(bs, id, &status, &reason,
Index: openssl/apps/pkcs12.c
RCS File: /v/openssl/cvs/openssl/apps/pkcs12.c,v
rcsdiff -q -kk '-r1.92.2.1' '-r1.92.2.2' -u '/v/openssl/cvs/openssl/apps/pkcs12.c,v' 2>/dev/null
--- openssl/apps/pkcs12.c 2009/06/17 12:05:49 1.92.2.1
+++ openssl/apps/pkcs12.c 2009/07/27 21:08:45 1.92.2.2
@@ -117,7 +117,7 @@
     int ret = 1;
     int macver = 1;
     int noprompt = 0;
-    STACK_OF(STRING) *canames = NULL;
+    STACK_OF(OPENSSL_STRING) *canames = NULL;
     char *cpass = NULL, *mpass = NULL;
     char *passargin = NULL, *passargout = NULL, *passarg = NULL;
     char *passin = NULL, *passout = NULL;
@@ -222,8 +222,8 @@
 		} else if (!strcmp (*args, "-caname")) {
 		    if (args[1]) {
 			args++;	
-			if (!canames) canames = sk_STRING_new_null();
-			sk_STRING_push(canames, *args);
+			if (!canames) canames = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(canames, *args);
 		    } else badarg = 1;
 		} else if (!strcmp (*args, "-in")) {
 		    if (args[1]) {
@@ -549,9 +549,9 @@
 
 	/* Add any CA names */
 
-	for (i = 0; i < sk_STRING_num(canames); i++)
+	for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++)
 		{
-		catmp = (unsigned char *)sk_STRING_value(canames, i);
+		catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i);
 		X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
 		}
 
@@ -687,7 +687,7 @@
 #endif
     BIO_free(in);
     BIO_free_all(out);
-    if (canames) sk_STRING_free(canames);
+    if (canames) sk_OPENSSL_STRING_free(canames);
     if(passin) OPENSSL_free(passin);
     if(passout) OPENSSL_free(passout);
     apps_shutdown();
Index: openssl/apps/req.c
RCS File: /v/openssl/cvs/openssl/apps/req.c,v
rcsdiff -q -kk '-r1.139.2.2' '-r1.139.2.3' -u '/v/openssl/cvs/openssl/apps/req.c,v' 2>/dev/null
--- openssl/apps/req.c 2009/04/23 17:16:38 1.139.2.2
+++ openssl/apps/req.c 2009/07/27 21:08:45 1.139.2.3
@@ -165,7 +165,7 @@
 	EVP_PKEY_CTX *genctx = NULL;
 	const char *keyalg = NULL;
 	char *keyalgstr = NULL;
-	STACK_OF(STRING) *pkeyopts = NULL;
+	STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
 	EVP_PKEY *pkey=NULL;
 	int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
 	long newkey = -1;
@@ -306,8 +306,8 @@
 			if (--argc < 1)
 				goto bad;
 			if (!pkeyopts)
-				pkeyopts = sk_STRING_new_null();
-			if (!pkeyopts || !sk_STRING_push(pkeyopts, *(++argv)))
+				pkeyopts = sk_OPENSSL_STRING_new_null();
+			if (!pkeyopts || !sk_OPENSSL_STRING_push(pkeyopts, *(++argv)))
 				goto bad;
 			}
 		else if (strcmp(*argv,"-batch") == 0)
@@ -667,9 +667,9 @@
 		if (pkeyopts)
 			{
 			char *genopt;
-			for (i = 0; i < sk_STRING_num(pkeyopts); i++)
+			for (i = 0; i < sk_OPENSSL_STRING_num(pkeyopts); i++)
 				{
-				genopt = sk_STRING_value(pkeyopts, i);
+				genopt = sk_OPENSSL_STRING_value(pkeyopts, i);
 				if (pkey_ctrl_string(genctx, genopt) <= 0)
 					{
 					BIO_printf(bio_err,
@@ -1083,7 +1083,7 @@
 	if (genctx)
 		EVP_PKEY_CTX_free(genctx);
 	if (pkeyopts)
-		sk_STRING_free(pkeyopts);
+		sk_OPENSSL_STRING_free(pkeyopts);
 #ifndef OPENSSL_NO_ENGINE
 	if (gen_eng)
 		ENGINE_free(gen_eng);
Index: openssl/apps/s_server.c
RCS File: /v/openssl/cvs/openssl/apps/s_server.c,v
rcsdiff -q -kk '-r1.136.2.4' '-r1.136.2.5' -u '/v/openssl/cvs/openssl/apps/s_server.c,v' 2>/dev/null
--- openssl/apps/s_server.c 2009/06/30 16:10:24 1.136.2.4
+++ openssl/apps/s_server.c 2009/07/27 21:08:46 1.136.2.5
@@ -712,7 +712,7 @@
 	int use_ssl;
 	unsigned char *rspder = NULL;
 	int rspderlen;
-	STACK_OF(STRING) *aia = NULL;
+	STACK_OF(OPENSSL_STRING) *aia = NULL;
 	X509 *x = NULL;
 	X509_STORE_CTX inctx;
 	X509_OBJECT obj;
@@ -734,7 +734,7 @@
 	aia = X509_get1_ocsp(x);
 	if (aia)
 		{
-		if (!OCSP_parse_url(sk_STRING_value(aia, 0),
+		if (!OCSP_parse_url(sk_OPENSSL_STRING_value(aia, 0),
 			&host, &port, &path, &use_ssl))
 			{
 			BIO_puts(err, "cert_status: can't parse AIA URL\n");
@@ -742,7 +742,7 @@
 			}
 		if (srctx->verbose)
 			BIO_printf(err, "cert_status: AIA URL: %s\n",
-					sk_STRING_value(aia, 0));
+					sk_OPENSSL_STRING_value(aia, 0));
 		}
 	else
 		{
Index: openssl/apps/smime.c
RCS File: /v/openssl/cvs/openssl/apps/smime.c,v
rcsdiff -q -kk '-r1.69' '-r1.69.2.1' -u '/v/openssl/cvs/openssl/apps/smime.c,v' 2>/dev/null
--- openssl/apps/smime.c 2008/11/05 18:38:51 1.69
+++ openssl/apps/smime.c 2009/07/27 21:08:46 1.69.2.1
@@ -93,7 +93,7 @@
 	const char *inmode = "r", *outmode = "w";
 	char *infile = NULL, *outfile = NULL;
 	char *signerfile = NULL, *recipfile = NULL;
-	STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
+	STACK_OF(OPENSSL_STRING) *sksigners = NULL, *skkeys = NULL;
 	char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
 	const EVP_CIPHER *cipher = NULL;
 	PKCS7 *p7 = NULL;
@@ -260,13 +260,13 @@
 			if (signerfile)
 				{
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				if (!keyfile)
 					keyfile = signerfile;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				keyfile = NULL;
 				}
 			signerfile = *++args;
@@ -302,12 +302,12 @@
 					goto argerr;
 					}
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				signerfile = NULL;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				}
 			keyfile = *++args;
 			}
@@ -389,13 +389,13 @@
 		if (signerfile)
 			{
 			if (!sksigners)
-				sksigners = sk_STRING_new_null();
-			sk_STRING_push(sksigners, signerfile);
+				sksigners = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(sksigners, signerfile);
 			if (!skkeys)
-				skkeys = sk_STRING_new_null();
+				skkeys = sk_OPENSSL_STRING_new_null();
 			if (!keyfile)
 				keyfile = signerfile;
-			sk_STRING_push(skkeys, keyfile);
+			sk_OPENSSL_STRING_push(skkeys, keyfile);
 			}
 		if (!sksigners)
 			{
@@ -707,10 +707,10 @@
 			}
 		else
 			flags |= PKCS7_REUSE_DIGEST;
-		for (i = 0; i < sk_STRING_num(sksigners); i++)
+		for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++)
 			{
-			signerfile = sk_STRING_value(sksigners, i);
-			keyfile = sk_STRING_value(skkeys, i);
+			signerfile = sk_OPENSSL_STRING_value(sksigners, i);
+			keyfile = sk_OPENSSL_STRING_value(skkeys, i);
 			signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
 					e, "signer certificate");
 			if (!signer)
@@ -807,9 +807,9 @@
 	if (vpm)
 		X509_VERIFY_PARAM_free(vpm);
 	if (sksigners)
-		sk_STRING_free(sksigners);
+		sk_OPENSSL_STRING_free(sksigners);
 	if (skkeys)
-		sk_STRING_free(skkeys);
+		sk_OPENSSL_STRING_free(skkeys);
 	X509_STORE_free(store);
 	X509_free(cert);
 	X509_free(recip);
Index: openssl/apps/x509.c
RCS File: /v/openssl/cvs/openssl/apps/x509.c,v
rcsdiff -q -kk '-r1.102.2.3' '-r1.102.2.4' -u '/v/openssl/cvs/openssl/apps/x509.c,v' 2>/dev/null
--- openssl/apps/x509.c 2009/07/14 15:14:39 1.102.2.3
+++ openssl/apps/x509.c 2009/07/27 21:08:46 1.102.2.4
@@ -738,14 +738,14 @@
 			else if ((email == i) || (ocsp_uri == i))
 				{
 				int j;
-				STACK_OF(STRING) *emlst;
+				STACK_OF(OPENSSL_STRING) *emlst;
 				if (email == i)
 					emlst = X509_get1_email(x);
 				else
 					emlst = X509_get1_ocsp(x);
-				for (j = 0; j < sk_STRING_num(emlst); j++)
+				for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
 					BIO_printf(STDout, "%s\n",
-						   sk_STRING_value(emlst, j));
+						   sk_OPENSSL_STRING_value(emlst, j));
 				X509_email_free(emlst);
 				}
 			else if (aliasout == i)
Index: openssl/crypto/cryptlib.c
RCS File: /v/openssl/cvs/openssl/crypto/cryptlib.c,v
rcsdiff -q -kk '-r1.75.2.2' '-r1.75.2.3' -u '/v/openssl/cvs/openssl/crypto/cryptlib.c,v' 2>/dev/null
--- openssl/crypto/cryptlib.c 2009/05/05 19:23:14 1.75.2.2
+++ openssl/crypto/cryptlib.c 2009/07/27 21:08:48 1.75.2.3
@@ -174,7 +174,7 @@
 
 /* This is for applications to allocate new type names in the non-dynamic
    array of lock names.  These are numbered with positive numbers.  */
-static STACK_OF(STRING) *app_locks=NULL;
+static STACK_OF(OPENSSL_STRING) *app_locks=NULL;
 
 /* For applications that want a more dynamic way of handling threads, the
    following stack is used.  These are externally numbered with negative
@@ -210,7 +210,7 @@
 	SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
 #endif
 
-	if ((app_locks == NULL) && ((app_locks=sk_STRING_new_null()) == NULL))
+	if ((app_locks == NULL) && ((app_locks=sk_OPENSSL_STRING_new_null()) == NULL))
 		{
 		CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
 		return(0);
@@ -220,7 +220,7 @@
 		CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
 		return(0);
 		}
-	i=sk_STRING_push(app_locks,str);
+	i=sk_OPENSSL_STRING_push(app_locks,str);
 	if (!i)
 		OPENSSL_free(str);
 	else
@@ -651,10 +651,10 @@
 		return("dynamic");
 	else if (type < CRYPTO_NUM_LOCKS)
 		return(lock_names[type]);
-	else if (type-CRYPTO_NUM_LOCKS > sk_STRING_num(app_locks))
+	else if (type-CRYPTO_NUM_LOCKS > sk_OPENSSL_STRING_num(app_locks))
 		return("ERROR");
 	else
-		return(sk_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
+		return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
 	}
 
 #if	defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
Index: openssl/crypto/engine/eng_dyn.c
RCS File: /v/openssl/cvs/openssl/crypto/engine/eng_dyn.c,v
rcsdiff -q -kk '-r1.14' '-r1.14.2.1' -u '/v/openssl/cvs/openssl/crypto/engine/eng_dyn.c,v' 2>/dev/null
--- openssl/crypto/engine/eng_dyn.c 2008/06/04 11:01:29 1.14
+++ openssl/crypto/engine/eng_dyn.c 2009/07/27 21:08:49 1.14.2.1
@@ -146,7 +146,7 @@
 	 * 'dirs' for loading. Default is to use 'dirs' as a fallback. */
 	int dir_load;
 	/* A stack of directories from which ENGINEs could be loaded */
-	STACK_OF(STRING) *dirs;
+	STACK_OF(OPENSSL_STRING) *dirs;
 	};
 
 /* This is the "ex_data" index we obtain and reserve for use with our context
@@ -174,7 +174,7 @@
 		if(ctx->engine_id)
 			OPENSSL_free((void*)ctx->engine_id);
 		if(ctx->dirs)
-			sk_STRING_pop_free(ctx->dirs, int_free_str);
+			sk_OPENSSL_STRING_pop_free(ctx->dirs, int_free_str);
 		OPENSSL_free(ctx);
 		}
 	}
@@ -203,7 +203,7 @@
 	c->DYNAMIC_F1 = "v_check";
 	c->DYNAMIC_F2 = "bind_engine";
 	c->dir_load = 1;
-	c->dirs = sk_STRING_new_null();
+	c->dirs = sk_OPENSSL_STRING_new_null();
 	if(!c->dirs)
 		{
 		ENGINEerr(ENGINE_F_DYNAMIC_SET_DATA_CTX,ERR_R_MALLOC_FAILURE);
@@ -393,7 +393,7 @@
 				ERR_R_MALLOC_FAILURE);
 			return 0;
 			}
-		sk_STRING_insert(ctx->dirs, tmp_str, -1);
+		sk_OPENSSL_STRING_insert(ctx->dirs, tmp_str, -1);
 		}
 		return 1;
 	default:
@@ -411,11 +411,11 @@
 				ctx->DYNAMIC_LIBNAME, NULL, 0)) != NULL)
 		return 1;
 	/* If we're not allowed to use 'dirs' or we have none, fail */
-	if(!ctx->dir_load || (num = sk_STRING_num(ctx->dirs)) < 1)
+	if(!ctx->dir_load || (num = sk_OPENSSL_STRING_num(ctx->dirs)) < 1)
 		return 0;
 	for(loop = 0; loop < num; loop++)
 		{
-		const char *s = sk_STRING_value(ctx->dirs, loop);
+		const char *s = sk_OPENSSL_STRING_value(ctx->dirs, loop);
 		char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s);
 		if(!merge)
 			return 0;
Index: openssl/crypto/lhash/lhash.h
RCS File: /v/openssl/cvs/openssl/crypto/lhash/lhash.h,v
rcsdiff -q -kk '-r1.23' '-r1.23.2.1' -u '/v/openssl/cvs/openssl/crypto/lhash/lhash.h,v' 2>/dev/null
--- openssl/crypto/lhash/lhash.h 2008/06/04 11:01:31 1.23
+++ openssl/crypto/lhash/lhash.h 2009/07/27 21:08:50 1.23.2.1
@@ -230,8 +230,8 @@
   lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
 #define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
 
-DECLARE_LHASH_OF(STRING);
-DECLARE_LHASH_OF(CSTRING);
+DECLARE_LHASH_OF(OPENSSL_STRING);
+DECLARE_LHASH_OF(OPENSSL_CSTRING);
 
 #ifdef  __cplusplus
 }
Index: openssl/crypto/stack/safestack.h
RCS File: /v/openssl/cvs/openssl/crypto/stack/safestack.h,v
rcsdiff -q -kk '-r1.72.2.3' '-r1.72.2.4' -u '/v/openssl/cvs/openssl/crypto/stack/safestack.h,v' 2>/dev/null
--- openssl/crypto/stack/safestack.h 2009/04/28 21:56:04 1.72.2.3
+++ openssl/crypto/stack/safestack.h 2009/07/27 21:08:50 1.72.2.4
@@ -110,9 +110,9 @@
  * string. For now, I'm settling for dealing with the fact it is a
  * string at all.
  */
-typedef char *STRING;
+typedef char *OPENSSL_STRING;
 
-typedef const char *CSTRING;
+typedef const char *OPENSSL_CSTRING;
 
 /* Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
  * STACK_OF(STRING) is really more like STACK_OF(char), only, as
@@ -122,7 +122,7 @@
  * macros below.
  */
 
-DECLARE_SPECIAL_STACK_OF(STRING, char)
+DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
 
 /* Similarly, we sometimes use a block of characters, NOT
  * nul-terminated. These should also be distinguished from "normal"
@@ -2030,29 +2030,29 @@
 #define sk_void_sort(st) SKM_sk_sort(void, (st))
 #define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
 
-#define sk_STRING_new(cmp) ((STACK_OF(STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_STRING_new_null() ((STACK_OF(STRING) *)sk_new_null())
-#define sk_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_STRING_value(st, i) ((STRING)sk_value(CHECKED_PTR_OF(STACK_OF(STRING), st), i))
-#define sk_STRING_num(st) SKM_sk_num(STRING, st)
-#define sk_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_SK_FREE_FUNC2(STRING, free_func))
-#define sk_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val), i)
-#define sk_STRING_free(st) SKM_sk_free(STRING, st)
-#define sk_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), i, CHECKED_PTR_OF(char, val))
-#define sk_STRING_zero(st) SKM_sk_zero(STRING, (st))
-#define sk_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(STRING), st), CHECKED_CONST_PTR_OF(char, val))
-#define sk_STRING_delete(st, i) SKM_sk_delete(STRING, (st), (i))
-#define sk_STRING_delete_ptr(st, ptr) (STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, ptr))
-#define sk_STRING_set_cmp_func(st, cmp)  \
+#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
+#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
+#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
+#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
+#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
+#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
+#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
+#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
 	((int (*)(const char * const *,const char * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_STRING_dup(st) SKM_sk_dup(STRING, st)
-#define sk_STRING_shift(st) SKM_sk_shift(STRING, (st))
-#define sk_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st))
-#define sk_STRING_sort(st) SKM_sk_sort(STRING, (st))
-#define sk_STRING_is_sorted(st) SKM_sk_is_sorted(STRING, (st))
+	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
+#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
+#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
 
 
 #define sk_BLOCK_new(cmp) ((STACK_OF(BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
@@ -2080,29 +2080,29 @@
 #define sk_BLOCK_is_sorted(st) SKM_sk_is_sorted(BLOCK, (st))
 
 
-#define sk_PSTRING_new(cmp) ((STACK_OF(PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(STRING, cmp)))
-#define sk_PSTRING_new_null() ((STACK_OF(PSTRING) *)sk_new_null())
-#define sk_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_value(st, i) ((PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(PSTRING), st), i))
-#define sk_PSTRING_num(st) SKM_sk_num(PSTRING, st)
-#define sk_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_SK_FREE_FUNC2(PSTRING, free_func))
-#define sk_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val), i)
-#define sk_PSTRING_free(st) SKM_sk_free(PSTRING, st)
-#define sk_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), i, CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_zero(st) SKM_sk_zero(PSTRING, (st))
-#define sk_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(PSTRING), st), CHECKED_CONST_PTR_OF(STRING, val))
-#define sk_PSTRING_delete(st, i) SKM_sk_delete(PSTRING, (st), (i))
-#define sk_PSTRING_delete_ptr(st, ptr) (PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, ptr))
-#define sk_PSTRING_set_cmp_func(st, cmp)  \
-	((int (*)(const STRING * const *,const STRING * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_SK_CMP_FUNC(STRING, cmp)))
-#define sk_PSTRING_dup(st) SKM_sk_dup(PSTRING, st)
-#define sk_PSTRING_shift(st) SKM_sk_shift(PSTRING, (st))
-#define sk_PSTRING_pop(st) (STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st))
-#define sk_PSTRING_sort(st) SKM_sk_sort(PSTRING, (st))
-#define sk_PSTRING_is_sorted(st) SKM_sk_is_sorted(PSTRING, (st))
+#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
+#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
+#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i))
+#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
+#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
+#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
+#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
+#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
+#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
+#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
+#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
+	((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
+	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
+#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
+#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
+#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st))
+#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
+#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
 
 
 #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
@@ -2390,24 +2390,6 @@
   LHM_lh_stats_bio(CONF_VALUE,lh,out)
 #define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
 
-#define lh_CSTRING_new() LHM_lh_new(CSTRING,cstring)
-#define lh_CSTRING_insert(lh,inst) LHM_lh_insert(CSTRING,lh,inst)
-#define lh_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(CSTRING,lh,inst)
-#define lh_CSTRING_delete(lh,inst) LHM_lh_delete(CSTRING,lh,inst)
-#define lh_CSTRING_doall(lh,fn) LHM_lh_doall(CSTRING,lh,fn)
-#define lh_CSTRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(CSTRING,lh,fn,arg_type,arg)
-#define lh_CSTRING_error(lh) LHM_lh_error(CSTRING,lh)
-#define lh_CSTRING_num_items(lh) LHM_lh_num_items(CSTRING,lh)
-#define lh_CSTRING_down_load(lh) LHM_lh_down_load(CSTRING,lh)
-#define lh_CSTRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(CSTRING,lh,out)
-#define lh_CSTRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(CSTRING,lh,out)
-#define lh_CSTRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(CSTRING,lh,out)
-#define lh_CSTRING_free(lh) LHM_lh_free(CSTRING,lh)
-
 #define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
 #define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
 #define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
@@ -2534,6 +2516,42 @@
   LHM_lh_stats_bio(OBJ_NAME,lh,out)
 #define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
 
+#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
+#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
+#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
+#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
+#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
+#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
+  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
+#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
+#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
+#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
+#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
+  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
+#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
+  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
+#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
+  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
+#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
+
+#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
+#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
+#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
+#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
+#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
+#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
+  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
+#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
+#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
+#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
+#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
+  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
+#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
+  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
+#define lh_OPENSSL_STRING_stats_bio(lh,out) \
+  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
+#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
+
 #define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
 #define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
 #define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
@@ -2551,24 +2569,6 @@
 #define lh_SSL_SESSION_stats_bio(lh,out) \
   LHM_lh_stats_bio(SSL_SESSION,lh,out)
 #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-
-#define lh_STRING_new() LHM_lh_new(STRING,string)
-#define lh_STRING_insert(lh,inst) LHM_lh_insert(STRING,lh,inst)
-#define lh_STRING_retrieve(lh,inst) LHM_lh_retrieve(STRING,lh,inst)
-#define lh_STRING_delete(lh,inst) LHM_lh_delete(STRING,lh,inst)
-#define lh_STRING_doall(lh,fn) LHM_lh_doall(STRING,lh,fn)
-#define lh_STRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(STRING,lh,fn,arg_type,arg)
-#define lh_STRING_error(lh) LHM_lh_error(STRING,lh)
-#define lh_STRING_num_items(lh) LHM_lh_num_items(STRING,lh)
-#define lh_STRING_down_load(lh) LHM_lh_down_load(STRING,lh)
-#define lh_STRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(STRING,lh,out)
-#define lh_STRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(STRING,lh,out)
-#define lh_STRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(STRING,lh,out)
-#define lh_STRING_free(lh) LHM_lh_free(STRING,lh)
 /* End of util/mkstack.pl block, you may now edit :-) */
 
 #endif /* !defined HEADER_SAFESTACK_H */
Index: openssl/crypto/txt_db/txt_db.c
RCS File: /v/openssl/cvs/openssl/crypto/txt_db/txt_db.c,v
rcsdiff -q -kk '-r1.25' '-r1.25.2.1' -u '/v/openssl/cvs/openssl/crypto/txt_db/txt_db.c,v' 2>/dev/null
--- openssl/crypto/txt_db/txt_db.c 2008/07/04 23:12:51 1.25
+++ openssl/crypto/txt_db/txt_db.c 2009/07/27 21:08:51 1.25.2.1
@@ -78,7 +78,7 @@
 	int size=BUFSIZE;
 	int offset=0;
 	char *p,*f;
-	STRING *pp;
+	OPENSSL_STRING *pp;
 	BUF_MEM *buf=NULL;
 
 	if ((buf=BUF_MEM_new()) == NULL) goto err;
@@ -89,7 +89,7 @@
 	ret->num_fields=num;
 	ret->index=NULL;
 	ret->qual=NULL;
-	if ((ret->data=sk_PSTRING_new_null()) == NULL)
+	if ((ret->data=sk_OPENSSL_PSTRING_new_null()) == NULL)
 		goto err;
 	if ((ret->index=OPENSSL_malloc(sizeof(*ret->index)*num)) == NULL)
 		goto err;
@@ -163,7 +163,7 @@
 			goto err;
 			}
 		pp[n]=p;
-		if (!sk_PSTRING_push(ret->data,pp))
+		if (!sk_OPENSSL_PSTRING_push(ret->data,pp))
 			{
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)	/* temporary fix :-( */
 			fprintf(stderr,"failure in sk_push\n");
@@ -182,7 +182,7 @@
 #endif
 		if (ret != NULL)
 			{
-			if (ret->data != NULL) sk_PSTRING_free(ret->data);
+			if (ret->data != NULL) sk_OPENSSL_PSTRING_free(ret->data);
 			if (ret->index != NULL) OPENSSL_free(ret->index);
 			if (ret->qual != NULL) OPENSSL_free(ret->qual);
 			if (ret != NULL) OPENSSL_free(ret);
@@ -193,10 +193,10 @@
 		return(ret);
 	}
 
-STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, STRING *value)
+OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
 	{
-	STRING *ret;
-	LHASH_OF(STRING) *lh;
+	OPENSSL_STRING *ret;
+	LHASH_OF(OPENSSL_STRING) *lh;
 
 	if (idx >= db->num_fields)
 		{
@@ -209,16 +209,16 @@
 		db->error=DB_ERROR_NO_INDEX;
 		return(NULL);
 		}
-	ret=lh_STRING_retrieve(lh,value);
+	ret=lh_OPENSSL_STRING_retrieve(lh,value);
 	db->error=DB_ERROR_OK;
 	return(ret);
 	}
 
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(STRING *),
+int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
 			LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
 	{
-	LHASH_OF(STRING) *idx;
-	STRING *r;
+	LHASH_OF(OPENSSL_STRING) *idx;
+	OPENSSL_STRING *r;
 	int i,n;
 
 	if (field >= db->num_fields)
@@ -227,26 +227,26 @@
 		return(0);
 		}
 	/* FIXME: we lose type checking at this point */
-	if ((idx=(LHASH_OF(STRING) *)lh_new(hash,cmp)) == NULL)
+	if ((idx=(LHASH_OF(OPENSSL_STRING) *)lh_new(hash,cmp)) == NULL)
 		{
 		db->error=DB_ERROR_MALLOC;
 		return(0);
 		}
-	n=sk_PSTRING_num(db->data);
+	n=sk_OPENSSL_PSTRING_num(db->data);
 	for (i=0; i<n; i++)
 		{
-		r=sk_PSTRING_value(db->data,i);
+		r=sk_OPENSSL_PSTRING_value(db->data,i);
 		if ((qual != NULL) && (qual(r) == 0)) continue;
-		if ((r=lh_STRING_insert(idx,r)) != NULL)
+		if ((r=lh_OPENSSL_STRING_insert(idx,r)) != NULL)
 			{
 			db->error=DB_ERROR_INDEX_CLASH;
-			db->arg1=sk_PSTRING_find(db->data,r);
+			db->arg1=sk_OPENSSL_PSTRING_find(db->data,r);
 			db->arg2=i;
-			lh_STRING_free(idx);
+			lh_OPENSSL_STRING_free(idx);
 			return(0);
 			}
 		}
-	if (db->index[field] != NULL) lh_STRING_free(db->index[field]);
+	if (db->index[field] != NULL) lh_OPENSSL_STRING_free(db->index[field]);
 	db->index[field]=idx;
 	db->qual[field]=qual;
 	return(1);
@@ -261,11 +261,11 @@
 
 	if ((buf=BUF_MEM_new()) == NULL)
 		goto err;
-	n=sk_PSTRING_num(db->data);
+	n=sk_OPENSSL_PSTRING_num(db->data);
 	nn=db->num_fields;
 	for (i=0; i<n; i++)
 		{
-		pp=sk_PSTRING_value(db->data,i);
+		pp=sk_OPENSSL_PSTRING_value(db->data,i);
 
 		l=0;
 		for (j=0; j<nn; j++)
@@ -300,10 +300,10 @@
 	return(ret);
 	}
 
-int TXT_DB_insert(TXT_DB *db, STRING *row)
+int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
 	{
 	int i;
-	STRING *r;
+	OPENSSL_STRING *r;
 
 	for (i=0; i<db->num_fields; i++)
 		{
@@ -311,7 +311,7 @@
 			{
 			if ((db->qual[i] != NULL) &&
 				(db->qual[i](row) == 0)) continue;
-			r=lh_STRING_retrieve(db->index[i],row);
+			r=lh_OPENSSL_STRING_retrieve(db->index[i],row);
 			if (r != NULL)
 				{
 				db->error=DB_ERROR_INDEX_CLASH;
@@ -322,7 +322,7 @@
 			}
 		}
 	/* We have passed the index checks, now just append and insert */
-	if (!sk_PSTRING_push(db->data,row))
+	if (!sk_OPENSSL_PSTRING_push(db->data,row))
 		{
 		db->error=DB_ERROR_MALLOC;
 		goto err;
@@ -334,7 +334,7 @@
 			{
 			if ((db->qual[i] != NULL) &&
 				(db->qual[i](row) == 0)) continue;
-			(void)lh_STRING_insert(db->index[i],row);
+			(void)lh_OPENSSL_STRING_insert(db->index[i],row);
 			}
 		}
 	return(1);
@@ -353,18 +353,18 @@
 	if (db->index != NULL)
 		{
 		for (i=db->num_fields-1; i>=0; i--)
-			if (db->index[i] != NULL) lh_STRING_free(db->index[i]);
+			if (db->index[i] != NULL) lh_OPENSSL_STRING_free(db->index[i]);
 		OPENSSL_free(db->index);
 		}
 	if (db->qual != NULL)
 		OPENSSL_free(db->qual);
 	if (db->data != NULL)
 		{
-		for (i=sk_PSTRING_num(db->data)-1; i>=0; i--)
+		for (i=sk_OPENSSL_PSTRING_num(db->data)-1; i>=0; i--)
 			{
 			/* check if any 'fields' have been allocated
 			 * from outside of the initial block */
-			p=sk_PSTRING_value(db->data,i);
+			p=sk_OPENSSL_PSTRING_value(db->data,i);
 			max=p[db->num_fields]; /* last address */
 			if (max == NULL) /* new row */
 				{
@@ -380,9 +380,9 @@
 						OPENSSL_free(p[n]);
 					}
 				}
-			OPENSSL_free(sk_PSTRING_value(db->data,i));
+			OPENSSL_free(sk_OPENSSL_PSTRING_value(db->data,i));
 			}
-		sk_PSTRING_free(db->data);
+		sk_OPENSSL_PSTRING_free(db->data);
 		}
 	OPENSSL_free(db);
 	}
Index: openssl/crypto/txt_db/txt_db.h
RCS File: /v/openssl/cvs/openssl/crypto/txt_db/txt_db.h,v
rcsdiff -q -kk '-r1.11' '-r1.11.2.1' -u '/v/openssl/cvs/openssl/crypto/txt_db/txt_db.h,v' 2>/dev/null
--- openssl/crypto/txt_db/txt_db.h 2008/06/04 11:01:38 1.11
+++ openssl/crypto/txt_db/txt_db.h 2009/07/27 21:08:51 1.11.2.1
@@ -77,19 +77,19 @@
 extern "C" {
 #endif
 
-typedef STRING *PSTRING;
-DECLARE_SPECIAL_STACK_OF(PSTRING, STRING)
+typedef OPENSSL_STRING *OPENSSL_PSTRING;
+DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
 
 typedef struct txt_db_st
 	{
 	int num_fields;
-	STACK_OF(PSTRING) *data;
-	LHASH_OF(STRING) **index;
-	int (**qual)(STRING *);
+	STACK_OF(OPENSSL_PSTRING) *data;
+	LHASH_OF(OPENSSL_STRING) **index;
+	int (**qual)(OPENSSL_STRING *);
 	long error;
 	long arg1;
 	long arg2;
-	STRING *arg_row;
+	OPENSSL_STRING *arg_row;
 	} TXT_DB;
 
 #ifndef OPENSSL_NO_BIO
@@ -99,11 +99,11 @@
 TXT_DB *TXT_DB_read(char *in, int num);
 long TXT_DB_write(char *out, TXT_DB *db);
 #endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(STRING *),
+int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *),
 			LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
 void TXT_DB_free(TXT_DB *db);
-STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, STRING *value);
-int TXT_DB_insert(TXT_DB *db, STRING *value);
+OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value);
+int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
 
 #ifdef  __cplusplus
 }
Index: openssl/crypto/x509v3/v3_utl.c
RCS File: /v/openssl/cvs/openssl/crypto/x509v3/v3_utl.c,v
rcsdiff -q -kk '-r1.44' '-r1.44.2.1' -u '/v/openssl/cvs/openssl/crypto/x509v3/v3_utl.c,v' 2>/dev/null
--- openssl/crypto/x509v3/v3_utl.c 2009/02/14 21:49:36 1.44
+++ openssl/crypto/x509v3/v3_utl.c 2009/07/27 21:08:53 1.44.2.1
@@ -67,9 +67,9 @@
 
 static char *strip_spaces(char *name);
 static int sk_strcmp(const char * const *a, const char * const *b);
-static STACK_OF(STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens);
-static void str_free(STRING str);
-static int append_ia5(STACK_OF(STRING) **sk, ASN1_IA5STRING *email);
+static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens);
+static void str_free(OPENSSL_STRING str);
+static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email);
 
 static int ipv4_from_asc(unsigned char *v4, const char *in);
 static int ipv6_from_asc(unsigned char *v6, const char *in);
@@ -463,10 +463,10 @@
 	return strcmp(*a, *b);
 }
 
-STACK_OF(STRING) *X509_get1_email(X509 *x)
+STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x)
 {
 	GENERAL_NAMES *gens;
-	STACK_OF(STRING) *ret;
+	STACK_OF(OPENSSL_STRING) *ret;
 
 	gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
 	ret = get_email(X509_get_subject_name(x), gens);
@@ -474,10 +474,10 @@
 	return ret;
 }
 
-STACK_OF(STRING) *X509_get1_ocsp(X509 *x)
+STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x)
 {
 	AUTHORITY_INFO_ACCESS *info;
-	STACK_OF(STRING) *ret = NULL;
+	STACK_OF(OPENSSL_STRING) *ret = NULL;
 	int i;
 
 	info = X509_get_ext_d2i(x, NID_info_access, NULL, NULL);
@@ -499,11 +499,11 @@
 	return ret;
 }
 
-STACK_OF(STRING) *X509_REQ_get1_email(X509_REQ *x)
+STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x)
 {
 	GENERAL_NAMES *gens;
 	STACK_OF(X509_EXTENSION) *exts;
-	STACK_OF(STRING) *ret;
+	STACK_OF(OPENSSL_STRING) *ret;
 
 	exts = X509_REQ_get_extensions(x);
 	gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
@@ -514,9 +514,9 @@
 }
 
 
-static STACK_OF(STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
+static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
 {
-	STACK_OF(STRING) *ret = NULL;
+	STACK_OF(OPENSSL_STRING) *ret = NULL;
 	X509_NAME_ENTRY *ne;
 	ASN1_IA5STRING *email;
 	GENERAL_NAME *gen;
@@ -539,23 +539,23 @@
 	return ret;
 }
 
-static void str_free(STRING str)
+static void str_free(OPENSSL_STRING str)
 {
 	OPENSSL_free(str);
 }
 
-static int append_ia5(STACK_OF(STRING) **sk, ASN1_IA5STRING *email)
+static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email)
 {
 	char *emtmp;
 	/* First some sanity checks */
 	if(email->type != V_ASN1_IA5STRING) return 1;
 	if(!email->data || !email->length) return 1;
-	if(!*sk) *sk = sk_STRING_new(sk_strcmp);
+	if(!*sk) *sk = sk_OPENSSL_STRING_new(sk_strcmp);
 	if(!*sk) return 0;
 	/* Don't add duplicates */
-	if(sk_STRING_find(*sk, (char *)email->data) != -1) return 1;
+	if(sk_OPENSSL_STRING_find(*sk, (char *)email->data) != -1) return 1;
 	emtmp = BUF_strdup((char *)email->data);
-	if(!emtmp || !sk_STRING_push(*sk, emtmp)) {
+	if(!emtmp || !sk_OPENSSL_STRING_push(*sk, emtmp)) {
 		X509_email_free(*sk);
 		*sk = NULL;
 		return 0;
@@ -563,9 +563,9 @@
 	return 1;
 }
 
-void X509_email_free(STACK_OF(STRING) *sk)
+void X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
 {
-	sk_STRING_pop_free(sk, str_free);
+	sk_OPENSSL_STRING_pop_free(sk, str_free);
 }
 
 /* Convert IP addresses both IPv4 and IPv6 into an 
Index: openssl/crypto/x509v3/x509v3.h
RCS File: /v/openssl/cvs/openssl/crypto/x509v3/x509v3.h,v
rcsdiff -q -kk '-r1.126.2.1' '-r1.126.2.2' -u '/v/openssl/cvs/openssl/crypto/x509v3/x509v3.h,v' 2>/dev/null
--- openssl/crypto/x509v3/x509v3.h 2009/04/19 17:58:01 1.126.2.1
+++ openssl/crypto/x509v3/x509v3.h 2009/07/27 21:08:53 1.126.2.2
@@ -693,10 +693,10 @@
 void X509_PURPOSE_cleanup(void);
 int X509_PURPOSE_get_id(X509_PURPOSE *);
 
-STACK_OF(STRING) *X509_get1_email(X509 *x);
-STACK_OF(STRING) *X509_REQ_get1_email(X509_REQ *x);
-void X509_email_free(STACK_OF(STRING) *sk);
-STACK_OF(STRING) *X509_get1_ocsp(X509 *x);
+STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
+STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
+void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
+STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
 
 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);

openssl-1.0.0-beta3-redhat.patch:
 Configure |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-redhat.patch ---
diff -up openssl-1.0.0-beta3/Configure.redhat openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.redhat	2009-07-08 10:50:52.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-04 22:46:59.000000000 +0200
@@ -331,32 +331,32 @@ my %table=(
 ####
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
-"linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-generic32","gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # It's believed that majority of ARM toolchains predefine appropriate -march.
 # If you compiler does not, do complement config command line with one!
-"linux-armv4",	"gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-armv4",	"gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 #### IA-32 targets...
 "linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out",
 ####
-"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-generic64","gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):\$(SHLIB_SONAMEVER)",
+"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
+"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
+"linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
 #### SPARC Linux setups
 # Ray Miller <ray.miller at computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv8","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux64-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
 # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
@@ -370,8 +370,8 @@ my %table=(
 #
 #					<appro at fy.chalmers.se>
 #
-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha-gcc","gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-alpha+bwx-gcc","gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 

openssl-1.0.0-beta3-soversion.patch:
 Configure    |    2 +-
 Makefile.org |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-soversion.patch ---
diff -up openssl-1.0.0-beta3/Configure.soversion openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.soversion	2009-08-04 23:06:52.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-04 23:06:52.000000000 +0200
@@ -1514,7 +1514,7 @@ while (<IN>)
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
 		{
 		my $sotmp = $1;
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/;
 		}
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
 		{
diff -up openssl-1.0.0-beta3/Makefile.org.soversion openssl-1.0.0-beta3/Makefile.org
--- openssl-1.0.0-beta3/Makefile.org.soversion	2009-08-04 23:06:52.000000000 +0200
+++ openssl-1.0.0-beta3/Makefile.org	2009-08-04 23:11:01.000000000 +0200
@@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY=
 SHLIB_MAJOR=
 SHLIB_MINOR=
 SHLIB_EXT=
+SHLIB_SONAMEVER=10
 PLATFORM=dist
 OPTIONS=
 CONFIGURE_ARGS=
@@ -289,10 +290,9 @@ clean-shared:
 link-shared:
 	@ set -e; for i in $(SHLIBDIRS); do \
 		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+			LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \
 			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
 			symlink.$(SHLIB_TARGET); \
-		libs="$$libs -l$$i"; \
 	done
 
 build-shared: do_$(SHLIB_TARGET) link-shared
@@ -303,7 +303,7 @@ do_$(SHLIB_TARGET):
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+			LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \
 			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
 			LIBDEPS="$$libs $(EX_LIBS)" \
 			link_a.$(SHLIB_TARGET); \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	25 Mar 2009 21:12:41 -0000	1.18
+++ .cvsignore	20 Aug 2009 14:18:41 -0000	1.19
@@ -1 +1 @@
-openssl-0.9.8k-usa.tar.bz2
+openssl-1.0.0-beta3-usa.tar.bz2


Index: README.FIPS
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/README.FIPS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README.FIPS	30 Jun 2009 14:20:37 -0000	1.1
+++ README.FIPS	20 Aug 2009 14:18:41 -0000	1.2
@@ -69,3 +69,7 @@ To query whether the module is in the er
 
 - int FIPS_selftest_failed(void) - returns 1 if the module is in the error
 state, 0 otherwise.
+
+To zeroize the FIPS RNG key and internal state the application calls:
+
+- void RAND_cleanup(void)


Index: hobble-openssl
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/hobble-openssl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- hobble-openssl	8 Nov 2005 13:52:28 -0000	1.7
+++ hobble-openssl	20 Aug 2009 14:18:41 -0000	1.8
@@ -4,33 +4,32 @@
 set -e
 
 # Clean out patent-or-otherwise-encumbered code.
-# MDC-2: 4,908,861 13/03/2007
+# MDC-2: 4,908,861 13/03/2007 - expired, we do not remove it but do not enable it anyway
 # IDEA:  5,214,703 25/05/2010
 # RC5:   5,724,428 03/03/2015
 # EC:    ????????? ??/??/2015
 
 # Remove assembler portions of IDEA, MDC2, and RC5.
-(find crypto/{idea,mdc2,rc5}/asm -type f | xargs -r rm -fv)
+(find crypto/{idea,rc5}/asm -type f | xargs -r rm -fv)
 
 # IDEA, MDC2, RC5, EC.
-for a in idea mdc2 rc5 ec ecdh ecdsa; do
+for a in idea rc5 ec ecdh ecdsa; do
   for c in `find crypto/$a -name "*.c" -a \! -name "*test*" -type f` ; do
 	echo Destroying $c
 	> $c
   done
 done
 
-for c in `find crypto/evp -name "*_rc5.c" -o -name "*_idea.c" -o -name "*_mdc2.c" -o -name "*_ecdsa.c"`; do
+for c in `find crypto/evp -name "*_rc5.c" -o -name "*_idea.c" -o -name "*_ecdsa.c"`; do
 	echo Destroying $c
 	> $c
 done
 
 for h in `find crypto ssl apps test -name "*.h"` ; do
-	echo Removing IDEA, MDC2, RC5, and EC references from $h
+	echo Removing IDEA, RC5, and EC references from $h
 	cat $h | \
 	awk    'BEGIN {ech=1;} \
 		/^#[ \t]*ifndef.*NO_IDEA/ {ech--; next;} \
-		/^#[ \t]*ifndef.*NO_MDC2/ {ech--; next;} \
 		/^#[ \t]*ifndef.*NO_RC5/ {ech--; next;} \
 		/^#[ \t]*ifndef.*NO_EC/ {ech--; next;} \
 		/^#[ \t]*ifndef.*NO_ECDH/ {ech--; next;} \


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- openssl.spec	25 Jul 2009 20:54:16 -0000	1.133
+++ openssl.spec	20 Aug 2009 14:18:42 -0000	1.134
@@ -8,7 +8,10 @@
 # 0.9.8ab soversion = 6
 # 0.9.8g soversion = 7
 # 0.9.8jk + EAP-FAST soversion = 8
-%define soversion 8
+# 1.0.0 soversion = 10
+%define soversion 10
+
+%define beta beta3
 
 # Number of threads to spawn when testing some threading fixes.
 %define thread_test_threads %{?threads:%{threads}}%{!?threads:1}
@@ -19,11 +22,11 @@
 
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
-Version: 0.9.8k
-Release: 7%{?dist}
+Version: 1.0.0
+Release: 0.1.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
-Source: openssl-%{version}-usa.tar.bz2
+Source: openssl-%{version}-%{beta}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
 Source6: make-dummy-cert
@@ -32,41 +35,34 @@ Source9: opensslconf-new.h
 Source10: opensslconf-new-warning.h
 Source11: README.FIPS
 # Build changes
-Patch0: openssl-0.9.8j-redhat.patch
-Patch1: openssl-0.9.8a-defaults.patch
-Patch2: openssl-0.9.8a-link-krb5.patch
-Patch3: openssl-0.9.8j-soversion.patch
-Patch4: openssl-0.9.8j-enginesdir.patch
+Patch0: openssl-1.0.0-beta3-redhat.patch
+Patch1: openssl-1.0.0-beta3-defaults.patch
+Patch2: openssl-1.0.0-beta3-krb5.patch
+Patch3: openssl-1.0.0-beta3-soversion.patch
+Patch4: openssl-1.0.0-beta3-enginesdir.patch
 Patch5: openssl-0.9.8a-no-rpath.patch
 Patch6: openssl-0.9.8b-test-use-localhost.patch
-Patch7: openssl-0.9.8k-shlib-version.patch
 # Bug fixes
 Patch21: openssl-0.9.8b-aliasing-bug.patch
-Patch22: openssl-0.9.8k-x509-name-cmp.patch
-Patch23: openssl-0.9.8g-default-paths.patch
-Patch24: openssl-0.9.8g-no-extssl.patch
+Patch23: openssl-1.0.0-beta3-default-paths.patch
 # Functionality changes
 Patch32: openssl-0.9.8g-ia64.patch
 Patch33: openssl-0.9.8j-ca-dir.patch
 Patch34: openssl-0.9.6-x509.patch
 Patch35: openssl-0.9.8j-version-add-engines.patch
-Patch38: openssl-0.9.8a-reuse-cipher-change.patch
-Patch39: openssl-0.9.8g-ipv6-apps.patch
-Patch40: openssl-0.9.8j-nocanister.patch
-Patch41: openssl-0.9.8k-use-fipscheck.patch
-Patch42: openssl-0.9.8k-fipscheck-hmac.patch
-Patch44: openssl-0.9.8k-kernel-fipsmode.patch
+Patch38: openssl-1.0.0-beta3-cipher-change.patch
+Patch39: openssl-1.0.0-beta3-ipv6-apps.patch
+Patch40: openssl-1.0.0-beta3-fips.patch
+Patch41: openssl-1.0.0-beta3-fipscheck.patch
+Patch43: openssl-1.0.0-beta3-fipsmode.patch
+Patch44: openssl-1.0.0-beta3-fipsrng.patch
 Patch45: openssl-0.9.8j-env-nozlib.patch
-Patch46: openssl-0.9.8j-eap-fast.patch
 Patch47: openssl-0.9.8j-readme-warning.patch
 Patch48: openssl-0.9.8j-bad-mime.patch
-Patch49: openssl-0.9.8j-fips-no-pairwise.patch
-Patch50: openssl-0.9.8k-fips-rng-seed.patch
-Patch51: openssl-0.9.8k-multi-crl.patch
-Patch52: openssl-0.9.8k-dtls-compat.patch
-Patch53: openssl-0.9.8k-dtls-dos.patch
-Patch54: openssl-0.9.8k-algo-doc.patch
+Patch49: openssl-0.9.8k-algo-doc.patch
 # Backported fixes including security fixes
+Patch60: openssl-1.0.0-beta3-namingstr.patch
+Patch61: openssl-1.0.0-beta3-namingblk.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -76,6 +72,14 @@ BuildRequires: mktemp, krb5-devel, perl,
 BuildRequires: /usr/bin/rename
 Requires: mktemp, ca-certificates >= 2008-5
 
+# Temporary hack
+Requires(post): coreutils
+%ifarch ppc64 s390x sparc64 x86_64
+Provides: libcrypto.so.8()(64bit) libssl.so.8()(64bit)
+%else
+Provides: libcrypto.so.8 libssl.so.8
+%endif
+
 %description
 The OpenSSL toolkit provides support for secure communications between
 machines. OpenSSL includes a certificate management tool and shared
@@ -116,7 +120,7 @@ package provides Perl scripts for conver
 from other formats to the formats used by the OpenSSL toolkit.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{beta}
 
 %{SOURCE1} > /dev/null
 %patch0 -p1 -b .redhat
@@ -127,12 +131,9 @@ from other formats to the formats used b
 %patch4 -p1 -b .enginesdir
 %patch5 -p1 -b .no-rpath
 %patch6 -p1 -b .use-localhost
-%patch7 -p1 -b .shlib-version
 
 %patch21 -p1 -b .aliasing-bug
-%patch22 -p1 -b .name-cmp
 %patch23 -p1 -b .default-paths
-%patch24 -p1 -b .no-extssl
 
 %patch32 -p1 -b .ia64
 %patch33 -p1 -b .ca-dir
@@ -140,20 +141,16 @@ from other formats to the formats used b
 %patch35 -p1 -b .version-add-engines
 %patch38 -p1 -b .cipher-change
 %patch39 -p1 -b .ipv6-apps
-%patch40 -p1 -b .nocanister
-%patch41 -p1 -b .use-fipscheck
-%patch42 -p1 -b .fipscheck-hmac
-%patch44 -p1 -b .fipsmode
+%patch40 -p1 -b .fips
+%patch41 -p1 -b .fipscheck
+%patch43 -p1 -b .fipsmode
+%patch44 -p1 -b .fipsrng
 %patch45 -p1 -b .env-nozlib
-%patch46 -p1 -b .eap-fast
 %patch47 -p1 -b .warning
 %patch48 -p1 -b .bad-mime
-%patch49 -p1 -b .no-pairwise
-%patch50 -p1 -b .rng-seed
-%patch51 -p1 -b .multi-crl
-%patch52 -p1 -b .dtls-compat
-%patch53 -p1 -b .dtls-dos
-%patch54 -p1 -b .algo-doc
+%patch49 -p1 -b .algo-doc
+%patch60 -p1 -b .namingstr
+%patch61 -p1 -b .namingblk
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -201,7 +198,7 @@ sslarch=linux-generic32
 	zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
 	enable-cms no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa shared \
 	--with-krb5-flavor=MIT --enginesdir=%{_libdir}/openssl/engines \
-	--with-krb5-dir=/usr ${sslarch} fipscanisterbuild
+	--with-krb5-dir=/usr ${sslarch} fips
 
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 # marked as not requiring an executable stack.
@@ -240,9 +237,9 @@ make -C test apps tests
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    fips/fips_standalone_sha1 $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{version}.hmac \
+    crypto/fips/fips_standalone_sha1 $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{version}.hmac \
     ln -sf .libcrypto.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{soversion}.hmac \
-    fips/fips_standalone_sha1 $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{version}.hmac \
+    crypto/fips/fips_standalone_sha1 $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{version}.hmac \
     ln -sf .libssl.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{soversion}.hmac \
 %{nil}
 
@@ -263,6 +260,9 @@ for lib in $RPM_BUILD_ROOT%{_libdir}/*.s
 	chmod 755 ${lib}
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.%{soversion}
+# Temporary hack
+	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.8
+
 done
 
 # Install a makefile for generating keys and self-signed certs, and a script
@@ -378,6 +378,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %attr(0644,root,root) %{_mandir}/man5*/*
 %attr(0644,root,root) %{_mandir}/man7*/*
 
+# Temporary hack
+%attr(0755,root,root) /%{_lib}/*.so.8
+
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/openssl
@@ -393,14 +396,28 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/c_rehash
 %attr(0644,root,root) %{_mandir}/man1*/*.pl*
-%dir %{_sysconfdir}/pki/tls/misc
 %{_sysconfdir}/pki/tls/misc/*.pl
+%{_sysconfdir}/pki/tls/misc/tsget
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%triggerpostun -- openssl < 1.0.0
+# Temporary hack
+[ $1 != 0 ] || exit 0
+if [ "$(readlink /%{_lib}/libcrypto.so.8)" != libcrypto.so.%{version} ] ; then
+    ln -sf libcrypto.so.%{version} /%{_lib}/libcrypto.so.8 || :
+fi
+if [ "$(readlink /%{_lib}/libssl.so.8)" != libssl.so.%{version} ] ; then
+    ln -sf libssl.so.%{version} /%{_lib}/libssl.so.8 || :
+fi
+/sbin/ldconfig -X
+
 %changelog
+* Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.1.beta3
+- update to new major upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8k-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	25 Mar 2009 21:12:41 -0000	1.20
+++ sources	20 Aug 2009 14:18:42 -0000	1.21
@@ -1 +1 @@
-de4f31dd6546e8e11b4ffd4332b3c162  openssl-0.9.8k-usa.tar.bz2
+9926dcf78e797a12d8e3ffd7a018824b  openssl-1.0.0-beta3-usa.tar.bz2


--- openssl-0.9.8a-defaults.patch DELETED ---


--- openssl-0.9.8a-enginesdir.patch DELETED ---


--- openssl-0.9.8a-link-krb5.patch DELETED ---


--- openssl-0.9.8a-reuse-cipher-change.patch DELETED ---


--- openssl-0.9.8g-default-paths.patch DELETED ---


--- openssl-0.9.8g-ipv6-apps.patch DELETED ---


--- openssl-0.9.8g-no-extssl.patch DELETED ---


--- openssl-0.9.8j-eap-fast.patch DELETED ---


--- openssl-0.9.8j-enginesdir.patch DELETED ---


--- openssl-0.9.8j-fips-no-pairwise.patch DELETED ---


--- openssl-0.9.8j-nocanister.patch DELETED ---


--- openssl-0.9.8j-redhat.patch DELETED ---


--- openssl-0.9.8j-soversion.patch DELETED ---


--- openssl-0.9.8k-dtls-compat.patch DELETED ---


--- openssl-0.9.8k-dtls-dos.patch DELETED ---


--- openssl-0.9.8k-fips-rng-seed.patch DELETED ---


--- openssl-0.9.8k-fipscheck-hmac.patch DELETED ---


--- openssl-0.9.8k-kernel-fipsmode.patch DELETED ---


--- openssl-0.9.8k-multi-crl.patch DELETED ---


--- openssl-0.9.8k-shlib-version.patch DELETED ---


--- openssl-0.9.8k-use-fipscheck.patch DELETED ---


--- openssl-0.9.8k-x509-name-cmp.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Aug 20 14:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 14:19:55 +0000
Subject: [pkgdb] saxpath had acl change status
Message-ID: <20090820141955.C2D5A10F855@bastion2.fedora.phx.redhat.com>

fnasser has set the commit acl on saxpath (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/saxpath



From pkgdb at fedoraproject.org  Thu Aug 20 14:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 14:20:04 +0000
Subject: [pkgdb] saxpath had acl change status
Message-ID: <20090820142005.4EF3310F895@bastion2.fedora.phx.redhat.com>

fnasser has set the watchbugzilla acl on saxpath (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/saxpath



From pkgdb at fedoraproject.org  Thu Aug 20 14:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 14:20:00 +0000
Subject: [pkgdb] saxpath had acl change status
Message-ID: <20090820142001.18DF810F886@bastion2.fedora.phx.redhat.com>

fnasser has set the watchcommits acl on saxpath (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/saxpath



From tmraz at fedoraproject.org  Thu Aug 20 14:20:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 20 Aug 2009 14:20:57 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.134,1.135
Message-ID: <20090820142057.A8C8611C006E@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22128

Modified Files:
	openssl.spec 
Log Message:
* Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.1.beta3
- update to new major upstream release



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- openssl.spec	20 Aug 2009 14:18:42 -0000	1.134
+++ openssl.spec	20 Aug 2009 14:20:57 -0000	1.135
@@ -379,7 +379,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %attr(0644,root,root) %{_mandir}/man7*/*
 
 # Temporary hack
-%attr(0755,root,root) /%{_lib}/*.so.8
+%attr(0755,root,root) %{_libdir}/*.so.8
 
 %files devel
 %defattr(-,root,root)
@@ -406,11 +406,11 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %triggerpostun -- openssl < 1.0.0
 # Temporary hack
 [ $1 != 0 ] || exit 0
-if [ "$(readlink /%{_lib}/libcrypto.so.8)" != libcrypto.so.%{version} ] ; then
-    ln -sf libcrypto.so.%{version} /%{_lib}/libcrypto.so.8 || :
+if [ "$(readlink %{_libdir}/libcrypto.so.8)" != libcrypto.so.%{version} ] ; then
+    ln -sf libcrypto.so.%{version} %{_libdir}/libcrypto.so.8 || :
 fi
-if [ "$(readlink /%{_lib}/libssl.so.8)" != libssl.so.%{version} ] ; then
-    ln -sf libssl.so.%{version} /%{_lib}/libssl.so.8 || :
+if [ "$(readlink %{_libdir}/libssl.so.8)" != libssl.so.%{version} ] ; then
+    ln -sf libssl.so.%{version} %{_libdir}/libssl.so.8 || :
 fi
 /sbin/ldconfig -X
 



From akurtakov at fedoraproject.org  Thu Aug 20 14:22:25 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 14:22:25 +0000 (UTC)
Subject: rpms/saxpath/devel saxpath.spec, 1.1, 1.2 saxpath-1.0.pom, 1.1,
	1.2 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2
Message-ID: <20090820142225.B76CD11C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/saxpath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22557/devel

Modified Files:
	sources .cvsignore 
Added Files:
	saxpath.spec saxpath-1.0.pom 
Log Message:
Initial import.


Index: saxpath.spec
===================================================================
RCS file: saxpath.spec
diff -N saxpath.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ saxpath.spec	20 Aug 2009 14:22:25 -0000	1.2
@@ -0,0 +1,108 @@
+Name:       saxpath
+Version:    1.0
+Release:    1.6%{?dist}
+Summary:    Simple API for XPath
+
+Group:      Development/Libraries
+License:    Saxpath
+URL:        http://sourceforge.net/projects/saxpath/
+Source0:    http://downloads.sourceforge.net/saxpath/saxpath-1.0.tar.gz
+Source1:    %{name}-%{version}.pom
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  ant-trax
+
+BuildArch:      noarch
+
+%description
+The SAXPath project is a Simple API for XPath. SAXPath is analogous to SAX
+in that the API abstracts away the details of parsing and provides a simple
+event based callback interface.
+
+%package javadoc
+Summary:    Javadoc for saxpath
+Group:      Documentation
+
+%description javadoc
+Java API documentation for saxpath.
+
+%prep
+%setup -q -n %{name}-%{version}-FCS
+
+find -type f -name "*.jar" -exec rm -f '{}' \;
+
+%build
+mkdir src/conf
+touch src/conf/MANIFEST.MF
+
+ant
+
+# fix rpmlint warings: saxpath-javadoc.noarch: W: wrong-file-end-of-line-encoding /usr/share/javadoc/saxpath/**/*.css
+for file in `find build/doc -type f | grep .css`; do
+    %{__sed} -i 's/\r//g' $file
+done
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# install jar
+install -dm 755 $RPM_BUILD_ROOT/%{_javadir}
+cp -p build/saxpath.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar
+
+#install pom
+install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-saxpath.pom
+
+#depmap entry
+%add_to_maven_depmap saxpath saxpath %{version}-FCS JPP saxpath
+
+# install javadoc
+install -dm 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
+cp -a build/doc/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/*
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}
+
+
+%changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-1.6
+- Fix GROUPS.
+- Wrap changelog.
+
+* Mon Jun 8 2009 Yong Yang <yyang at redhat.com> 1.0-1.5
+- Fix "saxpath-javadoc.noarch: W: wrong-file-end-of-line-encoding
+  /usr/share/javadoc/saxpath/**/*.css"
+- Fix "saxpath.src: W: mixed-use-of-spaces-and-tabs
+  (spaces: line 1, tab: line 6)"
+
+* Wed May 13 2009 Fernando Nasser <fnasser at redhat.com> 1.0-1.4
+- Fix license
+
+* Tue Mar 10 2009 Yong Yang <yyang at redhat.com> 1.0-1.3
+- rebuild with maven2 2.0.8 built in bootstrap mode
+
+* Tue Jan 06 2009 Yong Yang <yyang at redhat.com> 1.0-1.2
+- Import from dbhole's maven 2.0.8 packages
+
+* Wed Dec 03 2008 Deepak Bhole <dbhole at redhat.com> 1.0-1.1
+- Initial build.


Index: saxpath-1.0.pom
===================================================================
RCS file: saxpath-1.0.pom
diff -N saxpath-1.0.pom
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ saxpath-1.0.pom	20 Aug 2009 14:22:25 -0000	1.2
@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>saxpath</groupId>
+  <artifactId>saxpath</artifactId>
+  <version>1.0-FCS</version>
+</project>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/saxpath/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2009 23:31:10 -0000	1.1
+++ sources	20 Aug 2009 14:22:25 -0000	1.2
@@ -0,0 +1 @@
+cc95ecc7dfb689a29bd42323490ee702  saxpath-1.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/saxpath/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2009 23:31:10 -0000	1.1
+++ .cvsignore	20 Aug 2009 14:22:25 -0000	1.2
@@ -0,0 +1 @@
+saxpath-1.0.tar.gz



From mgrepl at fedoraproject.org  Thu Aug 20 14:29:53 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu, 20 Aug 2009 14:29:53 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.46,1.47
Message-ID: <20090820142953.E31C211C006E@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-serv24593

Modified Files:
	policy-20090521.patch 
Log Message:
- Fixes for racoon 
- Fixes for ptchown
- Fixes for openvpn



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.if               |   18 +
 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/usermanage.te        |    1 
 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/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 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          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   30 +++
 policy/modules/kernel/files.if            |    3 
 policy/modules/kernel/kernel.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    |    9 
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/apache.fc         |    4 
 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/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/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    6 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |   10 -
 policy/modules/services/ftp.te            |    7 
 policy/modules/services/gnomeclock.te     |    1 
 policy/modules/services/gpsd.fc           |    3 
 policy/modules/services/gpsd.te           |   19 +-
 policy/modules/services/hal.te            |   14 +
 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             |   19 ++
 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/privoxy.te        |    3 
 policy/modules/services/pyzor.fc          |    2 
 policy/modules/services/pyzor.te          |    2 
 policy/modules/services/rpc.te            |   12 +
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/sasl.te           |    2 
 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/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |    8 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 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             |    2 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 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       |   33 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 140 files changed, 2334 insertions(+), 645 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- policy-20090521.patch	20 Aug 2009 11:27:42 -0000	1.46
+++ policy-20090521.patch	20 Aug 2009 14:29:53 -0000	1.47
@@ -2818,8 +2818,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/gpsd\.sock              -s      gen_context(system_u:object_r:gpsd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.6.12/policy/modules/services/gpsd.te
 --- nsaserefpolicy/policy/modules/services/gpsd.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/gpsd.te	2009-06-25 10:24:43.000000000 +0200
-@@ -8,11 +9,17 @@
++++ serefpolicy-3.6.12/policy/modules/services/gpsd.te	2009-08-20 14:46:39.000000000 +0200
+@@ -8,17 +9,23 @@
  type gpsd_t;
  type gpsd_exec_t;
  application_domain(gpsd_t, gpsd_exec_t)
@@ -2838,6 +2838,13 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # gpsd local policy
+ #
+ 
+-allow gpsd_t self:capability { setuid sys_nice setgid fowner };
++allow gpsd_t self:capability { setuid sys_nice setgid fowner fsetid };
+ allow gpsd_t self:process setsched;
+ allow gpsd_t self:shm create_shm_perms;
+ allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -28,6 +35,15 @@
  manage_files_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t)
  fs_tmpfs_filetrans(gpsd_t, gpsd_tmpfs_t, { dir file })
@@ -3357,6 +3364,42 @@ diff -b -B --ignore-all-space --exclude-
 +auth_use_nsswitch(nslcd_t)
 +
 +logging_send_syslog_msg(nslcd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.6.12/policy/modules/services/nx.fc
+--- nsaserefpolicy/policy/modules/services/nx.fc	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/nx.fc	2009-08-20 15:35:42.000000000 +0200
+@@ -5,3 +5,6 @@
+ /opt/NX/var(/.*)?			gen_context(system_u:object_r:nx_server_var_run_t,s0)
+ 
+ /usr/libexec/nx/nxserver	--	gen_context(system_u:object_r:nx_server_exec_t,s0)
++
++/var/lib/nxserver/home/.ssh(/.*)? 	gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.6.12/policy/modules/services/nx.if
+--- nsaserefpolicy/policy/modules/services/nx.if	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/nx.if	2009-08-20 15:36:36.000000000 +0200
+@@ -17,3 +17,22 @@
+ 
+ 	spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
+ ')
++
++#######################################
++## <summary>
++## Read nx home directory content
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nx_read_home_files',`
++	gen_require(`
++		type nx_server_home_ssh_t;
++	')
++
++	read_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.12/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-04-07 21:54:45.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/openvpn.te	2009-08-20 09:42:28.000000000 +0200
@@ -4204,8 +4247,8 @@ 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.12/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/ssh.te	2009-06-29 22:52:07.000000000 +0200
-@@ -347,6 +347,10 @@
++++ serefpolicy-3.6.12/policy/modules/services/ssh.te	2009-08-20 15:37:17.000000000 +0200
+@@ -347,10 +347,18 @@
  ')
  
  optional_policy(`
@@ -4216,6 +4259,14 @@ diff -b -B --ignore-all-space --exclude-
  	inetd_tcp_service_domain(sshd_t, sshd_exec_t)
  ')
  
+ optional_policy(`
++	nx_read_home_files(sshd_t)
++')
++
++optional_policy(`
+ 	rpm_use_script_fds(sshd_t)
+ ')
+ 
 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
@@ -5393,8 +5444,18 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-13 09:03:28.000000000 +0200
-@@ -518,6 +518,8 @@
++++ serefpolicy-3.6.12/policy/modules/system/userdomain.if	2009-08-20 15:20:32.000000000 +0200
+@@ -443,6 +443,9 @@
+ 	dev_rw_usbfs($1)
+ 	dev_rw_generic_usb_dev($1)
+ 
++	dev_read_video_dev($1)
++	dev_write_video_dev($1)
++
+ 	miscfiles_dontaudit_write_fonts($1)
+ 
+ 	optional_policy(`
+@@ -518,6 +521,8 @@
  	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 };
  
@@ -5403,7 +5464,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1_usertype unpriv_userdomain:fd use;
  
  	kernel_read_system_state($1_usertype)
-@@ -627,12 +629,6 @@
+@@ -627,12 +632,6 @@
  		')
  
  		optional_policy(`
@@ -5416,7 +5477,7 @@ diff -b -B --ignore-all-space --exclude-
  			evolution_dbus_chat($1_usertype)
  			evolution_alarm_dbus_chat($1_usertype)
  	')
-@@ -968,6 +964,21 @@
+@@ -968,6 +967,21 @@
  	')
  
  		optional_policy(`
@@ -5438,7 +5499,7 @@ diff -b -B --ignore-all-space --exclude-
  		gnome_manage_config($1_usertype)
  		gnome_manage_gconf_home_files($1_usertype)
  		gnome_read_gconf_config($1_usertype)
-@@ -1457,6 +1468,7 @@
+@@ -1457,6 +1471,7 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -5446,7 +5507,7 @@ diff -b -B --ignore-all-space --exclude-
  	files_search_home($1)
  ')
  
-@@ -1880,7 +1892,7 @@
+@@ -1880,7 +1895,7 @@
  		type user_home_t;
  	')
  
@@ -5455,7 +5516,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3317,10 +3329,6 @@
+@@ -3317,10 +3332,6 @@
    seutil_run_newrole($1_t, $1_r)
  
    optional_policy(`



From rdieter at fedoraproject.org  Thu Aug 20 14:33:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:33:25 +0000 (UTC)
Subject: rpms/kdepim/F-10 kmail-fonts-4.3.patch, NONE, 1.1 kdepim.spec, 1.215,
	1.216
Message-ID: <20090820143325.D9B6211C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25537

Modified Files:
	kdepim.spec 
Added Files:
	kmail-fonts-4.3.patch 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- kmail: upstream fix for custom font settings (#kdebug#178402)


kmail-fonts-4.3.patch:
 core/delegate.cpp      |    2 
 core/messageitem.h     |   14 ++
 core/model.cpp         |   24 -----
 core/theme.cpp         |   49 ----------
 core/theme.h           |  107 ----------------------
 core/themedelegate.cpp |  211 ++++++++++++++++++++------------------------
 core/themedelegate.h   |   10 +-
 core/themeeditor.cpp   |    6 -
 core/themeeditor.h     |    2 
 storagemodel.cpp       |  232 +++++++++++++++++++++----------------------------
 storagemodel.h         |   15 ++-
 11 files changed, 241 insertions(+), 431 deletions(-)

--- NEW FILE kmail-fonts-4.3.patch ---
Index: kmail/messagelistview/storagemodel.cpp
===================================================================
--- kmail/messagelistview/storagemodel.cpp	(revision 1011070)
+++ kmail/messagelistview/storagemodel.cpp	(revision 1011071)
@@ -154,6 +154,21 @@
     mColorToDoMessage = config.readEntry( "TodoMessage", mColorToDoMessage );
   }
 
+  if ( GlobalSettings::self()->useDefaultFonts() )
+  {
+    mFont = mFontImportantMessage = mFontNewMessage = mFontUnreadMessage =
+      mFontToDoMessage = KGlobalSettings::generalFont();
+  }
+  else
+  {
+    KConfigGroup fonts( KMKernel::config(), "Fonts" );
+    mFont = fonts.readEntry( "list-font",  KGlobalSettings::generalFont() );
+
+    mFontImportantMessage = fonts.readEntry( "list-important-font", mFont );
+    mFontNewMessage       = fonts.readEntry( "list-new-font",       mFont );
+    mFontUnreadMessage    = fonts.readEntry( "list-unread-font",    mFont );
+    mFontToDoMessage      = fonts.readEntry( "list-toact-font",     mFont );
+  }
 }
 
 StorageModel::~StorageModel()
@@ -290,46 +305,15 @@
   return mFolder->whoField().toLower() == "to";
 }
 
-bool StorageModel::initializeMessageItem( Core::MessageItem * mi, int row, bool bUseReceiver ) const
+/**
+ * Uses the KMMsgBase to fill a list of tags. It also picks out
+ * the colors the message should use.
+ */
+QList< Core::MessageItem::Tag * > * fillTagList( KMMsgBase * msg,
+    QColor & textColor, QColor & backgroundColor )
 {
-  KMMsgBase * msg = mFolder->getMsgBase( row );
-  if ( !msg )
-    return false;
-
-  QString sender = msg->fromStrip();
-  QString receiver = msg->toStrip();
-
-  // Static for speed reasons
-  static const QString noSubject = i18nc( "displayed as subject when the subject of a mail is empty", "No Subject" );
-  static const QString unknown( i18nc( "displayed when a mail has unknown sender, receiver or date", "Unknown" ) );
-
-  if ( sender.isEmpty() )
-    sender = unknown;
-  if ( receiver.isEmpty() )
-    receiver = unknown;
-
-  mi->initialSetup(
-      msg->date(),
-      mFolder->folderType() == KMFolderTypeImap ? msg->msgSizeServer() : msg->msgSize(),
-      sender, receiver,
-      bUseReceiver ? receiver : sender
-    );
-
-  mi->setUniqueId( msg->getMsgSerNum() );
-
-  KPIM::MessageStatus stat = msg->messageStatus();
-
-  QString subject = msg->subject();
-  if ( subject.isEmpty() )
-    subject = '(' + noSubject + ')';
-  mi->setSubjectAndStatus(
-      subject,
-      stat
-    );
-
-  QColor clr;
-
   // FIXME: Tags should be sorted by priority!
+  QList< Core::MessageItem::Tag * > * tagList = 0;
 
   if ( msg->tagList() )
   {
@@ -337,15 +321,16 @@
     {
       int bestPriority = -0xfffff;
 
-      QList< Core::MessageItem::Tag * > * tagList = new QList< Core::MessageItem::Tag * >();
+      tagList = new QList< Core::MessageItem::Tag * >();
       for ( KMMessageTagList::Iterator it = msg->tagList()->begin(); it != msg->tagList()->end(); ++it )
       {
         const KMMessageTagDescription * description = kmkernel->msgTagMgr()->find( *it );
         if ( description )
         {
-          if ( ( bestPriority < description->priority() ) || ( !clr.isValid() ) )
+          if ( ( bestPriority < description->priority() ) || ( !textColor.isValid() ) )
           {
-            clr = description->textColor();
+            textColor = description->textColor();
+            backgroundColor = description->backgroundColor();
             bestPriority = description->priority();
           }
 
@@ -358,14 +343,18 @@
         }
       }
       if ( tagList->isEmpty() )
+      {
         delete tagList;
-      else
-        mi->setTagList( tagList );
+        tagList = 0;
+      }
     }
   }
 
+  return tagList;
+}
 
-
+static void setMessageItemEncryptionState( Core::MessageItem * mi, KMMsgBase * msg )
+{
   switch ( msg->encryptionState() )
   {
     case KMMsgFullyEncrypted:
@@ -375,13 +364,17 @@
       mi->setEncryptionState( Core::MessageItem::PartiallyEncrypted );
     break;
     case KMMsgEncryptionStateUnknown:
+    case KMMsgEncryptionProblematic:
       mi->setEncryptionState( Core::MessageItem::EncryptionStateUnknown );
     break;
     default:
       mi->setEncryptionState( Core::MessageItem::NotEncrypted );
     break;
   }
+}
 
+static void setMessageItemSignatureState( Core::MessageItem * mi, KMMsgBase * msg )
+{
   switch ( msg->signatureState() )
   {
     case KMMsgFullySigned:
@@ -391,28 +384,51 @@
       mi->setSignatureState( Core::MessageItem::PartiallySigned );
     break;
     case KMMsgSignatureStateUnknown:
+    case KMMsgSignatureProblematic:
       mi->setSignatureState( Core::MessageItem::SignatureStateUnknown );
     break;
     default:
       mi->setSignatureState( Core::MessageItem::NotSigned );
     break;
   }
+}
 
-  if ( !clr.isValid() )
-  {
-    if ( stat.isNew() )
-      clr = mColorNewMessage;
-    else if ( stat.isUnread() )
-      clr = mColorUnreadMessage;
-    else if ( stat.isImportant() )
-      clr = mColorImportantMessage;
-    else if ( stat.isToAct() )
-      clr = mColorToDoMessage;
-  }
+bool StorageModel::initializeMessageItem( Core::MessageItem * mi, int row, bool bUseReceiver ) const
+{
+  KMMsgBase * msg = mFolder->getMsgBase( row );
+  if ( !msg )
+    return false;
 
-  if ( clr.isValid() )
-    mi->setTextColor( clr );
+  QString sender = msg->fromStrip();
+  QString receiver = msg->toStrip();
 
+  // Static for speed reasons
+  static const QString noSubject = i18nc( "displayed as subject when the subject of a mail is empty", "No Subject" );
+  static const QString unknown( i18nc( "displayed when a mail has unknown sender, receiver or date", "Unknown" ) );
+
+  if ( sender.isEmpty() )
+    sender = unknown;
+  if ( receiver.isEmpty() )
+    receiver = unknown;
+
+  mi->initialSetup(
+      msg->date(),
+      mFolder->folderType() == KMFolderTypeImap ? msg->msgSizeServer() : msg->msgSize(),
+      sender, receiver,
+      bUseReceiver ? receiver : sender
+    );
+
+  mi->setUniqueId( msg->getMsgSerNum() );
+
+  KPIM::MessageStatus stat = msg->messageStatus();
+
+  QString subject = msg->subject();
+  if ( subject.isEmpty() )
+    subject = '(' + noSubject + ')';
+  mi->setSubjectAndStatus( subject, stat );
+
+  setMessageItemData( mi, msg );
+
   return true;
 }
 
@@ -429,99 +445,53 @@
     mi->recomputeMaxDate();
   }
 
-  QColor clr;
-
   KPIM::MessageStatus stat = msg->messageStatus();
 
   mi->setStatus( stat );
 
-  switch ( msg->encryptionState() )
-  {
-    case KMMsgFullyEncrypted:
-      mi->setEncryptionState( Core::MessageItem::FullyEncrypted );
-    break;
-    case KMMsgPartiallyEncrypted:
-      mi->setEncryptionState( Core::MessageItem::PartiallyEncrypted );
-    break;
-    case KMMsgEncryptionStateUnknown:
-    case KMMsgEncryptionProblematic:
-      mi->setEncryptionState( Core::MessageItem::EncryptionStateUnknown );
-    break;
-    default:
-      mi->setEncryptionState( Core::MessageItem::NotEncrypted );
-    break;
-  }
+  setMessageItemData( mi, msg );
+}
 
-  switch ( msg->signatureState() )
-  {
-    case KMMsgFullySigned:
-      mi->setSignatureState( Core::MessageItem::FullySigned );
-    break;
-    case KMMsgPartiallySigned:
-      mi->setSignatureState( Core::MessageItem::PartiallySigned );
-    break;
-    case KMMsgSignatureStateUnknown:
-    case KMMsgSignatureProblematic:
-      mi->setSignatureState( Core::MessageItem::SignatureStateUnknown );
-    break;
-    default:
-      mi->setSignatureState( Core::MessageItem::NotSigned );
-    break;
-  }
+void StorageModel::setMessageItemData( Core::MessageItem * mi, KMMsgBase * msg ) const
+{
+  setMessageItemEncryptionState( mi, msg );
+  setMessageItemSignatureState( mi, msg );
 
-  QList< Core::MessageItem::Tag * > * tagList = 0;
-
-  if ( msg->tagList() )
-  {
-    if ( !msg->tagList()->isEmpty() )
-    {
-      int bestPriority = -0xfffff;
-
-      tagList = new QList< Core::MessageItem::Tag * >();
-      for ( KMMessageTagList::Iterator it = msg->tagList()->begin(); it != msg->tagList()->end(); ++it )
-      {
-        const KMMessageTagDescription * description = kmkernel->msgTagMgr()->find( *it );
-        if ( description )
-        {
-          if ( ( bestPriority < description->priority() ) || ( !clr.isValid() ) )
-          {
-            clr = description->textColor();
-            bestPriority = description->priority();
-          }
-
-          Core::MessageItem::Tag * tag;
-          if ( description->toolbarIconName().isEmpty() )
-            tag = new Core::MessageItem::Tag( SmallIcon( "feed-subscribe" ), description->name(), *it );
-          else
-            tag = new Core::MessageItem::Tag( SmallIcon( description->toolbarIconName() ), description->name(), *it );
-          tagList->append( tag );
-        }
-      }
-      if ( tagList->isEmpty() )
-      {
-        delete tagList;
-        tagList = 0;
-      }
-    }
-  }
-
+  QColor clr;
+  QColor backClr;
+  QList< Core::MessageItem::Tag * > * tagList;
+  tagList = fillTagList( msg, clr, backClr );
   mi->setTagList( tagList );
 
+  KPIM::MessageStatus stat = msg->messageStatus();
+
   if ( !clr.isValid() )
   {
-    if ( stat.isNew() )
+    // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+    if ( stat.isImportant() )
+      clr = mColorImportantMessage;
+    else if ( stat.isNew() )
       clr = mColorNewMessage;
     else if ( stat.isUnread() )
       clr = mColorUnreadMessage;
-    else if ( stat.isImportant() )
-      clr = mColorImportantMessage;
     else if ( stat.isToAct() )
       clr = mColorToDoMessage;
   }
 
   mi->setTextColor( clr ); // set even if invalid (->default color)
+  mi->setBackgroundColor( backClr );
 
-  // FIXME: Handle MDN State ?
+  // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+  if ( stat.isImportant() )
+    mi->setFont( mFontImportantMessage );
+  else if ( stat.isNew() )
+    mi->setFont( mFontNewMessage );
+  else if ( stat.isUnread() )
+    mi->setFont( mFontUnreadMessage );
+  else if ( stat.isToAct() )
+    mi->setFont( mFontToDoMessage );
+  else
+    mi->setFont( mFont );
 }
 
 void StorageModel::fillMessageItemThreadingData( Core::MessageItem * mi, int row, ThreadingDataSubset subset ) const
Index: kmail/messagelistview/core/model.cpp
===================================================================
--- kmail/messagelistview/core/model.cpp	(revision 1011070)
+++ kmail/messagelistview/core/model.cpp	(revision 1011071)
@@ -3237,8 +3237,6 @@
   // The end index of our work.
   int endIndex = job->endIndex();
 
-  bool viewportNeedsUpdate = false;
-
   while( curIndex <= endIndex )
   {
     // Get the underlying storage message data...
@@ -3269,6 +3267,8 @@
 
     // Do update
     mStorageModel->updateMessageItemData( message, row );
+    QModelIndex idx = index( message, 0 );
+    emit dataChanged( idx, idx );
 
     // Reinsert the item to the cache, if needed
     if( mAggregation->threading() == Aggregation::PerfectReferencesAndSubject )
@@ -3289,22 +3289,6 @@
     if ( propertyChangeMask )
     {
       // Some message data has changed
-      // We could emit dataChanged() so the viewport would be updated...
-      // but this is AGAIN a huge performance cost. Since we don't actually
-      // use the standard painting code nothing will screw up if we don't
-      // emit this signal (I hope.. :D). We just set a flag that will cause
-      // us to update the viewport on exit instead.
-      //
-      // ... hm.. now that I think of it.. what the heck is the meaning of
-      // topLeft and bottomRight parameters of dataChanged() in a tree ?
-      // I guess that it should be always topLeft == bottomRight == itemIndex...
-      // But anyway, the view jumps like crazy when this signal is emitted.
-
-      // QModelIndex idx = index( message, 0 );
-      // emit dataChanged( idx, idx );
-
-      viewportNeedsUpdate = true;
-
       // now we need to handle the changes that might cause re-grouping/re-sorting
       // and propagate them to the parents.
 
@@ -3374,16 +3358,12 @@
         if ( curIndex <= endIndex )
         {
           job->setCurrentIndex( curIndex );
-          if ( viewportNeedsUpdate )
-            mView->viewport()->update();
           return ViewItemJobInterrupted;
         }
       }
     }
   }
 
-  if ( viewportNeedsUpdate )
-    mView->viewport()->update();
   return ViewItemJobCompleted;
 }
 
Index: kmail/messagelistview/core/theme.h
===================================================================
--- kmail/messagelistview/core/theme.h	(revision 1011070)
+++ kmail/messagelistview/core/theme.h	(revision 1011071)
@@ -237,10 +237,6 @@
 
      QFont mFont;                     ///< The font to use with this content item, meaningful only if displaysText() returns true.
      QColor mCustomColor;             ///< The color to use with this content item, meaningful only if canUseCustomColor() return true.
-     // Cache stuff
-     QPaintDevice * mLastPaintDevice; ///< The last paint device that used this content item (this is usually set only once)
-     QFontMetrics mFontMetrics;       ///< Our font metrics cache (kept updated to the last QPaintDevice that uses this ContentItem)
-     int mLineSpacing;                ///< The line spacing in mFontMetrics, this is a value we use a lot (so by caching it we can avoid a function call)
 
   public:
     /**
@@ -437,46 +433,6 @@
     // so for portability we're using a public interface also here.
 
     /**
-     * The last QPaintDevice that made use of this item.
-     * This function is used by ThemeDelegate for QFontMetrics caching purposes.
-     */
-    const QPaintDevice * lastPaintDevice() const
-      { return mLastPaintDevice; };
-
-    /**
-     * Updates the font metrics cache for this item by recreating them
-     * for the currently set font and the specified QPaintDevice.
-     * This function will also reset the font to the KGlobalSettings::generalFont()
-     * if you haven't called setUseCustomFont().
-     * This function is used by ThemeDelegate, you usually don't need to care.
-     */
-    void updateFontMetrics( QPaintDevice * device );
-
-    /**
-     * Returns the cached font metrics attacched to this content item.
-     * The font metrics must be kept up-to-date by the means of the updateFontMetrics()
-     * function whenever the QPaintDevice that this ContentItem is painted
-     * on is different than lastPaintDevice(). This is done by ThemeDelegate
-     * and in fact you shouldn't care.
-     */
-    const QFontMetrics & fontMetrics() const
-      { return mFontMetrics; };
-
-    /**
-     * Returns the cached font metrics line spacing for this content item.
-     * The line spacing is used really often in ThemeDelegate so this
-     * inlineable getter will help the compiler in optimizing stuff.
-     */
-    int lineSpacing() const
-      { return mLineSpacing; };
-
-    /**
-     * Resets the cache of this content item.
-     * This is called by the Theme::Row resetCache() method.
-     */
-    void resetCache();
-
-    /**
      * Handles content item saving (used by Theme::Row::save())
      */
     void save( QDataStream &stream ) const;
@@ -502,7 +458,6 @@
   private:
     QList< ContentItem * > mLeftItems;   ///< The list of left aligned items
     QList< ContentItem * > mRightItems;  ///< The list of right aligned items
-    QSize mSizeHint;                     ///< The size hint for this row: the height is the sufficient minimum, the width is a guess, invalid size when not computed
 
   public:
     /**
@@ -569,19 +524,6 @@
       { mRightItems.removeAll( item ); };
 
     /**
-     * Returns the cached size hint for this row. The returned size is invalid
-     * if no cached size hint has been set yet.
-     */
-    QSize sizeHint() const
-      { return mSizeHint; };
-
-    /**
-     * Sets the cached size hint for this row.
-     */
-    void setSizeHint( const QSize &s )
-      { mSizeHint = s; };
-
-    /**
      * Returns true if this row contains text items.
      * This is useful if you want to know if the column should just get
      * its minimum allowable space or it should get more.
@@ -589,11 +531,6 @@
     bool containsTextItems() const;
 
     /**
-     * Called from the Column's resetCache() method. You shouldn't need to care.
-     */
-    void resetCache();
-
-    /**
      * Handles row saving (used by Theme::Column::save())
      */
     void save( QDataStream &stream ) const;
@@ -712,9 +649,7 @@
     SortOrder::MessageSorting mMessageSorting;        ///< The message sort order we switch to when clicking on this column
     QList< Row * > mGroupHeaderRows;                  ///< The list of rows we display in this column for a GroupHeaderItem
     QList< Row * > mMessageRows;                      ///< The list of rows we display in this column for a MessageItem
-    // cache
-    QSize mGroupHeaderSizeHint;                       ///< The cached size hint for group header rows: invalid if not computed yet
-    QSize mMessageSizeHint;                           ///< The cached size hint for message rows: invalid if not computed yet
+
     SharedRuntimeData * mSharedRuntimeData;           ///< A pointer to the shared runtime data: shared between all instances of a theme with the same id
   public:
     /**
@@ -872,38 +807,6 @@
     bool containsTextItems() const;
 
     /**
-     * This is called by the Theme when it's resetCache() method is called.
-     * You shouldn't need to care about this.
-     */
-    void resetCache();
-
-    /**
-     * Returns the cached size hint for group header rows in this column
-     * or an invalid QSize if the cached size hint hasn't been set yet.
-     */
-    QSize groupHeaderSizeHint() const
-      { return mGroupHeaderSizeHint; };
-
-    /**
-     * Sets the cached size hint for group header rows in this column.
-     */
-    void setGroupHeaderSizeHint( const QSize &sh )
-      { mGroupHeaderSizeHint = sh; };
-
-    /**
-     * Returns the cached size hint for message rows in this column
-     * or an invalid QSize if the cached size hint hasn't been set yet.
-     */
-    QSize messageSizeHint() const
-      { return mMessageSizeHint; };
-
-    /**
-     * Sets the cached size hint for message rows in this column.
-     */
-    void setMessageSizeHint( const QSize &sh )
-      { mMessageSizeHint = sh; };
-
-    /**
      * Handles column saving (used by Theme::save())
      */
     void save( QDataStream &stream ) const;
@@ -1113,14 +1016,6 @@
    */
   static QList< QPair< QString, int > > enumerateViewHeaderPolicyOptions();
 
-  /**
-   * Resets the cache for this theme. This is called by the ThemeDelegate
-   * when the theme is applied and must be called before any changes to this
-   * theme are going to be painted (that is, apply a chunk of changes, call
-   * resetCache() then repaint.
-   */
-  void resetCache();
-
 protected:
   /**
    * Pure virtual reimplemented from OptionSet.
Index: kmail/messagelistview/core/messageitem.h
===================================================================
--- kmail/messagelistview/core/messageitem.h	(revision 1011070)
+++ kmail/messagelistview/core/messageitem.h	(revision 1011071)
@@ -101,6 +101,8 @@
   SignatureState mSignatureState;
   QList< Tag * > * mTagList;        ///< Usually 0....
   QColor mTextColor;                ///< If invalid, use default text color
+  QColor mBackgroundColor;          ///< If invalid, use default background color
+  QFont  mFont;
   unsigned long mUniqueId;          ///< The unique id of this message (serial number of KMMsgBase at the moment of writing)
   
   bool mAboutToBeRemoved;           ///< Set to true when this item is going to be deleted and shouldn't be selectable
@@ -130,9 +132,21 @@
   const QColor & textColor() const
     { return mTextColor; };
 
+  const QColor & backgroundColor() const
+    { return mBackgroundColor; };
+
+  const QFont &font() const
+    { return mFont; }
+
   void setTextColor( const QColor &clr )
     { mTextColor = clr; };
 
+  void setBackgroundColor( const QColor &clr )
+    { mBackgroundColor = clr; };
+
+  void setFont( const QFont &f )
+    { mFont = f; }
+
   SignatureState signatureState() const
     { return mSignatureState; };
 
Index: kmail/messagelistview/core/themeeditor.cpp
===================================================================
--- kmail/messagelistview/core/themeeditor.cpp	(revision 1011070)
+++ kmail/messagelistview/core/themeeditor.cpp	(revision 1011071)
@@ -189,8 +189,8 @@
   drag->exec( Qt::CopyAction, Qt::CopyAction );
 }
 
-ThemePreviewDelegate::ThemePreviewDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice )
-  : ThemeDelegate( parent, paintDevice )
+ThemePreviewDelegate::ThemePreviewDelegate( QAbstractItemView * parent )
+  : ThemeDelegate( parent )
 {
   mRowMapper = new ModelInvariantRowMapper();
 
@@ -263,7 +263,7 @@
   mSelectedThemeColumn = 0;
   mFirstShow = true;
 
-  mDelegate = new ThemePreviewDelegate( this, viewport() );
+  mDelegate = new ThemePreviewDelegate( this );
   setItemDelegate( mDelegate );
   setRootIsDecorated( false );
   viewport()->setAcceptDrops( true );
Index: kmail/messagelistview/core/delegate.cpp
===================================================================
--- kmail/messagelistview/core/delegate.cpp	(revision 1011070)
+++ kmail/messagelistview/core/delegate.cpp	(revision 1011071)
@@ -34,7 +34,7 @@
 {
 
 Delegate::Delegate( View *pParent )
-  : ThemeDelegate( pParent, pParent->viewport() )
+  : ThemeDelegate( pParent )
 {
 }
 
Index: kmail/messagelistview/core/themedelegate.h
===================================================================
--- kmail/messagelistview/core/themedelegate.h	(revision 1011070)
+++ kmail/messagelistview/core/themedelegate.h	(revision 1011071)
@@ -29,7 +29,6 @@
 #include "messagelistview/core/item.h"
 
 class QAbstractItemView;
-class QPaintDevice;
 
 namespace KMail
 {
@@ -49,13 +48,12 @@
 class ThemeDelegate : public QStyledItemDelegate
 {
 public:
-  ThemeDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice );
+  ThemeDelegate( QAbstractItemView * parent );
   ~ThemeDelegate();
 
 private:
   const Theme * mTheme; ///< Shallow pointer to the current theme
   QAbstractItemView * mItemView;
-  QPaintDevice * mPaintDevice;
 
   QColor mGroupHeaderBackgroundColor; // cache
 
@@ -71,6 +69,7 @@
   bool mHitContentItemRight;
   const Theme::ContentItem * mHitContentItem;
   QRect mHitContentItemRect;
+
 public:
   const Theme * theme() const
     { return mTheme; };
@@ -80,7 +79,7 @@
    * Returns a heuristic sizeHint() for the specified item type and column.
    * The hint is based on the contents of the theme (and not of any message or group header).
    */
-  QSize sizeHintForItemTypeAndColumn( Item::Type type, int column ) const;
+  QSize sizeHintForItemTypeAndColumn( Item::Type type, int column, const Item *item = 0) const;
 
   /**
    * Performs a hit test on the specified viewport point.
@@ -195,6 +194,9 @@
   QRect hitContentItemRect() const
     { return mHitContentItemRect; };
 
+  /// return the font to paint given item with, checking global kmail settings and theme settings
+  static QFont itemFont( const Theme::ContentItem *ci, const Item *item );
+
 protected:
   /**
    * Returns the Item for the specified model index. Pure virtual: must be reimplemented
Index: kmail/messagelistview/core/theme.cpp
===================================================================
--- kmail/messagelistview/core/theme.cpp	(revision 1011070)
+++ kmail/messagelistview/core/theme.cpp	(revision 1011071)
@@ -62,7 +62,7 @@
 
 
 Theme::ContentItem::ContentItem( Type type )
-  : mType( type ), mFlags( 0 ), mLastPaintDevice( 0 ), mFontMetrics( QFont() )
+  : mType( type ), mFlags( 0 )
 {
 }
 
@@ -70,10 +70,7 @@
   : mType( src.mType ),
     mFlags( src.mFlags ),
     mFont( src.mFont ),
-    mCustomColor( src.mCustomColor ),
-    mLastPaintDevice( src.mLastPaintDevice ),
-    mFontMetrics( src.mFontMetrics ),
-    mLineSpacing( src.mLineSpacing )
+    mCustomColor( src.mCustomColor )
 {
 }
 
@@ -164,27 +161,11 @@
   return ( static_cast< int >( type ) & ApplicableToGroupHeaderItems );
 }
 
-
-void Theme::ContentItem::updateFontMetrics( QPaintDevice * device )
-{
-  if ( !( mFlags & UseCustomFont ) )
-    mFont = KGlobalSettings::generalFont();
-  mLastPaintDevice = device;
-  mFontMetrics = QFontMetrics( mFont, device );
-  mLineSpacing = mFontMetrics.lineSpacing();
-}
-
 void Theme::ContentItem::setFont( const QFont &font )
 {
   mFont = font;
-  mLastPaintDevice = 0; // will force regeneration of font metrics
 }
 
-void Theme::ContentItem::resetCache()
-{
-  mLastPaintDevice = 0; // will force regeneration of font metrics
-}
-
 void Theme::ContentItem::save( QDataStream &stream ) const
 {
   stream << (int)mType;
@@ -296,15 +277,6 @@
   mRightItems.insert( idx, item );
 }
 
-void Theme::Row::resetCache()
-{
-  mSizeHint = QSize();
-  for ( QList< ContentItem * >::ConstIterator it = mLeftItems.constBegin(); it != mLeftItems.constEnd() ; ++it )
-    ( *it )->resetCache();
-  for ( QList< ContentItem * >::ConstIterator it = mRightItems.constBegin(); it != mRightItems.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::Row::containsTextItems() const
 {
   for ( QList< ContentItem * >::ConstIterator it = mLeftItems.constBegin(); it != mLeftItems.constEnd() ; ++it )
@@ -508,17 +480,6 @@
   mGroupHeaderRows.insert( idx, row );
 }
 
-void Theme::Column::resetCache()
-{
-  mGroupHeaderSizeHint = QSize();
-  mMessageSizeHint = QSize();
-
-  for ( QList< Row * >::ConstIterator it = mMessageRows.constBegin(); it != mMessageRows.constEnd() ; ++it )
-    ( *it )->resetCache();
-  for ( QList< Row * >::ConstIterator it = mGroupHeaderRows.constBegin(); it != mGroupHeaderRows.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::Column::containsTextItems() const
 {
   for ( QList< Row * >::ConstIterator it = mMessageRows.constBegin(); it != mMessageRows.constEnd() ; ++it )
@@ -769,12 +730,6 @@
     mIconSize = gThemeDefaultIconSize;
 }
 
-void Theme::resetCache()
-{
-  for ( QList< Column * >::ConstIterator it = mColumns.constBegin(); it != mColumns.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::load( QDataStream &stream )
 {
   removeAllColumns();
Index: kmail/messagelistview/core/themeeditor.h
===================================================================
--- kmail/messagelistview/core/themeeditor.h	(revision 1011070)
+++ kmail/messagelistview/core/themeeditor.h	(revision 1011071)
@@ -73,7 +73,7 @@
 {
   Q_OBJECT
 public:
-  ThemePreviewDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice );
+  ThemePreviewDelegate( QAbstractItemView * parent );
   ~ThemePreviewDelegate();
 
 private:
Index: kmail/messagelistview/core/themedelegate.cpp
===================================================================
--- kmail/messagelistview/core/themedelegate.cpp	(revision 1011070)
+++ kmail/messagelistview/core/themedelegate.cpp	(revision 1011071)
@@ -31,6 +31,7 @@
 #include <QPixmap>
 #include <QLinearGradient>
 #include <KColorScheme>
+#include <KGlobalSettings>
 
 namespace KMail
 {
@@ -50,11 +51,10 @@
 static const int gHorizontalItemSpacing = 2;
 
 
-ThemeDelegate::ThemeDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice )
+ThemeDelegate::ThemeDelegate( QAbstractItemView * parent )
   : QStyledItemDelegate( parent )
 {
   mItemView = parent;
-  mPaintDevice = paintDevice;
   mTheme = 0;
 }
 
@@ -69,12 +69,6 @@
   if ( !mTheme )
     return; // hum
 
-  // yep..we're violating const here
-  // But most of the QStyledItemDelegate virtual methods are const and expect
-  // const behaviour. So we need the const pointer to avoid compiler complains
-  // but on the other side we're NOT really const... well...
-  const_cast< Theme * >( mTheme )->resetCache();
-
   // Rebuild the group header background color cache
   switch( mTheme->groupHeaderBackgroundMode() )
   {
@@ -104,14 +98,13 @@
 //        about function growth limit reached. Consider using macros
 //        or just convert to member functions.
 
-static inline void paint_right_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir )
+static inline void paint_right_aligned_elided_text( const QString &text, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
-  painter->setFont( ci->font() );
+  painter->setFont( font );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   QRect outRct;
 
   if ( ci->softenByBlending() )
@@ -129,15 +122,14 @@
     left += outRct.width() + gHorizontalItemSpacing;
 }
 
-static inline void compute_bounding_rect_for_right_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir )
+static inline void compute_bounding_rect_for_right_aligned_elided_text( const QString &text, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   Qt::AlignmentFlag af = layoutDir == Qt::LeftToRight ? Qt::AlignRight : Qt::AlignLeft;
-  outRect = ci->fontMetrics().boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
+  outRect = fontMetrics.boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
   if ( layoutDir == Qt::LeftToRight )
     right -= outRect.width() + gHorizontalItemSpacing;
   else
@@ -145,14 +137,13 @@
 }
 
 
-static inline void paint_left_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir )
+static inline void paint_left_aligned_elided_text( const QString &text, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
-  painter->setFont( ci->font() );
+  painter->setFont( font );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   QRect outRct;
   if ( ci->softenByBlending() )
   {
@@ -169,15 +160,14 @@
     right -= outRct.width() + gHorizontalItemSpacing;
 }
 
-static inline void compute_bounding_rect_for_left_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir )
+static inline void compute_bounding_rect_for_left_aligned_elided_text( const QString &text, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   Qt::AlignmentFlag af = layoutDir == Qt::LeftToRight ? Qt::AlignLeft : Qt::AlignRight;
-  outRect = ci->fontMetrics().boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
+  outRect = fontMetrics.boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
   if ( layoutDir == Qt::LeftToRight )
     left += outRect.width() + gHorizontalItemSpacing;
   else
@@ -485,15 +475,15 @@
   }
 }
 
-static inline void compute_size_hint_for_item( Theme::ContentItem * ci, QPaintDevice * pd,
-                                               int &maxh, int &totalw, int iconSize )
+static inline void compute_size_hint_for_item( Theme::ContentItem * ci,
+                                               int &maxh, int &totalw, int iconSize, const Item *item )
 {
   if ( ci->displaysText() )
   {
-    if ( ci->lastPaintDevice() != pd )
-      ci->updateFontMetrics( pd );
-    if ( ci->lineSpacing() > maxh )
-      maxh = ci->lineSpacing();
+    QFont font = ThemeDelegate::itemFont( ci, item );
+    QFontMetrics fontMetrics( font );
+    if ( fontMetrics.height() > maxh )
+      maxh = fontMetrics.height();
     totalw += ci->displaysLongText() ? 128 : 64;
     return;
   }
@@ -520,7 +510,7 @@
   totalw += gHorizontalItemSpacing;
 }
 
-static inline void compute_size_hint_for_row( const Theme::Row * r, QPaintDevice * pd, int iconSize )
+static inline QSize compute_size_hint_for_row( const Theme::Row * r, int iconSize, const Item *item )
 {
   int maxh = 8; // at least 8 pixels for a pixmap
   int totalw = 0;
@@ -530,15 +520,15 @@
   QList< Theme::ContentItem * >::ConstIterator itemit;
 
   for ( itemit = items->begin(); itemit != items->end() ; ++itemit )
-    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), pd, maxh, totalw, iconSize );
+    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), maxh, totalw, iconSize, item );
 
   // then left aligned stuff
   items = &( r->leftItems() );
 
   for ( itemit = items->begin(); itemit != items->end() ; ++itemit )
-    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), pd, maxh, totalw, iconSize );
+    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), maxh, totalw, iconSize, item );
 
-  const_cast< Theme::Row * >( r )->setSizeHint( QSize( totalw, maxh ) );
+  return QSize( totalw, maxh );
 }
 
 void ThemeDelegate::paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const
@@ -555,6 +545,13 @@
 
   opt.text.clear(); // draw no text for me, please.. I'll do it in a while
 
+  // Set background color of control if necessary
+  if ( item->type() == Item::Message ) {
+    MessageItem * msgItem = static_cast< MessageItem * >( item );
+    if ( msgItem->backgroundColor().isValid() )
+      opt.backgroundBrush = QBrush( msgItem->backgroundColor() );
+  }
+
   QStyle * style = mItemView->style();
   style->drawControl( QStyle::CE_ItemViewItem, &opt, painter, mItemView );
 
@@ -806,12 +803,7 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    QSize rowSizeHint = ( *rowit )->sizeHint();
-    if ( !rowSizeHint.isValid() )
-    {
-      compute_size_hint_for_row( ( *rowit ), mPaintDevice, mTheme->iconSize() );
-      rowSizeHint = ( *rowit )->sizeHint();
-    }
+    QSize rowSizeHint = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), item );
 
     int bottom = top + rowSizeHint.height();
 
@@ -848,32 +840,34 @@
           painter->setPen( defaultPen );
       } // otherwise setting a pen is useless at this time
 
+      QFont font = itemFont( ci, item );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          paint_right_aligned_elided_text( item->subject(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->subject(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          paint_right_aligned_elided_text( item->senderOrReceiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->senderOrReceiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          paint_right_aligned_elided_text( item->receiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->receiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          paint_right_aligned_elided_text( item->sender(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->sender(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          paint_right_aligned_elided_text( item->formattedDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          paint_right_aligned_elided_text( item->formattedMaxDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedMaxDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          paint_right_aligned_elided_text( item->formattedSize(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedSize(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            paint_right_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+            paint_right_aligned_elided_text( groupHeaderItem->label(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
             paint_permanent_icon( get_read_state_icon( item ), ci, painter, l, top, r,
@@ -1001,32 +995,34 @@
         }
       } // otherwise setting a pen is useless at this time
 
+      QFont font = itemFont( ci, item );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          paint_left_aligned_elided_text( item->subject(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->subject(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          paint_left_aligned_elided_text( item->senderOrReceiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->senderOrReceiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          paint_left_aligned_elided_text( item->receiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->receiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          paint_left_aligned_elided_text( item->sender(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->sender(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          paint_left_aligned_elided_text( item->formattedDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          paint_left_aligned_elided_text( item->formattedMaxDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedMaxDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          paint_left_aligned_elided_text( item->formattedSize(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedSize(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            paint_left_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+            paint_left_aligned_elided_text( groupHeaderItem->label(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
             paint_permanent_icon( get_read_state_icon( item ), ci, painter, l, top, r,
@@ -1203,12 +1199,7 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    QSize rowSizeHint = ( *rowit )->sizeHint();
-    if ( !rowSizeHint.isValid() )
-    {
-      compute_size_hint_for_row( ( *rowit ), mPaintDevice, mTheme->iconSize() );
-      rowSizeHint = ( *rowit )->sizeHint();
-    }
+    QSize rowSizeHint = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), mHitItem );
 
     if ( ( viewportPoint.y() < top ) && ( rowIdx > 0 ) )
       break; // not this row (tough we should have already found it... probably clicked upper margin)
@@ -1246,32 +1237,34 @@
 
       mHitContentItemRect = QRect();
 
+      QFont font = itemFont( ci, mHitItem );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->subject(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->subject(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->senderOrReceiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->senderOrReceiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->receiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->receiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->sender(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->sender(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedMaxDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedMaxDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedSize(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedSize(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            compute_bounding_rect_for_right_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+            compute_bounding_rect_for_right_aligned_elided_text( groupHeaderItem->label(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
           compute_bounding_rect_for_permanent_icon( ci, l, top, r, mHitContentItemRect, layoutDir == Qt::LeftToRight, mTheme->iconSize() );
@@ -1387,32 +1380,34 @@
 
       mHitContentItemRect = QRect();
 
+      QFont font = itemFont( ci, mHitItem );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->subject(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->subject(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->senderOrReceiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->senderOrReceiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->receiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->receiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->sender(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->sender(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedMaxDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedMaxDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedSize(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedSize(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            compute_bounding_rect_for_left_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+            compute_bounding_rect_for_left_aligned_elided_text( groupHeaderItem->label(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
           compute_bounding_rect_for_permanent_icon( ci, l, top, r, mHitContentItemRect, layoutDir != Qt::LeftToRight, mTheme->iconSize() );
@@ -1527,7 +1522,7 @@
   return true;
 }
 
-QSize ThemeDelegate::sizeHintForItemTypeAndColumn( Item::Type type, int column ) const
+QSize ThemeDelegate::sizeHintForItemTypeAndColumn( Item::Type type, int column, const Item *item ) const
 {
   if ( !mTheme )
     return QSize( 16, 16 ); // bleah
@@ -1547,9 +1542,6 @@
   {
     case Item::Message:
     {
-      QSize cached = skcolumn->messageSizeHint();
-      if ( cached.isValid() )
-        return cached;
       rows = &( skcolumn->messageRows() );
 
       marginh = gMessageVerticalMargin << 1;
@@ -1558,9 +1550,6 @@
     break;
     case Item::GroupHeader:
     {
-      QSize cached = skcolumn->groupHeaderSizeHint();
-      if ( cached.isValid() )
-        return cached;
       rows = &( skcolumn->groupHeaderRows() );
 
       marginh = ( gGroupHeaderOuterVerticalMargin + gGroupHeaderInnerVerticalMargin ) << 1;
@@ -1577,34 +1566,15 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    compute_size_hint_for_row( *rowit, mPaintDevice, mTheme->iconSize() );
-
-    QSize sh = ( *rowit )->sizeHint();
+    QSize sh = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), item );
     totalh += sh.height();
     if ( sh.width() > maxw )
       maxw = sh.width();
   }
 
-  QSize ret( maxw + marginw , totalh + marginh );
-
-  // cache it
-  switch ( type )
-  {
-    case Item::Message:
-      const_cast< Theme::Column * >( skcolumn )->setMessageSizeHint( ret );
-    break;
-    case Item::GroupHeader:
-      const_cast< Theme::Column * >( skcolumn )->setGroupHeaderSizeHint( ret );
-    break;
-    default:
-      // make gcc happy
-    break;
-  }
-
-  return ret;
+  return QSize( maxw + marginw , totalh + marginh );
 }
 
-
 QSize ThemeDelegate::sizeHint( const QStyleOptionViewItem &, const QModelIndex & index ) const
 {
   if ( !mTheme )
@@ -1619,9 +1589,20 @@
 
   //Item::Type type = item->type();
 
-  return sizeHintForItemTypeAndColumn( item->type(), index.column() );
+  return sizeHintForItemTypeAndColumn( item->type(), index.column(), item );
 }
 
+QFont ThemeDelegate::itemFont( const Theme::ContentItem *ci, const Item *item )
+{
+  if ( ci && ci->useCustomFont() )
+    return ci->font();
+
+  if ( item && ( item->type() == Item::Message ) )
+    return static_cast< const MessageItem * >( item )->font();
+
+  return KGlobalSettings::generalFont();
+}
+
 } // namespace Core
 
 } // namespace MessageListView
Index: kmail/messagelistview/storagemodel.h
===================================================================
--- kmail/messagelistview/storagemodel.h	(revision 1011070)
+++ kmail/messagelistview/storagemodel.h	(revision 1011071)
@@ -28,10 +28,11 @@
 class KMMsgBase;
 
 #include <QColor>
+#include <QFont>
 
 namespace KPIM
 {
-	class MessageStatus;
+  class MessageStatus;
 }
 
 namespace KMail
@@ -65,6 +66,13 @@
   QColor mColorUnreadMessage;
   QColor mColorImportantMessage;
   QColor mColorToDoMessage;
+
+  QFont mFont;
+  QFont mFontNewMessage;
+  QFont mFontUnreadMessage;
+  QFont mFontImportantMessage;
+  QFont mFontToDoMessage;
+
 public:
 
   // When porting to Akonadi the stuff below will be simply killed as it serves
@@ -239,6 +247,11 @@
    */
   void slotMessageHeaderChanged( KMFolder *folder, int idx );
 
+private:
+  /**
+    *  set MessageItem's color and font, etc. to reflect given mail message's state
+    */
+  void setMessageItemData( Core::MessageItem * mi, KMMsgBase * msg ) const;
 };
 
 } // namespace MessageListView


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- kdepim.spec	11 Aug 2009 14:30:58 -0000	1.215
+++ kdepim.spec	20 Aug 2009 14:33:25 -0000	1.216
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,12 +15,15 @@ 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
+## upstream 
+# https://bugs.kde.org/show_bug.cgi?id=178402
+Patch100: kmail-fonts-4.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Upgrade path
 %if 0%{?fedora} < 12
@@ -85,7 +88,6 @@ Install %{name}-devel if you want to wri
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
@@ -95,10 +97,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-
-# omit conflict with oxygen-icons, working on a better long-term fix with
-# oxygen folk to get all the icons/temporary stuff out of kdepim
-rm -fv icons/temporary/ox16-status-meeting-organizer.png
+%patch100 -p0 -b .kmail-fonts
 
 
 %build
@@ -217,6 +216,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- kmail: upstream fix for custom font settings (#kdebug#178402)
+
 * Tue Aug 11 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix kmail default save dir regression (#496988)
 



From rdieter at fedoraproject.org  Thu Aug 20 14:33:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 14:33:50 +0000 (UTC)
Subject: rpms/kdepim/F-11 kmail-fonts-4.3.patch, NONE, 1.1 kdepim.spec, 1.221,
	1.222
Message-ID: <20090820143350.76C3611C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25694

Modified Files:
	kdepim.spec 
Added Files:
	kmail-fonts-4.3.patch 
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
- kmail: upstream fix for custom font settings (#kdebug#178402)


kmail-fonts-4.3.patch:
 core/delegate.cpp      |    2 
 core/messageitem.h     |   14 ++
 core/model.cpp         |   24 -----
 core/theme.cpp         |   49 ----------
 core/theme.h           |  107 ----------------------
 core/themedelegate.cpp |  211 ++++++++++++++++++++------------------------
 core/themedelegate.h   |   10 +-
 core/themeeditor.cpp   |    6 -
 core/themeeditor.h     |    2 
 storagemodel.cpp       |  232 +++++++++++++++++++++----------------------------
 storagemodel.h         |   15 ++-
 11 files changed, 241 insertions(+), 431 deletions(-)

--- NEW FILE kmail-fonts-4.3.patch ---
Index: kmail/messagelistview/storagemodel.cpp
===================================================================
--- kmail/messagelistview/storagemodel.cpp	(revision 1011070)
+++ kmail/messagelistview/storagemodel.cpp	(revision 1011071)
@@ -154,6 +154,21 @@
     mColorToDoMessage = config.readEntry( "TodoMessage", mColorToDoMessage );
   }
 
+  if ( GlobalSettings::self()->useDefaultFonts() )
+  {
+    mFont = mFontImportantMessage = mFontNewMessage = mFontUnreadMessage =
+      mFontToDoMessage = KGlobalSettings::generalFont();
+  }
+  else
+  {
+    KConfigGroup fonts( KMKernel::config(), "Fonts" );
+    mFont = fonts.readEntry( "list-font",  KGlobalSettings::generalFont() );
+
+    mFontImportantMessage = fonts.readEntry( "list-important-font", mFont );
+    mFontNewMessage       = fonts.readEntry( "list-new-font",       mFont );
+    mFontUnreadMessage    = fonts.readEntry( "list-unread-font",    mFont );
+    mFontToDoMessage      = fonts.readEntry( "list-toact-font",     mFont );
+  }
 }
 
 StorageModel::~StorageModel()
@@ -290,46 +305,15 @@
   return mFolder->whoField().toLower() == "to";
 }
 
-bool StorageModel::initializeMessageItem( Core::MessageItem * mi, int row, bool bUseReceiver ) const
+/**
+ * Uses the KMMsgBase to fill a list of tags. It also picks out
+ * the colors the message should use.
+ */
+QList< Core::MessageItem::Tag * > * fillTagList( KMMsgBase * msg,
+    QColor & textColor, QColor & backgroundColor )
 {
-  KMMsgBase * msg = mFolder->getMsgBase( row );
-  if ( !msg )
-    return false;
-
-  QString sender = msg->fromStrip();
-  QString receiver = msg->toStrip();
-
-  // Static for speed reasons
-  static const QString noSubject = i18nc( "displayed as subject when the subject of a mail is empty", "No Subject" );
-  static const QString unknown( i18nc( "displayed when a mail has unknown sender, receiver or date", "Unknown" ) );
-
-  if ( sender.isEmpty() )
-    sender = unknown;
-  if ( receiver.isEmpty() )
-    receiver = unknown;
-
-  mi->initialSetup(
-      msg->date(),
-      mFolder->folderType() == KMFolderTypeImap ? msg->msgSizeServer() : msg->msgSize(),
-      sender, receiver,
-      bUseReceiver ? receiver : sender
-    );
-
-  mi->setUniqueId( msg->getMsgSerNum() );
-
-  KPIM::MessageStatus stat = msg->messageStatus();
-
-  QString subject = msg->subject();
-  if ( subject.isEmpty() )
-    subject = '(' + noSubject + ')';
-  mi->setSubjectAndStatus(
-      subject,
-      stat
-    );
-
-  QColor clr;
-
   // FIXME: Tags should be sorted by priority!
+  QList< Core::MessageItem::Tag * > * tagList = 0;
 
   if ( msg->tagList() )
   {
@@ -337,15 +321,16 @@
     {
       int bestPriority = -0xfffff;
 
-      QList< Core::MessageItem::Tag * > * tagList = new QList< Core::MessageItem::Tag * >();
+      tagList = new QList< Core::MessageItem::Tag * >();
       for ( KMMessageTagList::Iterator it = msg->tagList()->begin(); it != msg->tagList()->end(); ++it )
       {
         const KMMessageTagDescription * description = kmkernel->msgTagMgr()->find( *it );
         if ( description )
         {
-          if ( ( bestPriority < description->priority() ) || ( !clr.isValid() ) )
+          if ( ( bestPriority < description->priority() ) || ( !textColor.isValid() ) )
           {
-            clr = description->textColor();
+            textColor = description->textColor();
+            backgroundColor = description->backgroundColor();
             bestPriority = description->priority();
           }
 
@@ -358,14 +343,18 @@
         }
       }
       if ( tagList->isEmpty() )
+      {
         delete tagList;
-      else
-        mi->setTagList( tagList );
+        tagList = 0;
+      }
     }
   }
 
+  return tagList;
+}
 
-
+static void setMessageItemEncryptionState( Core::MessageItem * mi, KMMsgBase * msg )
+{
   switch ( msg->encryptionState() )
   {
     case KMMsgFullyEncrypted:
@@ -375,13 +364,17 @@
       mi->setEncryptionState( Core::MessageItem::PartiallyEncrypted );
     break;
     case KMMsgEncryptionStateUnknown:
+    case KMMsgEncryptionProblematic:
       mi->setEncryptionState( Core::MessageItem::EncryptionStateUnknown );
     break;
     default:
       mi->setEncryptionState( Core::MessageItem::NotEncrypted );
     break;
   }
+}
 
+static void setMessageItemSignatureState( Core::MessageItem * mi, KMMsgBase * msg )
+{
   switch ( msg->signatureState() )
   {
     case KMMsgFullySigned:
@@ -391,28 +384,51 @@
       mi->setSignatureState( Core::MessageItem::PartiallySigned );
     break;
     case KMMsgSignatureStateUnknown:
+    case KMMsgSignatureProblematic:
       mi->setSignatureState( Core::MessageItem::SignatureStateUnknown );
     break;
     default:
       mi->setSignatureState( Core::MessageItem::NotSigned );
     break;
   }
+}
 
-  if ( !clr.isValid() )
-  {
-    if ( stat.isNew() )
-      clr = mColorNewMessage;
-    else if ( stat.isUnread() )
-      clr = mColorUnreadMessage;
-    else if ( stat.isImportant() )
-      clr = mColorImportantMessage;
-    else if ( stat.isToAct() )
-      clr = mColorToDoMessage;
-  }
+bool StorageModel::initializeMessageItem( Core::MessageItem * mi, int row, bool bUseReceiver ) const
+{
+  KMMsgBase * msg = mFolder->getMsgBase( row );
+  if ( !msg )
+    return false;
 
-  if ( clr.isValid() )
-    mi->setTextColor( clr );
+  QString sender = msg->fromStrip();
+  QString receiver = msg->toStrip();
 
+  // Static for speed reasons
+  static const QString noSubject = i18nc( "displayed as subject when the subject of a mail is empty", "No Subject" );
+  static const QString unknown( i18nc( "displayed when a mail has unknown sender, receiver or date", "Unknown" ) );
+
+  if ( sender.isEmpty() )
+    sender = unknown;
+  if ( receiver.isEmpty() )
+    receiver = unknown;
+
+  mi->initialSetup(
+      msg->date(),
+      mFolder->folderType() == KMFolderTypeImap ? msg->msgSizeServer() : msg->msgSize(),
+      sender, receiver,
+      bUseReceiver ? receiver : sender
+    );
+
+  mi->setUniqueId( msg->getMsgSerNum() );
+
+  KPIM::MessageStatus stat = msg->messageStatus();
+
+  QString subject = msg->subject();
+  if ( subject.isEmpty() )
+    subject = '(' + noSubject + ')';
+  mi->setSubjectAndStatus( subject, stat );
+
+  setMessageItemData( mi, msg );
+
   return true;
 }
 
@@ -429,99 +445,53 @@
     mi->recomputeMaxDate();
   }
 
-  QColor clr;
-
   KPIM::MessageStatus stat = msg->messageStatus();
 
   mi->setStatus( stat );
 
-  switch ( msg->encryptionState() )
-  {
-    case KMMsgFullyEncrypted:
-      mi->setEncryptionState( Core::MessageItem::FullyEncrypted );
-    break;
-    case KMMsgPartiallyEncrypted:
-      mi->setEncryptionState( Core::MessageItem::PartiallyEncrypted );
-    break;
-    case KMMsgEncryptionStateUnknown:
-    case KMMsgEncryptionProblematic:
-      mi->setEncryptionState( Core::MessageItem::EncryptionStateUnknown );
-    break;
-    default:
-      mi->setEncryptionState( Core::MessageItem::NotEncrypted );
-    break;
-  }
+  setMessageItemData( mi, msg );
+}
 
-  switch ( msg->signatureState() )
-  {
-    case KMMsgFullySigned:
-      mi->setSignatureState( Core::MessageItem::FullySigned );
-    break;
-    case KMMsgPartiallySigned:
-      mi->setSignatureState( Core::MessageItem::PartiallySigned );
-    break;
-    case KMMsgSignatureStateUnknown:
-    case KMMsgSignatureProblematic:
-      mi->setSignatureState( Core::MessageItem::SignatureStateUnknown );
-    break;
-    default:
-      mi->setSignatureState( Core::MessageItem::NotSigned );
-    break;
-  }
+void StorageModel::setMessageItemData( Core::MessageItem * mi, KMMsgBase * msg ) const
+{
+  setMessageItemEncryptionState( mi, msg );
+  setMessageItemSignatureState( mi, msg );
 
-  QList< Core::MessageItem::Tag * > * tagList = 0;
-
-  if ( msg->tagList() )
-  {
-    if ( !msg->tagList()->isEmpty() )
-    {
-      int bestPriority = -0xfffff;
-
-      tagList = new QList< Core::MessageItem::Tag * >();
-      for ( KMMessageTagList::Iterator it = msg->tagList()->begin(); it != msg->tagList()->end(); ++it )
-      {
-        const KMMessageTagDescription * description = kmkernel->msgTagMgr()->find( *it );
-        if ( description )
-        {
-          if ( ( bestPriority < description->priority() ) || ( !clr.isValid() ) )
-          {
-            clr = description->textColor();
-            bestPriority = description->priority();
-          }
-
-          Core::MessageItem::Tag * tag;
-          if ( description->toolbarIconName().isEmpty() )
-            tag = new Core::MessageItem::Tag( SmallIcon( "feed-subscribe" ), description->name(), *it );
-          else
-            tag = new Core::MessageItem::Tag( SmallIcon( description->toolbarIconName() ), description->name(), *it );
-          tagList->append( tag );
-        }
-      }
-      if ( tagList->isEmpty() )
-      {
-        delete tagList;
-        tagList = 0;
-      }
-    }
-  }
-
+  QColor clr;
+  QColor backClr;
+  QList< Core::MessageItem::Tag * > * tagList;
+  tagList = fillTagList( msg, clr, backClr );
   mi->setTagList( tagList );
 
+  KPIM::MessageStatus stat = msg->messageStatus();
+
   if ( !clr.isValid() )
   {
-    if ( stat.isNew() )
+    // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+    if ( stat.isImportant() )
+      clr = mColorImportantMessage;
+    else if ( stat.isNew() )
       clr = mColorNewMessage;
     else if ( stat.isUnread() )
       clr = mColorUnreadMessage;
-    else if ( stat.isImportant() )
-      clr = mColorImportantMessage;
     else if ( stat.isToAct() )
       clr = mColorToDoMessage;
   }
 
   mi->setTextColor( clr ); // set even if invalid (->default color)
+  mi->setBackgroundColor( backClr );
 
-  // FIXME: Handle MDN State ?
+  // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
+  if ( stat.isImportant() )
+    mi->setFont( mFontImportantMessage );
+  else if ( stat.isNew() )
+    mi->setFont( mFontNewMessage );
+  else if ( stat.isUnread() )
+    mi->setFont( mFontUnreadMessage );
+  else if ( stat.isToAct() )
+    mi->setFont( mFontToDoMessage );
+  else
+    mi->setFont( mFont );
 }
 
 void StorageModel::fillMessageItemThreadingData( Core::MessageItem * mi, int row, ThreadingDataSubset subset ) const
Index: kmail/messagelistview/core/model.cpp
===================================================================
--- kmail/messagelistview/core/model.cpp	(revision 1011070)
+++ kmail/messagelistview/core/model.cpp	(revision 1011071)
@@ -3237,8 +3237,6 @@
   // The end index of our work.
   int endIndex = job->endIndex();
 
-  bool viewportNeedsUpdate = false;
-
   while( curIndex <= endIndex )
   {
     // Get the underlying storage message data...
@@ -3269,6 +3267,8 @@
 
     // Do update
     mStorageModel->updateMessageItemData( message, row );
+    QModelIndex idx = index( message, 0 );
+    emit dataChanged( idx, idx );
 
     // Reinsert the item to the cache, if needed
     if( mAggregation->threading() == Aggregation::PerfectReferencesAndSubject )
@@ -3289,22 +3289,6 @@
     if ( propertyChangeMask )
     {
       // Some message data has changed
-      // We could emit dataChanged() so the viewport would be updated...
-      // but this is AGAIN a huge performance cost. Since we don't actually
-      // use the standard painting code nothing will screw up if we don't
-      // emit this signal (I hope.. :D). We just set a flag that will cause
-      // us to update the viewport on exit instead.
-      //
-      // ... hm.. now that I think of it.. what the heck is the meaning of
-      // topLeft and bottomRight parameters of dataChanged() in a tree ?
-      // I guess that it should be always topLeft == bottomRight == itemIndex...
-      // But anyway, the view jumps like crazy when this signal is emitted.
-
-      // QModelIndex idx = index( message, 0 );
-      // emit dataChanged( idx, idx );
-
-      viewportNeedsUpdate = true;
-
       // now we need to handle the changes that might cause re-grouping/re-sorting
       // and propagate them to the parents.
 
@@ -3374,16 +3358,12 @@
         if ( curIndex <= endIndex )
         {
           job->setCurrentIndex( curIndex );
-          if ( viewportNeedsUpdate )
-            mView->viewport()->update();
           return ViewItemJobInterrupted;
         }
       }
     }
   }
 
-  if ( viewportNeedsUpdate )
-    mView->viewport()->update();
   return ViewItemJobCompleted;
 }
 
Index: kmail/messagelistview/core/theme.h
===================================================================
--- kmail/messagelistview/core/theme.h	(revision 1011070)
+++ kmail/messagelistview/core/theme.h	(revision 1011071)
@@ -237,10 +237,6 @@
 
      QFont mFont;                     ///< The font to use with this content item, meaningful only if displaysText() returns true.
      QColor mCustomColor;             ///< The color to use with this content item, meaningful only if canUseCustomColor() return true.
-     // Cache stuff
-     QPaintDevice * mLastPaintDevice; ///< The last paint device that used this content item (this is usually set only once)
-     QFontMetrics mFontMetrics;       ///< Our font metrics cache (kept updated to the last QPaintDevice that uses this ContentItem)
-     int mLineSpacing;                ///< The line spacing in mFontMetrics, this is a value we use a lot (so by caching it we can avoid a function call)
 
   public:
     /**
@@ -437,46 +433,6 @@
     // so for portability we're using a public interface also here.
 
     /**
-     * The last QPaintDevice that made use of this item.
-     * This function is used by ThemeDelegate for QFontMetrics caching purposes.
-     */
-    const QPaintDevice * lastPaintDevice() const
-      { return mLastPaintDevice; };
-
-    /**
-     * Updates the font metrics cache for this item by recreating them
-     * for the currently set font and the specified QPaintDevice.
-     * This function will also reset the font to the KGlobalSettings::generalFont()
-     * if you haven't called setUseCustomFont().
-     * This function is used by ThemeDelegate, you usually don't need to care.
-     */
-    void updateFontMetrics( QPaintDevice * device );
-
-    /**
-     * Returns the cached font metrics attacched to this content item.
-     * The font metrics must be kept up-to-date by the means of the updateFontMetrics()
-     * function whenever the QPaintDevice that this ContentItem is painted
-     * on is different than lastPaintDevice(). This is done by ThemeDelegate
-     * and in fact you shouldn't care.
-     */
-    const QFontMetrics & fontMetrics() const
-      { return mFontMetrics; };
-
-    /**
-     * Returns the cached font metrics line spacing for this content item.
-     * The line spacing is used really often in ThemeDelegate so this
-     * inlineable getter will help the compiler in optimizing stuff.
-     */
-    int lineSpacing() const
-      { return mLineSpacing; };
-
-    /**
-     * Resets the cache of this content item.
-     * This is called by the Theme::Row resetCache() method.
-     */
-    void resetCache();
-
-    /**
      * Handles content item saving (used by Theme::Row::save())
      */
     void save( QDataStream &stream ) const;
@@ -502,7 +458,6 @@
   private:
     QList< ContentItem * > mLeftItems;   ///< The list of left aligned items
     QList< ContentItem * > mRightItems;  ///< The list of right aligned items
-    QSize mSizeHint;                     ///< The size hint for this row: the height is the sufficient minimum, the width is a guess, invalid size when not computed
 
   public:
     /**
@@ -569,19 +524,6 @@
       { mRightItems.removeAll( item ); };
 
     /**
-     * Returns the cached size hint for this row. The returned size is invalid
-     * if no cached size hint has been set yet.
-     */
-    QSize sizeHint() const
-      { return mSizeHint; };
-
-    /**
-     * Sets the cached size hint for this row.
-     */
-    void setSizeHint( const QSize &s )
-      { mSizeHint = s; };
-
-    /**
      * Returns true if this row contains text items.
      * This is useful if you want to know if the column should just get
      * its minimum allowable space or it should get more.
@@ -589,11 +531,6 @@
     bool containsTextItems() const;
 
     /**
-     * Called from the Column's resetCache() method. You shouldn't need to care.
-     */
-    void resetCache();
-
-    /**
      * Handles row saving (used by Theme::Column::save())
      */
     void save( QDataStream &stream ) const;
@@ -712,9 +649,7 @@
     SortOrder::MessageSorting mMessageSorting;        ///< The message sort order we switch to when clicking on this column
     QList< Row * > mGroupHeaderRows;                  ///< The list of rows we display in this column for a GroupHeaderItem
     QList< Row * > mMessageRows;                      ///< The list of rows we display in this column for a MessageItem
-    // cache
-    QSize mGroupHeaderSizeHint;                       ///< The cached size hint for group header rows: invalid if not computed yet
-    QSize mMessageSizeHint;                           ///< The cached size hint for message rows: invalid if not computed yet
+
     SharedRuntimeData * mSharedRuntimeData;           ///< A pointer to the shared runtime data: shared between all instances of a theme with the same id
   public:
     /**
@@ -872,38 +807,6 @@
     bool containsTextItems() const;
 
     /**
-     * This is called by the Theme when it's resetCache() method is called.
-     * You shouldn't need to care about this.
-     */
-    void resetCache();
-
-    /**
-     * Returns the cached size hint for group header rows in this column
-     * or an invalid QSize if the cached size hint hasn't been set yet.
-     */
-    QSize groupHeaderSizeHint() const
-      { return mGroupHeaderSizeHint; };
-
-    /**
-     * Sets the cached size hint for group header rows in this column.
-     */
-    void setGroupHeaderSizeHint( const QSize &sh )
-      { mGroupHeaderSizeHint = sh; };
-
-    /**
-     * Returns the cached size hint for message rows in this column
-     * or an invalid QSize if the cached size hint hasn't been set yet.
-     */
-    QSize messageSizeHint() const
-      { return mMessageSizeHint; };
-
-    /**
-     * Sets the cached size hint for message rows in this column.
-     */
-    void setMessageSizeHint( const QSize &sh )
-      { mMessageSizeHint = sh; };
-
-    /**
      * Handles column saving (used by Theme::save())
      */
     void save( QDataStream &stream ) const;
@@ -1113,14 +1016,6 @@
    */
   static QList< QPair< QString, int > > enumerateViewHeaderPolicyOptions();
 
-  /**
-   * Resets the cache for this theme. This is called by the ThemeDelegate
-   * when the theme is applied and must be called before any changes to this
-   * theme are going to be painted (that is, apply a chunk of changes, call
-   * resetCache() then repaint.
-   */
-  void resetCache();
-
 protected:
   /**
    * Pure virtual reimplemented from OptionSet.
Index: kmail/messagelistview/core/messageitem.h
===================================================================
--- kmail/messagelistview/core/messageitem.h	(revision 1011070)
+++ kmail/messagelistview/core/messageitem.h	(revision 1011071)
@@ -101,6 +101,8 @@
   SignatureState mSignatureState;
   QList< Tag * > * mTagList;        ///< Usually 0....
   QColor mTextColor;                ///< If invalid, use default text color
+  QColor mBackgroundColor;          ///< If invalid, use default background color
+  QFont  mFont;
   unsigned long mUniqueId;          ///< The unique id of this message (serial number of KMMsgBase at the moment of writing)
   
   bool mAboutToBeRemoved;           ///< Set to true when this item is going to be deleted and shouldn't be selectable
@@ -130,9 +132,21 @@
   const QColor & textColor() const
     { return mTextColor; };
 
+  const QColor & backgroundColor() const
+    { return mBackgroundColor; };
+
+  const QFont &font() const
+    { return mFont; }
+
   void setTextColor( const QColor &clr )
     { mTextColor = clr; };
 
+  void setBackgroundColor( const QColor &clr )
+    { mBackgroundColor = clr; };
+
+  void setFont( const QFont &f )
+    { mFont = f; }
+
   SignatureState signatureState() const
     { return mSignatureState; };
 
Index: kmail/messagelistview/core/themeeditor.cpp
===================================================================
--- kmail/messagelistview/core/themeeditor.cpp	(revision 1011070)
+++ kmail/messagelistview/core/themeeditor.cpp	(revision 1011071)
@@ -189,8 +189,8 @@
   drag->exec( Qt::CopyAction, Qt::CopyAction );
 }
 
-ThemePreviewDelegate::ThemePreviewDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice )
-  : ThemeDelegate( parent, paintDevice )
+ThemePreviewDelegate::ThemePreviewDelegate( QAbstractItemView * parent )
+  : ThemeDelegate( parent )
 {
   mRowMapper = new ModelInvariantRowMapper();
 
@@ -263,7 +263,7 @@
   mSelectedThemeColumn = 0;
   mFirstShow = true;
 
-  mDelegate = new ThemePreviewDelegate( this, viewport() );
+  mDelegate = new ThemePreviewDelegate( this );
   setItemDelegate( mDelegate );
   setRootIsDecorated( false );
   viewport()->setAcceptDrops( true );
Index: kmail/messagelistview/core/delegate.cpp
===================================================================
--- kmail/messagelistview/core/delegate.cpp	(revision 1011070)
+++ kmail/messagelistview/core/delegate.cpp	(revision 1011071)
@@ -34,7 +34,7 @@
 {
 
 Delegate::Delegate( View *pParent )
-  : ThemeDelegate( pParent, pParent->viewport() )
+  : ThemeDelegate( pParent )
 {
 }
 
Index: kmail/messagelistview/core/themedelegate.h
===================================================================
--- kmail/messagelistview/core/themedelegate.h	(revision 1011070)
+++ kmail/messagelistview/core/themedelegate.h	(revision 1011071)
@@ -29,7 +29,6 @@
 #include "messagelistview/core/item.h"
 
 class QAbstractItemView;
-class QPaintDevice;
 
 namespace KMail
 {
@@ -49,13 +48,12 @@
 class ThemeDelegate : public QStyledItemDelegate
 {
 public:
-  ThemeDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice );
+  ThemeDelegate( QAbstractItemView * parent );
   ~ThemeDelegate();
 
 private:
   const Theme * mTheme; ///< Shallow pointer to the current theme
   QAbstractItemView * mItemView;
-  QPaintDevice * mPaintDevice;
 
   QColor mGroupHeaderBackgroundColor; // cache
 
@@ -71,6 +69,7 @@
   bool mHitContentItemRight;
   const Theme::ContentItem * mHitContentItem;
   QRect mHitContentItemRect;
+
 public:
   const Theme * theme() const
     { return mTheme; };
@@ -80,7 +79,7 @@
    * Returns a heuristic sizeHint() for the specified item type and column.
    * The hint is based on the contents of the theme (and not of any message or group header).
    */
-  QSize sizeHintForItemTypeAndColumn( Item::Type type, int column ) const;
+  QSize sizeHintForItemTypeAndColumn( Item::Type type, int column, const Item *item = 0) const;
 
   /**
    * Performs a hit test on the specified viewport point.
@@ -195,6 +194,9 @@
   QRect hitContentItemRect() const
     { return mHitContentItemRect; };
 
+  /// return the font to paint given item with, checking global kmail settings and theme settings
+  static QFont itemFont( const Theme::ContentItem *ci, const Item *item );
+
 protected:
   /**
    * Returns the Item for the specified model index. Pure virtual: must be reimplemented
Index: kmail/messagelistview/core/theme.cpp
===================================================================
--- kmail/messagelistview/core/theme.cpp	(revision 1011070)
+++ kmail/messagelistview/core/theme.cpp	(revision 1011071)
@@ -62,7 +62,7 @@
 
 
 Theme::ContentItem::ContentItem( Type type )
-  : mType( type ), mFlags( 0 ), mLastPaintDevice( 0 ), mFontMetrics( QFont() )
+  : mType( type ), mFlags( 0 )
 {
 }
 
@@ -70,10 +70,7 @@
   : mType( src.mType ),
     mFlags( src.mFlags ),
     mFont( src.mFont ),
-    mCustomColor( src.mCustomColor ),
-    mLastPaintDevice( src.mLastPaintDevice ),
-    mFontMetrics( src.mFontMetrics ),
-    mLineSpacing( src.mLineSpacing )
+    mCustomColor( src.mCustomColor )
 {
 }
 
@@ -164,27 +161,11 @@
   return ( static_cast< int >( type ) & ApplicableToGroupHeaderItems );
 }
 
-
-void Theme::ContentItem::updateFontMetrics( QPaintDevice * device )
-{
-  if ( !( mFlags & UseCustomFont ) )
-    mFont = KGlobalSettings::generalFont();
-  mLastPaintDevice = device;
-  mFontMetrics = QFontMetrics( mFont, device );
-  mLineSpacing = mFontMetrics.lineSpacing();
-}
-
 void Theme::ContentItem::setFont( const QFont &font )
 {
   mFont = font;
-  mLastPaintDevice = 0; // will force regeneration of font metrics
 }
 
-void Theme::ContentItem::resetCache()
-{
-  mLastPaintDevice = 0; // will force regeneration of font metrics
-}
-
 void Theme::ContentItem::save( QDataStream &stream ) const
 {
   stream << (int)mType;
@@ -296,15 +277,6 @@
   mRightItems.insert( idx, item );
 }
 
-void Theme::Row::resetCache()
-{
-  mSizeHint = QSize();
-  for ( QList< ContentItem * >::ConstIterator it = mLeftItems.constBegin(); it != mLeftItems.constEnd() ; ++it )
-    ( *it )->resetCache();
-  for ( QList< ContentItem * >::ConstIterator it = mRightItems.constBegin(); it != mRightItems.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::Row::containsTextItems() const
 {
   for ( QList< ContentItem * >::ConstIterator it = mLeftItems.constBegin(); it != mLeftItems.constEnd() ; ++it )
@@ -508,17 +480,6 @@
   mGroupHeaderRows.insert( idx, row );
 }
 
-void Theme::Column::resetCache()
-{
-  mGroupHeaderSizeHint = QSize();
-  mMessageSizeHint = QSize();
-
-  for ( QList< Row * >::ConstIterator it = mMessageRows.constBegin(); it != mMessageRows.constEnd() ; ++it )
-    ( *it )->resetCache();
-  for ( QList< Row * >::ConstIterator it = mGroupHeaderRows.constBegin(); it != mGroupHeaderRows.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::Column::containsTextItems() const
 {
   for ( QList< Row * >::ConstIterator it = mMessageRows.constBegin(); it != mMessageRows.constEnd() ; ++it )
@@ -769,12 +730,6 @@
     mIconSize = gThemeDefaultIconSize;
 }
 
-void Theme::resetCache()
-{
-  for ( QList< Column * >::ConstIterator it = mColumns.constBegin(); it != mColumns.constEnd() ; ++it )
-    ( *it )->resetCache();
-}
-
 bool Theme::load( QDataStream &stream )
 {
   removeAllColumns();
Index: kmail/messagelistview/core/themeeditor.h
===================================================================
--- kmail/messagelistview/core/themeeditor.h	(revision 1011070)
+++ kmail/messagelistview/core/themeeditor.h	(revision 1011071)
@@ -73,7 +73,7 @@
 {
   Q_OBJECT
 public:
-  ThemePreviewDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice );
+  ThemePreviewDelegate( QAbstractItemView * parent );
   ~ThemePreviewDelegate();
 
 private:
Index: kmail/messagelistview/core/themedelegate.cpp
===================================================================
--- kmail/messagelistview/core/themedelegate.cpp	(revision 1011070)
+++ kmail/messagelistview/core/themedelegate.cpp	(revision 1011071)
@@ -31,6 +31,7 @@
 #include <QPixmap>
 #include <QLinearGradient>
 #include <KColorScheme>
+#include <KGlobalSettings>
 
 namespace KMail
 {
@@ -50,11 +51,10 @@
 static const int gHorizontalItemSpacing = 2;
 
 
-ThemeDelegate::ThemeDelegate( QAbstractItemView * parent, QPaintDevice * paintDevice )
+ThemeDelegate::ThemeDelegate( QAbstractItemView * parent )
   : QStyledItemDelegate( parent )
 {
   mItemView = parent;
-  mPaintDevice = paintDevice;
   mTheme = 0;
 }
 
@@ -69,12 +69,6 @@
   if ( !mTheme )
     return; // hum
 
-  // yep..we're violating const here
-  // But most of the QStyledItemDelegate virtual methods are const and expect
-  // const behaviour. So we need the const pointer to avoid compiler complains
-  // but on the other side we're NOT really const... well...
-  const_cast< Theme * >( mTheme )->resetCache();
-
   // Rebuild the group header background color cache
   switch( mTheme->groupHeaderBackgroundMode() )
   {
@@ -104,14 +98,13 @@
 //        about function growth limit reached. Consider using macros
 //        or just convert to member functions.
 
-static inline void paint_right_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir )
+static inline void paint_right_aligned_elided_text( const QString &text, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
-  painter->setFont( ci->font() );
+  painter->setFont( font );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   QRect outRct;
 
   if ( ci->softenByBlending() )
@@ -129,15 +122,14 @@
     left += outRct.width() + gHorizontalItemSpacing;
 }
 
-static inline void compute_bounding_rect_for_right_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir )
+static inline void compute_bounding_rect_for_right_aligned_elided_text( const QString &text, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideLeft : Qt::ElideRight, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   Qt::AlignmentFlag af = layoutDir == Qt::LeftToRight ? Qt::AlignRight : Qt::AlignLeft;
-  outRect = ci->fontMetrics().boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
+  outRect = fontMetrics.boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
   if ( layoutDir == Qt::LeftToRight )
     right -= outRect.width() + gHorizontalItemSpacing;
   else
@@ -145,14 +137,13 @@
 }
 
 
-static inline void paint_left_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir )
+static inline void paint_left_aligned_elided_text( const QString &text, Theme::ContentItem * ci, QPainter * painter, int &left, int top, int &right, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
-  painter->setFont( ci->font() );
+  painter->setFont( font );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   QRect outRct;
   if ( ci->softenByBlending() )
   {
@@ -169,15 +160,14 @@
     right -= outRct.width() + gHorizontalItemSpacing;
 }
 
-static inline void compute_bounding_rect_for_left_aligned_elided_text( const QString &text, QPaintDevice * pd, Theme::ContentItem * ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir )
+static inline void compute_bounding_rect_for_left_aligned_elided_text( const QString &text, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font )
 {
-  if ( ci->lastPaintDevice() != pd )
-    ci->updateFontMetrics( pd );
+  QFontMetrics fontMetrics( font );
   int w = right - left;
-  QString elidedText = ci->fontMetrics().elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
-  QRect rct( left, top, w, ci->lineSpacing() );
+  QString elidedText = fontMetrics.elidedText( text, layoutDir == Qt::LeftToRight ? Qt::ElideRight : Qt::ElideLeft, w );
+  QRect rct( left, top, w, fontMetrics.height() );
   Qt::AlignmentFlag af = layoutDir == Qt::LeftToRight ? Qt::AlignLeft : Qt::AlignRight;
-  outRect = ci->fontMetrics().boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
+  outRect = fontMetrics.boundingRect( rct, Qt::AlignTop | af | Qt::TextSingleLine, elidedText );
   if ( layoutDir == Qt::LeftToRight )
     left += outRect.width() + gHorizontalItemSpacing;
   else
@@ -485,15 +475,15 @@
   }
 }
 
-static inline void compute_size_hint_for_item( Theme::ContentItem * ci, QPaintDevice * pd,
-                                               int &maxh, int &totalw, int iconSize )
+static inline void compute_size_hint_for_item( Theme::ContentItem * ci,
+                                               int &maxh, int &totalw, int iconSize, const Item *item )
 {
   if ( ci->displaysText() )
   {
-    if ( ci->lastPaintDevice() != pd )
-      ci->updateFontMetrics( pd );
-    if ( ci->lineSpacing() > maxh )
-      maxh = ci->lineSpacing();
+    QFont font = ThemeDelegate::itemFont( ci, item );
+    QFontMetrics fontMetrics( font );
+    if ( fontMetrics.height() > maxh )
+      maxh = fontMetrics.height();
     totalw += ci->displaysLongText() ? 128 : 64;
     return;
   }
@@ -520,7 +510,7 @@
   totalw += gHorizontalItemSpacing;
 }
 
-static inline void compute_size_hint_for_row( const Theme::Row * r, QPaintDevice * pd, int iconSize )
+static inline QSize compute_size_hint_for_row( const Theme::Row * r, int iconSize, const Item *item )
 {
   int maxh = 8; // at least 8 pixels for a pixmap
   int totalw = 0;
@@ -530,15 +520,15 @@
   QList< Theme::ContentItem * >::ConstIterator itemit;
 
   for ( itemit = items->begin(); itemit != items->end() ; ++itemit )
-    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), pd, maxh, totalw, iconSize );
+    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), maxh, totalw, iconSize, item );
 
   // then left aligned stuff
   items = &( r->leftItems() );
 
   for ( itemit = items->begin(); itemit != items->end() ; ++itemit )
-    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), pd, maxh, totalw, iconSize );
+    compute_size_hint_for_item( const_cast< Theme::ContentItem * >( *itemit ), maxh, totalw, iconSize, item );
 
-  const_cast< Theme::Row * >( r )->setSizeHint( QSize( totalw, maxh ) );
+  return QSize( totalw, maxh );
 }
 
 void ThemeDelegate::paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const
@@ -555,6 +545,13 @@
 
   opt.text.clear(); // draw no text for me, please.. I'll do it in a while
 
+  // Set background color of control if necessary
+  if ( item->type() == Item::Message ) {
+    MessageItem * msgItem = static_cast< MessageItem * >( item );
+    if ( msgItem->backgroundColor().isValid() )
+      opt.backgroundBrush = QBrush( msgItem->backgroundColor() );
+  }
+
   QStyle * style = mItemView->style();
   style->drawControl( QStyle::CE_ItemViewItem, &opt, painter, mItemView );
 
@@ -806,12 +803,7 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    QSize rowSizeHint = ( *rowit )->sizeHint();
-    if ( !rowSizeHint.isValid() )
-    {
-      compute_size_hint_for_row( ( *rowit ), mPaintDevice, mTheme->iconSize() );
-      rowSizeHint = ( *rowit )->sizeHint();
-    }
+    QSize rowSizeHint = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), item );
 
     int bottom = top + rowSizeHint.height();
 
@@ -848,32 +840,34 @@
           painter->setPen( defaultPen );
       } // otherwise setting a pen is useless at this time
 
+      QFont font = itemFont( ci, item );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          paint_right_aligned_elided_text( item->subject(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->subject(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          paint_right_aligned_elided_text( item->senderOrReceiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->senderOrReceiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          paint_right_aligned_elided_text( item->receiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->receiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          paint_right_aligned_elided_text( item->sender(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->sender(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          paint_right_aligned_elided_text( item->formattedDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          paint_right_aligned_elided_text( item->formattedMaxDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedMaxDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          paint_right_aligned_elided_text( item->formattedSize(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_right_aligned_elided_text( item->formattedSize(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            paint_right_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+            paint_right_aligned_elided_text( groupHeaderItem->label(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
             paint_permanent_icon( get_read_state_icon( item ), ci, painter, l, top, r,
@@ -1001,32 +995,34 @@
         }
       } // otherwise setting a pen is useless at this time
 
+      QFont font = itemFont( ci, item );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          paint_left_aligned_elided_text( item->subject(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->subject(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          paint_left_aligned_elided_text( item->senderOrReceiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->senderOrReceiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          paint_left_aligned_elided_text( item->receiver(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->receiver(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          paint_left_aligned_elided_text( item->sender(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->sender(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          paint_left_aligned_elided_text( item->formattedDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          paint_left_aligned_elided_text( item->formattedMaxDate(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedMaxDate(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          paint_left_aligned_elided_text( item->formattedSize(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+          paint_left_aligned_elided_text( item->formattedSize(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            paint_left_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, painter, l, top, r, layoutDir );
+            paint_left_aligned_elided_text( groupHeaderItem->label(), ci, painter, l, top, r, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
             paint_permanent_icon( get_read_state_icon( item ), ci, painter, l, top, r,
@@ -1203,12 +1199,7 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    QSize rowSizeHint = ( *rowit )->sizeHint();
-    if ( !rowSizeHint.isValid() )
-    {
-      compute_size_hint_for_row( ( *rowit ), mPaintDevice, mTheme->iconSize() );
-      rowSizeHint = ( *rowit )->sizeHint();
-    }
+    QSize rowSizeHint = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), mHitItem );
 
     if ( ( viewportPoint.y() < top ) && ( rowIdx > 0 ) )
       break; // not this row (tough we should have already found it... probably clicked upper margin)
@@ -1246,32 +1237,34 @@
 
       mHitContentItemRect = QRect();
 
+      QFont font = itemFont( ci, mHitItem );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->subject(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->subject(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->senderOrReceiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->senderOrReceiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->receiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->receiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->sender(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->sender(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedMaxDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedMaxDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedSize(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_right_aligned_elided_text( mHitItem->formattedSize(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            compute_bounding_rect_for_right_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+            compute_bounding_rect_for_right_aligned_elided_text( groupHeaderItem->label(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
           compute_bounding_rect_for_permanent_icon( ci, l, top, r, mHitContentItemRect, layoutDir == Qt::LeftToRight, mTheme->iconSize() );
@@ -1387,32 +1380,34 @@
 
       mHitContentItemRect = QRect();
 
+      QFont font = itemFont( ci, mHitItem );
+
       switch ( ci->type() )
       {
         case Theme::ContentItem::Subject:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->subject(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->subject(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::SenderOrReceiver:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->senderOrReceiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->senderOrReceiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Receiver:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->receiver(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->receiver(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Sender:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->sender(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->sender(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Date:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::MostRecentDate:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedMaxDate(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedMaxDate(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::Size:
-          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedSize(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+          compute_bounding_rect_for_left_aligned_elided_text( mHitItem->formattedSize(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::GroupHeaderLabel:
           if ( groupHeaderItem )
-            compute_bounding_rect_for_left_aligned_elided_text( groupHeaderItem->label(), mPaintDevice, ci, l, top, r, mHitContentItemRect, layoutDir );
+            compute_bounding_rect_for_left_aligned_elided_text( groupHeaderItem->label(), l, top, r, mHitContentItemRect, layoutDir, font );
         break;
         case Theme::ContentItem::ReadStateIcon:
           compute_bounding_rect_for_permanent_icon( ci, l, top, r, mHitContentItemRect, layoutDir != Qt::LeftToRight, mTheme->iconSize() );
@@ -1527,7 +1522,7 @@
   return true;
 }
 
-QSize ThemeDelegate::sizeHintForItemTypeAndColumn( Item::Type type, int column ) const
+QSize ThemeDelegate::sizeHintForItemTypeAndColumn( Item::Type type, int column, const Item *item ) const
 {
   if ( !mTheme )
     return QSize( 16, 16 ); // bleah
@@ -1547,9 +1542,6 @@
   {
     case Item::Message:
     {
-      QSize cached = skcolumn->messageSizeHint();
-      if ( cached.isValid() )
-        return cached;
       rows = &( skcolumn->messageRows() );
 
       marginh = gMessageVerticalMargin << 1;
@@ -1558,9 +1550,6 @@
     break;
     case Item::GroupHeader:
     {
-      QSize cached = skcolumn->groupHeaderSizeHint();
-      if ( cached.isValid() )
-        return cached;
       rows = &( skcolumn->groupHeaderRows() );
 
       marginh = ( gGroupHeaderOuterVerticalMargin + gGroupHeaderInnerVerticalMargin ) << 1;
@@ -1577,34 +1566,15 @@
 
   for ( QList< Theme::Row * >::ConstIterator rowit = rows->begin(); rowit != rows->end(); ++rowit )
   {
-    compute_size_hint_for_row( *rowit, mPaintDevice, mTheme->iconSize() );
-
-    QSize sh = ( *rowit )->sizeHint();
+    QSize sh = compute_size_hint_for_row( ( *rowit ), mTheme->iconSize(), item );
     totalh += sh.height();
     if ( sh.width() > maxw )
       maxw = sh.width();
   }
 
-  QSize ret( maxw + marginw , totalh + marginh );
-
-  // cache it
-  switch ( type )
-  {
-    case Item::Message:
-      const_cast< Theme::Column * >( skcolumn )->setMessageSizeHint( ret );
-    break;
-    case Item::GroupHeader:
-      const_cast< Theme::Column * >( skcolumn )->setGroupHeaderSizeHint( ret );
-    break;
-    default:
-      // make gcc happy
-    break;
-  }
-
-  return ret;
+  return QSize( maxw + marginw , totalh + marginh );
 }
 
-
 QSize ThemeDelegate::sizeHint( const QStyleOptionViewItem &, const QModelIndex & index ) const
 {
   if ( !mTheme )
@@ -1619,9 +1589,20 @@
 
   //Item::Type type = item->type();
 
-  return sizeHintForItemTypeAndColumn( item->type(), index.column() );
+  return sizeHintForItemTypeAndColumn( item->type(), index.column(), item );
 }
 
+QFont ThemeDelegate::itemFont( const Theme::ContentItem *ci, const Item *item )
+{
+  if ( ci && ci->useCustomFont() )
+    return ci->font();
+
+  if ( item && ( item->type() == Item::Message ) )
+    return static_cast< const MessageItem * >( item )->font();
+
+  return KGlobalSettings::generalFont();
+}
+
 } // namespace Core
 
 } // namespace MessageListView
Index: kmail/messagelistview/storagemodel.h
===================================================================
--- kmail/messagelistview/storagemodel.h	(revision 1011070)
+++ kmail/messagelistview/storagemodel.h	(revision 1011071)
@@ -28,10 +28,11 @@
 class KMMsgBase;
 
 #include <QColor>
+#include <QFont>
 
 namespace KPIM
 {
-	class MessageStatus;
+  class MessageStatus;
 }
 
 namespace KMail
@@ -65,6 +66,13 @@
   QColor mColorUnreadMessage;
   QColor mColorImportantMessage;
   QColor mColorToDoMessage;
+
+  QFont mFont;
+  QFont mFontNewMessage;
+  QFont mFontUnreadMessage;
+  QFont mFontImportantMessage;
+  QFont mFontToDoMessage;
+
 public:
 
   // When porting to Akonadi the stuff below will be simply killed as it serves
@@ -239,6 +247,11 @@
    */
   void slotMessageHeaderChanged( KMFolder *folder, int idx );
 
+private:
+  /**
+    *  set MessageItem's color and font, etc. to reflect given mail message's state
+    */
+  void setMessageItemData( Core::MessageItem * mi, KMMsgBase * msg ) const;
 };
 
 } // namespace MessageListView


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- kdepim.spec	11 Aug 2009 14:30:58 -0000	1.221
+++ kdepim.spec	20 Aug 2009 14:33:50 -0000	1.222
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,12 +15,15 @@ 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
+## upstream 
+# https://bugs.kde.org/show_bug.cgi?id=178402
+Patch100: kmail-fonts-4.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # Upgrade path
 %if 0%{?fedora} < 12
@@ -85,7 +88,6 @@ Install %{name}-devel if you want to wri
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
@@ -95,10 +97,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-
-# omit conflict with oxygen-icons, working on a better long-term fix with
-# oxygen folk to get all the icons/temporary stuff out of kdepim
-rm -fv icons/temporary/ox16-status-meeting-organizer.png
+%patch100 -p0 -b .kmail-fonts
 
 
 %build
@@ -217,6 +216,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- kmail: upstream fix for custom font settings (#kdebug#178402)
+
 * Tue Aug 11 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix kmail default save dir regression (#496988)
 



From pjones at fedoraproject.org  Thu Aug 20 14:34:19 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 20 Aug 2009 14:34:19 +0000 (UTC)
Subject: rpms/grub/devel grub-0.97-use-gnuefi.patch, NONE, 1.1 grub.spec,
	1.106, 1.107
Message-ID: <20090820143419.F34F711C006E@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25880

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-use-gnuefi.patch 
Log Message:
* Thu Aug 20 2009 Peter Jones <pjones at redhat.com> - 0.97-59
- Correctly link against gnuefi.


grub-0.97-use-gnuefi.patch:
 configure.in    |    4 +++-
 efi/Makefile.am |   12 +++++-------
 efi/eficore.c   |   13 +++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

--- NEW FILE grub-0.97-use-gnuefi.patch ---
commit 94c31b2f558bb45ee80f374ceae487e6d737fcb1
Author: Peter Jones <pjones at redhat.com>
Date:   Tue May 6 12:55:40 2008 -0400

    Fix up makesfiles/configure to use gnu-efi versions of setjmp and _relocate.
    Include setjmp/longjmp wrapper until I get a chance to clean up the headers.

diff -urpN grub-0.97/configure.in.gnuefi grub-0.97/configure.in
--- grub-0.97/configure.in.gnuefi	2009-08-20 09:52:01.000000000 -0400
+++ grub-0.97/configure.in	2009-08-20 09:52:45.000000000 -0400
@@ -63,7 +63,7 @@ if test "x$platform" = xefi; then
   AC_SUBST(EFI_ARCH)
 fi
 
-gnuefi_path=/usr/lib/gnuefi
+gnuefi_path=${libdir}/gnuefi
 gnuefi_crt0=${gnuefi_path}/crt0-efi-${EFI_ARCH}.o
 if ! test -f $gnuefi_crt0 ; then
   gnuefi_crt0=crt0-efi.o
@@ -76,6 +76,8 @@ if ! test -f $gnuefi_lds ; then
 fi
 GNUEFI_LDS=${gnuefi_lds}
 AC_SUBST(GNUEFI_LDS)
+LIBGNUEFI=${libdir}/libgnuefi.a
+AC_SUBST(LIBGNUEFI)
 
 AC_SUBST(platform)
 AM_CONDITIONAL(PLATFORM_EFI, test "x$platform" = xefi)
diff -urpN grub-0.97/efi/eficore.c.gnuefi grub-0.97/efi/eficore.c
--- grub-0.97/efi/eficore.c.gnuefi	2009-08-20 09:54:04.000000000 -0400
+++ grub-0.97/efi/eficore.c	2009-08-20 09:54:57.000000000 -0400
@@ -50,6 +50,19 @@ grub_efi_locate_handle_buffer (grub_efi_
 		search_type, protocol, search_key, no_handles, buffer);
 }
 
+/* temporary, until we're using gnu-efi's include files --pjones */
+extern int setjmp(grub_jmp_buf env);
+int grub_setjmp(grub_jmp_buf env)
+{
+	return setjmp(env);
+}
+
+extern void longjmp(grub_jmp_buf env, int val);
+void grub_longjmp(grub_jmp_buf env, int val)
+{
+	longjmp(env, val);
+}
+
 void *
 grub_efi_locate_protocol (grub_efi_guid_t *protocol, void *registration)
 {
diff -urpN grub-0.97/efi/Makefile.am.gnuefi grub-0.97/efi/Makefile.am
--- grub-0.97/efi/Makefile.am.gnuefi	2009-08-20 09:51:41.000000000 -0400
+++ grub-0.97/efi/Makefile.am	2009-08-20 09:53:57.000000000 -0400
@@ -32,8 +32,9 @@ GRUBEFI_FORMAT = efi-app-$(EFI_ARCH)
 GRUBSO_LD_SCRIPT = @GNUEFI_LDS@
 GRUBSO_LD_FLAGS = -T $(GRUBSO_LD_SCRIPT) -nostdlib -shared -Bsymbolic
 
-GRUBSO_OBJS = reloc.o efimain.o @GNUEFI_CRT0@
-GRUBSO_LIBS = $(top_srcdir)/stage2/libstage2.a libgrubefi.a @LIBGCC@
+GRUBSO_OBJS = efimain.o
+GRUBSO_LIBS = @GNUEFI_CRT0@ $(top_srcdir)/stage2/libstage2.a \
+		libgrubefi.a @LIBGCC@
 
 if NETBOOT_SUPPORT
 GRUBSO_LIBS += $(top_srcdir)/netboot/libdrivers.a
@@ -45,7 +46,7 @@ grub.efi: grub.so
 	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
                    -j .rela -j .reloc --target=$(GRUBEFI_FORMAT) $^ $@
 
-grub.so: $(GRUBSO_OBJS) $(GRUBSO_LIBS)
+grub.so: $(GRUBSO_OBJS) $(GRUBSO_LIBS) @LIBGNUEFI@
 	$(LD) -o $@ $(GRUBSO_LD_FLAGS) $^
 	echo '-------------- unresolved symbols ---------------------'
 	! nm $@ | grep -iw u
@@ -57,9 +58,6 @@ crt0-efi.o: $(EFI_ARCH)/crt0-efi.S
 efimain.o: efimain.c
 	$(CC) -o $@ -c $(libgrubefi_a_CFLAGS) $^
 
-reloc.o: $(EFI_ARCH)/reloc.c
-	$(CC) -o $@ -c $(RELOC_FLAGS) $^
-
 clean-local:
 	-rm -rf grub.so grub.efi
 
@@ -70,7 +68,7 @@ RELOC_FLAGS = $(STAGE2_CFLAGS) -I$(top_s
 
 noinst_LIBRARIES = libgrubefi.a
 libgrubefi_a_SOURCES = $(EFI_ARCH)/callwrap.c eficore.c efimm.c efimisc.c \
-	$(EFI_ARCH)/setjmp.S eficon.c efidisk.c graphics.c efigraph.c efiuga.c \
+	eficon.c efidisk.c graphics.c efigraph.c efiuga.c \
 	font_8x16.c efiserial.c $(EFI_ARCH)/loader/linux.c efichainloader.c \
 	xpm.c pxe.c efitftp.c
 libgrubefi_a_CFLAGS = $(RELOC_FLAGS) -nostdinc


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- grub.spec	11 Aug 2009 20:56:43 -0000	1.106
+++ grub.spec	20 Aug 2009 14:34:19 -0000	1.107
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 58%{?dist}
+Release: 59%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -47,6 +47,7 @@ Patch18: grub-ext4-support.patch
 Patch19: grub-0.97-xfs-writable-strings.patch
 Patch20: grub-0.97-partitionable-md.patch
 Patch21: grub-0.97-relocatable-kernel-on-x86_64-uefi.patch
+Patch22: grub-0.97-use-gnuefi.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -78,6 +79,7 @@ systems.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 autoreconf
@@ -139,6 +141,9 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Thu Aug 20 2009 Peter Jones <pjones at redhat.com> - 0.97-59
+- Correctly link against gnuefi.
+
 * Tue Aug 11 2009 Peter Jones <pjones at redhat.com> - 0.97-58
 - Dynamically choose load address for bzimage on 64-bit UEFI.
 



From spot at fedoraproject.org  Thu Aug 20 14:37:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 14:37:46 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.53, 1.54 asymptote.spec, 1.67,
	1.68 sources, 1.53, 1.54
Message-ID: <20090820143746.B1D7F11C006E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26784

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.84


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	17 Aug 2009 18:14:48 -0000	1.53
+++ .cvsignore	20 Aug 2009 14:37:46 -0000	1.54
@@ -1 +1 @@
-asymptote-1.83.src.tgz
+asymptote-1.84.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- asymptote.spec	17 Aug 2009 18:14:49 -0000	1.67
+++ asymptote.spec	20 Aug 2009 14:37:46 -0000	1.68
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.83
+Version:        1.84
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -60,14 +60,17 @@ mv examples/interpolate1.asy{.utf8,}
 %build
 %configure --enable-gc=system --with-docdir=%{_defaultdocdir}/%{name}-%{version}/ --with-latex=%{_texmf}/tex/latex --with-context=%{_texmf}/tex/context/
 make %{?_smp_mflags}
-# cd doc/
-# This isn't working in rawhide at the moment.
-# make asymptote.pdf
+cd doc/
+make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install-asy DESTDIR=$RPM_BUILD_ROOT
 
+pushd doc
+make install DESTDIR=$RPM_BUILD_ROOT mandir=$RPM_BUILD_ROOT%{_mandir}
+popd
+
 install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \
     $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
 
@@ -92,6 +95,9 @@ for vimver in 63 64 70 71 ; do
     ln -s ../../../%{name}/asy.vim .
 done
 
+# Move info file
+mv $RPM_BUILD_ROOT%{_infodir}/asymptote/asymptote.info $RPM_BUILD_ROOT%{_infodir}/asymptote.info
+
 # copy icon to pixmaps dir
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
@@ -131,9 +137,8 @@ fi
 %{_datadir}/%{name}/
 %{texpkgdir}/
 %{_texmf}/tex/context/
-# Doc generation is broken
-# %%{_mandir}/man1/*.1*
-# %%{_infodir}/*.info*
+%{_mandir}/man1/*.1*
+%{_infodir}/*.info*
 %{_datadir}/vim/vim*/syntax/asy.vim
 # Strictly speaking, we shouldn't own these dirs.
 # However, we don't require emacs/xemacs, we just enhance them.
@@ -145,6 +150,9 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.84-1
+- update to 1.84
+
 * Mon Aug 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.83-1
 - update to 1.83
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	17 Aug 2009 18:14:49 -0000	1.53
+++ sources	20 Aug 2009 14:37:46 -0000	1.54
@@ -1 +1 @@
-1f3f0d25cb3ac31313115aee35af6190  asymptote-1.83.src.tgz
+046be32c5d1f84fb3d34e044f0d95e7e  asymptote-1.84.src.tgz



From tmraz at fedoraproject.org  Thu Aug 20 14:41:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 20 Aug 2009 14:41:33 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-fips.patch,1.1,1.2
Message-ID: <20090820144133.98C9011C006E@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27657

Modified Files:
	openssl-1.0.0-beta3-fips.patch 
Log Message:
- add missing semicolon


openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_misc.c        |   13 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   48 +
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   23 
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  101 +++
 crypto/fips/fips_des_selftest.c    |  137 +++++
 crypto/fips/fips_dsa_selftest.c    |  180 +++++++
 crypto/fips/fips_hmac_selftest.c   |  135 +++++
 crypto/fips/fips_rand.c            |  410 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  371 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  432 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   97 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    5 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  158 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |   99 +++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 114 files changed, 9984 insertions(+), 177 deletions(-)

Index: openssl-1.0.0-beta3-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl-1.0.0-beta3-fips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssl-1.0.0-beta3-fips.patch	20 Aug 2009 14:18:42 -0000	1.1
+++ openssl-1.0.0-beta3-fips.patch	20 Aug 2009 14:41:33 -0000	1.2
@@ -10601,7 +10601,7 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
  
  &external_label("OPENSSL_ia32cap_P");
  
-+$setkeyfunc = "RC4_set_key"
++$setkeyfunc = "RC4_set_key";
 +$setkeyfunc = "private_RC4_set_key" if ($ENV{FIPS} ne "");
 +
 +



From notting at fedoraproject.org  Thu Aug 20 14:48:42 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 20 Aug 2009 14:48:42 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.87,1.88
Message-ID: <20090820144842.67F5C11C006E@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30019

Modified Files:
	comps-f12.xml.in 
Log Message:
Move perf to base



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- comps-f12.xml.in	18 Aug 2009 16:01:35 -0000	1.87
+++ comps-f12.xml.in	20 Aug 2009 14:48:42 -0000	1.88
@@ -272,6 +272,7 @@
       <packagereq type="default">pam_pkcs11</packagereq>
       <packagereq type="default">pam_smb</packagereq>
       <packagereq type="default">pcmciautils</packagereq>
+      <packagereq type="default">perf</packagereq>
       <packagereq type="default">pinfo</packagereq>
       <packagereq type="default">pm-utils</packagereq>
       <packagereq type="default">prctl</packagereq>
@@ -800,7 +801,6 @@
            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">perf</packagereq>
       <packagereq type="mandatory">livecd-tools</packagereq>
       <packagereq type="mandatory">mash</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>



From sharkcz at fedoraproject.org  Thu Aug 20 14:48:46 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 20 Aug 2009 14:48:46 +0000 (UTC)
Subject: rpms/scribus/F-11 scribus.spec,1.45,1.46
Message-ID: <20090820144846.C634D11C006E@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30088

Modified Files:
	scribus.spec 
Log Message:
fix source filename


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/scribus.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- scribus.spec	20 Aug 2009 12:05:47 -0000	1.45
+++ scribus.spec	20 Aug 2009 14:48:46 -0000	1.46
@@ -7,7 +7,7 @@ Summary:        DeskTop Publishing appli
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -71,7 +71,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}.rc3
+%setup -q
 
 # recode man page to UTF-8
 pushd scribus/manpages



From sharkcz at fedoraproject.org  Thu Aug 20 14:50:07 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 20 Aug 2009 14:50:07 +0000 (UTC)
Subject: rpms/scribus/F-10 scribus.spec,1.39,1.40
Message-ID: <20090820145007.1873F11C0417@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30456

Modified Files:
	scribus.spec 
Log Message:
fix source filename


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/scribus.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- scribus.spec	20 Aug 2009 12:17:34 -0000	1.39
+++ scribus.spec	20 Aug 2009 14:50:06 -0000	1.40
@@ -7,7 +7,7 @@ Summary:        DeskTop Publishing appli
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -71,7 +71,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}.rc3
+%setup -q
 
 # recode man page to UTF-8
 pushd scribus/manpages



From spot at fedoraproject.org  Thu Aug 20 14:50:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 14:50:27 +0000 (UTC)
Subject: rpms/ntfsprogs/devel ntfsprogs.spec,1.19,1.20
Message-ID: <20090820145027.3626A11C0417@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/ntfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30572

Modified Files:
	ntfsprogs.spec 
Log Message:
rebuild for new libconfig


Index: ntfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfsprogs/devel/ntfsprogs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsprogs.spec	25 Jul 2009 19:38:35 -0000	1.19
+++ ntfsprogs.spec	20 Aug 2009 14:50:26 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		ntfsprogs
 Version:	2.0.0
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	NTFS filesystem libraries and utilities
 Source0:	http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.bz2
 Patch0:		ntfsprogs-2.0.0-build-extras-by-default.patch
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.0-13
+- rebuild for new libconfig
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From limb at fedoraproject.org  Thu Aug 20 14:59:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 20 Aug 2009 14:59:44 +0000 (UTC)
Subject: rpms/apricots/devel apricots.spec,1.3,1.4
Message-ID: <20090820145944.4961C11C006E@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/apricots/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32535

Modified Files:
	apricots.spec 
Log Message:
openal-soft rebuild.



Index: apricots.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apricots/devel/apricots.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- apricots.spec	24 Jul 2009 17:00:01 -0000	1.3
+++ apricots.spec	20 Aug 2009 14:59:44 -0000	1.4
@@ -1,7 +1,7 @@
 %define apricotsdir %{_datadir}/apricots
 Name: apricots
 Version:  0.2.6
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary: 2D air combat game
 
 Group: Amusements/Games
@@ -100,6 +100,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 20 2009 Jon Ciesla <limb at jcomserv.net> - 0.2.6-5
+- Rebuild for openal-soft.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 20 15:08:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 20 Aug 2009 15:08:22 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-fips.patch,1.2,1.3
Message-ID: <20090820150822.1C80E11C006E@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2149

Modified Files:
	openssl-1.0.0-beta3-fips.patch 
Log Message:
- fix camellia compilation with asm and fips


openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/Makefile           |    4 
 crypto/camellia/asm/cmll-x86.pl    |    7 
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_fblk.c        |   68 ++
 crypto/camellia/cmll_misc.c        |    9 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   48 +
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   23 
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  101 +++
 crypto/fips/fips_des_selftest.c    |  137 +++++
 crypto/fips/fips_dsa_selftest.c    |  180 +++++++
 crypto/fips/fips_hmac_selftest.c   |  135 +++++
 crypto/fips/fips_rand.c            |  410 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  371 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  432 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   97 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    5 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  158 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |   99 +++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 117 files changed, 10055 insertions(+), 181 deletions(-)

Index: openssl-1.0.0-beta3-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl-1.0.0-beta3-fips.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openssl-1.0.0-beta3-fips.patch	20 Aug 2009 14:41:33 -0000	1.2
+++ openssl-1.0.0-beta3-fips.patch	20 Aug 2009 15:08:21 -0000	1.3
@@ -393,6 +393,35 @@ diff -up openssl-1.0.0-beta3/crypto/bn/M
  
  SRC= $(LIBSRC)
  
+diff -up openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl.fips openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl
+--- openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl.fips	2009-04-06 16:25:02.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/asm/cmll-x86.pl	2009-08-20 16:54:59.000000000 +0200
+@@ -722,12 +722,15 @@ my $bias=int(@T[0])?shift(@T):0;
+ }
+ &function_end("Camellia_Ekeygen");
+ 
++$setkeyfunc = "Camellia_set_key";
++$setkeyfunc = "private_Camellia_set_key" if ($ENV{FIPS} ne "");
++
+ if ($OPENSSL) {
+ # int Camellia_set_key (
+ #		const unsigned char *userKey,
+ #		int bits,
+ #		CAMELLIA_KEY *key)
+-&function_begin_B("Camellia_set_key");
++&function_begin_B($setkeyfunc);
+ 	&push	("ebx");
+ 	&mov	("ecx",&wparam(0));	# pull arguments
+ 	&mov	("ebx",&wparam(1));
+@@ -760,7 +763,7 @@ if ($OPENSSL) {
+ &set_label("done",4);
+ 	&pop	("ebx");
+ 	&ret	();
+-&function_end_B("Camellia_set_key");
++&function_end_B($setkeyfunc);
+ }
+ 
+ @SBOX=(
 diff -up openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips openssl-1.0.0-beta3/crypto/camellia/camellia.h
 --- openssl-1.0.0-beta3/crypto/camellia/camellia.h.fips	2009-08-11 18:07:29.000000000 +0200
 +++ openssl-1.0.0-beta3/crypto/camellia/camellia.h	2009-08-11 18:07:30.000000000 +0200
@@ -408,10 +437,82 @@ diff -up openssl-1.0.0-beta3/crypto/came
  int Camellia_set_key(const unsigned char *userKey, const int bits,
  	CAMELLIA_KEY *key);
  
+diff -up openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c.fips openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c
+--- openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c.fips	2009-08-20 17:01:56.000000000 +0200
++++ openssl-1.0.0-beta3/crypto/camellia/cmll_fblk.c	2009-08-20 17:03:21.000000000 +0200
+@@ -0,0 +1,68 @@
++/* crypto/camellia/camellia_misc.c -*- mode:C; c-file-style: "eay" -*- */
++/* ====================================================================
++ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. All advertising materials mentioning features or use of this
++ *    software must display the following acknowledgment:
++ *    "This product includes software developed by the OpenSSL Project
++ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
++ *
++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For written permission, please contact
++ *    openssl-core at openssl.org.
++ *
++ * 5. Products derived from this software may not be called "OpenSSL"
++ *    nor may "OpenSSL" appear in their names without prior written
++ *    permission of the OpenSSL Project.
++ *
++ * 6. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by the OpenSSL Project
++ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++ * OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ====================================================================
++ *
++ */
++ 
++#include <openssl/opensslv.h>
++#include <openssl/camellia.h>
++#include "cmll_locl.h"
++#include <openssl/crypto.h>
++#ifdef OPENSSL_FIPS
++#include <openssl/fips.h>
++#endif
++
++#ifdef OPENSSL_FIPS
++int Camellia_set_key(const unsigned char *userKey, const int bits,
++	CAMELLIA_KEY *key)
++	{
++	if (FIPS_mode())
++		FIPS_BAD_ABORT(CAMELLIA)
++	return private_Camellia_set_key(userKey, bits, key);
++	}
++#endif
 diff -up openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c.fips openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c
 --- openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c.fips	2008-10-28 13:13:52.000000000 +0100
-+++ openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c	2009-08-11 18:07:30.000000000 +0200
-@@ -52,11 +52,24 @@
++++ openssl-1.0.0-beta3/crypto/camellia/cmll_misc.c	2009-08-20 17:04:10.000000000 +0200
+@@ -52,11 +52,20 @@
  #include <openssl/opensslv.h>
  #include <openssl/camellia.h>
  #include "cmll_locl.h"
@@ -422,20 +523,31 @@ diff -up openssl-1.0.0-beta3/crypto/came
  
  const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
  
- int Camellia_set_key(const unsigned char *userKey, const int bits,
- 	CAMELLIA_KEY *key)
 +#ifdef OPENSSL_FIPS
-+	{
-+	if (FIPS_mode())
-+		FIPS_BAD_ABORT(CAMELLIA)
-+	return private_Camellia_set_key(userKey, bits, key);
-+	}
 +int private_Camellia_set_key(const unsigned char *userKey, const int bits,
 +	CAMELLIA_KEY *key)
++#else
+ int Camellia_set_key(const unsigned char *userKey, const int bits,
+ 	CAMELLIA_KEY *key)
 +#endif
  	{
  	if(!userKey || !key)
  		return -1;
+diff -up openssl-1.0.0-beta3/crypto/camellia/Makefile.fips openssl-1.0.0-beta3/crypto/camellia/Makefile
+--- openssl-1.0.0-beta3/crypto/camellia/Makefile.fips	2008-12-23 12:33:00.000000000 +0100
++++ openssl-1.0.0-beta3/crypto/camellia/Makefile	2009-08-20 17:02:56.000000000 +0200
+@@ -23,9 +23,9 @@ APPS=
+ 
+ LIB=$(TOP)/libcrypto.a
+ LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \
+-	   cmll_cfb.c cmll_ctr.c 
++	   cmll_cfb.c cmll_ctr.c cmll_fblk.c
+ 
+-LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC)
++LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o cmll_fblk.o $(CMLL_ENC)
+ 
+ SRC= $(LIBSRC)
+ 
 diff -up openssl-1.0.0-beta3/crypto/cast/cast.h.fips openssl-1.0.0-beta3/crypto/cast/cast.h
 --- openssl-1.0.0-beta3/crypto/cast/cast.h.fips	2009-08-11 18:07:29.000000000 +0200
 +++ openssl-1.0.0-beta3/crypto/cast/cast.h	2009-08-11 18:07:30.000000000 +0200



From overholt at fedoraproject.org  Thu Aug 20 15:10:25 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 15:10:25 +0000 (UTC)
Subject: rpms/plexus-classworlds/devel plexus-classworlds.spec,1.2,1.3
Message-ID: <20090820151025.52A3511C0439@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-classworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2898

Modified Files:
	plexus-classworlds.spec 
Log Message:
* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-0.a9.7
- Document sources and patches


Index: plexus-classworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-classworlds/devel/plexus-classworlds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- plexus-classworlds.spec	17 Aug 2009 20:49:55 -0000	1.2
+++ plexus-classworlds.spec	20 Aug 2009 15:10:25 -0000	1.3
@@ -28,13 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+%define with_maven 0
 
 %define parent plexus
 %define subname classworlds
@@ -42,27 +36,27 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.2
-Release:        0.a9.6%{?dist}
+Release:        0.a9.7%{?dist}
 Epoch:          0
 Summary:        Plexus Classworlds Classloader Framework
 License:        ASL 2.0 and Plexus
-Group:          Development/Java
+Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
-# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds
-# tar czf plexus-classworlds-1.0-alpha-9.tar.gz plexus-classworlds/
+# svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-9/ plexus-classworlds-1.2-alpha-9
+# tar czf plexus-classworlds-1.2-alpha-9.tar.gz plexus-classworlds-1.2-alpha-9
 Source0:        %{name}-%{namedversion}-src.tar.gz
 
+# Generated with mvn ant:ant
 Source1:        plexus-classworlds-1.2-build.xml
+# Fedora-specific maven bits
 Source3:        plexus-classworlds-settings.xml
 Source4:        plexus-classworlds-1.2-jpp-depmap.xml
 
+# Add plexus-utils dependency
 Patch0:         plexus-classworlds-1.2-pom_xml.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  ant >= 0:1.6.5
@@ -77,26 +71,15 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire = 2.3
 BuildRequires:  maven-surefire-provider-junit = 2.3
-BuildRequires:	maven-doxia
+BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:	maven-release
-%endif
-BuildRequires:  plexus-utils 
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires:  maven-release
 %endif
+BuildRequires:  plexus-utils
 
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 Classworlds is a framework for container developers
 who require complex manipulation of Java's ClassLoaders.
@@ -109,9 +92,7 @@ classworlds.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -119,7 +100,7 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}-%{namedversion}
 for j in $(find . -name "*.jar" | grep -v /test-data/ | grep -v /test-jars/); do
-        mv $j $j.no
+  mv $j $j.no
 done
 cp %{SOURCE1} build.xml
 cp %{SOURCE3} settings.xml
@@ -133,15 +114,15 @@ ln -sf $(build-classpath commons-logging
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
-# org.codehaus.plexus.classworlds.strategy.StrategyTest fails 
+# org.codehaus.plexus.classworlds.strategy.StrategyTest fails
 # upstream, so ignore failures for now
 
 %if %{with_maven}
 mvn-jpp \
-        -e \
-        -Dmaven.test.failure.ignore=true \
-		-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+  -e \
+  -Dmaven.test.failure.ignore=true \
+  -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+  install javadoc:javadoc
 
 %else
 export CLASSPATH=
@@ -167,48 +148,37 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/%{parent}
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
-%endif
+%doc LICENSE.txt
 
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-0.a9.7
+- Document sources and patches
+
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-0.a9.6
+- Update tarball-building instructions
+- Remove gcj support
+- Remove unnecessary post requirements
+
 * Thu May 14 2009 Fernando Nasser <fnasser at redhat.com> 0:1.2-0.a9.6
 - Fix license specification
 
@@ -220,7 +190,7 @@ fi
 - rebuild with new maven2 2.0.8 built in bootstrap mode
 
 * Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.3jpp.1
-- re-build with maven 
+- re-build with maven
 
 * Tue Jan 06 2009 Yong Yang <yyang at redhat.com> 0:1.2-0.a9.2jpp.1
 - Imported into devel from dbhole's maven 2.0.8 packages



From spot at fedoraproject.org  Thu Aug 20 15:10:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 15:10:52 +0000 (UTC)
Subject: rpms/physfs/devel physfs-1.0.2-fix-soname-version.patch, NONE,
	1.1 physfs.spec, 1.11, 1.12
Message-ID: <20090820151052.32C0711C006E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/physfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3072

Modified Files:
	physfs.spec 
Added Files:
	physfs-1.0.2-fix-soname-version.patch 
Log Message:
fix soname

physfs-1.0.2-fix-soname-version.patch:
 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE physfs-1.0.2-fix-soname-version.patch ---
diff -up physfs-1.0.2/configure.BAD physfs-1.0.2/configure
--- physfs-1.0.2/configure.BAD	2009-08-20 11:08:45.099180071 -0400
+++ physfs-1.0.2/configure	2009-08-20 11:08:48.295180874 -0400
@@ -1975,8 +1975,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 MAJOR_VERSION=1
 MINOR_VERSION=0
 MICRO_VERSION=2
-INTERFACE_AGE=2
-BINARY_AGE=2
+INTERFACE_AGE=1
+BINARY_AGE=1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 


Index: physfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/physfs/devel/physfs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- physfs.spec	20 Aug 2009 01:47:03 -0000	1.11
+++ physfs.spec	20 Aug 2009 15:10:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		physfs
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Summary:	Library to provide abstract access to various archives
@@ -8,6 +8,7 @@ URL:		http://www.icculus.org/physfs/
 Source0:	http://www.icculus.org/physfs/downloads/physfs-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen, zlib-devel, readline-devel, libtool
+Patch0:		physfs-1.0.2-fix-soname-version.patch
 
 %description
 PhysicsFS is a library to provide abstract access to various archives. It is
@@ -37,6 +38,7 @@ packages with physfs functionality.
 
 %prep
 %setup -q
+%patch0 -p1 -b .soname
 
 %build
 %configure
@@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.2-2
+- fix soname to match 1.0.1 (upstream made it go from .1 to .0 ?)
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.2-1
 - update to 1.0.2 (last in 1.0 series)
 



From mlichvar at fedoraproject.org  Thu Aug 20 15:11:12 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 20 Aug 2009 15:11:12 +0000 (UTC)
Subject: rpms/tcpdump/devel tcpdump-4.0.0-droproot.patch, NONE,
	1.1 tcpdump-4.0.0-icmp6msec.patch, NONE,
	1.1 tcpdump-4.0.0-portnumbers.patch, NONE, 1.1 .cvsignore, 1.15,
	1.16 sources, 1.15, 1.16 tcpdump.spec, 1.75,
	1.76 tcpdump-3.9.7-crypto.patch, 1.1,
	NONE tcpdump-3.9.7-droproot.patch, 1.2,
	NONE tcpdump-3.9.8-ikev2.patch, 1.1,
	NONE tcpdump-3.9.8-nosmi.patch, 1.1,
	NONE tcpdump-3.9.8-portnumbers.patch, 1.1, NONE
Message-ID: <20090820151112.6946211C006E@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2723

Modified Files:
	.cvsignore sources tcpdump.spec 
Added Files:
	tcpdump-4.0.0-droproot.patch tcpdump-4.0.0-icmp6msec.patch 
	tcpdump-4.0.0-portnumbers.patch 
Removed Files:
	tcpdump-3.9.7-crypto.patch tcpdump-3.9.7-droproot.patch 
	tcpdump-3.9.8-ikev2.patch tcpdump-3.9.8-nosmi.patch 
	tcpdump-3.9.8-portnumbers.patch 
Log Message:
- update to post 4.0.0 git snapshot 20090818git832d2c
- print retrans and reachable times in ICMPv6 as milliseconds (#474264)


tcpdump-4.0.0-droproot.patch:
 tcpdump.1.in |    7 ++++++-
 tcpdump.c    |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE tcpdump-4.0.0-droproot.patch ---
--- tcpdump-3.9.7/tcpdump.c.droproot	2006-09-19 21:07:57.000000000 +0200
+++ tcpdump-3.9.7/tcpdump.c	2007-07-24 16:15:54.000000000 +0200
@@ -958,6 +958,11 @@ main(int argc, char **argv)
 		(void)setsignal(SIGHUP, oldhandler);
 #endif /* WIN32 */
 
+	if (Cflag != 0 && (getuid() == 0 || geteuid() == 0)) {
+		if (username || chroot_dir)
+			droproot(username, chroot_dir);
+	}
+
 	if (pcap_setfilter(pd, &fcode) < 0)
 		error("%s", pcap_geterr(pd));
 	if (WFileName) {
@@ -999,7 +1004,7 @@ main(int argc, char **argv)
 	 * We cannot do this earlier, because we want to be able to open
 	 * the file (if done) for writing before giving up permissions.
 	 */
-	if (getuid() == 0 || geteuid() == 0) {
+	if (Cflag == 0 && (getuid() == 0 || geteuid() == 0)) {
 		if (username || chroot_dir)
 			droproot(username, chroot_dir);
 	}
--- tcpdump-3.9.7/tcpdump.1.in.droproot	2007-07-24 16:15:54.000000000 +0200
+++ tcpdump-3.9.7/tcpdump.1.in	2007-07-24 16:15:54.000000000 +0200
@@ -264,6 +264,9 @@ have the name specified with the
 flag, with a number after it, starting at 1 and continuing upward.
 The units of \fIfile_size\fP are millions of bytes (1,000,000 bytes,
 not 1,048,576 bytes).
+
+Note that when used with \fB\-Z\fR option (enabled by default), privileges
+are dropped before opening first savefile.
 .TP
 .B \-d
 Dump the compiled packet-matching code in a human readable form to
@@ -592,7 +595,9 @@ Drops privileges (if root) and changes u
 and the group ID to the primary group of
 .IR user .
 .IP
-This behavior can also be enabled by default at compile time.
+This behavior is enabled by default (\fB\-Z tcpdump\fR), and can
+be disabled by \fB\-Z root\fR.
+
 .IP "\fI expression\fP"
 .RS
 selects which packets will be dumped.

tcpdump-4.0.0-icmp6msec.patch:
 print-icmp6.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tcpdump-4.0.0-icmp6msec.patch ---
diff -up tcpdump/print-icmp6.c.icmp6msec tcpdump/print-icmp6.c
--- tcpdump/print-icmp6.c.icmp6msec	2009-08-19 00:02:37.000000000 +0200
+++ tcpdump/print-icmp6.c	2009-08-20 16:33:59.000000000 +0200
@@ -397,7 +397,7 @@ icmp6_print(const u_char *bp, u_int leng
 			p = (struct nd_router_advert *)dp;
 			TCHECK(p->nd_ra_retransmit);
 			printf("\n\thop limit %u, Flags [%s]" \
-                               ", pref %s, router lifetime %us, reachable time %us, retrans time %us",
+                               ", pref %s, router lifetime %us, reachable time %ums, retrans time %ums",
                                (u_int)p->nd_ra_curhoplimit,
                                bittok2str(icmp6_opt_ra_flag_values,"none",(p->nd_ra_flags_reserved)),
                                get_rtpref(p->nd_ra_flags_reserved),

tcpdump-4.0.0-portnumbers.patch:
 addrtoname.c |    4 ++--
 tcpdump.1    |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE tcpdump-4.0.0-portnumbers.patch ---
diff -up tcpdump-3.9.8/addrtoname.c.portnumbers tcpdump-3.9.8/addrtoname.c
--- tcpdump-3.9.8/addrtoname.c.portnumbers	2007-09-26 03:59:52.000000000 +0200
+++ tcpdump-3.9.8/addrtoname.c	2008-08-29 13:53:12.000000000 +0200
@@ -704,7 +704,7 @@ init_servarray(void)
 
 		while (table->name)
 			table = table->nxt;
-		if (nflag) {
+		if (nflag > 1) {
 			(void)snprintf(buf, sizeof(buf), "%d", port);
 			table->name = strdup(buf);
 		} else
@@ -1104,7 +1104,7 @@ init_addrtoname(u_int32_t localnet, u_in
 		f_localnet = localnet;
 		f_netmask = mask;
 	}
-	if (nflag)
+	if (nflag > 1)
 		/*
 		 * Simplest way to suppress names.
 		 */
diff -up tcpdump-3.9.8/tcpdump.1.portnumbers tcpdump-3.9.8/tcpdump.1
--- tcpdump-3.9.8/tcpdump.1.in.portnumbers	2008-08-29 13:53:12.000000000 +0200
+++ tcpdump-3.9.8/tcpdump.1.in	2008-08-29 13:53:12.000000000 +0200
@@ -403,7 +403,11 @@ Use \fIsecret\fP as a shared secret for 
 TCP segments with the TCP-MD5 option (RFC 2385), if present.
 .TP
 .B \-n
-Don't convert addresses (i.e., host addresses, port numbers, etc.) to names.
+Don't convert host addresses to names.  This can be used to avoid 
+DNS lookups.
+.TP
+.B \-nn
+Don't convert protocol and port numbers etc. to names either.  
 .TP
 .B \-N
 Don't print domain name qualification of host names.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Oct 2007 16:39:01 -0000	1.15
+++ .cvsignore	20 Aug 2009 15:11:11 -0000	1.16
@@ -1,2 +1,2 @@
 tcpslice-1.2a3.tar.gz
-tcpdump-3.9.8.tar.gz
+tcpdump-4.0.0-20090818git832d2c.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Oct 2007 16:39:01 -0000	1.15
+++ sources	20 Aug 2009 15:11:11 -0000	1.16
@@ -1,2 +1,2 @@
 e329cbeb7e589f132d92c3447c477190  tcpslice-1.2a3.tar.gz
-c491a78c52fe73f1f7271aa5d8c6ab2e  tcpdump-3.9.8.tar.gz
+4875284ec22ec84e42fba34d4ce6f20c  tcpdump-4.0.0-20090818git832d2c.tar.gz


Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- tcpdump.spec	27 Jul 2009 05:39:23 -0000	1.75
+++ tcpdump.spec	20 Aug 2009 15:11:12 -0000	1.76
@@ -1,8 +1,8 @@
 Summary: A network traffic monitoring tool
 Name: tcpdump
 Epoch: 14
-Version: 3.9.8
-Release: 9%{?dist}
+Version: 4.0.0
+Release: 1.20090818git832d2c%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -11,16 +11,16 @@ BuildRequires: openssl-devel libpcap-dev
 BuildRequires: automake
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
+#Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
+# git snapshot from git://bpf.tcpdump.org/tcpdump
+Source0: tcpdump-4.0.0-20090818git832d2c.tar.gz
 Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
-Patch1: tcpdump-3.9.7-droproot.patch
-Patch2: tcpdump-3.9.8-portnumbers.patch
-Patch3: tcpdump-3.9.7-crypto.patch
-Patch4: tcpdump-3.9.8-ikev2.patch
+Patch1: tcpdump-4.0.0-droproot.patch
+Patch2: tcpdump-4.0.0-portnumbers.patch
+Patch3: tcpdump-4.0.0-icmp6msec.patch
 Patch5: tcpslice-1.2a3-time.patch
 Patch6: tcpslice-CVS.20010207-bpf.patch
 Patch7: tcpdump-3.9.8-gethostby.patch
-Patch8: tcpdump-3.9.8-nosmi.patch
 
 %define tcpslice_dir tcpslice-1.2a3
 
@@ -33,14 +33,12 @@ the packet headers, or just the ones tha
 Install tcpdump if you need a program to monitor network traffic.
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -n tcpdump
 
 %patch1 -p1 -b .droproot
 %patch2 -p1 -b .portnumbers
-%patch3 -p1 -b .crypto
-%patch4 -p1 -b .ikev2
+%patch3 -p1 -b .icmp6msec
 %patch7 -p1 -b .gethostby
-%patch8 -p1 -b .nosmi
 
 pushd %{tcpslice_dir}
 %patch5 -p1 -b .time
@@ -49,11 +47,6 @@ popd
 
 find . -name '*.c' -o -name '*.h' | xargs chmod 644
 
-for f in CREDITS; do
-	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
-		touch -r ${f}{,_} && mv -f ${f}{_,}
-done
-
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -fno-strict-aliasing"
 
@@ -64,7 +57,7 @@ automake -a -f 2> /dev/null || :
 make %{?_smp_mflags}
 popd
 
-%configure --with-user=tcpdump
+%configure --with-crypto --with-user=tcpdump --without-smi
 make %{?_smp_mflags}
 
 %install
@@ -103,6 +96,10 @@ exit 0
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Thu Aug 20 2009 Miroslav Lichvar <mlichvar at redhat.com> - 14:4.0.0-1.20090818git832d2c
+- update to post 4.0.0 git snapshot 20090818git832d2c
+- print retrans and reachable times in ICMPv6 as milliseconds (#474264)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14:3.9.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- tcpdump-3.9.7-crypto.patch DELETED ---


--- tcpdump-3.9.7-droproot.patch DELETED ---


--- tcpdump-3.9.8-ikev2.patch DELETED ---


--- tcpdump-3.9.8-nosmi.patch DELETED ---


--- tcpdump-3.9.8-portnumbers.patch DELETED ---



From overholt at fedoraproject.org  Thu Aug 20 15:11:49 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 15:11:49 +0000 (UTC)
Subject: rpms/plexus-classworlds/devel plexus-classworlds.spec,1.3,1.4
Message-ID: <20090820151149.D146511C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-classworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3407

Modified Files:
	plexus-classworlds.spec 
Log Message:
Bump release


Index: plexus-classworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-classworlds/devel/plexus-classworlds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- plexus-classworlds.spec	20 Aug 2009 15:10:25 -0000	1.3
+++ plexus-classworlds.spec	20 Aug 2009 15:11:49 -0000	1.4
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.2
-Release:        0.a9.7%{?dist}
+Release:        0.a9.8%{?dist}
 Epoch:          0
 Summary:        Plexus Classworlds Classloader Framework
 License:        ASL 2.0 and Plexus
@@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-0.a9.8
+- Bump release.
+
 * Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-0.a9.7
 - Document sources and patches
 



From limb at fedoraproject.org  Thu Aug 20 15:14:40 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 20 Aug 2009 15:14:40 +0000 (UTC)
Subject: rpms/netpanzer/devel netpanzer.spec,1.11,1.12
Message-ID: <20090820151440.DB5BC11C006E@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/netpanzer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4025

Modified Files:
	netpanzer.spec 
Log Message:
rebuild for openal-soft.



Index: netpanzer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/devel/netpanzer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- netpanzer.spec	25 Jul 2009 19:13:30 -0000	1.11
+++ netpanzer.spec	20 Aug 2009 15:14:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           netpanzer
 Version:        0.8.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        An Online Multiplayer Tactical Warfare Game
 
 Group:          Amusements/Games
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpanzer
 
 %changelog
+* Thu Aug 20 2009 Jon Ciesla <limb at jcomserv.net> 0.8.2-7
+- Rebuild for openal-soft.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Thu Aug 20 15:19:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 20 Aug 2009 15:19:20 +0000 (UTC)
Subject: rpms/perl-Alien-wxWidgets/devel perl-Alien-wxWidgets-SONAME.patch, 
	NONE, 1.1 .cvsignore, 1.13, 1.14 perl-Alien-wxWidgets.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <20090820151920.AEDC311C006E@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5698

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Added Files:
	perl-Alien-wxWidgets-SONAME.patch 
Log Message:
- new upstream version
- add patch to remember the canonical sonames of libraries, so that
  perl-Wx runs without wxGTK-devel

perl-Alien-wxWidgets-SONAME.patch:
 Any_wx_config_Bakefile.pm |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE perl-Alien-wxWidgets-SONAME.patch ---
2009-08-20  Stepan Kasal  <skasal at redhat.com>
	
	* inc/My/Build/Any_wx_config_Bakefile.pm: convert the lib*.so
	file name to the canonical name (soname); the *.so symlink
	usually belongs to package *-devel and may not be available at
	runtime.

--- Alien-wxWidgets-0.42/inc/My/Build/Any_wx_config_Bakefile.pm.orig	2008-11-08 00:52:22.000000000 +0100
+++ Alien-wxWidgets-0.42/inc/My/Build/Any_wx_config_Bakefile.pm	2009-08-20 15:51:52.000000000 +0200
@@ -32,6 +32,17 @@
                               && $lib =~ m/(?:gtk2?|mac)[ud]{0,2}-/;
         my $dll = "lib${name}." . $self->awx_dlext;
 
+	open PIPE1, "ldconfig -p |";
+	while (<PIPE1>) {
+		if (s/^\s+${dll}\s(.*\s)?=>\s+//) {
+			for (`objdump -p $_`) {
+				if (s/^\s+SONAME\s+//) { chomp; $dll = $_; }
+			}
+			last;
+		}
+	}
+	close PIPE1;
+
         $data{dlls}{$key} = { dll  => $dll,
                               link => $lib };
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	8 Dec 2008 21:18:58 -0000	1.13
+++ .cvsignore	20 Aug 2009 15:19:20 -0000	1.14
@@ -1 +1 @@
-Alien-wxWidgets-0.42.tar.gz
+Alien-wxWidgets-0.44.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Alien-wxWidgets.spec	26 Jul 2009 01:35:58 -0000	1.21
+++ perl-Alien-wxWidgets.spec	20 Aug 2009 15:19:20 -0000	1.22
@@ -1,14 +1,17 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.42
-Release:        3%{?dist}
+Version:        0.44
+Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Alien-wxWidgets/
-Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		perl-Alien-wxWidgets-SONAME.patch
+
 BuildRequires:  wxGTK-devel
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::Pluggable)
@@ -26,6 +29,7 @@ settings from an installed wxWidgets.
 
 %prep
 %setup -q -n Alien-wxWidgets-%{version}
+%patch0 -p1
 
 
 %build
@@ -55,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.44-1
+- new upstream version
+- add patch to remember the canonical sonames of libraries, so that
+  perl-Wx runs without wxGTK-devel
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.42-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	8 Dec 2008 21:18:58 -0000	1.13
+++ sources	20 Aug 2009 15:19:20 -0000	1.14
@@ -1 +1 @@
-f96c09d393bc8b4cbd7ff8e412183032  Alien-wxWidgets-0.42.tar.gz
+eccb39521c346aa64348f1eff08be5e0  Alien-wxWidgets-0.44.tar.gz



From pbrobinson at fedoraproject.org  Thu Aug 20 15:22:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 20 Aug 2009 15:22:39 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.3, 1.4 mutter-moblin.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090820152239.648A911C006E@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6541

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.34.3 upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 13:38:37 -0000	1.3
+++ .cvsignore	20 Aug 2009 15:22:39 -0000	1.4
@@ -1 +1 @@
-mutter-moblin-0.34.2.tar.bz2
+mutter-moblin-0.34.3.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mutter-moblin.spec	20 Aug 2009 13:38:37 -0000	1.2
+++ mutter-moblin.spec	20 Aug 2009 15:22:39 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           mutter-moblin
-Version:        0.34.2
+Version:        0.34.3
 Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Thu Aug 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.3-1
+- New 0.34.3 upstream release.
+
 * Thu Aug 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.2-1
 - New 0.34.2 upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 13:38:37 -0000	1.3
+++ sources	20 Aug 2009 15:22:39 -0000	1.4
@@ -1 +1 @@
-50575c091f2ed7b047acff77772dee71  mutter-moblin-0.34.2.tar.bz2
+c64f87825dbd5593309171249c3ca12b  mutter-moblin-0.34.3.tar.bz2



From pwouters at fedoraproject.org  Thu Aug 20 15:28:12 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 20 Aug 2009 15:28:12 +0000 (UTC)
Subject: rpms/nsd/EL-5 nsd.init,1.7,1.8
Message-ID: <20090820152812.3E25611C006E@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7583/EL-5

Modified Files:
	nsd.init 
Log Message:
* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> 
- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %1 file by mistake



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/EL-5/nsd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nsd.init	10 Apr 2009 20:11:45 -0000	1.7
+++ nsd.init	20 Aug 2009 15:28:12 -0000	1.8
@@ -45,7 +45,7 @@ start() {
   [ -x $NSD_PROG ] || exit 5
 
   echo -n $"Starting nsd:"
-  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
   RETVAL=$?
   echo
@@ -60,7 +60,7 @@ start() {
 stop() {
   echo -n $"Stopping nsd: "
   # save state to zonefiles
-  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
   $NSDC_PROG -c $NSD_CONF stop
   RETVAL=$?
   # was nsdc successful?



From pwouters at fedoraproject.org  Thu Aug 20 15:28:12 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 20 Aug 2009 15:28:12 +0000 (UTC)
Subject: rpms/nsd/F-10 nsd.init,1.10,1.11 nsd.spec,1.44,1.45
Message-ID: <20090820152812.69E7511C006E@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7583/F-10

Modified Files:
	nsd.init nsd.spec 
Log Message:
* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> 
- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %1 file by mistake



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nsd.init	10 Apr 2009 18:58:46 -0000	1.10
+++ nsd.init	20 Aug 2009 15:28:12 -0000	1.11
@@ -46,7 +46,7 @@ start() {
   [ -x $NSD_PROG ] || exit 5
 
   echo -n $"Starting nsd... "
-  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
   RETVAL=$?
   echo
@@ -61,7 +61,7 @@ start() {
 stop() {
   echo -n $"Shutting down nsd services: "
   # save state to zonefiles
-  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
   $NSDC_PROG -c $NSD_CONF stop
   RETVAL=$?
   # was nsdc successful?


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-10/nsd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- nsd.spec	18 May 2009 22:49:03 -0000	1.44
+++ nsd.spec	20 Aug 2009 15:28:12 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> - 3.2.2-3
+- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %%1 file by mistake
+
 * Mon May 18 2009 Paul Wouters <paul at xelerance.com> - 3.2.2-2
 - Bump version
 



From pwouters at fedoraproject.org  Thu Aug 20 15:28:12 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 20 Aug 2009 15:28:12 +0000 (UTC)
Subject: rpms/nsd/F-11 nsd.init,1.13,1.14 nsd.spec,1.55,1.56
Message-ID: <20090820152812.BBBA011C006E@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7583/F-11

Modified Files:
	nsd.init nsd.spec 
Log Message:
* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> 
- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %1 file by mistake



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nsd.init	10 Apr 2009 18:58:47 -0000	1.13
+++ nsd.init	20 Aug 2009 15:28:12 -0000	1.14
@@ -45,7 +45,7 @@ start() {
   [ -x $NSD_PROG ] || exit 5
 
   echo -n $"Starting nsd:"
-  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
   RETVAL=$?
   echo
@@ -60,7 +60,7 @@ start() {
 stop() {
   echo -n $"Stopping nsd: "
   # save state to zonefiles
-  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
   $NSDC_PROG -c $NSD_CONF stop
   RETVAL=$?
   # was nsdc successful?


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- nsd.spec	17 Aug 2009 14:53:55 -0000	1.55
+++ nsd.spec	20 Aug 2009 15:28:12 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> - 3.2.3-2
+- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %%1 file by mistake
+
 * Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-1
 - Updated to nsd-3.2.3
 



From pwouters at fedoraproject.org  Thu Aug 20 15:28:13 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 20 Aug 2009 15:28:13 +0000 (UTC)
Subject: rpms/nsd/devel nsd.init,1.13,1.14 nsd.spec,1.56,1.57
Message-ID: <20090820152813.3579A11C006E@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7583/devel

Modified Files:
	nsd.init nsd.spec 
Log Message:
* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> 
- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %1 file by mistake



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nsd.init	10 Apr 2009 18:58:47 -0000	1.13
+++ nsd.init	20 Aug 2009 15:28:13 -0000	1.14
@@ -45,7 +45,7 @@ start() {
   [ -x $NSD_PROG ] || exit 5
 
   echo -n $"Starting nsd:"
-  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
   RETVAL=$?
   echo
@@ -60,7 +60,7 @@ start() {
 stop() {
   echo -n $"Stopping nsd: "
   # save state to zonefiles
-  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
   $NSDC_PROG -c $NSD_CONF stop
   RETVAL=$?
   # was nsdc successful?


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- nsd.spec	17 Aug 2009 14:38:53 -0000	1.56
+++ nsd.spec	20 Aug 2009 15:28:13 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> - 3.2.3-2
+- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %%1 file by mistake
+
 * Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 3.2.3-1
 -Updated to version 3.2.3
 



From pwouters at fedoraproject.org  Thu Aug 20 15:28:12 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Thu, 20 Aug 2009 15:28:12 +0000 (UTC)
Subject: rpms/nsd/F-9 nsd.init,1.10,1.11 nsd.spec,1.38,1.39
Message-ID: <20090820152813.0018911C006E@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7583/F-9

Modified Files:
	nsd.init nsd.spec 
Log Message:
* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> 
- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %1 file by mistake



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nsd.init	10 Apr 2009 18:58:47 -0000	1.10
+++ nsd.init	20 Aug 2009 15:28:12 -0000	1.11
@@ -46,7 +46,7 @@ start() {
   [ -x $NSD_PROG ] || exit 5
 
   echo -n $"Starting nsd... "
-  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
   RETVAL=$?
   echo
@@ -61,7 +61,7 @@ start() {
 stop() {
   echo -n $"Shutting down nsd services: "
   # save state to zonefiles
-  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>%1
+  $NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
   $NSDC_PROG -c $NSD_CONF stop
   RETVAL=$?
   # was nsdc successful?


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-9/nsd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nsd.spec	18 May 2009 22:41:48 -0000	1.38
+++ nsd.spec	20 Aug 2009 15:28:12 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/nsd/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -91,6 +91,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> - 3.2.2-2
+- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %%1 file by mistake
+
 * Mon May 18 2009 Paul Wouters <paul at xelerance.com> - 3.2.2-1
 - Upgraded to 3.2.2 security release
   http://www.nlnetlabs.nl/publications/NSD_vulnerability_announcement.html



From pkgdb at fedoraproject.org  Thu Aug 20 15:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 15:29:50 +0000
Subject: [pkgdb] sbackup had acl change status
Message-ID: <20090820152950.1850D10F857@bastion2.fedora.phx.redhat.com>

cassmodiah has set the watchbugzilla acl on sbackup (Fedora devel) to Approved for twaugh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Thu Aug 20 15:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 15:29:50 +0000
Subject: [pkgdb] sbackup had acl change status
Message-ID: <20090820152950.374F510F882@bastion2.fedora.phx.redhat.com>

cassmodiah has set the watchcommits acl on sbackup (Fedora devel) to Approved for twaugh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Thu Aug 20 15:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 15:29:50 +0000
Subject: [pkgdb] sbackup had acl change status
Message-ID: <20090820152950.A5DC810F889@bastion2.fedora.phx.redhat.com>

cassmodiah has set the commit acl on sbackup (Fedora devel) to Approved for twaugh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From kasal at fedoraproject.org  Thu Aug 20 15:32:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 20 Aug 2009 15:32:42 +0000 (UTC)
Subject: rpms/perl-Wx/devel perl-Wx.spec,1.31,1.32
Message-ID: <20090820153242.4F22511C006E@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8849

Modified Files:
	perl-Wx.spec 
Log Message:
- rebuild against patched perl-Alien-wxWidgets


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- perl-Wx.spec	26 Jul 2009 17:30:14 -0000	1.31
+++ perl-Wx.spec	20 Aug 2009 15:32:41 -0000	1.32
@@ -6,13 +6,13 @@
 
 Name:           perl-Wx
 Version:        0.91
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Wx/
-Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/Wx-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MB/MBARBON/Wx-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-7
+- rebuild against patched perl-Alien-wxWidgets
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Thu Aug 20 15:37:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 20 Aug 2009 15:37:53 +0000 (UTC)
Subject: rpms/mozplugger/devel mozplugger-1.12.1-path.patch, NONE,
	1.1 mozplugger.spec, 1.33, 1.34
Message-ID: <20090820153753.4A28D11C006E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/mozplugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10028

Modified Files:
	mozplugger.spec 
Added Files:
	mozplugger-1.12.1-path.patch 
Log Message:
fix #513470, using a wrong path for executable


mozplugger-1.12.1-path.patch:
 mozpluggerrc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mozplugger-1.12.1-path.patch ---
diff -up mozplugger-1.12.1/mozpluggerrc.orig mozplugger-1.12.1/mozpluggerrc
--- mozplugger-1.12.1/mozpluggerrc.orig	2009-08-20 16:27:57.000000000 +0200
+++ mozplugger-1.12.1/mozpluggerrc	2009-08-20 16:28:26.000000000 +0200
@@ -390,4 +390,4 @@ application/vnd.oasis.opendocument.prese
 chemical/x-pdb:pdb: Protein Data Bank file
 model/x-pdb:pdb: Protein Data Bank file
 	swallow(rasmol) fill: rasmol "$file"
-        swallow(molecule) fill: /usr/X11R6/lib/xscreensaver/molecule -delay 20000 -geometry +9000+9000 -no-spin -molecule "$file"
+        swallow(molecule) fill: /usr/libexec/xscreensaver/molecule -delay 20000 -geometry +9000+9000 -no-spin -molecule "$file"


Index: mozplugger.spec
===================================================================
RCS file: /cvs/extras/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mozplugger.spec	25 Jul 2009 15:11:50 -0000	1.33
+++ mozplugger.spec	20 Aug 2009 15:37:53 -0000	1.34
@@ -1,13 +1,14 @@
 Summary: A generic mozilla plug-in
 Name: mozplugger
 Version: 1.12.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Url: http://mozplugger.mozdev.org/
 
 Source0: http://mozplugger.mozdev.org/mozplugger/%{name}-%{version}.tar.gz
 Patch1: mozplugger-1.12.1-lib64.patch
+Patch2: mozplugger-1.12.1-path.patch
 
 Requires: m4
 Requires: sox
@@ -26,6 +27,7 @@ programs as plug-ins for media types on 
 %prep
 %setup -q
 %patch1 -p1 -b .lib64
+%patch2 -p1 -b .path
 
 %build
 make linux lib=%{_lib}
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
+* Thu Aug 20 2009 Than Ngo <than at redhat.com> - 1.12.1-5
+- fix #513470, using a wrong path for executable
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gd at fedoraproject.org  Thu Aug 20 15:38:46 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 20 Aug 2009 15:38:46 +0000 (UTC)
Subject: rpms/samba/devel samba-3.4.0-cliread.patch, NONE, 1.1 samba.spec,
	1.193, 1.194
Message-ID: <20090820153846.3F58111C006E@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10314

Modified Files:
	samba.spec 
Added Files:
	samba-3.4.0-cliread.patch 
Log Message:
Fix cli_read()
resolves: #516165

Guenther


samba-3.4.0-cliread.patch:
 clireadwrite.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.4.0-cliread.patch ---
commit 33d27797d3ae9ab3ff7e1aa940941cc450f5ad1d
Author:     Jeremy Allison <jra at samba.org>
AuthorDate: Wed Aug 19 15:33:08 2009 -0700
Commit:     Jeremy Allison <jra at samba.org>
CommitDate: Wed Aug 19 15:33:08 2009 -0700

    Fix Red Hat bugzilla bug : https://bugzilla.redhat.com/show_bug.cgi?id=516165
    nautilus fails to copy files from an SMB share. This is a show-stopper
    for 3.4.1 (I'll open a Samba.org bug). Although gnome-vfs is doing
    *incredibly* stupid things by asking for a read size of 65535 - this
    translates on the wire to a 65534 byte read followed by a 1 byte
    read. Please send this back to the gnome developers that they
    will ge horrid on the wire performance for this.
    Jeremy.
---
 source3/libsmb/clireadwrite.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index d38de19..0d1f9e5 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -200,7 +200,7 @@ static void cli_read_andx_done(struct tevent_req *subreq)
 	state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0);
 
 	if (trans_oob(smb_len(inbuf), SVAL(vwv+6, 0), state->received)
-	    || (state->buf < bytes)) {
+	    || (state->received && (state->buf < bytes))) {
 		DEBUG(5, ("server returned invalid read&x data offset\n"));
 		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
 		return;


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- samba.spec	6 Aug 2009 17:00:00 -0000	1.193
+++ samba.spec	20 Aug 2009 15:38:45 -0000	1.194
@@ -1,4 +1,4 @@
-%define main_release 42
+%define main_release 43
 %define samba_version 3.4.0
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
@@ -50,6 +50,7 @@ Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
 Patch201: samba-3.4.0-build.patch
 Patch202: samba-3.4.0-bug6551.patch
+Patch203: samba-3.4.0-cliread.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -262,6 +263,7 @@ cp %{SOURCE11} packaging/Fedora/
 %patch200 -p0 -b .inotify
 %patch201 -p1 -b .build
 %patch202 -p1 -b .bug6551
+%patch203 -p1 -b .cliread
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -888,6 +890,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Aug 20 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0-0.43
+- Fix cli_read()
+- resolves: #516165
+
 * Thu Aug 06 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.0-0.42
 - Fix required talloc version number
 - resolves: #516086



From rjones at fedoraproject.org  Thu Aug 20 15:41:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 20 Aug 2009 15:41:37 +0000 (UTC)
Subject: rpms/libguestfs/F-11 libguestfs.spec,1.58,1.59
Message-ID: <20090820154137.228B911C006E@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11146/F-11

Modified Files:
	libguestfs.spec 
Log Message:
Remove references to virt-v2v since it's no longer in the upstream repo.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- libguestfs.spec	19 Aug 2009 17:51:25 -0000	1.58
+++ libguestfs.spec	20 Aug 2009 15:41:36 -0000	1.59
@@ -406,10 +406,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
-# Remove virt-v2v for now, WIP.
-rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v
-rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v.1*
-
 # Find locale files.
 %find_lang %{name}
 



From rjones at fedoraproject.org  Thu Aug 20 15:41:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 20 Aug 2009 15:41:37 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.94,1.95
Message-ID: <20090820154137.4AF6811C0347@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11146/devel

Modified Files:
	libguestfs.spec 
Log Message:
Remove references to virt-v2v since it's no longer in the upstream repo.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- libguestfs.spec	19 Aug 2009 17:51:29 -0000	1.94
+++ libguestfs.spec	20 Aug 2009 15:41:37 -0000	1.95
@@ -410,10 +410,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
-# Remove virt-v2v for now, WIP.
-rm $RPM_BUILD_ROOT%{_bindir}/virt-v2v
-rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v.1*
-
 # Find locale files.
 %find_lang %{name}
 



From markmc at fedoraproject.org  Thu Aug 20 16:03:17 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 20 Aug 2009 16:03:17 +0000 (UTC)
Subject: rpms/kernel/devel config-x86-generic, 1.87,
	1.88 config-x86_64-generic, 1.89, 1.90 kernel.spec, 1.1729, 1.1730
Message-ID: <20090820160317.8F15611C006E@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15924

Modified Files:
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Thu Aug 20 2009 Mark McLoughlin <markmc at redhat.com>
- Disable LZMA for xen (#515831)



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- config-x86-generic	10 Aug 2009 14:21:08 -0000	1.87
+++ config-x86-generic	20 Aug 2009 16:03:17 -0000	1.88
@@ -1,6 +1,6 @@
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 #
 # Processor type and features


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- config-x86_64-generic	10 Aug 2009 14:21:09 -0000	1.89
+++ config-x86_64-generic	20 Aug 2009 16:03:17 -0000	1.90
@@ -1,6 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_UID16=y
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1729
retrieving revision 1.1730
diff -u -p -r1.1729 -r1.1730
--- kernel.spec	20 Aug 2009 13:30:13 -0000	1.1729
+++ kernel.spec	20 Aug 2009 16:03:17 -0000	1.1730
@@ -1993,6 +1993,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 20 2009 Mark McLoughlin <markmc at redhat.com>
+- Disable LZMA for xen (#515831)
+
 * Thu Aug 20 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc6-git5
 - Fix up drm-r600-kms.patch



From kanarip at fedoraproject.org  Thu Aug 20 16:13:25 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Thu, 20 Aug 2009 16:13:25 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-11 import.log, 1.2,
	1.3 rubygem-actionmailer.spec, 1.10, 1.11
Message-ID: <20090820161325.D658111C006E@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-actionmailer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18113/F-11

Modified Files:
	import.log rubygem-actionmailer.spec 
Log Message:
2.3.3-2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Aug 2009 21:19:35 -0000	1.2
+++ import.log	20 Aug 2009 16:13:25 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-actionmailer-2_3_2-1_fc10:HEAD:rubygem-actionmailer-2.3.2-1.fc10.src.rpm:1237201085
 rubygem-actionmailer-2_3_3-1_fc12:F-11:rubygem-actionmailer-2.3.3-1.fc12.src.rpm:1250111931
+rubygem-actionmailer-2_3_3-2_fc11:F-11:rubygem-actionmailer-2.3.3-2.fc11.src.rpm:1250784784


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/rubygem-actionmailer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-actionmailer.spec	12 Aug 2009 21:19:35 -0000	1.10
+++ rubygem-actionmailer.spec	20 Aug 2009 16:13:25 -0000	1.11
@@ -7,7 +7,7 @@
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -58,10 +58,6 @@ cp -a .%{gemdir}/* %{buildroot}%{gemdir}
 rm -rf %{buildroot}
 
 %check
-export GEM_PATH=$(pwd)/%{gemdir}
-pushd .%{geminstdir}
-
-rake test --trace
 
 %files
 %defattr(-, root, root, -)
@@ -79,6 +75,9 @@ rake test --trace
 
 
 %changelog
+* Thu Aug 02 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-2
+- Disable test
+
 * Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-1
 - 2.3.3
 - Enable test



From kanarip at fedoraproject.org  Thu Aug 20 16:14:01 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Thu, 20 Aug 2009 16:14:01 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/devel import.log, 1.1,
	1.2 rubygem-actionmailer.spec, 1.11, 1.12
Message-ID: <20090820161401.4C71411C006E@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-actionmailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18387/devel

Modified Files:
	import.log rubygem-actionmailer.spec 
Log Message:
2.3.3-2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Mar 2009 10:58:22 -0000	1.1
+++ import.log	20 Aug 2009 16:14:01 -0000	1.2
@@ -1 +1,2 @@
 rubygem-actionmailer-2_3_2-1_fc10:HEAD:rubygem-actionmailer-2.3.2-1.fc10.src.rpm:1237201085
+rubygem-actionmailer-2_3_3-2_fc11:HEAD:rubygem-actionmailer-2.3.3-2.fc11.src.rpm:1250784819


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/devel/rubygem-actionmailer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-actionmailer.spec	2 Aug 2009 16:42:53 -0000	1.11
+++ rubygem-actionmailer.spec	20 Aug 2009 16:14:01 -0000	1.12
@@ -7,7 +7,7 @@
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -58,10 +58,6 @@ cp -a .%{gemdir}/* %{buildroot}%{gemdir}
 rm -rf %{buildroot}
 
 %check
-export GEM_PATH=$(pwd)/%{gemdir}
-pushd .%{geminstdir}
-
-rake test --trace
 
 %files
 %defattr(-, root, root, -)
@@ -79,6 +75,9 @@ rake test --trace
 
 
 %changelog
+* Thu Aug 02 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-2
+- Disable test
+
 * Sun Aug  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-1
 - 2.3.3
 - Enable test



From ebaron at fedoraproject.org  Thu Aug 20 16:16:01 2009
From: ebaron at fedoraproject.org (Elliott Baron)
Date: Thu, 20 Aug 2009 16:16:01 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel .cvsignore, 1.3,
	1.4 eclipse-linuxprofilingframework.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20090820161601.4FD2A11C006E@cvs1.fedora.phx.redhat.com>

Author: ebaron

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19002

Modified Files:
	.cvsignore eclipse-linuxprofilingframework.spec sources 
Log Message:
* Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-1
- Upstream 0.3.0 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 May 2009 18:44:27 -0000	1.3
+++ .cvsignore	20 Aug 2009 16:16:00 -0000	1.4
@@ -1 +1 @@
-eclipse-linuxprofilingframework-fetched-src-RELEASE_0_2_0.tar.bz2
+eclipse-linuxprofilingframework-fetched-src-RELEASE_0_3_0.tar.bz2


Index: eclipse-linuxprofilingframework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/eclipse-linuxprofilingframework.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-linuxprofilingframework.spec	24 Jul 2009 20:54:47 -0000	1.12
+++ eclipse-linuxprofilingframework.spec	20 Aug 2009 16:16:01 -0000	1.13
@@ -1,14 +1,14 @@
-%define src_repo_tag   RELEASE_0_2_0
+%define src_repo_tag   RELEASE_0_3_0
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_libdir}/eclipse/dropins/linuxprofilingframework
-%define qualifier      200905081335
+%define qualifier      200908180856
 
 # Package in %%{_libdir} but no native code so no debuginfo
 %global debug_package %{nil}
 
 Name:           eclipse-linuxprofilingframework
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Eclipse Linux Tools Profiling Framework
 
 Group:          Development/Tools
@@ -22,10 +22,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # No CDT on ppc64
 ExcludeArch: ppc64
 
-BuildRequires: eclipse-pde >= 1:3.4.0
-Requires: eclipse-platform >= 1:3.4.0
-BuildRequires: eclipse-cdt >= 1:5.0.0
-Requires: eclipse-cdt >= 1:5.0.0
+BuildRequires: eclipse-pde >= 1:3.5.0
+Requires: eclipse-platform >= 1:3.5.0
+BuildRequires: eclipse-cdt >= 1:6.0.0
+Requires: eclipse-cdt >= 1:6.0.0
 
 %description
 Plugins common to Eclipse Linux Tools profiling tools.
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{install_loc}
 
 %changelog
+* Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-1
+- Upstream 0.3.0 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 May 2009 18:44:28 -0000	1.3
+++ sources	20 Aug 2009 16:16:01 -0000	1.4
@@ -1 +1 @@
-e5463701f81bdeaadcb6ab833926b1e3  eclipse-linuxprofilingframework-fetched-src-RELEASE_0_2_0.tar.bz2
+f50a1dafd12db1d186f3107988d059e1  eclipse-linuxprofilingframework-fetched-src-RELEASE_0_3_0.tar.bz2



From spot at fedoraproject.org  Thu Aug 20 16:18:36 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 16:18:36 +0000 (UTC)
Subject: rpms/lapack/devel Makefile.lapack,1.5,1.6 lapack.spec,1.23,1.24
Message-ID: <20090820161836.ACC4C11C006E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/lapack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19790

Modified Files:
	Makefile.lapack lapack.spec 
Log Message:
do not enable xblas


Index: Makefile.lapack
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/Makefile.lapack,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- Makefile.lapack	14 Aug 2009 18:53:38 -0000	1.5
+++ Makefile.lapack	20 Aug 2009 16:18:36 -0000	1.6
@@ -1,54 +1,54 @@
+include ../make.inc
+
 clean:
 	rm -f *.o liblapack*
 
-OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb.o cgbequ.o cgbrfs.o cgbrfsx.o \
-	cgbsv.o cgbsvx.o cgbsvxx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o \
+OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb.o cgbequ.o cgbrfs.o \
+	cgbsv.o cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o \
 	cgebal.o cgebd2.o cgebrd.o cgecon.o cgeequb.o cgeequ.o cgees.o \
 	cgeesx.o cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o \
 	cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o cgelsy.o cgeql2.o \
-	cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o cgerfsx.o \
+	cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o \
 	cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesvd.o cgesv.o cgesvx.o \
-	cgesvxx.o cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o cggbak.o \
+	cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o cggbak.o \
 	cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o cgghrd.o \
 	cgglse.o cggqrf.o cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o \
 	cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
 	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o checon.o \
 	cheequb.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o chegst.o \
-	chegvd.o chegv.o chegvx.o cherfs.o cherfsx.o chesv.o chesvx.o \
-	chesvxx.o chetd2.o chetf2.o chetrd.o chetrf.o chetri.o chetrs.o \
+	chegvd.o chegv.o chegvx.o cherfs.o chesv.o chesvx.o \
+	chetd2.o chetf2.o chetrd.o chetrf.o chetri.o chetrs.o \
 	chfrk.o chgeqz.o chla_transtype.o chpcon.o chpevd.o chpev.o \
 	chpevx.o chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
 	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o \
 	clabrd.o clacgv.o clacn2.o clacon.o clacp2.o clacpy.o clacrm.o \
 	clacrt.o cladiv.o claed0.o claed7.o claed8.o claein.o claesy.o \
-	claev2.o clag2z.o cla_gbamv.o cla_gbrcond_c.o cla_gbrcond_x.o \
-	cla_gbrfsx_extended.o cla_gbrpvgrw.o cla_geamv.o cla_gercond_c.o \
-	cla_gercond_x.o cla_gerfsx_extended.o clags2.o clagtm.o cla_heamv.o \
-	clahef.o cla_hercond_c.o cla_hercond_x.o cla_herfsx_extended.o \
-	cla_herpvgrw.o clahqr.o clahr2.o clahrd.o claic1.o cla_lin_berr.o \
+	claev2.o clag2z.o \
+	clags2.o clagtm.o \
+	clahef.o \
+	clahqr.o clahr2.o clahrd.o claic1.o \
 	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o clanhb.o \
 	clanhe.o clanhf.o clanhp.o clanhs.o clanht.o clansb.o clansp.o \
 	clansy.o clantb.o clantp.o clantr.o clapll.o clapmt.o \
-	cla_porcond_c.o cla_porcond_x.o cla_porfsx_extended.o \
-	cla_porpvgrw.o claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
+	claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
 	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o \
 	claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o clar2v.o clarcm.o \
 	clarfb.o clarf.o clarfg.o clarfp.o clarft.o clarfx.o clargv.o \
-	clarnv.o cla_rpvgrw.o clarrv.o clarscl2.o clartg.o clartv.o \
-	clarzb.o clarz.o clarzt.o clascl2.o clascl.o claset.o clasr.o \
-	classq.o claswp.o cla_syamv.o clasyf.o cla_syrcond_c.o \
-	cla_syrcond_x.o cla_syrfsx_extended.o cla_syrpvgrw.o clatbs.o \
+	clarnv.o clarrv.o clartg.o clartv.o \
+	clarzb.o clarz.o clarzt.o clascl.o claset.o clasr.o \
+	classq.o claswp.o clasyf.o \
+	clatbs.o \
 	clatdf.o clatps.o clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o \
-	clauum.o cla_wwaddw.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
+	clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
 	cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpftrf.o cpftri.o cpftrs.o \
-	cpocon.o cpoequb.o cpoequ.o cporfs.o cporfsx.o cposv.o cposvx.o \
-	cposvxx.o cpotf2.o cpotrf.o cpotri.o cpotrs.o cppcon.o cppequ.o \
+	cpocon.o cpoequb.o cpoequ.o cporfs.o cposv.o cposvx.o \
+	cpotf2.o cpotrf.o cpotri.o cpotrs.o cppcon.o cppequ.o \
 	cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o cpstf2.o \
 	cpstrf.o cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o \
 	cpttrs.o cptts2.o crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
 	cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
 	cstein.o cstemr.o csteqr.o csycon.o csyequb.o csymv.o csyr.o \
-	csyrfs.o csyrfsx.o csysv.o csysvx.o csysvxx.o csytf2.o csytrf.o \
+	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o \
 	csytri.o csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctfsm.o ctftri.o \
 	ctfttp.o ctfttr.o ctgevc.o ctgex2.o ctgexc.o ctgsen.o ctgsja.o \
 	ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o ctprfs.o ctptri.o ctptrs.o \
@@ -59,13 +59,13 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	cunm2r.o cunmbr.o cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o \
 	cunmr2.o cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
 	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequb.o dgbequ.o \
-	dgbrfs.o dgbrfsx.o dgbsv.o dgbsvx.o dgbsvxx.o dgbtf2.o dgbtrf.o \
+	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o \
  	dgbtrs.o dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequb.o \
  	dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
 	dgehd2.o dgehrd.o dgejsv.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
 	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o dgeqpf.o \
-	dgeqr2.o dgeqrf.o dgerfs.o dgerfsx.o dgerq2.o dgerqf.o dgesc2.o \
-	dgesdd.o dgesvd.o dgesv.o dgesvj.o dgesvx.o dgesvxx.o dgetc2.o \
+	dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o dgesc2.o \
+	dgesdd.o dgesvd.o dgesv.o dgesvj.o dgesvx.o dgetc2.o \
 	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o dgges.o \
 	dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o dgglse.o dggqrf.o \
 	dggrqf.o dggsvd.o dggsvp.o dgsvj0.o dgsvj1.o dgtcon.o dgtrfs.o \
@@ -73,35 +73,34 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	dhseqr.o disnan.o dlabad.o dlabrd.o dlacn2.o dlacon.o dlacpy.o \
 	dladiv.o dlae2.o dlaebz.o dlaed0.o dlaed1.o dlaed2.o dlaed3.o \
 	dlaed4.o dlaed5.o dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o \
-	dlaein.o dlaev2.o dlaexc.o dlag2.o dlag2s.o dla_gbamv.o \
-	dla_gbrcond.o dla_gbrfsx_extended.o dla_gbrpvgrw.o dla_geamv.o \
-	dla_gercond.o dla_gerfsx_extended.o dlags2.o dlagtf.o dlagtm.o \
+	dlaein.o dlaev2.o dlaexc.o dlag2.o dlag2s.o \
+	dlags2.o dlagtf.o dlagtm.o \
 	dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o dlaic1.o \
-	dlaisnan.o dla_lin_berr.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
+	dlaisnan.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
 	dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o \
 	dlansf.o dlansp.o dlanst.o dlansy.o dlantb.o dlantp.o dlantr.o \
-	dlanv2.o dlapll.o dlapmt.o dla_porcond.o dla_porfsx_extended.o \
-	dla_porpvgrw.o dlapy2.o dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o \
+	dlanv2.o dlapll.o dlapmt.o \
+	dlapy2.o dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o \
 	dlaqps.o dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
 	dlaqsb.o dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
 	dlarf.o dlarfg.o dlarfp.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
-	dla_rpvgrw.o dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o \
-	dlarrf.o dlarrj.o dlarrk.o dlarrr.o dlarrv.o dlarscl2.o \
+	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o \
+	dlarrf.o dlarrj.o dlarrk.o dlarrr.o dlarrv.o \
 	dlartg.o dlartv.o dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o \
-	dlascl2.o dlascl.o dlasd0.o dlasd1.o dlasd2.o dlasd3.o \
+	dlascl.o dlasd0.o dlasd1.o dlasd2.o dlasd3.o \
 	dlasd4.o dlasd5.o dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o \
 	dlasdt.o dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
 	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o dlasy2.o \
-	dla_syamv.o dlasyf.o dla_syrcond.o dla_syrfsx_extended.o \
-	dla_syrpvgrw.o dlat2s.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
-	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o dla_wwaddw.o \
+	dlasyf.o \
+	dlat2s.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
+	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o \
 	dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o dorghr.o dorgl2.o \
 	dorglq.o dorgql.o dorgqr.o dorgr2.o dorgrq.o dorgtr.o dorm2l.o \
 	dorm2r.o dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o \
 	dormr2.o dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o \
 	dpbrfs.o dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
 	dpftrf.o dpftri.o dpftrs.o dpocon.o dpoequb.o dpoequ.o \
-	dporfs.o dporfsx.o dposv.o dposvx.o dposvxx.o dpotf2.o dpotrf.o \
+	dporfs.o dposv.o dposvx.o dpotf2.o dpotrf.o \
 	dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o dppsv.o dppsvx.o \
 	dpptrf.o dpptri.o dpptrs.o dpstf2.o dpstrf.o dptcon.o dpteqr.o \
 	dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o dptts2.o drscl.o \
@@ -112,7 +111,7 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	dstegr.o dstein.o dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o \
 	dstevr.o dstevx.o dsycon.o dsyequb.o dsyevd.o dsyev.o dsyevr.o \
 	dsyevx.o dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
-	dsyrfsx.o dsysv.o dsysvx.o dsysvxx.o dsytd2.o dsytf2.o dsytrd.o \
+	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o \
 	dsytrf.o dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtfsm.o \
 	dtftri.o dtfttp.o dtfttr.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
 	dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
@@ -123,13 +122,13 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	ilaslc.o ilaslr.o ilatrans.o ilauplo.o ilaver.o ilazlc.o \
 	ilazlr.o iparmq.o izmax1.o lsamen.o sbdsdc.o sbdsqr.o scsum1.o \
 	sdisna.o sgbbrd.o sgbcon.o sgbequb.o sgbequ.o sgbrfs.o \
-	sgbrfsx.o sgbsv.o sgbsvx.o sgbsvxx.o sgbtf2.o sgbtrf.o sgbtrs.o \
+	sgbsv.o sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o \
 	sgebak.o sgebal.o sgebd2.o sgebrd.o sgecon.o sgeequb.o sgeequ.o \
 	sgees.o sgeesx.o sgeev.o sgeevx.o sgegs.o sgegv.o sgehd2.o \
 	sgehrd.o sgejsv.o sgelq2.o sgelqf.o sgelsd.o sgels.o sgelss.o \
 	sgelsx.o sgelsy.o sgeql2.o sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o \
-	sgeqrf.o sgerfs.o sgerfsx.o sgerq2.o sgerqf.o sgesc2.o sgesdd.o \
-	sgesvd.o sgesv.o sgesvj.o sgesvx.o sgesvxx.o sgetc2.o sgetf2.o \
+	sgeqrf.o sgerfs.o sgerq2.o sgerqf.o sgesc2.o sgesdd.o \
+	sgesvd.o sgesv.o sgesvj.o sgesvx.o sgetc2.o sgetf2.o \
 	sgetrf.o sgetri.o sgetrs.o sggbak.o sggbal.o sgges.o sggesx.o \
 	sggev.o sggevx.o sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o \
 	sggsvd.o sggsvp.o sgsvj0.o sgsvj1.o sgtcon.o sgtrfs.o sgtsv.o \
@@ -137,35 +136,33 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	sisnan.o slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
 	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o \
 	slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o slaeda.o slaein.o \
-	slaev2.o slaexc.o slag2d.o slag2.o sla_gbamv.o sla_gbrcond.o \
-	sla_gbrfsx_extended.o sla_gbrpvgrw.o sla_geamv.o sla_gercond.o \
-	sla_gerfsx_extended.o slags2.o slagtf.o slagtm.o slagts.o \
+	slaev2.o slaexc.o slag2d.o slag2.o \
+	slags2.o slagtf.o slagtm.o slagts.o \
 	slagv2.o slahqr.o slahr2.o slahrd.o slaic1.o slaisnan.o \
-	sla_lin_berr.o slaln2.o slals0.o slalsa.o slalsd.o slamrg.o \
+	slaln2.o slals0.o slalsa.o slalsd.o slamrg.o \
 	slaneg.o slangb.o slange.o slangt.o slanhs.o slansb.o slansf.o \
 	slansp.o slanst.o slansy.o slantb.o slantp.o slantr.o slanv2.o \
-	slapll.o slapmt.o sla_porcond.o sla_porfsx_extended.o \
-	sla_porpvgrw.o slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
+	slapll.o slapmt.o \
+	slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
 	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
 	slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o slar2v.o slarfb.o \
 	slarf.o slarfg.o slarfp.o slarft.o slarfx.o slargv.o slarnv.o \
-	sla_rpvgrw.o slarra.o slarrb.o slarrc.o slarrd.o slarre.o \
-	slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o slarscl2.o \
+	slarra.o slarrb.o slarrc.o slarrd.o slarre.o \
+	slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
 	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o slas2.o \
-	slascl2.o slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
+	slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
 	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o slasdq.o \
 	slasdt.o slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o \
 	slasq6.o slasr.o slasrt.o slassq.o slasv2.o slaswp.o slasy2.o \
-	sla_syamv.o slasyf.o sla_syrcond.o sla_syrfsx_extended.o \
-	sla_syrpvgrw.o slatbs.o slatdf.o slatps.o slatrd.o slatrs.o \
-	slatrz.o slatzm.o slauu2.o slauum.o sla_wwaddw.o sopgtr.o \
+	slasyf.o slatbs.o slatdf.o slatps.o slatrd.o slatrs.o \
+	slatrz.o slatzm.o slauu2.o slauum.o sopgtr.o \
 	sopmtr.o sorg2l.o sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o \
 	sorgql.o sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
 	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
 	sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
 	spbstf.o spbsv.o spbsvx.o spbtf2.o spbtrf.o spbtrs.o spftrf.o \
 	spftri.o spftrs.o spocon.o spoequb.o spoequ.o sporfs.o \
-	sporfsx.o sposv.o sposvx.o sposvxx.o spotf2.o spotrf.o \
+	sposv.o sposvx.o spotf2.o spotrf.o \
 	spotri.o spotrs.o sppcon.o sppequ.o spprfs.o sppsv.o sppsvx.o \
 	spptrf.o spptri.o spptrs.o spstf2.o spstrf.o sptcon.o spteqr.o \
 	sptrfs.o sptsv.o sptsvx.o spttrf.o spttrs.o sptts2.o srscl.o \
@@ -175,8 +172,8 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o sstein.o \
 	sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o sstevr.o sstevx.o \
 	ssycon.o ssyequb.o ssyevd.o ssyev.o ssyevr.o ssyevx.o ssygs2.o \
-	ssygst.o ssygvd.o ssygv.o ssygvx.o ssyrfs.o ssyrfsx.o ssysv.o \
-	ssysvx.o ssysvxx.o ssytd2.o ssytf2.o ssytrd.o ssytrf.o \
+	ssygst.o ssygvd.o ssygv.o ssygvx.o ssyrfs.o ssysv.o \
+	ssysvx.o ssytd2.o ssytf2.o ssytrd.o ssytrf.o \
 	ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o stfsm.o stftri.o \
 	stfttp.o stfttr.o stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o \
 	stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
@@ -184,56 +181,54 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	strsna.o strsyl.o strti2.o strtri.o strtrs.o strttf.o strttp.o \
 	stzrqf.o stzrzf.o xerbla_array.o xerbla.o zbdsqr.o zcgesv.o \
 	zcposv.o zdrscl.o zgbbrd.o zgbcon.o zgbequb.o zgbequ.o \
-	zgbrfs.o zgbrfsx.o zgbsv.o zgbsvx.o zgbsvxx.o zgbtf2.o \
+	zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
 	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o zgecon.o \
 	zgeequb.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o zgegs.o \
 	zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o zgelsd.o zgels.o \
 	zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
-	zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerfsx.o zgerq2.o \
-	zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o zgesvx.o zgesvxx.o \
+	zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerq2.o \
+	zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o zgesvx.o \
 	zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o zggbak.o zggbal.o \
 	zgges.o zggesx.o zggev.o zggevx.o zggglm.o zgghrd.o zgglse.o \
 	zggqrf.o zggrqf.o zggsvd.o zggsvp.o zgtcon.o zgtrfs.o zgtsv.o \
 	zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o \
 	zhbgst.o zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheequb.o \
 	zheevd.o zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
-	zhegv.o zhegvx.o zherfs.o zherfsx.o zhesv.o zhesvx.o zhesvxx.o \
+	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o \
 	zhetd2.o zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhfrk.o \
 	zhgeqz.o zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
 	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o zhptrf.o \
 	zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o zlacgv.o zlacn2.o \
 	zlacon.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o zlaed0.o \
 	zlaed7.o zlaed8.o zlaein.o zlaesy.o zlaev2.o zlag2c.o \
-	zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o \
-	zla_gbrfsx_extended.o zla_gbrpvgrw.o zla_geamv.o \
-	zla_gercond_c.o zla_gercond_x.o zla_gerfsx_extended.o zlags2.o \
-	zlagtm.o zla_heamv.o zlahef.o zla_hercond_c.o zla_hercond_x.o \
-	zla_herfsx_extended.o zla_herpvgrw.o zlahqr.o zlahr2.o \
-	zlahrd.o zlaic1.o zla_lin_berr.o zlals0.o zlalsa.o zlalsd.o \
+	zlags2.o \
+	zlagtm.o zlahef.o \
+	zlahqr.o zlahr2.o \
+	zlahrd.o zlaic1.o zlals0.o zlalsa.o zlalsd.o \
 	zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o zlanhf.o zlanhp.o \
 	zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o zlantp.o \
-	zlantr.o zlapll.o zlapmt.o zla_porcond_c.o zla_porcond_x.o \
-	zla_porfsx_extended.o zla_porpvgrw.o zlaqgb.o zlaqge.o \
+	zlantr.o zlapll.o zlapmt.o \
+	zlaqgb.o zlaqge.o \
 	zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqr0.o zlaqr1.o \
 	zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o zlaqsb.o zlaqsp.o zlaqsy.o \
 	zlar1v.o zlar2v.o zlarcm.o zlarfb.o zlarf.o zlarfg.o zlarfp.o \
-	zlarft.o zlarfx.o zlargv.o zlarnv.o zla_rpvgrw.o zlarrv.o \
-	zlarscl2.o zlartg.o zlartv.o zlarzb.o zlarz.o zlarzt.o \
-	zlascl2.o zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
-	zla_syamv.o zlasyf.o zla_syrcond_c.o zla_syrcond_x.o \
-	zla_syrfsx_extended.o zla_syrpvgrw.o zlat2c.o zlatbs.o \
+	zlarft.o zlarfx.o zlargv.o zlarnv.o zlarrv.o \
+	zlartg.o zlartv.o zlarzb.o zlarz.o zlarzt.o \
+	zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
+	zlasyf.o \
+	zlat2c.o zlatbs.o \
 	zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
-	zlauum.o zla_wwaddw.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o \
+	zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o \
 	zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpftrf.o zpftri.o \
-	zpftrs.o zpocon.o zpoequb.o zpoequ.o zporfs.o zporfsx.o \
-	zposv.o zposvx.o zposvxx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o \
+	zpftrs.o zpocon.o zpoequb.o zpoequ.o zporfs.o \
+	zposv.o zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o \
 	zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o \
 	zpptrs.o zpstf2.o zpstrf.o zptcon.o zpteqr.o zptrfs.o zptsv.o \
 	zptsvx.o zpttrf.o zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o \
 	zspr.o zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
 	zstedc.o zstegr.o zstein.o zstemr.o zsteqr.o zsycon.o \
-	zsyequb.o zsymv.o zsyr.o zsyrfs.o zsyrfsx.o zsysv.o zsysvx.o \
-	zsysvxx.o zsytf2.o zsytrf.o zsytri.o zsytrs.o ztbcon.o \
+	zsyequb.o zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o \
+	zsytf2.o zsytrf.o zsytri.o zsytrs.o ztbcon.o \
 	ztbrfs.o ztbtrs.o ztfsm.o ztftri.o ztfttp.o ztfttr.o ztgevc.o \
 	ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o \
 	ztpcon.o ztprfs.o ztptri.o ztptrs.o ztpttf.o ztpttr.o ztrcon.o \
@@ -246,9 +241,53 @@ OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb
 	../INSTALL/dsecnd_INT_ETIME.o ../INSTALL/lsame.o \
 	../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
 
-static: $(OBJS)
+SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
+   sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o			\
+   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
+   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
+   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
+   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
+   slascl2.o sla_wwaddw.o
+
+DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
+   dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o			\
+   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
+   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
+   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
+   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
+   dlascl2.o dla_wwaddw.o
+
+CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o		\
+   cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o				\
+   csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o		\
+   cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o			\
+   cposvxx.o cporfsx.o cla_porfsx_extended.o				\
+   cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o			\
+   cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o		\
+   cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o			\
+   chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o		\
+   cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o			\
+   cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
+
+ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
+   zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o	\
+   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
+   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
+   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
+   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o	\
+   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
+   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
+   zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
+
+ALLXAUX =
+
+ifdef USEXBLAS
+ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX)
+endif
+
+static: $(OBJS) $(ALLXOBJ)
 	ar ruv liblapack.a $(OBJS)
 	ranlib liblapack.a
 
-shared: $(OBJS)
+shared: $(OBJS) $(ALLXOBJ)
 	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.2.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc


Index: lapack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- lapack.spec	14 Aug 2009 18:53:38 -0000	1.23
+++ lapack.spec	20 Aug 2009 16:18:36 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Numerical linear algebra package libraries
 Name: lapack
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -189,6 +189,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-2
+- don't enable xblas yet
+
 * Fri Aug 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.1-1
 - update to 3.2.1, spec file cleanups
 



From cebbert at fedoraproject.org  Thu Aug 20 16:22:00 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 20 Aug 2009 16:22:00 +0000 (UTC)
Subject: rpms/kernel/devel drm-r600-kms.patch,1.3,1.4
Message-ID: <20090820162200.076F311C006E@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21403

Modified Files:
	drm-r600-kms.patch 
Log Message:
try to fix r600 kms build

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    3 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  139 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  340 ++++----
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  981 +++++++++++++++++++++++-
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 19 files changed, 3366 insertions(+), 498 deletions(-)

Index: drm-r600-kms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-r600-kms.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drm-r600-kms.patch	20 Aug 2009 13:30:13 -0000	1.3
+++ drm-r600-kms.patch	20 Aug 2009 16:21:59 -0000	1.4
@@ -2063,7 +2063,7 @@ index b1d945b..0c5c63a 100644
  #define RREG8(reg) readb(((void __iomem *)rdev->rmmio) + (reg))
  #define WREG8(reg, v) writeb(v, ((void __iomem *)rdev->rmmio) + (reg))
  #define RREG32(reg) r100_mm_rreg(rdev, (reg))
-+#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", rdev->mm_rreg(rdev, (reg)))
++#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg)))
  #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v))
  #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
  #define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
@@ -2071,7 +2071,7 @@ index b1d945b..0c5c63a 100644
  		tmp_ |= ((val) & ~(mask));			\
  		WREG32_PLL(reg, tmp_);				\
  	} while (0)
-+#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", (rdev)->mm_rreg((rdev), (reg)))
++#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", r100_mm_rreg((rdev), (reg)))
  
  /*
   * Indirect registers accessor



From mtasaka at fedoraproject.org  Thu Aug 20 16:24:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 16:24:08 +0000 (UTC)
Subject: rpms/rubygem-htmlentities/F-10 .cvsignore, 1.2,
	1.3 rubygem-htmlentities.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090820162408.94C1B11C006E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-htmlentities/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21858/F-10

Modified Files:
	.cvsignore rubygem-htmlentities.spec sources 
Log Message:
* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
- 4.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 01:18:54 -0000	1.2
+++ .cvsignore	20 Aug 2009 16:24:08 -0000	1.3
@@ -1 +1 @@
-htmlentities-4.0.0.gem
+htmlentities-4.1.0.gem


Index: rubygem-htmlentities.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/rubygem-htmlentities.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-htmlentities.spec	6 Mar 2009 01:18:54 -0000	1.1
+++ rubygem-htmlentities.spec	20 Aug 2009 16:24:08 -0000	1.2
@@ -9,8 +9,8 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.0.0
-Release:	2%{?dist}
+Version:	4.1.0
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://htmlentities.rubyforge.org/
@@ -137,6 +137,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
+- 4.1.0
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.0-3
+- F-12: Mass rebuild
+
 * Fri Mar 6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 01:18:54 -0000	1.2
+++ sources	20 Aug 2009 16:24:08 -0000	1.3
@@ -1 +1 @@
-8490050367c95d63f83049852f7e93a8  htmlentities-4.0.0.gem
+ccb03a8085d032ebfdcef45eba91ada2  htmlentities-4.1.0.gem



From mtasaka at fedoraproject.org  Thu Aug 20 16:24:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 16:24:08 +0000 (UTC)
Subject: rpms/rubygem-htmlentities/F-11 .cvsignore, 1.2,
	1.3 rubygem-htmlentities.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090820162408.C173811C02CC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-htmlentities/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21858/F-11

Modified Files:
	.cvsignore rubygem-htmlentities.spec sources 
Log Message:
* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
- 4.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 01:18:55 -0000	1.2
+++ .cvsignore	20 Aug 2009 16:24:08 -0000	1.3
@@ -1 +1 @@
-htmlentities-4.0.0.gem
+htmlentities-4.1.0.gem


Index: rubygem-htmlentities.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-11/rubygem-htmlentities.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-htmlentities.spec	6 Mar 2009 01:18:55 -0000	1.1
+++ rubygem-htmlentities.spec	20 Aug 2009 16:24:08 -0000	1.2
@@ -9,8 +9,8 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.0.0
-Release:	2%{?dist}
+Version:	4.1.0
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://htmlentities.rubyforge.org/
@@ -137,6 +137,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
+- 4.1.0
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.0-3
+- F-12: Mass rebuild
+
 * Fri Mar 6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 01:18:55 -0000	1.2
+++ sources	20 Aug 2009 16:24:08 -0000	1.3
@@ -1 +1 @@
-8490050367c95d63f83049852f7e93a8  htmlentities-4.0.0.gem
+ccb03a8085d032ebfdcef45eba91ada2  htmlentities-4.1.0.gem



From mtasaka at fedoraproject.org  Thu Aug 20 16:24:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 16:24:09 +0000 (UTC)
Subject: rpms/rubygem-htmlentities/devel .cvsignore, 1.2,
	1.3 rubygem-htmlentities.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090820162409.0AA8A11C006E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-htmlentities/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21858/devel

Modified Files:
	.cvsignore rubygem-htmlentities.spec sources 
Log Message:
* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
- 4.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 01:18:55 -0000	1.2
+++ .cvsignore	20 Aug 2009 16:24:08 -0000	1.3
@@ -1 +1 @@
-htmlentities-4.0.0.gem
+htmlentities-4.1.0.gem


Index: rubygem-htmlentities.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/rubygem-htmlentities.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-htmlentities.spec	25 Jul 2009 07:01:29 -0000	1.2
+++ rubygem-htmlentities.spec	20 Aug 2009 16:24:08 -0000	1.3
@@ -9,8 +9,8 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.0.0
-Release:	3%{?dist}
+Version:	4.1.0
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://htmlentities.rubyforge.org/
@@ -137,6 +137,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
+- 4.1.0
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.0-3
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 01:18:55 -0000	1.2
+++ sources	20 Aug 2009 16:24:08 -0000	1.3
@@ -1 +1 @@
-8490050367c95d63f83049852f7e93a8  htmlentities-4.0.0.gem
+ccb03a8085d032ebfdcef45eba91ada2  htmlentities-4.1.0.gem



From ebaron at fedoraproject.org  Thu Aug 20 16:30:25 2009
From: ebaron at fedoraproject.org (Elliott Baron)
Date: Thu, 20 Aug 2009 16:30:25 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel
	eclipse-linuxprofilingframework.spec, 1.13, 1.14
Message-ID: <20090820163025.8167E11C04F3@cvs1.fedora.phx.redhat.com>

Author: ebaron

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23378

Modified Files:
	eclipse-linuxprofilingframework.spec 
Log Message:
* Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-2
- Remove ".feature" from feature ID passed to pdebuild.



Index: eclipse-linuxprofilingframework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/eclipse-linuxprofilingframework.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- eclipse-linuxprofilingframework.spec	20 Aug 2009 16:16:01 -0000	1.13
+++ eclipse-linuxprofilingframework.spec	20 Aug 2009 16:30:25 -0000	1.14
@@ -8,7 +8,7 @@
 
 Name:           eclipse-linuxprofilingframework
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse Linux Tools Profiling Framework
 
 Group:          Development/Tools
@@ -34,7 +34,7 @@ Plugins common to Eclipse Linux Tools pr
 %setup -q -n %{name}-fetched-src-%{src_repo_tag}
 
 %build
-%{eclipse_base}/buildscripts/pdebuild -d cdt -f org.eclipse.linuxtools.profiling.feature \
+%{eclipse_base}/buildscripts/pdebuild -d cdt -f org.eclipse.linuxtools.profiling \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
  -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
 
@@ -43,7 +43,7 @@ rm -rf %{buildroot}
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
 
 unzip -q -d $RPM_BUILD_ROOT%{install_loc} \
-     build/rpmBuild/org.eclipse.linuxtools.profiling.feature.zip
+     build/rpmBuild/org.eclipse.linuxtools.profiling.zip
 
 %clean
 rm -rf %{buildroot}
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{install_loc}
 
 %changelog
+* Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-2
+- Remove ".feature" from feature ID passed to pdebuild.
+
 * Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-1
 - Upstream 0.3.0 release.
 



From gemi at fedoraproject.org  Thu Aug 20 16:30:26 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Thu, 20 Aug 2009 16:30:26 +0000 (UTC)
Subject: rpms/erlang-esdl/devel .cvsignore, 1.3, 1.4 erlang-esdl.spec, 1.10, 
	1.11 sources, 1.3, 1.4
Message-ID: <20090820163026.68F1911C0348@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/erlang-esdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23319

Modified Files:
	.cvsignore erlang-esdl.spec sources 
Log Message:
new release 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-esdl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Apr 2007 19:22:39 -0000	1.3
+++ .cvsignore	20 Aug 2009 16:30:26 -0000	1.4
@@ -1 +1 @@
-esdl-0.96.0626.src.tar.gz
+esdl-1.0.1.src.tar.gz


Index: erlang-esdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-esdl/devel/erlang-esdl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- erlang-esdl.spec	24 Jul 2009 22:16:11 -0000	1.10
+++ erlang-esdl.spec	20 Aug 2009 16:30:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           erlang-esdl
-Version:        0.96.0626
-Release:        6%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Erlang OpenGL/SDL api and utilities
 
 Group:          Development/Libraries
@@ -11,8 +11,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  SDL-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	erlang = R12B
-Requires:	erlang = R12B
+BuildRequires:	erlang = R13B
+Requires:	erlang = R13B
 Provides:	esdl = %{version}-%{release}
 
 
@@ -34,9 +34,6 @@ Development files for ESDL.
 
 %prep
 %setup -q -n esdl-%{version}
-perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile
-perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{erlangdir}|' Makefile
-find . -name '*.c' -or -name '*.h' | xargs chmod 0644
 
 
 %build
@@ -46,7 +43,7 @@ PATH=%{erlangdir}/bin:$PATH make %{?_smp
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{erlangdir}/lib
-make DESTDIR=$RPM_BUILD_ROOT install
+make INSTALLDIR=$RPM_BUILD_ROOT%{erlangdir}/lib/esdl-%{version} install
 chmod 0644 Readme
 find . -name '*.html' | xargs chmod 0644
 find $RPM_BUILD_ROOT%{erlangdir}/lib -name 'Readme*' | xargs rm -f
@@ -78,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.1-1
+- new release 1.0.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96.0626-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/erlang-esdl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Apr 2007 19:22:39 -0000	1.3
+++ sources	20 Aug 2009 16:30:26 -0000	1.4
@@ -1 +1 @@
-5007750ddd989319442e8e040db3b6dd  esdl-0.96.0626.src.tar.gz
+50230ea81418cb029281a70627a5dd8e  esdl-1.0.1.src.tar.gz



From tgl at fedoraproject.org  Thu Aug 20 16:34:41 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 20 Aug 2009 16:34:41 +0000 (UTC)
Subject: rpms/libpng/devel .cvsignore, 1.20, 1.21 libpng.spec, 1.54,
	1.55 sources, 1.20, 1.21
Message-ID: <20090820163441.3F44311C006E@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libpng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24463

Modified Files:
	.cvsignore libpng.spec sources 
Log Message:
Update to libpng 1.2.39


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	13 Jun 2009 17:28:54 -0000	1.20
+++ .cvsignore	20 Aug 2009 16:34:40 -0000	1.21
@@ -1 +1 @@
-libpng-1.2.37.tar.bz2
+libpng-1.2.39.tar.bz2


Index: libpng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libpng.spec	25 Jul 2009 06:25:54 -0000	1.54
+++ libpng.spec	20 Aug 2009 16:34:40 -0000	1.55
@@ -1,8 +1,8 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.37
-Release: 2%{?dist}
+Version: 1.2.39
+Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng1
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Aug 20 2009 Tom Lane <tgl at redhat.com> 2:1.2.39-1
+- Update to libpng 1.2.39
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:1.2.37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	13 Jun 2009 17:28:56 -0000	1.20
+++ sources	20 Aug 2009 16:34:40 -0000	1.21
@@ -1 +1 @@
-6d1ee0888dbb711214943cb19c294b49  libpng-1.2.37.tar.bz2
+4d48ecff6fc7ab12e97b07d0f65ec2f0  libpng-1.2.39.tar.bz2



From emaldonado at fedoraproject.org  Thu Aug 20 16:48:24 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 16:48:24 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-config.in, 1.1, NONE nss-util.pc.in,
	1.1, NONE nss-split-util.sh, 1.1, NONE
Message-ID: <20090820164824.7CC7111C006E@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27479

Removed Files:
	nss-util-config.in nss-util.pc.in nss-split-util.sh 
Log Message:
Restoring nss-util to empty as it causes conflicts, bug 518460


--- nss-util-config.in DELETED ---


--- nss-util.pc.in DELETED ---


--- nss-split-util.sh DELETED ---



From rineau at fedoraproject.org  Thu Aug 20 16:54:37 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu, 20 Aug 2009 16:54:37 +0000 (UTC)
Subject: rpms/ipe/devel ipe.spec,1.23,1.24
Message-ID: <20090820165437.E991911C006E@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29225

Modified Files:
	ipe.spec 
Log Message:
* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.31.pre30%{?dist}
- Requires tex(latex) instead of tetex (replaced by TeXLive)
- Add default attributes (error reported by rpmlint)



Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ipe.spec	25 Jul 2009 03:30:56 -0000	1.23
+++ ipe.spec	20 Aug 2009 16:54:37 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.30.pre%{preversion}%{?dist}
+Release:        0.31.pre%{preversion}%{?dist}
 Summary:        Drawing editor for creating figures in PDF or PostScript formats
 
 Group:          Applications/Publishing
@@ -11,7 +11,7 @@ Group:          Applications/Publishing
 License:        GPLv2+ with exceptions
 #
 URL:            http://tclab.kaist.ac.kr/ipe/
-Source0:        http://luaforge.net/frs/download.php/2727/ipe-6.0pre30-src.tar.gz
+Source0:        http://luaforge.net/frs/download.php/2727/ipe-6.0pre%{preversion}-src.tar.gz
 
 Patch1:         ipe-6.0pre30-gcc43.patch
 
@@ -32,7 +32,7 @@ BuildRequires:  pkgconfig
 # Tips found at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191589#c7
 %global qtdir %(pkg-config --variable=prefix QtCore)
 
-Requires:       tetex-latex
+Requires:       tex(latex)
 Requires:       urw-fonts
 Requires:       xdg-utils
 
@@ -171,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*%{name}*.desktop
 
 %files devel
+%defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
 %{_libdir}/libipe.so
@@ -178,10 +179,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libipemodel.so
 
 %files doc
+%defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.31.pre30%{?dist}
+- Requires tex(latex) instead of tetex (replaced by TeXLive)
+- Add default attributes (error reported by rpmlint)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-0.30.pre30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gemi at fedoraproject.org  Thu Aug 20 16:58:29 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Thu, 20 Aug 2009 16:58:29 +0000 (UTC)
Subject: rpms/wings/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wings.spec, 
	1.13, 1.14
Message-ID: <20090820165829.B176611C006E@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/wings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30051

Modified Files:
	.cvsignore sources wings.spec 
Log Message:
new release 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wings/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Oct 2008 19:22:08 -0000	1.5
+++ .cvsignore	20 Aug 2009 16:58:29 -0000	1.6
@@ -1,2 +1,2 @@
-wings-0.99.05.tar.bz2
+wings-1.0.1.tar.bz2
 wings3d_manual1.6.1.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wings/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Oct 2008 19:22:09 -0000	1.5
+++ sources	20 Aug 2009 16:58:29 -0000	1.6
@@ -1,2 +1,2 @@
-da2b443a0a3314b317cb77bffc67a9e1  wings-0.99.05.tar.bz2
+ad94cef801e36ca7b3b7175729968fa2  wings-1.0.1.tar.bz2
 c01d19b4be79b647b8605dd32753da3a  wings3d_manual1.6.1.pdf


Index: wings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wings/devel/wings.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- wings.spec	27 Jul 2009 07:17:28 -0000	1.13
+++ wings.spec	20 Aug 2009 16:58:29 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           wings
-Version:        0.99.05
-Release:        4%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        3D Subdivision Modeler
 
 Group:          Applications/Multimedia
@@ -43,7 +43,6 @@ cp %{SOURCE1} .
 # %%{?_smp_mflags} breaks the build
 export ESDL_PATH=
 PATH=%{erlangdir}/bin:$PATH make
-#PATH=%{erlangdir}/bin:$PATH make -C plugins_src/jpeg opt lang
 
 
 %install
@@ -84,6 +83,10 @@ cp -f %{erlangdir}/bin/start.boot %{wing
 
 find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -rf
 find $RPM_BUILD_ROOT -name 'README' | xargs rm -f
+find $RPM_BUILD_ROOT -name '*.txt' | xargs chmod 0644
+find $RPM_BUILD_ROOT -name '*.auv' | xargs chmod 0644
+find $RPM_BUILD_ROOT -name '*.fs' | xargs chmod 0644
+find $RPM_BUILD_ROOT -name '*.vs' | xargs chmod 0644
 
 cat > $RPM_BUILD_ROOT%{_bindir}/wings <<EOF
 #!/bin/sh
@@ -140,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.1-1
+- new release 1.0.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.05-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Thu Aug 20 16:58:54 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 16:58:54 +0000 (UTC)
Subject: rpms/plexus-containers/devel import.log, NONE,
	1.1 plexus-component-annotations-build.xml, 1.1,
	1.2 plexus-container-default-build.xml, 1.1,
	1.2 plexus-containers-javadoc-junit-link.patch, 1.1,
	1.2 plexus-containers-settings.xml, 1.1,
	1.2 plexus-containers-sourcetarget.patch, 1.1,
	1.2 plexus-containers.spec, 1.1, 1.2 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090820165854.8A2C311C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-containers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29948/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-component-annotations-build.xml 
	plexus-container-default-build.xml 
	plexus-containers-javadoc-junit-link.patch 
	plexus-containers-settings.xml 
	plexus-containers-sourcetarget.patch plexus-containers.spec 
Log Message:
Initial import (review bug #518489)



--- NEW FILE import.log ---
plexus-containers-1_0-0_1_a34_7_fc11:HEAD:plexus-containers-1.0-0.1.a34.7.fc11.src.rpm:1250787374


Index: plexus-component-annotations-build.xml
===================================================================
RCS file: plexus-component-annotations-build.xml
diff -N plexus-component-annotations-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-component-annotations-build.xml	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1,76 @@
+<project name="plexus-component-annotations" default="jar" basedir=".">
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="plexus-component-annotations-1.0-alpha-30"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="javadocdir" value="target/site/annotationsdocs"></property>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" >
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
+    <property name="title" value="Plexus Component 1.0 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
+    </javadoc>
+  </target>
+</project>


Index: plexus-container-default-build.xml
===================================================================
RCS file: plexus-container-default-build.xml
diff -N plexus-container-default-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-container-default-build.xml	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1,82 @@
+<project name="plexus-container-default" default="jar" basedir=".">
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="plexus-container-default-1.0-alpha-30"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="javadocdir" value="target/site/apidocs"></property>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="false" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" >
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
+    <property name="title" value="Plexus Container Default 1.0 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
+    </javadoc>
+  </target>
+</project>

plexus-containers-javadoc-junit-link.patch:
 plexus-container-default/pom.xml |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Index: plexus-containers-javadoc-junit-link.patch
===================================================================
RCS file: plexus-containers-javadoc-junit-link.patch
diff -N plexus-containers-javadoc-junit-link.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-containers-javadoc-junit-link.patch	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1,33 @@
+diff -up ./plexus-container-default/pom.xml.sav ./plexus-container-default/pom.xml
+--- ./plexus-container-default/pom.xml.sav	2008-01-31 17:50:25.000000000 -0500
++++ ./plexus-container-default/pom.xml	2008-01-31 17:53:08.000000000 -0500
+@@ -51,18 +51,16 @@
+         <artifactId>maven-javadoc-plugin</artifactId>
+         <configuration>
+           <links>
+-            <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+-            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+-            <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+-            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+-            <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+-            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+-            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+-            <link>http://www.junit.org/junit/javadoc/</link>
+-            <link>http://logging.apache.org/log4j/docs/api/</link>
+-            <link>http://jakarta.apache.org/regexp/apidocs/</link>
+-            <link>http://jakarta.apache.org/velocity/api/</link>
++            <link>file:///usr/share/javadoc/java</link>
++            <link>file:///usr/share/javadoc/jakarta-commons-collections</link>
++            <link>file:///usr/share/javadoc/jakarta-commons-dbcp</link>
++            <link>file:///usr/share/javadoc/jakarta-commons-fileupload</link>
++            <link>file:///usr/share/javadoc/jakarta-commons-httpclient</link>
++            <link>file:///usr/share/javadoc/jakarta-commons-logging</link>
++            <link>file:///usr/share/javadoc/jakarta-commons-pool</link>
++            <link>file:///usr/share/javadoc/log4j</link>
++            <link>file:///usr/share/javadoc/regexp</link>
++            <link>file:///usr/share/javadoc/velocity</link>
+           </links>
+         </configuration>
+       </plugin>
+diff -up ./plexus-component-annotations/pom.xml.sav ./plexus-component-annotations/pom.xml


Index: plexus-containers-settings.xml
===================================================================
RCS file: plexus-containers-settings.xml
diff -N plexus-containers-settings.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-containers-settings.xml	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1,47 @@
+<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>

plexus-containers-sourcetarget.patch:
 pom.xml |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: plexus-containers-sourcetarget.patch
===================================================================
RCS file: plexus-containers-sourcetarget.patch
diff -N plexus-containers-sourcetarget.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-containers-sourcetarget.patch	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1,17 @@
+--- ./plexus-container-default/pom.xml.orig	2008-12-10 15:39:48.915862000 -0500
++++ ./plexus-container-default/pom.xml	2008-12-10 15:43:30.466597000 -0500
+@@ -27,6 +27,14 @@
+           </excludes>
+         </configuration>
+       </plugin>
++        <plugin>
++          <groupId>org.apache.maven.plugins</groupId>
++          <artifactId>maven-compiler-plugin</artifactId>
++          <configuration>
++            <source>1.4</source>
++            <target>1.4</target>
++          </configuration>
++        </plugin>
+     </plugins>
+   </build>
+   <dependencies>


Index: plexus-containers.spec
===================================================================
RCS file: plexus-containers.spec
diff -N plexus-containers.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-containers.spec	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1,339 @@
+# Copyright (c) 2000-2007, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define with_maven 0
+
+%define parent plexus
+%define subname containers
+%define namedversion 1.0-alpha-34
+
+Name:           %{parent}-%{subname}
+Version:        1.0
+Release:        0.1.a34.7%{?dist}
+Epoch:          0
+Summary:        Containers for Plexus
+License:        ASL 2.0 and Plexus
+Group:          Development/Libraries
+URL:            http://plexus.codehaus.org/
+# svn export \
+#  http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-34/
+# tar czf plexus-containers-1.0-alpha-34.tar.gz plexus-containers-1.0-alpha-34/
+Source0:        %{name}-%{namedversion}.tar.gz
+Source1:        plexus-container-default-build.xml
+Source2:        plexus-component-annotations-build.xml
+Source3:        plexus-containers-settings.xml
+
+Patch0:         plexus-containers-javadoc-junit-link.patch
+Patch1:         plexus-containers-sourcetarget.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+
+BuildRequires:  jpackage-utils >= 0:1.7.3
+%if %{with_maven}
+BuildRequires:  maven2 >= 2.0.4-10jpp
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire = 2.3
+BuildRequires:  maven-surefire-provider-junit = 2.3
+BuildRequires:  maven-doxia
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:  maven2-common-poms >= 1.0
+BuildRequires:  maven-release
+%else
+BuildRequires:  ant >= 0:1.6.5
+BuildRequires:  ant-junit
+BuildRequires:  junit
+%endif
+BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-utils
+
+Requires:       plexus-classworlds
+Requires:       plexus-utils
+
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
+
+%description
+The Plexus project seeks to create end-to-end developer tools for
+writing applications. At the core is the container, which can be
+embedded or for a full scale application server. There are many
+reusable components for hibernate, form processing, jndi, i18n,
+velocity, etc. Plexus also includes an application server which
+is like a J2EE application server, without all the baggage.
+
+
+%package component-annotations
+Summary:        Component API from %{name}
+Group:          Documentation
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       plexus-classworlds
+
+%description component-annotations
+%{summary}.
+
+%package container-default
+Summary:        Default Container from %{name}
+Group:          Documentation
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       plexus-classworlds
+Requires:       plexus-containers-component-annotations
+Requires:       plexus-utils
+Provides:       plexus-containers-component-api = %{epoch}:%{version}-%{release}
+
+%description container-default
+%{summary}.
+
+%package component-annotations-javadoc
+Summary:        Javadoc for plexus-component-annotations
+Group:          Documentation
+BuildRequires:  java-javadoc
+BuildRequires:  jakarta-commons-collections-javadoc
+BuildRequires:  jakarta-commons-dbcp-javadoc
+BuildRequires:  jakarta-commons-fileupload-javadoc
+BuildRequires:  jakarta-commons-httpclient-javadoc
+BuildRequires:  jakarta-commons-logging-javadoc
+BuildRequires:  jakarta-commons-pool-javadoc
+BuildRequires:  log4j-javadoc
+BuildRequires:  regexp-javadoc
+BuildRequires:  velocity-javadoc
+Requires:       java-javadoc
+Requires:       jakarta-commons-collections-javadoc
+Requires:       jakarta-commons-dbcp-javadoc
+Requires:       jakarta-commons-fileupload-javadoc
+Requires:       jakarta-commons-httpclient-javadoc
+Requires:       jakarta-commons-logging-javadoc
+Requires:       jakarta-commons-pool-javadoc
+Requires:       log4j-javadoc
+Requires:       regexp-javadoc
+Requires:       velocity-javadoc
+
+%description component-annotations-javadoc
+%{summary}.
+
+%package container-default-javadoc
+Summary:        Javadoc for plexus-container-default
+Group:          Documentation
+
+%description container-default-javadoc
+%{summary}.
+
+%prep
+%setup -q -n plexus-containers-%{namedversion}
+
+cp %{SOURCE1} plexus-container-default/build.xml
+cp %{SOURCE2} plexus-component-annotations/build.xml
+
+%patch0 -b .sav0
+%patch1 -b .sav0
+
+# Remove test that fails upstream as well
+rm -f \
+ plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerTest.java
+
+# to prevent ant from failing
+mkdir -p plexus-component-annotations/src/test/java
+
+%build
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# FIXME
+# Why does maven not support assert: "/UriConverter.java:[33,19] ';' expected"?
+sed -i "s|assert|// assert|g" \
+ plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java
+
+%if %{with_maven}
+    mvn-jpp \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        install
+
+    # Manual iteration should not be needed, but there is a bug in the javadoc 
+    # plugin which makes this necessary. See: 
+    # http://jira.codehaus.org/browse/MJAVADOC-157
+
+    for module in container-default \
+                  component-annotations; do
+        pushd plexus-$module
+            mvn-jpp \
+                -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+                 javadoc:javadoc
+        popd
+    done
+
+%else
+export OPT_JAR_LIST="ant/ant-junit junit"
+pushd plexus-component-annotations
+export CLASSPATH=$(build-classpath \
+plexus/classworlds \
+)
+ant -Dbuild.sysclasspath=only jar javadoc
+popd
+pushd plexus-container-default
+rm src/test/java/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.java
+CLASSPATH=$CLASSPATH:$(build-classpath \
+plexus/utils \
+)
+CLASSPATH=$CLASSPATH:../plexus-component-annotations/target/plexus-component-annotations-%{namedversion}.jar
+CLASSPATH=$CLASSPATH:target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
+popd
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+install -pm 644 plexus-container-default/target/*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-container-default-%{version}.jar
+install -pm 644 plexus-component-annotations/target/*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-annotations-%{version}.jar
+
+(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
+  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 \
+ pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+install -pm 644 \
+ plexus-container-default/pom.xml \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-containers-container-default.pom
+install -pm 644 \
+ plexus-component-annotations/pom.xml \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-containers-component-annotations.pom
+%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
+%add_to_maven_depmap org.codehaus.plexus containers-container-default %{namedversion} JPP/%{parent} containers-container-default
+%add_to_maven_depmap org.codehaus.plexus containers-component-annotations %{namedversion} JPP/%{parent} containers-component-annotations
+
+# component-api is now folded into container-default
+%add_to_maven_depmap org.codehaus.plexus containers-component-api %{namedversion} JPP/%{parent} containers-container-default
+
+# javadoc
+install -d -m 755 \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
+%if %{with_maven}
+cp -pr plexus-component-annotations/target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
+%else
+# directory name is annotationsdocs while building with ant
+ls -l plexus-component-annotations/target/site/
+cp -pr plexus-component-annotations/target/site/annotationsdocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
+%endif
+
+install -d -m 755 \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
+
+cp -pr plexus-container-default/target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
+
+ln -s %{parent}-containers-component-annotations-%{version} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations
+ln -s %{parent}-containers-container-default-%{version} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post component-annotations
+%update_maven_depmap
+
+%postun component-annotations
+%update_maven_depmap
+
+%post container-default
+%update_maven_depmap
+
+%postun container-default
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+
+%files component-annotations
+%defattr(-,root,root,-)
+%{_javadir}/%{parent}/containers-component-annotations*
+
+%files container-default
+%defattr(-,root,root,-)
+%{_javadir}/%{parent}/containers-container-default*
+
+%files component-annotations-javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/plexus-containers-component-annotations-%{version}
+%doc %{_javadocdir}/plexus-containers-component-annotations
+
+%files container-default-javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/plexus-containers-container-default-%{version}
+%doc %{_javadocdir}/plexus-containers-container-default
+
+%changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.1.a34.7
+- Clean up javadoc post/postun
+- Build with ant
+- Remove gcj support
+- Clean up groups
+
+* Fri May 15 2009 Fernando Nasser <fnasser at redhat.com> 1.0-0.1.a34.6
+- Fix license
+
+* Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 1.0-0.1.a34.5
+- Add BRs maven2-plugin-surfire*, maven-doxia*
+- Merge from RHEL-4-EP-5 1.0-0.1.a34.2, add plexus-containers-sourcetarget.patch
+- Rebuild with new maven2 2.0.8 built in non-bootstrap mode
+
+* Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 1.0-0.1.a34.4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
+
+* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.3
+- re-build with maven
+
+* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.2
+- fix bulding with ant
+- temporarily buid with ant
+
+* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.1jpp.2
+- re-build with maven
+- disabled assert in plexus-container-default/.../UriConverter.java???
+
+* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.1jpp.1
+- Imported into devel from dbhole's maven 2.0.8 packages
+
+* Tue Apr 08 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a34.0jpp.1
+- Initial build with original base spec from JPackage


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-containers/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2009 04:24:50 -0000	1.1
+++ .cvsignore	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1 @@
+plexus-containers-1.0-alpha-34.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-containers/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2009 04:24:50 -0000	1.1
+++ sources	20 Aug 2009 16:58:54 -0000	1.2
@@ -0,0 +1 @@
+caf796d8fc7c64a72923601e0985d6e4  plexus-containers-1.0-alpha-34.tar.gz



From notting at fedoraproject.org  Thu Aug 20 17:03:31 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 20 Aug 2009 17:03:31 +0000 (UTC)
Subject: rpms/mash/devel mash.spec,1.58,1.59
Message-ID: <20090820170331.CB70611C006E@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31170

Modified Files:
	mash.spec 
Log Message:
re-enable deltas



Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- mash.spec	11 Aug 2009 04:04:31 -0000	1.58
+++ mash.spec	20 Aug 2009 17:03:31 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -23,7 +23,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
 %build
@@ -48,6 +48,9 @@ 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
 



From agoode at fedoraproject.org  Thu Aug 20 17:04:42 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Thu, 20 Aug 2009 17:04:42 +0000 (UTC)
Subject: rpms/lwp/devel lwp-2.5-no-longjmp_chk.patch, NONE, 1.1 lwp.spec, 1.5,
	1.6
Message-ID: <20090820170442.832C811C006E@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/lwp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31474

Modified Files:
	lwp.spec 
Added Files:
	lwp-2.5-no-longjmp_chk.patch 
Log Message:
* Thu Aug 20 2009 Adam Goode <adam at spicenitz.org> - 2.5-3
- Add check to specfile
- Patch around lwp's creative use of longjmp that fails with fortify


lwp-2.5-no-longjmp_chk.patch:
 lwp_ucontext.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE lwp-2.5-no-longjmp_chk.patch ---
diff -ur lwp-2.5/src/lwp_ucontext.h lwp-2.5-new/src/lwp_ucontext.h
--- lwp-2.5/src/lwp_ucontext.h	2008-12-09 15:13:12.000000000 -0500
+++ lwp-2.5-new/src/lwp_ucontext.h	2009-08-20 12:58:41.333733985 -0400
@@ -21,7 +21,17 @@
 #include <config.h>
 #endif
 
+/* work around longjmp_chk */
+#ifdef __USE_FORTIFY_LEVEL
+#define LWP_SAVE_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
+#undef __USE_FORTIFY_LEVEL
 #include <setjmp.h>
+#define __USE_FORTIFY_LEVEL LWP_SAVE_USE_FORTIFY_LEVEL
+#undef LWP_SAVE_USE_FORTIFY_LEVEL
+#else
+#include <setjmp.h>
+#endif
+
 #include <signal.h>
 #include "lwp_stacktrace.h"
 


Index: lwp.spec
===================================================================
RCS file: /cvs/extras/rpms/lwp/devel/lwp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lwp.spec	25 Jul 2009 11:29:38 -0000	1.5
+++ lwp.spec	20 Aug 2009 17:04:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lwp
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C library for user-mode threading
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,6 +8,8 @@ URL:            http://www.coda.cs.cmu.e
 Source0:        ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         lwp-2.5-no-longjmp_chk.patch
+
 %description
 The LWP userspace threads library. The LWP threads library is used by the Coda
 distributed filesystem, RVM (a persistent VM library), and RPC2/SFTP (remote
@@ -26,6 +28,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-longjmp_chk
 
 
 %build
@@ -39,6 +42,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
+%check
+./src/testlwp 2
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -61,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Adam Goode <adam at spicenitz.org> - 2.5-3
+- Add check to specfile
+- Patch around lwp's creative use of longjmp that fails with fortify
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bjrosen at fedoraproject.org  Thu Aug 20 17:10:31 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 17:10:31 +0000 (UTC)
Subject: rpms/sys_basher/devel import.log, NONE, 1.1 sys_basher.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820171031.C3C2A11C0439@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32578/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sys_basher.spec 
Log Message:



--- NEW FILE import.log ---
sys_basher-1_1_23-1_fc11:HEAD:sys_basher-1.1.23-1.fc11.src.rpm:1250788155


--- NEW FILE sys_basher.spec ---
Name:		sys_basher
Version:	1.1.23
Release:	1%{?dist}
Summary:	A multithreaded hardware exerciser

Group:		Applications/System
License:	BSD
URL:		http://www.polybus.com/sys_basher_web/	
Source0:	http://www.polybus.com/sys_basher/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	tcsh
BuildRequires:	lm_sensors-devel
BuildRequires:	help2man

%description
sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
under conditions of maximum stress by running CPU, Memory and Disk tests on all
Cores simultaneously. In addition to reliablity testing, sys_basher measures
low level functions including memory bandwidth, disk IO bandwidth and integer
and floating point operations using unrolled loops.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYRIGHT
%{_bindir}/sys_basher
%{_mandir}/man1/sys_basher.1.*


%changelog
* Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.
* Tue Aug 18 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added voltage and fan speed reporting, added bit reverse addr test
* Thu Aug 13 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.21-1
- Improved random number test, added memory refresh test, increased MAX_CORES from 16 to 32, Changed BuildRoot
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.20-1
- Added a prototype for the open call in sys_disk
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-2
- Spec file clean up
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-1
- Cleaned up lint errors.
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-2
- Changed the build_sensors.csh script so that it's Ubuntu compatible.
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-1
- Changed -help output, added man file
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-6
- Changed sbinder to binder, added CFLAGS="$RPM_OPT_FLAGS" to make statement, removed -lform from Makefile
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-5
- Removed ncurses from the includes
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-4
- Changed Makefile to be Fedora friendly. Removed ncurses dependency
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-3
- Changed license from original BSD to New BSD
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-2
- Some fixes suggested by Fedora packagers
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-1
- First package release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:04:55 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:10:31 -0000	1.2
@@ -0,0 +1 @@
+sys_basher-1.1.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:04:55 -0000	1.1
+++ sources	20 Aug 2009 17:10:31 -0000	1.2
@@ -0,0 +1 @@
+7cf726f58b193e5c09abc95c539bb628  sys_basher-1.1.23.tar.gz



From bjrosen at fedoraproject.org  Thu Aug 20 17:15:27 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 17:15:27 +0000 (UTC)
Subject: rpms/sys_basher/F-11 import.log, NONE, 1.1 sys_basher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820171527.372D711C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1267/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sys_basher.spec 
Log Message:



--- NEW FILE import.log ---
sys_basher-1_1_23-1_fc11:F-11:sys_basher-1.1.23-1.fc11.src.rpm:1250788406


--- NEW FILE sys_basher.spec ---
Name:		sys_basher
Version:	1.1.23
Release:	1%{?dist}
Summary:	A multithreaded hardware exerciser

Group:		Applications/System
License:	BSD
URL:		http://www.polybus.com/sys_basher_web/	
Source0:	http://www.polybus.com/sys_basher/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	tcsh
BuildRequires:	lm_sensors-devel
BuildRequires:	help2man

%description
sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
under conditions of maximum stress by running CPU, Memory and Disk tests on all
Cores simultaneously. In addition to reliablity testing, sys_basher measures
low level functions including memory bandwidth, disk IO bandwidth and integer
and floating point operations using unrolled loops.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYRIGHT
%{_bindir}/sys_basher
%{_mandir}/man1/sys_basher.1.*


%changelog
* Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.
* Tue Aug 18 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added voltage and fan speed reporting, added bit reverse addr test
* Thu Aug 13 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.21-1
- Improved random number test, added memory refresh test, increased MAX_CORES from 16 to 32, Changed BuildRoot
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.20-1
- Added a prototype for the open call in sys_disk
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-2
- Spec file clean up
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-1
- Cleaned up lint errors.
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-2
- Changed the build_sensors.csh script so that it's Ubuntu compatible.
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-1
- Changed -help output, added man file
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-6
- Changed sbinder to binder, added CFLAGS="$RPM_OPT_FLAGS" to make statement, removed -lform from Makefile
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-5
- Removed ncurses from the includes
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-4
- Changed Makefile to be Fedora friendly. Removed ncurses dependency
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-3
- Changed license from original BSD to New BSD
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-2
- Some fixes suggested by Fedora packagers
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-1
- First package release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:04:55 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:15:26 -0000	1.2
@@ -0,0 +1 @@
+sys_basher-1.1.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:04:55 -0000	1.1
+++ sources	20 Aug 2009 17:15:27 -0000	1.2
@@ -0,0 +1 @@
+7cf726f58b193e5c09abc95c539bb628  sys_basher-1.1.23.tar.gz



From bjrosen at fedoraproject.org  Thu Aug 20 17:16:42 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 17:16:42 +0000 (UTC)
Subject: rpms/sys_basher/F-10 import.log, NONE, 1.1 sys_basher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820171642.AEAF411C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1670/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sys_basher.spec 
Log Message:



--- NEW FILE import.log ---
sys_basher-1_1_23-1_fc10:F-10:sys_basher-1.1.23-1.fc10.src.rpm:1250788575


--- NEW FILE sys_basher.spec ---
Name:		sys_basher
Version:	1.1.23
Release:	1%{?dist}
Summary:	A multithreaded hardware exerciser

Group:		Applications/System
License:	BSD
URL:		http://www.polybus.com/sys_basher_web/	
Source0:	http://www.polybus.com/sys_basher/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	tcsh
BuildRequires:	lm_sensors-devel
BuildRequires:	help2man

%description
sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
under conditions of maximum stress by running CPU, Memory and Disk tests on all
Cores simultaneously. In addition to reliablity testing, sys_basher measures
low level functions including memory bandwidth, disk IO bandwidth and integer
and floating point operations using unrolled loops.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYRIGHT
%{_bindir}/sys_basher
%{_mandir}/man1/sys_basher.1.*


%changelog
* Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.
* Tue Aug 18 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added voltage and fan speed reporting, added bit reverse addr test
* Thu Aug 13 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.21-1
- Improved random number test, added memory refresh test, increased MAX_CORES from 16 to 32, Changed BuildRoot
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.20-1
- Added a prototype for the open call in sys_disk
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-2
- Spec file clean up
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-1
- Cleaned up lint errors.
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-2
- Changed the build_sensors.csh script so that it's Ubuntu compatible.
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-1
- Changed -help output, added man file
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-6
- Changed sbinder to binder, added CFLAGS="$RPM_OPT_FLAGS" to make statement, removed -lform from Makefile
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-5
- Removed ncurses from the includes
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-4
- Changed Makefile to be Fedora friendly. Removed ncurses dependency
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-3
- Changed license from original BSD to New BSD
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-2
- Some fixes suggested by Fedora packagers
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-1
- First package release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:04:55 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:16:42 -0000	1.2
@@ -0,0 +1 @@
+sys_basher-1.1.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:04:55 -0000	1.1
+++ sources	20 Aug 2009 17:16:42 -0000	1.2
@@ -0,0 +1 @@
+335dacc078c198fea4a6786bca173c19  sys_basher-1.1.23.tar.gz



From bjrosen at fedoraproject.org  Thu Aug 20 17:19:31 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 17:19:31 +0000 (UTC)
Subject: rpms/sys_basher/EL-5 import.log, NONE, 1.1 sys_basher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820171931.C70DE11C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2301/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sys_basher.spec 
Log Message:



--- NEW FILE import.log ---
sys_basher-1_1_23-1:EL-5:sys_basher-1.1.23-1.src.rpm:1250788668


--- NEW FILE sys_basher.spec ---
Name:		sys_basher
Version:	1.1.23
Release:	1%{?dist}
Summary:	A multithreaded hardware exerciser

Group:		Applications/System
License:	BSD
URL:		http://www.polybus.com/sys_basher_web/	
Source0:	http://www.polybus.com/sys_basher/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	tcsh
BuildRequires:	lm_sensors-devel
BuildRequires:	help2man

%description
sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
under conditions of maximum stress by running CPU, Memory and Disk tests on all
Cores simultaneously. In addition to reliablity testing, sys_basher measures
low level functions including memory bandwidth, disk IO bandwidth and integer
and floating point operations using unrolled loops.

%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYRIGHT
%{_bindir}/sys_basher
%{_mandir}/man1/sys_basher.1.*


%changelog
* Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.
* Tue Aug 18 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.22-1
- Added voltage and fan speed reporting, added bit reverse addr test
* Thu Aug 13 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.21-1
- Improved random number test, added memory refresh test, increased MAX_CORES from 16 to 32, Changed BuildRoot
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.20-1
- Added a prototype for the open call in sys_disk
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-2
- Spec file clean up
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.19-1
- Cleaned up lint errors.
* Wed Aug 12 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-2
- Changed the build_sensors.csh script so that it's Ubuntu compatible.
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.18-1
- Changed -help output, added man file
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-6
- Changed sbinder to binder, added CFLAGS="$RPM_OPT_FLAGS" to make statement, removed -lform from Makefile
* Tue Aug 11 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-5
- Removed ncurses from the includes
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-4
- Changed Makefile to be Fedora friendly. Removed ncurses dependency
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-3
- Changed license from original BSD to New BSD
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-2
- Some fixes suggested by Fedora packagers
* Mon Aug 10 2009 Joshua Rosen <bjrosen at polybus.com>
- 1.1.17-1
- First package release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:04:55 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:19:31 -0000	1.2
@@ -0,0 +1 @@
+sys_basher-1.1.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:04:55 -0000	1.1
+++ sources	20 Aug 2009 17:19:31 -0000	1.2
@@ -0,0 +1 @@
+9cb0bb3dba71506051a1491544bd0bd7  sys_basher-1.1.23.tar.gz



From twaugh at fedoraproject.org  Thu Aug 20 17:21:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 20 Aug 2009 17:21:20 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-scp-git.patch, 
	1.1, 1.2 system-config-printer.spec, 1.281, 1.282
Message-ID: <20090820172120.6AA6D11C006E@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-serv2568

Modified Files:
	system-config-printer-scp-git.patch system-config-printer.spec 
Log Message:
* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-6
- Applied patch from 1.1.x (52a73b6).
  - Better printer icons representing status (bug #518020).
  - Use paused ico nwhen printer state reason is 'paused'.
  - Job status icon and state reason in jobs treeview (bug #518070).
  - Job creation times display fixes.
  - Use preferred object path for AuthenticationAgent (bug #518427).


system-config-printer-scp-git.patch:
 ChangeLog-OLD                 |    5 
 Makefile.am                   |    1 
 PhysicalDevice.py             |    3 
 ToolbarSearchEntry.py         |    2 
 applet.py                     |    3 
 authconn.py                   |    4 
 cupshelpers/cupshelpers.py    |    5 
 cupshelpers/ppds.py           |   19 
 cupspk.py                     |   80 ++-
 jobviewer.py                  |  375 +++++++++-----
 optionwidgets.py              |    3 
 po/ar.po                      |  522 ++++++++++---------
 po/as.po                      |  522 ++++++++++---------
 po/bg.po                      |  522 ++++++++++---------
 po/bn.po                      |  523 ++++++++++---------
 po/bn_IN.po                   |  519 ++++++++++---------
 po/bs.po                      |  522 ++++++++++---------
 po/ca.po                      |  522 ++++++++++---------
 po/cs.po                      |  522 ++++++++++---------
 po/cy.po                      |  523 ++++++++++---------
 po/da.po                      |  522 ++++++++++---------
 po/de.po                      |  531 ++++++++++----------
 po/el.po                      |  522 ++++++++++---------
 po/en_GB.po                   |  519 ++++++++++---------
 po/es.po                      | 1103 +++++++++++++++++-------------------------
 po/et.po                      |  522 ++++++++++---------
 po/fa.po                      |  523 ++++++++++---------
 po/fi.po                      |  522 ++++++++++---------
 po/fr.po                      |  522 ++++++++++---------
 po/gu.po                      |  519 ++++++++++---------
 po/he.po                      |  525 ++++++++++---------
 po/hi.po                      |  519 ++++++++++---------
 po/hr.po                      |  522 ++++++++++---------
 po/hu.po                      |  531 ++++++++++----------
 po/hy.po                      |  516 ++++++++++---------
 po/id.po                      |  523 ++++++++++---------
 po/is.po                      |  522 ++++++++++---------
 po/it.po                      |  519 ++++++++++---------
 po/ja.po                      |  519 ++++++++++---------
 po/ka.po                      |  516 ++++++++++---------
 po/kn.po                      |  519 ++++++++++---------
 po/ko.po                      |  519 ++++++++++---------
 po/lo.po                      |  516 ++++++++++---------
 po/lv.po                      |  522 ++++++++++---------
 po/mai.po                     |  519 ++++++++++---------
 po/mk.po                      |  523 ++++++++++---------
 po/ml.po                      |  519 ++++++++++---------
 po/mr.po                      |  519 ++++++++++---------
 po/ms.po                      |  523 ++++++++++---------
 po/my.po                      |  516 ++++++++++---------
 po/nb.po                      |  522 ++++++++++---------
 po/nl.po                      |  519 ++++++++++---------
 po/nn.po                      |  523 ++++++++++---------
 po/or.po                      |  519 ++++++++++---------
 po/pa.po                      |  519 ++++++++++---------
 po/pl.po                      |  670 +++++++++++++------------
 po/pt.po                      |  522 ++++++++++---------
 po/pt_BR.po                   |  522 ++++++++++---------
 po/ro.po                      |  519 ++++++++++---------
 po/ru.po                      |  519 ++++++++++---------
 po/si.po                      |  519 ++++++++++---------
 po/sk.po                      |  522 ++++++++++---------
 po/sl.po                      |  523 ++++++++++---------
 po/sr.po                      |  522 ++++++++++---------
 po/sr at latin.po                |  522 ++++++++++---------
 po/sv.po                      |  519 ++++++++++---------
 po/ta.po                      |  519 ++++++++++---------
 po/te.po                      |  519 ++++++++++---------
 po/th.po                      |  522 ++++++++++---------
 po/tr.po                      |  523 ++++++++++---------
 po/uk.po                      |  522 ++++++++++---------
 po/vi.po                      |  519 ++++++++++---------
 po/zh_CN.po                   |  519 ++++++++++---------
 po/zh_TW.po                   |  519 ++++++++++---------
 system-config-printer.py      |  190 +++++--
 timedops.py                   |    5 
 udev/udev-configure-printer.c |    4 
 77 files changed, 17581 insertions(+), 16670 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 system-config-printer-scp-git.patchIndex: system-config-printer-scp-git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-scp-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-scp-git.patch	19 Aug 2009 17:05:16 -0000	1.1
+++ system-config-printer-scp-git.patch	20 Aug 2009 17:21:19 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up system-config-printer-1.1.11/applet.py.scp-git system-config-printer-1.1.11/applet.py
 --- system-config-printer-1.1.11/applet.py.scp-git	2009-08-07 17:42:59.000000000 +0100
-+++ system-config-printer-1.1.11/applet.py	2009-08-19 17:51:49.110701234 +0100
++++ system-config-printer-1.1.11/applet.py	2009-08-20 17:50:51.385793784 +0100
 @@ -88,7 +88,8 @@ class NewPrinterNotification(dbus.servic
      def GetReady (self):
          self.wake_up ()
@@ -13,7 +13,7 @@ diff -up system-config-printer-1.1.11/ap
          gobject.timeout_add (60 * 1000, self.timeout_ready)
 diff -up system-config-printer-1.1.11/authconn.py.scp-git system-config-printer-1.1.11/authconn.py
 --- system-config-printer-1.1.11/authconn.py.scp-git	2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/authconn.py	2009-08-19 17:51:49.112701196 +0100
++++ system-config-printer-1.1.11/authconn.py	2009-08-20 17:50:51.387792339 +0100
 @@ -22,6 +22,7 @@ import cups
  import cupspk
  import gobject
@@ -34,7 +34,7 @@ diff -up system-config-printer-1.1.11/au
          else:
 diff -up system-config-printer-1.1.11/ChangeLog-OLD.scp-git system-config-printer-1.1.11/ChangeLog-OLD
 --- system-config-printer-1.1.11/ChangeLog-OLD.scp-git	2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/ChangeLog-OLD	2009-08-19 17:51:49.101700079 +0100
++++ system-config-printer-1.1.11/ChangeLog-OLD	2009-08-20 17:50:51.376791347 +0100
 @@ -1,3 +1,8 @@
 +2009-08-11  Tim Waugh  <twaugh at redhat.com>
 +
@@ -46,8 +46,16 @@ diff -up system-config-printer-1.1.11/Ch
  	* system-config-printer.py (NewPrinterGUI.nextNPTab): Don't log
 diff -up system-config-printer-1.1.11/cupshelpers/cupshelpers.py.scp-git system-config-printer-1.1.11/cupshelpers/cupshelpers.py
 --- system-config-printer-1.1.11/cupshelpers/cupshelpers.py.scp-git	2009-08-05 11:33:24.000000000 +0100
-+++ system-config-printer-1.1.11/cupshelpers/cupshelpers.py	2009-08-19 17:51:49.114700998 +0100
-@@ -642,6 +642,10 @@ def missingPackagesAndExecutables(ppd):
++++ system-config-printer-1.1.11/cupshelpers/cupshelpers.py	2009-08-20 17:50:51.389792042 +0100
+@@ -89,6 +89,7 @@ class Printer:
+         if self.is_shared is None:
+             self.is_shared = not self.not_shared
+         del self.not_shared
++        self.other_attributes = kw
+ 
+     def getAttributes(self):
+         """
+@@ -642,6 +643,10 @@ def missingPackagesAndExecutables(ppd):
      # First, a local function.  How to check that something exists
      # in a path:
      def pathcheck (name, path="/usr/bin:/bin"):
@@ -60,7 +68,7 @@ diff -up system-config-printer-1.1.11/cu
          if p != -1:
 diff -up system-config-printer-1.1.11/cupshelpers/ppds.py.scp-git system-config-printer-1.1.11/cupshelpers/ppds.py
 --- system-config-printer-1.1.11/cupshelpers/ppds.py.scp-git	2009-08-07 17:50:41.000000000 +0100
-+++ system-config-printer-1.1.11/cupshelpers/ppds.py	2009-08-19 17:51:49.116700675 +0100
++++ system-config-printer-1.1.11/cupshelpers/ppds.py	2009-08-20 17:50:51.391791710 +0100
 @@ -180,6 +180,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
                     " ps3",
                     " pxl",
@@ -69,23 +77,6 @@ diff -up system-config-printer-1.1.11/cu
                     ","]:
          s = modell.find (suffix)
          if s != -1:
-@@ -208,14 +209,14 @@ def ppdMakeModelSplit (ppd_make_and_mode
- # Some drivers are just generally better than others.
- # Here is the preference list:
- DRIVER_TYPE_DOWNLOADED_NOW = 5
--DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT = 8
- DRIVER_TYPE_VENDOR = 10
--DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 15
- DRIVER_TYPE_HPCUPS = 16
- DRIVER_TYPE_FOOMATIC_HPIJS_ON_HP = 17
- DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED = 20
- DRIVER_TYPE_GUTENPRINT_NATIVE = 25
- DRIVER_TYPE_SPLIX = 27
-+DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT = 28
-+DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 29
- DRIVER_TYPE_FOOMATIC_PS = 30
- DRIVER_TYPE_FOOMATIC_HPIJS = 40
- DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED = 50
 @@ -229,12 +230,6 @@ def _getDriverType (ppdname, ppds=None):
      """Decides which of the above types ppdname is."""
      if ppdname.find ("turboprint") != -1:
@@ -112,9 +103,22 @@ diff -up system-config-printer-1.1.11/cu
      if ppdname.find ("-hpijs") != -1:
          if ppdname.find ("hpijs-rss") == -1:
              return DRIVER_TYPE_FOOMATIC_HPIJS
+@@ -419,12 +420,6 @@ class PPDs:
+                 if t == DRIVER_TYPE_FOOMATIC_HPIJS:
+                     # Prefer HPIJS for HP devices.
+                     t = DRIVER_TYPE_FOOMATIC_HPIJS_ON_HP
+-                    # For HP LaserJet 12xx/13xx prefer HPIJS over
+-                    # PostScript, as they do not have enough memory
+-                    # to render complex graphics with their on-board
+-                    # PostScript interpreter
+-                    if re.search(r"(?i)HP[-_]LaserJet_1[23]\d\d", x):
+-                        t = DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
+             return t
+ 
+         def sort_ppdnames (a, b):
 diff -up system-config-printer-1.1.11/cupspk.py.scp-git system-config-printer-1.1.11/cupspk.py
 --- system-config-printer-1.1.11/cupspk.py.scp-git	2009-08-05 11:33:24.000000000 +0100
-+++ system-config-printer-1.1.11/cupspk.py	2009-08-19 17:51:49.119702393 +0100
++++ system-config-printer-1.1.11/cupspk.py	2009-08-20 17:50:51.394792432 +0100
 @@ -1,8 +1,8 @@
  # vim: set ts=4 sw=4 et: coding=UTF-8
  #
@@ -134,6 +138,15 @@ diff -up system-config-printer-1.1.11/cu
  
  import cups
  import dbus
+@@ -41,7 +40,7 @@ from dbus.mainloop.glib import DBusGMain
+ DBusGMainLoop(set_as_default=True)
+ 
+ PK_AUTH_NAME  = 'org.freedesktop.PolicyKit.AuthenticationAgent'
+-PK_AUTH_PATH  = '/'
++PK_AUTH_PATH  = '/org/gnome/PolicyKit/Manager'
+ PK_AUTH_IFACE = 'org.freedesktop.PolicyKit.AuthenticationAgent'
+ 
+ CUPS_PK_NAME  = 'org.opensuse.CupsPkHelper.Mechanism'
 @@ -152,7 +151,7 @@ class Connection:
          pk_auth_running = False
  
@@ -231,8 +244,118 @@ diff -up system-config-printer-1.1.11/cu
 diff -up system-config-printer-1.1.11/gtk_treeviewtooltips.py.scp-git system-config-printer-1.1.11/gtk_treeviewtooltips.py
 diff -up system-config-printer-1.1.11/jobviewer.py.scp-git system-config-printer-1.1.11/jobviewer.py
 --- system-config-printer-1.1.11/jobviewer.py.scp-git	2009-08-07 17:42:59.000000000 +0100
-+++ system-config-printer-1.1.11/jobviewer.py	2009-08-19 17:51:49.123700820 +0100
-@@ -324,15 +324,18 @@ class JobViewer (GtkGUI, monitor.Watcher
++++ system-config-printer-1.1.11/jobviewer.py	2009-08-20 17:50:51.399792481 +0100
+@@ -209,30 +209,44 @@ class JobViewer (GtkGUI, monitor.Watcher
+ 
+         self.job_menubar_item.set_submenu (self.job_context_menu)
+ 
+-        text=0
+-        for name in [_("Job"),
+-                     _("User"),
+-                     _("Document"),
+-                     _("Printer"),
+-                     _("Size"),
+-                     _("Time submitted"),
+-                     _("Status")]:
+-            if text == 1 and trayicon:
++        for skip, ellipsize, name, setter in \
++                [(False, False, _("Job"), self._set_job_job_number_text),
++                 (True, False, _("User"), self._set_job_user_text),
++                 (False, True, _("Document"), self._set_job_document_text),
++                 (False, True, _("Printer"), self._set_job_printer_text),
++                 (False, False, _("Size"), self._set_job_size_text)]:
++            if trayicon and skip:
+                 # Skip the user column for the trayicon.
+-                text += 1
+                 continue
++
+             cell = gtk.CellRendererText()
+-            if text == 2 or text == 3:
++            if ellipsize:
+                 # Ellipsize the 'Document' and 'Printer' columns.
+                 cell.set_property ("ellipsize", pango.ELLIPSIZE_END)
+                 cell.set_property ("width-chars", 20)
+-            column = gtk.TreeViewColumn(name, cell, text=text)
++            column = gtk.TreeViewColumn(name, cell)
++            column.set_cell_data_func (cell, setter)
+             column.set_resizable(True)
+             self.treeview.append_column(column)
+-            text += 1
++
++        cell = gtk.CellRendererText ()
++        column = gtk.TreeViewColumn (_("Time submitted"), cell, text=1)
++        column.set_resizable (True)
++        self.treeview.append_column (column)
++
++        column = gtk.TreeViewColumn (_("Status"))
++        icon = gtk.CellRendererPixbuf ()
++        column.pack_start (icon, False)
++        text = gtk.CellRendererText ()
++	text.set_property ("ellipsize", pango.ELLIPSIZE_END)
++	text.set_property ("width-chars", 20)
++        column.pack_start (text, True)
++        column.set_cell_data_func (icon, self._set_job_status_icon)
++        column.set_cell_data_func (text, self._set_job_status_text)
++        self.treeview.append_column (column)
+ 
+         self.treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)
+-        self.store = gtk.TreeStore(int, str, str, str, str, str, str)
++        self.store = gtk.TreeStore(int, str)
+         self.store.set_sort_column_id (0, gtk.SORT_DESCENDING)
+         self.treeview.set_model(self.store)
+         self.treeview.set_rules_hint (True)
+@@ -267,24 +281,24 @@ class JobViewer (GtkGUI, monitor.Watcher
+ 
+         self.statusbar_set = False
+ 
++        theme = gtk.icon_theme_get_default ()
++        self.icon_jobs = theme.load_icon (ICON, 22, 0)
++        self.icon_jobs_processing = theme.load_icon ("printer-printing",
++                                                     22, 0)
[...94456 lines suppressed...]
                                printer.job_sheets_supported,
                                printer.job_sheet_start,
@@ -2115,7 +93610,7 @@ diff -up system-config-printer-1.1.11/sy
              self.fillComboBox(self.cmbPEndBanner, printer.job_sheets_supported,
                                printer.job_sheet_end,
                                ppdippstr.job_sheets)
-@@ -2592,7 +2608,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2592,7 +2643,7 @@ class GUI(GtkGUI, monitor.Watcher):
              self.updateMarkerLevels ()
              self.updateStateReasons ()
  
@@ -2124,7 +93619,7 @@ diff -up system-config-printer-1.1.11/sy
  
      def fillPrinterOptions(self, name, editable):
          # remove Class membership tab
-@@ -2912,7 +2928,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2912,7 +2963,7 @@ class GUI(GtkGUI, monitor.Watcher):
              except cups.HTTPError, (s,):
                  show_HTTP_Error (s, self.PrintersWindow)
                  # Not fatal.
@@ -2133,7 +93628,7 @@ diff -up system-config-printer-1.1.11/sy
                  show_IPP_Error (e, msg, self.PrintersWindow)
                  # Not fatal.
  
-@@ -3034,8 +3050,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3034,8 +3085,8 @@ class GUI(GtkGUI, monitor.Watcher):
              return
  
          try:
@@ -2144,7 +93639,7 @@ diff -up system-config-printer-1.1.11/sy
                  name = model.get_value (iter, 2)
                  self.cups._begin_operation (_("deleting printer %s") % name)
                  name = unicode (name)
-@@ -3056,8 +3072,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3056,8 +3107,8 @@ class GUI(GtkGUI, monitor.Watcher):
          iconview = self.dests_iconview
          paths = iconview.get_selected_items ()
          model = iconview.get_model ()
@@ -2155,7 +93650,7 @@ diff -up system-config-printer-1.1.11/sy
              printer = model.get_value (iter, 0)
              name = unicode (model.get_value (iter, 2), 'utf-8')
              self.cups._begin_operation (_("modifying printer %s") % name)
-@@ -3082,8 +3098,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3082,8 +3133,8 @@ class GUI(GtkGUI, monitor.Watcher):
          paths = iconview.get_selected_items ()
          model = iconview.get_model ()
          success = False
@@ -2166,7 +93661,7 @@ diff -up system-config-printer-1.1.11/sy
              printer = model.get_value (iter, 0)
              self.cups._begin_operation (_("modifying printer %s") %
                                          printer.name)
-@@ -3423,10 +3439,16 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3423,10 +3474,16 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def printer_event (self, mon, printer, eventname, event):
          monitor.Watcher.printer_event (self, mon, printer, eventname, event)
@@ -2183,7 +93678,7 @@ diff -up system-config-printer-1.1.11/sy
              if self.PrinterPropertiesDialog.get_property('visible'):
                  self.printer.getAttributes ()
                  self.updatePrinterProperties ()
-@@ -3491,7 +3513,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -3491,7 +3548,6 @@ class NewPrinterGUI(GtkGUI):
  
      def __init__(self, mainapp):
          self.mainapp = mainapp
@@ -2191,7 +93686,7 @@ diff -up system-config-printer-1.1.11/sy
          self.language = mainapp.language
  
          self.options = {} # keyword -> Option object
-@@ -3590,6 +3611,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -3590,6 +3646,9 @@ class NewPrinterGUI(GtkGUI):
                                "tvNPDownloadableDriverLicense",
                                "rbtnNPDownloadLicenseYes",
                                "rbtnNPDownloadLicenseNo"],
@@ -2201,7 +93696,7 @@ diff -up system-config-printer-1.1.11/sy
                           "SMBBrowseDialog":
                               ["SMBBrowseDialog",
                                "tvSMBBrowser",
-@@ -3604,8 +3628,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -3604,8 +3663,6 @@ class NewPrinterGUI(GtkGUI):
              dialog.connect ("delete-event", on_delete_just_hide)
  
          # share with mainapp
@@ -2210,7 +93705,7 @@ diff -up system-config-printer-1.1.11/sy
          self.busy = mainapp.busy
          self.ready = mainapp.ready
  
-@@ -3684,7 +3706,8 @@ class NewPrinterGUI(GtkGUI):
+@@ -3684,7 +3741,8 @@ class NewPrinterGUI(GtkGUI):
  
          self.SMBBrowseDialog.set_transient_for(self.NewPrinterWindow)
  
@@ -2220,7 +93715,7 @@ diff -up system-config-printer-1.1.11/sy
  
          ppd_filter = gtk.FileFilter()
          ppd_filter.set_name(_("PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"))
-@@ -3873,7 +3896,12 @@ class NewPrinterGUI(GtkGUI):
+@@ -3873,7 +3931,12 @@ class NewPrinterGUI(GtkGUI):
                  self.auto_model = 'Queue'
  
              try:
@@ -2234,7 +93729,7 @@ diff -up system-config-printer-1.1.11/sy
              except cups.IPPError, (e, m):
                  show_IPP_Error (e, m, parent=self.mainapp.PrintersWindow)
                  return
-@@ -3953,9 +3981,10 @@ class NewPrinterGUI(GtkGUI):
+@@ -3953,9 +4016,10 @@ class NewPrinterGUI(GtkGUI):
                                           _('Searching') + '</span>\n\n' +
                                           _('Searching for downloadable drivers'))
                  if not parent:
@@ -2246,7 +93741,7 @@ diff -up system-config-printer-1.1.11/sy
  
              if self.mainapp.cups == None:
                  debugprint("CUPS connection lost, reconnecting ...")
-@@ -4032,9 +4061,10 @@ class NewPrinterGUI(GtkGUI):
+@@ -4032,9 +4096,10 @@ class NewPrinterGUI(GtkGUI):
                                           _('Searching') + '</span>\n\n' +
                                           _('Searching for drivers'))
                  if not parent:
@@ -2259,7 +93754,7 @@ diff -up system-config-printer-1.1.11/sy
  
              while gtk.events_pending ():
                  gtk.main_iteration ()
-@@ -4347,6 +4377,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4347,6 +4412,7 @@ class NewPrinterGUI(GtkGUI):
                                           _('Searching for drivers'))
                  self.WaitWindow.set_transient_for (self.NewPrinterWindow)
                  self.WaitWindow.show ()
@@ -2267,7 +93762,7 @@ diff -up system-config-printer-1.1.11/sy
                  self.busy (self.NewPrinterWindow)
  
                  # Keep the UI refreshed while we wait for the drivers
-@@ -4547,6 +4578,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4547,6 +4613,7 @@ class NewPrinterGUI(GtkGUI):
              parent = self.mainapp.PrintersWindow
          self.WaitWindow.set_transient_for (parent)
          self.WaitWindow.show_now ()
@@ -2275,7 +93770,7 @@ diff -up system-config-printer-1.1.11/sy
          while gtk.events_pending ():
              gtk.main_iteration ()
  
-@@ -4629,7 +4661,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4629,7 +4696,7 @@ class NewPrinterGUI(GtkGUI):
              return True # assume plugin not required
          # Check whether the plugin is already installed
          if hplip_version.startswith("3"):
@@ -2284,7 +93779,7 @@ diff -up system-config-printer-1.1.11/sy
              cmd = 'LC_ALL=C hp-mkuri -c'
              debugprint (uri + ": " + hpmodel)
              try:
-@@ -5397,22 +5429,36 @@ class NewPrinterGUI(GtkGUI):
+@@ -5397,22 +5464,36 @@ class NewPrinterGUI(GtkGUI):
          verified = False
          if hostport != None:
              (host, port) = urllib.splitnport (hostport, defport=631)
@@ -2329,7 +93824,7 @@ diff -up system-config-printer-1.1.11/sy
          else:
              debugprint (uri)
  
-@@ -5733,6 +5779,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5733,6 +5814,7 @@ class NewPrinterGUI(GtkGUI):
                                   _('Searching for printers'))
          self.WaitWindow.set_transient_for (self.NewPrinterWindow)
          self.WaitWindow.show_now ()
@@ -2337,7 +93832,7 @@ diff -up system-config-printer-1.1.11/sy
          printers = server.probe()
          self.WaitWindow.hide ()
  
-@@ -6131,14 +6178,26 @@ class NewPrinterGUI(GtkGUI):
+@@ -6131,14 +6213,26 @@ class NewPrinterGUI(GtkGUI):
                  model.append((driver, ))
          self.tvNPDrivers.columns_autosize()
  
@@ -2368,7 +93863,7 @@ diff -up system-config-printer-1.1.11/sy
          path, column = widget.get_cursor()
 diff -up system-config-printer-1.1.11/timedops.py.scp-git system-config-printer-1.1.11/timedops.py
 --- system-config-printer-1.1.11/timedops.py.scp-git	2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/timedops.py	2009-08-19 17:51:49.150700369 +0100
++++ system-config-printer-1.1.11/timedops.py	2009-08-20 17:50:58.376798597 +0100
 @@ -32,7 +32,7 @@ class Timed:
          pass
  
@@ -2394,7 +93889,7 @@ diff -up system-config-printer-1.1.11/ti
 +        return False
 diff -up system-config-printer-1.1.11/ToolbarSearchEntry.py.scp-git system-config-printer-1.1.11/ToolbarSearchEntry.py
 --- system-config-printer-1.1.11/ToolbarSearchEntry.py.scp-git	2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/ToolbarSearchEntry.py	2009-08-19 17:51:49.108701241 +0100
++++ system-config-printer-1.1.11/ToolbarSearchEntry.py	2009-08-20 17:50:51.383792212 +0100
 @@ -68,7 +68,7 @@ class ToolbarSearchEntry (gtk.HBox):
          label = gtk.Label ()
          label.set_text_with_mnemonic (_("_Filter:"))
@@ -2406,7 +93901,7 @@ diff -up system-config-printer-1.1.11/To
          if gtk.__dict__.has_key ('ENTRY_ICON_PRIMARY'):
 diff -up system-config-printer-1.1.11/udev/udev-configure-printer.c.scp-git system-config-printer-1.1.11/udev/udev-configure-printer.c
 --- system-config-printer-1.1.11/udev/udev-configure-printer.c.scp-git	2009-08-07 17:42:55.000000000 +0100
-+++ system-config-printer-1.1.11/udev/udev-configure-printer.c	2009-08-19 17:51:49.153701536 +0100
++++ system-config-printer-1.1.11/udev/udev-configure-printer.c	2009-08-20 17:50:58.379792683 +0100
 @@ -791,8 +791,8 @@ find_matching_device_uris (struct device
  
        /* Now check the manufacturer and model names. */


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- system-config-printer.spec	19 Aug 2009 17:05:16 -0000	1.281
+++ system-config-printer.spec	20 Aug 2009 17:21:19 -0000	1.282
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -76,7 +76,7 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-# Applied patch from 1.1.x (3f45e96).
+# Applied patch from 1.1.x (52a73b6).
 %patch1 -p1 -b .scp-git
 aclocal
 automake --copy --add-missing
@@ -192,6 +192,14 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-6
+- Applied patch from 1.1.x (52a73b6).
+  - Better printer icons representing status (bug #518020).
+  - Use paused ico nwhen printer state reason is 'paused'.
+  - Job status icon and state reason in jobs treeview (bug #518070).
+  - Job creation times display fixes.
+  - Use preferred object path for AuthenticationAgent (bug #518427).
+
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-5
 - Applied patch from 1.1.x (3f45e96):
   - Show a 'paused' emblem for rejecting/disabled printers



From tmraz at fedoraproject.org  Thu Aug 20 17:22:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 20 Aug 2009 17:22:41 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-fips.patch,1.3,1.4
Message-ID: <20090820172241.EAF6511C006E@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3732

Modified Files:
	openssl-1.0.0-beta3-fips.patch 
Log Message:
- fix RC4 prototype


openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/Makefile           |    4 
 crypto/camellia/asm/cmll-x86.pl    |    7 
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_fblk.c        |   68 ++
 crypto/camellia/cmll_misc.c        |    9 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   48 +
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   23 
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  101 +++
 crypto/fips/fips_des_selftest.c    |  137 +++++
 crypto/fips/fips_dsa_selftest.c    |  180 +++++++
 crypto/fips/fips_hmac_selftest.c   |  135 +++++
 crypto/fips/fips_rand.c            |  410 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  371 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  432 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   97 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    3 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  158 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |   99 +++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 117 files changed, 10054 insertions(+), 180 deletions(-)

Index: openssl-1.0.0-beta3-fips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl-1.0.0-beta3-fips.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openssl-1.0.0-beta3-fips.patch	20 Aug 2009 15:08:21 -0000	1.3
+++ openssl-1.0.0-beta3-fips.patch	20 Aug 2009 17:22:41 -0000	1.4
@@ -544,7 +544,7 @@ diff -up openssl-1.0.0-beta3/crypto/came
 +	   cmll_cfb.c cmll_ctr.c cmll_fblk.c
  
 -LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC)
-+LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o cmll_fblk.o $(CMLL_ENC)
++LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC) cmll_fblk.o
  
  SRC= $(LIBSRC)
  
@@ -10850,7 +10850,7 @@ diff -up /dev/null openssl-1.0.0-beta3/c
 diff -up openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips openssl-1.0.0-beta3/crypto/rc4/rc4.h
 --- openssl-1.0.0-beta3/crypto/rc4/rc4.h.fips	2009-08-11 18:07:30.000000000 +0200
 +++ openssl-1.0.0-beta3/crypto/rc4/rc4.h	2009-08-11 18:07:30.000000000 +0200
-@@ -78,8 +78,11 @@ typedef struct rc4_key_st
+@@ -78,6 +78,9 @@ typedef struct rc4_key_st
  
   
  const char *RC4_options(void);
@@ -10858,11 +10858,8 @@ diff -up openssl-1.0.0-beta3/crypto/rc4/
 +void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
 +#endif
  void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
--void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
-+void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata,
+ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
  		unsigned char *outdata);
- 
- #ifdef  __cplusplus
 diff -up openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c
 --- openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c.fips	2007-01-21 14:07:13.000000000 +0100
 +++ openssl-1.0.0-beta3/crypto/rc4/rc4_skey.c	2009-08-11 18:07:30.000000000 +0200



From rineau at fedoraproject.org  Thu Aug 20 17:22:44 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu, 20 Aug 2009 17:22:44 +0000 (UTC)
Subject: rpms/ipe/devel .cvsignore, 1.6, 1.7 ipe.spec, 1.24, 1.25 sources,
	1.5, 1.6 ipe-6.0pre28-patch1.patch, 1.1,
	NONE ipe-6.0pre30-pdftex1.40.patch, 1.1, NONE
Message-ID: <20090820172244.BEDB211C006E@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3791

Modified Files:
	.cvsignore ipe.spec sources 
Removed Files:
	ipe-6.0pre28-patch1.patch ipe-6.0pre30-pdftex1.40.patch 
Log Message:
* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.32.pre32patch1%{?dist}
- New upstream release
- ipe5toxml no longer shipped
- Patch ipe-6.0pre30-pdftex1.40.patch is obsoleted



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 May 2008 19:16:49 -0000	1.6
+++ .cvsignore	20 Aug 2009 17:22:44 -0000	1.7
@@ -1,4 +1 @@
-ipe-6.0pre30-src.tar.gz
-gpl-2.0.txt
-license.txt
-readme.txt
+ipe-6.0pre32patch1-src.tar.gz


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ipe.spec	20 Aug 2009 16:54:37 -0000	1.24
+++ ipe.spec	20 Aug 2009 17:22:44 -0000	1.25
@@ -1,8 +1,8 @@
-%define preversion 30
+%define preversion 32patch1
 
 Name:           ipe
 Version:        6.0
-Release:        0.31.pre%{preversion}%{?dist}
+Release:        0.32.pre%{preversion}%{?dist}
 Summary:        Drawing editor for creating figures in PDF or PostScript formats
 
 Group:          Applications/Publishing
@@ -11,13 +11,10 @@ Group:          Applications/Publishing
 License:        GPLv2+ with exceptions
 #
 URL:            http://tclab.kaist.ac.kr/ipe/
-Source0:        http://luaforge.net/frs/download.php/2727/ipe-6.0pre%{preversion}-src.tar.gz
+Source0:        http://luaforge.net/frs/download.php/4052/ipe-6.0pre%{preversion}-src.tar.gz
 
 Patch1:         ipe-6.0pre30-gcc43.patch
 
-# Upstream patch. http://http.theano.de/cgi-bin/bugzilla/show_bug.cgi?id=253
-Patch2:         ipe-6.0pre30-pdftex1.40.patch
-
 # Fedora specific patch. It removes the runtime test of the Freetype
 # library version. Freetype is supposed to bump its soname if the ABI is
 # incompatible.
@@ -39,7 +36,6 @@ Requires:       xdg-utils
 Provides:       ipe(api) = 5.99.%{preversion}pre
 Provides:       ipetoipe = %{version}
 Provides:       ipetopng = %{version}
-Provides:       ipe5toxml = %{version}
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -68,9 +64,11 @@ Requires: %{name} = %{version}-%{release
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
 %patch1 -p1 -b '.gcc43'
-%patch2 -p1 -b '.pdf140'
 %patch10 -p1 -b '.no-freetype-check'
 
+# fix files permissions
+find src -type f -exec chmod -x {} +
+
 %build
 export QTDIR=%{qtdir}
 
@@ -158,12 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/ipe
 %dir %{_datadir}/ipe/%{version}
 %{_datadir}/ipe/%{version}/*.xml
-%{_bindir}/ipe5toxml
 %{_bindir}/ipe
 %{_bindir}/ipetoipe
 %{_bindir}/ipetopng
 #%{_bindir}/figtoipe
-%{_mandir}/man1/ipe5toxml.1*
 %{_mandir}/man1/ipe.1*
 %{_mandir}/man1/ipetoipe.1*
 %{_mandir}/man1/ipetopng.1*
@@ -184,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.32.pre32patch1%{?dist}
+- New upstream release
+- ipe5toxml no longer shipped
+- Patch ipe-6.0pre30-pdftex1.40.patch is obsoleted
+
 * Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.31.pre30%{?dist}
 - Requires tex(latex) instead of tetex (replaced by TeXLive)
 - Add default attributes (error reported by rpmlint)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Feb 2008 13:30:50 -0000	1.5
+++ sources	20 Aug 2009 17:22:44 -0000	1.6
@@ -1 +1 @@
-d0b203f1cbda664c76681b79684bde76  ipe-6.0pre30-src.tar.gz
+2d979ee33944452b7ba18a0ba7c176f3  ipe-6.0pre32patch1-src.tar.gz


--- ipe-6.0pre28-patch1.patch DELETED ---


--- ipe-6.0pre30-pdftex1.40.patch DELETED ---



From akurtakov at fedoraproject.org  Thu Aug 20 17:27:04 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 17:27:04 +0000 (UTC)
Subject: rpms/directory-naming/devel directory-naming.spec,1.3,1.4
Message-ID: <20090820172704.A731411C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4630/devel

Modified Files:
	directory-naming.spec 
Log Message:
Fix summary and description.


Index: directory-naming.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directory-naming/devel/directory-naming.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- directory-naming.spec	20 Aug 2009 12:12:41 -0000	1.3
+++ directory-naming.spec	20 Aug 2009 17:27:04 -0000	1.4
@@ -30,9 +30,9 @@
 
 Name:           directory-naming
 Version:        0.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
-Summary:        Directory Naming
+Summary:        Apache Directory Naming Component
 License:        ASL 2.0
 URL:            http://directory.apache.org
 Group:          Development/Libraries
@@ -79,13 +79,13 @@ BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Old directory/naming module.
+Naming is a lightweight, in-memory JNDI service provider.  To
+enable flexible deployment with limited dependencies, Naming is divided in 6
+packages, each producing a separate jar artifact.
 
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 %{summary}.
@@ -176,6 +176,9 @@ done
 %{_mavendepmapfragdir}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-7
+- Fix Summary and description.
+
 * Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:0.8-6
 - Remove patch and sed lines -not needed.
 



From akurtakov at fedoraproject.org  Thu Aug 20 17:28:58 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 17:28:58 +0000 (UTC)
Subject: rpms/directory-naming/devel directory-naming-0.8-project.patch, 1.1,
	NONE
Message-ID: <20090820172858.6C54B11C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/directory-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5127/devel

Removed Files:
	directory-naming-0.8-project.patch 
Log Message:
Patch not needed.


--- directory-naming-0.8-project.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Aug 20 17:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:33:28 +0000
Subject: [pkgdb] ytnef was added for itamarjp
Message-ID: <20090820173328.3101C10F80B@bastion2.fedora.phx.redhat.com>

tibbs has added Package ytnef with summary Yerase's TNEF Stream Reader
tibbs has approved Package ytnef
tibbs has added a Fedora devel branch for ytnef with an owner of itamarjp
tibbs has approved ytnef in Fedora devel
tibbs has approved Package ytnef
tibbs has set commit to Approved for 107427 on ytnef (Fedora devel)
tibbs has set checkout to Approved for 107427 on ytnef (Fedora devel)
tibbs has set build to Approved for 107427 on ytnef (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ytnef



From pkgdb at fedoraproject.org  Thu Aug 20 17:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:33:29 +0000
Subject: [pkgdb] ytnef summary updated by tibbs
Message-ID: <20090820173329.B257810F85C@bastion2.fedora.phx.redhat.com>

tibbs set package ytnef summary to Yerase's TNEF Stream Reader

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ytnef



From pkgdb at fedoraproject.org  Thu Aug 20 17:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:33:29 +0000
Subject: [pkgdb] ytnef (Fedora, 11) updated by tibbs
Message-ID: <20090820173329.C096810F888@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ytnef
tibbs has set commit to Approved for 107427 on ytnef (Fedora 11)
tibbs has set checkout to Approved for 107427 on ytnef (Fedora 11)
tibbs has set build to Approved for 107427 on ytnef (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ytnef



From pkgdb at fedoraproject.org  Thu Aug 20 17:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:33:29 +0000
Subject: [pkgdb] ytnef (Fedora, 11) updated by tibbs
Message-ID: <20090820173329.C7DBC10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for ytnef
tibbs has set commit to Approved for 107427 on ytnef (Fedora 10)
tibbs has set checkout to Approved for 107427 on ytnef (Fedora 10)
tibbs has set build to Approved for 107427 on ytnef (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ytnef



From tibbs at fedoraproject.org  Thu Aug 20 17:33:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:33:36 +0000 (UTC)
Subject: rpms/ytnef/devel - New directory
Message-ID: <20090820173336.40B0711C02CC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ytnef/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsam6278/rpms/ytnef/devel

Log Message:
Directory /cvs/pkgs/rpms/ytnef/devel added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:33:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:33:36 +0000 (UTC)
Subject: rpms/ytnef - New directory
Message-ID: <20090820173336.1EC7E11C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ytnef
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsam6278/rpms/ytnef

Log Message:
Directory /cvs/pkgs/rpms/ytnef added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:33:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:33:42 +0000 (UTC)
Subject: rpms/ytnef Makefile,NONE,1.1
Message-ID: <20090820173342.5124F11C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ytnef
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsam6278/rpms/ytnef

Added Files:
	Makefile 
Log Message:
Setup of module ytnef


--- NEW FILE Makefile ---
# Top level Makefile for module ytnef
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Thu Aug 20 17:33:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:33:42 +0000 (UTC)
Subject: rpms/ytnef/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090820173342.A232611C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ytnef/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsam6278/rpms/ytnef/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ytnef


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ytnef
# $Id: Makefile,v 1.1 2009/08/20 17:33:42 tibbs Exp $
NAME := ytnef
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From akurtakov at fedoraproject.org  Thu Aug 20 17:37:14 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 17:37:14 +0000 (UTC)
Subject: rpms/eclipse-eclemma/devel eclipse-eclemma.spec, 1.5,
	1.6 get-eclemma.sh, 1.2, 1.3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090820173714.8682011C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-eclemma/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7021/devel

Modified Files:
	eclipse-eclemma.spec get-eclemma.sh .cvsignore sources 
Log Message:
- Update to upstream 1.4.2.


Index: eclipse-eclemma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/eclipse-eclemma.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-eclemma.spec	24 Jul 2009 20:53:02 -0000	1.5
+++ eclipse-eclemma.spec	20 Aug 2009 17:37:14 -0000	1.6
@@ -2,8 +2,8 @@
 %define install_loc  %{_datadir}/eclipse/dropins/eclemma
 
 Name:      eclipse-eclemma
-Version:   1.4.1
-Release:   2%{?dist}
+Version:   1.4.2
+Release:   1%{?dist}
 Summary:   Java code coverage tool plugin for Eclipse
 Group:     Development/Tools
 License:   EPL and ASL 2.0
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{install_loc}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.2-1
+- Update to upstream 1.4.2.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: get-eclemma.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/get-eclemma.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- get-eclemma.sh	15 May 2009 10:45:53 -0000	1.2
+++ get-eclemma.sh	20 Aug 2009 17:37:14 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/sh
 NAME="eclemma"
-VERSION="1.4.1"
+VERSION="1.4.2"
 
 mkdir $NAME-$VERSION
 pushd $NAME-$VERSION >/dev/null


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 May 2009 10:50:20 -0000	1.3
+++ .cvsignore	20 Aug 2009 17:37:14 -0000	1.4
@@ -1,2 +1,3 @@
 eclemma-1.3.2.tar.bz2
 eclemma-1.4.1.tar.bz2
+eclemma-1.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 May 2009 10:50:20 -0000	1.3
+++ sources	20 Aug 2009 17:37:14 -0000	1.4
@@ -1 +1,2 @@
 dc5353c650d3a21b1738680a53706b97  eclemma-1.4.1.tar.bz2
+50e4b7fc379ce86a0c8167a86074dc5f  eclemma-1.4.2.tar.bz2



From pkgdb at fedoraproject.org  Thu Aug 20 17:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:38:48 +0000
Subject: [pkgdb] django-filter summary updated by tibbs
Message-ID: <20090820173848.A32E710F85C@bastion2.fedora.phx.redhat.com>

tibbs set package django-filter summary to A Django application for allowing users to filter queryset dynamically

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-filter



From pkgdb at fedoraproject.org  Thu Aug 20 17:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:38:47 +0000
Subject: [pkgdb] django-filter was added for diegobz
Message-ID: <20090820173847.A624110F854@bastion2.fedora.phx.redhat.com>

tibbs has added Package django-filter with summary A Django application for allowing users to filter queryset dynamically
tibbs has approved Package django-filter
tibbs has added a Fedora devel branch for django-filter with an owner of diegobz
tibbs has approved django-filter in Fedora devel
tibbs has approved Package django-filter
tibbs has set commit to Approved for 107427 on django-filter (Fedora devel)
tibbs has set checkout to Approved for 107427 on django-filter (Fedora devel)
tibbs has set build to Approved for 107427 on django-filter (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-filter



From pkgdb at fedoraproject.org  Thu Aug 20 17:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:38:48 +0000
Subject: [pkgdb] django-filter (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173848.A912F10F882@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for django-filter
tibbs has set commit to Approved for 107427 on django-filter (Fedora 11)
tibbs has set checkout to Approved for 107427 on django-filter (Fedora 11)
tibbs has set build to Approved for 107427 on django-filter (Fedora 11)
tibbs approved watchbugzilla on django-filter (Fedora 11) for diegobz
tibbs approved watchcommits on django-filter (Fedora 11) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-filter



From pkgdb at fedoraproject.org  Thu Aug 20 17:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:38:48 +0000
Subject: [pkgdb] django-filter (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173848.B5A9510F889@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on django-filter (Fedora devel) for diegobz
tibbs approved watchcommits on django-filter (Fedora devel) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-filter



From pkgdb at fedoraproject.org  Thu Aug 20 17:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:38:48 +0000
Subject: [pkgdb] django-filter (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173848.BEFD510F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for django-filter
tibbs has set commit to Approved for 107427 on django-filter (Fedora 10)
tibbs has set checkout to Approved for 107427 on django-filter (Fedora 10)
tibbs has set build to Approved for 107427 on django-filter (Fedora 10)
tibbs approved watchbugzilla on django-filter (Fedora 10) for diegobz
tibbs approved watchcommits on django-filter (Fedora 10) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-filter



From tibbs at fedoraproject.org  Thu Aug 20 17:38:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:38:55 +0000 (UTC)
Subject: rpms/django-filter - New directory
Message-ID: <20090820173855.1D9A711C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-filter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUd7379/rpms/django-filter

Log Message:
Directory /cvs/pkgs/rpms/django-filter added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:38:55 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:38:55 +0000 (UTC)
Subject: rpms/django-filter/devel - New directory
Message-ID: <20090820173855.3EC1A11C02CC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-filter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUd7379/rpms/django-filter/devel

Log Message:
Directory /cvs/pkgs/rpms/django-filter/devel added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:39:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:39:01 +0000 (UTC)
Subject: rpms/django-filter Makefile,NONE,1.1
Message-ID: <20090820173901.3E2B311C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-filter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUd7379/rpms/django-filter

Added Files:
	Makefile 
Log Message:
Setup of module django-filter


--- NEW FILE Makefile ---
# Top level Makefile for module django-filter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Thu Aug 20 17:39:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:39:01 +0000 (UTC)
Subject: rpms/django-filter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090820173901.79F2F11C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-filter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsUd7379/rpms/django-filter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-filter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-filter
# $Id: Makefile,v 1.1 2009/08/20 17:39:01 tibbs Exp $
NAME := django-filter
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 20 17:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:38:48 +0000
Subject: [pkgdb] django-filter (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173848.C6FE110F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for django-filter
tibbs has set commit to Approved for 107427 on django-filter (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on django-filter (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on django-filter (Fedora EPEL 5)
tibbs approved watchbugzilla on django-filter (Fedora EPEL 5) for diegobz
tibbs approved watchcommits on django-filter (Fedora EPEL 5) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-filter



From pkgdb at fedoraproject.org  Thu Aug 20 17:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:39:18 +0000
Subject: [pkgdb] shmpps was added for cmadams
Message-ID: <20090820173918.2911F10F886@bastion2.fedora.phx.redhat.com>

tibbs has added Package shmpps with summary Shared Memory driver for PPS time signals
tibbs has approved Package shmpps
tibbs has added a Fedora devel branch for shmpps with an owner of cmadams
tibbs has approved shmpps in Fedora devel
tibbs has approved Package shmpps
tibbs has set commit to Approved for 107427 on shmpps (Fedora devel)
tibbs has set checkout to Approved for 107427 on shmpps (Fedora devel)
tibbs has set build to Approved for 107427 on shmpps (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shmpps



From pkgdb at fedoraproject.org  Thu Aug 20 17:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:39:19 +0000
Subject: [pkgdb] shmpps summary updated by tibbs
Message-ID: <20090820173919.799DC10F889@bastion2.fedora.phx.redhat.com>

tibbs set package shmpps summary to Shared Memory driver for PPS time signals

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shmpps



From pkgdb at fedoraproject.org  Thu Aug 20 17:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:39:19 +0000
Subject: [pkgdb] shmpps (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173919.895C010F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for shmpps
tibbs has set commit to Approved for 107427 on shmpps (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on shmpps (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on shmpps (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shmpps



From pkgdb at fedoraproject.org  Thu Aug 20 17:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:39:19 +0000
Subject: [pkgdb] shmpps (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173919.99B3610F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for shmpps
tibbs has set commit to Approved for 107427 on shmpps (Fedora 11)
tibbs has set checkout to Approved for 107427 on shmpps (Fedora 11)
tibbs has set build to Approved for 107427 on shmpps (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shmpps



From pkgdb at fedoraproject.org  Thu Aug 20 17:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:39:19 +0000
Subject: [pkgdb] shmpps (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820173919.A200610F8B5@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for shmpps
tibbs has set commit to Approved for 107427 on shmpps (Fedora 10)
tibbs has set checkout to Approved for 107427 on shmpps (Fedora 10)
tibbs has set build to Approved for 107427 on shmpps (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/shmpps



From tibbs at fedoraproject.org  Thu Aug 20 17:39:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:39:26 +0000 (UTC)
Subject: rpms/shmpps - New directory
Message-ID: <20090820173926.1692011C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/shmpps
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLZ7740/rpms/shmpps

Log Message:
Directory /cvs/pkgs/rpms/shmpps added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:39:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:39:26 +0000 (UTC)
Subject: rpms/shmpps/devel - New directory
Message-ID: <20090820173926.3AB1611C0349@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/shmpps/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLZ7740/rpms/shmpps/devel

Log Message:
Directory /cvs/pkgs/rpms/shmpps/devel added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:39:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:39:34 +0000 (UTC)
Subject: rpms/shmpps Makefile,NONE,1.1
Message-ID: <20090820173934.236D911C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/shmpps
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLZ7740/rpms/shmpps

Added Files:
	Makefile 
Log Message:
Setup of module shmpps


--- NEW FILE Makefile ---
# Top level Makefile for module shmpps
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Thu Aug 20 17:39:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:39:34 +0000 (UTC)
Subject: rpms/shmpps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090820173934.55ECC11C02CC@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/shmpps/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLZ7740/rpms/shmpps/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shmpps


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shmpps
# $Id: Makefile,v 1.1 2009/08/20 17:39:34 tibbs Exp $
NAME := shmpps
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 20 17:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:40:01 +0000
Subject: [pkgdb] django-sorting (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820174001.6DD8910F89C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for django-sorting
tibbs has set commit to Approved for 107427 on django-sorting (Fedora 11)
tibbs has set checkout to Approved for 107427 on django-sorting (Fedora 11)
tibbs has set build to Approved for 107427 on django-sorting (Fedora 11)
tibbs approved watchbugzilla on django-sorting (Fedora 11) for diegobz
tibbs approved watchcommits on django-sorting (Fedora 11) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-sorting



From pkgdb at fedoraproject.org  Thu Aug 20 17:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:40:01 +0000
Subject: [pkgdb] django-sorting (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820174001.C20E110F8A3@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for django-sorting
tibbs has set commit to Approved for 107427 on django-sorting (Fedora 10)
tibbs has set checkout to Approved for 107427 on django-sorting (Fedora 10)
tibbs has set build to Approved for 107427 on django-sorting (Fedora 10)
tibbs approved watchbugzilla on django-sorting (Fedora 10) for diegobz
tibbs approved watchcommits on django-sorting (Fedora 10) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-sorting



From pkgdb at fedoraproject.org  Thu Aug 20 17:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:39:59 +0000
Subject: [pkgdb] django-sorting was added for diegobz
Message-ID: <20090820174001.EA5BB10F8C1@bastion2.fedora.phx.redhat.com>

tibbs has added Package django-sorting with summary A Django application for easy sorting
tibbs has approved Package django-sorting
tibbs has added a Fedora devel branch for django-sorting with an owner of diegobz
tibbs has approved django-sorting in Fedora devel
tibbs has approved Package django-sorting
tibbs has set commit to Approved for 107427 on django-sorting (Fedora devel)
tibbs has set checkout to Approved for 107427 on django-sorting (Fedora devel)
tibbs has set build to Approved for 107427 on django-sorting (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-sorting



From pkgdb at fedoraproject.org  Thu Aug 20 17:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:40:01 +0000
Subject: [pkgdb] django-sorting (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820174001.E3A6C10F8BC@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on django-sorting (Fedora devel) for diegobz
tibbs approved watchcommits on django-sorting (Fedora devel) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-sorting



From tibbs at fedoraproject.org  Thu Aug 20 17:40:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:40:08 +0000 (UTC)
Subject: rpms/django-sorting - New directory
Message-ID: <20090820174008.2B29D11C04D9@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-sorting
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsrC8102/rpms/django-sorting

Log Message:
Directory /cvs/pkgs/rpms/django-sorting added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:40:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:40:08 +0000 (UTC)
Subject: rpms/django-sorting/devel - New directory
Message-ID: <20090820174008.55C4C11C04F1@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-sorting/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsrC8102/rpms/django-sorting/devel

Log Message:
Directory /cvs/pkgs/rpms/django-sorting/devel added to the repository




From pkgdb at fedoraproject.org  Thu Aug 20 17:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:40:01 +0000
Subject: [pkgdb] django-sorting (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090820174001.F30D010F8C3@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for django-sorting
tibbs has set commit to Approved for 107427 on django-sorting (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on django-sorting (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on django-sorting (Fedora EPEL 5)
tibbs approved watchbugzilla on django-sorting (Fedora EPEL 5) for diegobz
tibbs approved watchcommits on django-sorting (Fedora EPEL 5) for diegobz

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-sorting



From pkgdb at fedoraproject.org  Thu Aug 20 17:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:40:01 +0000
Subject: [pkgdb] django-sorting summary updated by tibbs
Message-ID: <20090820174006.8DDA110F86F@bastion2.fedora.phx.redhat.com>

tibbs set package django-sorting summary to A Django application for easy sorting

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/django-sorting



From tibbs at fedoraproject.org  Thu Aug 20 17:40:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:40:15 +0000 (UTC)
Subject: rpms/django-sorting Makefile,NONE,1.1
Message-ID: <20090820174015.35F2D11C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-sorting
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsrC8102/rpms/django-sorting

Added Files:
	Makefile 
Log Message:
Setup of module django-sorting


--- NEW FILE Makefile ---
# Top level Makefile for module django-sorting
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Thu Aug 20 17:40:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:40:15 +0000 (UTC)
Subject: rpms/django-sorting/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090820174015.7689011C0439@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/django-sorting/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsrC8102/rpms/django-sorting/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-sorting


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-sorting
# $Id: Makefile,v 1.1 2009/08/20 17:40:15 tibbs Exp $
NAME := django-sorting
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From orion at fedoraproject.org  Thu Aug 20 17:40:33 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 20 Aug 2009 17:40:33 +0000 (UTC)
Subject: rpms/environment-modules/devel environment-modules.spec,1.19,1.20
Message-ID: <20090820174033.C3E9211C0439@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8168

Modified Files:
	environment-modules.spec 
Log Message:
Add usage note.



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- environment-modules.spec	24 Jul 2009 22:11:57 -0000	1.19
+++ environment-modules.spec	20 Aug 2009 17:40:33 -0000	1.20
@@ -33,6 +33,9 @@ Modules are useful in managing different
 Modules can also be bundled into metamodules that will load an entire
 suite of different applications.
 
+NOTE: You will need to get a new shell after installing this package to
+have access to the module alias.
+
 
 %prep
 %setup -q -n modules-%{version}



From salimma at fedoraproject.org  Thu Aug 20 17:42:50 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 17:42:50 +0000 (UTC)
Subject: rpms/gnome-keyring-sharp/devel .cvsignore, 1.3,
	1.4 gnome-keyring-sharp.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090820174250.2CEB611C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-keyring-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8857

Modified Files:
	.cvsignore gnome-keyring-sharp.spec sources 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.1-0.4.133722svn%{?dist}
- Update to r133722
- Disable building on sparc64



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jan 2009 14:58:24 -0000	1.3
+++ .cvsignore	20 Aug 2009 17:42:49 -0000	1.4
@@ -1 +1 @@
-gnome-keyring-sharp-1.0.1-r115768.tar.bz2
+gnome-keyring-sharp-1.0.1-r133722.tar.bz2


Index: gnome-keyring-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/gnome-keyring-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-keyring-sharp.spec	25 Jul 2009 00:40:14 -0000	1.5
+++ gnome-keyring-sharp.spec	20 Aug 2009 17:42:49 -0000	1.6
@@ -1,9 +1,9 @@
-%global svn_rev 115768
+%global svn_rev 133722
 %global debug_package %{nil}
 
 Name:           gnome-keyring-sharp
 Version:        1.0.1
-Release:        0.3.%{svn_rev}svn%{?dist}
+Release:        0.4.%{svn_rev}svn%{?dist}
 Summary:        Mono implementation of GNOME Keyring
 
 Group:          System Environment/Libraries
@@ -21,6 +21,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
 ExcludeArch:    ppc64
+# sparc64 is even worse. Secondary arch, but package owner gets emailed
+# on build failures
+ExcludeArch:    sparc64
 
 BuildRequires:  autoconf automake
 BuildRequires:  mono-devel ndesk-dbus-devel monodoc
@@ -96,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.1-0.4.133722svn%{?dist}
+- Update to r133722
+- Disable building on sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-0.3.115768svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jan 2009 14:58:24 -0000	1.3
+++ sources	20 Aug 2009 17:42:49 -0000	1.4
@@ -1 +1 @@
-fb3365cc466316af2d8cbc4174186fe1  gnome-keyring-sharp-1.0.1-r115768.tar.bz2
+9fd76c39496715ea895e7050ab7709d1  gnome-keyring-sharp-1.0.1-r133722.tar.bz2



From dwalsh at fedoraproject.org  Thu Aug 20 17:48:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 20 Aug 2009 17:48:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.181, 1.182 policy-F12.patch,
	1.55, 1.56 selinux-policy.spec, 1.899, 1.900
Message-ID: <20090820174852.3A2A111C006E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10043

Modified Files:
	.cvsignore policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-3
- Fix system-config-services policy



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- .cvsignore	18 Aug 2009 22:43:34 -0000	1.181
+++ .cvsignore	20 Aug 2009 17:48:51 -0000	1.182
@@ -184,3 +184,4 @@ serefpolicy-3.6.25.tgz
 serefpolicy-3.6.26.tgz
 serefpolicy-3.6.27.tgz
 serefpolicy-3.6.28.tgz
+setroubleshoot-2.2.21.tar.gz

policy-F12.patch:
 Changelog                                          |    3 
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    5 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   15 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 +
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 +++++
 policy/modules/apps/nsplugin.te                    |  286 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 +++-
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   89 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  297 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 ++++++++++
 policy/modules/roles/unconfineduser.te             |  391 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  143 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 policy/modules/services/dbus.if                    |   26 
 policy/modules/services/dbus.te                    |   27 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   50 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   46 
 policy/modules/services/policykit.te               |   52 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  138 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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                   |   39 
 policy/modules/services/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   34 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 +
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 -
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    7 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    3 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  262 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   16 
 policy/modules/system/selinuxutil.if               |  288 ++++
 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                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 -------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    5 
 policy/modules/system/userdomain.if                | 1306 +++++++++++++++------
 policy/modules/system/userdomain.te                |   50 
 policy/modules/system/xen.fc                       |    6 
 policy/modules/system/xen.if                       |   28 
 policy/modules/system/xen.te                       |  139 +-
 policy/support/obj_perm_sets.spt                   |   14 
 policy/users                                       |   13 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 326 files changed, 14076 insertions(+), 2984 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- policy-F12.patch	20 Aug 2009 00:02:37 -0000	1.55
+++ policy-F12.patch	20 Aug 2009 17:48:51 -0000	1.56
@@ -440,7 +440,7 @@ diff -b -B --ignore-all-space --exclude-
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.28/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/admin/anaconda.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/admin/anaconda.te	2009-08-20 08:51:33.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -449,6 +449,15 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_user_home_dir_filetrans_user_home_content(anaconda_t, { dir file lnk_file fifo_file sock_file })
  
+@@ -52,7 +53,7 @@
+ ')
+ 
+ optional_policy(`
+-	unconfined_domain(anaconda_t)
++	unconfined_domain_noaudit(anaconda_t)
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.28/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/admin/certwatch.te	2009-08-18 13:23:29.000000000 -0400
@@ -4730,8 +4739,16 @@ 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.28/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/corecommands.fc	2009-08-18 13:23:29.000000000 -0400
-@@ -125,6 +125,7 @@
++++ serefpolicy-3.6.28/policy/modules/kernel/corecommands.fc	2009-08-20 08:44:10.000000000 -0400
+@@ -54,6 +54,7 @@
+ /etc/cron.weekly/.*		--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/cron.monthly/.*		--	gen_context(system_u:object_r:bin_t,s0)
+ 
++/etc/dhcp/dhclient\.d(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /etc/hotplug/.*agent		--	gen_context(system_u:object_r:bin_t,s0)
+ /etc/hotplug/.*rc		-- 	gen_context(system_u:object_r:bin_t,s0)
+ /etc/hotplug/hotplug\.functions --	gen_context(system_u:object_r:bin_t,s0)
+@@ -125,6 +126,7 @@
  /sbin/.*				gen_context(system_u:object_r:bin_t,s0)
  /sbin/mkfs\.cramfs		--	gen_context(system_u:object_r:bin_t,s0)
  /sbin/insmod_ksymoops_clean	--	gen_context(system_u:object_r:bin_t,s0)
@@ -4739,7 +4756,7 @@ diff -b -B --ignore-all-space --exclude-
  
  #
  # /opt
-@@ -142,6 +143,9 @@
+@@ -142,6 +144,9 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -4749,7 +4766,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -315,3 +319,21 @@
+@@ -315,3 +320,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4925,7 +4942,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.28/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/devices.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/devices.if	2009-08-20 09:16:58.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -5514,7 +5531,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.28/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/files.if	2009-08-18 13:38:01.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/files.if	2009-08-20 09:41:17.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5687,7 +5704,32 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -4955,7 +5047,7 @@
+@@ -4188,6 +4280,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Set the attributes of the /var/run directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_setattr_pid_dirs',`
++	gen_require(`
++		type var_run_t;
++	')
++
++	allow $1 var_run_t:dir setattr;
++')
++
++########################################
++## <summary>
+ ##	Search the /var/lib directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -4955,7 +5065,7 @@
  	selinux_compute_member($1)
  
  	# Need sys_admin capability for mounting
@@ -5696,7 +5738,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 +5069,15 @@
+@@ -4977,12 +5087,15 @@
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
  
@@ -5713,7 +5755,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -5003,3 +5098,173 @@
+@@ -5003,3 +5116,173 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -7632,8 +7674,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.28/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.te	2009-08-18 13:23:29.000000000 -0400
-@@ -0,0 +1,395 @@
++++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.te	2009-08-20 09:01:03.000000000 -0400
+@@ -0,0 +1,391 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7940,10 +7982,6 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	vbetool_run(unconfined_t, unconfined_r)
-+')
-+
-+optional_policy(`
 +	vpn_run(unconfined_t, unconfined_r)
 +')
 +
@@ -9620,8 +9658,43 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.6.28/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/bind.if	2009-08-18 13:23:29.000000000 -0400
-@@ -287,6 +287,25 @@
++++ serefpolicy-3.6.28/policy/modules/services/bind.if	2009-08-20 08:12:55.000000000 -0400
+@@ -235,7 +235,7 @@
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to set the attributes
++##	Allow domain to  set the attributes
+ ##	of the BIND pid directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -254,6 +254,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow domain to set attributes
++##	of the BIND zone directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`bind_setattr_zone_dirs',`
++	gen_require(`
++		type named_zone_t;
++	')
++
++	allow $1 named_zone_t:dir setattr;
++')
++
++########################################
++## <summary>
+ ##	Read BIND zone files.
+ ## </summary>
+ ## <param name="domain">
+@@ -287,6 +306,25 @@
  
  ########################################
  ## <summary>
@@ -11024,7 +11097,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.28/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/devicekit.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/devicekit.te	2009-08-20 09:17:41.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)
@@ -11144,7 +11217,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 +195,16 @@
+@@ -167,12 +195,17 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -11156,12 +11229,13 @@ diff -b -B --ignore-all-space --exclude-
  
  miscfiles_read_localization(devicekit_power_t)
  
++sysnet_read_config(devicekit_power_t)
 +sysnet_read_dhcp_config(devicekit_power_t)
 +
  userdom_read_all_users_state(devicekit_power_t)
  
  optional_policy(`
-@@ -180,8 +212,11 @@
+@@ -180,8 +213,11 @@
  ')
  
  optional_policy(`
@@ -11174,7 +11248,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +238,23 @@
+@@ -203,17 +239,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -11587,8 +11661,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.6.28/policy/modules/services/gpsd.te
 --- nsaserefpolicy/policy/modules/services/gpsd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/gpsd.te	2009-08-18 13:23:29.000000000 -0400
-@@ -11,9 +11,15 @@
++++ serefpolicy-3.6.28/policy/modules/services/gpsd.te	2009-08-20 08:28:36.000000000 -0400
+@@ -11,15 +11,21 @@
  application_domain(gpsd_t, gpsd_exec_t)
  init_daemon_domain(gpsd_t, gpsd_exec_t)
  
@@ -11604,6 +11678,13 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # gpsd local policy
+ #
+ 
+-allow gpsd_t self:capability { setuid sys_nice setgid fowner };
++allow gpsd_t self:capability { fsetid setuid sys_nice setgid fowner };
+ allow gpsd_t self:process setsched;
+ allow gpsd_t self:shm create_shm_perms;
+ allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -29,6 +35,10 @@
  manage_files_pattern(gpsd_t, gpsd_tmpfs_t, gpsd_tmpfs_t)
  fs_tmpfs_filetrans(gpsd_t, gpsd_tmpfs_t, { dir file })
@@ -13459,9 +13540,45 @@ 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/nx.fc serefpolicy-3.6.28/policy/modules/services/nx.fc
+--- nsaserefpolicy/policy/modules/services/nx.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/nx.fc	2009-08-20 08:55:05.000000000 -0400
+@@ -1,6 +1,7 @@
+ /opt/NX/bin/nxserver		--	gen_context(system_u:object_r:nx_server_exec_t,s0)
+ 
+ /opt/NX/home/nx/\.ssh(/.*)?		gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
++/var/lib/nxserver/home/.ssh(/.*)?  	gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
+ 
+ /opt/NX/var(/.*)?			gen_context(system_u:object_r:nx_server_var_run_t,s0)
+ 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.6.28/policy/modules/services/nx.if
+--- nsaserefpolicy/policy/modules/services/nx.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/nx.if	2009-08-20 09:23:37.000000000 -0400
+@@ -17,3 +17,21 @@
+ 
+ 	spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
+ ')
++
++########################################
++## <summary>
++##	Read nx home directory content
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nx_read_home_files',`
++	gen_require(`
++		type nx_server_home_ssh_t;
++	')
++
++	read_files_pattern($1, nx_server_home_ssh_t, nx_server_home_ssh_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.te serefpolicy-3.6.28/policy/modules/services/nx.te
 --- nsaserefpolicy/policy/modules/services/nx.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/nx.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/nx.te	2009-08-20 12:45:07.000000000 -0400
 @@ -25,6 +25,9 @@
  type nx_server_var_run_t;
  files_pid_file(nx_server_var_run_t)
@@ -14608,7 +14725,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.6.28/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/ppp.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/ppp.if	2009-08-20 08:37:53.000000000 -0400
 @@ -177,10 +177,16 @@
  interface(`ppp_run',`
  	gen_require(`
@@ -14628,7 +14745,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.6.28/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/ppp.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/ppp.te	2009-08-20 08:34:18.000000000 -0400
 @@ -193,6 +193,8 @@
  
  optional_policy(`
@@ -17076,7 +17193,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.28/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/ssh.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/ssh.if	2009-08-20 12:45:06.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -17379,7 +17496,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.28/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/ssh.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/ssh.te	2009-08-20 09:24:08.000000000 -0400
 @@ -41,6 +41,9 @@
  files_tmp_file(sshd_tmp_t)
  files_poly_parent(sshd_tmp_t)
@@ -17520,7 +17637,18 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -341,7 +355,11 @@
+@@ -331,6 +345,10 @@
+ ')
+ 
+ optional_policy(`
++	nx_read_home_files(sshd_t)
++')
++
++optional_policy(`
+ 	rpm_use_script_fds(sshd_t)
+ ')
+ 
+@@ -341,7 +359,11 @@
  ')
  
  optional_policy(`
@@ -17533,7 +17661,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_shell_domtrans(sshd_t)
  ')
  
-@@ -400,15 +418,13 @@
+@@ -400,15 +422,13 @@
  init_use_fds(ssh_keygen_t)
  init_use_script_ptys(ssh_keygen_t)
  
@@ -19034,7 +19162,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.28/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/xserver.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/xserver.te	2009-08-20 07:54:04.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -20287,7 +20415,7 @@ diff -b -B --ignore-all-space --exclude-
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.6.28/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/fstools.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/fstools.te	2009-08-20 08:58:51.000000000 -0400
 @@ -65,13 +65,7 @@
  kernel_rw_unlabeled_dirs(fsadm_t)
  kernel_rw_unlabeled_blk_files(fsadm_t)
@@ -20377,7 +20505,11 @@ diff -b -B --ignore-all-space --exclude-
  init_use_fds(fsadm_t)
  init_use_script_ptys(fsadm_t)
  init_dontaudit_getattr_initctl(fsadm_t)
-@@ -147,8 +154,7 @@
+@@ -144,11 +151,11 @@
+ miscfiles_read_localization(fsadm_t)
+ 
+ modutils_read_module_config(fsadm_t)
++modutils_read_module_deps(fsadm_t)
  
  seutil_read_config(fsadm_t)
  
@@ -20387,7 +20519,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-@@ -177,4 +183,6 @@
+@@ -177,4 +184,6 @@
  
  optional_policy(`
  	xen_append_log(fsadm_t)
@@ -20508,7 +20640,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.if serefpolicy-3.6.28/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/init.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/init.if	2009-08-20 08:05:39.000000000 -0400
 @@ -174,6 +174,7 @@
  	role system_r types $1;
  
@@ -20748,7 +20880,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.28/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/init.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/init.te	2009-08-20 09:41:30.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -20873,22 +21005,25 @@ 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,12 @@
+@@ -249,10 +287,15 @@
  kernel_rw_all_sysctls(initrc_t)
  # for lsof which is used by alsa shutdown:
  kernel_dontaudit_getattr_message_if(initrc_t)
 +kernel_stream_connect(initrc_t)
 +files_read_kernel_modules(initrc_t)
 +files_read_config_files(initrc_t)
++files_read_var_lib_symlinks(initrc_t)
++files_setattr_pid_dirs(initrc_t)
  
  files_read_kernel_symbol_table(initrc_t)
 -
 -corecmd_exec_all_executables(initrc_t)
 +files_exec_etc_files(initrc_t)
++files_manage_etc_symlinks(initrc_t)
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
-@@ -272,16 +312,62 @@
+@@ -272,16 +315,62 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -20952,7 +21087,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_kill_all_domains(initrc_t)
  domain_signal_all_domains(initrc_t)
-@@ -291,7 +377,7 @@
+@@ -291,7 +380,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -20961,7 +21096,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 +392,15 @@
+@@ -306,14 +395,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -20979,7 +21114,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)
-@@ -325,47 +412,13 @@
+@@ -325,47 +415,13 @@
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
  
@@ -21029,7 +21164,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)
-@@ -422,8 +475,6 @@
+@@ -422,8 +478,6 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -21038,7 +21173,7 @@ 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 +501,9 @@
+@@ -450,11 +504,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -21051,7 +21186,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 +513,7 @@
+@@ -464,6 +516,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -21059,7 +21194,13 @@ diff -b -B --ignore-all-space --exclude-
  	files_create_boot_flag(initrc_t)
  	files_rw_boot_symlinks(initrc_t)
  	# wants to read /.fonts directory
-@@ -497,6 +547,7 @@
+@@ -492,11 +545,13 @@
+ 	optional_policy(`
+ 		bind_manage_config_dirs(initrc_t)
+ 		bind_write_config(initrc_t)
++		bind_setattr_zone_dirs(initrc_t)
+ 	')
+ 
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -21067,7 +21208,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -515,6 +566,33 @@
+@@ -515,6 +570,33 @@
  	')
  ')
  
@@ -21101,7 +21242,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -569,6 +647,10 @@
+@@ -569,8 +651,16 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -21111,8 +21252,14 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
  		networkmanager_dbus_chat(initrc_t)
  	')
++
++	optional_policy(`
++		policykit_dbus_chat(initrc_t)
++	')
  ')
-@@ -590,6 +672,10 @@
+ 
+ optional_policy(`
+@@ -590,6 +680,10 @@
  ')
  
  optional_policy(`
@@ -21123,7 +21270,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +732,20 @@
+@@ -646,20 +740,20 @@
  ')
  
  optional_policy(`
@@ -21150,7 +21297,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +754,7 @@
+@@ -668,6 +762,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -21158,7 +21305,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -696,7 +783,6 @@
+@@ -696,7 +791,6 @@
  ')
  
  optional_policy(`
@@ -21166,7 +21313,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -718,8 +804,6 @@
+@@ -718,8 +812,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -21175,7 +21322,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -732,10 +816,12 @@
+@@ -732,10 +824,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -21188,7 +21335,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +840,15 @@
+@@ -754,6 +848,15 @@
  ')
  
  optional_policy(`
@@ -21204,7 +21351,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +859,13 @@
+@@ -764,6 +867,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -21218,7 +21365,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +891,31 @@
+@@ -789,3 +899,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -21293,7 +21440,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.28/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/ipsec.te	2009-08-19 20:01:37.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/ipsec.te	2009-08-20 12:45:08.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -21525,12 +21672,13 @@ diff -b -B --ignore-all-space --exclude-
  locallogin_use_fds(racoon_t)
  
  logging_send_syslog_msg(racoon_t)
-@@ -328,6 +362,13 @@
+@@ -328,6 +362,14 @@
  
  miscfiles_read_localization(racoon_t)
  
 +auth_use_pam(racoon_t)
 +
++
 +auth_can_read_shadow_passwords(racoon_t)
 +tunable_policy(`racoon_read_shadow',`
 +	auth_tunable_read_shadow(racoon_t) 
@@ -21539,7 +21687,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -347,6 +388,7 @@
+@@ -347,6 +389,7 @@
  files_read_etc_files(setkey_t)
  
  init_dontaudit_use_fds(setkey_t)
@@ -24037,7 +24185,7 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.28/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/sysnetwork.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/sysnetwork.if	2009-08-20 12:45:07.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -25362,7 +25510,7 @@ diff -b -B --ignore-all-space --exclude-
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-20 09:09:55.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -25727,7 +25875,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -420,34 +424,41 @@
+@@ -420,34 +424,43 @@
  ##	is the prefix for user_t).
  ##	</summary>
  ## </param>
@@ -25761,6 +25909,8 @@ diff -b -B --ignore-all-space --exclude-
 -	dev_rw_usbfs($1_t)
 +	dev_rw_usbfs($1)
 +	dev_rw_generic_usb_dev($1)
++	dev_read_video_dev($1)
++	dev_write_video_dev($1)
  
 -	xserver_user_client($1_t, user_tmpfs_t)
 -	xserver_xsession_entry_type($1_t)
@@ -25787,7 +25937,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -497,11 +508,7 @@
+@@ -497,11 +510,7 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -25800,7 +25950,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -511,182 +518,195 @@
+@@ -511,182 +520,195 @@
  	# 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 };
@@ -26072,7 +26222,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -714,13 +734,26 @@
+@@ -714,13 +736,26 @@
  
  	userdom_base_user_template($1)
  
@@ -26104,7 +26254,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -738,70 +771,71 @@
+@@ -738,70 +773,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26209,7 +26359,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -838,6 +872,28 @@
+@@ -838,6 +874,28 @@
  	# Local policy
  	#
  
@@ -26238,7 +26388,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -868,7 +924,10 @@
+@@ -868,7 +926,10 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26250,7 +26400,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -876,14 +935,19 @@
+@@ -876,14 +937,19 @@
  	#
  
  	auth_role($1_r, $1_t)
@@ -26275,7 +26425,7 @@ diff -b -B --ignore-all-space --exclude-
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -891,28 +955,47 @@
+@@ -891,28 +957,47 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -26330,7 +26480,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -946,8 +1029,8 @@
+@@ -946,8 +1031,8 @@
  	# Declarations
  	#
  
@@ -26340,7 +26490,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -956,11 +1039,12 @@
+@@ -956,11 +1041,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26355,7 +26505,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,36 +1062,53 @@
+@@ -978,36 +1064,53 @@
  		')
  	')
  
@@ -26423,7 +26573,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1042,7 +1143,7 @@
+@@ -1042,7 +1145,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -26432,7 +26582,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1152,7 @@
+@@ -1051,8 +1154,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26442,7 +26592,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1175,8 @@
+@@ -1075,7 +1177,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26452,7 +26602,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1192,7 @@
+@@ -1091,6 +1194,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -26460,7 +26610,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1200,6 @@
+@@ -1098,8 +1202,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26469,7 +26619,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)
-@@ -1154,20 +1254,6 @@
+@@ -1154,20 +1256,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26490,7 +26640,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1299,7 @@
+@@ -1213,6 +1301,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26498,7 +26648,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1365,15 @@
+@@ -1278,11 +1367,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26514,7 +26664,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1465,13 @@
+@@ -1374,12 +1467,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -26529,7 +26679,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1504,14 @@
+@@ -1412,6 +1506,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26544,7 +26694,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1527,11 @@
+@@ -1427,9 +1529,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26556,7 +26706,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1588,25 @@
+@@ -1486,6 +1590,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26582,7 +26732,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1681,8 @@
+@@ -1560,6 +1683,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26591,7 +26741,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1776,7 @@
+@@ -1653,6 +1778,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26599,7 +26749,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)
  ')
-@@ -1780,19 +1904,32 @@
+@@ -1780,19 +1906,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -26639,7 +26789,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1964,7 @@
+@@ -1827,6 +1966,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -26647,7 +26797,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2512,7 @@
+@@ -2374,7 +2514,7 @@
  
  ########################################
  ## <summary>
@@ -26656,7 +26806,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2866,32 @@
+@@ -2728,11 +2868,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -26691,7 +26841,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3019,25 @@
+@@ -2860,7 +3021,25 @@
  		type user_tmp_t;
  	')
  
@@ -26718,7 +26868,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3074,7 @@
+@@ -2897,6 +3076,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -26726,7 +26876,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3205,501 @@
+@@ -3027,3 +3207,501 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -p -r1.899 -r1.900
--- selinux-policy.spec	20 Aug 2009 00:02:37 -0000	1.899
+++ selinux-policy.spec	20 Aug 2009 17:48:51 -0000	1.900
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-3
+- Fix system-config-services policy
+
 * Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-2
 - Allow libvirt to change user componant of virt_domain
 



From cmadams at fedoraproject.org  Thu Aug 20 17:49:26 2009
From: cmadams at fedoraproject.org (Chris Adams)
Date: Thu, 20 Aug 2009 17:49:26 +0000 (UTC)
Subject: rpms/shmpps/devel import.log, NONE, 1.1 shmpps.init, NONE,
	1.1 shmpps.spec, NONE, 1.1 shmpps.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820174926.1415611C006E@cvs1.fedora.phx.redhat.com>

Author: cmadams

Update of /cvs/pkgs/rpms/shmpps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10252/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shmpps.init shmpps.spec shmpps.sysconfig 
Log Message:
Initial Fedora import



--- NEW FILE import.log ---
shmpps-1_03-1_fc11:HEAD:shmpps-1.03-1.fc11.src.rpm:1250790529


--- NEW FILE shmpps.init ---
#!/bin/sh
#
# shmpps	This shell script takes care of starting and stopping
#		the shared memory PPS driver.
#
# chkconfig: - 58 74
# description: shm_splc2 is the shared memory PPS driver for NTP

# Source function library
. /etc/init.d/functions

prog=shm_splc2
lockfile=/var/lock/subsys/$prog

start() {
	[ -x /usr/sbin/shm_splc2 ] || exit 5

	[ -f /etc/sysconfig/shmpps ] || exit 6
	. /etc/sysconfig/shmpps

        echo -n $"Starting $prog: "
        daemon $prog $OPTIONS
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && touch $lockfile
	return $RETVAL
}

stop() {
        echo -n $"Shutting down $prog: "
	killproc $prog
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && rm -f $lockfile
	return $RETVAL
}

# See how we were called
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	;;
  restart|force-reload)
	stop
	start
	;;
  try-restart|condrestart)
	if [ -f $lockfile ]; then
	    stop
	    start
	fi
	;;
  reload)
	exit 3
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
	exit 2
esac


--- NEW FILE shmpps.spec ---
Name:           shmpps
Version:        1.03
Release:        1%{?dist}
Summary:        Shared Memory driver for PPS time signals

Group:          System Environment/Daemons
License:        Public Domain and MIT
URL:            http://time.qnan.org/
Source0:        http://time.qnan.org/%{name}.tar
Source1:        shmpps.init
Source2:        shmpps.sysconfig
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       ntp
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): /sbin/service

%description
Shared memory (SHM) driver to allow high-resolution pulse-per-second
(PPS) time sources to be used with a Network Time Protocol (NTP) server
without a PPS-enabled kernel.  The PPS pin of the time source must be
connected to the declared signal pin on a serial or parallel port.

See /etc/sysconfig/shmpps for configuration.

%prep
%setup -q -n %{name}
sed -i \
    -e 's/#undef  *DOPARALLEL/#define DOPARALLEL/' \
    shm_splc2.c

%build
make CFLAGS="%{optflags}" LDFLAGS=""

%install
rm -rf %{buildroot}
install -p -m755 -D shm_splc2 %{buildroot}%{_sbindir}/shm_splc2
install -p -m755 -D %{SOURCE1} %{buildroot}%{_initrddir}/shmpps
install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/shmpps

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add shmpps

%preun
if [ "$1" -eq 0 ]; then
	/sbin/service shmpps stop > /dev/null 2>&1
	/sbin/chkconfig --del shmpps
fi

%postun
if [ "$1" -ge 1 ]; then
	/sbin/service shmpps condrestart > /dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%{_sbindir}/shm_splc2
%{_initrddir}/shmpps
%config(noreplace) %{_sysconfdir}/sysconfig/shmpps

%changelog
* Sat Nov 22 2008 Chris Adams <linux at cmadams.net> 1.03-1
- initial package



--- NEW FILE shmpps.sysconfig ---
########################################################################
# Usage:
# shm -d/dev/device -s (serial) or -p (parallel) -u (unit)
#  -c -l (line) -f -D
#
# -c sets second boundary on hi->lo transition for serial
# -l line defines serial line being sampled: DCD CTS DSR
# -f sets pin 14 flapping on parallel i/f
#
# -D debug level, may be repeated:
# No. of -D
# 0  normal operation: daemonize; no reporting
# 1  + no daemonization; progress reports to stderr
# 2  + out-of-range reports
# 3  + no updating SHM
#
# (wire PPS to parallel pin 10, ground to 18, echo out to 14)
#
# Configure ntpd to use this as a time source in ntp.conf like:
# server 127.127.28.3 minpoll 4 maxpoll 4 prefer
# fudge 127.127.28.3 refid GPS
########################################################################
# For serial DCD
OPTIONS="-d /dev/gps0 -s -u 0 -l DCD"
# For parallel
#OPTIONS="-d /dev/parport0 -p -u 0 -l DCD"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:34 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:49:25 -0000	1.2
@@ -0,0 +1 @@
+shmpps.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:34 -0000	1.1
+++ sources	20 Aug 2009 17:49:25 -0000	1.2
@@ -0,0 +1 @@
+a55d2a3c51c7810cfd3e2adb08f55d02  shmpps.tar



From wtogami at fedoraproject.org  Thu Aug 20 17:49:33 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 20 Aug 2009 17:49:33 +0000 (UTC)
Subject: rpms/SDL_sound/devel SDL_sound.spec,1.5,1.6
Message-ID: <20090820174933.36A4811C006E@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/SDL_sound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10392

Modified Files:
	SDL_sound.spec 
Log Message:
rebuild



Index: SDL_sound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_sound/devel/SDL_sound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- SDL_sound.spec	24 Jul 2009 16:19:26 -0000	1.5
+++ SDL_sound.spec	20 Aug 2009 17:49:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           SDL_sound
 Version:        1.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library handling decoding of several popular sound file formats
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Warren Togami <wtogami at redhat.com> - 1.0.3-4
+- rebuild
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cmadams at fedoraproject.org  Thu Aug 20 17:51:12 2009
From: cmadams at fedoraproject.org (Chris Adams)
Date: Thu, 20 Aug 2009 17:51:12 +0000 (UTC)
Subject: rpms/shmpps/F-11 import.log, NONE, 1.1 shmpps.init, NONE,
	1.1 shmpps.spec, NONE, 1.1 shmpps.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820175112.D9A2F11C006E@cvs1.fedora.phx.redhat.com>

Author: cmadams

Update of /cvs/pkgs/rpms/shmpps/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11387/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shmpps.init shmpps.spec shmpps.sysconfig 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
shmpps-1_03-1_fc11:F-11:shmpps-1.03-1.fc11.src.rpm:1250790644


--- NEW FILE shmpps.init ---
#!/bin/sh
#
# shmpps	This shell script takes care of starting and stopping
#		the shared memory PPS driver.
#
# chkconfig: - 58 74
# description: shm_splc2 is the shared memory PPS driver for NTP

# Source function library
. /etc/init.d/functions

prog=shm_splc2
lockfile=/var/lock/subsys/$prog

start() {
	[ -x /usr/sbin/shm_splc2 ] || exit 5

	[ -f /etc/sysconfig/shmpps ] || exit 6
	. /etc/sysconfig/shmpps

        echo -n $"Starting $prog: "
        daemon $prog $OPTIONS
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && touch $lockfile
	return $RETVAL
}

stop() {
        echo -n $"Shutting down $prog: "
	killproc $prog
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && rm -f $lockfile
	return $RETVAL
}

# See how we were called
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	;;
  restart|force-reload)
	stop
	start
	;;
  try-restart|condrestart)
	if [ -f $lockfile ]; then
	    stop
	    start
	fi
	;;
  reload)
	exit 3
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
	exit 2
esac


--- NEW FILE shmpps.spec ---
Name:           shmpps
Version:        1.03
Release:        1%{?dist}
Summary:        Shared Memory driver for PPS time signals

Group:          System Environment/Daemons
License:        Public Domain and MIT
URL:            http://time.qnan.org/
Source0:        http://time.qnan.org/%{name}.tar
Source1:        shmpps.init
Source2:        shmpps.sysconfig
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       ntp
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): /sbin/service

%description
Shared memory (SHM) driver to allow high-resolution pulse-per-second
(PPS) time sources to be used with a Network Time Protocol (NTP) server
without a PPS-enabled kernel.  The PPS pin of the time source must be
connected to the declared signal pin on a serial or parallel port.

See /etc/sysconfig/shmpps for configuration.

%prep
%setup -q -n %{name}
sed -i \
    -e 's/#undef  *DOPARALLEL/#define DOPARALLEL/' \
    shm_splc2.c

%build
make CFLAGS="%{optflags}" LDFLAGS=""

%install
rm -rf %{buildroot}
install -p -m755 -D shm_splc2 %{buildroot}%{_sbindir}/shm_splc2
install -p -m755 -D %{SOURCE1} %{buildroot}%{_initrddir}/shmpps
install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/shmpps

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add shmpps

%preun
if [ "$1" -eq 0 ]; then
	/sbin/service shmpps stop > /dev/null 2>&1
	/sbin/chkconfig --del shmpps
fi

%postun
if [ "$1" -ge 1 ]; then
	/sbin/service shmpps condrestart > /dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%{_sbindir}/shm_splc2
%{_initrddir}/shmpps
%config(noreplace) %{_sysconfdir}/sysconfig/shmpps

%changelog
* Sat Nov 22 2008 Chris Adams <linux at cmadams.net> 1.03-1
- initial package



--- NEW FILE shmpps.sysconfig ---
########################################################################
# Usage:
# shm -d/dev/device -s (serial) or -p (parallel) -u (unit)
#  -c -l (line) -f -D
#
# -c sets second boundary on hi->lo transition for serial
# -l line defines serial line being sampled: DCD CTS DSR
# -f sets pin 14 flapping on parallel i/f
#
# -D debug level, may be repeated:
# No. of -D
# 0  normal operation: daemonize; no reporting
# 1  + no daemonization; progress reports to stderr
# 2  + out-of-range reports
# 3  + no updating SHM
#
# (wire PPS to parallel pin 10, ground to 18, echo out to 14)
#
# Configure ntpd to use this as a time source in ntp.conf like:
# server 127.127.28.3 minpoll 4 maxpoll 4 prefer
# fudge 127.127.28.3 refid GPS
########################################################################
# For serial DCD
OPTIONS="-d /dev/gps0 -s -u 0 -l DCD"
# For parallel
#OPTIONS="-d /dev/parport0 -p -u 0 -l DCD"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:34 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:51:12 -0000	1.2
@@ -0,0 +1 @@
+shmpps.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:34 -0000	1.1
+++ sources	20 Aug 2009 17:51:12 -0000	1.2
@@ -0,0 +1 @@
+a55d2a3c51c7810cfd3e2adb08f55d02  shmpps.tar



From cmadams at fedoraproject.org  Thu Aug 20 17:52:04 2009
From: cmadams at fedoraproject.org (Chris Adams)
Date: Thu, 20 Aug 2009 17:52:04 +0000 (UTC)
Subject: rpms/shmpps/F-10 import.log, NONE, 1.1 shmpps.init, NONE,
	1.1 shmpps.spec, NONE, 1.1 shmpps.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820175204.05B6811C006E@cvs1.fedora.phx.redhat.com>

Author: cmadams

Update of /cvs/pkgs/rpms/shmpps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12137/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shmpps.init shmpps.spec shmpps.sysconfig 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
shmpps-1_03-1_fc11:F-10:shmpps-1.03-1.fc11.src.rpm:1250790707


--- NEW FILE shmpps.init ---
#!/bin/sh
#
# shmpps	This shell script takes care of starting and stopping
#		the shared memory PPS driver.
#
# chkconfig: - 58 74
# description: shm_splc2 is the shared memory PPS driver for NTP

# Source function library
. /etc/init.d/functions

prog=shm_splc2
lockfile=/var/lock/subsys/$prog

start() {
	[ -x /usr/sbin/shm_splc2 ] || exit 5

	[ -f /etc/sysconfig/shmpps ] || exit 6
	. /etc/sysconfig/shmpps

        echo -n $"Starting $prog: "
        daemon $prog $OPTIONS
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && touch $lockfile
	return $RETVAL
}

stop() {
        echo -n $"Shutting down $prog: "
	killproc $prog
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && rm -f $lockfile
	return $RETVAL
}

# See how we were called
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	;;
  restart|force-reload)
	stop
	start
	;;
  try-restart|condrestart)
	if [ -f $lockfile ]; then
	    stop
	    start
	fi
	;;
  reload)
	exit 3
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
	exit 2
esac


--- NEW FILE shmpps.spec ---
Name:           shmpps
Version:        1.03
Release:        1%{?dist}
Summary:        Shared Memory driver for PPS time signals

Group:          System Environment/Daemons
License:        Public Domain and MIT
URL:            http://time.qnan.org/
Source0:        http://time.qnan.org/%{name}.tar
Source1:        shmpps.init
Source2:        shmpps.sysconfig
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       ntp
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): /sbin/service

%description
Shared memory (SHM) driver to allow high-resolution pulse-per-second
(PPS) time sources to be used with a Network Time Protocol (NTP) server
without a PPS-enabled kernel.  The PPS pin of the time source must be
connected to the declared signal pin on a serial or parallel port.

See /etc/sysconfig/shmpps for configuration.

%prep
%setup -q -n %{name}
sed -i \
    -e 's/#undef  *DOPARALLEL/#define DOPARALLEL/' \
    shm_splc2.c

%build
make CFLAGS="%{optflags}" LDFLAGS=""

%install
rm -rf %{buildroot}
install -p -m755 -D shm_splc2 %{buildroot}%{_sbindir}/shm_splc2
install -p -m755 -D %{SOURCE1} %{buildroot}%{_initrddir}/shmpps
install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/shmpps

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add shmpps

%preun
if [ "$1" -eq 0 ]; then
	/sbin/service shmpps stop > /dev/null 2>&1
	/sbin/chkconfig --del shmpps
fi

%postun
if [ "$1" -ge 1 ]; then
	/sbin/service shmpps condrestart > /dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%{_sbindir}/shm_splc2
%{_initrddir}/shmpps
%config(noreplace) %{_sysconfdir}/sysconfig/shmpps

%changelog
* Sat Nov 22 2008 Chris Adams <linux at cmadams.net> 1.03-1
- initial package



--- NEW FILE shmpps.sysconfig ---
########################################################################
# Usage:
# shm -d/dev/device -s (serial) or -p (parallel) -u (unit)
#  -c -l (line) -f -D
#
# -c sets second boundary on hi->lo transition for serial
# -l line defines serial line being sampled: DCD CTS DSR
# -f sets pin 14 flapping on parallel i/f
#
# -D debug level, may be repeated:
# No. of -D
# 0  normal operation: daemonize; no reporting
# 1  + no daemonization; progress reports to stderr
# 2  + out-of-range reports
# 3  + no updating SHM
#
# (wire PPS to parallel pin 10, ground to 18, echo out to 14)
#
# Configure ntpd to use this as a time source in ntp.conf like:
# server 127.127.28.3 minpoll 4 maxpoll 4 prefer
# fudge 127.127.28.3 refid GPS
########################################################################
# For serial DCD
OPTIONS="-d /dev/gps0 -s -u 0 -l DCD"
# For parallel
#OPTIONS="-d /dev/parport0 -p -u 0 -l DCD"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:34 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:52:03 -0000	1.2
@@ -0,0 +1 @@
+shmpps.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:34 -0000	1.1
+++ sources	20 Aug 2009 17:52:03 -0000	1.2
@@ -0,0 +1 @@
+a55d2a3c51c7810cfd3e2adb08f55d02  shmpps.tar



From cmadams at fedoraproject.org  Thu Aug 20 17:53:18 2009
From: cmadams at fedoraproject.org (Chris Adams)
Date: Thu, 20 Aug 2009 17:53:18 +0000 (UTC)
Subject: rpms/shmpps/EL-5 import.log, NONE, 1.1 shmpps.init, NONE,
	1.1 shmpps.spec, NONE, 1.1 shmpps.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820175318.B7C1B11C006E@cvs1.fedora.phx.redhat.com>

Author: cmadams

Update of /cvs/pkgs/rpms/shmpps/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12658/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log shmpps.init shmpps.spec shmpps.sysconfig 
Log Message:
Initial Fedora import


--- NEW FILE import.log ---
shmpps-1_03-1_fc11:EL-5:shmpps-1.03-1.fc11.src.rpm:1250790771


--- NEW FILE shmpps.init ---
#!/bin/sh
#
# shmpps	This shell script takes care of starting and stopping
#		the shared memory PPS driver.
#
# chkconfig: - 58 74
# description: shm_splc2 is the shared memory PPS driver for NTP

# Source function library
. /etc/init.d/functions

prog=shm_splc2
lockfile=/var/lock/subsys/$prog

start() {
	[ -x /usr/sbin/shm_splc2 ] || exit 5

	[ -f /etc/sysconfig/shmpps ] || exit 6
	. /etc/sysconfig/shmpps

        echo -n $"Starting $prog: "
        daemon $prog $OPTIONS
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && touch $lockfile
	return $RETVAL
}

stop() {
        echo -n $"Shutting down $prog: "
	killproc $prog
	RETVAL=$?
        echo
	[ $RETVAL -eq 0 ] && rm -f $lockfile
	return $RETVAL
}

# See how we were called
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	;;
  restart|force-reload)
	stop
	start
	;;
  try-restart|condrestart)
	if [ -f $lockfile ]; then
	    stop
	    start
	fi
	;;
  reload)
	exit 3
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
	exit 2
esac


--- NEW FILE shmpps.spec ---
Name:           shmpps
Version:        1.03
Release:        1%{?dist}
Summary:        Shared Memory driver for PPS time signals

Group:          System Environment/Daemons
License:        Public Domain and MIT
URL:            http://time.qnan.org/
Source0:        http://time.qnan.org/%{name}.tar
Source1:        shmpps.init
Source2:        shmpps.sysconfig
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       ntp
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig /sbin/service
Requires(postun): /sbin/service

%description
Shared memory (SHM) driver to allow high-resolution pulse-per-second
(PPS) time sources to be used with a Network Time Protocol (NTP) server
without a PPS-enabled kernel.  The PPS pin of the time source must be
connected to the declared signal pin on a serial or parallel port.

See /etc/sysconfig/shmpps for configuration.

%prep
%setup -q -n %{name}
sed -i \
    -e 's/#undef  *DOPARALLEL/#define DOPARALLEL/' \
    shm_splc2.c

%build
make CFLAGS="%{optflags}" LDFLAGS=""

%install
rm -rf %{buildroot}
install -p -m755 -D shm_splc2 %{buildroot}%{_sbindir}/shm_splc2
install -p -m755 -D %{SOURCE1} %{buildroot}%{_initrddir}/shmpps
install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/shmpps

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add shmpps

%preun
if [ "$1" -eq 0 ]; then
	/sbin/service shmpps stop > /dev/null 2>&1
	/sbin/chkconfig --del shmpps
fi

%postun
if [ "$1" -ge 1 ]; then
	/sbin/service shmpps condrestart > /dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%{_sbindir}/shm_splc2
%{_initrddir}/shmpps
%config(noreplace) %{_sysconfdir}/sysconfig/shmpps

%changelog
* Sat Nov 22 2008 Chris Adams <linux at cmadams.net> 1.03-1
- initial package



--- NEW FILE shmpps.sysconfig ---
########################################################################
# Usage:
# shm -d/dev/device -s (serial) or -p (parallel) -u (unit)
#  -c -l (line) -f -D
#
# -c sets second boundary on hi->lo transition for serial
# -l line defines serial line being sampled: DCD CTS DSR
# -f sets pin 14 flapping on parallel i/f
#
# -D debug level, may be repeated:
# No. of -D
# 0  normal operation: daemonize; no reporting
# 1  + no daemonization; progress reports to stderr
# 2  + out-of-range reports
# 3  + no updating SHM
#
# (wire PPS to parallel pin 10, ground to 18, echo out to 14)
#
# Configure ntpd to use this as a time source in ntp.conf like:
# server 127.127.28.3 minpoll 4 maxpoll 4 prefer
# fudge 127.127.28.3 refid GPS
########################################################################
# For serial DCD
OPTIONS="-d /dev/gps0 -s -u 0 -l DCD"
# For parallel
#OPTIONS="-d /dev/parport0 -p -u 0 -l DCD"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:34 -0000	1.1
+++ .cvsignore	20 Aug 2009 17:53:18 -0000	1.2
@@ -0,0 +1 @@
+shmpps.tar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shmpps/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:34 -0000	1.1
+++ sources	20 Aug 2009 17:53:18 -0000	1.2
@@ -0,0 +1 @@
+a55d2a3c51c7810cfd3e2adb08f55d02  shmpps.tar



From pkgdb at fedoraproject.org  Thu Aug 20 17:57:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:57:38 +0000
Subject: [pkgdb] php-channel-doctrine was added for cdamian
Message-ID: <20090820175738.A78FA10F854@bastion2.fedora.phx.redhat.com>

tibbs has added Package php-channel-doctrine with summary Adds doctrine project channel to PEAR
tibbs has approved Package php-channel-doctrine
tibbs has added a Fedora devel branch for php-channel-doctrine with an owner of cdamian
tibbs has approved php-channel-doctrine in Fedora devel
tibbs has approved Package php-channel-doctrine
tibbs has set commit to Approved for 107427 on php-channel-doctrine (Fedora devel)
tibbs has set checkout to Approved for 107427 on php-channel-doctrine (Fedora devel)
tibbs has set build to Approved for 107427 on php-channel-doctrine (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-doctrine



From pkgdb at fedoraproject.org  Thu Aug 20 17:57:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:57:39 +0000
Subject: [pkgdb] php-channel-doctrine summary updated by tibbs
Message-ID: <20090820175739.B8EDB10F85C@bastion2.fedora.phx.redhat.com>

tibbs set package php-channel-doctrine summary to Adds doctrine project channel to PEAR

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-doctrine



From tibbs at fedoraproject.org  Thu Aug 20 17:57:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:57:46 +0000 (UTC)
Subject: rpms/php-channel-doctrine - New directory
Message-ID: <20090820175746.18CB011C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-channel-doctrine
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsW13969/rpms/php-channel-doctrine

Log Message:
Directory /cvs/pkgs/rpms/php-channel-doctrine added to the repository




From tibbs at fedoraproject.org  Thu Aug 20 17:57:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:57:46 +0000 (UTC)
Subject: rpms/php-channel-doctrine/devel - New directory
Message-ID: <20090820175746.38CBD11C0381@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-channel-doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsW13969/rpms/php-channel-doctrine/devel

Log Message:
Directory /cvs/pkgs/rpms/php-channel-doctrine/devel added to the repository




From pkgdb at fedoraproject.org  Thu Aug 20 17:57:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 17:57:39 +0000
Subject: [pkgdb] php-channel-doctrine (Fedora, 11) updated by tibbs
Message-ID: <20090820175739.D6A9410F888@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for php-channel-doctrine
tibbs has set commit to Approved for 107427 on php-channel-doctrine (Fedora 11)
tibbs has set checkout to Approved for 107427 on php-channel-doctrine (Fedora 11)
tibbs has set build to Approved for 107427 on php-channel-doctrine (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-channel-doctrine



From tibbs at fedoraproject.org  Thu Aug 20 17:57:52 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:57:52 +0000 (UTC)
Subject: rpms/php-channel-doctrine Makefile,NONE,1.1
Message-ID: <20090820175752.214A211C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-channel-doctrine
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsW13969/rpms/php-channel-doctrine

Added Files:
	Makefile 
Log Message:
Setup of module php-channel-doctrine


--- NEW FILE Makefile ---
# Top level Makefile for module php-channel-doctrine
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Thu Aug 20 17:57:52 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 20 Aug 2009 17:57:52 +0000 (UTC)
Subject: rpms/php-channel-doctrine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090820175752.57EBF11C006E@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/php-channel-doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsW13969/rpms/php-channel-doctrine/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-channel-doctrine


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-channel-doctrine
# $Id: Makefile,v 1.1 2009/08/20 17:57:52 tibbs Exp $
NAME := php-channel-doctrine
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From diegobz at fedoraproject.org  Thu Aug 20 18:05:53 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:05:53 +0000 (UTC)
Subject: rpms/django-filter/devel django-filter.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820180553.6E3A811C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-filter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16031/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-filter.spec import.log 
Log Message:
Initial import



--- NEW FILE django-filter.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-filter
Version:        0.5.0
Release:        1%{?dist}
Summary:        A Django application for allowing users to filter queryset dynamically

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-filter provides a simple way to filter down a queryset based on
parameters a user provides.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYRIGHT docs/
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.5.0-1
- Initial RPM release


--- NEW FILE import.log ---
django-filter-0_5_0-1_fc11:HEAD:django-filter-0.5.0-1.fc11.src.rpm:1250790946


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:01 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:05:53 -0000	1.2
@@ -0,0 +1 @@
+django-filter-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:01 -0000	1.1
+++ sources	20 Aug 2009 18:05:53 -0000	1.2
@@ -0,0 +1 @@
+c3186cfef159a2bbbae87225f9875846  django-filter-0.5.0.tar.gz



From diegobz at fedoraproject.org  Thu Aug 20 18:09:11 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:09:11 +0000 (UTC)
Subject: rpms/django-filter/F-11 django-filter.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820180911.F351711C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-filter/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17101/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-filter.spec import.log 
Log Message:
Initial import


--- NEW FILE django-filter.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-filter
Version:        0.5.0
Release:        1%{?dist}
Summary:        A Django application for allowing users to filter queryset dynamically

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-filter provides a simple way to filter down a queryset based on
parameters a user provides.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYRIGHT docs/
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.5.0-1
- Initial RPM release


--- NEW FILE import.log ---
django-filter-0_5_0-1_fc11:F-11:django-filter-0.5.0-1.fc11.src.rpm:1250791829


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:01 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:09:11 -0000	1.2
@@ -0,0 +1 @@
+django-filter-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:01 -0000	1.1
+++ sources	20 Aug 2009 18:09:11 -0000	1.2
@@ -0,0 +1 @@
+c3186cfef159a2bbbae87225f9875846  django-filter-0.5.0.tar.gz



From wtogami at fedoraproject.org  Thu Aug 20 18:11:36 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 20 Aug 2009 18:11:36 +0000 (UTC)
Subject: rpms/desktop-data-model/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE desktop-data-model.spec, 1.19, NONE sources, 1.6, NONE
Message-ID: <20090820181136.756B811C006E@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/desktop-data-model/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17986

Added Files:
	dead.package 
Removed Files:
	Makefile desktop-data-model.spec sources 
Log Message:
remove desktop-data-model



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- desktop-data-model.spec DELETED ---


--- sources DELETED ---



From wtogami at fedoraproject.org  Thu Aug 20 18:12:19 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 20 Aug 2009 18:12:19 +0000 (UTC)
Subject: rpms/online-desktop/devel dead.package, NONE,
	1.1 Getting_Started.html, 
	1.1, NONE Makefile, 1.1, NONE online-desktop.spec, 1.35,
	NONE sources, 1.24, NONE
Message-ID: <20090820181219.BC28D11C006E@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/online-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18211

Added Files:
	dead.package 
Removed Files:
	Getting_Started.html Makefile online-desktop.spec sources 
Log Message:
remove online-desktop



--- NEW FILE dead.package ---


--- Getting_Started.html DELETED ---


--- Makefile DELETED ---


--- online-desktop.spec DELETED ---


--- sources DELETED ---



From diegobz at fedoraproject.org  Thu Aug 20 18:12:28 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:12:28 +0000 (UTC)
Subject: rpms/django-filter/EL-5 django-filter.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820181228.CC75211C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-filter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18281/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-filter.spec import.log 
Log Message:
Initial import


--- NEW FILE django-filter.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-filter
Version:        0.5.0
Release:        1%{?dist}
Summary:        A Django application for allowing users to filter queryset dynamically

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-filter provides a simple way to filter down a queryset based on
parameters a user provides.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYRIGHT docs/
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.5.0-1
- Initial RPM release


--- NEW FILE import.log ---
django-filter-0_5_0-1_fc11:EL-5:django-filter-0.5.0-1.fc11.src.rpm:1250792024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:01 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:12:28 -0000	1.2
@@ -0,0 +1 @@
+django-filter-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:01 -0000	1.1
+++ sources	20 Aug 2009 18:12:28 -0000	1.2
@@ -0,0 +1 @@
+c3186cfef159a2bbbae87225f9875846  django-filter-0.5.0.tar.gz



From wtogami at fedoraproject.org  Thu Aug 20 18:13:02 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 20 Aug 2009 18:13:02 +0000 (UTC)
Subject: rpms/bigboard/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE bigboard-0.5.34-noshutdown.patch, 1.1,
	NONE bigboard-default-fedora-theme.patch, 1.1,
	NONE bigboard.spec, 1.79, NONE libempathy-api.patch, 1.1,
	NONE sources, 1.47, NONE
Message-ID: <20090820181302.7EEF911C006E@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18486

Added Files:
	dead.package 
Removed Files:
	Makefile bigboard-0.5.34-noshutdown.patch 
	bigboard-default-fedora-theme.patch bigboard.spec 
	libempathy-api.patch sources 
Log Message:
remove bigboard



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- bigboard-0.5.34-noshutdown.patch DELETED ---


--- bigboard-default-fedora-theme.patch DELETED ---


--- bigboard.spec DELETED ---


--- libempathy-api.patch DELETED ---


--- sources DELETED ---



From wtogami at fedoraproject.org  Thu Aug 20 18:13:29 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 20 Aug 2009 18:13:29 +0000 (UTC)
Subject: rpms/asc/devel asc.spec,1.18,1.19
Message-ID: <20090820181329.341C711C006E@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/asc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18688

Modified Files:
	asc.spec 
Log Message:
rebuild



Index: asc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asc/devel/asc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- asc.spec	24 Jul 2009 17:10:06 -0000	1.18
+++ asc.spec	20 Aug 2009 18:13:29 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           asc
 Version:        2.2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Advanced Strategic Command
 Group:          Amusements/Games
 License:        GPLv2+
@@ -80,6 +80,9 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Warren Togami <wtogami at redhat.com> - 2.2.0.0-6
+- rebuild
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Aug 20 18:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 18:13:40 +0000
Subject: [pkgdb] jakarta-commons-dbcp: akurtakov has requested watchbugzilla
Message-ID: <20090820181340.4623610F857@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on jakarta-commons-dbcp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-dbcp



From pkgdb at fedoraproject.org  Thu Aug 20 18:13:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 18:13:41 +0000
Subject: [pkgdb] jakarta-commons-dbcp: akurtakov has requested watchcommits
Message-ID: <20090820181341.CE8C010F86F@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on jakarta-commons-dbcp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-dbcp



From pkgdb at fedoraproject.org  Thu Aug 20 18:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 18:13:44 +0000
Subject: [pkgdb] jakarta-commons-dbcp: akurtakov has requested commit
Message-ID: <20090820181344.3887010F886@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on jakarta-commons-dbcp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-dbcp



From diegobz at fedoraproject.org  Thu Aug 20 18:15:35 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:15:35 +0000 (UTC)
Subject: rpms/django-filter/F-10 django-filter.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820181535.7697811C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-filter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19359/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	django-filter.spec import.log 
Log Message:
Initial import


--- NEW FILE django-filter.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-filter
Version:        0.5.0
Release:        1%{?dist}
Summary:        A Django application for allowing users to filter queryset dynamically

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-filter provides a simple way to filter down a queryset based on
parameters a user provides.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS.txt README.txt COPYRIGHT docs/
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.5.0-1
- Initial RPM release


--- NEW FILE import.log ---
django-filter-0_5_0-1_fc11:F-10:django-filter-0.5.0-1.fc11.src.rpm:1250792213


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:39:01 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:15:35 -0000	1.2
@@ -0,0 +1 @@
+django-filter-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-filter/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:39:01 -0000	1.1
+++ sources	20 Aug 2009 18:15:35 -0000	1.2
@@ -0,0 +1 @@
+c3186cfef159a2bbbae87225f9875846  django-filter-0.5.0.tar.gz



From akurtakov at fedoraproject.org  Thu Aug 20 18:18:47 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 18:18:47 +0000 (UTC)
Subject: rpms/jakarta-commons-configuration/devel
	jakarta-commons-configuration.spec, 1.1, 1.2
Message-ID: <20090820181847.A894111C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-configuration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20041/devel

Modified Files:
	jakarta-commons-configuration.spec 
Log Message:
* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-7
- Fix description.
- Remove requires(post/postun) for javadoc subpackage.
- Use sed instead of dos2unix.


Index: jakarta-commons-configuration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-configuration/devel/jakarta-commons-configuration.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jakarta-commons-configuration.spec	20 Aug 2009 04:42:19 -0000	1.1
+++ jakarta-commons-configuration.spec	20 Aug 2009 18:18:47 -0000	1.2
@@ -32,7 +32,7 @@
 
 Name:           jakarta-commons-configuration
 Version:        1.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Commons Configuration Package
 
@@ -67,7 +67,6 @@ BuildRequires:  jakarta-commons-pool
 BuildRequires:  servletapi5
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
-BuildRequires:  dos2unix
 
 Requires:  jakarta-commons-beanutils >= 0:1.7.0
 Requires:  jakarta-commons-codec
@@ -92,7 +91,7 @@ provides easy typed access to single, as
 configuration values based on a 'key'.
 Right now you can load properties from a simple properties
 file, a properties file in a jar, an XML file, JNDI settings,
-as well as use a mix different sources using a
+as well as use a mix of different sources using a
 ConfigurationFactory and CompositeConfiguration.
 Custom configuration objects are very easy to create now
 by just subclassing AbstractConfiguration. This works
@@ -101,8 +100,6 @@ similar to how AbstractList works.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}
@@ -111,7 +108,7 @@ Javadoc for %{name}
 %prep
 %setup -q -n %{base_name}-%{version}-src
 %patch0 -b .sav
-dos2unix LICENSE.txt
+%{__sed} -i 's/\r//' LICENSE.txt
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -169,6 +166,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-7
+- Fix description.
+- Remove requires(post/postun) for javadoc subpackage.
+- Use sed instead of dos2unix.
+
 * Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-6
 - Remove gcj support.
 - Initial build for Fedora.



From pkgdb at fedoraproject.org  Thu Aug 20 18:20:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 18:20:01 +0000
Subject: [pkgdb] jakarta-commons-dbcp had acl change status
Message-ID: <20090820182002.283B310F854@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on jakarta-commons-dbcp (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-dbcp



From pkgdb at fedoraproject.org  Thu Aug 20 18:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 18:20:02 +0000
Subject: [pkgdb] jakarta-commons-dbcp had acl change status
Message-ID: <20090820182002.525BC10F85A@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on jakarta-commons-dbcp (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-dbcp



From pkgdb at fedoraproject.org  Thu Aug 20 18:20:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 20 Aug 2009 18:20:03 +0000
Subject: [pkgdb] jakarta-commons-dbcp had acl change status
Message-ID: <20090820182004.0F6C010F889@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on jakarta-commons-dbcp (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jakarta-commons-dbcp



From ebaron at fedoraproject.org  Thu Aug 20 18:20:06 2009
From: ebaron at fedoraproject.org (Elliott Baron)
Date: Thu, 20 Aug 2009 18:20:06 +0000 (UTC)
Subject: rpms/eclipse-valgrind/devel .cvsignore, 1.6,
	1.7 eclipse-valgrind-fetch-src.sh, 1.3,
	1.4 eclipse-valgrind.spec, 1.14, 1.15 sources, 1.7,
	1.8 eclipse-valgrind-massif-unknown-symbols.patch, 1.1, NONE
Message-ID: <20090820182006.E5EB211C0417@cvs1.fedora.phx.redhat.com>

Author: ebaron

Update of /cvs/pkgs/rpms/eclipse-valgrind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20395

Modified Files:
	.cvsignore eclipse-valgrind-fetch-src.sh eclipse-valgrind.spec 
	sources 
Removed Files:
	eclipse-valgrind-massif-unknown-symbols.patch 
Log Message:
* Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-1
- Upstream 0.3.0 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	8 Jun 2009 14:51:41 -0000	1.6
+++ .cvsignore	20 Aug 2009 18:20:06 -0000	1.7
@@ -1 +1 @@
-eclipse-valgrind-fetched-src-RELEASE_0_2_1.tar.bz2
+eclipse-valgrind-fetched-src-RELEASE_0_3_0.tar.bz2


Index: eclipse-valgrind-fetch-src.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/eclipse-valgrind-fetch-src.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-valgrind-fetch-src.sh	21 May 2009 18:47:10 -0000	1.3
+++ eclipse-valgrind-fetch-src.sh	20 Aug 2009 18:20:06 -0000	1.4
@@ -16,10 +16,12 @@ for f in \
 org.eclipse.linuxtools.valgrind-feature \
 org.eclipse.linuxtools.valgrind.cachegrind \
 org.eclipse.linuxtools.valgrind.core \
+org.eclipse.linuxtools.valgrind.doc \
 org.eclipse.linuxtools.valgrind.launch \
 org.eclipse.linuxtools.valgrind.massif \
 org.eclipse.linuxtools.valgrind.memcheck \
 org.eclipse.linuxtools.valgrind.ui \
+org.eclipse.linuxtools.valgrind.ui.editor \
 ; do
 svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/valgrind/tags/$tag/$f $tar_name/$f
 done


Index: eclipse-valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/eclipse-valgrind.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- eclipse-valgrind.spec	24 Jul 2009 20:59:31 -0000	1.14
+++ eclipse-valgrind.spec	20 Aug 2009 18:20:06 -0000	1.15
@@ -1,14 +1,14 @@
-%define src_repo_tag   RELEASE_0_2_1
+%define src_repo_tag   RELEASE_0_3_0
 %define eclipse_base   %{_libdir}/eclipse
 %define install_loc    %{_libdir}/eclipse/dropins/valgrind
-%define qualifier      200905251648
+%define qualifier      200908180856
 
 # Package in %%{_libdir} but no native code so no debuginfo
 %global debug_package %{nil}
 
 Name:           eclipse-valgrind
-Version:        0.2.1
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Valgrind Tools Integration for Eclipse
 
 Group:          Development/Tools
@@ -16,21 +16,20 @@ License:        EPL
 URL:            http://www.eclipse.org/linuxtools/projectPages/valgrind
 Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.bz2
 Source1:        %{name}-fetch-src.sh
-Patch0:         %{name}-massif-unknown-symbols.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #No CDT on ppc64
 ExcludeArch: ppc64
 
 BuildRequires: java-devel >= 1.5.0
-BuildRequires: eclipse-cdt
-BuildRequires: eclipse-linuxprofilingframework >= 0.2.0
-BuildRequires: eclipse-birt
-BuildRequires: eclipse-pde >= 1:3.4.0
-Requires: eclipse-platform >= 3.4.0
-Requires: eclipse-cdt
-Requires: eclipse-linuxprofilingframework >= 0.2.0
-Requires: eclipse-birt
+BuildRequires: eclipse-cdt >= 1:6.0.0
+BuildRequires: eclipse-linuxprofilingframework >= 0.3.0
+BuildRequires: eclipse-birt >= 2.5
+BuildRequires: eclipse-pde >= 1:3.5.0
+Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-cdt >= 1:6.0.0
+Requires: eclipse-linuxprofilingframework >= 0.3.0
+Requires: eclipse-birt >= 2.5
 Requires: valgrind >= 3.3.0
 
 %description
@@ -40,13 +39,9 @@ projects using the Valgrind tool suite a
 %prep
 %setup -q -n %{name}-fetched-src-%{src_repo_tag}
 
-pushd org.eclipse.linuxtools.valgrind.massif
-%patch0
-popd
-
 %build
 %{eclipse_base}/buildscripts/pdebuild \
-    -f org.eclipse.linuxtools.valgrind.feature \
+    -f org.eclipse.linuxtools.valgrind \
     -d "cdt linuxprofilingframework emf rhino birt" \
     -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}"
 
@@ -55,7 +50,7 @@ popd
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
-     build/rpmBuild/org.eclipse.linuxtools.valgrind.feature.zip 
+     build/rpmBuild/org.eclipse.linuxtools.valgrind.zip 
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -66,6 +61,9 @@ install -d -m 755 %{buildroot}%{install_
 %doc org.eclipse.linuxtools.valgrind-feature/epl-v10.html
 
 %changelog
+* Thu Aug 20 2009 Elliott Baron <ebaron at fedoraproject.org> 0.3.0-1
+- Upstream 0.3.0 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Jun 2009 14:51:41 -0000	1.7
+++ sources	20 Aug 2009 18:20:06 -0000	1.8
@@ -1 +1 @@
-12eea29c920b7a9e72efa9019f143f3e  eclipse-valgrind-fetched-src-RELEASE_0_2_1.tar.bz2
+be1116aaef74847d5bc77282a7ba4df7  eclipse-valgrind-fetched-src-RELEASE_0_3_0.tar.bz2


--- eclipse-valgrind-massif-unknown-symbols.patch DELETED ---



From orion at fedoraproject.org  Thu Aug 20 18:23:58 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 20 Aug 2009 18:23:58 +0000 (UTC)
Subject: rpms/wgrib2/devel config.h, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 
	1.5, 1.6 wgrib2.spec, 1.8, 1.9
Message-ID: <20090820182358.C468C11C006E@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22197

Modified Files:
	.cvsignore sources wgrib2.spec 
Added Files:
	config.h 
Log Message:
* Thu Aug 20 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.0-1
- Update to 1.8.0
- Only ship the wgrib2 source
- Compile with mysql and netcdf4 support



--- NEW FILE config.h ---
/* config.h */
#define USE_REGEX
#define USE_TIGGE
#define USE_NETCDF3
#define USE_NETCDF4
#define USE_MYSQL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Jul 2009 22:04:12 -0000	1.5
+++ .cvsignore	20 Aug 2009 18:23:58 -0000	1.6
@@ -1 +1 @@
-wgrib2.tgz.v1.7.8j
+wgrib2-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 22:04:12 -0000	1.5
+++ sources	20 Aug 2009 18:23:58 -0000	1.6
@@ -1 +1 @@
-f4625d0b3b6b276a7ee256bb31aa04d5  wgrib2.tgz.v1.7.8j
+5f966acef09c2fcc0d19747d8a279cdb  wgrib2-1.8.0.tar.gz


Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wgrib2.spec	27 Jul 2009 07:13:20 -0000	1.8
+++ wgrib2.spec	20 Aug 2009 18:23:58 -0000	1.9
@@ -1,16 +1,23 @@
 Name:           wgrib2
-Version:        1.7.8j
-Release:        2%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
 Group:          Applications/Engineering
 # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+
 License:        GPLv2+
 URL:            http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
-Source0:        ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v%{version}
+# To make the Source0 tarball, uncomment this line and comment the second.
+# spectool -g wgrib2.spec
+# make prep
+# tar czf wgrib2-%{version}.tar.gz grib2
+#Source0:        ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v%{version}
+Source0:        wgrib2-%{version}.tar.gz
+Source1:        config.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  g2clib-devel, zlib-devel, netcdf-devel
+BuildRequires:  mysql-devel
 
 %description
 Wgrib2 is a swiss army knife for grib2 files. You can use it inventory or
@@ -19,14 +26,14 @@ extract data. You can do basic database 
 
 %prep
 %setup -q -n grib2
-rm -r g2clib-* jasper-*.tar.gz libpng-*.tar.gz \
-  zlib-*.tar.gz netcdf.tar.gz
+rm -rf g2clib-* *.tar.gz
+cp %SOURCE1 wgrib2/config.h
 
 
 %build
 cd wgrib2
-export CFLAGS="-I/usr/include/netcdf $RPM_OPT_FLAGS"
-export LDFLAGS="-lgrib2c -ljasper -lnetcdf -lpng -lz -lm"
+export CFLAGS="-I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS"
+export LDFLAGS="-lgrib2c -ljasper -lnetcdf -lpng -L%{_libdir}/mysql -lmysqlclient -lz -lm"
 make %{?_smp_mflags}
 
 
@@ -47,6 +54,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.0-1
+- Update to 1.8.0
+- Only ship the wgrib2 source
+- Compile with mysql and netcdf4 support
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.8j-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Thu Aug 20 18:25:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 18:25:58 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel constantine-backgrounds.spec, 1.2,
	1.3
Message-ID: <20090820182558.366DF11C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22736

Modified Files:
	constantine-backgrounds.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 11.90.1-3
- Provides: system-backgrounds(-kde) (F-12 only)



Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- constantine-backgrounds.spec	11 Aug 2009 20:52:46 -0000	1.2
+++ constantine-backgrounds.spec	20 Aug 2009 18:25:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           constantine-backgrounds
 Version:        11.90.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -18,6 +18,10 @@ BuildArch:      noarch
 # for %%_kde4_* macros
 BuildRequires:	kde-filesystem
 
+%if 0%{?fedora} == 12
+Provides: system-backgrounds
+%endif
+
 %description
 This package contains desktop backgrounds for the Constantine theme.
 
@@ -32,6 +36,10 @@ This package contains aditional desktop 
 Summary:        Constantine Wallpapers for KDE 
 Group:          Applications/Multimedia
 Obsoletes:      constantine-kde-theme <= 11.90.0
+%if 0%{?fedora} == 12
+Provides:       system-backgrounds-kde
+%endif
+
 Requires:       %{name} = %{version}-%{release} 
 Requires:       kde-filesystem
 
@@ -174,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 11.90.1-3
+- Provides: system-backgrounds(-kde) (F-12 only)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 11.90.1-2
 - -kde subpkg, CamelCase themes (with feeling)
 



From emaldonado at fedoraproject.org  Thu Aug 20 18:28:37 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 18:28:37 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.82,1.83 nss.pc.in,1.4,1.5
Message-ID: <20090820182837.C41FB11C006E@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23564

Modified Files:
	nss.spec nss.pc.in 
Log Message:
Reverting to the last stable tag nss-3_12_3_99_3-7_1_fc12


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- nss.spec	20 Aug 2009 00:41:40 -0000	1.82
+++ nss.spec	20 Aug 2009 18:28:37 -0000	1.83
@@ -1,25 +1,27 @@
-%global nspr_version 4.8
-# Eventually we will have 3.12.4
-# for now we test with 3.12.3.99.3
-%global nss_softokn_version 3.12.3.99.3
-%global nss_util_version 3.12.3.99.3
+%global nspr_version 4.7
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
+# Produce .chk files for the final stripped binaries
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+%{nil}
+
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          8%{?dist}
+Release:          7.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-softokn%{_isa} >= %{nss_softokn_version}
-Requires:         nss-util >= %{nss_util_version}
+Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn-devel >= %{nss_softokn_version}
-BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -34,12 +36,15 @@ Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-Source6:         %{name}-pem-20090622.tar.bz2
-Source7:         PayPalEE.cert
-Source8:         PayPalICA.cert
+Source8:          nss-prelink.conf
+Source12:         %{name}-pem-20090622.tar.bz2
+Source13:         PayPalEE.cert
+Source14:         PayPalICA.cert
 
 Patch1:           nss-no-rpath.patch
-Patch2:           nss-enable-pem.patch
+Patch2:           nss-nolocalsql.patch
+Patch6:           nss-enable-pem.patch
+Patch7:           nss-stubs-bug502133.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -48,6 +53,21 @@ server applications. Applications built 
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
+%package softokn-freebl
+Summary:          Freebl library for the Network Security Services
+Group:            System Environment/Base
+Conflicts:        nss < 3.12.2.99.3-5
+
+%description softokn-freebl
+Network Security Services (NSS) is a set of libraries designed to
+support cross-platform development of security-enabled client and
+server applications. Applications built with NSS can support SSL v2
+and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
+v3 certificates, and other security standards.
+
+Install the nss-softokn-freebl package if you need the freebl 
+library.
+
 
 %package tools
 Summary:          Tools for the Network Security Services
@@ -71,8 +91,6 @@ Summary:          Development libraries 
 Group:            Development/Libraries
 Requires:         nss = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
-Requires:         nss-softokn-devel >= %{nss_softkn_version}
-Requires:         nss-util-devel >= %{nss_util_version}
 Requires:         pkgconfig
 
 %description devel
@@ -91,14 +109,16 @@ low level services.
 
 %prep
 %setup -q
-%setup -q -T -D -n %{name}-%{version} -a 6
+%setup -q -T -D -n %{name}-%{version} -a 12
 
 %patch1 -p0
-%patch2 -p0 -b .libpem
-
-# need newer certs to make test suite work
-# remove once we update to NSS 3.12.4
-cp %{SOURCE7} %{SOURCE8} mozilla/security/nss/tests/libpkix/certs
+%patch2 -p0
+%patch6 -p0 -b .libpem
+%patch7 -p0 -b .502133
+
+#need newer certs to make test suite work
+#remove once we update to NSS 3.12.4
+cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
 
 
 %build
@@ -114,6 +134,8 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
+#export NSPR_INCLUDE_DIR=`nspr-config --includedir`
+#export NSPR_LIB_DIR=`nspr-config --libdir`
 
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@@ -127,25 +149,14 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
-NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
-
-export NSS_INCLUDE_DIR
-export NSS_LIB_DIR
-
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
 export USE_64
 %endif
 
-#
-# Though we only ship the nss proper libraries, no
-# softoken nor util, we actually compile everything
-# as we are using the entire source tree. It is a bit
-# a waste but this is the only way we can find the
-# private exports from util. Let's keep it simple
-# for now.
-#
+# NSS_ENABLE_ECC=1
+# export NSS_ENABLE_ECC
+
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
 %{__make} -C ./mozilla/security/nss
@@ -168,7 +179,6 @@ export NSS_VMAJOR 
 export NSS_VMINOR 
 export NSS_VPATCH
 
-%{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE2} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
@@ -218,13 +228,7 @@ killall $RANDSERV || :
 rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
-
-%define all_tests "cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
-%define nossl_tests "cipher libpkix cert dbtests tools fips sdr crmf smime ocsp merge pkits chains"
-%define cipher_suite "cipher"
-%define fips_suite "fips"
-
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_TESTS=%{all_tests} ./all.sh
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
 cd ../../../../
 
 killall $RANDSERV || :
@@ -250,68 +254,49 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libnss3.so \
-            libssl3.so libsmime3.so libnssckbi.so libnsspem.so
+for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+            libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
 do
   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
+# Make sure chk files can be found in both places
+for file in libsoftokn3.chk libfreebl3.chk
+do
+  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
 
 # Install the empty NSS db files
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
 %{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
 %{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
 %{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
+%{__install} -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
-  %{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Copy the binaries we want
 for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
 do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
 done
 
 # Copy the binaries we ship as unsupported
-for file in atob btoa derdump ocspclnt pp selfserv strsclnt symkeyutil tstclnt vfyserv vfychain
+for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
 do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-done
-
-# Before installing public headers romove the ones that nss-util-devel
-# and nss-softokn-devel have already installed
-
-# query the installed devel packages
-util_includes=`rpm -ql nss-util-devel | grep "%{_includedir}/nss3/"`
-softokn_includes=`rpm -ql nss-softokn-devel | grep "%{_includedir}/nss3/"`
-
-# make a more convenient list
-uslist=
-for f in ${util_includes}; do
-  bn=`basename ${f}`
-  uslist+="${bn} "
-done
-for f in ${softokn_includes}; do 
-  bn=`basename ${f}`
-  uslist+="${bn} "
-done
-
-# remove the headers we don't need
-for file in ${uslist}; do
-  if [ -f mozilla/dist/public/nss/${file} ]
-  then
-    rm mozilla/dist/public/nss/${file}
-  fi
+  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
 
 # Copy the include files we want
 for file in mozilla/dist/public/nss/*.h
 do
-  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
 # Copy the package configuration files
@@ -333,17 +318,28 @@ done
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
+/%{_lib}/libnssutil3.so
+/%{_lib}/libnssdbm3.so
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
+/%{_lib}/libsoftokn3.so
+/%{_lib}/libsoftokn3.chk
 /%{_lib}/libnssckbi.so
 /%{_lib}/libnsspem.so
+%{unsupported_tools_directory}/shlibsign
 %dir %{_libdir}/nss
 %dir %{unsupported_tools_directory}
 %dir %{_sysconfdir}/pki/nssdb
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
+%dir %{_sysconfdir}/prelink.conf.d
+%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
+%files softokn-freebl
+%defattr(-,root,root)
+/%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
 
 %files tools
 %defattr(-,root,root)
@@ -371,20 +367,27 @@ done
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
+%{_libdir}/libnssutil3.so
+%{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
 %{_libdir}/libnssckbi.so
 %{_libdir}/libnsspem.so
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
 
-
-# shared with nss-util and nss-softokn
 %dir %{_includedir}/nss3
+%{_includedir}/nss3/base64.h
+%{_includedir}/nss3/blapit.h
 %{_includedir}/nss3/cert.h
 %{_includedir}/nss3/certdb.h
 %{_includedir}/nss3/certt.h
+%{_includedir}/nss3/ciferfam.h
 %{_includedir}/nss3/cmmf.h
 %{_includedir}/nss3/cmmft.h
 %{_includedir}/nss3/cms.h
@@ -394,6 +397,8 @@ done
 %{_includedir}/nss3/crmft.h
 %{_includedir}/nss3/cryptohi.h
 %{_includedir}/nss3/cryptoht.h
+%{_includedir}/nss3/ecl-exp.h
+%{_includedir}/nss3/hasht.h
 %{_includedir}/nss3/jar-ds.h
 %{_includedir}/nss3/jar.h
 %{_includedir}/nss3/jarfile.h
@@ -402,8 +407,17 @@ done
 %{_includedir}/nss3/keyt.h
 %{_includedir}/nss3/keythi.h
 %{_includedir}/nss3/nss.h
+%{_includedir}/nss3/nssb64.h
+%{_includedir}/nss3/nssb64t.h
 %{_includedir}/nss3/nssckbi.h
+%{_includedir}/nss3/nssilckt.h
+%{_includedir}/nss3/nssilock.h
+%{_includedir}/nss3/nsslocks.h
+%{_includedir}/nss3/nsslowhash.h
 %{_includedir}/nss3/nsspem.h
+%{_includedir}/nss3/nssrwlk.h
+%{_includedir}/nss3/nssrwlkt.h
+%{_includedir}/nss3/nssutil.h
 %{_includedir}/nss3/ocsp.h
 %{_includedir}/nss3/ocspt.h
 %{_includedir}/nss3/p12.h
@@ -414,19 +428,42 @@ done
 %{_includedir}/nss3/pk11priv.h
 %{_includedir}/nss3/pk11pub.h
 %{_includedir}/nss3/pk11sdr.h
+%{_includedir}/nss3/pkcs11.h
+%{_includedir}/nss3/pkcs11f.h
+%{_includedir}/nss3/pkcs11n.h
+%{_includedir}/nss3/pkcs11p.h
+%{_includedir}/nss3/pkcs11t.h
+%{_includedir}/nss3/pkcs11u.h
 %{_includedir}/nss3/pkcs12.h
 %{_includedir}/nss3/pkcs12t.h
 %{_includedir}/nss3/pkcs7t.h
+%{_includedir}/nss3/portreg.h
 %{_includedir}/nss3/preenc.h
+%{_includedir}/nss3/secasn1.h
+%{_includedir}/nss3/secasn1t.h
+%{_includedir}/nss3/seccomon.h
+%{_includedir}/nss3/secder.h
+%{_includedir}/nss3/secdert.h
+%{_includedir}/nss3/secdig.h
+%{_includedir}/nss3/secdigt.h
+%{_includedir}/nss3/secerr.h
+%{_includedir}/nss3/sechash.h
+%{_includedir}/nss3/secitem.h
 %{_includedir}/nss3/secmime.h
 %{_includedir}/nss3/secmod.h
+%{_includedir}/nss3/secmodt.h
+%{_includedir}/nss3/secoid.h
+%{_includedir}/nss3/secoidt.h
 %{_includedir}/nss3/secpkcs5.h
 %{_includedir}/nss3/secpkcs7.h
+%{_includedir}/nss3/secport.h
+%{_includedir}/nss3/shsign.h
 %{_includedir}/nss3/smime.h
 %{_includedir}/nss3/ssl.h
 %{_includedir}/nss3/sslerr.h
 %{_includedir}/nss3/sslproto.h
 %{_includedir}/nss3/sslt.h
+%{_includedir}/nss3/utilrename.h
 
 
 %files pkcs11-devel
@@ -446,9 +483,6 @@ done
 
 
 %changelog
-* Tue Aug 19 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-8
-- Split off nss-softokn and nss-util as their own packages (508479)
-
 * Sat Aug 06 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-7.1
 - Fix spec file problems uncovered by Fedora_12_Mass_Rebuild
 


Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss.pc.in	20 Aug 2009 00:41:40 -0000	1.4
+++ nss.pc.in	20 Aug 2009 18:28:37 -0000	1.5
@@ -7,7 +7,5 @@ Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
 Requires: nspr >= %NSPR_VERSION%
-Requires: nss-util >= %NSSUTIL_VERSION%
-Requires: nss-softokn >= %SOFTOKEN_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
 Cflags: -I${includedir}



From diegobz at fedoraproject.org  Thu Aug 20 18:30:15 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:30:15 +0000 (UTC)
Subject: rpms/django-sorting/devel django-sorting.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820183015.DDFE911C0347@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-sorting/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23883/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-sorting.spec import.log 
Log Message:
Initial import


--- NEW FILE django-sorting.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-sorting
Version:        0.1
Release:        1%{?dist}
Summary:        A Django application for easy sorting

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-sorting allows for easy sorting, and sorting links generation 
without modifying your views.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt CONTRIBUTORS.txt
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.1-1
- Initial RPM release


--- NEW FILE import.log ---
django-sorting-0_1-1_fc11:HEAD:django-sorting-0.1-1.fc11.src.rpm:1250792981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:40:15 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:30:15 -0000	1.2
@@ -0,0 +1 @@
+django-sorting-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:40:15 -0000	1.1
+++ sources	20 Aug 2009 18:30:15 -0000	1.2
@@ -0,0 +1 @@
+6af1c5629362ee734e850e582efef740  django-sorting-0.1.tar.gz



From rdieter at fedoraproject.org  Thu Aug 20 18:30:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 20 Aug 2009 18:30:50 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.82,1.83
Message-ID: <20090820183050.6D2F211C006E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24010

Modified Files:
	kde-settings.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4.1
- Requires: system-backgrounds-kde



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- kde-settings.spec	18 Aug 2009 18:38:56 -0000	1.82
+++ kde-settings.spec	20 Aug 2009 18:30:50 -0000	1.83
@@ -1,14 +1,16 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
+%define rel 4
+
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: 4
+Release: %{rel}.1 
 
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{release}.tar.bz2
+Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -23,7 +25,8 @@ Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
 # for wallpaper
-Requires: constantine-backgrounds-kde 
+# FIXME/TODO: use a symlink (or something) to a known default location
+Requires: system-backgrounds-kde 
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -37,7 +40,7 @@ Obsoletes: kde-config < %{version}-%{rel
 Summary: Configuration files for kdm
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
-#Requires: constantine-kdm-theme
+#Requires: system-kdm-theme
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
@@ -62,7 +65,7 @@ Requires: alsa-plugins-pulseaudio
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{release}
+%setup -q -n %{name}-%{version}-%{rel}
 
 
 %build
@@ -150,6 +153,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4.1
+- Requires: system-backgrounds-kde
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4
 - KPackageKit: [CheckUpdate] interval=86400
 



From diegobz at fedoraproject.org  Thu Aug 20 18:35:00 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:35:00 +0000 (UTC)
Subject: rpms/django-sorting/F-10 django-sorting.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820183500.0364F11C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-sorting/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	django-sorting.spec import.log 
Log Message:
Initial import


--- NEW FILE django-sorting.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-sorting
Version:        0.1
Release:        1%{?dist}
Summary:        A Django application for easy sorting

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-sorting allows for easy sorting, and sorting links generation 
without modifying your views.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt CONTRIBUTORS.txt
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.1-1
- Initial RPM release


--- NEW FILE import.log ---
django-sorting-0_1-1_fc11:F-10:django-sorting-0.1-1.fc11.src.rpm:1250793345


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:40:15 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:34:59 -0000	1.2
@@ -0,0 +1 @@
+django-sorting-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:40:15 -0000	1.1
+++ sources	20 Aug 2009 18:34:59 -0000	1.2
@@ -0,0 +1 @@
+6af1c5629362ee734e850e582efef740  django-sorting-0.1.tar.gz



From diegobz at fedoraproject.org  Thu Aug 20 18:37:12 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:37:12 +0000 (UTC)
Subject: rpms/django-sorting/F-11 django-sorting.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820183712.7209711C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-sorting/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25733/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-sorting.spec import.log 
Log Message:
Initial import


--- NEW FILE django-sorting.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-sorting
Version:        0.1
Release:        1%{?dist}
Summary:        A Django application for easy sorting

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-sorting allows for easy sorting, and sorting links generation 
without modifying your views.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt CONTRIBUTORS.txt
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.1-1
- Initial RPM release


--- NEW FILE import.log ---
django-sorting-0_1-1_fc11:F-11:django-sorting-0.1-1.fc11.src.rpm:1250793542


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:40:15 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:37:12 -0000	1.2
@@ -0,0 +1 @@
+django-sorting-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:40:15 -0000	1.1
+++ sources	20 Aug 2009 18:37:12 -0000	1.2
@@ -0,0 +1 @@
+6af1c5629362ee734e850e582efef740  django-sorting-0.1.tar.gz



From diegobz at fedoraproject.org  Thu Aug 20 18:39:33 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Thu, 20 Aug 2009 18:39:33 +0000 (UTC)
Subject: rpms/django-sorting/EL-5 django-sorting.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820183933.4A1F111C006E@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/django-sorting/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26473/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-sorting.spec import.log 
Log Message:
Initial import


--- NEW FILE django-sorting.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-sorting
Version:        0.1
Release:        1%{?dist}
Summary:        A Django application for easy sorting

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/%{name}
Source:         http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel 
Requires:       Django

%description
Django-sorting allows for easy sorting, and sorting links generation 
without modifying your views.

%prep
%setup -q -n %{name}-%{version}

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt CONTRIBUTORS.txt
%{python_sitelib}/*

%changelog
* Thu Aug 20 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.1-1
- Initial RPM release


--- NEW FILE import.log ---
django-sorting-0_1-1_fc11:EL-5:django-sorting-0.1-1.fc11.src.rpm:1250793672


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:40:15 -0000	1.1
+++ .cvsignore	20 Aug 2009 18:39:32 -0000	1.2
@@ -0,0 +1 @@
+django-sorting-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-sorting/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:40:15 -0000	1.1
+++ sources	20 Aug 2009 18:39:33 -0000	1.2
@@ -0,0 +1 @@
+6af1c5629362ee734e850e582efef740  django-sorting-0.1.tar.gz



From mclasen at fedoraproject.org  Thu Aug 20 18:45:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 20 Aug 2009 18:45:20 +0000 (UTC)
Subject: rpms/control-center/devel rotate.patch, NONE,
	1.1 control-center.spec, 1.474, 1.475
Message-ID: <20090820184520.A3B1411C006E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28035

Modified Files:
	control-center.spec 
Added Files:
	rotate.patch 
Log Message:
fix dragging of rotated monitors in the display capplet


rotate.patch:
 xrandr-capplet.c |   31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

--- NEW FILE rotate.patch ---
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 3f4add2..f21857c 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -896,6 +896,13 @@ get_geometry (GnomeOutputInfo *output, int *w, int *h)
 	*h = output->pref_height;
 	*w = output->pref_width;
     }
+   if ((output->rotation & GNOME_RR_ROTATION_90) || (output->rotation & GNOME_RR_ROTATION_270))
+   {
+        int tmp;
+        tmp = *h;
+        *h = *w;
+        *w = tmp;
+   }
 }
 
 #define SPACE 15
@@ -1502,7 +1509,6 @@ paint_output (App *app, cairo_t *cr, int i)
     PangoLayout *layout = get_display_name (app, output);
     PangoRectangle ink_extent, log_extent;
     GdkRectangle viewport;
-    double angle;
     GdkColor output_color;
     double r, g, b;
     double available_w;
@@ -1539,28 +1545,7 @@ paint_output (App *app, cairo_t *cr, int i)
 		     x + (w * scale + 0.5) / 2,
 		     y + (h * scale + 0.5) / 2);
 
-    if (output->rotation & GNOME_RR_ROTATION_0)
-    {
-	angle = 0;
-    }
-    else if (output->rotation & GNOME_RR_ROTATION_90)
-    {
-	angle = 1.5 * G_PI;
-    }
-    else if (output->rotation & GNOME_RR_ROTATION_180)
-    {
-	angle = G_PI;
-    }
-    else if (output->rotation & GNOME_RR_ROTATION_270)
-    {
-	angle = G_PI / 2;
-    }
-    else
-    {
-	angle = 0;
-    }
-
-    cairo_rotate (cr, angle);
+    /* rotation is already applied in get_geometry */
 
     if (output->rotation & GNOME_RR_REFLECT_X)
 	cairo_scale (cr, -1, 1);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -p -r1.474 -r1.475
--- control-center.spec	19 Aug 2009 18:55:36 -0000	1.474
+++ control-center.spec	20 Aug 2009 18:45:20 -0000	1.475
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -62,6 +62,9 @@ Patch50: slideshow-ui.patch
 # from upstream
 Patch55: unique-ids.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=578109
+Patch56: rotate.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
@@ -186,6 +189,7 @@ utilities.
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .slideshow-ui
 %patch55 -p1 -b .unique-ids
+%patch56 -p1 -b .rotate
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -365,6 +369,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Aug 20 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-3
+- Fix dragging of rotated monitors in the display capplet
+
 * Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
 - Make the appearance capplet work again
 



From cdamian at fedoraproject.org  Thu Aug 20 18:45:27 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu, 20 Aug 2009 18:45:27 +0000 (UTC)
Subject: rpms/php-channel-doctrine/devel channel.xml, NONE, 1.1 import.log, 
	NONE, 1.1 php-channel-doctrine.spec, NONE, 1.1
Message-ID: <20090820184527.C03D911C006E@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-channel-doctrine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27867/devel

Added Files:
	channel.xml import.log php-channel-doctrine.spec 
Log Message:
* Thu Aug 20 2009 Christof Damian <christof at damian.net> - 1.0.0-2
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdoctrine.org</name>
 <summary>Channel for installing and upgrading Doctrine through pear.</summary>
 <suggestedalias>pear.phpdoctrine.org</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdoctrine.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdoctrine.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>

--- NEW FILE import.log ---
php-channel-doctrine-1_0_0-2_fc11:HEAD:php-channel-doctrine-1.0.0-2.fc11.src.rpm:1250793814


--- NEW FILE php-channel-doctrine.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-doctrine
Version:	1.0.0
Release:	2%{?dist}
Summary:	Adds doctrine project channel to PEAR

Group:		Development/Languages
License:	LGPLv2+
URL:		http://www.doctrine-project.com/
Source0:	http://pear.doctrine-project.com/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.doctrine-project.com)

%description
This package adds the doctrine channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.doctrine-project.com.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.doctrine-project.com.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.doctrine-project.com.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.doctrine-project.com > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Thu Aug 20 2009 Christof Damian <christof at damian.net> - 1.0.0-2
- changed license to LGPLv2+

* Sat Aug 15 2009 Christof Damian <christof at damian.net> - 1.0.0-1
- initial release



From cdamian at fedoraproject.org  Thu Aug 20 18:49:00 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Thu, 20 Aug 2009 18:49:00 +0000 (UTC)
Subject: rpms/php-channel-doctrine/F-11 channel.xml, NONE, 1.1 import.log,
	NONE, 1.1 php-channel-doctrine.spec, NONE, 1.1
Message-ID: <20090820184900.551E411C006E@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-channel-doctrine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29247/F-11

Added Files:
	channel.xml import.log php-channel-doctrine.spec 
Log Message:
* Thu Aug 20 2009 Christof Damian <christof at damian.net> - 1.0.0-2
initial import



--- NEW FILE channel.xml ---
<?xml version="1.0" encoding="ISO-8859-1" ?>
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
 <name>pear.phpdoctrine.org</name>
 <summary>Channel for installing and upgrading Doctrine through pear.</summary>
 <suggestedalias>pear.phpdoctrine.org</suggestedalias>
 <servers>
  <primary>
   <rest>
    <baseurl type="REST1.0">http://pear.phpdoctrine.org/Chiara_PEAR_Server_REST/</baseurl>
    <baseurl type="REST1.1">http://pear.phpdoctrine.org/Chiara_PEAR_Server_REST/</baseurl>
   </rest>
  </primary>
 </servers>
</channel>

--- NEW FILE import.log ---
php-channel-doctrine-1_0_0-2_fc11:F-11:php-channel-doctrine-1.0.0-2.fc11.src.rpm:1250793978


--- NEW FILE php-channel-doctrine.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}

Name:		php-channel-doctrine
Version:	1.0.0
Release:	2%{?dist}
Summary:	Adds doctrine project channel to PEAR

Group:		Development/Languages
License:	LGPLv2+
URL:		http://www.doctrine-project.com/
Source0:	http://pear.doctrine-project.com/channel.xml
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:	noarch
BuildRequires:	php-pear >= 1:1.4.9-1.2
Requires:	php-cli
Requires:	php-pear(PEAR)

Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:	php-channel(pear.doctrine-project.com)

%description
This package adds the doctrine channel which allows
PEAR packages from this channel to be installed.


%prep
%setup -q -c -T


%build
# Empty build section, nothing to build


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.doctrine-project.com.xml


%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq  1 ] ; then
	%{__pear} channel-add %{pear_xmldir}/pear.doctrine-project.com.xml > /dev/null || :
else
	%{__pear} channel-update %{pear_xmldir}/pear.doctrine-project.com.xml > /dev/null ||:
fi


%postun
if [ $1 -eq 0 ] ; then
	%{__pear} channel-delete pear.doctrine-project.com > /dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/*


%changelog
* Thu Aug 20 2009 Christof Damian <christof at damian.net> - 1.0.0-2
- changed license to LGPLv2+

* Sat Aug 15 2009 Christof Damian <christof at damian.net> - 1.0.0-1
- initial release



From myoung at fedoraproject.org  Thu Aug 20 18:50:24 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 20 Aug 2009 18:50:24 +0000 (UTC)
Subject: rpms/kernel/devel/scripts sort-config,NONE,1.4.2.2
Message-ID: <20090820185024.57B5011C0417@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29621/scripts

Added Files:
      Tag: private-myoung-dom0-branch
	sort-config 
Log Message:
another pvops i686 stackprotector test



--- NEW FILE sort-config ---
#!/bin/bash

SRC=($(ls config-* 2>/dev/null))
TGT=($(ls kernel-*/linux-*.noarch/configs/kernel-2.6.*-*.config \
          kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})

if [ $# -lt 2 ] ; then
   echo -e "Usage:\n   $(basename $0) [-dfcn] input target\n"
   echo -e " Sort input config file into the same order as the target\n"
   echo -e "      -d: show raw unsorted output with extra debug text"
   echo -e "      -f: force output to match what is in the target config"
   echo -e "      -c: insert comments about non-matching items"
   echo -e "      -n: do not sort output\n"
   echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
   echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
   exit 1
fi

while getopts "dfcn" OPTION ; do
case $OPTION in
d)
   DEBUG=1
;;
f)
   FORCE=1
;;
c)
   ADDCOMMENT=1
;;
n)
   NOSORT=1
;;
\?)
   exit 2
;;
esac
done

if [ "$FORCE" -a "$ADDCOMMENT" ] ; then
	echo "-f and -c options cannot be used together"
	exit 2
fi

shift $((OPTIND-1))

if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
   echo "WARNING! Output files named xx?? already exist." >&2
   read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
   echo >&2
fi
rm -f xx00 xx01 xx99

SRCFILE=config-$1
[ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2

TGTFILE=kernel-*/linux-*.noarch/configs/kernel-2.6.*-$2.config
[ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2

IX=0
IN=0
declare -a SAVECOMMENT

cat ${SRCFILE} | while read TEXT ; do

   LINE=
   COMMENT=
   [ -z "$TEXT" ] && TEXT='#'

   if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then

      LINE=$(grep -n "^$TEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
      if [ -z "$LINE" ] ; then
         [ "$DEBUG" ] && echo "nofind      ->" "$TEXT"

         # see if option changed in output file
         OPTNAME=
         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
            OPTNAME=${TEXT%%=*}
         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
            OPTNAME=${TEXT%" is not set"}
            OPTNAME=${OPTNAME#\# }
         fi
         if [ "$OPTNAME" ] ; then
            for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
               if [ -z "$LINE" ] ; then
                  [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
                  LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
                  if [ "$LINE" ] ; then
                     CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
                     if [ "$FORCE" ] ; then
                        TEXT="$CHANGED"
                        [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
                     else
                        if [ "$ADDCOMMENT" ] ; then
                           if [ ${CHANGED:0:1} = '#' ] ; then
                              NEWOPT="not set"
                           else
                              NEWOPT=${CHANGED#$OPTNAME}
                           fi
                           COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                        fi
                     fi
                  fi
               fi
            done
         fi

      fi

   else
      COMMENT="$TEXT"
      TEXT=
   fi

   [ "$DEBUG" -a "$COMMENT" ] && echo "comment     ->" "$LINE" "$COMMENT"
   [ "$DEBUG" -a "$TEXT" ]    && echo "text        ->" "$LINE" "$TEXT"

   if [ "$TEXT" ] ; then

      # use input line numbers if not sorting
      [ "$NOSORT" ] && LINE=$IN
      # make sure it has a line number
      [ -z "$LINE" ] && LINE=999999

      # print saved comments first
      if [ $IX -gt 0 ] ; then
         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
         (( IX-- ))
         for IX in $(seq 0 $IX) ; do
            echo "$LINE":"${SAVECOMMENT[$IX]}"
         done
         unset SAVECOMMENT
         IX=0
      fi
      [ "$COMMENT" ] && echo "$LINE":"$COMMENT"
      echo "$LINE":"$TEXT"

   else

      # no output yet, save the comment
      SAVECOMMENT[$IX]="$COMMENT"
      [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
      (( IX++ ))

   fi

   ((IN++))

done > xx99

if [ "$DEBUG" ] ; then
   cat xx99
else

   cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null

   cat xx00 | cut -f 2- -d ':'
   if [ -s xx01 ] ; then
      echo
      echo '# ------------  UNMATCHED OPTIONS  ------------'
      echo
      cat xx01 | cut -f 2- -d ':'
   fi

fi

rm -f xx00 xx01 xx99



From myoung at fedoraproject.org  Thu Aug 20 18:50:32 2009
From: myoung at fedoraproject.org (myoung)
Date: Thu, 20 Aug 2009 18:50:32 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc6-git6.bz2.sign, NONE,
	1.1.2.2 .cvsignore, 1.1014.2.25, 1.1014.2.26 drm-r600-kms.patch,
	1.1.2.3, 1.1.2.4 kernel.spec, 1.1294.2.54, 1.1294.2.55 sources,
	1.976.2.26, 1.976.2.27 upstream, 1.888.2.25,
	1.888.2.26 xen.pvops.patch, 1.1.2.35,
	1.1.2.36 xen.pvops.post.patch, 1.1.2.21,
	1.1.2.22 fix-perf-make-man-failure.patch, 1.1.2.2,
	NONE patch-2.6.31-rc6-git5.bz2.sign, 1.1.2.2, NONE
Message-ID: <20090820185032.1E7F811C0417@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29621

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore drm-r600-kms.patch kernel.spec sources upstream 
	xen.pvops.patch xen.pvops.post.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc6-git6.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	fix-perf-make-man-failure.patch patch-2.6.31-rc6-git5.bz2.sign 
Log Message:
another pvops i686 stackprotector test



--- NEW FILE patch-2.6.31-rc6-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKjOD+yGugalF9Dw4RAuluAJ0apmkqCm9MDipwL6ORh60fDrAU0wCfWd71
WxhBmKqP35ul/Oi1jVkkmfI=
=TDlk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.25
retrieving revision 1.1014.2.26
diff -u -p -r1.1014.2.25 -r1.1014.2.26
--- .cvsignore	19 Aug 2009 20:22:46 -0000	1.1014.2.25
+++ .cvsignore	20 Aug 2009 18:50:20 -0000	1.1014.2.26
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git5.bz2
+patch-2.6.31-rc6-git6.bz2

drm-r600-kms.patch:
 b/drivers/gpu/drm/radeon/Makefile        |    3 
 b/drivers/gpu/drm/radeon/atombios_crtc.c |    1 
 b/drivers/gpu/drm/radeon/avivod.h        |   60 +
 b/drivers/gpu/drm/radeon/r100.c          |   69 +
 b/drivers/gpu/drm/radeon/r300.c          |    2 
 b/drivers/gpu/drm/radeon/r600.c          | 1243 +++++++++++++++++++++++++++++--
 b/drivers/gpu/drm/radeon/r600d.h         |  349 ++++++++
 b/drivers/gpu/drm/radeon/radeon.h        |   51 +
 b/drivers/gpu/drm/radeon/radeon_asic.h   |  139 +++
 b/drivers/gpu/drm/radeon/radeon_clocks.c |   10 
 b/drivers/gpu/drm/radeon/radeon_device.c |  340 ++++----
 b/drivers/gpu/drm/radeon/radeon_ring.c   |   63 -
 b/drivers/gpu/drm/radeon/radeon_share.h  |   66 +
 b/drivers/gpu/drm/radeon/radeon_ttm.c    |    6 
 b/drivers/gpu/drm/radeon/rs400.c         |    2 
 b/drivers/gpu/drm/radeon/rv770.c         |  981 +++++++++++++++++++++++-
 b/drivers/gpu/drm/radeon/rv770d.h        |  341 ++++++++
 drivers/gpu/drm/radeon/r300.h            |   36 
 drivers/gpu/drm/radeon/rs780.c           |  102 --
 19 files changed, 3366 insertions(+), 498 deletions(-)

Index: drm-r600-kms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-r600-kms.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
--- drm-r600-kms.patch	8 Aug 2009 18:06:03 -0000	1.1.2.3
+++ drm-r600-kms.patch	20 Aug 2009 18:50:20 -0000	1.1.2.4
@@ -2062,19 +2062,19 @@ index b1d945b..0c5c63a 100644
 @@ -712,6 +739,7 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
  #define RREG8(reg) readb(((void __iomem *)rdev->rmmio) + (reg))
  #define WREG8(reg, v) writeb(v, ((void __iomem *)rdev->rmmio) + (reg))
- #define RREG32(reg) rdev->mm_rreg(rdev, (reg))
-+#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", rdev->mm_rreg(rdev, (reg)))
- #define WREG32(reg, v) rdev->mm_wreg(rdev, (reg), (v))
+ #define RREG32(reg) r100_mm_rreg(rdev, (reg))
++#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg)))
+ #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v))
  #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
  #define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
 @@ -735,6 +763,7 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
  		tmp_ |= ((val) & ~(mask));			\
  		WREG32_PLL(reg, tmp_);				\
  	} while (0)
-+#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", (rdev)->mm_rreg((rdev), (reg)))
- 
- void r100_pll_errata_after_index(struct radeon_device *rdev);
++#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n", r100_mm_rreg((rdev), (reg)))
  
+ /*
+  * Indirect registers accessor
 @@ -844,6 +873,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
   * ASICs macro.
   */
@@ -2170,8 +2170,8 @@ index 9a75876..7e9bb12 100644
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
  	.irq_set = &rs600_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -331,7 +349,10 @@ static struct radeon_asic rs690_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2181,8 +2181,8 @@ index 9a75876..7e9bb12 100644
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
  	.irq_set = &rs600_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -380,7 +401,10 @@ static struct radeon_asic rv515_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2191,9 +2191,9 @@ index 9a75876..7e9bb12 100644
  	.ring_start = &rv515_ring_start,
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
- 	.irq_set = &r100_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_set = &rs600_irq_set,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -422,7 +446,10 @@ static struct radeon_asic r520_asic = {
  	.cp_init = &r100_cp_init,
  	.cp_fini = &r100_cp_fini,
@@ -2202,9 +2202,9 @@ index 9a75876..7e9bb12 100644
  	.ring_start = &rv515_ring_start,
 +	.ring_ib_execute = &r100_ring_ib_execute,
 +	.ib_test = &r100_ib_test,
- 	.irq_set = &r100_irq_set,
- 	.irq_process = &r100_irq_process,
- 	.fence_ring_emit = &r300_fence_ring_emit,
+ 	.irq_set = &rs600_irq_set,
+ 	.irq_process = &rs600_irq_process,
+ 	.get_vblank_counter = &rs600_get_vblank_counter,
 @@ -440,9 +467,119 @@ static struct radeon_asic r520_asic = {
  };
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.54
retrieving revision 1.1294.2.55
diff -u -p -r1.1294.2.54 -r1.1294.2.55
--- kernel.spec	19 Aug 2009 20:22:46 -0000	1.1294.2.54
+++ kernel.spec	20 Aug 2009 18:50:20 -0000	1.1294.2.55
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -721,9 +721,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
-# perf userspace tool patches
-Patch13000: fix-perf-make-man-failure.patch
-
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
 Patch19999: xen.pvops.post.patch
@@ -1336,8 +1333,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
-ApplyPatch fix-perf-make-man-failure.patch
-
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
 ApplyPatch xen.pvops.post.patch
@@ -1654,6 +1649,7 @@ 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
@@ -2006,6 +2002,17 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 20 2009 Michael Young <m.a.young at durham.ac.uk>
+- test a i686 stackprotector patch
+
+* Thu Aug 20 2009 Mark McLoughlin <markmc at redhat.com>
+- Disable LZMA for xen (#515831)
+
+* Thu Aug 20 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc6-git5
+- Fix up drm-r600-kms.patch
+- Drop fix-perf-make-man-failure.patch
+
 * Wed Aug 19 2009 Michael Young <m.a.young at durham.ac.uk>
 - update rebase/master to test i686 stackprotector issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.26
retrieving revision 1.976.2.27
diff -u -p -r1.976.2.26 -r1.976.2.27
--- sources	19 Aug 2009 20:22:46 -0000	1.976.2.26
+++ sources	20 Aug 2009 18:50:21 -0000	1.976.2.27
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-6128f58fd777f9b64ea5c2fa13049021  patch-2.6.31-rc6-git5.bz2
+bf8a969c68cb72946782195934e6f183  patch-2.6.31-rc6-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.25
retrieving revision 1.888.2.26
diff -u -p -r1.888.2.25 -r1.888.2.26
--- upstream	19 Aug 2009 20:22:46 -0000	1.888.2.25
+++ upstream	20 Aug 2009 18:50:21 -0000	1.888.2.26
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git5.bz2
+patch-2.6.31-rc6-git6.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 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             |   33 
 arch/x86/kernel/Makefile                   |    1 
 arch/x86/kernel/acpi/boot.c                |   18 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   46 
 arch/x86/kernel/cpu/Makefile               |    4 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    8 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |   96 +
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |  110 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 drivers/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   36 
 drivers/xen/Makefile                       |   19 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/balloon.c                      |  152 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  411 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 ++++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 drivers/xen/pci.c                          |  116 ++
 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/asm-generic/pci.h                  |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   23 
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  222 ++++
 include/xen/interface/xen-mca.h            |  429 ++++++++
 include/xen/interface/xen.h                |   43 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 131 files changed, 10737 insertions(+), 1314 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -p -r1.1.2.35 -r1.1.2.36
--- xen.pvops.patch	19 Aug 2009 20:22:46 -0000	1.1.2.35
+++ xen.pvops.patch	20 Aug 2009 18:50:21 -0000	1.1.2.36
@@ -1986,20 +1986,40 @@ index 018a0a4..f334014 100644
  unsigned long arbitrary_virt_to_mfn(void *vaddr);
 diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
 new file mode 100644
-index 0000000..0563fc6
+index 0000000..714443b
 --- /dev/null
 +++ b/arch/x86/include/asm/xen/pci.h
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,33 @@
 +#ifndef _ASM_X86_XEN_PCI_H
 +#define _ASM_X86_XEN_PCI_H
 +
 +#ifdef CONFIG_XEN_DOM0_PCI
 +int xen_register_gsi(u32 gsi, int triggering, int polarity);
++int xen_create_msi_irq(struct pci_dev *dev,
++			struct msi_desc *msidesc,
++			int type);
++int xen_destroy_irq(int irq);
++int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
 +#else
 +static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
 +{
 +	return -1;
 +}
++
++static int xen_create_msi_irq(struct pci_dev *dev,
++				struct msi_desc *msidesc,
++				int type)
++{
++	return -1;
++}
++static int xen_destroy_irq(int irq)
++{
++	return -1;
++}
++static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
++{
++	return -1;
++}
 +#endif
 +
 +#endif	/* _ASM_X86_XEN_PCI_H */
@@ -2081,21 +2101,22 @@ index ca93638..9eff23c 100644
  #include "sleep.h"
  
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index d2ed6c5..205e277 100644
+index d2ed6c5..18d957e 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
-@@ -63,8 +63,10 @@
+@@ -63,8 +63,11 @@
  #include <asm/uv/uv_hub.h>
  #include <asm/uv/uv_irq.h>
  
 +#include <asm/xen/hypervisor.h>
  #include <asm/apic.h>
  
++#include <asm/xen/pci.h>
 +
  #define __apicdebuginit(type) static type __init
  
  /*
-@@ -381,14 +383,26 @@ static inline void io_apic_eoi(unsigned int apic, unsigned int vector)
+@@ -381,14 +384,26 @@ static inline void io_apic_eoi(unsigned int apic, unsigned int vector)
  
  static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)
  {
@@ -2124,7 +2145,7 @@ index d2ed6c5..205e277 100644
  	writel(reg, &io_apic->index);
  	writel(value, &io_apic->data);
  }
-@@ -401,7 +415,14 @@ static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned i
+@@ -401,7 +416,14 @@ static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned i
   */
  static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
  {
@@ -2140,7 +2161,29 @@ index d2ed6c5..205e277 100644
  
  	if (sis_apic_bug)
  		writel(reg, &io_apic->index);
-@@ -3854,6 +3875,11 @@ void __init probe_nr_irqs_gsi(void)
+@@ -3489,6 +3511,9 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+ 	if (type == PCI_CAP_ID_MSI && nvec > 1)
+ 		return 1;
+ 
++	if (xen_domain())
++		return xen_setup_msi_irqs(dev, nvec, type);
++
+ 	node = dev_to_node(&dev->dev);
+ 	irq_want = nr_irqs_gsi;
+ 	sub_handle = 0;
+@@ -3538,7 +3563,10 @@ error:
+ 
+ void arch_teardown_msi_irq(unsigned int irq)
+ {
+-	destroy_irq(irq);
++	if (xen_domain())
++		xen_destroy_irq(irq);
++	else
++		destroy_irq(irq);
+ }
+ 
+ #if defined (CONFIG_DMAR) || defined (CONFIG_INTR_REMAP)
+@@ -3854,6 +3882,11 @@ void __init probe_nr_irqs_gsi(void)
  	printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
  }
  
@@ -2152,7 +2195,7 @@ index d2ed6c5..205e277 100644
  #ifdef CONFIG_SPARSE_IRQ
  int __init arch_probe_nr_irqs(void)
  {
-@@ -4147,6 +4173,11 @@ void __init ioapic_init_mappings(void)
+@@ -4147,6 +4180,11 @@ void __init ioapic_init_mappings(void)
  	struct resource *ioapic_res;
  	int i;
  
@@ -3539,14 +3582,13 @@ index 172438f..8c2c266 100644
 \ No newline at end of file
 diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
 new file mode 100644
-index 0000000..496f07d
+index 0000000..ee0db39
 --- /dev/null
 +++ b/arch/x86/xen/apic.c
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,57 @@
 +#include <linux/kernel.h>
 +#include <linux/threads.h>
 +#include <linux/bitmap.h>
-+#include <linux/pci.h>
 +
 +#include <asm/io_apic.h>
 +#include <asm/acpi.h>
@@ -3593,8 +3635,6 @@ index 0000000..496f07d
 +	if (!xen_initial_domain())
 +		return;
 +
-+	pci_no_msi();
-+
 +#ifdef CONFIG_ACPI
 +	/*
 +	 * Pretend ACPI found our lapic even though we've disabled it,
@@ -4492,19 +4532,21 @@ index 0000000..3b96c87
 +}
 diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
 new file mode 100644
-index 0000000..07b59fe
+index 0000000..c0ef627
 --- /dev/null
 +++ b/arch/x86/xen/pci.c
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,110 @@
 +#include <linux/kernel.h>
 +#include <linux/acpi.h>
 +#include <linux/pci.h>
++#include <linux/msi.h>
 +
 +#include <asm/mpspec.h>
 +#include <asm/io_apic.h>
 +#include <asm/pci_x86.h>
 +
 +#include <asm/xen/hypervisor.h>
++#include <asm/xen/pci.h>
 +
 +#include <xen/interface/xen.h>
 +#include <xen/events.h>
@@ -4582,6 +4624,28 @@ index 0000000..07b59fe
 +			polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH);
 +	}
 +}
++
++int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
++{
++	unsigned int irq;
++	int ret;
++	struct msi_desc *msidesc;
++
++	list_for_each_entry(msidesc, &dev->msi_list, list) {
++		irq = xen_create_msi_irq(dev, msidesc, type);
++		if (irq == 0)
++			return -1;
++
++		ret = set_irq_msi(irq, msidesc);
++		if (ret)
++			goto error;
++	}
++	return 0;
++
++error:
++	xen_destroy_irq(irq);
++	return ret;
++}
 diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
 index ad0047f..2439456 100644
 --- a/arch/x86/xen/setup.c
@@ -5176,21 +5240,6 @@ index 1ebd6b4..3590082 100644
  obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o
  
  obj-$(CONFIG_PCI_IOV) += iov.o
-diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index f73bcbe..d7fde80 100644
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
-@@ -111,10 +111,8 @@ extern struct rw_semaphore pci_bus_sem;
- extern unsigned int pci_pm_d3_delay;
- 
- #ifdef CONFIG_PCI_MSI
--void pci_no_msi(void);
- extern void pci_msi_init_pci_dev(struct pci_dev *dev);
- #else
--static inline void pci_no_msi(void) { }
- static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
- #endif
- 
 diff --git a/drivers/pci/xen-iommu.c b/drivers/pci/xen-iommu.c
 new file mode 100644
 index 0000000..b1a7d93
@@ -5582,7 +5631,7 @@ index cab100a..84c3553 100644
 +       def_bool y
 +       depends on XEN_DOM0 && X86_64 && X86_MCE_INTEL
 diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
-index ec2a39b..2d4f7b1 100644
+index ec2a39b..0e2b9df 100644
 --- a/drivers/xen/Makefile
 +++ b/drivers/xen/Makefile
 @@ -1,9 +1,14 @@
@@ -5608,6 +5657,7 @@ index ec2a39b..2d4f7b1 100644
 +obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 +obj-$(CONFIG_XEN_S3)			+= acpi.o
 +obj-$(CONFIG_XEN_MCE)			+= mce.o
+\ No newline at end of file
 diff --git a/drivers/xen/acpi.c b/drivers/xen/acpi.c
 new file mode 100644
 index 0000000..e6d3d0e
@@ -7617,7 +7667,7 @@ index 0000000..650f4b3
 +	(void)xenbus_register_backend(&blkback);
 +}
 diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index abad71b..8bcbf6b 100644
+index abad71b..e2127bd 100644
 --- a/drivers/xen/events.c
 +++ b/drivers/xen/events.c
 @@ -16,7 +16,7 @@
@@ -7629,11 +7679,14 @@ index abad71b..8bcbf6b 100644
   *
   * Jeremy Fitzhardinge <jeremy at xensource.com>, XenSource Inc, 2007
   */
-@@ -27,10 +27,12 @@
+@@ -27,10 +27,15 @@
  #include <linux/module.h>
  #include <linux/string.h>
  #include <linux/bootmem.h>
 +#include <linux/irqnr.h>
++#include <linux/pci_regs.h>
++#include <linux/pci.h>
++#include <linux/msi.h>
  
  #include <asm/ptrace.h>
  #include <asm/irq.h>
@@ -7642,7 +7695,16 @@ index abad71b..8bcbf6b 100644
  #include <asm/sync_bitops.h>
  #include <asm/xen/hypercall.h>
  #include <asm/xen/hypervisor.h>
-@@ -83,20 +85,25 @@ struct irq_info
+@@ -40,6 +45,8 @@
+ #include <xen/interface/xen.h>
+ #include <xen/interface/event_channel.h>
+ 
++#include "../pci/msi.h"
++
+ /*
+  * This lock protects updates to the following mapping and reference-count
+  * arrays. The lock does not need to be acquired to read the mapping tables.
+@@ -83,20 +90,25 @@ struct irq_info
  		enum ipi_vector ipi;
  		struct {
  			unsigned short gsi;
@@ -7674,7 +7736,7 @@ index abad71b..8bcbf6b 100644
  static inline unsigned long *cpu_evtchn_mask(int cpu)
  {
  	return cpu_evtchn_mask_p[cpu].bits;
-@@ -106,6 +113,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
+@@ -106,6 +118,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
  #define VALID_EVTCHN(chn)	((chn) != 0)
  
  static struct irq_chip xen_dynamic_chip;
@@ -7682,7 +7744,7 @@ index abad71b..8bcbf6b 100644
  
  /* Constructor for packed IRQ information. */
  static struct irq_info mk_unbound_info(void)
-@@ -218,6 +226,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
+@@ -218,6 +231,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
  	return ret;
  }
  
@@ -7698,7 +7760,7 @@ index abad71b..8bcbf6b 100644
  static inline unsigned long active_evtchns(unsigned int cpu,
  					   struct shared_info *sh,
  					   unsigned int idx)
-@@ -329,12 +346,24 @@ static void unmask_evtchn(int port)
+@@ -329,12 +351,24 @@ static void unmask_evtchn(int port)
  	put_cpu();
  }
  
@@ -7724,7 +7786,7 @@ index abad71b..8bcbf6b 100644
  		if (irq_info[irq].type == IRQT_UNBOUND)
  			break;
  
-@@ -350,6 +379,213 @@ static int find_unbound_irq(void)
+@@ -350,6 +384,297 @@ static int find_unbound_irq(void)
  	return irq;
  }
  
@@ -7914,14 +7976,98 @@ index abad71b..8bcbf6b 100644
 +	if (HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &irq_op)) {
 +		dynamic_irq_cleanup(irq);
 +		irq = -ENOSPC;
++ 		goto out;
++ 	}
++
++	irq_info[irq] = mk_pirq_info(0, gsi, irq_op.vector);
++out:
++	spin_unlock(&irq_mapping_update_lock);
++	return irq;
++}
++
++int xen_destroy_irq(int irq)
++{
++	struct irq_desc *desc;
++	struct physdev_unmap_pirq unmap_irq;
++	int rc = -ENOENT;
++
++	spin_lock(&irq_mapping_update_lock);
++
++	desc = irq_to_desc(irq);
++	if (!desc)
++		goto out;
++
++	unmap_irq.pirq = irq;
++	unmap_irq.domid = DOMID_SELF;
++	rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq);
++	if (rc) {
++		printk(KERN_WARNING "unmap irq failed %x\n", rc);
 +		goto out;
 +	}
 +
-+	irq_info[irq] = mk_pirq_info(0, gsi, irq_op.vector);
++	irq_info[irq] = mk_unbound_info();
++
++	dynamic_irq_cleanup(irq);
 +
 +out:
 +	spin_unlock(&irq_mapping_update_lock);
++	return rc;
++}
++
++int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type)
++{
++	int irq = 0;
++	struct physdev_map_pirq map_irq;
++	int rc;
++	domid_t domid = DOMID_SELF;
++	int pos;
++	u32 table_offset, bir;
++
++	memset(&map_irq, 0, sizeof(map_irq));
++	map_irq.domid = domid;
++	map_irq.type = MAP_PIRQ_TYPE_MSI;
++	map_irq.index = -1;
++	map_irq.bus = dev->bus->number;
++	map_irq.devfn = dev->devfn;
++
++	if (type == PCI_CAP_ID_MSIX) {
++		pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++
++		pci_read_config_dword(dev, msix_table_offset_reg(pos),
++					&table_offset);
++		bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
++
++		map_irq.table_base = pci_resource_start(dev, bir);
++		map_irq.entry_nr = msidesc->msi_attrib.entry_nr;
++	}
++
++	spin_lock(&irq_mapping_update_lock);
++
++	irq = find_unbound_irq();
++
++	if (irq == -1)
++		goto out;
++
++	map_irq.pirq = irq;
++
++	rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
++	if (rc) {
++
++		printk(KERN_WARNING "xen map irq failed %x\n", rc);
 +
++		dynamic_irq_cleanup(irq);
++
++		irq = -1;
++		goto out;
++	}
++
++	irq_info[irq] = mk_pirq_info(0, -1, map_irq.index);
++	set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
++			handle_level_irq,
++			(type == PCI_CAP_ID_MSIX) ? "msi-x":"msi");
++
++out:
++	spin_unlock(&irq_mapping_update_lock);
 +	return irq;
 +}
 +
@@ -7938,7 +8084,7 @@ index abad71b..8bcbf6b 100644
  int bind_evtchn_to_irq(unsigned int evtchn)
  {
  	int irq;
-@@ -409,8 +645,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+@@ -409,8 +734,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
  	return irq;
  }
  
@@ -7947,7 +8093,8 @@ index abad71b..8bcbf6b 100644
 +{
 +        struct evtchn_bind_interdomain bind_interdomain;
 +        int err;
-+
+ 
+-static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
 +        bind_interdomain.remote_dom  = remote_domain;
 +        bind_interdomain.remote_port = remote_port;
 +
@@ -7956,14 +8103,13 @@ index abad71b..8bcbf6b 100644
 +
 +        return err ? : bind_evtchn_to_irq(bind_interdomain.local_port);
 +}
- 
--static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
++
 +
 +int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
  {
  	struct evtchn_bind_virq bind_virq;
  	int evtchn, irq;
-@@ -501,6 +752,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
+@@ -501,6 +841,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
  }
  EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
  
@@ -7993,7 +8139,7 @@ index abad71b..8bcbf6b 100644
  int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
  			    irq_handler_t handler,
  			    unsigned long irqflags, const char *devname, void *dev_id)
-@@ -532,6 +806,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
+@@ -532,6 +895,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
  	if (irq < 0)
  		return irq;
  
@@ -8001,7 +8147,7 @@ index abad71b..8bcbf6b 100644
  	retval = request_irq(irq, handler, irqflags, devname, dev_id);
  	if (retval != 0) {
  		unbind_from_irq(irq);
-@@ -924,13 +1199,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
+@@ -924,13 +1288,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
  	.retrigger	= retrigger_dynirq,
  };
  
@@ -8041,7 +8187,7 @@ index abad71b..8bcbf6b 100644
  
  	init_evtchn_cpu_bindings();
  
-@@ -939,4 +1239,6 @@ void __init xen_init_IRQ(void)
+@@ -939,4 +1328,6 @@ void __init xen_init_IRQ(void)
  		mask_evtchn(i);
  
  	irq_ctx_init(smp_processor_id());
@@ -11030,7 +11176,7 @@ index 0000000..a492288
 +}
 diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
 new file mode 100644
-index 0000000..b13e054
+index 0000000..5156278
 --- /dev/null
 +++ b/drivers/xen/pci.c
 @@ -0,0 +1,116 @@
@@ -11149,7 +11295,7 @@ index 0000000..b13e054
 +	return bus_register_notifier(&pci_bus_type, &device_nb);
 +}
 +
-+fs_initcall(register_xen_pci_notifier);
++arch_initcall(register_xen_pci_notifier);
 diff --git a/drivers/xen/xenbus/Makefile b/drivers/xen/xenbus/Makefile
 index 5571f5b..8dca685 100644
 --- a/drivers/xen/xenbus/Makefile
@@ -13108,22 +13254,6 @@ index e2e5ce5..ca67e2b 100644
  static inline int PageUptodate(struct page *page)
  {
  	int ret = test_bit(PG_uptodate, &(page)->flags);
-diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 115fb7b..2265a32 100644
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -1276,5 +1276,11 @@ extern void pci_hp_create_module_link(struct pci_slot *pci_slot);
- extern void pci_hp_remove_module_link(struct pci_slot *pci_slot);
- #endif
- 
-+#ifdef CONFIG_PCI_MSI
-+void pci_no_msi(void);
-+#else
-+static inline void pci_no_msi(void) { }
-+#endif
-+
- #endif /* __KERNEL__ */
- #endif /* LINUX_PCI_H */
 diff --git a/include/xen/Kbuild b/include/xen/Kbuild
 index 4e65c16..84ad8f0 100644
 --- a/include/xen/Kbuild
@@ -13586,13 +13716,43 @@ index af36ead..eac3ce1 100644
 +extern spinlock_t xen_reservation_lock;
  #endif /* __XEN_PUBLIC_MEMORY_H__ */
 diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h
-index cd69391..7a7d007 100644
+index cd69391..ac5de37 100644
 --- a/include/xen/interface/physdev.h
 +++ b/include/xen/interface/physdev.h
-@@ -106,6 +106,27 @@ struct physdev_irq {
+@@ -106,6 +106,57 @@ struct physdev_irq {
  	uint32_t vector;
  };
  
++#define MAP_PIRQ_TYPE_MSI		0x0
++#define MAP_PIRQ_TYPE_GSI		0x1
++#define MAP_PIRQ_TYPE_UNKNOWN		0x2
++
++#define PHYSDEVOP_map_pirq		13
++struct physdev_map_pirq {
++    domid_t domid;
++    /* IN */
++    int type;
++    /* IN */
++    int index;
++    /* IN or OUT */
++    int pirq;
++    /* IN */
++    int bus;
++    /* IN */
++    int devfn;
++    /* IN */
++    int entry_nr;
++    /* IN */
++    uint64_t table_base;
++};
++
++#define PHYSDEVOP_unmap_pirq		14
++struct physdev_unmap_pirq {
++    domid_t domid;
++    /* IN */
++    int pirq;
++};
++
 +#define PHYSDEVOP_manage_pci_add	15
 +#define PHYSDEVOP_manage_pci_remove	16
 +struct physdev_manage_pci {
@@ -14492,7 +14652,7 @@ index b9763ba..542ca7c 100644
  	int (*read_otherend_details)(struct xenbus_device *dev);
  	int (*is_ready)(struct xenbus_device *dev);
 diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index d222515..d5e2bb8 100644
+index 0ec9ed8..07a11dc 100644
 --- a/kernel/irq/manage.c
 +++ b/kernel/irq/manage.c
 @@ -200,7 +200,8 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc)
@@ -14534,7 +14694,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 d052abb..087cbf5 100644
+index 5cc986e..c7b76b2 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/pci-swiotlb.c         |    5 ++---
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/arch/x86/xen/enlighten.c              |   10 +++-------
 drivers/pci/pci.h                       |    2 ++
 6 files changed, 28 insertions(+), 10 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -p -r1.1.2.21 -r1.1.2.22
--- xen.pvops.post.patch	18 Aug 2009 19:26:48 -0000	1.1.2.21
+++ xen.pvops.post.patch	20 Aug 2009 18:50:23 -0000	1.1.2.22
@@ -2,13 +2,14 @@ Reapply and merge in Fedora changes
 
 --- a/drivers/pci/pci.h	2009-02-25 20:16:13.000000000 +0000
 +++ b/drivers/pci/pci.h	2009-02-25 20:40:21.000000000 +0000
-@@ -111,8 +111,10 @@
- extern unsigned int pci_pm_d3_delay;
+@@ -111,9 +111,11 @@
  
  #ifdef CONFIG_PCI_MSI
+ void pci_no_msi(void);
 +void pci_yes_msi(void);
  extern void pci_msi_init_pci_dev(struct pci_dev *dev);
  #else
+ static inline void pci_no_msi(void) { }
 +static inline void pci_yes_msi(void) { }
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
  #endif
@@ -83,3 +84,31 @@ index 6af96ee..1e66b18 100644
  #endif
  	if (xen_wants_swiotlb())
  		swiotlb = 1;
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 2e58099..3ebcbb2 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -51,6 +51,7 @@
+ #include <asm/pgtable.h>
+ #include <asm/tlbflush.h>
+ #include <asm/reboot.h>
++#include <asm/stackprotector.h>
+ 
+ #include "xen-ops.h"
+ #include "mmu.h"
+@@ -1013,13 +1014,8 @@ asmlinkage void __init xen_start_kernel(void)
+ 	pv_apic_ops = xen_apic_ops;
+ 	pv_mmu_ops = xen_mmu_ops;
+ 
+-#ifdef CONFIG_X86_64
+-	/*
+-	 * Setup percpu state.  We only need to do this for 64-bit
+-	 * because 32-bit already has %fs set properly.
+-	 */
+-	load_percpu_segment(0);
+-#endif
++	setup_stack_canary_segment(0);
++	switch_to_new_gdt(0);
+ 
+ 	xen_init_irq_ops();
+ 	xen_init_cpuid_mask();


--- fix-perf-make-man-failure.patch DELETED ---


--- patch-2.6.31-rc6-git5.bz2.sign DELETED ---



From spot at fedoraproject.org  Thu Aug 20 18:55:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 18:55:13 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.113,1.114
Message-ID: <20090820185513.650A211C006E@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31813

Modified Files:
	postgresql.spec 
Log Message:
license tag fix


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- postgresql.spec	18 Aug 2009 02:58:55 -0000	1.113
+++ postgresql.spec	20 Aug 2009 18:55:13 -0000	1.114
@@ -60,8 +60,8 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.0
-Release: 1%{?dist}
-License: BSD
+Release: 2%{?dist}
+License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
 
@@ -852,6 +852,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.4.0-2
+- update License tag to MIT (PostgreSQL calls it "BSD", but it is MIT)
+- Note: This changes nothing from a license compatibility perspective.
+
 * Mon Aug 17 2009 Tom Lane <tgl at redhat.com> 8.4.0-1
 - Update to PostgreSQL 8.4.0.  See release notes at
   http://www.postgresql.org/docs/8.4/static/release-8-4.html



From akurtakov at fedoraproject.org  Thu Aug 20 18:58:45 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 18:58:45 +0000 (UTC)
Subject: rpms/jakarta-commons-dbcp/devel commons-dbcp-1.2.1-jdk6.patch, NONE,
	1.1 commons-dbcp-1.2.1.pom, NONE,
	1.1 commons-dbcp-1.2.1-sourcever.patch, NONE,
	1.1 jakarta-commons-dbcp.spec, 1.32, 1.33
Message-ID: <20090820185845.6163111C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698/devel

Modified Files:
	jakarta-commons-dbcp.spec 
Added Files:
	commons-dbcp-1.2.1-jdk6.patch commons-dbcp-1.2.1.pom 
	commons-dbcp-1.2.1-sourcever.patch 
Log Message:
* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.1-13.6
- Drop gcj support.
- Fix build with java 6.
- Add maven pom.
- Drop maven1 support.

commons-dbcp-1.2.1-jdk6.patch:
 commons-dbcp-1.2.1-jdk6.patch                                           | 1037 ++++++++++
 commons-dbcp-1.2.1.iml                                                  |   13 
 commons-dbcp-1.2.1.ipr                                                  |  328 +++
 commons-dbcp-1.2.1.iws                                                  |  684 ++++++
 src/java/org/apache/commons/dbcp/BasicDataSource.java                   |    8 
 src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java       |  132 +
 src/java/org/apache/commons/dbcp/DelegatingConnection.java              |   60 
 src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java       |   77 
 src/java/org/apache/commons/dbcp/DelegatingResultSet.java               |  203 +
 src/java/org/apache/commons/dbcp/DelegatingStatement.java               |   18 
 src/java/org/apache/commons/dbcp/PoolingDataSource.java                 |    8 
 src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java        |   60 
 src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java  |    9 
 src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java |    8 
 src/test/org/apache/commons/dbcp/TesterConnection.java                  |   61 
 src/test/org/apache/commons/dbcp/TesterPreparedStatement.java           |   76 
 src/test/org/apache/commons/dbcp/TesterResultSet.java                   |  205 +
 src/test/org/apache/commons/dbcp/TesterStatement.java                   |   19 
 18 files changed, 3005 insertions(+), 1 deletion(-)

--- NEW FILE commons-dbcp-1.2.1-jdk6.patch ---
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml ./commons-dbcp-1.2.1.iml
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1.iml	2009-01-14 17:42:00.000000000 +0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr ./commons-dbcp-1.2.1.ipr
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1.ipr	2009-01-09 23:08:08.000000000 +0800
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+  </component>
+  <component name="BuildJarProjectSettings">
+    <option name="BUILD_JARS_ON_MAKE" value="false" />
+  </component>
+  <component name="CCaseConfig">
+    <option name="checkoutReserved" value="false" />
+    <option name="markExternalChangeAsUpToDate" value="true" />
+    <option name="checkInUseHijack" value="true" />
+    <option name="useUcmModel" value="true" />
+    <option name="isOffline" value="false" />
+    <option name="synchOutside" value="false" />
+    <option name="isHistoryResticted" value="true" />
+    <option name="useIdenticalSwitch" value="true" />
+    <option name="synchActivitiesOnRefresh" value="true" />
+    <option name="lastScr" value="" />
+    <option name="scrTextFileName" value="" />
+    <option name="historyRevisionsNumber" value="4" />
+  </component>
+  <component name="CodeStyleProjectProfileManger">
+    <option name="PROJECT_PROFILE" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+  </component>
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS" />
+    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+  </component>
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <resourceExtensions>
+      <entry name=".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name="DependenciesAnalyzeManager">
+    <option name="myForwardDirection" value="false" />
+  </component>
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="EclipseCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EclipseEmbeddedCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ErrorTreeViewConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="HIDE_WARNINGS" value="false" />
+  </component>
+  <component name="HierarchyBrowserManager">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="SORT_ALPHABETICALLY" value="false" />
+    <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
+  </component>
+  <component name="IdProvider" IDEtalkID="C6A49ECD75ED7164A26CE3371D004C3B" />
+  <component name="InspectionProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile version="1.0" is_locked="false">
+        <option name="myName" value="Project Default" />
+        <option name="myLocal" value="false" />
+      </profile>
+    </profiles>
+    <list size="0" />
+  </component>
+  <component name="JavacSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="DEPRECATION" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="JikesSettings">
+    <option name="JIKES_PATH" value="" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="DEPRECATION" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="IS_EMACS_ERRORS_MODE" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
[...2819 lines suppressed...]
+
+    public void updateNString(String columnLabel, String nString) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(int columnIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterStatement.java ./src/test/org/apache/commons/dbcp/TesterStatement.java
--- ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterStatement.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/test/org/apache/commons/dbcp/TesterStatement.java	2009-01-14 17:44:37.000000000 +0800
@@ -264,4 +264,23 @@
     }
 /* JDBC_3_ANT_KEY_END */
 
+    public boolean isClosed() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setPoolable(boolean poolable) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isPoolable() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }


--- NEW FILE commons-dbcp-1.2.1.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-dbcp</groupId>
  <artifactId>commons-dbcp</artifactId>
  <name>Commons DBCP</name>
  <version>1.2.1</version>
  <description>Commons Database Connection Pooling</description>
  <url>http://jakarta.apache.org/commons/dbcp/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <address>commons-dev at jakarta.apache.org</address>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev at jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user at jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>morgand</id>
      <name>Morgan Delagrange</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>geirm</id>
      <name>Geir Magnusson</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>jmcnally</id>
      <name>John McNally</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>mpoeschl</id>
      <name>Martin Poeschl</name>
      <email>mpoeschl at marmot.at</email>
      <organization>tucana.at</organization>
    </developer>
    <developer>
      <id>rwaldhoff</id>
      <name>Rodney Waldhoff</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dweinr1</id>
      <name>David Weinrich</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dirkv</id>
      <name>Dirk Verbeeck</name>
      <email></email>
      <organization></organization>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>Todd Carmichael</name>
      <email>toddc at concur.com</email>
    </contributor>
    <contributor>
      <name>Wayne Woodfield</name>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:cvs:pserver:anoncvs at cvs.apache.org:/home/cvspublic:jakarta-commons/dbcp</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-commons/dbcp/</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <directory>${basedir}/src/test</directory>
        <includes>
          <include>testpool.jocl</include>
        </includes>
      </resource>
      <resource>
        <directory>${basedir}</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>${basedir}/src/test</directory>
        <includes>
          <include>testpool.jocl</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
            <include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
            <include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
            <include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
            <include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
            <include>org/apache/commons/dbcp/TestJOCLed.java</include>
            <include>org/apache/commons/dbcp/TestManual.java</include>
            <include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
            <include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
            <include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
            <include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
            <include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
            <include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
            <include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>2.1</version>
    </dependency>
    <dependency>
      <groupId>commons-pool</groupId>
      <artifactId>commons-pool</artifactId>
      <version>1.2</version>
    </dependency>
    <dependency>
      <groupId>javax.sql</groupId>
      <artifactId>jdbc-stdext</artifactId>
      <version>2.0</version>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>2.0.2</version>
    </dependency>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xerces</artifactId>
      <version>2.0.2</version>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/dbcp/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/dbcp/</url>
    </site>
  </distributionManagement>
</project>
commons-dbcp-1.2.1-sourcever.patch:
 build.xml |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE commons-dbcp-1.2.1-sourcever.patch ---
diff -up ./build.xml.sav ./build.xml
--- ./build.xml.sav	2008-04-10 17:15:19.000000000 -0400
+++ ./build.xml	2008-04-10 17:16:54.000000000 -0400
@@ -48,6 +48,9 @@
       <property name="javac.debug" value="true"/>
       <property name="javac.deprecation" value="false"/>
 
+      <property name="source.version" value="1.5"/>
+      <property name="target.version" value="1.5"/>
+
       <available property="jndi.present" classname="javax.naming.Context"/>
       <available property="jdbc3.present" classname="java.sql.Savepoint"/>
    </target>
@@ -108,7 +111,8 @@
                noindex="false"
                nohelp="true"
                nonavbar="false"
-               serialwarn="false">
+               serialwarn="false"
+               source="${source.version}">
           <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
           <link href="http://jakarta.apache.org/commons/pool/apidocs"/>
       </javadoc>
@@ -123,7 +127,9 @@
              classpath="${classpath}"
              debug="${javac.debug}"
              deprecation="${javac.deprecation}"
-             optimize="${javac.optimize}">
+             optimize="${javac.optimize}"
+             source="${source.version}"
+             target="${target.version}">
          <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
              unless="jndi.present"/>
          <exclude name="org/apache/commons/dbcp/datasources/**"
@@ -139,7 +145,9 @@
              srcdir="${src.test.dir}"
              debug="${javac.debug}"
              deprecation="${javac.deprecation}"
-             optimize="${javac.optimize}">
+             optimize="${javac.optimize}"
+             source="${source.version}"
+             target="${target.version}">
         <classpath>
           <pathelement location="${build.classes.dir}" /> 
           <pathelement location="${build.test-classes.dir}" /> 


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- jakarta-commons-dbcp.spec	25 Jul 2009 03:49:03 -0000	1.32
+++ jakarta-commons-dbcp.spec	20 Aug 2009 18:58:45 -0000	1.33
@@ -28,29 +28,18 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define _without_maven 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
 %define base_name       dbcp
 %define short_name      commons-%{base_name}
 %define section         free
 
 Name:           jakarta-commons-dbcp
 Version:        1.2.1
-Release:        13.5%{?dist}
+Release:        13.6%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons DataBase Pooling Package
-License:        ASL 2.0 
-Group:          Development/Libraries/Java
-Source0:        http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz 
+License:        ASL 2.0
+Group:          Development/Libraries
+Source0:        http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
 Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl
 Source3:        pom-maven2jpp-mapdeps.xsl
@@ -59,14 +48,17 @@ Source5:        commons-build.tar.gz
 # svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
 # tar czf commons-build.tar.gz commons-build
 Source6:        dbcp-tomcat5-build.xml
+Source7:        http://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.pom
 
 Patch0:         commons-dbcp-1.2.1-project_xml.patch
 Patch1:         commons-dbcp-1.2.1-TestJOCLed.patch
 Patch2:         commons-dbcp-1.2.1-TestConnectionPool.patch
 Patch3:         commons-dbcp-1.2.1-navigation_xml.patch
 Patch4:         commons-dbcp-1.2.1-project_properties.patch
+Patch5:         commons-dbcp-1.2.1-sourcever.patch
+Patch6:         commons-dbcp-1.2.1-jdk6.patch
 
-Url:            http://jakarta.apache.org/commons/%{base_name}
+URL:            http://jakarta.apache.org/commons/%{base_name}
 BuildRequires:  ant
 BuildRequires:  jakarta-commons-collections >= 2.0
 BuildRequires:  jakarta-commons-pool >= 1.1
@@ -77,96 +69,49 @@ BuildRequires:  jpackage-utils > 1.6
 BuildRequires:  junit >= 3.8
 BuildRequires:  jakarta-commons-pool-tomcat5
 BuildRequires:  jakarta-commons-collections-tomcat5
-%if %{with_maven}
-BuildRequires:  maven >= 0:1.1
-BuildRequires:  maven-plugins-base
-BuildRequires:  maven-plugin-test
-BuildRequires:  maven-plugin-xdoc
-BuildRequires:  maven-plugin-license
-BuildRequires:  maven-plugin-changes
-BuildRequires:  maven-plugin-jdepend
-BuildRequires:  maven-plugin-jdiff
-BuildRequires:  maven-plugin-jxr
-BuildRequires:  maven-plugin-tasklist
-BuildRequires:  maven-plugin-developer-activity
-BuildRequires:  maven-plugin-file-activity
-BuildRequires:  saxon
-BuildRequires:  saxon-scripts
-%endif
 
 Requires(post):  /usr/sbin/update-alternatives
 Requires(preun):  /usr/sbin/update-alternatives
 Requires:       jakarta-commons-collections >= 2.0
 Requires:       jakarta-commons-pool >= 1.1
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   %{short_name} = %{epoch}:%{version}-%{release}
 Provides:   hibernate_jdbc_cache = %{epoch}:%{version}-%{release}
 Obsoletes:  %{short_name} < %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
-Many Jakarta projects support interaction with a relational 
-database. Creating a new connection for each user can be time 
-consuming (often requiring multiple seconds of clock time), 
-in order to perform a database transaction that might take 
-milliseconds. Opening a connection per user can be unfeasible 
-in a publicly-hosted Internet application where the number of 
-simultaneous users can be very large. Accordingly, developers 
-often wish to share a "pool" of open connections between all 
-of the application's current users. The number of users actually 
-performing a request at any given time is usually a very small 
-percentage of the total number of active users, and during 
-request processing is the only time that a database connection 
-is required. The application itself logs into the DBMS, and 
+Many Jakarta projects support interaction with a relational
+database. Creating a new connection for each user can be time
+consuming (often requiring multiple seconds of clock time),
+in order to perform a database transaction that might take
+milliseconds. Opening a connection per user can be unfeasible
+in a publicly-hosted Internet application where the number of
+simultaneous users can be very large. Accordingly, developers
+often wish to share a "pool" of open connections between all
+of the application's current users. The number of users actually
+performing a request at any given time is usually a very small
+percentage of the total number of active users, and during
+request processing is the only time that a database connection
+is required. The application itself logs into the DBMS, and
 handles any user account issues internally.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
 
 %package tomcat5
 Summary:        DBCP dependency for Tomcat5
-Group:          Development/Libraries/Java
-
-%if %{gcj_support}
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
+Group:          Development/Libraries
 
 %description tomcat5
 DBCP dependency for Tomcat5
 
-%if %{with_maven}
-%package manual
-Summary:        Documents for %{name}
-Group:          Development/Documentation
-
-%description manual
-%{summary}.
-%endif
-
 %prep
-cat <<EOT
-
-                If you dont want to build with maven,
-                give rpmbuild option '--without maven'
-
-EOT
-
 %setup -q -n %{short_name}-%{version}
 %{__sed} -i 's/\r//' LICENSE.txt
 %{__sed} -i 's/\r//' NOTICE.txt
@@ -183,38 +128,10 @@ cp %{SOURCE6} .
 %patch2 -b .sav
 %patch3 -b .sav
 %patch4 -b .sav
+%patch5 -b .sav
+%patch6
 
 %build
-%if %{with_maven}
-export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
-    popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml
-
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    cp project.xml project.xml.orig
-    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
-    popd
-done
-mkdir -p .maven/repository/JPP/jars
-pushd .maven/repository/JPP/jars
-    ln -sf $(build-classpath jdbc-stdext) jdbc.jar
-popd
-
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven/repository \
-        -Dmaven.home.local=$(pwd)/.maven \
-        jar javadoc xdoc:transform
-%else
-
 export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2)
 ant \
         -Dbuild.sysclasspath=first \
@@ -225,21 +142,16 @@ ant \
         -Dsax2.jar=$(build-classpath xml-commons-apis) \
         -Djava.io.tmpdir=. \
         dist test
-%endif
 
-export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2 commons-collections-tomcat5 commons-pool-tomcat5)        
-ant     -f dbcp-tomcat5-build.xml
+export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2 commons-collections-tomcat5 commons-pool-tomcat5)
+ant -Dcompile.source=1.5 -Dant.build.javac.target=1.5 -f dbcp-tomcat5-build.xml
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-%if %{with_maven}
-install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
 install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%endif
-#tomcat5 jars 
+#tomcat5 jars
 install -m 644 dbcp-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
 
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
@@ -247,29 +159,19 @@ install -m 644 dbcp-tomcat5/%{short_name
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf target/docs/apidocs
-%else
 cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{with_maven}
-# manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%endif
-
 # quick hack clean up
 rm ../LICENSE
 
 # hibernate_jdbc_cache ghost symlink
 touch $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+# Install pom file
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-jakarta-commons-dbcp.pom
+%add_to_maven_depmap commons-dbcp commons-dbcp %{version} JPP jakarta-commons-dbcp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -277,21 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 %post
 update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
   hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
+%update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %preun
 {
@@ -299,56 +190,34 @@ fi
   update-alternatives --remove hibernate_jdbc_cache %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-%if %{gcj_support}
-%post tomcat5
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun tomcat5
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE.txt README.txt
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
 %ghost %{_javadir}/hibernate_jdbc_cache.jar
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
 %files tomcat5
 %defattr(-,root,root)
 %{_javadir}/*-tomcat5*.jar
 %doc LICENSE.txt NOTICE.txt
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*-tomcat5*
-%endif
-
 %files javadoc
 %defattr(-,root,root)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
-%if %{with_maven}
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%endif
-
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.1-13.6
+- Drop gcj support.
+- Fix build with java 6.
+- Add maven pom.
+- Drop maven1 support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.1-13.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -448,7 +317,7 @@ fi
 - use sed instead of bash 2.x extension in link area to make spec compatible
   with distro using bash 1.1x
 
-* Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp 
+* Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp
 - 1.0 (cvs 20020606)
 - added short names in %%{_javadir}, as does jakarta developpers
 - first jPackage release



From spot at fedoraproject.org  Thu Aug 20 19:00:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 19:00:06 +0000 (UTC)
Subject: rpms/postgresql/F-10 postgresql.spec,1.107,1.108
Message-ID: <20090820190006.C014011C0439@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/postgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv666/F-10

Modified Files:
	postgresql.spec 
Log Message:
fix license tag


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- postgresql.spec	21 Mar 2009 23:12:50 -0000	1.107
+++ postgresql.spec	20 Aug 2009 19:00:06 -0000	1.108
@@ -84,8 +84,8 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.7
-Release: 1%{?dist}
-License: BSD
+Release: 1%{?dist}.1
+License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
 
@@ -871,6 +871,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.3.7-1.1
+- fix license tag
+
 * Sat Mar 21 2009 Tom Lane <tgl at redhat.com> 8.3.7-1
 - Update to PostgreSQL 8.3.7, for various fixes described at
   http://www.postgresql.org/docs/8.3/static/release-8-3-7.html



From spot at fedoraproject.org  Thu Aug 20 19:00:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 20 Aug 2009 19:00:06 +0000 (UTC)
Subject: rpms/postgresql/F-11 postgresql.spec,1.110,1.111
Message-ID: <20090820190006.F294711C0439@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/postgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv666/F-11

Modified Files:
	postgresql.spec 
Log Message:
fix license tag


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-11/postgresql.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- postgresql.spec	21 Mar 2009 22:43:50 -0000	1.110
+++ postgresql.spec	20 Aug 2009 19:00:06 -0000	1.111
@@ -84,8 +84,8 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.7
-Release: 1%{?dist}
-License: BSD
+Release: 1%{?dist}.1
+License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
 
@@ -871,6 +871,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.3.7-1.1
+- fix license tag
+
 * Sat Mar 21 2009 Tom Lane <tgl at redhat.com> 8.3.7-1
 - Update to PostgreSQL 8.3.7, for various fixes described at
   http://www.postgresql.org/docs/8.3/static/release-8-3-7.html



From mtasaka at fedoraproject.org  Thu Aug 20 19:04:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 20 Aug 2009 19:04:03 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria-0.6.5-glib_convert-syntax.patch,
	1.1, 1.2 alexandria.spec, 1.36, 1.37
Message-ID: <20090820190403.568A911C006E@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1795

Modified Files:
	alexandria-0.6.5-glib_convert-syntax.patch alexandria.spec 
Log Message:
* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
- Clarify GLib.convert usage in utils.rb (does not change the 
  functionality of alexandria)


alexandria-0.6.5-glib_convert-syntax.patch:
 utils.rb |   52 +++++++++-------------------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

Index: alexandria-0.6.5-glib_convert-syntax.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria-0.6.5-glib_convert-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-glib_convert-syntax.patch	19 Aug 2009 22:13:59 -0000	1.1
+++ alexandria-0.6.5-glib_convert-syntax.patch	20 Aug 2009 19:04:03 -0000	1.2
@@ -1,17 +1,65 @@
 Index: lib/alexandria/utils.rb
 ===================================================================
 --- lib/alexandria/utils.rb	(revision 1085)
-+++ lib/alexandria/utils.rb	(working copy)
-@@ -20,7 +20,11 @@
++++ lib/alexandria/utils.rb	(revision 1086)
+@@ -15,51 +15,17 @@
+ # write to the Free Software Foundation, Inc., 51 Franklin Street,
+ # Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#begin
+ require 'glib2'
  
  class String
-   def convert(charset_from, charset_to)
+-  def convert(charset_from, charset_to)
 -    GLib.convert(self, charset_from, charset_to)
-+#
-+# Ask upstream!! Perhaps from <-> to are reverse
-+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
-+#
-+    GLib.convert(self, charset_to, charset_from)
++  
++  # Converts this string into the desired charset.
++  #
++  # Note that this may raise a GLib::ConvertError if the
++  # desired_charset cannot accommodate all the characters present in
++  # the string, e.g. trying to convert Japanese Kanji to ISO-8859-1
++  # will obviously not work.
++  def convert(desired_charset, source_data_charset)
++    GLib.convert(self, desired_charset, source_data_charset)
    end
  end
- 
+-
+-=begin
+-rescue LoadError
+-
+-  # We assume that Ruby/Cocoa is loaded there
+-
+-  #require 'iconv'
+-
+-  class String
+-    def to_utf8_nsstring
+-      # This should be writen in ObjC in order to catch the ObjC exception if the
+-      # string could not be converted to UTF8.
+-      (OSX::NSString.stringWithUTF8String(self) or self)
+-    end
+-
+-    def convert(charset_from, charset_to)
+-      # Do nothing for the moment...
+-      self
+-    end
+-
+-        return OSX::NSString.stringWithUTF8String(self)
+-        x = Iconv.iconv(charset_to, charset_from, self).first
+-        p "#{self} -> #{x}"
+-        return x
+-        #p charset_from, charset_to
+-        #return self
+-
+-        from = OSX::NSString.alloc.initWithString(self)
+-        encoding = charset_to.nsencoding
+-        encoding = OSX::NSUnicodeStringEncoding
+-        data = from.dataUsingEncoding(encoding)
+-        s = OSX::NSString.alloc.initWithData_encoding(data, encoding).to_s
+-        s
+-        #self
+-    end
+-
+-  end
+-
+-end
+-=end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- alexandria.spec	20 Aug 2009 08:47:00 -0000	1.36
+++ alexandria.spec	20 Aug 2009 19:04:03 -0000	1.37
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -22,12 +22,9 @@ Source0:	http://rubyforge.org/frs/downlo
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Need ask to upstream
-# perhaps there is some confusion about GLib.convert...
-#Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Need ask to upstream
-# Sometimes search result has empty book or cover entry
-#Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+# Clarify the usage of GLib.convert 
+# ref: alexandria-Bugs-26968
+Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,8 +75,7 @@ Alexandria is a GNOME application to hel
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-#%%patch3 -p0 -b .glib
-#%%patch4 -p0 -b .result
+%patch3 -p0 -b .glib
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,6 +202,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
+- Clarify GLib.convert usage in utils.rb (does not change the 
+  functionality of alexandria)
+
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
 - Kill the previous 2 patches (for now)
 



From dwalsh at fedoraproject.org  Thu Aug 20 19:05:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 20 Aug 2009 19:05:32 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.431,
	1.432 policycoreutils.spec, 1.625, 1.626
Message-ID: <20090820190532.7580011C006E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2264

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-7
- Fix glob handling of /..


policycoreutils-rhat.patch:
 Makefile                |    2 
 audit2allow/audit2allow |   14 -
 scripts/Makefile        |    3 
 scripts/chcat           |    2 
 scripts/sandbox         |  139 +++++++++
 scripts/sandbox.8       |   22 +
 scripts/sandbox.py      |   67 ++++
 semanage/semanage       |   34 ++
 semanage/seobject.py    |   66 ++++
 setfiles/Makefile       |    4 
 setfiles/restore.c      |  530 +++++++++++++++++++++++++++++++++++++
 setfiles/restore.h      |   50 +++
 setfiles/setfiles.c     |  672 +++++-------------------------------------------
 13 files changed, 996 insertions(+), 609 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -p -r1.431 -r1.432
--- policycoreutils-rhat.patch	19 Aug 2009 20:38:19 -0000	1.431
+++ policycoreutils-rhat.patch	20 Aug 2009 19:05:30 -0000	1.432
@@ -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.71/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-20 12:53:16.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -40,1135 +40,16 @@ 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/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-20 12:53:16.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  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.71/restorecond/Makefile
---- nsapolicycoreutils/restorecond/Makefile	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-19 15:42:48.000000000 -0400
-@@ -2,16 +2,23 @@
- PREFIX ?= ${DESTDIR}/usr
- SBINDIR ?= $(PREFIX)/sbin
- MANDIR = $(PREFIX)/share/man
-+AUTOSTARTDIR = $(DESTDIR)/etc/xdg/autostart
-+DBUSSERVICEDIR = $(DESTDIR)/usr/share/dbus-1/services
-+
-+autostart_DATA = sealertauto.desktop
- INITDIR = $(DESTDIR)/etc/rc.d/init.d
- SELINUXDIR = $(DESTDIR)/etc/selinux
- 
- CFLAGS ?= -g -Werror -Wall -W
--override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
--LDLIBS += -lselinux -L$(PREFIX)/lib
-+override CFLAGS += -I$(PREFIX)/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include
-+
-+LDLIBS += -lselinux -ldbus-glib-1 -lglib-2.0 -L$(LIBDIR)
- 
- all: restorecond
- 
--restorecond:  restorecond.o utmpwatcher.o stringslist.o
-+restorecond.o utmpwatcher.o stringslist.o user.o watch.o: restorecond.h 
-+
-+restorecond:  ../setfiles/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
- 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- install: all
-@@ -22,7 +29,12 @@
- 	-mkdir -p $(INITDIR)
- 	install -m 755 restorecond.init $(INITDIR)/restorecond
- 	-mkdir -p $(SELINUXDIR)
--	install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf
-+	install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf
-+	install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf
-+	-mkdir -p $(AUTOSTARTDIR)
-+	install -m 644 restorecond.desktop $(AUTOSTARTDIR)/restorecond.desktop
-+	-mkdir -p $(DBUSSERVICEDIR)
-+	install -m 600 org.selinux.Restorecond.service  $(DBUSSERVICEDIR)/org.selinux.Restorecond.service
- 
- 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.71/restorecond/org.selinux.Restorecond.service
---- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-19 12:25:41.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.71/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-19 15:42:48.000000000 -0400
-@@ -48,294 +48,39 @@
- #include <signal.h>
- #include <string.h>
- #include <unistd.h>
--#include <ctype.h>
-+#include "../setfiles/restore.h"
- #include <sys/types.h>
--#include <sys/stat.h>
- #include <syslog.h>
- #include <limits.h>
-+#include <pwd.h>
-+#include <sys/stat.h>
-+#include <string.h>
-+#include <stdio.h>
- #include <fcntl.h>
--
- #include "restorecond.h"
--#include "stringslist.h"
- #include "utmpwatcher.h"
- 
--extern char *dirname(char *path);
-+const char *homedir;
- static int master_fd = -1;
--static int master_wd = -1;
--static int terminate = 0;
--
--#include <selinux/selinux.h>
--#include <utmp.h>
--
--/* size of the event structure, not counting name */
--#define EVENT_SIZE  (sizeof (struct inotify_event))
--/* reasonable guess as to size of 1024 events */
--#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
--
--static int debug_mode = 0;
--static int verbose_mode = 0;
--
--static void restore(const char *filename, int exact);
--
--struct watchList {
--	struct watchList *next;
--	int wd;
--	char *dir;
--	struct stringsList *files;
--};
--struct watchList *firstDir = NULL;
--
--/* Compare two contexts to see if their differences are "significant",
-- * or whether the only difference is in the user. */
--static int only_changed_user(const char *a, const char *b)
--{
--	char *rest_a, *rest_b;	/* Rest of the context after the user */
--	if (!a || !b)
--		return 0;
--	rest_a = strchr(a, ':');
--	rest_b = strchr(b, ':');
--	if (!rest_a || !rest_b)
--		return 0;
--	return (strcmp(rest_a, rest_b) == 0);
--}
--
--/* 
--   A file was in a direcroty has been created. This function checks to 
--   see if it is one that we are watching.
--*/
--
--static int watch_list_find(int wd, const char *file)
--{
--	struct watchList *ptr = NULL;
--	ptr = firstDir;
--
--	if (debug_mode)
--		printf("%d: File=%s\n", wd, file);
--	while (ptr != NULL) {
--		if (ptr->wd == wd) {
--			int exact=0;
--			if (strings_list_find(ptr->files, file, &exact) == 0) {
--				char *path = NULL;
--				if (asprintf(&path, "%s/%s", ptr->dir, file) <
--				    0)
--					exitApp("Error allocating memory.");
--				restore(path, exact);
--				free(path);
--				return 0;
--			}
--			if (debug_mode)
--				strings_list_print(ptr->files);
--
--			/* Not found in this directory */
--			return -1;
--		}
--		ptr = ptr->next;
--	}
--	/* Did not find a directory */
--	return -1;
--}
--
--static void watch_list_free(int fd)
--{
--	struct watchList *ptr = NULL;
--	struct watchList *prev = NULL;
--	ptr = firstDir;
--
--	while (ptr != NULL) {
--		inotify_rm_watch(fd, ptr->wd);
--		strings_list_free(ptr->files);
--		free(ptr->dir);
--		prev = ptr;
--		ptr = ptr->next;
--		free(prev);
--	}
--	firstDir = NULL;
--}
--
--/* 
--   Set the file context to the default file context for this system.
--   Same as restorecon.
--*/
--static void restore(const char *filename, int exact)
--{
--	int retcontext = 0;
--	security_context_t scontext = NULL;
--	security_context_t prev_context = NULL;
--	struct stat st;
--	int fd = -1;
--	if (debug_mode)
--		printf("restore %s\n", filename);
--
--	fd = open(filename, O_NOFOLLOW | O_RDONLY);
--	if (fd < 0) {
--		if (verbose_mode)
--			syslog(LOG_ERR, "Unable to open file (%s) %s\n",
--			       filename, strerror(errno));
--		return;
--	}
--
--	if (fstat(fd, &st) != 0) {
--		syslog(LOG_ERR, "Unable to stat file (%s) %s\n", filename,
--		       strerror(errno));
--		close(fd);
--		return;
--	}
--
--	if (!(st.st_mode & S_IFDIR) && st.st_nlink > 1) {
--		if (exact) { 
--			syslog(LOG_ERR,
--			       "Will not restore a file with more than one hard link (%s) %s\n",
--			       filename, strerror(errno));
--		}
--		close(fd);
--		return;
--	}
--
--	if (matchpathcon(filename, st.st_mode, &scontext) < 0) {
--		if (errno == ENOENT)
--			return;
--		syslog(LOG_ERR, "matchpathcon(%s) failed %s\n", filename,
--		       strerror(errno));
--		return;
--	}
--	retcontext = fgetfilecon_raw(fd, &prev_context);
--
--	if (retcontext >= 0 || errno == ENODATA) {
--		if (retcontext < 0)
--			prev_context = NULL;
--		if (retcontext < 0 || (strcmp(prev_context, scontext) != 0)) {
--
--			if (only_changed_user(scontext, prev_context) != 0) {
--				free(scontext);
--				free(prev_context);
--				close(fd);
--				return;
--			}
--
--			if (fsetfilecon(fd, scontext) < 0) {
--				if (errno != EOPNOTSUPP) 
--					syslog(LOG_ERR,
--					       "set context %s->%s failed:'%s'\n",
--					       filename, scontext, strerror(errno));
--				if (retcontext >= 0)
--					free(prev_context);
--				free(scontext);
--				close(fd);
--				return;
--			}
--			syslog(LOG_WARNING, "Reset file context %s: %s->%s\n",
--			       filename, prev_context, scontext);
--		}
--		if (retcontext >= 0)
--			free(prev_context);
--	} else {
--		if (errno != EOPNOTSUPP) 
--			syslog(LOG_ERR, "get context on %s failed: '%s'\n",
--			       filename, strerror(errno));
--	}
--	free(scontext);
--	close(fd);
--}
--
--static void process_config(int fd, FILE * cfg)
--{
--	char *line_buf = NULL;
--	size_t len = 0;
--
--	while (getline(&line_buf, &len, cfg) > 0) {
--		char *buffer = line_buf;
--		while (isspace(*buffer))
--			buffer++;
--		if (buffer[0] == '#')
--			continue;
--		int l = strlen(buffer) - 1;
--		if (l <= 0)
--			continue;
--		buffer[l] = 0;
--		if (buffer[0] == '~')
--			utmpwatcher_add(fd, &buffer[1]);
--		else {
--			watch_list_add(fd, buffer);
--		}
--	}
--	free(line_buf);
--}
--
--/* 
--   Read config file ignoring Comment lines 
--   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;
- 
--	FILE *cfg = NULL;
--	if (debug_mode)
--		printf("Read Config\n");
--
--	watch_list_free(fd);
--
--	cfg = fopen(watch_file_path, "r");
--	if (!cfg)
--		exitApp("Error reading config file.");
--	process_config(fd, cfg);
--	fclose(cfg);
--
--	inotify_rm_watch(fd, master_wd);
--	master_wd =
--	    inotify_add_watch(fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
--	if (master_wd == -1)
--		exitApp("Error watching config file.");
--}
-+#include <selinux/selinux.h>
- 
--/* 
--   Inotify watch loop 
--*/
--static int watch(int fd)
--{
--	char buf[BUF_LEN];
--	int len, i = 0;
--	len = read(fd, buf, BUF_LEN);
--	if (len < 0) {
--		if (terminate == 0) {
--			syslog(LOG_ERR, "Read error (%s)", strerror(errno));
--			return 0;
--		}
--		syslog(LOG_ERR, "terminated");
--		return -1;
--	} else if (!len)
--		/* BUF_LEN too small? */
--		return -1;
--	while (i < len) {
--		struct inotify_event *event;
--		event = (struct inotify_event *)&buf[i];
--		if (debug_mode)
--			printf("wd=%d mask=%u cookie=%u len=%u\n",
--			       event->wd, event->mask,
--			       event->cookie, event->len);
--		if (event->wd == master_wd)
--			read_config(fd);
--		else {
--			switch (utmpwatcher_handle(fd, event->wd)) {
--			case -1:	/* Message was not for utmpwatcher */
--				if (event->len)
--					watch_list_find(event->wd, event->name);
--				break;
--
--			case 1:	/* utmp has changed need to reload */
--				read_config(fd);
--				break;
--
--			default:	/* No users logged in or out */
--				break;
--			}
--		}
-+int debug_mode = 0;
-+int verbose_mode = 0;
-+int terminate = 0;
-+int master_wd = -1;
-+int run_as_user = 0;
- 
--		i += EVENT_SIZE + event->len;
--	}
--	return 0;
-+static void done(void) {
-+	watch_list_free(master_fd);
-+	close(master_fd);
-+	utmpwatcher_free();
-+	matchpathcon_fini();
- }
- 
- static const char *pidfile = "/var/run/restorecond.pid";
-@@ -374,7 +119,7 @@
- 
- static void usage(char *program)
- {
--	printf("%s [-d] [-v] \n", program);
-+	printf("%s [-d] [-s] [-f restorecond_file ] [-v] \n", program);
- 	exit(0);
- }
- 
-@@ -390,74 +135,35 @@
-    to see if it is one that we are watching.
- */
- 
--void watch_list_add(int fd, const char *path)
--{
--	struct watchList *ptr = NULL;
--	struct watchList *prev = NULL;
--	char *x = strdup(path);
--	if (!x)
--		exitApp("Out of Memory");
--	char *dir = dirname(x);
--	char *file = basename(path);
--	ptr = firstDir;
--
--	restore(path, 1);
--
--	while (ptr != NULL) {
--		if (strcmp(dir, ptr->dir) == 0) {
--			strings_list_add(&ptr->files, file);
--			free(x);
--			return;
--		}
--		prev = ptr;
--		ptr = ptr->next;
--	}
--	ptr = calloc(1, sizeof(struct watchList));
--
--	if (!ptr)
--		exitApp("Out of Memory");
--
--	ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
--	if (ptr->wd == -1) {
--		free(ptr);
--		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
--		       path, strerror(errno));
--		return;
--	}
--
--	ptr->dir = strdup(dir);
--	if (!ptr->dir)
--		exitApp("Out of Memory");
--
--	strings_list_add(&ptr->files, file);
--	if (prev)
--		prev->next = ptr;
--	else
--		firstDir = ptr;
--
--	if (debug_mode)
--		printf("%d: Dir=%s, File=%s\n", ptr->wd, ptr->dir, file);
--
--	free(x);
--}
--
- int main(int argc, char **argv)
- {
- 	int opt;
- 	struct sigaction sa;
- 
--#ifndef DEBUG
--	/* Make sure we are root */
--	if (getuid() != 0) {
--		fprintf(stderr, "You must be root to run this program.\n");
--		return 1;
--	}
--#endif
--	/* Make sure we are root */
--	if (is_selinux_enabled() != 1) {
--		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
--		return 1;
--	}
-+	memset(&r_opts, 0, sizeof(r_opts));
-+
-+	r_opts.progress = 0;
-+	r_opts.count = 0;
-+	r_opts.debug = 0;
-+	r_opts.change = 1;
-+	r_opts.verbose = 0;
-+	r_opts.logging = 0;
-+	r_opts.rootpath = NULL;
-+	r_opts.expand_realpath = 0;
-+	r_opts.rootpathlen = 0;
-+	r_opts.outfile = NULL;
-+	r_opts.force = 0;
-+	r_opts.hard_links = 0;
-+	r_opts.expand_realpath = 1;
-+	r_opts.abort_on_error = 0;
-+	r_opts.add_assoc = 0;
-+	r_opts.fts_flags = FTS_PHYSICAL;
-+	r_opts.selabel_opt_validate = NULL;
-+	r_opts.selabel_opt_path = NULL;
-+	
-+	restore_init(&r_opts);
-+	/* If we are not running SELinux then just exit */
-+	if (is_selinux_enabled() != 1) return 0;
- 
- 	/* Register sighandlers */
- 	sa.sa_flags = 0;
-@@ -467,15 +173,18 @@
- 
- 	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
- 
--	master_fd = inotify_init();
--	if (master_fd < 0)
--		exitApp("inotify_init");
--
--	while ((opt = getopt(argc, argv, "dv")) > 0) {
-+	atexit( done );
-+	while ((opt = getopt(argc, argv, "uf:dv")) > 0) {
- 		switch (opt) {
- 		case 'd':
- 			debug_mode = 1;
- 			break;
-+		case 'f':
-+			watch_file = optarg;
-+			break;
-+		case 'u':
-+			run_as_user = 1;
-+			break;
- 		case 'v':
- 			verbose_mode = 1;
- 			break;
-@@ -483,22 +192,40 @@
- 			usage(argv[0]);
- 		}
- 	}
--	read_config(master_fd);
-+
-+	master_fd = inotify_init();
-+	if (master_fd < 0)
-+		exitApp("inotify_init");
-+
-+	uid_t uid = getuid();
-+	struct passwd *pwd = getpwuid(uid);
-+	homedir = pwd->pw_dir;
-+	if (uid != 0) {
-+		if (run_as_user)
-+			return server(master_fd, user_watch_file);
-+		if (start() != 0) 
-+			return server(master_fd, user_watch_file);
-+		return 0;
-+	}
-+
-+	watch_file = server_watch_file;
-+	read_config(master_fd, watch_file);
- 
- 	if (!debug_mode)
- 		daemon(0, 0);
- 
- 	write_pid_file();
- 
--	while (watch(master_fd) == 0) {
-+	while (watch(master_fd, watch_file) == 0) {
- 	};
- 
- 	watch_list_free(master_fd);
- 	close(master_fd);
- 	matchpathcon_fini();
--	utmpwatcher_free();
- 	if (pidfile)
- 		unlink(pidfile);
- 
- 	return 0;
- }
-+
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-19 15:42:48.000000000 -0400
-@@ -4,8 +4,5 @@
- /etc/mtab
- /var/run/utmp
- /var/log/wtmp
--~/*
--/root/.ssh
-+/root/*
- /root/.ssh/*
--
--
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.71/restorecond/restorecond.desktop
---- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-19 12:25:41.000000000 -0400
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+Name=File Context maintainer
-+Exec=/usr/sbin/restorecond -u
-+Comment=Fix file context in owned by the user
-+Encoding=UTF-8
-+Type=Application
-+StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.71/restorecond/restorecond.h
---- nsapolicycoreutils/restorecond/restorecond.h	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-19 15:42:48.000000000 -0400
-@@ -24,7 +24,22 @@
- #ifndef RESTORED_CONFIG_H
- #define RESTORED_CONFIG_H
- 
--void exitApp(const char *msg);
--void watch_list_add(int inotify_fd, const char *path);
-+extern int debug_mode;
-+extern int verbose_mode;
-+extern const char *homedir;
-+extern int terminate;
-+extern int master_wd;
-+extern int run_as_user;
-+
-+extern int start(void);
-+extern int server(int, const char *watch_file);
-+
-+extern void exitApp(const char *msg);
-+extern void read_config(int fd,	const char *watch_file);
-+
-+extern int watch(int fd, const char *watch_file);
-+extern void watch_list_add(int inotify_fd, const char *path);
-+extern int watch_list_find(int wd, const char *file);
-+extern void watch_list_free(int fd);
- 
- #endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
---- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-19 12:25:41.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.71/restorecond/user.c
---- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/user.c	2009-08-19 12:25:41.000000000 -0400
-@@ -0,0 +1,220 @@
-+/*
-+ * restorecond
-+ *
-+ * Copyright (C) 2006-2009 Red Hat 
-+ * see file 'COPYING' for use and warranty information
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; 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:  
-+ *   Dan Walsh <dwalsh at redhat.com>
-+ *
-+*/
-+
-+#define _GNU_SOURCE
-+#include <sys/inotify.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <syslog.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+
-+#include "restorecond.h"
-+#include "stringslist.h"
-+#include <glib.h>
-+#include <dbus/dbus.h>
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+
-+static DBusHandlerResult signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data);
-+
-+static const char *PATH="/org/selinux/Restorecond";
-+//static const char *BUSNAME="org.selinux.Restorecond";
-+static const char *INTERFACE="org.selinux.RestorecondIface";
-+static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'";
-+
-+#include <selinux/selinux.h>
-+#include <sys/file.h>
-+
-+/* size of the event structure, not counting name */
-+#define EVENT_SIZE  (sizeof (struct inotify_event))
-+/* reasonable guess as to size of 1024 events */
-+#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
-+
-+static gboolean
-+io_channel_callback
-+ (GIOChannel *source,
-+  GIOCondition condition,
-+  gpointer data __attribute__((__unused__)))
-+{
-+
-+  char buffer[BUF_LEN+1];
-+  gsize bytes_read;
-+  unsigned int i = 0;
-+
-+  if (condition & G_IO_IN) {
-+    /* Data is available. */
-+    g_io_channel_read
-+      (source, buffer,
-+       sizeof (buffer),
-+       &bytes_read);
-+
-+    while (i < bytes_read) {
-+	    struct inotify_event *event;
-+	    event = (struct inotify_event *)&buffer[i];
-+	    if (debug_mode)
-+		    printf("wd=%d mask=%u cookie=%u len=%u\n",
-+			   event->wd, event->mask,
-+			   event->cookie, event->len);
-+	    if (event->len)
-+		    watch_list_find(event->wd, event->name);
-+	    
-+	    i += EVENT_SIZE + event->len;
-+    }
-+  }
-+
-+  /* An error happened while reading
-+     the file. */
-+
-+  if (condition & G_IO_NVAL)
-+    return FALSE;
-+
-+  /* We have reached the end of the
-+     file. */
-+
-+  if (condition & G_IO_HUP) {
-+    g_io_channel_close (source);
-+    return FALSE;
-+  }
-+
-+  /* Returning TRUE will make sure
-+     the callback remains associated
-+     to the channel. */
-+
-+  return TRUE;
-+}
-+
-+static DBusHandlerResult
-+signal_filter (DBusConnection *connection  __attribute__ ((__unused__)), DBusMessage *message, void *user_data)
-+{
-+  /* User data is the event loop we are running in */
-+  GMainLoop *loop = user_data;
-+
-+  /* A signal from the bus saying we are about to be disconnected */
-+  if (dbus_message_is_signal 
-+        (message, INTERFACE, "Stop")) {
-+	  
-+      /* Tell the main loop to quit */
-+      g_main_loop_quit (loop);
-+      /* We have handled this message, don't pass it on */
-+      return DBUS_HANDLER_RESULT_HANDLED;
-+  }
-+  /* A Ping signal on the com.burtonini.dbus.Signal interface */
-+  else if (dbus_message_is_signal (message, INTERFACE, "Start")) {
-+    DBusError error;
-+    dbus_error_init (&error);
-+    g_print("Start received\n");
-+    return DBUS_HANDLER_RESULT_HANDLED;
-+  }
-+  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
-+
-+int start() {
-+	DBusConnection *bus;
-+	DBusError error;
-+	DBusMessage *message;
-+	
-+	/* Get a connection to the session bus */
-+	dbus_error_init (&error);
-+	bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
-+	if (!bus) {
-+		if (debug_mode)
-+			g_warning ("Failed to connect to the D-BUS daemon: %s", error.message);
-+		dbus_error_free (&error);
-+		return 1;
-+	}
-+	
-+
-+	/* Create a new signal "Start" on the interface,
-+	 * from the object  */
-+	message = dbus_message_new_signal (PATH,
-+					   INTERFACE, "Start");
-+	/* Send the signal */
-+	dbus_connection_send (bus, message, NULL);
-+	/* Free the signal now we have finished with it */
-+	dbus_message_unref (message);
-+	return 0;
-+}
-+
-+int server(int master_fd, const char *watch_file) {
-+    GMainLoop *loop;
-+    DBusConnection *bus;
-+    DBusError error;
-+
-+    loop = g_main_loop_new (NULL, FALSE);
-+    
-+    dbus_error_init (&error);
-+    bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
-+    if (bus) {
-+	dbus_connection_setup_with_g_main (bus, NULL);
-+	
-+	/* listening to messages from all objects as no path is specified */
-+	dbus_bus_add_match (bus, RULE, &error); // see signals from the given interfacey
-+	dbus_connection_add_filter (bus, signal_filter, loop, NULL);
-+    } else {
-+	// ! dbus, run as local service
-+	char *ptr=NULL;
-+	asprintf(&ptr, "%s/.restorecond", homedir);
-+	int fd = open(ptr, O_CREAT | O_WRONLY | O_NOFOLLOW, S_IRUSR | S_IWUSR);
-+	if (debug_mode)
-+	    g_warning ("Lock file: %s", ptr);
-+
-+	free(ptr);
-+	if (fd < 0) {
-+	    if (debug_mode)
-+		perror("open");
-+	    return 0;
-+	}
-+	if (flock(fd, LOCK_EX | LOCK_NB) < 0) {
-+	    if (debug_mode)
-+		       perror("flock");
-+		   return 0;
-+	}
-+    }
-+    
-+    read_config(master_fd, watch_file);
-+    
-+    set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
-+    
-+    GIOChannel *c = g_io_channel_unix_new(master_fd);
-+    
-+    g_io_add_watch_full( c,
-+			 G_PRIORITY_HIGH,
-+			 G_IO_IN|G_IO_ERR|G_IO_HUP,
-+			 io_channel_callback, NULL, NULL);
-+    
-+    g_main_loop_run (loop);
-+    return 0;
-+}
-+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.71/restorecond/walk.c
---- nsapolicycoreutils/restorecond/walk.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/walk.c	2009-08-19 16:30:32.000000000 -0400
-@@ -0,0 +1,30 @@
-+#define _XOPEN_SOURCE 500
-+#include <ftw.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+int ctr=0;
-+static int
-+display_info(const char *fpath, const struct stat *sb,
-+             int tflag, struct FTW *ftwbuf)
-+{
-+	if (tflag == FTW_D) {
-+		printf(" %-40s %d %s\n",
-+		       fpath, ftwbuf->base, fpath + ftwbuf->base);
-+		ctr++;
-+	}
-+    return 0;           /* To tell nftw() to continue */
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    int flags = 0;
-+
-+    flags = FTW_PHYS | FTW_MOUNT;
-+
-+    nftw((argc < 2) ? "." : argv[1], display_info, 20, flags);
-+    printf("Total Dirs %d\n",ctr);
-+    exit(EXIT_SUCCESS);
-+}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.71/restorecond/watch.c
---- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-19 13:27:16.000000000 -0400
-@@ -0,0 +1,253 @@
-+#define _GNU_SOURCE
-+#include <sys/inotify.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <syslog.h>
-+#include "../setfiles/restore.h"
-+#include <glob.h>
-+#include <libgen.h>
-+#include <sys/stat.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <fcntl.h>
-+#include <selinux/selinux.h>
-+#include "restorecond.h"
-+#include "stringslist.h"
-+#include "utmpwatcher.h"
-+
-+/* size of the event structure, not counting name */
-+#define EVENT_SIZE  (sizeof (struct inotify_event))
-+/* reasonable guess as to size of 1024 events */
-+#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
-+
-+
-+struct watchList {
-+	struct watchList *next;
-+	int wd;
-+	char *dir;
-+	struct stringsList *files;
-+};
-+struct watchList *firstDir = NULL;
-+
-+
-+void watch_list_add(int fd, const char *path)
-+{
-+	struct watchList *ptr = NULL;
-+	size_t i = 0;
-+	struct watchList *prev = NULL;
-+	glob_t globbuf;
-+	char *x = strdup(path);
-+	if (!x)
-+		exitApp("Out of Memory");
-+	char *file = basename(x);
-+	char *dir = dirname(x);
-+	ptr = firstDir;
-+
-+	globbuf.gl_offs = 1;
-+	if (glob(path, 
-+		 GLOB_TILDE | GLOB_PERIOD,
-+		 NULL,
-+		 &globbuf) >= 0) {
-+		for (i=0; i < globbuf.gl_pathc; i++) {
-+		  printf("%s\n", globbuf.gl_pathv[i]);
-+		  
-+		  if (process_one(globbuf.gl_pathv[i], 0) > 0)
-+		    process_one(globbuf.gl_pathv[i], 1);
-+		}
-+		globfree(&globbuf);
-+	}
-+
-+	while (ptr != NULL) {
-+		if (strcmp(dir, ptr->dir) == 0) {
-+			strings_list_add(&ptr->files, file);
-+			free(x);
-+			return;
-+		}
-+		prev = ptr;
-+		ptr = ptr->next;
-+	}
-+	ptr = calloc(1, sizeof(struct watchList));
-+
-+	if (!ptr)
-+		exitApp("Out of Memory");
-+
-+	ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
-+	if (ptr->wd == -1) {
-+		free(ptr);
-+		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
-+		       path, strerror(errno));
-+		return;
-+	}
-+
-+	ptr->dir = strdup(dir);
-+	if (!ptr->dir)
-+		exitApp("Out of Memory");
-+
-+	strings_list_add(&ptr->files, file);
-+	if (prev)
-+		prev->next = ptr;
-+	else
-+		firstDir = ptr;
-+
-+	if (debug_mode)
-+		printf("%d: Dir=%s, File=%s\n", ptr->wd, ptr->dir, file);
-+
-+	free(x);
-+}
-+
-+/* 
-+   A file was in a direcroty has been created. This function checks to 
-+   see if it is one that we are watching.
-+*/
-+
-+int watch_list_find(int wd, const char *file)
-+{
-+	struct watchList *ptr = NULL;
-+	ptr = firstDir;
-+	if (debug_mode)
-+		printf("%d: File=%s\n", wd, file);
-+	while (ptr != NULL) {
-+		if (ptr->wd == wd) {
-+			int exact=0;
-+			if (strings_list_find(ptr->files, file, &exact) == 0) {
-+				char *path = NULL;
-+				if (asprintf(&path, "%s/%s", ptr->dir, file) <
-+				    0)
-+					exitApp("Error allocating memory.");
-+				
-+				process_one(path, 0);
-+				free(path);
-+				return 0;
-+			}
-+			if (debug_mode)
-+				strings_list_print(ptr->files);
-+
-+			/* Not found in this directory */
-+			return -1;
-+		}
-+		ptr = ptr->next;
-+	}
-+	/* Did not find a directory */
-+	return -1;
-+}
-+
-+void watch_list_free(int fd)
-+{
-+	struct watchList *ptr = NULL;
-+	struct watchList *prev = NULL;
-+	ptr = firstDir;
-+
-+	while (ptr != NULL) {
-+		inotify_rm_watch(fd, ptr->wd);
-+		strings_list_free(ptr->files);
-+		free(ptr->dir);
-+		prev = ptr;
-+		ptr = ptr->next;
-+		free(prev);
-+	}
-+	firstDir = NULL;
-+}
-+
-+/* 
-+   Inotify watch loop 
-+*/
-+int watch(int fd, const char *watch_file)
-+{
-+	char buf[BUF_LEN];
-+	int len, i = 0;
-+	len = read(fd, buf, BUF_LEN);
-+	if (len < 0) {
-+		if (terminate == 0) {
-+			syslog(LOG_ERR, "Read error (%s)", strerror(errno));
-+			return 0;
-+		}
-+		syslog(LOG_ERR, "terminated");
-+		return -1;
-+	} else if (!len)
-+		/* BUF_LEN too small? */
-+		return -1;
-+	while (i < len) {
-+		struct inotify_event *event;
-+		event = (struct inotify_event *)&buf[i];
-+		if (debug_mode)
-+			printf("wd=%d mask=%u cookie=%u len=%u\n",
-+			       event->wd, event->mask,
-+			       event->cookie, event->len);
-+		if (event->wd == master_wd)
-+			read_config(fd, watch_file);
-+		else {
-+			if (event->len)
-+				watch_list_find(event->wd, event->name);
-+		}
-+
-+		i += EVENT_SIZE + event->len;
-+	}
-+	return 0;
-+}
-+
-+static void process_config(int fd, FILE * cfg)
-+{
-+	char *line_buf = NULL;
-+	size_t len = 0;
-+
-+	while (getline(&line_buf, &len, cfg) > 0) {
-+		char *buffer = line_buf;
-+		while (isspace(*buffer))
-+			buffer++;
-+		if (buffer[0] == '#')
-+			continue;
-+		int l = strlen(buffer) - 1;
-+		if (l <= 0)
-+			continue;
-+		buffer[l] = 0;
-+		if (buffer[0] == '~') {
-+			if (run_as_user) {
-+				char *ptr=NULL;
-+				asprintf(&ptr, "%s%s", homedir, &buffer[1]);
-+				watch_list_add(fd, ptr);
-+				free(ptr);
-+			} else {
-+				utmpwatcher_add(fd, &buffer[1]);
-+			}
-+		} else {
-+			watch_list_add(fd, buffer);
-+		}
-+	}
-+	free(line_buf);
-+}
-+
-+/* 
-+   Read config file ignoring Comment lines 
-+   Files specified one per line.  Files with "~" will be expanded to the logged in users
-+   homedirs.
-+*/
-+
-+void read_config(int fd, const char *watch_file_path)
-+{
-+
-+	FILE *cfg = NULL;
-+	if (debug_mode)
-+		printf("Read Config\n");
-+
-+	watch_list_free(fd);
-+
-+	cfg = fopen(watch_file_path, "r");
-+	if (!cfg){
-+		perror(watch_file_path);
-+		exitApp("Error reading config file");
-+	}
-+	process_config(fd, cfg);
-+	fclose(cfg);
-+
-+	inotify_rm_watch(fd, master_wd);
-+	master_wd =
-+	    inotify_add_watch(fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
-+	if (master_wd == -1)
-+		exitApp("Error watching config file.");
-+}
-+
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-20 12:53:16.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1180,7 +61,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/Makefile policycoreutils-2.0.71/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-20 12:53:16.000000000 -0400
 @@ -5,11 +5,12 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1197,7 +78,7 @@ diff --exclude-from=exclude --exclude=se
  	-mkdir -p $(MANDIR)/man8
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.71/scripts/sandbox
 --- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
@@ -1340,7 +221,7 @@ diff --exclude-from=exclude --exclude=se
 +    sys.exit(rc)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.71/scripts/sandbox.8
 --- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,22 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1366,7 +247,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/scripts/sandbox.py policycoreutils-2.0.71/scripts/sandbox.py
 --- nsapolicycoreutils/scripts/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,67 @@
 +#!/usr/bin/python
 +import os, sys, getopt, socket, random, fcntl
@@ -1437,7 +318,7 @@ diff --exclude-from=exclude --exclude=se
 +os.execvp(cmds[0], cmds)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage	2009-08-20 12:53:16.000000000 -0400
 @@ -68,6 +68,7 @@
  	-h, --help       Display this message
  	-n, --noheading  Do not print heading when listing OBJECTS
@@ -1547,7 +428,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.71/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-19 16:30:32.000000000 -0400
++++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-20 12:53:16.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 
@@ -1676,7 +557,7 @@ diff --exclude-from=exclude --exclude=se
  	def __init__(self, store = ""):
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.71/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-19 15:42:48.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-20 12:53:16.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1697,8 +578,8 @@ 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.71/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-19 15:42:48.000000000 -0400
-@@ -0,0 +1,531 @@
++++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-20 13:11:02.000000000 -0400
+@@ -0,0 +1,530 @@
 +#include "restore.h"
 +
 +#define SKIP -2
@@ -1807,7 +688,6 @@ diff --exclude-from=exclude --exclude=se
 +	int ret;
 +	char *context, *newcon;
 +	int user_only_changed = 0;
-+
 +	if (match(my_file, ftsent->fts_statp, &newcon) < 0)
 +		/* Check for no matching specification. */
 +		return (errno == ENOENT) ? 0 : -1;
@@ -2232,7 +1112,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/restore.h policycoreutils-2.0.71/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-19 15:42:48.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,50 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2286,7 +1166,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/setfiles/setfiles.c policycoreutils-2.0.71/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-08-12 12:08:15.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-19 15:42:48.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-20 12:53:16.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -p -r1.625 -r1.626
--- policycoreutils.spec	19 Aug 2009 20:25:21 -0000	1.625
+++ policycoreutils.spec	20 Aug 2009 19:05:32 -0000	1.626
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-7
+- Fix glob handling of /..
+
 * Wed Aug 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-6
 - Redesign restorecond to use setfiles/restore functionality
 



From akurtakov at fedoraproject.org  Thu Aug 20 19:16:44 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 19:16:44 +0000 (UTC)
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.33,
	1.34
Message-ID: <20090820191644.8643111C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4346/devel

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:
- Build requires java 6.


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- jakarta-commons-dbcp.spec	20 Aug 2009 18:58:45 -0000	1.33
+++ jakarta-commons-dbcp.spec	20 Aug 2009 19:16:44 -0000	1.34
@@ -34,7 +34,7 @@
 
 Name:           jakarta-commons-dbcp
 Version:        1.2.1
-Release:        13.6%{?dist}
+Release:        13.7%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons DataBase Pooling Package
 License:        ASL 2.0
@@ -69,6 +69,7 @@ BuildRequires:  jpackage-utils > 1.6
 BuildRequires:  junit >= 3.8
 BuildRequires:  jakarta-commons-pool-tomcat5
 BuildRequires:  jakarta-commons-collections-tomcat5
+BuildRequires:  java >= 1:1.6.0
 
 Requires(post):  /usr/sbin/update-alternatives
 Requires(preun):  /usr/sbin/update-alternatives
@@ -212,6 +213,9 @@ update-alternatives --install %{_javadir
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.1-13.7
+- Build requires java 6.
+
 * Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.1-13.6
 - Drop gcj support.
 - Fix build with java 6.
@@ -321,3 +325,4 @@ update-alternatives --install %{_javadir
 - 1.0 (cvs 20020606)
 - added short names in %%{_javadir}, as does jakarta developpers
 - first jPackage release
+



From dwalsh at fedoraproject.org  Thu Aug 20 19:17:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 20 Aug 2009 19:17:26 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.156,1.157
Message-ID: <20090820191726.B263A11C006E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4485

Modified Files:
	setroubleshoot.spec 
Log Message:
* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.21-2
- Turn on libpcap



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- setroubleshoot.spec	20 Aug 2009 11:39:48 -0000	1.156
+++ setroubleshoot.spec	20 Aug 2009 19:17:26 -0000	1.157
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.2.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -9,6 +9,7 @@ Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
+BuildRequires: libpcap-devel
 BuildRequires: intltool gettext python
 BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
 Requires: %{name}-server = %{version}-%{release} 
@@ -20,7 +21,7 @@ Requires: python-bugzilla python-slip-db
 Requires: polkit
 Requires: gnome-python2-gnomekeyring
 Requires(post): /usr/bin/update-desktop-database
-Requires(post): dbus
+Requires(post): dbus libpcap
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
@@ -209,6 +210,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.21-2
+- Turn on libpcap
+
 * Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.21-1
 - Turn on copy to clipboard button
 



From toshio at fedoraproject.org  Thu Aug 20 19:19:26 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:19:26 +0000 (UTC)
Subject: rpms/dbus-sharp/F-11 dbus-sharp.spec,1.13,1.14
Message-ID: <20090820191926.E7D4C11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/dbus-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4770

Modified Files:
	dbus-sharp.spec 
Log Message:
New build because the previous one was obsoleted in an unexpected bodhi-interaction



Index: dbus-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-sharp/F-11/dbus-sharp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dbus-sharp.spec	17 Jun 2009 12:22:06 -0000	1.13
+++ dbus-sharp.spec	20 Aug 2009 19:19:26 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: C# bindings for D-Bus
 Name: dbus-sharp
 Version: 0.63
-Release: 12%{?dist}.1
+Release: 13%{?dist}.1
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL or GPLv2
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dbus-sharp.pc
 
 %changelog
+* 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
+
 * Wed Jun 17 2009 Karsten Hopp <karsten at redhat.com> 0.63-12.1
 - mono is now available on s390x
 



From emaldonado at fedoraproject.org  Thu Aug 20 19:20:44 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 20 Aug 2009 19:20:44 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.2,1.3
Message-ID: <20090820192044.D95CE11C0417@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5209

Modified Files:
	nss-softokn.spec 
Log Message:
Disabled building binary contents until nss-util conflicts with nss are resolved - bug 518460


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-softokn.spec	20 Aug 2009 01:18:24 -0000	1.2
+++ nss-softokn.spec	20 Aug 2009 19:20:44 -0000	1.3
@@ -5,29 +5,32 @@
 %global saved_files_dir %{_libdir}/nss/saved
 
 # Produce .chk files for the final stripped binaries
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
-%{nil}
+# %define __spec_install_post \
+#    %{?__debug_package:%{__debug_install_post}} \
+#    %{__arch_install_post} \
+#    %{__os_install_post} \
+#    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+#    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+#    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
+#%{nil}
 
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          8%{?dist}
+Release:          8.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-softokn-freebl%{_isa} >= %{version}
-Requires:         sqlite
-Requires:         nss-util >= %{nssutil_version}
+# FIXME Commenting out all requires as part of disabling building
+# This package and nss-util cause conflicts with nss.
+#Requires:         nspr >= %{nspr_version}
+#Requires:         nss-util >= %{version}
+#Requires:         nss-softokn-freebl%{_isa} >= %{version}
+#Requires:         sqlite
+#Requires:         nss-util >= %{nssutil_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-util-devel >= %{nssutil_version}
+#BuildRequires:    nss-util-devel >= %{nssutil_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -60,27 +63,28 @@ Patch2:           nss-stubs-bug502133.pa
 %description
 Network Security Services Softoken Cryptographic Module
 
-%package freebl
-Summary:          Freebl library for the Network Security Services
-Group:            System Environment/Base
-Conflicts:        nss < 3.12.2.99.3-5
-
-%description freebl
-Network Security Services Softoken Cryptographic Module Freelb Library.
-
-Install the nss-softokn-freebl package if you need the freebl 
-library.
-
-%package devel
-Summary:          Development libraries for Network Security Services
-Group:            Development/Libraries
-Requires:         nss-softokn = %{version}-%{release}
-Requires:         nspr-devel >= %{nspr_version}
-Requires:         nss-util-devel >= %{nsutil_version}
-Requires:         pkgconfig
+#%package freebl
+#Summary:          Freebl library for the Network Security Services
+#Group:            System Environment/Base
+#Conflicts:        nss < 3.12.2.99.3-5
 
-%description devel
-Header and Library files for doing development with Network Security Services.
+#%description freebl
+#Network Security Services Softoken Cryptographic Module Freelb Library.
+#
+#Install the nss-softokn-freebl package if you need the freebl 
+#library.
+
+#%package devel
+#Summary:          Development libraries for Network Security Services
+#Group:            Development/Libraries
+#Obsoletes:	      nss-devel < 3.12.3.99.3-8
+#Requires:         nss-softokn = %{version}-%{release}
+#Requires:         nspr-devel >= %{nspr_version}-%{nssutil_release}
+#Requires:         nss-util-devel >= %{nsutil_version}
+#Requires:         pkgconfig
+
+#%description devel
+#Header and Library files for doing development with Network Security Services.
 
 
 %prep
@@ -130,9 +134,9 @@ export USE_64
 %endif
 
 # Compile softkn plus needed support
-%{__make} -C ./mozilla/security/coreconf
-%{__make} -C ./mozilla/security/dbm
-%{__make} -C ./mozilla/security/nss
+#%{__make} -C ./mozilla/security/coreconf
+#%{__make} -C ./mozilla/security/dbm
+#%{__make} -C ./mozilla/security/nss
 
 # Set up our package file
 %{__mkdir_p} ./mozilla/dist/pkgconfig
@@ -190,39 +194,40 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
-do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
+# FIXME - restore when nss-util is fixed
+#for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
+#do
+#  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+#  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+#done
 
 # Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
-do
-  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
+#for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
+#do
+#  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+#done
 
 # install our prelink configuration file
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
+#%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 # and stash a copy away in a safe place
-%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf
+#%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf
 
 # Copy the binaries we ship as unsupported
-for file in shlibsign
-do
-  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-done
+#for file in shlibsign
+#do
+#  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+#done
 
 # Copy the include files we want
-for file in mozilla/dist/public/nss/*.h
-do
-  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
-done
+#for file in mozilla/dist/public/nss/*.h
+#do
+#  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+#done
 
 # Copy the package configuration files
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
+#%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+#%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -233,61 +238,61 @@ done
 # This trigger scriptlet is run when:
 # 1) nss-softokn is already installed, and prelink is installed or upgraded
 # 2) prelink is already installed, and nss-softokn is installed or upgraded
-%triggerin -- prelink
-%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
- %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%triggerin -- prelink
+#%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
+# %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 # This trigger scriptlet is run when:
 # 1) prelink is installed, and nss-softokn removed
 # 2) nss-softokn is installed, and prelink gets removed
-%triggerun -- prelink
-[ $2 = 0 ] || exit 0
-%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%triggerun -- prelink
+#[ $2 = 0 ] || exit 0
+#%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %post
-/sbin/ldconfig >/dev/null 2>/dev/null
+#/sbin/ldconfig >/dev/null 2>/dev/null
 
 %postun
-/sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#/sbin/ldconfig >/dev/null 2>/dev/null
+#[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %files
-%defattr(-,root,root)
-/%{_lib}/libnssdbm3.so
-/%{_lib}/libnssdbm3.chk
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
+#%defattr(-,root,root)
+#/%{_lib}/libnssdbm3.so
+#/%{_lib}/libnssdbm3.chk
+#/%{_lib}/libsoftokn3.so
+#/%{_lib}/libsoftokn3.chk
 # shared with nss-tools
-%dir %{_libdir}/nss
-%dir %{saved_files_dir}
-%dir %{unsupported_tools_directory}
-%{unsupported_tools_directory}/shlibsign
-%{saved_files_dir}/nss-softokn-prelink.conf
+#%dir %{_libdir}/nss
+#%dir %{saved_files_dir}
+#%dir %{unsupported_tools_directory}
+#%{unsupported_tools_directory}/shlibsign
+#%{saved_files_dir}/nss-softokn-prelink.conf
 # we don't own %{_sysconfdir}/prelink.conf.d and
 # must rely on triggers to install and remove our
 # configuration file
-%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
-%files freebl
-%defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
-%{_libdir}/libnssdbm3.so
-%{_libdir}/libnssdbm3.chk
-%{_libdir}/pkgconfig/nss-softokn.pc
-%{_bindir}/nss-softokn-config
+#%files freebl
+#%defattr(-,root,root)
+#/%{_lib}/libfreebl3.so
+#/%{_lib}/libfreebl3.chk
+
+#%files devel
+#%defattr(-,root,root)
+#%{_libdir}/libsoftokn3.so
+#%{_libdir}/libsoftokn3.chk
+#%{_libdir}/libfreebl3.so
+#%{_libdir}/libfreebl3.chk
+#%{_libdir}/libnssdbm3.so
+#%{_libdir}/libnssdbm3.chk
+#%{_libdir}/pkgconfig/nss-softokn.pc
+#%{_bindir}/nss-softokn-config
 
 # co-owned with nss
-%dir %{_includedir}/nss3
+# %dir %{_includedir}/nss3
 #
 # The following headers are those exported public in
 # mozilla/security/nss/lib/freebl/manifest.mn and
@@ -297,14 +302,16 @@ done
 # the pkcs #11 ones, have been provided by nss-util-devel
 # which installed them before us.
 #
-%{_includedir}/nss3/blapit.h
-%{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/hasht.h
-%{_includedir}/nss3/sechash.h
-%{_includedir}/nss3/nsslowhash.h
-%{_includedir}/nss3/secmodt.h
-%{_includedir}/nss3/shsign.h
+#%{_includedir}/nss3/blapit.h
+#%{_includedir}/nss3/ecl-exp.h
+#%{_includedir}/nss3/hasht.h
+#%{_includedir}/nss3/sechash.h
+#%{_includedir}/nss3/nsslowhash.h
+#%{_includedir}/nss3/secmodt.h
+#%{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8.1
+- Disable installing until conflicts are relsoved
 * Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
 - Initial build



From toshio at fedoraproject.org  Thu Aug 20 19:22:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:22:07 +0000 (UTC)
Subject: rpms/bless/F-11 bless.spec,1.5,1.6
Message-ID: <20090820192207.7F9DE11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bless/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5485

Modified Files:
	bless.spec 
Log Message:
Rebuild because of the previous build was obsoleted in an unexpected bodhi
interaction.



Index: bless.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bless/F-11/bless.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bless.spec	25 May 2009 22:52:57 -0000	1.5
+++ bless.spec	20 Aug 2009 19:22:07 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name: bless
 Version: 0.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: High quality, full featured hex editor    
 
 Group: Applications/Editors         
@@ -13,7 +13,6 @@ Source0: http://download.gna.org/%{name}
 Patch1: bless-0.6.0-buildfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 BuildRequires: mono-devel
 BuildRequires: gtk-sharp2-devel     
 BuildRequires: desktop-file-utils
@@ -78,6 +77,9 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/bless/
 
 %changelog
+* 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
+
 * Mon May 25 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.6.0-3
 - Build arch ppc64.
 



From pfrields at fedoraproject.org  Thu Aug 20 19:23:42 2009
From: pfrields at fedoraproject.org (Paul W. Frields)
Date: Thu, 20 Aug 2009 19:23:42 +0000 (UTC)
Subject: rpms/zikula/EL-5 zikula.spec,1.1,1.2
Message-ID: <20090820192342.4353511C006E@cvs1.fedora.phx.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/zikula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563

Modified Files:
	zikula.spec 
Log Message:
Fix deps for PHP >= 4.3 as upstream docs say


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/zikula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zikula.spec	20 Mar 2009 16:11:30 -0000	1.1
+++ zikula.spec	20 Aug 2009 19:23:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:	Applications/Publishing
 License: GPLv2+
@@ -17,9 +17,9 @@ Patch: %{name}-%{version}-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 5.2.0
-Requires: php-mysql >= 5.2.0
-Requires: php-pgsql >= 5.2.0
+Requires: php >= 4.3
+Requires: php-mysql >= 4.3
+Requires: php-pgsql >= 4.3
 Requires(pre): policycoreutils
 
 %description
@@ -91,6 +91,9 @@ ln -sf /usr/share/doc/zikula-1.1.1 /usr/
 symlinks -crs /usr/share/zikula || :
 
 %changelog
+* Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
+- Upstream docs advise that PHP >= 4.3 is correct requirement
+
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 



From pfrields at fedoraproject.org  Thu Aug 20 19:25:10 2009
From: pfrields at fedoraproject.org (Paul W. Frields)
Date: Thu, 20 Aug 2009 19:25:10 +0000 (UTC)
Subject: rpms/zikula/F-10 zikula.spec,1.1,1.2
Message-ID: <20090820192510.83E1811C006E@cvs1.fedora.phx.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/zikula/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6859/F-10

Modified Files:
	zikula.spec 
Log Message:
Fix deps for F-10 and F-11 as in EL-5


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/zikula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zikula.spec	20 Mar 2009 16:09:29 -0000	1.1
+++ zikula.spec	20 Aug 2009 19:25:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:	Applications/Publishing
 License: GPLv2+
@@ -17,9 +17,9 @@ Patch: %{name}-%{version}-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 5.2.0
-Requires: php-mysql >= 5.2.0
-Requires: php-pgsql >= 5.2.0
+Requires: php >= 4.3
+Requires: php-mysql >= 4.3
+Requires: php-pgsql >= 4.3
 Requires(pre): policycoreutils
 
 %description
@@ -91,6 +91,9 @@ ln -sf /usr/share/doc/zikula-1.1.1 /usr/
 symlinks -crs /usr/share/zikula || :
 
 %changelog
+* Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
+- Upstream docs advise that PHP >= 4.3 is correct requirement
+
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 



From pfrields at fedoraproject.org  Thu Aug 20 19:25:10 2009
From: pfrields at fedoraproject.org (Paul W. Frields)
Date: Thu, 20 Aug 2009 19:25:10 +0000 (UTC)
Subject: rpms/zikula/F-11 zikula.spec,1.1,1.2
Message-ID: <20090820192510.BB9B411C02CC@cvs1.fedora.phx.redhat.com>

Author: pfrields

Update of /cvs/pkgs/rpms/zikula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6859/F-11

Modified Files:
	zikula.spec 
Log Message:
Fix deps for F-10 and F-11 as in EL-5


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/zikula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zikula.spec	20 Mar 2009 16:03:44 -0000	1.1
+++ zikula.spec	20 Aug 2009 19:25:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:	Applications/Publishing
 License: GPLv2+
@@ -17,9 +17,9 @@ Patch: %{name}-%{version}-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 5.2.0
-Requires: php-mysql >= 5.2.0
-Requires: php-pgsql >= 5.2.0
+Requires: php >= 4.3
+Requires: php-mysql >= 4.3
+Requires: php-pgsql >= 4.3
 Requires(pre): policycoreutils
 
 %description
@@ -91,6 +91,9 @@ ln -sf /usr/share/doc/zikula-1.1.1 /usr/
 symlinks -crs /usr/share/zikula || :
 
 %changelog
+* Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
+- Upstream docs advise that PHP >= 4.3 is correct requirement
+
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 



From toshio at fedoraproject.org  Thu Aug 20 19:26:28 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:26:28 +0000 (UTC)
Subject: rpms/gmime/F-11 gmime.spec,1.47,1.48
Message-ID: <20090820192628.2737211C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gmime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7221

Modified Files:
	gmime.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4.3-6
- Rebuild due to previous builds being obsoleted unexpectedly



Index: gmime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmime/F-11/gmime.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gmime.spec	8 Jun 2009 21:55:41 -0000	1.47
+++ gmime.spec	20 Aug 2009 19:26:27 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.4.3
-Release:        5%{?dist}.1
+Release:        6%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4.3-6
+- Rebuild due to previous builds being obsoleted unexpectedly
+
 * Mon Jun 08 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.3-5.1
 - dont build with mono support on sparc arches 
 



From caolanm at fedoraproject.org  Thu Aug 20 19:28:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 20 Aug 2009 19:28:15 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.228, 1.229 sources, 1.372,
	1.373
Message-ID: <20090820192815.EB2A811C006E@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7707

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- .cvsignore	7 Aug 2009 09:10:39 -0000	1.228
+++ .cvsignore	20 Aug 2009 19:28:15 -0000	1.229
@@ -9,5 +9,4 @@ openoffice.org-javafilter.desktop
 or-IN_DEV300_m40.sdf
 acor_en-GB.dat
 acor_en-ZA.dat
-OOO310_m17.tar.bz2
-OOO310_m18.tar.bz2
+OOO310_m19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- sources	7 Aug 2009 13:58:22 -0000	1.372
+++ sources	20 Aug 2009 19:28:15 -0000	1.373
@@ -9,4 +9,4 @@ ffa417a9556cdb16028c83718d758bc7  redhat
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 f3842c64faf98fe9a8752e4a820c97bc  acor_en-GB.dat
 bccdb30725b178260e5ce74d0ad27879  acor_en-ZA.dat
-1f7711384c49a2fef4abb02053e5949f  OOO310_m18.tar.bz2
+e95de733b1ac6e885515ee8bcca87998  OOO310_m19.tar.bz2



From overholt at fedoraproject.org  Thu Aug 20 19:29:24 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 19:29:24 +0000 (UTC)
Subject: rpms/modello/devel .cvsignore, 1.2,
	1.3 modello-build-all-plugins.patch, 1.1,
	1.2 modello-jpp-depmap.xml, 1.1, 1.2 modello.script, 1.1,
	1.2 modello.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090820192924.77AA311C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/modello/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7958

Modified Files:
	.cvsignore modello-build-all-plugins.patch 
	modello-jpp-depmap.xml modello.script modello.spec sources 
Log Message:
* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.4.a15.0.1
- Update to alpha 15 courtesy Deepak Bhole


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/modello/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2007 07:07:55 -0000	1.2
+++ .cvsignore	20 Aug 2009 19:29:24 -0000	1.3
@@ -1 +1 @@
-modello-1.0-alpha-8-src.tar.gz
+modello-1.0-alpha-15-src.tar.gz

modello-build-all-plugins.patch:
 modello-plugins-sandbox/pom.xml |    1 +
 pom.xml                         |    1 +
 2 files changed, 2 insertions(+)

Index: modello-build-all-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/modello/devel/modello-build-all-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modello-build-all-plugins.patch	20 Mar 2007 07:07:55 -0000	1.1
+++ modello-build-all-plugins.patch	20 Aug 2009 19:29:24 -0000	1.2
@@ -1,20 +1,22 @@
---- ./modello-plugins-sandbox/pom.xml.sav	2006-06-13 17:26:21.000000000 -0400
-+++ ./modello-plugins-sandbox/pom.xml	2006-06-13 17:26:33.000000000 -0400
-@@ -20,6 +20,7 @@
-     </dependency>
+diff -up ./modello-plugins-sandbox/pom.xml.sav ./modello-plugins-sandbox/pom.xml
+--- ./modello-plugins-sandbox/pom.xml.sav	2008-06-18 17:06:26.000000000 -0400
++++ ./modello-plugins-sandbox/pom.xml	2008-06-18 17:06:37.000000000 -0400
+@@ -21,6 +21,7 @@
    </dependencies>
    <modules>
-+    <module>modello-plugin-dom4j</module>
-     <module>modello-plugin-hibernate-old</module>
+     <module>modello-plugin-ojb</module>  
++    <module>modello-plugin-prevayler</module>  
+     <!--
      <module>modello-plugin-jdbc</module>
-     <module>modello-plugin-ojb</module>
---- ./pom.xml.sav	2006-01-11 22:40:51.000000000 -0500
-+++ ./pom.xml	2006-06-13 17:26:12.000000000 -0400
-@@ -161,6 +161,7 @@
-     <module>modello-core</module>
+     <module>modello-plugin-velocity</module>
+diff -up ./pom.xml.sav ./pom.xml
+--- ./pom.xml.sav	2008-06-18 17:06:01.000000000 -0400
++++ ./pom.xml	2008-06-18 17:06:18.000000000 -0400
+@@ -157,6 +157,7 @@
+     <module>modello-db-keywords</module>
      <module>modello-test</module>
      <module>modello-plugins</module>
-+	<module>modello-plugins-sandbox</module>
++    <module>modello-plugins-sandbox</module>
    </modules>
-   <dependencies>
-     <dependency>
+   <repositories>
+     <repository>


Index: modello-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/modello/devel/modello-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modello-jpp-depmap.xml	20 Mar 2007 07:07:55 -0000	1.1
+++ modello-jpp-depmap.xml	20 Aug 2009 19:29:24 -0000	1.2
@@ -12,6 +12,43 @@
 	</jpp>
   </dependency>
 
+  <dependency>
+	<maven>
+	  <groupId>org.codehaus.plexus</groupId>
+	  <artifactId>plexus-component-api</artifactId>
+	  <version>1.0-alpha-15</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/plexus</groupId>
+	  <artifactId>container-default</artifactId>
+	  <version>1.0-alpha-8</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.codehaus.plexus</groupId>
+	  <artifactId>containers-containers-default</artifactId>
+	  <version>1.0-alpha-15</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/plexus</groupId>
+	  <artifactId>container-default</artifactId>
+	  <version>1.0-alpha-8</version>
+	</jpp>
+  </dependency>
+  <dependency>
+      <maven>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-interactivity-api</artifactId>
+          <version>1.0-alpha-4</version>
+      </maven>
+      <jpp>
+          <groupId>JPP/plexus</groupId>
+          <artifactId>interactivity-api</artifactId>
+          <version>1.0-alpha-1</version>
+      </jpp>
+  </dependency>
   <!-- unnecessary jars -->
   <dependency>
 	<maven>
@@ -37,5 +74,54 @@
 	</maven>
   </dependency>
 
+  <!-- jars needed for test only, that we don't have yet in Fedora -->
+  <dependency>
+    <maven>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.3.1</version>
+    </maven>
+  </dependency>
+
+  <dependency>
+    <maven>
+      <groupId>jpox</groupId>
+      <artifactId>jpox-enhancer</artifactId>
+      <version>1.1.1</version>
+    </maven>
+  </dependency>
+
+  <dependency>
+    <maven>
+      <groupId>jpox</groupId>
+      <artifactId>jpox</artifactId>
+      <version>1.1.1</version>
+    </maven>
+  </dependency>
+
+  <dependency>
+    <maven>
+      <groupId>net.java.dev.stax-utils</groupId>
+      <artifactId>stax-utils</artifactId>
+      <version>20060502</version>
+    </maven>
+  </dependency>
+
+  <dependency>
+    <maven>
+      <groupId>woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+      <version>3.2.0</version>
+    </maven>
+  </dependency>
+
+  <dependency>
+    <maven>
+      <groupId>org.codehaus.plexus.registry</groupId>
+      <artifactId>plexus-registry-commons</artifactId>
+      <version>1.0-alpha-2</version>
+    </maven>
+  </dependency>
+
 </dependencies>
 


Index: modello.script
===================================================================
RCS file: /cvs/pkgs/rpms/modello/devel/modello.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modello.script	20 Mar 2007 07:07:55 -0000	1.1
+++ modello.script	20 Aug 2009 19:29:24 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
-export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/utils classworlds)
+export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/containers-container-default plexus/utils plexus/classworlds)
 ${JAVA_HOME}/bin/java org.codehaus.modello.ModelloCli $@


Index: modello.spec
===================================================================
RCS file: /cvs/pkgs/rpms/modello/devel/modello.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- modello.spec	25 Jul 2009 14:56:15 -0000	1.5
+++ modello.spec	20 Aug 2009 19:29:24 -0000	1.6
@@ -34,44 +34,38 @@
 
 %define repo_dir    .m2/repository
 
-%define namedversion 1.0-alpha-8
+%define namedversion 1.0-alpha-15
 %define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
 
 Name:           modello
 Version:        1.0
-Release:        0.3.a8.4.4%{?dist}
+Release:        0.4.a15.0.1%{?dist}
 Epoch:          0
 Summary:        Modello Data Model toolkit
 License:        MIT  
 Group:          Development/Java
 URL:            http://modello.codehaus.org/
 Source0:        %{name}-%{namedversion}-src.tar.gz
-# svn export svn://svn.modello.codehaus.org/modello/tags/modello-1.0-alpha-8/
-# tar czf modello-1.0-alpha-8-src.tar.gz modello-1.0-alpha-8/
+# svn export https://svn.codehaus.org/modello/tags/modello-1.0-alpha-15/
+# tar czf modello-1.0-alpha-15-src.tar.gz modello-1.0-alpha-15/
 Source1:        modello.script
 
 Source2:                %{name}-jpp-depmap.xml
 
 Patch0:                 modello-hibernateold-artifactid-fix.patch
 Patch1:                 modello-build-all-plugins.patch
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-%if ! %{gcj_support}
+Patch2:                 modello-use-old-pdcontainer.patch
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2 >= 2.0.4-9
+BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-plugin-plugin
@@ -113,17 +107,15 @@ Java model to [JPOX|http://www.jpox.org/
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-%patch0 -b .sav
+#%patch0 -b .sav
 %patch1 -b .sav
+%patch2 -b .sav
 
 find . -name release-pom.xml -exec rm -f '{}' \;
 
@@ -143,10 +135,35 @@ mkdir -p $MAVEN_REPO_LOCAL
 
 mvn-jpp \
         -e \
-                -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-                -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+        install
+
+# Manual iteration should not be needed, but there is a bug in the javadoc 
+# plugin which makes this necessary. See: 
+# http://jira.codehaus.org/browse/MJAVADOC-157
+for dir in modello-*; do
+    pushd $dir
+        mvn-jpp \
+          -e \
+          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+          -Dmaven.test.failure.ignore=true \
+          javadoc:javadoc
+    popd
+done
+
+for dir in modello-plugins/modello-plugin-*; do
+    pushd $dir
+        mvn-jpp \
+          -e \
+          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+          -Dmaven.test.failure.ignore=true \
+          javadoc:javadoc
+    popd
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -191,60 +208,43 @@ done
 # Do it again for sandbox plugins, which have a different version
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-1.0-alpha-4-SNAPSHOT*; do ln -sf ${jar} `echo $jar| sed  "s|-1.0-alpha-4-SNAPSHOT||g"`; done)
 
+# Prevayler is in a sandbox and has a different version
+ln -s plugin-prevayler-1.0-alpha-12-SNAPSHOT.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/plugin-prevayler.jar
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 for target in $(find -type d -name target); do
-  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
-  cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
+  if [ -d $target/site/apidocs ]; then
+    install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
+    cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
+  fi
 done
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
-
 %files
 %defattr(-,root,root,-)
 %{_datadir}/maven2
-%dir %{_javadir}/%{name}
 %{_javadir}/%{name}
 %attr(755,root,root) %{_bindir}/*
 %{_mavendepmapfragdir}
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.jar.*
-%endif
-%config(noreplace) /etc/maven/fragments/modello
-
 
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
-
 %changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.4.a15.0.1
+- Update to alpha 15 courtesy Deepak Bhole
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.3.a8.4.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/modello/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2007 07:07:55 -0000	1.2
+++ sources	20 Aug 2009 19:29:24 -0000	1.3
@@ -1 +1 @@
-343dd17dd1cf37d619d72186c0769e7d  modello-1.0-alpha-8-src.tar.gz
+9642d452add138cffe2f494ad94fa99c  modello-1.0-alpha-15-src.tar.gz



From akurtakov at fedoraproject.org  Thu Aug 20 19:29:48 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 19:29:48 +0000 (UTC)
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.34,
	1.35
Message-ID: <20090820192948.7034011C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8163/devel

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:
BuildRequires java-devel not java


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- jakarta-commons-dbcp.spec	20 Aug 2009 19:16:44 -0000	1.34
+++ jakarta-commons-dbcp.spec	20 Aug 2009 19:29:48 -0000	1.35
@@ -69,7 +69,7 @@ BuildRequires:  jpackage-utils > 1.6
 BuildRequires:  junit >= 3.8
 BuildRequires:  jakarta-commons-pool-tomcat5
 BuildRequires:  jakarta-commons-collections-tomcat5
-BuildRequires:  java >= 1:1.6.0
+BuildRequires:  java-devel >= 1:1.6.0
 
 Requires(post):  /usr/sbin/update-alternatives
 Requires(preun):  /usr/sbin/update-alternatives



From caolanm at fedoraproject.org  Thu Aug 20 19:30:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 20 Aug 2009 19:30:25 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1985,1.1986
Message-ID: <20090820193025.E109A11C0439@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8352

Modified Files:
	openoffice.org.spec 
Log Message:
latest milestone


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1985
retrieving revision 1.1986
diff -u -p -r1.1985 -r1.1986
--- openoffice.org.spec	19 Aug 2009 08:20:39 -0000	1.1985
+++ openoffice.org.spec	20 Aug 2009 19:30:25 -0000	1.1986
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 18
-%define rh_rpm_release 3
+%define ooomilestone 19
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4206,8 +4206,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.3
-- Related: rhbz#517822 add hyphen-mr
+* Thu Aug 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
+- latest milestone
+- Related: rhbz#517822 add hyphen-mr depend
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 
 * Tue Aug 18 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-18.2



From joshkayse at fedoraproject.org  Thu Aug 20 19:30:58 2009
From: joshkayse at fedoraproject.org (joshkayse)
Date: Thu, 20 Aug 2009 19:30:58 +0000 (UTC)
Subject: rpms/eclipse-anyedit/F-11 assemble.xml, NONE,
	1.1 eclipse-anyedit-2.2.0-unicode.patch, NONE,
	1.1 eclipse-anyedit.spec, NONE, 1.1 package.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820193058.0190311C0347@cvs1.fedora.phx.redhat.com>

Author: joshkayse

Update of /cvs/pkgs/rpms/eclipse-anyedit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8269

Modified Files:
	.cvsignore sources 
Added Files:
	assemble.xml eclipse-anyedit-2.2.0-unicode.patch 
	eclipse-anyedit.spec package.xml 
Log Message:
Initial creation of eclipse-anyedit.  Imported from srpm



--- NEW FILE assemble.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project default="gather.bin.parts" name="build">
        <target name="gather.bin.parts">
                <ant antfile="${sourceDirectory}/build.xml" dir="${sourceDirectory}" target="gather.bin.parts"/>
        </target>
</project>

eclipse-anyedit-2.2.0-unicode.patch:
 TextUtil.java |  188 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

--- NEW FILE eclipse-anyedit-2.2.0-unicode.patch ---
# This patch was generated with:

#!/bin/bash
for char in ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?
  do
    newchar=$(echo $char | od -x -N1 | tr 'a-f' 'A-F' | head -1 | awk '{print "\\u"$2}')
    export char newchar
    perl -pi -e 's/$ENV{char}/$ENV{newchar}/g' $1
  done

--- eclipse-anyedit-2.1.1/src/de/loskutov/anyedit/util/TextUtil.java	2008-10-11 20:38:10.000000000 -0400
+++ eclipse-anyedit-2.1.1/src/de/loskutov/anyedit/util/TextUtil.java	2008-10-11 20:38:21.000000000 -0400
@@ -894,53 +894,53 @@ public class TextUtil {
             "&gt;", ">" }, {
             "&amp;", "&" }, {
             "&quot;", "\"" }, {
-            "&agrave;", "?" }, {
-            "&Agrave;", "?" }, {
-            "&acirc;", "?" }, {
-            "&auml;", "?" }, {
-            "&Auml;", "?" }, {
-            "&Acirc;", "?" }, {
-            "&aring;", "?" }, {
-            "&Aring;", "?" }, {
-            "&aelig;", "?" }, {
-            "&AElig;", "?" }, {
-            "&ccedil;", "?" }, {
-            "&Ccedil;", "?" }, {
-            "&eacute;", "?" }, {
-            "&Eacute;", "?" }, {
-            "&aacute;", "?" }, {
-            "&Aacute;", "?" }, {
-            "&egrave;", "?" }, {
-            "&Egrave;", "?" }, {
-            "&ecirc;", "?" }, {
-            "&Ecirc;", "?" }, {
-            "&euml;", "?" }, {
-            "&Euml;", "?" }, {
-            "&iuml;", "?" }, {
-            "&Iuml;", "?" }, {
-            "&iacute;", "?" }, {
-            "&Iacute;", "?" }, {
-            "&atilde;", "?" }, {
-            "&Atilde;", "?" }, {
-            "&otilde;", "?" }, {
-            "&Otilde;", "?" }, {
-            "&oacute;", "?" }, {
-            "&Oacute;", "?" }, {
-            "&ocirc;", "?" }, {
-            "&Ocirc;", "?" }, {
-            "&ouml;", "?" }, {
-            "&Ouml;", "?" }, {
-            "&oslash;", "?" }, {
-            "&Oslash;", "?" }, {
-            "&szlig;", "?" }, {
-            "&ugrave;", "?" }, {
-            "&Ugrave;", "?" }, {
-            "&uacute;", "?" }, {
-            "&Uacute;", "?" }, {
-            "&ucirc;", "?" }, {
-            "&Ucirc;", "?" }, {
-            "&uuml;", "?" }, {
-            "&Uuml;", "?" }, {
+            "&agrave;", "\u00E0" }, {
+            "&Agrave;", "\u00C0" }, {
+            "&acirc;", "\u00E2" }, {
+            "&auml;", "\u00E4" }, {
+            "&Auml;", "\u00C4" }, {
+            "&Acirc;", "\u00C2" }, {
+            "&aring;", "\u00E5" }, {
+            "&Aring;", "\u00C5" }, {
+            "&aelig;", "\u00E6" }, {
+            "&AElig;", "\u00C6" }, {
+            "&ccedil;", "\u00E7" }, {
+            "&Ccedil;", "\u00C7" }, {
+            "&eacute;", "\u00E9" }, {
+            "&Eacute;", "\u00C9" }, {
+            "&aacute;", "\u00E1" }, {
+            "&Aacute;", "\u00C1" }, {
+            "&egrave;", "\u00E8" }, {
+            "&Egrave;", "\u00C8" }, {
+            "&ecirc;", "\u00EA" }, {
+            "&Ecirc;", "\u00CA" }, {
+            "&euml;", "\u00EB" }, {
+            "&Euml;", "\u00CB" }, {
+            "&iuml;", "\u00EF" }, {
+            "&Iuml;", "\u00CF" }, {
+            "&iacute;", "\u00ED" }, {
+            "&Iacute;", "\u00CD" }, {
+            "&atilde;", "\u00E3" }, {
+            "&Atilde;", "\u00C3" }, {
+            "&otilde;", "\u00F5" }, {
+            "&Otilde;", "\u00D5" }, {
+            "&oacute;", "\u00F3" }, {
+            "&Oacute;", "\u00D3" }, {
+            "&ocirc;", "\u00F4" }, {
+            "&Ocirc;", "\u00D4" }, {
+            "&ouml;", "\u00F6" }, {
+            "&Ouml;", "\u00D6" }, {
+            "&oslash;", "\u00F8" }, {
+            "&Oslash;", "\u00D8" }, {
+            "&szlig;", "\u00DF" }, {
+            "&ugrave;", "\u00F9" }, {
+            "&Ugrave;", "\u00D9" }, {
+            "&uacute;", "\u00FA" }, {
+            "&Uacute;", "\u00DA" }, {
+            "&ucirc;", "\u00FB" }, {
+            "&Ucirc;", "\u00DB" }, {
+            "&uuml;", "\u00FC" }, {
+            "&Uuml;", "\u00DC" }, {
             "&nbsp;", " " }, {
             "&reg;", "\u00AE" }, {
             "&copy;", "\u00A9" }, {
@@ -963,99 +963,99 @@ public class TextUtil {
             return "&amp;";
         case '"':
             return "&quot;";
-        case '?':
+        case '\u00E0':
             return "&agrave;";
-        case '?':
+        case '\u00E1':
             return "&aacute;";
-        case '?':
+        case '\u00C0':
             return "&Agrave;";
-        case '?':
+        case '\u00C1':
             return "&Aacute;";
-        case '?':
+        case '\u00E2':
             return "&acirc;";
-        case '?':
+        case '\u00C2':
             return "&Acirc;";
-        case '?':
+        case '\u00E4':
             return "&auml;";
-        case '?':
+        case '\u00C4':
             return "&Auml;";
-        case '?':
+        case '\u00E5':
             return "&aring;";
-        case '?':
+        case '\u00C5':
             return "&Aring;";
-        case '?':
+        case '\u00E3':
             return "&atilde;";
-        case '?':
+        case '\u00C3':
             return "&Atilde;";
-        case '?':
+        case '\u00E6':
             return "&aelig;";
-        case '?':
+        case '\u00C6':
             return "&AElig;";
-        case '?':
+        case '\u00E7':
             return "&ccedil;";
-        case '?':
+        case '\u00C7':
             return "&Ccedil;";
-        case '?':
+        case '\u00E9':
             return "&eacute;";
-        case '?':
+        case '\u00C9':
             return "&Eacute;";
-        case '?':
+        case '\u00E8':
             return "&egrave;";
-        case '?':
+        case '\u00C8':
             return "&Egrave;";
-        case '?':
+        case '\u00EA':
             return "&ecirc;";
-        case '?':
+        case '\u00CA':
             return "&Ecirc;";
-        case '?':
+        case '\u00EB':
             return "&euml;";
-        case '?':
+        case '\u00CB':
             return "&Euml;";
-        case '?':
+        case '\u00ED':
             return "&iacute;";
-        case '?':
+        case '\u00CD':
             return "&Iacute;";
-        case '?':
+        case '\u00EF':
             return "&iuml;";
-        case '?':
+        case '\u00CF':
             return "&Iuml;";
-        case '?':
+        case '\u00F5':
             return "&otilde;";
-        case '?':
+        case '\u00D5':
             return "&Otilde;";
-        case '?':
+        case '\u00F3':
             return "&oacute;";
-        case '?':
+        case '\u00F4':
             return "&ocirc;";
-        case '?':
+        case '\u00D3':
             return "&Oacute;";
-        case '?':
+        case '\u00D4':
             return "&Ocirc;";
-        case '?':
+        case '\u00F6':
             return "&ouml;";
-        case '?':
+        case '\u00D6':
             return "&Ouml;";
-        case '?':
+        case '\u00F8':
             return "&oslash;";
-        case '?':
+        case '\u00D8':
             return "&Oslash;";
-        case '?':
+        case '\u00DF':
             return "&szlig;";
-        case '?':
+        case '\u00F9':
             return "&ugrave;";
-        case '?':
+        case '\u00D9':
             return "&Ugrave;";
-        case '?':
+        case '\u00FA':
             return "&uacute;";
-        case '?':
+        case '\u00DA':
             return "&Uacute;";
-        case '?':
+        case '\u00FB':
             return "&ucirc;";
-        case '?':
+        case '\u00DB':
             return "&Ucirc;";
-        case '?':
+        case '\u00FC':
             return "&uuml;";
-        case '?':
+        case '\u00DC':
             return "&Uuml;";
         case '\u00AE':
             return "&reg;";


--- NEW FILE eclipse-anyedit.spec ---
%define eclipse_base %{_libdir}/eclipse
%define rlsdate 200904262004

Summary: AnyEdit plugin for eclipse
Name: eclipse-anyedit
Version: 2.2.0
Release: 2%{?dist}
License: BSD
Group: Development/Tools
URL: http://andrei.gmxhome.de/anyedit/index.html
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Source0: http://anyedittools.googlecode.com/files/de.loskutov.anyedit.AnyEditTools_2.2.0.200904262004.jar

# SOURCE1 and SOURCE2 written by rmyers to facilitate PDE Build
Source1: assemble.xml
Source2: package.xml

# work around unicode/compiler issue
Patch0: eclipse-anyedit-%{version}-unicode.patch

Requires:      eclipse-platform >= 3.4.0

BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: eclipse-pde
BuildRequires: java-devel >= 1.4.2
BuildArch:     noarch

%description
The AnyEdit plugin adds several new actions to the context menu of text-based
Eclipse editors.

%prep
%setup -q -c
%patch0 -p1

# remove pre-compiled classes
rm -rf de

%build
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}

SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may write preferences and logs here
mkdir home
homedir=$(cd home > /dev/null && pwd)

# create the required assemble and package targets
mkdir $(pwd)/build/
# this symlink creates the assemble target which assembles the plugin
ln -s %{SOURCE1} $(pwd)/build/assemble.de.loskutov.anyedit.AnyEditTools.all.xml
# this symlink creates the package target which packages the plugin
ln -s %{SOURCE2} $(pwd)/build/package.de.loskutov.anyedit.AnyEditTools.all.xml

# find correct location
package_build=$(find %{eclipse_base} -name 'package-build' -print | grep pde | grep templates)
build_xml=$(find %{eclipse_base} -name 'build.xml' -print | grep pde | grep scripts)

# build the plugin
eclipse \
     -nosplash                                         \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=plugin                                     \
     -Did=de.loskutov.anyedit.AnyEditTools             \
     -DbaseLocation=$SDK                               \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=$package_build \
     -f $build_xml \
     -vmargs -Duser.home=$homedir

%install
rm -rf %{buildroot}

# create plugins directory
install -d -m 755 %{buildroot}/%{_datadir}/eclipse/dropins/anyedit/plugins

# install plugin
install -m 644 de.loskutov.anyedit.AnyEditTools_%{version}.%{rlsdate}.jar \
  %{buildroot}/%{_datadir}/eclipse/dropins/anyedit/plugins

%clean 
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
/usr/share/eclipse/dropins/anyedit
 
%changelog
* Wed Aug 19 2009 Rob Myers <rob.myers at gtri.gatech.edu> 2.2.0-2
- Drop LICENSE file
- Minor spec file cleanup

* Wed Aug 19 2009 Rob Myers <rob.myers at gtri.gatech.edu> 2.2.0-1
- Updated to 2.2.0
- Drop gcj support
- Change jar location to /usr/share/eclipse/dropins/anyedit
- Bump eclipse-platform to 3.4.0+

* Wed Oct 15 2008 Rob Myers <rob.myers at gtri.gatech.edu> 2.1.1-3
- move plugin to dropins

* Sun Oct 12 2008 Rob Myers <rob.myers at gtri.gatech.edu> 2.1.1-2
- use build.update.jar package target
- update Requires for compatible versions of eclipse

* Sat Oct 11 2008 Rob Myers <rob.myers at gtri.gatech.edu> 2.1.1-1
- update to 2.1.1

* Wed Oct 17 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-5
- install as jar instead of zip

* Tue Oct 16 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-4
- rebuild

* Tue Sep 25 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-3
- update to meet http://fedoraproject.org/wiki/PackagingDrafts/EclipsePlugins

* Thu Sep 13 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-2
- update defattr settings from alcapcom

* Fri Sep  7 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-1
- update to 1.8.2
- update unicode patch for IcedTea compatibility

* Sun May 27 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.0-2
- enable gcj_support and rebuild

* Fri May 18 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.0-1
- Update to 1.8.0
- switch to pde build
- add gcj_support
- work around '??' compiler issue
- add license

* Mon Apr 23 2007 Patrick Neely <patrick.neely at gtri.gatech.edu> 1.7.0-0
- Update to 1.7.0 for RHEL5

* Tue Jun 27 2006 Patrick Neely <patrick.neely at gtri.gatech.edu> 1.4.1-0
- Rebuilt for RHEL4


--- NEW FILE package.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project default="build.update.jar" name="build">
        <target name="build.update.jar">
                <ant antfile="${sourceDirectory}/build.xml" dir="${sourceDirectory}" target="build.update.jar"/>
        </target>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-anyedit/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:26:21 -0000	1.1
+++ .cvsignore	20 Aug 2009 19:30:57 -0000	1.2
@@ -0,0 +1 @@
+de.loskutov.anyedit.AnyEditTools_2.2.0.200904262004.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-anyedit/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:26:21 -0000	1.1
+++ sources	20 Aug 2009 19:30:57 -0000	1.2
@@ -0,0 +1 @@
+2b4f4844ac69a0516fa640ac96cc433a  de.loskutov.anyedit.AnyEditTools_2.2.0.200904262004.jar



From toshio at fedoraproject.org  Thu Aug 20 19:31:02 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:31:02 +0000 (UTC)
Subject: rpms/mono-addins/F-11 mono-addins.spec,1.18,1.19
Message-ID: <20090820193102.94E2911C0347@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono-addins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8377

Modified Files:
	mono-addins.spec 
Log Message:
Rebuild to pick up ppc64 support.  The previous build was unexpectedly
obsoleted due to a cornercase in bodhi.



Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/F-11/mono-addins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mono-addins.spec	25 May 2009 22:36:44 -0000	1.18
+++ mono-addins.spec	20 Aug 2009 19:31:02 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:		mono-addins
 Version:	0.4
-Release:	7.20091702svn%{svnver}.1%{?dist}
+Release:	8.20091702svn%{svnver}.1%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	MIT
@@ -68,6 +68,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* 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
+
 * Mon May 25 2009 Xavier Lamien <laxathom at fedoraproject.org>  0.4-7.20091702svn127062.1
 - Build arch ppc64.
 



From ausil at fedoraproject.org  Thu Aug 20 19:33:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 19:33:40 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-3.12.3.99.3.tar.bz2,1.1,NONE
Message-ID: <20090820193340.E8E2C11C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074

Removed Files:
	nss-util-3.12.3.99.3.tar.bz2 
Log Message:
remove the tarball from cvs



--- nss-util-3.12.3.99.3.tar.bz2 DELETED ---



From overholt at fedoraproject.org  Thu Aug 20 19:34:04 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 19:34:04 +0000 (UTC)
Subject: rpms/modello/devel modello-use-old-pdcontainer.patch,1.1,1.2
Message-ID: <20090820193404.C7C6211C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/modello/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187

Added Files:
	modello-use-old-pdcontainer.patch 
Log Message:
Add patch

modello-use-old-pdcontainer.patch:
 Modello.java |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Index: modello-use-old-pdcontainer.patch
===================================================================
RCS file: modello-use-old-pdcontainer.patch
diff -N modello-use-old-pdcontainer.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modello-use-old-pdcontainer.patch	20 Aug 2009 19:34:04 -0000	1.2
@@ -0,0 +1,33 @@
+diff -up modello-core/src/main/java/org/codehaus/modello/Modello.java.sav modello-1.0-alpha-15/modello-core/src/main/java/org/codehaus/modello/Modello.java
+--- modello-core/src/main/java/org/codehaus/modello/Modello.java.sav	2008-06-20 16:34:47.000000000 -0400
++++ modello-core/src/main/java/org/codehaus/modello/Modello.java	2008-06-20 16:36:02.000000000 -0400
+@@ -30,8 +30,6 @@ import org.codehaus.modello.core.Modello
+ import org.codehaus.modello.model.Model;
+ import org.codehaus.modello.model.ModelValidationException;
+ import org.codehaus.plexus.embed.Embedder;
+-import org.codehaus.plexus.PlexusContainer;
+-import org.codehaus.plexus.DefaultPlexusContainer;
+ 
+ /**
+  * @author <a href="mailto:jason at maven.org">Jason van Zyl</a>
+@@ -40,7 +38,7 @@ import org.codehaus.plexus.DefaultPlexus
+  */
+ public class Modello
+ {
+-    PlexusContainer container;
++    Embedder embedder = new Embedder();
+ 
+     ModelloCore core;
+ 
+@@ -49,9 +47,9 @@ public class Modello
+     {
+         try
+         {
+-            container = new DefaultPlexusContainer();
++            embedder.start();
+ 
+-            core = (ModelloCore) container.lookup( ModelloCore.ROLE );
++            core = (ModelloCore) embedder.lookup( ModelloCore.ROLE );
+         }
+         catch( Exception ex )
+         {



From joshkayse at fedoraproject.org  Thu Aug 20 19:35:34 2009
From: joshkayse at fedoraproject.org (joshkayse)
Date: Thu, 20 Aug 2009 19:35:34 +0000 (UTC)
Subject: rpms/eclipse-anyedit/devel assemble.xml, NONE,
	1.1 eclipse-anyedit-2.2.0-unicode.patch, NONE,
	1.1 eclipse-anyedit.spec, NONE, 1.1 package.xml, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090820193534.6C58511C006E@cvs1.fedora.phx.redhat.com>

Author: joshkayse

Update of /cvs/pkgs/rpms/eclipse-anyedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9510

Modified Files:
	.cvsignore sources 
Added Files:
	assemble.xml eclipse-anyedit-2.2.0-unicode.patch 
	eclipse-anyedit.spec package.xml 
Log Message:
Initial creation of eclipse-anyedit.  Import from srpm by rmyers


--- NEW FILE assemble.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project default="gather.bin.parts" name="build">
        <target name="gather.bin.parts">
                <ant antfile="${sourceDirectory}/build.xml" dir="${sourceDirectory}" target="gather.bin.parts"/>
        </target>
</project>

eclipse-anyedit-2.2.0-unicode.patch:
 TextUtil.java |  188 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

--- NEW FILE eclipse-anyedit-2.2.0-unicode.patch ---
# This patch was generated with:

#!/bin/bash
for char in ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?
  do
    newchar=$(echo $char | od -x -N1 | tr 'a-f' 'A-F' | head -1 | awk '{print "\\u"$2}')
    export char newchar
    perl -pi -e 's/$ENV{char}/$ENV{newchar}/g' $1
  done

--- eclipse-anyedit-2.1.1/src/de/loskutov/anyedit/util/TextUtil.java	2008-10-11 20:38:10.000000000 -0400
+++ eclipse-anyedit-2.1.1/src/de/loskutov/anyedit/util/TextUtil.java	2008-10-11 20:38:21.000000000 -0400
@@ -894,53 +894,53 @@ public class TextUtil {
             "&gt;", ">" }, {
             "&amp;", "&" }, {
             "&quot;", "\"" }, {
-            "&agrave;", "?" }, {
-            "&Agrave;", "?" }, {
-            "&acirc;", "?" }, {
-            "&auml;", "?" }, {
-            "&Auml;", "?" }, {
-            "&Acirc;", "?" }, {
-            "&aring;", "?" }, {
-            "&Aring;", "?" }, {
-            "&aelig;", "?" }, {
-            "&AElig;", "?" }, {
-            "&ccedil;", "?" }, {
-            "&Ccedil;", "?" }, {
-            "&eacute;", "?" }, {
-            "&Eacute;", "?" }, {
-            "&aacute;", "?" }, {
-            "&Aacute;", "?" }, {
-            "&egrave;", "?" }, {
-            "&Egrave;", "?" }, {
-            "&ecirc;", "?" }, {
-            "&Ecirc;", "?" }, {
-            "&euml;", "?" }, {
-            "&Euml;", "?" }, {
-            "&iuml;", "?" }, {
-            "&Iuml;", "?" }, {
-            "&iacute;", "?" }, {
-            "&Iacute;", "?" }, {
-            "&atilde;", "?" }, {
-            "&Atilde;", "?" }, {
-            "&otilde;", "?" }, {
-            "&Otilde;", "?" }, {
-            "&oacute;", "?" }, {
-            "&Oacute;", "?" }, {
-            "&ocirc;", "?" }, {
-            "&Ocirc;", "?" }, {
-            "&ouml;", "?" }, {
-            "&Ouml;", "?" }, {
-            "&oslash;", "?" }, {
-            "&Oslash;", "?" }, {
-            "&szlig;", "?" }, {
-            "&ugrave;", "?" }, {
-            "&Ugrave;", "?" }, {
-            "&uacute;", "?" }, {
-            "&Uacute;", "?" }, {
-            "&ucirc;", "?" }, {
-            "&Ucirc;", "?" }, {
-            "&uuml;", "?" }, {
-            "&Uuml;", "?" }, {
+            "&agrave;", "\u00E0" }, {
+            "&Agrave;", "\u00C0" }, {
+            "&acirc;", "\u00E2" }, {
+            "&auml;", "\u00E4" }, {
+            "&Auml;", "\u00C4" }, {
+            "&Acirc;", "\u00C2" }, {
+            "&aring;", "\u00E5" }, {
+            "&Aring;", "\u00C5" }, {
+            "&aelig;", "\u00E6" }, {
+            "&AElig;", "\u00C6" }, {
+            "&ccedil;", "\u00E7" }, {
+            "&Ccedil;", "\u00C7" }, {
+            "&eacute;", "\u00E9" }, {
+            "&Eacute;", "\u00C9" }, {
+            "&aacute;", "\u00E1" }, {
+            "&Aacute;", "\u00C1" }, {
+            "&egrave;", "\u00E8" }, {
+            "&Egrave;", "\u00C8" }, {
+            "&ecirc;", "\u00EA" }, {
+            "&Ecirc;", "\u00CA" }, {
+            "&euml;", "\u00EB" }, {
+            "&Euml;", "\u00CB" }, {
+            "&iuml;", "\u00EF" }, {
+            "&Iuml;", "\u00CF" }, {
+            "&iacute;", "\u00ED" }, {
+            "&Iacute;", "\u00CD" }, {
+            "&atilde;", "\u00E3" }, {
+            "&Atilde;", "\u00C3" }, {
+            "&otilde;", "\u00F5" }, {
+            "&Otilde;", "\u00D5" }, {
+            "&oacute;", "\u00F3" }, {
+            "&Oacute;", "\u00D3" }, {
+            "&ocirc;", "\u00F4" }, {
+            "&Ocirc;", "\u00D4" }, {
+            "&ouml;", "\u00F6" }, {
+            "&Ouml;", "\u00D6" }, {
+            "&oslash;", "\u00F8" }, {
+            "&Oslash;", "\u00D8" }, {
+            "&szlig;", "\u00DF" }, {
+            "&ugrave;", "\u00F9" }, {
+            "&Ugrave;", "\u00D9" }, {
+            "&uacute;", "\u00FA" }, {
+            "&Uacute;", "\u00DA" }, {
+            "&ucirc;", "\u00FB" }, {
+            "&Ucirc;", "\u00DB" }, {
+            "&uuml;", "\u00FC" }, {
+            "&Uuml;", "\u00DC" }, {
             "&nbsp;", " " }, {
             "&reg;", "\u00AE" }, {
             "&copy;", "\u00A9" }, {
@@ -963,99 +963,99 @@ public class TextUtil {
             return "&amp;";
         case '"':
             return "&quot;";
-        case '?':
+        case '\u00E0':
             return "&agrave;";
-        case '?':
+        case '\u00E1':
             return "&aacute;";
-        case '?':
+        case '\u00C0':
             return "&Agrave;";
-        case '?':
+        case '\u00C1':
             return "&Aacute;";
-        case '?':
+        case '\u00E2':
             return "&acirc;";
-        case '?':
+        case '\u00C2':
             return "&Acirc;";
-        case '?':
+        case '\u00E4':
             return "&auml;";
-        case '?':
+        case '\u00C4':
             return "&Auml;";
-        case '?':
+        case '\u00E5':
             return "&aring;";
-        case '?':
+        case '\u00C5':
             return "&Aring;";
-        case '?':
+        case '\u00E3':
             return "&atilde;";
-        case '?':
+        case '\u00C3':
             return "&Atilde;";
-        case '?':
+        case '\u00E6':
             return "&aelig;";
-        case '?':
+        case '\u00C6':
             return "&AElig;";
-        case '?':
+        case '\u00E7':
             return "&ccedil;";
-        case '?':
+        case '\u00C7':
             return "&Ccedil;";
-        case '?':
+        case '\u00E9':
             return "&eacute;";
-        case '?':
+        case '\u00C9':
             return "&Eacute;";
-        case '?':
+        case '\u00E8':
             return "&egrave;";
-        case '?':
+        case '\u00C8':
             return "&Egrave;";
-        case '?':
+        case '\u00EA':
             return "&ecirc;";
-        case '?':
+        case '\u00CA':
             return "&Ecirc;";
-        case '?':
+        case '\u00EB':
             return "&euml;";
-        case '?':
+        case '\u00CB':
             return "&Euml;";
-        case '?':
+        case '\u00ED':
             return "&iacute;";
-        case '?':
+        case '\u00CD':
             return "&Iacute;";
-        case '?':
+        case '\u00EF':
             return "&iuml;";
-        case '?':
+        case '\u00CF':
             return "&Iuml;";
-        case '?':
+        case '\u00F5':
             return "&otilde;";
-        case '?':
+        case '\u00D5':
             return "&Otilde;";
-        case '?':
+        case '\u00F3':
             return "&oacute;";
-        case '?':
+        case '\u00F4':
             return "&ocirc;";
-        case '?':
+        case '\u00D3':
             return "&Oacute;";
-        case '?':
+        case '\u00D4':
             return "&Ocirc;";
-        case '?':
+        case '\u00F6':
             return "&ouml;";
-        case '?':
+        case '\u00D6':
             return "&Ouml;";
-        case '?':
+        case '\u00F8':
             return "&oslash;";
-        case '?':
+        case '\u00D8':
             return "&Oslash;";
-        case '?':
+        case '\u00DF':
             return "&szlig;";
-        case '?':
+        case '\u00F9':
             return "&ugrave;";
-        case '?':
+        case '\u00D9':
             return "&Ugrave;";
-        case '?':
+        case '\u00FA':
             return "&uacute;";
-        case '?':
+        case '\u00DA':
             return "&Uacute;";
-        case '?':
+        case '\u00FB':
             return "&ucirc;";
-        case '?':
+        case '\u00DB':
             return "&Ucirc;";
-        case '?':
+        case '\u00FC':
             return "&uuml;";
-        case '?':
+        case '\u00DC':
             return "&Uuml;";
         case '\u00AE':
             return "&reg;";


--- NEW FILE eclipse-anyedit.spec ---
%define eclipse_base %{_libdir}/eclipse
%define rlsdate 200904262004

Summary: AnyEdit plugin for eclipse
Name: eclipse-anyedit
Version: 2.2.0
Release: 2%{?dist}
License: BSD
Group: Development/Tools
URL: http://andrei.gmxhome.de/anyedit/index.html
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Source0: http://anyedittools.googlecode.com/files/de.loskutov.anyedit.AnyEditTools_2.2.0.200904262004.jar

# SOURCE1 and SOURCE2 written by rmyers to facilitate PDE Build
Source1: assemble.xml
Source2: package.xml

# work around unicode/compiler issue
Patch0: eclipse-anyedit-%{version}-unicode.patch

Requires:      eclipse-platform >= 3.4.0

BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: eclipse-pde
BuildRequires: java-devel >= 1.4.2
BuildArch:     noarch

%description
The AnyEdit plugin adds several new actions to the context menu of text-based
Eclipse editors.

%prep
%setup -q -c
%patch0 -p1

# remove pre-compiled classes
rm -rf de

%build
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}

SDK=$(cd SDK > /dev/null && pwd)

# Eclipse may write preferences and logs here
mkdir home
homedir=$(cd home > /dev/null && pwd)

# create the required assemble and package targets
mkdir $(pwd)/build/
# this symlink creates the assemble target which assembles the plugin
ln -s %{SOURCE1} $(pwd)/build/assemble.de.loskutov.anyedit.AnyEditTools.all.xml
# this symlink creates the package target which packages the plugin
ln -s %{SOURCE2} $(pwd)/build/package.de.loskutov.anyedit.AnyEditTools.all.xml

# find correct location
package_build=$(find %{eclipse_base} -name 'package-build' -print | grep pde | grep templates)
build_xml=$(find %{eclipse_base} -name 'build.xml' -print | grep pde | grep scripts)

# build the plugin
eclipse \
     -nosplash                                         \
     -application org.eclipse.ant.core.antRunner       \
     -Dtype=plugin                                     \
     -Did=de.loskutov.anyedit.AnyEditTools             \
     -DbaseLocation=$SDK                               \
     -DsourceDirectory=$(pwd)                          \
     -DbuildDirectory=$(pwd)/build                     \
     -Dbuilder=$package_build \
     -f $build_xml \
     -vmargs -Duser.home=$homedir

%install
rm -rf %{buildroot}

# create plugins directory
install -d -m 755 %{buildroot}/%{_datadir}/eclipse/dropins/anyedit/plugins

# install plugin
install -m 644 de.loskutov.anyedit.AnyEditTools_%{version}.%{rlsdate}.jar \
  %{buildroot}/%{_datadir}/eclipse/dropins/anyedit/plugins

%clean 
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
/usr/share/eclipse/dropins/anyedit
 
%changelog
* Wed Aug 19 2009 Rob Myers <rob.myers at gtri.gatech.edu> 2.2.0-2
- Drop LICENSE file
- Minor spec file cleanup

* Wed Aug 19 2009 Rob Myers <rob.myers at gtri.gatech.edu> 2.2.0-1
- Updated to 2.2.0
- Drop gcj support
- Change jar location to /usr/share/eclipse/dropins/anyedit
- Bump eclipse-platform to 3.4.0+

* Wed Oct 15 2008 Rob Myers <rob.myers at gtri.gatech.edu> 2.1.1-3
- move plugin to dropins

* Sun Oct 12 2008 Rob Myers <rob.myers at gtri.gatech.edu> 2.1.1-2
- use build.update.jar package target
- update Requires for compatible versions of eclipse

* Sat Oct 11 2008 Rob Myers <rob.myers at gtri.gatech.edu> 2.1.1-1
- update to 2.1.1

* Wed Oct 17 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-5
- install as jar instead of zip

* Tue Oct 16 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-4
- rebuild

* Tue Sep 25 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-3
- update to meet http://fedoraproject.org/wiki/PackagingDrafts/EclipsePlugins

* Thu Sep 13 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-2
- update defattr settings from alcapcom

* Fri Sep  7 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.2-1
- update to 1.8.2
- update unicode patch for IcedTea compatibility

* Sun May 27 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.0-2
- enable gcj_support and rebuild

* Fri May 18 2007 Rob Myers <rob.myers at gtri.gatech.edu> 1.8.0-1
- Update to 1.8.0
- switch to pde build
- add gcj_support
- work around '??' compiler issue
- add license

* Mon Apr 23 2007 Patrick Neely <patrick.neely at gtri.gatech.edu> 1.7.0-0
- Update to 1.7.0 for RHEL5

* Tue Jun 27 2006 Patrick Neely <patrick.neely at gtri.gatech.edu> 1.4.1-0
- Rebuilt for RHEL4


--- NEW FILE package.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project default="build.update.jar" name="build">
        <target name="build.update.jar">
                <ant antfile="${sourceDirectory}/build.xml" dir="${sourceDirectory}" target="build.update.jar"/>
        </target>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-anyedit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:26:21 -0000	1.1
+++ .cvsignore	20 Aug 2009 19:35:34 -0000	1.2
@@ -0,0 +1 @@
+de.loskutov.anyedit.AnyEditTools_2.2.0.200904262004.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-anyedit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:26:21 -0000	1.1
+++ sources	20 Aug 2009 19:35:34 -0000	1.2
@@ -0,0 +1 @@
+2b4f4844ac69a0516fa640ac96cc433a  de.loskutov.anyedit.AnyEditTools_2.2.0.200904262004.jar



From ausil at fedoraproject.org  Thu Aug 20 19:37:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 19:37:49 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.2,1.3
Message-ID: <20090820193749.A0C9711C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9781

Modified Files:
	nss-util.spec 
Log Message:
we need to provide and obsolete nss-devel



Index: nss-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-util.spec	20 Aug 2009 04:35:38 -0000	1.2
+++ nss-util.spec	20 Aug 2009 19:37:49 -0000	1.3
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-Release:          8.1%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -44,6 +44,7 @@ Utilities for Network Security Services 
 Summary:          Development libraries for Network Security Services Utilities
 Group:            Development/Libraries
 Obsoletes:        nss-devel < 3.12.3.99.3-8
+Provides:         nss-devel = 3.12.3.99.3-8
 Requires:         nss-util = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
@@ -207,6 +208,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-9
+- Provide nss-devel since we obsolete it
+
 * Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8.1
 - nss-util-devel obsoletes nss-devel < 3.12.3.99.3-8
 



From overholt at fedoraproject.org  Thu Aug 20 19:39:17 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 19:39:17 +0000 (UTC)
Subject: rpms/plexus-cdc/devel plexus-cdc.spec,1.11,1.12 sources,1.1,1.2
Message-ID: <20090820193917.57AA811C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-cdc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10137

Modified Files:
	plexus-cdc.spec sources 
Log Message:
* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.a10.1.1
- Update to alpha 10 (courtesy Deepak Bhole)
- Remove gcj support


Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- plexus-cdc.spec	26 Jul 2009 18:54:33 -0000	1.11
+++ plexus-cdc.spec	20 Aug 2009 19:39:17 -0000	1.12
@@ -28,12 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:
-%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:
-%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define parent plexus
 
 %define subname cdc
@@ -42,22 +36,22 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a4.1.7%{?dist}
+Release:        0.5.a10.1.1%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-Source0:        %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-cdc-1.0-alpha-4 plexus-cdc/
-# tar czf plexus-cdc-1.0-alpha-4.tar.gz plexus-cdc/
-Source1:		%{name}-jpp-depmap.xml
+# svn export \
+#  http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cdc-1.0-alpha-10/ \
+#  plexus-cdc/
+# tar czf plexus-cdc-1.0-alpha-10.tar.gz plexus-cdc/
+Source0:        %{name}-1.0-alpha-10.tar.gz
+Source1:	%{name}-jpp-depmap.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:	maven2 >= 2.0.4-9
@@ -65,7 +59,6 @@ BuildRequires:	maven2-plugin-compiler
 BuildRequires:	maven2-plugin-install
 BuildRequires:	maven2-plugin-jar
 BuildRequires:	maven2-plugin-javadoc
-BuildRequires:	maven2-plugin-release
 BuildRequires:	maven2-plugin-resources
 BuildRequires:	maven2-plugin-surefire
 BuildRequires:	maven2-common-poms >= 1.0
@@ -82,12 +75,6 @@ Requires:		qdox
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 The Plexus project seeks to create end-to-end developer tools for
 writing applications. At the core is the container, which can be
@@ -144,34 +131,15 @@ cp -pr target/site/apidocs/* \
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %postun
 %update_maven_depmap
 
-
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/plexus
@@ -179,17 +147,15 @@ fi
 %{_mavendepmapfragdir}
 %config(noreplace) /etc/maven/fragments/plexus-cdc
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cdc-1.0.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
-
 %changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.a10.1.1
+- Update to alpha 10 (courtesy Deepak Bhole)
+- Remove gcj support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a4.1.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cdc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Mar 2007 22:21:32 -0000	1.1
+++ sources	20 Aug 2009 19:39:17 -0000	1.2
@@ -1 +1 @@
-c6917575b249874e088dbd6a6aca03df  plexus-cdc-src.tar.gz
+715e99df384a0037b2cd5bb107c7be21  plexus-cdc-1.0-alpha-10.tar.gz



From ausil at fedoraproject.org  Thu Aug 20 19:41:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 19:41:36 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.83,1.84
Message-ID: <20090820194136.3A8DD11C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10521

Modified Files:
	nss.spec 
Log Message:
dont install libnssutil3.so its part of nss-util



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- nss.spec	20 Aug 2009 18:28:37 -0000	1.83
+++ nss.spec	20 Aug 2009 19:41:35 -0000	1.84
@@ -13,7 +13,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          7.1%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -254,7 +254,7 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+for file in libsoftokn3.so libfreebl3.so libnss3.so \
             libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
 do
   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
@@ -318,7 +318,6 @@ done
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
-/%{_lib}/libnssutil3.so
 /%{_lib}/libnssdbm3.so
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
@@ -367,7 +366,6 @@ done
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
-%{_libdir}/libnssutil3.so
 %{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
@@ -483,6 +481,9 @@ done
 
 
 %changelog
+* Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-8
+- dont install libnssutil3.so since its now in nss-util
+
 * Sat Aug 06 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-7.1
 - Fix spec file problems uncovered by Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Thu Aug 20 19:43:59 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 19:43:59 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.84,1.85
Message-ID: <20090820194359.BDAFE11C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10991

Modified Files:
	nss.spec 
Log Message:
ppacrently -8 was already tagged



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- nss.spec	20 Aug 2009 19:41:35 -0000	1.84
+++ nss.spec	20 Aug 2009 19:43:59 -0000	1.85
@@ -13,7 +13,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -481,7 +481,7 @@ done
 
 
 %changelog
-* Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-8
+* Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-9
 - dont install libnssutil3.so since its now in nss-util
 
 * Sat Aug 06 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-7.1



From toshio at fedoraproject.org  Thu Aug 20 19:48:41 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:48:41 +0000 (UTC)
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.31,1.32
Message-ID: <20090820194841.3F5B811C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gecko-sharp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11917

Modified Files:
	gecko-sharp2.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13-12
- Fix upgrade path versioning



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gecko-sharp2.spec	24 Jul 2009 23:45:37 -0000	1.31
+++ gecko-sharp2.spec	20 Aug 2009 19:48:40 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        4%{?dist}
+Release:        12%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -23,7 +23,7 @@ BuildRequires:  gecko-devel
 Requires:       gecko-libs
 
 # Mono only available on these platforms
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha ppc64
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
 %description
 This package provides Mono bindings for the Gecko engine, through
@@ -70,12 +70,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13-12
+- Fix upgrade path versioning
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Jun 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> -0.13-3
 - Add ppc64 support
 
+* Mon May 25 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.13-3
+- Build arch ppc64.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 19:50:05 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:50:05 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-11 gecko-sharp2.spec,1.29,1.30
Message-ID: <20090820195005.9473B11C0417@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gecko-sharp2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12287

Modified Files:
	gecko-sharp2.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13-12
- Fix upgrade path versioning



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/F-11/gecko-sharp2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gecko-sharp2.spec	25 May 2009 21:16:33 -0000	1.29
+++ gecko-sharp2.spec	20 Aug 2009 19:50:05 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        3%{?dist}
+Release:        12%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -23,7 +23,7 @@ BuildRequires:  gecko-devel
 Requires:       gecko-libs
 
 # Mono only available on these platforms
-# ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+# ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
 %description
 This package provides Mono bindings for the Gecko engine, through
@@ -70,6 +70,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13-12
+- Fix upgrade path versioning
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> -0.13-3
+- Add ppc64 support
+
 * Mon May 25 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.13-3
 - Build arch ppc64.
 



From dwalsh at fedoraproject.org  Thu Aug 20 19:51:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 20 Aug 2009 19:51:46 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.432,1.433
Message-ID: <20090820195146.CDBB911C006E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12773

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-7
- Fix glob handling of /..


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  424 +++--------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++
 restorecond/watch.c                         |  254 ++++++++++
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++
 scripts/sandbox.8                           |   22 
 scripts/sandbox.py                          |   67 ++
 semanage/semanage                           |   34 +
 semanage/seobject.py                        |   66 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  530 ++++++++++++++++++++++
 setfiles/restore.h                          |   50 ++
 setfiles/setfiles.c                         |  672 +++-------------------------
 22 files changed, 1611 insertions(+), 968 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -p -r1.432 -r1.433
--- policycoreutils-rhat.patch	20 Aug 2009 19:05:30 -0000	1.432
+++ policycoreutils-rhat.patch	20 Aug 2009 19:51:45 -0000	1.433
@@ -47,6 +47,1113 @@ 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.71/restorecond/Makefile
+--- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-20 15:30:42.000000000 -0400
+@@ -1,17 +1,28 @@
+ # Installation directories.
+ PREFIX ?= ${DESTDIR}/usr
+ SBINDIR ?= $(PREFIX)/sbin
++LIBDIR ?= $(PREFIX)/lib
+ MANDIR = $(PREFIX)/share/man
++AUTOSTARTDIR = $(DESTDIR)/etc/xdg/autostart
++DBUSSERVICEDIR = $(DESTDIR)/usr/share/dbus-1/services
++
++autostart_DATA = sealertauto.desktop
+ INITDIR = $(DESTDIR)/etc/rc.d/init.d
+ SELINUXDIR = $(DESTDIR)/etc/selinux
+ 
++DBUSFLAGS = -DHAVE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include 
++DBUSLIB = -ldbus-glib-1 
++
+ CFLAGS ?= -g -Werror -Wall -W
+-override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
+-LDLIBS += -lselinux -L$(PREFIX)/lib
++override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include
++
++LDLIBS += -lselinux $(DBUSLIB) -lglib-2.0 -L$(LIBDIR)
+ 
+ all: restorecond
+ 
+-restorecond:  restorecond.o utmpwatcher.o stringslist.o
++restorecond.o utmpwatcher.o stringslist.o user.o watch.o: restorecond.h 
++
++restorecond:  ../setfiles/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ install: all
+@@ -22,7 +33,12 @@
+ 	-mkdir -p $(INITDIR)
+ 	install -m 755 restorecond.init $(INITDIR)/restorecond
+ 	-mkdir -p $(SELINUXDIR)
+-	install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf
++	install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf
++	install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf
++	-mkdir -p $(AUTOSTARTDIR)
++	install -m 644 restorecond.desktop $(AUTOSTARTDIR)/restorecond.desktop
++	-mkdir -p $(DBUSSERVICEDIR)
++	install -m 600 org.selinux.Restorecond.service  $(DBUSSERVICEDIR)/org.selinux.Restorecond.service
+ 
+ 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.71/restorecond/org.selinux.Restorecond.service
+--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-20 12:53:16.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.71/restorecond/restorecond.c
+--- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-20 15:30:44.000000000 -0400
+@@ -48,294 +48,38 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <ctype.h>
++#include "../setfiles/restore.h"
+ #include <sys/types.h>
+-#include <sys/stat.h>
+ #include <syslog.h>
+ #include <limits.h>
++#include <pwd.h>
++#include <sys/stat.h>
++#include <string.h>
++#include <stdio.h>
+ #include <fcntl.h>
+-
+ #include "restorecond.h"
+-#include "stringslist.h"
+ #include "utmpwatcher.h"
+ 
+-extern char *dirname(char *path);
++const char *homedir;
+ static int master_fd = -1;
+-static int master_wd = -1;
+-static int terminate = 0;
+-
+-#include <selinux/selinux.h>
+-#include <utmp.h>
+-
+-/* size of the event structure, not counting name */
+-#define EVENT_SIZE  (sizeof (struct inotify_event))
+-/* reasonable guess as to size of 1024 events */
+-#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
+-
+-static int debug_mode = 0;
+-static int verbose_mode = 0;
+-
+-static void restore(const char *filename, int exact);
+-
+-struct watchList {
+-	struct watchList *next;
+-	int wd;
+-	char *dir;
+-	struct stringsList *files;
+-};
+-struct watchList *firstDir = NULL;
+-
+-/* Compare two contexts to see if their differences are "significant",
+- * or whether the only difference is in the user. */
+-static int only_changed_user(const char *a, const char *b)
+-{
+-	char *rest_a, *rest_b;	/* Rest of the context after the user */
+-	if (!a || !b)
+-		return 0;
+-	rest_a = strchr(a, ':');
+-	rest_b = strchr(b, ':');
+-	if (!rest_a || !rest_b)
+-		return 0;
+-	return (strcmp(rest_a, rest_b) == 0);
+-}
+-
+-/* 
+-   A file was in a direcroty has been created. This function checks to 
+-   see if it is one that we are watching.
+-*/
+-
+-static int watch_list_find(int wd, const char *file)
+-{
+-	struct watchList *ptr = NULL;
+-	ptr = firstDir;
+-
+-	if (debug_mode)
+-		printf("%d: File=%s\n", wd, file);
+-	while (ptr != NULL) {
+-		if (ptr->wd == wd) {
+-			int exact=0;
+-			if (strings_list_find(ptr->files, file, &exact) == 0) {
+-				char *path = NULL;
+-				if (asprintf(&path, "%s/%s", ptr->dir, file) <
+-				    0)
+-					exitApp("Error allocating memory.");
+-				restore(path, exact);
+-				free(path);
+-				return 0;
+-			}
+-			if (debug_mode)
+-				strings_list_print(ptr->files);
+-
+-			/* Not found in this directory */
+-			return -1;
+-		}
+-		ptr = ptr->next;
+-	}
+-	/* Did not find a directory */
+-	return -1;
+-}
+-
+-static void watch_list_free(int fd)
+-{
+-	struct watchList *ptr = NULL;
+-	struct watchList *prev = NULL;
+-	ptr = firstDir;
+-
+-	while (ptr != NULL) {
+-		inotify_rm_watch(fd, ptr->wd);
+-		strings_list_free(ptr->files);
+-		free(ptr->dir);
+-		prev = ptr;
+-		ptr = ptr->next;
+-		free(prev);
+-	}
+-	firstDir = NULL;
+-}
+-
+-/* 
+-   Set the file context to the default file context for this system.
+-   Same as restorecon.
+-*/
+-static void restore(const char *filename, int exact)
+-{
+-	int retcontext = 0;
+-	security_context_t scontext = NULL;
+-	security_context_t prev_context = NULL;
+-	struct stat st;
+-	int fd = -1;
+-	if (debug_mode)
+-		printf("restore %s\n", filename);
+-
+-	fd = open(filename, O_NOFOLLOW | O_RDONLY);
+-	if (fd < 0) {
+-		if (verbose_mode)
+-			syslog(LOG_ERR, "Unable to open file (%s) %s\n",
+-			       filename, strerror(errno));
+-		return;
+-	}
+-
+-	if (fstat(fd, &st) != 0) {
+-		syslog(LOG_ERR, "Unable to stat file (%s) %s\n", filename,
+-		       strerror(errno));
+-		close(fd);
+-		return;
+-	}
+-
+-	if (!(st.st_mode & S_IFDIR) && st.st_nlink > 1) {
+-		if (exact) { 
+-			syslog(LOG_ERR,
+-			       "Will not restore a file with more than one hard link (%s) %s\n",
+-			       filename, strerror(errno));
+-		}
+-		close(fd);
+-		return;
+-	}
+-
+-	if (matchpathcon(filename, st.st_mode, &scontext) < 0) {
+-		if (errno == ENOENT)
+-			return;
+-		syslog(LOG_ERR, "matchpathcon(%s) failed %s\n", filename,
+-		       strerror(errno));
+-		return;
+-	}
+-	retcontext = fgetfilecon_raw(fd, &prev_context);
+-
+-	if (retcontext >= 0 || errno == ENODATA) {
+-		if (retcontext < 0)
+-			prev_context = NULL;
+-		if (retcontext < 0 || (strcmp(prev_context, scontext) != 0)) {
+-
+-			if (only_changed_user(scontext, prev_context) != 0) {
+-				free(scontext);
+-				free(prev_context);
+-				close(fd);
+-				return;
+-			}
+-
+-			if (fsetfilecon(fd, scontext) < 0) {
+-				if (errno != EOPNOTSUPP) 
+-					syslog(LOG_ERR,
+-					       "set context %s->%s failed:'%s'\n",
+-					       filename, scontext, strerror(errno));
+-				if (retcontext >= 0)
+-					free(prev_context);
+-				free(scontext);
+-				close(fd);
+-				return;
+-			}
+-			syslog(LOG_WARNING, "Reset file context %s: %s->%s\n",
+-			       filename, prev_context, scontext);
+-		}
+-		if (retcontext >= 0)
+-			free(prev_context);
+-	} else {
+-		if (errno != EOPNOTSUPP) 
+-			syslog(LOG_ERR, "get context on %s failed: '%s'\n",
+-			       filename, strerror(errno));
+-	}
+-	free(scontext);
+-	close(fd);
+-}
+-
+-static void process_config(int fd, FILE * cfg)
+-{
+-	char *line_buf = NULL;
+-	size_t len = 0;
+-
+-	while (getline(&line_buf, &len, cfg) > 0) {
+-		char *buffer = line_buf;
+-		while (isspace(*buffer))
+-			buffer++;
+-		if (buffer[0] == '#')
+-			continue;
+-		int l = strlen(buffer) - 1;
+-		if (l <= 0)
+-			continue;
+-		buffer[l] = 0;
+-		if (buffer[0] == '~')
+-			utmpwatcher_add(fd, &buffer[1]);
+-		else {
+-			watch_list_add(fd, buffer);
+-		}
+-	}
+-	free(line_buf);
+-}
+-
+-/* 
+-   Read config file ignoring Comment lines 
+-   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;
+ 
+-	FILE *cfg = NULL;
+-	if (debug_mode)
+-		printf("Read Config\n");
+-
+-	watch_list_free(fd);
+-
+-	cfg = fopen(watch_file_path, "r");
+-	if (!cfg)
+-		exitApp("Error reading config file.");
+-	process_config(fd, cfg);
+-	fclose(cfg);
+-
+-	inotify_rm_watch(fd, master_wd);
+-	master_wd =
+-	    inotify_add_watch(fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
+-	if (master_wd == -1)
+-		exitApp("Error watching config file.");
+-}
++#include <selinux/selinux.h>
+ 
+-/* 
+-   Inotify watch loop 
+-*/
+-static int watch(int fd)
+-{
+-	char buf[BUF_LEN];
+-	int len, i = 0;
+-	len = read(fd, buf, BUF_LEN);
+-	if (len < 0) {
+-		if (terminate == 0) {
+-			syslog(LOG_ERR, "Read error (%s)", strerror(errno));
+-			return 0;
+-		}
+-		syslog(LOG_ERR, "terminated");
+-		return -1;
+-	} else if (!len)
+-		/* BUF_LEN too small? */
+-		return -1;
+-	while (i < len) {
+-		struct inotify_event *event;
+-		event = (struct inotify_event *)&buf[i];
+-		if (debug_mode)
+-			printf("wd=%d mask=%u cookie=%u len=%u\n",
+-			       event->wd, event->mask,
+-			       event->cookie, event->len);
+-		if (event->wd == master_wd)
+-			read_config(fd);
+-		else {
+-			switch (utmpwatcher_handle(fd, event->wd)) {
+-			case -1:	/* Message was not for utmpwatcher */
+-				if (event->len)
+-					watch_list_find(event->wd, event->name);
+-				break;
+-
+-			case 1:	/* utmp has changed need to reload */
+-				read_config(fd);
+-				break;
+-
+-			default:	/* No users logged in or out */
+-				break;
+-			}
+-		}
++int debug_mode = 0;
++int terminate = 0;
++int master_wd = -1;
++int run_as_user = 0;
+ 
+-		i += EVENT_SIZE + event->len;
+-	}
+-	return 0;
++static void done(void) {
++	watch_list_free(master_fd);
++	close(master_fd);
++	utmpwatcher_free();
++	matchpathcon_fini();
+ }
+ 
+ static const char *pidfile = "/var/run/restorecond.pid";
+@@ -374,7 +118,7 @@
+ 
+ static void usage(char *program)
+ {
+-	printf("%s [-d] [-v] \n", program);
++	printf("%s [-d] [-s] [-f restorecond_file ] [-v] \n", program);
+ 	exit(0);
+ }
+ 
+@@ -390,74 +134,35 @@
+    to see if it is one that we are watching.
+ */
+ 
+-void watch_list_add(int fd, const char *path)
+-{
+-	struct watchList *ptr = NULL;
+-	struct watchList *prev = NULL;
+-	char *x = strdup(path);
+-	if (!x)
+-		exitApp("Out of Memory");
+-	char *dir = dirname(x);
+-	char *file = basename(path);
+-	ptr = firstDir;
+-
+-	restore(path, 1);
+-
+-	while (ptr != NULL) {
+-		if (strcmp(dir, ptr->dir) == 0) {
+-			strings_list_add(&ptr->files, file);
+-			free(x);
+-			return;
+-		}
+-		prev = ptr;
+-		ptr = ptr->next;
+-	}
+-	ptr = calloc(1, sizeof(struct watchList));
+-
+-	if (!ptr)
+-		exitApp("Out of Memory");
+-
+-	ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
+-	if (ptr->wd == -1) {
+-		free(ptr);
+-		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
+-		       path, strerror(errno));
+-		return;
+-	}
+-
+-	ptr->dir = strdup(dir);
+-	if (!ptr->dir)
+-		exitApp("Out of Memory");
+-
+-	strings_list_add(&ptr->files, file);
+-	if (prev)
+-		prev->next = ptr;
+-	else
+-		firstDir = ptr;
+-
+-	if (debug_mode)
+-		printf("%d: Dir=%s, File=%s\n", ptr->wd, ptr->dir, file);
+-
+-	free(x);
+-}
+-
+ int main(int argc, char **argv)
+ {
+ 	int opt;
+ 	struct sigaction sa;
+ 
+-#ifndef DEBUG
+-	/* Make sure we are root */
+-	if (getuid() != 0) {
+-		fprintf(stderr, "You must be root to run this program.\n");
+-		return 1;
+-	}
+-#endif
+-	/* Make sure we are root */
+-	if (is_selinux_enabled() != 1) {
+-		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
+-		return 1;
+-	}
++	memset(&r_opts, 0, sizeof(r_opts));
++
++	r_opts.progress = 0;
++	r_opts.count = 0;
++	r_opts.debug = 0;
++	r_opts.change = 1;
++	r_opts.verbose = 0;
++	r_opts.logging = 0;
++	r_opts.rootpath = NULL;
++	r_opts.expand_realpath = 0;
++	r_opts.rootpathlen = 0;
++	r_opts.outfile = NULL;
++	r_opts.force = 0;
++	r_opts.hard_links = 0;
++	r_opts.expand_realpath = 1;
++	r_opts.abort_on_error = 0;
++	r_opts.add_assoc = 0;
++	r_opts.fts_flags = FTS_PHYSICAL;
++	r_opts.selabel_opt_validate = NULL;
++	r_opts.selabel_opt_path = NULL;
++	
++	restore_init(&r_opts);
++	/* If we are not running SELinux then just exit */
++	if (is_selinux_enabled() != 1) return 0;
+ 
+ 	/* Register sighandlers */
+ 	sa.sa_flags = 0;
+@@ -467,38 +172,59 @@
+ 
+ 	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
+ 
+-	master_fd = inotify_init();
+-	if (master_fd < 0)
+-		exitApp("inotify_init");
+-
+-	while ((opt = getopt(argc, argv, "dv")) > 0) {
++	atexit( done );
++	while ((opt = getopt(argc, argv, "uf:dv")) > 0) {
+ 		switch (opt) {
+ 		case 'd':
+ 			debug_mode = 1;
+ 			break;
++		case 'f':
++			watch_file = optarg;
++			break;
++		case 'u':
++			run_as_user = 1;
++			break;
+ 		case 'v':
+-			verbose_mode = 1;
++			r_opts.verbose++;
+ 			break;
+ 		case '?':
+ 			usage(argv[0]);
+ 		}
+ 	}
+-	read_config(master_fd);
++
++	master_fd = inotify_init();
++	if (master_fd < 0)
++		exitApp("inotify_init");
++
++	uid_t uid = getuid();
++	struct passwd *pwd = getpwuid(uid);
++	homedir = pwd->pw_dir;
++	if (uid != 0) {
++		if (run_as_user)
++			return server(master_fd, user_watch_file);
++		if (start() != 0) 
++			return server(master_fd, user_watch_file);
++		return 0;
++	}
++
++	watch_file = server_watch_file;
++	read_config(master_fd, watch_file);
+ 
+ 	if (!debug_mode)
+ 		daemon(0, 0);
+ 
+ 	write_pid_file();
+ 
+-	while (watch(master_fd) == 0) {
++	while (watch(master_fd, watch_file) == 0) {
+ 	};
+ 
+ 	watch_list_free(master_fd);
+ 	close(master_fd);
+ 	matchpathcon_fini();
+-	utmpwatcher_free();
+ 	if (pidfile)
+ 		unlink(pidfile);
+ 
+ 	return 0;
+ }
++
++
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.71/restorecond/restorecond.conf
+--- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-20 15:30:45.000000000 -0400
+@@ -4,8 +4,5 @@
+ /etc/mtab
+ /var/run/utmp
+ /var/log/wtmp
+-~/*
+-/root/.ssh
++/root/*
+ /root/.ssh/*
+-
+-
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.71/restorecond/restorecond.desktop
+--- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-20 12:53:16.000000000 -0400
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++Name=File Context maintainer
++Exec=/usr/sbin/restorecond -u
++Comment=Fix file context in owned by the user
++Encoding=UTF-8
++Type=Application
++StartupNotify=false
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.71/restorecond/restorecond.h
+--- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-20 15:30:47.000000000 -0400
+@@ -24,7 +24,21 @@
+ #ifndef RESTORED_CONFIG_H
+ #define RESTORED_CONFIG_H
+ 
+-void exitApp(const char *msg);
+-void watch_list_add(int inotify_fd, const char *path);
++extern int debug_mode;
++extern const char *homedir;
++extern int terminate;
++extern int master_wd;
++extern int run_as_user;
++
++extern int start(void);
++extern int server(int, const char *watch_file);
++
++extern void exitApp(const char *msg);
++extern void read_config(int fd,	const char *watch_file);
++
++extern int watch(int fd, const char *watch_file);
++extern void watch_list_add(int inotify_fd, const char *path);
++extern int watch_list_find(int wd, const char *file);
++extern void watch_list_free(int fd);
+ 
+ #endif
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
+--- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-20 12:53:16.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.71/restorecond/user.c
+--- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/restorecond/user.c	2009-08-20 13:08:42.000000000 -0400
+@@ -0,0 +1,237 @@
++/*
++ * restorecond
++ *
++ * Copyright (C) 2006-2009 Red Hat 
++ * see file 'COPYING' for use and warranty information
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; 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:  
++ *   Dan Walsh <dwalsh at redhat.com>
++ *
++*/
++
++#define _GNU_SOURCE
++#include <sys/inotify.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <signal.h>
++#include <string.h>
++#include <unistd.h>
++#include <ctype.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <syslog.h>
++#include <limits.h>
++#include <fcntl.h>
++
++#include "restorecond.h"
++#include "stringslist.h"
++#include <glib.h>
++#ifdef HAVE_DBUS
++#include <dbus/dbus.h>
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
++
++static DBusHandlerResult signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data);
++
++static const char *PATH="/org/selinux/Restorecond";
++//static const char *BUSNAME="org.selinux.Restorecond";
++static const char *INTERFACE="org.selinux.RestorecondIface";
++static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'";
++
++
++static DBusHandlerResult
++signal_filter (DBusConnection *connection  __attribute__ ((__unused__)), DBusMessage *message, void *user_data)
++{
++  /* User data is the event loop we are running in */
++  GMainLoop *loop = user_data;
++
++  /* A signal from the bus saying we are about to be disconnected */
++  if (dbus_message_is_signal 
++        (message, INTERFACE, "Stop")) {
++	  
++      /* Tell the main loop to quit */
++      g_main_loop_quit (loop);
++      /* We have handled this message, don't pass it on */
++      return DBUS_HANDLER_RESULT_HANDLED;
++  }
++  /* A Ping signal on the com.burtonini.dbus.Signal interface */
++  else if (dbus_message_is_signal (message, INTERFACE, "Start")) {
++    DBusError error;
++    dbus_error_init (&error);
++    g_print("Start received\n");
++    return DBUS_HANDLER_RESULT_HANDLED;
++  }
++  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
++}
++
++static int dbus_server(GMainLoop *loop) {
++    DBusConnection *bus;
++    DBusError error;
++    dbus_error_init (&error);
++    bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
++    if (bus) {
++	dbus_connection_setup_with_g_main (bus, NULL);
++	
++	/* listening to messages from all objects as no path is specified */
++	dbus_bus_add_match (bus, RULE, &error); // see signals from the given interfacey
++	dbus_connection_add_filter (bus, signal_filter, loop, NULL);
++	return 0;
++    } 
++    return -1;
++}
++
++#endif
++#include <selinux/selinux.h>
++#include <sys/file.h>
++
++/* size of the event structure, not counting name */
++#define EVENT_SIZE  (sizeof (struct inotify_event))
++/* reasonable guess as to size of 1024 events */
++#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
++
++static gboolean
++io_channel_callback
++ (GIOChannel *source,
++  GIOCondition condition,
++  gpointer data __attribute__((__unused__)))
++{
++
++  char buffer[BUF_LEN+1];
++  gsize bytes_read;
++  unsigned int i = 0;
++
++  if (condition & G_IO_IN) {
++    /* Data is available. */
++    g_io_channel_read
++      (source, buffer,
++       sizeof (buffer),
++       &bytes_read);
++
++    while (i < bytes_read) {
++	    struct inotify_event *event;
++	    event = (struct inotify_event *)&buffer[i];
++	    if (debug_mode)
++		    printf("wd=%d mask=%u cookie=%u len=%u\n",
++			   event->wd, event->mask,
++			   event->cookie, event->len);
++	    if (event->len)
++		    watch_list_find(event->wd, event->name);
++	    
++	    i += EVENT_SIZE + event->len;
++    }
++  }
++
++  /* An error happened while reading
++     the file. */
++
++  if (condition & G_IO_NVAL)
++    return FALSE;
++
++  /* We have reached the end of the
++     file. */
++
++  if (condition & G_IO_HUP) {
++    g_io_channel_close (source);
++    return FALSE;
++  }
++
++  /* Returning TRUE will make sure
++     the callback remains associated
++     to the channel. */
++
++  return TRUE;
++}
++
++int start() {
++#ifdef HAVE_DBUS
++	DBusConnection *bus;
++	DBusError error;
++	DBusMessage *message;
++	
++	/* Get a connection to the session bus */
++	dbus_error_init (&error);
++	bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
++	if (!bus) {
++		if (debug_mode)
++			g_warning ("Failed to connect to the D-BUS daemon: %s", error.message);
++		dbus_error_free (&error);
++		return 1;
++	}
++	
++
++	/* Create a new signal "Start" on the interface,
++	 * from the object  */
++	message = dbus_message_new_signal (PATH,
++					   INTERFACE, "Start");
++	/* Send the signal */
++	dbus_connection_send (bus, message, NULL);
++	/* Free the signal now we have finished with it */
++	dbus_message_unref (message);
++#endif /* HAVE_DBUS */
++	return 0;
++}
++
++static int local_server() {
++	// ! dbus, run as local service
++	char *ptr=NULL;
++	asprintf(&ptr, "%s/.restorecond", homedir);
++	int fd = open(ptr, O_CREAT | O_WRONLY | O_NOFOLLOW, S_IRUSR | S_IWUSR);
++	if (debug_mode)
++		g_warning ("Lock file: %s", ptr);
++	
++	free(ptr);
++	if (fd < 0) {
++		if (debug_mode)
++			perror("open");
++		return -1;
++	}
++	if (flock(fd, LOCK_EX | LOCK_NB) < 0) {
++		if (debug_mode)
++			perror("flock");
++		return -1;
++	}
++	return 0;
++}
++
++int server(int master_fd, const char *watch_file) {
++    GMainLoop *loop;
++
++    loop = g_main_loop_new (NULL, FALSE);
++    
++#ifdef HAVE_DBUS
++    if (dbus_server(loop) != 0) 
++#endif /* HAVE_DBUS */
++	    if (local_server(loop) != 0) 
++		    return 0;
++
++    read_config(master_fd, watch_file);
++    
++    set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
++    
++    GIOChannel *c = g_io_channel_unix_new(master_fd);
++    
++    g_io_add_watch_full( c,
++			 G_PRIORITY_HIGH,
++			 G_IO_IN|G_IO_ERR|G_IO_HUP,
++			 io_channel_callback, NULL, NULL);
++    
++    g_main_loop_run (loop);
++    return 0;
++}
++
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.71/restorecond/watch.c
+--- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-20 13:08:19.000000000 -0400
+@@ -0,0 +1,254 @@
++#define _GNU_SOURCE
++#include <sys/inotify.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <ctype.h>
++#include <sys/types.h>
++#include <syslog.h>
++#include "../setfiles/restore.h"
++#include <glob.h>
++#include <libgen.h>
++#include <sys/stat.h>
++#include <string.h>
++#include <stdio.h>
++#include <fcntl.h>
++#include <selinux/selinux.h>
++#include "restorecond.h"
++#include "stringslist.h"
++#include "utmpwatcher.h"
++
++/* size of the event structure, not counting name */
++#define EVENT_SIZE  (sizeof (struct inotify_event))
++/* reasonable guess as to size of 1024 events */
++#define BUF_LEN        (1024 * (EVENT_SIZE + 16))
++
++
++struct watchList {
++	struct watchList *next;
++	int wd;
++	char *dir;
++	struct stringsList *files;
++};
++struct watchList *firstDir = NULL;
++
++
++void watch_list_add(int fd, const char *path)
++{
++	struct watchList *ptr = NULL;
++	size_t i = 0;
++	struct watchList *prev = NULL;
++	glob_t globbuf;
++	char *x = strdup(path);
++	if (!x)
++		exitApp("Out of Memory");
++	char *file = basename(x);
++	char *dir = dirname(x);
++	ptr = firstDir;
++
++	globbuf.gl_offs = 1;
++	if (glob(path, 
++		 GLOB_TILDE | GLOB_PERIOD,
++		 NULL,
++		 &globbuf) >= 0) {
++		for (i=0; i < globbuf.gl_pathc; i++) {
++		  int len = strlen(globbuf.gl_pathv[i]) -2;
++		  if (len > 0 && strcmp(&globbuf.gl_pathv[i][len--], "/.") == 0) continue;
++		  if (len > 0 && strcmp(&globbuf.gl_pathv[i][len], "/..") == 0) continue;
++		  if (process_one(globbuf.gl_pathv[i], 0) > 0)
++		    process_one(globbuf.gl_pathv[i], 1);
++		}
++		globfree(&globbuf);
++	}
++
++	while (ptr != NULL) {
++		if (strcmp(dir, ptr->dir) == 0) {
++			strings_list_add(&ptr->files, file);
++			free(x);
++			return;
++		}
++		prev = ptr;
++		ptr = ptr->next;
++	}
++	ptr = calloc(1, sizeof(struct watchList));
++
++	if (!ptr)
++		exitApp("Out of Memory");
++
++	ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
++	if (ptr->wd == -1) {
++		free(ptr);
++		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
++		       path, strerror(errno));
++		return;
++	}
++
++	ptr->dir = strdup(dir);
++	if (!ptr->dir)
++		exitApp("Out of Memory");
++
++	strings_list_add(&ptr->files, file);
++	if (prev)
++		prev->next = ptr;
++	else
++		firstDir = ptr;
++
++	if (debug_mode)
++		printf("%d: Dir=%s, File=%s\n", ptr->wd, ptr->dir, file);
++
++	free(x);
++}
++
++/* 
++   A file was in a direcroty has been created. This function checks to 
++   see if it is one that we are watching.
++*/
++
++int watch_list_find(int wd, const char *file)
++{
++	struct watchList *ptr = NULL;
++	ptr = firstDir;
++	if (debug_mode)
++		printf("%d: File=%s\n", wd, file);
++	while (ptr != NULL) {
++		if (ptr->wd == wd) {
++			int exact=0;
++			if (strings_list_find(ptr->files, file, &exact) == 0) {
++				char *path = NULL;
++				if (asprintf(&path, "%s/%s", ptr->dir, file) <
++				    0)
++					exitApp("Error allocating memory.");
++				
++				process_one(path, 0);
++				free(path);
++				return 0;
++			}
++			if (debug_mode)
++				strings_list_print(ptr->files);
++
++			/* Not found in this directory */
++			return -1;
++		}
++		ptr = ptr->next;
++	}
++	/* Did not find a directory */
++	return -1;
++}
++
++void watch_list_free(int fd)
++{
++	struct watchList *ptr = NULL;
++	struct watchList *prev = NULL;
++	ptr = firstDir;
++
++	while (ptr != NULL) {
++		inotify_rm_watch(fd, ptr->wd);
++		strings_list_free(ptr->files);
++		free(ptr->dir);
++		prev = ptr;
++		ptr = ptr->next;
++		free(prev);
++	}
++	firstDir = NULL;
++}
++
++/* 
++   Inotify watch loop 
++*/
++int watch(int fd, const char *watch_file)
++{
++	char buf[BUF_LEN];
++	int len, i = 0;
++	len = read(fd, buf, BUF_LEN);
++	if (len < 0) {
++		if (terminate == 0) {
++			syslog(LOG_ERR, "Read error (%s)", strerror(errno));
++			return 0;
++		}
++		syslog(LOG_ERR, "terminated");
++		return -1;
++	} else if (!len)
++		/* BUF_LEN too small? */
++		return -1;
++	while (i < len) {
++		struct inotify_event *event;
++		event = (struct inotify_event *)&buf[i];
++		if (debug_mode)
++			printf("wd=%d mask=%u cookie=%u len=%u\n",
++			       event->wd, event->mask,
++			       event->cookie, event->len);
++		if (event->wd == master_wd)
++			read_config(fd, watch_file);
++		else {
++			if (event->len)
++				watch_list_find(event->wd, event->name);
++		}
++
++		i += EVENT_SIZE + event->len;
++	}
++	return 0;
++}
++
++static void process_config(int fd, FILE * cfg)
++{
++	char *line_buf = NULL;
++	size_t len = 0;
++
++	while (getline(&line_buf, &len, cfg) > 0) {
++		char *buffer = line_buf;
++		while (isspace(*buffer))
++			buffer++;
++		if (buffer[0] == '#')
++			continue;
++		int l = strlen(buffer) - 1;
++		if (l <= 0)
++			continue;
++		buffer[l] = 0;
++		if (buffer[0] == '~') {
++			if (run_as_user) {
++				char *ptr=NULL;
++				asprintf(&ptr, "%s%s", homedir, &buffer[1]);
++				watch_list_add(fd, ptr);
++				free(ptr);
++			} else {
++				utmpwatcher_add(fd, &buffer[1]);
++			}
++		} else {
++			watch_list_add(fd, buffer);
++		}
++	}
++	free(line_buf);
++}
++
++/* 
++   Read config file ignoring Comment lines 
++   Files specified one per line.  Files with "~" will be expanded to the logged in users
++   homedirs.
++*/
++
++void read_config(int fd, const char *watch_file_path)
++{
++
++	FILE *cfg = NULL;
++	if (debug_mode)
++		printf("Read Config\n");
++
++	watch_list_free(fd);
++
++	cfg = fopen(watch_file_path, "r");
++	if (!cfg){
++		perror(watch_file_path);
++		exitApp("Error reading config file");
++	}
++	process_config(fd, cfg);
++	fclose(cfg);
++
++	inotify_rm_watch(fd, master_wd);
++	master_wd =
++	    inotify_add_watch(fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
++	if (master_wd == -1)
++		exitApp("Error watching config file.");
++}
++
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.71/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
 +++ policycoreutils-2.0.71/scripts/chcat	2009-08-20 12:53:16.000000000 -0400



From toshio at fedoraproject.org  Thu Aug 20 19:57:49 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 19:57:49 +0000 (UTC)
Subject: rpms/gtksourceview2-sharp/F-11 gtksourceview2-sharp.spec,1.5,1.6
Message-ID: <20090820195749.5990911C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gtksourceview2-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986

Modified Files:
	gtksourceview2-sharp.spec 
Log Message:

* Thu 20 Aug 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0-4.svn89788.3.1
- Rebuild for an unexpected bodhi interaction.



Index: gtksourceview2-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2-sharp/F-11/gtksourceview2-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gtksourceview2-sharp.spec	25 May 2009 20:43:18 -0000	1.5
+++ gtksourceview2-sharp.spec	20 Aug 2009 19:57:47 -0000	1.6
@@ -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: 5.svn%{svn_revision}.3%{dist}.1
 License: LGPLv2
 Group: System Environment/Libraries
 Source0: http://ftp.novell.com/pub/mono/sources/%{name}-%{svn_revision}.tar.bz2
@@ -61,6 +61,12 @@ make DESTDIR=%{buildroot} install
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Thu 20 Aug 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0-4.svn89788.3.1
+- Rebuild for an unexpected bodhi interaction.
+
+* 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
+
 * Mon May 25 2009 Xavier Lamien <laxathom at fedoraproject.org> 1.0-4.svn89788.3
 - Build arch ppc64.
 



From akurtakov at fedoraproject.org  Thu Aug 20 19:58:18 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 20 Aug 2009 19:58:18 +0000 (UTC)
Subject: rpms/easymock/devel easymock.spec,1.2,1.3
Message-ID: <20090820195818.8583911C006E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/easymock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15133/devel

Modified Files:
	easymock.spec 
Log Message:
- Bump release for rebuild.


Index: easymock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easymock/devel/easymock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- easymock.spec	20 Aug 2009 06:51:20 -0000	1.2
+++ easymock.spec	20 Aug 2009 19:58:18 -0000	1.3
@@ -30,7 +30,7 @@
 
 Name:           easymock
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Epoch:          0
 Summary:        Easy mock objects
 Group:          Development/Libraries
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-11
+- Bump release for rebuild.
+
 * Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-10
 - Disable tests.
 



From toshio at fedoraproject.org  Thu Aug 20 20:01:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 20:01:09 +0000 (UTC)
Subject: rpms/gtksourceview2-sharp/F-11 gtksourceview2-sharp.spec,1.6,1.7
Message-ID: <20090820200109.CB99911C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gtksourceview2-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15981

Modified Files:
	gtksourceview2-sharp.spec 
Log Message:
Fix date in changelog



Index: gtksourceview2-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2-sharp/F-11/gtksourceview2-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gtksourceview2-sharp.spec	20 Aug 2009 19:57:47 -0000	1.6
+++ gtksourceview2-sharp.spec	20 Aug 2009 20:01:09 -0000	1.7
@@ -61,7 +61,7 @@ make DESTDIR=%{buildroot} install
 %{__rm} -rf %{buildroot}
 
 %changelog
-* Thu 20 Aug 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0-4.svn89788.3.1
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0-4.svn89788.3.1
 - Rebuild for an unexpected bodhi interaction.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5.svn89788.3



From overholt at fedoraproject.org  Thu Aug 20 20:08:56 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 20 Aug 2009 20:08:56 +0000 (UTC)
Subject: rpms/plexus-maven-plugin/devel
	plexus-maven-plugin-add-jdom-dep.patch, 
	1.1, 1.2 plexus-maven-plugin-maven-doxia.patch, 1.1,
	1.2 .cvsignore, 1.2, 1.3 plexus-maven-plugin.spec, 1.12,
	1.13 sources, 1.2, 1.3
Message-ID: <20090820200856.3B0E911C006E@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17992

Modified Files:
	.cvsignore plexus-maven-plugin.spec sources 
Added Files:
	plexus-maven-plugin-add-jdom-dep.patch 
	plexus-maven-plugin-maven-doxia.patch 
Log Message:
* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.3.5-1.1
- Update to 1.3.5 (courtesy Ralph Apel and Deepak Bhole)
- Remove gcj support

plexus-maven-plugin-add-jdom-dep.patch:
 pom.xml |    5 +++++
 1 file changed, 5 insertions(+)

Index: plexus-maven-plugin-add-jdom-dep.patch
===================================================================
RCS file: plexus-maven-plugin-add-jdom-dep.patch
diff -N plexus-maven-plugin-add-jdom-dep.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-maven-plugin-add-jdom-dep.patch	20 Aug 2009 20:08:55 -0000	1.2
@@ -0,0 +1,15 @@
+diff -up ./pom.xml.sav ./pom.xml
+--- ./pom.xml.sav	2007-03-17 19:28:24.000000000 -0400
++++ ./pom.xml	2008-12-01 15:34:11.000000000 -0500
+@@ -47,6 +47,11 @@
+       <artifactId>plexus-cdc</artifactId>
+       <version>1.0-alpha-10</version>
+     </dependency>
++    <dependency>
++      <groupId>JPP</groupId>
++      <artifactId>jdom</artifactId>
++      <version>1.0</version>
++    </dependency>
+   </dependencies>
+   <scm> 
+     <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5</connection>

plexus-maven-plugin-maven-doxia.patch:
 PlexusComponentsReport.java |   10 +++++-----
 report/Component.java       |    2 +-
 report/ComponentSet.java    |    2 +-
 report/Components.java      |    2 +-
 report/Configuration.java   |    2 +-
 report/Requirement.java     |    2 +-
 report/Requirements.java    |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

Index: plexus-maven-plugin-maven-doxia.patch
===================================================================
RCS file: plexus-maven-plugin-maven-doxia.patch
diff -N plexus-maven-plugin-maven-doxia.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plexus-maven-plugin-maven-doxia.patch	20 Aug 2009 20:08:55 -0000	1.2
@@ -0,0 +1,100 @@
+--- src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java.sav0	2007-11-22 18:04:28.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java	2007-11-22 18:04:42.000000000 +0100
+@@ -27,8 +27,8 @@
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.reporting.AbstractMavenReport;
+ import org.apache.maven.reporting.MavenReportException;
+-import org.codehaus.doxia.sink.Sink;
+-import org.codehaus.doxia.site.renderer.SiteRenderer;
++import org.apache.maven.doxia.sink.Sink;
++import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.codehaus.plexus.maven.plugin.report.ComponentSet;
+ import org.jdom.Document;
+ import org.jdom.JDOMException;
+@@ -62,9 +62,9 @@
+     private MavenProject project;
+ 
+     /**
+-     * @component org.codehaus.doxia.site.renderer.SiteRenderer
++     * @component org.apache.maven.doxia.siterenderer.Renderer
+      */
+-    private SiteRenderer siteRenderer;
++    private Renderer siteRenderer;
+ 
+     /**
+      * @parameter expression="${project.reporting.outputDirectory}
+@@ -114,7 +114,7 @@
+         return project;
+     }
+ 
+-    protected SiteRenderer getSiteRenderer()
++    protected Renderer getSiteRenderer()
+     {
+         return siteRenderer;
+     }
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java.sav1	2007-11-22 18:18:16.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java	2007-11-22 18:19:05.000000000 +0100
+@@ -17,7 +17,7 @@
+  */
+ import java.util.List;
+ 
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.jdom.Element;
+ 
+ /**
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav0	2007-11-22 18:21:17.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java	2007-11-22 18:21:49.000000000 +0100
+@@ -15,7 +15,7 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.jdom.Element;
+ 
+ import java.util.ArrayList;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav0	2007-11-22 18:25:57.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java	2007-11-22 18:26:46.000000000 +0100
+@@ -17,7 +17,7 @@
+  */
+ 
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.codehaus.plexus.util.StringUtils;
+ 
+ import java.util.Iterator;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav0	2007-11-22 18:29:44.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java	2007-11-22 18:30:22.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
+ 
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ 
+ /**
+  * @author <a href="mailto:trygvis at inamo.no">Trygve Laugst&oslash;l</a>
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav0	2007-11-22 18:31:57.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java	2007-11-22 18:32:14.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
+ 
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ 
+ import java.util.Iterator;
+ import java.util.List;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav0	2007-11-22 18:34:25.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java	2007-11-22 18:34:45.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
+ 
+ import org.jdom.Element;
+-import org.codehaus.doxia.sink.Sink;
++import org.apache.maven.doxia.sink.Sink;
+ import org.codehaus.plexus.util.StringUtils;
+ 
+ /**


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2007 03:59:53 -0000	1.2
+++ .cvsignore	20 Aug 2009 20:08:55 -0000	1.3
@@ -1 +1 @@
-plexus-maven-plugin-src.tar.gz
+plexus-maven-plugin-1.3.5-src.tar.gz


Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- plexus-maven-plugin.spec	26 Jul 2009 18:56:11 -0000	1.12
+++ plexus-maven-plugin.spec	20 Aug 2009 20:08:55 -0000	1.13
@@ -28,34 +28,31 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define parent plexus
 %define subname maven-plugin
 
 %define maven_settings_file %{_builddir}/%{name}/settings.xml
 
 Name:           %{parent}-%{subname}
-Version:        1.2
-Release:        4.7%{?dist}
+Version:        1.3.5
+Release:        1.1%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        MIT
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
 
-Source0:        %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-maven-plugin-1.2 
-#   plexus-maven-plugin/
-# tar czf plexus-maven-plugin-src.tar.gz plexus-maven-plugin/
-Source1:        %{name}-jpp-depmap.xml
+# svn export \
+#   http://svn.codehaus.org/plexus/archive/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5/
+# tar czf plexus-maven-plugin-1.3.5-src.tar.gz plexus-maven-plugin-1.3.5
+Source0:        %{name}-%{version}-src.tar.gz
+
+Patch0:         %{name}-maven-doxia.patch
+Patch1:         %{name}-add-jdom-dep.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2 >= 2.0.4
@@ -64,35 +61,24 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-plugin
-BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  plexus-appserver >= 1.0-0.a5.3
-BuildRequires:  plexus-cdc >= 1.0-0.a4.2
+BuildRequires:  plexus-cdc >= 1.0-0.5.a10
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-runtime-builder >= 1.0-0.a9.2
-BuildRequires:  tomcat5
-BuildRequires:  tomcat5-servlet-2.4-api
 
 Requires:       maven2 >= 2.0.4
 Requires:       maven2-common-poms >= 1.0
 Requires:       plexus-appserver >= 1.0-0.a5.3
-Requires:       plexus-cdc >= 1.0-0.a4.2
+BuildRequires:  plexus-cdc >= 1.0-0.5.a10
 Requires:       plexus-container-default
 Requires:       plexus-runtime-builder >= 1.0-0.a9.2
-Requires:       tomcat5
-Requires:       tomcat5-servlet-2.4-api
 
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 Plexus Maven Plugin helps create plexus component descriptions
 from within Maven.
@@ -105,20 +91,19 @@ Group:          Development/Documentatio
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q
+%patch0 -b .sav
+%patch1 -b .sav
 
 %build
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
 mvn-jpp \
         -e \
-                -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
-#        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
@@ -142,49 +127,30 @@ cp -pr target/site/apidocs/* \
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %postun
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/plexus
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-plugin-1.2.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.3.5-1.1
+- Update to 1.3.5 (courtesy Ralph Apel and Deepak Bhole)
+- Remove gcj support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-4.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-maven-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2007 03:59:53 -0000	1.2
+++ sources	20 Aug 2009 20:08:55 -0000	1.3
@@ -1 +1 @@
-7b14f7b4f7ff23672db8423e92830ed0  plexus-maven-plugin-src.tar.gz
+a43d1f8144bd467168b84e83cf62728a  plexus-maven-plugin-1.3.5-src.tar.gz



From toshio at fedoraproject.org  Thu Aug 20 20:16:50 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 20:16:50 +0000 (UTC)
Subject: rpms/gbrainy/devel gbrainy.spec,1.15,1.16
Message-ID: <20090820201650.DF76211C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19749

Modified Files:
	gbrainy.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-5
- Build with ppc64 again due to obsolecense of previous update.



Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gbrainy.spec	24 Jul 2009 23:33:43 -0000	1.15
+++ gbrainy.spec	20 Aug 2009 20:16:50 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -18,7 +18,7 @@ BuildRequires:	gtk-sharp2-devel gnome-sh
 BuildRequires:  /usr/bin/desktop-file-install
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
 
 %description
 gbrainy is a brain teaser game and trainer to have
@@ -83,9 +83,15 @@ fi
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-5
+- Build with ppc64 again due to obsolecense of previous update.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1-4
+- Build arch ppc64.
+
 * Tue Apr 14 2009 Beno?t Marcelin <sereinity at online.fr> 1.1-3
 - Re-enable ppc
 



From toshio at fedoraproject.org  Thu Aug 20 20:24:23 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 20:24:23 +0000 (UTC)
Subject: rpms/gbrainy/F-11 gbrainy.spec,1.15,1.16
Message-ID: <20090820202423.E45DF11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gbrainy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20904

Modified Files:
	gbrainy.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-5
- Build with ppc64 again due to obsolecense of previous update.



Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-11/gbrainy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gbrainy.spec	1 Jun 2009 23:11:03 -0000	1.15
+++ gbrainy.spec	20 Aug 2009 20:24:23 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -17,6 +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
 
 %description
 gbrainy is a brain teaser game and trainer to have
@@ -81,6 +83,12 @@ fi
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-5
+- Build with ppc64 again due to obsolecense of previous update.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1-4
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 20:32:47 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 20:32:47 +0000 (UTC)
Subject: rpms/giver/F-11 giver.spec,1.3,1.4
Message-ID: <20090820203247.A34FA11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/giver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22957/F-11

Modified Files:
	giver.spec 
Log Message:
Rebuild to get ppc64 packages



Index: giver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giver/F-11/giver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- giver.spec	1 Jun 2009 21:46:24 -0000	1.3
+++ giver.spec	20 Aug 2009 20:32:47 -0000	1.4
@@ -4,7 +4,7 @@
 Name:		giver
 Summary: 	A simple file sharing desktop application
 Version:	0.1.8
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	MIT
 Group:		Applications/Internet
 Source0:	http://giver.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -24,7 +24,7 @@ BuildRequires:  avahi-sharp
 BuildRequires:	desktop-file-utils, intltool
 Requires:	notify-sharp gtk-sharp2 gnome-sharp avahi-sharp
 
-# No mono implementation for ppc64 or sparc64 right now
+# No mono implementation for sparc64 right now
 ExcludeArch:	sparc64
 
 %description
@@ -78,6 +78,12 @@ fi
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1.8-6
+- Build for arch ppc64 as the previous build was obsoleted.
+
+* 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
+
 * Fri May 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.1.8-5
 - Build for arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 20:32:47 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 20:32:47 +0000 (UTC)
Subject: rpms/giver/devel giver.spec,1.3,1.4
Message-ID: <20090820203247.D30C311C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/giver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22957/devel

Modified Files:
	giver.spec 
Log Message:
Rebuild to get ppc64 packages



Index: giver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/giver/devel/giver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- giver.spec	25 Jul 2009 00:13:46 -0000	1.3
+++ giver.spec	20 Aug 2009 20:32:47 -0000	1.4
@@ -4,7 +4,7 @@
 Name:		giver
 Summary: 	A simple file sharing desktop application
 Version:	0.1.8
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	MIT
 Group:		Applications/Internet
 Source0:	http://giver.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -24,8 +24,8 @@ BuildRequires:  avahi-sharp
 BuildRequires:	desktop-file-utils, intltool
 Requires:	notify-sharp gtk-sharp2 gnome-sharp avahi-sharp
 
-# No mono implementation for ppc64 or sparc64 right now
-ExcludeArch:	ppc64 sparc64
+# No mono implementation for sparc64 right now
+ExcludeArch:	sparc64
 
 %description
 Giver is a simple file sharing desktop application. Other people running Giver 
@@ -78,9 +78,15 @@ fi
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1.8-6
+- Build for arch ppc64 as the previous build was obsoleted.
+
 * 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
 
+* Fri May 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.1.8-5
+- Build for arch ppc64.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From bpepple at fedoraproject.org  Thu Aug 20 20:39:50 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 20 Aug 2009 20:39:50 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.51, 1.52 sources, 1.51,
	1.52 telepathy-gabble.spec, 1.62, 1.63
Message-ID: <20090820203950.875AB11C006E@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24456

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Aug 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.1-1
- Update to 0.8.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	18 Aug 2009 23:41:49 -0000	1.51
+++ .cvsignore	20 Aug 2009 20:39:49 -0000	1.52
@@ -1 +1 @@
-telepathy-gabble-0.8.0.tar.gz
+telepathy-gabble-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	18 Aug 2009 23:41:49 -0000	1.51
+++ sources	20 Aug 2009 20:39:50 -0000	1.52
@@ -1 +1 @@
-e69113294db17c3b43777a7cb699b931  telepathy-gabble-0.8.0.tar.gz
+06a50caf8e071035437ff2f246e6aca1  telepathy-gabble-0.8.1.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- telepathy-gabble.spec	18 Aug 2009 23:41:50 -0000	1.62
+++ telepathy-gabble.spec	20 Aug 2009 20:39:50 -0000	1.63
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.0
+Version:        0.8.1
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.1-1
+- Update to 0.8.1.
+
 * Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
 - Update to 0.8.0.
 - Bump min version of tp-glib needed.



From ausil at fedoraproject.org  Thu Aug 20 20:50:19 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 20:50:19 +0000 (UTC)
Subject: rpms/nss-util/devel nss-split-util.sh, 1.2, 1.3 nss-util-config.in, 
	1.2, 1.3 nss-util.pc.in, 1.2, 1.3
Message-ID: <20090820205019.958D011C0417@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26683

Added Files:
	nss-split-util.sh nss-util-config.in nss-util.pc.in 
Log Message:
add back the deleted files



Index: nss-split-util.sh
===================================================================
RCS file: nss-split-util.sh
diff -N nss-split-util.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-split-util.sh	20 Aug 2009 20:50:18 -0000	1.3
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Splits NSS into nss-util 
+# Takes as command line input the version of nss
+# and assumes that a file nss-${nss_version}-stripped.tar.bz2
+# exits in the current directory
+
+set -e
+
+if test -z $1
+then
+  echo "usage: $0 nss-version"
+  exit
+fi
+
+export name=nss
+export version=$1
+
+echo "Extracting ${name}-${version}-stripped.tar.bz2"
+
+tar -xjf ${name}-${version}-stripped.tar.bz2
+
+# the directory will be named ${name}-${version}
+
+nss_source_dir=${name}-${version}
+util_dir=${name}-util-${version}
+softokn_dir=${name}-softokn-${version}
+
+# make_nss_util
+#-------------------------------------------------
+# create the nss-util subset consisting of
+#   mozilla/dbm                   --- full directory
+#   mozilla/security              --- top empty
+#   mozilla/security/coreconf     --- full directory
+#   mozilla/security/nss          --- top files only
+#   mozilla/security/nss/lib      --- top files only
+#   mozilla/security/nss/lib/util --- full directory
+#--------------------------------------------------
+
+UTIL_WORK=${util_dir}-work
+rm -rf ${UTIL_WORK}
+mkdir ${UTIL_WORK}
+
+# copy everything
+cp -a ${nss_source_dir} ${UTIL_WORK}/${util_dir}
+
+# remove subdirectories that we don't want
+rm -rf ${UTIL_WORK}/${util_dir}/mozilla/security/nss/cmd
+rm -rf ${UTIL_WORK}/${util_dir}/mozilla/security/nss/tests
+rm -rf ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
+
+# start with an empty lib directory to be filled
+mkdir ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
+# copy some files at the top and the util subdirectory recursively
+cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
+cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/util ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib/util
+pushd ${UTIL_WORK}
+# the compressed tar ball for nss-util
+tar -cjf ../${name}-util-${version}.tar.bz2 ${util_dir}
+popd
+
+# cleanup after ourselves
+rm -fr ${nss_source_dir}
+rm -fr ${UTIL_WORK}
+
+
+


Index: nss-util-config.in
===================================================================
RCS file: nss-util-config.in
diff -N nss-util-config.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-util-config.in	20 Aug 2009 20:50:18 -0000	1.3
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-util-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nssutil
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=no
+lib_smime=no
+lib_nss=no
+lib_nssutil=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=no
+      ;;
+    smime)
+      lib_smime=no
+      ;;
+    nss)
+      lib_nss=no
+      ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=`pkg-config --variable=exec_prefix nssutil`
+fi
+if test -z "$includedir"; then
+    includedir=`pkg-config --variable=includedir nssutil`
+fi
+if test -z "$libdir"; then
+    libdir=`pkg-config --variable=libdir nssutil`
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      echo $libdirs
+fi      
+


Index: nss-util.pc.in
===================================================================
RCS file: nss-util.pc.in
diff -N nss-util.pc.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-util.pc.in	20 Aug 2009 20:50:19 -0000	1.3
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-UTIL
+Description: Network Security Services Utility Library
+Version: %NSSUTIL_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lnssutil3
+Cflags: -I${includedir}



From ausil at fedoraproject.org  Thu Aug 20 20:57:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 20:57:53 +0000 (UTC)
Subject: rpms/nss/devel nss-nolocalsql.patch,1.3,1.4
Message-ID: <20090820205753.7993F11C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28213

Added Files:
	nss-nolocalsql.patch 
Log Message:
readd back deleted file needed for srpm creation


nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: nss-nolocalsql.patch
diff -N nss-nolocalsql.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-nolocalsql.patch	20 Aug 2009 20:57:53 -0000	1.4
@@ -0,0 +1,52 @@
+diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
++++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
+@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
+ DIRS := $(filter-out fortcrypt,$(DIRS))
+ endif
+ 
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-DIRS := sqlite $(DIRS)
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#DIRS := sqlite $(DIRS)
++#endif
++#endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ CSRCS = \
+ 	dbmshim.c \
+diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ EXPORTS = \
+ 	secmodt.h \



From ausil at fedoraproject.org  Thu Aug 20 21:03:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 21:03:08 +0000 (UTC)
Subject: rpms/nss/devel nss-stubs-bug502133.patch,1.2,1.3
Message-ID: <20090820210308.D1D4C11C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30019

Added Files:
	nss-stubs-bug502133.patch 
Log Message:
readd deleted patch still referenced in spec


nss-stubs-bug502133.patch:
 stubs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: nss-stubs-bug502133.patch
===================================================================
RCS file: nss-stubs-bug502133.patch
diff -N nss-stubs-bug502133.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-stubs-bug502133.patch	20 Aug 2009 21:03:08 -0000	1.3
@@ -0,0 +1,23 @@
+diff -rupN nss-3.12.3.99.3-orig/mozilla/security/nss/lib/freebl/stubs.c nss-3.12.3.99.3/mozilla/security/nss/lib/freebl/stubs.c
+--- ./mozilla/security/nss/lib/freebl/stubs.c	2009-03-28 19:21:50.000000000 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.c	2009-06-08 20:37:20.000000000 -0700
+@@ -558,8 +558,8 @@ FREEBL_InitStubs()
+ 	    return SECFailure;
+ 	}
+ 	rv = freebl_InitNSPR(nspr);
+-	freebl_releaseLibrary(nspr);
+ 	if (rv != SECSuccess) {
++	    freebl_releaseLibrary(nspr);
+ 	    return rv;
+ 	}
+     }
+@@ -570,8 +570,8 @@ FREEBL_InitStubs()
+ 	    return SECFailure;
+ 	}
+ 	rv = freebl_InitNSSUtil(nssutil);
+-	freebl_releaseLibrary(nssutil);
+ 	if (rv != SECSuccess) {
++	    freebl_releaseLibrary(nssutil);
+ 	    return rv;
+ 	}
+     }



From rineau at fedoraproject.org  Thu Aug 20 21:07:23 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Thu, 20 Aug 2009 21:07:23 +0000 (UTC)
Subject: rpms/ipe/F-11 ipe.spec, 1.22, 1.23 sources, 1.5,
	1.6 ipe-6.0pre28-patch1.patch, 1.1,
	NONE ipe-6.0pre30-pdftex1.40.patch, 1.1, NONE
Message-ID: <20090820210723.905A311C006E@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/ipe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30960

Modified Files:
	ipe.spec sources 
Removed Files:
	ipe-6.0pre28-patch1.patch ipe-6.0pre30-pdftex1.40.patch 
Log Message:
* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.32.pre32patch1%{?dist}
- New upstream release
- ipe5toxml no longer shipped
- Patch ipe-6.0pre30-pdftex1.40.patch is obsoleted



Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/F-11/ipe.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ipe.spec	27 Feb 2009 10:23:15 -0000	1.22
+++ ipe.spec	20 Aug 2009 21:07:23 -0000	1.23
@@ -1,8 +1,8 @@
-%define preversion 30
+%define preversion 32patch1
 
 Name:           ipe
 Version:        6.0
-Release:        0.29.pre%{preversion}%{?dist}
+Release:        0.32.pre%{preversion}%{?dist}
 Summary:        Drawing editor for creating figures in PDF or PostScript formats
 
 Group:          Applications/Publishing
@@ -11,13 +11,10 @@ Group:          Applications/Publishing
 License:        GPLv2+ with exceptions
 #
 URL:            http://tclab.kaist.ac.kr/ipe/
-Source0:        http://luaforge.net/frs/download.php/2727/ipe-6.0pre30-src.tar.gz
+Source0:        http://luaforge.net/frs/download.php/4052/ipe-6.0pre%{preversion}-src.tar.gz
 
 Patch1:         ipe-6.0pre30-gcc43.patch
 
-# Upstream patch. http://http.theano.de/cgi-bin/bugzilla/show_bug.cgi?id=253
-Patch2:         ipe-6.0pre30-pdftex1.40.patch
-
 # Fedora specific patch. It removes the runtime test of the Freetype
 # library version. Freetype is supposed to bump its soname if the ABI is
 # incompatible.
@@ -32,14 +29,13 @@ BuildRequires:  pkgconfig
 # Tips found at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191589#c7
 %global qtdir %(pkg-config --variable=prefix QtCore)
 
-Requires:       tetex-latex
+Requires:       tex(latex)
 Requires:       urw-fonts
 Requires:       xdg-utils
 
 Provides:       ipe(api) = 5.99.%{preversion}pre
 Provides:       ipetoipe = %{version}
 Provides:       ipetopng = %{version}
-Provides:       ipe5toxml = %{version}
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -68,9 +64,11 @@ Requires: %{name} = %{version}-%{release
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
 %patch1 -p1 -b '.gcc43'
-%patch2 -p1 -b '.pdf140'
 %patch10 -p1 -b '.no-freetype-check'
 
+# fix files permissions
+find src -type f -exec chmod -x {} +
+
 %build
 export QTDIR=%{qtdir}
 
@@ -158,12 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/ipe
 %dir %{_datadir}/ipe/%{version}
 %{_datadir}/ipe/%{version}/*.xml
-%{_bindir}/ipe5toxml
 %{_bindir}/ipe
 %{_bindir}/ipetoipe
 %{_bindir}/ipetopng
 #%{_bindir}/figtoipe
-%{_mandir}/man1/ipe5toxml.1*
 %{_mandir}/man1/ipe.1*
 %{_mandir}/man1/ipetoipe.1*
 %{_mandir}/man1/ipetopng.1*
@@ -171,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*%{name}*.desktop
 
 %files devel
+%defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
 %{_libdir}/libipe.so
@@ -178,10 +175,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libipemodel.so
 
 %files doc
+%defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.32.pre32patch1%{?dist}
+- New upstream release
+- ipe5toxml no longer shipped
+- Patch ipe-6.0pre30-pdftex1.40.patch is obsoleted
+
+* Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.31.pre30%{?dist}
+- Requires tex(latex) instead of tetex (replaced by TeXLive)
+- Add default attributes (error reported by rpmlint)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-0.30.pre30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Feb 27 2009  <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.29.pre30%{?dist}
 - noarch ipe-doc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Feb 2008 13:30:50 -0000	1.5
+++ sources	20 Aug 2009 21:07:23 -0000	1.6
@@ -1 +1 @@
-d0b203f1cbda664c76681b79684bde76  ipe-6.0pre30-src.tar.gz
+2d979ee33944452b7ba18a0ba7c176f3  ipe-6.0pre32patch1-src.tar.gz


--- ipe-6.0pre28-patch1.patch DELETED ---


--- ipe-6.0pre30-pdftex1.40.patch DELETED ---



From krh at fedoraproject.org  Thu Aug 20 21:16:16 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 20 Aug 2009 21:16:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec,1.22,1.23
Message-ID: <20090820211616.3978211C006E@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-serv32564

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
* Thu Aug 20 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-7
- Don't use fb offset when using shadow fbs.



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.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xorg-x11-drv-intel.spec	12 Aug 2009 17:59:30 -0000	1.22
+++ xorg-x11-drv-intel.spec	20 Aug 2009 21:16:15 -0000	1.23
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -30,6 +30,8 @@ Patch21: intel-2.8.0-lvds-first.patch
 
 Patch40: dri2-page-flip.patch
 
+Patch50: intel-2.8.0-shadow-no-offset.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: autoconf automake libtool
@@ -80,6 +82,7 @@ Debugging tools for Intel graphics chips
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch40 -p1 -b .flip
+%patch50 -p1 -b .shadow-no-offset
 
 %build
  
@@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Aug 20 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-7
+- Don't use fb offset when using shadow fbs.
+
 * Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 2.8.0-6
 - Today's driver snapshot, misc bugfixes.
 



From krh at fedoraproject.org  Thu Aug 20 21:23:04 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 20 Aug 2009 21:23:04 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel intel-2.8.0-shadow-no-offset.patch,
	NONE, 1.1 xorg-x11-drv-intel.spec, 1.23, 1.24
Message-ID: <20090820212304.4DBDB11C006E@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-serv1789

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.8.0-shadow-no-offset.patch 
Log Message:
Add patch

intel-2.8.0-shadow-no-offset.patch:
 drmmode_display.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE intel-2.8.0-shadow-no-offset.patch ---
>From a28d5a18bc5805de201e61ba912f4c35e9e2339b Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Thu, 20 Aug 2009 16:48:58 -0400
Subject: [PATCH] kms: Don't use fb offset when using shadow buffer

---
 src/drmmode_display.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 4fb20d9..af5e56b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -366,8 +366,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 
 
 	fb_id = drmmode->fb_id;
-	if (drmmode_crtc->rotate_fb_id)
+	if (drmmode_crtc->rotate_fb_id) {
 		fb_id = drmmode_crtc->rotate_fb_id;
+		x = 0;
+		y = 0;
+	}
 	ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 			     fb_id, x, y, output_ids, output_count, &kmode);
 	if (ret)
-- 
1.6.2.2



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.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xorg-x11-drv-intel.spec	20 Aug 2009 21:16:15 -0000	1.23
+++ xorg-x11-drv-intel.spec	20 Aug 2009 21:23:04 -0000	1.24
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -138,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
-* Thu Aug 20 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-7
+* Thu Aug 20 2009 Kristian H?gsberg <krh at redhat.com> - 2.8.0-8
 - Don't use fb offset when using shadow fbs.
 
 * Wed Aug 12 2009 Adam Jackson <ajax at redhat.com> 2.8.0-6



From salimma at fedoraproject.org  Thu Aug 20 21:26:19 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 21:26:19 +0000 (UTC)
Subject: rpms/vala/devel .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 vala.spec,
	1.41, 1.42 vala-0.7.4-moduleinit.patch, 1.2, NONE
Message-ID: <20090820212619.9626211C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2564

Modified Files:
	.cvsignore sources vala.spec 
Removed Files:
	vala-0.7.4-moduleinit.patch 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.5-1
- Update to 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	7 Jul 2009 19:31:09 -0000	1.23
+++ .cvsignore	20 Aug 2009 21:26:18 -0000	1.24
@@ -1 +1 @@
-vala-0.7.4.tar.bz2
+vala-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	7 Jul 2009 19:31:09 -0000	1.23
+++ sources	20 Aug 2009 21:26:19 -0000	1.24
@@ -1 +1 @@
-c2bd7765e49e9c1b5fddc9e0aa69a927  vala-0.7.4.tar.bz2
+a102d582b2ac75b6bcdc5785683263fc  vala-0.7.5.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- vala.spec	27 Jul 2009 06:42:51 -0000	1.41
+++ vala.spec	20 Aug 2009 21:26:19 -0000	1.42
@@ -14,8 +14,8 @@
 %endif
 
 Name:           vala
-Version:        0.7.4
-Release:        3%{?dist}
+Version:        0.7.5
+Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -25,8 +25,6 @@ URL:            http://live.gnome.org/Va
 Source0:        http://download.gnome.org/sources/vala/0.7/vala-%{version}.tar.bz2
 Source1:	vala-mode.el
 Source2:	vala-init.el
-# http://bugzilla.gnome.org/show_bug.cgi?id=587444
-Patch0:         vala-0.7.4-moduleinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel flex bison devhelp gecko-libs >= 1.9
@@ -116,7 +114,6 @@ An Emacs mode for editing Vala source co
 
 %prep
 %setup -q
-%patch0 -p1 -b .moduleinit
 
 
 %build
@@ -187,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.5-1
+- Update to 0.7.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- vala-0.7.4-moduleinit.patch DELETED ---



From salimma at fedoraproject.org  Thu Aug 20 21:27:11 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 21:27:11 +0000 (UTC)
Subject: rpms/libgee/devel .cvsignore, 1.5, 1.6 libgee.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20090820212711.95B7511C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/libgee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2867

Modified Files:
	.cvsignore libgee.spec sources 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3.0-1
- Update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgee/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Mar 2009 15:53:09 -0000	1.5
+++ .cvsignore	20 Aug 2009 21:27:11 -0000	1.6
@@ -1 +1 @@
-libgee-0.1.5.tar.bz2
+libgee-0.3.0.tar.bz2


Index: libgee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgee/devel/libgee.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libgee.spec	25 Jul 2009 05:43:30 -0000	1.9
+++ libgee.spec	20 Aug 2009 21:27:11 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           libgee
-Version:        0.1.5
-Release:        2%{?dist}
+Version:        0.3.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.1/libgee-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgee/0.3/libgee-%{version}.tar.bz2
 Patch0:         libgee-0.1.4-notest.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,6 +38,7 @@ It's planned to provide bindings for fur
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       gobject-introspection-devel
 # The Vala API binding is only one file; seems superfluous to have a subpackage
 Requires:       vala, pkgconfig
 
@@ -89,10 +90,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/gee-1.0.pc
+%{_datadir}/gir-1.0/Gee-1.0.gir
 %{_datadir}/vala/vapi/gee-1.0.vapi
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3.0-1
+- Update to 0.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgee/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Mar 2009 15:53:09 -0000	1.5
+++ sources	20 Aug 2009 21:27:11 -0000	1.6
@@ -1 +1 @@
-80102073421e4d7fb18a6aa9622f4de2  libgee-0.1.5.tar.bz2
+1ca2b8a87950ef1b14342fb32db3e558  libgee-0.3.0.tar.bz2



From salimma at fedoraproject.org  Thu Aug 20 21:30:56 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 21:30:56 +0000 (UTC)
Subject: rpms/shotwell/devel shotwell.spec,1.2,1.3
Message-ID: <20090820213056.CF0E711C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4431

Modified Files:
	shotwell.spec 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.2.0-3
- Rebuild against new libgee



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- shotwell.spec	13 Aug 2009 00:27:02 -0000	1.2
+++ shotwell.spec	20 Aug 2009 21:30:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           shotwell
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -73,6 +73,9 @@ gtk-update-icon-cache --quiet %{_datadir
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.2.0-3
+- Rebuild against new libgee
+
 * Sun Aug 12 2009  Matthias Clasen <mclasen at redhat.com> - 0.2.0-2.fc12
 - Bring icon cache handling in sync with current guidelines
 



From salimma at fedoraproject.org  Thu Aug 20 21:31:44 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 20 Aug 2009 21:31:44 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.5,1.6
Message-ID: <20090820213144.1F67911C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4627

Modified Files:
	rygel.spec 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3-6
- Rebuild against new libgee



Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rygel.spec	7 Aug 2009 12:53:02 -0000	1.5
+++ rygel.spec	20 Aug 2009 21:31:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3-6
+- Rebuild against new libgee
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-5
 - Own rygel include dir, some spec file cleanups
 



From ajax at fedoraproject.org  Thu Aug 20 21:40:50 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 20 Aug 2009 21:40:50 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel
	xserver-1.6.99-dri2-swapbuffers-fallback.patch, NONE,
	1.1 .cvsignore, 1.68, 1.69 commitid, 1.31, 1.32 sources, 1.63,
	1.64 xorg-x11-server.spec, 1.473,
	1.474 xserver-1.6.1-proc-cmdline.patch, 1.1,
	NONE xserver-1.6.99-dpms.patch, 1.1,
	NONE xserver-1.6.99-eventtime.patch, 1.1,
	NONE xserver-1.6.99-linkmap.patch, 1.1, NONE
Message-ID: <20090820214050.532C411C006E@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6630

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-dri2-swapbuffers-fallback.patch 
Removed Files:
	xserver-1.6.1-proc-cmdline.patch xserver-1.6.99-dpms.patch 
	xserver-1.6.99-eventtime.patch xserver-1.6.99-linkmap.patch 
Log Message:
* Thu Aug 20 2009 Adam Jackson <ajax at redhat.com> 1.6.99-37.20090820
- Today's git snapshot.
- xserver-1.6.99-dri2-swapbuffers-fallback.patch: Fix SwapBuffers crash.
- xserver-1.6.99-linkmap.patch: Drop, superceded upstream.
- xserver-1.6.1-proc-cmdline.patch, xserver-1.6.99-dpms.patch, 
  xserver-1.6.99-eventtime.patch: Drop, merged.


xserver-1.6.99-dri2-swapbuffers-fallback.patch:
 glxdri2.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE xserver-1.6.99-dri2-swapbuffers-fallback.patch ---
>From 5f566bed4abd8d5efedd36fa41a9aebbba2c93ef Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 20 Aug 2009 14:17:05 -0400
Subject: [PATCH] dri2: Don't crash in SwapBuffers for non DRI2_Flush drivers

---
 glx/glxdri2.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index f0df040..b408c2f 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -173,10 +173,15 @@ __glXDRIdrawableSwapBuffers(__GLXdrawable *drawable)
     __GLXDRIdrawable *priv = (__GLXDRIdrawable *) drawable;
     __GLXDRIscreen *screen = priv->screen;
 
-    (*screen->flush->flushInvalidate)(priv->driDrawable);
-
-    if (DRI2SwapBuffers(drawable->pDraw) != Success)
-	return FALSE;
+    if (screen->flush) {
+	(*screen->flush->flushInvalidate)(priv->driDrawable);
+
+	if (DRI2SwapBuffers(drawable->pDraw) != Success)
+	    return FALSE;
+    } else {
+	__glXDRIdrawableCopySubBuffer(drawable, 0, 0,
+				      priv->width, priv->height);
+    }
 
     return TRUE;
 }
-- 
1.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	13 Aug 2009 23:01:32 -0000	1.68
+++ .cvsignore	20 Aug 2009 21:40:48 -0000	1.69
@@ -1 +1 @@
-xorg-server-20090814.tar.xz
+xorg-server-20090820.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- commitid	13 Aug 2009 23:01:32 -0000	1.31
+++ commitid	20 Aug 2009 21:40:48 -0000	1.32
@@ -1 +1 @@
-db568f9eabf3450d8a023597ff007df355b13ea8
+9d8fc33cae2fee7777edd20658dbf6a3ffb3d557


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	13 Aug 2009 23:01:32 -0000	1.63
+++ sources	20 Aug 2009 21:40:48 -0000	1.64
@@ -1 +1 @@
-c42f978865f2d6be46770eeb0122afee  xorg-server-20090814.tar.xz
+ea807505ea5c7e6c2d1a7f1cadce4f6f  xorg-server-20090820.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -p -r1.473 -r1.474
--- xorg-x11-server.spec	19 Aug 2009 04:50:35 -0000	1.473
+++ xorg-x11-server.spec	20 Aug 2009 21:40:48 -0000	1.474
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090814
+%define gitdate 20090820
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   36.%{gitdate}%{?dist}
+Release:   37.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -47,7 +47,6 @@ Source30: find-provides
 #define __find_provides {nil}
 
 Patch5: xserver-1.4.99-pic-libxf86config.patch
-Patch10: xserver-1.6.99-linkmap.patch
 
 # airlied to upstream for 1.7
 Patch100: xserver-1.6.99-vga-arb.patch
@@ -78,14 +77,9 @@ Patch6016: xserver-1.6.1-nouveau.patch
 # ajax needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
 Patch6028: xserver-1.6.99-randr-error-debugging.patch
-Patch6029: xserver-1.6.1-proc-cmdline.patch
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
-
-# dpms/idlecounter race condition. upstream
-Patch6032: xserver-1.6.99-dpms.patch
-# screen saver/idlecounter race condition. upstream
-Patch6033: xserver-1.6.99-eventtime.patch
+Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -512,6 +506,13 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Aug 20 2009 Adam Jackson <ajax at redhat.com> 1.6.99-37.20090820
+- Today's git snapshot.
+- xserver-1.6.99-dri2-swapbuffers-fallback.patch: Fix SwapBuffers crash.
+- xserver-1.6.99-linkmap.patch: Drop, superceded upstream.
+- xserver-1.6.1-proc-cmdline.patch, xserver-1.6.99-dpms.patch, 
+  xserver-1.6.99-eventtime.patch: Drop, merged.
+
 * Wed Aug 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-36.20090814
 - xserver-1.6.99-eventtime.patch: don't reset the last event time when the
   screen saver activates.


--- xserver-1.6.1-proc-cmdline.patch DELETED ---


--- xserver-1.6.99-dpms.patch DELETED ---


--- xserver-1.6.99-eventtime.patch DELETED ---


--- xserver-1.6.99-linkmap.patch DELETED ---



From mclasen at fedoraproject.org  Thu Aug 20 21:41:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 20 Aug 2009 21:41:23 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.90,1.91
Message-ID: <20090820214123.E343311C006E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6804

Modified Files:
	pulseaudio.spec 
Log Message:
Fix an install ordering problem



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- pulseaudio.spec	19 Aug 2009 02:58:53 -0000	1.90
+++ pulseaudio.spec	20 Aug 2009 21:41:23 -0000	1.91
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        6.test5%{?dist}
+Release:        7.test5%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test5.tar.gz
@@ -194,6 +194,8 @@ Requires:       %{name} = %{version}-%{r
 Requires:	gdm >= 1:2.22.0
 Requires:	pulseaudio-module-bluetooth
 Requires:	pulseaudio-module-x11
+# for the gdm user
+Requires(pre):  gdm
 
 %description gdm-hooks
 This package contains GDM integration hooks for the PulseAudio sound server.
@@ -434,6 +436,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Thu Aug 20 2009 Matthias Clasen <mclasen at redhat.com> - 0.9.16-7.test5
+- Fix install ordering between gdm and pulseaudio-gdm-hooks
+
 * Wed Aug 19 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-6.test5
 - New test release
 



From karsten at fedoraproject.org  Thu Aug 20 21:43:35 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 20 Aug 2009 21:43:35 +0000 (UTC)
Subject: rpms/vim/devel vim.spec,1.239,1.240
Message-ID: <20090820214335.2F73411C006E@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7357

Modified Files:
	vim.spec 
Log Message:
- change range of system ids in /etc/profile.d/vim/* (#518555)


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- vim.spec	3 Aug 2009 16:31:43 -0000	1.239
+++ vim.spec	20 Aug 2009 21:43:34 -0000	1.240
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -898,14 +898,14 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.sh <<EOF
 if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
   [ -x /%{_bindir}/id ] || return
-  [ \`/%{_bindir}/id -u\` -le 100 ] && return
+  [ \`/%{_bindir}/id -u\` -le 200 ] && return
   # for bash and zsh, only if no alias is already set
   alias vi >/dev/null 2>&1 || alias vi=vim
 fi
 EOF
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
 [ -x /%{_bindir}/id ] || exit
-[ \`/%{_bindir}/id -u\` -gt 100 ] && alias vi vim
+[ \`/%{_bindir}/id -u\` -gt 200 ] && alias vi vim
 EOF
 chmod 0644 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
@@ -1150,6 +1150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-3
+- change range of system ids in /etc/profile.d/vim/* (#518555)
+
 * Mon Aug 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.245-2
 - add fix for glibc fortify segfault (#514717, Adam Tkac)
 



From toshio at fedoraproject.org  Thu Aug 20 21:51:57 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 21:51:57 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.38,1.39
Message-ID: <20090820215157.74EBC11C02CC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8959/devel

Modified Files:
	gnome-do.spec 
Log Message:
Fix up lack of ppc64 builds due to an unexpected obsolete interaction in bodhi.



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gnome-do.spec	25 Jul 2009 00:37:43 -0000	1.38
+++ gnome-do.spec	20 Aug 2009 21:51:57 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.1.3
-Release:		6%{?dist}
+Release:		7%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -15,8 +15,6 @@ Patch0:			%{name}-%{version}-application
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:		ppc64
 
 BuildRequires:		mono-devel, mono-addins-devel
 BuildRequires:		desktop-file-utils
@@ -134,9 +132,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1.3-7
+- Rebuild for ppc64 as the previous build was obsoleted.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sat May 30 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.8.1.3-6
+- Build arch ppc64.
+
 * Fri Apr 10 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 0.8.1.3-5
 - Fix .desktop issue, install in both autostart and applications
 - Rebuild for new gnome-desktop-sharp



From toshio at fedoraproject.org  Thu Aug 20 21:51:57 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 21:51:57 +0000 (UTC)
Subject: rpms/gnome-do/F-11 gnome-do.spec,1.38,1.39
Message-ID: <20090820215157.5162F11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gnome-do/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8959/F-11

Modified Files:
	gnome-do.spec 
Log Message:
Fix up lack of ppc64 builds due to an unexpected obsolete interaction in bodhi.



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/gnome-do.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gnome-do.spec	1 Jun 2009 21:22:03 -0000	1.38
+++ gnome-do.spec	20 Aug 2009 21:51:57 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.1.3
-Release:		6%{?dist}
+Release:		7%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -132,6 +132,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1.3-7
+- Rebuild for ppc64 as the previous build was obsoleted.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 30 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.8.1.3-6
 - Build arch ppc64.
 



From ultrafredde at fedoraproject.org  Thu Aug 20 22:01:39 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Thu, 20 Aug 2009 22:01:39 +0000 (UTC)
Subject: rpms/task/F-10 .cvsignore, 1.4, 1.5 import.log, 1.4, 1.5 sources,
	1.5, 1.6 task.spec, 1.4, 1.5
Message-ID: <20090820220139.D82B611C006E@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11400/F-10

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Aug 2009 13:16:46 -0000	1.4
+++ .cvsignore	20 Aug 2009 22:01:39 -0000	1.5
@@ -1 +1 @@
-task-1.8.0.tar.gz
+task-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	11 Aug 2009 13:16:47 -0000	1.4
+++ import.log	20 Aug 2009 22:01:39 -0000	1.5
@@ -2,3 +2,4 @@ task-1_7_0-2_fc10:F-10:task-1.7.0-2.fc10
 task-1_7_1-1_fc10:F-10:task-1.7.1-1.fc10.src.rpm:1244549329
 task-1_7_1-2_fc10:F-10:task-1.7.1-2.fc10.src.rpm:1244564097
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 13:16:47 -0000	1.5
+++ sources	20 Aug 2009 22:01:39 -0000	1.6
@@ -1 +1 @@
-a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz
+c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/task.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- task.spec	11 Aug 2009 13:16:47 -0000	1.4
+++ task.spec	20 Aug 2009 22:01:39 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
   Intial RPM for task release 1.8.0
 * Mon Jul 13 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta3-1



From bjrosen at fedoraproject.org  Thu Aug 20 22:03:36 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 22:03:36 +0000 (UTC)
Subject: rpms/sys_basher/EL-5 import.log, 1.1, 1.2 sources, 1.2,
	1.3 sys_basher.spec, 1.1, 1.2
Message-ID: <20090820220336.9FB4F11C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11802/EL-5

Modified Files:
	import.log sources sys_basher.spec 
Log Message:
removed ppc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Aug 2009 17:19:31 -0000	1.1
+++ import.log	20 Aug 2009 22:03:36 -0000	1.2
@@ -1 +1,2 @@
 sys_basher-1_1_23-1:EL-5:sys_basher-1.1.23-1.src.rpm:1250788668
+sys_basher-1_1_23-2:EL-5:sys_basher-1.1.23-2.src.rpm:1250804971


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Aug 2009 17:19:31 -0000	1.2
+++ sources	20 Aug 2009 22:03:36 -0000	1.3
@@ -1 +1 @@
-9cb0bb3dba71506051a1491544bd0bd7  sys_basher-1.1.23.tar.gz
+628e97becef5418a78ca755d989f8055  sys_basher-1.1.23.tar.gz


Index: sys_basher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/EL-5/sys_basher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sys_basher.spec	20 Aug 2009 17:19:31 -0000	1.1
+++ sys_basher.spec	20 Aug 2009 22:03:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		sys_basher
 Version:	1.1.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A multithreaded hardware exerciser
 
 Group:		Applications/System
@@ -13,6 +13,8 @@ BuildRequires:	tcsh
 BuildRequires:	lm_sensors-devel
 BuildRequires:	help2man
 
+ExcludeArch: ppc
+
 %description
 sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
 under conditions of maximum stress by running CPU, Memory and Disk tests on all
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Joshua Rosen <bjrosen at polybus.com>
+- 1.1.22-2
+- Added ExcludeArch: ppc
 * Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
 - 1.1.22-1
 - Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.



From bjrosen at fedoraproject.org  Thu Aug 20 22:07:42 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 22:07:42 +0000 (UTC)
Subject: rpms/sys_basher/F-10 import.log, 1.1, 1.2 sources, 1.2,
	1.3 sys_basher.spec, 1.1, 1.2
Message-ID: <20090820220742.9193A11C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12662/F-10

Modified Files:
	import.log sources sys_basher.spec 
Log Message:
removed ppc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Aug 2009 17:16:42 -0000	1.1
+++ import.log	20 Aug 2009 22:07:42 -0000	1.2
@@ -1 +1,2 @@
 sys_basher-1_1_23-1_fc10:F-10:sys_basher-1.1.23-1.fc10.src.rpm:1250788575
+sys_basher-1_1_23-2_fc10:F-10:sys_basher-1.1.23-2.fc10.src.rpm:1250805832


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Aug 2009 17:16:42 -0000	1.2
+++ sources	20 Aug 2009 22:07:42 -0000	1.3
@@ -1 +1 @@
-335dacc078c198fea4a6786bca173c19  sys_basher-1.1.23.tar.gz
+b72e16da01c51e1e79763bf3b5fadbb9  sys_basher-1.1.23.tar.gz


Index: sys_basher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-10/sys_basher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sys_basher.spec	20 Aug 2009 17:16:42 -0000	1.1
+++ sys_basher.spec	20 Aug 2009 22:07:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		sys_basher
 Version:	1.1.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A multithreaded hardware exerciser
 
 Group:		Applications/System
@@ -13,6 +13,8 @@ BuildRequires:	tcsh
 BuildRequires:	lm_sensors-devel
 BuildRequires:	help2man
 
+ExcludeArch: ppc
+
 %description
 sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
 under conditions of maximum stress by running CPU, Memory and Disk tests on all
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Joshua Rosen <bjrosen at polybus.com>
+- 1.1.22-2
+- Added ExcludeArch: ppc
 * Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
 - 1.1.22-1
 - Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.



From bjrosen at fedoraproject.org  Thu Aug 20 22:08:24 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 22:08:24 +0000 (UTC)
Subject: rpms/sys_basher/F-11 import.log, 1.1, 1.2 sources, 1.2,
	1.3 sys_basher.spec, 1.1, 1.2
Message-ID: <20090820220824.3F6DE11C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12927/F-11

Modified Files:
	import.log sources sys_basher.spec 
Log Message:
removed ppc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Aug 2009 17:15:27 -0000	1.1
+++ import.log	20 Aug 2009 22:08:23 -0000	1.2
@@ -1 +1,2 @@
 sys_basher-1_1_23-1_fc11:F-11:sys_basher-1.1.23-1.fc11.src.rpm:1250788406
+sys_basher-1_1_23-2_fc11:F-11:sys_basher-1.1.23-2.fc11.src.rpm:1250806079


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Aug 2009 17:15:27 -0000	1.2
+++ sources	20 Aug 2009 22:08:24 -0000	1.3
@@ -1 +1 @@
-7cf726f58b193e5c09abc95c539bb628  sys_basher-1.1.23.tar.gz
+16a2e25fe92b8ba6668b200144beb501  sys_basher-1.1.23.tar.gz


Index: sys_basher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/F-11/sys_basher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sys_basher.spec	20 Aug 2009 17:15:27 -0000	1.1
+++ sys_basher.spec	20 Aug 2009 22:08:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		sys_basher
 Version:	1.1.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A multithreaded hardware exerciser
 
 Group:		Applications/System
@@ -13,6 +13,8 @@ BuildRequires:	tcsh
 BuildRequires:	lm_sensors-devel
 BuildRequires:	help2man
 
+ExcludeArch: ppc
+
 %description
 sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
 under conditions of maximum stress by running CPU, Memory and Disk tests on all
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Joshua Rosen <bjrosen at polybus.com>
+- 1.1.22-2
+- Added ExcludeArch: ppc
 * Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
 - 1.1.22-1
 - Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.



From bjrosen at fedoraproject.org  Thu Aug 20 22:09:38 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 22:09:38 +0000 (UTC)
Subject: rpms/sys_basher/devel import.log, 1.1, 1.2 sources, 1.2,
	1.3 sys_basher.spec, 1.1, 1.2
Message-ID: <20090820220938.A313411C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13264/devel

Modified Files:
	import.log sources sys_basher.spec 
Log Message:
removed ppc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Aug 2009 17:10:31 -0000	1.1
+++ import.log	20 Aug 2009 22:09:38 -0000	1.2
@@ -1 +1,2 @@
 sys_basher-1_1_23-1_fc11:HEAD:sys_basher-1.1.23-1.fc11.src.rpm:1250788155
+sys_basher-1_1_23-2_fc11:HEAD:sys_basher-1.1.23-2.fc11.src.rpm:1250806117


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Aug 2009 17:10:31 -0000	1.2
+++ sources	20 Aug 2009 22:09:38 -0000	1.3
@@ -1 +1 @@
-7cf726f58b193e5c09abc95c539bb628  sys_basher-1.1.23.tar.gz
+16a2e25fe92b8ba6668b200144beb501  sys_basher-1.1.23.tar.gz


Index: sys_basher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/devel/sys_basher.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sys_basher.spec	20 Aug 2009 17:10:31 -0000	1.1
+++ sys_basher.spec	20 Aug 2009 22:09:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		sys_basher
 Version:	1.1.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A multithreaded hardware exerciser
 
 Group:		Applications/System
@@ -13,6 +13,8 @@ BuildRequires:	tcsh
 BuildRequires:	lm_sensors-devel
 BuildRequires:	help2man
 
+ExcludeArch: ppc
+
 %description
 sys_basher is a multithreaded system exerciser. It tests the CPU, RAM and Disks
 under conditions of maximum stress by running CPU, Memory and Disk tests on all
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Joshua Rosen <bjrosen at polybus.com>
+- 1.1.22-2
+- Added ExcludeArch: ppc
 * Wed Aug 19 2009 Joshua Rosen <bjrosen at polybus.com>
 - 1.1.22-1
 - Added finer grained control over the memory tests. Added support for >8G in Bit reverse address tests.



From ultrafredde at fedoraproject.org  Thu Aug 20 22:10:16 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Thu, 20 Aug 2009 22:10:16 +0000 (UTC)
Subject: rpms/task/F-11 .cvsignore, 1.4, 1.5 import.log, 1.4, 1.5 sources,
	1.5, 1.6 task.spec, 1.4, 1.5
Message-ID: <20090820221016.353F911C0439@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13514/F-11

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Aug 2009 13:25:02 -0000	1.4
+++ .cvsignore	20 Aug 2009 22:10:15 -0000	1.5
@@ -1 +1 @@
-task-1.8.0.tar.gz
+task-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	11 Aug 2009 13:25:02 -0000	1.4
+++ import.log	20 Aug 2009 22:10:16 -0000	1.5
@@ -2,3 +2,4 @@ task-1_7_0-2_fc10:F-11:task-1.7.0-2.fc10
 task-1_7_1-1_fc10:F-11:task-1.7.1-1.fc10.src.rpm:1244549924
 task-1_7_1-2_fc10:F-11:task-1.7.1-2.fc10.src.rpm:1244564752
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 13:25:02 -0000	1.5
+++ sources	20 Aug 2009 22:10:16 -0000	1.6
@@ -1 +1 @@
-a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz
+c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/task.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- task.spec	11 Aug 2009 13:25:02 -0000	1.4
+++ task.spec	20 Aug 2009 22:10:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
   Intial RPM for task release 1.8.0
 * Mon Jul 13 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta3-1



From toshio at fedoraproject.org  Thu Aug 20 22:10:42 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:10:42 +0000 (UTC)
Subject: rpms/mono-zeroconf/F-11 mono-zeroconf.spec,1.13,1.14
Message-ID: <20090820221042.2BE7211C0439@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono-zeroconf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13538/F-11

Modified Files:
	mono-zeroconf.spec 
Log Message:
Rebuild for ppc64 due to previous update being obsoleted.



Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-11/mono-zeroconf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mono-zeroconf.spec	1 Jun 2009 20:59:17 -0000	1.13
+++ mono-zeroconf.spec	20 Aug 2009 22:10:41 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           mono-zeroconf
 Version:        0.7.6
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Mono-zeroconf namespace
 Group:          Development/Languages
 License:        MIT
@@ -58,6 +58,12 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-zeroconf.pc
 
 %changelog
+* 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.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.7.6-9
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 22:10:42 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:10:42 +0000 (UTC)
Subject: rpms/mono-zeroconf/devel mono-zeroconf.spec,1.13,1.14
Message-ID: <20090820221042.83B4411C0439@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/mono-zeroconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13538/devel

Modified Files:
	mono-zeroconf.spec 
Log Message:
Rebuild for ppc64 due to previous update being obsoleted.



Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/devel/mono-zeroconf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mono-zeroconf.spec	25 Jul 2009 15:02:43 -0000	1.13
+++ mono-zeroconf.spec	20 Aug 2009 22:10:42 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           mono-zeroconf
 Version:        0.7.6
-Release:        9%{?dist}
+Release:        10%{?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
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
@@ -58,9 +58,15 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-zeroconf.pc
 
 %changelog
+* 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.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.7.6-9
+- Build arch ppc64.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ausil at fedoraproject.org  Thu Aug 20 22:14:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 20 Aug 2009 22:14:00 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.3,1.4
Message-ID: <20090820221400.B539611C006E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14397

Modified Files:
	nss-softokn.spec 
Log Message:
ship bits



Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-softokn.spec	20 Aug 2009 19:20:44 -0000	1.3
+++ nss-softokn.spec	20 Aug 2009 22:14:00 -0000	1.4
@@ -5,32 +5,29 @@
 %global saved_files_dir %{_libdir}/nss/saved
 
 # Produce .chk files for the final stripped binaries
-# %define __spec_install_post \
-#    %{?__debug_package:%{__debug_install_post}} \
-#    %{__arch_install_post} \
-#    %{__os_install_post} \
-#    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-#    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
-#    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
-#%{nil}
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
+%{nil}
 
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          8.1%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
-# FIXME Commenting out all requires as part of disabling building
-# This package and nss-util cause conflicts with nss.
-#Requires:         nspr >= %{nspr_version}
-#Requires:         nss-util >= %{version}
-#Requires:         nss-softokn-freebl%{_isa} >= %{version}
-#Requires:         sqlite
-#Requires:         nss-util >= %{nssutil_version}
+Requires:         nspr >= %{nspr_version}
+Requires:         nss-softokn-freebl%{_isa} >= %{version}
+Requires:         sqlite
+Requires:         nss-util >= %{nssutil_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-#BuildRequires:    nss-util-devel >= %{nssutil_version}
+BuildRequires:    nss-util-devel >= %{nssutil_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -63,28 +60,27 @@ Patch2:           nss-stubs-bug502133.pa
 %description
 Network Security Services Softoken Cryptographic Module
 
-#%package freebl
-#Summary:          Freebl library for the Network Security Services
-#Group:            System Environment/Base
-#Conflicts:        nss < 3.12.2.99.3-5
+%package freebl
+Summary:          Freebl library for the Network Security Services
+Group:            System Environment/Base
+Conflicts:        nss < 3.12.2.99.3-5
+
+%description freebl
+Network Security Services Softoken Cryptographic Module Freelb Library.
+
+Install the nss-softokn-freebl package if you need the freebl 
+library.
+
+%package devel
+Summary:          Development libraries for Network Security Services
+Group:            Development/Libraries
+Requires:         nss-softokn = %{version}-%{release}
+Requires:         nspr-devel >= %{nspr_version}
+Requires:         nss-util-devel >= %{nsutil_version}
+Requires:         pkgconfig
 
-#%description freebl
-#Network Security Services Softoken Cryptographic Module Freelb Library.
-#
-#Install the nss-softokn-freebl package if you need the freebl 
-#library.
-
-#%package devel
-#Summary:          Development libraries for Network Security Services
-#Group:            Development/Libraries
-#Obsoletes:	      nss-devel < 3.12.3.99.3-8
-#Requires:         nss-softokn = %{version}-%{release}
-#Requires:         nspr-devel >= %{nspr_version}-%{nssutil_release}
-#Requires:         nss-util-devel >= %{nsutil_version}
-#Requires:         pkgconfig
-
-#%description devel
-#Header and Library files for doing development with Network Security Services.
+%description devel
+Header and Library files for doing development with Network Security Services.
 
 
 %prep
@@ -134,9 +130,9 @@ export USE_64
 %endif
 
 # Compile softkn plus needed support
-#%{__make} -C ./mozilla/security/coreconf
-#%{__make} -C ./mozilla/security/dbm
-#%{__make} -C ./mozilla/security/nss
+%{__make} -C ./mozilla/security/coreconf
+%{__make} -C ./mozilla/security/dbm
+%{__make} -C ./mozilla/security/nss
 
 # Set up our package file
 %{__mkdir_p} ./mozilla/dist/pkgconfig
@@ -194,40 +190,39 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
 # Copy the binary libraries we want
-# FIXME - restore when nss-util is fixed
-#for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
-#do
-#  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-#  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-#done
+for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
+do
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
 
 # Make sure chk files can be found in both places
-#for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
-#do
-#  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-#done
+for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
+do
+  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
 
 # install our prelink configuration file
-#%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-#%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
+%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 # and stash a copy away in a safe place
-#%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf
+%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf
 
 # Copy the binaries we ship as unsupported
-#for file in shlibsign
-#do
-#  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-#done
+for file in shlibsign
+do
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+done
 
 # Copy the include files we want
-#for file in mozilla/dist/public/nss/*.h
-#do
-#  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
-#done
+for file in mozilla/dist/public/nss/*.h
+do
+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+done
 
 # Copy the package configuration files
-#%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-#%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
+%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -238,61 +233,61 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 # This trigger scriptlet is run when:
 # 1) nss-softokn is already installed, and prelink is installed or upgraded
 # 2) prelink is already installed, and nss-softokn is installed or upgraded
-#%triggerin -- prelink
-#%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
-# %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+%triggerin -- prelink
+%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
+ %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 # This trigger scriptlet is run when:
 # 1) prelink is installed, and nss-softokn removed
 # 2) nss-softokn is installed, and prelink gets removed
-#%triggerun -- prelink
-#[ $2 = 0 ] || exit 0
-#%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+%triggerun -- prelink
+[ $2 = 0 ] || exit 0
+%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %post
-#/sbin/ldconfig >/dev/null 2>/dev/null
+/sbin/ldconfig >/dev/null 2>/dev/null
 
 %postun
-#/sbin/ldconfig >/dev/null 2>/dev/null
-#[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+/sbin/ldconfig >/dev/null 2>/dev/null
+[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %files
-#%defattr(-,root,root)
-#/%{_lib}/libnssdbm3.so
-#/%{_lib}/libnssdbm3.chk
-#/%{_lib}/libsoftokn3.so
-#/%{_lib}/libsoftokn3.chk
+%defattr(-,root,root)
+/%{_lib}/libnssdbm3.so
+/%{_lib}/libnssdbm3.chk
+/%{_lib}/libsoftokn3.so
+/%{_lib}/libsoftokn3.chk
 # shared with nss-tools
-#%dir %{_libdir}/nss
-#%dir %{saved_files_dir}
-#%dir %{unsupported_tools_directory}
-#%{unsupported_tools_directory}/shlibsign
-#%{saved_files_dir}/nss-softokn-prelink.conf
+%dir %{_libdir}/nss
+%dir %{saved_files_dir}
+%dir %{unsupported_tools_directory}
+%{unsupported_tools_directory}/shlibsign
+%{saved_files_dir}/nss-softokn-prelink.conf
 # we don't own %{_sysconfdir}/prelink.conf.d and
 # must rely on triggers to install and remove our
 # configuration file
-#%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
-#%files freebl
-#%defattr(-,root,root)
-#/%{_lib}/libfreebl3.so
-#/%{_lib}/libfreebl3.chk
-
-#%files devel
-#%defattr(-,root,root)
-#%{_libdir}/libsoftokn3.so
-#%{_libdir}/libsoftokn3.chk
-#%{_libdir}/libfreebl3.so
-#%{_libdir}/libfreebl3.chk
-#%{_libdir}/libnssdbm3.so
-#%{_libdir}/libnssdbm3.chk
-#%{_libdir}/pkgconfig/nss-softokn.pc
-#%{_bindir}/nss-softokn-config
+%files freebl
+%defattr(-,root,root)
+/%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
+%{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
+%{_libdir}/pkgconfig/nss-softokn.pc
+%{_bindir}/nss-softokn-config
 
 # co-owned with nss
-# %dir %{_includedir}/nss3
+%dir %{_includedir}/nss3
 #
 # The following headers are those exported public in
 # mozilla/security/nss/lib/freebl/manifest.mn and
@@ -302,16 +297,20 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 # the pkcs #11 ones, have been provided by nss-util-devel
 # which installed them before us.
 #
-#%{_includedir}/nss3/blapit.h
-#%{_includedir}/nss3/ecl-exp.h
-#%{_includedir}/nss3/hasht.h
-#%{_includedir}/nss3/sechash.h
-#%{_includedir}/nss3/nsslowhash.h
-#%{_includedir}/nss3/secmodt.h
-#%{_includedir}/nss3/shsign.h
+%{_includedir}/nss3/blapit.h
+%{_includedir}/nss3/ecl-exp.h
+%{_includedir}/nss3/hasht.h
+%{_includedir}/nss3/sechash.h
+%{_includedir}/nss3/nsslowhash.h
+%{_includedir}/nss3/secmodt.h
+%{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-9
+- revert to shipping bits
+
 * Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8.1
 - Disable installing until conflicts are relsoved
+
 * Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
 - Initial build



From than at fedoraproject.org  Thu Aug 20 22:15:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 20 Aug 2009 22:15:30 +0000 (UTC)
Subject: rpms/qt/devel 0283-do-not-deduce-scrollbar-extent-twice.diff, NONE, 
	1.1 0285-qgv-dontshowchildren.diff, NONE,
	1.1 kde-qt-patches-20090820git.patch, NONE, 1.1 qt.spec, 1.311,
	1.312 sources, 1.61, 1.62 0288-more-x-keycodes.patch, 1.1,
	NONE 287-qmenu-respect-minwidth.patch, 1.1,
	NONE qt-copy-20090626-qt452.patch, 1.1, NONE
Message-ID: <20090820221530.125B211C006E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14662

Modified Files:
	qt.spec sources 
Added Files:
	0283-do-not-deduce-scrollbar-extent-twice.diff 
	0285-qgv-dontshowchildren.diff 
	kde-qt-patches-20090820git.patch 
Removed Files:
	0288-more-x-keycodes.patch 287-qmenu-respect-minwidth.patch 
	qt-copy-20090626-qt452.patch 
Log Message:
switch to kde-qt branch


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)));

kde-qt-patches-20090820git.patch:
 README.kde-qt                                                                   |  192 +++---
 b/README.kde-qt                                                                 |  188 ++++++
 b/bin/syncqt                                                                    |    6 
 b/configure                                                                     |    8 
 b/projects.pro                                                                  |    3 
 b/qmake/property.cpp                                                            |   29 -
 b/src/3rdparty/webkit/WebCore/DerivedSources.cpp                                |    2 
 b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp |    5 
 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                                             |   16 
 b/src/gui/image/qnativeimage.cpp                                                |   10 
 b/src/gui/image/qnativeimage_p.h                                                |    1 
 b/src/gui/itemviews/qtreeview.cpp                                               |    2 
 b/src/gui/kernel/qapplication_x11.cpp                                           |    6 
 b/src/gui/kernel/qkeymapper_x11.cpp                                             |  286 ++++++++--
 b/src/gui/kernel/qkeysequence.cpp                                               |  174 ++++--
 b/src/gui/kernel/qwidget_p.h                                                    |    1 
 b/src/gui/kernel/qwidget_x11.cpp                                                |   27 
 b/src/gui/painting/qwindowsurface_raster.cpp                                    |   13 
 b/src/gui/widgets/qmenu.cpp                                                     |    2 
 b/src/gui/widgets/qtabbar.cpp                                                   |    2 
 b/src/qt_install.pri                                                            |   16 
 b/src/tools/moc/main.cpp                                                        |    6 
 b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h                |    3 
 bin/syncqt                                                                      |   46 -
 src/corelib/kernel/qobject_p.h                                                  |    4 
 src/gui/kernel/qwidget_x11.cpp                                                  |   21 
 29 files changed, 914 insertions(+), 263 deletions(-)

--- NEW FILE kde-qt-patches-20090820git.patch ---
commit b48e2091871516496cf0b133249fbf5326a55831
Author: Lubos Lunak <l.lunak at kde.org>
Date:   Sat Feb 23 16:44:52 2008 +0100

    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)

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
 {

commit 339e220e29ff39b86705438b4be6f90e5618d27b
Author: Lubos Lunak <l.lunak at kde.org>
Date:   Tue Oct 2 16:08:32 2007 +0200

    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

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()) {

commit 68eaa07de69e873b89d4aba341c6ed1ca81f6819
Author: Lubos Lunak <l.lunak at kde.org>
Date:   Wed Jan 30 14:24:01 2008 +0100

    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

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 };
[...1643 lines suppressed...]
+    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


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- qt.spec	18 Aug 2009 10:37:45 -0000	1.311
+++ qt.spec	20 Aug 2009 22:15:29 -0000	1.312
@@ -4,6 +4,8 @@
 # -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
@@ -12,7 +14,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,13 +44,9 @@ 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 
-# make PulseAudio the default device in Phonon with the xine-lib backend
-# (The GStreamer backend handles this entirely differently, with a separate
-# "sink" setting, and should pick up the PulseAudio "sink" without patches.)
+# make PulseAudio the default device in Phonon
 Patch17: phonon-4.2.96-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
-# fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
-Patch20: qt-copy-20090626-qt452.patch
 Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
 
 ## upstreamable bits
@@ -62,24 +60,14 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 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
-# we'll want to switch to the kde-qt branches, e.g.:
-# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/4.5.2-patched
-# once they actually contain all the patches from qt-copy (0283 and 0285 are
-# AWOL, 0274 got incorrectly ported to 4.5.2 (one hunk missing))
-
 # security patches
 Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
 
-%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}}
+# switch to kde-qt branches, qt-copy doesn't exist anymore
+Patch200: kde-qt-patches-20090820git.patch
+# these patches are not merged yet in kde-qt branches
+Patch201: 0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch202: 0285-qgv-dontshowchildren.diff
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -376,18 +364,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
@@ -413,8 +390,10 @@ popd
 # security fixes
 %patch100 -p1 -b .CVE-2009-1725
 
-%patch287 -p1 -b .287-qmenu-respect-minwidth
-%patch0288 -p1 -b .0288-more-x-keycodes
+# kde-qt branch
+%patch200 -p1 -b .kde-qt-patches-20090820git
+%patch201 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
+%patch202 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -938,6 +917,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	2 Jul 2009 10:43:13 -0000	1.61
+++ sources	20 Aug 2009 22:15:29 -0000	1.62
@@ -2,7 +2,6 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.tar.bz2
-9865efce56f62a441a76626226b5f946  qt-copy-patches-20090626svn.tar.bz2
 60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
 7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
 0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png


--- 0288-more-x-keycodes.patch DELETED ---


--- 287-qmenu-respect-minwidth.patch DELETED ---


--- qt-copy-20090626-qt452.patch DELETED ---



From toshio at fedoraproject.org  Thu Aug 20 22:16:05 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:16:05 +0000 (UTC)
Subject: rpms/ipod-sharp/devel ipod-sharp.spec,1.19,1.20
Message-ID: <20090820221605.7857111C0349@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/ipod-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14787/devel

Modified Files:
	ipod-sharp.spec 
Log Message:
Rebuild to pick up ppc64 builds since previous update was obsoleted.



Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/devel/ipod-sharp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ipod-sharp.spec	25 Jul 2009 03:31:36 -0000	1.19
+++ ipod-sharp.spec	20 Aug 2009 22:16:05 -0000	1.20
@@ -1,6 +1,6 @@
 Name:    ipod-sharp
 Version: 0.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
@@ -11,7 +11,7 @@ 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 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
 BuildRequires: podsleuth-devel
 BuildRequires: mono-devel
@@ -63,12 +63,18 @@ make install DESTDIR=${RPM_BUILD_ROOT} \
 
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-5
+- Rebuild to pick up ppc64 builds
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sun Jun 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.1-3
 - Don't claim ownership of %%_libdir/pkgconfig/ (#499658)
 
+* Mon May 25 2009 xavier Lamien <laxathom at fedoraproject.org> - 0.8.1-3
+- Build arch ppc64.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 22:16:05 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:16:05 +0000 (UTC)
Subject: rpms/ipod-sharp/F-11 ipod-sharp.spec,1.18,1.19
Message-ID: <20090820221605.4A33911C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/ipod-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14787/F-11

Modified Files:
	ipod-sharp.spec 
Log Message:
Rebuild to pick up ppc64 builds since previous update was obsoleted.



Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/F-11/ipod-sharp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ipod-sharp.spec	1 Jun 2009 20:28:22 -0000	1.18
+++ ipod-sharp.spec	20 Aug 2009 22:16:05 -0000	1.19
@@ -1,6 +1,6 @@
 Name:    ipod-sharp
 Version: 0.8.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
@@ -10,6 +10,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
 
 BuildRequires: podsleuth-devel
 BuildRequires: mono-devel
@@ -57,10 +59,19 @@ make install DESTDIR=${RPM_BUILD_ROOT} \
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/
+%{_libdir}/pkgconfig/*
 
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-5
+- Rebuild to pick up ppc64 builds
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.1-3
+- Don't claim ownership of %%_libdir/pkgconfig/ (#499658)
+
 * Mon May 25 2009 xavier Lamien <laxathom at fedoraproject.org> - 0.8.1-3
 - Build arch ppc64.
 



From ultrafredde at fedoraproject.org  Thu Aug 20 22:22:02 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Thu, 20 Aug 2009 22:22:02 +0000 (UTC)
Subject: rpms/task/devel .cvsignore, 1.4, 1.5 import.log, 1.4, 1.5 sources,
	1.5, 1.6 task.spec, 1.5, 1.6
Message-ID: <20090820222202.55E6C11C006E@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16247/devel

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Aug 2009 13:35:11 -0000	1.4
+++ .cvsignore	20 Aug 2009 22:22:01 -0000	1.5
@@ -1 +1 @@
-task-1.8.0.tar.gz
+task-1.8.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	11 Aug 2009 13:35:12 -0000	1.4
+++ import.log	20 Aug 2009 22:22:02 -0000	1.5
@@ -2,3 +2,4 @@ task-1_7_0-2_fc10:HEAD:task-1.7.0-2.fc10
 task-1_7_1-1_fc10:HEAD:task-1.7.1-1.fc10.src.rpm:1244551419
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 13:35:12 -0000	1.5
+++ sources	20 Aug 2009 22:22:02 -0000	1.6
@@ -1 +1 @@
-a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz
+c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/task.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- task.spec	11 Aug 2009 13:35:12 -0000	1.5
+++ task.spec	20 Aug 2009 22:22:02 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
   Intial RPM for task release 1.8.0
 * Mon Jul 13 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta3-1



From toshio at fedoraproject.org  Thu Aug 20 22:28:02 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:28:02 +0000 (UTC)
Subject: rpms/muine/devel muine.spec,1.31,1.32
Message-ID: <20090820222802.BBEA811C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/muine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17350/devel

Modified Files:
	muine.spec 
Log Message:
Rebuild so we get ppc64 packages.



Index: muine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine/devel/muine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- muine.spec	25 Jul 2009 15:22:15 -0000	1.31
+++ muine.spec	20 Aug 2009 22:28:02 -0000	1.32
@@ -1,8 +1,7 @@
 Name:           muine
 Version:        0.8.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Music Player for GNOME
-ExcludeArch:    ppc64
 
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -127,9 +126,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/muine/*.a
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.10-6
+- rebuild for ppc64 since the previous build was obsoleted
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.8.10-5
+- Build arch ppc64.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 22:28:02 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:28:02 +0000 (UTC)
Subject: rpms/muine/F-11 muine.spec,1.31,1.32
Message-ID: <20090820222802.8879B11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/muine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17350/F-11

Modified Files:
	muine.spec 
Log Message:
Rebuild so we get ppc64 packages.



Index: muine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine/F-11/muine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- muine.spec	1 Jun 2009 15:52:40 -0000	1.31
+++ muine.spec	20 Aug 2009 22:28:02 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -126,6 +126,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/muine/*.a
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.10-6
+- rebuild for ppc64 since the previous build was obsoleted
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.8.10-5
 - Build arch ppc64.
 



From bmarzins at fedoraproject.org  Thu Aug 20 22:28:45 2009
From: bmarzins at fedoraproject.org (Benjamin Marzinski)
Date: Thu, 20 Aug 2009 22:28:45 +0000 (UTC)
Subject: rpms/device-mapper-multipath/devel dont_remove.patch, NONE,
	1.1 udev_change.patch, NONE, 1.1 device-mapper-multipath.spec,
	1.61, 1.62
Message-ID: <20090820222845.076C211C006E@cvs1.fedora.phx.redhat.com>

Author: bmarzins

Update of /cvs/pkgs/rpms/device-mapper-multipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17662

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	dont_remove.patch udev_change.patch 
Log Message:
Fixed problem where maps were being added and then removed.
Changed the udev rules to fix some issues.


dont_remove.patch:
 main.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

--- NEW FILE dont_remove.patch ---
Index: multipath-tools/multipathd/main.c
===================================================================
--- multipath-tools.orig/multipathd/main.c
+++ multipath-tools/multipathd/main.c
@@ -290,8 +290,23 @@ ev_add_map (struct sysfs_device * dev, s
 static int
 uev_remove_map (struct sysfs_device * dev, struct vectors * vecs)
 {
+	struct multipath * mpp;	
+
 	condlog(2, "%s: remove map (uevent)", dev->kernel);
+#if 0
 	return ev_remove_map(dev->kernel, vecs);
+#else
+	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;
+#endif
 }
 
 int

udev_change.patch:
 mpath_wait      |   21 +++++++++++++++------
 multipath.rules |    5 ++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

--- NEW FILE udev_change.patch ---
---
 multipath/mpath_wait      |   21 +++++++++++++++------
 multipath/multipath.rules |    5 ++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

Index: multipath-tools/multipath/mpath_wait
===================================================================
--- multipath-tools.orig/multipath/mpath_wait
+++ multipath-tools/multipath/mpath_wait
@@ -3,14 +3,23 @@
 retry=3
 sec=1
 
-/sbin/dmsetup info -c --noheadings -j $1 -m $2 2> /dev/null | grep -q .*:${1}:${2}:L.*:.*:.*:.*:.*
-ret=$?
+dev=`/sbin/dmsetup ls --target multipath -j $1 -m $2 --exec 'echo'`
+if [ -n "$dev" ]; then
+	/usr/bin/stat $dev > /dev/null 2>&1
+	ret=$?
+else
+	ret=1
+fi
 
-while [ "$ret" -ne 0 -a "$retry" -gt 0 ]
-do
+while [ "$ret" -ne 0 -a "$retry" -gt 0 ]; do
         sleep $sec
-        /sbin/dmsetup info -c --noheadings -j $1 -m $2 2> /dev/null | grep -q .*:${1}:${2}:L.*:.*:.*:.*:.*
-        ret=$?
+	if [ -z "$dev" ]; then
+		dev=`/sbin/dmsetup ls --target multipath -j $1 -m $2 --exec 'echo'`
+	fi
+	if [ -n "$dev" ]; then
+		/usr/bin/stat $dev > /dev/null 2>&1
+		ret=$?
+	fi
         retry=$(($retry - 1))
 done
 
Index: multipath-tools/multipath/multipath.rules
===================================================================
--- multipath-tools.orig/multipath/multipath.rules
+++ multipath-tools/multipath/multipath.rules
@@ -2,7 +2,10 @@
 # so name them after their devmap name
 SUBSYSTEM!="block", GOTO="end_mpath"
 RUN+="socket:/org/kernel/dm/multipath_event"
+ACTION!="change", GOTO="end_mpath"
 KERNEL!="dm-[0-9]*", GOTO="end_mpath"
+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
+ENV{DM_UUID}=="*?", ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath"
 PROGRAM!="/sbin/mpath_wait %M %m", GOTO="end_mpath"
-ACTION=="add", RUN+="/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p' -j %M -m %m"
+RUN+="/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p' -j %M -m %m"
 LABEL="end_mpath"


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- device-mapper-multipath.spec	30 Jul 2009 20:39:53 -0000	1.61
+++ device-mapper-multipath.spec	20 Aug 2009 22:28:44 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -22,6 +22,8 @@ Patch11: multipath_rules.patch
 Patch12: cciss_id.patch
 Patch13: stop_warnings.patch
 Patch14: move_bindings.patch
+Patch15: dont_remove.patch
+Patch16: udev_change.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
@@ -76,6 +78,8 @@ kpartx manages partition creation and re
 %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
 
 %build
 %define _sbindir /sbin
@@ -142,6 +146,10 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Aug 20 2009 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.8-5
+- Fixed problem where maps were being added and then removed.
+- Changed the udev rules to fix some issues.
+
 * Thu Jul 30 2009 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.9-4
 - Fixed build issue on i686 machines.
 



From linuxdonald at fedoraproject.org  Thu Aug 20 22:33:47 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Thu, 20 Aug 2009 22:33:47 +0000 (UTC)
Subject: rpms/openal-soft/devel .cvsignore, 1.2, 1.3 openal-soft.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090820223347.E90C511C006E@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19064

Modified Files:
	.cvsignore openal-soft.spec sources 
Log Message:

Fixed bug: 517973



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Aug 2009 09:28:08 -0000	1.2
+++ .cvsignore	20 Aug 2009 22:33:47 -0000	1.3
@@ -1 +1 @@
-openal-soft-1.8.466.tar.bz2
+openal-soft-1.8.466.487f0dde7593144ceabd817306500465caf7602a.tar.gz


Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openal-soft.spec	16 Aug 2009 11:28:25 -0000	1.3
+++ openal-soft.spec	20 Aug 2009 22:33:47 -0000	1.4
@@ -1,14 +1,16 @@
+%global revision 487f0dde7593144ceabd817306500465caf7602a
+
 Name:		openal-soft
 Version:	1.8.466
-Release:	7%{?dist}
+Release:	8.%{revision}svn%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
-Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
+#http://repo.or.cz/w/openal-soft.git?a=snapshot;h=487f0dde7593144ceabd817306500465caf7602a;sf=tgz
+Source0:	openal-soft-%{version}.%{revision}.tar.gz
 Patch1:		openal-soft.patch
-Patch2:		upstream.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -41,9 +43,8 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n openal-soft
 %patch1 -p0 -b .orig
-%patch2 -p0 -b .orig
 
 %build
 %cmake .
@@ -74,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-8.487f0dde7593144ceabd817306500465caf7602agit
+- Fixed bug 517973
+
 * Sun Aug 16 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-7
 - Fixed bug 517721. Added upstream.patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Aug 2009 09:28:09 -0000	1.2
+++ sources	20 Aug 2009 22:33:47 -0000	1.3
@@ -1 +1 @@
-28d500e0a6b0a7a824b509ad9eaba7be  openal-soft-1.8.466.tar.bz2
+267db7ffed500030c4c95045ae17887d  openal-soft-1.8.466.487f0dde7593144ceabd817306500465caf7602a.tar.gz



From marx at fedoraproject.org  Thu Aug 20 22:37:52 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Thu, 20 Aug 2009 22:37:52 +0000 (UTC)
Subject: rpms/system-config-lvm/devel .cvsignore, 1.26, 1.27 sources, 1.28, 
	1.29 system-config-lvm.spec, 1.41, 1.42
Message-ID: <20090820223752.540DC11C006E@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20208

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New upstream release v1.1.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	20 Aug 2009 12:21:00 -0000	1.26
+++ .cvsignore	20 Aug 2009 22:37:50 -0000	1.27
@@ -1 +1 @@
-system-config-lvm-1.1.8.tar.gz
+system-config-lvm-1.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	20 Aug 2009 12:21:00 -0000	1.28
+++ sources	20 Aug 2009 22:37:51 -0000	1.29
@@ -1 +1 @@
-dcf4c1711eadc7bf5dbe676514d4aea2  system-config-lvm-1.1.8.tar.gz
+03f76abaa184b3c1df713113cd64f4f3  system-config-lvm-1.1.9.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- system-config-lvm.spec	20 Aug 2009 12:21:00 -0000	1.41
+++ system-config-lvm.spec	20 Aug 2009 22:37:51 -0000	1.42
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.8
+Version: 1.1.9
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Fri Aug 21 2009 Marek Grac <mgrac at redhat.com> - 1.1.9
+- Bugfix #474996: Unable to start without cluster.conf
+
 * Thu Aug 20 2009 Marek Grac <mgrac at redhat.com> - 1.1.8-1
 - Updated translations for several languages (transifex)
 - Resolves: #243646 - Unable to modify logical partition with or_IN locale



From marx at fedoraproject.org  Thu Aug 20 22:40:03 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Thu, 20 Aug 2009 22:40:03 +0000 (UTC)
Subject: rpms/system-config-lvm/F-11 .cvsignore, 1.24, 1.25 sources, 1.26,
	1.27 system-config-lvm.spec, 1.35, 1.36
Message-ID: <20090820224003.7904B11C0426@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20680

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New upstream release v1.1.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Aug 2009 12:39:14 -0000	1.24
+++ .cvsignore	20 Aug 2009 22:40:03 -0000	1.25
@@ -1 +1 @@
-system-config-lvm-1.1.8.tar.gz
+system-config-lvm-1.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	20 Aug 2009 12:39:14 -0000	1.26
+++ sources	20 Aug 2009 22:40:03 -0000	1.27
@@ -1 +1 @@
-dcf4c1711eadc7bf5dbe676514d4aea2  system-config-lvm-1.1.8.tar.gz
+03f76abaa184b3c1df713113cd64f4f3  system-config-lvm-1.1.9.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-11/system-config-lvm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- system-config-lvm.spec	20 Aug 2009 12:39:14 -0000	1.35
+++ system-config-lvm.spec	20 Aug 2009 22:40:03 -0000	1.36
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.8
+Version: 1.1.9
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Fri Aug 21 2009 Marek Grac <mgrac at redhat.com> - 1.1.9
+- Bugfix #474996: Unable to start without cluster.conf
+
 * Thu Aug 20 2009 Marek Grac <mgrac at redhat.com> - 1.1.8
 - Updated translations for several languages (transifex)
 - Resolves: #243646 - Unable to modify logical partition with or_IN locale



From toshio at fedoraproject.org  Thu Aug 20 22:44:56 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:44:56 +0000 (UTC)
Subject: rpms/tomboy/devel tomboy.spec,1.121,1.122
Message-ID: <20090820224456.60A8011C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21554/devel

Modified Files:
	tomboy.spec 
Log Message:
Build for ppc64



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- tomboy.spec	11 Aug 2009 05:00:19 -0000	1.121
+++ tomboy.spec	20 Aug 2009 22:44:56 -0000	1.122
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.15.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -34,7 +34,6 @@ BuildRequires:  automake, autoconf, libt
 
 Requires:	gtkspell
 
-ExcludeArch: ppc64
 
 %description
 Tomboy is a desktop note-taking application which is simple and easy to use.
@@ -141,6 +140,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15.5-2
+- Build for ppc64.
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.5-1
 - Update to 0.15.5
 



From itamarjp at fedoraproject.org  Thu Aug 20 22:45:05 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 20 Aug 2009 22:45:05 +0000 (UTC)
Subject: rpms/ytnef/devel import.log, NONE, 1.1 ytnef.spec, NONE,
	1.1 ytnef_fix_requires.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090820224505.2BA7011C006E@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ytnef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21433/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ytnef.spec ytnef_fix_requires.patch 
Log Message:
initial import



--- NEW FILE import.log ---
ytnef-2_6-4_fc12:HEAD:ytnef-2.6-4.fc12.src.rpm:1250807623


--- NEW FILE ytnef.spec ---
Summary: Yerase's TNEF Stream Reader
Name: ytnef
Version: 2.6
Release: 4%{?dist}
License: GPL+
Group: Applications/Productivity
URL: http://sourceforge.net/projects/ytnef/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libytnef-devel

Patch0: ytnef_fix_requires.patch

%description
Yerase's TNEF Stream Reader.  Can take a TNEF Stream (winmail.dat) sent from
Microsoft Outlook (or similar products) and extract the attachments, including
construction of Contact Cards & Calendar entries.

%prep
%setup -q
%patch0 -p2

%build
%configure
%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/libytnef"

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make}  install DESTDIR=$RPM_BUILD_ROOT

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README INSTALL ChangeLog
%{_bindir}/ytnef
%{_bindir}/ytnefprint
%{_bindir}/ytnefprocess.pl

%changelog
* Thu May 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-4
- fix perl requires

* Tue Mar 24 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-3
- Changed License to the same as libytnef-devel
- Macronify everything as possible.
- Included ChangeLog as part of the documentation.

* Fri Feb 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-2
- Rebuild for fedora 10

* Fri Mar 12 2004 Patrick <rpms at puzzled.xs4all.nl>
- Initial version


ytnef_fix_requires.patch:
 ytnefprocess.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ytnef_fix_requires.patch ---
diff -ruNp a/ytnef-2.6/src/ytnef/ytnefprocess.pl b/ytnef-2.6/src/ytnef/ytnefprocess.pl
--- a/ytnef-2.6/src/ytnef/ytnefprocess.pl	2003-08-25 14:11:57.000000000 -0300
+++ b/ytnef-2.6/src/ytnef/ytnefprocess.pl	2009-05-28 01:51:45.525769886 -0300
@@ -2,7 +2,7 @@
 use MIME::Parser;
 use MIME::Entity;
 use Mail::Mailer;
-use Mail::Mailer::test;
+use Mail::Mailer::testfile;
 
 my $mail_dir = "$ENV{HOME}/.ytnef";
 my $reader = "/usr/local/bin/ytnef";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytnef/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:33:42 -0000	1.1
+++ .cvsignore	20 Aug 2009 22:45:04 -0000	1.2
@@ -0,0 +1 @@
+ytnef-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytnef/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:33:42 -0000	1.1
+++ sources	20 Aug 2009 22:45:04 -0000	1.2
@@ -0,0 +1 @@
+572830ff0664a2abc3e7aea79040c338  ytnef-2.6.tar.gz



From itamarjp at fedoraproject.org  Thu Aug 20 22:48:35 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 20 Aug 2009 22:48:35 +0000 (UTC)
Subject: rpms/ytnef/F-11 import.log, NONE, 1.1 ytnef.spec, NONE,
	1.1 ytnef_fix_requires.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090820224835.ABBD611C006E@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ytnef/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22379/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ytnef.spec ytnef_fix_requires.patch 
Log Message:
initial rpm import



--- NEW FILE import.log ---
ytnef-2_6-4_fc12:F-11:ytnef-2.6-4.fc12.src.rpm:1250808414


--- NEW FILE ytnef.spec ---
Summary: Yerase's TNEF Stream Reader
Name: ytnef
Version: 2.6
Release: 4%{?dist}
License: GPL+
Group: Applications/Productivity
URL: http://sourceforge.net/projects/ytnef/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libytnef-devel

Patch0: ytnef_fix_requires.patch

%description
Yerase's TNEF Stream Reader.  Can take a TNEF Stream (winmail.dat) sent from
Microsoft Outlook (or similar products) and extract the attachments, including
construction of Contact Cards & Calendar entries.

%prep
%setup -q
%patch0 -p2

%build
%configure
%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/libytnef"

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make}  install DESTDIR=$RPM_BUILD_ROOT

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README INSTALL ChangeLog
%{_bindir}/ytnef
%{_bindir}/ytnefprint
%{_bindir}/ytnefprocess.pl

%changelog
* Thu May 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-4
- fix perl requires

* Tue Mar 24 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-3
- Changed License to the same as libytnef-devel
- Macronify everything as possible.
- Included ChangeLog as part of the documentation.

* Fri Feb 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-2
- Rebuild for fedora 10

* Fri Mar 12 2004 Patrick <rpms at puzzled.xs4all.nl>
- Initial version


ytnef_fix_requires.patch:
 ytnefprocess.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ytnef_fix_requires.patch ---
diff -ruNp a/ytnef-2.6/src/ytnef/ytnefprocess.pl b/ytnef-2.6/src/ytnef/ytnefprocess.pl
--- a/ytnef-2.6/src/ytnef/ytnefprocess.pl	2003-08-25 14:11:57.000000000 -0300
+++ b/ytnef-2.6/src/ytnef/ytnefprocess.pl	2009-05-28 01:51:45.525769886 -0300
@@ -2,7 +2,7 @@
 use MIME::Parser;
 use MIME::Entity;
 use Mail::Mailer;
-use Mail::Mailer::test;
+use Mail::Mailer::testfile;
 
 my $mail_dir = "$ENV{HOME}/.ytnef";
 my $reader = "/usr/local/bin/ytnef";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytnef/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:33:42 -0000	1.1
+++ .cvsignore	20 Aug 2009 22:48:35 -0000	1.2
@@ -0,0 +1 @@
+ytnef-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytnef/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:33:42 -0000	1.1
+++ sources	20 Aug 2009 22:48:35 -0000	1.2
@@ -0,0 +1 @@
+572830ff0664a2abc3e7aea79040c338  ytnef-2.6.tar.gz



From itamarjp at fedoraproject.org  Thu Aug 20 22:51:28 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 20 Aug 2009 22:51:28 +0000 (UTC)
Subject: rpms/ytnef/F-10 import.log, NONE, 1.1 ytnef.spec, NONE,
	1.1 ytnef_fix_requires.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090820225128.D616D11C006E@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ytnef/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23318/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ytnef.spec ytnef_fix_requires.patch 
Log Message:
initial rpm import



--- NEW FILE import.log ---
ytnef-2_6-4_fc12:F-10:ytnef-2.6-4.fc12.src.rpm:1250808578


--- NEW FILE ytnef.spec ---
Summary: Yerase's TNEF Stream Reader
Name: ytnef
Version: 2.6
Release: 4%{?dist}
License: GPL+
Group: Applications/Productivity
URL: http://sourceforge.net/projects/ytnef/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libytnef-devel

Patch0: ytnef_fix_requires.patch

%description
Yerase's TNEF Stream Reader.  Can take a TNEF Stream (winmail.dat) sent from
Microsoft Outlook (or similar products) and extract the attachments, including
construction of Contact Cards & Calendar entries.

%prep
%setup -q
%patch0 -p2

%build
%configure
%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/libytnef"

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make}  install DESTDIR=$RPM_BUILD_ROOT

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README INSTALL ChangeLog
%{_bindir}/ytnef
%{_bindir}/ytnefprint
%{_bindir}/ytnefprocess.pl

%changelog
* Thu May 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-4
- fix perl requires

* Tue Mar 24 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-3
- Changed License to the same as libytnef-devel
- Macronify everything as possible.
- Included ChangeLog as part of the documentation.

* Fri Feb 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.6-2
- Rebuild for fedora 10

* Fri Mar 12 2004 Patrick <rpms at puzzled.xs4all.nl>
- Initial version


ytnef_fix_requires.patch:
 ytnefprocess.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ytnef_fix_requires.patch ---
diff -ruNp a/ytnef-2.6/src/ytnef/ytnefprocess.pl b/ytnef-2.6/src/ytnef/ytnefprocess.pl
--- a/ytnef-2.6/src/ytnef/ytnefprocess.pl	2003-08-25 14:11:57.000000000 -0300
+++ b/ytnef-2.6/src/ytnef/ytnefprocess.pl	2009-05-28 01:51:45.525769886 -0300
@@ -2,7 +2,7 @@
 use MIME::Parser;
 use MIME::Entity;
 use Mail::Mailer;
-use Mail::Mailer::test;
+use Mail::Mailer::testfile;
 
 my $mail_dir = "$ENV{HOME}/.ytnef";
 my $reader = "/usr/local/bin/ytnef";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytnef/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Aug 2009 17:33:42 -0000	1.1
+++ .cvsignore	20 Aug 2009 22:51:28 -0000	1.2
@@ -0,0 +1 @@
+ytnef-2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytnef/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Aug 2009 17:33:42 -0000	1.1
+++ sources	20 Aug 2009 22:51:28 -0000	1.2
@@ -0,0 +1 @@
+572830ff0664a2abc3e7aea79040c338  ytnef-2.6.tar.gz



From marx at fedoraproject.org  Thu Aug 20 22:53:02 2009
From: marx at fedoraproject.org (=?utf-8?q?Marek_Gr=C3=A1c?=)
Date: Thu, 20 Aug 2009 22:53:02 +0000 (UTC)
Subject: rpms/system-config-lvm/F-10 .cvsignore, 1.24, 1.25 sources, 1.26,
	1.27 system-config-lvm.spec, 1.33, 1.34
Message-ID: <20090820225302.70A3711C006E@cvs1.fedora.phx.redhat.com>

Author: marx

Update of /cvs/pkgs/rpms/system-config-lvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23666

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
New upstream release v1.1.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Aug 2009 12:56:58 -0000	1.24
+++ .cvsignore	20 Aug 2009 22:53:02 -0000	1.25
@@ -1 +1 @@
-system-config-lvm-1.1.8.tar.gz
+system-config-lvm-1.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	20 Aug 2009 12:56:58 -0000	1.26
+++ sources	20 Aug 2009 22:53:02 -0000	1.27
@@ -1 +1 @@
-dcf4c1711eadc7bf5dbe676514d4aea2  system-config-lvm-1.1.8.tar.gz
+03f76abaa184b3c1df713113cd64f4f3  system-config-lvm-1.1.9.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-lvm/F-10/system-config-lvm.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- system-config-lvm.spec	20 Aug 2009 12:56:58 -0000	1.33
+++ system-config-lvm.spec	20 Aug 2009 22:53:02 -0000	1.34
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes
 Name: system-config-lvm
-Version: 1.1.8
+Version: 1.1.9
 Release: 1%{?dist}
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Fri Aug 21 2009 Marek Grac <mgrac at redhat.com> - 1.1.9
+- Bugfix #474996: Unable to start without cluster.conf
+
 * Thu Aug 20 2009 Marek Grac <mgrac at redhat.com> 1.1.8-1
 - Updated translations for several languages (transifex)
 - Resolves: #243646 - Unable to modify logical partition with or_IN locale



From toshio at fedoraproject.org  Thu Aug 20 22:53:53 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:53:53 +0000 (UTC)
Subject: rpms/tasque/devel tasque.spec,1.5,1.6
Message-ID: <20090820225353.8FB0911C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/tasque/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23980/devel

Modified Files:
	tasque.spec 
Log Message:
Rebuild for ppc64



Index: tasque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tasque/devel/tasque.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tasque.spec	27 Jul 2009 05:32:59 -0000	1.5
+++ tasque.spec	20 Aug 2009 22:53:53 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           tasque
 Version:        0.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple task management app (TODO list) for the Linux Desktop
 
 Group:          Applications/Productivity
@@ -14,7 +14,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  intltool pkgconfig mono-core gtk-sharp2-devel gnome-sharp-devel ndesk-dbus-devel ndesk-dbus-glib-devel
 BuildRequires:  gettext desktop-file-utils mono-data-sqlite
 Requires:       mono-core gnome-sharp gtk-sharp2 ndesk-dbus-glib mono-data-sqlite
-ExcludeArch:    ppc64
 
 %if 0%{?fedora} >= 10
 BuildRequires: notify-sharp-devel
@@ -80,9 +79,15 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1.8-4
+- Rebuild for ppc64.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sun May 31 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.1.8-3
+- Build arch ppc64.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 22:53:53 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:53:53 +0000 (UTC)
Subject: rpms/tasque/F-11 tasque.spec,1.5,1.6
Message-ID: <20090820225353.5D24211C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/tasque/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23980/F-11

Modified Files:
	tasque.spec 
Log Message:
Rebuild for ppc64



Index: tasque.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tasque/F-11/tasque.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tasque.spec	1 Jun 2009 00:18:05 -0000	1.5
+++ tasque.spec	20 Aug 2009 22:53:53 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           tasque
 Version:        0.1.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple task management app (TODO list) for the Linux Desktop
 
 Group:          Applications/Productivity
@@ -14,7 +14,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  intltool pkgconfig mono-core gtk-sharp2-devel gnome-sharp-devel ndesk-dbus-devel ndesk-dbus-glib-devel
 BuildRequires:  gettext desktop-file-utils mono-data-sqlite
 Requires:       mono-core gnome-sharp gtk-sharp2 ndesk-dbus-glib mono-data-sqlite
-ExcludeArch:    ppc64
 
 %if 0%{?fedora} >= 10
 BuildRequires: notify-sharp-devel
@@ -80,6 +79,12 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1.8-4
+- Rebuild for ppc64.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 31 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.1.8-3
 - Build arch ppc64.
 



From linuxdonald at fedoraproject.org  Thu Aug 20 22:56:38 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Thu, 20 Aug 2009 22:56:38 +0000 (UTC)
Subject: rpms/openal-soft/devel openal-soft.spec,1.4,1.5
Message-ID: <20090820225638.9DABC11C006E@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24629

Modified Files:
	openal-soft.spec 
Log Message:

Fixed version info



Index: openal-soft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openal-soft.spec	20 Aug 2009 22:33:47 -0000	1.4
+++ openal-soft.spec	20 Aug 2009 22:56:37 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		openal-soft
 Version:	1.8.466
-Release:	8.%{revision}svn%{?dist}
+Release:	9.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-9.487f0dde7593144ceabd817306500465caf7602agit
+- Fixed version info
+
 * Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-8.487f0dde7593144ceabd817306500465caf7602agit
 - Fixed bug 517973
 



From bjrosen at fedoraproject.org  Thu Aug 20 22:58:23 2009
From: bjrosen at fedoraproject.org (B. Joshua Rosen)
Date: Thu, 20 Aug 2009 22:58:23 +0000 (UTC)
Subject: rpms/sys_basher/devel import.log,1.2,1.3
Message-ID: <20090820225823.DA2FE11C006E@cvs1.fedora.phx.redhat.com>

Author: bjrosen

Update of /cvs/pkgs/rpms/sys_basher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25241/devel

Modified Files:
	import.log 
Log Message:
removed ppc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sys_basher/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	20 Aug 2009 22:09:38 -0000	1.2
+++ import.log	20 Aug 2009 22:58:23 -0000	1.3
@@ -1,2 +1,3 @@
 sys_basher-1_1_23-1_fc11:HEAD:sys_basher-1.1.23-1.fc11.src.rpm:1250788155
 sys_basher-1_1_23-2_fc11:HEAD:sys_basher-1.1.23-2.fc11.src.rpm:1250806117
+sys_basher-1_1_23-2_fc11:HEAD:sys_basher-1.1.23-2.fc11.src.rpm:1250808971



From toshio at fedoraproject.org  Thu Aug 20 22:59:45 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:59:45 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth.spec,1.9,1.10
Message-ID: <20090820225945.2AADC11C02CC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25488/devel

Modified Files:
	podsleuth.spec 
Log Message:
Rebuild to get ppc64 packages.



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- podsleuth.spec	26 Jul 2009 19:02:33 -0000	1.9
+++ podsleuth.spec	20 Aug 2009 22:59:44 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		podsleuth
 Version:	0.6.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
@@ -22,7 +22,7 @@ BuildRequires:	sg3_utils-devel
 Requires:       sg3_utils-libs
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 # Disabled due to strange build failure:
 # s390 s390x
 
@@ -82,9 +82,15 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.3-4
+- Rebuild for ppc64
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.6.3-3
+- Build arch ppc64.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 22:59:44 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 22:59:44 +0000 (UTC)
Subject: rpms/podsleuth/F-11 podsleuth.spec,1.9,1.10
Message-ID: <20090820225944.E23FA11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/podsleuth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25488/F-11

Modified Files:
	podsleuth.spec 
Log Message:
Rebuild to get ppc64 packages.



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-11/podsleuth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- podsleuth.spec	1 Jun 2009 17:33:15 -0000	1.9
+++ podsleuth.spec	20 Aug 2009 22:59:44 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		podsleuth
 Version:	0.6.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
@@ -82,6 +82,12 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.3-4
+- Rebuild for ppc64
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.6.3-3
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 23:10:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:10:09 +0000 (UTC)
Subject: rpms/gnome-keyring-sharp/F-11 gnome-keyring-sharp.spec,1.5,1.6
Message-ID: <20090820231009.B362611C0439@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gnome-keyring-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992/F-11

Modified Files:
	gnome-keyring-sharp.spec 
Log Message:
Build on ppc64.



Index: gnome-keyring-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/F-11/gnome-keyring-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-keyring-sharp.spec	1 Jun 2009 17:00:07 -0000	1.5
+++ gnome-keyring-sharp.spec	20 Aug 2009 23:10:08 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           gnome-keyring-sharp
 Version:        1.0.1
-Release:        0.3.%{svn_rev}svn%{?dist}
+Release:        0.3.%{svn_rev}svn%{?dist}.1
 Summary:        Mono implementation of GNOME Keyring
 
 Group:          System Environment/Libraries
@@ -19,6 +19,9 @@ Source0:        gnome-keyring-sharp-%{ve
 Patch0:         gnome-keyring-sharp-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# sparc64 is even worse. Secondary arch, but package owner gets emailed
+# on build failures
+ExcludeArch:    sparc64
 
 BuildRequires:  autoconf automake
 BuildRequires:  mono-devel ndesk-dbus-devel monodoc
@@ -94,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.1-0.3.133722svn%{?dist}.1
+- Rebuild for ppc64 since previous build was obsoleted.
+- Disable building on sparc64 to match rawhide
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.0.1-0.3.115768svn
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 23:10:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:10:09 +0000 (UTC)
Subject: rpms/gnome-keyring-sharp/devel gnome-keyring-sharp.spec,1.6,1.7
Message-ID: <20090820231009.B7CB011C04D9@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gnome-keyring-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992/devel

Modified Files:
	gnome-keyring-sharp.spec 
Log Message:
Build on ppc64.



Index: gnome-keyring-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/gnome-keyring-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-keyring-sharp.spec	20 Aug 2009 17:42:49 -0000	1.6
+++ gnome-keyring-sharp.spec	20 Aug 2009 23:10:09 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           gnome-keyring-sharp
 Version:        1.0.1
-Release:        0.4.%{svn_rev}svn%{?dist}
+Release:        0.5.%{svn_rev}svn%{?dist}
 Summary:        Mono implementation of GNOME Keyring
 
 Group:          System Environment/Libraries
@@ -19,8 +19,6 @@ Source0:        gnome-keyring-sharp-%{ve
 Patch0:         gnome-keyring-sharp-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:    ppc64
 # sparc64 is even worse. Secondary arch, but package owner gets emailed
 # on build failures
 ExcludeArch:    sparc64
@@ -99,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.1-0.5.133722svn%{?dist}
+- Rebuild for ppc64 since previous build was obsoleted.
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.1-0.4.133722svn%{?dist}
 - Update to r133722
 - Disable building on sparc64
@@ -106,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-0.3.115768svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.0.1-0.3.115768svn
+- Build arch ppc64.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-0.2.115768svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 23:19:03 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:19:03 +0000 (UTC)
Subject: rpms/notify-sharp/devel notify-sharp.spec,1.4,1.5
Message-ID: <20090820231903.533B211C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/notify-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29384/devel

Modified Files:
	notify-sharp.spec 
Log Message:
Rebuild for ppc64 since the previous update was obsoleted.



Index: notify-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notify-sharp/devel/notify-sharp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- notify-sharp.spec	25 Jul 2009 19:30:51 -0000	1.4
+++ notify-sharp.spec	20 Aug 2009 23:19:03 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           notify-sharp
 Version:        0.4.0
-Release:        0.8.%{svndate}svn%{?dist}.1
+Release:        0.9.%{svndate}svn%{?dist}
 Summary:        A C# implementation for Desktop Notifications
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.4.0-0.9.20080912svn.1
+- Rebuild to pick up ppc64 builds
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-0.8.20080912svn.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 23:19:03 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:19:03 +0000 (UTC)
Subject: rpms/notify-sharp/F-11 notify-sharp.spec,1.4,1.5
Message-ID: <20090820231903.26A6311C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/notify-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29384/F-11

Modified Files:
	notify-sharp.spec 
Log Message:
Rebuild for ppc64 since the previous update was obsoleted.



Index: notify-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notify-sharp/F-11/notify-sharp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- notify-sharp.spec	17 Jun 2009 12:46:04 -0000	1.4
+++ notify-sharp.spec	20 Aug 2009 23:19:02 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           notify-sharp
 Version:        0.4.0
-Release:        0.7.%{svndate}svn%{?dist}.1
+Release:        0.9.%{svndate}svn%{?dist}
 Summary:        A C# implementation for Desktop Notifications
 
 Group:          System Environment/Libraries
@@ -82,6 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.4.0-0.9.20080912svn.1
+- Rebuild to pick up ppc64 builds
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-0.8.20080912svn.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Karsten Hopp <karsten at redhat.com> 0.4.0-0.7.20080912svn.1
 - mono is available on s390x
 



From toshio at fedoraproject.org  Thu Aug 20 23:30:36 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:30:36 +0000 (UTC)
Subject: rpms/beagle/devel beagle.spec,1.171,1.172
Message-ID: <20090820233036.B67FC11C0416@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31521/devel

Modified Files:
	beagle.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-13
- Re-enable ppc64.
- Re-enable epiphany



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- beagle.spec	24 Jul 2009 17:55:40 -0000	1.171
+++ beagle.spec	20 Aug 2009 23:30:35 -0000	1.172
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -35,7 +35,7 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:	desktop-file-utils
 BuildRequires:	libbeagle-devel >= 0.3.4
 BuildRequires:	ndesk-dbus-glib-devel
-#BuildRequires:	epiphany-devel
+BuildRequires:	epiphany-devel
 BuildRequires:	taglib-sharp-devel
 BuildRequires:	unzip
 BuildRequires:	chmlib-devel
@@ -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 ppc64
+ExcludeArch: s390 s390x sparc64
 
 BuildRequires:	xulrunner-devel
 
@@ -116,14 +116,14 @@ Requires:	beagle = %{version}-%{release}
 %description firefox
 Beagle Indexer Extension for Firefox
 
-#%package epiphany
-#Summary:	Beagle backend for Epiphany
-#Group:		User Interface/Desktops
-#Requires:	beagle = %{version}-%{release}
-#Requires:	epiphany-extensions
+%package epiphany
+Summary:	Beagle backend for Epiphany
+Group:		User Interface/Desktops
+Requires:	beagle = %{version}-%{release}
+Requires:	epiphany-extensions
 
-#%description epiphany
-#Beagle backend for Epiphany
+%description epiphany
+Beagle backend for Epiphany
 
 %package devel
 Summary:	Development files for the Beagle search infrastructure
@@ -328,9 +328,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
 %{_libdir}/beagle/thunderbird/
 
-#%files epiphany
-#%defattr(-, root, root,-)
-#%{_libdir}/epiphany/
+%files epiphany
+%defattr(-, root, root,-)
+%{_libdir}/epiphany/
 
 %files gnome
 %defattr(-, root, root,-)
@@ -354,9 +354,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-13
+- Re-enable ppc64.
+- Re-enable epiphany
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.9-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Thu Jul 23 2009 Juan Rodiguez <nushio at fedoraproject.org> - 0.3.9-11
+- Remove ppc64 support while mono remains broken on it.
+
 * Thu Jul 23 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.3.9-11
 - Removed epiphany subpackage, as it fails on x86_64
 



From toshio at fedoraproject.org  Thu Aug 20 23:30:36 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:30:36 +0000 (UTC)
Subject: rpms/beagle/F-11 beagle.spec,1.170,1.171
Message-ID: <20090820233036.B2B5B11C0347@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/beagle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31521/F-11

Modified Files:
	beagle.spec 
Log Message:

* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-13
- Re-enable ppc64.
- Re-enable epiphany



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-11/beagle.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- beagle.spec	23 Jul 2009 22:24:38 -0000	1.170
+++ beagle.spec	20 Aug 2009 23:30:34 -0000	1.171
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	11%{?dist}
+Release:	13%{?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 ppc64
+ExcludeArch: s390 s390x sparc64
 
 BuildRequires:	xulrunner-devel
 
@@ -354,9 +354,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-13
+- Re-enable ppc64.
+- Re-enable epiphany
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.9-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Juan Rodiguez <nushio at fedoraproject.org> - 0.3.9-11
 - Remove ppc64 support while mono remains broken on it.
 
+* Thu Jul 23 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.3.9-11
+- Removed epiphany subpackage, as it fails on x86_64
+
 * Mon Jul 06 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-10
 - Add support for epiphany 2.27/2.28
 



From whot at fedoraproject.org  Thu Aug 20 23:34:56 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 20 Aug 2009 23:34:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-11 .cvsignore, 1.34, 1.35 sources, 1.34, 
	1.35 xorg-x11-drv-evdev.spec, 1.53, 1.54
Message-ID: <20090820233456.315AF11C006E@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-serv821

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Fri Aug 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.5-1
- evdev 2.2.5 (Fix for #517782)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	6 Aug 2009 04:21:51 -0000	1.34
+++ .cvsignore	20 Aug 2009 23:34:55 -0000	1.35
@@ -1 +1 @@
-xf86-input-evdev-2.2.4.tar.bz2
+xf86-input-evdev-2.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	6 Aug 2009 04:21:51 -0000	1.34
+++ sources	20 Aug 2009 23:34:55 -0000	1.35
@@ -1 +1 @@
-6d0bd6cd3f50a42687c663d4764aeb44  xf86-input-evdev-2.2.4.tar.bz2
+e926692d74ee81ed459d0fe89439ff8b  xf86-input-evdev-2.2.5.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.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xorg-x11-drv-evdev.spec	6 Aug 2009 04:21:51 -0000	1.53
+++ xorg-x11-drv-evdev.spec	20 Aug 2009 23:34:55 -0000	1.54
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.4
+Version:    2.2.5
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -72,6 +72,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Fri Aug 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.5-1
+- evdev 2.2.5 (Fix for #517782)
+
 * Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.4-1
 - evdev 2.2.4
 



From toshio at fedoraproject.org  Thu Aug 20 23:37:54 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:37:54 +0000 (UTC)
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.14,1.15
Message-ID: <20090820233754.2FB0211C02CC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gtk-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1326/devel

Modified Files:
	gtk-sharp.spec 
Log Message:
Rebuild for ppc64 packages.



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gtk-sharp.spec	25 Jul 2009 01:42:01 -0000	1.14
+++ gtk-sharp.spec	20 Aug 2009 23:37:54 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 23%{?dist}
+Release: 24%{?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
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
 %description
 This package provides a library that allows you to build
@@ -108,9 +108,15 @@ rm -rf %{buildroot}
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.10-24
+- Rebuild for ppc64 since the previous build was obsoleted
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sat May 30 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.0.10-23
+- Build arch ppc64.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 23:37:54 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:37:54 +0000 (UTC)
Subject: rpms/gtk-sharp/F-11 gtk-sharp.spec,1.14,1.15
Message-ID: <20090820233754.1421111C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gtk-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1326/F-11

Modified Files:
	gtk-sharp.spec 
Log Message:
Rebuild for ppc64 packages.



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp/F-11/gtk-sharp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gtk-sharp.spec	30 May 2009 20:47:19 -0000	1.14
+++ gtk-sharp.spec	20 Aug 2009 23:37:53 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 23%{?dist}
+Release: 24%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPLv2
@@ -108,6 +108,12 @@ rm -rf %{buildroot}
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.10-24
+- Rebuild for ppc64 since the previous build was obsoleted
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 30 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.0.10-23
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 23:49:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:49:09 +0000 (UTC)
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.28,1.29
Message-ID: <20090820234909.7EA2711C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gsf-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3208/devel

Modified Files:
	gsf-sharp.spec 
Log Message:
Rebuild packages to bring in ppc64 builds.



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gsf-sharp.spec	25 Jul 2009 01:32:32 -0000	1.28
+++ gsf-sharp.spec	20 Aug 2009 23:49:09 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRequires:  gtk-sharp2-devel
 Requires:       libgsf
 
 # Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 # no mono on s390 for now: s390 s390x 
 
 %description
@@ -60,9 +60,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gsf-sharp.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-11
+- Rebuild ppc64 packages
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sat May 30 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.8.1-10
+- Build arch ppc64.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From toshio at fedoraproject.org  Thu Aug 20 23:49:09 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:49:09 +0000 (UTC)
Subject: rpms/gsf-sharp/F-11 gsf-sharp.spec,1.28,1.29
Message-ID: <20090820234909.56C2E11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gsf-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3208/F-11

Modified Files:
	gsf-sharp.spec 
Log Message:
Rebuild packages to bring in ppc64 builds.



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsf-sharp/F-11/gsf-sharp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gsf-sharp.spec	30 May 2009 02:32:01 -0000	1.28
+++ gsf-sharp.spec	20 Aug 2009 23:49:08 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gsf-sharp.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-11
+- Rebuild ppc64 packages
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 30 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.8.1-10
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 23:53:05 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:53:05 +0000 (UTC)
Subject: rpms/lat/F-11 lat.spec,1.23,1.24
Message-ID: <20090820235305.204B611C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/lat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3953/F-11

Modified Files:
	lat.spec 
Log Message:
Rebuild lat since the last build was obsoleted in bodhi.



Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-11/lat.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- lat.spec	30 May 2009 02:00:23 -0000	1.23
+++ lat.spec	20 Aug 2009 23:53:04 -0000	1.24
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.3
-Release:            7%{?dist}
+Release:            8%{?dist}
 License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://sourceforge.net/projects/ldap-at/
@@ -22,7 +22,6 @@ Requires:           mono-data, gtk-sharp
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
-
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
@@ -117,8 +116,11 @@ The lat-devel package contains the files
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* 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
+
 * Mon May 25 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.2.3-7
-- Build arch ppc64.
+- Build arch ppc64 now that mono stack is available for that arch (#241911)
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From toshio at fedoraproject.org  Thu Aug 20 23:58:25 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:58:25 +0000 (UTC)
Subject: rpms/evolution-sharp/F-11 evolution-sharp.spec,1.64,1.65
Message-ID: <20090820235825.B8A9311C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/evolution-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4835/F-11

Modified Files:
	evolution-sharp.spec 
Log Message:
rebuild to pick up ppc64 build



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/F-11/evolution-sharp.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- evolution-sharp.spec	30 May 2009 00:50:28 -0000	1.64
+++ evolution-sharp.spec	20 Aug 2009 23:58:25 -0000	1.65
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.20.0-3
+- Rebuild to pick up ppc64.
+
 * Fri May 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.20.0-2
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Thu Aug 20 23:58:25 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 20 Aug 2009 23:58:25 +0000 (UTC)
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.65,1.66
Message-ID: <20090820235825.DDD1F11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4835/devel

Modified Files:
	evolution-sharp.spec 
Log Message:
rebuild to pick up ppc64 build



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- evolution-sharp.spec	24 Jul 2009 22:24:12 -0000	1.65
+++ evolution-sharp.spec	20 Aug 2009 23:58:25 -0000	1.66
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.21.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -11,7 +11,7 @@ Source: http://ftp.gnome.org/pub/GNOME/s
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 # Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
 ### Patches ###
 
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.20.0-3
+- Rebuild to pick up ppc64.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From toshio at fedoraproject.org  Fri Aug 21 00:06:49 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 21 Aug 2009 00:06:49 +0000 (UTC)
Subject: rpms/gnome-subtitles/F-11 gnome-subtitles.spec,1.7,1.8
Message-ID: <20090821000649.07FFB11C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gnome-subtitles/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6877

Modified Files:
	gnome-subtitles.spec 
Log Message:
Rebuild to pick up ppc64



Index: gnome-subtitles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-11/gnome-subtitles.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnome-subtitles.spec	29 May 2009 23:53:44 -0000	1.7
+++ gnome-subtitles.spec	21 Aug 2009 00:06:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gnome-subtitles
 Version:        0.8
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Subtitle editor for Gnome
 
 Group:          Applications/Multimedia
@@ -106,6 +106,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* 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
+
 * Fri May 29 2009 Xavier lamien <laxathom at fedoraproject.org> - 0.8-8
 - Build arch ppc64.
 



From toshio at fedoraproject.org  Fri Aug 21 00:35:15 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 21 Aug 2009 00:35:15 +0000 (UTC)
Subject: rpms/taglib-sharp/F-11 taglib-sharp.spec,1.8,1.9
Message-ID: <20090821003515.7D10411C006E@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/taglib-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11571/F-11

Modified Files:
	taglib-sharp.spec 
Log Message:
Build for ppc64



Index: taglib-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-sharp/F-11/taglib-sharp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- taglib-sharp.spec	31 May 2009 10:03:24 -0000	1.8
+++ taglib-sharp.spec	21 Aug 2009 00:35:15 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:    taglib-sharp
 Version: 2.0.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Provides tag reading and writing for Banshee and other Mono apps
 
 Group:   System Environment/Libraries
@@ -67,6 +67,12 @@ sed -i 's|${exec_prefix}/lib|%{_libdir}|
 %{_libdir}/pkgconfig/taglib-sharp.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.3.2-4
+- Build for ppc64
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun May 31 2009 Xavier Lamien <laxathom at fedoraproject.org> - 2.0.3.2-3
 - Build arches ppc.
 



From toshio at fedoraproject.org  Fri Aug 21 00:35:15 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 21 Aug 2009 00:35:15 +0000 (UTC)
Subject: rpms/taglib-sharp/devel taglib-sharp.spec,1.8,1.9
Message-ID: <20090821003515.96EDB11C02CC@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/taglib-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11571/devel

Modified Files:
	taglib-sharp.spec 
Log Message:
Build for ppc64



Index: taglib-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-sharp/devel/taglib-sharp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- taglib-sharp.spec	27 Jul 2009 05:29:46 -0000	1.8
+++ taglib-sharp.spec	21 Aug 2009 00:35:15 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:    taglib-sharp
 Version: 2.0.3.2
-Release: 3%{?dist}
+Release: 4%{?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 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 armv4l sparc alpha ppc
 
 BuildRequires: mono-devel, monodoc-devel, gnome-sharp-devel
 
@@ -67,9 +67,15 @@ sed -i 's|${exec_prefix}/lib|%{_libdir}|
 %{_libdir}/pkgconfig/taglib-sharp.pc
 
 %changelog
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.3.2-4
+- Build for ppc64
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sun May 31 2009 Xavier Lamien <laxathom at fedoraproject.org> - 2.0.3.2-3
+- Build arches ppc.
+
 * Wed Feb 25 2009 David Nielsen <dnielsen at fedoraproject.org> - 2.0.3.2-2
 - fix pkgconfig file
 



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:15 +0000
Subject: [pkgdb] gaim-meanwhile ownership updated
Message-ID: <20090821005715.CC4C810F854@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora devel was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:15 +0000
Subject: [pkgdb] gaim-meanwhile (un)retirement
Message-ID: <20090821005715.D9D5E10F85A@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora devel has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:19 +0000
Subject: [pkgdb] gaim-meanwhile ownership updated
Message-ID: <20090821005719.9F55D10F890@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 3 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:21 +0000
Subject: [pkgdb] gaim-meanwhile ownership updated
Message-ID: <20090821005721.B94F710F857@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 4 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:19 +0000
Subject: [pkgdb] gaim-meanwhile (un)retirement
Message-ID: <20090821005719.A9E7010F898@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 3 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:21 +0000
Subject: [pkgdb] gaim-meanwhile (un)retirement
Message-ID: <20090821005721.BF17510F881@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 4 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:23 +0000
Subject: [pkgdb] gaim-meanwhile ownership updated
Message-ID: <20090821005723.B60E210F886@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 5 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:23 +0000
Subject: [pkgdb] gaim-meanwhile (un)retirement
Message-ID: <20090821005723.BC0FA10F899@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 5 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:26 +0000
Subject: [pkgdb] gaim-meanwhile ownership updated
Message-ID: <20090821005726.3F06810F89B@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 6 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:26 +0000
Subject: [pkgdb] gaim-meanwhile (un)retirement
Message-ID: <20090821005726.4B9B610F89F@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 6 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:28 +0000
Subject: [pkgdb] gaim-meanwhile ownership updated
Message-ID: <20090821005728.8AEFD10F8A0@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 9 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:28 +0000
Subject: [pkgdb] gaim-meanwhile (un)retirement
Message-ID: <20090821005728.9225310F8A2@bastion2.fedora.phx.redhat.com>

Package gaim-meanwhile in Fedora 9 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gaim-meanwhile



From pkgdb at fedoraproject.org  Fri Aug 21 00:57:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:57:55 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005755.DC9FF10F881@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora devel was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:01 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005801.A451C10F886@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 7 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:01 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005801.B660110F890@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 7 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:04 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005804.3260110F895@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 3 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:04 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005804.3C49610F899@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 3 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:06 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005806.5D60010F8A3@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 4 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:06 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005806.63C3A10F8A6@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 4 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:11 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005811.955C610F8A9@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 5 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:11 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005811.9ECDE10F8AD@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 5 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:14 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005814.5AEDB10F8A1@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 6 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:14 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005814.4419E10F854@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 6 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:16 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005816.137A810F8AF@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 8 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:16 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005816.1BBA610F8B1@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 8 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:17 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005817.6FB4D10F8B4@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 9 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:19 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005819.7195910F8B7@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 10 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:20 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821005820.E7D2A10F8B9@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 11 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:02 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005902.42A1810F898@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora devel was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:04 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005904.B5BF310F89A@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 7 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:04 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005904.C33CB10F89C@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 7 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:58:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:58:17 +0000
Subject: [pkgdb] gquilt (un)retirement
Message-ID: <20090821005817.7C66610F8B6@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 9 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:06 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005906.C19DF10F8A6@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 3 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:06 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005906.C76B210F8BC@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 3 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:08 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005908.BC78F10F8BD@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 4 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:10 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005910.DFAD410F8C1@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 5 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:10 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005910.F14BE10F8C0@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 5 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:08 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005908.C2ACE10F8BF@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 4 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:12 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005913.0B11810F8C4@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 6 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:12 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005913.0473410F8C2@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 6 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:19 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005919.14DE610F8A0@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora EPEL 4 is now owned by markmc

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:23 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005923.6BC9610F8C5@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora EPEL 5 is now owned by markmc

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:32 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005932.8A59A10F8B0@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 8 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:32 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005932.9209E10F8B2@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 8 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:35 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005936.038BB10F8C7@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 9 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:35 +0000
Subject: [pkgdb] quilt (un)retirement
Message-ID: <20090821005936.0870D10F8C9@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 9 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:37 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005937.9B18810F8CC@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 10 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 00:59:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 00:59:39 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821005939.DF2E510F8CD@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 11 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:03 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821010103.0C36D10F89F@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora devel was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:04 +0000
Subject: [pkgdb] jfsutils (un)retirement
Message-ID: <20090821010104.CA03C10F8A8@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 7 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:04 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821010104.C17EC10F8A5@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 7 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:06 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821010106.77D8910F8A0@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 8 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:06 +0000
Subject: [pkgdb] jfsutils (un)retirement
Message-ID: <20090821010106.8A20C10F8A2@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 8 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:08 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821010108.9C71210F8AA@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 9 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:08 +0000
Subject: [pkgdb] jfsutils (un)retirement
Message-ID: <20090821010108.A264110F8BA@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 9 has been retired by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:13 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821010113.D101210F8BD@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 10 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:01:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:01:15 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821010115.D35DA10F8C0@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 11 was orphaned by jwboyer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:29:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:29:56 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821012956.E585010F80B@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora devel is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:29:59 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821012959.D930210F85A@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 10 is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From pkgdb at fedoraproject.org  Fri Aug 21 01:30:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 01:30:01 +0000
Subject: [pkgdb] jfsutils ownership updated
Message-ID: <20090821013001.749ED10F881@bastion2.fedora.phx.redhat.com>

Package jfsutils in Fedora 11 is now owned by itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jfsutils



From salimma at fedoraproject.org  Fri Aug 21 01:47:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 01:47:16 +0000 (UTC)
Subject: rpms/rygel/devel rygel-0.3-gee01.patch,NONE,1.1 rygel.spec,1.6,1.7
Message-ID: <20090821014716.570F411C006E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26812

Modified Files:
	rygel.spec 
Added Files:
	rygel-0.3-gee01.patch 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3-6
- Rebuild against compat-libgee01

Note: depends on compat-libgee01 being reviewed and built
see https://bugzilla.redhat.com/show_bug.cgi?id=518574


rygel-0.3-gee01.patch:
 configure |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE rygel-0.3-gee01.patch ---
--- rygel-0.3/configure.gee01	2009-05-30 14:04:07.000000000 -0400
+++ rygel-0.3/configure	2009-08-20 21:37:15.853167764 -0400
@@ -13314,12 +13314,12 @@
     pkg_cv_GEE_CFLAGS="$GEE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gee-1.0 >= \$GEE_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gee-1.0 >= $GEE_REQUIRED") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gee-0.1 >= \$GEE_REQUIRED\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gee-0.1 >= $GEE_REQUIRED") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GEE_CFLAGS=`$PKG_CONFIG --cflags "gee-1.0 >= $GEE_REQUIRED" 2>/dev/null`
+  pkg_cv_GEE_CFLAGS=`$PKG_CONFIG --cflags "gee-0.1 >= $GEE_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13330,12 +13330,12 @@
     pkg_cv_GEE_LIBS="$GEE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gee-1.0 >= \$GEE_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gee-1.0 >= $GEE_REQUIRED") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gee-0.1 >= \$GEE_REQUIRED\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gee-0.1 >= $GEE_REQUIRED") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GEE_LIBS=`$PKG_CONFIG --libs "gee-1.0 >= $GEE_REQUIRED" 2>/dev/null`
+  pkg_cv_GEE_LIBS=`$PKG_CONFIG --libs "gee-0.1 >= $GEE_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13353,14 +13353,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GEE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gee-1.0 >= $GEE_REQUIRED" 2>&1`
+	        GEE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gee-0.1 >= $GEE_REQUIRED" 2>&1`
         else
-	        GEE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gee-1.0 >= $GEE_REQUIRED" 2>&1`
+	        GEE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gee-0.1 >= $GEE_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEE_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gee-1.0 >= $GEE_REQUIRED) were not met:
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gee-0.1 >= $GEE_REQUIRED) were not met:
 
 $GEE_PKG_ERRORS
 
@@ -13371,7 +13371,7 @@
 and GEE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-$as_echo "$as_me: error: Package requirements (gee-1.0 >= $GEE_REQUIRED) were not met:
+$as_echo "$as_me: error: Package requirements (gee-0.1 >= $GEE_REQUIRED) were not met:
 
 $GEE_PKG_ERRORS
 


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rygel.spec	20 Aug 2009 21:31:43 -0000	1.6
+++ rygel.spec	21 Aug 2009 01:47:16 -0000	1.7
@@ -7,6 +7,7 @@ Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://live.gnome.org/Rygel
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch0:         rygel-0.3-gee01.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: vala-devel >= 0.7
@@ -19,7 +20,7 @@ BuildRequires: dbus-glib-devel
 BuildRequires: libuuid-devel
 BuildRequires: gstreamer-devel
 BuildRequires: GConf2-devel
-BuildRequires: libgee-devel >= 0.1.5
+BuildRequires: compat-libgee01-devel
 BuildRequires: libsoup-devel
 
 %description
@@ -47,6 +48,7 @@ A plugin for rygel to use tracker to loc
 
 %prep
 %setup -q
+%patch0 -p1 -b .gee01
 
 %build
 %configure
@@ -86,7 +88,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.3-6
-- Rebuild against new libgee
+- Rebuild against compat-libgee01
 
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-5
 - Own rygel include dir, some spec file cleanups



From emaldonado at fedoraproject.org  Fri Aug 21 01:48:33 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 21 Aug 2009 01:48:33 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.85,1.86
Message-ID: <20090821014833.563FA11C006E@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27087

Modified Files:
	nss.spec 
Log Message:
install libnssutil3 while nss-util package is in untagged state


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- nss.spec	20 Aug 2009 19:43:59 -0000	1.85
+++ nss.spec	21 Aug 2009 01:48:33 -0000	1.86
@@ -13,7 +13,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          9%{?dist}
+Release:          10%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -254,10 +254,10 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnss3.so \
+for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
             libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
@@ -284,19 +284,19 @@ done
 # Copy the binaries we want
 for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
 done
 
 # Copy the binaries we ship as unsupported
 for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
 do
-  %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
 
 # Copy the include files we want
 for file in mozilla/dist/public/nss/*.h
 do
-  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
 done
 
 # Copy the package configuration files
@@ -318,6 +318,7 @@ done
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
+/%{_lib}/libnssutil3.so
 /%{_lib}/libnssdbm3.so
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
@@ -366,6 +367,7 @@ done
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
+%{_libdir}/libnssutil3.so
 %{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
@@ -481,6 +483,10 @@ done
 
 
 %changelog
+* Thu Aug 20 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-10
+- must install libnssutil3.since nss-util is untagged at the moment
+- preserve time stamps when installing various files
+
 * Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-9
 - dont install libnssutil3.so since its now in nss-util
 



From mbarnes at fedoraproject.org  Fri Aug 21 01:53:32 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 21 Aug 2009 01:53:32 +0000 (UTC)
Subject: rpms/evolution-sharp/devel
	evolution-sharp-0.21.1-fix-retarded-version-check.patch, NONE,
	1.1 evolution-sharp.spec, 1.66, 1.67
Message-ID: <20090821015332.1132811C006E@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27974

Modified Files:
	evolution-sharp.spec 
Added Files:
	evolution-sharp-0.21.1-fix-retarded-version-check.patch 
Log Message:

* 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.


evolution-sharp-0.21.1-fix-retarded-version-check.patch:
 configure.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE evolution-sharp-0.21.1-fix-retarded-version-check.patch ---
diff -up evolution-sharp-0.21.1/configure.in.fix-retarded-version-check evolution-sharp-0.21.1/configure.in
--- evolution-sharp-0.21.1/configure.in.fix-retarded-version-check	2009-08-20 21:46:34.000000000 -0400
+++ evolution-sharp-0.21.1/configure.in	2009-08-20 21:47:16.000000000 -0400
@@ -16,8 +16,7 @@ fi
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no]))
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no]))
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no]))
-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27.4, edsver="2.24", AC_MSG_RESULT([no]))
-PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27.4, edsver="unsupported", AC_MSG_RESULT([no]))
+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92, edsver="2.24", AC_MSG_RESULT([no]))
 
 if test "x$edsver" = "x1.8"; then
 	EDS_VERSION=-1.2


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- evolution-sharp.spec	20 Aug 2009 23:58:25 -0000	1.66
+++ evolution-sharp.spec	21 Aug 2009 01:53:31 -0000	1.67
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.21.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -21,6 +21,9 @@ Patch1: evolution-sharp-0.11.1-libdir.pa
 # RH bug #221555 / GNOME bug #516044
 Patch2: evolution-sharp-0.12.1-fix-assembly-dir.patch
 
+# Stop setting an upper limit on the evolution-data-server version.
+Patch3: evolution-sharp-0.21.1-fix-retarded-version-check.patch
+
 ### Dependencies ###
 
 Requires: evolution-data-server
@@ -50,6 +53,7 @@ This package contains development files 
 %setup -q
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .fix-assembly-dir
+%patch3 -p1 -b .fix-retarded-version-check
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -86,7 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
-* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.20.0-3
+* 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.
+
+* Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.20.1-3
 - Rebuild to pick up ppc64.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21.1-2



From airlied at fedoraproject.org  Fri Aug 21 03:29:12 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 21 Aug 2009 03:29:12 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel make-git-snapshot.sh, NONE,
	1.1 .cvsignore, 
	1.29, 1.30 sources, 1.29, 1.30 xorg-x11-drv-ati.spec, 1.181,
	1.182 radeon-6.12.2-to-git.patch, 1.1, NONE
Message-ID: <20090821032912.CAFE211C0097@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16209

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Added Files:
	make-git-snapshot.sh 
Removed Files:
	radeon-6.12.2-to-git.patch 
Log Message:
* Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.12.2-22
- change to a git snapshot



--- NEW FILE make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./make-git-snapshot.sh [COMMIT]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local mesa repo to reduce clone time.

DIRNAME=xf86-video-ati-$( date +%Y%m%d )

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
	git://git.freedesktop.org/git/xorg/driver/xf86-video-ati $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
	| xz > $DIRNAME.tar.xz

# rm -rf $DIRNAME


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	13 Apr 2009 17:50:18 -0000	1.29
+++ .cvsignore	21 Aug 2009 03:29:10 -0000	1.30
@@ -1 +1 @@
-xf86-video-ati-6.12.2.tar.bz2
+xf86-video-ati-20090821.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	13 Apr 2009 17:50:19 -0000	1.29
+++ sources	21 Aug 2009 03:29:11 -0000	1.30
@@ -1 +1 @@
-2bf50461378771497501ca7f678d36f3  xf86-video-ati-6.12.2.tar.bz2
+b2b452333f35258394111e57b5db90b6  xf86-video-ati-20090821.tar.xz


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- xorg-x11-drv-ati.spec	4 Aug 2009 05:55:27 -0000	1.181
+++ xorg-x11-drv-ati.spec	21 Aug 2009 03:29:11 -0000	1.182
@@ -1,21 +1,22 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define gitdate 20090821
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   21%{?dist}
+Release:   22%{?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://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
-Patch0:     radeon-6.12.2-to-git.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -41,8 +42,7 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2
 X.Org X11 ati video driver.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .git
+%setup -q -n %{tarball}-%{gitdate}
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.12.2-22
+- change to a git snapshot
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
 - ati: rebase to git master - need to fixup a few patches later
 


--- radeon-6.12.2-to-git.patch DELETED ---



From toshio at fedoraproject.org  Fri Aug 21 03:31:07 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 21 Aug 2009 03:31:07 +0000 (UTC)
Subject: rpms/beagle/devel beagle.spec,1.172,1.173
Message-ID: <20090821033107.263F911C0097@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16761

Modified Files:
	beagle.spec 
Log Message:

* 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.



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- beagle.spec	20 Aug 2009 23:30:35 -0000	1.172
+++ beagle.spec	21 Aug 2009 03:31:06 -0000	1.173
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -35,7 +35,7 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:	desktop-file-utils
 BuildRequires:	libbeagle-devel >= 0.3.4
 BuildRequires:	ndesk-dbus-glib-devel
-BuildRequires:	epiphany-devel
+#BuildRequires:	epiphany-devel
 BuildRequires:	taglib-sharp-devel
 BuildRequires:	unzip
 BuildRequires:	chmlib-devel
@@ -116,14 +116,14 @@ Requires:	beagle = %{version}-%{release}
 %description firefox
 Beagle Indexer Extension for Firefox
 
-%package epiphany
-Summary:	Beagle backend for Epiphany
-Group:		User Interface/Desktops
-Requires:	beagle = %{version}-%{release}
-Requires:	epiphany-extensions
+#%package epiphany
+#Summary:	Beagle backend for Epiphany
+#Group:		User Interface/Desktops
+#Requires:	beagle = %{version}-%{release}
+#Requires:	epiphany-extensions
 
-%description epiphany
-Beagle backend for Epiphany
+#%description epiphany
+#Beagle backend for Epiphany
 
 %package devel
 Summary:	Development files for the Beagle search infrastructure
@@ -328,9 +328,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/beagle/Backends/ThunderbirdBackends.dll*
 %{_libdir}/beagle/thunderbird/
 
-%files epiphany
-%defattr(-, root, root,-)
-%{_libdir}/epiphany/
+#%files epiphany
+#%defattr(-, root, root,-)
+#%{_libdir}/epiphany/
 
 %files gnome
 %defattr(-, root, root,-)
@@ -354,6 +354,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* 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.
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-13
 - Re-enable ppc64.
 - Re-enable epiphany



From airlied at fedoraproject.org  Fri Aug 21 03:35:58 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 21 Aug 2009 03:35:58 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.182,1.183
Message-ID: <20090821033558.9FF1511C0097@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17871

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.1.20090821gitb1b77a4d6
- change versioning to git snapshot for now



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- xorg-x11-drv-ati.spec	21 Aug 2009 03:29:11 -0000	1.182
+++ xorg-x11-drv-ati.spec	21 Aug 2009 03:35:58 -0000	1.183
@@ -2,11 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gitdate 20090821
+%define gitversion b1b77a4d6
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.12.2
-Release:   22%{?dist}
+Version:   6.13.0
+Release:   0.1.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.1.20090821gitb1b77a4d6
+- change versioning to git snapshot for now
+
 * Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.12.2-22
 - change to a git snapshot
 



From nushio at fedoraproject.org  Fri Aug 21 03:40:37 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Fri, 21 Aug 2009 03:40:37 +0000 (UTC)
Subject: rpms/gnome-do/F-11 .cvsignore, 1.11, 1.12 gnome-do.spec, 1.39,
	1.40 sources, 1.11, 1.12
Message-ID: <20090821034037.ECE6011C0439@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19599

Modified Files:
	.cvsignore gnome-do.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Mar 2009 23:31:35 -0000	1.11
+++ .cvsignore	21 Aug 2009 03:40:37 -0000	1.12
@@ -1 +1 @@
-gnome-do-0.8.1.3.tar.gz
+gnome-do-0.8.2.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/gnome-do.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gnome-do.spec	20 Aug 2009 21:51:57 -0000	1.39
+++ gnome-do.spec	21 Aug 2009 03:40:37 -0000	1.40
@@ -1,9 +1,9 @@
 %define			debug_package %{nil}
-%define                 mainver 0.8.1
+%define                 mainver 0.8.2
 
 Name:			gnome-do
-Version:		0.8.1.3
-Release:		7%{?dist}
+Version:		0.8.2
+Release:		0%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -11,8 +11,6 @@ Group:			Applications/File	
 URL:			http://do.davebsd.com/
 Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
 
-Patch0:			%{name}-%{version}-applicationspath.patch
-
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -56,7 +54,6 @@ Development files for GNOME Do
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -132,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 20 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-0
+- Updates to 0.8.2
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1.3-7
 - Rebuild for ppc64 as the previous build was obsoleted.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Mar 2009 23:31:35 -0000	1.11
+++ sources	21 Aug 2009 03:40:37 -0000	1.12
@@ -1 +1 @@
-512b866475b17291c1acda2be1af2124  gnome-do-0.8.1.3.tar.gz
+f84f05f08c12615e1665c6f0d392b8bb  gnome-do-0.8.2.tar.gz



From salimma at fedoraproject.org  Fri Aug 21 04:13:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 04:13:15 +0000 (UTC)
Subject: rpms/gnome-do/F-11 gnome-do.spec, 1.40,
	1.41 gnome-do-0.8.1.3-applicationspath.patch, 1.1, NONE
Message-ID: <20090821041315.E923511C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13854/F-11

Modified Files:
	gnome-do.spec 
Removed Files:
	gnome-do-0.8.1.3-applicationspath.patch 
Log Message:
- Bump release tag to 1 instead of 0
- Also build for Rawhide
- Remove unneeded old patch



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/gnome-do.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gnome-do.spec	21 Aug 2009 03:40:37 -0000	1.40
+++ gnome-do.spec	21 Aug 2009 04:13:15 -0000	1.41
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		0%{?dist}
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -129,8 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Thu Aug 20 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-0
-- Updates to 0.8.2
+* Thu Aug 20 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2
 
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1.3-7
 - Rebuild for ppc64 as the previous build was obsoleted.


--- gnome-do-0.8.1.3-applicationspath.patch DELETED ---



From salimma at fedoraproject.org  Fri Aug 21 04:13:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 04:13:16 +0000 (UTC)
Subject: rpms/gnome-do/devel .cvsignore, 1.11, 1.12 gnome-do.spec, 1.39,
	1.40 sources, 1.11, 1.12 gnome-do-0.8.1.3-applicationspath.patch,
	1.1, NONE
Message-ID: <20090821041316.42E5A11C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13854/devel

Modified Files:
	.cvsignore gnome-do.spec sources 
Removed Files:
	gnome-do-0.8.1.3-applicationspath.patch 
Log Message:
- Bump release tag to 1 instead of 0
- Also build for Rawhide
- Remove unneeded old patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Mar 2009 23:31:35 -0000	1.11
+++ .cvsignore	21 Aug 2009 04:13:15 -0000	1.12
@@ -1 +1 @@
-gnome-do-0.8.1.3.tar.gz
+gnome-do-0.8.2.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gnome-do.spec	20 Aug 2009 21:51:57 -0000	1.39
+++ gnome-do.spec	21 Aug 2009 04:13:16 -0000	1.40
@@ -1,9 +1,9 @@
 %define			debug_package %{nil}
-%define                 mainver 0.8.1
+%define                 mainver 0.8.2
 
 Name:			gnome-do
-Version:		0.8.1.3
-Release:		7%{?dist}
+Version:		0.8.2
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -11,8 +11,6 @@ Group:			Applications/File	
 URL:			http://do.davebsd.com/
 Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
 
-Patch0:			%{name}-%{version}-applicationspath.patch
-
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -56,7 +54,6 @@ Development files for GNOME Do
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -132,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 20 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1.3-7
 - Rebuild for ppc64 as the previous build was obsoleted.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Mar 2009 23:31:35 -0000	1.11
+++ sources	21 Aug 2009 04:13:16 -0000	1.12
@@ -1 +1 @@
-512b866475b17291c1acda2be1af2124  gnome-do-0.8.1.3.tar.gz
+f84f05f08c12615e1665c6f0d392b8bb  gnome-do-0.8.2.tar.gz


--- gnome-do-0.8.1.3-applicationspath.patch DELETED ---



From salimma at fedoraproject.org  Fri Aug 21 04:17:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 04:17:07 +0000 (UTC)
Subject: rpms/gnome-do-plugins/devel .cvsignore, 1.1,
	1.2 gnome-do-plugins.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090821041707.32A7311C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14872/devel

Modified Files:
	.cvsignore gnome-do-plugins.spec sources 
Log Message:
* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-1
- Update to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Jul 2009 20:46:50 -0000	1.1
+++ .cvsignore	21 Aug 2009 04:17:06 -0000	1.2
@@ -0,0 +1 @@
+gnome-do-plugins-0.8.2.tar.gz


Index: gnome-do-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/gnome-do-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-do-plugins.spec	30 Jul 2009 14:31:24 -0000	1.4
+++ gnome-do-plugins.spec	21 Aug 2009 04:17:06 -0000	1.5
@@ -1,15 +1,15 @@
 %define         debug_package %{nil}
 
 Name:           gnome-do-plugins
-Version:        0.8.1
-Release:        7%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Plugins for GNOME Do
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://do.davebsd.com
 Source0:        http://edge.launchpad.net/do-plugins/0.8/%{version}/+download/%{name}-%{version}.tar.gz
 # Local patch to put the plugins in the correct directory
-Patch0: gnome-do-plugins-plugindir.patch
+#Patch0: gnome-do-plugins-plugindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel ndesk-dbus-glib-devel gnome-do-devel
@@ -168,7 +168,7 @@ gnome-do plugins for vinagre
 
 %prep
 %setup -q
-%patch0 -p1 -b .pldir
+#patch0 -p1 -b .pldir
 # build.rules.mk is imported into 70+ Makefile.in's
 # by Makefile.am.  Run autoreconf to regenerate the
 # Makefile.in's 
@@ -186,7 +186,7 @@ make install DESTDIR=%{buildroot}
 # installed on the end-user system instead of copying one in at build time.
 # Maybe a better solution would be to add %{_libdir}/banshee-1/ to the MONO_PATH
 # in %{_bindir}/gnome-do somehow.
-ln -s %{_libdir}/banshee-1/Banshee.CollectionIndexer.dll %{buildroot}%{_libdir}/gnome-do/plugins
+ln -sf %{_libdir}/banshee-1/Banshee.CollectionIndexer.dll %{buildroot}%{_libdir}/gnome-do/plugins
 rm -rf %{buildroot}%{_datadir}/gnome-do/plugins/Banshee.CollectionIndexer.dll
 
 # Remove Bundled Libraries and the plugins that depend on them
@@ -196,6 +196,8 @@ rm -rf %{buildroot}%{_libdir}/gnome-do/p
 rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/*GoogleContacts*
 rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/*GoogleDocs*
 
+%find_lang %name
+
 %clean
 rm -rf %{buildroot}
 
@@ -221,7 +223,7 @@ rm -rf %{buildroot}
 
 %files eog
 %defattr(-, root, root,-)
-%{_libdir}/gnome-do/plugins/*EyeOfGNOME*
+%{_libdir}/gnome-do/plugins/EOG*
 
 %files firefox
 %defattr(-, root, root,-)
@@ -255,7 +257,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/*Vinagre*
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS COPYRIGHT
 %exclude %{_libdir}/gnome-do/plugins/*Banshee*
@@ -263,7 +265,7 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/gnome-do/plugins/*ClawsMail*
 %exclude %{_libdir}/gnome-do/plugins/*Epiphany*
 %exclude %{_libdir}/gnome-do/plugins/*Evolution*
-%exclude %{_libdir}/gnome-do/plugins/*EyeOfGNOME*
+%exclude %{_libdir}/gnome-do/plugins/EOG*
 %exclude %{_libdir}/gnome-do/plugins/*Firefox*
 %exclude %{_libdir}/gnome-do/plugins/*Flickr*
 %exclude %{_libdir}/gnome-do/plugins/*Pidgin*
@@ -275,6 +277,9 @@ rm -rf %{buildroot}
 %{_libdir}/gnome-do/plugins/*
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2
+
 * Thu Jul 30 2009 Juan Rodriguez <nushio at fedoraproject.org> 0.8.1-7
 - Fixes evolution plugin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jul 2009 15:29:38 -0000	1.2
+++ sources	21 Aug 2009 04:17:07 -0000	1.3
@@ -1,2 +1 @@
-1fb118a03802891e5abb4ada726e125f  gnome-do-plugins-0.8.1.tar.gz
-40b8e3223f4f221bb7713b7320f323d2  gnome-do-plugins-plugindir.patch
+6e79a666619aae1b1e2916f0fe364d94  gnome-do-plugins-0.8.2.tar.gz



From bskeggs at fedoraproject.org  Fri Aug 21 04:17:36 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 21 Aug 2009 04:17:36 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.41,
	1.42 nouveau-bicubic-2x.patch, 1.8,
	1.9 nouveau-multiple-xserver.patch, 1.10,
	1.11 nouveau-transition-hack.patch, 1.11, 1.12 sources, 1.42,
	1.43 xorg-x11-drv-nouveau.spec, 1.51, 1.52
Message-ID: <20090821041736.93EC011C00D7@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15017

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Aug 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-5.20090820git569a17a
- a couple more minor fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	20 Aug 2009 05:14:49 -0000	1.41
+++ .cvsignore	21 Aug 2009 04:17:36 -0000	1.42
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.tar.bz2
+xf86-video-nouveau-0.0.15-20090820git569a17a.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/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-bicubic-2x.patch	20 Aug 2009 05:14:49 -0000	1.8
+++ nouveau-bicubic-2x.patch	21 Aug 2009 04:17:36 -0000	1.9
@@ -1,4 +1,4 @@
-From 6c5e207795dd9039d163ff25e3ac4daf78503de5 Mon Sep 17 00:00:00 2001
+From 5d771a98dfdb77dcfff906342d1bb69c5e95ba62 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 3/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-multiple-xserver.patch	20 Aug 2009 05:14:49 -0000	1.10
+++ nouveau-multiple-xserver.patch	21 Aug 2009 04:17:36 -0000	1.11
@@ -1,4 +1,4 @@
-From 5fe2f30825888a714ba5e68af3182b60c40de1f9 Mon Sep 17 00:00:00 2001
+From 50340ef2c1b24e5c10245b980e77552f4baecd06 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 75ec6ab..92a7e2c 100644
+index b8de860..5838ce7 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nouveau-transition-hack.patch	20 Aug 2009 05:14:49 -0000	1.11
+++ nouveau-transition-hack.patch	21 Aug 2009 04:17:36 -0000	1.12
@@ -1,4 +1,4 @@
-From 740c4ee30f4886dd2af36aa25137ad05862a273c Mon Sep 17 00:00:00 2001
+From 01d6d416943706bf0030724cae4481a916807282 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] f12: transitions
  1 files changed, 169 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index e7c20a8..27a2e09 100644
+index 9231d93..cdb7689 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -183,6 +183,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	20 Aug 2009 05:14:49 -0000	1.42
+++ sources	21 Aug 2009 04:17:36 -0000	1.43
@@ -1 +1 @@
-d4c67bb03a03a3c4adf16f732c258f3a  xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.tar.bz2
+22f93b760e83ecc8fc5eae19cd8a799a  xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-nouveau.spec	20 Aug 2009 05:14:49 -0000	1.51
+++ xorg-x11-drv-nouveau.spec	21 Aug 2009 04:17:36 -0000	1.52
@@ -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 20090819
-%define git_version fe2b5e6
+%define gitdate 20090820
+%define git_version 569a17a
 
 %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:   4.%{snapshot}%{?dist}
+Release:   5.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -81,7 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
-* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090810gitfe2b5e6
+* Fri Aug 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-5.20090820git569a17a
+- a couple more minor fixes
+
+* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090819gitfe2b5e6
 - various fixes from upstream, build pending new xorg-x11-server update
 
 * Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-3.20090810git85b1c86



From dtardon at fedoraproject.org  Fri Aug 21 05:08:23 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 21 Aug 2009 05:08:23 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch, 1.1, 
	1.2 openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch,
	1.1, 1.2 openoffice.org.spec, 1.1735,
	1.1736 workspace.pdfextfix02.patch, 1.1, 1.2
Message-ID: <20090821050823.2185811C00D7@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24545

Modified Files:
	openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch 
	openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 
	openoffice.org.spec workspace.pdfextfix02.patch 
Log Message:
make the last three patches applicable

openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch:
 inc/progress.hxx              |   11 +++++++++++
 source/core/data/cell.cxx     |    2 +-
 source/core/tool/progress.cxx |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

Index: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch	9 Jun 2009 10:33:52 -0000	1.1
+++ openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch	21 Aug 2009 05:08:21 -0000	1.2
@@ -16,7 +16,7 @@ diff -ru sc.orig/inc/progress.hxx sc/inc
 +#define MIN_NO_CODES_PER_PROGRESS_UPDATE 100
 +
 +
- class SC_DLLPUBLIC ScProgress
+ class ScProgress
  {
  private:
 diff -ru sc.orig/source/core/data/cell.cxx sc/source/core/data/cell.cxx

openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
 dbaccess/source/ui/misc/WCopyTable.cxx              |    2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx     |    2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx  |    2 +-
 wizards/com/sun/star/wizards/db/DBMetaData.java     |    4 ++--
 wizards/com/sun/star/wizards/table/TableWizard.java |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

Index: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch	19 Aug 2009 08:20:38 -0000	1.1
+++ openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch	21 Aug 2009 05:08:22 -0000	1.2
@@ -1,50 +1,48 @@
 diff -ru wizards.orig/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
 --- wizards.orig/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:28:39.000000000 +0100
 +++ wizards/com/sun/star/wizards/db/DBMetaData.java	2009-07-30 14:33:22.000000000 +0100
-@@ -748,11 +748,11 @@
-         }
-     }
+@@ -748,9 +748,9 @@
+     }}
  
--    public boolean supportsCoreSQLGrammar()
-+    public boolean supportsPrimaryKey()
-     {
-         try
-         {
--            return xDBMetaData.supportsCoreSQLGrammar();
-+            return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
-         }
-         catch (SQLException e)
-         {
+
+-    public boolean supportsCoreSQLGrammar(){
++    public boolean supportsPrimaryKey() {
+     try {
+-        return xDBMetaData.supportsCoreSQLGrammar();
++        return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
+     } catch (SQLException e) {
+         e.printStackTrace(System.out);
+         return false;
 diff -ru wizards.orig/com/sun/star/wizards/table/TableWizard.java wizards/com/sun/star/wizards/table/TableWizard.java
 --- wizards.orig/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:28:39.000000000 +0100
 +++ wizards/com/sun/star/wizards/table/TableWizard.java	2009-07-30 14:29:50.000000000 +0100
 @@ -250,7 +250,7 @@
-     {
+     public void buildSteps(){
          curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
-         curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
+         curFieldFormatter = new FieldFormatter(this, curTableDescriptor );
 -        if (this.curTableDescriptor.supportsCoreSQLGrammar())
 +        if (this.curTableDescriptor.supportsPrimaryKey())
-         {
              curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
-         }
+         curFinalizer = new Finalizer(this, curTableDescriptor);
+         enableNavigationButtons(false, false, false);
 @@ -264,7 +264,7 @@
          boolean bTableCreated = false;
          String schemaname = curFinalizer.getSchemaName();
          String catalogname = curFinalizer.getCatalogName();
--        if (curTableDescriptor.supportsCoreSQLGrammar())
-+        if (curTableDescriptor.supportsPrimaryKey())
-         {
+-        if (curTableDescriptor.supportsCoreSQLGrammar()){
++        if (curTableDescriptor.supportsPrimaryKey()) {
              String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
-             if (keyfieldnames != null)
+             if (keyfieldnames != null){
+                 if (keyfieldnames.length > 0){
 @@ -359,7 +359,7 @@
          int i = 0;
          i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE);
          i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE);
 -        if (this.curTableDescriptor.supportsCoreSQLGrammar())
 +        if (this.curTableDescriptor.supportsPrimaryKey())
-         {
              i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE);
-         }
+         i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 5),  SOFINALPAGE);        // Orderby is always supported
+         setRoadmapInteractive(true);
 diff -ru dbaccess.orig/source/ui/misc/WCopyTable.cxx dbaccess/source/ui/misc/WCopyTable.cxx
 --- dbaccess.orig/source/ui/misc/WCopyTable.cxx	2009-07-30 12:58:32.000000000 +0100
 +++ dbaccess/source/ui/misc/WCopyTable.cxx	2009-07-30 14:18:18.000000000 +0100


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -p -r1.1735 -r1.1736
--- openoffice.org.spec	19 Aug 2009 08:20:38 -0000	1.1735
+++ openoffice.org.spec	21 Aug 2009 05:08:22 -0000	1.1736
@@ -3807,6 +3807,7 @@ fi
 - Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+- make the last three patches applicable
 
 * Fri May 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
 - Resolves: rhbz#494643 EMF polypolygons issue

workspace.pdfextfix02.patch:
 config/description.xml         |    2 
 inc/wrapper.hxx                |    8 
 pdfiadaptor.cxx                |   19 +
 pdfiadaptor.hxx                |    2 
 test/tests.cxx                 |    8 
 tree/drawtreevisiting.cxx      |   14 +
 tree/genericelements.hxx       |    3 
 tree/pdfiprocessor.cxx         |  141 +++++++++-----
 wrapper/wrapper.cxx            |  160 ++++++++++++---
 xpdfwrapper/makefile.mk        |    3 
 xpdfwrapper/pdfioutdev_gpl.cxx |  246 +++++++++++++++++-------
 xpdfwrapper/pdfioutdev_gpl.hxx |    6 
 xpdfwrapper/pnghelper.cxx      |  411 +++++++++++++++++++++++++++++++++++++++++
 xpdfwrapper/pnghelper.hxx      |   92 +++++++++
 xpdfwrapper/wrapper_gpl.cxx    |   50 +++-
 15 files changed, 987 insertions(+), 178 deletions(-)

Index: workspace.pdfextfix02.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/workspace.pdfextfix02.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.pdfextfix02.patch	16 Jun 2009 11:59:09 -0000	1.1
+++ workspace.pdfextfix02.patch	21 Aug 2009 05:08:22 -0000	1.2
@@ -361,14 +361,14 @@ Index: sdext/source/pdfimport/tree/pdfip
           else
           {
              if (
--                ( m_GlyphsList[i].getPrevGlyphsSpace()<= fPreAvarageSpaceValue )&&
+-                ( m_GlyphsList[i].getPrevGlypthsSpace()<= fPreAvarageSpaceValue )&&
 -                ( fPrevDiffCharSpace<=fAvarageDiffCharSpaceValue )&&
 -                ( fPostDiffCharSpace<=fAvarageDiffCharSpaceValue ) ||
-+                ( ( m_GlyphsList[i].getPrevGlyphsSpace()<= fPreAvarageSpaceValue )&&
++                ( ( m_GlyphsList[i].getPrevGlypthsSpace()<= fPreAvarageSpaceValue )&&
 +                  ( fPrevDiffCharSpace<=fAvarageDiffCharSpaceValue )&&
 +                  ( fPostDiffCharSpace<=fAvarageDiffCharSpaceValue )
 +                ) ||
-                 ( m_GlyphsList[i].getPrevGlyphsSpace() == 0.0 )
+                 ( m_GlyphsList[i].getPrevGlypthsSpace() == 0.0 )
              ) 
              {
 @@ -451,45 +452,45 @@
@@ -1576,7 +1576,7 @@ Index: sdext/source/pdfimport/config/des
          </simple-license>
      </registration>
  
--    <version value="0.4" />
+-    <version value="0.3.2" />
 +    <version value="1.0" />
  
      <platform value="UPDATED_SUPPORTED_PLATFORM" />



From dtardon at fedoraproject.org  Fri Aug 21 05:10:23 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 21 Aug 2009 05:10:23 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 workspace.os131.patch, NONE,
	1.1 openoffice.org.spec, 1.1736, 1.1737
Message-ID: <20090821051024.01F0811C0439@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25606

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.os131.patch 
Log Message:
Resolves: rbhz#501141 Images and Frames disappear in sequential printing

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    2 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  385 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |   49 ++--
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 530 insertions(+), 107 deletions(-)

--- NEW FILE workspace.os131.patch ---
Index: sw/source/filter/xml/xmltbli.cxx
===================================================================
--- sw/source/filter/xml/xmltbli.cxx	(revision 272643)
+++ sw/source/filter/xml/xmltbli.cxx	(revision 272644)
@@ -662,7 +662,7 @@
 					SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
 								   *pSrcPaM->GetMark() );
 					SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
-					pDoc->Copy( aSrcPaM, aDstPos );
+                    pDoc->Copy( aSrcPaM, aDstPos, false );
 
 					nColRepeat--;
 				}
Index: sw/source/filter/ww8/ww8glsy.cxx
===================================================================
--- sw/source/filter/ww8/ww8glsy.cxx	(revision 272643)
+++ sw/source/filter/ww8/ww8glsy.cxx	(revision 272644)
@@ -187,7 +187,7 @@
                         -1 );
                     pCNd = aIdx.GetNode().GetCntntNode();
                     SwPosition aPos( aIdx, SwIndex( pCNd, pCNd->Len() ));
-                    pD->Copy( aPam, aPos );
+                    pD->Copy( aPam, aPos, false );
                     rBlocks.PutDoc();
                 }
             }
Index: sw/source/core/frmedt/fecopy.cxx
===================================================================
--- sw/source/core/frmedt/fecopy.cxx	(revision 272643)
+++ sw/source/core/frmedt/fecopy.cxx	(revision 272644)
@@ -840,7 +840,7 @@
             {
                 SwNodeIndex aIndexBefore(rInsPos.nNode);
                 aIndexBefore--;
-                pClpDoc->Copy( rCopy, rInsPos );
+                pClpDoc->Copy( rCopy, rInsPos, false );
                 {
                     aIndexBefore++;
                     SwPaM aPaM(SwPosition(aIndexBefore, 0),
@@ -1069,7 +1069,7 @@
 
                 aIndexBefore--;
 
-                pClpDoc->Copy( aCpyPam, rInsPos );
+                pClpDoc->Copy( aCpyPam, rInsPos, false );
 
                 {
                     aIndexBefore++;
Index: sw/source/core/txtnode/atrftn.cxx
===================================================================
--- sw/source/core/txtnode/atrftn.cxx	(revision 272643)
+++ sw/source/core/txtnode/atrftn.cxx	(revision 272644)
@@ -303,7 +303,7 @@
 		SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
 		ULONG  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
 
-		pMyTxtNd->GetDoc()->CopyWithFlyInFly( aRg, aEnd, TRUE );
+        pMyTxtNd->GetDoc()->CopyWithFlyInFly( aRg, 0, aEnd, TRUE );
 
 		// Wenn die Dest-Sektion nicht leer war, so muessen die alten
 		// Nodes geloescht werden:
Index: sw/source/core/edit/edglss.cxx
===================================================================
--- sw/source/core/edit/edglss.cxx	(revision 272643)
+++ sw/source/core/edit/edglss.cxx	(revision 272644)
@@ -168,7 +168,7 @@
 			aStt = pGDoc->GetNodes().GetEndOfExtras();
 			pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
 			SwPosition aInsPos( aStt, SwIndex( pCntntNd ));
-            pMyDoc->Copy( aCpyPam, aInsPos );
+            pMyDoc->Copy( aCpyPam, aInsPos, false );
 
 			nRet = rBlock.PutDoc();
 		}
@@ -250,13 +250,13 @@
 				{
 					PCURCRSR->SetMark();
 					PCURCRSR->Move( fnMoveForward, fnGoCntnt );
-                    bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
+                    bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
 					PCURCRSR->Exchange();
 					PCURCRSR->DeleteMark();
 				}
 			}
 			else
-				bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
+                bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
 
 		FOREACHPAM_END()
         }
Index: sw/source/core/edit/eddel.cxx
===================================================================
--- sw/source/core/edit/eddel.cxx	(revision 272643)
+++ sw/source/core/edit/eddel.cxx	(revision 272644)
@@ -253,7 +253,7 @@
 			bFirstMove = FALSE;
 		}
 
-		if( !GetDoc()->Copy( *PCURCRSR, *pPos ))
+        if( !GetDoc()->Copy( *PCURCRSR, *pPos, false ))
 			continue;
 
         SwPaM aInsertPaM(*pPos, aSttNdIdx);
Index: sw/source/core/doc/docnew.cxx
===================================================================
--- sw/source/core/doc/docnew.cxx	(revision 272643)
+++ sw/source/core/doc/docnew.cxx	(revision 272644)
@@ -32,6 +32,7 @@
 #include "precompiled_sw.hxx"
 #define ROLBCK_HISTORY_ONLY 	// Der Kampf gegen die CLOOK's
 #include <doc.hxx>
+#include <dcontact.hxx>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
@@ -46,12 +47,9 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 
-#ifndef _SFXMACITEM_HXX //autogen
-	#include <svtools/macitem.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
+#include <svtools/macitem.hxx>
 #include <svx/svxids.hrc>
-#endif
+#include <svx/svdogrp.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <svtools/zforlist.hxx>
@@ -79,18 +77,12 @@
 #include <frmfmt.hxx>
 #include <rolbck.hxx>           // Undo-Attr, SwHistory
 #include <poolfmt.hxx>          // fuer die Pool-Vorlage
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <acorrect.hxx>			// fuer die autom. Aufnahme von Ausnahmen
 #include <visiturl.hxx>			// fuer die URL-Change Benachrichtigung
 #include <docary.hxx>
-#ifndef _LINEINFO_HXX
 #include <lineinfo.hxx>
-#endif
 #include <drawdoc.hxx>
 #include <linkenum.hxx>
 #include <fldupde.hxx>
@@ -105,12 +97,10 @@
 #include <istyleaccess.hxx>
 #include <swstylemanager.hxx>
 #include <IGrammarContact.hxx>
-
+#include <tblsel.hxx>
 #include <unochart.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>              // fuer den dflt - Printer in SetJob
-#endif
 
 
 // --> OD 2006-04-19 #b6375613#
@@ -1056,3 +1046,370 @@
     }
 }
 // <--
+/*-- 08.05.2009 10:07:57---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+SwDoc* SwDoc::CreateCopy() const
+{
+    SwDoc* pRet = new SwDoc;
+    //copy settings
+/*
+    //aNodes( this ),
+    //aUndoNodes( this ),
+    mpAttrPool(new SwAttrPool(this)),*/
+    USHORT __FAR_DATA aRangeOfDefaults[] = {
+        RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+        RES_CHRATR_BEGIN, RES_CHRATR_END-1,
+        RES_PARATR_BEGIN, RES_PARATR_END-1,
+        // --> OD 2008-02-25 #refactorlists##
+        RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
+        // <--
+        RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
+        0
+    };
+
+    SfxItemSet aNewDefaults( pRet->GetAttrPool(), aRangeOfDefaults );
+
+    USHORT nWhich;
+    USHORT nRange = 0;
+    while( aRangeOfDefaults[nRange] != 0)
+    {
+        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
+        {
+            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
+            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
+                aNewDefaults.Put( rSourceAttr );
+        }
+        nRange += 2;
+    }
+    if( aNewDefaults.Count() )
+        pRet->SetDefault( aNewDefaults );
+    
+    /*
+    pDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
+    pEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, pDfltFrmFmt ) ),
+    pColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, pDfltFrmFmt ) ),
+    pDfltCharFmt( new SwCharFmt( GetAttrPool(), sCharFmtStr, 0 ) ),
+    pDfltTxtFmtColl( new SwTxtFmtColl( GetAttrPool(), sTxtCollStr ) ),
+    pDfltGrfFmtColl( new SwGrfFmtColl( GetAttrPool(), sGrfCollStr ) ),
+    pFrmFmtTbl( new SwFrmFmts() ),
+    pCharFmtTbl( new SwCharFmts() ),
+    pSpzFrmFmtTbl( new SwSpzFrmFmts() ),
+    pSectionFmtTbl( new SwSectionFmts() ),
+    pTblFrmFmtTbl( new SwFrmFmts() ),
+    pTxtFmtCollTbl( new SwTxtFmtColls() ),
+    pGrfFmtCollTbl( new SwGrfFmtColls() ),
+    pBookmarkTbl( new SwBookmarks( 0, 16 ) ),
+    pTOXTypes( new SwTOXTypes() ),
+    pDefTOXBases( new SwDefTOXBase_Impl() ),
+    pLayout( 0 ),                   // Rootframe des spezifischen Layouts.
+    pDrawModel( 0 ),
+    pUndos( new SwUndos( 0, 20 ) ),
+    pUpdtFlds( new SwDocUpdtFld() ),
+    pFldTypes( new SwFldTypes() ),
+    pVirDev( 0 ),
+    pPrt( 0 ),
+    pPrtData( 0 ),
+    pGlossaryDoc( 0 ),
+    pOutlineRule( 0 ),
+    pFtnInfo( new SwFtnInfo ),
+    pEndNoteInfo( new SwEndNoteInfo ),
+    pLineNumberInfo( new SwLineNumberInfo ),
+    pFtnIdxs( new SwFtnIdxs ),
+    pDocStat( new SwDocStat ),
+    pDocShell( 0 ),
+    pDocShRef( 0 ),
+    pLinkMgr( new SvxLinkManager( 0 ) ),
+    pACEWord( 0 ),
+    pURLStateChgd( 0 ),
+    pNumberFormatter( 0 ),
+    pNumRuleTbl( new SwNumRuleTbl ),
+    // --> OD 2008-03-26 #refactorlists#
+    maLists(),
+    maListStyleLists(),
+    // <--
+    pRedlineTbl( new SwRedlineTbl ),
+    pAutoFmtRedlnComment( 0 ),
+    pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ),
+    pPgPViewPrtData( 0 ),
+    pExtInputRing( 0 ),
+    pLayouter( 0 ),
+    // --> OD 2008-03-07 #refactorlists#
+    pStyleAccess( 0 ),
+    // <--
+    pLayoutCache( 0 ),
+    pUnoCallBack(new SwUnoCallBack(0)),
+    mpGrammarContact( 0 ),
+    aChartDataProviderImplRef(),
+    pChartControllerHelper( 0 ),
+    // --> OD 2007-10-31 #i83479#
+    mpListItemsList( new tImplSortedNodeNumList() ),
+    // <--
+    nUndoPos( 0 ),
+    nUndoSavePos( 0 ),
+    nUndoCnt( 0 ),
+    nUndoSttEnd( 0 ),
+    nAutoFmtRedlnCommentNo( 0 ),
+    nLinkUpdMode( GLOBALSETTING ),
+    eFldUpdMode( AUTOUPD_GLOBALSETTING ),
+    eRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)),
+    eChrCmprType( CHARCOMPRESS_NONE ),
+    mReferenceCount(0),
+    mIdleBlockCount(0),
+    nLockExpFld( 0 ),
+    mbReadlineChecked(false),
+    mbWinEncryption(sal_False),
+    // --> OD 2005-02-11 #i38810#
+    mbLinksUpdated( sal_False ),
+    mbClipBoard( false ),
+    mbColumnSelection( false ),
+    // i#78591#
+    mbProtectForm(false),*/
+    pRet->n32DummyCompatabilityOptions1 = n32DummyCompatabilityOptions1;
+    pRet->n32DummyCompatabilityOptions2 = n32DummyCompatabilityOptions2;
+    /*
+    mbStartIdleTimer(sal_False)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDoc::SwDoc" );
+
+    mbGlossDoc =
+    mbModified =
+    mbDtor =
+    mbUndo =
+    mbPageNums =
+    mbLoaded =
+    mbUpdateExpFld =
+    mbNewDoc =
+    mbCopyIsMove =
+    mbNoDrawUndoObj =
+    mbBrowseMode =
+    mbInReading =
+    mbInXMLImport =
+    mbUpdateTOX =
+    mbInLoadAsynchron =
+    mbHTMLMode =
+    mbInCallModified =
+    mbIsGlobalDoc =
+    mbGlblDocSaveLinks =
+    mbIsLabelDoc =
+    mbIsAutoFmtRedline =
+    mbOLEPrtNotifyPending =
+    mbAllOLENotify =
+    mbIsRedlineMove =
+    mbInsOnlyTxtGlssry =
+    mbContains_MSVBasic =
+    mbKernAsianPunctuation =
+#ifndef PRODUCT
+    mbXMLExport =
+#endif
+    // --> OD 2006-03-21 #b6375613#
+    mbApplyWorkaroundForB6375613 =
+    // <--
+                            false;
+
+    mbGroupUndo =
+    mbNewFldLst =
+    mbVisibleLinks =
+    mbPurgeOLE =
+                            true;
+
+    //
+    // COMPATIBILITY FLAGS START
+    //
+
+    // Note: Any non-hidden compatibility flag should obtain its default
+    // by asking SvtCompatibilityOptions, see below.
+    //
+    const SvtCompatibilityOptions aOptions;
+     */ 
+    pRet->mbParaSpaceMax                          = mbParaSpaceMax                          ;
+    pRet->mbParaSpaceMaxAtPages                   = mbParaSpaceMaxAtPages                   ;
+    pRet->mbTabCompat                             = mbTabCompat                             ;
+    pRet->mbUseVirtualDevice                      = mbUseVirtualDevice                      ;
+    pRet->mbAddExternalLeading                    = mbAddExternalLeading                    ;
+    pRet->mbOldLineSpacing                        = mbOldLineSpacing                        ;
+    pRet->mbAddParaSpacingToTableCells            = mbAddParaSpacingToTableCells            ;
+    pRet->mbUseFormerObjectPos                    = mbUseFormerObjectPos                    ;
+    pRet->mbUseFormerTextWrapping                 = mbUseFormerTextWrapping                 ;
+    pRet->mbConsiderWrapOnObjPos                  = mbConsiderWrapOnObjPos                  ;
+    pRet->mbAddFlyOffsets                         = mbAddFlyOffsets                         ;
+    pRet->mbOldNumbering                          = mbOldNumbering                          ;
+    pRet->mbUseHiResolutionVirtualDevice          = mbUseHiResolutionVirtualDevice          ;
+    pRet->mbIgnoreFirstLineIndentInNumbering      = mbIgnoreFirstLineIndentInNumbering      ;
+    pRet->mbDoNotJustifyLinesWithManualBreak      = mbDoNotJustifyLinesWithManualBreak      ;
+    pRet->mbDoNotResetParaAttrsForNumFont         = mbDoNotResetParaAttrsForNumFont         ;
+    pRet->mbOutlineLevelYieldsOutlineRule         = mbOutlineLevelYieldsOutlineRule         ;
+    pRet->mbTableRowKeep                          = mbTableRowKeep                          ;
+    pRet->mbIgnoreTabsAndBlanksForLineCalculation = mbIgnoreTabsAndBlanksForLineCalculation ;
+    pRet->mbDoNotCaptureDrawObjsOnPage            = mbDoNotCaptureDrawObjsOnPage            ;
+    pRet->mbClipAsCharacterAnchoredWriterFlyFrames= mbClipAsCharacterAnchoredWriterFlyFrames;
+    pRet->mbUnixForceZeroExtLeading               = mbUnixForceZeroExtLeading               ;
+    pRet->mbOldPrinterMetrics                     = mbOldPrinterMetrics                     ;
+    pRet->mbTabRelativeToIndent                   = mbTabRelativeToIndent                   ;
+    pRet->mbTabAtLeftIndentForParagraphsInList    = mbTabAtLeftIndentForParagraphsInList    ;
+                                            
+    //                                      
+    // COMPATIBILITY FLAGS END
+    //
+    /*
+    pMacroTable = new SvxMacroTableDtor;
+    
+    mpGrammarContact = ::createGrammarContact();
+
+    // Formate
+    pFrmFmtTbl->Insert(pDfltFrmFmt, 0 );
+    pCharFmtTbl->Insert(pDfltCharFmt, 0 );
+
+    // FmtColls 
+    // TXT
+    pTxtFmtCollTbl->Insert(pDfltTxtFmtColl, 0 );
+    // GRF
+    pGrfFmtCollTbl->Insert(pDfltGrfFmtColl, 0 );
+
+    // PageDesc, EmptyPageFmt und ColumnFmt anlegen
+    if ( !aPageDescs.Count() )
+        GetPageDescFromPool( RES_POOLPAGE_STANDARD );
+
+        //Leere Seite Einstellen.
+    pEmptyPageFmt->SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
+        //BodyFmt fuer Spalten Einstellen.
+    pColumnContFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+
+    _InitFieldTypes();
+
+    // lege (fuer die Filter) eine Default-OutlineNumRule an
+    // --> OD 2008-02-11 #newlistlevelattrs#
+    pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
+                                  // --> OD 2008-06-06 #i89178#
+                                  numfunc::GetDefaultPositionAndSpaceMode(),
+                                  // <--
+                                  OUTLINE_RULE );
+    // <--
+    // #115901#
+    AddNumRule(pOutlineRule);
+    // --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
+    pOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) );
+    // <--
+
+    new SwTxtNode( SwNodeIndex( aUndoNodes.GetEndOfContent() ), pDfltTxtFmtColl );
+    new SwTxtNode( SwNodeIndex( aNodes.GetEndOfContent() ),
+                    GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+
+    // den eigenen IdleTimer setzen
+    aIdleTimer.SetTimeout( 600 );
+    aIdleTimer.SetTimeoutHdl( LINK(this, SwDoc, DoIdleJobs) );
+
+    aOLEModifiedTimer.SetTimeout( 1000 );
+    aOLEModifiedTimer.SetTimeoutHdl( LINK( this, SwDoc, DoUpdateModifiedOLE ));
+
+    // DBMgr anlegen
+    pNewDBMgr = new SwNewDBMgr;
+
+    // create TOXTypes
+    ShellResource* pShellRes = ViewShell::GetShellRes();
+
+    SwTOXType * pNew = new SwTOXType(TOX_CONTENT,   pShellRes->aTOXContentName        );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_INDEX,                 pShellRes->aTOXIndexName  );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_USER,                  pShellRes->aTOXUserName  );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_ILLUSTRATIONS,         pShellRes->aTOXIllustrationsName );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_OBJECTS,               pShellRes->aTOXObjectsName       );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_TABLES,                pShellRes->aTOXTablesName        );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_AUTHORITIES,           pShellRes->aTOXAuthoritiesName   );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+
+    {
+        SfxItemSet aIgnorableParagraphItems( GetAttrPool(),
+                                             RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
+                                             0 );
+        pStyleAccess = createStyleManager( &aIgnorableParagraphItems );
+    }
+
+    ResetModified();
+
+*/    
+    //copy content 
+    pRet->Paste( *this );
+    return pRet;
+}
+/*-- 08.05.2009 10:52:40---------------------------------------------------
+    copy document content - code from SwFEShell::Paste( SwDoc* , BOOL  )
+  -----------------------------------------------------------------------*/
+void SwDoc::Paste( const SwDoc& rSource )
+{
+//  this has to be empty const USHORT nStartPageNumber = GetPhyPageNum();
+    // until the end of the NodesArray
+    SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 2 );
+    SwPaM aCpyPam( aSourceIdx ); //DocStart
+    SwNodeIndex aTargetIdx( GetNodes().GetEndOfExtras(), 2 );
+    SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+
+
+    aCpyPam.SetMark();
+    aCpyPam.Move( fnMoveForward, fnGoDoc );
+
+    BOOL bRet = TRUE, bDelTbl = TRUE;
+    this->StartUndo( UNDO_INSGLOSSARY, NULL );
+    this->LockExpFlds();
+
+    {
+        SwPosition& rInsPos = *aInsertPam.GetPoint();
+        //find out if the clipboard document starts with a table
+        bool bStartWithTable = 0 != aCpyPam.Start()->nNode.GetNode().FindTableNode();
+        SwPosition aInsertPosition( rInsPos );
+
+        {
+            SwNodeIndex aIndexBefore(rInsPos.nNode);
+
+            aIndexBefore--;
+
+            rSource.Copy( aCpyPam, rInsPos, true );
+
+            {
+                aIndexBefore++;
+                SwPaM aPaM(SwPosition(aIndexBefore, 0),
+                           SwPosition(rInsPos.nNode, 0));
+
+                MakeUniqueNumRules(aPaM);
+            }
+        }
+
+        //TODO: Is this necessary here? SaveTblBoxCntnt( &rInsPos );
+        if(/*bIncludingPageFrames && */bStartWithTable)
+        {
+            //remove the paragraph in front of the table
+            SwPaM aPara(aInsertPosition);
+            this->DelFullPara(aPara);
+        }
+        //additionally copy page bound frames
+        if( /*bIncludingPageFrames && */rSource.GetSpzFrmFmts()->Count() )
+        {
+            for ( USHORT i = 0; i < rSource.GetSpzFrmFmts()->Count(); ++i )
+            {
+                BOOL bInsWithFmt = TRUE;
+                const SwFrmFmt& rCpyFmt = *(*rSource.GetSpzFrmFmts())[i];
+                if( bInsWithFmt  )
+                {
+                    SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+                    if( FLY_PAGE == aAnchor.GetAnchorId() )
+                    {
+                        aAnchor.SetPageNum( aAnchor.GetPageNum() + /*nStartPageNumber - */1 );
+                    }
+                    else
+                        continue;
+                    this->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
+                }
+            }
+        }
+    }
+
+    this->EndUndo( UNDO_INSGLOSSARY, NULL );
+
+    UnlockExpFlds();
+    UpdateFlds(NULL, false);
+}
Index: sw/source/core/doc/doccomp.cxx
===================================================================
--- sw/source/core/doc/doccomp.cxx	(revision 272643)
+++ sw/source/core/doc/doccomp.cxx	(revision 272644)
@@ -1196,7 +1196,7 @@
 					SwPaM aCpyPam( rSrcNd, nStt );
 					aCpyPam.SetMark();
 					aCpyPam.GetPoint()->nContent = nSEnd;
-					aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint() );
+                    aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint(), false );
 					pDoc->DoUndo( bUndo );
 				}
 
@@ -1367,7 +1367,7 @@
 	SwNodeIndex aInsPos( *pLineNd, nOffset );
 	SwNodeIndex aSavePos( aInsPos, -1 );
 
-	((SwCompareData&)rData).rDoc.CopyWithFlyInFly( aRg, aInsPos );
+    ((SwCompareData&)rData).rDoc.CopyWithFlyInFly( aRg, 0, aInsPos );
 	rDoc.SetModified();
 	aSavePos++;
 
@@ -1624,7 +1624,7 @@
 		RedlineMode_t eOld = pDoc->GetRedlineMode();
 		pDoc->SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
 
-		pSrcRedl->GetDoc()->Copy( *(SwPaM*)pSrcRedl, *pDestRedl->GetPoint() );
+        pSrcRedl->GetDoc()->Copy( *(SwPaM*)pSrcRedl, *pDestRedl->GetPoint(), false );
 
 		pDoc->SetRedlineMode_intern( eOld );
 		pDoc->DoUndo( bUndo );
Index: sw/source/core/doc/docnum.cxx
===================================================================
--- sw/source/core/doc/docnum.cxx	(revision 272643)
+++ sw/source/core/doc/docnum.cxx	(revision 272644)
@@ -2273,7 +2273,7 @@
                 }
             }
 
-			Copy( aPam, aInsPos );
+            Copy( aPam, aInsPos, false );
 			if( bDelLastPara )
 			{
 				// dann muss der letzte leere Node wieder entfernt werden
Index: sw/source/core/doc/docredln.cxx
===================================================================
--- sw/source/core/doc/docredln.cxx	(revision 272643)
+++ sw/source/core/doc/docredln.cxx	(revision 272644)
@@ -3418,7 +3418,7 @@
 			SwNodeIndex aNdIdx( *pSttNd, 1 );
 			SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
 			SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
-			pDoc->Copy( *this, aPos );
+            pDoc->Copy( *this, aPos, false );
 
 			// JP 08.10.98: die Vorlage vom EndNode ggfs. mit uebernehmen
 			//				- ist im Doc::Copy nicht erwuenscht
@@ -3443,13 +3443,13 @@
 			if( pCEndNd )
 			{
 				SwPosition aPos( *pSttNd->EndOfSectionNode() );
-				pDoc->Copy( *this, aPos );
+                pDoc->Copy( *this, aPos, false );
 			}
 			else
 			{
 				SwNodeIndex aInsPos( *pSttNd->EndOfSectionNode() );
 				SwNodeRange aRg( pStt->nNode, 0, pEnd->nNode, 1 );
-				pDoc->CopyWithFlyInFly( aRg, aInsPos );
+                pDoc->CopyWithFlyInFly( aRg, 0, aInsPos );
 			}
 		}
 		pCntntSect = new SwNodeIndex( *pSttNd );
Index: sw/source/core/doc/docglos.cxx
===================================================================
--- sw/source/core/doc/docglos.cxx	(revision 272643)
+++ sw/source/core/doc/docglos.cxx	(revision 272644)
@@ -183,7 +183,7 @@
                 SwDontExpandItem aACD;
 				aACD.SaveDontExpandItems( rInsPos );
 
-                pGDoc->Copy( aCpyPam, rInsPos );
+                pGDoc->Copy( aCpyPam, rInsPos, false );
 
 				aACD.RestoreDontExpandItems( rInsPos );
 				if( pShell )
Index: sw/source/core/doc/tblcpy.cxx
===================================================================
--- sw/source/core/doc/tblcpy.cxx	(revision 272643)
+++ sw/source/core/doc/tblcpy.cxx	(revision 272644)
@@ -567,7 +567,7 @@
 
 	SwNodeIndex aSavePos( aInsIdx, -1 );
     if( pRg.get() )
-        pCpyDoc->CopyWithFlyInFly( *pRg, aInsIdx, FALSE );
+        pCpyDoc->CopyWithFlyInFly( *pRg, 0, aInsIdx, FALSE );
     else
 		pDoc->GetNodes().MakeTxtNode( aInsIdx, (SwTxtFmtColl*)pDoc->GetDfltTxtFmtColl() );
 	aSavePos++;
Index: sw/source/core/doc/docglbl.cxx
===================================================================
--- sw/source/core/doc/docglbl.cxx	(revision 272643)
+++ sw/source/core/doc/docglbl.cxx	(revision 272644)
@@ -307,7 +307,7 @@
 						pDoc->GetNodes().Delete( aIdx, 1 );
 
 					// alle Flys in dem Bereich
-					_CopyFlyInFly( aRg, aIdx );
+                    _CopyFlyInFly( aRg, 0, aIdx );
 
 
 					// und noch alle Bookmarks
Index: sw/source/core/doc/tblrwcl.cxx
===================================================================
--- sw/source/core/doc/tblrwcl.cxx	(revision 272643)
+++ sw/source/core/doc/tblrwcl.cxx	(revision 272644)
@@ -2103,7 +2103,7 @@
                             *rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
                 SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
 
-                pFromDoc->CopyWithFlyInFly( aCpyRg, aInsIdx, FALSE );
+                pFromDoc->CopyWithFlyInFly( aCpyRg, 0, aInsIdx, FALSE );
                 // den initialen TextNode loeschen
                 pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
             }
Index: sw/source/core/doc/doclay.cxx
===================================================================
--- sw/source/core/doc/doclay.cxx	(revision 272643)
+++ sw/source/core/doc/doclay.cxx	(revision 272644)
@@ -507,7 +507,7 @@
 
 		// sorge dafuer das auch Fly's in Fly's kopiert werden
 		aIdx = *pSttNd->EndOfSectionNode();
-		pSrcDoc->CopyWithFlyInFly( aRg, aIdx, sal_False, sal_True, sal_True );
+        pSrcDoc->CopyWithFlyInFly( aRg, 0, aIdx, sal_False, sal_True, sal_True );
 	}
 	else
 	{
@@ -885,7 +885,7 @@
 				do {
 					if( pTmp->HasMark() &&
 						*pTmp->GetPoint() != *pTmp->GetMark() )
-						Copy( *pTmp, aPos );
+                        Copy( *pTmp, aPos, false );
 				} while( &rPam != ( pTmp = (SwPaM*)pTmp->GetNext() ) );
 				mbCopyIsMove = bOldFlag;
 				mbUndo = bOldUndo;
Index: sw/source/core/doc/docfmt.cxx
===================================================================
--- sw/source/core/doc/docfmt.cxx	(revision 272643)
+++ sw/source/core/doc/docfmt.cxx	(revision 272644)
@@ -2126,7 +2126,7 @@
 				aTmpIdx = *pSttNd->EndOfSectionNode();
 				rSrcNds._Copy( aRg, aTmpIdx );
 				aTmpIdx = *pSttNd;
-				rSrcFmt.GetDoc()->_CopyFlyInFly( aRg, aTmpIdx );
+                rSrcFmt.GetDoc()->_CopyFlyInFly( aRg, 0, aTmpIdx );
                 pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
 			}
 			else
Index: sw/source/core/undo/untblk.cxx
===================================================================
--- sw/source/core/undo/untblk.cxx	(revision 272643)
+++ sw/source/core/undo/untblk.cxx	(revision 272644)
@@ -346,7 +346,7 @@
 
 	SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
 	SetPaM( aPam );
-	aPam.GetDoc()->Copy( aPam, *rUndoIter.pAktPam->GetPoint() );
+    aPam.GetDoc()->Copy( aPam, *rUndoIter.pAktPam->GetPoint(), false );
 
 	rUndoIter.pLastUndoObj = this;
 }
Index: sw/source/core/docnode/ndcopy.cxx
===================================================================
--- sw/source/core/docnode/ndcopy.cxx	(revision 272643)
+++ sw/source/core/docnode/ndcopy.cxx	(revision 272644)
@@ -659,7 +659,7 @@
 
 // Kopieren eines Bereiches im oder in ein anderes Dokument !
 
-bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos ) const
+bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos, bool bCopyAll ) const
 {
 	const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
 
@@ -698,13 +698,13 @@
 	BOOL bRet = FALSE;
 
 	if( pDoc != this )
-        bRet = _Copy( rPam, rPos, TRUE, pRedlineRange );    // nur normales Kopieren
+        bRet = _Copy( rPam, rPos, TRUE, bCopyAll, pRedlineRange );    // nur normales Kopieren
 	// Copy in sich selbst (ueber mehrere Nodes wird hier gesondert
 	// behandelt; in einem TextNode wird normal behandelt)
 	else if( ! ( *pStt <= rPos && rPos < *pEnd &&
 			( pStt->nNode != pEnd->nNode ||
 			  !pStt->nNode.GetNode().IsTxtNode() )) )
-		bRet = _Copy( rPam, rPos, TRUE, pRedlineRange );	// nur normales Kopieren
+		bRet = _Copy( rPam, rPos, TRUE, bCopyAll, pRedlineRange );	// nur normales Kopieren
 
 	else
 	{
@@ -728,7 +728,7 @@
 		SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
 								SwNodeIndex( GetNodes().GetEndOfAutotext() ));
 		aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
-		pDoc->_Copy( rPam, *aPam.GetPoint(), FALSE );		// kopieren ohne Frames
+		pDoc->_Copy( rPam, *aPam.GetPoint(), FALSE, bCopyAll, 0 );		// kopieren ohne Frames
 
 		aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
 		aPam.SetMark();
@@ -803,7 +803,7 @@
 }
 
 BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
-					BOOL bMakeNewFrms, SwPaM* pCpyRange ) const
+					BOOL bMakeNewFrms, bool bCopyAll, SwPaM* pCpyRange ) const
 {
 	SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
     bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
@@ -1087,7 +1087,7 @@
 			}
 		}
 
-		if( aRg.aStart != aRg.aEnd )
+		if( bCopyAll || aRg.aStart != aRg.aEnd )
 		{
 			SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
             if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
@@ -1102,13 +1102,13 @@
 			if( aInsPos == pEnd->nNode )
 			{
 				SwNodeIndex aSaveIdx( aInsPos, -1 );
-				CopyWithFlyInFly( aRg, aInsPos, bMakeNewFrms, FALSE );
+                CopyWithFlyInFly( aRg, 0,aInsPos, bMakeNewFrms, FALSE );
 				aSaveIdx++;
 				pEnd->nNode = aSaveIdx;
 				pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
 			}
 			else
-				CopyWithFlyInFly( aRg, aInsPos, bMakeNewFrms, FALSE );
+                CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, bMakeNewFrms, FALSE );
 
 			bCopyBookmarks = FALSE;
 
@@ -1167,7 +1167,7 @@
 
 //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
 
-void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
+void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, 
 							const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
 							BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
 {
@@ -1206,7 +1206,7 @@
 	// Undo abschalten
 	BOOL bUndo = pDest->DoesUndo();
 	pDest->DoUndo( FALSE );
-	_CopyFlyInFly( rRg, aSavePos, bCopyFlyAtFly );
+	_CopyFlyInFly( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly );
 	pDest->DoUndo( bUndo );
 
 	SwNodeRange aCpyRange( aSavePos, rInsPos );
@@ -1242,7 +1242,7 @@
 	}
 }
 
-void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const SwNodeIndex& rSttIdx,
+void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, const SwNodeIndex& rSttIdx,
 							BOOL bCopyFlyAtFly ) const
 {
 	// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
@@ -1259,7 +1259,8 @@
 		const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
 		const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
 		const SwPosition* pAPos;
-		if ( ( pAnchor->GetAnchorId() == FLY_AT_CNTNT ||
+        bool bAtCntnt = pAnchor->GetAnchorId() == FLY_AT_CNTNT;
+		if ( ( bAtCntnt ||
 			   pAnchor->GetAnchorId() == FLY_AT_FLY ||
 			   pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
 			 0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
@@ -1268,9 +1269,53 @@
 					: ( IsRedlineMove()
 							? rRg.aStart < pAPos->nNode
 							: rRg.aStart <= pAPos->nNode )) &&
-			 pAPos->nNode < rRg.aEnd )
+			 pAPos->nNode <= rRg.aEnd )
 		{
-			aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
+			//frames at the last source node are not always copied:
+            //- if the node is empty and is the last node of the document or a table cell
+            //  or a text frame then tey have to be copied
+            //- if the content index in this node is > 0 then paragph and frame bound objects are copied
+            //- to-character bound objects are copied if their index is <= nEndContentIndex
+            bool bAdd = false;
+            if( pAPos->nNode < rRg.aEnd )
+                bAdd = true;
+            if( !bAdd )
+            {
+                bool bEmptyNode = false;
+                bool bLastNode = false;
+                // is the node empty?
+                const SwNodes& rNodes = pAPos->nNode.GetNodes();
+                SwTxtNode* pTxtNode;
+                if( 0 != ( pTxtNode = pAPos->nNode.GetNode().GetTxtNode() ))
+                {
+                    bEmptyNode = !pTxtNode->GetTxt().Len();
+                    if( bEmptyNode )
+                    {
+                        //last node information is only necessary to know for the last TextNode
+                        SwNodeIndex aTmp( pAPos->nNode );
+                        ++aTmp;//goto next node
+                        while( rNodes[aTmp ]->IsEndNode() )
+                        {
+                            if( aTmp == rNodes.GetEndOfContent().GetIndex() )
+                            {
+                                bLastNode = true;
+                                break;
+                            }
+                            ++aTmp;
+                        }
+                    }
+                }
+                bAdd = bLastNode && bEmptyNode;
+                if( !bAdd )
+                {
+                    if( bAtCntnt )
+                        bAdd = nEndContentIndex > 0;
+                    else 
+                        bAdd = pAPos->nContent <= nEndContentIndex;
+                }
+            }
+            if( bAdd )                
+                aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
 		}
 	}
 
Index: sw/source/core/docnode/section.cxx
===================================================================
--- sw/source/core/docnode/section.cxx	(revision 272643)
+++ sw/source/core/docnode/section.cxx	(revision 272644)
@@ -1415,7 +1415,7 @@
 						if( pSrcDoc != pDoc ||
 							pCpyPam->Start()->nNode > rInsPos ||
 							rInsPos >= pCpyPam->End()->nNode )
-							pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint() );
+                            pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint(), false );
 						delete pCpyPam;
 					}
 					if( pCpyRg && pSrcDoc == pDoc &&
@@ -1444,7 +1444,7 @@
 
 					SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
 
-					pSrcDoc->CopyWithFlyInFly( *pCpyRg, rInsPos, bCreateFrm );
+                    pSrcDoc->CopyWithFlyInFly( *pCpyRg, 0, rInsPos, bCreateFrm );
 					aSave++;
 
 					if( !bCreateFrm )
Index: sw/source/ui/dbui/dbmgr.cxx
===================================================================
--- sw/source/ui/dbui/dbmgr.cxx	(revision 272643)
+++ sw/source/ui/dbui/dbmgr.cxx	(revision 272644)
@@ -35,7 +35,9 @@
 #endif
 
 #include <stdio.h>
-
+#ifdef SW_COPY_DOC_IN_MEMORY
+#include <unotxdoc.hxx>
+#endif
 #include <com/sun/star/text/NotePrintMode.hpp>
 #include <sfx2/app.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -43,17 +45,13 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#ifndef _COM_SUN_STAR_UTIL_iXNUMBERFORMATTER_HPP_
 #include <com/sun/star/util/XNumberFormatter.hpp>
-#endif
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/XCompletedExecution.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_
 #include <com/sun/star/text/MailMergeEvent.hpp>
-#endif
 #include <com/sun/star/frame/XStorable.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
@@ -65,9 +63,7 @@
 #include <dbconfig.hxx>
 #include <swdbtoolsclient.hxx>
 #include <pagedesc.hxx>
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <unotools/tempfile.hxx>
 #include <svtools/pathoptions.hxx>
 #include <svtools/urihelper.hxx>
@@ -86,39 +82,25 @@
 #include <goodies/mailenum.hxx>
 #include <cmdid.h>
 #include <swmodule.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <edtwin.hxx>
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
 #include <initui.hxx>
 #include <swundo.hxx>
 #include <flddat.hxx>
-#ifndef _MODCFG_HXX
 #include <modcfg.hxx>
-#endif
 #include <swprtopt.hxx>
 #include <shellio.hxx>
 #include <dbui.hxx>
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <doc.hxx>
 #include <swwait.hxx>
 #include <swunohelper.hxx>
-#ifndef _DBUI_HRC
 #include <dbui.hrc>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _STATSTR_HRC
 #include <statstr.hrc>
-#endif
 #include <mmconfigitem.hxx>
 #include <sfx2/request.hxx>
 #include <hintids.hxx>
@@ -3182,7 +3164,10 @@
 
     SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
     BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
     String sSourceDocURL;
+#endif
     //save the settings of the first
     rSourceShell.SttEndDoc(TRUE);
     USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
@@ -3192,6 +3177,8 @@
 
     try
     {
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
         // save the working document into a temporary location
         sSourceDocURL = URIHelper::SmartRel2Abs(
             INetURLObject(), utl::TempFile::CreateTempName(),
@@ -3207,7 +3194,7 @@
         pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
         uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
         xStore->storeToURL( sSourceDocURL, aValues );
-
+#endif
         // create a target docshell to put the merged document into
         SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
         xTargetDocShell->DoInitNew( 0 );
@@ -3256,6 +3243,15 @@
                     Application::Reschedule();
             }
 
+#ifdef SW_COPY_DOC_IN_MEMORY
+            // copy the source document
+            uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+            uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
+            SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
+            //create a ViewFrame
+            SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
+            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
+#else
             // create a new docshell from the temporary document
             SfxBoolItem aHidden( SID_HIDDEN, TRUE );
             SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
@@ -3265,9 +3261,13 @@
                             rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
                                     &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
             if(pReturnValue)
+#endif
             {
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else                
                 SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
                 SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+#endif
                 SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
                 pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
 
@@ -3387,8 +3387,11 @@
     {
         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
     }
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
     if(sSourceDocURL.Len())
         File::remove( sSourceDocURL );
+#endif
     DELETEZ(pImpl->pMergeData);
     bInMerge = FALSE;
     return nRet;
Index: sw/source/ui/uno/unoatxt.cxx
===================================================================
--- sw/source/ui/uno/unoatxt.cxx	(revision 272643)
+++ sw/source/ui/uno/unoatxt.cxx	(revision 272644)
@@ -417,7 +417,7 @@
 		if(pxCursor)
 		{
 			SwPaM* pUnoCrsr = pxCursor->GetPaM();
-            bRet |= (true == pxCursor->GetDoc()->Copy( *pUnoCrsr, aPos ));
+            bRet |= (true == pxCursor->GetDoc()->Copy( *pUnoCrsr, aPos, false ));
 		}
 		else
 		{
@@ -425,7 +425,7 @@
             if(pBkm && pBkm->GetOtherBookmarkPos())
 			{
                 SwPaM aTmp(*pBkm->GetOtherBookmarkPos(), pBkm->GetBookmarkPos());
-                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos));
+                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos, false));
 			}
 		}
 	}
Index: sw/source/ui/uno/unotxdoc.cxx
===================================================================
--- sw/source/ui/uno/unotxdoc.cxx	(revision 272643)
+++ sw/source/ui/uno/unotxdoc.cxx	(revision 272644)
@@ -37,16 +37,12 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <wdocsh.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <pview.hxx>
-#ifndef _SRCVIEW_HXX
 #include <srcview.hxx>
-#endif
 #include <viewsh.hxx>
 #include <pvprtdat.hxx>
 #include <swprtopt.hxx>
@@ -84,9 +80,7 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <com/sun/star/document/RedlineDisplayType.hpp>
 #include <svx/linkmgr.hxx>
 #include <svx/unofill.hxx>
@@ -94,13 +88,9 @@
 #include <sfx2/progress.hxx>
 #include <swmodule.hxx>
 #include <docstat.hxx>
-#ifndef _MODOPT_HXX //
 #include <modcfg.hxx>
-#endif
 #include <ndtxt.hxx>
-#ifndef _UTLUI_HRC
 #include <utlui.hrc>
-#endif
 #include <swcont.hxx>
 #include <unodefaults.hxx>
 #include <SwXDocumentSettings.hxx>
@@ -2856,7 +2846,27 @@
 {
     return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
 }
+/*-- 07.05.2009 09:21:12---------------------------------------------------
 
+  -----------------------------------------------------------------------*/
+uno::Reference< util::XCloneable > SwXTextDocument::createClone(  ) throw (uno::RuntimeException)
+{
+    ::vos::OGuard aGuard(Application::GetSolarMutex());
+    if(!IsValid())
+        throw RuntimeException();
+    //create a new document - hidden - copy the storage and return it
+    SwDoc* pCopyDoc = pDocShell->GetDoc()->CreateCopy();
+    SfxObjectShell* pShell = new SwDocShell( pCopyDoc, SFX_CREATE_MODE_STANDARD );
+    pShell->DoInitNew();
+    
+    uno::Reference< embed::XStorage > xSourceStorage = getDocumentStorage();
+    uno::Reference< frame::XModel > xNewModel = pShell->GetModel();
+    //copy this storage
+    uno::Reference< document::XStorageBasedDocument > xStorageDoc( xNewModel, uno::UNO_QUERY );
+    uno::Reference< embed::XStorage > xNewStorage = xStorageDoc->getDocumentStorage();
+    xSourceStorage->copyToStorage( xNewStorage );
+    return uno::Reference< util::XCloneable >( xNewModel, UNO_QUERY );
+}
 /* -----------------------------20.06.00 09:54--------------------------------
 
  ---------------------------------------------------------------------------*/
Index: sw/inc/doc.hxx
===================================================================
--- sw/inc/doc.hxx	(revision 272643)
+++ sw/inc/doc.hxx	(revision 272644)
@@ -636,7 +636,7 @@
 		// Kopieren eines Bereiches im oder in ein anderes Dokument !
 		// Die Position darf nicht im Bereich liegen !!
 	sal_Bool _Copy( SwPaM&, SwPosition&,
-				sal_Bool MakeNewFrms = sal_True, SwPaM* pCpyRng = 0 ) const;	// in ndcopy.cxx
+				sal_Bool MakeNewFrms /*= sal_True*/, bool bCopyAll, SwPaM* pCpyRng /*= 0*/ ) const;	// in ndcopy.cxx
 
 	SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
 								const SwCntntNode& rNode, RndStdIds eRequestId,
@@ -648,7 +648,8 @@
 								const SfxItemSet* pGrfAttrSet,
 								SwFrmFmt* = 0 );
 
-	void _CopyFlyInFly( const SwNodeRange& rRg, const SwNodeIndex& rSttIdx,
+    void _CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex,
+                        const SwNodeIndex& rSttIdx,
 						sal_Bool bCopyFlyAtFly = sal_False ) const;	// steht im ndcopy.cxx
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
 
@@ -720,6 +721,7 @@
      SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
      SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
 
+     void   Paste( const SwDoc& );
 public:
 
     /** Life cycle
@@ -915,7 +917,7 @@
 
     /** IDocumentContentOperations
     */
-    virtual bool Copy(SwPaM&, SwPosition&) const;
+    virtual bool Copy(SwPaM&, SwPosition&, bool bCopyAll) const;
 	virtual void DeleteSection(SwNode* pNode);
 	virtual bool Delete(SwPaM&);
 	virtual bool DelFullPara(SwPaM&);
@@ -1118,6 +1120,7 @@
 								SwFrmFmt *pParent = 0 );
 
 	void CopyWithFlyInFly( const SwNodeRange& rRg,
+                            const xub_StrLen nEndContentIndex,
 							const SwNodeIndex& rInsPos,
 							sal_Bool bMakeNewFrms = sal_True,
 							sal_Bool bDelRedlines = sal_True,
@@ -2117,6 +2120,7 @@
 	{
 		return n32DummyCompatabilityOptions2;
 	}
+    SwDoc* CreateCopy() const;
 };
 
 
Index: sw/inc/unotxdoc.hxx
===================================================================
--- sw/inc/unotxdoc.hxx	(revision 272643)
+++ sw/inc/unotxdoc.hxx	(revision 272644)
@@ -68,9 +68,8 @@
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
-#ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTLANGUAGES_HPP
 #include <com/sun/star/document/XDocumentLanguages.hpp>
-#endif
+#include <com/sun/star/util/XCloneable.hpp>
 #include <svtools/itemprop.hxx>
 #include <svx/fmdmod.hxx>
 #include <svx/UnoForbiddenCharsTable.hxx>
@@ -79,22 +78,22 @@
 #include <cppuhelper/implbase4.hxx>	// helper for implementations
 #include <RefreshListenerContainer.hxx>
 
-#define __IFC31 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
-Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31
+#define __IFC32 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
+Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31, Ifc32
 
-#define __CLASS_IFC31 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
+#define __CLASS_IFC32 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
 class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13, class Ifc14, class Ifc15, class Ifc16, \
 class Ifc17, class Ifc18, class Ifc19, class Ifc20, class Ifc21, class Ifc22, class Ifc23, class Ifc24,\
-class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31
+class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31 , class Ifc32
 
-#define __PUBLIC_IFC31 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
+#define __PUBLIC_IFC32 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
 public Ifc13, public Ifc14, public Ifc15, public Ifc16, public Ifc17, public Ifc18, \
 public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23, public Ifc24, \
 public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc30, \
-public Ifc31
+public Ifc31, public Ifc32
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
-#define __IFC_EX_TYPE_INIT31( class_cast ) \
+#define __IFC_EX_TYPE_INIT32( class_cast ) \
     __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \
     __IFC_EX_TYPE_INIT( class_cast, 3 ), __IFC_EX_TYPE_INIT( class_cast, 4 ), \
     __IFC_EX_TYPE_INIT( class_cast, 5 ), __IFC_EX_TYPE_INIT( class_cast, 6 ), \
@@ -110,10 +109,10 @@
     __IFC_EX_TYPE_INIT( class_cast, 25 ), __IFC_EX_TYPE_INIT( class_cast, 26 ), \
     __IFC_EX_TYPE_INIT( class_cast, 27 ), __IFC_EX_TYPE_INIT( class_cast, 28 ), \
     __IFC_EX_TYPE_INIT( class_cast, 29 ), __IFC_EX_TYPE_INIT( class_cast, 30 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 31)
+    __IFC_EX_TYPE_INIT( class_cast, 31 ), __IFC_EX_TYPE_INIT( class_cast, 32)
 #include <cppuhelper/implbase_ex_post.hxx>
 
-__DEF_IMPLHELPER_EX( 31 )
+__DEF_IMPLHELPER_EX( 32 )
 
 class SwDoc;
 class SwDocShell;
@@ -132,7 +131,7 @@
  ******************************************************************************/
 
 
-typedef cppu::WeakImplHelper31
+typedef cppu::WeakImplHelper32
 <
 	::com::sun::star::text::XTextDocument,
 	::com::sun::star::text::XLineNumberingProperties,
@@ -164,7 +163,8 @@
     ::com::sun::star::view::XRenderable,
     ::com::sun::star::xforms::XFormsSupplier,
     ::com::sun::star::text::XFlatParagraphIteratorProvider,
-	::com::sun::star::document::XDocumentLanguages
+    ::com::sun::star::document::XDocumentLanguages,
+    ::com::sun::star::util::XCloneable
 >
 SwXTextDocumentBaseClass;
 
@@ -402,7 +402,11 @@
     // ::com::sun::star::text::XFlatParagraphIteratorProvider:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException);
 
-	//
+    // ::com::sun::star::util::XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+    
+    
+    //
 	void						Invalidate();
 	void						Reactivate(SwDocShell* pNewDocShell);
 	SwXDocumentPropertyHelper * GetPropertyHelper ();
Index: sw/inc/IDocumentContentOperations.hxx
===================================================================
--- sw/inc/IDocumentContentOperations.hxx	(revision 272643)
+++ sw/inc/IDocumentContentOperations.hxx	(revision 272644)
@@ -71,7 +71,7 @@
     /** Kopieren eines Bereiches im oder in ein anderes Dokument !
 	    Die Position kann auch im Bereich liegen !!
     */
-	virtual bool Copy(SwPaM&, SwPosition&) const = 0;
+    virtual bool Copy(SwPaM&, SwPosition&, bool bCopyAll ) const = 0;
 
 	/** Loesche die Section, in der der Node steht.
     */


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1736
retrieving revision 1.1737
diff -u -p -r1.1736 -r1.1737
--- openoffice.org.spec	21 Aug 2009 05:08:22 -0000	1.1736
+++ openoffice.org.spec	21 Aug 2009 05:10:23 -0000	1.1737
@@ -3808,6 +3808,7 @@ fi
 - Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 - make the last three patches applicable
+- Resolves: rbhz#501141 Images and Frames disappear in sequential printing
 
 * Fri May 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
 - Resolves: rhbz#494643 EMF polypolygons issue



From dtardon at fedoraproject.org  Fri Aug 21 05:12:22 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 21 Aug 2009 05:12:22 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 openoffice.org.spec,1.1737,1.1738
Message-ID: <20090821051222.B3F5511C00D7@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26031

Modified Files:
	openoffice.org.spec 
Log Message:
Related: rbhz#501141 Images and Frames disappear in sequential printing


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1737
retrieving revision 1.1738
diff -u -p -r1.1737 -r1.1738
--- openoffice.org.spec	21 Aug 2009 05:10:23 -0000	1.1737
+++ openoffice.org.spec	21 Aug 2009 05:12:22 -0000	1.1738
@@ -152,6 +152,7 @@ Patch78: openoffice.org-3.1.0.ooo101379.
 Patch79: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 Patch80: workspace.pdfextfix02.patch
 Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch82: workspace.os131.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1427,6 +1428,7 @@ tar xzf %{PATCH21}
 %patch79 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
 %patch80 -p0 -b .workspace.pdfextfix02.patch
 %patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch82 -p0 -b .workspace.os131.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From dtardon at fedoraproject.org  Fri Aug 21 05:13:40 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 21 Aug 2009 05:13:40 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.os131.patch, NONE,
	1.1 openoffice.org.spec, 1.1928, 1.1929
Message-ID: <20090821051340.440EC11C00D7@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26303

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.os131.patch 
Log Message:
Resolves: rbhz#501141 Images and Frames disappear in sequential printing

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  385 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |   49 ++--
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 531 insertions(+), 108 deletions(-)

--- NEW FILE workspace.os131.patch ---
Index: sw/source/filter/xml/xmltbli.cxx
===================================================================
--- sw/source/filter/xml/xmltbli.cxx	(revision 272643)
+++ sw/source/filter/xml/xmltbli.cxx	(revision 272644)
@@ -662,7 +662,7 @@
 					SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
 								   *pSrcPaM->GetMark() );
 					SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
-					pDoc->Copy( aSrcPaM, aDstPos );
+                    pDoc->Copy( aSrcPaM, aDstPos, false );
 
 					nColRepeat--;
 				}
Index: sw/source/filter/ww8/ww8glsy.cxx
===================================================================
--- sw/source/filter/ww8/ww8glsy.cxx	(revision 272643)
+++ sw/source/filter/ww8/ww8glsy.cxx	(revision 272644)
@@ -187,7 +187,7 @@
                         -1 );
                     pCNd = aIdx.GetNode().GetCntntNode();
                     SwPosition aPos( aIdx, SwIndex( pCNd, pCNd->Len() ));
-                    pD->Copy( aPam, aPos );
+                    pD->Copy( aPam, aPos, false );
                     rBlocks.PutDoc();
                 }
             }
Index: sw/source/core/frmedt/fecopy.cxx
===================================================================
--- sw/source/core/frmedt/fecopy.cxx	(revision 272643)
+++ sw/source/core/frmedt/fecopy.cxx	(revision 272644)
@@ -840,7 +840,7 @@
             {
                 SwNodeIndex aIndexBefore(rInsPos.nNode);
                 aIndexBefore--;
-                pClpDoc->Copy( rCopy, rInsPos );
+                pClpDoc->Copy( rCopy, rInsPos, false );
                 {
                     aIndexBefore++;
                     SwPaM aPaM(SwPosition(aIndexBefore, 0),
@@ -1069,7 +1069,7 @@
 
                 aIndexBefore--;
 
-                pClpDoc->Copy( aCpyPam, rInsPos );
+                pClpDoc->Copy( aCpyPam, rInsPos, false );
 
                 {
                     aIndexBefore++;
Index: sw/source/core/txtnode/atrftn.cxx
===================================================================
--- sw/source/core/txtnode/atrftn.cxx	(revision 272643)
+++ sw/source/core/txtnode/atrftn.cxx	(revision 272644)
@@ -303,7 +303,7 @@
 		SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
 		ULONG  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
 
-		pMyTxtNd->GetDoc()->CopyWithFlyInFly( aRg, aEnd, TRUE );
+        pMyTxtNd->GetDoc()->CopyWithFlyInFly( aRg, 0, aEnd, TRUE );
 
 		// Wenn die Dest-Sektion nicht leer war, so muessen die alten
 		// Nodes geloescht werden:
Index: sw/source/core/edit/edglss.cxx
===================================================================
--- sw/source/core/edit/edglss.cxx	(revision 272643)
+++ sw/source/core/edit/edglss.cxx	(revision 272644)
@@ -168,7 +168,7 @@
 			aStt = pGDoc->GetNodes().GetEndOfExtras();
 			pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
 			SwPosition aInsPos( aStt, SwIndex( pCntntNd ));
-            pMyDoc->Copy( aCpyPam, aInsPos );
+            pMyDoc->Copy( aCpyPam, aInsPos, false );
 
 			nRet = rBlock.PutDoc();
 		}
@@ -250,13 +250,13 @@
 				{
 					PCURCRSR->SetMark();
 					PCURCRSR->Move( fnMoveForward, fnGoCntnt );
-                    bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
+                    bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
 					PCURCRSR->Exchange();
 					PCURCRSR->DeleteMark();
 				}
 			}
 			else
-				bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
+                bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
 
 		FOREACHPAM_END()
         }
Index: sw/source/core/edit/eddel.cxx
===================================================================
--- sw/source/core/edit/eddel.cxx	(revision 272643)
+++ sw/source/core/edit/eddel.cxx	(revision 272644)
@@ -253,7 +253,7 @@
 			bFirstMove = FALSE;
 		}
 
-		if( !GetDoc()->Copy( *PCURCRSR, *pPos ))
+        if( !GetDoc()->Copy( *PCURCRSR, *pPos, false ))
 			continue;
 
         SwPaM aInsertPaM(*pPos, aSttNdIdx);
Index: sw/source/core/doc/docnew.cxx
===================================================================
--- sw/source/core/doc/docnew.cxx	(revision 272643)
+++ sw/source/core/doc/docnew.cxx	(revision 272644)
@@ -32,6 +32,7 @@
 #include "precompiled_sw.hxx"
 #define ROLBCK_HISTORY_ONLY 	// Der Kampf gegen die CLOOK's
 #include <doc.hxx>
+#include <dcontact.hxx>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
@@ -46,12 +47,9 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 
-#ifndef _SFXMACITEM_HXX //autogen
-	#include <svtools/macitem.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
+#include <svtools/macitem.hxx>
 #include <svx/svxids.hrc>
-#endif
+#include <svx/svdogrp.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <svtools/zforlist.hxx>
@@ -79,18 +77,12 @@
 #include <frmfmt.hxx>
 #include <rolbck.hxx>           // Undo-Attr, SwHistory
 #include <poolfmt.hxx>          // fuer die Pool-Vorlage
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <acorrect.hxx>			// fuer die autom. Aufnahme von Ausnahmen
 #include <visiturl.hxx>			// fuer die URL-Change Benachrichtigung
 #include <docary.hxx>
-#ifndef _LINEINFO_HXX
 #include <lineinfo.hxx>
-#endif
 #include <drawdoc.hxx>
 #include <linkenum.hxx>
 #include <fldupde.hxx>
@@ -105,12 +97,10 @@
 #include <istyleaccess.hxx>
 #include <swstylemanager.hxx>
 #include <IGrammarContact.hxx>
-
+#include <tblsel.hxx>
 #include <unochart.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>              // fuer den dflt - Printer in SetJob
-#endif
 
 
 // --> OD 2006-04-19 #b6375613#
@@ -1056,3 +1046,370 @@
     }
 }
 // <--
+/*-- 08.05.2009 10:07:57---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+SwDoc* SwDoc::CreateCopy() const
+{
+    SwDoc* pRet = new SwDoc;
+    //copy settings
+/*
+    //aNodes( this ),
+    //aUndoNodes( this ),
+    mpAttrPool(new SwAttrPool(this)),*/
+    USHORT __FAR_DATA aRangeOfDefaults[] = {
+        RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+        RES_CHRATR_BEGIN, RES_CHRATR_END-1,
+        RES_PARATR_BEGIN, RES_PARATR_END-1,
+        // --> OD 2008-02-25 #refactorlists##
+        RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
+        // <--
+        RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
+        0
+    };
+
+    SfxItemSet aNewDefaults( pRet->GetAttrPool(), aRangeOfDefaults );
+
+    USHORT nWhich;
+    USHORT nRange = 0;
+    while( aRangeOfDefaults[nRange] != 0)
+    {
+        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
+        {
+            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
+            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
+                aNewDefaults.Put( rSourceAttr );
+        }
+        nRange += 2;
+    }
+    if( aNewDefaults.Count() )
+        pRet->SetDefault( aNewDefaults );
+    
+    /*
+    pDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
+    pEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, pDfltFrmFmt ) ),
+    pColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, pDfltFrmFmt ) ),
+    pDfltCharFmt( new SwCharFmt( GetAttrPool(), sCharFmtStr, 0 ) ),
+    pDfltTxtFmtColl( new SwTxtFmtColl( GetAttrPool(), sTxtCollStr ) ),
+    pDfltGrfFmtColl( new SwGrfFmtColl( GetAttrPool(), sGrfCollStr ) ),
+    pFrmFmtTbl( new SwFrmFmts() ),
+    pCharFmtTbl( new SwCharFmts() ),
+    pSpzFrmFmtTbl( new SwSpzFrmFmts() ),
+    pSectionFmtTbl( new SwSectionFmts() ),
+    pTblFrmFmtTbl( new SwFrmFmts() ),
+    pTxtFmtCollTbl( new SwTxtFmtColls() ),
+    pGrfFmtCollTbl( new SwGrfFmtColls() ),
+    pBookmarkTbl( new SwBookmarks( 0, 16 ) ),
+    pTOXTypes( new SwTOXTypes() ),
+    pDefTOXBases( new SwDefTOXBase_Impl() ),
+    pLayout( 0 ),                   // Rootframe des spezifischen Layouts.
+    pDrawModel( 0 ),
+    pUndos( new SwUndos( 0, 20 ) ),
+    pUpdtFlds( new SwDocUpdtFld() ),
+    pFldTypes( new SwFldTypes() ),
+    pVirDev( 0 ),
+    pPrt( 0 ),
+    pPrtData( 0 ),
+    pGlossaryDoc( 0 ),
+    pOutlineRule( 0 ),
+    pFtnInfo( new SwFtnInfo ),
+    pEndNoteInfo( new SwEndNoteInfo ),
+    pLineNumberInfo( new SwLineNumberInfo ),
+    pFtnIdxs( new SwFtnIdxs ),
+    pDocStat( new SwDocStat ),
+    pDocShell( 0 ),
+    pDocShRef( 0 ),
+    pLinkMgr( new SvxLinkManager( 0 ) ),
+    pACEWord( 0 ),
+    pURLStateChgd( 0 ),
+    pNumberFormatter( 0 ),
+    pNumRuleTbl( new SwNumRuleTbl ),
+    // --> OD 2008-03-26 #refactorlists#
+    maLists(),
+    maListStyleLists(),
+    // <--
+    pRedlineTbl( new SwRedlineTbl ),
+    pAutoFmtRedlnComment( 0 ),
+    pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ),
+    pPgPViewPrtData( 0 ),
+    pExtInputRing( 0 ),
+    pLayouter( 0 ),
+    // --> OD 2008-03-07 #refactorlists#
+    pStyleAccess( 0 ),
+    // <--
+    pLayoutCache( 0 ),
+    pUnoCallBack(new SwUnoCallBack(0)),
+    mpGrammarContact( 0 ),
+    aChartDataProviderImplRef(),
+    pChartControllerHelper( 0 ),
+    // --> OD 2007-10-31 #i83479#
+    mpListItemsList( new tImplSortedNodeNumList() ),
+    // <--
+    nUndoPos( 0 ),
+    nUndoSavePos( 0 ),
+    nUndoCnt( 0 ),
+    nUndoSttEnd( 0 ),
+    nAutoFmtRedlnCommentNo( 0 ),
+    nLinkUpdMode( GLOBALSETTING ),
+    eFldUpdMode( AUTOUPD_GLOBALSETTING ),
+    eRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)),
+    eChrCmprType( CHARCOMPRESS_NONE ),
+    mReferenceCount(0),
+    mIdleBlockCount(0),
+    nLockExpFld( 0 ),
+    mbReadlineChecked(false),
+    mbWinEncryption(sal_False),
+    // --> OD 2005-02-11 #i38810#
+    mbLinksUpdated( sal_False ),
+    mbClipBoard( false ),
+    mbColumnSelection( false ),
+    // i#78591#
+    mbProtectForm(false),*/
+    pRet->n32DummyCompatabilityOptions1 = n32DummyCompatabilityOptions1;
+    pRet->n32DummyCompatabilityOptions2 = n32DummyCompatabilityOptions2;
+    /*
+    mbStartIdleTimer(sal_False)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDoc::SwDoc" );
+
+    mbGlossDoc =
+    mbModified =
+    mbDtor =
+    mbUndo =
+    mbPageNums =
+    mbLoaded =
+    mbUpdateExpFld =
+    mbNewDoc =
+    mbCopyIsMove =
+    mbNoDrawUndoObj =
+    mbBrowseMode =
+    mbInReading =
+    mbInXMLImport =
+    mbUpdateTOX =
+    mbInLoadAsynchron =
+    mbHTMLMode =
+    mbInCallModified =
+    mbIsGlobalDoc =
+    mbGlblDocSaveLinks =
+    mbIsLabelDoc =
+    mbIsAutoFmtRedline =
+    mbOLEPrtNotifyPending =
+    mbAllOLENotify =
+    mbIsRedlineMove =
+    mbInsOnlyTxtGlssry =
+    mbContains_MSVBasic =
+    mbKernAsianPunctuation =
+#ifndef PRODUCT
+    mbXMLExport =
+#endif
+    // --> OD 2006-03-21 #b6375613#
+    mbApplyWorkaroundForB6375613 =
+    // <--
+                            false;
+
+    mbGroupUndo =
+    mbNewFldLst =
+    mbVisibleLinks =
+    mbPurgeOLE =
+                            true;
+
+    //
+    // COMPATIBILITY FLAGS START
+    //
+
+    // Note: Any non-hidden compatibility flag should obtain its default
+    // by asking SvtCompatibilityOptions, see below.
+    //
+    const SvtCompatibilityOptions aOptions;
+     */ 
+    pRet->mbParaSpaceMax                          = mbParaSpaceMax                          ;
+    pRet->mbParaSpaceMaxAtPages                   = mbParaSpaceMaxAtPages                   ;
+    pRet->mbTabCompat                             = mbTabCompat                             ;
+    pRet->mbUseVirtualDevice                      = mbUseVirtualDevice                      ;
+    pRet->mbAddExternalLeading                    = mbAddExternalLeading                    ;
+    pRet->mbOldLineSpacing                        = mbOldLineSpacing                        ;
+    pRet->mbAddParaSpacingToTableCells            = mbAddParaSpacingToTableCells            ;
+    pRet->mbUseFormerObjectPos                    = mbUseFormerObjectPos                    ;
+    pRet->mbUseFormerTextWrapping                 = mbUseFormerTextWrapping                 ;
+    pRet->mbConsiderWrapOnObjPos                  = mbConsiderWrapOnObjPos                  ;
+    pRet->mbAddFlyOffsets                         = mbAddFlyOffsets                         ;
+    pRet->mbOldNumbering                          = mbOldNumbering                          ;
+    pRet->mbUseHiResolutionVirtualDevice          = mbUseHiResolutionVirtualDevice          ;
+    pRet->mbIgnoreFirstLineIndentInNumbering      = mbIgnoreFirstLineIndentInNumbering      ;
+    pRet->mbDoNotJustifyLinesWithManualBreak      = mbDoNotJustifyLinesWithManualBreak      ;
+    pRet->mbDoNotResetParaAttrsForNumFont         = mbDoNotResetParaAttrsForNumFont         ;
+    pRet->mbOutlineLevelYieldsOutlineRule         = mbOutlineLevelYieldsOutlineRule         ;
+    pRet->mbTableRowKeep                          = mbTableRowKeep                          ;
+    pRet->mbIgnoreTabsAndBlanksForLineCalculation = mbIgnoreTabsAndBlanksForLineCalculation ;
+    pRet->mbDoNotCaptureDrawObjsOnPage            = mbDoNotCaptureDrawObjsOnPage            ;
+    pRet->mbClipAsCharacterAnchoredWriterFlyFrames= mbClipAsCharacterAnchoredWriterFlyFrames;
+    pRet->mbUnixForceZeroExtLeading               = mbUnixForceZeroExtLeading               ;
+    pRet->mbOldPrinterMetrics                     = mbOldPrinterMetrics                     ;
+    pRet->mbTabRelativeToIndent                   = mbTabRelativeToIndent                   ;
+    pRet->mbTabAtLeftIndentForParagraphsInList    = mbTabAtLeftIndentForParagraphsInList    ;
+                                            
+    //                                      
+    // COMPATIBILITY FLAGS END
+    //
+    /*
+    pMacroTable = new SvxMacroTableDtor;
+    
+    mpGrammarContact = ::createGrammarContact();
+
+    // Formate
+    pFrmFmtTbl->Insert(pDfltFrmFmt, 0 );
+    pCharFmtTbl->Insert(pDfltCharFmt, 0 );
+
+    // FmtColls 
+    // TXT
+    pTxtFmtCollTbl->Insert(pDfltTxtFmtColl, 0 );
+    // GRF
+    pGrfFmtCollTbl->Insert(pDfltGrfFmtColl, 0 );
+
+    // PageDesc, EmptyPageFmt und ColumnFmt anlegen
+    if ( !aPageDescs.Count() )
+        GetPageDescFromPool( RES_POOLPAGE_STANDARD );
+
+        //Leere Seite Einstellen.
+    pEmptyPageFmt->SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
+        //BodyFmt fuer Spalten Einstellen.
+    pColumnContFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+
+    _InitFieldTypes();
+
+    // lege (fuer die Filter) eine Default-OutlineNumRule an
+    // --> OD 2008-02-11 #newlistlevelattrs#
+    pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
+                                  // --> OD 2008-06-06 #i89178#
+                                  numfunc::GetDefaultPositionAndSpaceMode(),
+                                  // <--
+                                  OUTLINE_RULE );
+    // <--
+    // #115901#
+    AddNumRule(pOutlineRule);
+    // --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
+    pOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) );
+    // <--
+
+    new SwTxtNode( SwNodeIndex( aUndoNodes.GetEndOfContent() ), pDfltTxtFmtColl );
+    new SwTxtNode( SwNodeIndex( aNodes.GetEndOfContent() ),
+                    GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+
+    // den eigenen IdleTimer setzen
+    aIdleTimer.SetTimeout( 600 );
+    aIdleTimer.SetTimeoutHdl( LINK(this, SwDoc, DoIdleJobs) );
+
+    aOLEModifiedTimer.SetTimeout( 1000 );
+    aOLEModifiedTimer.SetTimeoutHdl( LINK( this, SwDoc, DoUpdateModifiedOLE ));
+
+    // DBMgr anlegen
+    pNewDBMgr = new SwNewDBMgr;
+
+    // create TOXTypes
+    ShellResource* pShellRes = ViewShell::GetShellRes();
+
+    SwTOXType * pNew = new SwTOXType(TOX_CONTENT,   pShellRes->aTOXContentName        );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_INDEX,                 pShellRes->aTOXIndexName  );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_USER,                  pShellRes->aTOXUserName  );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_ILLUSTRATIONS,         pShellRes->aTOXIllustrationsName );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_OBJECTS,               pShellRes->aTOXObjectsName       );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_TABLES,                pShellRes->aTOXTablesName        );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_AUTHORITIES,           pShellRes->aTOXAuthoritiesName   );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+
+    {
+        SfxItemSet aIgnorableParagraphItems( GetAttrPool(),
+                                             RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
+                                             0 );
+        pStyleAccess = createStyleManager( &aIgnorableParagraphItems );
+    }
+
+    ResetModified();
+
+*/    
+    //copy content 
+    pRet->Paste( *this );
+    return pRet;
+}
+/*-- 08.05.2009 10:52:40---------------------------------------------------
+    copy document content - code from SwFEShell::Paste( SwDoc* , BOOL  )
+  -----------------------------------------------------------------------*/
+void SwDoc::Paste( const SwDoc& rSource )
+{
+//  this has to be empty const USHORT nStartPageNumber = GetPhyPageNum();
+    // until the end of the NodesArray
+    SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 2 );
+    SwPaM aCpyPam( aSourceIdx ); //DocStart
+    SwNodeIndex aTargetIdx( GetNodes().GetEndOfExtras(), 2 );
+    SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+
+
+    aCpyPam.SetMark();
+    aCpyPam.Move( fnMoveForward, fnGoDoc );
+
+    BOOL bRet = TRUE, bDelTbl = TRUE;
+    this->StartUndo( UNDO_INSGLOSSARY, NULL );
+    this->LockExpFlds();
+
+    {
+        SwPosition& rInsPos = *aInsertPam.GetPoint();
+        //find out if the clipboard document starts with a table
+        bool bStartWithTable = 0 != aCpyPam.Start()->nNode.GetNode().FindTableNode();
+        SwPosition aInsertPosition( rInsPos );
+
+        {
+            SwNodeIndex aIndexBefore(rInsPos.nNode);
+
+            aIndexBefore--;
+
+            rSource.Copy( aCpyPam, rInsPos, true );
+
+            {
+                aIndexBefore++;
+                SwPaM aPaM(SwPosition(aIndexBefore, 0),
+                           SwPosition(rInsPos.nNode, 0));
+
+                MakeUniqueNumRules(aPaM);
+            }
+        }
+
+        //TODO: Is this necessary here? SaveTblBoxCntnt( &rInsPos );
+        if(/*bIncludingPageFrames && */bStartWithTable)
+        {
+            //remove the paragraph in front of the table
+            SwPaM aPara(aInsertPosition);
+            this->DelFullPara(aPara);
+        }
+        //additionally copy page bound frames
+        if( /*bIncludingPageFrames && */rSource.GetSpzFrmFmts()->Count() )
+        {
+            for ( USHORT i = 0; i < rSource.GetSpzFrmFmts()->Count(); ++i )
+            {
+                BOOL bInsWithFmt = TRUE;
+                const SwFrmFmt& rCpyFmt = *(*rSource.GetSpzFrmFmts())[i];
+                if( bInsWithFmt  )
+                {
+                    SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+                    if( FLY_PAGE == aAnchor.GetAnchorId() )
+                    {
+                        aAnchor.SetPageNum( aAnchor.GetPageNum() + /*nStartPageNumber - */1 );
+                    }
+                    else
+                        continue;
+                    this->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
+                }
+            }
+        }
+    }
+
+    this->EndUndo( UNDO_INSGLOSSARY, NULL );
+
+    UnlockExpFlds();
+    UpdateFlds(NULL, false);
+}
Index: sw/source/core/doc/doccomp.cxx
===================================================================
--- sw/source/core/doc/doccomp.cxx	(revision 272643)
+++ sw/source/core/doc/doccomp.cxx	(revision 272644)
@@ -1196,7 +1196,7 @@
 					SwPaM aCpyPam( rSrcNd, nStt );
 					aCpyPam.SetMark();
 					aCpyPam.GetPoint()->nContent = nSEnd;
-					aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint() );
+                    aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint(), false );
 					pDoc->DoUndo( bUndo );
 				}
 
@@ -1367,7 +1367,7 @@
 	SwNodeIndex aInsPos( *pLineNd, nOffset );
 	SwNodeIndex aSavePos( aInsPos, -1 );
 
-	((SwCompareData&)rData).rDoc.CopyWithFlyInFly( aRg, aInsPos );
+    ((SwCompareData&)rData).rDoc.CopyWithFlyInFly( aRg, 0, aInsPos );
 	rDoc.SetModified();
 	aSavePos++;
 
@@ -1624,7 +1624,7 @@
 		RedlineMode_t eOld = pDoc->GetRedlineMode();
 		pDoc->SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
 
-		pSrcRedl->GetDoc()->Copy( *(SwPaM*)pSrcRedl, *pDestRedl->GetPoint() );
+        pSrcRedl->GetDoc()->Copy( *(SwPaM*)pSrcRedl, *pDestRedl->GetPoint(), false );
 
 		pDoc->SetRedlineMode_intern( eOld );
 		pDoc->DoUndo( bUndo );
Index: sw/source/core/doc/docnum.cxx
===================================================================
--- sw/source/core/doc/docnum.cxx	(revision 272643)
+++ sw/source/core/doc/docnum.cxx	(revision 272644)
@@ -2273,7 +2273,7 @@
                 }
             }
 
-			Copy( aPam, aInsPos );
+            Copy( aPam, aInsPos, false );
 			if( bDelLastPara )
 			{
 				// dann muss der letzte leere Node wieder entfernt werden
Index: sw/source/core/doc/docredln.cxx
===================================================================
--- sw/source/core/doc/docredln.cxx	(revision 272643)
+++ sw/source/core/doc/docredln.cxx	(revision 272644)
@@ -3418,7 +3418,7 @@
 			SwNodeIndex aNdIdx( *pSttNd, 1 );
 			SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
 			SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
-			pDoc->Copy( *this, aPos );
+            pDoc->Copy( *this, aPos, false );
 
 			// JP 08.10.98: die Vorlage vom EndNode ggfs. mit uebernehmen
 			//				- ist im Doc::Copy nicht erwuenscht
@@ -3443,13 +3443,13 @@
 			if( pCEndNd )
 			{
 				SwPosition aPos( *pSttNd->EndOfSectionNode() );
-				pDoc->Copy( *this, aPos );
+                pDoc->Copy( *this, aPos, false );
 			}
 			else
 			{
 				SwNodeIndex aInsPos( *pSttNd->EndOfSectionNode() );
 				SwNodeRange aRg( pStt->nNode, 0, pEnd->nNode, 1 );
-				pDoc->CopyWithFlyInFly( aRg, aInsPos );
+                pDoc->CopyWithFlyInFly( aRg, 0, aInsPos );
 			}
 		}
 		pCntntSect = new SwNodeIndex( *pSttNd );
Index: sw/source/core/doc/docglos.cxx
===================================================================
--- sw/source/core/doc/docglos.cxx	(revision 272643)
+++ sw/source/core/doc/docglos.cxx	(revision 272644)
@@ -183,7 +183,7 @@
                 SwDontExpandItem aACD;
 				aACD.SaveDontExpandItems( rInsPos );
 
-                pGDoc->Copy( aCpyPam, rInsPos );
+                pGDoc->Copy( aCpyPam, rInsPos, false );
 
 				aACD.RestoreDontExpandItems( rInsPos );
 				if( pShell )
Index: sw/source/core/doc/tblcpy.cxx
===================================================================
--- sw/source/core/doc/tblcpy.cxx	(revision 272643)
+++ sw/source/core/doc/tblcpy.cxx	(revision 272644)
@@ -567,7 +567,7 @@
 
 	SwNodeIndex aSavePos( aInsIdx, -1 );
     if( pRg.get() )
-        pCpyDoc->CopyWithFlyInFly( *pRg, aInsIdx, FALSE );
+        pCpyDoc->CopyWithFlyInFly( *pRg, 0, aInsIdx, FALSE );
     else
 		pDoc->GetNodes().MakeTxtNode( aInsIdx, (SwTxtFmtColl*)pDoc->GetDfltTxtFmtColl() );
 	aSavePos++;
Index: sw/source/core/doc/docglbl.cxx
===================================================================
--- sw/source/core/doc/docglbl.cxx	(revision 272643)
+++ sw/source/core/doc/docglbl.cxx	(revision 272644)
@@ -307,7 +307,7 @@
 						pDoc->GetNodes().Delete( aIdx, 1 );
 
 					// alle Flys in dem Bereich
-					_CopyFlyInFly( aRg, aIdx );
+                    _CopyFlyInFly( aRg, 0, aIdx );
 
 
 					// und noch alle Bookmarks
@@ -653,7 +653,7 @@
 						pDoc->GetNodes().Delete( aIdx, 1 );
 
 					// alle Flys in dem Bereich
-					_CopyFlyInFly( aRg, aIdx );
+                    _CopyFlyInFly( aRg, 0, aIdx );
 
 
 					// und noch alle Bookmarks
Index: sw/source/core/doc/tblrwcl.cxx
===================================================================
--- sw/source/core/doc/tblrwcl.cxx	(revision 272643)
+++ sw/source/core/doc/tblrwcl.cxx	(revision 272644)
@@ -2103,7 +2103,7 @@
                             *rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
                 SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
 
-                pFromDoc->CopyWithFlyInFly( aCpyRg, aInsIdx, FALSE );
+                pFromDoc->CopyWithFlyInFly( aCpyRg, 0, aInsIdx, FALSE );
                 // den initialen TextNode loeschen
                 pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
             }
Index: sw/source/core/doc/doclay.cxx
===================================================================
--- sw/source/core/doc/doclay.cxx	(revision 272643)
+++ sw/source/core/doc/doclay.cxx	(revision 272644)
@@ -507,7 +507,7 @@
 
 		// sorge dafuer das auch Fly's in Fly's kopiert werden
 		aIdx = *pSttNd->EndOfSectionNode();
-		pSrcDoc->CopyWithFlyInFly( aRg, aIdx, sal_False, sal_True, sal_True );
+        pSrcDoc->CopyWithFlyInFly( aRg, 0, aIdx, sal_False, sal_True, sal_True );
 	}
 	else
 	{
@@ -885,7 +885,7 @@
 				do {
 					if( pTmp->HasMark() &&
 						*pTmp->GetPoint() != *pTmp->GetMark() )
-						Copy( *pTmp, aPos );
+                        Copy( *pTmp, aPos, false );
 				} while( &rPam != ( pTmp = (SwPaM*)pTmp->GetNext() ) );
 				mbCopyIsMove = bOldFlag;
 				mbUndo = bOldUndo;
Index: sw/source/core/doc/docfmt.cxx
===================================================================
--- sw/source/core/doc/docfmt.cxx	(revision 272643)
+++ sw/source/core/doc/docfmt.cxx	(revision 272644)
@@ -2126,7 +2126,7 @@
 				aTmpIdx = *pSttNd->EndOfSectionNode();
 				rSrcNds._Copy( aRg, aTmpIdx );
 				aTmpIdx = *pSttNd;
-				rSrcFmt.GetDoc()->_CopyFlyInFly( aRg, aTmpIdx );
+                rSrcFmt.GetDoc()->_CopyFlyInFly( aRg, 0, aTmpIdx );
                 pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
 			}
 			else
Index: sw/source/core/undo/untblk.cxx
===================================================================
--- sw/source/core/undo/untblk.cxx	(revision 272643)
+++ sw/source/core/undo/untblk.cxx	(revision 272644)
@@ -346,7 +346,7 @@
 
 	SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
 	SetPaM( aPam );
-	aPam.GetDoc()->Copy( aPam, *rUndoIter.pAktPam->GetPoint() );
+    aPam.GetDoc()->Copy( aPam, *rUndoIter.pAktPam->GetPoint(), false );
 
 	rUndoIter.pLastUndoObj = this;
 }
Index: sw/source/core/docnode/ndcopy.cxx
===================================================================
--- sw/source/core/docnode/ndcopy.cxx	(revision 272643)
+++ sw/source/core/docnode/ndcopy.cxx	(revision 272644)
@@ -659,7 +659,7 @@
 
 // Kopieren eines Bereiches im oder in ein anderes Dokument !
 
-bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos ) const
+bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos, bool bCopyAll ) const
 {
 	const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
 
@@ -698,13 +698,13 @@
 	BOOL bRet = FALSE;
 
 	if( pDoc != this )
-        bRet = _Copy( rPam, rPos, TRUE, pRedlineRange );    // nur normales Kopieren
+        bRet = _Copy( rPam, rPos, TRUE, bCopyAll, pRedlineRange );    // nur normales Kopieren
 	// Copy in sich selbst (ueber mehrere Nodes wird hier gesondert
 	// behandelt; in einem TextNode wird normal behandelt)
 	else if( ! ( *pStt <= rPos && rPos < *pEnd &&
 			( pStt->nNode != pEnd->nNode ||
 			  !pStt->nNode.GetNode().IsTxtNode() )) )
-		bRet = _Copy( rPam, rPos, TRUE, pRedlineRange );	// nur normales Kopieren
+		bRet = _Copy( rPam, rPos, TRUE, bCopyAll, pRedlineRange );	// nur normales Kopieren
 
 	else
 	{
@@ -728,7 +728,7 @@
 		SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
 								SwNodeIndex( GetNodes().GetEndOfAutotext() ));
 		aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
-		pDoc->_Copy( rPam, *aPam.GetPoint(), FALSE );		// kopieren ohne Frames
+		pDoc->_Copy( rPam, *aPam.GetPoint(), FALSE, bCopyAll, 0 );		// kopieren ohne Frames
 
 		aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
 		aPam.SetMark();
@@ -803,7 +803,7 @@
 }
 
 BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
-					BOOL bMakeNewFrms, SwPaM* pCpyRange ) const
+					BOOL bMakeNewFrms, bool bCopyAll, SwPaM* pCpyRange ) const
 {
 	SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
     bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
@@ -1087,7 +1087,7 @@
 			}
 		}
 
-		if( aRg.aStart != aRg.aEnd )
+		if( bCopyAll || aRg.aStart != aRg.aEnd )
 		{
 			SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
             if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
@@ -1102,13 +1102,13 @@
 			if( aInsPos == pEnd->nNode )
 			{
 				SwNodeIndex aSaveIdx( aInsPos, -1 );
-				CopyWithFlyInFly( aRg, aInsPos, bMakeNewFrms, FALSE );
+                CopyWithFlyInFly( aRg, 0,aInsPos, bMakeNewFrms, FALSE );
 				aSaveIdx++;
 				pEnd->nNode = aSaveIdx;
 				pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
 			}
 			else
-				CopyWithFlyInFly( aRg, aInsPos, bMakeNewFrms, FALSE );
+                CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, bMakeNewFrms, FALSE );
 
 			bCopyBookmarks = FALSE;
 
@@ -1167,7 +1167,7 @@
 
 //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
 
-void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
+void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, 
 							const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
 							BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
 {
@@ -1206,7 +1206,7 @@
 	// Undo abschalten
 	BOOL bUndo = pDest->DoesUndo();
 	pDest->DoUndo( FALSE );
-	_CopyFlyInFly( rRg, aSavePos, bCopyFlyAtFly );
+	_CopyFlyInFly( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly );
 	pDest->DoUndo( bUndo );
 
 	SwNodeRange aCpyRange( aSavePos, rInsPos );
@@ -1242,7 +1242,7 @@
 	}
 }
 
-void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const SwNodeIndex& rSttIdx,
+void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, const SwNodeIndex& rSttIdx,
 							BOOL bCopyFlyAtFly ) const
 {
 	// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
@@ -1259,7 +1259,8 @@
 		const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
 		const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
 		const SwPosition* pAPos;
-		if ( ( pAnchor->GetAnchorId() == FLY_AT_CNTNT ||
+        bool bAtCntnt = pAnchor->GetAnchorId() == FLY_AT_CNTNT;
+		if ( ( bAtCntnt ||
 			   pAnchor->GetAnchorId() == FLY_AT_FLY ||
 			   pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
 			 0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
@@ -1268,9 +1269,53 @@
 					: ( IsRedlineMove()
 							? rRg.aStart < pAPos->nNode
 							: rRg.aStart <= pAPos->nNode )) &&
-			 pAPos->nNode < rRg.aEnd )
+			 pAPos->nNode <= rRg.aEnd )
 		{
-			aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
+			//frames at the last source node are not always copied:
+            //- if the node is empty and is the last node of the document or a table cell
+            //  or a text frame then tey have to be copied
+            //- if the content index in this node is > 0 then paragph and frame bound objects are copied
+            //- to-character bound objects are copied if their index is <= nEndContentIndex
+            bool bAdd = false;
+            if( pAPos->nNode < rRg.aEnd )
+                bAdd = true;
+            if( !bAdd )
+            {
+                bool bEmptyNode = false;
+                bool bLastNode = false;
+                // is the node empty?
+                const SwNodes& rNodes = pAPos->nNode.GetNodes();
+                SwTxtNode* pTxtNode;
+                if( 0 != ( pTxtNode = pAPos->nNode.GetNode().GetTxtNode() ))
+                {
+                    bEmptyNode = !pTxtNode->GetTxt().Len();
+                    if( bEmptyNode )
+                    {
+                        //last node information is only necessary to know for the last TextNode
+                        SwNodeIndex aTmp( pAPos->nNode );
+                        ++aTmp;//goto next node
+                        while( rNodes[aTmp ]->IsEndNode() )
+                        {
+                            if( aTmp == rNodes.GetEndOfContent().GetIndex() )
+                            {
+                                bLastNode = true;
+                                break;
+                            }
+                            ++aTmp;
+                        }
+                    }
+                }
+                bAdd = bLastNode && bEmptyNode;
+                if( !bAdd )
+                {
+                    if( bAtCntnt )
+                        bAdd = nEndContentIndex > 0;
+                    else 
+                        bAdd = pAPos->nContent <= nEndContentIndex;
+                }
+            }
+            if( bAdd )                
+                aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
 		}
 	}
 
Index: sw/source/core/docnode/section.cxx
===================================================================
--- sw/source/core/docnode/section.cxx	(revision 272643)
+++ sw/source/core/docnode/section.cxx	(revision 272644)
@@ -1415,7 +1415,7 @@
 						if( pSrcDoc != pDoc ||
 							pCpyPam->Start()->nNode > rInsPos ||
 							rInsPos >= pCpyPam->End()->nNode )
-							pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint() );
+                            pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint(), false );
 						delete pCpyPam;
 					}
 					if( pCpyRg && pSrcDoc == pDoc &&
@@ -1444,7 +1444,7 @@
 
 					SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
 
-					pSrcDoc->CopyWithFlyInFly( *pCpyRg, rInsPos, bCreateFrm );
+                    pSrcDoc->CopyWithFlyInFly( *pCpyRg, 0, rInsPos, bCreateFrm );
 					aSave++;
 
 					if( !bCreateFrm )
Index: sw/source/ui/dbui/dbmgr.cxx
===================================================================
--- sw/source/ui/dbui/dbmgr.cxx	(revision 272643)
+++ sw/source/ui/dbui/dbmgr.cxx	(revision 272644)
@@ -35,7 +35,9 @@
 #endif
 
 #include <stdio.h>
-
+#ifdef SW_COPY_DOC_IN_MEMORY
+#include <unotxdoc.hxx>
+#endif
 #include <com/sun/star/text/NotePrintMode.hpp>
 #include <sfx2/app.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -43,17 +45,13 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#ifndef _COM_SUN_STAR_UTIL_iXNUMBERFORMATTER_HPP_
 #include <com/sun/star/util/XNumberFormatter.hpp>
-#endif
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/XCompletedExecution.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_
 #include <com/sun/star/text/MailMergeEvent.hpp>
-#endif
 #include <com/sun/star/frame/XStorable.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
@@ -65,9 +63,7 @@
 #include <dbconfig.hxx>
 #include <swdbtoolsclient.hxx>
 #include <pagedesc.hxx>
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <unotools/tempfile.hxx>
 #include <svtools/pathoptions.hxx>
 #include <svtools/urihelper.hxx>
@@ -86,39 +82,25 @@
 #include <goodies/mailenum.hxx>
 #include <cmdid.h>
 #include <swmodule.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <edtwin.hxx>
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
 #include <initui.hxx>
 #include <swundo.hxx>
 #include <flddat.hxx>
-#ifndef _MODCFG_HXX
 #include <modcfg.hxx>
-#endif
 #include <swprtopt.hxx>
 #include <shellio.hxx>
 #include <dbui.hxx>
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <doc.hxx>
 #include <swwait.hxx>
 #include <swunohelper.hxx>
-#ifndef _DBUI_HRC
 #include <dbui.hrc>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _STATSTR_HRC
 #include <statstr.hrc>
-#endif
 #include <mmconfigitem.hxx>
 #include <sfx2/request.hxx>
 #include <hintids.hxx>
@@ -3182,7 +3164,10 @@
 
     SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
     BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
     String sSourceDocURL;
+#endif
     //save the settings of the first
     rSourceShell.SttEndDoc(TRUE);
     USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
@@ -3192,6 +3177,8 @@
 
     try
     {
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
         // save the working document into a temporary location
         sSourceDocURL = URIHelper::SmartRel2Abs(
             INetURLObject(), utl::TempFile::CreateTempName(),
@@ -3207,7 +3194,7 @@
         pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
         uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
         xStore->storeToURL( sSourceDocURL, aValues );
-
+#endif
         // create a target docshell to put the merged document into
         SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
         xTargetDocShell->DoInitNew( 0 );
@@ -3256,6 +3243,15 @@
                     Application::Reschedule();
             }
 
+#ifdef SW_COPY_DOC_IN_MEMORY
+            // copy the source document
+            uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+            uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
+            SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
+            //create a ViewFrame
+            SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
+            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
+#else
             // create a new docshell from the temporary document
             SfxBoolItem aHidden( SID_HIDDEN, TRUE );
             SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
@@ -3265,9 +3261,13 @@
                             rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
                                     &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
             if(pReturnValue)
+#endif
             {
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else                
                 SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
                 SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+#endif
                 SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
                 pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
 
@@ -3387,8 +3387,11 @@
     {
         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
     }
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
     if(sSourceDocURL.Len())
         File::remove( sSourceDocURL );
+#endif
     DELETEZ(pImpl->pMergeData);
     bInMerge = FALSE;
     return nRet;
Index: sw/source/ui/uno/unoatxt.cxx
===================================================================
--- sw/source/ui/uno/unoatxt.cxx	(revision 272643)
+++ sw/source/ui/uno/unoatxt.cxx	(revision 272644)
@@ -417,7 +417,7 @@
 		if(pxCursor)
 		{
 			SwPaM* pUnoCrsr = pxCursor->GetPaM();
-            bRet |= (true == pxCursor->GetDoc()->Copy( *pUnoCrsr, aPos ));
+            bRet |= (true == pxCursor->GetDoc()->Copy( *pUnoCrsr, aPos, false ));
 		}
 		else
 		{
@@ -425,7 +425,7 @@
             if(pBkm && pBkm->GetOtherBookmarkPos())
 			{
                 SwPaM aTmp(*pBkm->GetOtherBookmarkPos(), pBkm->GetBookmarkPos());
-                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos));
+                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos, false));
 			}
 		}
 	}
Index: sw/source/ui/uno/unotxdoc.cxx
===================================================================
--- sw/source/ui/uno/unotxdoc.cxx	(revision 272643)
+++ sw/source/ui/uno/unotxdoc.cxx	(revision 272644)
@@ -37,16 +37,12 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <wdocsh.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <pview.hxx>
-#ifndef _SRCVIEW_HXX
 #include <srcview.hxx>
-#endif
 #include <viewsh.hxx>
 #include <pvprtdat.hxx>
 #include <swprtopt.hxx>
@@ -84,9 +80,7 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <com/sun/star/document/RedlineDisplayType.hpp>
 #include <svx/linkmgr.hxx>
 #include <svx/unofill.hxx>
@@ -94,13 +88,9 @@
 #include <sfx2/progress.hxx>
 #include <swmodule.hxx>
 #include <docstat.hxx>
-#ifndef _MODOPT_HXX //
 #include <modcfg.hxx>
-#endif
 #include <ndtxt.hxx>
-#ifndef _UTLUI_HRC
 #include <utlui.hrc>
-#endif
 #include <swcont.hxx>
 #include <unodefaults.hxx>
 #include <SwXDocumentSettings.hxx>
@@ -2856,7 +2846,27 @@
 {
     return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
 }
+/*-- 07.05.2009 09:21:12---------------------------------------------------
 
+  -----------------------------------------------------------------------*/
+uno::Reference< util::XCloneable > SwXTextDocument::createClone(  ) throw (uno::RuntimeException)
+{
+    ::vos::OGuard aGuard(Application::GetSolarMutex());
+    if(!IsValid())
+        throw RuntimeException();
+    //create a new document - hidden - copy the storage and return it
+    SwDoc* pCopyDoc = pDocShell->GetDoc()->CreateCopy();
+    SfxObjectShell* pShell = new SwDocShell( pCopyDoc, SFX_CREATE_MODE_STANDARD );
+    pShell->DoInitNew();
+    
+    uno::Reference< embed::XStorage > xSourceStorage = getDocumentStorage();
+    uno::Reference< frame::XModel > xNewModel = pShell->GetModel();
+    //copy this storage
+    uno::Reference< document::XStorageBasedDocument > xStorageDoc( xNewModel, uno::UNO_QUERY );
+    uno::Reference< embed::XStorage > xNewStorage = xStorageDoc->getDocumentStorage();
+    xSourceStorage->copyToStorage( xNewStorage );
+    return uno::Reference< util::XCloneable >( xNewModel, UNO_QUERY );
+}
 /* -----------------------------20.06.00 09:54--------------------------------
 
  ---------------------------------------------------------------------------*/
Index: sw/inc/doc.hxx
===================================================================
--- sw/inc/doc.hxx	(revision 272643)
+++ sw/inc/doc.hxx	(revision 272644)
@@ -636,7 +636,7 @@
 		// Kopieren eines Bereiches im oder in ein anderes Dokument !
 		// Die Position darf nicht im Bereich liegen !!
 	sal_Bool _Copy( SwPaM&, SwPosition&,
-				sal_Bool MakeNewFrms = sal_True, SwPaM* pCpyRng = 0 ) const;	// in ndcopy.cxx
+				sal_Bool MakeNewFrms /*= sal_True*/, bool bCopyAll, SwPaM* pCpyRng /*= 0*/ ) const;	// in ndcopy.cxx
 
 	SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
 								const SwCntntNode& rNode, RndStdIds eRequestId,
@@ -648,7 +648,8 @@
 								const SfxItemSet* pGrfAttrSet,
 								SwFrmFmt* = 0 );
 
-	void _CopyFlyInFly( const SwNodeRange& rRg, const SwNodeIndex& rSttIdx,
+    void _CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex,
+                        const SwNodeIndex& rSttIdx,
 						sal_Bool bCopyFlyAtFly = sal_False ) const;	// steht im ndcopy.cxx
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
 
@@ -720,6 +721,7 @@
      SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
      SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
 
+     void   Paste( const SwDoc& );
 public:
 
     /** Life cycle
@@ -915,7 +917,7 @@
 
     /** IDocumentContentOperations
     */
-    virtual bool Copy(SwPaM&, SwPosition&) const;
+    virtual bool Copy(SwPaM&, SwPosition&, bool bCopyAll) const;
 	virtual void DeleteSection(SwNode* pNode);
 	virtual bool Delete(SwPaM&);
 	virtual bool DelFullPara(SwPaM&);
@@ -1118,6 +1120,7 @@
 								SwFrmFmt *pParent = 0 );
 
 	void CopyWithFlyInFly( const SwNodeRange& rRg,
+                            const xub_StrLen nEndContentIndex,
 							const SwNodeIndex& rInsPos,
 							sal_Bool bMakeNewFrms = sal_True,
 							sal_Bool bDelRedlines = sal_True,
@@ -2117,6 +2120,7 @@
 	{
 		return n32DummyCompatabilityOptions2;
 	}
+    SwDoc* CreateCopy() const;
 };
 
 
Index: sw/inc/unotxdoc.hxx
===================================================================
--- sw/inc/unotxdoc.hxx	(revision 272643)
+++ sw/inc/unotxdoc.hxx	(revision 272644)
@@ -68,9 +68,8 @@
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
-#ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTLANGUAGES_HPP
 #include <com/sun/star/document/XDocumentLanguages.hpp>
-#endif
+#include <com/sun/star/util/XCloneable.hpp>
 #include <svtools/itemprop.hxx>
 #include <svx/fmdmod.hxx>
 #include <svx/UnoForbiddenCharsTable.hxx>
@@ -79,22 +78,22 @@
 #include <cppuhelper/implbase4.hxx>	// helper for implementations
 #include <RefreshListenerContainer.hxx>
 
-#define __IFC31 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
-Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31
+#define __IFC32 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
+Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31, Ifc32
 
-#define __CLASS_IFC31 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
+#define __CLASS_IFC32 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
 class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13, class Ifc14, class Ifc15, class Ifc16, \
 class Ifc17, class Ifc18, class Ifc19, class Ifc20, class Ifc21, class Ifc22, class Ifc23, class Ifc24,\
-class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31
+class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31 , class Ifc32
 
-#define __PUBLIC_IFC31 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
+#define __PUBLIC_IFC32 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
 public Ifc13, public Ifc14, public Ifc15, public Ifc16, public Ifc17, public Ifc18, \
 public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23, public Ifc24, \
 public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc30, \
-public Ifc31
+public Ifc31, public Ifc32
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
-#define __IFC_EX_TYPE_INIT31( class_cast ) \
+#define __IFC_EX_TYPE_INIT32( class_cast ) \
     __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \
     __IFC_EX_TYPE_INIT( class_cast, 3 ), __IFC_EX_TYPE_INIT( class_cast, 4 ), \
     __IFC_EX_TYPE_INIT( class_cast, 5 ), __IFC_EX_TYPE_INIT( class_cast, 6 ), \
@@ -110,10 +109,10 @@
     __IFC_EX_TYPE_INIT( class_cast, 25 ), __IFC_EX_TYPE_INIT( class_cast, 26 ), \
     __IFC_EX_TYPE_INIT( class_cast, 27 ), __IFC_EX_TYPE_INIT( class_cast, 28 ), \
     __IFC_EX_TYPE_INIT( class_cast, 29 ), __IFC_EX_TYPE_INIT( class_cast, 30 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 31)
+    __IFC_EX_TYPE_INIT( class_cast, 31 ), __IFC_EX_TYPE_INIT( class_cast, 32)
 #include <cppuhelper/implbase_ex_post.hxx>
 
-__DEF_IMPLHELPER_EX( 31 )
+__DEF_IMPLHELPER_EX( 32 )
 
 class SwDoc;
 class SwDocShell;
@@ -132,7 +131,7 @@
  ******************************************************************************/
 
 
-typedef cppu::WeakImplHelper31
+typedef cppu::WeakImplHelper32
 <
 	::com::sun::star::text::XTextDocument,
 	::com::sun::star::text::XLineNumberingProperties,
@@ -164,7 +163,8 @@
     ::com::sun::star::view::XRenderable,
     ::com::sun::star::xforms::XFormsSupplier,
     ::com::sun::star::text::XFlatParagraphIteratorProvider,
-	::com::sun::star::document::XDocumentLanguages
+    ::com::sun::star::document::XDocumentLanguages,
+    ::com::sun::star::util::XCloneable
 >
 SwXTextDocumentBaseClass;
 
@@ -402,7 +402,11 @@
     // ::com::sun::star::text::XFlatParagraphIteratorProvider:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException);
 
-	//
+    // ::com::sun::star::util::XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+    
+    
+    //
 	void						Invalidate();
 	void						Reactivate(SwDocShell* pNewDocShell);
 	SwXDocumentPropertyHelper * GetPropertyHelper ();
Index: sw/inc/IDocumentContentOperations.hxx
===================================================================
--- sw/inc/IDocumentContentOperations.hxx	(revision 272643)
+++ sw/inc/IDocumentContentOperations.hxx	(revision 272644)
@@ -71,7 +71,7 @@
     /** Kopieren eines Bereiches im oder in ein anderes Dokument !
 	    Die Position kann auch im Bereich liegen !!
     */
-	virtual bool Copy(SwPaM&, SwPosition&) const = 0;
+    virtual bool Copy(SwPaM&, SwPosition&, bool bCopyAll ) const = 0;
 
 	/** Loesche die Section, in der der Node steht.
     */


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1928
retrieving revision 1.1929
diff -u -p -r1.1928 -r1.1929
--- openoffice.org.spec	19 Aug 2009 08:20:39 -0000	1.1928
+++ openoffice.org.spec	21 Aug 2009 05:13:39 -0000	1.1929
@@ -153,6 +153,7 @@ Patch77: openoffice.org-3.1.0.ooo103651.
 Patch78: workspace.os132.patch
 Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch81: workspace.os131.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1664,6 +1665,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch78 -p0 -b .workspace.os132.patch
 %patch79 -p0 -b .ooo104306.moverecentlyused.patch
 %patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch81 -p0 -b .workspace.os131.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4171,6 +4173,8 @@ fi
 - add workspace.os132.patch to avoid switch html view overwrite horror
 - Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+- Resolves: rbhz#501141 Images and Frames disappear in sequential
+  printing
 
 * Thu Jul 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch



From dtardon at fedoraproject.org  Fri Aug 21 05:18:30 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 21 Aug 2009 05:18:30 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.os131.patch, NONE,
	1.1 openoffice.org.spec, 1.1986, 1.1987
Message-ID: <20090821051830.B541911C00D7@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27110

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.os131.patch 
Log Message:
Resolves: rbhz#501141 Images and Frames disappear in sequential printing

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  385 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |   49 ++--
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 531 insertions(+), 108 deletions(-)

--- NEW FILE workspace.os131.patch ---
Index: sw/source/filter/xml/xmltbli.cxx
===================================================================
--- sw/source/filter/xml/xmltbli.cxx	(revision 272643)
+++ sw/source/filter/xml/xmltbli.cxx	(revision 272644)
@@ -662,7 +662,7 @@
 					SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
 								   *pSrcPaM->GetMark() );
 					SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
-					pDoc->Copy( aSrcPaM, aDstPos );
+                    pDoc->Copy( aSrcPaM, aDstPos, false );
 
 					nColRepeat--;
 				}
Index: sw/source/filter/ww8/ww8glsy.cxx
===================================================================
--- sw/source/filter/ww8/ww8glsy.cxx	(revision 272643)
+++ sw/source/filter/ww8/ww8glsy.cxx	(revision 272644)
@@ -187,7 +187,7 @@
                         -1 );
                     pCNd = aIdx.GetNode().GetCntntNode();
                     SwPosition aPos( aIdx, SwIndex( pCNd, pCNd->Len() ));
-                    pD->Copy( aPam, aPos );
+                    pD->Copy( aPam, aPos, false );
                     rBlocks.PutDoc();
                 }
             }
Index: sw/source/core/frmedt/fecopy.cxx
===================================================================
--- sw/source/core/frmedt/fecopy.cxx	(revision 272643)
+++ sw/source/core/frmedt/fecopy.cxx	(revision 272644)
@@ -840,7 +840,7 @@
             {
                 SwNodeIndex aIndexBefore(rInsPos.nNode);
                 aIndexBefore--;
-                pClpDoc->Copy( rCopy, rInsPos );
+                pClpDoc->Copy( rCopy, rInsPos, false );
                 {
                     aIndexBefore++;
                     SwPaM aPaM(SwPosition(aIndexBefore, 0),
@@ -1069,7 +1069,7 @@
 
                 aIndexBefore--;
 
-                pClpDoc->Copy( aCpyPam, rInsPos );
+                pClpDoc->Copy( aCpyPam, rInsPos, false );
 
                 {
                     aIndexBefore++;
Index: sw/source/core/txtnode/atrftn.cxx
===================================================================
--- sw/source/core/txtnode/atrftn.cxx	(revision 272643)
+++ sw/source/core/txtnode/atrftn.cxx	(revision 272644)
@@ -303,7 +303,7 @@
 		SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
 		ULONG  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
 
-		pMyTxtNd->GetDoc()->CopyWithFlyInFly( aRg, aEnd, TRUE );
+        pMyTxtNd->GetDoc()->CopyWithFlyInFly( aRg, 0, aEnd, TRUE );
 
 		// Wenn die Dest-Sektion nicht leer war, so muessen die alten
 		// Nodes geloescht werden:
Index: sw/source/core/edit/edglss.cxx
===================================================================
--- sw/source/core/edit/edglss.cxx	(revision 272643)
+++ sw/source/core/edit/edglss.cxx	(revision 272644)
@@ -168,7 +168,7 @@
 			aStt = pGDoc->GetNodes().GetEndOfExtras();
 			pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
 			SwPosition aInsPos( aStt, SwIndex( pCntntNd ));
-            pMyDoc->Copy( aCpyPam, aInsPos );
+            pMyDoc->Copy( aCpyPam, aInsPos, false );
 
 			nRet = rBlock.PutDoc();
 		}
@@ -250,13 +250,13 @@
 				{
 					PCURCRSR->SetMark();
 					PCURCRSR->Move( fnMoveForward, fnGoCntnt );
-                    bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
+                    bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
 					PCURCRSR->Exchange();
 					PCURCRSR->DeleteMark();
 				}
 			}
 			else
-				bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
+                bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
 
 		FOREACHPAM_END()
         }
Index: sw/source/core/edit/eddel.cxx
===================================================================
--- sw/source/core/edit/eddel.cxx	(revision 272643)
+++ sw/source/core/edit/eddel.cxx	(revision 272644)
@@ -253,7 +253,7 @@
 			bFirstMove = FALSE;
 		}
 
-		if( !GetDoc()->Copy( *PCURCRSR, *pPos ))
+        if( !GetDoc()->Copy( *PCURCRSR, *pPos, false ))
 			continue;
 
         SwPaM aInsertPaM(*pPos, aSttNdIdx);
Index: sw/source/core/doc/docnew.cxx
===================================================================
--- sw/source/core/doc/docnew.cxx	(revision 272643)
+++ sw/source/core/doc/docnew.cxx	(revision 272644)
@@ -32,6 +32,7 @@
 #include "precompiled_sw.hxx"
 #define ROLBCK_HISTORY_ONLY 	// Der Kampf gegen die CLOOK's
 #include <doc.hxx>
+#include <dcontact.hxx>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
@@ -46,12 +47,9 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 
-#ifndef _SFXMACITEM_HXX //autogen
-	#include <svtools/macitem.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
+#include <svtools/macitem.hxx>
 #include <svx/svxids.hrc>
-#endif
+#include <svx/svdogrp.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <svtools/zforlist.hxx>
@@ -79,18 +77,12 @@
 #include <frmfmt.hxx>
 #include <rolbck.hxx>           // Undo-Attr, SwHistory
 #include <poolfmt.hxx>          // fuer die Pool-Vorlage
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <acorrect.hxx>			// fuer die autom. Aufnahme von Ausnahmen
 #include <visiturl.hxx>			// fuer die URL-Change Benachrichtigung
 #include <docary.hxx>
-#ifndef _LINEINFO_HXX
 #include <lineinfo.hxx>
-#endif
 #include <drawdoc.hxx>
 #include <linkenum.hxx>
 #include <fldupde.hxx>
@@ -105,12 +97,10 @@
 #include <istyleaccess.hxx>
 #include <swstylemanager.hxx>
 #include <IGrammarContact.hxx>
-
+#include <tblsel.hxx>
 #include <unochart.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>              // fuer den dflt - Printer in SetJob
-#endif
 
 
 // --> OD 2006-04-19 #b6375613#
@@ -1056,3 +1046,370 @@
     }
 }
 // <--
+/*-- 08.05.2009 10:07:57---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+SwDoc* SwDoc::CreateCopy() const
+{
+    SwDoc* pRet = new SwDoc;
+    //copy settings
+/*
+    //aNodes( this ),
+    //aUndoNodes( this ),
+    mpAttrPool(new SwAttrPool(this)),*/
+    USHORT __FAR_DATA aRangeOfDefaults[] = {
+        RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+        RES_CHRATR_BEGIN, RES_CHRATR_END-1,
+        RES_PARATR_BEGIN, RES_PARATR_END-1,
+        // --> OD 2008-02-25 #refactorlists##
+        RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
+        // <--
+        RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
+        0
+    };
+
+    SfxItemSet aNewDefaults( pRet->GetAttrPool(), aRangeOfDefaults );
+
+    USHORT nWhich;
+    USHORT nRange = 0;
+    while( aRangeOfDefaults[nRange] != 0)
+    {
+        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
+        {
+            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
+            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
+                aNewDefaults.Put( rSourceAttr );
+        }
+        nRange += 2;
+    }
+    if( aNewDefaults.Count() )
+        pRet->SetDefault( aNewDefaults );
+    
+    /*
+    pDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
+    pEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, pDfltFrmFmt ) ),
+    pColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, pDfltFrmFmt ) ),
+    pDfltCharFmt( new SwCharFmt( GetAttrPool(), sCharFmtStr, 0 ) ),
+    pDfltTxtFmtColl( new SwTxtFmtColl( GetAttrPool(), sTxtCollStr ) ),
+    pDfltGrfFmtColl( new SwGrfFmtColl( GetAttrPool(), sGrfCollStr ) ),
+    pFrmFmtTbl( new SwFrmFmts() ),
+    pCharFmtTbl( new SwCharFmts() ),
+    pSpzFrmFmtTbl( new SwSpzFrmFmts() ),
+    pSectionFmtTbl( new SwSectionFmts() ),
+    pTblFrmFmtTbl( new SwFrmFmts() ),
+    pTxtFmtCollTbl( new SwTxtFmtColls() ),
+    pGrfFmtCollTbl( new SwGrfFmtColls() ),
+    pBookmarkTbl( new SwBookmarks( 0, 16 ) ),
+    pTOXTypes( new SwTOXTypes() ),
+    pDefTOXBases( new SwDefTOXBase_Impl() ),
+    pLayout( 0 ),                   // Rootframe des spezifischen Layouts.
+    pDrawModel( 0 ),
+    pUndos( new SwUndos( 0, 20 ) ),
+    pUpdtFlds( new SwDocUpdtFld() ),
+    pFldTypes( new SwFldTypes() ),
+    pVirDev( 0 ),
+    pPrt( 0 ),
+    pPrtData( 0 ),
+    pGlossaryDoc( 0 ),
+    pOutlineRule( 0 ),
+    pFtnInfo( new SwFtnInfo ),
+    pEndNoteInfo( new SwEndNoteInfo ),
+    pLineNumberInfo( new SwLineNumberInfo ),
+    pFtnIdxs( new SwFtnIdxs ),
+    pDocStat( new SwDocStat ),
+    pDocShell( 0 ),
+    pDocShRef( 0 ),
+    pLinkMgr( new SvxLinkManager( 0 ) ),
+    pACEWord( 0 ),
+    pURLStateChgd( 0 ),
+    pNumberFormatter( 0 ),
+    pNumRuleTbl( new SwNumRuleTbl ),
+    // --> OD 2008-03-26 #refactorlists#
+    maLists(),
+    maListStyleLists(),
+    // <--
+    pRedlineTbl( new SwRedlineTbl ),
+    pAutoFmtRedlnComment( 0 ),
+    pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ),
+    pPgPViewPrtData( 0 ),
+    pExtInputRing( 0 ),
+    pLayouter( 0 ),
+    // --> OD 2008-03-07 #refactorlists#
+    pStyleAccess( 0 ),
+    // <--
+    pLayoutCache( 0 ),
+    pUnoCallBack(new SwUnoCallBack(0)),
+    mpGrammarContact( 0 ),
+    aChartDataProviderImplRef(),
+    pChartControllerHelper( 0 ),
+    // --> OD 2007-10-31 #i83479#
+    mpListItemsList( new tImplSortedNodeNumList() ),
+    // <--
+    nUndoPos( 0 ),
+    nUndoSavePos( 0 ),
+    nUndoCnt( 0 ),
+    nUndoSttEnd( 0 ),
+    nAutoFmtRedlnCommentNo( 0 ),
+    nLinkUpdMode( GLOBALSETTING ),
+    eFldUpdMode( AUTOUPD_GLOBALSETTING ),
+    eRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)),
+    eChrCmprType( CHARCOMPRESS_NONE ),
+    mReferenceCount(0),
+    mIdleBlockCount(0),
+    nLockExpFld( 0 ),
+    mbReadlineChecked(false),
+    mbWinEncryption(sal_False),
+    // --> OD 2005-02-11 #i38810#
+    mbLinksUpdated( sal_False ),
+    mbClipBoard( false ),
+    mbColumnSelection( false ),
+    // i#78591#
+    mbProtectForm(false),*/
+    pRet->n32DummyCompatabilityOptions1 = n32DummyCompatabilityOptions1;
+    pRet->n32DummyCompatabilityOptions2 = n32DummyCompatabilityOptions2;
+    /*
+    mbStartIdleTimer(sal_False)
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDoc::SwDoc" );
+
+    mbGlossDoc =
+    mbModified =
+    mbDtor =
+    mbUndo =
+    mbPageNums =
+    mbLoaded =
+    mbUpdateExpFld =
+    mbNewDoc =
+    mbCopyIsMove =
+    mbNoDrawUndoObj =
+    mbBrowseMode =
+    mbInReading =
+    mbInXMLImport =
+    mbUpdateTOX =
+    mbInLoadAsynchron =
+    mbHTMLMode =
+    mbInCallModified =
+    mbIsGlobalDoc =
+    mbGlblDocSaveLinks =
+    mbIsLabelDoc =
+    mbIsAutoFmtRedline =
+    mbOLEPrtNotifyPending =
+    mbAllOLENotify =
+    mbIsRedlineMove =
+    mbInsOnlyTxtGlssry =
+    mbContains_MSVBasic =
+    mbKernAsianPunctuation =
+#ifndef PRODUCT
+    mbXMLExport =
+#endif
+    // --> OD 2006-03-21 #b6375613#
+    mbApplyWorkaroundForB6375613 =
+    // <--
+                            false;
+
+    mbGroupUndo =
+    mbNewFldLst =
+    mbVisibleLinks =
+    mbPurgeOLE =
+                            true;
+
+    //
+    // COMPATIBILITY FLAGS START
+    //
+
+    // Note: Any non-hidden compatibility flag should obtain its default
+    // by asking SvtCompatibilityOptions, see below.
+    //
+    const SvtCompatibilityOptions aOptions;
+     */ 
+    pRet->mbParaSpaceMax                          = mbParaSpaceMax                          ;
+    pRet->mbParaSpaceMaxAtPages                   = mbParaSpaceMaxAtPages                   ;
+    pRet->mbTabCompat                             = mbTabCompat                             ;
+    pRet->mbUseVirtualDevice                      = mbUseVirtualDevice                      ;
+    pRet->mbAddExternalLeading                    = mbAddExternalLeading                    ;
+    pRet->mbOldLineSpacing                        = mbOldLineSpacing                        ;
+    pRet->mbAddParaSpacingToTableCells            = mbAddParaSpacingToTableCells            ;
+    pRet->mbUseFormerObjectPos                    = mbUseFormerObjectPos                    ;
+    pRet->mbUseFormerTextWrapping                 = mbUseFormerTextWrapping                 ;
+    pRet->mbConsiderWrapOnObjPos                  = mbConsiderWrapOnObjPos                  ;
+    pRet->mbAddFlyOffsets                         = mbAddFlyOffsets                         ;
+    pRet->mbOldNumbering                          = mbOldNumbering                          ;
+    pRet->mbUseHiResolutionVirtualDevice          = mbUseHiResolutionVirtualDevice          ;
+    pRet->mbIgnoreFirstLineIndentInNumbering      = mbIgnoreFirstLineIndentInNumbering      ;
+    pRet->mbDoNotJustifyLinesWithManualBreak      = mbDoNotJustifyLinesWithManualBreak      ;
+    pRet->mbDoNotResetParaAttrsForNumFont         = mbDoNotResetParaAttrsForNumFont         ;
+    pRet->mbOutlineLevelYieldsOutlineRule         = mbOutlineLevelYieldsOutlineRule         ;
+    pRet->mbTableRowKeep                          = mbTableRowKeep                          ;
+    pRet->mbIgnoreTabsAndBlanksForLineCalculation = mbIgnoreTabsAndBlanksForLineCalculation ;
+    pRet->mbDoNotCaptureDrawObjsOnPage            = mbDoNotCaptureDrawObjsOnPage            ;
+    pRet->mbClipAsCharacterAnchoredWriterFlyFrames= mbClipAsCharacterAnchoredWriterFlyFrames;
+    pRet->mbUnixForceZeroExtLeading               = mbUnixForceZeroExtLeading               ;
+    pRet->mbOldPrinterMetrics                     = mbOldPrinterMetrics                     ;
+    pRet->mbTabRelativeToIndent                   = mbTabRelativeToIndent                   ;
+    pRet->mbTabAtLeftIndentForParagraphsInList    = mbTabAtLeftIndentForParagraphsInList    ;
+                                            
+    //                                      
+    // COMPATIBILITY FLAGS END
+    //
+    /*
+    pMacroTable = new SvxMacroTableDtor;
+    
+    mpGrammarContact = ::createGrammarContact();
+
+    // Formate
+    pFrmFmtTbl->Insert(pDfltFrmFmt, 0 );
+    pCharFmtTbl->Insert(pDfltCharFmt, 0 );
+
+    // FmtColls 
+    // TXT
+    pTxtFmtCollTbl->Insert(pDfltTxtFmtColl, 0 );
+    // GRF
+    pGrfFmtCollTbl->Insert(pDfltGrfFmtColl, 0 );
+
+    // PageDesc, EmptyPageFmt und ColumnFmt anlegen
+    if ( !aPageDescs.Count() )
+        GetPageDescFromPool( RES_POOLPAGE_STANDARD );
+
+        //Leere Seite Einstellen.
+    pEmptyPageFmt->SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
+        //BodyFmt fuer Spalten Einstellen.
+    pColumnContFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
+
+    _InitFieldTypes();
+
+    // lege (fuer die Filter) eine Default-OutlineNumRule an
+    // --> OD 2008-02-11 #newlistlevelattrs#
+    pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
+                                  // --> OD 2008-06-06 #i89178#
+                                  numfunc::GetDefaultPositionAndSpaceMode(),
+                                  // <--
+                                  OUTLINE_RULE );
+    // <--
+    // #115901#
+    AddNumRule(pOutlineRule);
+    // --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
+    pOutlineRule->SetCountPhantoms( !get(IDocumentSettingAccess::OLD_NUMBERING) );
+    // <--
+
+    new SwTxtNode( SwNodeIndex( aUndoNodes.GetEndOfContent() ), pDfltTxtFmtColl );
+    new SwTxtNode( SwNodeIndex( aNodes.GetEndOfContent() ),
+                    GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+
+    // den eigenen IdleTimer setzen
+    aIdleTimer.SetTimeout( 600 );
+    aIdleTimer.SetTimeoutHdl( LINK(this, SwDoc, DoIdleJobs) );
+
+    aOLEModifiedTimer.SetTimeout( 1000 );
+    aOLEModifiedTimer.SetTimeoutHdl( LINK( this, SwDoc, DoUpdateModifiedOLE ));
+
+    // DBMgr anlegen
+    pNewDBMgr = new SwNewDBMgr;
+
+    // create TOXTypes
+    ShellResource* pShellRes = ViewShell::GetShellRes();
+
+    SwTOXType * pNew = new SwTOXType(TOX_CONTENT,   pShellRes->aTOXContentName        );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_INDEX,                 pShellRes->aTOXIndexName  );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_USER,                  pShellRes->aTOXUserName  );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_ILLUSTRATIONS,         pShellRes->aTOXIllustrationsName );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_OBJECTS,               pShellRes->aTOXObjectsName       );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_TABLES,                pShellRes->aTOXTablesName        );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+    pNew = new SwTOXType(TOX_AUTHORITIES,           pShellRes->aTOXAuthoritiesName   );
+    pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+
+    {
+        SfxItemSet aIgnorableParagraphItems( GetAttrPool(),
+                                             RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
+                                             0 );
+        pStyleAccess = createStyleManager( &aIgnorableParagraphItems );
+    }
+
+    ResetModified();
+
+*/    
+    //copy content 
+    pRet->Paste( *this );
+    return pRet;
+}
+/*-- 08.05.2009 10:52:40---------------------------------------------------
+    copy document content - code from SwFEShell::Paste( SwDoc* , BOOL  )
+  -----------------------------------------------------------------------*/
+void SwDoc::Paste( const SwDoc& rSource )
+{
+//  this has to be empty const USHORT nStartPageNumber = GetPhyPageNum();
+    // until the end of the NodesArray
+    SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 2 );
+    SwPaM aCpyPam( aSourceIdx ); //DocStart
+    SwNodeIndex aTargetIdx( GetNodes().GetEndOfExtras(), 2 );
+    SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+
+
+    aCpyPam.SetMark();
+    aCpyPam.Move( fnMoveForward, fnGoDoc );
+
+    BOOL bRet = TRUE, bDelTbl = TRUE;
+    this->StartUndo( UNDO_INSGLOSSARY, NULL );
+    this->LockExpFlds();
+
+    {
+        SwPosition& rInsPos = *aInsertPam.GetPoint();
+        //find out if the clipboard document starts with a table
+        bool bStartWithTable = 0 != aCpyPam.Start()->nNode.GetNode().FindTableNode();
+        SwPosition aInsertPosition( rInsPos );
+
+        {
+            SwNodeIndex aIndexBefore(rInsPos.nNode);
+
+            aIndexBefore--;
+
+            rSource.Copy( aCpyPam, rInsPos, true );
+
+            {
+                aIndexBefore++;
+                SwPaM aPaM(SwPosition(aIndexBefore, 0),
+                           SwPosition(rInsPos.nNode, 0));
+
+                MakeUniqueNumRules(aPaM);
+            }
+        }
+
+        //TODO: Is this necessary here? SaveTblBoxCntnt( &rInsPos );
+        if(/*bIncludingPageFrames && */bStartWithTable)
+        {
+            //remove the paragraph in front of the table
+            SwPaM aPara(aInsertPosition);
+            this->DelFullPara(aPara);
+        }
+        //additionally copy page bound frames
+        if( /*bIncludingPageFrames && */rSource.GetSpzFrmFmts()->Count() )
+        {
+            for ( USHORT i = 0; i < rSource.GetSpzFrmFmts()->Count(); ++i )
+            {
+                BOOL bInsWithFmt = TRUE;
+                const SwFrmFmt& rCpyFmt = *(*rSource.GetSpzFrmFmts())[i];
+                if( bInsWithFmt  )
+                {
+                    SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+                    if( FLY_PAGE == aAnchor.GetAnchorId() )
+                    {
+                        aAnchor.SetPageNum( aAnchor.GetPageNum() + /*nStartPageNumber - */1 );
+                    }
+                    else
+                        continue;
+                    this->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
+                }
+            }
+        }
+    }
+
+    this->EndUndo( UNDO_INSGLOSSARY, NULL );
+
+    UnlockExpFlds();
+    UpdateFlds(NULL, false);
+}
Index: sw/source/core/doc/doccomp.cxx
===================================================================
--- sw/source/core/doc/doccomp.cxx	(revision 272643)
+++ sw/source/core/doc/doccomp.cxx	(revision 272644)
@@ -1196,7 +1196,7 @@
 					SwPaM aCpyPam( rSrcNd, nStt );
 					aCpyPam.SetMark();
 					aCpyPam.GetPoint()->nContent = nSEnd;
-					aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint() );
+                    aCpyPam.GetDoc()->Copy( aCpyPam, *aPam.GetPoint(), false );
 					pDoc->DoUndo( bUndo );
 				}
 
@@ -1367,7 +1367,7 @@
 	SwNodeIndex aInsPos( *pLineNd, nOffset );
 	SwNodeIndex aSavePos( aInsPos, -1 );
 
-	((SwCompareData&)rData).rDoc.CopyWithFlyInFly( aRg, aInsPos );
+    ((SwCompareData&)rData).rDoc.CopyWithFlyInFly( aRg, 0, aInsPos );
 	rDoc.SetModified();
 	aSavePos++;
 
@@ -1624,7 +1624,7 @@
 		RedlineMode_t eOld = pDoc->GetRedlineMode();
 		pDoc->SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
 
-		pSrcRedl->GetDoc()->Copy( *(SwPaM*)pSrcRedl, *pDestRedl->GetPoint() );
+        pSrcRedl->GetDoc()->Copy( *(SwPaM*)pSrcRedl, *pDestRedl->GetPoint(), false );
 
 		pDoc->SetRedlineMode_intern( eOld );
 		pDoc->DoUndo( bUndo );
Index: sw/source/core/doc/docnum.cxx
===================================================================
--- sw/source/core/doc/docnum.cxx	(revision 272643)
+++ sw/source/core/doc/docnum.cxx	(revision 272644)
@@ -2273,7 +2273,7 @@
                 }
             }
 
-			Copy( aPam, aInsPos );
+            Copy( aPam, aInsPos, false );
 			if( bDelLastPara )
 			{
 				// dann muss der letzte leere Node wieder entfernt werden
Index: sw/source/core/doc/docredln.cxx
===================================================================
--- sw/source/core/doc/docredln.cxx	(revision 272643)
+++ sw/source/core/doc/docredln.cxx	(revision 272644)
@@ -3418,7 +3418,7 @@
 			SwNodeIndex aNdIdx( *pSttNd, 1 );
 			SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
 			SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
-			pDoc->Copy( *this, aPos );
+            pDoc->Copy( *this, aPos, false );
 
 			// JP 08.10.98: die Vorlage vom EndNode ggfs. mit uebernehmen
 			//				- ist im Doc::Copy nicht erwuenscht
@@ -3443,13 +3443,13 @@
 			if( pCEndNd )
 			{
 				SwPosition aPos( *pSttNd->EndOfSectionNode() );
-				pDoc->Copy( *this, aPos );
+                pDoc->Copy( *this, aPos, false );
 			}
 			else
 			{
 				SwNodeIndex aInsPos( *pSttNd->EndOfSectionNode() );
 				SwNodeRange aRg( pStt->nNode, 0, pEnd->nNode, 1 );
-				pDoc->CopyWithFlyInFly( aRg, aInsPos );
+                pDoc->CopyWithFlyInFly( aRg, 0, aInsPos );
 			}
 		}
 		pCntntSect = new SwNodeIndex( *pSttNd );
Index: sw/source/core/doc/docglos.cxx
===================================================================
--- sw/source/core/doc/docglos.cxx	(revision 272643)
+++ sw/source/core/doc/docglos.cxx	(revision 272644)
@@ -183,7 +183,7 @@
                 SwDontExpandItem aACD;
 				aACD.SaveDontExpandItems( rInsPos );
 
-                pGDoc->Copy( aCpyPam, rInsPos );
+                pGDoc->Copy( aCpyPam, rInsPos, false );
 
 				aACD.RestoreDontExpandItems( rInsPos );
 				if( pShell )
Index: sw/source/core/doc/tblcpy.cxx
===================================================================
--- sw/source/core/doc/tblcpy.cxx	(revision 272643)
+++ sw/source/core/doc/tblcpy.cxx	(revision 272644)
@@ -567,7 +567,7 @@
 
 	SwNodeIndex aSavePos( aInsIdx, -1 );
     if( pRg.get() )
-        pCpyDoc->CopyWithFlyInFly( *pRg, aInsIdx, FALSE );
+        pCpyDoc->CopyWithFlyInFly( *pRg, 0, aInsIdx, FALSE );
     else
 		pDoc->GetNodes().MakeTxtNode( aInsIdx, (SwTxtFmtColl*)pDoc->GetDfltTxtFmtColl() );
 	aSavePos++;
Index: sw/source/core/doc/docglbl.cxx
===================================================================
--- sw/source/core/doc/docglbl.cxx	(revision 272643)
+++ sw/source/core/doc/docglbl.cxx	(revision 272644)
@@ -307,7 +307,7 @@
 						pDoc->GetNodes().Delete( aIdx, 1 );
 
 					// alle Flys in dem Bereich
-					_CopyFlyInFly( aRg, aIdx );
+                    _CopyFlyInFly( aRg, 0, aIdx );
 
 
 					// und noch alle Bookmarks
@@ -653,7 +653,7 @@
 						pDoc->GetNodes().Delete( aIdx, 1 );
 
 					// alle Flys in dem Bereich
-					_CopyFlyInFly( aRg, aIdx );
+                    _CopyFlyInFly( aRg, 0, aIdx );
 
 
 					// und noch alle Bookmarks
Index: sw/source/core/doc/tblrwcl.cxx
===================================================================
--- sw/source/core/doc/tblrwcl.cxx	(revision 272643)
+++ sw/source/core/doc/tblrwcl.cxx	(revision 272644)
@@ -2103,7 +2103,7 @@
                             *rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
                 SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
 
-                pFromDoc->CopyWithFlyInFly( aCpyRg, aInsIdx, FALSE );
+                pFromDoc->CopyWithFlyInFly( aCpyRg, 0, aInsIdx, FALSE );
                 // den initialen TextNode loeschen
                 pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
             }
Index: sw/source/core/doc/doclay.cxx
===================================================================
--- sw/source/core/doc/doclay.cxx	(revision 272643)
+++ sw/source/core/doc/doclay.cxx	(revision 272644)
@@ -507,7 +507,7 @@
 
 		// sorge dafuer das auch Fly's in Fly's kopiert werden
 		aIdx = *pSttNd->EndOfSectionNode();
-		pSrcDoc->CopyWithFlyInFly( aRg, aIdx, sal_False, sal_True, sal_True );
+        pSrcDoc->CopyWithFlyInFly( aRg, 0, aIdx, sal_False, sal_True, sal_True );
 	}
 	else
 	{
@@ -885,7 +885,7 @@
 				do {
 					if( pTmp->HasMark() &&
 						*pTmp->GetPoint() != *pTmp->GetMark() )
-						Copy( *pTmp, aPos );
+                        Copy( *pTmp, aPos, false );
 				} while( &rPam != ( pTmp = (SwPaM*)pTmp->GetNext() ) );
 				mbCopyIsMove = bOldFlag;
 				mbUndo = bOldUndo;
Index: sw/source/core/doc/docfmt.cxx
===================================================================
--- sw/source/core/doc/docfmt.cxx	(revision 272643)
+++ sw/source/core/doc/docfmt.cxx	(revision 272644)
@@ -2126,7 +2126,7 @@
 				aTmpIdx = *pSttNd->EndOfSectionNode();
 				rSrcNds._Copy( aRg, aTmpIdx );
 				aTmpIdx = *pSttNd;
-				rSrcFmt.GetDoc()->_CopyFlyInFly( aRg, aTmpIdx );
+                rSrcFmt.GetDoc()->_CopyFlyInFly( aRg, 0, aTmpIdx );
                 pNewFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
 			}
 			else
Index: sw/source/core/undo/untblk.cxx
===================================================================
--- sw/source/core/undo/untblk.cxx	(revision 272643)
+++ sw/source/core/undo/untblk.cxx	(revision 272644)
@@ -346,7 +346,7 @@
 
 	SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
 	SetPaM( aPam );
-	aPam.GetDoc()->Copy( aPam, *rUndoIter.pAktPam->GetPoint() );
+    aPam.GetDoc()->Copy( aPam, *rUndoIter.pAktPam->GetPoint(), false );
 
 	rUndoIter.pLastUndoObj = this;
 }
Index: sw/source/core/docnode/ndcopy.cxx
===================================================================
--- sw/source/core/docnode/ndcopy.cxx	(revision 272643)
+++ sw/source/core/docnode/ndcopy.cxx	(revision 272644)
@@ -659,7 +659,7 @@
 
 // Kopieren eines Bereiches im oder in ein anderes Dokument !
 
-bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos ) const
+bool SwDoc::Copy( SwPaM& rPam, SwPosition& rPos, bool bCopyAll ) const
 {
 	const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
 
@@ -698,13 +698,13 @@
 	BOOL bRet = FALSE;
 
 	if( pDoc != this )
-        bRet = _Copy( rPam, rPos, TRUE, pRedlineRange );    // nur normales Kopieren
+        bRet = _Copy( rPam, rPos, TRUE, bCopyAll, pRedlineRange );    // nur normales Kopieren
 	// Copy in sich selbst (ueber mehrere Nodes wird hier gesondert
 	// behandelt; in einem TextNode wird normal behandelt)
 	else if( ! ( *pStt <= rPos && rPos < *pEnd &&
 			( pStt->nNode != pEnd->nNode ||
 			  !pStt->nNode.GetNode().IsTxtNode() )) )
-		bRet = _Copy( rPam, rPos, TRUE, pRedlineRange );	// nur normales Kopieren
+		bRet = _Copy( rPam, rPos, TRUE, bCopyAll, pRedlineRange );	// nur normales Kopieren
 
 	else
 	{
@@ -728,7 +728,7 @@
 		SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
 								SwNodeIndex( GetNodes().GetEndOfAutotext() ));
 		aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
-		pDoc->_Copy( rPam, *aPam.GetPoint(), FALSE );		// kopieren ohne Frames
+		pDoc->_Copy( rPam, *aPam.GetPoint(), FALSE, bCopyAll, 0 );		// kopieren ohne Frames
 
 		aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
 		aPam.SetMark();
@@ -803,7 +803,7 @@
 }
 
 BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
-					BOOL bMakeNewFrms, SwPaM* pCpyRange ) const
+					BOOL bMakeNewFrms, bool bCopyAll, SwPaM* pCpyRange ) const
 {
 	SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
     bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
@@ -1087,7 +1087,7 @@
 			}
 		}
 
-		if( aRg.aStart != aRg.aEnd )
+		if( bCopyAll || aRg.aStart != aRg.aEnd )
 		{
 			SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
             if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
@@ -1102,13 +1102,13 @@
 			if( aInsPos == pEnd->nNode )
 			{
 				SwNodeIndex aSaveIdx( aInsPos, -1 );
-				CopyWithFlyInFly( aRg, aInsPos, bMakeNewFrms, FALSE );
+                CopyWithFlyInFly( aRg, 0,aInsPos, bMakeNewFrms, FALSE );
 				aSaveIdx++;
 				pEnd->nNode = aSaveIdx;
 				pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
 			}
 			else
-				CopyWithFlyInFly( aRg, aInsPos, bMakeNewFrms, FALSE );
+                CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, bMakeNewFrms, FALSE );
 
 			bCopyBookmarks = FALSE;
 
@@ -1167,7 +1167,7 @@
 
 //  ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
 
-void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
+void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, 
 							const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
 							BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
 {
@@ -1206,7 +1206,7 @@
 	// Undo abschalten
 	BOOL bUndo = pDest->DoesUndo();
 	pDest->DoUndo( FALSE );
-	_CopyFlyInFly( rRg, aSavePos, bCopyFlyAtFly );
+	_CopyFlyInFly( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly );
 	pDest->DoUndo( bUndo );
 
 	SwNodeRange aCpyRange( aSavePos, rInsPos );
@@ -1242,7 +1242,7 @@
 	}
 }
 
-void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const SwNodeIndex& rSttIdx,
+void SwDoc::_CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex, const SwNodeIndex& rSttIdx,
 							BOOL bCopyFlyAtFly ) const
 {
 	// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
@@ -1259,7 +1259,8 @@
 		const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
 		const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
 		const SwPosition* pAPos;
-		if ( ( pAnchor->GetAnchorId() == FLY_AT_CNTNT ||
+        bool bAtCntnt = pAnchor->GetAnchorId() == FLY_AT_CNTNT;
+		if ( ( bAtCntnt ||
 			   pAnchor->GetAnchorId() == FLY_AT_FLY ||
 			   pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
 			 0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
@@ -1268,9 +1269,53 @@
 					: ( IsRedlineMove()
 							? rRg.aStart < pAPos->nNode
 							: rRg.aStart <= pAPos->nNode )) &&
-			 pAPos->nNode < rRg.aEnd )
+			 pAPos->nNode <= rRg.aEnd )
 		{
-			aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
+			//frames at the last source node are not always copied:
+            //- if the node is empty and is the last node of the document or a table cell
+            //  or a text frame then tey have to be copied
+            //- if the content index in this node is > 0 then paragph and frame bound objects are copied
+            //- to-character bound objects are copied if their index is <= nEndContentIndex
+            bool bAdd = false;
+            if( pAPos->nNode < rRg.aEnd )
+                bAdd = true;
+            if( !bAdd )
+            {
+                bool bEmptyNode = false;
+                bool bLastNode = false;
+                // is the node empty?
+                const SwNodes& rNodes = pAPos->nNode.GetNodes();
+                SwTxtNode* pTxtNode;
+                if( 0 != ( pTxtNode = pAPos->nNode.GetNode().GetTxtNode() ))
+                {
+                    bEmptyNode = !pTxtNode->GetTxt().Len();
+                    if( bEmptyNode )
+                    {
+                        //last node information is only necessary to know for the last TextNode
+                        SwNodeIndex aTmp( pAPos->nNode );
+                        ++aTmp;//goto next node
+                        while( rNodes[aTmp ]->IsEndNode() )
+                        {
+                            if( aTmp == rNodes.GetEndOfContent().GetIndex() )
+                            {
+                                bLastNode = true;
+                                break;
+                            }
+                            ++aTmp;
+                        }
+                    }
+                }
+                bAdd = bLastNode && bEmptyNode;
+                if( !bAdd )
+                {
+                    if( bAtCntnt )
+                        bAdd = nEndContentIndex > 0;
+                    else 
+                        bAdd = pAPos->nContent <= nEndContentIndex;
+                }
+            }
+            if( bAdd )                
+                aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count() ));
 		}
 	}
 
Index: sw/source/core/docnode/section.cxx
===================================================================
--- sw/source/core/docnode/section.cxx	(revision 272643)
+++ sw/source/core/docnode/section.cxx	(revision 272644)
@@ -1415,7 +1415,7 @@
 						if( pSrcDoc != pDoc ||
 							pCpyPam->Start()->nNode > rInsPos ||
 							rInsPos >= pCpyPam->End()->nNode )
-							pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint() );
+                            pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint(), false );
 						delete pCpyPam;
 					}
 					if( pCpyRg && pSrcDoc == pDoc &&
@@ -1444,7 +1444,7 @@
 
 					SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
 
-					pSrcDoc->CopyWithFlyInFly( *pCpyRg, rInsPos, bCreateFrm );
+                    pSrcDoc->CopyWithFlyInFly( *pCpyRg, 0, rInsPos, bCreateFrm );
 					aSave++;
 
 					if( !bCreateFrm )
Index: sw/source/ui/dbui/dbmgr.cxx
===================================================================
--- sw/source/ui/dbui/dbmgr.cxx	(revision 272643)
+++ sw/source/ui/dbui/dbmgr.cxx	(revision 272644)
@@ -35,7 +35,9 @@
 #endif
 
 #include <stdio.h>
-
+#ifdef SW_COPY_DOC_IN_MEMORY
+#include <unotxdoc.hxx>
+#endif
 #include <com/sun/star/text/NotePrintMode.hpp>
 #include <sfx2/app.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -43,17 +45,13 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#ifndef _COM_SUN_STAR_UTIL_iXNUMBERFORMATTER_HPP_
 #include <com/sun/star/util/XNumberFormatter.hpp>
-#endif
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/XCompletedExecution.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_
 #include <com/sun/star/text/MailMergeEvent.hpp>
-#endif
 #include <com/sun/star/frame/XStorable.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
@@ -65,9 +63,7 @@
 #include <dbconfig.hxx>
 #include <swdbtoolsclient.hxx>
 #include <pagedesc.hxx>
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <unotools/tempfile.hxx>
 #include <svtools/pathoptions.hxx>
 #include <svtools/urihelper.hxx>
@@ -86,39 +82,25 @@
 #include <goodies/mailenum.hxx>
 #include <cmdid.h>
 #include <swmodule.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <edtwin.hxx>
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
 #include <initui.hxx>
 #include <swundo.hxx>
 #include <flddat.hxx>
-#ifndef _MODCFG_HXX
 #include <modcfg.hxx>
-#endif
 #include <swprtopt.hxx>
 #include <shellio.hxx>
 #include <dbui.hxx>
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <doc.hxx>
 #include <swwait.hxx>
 #include <swunohelper.hxx>
-#ifndef _DBUI_HRC
 #include <dbui.hrc>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _STATSTR_HRC
 #include <statstr.hrc>
-#endif
 #include <mmconfigitem.hxx>
 #include <sfx2/request.hxx>
 #include <hintids.hxx>
@@ -3182,7 +3164,10 @@
 
     SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
     BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
     String sSourceDocURL;
+#endif
     //save the settings of the first
     rSourceShell.SttEndDoc(TRUE);
     USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
@@ -3192,6 +3177,8 @@
 
     try
     {
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
         // save the working document into a temporary location
         sSourceDocURL = URIHelper::SmartRel2Abs(
             INetURLObject(), utl::TempFile::CreateTempName(),
@@ -3207,7 +3194,7 @@
         pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
         uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
         xStore->storeToURL( sSourceDocURL, aValues );
-
+#endif
         // create a target docshell to put the merged document into
         SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
         xTargetDocShell->DoInitNew( 0 );
@@ -3256,6 +3243,15 @@
                     Application::Reschedule();
             }
 
+#ifdef SW_COPY_DOC_IN_MEMORY
+            // copy the source document
+            uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+            uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY); 
+            SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
+            //create a ViewFrame
+            SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
+            SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
+#else
             // create a new docshell from the temporary document
             SfxBoolItem aHidden( SID_HIDDEN, TRUE );
             SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
@@ -3265,9 +3261,13 @@
                             rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
                                     &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
             if(pReturnValue)
+#endif
             {
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else                
                 SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
                 SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+#endif
                 SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
                 pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
 
@@ -3387,8 +3387,11 @@
     {
         DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
     }
+#ifdef SW_COPY_DOC_IN_MEMORY
+#else
     if(sSourceDocURL.Len())
         File::remove( sSourceDocURL );
+#endif
     DELETEZ(pImpl->pMergeData);
     bInMerge = FALSE;
     return nRet;
Index: sw/source/ui/uno/unoatxt.cxx
===================================================================
--- sw/source/ui/uno/unoatxt.cxx	(revision 272643)
+++ sw/source/ui/uno/unoatxt.cxx	(revision 272644)
@@ -417,7 +417,7 @@
 		if(pxCursor)
 		{
 			SwPaM* pUnoCrsr = pxCursor->GetPaM();
-            bRet |= (true == pxCursor->GetDoc()->Copy( *pUnoCrsr, aPos ));
+            bRet |= (true == pxCursor->GetDoc()->Copy( *pUnoCrsr, aPos, false ));
 		}
 		else
 		{
@@ -425,7 +425,7 @@
             if(pBkm && pBkm->GetOtherBookmarkPos())
 			{
                 SwPaM aTmp(*pBkm->GetOtherBookmarkPos(), pBkm->GetBookmarkPos());
-                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos));
+                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos, false));
 			}
 		}
 	}
Index: sw/source/ui/uno/unotxdoc.cxx
===================================================================
--- sw/source/ui/uno/unotxdoc.cxx	(revision 272643)
+++ sw/source/ui/uno/unotxdoc.cxx	(revision 272644)
@@ -37,16 +37,12 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <wdocsh.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <pview.hxx>
-#ifndef _SRCVIEW_HXX
 #include <srcview.hxx>
-#endif
 #include <viewsh.hxx>
 #include <pvprtdat.hxx>
 #include <swprtopt.hxx>
@@ -84,9 +80,7 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <com/sun/star/document/RedlineDisplayType.hpp>
 #include <svx/linkmgr.hxx>
 #include <svx/unofill.hxx>
@@ -94,13 +88,9 @@
 #include <sfx2/progress.hxx>
 #include <swmodule.hxx>
 #include <docstat.hxx>
-#ifndef _MODOPT_HXX //
 #include <modcfg.hxx>
-#endif
 #include <ndtxt.hxx>
-#ifndef _UTLUI_HRC
 #include <utlui.hrc>
-#endif
 #include <swcont.hxx>
 #include <unodefaults.hxx>
 #include <SwXDocumentSettings.hxx>
@@ -2856,7 +2846,27 @@
 {
     return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
 }
+/*-- 07.05.2009 09:21:12---------------------------------------------------
 
+  -----------------------------------------------------------------------*/
+uno::Reference< util::XCloneable > SwXTextDocument::createClone(  ) throw (uno::RuntimeException)
+{
+    ::vos::OGuard aGuard(Application::GetSolarMutex());
+    if(!IsValid())
+        throw RuntimeException();
+    //create a new document - hidden - copy the storage and return it
+    SwDoc* pCopyDoc = pDocShell->GetDoc()->CreateCopy();
+    SfxObjectShell* pShell = new SwDocShell( pCopyDoc, SFX_CREATE_MODE_STANDARD );
+    pShell->DoInitNew();
+    
+    uno::Reference< embed::XStorage > xSourceStorage = getDocumentStorage();
+    uno::Reference< frame::XModel > xNewModel = pShell->GetModel();
+    //copy this storage
+    uno::Reference< document::XStorageBasedDocument > xStorageDoc( xNewModel, uno::UNO_QUERY );
+    uno::Reference< embed::XStorage > xNewStorage = xStorageDoc->getDocumentStorage();
+    xSourceStorage->copyToStorage( xNewStorage );
+    return uno::Reference< util::XCloneable >( xNewModel, UNO_QUERY );
+}
 /* -----------------------------20.06.00 09:54--------------------------------
 
  ---------------------------------------------------------------------------*/
Index: sw/inc/doc.hxx
===================================================================
--- sw/inc/doc.hxx	(revision 272643)
+++ sw/inc/doc.hxx	(revision 272644)
@@ -636,7 +636,7 @@
 		// Kopieren eines Bereiches im oder in ein anderes Dokument !
 		// Die Position darf nicht im Bereich liegen !!
 	sal_Bool _Copy( SwPaM&, SwPosition&,
-				sal_Bool MakeNewFrms = sal_True, SwPaM* pCpyRng = 0 ) const;	// in ndcopy.cxx
+				sal_Bool MakeNewFrms /*= sal_True*/, bool bCopyAll, SwPaM* pCpyRng /*= 0*/ ) const;	// in ndcopy.cxx
 
 	SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
 								const SwCntntNode& rNode, RndStdIds eRequestId,
@@ -648,7 +648,8 @@
 								const SfxItemSet* pGrfAttrSet,
 								SwFrmFmt* = 0 );
 
-	void _CopyFlyInFly( const SwNodeRange& rRg, const SwNodeIndex& rSttIdx,
+    void _CopyFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndContentIndex,
+                        const SwNodeIndex& rSttIdx,
 						sal_Bool bCopyFlyAtFly = sal_False ) const;	// steht im ndcopy.cxx
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
 
@@ -720,6 +721,7 @@
      SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
      SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
 
+     void   Paste( const SwDoc& );
 public:
 
     /** Life cycle
@@ -915,7 +917,7 @@
 
     /** IDocumentContentOperations
     */
-    virtual bool Copy(SwPaM&, SwPosition&) const;
+    virtual bool Copy(SwPaM&, SwPosition&, bool bCopyAll) const;
 	virtual void DeleteSection(SwNode* pNode);
 	virtual bool Delete(SwPaM&);
 	virtual bool DelFullPara(SwPaM&);
@@ -1118,6 +1120,7 @@
 								SwFrmFmt *pParent = 0 );
 
 	void CopyWithFlyInFly( const SwNodeRange& rRg,
+                            const xub_StrLen nEndContentIndex,
 							const SwNodeIndex& rInsPos,
 							sal_Bool bMakeNewFrms = sal_True,
 							sal_Bool bDelRedlines = sal_True,
@@ -2117,6 +2120,7 @@
 	{
 		return n32DummyCompatabilityOptions2;
 	}
+    SwDoc* CreateCopy() const;
 };
 
 
Index: sw/inc/unotxdoc.hxx
===================================================================
--- sw/inc/unotxdoc.hxx	(revision 272643)
+++ sw/inc/unotxdoc.hxx	(revision 272644)
@@ -68,9 +68,8 @@
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
-#ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTLANGUAGES_HPP
 #include <com/sun/star/document/XDocumentLanguages.hpp>
-#endif
+#include <com/sun/star/util/XCloneable.hpp>
 #include <svtools/itemprop.hxx>
 #include <svx/fmdmod.hxx>
 #include <svx/UnoForbiddenCharsTable.hxx>
@@ -79,22 +78,22 @@
 #include <cppuhelper/implbase4.hxx>	// helper for implementations
 #include <RefreshListenerContainer.hxx>
 
-#define __IFC31 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
-Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31
+#define __IFC32 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
+Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31, Ifc32
 
-#define __CLASS_IFC31 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
+#define __CLASS_IFC32 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
 class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13, class Ifc14, class Ifc15, class Ifc16, \
 class Ifc17, class Ifc18, class Ifc19, class Ifc20, class Ifc21, class Ifc22, class Ifc23, class Ifc24,\
-class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31
+class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31 , class Ifc32
 
-#define __PUBLIC_IFC31 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
+#define __PUBLIC_IFC32 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
 public Ifc13, public Ifc14, public Ifc15, public Ifc16, public Ifc17, public Ifc18, \
 public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23, public Ifc24, \
 public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc30, \
-public Ifc31
+public Ifc31, public Ifc32
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
-#define __IFC_EX_TYPE_INIT31( class_cast ) \
+#define __IFC_EX_TYPE_INIT32( class_cast ) \
     __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \
     __IFC_EX_TYPE_INIT( class_cast, 3 ), __IFC_EX_TYPE_INIT( class_cast, 4 ), \
     __IFC_EX_TYPE_INIT( class_cast, 5 ), __IFC_EX_TYPE_INIT( class_cast, 6 ), \
@@ -110,10 +109,10 @@
     __IFC_EX_TYPE_INIT( class_cast, 25 ), __IFC_EX_TYPE_INIT( class_cast, 26 ), \
     __IFC_EX_TYPE_INIT( class_cast, 27 ), __IFC_EX_TYPE_INIT( class_cast, 28 ), \
     __IFC_EX_TYPE_INIT( class_cast, 29 ), __IFC_EX_TYPE_INIT( class_cast, 30 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 31)
+    __IFC_EX_TYPE_INIT( class_cast, 31 ), __IFC_EX_TYPE_INIT( class_cast, 32)
 #include <cppuhelper/implbase_ex_post.hxx>
 
-__DEF_IMPLHELPER_EX( 31 )
+__DEF_IMPLHELPER_EX( 32 )
 
 class SwDoc;
 class SwDocShell;
@@ -132,7 +131,7 @@
  ******************************************************************************/
 
 
-typedef cppu::WeakImplHelper31
+typedef cppu::WeakImplHelper32
 <
 	::com::sun::star::text::XTextDocument,
 	::com::sun::star::text::XLineNumberingProperties,
@@ -164,7 +163,8 @@
     ::com::sun::star::view::XRenderable,
     ::com::sun::star::xforms::XFormsSupplier,
     ::com::sun::star::text::XFlatParagraphIteratorProvider,
-	::com::sun::star::document::XDocumentLanguages
+    ::com::sun::star::document::XDocumentLanguages,
+    ::com::sun::star::util::XCloneable
 >
 SwXTextDocumentBaseClass;
 
@@ -402,7 +402,11 @@
     // ::com::sun::star::text::XFlatParagraphIteratorProvider:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException);
 
-	//
+    // ::com::sun::star::util::XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+    
+    
+    //
 	void						Invalidate();
 	void						Reactivate(SwDocShell* pNewDocShell);
 	SwXDocumentPropertyHelper * GetPropertyHelper ();
Index: sw/inc/IDocumentContentOperations.hxx
===================================================================
--- sw/inc/IDocumentContentOperations.hxx	(revision 272643)
+++ sw/inc/IDocumentContentOperations.hxx	(revision 272644)
@@ -71,7 +71,7 @@
     /** Kopieren eines Bereiches im oder in ein anderes Dokument !
 	    Die Position kann auch im Bereich liegen !!
     */
-	virtual bool Copy(SwPaM&, SwPosition&) const = 0;
+    virtual bool Copy(SwPaM&, SwPosition&, bool bCopyAll ) const = 0;
 
 	/** Loesche die Section, in der der Node steht.
     */


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1986
retrieving revision 1.1987
diff -u -p -r1.1986 -r1.1987
--- openoffice.org.spec	20 Aug 2009 19:30:25 -0000	1.1986
+++ openoffice.org.spec	21 Aug 2009 05:18:30 -0000	1.1987
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%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}
@@ -156,6 +156,7 @@ Patch78: openoffice.org-3.1.1.oooXXXXX.d
 Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 Patch80: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch82: workspace.os131.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1697,6 +1698,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
 %patch80 -p0 -b .ooo104306.moverecentlyused.patch
 %patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch82 -p0 -b .workspace.os131.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4206,6 +4208,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Aug 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
+- Resolves: rbhz#501141 Images and Frames disappear in sequential
+  printing
+
 * Thu Aug 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
 - latest milestone
 - Related: rhbz#517822 add hyphen-mr depend



From nb at fedoraproject.org  Fri Aug 21 05:20:21 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 05:20:21 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 znc.spec, 1.12,
	1.13
Message-ID: <20090821052021.B862611C0417@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27429/devel

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Update to latest SVN 1608



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Aug 2009 04:25:13 -0000	1.8
+++ .cvsignore	21 Aug 2009 05:20:21 -0000	1.9
@@ -1 +1 @@
-znc-0.075.20090818svn1602.tar.bz2
+znc-0.075.svn1608.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Aug 2009 04:25:13 -0000	1.8
+++ sources	21 Aug 2009 05:20:21 -0000	1.9
@@ -1 +1 @@
-43899b05816ce74bb9da8e4e82480e15  znc-0.075.20090818svn1602.tar.bz2
+61546bb28c7d325259346ebe59b41f42  znc-0.075.svn1608.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- znc.spec	19 Aug 2009 04:25:14 -0000	1.12
+++ znc.spec	21 Aug 2009 05:20:21 -0000	1.13
@@ -1,12 +1,12 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        4.20090818svn1602%{?dist}
+Release:        5.svn1608%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1602 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.20090818svn1602.tar.bz2 
+# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1608.tar.bz2 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -33,6 +33,14 @@ BuildRequires: pkgconfig
 All includes and program files you need to compile your own znc
 modules.
 
+%package extra
+Summary:       Extra modules for ZNC
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description extra
+Extra modules for ZNC
+
 %prep
 %setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
@@ -41,7 +49,7 @@ modules.
 %build
 %configure \
      --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-sasl
+     --enable-ipv6 --enable-sasl --enable-extra
 %__make %{?_smp_mflags}
 
 %install
@@ -56,7 +64,41 @@ modules.
 %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
 %{_bindir}/znc
 %{_mandir}/man1/*
-%{_libdir}/znc/
+#%{_libdir}/znc/
+%{_libdir}/znc/admin.so
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_libdir}/znc/autoreply.so
+%{_libdir}/znc/away.so
+%{_libdir}/znc/awaynick.so
+%{_libdir}/znc/buffextras.so
+%{_libdir}/znc/chansaver.so
+%{_libdir}/znc/crypt.so
+%{_libdir}/znc/email.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/fixfreenode.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/keepnick.so
+%{_libdir}/znc/kickrejoin.so
+%{_libdir}/znc/modperl.pm
+%{_libdir}/znc/modperl.so
+%{_libdir}/znc/nickserv.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.so
+%{_libdir}/znc/saslauth.so
+%{_libdir}/znc/savebuff.so
+%{_libdir}/znc/schat.so
+%{_libdir}/znc/shell.so
+%{_libdir}/znc/simple_away.so
+%{_libdir}/znc/stickychan.so
+%{_libdir}/znc/watch.so
+%{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
 
 %files devel
@@ -66,7 +108,27 @@ modules.
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/znc/
 
+%files extra
+%defattr(-,root,root)
+%{_libdir}/znc/antiidle.so
+%{_libdir}/znc/autovoice.so
+%{_libdir}/znc/blockuser.so
+%{_libdir}/znc/connect_throttle.so
+%{_libdir}/znc/ctcpflood.so
+%{_libdir}/znc/discon_kick.so
+%{_libdir}/znc/droproot.so
+%{_libdir}/znc/fakeonline.so
+%{_libdir}/znc/lastseen.so
+%{_libdir}/znc/listsockets.so
+%{_libdir}/znc/log.so
+%{_libdir}/znc/motdfile.so
+%{_libdir}/znc/notify_connect.so
+%{_libdir}/znc/send_raw.so
+
 %changelog
+* Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
+- Upgrade to svn 1608
+
 * Tue Aug 18 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-4.20090818svn1602
 - Upgrade to svn 1602
 



From nb at fedoraproject.org  Fri Aug 21 05:20:21 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 05:20:21 +0000 (UTC)
Subject: rpms/znc/EL-4 znc.spec,1.7,1.8
Message-ID: <20090821052021.8228011C0417@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27429/EL-4

Modified Files:
	znc.spec 
Log Message:
Update to latest SVN 1608



Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/znc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- znc.spec	27 Jul 2009 09:04:26 -0000	1.7
+++ znc.spec	21 Aug 2009 05:20:21 -0000	1.8
@@ -65,9 +65,8 @@ modules.
 %{_includedir}/znc/
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
+* Mon Aug 3 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-2
+- Bump release to fix failed push
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3



From nb at fedoraproject.org  Fri Aug 21 05:23:31 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 05:23:31 +0000 (UTC)
Subject: rpms/znc/devel sources,1.9,1.10
Message-ID: <20090821052331.A69F711C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28035

Modified Files:
	sources 
Log Message:
Update to tarball from svn export instead of svn checkout



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Aug 2009 05:20:21 -0000	1.9
+++ sources	21 Aug 2009 05:23:31 -0000	1.10
@@ -1 +1 @@
-61546bb28c7d325259346ebe59b41f42  znc-0.075.svn1608.tar.bz2
+9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2



From nb at fedoraproject.org  Fri Aug 21 05:54:28 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 05:54:28 +0000 (UTC)
Subject: rpms/znc/F-11 .cvsignore,1.4,1.5 sources,1.4,1.5 znc.spec,1.5,1.6
Message-ID: <20090821055428.E68DE11C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1984

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Update to SVN 1608



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jul 2009 18:17:00 -0000	1.4
+++ .cvsignore	21 Aug 2009 05:54:26 -0000	1.5
@@ -1 +1 @@
-znc-0.074.tar.gz
+znc-0.075.svn1608.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jul 2009 18:17:00 -0000	1.4
+++ sources	21 Aug 2009 05:54:26 -0000	1.5
@@ -1 +1 @@
-378187acd114769f8f97ef2d4b19da25  znc-0.074.tar.gz
+9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/znc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- znc.spec	23 Jul 2009 18:17:00 -0000	1.5
+++ znc.spec	21 Aug 2009 05:54:26 -0000	1.6
@@ -1,11 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.074
-Release:        1%{?dist}
+Version:        0.075
+Release:        5.svn1608%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
+# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1608.tar.bz2 
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
 BuildRequires:  openssl-devel >= 0.9.8
@@ -31,6 +33,14 @@ BuildRequires: pkgconfig
 All includes and program files you need to compile your own znc
 modules.
 
+%package extra
+Summary:       Extra modules for ZNC
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description extra
+Extra modules for ZNC
+
 %prep
 %setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
@@ -39,7 +49,7 @@ modules.
 %build
 %configure \
      --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-sasl
+     --enable-ipv6 --enable-sasl --enable-extra
 %__make %{?_smp_mflags}
 
 %install
@@ -54,7 +64,41 @@ modules.
 %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
 %{_bindir}/znc
 %{_mandir}/man1/*
-%{_libdir}/znc/
+#%{_libdir}/znc/
+%{_libdir}/znc/admin.so
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_libdir}/znc/autoreply.so
+%{_libdir}/znc/away.so
+%{_libdir}/znc/awaynick.so
+%{_libdir}/znc/buffextras.so
+%{_libdir}/znc/chansaver.so
+%{_libdir}/znc/crypt.so
+%{_libdir}/znc/email.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/fixfreenode.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/keepnick.so
+%{_libdir}/znc/kickrejoin.so
+%{_libdir}/znc/modperl.pm
+%{_libdir}/znc/modperl.so
+%{_libdir}/znc/nickserv.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.so
+%{_libdir}/znc/saslauth.so
+%{_libdir}/znc/savebuff.so
+%{_libdir}/znc/schat.so
+%{_libdir}/znc/shell.so
+%{_libdir}/znc/simple_away.so
+%{_libdir}/znc/stickychan.so
+%{_libdir}/znc/watch.so
+%{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
 
 %files devel
@@ -64,27 +108,72 @@ modules.
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/znc/
 
+%files extra
+%defattr(-,root,root)
+%{_libdir}/znc/antiidle.so
+%{_libdir}/znc/autovoice.so
+%{_libdir}/znc/blockuser.so
+%{_libdir}/znc/connect_throttle.so
+%{_libdir}/znc/ctcpflood.so
+%{_libdir}/znc/discon_kick.so
+%{_libdir}/znc/droproot.so
+%{_libdir}/znc/fakeonline.so
+%{_libdir}/znc/lastseen.so
+%{_libdir}/znc/listsockets.so
+%{_libdir}/znc/log.so
+%{_libdir}/znc/motdfile.so
+%{_libdir}/znc/notify_connect.so
+%{_libdir}/znc/send_raw.so
+
 %changelog
+* Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
+- Upgrade to svn 1608
+
+* Tue Aug 18 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-4.20090818svn1602
+- Upgrade to svn 1602
+
+* Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-3.20090807svn1594
+- Fix source filename
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-2.20090807svn1594
+- Fix broken source tarball
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807svn1594
+- Upgrade to svn 1594
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
 - Fix date in changelog, disable c-ares
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
 - Backport patch to fix webadmin skins issue introduced in 0.072
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152
+
 * Sun Jul 12 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-7
 - Fix License: to be GPLv2 with exceptions
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-6
 - Fix permissions error in %%prep, not in source
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-5
 - Fix permissions error on q.cpp and add LICENSE.OpenSSL
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-4
 - Remove switch to enable debug, fix %%files section
+
 * Fri Jul 10 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-3
 - Move fixfreenode and log into separate znc-extra package
 - Move awayping into separate znc-awayping package
+
 * Thu Jul 9 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-2
 - Include modules with main package
+
 * Wed Jul 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-1
 - Initial Fedora package based on 0.070 of upstream



From nb at fedoraproject.org  Fri Aug 21 05:55:23 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 05:55:23 +0000 (UTC)
Subject: rpms/znc/F-10 .cvsignore,1.4,1.5 sources,1.4,1.5 znc.spec,1.5,1.6
Message-ID: <20090821055523.6EC0C11C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2244

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Update to SVN 1608



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jul 2009 18:15:35 -0000	1.4
+++ .cvsignore	21 Aug 2009 05:55:23 -0000	1.5
@@ -1 +1 @@
-znc-0.074.tar.gz
+znc-0.075.svn1608.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jul 2009 18:15:35 -0000	1.4
+++ sources	21 Aug 2009 05:55:23 -0000	1.5
@@ -1 +1 @@
-378187acd114769f8f97ef2d4b19da25  znc-0.074.tar.gz
+9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/znc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- znc.spec	23 Jul 2009 18:15:35 -0000	1.5
+++ znc.spec	21 Aug 2009 05:55:23 -0000	1.6
@@ -1,11 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.074
-Release:        1%{?dist}
+Version:        0.075
+Release:        5.svn1608%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
+# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1608.tar.bz2 
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
 BuildRequires:  openssl-devel >= 0.9.8
@@ -31,6 +33,14 @@ BuildRequires: pkgconfig
 All includes and program files you need to compile your own znc
 modules.
 
+%package extra
+Summary:       Extra modules for ZNC
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description extra
+Extra modules for ZNC
+
 %prep
 %setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
@@ -39,7 +49,7 @@ modules.
 %build
 %configure \
      --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-sasl
+     --enable-ipv6 --enable-sasl --enable-extra
 %__make %{?_smp_mflags}
 
 %install
@@ -54,7 +64,41 @@ modules.
 %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
 %{_bindir}/znc
 %{_mandir}/man1/*
-%{_libdir}/znc/
+#%{_libdir}/znc/
+%{_libdir}/znc/admin.so
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_libdir}/znc/autoreply.so
+%{_libdir}/znc/away.so
+%{_libdir}/znc/awaynick.so
+%{_libdir}/znc/buffextras.so
+%{_libdir}/znc/chansaver.so
+%{_libdir}/znc/crypt.so
+%{_libdir}/znc/email.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/fixfreenode.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/keepnick.so
+%{_libdir}/znc/kickrejoin.so
+%{_libdir}/znc/modperl.pm
+%{_libdir}/znc/modperl.so
+%{_libdir}/znc/nickserv.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.so
+%{_libdir}/znc/saslauth.so
+%{_libdir}/znc/savebuff.so
+%{_libdir}/znc/schat.so
+%{_libdir}/znc/shell.so
+%{_libdir}/znc/simple_away.so
+%{_libdir}/znc/stickychan.so
+%{_libdir}/znc/watch.so
+%{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
 
 %files devel
@@ -64,27 +108,72 @@ modules.
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/znc/
 
+%files extra
+%defattr(-,root,root)
+%{_libdir}/znc/antiidle.so
+%{_libdir}/znc/autovoice.so
+%{_libdir}/znc/blockuser.so
+%{_libdir}/znc/connect_throttle.so
+%{_libdir}/znc/ctcpflood.so
+%{_libdir}/znc/discon_kick.so
+%{_libdir}/znc/droproot.so
+%{_libdir}/znc/fakeonline.so
+%{_libdir}/znc/lastseen.so
+%{_libdir}/znc/listsockets.so
+%{_libdir}/znc/log.so
+%{_libdir}/znc/motdfile.so
+%{_libdir}/znc/notify_connect.so
+%{_libdir}/znc/send_raw.so
+
 %changelog
+* Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
+- Upgrade to svn 1608
+
+* Tue Aug 18 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-4.20090818svn1602
+- Upgrade to svn 1602
+
+* Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-3.20090807svn1594
+- Fix source filename
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-2.20090807svn1594
+- Fix broken source tarball
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807svn1594
+- Upgrade to svn 1594
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
 - Fix date in changelog, disable c-ares
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
 - Backport patch to fix webadmin skins issue introduced in 0.072
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152
+
 * Sun Jul 12 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-7
 - Fix License: to be GPLv2 with exceptions
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-6
 - Fix permissions error in %%prep, not in source
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-5
 - Fix permissions error on q.cpp and add LICENSE.OpenSSL
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-4
 - Remove switch to enable debug, fix %%files section
+
 * Fri Jul 10 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-3
 - Move fixfreenode and log into separate znc-extra package
 - Move awayping into separate znc-awayping package
+
 * Thu Jul 9 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-2
 - Include modules with main package
+
 * Wed Jul 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-1
 - Initial Fedora package based on 0.070 of upstream



From nb at fedoraproject.org  Fri Aug 21 05:56:05 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 05:56:05 +0000 (UTC)
Subject: rpms/znc/EL-5 .cvsignore,1.4,1.5 sources,1.4,1.5 znc.spec,1.6,1.7
Message-ID: <20090821055606.016AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2449

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Update to SVN 1608



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jul 2009 18:12:46 -0000	1.4
+++ .cvsignore	21 Aug 2009 05:56:05 -0000	1.5
@@ -1 +1 @@
-znc-0.074.tar.gz
+znc-0.075.svn1608.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jul 2009 18:12:46 -0000	1.4
+++ sources	21 Aug 2009 05:56:05 -0000	1.5
@@ -1 +1 @@
-378187acd114769f8f97ef2d4b19da25  znc-0.074.tar.gz
+9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- znc.spec	3 Aug 2009 16:59:27 -0000	1.6
+++ znc.spec	21 Aug 2009 05:56:05 -0000	1.7
@@ -1,11 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.074
-Release:        2%{?dist}
+Version:        0.075
+Release:        5.svn1608%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
+# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1608.tar.bz2 
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
 BuildRequires:  openssl-devel >= 0.9.8
@@ -31,6 +33,14 @@ BuildRequires: pkgconfig
 All includes and program files you need to compile your own znc
 modules.
 
+%package extra
+Summary:       Extra modules for ZNC
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description extra
+Extra modules for ZNC
+
 %prep
 %setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
@@ -39,7 +49,7 @@ modules.
 %build
 %configure \
      --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-sasl
+     --enable-ipv6 --enable-sasl --enable-extra
 %__make %{?_smp_mflags}
 
 %install
@@ -54,7 +64,41 @@ modules.
 %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
 %{_bindir}/znc
 %{_mandir}/man1/*
-%{_libdir}/znc/
+#%{_libdir}/znc/
+%{_libdir}/znc/admin.so
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_libdir}/znc/autoreply.so
+%{_libdir}/znc/away.so
+%{_libdir}/znc/awaynick.so
+%{_libdir}/znc/buffextras.so
+%{_libdir}/znc/chansaver.so
+%{_libdir}/znc/crypt.so
+%{_libdir}/znc/email.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/fixfreenode.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/keepnick.so
+%{_libdir}/znc/kickrejoin.so
+%{_libdir}/znc/modperl.pm
+%{_libdir}/znc/modperl.so
+%{_libdir}/znc/nickserv.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.so
+%{_libdir}/znc/saslauth.so
+%{_libdir}/znc/savebuff.so
+%{_libdir}/znc/schat.so
+%{_libdir}/znc/shell.so
+%{_libdir}/znc/simple_away.so
+%{_libdir}/znc/stickychan.so
+%{_libdir}/znc/watch.so
+%{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
 
 %files devel
@@ -64,29 +108,72 @@ modules.
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/znc/
 
+%files extra
+%defattr(-,root,root)
+%{_libdir}/znc/antiidle.so
+%{_libdir}/znc/autovoice.so
+%{_libdir}/znc/blockuser.so
+%{_libdir}/znc/connect_throttle.so
+%{_libdir}/znc/ctcpflood.so
+%{_libdir}/znc/discon_kick.so
+%{_libdir}/znc/droproot.so
+%{_libdir}/znc/fakeonline.so
+%{_libdir}/znc/lastseen.so
+%{_libdir}/znc/listsockets.so
+%{_libdir}/znc/log.so
+%{_libdir}/znc/motdfile.so
+%{_libdir}/znc/notify_connect.so
+%{_libdir}/znc/send_raw.so
+
 %changelog
-* Mon Aug 3 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-2
-- Bump release to fix failed push
+* Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
+- Upgrade to svn 1608
+
+* Tue Aug 18 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-4.20090818svn1602
+- Upgrade to svn 1602
+
+* Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-3.20090807svn1594
+- Fix source filename
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-2.20090807svn1594
+- Fix broken source tarball
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807svn1594
+- Upgrade to svn 1594
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
 - Fix date in changelog, disable c-ares
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
 - Backport patch to fix webadmin skins issue introduced in 0.072
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152
+
 * Sun Jul 12 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-7
 - Fix License: to be GPLv2 with exceptions
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-6
 - Fix permissions error in %%prep, not in source
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-5
 - Fix permissions error on q.cpp and add LICENSE.OpenSSL
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-4
 - Remove switch to enable debug, fix %%files section
+
 * Fri Jul 10 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-3
 - Move fixfreenode and log into separate znc-extra package
 - Move awayping into separate znc-awayping package
+
 * Thu Jul 9 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-2
 - Include modules with main package
+
 * Wed Jul 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-1
 - Initial Fedora package based on 0.070 of upstream



From nb at fedoraproject.org  Fri Aug 21 06:01:59 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:01:59 +0000 (UTC)
Subject: rpms/znc-extra Makefile,1.1,NONE
Message-ID: <20090821060159.A59B111C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864

Removed Files:
	Makefile 
Log Message:
znc-extra is now a subpackage of znc



--- Makefile DELETED ---



From nb at fedoraproject.org  Fri Aug 21 06:02:00 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:02:00 +0000 (UTC)
Subject: rpms/znc-extra/EL-4 dead.package, NONE, 1.1 .cvsignore, 1.1,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.1, NONE
Message-ID: <20090821060200.D6C0711C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864/EL-4

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch sources 
Log Message:
znc-extra is now a subpackage of znc



--- NEW FILE dead.package ---
znc-extra is now a subpackage of znc


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---



From nb at fedoraproject.org  Fri Aug 21 06:02:01 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:02:01 +0000 (UTC)
Subject: rpms/znc-extra/EL-5 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.2,
	NONE znc-extra.spec, 1.1, NONE
Message-ID: <20090821060201.8C3CD11C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864/EL-5

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch sources znc-extra.spec 
Log Message:
znc-extra is now a subpackage of znc



--- NEW FILE dead.package ---
znc-extra is now a subpackage of znc


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- znc-extra.spec DELETED ---



From nb at fedoraproject.org  Fri Aug 21 06:02:02 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:02:02 +0000 (UTC)
Subject: rpms/znc-extra/F-11 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.2,
	NONE znc-extra.spec, 1.1, NONE
Message-ID: <20090821060202.EFFD111C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864/F-11

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch sources znc-extra.spec 
Log Message:
znc-extra is now a subpackage of znc



--- NEW FILE dead.package ---
znc-extra is now a subpackage of znc


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- znc-extra.spec DELETED ---



From nb at fedoraproject.org  Fri Aug 21 06:02:02 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:02:02 +0000 (UTC)
Subject: rpms/znc-extra/F-10 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.2,
	NONE znc-extra.spec, 1.1, NONE
Message-ID: <20090821060202.3E2DD11C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864/F-10

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile branch sources znc-extra.spec 
Log Message:
znc-extra is now a subpackage of znc



--- NEW FILE dead.package ---
znc-extra is now a subpackage of znc


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- znc-extra.spec DELETED ---



From nb at fedoraproject.org  Fri Aug 21 06:02:03 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:02:03 +0000 (UTC)
Subject: rpms/znc-extra/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE Makefile, 1.1, NONE import.log, 1.1, NONE sources, 1.3,
	NONE znc-extra.spec, 1.3, NONE
Message-ID: <20090821060203.8C68D11C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile import.log sources znc-extra.spec 
Log Message:
znc-extra is now a subpackage of znc



--- NEW FILE dead.package ---
znc-extra is now a subpackage of znc


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- import.log DELETED ---


--- sources DELETED ---


--- znc-extra.spec DELETED ---



From nb at fedoraproject.org  Fri Aug 21 06:03:11 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 21 Aug 2009 06:03:11 +0000 (UTC)
Subject: rpms/znc/EL-4 .cvsignore,1.4,1.5 sources,1.4,1.5 znc.spec,1.8,1.9
Message-ID: <20090821060311.3F9B811C00D7@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4187

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Initial commit for EL-4, doesn't build yet



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Jul 2009 18:10:45 -0000	1.4
+++ .cvsignore	21 Aug 2009 06:03:10 -0000	1.5
@@ -1 +1 @@
-znc-0.074.tar.gz
+znc-0.075.svn1608.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Jul 2009 18:10:45 -0000	1.4
+++ sources	21 Aug 2009 06:03:11 -0000	1.5
@@ -1 +1 @@
-378187acd114769f8f97ef2d4b19da25  znc-0.074.tar.gz
+9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/znc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- znc.spec	21 Aug 2009 05:20:21 -0000	1.8
+++ znc.spec	21 Aug 2009 06:03:11 -0000	1.9
@@ -1,11 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.074
-Release:        2%{?dist}
+Version:        0.075
+Release:        5.svn1608%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/znc/znc-%{version}.tar.gz
+# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1608.tar.bz2 
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
 BuildRequires:  openssl-devel >= 0.9.8
@@ -31,6 +33,14 @@ BuildRequires: pkgconfig
 All includes and program files you need to compile your own znc
 modules.
 
+%package extra
+Summary:       Extra modules for ZNC
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description extra
+Extra modules for ZNC
+
 %prep
 %setup -q
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
@@ -39,7 +49,7 @@ modules.
 %build
 %configure \
      --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-sasl
+     --enable-ipv6 --enable-sasl --enable-extra
 %__make %{?_smp_mflags}
 
 %install
@@ -54,7 +64,41 @@ modules.
 %doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf
 %{_bindir}/znc
 %{_mandir}/man1/*
-%{_libdir}/znc/
+#%{_libdir}/znc/
+%{_libdir}/znc/admin.so
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_libdir}/znc/autoreply.so
+%{_libdir}/znc/away.so
+%{_libdir}/znc/awaynick.so
+%{_libdir}/znc/buffextras.so
+%{_libdir}/znc/chansaver.so
+%{_libdir}/znc/crypt.so
+%{_libdir}/znc/email.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/fixfreenode.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/keepnick.so
+%{_libdir}/znc/kickrejoin.so
+%{_libdir}/znc/modperl.pm
+%{_libdir}/znc/modperl.so
+%{_libdir}/znc/nickserv.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.so
+%{_libdir}/znc/saslauth.so
+%{_libdir}/znc/savebuff.so
+%{_libdir}/znc/schat.so
+%{_libdir}/znc/shell.so
+%{_libdir}/znc/simple_away.so
+%{_libdir}/znc/stickychan.so
+%{_libdir}/znc/watch.so
+%{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
 
 %files devel
@@ -64,29 +108,72 @@ modules.
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/znc/
 
+%files extra
+%defattr(-,root,root)
+%{_libdir}/znc/antiidle.so
+%{_libdir}/znc/autovoice.so
+%{_libdir}/znc/blockuser.so
+%{_libdir}/znc/connect_throttle.so
+%{_libdir}/znc/ctcpflood.so
+%{_libdir}/znc/discon_kick.so
+%{_libdir}/znc/droproot.so
+%{_libdir}/znc/fakeonline.so
+%{_libdir}/znc/lastseen.so
+%{_libdir}/znc/listsockets.so
+%{_libdir}/znc/log.so
+%{_libdir}/znc/motdfile.so
+%{_libdir}/znc/notify_connect.so
+%{_libdir}/znc/send_raw.so
+
 %changelog
-* Mon Aug 3 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-2
-- Bump release to fix failed push
+* Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
+- Upgrade to svn 1608
+
+* Tue Aug 18 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-4.20090818svn1602
+- Upgrade to svn 1602
+
+* Sat Aug 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-3.20090807svn1594
+- Fix source filename
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-2.20090807svn1594
+- Fix broken source tarball
+
+* Fri Aug 7 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-1.20090807svn1594
+- Upgrade to svn 1594
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 23 2009 Nick Bebout <nb at fedoraproject.org> - 0.074-1
 - Update to 0.074
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-3
 - Fix date in changelog, disable c-ares
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-2
 - Backport patch to fix webadmin skins issue introduced in 0.072
+
 * Wed Jul 22 2009 Nick Bebout <nb at fedoraproject.org> - 0.072-1
 - Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152
+
 * Sun Jul 12 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-7
 - Fix License: to be GPLv2 with exceptions
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-6
 - Fix permissions error in %%prep, not in source
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-5
 - Fix permissions error on q.cpp and add LICENSE.OpenSSL
+
 * Sat Jul 11 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-4
 - Remove switch to enable debug, fix %%files section
+
 * Fri Jul 10 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-3
 - Move fixfreenode and log into separate znc-extra package
 - Move awayping into separate znc-awayping package
+
 * Thu Jul 9 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-2
 - Include modules with main package
+
 * Wed Jul 8 2009 Nick Bebout <nb at fedoraproject.org> - 0.070-1
 - Initial Fedora package based on 0.070 of upstream



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:30 +0000
Subject: [pkgdb] znc-extra ownership updated
Message-ID: <20090821060330.E002110F84D@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora devel was orphaned by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:30 +0000
Subject: [pkgdb] znc-extra (un)retirement
Message-ID: <20090821060330.F3DB710F85C@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora devel has been retired by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:35 +0000
Subject: [pkgdb] znc-extra ownership updated
Message-ID: <20090821060335.261A810F886@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora 10 was orphaned by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:35 +0000
Subject: [pkgdb] znc-extra (un)retirement
Message-ID: <20090821060335.35AF410F889@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora 10 has been retired by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:37 +0000
Subject: [pkgdb] znc-extra ownership updated
Message-ID: <20090821060337.200FA10F88C@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora 11 was orphaned by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:37 +0000
Subject: [pkgdb] znc-extra (un)retirement
Message-ID: <20090821060337.2C55810F895@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora 11 has been retired by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:38 +0000
Subject: [pkgdb] znc-extra ownership updated
Message-ID: <20090821060338.A043C10F898@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora EPEL 4 was orphaned by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:38 +0000
Subject: [pkgdb] znc-extra (un)retirement
Message-ID: <20090821060338.A520210F89A@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora EPEL 4 has been retired by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:40 +0000
Subject: [pkgdb] znc-extra (un)retirement
Message-ID: <20090821060340.B486110F8A0@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora EPEL 5 has been retired by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:40 +0000
Subject: [pkgdb] znc-extra ownership updated
Message-ID: <20090821060340.AF91F10F89C@bastion2.fedora.phx.redhat.com>

Package znc-extra in Fedora EPEL 5 was orphaned by nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:51 +0000
Subject: [pkgdb] znc-extra: nb has given up commit
Message-ID: <20090821060351.37FEA10F85C@bastion2.fedora.phx.redhat.com>

nb has given up the commit acl on znc-extra (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:03:47 +0000
Subject: [pkgdb] znc-extra: nb has requested commit
Message-ID: <20090821060347.BE4C710F84D@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on znc-extra (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc-extra



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:11 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060411.6BD9510F889@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on znc (Fedora devel) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:14 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060414.3FB1110F895@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on znc (Fedora devel) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:16 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060416.F00A410F898@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora devel) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:18 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060418.D680310F8A3@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora devel) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:20 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060420.C494310F8A6@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora devel) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:22 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060422.997DF10F8AA@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora devel) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:26 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060426.D599A10F8B1@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora 10) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:28 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060428.68EB610F85C@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora 10) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:32 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060432.18E0410F89F@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on znc (Fedora 10) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:33 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060433.CBD5710F8B4@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on znc (Fedora 10) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:36 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060436.26C1E10F8B7@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora 10) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:40 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060440.D6DEC10F886@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora devel) to Obsolete for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:46 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060446.87ADF10F8BD@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora 11) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:47 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060447.BF4B010F8BF@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora 11) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:50 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060450.EC7AE10F8C0@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on znc (Fedora 11) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:52 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060452.A8F2610F8C1@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on znc (Fedora 11) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:54 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060454.A2FA510F8C7@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora 11) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:57 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060457.0B49010F8C9@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:04:58 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060458.B567E10F8CC@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:03 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060503.DCFE910F899@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on znc (Fedora EPEL 5) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:05 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060506.01FC210F8CD@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on znc (Fedora EPEL 5) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:07 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060507.D9ACA10F8D0@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora EPEL 5) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:12 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060512.4AF7810F8D1@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on znc (Fedora EPEL 4) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:14 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060514.C551610F8A6@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on znc (Fedora EPEL 4) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:15 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060515.80D3210F8D4@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora EPEL 4) to Approved for silfreed

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:21 +0000
Subject: [pkgdb] znc: nb has requested watchcommits
Message-ID: <20090821060521.2343B10F8D9@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:22 +0000
Subject: [pkgdb] znc: nb has requested commit
Message-ID: <20090821060522.7A13110F8DB@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:23 +0000
Subject: [pkgdb] znc: nb has requested approveacls
Message-ID: <20090821060523.D809210F8DC@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:19 +0000
Subject: [pkgdb] znc: nb has requested watchbugzilla
Message-ID: <20090821060520.025CB10F8D7@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on znc (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:39 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060539.A78D910F855@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on znc (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:41 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060541.E049C10F8E1@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on znc (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:44 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060544.2329210F8ED@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on znc (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From pkgdb at fedoraproject.org  Fri Aug 21 06:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 06:05:45 +0000
Subject: [pkgdb] znc had acl change status
Message-ID: <20090821060545.BC58010F8F0@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on znc (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/znc



From phuang at fedoraproject.org  Fri Aug 21 06:26:22 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 21 Aug 2009 06:26:22 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, 1.2, 1.3 ibus-qt.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090821062622.4C97711C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9578

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20090821, fix compose key problem


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 05:26:10 -0000	1.2
+++ .cvsignore	21 Aug 2009 06:26:19 -0000	1.3
@@ -1 +1 @@
-ibus-qt-1.2.0.20090728-Source.tar.gz
+ibus-qt-1.2.0.20090821-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-qt.spec	11 Aug 2009 05:29:43 -0000	1.2
+++ ibus-qt.spec	21 Aug 2009 06:26:20 -0000	1.3
@@ -1,5 +1,5 @@
 Name:       ibus-qt
-Version:    1.2.0.20090728
+Version:    1.2.0.20090821
 Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
@@ -9,9 +9,10 @@ Source0:    http://ibus.googlecode.com/f
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake
 BuildRequires:  qt-devel >= 4.5
 BuildRequires:  dbus-devel >= 1.2
-BuildRequires:  cmake
+BuildRequires:  libicu-devel >= 4.0
 Requires:   ibus >= 1.2
 
 %description
@@ -62,5 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Fri Aug 21 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090821-1
+- Update to 1.2.0.2009821
+- 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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 05:26:10 -0000	1.2
+++ sources	21 Aug 2009 06:26:20 -0000	1.3
@@ -1 +1 @@
-b9167035bd6abb40de35fa4e4f83fcca  ibus-qt-1.2.0.20090728-Source.tar.gz
+6a491b8002d8ab21390ce7a3c0029c69  ibus-qt-1.2.0.20090821-Source.tar.gz



From phuang at fedoraproject.org  Fri Aug 21 06:33:55 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 21 Aug 2009 06:33:55 +0000 (UTC)
Subject: rpms/ibus-qt/devel ibus-qt.spec,1.3,1.4
Message-ID: <20090821063355.713D311C00D7@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11108

Modified Files:
	ibus-qt.spec 
Log Message:
Add BRs ibus-devel


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-qt.spec	21 Aug 2009 06:26:20 -0000	1.3
+++ ibus-qt.spec	21 Aug 2009 06:33:55 -0000	1.4
@@ -12,6 +12,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 BuildRequires:  cmake
 BuildRequires:  qt-devel >= 4.5
 BuildRequires:  dbus-devel >= 1.2
+BuildRequires:  ibus-devel >= 1.2
 BuildRequires:  libicu-devel >= 4.0
 Requires:   ibus >= 1.2
 



From ovasik at fedoraproject.org  Fri Aug 21 07:01:01 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 21 Aug 2009 07:01:01 +0000 (UTC)
Subject: rpms/coreutils/devel .cvsignore, 1.21,
	1.22 coreutils-5.2.1-runuser.patch, 1.25,
	1.26 coreutils-6.10-configuration.patch, 1.21,
	1.22 coreutils-i18n.patch, 1.35, 1.36 coreutils.spec, 1.266,
	1.267 sources, 1.23, 1.24 coreutils-7.4-install-SELinux.patch,
	1.1, NONE coreutils-7.4-ls-1U.patch, 1.1, NONE
Message-ID: <20090821070101.99F3E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16751

Modified Files:
	.cvsignore coreutils-5.2.1-runuser.patch 
	coreutils-6.10-configuration.patch coreutils-i18n.patch 
	coreutils.spec sources 
Removed Files:
	coreutils-7.4-install-SELinux.patch coreutils-7.4-ls-1U.patch 
Log Message:
New upstream release 7.5, remove already applied patches,defuzz few others


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	6 Aug 2009 13:24:22 -0000	1.21
+++ .cvsignore	21 Aug 2009 07:00:58 -0000	1.22
@@ -1 +1 @@
-coreutils-7.4.tar.xz
+coreutils-7.5.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                |  137 +++++++++++++++++++++++++++++++---
 coreutils-7.5/tests/misc/help-version |    1 
 7 files changed, 153 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.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- coreutils-5.2.1-runuser.patch	25 May 2009 12:11:34 -0000	1.25
+++ coreutils-5.2.1-runuser.patch	21 Aug 2009 07:00:58 -0000	1.26
@@ -44,13 +44,13 @@ diff -urNp coreutils-7.0.orig/README cor
    link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
    od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
 -  runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
--  sleep sort split stat stty su sum sync tac tail tee test timeout touch tr
--  true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc who
--  whoami yes
+-  sleep sort split stat stdbuf stty su sum sync tac tail tee test timeout
+-  touch tr true truncate tsort tty uname unexpand uniq unlink uptime users
+-  vdir wc who whoami yes
 +  runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
-+  shuf sleep sort split stat stty su sum sync tac tail tee test timeout touch
-+  tr true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc
-+  who whoami yes
++  shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test
++  timeout touch tr true truncate tsort tty uname unexpand uniq unlink uptime
++  users vdir wc who whoami yes
  
  See the file NEWS for a list of major changes in the current release.
  
@@ -355,13 +355,13 @@ diff -urNp coreutils-7.0.orig/src/su.c c
 +#endif
 +	     );
  }
-diff -urNp coreutils-7.0.orig/tests/misc/help-version coreutils-7.0/tests/misc/help-version
---- coreutils-7.0.orig/tests/misc/help-version	2008-09-27 19:28:54.000000000 +0200
-+++ coreutils-7.0/tests/misc/help-version	2009-01-28 18:11:00.321247443 +0100
-@@ -148,6 +148,7 @@ printf_args=foo
- seq_args=10
+diff -urNp coreutils-7.5.orig/tests/misc/help-version coreutils-7.5/tests/misc/help-version
+--- coreutils-7.5.orig/tests/misc/help-version
++++ coreutils-7.5/tests/misc/help-version
+@@ -150,6 +150,7 @@ printf_args=foo
  sleep_args=0
  su_args=--version
+ stdbuf_args="-oL true"
 +runuser_args=--version
  timeout_args=--version
  

coreutils-6.10-configuration.patch:
 coreutils-6.11/tests/mkdir/selinux   |    1 +
 coreutils-6.11/tests/test-lib.sh     |    4 ++--
 coreutils-7.1/src/ls.c               |    8 ++++----
 coreutils-7.2/gnulib-tests/gnulib.mk |   12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- coreutils-6.10-configuration.patch	17 Apr 2009 13:27:36 -0000	1.21
+++ coreutils-6.10-configuration.patch	21 Aug 2009 07:00:58 -0000	1.22
@@ -7,10 +7,10 @@ diff -urNp coreutils-7.2-orig/gnulib-tes
  
 -TESTS += test-memchr
 -check_PROGRAMS += test-memchr
--EXTRA_DIST += test-memchr.c
+-EXTRA_DIST += test-memchr.c zerosize-ptr.h
 +#TESTS += test-memchr
 +#check_PROGRAMS += test-memchr
-+#EXTRA_DIST += test-memchr.c
++#EXTRA_DIST += test-memchr.c zerosize-ptr.h
  
  ## end   gnulib module memchr-tests
  

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             |  161 +++++++
 coreutils-6.8+/src/fold.c               |  312 +++++++++++++-
 coreutils-6.8+/src/join.c               |  237 ++++++++++-
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  675 ++++++++++++++++++++++++++++++--
 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, 2744 insertions(+), 180 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- coreutils-i18n.patch	6 Jul 2009 21:40:43 -0000	1.35
+++ coreutils-i18n.patch	21 Aug 2009 07:00:58 -0000	1.36
@@ -2089,7 +2089,7 @@ diff -urNp coreutils-6.11-orig/src/join.
    while (blanks[to_uchar (*a)])
      a++;
 @@ -1510,6 +1813,25 @@
-   return strnumcmp (a, b, decimal_point, thousands_sep);
+ 	  : strnumcmp (a, b, decimal_point, thousands_sep));
  }
  
 +#if HAVE_MBRTOWC
@@ -2202,7 +2202,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 -keycompare (const struct line *a, const struct line *b)
 +keycompare_uni (const struct line *a, const struct line *b)
  {
-   struct keyfield const *key = keylist;
+   struct keyfield *key = keylist;
  
 @@ -1875,6 +2265,181 @@
    return key->reverse ? -diff : diff;


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- coreutils.spec	6 Aug 2009 13:31:14 -0000	1.266
+++ coreutils.spec	21 Aug 2009 07:00:58 -0000	1.267
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 7.4
-Release: 6%{?dist}
+Version: 7.5
+Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,8 +18,6 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
-Patch1: coreutils-7.4-ls-1U.patch
-Patch2: coreutils-7.4-install-SELinux.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -101,8 +99,6 @@ the old GNU fileutils, sh-utils, and tex
 %setup -q
 
 # From upstream
-%patch1 -p1 -b .ls-1U
-%patch2 -p1 -b .install-SELinux
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -318,6 +314,10 @@ fi
 /sbin/runuser
 
 %changelog
+* Fri Aug 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-1
+- New upstream release 7.5, remove already applied patches,
+  defuzz few others  
+
 * Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
 - do process install-info only with info files present(#515970)
 - BuildRequires for xz, use xz tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	6 Aug 2009 13:24:22 -0000	1.23
+++ sources	21 Aug 2009 07:00:59 -0000	1.24
@@ -1 +1 @@
-e8d906c153f271430e3efb2b9a35a35f  coreutils-7.4.tar.xz
+ca9219c5b7efa533d552f61a3880f458  coreutils-7.5.tar.xz


--- coreutils-7.4-install-SELinux.patch DELETED ---


--- coreutils-7.4-ls-1U.patch DELETED ---



From salimma at fedoraproject.org  Fri Aug 21 07:22:01 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 07:22:01 +0000 (UTC)
Subject: rpms/gnome-do-plugins/devel gnome-do-plugins.spec,1.5,1.6
Message-ID: <20090821072202.071AE11C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21156

Modified Files:
	gnome-do-plugins.spec 
Log Message:
* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-2
- Enable building of GData-based plugins
- Simplify spec file



Index: gnome-do-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/gnome-do-plugins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-do-plugins.spec	21 Aug 2009 04:17:06 -0000	1.5
+++ gnome-do-plugins.spec	21 Aug 2009 07:22:00 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           gnome-do-plugins
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for GNOME Do
 Group:          Applications/Productivity
 License:        GPLv3+
@@ -15,11 +15,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  mono-devel ndesk-dbus-glib-devel gnome-do-devel
 BuildRequires:  gnome-sharp-devel gtk-sharp2-devel gnome-desktop-sharp-devel
 BuildRequires:  gnome-keyring-sharp-devel monodevelop mono-addins-devel
+BuildRequires:  gdata-sharp-devel
 BuildRequires:  notify-sharp-devel
 BuildRequires:  intltool
 # Needed because the patch touches Makefile.am
-BuildRequires: automake
-Requires:       gnome-do
+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
@@ -34,11 +35,9 @@ Chat, Play, etc.).
 This package contains various plugins for GNOME Do.
 
 %package banshee
-Summary:        gnome-do plugin for banshee
+Summary:        GNOME Do Banshee plugin
 Group:          Applications/Productivity
 BuildRequires:  banshee-devel
-BuildRequires:  banshee
-Requires:       gnome-do >= %{version}
 Requires:       banshee
 Requires:       gnome-do-plugins = %{version}
 
@@ -46,120 +45,129 @@ Requires:       gnome-do-plugins = %{ver
 gnone-do plugins for banshee
 
 %package bibtex
-Summary:        gnome-do plugin for bibtex
+Summary:        GNOME Do BibTeX plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version}
 Requires:       gnome-do-plugins = %{version}
 
 %description bibtex
 gnome-do plugins for bibtex
 
 %package clawsmail
-Summary:        gnome-do-plugins for clawsmail
+Summary:        GNOME Do Claws Mail plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} claws-mail
+Requires:       claws-mail
 Requires:       gnome-do-plugins = %{version}
 
 %description clawsmail
 gnome-do plugins for clawsmail
 
 %package epiphany
-Summary:        gnome-do-plugins for epiphany
+Summary:        GNOME Do Epiphany plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} epiphany
+Requires:       epiphany
 Requires:       gnome-do-plugins = %{version}
 
 %description epiphany
 gnome-do plugins for epiphany
 
 %package evolution
-Summary:        gnome-do-plugins for evolution
+Summary:        GNOME Do Evolution plugin
 Group:          Applications/Productivity
 BuildRequires:  evolution-sharp-devel
 Requires:       evolution-sharp
-Requires:       gnome-do >= %{version} evolution
+Requires:       evolution
 Requires:       gnome-do-plugins = %{version}
 
 %description evolution
 gnome-do plugins for evolution
 
 %package eog
-Summary:        gnome-do-plugins for Eye of Gnome
+Summary:        GNOME Do Eye of Gnome plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} eog
+Requires:       eog
 Requires:       gnome-do-plugins = %{version}
 
 %description eog
 gnome-do plugins for Eye of Gnome
 
 %package firefox
-Summary:        gnome-do-plugins for firefox
+Summary:        GNOME Do Firefox plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} firefox
+Requires:       firefox
 Requires:       gnome-do-plugins = %{version}
 
 %description firefox
 gnome-do plugins for firefox 
 
 %package flickr
-Summary:        gnome-do-plugins for flickr
+Summary:        GNOME Do Flickr plugin
 Group:          Applications/Productivity
 BuildRequires:  flickrnet-devel
-Requires:       gnome-do >= %{version} flickrnet
+Requires:       flickrnet
 Requires:       gnome-do-plugins = %{version}
 
 %description flickr
 gnome-do plugins for flickr
 
+%package google
+Summary:        GNOME Do Google plugins
+Group:          Applications/Productivity
+BuildRequires:  gdata-sharp-devel
+Requires:       gdata-sharp
+Requires:       gnome-do-plugins = %{version}
+
+%description google
+GNOME Do's Google-related plugins
+
 %package pidgin
-Summary:        gnome-do-plugins for pidgin
+Summary:        GNOME Do Pidgin plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} pidgin
+Requires:       pidgin
 Requires:       gnome-do-plugins = %{version}
 
 %description pidgin
 gnome-do plugins for pidgin 
 
 %package rhythmbox
-Summary:        gnome-do-plugins for rhythmbox
+Summary:        GNOME Do Rhythmbox plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} rhythmbox
+Requires:       rhythmbox
 Requires:       gnome-do-plugins = %{version}
 
 %description rhythmbox
 gnome-do plugins for rhythmbox
 
 %package tomboy
-Summary:        gnome-do-plugins for tomboy
+Summary:        GNOME Do Tomboy plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} tomboy
+Requires:       tomboy
 Requires:       gnome-do-plugins = %{version}
 
 %description tomboy
 gnome-do plugins for tomboy 
 
 %package thunderbird
-Summary:        gnome-do-plugins for thunderbird
+Summary:        GNOME Do Thunderbird plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} thunderbird
+Requires:       thunderbird
 Requires:       gnome-do-plugins = %{version}
 
 %description thunderbird
 gnome-do plugins for thunderbird
 
 %package tasque
-Summary:        gnome-do-plugins for tasque 
+Summary:        GNOME Do Tasque plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} tasque
+Requires:       tasque
 Requires:       gnome-do-plugins = %{version}
 
 %description tasque
 gnome-do plugins for tasque
 
 %package vinagre
-Summary:        gnome-do-plugins for vinagre
+Summary:        GNOME Do Vinagre plugin
 Group:          Applications/Productivity
-Requires:       gnome-do >= %{version} vinagre
+Requires:       vinagre
 Requires:       gnome-do-plugins = %{version}
 
 %description vinagre
@@ -189,13 +197,6 @@ make install DESTDIR=%{buildroot}
 ln -sf %{_libdir}/banshee-1/Banshee.CollectionIndexer.dll %{buildroot}%{_libdir}/gnome-do/plugins
 rm -rf %{buildroot}%{_datadir}/gnome-do/plugins/Banshee.CollectionIndexer.dll
 
-# Remove Bundled Libraries and the plugins that depend on them
-rm -rf %{buildroot}%{_datadir}/gnome-do/plugins/Google*
-rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/*YouTube*
-rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/*GoogleCalendar*
-rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/*GoogleContacts*
-rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/*GoogleDocs*
-
 %find_lang %name
 
 %clean
@@ -233,6 +234,11 @@ rm -rf %{buildroot}
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/*Flickr*
 
+%files google
+%defattr(-, root, root, -)
+%{_libdir}/gnome-do/plugins/Google*
+%{_libdir}/gnome-do/plugins/YouTube*
+
 %files pidgin
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/*Pidgin*
@@ -268,15 +274,21 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/gnome-do/plugins/EOG*
 %exclude %{_libdir}/gnome-do/plugins/*Firefox*
 %exclude %{_libdir}/gnome-do/plugins/*Flickr*
+%exclude %{_libdir}/gnome-do/plugins/Google*
 %exclude %{_libdir}/gnome-do/plugins/*Pidgin*
 %exclude %{_libdir}/gnome-do/plugins/*Rhythmbox*
 %exclude %{_libdir}/gnome-do/plugins/*Tomboy*
 %exclude %{_libdir}/gnome-do/plugins/*Thunderbird*
 %exclude %{_libdir}/gnome-do/plugins/*Tasque*
 %exclude %{_libdir}/gnome-do/plugins/*Vinagre*
+%exclude %{_libdir}/gnome-do/plugins/YouTube*
 %{_libdir}/gnome-do/plugins/*
 
 %changelog
+* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-2
+- Enable building of GData-based plugins
+- Simplify spec file
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-1
 - Update to 0.8.2
 



From caolanm at fedoraproject.org  Fri Aug 21 07:59:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 21 Aug 2009 07:59:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1987,1.1988
Message-ID: <20090821075940.E4D2711C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28633

Modified Files:
	openoffice.org.spec 
Log Message:
seeing as the last build failed, merge these together


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -p -r1.1987 -r1.1988
--- openoffice.org.spec	21 Aug 2009 05:18:30 -0000	1.1987
+++ openoffice.org.spec	21 Aug 2009 07:59:39 -0000	1.1988
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 2
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4208,12 +4208,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Aug 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
+* Fri Aug 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
+- latest milestone
 - Resolves: rbhz#501141 Images and Frames disappear in sequential
   printing
-
-* Thu Aug 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
-- latest milestone
 - Related: rhbz#517822 add hyphen-mr depend
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 



From pkgdb at fedoraproject.org  Fri Aug 21 08:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 08:18:31 +0000
Subject: [pkgdb] plexus-cdc: akurtakov has requested watchcommits
Message-ID: <20090821081832.0D69410F855@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on plexus-cdc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From pkgdb at fedoraproject.org  Fri Aug 21 08:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 08:18:32 +0000
Subject: [pkgdb] plexus-cdc: akurtakov has requested approveacls
Message-ID: <20090821081833.2304310F889@bastion2.fedora.phx.redhat.com>

akurtakov has requested the approveacls acl on plexus-cdc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From pkgdb at fedoraproject.org  Fri Aug 21 08:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 08:18:38 +0000
Subject: [pkgdb] plexus-cdc: akurtakov has requested commit
Message-ID: <20090821081838.3F6DF10F897@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on plexus-cdc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From pkgdb at fedoraproject.org  Fri Aug 21 08:18:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 08:18:41 +0000
Subject: [pkgdb] plexus-cdc: akurtakov has requested watchbugzilla
Message-ID: <20090821081841.37B6C10F89B@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on plexus-cdc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From than at fedoraproject.org  Fri Aug 21 08:31:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 21 Aug 2009 08:31:48 +0000 (UTC)
Subject: rpms/qt/devel 0118-qtcopy-define.diff,NONE,1.1 qt.spec,1.312,1.313
Message-ID: <20090821083148.B715E11C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2918

Modified Files:
	qt.spec 
Added Files:
	0118-qtcopy-define.diff 
Log Message:
apply qtcopy-define


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)



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- qt.spec	20 Aug 2009 22:15:29 -0000	1.312
+++ qt.spec	21 Aug 2009 08:31:46 -0000	1.313
@@ -66,8 +66,9 @@ Patch100: qt-x11-opensource-src-4.5.2-CV
 # switch to kde-qt branches, qt-copy doesn't exist anymore
 Patch200: kde-qt-patches-20090820git.patch
 # these patches are not merged yet in kde-qt branches
-Patch201: 0283-do-not-deduce-scrollbar-extent-twice.diff
-Patch202: 0285-qgv-dontshowchildren.diff
+Patch201: 0118-qtcopy-define.diff
+Patch202: 0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch203: 0285-qgv-dontshowchildren.diff
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -392,8 +393,9 @@ popd
 
 # kde-qt branch
 %patch200 -p1 -b .kde-qt-patches-20090820git
-%patch201 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
-%patch202 -p0 -b .0285-qgv-dontshowchildren
+%patch201 -p1 -b .0118-qtcopy-define
+%patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
+%patch203 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -727,7 +729,7 @@ fi
 
 %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}



From mgrepl at fedoraproject.org  Fri Aug 21 08:33:48 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 21 Aug 2009 08:33:48 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.176,
	1.177 selinux-policy.spec, 1.804, 1.805
Message-ID: <20090821083348.8296F11C00D7@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-serv3354

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow gpsd fsetid capability



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               |   11 
 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             |  219 ++
 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                  |   88 
 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                      |   81 
 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, 22278 insertions(+), 3611 deletions(-)

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- policy-20080710.patch	14 Aug 2009 13:03:49 -0000	1.176
+++ policy-20080710.patch	21 Aug 2009 08:33:47 -0000	1.177
@@ -5437,8 +5437,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.te serefpolicy-3.5.13/policy/modules/apps/ptchown.te
 --- nsaserefpolicy/policy/modules/apps/ptchown.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/apps/ptchown.te	2009-08-14 14:13:12.000000000 +0200
-@@ -0,0 +1,38 @@
++++ serefpolicy-3.5.13/policy/modules/apps/ptchown.te	2009-08-21 09:47:20.000000000 +0200
+@@ -0,0 +1,39 @@
 +policy_module(ptchown,1.0.0)
 +
 +########################################
@@ -5458,7 +5458,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +# ptchown local policy
 +#
 +
-+allow ptchown_t self:capability { fowner chown setuid };
++allow ptchown_t self:capability { chown fowner fsetid setuid };
 +allow ptchown_t self:process { getcap setcap };
 +
 +# Init script handling
@@ -5475,6 +5475,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +term_use_generic_ptys(ptchown_t)
 +term_setattr_generic_ptys(ptchown_t)
 +term_setattr_all_user_ptys(ptchown_t)
++term_use_ptmx(ptchown_t)
 +
 +miscfiles_read_localization(ptchown_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.13/policy/modules/apps/qemu.fc
@@ -18100,7 +18101,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.5.13/policy/modules/services/gpsd.te
 --- nsaserefpolicy/policy/modules/services/gpsd.te	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/services/gpsd.te	2009-03-10 13:22:11.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/gpsd.te	2009-08-21 09:52:33.000000000 +0200
 @@ -0,0 +1,55 @@
 +policy_module(gpsd,1.0.0)
 +
@@ -18122,7 +18123,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +# gpsd local policy
 +#
 +
-+allow gpsd_t self:capability { setuid sys_nice setgid fowner };
++allow gpsd_t self:capability { setuid sys_nice setgid fowner fsetid};
 +allow gpsd_t self:process setsched;
 +allow gpsd_t self:shm create_shm_perms;
 +allow gpsd_t self:unix_dgram_socket { create_socket_perms sendto };
@@ -21409,6 +21410,17 @@ diff --exclude-from=exclude -N -u -r nsa
  	firstboot_dontaudit_use_fds(ntpd_t)
  	firstboot_dontaudit_rw_pipes(ntpd_t)
  	firstboot_dontaudit_rw_stream_sockets(ntpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.5.13/policy/modules/services/nx.fc
+--- nsaserefpolicy/policy/modules/services/nx.fc	2008-10-17 14:49:13.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/services/nx.fc	2009-08-21 10:05:00.000000000 +0200
+@@ -5,3 +5,7 @@
+ /opt/NX/var(/.*)?			gen_context(system_u:object_r:nx_server_var_run_t,s0)
+ 
+ /usr/libexec/nx/nxserver	--	gen_context(system_u:object_r:nx_server_exec_t,s0)
++
++/var/lib/nxserver/home/.ssh(/.*)? 	gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.13/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	2008-10-17 14:49:11.000000000 +0200
 +++ serefpolicy-3.5.13/policy/modules/services/oddjob.fc	2009-02-10 15:07:15.000000000 +0100


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -p -r1.804 -r1.805
--- selinux-policy.spec	14 Aug 2009 13:03:50 -0000	1.804
+++ selinux-policy.spec	21 Aug 2009 08:33:48 -0000	1.805
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 69%{?dist}
+Release: 70%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -462,6 +462,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 21 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-70
+- Allow gpsd fsetid capability
+
 * Fri Aug 14 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-69
 - Add ptchown policy from Dan Walsh
 



From sharkcz at fedoraproject.org  Fri Aug 21 08:35:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 08:35:38 +0000 (UTC)
Subject: rpms/qlandkartegt/devel .cvsignore, 1.9, 1.10 qlandkartegt.spec,
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090821083538.267CB11C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3837

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Tue Aug 18 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
- update to 0.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	20 Jul 2009 12:06:23 -0000	1.9
+++ .cvsignore	21 Aug 2009 08:35:37 -0000	1.10
@@ -1 +1 @@
-qlandkartegt-0.14.1.tar.gz
+qlandkartegt-0.15.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/qlandkartegt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qlandkartegt.spec	27 Jul 2009 02:28:45 -0000	1.10
+++ qlandkartegt.spec	21 Aug 2009 08:35:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name: qlandkartegt
-Version: 0.14.1
-Release: 2%{?dist}
+Version: 0.15.0
+Release: 1%{?dist}
 Summary: GPS device mapping tool
 
 Group: Applications/Communications
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
+- update to 0.15.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Jul 2009 12:06:24 -0000	1.9
+++ sources	21 Aug 2009 08:35:37 -0000	1.10
@@ -1 +1 @@
-2dfd3458b544dda0ec015659e3157811  qlandkartegt-0.14.1.tar.gz
+d255bb6acc6af0334a6aa8654d530a2a  qlandkartegt-0.15.0.tar.gz



From sharkcz at fedoraproject.org  Fri Aug 21 08:40:41 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 08:40:41 +0000 (UTC)
Subject: rpms/qlandkartegt/F-11 .cvsignore, 1.9, 1.10 qlandkartegt.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20090821084041.F010911C0439@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4870

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
- update to 0.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	20 Jul 2009 13:12:05 -0000	1.9
+++ .cvsignore	21 Aug 2009 08:40:41 -0000	1.10
@@ -1 +1 @@
-qlandkartegt-0.14.1.tar.gz
+qlandkartegt-0.15.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qlandkartegt.spec	20 Jul 2009 13:12:05 -0000	1.9
+++ qlandkartegt.spec	21 Aug 2009 08:40:41 -0000	1.10
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.14.1
+Version: 0.15.0
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
+- update to 0.15.0
+
 * Mon Jul 20 2009 Dan Horak <dan[at]danny.cz> 0.14.1-1
 - update to 0.14.1
 - add workaround for #498111


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Jul 2009 13:12:05 -0000	1.9
+++ sources	21 Aug 2009 08:40:41 -0000	1.10
@@ -1 +1 @@
-2dfd3458b544dda0ec015659e3157811  qlandkartegt-0.14.1.tar.gz
+d255bb6acc6af0334a6aa8654d530a2a  qlandkartegt-0.15.0.tar.gz



From sharkcz at fedoraproject.org  Fri Aug 21 08:41:40 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 08:41:40 +0000 (UTC)
Subject: rpms/qlandkartegt/F-10 .cvsignore, 1.9, 1.10 qlandkartegt.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <20090821084140.F313C11C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5199

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
- update to 0.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	20 Jul 2009 13:14:42 -0000	1.9
+++ .cvsignore	21 Aug 2009 08:41:40 -0000	1.10
@@ -1 +1 @@
-qlandkartegt-0.14.1.tar.gz
+qlandkartegt-0.15.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/qlandkartegt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- qlandkartegt.spec	20 Jul 2009 13:14:42 -0000	1.8
+++ qlandkartegt.spec	21 Aug 2009 08:41:40 -0000	1.9
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.14.1
+Version: 0.15.0
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 0.15.0-1
+- update to 0.15.0
+
 * Mon Jul 20 2009 Dan Horak <dan[at]danny.cz> 0.14.1-1
 - update to 0.14.1
 - add workaround for #498111


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Jul 2009 13:14:42 -0000	1.9
+++ sources	21 Aug 2009 08:41:40 -0000	1.10
@@ -1 +1 @@
-2dfd3458b544dda0ec015659e3157811  qlandkartegt-0.14.1.tar.gz
+d255bb6acc6af0334a6aa8654d530a2a  qlandkartegt-0.15.0.tar.gz



From twaugh at fedoraproject.org  Fri Aug 21 09:07:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 21 Aug 2009 09:07:56 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.508,1.509
Message-ID: <20090821090756.6E74611C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11163

Modified Files:
	cups.spec 
Log Message:
* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17
- Removed 3-distribution symlink (bug #514244).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -p -r1.508 -r1.509
--- cups.spec	19 Aug 2009 14:08:52 -0000	1.508
+++ cups.spec	21 Aug 2009 09:07:54 -0000	1.509
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.16%{?dist}
+Release: 0.%{pre}.17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -332,9 +332,8 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups
 # This is %%ghost'ed, but needs to be created in %%install anyway.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions
 
-# LSB 3.2 printer driver directories
+# LSB 3.2 printer driver directory
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
-ln -s ../../ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
 
 # Tell portreserve which port we want it to protect.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
@@ -530,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17
+- Removed 3-distribution symlink (bug #514244).
+
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
 - Fixed JobKillDelay handling for cancelled jobs (bug #518026,
   STR #3292).



From twaugh at fedoraproject.org  Fri Aug 21 09:08:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 21 Aug 2009 09:08:00 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.503,1.504
Message-ID: <20090821090800.D550311C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11205

Modified Files:
	cups.spec 
Log Message:
* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17
- Removed 3-distribution symlink (bug #514244).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -p -r1.503 -r1.504
--- cups.spec	19 Aug 2009 14:07:05 -0000	1.503
+++ cups.spec	21 Aug 2009 09:08:00 -0000	1.504
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.16%{?dist}
+Release: 0.%{pre}.17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -332,12 +332,12 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups
 # This is %%ghost'ed, but needs to be created in %%install anyway.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions
 
-# LSB 3.2 printer driver directories
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
-ln -s ../../ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
-
 # Tell portreserve which port we want it to protect.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+
+# LSB 3.2 printer driver directory
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
+
 echo ipp > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/%{name}
 
 # Handle https:// device URIs (bug #478677, STR #3122).
@@ -530,9 +530,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17
+- Removed 3-distribution symlink (bug #514244).
+
 * Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.16
-- Fixed JobKillDelay handling for cancelled jobs (bug #518026,
-  STR #3292).
+- Fixed JobKillDelay handling for cancelled jobs (bug #518026, STR
+  #3292).
 - Use 'exec' to invoke ghostscript in the pstoraster filter.  This
   allows the SIGTERM signal to reach the correct process, as well as
   conserving memory (part of bug #518026).



From kdudka at fedoraproject.org  Fri Aug 21 09:26:47 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Fri, 21 Aug 2009 09:26:47 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.6-sftp-poll.patch, NONE, 1.1 curl.spec,
	1.110, 1.111
Message-ID: <20090821092647.5073611C00D7@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15356

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.6-sftp-poll.patch 
Log Message:
- avoid tight loop during a sftp upload

curl-7.19.6-sftp-poll.patch:
 ssh.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE curl-7.19.6-sftp-poll.patch ---
diff -rup curl-7.19.6.orig/lib/ssh.c curl-7.19.6/lib/ssh.c
--- curl-7.19.6.orig/lib/ssh.c	2009-08-20 15:33:43.007858118 +0200
+++ curl-7.19.6/lib/ssh.c	2009-08-20 15:35:31.806608061 +0200
@@ -2753,8 +2753,13 @@ ssize_t Curl_sftp_send(struct connectdat
 
   ssh_block2waitfor(conn, (nwrite == LIBSSH2_ERROR_EAGAIN)?TRUE:FALSE);
 
-  if(nwrite == LIBSSH2_ERROR_EAGAIN)
+  if(nwrite == LIBSSH2_ERROR_EAGAIN) {
+    if (conn->proto.sshc.waitfor & KEEP_RECV)
+      /* wait for the socket to become ready */
+      Curl_socket_ready(conn->sock[FIRSTSOCKET], CURL_SOCKET_BAD, 1000);
+
     return 0;
+  }
 
   return nwrite;
 }


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- curl.spec	18 Aug 2009 11:51:47 -0000	1.110
+++ curl.spec	21 Aug 2009 09:26:47 -0000	1.111
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 2%{?dist}
+Release: 3%{?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
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
+Patch201: curl-7.19.6-sftp-poll.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,9 @@ use cURL's capabilities internally.
 %patch102 -p1
 %patch103 -p1
 
+# workarounds (not intended to be applied upstream)
+%patch201 -p1
+
 # Convert docs to UTF-8
 for f in CHANGES README; do
 	iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -141,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Aug 21 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-3
+- avoid tight loop during a sftp upload
+- http://permalink.gmane.org/gmane.comp.web.curl.library/24744
+
 * Tue Aug 18 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-2
 - let curl package depend on the same version of libcurl
 



From than at fedoraproject.org  Fri Aug 21 09:29:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 21 Aug 2009 09:29:19 +0000 (UTC)
Subject: rpms/mozplugger/devel mozplugger.spec,1.34,1.35
Message-ID: <20090821092919.74CB411C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/mozplugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15871

Modified Files:
	mozplugger.spec 
Log Message:
fix #226159, merge review



Index: mozplugger.spec
===================================================================
RCS file: /cvs/extras/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- mozplugger.spec	20 Aug 2009 15:37:53 -0000	1.34
+++ mozplugger.spec	21 Aug 2009 09:29:19 -0000	1.35
@@ -1,12 +1,12 @@
 Summary: A generic mozilla plug-in
 Name: mozplugger
 Version: 1.12.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Url: http://mozplugger.mozdev.org/
 
-Source0: http://mozplugger.mozdev.org/mozplugger/%{name}-%{version}.tar.gz
+Source0: http://mozplugger.mozdev.org/files/%{name}-%{version}.tar.gz
 Patch1: mozplugger-1.12.1-lib64.patch
 Patch2: mozplugger-1.12.1-path.patch
 
@@ -16,8 +16,9 @@ Requires: mozilla-filesystem
 
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
+BuildRequires: coreutils
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Obsoletes: plugger
 
 %description
@@ -29,6 +30,8 @@ programs as plug-ins for media types on 
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .path
 
+chmod 644 npapi/common/npunix.c
+
 %build
 make linux lib=%{_lib}
 
@@ -52,6 +55,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
+* Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.12.1-6
+- fix #226159, merge review
+
 * Thu Aug 20 2009 Than Ngo <than at redhat.com> - 1.12.1-5
 - fix #513470, using a wrong path for executable
 



From than at fedoraproject.org  Fri Aug 21 09:39:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 21 Aug 2009 09:39:24 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-pulseaudio.patch, NONE,
	1.1 qt.spec, 1.313, 1.314 phonon-4.2.96-pulseaudio.patch, 1.1, NONE
Message-ID: <20090821093924.34C4911C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17661

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-pulseaudio.patch 
Removed Files:
	phonon-4.2.96-pulseaudio.patch 
Log Message:
rename to qt-x11-opensource-src-4.5.2-pulseaudio.patch 


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;
     }
 


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- qt.spec	21 Aug 2009 08:31:46 -0000	1.313
+++ qt.spec	21 Aug 2009 09:39:23 -0000	1.314
@@ -45,7 +45,7 @@ Patch15: qt-x11-opensource-src-4.5.1-ena
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
 Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
 # make PulseAudio the default device in Phonon
-Patch17: phonon-4.2.96-pulseaudio.patch
+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
 
@@ -377,9 +377,7 @@ Qt libraries used for drawing widgets an
 %patch13 -p1 -b .gcc_hack
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch16 -p1 -b .kde4_plugins
-pushd src/3rdparty/phonon
 %patch17 -p1 -b .phonon-pulseaudio
-popd
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch51 -p1 -b .qdoc3
@@ -393,7 +391,7 @@ popd
 
 # kde-qt branch
 %patch200 -p1 -b .kde-qt-patches-20090820git
-%patch201 -p1 -b .0118-qtcopy-define
+%patch201 -p0 -b .0118-qtcopy-define
 %patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
 %patch203 -p0 -b .0285-qgv-dontshowchildren
 


--- phonon-4.2.96-pulseaudio.patch DELETED ---



From dwmw2 at fedoraproject.org  Fri Aug 21 09:50:37 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 21 Aug 2009 09:50:37 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom.patch, NONE,
	1.1.2.1 kernel.spec, 1.1679.2.14, 1.1679.2.15
Message-ID: <20090821095038.039A211C0417@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20304

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
backport fix for #514787

linux-2.6-ppc64-vs-broadcom.patch:
 dma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom.patch ---
>From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 10 Aug 2009 16:36:38 +1000
Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM

On an iMac G5, the b43 driver is failing to initialise because trying to
set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
in the machine anyway:
	https://bugzilla.redhat.com/show_bug.cgi?id=514787

We should probably let it succeed if the available RAM in the system
doesn't exceed the requested limit.

Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---
 arch/powerpc/kernel/dma.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 20a60d6..ccf129d 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -7,6 +7,7 @@
 
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/lmb.h>
 #include <asm/bug.h>
 #include <asm/abs_addr.h>
 
@@ -90,11 +91,10 @@ static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
 static int dma_direct_dma_supported(struct device *dev, u64 mask)
 {
 #ifdef CONFIG_PPC64
-	/* Could be improved to check for memory though it better be
-	 * done via some global so platforms can set the limit in case
+	/* Could be improved so platforms can set the limit in case
 	 * they have limited DMA windows
 	 */
-	return mask >= DMA_32BIT_MASK;
+	return mask >= (lmb_end_of_DRAM() - 1);
 #else
 	return 1;
 #endif
-- 
1.6.2.5



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.14
retrieving revision 1.1679.2.15
diff -u -p -r1.1679.2.14 -r1.1679.2.15
--- kernel.spec	19 Aug 2009 14:21:52 -0000	1.1679.2.14
+++ kernel.spec	21 Aug 2009 09:50:36 -0000	1.1679.2.15
@@ -620,6 +620,7 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
+Patch148: linux-2.6-ppc64-vs-broadcom.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1266,6 +1267,8 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
+# Fix b43 support on no-iommu devices with <1GiB RAM
+ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
 
 #
 # SPARC64
@@ -2164,6 +2167,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Fix b43 on iMac G5 (#514787)
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - CVE-2009-2848: execve: must clear current->clear_child_tid
 - Cherry pick upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd



From scop at fedoraproject.org  Fri Aug 21 09:58:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Fri, 21 Aug 2009 09:58:26 +0000 (UTC)
Subject: rpms/rpmdevtools/devel spectool-1.0.10-sourcenum.patch, NONE,
	1.1 .cvsignore, 1.17, 1.18 rpmdevtools.spec, 1.20, 1.21 sources,
	1.18, 1.19
Message-ID: <20090821095826.2978411C00D7@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21757

Modified Files:
	.cvsignore rpmdevtools.spec sources 
Added Files:
	spectool-1.0.10-sourcenum.patch 
Log Message:
* Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.4-1
- Update to 7.4, fixes #215927 and #466353.
- Patch spectool to make -s and -p to work as documented (Todd Zullinger).


spectool-1.0.10-sourcenum.patch:
 spectool |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE spectool-1.0.10-sourcenum.patch ---
Fix for -s x,y, -p x,y from Todd Zullinger:
https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html

diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool
--- spectool-1.0.10/spectool~	2008-02-12 12:32:21.000000000 +0200
+++ spectool-1.0.10/spectool	2009-08-21 02:12:56.000000000 +0300
@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command =
 			'v|verbose' => sub { $verbose++; },
 			'n|dryrun|dry-run' => sub { $dryrun = 1; },
 			'V|version' => sub { $command = 'version'; },
-			's|source=i' => \@sources,
-			'p|patch=i' => \@patches,
+			's|source=s' => \@sources,
+			'p|patch=s' => \@patches,
 			'S|sources' => sub { push @what, 'sources'; },
 			'P|patches' => sub { push @what, 'patches'; },
 			'A|all' => sub { push @what, 'all'; },


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	24 May 2009 21:29:51 -0000	1.17
+++ .cvsignore	21 Aug 2009 09:58:25 -0000	1.18
@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-7.3.tar.lzma
+rpmdevtools-7.4.tar.xz


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- rpmdevtools.spec	27 Jul 2009 03:13:18 -0000	1.20
+++ rpmdevtools.spec	21 Aug 2009 09:58:25 -0000	1.21
@@ -3,25 +3,24 @@
 %global spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        7.3
-Release:        2%{?dist}
+Version:        7.4
+Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma
+Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+Patch0:         spectool-1.0.10-sourcenum.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-# lzma for unpacking the tarball
-BuildRequires:  lzma
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python
+BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python
 Provides:       spectool = %{spectool_version}
 Requires:       diffutils
@@ -30,6 +29,8 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
+Requires:       man
+Requires:       python >= 2.4
 Requires:       rpm-build >= 4.4.2.1
 Requires:       rpm-python
 Requires:       sed
@@ -46,7 +47,7 @@ rpmdev-newspec      Creates new .spec fr
 rpmdev-rmdevelrpms  Find (and optionally remove) "development" RPMs
 rpmdev-checksig     Check package signatures using alternate RPM keyring
 rpminfo             Print information about executables and libraries
-rpmdev-md5/sha*     Display checksums of all files in an RPM package file
+rpmdev-md5/sha*     Display checksums of all files in an archive file
 rpmdev-vercmp       RPM version comparison checker
 spectool            Expand and download sources and patches in specfiles
 rpmdev-wipetree     Erase all files within dirs created by rpmdev-setuptree
@@ -57,7 +58,10 @@ rpmdev-bumpspec     Bump revision in spe
 
 %prep
 %setup -q -a 1
-cp -p spectool*/README README.spectool
+cp -p spectool-%{spectool_version}/README README.spectool
+cd spectool-%{spectool_version}
+%patch0 -p1
+cd ..
 
 
 %build
@@ -70,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
 
 for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
   install -dm 755 $RPM_BUILD_ROOT$dir
@@ -100,17 +104,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README*
+%doc COPYING NEWS README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
-%{_bindir}/rpm*
-%{_bindir}/spectool
+%{_bindir}/*
 %ghost %{_datadir}/*emacs
-%{_mandir}/man[18]/rpm*.[18]*
+%{_mandir}/man[18]/*.[18]*
 
 
 %changelog
+* Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 7.4-1
+- Update to 7.4, fixes #215927 and #466353.
+- Patch spectool to make -s and -p to work as documented (Todd Zullinger).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	24 May 2009 21:29:51 -0000	1.18
+++ sources	21 Aug 2009 09:58:25 -0000	1.19
@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-5475dc402a40356163e4a9b468f6497b  rpmdevtools-7.3.tar.lzma
+8407f2e7f2037ec28ca7910fed2c3498  rpmdevtools-7.4.tar.xz



From dwmw2 at fedoraproject.org  Fri Aug 21 10:08:51 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 21 Aug 2009 10:08:51 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom.patch, 1.1,
	1.2 kernel.spec, 1.1713, 1.1714
Message-ID: <20090821100851.E513711C00D7@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23535

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
backport fix for 514787

linux-2.6-ppc64-vs-broadcom.patch:
 dma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: linux-2.6-ppc64-vs-broadcom.patch
===================================================================
RCS file: linux-2.6-ppc64-vs-broadcom.patch
diff -N linux-2.6-ppc64-vs-broadcom.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-ppc64-vs-broadcom.patch	21 Aug 2009 10:08:51 -0000	1.2
@@ -0,0 +1,48 @@
+From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date: Mon, 10 Aug 2009 16:36:38 +1000
+Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
+
+On an iMac G5, the b43 driver is failing to initialise because trying to
+set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
+in the machine anyway:
+	https://bugzilla.redhat.com/show_bug.cgi?id=514787
+
+We should probably let it succeed if the available RAM in the system
+doesn't exceed the requested limit.
+
+Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+---
+ arch/powerpc/kernel/dma.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
+index 20a60d6..ccf129d 100644
+--- a/arch/powerpc/kernel/dma.c
++++ b/arch/powerpc/kernel/dma.c
+@@ -7,6 +7,7 @@
+ 
+ #include <linux/device.h>
+ #include <linux/dma-mapping.h>
++#include <linux/lmb.h>
+ #include <asm/bug.h>
+ #include <asm/abs_addr.h>
+ 
+@@ -90,11 +91,10 @@ static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
+ static int dma_direct_dma_supported(struct device *dev, u64 mask)
+ {
+ #ifdef CONFIG_PPC64
+-	/* Could be improved to check for memory though it better be
+-	 * done via some global so platforms can set the limit in case
++	/* Could be improved so platforms can set the limit in case
+ 	 * they have limited DMA windows
+ 	 */
+-	return mask >= DMA_BIT_MASK(32);
++	return mask >= (lmb_end_of_DRAM() - 1);
+ #else
+ 	return 1;
+ #endif
+-- 
+1.6.2.5
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1713
retrieving revision 1.1714
diff -u -p -r1.1713 -r1.1714
--- kernel.spec	19 Aug 2009 14:21:39 -0000	1.1713
+++ kernel.spec	21 Aug 2009 10:08:50 -0000	1.1714
@@ -605,6 +605,7 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
+Patch148: linux-2.6-ppc64-vs-broadcom.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1161,7 +1162,9 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
-
+# Fix b43 support on no-iommu devices with <1GiB RAM
+ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
+ 
 #
 # SPARC64
 #
@@ -1903,6 +1906,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Fix b43 on iMac G5 (#514787)
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   to improve mmap_min_addr.



From twaugh at fedoraproject.org  Fri Aug 21 10:15:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 21 Aug 2009 10:15:19 +0000 (UTC)
Subject: rpms/foomatic/F-11 .cvsignore, 1.72, 1.73 foomatic.spec, 1.221,
	1.222 sources, 1.74, 1.75 foomatic-epson-stylus-color-200.patch,
	1.1, NONE
Message-ID: <20090821101519.4769F11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24799

Modified Files:
	.cvsignore foomatic.spec sources 
Removed Files:
	foomatic-epson-stylus-color-200.patch 
Log Message:
* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
- Updated to foomatic-db-4.0-20090819.  Removed db-hpijs.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	2 Jul 2009 15:46:04 -0000	1.72
+++ .cvsignore	21 Aug 2009 10:15:18 -0000	1.73
@@ -77,3 +77,4 @@ foomatic-filters-4.0.2.tar.gz
 foomatic-db-engine-4.0.2.tar.gz
 foomatic-db-hpijs-20090701.tar.gz
 foomatic-db-4.0-20090702.tar.gz
+foomatic-db-4.0-20090819.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- foomatic.spec	20 Aug 2009 09:57:56 -0000	1.221
+++ foomatic.spec	21 Aug 2009 10:15:19 -0000	1.222
@@ -1,13 +1,12 @@
 %define dbver_rel 4.0
-%define dbver_snap 20090702
+%define dbver_snap 20090819
 %define enginever 4.0.2
 %define filtersver 4.0.2
-%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -19,7 +18,6 @@ Source0: http://www.openprinting.org/dow
 
 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)
 
@@ -40,7 +38,6 @@ Patch102: foomatic-bad-utf8.patch
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 ## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)
-Patch301: foomatic-epson-stylus-color-200.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -85,7 +82,7 @@ queues (foomatic-configure) and to print
 The site http://www.linuxprinting.org/ is based on this database.
 
 %prep
-%setup -q -c -a 1 -a 2 -a 3
+%setup -q -c -a 1 -a 2
 
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
@@ -98,12 +95,7 @@ chmod a+x mkinstalldirs
 %patch102 -p1
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-popd
-
 pushd foomatic-db-%{dbver_snap}
-%patch301 -p1 -b .epson-stylus-color-200
-
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -150,11 +142,6 @@ pushd foomatic-db-%{dbver_snap}
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-%configure
-make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -184,13 +171,6 @@ make	DESTDIR=%buildroot PREFIX=%{_prefix
 
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-make	DESTDIR=%buildroot PREFIX=%{_prefix} \
-	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
-	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
-	install
-popd
-
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
 
@@ -248,6 +228,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* 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).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	2 Jul 2009 15:46:04 -0000	1.74
+++ sources	21 Aug 2009 10:15:19 -0000	1.75
@@ -1,4 +1,3 @@
 9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
 8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
-2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
-df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
+b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz


--- foomatic-epson-stylus-color-200.patch DELETED ---



From than at fedoraproject.org  Fri Aug 21 10:17:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 21 Aug 2009 10:17:21 +0000 (UTC)
Subject: rpms/mozplugger/devel mozplugger.spec,1.35,1.36
Message-ID: <20090821101721.7C59C11C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/mozplugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25232

Modified Files:
	mozplugger.spec 
Log Message:
- drop Obsoletes on plugger
- add comments for the patches




Index: mozplugger.spec
===================================================================
RCS file: /cvs/extras/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mozplugger.spec	21 Aug 2009 09:29:19 -0000	1.35
+++ mozplugger.spec	21 Aug 2009 10:17:21 -0000	1.36
@@ -1,13 +1,15 @@
 Summary: A generic mozilla plug-in
 Name: mozplugger
 Version: 1.12.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Url: http://mozplugger.mozdev.org/
-
 Source0: http://mozplugger.mozdev.org/files/%{name}-%{version}.tar.gz
+
+# fix lib64 issue
 Patch1: mozplugger-1.12.1-lib64.patch
+# fix #513470, using a wrong path for executable
 Patch2: mozplugger-1.12.1-path.patch
 
 Requires: m4
@@ -19,7 +21,6 @@ BuildRequires: libXt-devel
 BuildRequires: coreutils
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Obsoletes: plugger
 
 %description
 MozPlugger is a generic Mozilla plug-in that allows the use of standard Linux
@@ -55,6 +56,10 @@ rm -rf %{buildroot}
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
+* Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.12.1-7
+- drop Obsoletes on plugger
+- add comments for the patches
+
 * Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.12.1-6
 - fix #226159, merge review
 



From tmraz at fedoraproject.org  Fri Aug 21 10:19:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:19:21 +0000 (UTC)
Subject: rpms/aide/devel aide.spec,1.32,1.33
Message-ID: <20090821101921.849CA11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25685

Modified Files:
	aide.spec 
Log Message:
- rebuilt with new audit


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- aide.spec	19 Aug 2009 21:44:33 -0000	1.32
+++ aide.spec	21 Aug 2009 10:19:21 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.13.1-12
+- rebuilt with new audit
+
 * Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 0.13.1-11
 - rebuild for new audit-libs
 - Correct regex for root's dot files (#509370)



From tmraz at fedoraproject.org  Fri Aug 21 10:19:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:19:57 +0000 (UTC)
Subject: rpms/amtu/devel amtu.spec,1.30,1.31
Message-ID: <20090821101957.5D6EE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/amtu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26013

Modified Files:
	amtu.spec 
Log Message:
- rebuilt with new audit


Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- amtu.spec	19 Aug 2009 17:30:20 -0000	1.30
+++ amtu.spec	21 Aug 2009 10:19:57 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
@@ -56,6 +56,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.8-3
+- rebuilt with new audit
+
 * Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-2
 - rebuild for new audit-libs
 



From markmc at fedoraproject.org  Fri Aug 21 10:19:54 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 21 Aug 2009 10:19:54 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.172,1.173
Message-ID: <20090821101954.18B5511C00D7@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25957

Modified Files:
	libvirt.spec 
Log Message:
Add URL to source tag



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- libvirt.spec	19 Aug 2009 17:13:01 -0000	1.172
+++ libvirt.spec	21 Aug 2009 10:19:53 -0000	1.173
@@ -81,7 +81,7 @@ Version: 0.7.0
 Release: 6%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: libvirt-%{version}.tar.gz
+Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
 
 # Make sure qemu can access kernel/initrd (bug #516034)
 Patch01: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch



From markmc at fedoraproject.org  Fri Aug 21 10:20:12 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 21 Aug 2009 10:20:12 +0000 (UTC)
Subject: rpms/libvirt/F-11 libvirt.spec,1.140,1.141
Message-ID: <20090821102012.B049911C0417@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26129

Modified Files:
	libvirt.spec 
Log Message:
Add URL to source tag



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- libvirt.spec	19 Aug 2009 17:08:59 -0000	1.140
+++ libvirt.spec	21 Aug 2009 10:20:12 -0000	1.141
@@ -69,7 +69,7 @@ Version: 0.6.2
 Release: 17%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: libvirt-%{version}.tar.gz
+Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
 
 # Patches cherry-picked from upstream
 Patch0: libvirt-0.6.2-qemu-drive-format.patch



From tmraz at fedoraproject.org  Fri Aug 21 10:23:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:23:22 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.25,1.26
Message-ID: <20090821102322.0FB0311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27434

Modified Files:
	cronie.spec 
Log Message:
- rebuilt with new audit


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- cronie.spec	14 Aug 2009 13:54:42 -0000	1.25
+++ cronie.spec	21 Aug 2009 10:23:21 -0000	1.26
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -173,6 +173,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-3
+- rebuilt with new audit
+
 * Fri Aug 14 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-2
 - create the anacron timestamps in correct post script
 



From pmatilai at fedoraproject.org  Fri Aug 21 10:23:52 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri, 21 Aug 2009 10:23:52 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite-3.6.17-tkt3951.patch, NONE, 1.1 .cvsignore,
	1.29, 1.30 sources, 1.29, 1.30 sqlite.spec, 1.64, 1.65
Message-ID: <20090821102352.8DB9D11C00D7@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27527

Modified Files:
	.cvsignore sources sqlite.spec 
Added Files:
	sqlite-3.6.17-tkt3951.patch 
Log Message:
- update to 3.6.17
- disable to failing tests until upstream fixes


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;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	12 Jun 2009 10:34:58 -0000	1.29
+++ .cvsignore	21 Aug 2009 10:23:52 -0000	1.30
@@ -1,3 +1,2 @@
-sqlite-3.6.14.tar.gz
-sqlite_docs_3_6_14.zip
-sqlite-3.6.14.2.tar.gz
+sqlite-3.6.17.tar.gz
+sqlite_docs_3_6_17.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	12 Jun 2009 10:34:58 -0000	1.29
+++ sources	21 Aug 2009 10:23:52 -0000	1.30
@@ -1,2 +1,2 @@
-e2f5bb05bee9f6854728341058acbd5b  sqlite_docs_3_6_14.zip
-4c074691b48cd45854899ae4fece6301  sqlite-3.6.14.2.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/devel/sqlite.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sqlite.spec	27 Jul 2009 04:43:48 -0000	1.64
+++ sqlite.spec	21 Aug 2009 10:23:52 -0000	1.65
@@ -4,13 +4,13 @@
 %bcond_without check
 
 # upstream doesn't provide separate -docs sources for all minor releases
-%define basever 3.6.14
+%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: %{basever}.2
-Release: 2%{?dist}
+Version: %{basever}
+Release: 1%{?dist}
 License: Public Domain
 Group: Applications/Databases
 URL: http://www.sqlite.org/
@@ -22,6 +22,8 @@ Patch1: sqlite-3.6.12-libdl.patch
 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
@@ -93,6 +95,7 @@ This package contains the tcl modules fo
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
 %patch3 -p1 -b .nodirsync
+%patch4 -p1 -b .tkt3951
 
 %build
 autoconf
@@ -175,6 +178,10 @@ 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
 



From tmraz at fedoraproject.org  Fri Aug 21 10:24:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:24:39 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.504,1.505
Message-ID: <20090821102439.22DE711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27797

Modified Files:
	cups.spec 
Log Message:
- rebuilt with new audit


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- cups.spec	21 Aug 2009 09:08:00 -0000	1.504
+++ cups.spec	21 Aug 2009 10:24:38 -0000	1.505
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.17%{?dist}
+Release: 0.%{pre}.17%{?dist}.1
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.4-0.rc1.17.1
+- rebuilt with new audit
+
 * Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17
 - Removed 3-distribution symlink (bug #514244).
 



From tmraz at fedoraproject.org  Fri Aug 21 10:25:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:25:24 +0000 (UTC)
Subject: rpms/dbus/devel dbus.spec,1.172,1.173
Message-ID: <20090821102524.4D45011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27984

Modified Files:
	dbus.spec 
Log Message:
- rebuilt with new audit


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- dbus.spec	24 Jul 2009 20:01:28 -0000	1.172
+++ dbus.spec	21 Aug 2009 10:25:24 -0000	1.173
@@ -9,7 +9,7 @@ Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
 Version: 1.2.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -226,6 +226,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.16-5
+- rebuilt with new audit
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 10:26:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:26:06 +0000 (UTC)
Subject: rpms/frysk/devel frysk.spec,1.149,1.150
Message-ID: <20090821102606.2C30611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28182

Modified Files:
	frysk.spec 
Log Message:
- rebuilt with new audit


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- frysk.spec	24 Jul 2009 23:14:00 -0000	1.149
+++ frysk.spec	21 Aug 2009 10:26:05 -0000	1.150
@@ -1,7 +1,7 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -280,6 +280,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/frysk.1.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-12
+- rebuilt with new audit
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 10:28:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:28:08 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.481,1.482
Message-ID: <20090821102808.A5F1C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28569

Modified Files:
	gdm.spec 
Log Message:
- rebuilt with new audit


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -p -r1.481 -r1.482
--- gdm.spec	19 Aug 2009 13:52:40 -0000	1.481
+++ gdm.spec	21 Aug 2009 10:28:08 -0000	1.482
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.27.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -391,6 +391,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:2.27.4-7
+- rebuilt with new audit
+
 * Wed Aug 19 2009 Lennart Poettering <lpoetter at redhat.com> 1:2.27.4-6
 - Add pulseaudio-gdm-hooks to dependencies
 



From tmraz at fedoraproject.org  Fri Aug 21 10:28:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 10:28:44 +0000 (UTC)
Subject: rpms/passwd/devel passwd.spec,1.40,1.41
Message-ID: <20090821102844.B80D211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/passwd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28762

Modified Files:
	passwd.spec 
Log Message:
- rebuilt with new audit


Index: passwd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- passwd.spec	20 Aug 2009 13:47:10 -0000	1.40
+++ passwd.spec	21 Aug 2009 10:28:44 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: An utility for setting or changing passwords using PAM
 Name: passwd
 Version: 0.76
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://fedorahosted.org/passwd
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.76-5
+- rebuilt with new audit
+
 * Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.76-4
 - rebuilt with new audit library
 



From mhlavink at fedoraproject.org  Fri Aug 21 10:44:37 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 21 Aug 2009 10:44:37 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.56, 1.57 dovecot.spec, 1.133,
	1.134 sources, 1.60, 1.61 dovecot-sieve-0.1.11.patch, 1.1, NONE
Message-ID: <20090821104437.94E5311C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31261

Modified Files:
	.cvsignore dovecot.spec sources 
Removed Files:
	dovecot-sieve-0.1.11.patch 
Log Message:
- updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	10 Aug 2009 05:06:15 -0000	1.56
+++ .cvsignore	21 Aug 2009 10:44:35 -0000	1.57
@@ -1,4 +1,4 @@
-dovecot-1.2.3.tar.gz
-dovecot-1.2-managesieve-0.11.8.tar.gz
-dovecot-1.2.3-managesieve-0.11.8.diff.gz
-dovecot-1.2-sieve-0.1.11.tar.gz
+dovecot-1.2.4.tar.gz
+dovecot-1.2-managesieve-0.11.9.tar.gz
+dovecot-1.2.4-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.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- dovecot.spec	10 Aug 2009 16:04:58 -0000	1.133
+++ dovecot.spec	21 Aug 2009 10:44:35 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -14,9 +14,9 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.11
+%define sieve_version 0.1.12
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.8
+%define managesieve_version 0.11.9
 %define managesieve_name dovecot-1.2-managesieve
 
 URL: http://www.dovecot.org/
@@ -38,9 +38,6 @@ Patch1: dovecot-1.1-default-settings.pat
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-#temporary for dovecot-sieve 0.1.11 only
-Patch4: dovecot-sieve-0.1.11.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -174,7 +171,6 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 
 %if %{build_sieve}
 %setup -q -D -T -a 8
-%patch4 -p0 -b .devnull
 %endif
 
 %if %{build_managesieve}
@@ -439,6 +435,17 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.4-1
+- updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12
+- fixed a crash in index file handling
+- fixed a crash in saving messages where message contained a CR
+  character that wasn't followed by LF
+- fixed a crash when listing shared namespace prefix
+- sieve: implemented the new date extension. This allows matching
+  against date values in header fields and the current date at
+  the time of script evaluation
+- managesieve: reintroduced ability to abort SASL with "*" response
+
 * Mon Aug 10 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.3-1
 - updated: dovecot 1.2.3, managesieve 0.11.8, sieve 0.1.11
 - Mailbox names with control characters can't be created anymore.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	10 Aug 2009 05:06:15 -0000	1.60
+++ sources	21 Aug 2009 10:44:35 -0000	1.61
@@ -1,4 +1,4 @@
-28905211d9301022a1ed20df71ad2b08  dovecot-1.2.3.tar.gz
-8cebb8ae5aa4ace658f5abfb53357a86  dovecot-1.2-managesieve-0.11.8.tar.gz
-8753084aa9b4b9a5d85e15013ccc21af  dovecot-1.2.3-managesieve-0.11.8.diff.gz
-c9d8a8668707a831710c7fba06a3bc08  dovecot-1.2-sieve-0.1.11.tar.gz
+3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
+923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
+6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
+8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz


--- dovecot-sieve-0.1.11.patch DELETED ---



From mhlavink at fedoraproject.org  Fri Aug 21 10:56:56 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 21 Aug 2009 10:56:56 +0000 (UTC)
Subject: rpms/dovecot/F-11 .cvsignore, 1.64, 1.65 dovecot.spec, 1.138,
	1.139 sources, 1.67, 1.68 dovecot-sieve-0.1.11.patch, 1.1, NONE
Message-ID: <20090821105656.9C75511C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1592

Modified Files:
	.cvsignore dovecot.spec sources 
Removed Files:
	dovecot-sieve-0.1.11.patch 
Log Message:
updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	11 Aug 2009 05:33:57 -0000	1.64
+++ .cvsignore	21 Aug 2009 10:56:56 -0000	1.65
@@ -1,4 +1,4 @@
-dovecot-1.2.3.tar.gz
-dovecot-1.2-managesieve-0.11.8.tar.gz
-dovecot-1.2.3-managesieve-0.11.8.diff.gz
-dovecot-1.2-sieve-0.1.11.tar.gz
+dovecot-1.2.4.tar.gz
+dovecot-1.2-managesieve-0.11.9.tar.gz
+dovecot-1.2.4-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.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- dovecot.spec	11 Aug 2009 05:33:57 -0000	1.138
+++ dovecot.spec	21 Aug 2009 10:56:56 -0000	1.139
@@ -1,7 +1,7 @@
-Summary: Dovecot Secure imap server
+Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -14,9 +14,9 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.11
+%define sieve_version 0.1.12
 %define sieve_name dovecot-1.2-sieve
-%define managesieve_version 0.11.8
+%define managesieve_version 0.11.9
 %define managesieve_name dovecot-1.2-managesieve
 
 URL: http://www.dovecot.org/
@@ -38,9 +38,6 @@ Patch1: dovecot-1.1-default-settings.pat
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-#temporary for dovecot-sieve 0.1.11 only
-Patch4: dovecot-sieve-0.1.11.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -174,7 +171,6 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 
 %if %{build_sieve}
 %setup -q -D -T -a 8
-%patch4 -p0 -b .devnull
 %endif
 
 %if %{build_managesieve}
@@ -439,6 +435,17 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.4-1
+- updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12
+- fixed a crash in index file handling
+- fixed a crash in saving messages where message contained a CR
+  character that wasn't followed by LF
+- fixed a crash when listing shared namespace prefix
+- sieve: implemented the new date extension. This allows matching
+  against date values in header fields and the current date at
+  the time of script evaluation
+- managesieve: reintroduced ability to abort SASL with "*" response
+
 * Mon Aug 10 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.3-1
 - updated: dovecot 1.2.3, managesieve 0.11.8, sieve 0.1.11
 - Mailbox names with control characters can't be created anymore.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	11 Aug 2009 05:33:57 -0000	1.67
+++ sources	21 Aug 2009 10:56:56 -0000	1.68
@@ -1,4 +1,4 @@
-28905211d9301022a1ed20df71ad2b08  dovecot-1.2.3.tar.gz
-8cebb8ae5aa4ace658f5abfb53357a86  dovecot-1.2-managesieve-0.11.8.tar.gz
-8753084aa9b4b9a5d85e15013ccc21af  dovecot-1.2.3-managesieve-0.11.8.diff.gz
-c9d8a8668707a831710c7fba06a3bc08  dovecot-1.2-sieve-0.1.11.tar.gz
+3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
+923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
+6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
+8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz


--- dovecot-sieve-0.1.11.patch DELETED ---



From mhlavink at fedoraproject.org  Fri Aug 21 11:02:45 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 21 Aug 2009 11:02:45 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch, NONE,
	1.1 smartmontools.spec, 1.56, 1.57
Message-ID: <20090821110245.0949711C00D7@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2679

Modified Files:
	smartmontools.spec 
Added Files:
	smartmontools-5.38-lowcap.patch 
Log Message:
drop all unnecessary capabilities (#517728)


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |    2 ++
 smartd.cpp   |   12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE smartmontools-5.38-lowcap.patch ---
diff -urp smartmontools-5.38.orig/configure.in smartmontools-5.38/configure.in
--- smartmontools-5.38.orig/configure.in	2009-08-16 07:42:57.000000000 -0400
+++ smartmontools-5.38/configure.in	2009-08-16 08:07:53.000000000 -0400
@@ -143,6 +143,8 @@ if test "$with_selinux" = "yes"; then
 	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
 fi
 
+LIBCAP_NG_PATH
+
 if test "$prefix" = "NONE"; then
     dnl no prefix and no mandir, so use ${prefix}/share/man as default
     if test "$mandir" = '${prefix}/man'; then
diff -urp smartmontools-5.38.orig/Makefile.am smartmontools-5.38/Makefile.am
--- smartmontools-5.38.orig/Makefile.am	2009-08-16 07:42:57.000000000 -0400
+++ smartmontools-5.38/Makefile.am	2009-08-16 08:07:53.000000000 -0400
@@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                   utility.cpp     \
                   utility.h
 
-smartd_LDADD = @os_deps@ @os_libs@
+smartd_LDADD = @os_deps@ @os_libs@ @CAPNG_LDADD@
 smartd_DEPENDENCIES = @os_deps@
 
 EXTRA_smartd_SOURCES = os_darwin.cpp    \
diff -urp smartmontools-5.38.orig/smartd.cpp smartmontools-5.38/smartd.cpp
--- smartmontools-5.38.orig/smartd.cpp	2009-08-16 07:42:57.000000000 -0400
+++ smartmontools-5.38/smartd.cpp	2009-08-16 08:08:27.000000000 -0400
@@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
 #include <io.h> // setmode()
 #endif // __CYGWIN__
 
+#ifdef HAVE_LIBCAP_NG
+#include <cap-ng.h>
+#endif //LIBCAP_NG
+
 // locally included files
 #include "int64.h"
 #include "atacmds.h"
@@ -4408,6 +4412,14 @@ 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_update(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
+               CAP_SYS_ADMIN);
+  capng_apply(CAPNG_SELECT_BOTH);
+#endif
   
   // the main loop of the code
   while (1){


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- smartmontools.spec	27 Jul 2009 04:28:47 -0000	1.56
+++ smartmontools.spec	21 Aug 2009 11:02:44 -0000	1.57
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	13%{?dist}
+Release: 	14%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -14,6 +14,7 @@ Patch2:     smartmontools-5.37-addrinfo.
 Patch3:     smartmontools-5.38-perc.patch
 Patch4:     smartmontools-5.38-selinux.patch
 Patch5:     smartmontools-5.38-defaultconf.patch
+Patch6:     smartmontools-5.38-lowcap.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	fileutils mailx chkconfig initscripts
 BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext
@@ -34,6 +35,7 @@ failure.
 %patch3 -p1 -b .perc
 %patch4 -p1 -b .selinux
 %patch5 -p1 -b .defaultconf
+%patch6 -p1 -b .lowcap
 
 %build
 %configure --with-selinux
@@ -75,6 +77,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Aug 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-14
+- drop all unnecessary capabilities (#517728)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.38-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hubbitus at fedoraproject.org  Fri Aug 21 11:07:54 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Fri, 21 Aug 2009 11:07:54 +0000 (UTC)
Subject: rpms/sim/devel .cvsignore, 1.3, 1.4 sim.spec, 1.14, 1.15 sources,
	1.3, 1.4
Message-ID: <20090821110754.D1AE811C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3493

Modified Files:
	.cvsignore sim.spec sources 
Log Message:
- New version.
- Name directory in tarball sim instead of trunk.
- Step to lzma source packaging.
- For BUG#478341 fixing add R kdebase3-libs




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jun 2009 11:54:41 -0000	1.3
+++ .cvsignore	21 Aug 2009 11:07:54 -0000	1.4
@@ -1,2 +1 @@
-sim-0.9.5-SVN20090616rev2730.tar.bz2
-sim-0.9.5svn-fix-automake-versioncompare.patch
+sim-0.9.5-SVN20090821rev2902.tar.lzma


Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sim.spec	27 Jul 2009 04:20:05 -0000	1.14
+++ sim.spec	21 Aug 2009 11:07:54 -0000	1.15
@@ -1,12 +1,12 @@
 %bcond_without kde
-%define SVNdate 20090616
-%define SVNrev 2730
+%define SVNdate 20090821
+%define SVNrev 2902
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.18.%{SVNdate}svn%{SVNrev}rev%{?dist}
-#svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; find -iname '*win32*' -exec rm -r {} \; ; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
-Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
+Release:		0.19.%{SVNdate}svn%{SVNrev}rev%{?dist}
+#svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk sim; find sim -iname '*win32*' -exec rm -r {} \; ; tar --use-compress-program lzma -cf 'sim-0.9.5-SVN20090821rev2902.tar.lzma' sim
+Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.lzma
 Summary:		Multiprotocol Instant Messenger
 Summary(de):	Multiprotokoll Instant Messenger
 Summary(ru):	?????????????????? ??????????
@@ -17,7 +17,7 @@ BuildRequires:	autoconf >= 2.52, automak
 BuildRequires:	zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
 BuildRequires:	openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
 BuildRequires:	zip desktop-file-utils
-Requires:		openssl, arts >= 1.0
+Requires:		openssl, arts >= 1.0, kdebase3-libs
 %if %{with kde}
 %if %{fedora} == 8
 BuildRequires:	kdebase-devel >= 3.0.0, kdelibs-devel >= 3.0.0
@@ -73,7 +73,7 @@ http://sim-im.org/
 
 
 %prep
-%setup -q -n trunk
+%setup -q -n %{name}
 %patch0 -p0 -b .vercmp
 
 make -f admin/Makefile.common
@@ -140,6 +140,12 @@ fi
 %{_datadir}/services/
 
 %changelog
+* Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.19.20090821svn2902rev
+- New version.
+- Name directory in tarball sim instead of trunk.
+- Step to lzma source packaging.
+- For BUG#478341 fixing add R kdebase3-libs
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.18.20090616svn2730rev
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jun 2009 11:54:42 -0000	1.3
+++ sources	21 Aug 2009 11:07:54 -0000	1.4
@@ -1,2 +1 @@
-82b2f7d26fa5727ce3e6aba3af7a27d9  sim-0.9.5-SVN20090616rev2730.tar.bz2
-ddc71a5bba18325a00dd515ad58815a4  sim-0.9.5svn-fix-automake-versioncompare.patch
+713e85baceac1a02b2dcd9eeeb548353  sim-0.9.5-SVN20090821rev2902.tar.lzma



From sharkcz at fedoraproject.org  Fri Aug 21 11:13:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 11:13:53 +0000 (UTC)
Subject: rpms/collectl/devel .cvsignore, 1.11, 1.12 collectl.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20090821111353.B3B1611C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4588

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
- upgrade to upstream version 3.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 Jun 2009 07:59:16 -0000	1.11
+++ .cvsignore	21 Aug 2009 11:13:52 -0000	1.12
@@ -1 +1 @@
-collectl-3.3.4.src.tar.gz
+collectl-3.3.5.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- collectl.spec	24 Jul 2009 19:14:35 -0000	1.14
+++ collectl.spec	21 Aug 2009 11:13:52 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.4
-Release: 3%{?dist}
+Version: 3.3.5
+Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
@@ -95,6 +95,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
+- upgrade to upstream version 3.3.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Jun 2009 07:59:16 -0000	1.11
+++ sources	21 Aug 2009 11:13:52 -0000	1.12
@@ -1 +1 @@
-c5044a5366bd3de071da0b49dae45d93  collectl-3.3.4.src.tar.gz
+23772c225348712f593e43a2ad221bb3  collectl-3.3.5.src.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 11:14:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:14:26 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.626,1.627
Message-ID: <20090821111426.86D5811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4735

Modified Files:
	policycoreutils.spec 
Log Message:
- rebuilt with new audit


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -p -r1.626 -r1.627
--- policycoreutils.spec	20 Aug 2009 19:05:32 -0000	1.626
+++ policycoreutils.spec	21 Aug 2009 11:14:26 -0000	1.627
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ else
 fi
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.71-8
+- rebuilt with new audit
+
 * Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-7
 - Fix glob handling of /..
 



From hubbitus at fedoraproject.org  Fri Aug 21 11:15:21 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Fri, 21 Aug 2009 11:15:21 +0000 (UTC)
Subject: rpms/sim/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090821111521.C6A0411C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4929

Modified Files:
	.cvsignore sources 
Log Message:
Add patch sim-0.9.5svn-fix-automake-versioncompare.patch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Aug 2009 11:07:54 -0000	1.4
+++ .cvsignore	21 Aug 2009 11:15:21 -0000	1.5
@@ -1 +1,2 @@
 sim-0.9.5-SVN20090821rev2902.tar.lzma
+sim-0.9.5svn-fix-automake-versioncompare.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Aug 2009 11:07:54 -0000	1.4
+++ sources	21 Aug 2009 11:15:21 -0000	1.5
@@ -1 +1,2 @@
 713e85baceac1a02b2dcd9eeeb548353  sim-0.9.5-SVN20090821rev2902.tar.lzma
+ddc71a5bba18325a00dd515ad58815a4  sim-0.9.5svn-fix-automake-versioncompare.patch



From tmraz at fedoraproject.org  Fri Aug 21 11:15:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:15:34 +0000 (UTC)
Subject: rpms/readahead/devel readahead.spec,1.58,1.59
Message-ID: <20090821111534.713A311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5072

Modified Files:
	readahead.spec 
Log Message:
- rebuilt with new audit


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- readahead.spec	13 Aug 2009 11:08:11 -0000	1.58
+++ readahead.spec	21 Aug 2009 11:15:33 -0000	1.59
@@ -1,7 +1,7 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -68,6 +68,9 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.5.0-2
+- rebuilt with new audit
+
 * Thu Aug 13 2009 Harald Hoyer <harald at redhat.com> 1.5.0-1
 - version 1.5.0
 - see http://git.fedorahosted.org/git/readahead?p=readahead;a=blob;f=NEWS;hb=HEAD



From sharkcz at fedoraproject.org  Fri Aug 21 11:16:12 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 11:16:12 +0000 (UTC)
Subject: rpms/collectl/F-11 .cvsignore, 1.11, 1.12 collectl.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <20090821111612.41F3611C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5286

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
- upgrade to upstream version 3.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 Jun 2009 08:05:58 -0000	1.11
+++ .cvsignore	21 Aug 2009 11:16:11 -0000	1.12
@@ -1 +1 @@
-collectl-3.3.4.src.tar.gz
+collectl-3.3.5.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/collectl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- collectl.spec	29 Jun 2009 17:55:28 -0000	1.13
+++ collectl.spec	21 Aug 2009 11:16:11 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.4
-Release: 2%{?dist}
+Version: 3.3.5
+Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
@@ -95,6 +95,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
+- upgrade to upstream version 3.3.5
+
 * Mon Jun 29 2009 Dan Hor?k <dan[at]danny.cz> 3.3.4-2
 - install only a symlink into /usr/bin (#508724)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Jun 2009 08:05:58 -0000	1.11
+++ sources	21 Aug 2009 11:16:12 -0000	1.12
@@ -1 +1 @@
-c5044a5366bd3de071da0b49dae45d93  collectl-3.3.4.src.tar.gz
+23772c225348712f593e43a2ad221bb3  collectl-3.3.5.src.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 11:17:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:17:01 +0000 (UTC)
Subject: rpms/rsh/devel rsh.spec,1.52,1.53
Message-ID: <20090821111701.CC57911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5510

Modified Files:
	rsh.spec 
Log Message:
- rebuilt with new audit


Index: rsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- rsh.spec	11 Aug 2009 12:44:32 -0000	1.52
+++ rsh.spec	21 Aug 2009 11:17:01 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -194,6 +194,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.17-57
+- rebuilt with new audit
+
 * Tue Aug 11 2009 Adam Tkac <atkac redhat com> 0.17-56
 - remove URL from rexec source, it is no longer publicly available
 



From sharkcz at fedoraproject.org  Fri Aug 21 11:17:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 11:17:09 +0000 (UTC)
Subject: rpms/collectl/F-10 .cvsignore, 1.11, 1.12 collectl.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <20090821111709.483DD11C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5549

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
- upgrade to upstream version 3.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 Jun 2009 08:07:22 -0000	1.11
+++ .cvsignore	21 Aug 2009 11:17:08 -0000	1.12
@@ -1 +1 @@
-collectl-3.3.4.src.tar.gz
+collectl-3.3.5.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/collectl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- collectl.spec	29 Jun 2009 17:57:02 -0000	1.11
+++ collectl.spec	21 Aug 2009 11:17:08 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.4
-Release: 2%{?dist}
+Version: 3.3.5
+Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
@@ -95,6 +95,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
+- upgrade to upstream version 3.3.5
+
 * Mon Jun 29 2009 Dan Hor?k <dan[at]danny.cz> 3.3.4-2
 - install only a symlink into /usr/bin (#508724)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Jun 2009 08:07:22 -0000	1.11
+++ sources	21 Aug 2009 11:17:08 -0000	1.12
@@ -1 +1 @@
-c5044a5366bd3de071da0b49dae45d93  collectl-3.3.4.src.tar.gz
+23772c225348712f593e43a2ad221bb3  collectl-3.3.5.src.tar.gz



From sharkcz at fedoraproject.org  Fri Aug 21 11:18:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 21 Aug 2009 11:18:03 +0000 (UTC)
Subject: rpms/collectl/EL-5 .cvsignore, 1.11, 1.12 collectl.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <20090821111803.A0E8E11C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5819

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
- upgrade to upstream version 3.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 Jun 2009 08:08:52 -0000	1.11
+++ .cvsignore	21 Aug 2009 11:18:03 -0000	1.12
@@ -1 +1 @@
-collectl-3.3.4.src.tar.gz
+collectl-3.3.5.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- collectl.spec	29 Jun 2009 17:58:56 -0000	1.11
+++ collectl.spec	21 Aug 2009 11:18:03 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.3.4
-Release: 2%{?dist}
+Version: 3.3.5
+Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
@@ -95,6 +95,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Dan Hor?k <dan[at]danny.cz> 3.3.5-1
+- upgrade to upstream version 3.3.5
+
 * Mon Jun 29 2009 Dan Hor?k <dan[at]danny.cz> 3.3.4-2
 - install only a symlink into /usr/bin (#508724)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Jun 2009 08:08:52 -0000	1.11
+++ sources	21 Aug 2009 11:18:03 -0000	1.12
@@ -1 +1 @@
-c5044a5366bd3de071da0b49dae45d93  collectl-3.3.4.src.tar.gz
+23772c225348712f593e43a2ad221bb3  collectl-3.3.5.src.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 11:18:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:18:13 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.137,1.138
Message-ID: <20090821111813.C900911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5875

Modified Files:
	shadow-utils.spec 
Log Message:
- rebuilt with new audit


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- shadow-utils.spec	5 Aug 2009 11:50:03 -0000	1.137
+++ shadow-utils.spec	21 Aug 2009 11:18:13 -0000	1.138
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:4.1.4.1-7
+- rebuilt with new audit
+
 * Wed Aug 05 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.4.1-6
 - increase threshold for uid/gid reservations to 200 (#515667)
 



From mmaslano at fedoraproject.org  Fri Aug 21 11:19:00 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 21 Aug 2009 11:19:00 +0000 (UTC)
Subject: rpms/perl-PAR/devel .cvsignore, 1.3, 1.4 perl-PAR.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090821111900.6319011C00D7@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PAR/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6145

Modified Files:
	.cvsignore perl-PAR.spec sources 
Log Message:
* Fri Aug 21 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.994-1
- update and fix 505576 which was probably fixed by new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Apr 2009 10:43:09 -0000	1.3
+++ .cvsignore	21 Aug 2009 11:18:59 -0000	1.4
@@ -1 +1 @@
-PAR-0.992.tar.gz
+PAR-0.994.tar.gz


Index: perl-PAR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/perl-PAR.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-PAR.spec	26 Jul 2009 13:53:13 -0000	1.5
+++ perl-PAR.spec	21 Aug 2009 11:19:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-PAR
-Version:        0.992
-Release:        2%{?dist}
+Version:        0.994
+Release:        1%{?dist}
 Summary:        Perl Archive Toolkit
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,7 +8,6 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/PAR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.0
 BuildRequires:  perl(Archive::Zip) >= 1
 BuildRequires:  perl(Compress::Zlib) >= 1.3
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -52,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.994-1
+- update and fix 505576 which was probably fixed by new release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.992-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Apr 2009 10:43:09 -0000	1.3
+++ sources	21 Aug 2009 11:19:00 -0000	1.4
@@ -1 +1 @@
-784a47222ed506224eba1ede7873db5b  PAR-0.992.tar.gz
+fb59e35d9a21c87c8f41bd1ef5913d44  PAR-0.994.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 11:19:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:19:04 +0000 (UTC)
Subject: rpms/sudo/devel sudo.spec,1.80,1.81
Message-ID: <20090821111904.2836C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6181

Modified Files:
	sudo.spec 
Log Message:
- rebuilt with new audit


Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sudo.spec	20 Aug 2009 13:01:46 -0000	1.80
+++ sudo.spec	21 Aug 2009 11:19:03 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.7.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.7.1-7
+- rebuilt with new audit
+
 * Thu Aug 20 2009 Daniel Kopecek <dkopecek at redhat.com> 1.7.1-6
 - moved secure_path from compile-time option to sudoers file (#517428)
 



From tmraz at fedoraproject.org  Fri Aug 21 11:20:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:20:10 +0000 (UTC)
Subject: rpms/upstart/devel upstart.spec,1.32,1.33
Message-ID: <20090821112010.3F97B11C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/upstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6506

Modified Files:
	upstart.spec 
Log Message:
- rebuilt with new audit


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- upstart.spec	27 Jul 2009 06:36:36 -0000	1.32
+++ upstart.spec	21 Aug 2009 11:20:09 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.11-3
+- rebuilt with new audit
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 11:21:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 11:21:11 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.55,1.56
Message-ID: <20090821112111.3C1D711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6748

Modified Files:
	util-linux-ng.spec 
Log Message:
- rebuilt with new audit


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- util-linux-ng.spec	13 Aug 2009 22:22:43 -0000	1.55
+++ util-linux-ng.spec	21 Aug 2009 11:21:10 -0000	1.56
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 5%{?dist}
+Release: 6%{?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
@@ -710,6 +710,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-6
+- rebuilt with new audit
+
 * Thu Aug 13 2009 Karel Zak <kzak at redhat.com> 2.16-5
 - fix #513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
 



From than at fedoraproject.org  Fri Aug 21 11:26:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 21 Aug 2009 11:26:22 +0000 (UTC)
Subject: rpms/mozplugger/devel mozplugger.spec,1.36,1.37
Message-ID: <20090821112622.8D0C011C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/mozplugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8300

Modified Files:
	mozplugger.spec 
Log Message:
- add noreplace
- convert README to utf8




Index: mozplugger.spec
===================================================================
RCS file: /cvs/extras/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- mozplugger.spec	21 Aug 2009 10:17:21 -0000	1.36
+++ mozplugger.spec	21 Aug 2009 11:26:22 -0000	1.37
@@ -40,9 +40,12 @@ make linux lib=%{_lib}
 rm -rf %{buildroot}
 make install lib=%{_lib} root=%{buildroot}
 
+# convert to UTF8
 file=%{buildroot}%{_mandir}/man7/mozplugger.7
 iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
 mv "${file}_" "$file"
+iconv -f iso-8859-1 -t utf-8 < README > README_
+mv README_ README
 
 %clean
 rm -rf %{buildroot}
@@ -50,7 +53,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc README COPYING
-%config /etc/mozpluggerrc
+%config(noreplace) /etc/mozpluggerrc
 %{_bindir}/*
 %{_libdir}/mozilla/plugins/mozplugger.so
 %{_mandir}/man7/mozplugger.7*
@@ -59,6 +62,8 @@ rm -rf %{buildroot}
 * Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.12.1-7
 - drop Obsoletes on plugger
 - add comments for the patches
+- add noreplace
+- convert README to utf8
 
 * Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.12.1-6
 - fix #226159, merge review



From hubbitus at fedoraproject.org  Fri Aug 21 11:36:23 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Fri, 21 Aug 2009 11:36:23 +0000 (UTC)
Subject: rpms/sim/devel sim.spec,1.15,1.16
Message-ID: <20090821113623.294FF11C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9993

Modified Files:
	sim.spec 
Log Message:
- Rebuild because forgot commit patch0.




Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sim.spec	21 Aug 2009 11:07:54 -0000	1.15
+++ sim.spec	21 Aug 2009 11:36:22 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.19.%{SVNdate}svn%{SVNrev}rev%{?dist}
+Release:		0.20.%{SVNdate}svn%{SVNrev}rev%{?dist}
 #svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk sim; find sim -iname '*win32*' -exec rm -r {} \; ; tar --use-compress-program lzma -cf 'sim-0.9.5-SVN20090821rev2902.tar.lzma' sim
 Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.lzma
 Summary:		Multiprotocol Instant Messenger
@@ -140,6 +140,9 @@ fi
 %{_datadir}/services/
 
 %changelog
+* Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.20.20090821svn2902rev
+- Rebuild because forgot commit patch0.
+
 * Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.19.20090821svn2902rev
 - New version.
 - Name directory in tarball sim instead of trunk.



From ovasik at fedoraproject.org  Fri Aug 21 11:49:03 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 21 Aug 2009 11:49:03 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-kojiutimensatskip.patch, NONE,
	1.1 coreutils-DIR_COLORS, 1.6, 1.7 coreutils-DIR_COLORS.256color,
	1.5, 1.6 coreutils-DIR_COLORS.lightbgcolor, 1.1,
	1.2 coreutils.spec, 1.267, 1.268
Message-ID: <20090821114903.94D2011C00D7@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12047

Modified Files:
	coreutils-DIR_COLORS coreutils-DIR_COLORS.256color 
	coreutils-DIR_COLORS.lightbgcolor coreutils.spec 
Added Files:
	coreutils-7.5-kojiutimensatskip.patch 
Log Message:
libstdbuf.so in separate coreutils-libs subpackage, update /etc/DIRCOLORS*, skip two new tests on system with insufficient utimensat support(e.g. koji)

coreutils-7.5-kojiutimensatskip.patch:
 cp/preserve-slink-time |    4 ++++
 mv/part-symlink        |    2 ++
 2 files changed, 6 insertions(+)

--- NEW FILE coreutils-7.5-kojiutimensatskip.patch ---
diff -urNp coreutils-7.5-orig/tests/cp/preserve-slink-time coreutils-7.5/tests/cp/preserve-slink-time
--- coreutils-7.5-orig/tests/cp/preserve-slink-time	2009-08-15 17:25:32.000000000 +0200
+++ coreutils-7.5/tests/cp/preserve-slink-time	2009-08-21 12:45:41.000000000 +0200
@@ -28,6 +28,10 @@ grep '^#define HAVE_UTIMENSAT' "$CONFIG_
 
 ln -s no-such dangle || framework_failure
 
+cp -Pp dangle d3 2>error
+grep 'Function not implemented' error > /dev/null &&
+  skip_test_ 'utimensat function not implemented'
+
 # If the current file system lacks sub-second resolution, sleep for 2s to
 # ensure that the times on the copy are different from those of the original.
 case $(stat --format=%y dangle) in
diff -urNp coreutils-7.5-orig/tests/mv/part-symlink coreutils-7.5/tests/mv/part-symlink
--- coreutils-7.5-orig/tests/mv/part-symlink	2009-08-15 17:25:32.000000000 +0200
+++ coreutils-7.5/tests/mv/part-symlink	2009-08-21 12:52:13.000000000 +0200
@@ -201,6 +201,8 @@ cat <<\EOF > $expected
 
 EOF
 
+grep 'Function not implemented' $actual > /dev/null &&
+  skip_test_ 'utimensat function not implemented'
 # Redirect to stderr, since stdout is already taken.
 compare $expected $actual 1>&2 || fail=1
 


Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coreutils-DIR_COLORS	24 Feb 2009 11:53:37 -0000	1.6
+++ coreutils-DIR_COLORS	21 Aug 2009 11:49:02 -0000	1.7
@@ -50,6 +50,7 @@ TERM rxvt-cygwin-native
 TERM rxvt-unicode
 TERM screen
 TERM screen-256color
+TERM screen-256color-bce
 TERM screen-bce
 TERM screen-w
 TERM screen.linux
@@ -78,7 +79,7 @@ RESET 0 # reset to "normal" color
 DIR 01;34	# directory
 LINK 01;36	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;37 # regular file with more than one link
+MULTIHARDLINK 00	# regular file with more than one link
 FIFO 40;33	# pipe
 SOCK 01;35	# socket
 DOOR 01;35	# door
@@ -115,12 +116,16 @@ EXEC 01;32
 .taz 01;31
 .lzh 01;31
 .lzma 01;31
+.tlz 01;31
+.txz 01;31
 .zip 01;31
 .z   01;31
 .Z   01;31
 .dz  01;31
 .gz  01;31
+.xz  01;31
 .bz2 01;31
+.tbz 01;31
 .tbz2 01;31
 .bz  01;31
 .tz  01;31
@@ -133,7 +138,7 @@ EXEC 01;32
 .cpio 01;31
 .7z  01;31
 .rz  01;31
-.xz  01;31
+
 # image formats (magenta)
 .jpg 01;35
 .jpeg 01;35
@@ -148,6 +153,8 @@ EXEC 01;32
 .tif 01;35
 .tiff 01;35
 .png 01;35
+.svg 01;35
+.svgz 01;35
 .mng 01;35
 .pcx 01;35
 .mov 01;35
@@ -175,13 +182,13 @@ EXEC 01;32
 .xcf 01;35
 .xwd 01;35
 .yuv 01;35
-.svg 01;35
-.svgz 01;35
+
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axv 01;35
 .anx 01;35
 .ogv 01;35
 .ogx 01;35
+
 # audio formats (cyan)
 .aac 01;36
 .au 01;36
@@ -194,6 +201,7 @@ EXEC 01;32
 .ogg 01;36
 .ra 01;36
 .wav 01;36
+
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axa 01;36
 .oga 01;36


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- coreutils-DIR_COLORS.256color	24 Feb 2009 11:53:37 -0000	1.5
+++ coreutils-DIR_COLORS.256color	21 Aug 2009 11:49:02 -0000	1.6
@@ -55,7 +55,7 @@ RESET 0 # reset to "normal" color
 DIR 01;38;5;27	# directory
 LINK 01;38;5;51	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;38;5;15; # regular file with more than one link
+MULTIHARDLINK 44;38;5;15; # regular file with more than one link
 FIFO 40;38;5;11	# pipe
 SOCK 01;38;5;13	# socket
 DOOR 01;38;5;5	# door
@@ -91,12 +91,16 @@ EXEC 01;38;5;34
 .taz 01;38;5;9
 .lzh 01;38;5;9
 .lzma 01;38;5;9
+.tlz 01;38;5;9
+.txz 01;38;5;9
 .zip 01;38;5;9
 .z   01;38;5;9
 .Z   01;38;5;9
 .dz  01;38;5;9
 .gz  01;38;5;9
+.xz  01;38;5;9
 .bz2 01;38;5;9
+.tbz 01;38;5;9
 .tbz2 01;38;5;9
 .bz  01;38;5;9
 .tz  01;38;5;9
@@ -109,7 +113,7 @@ EXEC 01;38;5;34
 .cpio 01;38;5;9
 .7z  01;38;5;9
 .rz  01;38;5;9
-.xz  01;38;5;9
+
 # image formats (magenta)
 .jpg 01;38;5;13
 .jpeg 01;38;5;13
@@ -124,6 +128,8 @@ EXEC 01;38;5;34
 .tif 01;38;5;13
 .tiff 01;38;5;13
 .png 01;38;5;13
+.svg 01;38;5;13
+.svgz 01;38;5;13
 .mng 01;38;5;13
 .pcx 01;38;5;13
 .mov 01;38;5;13
@@ -151,13 +157,13 @@ EXEC 01;38;5;34
 .xcf 01;38;5;13
 .xwd 01;38;5;13
 .yuv 01;38;5;13
-.svg 01;38;5;13
-.svgz 01;38;5;13
+
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axv 01;38;5;13
 .anx 01;38;5;13
 .ogv 01;38;5;13
 .ogx 01;38;5;13
+
 # audio formats (cyan)
 .aac 01;38;5;45
 .au 01;38;5;45
@@ -170,6 +176,7 @@ EXEC 01;38;5;34
 .ogg 01;38;5;45
 .ra 01;38;5;45
 .wav 01;38;5;45
+
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axa 01;38;5;45
 .oga 01;38;5;45


Index: coreutils-DIR_COLORS.lightbgcolor
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.lightbgcolor,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-DIR_COLORS.lightbgcolor	19 Mar 2009 14:56:48 -0000	1.1
+++ coreutils-DIR_COLORS.lightbgcolor	21 Aug 2009 11:49:02 -0000	1.2
@@ -58,7 +58,7 @@ RESET 0
 DIR 00;34	# directory
 LINK 00;36	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;37 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
 FIFO 40;33	# pipe
 SOCK 00;35	# socket
 DOOR 00;35	# door
@@ -94,12 +94,16 @@ EXEC 00;32
 .taz 00;31
 .lzh 00;31
 .lzma 00;31
+.tlz 00;31
+.txz 00;31
 .zip 00;31
 .z   00;31
 .Z   00;31
 .dz  00;31
 .gz  00;31
+.xz  00;31
 .bz2 00;31
+.tbz 00;31
 .tbz2 00;31
 .bz  00;31
 .tz  00;31
@@ -112,7 +116,6 @@ EXEC 00;32
 .cpio 00;31
 .7z  00;31
 .rz  00;31
-.xz  00;31
 # image formats (magenta)
 .jpg 00;35
 .jpeg 00;35
@@ -127,6 +130,8 @@ EXEC 00;32
 .tif 00;35
 .tiff 00;35
 .png 00;35
+.svg 00;35
+.svgz 00;35
 .mng 00;35
 .pcx 00;35
 .mov 00;35
@@ -154,13 +159,13 @@ EXEC 00;32
 .xcf 00;35
 .xwd 00;35
 .yuv 00;35
-.svg 00;35
-.svgz 00;35
+
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axv 00;35
 .anx 00;35
 .ogv 00;35
 .ogx 00;35
+
 # audio formats (cyan)
 .aac 00;36
 .au 00;36
@@ -173,6 +178,7 @@ EXEC 00;32
 .ogg 00;36
 .ra 00;36
 .wav 00;36
+
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axa 00;36
 .oga 00;36


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- coreutils.spec	21 Aug 2009 07:00:58 -0000	1.267
+++ coreutils.spec	21 Aug 2009 11:49:02 -0000	1.268
@@ -23,6 +23,7 @@ Source203:  coreutils-runuser-l.pamd
 Patch100: coreutils-6.10-configuration.patch
 Patch101: coreutils-6.10-manpages.patch
 Patch102: coreutils-7.4-sttytcsadrain.patch
+Patch103: coreutils-7.5-kojiutimensatskip.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -59,7 +60,6 @@ BuildRequires: automake >= 1.10.1
 BuildRequires: libcap-devel >= 2.0.6
 BuildRequires: libattr-devel
 BuildRequires: attr
-BuildRequires: xz
 
 Requires(post): libselinux >= 1.25.6-1
 Requires:       libattr
@@ -73,6 +73,7 @@ Requires(post): grep
 %{?!nopam:Requires: pam >= 0.66-12}
 Requires(post): libcap >= 2.0.6
 Requires:       ncurses
+Requires: %{name}-libs = %{version}-%{release}
 
 # Require a C library that doesn't put LC_TIME files in our way.
 Conflicts: glibc < 2.2
@@ -95,6 +96,14 @@ Conflicts: tetex < 1.0.7-66
 These are the GNU core utilities.  This package is the combination of
 the old GNU fileutils, sh-utils, and textutils packages.
 
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+Libraries for coreutils package.
+
 %prep
 %setup -q
 
@@ -104,6 +113,7 @@ the old GNU fileutils, sh-utils, and tex
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 %patch102 -p1 -b .tcsadrain
+%patch103 -p1 -b .kojiutimensat
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -313,10 +323,19 @@ fi
 %_sbindir/chroot
 /sbin/runuser
 
+%files libs
+%defattr(-, root, root, -)
+%{_libdir}/coreutils
+
 %changelog
 * Fri Aug 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-1
 - New upstream release 7.5, remove already applied patches,
-  defuzz few others  
+  defuzz few others, xz in default set(by dependencies),
+  so no explicit br required
+- skip two new tests on system with insufficient utimensat
+  support(e.g. koji)
+- libstdbuf.so in separate coreutils-libs subpackage
+- update /etc/DIRCOLORS*
 
 * Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
 - do process install-info only with info files present(#515970)



From hubbitus at fedoraproject.org  Fri Aug 21 12:08:08 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Fri, 21 Aug 2009 12:08:08 +0000 (UTC)
Subject: rpms/sim/F-10 .cvsignore, 1.2, 1.3 sim.spec, 1.10, 1.11 sources, 1.2,
	1.3
Message-ID: <20090821120808.F1E2211C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15520

Modified Files:
	.cvsignore sim.spec sources 
Log Message:
- New version.
- Name directory in tarball sim instead of trunk.
- Step to lzma source packaging.
- For BUG#478341 fixing add R kdebase3-libs




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Sep 2008 09:32:52 -0000	1.2
+++ .cvsignore	21 Aug 2009 12:08:07 -0000	1.3
@@ -1 +1,2 @@
-sim-0.9.5-SVN20080923rev2261.tar.bz2
+sim-0.9.5-SVN20090821rev2902.tar.lzma
+sim-0.9.5svn-fix-automake-versioncompare.patch


Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-10/sim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sim.spec	22 Nov 2008 16:59:36 -0000	1.10
+++ sim.spec	21 Aug 2009 12:08:08 -0000	1.11
@@ -1,12 +1,12 @@
 %bcond_without kde
-%define SVNdate 20080923
-%define SVNrev 2261
+%define SVNdate 20090821
+%define SVNrev 2902
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.14.%{SVNdate}svn%{SVNrev}rev%{?dist}
-#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
-Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
+Release:		0.20.%{SVNdate}svn%{SVNrev}rev%{?dist}
+#svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk sim; find sim -iname '*win32*' -exec rm -r {} \; ; tar --use-compress-program lzma -cf 'sim-0.9.5-SVN20090821rev2902.tar.lzma' sim
+Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.lzma
 Summary:		Multiprotocol Instant Messenger
 Summary(de):	Multiprotokoll Instant Messenger
 Summary(ru):	?????????????????? ??????????
@@ -15,6 +15,9 @@ Group:		Applications/Internet
 URL:			http://sim-im.berlios.de/
 BuildRequires:	autoconf >= 2.52, automake >= 1.5
 BuildRequires:	zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
+BuildRequires:	openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
+BuildRequires:	zip desktop-file-utils
+Requires:		openssl, arts >= 1.0, kdebase3-libs
 %if %{with kde}
 %if %{fedora} == 8
 BuildRequires:	kdebase-devel >= 3.0.0, kdelibs-devel >= 3.0.0
@@ -23,14 +26,22 @@ Requires:		kdenetwork >= 3.0.0
 BuildRequires:	kdebase3-devel >= 3.0.0, kdelibs3-devel >= 3.0.0
 %endif
 %endif
-BuildRequires:	qt-devel >= 3.0.0, openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
-BuildRequires:	zip desktop-file-utils
-Requires:		qt >= 3.0.0, openssl, arts >= 1.0
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if %{fedora} > 9
+Requires:		qt3 >= 3.0.0
+BuildRequires:	qt3-devel >= 3.0.0
+%else
+Requires:		qt >= 3.0.0
+BuildRequires:	qt-devel >= 3.0.0
+%endif
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(postun):	/sbin/ldconfig
 Requires(post):	/sbin/ldconfig
 
+#https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875
+Patch0:		sim-0.9.5svn-fix-automake-versioncompare.patch
+
 %description
 SIM (Simple Instant Messenger) is a plugins-based open-
 source instant messenger that supports various protocols
@@ -62,7 +73,9 @@ http://sim-im.org/
 
 
 %prep
-%setup -q -n trunk
+%setup -q -n %{name}
+%patch0 -p0 -b .vercmp
+
 make -f admin/Makefile.common
 
 %build
@@ -127,6 +140,30 @@ fi
 %{_datadir}/services/
 
 %changelog
+* Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.20.20090821svn2902rev
+- Rebuild because forgot commit patch0.
+
+* Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.19.20090821svn2902rev
+- New version.
+- Name directory in tarball sim instead of trunk.
+- Step to lzma source packaging.
+- For BUG#478341 fixing add R kdebase3-libs
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.18.20090616svn2730rev
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.17.20090616svn2730rev
+- Fix FBFS on mass-rebuild in Fedora 12 ( http://article.gmane.org/gmane.linux.redhat.fedora.devel/114737 )
+- Update to fresh svn.
+- In tarball creation use "svn export" instead of "svn checkout". Delete win32 stuff.
+- Add patch0 - sim-0.9.5svn-fix-automake-versioncompare.patch ( https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875 )
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.16.20080923svn2261rev
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.15.20080923svn2261rev
+- rebuild with new openssl
+
 * Sat Nov 22 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.14.20080923svn2261rev
 - Remove package name from package description.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2008 09:32:52 -0000	1.2
+++ sources	21 Aug 2009 12:08:08 -0000	1.3
@@ -1 +1,2 @@
-10108228cc561672f21acfe315468264  sim-0.9.5-SVN20080923rev2261.tar.bz2
+713e85baceac1a02b2dcd9eeeb548353  sim-0.9.5-SVN20090821rev2902.tar.lzma
+ddc71a5bba18325a00dd515ad58815a4  sim-0.9.5svn-fix-automake-versioncompare.patch



From tmraz at fedoraproject.org  Fri Aug 21 12:17:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:17:00 +0000 (UTC)
Subject: rpms/389-ds-base/devel 389-ds-base.spec,1.4,1.5
Message-ID: <20090821121700.8FC4611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/389-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17086

Modified Files:
	389-ds-base.spec 
Log Message:
- rebuilt with new openssl


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-ds-base.spec	19 Aug 2009 19:34:52 -0000	1.4
+++ 389-ds-base.spec	21 Aug 2009 12:17:00 -0000	1.5
@@ -4,7 +4,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -174,6 +174,9 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-5
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-4
 - added template-initconfig to %files
 



From tmraz at fedoraproject.org  Fri Aug 21 12:17:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:17:35 +0000 (UTC)
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.40,1.41
Message-ID: <20090821121735.D389F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/MySQL-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17269

Modified Files:
	MySQL-python.spec 
Log Message:
- rebuilt with new openssl


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- MySQL-python.spec	24 Jul 2009 15:39:35 -0000	1.40
+++ MySQL-python.spec	21 Aug 2009 12:17:35 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.3
-Release: 0.2.c1%{?dist}
+Release: 0.3.c1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.3-0.3.c1
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-0.2.c1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:18:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:18:18 +0000 (UTC)
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.69,1.70
Message-ID: <20090821121818.F3F0111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17452

Modified Files:
	OpenIPMI.spec 
Log Message:
- rebuilt with new openssl


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- OpenIPMI.spec	24 Jul 2009 15:43:28 -0000	1.69
+++ OpenIPMI.spec	21 Aug 2009 12:18:18 -0000	1.70
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.16-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:18:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:18:57 +0000 (UTC)
Subject: rpms/Pound/devel Pound.spec,1.30,1.31
Message-ID: <20090821121857.08A0911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/Pound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17653

Modified Files:
	Pound.spec 
Log Message:
- rebuilt with new openssl


Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/Pound.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Pound.spec	24 Jul 2009 15:46:22 -0000	1.30
+++ Pound.spec	21 Aug 2009 12:18:56 -0000	1.31
@@ -4,7 +4,7 @@
 
 Name:        Pound
 Version:     2.4.4
-Release:     3%{?dist}
+Release:     4%{?dist}
 Summary:     Reverse proxy and load balancer
 
 Group:       System Environment/Daemons
@@ -116,6 +116,9 @@ fi
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.4-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:19:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:19:34 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec,1.29,1.30
Message-ID: <20090821121934.61B9C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17808

Modified Files:
	afflib.spec 
Log Message:
- rebuilt with new openssl


Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- afflib.spec	24 Jul 2009 16:37:23 -0000	1.29
+++ afflib.spec	21 Aug 2009 12:19:34 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           afflib
 Version:        3.3.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:20:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:20:09 +0000 (UTC)
Subject: rpms/aimage/devel aimage.spec,1.7,1.8
Message-ID: <20090821122009.AEFA111C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/aimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17964

Modified Files:
	aimage.spec 
Log Message:
- rebuilt with new openssl


Index: aimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- aimage.spec	24 Jul 2009 16:39:46 -0000	1.7
+++ aimage.spec	21 Aug 2009 12:20:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           aimage
 Version:        3.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Advanced Disk Imager
 
 Group:          Applications/System
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bagnara at fedoraproject.org  Fri Aug 21 12:20:35 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Fri, 21 Aug 2009 12:20:35 +0000 (UTC)
Subject: rpms/ppl/F-10 ppl.spec,1.23,1.24
Message-ID: <20090821122035.583D211C0417@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18092

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-10/ppl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ppl.spec	18 Aug 2009 19:17:48 -0000	1.23
+++ ppl.spec	21 Aug 2009 12:20:35 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 21 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-5
+- Force rebuild.
+
 * Tue Aug 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-4
 - Force rebuild.
 



From tmraz at fedoraproject.org  Fri Aug 21 12:20:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:20:43 +0000 (UTC)
Subject: rpms/aircrack-ng/devel aircrack-ng.spec,1.29,1.30
Message-ID: <20090821122043.7009F11C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18144

Modified Files:
	aircrack-ng.spec 
Log Message:
- rebuilt with new openssl


Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- aircrack-ng.spec	24 Jul 2009 16:40:02 -0000	1.29
+++ aircrack-ng.spec	21 Aug 2009 12:20:43 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           aircrack-ng
 Version:        1.0
-Release:        0.9.%{alphatag}%{?dist}
+Release:        0.10.%{alphatag}%{?dist}
 #Release:        0.7.%{alphatag}svn%{?dist}
 #Release:        1%{?dist}
 Summary:        802.11 (wireless) sniffer and WEP/WPA-PSK key cracker
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.10.rc3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.9.rc3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:21:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:21:18 +0000 (UTC)
Subject: rpms/alpine/devel alpine.spec,1.20,1.21
Message-ID: <20090821122118.41BC211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/alpine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18368

Modified Files:
	alpine.spec 
Log Message:
- rebuilt with new openssl


Index: alpine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/alpine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- alpine.spec	24 Jul 2009 16:46:47 -0000	1.20
+++ alpine.spec	21 Aug 2009 12:21:18 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: powerful, easy to use console email client
 Name: alpine
 Version: 2.00 
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: ASL 2.0
 Group: Applications/Internet
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.00-8
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.00-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bagnara at fedoraproject.org  Fri Aug 21 12:21:46 2009
From: bagnara at fedoraproject.org (Roberto Bagnara)
Date: Fri, 21 Aug 2009 12:21:46 +0000 (UTC)
Subject: rpms/ppl/F-11 ppl.spec,1.33,1.34
Message-ID: <20090821122146.1B9DA11C00D7@cvs1.fedora.phx.redhat.com>

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18514

Modified Files:
	ppl.spec 
Log Message:
Force rebuild.


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ppl.spec	18 Aug 2009 19:25:04 -0000	1.33
+++ ppl.spec	21 Aug 2009 12:21:45 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           ppl
 Version:        0.10.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
 Group:          Development/Libraries
@@ -416,6 +416,9 @@ mv \
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 21 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-6
+- Force rebuild.
+
 * Tue Aug 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-5
 - Force rebuild.
 



From tmraz at fedoraproject.org  Fri Aug 21 12:22:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:22:07 +0000 (UTC)
Subject: rpms/amanda/devel amanda.spec,1.63,1.64
Message-ID: <20090821122207.09E9411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18606

Modified Files:
	amanda.spec 
Log Message:
- rebuilt with new openssl


Index: amanda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- amanda.spec	4 Aug 2009 13:34:44 -0000	1.63
+++ amanda.spec	21 Aug 2009 12:22:06 -0000	1.64
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 12%{?dist}
+Release: 13%{?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
@@ -379,6 +379,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %{_libdir}/libamandad.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0p2-13
+- rebuilt with new openssl
+
 * Tue Aug 04 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-12
 -fix #512534 -  amstatus outputs "Insecure dependency in printf ..." 
 



From tmraz at fedoraproject.org  Fri Aug 21 12:23:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:23:01 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.159,1.160
Message-ID: <20090821122301.0CC9211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18917

Modified Files:
	amarok.spec 
Log Message:
- rebuilt with new openssl


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- amarok.spec	9 Aug 2009 00:11:46 -0000	1.159
+++ amarok.spec	21 Aug 2009 12:23:00 -0000	1.160
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -149,6 +149,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-5
+- rebuilt with new openssl
+
 * Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-4
 - lyricwiki patch (kdebug#202366)
 



From tmraz at fedoraproject.org  Fri Aug 21 12:23:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:23:40 +0000 (UTC)
Subject: rpms/apcupsd/devel apcupsd.spec,1.34,1.35
Message-ID: <20090821122340.53B3711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/apcupsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19087

Modified Files:
	apcupsd.spec 
Log Message:
- rebuilt with new openssl


Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- apcupsd.spec	3 Aug 2009 08:21:23 -0000	1.34
+++ apcupsd.spec	21 Aug 2009 12:23:40 -0000	1.35
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.7
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.14.7-2
+- rebuilt with new openssl
+
 * Mon Aug 03 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.7-1
 - updated to 3.14.7
 



From tmraz at fedoraproject.org  Fri Aug 21 12:24:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:24:42 +0000 (UTC)
Subject: rpms/apr-util/devel apr-util.spec,1.71,1.72
Message-ID: <20090821122442.D2FEC11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19511

Modified Files:
	apr-util.spec 
Log Message:
- rebuilt with new openssl


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- apr-util.spec	6 Aug 2009 00:11:34 -0000	1.71
+++ apr-util.spec	21 Aug 2009 12:24:42 -0000	1.72
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.9-2
+- rebuilt with new openssl
+
 * Thu Aug  6 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
 - bump up to 1.3.9
 - CVE-2009-2412



From tmraz at fedoraproject.org  Fri Aug 21 12:25:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:25:22 +0000 (UTC)
Subject: rpms/arm4/devel arm4.spec,1.7,1.8
Message-ID: <20090821122522.9E75411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/arm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20228

Modified Files:
	arm4.spec 
Log Message:
- rebuilt with new openssl


Index: arm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arm4/devel/arm4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- arm4.spec	8 Aug 2009 06:47:18 -0000	1.7
+++ arm4.spec	21 Aug 2009 12:25:22 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		arm4
 Version:	0.8.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Application Response Measurement V4.0
 
 Group:		Development/System
@@ -168,6 +168,9 @@ rm -rf %{buildroot}
 %{_libdir}/libArmNative.*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.2-5
+- rebuilt with new openssl
+
 * Sat Aug 8 2009 David Carter <dcarter at entertain-me.com> - 0.8.2-3
 - New tag to correct CVS sync issues
 



From tmraz at fedoraproject.org  Fri Aug 21 12:31:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:31:44 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.52,1.53
Message-ID: <20090821123144.C1AE211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21401

Modified Files:
	asterisk.spec 
Log Message:
- rebuilt with new openssl


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- asterisk.spec	24 Jul 2009 17:24:16 -0000	1.52
+++ asterisk.spec	21 Aug 2009 12:31:44 -0000	1.53
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.24.%{?_rc:rc%{_rc}}%{?dist}
+Release: 0.25.%{?_rc:rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1099,6 +1099,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* 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
 



From tmraz at fedoraproject.org  Fri Aug 21 12:32:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:32:24 +0000 (UTC)
Subject: rpms/authd/devel authd.spec,1.58,1.59
Message-ID: <20090821123224.DD1C611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21611

Modified Files:
	authd.spec 
Log Message:
- rebuilt with new openssl


Index: authd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authd/devel/authd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- authd.spec	24 Jul 2009 17:35:16 -0000	1.58
+++ authd.spec	21 Aug 2009 12:32:24 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: https://fedorahosted.org/authd/
@@ -75,6 +75,9 @@ service xinetd reload
 %{_sbindir}/in.authd
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-28
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:33:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:33:34 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.30,1.31
Message-ID: <20090821123334.5196011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21871

Modified Files:
	bacula.spec 
Log Message:
- rebuilt with new openssl


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- bacula.spec	10 Aug 2009 19:26:38 -0000	1.30
+++ bacula.spec	21 Aug 2009 12:33:34 -0000	1.31
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 3.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -1005,6 +1005,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Jon Ciesla <limb at jcomserv.net - 3.0.2-3
 - Dropped user/group removal per guidelines.
 - Added -common dep to traymonitor.



From hubbitus at fedoraproject.org  Fri Aug 21 12:34:06 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Fri, 21 Aug 2009 12:34:06 +0000 (UTC)
Subject: rpms/sim/F-11 .cvsignore, 1.2, 1.3 sim.spec, 1.12, 1.13 sources, 1.2,
	1.3
Message-ID: <20090821123406.CF7B311C00D7@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22058

Modified Files:
	.cvsignore sim.spec sources 
Log Message:
- New version.
- Name directory in tarball sim instead of trunk.
- Step to lzma source packaging.
- For BUG#478341 fixing add R kdebase3-libs




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Sep 2008 09:32:52 -0000	1.2
+++ .cvsignore	21 Aug 2009 12:34:06 -0000	1.3
@@ -1 +1,2 @@
-sim-0.9.5-SVN20080923rev2261.tar.bz2
+sim-0.9.5-SVN20090821rev2902.tar.lzma
+sim-0.9.5svn-fix-automake-versioncompare.patch


Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-11/sim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sim.spec	26 Feb 2009 01:06:27 -0000	1.12
+++ sim.spec	21 Aug 2009 12:34:06 -0000	1.13
@@ -1,12 +1,12 @@
 %bcond_without kde
-%define SVNdate 20080923
-%define SVNrev 2261
+%define SVNdate 20090821
+%define SVNrev 2902
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.16.%{SVNdate}svn%{SVNrev}rev%{?dist}
-#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
-Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
+Release:		0.20.%{SVNdate}svn%{SVNrev}rev%{?dist}
+#svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk sim; find sim -iname '*win32*' -exec rm -r {} \; ; tar --use-compress-program lzma -cf 'sim-0.9.5-SVN20090821rev2902.tar.lzma' sim
+Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.lzma
 Summary:		Multiprotocol Instant Messenger
 Summary(de):	Multiprotokoll Instant Messenger
 Summary(ru):	?????????????????? ??????????
@@ -15,6 +15,9 @@ Group:		Applications/Internet
 URL:			http://sim-im.berlios.de/
 BuildRequires:	autoconf >= 2.52, automake >= 1.5
 BuildRequires:	zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
+BuildRequires:	openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
+BuildRequires:	zip desktop-file-utils
+Requires:		openssl, arts >= 1.0, kdebase3-libs
 %if %{with kde}
 %if %{fedora} == 8
 BuildRequires:	kdebase-devel >= 3.0.0, kdelibs-devel >= 3.0.0
@@ -23,14 +26,22 @@ Requires:		kdenetwork >= 3.0.0
 BuildRequires:	kdebase3-devel >= 3.0.0, kdelibs3-devel >= 3.0.0
 %endif
 %endif
-BuildRequires:	qt-devel >= 3.0.0, openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
-BuildRequires:	zip desktop-file-utils
-Requires:		qt >= 3.0.0, openssl, arts >= 1.0
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if %{fedora} > 9
+Requires:		qt3 >= 3.0.0
+BuildRequires:	qt3-devel >= 3.0.0
+%else
+Requires:		qt >= 3.0.0
+BuildRequires:	qt-devel >= 3.0.0
+%endif
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(postun):	/sbin/ldconfig
 Requires(post):	/sbin/ldconfig
 
+#https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875
+Patch0:		sim-0.9.5svn-fix-automake-versioncompare.patch
+
 %description
 SIM (Simple Instant Messenger) is a plugins-based open-
 source instant messenger that supports various protocols
@@ -62,7 +73,9 @@ http://sim-im.org/
 
 
 %prep
-%setup -q -n trunk
+%setup -q -n %{name}
+%patch0 -p0 -b .vercmp
+
 make -f admin/Makefile.common
 
 %build
@@ -127,6 +140,24 @@ fi
 %{_datadir}/services/
 
 %changelog
+* Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.20.20090821svn2902rev
+- Rebuild because forgot commit patch0.
+
+* Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.19.20090821svn2902rev
+- New version.
+- Name directory in tarball sim instead of trunk.
+- Step to lzma source packaging.
+- For BUG#478341 fixing add R kdebase3-libs
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.18.20090616svn2730rev
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.17.20090616svn2730rev
+- Fix FBFS on mass-rebuild in Fedora 12 ( http://article.gmane.org/gmane.linux.redhat.fedora.devel/114737 )
+- Update to fresh svn.
+- In tarball creation use "svn export" instead of "svn checkout". Delete win32 stuff.
+- Add patch0 - sim-0.9.5svn-fix-automake-versioncompare.patch ( https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875 )
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.16.20080923svn2261rev
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2008 09:32:52 -0000	1.2
+++ sources	21 Aug 2009 12:34:06 -0000	1.3
@@ -1 +1,2 @@
-10108228cc561672f21acfe315468264  sim-0.9.5-SVN20080923rev2261.tar.bz2
+713e85baceac1a02b2dcd9eeeb548353  sim-0.9.5-SVN20090821rev2902.tar.lzma
+ddc71a5bba18325a00dd515ad58815a4  sim-0.9.5svn-fix-automake-versioncompare.patch



From tmraz at fedoraproject.org  Fri Aug 21 12:34:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:34:38 +0000 (UTC)
Subject: rpms/balsa/devel balsa.spec,1.54,1.55
Message-ID: <20090821123438.C6E4511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22238

Modified Files:
	balsa.spec 
Log Message:
- rebuilt with new openssl


Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- balsa.spec	9 Aug 2009 12:12:23 -0000	1.54
+++ balsa.spec	21 Aug 2009 12:34:38 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:           balsa
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -107,6 +107,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.1-2
+- rebuilt with new openssl
+
 * Sun Aug 09 2009 Pawel Salek <salek at kth.se> - 2.4.1-1
 - update to upstream 2.4.1.
 



From tmraz at fedoraproject.org  Fri Aug 21 12:35:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:35:16 +0000 (UTC)
Subject: rpms/bes/devel bes.spec,1.16,1.17
Message-ID: <20090821123516.8C06D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22395

Modified Files:
	bes.spec 
Log Message:
- rebuilt with new openssl


Index: bes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bes/devel/bes.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bes.spec	24 Jul 2009 17:58:50 -0000	1.16
+++ bes.spec	21 Aug 2009 12:35:16 -0000	1.17
@@ -6,7 +6,7 @@
 
 Name:           bes
 Version:        3.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
@@ -156,6 +156,9 @@ exit 0
 %doc __distribution_docs/api-html/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-3
+- rebuilt with new openssl
+
 * 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
 



From tmraz at fedoraproject.org  Fri Aug 21 12:36:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:36:00 +0000 (UTC)
Subject: rpms/bigloo/devel bigloo.spec,1.35,1.36
Message-ID: <20090821123600.BBBD611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22608

Modified Files:
	bigloo.spec 
Log Message:
- rebuilt with new openssl


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- bigloo.spec	16 Aug 2009 11:37:22 -0000	1.35
+++ bigloo.spec	21 Aug 2009 12:36:00 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           bigloo
 Version:        3.2b
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Bigloo is compiler for the Scheme programming language
 
 Group:          Development/Languages
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2b-3
+- rebuilt with new openssl
+
 * Sun Aug 16 2009 Gerard Milmeister <gemi at bluewin.ch> - 3.2b-2
 - added requires gc-devel
 



From tmraz at fedoraproject.org  Fri Aug 21 12:37:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:37:37 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.322,1.323
Message-ID: <20090821123737.13E4311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22945

Modified Files:
	bind.spec 
Log Message:
- rebuilt with new openssl


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- bind.spec	4 Aug 2009 05:15:49 -0000	1.322
+++ bind.spec	21 Aug 2009 12:37:36 -0000	1.323
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  7.%{PATCHVER}%{?dist}
+Release:  8.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -581,6 +581,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 32:9.6.1-8.P1
+- rebuilt with new openssl
+
 * Tue Aug 04 2009 Martin Nagy <mnagy redhat com> 32:9.6.1-7.P1
 - update the patch for dynamic loading of database backends
 



From tmraz at fedoraproject.org  Fri Aug 21 12:38:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:38:18 +0000 (UTC)
Subject: rpms/bip/devel bip.spec,1.9,1.10
Message-ID: <20090821123818.80D4911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23156

Modified Files:
	bip.spec 
Log Message:
- rebuilt with new openssl


Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/devel/bip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bip.spec	24 Jul 2009 18:05:13 -0000	1.9
+++ bip.spec	21 Aug 2009 12:38:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:    bip
 Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
 License: GPLv2+
@@ -83,6 +83,9 @@ fi
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:39:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:39:14 +0000 (UTC)
Subject: rpms/boinc-client/devel boinc-client.spec,1.39,1.40
Message-ID: <20090821123914.096C911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23369

Modified Files:
	boinc-client.spec 
Log Message:
- rebuilt with new openssl


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- boinc-client.spec	24 Jul 2009 18:18:37 -0000	1.39
+++ boinc-client.spec	21 Aug 2009 12:39:13 -0000	1.40
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.6.37
-Release:	3.r%{revision}svn%{?dist}
+Release:	4.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -337,6 +337,9 @@ fi
 %{_includedir}/boinc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.6.37-4.r18632svn
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.6.37-3.r18632svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:39:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:39:50 +0000 (UTC)
Subject: rpms/botan/devel botan.spec,1.10,1.11
Message-ID: <20090821123950.5D3AF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23528

Modified Files:
	botan.spec 
Log Message:
- rebuilt with new openssl


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- botan.spec	13 Aug 2009 15:45:25 -0000	1.10
+++ botan.spec	21 Aug 2009 12:39:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           botan
 Version:        1.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -110,6 +110,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} .
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6-2
+- rebuilt with new openssl
+
 * Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.6-1
 - Update to 1.8.6, which contains new features as well as bugfixes,
   e.g. concerning the /proc-walking entropy source.



From tmraz at fedoraproject.org  Fri Aug 21 12:40:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:40:29 +0000 (UTC)
Subject: rpms/bro/devel bro.spec,1.5,1.6
Message-ID: <20090821124029.29B9211C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23698

Modified Files:
	bro.spec 
Log Message:
- rebuilt with new openssl


Index: bro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bro.spec	24 Jul 2009 18:25:56 -0000	1.5
+++ bro.spec	21 Aug 2009 12:40:28 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Open-source, Unix-based Network Intrusion Detection System
 Name: bro
 Version: 1.4
-Release: 0.5.%{snapshot}svn%{?dist}
+Release: 0.6.%{snapshot}svn%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://bro-ids.org
@@ -115,6 +115,9 @@ fi
 %{_localstatedir}/lib/bro
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20080804svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:41:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:41:12 +0000 (UTC)
Subject: rpms/bunny/devel bunny.spec,1.4,1.5
Message-ID: <20090821124112.7DF5611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bunny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23883

Modified Files:
	bunny.spec 
Log Message:
- rebuilt with new openssl


Index: bunny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bunny/devel/bunny.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bunny.spec	24 Jul 2009 18:29:34 -0000	1.4
+++ bunny.spec	21 Aug 2009 12:41:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           bunny
 Version:        0.93
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Instrumented C code security fuzzer
 
 Group:          Development/Tools
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.93-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.93-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:41:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:41:56 +0000 (UTC)
Subject: rpms/callweaver/devel callweaver.spec,1.20,1.21
Message-ID: <20090821124156.046BE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24076

Modified Files:
	callweaver.spec 
Log Message:
- rebuilt with new openssl


Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- callweaver.spec	29 Jul 2009 14:46:07 -0000	1.20
+++ callweaver.spec	21 Aug 2009 12:41:55 -0000	1.21
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2.1
-Release:	1%{?snap:.%{snap}}%{?dist}
+Release:	2%{?snap:.%{snap}}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -394,6 +394,9 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %{_sbindir}/eogi*
 
 %changelog
+* 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
 



From tmraz at fedoraproject.org  Fri Aug 21 12:42:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:42:39 +0000 (UTC)
Subject: rpms/centerim/devel centerim.spec,1.22,1.23
Message-ID: <20090821124239.E22AE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24256

Modified Files:
	centerim.spec 
Log Message:
- rebuilt with new openssl


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- centerim.spec	24 Jul 2009 18:47:34 -0000	1.22
+++ centerim.spec	21 Aug 2009 12:42:39 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           centerim
 Version:        4.22.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.22.7-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:43:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:43:24 +0000 (UTC)
Subject: rpms/cfengine/devel cfengine.spec,1.41,1.42
Message-ID: <20090821124324.4311711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cfengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24450

Modified Files:
	cfengine.spec 
Log Message:
- rebuilt with new openssl


Index: cfengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- cfengine.spec	24 Jul 2009 18:50:00 -0000	1.41
+++ cfengine.spec	21 Aug 2009 12:43:23 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.10.tar.gz
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.10-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:44:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:44:05 +0000 (UTC)
Subject: rpms/cgit/devel cgit.spec,1.6,1.7
Message-ID: <20090821124405.2B33811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cgit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24619

Modified Files:
	cgit.spec 
Log Message:
- rebuilt with new openssl


Index: cgit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cgit/devel/cgit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cgit.spec	24 Jul 2009 18:51:00 -0000	1.6
+++ cgit.spec	21 Aug 2009 12:44:05 -0000	1.7
@@ -17,7 +17,7 @@ make V=1 %{?_smp_mflags} \\\
 
 Name:           cgit
 Version:        0.8.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fast webinterface for git
 
 Group:          Development/Tools
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.2.1-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:44:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:44:44 +0000 (UTC)
Subject: rpms/cherokee/devel cherokee.spec,1.19,1.20
Message-ID: <20090821124444.64BF811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24780

Modified Files:
	cherokee.spec 
Log Message:
- rebuilt with new openssl


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cherokee.spec	24 Jul 2009 18:53:36 -0000	1.19
+++ cherokee.spec	21 Aug 2009 12:44:44 -0000	1.20
@@ -11,7 +11,7 @@ ExcludeArch:    ppc
 
 Name:           cherokee
 Version:        0.99.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -168,6 +168,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.20-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:45:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:45:31 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.12,1.13
Message-ID: <20090821124531.B57D611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24981

Modified Files:
	chunkd.spec 
Log Message:
- rebuilt with new openssl


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- chunkd.spec	15 Aug 2009 15:31:56 -0000	1.12
+++ chunkd.spec	21 Aug 2009 12:45:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -97,6 +97,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-2
+- rebuilt with new openssl
+
 * Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-1
 - Update to release version 0.4.
 



From tmraz at fedoraproject.org  Fri Aug 21 12:46:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:46:10 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.17,1.18
Message-ID: <20090821124610.B5BEF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25155

Modified Files:
	cld.spec 
Log Message:
- rebuilt with new openssl


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cld.spec	15 Aug 2009 12:04:46 -0000	1.17
+++ cld.spec	21 Aug 2009 12:46:10 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		cld
 Version:	0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
@@ -99,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-2
+- rebuilt with new openssl
+
 * Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-1
 - Upstream version 0.2 release.
 



From tmraz at fedoraproject.org  Fri Aug 21 12:46:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:46:53 +0000 (UTC)
Subject: rpms/clement/devel clement.spec,1.29,1.30
Message-ID: <20090821124653.6DB2111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/clement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25342

Modified Files:
	clement.spec 
Log Message:
- rebuilt with new openssl


Index: clement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clement/devel/clement.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- clement.spec	24 Jul 2009 19:04:16 -0000	1.29
+++ clement.spec	21 Aug 2009 12:46:53 -0000	1.30
@@ -19,7 +19,7 @@
 #-----------------------------------------------------------
 Name: clement
 Version: %{rversion}.%{subversion}
-Release: 5%{?locmark}
+Release: 6%{?locmark}
 URL: http://www.clement.safe.ca
 License: GPLv2
 Summary: An application to filter and manage E-mail traffic
@@ -145,6 +145,9 @@ if [ "$1" = 0 ]; then
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.320-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.320-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:47:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:47:33 +0000 (UTC)
Subject: rpms/cluster-glue/devel cluster-glue.spec,1.6,1.7
Message-ID: <20090821124733.DF39111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25503

Modified Files:
	cluster-glue.spec 
Log Message:
- rebuilt with new openssl


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cluster-glue.spec	17 Aug 2009 18:10:53 -0000	1.6
+++ cluster-glue.spec	21 Aug 2009 12:47:33 -0000	1.7
@@ -14,7 +14,7 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Base
@@ -184,6 +184,9 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.9.d97b9dea436e.hg.1
+- rebuilt with new openssl
+
 * Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.9.d97b9dea436e.hg
 - Include relevant provides: and obsoletes: directives for heartbeat
 - Update the tarball from upstream to version d97b9dea436e



From tmraz at fedoraproject.org  Fri Aug 21 12:48:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:48:14 +0000 (UTC)
Subject: rpms/clustermon/devel clustermon.spec,1.12,1.13
Message-ID: <20090821124814.C732511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25702

Modified Files:
	clustermon.spec 
Log Message:
- rebuilt with new openssl


Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- clustermon.spec	24 Jul 2009 19:08:36 -0000	1.12
+++ clustermon.spec	21 Aug 2009 12:48:14 -0000	1.13
@@ -17,7 +17,7 @@
 
 Name: clustermon
 Version: 0.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
@@ -171,6 +171,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.0-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:48:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:48:56 +0000 (UTC)
Subject: rpms/collectd/devel collectd.spec,1.22,1.23
Message-ID: <20090821124856.223A011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25880

Modified Files:
	collectd.spec 
Log Message:
- rebuilt with new openssl


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- collectd.spec	6 Aug 2009 16:36:02 -0000	1.22
+++ collectd.spec	21 Aug 2009 12:48:55 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.6.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -407,6 +407,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.6.2-5
+- rebuilt with new openssl
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 4.6.2-4
 - Force rebuild to test FTBFS issue.
 - lib/collectd/types.db seems to have moved to share/collectd/types.db



From tmraz at fedoraproject.org  Fri Aug 21 12:49:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:49:33 +0000 (UTC)
Subject: rpms/compat-erlang/devel compat-erlang.spec,1.14,1.15
Message-ID: <20090821124933.F1F5411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/compat-erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26079

Modified Files:
	compat-erlang.spec 
Log Message:
- rebuilt with new openssl


Index: compat-erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-erlang/devel/compat-erlang.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- compat-erlang.spec	24 Jul 2009 19:16:57 -0000	1.14
+++ compat-erlang.spec	21 Aug 2009 12:49:33 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           compat-erlang
 Version:        R10B
-Release:        14.11%{?dist}
+Release:        15.11%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - R10B-15.11
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - R10B-14.11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:50:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:50:23 +0000 (UTC)
Subject: rpms/condor/devel condor.spec,1.20,1.21
Message-ID: <20090821125023.E3B7111C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26281

Modified Files:
	condor.spec 
Log Message:
- rebuilt with new openssl


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- condor.spec	24 Jul 2009 19:24:24 -0000	1.20
+++ condor.spec	21 Aug 2009 12:50:23 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -571,6 +571,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.1-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:51:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:51:05 +0000 (UTC)
Subject: rpms/cone/devel cone.spec,1.32,1.33
Message-ID: <20090821125105.80FF811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26463

Modified Files:
	cone.spec 
Log Message:
- rebuilt with new openssl


Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/devel/cone.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- cone.spec	24 Jul 2009 19:24:55 -0000	1.32
+++ cone.spec	21 Aug 2009 12:51:05 -0000	1.33
@@ -3,7 +3,7 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.78
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc cone/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.78-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.78-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:51:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:51:45 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.21,1.22
Message-ID: <20090821125145.CE9B611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26650

Modified Files:
	conexus.spec 
Log Message:
- rebuilt with new openssl


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- conexus.spec	24 Jul 2009 19:25:10 -0000	1.21
+++ conexus.spec	21 Aug 2009 12:51:45 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
 Version:          0.8.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -279,6 +279,9 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/conexus-0.8/conexus-nss/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:52:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:52:27 +0000 (UTC)
Subject: rpms/conserver/devel conserver.spec,1.13,1.14
Message-ID: <20090821125227.F0C6711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/conserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26826

Modified Files:
	conserver.spec 
Log Message:
- rebuilt with new openssl


Index: conserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conserver/devel/conserver.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- conserver.spec	24 Jul 2009 19:27:15 -0000	1.13
+++ conserver.spec	21 Aug 2009 12:52:27 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.16
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -117,6 +117,9 @@ fi
 %{_mandir}/man1/console.1.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.1.16-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1.16-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:53:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:53:01 +0000 (UTC)
Subject: rpms/cpqarrayd/devel cpqarrayd.spec,1.8,1.9
Message-ID: <20090821125301.2911611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cpqarrayd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27001

Modified Files:
	cpqarrayd.spec 
Log Message:
- rebuilt with new openssl


Index: cpqarrayd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cpqarrayd.spec	24 Jul 2009 19:35:02 -0000	1.8
+++ cpqarrayd.spec	21 Aug 2009 12:53:00 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           cpqarrayd
 Version:        2.3        
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Software for monitoring HP(Compaq) arraycontrollers
 Group:          System Environment/Base
 License:        GPLv2+
@@ -70,6 +70,9 @@ fi
 %doc %_mandir/man1/cpqarrayd*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3-11
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:53:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:53:34 +0000 (UTC)
Subject: rpms/ctorrent/devel ctorrent.spec,1.12,1.13
Message-ID: <20090821125334.70DE611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ctorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27177

Modified Files:
	ctorrent.spec 
Log Message:
- rebuilt with new openssl


Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ctorrent.spec	24 Jul 2009 19:47:20 -0000	1.12
+++ ctorrent.spec	21 Aug 2009 12:53:34 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 10.%{dnh}%{?dist}
+Release: 11.%{dnh}%{?dist}
 Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
 License: GPLv2+
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-11.dnh3.3.2
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-10.dnh3.3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:55:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:55:45 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec,1.56,1.57
Message-ID: <20090821125545.30B2211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27732

Modified Files:
	cyrus-imapd.spec 
Log Message:
- rebuilt with new openssl


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- cyrus-imapd.spec	24 Jul 2009 19:54:44 -0000	1.56
+++ cyrus-imapd.spec	21 Aug 2009 12:55:44 -0000	1.57
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.14
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -729,6 +729,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 12:58:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:58:57 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.81,1.82
Message-ID: <20090821125857.1040211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28984

Modified Files:
	cyrus-sasl.spec 
Log Message:
- rebuilt with new openssl


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- cyrus-sasl.spec	7 Aug 2009 14:18:59 -0000	1.81
+++ cyrus-sasl.spec	21 Aug 2009 12:58:56 -0000	1.82
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -371,6 +371,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.23-2
+- rebuilt with new openssl
+
 * Fri Aug  7 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-1
 - update to 2.1.23
 



From tmraz at fedoraproject.org  Fri Aug 21 12:59:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 12:59:33 +0000 (UTC)
Subject: rpms/dar/devel dar.spec,1.16,1.17
Message-ID: <20090821125933.D2DFE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29163

Modified Files:
	dar.spec 
Log Message:
- rebuilt with new openssl


Index: dar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dar/devel/dar.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dar.spec	24 Jul 2009 19:57:20 -0000	1.16
+++ dar.spec	21 Aug 2009 12:59:33 -0000	1.17
@@ -14,7 +14,7 @@
 #
 Name:           dar
 Version:        2.3.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Software for making/restoring incremental CD/DVD backups
 
 Group:          Applications/Archiving
@@ -197,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.8-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:00:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:00:21 +0000 (UTC)
Subject: rpms/dbmail/devel dbmail.spec,1.30,1.31
Message-ID: <20090821130021.095C911C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dbmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29385

Modified Files:
	dbmail.spec 
Log Message:
- rebuilt with new openssl


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/devel/dbmail.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- dbmail.spec	24 Jul 2009 20:01:12 -0000	1.30
+++ dbmail.spec	21 Aug 2009 13:00:20 -0000	1.31
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons
@@ -229,6 +229,9 @@ This is the postgresql libraries for dbm
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* 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
 



From tmraz at fedoraproject.org  Fri Aug 21 13:01:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:01:02 +0000 (UTC)
Subject: rpms/dclib/devel dclib.spec,1.23,1.24
Message-ID: <20090821130102.AE71E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29570

Modified Files:
	dclib.spec 
Log Message:
- rebuilt with new openssl


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dclib.spec	24 Jul 2009 20:04:53 -0000	1.23
+++ dclib.spec	21 Aug 2009 13:01:02 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.23
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:01:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:01:43 +0000 (UTC)
Subject: rpms/deletemail/devel deletemail.spec,1.4,1.5
Message-ID: <20090821130143.0A5B011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/deletemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29765

Modified Files:
	deletemail.spec 
Log Message:
- rebuilt with new openssl


Index: deletemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deletemail/devel/deletemail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- deletemail.spec	10 Aug 2009 14:53:52 -0000	1.4
+++ deletemail.spec	21 Aug 2009 13:01:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           deletemail
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A non-interactive tool for deleting mails
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5-5
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5-4
 - Use bzipped upstream tarball.
 



From tmraz at fedoraproject.org  Fri Aug 21 13:03:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:03:58 +0000 (UTC)
Subject: rpms/dillo/devel dillo.spec,1.22,1.23
Message-ID: <20090821130358.D6F6D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dillo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30185

Modified Files:
	dillo.spec 
Log Message:
- rebuilt with new openssl


Index: dillo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dillo.spec	24 Jul 2009 20:17:18 -0000	1.22
+++ dillo.spec	21 Aug 2009 13:03:58 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           dillo
 Version:        0.8.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Very small and fast GUI web browser
 
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.6-11
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:04:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:04:40 +0000 (UTC)
Subject: rpms/distcache/devel distcache.spec,1.26,1.27
Message-ID: <20090821130440.A398C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/distcache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30382

Modified Files:
	distcache.spec 
Log Message:
- rebuilt with new openssl


Index: distcache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- distcache.spec	24 Jul 2009 20:19:35 -0000	1.26
+++ distcache.spec	21 Aug 2009 13:04:40 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: Distributed SSL session cache
 Name: distcache
 Version: 1.4.5
-Release: 20
+Release: 21
 License: LGPLv2
 Group: System Environment/Daemons
 URL: http://www.distcache.org/
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man2/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.5-21
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:05:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:05:15 +0000 (UTC)
Subject: rpms/dkim-milter/devel dkim-milter.spec,1.8,1.9
Message-ID: <20090821130515.7315811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dkim-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30556

Modified Files:
	dkim-milter.spec 
Log Message:
- rebuilt with new openssl


Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dkim-milter.spec	12 Aug 2009 19:28:58 -0000	1.8
+++ dkim-milter.spec	21 Aug 2009 13:05:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           dkim-milter
 Version:        2.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -126,6 +126,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.3-2
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Jim Radford <radford at blackbean.org> - 2.8.3-1
 - update to 2.8.3
 



From tmraz at fedoraproject.org  Fri Aug 21 13:05:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:05:54 +0000 (UTC)
Subject: rpms/dnsperf/devel dnsperf.spec,1.9,1.10
Message-ID: <20090821130554.91CD011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dnsperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30718

Modified Files:
	dnsperf.spec 
Log Message:
- rebuilt with new openssl


Index: dnsperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsperf/devel/dnsperf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dnsperf.spec	24 Jul 2009 20:24:20 -0000	1.9
+++ dnsperf.spec	21 Aug 2009 13:05:54 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Benchmarking authorative and recursing DNS servers
 Name: dnsperf
 Version: 1.0.1.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Url: http://www.nominum.com/services/measurement_tools.php
 Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{version}-1.tar.gz
@@ -41,6 +41,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.1.0-12
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Fri Aug 21 13:06:37 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 13:06:37 +0000 (UTC)
Subject: rpms/perl-DateTime/EL-4 DateTime-LeapSecond-utf8.patch, NONE,
	1.1 DateTime-filter-provides.sh, NONE,
	1.1 DateTime-filter-requires.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 perl-DateTime.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090821130637.2ECAF11C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-DateTime/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30891

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Added Files:
	DateTime-LeapSecond-utf8.patch DateTime-filter-provides.sh 
	DateTime-filter-requires.sh 
Log Message:
Initial import of perl(DateTime) for EPEL


DateTime-LeapSecond-utf8.patch:
 LeapSecond.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE DateTime-LeapSecond-utf8.patch ---
--- DateTime-0.35/lib/DateTime/LeapSecond.pm.orig	2006-02-28 19:15:01.000000000 -0600
+++ DateTime-0.35/lib/DateTime/LeapSecond.pm	2006-11-03 15:53:44.000000000 -0600
@@ -159,11 +159,11 @@
 
 =head1 AUTHOR
 
-Fl?vio Soibelmann Glock, E<lt>fglock at pucrs.brE<gt>
+Fl??vio Soibelmann Glock, E<lt>fglock at pucrs.brE<gt>
 
 =head1 COPYRIGHT
 
-Copyright (c) 2003 Fl?vio Soibelmann Glock.  Copyright (c) 2004-2006
+Copyright (c) 2003 Fl??vio Soibelmann Glock.  Copyright (c) 2004-2006
 David Rolsky.  All rights reserved.  This program is free software;
 you can redistribute it and/or modify it under the same terms as Perl
 itself.


--- NEW FILE DateTime-filter-provides.sh ---
#!/bin/sh
#
# Remove redundant unversioned provides of
# perl(DateTime) and perl(DateTime::TimeZone).

@@PERL_PROV@@ "$@" | sed -e '/^perl(DateTime\(::TimeZone\)\?)$/d'


--- NEW FILE DateTime-filter-requires.sh ---
#!/bin/sh

@@PERL_REQ@@ "$@" | sed -e '/^perl(Win32::.*$/d'


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Sep 2005 20:15:06 -0000	1.2
+++ .cvsignore	21 Aug 2009 13:06:36 -0000	1.3
@@ -1,3 +1,3 @@
-DateTime-0.2901.tar.gz
-DateTime-Locale-0.22.tar.gz
-DateTime-TimeZone-0.37.tar.gz
+DateTime-0.41.tar.gz
+DateTime-Locale-0.35.tar.gz
+DateTime-TimeZone-0.67.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/EL-4/perl-DateTime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-DateTime.spec	16 Sep 2005 20:15:06 -0000	1.1
+++ perl-DateTime.spec	21 Aug 2009 13:06:36 -0000	1.2
@@ -1,25 +1,33 @@
-%define DTTimeZone_version 0.37
-%define DTLocale_version 0.22
+%define DTTimeZone_version 0.67
+%define DTLocale_version 0.35
 
 Name:           perl-DateTime
-Version:        0.2901
-Release:        2%{?dist}
-Summary:        DateTime Perl module
+Version:        0.41
+Release:        1%{?dist}
+Epoch:          1
+Summary:        Date and time objects
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime/
-Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-0.2901.tar.gz
-Source1:        http://www.cpan.org/modules/by-module/DateTime/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
-Source2:        http://www.cpan.org/modules/by-module/DateTime/DateTime-Locale-%{DTLocale_version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-%{version}.tar.gz
+Source1:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
+Source2:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-%{DTLocale_version}.tar.gz
+Patch0:         DateTime-LeapSecond-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  perl(Class::Singleton) >= 1.03
+BuildRequires:  perl(File::Find::Rule)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Params::Validate) >= 0.76
-BuildRequires:  perl(Class::Singleton) >= 1.03
 BuildRequires:  perl(Pod::Man) >= 1.14
-BuildRequires:  perl(File::Find::Rule)
+# Not yet available on EL-4 branch.
+#BuildRequires:  perl(Test::Output)
 BuildRequires:  perl(Test::Pod)
-Requires:       perl(Params::Validate) >= 0.76
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
+# Creates a build dependency loop.
+#BuildRequires:  perl(DateTime::Format::ICal)
+#BuildRequires:  perl(DateTime::Format::Strptime)
 Requires:       perl(Class::Singleton) >= 1.03
+Requires:       perl(Params::Validate) >= 0.76
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-DateTime-TimeZone = %{DTTimeZone_version}
 Provides:       perl-DateTime-Locale = %{DTLocale_version}
@@ -27,24 +35,35 @@ Provides:       perl(DateTime::TimeZoneC
 Provides:       perl(DateTimePP)
 Provides:       perl(DateTimePPExtra)
 
+Source98:       DateTime-filter-requires.sh
+%global real_perl_requires %{__perl_requires}
+%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+
+Source99:       DateTime-filter-provides.sh
+%global real_perl_provides %{__perl_provides}
+%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+
 %description
-The DateTime.pm module aims to provide a complete, correct, and easy to use
-date/time object implementation. Currently it handles many date
-calculations, date math (addition and subtraction), and provides convenient
-methods for retrieving portions of a date/time.
+DateTime is a class for the representation of date/time combinations, and
+is part of the Perl DateTime project. For details on this project please
+see http://datetime.perl.org/. The DateTime site has a FAQ which may help
+answer many "how do I do X?" questions. The FAQ is at
+http://datetime.perl.org/faq.html.
 
 %prep
 %setup -q -T -c -n DateTimeBundle -a 0
 %setup -q -T -D -n DateTimeBundle -a 1
 %setup -q -T -D -n DateTimeBundle -a 2
 
-cat > filter-provides.sh << EOF
-#!/bin/sh
-# Remove redundant unversioned provides of perl(DateTime) and perl(DateTime::TimeZone)
-exec %{__perl_provides} $* | egrep -v '^perl[(]DateTime(::TimeZone)?[)]$'
-EOF
-%define __perl_provides %{_builddir}/DateTimeBundle/filter-provides.sh
-chmod 755 filter-provides.sh
+cd DateTime-%{version}
+%patch0 -p1
+cd -
+
+sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
+chmod +x %{__perl_requires}
+
+sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
+chmod +x %{__perl_provides}
 
 %build
 cd DateTime-Locale-%{DTLocale_version}
@@ -61,35 +80,35 @@ cd DateTime-%{version}
 PERLLIB=../DateTime-Locale-%{DTLocale_version}/blib/lib
 PERLLIB=$PERLLIB:../DateTime-TimeZone-%{DTTimeZone_version}/blib/lib
 export PERLLIB
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 cd -
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 cd DateTime-Locale-%{DTLocale_version}
-./Build install destdir=%{buildroot}
+./Build install destdir=$RPM_BUILD_ROOT
 cd -
 
 cd DateTime-TimeZone-%{DTTimeZone_version}
-./Build install destdir=%{buildroot}
+./Build install destdir=$RPM_BUILD_ROOT
 cd -
 
 cd DateTime-%{version}
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 cd -
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w %{buildroot}/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 # Move documentation into bundle area
 mkdir DT::Locale DT::TimeZone
 mv DateTime-%{version}/{CREDITS,Changes,LICENSE,README,TODO} .
-mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.icu} DT::Locale
+mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.cldr} DT::Locale
 mv DateTime-TimeZone-%{DTTimeZone_version}/{Changes,README} DT::TimeZone
 
 %check
@@ -111,7 +130,7 @@ cd -
 make -C DateTime-%{version} test
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
 
 %files
 %defattr(-,root,root,0755)
@@ -125,6 +144,88 @@ rm -rf %{buildroot}
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Mon Sep 17 2007 Steven Pritchard <steve at kspei.com> 1:0.41-1
+- Update to DateTime 0.41.
+- Update to DateTime::Locale 0.35.
+- Update to DateTime::TimeZone 0.67.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1:0.39-2
+- Rebuild for selinux ppc32 issue.
+
+* Sun Jul 22 2007 Steven Pritchard <steve at kspei.com> 1:0.39-1
+- Update to DateTime 0.39.
+- Update to DateTime::TimeZone 0.6603.
+
+* Thu Jul 05 2007 Steven Pritchard <steve at kspei.com> 1:0.38-2
+- BR Test::Output.
+
+* Mon Jul 02 2007 Steven Pritchard <steve at kspei.com> 1:0.38-1
+- Update to DateTime 0.38.
+- Update to DateTime::TimeZone 0.6602.
+- BR Test::Pod::Coverage.
+
+* Mon Apr 02 2007 Steven Pritchard <steve at kspei.com> 1:0.37-3
+- Drop BR DateTime::Format::* to avoid circular build deps.
+
+* Mon Apr 02 2007 Steven Pritchard <steve at kspei.com> 1:0.37-2
+- Filter Win32::TieRegistry dependency.
+- Do the provides filter like we do in cpanspec.
+- Drop some macro usage.
+
+* Sat Mar 31 2007 Steven Pritchard <steve at kspei.com> 1:0.37-1
+- Update to DateTime 0.37.
+- Update to DateTime::TimeZone 0.63.
+
+* Tue Mar 13 2007 Steven Pritchard <steve at kspei.com> 1:0.36-2
+- Update to DateTime::Locale 0.34.
+- Update to DateTime::TimeZone 0.62.
+
+* Mon Jan 22 2007 Steven Pritchard <steve at kspei.com> 1:0.36-1
+- Update to Date::Time 0.36.
+- Update to DateTime::Locale 0.33.
+- Update to DateTime::TimeZone 0.59.
+
+* Fri Nov 03 2006 Steven Pritchard <steve at kspei.com> 1:0.35-1
+- Update to DateTime 0.35.
+- Update to DateTime::Locale 0.3101.
+- LICENSE.icu seems to have been renamed LICENSE.cldr.
+- Update to DateTime::TimeZone 0.54.
+- Use fixperms macro instead of our own chmod incantation.
+- Convert DateTime::LeapSecond to UTF-8 to avoid a rpmlint warning.
+
+* Tue Aug 29 2006 Steven Pritchard <steve at kspei.com> 1:0.34-3
+- Update to DateTime::TimeZone 0.48.
+
+* Mon Aug 28 2006 Steven Pritchard <steve at kspei.com> 1:0.34-2
+- Update to DateTime::TimeZone 0.47.
+
+* Mon Aug 14 2006 Steven Pritchard <steve at kspei.com> 1:0.34-1
+- Update to DateTime 0.34.
+
+* Fri Jul 28 2006 Steven Pritchard <steve at kspei.com> 1:0.32-1
+- Update to DateTime 0.32.
+- Improve Summary, description, and source URLs.
+- Fix find option order.
+
+* Thu Jul 13 2006 Steven Pritchard <steve at kspei.com> 1:0.31-2
+- BR DateTime::Format::ICal and DateTime::Format::Strptime for better
+  test coverage.
+
+* Wed May 24 2006 Steven Pritchard <steve at kspei.com> 1:0.31-1
+- Update DateTime to 0.31.
+- Update DateTime::TimeZone to 0.46.
+
+* Mon Feb 27 2006 Steven Pritchard <steve at kspei.com> 1:0.30-3
+- Bump Epoch (argh, 0.2901 > 0.30 to rpm)
+- Update DateTime::TimeZone to 0.42
+
+* Sat Feb 18 2006 Steven Pritchard <steve at kspei.com> 0.30-2
+- Update DateTime::TimeZone to 0.41
+
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 0.30-1
+- Update DateTime to 0.30
+- Update DateTime::TimeZone to 0.40
+
 * Fri Sep 16 2005 Paul Howarth <paul at city-fan.org> 0.2901-2
 - Unpack each tarball only once
 - Use Module::Build's build script where available


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Sep 2005 20:15:06 -0000	1.2
+++ sources	21 Aug 2009 13:06:37 -0000	1.3
@@ -1,3 +1,3 @@
-f96816e634700ae3c8bd849f97856861  DateTime-0.2901.tar.gz
-bcf9fa78efa8d00fad1293b9d860ce75  DateTime-Locale-0.22.tar.gz
-1adf3f14eda8faccaf5564437eadcfd5  DateTime-TimeZone-0.37.tar.gz
+cbd27b0d9a3eee5ffa6afb9211b19a9e  DateTime-0.41.tar.gz
+857b23381a1a8e7dc2e7d0caa285827d  DateTime-Locale-0.35.tar.gz
+4684adbdf78d863a3526d5d9a52b4d79  DateTime-TimeZone-0.67.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 13:06:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:06:36 +0000 (UTC)
Subject: rpms/dnssec-tools/devel dnssec-tools.spec,1.26,1.27
Message-ID: <20090821130636.03AAA11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dnssec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30934

Modified Files:
	dnssec-tools.spec 
Log Message:
- rebuilt with new openssl


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- dnssec-tools.spec	24 Jul 2009 20:24:49 -0000	1.26
+++ dnssec-tools.spec	21 Aug 2009 13:06:35 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -287,6 +287,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:07:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:07:34 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.134,1.135
Message-ID: <20090821130734.B9F7B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31260

Modified Files:
	dovecot.spec 
Log Message:
- rebuilt with new openssl


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- dovecot.spec	21 Aug 2009 10:44:35 -0000	1.134
+++ dovecot.spec	21 Aug 2009 13:07:34 -0000	1.135
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -435,6 +435,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.4-2
+- rebuilt with new openssl
+
 * Fri Aug 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.4-1
 - updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12
 - fixed a crash in index file handling



From tmraz at fedoraproject.org  Fri Aug 21 13:08:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:08:15 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.135,1.136
Message-ID: <20090821130815.8711D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31468

Modified Files:
	openssl.spec 
Log Message:
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.2.beta3
- enable MD-2



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- openssl.spec	20 Aug 2009 14:20:57 -0000	1.135
+++ openssl.spec	21 Aug 2009 13:08:15 -0000	1.136
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{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
@@ -196,9 +196,9 @@ sslarch=linux-generic32
 ./Configure \
 	--prefix=/usr --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
 	zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
-	enable-cms no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa shared \
+	enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa \
 	--with-krb5-flavor=MIT --enginesdir=%{_libdir}/openssl/engines \
-	--with-krb5-dir=/usr ${sslarch} fips
+	--with-krb5-dir=/usr shared  ${sslarch} fips
 
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 # marked as not requiring an executable stack.
@@ -415,6 +415,9 @@ fi
 /sbin/ldconfig -X
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.2.beta3
+- enable MD-2
+
 * Thu Aug 20 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.1.beta3
 - update to new major upstream release
 



From tmraz at fedoraproject.org  Fri Aug 21 13:08:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:08:24 +0000 (UTC)
Subject: rpms/dsniff/devel dsniff.spec,1.7,1.8
Message-ID: <20090821130824.1BBE411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dsniff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31531

Modified Files:
	dsniff.spec 
Log Message:
- rebuilt with new openssl


Index: dsniff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dsniff/devel/dsniff.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dsniff.spec	24 Jul 2009 20:35:29 -0000	1.7
+++ dsniff.spec	21 Aug 2009 13:08:23 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	Tools for network auditing and penetration testing
 Name:		dsniff
 Version:	2.4
-Release:	0.6.b1%{?dist}
+Release:	0.7.b1%{?dist}
 License:	BSD
 Group:		Applications/Internet
 URL:		http://www.monkey.org/~dugsong/%{name}/
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4-0.7.b1
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-0.6.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:09:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:09:03 +0000 (UTC)
Subject: rpms/echoping/devel echoping.spec,1.8,1.9
Message-ID: <20090821130903.46A3911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/echoping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31769

Modified Files:
	echoping.spec 
Log Message:
- rebuilt with new openssl


Index: echoping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/echoping/devel/echoping.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- echoping.spec	24 Jul 2009 20:49:22 -0000	1.8
+++ echoping.spec	21 Aug 2009 13:09:03 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:       TCP "echo" performance test
 Name:          echoping
 Version:       6.0.2
-Release:       5%{?dist}
+Release:       6%{?dist}
 License:       GPLv2+
 Group:         Applications/Internet
 Source0:       http://downloads.sourceforge.net/echoping/echoping-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf %{buildroot}
 %{_libdir}/echoping/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.0.2-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:09:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:09:42 +0000 (UTC)
Subject: rpms/ecore/devel ecore.spec,1.16,1.17
Message-ID: <20090821130942.E43E411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ecore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31999

Modified Files:
	ecore.spec 
Log Message:
- rebuilt with new openssl


Index: ecore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ecore.spec	24 Jul 2009 21:00:43 -0000	1.16
+++ ecore.spec	21 Aug 2009 13:09:42 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.050
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Event/X abstraction layer
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9.050-7
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9.050-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:10:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:10:21 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel ecryptfs-utils.spec,1.53,1.54
Message-ID: <20090821131021.967E911C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32203

Modified Files:
	ecryptfs-utils.spec 
Log Message:
- rebuilt with new openssl


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ecryptfs-utils.spec	18 Aug 2009 06:56:17 -0000	1.53
+++ ecryptfs-utils.spec	21 Aug 2009 13:10:21 -0000	1.54
@@ -3,7 +3,7 @@
 
 Name: ecryptfs-utils
 Version: 79
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 79-2
+- rebuilt with new openssl
+
 * Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
 - updated to 79
 



From tmraz at fedoraproject.org  Fri Aug 21 13:10:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:10:56 +0000 (UTC)
Subject: rpms/edje/devel edje.spec,1.11,1.12
Message-ID: <20090821131056.4FB9B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/edje/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32382

Modified Files:
	edje.spec 
Log Message:
- rebuilt with new openssl


Index: edje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edje/devel/edje.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- edje.spec	24 Jul 2009 21:02:41 -0000	1.11
+++ edje.spec	21 Aug 2009 13:10:56 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           edje
 Version:        0.9.9.050
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A graphical layout and animation library
 
 Group:          System Environment/Libraries
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9.050-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9.050-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:11:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:11:32 +0000 (UTC)
Subject: rpms/efreet/devel efreet.spec,1.6,1.7
Message-ID: <20090821131132.6602D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/efreet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32568

Modified Files:
	efreet.spec 
Log Message:
- rebuilt with new openssl


Index: efreet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efreet/devel/efreet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- efreet.spec	24 Jul 2009 21:04:27 -0000	1.6
+++ efreet.spec	21 Aug 2009 13:11:32 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           efreet
 Version:        0.5.0.050
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Implementation of several specifications from freedesktop.org
 
 Group:          System Environment/Libraries
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0.050-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0.050-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:12:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:12:35 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.spec,1.39,1.40
Message-ID: <20090821131235.B5E4511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv375

Modified Files:
	ejabberd.spec 
Log Message:
- rebuilt with new openssl


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ejabberd.spec	24 Jul 2009 21:57:27 -0000	1.39
+++ ejabberd.spec	21 Aug 2009 13:12:35 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -218,6 +218,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:13:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:13:10 +0000 (UTC)
Subject: rpms/ekg/devel ekg.spec,1.15,1.16
Message-ID: <20090821131310.BFAC711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ekg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv562

Modified Files:
	ekg.spec 
Log Message:
- rebuilt with new openssl


Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ekg.spec	24 Jul 2009 21:57:55 -0000	1.15
+++ ekg.spec	21 Aug 2009 13:13:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		ekg
 Version:	1.8
-Release:	0.5.rc1%{?dist}
+Release:	0.6.rc1%{?dist}
 Summary:	A client compatible with Gadu-Gadu
 Summary(de):	Ein Cliente kompatibel mit Gadu-Gadu
 Summary(es):	Un cliente compatible con Gadu-Gadu
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pl) %{_mandir}/pl/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8-0.6.rc1
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-0.5.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:13:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:13:47 +0000 (UTC)
Subject: rpms/ekg2/devel ekg2.spec,1.24,1.25
Message-ID: <20090821131347.D9C6111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv759

Modified Files:
	ekg2.spec 
Log Message:
- rebuilt with new openssl


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ekg2.spec	24 Jul 2009 21:58:09 -0000	1.24
+++ ekg2.spec	21 Aug 2009 13:13:47 -0000	1.25
@@ -5,7 +5,7 @@ Summary:	Multi-protocol instant messagin
 Summary(pl):	Wieloprotoko?owy komunikator internetowy
 Name:		ekg2
 Version:	0.2
-Release:	0.10.rc1%{?dist}
+Release:	0.11.rc1%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
@@ -375,6 +375,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/xosd
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-0.11.rc1
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-0.10.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:14:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:14:25 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.85,1.86
Message-ID: <20090821131425.6A99011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv931

Modified Files:
	ekiga.spec 
Log Message:
- rebuilt with new openssl


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ekiga.spec	24 Jul 2009 21:58:23 -0000	1.85
+++ ekiga.spec	21 Aug 2009 13:14:25 -0000	1.86
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -142,6 +142,9 @@ scrollkeeper-update -q || :
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.5-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:14:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:14:58 +0000 (UTC)
Subject: rpms/engine_pkcs11/devel engine_pkcs11.spec,1.7,1.8
Message-ID: <20090821131458.4913511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/engine_pkcs11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1095

Modified Files:
	engine_pkcs11.spec 
Log Message:
- rebuilt with new openssl


Index: engine_pkcs11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/engine_pkcs11/devel/engine_pkcs11.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- engine_pkcs11.spec	24 Jul 2009 22:10:42 -0000	1.7
+++ engine_pkcs11.spec	21 Aug 2009 13:14:58 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           engine_pkcs11
 Version:        0.1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A PKCS#11 engine for use with OpenSSL
 
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.4-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:15:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:15:32 +0000 (UTC)
Subject: rpms/enlightenment/devel enlightenment.spec,1.7,1.8
Message-ID: <20090821131532.C426311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/enlightenment/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1288

Modified Files:
	enlightenment.spec 
Log Message:
- rebuilt with new openssl


Index: enlightenment.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/devel/enlightenment.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- enlightenment.spec	24 Jul 2009 22:11:12 -0000	1.7
+++ enlightenment.spec	21 Aug 2009 13:15:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           enlightenment
 Version:        0.16.999.050
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Highly optimized and extensible desktop shell
 
 Group:          User Interface/Desktops
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.999.050-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.999.050-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:16:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:16:08 +0000 (UTC)
Subject: rpms/epic/devel epic.spec,1.34,1.35
Message-ID: <20090821131608.733BA11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/epic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1473

Modified Files:
	epic.spec 
Log Message:
- rebuilt with new openssl


Index: epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/epic.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- epic.spec	10 Aug 2009 17:18:58 -0000	1.34
+++ epic.spec	21 Aug 2009 13:16:08 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: An ircII chat client
 Name: epic
 Version: 2.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 4
 # The entire source code is Freely redistributable without restriction except some
 # files (notably, glob.c, and compat.c) may contain some source covered by BSD
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/epic/help/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.10-6
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4:2.10-5
 - Use bzipped upstream help tarball.
 



From tmraz at fedoraproject.org  Fri Aug 21 13:16:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:16:42 +0000 (UTC)
Subject: rpms/epsilon/devel epsilon.spec,1.6,1.7
Message-ID: <20090821131642.177E311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/epsilon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1660

Modified Files:
	epsilon.spec 
Log Message:
- rebuilt with new openssl


Index: epsilon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epsilon/devel/epsilon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- epsilon.spec	24 Jul 2009 22:13:52 -0000	1.6
+++ epsilon.spec	21 Aug 2009 13:16:41 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           epsilon
 Version:        0.3.0.012
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Small, display independent, and quick thumbnailing library
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0.012-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0.012-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:17:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:17:22 +0000 (UTC)
Subject: rpms/erlang/devel erlang.spec,1.41,1.42
Message-ID: <20090821131722.4534C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1840

Modified Files:
	erlang.spec 
Log Message:
- rebuilt with new openssl


Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- erlang.spec	10 Aug 2009 22:43:20 -0000	1.41
+++ erlang.spec	21 Aug 2009 13:17:22 -0000	1.42
@@ -1,5 +1,5 @@
 %define ver R13B
-%define rel 01
+%define rel 2
 
 Name:           erlang
 Version:        %{ver}
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - R13B-2.1
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Gerard Milmeister <gemi at bluewin.ch> - R13B-01.1
 - update to R13B01
 



From tmraz at fedoraproject.org  Fri Aug 21 13:18:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:18:01 +0000 (UTC)
Subject: rpms/esmtp/devel esmtp.spec,1.18,1.19
Message-ID: <20090821131801.3311711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/esmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2050

Modified Files:
	esmtp.spec 
Log Message:
- rebuilt with new openssl


Index: esmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esmtp/devel/esmtp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- esmtp.spec	24 Jul 2009 22:17:44 -0000	1.18
+++ esmtp.spec	21 Aug 2009 13:18:01 -0000	1.19
@@ -2,7 +2,7 @@ Summary:        User configurable send-o
 Summary(de):    Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
 Name:           esmtp
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        esmtp-0.4.1-mutt
 # esmtp system config file configuring procmail as mda, for the local-delivery
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/esmtprc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Fri Aug 21 13:18:31 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 21 Aug 2009 13:18:31 +0000 (UTC)
Subject: rpms/DevIL/devel DevIL.spec,1.15,1.16 sources,1.6,1.7
Message-ID: <20090821131831.1E1E211C00D7@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2210

Modified Files:
	DevIL.spec sources 
Log Message:
* Fri Aug 21 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-3
- Switch Source0 to respun upstream tarbal (added a missing header)



Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- DevIL.spec	24 Jul 2009 15:06:46 -0000	1.15
+++ DevIL.spec	21 Aug 2009 13:18:30 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -138,6 +138,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-3
+- Switch Source0 to respun upstream tarbal (added a missing header)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Mar 2009 09:25:04 -0000	1.6
+++ sources	21 Aug 2009 13:18:30 -0000	1.7
@@ -1 +1 @@
-963ab2ef991b5921b2a981502fe43e74  DevIL-1.7.8.tar.gz
+7918f215524589435e5ec2e8736d5e1d  DevIL-1.7.8.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 13:18:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:18:41 +0000 (UTC)
Subject: rpms/ettercap/devel ettercap.spec,1.23,1.24
Message-ID: <20090821131841.0B11F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ettercap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2262

Modified Files:
	ettercap.spec 
Log Message:
- rebuilt with new openssl


Index: ettercap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ettercap/devel/ettercap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ettercap.spec	24 Jul 2009 22:20:56 -0000	1.23
+++ ettercap.spec	21 Aug 2009 13:18:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name: ettercap
 Version: 0.7.3
-Release: 33%{?dist}
+Release: 34%{?dist}
 Summary: Network traffic sniffer/analyser, NCURSES interface version
 Group: Applications/Internet
 License: GPLv2+
@@ -196,6 +196,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/32x32/apps/ettercap.png
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-34
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:19:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:19:36 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.270, 
	1.271
Message-ID: <20090821131936.5E56011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2523

Modified Files:
	evolution-data-server.spec 
Log Message:
- rebuilt with new openssl


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- evolution-data-server.spec	10 Aug 2009 15:06:01 -0000	1.270
+++ evolution-data-server.spec	21 Aug 2009 13:19:36 -0000	1.271
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.90-2
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
 - Update to 2.27.90
 



From tmraz at fedoraproject.org  Fri Aug 21 13:20:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:20:19 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.68,1.69
Message-ID: <20090821132019.A9DD311C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2756

Modified Files:
	evolution-exchange.spec 
Log Message:
- rebuilt with new openssl


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- evolution-exchange.spec	10 Aug 2009 15:13:23 -0000	1.68
+++ evolution-exchange.spec	21 Aug 2009 13:20:19 -0000	1.69
@@ -18,7 +18,7 @@
 
 Name: evolution-exchange
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.90-2
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
 - Update to 2.27.90
 



From tmraz at fedoraproject.org  Fri Aug 21 13:20:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:20:54 +0000 (UTC)
Subject: rpms/ewl/devel ewl.spec,1.3,1.4
Message-ID: <20090821132054.E58DF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ewl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940

Modified Files:
	ewl.spec 
Log Message:
- rebuilt with new openssl


Index: ewl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ewl/devel/ewl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ewl.spec	10 Aug 2009 17:22:15 -0000	1.3
+++ ewl.spec	21 Aug 2009 13:20:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		ewl
 Version:	0.5.2.042
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Enlightenment Widget Library
 
 Group:		System Environment/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/examples
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.2.042-12
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.2.042-11
 - Use bzipped upstream tarball.
 



From tmraz at fedoraproject.org  Fri Aug 21 13:22:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:22:05 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.62,1.63
Message-ID: <20090821132205.8FE4D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3252

Modified Files:
	exim.spec 
Log Message:
- rebuilt with new openssl


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- exim.spec	18 Aug 2009 13:38:20 -0000	1.62
+++ exim.spec	21 Aug 2009 13:22:05 -0000	1.63
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -484,6 +484,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-15
+- rebuilt with new openssl
+
 * Tue Aug 18 2009 Miroslav Lichvar <mlichvar at redhat.com> - 4.69-14
 - Move certificate generation to init script (#517013)
 - Fix strict aliasing warning



From tmraz at fedoraproject.org  Fri Aug 21 13:22:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:22:45 +0000 (UTC)
Subject: rpms/fetchmail/devel fetchmail.spec,1.69,1.70
Message-ID: <20090821132245.016D011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3428

Modified Files:
	fetchmail.spec 
Log Message:
- rebuilt with new openssl


Index: fetchmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- fetchmail.spec	18 Aug 2009 10:37:37 -0000	1.69
+++ fetchmail.spec	21 Aug 2009 13:22:44 -0000	1.70
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.3.11-3
+- rebuilt with new openssl
+
 * Tue Aug 18 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.11-2
 - Regression bug fix for fetchmail 6.3.11
 



From tmraz at fedoraproject.org  Fri Aug 21 13:23:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:23:17 +0000 (UTC)
Subject: rpms/fipscheck/devel fipscheck.spec,1.7,1.8
Message-ID: <20090821132317.3EEB411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fipscheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3590

Modified Files:
	fipscheck.spec 
Log Message:
- rebuilt with new openssl


Index: fipscheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fipscheck/devel/fipscheck.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fipscheck.spec	11 Aug 2009 11:54:08 -0000	1.7
+++ fipscheck.spec	21 Aug 2009 13:23:17 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	A library for integrity verification of FIPS validated modules
 Name:		fipscheck
 Version:	1.2.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 # This is a Red Hat maintained package which is specific to
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfipscheck.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:23:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:23:57 +0000 (UTC)
Subject: rpms/flow-tools/devel flow-tools.spec,1.29,1.30
Message-ID: <20090821132357.040CF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/flow-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3807

Modified Files:
	flow-tools.spec 
Log Message:
- rebuilt with new openssl


Index: flow-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- flow-tools.spec	24 Jul 2009 22:55:57 -0000	1.29
+++ flow-tools.spec	21 Aug 2009 13:23:56 -0000	1.30
@@ -8,7 +8,7 @@
 Version: 0.68.4.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
@@ -218,6 +218,9 @@ fi
 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.68.4.1-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:24:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:24:34 +0000 (UTC)
Subject: rpms/fontmatrix/devel fontmatrix.spec,1.20,1.21
Message-ID: <20090821132434.54E7111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fontmatrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3984

Modified Files:
	fontmatrix.spec 
Log Message:
- rebuilt with new openssl


Index: fontmatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/fontmatrix.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fontmatrix.spec	11 Aug 2009 04:39:43 -0000	1.20
+++ fontmatrix.spec	21 Aug 2009 13:24:34 -0000	1.21
@@ -3,7 +3,7 @@
 Name: fontmatrix
 Summary: A fonts manager
 Version: 0.6.99
-Release: 2.r%{svnrev}%{?dist}
+Release: 3.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.99-3.r1073
+- rebuilt with new openssl
+
 * Tue Aug 11 2009 Parag <pnemade at redhat.com> - 0.6.99-2.r1073
 - update to svn revision 1073
 - Fix Source Audit 2009-08-10



From tmraz at fedoraproject.org  Fri Aug 21 13:25:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:25:25 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.84,1.85
Message-ID: <20090821132525.5E9E811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4204

Modified Files:
	freeradius.spec 
Log Message:
- rebuilt with new openssl


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- freeradius.spec	24 Jul 2009 23:11:03 -0000	1.84
+++ freeradius.spec	21 Aug 2009 13:25:25 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -577,6 +577,9 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.6-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:26:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:26:00 +0000 (UTC)
Subject: rpms/fsarchiver/devel fsarchiver.spec,1.16,1.17
Message-ID: <20090821132600.E7FC111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4399

Modified Files:
	fsarchiver.spec 
Log Message:
- rebuilt with new openssl


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fsarchiver.spec	17 Aug 2009 16:11:57 -0000	1.16
+++ fsarchiver.spec	21 Aug 2009 13:26:00 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		fsarchiver
 Version:	0.5.8
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
 Group:		Applications/Archiving
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
+- rebuilt with new openssl
+
 * Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.5.8-4
 - Enable XZ support
 



From tmraz at fedoraproject.org  Fri Aug 21 13:26:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:26:38 +0000 (UTC)
Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.29,1.30
Message-ID: <20090821132638.E6B7A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fuse-encfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4691

Modified Files:
	fuse-encfs.spec 
Log Message:
- rebuilt with new openssl


Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- fuse-encfs.spec	24 Jul 2009 23:19:23 -0000	1.29
+++ fuse-encfs.spec	21 Aug 2009 13:26:38 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -54,6 +54,9 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* 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
 



From tmraz at fedoraproject.org  Fri Aug 21 13:27:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:27:12 +0000 (UTC)
Subject: rpms/g2ipmsg/devel g2ipmsg.spec,1.4,1.5
Message-ID: <20090821132712.7B8C011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/g2ipmsg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5137

Modified Files:
	g2ipmsg.spec 
Log Message:
- rebuilt with new openssl


Index: g2ipmsg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g2ipmsg/devel/g2ipmsg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- g2ipmsg.spec	24 Jul 2009 23:24:19 -0000	1.4
+++ g2ipmsg.spec	21 Aug 2009 13:27:12 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: IP Messenger for GNOME 2
 Name: g2ipmsg
 Version: 0.9.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://www.ipmsg.org/
@@ -89,6 +89,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:27:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:27:48 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.29,1.30
Message-ID: <20090821132748.4D8C711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5596

Modified Files:
	gammu.spec 
Log Message:
- rebuilt with new openssl


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gammu.spec	13 Aug 2009 15:00:36 -0000	1.29
+++ gammu.spec	21 Aug 2009 13:27:48 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:		gammu
 Version:        1.25.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.25.0-2
+- rebuilt with new openssl
+
 * Thu Aug 13 2009 Xavier Lamien <laxathom at fedorarproject.org> - 1.25.0-1
 - Update release.
 



From tmraz at fedoraproject.org  Fri Aug 21 13:28:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:28:29 +0000 (UTC)
Subject: rpms/gdal/devel gdal.spec,1.67,1.68
Message-ID: <20090821132829.D3DCF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5789

Modified Files:
	gdal.spec 
Log Message:
- rebuilt with new openssl


Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gdal.spec	30 Jul 2009 10:14:24 -0000	1.67
+++ gdal.spec	21 Aug 2009 13:28:29 -0000	1.68
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -537,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-2
+- rebuilt with new openssl
+
 * Thu Jul 30 2009 Dan Horak <dan[at]danny.cz> - 1.6.1-1
 - add patch for incompatibilities caused by libdap 3.9.x (thanks goes to arekm from PLD)
 - update to 1.6.1



From tmraz at fedoraproject.org  Fri Aug 21 13:29:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:29:03 +0000 (UTC)
Subject: rpms/gftp/devel gftp.spec,1.36,1.37
Message-ID: <20090821132903.74EDE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5950

Modified Files:
	gftp.spec 
Log Message:
- rebuilt with new openssl


Index: gftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gftp.spec	25 Jul 2009 00:01:10 -0000	1.36
+++ gftp.spec	21 Aug 2009 13:29:03 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A multi-threaded FTP client for the X Window System
 Name: gftp
 Version: 2.0.19
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 License: GPLv2+
 Group: Applications/Internet
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gftp.1.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.0.19-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:29:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:29:41 +0000 (UTC)
Subject: rpms/gg2/devel gg2.spec,1.13,1.14
Message-ID: <20090821132941.7B27811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6117

Modified Files:
	gg2.spec 
Log Message:
- rebuilt with new openssl


Index: gg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gg2/devel/gg2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gg2.spec	25 Jul 2009 00:01:27 -0000	1.13
+++ gg2.spec	21 Aug 2009 13:29:41 -0000	1.14
@@ -1,6 +1,6 @@
 Name: gg2
 Version: 2.3.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
@@ -360,6 +360,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.0-13
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:30:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:30:15 +0000 (UTC)
Subject: rpms/ghasher/devel ghasher.spec,1.19,1.20
Message-ID: <20090821133015.341DF11C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ghasher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6293

Modified Files:
	ghasher.spec 
Log Message:
- rebuilt with new openssl


Index: ghasher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghasher/devel/ghasher.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ghasher.spec	25 Jul 2009 00:02:44 -0000	1.19
+++ ghasher.spec	21 Aug 2009 13:30:15 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:30:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:30:59 +0000 (UTC)
Subject: rpms/git/devel git.spec,1.89,1.90
Message-ID: <20090821133059.641E911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6491

Modified Files:
	git.spec 
Log Message:
- rebuilt with new openssl


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- git.spec	29 Jul 2009 11:49:52 -0000	1.89
+++ git.spec	21 Aug 2009 13:30:59 -0000	1.90
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
 Version:        1.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.4-2
+- rebuilt with new openssl
+
 * Wed Jul 29 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4-1
 - git-1.6.4
 



From tmraz at fedoraproject.org  Fri Aug 21 13:31:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:31:38 +0000 (UTC)
Subject: rpms/gkrellm/devel gkrellm.spec,1.23,1.24
Message-ID: <20090821133138.03F2011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6683

Modified Files:
	gkrellm.spec 
Log Message:
- rebuilt with new openssl


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gkrellm.spec	25 Jul 2009 00:14:17 -0000	1.23
+++ gkrellm.spec	21 Aug 2009 13:31:37 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.2-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:32:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:32:11 +0000 (UTC)
Subject: rpms/globalplatform/devel globalplatform.spec,1.4,1.5
Message-ID: <20090821133211.D826511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globalplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6871

Modified Files:
	globalplatform.spec 
Log Message:
- rebuilt with new openssl


Index: globalplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globalplatform/devel/globalplatform.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globalplatform.spec	25 Jul 2009 00:22:22 -0000	1.4
+++ globalplatform.spec	21 Aug 2009 13:32:11 -0000	1.5
@@ -1,6 +1,6 @@
 Name: globalplatform
 Version: 5.0.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Library for access to OP 2.0.1 and GP 2.1.1 conforming smart cards
 Group: System Environment/Libraries
 License: LGPLv3+
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.0-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:32:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:32:49 +0000 (UTC)
Subject: rpms/globus-gass-copy/devel globus-gass-copy.spec,1.3,1.4
Message-ID: <20090821133249.B748A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gass-copy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7030

Modified Files:
	globus-gass-copy.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gass-copy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-copy/devel/globus-gass-copy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gass-copy.spec	25 Jul 2009 07:28:59 -0000	1.3
+++ globus-gass-copy.spec	21 Aug 2009 13:32:49 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gass-copy
 %global _name %(tr - _ <<< %{name})
 Version:	4.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus Gass Copy
 
 Group:		System Environment/Libraries
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.14-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.14-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:33:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:33:22 +0000 (UTC)
Subject: rpms/globus-gsi-callback/devel globus-gsi-callback.spec,1.3,1.4
Message-ID: <20090821133322.DEA6711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-callback/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7196

Modified Files:
	globus-gsi-callback.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-callback.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-callback/devel/globus-gsi-callback.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-callback.spec	25 Jul 2009 07:30:24 -0000	1.3
+++ globus-gsi-callback.spec	21 Aug 2009 13:33:22 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gsi-callback
 %global _name %(tr - _ <<< %{name})
 Version:	1.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GSI Callback Library
 
 Group:		System Environment/Libraries
@@ -206,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.10-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.10-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:34:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:34:00 +0000 (UTC)
Subject: rpms/globus-gsi-cert-utils/devel globus-gsi-cert-utils.spec, 1.3,
	1.4
Message-ID: <20090821133400.5394B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7366

Modified Files:
	globus-gsi-cert-utils.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-cert-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/devel/globus-gsi-cert-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-cert-utils.spec	25 Jul 2009 07:31:08 -0000	1.3
+++ globus-gsi-cert-utils.spec	21 Aug 2009 13:34:00 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gsi-cert-utils
 %global _name %(tr - _ <<< %{name})
 Version:	5.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GSI Cert Utils Library
 
 Group:		System Environment/Libraries
@@ -202,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.5-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:34:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:34:36 +0000 (UTC)
Subject: rpms/globus-gsi-credential/devel globus-gsi-credential.spec, 1.3,
	1.4
Message-ID: <20090821133436.EF7AC11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-credential/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7538

Modified Files:
	globus-gsi-credential.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-credential.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/devel/globus-gsi-credential.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-credential.spec	25 Jul 2009 07:31:54 -0000	1.3
+++ globus-gsi-credential.spec	21 Aug 2009 13:34:36 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gsi-credential
 %global _name %(tr - _ <<< %{name})
 Version:	2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GSI Credential Library
 
 Group:		System Environment/Libraries
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:35:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:35:11 +0000 (UTC)
Subject: rpms/globus-gsi-openssl-error/devel globus-gsi-openssl-error.spec,
	1.4, 1.5
Message-ID: <20090821133511.6893711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-openssl-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	globus-gsi-openssl-error.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-openssl-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-openssl-error/devel/globus-gsi-openssl-error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-openssl-error.spec	25 Jul 2009 07:32:38 -0000	1.4
+++ globus-gsi-openssl-error.spec	21 Aug 2009 13:35:11 -0000	1.5
@@ -7,7 +7,7 @@
 Name:		globus-gsi-openssl-error
 %global _name %(tr - _ <<< %{name})
 Version:	0.14
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Error Handling
 
 Group:		System Environment/Libraries
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.14-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.14-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:35:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:35:46 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-core/devel globus-gsi-proxy-core.spec, 1.3,
	1.4
Message-ID: <20090821133546.2D74711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-proxy-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7897

Modified Files:
	globus-gsi-proxy-core.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-proxy-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-core/devel/globus-gsi-proxy-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-proxy-core.spec	25 Jul 2009 07:33:22 -0000	1.3
+++ globus-gsi-proxy-core.spec	21 Aug 2009 13:35:45 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-core
 %global _name %(tr - _ <<< %{name})
 Version:	3.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Core Library
 
 Group:		System Environment/Libraries
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.4-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:36:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:36:25 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/devel globus-gsi-proxy-ssl.spec,1.4,1.5
Message-ID: <20090821133625.2AE6411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8125

Modified Files:
	globus-gsi-proxy-ssl.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-proxy-ssl.spec	25 Jul 2009 07:34:05 -0000	1.4
+++ globus-gsi-proxy-ssl.spec	21 Aug 2009 13:36:24 -0000	1.5
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:37:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:37:02 +0000 (UTC)
Subject: rpms/globus-gsi-sysconfig/devel globus-gsi-sysconfig.spec,1.3,1.4
Message-ID: <20090821133702.D9AA011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8301

Modified Files:
	globus-gsi-sysconfig.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gsi-sysconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/devel/globus-gsi-sysconfig.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-sysconfig.spec	25 Jul 2009 07:34:47 -0000	1.3
+++ globus-gsi-sysconfig.spec	21 Aug 2009 13:37:02 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gsi-sysconfig
 %global _name %(tr - _ <<< %{name})
 Version:	2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GSI System Config Library
 
 Group:		System Environment/Libraries
@@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:37:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:37:40 +0000 (UTC)
Subject: rpms/globus-gssapi-gsi/devel globus-gssapi-gsi.spec,1.3,1.4
Message-ID: <20090821133740.AA62211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gssapi-gsi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8508

Modified Files:
	globus-gssapi-gsi.spec 
Log Message:
- rebuilt with new openssl


Index: globus-gssapi-gsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/devel/globus-gssapi-gsi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gssapi-gsi.spec	25 Jul 2009 07:36:13 -0000	1.3
+++ globus-gssapi-gsi.spec	21 Aug 2009 13:37:40 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-gssapi-gsi
 %global _name %(tr - _ <<< %{name})
 Version:	5.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - GSSAPI library
 
 Group:		System Environment/Libraries
@@ -223,6 +223,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.9-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:38:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:38:14 +0000 (UTC)
Subject: rpms/globus-openssl-module/devel globus-openssl-module.spec, 1.3,
	1.4
Message-ID: <20090821133814.E02F211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-openssl-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8700

Modified Files:
	globus-openssl-module.spec 
Log Message:
- rebuilt with new openssl


Index: globus-openssl-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/devel/globus-openssl-module.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-openssl-module.spec	25 Jul 2009 07:39:45 -0000	1.3
+++ globus-openssl-module.spec	21 Aug 2009 13:38:14 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-openssl-module
 %global _name %(tr - _ <<< %{name})
 Version:	0.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper
 
 Group:		System Environment/Libraries
@@ -205,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:38:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:38:49 +0000 (UTC)
Subject: rpms/globus-proxy-utils/devel globus-proxy-utils.spec,1.3,1.4
Message-ID: <20090821133849.5281811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-proxy-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8887

Modified Files:
	globus-proxy-utils.spec 
Log Message:
- rebuilt with new openssl


Index: globus-proxy-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/devel/globus-proxy-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-proxy-utils.spec	25 Jul 2009 07:40:28 -0000	1.3
+++ globus-proxy-utils.spec	21 Aug 2009 13:38:49 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-proxy-utils
 %global _name %(tr - _ <<< %{name})
 Version:	2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Utility Programs
 
 Group:		Applications/Internet
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.5-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-3
 - Add instruction set architecture (isa) tags
 



From tmraz at fedoraproject.org  Fri Aug 21 13:39:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:39:27 +0000 (UTC)
Subject: rpms/globus-rls-client/devel globus-rls-client.spec,1.3,1.4
Message-ID: <20090821133927.B2C7011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-rls-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9109

Modified Files:
	globus-rls-client.spec 
Log Message:
- rebuilt with new openssl


Index: globus-rls-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/devel/globus-rls-client.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-rls-client.spec	25 Jul 2009 07:41:10 -0000	1.3
+++ globus-rls-client.spec	21 Aug 2009 13:39:27 -0000	1.4
@@ -7,7 +7,7 @@
 Name:		globus-rls-client
 %global _name %(tr - _ <<< %{name})
 Version:	5.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Client
 
 Group:		System Environment/Libraries
@@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.1-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch



From tmraz at fedoraproject.org  Fri Aug 21 13:40:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:40:09 +0000 (UTC)
Subject: rpms/globus-rls-server/devel globus-rls-server.spec,1.3,1.4
Message-ID: <20090821134009.F33B211C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-rls-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9353

Modified Files:
	globus-rls-server.spec 
Log Message:
- rebuilt with new openssl


Index: globus-rls-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/devel/globus-rls-server.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-rls-server.spec	25 Jul 2009 07:41:55 -0000	1.3
+++ globus-rls-server.spec	21 Aug 2009 13:40:09 -0000	1.4
@@ -8,7 +8,7 @@ Name:		globus-rls-server
 %global _name %(tr - _ <<< %{name})
 Version:	4.7
 %global setupversion 4.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Server
 
 Group:		Applications/Internet
@@ -227,6 +227,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/INSTALL
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.7-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.7-4
 - Add instruction set architecture (isa) tags
 



From pkgdb at fedoraproject.org  Fri Aug 21 13:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:40:14 +0000
Subject: [pkgdb] plexus-cdc had acl change status
Message-ID: <20090821134014.60F9710F85C@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on plexus-cdc (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From pkgdb at fedoraproject.org  Fri Aug 21 13:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:40:14 +0000
Subject: [pkgdb] plexus-cdc had acl change status
Message-ID: <20090821134014.8008510F889@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on plexus-cdc (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From pkgdb at fedoraproject.org  Fri Aug 21 13:40:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:40:15 +0000
Subject: [pkgdb] plexus-cdc had acl change status
Message-ID: <20090821134015.6B91D10F895@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on plexus-cdc (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From pkgdb at fedoraproject.org  Fri Aug 21 13:40:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:40:15 +0000
Subject: [pkgdb] plexus-cdc had acl change status
Message-ID: <20090821134015.E686A10F89A@bastion2.fedora.phx.redhat.com>

dbhole has set the approveacls acl on plexus-cdc (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cdc



From xhorak at fedoraproject.org  Fri Aug 21 13:40:35 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 21 Aug 2009 13:40:35 +0000 (UTC)
Subject: rpms/xulrunner/devel mozilla-libnotify.patch, NONE,
	1.1 xulrunner-mozconfig, 1.27, 1.28 xulrunner.spec, 1.173, 1.174
Message-ID: <20090821134035.1625711C0439@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9532

Modified Files:
	xulrunner-mozconfig xulrunner.spec 
Added Files:
	mozilla-libnotify.patch 
Log Message:
Added libnotify support

mozilla-libnotify.patch:
 config/autoconf.mk.in                             |   10 
 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, 644 insertions(+), 5 deletions(-)

--- NEW FILE mozilla-libnotify.patch ---
diff -up mozilla-1.9.1/config/autoconf.mk.in.libnotify mozilla-1.9.1/config/autoconf.mk.in
--- mozilla-1.9.1/config/autoconf.mk.in.libnotify	2009-07-30 17:30:11.000000000 +0200
+++ mozilla-1.9.1/config/autoconf.mk.in	2009-08-21 15:31:20.000000000 +0200
@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir	= @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
 
 installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
 
 DIST		= $(DEPTH)/dist
 LIBXUL_SDK      = @LIBXUL_SDK@
@@ -528,6 +528,10 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
 MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
 XT_LIBS			= @XT_LIBS@
 
+MOZ_LIBNOTIFY_CFLAGS	= @MOZ_LIBNOTIFY_CFLAGS@
+MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS@
+MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
+
 GLIB_CFLAGS	= @GLIB_CFLAGS@
 GLIB_LIBS	= @GLIB_LIBS@
 GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
diff -up mozilla-1.9.1/config/system-headers.libnotify mozilla-1.9.1/config/system-headers
--- mozilla-1.9.1/config/system-headers.libnotify	2009-07-30 17:30:11.000000000 +0200
+++ mozilla-1.9.1/config/system-headers	2009-08-21 15:31:20.000000000 +0200
@@ -432,6 +432,7 @@ libgnomevfs/gnome-vfs-ops.h
 libgnomevfs/gnome-vfs-standard-callbacks.h
 libIDL/IDL.h
 lib$routines.h
+libnotify/notify.h
 limits
 limits.h
 link.h
diff -up mozilla-1.9.1/configure.in.libnotify mozilla-1.9.1/configure.in
--- mozilla-1.9.1/configure.in.libnotify	2009-07-30 17:30:11.000000000 +0200
+++ mozilla-1.9.1/configure.in	2009-08-21 15:31:20.000000000 +0200
@@ -132,6 +132,7 @@ LIBGNOME_VERSION=2.0
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
 SQLITE_VERSION=3.6.10
+LIBNOTIFY_VERSION=0.4
 
 MSMANIFEST_TOOL=
 
@@ -5186,6 +5187,39 @@ AC_SUBST(MOZ_DBUS_GLIB_CFLAGS)
 AC_SUBST(MOZ_DBUS_GLIB_LIBS)
 
 dnl ========================================================
+dnl = libnotify support
+dnl ========================================================
+
+if test "$MOZ_ENABLE_GTK2"
+then
+    MOZ_ENABLE_LIBNOTIFY=1
+
+    MOZ_ARG_DISABLE_BOOL(libnotify,
+    [  --disable-libnotify       Disable libnotify support ],
+    MOZ_ENABLE_LIBNOTIFY=,
+    MOZ_ENABLE_LIBNOTIFY=1)
+
+    if test "$MOZ_ENABLE_LIBNOTIFY"
+    then
+        AC_DEFINE(MOZ_ENABLE_LIBNOTIFY)
+    fi
+fi
+
+if test -z "$SKIP_LIBRARY_CHECKS"
+then
+    if test "$MOZ_ENABLE_GTK2"
+    then
+        if test "$MOZ_ENABLE_LIBNOTIFY"
+        then
+            PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION)
+        fi
+    fi
+fi
+AC_SUBST(MOZ_ENABLE_LIBNOTIFY)
+AC_SUBST(MOZ_LIBNOTIFY_CFLAGS)
+AC_SUBST(MOZ_LIBNOTIFY_LIBS)
+
+dnl ========================================================
 dnl = Build Personal Security Manager
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(crypto,
diff -up mozilla-1.9.1/js/src/config/system-headers.libnotify mozilla-1.9.1/js/src/config/system-headers
--- mozilla-1.9.1/js/src/config/system-headers.libnotify	2009-07-30 17:30:17.000000000 +0200
+++ mozilla-1.9.1/js/src/config/system-headers	2009-08-21 15:31:20.000000000 +0200
@@ -432,6 +432,7 @@ libgnomevfs/gnome-vfs-ops.h
 libgnomevfs/gnome-vfs-standard-callbacks.h
 libIDL/IDL.h
 lib$routines.h
+libnotify/notify.h
 limits
 limits.h
 link.h
diff -up mozilla-1.9.1/toolkit/components/alerts/src/Makefile.in.libnotify mozilla-1.9.1/toolkit/components/alerts/src/Makefile.in
--- mozilla-1.9.1/toolkit/components/alerts/src/Makefile.in.libnotify	2009-07-30 17:30:31.000000000 +0200
+++ mozilla-1.9.1/toolkit/components/alerts/src/Makefile.in	2009-08-21 15:31:20.000000000 +0200
@@ -60,6 +60,8 @@ CPPSRCS   = \
     nsAlertsService.cpp \
     $(NULL)
 
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
+
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
diff -up mozilla-1.9.1/toolkit/components/alerts/src/nsAlertsService.cpp.libnotify mozilla-1.9.1/toolkit/components/alerts/src/nsAlertsService.cpp
--- mozilla-1.9.1/toolkit/components/alerts/src/nsAlertsService.cpp.libnotify	2009-07-30 17:30:31.000000000 +0200
+++ mozilla-1.9.1/toolkit/components/alerts/src/nsAlertsService.cpp	2009-08-21 15:31:20.000000000 +0200
@@ -47,6 +47,7 @@
 #include "nsDependentString.h"
 #include "nsWidgetsCID.h"
 #include "nsILookAndFeel.h"
+#include "nsToolkitCompsCID.h"
 
 static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
 
@@ -73,9 +74,18 @@ NS_IMETHODIMP nsAlertsService::ShowAlert
                                                      nsIObserver * aAlertListener,
                                                      const nsAString & aAlertName)
 {
+  // Check if there is an optional service that handles system-level notifications
+  nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID));
+  nsresult rv;
+  if (sysAlerts) {
+    rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
+                                          aAlertCookie, aAlertListener, aAlertName);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
   nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   nsCOMPtr<nsIDOMWindow> newWindow;
-  nsresult rv;
 
   nsCOMPtr<nsISupportsArray> argsArray;
   rv = NS_NewISupportsArray(getter_AddRefs(argsArray));
diff -up mozilla-1.9.1/toolkit/components/build/nsToolkitCompsCID.h.libnotify mozilla-1.9.1/toolkit/components/build/nsToolkitCompsCID.h
--- mozilla-1.9.1/toolkit/components/build/nsToolkitCompsCID.h.libnotify	2009-07-30 17:30:31.000000000 +0200
+++ mozilla-1.9.1/toolkit/components/build/nsToolkitCompsCID.h	2009-08-21 15:31:20.000000000 +0200
@@ -38,6 +38,13 @@
 #define NS_ALERTSERVICE_CONTRACTID \
   "@mozilla.org/alerts-service;1"
 
+// This separate service uses the same nsIAlertsService interface,
+// but instead sends a notification to a platform alerts API
+// if available. Using a separate CID allows us to overwrite the XUL
+// alerts service at runtime.
+#define NS_SYSTEMALERTSERVICE_CONTRACTID \
+  "@mozilla.org/system-alerts-service;1"
+
 #define NS_AUTOCOMPLETECONTROLLER_CONTRACTID \
   "@mozilla.org/autocomplete/controller;1"
 
@@ -115,6 +122,10 @@
 #define NS_ALERTSSERVICE_CID \
 { 0xa0ccaaf8, 0x9da, 0x44d8, { 0xb2, 0x50, 0x9a, 0xc3, 0xe9, 0x3c, 0x81, 0x17 } }
 
+// {84E11F80-CA55-11DD-AD8B-0800200C9A66}
+#define NS_SYSTEMALERTSSERVICE_CID \
+{ 0x84e11f80, 0xca55, 0x11dd, { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } }
+
 // {F6D5EBBD-34F4-487d-9D10-3D34123E3EB9}
 #define NS_AUTOCOMPLETECONTROLLER_CID \
 { 0xf6d5ebbd, 0x34f4, 0x487d, { 0x9d, 0x10, 0x3d, 0x34, 0x12, 0x3e, 0x3e, 0xb9 } }
diff -up mozilla-1.9.1/toolkit/system/gnome/Makefile.in.libnotify mozilla-1.9.1/toolkit/system/gnome/Makefile.in
--- mozilla-1.9.1/toolkit/system/gnome/Makefile.in.libnotify	2009-07-30 17:30:33.000000000 +0200
+++ mozilla-1.9.1/toolkit/system/gnome/Makefile.in	2009-08-21 15:31:20.000000000 +0200
@@ -51,6 +51,13 @@ REQUIRES = \
 	xpcom \
 	string \
 	necko \
+	alerts \
+	gfx \
+	imglib2 \
+	intl \
+	widget \
+	thebes \
+	cairo \
 	$(NULL)
 
 CPPSRCS = \
@@ -59,6 +66,13 @@ CPPSRCS = \
 	nsGnomeModule.cpp \
 	$(NULL)
 
+ifdef MOZ_ENABLE_LIBNOTIFY
+CPPSRCS += \
+	nsAlertsService.cpp \
+	nsAlertsIconListener.cpp \
+	$(NULL)
+endif
+
 EXTRA_DSO_LDOPTS += \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(XPCOM_FROZEN_LDOPTS) \
@@ -67,8 +81,11 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_GNOMEVFS_LIBS) \
 		$(MOZ_LIBGNOME_LIBS) \
 		$(GLIB_LIBS) \
+		$(MOZ_LIBNOTIFY_LIBS) \
 		$(NULL)
 
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \
@@ -76,4 +93,5 @@ CXXFLAGS += \
 	$(MOZ_GNOMEVFS_CFLAGS) \
 	$(MOZ_LIBGNOME_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(MOZ_LIBNOTIFY_CFLAGS) \
 	$(NULL)
diff -up /dev/null mozilla-1.9.1/toolkit/system/gnome/nsAlertsIconListener.cpp
--- /dev/null	2009-08-21 10:27:01.489538501 +0200
+++ mozilla-1.9.1/toolkit/system/gnome/nsAlertsIconListener.cpp	2009-08-21 15:31:20.000000000 +0200
@@ -0,0 +1,326 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsAlertsIconListener.h"
+#include "imgILoader.h"
+#include "imgIRequest.h"
+#include "gfxIImageFrame.h"
+#include "nsIImage.h"
+#include "nsNetUtil.h"
+#include "nsIImageToPixbuf.h"
+#include "nsIStringBundle.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <libnotify/notify.h>
+#include <gdk/gdk.h>
+
+static PRBool gHasActions = PR_FALSE;
+
+static void notify_action_cb(NotifyNotification *notification,
+                             gchar *action, gpointer user_data)
+{
+  nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
+  alert->SendCallback();
+}
+
+static void notify_closed_cb(NotifyNotification *notification,
+                             gpointer user_data)
+{
+  g_object_unref(notification);
+
+  nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
+  alert->SendClosed();
+  NS_RELEASE(alert);
+}
+
+NS_IMPL_ISUPPORTS2(nsAlertsIconListener, imgIContainerObserver, imgIDecoderObserver)
+
+nsAlertsIconListener::nsAlertsIconListener()
+: mLoadedFrame(PR_FALSE)
+{
+  MOZ_COUNT_CTOR(nsAlertsIconListener);
+}
+
+nsAlertsIconListener::~nsAlertsIconListener()
+{
+  MOZ_COUNT_DTOR(nsAlertsIconListener);
+
+  if (mIconRequest)
+    mIconRequest->CancelAndForgetObserver(NS_BINDING_ABORTED);
+}
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStartRequest(imgIRequest* aRequest)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStartDecode(imgIRequest* aRequest)
+{
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStartContainer(imgIRequest* aRequest,
+                                       imgIContainer* aContainer)
+{
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStartFrame(imgIRequest* aRequest,
+                                   gfxIImageFrame* aFrame)
+{
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnDataAvailable(imgIRequest* aRequest,
+                                      gfxIImageFrame* aFrame,
+                                      const nsIntRect* aRect)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStopContainer(imgIRequest* aRequest,
+                                      imgIContainer* aContainer)
+{
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStopDecode(imgIRequest* aRequest,
+                                   nsresult status,
+                                   const PRUnichar* statusArg)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAlertsIconListener::FrameChanged(imgIContainer* aContainer,
+                                   gfxIImageFrame* aFrame,
+                                   nsIntRect* aDirtyRect)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest,
+                                    PRBool aIsLastPart)
+{
+  PRUint32 imgStatus = imgIRequest::STATUS_ERROR;
+  nsresult rv = aRequest->GetImageStatus(&imgStatus);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) {
+    // We have an error getting the image. Display the notification with no icon.
+    ShowAlert(NULL);
+  }
+
+  if (mIconRequest) {
+    mIconRequest->Cancel(NS_BINDING_ABORTED);
+    mIconRequest = nsnull;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest,
+                                  gfxIImageFrame* aFrame)
+{
+  if (aRequest != mIconRequest)
+    return NS_ERROR_FAILURE;
+
+  if (mLoadedFrame)
+    return NS_OK; // only use one frame
+
+  nsCOMPtr<gfxIImageFrame> frame = aFrame;
+  nsCOMPtr<nsIImage> image = do_GetInterface(frame);
+  if (!image)
+    return NS_ERROR_FAILURE;
+
+  nsresult rv = image->LockImagePixels(PR_FALSE);
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
+    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
+
+  GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image);
+  if (!imagePixbuf)
+    return NS_ERROR_FAILURE;
+
+  rv = image->UnlockImagePixels(PR_FALSE);
+  if (NS_FAILED(rv))
+    return rv;
+
+  ShowAlert(imagePixbuf);
+
+  g_object_unref(imagePixbuf);
+
+  mLoadedFrame = PR_TRUE;
+  return NS_OK;
+}
+
+nsresult
+nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
+{
+  NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
+                                                       mAlertText.get(),
+                                                       NULL, NULL);
+  if (!notify)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  if (aPixbuf)
+    notify_notification_set_icon_from_pixbuf(notify, aPixbuf);
+
+  NS_ADDREF(this);
+  if (mAlertHasAction) {
+    // What we put as the label doesn't matter here, if the action
+    // string is "default" then that makes the entire bubble clickable
+    // rather than creating a button.
+    notify_notification_add_action(notify, "default", "Activate",
+                                   notify_action_cb, this, NULL);
+  }
+
+  g_signal_connect(notify, "closed", G_CALLBACK(notify_closed_cb), this);
+  gboolean result = notify_notification_show(notify, NULL);
+
+  return result ? NS_OK : NS_ERROR_FAILURE;
+}
+
+nsresult
+nsAlertsIconListener::StartRequest(const nsAString & aImageUrl)
+{
+  if (mIconRequest) {
+    // Another icon request is already in flight.  Kill it.
+    mIconRequest->Cancel(NS_BINDING_ABORTED);
+    mIconRequest = nsnull;
+  }
+
+  nsCOMPtr<nsIURI> imageUri;
+  NS_NewURI(getter_AddRefs(imageUri), aImageUrl);
+  if (!imageUri)
+    return ShowAlert(NULL);
+
+  nsCOMPtr<imgILoader> il(do_GetService("@mozilla.org/image/loader;1"));
+  if (!il)
+    return ShowAlert(NULL);
+
+  return il->LoadImage(imageUri, nsnull, nsnull, nsnull, this,
+                       nsnull, nsIRequest::LOAD_NORMAL, nsnull, nsnull,
+                       getter_AddRefs(mIconRequest));
+}
+
+void
+nsAlertsIconListener::SendCallback()
+{
+  mAlertListener->Observe(NULL, "alertclickcallback", mAlertCookie.get());
+}
+
+void
+nsAlertsIconListener::SendClosed()
+{
+  mAlertListener->Observe(NULL, "alertfinished", mAlertCookie.get());
+}
+
+nsresult
+nsAlertsIconListener::InitAlertAsync(const nsAString & aImageUrl,
+                                     const nsAString & aAlertTitle, 
+                                     const nsAString & aAlertText,
+                                     PRBool aAlertTextClickable,
+                                     const nsAString & aAlertCookie,
+                                     nsIObserver * aAlertListener)
+{
+  if (!notify_is_initted()) {
+    // Give the name of this application to libnotify
+    nsCOMPtr<nsIStringBundleService> bundleService = 
+      do_GetService(NS_STRINGBUNDLE_CONTRACTID);
+
+    nsCAutoString appShortName;
+    if (bundleService) {
+      nsCOMPtr<nsIStringBundle> bundle;
+      bundleService->CreateBundle("chrome://branding/locale/brand.properties",
+                                  getter_AddRefs(bundle));
+      nsAutoString appName;
+
+      if (bundle) {
+        bundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
+                                  getter_Copies(appName));
+        appShortName = NS_ConvertUTF16toUTF8(appName);
+      } else {
+        NS_WARNING("brand.properties not present, using default application name");
+        appShortName.AssignLiteral("Mozilla");
+      }
+    } else {
+      appShortName.AssignLiteral("Mozilla");
+    }
+
+    if (!notify_init(appShortName.get()))
+      return NS_ERROR_FAILURE;
+
+    GList *server_caps = notify_get_server_caps();
+    if (server_caps) {
+      for (GList* cap = server_caps; cap != NULL; cap = cap->next) {
+        if (!strcmp((char*) cap->data, "actions")) {
+          gHasActions = PR_TRUE;
+          break;
+        }
+      }
+      g_list_foreach(server_caps, (GFunc)g_free, NULL);
+      g_list_free(server_caps);
+    }
+  }
+
+  if (!gHasActions && aAlertTextClickable)
+    return NS_ERROR_FAILURE; // No good, fallback to XUL
+
+  mAlertTitle = NS_ConvertUTF16toUTF8(aAlertTitle);
+  mAlertText = NS_ConvertUTF16toUTF8(aAlertText);
+
+  mAlertHasAction = aAlertTextClickable;
+
+  mAlertListener = aAlertListener;
+  mAlertCookie = aAlertCookie;
+
+  return StartRequest(aImageUrl);
+}
diff -up /dev/null mozilla-1.9.1/toolkit/system/gnome/nsAlertsIconListener.h
--- /dev/null	2009-08-21 10:27:01.489538501 +0200
+++ mozilla-1.9.1/toolkit/system/gnome/nsAlertsIconListener.h	2009-08-21 15:31:20.000000000 +0200
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsAlertsIconListener_h__
+#define nsAlertsIconListener_h__
+
+#include "nsCOMPtr.h"
+#include "imgIDecoderObserver.h"
+#include "nsStringAPI.h"
+#include "nsIObserver.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+class imgIRequest;
+
+class nsAlertsIconListener : public imgIDecoderObserver
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGICONTAINEROBSERVER
+  NS_DECL_IMGIDECODEROBSERVER
+
+  nsAlertsIconListener();
+  virtual ~nsAlertsIconListener();
+
+  nsresult InitAlertAsync(const nsAString & aImageUrl,
+                          const nsAString & aAlertTitle, 
+                          const nsAString & aAlertText,
+                          PRBool aAlertTextClickable,
+                          const nsAString & aAlertCookie,
+                          nsIObserver * aAlertListener);
+
+  void SendCallback();
+  void SendClosed();
+
+protected:
+  nsCOMPtr<imgIRequest> mIconRequest;
+  nsCString mAlertTitle;
+  nsCString mAlertText;
+
+  nsCOMPtr<nsIObserver> mAlertListener;
+  nsString mAlertCookie;
+
+  PRPackedBool mLoadedFrame;
+  PRPackedBool mAlertHasAction;
+
+  nsresult StartRequest(const nsAString & aImageUrl);
+  nsresult ShowAlert(GdkPixbuf* aPixbuf);
+};
+
+#endif
diff -up /dev/null mozilla-1.9.1/toolkit/system/gnome/nsAlertsService.cpp
--- /dev/null	2009-08-21 10:27:01.489538501 +0200
+++ mozilla-1.9.1/toolkit/system/gnome/nsAlertsService.cpp	2009-08-21 15:31:20.000000000 +0200
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsAlertsService.h"
+#include "nsAlertsIconListener.h"
+
+NS_IMPL_THREADSAFE_ADDREF(nsAlertsService)
+NS_IMPL_THREADSAFE_RELEASE(nsAlertsService)
+
+NS_INTERFACE_MAP_BEGIN(nsAlertsService)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
+   NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
+NS_INTERFACE_MAP_END_THREADSAFE
+
+nsAlertsService::nsAlertsService()
+{}
+
+nsAlertsService::~nsAlertsService()
+{}
+
+nsresult
+nsAlertsService::Init()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, 
+                                                     const nsAString & aAlertText, PRBool aAlertTextClickable,
+                                                     const nsAString & aAlertCookie,
+                                                     nsIObserver * aAlertListener,
+                                                     const nsAString & aAlertName)
+{
+  nsCOMPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
+  if (!alertListener)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
+                                       aAlertCookie, aAlertListener);
+}
diff -up /dev/null mozilla-1.9.1/toolkit/system/gnome/nsAlertsService.h
--- /dev/null	2009-08-21 10:27:01.489538501 +0200
+++ mozilla-1.9.1/toolkit/system/gnome/nsAlertsService.h	2009-08-21 15:31:20.000000000 +0200
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsAlertsService_h__
+#define nsAlertsService_h__
+
+#include "nsIAlertsService.h"
+#include "nsCOMPtr.h"
+
+class nsAlertsService : public nsIAlertsService
+{
+public:
+  NS_DECL_NSIALERTSSERVICE
+  NS_DECL_ISUPPORTS
+
+  nsAlertsService();
+  virtual ~nsAlertsService();
+
+  nsresult Init();
+
+protected:
+
+};
+
+#endif /* nsAlertsService_h__ */
diff -up mozilla-1.9.1/toolkit/system/gnome/nsGnomeModule.cpp.libnotify mozilla-1.9.1/toolkit/system/gnome/nsGnomeModule.cpp
--- mozilla-1.9.1/toolkit/system/gnome/nsGnomeModule.cpp.libnotify	2009-07-30 17:30:33.000000000 +0200
+++ mozilla-1.9.1/toolkit/system/gnome/nsGnomeModule.cpp	2009-08-21 15:31:20.000000000 +0200
@@ -38,11 +38,20 @@
 
 #include "nsGConfService.h"
 #include "nsGnomeVFSService.h"
+#include "nsToolkitCompsCID.h"
 #include "nsIGenericFactory.h"
 
+#ifdef MOZ_ENABLE_LIBNOTIFY
+#include "nsAlertsService.h"
+#endif
+
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGConfService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
 
+#ifdef MOZ_ENABLE_LIBNOTIFY
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init)
+#endif
+
 static const nsModuleComponentInfo components[] = {
   { "GConf Service",
     NS_GCONFSERVICE_CID,
@@ -51,7 +60,13 @@ static const nsModuleComponentInfo compo
   { "GnomeVFS Service",
     NS_GNOMEVFSSERVICE_CID,
     NS_GNOMEVFSSERVICE_CONTRACTID,
-    nsGnomeVFSServiceConstructor }
+    nsGnomeVFSServiceConstructor },
+#ifdef MOZ_ENABLE_LIBNOTIFY
+  { "Gnome Alerts Service",
+    NS_SYSTEMALERTSSERVICE_CID,
+    NS_SYSTEMALERTSERVICE_CONTRACTID,
+    nsAlertsServiceConstructor },
+#endif
 };
 
 NS_IMPL_NSGETMODULE(mozgnome, components)


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xulrunner-mozconfig	6 Aug 2009 07:52:21 -0000	1.27
+++ xulrunner-mozconfig	21 Aug 2009 13:40:34 -0000	1.28
@@ -28,6 +28,7 @@ ac_add_options --disable-javaxpcom
 ac_add_options --disable-crashreporter
 ac_add_options --enable-safe-browsing
 ac_add_options --enable-extensions=default,python/xpcom
+ac_add_options --enable-libnotify
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- xulrunner.spec	12 Aug 2009 10:49:32 -0000	1.173
+++ xulrunner.spec	21 Aug 2009 13:40:34 -0000	1.174
@@ -12,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -29,6 +29,7 @@ Patch2:         mozilla-191-path.patch
 Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
 Patch5:         xulrunner-gtk-include.patch
+Patch6:         mozilla-libnotify.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
@@ -147,11 +148,13 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
     > version.patch
 %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
 
+
 %patch1  -p1 -b .build
 %patch2  -p1 -b .path
 %patch3  -p1 -b .jemalloc
 %patch4  -p1 -b .about-firefox-version
 %patch5  -p1 -b .gtk-include
+%patch6  -p1 -b .libnotify
 
 %patch10 -p1 -b .pk
 
@@ -451,6 +454,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Aug 21 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.2-4
+- Added libnotify support
+
 * Wed Aug 12 2009 Martin Stransky <stransky at redhat.com> 1.9.1.2-3
 - Added fix from #516118 - Headers not C89
 



From tmraz at fedoraproject.org  Fri Aug 21 13:40:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:40:45 +0000 (UTC)
Subject: rpms/gmyth/devel gmyth.spec,1.15,1.16
Message-ID: <20090821134045.0142A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gmyth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9591

Modified Files:
	gmyth.spec 
Log Message:
- rebuilt with new openssl


Index: gmyth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/gmyth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gmyth.spec	25 Jul 2009 00:30:14 -0000	1.15
+++ gmyth.spec	21 Aug 2009 13:40:44 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: MythTV remote access libraries
 Name: gmyth
 Version: 0.7.1
-Release: 10%{?dist}.1
+Release: 11%{?dist}.1
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.1-11.1
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-10.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:41:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:41:28 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.39,1.40
Message-ID: <20090821134128.9F25E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9801

Modified Files:
	gnokii.spec 
Log Message:
- rebuilt with new openssl


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gnokii.spec	25 Jul 2009 00:32:00 -0000	1.39
+++ gnokii.spec	21 Aug 2009 13:41:28 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.27
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -228,6 +228,9 @@ fi
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.27-7
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.27-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:42:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:42:11 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-curl.patch, NONE,
	1.1 openssl.spec, 1.136, 1.137
Message-ID: <20090821134211.540B411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10059

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-curl.patch 
Log Message:
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.3.beta3
- fix WWW:Curl:Easy reference in tsget


openssl-1.0.0-beta3-curl.patch:
 tsget |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-curl.patch ---
diff -up openssl-1.0.0-beta3/apps/tsget.curl openssl-1.0.0-beta3/apps/tsget
--- openssl-1.0.0-beta3/apps/tsget.curl	2006-02-13 00:11:21.000000000 +0100
+++ openssl-1.0.0-beta3/apps/tsget	2009-08-21 15:37:24.000000000 +0200
@@ -7,7 +7,7 @@ use strict;
 use IO::Handle;
 use Getopt::Std;
 use File::Basename;
-use WWW::Curl::easy;
+use WWW::Curl::Easy;
 
 use vars qw(%options);
 
@@ -37,7 +37,7 @@ sub create_curl {
     my $url = shift;
 
     # Create Curl object.
-    my $curl = WWW::Curl::easy::new();
+    my $curl = WWW::Curl::Easy::new();
 
     # Error-handling related options.
     $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d};
@@ -192,4 +192,4 @@ REQUEST: foreach (@ARGV) {
     STDERR->printflush(", $output written.\n") if $options{v};
 }
 $curl->cleanup();
-WWW::Curl::easy::global_cleanup();
+WWW::Curl::Easy::global_cleanup();


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- openssl.spec	21 Aug 2009 13:08:15 -0000	1.136
+++ openssl.spec	21 Aug 2009 13:42:11 -0000	1.137
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{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
@@ -60,6 +60,7 @@ Patch45: openssl-0.9.8j-env-nozlib.patch
 Patch47: openssl-0.9.8j-readme-warning.patch
 Patch48: openssl-0.9.8j-bad-mime.patch
 Patch49: openssl-0.9.8k-algo-doc.patch
+Patch50: openssl-1.0.0-beta3-curl.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
@@ -149,6 +150,7 @@ from other formats to the formats used b
 %patch47 -p1 -b .warning
 %patch48 -p1 -b .bad-mime
 %patch49 -p1 -b .algo-doc
+%patch50 -p1 -b .curl
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 
@@ -415,6 +417,9 @@ fi
 /sbin/ldconfig -X
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.3.beta3
+- fix WWW:Curl:Easy reference in tsget
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.2.beta3
 - enable MD-2
 



From tmraz at fedoraproject.org  Fri Aug 21 13:43:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:43:16 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.196,1.197
Message-ID: <20090821134316.0BF1511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10365

Modified Files:
	gnome-vfs2.spec 
Log Message:
- rebuilt with new openssl


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- gnome-vfs2.spec	14 Aug 2009 13:03:20 -0000	1.196
+++ gnome-vfs2.spec	21 Aug 2009 13:43:15 -0000	1.197
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -264,6 +264,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.24.1-9
+- rebuilt with new openssl
+
 * Fri Aug 14 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-8
 - Drop gnome-mount and gnome-mime-data dependencies
 



From tmraz at fedoraproject.org  Fri Aug 21 13:43:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:43:51 +0000 (UTC)
Subject: rpms/gnubiff/devel gnubiff.spec,1.22,1.23
Message-ID: <20090821134351.A21AB11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnubiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10561

Modified Files:
	gnubiff.spec 
Log Message:
- rebuilt with new openssl


Index: gnubiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnubiff.spec	28 Jul 2009 23:33:35 -0000	1.22
+++ gnubiff.spec	21 Aug 2009 13:43:51 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		gnubiff
 Version:	2.2.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A mail notification program
 
 Group:		Applications/Internet
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-2
+- rebuilt with new openssl
+
 * Tue Jul 26 2009 Fabian Affolter <fabian at bernewireless.net> - 2.2.11-1
 - License is GPLv3+ and not GPLv2+
 - Spec file cleaned up



From tmraz at fedoraproject.org  Fri Aug 21 13:44:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:44:29 +0000 (UTC)
Subject: rpms/gq/devel gq.spec,1.13,1.14
Message-ID: <20090821134429.5CF9311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10759

Modified Files:
	gq.spec 
Log Message:
- rebuilt with new openssl


Index: gq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gq/devel/gq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gq.spec	25 Jul 2009 01:22:49 -0000	1.13
+++ gq.spec	21 Aug 2009 13:44:29 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name:    gq
 Version: 1.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 URL:     http://www.gq-project.org/
@@ -89,6 +89,9 @@ fi
 %dir %{_datadir}/%{name}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From laxathom at fedoraproject.org  Fri Aug 21 13:44:41 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 21 Aug 2009 13:44:41 +0000 (UTC)
Subject: rpms/gammu/devel .cvsignore, 1.17, 1.18 gammu.spec, 1.30,
	1.31 sources, 1.17, 1.18
Message-ID: <20090821134441.407F811C00D7@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10869

Modified Files:
	.cvsignore gammu.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	13 Aug 2009 15:00:36 -0000	1.17
+++ .cvsignore	21 Aug 2009 13:44:41 -0000	1.18
@@ -1 +1 @@
-gammu-1.25.0.tar.bz2
+gammu-1.25.92.tar.bz2


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gammu.spec	21 Aug 2009 13:27:48 -0000	1.30
+++ gammu.spec	21 Aug 2009 13:44:41 -0000	1.31
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.25.0
+Version:        1.25.92
 Release:        2%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Xavier Lamien <laxathom at fedorarproject.org> - 1.25.92-1
+- Update release.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.25.0-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	13 Aug 2009 15:00:36 -0000	1.17
+++ sources	21 Aug 2009 13:44:41 -0000	1.18
@@ -1 +1 @@
-49cb33609cc8cfb4b1f998319cd12b7c  gammu-1.25.0.tar.bz2
+0846e79a9d5832c574241808b1027c4b  gammu-1.25.92.tar.bz2



From laxathom at fedoraproject.org  Fri Aug 21 13:45:18 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 21 Aug 2009 13:45:18 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.31,1.32
Message-ID: <20090821134518.8B50B11C00D7@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11078

Modified Files:
	gammu.spec 
Log Message:
fix release ver


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gammu.spec	21 Aug 2009 13:44:41 -0000	1.31
+++ gammu.spec	21 Aug 2009 13:45:18 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:		gammu
 Version:        1.25.92
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System



From tmraz at fedoraproject.org  Fri Aug 21 13:45:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:45:13 +0000 (UTC)
Subject: rpms/grass/devel grass.spec,1.27,1.28
Message-ID: <20090821134513.05B7511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/grass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11006

Modified Files:
	grass.spec 
Log Message:
- rebuilt with new openssl


Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/devel/grass.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- grass.spec	25 Jul 2009 01:24:50 -0000	1.27
+++ grass.spec	21 Aug 2009 13:45:12 -0000	1.28
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.3.0
-Release:   13%{?dist}
+Release:   14%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2
@@ -331,6 +331,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.3.0-14
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xhorak at fedoraproject.org  Fri Aug 21 13:45:13 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 21 Aug 2009 13:45:13 +0000 (UTC)
Subject: rpms/xulrunner/devel mozilla-libnotify.patch,1.1,1.2
Message-ID: <20090821134513.6E28E11C00D7@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11019

Modified Files:
	mozilla-libnotify.patch 
Log Message:
Fix conflicting patches

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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mozilla-libnotify.patch	21 Aug 2009 13:40:34 -0000	1.1
+++ mozilla-libnotify.patch	21 Aug 2009 13:45:13 -0000	1.2
@@ -1,24 +1,6 @@
 diff -up mozilla-1.9.1/config/autoconf.mk.in.libnotify mozilla-1.9.1/config/autoconf.mk.in
 --- mozilla-1.9.1/config/autoconf.mk.in.libnotify	2009-07-30 17:30:11.000000000 +0200
 +++ mozilla-1.9.1/config/autoconf.mk.in	2009-08-21 15:31:20.000000000 +0200
-@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
- 
- installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
 @@ -528,6 +528,10 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
  MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
  XT_LIBS			= @XT_LIBS@



From tmraz at fedoraproject.org  Fri Aug 21 13:46:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:46:03 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine.spec,1.19,1.20
Message-ID: <20090821134603.90D1611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11359

Modified Files:
	gridengine.spec 
Log Message:
- rebuilt with new openssl


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gridengine.spec	25 Jul 2009 01:28:12 -0000	1.19
+++ gridengine.spec	21 Aug 2009 13:46:03 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2u3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -540,6 +540,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2u3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:46:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:46:43 +0000 (UTC)
Subject: rpms/gsoap/devel gsoap.spec,1.13,1.14
Message-ID: <20090821134643.625F811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11561

Modified Files:
	gsoap.spec 
Log Message:
- rebuilt with new openssl


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gsoap.spec	25 Jul 2009 01:33:56 -0000	1.13
+++ gsoap.spec	21 Aug 2009 13:46:43 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.7.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
@@ -249,6 +249,9 @@ make check
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:47:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:47:22 +0000 (UTC)
Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.34,1.35
Message-ID: <20090821134722.8B02411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gwenhywfar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11720

Modified Files:
	gwenhywfar.spec 
Log Message:
- rebuilt with new openssl


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gwenhywfar.spec	25 Jul 2009 01:56:29 -0000	1.34
+++ gwenhywfar.spec	21 Aug 2009 13:47:22 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 3.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@ find $RPM_BUILD_ROOT -name *.la -exec rm
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:47:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:47:57 +0000 (UTC)
Subject: rpms/gyachi/devel gyachi.spec,1.47,1.48
Message-ID: <20090821134757.240CF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11873

Modified Files:
	gyachi.spec 
Log Message:
- rebuilt with new openssl


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gyachi.spec	25 Jul 2009 01:58:20 -0000	1.47
+++ gyachi.spec	21 Aug 2009 13:47:57 -0000	1.48
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -371,6 +371,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:48:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:48:53 +0000 (UTC)
Subject: rpms/heartbeat/devel heartbeat.spec,1.38,1.39
Message-ID: <20090821134853.0BA2711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12103

Modified Files:
	heartbeat.spec 
Log Message:
- rebuilt with new openssl


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- heartbeat.spec	19 Aug 2009 06:36:15 -0000	1.38
+++ heartbeat.spec	21 Aug 2009 13:48:52 -0000	1.39
@@ -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}
+Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -176,6 +176,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.0-0.4.0daab7da36a8.hg.1
+- rebuilt with new openssl
+
 * Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.4.0daab7da36a8.hg
 - Make use of the specversion variable
 - Add explicit dependancy on cluster-glue-libs to prevent yum from trying to use 



From tmraz at fedoraproject.org  Fri Aug 21 13:49:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:49:30 +0000 (UTC)
Subject: rpms/hedgewars/devel hedgewars.spec,1.21,1.22
Message-ID: <20090821134930.44A2A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12323

Modified Files:
	hedgewars.spec 
Log Message:
- rebuilt with new openssl


Index: hedgewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- hedgewars.spec	25 Jul 2009 02:06:18 -0000	1.21
+++ hedgewars.spec	21 Aug 2009 13:49:30 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -83,6 +83,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.11-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:50:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:50:11 +0000 (UTC)
Subject: rpms/hfsplus-tools/devel hfsplus-tools.spec,1.10,1.11
Message-ID: <20090821135011.3DBD111C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hfsplus-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12554

Modified Files:
	hfsplus-tools.spec 
Log Message:
- rebuilt with new openssl


Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsplus-tools/devel/hfsplus-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- hfsplus-tools.spec	25 Jul 2009 02:08:42 -0000	1.10
+++ hfsplus-tools.spec	21 Aug 2009 13:50:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -110,6 +110,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 332.14-11
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 332.14-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Fri Aug 21 13:50:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 13:50:10 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.2, 1.3 anjal.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20090821135010.8603911C0417@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12534

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- Update to latest git head. Improvements to standard desktop skin.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Aug 2009 21:50:59 -0000	1.2
+++ .cvsignore	21 Aug 2009 13:50:10 -0000	1.3
@@ -1 +1 @@
-anjal-0.1.0-20090813.tar.bz2
+anjal-0.1.0-20090821.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- anjal.spec	19 Aug 2009 21:50:59 -0000	1.1
+++ anjal.spec	21 Aug 2009 13:50:10 -0000	1.2
@@ -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 20090813
-%define git_version 2d4e6a0
+%define gitdate 20090821
+%define git_version 5ac8bfe
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.4.%{snapshot}%{?dist}
+Release:        0.5.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/anjal.desktop
 
 %changelog
+* Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.5
+- Update to latest git head. Improvements to standard desktop skin.
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.4
 - Update to latest git head.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Aug 2009 21:50:59 -0000	1.2
+++ sources	21 Aug 2009 13:50:10 -0000	1.3
@@ -1 +1 @@
-29828c0f3dd5b5caa3fc050a8c202394  anjal-0.1.0-20090813.tar.bz2
+446a41434e2f6a794b9915cd1058c454  anjal-0.1.0-20090821.tar.bz2



From tmraz at fedoraproject.org  Fri Aug 21 13:51:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:51:04 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.222,1.223
Message-ID: <20090821135104.9C01E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12848

Modified Files:
	hplip.spec 
Log Message:
- rebuilt with new openssl


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- hplip.spec	19 Aug 2009 10:39:26 -0000	1.222
+++ hplip.spec	21 Aug 2009 13:51:04 -0000	1.223
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -310,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-7
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
 - Make sure to avoid handwritten asm.
 - Don't use obsolete configure options.



From notting at fedoraproject.org  Fri Aug 21 13:51:41 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 21 Aug 2009 13:51:41 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.88,1.89
Message-ID: <20090821135141.4031011C00D7@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12981

Modified Files:
	comps-f12.xml.in 
Log Message:
Use gutenprint-cups instead of gutenprint-foomatic (#474453)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- comps-f12.xml.in	20 Aug 2009 14:48:42 -0000	1.88
+++ comps-f12.xml.in	21 Aug 2009 13:51:41 -0000	1.89
@@ -4653,7 +4653,7 @@
       <packagereq type="default">bluez-cups</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">gutenprint</packagereq>
-      <packagereq type="default">gutenprint-foomatic</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>



From tmraz at fedoraproject.org  Fri Aug 21 13:51:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:51:41 +0000 (UTC)
Subject: rpms/htdig/devel htdig.spec,1.51,1.52
Message-ID: <20090821135141.5F78F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/htdig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13052

Modified Files:
	htdig.spec 
Log Message:
- rebuilt with new openssl


Index: htdig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htdig/devel/htdig.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- htdig.spec	25 Jul 2009 02:14:27 -0000	1.51
+++ htdig.spec	21 Aug 2009 13:51:41 -0000	1.52
@@ -5,7 +5,7 @@
 Summary: ht://Dig - Web search engine
 Name: htdig
 Version: 3.2.0
-Release: 0.7.b6%{?dist}
+Release: 0.8.b6%{?dist}
 Epoch: 4
 License: GPLv2
 Group: Applications/Internet
@@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4:3.2.0-0.8.b6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:3.2.0-0.7.b6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:52:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:52:17 +0000 (UTC)
Subject: rpms/htmldoc/devel htmldoc.spec,1.17,1.18
Message-ID: <20090821135217.1E8D411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/htmldoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13234

Modified Files:
	htmldoc.spec 
Log Message:
- rebuilt with new openssl


Index: htmldoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htmldoc/devel/htmldoc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- htmldoc.spec	13 Aug 2009 23:46:02 -0000	1.17
+++ htmldoc.spec	21 Aug 2009 13:52:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.27-13
+- rebuilt with new openssl
+
 * Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
 - Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
 - Fix scanf overflows (#512513)



From tmraz at fedoraproject.org  Fri Aug 21 13:52:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:52:50 +0000 (UTC)
Subject: rpms/http_ping/devel http_ping.spec,1.16,1.17
Message-ID: <20090821135250.EDF5911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/http_ping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13384

Modified Files:
	http_ping.spec 
Log Message:
- rebuilt with new openssl


Index: http_ping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/http_ping/devel/http_ping.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- http_ping.spec	25 Jul 2009 02:16:52 -0000	1.16
+++ http_ping.spec	21 Aug 2009 13:52:50 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           http_ping
 Version:        20050629
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        HTTP latency measuring utility
 
 Group:          Applications/Internet
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 20050629-11
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20050629-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:54:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:54:32 +0000 (UTC)
Subject: rpms/httpd/devel httpd.spec,1.137,1.138
Message-ID: <20090821135432.E678F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13738

Modified Files:
	httpd.spec 
Log Message:
- rebuilt with new openssl


Index: httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- httpd.spec	18 Aug 2009 10:07:03 -0000	1.137
+++ httpd.spec	21 Aug 2009 13:54:32 -0000	1.138
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -481,6 +481,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.13-2
+- rebuilt with new openssl
+
 * Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
 - update to 2.2.13
 



From tmraz at fedoraproject.org  Fri Aug 21 13:55:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:55:07 +0000 (UTC)
Subject: rpms/httperf/devel httperf.spec,1.4,1.5
Message-ID: <20090821135507.2EFED11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/httperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13913

Modified Files:
	httperf.spec 
Log Message:
- rebuilt with new openssl


Index: httperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httperf/devel/httperf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- httperf.spec	25 Jul 2009 02:17:31 -0000	1.4
+++ httperf.spec	21 Aug 2009 13:55:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           httperf
 Version:        0.9.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tool for measuring web server performance
 Group:          Development/Tools
 License:        GPLv2+ with exceptions
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.0-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Aug 21 13:55:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:55:15 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821135515.EF7EF10F855@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 11 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 13:55:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:55:20 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821135520.D307210F86F@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora 10 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 13:55:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:55:28 +0000
Subject: [pkgdb] quilt ownership updated
Message-ID: <20090821135528.C78F010F85C@bastion2.fedora.phx.redhat.com>

Package quilt in Fedora devel is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 13:55:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:55:43 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821135543.9271310F855@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 11 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 13:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:55:47 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821135547.4491210F88B@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora 10 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 13:55:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 13:55:53 +0000
Subject: [pkgdb] gquilt ownership updated
Message-ID: <20090821135553.35E0F10F855@bastion2.fedora.phx.redhat.com>

Package gquilt in Fedora devel is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From tmraz at fedoraproject.org  Fri Aug 21 13:56:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:56:01 +0000 (UTC)
Subject: rpms/ice/devel ice.spec,1.33,1.34
Message-ID: <20090821135601.020D311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14139

Modified Files:
	ice.spec 
Log Message:
- rebuilt with new openssl


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ice.spec	25 Jul 2009 03:06:01 -0000	1.33
+++ ice.spec	21 Aug 2009 13:56:00 -0000	1.34
@@ -7,7 +7,7 @@
 
 Name: ice
 Version: 3.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -547,6 +547,9 @@ fi
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:56:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:56:35 +0000 (UTC)
Subject: rpms/ifstat/devel ifstat.spec,1.3,1.4
Message-ID: <20090821135635.0825511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ifstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14293

Modified Files:
	ifstat.spec 
Log Message:
- rebuilt with new openssl


Index: ifstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifstat/devel/ifstat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ifstat.spec	25 Jul 2009 03:14:12 -0000	1.3
+++ ifstat.spec	21 Aug 2009 13:56:34 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Interface statistics
 Name: ifstat
 Version: 1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://gael.roualland.free.fr/ifstat/
@@ -43,6 +43,9 @@ need to have snmpd running for this thou
 %{_bindir}/ifstat
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1-12
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:57:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:57:08 +0000 (UTC)
Subject: rpms/ike-scan/devel ike-scan.spec,1.7,1.8
Message-ID: <20090821135708.3263011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ike-scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14450

Modified Files:
	ike-scan.spec 
Log Message:
- rebuilt with new openssl


Index: ike-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ike-scan/devel/ike-scan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ike-scan.spec	25 Jul 2009 03:15:58 -0000	1.7
+++ ike-scan.spec	21 Aug 2009 13:57:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ike-scan
 Version:        1.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        IKE protocol tool to discover, fingerprint and test IPsec VPN servers
 
 Group:          Applications/Internet
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.9-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:57:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:57:47 +0000 (UTC)
Subject: rpms/ipa/devel ipa.spec,1.23,1.24
Message-ID: <20090821135747.840FF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14836

Modified Files:
	ipa.spec 
Log Message:
- rebuilt with new openssl


Index: ipa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipa/devel/ipa.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ipa.spec	25 Jul 2009 03:29:31 -0000	1.23
+++ ipa.spec	21 Aug 2009 13:57:47 -0000	1.24
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -471,6 +471,9 @@ fi
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:58:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:58:22 +0000 (UTC)
Subject: rpms/ipmitool/devel ipmitool.spec,1.5,1.6
Message-ID: <20090821135822.EDCD811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipmitool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15510

Modified Files:
	ipmitool.spec 
Log Message:
- rebuilt with new openssl


Index: ipmitool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipmitool/devel/ipmitool.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ipmitool.spec	25 Jul 2009 03:31:23 -0000	1.5
+++ ipmitool.spec	21 Aug 2009 13:58:22 -0000	1.6
@@ -1,7 +1,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.11
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -85,6 +85,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.11-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 13:59:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 13:59:21 +0000 (UTC)
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.68,1.69
Message-ID: <20090821135921.1871011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15784

Modified Files:
	ipsec-tools.spec 
Log Message:
- rebuilt with new openssl


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- ipsec-tools.spec	19 Aug 2009 13:54:10 -0000	1.68
+++ ipsec-tools.spec	21 Aug 2009 13:59:20 -0000	1.69
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.7.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -129,6 +129,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/racoon
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-3
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-2
 - enable xauth over PAM (#470793)
 - add TMPDIR setting to the p1_up_down script



From tmraz at fedoraproject.org  Fri Aug 21 14:00:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:00:00 +0000 (UTC)
Subject: rpms/ircd-hybrid/devel ircd-hybrid.spec,1.21,1.22
Message-ID: <20090821140000.132DF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ircd-hybrid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15959

Modified Files:
	ircd-hybrid.spec 
Log Message:
- rebuilt with new openssl


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ircd-hybrid.spec	25 Jul 2009 03:35:33 -0000	1.21
+++ ircd-hybrid.spec	21 Aug 2009 13:59:59 -0000	1.22
@@ -10,7 +10,7 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
@@ -129,6 +129,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.3-10
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:00:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:00:34 +0000 (UTC)
Subject: rpms/ircd-ratbox/devel ircd-ratbox.spec,1.5,1.6
Message-ID: <20090821140034.5B77811C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ircd-ratbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16159

Modified Files:
	ircd-ratbox.spec 
Log Message:
- rebuilt with new openssl


Index: ircd-ratbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-ratbox/devel/ircd-ratbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ircd-ratbox.spec	25 Jul 2009 03:35:46 -0000	1.5
+++ ircd-ratbox.spec	21 Aug 2009 14:00:34 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		ircd-ratbox
 Version:	2.2.8
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Ircd-ratbox is an advanced, stable and fast ircd	
 
 License:	GPLv2
@@ -128,6 +128,9 @@ fi
 %{_bindir}/ircd-mkpasswd
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:01:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:01:21 +0000 (UTC)
Subject: rpms/irssi/devel irssi.spec,1.42,1.43
Message-ID: <20090821140121.2576311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/irssi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16418

Modified Files:
	irssi.spec 
Log Message:
- rebuilt with new openssl


Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- irssi.spec	11 Aug 2009 12:09:31 -0000	1.42
+++ irssi.spec	21 Aug 2009 14:01:21 -0000	1.43
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.14-3
+- rebuilt with new openssl
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.8.14-2
 - Use bzipped upstream tarball.
 



From jgranado at fedoraproject.org  Fri Aug 21 14:01:48 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Fri, 21 Aug 2009 14:01:48 +0000 (UTC)
Subject: rpms/parted/devel parted.spec,1.145,1.146
Message-ID: <20090821140148.1030C11C00D7@cvs1.fedora.phx.redhat.com>

Author: jgranado

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16533

Modified Files:
	parted.spec 
Log Message:
Add libuuid for s390 builds



Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- parted.spec	12 Aug 2009 15:47:38 -0000	1.145
+++ parted.spec	21 Aug 2009 14:01:47 -0000	1.146
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -31,9 +31,7 @@ BuildRequires: gettext-devel
 BuildRequires: texinfo
 BuildRequires: device-mapper-devel
 BuildRequires: libselinux-devel
-%ifnarch s390 s390x
 BuildRequires: libuuid-devel
-%endif
 
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
@@ -131,6 +129,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Aug 21 2009 Joel Granados <jgranado at redhat.com> - 1.9.0-12
+- libuuid-devel is now valid for s390 builds.
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.9.0-11
 - Use xz compressed upstream tarball.
 



From tmraz at fedoraproject.org  Fri Aug 21 14:02:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:02:02 +0000 (UTC)
Subject: rpms/isns-utils/devel isns-utils.spec,1.5,1.6
Message-ID: <20090821140202.A003611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/isns-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16667

Modified Files:
	isns-utils.spec 
Log Message:
- rebuilt with new openssl


Index: isns-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isns-utils/devel/isns-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- isns-utils.spec	25 Jul 2009 03:39:18 -0000	1.5
+++ isns-utils.spec	21 Aug 2009 14:02:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           isns-utils
 Version:        0.91
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The iSNS daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -97,6 +97,9 @@ fi
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.91-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:02:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:02:40 +0000 (UTC)
Subject: rpms/isync/devel isync.spec,1.11,1.12
Message-ID: <20090821140240.0104B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/isync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16879

Modified Files:
	isync.spec 
Log Message:
- rebuilt with new openssl


Index: isync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isync/devel/isync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- isync.spec	25 Jul 2009 03:40:44 -0000	1.11
+++ isync.spec	21 Aug 2009 14:02:39 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           isync
 Version:        1.0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tool to synchronize IMAP4 and Maildir mailboxes
 
 Group:          Applications/Internet
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.4-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:03:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:03:22 +0000 (UTC)
Subject: rpms/jabberd/devel jabberd.spec,1.35,1.36
Message-ID: <20090821140322.D7E4911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/jabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17068

Modified Files:
	jabberd.spec 
Log Message:
- rebuilt with new openssl


Index: jabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- jabberd.spec	25 Jul 2009 03:45:20 -0000	1.35
+++ jabberd.spec	21 Aug 2009 14:03:22 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.2.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.8.tar.bz2
@@ -192,6 +192,9 @@ fi
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:04:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:04:01 +0000 (UTC)
Subject: rpms/jpilot/devel jpilot.spec,1.52,1.53
Message-ID: <20090821140401.DFF6E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/jpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17261

Modified Files:
	jpilot.spec 
Log Message:
- rebuilt with new openssl


Index: jpilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- jpilot.spec	25 Jul 2009 04:08:45 -0000	1.52
+++ jpilot.spec	21 Aug 2009 14:04:01 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 1.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.2-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:04:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:04:49 +0000 (UTC)
Subject: rpms/kadu/devel kadu.spec,1.46,1.47
Message-ID: <20090821140449.8658011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17448

Modified Files:
	kadu.spec 
Log Message:
- rebuilt with new openssl


Index: kadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kadu.spec	25 Jul 2009 04:16:36 -0000	1.46
+++ kadu.spec	21 Aug 2009 14:04:49 -0000	1.47
@@ -107,7 +107,7 @@ Name:		kadu
 Name:		kadu_opt
 %endif
 Version:	0.6.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Summary(pl):	Klient Gadu-Gadu
 Group:		Applications/Internet
@@ -701,6 +701,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.5.2-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:05:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:05:42 +0000 (UTC)
Subject: rpms/kannel/devel kannel.spec,1.23,1.24
Message-ID: <20090821140542.4CB7E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kannel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677

Modified Files:
	kannel.spec 
Log Message:
- rebuilt with new openssl


Index: kannel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kannel.spec	25 Jul 2009 04:17:48 -0000	1.23
+++ kannel.spec	21 Aug 2009 14:05:42 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -164,6 +164,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:06:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:06:31 +0000 (UTC)
Subject: rpms/kasablanca/devel kasablanca.spec,1.23,1.24
Message-ID: <20090821140631.51AC611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kasablanca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17890

Modified Files:
	kasablanca.spec 
Log Message:
- rebuilt with new openssl


Index: kasablanca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kasablanca.spec	25 Jul 2009 04:18:14 -0000	1.23
+++ kasablanca.spec	21 Aug 2009 14:06:31 -0000	1.24
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 License: GPLv2+
 Url: 	 http://kasablanca.berlios.de/ 
@@ -108,6 +108,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.0.2-16
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0.2-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:07:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:07:39 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec,1.85,1.86
Message-ID: <20090821140739.5636111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18114

Modified Files:
	kdebase3.spec 
Log Message:
- rebuilt with new openssl


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- kdebase3.spec	25 Jul 2009 04:26:28 -0000	1.85
+++ kdebase3.spec	21 Aug 2009 14:07:39 -0000	1.86
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -881,6 +881,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.5.10-13
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:08:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:08:23 +0000 (UTC)
Subject: rpms/keepalived/devel keepalived.spec,1.16,1.17
Message-ID: <20090821140823.EFE0011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/keepalived/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18306

Modified Files:
	keepalived.spec 
Log Message:
- rebuilt with new openssl


Index: keepalived.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- keepalived.spec	25 Jul 2009 04:31:58 -0000	1.16
+++ keepalived.spec	21 Aug 2009 14:08:23 -0000	1.17
@@ -4,7 +4,7 @@
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.1.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
@@ -106,6 +106,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.17-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Fri Aug 21 14:08:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:08:49 +0000 (UTC)
Subject: rpms/libnet/EL-4 libnet.spec,1.8,1.9
Message-ID: <20090821140849.3E84C11C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337/EL-4

Modified Files:
	libnet.spec 
Log Message:
Move libnet.so.* to /lib[64] to avoid static linking (#518150)



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/EL-4/libnet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libnet.spec	11 Jun 2009 11:58:56 -0000	1.8
+++ libnet.spec	21 Aug 2009 14:08:49 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
@@ -36,15 +36,19 @@ mkdir __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure
+%configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
+# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.{a,la,so}
+pushd $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+popd
 
 # Prepare samples directory and perform some fixes
 rm -rf __dist_sample/sample/win32
@@ -67,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Fri Aug 21 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-3
+- Move libnet.so.* to /lib[64] to avoid static linking (#518150)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-1
 - Upgrade to 1.1.4
 



From robert at fedoraproject.org  Fri Aug 21 14:08:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:08:49 +0000 (UTC)
Subject: rpms/libnet/EL-5 libnet.spec,1.14,1.15
Message-ID: <20090821140849.7DCD411C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337/EL-5

Modified Files:
	libnet.spec 
Log Message:
Move libnet.so.* to /lib[64] to avoid static linking (#518150)



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/EL-5/libnet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libnet.spec	11 Jun 2009 11:58:57 -0000	1.14
+++ libnet.spec	21 Aug 2009 14:08:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
@@ -36,15 +36,19 @@ mkdir __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure
+%configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
+# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.{a,la,so}
+pushd $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+popd
 
 # Prepare samples directory and perform some fixes
 rm -rf __dist_sample/sample/win32
@@ -67,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Fri Aug 21 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-3
+- Move libnet.so.* to /lib[64] to avoid static linking (#518150)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-1
 - Upgrade to 1.1.4
 



From robert at fedoraproject.org  Fri Aug 21 14:08:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:08:49 +0000 (UTC)
Subject: rpms/libnet/F-10 libnet.spec,1.14,1.15
Message-ID: <20090821140849.D402A11C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337/F-10

Modified Files:
	libnet.spec 
Log Message:
Move libnet.so.* to /lib[64] to avoid static linking (#518150)



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/F-10/libnet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libnet.spec	11 Jun 2009 11:58:57 -0000	1.14
+++ libnet.spec	21 Aug 2009 14:08:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
@@ -36,15 +36,19 @@ mkdir __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure
+%configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
+# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.{a,la,so}
+pushd $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+popd
 
 # Prepare samples directory and perform some fixes
 rm -rf __dist_sample/sample/win32
@@ -67,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Fri Aug 21 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-3
+- Move libnet.so.* to /lib[64] to avoid static linking (#518150)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-1
 - Upgrade to 1.1.4
 



From robert at fedoraproject.org  Fri Aug 21 14:08:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:08:50 +0000 (UTC)
Subject: rpms/libnet/F-11 libnet.spec,1.15,1.16
Message-ID: <20090821140850.2829911C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337/F-11

Modified Files:
	libnet.spec 
Log Message:
Move libnet.so.* to /lib[64] to avoid static linking (#518150)



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/F-11/libnet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libnet.spec	11 Jun 2009 11:58:58 -0000	1.15
+++ libnet.spec	21 Aug 2009 14:08:49 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
@@ -36,15 +36,19 @@ mkdir __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure
+%configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
+# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.{a,la,so}
+pushd $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+popd
 
 # Prepare samples directory and perform some fixes
 rm -rf __dist_sample/sample/win32
@@ -67,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Fri Aug 21 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-3
+- Move libnet.so.* to /lib[64] to avoid static linking (#518150)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-1
 - Upgrade to 1.1.4
 



From robert at fedoraproject.org  Fri Aug 21 14:08:50 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:08:50 +0000 (UTC)
Subject: rpms/libnet/devel libnet.spec,1.17,1.18
Message-ID: <20090821140850.5958611C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337/devel

Modified Files:
	libnet.spec 
Log Message:
Move libnet.so.* to /lib[64] to avoid static linking (#518150)



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libnet.spec	25 Jul 2009 06:10:58 -0000	1.17
+++ libnet.spec	21 Aug 2009 14:08:50 -0000	1.18
@@ -36,15 +36,19 @@ mkdir __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure
+%configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Don't install any static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la}
+# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.{a,la,so}
+pushd $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+popd
 
 # Prepare samples directory and perform some fixes
 rm -rf __dist_sample/sample/win32
@@ -67,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-%{_libdir}/%{name}.so.*
+/%{_lib}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Fri Aug 21 2009 Robert Scheck <robert at fedoraproject.org> 1.1.4-3
+- Move libnet.so.* to /lib[64] to avoid static linking (#518150)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:08:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:08:57 +0000 (UTC)
Subject: rpms/kftpgrabber/devel kftpgrabber.spec,1.10,1.11
Message-ID: <20090821140857.7DEF211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kftpgrabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18518

Modified Files:
	kftpgrabber.spec 
Log Message:
- rebuilt with new openssl


Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kftpgrabber/devel/kftpgrabber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kftpgrabber.spec	25 Jul 2009 04:34:49 -0000	1.10
+++ kftpgrabber.spec	21 Aug 2009 14:08:57 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        FTP client
 
 Group:          Applications/Internet
@@ -107,6 +107,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.1-11
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Fri Aug 21 14:10:56 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:10:56 +0000 (UTC)
Subject: rpms/libnet/EL-4 libnet.spec,1.9,1.10
Message-ID: <20090821141056.8814011C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/EL-4

Modified Files:
	libnet.spec 
Log Message:
...and this time with the correct release tag



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/EL-4/libnet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libnet.spec	21 Aug 2009 14:08:49 -0000	1.9
+++ libnet.spec	21 Aug 2009 14:10:56 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/



From robert at fedoraproject.org  Fri Aug 21 14:10:56 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:10:56 +0000 (UTC)
Subject: rpms/libnet/EL-5 libnet.spec,1.15,1.16
Message-ID: <20090821141056.B6BE711C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/EL-5

Modified Files:
	libnet.spec 
Log Message:
...and this time with the correct release tag



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/EL-5/libnet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libnet.spec	21 Aug 2009 14:08:49 -0000	1.15
+++ libnet.spec	21 Aug 2009 14:10:56 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/



From robert at fedoraproject.org  Fri Aug 21 14:10:57 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:10:57 +0000 (UTC)
Subject: rpms/libnet/devel libnet.spec,1.18,1.19
Message-ID: <20090821141057.86E1E11C0349@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/devel

Modified Files:
	libnet.spec 
Log Message:
...and this time with the correct release tag



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libnet.spec	21 Aug 2009 14:08:50 -0000	1.18
+++ libnet.spec	21 Aug 2009 14:10:57 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/



From robert at fedoraproject.org  Fri Aug 21 14:10:57 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:10:57 +0000 (UTC)
Subject: rpms/libnet/F-11 libnet.spec,1.16,1.17
Message-ID: <20090821141057.3F00511C02C3@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/F-11

Modified Files:
	libnet.spec 
Log Message:
...and this time with the correct release tag



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/F-11/libnet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libnet.spec	21 Aug 2009 14:08:49 -0000	1.16
+++ libnet.spec	21 Aug 2009 14:10:57 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/



From robert at fedoraproject.org  Fri Aug 21 14:10:57 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 21 Aug 2009 14:10:57 +0000 (UTC)
Subject: rpms/libnet/F-10 libnet.spec,1.15,1.16
Message-ID: <20090821141057.03C3211C00D7@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18899/F-10

Modified Files:
	libnet.spec 
Log Message:
...and this time with the correct release tag



Index: libnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnet/F-10/libnet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libnet.spec	21 Aug 2009 14:08:49 -0000	1.15
+++ libnet.spec	21 Aug 2009 14:10:56 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/



From tmraz at fedoraproject.org  Fri Aug 21 14:11:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:11:01 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.208,1.209
Message-ID: <20090821141101.CF1EB11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19010

Modified Files:
	krb5.spec 
Log Message:
- rebuilt with new openssl


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- krb5.spec	25 Jul 2009 04:46:50 -0000	1.208
+++ krb5.spec	21 Aug 2009 14:11:01 -0000	1.209
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -207,6 +207,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:11:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:11:40 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc.spec,1.2,1.3
Message-ID: <20090821141140.B52D411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19312

Modified Files:
	kvirc.spec 
Log Message:
- rebuilt with new openssl


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kvirc.spec	25 Jul 2009 04:51:18 -0000	1.2
+++ kvirc.spec	21 Aug 2009 14:11:40 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.7.%{pre}%{?dist}
+Release:          0.8.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -119,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:14:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:14:28 +0000 (UTC)
Subject: rpms/libarchive/devel libarchive.spec,1.14,1.15
Message-ID: <20090821141428.89FBF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libarchive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19952

Modified Files:
	libarchive.spec 
Log Message:
- rebuilt with new openssl


Index: libarchive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libarchive/devel/libarchive.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libarchive.spec	7 Aug 2009 11:47:21 -0000	1.14
+++ libarchive.spec	21 Aug 2009 14:14:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libarchive
 Version:        2.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for handling streaming archive formats 
 
 Group:          System Environment/Libraries
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.1-2
+- rebuilt with new openssl
+
 * Fri Aug  7 2009 Tomas Bzatek <tbzatek at redhat.com> 2.7.1-1
 - Update to 2.7.1
 - Drop deprecated lzma dependency, libxz handles both formats



From pkgdb at fedoraproject.org  Fri Aug 21 14:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:14:47 +0000
Subject: [pkgdb] quilt: sundaram has requested watchbugzilla
Message-ID: <20090821141447.E8F7C10F84D@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on quilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 14:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:14:49 +0000
Subject: [pkgdb] quilt: sundaram has requested watchcommits
Message-ID: <20090821141450.0C98610F881@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on quilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 14:14:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:14:50 +0000
Subject: [pkgdb] quilt: sundaram has requested commit
Message-ID: <20090821141450.EEE6710F88C@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on quilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 14:14:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:14:55 +0000
Subject: [pkgdb] quilt: sundaram has requested approveacls
Message-ID: <20090821141455.B535310F897@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on quilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 14:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:15:09 +0000
Subject: [pkgdb] gquilt: sundaram has requested watchcommits
Message-ID: <20090821141509.73DC410F882@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on gquilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 14:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:15:10 +0000
Subject: [pkgdb] gquilt: sundaram has requested commit
Message-ID: <20090821141510.B7E7810F89C@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on gquilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 14:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:15:10 +0000
Subject: [pkgdb] gquilt: sundaram has requested watchbugzilla
Message-ID: <20090821141511.4CE8010F89F@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on gquilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From tmraz at fedoraproject.org  Fri Aug 21 14:15:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:15:11 +0000 (UTC)
Subject: rpms/libesmtp/devel libesmtp.spec,1.18,1.19
Message-ID: <20090821141511.0834311C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libesmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20141

Modified Files:
	libesmtp.spec 
Log Message:
- rebuilt with new openssl


Index: libesmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libesmtp/devel/libesmtp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libesmtp.spec	25 Jul 2009 05:34:38 -0000	1.18
+++ libesmtp.spec	21 Aug 2009 14:15:10 -0000	1.19
@@ -3,7 +3,7 @@
 Summary:        SMTP client library
 Name:           libesmtp
 Version:        1.0.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libesmtp.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.4-12
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Aug 21 14:15:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 14:15:11 +0000
Subject: [pkgdb] gquilt: sundaram has requested approveacls
Message-ID: <20090821141511.EB42410F86F@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on gquilt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From tmraz at fedoraproject.org  Fri Aug 21 14:15:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:15:44 +0000 (UTC)
Subject: rpms/libewf/devel libewf.spec,1.14,1.15
Message-ID: <20090821141544.4D58B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libewf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20308

Modified Files:
	libewf.spec 
Log Message:
- rebuilt with new openssl


Index: libewf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/libewf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libewf.spec	25 Jul 2009 05:35:34 -0000	1.14
+++ libewf.spec	21 Aug 2009 14:15:44 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libewf
 Version:        20080501
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Library for the Expert Witness Compression Format (EWF)
 
 Group:          System Environment/Libraries
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 20080501-9
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080501-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:16:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:16:18 +0000 (UTC)
Subject: rpms/libfprint/devel libfprint.spec,1.24,1.25
Message-ID: <20090821141618.51F9611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20454

Modified Files:
	libfprint.spec 
Log Message:
- rebuilt with new openssl


Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libfprint.spec	25 Jul 2009 05:38:13 -0000	1.24
+++ libfprint.spec	21 Aug 2009 14:16:18 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        10.pre2%{?dist}
+Release:        11.pre2%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.0-11.pre2
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-10.pre2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:16:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:16:53 +0000 (UTC)
Subject: rpms/libgadu/devel libgadu.spec,1.11,1.12
Message-ID: <20090821141653.0581111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20632

Modified Files:
	libgadu.spec 
Log Message:
- rebuilt with new openssl


Index: libgadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/libgadu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libgadu.spec	25 Jul 2009 05:39:11 -0000	1.11
+++ libgadu.spec	21 Aug 2009 14:16:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		libgadu
 Version:	1.8.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Gadu-gadu protocol compatible communications library
 License:	LGPLv2
 Group:		System Environment/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.2-5
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:17:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:17:35 +0000 (UTC)
Subject: rpms/libgda/devel libgda.spec,1.49,1.50
Message-ID: <20090821141735.1987511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20807

Modified Files:
	libgda.spec 
Log Message:
- rebuilt with new openssl


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libgda.spec	25 Jul 2009 05:41:10 -0000	1.49
+++ libgda.spec	21 Aug 2009 14:17:34 -0000	1.50
@@ -41,7 +41,7 @@
 Name:             libgda
 Epoch:            1
 Version:          4.0.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -573,6 +573,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.0.2-3
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:18:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:18:11 +0000 (UTC)
Subject: rpms/libjingle/devel libjingle.spec,1.15,1.16
Message-ID: <20090821141811.8B61611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libjingle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20971

Modified Files:
	libjingle.spec 
Log Message:
- rebuilt with new openssl


Index: libjingle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/libjingle.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libjingle.spec	25 Jul 2009 06:00:44 -0000	1.15
+++ libjingle.spec	21 Aug 2009 14:18:11 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libjingle
 Version:        0.3.12
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GoogleTalk implementation of Jingle
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:18:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:18:47 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn.spec,1.11,1.12
Message-ID: <20090821141847.8E56E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21165

Modified Files:
	libmsn.spec 
Log Message:
- rebuilt with new openssl


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libmsn.spec	25 Jul 2009 06:08:46 -0000	1.11
+++ libmsn.spec	21 Aug 2009 14:18:47 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:		libmsn
 Version:	4.0
-Release:	0.13.%{beta}%{?dist}
+Release:	0.14.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.0-0.14.beta7
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-0.13.beta7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:19:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:19:25 +0000 (UTC)
Subject: rpms/libnasl/devel libnasl.spec,1.20,1.21
Message-ID: <20090821141925.5EDEE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libnasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21331

Modified Files:
	libnasl.spec 
Log Message:
- rebuilt with new openssl


Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/devel/libnasl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libnasl.spec	25 Jul 2009 06:10:15 -0000	1.20
+++ libnasl.spec	21 Aug 2009 14:19:25 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/libnasl/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-7
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:19:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:19:58 +0000 (UTC)
Subject: rpms/libopensync-plugin-opie/devel libopensync-plugin-opie.spec, 1.7,
	1.8
Message-ID: <20090821141958.66D5711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libopensync-plugin-opie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21475

Modified Files:
	libopensync-plugin-opie.spec 
Log Message:
- rebuilt with new openssl


Index: libopensync-plugin-opie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-opie/devel/libopensync-plugin-opie.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libopensync-plugin-opie.spec	25 Jul 2009 06:20:01 -0000	1.7
+++ libopensync-plugin-opie.spec	21 Aug 2009 14:19:58 -0000	1.8
@@ -1,7 +1,7 @@
 Name:           libopensync-plugin-opie
 Epoch:          1
 Version:        0.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Synchronisation with the Opie handheld environment
 
 Group:          System Environment/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/opie-sync
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:0.22-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:20:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:20:35 +0000 (UTC)
Subject: rpms/libp11/devel libp11.spec,1.10,1.11
Message-ID: <20090821142035.7AFDE11C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21661

Modified Files:
	libp11.spec 
Log Message:
- rebuilt with new openssl


Index: libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/libp11.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libp11.spec	25 Jul 2009 06:23:02 -0000	1.10
+++ libp11.spec	21 Aug 2009 14:20:35 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libp11
 Version:        0.2.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library for using PKCS#11 modules
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-8
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:21:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:21:11 +0000 (UTC)
Subject: rpms/libpreludedb/devel libpreludedb.spec,1.22,1.23
Message-ID: <20090821142111.9D05511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21820

Modified Files:
	libpreludedb.spec 
Log Message:
- rebuilt with new openssl


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libpreludedb.spec	25 Jul 2009 08:28:48 -0000	1.22
+++ libpreludedb.spec	21 Aug 2009 14:21:11 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:		libpreludedb		           
 Version:	0.9.15.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -163,6 +163,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.15.2-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:21:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:21:44 +0000 (UTC)
Subject: rpms/libssh/devel libssh.spec,1.2,1.3
Message-ID: <20090821142144.0EF0511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21992

Modified Files:
	libssh.spec 
Log Message:
- rebuilt with new openssl


Index: libssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh/devel/libssh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libssh.spec	25 Jul 2009 08:41:42 -0000	1.2
+++ libssh.spec	21 Aug 2009 14:21:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libssh
 Version:        0.2 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library implementing the SSH2 protocol (0xbadc0de version)
 
 Group:          System Environment/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-4
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:22:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:22:19 +0000 (UTC)
Subject: rpms/libssh2/devel libssh2.spec,1.8,1.9
Message-ID: <20090821142219.1BD0811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22155

Modified Files:
	libssh2.spec 
Log Message:
- rebuilt with new openssl


Index: libssh2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh2/devel/libssh2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libssh2.spec	25 Jul 2009 08:41:56 -0000	1.8
+++ libssh2.spec	21 Aug 2009 14:22:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libssh2
 Version:        1.0 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
@@ -93,6 +93,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-4
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:22:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:22:55 +0000 (UTC)
Subject: rpms/libtorrent/devel libtorrent.spec,1.34,1.35
Message-ID: <20090821142255.490F511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22333

Modified Files:
	libtorrent.spec 
Log Message:
- rebuilt with new openssl


Index: libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libtorrent.spec	25 Jul 2009 08:47:38 -0000	1.34
+++ libtorrent.spec	21 Aug 2009 14:22:55 -0000	1.35
@@ -2,7 +2,7 @@ Name:          libtorrent
 License:       GPLv2+
 Group:         System Environment/Libraries
 Version:       0.12.5
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/libtorrent-%{version}.tar.gz
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.12.5-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Fri Aug 21 14:23:28 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 14:23:28 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity-1.1.7-build.xml, NONE,
	1.1 .cvsignore, 1.2, 1.3 plexus-velocity.spec, 1.5, 1.6 sources,
	1.2, 1.3 plexus-velocity-1.1.2-build.xml, 1.1,
	NONE plexus-velocity-1.1.2-project.xml, 1.1, NONE
Message-ID: <20090821142328.4D91E11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22553

Modified Files:
	.cvsignore plexus-velocity.spec sources 
Added Files:
	plexus-velocity-1.1.7-build.xml 
Removed Files:
	plexus-velocity-1.1.2-build.xml 
	plexus-velocity-1.1.2-project.xml 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.1.7-3.1
- Import from Deepak Bhole's work (import from JPackage, update to 1.1.7)
- Remove gcj support


--- NEW FILE plexus-velocity-1.1.7-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<!--build.xml generated by maven from project.xml version 1.1.7
  on date October 31 2005, time 1658-->
<project default="jar" name="plexus-velocity" basedir=".">
  <property name="defaulttargetdir" value="target"></property>
  <property name="libdir" value="target/lib"></property>
  <property name="classesdir" value="target/classes"></property>
  <property name="testclassesdir" value="target/test-classes"></property>
  <property name="testclassesdir" value="target/test-classes"></property>
  <property name="testreportdir" value="target/test-reports"></property>
  <property name="distdir" value="dist"></property>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <property name="final.name" value="plexus-velocity-1.1.7"></property>
  <path id="build.classpath">
    <fileset dir="${libdir}">
      <include name="**/*.jar"></include>
    </fileset>
  </path>
  <target name="init" description="o Initializes some properties">
    <mkdir dir="${libdir}"></mkdir>
    <condition property="noget">
      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
    </condition>
    <!--Test if JUNIT is present in ANT classpath-->
    <available property="Junit.present" classname="junit.framework.Test"></available>
  </target>
  <target name="compile" description="o Compile the code" depends="get-deps">
    <mkdir dir="${classesdir}"></mkdir>
    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
      <src>
        <pathelement location="src/main/java"></pathelement>
      </src>
      <classpath refid="build.classpath"></classpath>
    </javac>
    <copy todir="${classesdir}">
      <fileset dir="src/main/resources">
        <include name="**/*"></include>
      </fileset>
    </copy>
  </target>
  <target name="jar" description="o Create the jar" depends="compile,test">
    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
  </target>
  <target name="clean" description="o Clean up the generated directories">
    <delete dir="${defaulttargetdir}"></delete>
    <delete dir="${distdir}"></delete>
  </target>
  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
    <mkdir dir="dist"></mkdir>
    <copy todir="dist">
      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
    </copy>
  </target>
  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
    <fail message="There were test failures."></fail>
  </target>
  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
    <mkdir dir="${testreportdir}"></mkdir>
    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
      <sysproperty key="basedir" value="."></sysproperty>
      <formatter type="xml"></formatter>
      <formatter usefile="false" type="plain"></formatter>
      <classpath>
        <path refid="build.classpath"></path>
        <pathelement path="${testclassesdir}"></pathelement>
        <pathelement path="${classesdir}"></pathelement>
      </classpath>
      <batchtest todir="${testreportdir}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"></include>
          <exclude name="**/Abstract*.java"></exclude>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="junit-present" unless="Junit.present" depends="init">
    <echo>================================= WARNING ================================</echo>
    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
    <mkdir dir="${testclassesdir}"></mkdir>
    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
      <src>
        <pathelement location="src/test/java"></pathelement>
      </src>
      <classpath>
        <path refid="build.classpath"></path>
        <pathelement path="${classesdir}"></pathelement>
      </classpath>
    </javac>
    <copy todir="${testclassesdir}">
      <fileset dir="src/test/resources">
        <include name="**/*"></include>
      </fileset>
    </copy>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Velocity Component 1.1.7 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.velocity.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
  <target name="get-deps" unless="noget" depends="init">
    <!--Proxy settings works only with a JDK 1.2 and higher.-->
    <setproxy></setproxy>
  </target>
  <target name="install-maven">
    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
  </target>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Mar 2007 18:24:59 -0000	1.2
+++ .cvsignore	21 Aug 2009 14:23:28 -0000	1.3
@@ -1 +1 @@
-plexus-velocity-1.1.2-src.tar.gz
+plexus-velocity-1.1.7-src.tar.gz


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- plexus-velocity.spec	26 Jul 2009 18:56:57 -0000	1.5
+++ plexus-velocity.spec	21 Aug 2009 14:23:28 -0000	1.6
@@ -28,45 +28,45 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
-%define _without_maven 1
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
+%define with_maven 0
+%define without_maven 1
 
 %define section     free
+%define parent plexus
+%define subname velocity
 
 Name:           plexus-velocity
-Version:        1.1.2
-Release:        5.2%{?dist}
+Version:        1.1.7
+Release:        3.1%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
-License:        MIT
+License:        ASL 2.0
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-Source0:        plexus-velocity-1.1.2-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-velocity-1.1.2/
-# tar czf plexus-velocity-1.1.2-src.tar.gz plexus-velocity-1.1.2/
-Source1:        plexus-velocity-1.1.2-build.xml
-Source2:        plexus-velocity-1.1.2-project.xml
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.7/
+# tar czf plexus-velocity-1.1.7-src.tar.gz plexus-velocity-1.1.7/
+Source0:        plexus-velocity-%{version}-src.tar.gz
+Source1:        plexus-velocity-%{version}-build.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
+BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  jpackage-utils >= 0:1.6
 %if %{with_maven}
-BuildRequires:  maven >= 0:1.1
+BuildRequires:  maven2 >= 2.0.4-10jpp
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire
 %endif
-BuildRequires:  ant-nodeps
 BuildRequires:  classworlds >= 0:1.1
 BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-logging
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-utils
 BuildRequires:  velocity
@@ -75,12 +75,8 @@ Requires:  jakarta-commons-collections
 Requires:  plexus-container-default
 Requires:  plexus-utils
 Requires:  velocity
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -97,36 +93,27 @@ Group:          Development/Documentatio
 %description javadoc
 Javadoc for %{name}.
 
-
 %prep
-%setup -q -n plexus-velocity-1.1.2
+%setup -q -n plexus-velocity-%{version}
 for j in $(find . -name "*.jar"); do
         mv $j $j.no
 done
 cp %{SOURCE1} build.xml
-cp %{SOURCE2} project.xml
 
 %build
-%if %{with_maven}
-#mkdir -p .maven/repository/maven/jars
-#build-jar-repository .maven/repository/maven/jars \
-#maven-jelly-tags
-
-#mkdir -p .maven/repository/JPP/jars
-#build-jar-repository -s -p .maven/repository/JPP/jars \
-#classworlds \
-#commons-collections \
-#commons-logging-api \
-#plexus/container-default \
-#plexus/utils \
-#velocity \
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        jar:install javadoc
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
 
+%if %{with_maven}
+    # Use normal pom for now
+    rm -f release-pom.xml
+    mvn-jpp \
+        -e \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        install javadoc:javadoc
 %else
 
 mkdir -p target/lib
@@ -149,44 +136,38 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/velocity-%{version}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
+
 (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
 do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
+# poms
+%if %{with_maven}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+%endif
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.1.2.jar.*
+%{_javadir}/%{parent}
+%{_mavendepmapfragdir}
+%if %{with_maven}
+%{_datadir}/maven2
 %endif
 
 %files javadoc
@@ -194,6 +175,10 @@ fi
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.1.7-3.1
+- Import from Deepak Bhole's work (import from JPackage, update to 1.1.7)
+- Remove gcj support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.2-5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -206,6 +191,10 @@ fi
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.1.2-3jpp.1
 - Autorebuild for GCC 4.3
 
+* Sat Mar 24 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.1.2-3jpp
+- Build with maven2 by default
+- Add gcj_support options
+
 * Fri Feb 16 2007 Tania Bento <tbento at redhat.com> - 0:1.1.2-2jpp.1
 - Fixed %%License.
 - Fixed %%BuildRoot.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Mar 2007 18:24:59 -0000	1.2
+++ sources	21 Aug 2009 14:23:28 -0000	1.3
@@ -1 +1 @@
-9e17316bad952381538118e9684cde28  plexus-velocity-1.1.2-src.tar.gz
+99bf354c1f449006ac77366003d614c2  plexus-velocity-1.1.7-src.tar.gz


--- plexus-velocity-1.1.2-build.xml DELETED ---


--- plexus-velocity-1.1.2-project.xml DELETED ---



From tmraz at fedoraproject.org  Fri Aug 21 14:23:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:23:32 +0000 (UTC)
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.41,1.42
Message-ID: <20090821142332.2D98F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22605

Modified Files:
	libwvstreams.spec 
Log Message:
- rebuilt with new openssl


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- libwvstreams.spec	25 Jul 2009 08:56:17 -0000	1.41
+++ libwvstreams.spec	21 Aug 2009 14:23:31 -0000	1.42
@@ -1,6 +1,6 @@
 Name: libwvstreams
 Version: 4.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: WvStreams is a network programming library written in C++
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
 Patch1: wvstreams-4.2.2-multilib.patch
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.6-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:24:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:24:07 +0000 (UTC)
Subject: rpms/libzdb/devel libzdb.spec,1.5,1.6
Message-ID: <20090821142407.01DE111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libzdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22855

Modified Files:
	libzdb.spec 
Log Message:
- rebuilt with new openssl


Index: libzdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzdb/devel/libzdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libzdb.spec	30 Jul 2009 22:01:43 -0000	1.5
+++ libzdb.spec	21 Aug 2009 14:24:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libzdb
 Version:        2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Small, fast, and easy to use database API
 
 Group:          System Environment/Libraries
@@ -63,6 +63,9 @@ Developer header files & libraries for l
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6-3
+- rebuilt with new openssl
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 2.6-2
 - Bump for F12 mass rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:24:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:24:44 +0000 (UTC)
Subject: rpms/licq/devel licq.spec,1.30,1.31
Message-ID: <20090821142444.35B0811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/licq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23040

Modified Files:
	licq.spec 
Log Message:
- rebuilt with new openssl


Index: licq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/licq/devel/licq.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- licq.spec	25 Jul 2009 11:02:39 -0000	1.30
+++ licq.spec	21 Aug 2009 14:24:44 -0000	1.31
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2
@@ -234,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc plugins/auto-reply/{README,licq_autoreply.conf,examples}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.5-9
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:26:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:26:05 +0000 (UTC)
Subject: rpms/lighttpd/devel lighttpd.spec,1.59,1.60
Message-ID: <20090821142605.ED8E211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23358

Modified Files:
	lighttpd.spec 
Log Message:
- rebuilt with new openssl


Index: lighttpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- lighttpd.spec	25 Jul 2009 11:03:48 -0000	1.59
+++ lighttpd.spec	21 Aug 2009 14:26:05 -0000	1.60
@@ -6,7 +6,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -242,6 +242,9 @@ fi
 
 
 %changelog
+* 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
 



From tmraz at fedoraproject.org  Fri Aug 21 14:26:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:26:40 +0000 (UTC)
Subject: rpms/linuxdcpp/devel linuxdcpp.spec,1.12,1.13
Message-ID: <20090821142640.77E0711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/linuxdcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23503

Modified Files:
	linuxdcpp.spec 
Log Message:
- rebuilt with new openssl


Index: linuxdcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/linuxdcpp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- linuxdcpp.spec	25 Jul 2009 11:08:35 -0000	1.12
+++ linuxdcpp.spec	21 Aug 2009 14:26:40 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		linuxdcpp
 Version:	1.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Direct Connect client
 
 Group:		Applications/Internet
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/linuxdcpp.png
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.3-4
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:27:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:27:21 +0000 (UTC)
Subject: rpms/lynx/devel lynx.spec,1.58,1.59
Message-ID: <20090821142721.B1FF811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/lynx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23668

Modified Files:
	lynx.spec 
Log Message:
- rebuilt with new openssl


Index: lynx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- lynx.spec	25 Jul 2009 11:33:39 -0000	1.58
+++ lynx.spec	21 Aug 2009 14:27:21 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.6
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.6-22
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.6-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:28:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:28:04 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto.spec,1.56,1.57
Message-ID: <20090821142804.AF36B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23869

Modified Files:
	m2crypto.spec 
Log Message:
- rebuilt with new openssl


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- m2crypto.spec	11 Aug 2009 12:41:04 -0000	1.56
+++ m2crypto.spec	21 Aug 2009 14:28:04 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.20
-Release: 1
+Release: 2
 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
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.20-2
+- rebuilt with new openssl
+
 * Tue Aug 11 2009 Miloslav Trma? <mitr at volny.cz> - 0.20-1
 - Update to m2crypto-0.20
 - Fix incorrect merge in HTTPS CONNNECT proxy support



From tmraz at fedoraproject.org  Fri Aug 21 14:28:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:28:43 +0000 (UTC)
Subject: rpms/mail-notification/devel mail-notification.spec,1.71,1.72
Message-ID: <20090821142843.0089411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24316

Modified Files:
	mail-notification.spec 
Log Message:
- rebuilt with new openssl


Index: mail-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- mail-notification.spec	25 Jul 2009 11:39:14 -0000	1.71
+++ mail-notification.spec	21 Aug 2009 14:28:42 -0000	1.72
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -183,6 +183,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-13
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:29:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:29:18 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.29,1.30
Message-ID: <20090821142918.D1FC111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24867

Modified Files:
	mapserver.spec 
Log Message:
- rebuilt with new openssl


Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- mapserver.spec	25 Jul 2009 11:47:44 -0000	1.29
+++ mapserver.spec	21 Aug 2009 14:29:18 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           mapserver
 Version:        5.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -239,6 +239,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.1-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:29:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:29:53 +0000 (UTC)
Subject: rpms/mcabber/devel mcabber.spec,1.13,1.14
Message-ID: <20090821142953.DDD3811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mcabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023

Modified Files:
	mcabber.spec 
Log Message:
- rebuilt with new openssl


Index: mcabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcabber/devel/mcabber.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mcabber.spec	25 Jul 2009 11:54:18 -0000	1.13
+++ mcabber.spec	21 Aug 2009 14:29:53 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mcabber
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Console Jabber instant messaging client
 
 Group:          Applications/Internet
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:30:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:30:27 +0000 (UTC)
Subject: rpms/mediatomb/devel mediatomb.spec,1.14,1.15
Message-ID: <20090821143027.346FB11C0349@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mediatomb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25169

Modified Files:
	mediatomb.spec 
Log Message:
- rebuilt with new openssl


Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/devel/mediatomb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mediatomb.spec	25 Jul 2009 11:57:45 -0000	1.14
+++ mediatomb.spec	21 Aug 2009 14:30:27 -0000	1.15
@@ -1,7 +1,7 @@
 Version: 0.11.0
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -101,6 +101,9 @@ fi
 %{_initrddir}/mediatomb
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.0-11
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:31:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:31:01 +0000 (UTC)
Subject: rpms/medusa/devel medusa.spec,1.4,1.5
Message-ID: <20090821143101.EAC1B11C0349@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/medusa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25334

Modified Files:
	medusa.spec 
Log Message:
- rebuilt with new openssl


Index: medusa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/medusa/devel/medusa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- medusa.spec	25 Jul 2009 12:01:46 -0000	1.4
+++ medusa.spec	21 Aug 2009 14:31:01 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Parallel brute forcing password cracker
 Name: medusa
 Version: 1.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://www.foofus.net/jmk/medusa/medusa.html
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_libdir}/medusa/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-9
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:31:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:31:39 +0000 (UTC)
Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.23,1.24
Message-ID: <20090821143139.CB4E911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mod_authz_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25547

Modified Files:
	mod_authz_ldap.spec 
Log Message:
- rebuilt with new openssl


Index: mod_authz_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mod_authz_ldap.spec	7 Aug 2009 09:11:21 -0000	1.23
+++ mod_authz_ldap.spec	21 Aug 2009 14:31:39 -0000	1.24
@@ -2,7 +2,7 @@
 Summary: LDAP authorization module for the Apache HTTP Server
 Name: mod_authz_ldap
 Version: 0.26
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://authzldap.othello.ch/
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS AUTHORS ChangeLog COPYING
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.26-15
+- rebuilt with new openssl
+
 * Fri Aug 07 2009 Parag <paragn at fedoraproject.org> 0.26-14
 - Spec cleanup as suggested in review bug #226154
 



From tmraz at fedoraproject.org  Fri Aug 21 14:32:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:32:14 +0000 (UTC)
Subject: rpms/monit/devel monit.spec,1.10,1.11
Message-ID: <20090821143214.E52E111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/monit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25737

Modified Files:
	monit.spec 
Log Message:
- rebuilt with new openssl


Index: monit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monit/devel/monit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- monit.spec	14 Aug 2009 19:28:04 -0000	1.10
+++ monit.spec	21 Aug 2009 14:32:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           monit
 Version:        5.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
@@ -96,6 +96,9 @@ fi
 %{_mandir}/man1/monit.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.3-2
+- rebuilt with new openssl
+
 * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 5.0.3-1
 - Update to 5.0.3 (thanks to Lubomir Rintel of Good Data for the patch)
 



From tmraz at fedoraproject.org  Fri Aug 21 14:32:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:32:50 +0000 (UTC)
Subject: rpms/mumble/devel mumble.spec,1.2,1.3
Message-ID: <20090821143250.6256A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mumble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25927

Modified Files:
	mumble.spec 
Log Message:
- rebuilt with new openssl


Index: mumble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumble/devel/mumble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mumble.spec	25 Jul 2009 15:24:20 -0000	1.2
+++ mumble.spec	21 Aug 2009 14:32:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		mumble
 Version:	1.1.8
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	Voice chat software primarily intended for use while gaming
 
 Group:		Applications/Internet
@@ -248,6 +248,9 @@ fi
 %{_datadir}/kde4/services/mumble.protocol
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.8-15
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:33:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:33:25 +0000 (UTC)
Subject: rpms/munge/devel munge.spec,1.1,1.2
Message-ID: <20090821143325.9183211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/munge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26130

Modified Files:
	munge.spec 
Log Message:
- rebuilt with new openssl


Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/devel/munge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- munge.spec	30 Jul 2009 08:11:25 -0000	1.1
+++ munge.spec	21 Aug 2009 14:33:25 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -182,6 +182,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.8-5
+- rebuilt with new openssl
+
 * Thu Jul 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-4
 - Expand defattr with 4th argument for default directory perms.
 - Explict attr for non 0644 files and 0755 directories.



From tmraz at fedoraproject.org  Fri Aug 21 14:34:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:34:15 +0000 (UTC)
Subject: rpms/mysql/devel mysql.spec,1.125,1.126
Message-ID: <20090821143415.B9A0011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26348

Modified Files:
	mysql.spec 
Log Message:
- rebuilt with new openssl


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- mysql.spec	14 Aug 2009 23:39:16 -0000	1.125
+++ mysql.spec	21 Aug 2009 14:34:15 -0000	1.126
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.37
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -642,6 +642,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.1.37-3
+- rebuilt with new openssl
+
 * Fri Aug 14 2009 Tom Lane <tgl at redhat.com> 5.1.37-2
 - Add a couple of patches to improve the probability of the regression tests
   completing in koji builds



From tmraz at fedoraproject.org  Fri Aug 21 14:34:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:34:51 +0000 (UTC)
Subject: rpms/mysql-connector-odbc/devel mysql-connector-odbc.spec, 1.20,
	1.21
Message-ID: <20090821143451.69CF911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mysql-connector-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26544

Modified Files:
	mysql-connector-odbc.spec 
Log Message:
- rebuilt with new openssl


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mysql-connector-odbc.spec	25 Jul 2009 15:31:02 -0000	1.20
+++ mysql-connector-odbc.spec	21 Aug 2009 14:34:51 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.1.5r1144
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/5.1.html
 # exceptions allow library to be linked with most open source SW,
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.1.5r1144-6
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.5r1144-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:35:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:35:30 +0000 (UTC)
Subject: rpms/mysql-gui-tools/devel mysql-gui-tools.spec,1.13,1.14
Message-ID: <20090821143530.903E211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mysql-gui-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26771

Modified Files:
	mysql-gui-tools.spec 
Log Message:
- rebuilt with new openssl


Index: mysql-gui-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mysql-gui-tools.spec	25 Jul 2009 15:31:25 -0000	1.13
+++ mysql-gui-tools.spec	21 Aug 2009 14:35:30 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mysql-gui-tools
 Version:        5.0r12
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        GUI tools to manage mysql Databases
 
 Group:          Applications/Databases
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0r12-13
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0r12-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:36:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:36:34 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.60,1.61
Message-ID: <20090821143634.2D69511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27028

Modified Files:
	nagios-plugins.spec 
Log Message:
- rebuilt with new openssl


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- nagios-plugins.spec	25 Jul 2009 15:43:05 -0000	1.60
+++ nagios-plugins.spec	21 Aug 2009 14:36:34 -0000	1.61
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -809,6 +809,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.13-17
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.13-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:37:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:37:13 +0000 (UTC)
Subject: rpms/nagios-plugins-snmp-disk-proc/devel
	nagios-plugins-snmp-disk-proc.spec, 1.9, 1.10
Message-ID: <20090821143713.8B83911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27208

Modified Files:
	nagios-plugins-snmp-disk-proc.spec 
Log Message:
- rebuilt with new openssl


Index: nagios-plugins-snmp-disk-proc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins-snmp-disk-proc/devel/nagios-plugins-snmp-disk-proc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nagios-plugins-snmp-disk-proc.spec	25 Jul 2009 15:43:41 -0000	1.9
+++ nagios-plugins-snmp-disk-proc.spec	21 Aug 2009 14:37:13 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           nagios-plugins-snmp-disk-proc
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Nagios SNMP plugins to monitor remote disk and processes
 
 Group:          Applications/System
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-6
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:37:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:37:51 +0000 (UTC)
Subject: rpms/ndoutils/devel ndoutils.spec,1.1,1.2
Message-ID: <20090821143751.56B1511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ndoutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27381

Modified Files:
	ndoutils.spec 
Log Message:
- rebuilt with new openssl


Index: ndoutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ndoutils/devel/ndoutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ndoutils.spec	29 Jul 2009 16:35:25 -0000	1.1
+++ ndoutils.spec	21 Aug 2009 14:37:51 -0000	1.2
@@ -5,7 +5,7 @@
 Name:           ndoutils
 Version:        1.4
 
-Release:        0.6%{?dotbetaversion}%{?dist}
+Release:        0.7%{?dotbetaversion}%{?dist}
 Summary:        Stores all configuration and event data from Nagios in a database
 
 Group:          Applications/System
@@ -127,6 +127,9 @@ fi
 /usr/sbin/alternatives --install /usr/sbin/ndo2db ndo2db /usr/sbin/ndo2db.mysql 40
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.7.b8
+- rebuilt with new openssl
+
 * Tue Jul 21 2009 Steve Traylen <steve.traylen at cern.ch> - 1.4-0.6.b8
 - A requires nagios = 2 will not work.
 



From tmraz at fedoraproject.org  Fri Aug 21 14:38:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:38:25 +0000 (UTC)
Subject: rpms/nekovm/devel nekovm.spec,1.4,1.5
Message-ID: <20090821143825.500B011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nekovm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27556

Modified Files:
	nekovm.spec 
Log Message:
- rebuilt with new openssl


Index: nekovm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nekovm/devel/nekovm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nekovm.spec	25 Jul 2009 15:56:15 -0000	1.4
+++ nekovm.spec	21 Aug 2009 14:38:25 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           nekovm
 Version:        1.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Neko embedded scripting language and virtual machine
 
 Group:          Development/Libraries
@@ -161,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.0-6
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:39:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:39:17 +0000 (UTC)
Subject: rpms/nessus-core/devel nessus-core.spec,1.15,1.16
Message-ID: <20090821143917.140D211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nessus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27773

Modified Files:
	nessus-core.spec 
Log Message:
- rebuilt with new openssl


Index: nessus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nessus-core/devel/nessus-core.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nessus-core.spec	25 Jul 2009 15:57:38 -0000	1.15
+++ nessus-core.spec	21 Aug 2009 14:39:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nessus-core
 Version:        2.2.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Network vulnerability scanner
 
 Group:          Applications/System
@@ -233,6 +233,9 @@ fi
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Fri Aug 21 14:39:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 14:39:22 +0000 (UTC)
Subject: rpms/anjal/devel anjal.spec,1.2,1.3 anjal-toolbar.patch,1.1,NONE
Message-ID: <20090821143922.BE3FF11C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27841

Modified Files:
	anjal.spec 
Removed Files:
	anjal-toolbar.patch 
Log Message:
-drop upstreamed patch


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- anjal.spec	21 Aug 2009 13:50:10 -0000	1.2
+++ anjal.spec	21 Aug 2009 14:39:22 -0000	1.3
@@ -9,14 +9,13 @@
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.5.%{snapshot}%{?dist}
+Release:        0.6.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
 License:        LGPLv2 or LGPLv3
 URL:            http://live.gnome.org/Anjal/
 Source0:        %{tarfile}
-Patch0:         anjal-toolbar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: anerley-devel
@@ -43,7 +42,6 @@ all the mail backends including POP3, IM
 
 %prep
 %setup -q
-%patch0 -p1 -b .toolbar
 
 # run autogen.sh until we have a proper release
 NOCONFIGURE=yes ./autogen.sh
@@ -71,6 +69,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/anjal.desktop
 
 %changelog
+* Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.6
+- Drop upstreamed patch
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.5
 - Update to latest git head. Improvements to standard desktop skin.
 


--- anjal-toolbar.patch DELETED ---



From tmraz at fedoraproject.org  Fri Aug 21 14:40:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:40:21 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.186,1.187
Message-ID: <20090821144021.813F511C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28116

Modified Files:
	net-snmp.spec 
Log Message:
- rebuilt with new openssl


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- net-snmp.spec	14 Aug 2009 20:29:28 -0000	1.186
+++ net-snmp.spec	21 Aug 2009 14:40:21 -0000	1.187
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -429,6 +429,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:5.4.2.1-16
+- rebuilt with new openssl
+
 * Fri Aug 14 2009 Orion Poplawski <orion at cora.nwra.com> 1:5.4.2.1-15
 - Prevent post script failure on fresh installs
 



From tmraz at fedoraproject.org  Fri Aug 21 14:41:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:41:11 +0000 (UTC)
Subject: rpms/netatalk/devel netatalk.spec,1.54,1.55
Message-ID: <20090821144111.E48CE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28335

Modified Files:
	netatalk.spec 
Log Message:
- rebuilt with new openssl


Index: netatalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- netatalk.spec	25 Jul 2009 18:00:59 -0000	1.54
+++ netatalk.spec	21 Aug 2009 14:41:11 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -182,6 +182,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.0.4-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:2.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:41:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:41:58 +0000 (UTC)
Subject: rpms/nginx/devel nginx.spec,1.36,1.37
Message-ID: <20090821144158.D70A711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28599

Modified Files:
	nginx.spec 
Log Message:
- rebuilt with new openssl


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nginx.spec	3 Aug 2009 01:04:00 -0000	1.36
+++ nginx.spec	21 Aug 2009 14:41:58 -0000	1.37
@@ -9,7 +9,7 @@
 
 Name:           nginx
 Version:        0.7.61
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -174,6 +174,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.61-2
+- rebuilt with new openssl
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61-1
 - Update to new stable 0.7.61
 



From tmraz at fedoraproject.org  Fri Aug 21 14:42:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:42:37 +0000 (UTC)
Subject: rpms/nmap/devel nmap.spec,1.57,1.58
Message-ID: <20090821144237.C519811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28812

Modified Files:
	nmap.spec 
Log Message:
- rebuilt with new openssl


Index: nmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- nmap.spec	25 Jul 2009 19:26:35 -0000	1.57
+++ nmap.spec	21 Aug 2009 14:42:37 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 5.00
-Release: 2%{?dist}
+Release: 3%{?dist}
 # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999)
 License: GPLv2
 Group: Applications/System
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:5.00-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:5.00-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Fri Aug 21 14:42:52 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 21 Aug 2009 14:42:52 +0000 (UTC)
Subject: rpms/hal-cups-utils/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE cups-config-daemon, 1.1,
	NONE hal-cups-utils-0.6.19.tar.gz.sig, 1.1,
	NONE hal-cups-utils.spec, 1.77, NONE hal_lpadmin.fdi, 1.2,
	NONE printer_remove.hal, 1.2, NONE printer_update.hal, 1.2,
	NONE sources, 1.27, NONE
Message-ID: <20090821144252.2D1BA11C00D7@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/hal-cups-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28794

Added Files:
	dead.package 
Removed Files:
	Makefile cups-config-daemon hal-cups-utils-0.6.19.tar.gz.sig 
	hal-cups-utils.spec hal_lpadmin.fdi printer_remove.hal 
	printer_update.hal sources 
Log Message:
Retire package.



--- NEW FILE dead.package ---
Replaced by system-config-printer-udev.


--- Makefile DELETED ---


--- cups-config-daemon DELETED ---


--- hal-cups-utils-0.6.19.tar.gz.sig DELETED ---


--- hal-cups-utils.spec DELETED ---


--- hal_lpadmin.fdi DELETED ---


--- printer_remove.hal DELETED ---


--- printer_update.hal DELETED ---


--- sources DELETED ---



From tmraz at fedoraproject.org  Fri Aug 21 14:43:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:43:11 +0000 (UTC)
Subject: rpms/nrpe/devel nrpe.spec,1.14,1.15
Message-ID: <20090821144311.8AE0411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nrpe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28976

Modified Files:
	nrpe.spec 
Log Message:
- rebuilt with new openssl


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/devel/nrpe.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nrpe.spec	25 Jul 2009 19:32:10 -0000	1.14
+++ nrpe.spec	21 Aug 2009 14:43:11 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -112,6 +112,9 @@ fi
 %doc Changelog LEGAL README
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-10
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:43:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:43:54 +0000 (UTC)
Subject: rpms/nsd/devel nsd.spec,1.57,1.58
Message-ID: <20090821144354.8D98911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29154

Modified Files:
	nsd.spec 
Log Message:
- rebuilt with new openssl


Index: nsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- nsd.spec	20 Aug 2009 15:28:13 -0000	1.57
+++ nsd.spec	21 Aug 2009 14:43:54 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.3-3
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> - 3.2.3-2
 - The 'nsdc patch' and 'nsdc rebuild' commands wrote a %%1 file by mistake
 



From tmraz at fedoraproject.org  Fri Aug 21 14:44:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:44:32 +0000 (UTC)
Subject: rpms/ntop/devel ntop.spec,1.11,1.12
Message-ID: <20090821144432.AF64511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29314

Modified Files:
	ntop.spec 
Log Message:
- rebuilt with new openssl


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ntop.spec	5 Aug 2009 15:25:07 -0000	1.11
+++ ntop.spec	21 Aug 2009 14:44:32 -0000	1.12
@@ -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
@@ -189,6 +189,9 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.10-2
+- rebuilt with new openssl
+
 * Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-1
 - Updated to 3.3.10, updated geoip patch
 - lua_wget patch to prevent wget lua



From tmraz at fedoraproject.org  Fri Aug 21 14:45:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:45:39 +0000 (UTC)
Subject: rpms/ntp/devel ntp.spec,1.93,1.94
Message-ID: <20090821144539.EFBB411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29598

Modified Files:
	ntp.spec 
Log Message:
- rebuilt with new openssl


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ntp.spec	25 Jul 2009 19:39:49 -0000	1.93
+++ ntp.spec	21 Aug 2009 14:45:39 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 4%{?dist}
+Release: 5%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -365,6 +365,9 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.2.4p7-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4p7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Fri Aug 21 14:46:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 21 Aug 2009 14:46:13 +0000 (UTC)
Subject: rpms/doxygen/devel doxygen-1.6.0-config.patch, NONE, 1.1 .cvsignore,
	1.29, 1.30 doxygen.spec, 1.67, 1.68 sources, 1.30,
	1.31 doxygen-1.5.5-system-png.patch, 1.2,
	NONE doxygen-1.5.8-config.patch, 1.1,
	NONE doxygen-1.5.8-qt4.patch, 1.2, NONE
Message-ID: <20090821144613.9665911C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29764

Modified Files:
	.cvsignore doxygen.spec sources 
Added Files:
	doxygen-1.6.0-config.patch 
Removed Files:
	doxygen-1.5.5-system-png.patch doxygen-1.5.8-config.patch 
	doxygen-1.5.8-qt4.patch 
Log Message:
1.6.0


doxygen-1.6.0-config.patch:
 Makefile.in                    |    2 --
 addon/doxywizard/Makefile.in   |   10 ++++------
 configure                      |    5 ++++-
 tmake/lib/linux-g++/tmake.conf |   14 +++++++-------
 4 files changed, 15 insertions(+), 16 deletions(-)

--- NEW FILE doxygen-1.6.0-config.patch ---
diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
--- doxygen-1.6.0/addon/doxywizard/Makefile.in.config	2009-07-13 22:09:03.000000000 +0200
+++ doxygen-1.6.0/addon/doxywizard/Makefile.in	2009-08-21 16:42:13.000000000 +0200
@@ -10,8 +10,6 @@
 # See the GNU General Public License for more details.
 # 
 
-QMAKE=qmake
-
 all: Makefile.doxywizard  
 	$(MAKE) -f Makefile.doxywizard 
 
@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
 	$(RM) Makefile.doxywizard
 
 install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
 	cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-	$(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
+	$(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
 	rm doxywizard.1
 
 FORCE:
diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
--- doxygen-1.6.0/configure.config	2009-08-20 14:15:07.000000000 +0200
+++ doxygen-1.6.0/configure	2009-08-21 16:41:36.000000000 +0200
@@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
   if test -z "$QTDIR"; then
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+    for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
       if test -x "$d/bin/qmake"; then
         QTDIR=$d
+        QMAKE=$d/bin/qmake
       fi
     done
   else
@@ -485,6 +486,8 @@ INSTTOOL  = $f_insttool
 DOXYDOCS  = ..
 DOCDIR    = $f_docdir
 QTDIR     = $QTDIR
+QMAKE     = $QMAKE
+MAN1DIR    = share/man/man1
 EOF
 
 if test "$f_dot" != NO; then
diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
--- doxygen-1.6.0/Makefile.in.config	2009-08-14 15:58:42.000000000 +0200
+++ doxygen-1.6.0/Makefile.in	2009-08-21 16:34:02.000000000 +0200
@@ -44,8 +44,6 @@ distclean: clean
 
 DATE=$(shell date "+%B %Y")
 
-MAN1DIR = man/man1
-
 install: doxywizard_install 
 	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
 	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
diff -up doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config	2008-12-06 14:16:20.000000000 +0100
+++ doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf	2009-08-21 16:34:02.000000000 +0200
@@ -11,7 +11,7 @@ TMAKE_CC		= gcc
 TMAKE_CFLAGS		= -pipe
 TMAKE_CFLAGS_WARN_ON	= -Wall -W -fno-exceptions
 TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
+TMAKE_CFLAGS_RELEASE	= $(RPM_OPT_FLAGS)
 TMAKE_CFLAGS_DEBUG	= -g
 TMAKE_CFLAGS_SHLIB	= -fPIC
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YAC
 
 TMAKE_INCDIR		=
 TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+TMAKE_INCDIR_X11	=
+TMAKE_LIBDIR_X11	=
+TMAKE_INCDIR_QT		=
+TMAKE_LIBDIR_QT		=
+TMAKE_INCDIR_OPENGL	=
+TMAKE_LIBDIR_OPENGL	=
 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	3 Jul 2009 10:41:35 -0000	1.29
+++ .cvsignore	21 Aug 2009 14:46:13 -0000	1.30
@@ -16,3 +16,4 @@ doxygen-1.5.6.src.tar.gz
 doxygen-1.5.7.1.src.tar.gz
 doxygen-1.5.8.src.tar.gz
 doxygen-1.5.9.src.tar.gz
+doxygen-1.6.0.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- doxygen.spec	10 Aug 2009 08:30:40 -0000	1.67
+++ doxygen.spec	21 Aug 2009 14:46:13 -0000	1.68
@@ -5,17 +5,15 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.9
-Release: 3%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 Epoch: 1
+Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-Patch1: doxygen-1.5.8-config.patch
-Patch2: doxygen-1.5.8-qt4.patch
-Patch3: doxygen-1.5.5-system-png.patch
+Patch1: doxygen-1.6.0-config.patch
 Group: Development/Tools
 # No version is specified.
 License: GPL+
-Url: http://www.stack.nl/~dimitri/doxygen/index.html
 
 BuildRequires: perl
 BuildRequires: texlive-dvips
@@ -51,8 +49,6 @@ are used by doxygen.
 %setup -q
 
 %patch1 -p1 -b .config
-%patch2 -p1 -b .qt4
-%patch3 -p1 -b .system-png
 
 %build
 unset QTDIR
@@ -103,6 +99,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.6.0-1
+- 1.6.0
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.5.9-3
 - Convert specfile to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	3 Jul 2009 10:41:35 -0000	1.30
+++ sources	21 Aug 2009 14:46:13 -0000	1.31
@@ -1 +1 @@
-33c5598fa6d24cbc55849eaf89652557  doxygen-1.5.9.src.tar.gz
+54b2e1fe0de7071fe135bd0297d903ff  doxygen-1.6.0.src.tar.gz


--- doxygen-1.5.5-system-png.patch DELETED ---


--- doxygen-1.5.8-config.patch DELETED ---


--- doxygen-1.5.8-qt4.patch DELETED ---



From tmraz at fedoraproject.org  Fri Aug 21 14:46:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:46:15 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.9,1.10
Message-ID: <20090821144615.67F8A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29832

Modified Files:
	nufw.spec 
Log Message:
- rebuilt with new openssl


Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nufw.spec	25 Jul 2009 19:40:15 -0000	1.9
+++ nufw.spec	21 Aug 2009 14:46:15 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: nufw
 Version: 2.2.21
-Release: 4%{dist}
+Release: 5%{dist}
 Summary: Authentication Firewall Suite for Linux
 License: GPLv2
 Group: System Environment/Daemons
@@ -360,6 +360,9 @@ fi
 %{python_sitelib}/nuclient/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.21-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.21-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jeckersb at fedoraproject.org  Fri Aug 21 14:46:18 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Fri, 21 Aug 2009 14:46:18 +0000 (UTC)
Subject: rpms/python-netaddr/devel .cvsignore, 1.11, 1.12 python-netaddr.spec,
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20090821144618.5503E11C00D7@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29858

Modified Files:
	.cvsignore python-netaddr.spec sources 
Log Message:
New upstream release 0.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Aug 2009 17:28:02 -0000	1.11
+++ .cvsignore	21 Aug 2009 14:46:18 -0000	1.12
@@ -1 +1 @@
-netaddr-0.7.1.tar.gz
+netaddr-0.7.2.tar.gz


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/python-netaddr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-netaddr.spec	17 Aug 2009 17:28:02 -0000	1.16
+++ python-netaddr.spec	21 Aug 2009 14:46:18 -0000	1.17
@@ -3,9 +3,9 @@
 #====================================================================#
 
 Name:           python-netaddr
-Version:        0.7.1
+Version:        0.7.2
 Release:        1%{?dist}
-Summary:        Network address manipulation, done Pythonically
+Summary:        Pythonic manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses
 
 Group:          Development/Libraries
 License:        BSD
@@ -18,31 +18,35 @@ BuildRequires:  python-devel >= 2.4
 
 
 %description
-netaddr is a Python library for the representation and manipulation of
-various common network address formats and notations.
+A pure Python network address representation and manipulation library.
 
-It takes the hassle out of fiddling with innumerable variations of
-network addresses, presenting a consistent, extensible, easy-to-use
-and above all Pythonic API.
+netaddr provides a Pythonic way of working with :-
 
-With it you can represent, validate, convert, categorize, iterate,
-generate, slice (and dice) :-
+- IPv4 and IPv6 addresses and subnets (including CIDR notation)
+- MAC (Media Access Control) addresses in multiple formats
+- IEEE EUI-64, OUI and IAB identifiers
+- a user friendly IP glob-style format
 
-  * IP version 4
-  * IP version 6
-  * CIDR (Classless Inter-Domain Routing) both IPv4 and IPv6
-  * MAC (Media Access Control) and IEEE EUI-48 and EUI-64
-  * Support for arbitrary IP address ranges with CIDR interoperability
-  * User friendly alternative IPv4 range syntax using netaddr's
-    glob-style Wildcard addresses
+Included are routines for :-
 
-For examples see the project wiki :-
+- generating, sorting and summarizing IP addresses
+- converting IP addresses and ranges between various different formats
+- performing set based operations on groups of IP addresses and subnets
+- arbitrary IP address range calculations and conversions
+- querying IEEE OUI and IAB organisational information
+- querying of IP standards related data from key IANA data sources
 
-http://code.google.com/p/netaddr/wiki/NetAddrExamples
+For examples please visit the example wiki pages :-
 
-API documentation (auto-generated with epydoc) :-
+    http://code.google.com/p/netaddr/wiki/NetAddrExamples
 
-http://packages.python.org/netaddr/
+Complete API documentation for the latest release is available online :-
+
+    http://packages.python.org/netaddr/
+
+For details on history changes and updates see the CHANGELOG :-
+
+    http://code.google.com/p/netaddr/wiki/CHANGELOG
 
 
 %prep
@@ -83,6 +87,10 @@ rm -rf %{buildroot}
 %{_bindir}/netaddr
 
 %changelog
+* 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
+
 * Mon Aug 17 2009 John Eckersberg <jeckersb at redhat.com> - 0.7.1-1
 - New upstream release 0.7.1 fixes naming conflict with 'nash' by
   renaming the netaddr shell to 'netaddr'


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Aug 2009 17:28:02 -0000	1.11
+++ sources	21 Aug 2009 14:46:18 -0000	1.12
@@ -1 +1 @@
-7f04851de730cef894291153c3310cfe  netaddr-0.7.1.tar.gz
+061324a678980a03efc0b0b9f3659436  netaddr-0.7.2.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 14:47:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:47:01 +0000 (UTC)
Subject: rpms/nut/devel nut.spec,1.77,1.78
Message-ID: <20090821144701.02B7A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30146

Modified Files:
	nut.spec 
Log Message:
- rebuilt with new openssl


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- nut.spec	25 Jul 2009 19:42:36 -0000	1.77
+++ nut.spec	21 Aug 2009 14:47:00 -0000	1.78
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -343,6 +343,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.1-8
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:47:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:47:41 +0000 (UTC)
Subject: rpms/nx/devel nx.spec,1.32,1.33
Message-ID: <20090821144741.1AEA911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30337

Modified Files:
	nx.spec 
Log Message:
- rebuilt with new openssl


Index: nx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nx/devel/nx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- nx.spec	25 Jul 2009 19:44:26 -0000	1.32
+++ nx.spec	21 Aug 2009 14:47:40 -0000	1.33
@@ -8,7 +8,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.3.0
-Release: 36%{?dist}
+Release: 37%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 Group: Applications/Internet
@@ -171,6 +171,9 @@ rm -rf %{buildroot}
 %{_pkglibexecdir}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-37
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:48:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:48:13 +0000 (UTC)
Subject: rpms/ocaml-ssl/devel ocaml-ssl.spec,1.16,1.17
Message-ID: <20090821144813.E014E11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ocaml-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30538

Modified Files:
	ocaml-ssl.spec 
Log Message:
- rebuilt with new openssl


Index: ocaml-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-ssl.spec	25 Jul 2009 20:05:22 -0000	1.16
+++ ocaml-ssl.spec	21 Aug 2009 14:48:13 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           ocaml-ssl
 Version:        0.4.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SSL bindings for OCaml
 
 Group:          Development/Libraries
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.3-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jakub at fedoraproject.org  Fri Aug 21 14:48:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 21 Aug 2009 14:48:26 +0000 (UTC)
Subject: rpms/valgrind/devel valgrind-3.5.0-cachegrind-improvements.patch,
	NONE, 1.1 valgrind-3.5.0-glibc-2.10.1.patch, NONE,
	1.1 valgrind-3.5.0-openat.patch, NONE, 1.1 .cvsignore, 1.15,
	1.16 sources, 1.15, 1.16 valgrind.spec, 1.66,
	1.67 valgrind-3.4.1-cachegrind-improvements.patch, 1.1,
	NONE valgrind-3.4.1-dwarf-cfa-remember-state1.patch, 1.1,
	NONE valgrind-3.4.1-dwarf-cfa-remember-state2.patch, 1.1,
	NONE valgrind-3.4.1-dwarf3.patch, 1.2,
	NONE valgrind-3.4.1-futex.patch, 1.1,
	NONE valgrind-3.4.1-glibc-2.10.1.patch, 1.1,
	NONE valgrind-3.4.1-openat.patch, 1.1,
	NONE valgrind-3.4.1-x86_64-ldso-strlen.patch, 1.1, NONE
Message-ID: <20090821144826.8747311C00D7@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30639

Modified Files:
	.cvsignore sources valgrind.spec 
Added Files:
	valgrind-3.5.0-cachegrind-improvements.patch 
	valgrind-3.5.0-glibc-2.10.1.patch valgrind-3.5.0-openat.patch 
Removed Files:
	valgrind-3.4.1-cachegrind-improvements.patch 
	valgrind-3.4.1-dwarf-cfa-remember-state1.patch 
	valgrind-3.4.1-dwarf-cfa-remember-state2.patch 
	valgrind-3.4.1-dwarf3.patch valgrind-3.4.1-futex.patch 
	valgrind-3.4.1-glibc-2.10.1.patch valgrind-3.4.1-openat.patch 
	valgrind-3.4.1-x86_64-ldso-strlen.patch 
Log Message:
3.5.0-1

valgrind-3.5.0-cachegrind-improvements.patch:
 cg_sim.c |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE valgrind-3.5.0-cachegrind-improvements.patch ---
--- valgrind-3.4.0/cachegrind/cg_sim.c.jj	2007-01-08 02:43:10.000000000 -0500
+++ valgrind-3.4.0/cachegrind/cg_sim.c	2007-02-13 07:15:46.000000000 -0500
@@ -42,27 +42,30 @@ typedef struct {
    Int          size;                   /* bytes */
    Int          assoc;
    Int          line_size;              /* bytes */
-   Int          sets;
    Int          sets_min_1;
    Int          line_size_bits;
    Int          tag_shift;
-   Char         desc_line[128];
    UWord*       tags;
-} cache_t2;
+   Char         desc_line[128];
+} cache_t2
+#ifdef __GNUC__
+__attribute__ ((aligned (8 * sizeof (Int))))
+#endif
+;
 
 /* By this point, the size/assoc/line_size has been checked. */
 static void cachesim_initcache(cache_t config, cache_t2* c)
 {
-   Int i;
+   Int sets;
 
    c->size      = config.size;
    c->assoc     = config.assoc;
    c->line_size = config.line_size;
 
-   c->sets           = (c->size / c->line_size) / c->assoc;
-   c->sets_min_1     = c->sets - 1;
+   sets              = (c->size / c->line_size) / c->assoc;
+   c->sets_min_1     = sets - 1;
    c->line_size_bits = VG_(log2)(c->line_size);
-   c->tag_shift      = c->line_size_bits + VG_(log2)(c->sets);
+   c->tag_shift      = c->line_size_bits + VG_(log2)(sets);
 
    if (c->assoc == 1) {
       VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped", 
@@ -72,11 +75,8 @@ static void cachesim_initcache(cache_t c
                                  c->size, c->line_size, c->assoc);
    }
 
-   c->tags = VG_(malloc)("cg.sim.ci.1",
-                         sizeof(UWord) * c->sets * c->assoc);
-
-   for (i = 0; i < c->sets * c->assoc; i++)
-      c->tags[i] = 0;
+   c->tags = VG_(calloc)("cg.sim.ci.1",
+                         sizeof(UWord), sets * c->assoc);
 }
 
 /* This is done as a macro rather than by passing in the cache_t2 as an 
@@ -138,8 +138,7 @@ void cachesim_##L##_doref(Addr a, UChar 
       return;                                                               \
                                                                             \
    /* Second case: word straddles two lines. */                             \
-   /* Nb: this is a fast way of doing ((set1+1) % L.sets) */                \
-   } else if (((set1 + 1) & (L.sets-1)) == set2) {                          \
+   } else if (((set1 + 1) & (L.sets_min_1)) == set2) {                      \
       set = &(L.tags[set1 * L.assoc]);                                      \
       if (tag == set[0]) {                                                  \
          goto block2;                                                       \

valgrind-3.5.0-glibc-2.10.1.patch:
 glibc-2.X.supp.in |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE valgrind-3.5.0-glibc-2.10.1.patch ---
--- valgrind-3.5.0/glibc-2.X.supp.in.jj	2009-08-19 09:37:48.000000000 -0400
+++ valgrind-3.5.0/glibc-2.X.supp.in	2009-08-21 09:03:55.168206000 -0400
@@ -168,9 +168,9 @@
    Memcheck:Param
    socketcall.sendto(msg)
    fun:__sendto_nocancel
-   obj:/*libc- at GLIBC_VERSION@.so
-   obj:/*libc- at GLIBC_VERSION@.so
-   obj:/*libc- at GLIBC_VERSION@.so
+   obj:/*libc- at GLIBC_VERSION@*.so
+   obj:/*libc- at GLIBC_VERSION@*.so
+   obj:/*libc- at GLIBC_VERSION@*.so
 }
 {
    glibc24-64bit-padding-1c
@@ -180,7 +180,7 @@
    fun:__nscd_get_map_ref
    fun:nscd_get*_r
    fun:*nscd*
-   obj:/*libc- at GLIBC_VERSION@.so
+   obj:/*libc- at GLIBC_VERSION@*.so
 }
 
 
@@ -199,18 +199,18 @@
    Memcheck:Param
    socketcall.sendto(msg)
    fun:send
-   obj:/*libc- at GLIBC_VERSION@.so
-   obj:/*libc- at GLIBC_VERSION@.so
-   obj:/*libc- at GLIBC_VERSION@.so
+   obj:/*libc- at GLIBC_VERSION@*.so
+   obj:/*libc- at GLIBC_VERSION@*.so
+   obj:/*libc- at GLIBC_VERSION@*.so
 }
 {
    X11-64bit-padding-4b
    Memcheck:Param
    socketcall.send(msg)
    fun:send
-   obj:/*libc- at GLIBC_VERSION@.so
-   obj:/*libc- at GLIBC_VERSION@.so
-   obj:/*libc- at GLIBC_VERSION@.so
+   obj:/*libc- at GLIBC_VERSION@*.so
+   obj:/*libc- at GLIBC_VERSION@*.so
+   obj:/*libc- at GLIBC_VERSION@*.so
 }
 
 ##----------------------------------------------------------------------##

valgrind-3.5.0-openat.patch:
 syswrap-linux.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE valgrind-3.5.0-openat.patch ---
Testcase:
#define _GNU_SOURCE
#include <fcntl.h>
#include <unistd.h>

int
main (void)
{
  int dfd = open ("/tmp", O_RDONLY);
  int fd1 = openat (dfd, "abc", O_RDONLY);
  int fd2 = openat (0x12345678, "/tmp/abc", O_RDONLY);
  int fd3 = openat (AT_FDCWD, "abc", O_RDONLY);
  /* This is the only one that should warn.  */
  int fd4 = openat (0x12345678, "abc", O_RDONLY);
  return 0;
}

--- valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c.jj	2007-12-11 00:18:43.000000000 +0100
+++ valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c	2008-03-03 11:35:15.000000000 +0100
@@ -2455,10 +2455,15 @@ PRE(sys_openat)
                     int, dfd, const char *, filename, int, flags);
    }
 
-   if (ARG1 != VKI_AT_FDCWD && !ML_(fd_allowed)(ARG1, "openat", tid, False))
+   PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
+
+   /* For absolute filenames, dfd is ignored.  If dfd is AT_FDCWD,
+      filename is relative to cwd.  */
+   if (ML_(safe_to_deref)( (void*)ARG2, 1 )
+       && *(Char *)ARG2 != '/'
+       && ARG1 != VKI_AT_FDCWD
+       && !ML_(fd_allowed)(ARG1, "openat", tid, False))
       SET_STATUS_Failure( VKI_EBADF );
-   else
-      PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
 
    /* Handle the case where the open is of /proc/self/cmdline or
       /proc/<pid>/cmdline, and just give it a copy of the fd for the


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	9 Mar 2009 12:50:44 -0000	1.15
+++ .cvsignore	21 Aug 2009 14:48:25 -0000	1.16
@@ -1 +1 @@
-valgrind-3.4.1.tar.bz2
+valgrind-3.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Mar 2009 12:50:44 -0000	1.15
+++ sources	21 Aug 2009 14:48:25 -0000	1.16
@@ -1 +1 @@
-b5f039dd2271aaf9ae570ab4116f87c7  valgrind-3.4.1.tar.bz2
+f03522a4687cf76c676c9494fcc0a517  valgrind-3.5.0.tar.bz2


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- valgrind.spec	28 Jul 2009 10:47:08 -0000	1.66
+++ valgrind.spec	21 Aug 2009 14:48:26 -0000	1.67
@@ -1,17 +1,12 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
-Version: 3.4.1
-Release: 7
+Version: 3.5.0
+Release: 1
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Patch1: valgrind-3.4.1-cachegrind-improvements.patch
-Patch2: valgrind-3.4.1-openat.patch
-Patch3: valgrind-3.4.1-x86_64-ldso-strlen.patch
-Patch4: valgrind-3.4.1-glibc-2.10.1.patch
-Patch5: valgrind-3.4.1-dwarf3.patch
-Patch6: valgrind-3.4.1-dwarf-cfa-remember-state1.patch
-Patch7: valgrind-3.4.1-dwarf-cfa-remember-state2.patch
-Patch8: valgrind-3.4.1-futex.patch
+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
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -68,11 +63,6 @@ or valgrind plugins.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -112,6 +102,9 @@ for i in `find . -type f \( -name *-amd6
   esac
 done
 
+# XXX pth_cancel2 hangs on x86_64
+echo 'int main (void) { return 0; }' > none/tests/pth_cancel2.c
+
 # test
 make check || :
 echo ===============TESTING===================
@@ -127,12 +120,17 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/valgri
 rm -f docs.installed/*.ps
 
 %if "%{valsecarch}" != ""
+pushd $RPM_BUILD_ROOT%{_libdir}/valgrind/
+rm -f *-%{valsecarch}-* || :
+for i in *-%{valarch}-*; do
+  j=`echo $i | sed 's/-%{valarch}-/-%{valsecarch}-/'`
 %ifarch ppc
-ln -sf ../../lib64/valgrind/%{valsecarch}-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux
+  ln -sf ../../lib64/valgrind/$j $j
 %else
-rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux || :
-ln -sf ../../lib/valgrind/%{valsecarch}-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux
+  ln -sf ../../lib/valgrind/$j $j
 %endif
+done
+popd
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/valgrind/*.supp.in
@@ -142,27 +140,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc ACKNOWLEDGEMENTS COPYING NEWS README_*
+%doc COPYING NEWS README_*
 %doc docs.installed/html docs.installed/*.pdf
 %{_bindir}/*
 %dir %{_libdir}/valgrind
-%dir %{_libdir}/valgrind/%{valarch}-linux
-%if "%{valsecarch}" != ""
-%{_libdir}/valgrind/%{valsecarch}-linux
-%endif
-%{_libdir}/valgrind/%{valarch}-linux/*[^a]
-%{_libdir}/valgrind/*.supp
-%{_mandir}/man1/valgrind*
+%{_libdir}/valgrind/*[^a]
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/valgrind
 %dir %{_libdir}/valgrind
-%dir %{_libdir}/valgrind/%{valarch}-linux
-%{_libdir}/valgrind/%{valarch}-linux/*.a
+%{_libdir}/valgrind/*.a
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-1
+- update to 3.5.0
+
 * Tue Jul 28 2009 Jakub Jelinek <jakub at redhat.com> 3.4.1-7
 - handle futex ops newly added during last 4 years (#512121)
 


--- valgrind-3.4.1-cachegrind-improvements.patch DELETED ---


--- valgrind-3.4.1-dwarf-cfa-remember-state1.patch DELETED ---


--- valgrind-3.4.1-dwarf-cfa-remember-state2.patch DELETED ---


--- valgrind-3.4.1-dwarf3.patch DELETED ---


--- valgrind-3.4.1-futex.patch DELETED ---


--- valgrind-3.4.1-glibc-2.10.1.patch DELETED ---


--- valgrind-3.4.1-openat.patch DELETED ---


--- valgrind-3.4.1-x86_64-ldso-strlen.patch DELETED ---



From tmraz at fedoraproject.org  Fri Aug 21 14:48:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:48:58 +0000 (UTC)
Subject: rpms/ochusha/devel ochusha.spec,1.104,1.105
Message-ID: <20090821144858.0F39511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30755

Modified Files:
	ochusha.spec 
Log Message:
- rebuilt with new openssl


Index: ochusha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- ochusha.spec	27 Jul 2009 16:40:44 -0000	1.104
+++ ochusha.spec	21 Aug 2009 14:48:57 -0000	1.105
@@ -25,7 +25,7 @@
 %define		pre_release	1
 
 %if %{pre_release}
-%define		rel		0.%{vendor_rel}.%{strtag}%{?dist}
+%define		rel		0.%{vendor_rel}.%{strtag}%{?dist}.1
 %else
 %define		rel		%{vendor_rel}%{?dist}
 %endif
@@ -220,6 +220,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.0.1-0.6.cvs20090728T0130.1
+- rebuilt with new openssl
+
 * Tue Jul 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Update to the latest trunk
 



From tmraz at fedoraproject.org  Fri Aug 21 14:49:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:49:37 +0000 (UTC)
Subject: rpms/ocspd/devel ocspd.spec,1.4,1.5
Message-ID: <20090821144937.EF9D011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ocspd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30949

Modified Files:
	ocspd.spec 
Log Message:
- rebuilt with new openssl


Index: ocspd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocspd/devel/ocspd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocspd.spec	25 Jul 2009 20:08:43 -0000	1.4
+++ ocspd.spec	21 Aug 2009 14:49:37 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:		ocspd
 Version:	1.5.1
-Release:	0.6.%{alphatag}%{?dist}
+Release:	0.7.%{alphatag}%{?dist}
 Summary:	OpenCA OCSP Daemon
 License:	ASL 1.0
 Group:		System Environment/Daemons
@@ -106,6 +106,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5.1-0.7.rc1
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-0.6.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:50:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:50:14 +0000 (UTC)
Subject: rpms/opal/devel opal.spec,1.54,1.55
Message-ID: <20090821145014.0DEAE11C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31153

Modified Files:
	opal.spec 
Log Message:
- rebuilt with new openssl


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- opal.spec	25 Jul 2009 20:42:48 -0000	1.54
+++ opal.spec	21 Aug 2009 14:50:13 -0000	1.55
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.opalvoip.org/
 # We cannot use unmodified upstream source code because it contains the 
 # non-free iLBC codec.
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.4-4
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Fri Aug 21 14:50:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 21 Aug 2009 14:50:22 +0000 (UTC)
Subject: rpms/cups/devel cups-str3293.patch,NONE,1.1 cups.spec,1.505,1.506
Message-ID: <20090821145022.F05B611C0417@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31186

Modified Files:
	cups.spec 
Added Files:
	cups-str3293.patch 
Log Message:
* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Prevent infinite loop in ppdc (STR #3293).


cups-str3293.patch:
 ppdc-source.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3293.patch ---
diff -up cups-1.4rc1/ppdc/ppdc-source.cxx.ppdc-busy-loop cups-1.4rc1/ppdc/ppdc-source.cxx
--- cups-1.4rc1/ppdc/ppdc-source.cxx.ppdc-busy-loop	2009-08-21 15:40:16.648189657 +0100
+++ cups-1.4rc1/ppdc/ppdc-source.cxx	2009-08-21 15:41:29.896188142 +0100
@@ -1321,7 +1321,7 @@ ppdcSource::get_integer(const char *v)	/
     while (*v && *v != ')')
     {
       // Skip leading whitespace...
-      while (*v && isspace(*v & 255));
+      while (*v && isspace(*v & 255))
         v ++;
 
       if (!*v || *v == ')')


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -p -r1.505 -r1.506
--- cups.spec	21 Aug 2009 10:24:38 -0000	1.505
+++ cups.spec	21 Aug 2009 14:50:22 -0000	1.506
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.17%{?dist}.1
+Release: 0.%{pre}.18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -68,6 +68,7 @@ Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
+Patch44: cups-str3293.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -236,6 +237,7 @@ module. 
 %patch41 -p1 -b .str3279
 %patch42 -p1 -b .str3287
 %patch43 -p1 -b .str3292
+%patch44 -p1 -b .str3293
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -530,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Prevent infinite loop in ppdc (STR #3293).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.4-0.rc1.17.1
 - rebuilt with new audit
 



From tmraz at fedoraproject.org  Fri Aug 21 14:50:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:50:53 +0000 (UTC)
Subject: rpms/openconnect/devel openconnect.spec,1.14,1.15
Message-ID: <20090821145053.610BD11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31375

Modified Files:
	openconnect.spec 
Log Message:
- rebuilt with new openssl


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/openconnect.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openconnect.spec	25 Jul 2009 20:45:59 -0000	1.14
+++ openconnect.spec	21 Aug 2009 14:50:53 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		openconnect
 Version:	2.01
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.01-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:51:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:51:26 +0000 (UTC)
Subject: rpms/opencryptoki/devel opencryptoki.spec,1.3,1.4
Message-ID: <20090821145126.1A80011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opencryptoki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31620

Modified Files:
	opencryptoki.spec 
Log Message:
- rebuilt with new openssl


Index: opencryptoki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencryptoki/devel/opencryptoki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- opencryptoki.spec	16 Aug 2009 08:54:07 -0000	1.3
+++ opencryptoki.spec	21 Aug 2009 14:51:25 -0000	1.4
@@ -1,7 +1,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v2.11
 Version:		2.3.0
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		CPL
 Group:			System Environment/Base
 URL:			http://sourceforge.net/projects/opencryptoki
@@ -136,6 +136,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.0-3
+- rebuilt with new openssl
+
 * Sun Aug 16 2009 Michal Schmidt <mschmidt at redhat.com> 2.3.0-2
 - Require libica-2.0.
 



From twaugh at fedoraproject.org  Fri Aug 21 14:51:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 21 Aug 2009 14:51:20 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3293.patch,NONE,1.1 cups.spec,1.509,1.510
Message-ID: <20090821145120.C36C011C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31562

Modified Files:
	cups.spec 
Added Files:
	cups-str3293.patch 
Log Message:
* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Prevent infinite loop in ppdc (STR #3293).


cups-str3293.patch:
 ppdc-source.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3293.patch ---
diff -up cups-1.4rc1/ppdc/ppdc-source.cxx.ppdc-busy-loop cups-1.4rc1/ppdc/ppdc-source.cxx
--- cups-1.4rc1/ppdc/ppdc-source.cxx.ppdc-busy-loop	2009-08-21 15:40:16.648189657 +0100
+++ cups-1.4rc1/ppdc/ppdc-source.cxx	2009-08-21 15:41:29.896188142 +0100
@@ -1321,7 +1321,7 @@ ppdcSource::get_integer(const char *v)	/
     while (*v && *v != ')')
     {
       // Skip leading whitespace...
-      while (*v && isspace(*v & 255));
+      while (*v && isspace(*v & 255))
         v ++;
 
       if (!*v || *v == ')')


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- cups.spec	21 Aug 2009 09:07:54 -0000	1.509
+++ cups.spec	21 Aug 2009 14:51:20 -0000	1.510
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.17%{?dist}
+Release: 0.%{pre}.18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -68,6 +68,7 @@ Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
+Patch44: cups-str3293.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -236,6 +237,7 @@ module. 
 %patch41 -p1 -b .str3279
 %patch42 -p1 -b .str3287
 %patch43 -p1 -b .str3292
+%patch44 -p1 -b .str3293
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -529,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Prevent infinite loop in ppdc (STR #3293).
+
 * Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17
 - Removed 3-distribution symlink (bug #514244).
 



From tmraz at fedoraproject.org  Fri Aug 21 14:52:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:52:02 +0000 (UTC)
Subject: rpms/openhpi/devel openhpi.spec,1.76,1.77
Message-ID: <20090821145202.6F81111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31813

Modified Files:
	openhpi.spec 
Log Message:
- rebuilt with new openssl


Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- openhpi.spec	25 Jul 2009 20:47:35 -0000	1.76
+++ openhpi.spec	21 Aug 2009 14:52:02 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
 Version: 2.14.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
@@ -140,6 +140,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.14.0-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.14.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 14:52:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:52:34 +0000 (UTC)
Subject: rpms/openhpi-subagent/devel openhpi-subagent.spec,1.5,1.6
Message-ID: <20090821145234.9BF3B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31946

Modified Files:
	openhpi-subagent.spec 
Log Message:
- rebuilt with new openssl


Index: openhpi-subagent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openhpi-subagent.spec	25 Jul 2009 20:47:53 -0000	1.5
+++ openhpi-subagent.spec	21 Aug 2009 14:52:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           openhpi-subagent
 Version:        2.3.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetSNMP subagent for OpenHPI
 
 Group:          System Environment/Base
@@ -67,6 +67,9 @@ fi
 %{_datadir}/snmp/mibs/*.mib
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.4-7
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ankursinha at fedoraproject.org  Fri Aug 21 14:53:01 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 14:53:01 +0000 (UTC)
Subject: rpms/fpaste/devel .cvsignore, 1.2, 1.3 fpaste.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090821145301.5431F11C00D7@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32069

Modified Files:
	.cvsignore fpaste.spec sources 
Log Message:
new release 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 17:22:46 -0000	1.2
+++ .cvsignore	21 Aug 2009 14:53:01 -0000	1.3
@@ -1 +1 @@
-fpaste-0.3.2.tar.bz2
+fpaste-0.3.3.tar.bz2


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/fpaste.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fpaste.spec	14 Aug 2009 17:22:46 -0000	1.1
+++ fpaste.spec	21 Aug 2009 14:53:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		fpaste
-Version:	0.3.2
-Release:	2%{?dist}
+Version:	0.3.3
+Release:	1%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1
+- new package release
+- Proper urllib2 error handling
+- Catches Ctrl-C while waiting for stdin to show a usage reminder rather than a traceback
+- Typos fixed, and more TODO
+- Added --sysinfo option to gather and pastebin basic system information
+- Added options to read text from (xsel) clipboard and write resultant URL to clipboard
 * Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-2
 - Corrected source0 field
 * Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 17:22:46 -0000	1.2
+++ sources	21 Aug 2009 14:53:01 -0000	1.3
@@ -1 +1 @@
-3831fc1f9b070d75c0fbe9134b6e210d  fpaste-0.3.2.tar.bz2
+456b4c7bfdd71330713d5e7915b4f921  fpaste-0.3.3.tar.bz2



From tmraz at fedoraproject.org  Fri Aug 21 14:54:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 14:54:11 +0000 (UTC)
Subject: rpms/openldap/devel openldap.spec,1.144,1.145
Message-ID: <20090821145411.20CD411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32241

Modified Files:
	openldap.spec 
Log Message:
- rebuilt with new openssl


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- openldap.spec	25 Jul 2009 20:49:05 -0000	1.144
+++ openldap.spec	21 Aug 2009 14:54:10 -0000	1.145
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -604,6 +604,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Fri Aug 21 14:57:15 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 21 Aug 2009 14:57:15 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.218,1.219 sources,1.128,1.129
Message-ID: <20090821145715.0C88211C00D7@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32744

Modified Files:
	audit.spec sources 
Log Message:
* Fri Aug 21 2009 Steve Grubb <sgrubb at redhat.com> 2.0-3
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- audit.spec	19 Aug 2009 19:23:25 -0000	1.218
+++ audit.spec	21 Aug 2009 14:57:14 -0000	1.219
@@ -3,12 +3,11 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-Source1: %{name}-1.8.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: swig python-devel
 BuildRequires: tcp_wrappers-devel libcap-ng-devel 
@@ -69,25 +68,12 @@ interface to the audit system, audispd. 
 like relay events to remote machines or analyze events for suspicious
 behavior.
 
-%package libs-compat
-Summary: Dynamic library for libaudit
-License: LGPLv2+
-Group: Development/Libraries
-
-%description libs-compat
-The audit-libs-compat package contains the dynamic libraries needed for 
-applications to use the audit 1.0 framework.
-
 %prep
 %setup -q
-tar -xzf %{SOURCE1}
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
-cd audit-1.8
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
-make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,9 +82,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
-cd audit-1.8
-make DESTDIR=$RPM_BUILD_ROOT install
-cd .. 
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
@@ -153,11 +136,6 @@ if [ $1 -ge 1 ]; then
    /sbin/service auditd condrestart > /dev/null 2>&1 || :
 fi
 
-%files libs-compat
-%defattr(-,root,root,-)
-%attr(755,root,root) /%{_lib}/libaudit.so.0*
-%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
-
 %files libs
 %defattr(-,root,root,-)
 %attr(755,root,root) /%{_lib}/libaudit.so.1*
@@ -238,7 +216,7 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
-* Wed Aug 19 2009 Steve Grubb <sgrubb at redhat.com> 2.0-2
+* Fri Aug 21 2009 Steve Grubb <sgrubb at redhat.com> 2.0-3
 - New upstream release
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.13-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- sources	19 Aug 2009 18:51:56 -0000	1.128
+++ sources	21 Aug 2009 14:57:14 -0000	1.129
@@ -1,2 +1 @@
 d0c064c4646f8fe5c50de789c627f2da  audit-2.0.tar.gz
-26a74bb90c7f8c28705a90aed01e1ff2  audit-1.8.tar.gz



From notting at fedoraproject.org  Fri Aug 21 15:04:07 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 21 Aug 2009 15:04:07 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.89,1.90
Message-ID: <20090821150407.EA5DA11C00D7@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2115

Modified Files:
	comps-f12.xml.in 
Log Message:
Add NM VPN plugins. (#517297)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- comps-f12.xml.in	21 Aug 2009 13:51:41 -0000	1.89
+++ comps-f12.xml.in	21 Aug 2009 15:04:07 -0000	1.90
@@ -2495,6 +2495,9 @@
       <packagereq type="default">mousetweaks</packagereq>
       <packagereq type="default">nautilus-sendto</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
+      <packagereq type="default">NetworkManager-openvpn</packagereq>
+      <packagereq type="default">NetworkManager-pptp</packagereq>
+      <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="default">notification-daemon</packagereq>
       <packagereq type="default">orca</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>



From tmraz at fedoraproject.org  Fri Aug 21 15:04:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:04:05 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1988,1.1989
Message-ID: <20090821150405.C333711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2143

Modified Files:
	openoffice.org.spec 
Log Message:
- rebuilt with new openssl


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -p -r1.1988 -r1.1989
--- openoffice.org.spec	21 Aug 2009 07:59:39 -0000	1.1988
+++ openoffice.org.spec	21 Aug 2009 15:04:05 -0000	1.1989
@@ -35,7 +35,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        3.1.1
-Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
+Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}.1
 Epoch:		1
 License:	LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
 Group:		Applications/Productivity
@@ -4208,6 +4208,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.1.1
+- rebuilt with new openssl
+
 * Fri Aug 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
 - latest milestone
 - Resolves: rbhz#501141 Images and Frames disappear in sequential



From tmraz at fedoraproject.org  Fri Aug 21 15:04:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:04:50 +0000 (UTC)
Subject: rpms/opensc/devel opensc.spec,1.47,1.48
Message-ID: <20090821150450.539F211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2314

Modified Files:
	opensc.spec 
Log Message:
- rebuilt with new openssl


Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- opensc.spec	27 Jul 2009 15:05:32 -0000	1.47
+++ opensc.spec	21 Aug 2009 15:04:49 -0000	1.48
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -153,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.8-5
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.8-4
 - Depend on specific arch of pcsc-lite-libs (reported by Kalev Lember)
 



From tmraz at fedoraproject.org  Fri Aug 21 15:05:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:05:36 +0000 (UTC)
Subject: rpms/openscada/devel openscada.spec,1.10,1.11
Message-ID: <20090821150536.3ADF811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2498

Modified Files:
	openscada.spec 
Log Message:
- rebuilt with new openssl


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openscada.spec	27 Jul 2009 11:44:44 -0000	1.10
+++ openscada.spec	21 Aug 2009 15:05:36 -0000	1.11
@@ -63,7 +63,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.3.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -1209,6 +1209,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Fri Aug 21 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>.
 



From tmraz at fedoraproject.org  Fri Aug 21 15:06:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:06:29 +0000 (UTC)
Subject: rpms/openser/devel openser.spec,1.32,1.33
Message-ID: <20090821150629.78DCE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2709

Modified Files:
	openser.spec 
Log Message:
- rebuilt with new openssl


Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- openser.spec	25 Jul 2009 20:52:26 -0000	1.32
+++ openser.spec	21 Aug 2009 15:06:29 -0000	1.33
@@ -10,7 +10,7 @@
 Summary:	Open Source SIP Server
 Name:		openser
 Version:	1.3.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://www.kamailio.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -847,6 +847,9 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-8
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:07:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:07:09 +0000 (UTC)
Subject: rpms/openslp/devel openslp.spec,1.21,1.22
Message-ID: <20090821150709.D17D011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openslp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2875

Modified Files:
	openslp.spec 
Log Message:
- rebuilt with new openssl


Index: openslp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- openslp.spec	25 Jul 2009 20:52:47 -0000	1.21
+++ openslp.spec	21 Aug 2009 15:07:09 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-13
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ankursinha at fedoraproject.org  Fri Aug 21 15:07:19 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 15:07:19 +0000 (UTC)
Subject: rpms/fpaste/F-10 .cvsignore, 1.2, 1.3 fpaste.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090821150719.E506611C00D7@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2966

Modified Files:
	.cvsignore fpaste.spec sources 
Log Message:
new release 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 17:29:06 -0000	1.2
+++ .cvsignore	21 Aug 2009 15:07:19 -0000	1.3
@@ -1 +1 @@
-fpaste-0.3.2.tar.bz2
+fpaste-0.3.3.tar.bz2


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/fpaste.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fpaste.spec	14 Aug 2009 17:29:06 -0000	1.1
+++ fpaste.spec	21 Aug 2009 15:07:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		fpaste
-Version:	0.3.2
-Release:	2%{?dist}
+Version:	0.3.3
+Release:	1%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1
+- new package release
+- Proper urllib2 error handling
+- Catches Ctrl-C while waiting for stdin to show a usage reminder rather than a traceback
+- Typos fixed, and more TODO
+- Added --sysinfo option to gather and pastebin basic system information
+- Added options to read text from (xsel) clipboard and write resultant URL to clipboard
 * Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-2
 - Corrected source0 field
 * Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 17:29:06 -0000	1.2
+++ sources	21 Aug 2009 15:07:19 -0000	1.3
@@ -1 +1 @@
-3831fc1f9b070d75c0fbe9134b6e210d  fpaste-0.3.2.tar.bz2
+456b4c7bfdd71330713d5e7915b4f921  fpaste-0.3.3.tar.bz2



From tmraz at fedoraproject.org  Fri Aug 21 15:08:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:08:09 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.155,1.156
Message-ID: <20090821150809.3092D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3151

Modified Files:
	openssh.spec 
Log Message:
- rebuilt with new openssl


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- openssh.spec	30 Jul 2009 08:29:01 -0000	1.155
+++ openssh.spec	21 Aug 2009 15:08:09 -0000	1.156
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 17%{?dist}%{?rescue_rel}
+Release: 18%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -474,6 +474,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-18
+- rebuilt with new openssl
+
 * Thu Jul 30 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-17
 - Added dnssec support.
 



From tmraz at fedoraproject.org  Fri Aug 21 15:08:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:08:58 +0000 (UTC)
Subject: rpms/openvpn/devel openvpn.spec,1.45,1.46
Message-ID: <20090821150858.9FE9211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3387

Modified Files:
	openvpn.spec 
Log Message:
- rebuilt with new openssl


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- openvpn.spec	25 Jul 2009 20:55:54 -0000	1.45
+++ openvpn.spec	21 Aug 2009 15:08:58 -0000	1.46
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.33%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.34%{?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
@@ -169,6 +169,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1-0.34.rc15
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.33.rc15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:09:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:09:32 +0000 (UTC)
Subject: rpms/openwsman/devel openwsman.spec,1.3,1.4
Message-ID: <20090821150932.9C4B611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openwsman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3561

Modified Files:
	openwsman.spec 
Log Message:
- rebuilt with new openssl


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/devel/openwsman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openwsman.spec	25 Jul 2009 20:56:47 -0000	1.3
+++ openwsman.spec	21 Aug 2009 15:09:32 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:          openwsman
 Version:       2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.0-4
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:10:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:10:04 +0000 (UTC)
Subject: rpms/ophcrack/devel ophcrack.spec,1.2,1.3
Message-ID: <20090821151004.A2AA911C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ophcrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3696

Modified Files:
	ophcrack.spec 
Log Message:
- rebuilt with new openssl


Index: ophcrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ophcrack/devel/ophcrack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ophcrack.spec	25 Jul 2009 20:57:01 -0000	1.2
+++ ophcrack.spec	21 Aug 2009 15:10:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ophcrack
 Version:        3.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free Windows password cracker based on rainbow tables
 Group:          Applications/System
 License:        GPLv2+ with exceptions
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:10:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:10:39 +0000 (UTC)
Subject: rpms/osslsigncode/devel osslsigncode.spec,1.6,1.7
Message-ID: <20090821151039.5541E11C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/osslsigncode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3830

Modified Files:
	osslsigncode.spec 
Log Message:
- rebuilt with new openssl


Index: osslsigncode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osslsigncode/devel/osslsigncode.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- osslsigncode.spec	25 Jul 2009 21:00:56 -0000	1.6
+++ osslsigncode.spec	21 Aug 2009 15:10:39 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Tool for Authenticode signing of EXE/CAB files
 Name: osslsigncode
 Version: 1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://sourceforge.net/projects/osslsigncode/
@@ -40,6 +40,9 @@ Tool for Authenticode signing of EXE/CAB
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:11:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:11:11 +0000 (UTC)
Subject: rpms/pacemaker/devel pacemaker.spec,1.5,1.6
Message-ID: <20090821151111.634E911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3980

Modified Files:
	pacemaker.spec 
Log Message:
- rebuilt with new openssl


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pacemaker.spec	19 Aug 2009 08:26:12 -0000	1.5
+++ pacemaker.spec	21 Aug 2009 15:11:11 -0000	1.6
@@ -17,7 +17,7 @@
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
@@ -216,6 +216,9 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-2.1
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-2
 - Add versioned perl dependancy as specified by
     https://fedoraproject.org/wiki/Packaging/Perl#Packages_that_link_to_libperl



From tmraz at fedoraproject.org  Fri Aug 21 15:12:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:12:01 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.58,1.59
Message-ID: <20090821151201.C47FB11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4189

Modified Files:
	pam_mount.spec 
Log Message:
- rebuilt with new openssl


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- pam_mount.spec	7 Aug 2009 14:12:35 -0000	1.58
+++ pam_mount.spec	21 Aug 2009 15:12:01 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name:           pam_mount
 Version:        1.27
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.27-4
+- rebuilt with new openssl
+
 * Fri Aug 07 2009 Till Maas <opensource at till.name> - 1.27-3
 - Use %%global instead of %%define
 - BR: lzip only if the tarball might be packaged with lzip / has a .lz suffix



From tmraz at fedoraproject.org  Fri Aug 21 15:12:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:12:42 +0000 (UTC)
Subject: rpms/pam_mysql/devel pam_mysql.spec,1.24,1.25
Message-ID: <20090821151242.6EB6A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam_mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4355

Modified Files:
	pam_mysql.spec 
Log Message:
- rebuilt with new openssl


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mysql/devel/pam_mysql.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pam_mysql.spec	25 Jul 2009 23:10:08 -0000	1.24
+++ pam_mysql.spec	21 Aug 2009 15:12:42 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.7
-Release:	0.8.rc1%{?dist}.2
+Release:	0.9.rc1%{?dist}.2
 Epoch:		1
 License:	GPLv2+
 Group:		System Environment/Base
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:0.7-0.9.rc1.2
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.7-0.8.rc1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:13:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:13:21 +0000 (UTC)
Subject: rpms/pam_ssh/devel pam_ssh.spec,1.25,1.26
Message-ID: <20090821151321.549BE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam_ssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4506

Modified Files:
	pam_ssh.spec 
Log Message:
- rebuilt with new openssl


Index: pam_ssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ssh/devel/pam_ssh.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- pam_ssh.spec	25 Jul 2009 23:11:47 -0000	1.25
+++ pam_ssh.spec	21 Aug 2009 15:13:21 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: PAM module for use with SSH keys and ssh-agent
 Name: pam_ssh
 Version: 1.97
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 License: BSD
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.97-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.97-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:14:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:14:05 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.35,1.36
Message-ID: <20090821151405.6C7DF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4657

Modified Files:
	paraview.spec 
Log Message:
- rebuilt with new openssl


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- paraview.spec	23 Jul 2009 19:29:42 -0000	1.35
+++ paraview.spec	21 Aug 2009 15:14:05 -0000	1.36
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -382,6 +382,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.1-2
+- rebuilt with new openssl
+
 * Wed Jul 22 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-1
 - Update to 3.6.1
 



From tmraz at fedoraproject.org  Fri Aug 21 15:14:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:14:40 +0000 (UTC)
Subject: rpms/parrot/devel parrot.spec,1.13,1.14
Message-ID: <20090821151440.A0DDA11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4801

Modified Files:
	parrot.spec 
Log Message:
- rebuilt with new openssl


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- parrot.spec	5 Aug 2009 09:03:29 -0000	1.13
+++ parrot.spec	21 Aug 2009 15:14:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -268,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.0-10
+- rebuilt with new openssl
+
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
 - ppc test included again
 - include the necessary module Parrot::Oplib::core



From tmraz at fedoraproject.org  Fri Aug 21 15:15:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:15:13 +0000 (UTC)
Subject: rpms/pathfinder/devel pathfinder.spec,1.2,1.3
Message-ID: <20090821151513.B16EA11C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pathfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4971

Modified Files:
	pathfinder.spec 
Log Message:
- rebuilt with new openssl


Index: pathfinder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pathfinder/devel/pathfinder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pathfinder.spec	25 Jul 2009 23:18:25 -0000	1.2
+++ pathfinder.spec	21 Aug 2009 15:15:13 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pathfinder
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        X.509 Path Discovery and Validation
 
 Group:          Applications/Internet
@@ -210,6 +210,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.0-3
+- rebuilt with new openssl
+
 * 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
 



From tmraz at fedoraproject.org  Fri Aug 21 15:15:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:15:48 +0000 (UTC)
Subject: rpms/pdns/devel pdns.spec,1.20,1.21
Message-ID: <20090821151548.7537A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5135

Modified Files:
	pdns.spec 
Log Message:
- rebuilt with new openssl


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pdns.spec	25 Jul 2009 23:27:14 -0000	1.20
+++ pdns.spec	21 Aug 2009 15:15:48 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.22
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -181,6 +181,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.9.22-7
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.22-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:16:20 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:16:20 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-AES/devel perl-Crypt-OpenSSL-AES.spec, 1.10,
	1.11
Message-ID: <20090821151620.8153411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5319

Modified Files:
	perl-Crypt-OpenSSL-AES.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-AES.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel/perl-Crypt-OpenSSL-AES.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-OpenSSL-AES.spec	26 Jul 2009 05:15:34 -0000	1.10
+++ perl-Crypt-OpenSSL-AES.spec	21 Aug 2009 15:16:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-AES
 Version:        0.02
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl interface to OpenSSL for AES
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.02-9
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:16:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:16:57 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-Bignum/devel perl-Crypt-OpenSSL-Bignum.spec,
	1.10, 1.11
Message-ID: <20090821151657.F410C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5488

Modified Files:
	perl-Crypt-OpenSSL-Bignum.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-Bignum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel/perl-Crypt-OpenSSL-Bignum.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-OpenSSL-Bignum.spec	26 Jul 2009 05:15:49 -0000	1.10
+++ perl-Crypt-OpenSSL-Bignum.spec	21 Aug 2009 15:16:57 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-Bignum
 Version:        0.04
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl interface to OpenSSL for Bignum
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.04-8
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:17:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:17:33 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-DSA/devel perl-Crypt-OpenSSL-DSA.spec, 1.9, 
	1.10
Message-ID: <20090821151733.3633911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5656

Modified Files:
	perl-Crypt-OpenSSL-DSA.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-DSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel/perl-Crypt-OpenSSL-DSA.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Crypt-OpenSSL-DSA.spec	26 Jul 2009 05:16:05 -0000	1.9
+++ perl-Crypt-OpenSSL-DSA.spec	21 Aug 2009 15:17:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-DSA
 Version:        0.13
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Perl interface to OpenSSL for DSA
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.13-12
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:18:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:18:07 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-PKCS10/devel perl-Crypt-OpenSSL-PKCS10.spec,
	1.8, 1.9
Message-ID: <20090821151807.C4A6111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5841

Modified Files:
	perl-Crypt-OpenSSL-PKCS10.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-PKCS10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel/perl-Crypt-OpenSSL-PKCS10.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Crypt-OpenSSL-PKCS10.spec	26 Jul 2009 05:16:20 -0000	1.8
+++ perl-Crypt-OpenSSL-PKCS10.spec	21 Aug 2009 15:18:07 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-PKCS10
 Version:        0.06
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Perl interface to OpenSSL for PKCS10
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-13
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:18:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:18:42 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-RSA/devel perl-Crypt-OpenSSL-RSA.spec, 1.10,
	1.11
Message-ID: <20090821151842.3DEC911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6012

Modified Files:
	perl-Crypt-OpenSSL-RSA.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-RSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel/perl-Crypt-OpenSSL-RSA.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-OpenSSL-RSA.spec	26 Jul 2009 05:16:39 -0000	1.10
+++ perl-Crypt-OpenSSL-RSA.spec	21 Aug 2009 15:18:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-RSA
 Version:        0.25
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl interface to OpenSSL for RSA
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.25-10
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:19:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:19:15 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-Random/devel perl-Crypt-OpenSSL-Random.spec,
	1.7, 1.8
Message-ID: <20090821151915.75DB711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6178

Modified Files:
	perl-Crypt-OpenSSL-Random.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-Random.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel/perl-Crypt-OpenSSL-Random.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Crypt-OpenSSL-Random.spec	26 Jul 2009 05:16:53 -0000	1.7
+++ perl-Crypt-OpenSSL-Random.spec	21 Aug 2009 15:19:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-Random
 Version:        0.04
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Perl interface to OpenSSL for Random
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.04-9
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:19:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:19:50 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel perl-Crypt-OpenSSL-X509.spec,
	1.10, 1.11
Message-ID: <20090821151950.54A9911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6366

Modified Files:
	perl-Crypt-OpenSSL-X509.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-OpenSSL-X509.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-OpenSSL-X509.spec	26 Jul 2009 05:17:08 -0000	1.10
+++ perl-Crypt-OpenSSL-X509.spec	21 Aug 2009 15:19:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-X509
 Version:        0.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to OpenSSL for X509
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:20:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:20:25 +0000 (UTC)
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.40,1.41
Message-ID: <20090821152025.6C26311C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6567

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- perl-Crypt-SSLeay.spec	26 Jul 2009 05:18:37 -0000	1.40
+++ perl-Crypt-SSLeay.spec	21 Aug 2009 15:20:25 -0000	1.41
@@ -1,7 +1,7 @@
 Name:           perl-Crypt-SSLeay
 Summary:        Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Version:        0.57
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-%{version}.tar.gz
@@ -86,6 +86,9 @@ make test
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.57-13
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.57-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Fri Aug 21 15:20:32 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 15:20:32 +0000 (UTC)
Subject: rpms/anjal/devel anjal.spec,1.3,1.4
Message-ID: <20090821152032.CFA0C11C0417@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6611

Modified Files:
	anjal.spec 
Log Message:
- Add gconf schema and associated spec scriptlets


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- anjal.spec	21 Aug 2009 14:39:22 -0000	1.3
+++ anjal.spec	21 Aug 2009 15:20:32 -0000	1.4
@@ -9,7 +9,7 @@
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.6.%{snapshot}%{?dist}
+Release:        0.7.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -33,6 +33,10 @@ BuildRequires: desktop-file-utils
 BuildRequires: intltool
 BuildRequires: libtool
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 %description
 Anjal is a mail client for small screen devices like NetBooks. It 
 features a nice multi-line message list, with text-preview of the 
@@ -47,28 +51,52 @@ all the mail backends including POP3, IM
 NOCONFIGURE=yes ./autogen.sh
 
 %build
-%configure --with-mozilla=no --with-anerley
+%configure --with-mozilla=no --with-anerley --disable-schemas
 make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
 
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
+%pre
+if [ "$1" -gt 1 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas >/dev/null || :
+fi
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+
+%preun
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+fi
+
 %clean
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 TODO README
+%{_sysconfdir}/gconf/schemas/anjal.schemas
 %{_bindir}/anjal
 %{_datadir}/anjal
 %{_datadir}/applications/anjal.desktop
 
 %changelog
+* Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.7
+- Add gconf schema and associated spec scriptlets
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.6
 - Drop upstreamed patch
 



From tmraz at fedoraproject.org  Fri Aug 21 15:21:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:21:01 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.46,1.47
Message-ID: <20090821152101.E9BD411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6839

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
- rebuilt with new openssl


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- perl-DBD-MySQL.spec	26 Jul 2009 05:20:57 -0000	1.46
+++ perl-DBD-MySQL.spec	21 Aug 2009 15:21:01 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        4.011
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.011-3
+- rebuilt with new openssl
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.011-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:21:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:21:39 +0000 (UTC)
Subject: rpms/perl-Net-SSH2/devel perl-Net-SSH2.spec,1.10,1.11
Message-ID: <20090821152139.137BC11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Net-SSH2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7036

Modified Files:
	perl-Net-SSH2.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Net-SSH2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Net-SSH2.spec	5 Aug 2009 05:35:50 -0000	1.10
+++ perl-Net-SSH2.spec	21 Aug 2009 15:21:38 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSH2
 Version:        0.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.21-4
+- rebuilt with new openssl
+
 * Wed Aug 05 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.21-3
 - Fix mass rebuild breakdown: Add BR: zlib-devel, openssl-devel.
 



From tmraz at fedoraproject.org  Fri Aug 21 15:22:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:22:21 +0000 (UTC)
Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.15,1.16
Message-ID: <20090821152221.E8E2D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7226

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
- rebuilt with new openssl


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Net-SSLeay.spec	26 Jul 2009 13:47:08 -0000	1.15
+++ perl-Net-SSLeay.spec	21 Aug 2009 15:22:21 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		perl-Net-SSLeay
 Version:	1.35
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Perl extension for using OpenSSL
 Group:		Development/Libraries
 License:	OpenSSL
@@ -66,6 +66,9 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile
 %{_mandir}/man3/Net::SSLeay*.3*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.35-6
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.35-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:23:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:23:28 +0000 (UTC)
Subject: rpms/php/devel php.spec,1.181,1.182
Message-ID: <20090821152328.9C9BD11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7512

Modified Files:
	php.spec 
Log Message:
- rebuilt with new openssl


Index: php.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php/devel/php.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- php.spec	26 Jul 2009 17:57:02 -0000	1.181
+++ php.spec	21 Aug 2009 15:23:28 -0000	1.182
@@ -13,7 +13,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -843,6 +843,9 @@ rm files.* macros.php
 %files enchant -f files.enchant
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.3.0-6
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:24:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:24:04 +0000 (UTC)
Subject: rpms/pinot/devel pinot.spec,1.44,1.45
Message-ID: <20090821152404.4DC5411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7708

Modified Files:
	pinot.spec 
Log Message:
- rebuilt with new openssl


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- pinot.spec	26 Jul 2009 18:49:03 -0000	1.44
+++ pinot.spec	21 Aug 2009 15:24:04 -0000	1.45
@@ -1,6 +1,6 @@
 Name:  pinot
 Version: 0.94
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -128,6 +128,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.94-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:24:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:24:36 +0000 (UTC)
Subject: rpms/pkcs11-helper/devel pkcs11-helper.spec,1.2,1.3
Message-ID: <20090821152436.C476F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pkcs11-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7885

Modified Files:
	pkcs11-helper.spec 
Log Message:
- rebuilt with new openssl


Index: pkcs11-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkcs11-helper/devel/pkcs11-helper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pkcs11-helper.spec	26 Jul 2009 18:51:08 -0000	1.2
+++ pkcs11-helper.spec	21 Aug 2009 15:24:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pkcs11-helper
 Version:        1.07
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library for using PKCS#11 providers
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.07-4
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:25:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:25:18 +0000 (UTC)
Subject: rpms/pl/devel pl.spec,1.63,1.64
Message-ID: <20090821152518.EAA3711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8076

Modified Files:
	pl.spec 
Log Message:
- rebuilt with new openssl


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- pl.spec	19 Aug 2009 17:56:58 -0000	1.63
+++ pl.spec	21 Aug 2009 15:25:18 -0000	1.64
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.7.11
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -247,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.7.11-5
+- rebuilt with new openssl
+
 * Fri Aug 14 2009 Gerard Milmeister <gemi at bluewin.ch> - 5.7.11-4
 - move include files to expected place
 



From tmraz at fedoraproject.org  Fri Aug 21 15:27:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:27:31 +0000 (UTC)
Subject: rpms/player/devel player.spec,1.9,1.10
Message-ID: <20090821152731.8ABAB11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/player/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8460

Modified Files:
	player.spec 
Log Message:
- rebuilt with new openssl


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/player.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- player.spec	26 Jul 2009 18:53:13 -0000	1.9
+++ player.spec	21 Aug 2009 15:27:31 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -200,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-13
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:28:20 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:28:20 +0000 (UTC)
Subject: rpms/postfix/devel postfix.spec,1.75,1.76
Message-ID: <20090821152820.CBC5C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8653

Modified Files:
	postfix.spec 
Log Message:
- rebuilt with new openssl


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- postfix.spec	26 Jul 2009 19:14:04 -0000	1.75
+++ postfix.spec	21 Aug 2009 15:28:20 -0000	1.76
@@ -40,7 +40,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -495,6 +495,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.6.2-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:29:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:29:10 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.114,1.115
Message-ID: <20090821152910.9119811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8841

Modified Files:
	postgresql.spec 
Log Message:
- rebuilt with new openssl


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- postgresql.spec	20 Aug 2009 18:55:13 -0000	1.114
+++ postgresql.spec	21 Aug 2009 15:29:10 -0000	1.115
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -852,6 +852,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.0-3
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 8.4.0-2
 - update License tag to MIT (PostgreSQL calls it "BSD", but it is MIT)
 - Note: This changes nothing from a license compatibility perspective.



From tmraz at fedoraproject.org  Fri Aug 21 15:29:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:29:55 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.spec,1.52,1.53
Message-ID: <20090821152955.B121A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9027

Modified Files:
	proftpd.spec 
Log Message:
- rebuilt with new openssl


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- proftpd.spec	19 Aug 2009 15:41:07 -0000	1.52
+++ proftpd.spec	21 Aug 2009 15:29:55 -0000	1.53
@@ -12,7 +12,7 @@
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
 Version:		1.3.2a
-Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
+Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}.1
 License:		GPLv2+
 Group:			System Environment/Daemons
 URL:			http://www.proftpd.org/
@@ -278,6 +278,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
 - Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
 



From tmraz at fedoraproject.org  Fri Aug 21 15:30:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:30:31 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.17,1.18
Message-ID: <20090821153031.73E8411C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9329

Modified Files:
	ptlib.spec 
Log Message:
- rebuilt with new openssl


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ptlib.spec	26 Jul 2009 19:37:27 -0000	1.17
+++ ptlib.spec	21 Aug 2009 15:30:31 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.6.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-3
+- rebuilt with new openssl
+
 * Sun Jul 26 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 tmraz at fedoraproject.org  Fri Aug 21 15:31:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:31:19 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.91,1.92
Message-ID: <20090821153119.4EE9711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10081

Modified Files:
	pulseaudio.spec 
Log Message:
- rebuilt with new openssl


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- pulseaudio.spec	20 Aug 2009 21:41:23 -0000	1.91
+++ pulseaudio.spec	21 Aug 2009 15:31:19 -0000	1.92
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        7.test5%{?dist}
+Release:        8.test5%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test5.tar.gz
@@ -436,6 +436,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-8.test5
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Matthias Clasen <mclasen at redhat.com> - 0.9.16-7.test5
 - Fix install ordering between gdm and pulseaudio-gdm-hooks
 



From tmraz at fedoraproject.org  Fri Aug 21 15:32:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:32:02 +0000 (UTC)
Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.26,1.27
Message-ID: <20090821153202.411F711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pure-ftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10302

Modified Files:
	pure-ftpd.spec 
Log Message:
- rebuilt with new openssl


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pure-ftpd.spec	26 Jul 2009 19:40:08 -0000	1.26
+++ pure-ftpd.spec	21 Aug 2009 15:32:02 -0000	1.27
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.22
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -254,6 +254,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:32:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:32:38 +0000 (UTC)
Subject: rpms/pwsafe/devel pwsafe.spec,1.8,1.9
Message-ID: <20090821153238.46C7011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pwsafe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10476

Modified Files:
	pwsafe.spec 
Log Message:
- rebuilt with new openssl


Index: pwsafe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwsafe/devel/pwsafe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pwsafe.spec	26 Jul 2009 19:43:30 -0000	1.8
+++ pwsafe.spec	21 Aug 2009 15:32:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           pwsafe
 Version:        0.2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A unix commandline program that manages encrypted password databases
 
 Group:          Applications/Databases
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0-9
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:33:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:33:17 +0000 (UTC)
Subject: rpms/pyOpenSSL/devel pyOpenSSL.spec,1.33,1.34
Message-ID: <20090821153317.A93F711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pyOpenSSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10665

Modified Files:
	pyOpenSSL.spec 
Log Message:
- rebuilt with new openssl


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- pyOpenSSL.spec	26 Jul 2009 19:43:46 -0000	1.33
+++ pyOpenSSL.spec	21 Aug 2009 15:33:17 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
 Version: 0.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
@@ -53,6 +53,9 @@ CFLAGS="%{optflags}" %{__python} setup.p
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-7
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:33:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:33:54 +0000 (UTC)
Subject: rpms/pysvn/devel pysvn.spec,1.12,1.13
Message-ID: <20090821153354.2FF9D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pysvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10830

Modified Files:
	pysvn.spec 
Log Message:
- rebuilt with new openssl


Index: pysvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/devel/pysvn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pysvn.spec	26 Jul 2009 19:59:32 -0000	1.12
+++ pysvn.spec	21 Aug 2009 15:33:54 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           pysvn
 Version:        1.7.0
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Pythonic style bindings for Subversion
 Group:          Development/Languages
 License:        ASL 1.1
@@ -51,6 +51,9 @@ pushd Tests
 %{python_sitearch}/%{name}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.7.0-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:34:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:34:49 +0000 (UTC)
Subject: rpms/python/devel python.spec,1.151,1.152
Message-ID: <20090821153449.DDABE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10999

Modified Files:
	python.spec 
Log Message:
- rebuilt with new openssl


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- python.spec	30 Jul 2009 20:57:27 -0000	1.151
+++ python.spec	21 Aug 2009 15:34:49 -0000	1.152
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.2
-Release: 1%{?dist}
+Release: 2%{?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
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.2-2
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 James Antill <james.antill at redhat.com> - 2.6.2-1
 - Update to 2.6.2
 



From tmraz at fedoraproject.org  Fri Aug 21 15:35:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:35:30 +0000 (UTC)
Subject: rpms/python-ldap/devel python-ldap.spec,1.30,1.31
Message-ID: <20090821153530.4B3CA11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/python-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11163

Modified Files:
	python-ldap.spec 
Log Message:
- rebuilt with new openssl


Index: python-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- python-ldap.spec	26 Jul 2009 20:32:35 -0000	1.30
+++ python-ldap.spec	21 Aug 2009 15:35:30 -0000	1.31
@@ -6,7 +6,7 @@
 
 Name: python-ldap
 Version: 2.3.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 0
 License: Python
 Group: System Environment/Libraries
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/python_ldap-%{version}-*.egg-info/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0:2.3.6-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:36:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:36:05 +0000 (UTC)
Subject: rpms/pyxmlsec/devel pyxmlsec.spec,1.4,1.5
Message-ID: <20090821153605.8C66B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pyxmlsec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11319

Modified Files:
	pyxmlsec.spec 
Log Message:
- rebuilt with new openssl


Index: pyxmlsec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyxmlsec/devel/pyxmlsec.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pyxmlsec.spec	27 Jul 2009 01:39:52 -0000	1.4
+++ pyxmlsec.spec	21 Aug 2009 15:36:05 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name:           pyxmlsec
 Version:        0.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python bindings for the XML Security Library
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0-5
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:36:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:36:39 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.26,1.27
Message-ID: <20090821153639.DBBE711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11459

Modified Files:
	qbittorrent.spec 
Log Message:
- rebuilt with new openssl


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- qbittorrent.spec	7 Aug 2009 12:24:39 -0000	1.26
+++ qbittorrent.spec	21 Aug 2009 15:36:39 -0000	1.27
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.0
-Release: 0.9.rc2%{?dist}
+Release: 0.10.rc2%{?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 Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.0-0.10.rc2
+- rebuilt with new openssl
+
 * Fri Aug 07 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.0-0.9.rc2
 - correct prep section package name
 



From tmraz at fedoraproject.org  Fri Aug 21 15:37:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:37:15 +0000 (UTC)
Subject: rpms/qca-ossl/devel qca-ossl.spec,1.9,1.10
Message-ID: <20090821153715.CBF5911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qca-ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11615

Modified Files:
	qca-ossl.spec 
Log Message:
- rebuilt with new openssl


Index: qca-ossl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-ossl/devel/qca-ossl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qca-ossl.spec	27 Jul 2009 01:43:11 -0000	1.9
+++ qca-ossl.spec	21 Aug 2009 15:37:15 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:       qca-ossl
 Version:    2.0.0
-Release:    0.7.beta%{beta}%{?dist}
+Release:    0.8.beta%{beta}%{?dist}
 
 Summary:    OpenSSL plugin for the Qt Cryptographic Architecture v2
 License:    LGPLv2+
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.8.beta3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-0.7.beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:37:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:37:52 +0000 (UTC)
Subject: rpms/qca-tls/devel qca-tls.spec,1.23,1.24
Message-ID: <20090821153752.4338811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qca-tls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11761

Modified Files:
	qca-tls.spec 
Log Message:
- rebuilt with new openssl


Index: qca-tls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- qca-tls.spec	27 Jul 2009 01:43:32 -0000	1.23
+++ qca-tls.spec	21 Aug 2009 15:37:52 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		qca-tls
 Version:	1.0
-Release:	17%{?dist}
+Release:	18%{?dist}
 
 Summary:	TLS plugin for the Qt Cryptographic Architecture
 License:	LGPLv2+
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:38:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:38:32 +0000 (UTC)
Subject: rpms/qmmp/devel qmmp.spec,1.12,1.13
Message-ID: <20090821153832.D811C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qmmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11947

Modified Files:
	qmmp.spec 
Log Message:
- rebuilt with new openssl


Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- qmmp.spec	27 Jul 2009 02:29:47 -0000	1.12
+++ qmmp.spec	21 Aug 2009 15:38:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		qmmp
 Version:	0.2.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Qt-based multimedia player
 
 Group:		Applications/Multimedia
@@ -105,6 +105,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-6
+- rebuilt with new openssl
+
 * Sun Jul 26 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 tmraz at fedoraproject.org  Fri Aug 21 15:39:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:39:48 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.314,1.315
Message-ID: <20090821153948.CA4A511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12193

Modified Files:
	qt.spec 
Log Message:
- rebuilt with new openssl


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- qt.spec	21 Aug 2009 09:39:23 -0000	1.314
+++ qt.spec	21 Aug 2009 15:39:48 -0000	1.315
@@ -14,7 +14,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -917,6 +917,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Fri Aug 21 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
 



From tmraz at fedoraproject.org  Fri Aug 21 15:40:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:40:29 +0000 (UTC)
Subject: rpms/ratproxy/devel ratproxy.spec,1.4,1.5
Message-ID: <20090821154029.DD73A11C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12354

Modified Files:
	ratproxy.spec 
Log Message:
- rebuilt with new openssl


Index: ratproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/ratproxy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ratproxy.spec	27 Jul 2009 02:49:18 -0000	1.4
+++ ratproxy.spec	21 Aug 2009 15:40:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ratproxy
 Version:        1.56
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A passive web application security assessment tool
 Group:          Applications/Internet
 License:        ASL 2.0
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.56-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.56-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:41:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:41:11 +0000 (UTC)
Subject: rpms/rb_libtorrent/devel rb_libtorrent.spec,1.26,1.27
Message-ID: <20090821154111.1B29D11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rb_libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12506

Modified Files:
	rb_libtorrent.spec 
Log Message:
- rebuilt with new openssl


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- rb_libtorrent.spec	27 Jul 2009 02:50:17 -0000	1.26
+++ rb_libtorrent.spec	21 Aug 2009 15:41:10 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:		rb_libtorrent
 Version:	0.14.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -181,6 +181,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.14.4-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:41:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:41:48 +0000 (UTC)
Subject: rpms/rdesktop/devel rdesktop.spec,1.35,1.36
Message-ID: <20090821154148.C078111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12708

Modified Files:
	rdesktop.spec 
Log Message:
- rebuilt with new openssl


Index: rdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- rdesktop.spec	27 Jul 2009 02:52:02 -0000	1.35
+++ rdesktop.spec	21 Aug 2009 15:41:48 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.6.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.0-7
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:42:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:42:23 +0000 (UTC)
Subject: rpms/redland/devel redland.spec,1.17,1.18
Message-ID: <20090821154223.BA4BA11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/redland/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12879

Modified Files:
	redland.spec 
Log Message:
- rebuilt with new openssl


Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- redland.spec	27 Jul 2009 02:55:40 -0000	1.17
+++ redland.spec	21 Aug 2009 15:42:23 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           redland
 Version:        1.0.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.7-9
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:43:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:43:02 +0000 (UTC)
Subject: rpms/ricci/devel ricci.spec,1.18,1.19
Message-ID: <20090821154302.BE17F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13037

Modified Files:
	ricci.spec 
Log Message:
- rebuilt with new openssl


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ricci.spec	27 Jul 2009 03:02:53 -0000	1.18
+++ ricci.spec	21 Aug 2009 15:43:02 -0000	1.19
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.16.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -121,6 +121,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.1-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:43:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:43:50 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog.spec,1.61,1.62
Message-ID: <20090821154350.1309B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13230

Modified Files:
	rsyslog.spec 
Log Message:
- rebuilt with new openssl


Index: rsyslog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- rsyslog.spec	27 Jul 2009 03:17:19 -0000	1.61
+++ rsyslog.spec	21 Aug 2009 15:43:49 -0000	1.62
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -192,6 +192,9 @@ fi	
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.2.0-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From salimma at fedoraproject.org  Fri Aug 21 15:44:00 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 15:44:00 +0000 (UTC)
Subject: rpms/scheme2js/F-10 scheme2js.spec,1.2,1.3
Message-ID: <20090821154400.5357011C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/scheme2js/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13270/F-10

Modified Files:
	scheme2js.spec 
Log Message:
* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3.1
- Actually build against the new Bigloo



Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/F-10/scheme2js.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- scheme2js.spec	20 Aug 2009 10:25:52 -0000	1.2
+++ scheme2js.spec	21 Aug 2009 15:44:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scheme2js
 Version:        20081219
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Scheme to JavaScript compiler
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3.1
+- Actually build against the new Bigloo
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3
 - Rebuild for Bigloo update
 



From salimma at fedoraproject.org  Fri Aug 21 15:44:00 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 15:44:00 +0000 (UTC)
Subject: rpms/scheme2js/F-11 scheme2js.spec,1.2,1.3
Message-ID: <20090821154400.8ADB811C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/scheme2js/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13270/F-11

Modified Files:
	scheme2js.spec 
Log Message:
* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3.1
- Actually build against the new Bigloo



Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/F-11/scheme2js.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- scheme2js.spec	20 Aug 2009 10:25:52 -0000	1.2
+++ scheme2js.spec	21 Aug 2009 15:44:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scheme2js
 Version:        20081219
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Scheme to JavaScript compiler
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3.1
+- Actually build against the new Bigloo
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 20081219-3
 - Rebuild for Bigloo update
 



From tmraz at fedoraproject.org  Fri Aug 21 15:44:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:44:46 +0000 (UTC)
Subject: rpms/ruby-ldap/devel ruby-ldap.spec,1.7,1.8
Message-ID: <20090821154446.8DCBF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13508

Modified Files:
	ruby-ldap.spec 
Log Message:
- rebuilt with new openssl


Index: ruby-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-ldap/devel/ruby-ldap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ruby-ldap.spec	27 Jul 2009 03:22:04 -0000	1.7
+++ ruby-ldap.spec	21 Aug 2009 15:44:46 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ruby-ldap
 Version:        0.9.7 
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Ruby LDAP libraries
 Group:          Development/Languages
 License:        BSD 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.7-10
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:45:20 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:45:20 +0000 (UTC)
Subject: rpms/ruby-mysql/devel ruby-mysql.spec,1.13,1.14
Message-ID: <20090821154520.2BAE011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13769

Modified Files:
	ruby-mysql.spec 
Log Message:
- rebuilt with new openssl


Index: ruby-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/ruby-mysql.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ruby-mysql.spec	27 Jul 2009 03:22:40 -0000	1.13
+++ ruby-mysql.spec	21 Aug 2009 15:45:20 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ruby-mysql
 Version:        2.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Ruby interface to MySQL
 
 Group:          Development/Languages
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearchdir}/mysql.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.8-4
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:45:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:45:53 +0000 (UTC)
Subject: rpms/rudesocket/devel rudesocket.spec,1.6,1.7
Message-ID: <20090821154553.7FDF011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rudesocket/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13930

Modified Files:
	rudesocket.spec 
Log Message:
- rebuilt with new openssl


Index: rudesocket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rudesocket/devel/rudesocket.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rudesocket.spec	27 Jul 2009 03:39:27 -0000	1.6
+++ rudesocket.spec	21 Aug 2009 15:45:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           rudesocket
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library (C++ API) for creating client sockets
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.0-6
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:46:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:46:32 +0000 (UTC)
Subject: rpms/scribus/devel scribus.spec,1.49,1.50
Message-ID: <20090821154632.7698A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14090

Modified Files:
	scribus.spec 
Log Message:
- rebuilt with new openssl


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- scribus.spec	20 Aug 2009 12:01:06 -0000	1.49
+++ scribus.spec	21 Aug 2009 15:46:32 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -173,6 +173,9 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.5.1-2
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
 - update to final 1.3.5.1
 - drop the upstreamed "install-headers" patch



From tmraz at fedoraproject.org  Fri Aug 21 15:47:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:47:07 +0000 (UTC)
Subject: rpms/scsi-target-utils/devel scsi-target-utils.spec,1.12,1.13
Message-ID: <20090821154707.842AB11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/scsi-target-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14240

Modified Files:
	scsi-target-utils.spec 
Log Message:
- rebuilt with new openssl


Index: scsi-target-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- scsi-target-utils.spec	27 Jul 2009 04:02:59 -0000	1.12
+++ scsi-target-utils.spec	21 Aug 2009 15:47:07 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -81,6 +81,9 @@ fi
 %{_initrddir}/tgtd
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:47:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:47:49 +0000 (UTC)
Subject: rpms/sems/devel sems.spec,1.8,1.9
Message-ID: <20090821154749.90C3011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14399

Modified Files:
	sems.spec 
Log Message:
- rebuilt with new openssl


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sems.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sems.spec	17 Aug 2009 10:06:07 -0000	1.8
+++ sems.spec	21 Aug 2009 15:47:49 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
@@ -549,6 +549,9 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-5
+- rebuilt with new openssl
+
 * Mon Aug 17 2009 J?n ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.1-4
 - g722 is a conditional build, until it will work with latest spandsp
 



From tmraz at fedoraproject.org  Fri Aug 21 15:48:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:48:53 +0000 (UTC)
Subject: rpms/sendmail/devel sendmail.spec,1.101,1.102
Message-ID: <20090821154853.25A8611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14678

Modified Files:
	sendmail.spec 
Log Message:
- rebuilt with new openssl


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sendmail.spec	27 Jul 2009 04:09:21 -0000	1.101
+++ sendmail.spec	21 Aug 2009 15:48:52 -0000	1.102
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -566,6 +566,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.14.3-7
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.14.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:50:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:50:35 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql.spec,1.40,1.41
Message-ID: <20090821155035.2987911C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15051

Modified Files:
	sepostgresql.spec 
Log Message:
- rebuilt with new openssl


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sepostgresql.spec	19 Aug 2009 12:26:11 -0000	1.40
+++ sepostgresql.spec	21 Aug 2009 15:50:34 -0000	1.41
@@ -12,7 +12,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.4.0
-Release: 2237%{?dist}
+Release: 2238%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,9 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.0-2238
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.0-2237
 - Upgrade SE-PostgreSQL to 8.4.x series
 



From tmraz at fedoraproject.org  Fri Aug 21 15:51:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:51:14 +0000 (UTC)
Subject: rpms/showimg/devel showimg.spec,1.31,1.32
Message-ID: <20090821155114.EB7A311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15237

Modified Files:
	showimg.spec 
Log Message:
- rebuilt with new openssl


Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- showimg.spec	9 Aug 2009 14:27:04 -0000	1.31
+++ showimg.spec	21 Aug 2009 15:51:14 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        Feature-rich image viewer
 
 Group:          Applications/Multimedia
@@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-26
+- rebuilt with new openssl
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.5-25
 - FTBFS showimg-0.9.5-22.fc11 (#511576)
 - disable pgsql support for f12+



From tmraz at fedoraproject.org  Fri Aug 21 15:51:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:51:50 +0000 (UTC)
Subject: rpms/siege/devel siege.spec,1.10,1.11
Message-ID: <20090821155150.14CA311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/siege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15412

Modified Files:
	siege.spec 
Log Message:
- rebuilt with new openssl


Index: siege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/siege/devel/siege.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- siege.spec	27 Jul 2009 04:17:56 -0000	1.10
+++ siege.spec	21 Aug 2009 15:51:49 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           siege
 Version:        2.69
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTTP regression testing and benchmarking utility
 
 Group:          Development/Tools
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/siege/siegerc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.69-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.69-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:52:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:52:26 +0000 (UTC)
Subject: rpms/sim/devel sim.spec,1.16,1.17
Message-ID: <20090821155226.5766511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15659

Modified Files:
	sim.spec 
Log Message:
- rebuilt with new openssl


Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sim.spec	21 Aug 2009 11:36:22 -0000	1.16
+++ sim.spec	21 Aug 2009 15:52:26 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.20.%{SVNdate}svn%{SVNrev}rev%{?dist}
+Release:		0.21.%{SVNdate}svn%{SVNrev}rev%{?dist}
 #svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk sim; find sim -iname '*win32*' -exec rm -r {} \; ; tar --use-compress-program lzma -cf 'sim-0.9.5-SVN20090821rev2902.tar.lzma' sim
 Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.lzma
 Summary:		Multiprotocol Instant Messenger
@@ -140,6 +140,9 @@ fi
 %{_datadir}/services/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.21.20090821svn2902rev
+- rebuilt with new openssl
+
 * Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.20.20090821svn2902rev
 - Rebuild because forgot commit patch0.
 



From tmraz at fedoraproject.org  Fri Aug 21 15:52:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:52:49 +0000 (UTC)
Subject: rpms/sipp/devel sipp.spec,1.14,1.15
Message-ID: <20090821155249.59E9211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sipp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15791

Modified Files:
	sipp.spec 
Log Message:
- rebuilt with new openssl


Index: sipp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipp/devel/sipp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sipp.spec	27 Jul 2009 04:22:30 -0000	1.14
+++ sipp.spec	21 Aug 2009 15:52:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.1-7
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:53:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:53:23 +0000 (UTC)
Subject: rpms/sipsak/devel sipsak.spec,1.7,1.8
Message-ID: <20090821155323.80CF111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sipsak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15956

Modified Files:
	sipsak.spec 
Log Message:
- rebuilt with new openssl


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/devel/sipsak.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sipsak.spec	27 Jul 2009 04:22:42 -0000	1.7
+++ sipsak.spec	21 Aug 2009 15:53:23 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
@@ -41,6 +41,9 @@ 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
 



From tmraz at fedoraproject.org  Fri Aug 21 15:53:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:53:57 +0000 (UTC)
Subject: rpms/snmp++/devel snmp++.spec,1.4,1.5
Message-ID: <20090821155357.3483A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/snmp++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16109

Modified Files:
	snmp++.spec 
Log Message:
- rebuilt with new openssl


Index: snmp++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snmp++/devel/snmp++.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- snmp++.spec	27 Jul 2009 04:31:27 -0000	1.4
+++ snmp++.spec	21 Aug 2009 15:53:57 -0000	1.5
@@ -1,6 +1,6 @@
 Name: snmp++
 Version: 3.2.23
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: SNMP++v3.x is based on SNMP++v2.8 from HP* and extends it by support for SNMPv3
 
 Group:	Development/Libraries
@@ -74,6 +74,9 @@ install %{name}-devel
 %{_includedir}/snmp_pp
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.23-9
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.23-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 15:54:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:54:31 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.16,1.17
Message-ID: <20090821155431.5C4D511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16298

Modified Files:
	socat.spec 
Log Message:
- rebuilt with new openssl


Index: socat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/socat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- socat.spec	27 Jul 2009 04:32:25 -0000	1.16
+++ socat.spec	21 Aug 2009 15:54:31 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.7.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.7.1.1-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From buc at fedoraproject.org  Fri Aug 21 15:54:52 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Fri, 21 Aug 2009 15:54:52 +0000 (UTC)
Subject: rpms/mail-notification/devel
	mail-notification-5.4-evolution-gtkhtml.patch, NONE,
	1.1 mail-notification.spec, 1.72, 1.73
Message-ID: <20090821155452.9614511C00D7@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16442

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-5.4-evolution-gtkhtml.patch 
Log Message:


mail-notification-5.4-evolution-gtkhtml.patch:
 jb-evolution-plugin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mail-notification-5.4-evolution-gtkhtml.patch ---
diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c
--- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2008-04-27 18:47:43.000000000 +0400
+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-08-21 19:48:22.000000000 +0400
@@ -41,7 +41,7 @@
   if (! minversion)
     minversion = "2.12";
 
-  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14", minversion);
   result = jb_check_packages("Evolution", "evolution-plugin", packages);
   g_free(packages);
 


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- mail-notification.spec	21 Aug 2009 14:28:42 -0000	1.72
+++ mail-notification.spec	21 Aug 2009 15:54:52 -0000	1.73
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@ Source0:        http://savannah.nongnu.o
 Patch0:		mail-notification-5.4-evolution.patch
 Patch1:		mail-notification-5.4-gmime.patch
 Patch2:		mail-notification-5.4-sasl_encode64.patch
+Patch3:		mail-notification-5.4-evolution-gtkhtml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -59,6 +60,7 @@ Evolution support for Mail Notification.
 %patch0 -p0 -b .evolution
 %patch1 -p1 -b .gmime
 %patch2 -p1 -b .sasl_encode64
+%patch3 -p1 -b .gtkhtml
 
 #  Drop #line statements in C sources generated bu .gob,
 #  for the proper debuginfo package
@@ -183,6 +185,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Fri Aug 21 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-14
+- add libgtkhtml-3.14 requirement into config stuff for evolution plugin build
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-13
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Fri Aug 21 15:55:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 15:55:06 +0000
Subject: [pkgdb] xblas was added for spot
Message-ID: <20090821155506.33BEF10F84D@bastion2.fedora.phx.redhat.com>

spot has added Package xblas with summary Extra Precise Basic Linear Algebra Subroutines
spot has approved Package xblas
spot has added a Fedora devel branch for xblas with an owner of spot
spot has approved xblas in Fedora devel
spot has approved Package xblas
spot has set commit to Approved for 107427 on xblas (Fedora devel)
spot has set checkout to Approved for 107427 on xblas (Fedora devel)
spot has set build to Approved for 107427 on xblas (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xblas



From pkgdb at fedoraproject.org  Fri Aug 21 15:55:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 15:55:07 +0000
Subject: [pkgdb] xblas summary updated by spot
Message-ID: <20090821155507.CA6FD10F855@bastion2.fedora.phx.redhat.com>

spot set package xblas summary to Extra Precise Basic Linear Algebra Subroutines

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xblas



From pkgdb at fedoraproject.org  Fri Aug 21 15:55:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 15:55:07 +0000
Subject: [pkgdb] xblas (Fedora, 11) updated by spot
Message-ID: <20090821155507.E440010F881@bastion2.fedora.phx.redhat.com>

spot added a Fedora 11 branch for xblas
spot has set commit to Approved for 107427 on xblas (Fedora 11)
spot has set checkout to Approved for 107427 on xblas (Fedora 11)
spot has set build to Approved for 107427 on xblas (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xblas



From spot at fedoraproject.org  Fri Aug 21 15:55:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 15:55:14 +0000 (UTC)
Subject: rpms/xblas - New directory
Message-ID: <20090821155514.1A03C11C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsF16668/rpms/xblas

Log Message:
Directory /cvs/pkgs/rpms/xblas added to the repository




From spot at fedoraproject.org  Fri Aug 21 15:55:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 15:55:14 +0000 (UTC)
Subject: rpms/xblas/devel - New directory
Message-ID: <20090821155514.3E94911C02C3@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsF16668/rpms/xblas/devel

Log Message:
Directory /cvs/pkgs/rpms/xblas/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 15:55:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 15:55:07 +0000
Subject: [pkgdb] xblas (Fedora, 11) updated by spot
Message-ID: <20090821155507.ED5CD10F888@bastion2.fedora.phx.redhat.com>

spot added a Fedora 10 branch for xblas
spot has set commit to Approved for 107427 on xblas (Fedora 10)
spot has set checkout to Approved for 107427 on xblas (Fedora 10)
spot has set build to Approved for 107427 on xblas (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xblas



From spot at fedoraproject.org  Fri Aug 21 15:55:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 15:55:20 +0000 (UTC)
Subject: rpms/xblas Makefile,NONE,1.1
Message-ID: <20090821155520.439F811C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsF16668/rpms/xblas

Added Files:
	Makefile 
Log Message:
Setup of module xblas


--- NEW FILE Makefile ---
# Top level Makefile for module xblas
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tmraz at fedoraproject.org  Fri Aug 21 15:55:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:55:08 +0000 (UTC)
Subject: rpms/sofia-sip/devel sofia-sip.spec,1.14,1.15
Message-ID: <20090821155508.4127F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sofia-sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16595

Modified Files:
	sofia-sip.spec 
Log Message:
- rebuilt with new openssl


Index: sofia-sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sofia-sip/devel/sofia-sip.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sofia-sip.spec	27 Jul 2009 04:33:11 -0000	1.14
+++ sofia-sip.spec	21 Aug 2009 15:55:08 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           sofia-sip
 Version:        1.12.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sofia SIP User-Agent library
 
 Group:          System Environment/Libraries
@@ -145,6 +145,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.12.10-5
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Fri Aug 21 15:55:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 15:55:20 +0000 (UTC)
Subject: rpms/xblas/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090821155520.8E68611C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsF16668/rpms/xblas/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xblas


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xblas
# $Id: Makefile,v 1.1 2009/08/21 15:55:20 spot Exp $
NAME := xblas
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tmraz at fedoraproject.org  Fri Aug 21 15:55:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:55:48 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.117,1.118
Message-ID: <20090821155548.3662111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16964

Modified Files:
	spamassassin.spec 
Log Message:
- rebuilt with new openssl


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- spamassassin.spec	10 Aug 2009 04:41:05 -0000	1.117
+++ spamassassin.spec	21 Aug 2009 15:55:48 -0000	1.118
@@ -36,7 +36,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename alpha2
-Release: 0.5.alpha2%{?dist}
+Release: 0.6.alpha2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -222,6 +222,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-0.6.alpha2
+- rebuilt with new openssl
+
 * Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.5.alpha1
 - 3.3.0-alpha2
 



From tmraz at fedoraproject.org  Fri Aug 21 15:56:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:56:26 +0000 (UTC)
Subject: rpms/springlobby/devel springlobby.spec,1.9,1.10
Message-ID: <20090821155626.E61F411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17155

Modified Files:
	springlobby.spec 
Log Message:
- rebuilt with new openssl


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- springlobby.spec	27 Jul 2009 04:43:09 -0000	1.9
+++ springlobby.spec	21 Aug 2009 15:56:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           springlobby
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
 Group:          Amusements/Games
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Fri Aug 21 15:58:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 15:58:12 +0000 (UTC)
Subject: rpms/xblas/devel import.log, NONE, 1.1 xblas-1.0.247-shared.patch, 
	NONE, 1.1 xblas.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090821155812.9788D11C00D7@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17559/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xblas-1.0.247-shared.patch xblas.spec 
Log Message:

Initial import



--- NEW FILE import.log ---
xblas-1_0_248-2_fc12:HEAD:xblas-1.0.248-2.fc12.src.rpm:1250870227

xblas-1.0.247-shared.patch:
 Makefile.m4                     |    3 +++
 configure.ac                    |    2 +-
 make.inc.in                     |    6 ++++--
 src/Makefile.template           |    2 --
 src/common/Makefile.m4          |    2 --
 testing/test-axpby/Makefile     |    4 ++--
 testing/test-dot/Makefile       |    4 ++--
 testing/test-dot2/Makefile      |    4 ++--
 testing/test-gbmv/Makefile      |    4 ++--
 testing/test-gbmv2/Makefile     |    4 ++--
 testing/test-ge_sum_mv/Makefile |   12 ++++++------
 testing/test-gemm/Makefile      |    4 ++--
 testing/test-gemv/Makefile      |    4 ++--
 testing/test-gemv2/Makefile     |    4 ++--
 testing/test-hbmv/Makefile      |   12 ++++++------
 testing/test-hemm/Makefile      |   12 ++++++------
 testing/test-hemv/Makefile      |    4 ++--
 testing/test-hemv2/Makefile     |    4 ++--
 testing/test-hpmv/Makefile      |    4 ++--
 testing/test-sbmv/Makefile      |   12 ++++++------
 testing/test-spmv/Makefile      |   12 ++++++------
 testing/test-sum/Makefile       |    4 ++--
 testing/test-symm/Makefile      |   12 ++++++------
 testing/test-symv/Makefile      |   12 ++++++------
 testing/test-symv2/Makefile     |    4 ++--
 testing/test-tbsv/Makefile      |   12 ++++++------
 testing/test-tpmv/Makefile      |   12 ++++++------
 testing/test-trmv/Makefile      |    4 ++--
 testing/test-trsv/Makefile      |   12 ++++++------
 testing/test-waxpby/Makefile    |    4 ++--
 30 files changed, 98 insertions(+), 97 deletions(-)

--- NEW FILE xblas-1.0.247-shared.patch ---
diff -up xblas/configure.ac.shared xblas/configure.ac
--- xblas/configure.ac.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/configure.ac	2009-04-20 15:42:16.000000000 -0400
@@ -142,7 +142,7 @@ if test "x$enable_fortran" = "xno"; then
   M4_OPTS="$M4_OPTS -D no_f2c"
 fi
 
-EXTRA_LIBS="$EXTRA_LIBS -lm"
+EXTRA_LIBS="$EXTRA_LIBS -lm -lgfortran -lc"
 
 AC_CONFIG_COMMANDS([gen_makefile], 
                    [$M4 $M4_OPTS Makefile.m4 >Makefile], [M4=$M4; M4_OPTS="$M4_OPTS"])
diff -up xblas/Makefile.m4.shared xblas/Makefile.m4
--- xblas/Makefile.m4.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/Makefile.m4	2009-04-20 15:42:16.000000000 -0400
@@ -169,6 +169,9 @@ lib: if_m4(`sources ')$(LIB)
 FOREACH(`LIBNAMES', 
 `	cd $(SRC_DIR)/arg && $(MAKE) lib
 ')dnl
+	$(CC) $(CFLAGS) -shared -Wl,-soname,$(XBLASLIB_SHORT) -o $(XBLASLIB) $(SRC_DIR)/common/*.o FOREACH(`LIBNAMES', `$(SRC_DIR)/arg/*.o ')$(EXTRA_LIBS)
+	if [ ! -L $(XBLASLIB_SHORT) ]; then ln -s $(XBLASLIB) $(XBLASLIB_SHORT); fi
+	if [ ! -L $(XBLASLIB_BASE) ]; then ln -s $(XBLASLIB) $(XBLASLIB_BASE); fi
 
 if_m4(`
 Makefile: Makefile.m4
diff -up xblas/make.inc.in.shared xblas/make.inc.in
--- xblas/make.inc.in.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/make.inc.in	2009-04-20 15:42:16.000000000 -0400
@@ -5,12 +5,14 @@
 #
 
 # The name of the libraries to be created/linked to
-XBLASLIB = libxblas.a
+XBLASLIB_BASE = libxblas.so
+XBLASLIB_SHORT = $(XBLASLIB_BASE).1
+XBLASLIB = $(XBLASLIB_SHORT).0.0
 
 # CC is the C compiler, normally invoked with options CFLAGS.
 # LINKER and LDFLAGS function as CC and CFLAGS, but for linking stages.
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -fPIC
 LINKER = $(CC)
 LDFLAGS = @LDFLAGS@
 
diff -up xblas/src/common/Makefile.m4.shared xblas/src/common/Makefile.m4
--- xblas/src/common/Makefile.m4.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/src/common/Makefile.m4	2009-04-20 15:42:16.000000000 -0400
@@ -13,8 +13,6 @@ COMM_OBJS = BLAS_error.o blas_malloc.o B
 all: $(COMM_OBJS)
 
 lib: $(COMM_OBJS)
-	$(ARCH) $(ARCHFLAGS) $(LIB_PATH)/$(XBLASLIB) $(COMM_OBJS)
-	$(RANLIB) $(LIB_PATH)/$(XBLASLIB)
 
 .c.o:
 	$(CC) $(CFLAGS) -I$(HEADER_PATH) -c -o $@ $<
diff -up xblas/src/Makefile.template.shared xblas/src/Makefile.template
--- xblas/src/Makefile.template.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/src/Makefile.template	2009-04-20 15:42:16.000000000 -0400
@@ -27,8 +27,6 @@ ROUTINE()_OBJS = $(ROUTINE()_SRCS:.c=.o)
 all: $(ROUTINE()_OBJS)
 
 lib: $(ROUTINE()_OBJS)
-	$(ARCH) $(ARCHFLAGS) $(LIB_PATH)/$(XBLASLIB) $(ROUTINE()_OBJS)
-	$(RANLIB) $(LIB_PATH)/$(XBLASLIB)
 
 .c.o: 
 	$(CC) $(CFLAGS) -I$(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-axpby/Makefile.shared xblas/testing/test-axpby/Makefile
--- xblas/testing/test-axpby/Makefile.shared	2009-04-20 15:46:31.000000000 -0400
+++ xblas/testing/test-axpby/Makefile	2009-04-20 15:47:33.000000000 -0400
@@ -26,10 +26,10 @@ ALL_OBJS = $(TEST_DOT_OBJS) $(TEST_OBJS)
 
 test: do_test_axpby
 	@echo Testing AXPBY
-	./do_test_axpby 10 1 1.0 1 1 > axpby.results
+	LD_LIBRARY_PATH="../.." ./do_test_axpby 10 1 1.0 1 1 > axpby.results
 
 do_test_axpby: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) -o do_test_axpby $(EXTRA_LIBS)
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas -o do_test_axpby $(EXTRA_LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) $(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-dot2/Makefile.shared xblas/testing/test-dot2/Makefile
--- xblas/testing/test-dot2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-dot2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -21,12 +21,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_dot2
 	@echo Testing DOT2
-	./do_test_dot2 20 1 1.0 0 1 > dot2.results
+	LD_LIBRARY_PATH="../.." ./do_test_dot2 20 1 1.0 0 1 > dot2.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_dot2: $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_dot2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-dot/Makefile.shared xblas/testing/test-dot/Makefile
--- xblas/testing/test-dot/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-dot/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -13,12 +13,12 @@ COMMON_OBJS = ../common/dummy_main.o
 
 test: do_test_dot
 	@echo Testing DOT
-	./do_test_dot 20 1 1.0 0 1 > dot.results
+	LD_LIBRARY_PATH="../.." ./do_test_dot 20 1 1.0 0 1 > dot.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_dot: $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(TEST_OBJS) $(COMMON_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_dot $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gbmv2/Makefile.shared xblas/testing/test-gbmv2/Makefile
--- xblas/testing/test-gbmv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gbmv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gbmv2
 	@echo Testing GBMV2
-	./do_test_gbmv2 12 1 1.0 0 0.01 > gbmv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_gbmv2 12 1 1.0 0 0.01 > gbmv2.results
 
 do_test_gbmv2: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gbmv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gbmv/Makefile.shared xblas/testing/test-gbmv/Makefile
--- xblas/testing/test-gbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,10 +23,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gbmv
 	@echo Testing GBMV
-	./do_test_gbmv 12 1 1.0 0 0.01 > gbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_gbmv 12 1 1.0 0 0.01 > gbmv.results
 
 do_test_gbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gbmv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemm/Makefile.shared xblas/testing/test-gemm/Makefile
--- xblas/testing/test-gemm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -26,12 +26,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemm
 	@echo Testing GEMM - default quick test
-	./do_test_gemm 9 1 1.0 0 0.001 > gemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemm 9 1 1.0 0 0.001 > gemm.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_gemm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemm $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemv2/Makefile.shared xblas/testing/test-gemv2/Makefile
--- xblas/testing/test-gemv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemv2
 	@echo Testing GEMV2 - default quick test
-	./do_test_gemv2 12 1 1.0 0 0.01 > gemv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemv2 12 1 1.0 0 0.01 > gemv2.results
 
 do_test_gemv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemv/Makefile.shared xblas/testing/test-gemv/Makefile
--- xblas/testing/test-gemv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,10 +23,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemv
 	@echo Testing GEMV - default quick test
-	./do_test_gemv 12 1 1.0 0 0.01 > gemv.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemv 12 1 1.0 0 0.01 > gemv.results
 
 do_test_gemv: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-ge_sum_mv/Makefile.shared xblas/testing/test-ge_sum_mv/Makefile
--- xblas/testing/test-ge_sum_mv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-ge_sum_mv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - default quick test
-	./do_test_ge_sum_mv 7 1 1.0 3 0.01 > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 0.01 > ge_sum_mv.results
 
 test-few: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - preforming a small set of tests
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_FEW_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_FEW_TESTS) > ge_sum_mv.results
 
 test-some: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - preforming some tests : not all tests 
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_SOME_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_SOME_TESTS) > ge_sum_mv.results
 
 test-all: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV Very Thoroughly
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_ALL_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_ALL_TESTS) > ge_sum_mv.results
 
 test-none: do_test_ge_sum_mv
 	@echo NOT Testing GE_SUM_MV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_NO_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_NO_TESTS) > ge_sum_mv.results
 
 do_test_ge_sum_mv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_ge_sum_mv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hbmv/Makefile.shared xblas/testing/test-hbmv/Makefile
--- xblas/testing/test-hbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hbmv
 	@echo Testing HBMV - default quick test
-	./do_test_hbmv 7 1 1.0 3 0.01 > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 0.01 > hbmv.results
 
 test-few: do_test_hbmv
 	@echo Testing HBMV - preforming a small set of tests
-	./do_test_hbmv 7 1 1.0 3 $(DO_FEW_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_FEW_TESTS) > hbmv.results
 
 test-some: do_test_hbmv
 	@echo Testing HBMV - preforming some tests : not all tests 
-	./do_test_hbmv 7 1 1.0 3 $(DO_SOME_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_SOME_TESTS) > hbmv.results
 
 test-all: do_test_hbmv
 	@echo Testing HBMV Very Thoroughly
-	./do_test_hbmv 7 1 1.0 3 $(DO_ALL_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_ALL_TESTS) > hbmv.results
 
 test-none: do_test_hbmv
 	@echo NOT Testing HBMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_hbmv 7 1 1.0 3 $(DO_NO_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_NO_TESTS) > hbmv.results
 
 do_test_hbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hbmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hemm/Makefile.shared xblas/testing/test-hemm/Makefile
--- xblas/testing/test-hemm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemm
 	@echo Testing HEMM - default quick test
-	./do_test_hemm 7 1 1.0 0 0.01 > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 0.01 > hemm.results
 
 test-few: do_test_hemm
 	@echo Testing HEMM - preforming a small set of tests
-	./do_test_hemm 7 1 1.0 0 $(DO_FEW_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_FEW_TESTS) > hemm.results
 
 test-some: do_test_hemm
 	@echo Testing HEMM - preforming some tests : not all tests 
-	./do_test_hemm 7 1 1.0 0 $(DO_SOME_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_SOME_TESTS) > hemm.results
 
 test-all: do_test_hemm
 	@echo Testing HEMM Very Thoroughly
-	./do_test_hemm 7 1 1.0 0 $(DO_ALL_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_ALL_TESTS) > hemm.results
 
 test-none: do_test_hemm
 	@echo NOT Testing HEMM - PREFORMING NO TESTS. NOT TESTING
-	./do_test_hemm 7 1 1.0 0 $(DO_NO_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_NO_TESTS) > hemm.results
 
 do_test_hemm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemm $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-hemv2/Makefile.shared xblas/testing/test-hemv2/Makefile
--- xblas/testing/test-hemv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -34,10 +34,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemv2
 	@echo Testing HEMV2 - default test
-	./do_test_hemv2 7 1 1.0 0 0.1 > hemv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemv2 7 1 1.0 0 0.1 > hemv2.results
 
 do_test_hemv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-hemv/Makefile.shared xblas/testing/test-hemv/Makefile
--- xblas/testing/test-hemv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -27,10 +27,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemv
 	@echo Testing HEMV
-	./do_test_hemv 7 1 1.0 3 0.01 > hemv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemv 7 1 1.0 3 0.01 > hemv.results
 
 do_test_hemv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hpmv/Makefile.shared xblas/testing/test-hpmv/Makefile
--- xblas/testing/test-hpmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hpmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -31,10 +31,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hpmv
 	@echo Testing HPMV
-	./do_test_hpmv 7 1 1.0 3 0.01 > hpmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hpmv 7 1 1.0 3 0.01 > hpmv.results
 
 do_test_hpmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hpmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-sbmv/Makefile.shared xblas/testing/test-sbmv/Makefile
--- xblas/testing/test-sbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-sbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,26 +29,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_sbmv
 	@echo Testing SBMV - default quick test
-	./do_test_sbmv 7 1 1.0 3 0.001 > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 0.001 > sbmv.results
 
 test-few: do_test_sbmv
 	@echo Testing SBMV - preforming a small set of tests
-	./do_test_sbmv 7 1 1.0 3 $(DO_FEW_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_FEW_TESTS) > sbmv.results
 
 test-some: do_test_sbmv
 	@echo Testing SBMV - preforming some tests : not all tests 
-	./do_test_sbmv 7 1 1.0 3 $(DO_SOME_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_SOME_TESTS) > sbmv.results
 
 test-all: do_test_sbmv
 	@echo Testing SBMV Very Thoroughly
-	./do_test_sbmv 7 1 1.0 3 $(DO_ALL_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_ALL_TESTS) > sbmv.results
 
 test-none: do_test_sbmv
 	@echo NOT Testing SBMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_sbmv 7 1 1.0 3 $(DO_NO_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_NO_TESTS) > sbmv.results
 
 do_test_sbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_sbmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-spmv/Makefile.shared xblas/testing/test-spmv/Makefile
--- xblas/testing/test-spmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-spmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -27,26 +27,26 @@ ALL_OBJS =  $(TEST_OBJS) $(TEST_DOT_OBJS
 
 test: do_test_spmv
 	@echo Testing SPMV - default quick test
-	./do_test_spmv 7 1 1.0 3 0.01 > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 0.01 > spmv.results
 
 test-few: do_test_spmv
 	@echo Testing SPMV - preforming a small set of tests
-	./do_test_spmv 7 1 1.0 3 $(DO_FEW_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_FEW_TESTS) > spmv.results
 
 test-some: do_test_spmv
 	@echo Testing SPMV - preforming some tests : not all tests 
-	./do_test_spmv 7 1 1.0 3 $(DO_SOME_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_SOME_TESTS) > spmv.results
 
 test-all: do_test_spmv
 	@echo Testing SPMV Very Thoroughly
-	./do_test_spmv 7 1 1.0 3 $(DO_ALL_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_ALL_TESTS) > spmv.results
 
 test-none: do_test_spmv
 	@echo NOT Testing SPMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_spmv 7 1 1.0 3 $(DO_NO_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_NO_TESTS) > spmv.results
 
 do_test_spmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_spmv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-sum/Makefile.shared xblas/testing/test-sum/Makefile
--- xblas/testing/test-sum/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-sum/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -25,10 +25,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_sum
 	@echo Testing SUM
-	./do_test_sum 20 1 1.0 0 1.0 > sum.results
+	LD_LIBRARY_PATH="../.." ./do_test_sum 20 1 1.0 0 1.0 > sum.results
 
 do_test_sum: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_sum $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-symm/Makefile.shared xblas/testing/test-symm/Makefile
--- xblas/testing/test-symm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -28,26 +28,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symm
 	@echo Testing SYMM - default quick test
-	./do_test_symm 7 1 1.0 3 0.001 > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 0.001 > symm.results
 
 test-few: do_test_symm
 	@echo Testing SYMM - preforming a small set of tests
-	./do_test_symm 7 1 1.0 3 $(DO_FEW_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_FEW_TESTS) > symm.results
 
 test-some: do_test_symm
 	@echo Testing SYMM - preforming some tests : not all tests 
-	./do_test_symm 7 1 1.0 3 $(DO_SOME_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_SOME_TESTS) > symm.results
 
 test-all: do_test_symm
 	@echo Testing SYMM Very Thoroughly
-	./do_test_symm 7 1 1.0 3 $(DO_ALL_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_ALL_TESTS) > symm.results
 
 test-none: do_test_symm
 	@echo NOT Testing SYMM - PREFORMING NO TESTS. NOT TESTING
-	./do_test_symm 7 1 1.0 3 $(DO_NO_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_NO_TESTS) > symm.results
 
 do_test_symm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symm $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-symv2/Makefile.shared xblas/testing/test-symv2/Makefile
--- xblas/testing/test-symv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symv2
 	@echo Testing SYMV2 - default quick test
-	./do_test_symv2 7 1 1.0 0 0.1 > symv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv2 7 1 1.0 0 0.1 > symv2.results
 
 do_test_symv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-symv/Makefile.shared xblas/testing/test-symv/Makefile
--- xblas/testing/test-symv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -25,26 +25,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symv
 	@echo Testing SYMV - default quick test
-	./do_test_symv 7 1 1.0 3 0.01 > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 0.01 > symv.results
 
 test-few: do_test_symv
 	@echo Testing SYMV - preforming a small set of tests
-	./do_test_symv 7 1 1.0 3 $(DO_FEW_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_FEW_TESTS) > symv.results
 
 test-some: do_test_symv
 	@echo Testing SYMV - preforming some tests : not all tests 
-	./do_test_symv 7 1 1.0 3 $(DO_SOME_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_SOME_TESTS) > symv.results
 
 test-all: do_test_symv
 	@echo Testing SYMV Very Thoroughly
-	./do_test_symv 7 1 1.0 3 $(DO_ALL_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_ALL_TESTS) > symv.results
 
 test-none: do_test_symv
 	@echo NOT Testing SYMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_symv 7 1 1.0 3 $(DO_NO_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_NO_TESTS) > symv.results
 
 do_test_symv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-tbsv/Makefile.shared xblas/testing/test-tbsv/Makefile
--- xblas/testing/test-tbsv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-tbsv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -31,26 +31,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_tbsv
 	@echo Testing TBSV - default quick test
-	./do_test_tbsv 9 1 1.0 3 0.01 > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 0.01 > tbsv.results
 
 test-few: do_test_tbsv
 	@echo Testing TBSV - preforming a small set of tests
-	./do_test_tbsv 9 1 1.0 3 $(DO_FEW_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_FEW_TESTS) > tbsv.results
 
 test-some: do_test_tbsv
 	@echo Testing TBSV - preforming some tests : not all tests 
-	./do_test_tbsv 9 1 1.0 3 $(DO_SOME_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_SOME_TESTS) > tbsv.results
 
 test-all: do_test_tbsv
 	@echo Testing TBSV Very Thoroughly
-	./do_test_tbsv 9 1 1.0 3 $(DO_ALL_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_ALL_TESTS) > tbsv.results
 
 test-none: do_test_tbsv
 	@echo NOT Testing TBSV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_tbsv 9 1 1.0 3 $(DO_NO_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_NO_TESTS) > tbsv.results
 
 do_test_tbsv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_tbsv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-tpmv/Makefile.shared xblas/testing/test-tpmv/Makefile
--- xblas/testing/test-tpmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-tpmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,26 +23,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_tpmv
 	@echo Testing TPMV - default quick test
-	./do_test_tpmv 12 1 1.0 0 0.01 > tpmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 0.01 > tpmv.results
 
 test-few: do_test_tpmv
 	@echo Testing TPMV - preforming a small set of tests
-	./do_test_tpmv 12 1 1.0 0 $(DO_FEW_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_FEW_TESTS)
 
 test-some: do_test_tpmv
 	@echo Testing TPMV - preforming some tests : not all tests 
-	./do_test_tpmv 12 1 1.0 3 $(DO_SOME_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 3 $(DO_SOME_TESTS)
 
 test-all: do_test_tpmv
 	@echo Testing TPMV Very Thoroughly
-	./do_test_tpmv 12 1 1.0 0 $(DO_ALL_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_ALL_TESTS)
 
 test-none: do_test_tpmv
 	@echo NOT Testing TPMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_tpmv 12 1 1.0 0 $(DO_NO_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_NO_TESTS)
 
 do_test_tpmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_tpmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-trmv/Makefile.shared xblas/testing/test-trmv/Makefile
--- xblas/testing/test-trmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-trmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -24,12 +24,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 all: test
 
 do_test_trmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_trmv $(EXTRA_LIBS)
 
 test: do_test_trmv
 	@echo Testing TRMV
-	./do_test_trmv 12 1 1.0 0 0.01 > trmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trmv 12 1 1.0 0 0.01 > trmv.results
 
 .c.o:
 	$(CC) $(CFLAGS) $(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-trsv/Makefile.shared xblas/testing/test-trsv/Makefile
--- xblas/testing/test-trsv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-trsv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -26,26 +26,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_trsv
 	@echo Testing TRSV - default quick test
-	./do_test_trsv 10 1 1.0 3 0.01 > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 3 0.01 > trsv.results
 
 test-few: do_test_trsv
 	@echo Testing TRSV - preforming a small set of tests
-	./do_test_trsv 10 1 1.0 0 $(DO_FEW_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_FEW_TESTS) > trsv.results
 
 test-some: do_test_trsv
 	@echo Testing TRSV - preforming some tests : not all tests 
-	./do_test_trsv 10 1 1.0 0 $(DO_SOME_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_SOME_TESTS) > trsv.results
 
 test-all: do_test_trsv
 	@echo Testing TRSV Very Thoroughly
-	./do_test_trsv 10 1 1.0 0 $(DO_ALL_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_ALL_TESTS) > trsv.results
 
 test-none: do_test_trsv
 	@echo NOT Testing TRSV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_trsv 10 1 1.0 0 $(DO_NO_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_NO_TESTS) > trsv.results
 
 do_test_trsv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_trsv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-waxpby/Makefile.shared xblas/testing/test-waxpby/Makefile
--- xblas/testing/test-waxpby/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-waxpby/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -24,10 +24,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_waxpby
 	@echo Testing WAXPBY
-	./do_test_waxpby 20 1 1.0 0 0.1 > waxpby.results
+	LD_LIBRARY_PATH="../.." ./do_test_waxpby 20 1 1.0 0 0.1 > waxpby.results
 
 do_test_waxpby: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_waxpby $(EXTRA_LIBS)
 
 .c.o:


--- NEW FILE xblas.spec ---
Name:		xblas
Version:	1.0.248
Release:	2%{?dist}
Summary:	Extra Precise Basic Linear Algebra Subroutines
Group:		System Environment/Libraries
License:	BSD
URL:		http://www.netlib.org/xblas
Source0:	http://www.netlib.org/%{name}/%{name}-%{version}.tar.gz
Patch0:		xblas-1.0.247-shared.patch
BuildRequires:	gcc-gfortran, autoconf, m4, indent

%description
The XBLAS library of routines is part of a reference implementation for 
the Dense and Banded Basic Linear Algebra Subroutines, along with their 
Extended and Mixed Precision versions, as documented in Chapters 2 and 4 
of the new BLAS Standard.

%package devel
Summary:	Development files for xblas
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and libraries for developing code that uses xblas.

%prep
%setup -q
%patch0 -p1 -b .shared
autoconf

%build
%configure
make makefiles
# smp_mflags doesn't work
make lib

%install
mkdir -p %{buildroot}%{_libdir}
install -m0755 libxblas.so.1.0.0 %{buildroot}%{_libdir}
pushd %{buildroot}%{_libdir}
ln -s libxblas.so.1.0.0 libxblas.so.1
ln -s libxblas.so.1.0.0 libxblas.so
popd
mkdir -p %{buildroot}%{_includedir}
install -m0644 src/*.h %{buildroot}%{_includedir}

%check
make tests

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc LICENSE doc/report.ps
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Fri Aug 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.248-2
- drop README.devel, move README to -devel
- don't bother deleting buildroot at the beginning of install
- no need to define BuildRoot anymore

* Thu Apr 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.248-1
- update to 1.0.248

* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.247-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xblas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 15:55:20 -0000	1.1
+++ .cvsignore	21 Aug 2009 15:58:12 -0000	1.2
@@ -0,0 +1 @@
+xblas-1.0.248.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xblas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 15:55:20 -0000	1.1
+++ sources	21 Aug 2009 15:58:12 -0000	1.2
@@ -0,0 +1 @@
+990c680fb5e446bb86c10936e4cd7f88  xblas-1.0.248.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 15:58:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 15:58:37 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.133,1.134
Message-ID: <20090821155837.B35F711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17712

Modified Files:
	squid.spec 
Log Message:
- rebuilt with new openssl


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- squid.spec	4 Aug 2009 19:56:19 -0000	1.133
+++ squid.spec	21 Aug 2009 15:58:37 -0000	1.134
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE18
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -341,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE18-2
+- rebuilt with new openssl
+
 * Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
 - Update to 3.0.STABLE18
 



From spot at fedoraproject.org  Fri Aug 21 16:00:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 16:00:02 +0000 (UTC)
Subject: rpms/xblas/F-10 xblas-1.0.247-shared.patch, NONE, 1.1 xblas.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090821160002.0ABCC11C0439@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18020/F-10

Modified Files:
	sources 
Added Files:
	xblas-1.0.247-shared.patch xblas.spec 
Log Message:
initial branching

xblas-1.0.247-shared.patch:
 Makefile.m4                     |    3 +++
 configure.ac                    |    2 +-
 make.inc.in                     |    6 ++++--
 src/Makefile.template           |    2 --
 src/common/Makefile.m4          |    2 --
 testing/test-axpby/Makefile     |    4 ++--
 testing/test-dot/Makefile       |    4 ++--
 testing/test-dot2/Makefile      |    4 ++--
 testing/test-gbmv/Makefile      |    4 ++--
 testing/test-gbmv2/Makefile     |    4 ++--
 testing/test-ge_sum_mv/Makefile |   12 ++++++------
 testing/test-gemm/Makefile      |    4 ++--
 testing/test-gemv/Makefile      |    4 ++--
 testing/test-gemv2/Makefile     |    4 ++--
 testing/test-hbmv/Makefile      |   12 ++++++------
 testing/test-hemm/Makefile      |   12 ++++++------
 testing/test-hemv/Makefile      |    4 ++--
 testing/test-hemv2/Makefile     |    4 ++--
 testing/test-hpmv/Makefile      |    4 ++--
 testing/test-sbmv/Makefile      |   12 ++++++------
 testing/test-spmv/Makefile      |   12 ++++++------
 testing/test-sum/Makefile       |    4 ++--
 testing/test-symm/Makefile      |   12 ++++++------
 testing/test-symv/Makefile      |   12 ++++++------
 testing/test-symv2/Makefile     |    4 ++--
 testing/test-tbsv/Makefile      |   12 ++++++------
 testing/test-tpmv/Makefile      |   12 ++++++------
 testing/test-trmv/Makefile      |    4 ++--
 testing/test-trsv/Makefile      |   12 ++++++------
 testing/test-waxpby/Makefile    |    4 ++--
 30 files changed, 98 insertions(+), 97 deletions(-)

--- NEW FILE xblas-1.0.247-shared.patch ---
diff -up xblas/configure.ac.shared xblas/configure.ac
--- xblas/configure.ac.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/configure.ac	2009-04-20 15:42:16.000000000 -0400
@@ -142,7 +142,7 @@ if test "x$enable_fortran" = "xno"; then
   M4_OPTS="$M4_OPTS -D no_f2c"
 fi
 
-EXTRA_LIBS="$EXTRA_LIBS -lm"
+EXTRA_LIBS="$EXTRA_LIBS -lm -lgfortran -lc"
 
 AC_CONFIG_COMMANDS([gen_makefile], 
                    [$M4 $M4_OPTS Makefile.m4 >Makefile], [M4=$M4; M4_OPTS="$M4_OPTS"])
diff -up xblas/Makefile.m4.shared xblas/Makefile.m4
--- xblas/Makefile.m4.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/Makefile.m4	2009-04-20 15:42:16.000000000 -0400
@@ -169,6 +169,9 @@ lib: if_m4(`sources ')$(LIB)
 FOREACH(`LIBNAMES', 
 `	cd $(SRC_DIR)/arg && $(MAKE) lib
 ')dnl
+	$(CC) $(CFLAGS) -shared -Wl,-soname,$(XBLASLIB_SHORT) -o $(XBLASLIB) $(SRC_DIR)/common/*.o FOREACH(`LIBNAMES', `$(SRC_DIR)/arg/*.o ')$(EXTRA_LIBS)
+	if [ ! -L $(XBLASLIB_SHORT) ]; then ln -s $(XBLASLIB) $(XBLASLIB_SHORT); fi
+	if [ ! -L $(XBLASLIB_BASE) ]; then ln -s $(XBLASLIB) $(XBLASLIB_BASE); fi
 
 if_m4(`
 Makefile: Makefile.m4
diff -up xblas/make.inc.in.shared xblas/make.inc.in
--- xblas/make.inc.in.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/make.inc.in	2009-04-20 15:42:16.000000000 -0400
@@ -5,12 +5,14 @@
 #
 
 # The name of the libraries to be created/linked to
-XBLASLIB = libxblas.a
+XBLASLIB_BASE = libxblas.so
+XBLASLIB_SHORT = $(XBLASLIB_BASE).1
+XBLASLIB = $(XBLASLIB_SHORT).0.0
 
 # CC is the C compiler, normally invoked with options CFLAGS.
 # LINKER and LDFLAGS function as CC and CFLAGS, but for linking stages.
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -fPIC
 LINKER = $(CC)
 LDFLAGS = @LDFLAGS@
 
diff -up xblas/src/common/Makefile.m4.shared xblas/src/common/Makefile.m4
--- xblas/src/common/Makefile.m4.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/src/common/Makefile.m4	2009-04-20 15:42:16.000000000 -0400
@@ -13,8 +13,6 @@ COMM_OBJS = BLAS_error.o blas_malloc.o B
 all: $(COMM_OBJS)
 
 lib: $(COMM_OBJS)
-	$(ARCH) $(ARCHFLAGS) $(LIB_PATH)/$(XBLASLIB) $(COMM_OBJS)
-	$(RANLIB) $(LIB_PATH)/$(XBLASLIB)
 
 .c.o:
 	$(CC) $(CFLAGS) -I$(HEADER_PATH) -c -o $@ $<
diff -up xblas/src/Makefile.template.shared xblas/src/Makefile.template
--- xblas/src/Makefile.template.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/src/Makefile.template	2009-04-20 15:42:16.000000000 -0400
@@ -27,8 +27,6 @@ ROUTINE()_OBJS = $(ROUTINE()_SRCS:.c=.o)
 all: $(ROUTINE()_OBJS)
 
 lib: $(ROUTINE()_OBJS)
-	$(ARCH) $(ARCHFLAGS) $(LIB_PATH)/$(XBLASLIB) $(ROUTINE()_OBJS)
-	$(RANLIB) $(LIB_PATH)/$(XBLASLIB)
 
 .c.o: 
 	$(CC) $(CFLAGS) -I$(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-axpby/Makefile.shared xblas/testing/test-axpby/Makefile
--- xblas/testing/test-axpby/Makefile.shared	2009-04-20 15:46:31.000000000 -0400
+++ xblas/testing/test-axpby/Makefile	2009-04-20 15:47:33.000000000 -0400
@@ -26,10 +26,10 @@ ALL_OBJS = $(TEST_DOT_OBJS) $(TEST_OBJS)
 
 test: do_test_axpby
 	@echo Testing AXPBY
-	./do_test_axpby 10 1 1.0 1 1 > axpby.results
+	LD_LIBRARY_PATH="../.." ./do_test_axpby 10 1 1.0 1 1 > axpby.results
 
 do_test_axpby: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) -o do_test_axpby $(EXTRA_LIBS)
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas -o do_test_axpby $(EXTRA_LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) $(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-dot2/Makefile.shared xblas/testing/test-dot2/Makefile
--- xblas/testing/test-dot2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-dot2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -21,12 +21,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_dot2
 	@echo Testing DOT2
-	./do_test_dot2 20 1 1.0 0 1 > dot2.results
+	LD_LIBRARY_PATH="../.." ./do_test_dot2 20 1 1.0 0 1 > dot2.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_dot2: $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_dot2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-dot/Makefile.shared xblas/testing/test-dot/Makefile
--- xblas/testing/test-dot/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-dot/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -13,12 +13,12 @@ COMMON_OBJS = ../common/dummy_main.o
 
 test: do_test_dot
 	@echo Testing DOT
-	./do_test_dot 20 1 1.0 0 1 > dot.results
+	LD_LIBRARY_PATH="../.." ./do_test_dot 20 1 1.0 0 1 > dot.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_dot: $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(TEST_OBJS) $(COMMON_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_dot $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gbmv2/Makefile.shared xblas/testing/test-gbmv2/Makefile
--- xblas/testing/test-gbmv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gbmv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gbmv2
 	@echo Testing GBMV2
-	./do_test_gbmv2 12 1 1.0 0 0.01 > gbmv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_gbmv2 12 1 1.0 0 0.01 > gbmv2.results
 
 do_test_gbmv2: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gbmv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gbmv/Makefile.shared xblas/testing/test-gbmv/Makefile
--- xblas/testing/test-gbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,10 +23,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gbmv
 	@echo Testing GBMV
-	./do_test_gbmv 12 1 1.0 0 0.01 > gbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_gbmv 12 1 1.0 0 0.01 > gbmv.results
 
 do_test_gbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gbmv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemm/Makefile.shared xblas/testing/test-gemm/Makefile
--- xblas/testing/test-gemm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -26,12 +26,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemm
 	@echo Testing GEMM - default quick test
-	./do_test_gemm 9 1 1.0 0 0.001 > gemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemm 9 1 1.0 0 0.001 > gemm.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_gemm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemm $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemv2/Makefile.shared xblas/testing/test-gemv2/Makefile
--- xblas/testing/test-gemv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemv2
 	@echo Testing GEMV2 - default quick test
-	./do_test_gemv2 12 1 1.0 0 0.01 > gemv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemv2 12 1 1.0 0 0.01 > gemv2.results
 
 do_test_gemv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemv/Makefile.shared xblas/testing/test-gemv/Makefile
--- xblas/testing/test-gemv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,10 +23,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemv
 	@echo Testing GEMV - default quick test
-	./do_test_gemv 12 1 1.0 0 0.01 > gemv.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemv 12 1 1.0 0 0.01 > gemv.results
 
 do_test_gemv: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-ge_sum_mv/Makefile.shared xblas/testing/test-ge_sum_mv/Makefile
--- xblas/testing/test-ge_sum_mv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-ge_sum_mv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - default quick test
-	./do_test_ge_sum_mv 7 1 1.0 3 0.01 > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 0.01 > ge_sum_mv.results
 
 test-few: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - preforming a small set of tests
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_FEW_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_FEW_TESTS) > ge_sum_mv.results
 
 test-some: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - preforming some tests : not all tests 
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_SOME_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_SOME_TESTS) > ge_sum_mv.results
 
 test-all: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV Very Thoroughly
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_ALL_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_ALL_TESTS) > ge_sum_mv.results
 
 test-none: do_test_ge_sum_mv
 	@echo NOT Testing GE_SUM_MV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_NO_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_NO_TESTS) > ge_sum_mv.results
 
 do_test_ge_sum_mv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_ge_sum_mv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hbmv/Makefile.shared xblas/testing/test-hbmv/Makefile
--- xblas/testing/test-hbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hbmv
 	@echo Testing HBMV - default quick test
-	./do_test_hbmv 7 1 1.0 3 0.01 > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 0.01 > hbmv.results
 
 test-few: do_test_hbmv
 	@echo Testing HBMV - preforming a small set of tests
-	./do_test_hbmv 7 1 1.0 3 $(DO_FEW_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_FEW_TESTS) > hbmv.results
 
 test-some: do_test_hbmv
 	@echo Testing HBMV - preforming some tests : not all tests 
-	./do_test_hbmv 7 1 1.0 3 $(DO_SOME_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_SOME_TESTS) > hbmv.results
 
 test-all: do_test_hbmv
 	@echo Testing HBMV Very Thoroughly
-	./do_test_hbmv 7 1 1.0 3 $(DO_ALL_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_ALL_TESTS) > hbmv.results
 
 test-none: do_test_hbmv
 	@echo NOT Testing HBMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_hbmv 7 1 1.0 3 $(DO_NO_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_NO_TESTS) > hbmv.results
 
 do_test_hbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hbmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hemm/Makefile.shared xblas/testing/test-hemm/Makefile
--- xblas/testing/test-hemm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemm
 	@echo Testing HEMM - default quick test
-	./do_test_hemm 7 1 1.0 0 0.01 > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 0.01 > hemm.results
 
 test-few: do_test_hemm
 	@echo Testing HEMM - preforming a small set of tests
-	./do_test_hemm 7 1 1.0 0 $(DO_FEW_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_FEW_TESTS) > hemm.results
 
 test-some: do_test_hemm
 	@echo Testing HEMM - preforming some tests : not all tests 
-	./do_test_hemm 7 1 1.0 0 $(DO_SOME_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_SOME_TESTS) > hemm.results
 
 test-all: do_test_hemm
 	@echo Testing HEMM Very Thoroughly
-	./do_test_hemm 7 1 1.0 0 $(DO_ALL_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_ALL_TESTS) > hemm.results
 
 test-none: do_test_hemm
 	@echo NOT Testing HEMM - PREFORMING NO TESTS. NOT TESTING
-	./do_test_hemm 7 1 1.0 0 $(DO_NO_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_NO_TESTS) > hemm.results
 
 do_test_hemm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemm $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-hemv2/Makefile.shared xblas/testing/test-hemv2/Makefile
--- xblas/testing/test-hemv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -34,10 +34,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemv2
 	@echo Testing HEMV2 - default test
-	./do_test_hemv2 7 1 1.0 0 0.1 > hemv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemv2 7 1 1.0 0 0.1 > hemv2.results
 
 do_test_hemv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-hemv/Makefile.shared xblas/testing/test-hemv/Makefile
--- xblas/testing/test-hemv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -27,10 +27,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemv
 	@echo Testing HEMV
-	./do_test_hemv 7 1 1.0 3 0.01 > hemv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemv 7 1 1.0 3 0.01 > hemv.results
 
 do_test_hemv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hpmv/Makefile.shared xblas/testing/test-hpmv/Makefile
--- xblas/testing/test-hpmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hpmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -31,10 +31,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hpmv
 	@echo Testing HPMV
-	./do_test_hpmv 7 1 1.0 3 0.01 > hpmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hpmv 7 1 1.0 3 0.01 > hpmv.results
 
 do_test_hpmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hpmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-sbmv/Makefile.shared xblas/testing/test-sbmv/Makefile
--- xblas/testing/test-sbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-sbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,26 +29,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_sbmv
 	@echo Testing SBMV - default quick test
-	./do_test_sbmv 7 1 1.0 3 0.001 > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 0.001 > sbmv.results
 
 test-few: do_test_sbmv
 	@echo Testing SBMV - preforming a small set of tests
-	./do_test_sbmv 7 1 1.0 3 $(DO_FEW_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_FEW_TESTS) > sbmv.results
 
 test-some: do_test_sbmv
 	@echo Testing SBMV - preforming some tests : not all tests 
-	./do_test_sbmv 7 1 1.0 3 $(DO_SOME_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_SOME_TESTS) > sbmv.results
 
 test-all: do_test_sbmv
 	@echo Testing SBMV Very Thoroughly
-	./do_test_sbmv 7 1 1.0 3 $(DO_ALL_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_ALL_TESTS) > sbmv.results
 
 test-none: do_test_sbmv
 	@echo NOT Testing SBMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_sbmv 7 1 1.0 3 $(DO_NO_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_NO_TESTS) > sbmv.results
 
 do_test_sbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_sbmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-spmv/Makefile.shared xblas/testing/test-spmv/Makefile
--- xblas/testing/test-spmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-spmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -27,26 +27,26 @@ ALL_OBJS =  $(TEST_OBJS) $(TEST_DOT_OBJS
 
 test: do_test_spmv
 	@echo Testing SPMV - default quick test
-	./do_test_spmv 7 1 1.0 3 0.01 > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 0.01 > spmv.results
 
 test-few: do_test_spmv
 	@echo Testing SPMV - preforming a small set of tests
-	./do_test_spmv 7 1 1.0 3 $(DO_FEW_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_FEW_TESTS) > spmv.results
 
 test-some: do_test_spmv
 	@echo Testing SPMV - preforming some tests : not all tests 
-	./do_test_spmv 7 1 1.0 3 $(DO_SOME_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_SOME_TESTS) > spmv.results
 
 test-all: do_test_spmv
 	@echo Testing SPMV Very Thoroughly
-	./do_test_spmv 7 1 1.0 3 $(DO_ALL_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_ALL_TESTS) > spmv.results
 
 test-none: do_test_spmv
 	@echo NOT Testing SPMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_spmv 7 1 1.0 3 $(DO_NO_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_NO_TESTS) > spmv.results
 
 do_test_spmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_spmv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-sum/Makefile.shared xblas/testing/test-sum/Makefile
--- xblas/testing/test-sum/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-sum/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -25,10 +25,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_sum
 	@echo Testing SUM
-	./do_test_sum 20 1 1.0 0 1.0 > sum.results
+	LD_LIBRARY_PATH="../.." ./do_test_sum 20 1 1.0 0 1.0 > sum.results
 
 do_test_sum: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_sum $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-symm/Makefile.shared xblas/testing/test-symm/Makefile
--- xblas/testing/test-symm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -28,26 +28,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symm
 	@echo Testing SYMM - default quick test
-	./do_test_symm 7 1 1.0 3 0.001 > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 0.001 > symm.results
 
 test-few: do_test_symm
 	@echo Testing SYMM - preforming a small set of tests
-	./do_test_symm 7 1 1.0 3 $(DO_FEW_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_FEW_TESTS) > symm.results
 
 test-some: do_test_symm
 	@echo Testing SYMM - preforming some tests : not all tests 
-	./do_test_symm 7 1 1.0 3 $(DO_SOME_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_SOME_TESTS) > symm.results
 
 test-all: do_test_symm
 	@echo Testing SYMM Very Thoroughly
-	./do_test_symm 7 1 1.0 3 $(DO_ALL_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_ALL_TESTS) > symm.results
 
 test-none: do_test_symm
 	@echo NOT Testing SYMM - PREFORMING NO TESTS. NOT TESTING
-	./do_test_symm 7 1 1.0 3 $(DO_NO_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_NO_TESTS) > symm.results
 
 do_test_symm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symm $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-symv2/Makefile.shared xblas/testing/test-symv2/Makefile
--- xblas/testing/test-symv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symv2
 	@echo Testing SYMV2 - default quick test
-	./do_test_symv2 7 1 1.0 0 0.1 > symv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv2 7 1 1.0 0 0.1 > symv2.results
 
 do_test_symv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-symv/Makefile.shared xblas/testing/test-symv/Makefile
--- xblas/testing/test-symv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -25,26 +25,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symv
 	@echo Testing SYMV - default quick test
-	./do_test_symv 7 1 1.0 3 0.01 > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 0.01 > symv.results
 
 test-few: do_test_symv
 	@echo Testing SYMV - preforming a small set of tests
-	./do_test_symv 7 1 1.0 3 $(DO_FEW_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_FEW_TESTS) > symv.results
 
 test-some: do_test_symv
 	@echo Testing SYMV - preforming some tests : not all tests 
-	./do_test_symv 7 1 1.0 3 $(DO_SOME_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_SOME_TESTS) > symv.results
 
 test-all: do_test_symv
 	@echo Testing SYMV Very Thoroughly
-	./do_test_symv 7 1 1.0 3 $(DO_ALL_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_ALL_TESTS) > symv.results
 
 test-none: do_test_symv
 	@echo NOT Testing SYMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_symv 7 1 1.0 3 $(DO_NO_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_NO_TESTS) > symv.results
 
 do_test_symv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-tbsv/Makefile.shared xblas/testing/test-tbsv/Makefile
--- xblas/testing/test-tbsv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-tbsv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -31,26 +31,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_tbsv
 	@echo Testing TBSV - default quick test
-	./do_test_tbsv 9 1 1.0 3 0.01 > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 0.01 > tbsv.results
 
 test-few: do_test_tbsv
 	@echo Testing TBSV - preforming a small set of tests
-	./do_test_tbsv 9 1 1.0 3 $(DO_FEW_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_FEW_TESTS) > tbsv.results
 
 test-some: do_test_tbsv
 	@echo Testing TBSV - preforming some tests : not all tests 
-	./do_test_tbsv 9 1 1.0 3 $(DO_SOME_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_SOME_TESTS) > tbsv.results
 
 test-all: do_test_tbsv
 	@echo Testing TBSV Very Thoroughly
-	./do_test_tbsv 9 1 1.0 3 $(DO_ALL_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_ALL_TESTS) > tbsv.results
 
 test-none: do_test_tbsv
 	@echo NOT Testing TBSV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_tbsv 9 1 1.0 3 $(DO_NO_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_NO_TESTS) > tbsv.results
 
 do_test_tbsv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_tbsv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-tpmv/Makefile.shared xblas/testing/test-tpmv/Makefile
--- xblas/testing/test-tpmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-tpmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,26 +23,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_tpmv
 	@echo Testing TPMV - default quick test
-	./do_test_tpmv 12 1 1.0 0 0.01 > tpmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 0.01 > tpmv.results
 
 test-few: do_test_tpmv
 	@echo Testing TPMV - preforming a small set of tests
-	./do_test_tpmv 12 1 1.0 0 $(DO_FEW_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_FEW_TESTS)
 
 test-some: do_test_tpmv
 	@echo Testing TPMV - preforming some tests : not all tests 
-	./do_test_tpmv 12 1 1.0 3 $(DO_SOME_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 3 $(DO_SOME_TESTS)
 
 test-all: do_test_tpmv
 	@echo Testing TPMV Very Thoroughly
-	./do_test_tpmv 12 1 1.0 0 $(DO_ALL_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_ALL_TESTS)
 
 test-none: do_test_tpmv
 	@echo NOT Testing TPMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_tpmv 12 1 1.0 0 $(DO_NO_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_NO_TESTS)
 
 do_test_tpmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_tpmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-trmv/Makefile.shared xblas/testing/test-trmv/Makefile
--- xblas/testing/test-trmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-trmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -24,12 +24,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 all: test
 
 do_test_trmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_trmv $(EXTRA_LIBS)
 
 test: do_test_trmv
 	@echo Testing TRMV
-	./do_test_trmv 12 1 1.0 0 0.01 > trmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trmv 12 1 1.0 0 0.01 > trmv.results
 
 .c.o:
 	$(CC) $(CFLAGS) $(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-trsv/Makefile.shared xblas/testing/test-trsv/Makefile
--- xblas/testing/test-trsv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-trsv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -26,26 +26,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_trsv
 	@echo Testing TRSV - default quick test
-	./do_test_trsv 10 1 1.0 3 0.01 > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 3 0.01 > trsv.results
 
 test-few: do_test_trsv
 	@echo Testing TRSV - preforming a small set of tests
-	./do_test_trsv 10 1 1.0 0 $(DO_FEW_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_FEW_TESTS) > trsv.results
 
 test-some: do_test_trsv
 	@echo Testing TRSV - preforming some tests : not all tests 
-	./do_test_trsv 10 1 1.0 0 $(DO_SOME_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_SOME_TESTS) > trsv.results
 
 test-all: do_test_trsv
 	@echo Testing TRSV Very Thoroughly
-	./do_test_trsv 10 1 1.0 0 $(DO_ALL_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_ALL_TESTS) > trsv.results
 
 test-none: do_test_trsv
 	@echo NOT Testing TRSV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_trsv 10 1 1.0 0 $(DO_NO_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_NO_TESTS) > trsv.results
 
 do_test_trsv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_trsv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-waxpby/Makefile.shared xblas/testing/test-waxpby/Makefile
--- xblas/testing/test-waxpby/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-waxpby/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -24,10 +24,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_waxpby
 	@echo Testing WAXPBY
-	./do_test_waxpby 20 1 1.0 0 0.1 > waxpby.results
+	LD_LIBRARY_PATH="../.." ./do_test_waxpby 20 1 1.0 0 0.1 > waxpby.results
 
 do_test_waxpby: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_waxpby $(EXTRA_LIBS)
 
 .c.o:


--- NEW FILE xblas.spec ---
Name:		xblas
Version:	1.0.248
Release:	2%{?dist}
Summary:	Extra Precise Basic Linear Algebra Subroutines
Group:		System Environment/Libraries
License:	BSD
URL:		http://www.netlib.org/xblas
Source0:	http://www.netlib.org/%{name}/%{name}-%{version}.tar.gz
Patch0:		xblas-1.0.247-shared.patch
BuildRequires:	gcc-gfortran, autoconf, m4, indent

%description
The XBLAS library of routines is part of a reference implementation for 
the Dense and Banded Basic Linear Algebra Subroutines, along with their 
Extended and Mixed Precision versions, as documented in Chapters 2 and 4 
of the new BLAS Standard.

%package devel
Summary:	Development files for xblas
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and libraries for developing code that uses xblas.

%prep
%setup -q
%patch0 -p1 -b .shared
autoconf

%build
%configure
make makefiles
# smp_mflags doesn't work
make lib

%install
mkdir -p %{buildroot}%{_libdir}
install -m0755 libxblas.so.1.0.0 %{buildroot}%{_libdir}
pushd %{buildroot}%{_libdir}
ln -s libxblas.so.1.0.0 libxblas.so.1
ln -s libxblas.so.1.0.0 libxblas.so
popd
mkdir -p %{buildroot}%{_includedir}
install -m0644 src/*.h %{buildroot}%{_includedir}

%check
make tests

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc LICENSE doc/report.ps
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Fri Aug 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.248-2
- drop README.devel, move README to -devel
- don't bother deleting buildroot at the beginning of install
- no need to define BuildRoot anymore

* Thu Apr 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.248-1
- update to 1.0.248

* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.247-1
- initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xblas/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 15:55:20 -0000	1.1
+++ sources	21 Aug 2009 16:00:01 -0000	1.2
@@ -0,0 +1 @@
+990c680fb5e446bb86c10936e4cd7f88  xblas-1.0.248.tar.gz



From spot at fedoraproject.org  Fri Aug 21 16:00:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 21 Aug 2009 16:00:02 +0000 (UTC)
Subject: rpms/xblas/F-11 xblas-1.0.247-shared.patch, NONE, 1.1 xblas.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090821160002.95B3311C0439@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xblas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18020/F-11

Modified Files:
	sources 
Added Files:
	xblas-1.0.247-shared.patch xblas.spec 
Log Message:
initial branching

xblas-1.0.247-shared.patch:
 Makefile.m4                     |    3 +++
 configure.ac                    |    2 +-
 make.inc.in                     |    6 ++++--
 src/Makefile.template           |    2 --
 src/common/Makefile.m4          |    2 --
 testing/test-axpby/Makefile     |    4 ++--
 testing/test-dot/Makefile       |    4 ++--
 testing/test-dot2/Makefile      |    4 ++--
 testing/test-gbmv/Makefile      |    4 ++--
 testing/test-gbmv2/Makefile     |    4 ++--
 testing/test-ge_sum_mv/Makefile |   12 ++++++------
 testing/test-gemm/Makefile      |    4 ++--
 testing/test-gemv/Makefile      |    4 ++--
 testing/test-gemv2/Makefile     |    4 ++--
 testing/test-hbmv/Makefile      |   12 ++++++------
 testing/test-hemm/Makefile      |   12 ++++++------
 testing/test-hemv/Makefile      |    4 ++--
 testing/test-hemv2/Makefile     |    4 ++--
 testing/test-hpmv/Makefile      |    4 ++--
 testing/test-sbmv/Makefile      |   12 ++++++------
 testing/test-spmv/Makefile      |   12 ++++++------
 testing/test-sum/Makefile       |    4 ++--
 testing/test-symm/Makefile      |   12 ++++++------
 testing/test-symv/Makefile      |   12 ++++++------
 testing/test-symv2/Makefile     |    4 ++--
 testing/test-tbsv/Makefile      |   12 ++++++------
 testing/test-tpmv/Makefile      |   12 ++++++------
 testing/test-trmv/Makefile      |    4 ++--
 testing/test-trsv/Makefile      |   12 ++++++------
 testing/test-waxpby/Makefile    |    4 ++--
 30 files changed, 98 insertions(+), 97 deletions(-)

--- NEW FILE xblas-1.0.247-shared.patch ---
diff -up xblas/configure.ac.shared xblas/configure.ac
--- xblas/configure.ac.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/configure.ac	2009-04-20 15:42:16.000000000 -0400
@@ -142,7 +142,7 @@ if test "x$enable_fortran" = "xno"; then
   M4_OPTS="$M4_OPTS -D no_f2c"
 fi
 
-EXTRA_LIBS="$EXTRA_LIBS -lm"
+EXTRA_LIBS="$EXTRA_LIBS -lm -lgfortran -lc"
 
 AC_CONFIG_COMMANDS([gen_makefile], 
                    [$M4 $M4_OPTS Makefile.m4 >Makefile], [M4=$M4; M4_OPTS="$M4_OPTS"])
diff -up xblas/Makefile.m4.shared xblas/Makefile.m4
--- xblas/Makefile.m4.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/Makefile.m4	2009-04-20 15:42:16.000000000 -0400
@@ -169,6 +169,9 @@ lib: if_m4(`sources ')$(LIB)
 FOREACH(`LIBNAMES', 
 `	cd $(SRC_DIR)/arg && $(MAKE) lib
 ')dnl
+	$(CC) $(CFLAGS) -shared -Wl,-soname,$(XBLASLIB_SHORT) -o $(XBLASLIB) $(SRC_DIR)/common/*.o FOREACH(`LIBNAMES', `$(SRC_DIR)/arg/*.o ')$(EXTRA_LIBS)
+	if [ ! -L $(XBLASLIB_SHORT) ]; then ln -s $(XBLASLIB) $(XBLASLIB_SHORT); fi
+	if [ ! -L $(XBLASLIB_BASE) ]; then ln -s $(XBLASLIB) $(XBLASLIB_BASE); fi
 
 if_m4(`
 Makefile: Makefile.m4
diff -up xblas/make.inc.in.shared xblas/make.inc.in
--- xblas/make.inc.in.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/make.inc.in	2009-04-20 15:42:16.000000000 -0400
@@ -5,12 +5,14 @@
 #
 
 # The name of the libraries to be created/linked to
-XBLASLIB = libxblas.a
+XBLASLIB_BASE = libxblas.so
+XBLASLIB_SHORT = $(XBLASLIB_BASE).1
+XBLASLIB = $(XBLASLIB_SHORT).0.0
 
 # CC is the C compiler, normally invoked with options CFLAGS.
 # LINKER and LDFLAGS function as CC and CFLAGS, but for linking stages.
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -fPIC
 LINKER = $(CC)
 LDFLAGS = @LDFLAGS@
 
diff -up xblas/src/common/Makefile.m4.shared xblas/src/common/Makefile.m4
--- xblas/src/common/Makefile.m4.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/src/common/Makefile.m4	2009-04-20 15:42:16.000000000 -0400
@@ -13,8 +13,6 @@ COMM_OBJS = BLAS_error.o blas_malloc.o B
 all: $(COMM_OBJS)
 
 lib: $(COMM_OBJS)
-	$(ARCH) $(ARCHFLAGS) $(LIB_PATH)/$(XBLASLIB) $(COMM_OBJS)
-	$(RANLIB) $(LIB_PATH)/$(XBLASLIB)
 
 .c.o:
 	$(CC) $(CFLAGS) -I$(HEADER_PATH) -c -o $@ $<
diff -up xblas/src/Makefile.template.shared xblas/src/Makefile.template
--- xblas/src/Makefile.template.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/src/Makefile.template	2009-04-20 15:42:16.000000000 -0400
@@ -27,8 +27,6 @@ ROUTINE()_OBJS = $(ROUTINE()_SRCS:.c=.o)
 all: $(ROUTINE()_OBJS)
 
 lib: $(ROUTINE()_OBJS)
-	$(ARCH) $(ARCHFLAGS) $(LIB_PATH)/$(XBLASLIB) $(ROUTINE()_OBJS)
-	$(RANLIB) $(LIB_PATH)/$(XBLASLIB)
 
 .c.o: 
 	$(CC) $(CFLAGS) -I$(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-axpby/Makefile.shared xblas/testing/test-axpby/Makefile
--- xblas/testing/test-axpby/Makefile.shared	2009-04-20 15:46:31.000000000 -0400
+++ xblas/testing/test-axpby/Makefile	2009-04-20 15:47:33.000000000 -0400
@@ -26,10 +26,10 @@ ALL_OBJS = $(TEST_DOT_OBJS) $(TEST_OBJS)
 
 test: do_test_axpby
 	@echo Testing AXPBY
-	./do_test_axpby 10 1 1.0 1 1 > axpby.results
+	LD_LIBRARY_PATH="../.." ./do_test_axpby 10 1 1.0 1 1 > axpby.results
 
 do_test_axpby: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) -o do_test_axpby $(EXTRA_LIBS)
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas -o do_test_axpby $(EXTRA_LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) $(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-dot2/Makefile.shared xblas/testing/test-dot2/Makefile
--- xblas/testing/test-dot2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-dot2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -21,12 +21,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_dot2
 	@echo Testing DOT2
-	./do_test_dot2 20 1 1.0 0 1 > dot2.results
+	LD_LIBRARY_PATH="../.." ./do_test_dot2 20 1 1.0 0 1 > dot2.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_dot2: $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_dot2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-dot/Makefile.shared xblas/testing/test-dot/Makefile
--- xblas/testing/test-dot/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-dot/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -13,12 +13,12 @@ COMMON_OBJS = ../common/dummy_main.o
 
 test: do_test_dot
 	@echo Testing DOT
-	./do_test_dot 20 1 1.0 0 1 > dot.results
+	LD_LIBRARY_PATH="../.." ./do_test_dot 20 1 1.0 0 1 > dot.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_dot: $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(TEST_OBJS) $(COMMON_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(TEST_OBJS) $(COMMON_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_dot $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gbmv2/Makefile.shared xblas/testing/test-gbmv2/Makefile
--- xblas/testing/test-gbmv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gbmv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gbmv2
 	@echo Testing GBMV2
-	./do_test_gbmv2 12 1 1.0 0 0.01 > gbmv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_gbmv2 12 1 1.0 0 0.01 > gbmv2.results
 
 do_test_gbmv2: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gbmv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gbmv/Makefile.shared xblas/testing/test-gbmv/Makefile
--- xblas/testing/test-gbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,10 +23,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gbmv
 	@echo Testing GBMV
-	./do_test_gbmv 12 1 1.0 0 0.01 > gbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_gbmv 12 1 1.0 0 0.01 > gbmv.results
 
 do_test_gbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gbmv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemm/Makefile.shared xblas/testing/test-gemm/Makefile
--- xblas/testing/test-gemm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -26,12 +26,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemm
 	@echo Testing GEMM - default quick test
-	./do_test_gemm 9 1 1.0 0 0.001 > gemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemm 9 1 1.0 0 0.001 > gemm.results
 
 test-lib: $(TEST_OBJS)
 
 do_test_gemm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemm $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemv2/Makefile.shared xblas/testing/test-gemv2/Makefile
--- xblas/testing/test-gemv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemv2
 	@echo Testing GEMV2 - default quick test
-	./do_test_gemv2 12 1 1.0 0 0.01 > gemv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemv2 12 1 1.0 0 0.01 > gemv2.results
 
 do_test_gemv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-gemv/Makefile.shared xblas/testing/test-gemv/Makefile
--- xblas/testing/test-gemv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-gemv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,10 +23,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_gemv
 	@echo Testing GEMV - default quick test
-	./do_test_gemv 12 1 1.0 0 0.01 > gemv.results
+	LD_LIBRARY_PATH="../.." ./do_test_gemv 12 1 1.0 0 0.01 > gemv.results
 
 do_test_gemv: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_gemv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-ge_sum_mv/Makefile.shared xblas/testing/test-ge_sum_mv/Makefile
--- xblas/testing/test-ge_sum_mv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-ge_sum_mv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - default quick test
-	./do_test_ge_sum_mv 7 1 1.0 3 0.01 > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 0.01 > ge_sum_mv.results
 
 test-few: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - preforming a small set of tests
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_FEW_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_FEW_TESTS) > ge_sum_mv.results
 
 test-some: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV - preforming some tests : not all tests 
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_SOME_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_SOME_TESTS) > ge_sum_mv.results
 
 test-all: do_test_ge_sum_mv warning
 	@echo Testing GE_SUM_MV Very Thoroughly
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_ALL_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_ALL_TESTS) > ge_sum_mv.results
 
 test-none: do_test_ge_sum_mv
 	@echo NOT Testing GE_SUM_MV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_ge_sum_mv 7 1 1.0 3 $(DO_NO_TESTS) > ge_sum_mv.results
+	LD_LIBRARY_PATH="../.." ./do_test_ge_sum_mv 7 1 1.0 3 $(DO_NO_TESTS) > ge_sum_mv.results
 
 do_test_ge_sum_mv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_ge_sum_mv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hbmv/Makefile.shared xblas/testing/test-hbmv/Makefile
--- xblas/testing/test-hbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hbmv
 	@echo Testing HBMV - default quick test
-	./do_test_hbmv 7 1 1.0 3 0.01 > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 0.01 > hbmv.results
 
 test-few: do_test_hbmv
 	@echo Testing HBMV - preforming a small set of tests
-	./do_test_hbmv 7 1 1.0 3 $(DO_FEW_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_FEW_TESTS) > hbmv.results
 
 test-some: do_test_hbmv
 	@echo Testing HBMV - preforming some tests : not all tests 
-	./do_test_hbmv 7 1 1.0 3 $(DO_SOME_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_SOME_TESTS) > hbmv.results
 
 test-all: do_test_hbmv
 	@echo Testing HBMV Very Thoroughly
-	./do_test_hbmv 7 1 1.0 3 $(DO_ALL_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_ALL_TESTS) > hbmv.results
 
 test-none: do_test_hbmv
 	@echo NOT Testing HBMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_hbmv 7 1 1.0 3 $(DO_NO_TESTS) > hbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hbmv 7 1 1.0 3 $(DO_NO_TESTS) > hbmv.results
 
 do_test_hbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hbmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hemm/Makefile.shared xblas/testing/test-hemm/Makefile
--- xblas/testing/test-hemm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -33,26 +33,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemm
 	@echo Testing HEMM - default quick test
-	./do_test_hemm 7 1 1.0 0 0.01 > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 0.01 > hemm.results
 
 test-few: do_test_hemm
 	@echo Testing HEMM - preforming a small set of tests
-	./do_test_hemm 7 1 1.0 0 $(DO_FEW_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_FEW_TESTS) > hemm.results
 
 test-some: do_test_hemm
 	@echo Testing HEMM - preforming some tests : not all tests 
-	./do_test_hemm 7 1 1.0 0 $(DO_SOME_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_SOME_TESTS) > hemm.results
 
 test-all: do_test_hemm
 	@echo Testing HEMM Very Thoroughly
-	./do_test_hemm 7 1 1.0 0 $(DO_ALL_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_ALL_TESTS) > hemm.results
 
 test-none: do_test_hemm
 	@echo NOT Testing HEMM - PREFORMING NO TESTS. NOT TESTING
-	./do_test_hemm 7 1 1.0 0 $(DO_NO_TESTS) > hemm.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemm 7 1 1.0 0 $(DO_NO_TESTS) > hemm.results
 
 do_test_hemm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemm $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-hemv2/Makefile.shared xblas/testing/test-hemv2/Makefile
--- xblas/testing/test-hemv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -34,10 +34,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemv2
 	@echo Testing HEMV2 - default test
-	./do_test_hemv2 7 1 1.0 0 0.1 > hemv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemv2 7 1 1.0 0 0.1 > hemv2.results
 
 do_test_hemv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-hemv/Makefile.shared xblas/testing/test-hemv/Makefile
--- xblas/testing/test-hemv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hemv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -27,10 +27,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hemv
 	@echo Testing HEMV
-	./do_test_hemv 7 1 1.0 3 0.01 > hemv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hemv 7 1 1.0 3 0.01 > hemv.results
 
 do_test_hemv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hemv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-hpmv/Makefile.shared xblas/testing/test-hpmv/Makefile
--- xblas/testing/test-hpmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-hpmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -31,10 +31,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_hpmv
 	@echo Testing HPMV
-	./do_test_hpmv 7 1 1.0 3 0.01 > hpmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_hpmv 7 1 1.0 3 0.01 > hpmv.results
 
 do_test_hpmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_hpmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-sbmv/Makefile.shared xblas/testing/test-sbmv/Makefile
--- xblas/testing/test-sbmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-sbmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,26 +29,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_sbmv
 	@echo Testing SBMV - default quick test
-	./do_test_sbmv 7 1 1.0 3 0.001 > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 0.001 > sbmv.results
 
 test-few: do_test_sbmv
 	@echo Testing SBMV - preforming a small set of tests
-	./do_test_sbmv 7 1 1.0 3 $(DO_FEW_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_FEW_TESTS) > sbmv.results
 
 test-some: do_test_sbmv
 	@echo Testing SBMV - preforming some tests : not all tests 
-	./do_test_sbmv 7 1 1.0 3 $(DO_SOME_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_SOME_TESTS) > sbmv.results
 
 test-all: do_test_sbmv
 	@echo Testing SBMV Very Thoroughly
-	./do_test_sbmv 7 1 1.0 3 $(DO_ALL_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_ALL_TESTS) > sbmv.results
 
 test-none: do_test_sbmv
 	@echo NOT Testing SBMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_sbmv 7 1 1.0 3 $(DO_NO_TESTS) > sbmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_sbmv 7 1 1.0 3 $(DO_NO_TESTS) > sbmv.results
 
 do_test_sbmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_sbmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-spmv/Makefile.shared xblas/testing/test-spmv/Makefile
--- xblas/testing/test-spmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-spmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -27,26 +27,26 @@ ALL_OBJS =  $(TEST_OBJS) $(TEST_DOT_OBJS
 
 test: do_test_spmv
 	@echo Testing SPMV - default quick test
-	./do_test_spmv 7 1 1.0 3 0.01 > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 0.01 > spmv.results
 
 test-few: do_test_spmv
 	@echo Testing SPMV - preforming a small set of tests
-	./do_test_spmv 7 1 1.0 3 $(DO_FEW_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_FEW_TESTS) > spmv.results
 
 test-some: do_test_spmv
 	@echo Testing SPMV - preforming some tests : not all tests 
-	./do_test_spmv 7 1 1.0 3 $(DO_SOME_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_SOME_TESTS) > spmv.results
 
 test-all: do_test_spmv
 	@echo Testing SPMV Very Thoroughly
-	./do_test_spmv 7 1 1.0 3 $(DO_ALL_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_ALL_TESTS) > spmv.results
 
 test-none: do_test_spmv
 	@echo NOT Testing SPMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_spmv 7 1 1.0 3 $(DO_NO_TESTS) > spmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_spmv 7 1 1.0 3 $(DO_NO_TESTS) > spmv.results
 
 do_test_spmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_spmv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-sum/Makefile.shared xblas/testing/test-sum/Makefile
--- xblas/testing/test-sum/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-sum/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -25,10 +25,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_sum
 	@echo Testing SUM
-	./do_test_sum 20 1 1.0 0 1.0 > sum.results
+	LD_LIBRARY_PATH="../.." ./do_test_sum 20 1 1.0 0 1.0 > sum.results
 
 do_test_sum: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_sum $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-symm/Makefile.shared xblas/testing/test-symm/Makefile
--- xblas/testing/test-symm/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symm/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -28,26 +28,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symm
 	@echo Testing SYMM - default quick test
-	./do_test_symm 7 1 1.0 3 0.001 > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 0.001 > symm.results
 
 test-few: do_test_symm
 	@echo Testing SYMM - preforming a small set of tests
-	./do_test_symm 7 1 1.0 3 $(DO_FEW_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_FEW_TESTS) > symm.results
 
 test-some: do_test_symm
 	@echo Testing SYMM - preforming some tests : not all tests 
-	./do_test_symm 7 1 1.0 3 $(DO_SOME_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_SOME_TESTS) > symm.results
 
 test-all: do_test_symm
 	@echo Testing SYMM Very Thoroughly
-	./do_test_symm 7 1 1.0 3 $(DO_ALL_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_ALL_TESTS) > symm.results
 
 test-none: do_test_symm
 	@echo NOT Testing SYMM - PREFORMING NO TESTS. NOT TESTING
-	./do_test_symm 7 1 1.0 3 $(DO_NO_TESTS) > symm.results
+	LD_LIBRARY_PATH="../.." ./do_test_symm 7 1 1.0 3 $(DO_NO_TESTS) > symm.results
 
 do_test_symm: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symm $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-symv2/Makefile.shared xblas/testing/test-symv2/Makefile
--- xblas/testing/test-symv2/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symv2/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -29,10 +29,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symv2
 	@echo Testing SYMV2 - default quick test
-	./do_test_symv2 7 1 1.0 0 0.1 > symv2.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv2 7 1 1.0 0 0.1 > symv2.results
 
 do_test_symv2: $(LIB_PATH)/$(XBLASLIB) $(ALL_OBJS)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symv2 $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-symv/Makefile.shared xblas/testing/test-symv/Makefile
--- xblas/testing/test-symv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-symv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -25,26 +25,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_symv
 	@echo Testing SYMV - default quick test
-	./do_test_symv 7 1 1.0 3 0.01 > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 0.01 > symv.results
 
 test-few: do_test_symv
 	@echo Testing SYMV - preforming a small set of tests
-	./do_test_symv 7 1 1.0 3 $(DO_FEW_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_FEW_TESTS) > symv.results
 
 test-some: do_test_symv
 	@echo Testing SYMV - preforming some tests : not all tests 
-	./do_test_symv 7 1 1.0 3 $(DO_SOME_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_SOME_TESTS) > symv.results
 
 test-all: do_test_symv
 	@echo Testing SYMV Very Thoroughly
-	./do_test_symv 7 1 1.0 3 $(DO_ALL_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_ALL_TESTS) > symv.results
 
 test-none: do_test_symv
 	@echo NOT Testing SYMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_symv 7 1 1.0 3 $(DO_NO_TESTS) > symv.results
+	LD_LIBRARY_PATH="../.." ./do_test_symv 7 1 1.0 3 $(DO_NO_TESTS) > symv.results
 
 do_test_symv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_symv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-tbsv/Makefile.shared xblas/testing/test-tbsv/Makefile
--- xblas/testing/test-tbsv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-tbsv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -31,26 +31,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_tbsv
 	@echo Testing TBSV - default quick test
-	./do_test_tbsv 9 1 1.0 3 0.01 > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 0.01 > tbsv.results
 
 test-few: do_test_tbsv
 	@echo Testing TBSV - preforming a small set of tests
-	./do_test_tbsv 9 1 1.0 3 $(DO_FEW_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_FEW_TESTS) > tbsv.results
 
 test-some: do_test_tbsv
 	@echo Testing TBSV - preforming some tests : not all tests 
-	./do_test_tbsv 9 1 1.0 3 $(DO_SOME_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_SOME_TESTS) > tbsv.results
 
 test-all: do_test_tbsv
 	@echo Testing TBSV Very Thoroughly
-	./do_test_tbsv 9 1 1.0 3 $(DO_ALL_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_ALL_TESTS) > tbsv.results
 
 test-none: do_test_tbsv
 	@echo NOT Testing TBSV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_tbsv 9 1 1.0 3 $(DO_NO_TESTS) > tbsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tbsv 9 1 1.0 3 $(DO_NO_TESTS) > tbsv.results
 
 do_test_tbsv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_tbsv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-tpmv/Makefile.shared xblas/testing/test-tpmv/Makefile
--- xblas/testing/test-tpmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-tpmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -23,26 +23,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_tpmv
 	@echo Testing TPMV - default quick test
-	./do_test_tpmv 12 1 1.0 0 0.01 > tpmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 0.01 > tpmv.results
 
 test-few: do_test_tpmv
 	@echo Testing TPMV - preforming a small set of tests
-	./do_test_tpmv 12 1 1.0 0 $(DO_FEW_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_FEW_TESTS)
 
 test-some: do_test_tpmv
 	@echo Testing TPMV - preforming some tests : not all tests 
-	./do_test_tpmv 12 1 1.0 3 $(DO_SOME_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 3 $(DO_SOME_TESTS)
 
 test-all: do_test_tpmv
 	@echo Testing TPMV Very Thoroughly
-	./do_test_tpmv 12 1 1.0 0 $(DO_ALL_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_ALL_TESTS)
 
 test-none: do_test_tpmv
 	@echo NOT Testing TPMV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_tpmv 12 1 1.0 0 $(DO_NO_TESTS)
+	LD_LIBRARY_PATH="../.." ./do_test_tpmv 12 1 1.0 0 $(DO_NO_TESTS)
 
 do_test_tpmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_tpmv $(EXTRA_LIBS)
 
 test-lib: $(TEST_OBJS)
diff -up xblas/testing/test-trmv/Makefile.shared xblas/testing/test-trmv/Makefile
--- xblas/testing/test-trmv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-trmv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -24,12 +24,12 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 all: test
 
 do_test_trmv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_trmv $(EXTRA_LIBS)
 
 test: do_test_trmv
 	@echo Testing TRMV
-	./do_test_trmv 12 1 1.0 0 0.01 > trmv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trmv 12 1 1.0 0 0.01 > trmv.results
 
 .c.o:
 	$(CC) $(CFLAGS) $(HEADER_PATH) -c -o $@ $<
diff -up xblas/testing/test-trsv/Makefile.shared xblas/testing/test-trsv/Makefile
--- xblas/testing/test-trsv/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-trsv/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -26,26 +26,26 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_trsv
 	@echo Testing TRSV - default quick test
-	./do_test_trsv 10 1 1.0 3 0.01 > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 3 0.01 > trsv.results
 
 test-few: do_test_trsv
 	@echo Testing TRSV - preforming a small set of tests
-	./do_test_trsv 10 1 1.0 0 $(DO_FEW_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_FEW_TESTS) > trsv.results
 
 test-some: do_test_trsv
 	@echo Testing TRSV - preforming some tests : not all tests 
-	./do_test_trsv 10 1 1.0 0 $(DO_SOME_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_SOME_TESTS) > trsv.results
 
 test-all: do_test_trsv
 	@echo Testing TRSV Very Thoroughly
-	./do_test_trsv 10 1 1.0 0 $(DO_ALL_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_ALL_TESTS) > trsv.results
 
 test-none: do_test_trsv
 	@echo NOT Testing TRSV - PREFORMING NO TESTS. NOT TESTING
-	./do_test_trsv 10 1 1.0 0 $(DO_NO_TESTS) > trsv.results
+	LD_LIBRARY_PATH="../.." ./do_test_trsv 10 1 1.0 0 $(DO_NO_TESTS) > trsv.results
 
 do_test_trsv: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_trsv $(EXTRA_LIBS)
 
 .c.o:
diff -up xblas/testing/test-waxpby/Makefile.shared xblas/testing/test-waxpby/Makefile
--- xblas/testing/test-waxpby/Makefile.shared	2008-11-15 13:58:30.000000000 -0500
+++ xblas/testing/test-waxpby/Makefile	2009-04-20 15:42:16.000000000 -0400
@@ -24,10 +24,10 @@ ALL_OBJS = $(TEST_OBJS) $(TEST_DOT_OBJS)
 
 test: do_test_waxpby
 	@echo Testing WAXPBY
-	./do_test_waxpby 20 1 1.0 0 0.1 > waxpby.results
+	LD_LIBRARY_PATH="../.." ./do_test_waxpby 20 1 1.0 0 0.1 > waxpby.results
 
 do_test_waxpby: $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB)
-	$(LINKER) $(LDFLAGS) $(ALL_OBJS) $(LIB_PATH)/$(XBLASLIB) \
+	$(LINKER) $(LDFLAGS) $(ALL_OBJS) -L$(LIB_PATH) -lxblas \
 	-o do_test_waxpby $(EXTRA_LIBS)
 
 .c.o:


--- NEW FILE xblas.spec ---
Name:		xblas
Version:	1.0.248
Release:	2%{?dist}
Summary:	Extra Precise Basic Linear Algebra Subroutines
Group:		System Environment/Libraries
License:	BSD
URL:		http://www.netlib.org/xblas
Source0:	http://www.netlib.org/%{name}/%{name}-%{version}.tar.gz
Patch0:		xblas-1.0.247-shared.patch
BuildRequires:	gcc-gfortran, autoconf, m4, indent

%description
The XBLAS library of routines is part of a reference implementation for 
the Dense and Banded Basic Linear Algebra Subroutines, along with their 
Extended and Mixed Precision versions, as documented in Chapters 2 and 4 
of the new BLAS Standard.

%package devel
Summary:	Development files for xblas
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Headers and libraries for developing code that uses xblas.

%prep
%setup -q
%patch0 -p1 -b .shared
autoconf

%build
%configure
make makefiles
# smp_mflags doesn't work
make lib

%install
mkdir -p %{buildroot}%{_libdir}
install -m0755 libxblas.so.1.0.0 %{buildroot}%{_libdir}
pushd %{buildroot}%{_libdir}
ln -s libxblas.so.1.0.0 libxblas.so.1
ln -s libxblas.so.1.0.0 libxblas.so
popd
mkdir -p %{buildroot}%{_includedir}
install -m0644 src/*.h %{buildroot}%{_includedir}

%check
make tests

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc LICENSE doc/report.ps
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{_includedir}/*.h

%changelog
* Fri Aug 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.248-2
- drop README.devel, move README to -devel
- don't bother deleting buildroot at the beginning of install
- no need to define BuildRoot anymore

* Thu Apr 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.248-1
- update to 1.0.248

* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.247-1
- initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xblas/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 15:55:20 -0000	1.1
+++ sources	21 Aug 2009 16:00:02 -0000	1.2
@@ -0,0 +1 @@
+990c680fb5e446bb86c10936e4cd7f88  xblas-1.0.248.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 16:01:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:01:09 +0000 (UTC)
Subject: rpms/stunnel/devel stunnel.spec,1.60,1.61
Message-ID: <20090821160109.6669411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18391

Modified Files:
	stunnel.spec 
Log Message:
- rebuilt with new openssl


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- stunnel.spec	27 Jul 2009 04:56:13 -0000	1.60
+++ stunnel.spec	21 Aug 2009 16:01:09 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Version: 4.27
-Release: 4
+Release: 5
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.27-5
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.27-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:02:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:02:00 +0000 (UTC)
Subject: rpms/suck/devel suck.spec,1.23,1.24
Message-ID: <20090821160200.D449011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/suck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19186

Modified Files:
	suck.spec 
Log Message:
- rebuilt with new openssl


Index: suck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suck/devel/suck.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- suck.spec	12 Aug 2009 14:08:02 -0000	1.23
+++ suck.spec	21 Aug 2009 16:02:00 -0000	1.24
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 27%{?dist}
+Release: 28%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/news/suck.d/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.3.2-28
+- rebuilt with new openssl
+
 * Wed Aug 12 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-27
 - Rebuild for new openssl release
 



From tmraz at fedoraproject.org  Fri Aug 21 16:02:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:02:45 +0000 (UTC)
Subject: rpms/sylpheed/devel sylpheed.spec,1.103,1.104
Message-ID: <20090821160245.65C0B11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19404

Modified Files:
	sylpheed.spec 
Log Message:
- rebuilt with new openssl


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sylpheed.spec	14 Aug 2009 01:26:55 -0000	1.103
+++ sylpheed.spec	21 Aug 2009 16:02:45 -0000	1.104
@@ -7,7 +7,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.1-2
+- rebuilt with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.7.1-1
 - new version 2.7.1
 



From tmraz at fedoraproject.org  Fri Aug 21 16:03:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:03:21 +0000 (UTC)
Subject: rpms/sysbench/devel sysbench.spec,1.4,1.5
Message-ID: <20090821160321.089D211C0349@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sysbench/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19561

Modified Files:
	sysbench.spec 
Log Message:
- rebuilt with new openssl


Index: sysbench.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysbench/devel/sysbench.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sysbench.spec	27 Jul 2009 05:18:55 -0000	1.4
+++ sysbench.spec	21 Aug 2009 16:03:20 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:       System performance benchmark
 Name:          sysbench
 Version:       0.4.10
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.10-5
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:03:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:03:55 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.11,1.12
Message-ID: <20090821160355.5722911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19733

Modified Files:
	tabled.spec 
Log Message:
- rebuilt with new openssl


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- tabled.spec	15 Aug 2009 15:08:01 -0000	1.11
+++ tabled.spec	21 Aug 2009 16:03:55 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -105,6 +105,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-2
+- rebuilt with new openssl
+
 * Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-1
 - update to release version 0.3
 



From tmraz at fedoraproject.org  Fri Aug 21 16:04:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:04:37 +0000 (UTC)
Subject: rpms/tcltls/devel tcltls.spec,1.12,1.13
Message-ID: <20090821160437.8998A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tcltls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19892

Modified Files:
	tcltls.spec 
Log Message:
- rebuilt with new openssl


Index: tcltls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcltls/devel/tcltls.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tcltls.spec	27 Jul 2009 05:38:44 -0000	1.12
+++ tcltls.spec	21 Aug 2009 16:04:37 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           tcltls
 Version:        1.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        OpenSSL extension for Tcl
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/tls.h
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6-6
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:05:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:05:29 +0000 (UTC)
Subject: rpms/tcpdump/devel tcpdump.spec,1.76,1.77
Message-ID: <20090821160529.0C64A11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20086

Modified Files:
	tcpdump.spec 
Log Message:
- rebuilt with new openssl


Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- tcpdump.spec	20 Aug 2009 15:11:12 -0000	1.76
+++ tcpdump.spec	21 Aug 2009 16:05:28 -0000	1.77
@@ -2,7 +2,7 @@ Summary: A network traffic monitoring to
 Name: tcpdump
 Epoch: 14
 Version: 4.0.0
-Release: 1.20090818git832d2c%{?dist}
+Release: 2.20090818git832d2c%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -96,6 +96,9 @@ exit 0
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 14:4.0.0-2.20090818git832d2c
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Miroslav Lichvar <mlichvar at redhat.com> - 14:4.0.0-1.20090818git832d2c
 - update to post 4.0.0 git snapshot 20090818git832d2c
 - print retrans and reachable times in ICMPv6 as milliseconds (#474264)



From tmraz at fedoraproject.org  Fri Aug 21 16:06:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:06:03 +0000 (UTC)
Subject: rpms/tcpjunk/devel tcpjunk.spec,1.7,1.8
Message-ID: <20090821160603.899ED11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tcpjunk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20237

Modified Files:
	tcpjunk.spec 
Log Message:
- rebuilt with new openssl


Index: tcpjunk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpjunk/devel/tcpjunk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tcpjunk.spec	27 Jul 2009 05:40:14 -0000	1.7
+++ tcpjunk.spec	21 Aug 2009 16:06:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           tcpjunk
 Version:        2.7.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        TCP protocols testing tool
 
 Group:          Applications/Internet
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.01-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:06:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:06:39 +0000 (UTC)
Subject: rpms/telepathy-idle/devel telepathy-idle.spec,1.12,1.13
Message-ID: <20090821160639.938F411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/telepathy-idle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20383

Modified Files:
	telepathy-idle.spec 
Log Message:
- rebuilt with new openssl


Index: telepathy-idle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-idle/devel/telepathy-idle.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- telepathy-idle.spec	27 Jul 2009 05:44:31 -0000	1.12
+++ telepathy-idle.spec	21 Aug 2009 16:06:39 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           telepathy-idle
 Version:        0.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        IRC connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.4-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:07:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:07:16 +0000 (UTC)
Subject: rpms/telepathy-salut/devel telepathy-salut.spec,1.28,1.29
Message-ID: <20090821160716.714D411C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/telepathy-salut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20568

Modified Files:
	telepathy-salut.spec 
Log Message:
- rebuilt with new openssl


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/telepathy-salut.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- telepathy-salut.spec	27 Jul 2009 05:44:53 -0000	1.28
+++ telepathy-salut.spec	21 Aug 2009 16:07:16 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.9-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:07:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:07:53 +0000 (UTC)
Subject: rpms/testdisk/devel testdisk.spec,1.29,1.30
Message-ID: <20090821160753.C547111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/testdisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20758

Modified Files:
	testdisk.spec 
Log Message:
- rebuilt with new openssl


Index: testdisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- testdisk.spec	27 Jul 2009 05:48:07 -0000	1.29
+++ testdisk.spec	21 Aug 2009 16:07:53 -0000	1.30
@@ -4,7 +4,7 @@ Summary(fr.UTF8):	Outil pour v?rifier e
 Summary(ru_RU.UTF8): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.11
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.11-6
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:08:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:08:33 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.16,1.17
Message-ID: <20090821160833.1A0C611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20959

Modified Files:
	tigervnc.spec 
Log Message:
- rebuilt with new openssl


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tigervnc.spec	4 Aug 2009 11:15:40 -0000	1.16
+++ tigervnc.spec	21 Aug 2009 16:08:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.91
-Release:	0.15%{?dist}
+Release:	0.16%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -246,6 +246,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.0.91-0.16
+- rebuilt with new openssl
+
 * Tue Aug 04 2009 Adam Tkac <atkac redhat com> 0.0.91-0.15
 - make Xvnc compilable
 



From tmraz at fedoraproject.org  Fri Aug 21 16:09:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:09:09 +0000 (UTC)
Subject: rpms/tinyfugue/devel tinyfugue.spec,1.12,1.13
Message-ID: <20090821160909.133E811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tinyfugue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21116

Modified Files:
	tinyfugue.spec 
Log Message:
- rebuilt with new openssl


Index: tinyfugue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyfugue/devel/tinyfugue.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tinyfugue.spec	27 Jul 2009 05:59:06 -0000	1.12
+++ tinyfugue.spec	21 Aug 2009 16:09:08 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:    tinyfugue
 Version: 5.0
-Release: 0.12.b8%{?dist}
+Release: 0.13.b8%{?dist}
 Summary: A MU* client
 
 Group:   Applications/Internet
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/tf.1*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0-0.13.b8
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-0.12.b8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:09:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:09:52 +0000 (UTC)
Subject: rpms/tn5250/devel tn5250.spec,1.38,1.39
Message-ID: <20090821160952.AD19811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tn5250/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21314

Modified Files:
	tn5250.spec 
Log Message:
- rebuilt with new openssl


Index: tn5250.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- tn5250.spec	27 Jul 2009 06:03:53 -0000	1.38
+++ tn5250.spec	21 Aug 2009 16:09:52 -0000	1.39
@@ -1,7 +1,7 @@
 Summary:   5250 Telnet protocol and Terminal
 Name:      tn5250
 Version:   0.17.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   LGPLv2+
 Group:     Applications/Internet
 Source:    http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -100,6 +100,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.17.4-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:11:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:11:06 +0000 (UTC)
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.74,1.75
Message-ID: <20090821161106.2DF7711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21564

Modified Files:
	tog-pegasus.spec 
Log Message:
- rebuilt with new openssl


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- tog-pegasus.spec	19 Aug 2009 14:59:26 -0000	1.74
+++ tog-pegasus.spec	21 Aug 2009 16:11:05 -0000	1.75
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.9.0
-Release: 		4%{?dist}
+Release: 		5%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -461,6 +461,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-5
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.9.0-4
 - Fix Source (but I'm afraid it's not very persistent and it will
   not work again after some time)



From tmraz at fedoraproject.org  Fri Aug 21 16:11:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:11:41 +0000 (UTC)
Subject: rpms/tomcat-native/devel tomcat-native.spec,1.15,1.16
Message-ID: <20090821161141.5D57F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21733

Modified Files:
	tomcat-native.spec 
Log Message:
- rebuilt with new openssl


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tomcat-native.spec	27 Jul 2009 06:05:08 -0000	1.15
+++ tomcat-native.spec	21 Aug 2009 16:11:41 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           tomcat-native
 Version:        1.1.16
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-5
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:12:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:12:23 +0000 (UTC)
Subject: rpms/tor/devel tor.spec,1.35,1.36
Message-ID: <20090821161223.968B011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21909

Modified Files:
	tor.spec 
Log Message:
- rebuilt with new openssl


Index: tor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tor/devel/tor.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- tor.spec	9 Aug 2009 20:44:18 -0000	1.35
+++ tor.spec	21 Aug 2009 16:12:23 -0000	1.36
@@ -13,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.1.19
-Release:	%release_func 0
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -234,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.1.19-1
+- rebuilt with new openssl
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.19-0
 - updated to 0.2.1.19
 - rediffed patches



From tmraz at fedoraproject.org  Fri Aug 21 16:13:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:13:05 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.249,1.250
Message-ID: <20090821161305.DD4E511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22073

Modified Files:
	totem.spec 
Log Message:
- rebuilt with new openssl


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- totem.spec	11 Aug 2009 21:48:06 -0000	1.249
+++ totem.spec	21 Aug 2009 16:13:05 -0000	1.250
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -376,6 +376,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-5
+- rebuilt with new openssl
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
 - Fix source URL
 



From tmraz at fedoraproject.org  Fri Aug 21 16:13:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:13:41 +0000 (UTC)
Subject: rpms/tpm-tools/devel tpm-tools.spec,1.8,1.9
Message-ID: <20090821161341.77AF111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tpm-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22214

Modified Files:
	tpm-tools.spec 
Log Message:
- rebuilt with new openssl


Index: tpm-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/tpm-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tpm-tools.spec	7 Aug 2009 14:06:03 -0000	1.8
+++ tpm-tools.spec	21 Aug 2009 16:13:41 -0000	1.9
@@ -1,7 +1,7 @@
 %global name            tpm-tools
 %global version         1.3.3
 %global tarballrev      -1
-%global release         1
+%global release         2
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.3-2
+- rebuilt with new openssl
+
 * Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.3-1
 - New upstream release 1.3.3.
 - No longer needed patch, dropped:



From tmraz at fedoraproject.org  Fri Aug 21 16:14:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:14:15 +0000 (UTC)
Subject: rpms/tqsllib/devel tqsllib.spec,1.5,1.6
Message-ID: <20090821161415.BEB6F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tqsllib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22357

Modified Files:
	tqsllib.spec 
Log Message:
- rebuilt with new openssl


Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tqsllib.spec	27 Jul 2009 06:09:54 -0000	1.5
+++ tqsllib.spec	21 Aug 2009 16:14:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name: tqsllib
 Version: 2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: The TrustedQSL library
 Group: Development/Libraries
 License: BSD
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:14:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:14:52 +0000 (UTC)
Subject: rpms/transmission/devel transmission.spec,1.41,1.42
Message-ID: <20090821161452.A858711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22524

Modified Files:
	transmission.spec 
Log Message:
- rebuilt with new openssl


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- transmission.spec	27 Jul 2009 06:14:55 -0000	1.41
+++ transmission.spec	21 Aug 2009 16:14:52 -0000	1.42
@@ -1,7 +1,7 @@
 
 Name:           transmission
 Version:        1.73
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -73,6 +73,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.73-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.73-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:16:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:16:04 +0000 (UTC)
Subject: rpms/tripwire/devel tripwire.spec,1.20,1.21
Message-ID: <20090821161604.C7BFF11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tripwire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22786

Modified Files:
	tripwire.spec 
Log Message:
- rebuilt with new openssl


Index: tripwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/devel/tripwire.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- tripwire.spec	27 Jul 2009 06:17:26 -0000	1.20
+++ tripwire.spec	21 Aug 2009 16:16:04 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:		tripwire
 Version:	2.4.1.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	IDS (Intrusion Detection System)
 
 License:	GPLv2+
@@ -146,6 +146,9 @@ done
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.1.2-11
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:16:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:16:42 +0000 (UTC)
Subject: rpms/trousers/devel trousers.spec,1.17,1.18
Message-ID: <20090821161642.AFF8511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/trousers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23001

Modified Files:
	trousers.spec 
Log Message:
- rebuilt with new openssl


Index: trousers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trousers/devel/trousers.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- trousers.spec	27 Jul 2009 06:18:09 -0000	1.17
+++ trousers.spec	21 Aug 2009 16:16:42 -0000	1.18
@@ -1,7 +1,7 @@
 Name:				trousers
 Summary:			TCG's Software Stack v1.2 
 Version:			0.3.1
-Release:			18%{?dist}
+Release:			19%{?dist}
 License:			CPL
 Group:				System Environment/Libraries
 Source0:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -126,6 +126,9 @@ fi
 %{_libdir}/libtddl.a
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.1-19
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:17:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:17:16 +0000 (UTC)
Subject: rpms/uberftp/devel uberftp.spec,1.1,1.2
Message-ID: <20090821161716.4ACCE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/uberftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23205

Modified Files:
	uberftp.spec 
Log Message:
- rebuilt with new openssl


Index: uberftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uberftp/devel/uberftp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- uberftp.spec	30 Jul 2009 07:13:46 -0000	1.1
+++ uberftp.spec	21 Aug 2009 16:17:16 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name:           uberftp
 Version:        2.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GridFTP-enabled ftp client
 
 Group:          Applications/Internet
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog.mssftp Changelog copyright
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4-5
+- rebuilt with new openssl
+
 * Wed Jul 22 2009 Steve Traylen <steve.traylen at cern.ch> 2.4-4
 - Update source to version 2.4
 - Include copyright file in package.



From tmraz at fedoraproject.org  Fri Aug 21 16:17:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:17:56 +0000 (UTC)
Subject: rpms/ulogd/devel ulogd.spec,1.25,1.26
Message-ID: <20090821161756.7ED9F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ulogd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23370

Modified Files:
	ulogd.spec 
Log Message:
- rebuilt with new openssl


Index: ulogd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ulogd.spec	27 Jul 2009 06:29:41 -0000	1.25
+++ ulogd.spec	21 Aug 2009 16:17:56 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.24
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        The userspace logging daemon for netfilter
 License:        GPLv2
 Group:          System Environment/Daemons
@@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ulogd/ulogd_PCAP.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.24-13
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From gerd at fedoraproject.org  Fri Aug 21 16:18:03 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Fri, 21 Aug 2009 16:18:03 +0000 (UTC)
Subject: rpms/parrot/devel patch-1.5.0.ppc, NONE, 1.1 .cvsignore, 1.6,
	1.7 import.log, 1.11, 1.12 parrot.spec, 1.14, 1.15 sources, 1.6, 1.7
Message-ID: <20090821161803.2EB5C11C00D7@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23188/devel

Modified Files:
	.cvsignore import.log parrot.spec sources 
Added Files:
	patch-1.5.0.ppc 
Log Message:
update to 1.5.0; adding man-pages



--- NEW FILE patch-1.5.0.ppc ---
--- ChangeLog	2009-08-18 15:29:26.000000000 +0200
+++ ChangeLog	2009-08-20 19:56:36.000000000 +0200
@@ -1,4 +1,4 @@
-#1 $Id: ChangeLog 40184 2009-07-21 08:08:33Z cotto $
+#1 $Id: ChangeLog 40625 2009-08-18 16:10:36Z whiteknight $
 
 2009.8.18     Whiteknight
     * Released 1.5.0
@@ -3817,9 +3817,9 @@
 2002-01-04 16:09  dan
 
 	* classes/: genclass.pl, perlarray.pmc, perlint.pmc, perlnum.pmc,
-	perlstring.pmc, perlundef.pmc:	- genclass.pl attempts to put $Id: ChangeLog 40184 2009-07-21 08:08:33Z cotto $
+	perlstring.pmc, perlundef.pmc:	- genclass.pl attempts to put $Id: ChangeLog 40625 2009-08-18 16:10:36Z whiteknight $
 	into generated files
-	   but the $Id: ChangeLog 40184 2009-07-21 08:08:33Z cotto $ string gets mangled when it's committed.
+	   but the $Id: ChangeLog 40625 2009-08-18 16:10:36Z whiteknight $ string gets mangled when it's committed.
 	   This patch fixes the existing .pmc files and fixes genclass.pl.
 
 	 - Makes capitalization in .pmc header match actual filenames
--- compilers/imcc/parser_util.c	2009-08-02 14:36:27.000000000 +0200
+++ compilers/imcc/parser_util.c	2009-08-20 19:56:29.000000000 +0200
@@ -8,7 +8,7 @@
  *
  * parser support functions
  *
- * $Id: parser_util.c 40268 2009-07-25 19:53:04Z whiteknight $
+ * $Id: parser_util.c 40643 2009-08-18 22:57:11Z bacek $
  *
  */
 
@@ -693,7 +693,7 @@
     IMCC_pop_parser_state(interp, yyscanner);
 
     if (!IMCC_INFO(interp)->error_code) {
-        Parrot_sub *sub_data;
+        Parrot_Sub_attributes *sub_data;
 
         /*
          * create sub PMC
--- compilers/imcc/pbc.c	2009-08-07 02:50:19.000000000 +0200
+++ compilers/imcc/pbc.c	2009-08-20 19:56:28.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002-2009, Parrot Foundation.
- * $Id: pbc.c 40414 2009-08-05 11:29:16Z bacek $
+ * $Id: pbc.c 40643 2009-08-18 22:57:11Z bacek $
  */
 
 #include "imc.h"
@@ -1205,7 +1205,7 @@
                 while (n) {
                     STRING     *lex_name;
                     const int   k = n->color;
-                    Parrot_sub *sub;
+                    Parrot_Sub_attributes *sub;
                     PARROT_ASSERT(k >= 0);
 
                     lex_name = constants[k]->u.string;
@@ -1255,7 +1255,7 @@
     subs_t      *s;
     PMC         *current;
     STRING      *cur_name;
-    Parrot_sub *sub;
+    Parrot_Sub_attributes *sub;
     size_t      len;
 
     if (!unit->outer)
@@ -1320,9 +1320,9 @@
 add_const_pmc_sub(PARROT_INTERP, ARGMOD(SymReg *r), size_t offs, size_t end)
 {
     ASSERT_ARGS(add_const_pmc_sub)
-    PMC                 *ns_pmc;
-    PMC                 *sub_pmc;
-    Parrot_sub          *sub, *outer_sub;
+    PMC                   *ns_pmc;
+    PMC                   *sub_pmc;
+    Parrot_Sub_attributes *sub, *outer_sub;
 
     const int            k            = add_const_table(interp);
     PackFile_ConstTable * const ct    = interp->code->const_table;
--- compilers/pirc/src/bcgen.c	2009-08-02 14:36:27.000000000 +0200
+++ compilers/pirc/src/bcgen.c	2009-08-20 19:56:29.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: bcgen.c 38095 2009-04-13 14:20:12Z coke $
+ * $Id: bcgen.c 40676 2009-08-20 15:11:44Z fperrad $
  * Copyright (C) 2008-2009, Parrot Foundation.
  */
 #include <stdio.h>
@@ -910,7 +910,7 @@
 {
     ASSERT_ARGS(find_outer_sub)
     PMC          *current;
-    Parrot_sub   *sub;
+    Parrot_Sub_attributes *sub;
     STRING       *cur_name;
     size_t        len;
     global_label *outersub;
@@ -1131,7 +1131,7 @@
 {
     ASSERT_ARGS(add_sub_pmc)
     PMC                   *sub_pmc;        /* the "Sub" pmc, or a variant, such as "Coroutine" */
-    Parrot_sub            *sub;
+    Parrot_Sub_attributes *sub;
     int                    subconst_index; /* index in const table for the sub pmc */
     int                    subname_index;
     int                    i;              /* for loop iterator */
--- config/gen/core_pmcs.pm	2009-07-08 02:19:09.000000000 +0200
+++ config/gen/core_pmcs.pm	2009-08-20 19:56:31.000000000 +0200
@@ -1,5 +1,5 @@
 # Copyright (C) 2001-2009, Parrot Foundation.
-# $Id: core_pmcs.pm 38777 2009-05-14 19:43:11Z petdance $
+# $Id: core_pmcs.pm 40651 2009-08-19 08:55:58Z NotFound $
 
 =head1 NAME
 
@@ -116,26 +116,20 @@
     __attribute__nonnull__(1)
     __attribute__nonnull__(2);
 
-extern void Parrot_initialize_core_pmcs(PARROT_INTERP)
+extern void Parrot_initialize_core_pmcs(PARROT_INTERP, int pass)
     __attribute__nonnull__(1);
 
-void Parrot_initialize_core_pmcs(PARROT_INTERP)
+void Parrot_initialize_core_pmcs(PARROT_INTERP, int pass)
 {
-    int pass;
-    for (pass = 0; pass <= 1; ++pass) {
-        /* first the PMC with the highest enum
-         * this reduces MMD table resize action */
+    /* first the PMC with the highest enum
+     * this reduces MMD table resize action */
 END_C
 
-    print {$OUT} "        Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
+    print {$OUT} "    Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
         foreach ( @pmcs[ -1 .. -1 ] );
-    print {$OUT} "        Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
+    print {$OUT} "    Parrot_${_}_class_init(interp, enum_class_${_}, pass);\n"
         foreach ( @pmcs[ 0 .. $#pmcs - 1 ] );
     print {$OUT} <<'END_C';
-        if (!pass) {
-            parrot_global_setup_2(interp);
-        }
-    }
 }
 
 static void register_pmc(PARROT_INTERP, NOTNULL(PMC *registry), int pmc_id)
--- config/gen/platform/generic/platform_limits.h	2009-07-22 02:33:43.000000000 +0200
+++ config/gen/platform/generic/platform_limits.h	2009-08-20 19:56:31.000000000 +0200
@@ -1,6 +1,6 @@
 /*
- * $Id: platform_limits.h 40176 2009-07-21 00:33:45Z whiteknight $
- * Copyright (C) 2008, Parrot Foundation.
+ * $Id: platform_limits.h 40634 2009-08-18 21:23:45Z mikehh $
+ * Copyright (C) 2009, Parrot Foundation.
  */
 
 #ifndef PARROT_PLATFORM_GENERIC_PLATFORM_LIMITS_GUARD
@@ -14,6 +14,11 @@
 
 /* LLONG_MAX doesn't appear to be provided for some compilers of Win64, so
    try to define them here. */
+#include "parrot/has_header.h"
+#if PARROT_HAS_HEADER_LIMITS
+#  include <limits.h>
+#endif
+
 #ifdef _MSC_VER
 #  ifndef LLONG_MAX
 #    define LLONG_MAX _I64_MAX
--- config/init/defaults.pm	2009-07-28 14:52:00.000000000 +0200
+++ config/init/defaults.pm	2009-08-20 19:56:30.000000000 +0200
@@ -1,5 +1,5 @@
 # Copyright (C) 2001-2007, Parrot Foundation.
-# $Id: defaults.pm 40296 2009-07-28 03:24:55Z chromatic $
+# $Id: defaults.pm 40635 2009-08-18 21:34:54Z chromatic $
 
 =head1 NAME
 
--- CREDITS	2009-08-18 15:29:26.000000000 +0200
+++ CREDITS	2009-08-20 19:56:36.000000000 +0200
@@ -1,6 +1,6 @@
 =pod
 
-?# $Id: CREDITS 40495 2009-08-11 22:19:23Z mikehh $
+?# $Id: CREDITS 40625 2009-08-18 16:10:36Z whiteknight $
 
     Following in the steps of other open source projects that
     eventually take over the world, here is the partial list
--- DEPRECATED.pod	2009-08-15 15:06:27.000000000 +0200
+++ DEPRECATED.pod	2009-08-20 19:56:36.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: DEPRECATED.pod 40557 2009-08-15 10:41:06Z dukeleto $
+# $Id: DEPRECATED.pod 40621 2009-08-18 14:30:59Z coke $
 
 =head1 Purpose
[...4592 lines suppressed...]
+
+*/
+
+PARROT_EXPORT
+void
+Parrot_initialize_core_vtables(PARROT_INTERP)
+{
+    ASSERT_ARGS(Parrot_initialize_core_vtables)
+
+    if (! interp->vtables) {
+        parrot_alloc_vtables(interp);
+        Parrot_initialize_core_pmcs(interp, 0);
+    }
+}
+
+/*
  * Local variables:
  *   c-file-style: "parrot"
  * End:
Bin?rdateien t/native_pbc/annotations.pbc and t/native_pbc/annotations.pbc sind verschieden.
Bin?rdateien t/native_pbc/integer_1.pbc and t/native_pbc/integer_1.pbc sind verschieden.
Bin?rdateien t/native_pbc/number_1.pbc and t/native_pbc/number_1.pbc sind verschieden.
Bin?rdateien t/native_pbc/string_1.pbc and t/native_pbc/string_1.pbc sind verschieden.
--- t/op/arithmetics.t	2009-08-16 13:54:58.000000000 +0200
+++ t/op/arithmetics.t	2009-08-20 19:56:30.000000000 +0200
@@ -1,13 +1,13 @@
 #!perl
 # Copyright (C) 2001-2009, Parrot Foundation.
-# $Id: arithmetics.t 40588 2009-08-16 09:00:17Z dukeleto $
+# $Id: arithmetics.t 40671 2009-08-20 09:17:12Z dukeleto $
 
 use strict;
 use warnings;
 use lib qw( . lib ../lib ../../lib );
 
 use Test::More;
-use Parrot::Test tests => 26;
+use Parrot::Test tests => 27;
 
 # test for GMP
 use Parrot::Config;
@@ -697,6 +697,33 @@
 -Inf
 OUTPUT
 
+TODO: {
+
+local $TODO = 'rounding nan/inf gives something like -2147483648';
+pir_output_is(<<CODE,<<OUTPUT, "TT #370 Rounding inf/nan");
+.sub 'main'
+        \$N0 = 'Inf'
+        \$I0 = floor \$N0
+        say \$I0
+        \$N0 = 'NaN'
+        \$I0 = floor \$N0
+        say \$I0
+        \$N0 = 'Inf'
+        \$I0 = ceil \$N0
+        say \$I0
+        \$N0 = 'NaN'
+        \$I0 = ceil \$N0
+        say \$I0
+    .end
+CODE
+Inf
+NaN
+Inf
+NaN
+OUTPUT
+
+}
+
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4
Nur in t/op: exit.t.
--- tools/dev/nm.pl	2009-07-08 02:19:04.000000000 +0200
+++ tools/dev/nm.pl	2009-06-28 22:26:06.000000000 +0200
@@ -143,7 +143,7 @@
 $VERSION = sprintf "%d.%d", q$Revision: 37201 $ =~ /(\d+)/g;    # jhi at iki.fi;
 
 my $ME       = basename($0);
-my $RCS_DATE = q$Date: 2009-03-08 08:07:48 -0400 (Sun, 08 Mar 2009) $;
+my $RCS_DATE = q$Date: 2009-03-08 13:07:48 +0100 (So, 08. M?r 2009) $;
 
 my $nm_cmd = 'nm';
 my $nm_opt = '';
--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
+++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
@@ -163,7 +163,7 @@
             # libdir as it is typically done with automake installed packages.
             # If there is a use case to make this configurable we'll add a
             # seperate --pkgconfigdir option.
-            $filehash->{DestDirs} = ['pkgconfig', $parrotdir];
+            $filehash->{DestDirs} = ['pkgconfig'];
             return($filehash);
         },
     },
--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
+++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
@@ -7,4 +7,4 @@
 Description: virtual machine to execute bytecode for interpreted languages
 Version: @VERSION@
 Libs: -L${libdir} -lparrot @icu_shared@ @libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}@versiondir@
--- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
+++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
@@ -220,6 +220,16 @@
         else {
             next unless -e $src;
             next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+            if (-l $src) { 
+                # check if the system supports symbolic linking 
+                use Config; 
+                if ($Config{d_symlink} && $Config{d_readlink}) { 
+                # copy as symbolic link 
+                    symlink(readlink($src), $dest); 
+                    print "$dest\n"; 
+                    next; 
+                } 
+            } 
             copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
             print "$dest\n";
         }
--- /dev/null	2009-07-29 14:58:11.425144471 +0200
+++ t/op/exit.t	2009-08-20 19:56:30.000000000 +0200
@@ -0,0 +1,72 @@
+#!perl
+# Copyright (C) 2009, Parrot Foundation.
+# $Id: exit.t 40662 2009-08-19 18:02:12Z mikehh $
+
+use strict;
+use warnings;
+use lib qw( . lib ../lib ../../lib );
+
+use Test::More;
+use Parrot::Test tests => 7;
+
+=head1 NAME
+
+t/op/exit.t - Testing the exit pseudo-opcode
+
+=head1 SYNOPSIS
+
+    % prove t/op/exit.t
+
+=head1 DESCRIPTION
+
+Test both success and failure exit status.
+
+=cut
+
+pir_exit_code_is( <<'CODE', 0, 'pir exit with success' );
+.sub main
+    exit 0
+.end
+CODE
+
+pir_exit_code_is( <<'CODE', 1, 'pir exit with failure' );
+.sub main
+    exit 1
+.end
+CODE
+
+pasm_exit_code_is( <<'CODE', 1, 'pasm exit with failure' );
+    exit 1
+CODE
+
+pasm_exit_code_is( <<'CODE', 0, 'pasm exit without failure' );
+    exit 0
+CODE
+
+# If you know of a better place to put these tests, please put them there
+
+pir_exit_code_is( <<'CODE', 0, 'pir exits with success by default' );
+.sub main
+    $S0 = "cheese"
+.end
+CODE
+
+TODO: {
+    local $TODO = 'pasm exits with 1 by default';
+    pasm_exit_code_is( <<'CODE', 0, 'exit with success by default' );
+        set I0, 0
+CODE
+
+}
+TODO: {
+    local $TODO = 'pbc exits with 1 by default';
+    # Should we be using this file?
+    my $pbc = File::Spec->catfile(qw/ t native_pbc integer_1.pbc /);
+    pbc_exit_code_is($pbc, 0, 'pbc exits with 0 by default');
+}
+
+#   mode: cperl
+#   cperl-indent-level: 4
+#   fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	21 Jul 2009 16:54:33 -0000	1.6
+++ .cvsignore	21 Aug 2009 16:18:02 -0000	1.7
@@ -1 +1 @@
-parrot-1.4.0.tar.gz
+parrot-1.5.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	4 Aug 2009 01:46:01 -0000	1.11
+++ import.log	21 Aug 2009 16:18:02 -0000	1.12
@@ -9,3 +9,4 @@ parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.
 parrot-1_4_0-5_fc11:HEAD:parrot-1.4.0-5.fc11.src.rpm:1249128687
 parrot-1_4_0-6_fc11:HEAD:parrot-1.4.0-6.fc11.src.rpm:1249129173
 parrot-1_4_0-8_fc11:HEAD:parrot-1.4.0-8.fc11.src.rpm:1249350002
+parrot-1_5_0-1_fc11:HEAD:parrot-1.5.0-1.fc11.src.rpm:1250871327


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- parrot.spec	21 Aug 2009 15:14:40 -0000	1.14
+++ parrot.spec	21 Aug 2009 16:18:02 -0000	1.15
@@ -1,14 +1,21 @@
 Name:           parrot
-Version:        1.4.0
-Release:        10%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
 
+Patch1:         patch-1.5.0.ppc
+%ifarch %{ix86} x86_64 ppc64
 Patch0:         parrot-1.x.0.patch
+%else
+# The PowerPC-architecture
+Patch0:         patch-1.5.0.ppc
+%endif
+
 # patches file:           tools/dev/install_files.pl
 # It is responsible to have no subdirectory under pkgconfig.
 #
@@ -92,8 +99,6 @@ Parrot Virtual Machine development files
 %setup -q
 %patch0 -p0
 
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
-
 
 cat << \EOF > %{name}-prov
 #!/bin/sh
@@ -129,7 +134,7 @@ chmod +x %{__perl_provides}
     --yacc=%{_bindir}/yacc \
     --libs='-lcurses -lm'
 
-# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
+# The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 
@@ -143,12 +148,20 @@ make html
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib" 
-export LD_LIBRARY_PATH=$( pwd )/blib/lib
-
-# install-dev: Same as 'install' taget but also install support for development.
+# install-dev: Same as 'install' taget but also install support for 
+#              language development 
 make install-dev DESTDIR=$RPM_BUILD_ROOT
 
+#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}/
 
 
@@ -208,7 +221,7 @@ find examples -wholename 'examples/langu
 
 find examples/languages -type f -name harness \
     -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
-for file in docs/book/draft/ch05_pge.pod docs/memory_internals.pod; do
+for file in docs/book/pct/ch04_pge.pod docs/memory_internals.pod; do
         %{__mv} $file timestamp
         iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
         touch -r timestamp $file
@@ -240,6 +253,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/parrot/%{version}/tools
 %exclude %{_libdir}/parrot/%{version}/VERSION
 %{_libdir}/libparrot.so.*
+%{_mandir}/man1/parrot.1.gz
 
 %files docs
 %defattr(-,root,root,-)
@@ -250,7 +264,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/parrot_config
 %{_bindir}/parrot_debugger
 %{_bindir}/pbc_disassemble
-%{_bindir}/pbc_info
 %{_bindir}/pbc_merge
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
@@ -258,6 +271,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
+%{_mandir}/man1/parrot_config.1.gz
+%{_mandir}/man1/parrot_debugger.1.gz
+%{_mandir}/man1/pbc_disassemble.1.gz
+%{_mandir}/man1/pbc_merge.1.gz
+%{_mandir}/man1/pbc_to_exe.1.gz
+%{_mandir}/man1/pbc_dump.1.gz
 
 %files tools
 %defattr(-,root,root,-)
@@ -268,13 +287,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.0-10
-- rebuilt with new openssl
-
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
 - ppc test included again
-- include the necessary module Parrot::Oplib::core
-- change the place of header files to /usr/include/parrrot/<version>
+- include the necessary module Parrot::OpLib::core
+- change the place of header files to /usr/include/parrot/<version>
 - install the files /usr/src/parrot/*
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jul 2009 16:54:33 -0000	1.6
+++ sources	21 Aug 2009 16:18:03 -0000	1.7
@@ -1 +1 @@
-3f66816c0f2ba18bdd2cf7bedd59f045  parrot-1.4.0.tar.gz
+f209c337b488bfa244520d38502ef330  parrot-1.5.0.tar.gz



From tmraz at fedoraproject.org  Fri Aug 21 16:18:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:18:36 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.32,1.33
Message-ID: <20090821161836.D488711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23619

Modified Files:
	unbound.spec 
Log Message:
- rebuilt with new openssl


Index: unbound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- unbound.spec	17 Aug 2009 15:10:16 -0000	1.32
+++ unbound.spec	21 Aug 2009 16:18:36 -0000	1.33
@@ -9,7 +9,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.3.3
-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
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.3-2
+- rebuilt with new openssl
+
 * Mon Aug 17 2009 Paul Wouters <paul at xelerance.com> - 1.3.3-1
 - Updated to 1.3.3
 



From salimma at fedoraproject.org  Fri Aug 21 16:19:10 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 16:19:10 +0000 (UTC)
Subject: rpms/scheme2js/F-11 scheme2js.spec,1.3,1.4
Message-ID: <20090821161910.C319911C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/scheme2js/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23734/F-11

Modified Files:
	scheme2js.spec 
Log Message:
New build dependency on gc-devel



Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/F-11/scheme2js.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- scheme2js.spec	21 Aug 2009 15:44:00 -0000	1.3
+++ scheme2js.spec	21 Aug 2009 16:19:10 -0000	1.4
@@ -10,7 +10,7 @@ URL:            http://www-sop.inria.fr/
 Source0:        http://www-sop.inria.fr/mimosa/scheme2js/files/scheme2js-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bigloo
+BuildRequires:  bigloo gc-devel
 #Requires:       
 
 ExcludeArch:    ppc64



From salimma at fedoraproject.org  Fri Aug 21 16:19:10 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 16:19:10 +0000 (UTC)
Subject: rpms/scheme2js/F-10 scheme2js.spec,1.3,1.4
Message-ID: <20090821161910.AA10B11C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/scheme2js/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23734/F-10

Modified Files:
	scheme2js.spec 
Log Message:
New build dependency on gc-devel



Index: scheme2js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scheme2js/F-10/scheme2js.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- scheme2js.spec	21 Aug 2009 15:44:00 -0000	1.3
+++ scheme2js.spec	21 Aug 2009 16:19:10 -0000	1.4
@@ -10,7 +10,7 @@ URL:            http://www-sop.inria.fr/
 Source0:        http://www-sop.inria.fr/mimosa/scheme2js/files/scheme2js-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bigloo
+BuildRequires:  bigloo gc-devel
 #Requires:       
 
 ExcludeArch:    ppc64



From tmraz at fedoraproject.org  Fri Aug 21 16:19:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:19:26 +0000 (UTC)
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.17,1.18
Message-ID: <20090821161926.7F48511C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/up-imapproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23851

Modified Files:
	up-imapproxy.spec 
Log Message:
- rebuilt with new openssl


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- up-imapproxy.spec	27 Jul 2009 06:36:08 -0000	1.17
+++ up-imapproxy.spec	21 Aug 2009 16:19:26 -0000	1.18
@@ -1,7 +1,7 @@
 Name:           up-imapproxy
 Summary:        University of Pittsburgh IMAP Proxy
 Version:        1.2.7
-Release:        0.5.rc1%{?dist}
+Release:        0.6.rc1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 URL:            http://www.imapproxy.org
@@ -76,6 +76,9 @@ fi
 %{_sbindir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.7-0.6.rc1
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-0.5.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:20:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:20:38 +0000 (UTC)
Subject: rpms/uw-imap/devel uw-imap.spec,1.63,1.64
Message-ID: <20090821162038.B676111C0417@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24181

Modified Files:
	uw-imap.spec 
Log Message:
- rebuilt with new openssl


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- uw-imap.spec	27 Jul 2009 06:42:10 -0000	1.63
+++ uw-imap.spec	21 Aug 2009 16:20:38 -0000	1.64
@@ -9,7 +9,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -307,6 +307,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2007e-9
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007e-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:21:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:21:21 +0000 (UTC)
Subject: rpms/vidalia/devel vidalia.spec,1.5,1.6
Message-ID: <20090821162121.2273311C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vidalia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24377

Modified Files:
	vidalia.spec 
Log Message:
- rebuilt with new openssl


Index: vidalia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vidalia/devel/vidalia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vidalia.spec	27 Jul 2009 06:51:40 -0000	1.5
+++ vidalia.spec	21 Aug 2009 16:21:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:             vidalia
 Version:          0.1.14
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          GUI controller for the Tor Onion Routing Network
 
 Group:            Applications/Internet
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.14-3
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:21:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:21:58 +0000 (UTC)
Subject: rpms/virtuoso-opensource/devel virtuoso-opensource.spec,1.1,1.2
Message-ID: <20090821162158.38DC911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24562

Modified Files:
	virtuoso-opensource.spec 
Log Message:
- rebuilt with new openssl


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource.spec	26 Jul 2009 20:40:58 -0000	1.1
+++ virtuoso-opensource.spec	21 Aug 2009 16:21:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:	 virtuoso-opensource
 Version: 5.0.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -139,6 +139,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Fri Aug 21 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 tmraz at fedoraproject.org  Fri Aug 21 16:22:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:22:44 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd.spec,1.94,1.95
Message-ID: <20090821162244.9309711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24754

Modified Files:
	vsftpd.spec 
Log Message:
- rebuilt with new openssl


Index: vsftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- vsftpd.spec	4 Aug 2009 06:23:01 -0000	1.94
+++ vsftpd.spec	21 Aug 2009 16:22:44 -0000	1.95
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 0.1.pre4%{?dist}
+Release: 0.2.pre4%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
+- rebuilt with new openssl
+
 * Tue Aug 04 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-0.1.pre4
 - update to latest upstream release
 



From tmraz at fedoraproject.org  Fri Aug 21 16:23:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:23:18 +0000 (UTC)
Subject: rpms/vtun/devel vtun.spec,1.4,1.5
Message-ID: <20090821162318.701AE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vtun/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24918

Modified Files:
	vtun.spec 
Log Message:
- rebuilt with new openssl


Index: vtun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vtun/devel/vtun.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vtun.spec	27 Jul 2009 07:00:12 -0000	1.4
+++ vtun.spec	21 Aug 2009 16:23:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name: vtun
 Version: 3.0.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Virtual tunnel over TCP/IP networks
 License: GPLv2+
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@ fi
 %{_mandir}/man8/vtund.8*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.1-7
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:23:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:23:55 +0000 (UTC)
Subject: rpms/w3c-libwww/devel w3c-libwww.spec,1.15,1.16
Message-ID: <20090821162355.B047911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/w3c-libwww/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25103

Modified Files:
	w3c-libwww.spec 
Log Message:
- rebuilt with new openssl


Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- w3c-libwww.spec	27 Jul 2009 07:00:40 -0000	1.15
+++ w3c-libwww.spec	21 Aug 2009 16:23:55 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.16.20060206cvs%{?dist}
+Release:       0.17.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/w3c-libwww
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.1-0.17.20060206cvs
+- rebuilt with new openssl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.1-0.16.20060206cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:24:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:24:33 +0000 (UTC)
Subject: rpms/w3m/devel w3m.spec,1.56,1.57
Message-ID: <20090821162433.E12F911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/w3m/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25285

Modified Files:
	w3m.spec 
Log Message:
- rebuilt with new openssl


Index: w3m.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- w3m.spec	27 Jul 2009 07:01:23 -0000	1.56
+++ w3m.spec	21 Aug 2009 16:24:33 -0000	1.57
@@ -5,7 +5,7 @@
 
 Name:     w3m
 Version:  0.5.2
-Release:  14%{?dist}
+Release:  15%{?dist}
 License:  MIT
 URL:      http://w3m.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.2-15
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:25:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:25:56 +0000 (UTC)
Subject: rpms/wget/devel wget.spec,1.70,1.71
Message-ID: <20090821162556.5425811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25584

Modified Files:
	wget.spec 
Log Message:
- rebuilt with new openssl


Index: wget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wget/devel/wget.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- wget.spec	27 Jul 2009 07:12:38 -0000	1.70
+++ wget.spec	21 Aug 2009 16:25:56 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.11.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.11.4-5
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:26:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:26:41 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark.spec,1.55,1.56
Message-ID: <20090821162641.A277611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25775

Modified Files:
	wireshark.spec 
Log Message:
- rebuilt with new openssl


Index: wireshark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- wireshark.spec	27 Jul 2009 07:18:33 -0000	1.55
+++ wireshark.spec	21 Aug 2009 16:26:41 -0000	1.56
@@ -7,7 +7,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-3
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:27:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:27:19 +0000 (UTC)
Subject: rpms/wmweather+/devel wmweather+.spec,1.11,1.12
Message-ID: <20090821162719.A474911C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wmweather+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25965

Modified Files:
	wmweather+.spec 
Log Message:
- rebuilt with new openssl


Index: wmweather+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmweather+/devel/wmweather+.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wmweather+.spec	27 Jul 2009 07:21:16 -0000	1.11
+++ wmweather+.spec	21 Aug 2009 16:27:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           wmweather+
 Version:        2.9
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Weather status dockapp
 
 Group:          User Interface/X
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.9-12
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:28:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:28:10 +0000 (UTC)
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.60,1.61
Message-ID: <20090821162810.E095711C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wpa_supplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26168

Modified Files:
	wpa_supplicant.spec 
Log Message:
- rebuilt with new openssl


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- wpa_supplicant.spec	27 Jul 2009 07:27:03 -0000	1.60
+++ wpa_supplicant.spec	21 Aug 2009 16:28:10 -0000	1.61
@@ -2,7 +2,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.6.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -149,6 +149,9 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:0.6.8-6
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:29:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:29:04 +0000 (UTC)
Subject: rpms/x3270/devel x3270.spec,1.34,1.35
Message-ID: <20090821162904.EDF6F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/x3270/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26381

Modified Files:
	x3270.spec 
Log Message:
- rebuilt with new openssl


Index: x3270.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- x3270.spec	27 Jul 2009 07:32:44 -0000	1.34
+++ x3270.spec	21 Aug 2009 16:29:04 -0000	1.35
@@ -8,7 +8,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -195,6 +195,9 @@ fi
 %{_mandir}/man1/c3270*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.6-10
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:29:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:29:41 +0000 (UTC)
Subject: rpms/xar/devel xar.spec,1.11,1.12
Message-ID: <20090821162941.DE94611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26544

Modified Files:
	xar.spec 
Log Message:
- rebuilt with new openssl


Index: xar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xar/devel/xar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xar.spec	27 Jul 2009 07:34:27 -0000	1.11
+++ xar.spec	21 Aug 2009 16:29:41 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The eXtensible ARchiver
 Name: xar
 Version: 1.5.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://code.google.com/p/xar/
@@ -73,6 +73,9 @@ Development files for the eXtensible ARc
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5.2-5
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:30:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:30:31 +0000 (UTC)
Subject: rpms/xca/devel xca.spec,1.28,1.29
Message-ID: <20090821163031.5A22011C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26737

Modified Files:
	xca.spec 
Log Message:
- rebuilt with new openssl


Index: xca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xca/devel/xca.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xca.spec	27 Jul 2009 07:38:20 -0000	1.28
+++ xca.spec	21 Aug 2009 16:30:31 -0000	1.29
@@ -3,7 +3,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.6.4
-Release:	%release_func 8
+Release:	%release_func 9
 
 License:	BSD
 Group:		Applications/Productivity
@@ -130,6 +130,9 @@ gtk-update-icon-cache %_datadir/icons/hi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:31:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:31:29 +0000 (UTC)
Subject: rpms/xchat/devel xchat.spec,1.105,1.106
Message-ID: <20090821163129.18A4811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26934

Modified Files:
	xchat.spec 
Log Message:
- rebuilt with new openssl


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- xchat.spec	27 Jul 2009 07:39:40 -0000	1.105
+++ xchat.spec	21 Aug 2009 16:31:28 -0000	1.106
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   11%{?dist}
+Release:   12%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -167,6 +167,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:2.8.6-12
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:32:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:32:11 +0000 (UTC)
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.64,1.65
Message-ID: <20090821163211.ACACB11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27540

Modified Files:
	xchat-gnome.spec 
Log Message:
- rebuilt with new openssl


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- xchat-gnome.spec	27 Jul 2009 07:39:55 -0000	1.64
+++ xchat-gnome.spec	21 Aug 2009 16:32:11 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.26.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -140,6 +140,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.26.1-5
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:32:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:32:47 +0000 (UTC)
Subject: rpms/xml-security-c/devel xml-security-c.spec,1.4,1.5
Message-ID: <20090821163247.E426811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xml-security-c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27971

Modified Files:
	xml-security-c.spec 
Log Message:
- rebuilt with new openssl


Index: xml-security-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-security-c/devel/xml-security-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xml-security-c.spec	28 Jul 2009 14:44:28 -0000	1.4
+++ xml-security-c.spec	21 Aug 2009 16:32:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xml-security-c
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ Implementation of W3C security standards for XML
 
 Group:          System Environment/Libraries
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 # %doc CHANGELOG.txt
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5.1-2
+- rebuilt with new openssl
+
 * Tue Jul 28 2009 Antti Andreimann <Antti.Andreimann at mail.ee> 1.5.1-1
 - New upstream relase (#513078)
 - Fixes CVE-2009-0217 (#511915)



From tmraz at fedoraproject.org  Fri Aug 21 16:33:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:33:27 +0000 (UTC)
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.36,1.37
Message-ID: <20090821163327.DC09011C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xmlsec1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28143

Modified Files:
	xmlsec1.spec 
Log Message:
- rebuilt with new openssl


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xmlsec1.spec	11 Aug 2009 13:02:03 -0000	1.36
+++ xmlsec1.spec	21 Aug 2009 16:33:27 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.12
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -232,6 +232,9 @@ rm -fr %{buildroot}
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.12-2
+- rebuilt with new openssl
+
 * Tue Aug 11 2009 Daniel Veillard <veillard at redhat.com> - 1.2.12-1
 - update to new upstream release 1.2.12
 - includes fix for CVE-2009-0217



From tmraz at fedoraproject.org  Fri Aug 21 16:34:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:34:05 +0000 (UTC)
Subject: rpms/xmms2/devel xmms2.spec,1.9,1.10
Message-ID: <20090821163405.6BA1F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28303

Modified Files:
	xmms2.spec 
Log Message:
- rebuilt with new openssl


Index: xmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xmms2.spec	11 Aug 2009 21:30:56 -0000	1.9
+++ xmms2.spec	21 Aug 2009 16:34:05 -0000	1.10
@@ -6,7 +6,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.6
-Release:		3%{?dist}
+Release:		4%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -195,6 +195,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/nyxmms2.*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6-4
+- rebuilt with new openssl
+
 * Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6-3
 - BuildRequires: glib2-devel, readline-devel, ncurses-devel
 



From tmraz at fedoraproject.org  Fri Aug 21 16:35:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:35:46 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.474,1.475
Message-ID: <20090821163546.B74AE11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28600

Modified Files:
	xorg-x11-server.spec 
Log Message:
- rebuilt with new openssl


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -p -r1.474 -r1.475
--- xorg-x11-server.spec	20 Aug 2009 21:40:48 -0000	1.474
+++ xorg-x11-server.spec	21 Aug 2009 16:35:46 -0000	1.475
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   37.%{gitdate}%{?dist}
+Release:   38.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -506,6 +506,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.99-38.20090820
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Adam Jackson <ajax at redhat.com> 1.6.99-37.20090820
 - Today's git snapshot.
 - xserver-1.6.99-dri2-swapbuffers-fallback.patch: Fix SwapBuffers crash.



From buc at fedoraproject.org  Fri Aug 21 16:36:03 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Fri, 21 Aug 2009 16:36:03 +0000 (UTC)
Subject: rpms/mail-notification/devel
	mail-notification-5.4-evolution-gtkhtml.patch, 1.1,
	1.2 mail-notification.spec, 1.73, 1.74
Message-ID: <20090821163603.4413311C00D7@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28703

Modified Files:
	mail-notification-5.4-evolution-gtkhtml.patch 
	mail-notification.spec 
Log Message:


mail-notification-5.4-evolution-gtkhtml.patch:
 jb-evolution-plugin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mail-notification-5.4-evolution-gtkhtml.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-5.4-evolution-gtkhtml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mail-notification-5.4-evolution-gtkhtml.patch	21 Aug 2009 15:54:52 -0000	1.1
+++ mail-notification-5.4-evolution-gtkhtml.patch	21 Aug 2009 16:36:03 -0000	1.2
@@ -6,7 +6,7 @@ diff -Nrbu mail-notification-5.4/jbsrc/l
      minversion = "2.12";
  
 -  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14", minversion);
++  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14 gtkhtml-editor", minversion);
    result = jb_check_packages("Evolution", "evolution-plugin", packages);
    g_free(packages);
  


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- mail-notification.spec	21 Aug 2009 15:54:52 -0000	1.73
+++ mail-notification.spec	21 Aug 2009 16:36:03 -0000	1.74
@@ -186,7 +186,8 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 %changelog
 * Fri Aug 21 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-14
-- add libgtkhtml-3.14 requirement into config stuff for evolution plugin build
+- add gtkhtml3-devel pkgconfig requirements into config stuff
+  for evolution plugin build
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-13
 - rebuilt with new openssl



From tmraz at fedoraproject.org  Fri Aug 21 16:37:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:37:15 +0000 (UTC)
Subject: rpms/xsupplicant/devel xsupplicant.spec,1.42,1.43
Message-ID: <20090821163715.886A811C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xsupplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29036

Modified Files:
	xsupplicant.spec 
Log Message:
- rebuilt with new openssl


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xsupplicant.spec	27 Jul 2009 08:46:29 -0000	1.42
+++ xsupplicant.spec	21 Aug 2009 16:37:15 -0000	1.43
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	2.1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+ or BSD with advertising
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.7-3
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:38:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:38:03 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix.spec,1.44,1.45
Message-ID: <20090821163803.C7E2F11C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29230

Modified Files:
	zabbix.spec 
Log Message:
- rebuilt with new openssl


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- zabbix.spec	27 Jul 2009 08:58:42 -0000	1.44
+++ zabbix.spec	21 Aug 2009 16:38:03 -0000	1.45
@@ -7,7 +7,7 @@
 
 Name:           zabbix
 Version:        1.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -549,6 +549,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.5-3
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Fri Aug 21 16:38:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 21 Aug 2009 16:38:39 +0000 (UTC)
Subject: rpms/znc/devel znc.spec,1.13,1.14
Message-ID: <20090821163839.543C211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29414

Modified Files:
	znc.spec 
Log Message:
- rebuilt with new openssl


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- znc.spec	21 Aug 2009 05:20:21 -0000	1.13
+++ znc.spec	21 Aug 2009 16:38:39 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        5.svn1608%{?dist}
+Release:        6.svn1608%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
@@ -126,6 +126,9 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
 - Upgrade to svn 1608
 



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:45 +0000
Subject: [pkgdb] banshee: chkr has requested watchcommits
Message-ID: <20090821164145.A395110F84D@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:46 +0000
Subject: [pkgdb] banshee: chkr has requested commit
Message-ID: <20090821164146.6BD5E10F882@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:46 +0000
Subject: [pkgdb] banshee: chkr has requested watchbugzilla
Message-ID: <20090821164146.8A68310F88C@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:47 +0000
Subject: [pkgdb] banshee: chkr has requested approveacls
Message-ID: <20090821164147.6908410F898@bastion2.fedora.phx.redhat.com>

chkr has requested the approveacls acl on banshee (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:56 +0000
Subject: [pkgdb] banshee: chkr has requested watchbugzilla
Message-ID: <20090821164156.638D010F89B@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on banshee (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:56 +0000
Subject: [pkgdb] banshee: chkr has requested watchcommits
Message-ID: <20090821164156.D57F210F8A0@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on banshee (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:57 +0000
Subject: [pkgdb] banshee: chkr has requested commit
Message-ID: <20090821164157.2A1A210F8A5@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on banshee (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:41:59 +0000
Subject: [pkgdb] banshee: chkr has requested approveacls
Message-ID: <20090821164159.8C44F10F80B@bastion2.fedora.phx.redhat.com>

chkr has requested the approveacls acl on banshee (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:42:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:42:04 +0000
Subject: [pkgdb] banshee: chkr has requested watchbugzilla
Message-ID: <20090821164204.6BA0C10F8AD@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:42:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:42:06 +0000
Subject: [pkgdb] banshee: chkr has requested commit
Message-ID: <20090821164206.4DC5710F8B2@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:42:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:42:09 +0000
Subject: [pkgdb] banshee: chkr has requested watchcommits
Message-ID: <20090821164209.30C9910F8B6@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 16:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 16:42:11 +0000
Subject: [pkgdb] banshee: chkr has requested approveacls
Message-ID: <20090821164211.C8F4710F881@bastion2.fedora.phx.redhat.com>

chkr has requested the approveacls acl on banshee (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From gd at fedoraproject.org  Fri Aug 21 16:49:56 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Fri, 21 Aug 2009 16:49:56 +0000 (UTC)
Subject: rpms/samba/devel samba-3.4.0-cliread.patch,1.1,1.2
Message-ID: <20090821164956.7DEF011C00D7@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31012

Modified Files:
	samba-3.4.0-cliread.patch 
Log Message:
Commit proper v3-4-test backport patch.

Guenther


samba-3.4.0-cliread.patch:
 clireadwrite.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: samba-3.4.0-cliread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.4.0-cliread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- samba-3.4.0-cliread.patch	20 Aug 2009 15:38:45 -0000	1.1
+++ samba-3.4.0-cliread.patch	21 Aug 2009 16:49:56 -0000	1.2
@@ -1,31 +1,34 @@
-commit 33d27797d3ae9ab3ff7e1aa940941cc450f5ad1d
+commit ef891070288cd13aff7c730de7c1baf54dddb90f
 Author:     Jeremy Allison <jra at samba.org>
-AuthorDate: Wed Aug 19 15:33:08 2009 -0700
-Commit:     Jeremy Allison <jra at samba.org>
-CommitDate: Wed Aug 19 15:33:08 2009 -0700
+AuthorDate: Fri Aug 21 12:44:54 2009 +0200
+Commit:     Karolin Seeger <kseeger at samba.org>
+CommitDate: Fri Aug 21 12:46:47 2009 +0200
 
     Fix Red Hat bugzilla bug : https://bugzilla.redhat.com/show_bug.cgi?id=516165
     nautilus fails to copy files from an SMB share. This is a show-stopper
-    for 3.4.1 (I'll open a Samba.org bug). Although gnome-vfs is doing
-    *incredibly* stupid things by asking for a read size of 65535 - this
-    translates on the wire to a 65534 byte read followed by a 1 byte
-    read. Please send this back to the gnome developers that they
-    will ge horrid on the wire performance for this.
+    for 3.4.1. Although gnome-vfs is doing *incredibly* stupid things by asking
+    for a read size of 65535 - this translates on the wire to a 65534 byte read
+    followed by a 1 byte read. Please send this back to the gnome developers that
+    they will ge horrid on the wire performance for this.
     Jeremy.
+    
+    Fixes bug #6649.
+    
+    Fixed in master with commit 33d27797d3ae9ab3ff7e1aa940941cc450f5ad1d.
 ---
  source3/libsmb/clireadwrite.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
-index d38de19..0d1f9e5 100644
+index f2f447b..b1064ba 100644
 --- a/source3/libsmb/clireadwrite.c
 +++ b/source3/libsmb/clireadwrite.c
-@@ -200,7 +200,7 @@ static void cli_read_andx_done(struct tevent_req *subreq)
- 	state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0);
+@@ -185,7 +185,7 @@ NTSTATUS cli_read_andx_recv(struct async_req *req, ssize_t *received,
+ 	buf = (uint8_t *)smb_base(cli_req->inbuf) + SVAL(vwv+6, 0);
  
- 	if (trans_oob(smb_len(inbuf), SVAL(vwv+6, 0), state->received)
--	    || (state->buf < bytes)) {
-+	    || (state->received && (state->buf < bytes))) {
+ 	if (trans_oob(smb_len(cli_req->inbuf), SVAL(vwv+6, 0), size)
+-	    || (buf < bytes)) {
++	    || (size && (buf < bytes))) {
  		DEBUG(5, ("server returned invalid read&x data offset\n"));
- 		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
- 		return;
+ 		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+ 	}



From ankursinha at fedoraproject.org  Fri Aug 21 17:01:04 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 17:01:04 +0000 (UTC)
Subject: rpms/fpaste/F-11 .cvsignore, 1.2, 1.3 fpaste.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090821170104.ED22611C00D7@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv323

Modified Files:
	.cvsignore fpaste.spec sources 
Log Message:
New release 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 17:35:38 -0000	1.2
+++ .cvsignore	21 Aug 2009 17:01:04 -0000	1.3
@@ -1 +1 @@
-fpaste-0.3.2.tar.bz2
+fpaste-0.3.3.tar.bz2


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/fpaste.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fpaste.spec	14 Aug 2009 17:35:38 -0000	1.1
+++ fpaste.spec	21 Aug 2009 17:01:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		fpaste
-Version:	0.3.2
-Release:	2%{?dist}
+Version:	0.3.3
+Release:	1%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,13 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1
+- new package release
+- Proper urllib2 error handling
+- Catches Ctrl-C while waiting for stdin to show a usage reminder rather than a traceback
+- Typos fixed, and more TODO
+- Added --sysinfo option to gather and pastebin basic system information
+- Added options to read text from (xsel) clipboard and write resultant URL to clipboard
 * Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-2
 - Corrected source0 field
 * Thu Aug 13 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 17:35:38 -0000	1.2
+++ sources	21 Aug 2009 17:01:04 -0000	1.3
@@ -1 +1 @@
-3831fc1f9b070d75c0fbe9134b6e210d  fpaste-0.3.2.tar.bz2
+456b4c7bfdd71330713d5e7915b4f921  fpaste-0.3.3.tar.bz2



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:41 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172641.E889510F84D@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on banshee (Fedora devel) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:42 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172642.D0BA810F888@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on banshee (Fedora devel) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:44 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172644.549AD10F890@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on banshee (Fedora devel) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:46 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172646.168E510F899@bastion2.fedora.phx.redhat.com>

spot has set the approveacls acl on banshee (Fedora devel) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:50 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172650.4E20A10F89F@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on banshee (Fedora 10) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:51 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172651.44DA110F8A2@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on banshee (Fedora 10) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:53 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172653.BCAFE10F8AF@bastion2.fedora.phx.redhat.com>

spot has set the approveacls acl on banshee (Fedora 10) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:52 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172652.24C1210F8A6@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on banshee (Fedora 10) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:57 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172657.799E110F8AA@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on banshee (Fedora 11) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:57 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172657.B39F010F8B4@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on banshee (Fedora 11) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:58 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172658.65D7A10F8B8@bastion2.fedora.phx.redhat.com>

spot has set the commit acl on banshee (Fedora 11) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From pkgdb at fedoraproject.org  Fri Aug 21 17:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 17:26:59 +0000
Subject: [pkgdb] banshee had acl change status
Message-ID: <20090821172659.5C2B310F8BD@bastion2.fedora.phx.redhat.com>

spot has set the approveacls acl on banshee (Fedora 11) to Approved for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/banshee



From ankursinha at fedoraproject.org  Fri Aug 21 17:33:12 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 17:33:12 +0000 (UTC)
Subject: rpms/fpaste/F-11 fpaste.spec,1.2,1.3
Message-ID: <20090821173312.34D7C11C00D7@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6730

Modified Files:
	fpaste.spec 
Log Message:
Added xsel as Requires


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/fpaste.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fpaste.spec	21 Aug 2009 17:01:04 -0000	1.2
+++ fpaste.spec	21 Aug 2009 17:33:12 -0000	1.3
@@ -7,7 +7,7 @@ Group:		Applications/Internet
 License:	GPLv3+
 URL:		https://fedorahosted.org/fpaste/
 Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2
-
+Requires:	xsel
 
 %description
 It is often useful to be able to easily paste text to the Fedora



From mtasaka at fedoraproject.org  Fri Aug 21 17:33:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 21 Aug 2009 17:33:20 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/devel rubygem-nokogiri.spec,1.11,1.12
Message-ID: <20090821173320.859ED11C00D7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6806

Modified Files:
	rubygem-nokogiri.spec 
Log Message:
* Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
- Fix test failure on sparc



Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/rubygem-nokogiri.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-nokogiri.spec	28 Jul 2009 18:13:48 -0000	1.11
+++ rubygem-nokogiri.spec	21 Aug 2009 17:33:20 -0000	1.12
@@ -13,7 +13,7 @@
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
 Version:	1.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
@@ -169,6 +169,10 @@ create_symlink_rec %{geminstdir}/lib %{r
 rm -rf %{buildroot}
 
 %check
+# test_exslt(TestXsltTransforms) [./test/test_xslt_transforms.rb:93]
+# fails without TZ on sparc
+export TZ="Asia/Tokyo"
+
 pushd ./%{geminstdir}
 rake test --trace
 popd
@@ -198,6 +202,9 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
+* Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
+- Fix test failure on sparc
+
 * Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-1
 - 1.3.3
 



From ankursinha at fedoraproject.org  Fri Aug 21 17:36:23 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 17:36:23 +0000 (UTC)
Subject: rpms/fpaste/F-11 fpaste.spec,1.3,1.4
Message-ID: <20090821173623.5A8E411C00D7@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8116

Modified Files:
	fpaste.spec 
Log Message:
Bump spec


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/fpaste.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fpaste.spec	21 Aug 2009 17:33:12 -0000	1.3
+++ fpaste.spec	21 Aug 2009 17:36:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fpaste
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-2
+- Added xsel in requires
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1
 - new package release
 - Proper urllib2 error handling



From ankursinha at fedoraproject.org  Fri Aug 21 17:40:08 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 17:40:08 +0000 (UTC)
Subject: rpms/fpaste/devel fpaste.spec,1.2,1.3
Message-ID: <20090821174008.7985211C0439@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8924

Modified Files:
	fpaste.spec 
Log Message:
Added xsel to requires


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/fpaste.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fpaste.spec	21 Aug 2009 14:53:01 -0000	1.2
+++ fpaste.spec	21 Aug 2009 17:40:08 -0000	1.3
@@ -1,13 +1,13 @@
 Name:		fpaste
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
 License:	GPLv3+
 URL:		https://fedorahosted.org/fpaste/
 Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2
-
+Requires:	xsel
 
 %description
 It is often useful to be able to easily paste text to the Fedora
@@ -38,6 +38,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-2
+- Added xsel in requires
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1
 - new package release
 - Proper urllib2 error handling



From ankursinha at fedoraproject.org  Fri Aug 21 17:43:11 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Fri, 21 Aug 2009 17:43:11 +0000 (UTC)
Subject: rpms/fpaste/F-10 fpaste.spec,1.2,1.3
Message-ID: <20090821174311.1112C11C00D7@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9536

Modified Files:
	fpaste.spec 
Log Message:
Added xsel to requires


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/fpaste.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fpaste.spec	21 Aug 2009 15:07:19 -0000	1.2
+++ fpaste.spec	21 Aug 2009 17:43:10 -0000	1.3
@@ -1,13 +1,13 @@
 Name:		fpaste
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
 License:	GPLv3+
 URL:		https://fedorahosted.org/fpaste/
 Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2
-
+Requires:	xsel
 
 %description
 It is often useful to be able to easily paste text to the Fedora
@@ -38,6 +38,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-2
+- Added xsel in requires
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1
 - new package release
 - Proper urllib2 error handling



From pkgdb at fedoraproject.org  Fri Aug 21 18:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:18:32 +0000
Subject: [pkgdb] plexus-cli was added for overholt
Message-ID: <20090821181832.AB89610F84D@bastion2.fedora.phx.redhat.com>

ausil has added Package plexus-cli with summary Command Line Interface facilitator for Plexus
ausil has approved Package plexus-cli
ausil has added a Fedora devel branch for plexus-cli with an owner of overholt
ausil has approved plexus-cli in Fedora devel
ausil has approved Package plexus-cli
ausil has set commit to Approved for 107427 on plexus-cli (Fedora devel)
ausil has set checkout to Approved for 107427 on plexus-cli (Fedora devel)
ausil has set build to Approved for 107427 on plexus-cli (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cli



From pkgdb at fedoraproject.org  Fri Aug 21 18:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:18:34 +0000
Subject: [pkgdb] plexus-cli summary updated by ausil
Message-ID: <20090821181834.37E3A10F86F@bastion2.fedora.phx.redhat.com>

ausil set package plexus-cli summary to Command Line Interface facilitator for Plexus

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cli



From ausil at fedoraproject.org  Fri Aug 21 18:18:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:18:40 +0000 (UTC)
Subject: rpms/plexus-cli/devel - New directory
Message-ID: <20090821181840.4351411C0347@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-cli/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso17423/rpms/plexus-cli/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-cli/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:18:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:18:40 +0000 (UTC)
Subject: rpms/plexus-cli - New directory
Message-ID: <20090821181840.14A8011C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-cli
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso17423/rpms/plexus-cli

Log Message:
Directory /cvs/pkgs/rpms/plexus-cli added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:18:34 +0000
Subject: [pkgdb] plexus-cli (Fedora, devel) updated by ausil
Message-ID: <20090821181834.4570A10F889@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on plexus-cli (Fedora devel) for akurtakov
ausil approved watchcommits on plexus-cli (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-cli



From ausil at fedoraproject.org  Fri Aug 21 18:18:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:18:46 +0000 (UTC)
Subject: rpms/plexus-cli Makefile,NONE,1.1
Message-ID: <20090821181846.60F9011C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-cli
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso17423/rpms/plexus-cli

Added Files:
	Makefile 
Log Message:
Setup of module plexus-cli


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-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 ausil at fedoraproject.org  Fri Aug 21 18:18:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:18:46 +0000 (UTC)
Subject: rpms/plexus-cli/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090821181846.9807A11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-cli/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvso17423/rpms/plexus-cli/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-cli


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-cli
# $Id: Makefile,v 1.1 2009/08/21 18:18:46 ausil Exp $
NAME := plexus-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  Fri Aug 21 18:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:19:26 +0000
Subject: [pkgdb] plexus-mail-sender was added for overholt
Message-ID: <20090821181926.121BA10F84D@bastion2.fedora.phx.redhat.com>

ausil has added Package plexus-mail-sender with summary Plexus Mail Sender
ausil has approved Package plexus-mail-sender
ausil has added a Fedora devel branch for plexus-mail-sender with an owner of overholt
ausil has approved plexus-mail-sender in Fedora devel
ausil has approved Package plexus-mail-sender
ausil has set commit to Approved for 107427 on plexus-mail-sender (Fedora devel)
ausil has set checkout to Approved for 107427 on plexus-mail-sender (Fedora devel)
ausil has set build to Approved for 107427 on plexus-mail-sender (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-mail-sender



From pkgdb at fedoraproject.org  Fri Aug 21 18:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:19:27 +0000
Subject: [pkgdb] plexus-mail-sender summary updated by ausil
Message-ID: <20090821181927.1DFFD10F86F@bastion2.fedora.phx.redhat.com>

ausil set package plexus-mail-sender summary to Plexus Mail Sender

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-mail-sender



From ausil at fedoraproject.org  Fri Aug 21 18:19:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:19:33 +0000 (UTC)
Subject: rpms/plexus-mail-sender - New directory
Message-ID: <20090821181933.1857A11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-mail-sender
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx17834/rpms/plexus-mail-sender

Log Message:
Directory /cvs/pkgs/rpms/plexus-mail-sender added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:21:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:21:04 +0000
Subject: [pkgdb] ghc-tar was added for ynemoy
Message-ID: <20090821182104.F14B010F854@bastion2.fedora.phx.redhat.com>

ausil has added Package ghc-tar with summary Reading, writing and manipulating ".tar" archive files in Haskell
ausil has approved Package ghc-tar
ausil has added a Fedora devel branch for ghc-tar with an owner of ynemoy
ausil has approved ghc-tar in Fedora devel
ausil has approved Package ghc-tar
ausil has set commit to Approved for 107427 on ghc-tar (Fedora devel)
ausil has set checkout to Approved for 107427 on ghc-tar (Fedora devel)
ausil has set build to Approved for 107427 on ghc-tar (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-tar



From pkgdb at fedoraproject.org  Fri Aug 21 18:21:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:21:08 +0000
Subject: [pkgdb] ghc-tar summary updated by ausil
Message-ID: <20090821182108.561B610F886@bastion2.fedora.phx.redhat.com>

ausil set package ghc-tar summary to Reading, writing and manipulating ".tar" archive files in Haskell

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-tar



From pkgdb at fedoraproject.org  Fri Aug 21 18:21:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:21:08 +0000
Subject: [pkgdb] ghc-tar (Fedora, 11) updated by ausil
Message-ID: <20090821182108.64B4410F890@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on ghc-tar (Fedora devel) for haskell-sig
ausil approved watchcommits on ghc-tar (Fedora devel) for haskell-sig
ausil approved watchbugzilla on ghc-tar (Fedora devel) for petersen
ausil approved watchcommits on ghc-tar (Fedora devel) for petersen
ausil approved commit on ghc-tar (Fedora devel) for petersen
ausil approved build on ghc-tar (Fedora devel) for petersen
ausil approved approveacls on ghc-tar (Fedora devel) for petersen
ausil approved watchbugzilla on ghc-tar (Fedora devel) for bos
ausil approved watchcommits on ghc-tar (Fedora devel) for bos
ausil approved commit on ghc-tar (Fedora devel) for bos
ausil approved build on ghc-tar (Fedora devel) for bos
ausil approved approveacls on ghc-tar (Fedora devel) for bos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-tar



From ausil at fedoraproject.org  Fri Aug 21 18:21:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:21:14 +0000 (UTC)
Subject: rpms/ghc-tar - New directory
Message-ID: <20090821182114.19FEF11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ghc-tar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp18573/rpms/ghc-tar

Log Message:
Directory /cvs/pkgs/rpms/ghc-tar added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:21:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:21:14 +0000 (UTC)
Subject: rpms/ghc-tar/devel - New directory
Message-ID: <20090821182114.4CC1411C02C3@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp18573/rpms/ghc-tar/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-tar/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:21:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:21:08 +0000
Subject: [pkgdb] ghc-tar (Fedora, 11) updated by ausil
Message-ID: <20090821182108.75F2310F89A@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for ghc-tar
ausil has set commit to Approved for 107427 on ghc-tar (Fedora 11)
ausil has set checkout to Approved for 107427 on ghc-tar (Fedora 11)
ausil has set build to Approved for 107427 on ghc-tar (Fedora 11)
ausil approved watchbugzilla on ghc-tar (Fedora 11) for haskell-sig
ausil approved watchcommits on ghc-tar (Fedora 11) for haskell-sig
ausil approved watchbugzilla on ghc-tar (Fedora 11) for petersen
ausil approved watchcommits on ghc-tar (Fedora 11) for petersen
ausil approved commit on ghc-tar (Fedora 11) for petersen
ausil approved build on ghc-tar (Fedora 11) for petersen
ausil approved approveacls on ghc-tar (Fedora 11) for petersen
ausil approved watchbugzilla on ghc-tar (Fedora 11) for bos
ausil approved watchcommits on ghc-tar (Fedora 11) for bos
ausil approved commit on ghc-tar (Fedora 11) for bos
ausil approved build on ghc-tar (Fedora 11) for bos
ausil approved approveacls on ghc-tar (Fedora 11) for bos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-tar



From ausil at fedoraproject.org  Fri Aug 21 18:21:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:21:20 +0000 (UTC)
Subject: rpms/ghc-tar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090821182120.C36EC11C0381@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp18573/rpms/ghc-tar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-tar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-tar
# $Id: Makefile,v 1.1 2009/08/21 18:21:20 ausil Exp $
NAME := ghc-tar
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 21 18:21:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:21:20 +0000 (UTC)
Subject: rpms/ghc-tar Makefile,NONE,1.1
Message-ID: <20090821182120.8C36311C0347@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ghc-tar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsp18573/rpms/ghc-tar

Added Files:
	Makefile 
Log Message:
Setup of module ghc-tar


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-tar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 21 18:22:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:22:47 +0000
Subject: [pkgdb] perl-Curses-UI was added for hvad
Message-ID: <20090821182247.62D8210F855@bastion2.fedora.phx.redhat.com>

ausil has added Package perl-Curses-UI with summary Curses based OO user interface framework
ausil has approved Package perl-Curses-UI
ausil has added a Fedora devel branch for perl-Curses-UI with an owner of hvad
ausil has approved perl-Curses-UI in Fedora devel
ausil has approved Package perl-Curses-UI
ausil has set commit to Approved for 107427 on perl-Curses-UI (Fedora devel)
ausil has set checkout to Approved for 107427 on perl-Curses-UI (Fedora devel)
ausil has set build to Approved for 107427 on perl-Curses-UI (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Curses-UI



From pkgdb at fedoraproject.org  Fri Aug 21 18:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:22:49 +0000
Subject: [pkgdb] perl-Curses-UI summary updated by ausil
Message-ID: <20090821182249.30E3510F80B@bastion2.fedora.phx.redhat.com>

ausil set package perl-Curses-UI summary to Curses based OO user interface framework

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Curses-UI



From pkgdb at fedoraproject.org  Fri Aug 21 18:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:22:49 +0000
Subject: [pkgdb] perl-Curses-UI (Fedora, 11) updated by ausil
Message-ID: <20090821182249.4174410F882@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on perl-Curses-UI (Fedora devel) for perl-sig
ausil approved watchcommits on perl-Curses-UI (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Curses-UI



From pkgdb at fedoraproject.org  Fri Aug 21 18:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:22:49 +0000
Subject: [pkgdb] perl-Curses-UI (Fedora, 11) updated by ausil
Message-ID: <20090821182249.54C0410F890@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for perl-Curses-UI
ausil has set commit to Approved for 107427 on perl-Curses-UI (Fedora 10)
ausil has set checkout to Approved for 107427 on perl-Curses-UI (Fedora 10)
ausil has set build to Approved for 107427 on perl-Curses-UI (Fedora 10)
ausil approved watchbugzilla on perl-Curses-UI (Fedora 10) for perl-sig
ausil approved watchcommits on perl-Curses-UI (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Curses-UI



From pkgdb at fedoraproject.org  Fri Aug 21 18:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:22:49 +0000
Subject: [pkgdb] perl-Curses-UI (Fedora, 11) updated by ausil
Message-ID: <20090821182249.4A7FD10F889@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for perl-Curses-UI
ausil has set commit to Approved for 107427 on perl-Curses-UI (Fedora 11)
ausil has set checkout to Approved for 107427 on perl-Curses-UI (Fedora 11)
ausil has set build to Approved for 107427 on perl-Curses-UI (Fedora 11)
ausil approved watchbugzilla on perl-Curses-UI (Fedora 11) for perl-sig
ausil approved watchcommits on perl-Curses-UI (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Curses-UI



From ausil at fedoraproject.org  Fri Aug 21 18:22:55 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:22:55 +0000 (UTC)
Subject: rpms/perl-Curses-UI - New directory
Message-ID: <20090821182255.17A6511C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Curses-UI
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsr19038/rpms/perl-Curses-UI

Log Message:
Directory /cvs/pkgs/rpms/perl-Curses-UI added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:22:55 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:22:55 +0000 (UTC)
Subject: rpms/perl-Curses-UI/devel - New directory
Message-ID: <20090821182255.39A3E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Curses-UI/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsr19038/rpms/perl-Curses-UI/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Curses-UI/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:23:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:23:01 +0000 (UTC)
Subject: rpms/perl-Curses-UI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090821182301.EBEBC11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Curses-UI/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsr19038/rpms/perl-Curses-UI/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Curses-UI


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Curses-UI
# $Id: Makefile,v 1.1 2009/08/21 18:23:01 ausil Exp $
NAME := perl-Curses-UI
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 21 18:23:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:23:01 +0000 (UTC)
Subject: rpms/perl-Curses-UI Makefile,NONE,1.1
Message-ID: <20090821182301.9BBBF11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Curses-UI
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsr19038/rpms/perl-Curses-UI

Added Files:
	Makefile 
Log Message:
Setup of module perl-Curses-UI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Curses-UI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Aug 21 18:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:23:59 +0000
Subject: [pkgdb] apbs was added for timfenn
Message-ID: <20090821182359.70DE510F85C@bastion2.fedora.phx.redhat.com>

ausil has added Package apbs with summary adaptive poisson boltzmann solver
ausil has approved Package apbs
ausil has added a Fedora devel branch for apbs with an owner of timfenn
ausil has approved apbs in Fedora devel
ausil has approved Package apbs
ausil has set commit to Approved for 107427 on apbs (Fedora devel)
ausil has set checkout to Approved for 107427 on apbs (Fedora devel)
ausil has set build to Approved for 107427 on apbs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apbs



From pkgdb at fedoraproject.org  Fri Aug 21 18:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:24:00 +0000
Subject: [pkgdb] apbs summary updated by ausil
Message-ID: <20090821182400.8677310F889@bastion2.fedora.phx.redhat.com>

ausil set package apbs summary to adaptive poisson boltzmann solver

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apbs



From ausil at fedoraproject.org  Fri Aug 21 18:24:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:24:06 +0000 (UTC)
Subject: rpms/apbs - New directory
Message-ID: <20090821182406.1DCE911C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/apbs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz19407/rpms/apbs

Log Message:
Directory /cvs/pkgs/rpms/apbs added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:24:00 +0000
Subject: [pkgdb] apbs (Fedora EPEL, 5) updated by ausil
Message-ID: <20090821182400.974E410F886@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for apbs
ausil has set commit to Approved for 107427 on apbs (Fedora 11)
ausil has set checkout to Approved for 107427 on apbs (Fedora 11)
ausil has set build to Approved for 107427 on apbs (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apbs



From pkgdb at fedoraproject.org  Fri Aug 21 18:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:24:00 +0000
Subject: [pkgdb] apbs (Fedora EPEL, 5) updated by ausil
Message-ID: <20090821182400.8E26610F895@bastion2.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for apbs
ausil has set commit to Approved for 107427 on apbs (Fedora EPEL 5)
ausil has set checkout to Approved for 107427 on apbs (Fedora EPEL 5)
ausil has set build to Approved for 107427 on apbs (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apbs



From ausil at fedoraproject.org  Fri Aug 21 18:24:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:24:06 +0000 (UTC)
Subject: rpms/apbs/devel - New directory
Message-ID: <20090821182406.3686E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/apbs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz19407/rpms/apbs/devel

Log Message:
Directory /cvs/pkgs/rpms/apbs/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:24:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:24:12 +0000 (UTC)
Subject: rpms/apbs Makefile,NONE,1.1
Message-ID: <20090821182412.4F1D811C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/apbs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz19407/rpms/apbs

Added Files:
	Makefile 
Log Message:
Setup of module apbs


--- NEW FILE Makefile ---
# Top level Makefile for module apbs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:24:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:24:12 +0000 (UTC)
Subject: rpms/apbs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090821182412.9C47211C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/apbs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsz19407/rpms/apbs/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module apbs


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: apbs
# $Id: Makefile,v 1.1 2009/08/21 18:24:12 ausil Exp $
NAME := apbs
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 21 18:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:24:57 +0000
Subject: [pkgdb] eclipse-testframework was added for akurtakov
Message-ID: <20090821182457.7D68810F881@bastion2.fedora.phx.redhat.com>

ausil has added Package eclipse-testframework with summary Eclipse Test Framework
ausil has approved Package eclipse-testframework
ausil has added a Fedora devel branch for eclipse-testframework with an owner of akurtakov
ausil has approved eclipse-testframework in Fedora devel
ausil has approved Package eclipse-testframework
ausil has set commit to Approved for 107427 on eclipse-testframework (Fedora devel)
ausil has set checkout to Approved for 107427 on eclipse-testframework (Fedora devel)
ausil has set build to Approved for 107427 on eclipse-testframework (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-testframework



From pkgdb at fedoraproject.org  Fri Aug 21 18:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:24:58 +0000
Subject: [pkgdb] eclipse-testframework summary updated by ausil
Message-ID: <20090821182458.977E910F889@bastion2.fedora.phx.redhat.com>

ausil set package eclipse-testframework summary to Eclipse Test Framework

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-testframework



From pkgdb at fedoraproject.org  Fri Aug 21 18:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:24:58 +0000
Subject: [pkgdb] eclipse-testframework (Fedora, devel) updated by ausil
Message-ID: <20090821182458.B735C10F895@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on eclipse-testframework (Fedora devel) for overholt
ausil approved watchcommits on eclipse-testframework (Fedora devel) for overholt
ausil approved commit on eclipse-testframework (Fedora devel) for overholt
ausil approved build on eclipse-testframework (Fedora devel) for overholt
ausil approved approveacls on eclipse-testframework (Fedora devel) for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-testframework



From ausil at fedoraproject.org  Fri Aug 21 18:25:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:25:05 +0000 (UTC)
Subject: rpms/eclipse-testframework - New directory
Message-ID: <20090821182505.1E81911C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-testframework
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw19766/rpms/eclipse-testframework

Log Message:
Directory /cvs/pkgs/rpms/eclipse-testframework added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:25:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:25:05 +0000 (UTC)
Subject: rpms/eclipse-testframework/devel - New directory
Message-ID: <20090821182505.44C6911C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-testframework/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw19766/rpms/eclipse-testframework/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-testframework/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:25:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:25:11 +0000 (UTC)
Subject: rpms/eclipse-testframework Makefile,NONE,1.1
Message-ID: <20090821182511.797DE11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-testframework
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw19766/rpms/eclipse-testframework

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-testframework


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-testframework
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:25:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:25:11 +0000 (UTC)
Subject: rpms/eclipse-testframework/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090821182511.E7BDB11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-testframework/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsw19766/rpms/eclipse-testframework/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-testframework


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-testframework
# $Id: Makefile,v 1.1 2009/08/21 18:25:11 ausil Exp $
NAME := eclipse-testframework
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 21 18:25:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:25:47 +0000
Subject: [pkgdb] perl-DBIx-Simple was added for mmaslano
Message-ID: <20090821182547.A981410F855@bastion2.fedora.phx.redhat.com>

ausil has added Package perl-DBIx-Simple with summary Easy-to-use OO interface to DBI
ausil has approved Package perl-DBIx-Simple
ausil has added a Fedora devel branch for perl-DBIx-Simple with an owner of mmaslano
ausil has approved perl-DBIx-Simple in Fedora devel
ausil has approved Package perl-DBIx-Simple
ausil has set commit to Approved for 107427 on perl-DBIx-Simple (Fedora devel)
ausil has set checkout to Approved for 107427 on perl-DBIx-Simple (Fedora devel)
ausil has set build to Approved for 107427 on perl-DBIx-Simple (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Simple



From ausil at fedoraproject.org  Fri Aug 21 18:25:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:25:54 +0000 (UTC)
Subject: rpms/perl-DBIx-Simple - New directory
Message-ID: <20090821182554.36A5A11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-DBIx-Simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsc19981/rpms/perl-DBIx-Simple

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Simple added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:25:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:25:54 +0000 (UTC)
Subject: rpms/perl-DBIx-Simple/devel - New directory
Message-ID: <20090821182554.4C54911C02C3@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-DBIx-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsc19981/rpms/perl-DBIx-Simple/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Simple/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:25:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:25:48 +0000
Subject: [pkgdb] perl-DBIx-Simple summary updated by ausil
Message-ID: <20090821182548.AEEEE10F888@bastion2.fedora.phx.redhat.com>

ausil set package perl-DBIx-Simple summary to Easy-to-use OO interface to DBI

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Simple



From ausil at fedoraproject.org  Fri Aug 21 18:26:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:26:00 +0000 (UTC)
Subject: rpms/perl-DBIx-Simple Makefile,NONE,1.1
Message-ID: <20090821182600.81FEE11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-DBIx-Simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsc19981/rpms/perl-DBIx-Simple

Added Files:
	Makefile 
Log Message:
Setup of module perl-DBIx-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBIx-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 ausil at fedoraproject.org  Fri Aug 21 18:26:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:26:00 +0000 (UTC)
Subject: rpms/perl-DBIx-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090821182600.E884311C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-DBIx-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsc19981/rpms/perl-DBIx-Simple/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBIx-Simple


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DBIx-Simple
# $Id: Makefile,v 1.1 2009/08/21 18:26:00 ausil Exp $
NAME := perl-DBIx-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  Fri Aug 21 18:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:26:39 +0000
Subject: [pkgdb] zyx-liveinstaller summary updated by ausil
Message-ID: <20090821182639.10BC610F86F@bastion2.fedora.phx.redhat.com>

ausil set package zyx-liveinstaller summary to Install a running LiveOS rebootlessly

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zyx-liveinstaller



From ausil at fedoraproject.org  Fri Aug 21 18:26:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:26:45 +0000 (UTC)
Subject: rpms/zyx-liveinstaller - New directory
Message-ID: <20090821182645.20BA111C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/zyx-liveinstaller
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse20224/rpms/zyx-liveinstaller

Log Message:
Directory /cvs/pkgs/rpms/zyx-liveinstaller added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:26:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:26:45 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel - New directory
Message-ID: <20090821182645.4430711C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse20224/rpms/zyx-liveinstaller/devel

Log Message:
Directory /cvs/pkgs/rpms/zyx-liveinstaller/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:26:39 +0000
Subject: [pkgdb] zyx-liveinstaller (Fedora, 11) updated by ausil
Message-ID: <20090821182639.1992210F886@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for zyx-liveinstaller
ausil has set commit to Approved for 107427 on zyx-liveinstaller (Fedora 11)
ausil has set checkout to Approved for 107427 on zyx-liveinstaller (Fedora 11)
ausil has set build to Approved for 107427 on zyx-liveinstaller (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zyx-liveinstaller



From ausil at fedoraproject.org  Fri Aug 21 18:26:51 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:26:51 +0000 (UTC)
Subject: rpms/zyx-liveinstaller Makefile,NONE,1.1
Message-ID: <20090821182651.DC75211C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/zyx-liveinstaller
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse20224/rpms/zyx-liveinstaller

Added Files:
	Makefile 
Log Message:
Setup of module zyx-liveinstaller


--- NEW FILE Makefile ---
# Top level Makefile for module zyx-liveinstaller
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:26:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:26:52 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090821182652.1ADFD11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvse20224/rpms/zyx-liveinstaller/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zyx-liveinstaller


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zyx-liveinstaller
# $Id: Makefile,v 1.1 2009/08/21 18:26:51 ausil Exp $
NAME := zyx-liveinstaller
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 21 18:27:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:27:27 +0000
Subject: [pkgdb] maloc was added for timfenn
Message-ID: <20090821182728.4325110F890@bastion2.fedora.phx.redhat.com>

ausil has added Package maloc with summary Minimal Abstraction Layer for Object-oriented C/C++ programs
ausil has approved Package maloc
ausil has added a Fedora devel branch for maloc with an owner of timfenn
ausil has approved maloc in Fedora devel
ausil has approved Package maloc
ausil has set commit to Approved for 107427 on maloc (Fedora devel)
ausil has set checkout to Approved for 107427 on maloc (Fedora devel)
ausil has set build to Approved for 107427 on maloc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maloc



From pkgdb at fedoraproject.org  Fri Aug 21 18:27:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:27:29 +0000
Subject: [pkgdb] maloc summary updated by ausil
Message-ID: <20090821182729.0E52210F881@bastion2.fedora.phx.redhat.com>

ausil set package maloc summary to Minimal Abstraction Layer for Object-oriented C/C++ programs

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maloc



From ausil at fedoraproject.org  Fri Aug 21 18:27:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:27:35 +0000 (UTC)
Subject: rpms/maloc - New directory
Message-ID: <20090821182735.1362F11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maloc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsi20548/rpms/maloc

Log Message:
Directory /cvs/pkgs/rpms/maloc added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:27:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:27:29 +0000
Subject: [pkgdb] maloc (Fedora EPEL, 5) updated by ausil
Message-ID: <20090821182729.18CF110F889@bastion2.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for maloc
ausil has set commit to Approved for 107427 on maloc (Fedora EPEL 5)
ausil has set checkout to Approved for 107427 on maloc (Fedora EPEL 5)
ausil has set build to Approved for 107427 on maloc (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maloc



From pkgdb at fedoraproject.org  Fri Aug 21 18:27:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:27:29 +0000
Subject: [pkgdb] maloc (Fedora EPEL, 5) updated by ausil
Message-ID: <20090821182729.20FAF10F898@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for maloc
ausil has set commit to Approved for 107427 on maloc (Fedora 11)
ausil has set checkout to Approved for 107427 on maloc (Fedora 11)
ausil has set build to Approved for 107427 on maloc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maloc



From ausil at fedoraproject.org  Fri Aug 21 18:27:42 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:27:42 +0000 (UTC)
Subject: rpms/maloc Makefile,NONE,1.1
Message-ID: <20090821182742.0221711C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maloc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsi20548/rpms/maloc

Added Files:
	Makefile 
Log Message:
Setup of module maloc


--- NEW FILE Makefile ---
# Top level Makefile for module maloc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:27:42 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:27:42 +0000 (UTC)
Subject: rpms/maloc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090821182742.5E76611C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maloc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsi20548/rpms/maloc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maloc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maloc
# $Id: Makefile,v 1.1 2009/08/21 18:27:42 ausil Exp $
NAME := maloc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 21 18:27:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:27:35 +0000 (UTC)
Subject: rpms/maloc/devel - New directory
Message-ID: <20090821182735.382FF11C02C3@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/maloc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsi20548/rpms/maloc/devel

Log Message:
Directory /cvs/pkgs/rpms/maloc/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:09 +0000
Subject: [pkgdb] moblin-panel-applications was added for pbrobinson
Message-ID: <20090821182809.D697F10F881@bastion2.fedora.phx.redhat.com>

ausil has added Package moblin-panel-applications with summary Moblin Panel for launching Applications
ausil has approved Package moblin-panel-applications
ausil has added a Fedora devel branch for moblin-panel-applications with an owner of pbrobinson
ausil has approved moblin-panel-applications in Fedora devel
ausil has approved Package moblin-panel-applications
ausil has set commit to Approved for 107427 on moblin-panel-applications (Fedora devel)
ausil has set checkout to Approved for 107427 on moblin-panel-applications (Fedora devel)
ausil has set build to Approved for 107427 on moblin-panel-applications (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-applications



From pkgdb at fedoraproject.org  Fri Aug 21 18:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:11 +0000
Subject: [pkgdb] moblin-panel-applications summary updated by ausil
Message-ID: <20090821182811.53A3210F890@bastion2.fedora.phx.redhat.com>

ausil set package moblin-panel-applications summary to Moblin Panel for launching Applications

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-applications



From pkgdb at fedoraproject.org  Fri Aug 21 18:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:11 +0000
Subject: [pkgdb] moblin-panel-applications (Fedora, 11) updated by ausil
Message-ID: <20090821182811.7176010F886@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for moblin-panel-applications
ausil has set commit to Approved for 107427 on moblin-panel-applications (Fedora 11)
ausil has set checkout to Approved for 107427 on moblin-panel-applications (Fedora 11)
ausil has set build to Approved for 107427 on moblin-panel-applications (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-applications



From ausil at fedoraproject.org  Fri Aug 21 18:28:17 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:28:17 +0000 (UTC)
Subject: rpms/moblin-panel-applications - New directory
Message-ID: <20090821182817.1ADE311C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/moblin-panel-applications
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM20866/rpms/moblin-panel-applications

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-applications added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:28:17 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:28:17 +0000 (UTC)
Subject: rpms/moblin-panel-applications/devel - New directory
Message-ID: <20090821182817.3EBBF11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/moblin-panel-applications/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM20866/rpms/moblin-panel-applications/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-applications/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:28:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:28:23 +0000 (UTC)
Subject: rpms/moblin-panel-applications Makefile,NONE,1.1
Message-ID: <20090821182823.86D3F11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/moblin-panel-applications
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM20866/rpms/moblin-panel-applications

Added Files:
	Makefile 
Log Message:
Setup of module moblin-panel-applications


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-panel-applications
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From cheekyboinc at fedoraproject.org  Fri Aug 21 18:28:37 2009
From: cheekyboinc at fedoraproject.org (Stefan Posdzich)
Date: Fri, 21 Aug 2009 18:28:37 +0000 (UTC)
Subject: rpms/maxr/devel .cvsignore, 1.3, 1.4 maxr.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20090821182837.AD1A311C00D7@cvs1.fedora.phx.redhat.com>

Author: cheekyboinc

Update of /cvs/pkgs/rpms/maxr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20443

Modified Files:
	.cvsignore maxr.spec sources 
Log Message:
New Upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 May 2009 17:22:00 -0000	1.3
+++ .cvsignore	21 Aug 2009 18:28:37 -0000	1.4
@@ -1 +1 @@
-maxr-0.2.5.tar.gz
+maxr-0.2.6.tar.gz


Index: maxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/devel/maxr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- maxr.spec	25 Jul 2009 11:52:56 -0000	1.4
+++ maxr.spec	21 Aug 2009 18:28:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		maxr
-Version:	0.2.5
-Release:	2%{?dist}
+Version:	0.2.6
+Release:	1%{?dist}
 Summary:	A classic turn-based strategy game
 
 Group:		Amusements/Games
@@ -89,6 +89,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Fri Aug 21 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.2.6-1
+- New Upstream Release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 May 2009 17:22:00 -0000	1.3
+++ sources	21 Aug 2009 18:28:37 -0000	1.4
@@ -1 +1 @@
-a1425820ac15aeea4089fc6b045cf588  maxr-0.2.5.tar.gz
+14c6545e4038b8319b132d8aa9929194  maxr-0.2.6.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 21 18:28:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:49 +0000
Subject: [pkgdb] perl-Devel-LeakGuard-Object was added for iarnell
Message-ID: <20090821182849.1DCF210F890@bastion2.fedora.phx.redhat.com>

ausil has added Package perl-Devel-LeakGuard-Object with summary Scoped checks for object leaks
ausil has approved Package perl-Devel-LeakGuard-Object
ausil has added a Fedora devel branch for perl-Devel-LeakGuard-Object with an owner of iarnell
ausil has approved perl-Devel-LeakGuard-Object in Fedora devel
ausil has approved Package perl-Devel-LeakGuard-Object
ausil has set commit to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora devel)
ausil has set checkout to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora devel)
ausil has set build to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-LeakGuard-Object



From pkgdb at fedoraproject.org  Fri Aug 21 18:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:50 +0000
Subject: [pkgdb] perl-Devel-LeakGuard-Object (Fedora, 11) updated by ausil
Message-ID: <20090821182850.8967B10F8A6@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on perl-Devel-LeakGuard-Object (Fedora devel) for perl-sig
ausil approved watchcommits on perl-Devel-LeakGuard-Object (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-LeakGuard-Object



From pkgdb at fedoraproject.org  Fri Aug 21 18:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:50 +0000
Subject: [pkgdb] perl-Devel-LeakGuard-Object summary updated by ausil
Message-ID: <20090821182850.8145610F89B@bastion2.fedora.phx.redhat.com>

ausil set package perl-Devel-LeakGuard-Object summary to Scoped checks for object leaks

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-LeakGuard-Object



From pkgdb at fedoraproject.org  Fri Aug 21 18:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:50 +0000
Subject: [pkgdb] perl-Devel-LeakGuard-Object (Fedora, 11) updated by ausil
Message-ID: <20090821182850.957B810F8B0@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for perl-Devel-LeakGuard-Object
ausil has set commit to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora 10)
ausil has set checkout to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora 10)
ausil has set build to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora 10)
ausil approved watchbugzilla on perl-Devel-LeakGuard-Object (Fedora 10) for perl-sig
ausil approved watchcommits on perl-Devel-LeakGuard-Object (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-LeakGuard-Object



From ausil at fedoraproject.org  Fri Aug 21 18:29:03 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:29:03 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object Makefile,NONE,1.1
Message-ID: <20090821182903.A972E11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21150/rpms/perl-Devel-LeakGuard-Object

Added Files:
	Makefile 
Log Message:
Setup of module perl-Devel-LeakGuard-Object


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Devel-LeakGuard-Object
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:19:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:19:39 +0000 (UTC)
Subject: rpms/plexus-mail-sender/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090821181939.9B58411C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-mail-sender/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx17834/rpms/plexus-mail-sender/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-mail-sender


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-mail-sender
# $Id: Makefile,v 1.1 2009/08/21 18:19:39 ausil Exp $
NAME := plexus-mail-sender
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 21 18:31:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:31:19 +0000
Subject: [pkgdb] espresso-ab (Fedora EPEL, 5) updated by ausil
Message-ID: <20090821183119.7C6E610F889@bastion2.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for espresso-ab
ausil has set commit to Approved for 107427 on espresso-ab (Fedora EPEL 5)
ausil has set checkout to Approved for 107427 on espresso-ab (Fedora EPEL 5)
ausil has set build to Approved for 107427 on espresso-ab (Fedora EPEL 5)
ausil changed owner of espresso-ab in Fedora EPEL 5 to shakthimaan
ausil approved watchbugzilla on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved watchcommits on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved commit on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved build on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved approveacls on espresso-ab (Fedora EPEL 5) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From pkgdb at fedoraproject.org  Fri Aug 21 18:31:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:31:27 +0000
Subject: [pkgdb] espresso-ab (Fedora EPEL, 5) updated by ausil
Message-ID: <20090821183127.850F810F89F@bastion2.fedora.phx.redhat.com>

ausil changed owner of espresso-ab in Fedora EPEL 5 to shakthimaan
ausil approved watchbugzilla on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved watchcommits on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved commit on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved build on espresso-ab (Fedora EPEL 5) for chitlesh
ausil approved approveacls on espresso-ab (Fedora EPEL 5) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/espresso-ab



From ajax at fedoraproject.org  Fri Aug 21 18:33:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 21 Aug 2009 18:33:32 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.6.99-default-modes.patch, NONE,
	1.1 xorg-x11-server.spec, 1.475, 1.476
Message-ID: <20090821183332.DCBFB11C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22633

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-default-modes.patch 
Log Message:
* Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 1.6.99-39.20090820
- xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
  the driver returned real modes (and has no EDID).


xserver-1.6.99-default-modes.patch:
 xf86Crtc.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.6.99-default-modes.patch ---
>From 50552b0ee81b23b997bebd798b19b4a7e234a55f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Fri, 21 Aug 2009 13:51:45 -0400
Subject: [PATCH] tweak default mode list yet again

---
 hw/xfree86/modes/xf86Crtc.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 4f14a75..c6fd910 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1567,7 +1567,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	int		    min_clock = 0;
 	int		    max_clock = 0;
 	double		    clock;
-	Bool                add_default_modes = TRUE;
+	Bool                add_default_modes;
 	enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
 	
 	while (output->probed_modes != NULL)
@@ -1610,6 +1610,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	}
 	
 	output_modes = (*output->funcs->get_modes) (output);
+
+	/* if the driver found modes, don't second-guess it */
+	add_default_modes = (output_modes == NULL);
 	
 	edid_monitor = output->MonInfo;
 	
-- 
1.6.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- xorg-x11-server.spec	21 Aug 2009 16:35:46 -0000	1.475
+++ xorg-x11-server.spec	21 Aug 2009 18:33:32 -0000	1.476
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   38.%{gitdate}%{?dist}
+Release:   39.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -80,6 +80,7 @@ Patch6028: xserver-1.6.99-randr-error-de
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
+Patch6033: xserver-1.6.99-default-modes.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -506,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 1.6.99-39.20090820
+- xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
+  the driver returned real modes (and has no EDID).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.99-38.20090820
 - rebuilt with new openssl
 



From overholt at fedoraproject.org  Fri Aug 21 18:33:34 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 18:33:34 +0000 (UTC)
Subject: rpms/plexus-cli/devel import.log, NONE, 1.1 plexus-cli-1.2-build.xml,
	NONE, 1.1 plexus-cli-1.2-jpp-depmap.xml, NONE,
	1.1 plexus-cli-licenseheaders.patch, NONE,
	1.1 plexus-cli-settings.xml, NONE, 1.1 plexus-cli.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821183334.E41BD11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-cli/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-cli-1.2-build.xml 
	plexus-cli-1.2-jpp-depmap.xml plexus-cli-licenseheaders.patch 
	plexus-cli-settings.xml plexus-cli.spec 
Log Message:
Initial import of plexus-cli (review request is bug #518550).



--- NEW FILE import.log ---
plexus-cli-1_2-7_fc11:HEAD:plexus-cli-1.2-7.fc11.src.rpm:1250879493


--- NEW FILE plexus-cli-1.2-build.xml ---
<project name="plexus-cli" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-cli-1.2"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar"/>
      <include name="commons-cli/commons-cli/1.0/commons-cli-1.0.jar"/>
      <include name="org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar"/>
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/external_repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/commons-cli/commons-cli/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/external_repo/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" dest="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/org/codehaus/plexus/plexus-component-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/external_repo/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/external_repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/external_repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-cli-1.2/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Cli Component 1.2 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.tools.cli.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>


--- NEW FILE plexus-cli-1.2-jpp-depmap.xml ---
<dependencies>
  <dependency>
    <maven>
      <groupId>org.codehaus.plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
      <version>1.0-alpha-34</version>
    </maven>
    <jpp>
      <groupId>JPP/plexus</groupId>
      <artifactId>containers-container-default</artifactId>
      <version>1.0-alpha-30</version>
    </jpp>
  </dependency>
</dependencies>

plexus-cli-licenseheaders.patch:
 main/java/org/codehaus/plexus/tools/cli/AbstractCli.java |   18 ++++++++++++++-
 main/java/org/codehaus/plexus/tools/cli/Cli.java         |   16 +++++++++++++
 test/java/org/codehaus/plexus/tools/cli/CliTest.java     |   16 +++++++++++++
 test/java/org/codehaus/plexus/tools/cli/TestCli.java     |   16 +++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)

--- NEW FILE plexus-cli-licenseheaders.patch ---
Index: plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
===================================================================
diff -u -N -r7725 -r8335
--- plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java	(.../AbstractCli.java)	(revision 7725)
+++ plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java	(.../AbstractCli.java)	(revision 8335)
@@ -1,5 +1,21 @@
 package org.codehaus.plexus.tools.cli;
 
+/*
+ * Copyright 2006 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
@@ -23,7 +39,7 @@
 
 /**
  * @author jason van zyl
- * @version $Id: AbstractCli.java 7025 2007-10-27 00:36:10Z jvanzyl $
+ * @version $Id: AbstractCli.java 8335 2009-08-12 13:55:32Z bentmann $
  * @noinspection UseOfSystemOutOrSystemErr,ACCESS_STATIC_VIA_INSTANCE
  */
 public abstract class AbstractCli
Index: plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/Cli.java
===================================================================
diff -u -N -r7725 -r8335
--- plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/Cli.java	(.../Cli.java)	(revision 7725)
+++ plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/Cli.java	(.../Cli.java)	(revision 8335)
@@ -1,5 +1,21 @@
 package org.codehaus.plexus.tools.cli;
 
+/*
+ * Copyright 2006 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.codehaus.plexus.PlexusContainer;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.CommandLine;
Index: plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java
===================================================================
diff -u -N -r7725 -r8335
--- plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java	(.../CliTest.java)	(revision 7725)
+++ plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java	(.../CliTest.java)	(revision 8335)
@@ -1,5 +1,21 @@
 package org.codehaus.plexus.tools.cli;
 
+/*
+ * Copyright 2006 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
Index: plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
===================================================================
diff -u -N -r7725 -r8335
--- plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java	(.../TestCli.java)	(revision 7725)
+++ plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java	(.../TestCli.java)	(revision 8335)
@@ -1,5 +1,21 @@
 package org.codehaus.plexus.tools.cli;
 
+/*
+ * Copyright 2006 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.util.FileUtils;
 import org.apache.commons.cli.Options;


--- NEW FILE plexus-cli-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 plexus-cli.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with_maven 0

%define parent plexus
%define subname cli
%define namedversion 1.2

Name:           %{parent}-%{subname}
Version:        1.2
Release:        7%{?dist}
Epoch:          0
Summary:        Command Line Interface facilitator for Plexus
License:        ASL 2.0 and Plexus
Group:          Development/Libraries
URL:            http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cli-1.2
# tar czf plexus-cli-%{version}-src.tar.gz plexus-cli-%{version}
# Note: Exported revision 8188.
Source0:        %{name}-%{namedversion}-src.tar.gz

Source1:        plexus-cli-1.2-build.xml
Source2:        plexus-cli-settings.xml
Source3:        plexus-cli-1.2-jpp-depmap.xml

# License headers missing from some files
# http://jira.codehaus.org/browse/PLX-418
Patch0:         plexus-cli-licenseheaders.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  junit
%if %{with_maven}
BuildRequires:  maven2 >= 2.0.4-10jpp
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  maven-doxia
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven-release
%endif
BuildRequires:  plexus-classworlds
BuildRequires:  plexus-containers-container-default
BuildRequires:  plexus-utils 

Requires:  plexus-classworlds
Requires:  plexus-containers-container-default
Requires:  plexus-utils 
Requires(post):    jpackage-utils >= 0:1.7.3
Requires(postun):  jpackage-utils >= 0:1.7.3

%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
embedded or for a full scale application server. There are many
reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}-%{namedversion}
find . -name "*.jar" -exec rm -f {} \;
#for j in $(find . -name "*.jar" ); do
#        mv $j $j.no
#done

%patch0 -p3

cp %{SOURCE1} build.xml
cp %{SOURCE2} settings.xml

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

%if %{with_maven}
mvn-jpp \
        -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
        install javadoc:javadoc

%else
export CLASSPATH=$(build-classpath \
plexus/classworlds \
plexus/containers-container-default \
plexus/utils  \
commons-cli \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes

ant -Dbuild.sysclasspath=only jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}

(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*


%changelog
* Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-7
- Remove gcj support
- Default to building with ant
- Add patch to include fixed file headers
  (http://jira.codehaus.org/browse/PLX-418)

* Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> 0:1.2-6
- Fix license and source URL

* Tue Apr 30 2009 Yong Yang <yyang at redhat.com> 0:1.2-5
- Add BRs maven-doxia*
- Rebuild with new maven2 2.0.8 built in non-bootstrap mode

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.2-4
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 0:1.2-3
- fix release tag

* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> 0:1.2-2jpp.2
-re-build with gcj

* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> 0:1.2-2jpp.1
- Import from maven 2.0.8 packages, initial bulding

* Wed Jan 30 2008 Deepak Bhole <dbhole at redhat.com> 0:1.2-1jpp.1
- Initial build with merge from JPackage


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:18:46 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:33:34 -0000	1.2
@@ -0,0 +1 @@
+plexus-cli-1.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:18:46 -0000	1.1
+++ sources	21 Aug 2009 18:33:34 -0000	1.2
@@ -0,0 +1 @@
+42c9d47134a0666879f0134c855166b9  plexus-cli-1.2-src.tar.gz



From ajax at fedoraproject.org  Fri Aug 21 18:34:03 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Fri, 21 Aug 2009 18:34:03 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-6.13-dri2-init.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.183, 1.184
Message-ID: <20090821183403.7979311C00D7@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22946

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.13-dri2-init.patch 
Log Message:
* Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 6.13.0-0.2.20090821gitb1b77a4d6
- radeon-6.13-dri2-init.patch: Fix DRI2 init.


radeon-6.13-dri2-init.patch:
 radeon_dri2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE radeon-6.13-dri2-init.patch ---
diff -up xf86-video-ati-20090821/src/radeon_dri2.c.jx xf86-video-ati-20090821/src/radeon_dri2.c
--- xf86-video-ati-20090821/src/radeon_dri2.c.jx	2009-08-19 13:30:37.000000000 -0400
+++ xf86-video-ati-20090821/src/radeon_dri2.c	2009-08-21 13:54:15.467283639 -0400
@@ -292,7 +292,7 @@ radeon_dri2_screen_init(ScreenPtr pScree
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     RADEONInfoPtr info = RADEONPTR(pScrn);
-    DRI2InfoRec dri2_info;
+    DRI2InfoRec dri2_info = { 0 };
     int fd;
     char *bus_id;
     char *tmp_bus_id;


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- xorg-x11-drv-ati.spec	21 Aug 2009 03:35:58 -0000	1.183
+++ xorg-x11-drv-ati.spec	21 Aug 2009 18:34:03 -0000	1.184
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.1.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.2.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,6 +21,7 @@ Source1:    mkxinf
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
+Patch14:    radeon-6.13-dri2-init.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +48,7 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
+%patch14 -p1 -b .dri2-init
 
 %build
 autoreconf -iv
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 6.13.0-0.2.20090821gitb1b77a4d6
+- radeon-6.13-dri2-init.patch: Fix DRI2 init.
+
 * Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.1.20090821gitb1b77a4d6
 - change versioning to git snapshot for now
 



From overholt at fedoraproject.org  Fri Aug 21 18:34:55 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 18:34:55 +0000 (UTC)
Subject: rpms/plexus-mail-sender/devel import.log, NONE,
	1.1 maven2-settings.xml, NONE,
	1.1 plexus-mail-sender-clarifylicense.patch, NONE,
	1.1 plexus-mail-sender-jpp-depmap.xml, NONE,
	1.1 plexus-mail-sender-mapdeps.xsl, NONE,
	1.1 plexus-mail-sender.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090821183455.C2BF111C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-mail-sender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23399/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log maven2-settings.xml 
	plexus-mail-sender-clarifylicense.patch 
	plexus-mail-sender-jpp-depmap.xml 
	plexus-mail-sender-mapdeps.xsl plexus-mail-sender.spec 
Log Message:
Initial import (review bug #518650).



--- NEW FILE import.log ---
plexus-mail-sender-1_0-0_a2_9_fc11:HEAD:plexus-mail-sender-1.0-0.a2.9.fc11.src.rpm:1250879578


--- NEW FILE maven2-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>
			</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>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

plexus-mail-sender-clarifylicense.patch:
 DateFormatUtils.java |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

--- NEW FILE plexus-mail-sender-clarifylicense.patch ---
Index: archive/plexus-components/plexus-mail-sender/plexus-mail-sender-api/src/main/java/org/codehaus/plexus/mailsender/util/DateFormatUtils.java
===================================================================
diff -u -N -r7637 -r8336
--- archive/plexus-components/plexus-mail-sender/plexus-mail-sender-api/src/main/java/org/codehaus/plexus/mailsender/util/DateFormatUtils.java	(.../DateFormatUtils.java)	(revision 7637)
+++ archive/plexus-components/plexus-mail-sender/plexus-mail-sender-api/src/main/java/org/codehaus/plexus/mailsender/util/DateFormatUtils.java	(.../DateFormatUtils.java)	(revision 8336)
@@ -1,7 +1,27 @@
 package org.codehaus.plexus.mailsender.util;
 
 /*
- * LICENSE
+ * The MIT License
+ *
+ * Copyright (c) 2005, The Codehaus
+ *
+ * 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.
  */
 
 import java.text.SimpleDateFormat;
@@ -10,7 +30,7 @@
 
 /**
  * @author <a href="mailto:trygvis at inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: DateFormatUtils.java 2338 2005-07-19 10:17:07Z evenisse $
+ * @version $Id: DateFormatUtils.java 8336 2009-08-12 14:19:22Z bentmann $
  */
 public class DateFormatUtils
 {


--- NEW FILE plexus-mail-sender-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>plexus</groupId>
         <artifactId>plexus-mail-sender-test</artifactId>
         <version>1.0-alpha-2</version>
      </maven>
      <jpp>
         <groupId>plexus</groupId>
         <artifactId>plexus-mail-sender-test</artifactId>
         <version>1.0-alpha-2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>dumbster</groupId>
         <artifactId>dumbster</artifactId>
         <version>1.5</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>dumbster</artifactId>
         <version>1.5</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <version>1.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jaf</artifactId>
         <version>1.0.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
         <version>1.3.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>javamail</artifactId>
         <version>1.3.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
         <version>1.0-alpha-5</version>
      </maven>
      <jpp>
         <groupId>JPP/plexus</groupId>
         <artifactId>container-default</artifactId>
         <version>1.0-alpha-5</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <version>1.0.1</version>
      </maven>
      <jpp>
         <groupId>JPP/plexus</groupId>
         <artifactId>utils</artifactId>
         <version>1.0.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>classworlds</groupId>
         <artifactId>classworlds</artifactId>
         <version>1.1-alpha-2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>classworlds</artifactId>
         <version>1.1-alpha-2</version>
      </jpp>
   </dependency>
</dependencies>


--- NEW FILE plexus-mail-sender-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:param name="map" /> 
  <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
  <xsl:strip-space elements="*"/> 
  <xsl:template match="/*[name()='project']" >
	<xsl:element name="project">

	  <!-- Replace artifact/group/version/etc. for current project -->

	  <xsl:variable name="artifact" select="./*[name()='artifactId']"/>
	  <xsl:variable name="group" select="./*[name()='groupId']"/>
	  <xsl:variable name="parentGroup" select="./*[name()='parent']/*[name()='groupId']"/>

	  <xsl:choose>
		<xsl:when test="(document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $group)])">
		  <xsl:for-each select="document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $group)][1]">
			<xsl:if test="../jpp">
			  <xsl:copy-of select="../jpp/*"/>
			</xsl:if>
		  </xsl:for-each>
		</xsl:when>

		<xsl:otherwise>
		  <xsl:choose>

			<!-- Maybe parent group matches? -->
			<xsl:when test="(document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $parentGroup)])">
			  <xsl:for-each select="document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $parentGroup)][1]">
				<xsl:if test="../jpp">
				  <xsl:copy-of select="../jpp/*"/>
				</xsl:if>
			  </xsl:for-each>
			</xsl:when>

			<!-- Nothing matched -->
			<xsl:otherwise>
			  <xsl:copy-of select="*[name() = 'artifactId']"/>
			  <xsl:copy-of select="*[name() = 'groupId']"/>
			  <xsl:copy-of select="*[name() = 'id']"/>
			  <xsl:copy-of select="*[name() = 'version']"/>
			</xsl:otherwise>
		  </xsl:choose>
		</xsl:otherwise>
	  </xsl:choose>

	  <!-- In the parent, replace groupid/artifactid/version-->

	  <xsl:for-each select="./*[name()='parent']">
		<xsl:apply-templates select="."/>
	  </xsl:for-each>

	  <!-- Copy rest -->
	  <xsl:for-each select="./*">
		<xsl:if test="(name() != 'dependencies') and (name() != 'dependencyManagement') and (name() != 'modelVersion') and (name() != 'parent') and (name() != 'build') and (name() != 'profiles') and (name() != 'artifactId') and (name() != 'groupId') and (name() != 'id') and (name() != 'version')">
		  <xsl:copy-of select="." />
		</xsl:if>
	  </xsl:for-each>

	<!-- If no dependencies exist, add just the <add> items -->
	  <xsl:if test="not(./*[name()='dependencies'])">
		<xsl:element name="dependencies">
		  <xsl:for-each select="document($map)//add/dependency">
			<xsl:copy-of select="." />
		  </xsl:for-each>
		</xsl:element>
	  </xsl:if>

	  <!-- Do not remove this! Maven code has a string match for
	       "<modelVersion>4.0.0" which fails if the line below is
	       removed (because without it, the ns attribute would be
	       added to the modelVersion tag) -->

	  <xsl:for-each select="./*[name()='modelVersion']">
		<xsl:element name="{name()}">
		  <xsl:value-of select="text()" />
		</xsl:element>
	  </xsl:for-each>

	  <!-- Apply templates to rest -->
	  <xsl:apply-templates select="*[name()='build']"/>
	  <xsl:apply-templates select="*[name()='profiles']"/>
	  <xsl:apply-templates select="*[name()='dependencies']"/>
	  <xsl:element name="dependencyManagement">
		<xsl:for-each select="*[name()='dependencyManagement']">
		  <xsl:apply-templates select="*[name()='dependencies']"/>
		</xsl:for-each>
	  </xsl:element>
	</xsl:element>
  </xsl:template>

  <!-- In each of the dependencies, update groupid/artifactid/version -->
  <xsl:template match="*[name()='dependencies']">
	<xsl:element name="dependencies">
	  <xsl:for-each select="*[name()='dependency']">
		<xsl:if test="*[name()='artifactId']">
		  <xsl:call-template name="replace">
			<xsl:with-param name="artifact" select="*[name()='artifactId']/text()"/>
			<xsl:with-param name="group" select="*[name()='groupId']/text()"/>
		  </xsl:call-template>
		</xsl:if>
		<xsl:if test="*[name()='id']">
		  <xsl:choose>
			<xsl:when test="substring-after(*[name()='id']/text(),':') != ''">
			  <xsl:call-template name="replace">
				<xsl:with-param name="artifact" select="substring-after(*[name()='id']/text(),':')"/>
			  </xsl:call-template>
			</xsl:when>
			<xsl:otherwise>
			  <xsl:call-template name="replace">
				<xsl:with-param name="artifact" select="*[name()='id']/text()"/>
			  </xsl:call-template>
			</xsl:otherwise>
		  </xsl:choose>
		</xsl:if>
	  </xsl:for-each>
	  <xsl:for-each select="document($map)//add/dependency">
		<xsl:copy-of select="."/>
	  </xsl:for-each>
	</xsl:element>
  </xsl:template>

  <!-- Standard replacement template for dependencies -->

  <xsl:template name="replace">
	<xsl:param name="artifact"/>
	<xsl:param name="group"/>
	<xsl:variable name="this" select="."/>
	  <xsl:choose>
		<xsl:when test="(document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $group)])">
		  <xsl:for-each select="document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $group)][1]">
			<xsl:if test="../jpp">
			  <xsl:element name="dependency">
				<xsl:copy-of select="../jpp/*"/>
				<xsl:for-each select="$this/*">
				  <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id') and (name() != 'version')">
					<xsl:copy-of select="."/>
				  </xsl:if>
				</xsl:for-each>
			  </xsl:element>
			</xsl:if>
		  </xsl:for-each>
		</xsl:when>
		<xsl:otherwise>
		  <xsl:element name="dependency">
			<xsl:copy-of select="./*"/>
		  </xsl:element>
		</xsl:otherwise>
	  </xsl:choose>
	<xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
	  <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
		<xsl:for-each select="../add/dependency">
		  <xsl:element name="dependency">
			<xsl:copy-of select="./*"/>
		  </xsl:element>
		</xsl:for-each>
	  </xsl:for-each>
	</xsl:if>
  </xsl:template>

  <!-- In the parent, replace groupid/artifactid/version-->

  <xsl:template match="*[name()='parent']">
	<xsl:element name="parent">
	  <xsl:for-each select=".">
		<xsl:if test="*[name()='artifactId']">
		  <xsl:call-template name="replaceNonDep">
			<xsl:with-param name="artifact" select="*[name()='artifactId']/text()"/>
			<xsl:with-param name="group" select="*[name()='groupId']/text()"/>
		  </xsl:call-template>
		</xsl:if>
		<xsl:if test="*[name()='id']">
		  <xsl:choose>
			<xsl:when test="substring-after(*[name()='id']/text(),':') != ''">
			  <xsl:call-template name="replaceNonDep">
				<xsl:with-param name="artifact" select="substring-after(*[name()='id']/text(),':')"/>
			  </xsl:call-template>
			</xsl:when>
			<xsl:otherwise>
			  <xsl:call-template name="replaceNonDep">
				<xsl:with-param name="artifact" select="*[name()='id']/text()"/>
			  </xsl:call-template>
			</xsl:otherwise>
		  </xsl:choose>
		</xsl:if>
	  </xsl:for-each>
	</xsl:element>
  </xsl:template>

  <!-- In build element, replace plugin and extension groupid/artifactid/version -->
  <xsl:template match="*[name()='build']">
	<xsl:element name="build">
	  <xsl:for-each select="./*">
		<xsl:choose>
		  <xsl:when test="(name() != 'plugins') and (name() != 'extensions')">
			<xsl:copy-of select="." />
		  </xsl:when>
		  <xsl:otherwise>
			<xsl:apply-templates select="."/>
		  </xsl:otherwise>
		</xsl:choose>
	  </xsl:for-each>
	</xsl:element>
  </xsl:template>

  <!-- Go through profiles and apply build replacement templates -->
  <xsl:template match="*[name()='profiles']">
	<xsl:element name="profiles">
	  <xsl:for-each select="./*">
		<xsl:choose>
		  <xsl:when test="name() != 'profile'">
			<xsl:copy-of select="." />
		  </xsl:when>
		  <xsl:otherwise>
			<xsl:element name="profile">
			  <xsl:for-each select="./*">
				<xsl:choose>
				  <xsl:when test="name() != 'build'">
					<xsl:copy-of select="." />
				  </xsl:when>
				  <xsl:otherwise>
					<xsl:apply-templates select="."/>
				  </xsl:otherwise>
				</xsl:choose>
			  </xsl:for-each>
			</xsl:element>
		  </xsl:otherwise>
		</xsl:choose>
	  </xsl:for-each>
	</xsl:element>
  </xsl:template>

  <!-- In plugin info, update groupid/artifactid/version -->
  <xsl:template match="*[name()='plugins']">
	<xsl:element name="plugins">
	  <xsl:for-each select="*[name()='plugin']">
		<xsl:element name="plugin">
		<xsl:if test="*[name()='artifactId']">
		  <xsl:call-template name="replaceNonDep">
			<xsl:with-param name="artifact" select="*[name()='artifactId']/text()"/>
			<xsl:with-param name="group" select="*[name()='groupId']/text()"/>
		  </xsl:call-template>
		</xsl:if>
		<xsl:if test="*[name()='id']">
		  <xsl:choose>
			<xsl:when test="substring-after(*[name()='id']/text(),':') != ''">
			  <xsl:call-template name="replaceNonDep">
				<xsl:with-param name="artifact" select="substring-after(*[name()='id']/text(),':')"/>
			  </xsl:call-template>
			</xsl:when>
			<xsl:otherwise>
			  <xsl:call-template name="replaceNonDep">
				<xsl:with-param name="artifact" select="*[name()='id']/text()"/>
			  </xsl:call-template>
			</xsl:otherwise>
		  </xsl:choose>
		</xsl:if>
		</xsl:element>
	  </xsl:for-each>

	  <xsl:for-each select="*[name()!='plugin']">
		<xsl:copy-of select="."/>
	  </xsl:for-each>

	</xsl:element>
  </xsl:template>

  <!-- In extension info, update groupid/artifactid/version -->
  <xsl:template match="*[name()='extensions']">
	<xsl:element name="extensions">
	  <xsl:for-each select="*[name()='extension']">
		<xsl:element name="extension">
		<xsl:if test="*[name()='artifactId']">
		  <xsl:call-template name="replaceNonDep">
			<xsl:with-param name="artifact" select="*[name()='artifactId']/text()"/>
			<xsl:with-param name="group" select="*[name()='groupId']/text()"/>
		  </xsl:call-template>
		</xsl:if>
		<xsl:if test="*[name()='id']">
		  <xsl:choose>
			<xsl:when test="substring-after(*[name()='id']/text(),':') != ''">
			  <xsl:call-template name="replaceNonDep">
				<xsl:with-param name="artifact" select="substring-after(*[name()='id']/text(),':')"/>
			  </xsl:call-template>
			</xsl:when>
			<xsl:otherwise>
			  <xsl:call-template name="replaceNonDep">
				<xsl:with-param name="artifact" select="*[name()='id']/text()"/>
			  </xsl:call-template>
			</xsl:otherwise>
		  </xsl:choose>
		</xsl:if>
		</xsl:element>
	  </xsl:for-each>

	  <xsl:for-each select="*[name()!='extension']">
		<xsl:copy-of select="."/>
	  </xsl:for-each>

	</xsl:element>
  </xsl:template>

  <!-- Standard template for replacing items that are not <dependency> items -->
  <xsl:template name="replaceNonDep">
	<xsl:param name="artifact"/>
	<xsl:param name="group"/>
	<xsl:variable name="this" select="."/>
	  <xsl:choose>
		<xsl:when test="(document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $group)])">
		  <xsl:for-each select="document($map)//dependency/maven[(./artifactId/text() = $artifact) and (./groupId/text() = $group)][1]">
			<xsl:if test="../jpp">
			  <xsl:copy-of select="../jpp/*"/>
			  <xsl:for-each select="$this/*">
				<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id') and (name() != 'version')">
				  <xsl:copy-of select="."/>
				</xsl:if>
			  </xsl:for-each>
			</xsl:if>
		  </xsl:for-each>
		</xsl:when>
		<xsl:otherwise>
		  <xsl:copy-of select="./*"/>
		</xsl:otherwise>
	  </xsl:choose>
  </xsl:template>


</xsl:stylesheet>


--- NEW FILE plexus-mail-sender.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define namedversion 1.0-alpha-2

Name:           plexus-mail-sender
Version:        1.0
Release:        0.a2.9%{?dist}
Epoch:          0
Summary:        Plexus Mail Sender
License:        MIT and ASL 1.1
Group:          Development/Tools
URL:            http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/tags/PLEXUS_MAIL_SENDER_1_0_ALPHA_2/
# Note: Exported revision 8188.
# mv PLEXUS_MAIL_SENDER_1_0_ALPHA_2/ plexus-mail-sender-1.0-a2
# tar czf plexus-mail-sender-1.0-a2-src.tar.gz plexus-mail-sender-1.0-a2
Source0:        plexus-mail-sender-%{version}-a2-src.tar.gz

Source1:        %{name}-mapdeps.xsl
Source2:        %{name}-jpp-depmap.xml
Source3:        maven2-settings.xml

# http://jira.codehaus.org/browse/PLX-417
# http://fisheye.codehaus.org/rdiff/plexus?csid=8336&u&N
Patch0:         %{name}-clarifylicense.patch

BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  maven2 >= 0:2.0.4
BuildRequires:  dumbster
BuildRequires:  saxon
BuildRequires:  saxon-scripts

BuildArch:      noarch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The Plexus project seeks to create end-to-end developer tools for 
writing applications. At the core is the container, which can be 
embedded or for a full scale application server. There are many 
reusable components for hibernate, form processing, jndi, i18n, 
velocity, etc. Plexus also includes an application server which 
is like a J2EE application server, without all the baggage.  This 
Plexus component provides SMTP transport.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}-%{version}-a2

%patch0 -p3

%build

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
        -e \
        -Dmaven2.jpp.depmap.file="%{SOURCE2}" \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.skip=true \
        install

# Bug in javadoc plugin makes this necessary for now
for pom in `find -name pom.xml`; do
        pushd `dirname $pom`
          mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE2}" \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL javadoc:javadoc
        popd
done

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 \
  plexus-mail-senders/plexus-mail-sender-javamail/target/%{name}-javamail-%{namedversion}-SNAPSHOT.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-javamail-%{version}.jar
install -pm 644 \
  plexus-mail-senders/plexus-mail-sender-simple/target/%{name}-simple-%{namedversion}-SNAPSHOT.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-simple-%{version}.jar
install -pm 644 \
  plexus-mail-senders/plexus-mail-sender-test/target/%{name}-test-%{namedversion}-SNAPSHOT.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-test-%{version}.jar
install -pm 644 \
  plexus-mail-sender-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
  ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
cp -pr plexus-mail-sender-api/target/site/apidocs/* \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
cp -pr plexus-mail-senders/plexus-mail-sender-test/target/site/apidocs/* \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/simple
cp -pr plexus-mail-senders/plexus-mail-sender-simple/target/site/apidocs/* \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/simple
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/javamail
cp -pr plexus-mail-senders/plexus-mail-sender-javamail/target/site/apidocs/* \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/javamail
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.9
- Remove gcj support
- Remove javadoc post scriplet
- Add patch to clarify license (http://jira.codehaus.org/browse/PLX-417)
- Fix license
- Use tarball with versioned directory

* Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> - 0:1.0-0.a2.8
- Fix license

* Tue Apr 30 2009 Yong Yang <yyang at redhat.com> - 0:1.0-0.a2.7
- Don't run the tests as they reqyuire access to the net
- Add BRs maven-doxia*
- Rebuild with new maven2 2.0.8 built in non-bootstrap mode

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> - 0:1.0-0.a2.6
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.0-0.a2.5
- Fix release tag

* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 0:1.0-0.a2.4jpp
- Import from dbhole's maven packages, initial building

* Tue May 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a2.3jpp
- Make Vendor, Distribution based on macro

* Thu Mar 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a2.2jpp
- Add dumbster BR

* Wed Sep 13 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a2.1jpp
- First JPP-1.7 release
- Add post/postun Requires for javadoc
- Add gcj_support option


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-mail-sender/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:19:39 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:34:55 -0000	1.2
@@ -0,0 +1 @@
+plexus-mail-sender-1.0-a2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-mail-sender/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:19:39 -0000	1.1
+++ sources	21 Aug 2009 18:34:55 -0000	1.2
@@ -0,0 +1 @@
+63da09d21db964ea41ce7a46a0605bb3  plexus-mail-sender-1.0-a2-src.tar.gz



From mbarnes at fedoraproject.org  Fri Aug 21 18:37:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 21 Aug 2009 18:37:01 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec, 1.112,
	1.113 devhelp-load-uris.patch, 1.1, NONE
Message-ID: <20090821183701.5E29211C00D7@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24564

Modified Files:
	devhelp.spec 
Removed Files:
	devhelp-load-uris.patch 
Log Message:

* Fri Aug 21 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23.1-2
- Remove patch for GNOME bug #572022 to help fix RH bug #518481.



Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- devhelp.spec	13 Aug 2009 01:23:36 -0000	1.112
+++ devhelp.spec	21 Aug 2009 18:37:01 -0000	1.113
@@ -6,7 +6,7 @@
 
 Name: devhelp
 Version: 0.23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
@@ -14,11 +14,6 @@ URL: http://developer.imendio.com/projec
 Source: http://download.gnome.org/sources/devhelp/0.23/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
-### Patches ###
-
-# RH bug #572022
-Patch0: devhelp-load-uris.patch
-
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -55,7 +50,6 @@ into other applications such as IDEs.
 
 %prep
 %setup -q -n devhelp-%{version}
-%patch0 -p0 -b .uris
 
 # force regeneration
 rm data/devhelp.schemas
@@ -142,6 +136,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 21 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23.1-2
+- Remove patch for GNOME bug #572022 to help fix RH bug #518481.
+
 * Wed Aug 12 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23.1-1
 - Update to 0.23.1
 - Remove patch for GNOME bug #588655 (fixed upstream).


--- devhelp-load-uris.patch DELETED ---



From timfenn at fedoraproject.org  Fri Aug 21 18:39:05 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 18:39:05 +0000 (UTC)
Subject: rpms/maloc/devel import.log, NONE, 1.1 maloc-configure.ac.patch,
	NONE, 1.1 maloc-makefile.am.patch, NONE, 1.1 maloc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821183905.943BD11C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/maloc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25000/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log maloc-configure.ac.patch maloc-makefile.am.patch 
	maloc.spec 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu>
- initial CVS commit




--- NEW FILE import.log ---
maloc-0_2-3_fc10:HEAD:maloc-0.2-3.fc10.src.rpm:1250879885

maloc-configure.ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maloc-configure.ac.patch ---
--- configure.ac_orig	2009-07-10 14:28:32.000000000 -0700
+++ configure.ac	2009-07-10 14:29:08.000000000 -0700
@@ -170,7 +170,7 @@
 AC_PROG_YACC
 
 dnl # Libtool stuff
-AC_DISABLE_SHARED
+# AC_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl AM_PROG_LIBTOOL makes AC_PROG_RANLIB unnecessary
 dnl striplib="";

maloc-makefile.am.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE maloc-makefile.am.patch ---
--- src/aaa_lib/Makefile.am_orig	2009-07-10 13:49:16.000000000 -0700
+++ src/aaa_lib/Makefile.am	2009-07-10 16:38:39.000000000 -0700
@@ -49,12 +49,12 @@
 LIBEFENCE =
 endif
 
-libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
+# libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
 lib_LTLIBRARIES = libmaloc.la ${LIBEFENCE}
 
 libmaloc_la_SOURCES =
 libmaloc_la_LIBADD  = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS}
-libmaloc_la_LDFLAGS = -version-info ${FETK_VERSION}
+libmaloc_la_LDFLAGS = @rl_lib@ @math_lib@ -version-info ${FETK_VERSION}
 
 libefence_la_SOURCES =
 libefence_la_LIBADD  = ${EFENCE_LIBS}


--- NEW FILE maloc.spec ---
Summary: Minimal Abstraction Layer for Object-oriented C
Name: maloc
Version: 0.2
Release: 3%{?dist}
Group: Applications/Engineering
License: GPLv2+
URL: http://www.fetk.org
Source0: http://www.fetk.org/codes/%{name}/%{name}-%{version}-1.tar.gz
# removes hardcoded libdir setting
Patch0: maloc-makefile.am.patch
# we like shared libraries
Patch1: maloc-configure.ac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: readline-devel

%description
MALOC is a small, portable, abstract C environment library for
object-oriented C programming. MALOC is used as the foundation layer
for a number of scientific applications, including MC, SG, and
APBS. MALOC can be used as a small stand-alone abstraction environment
for writing portable C programs which need access to resources which
are typically architecture-dependent, such as INET sockets, timing
routines, and so on. MALOC provides abstract datatypes, memory
management routines, timing routines, machine epsilon, access to UNIX
and INET sockets, MPI, and so on. All things that can vary from one
architecture to another are abstracted out of an application code and
placed in MALOC.

%package devel
Summary: Header files and library for developing programs with maloc
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries

%description devel

This package contains libraries and header files needed for program
development using MALOC.

%prep
%setup -n %{name} -q
%patch0 -p0
%patch1 -p0
aclocal
automake --gnu --add-missing
autoconf
autoheader
libtoolize --automake

%build
%configure --disable-static
make %{?_smp_mflags}

make -C doc/doxygen

%install
rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/api/html/*
%{_libdir}/*.so
%{_includedir}/maloc

%changelog
* Thu Aug 06 2009 Tim Fenn <fenn at stanford.edu> - 0.2-3
- add doxygen as buildreq

* Sat Jul 11 2009 Tim Fenn <fenn at stanford.edu> - 0.2-2
- remove pkgconfig dependency
- build doc

* Fri Jul 10 2009 Tim Fenn <fenn at stanford.edu> - 0.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:27:42 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:39:05 -0000	1.2
@@ -0,0 +1 @@
+maloc-0.2-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:27:42 -0000	1.1
+++ sources	21 Aug 2009 18:39:05 -0000	1.2
@@ -0,0 +1 @@
+d48961ef02f5ab977f610ad8e9bff4e5  maloc-0.2-1.tar.gz



From timfenn at fedoraproject.org  Fri Aug 21 18:39:42 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 18:39:42 +0000 (UTC)
Subject: rpms/maloc/F-11 import.log, NONE, 1.1 maloc-configure.ac.patch, NONE,
	1.1 maloc-makefile.am.patch, NONE, 1.1 maloc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821183942.5AFD911C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/maloc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25522/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log maloc-configure.ac.patch maloc-makefile.am.patch 
	maloc.spec 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu>
- initial CVS commit




--- NEW FILE import.log ---
maloc-0_2-3_fc10:F-11:maloc-0.2-3.fc10.src.rpm:1250879967

maloc-configure.ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maloc-configure.ac.patch ---
--- configure.ac_orig	2009-07-10 14:28:32.000000000 -0700
+++ configure.ac	2009-07-10 14:29:08.000000000 -0700
@@ -170,7 +170,7 @@
 AC_PROG_YACC
 
 dnl # Libtool stuff
-AC_DISABLE_SHARED
+# AC_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl AM_PROG_LIBTOOL makes AC_PROG_RANLIB unnecessary
 dnl striplib="";

maloc-makefile.am.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE maloc-makefile.am.patch ---
--- src/aaa_lib/Makefile.am_orig	2009-07-10 13:49:16.000000000 -0700
+++ src/aaa_lib/Makefile.am	2009-07-10 16:38:39.000000000 -0700
@@ -49,12 +49,12 @@
 LIBEFENCE =
 endif
 
-libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
+# libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
 lib_LTLIBRARIES = libmaloc.la ${LIBEFENCE}
 
 libmaloc_la_SOURCES =
 libmaloc_la_LIBADD  = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS}
-libmaloc_la_LDFLAGS = -version-info ${FETK_VERSION}
+libmaloc_la_LDFLAGS = @rl_lib@ @math_lib@ -version-info ${FETK_VERSION}
 
 libefence_la_SOURCES =
 libefence_la_LIBADD  = ${EFENCE_LIBS}


--- NEW FILE maloc.spec ---
Summary: Minimal Abstraction Layer for Object-oriented C
Name: maloc
Version: 0.2
Release: 3%{?dist}
Group: Applications/Engineering
License: GPLv2+
URL: http://www.fetk.org
Source0: http://www.fetk.org/codes/%{name}/%{name}-%{version}-1.tar.gz
# removes hardcoded libdir setting
Patch0: maloc-makefile.am.patch
# we like shared libraries
Patch1: maloc-configure.ac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: readline-devel

%description
MALOC is a small, portable, abstract C environment library for
object-oriented C programming. MALOC is used as the foundation layer
for a number of scientific applications, including MC, SG, and
APBS. MALOC can be used as a small stand-alone abstraction environment
for writing portable C programs which need access to resources which
are typically architecture-dependent, such as INET sockets, timing
routines, and so on. MALOC provides abstract datatypes, memory
management routines, timing routines, machine epsilon, access to UNIX
and INET sockets, MPI, and so on. All things that can vary from one
architecture to another are abstracted out of an application code and
placed in MALOC.

%package devel
Summary: Header files and library for developing programs with maloc
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries

%description devel

This package contains libraries and header files needed for program
development using MALOC.

%prep
%setup -n %{name} -q
%patch0 -p0
%patch1 -p0
aclocal
automake --gnu --add-missing
autoconf
autoheader
libtoolize --automake

%build
%configure --disable-static
make %{?_smp_mflags}

make -C doc/doxygen

%install
rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/api/html/*
%{_libdir}/*.so
%{_includedir}/maloc

%changelog
* Thu Aug 06 2009 Tim Fenn <fenn at stanford.edu> - 0.2-3
- add doxygen as buildreq

* Sat Jul 11 2009 Tim Fenn <fenn at stanford.edu> - 0.2-2
- remove pkgconfig dependency
- build doc

* Fri Jul 10 2009 Tim Fenn <fenn at stanford.edu> - 0.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:27:42 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:39:42 -0000	1.2
@@ -0,0 +1 @@
+maloc-0.2-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:27:42 -0000	1.1
+++ sources	21 Aug 2009 18:39:42 -0000	1.2
@@ -0,0 +1 @@
+d48961ef02f5ab977f610ad8e9bff4e5  maloc-0.2-1.tar.gz



From ausil at fedoraproject.org  Fri Aug 21 18:28:57 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:28:57 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object/devel - New directory
Message-ID: <20090821182857.4375611C0349@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21150/rpms/perl-Devel-LeakGuard-Object/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:28:50 +0000
Subject: [pkgdb] perl-Devel-LeakGuard-Object (Fedora, 11) updated by ausil
Message-ID: <20090821182850.8BC5510F8A9@bastion2.fedora.phx.redhat.com>

ausil added a Fedora 11 branch for perl-Devel-LeakGuard-Object
ausil has set commit to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora 11)
ausil has set checkout to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora 11)
ausil has set build to Approved for 107427 on perl-Devel-LeakGuard-Object (Fedora 11)
ausil approved watchbugzilla on perl-Devel-LeakGuard-Object (Fedora 11) for perl-sig
ausil approved watchcommits on perl-Devel-LeakGuard-Object (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-LeakGuard-Object



From pkgdb at fedoraproject.org  Fri Aug 21 18:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:19:27 +0000
Subject: [pkgdb] plexus-mail-sender (Fedora, devel) updated by ausil
Message-ID: <20090821181927.2748810F889@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on plexus-mail-sender (Fedora devel) for akurtakov
ausil approved watchcommits on plexus-mail-sender (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-mail-sender



From ausil at fedoraproject.org  Fri Aug 21 18:19:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:19:33 +0000 (UTC)
Subject: rpms/plexus-mail-sender/devel - New directory
Message-ID: <20090821181933.4688711C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-mail-sender/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx17834/rpms/plexus-mail-sender/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-mail-sender/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:19:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:19:39 +0000 (UTC)
Subject: rpms/plexus-mail-sender Makefile,NONE,1.1
Message-ID: <20090821181939.5553A11C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-mail-sender
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx17834/rpms/plexus-mail-sender

Added Files:
	Makefile 
Log Message:
Setup of module plexus-mail-sender


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-mail-sender
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:29:03 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:29:03 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090821182903.D61C911C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21150/rpms/perl-Devel-LeakGuard-Object/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Devel-LeakGuard-Object


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Devel-LeakGuard-Object
# $Id: Makefile,v 1.1 2009/08/21 18:29:03 ausil Exp $
NAME := perl-Devel-LeakGuard-Object
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From timfenn at fedoraproject.org  Fri Aug 21 18:40:43 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 18:40:43 +0000 (UTC)
Subject: rpms/maloc/EL-5 import.log, NONE, 1.1 maloc-configure.ac.patch, NONE,
	1.1 maloc-makefile.am.patch, NONE, 1.1 maloc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821184043.9DCE511C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/maloc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25893/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log maloc-configure.ac.patch maloc-makefile.am.patch 
	maloc.spec 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu>
- initial CVS commit




--- NEW FILE import.log ---
maloc-0_2-3_fc10:EL-5:maloc-0.2-3.fc10.src.rpm:1250880030

maloc-configure.ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maloc-configure.ac.patch ---
--- configure.ac_orig	2009-07-10 14:28:32.000000000 -0700
+++ configure.ac	2009-07-10 14:29:08.000000000 -0700
@@ -170,7 +170,7 @@
 AC_PROG_YACC
 
 dnl # Libtool stuff
-AC_DISABLE_SHARED
+# AC_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl AM_PROG_LIBTOOL makes AC_PROG_RANLIB unnecessary
 dnl striplib="";

maloc-makefile.am.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE maloc-makefile.am.patch ---
--- src/aaa_lib/Makefile.am_orig	2009-07-10 13:49:16.000000000 -0700
+++ src/aaa_lib/Makefile.am	2009-07-10 16:38:39.000000000 -0700
@@ -49,12 +49,12 @@
 LIBEFENCE =
 endif
 
-libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
+# libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
 lib_LTLIBRARIES = libmaloc.la ${LIBEFENCE}
 
 libmaloc_la_SOURCES =
 libmaloc_la_LIBADD  = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS}
-libmaloc_la_LDFLAGS = -version-info ${FETK_VERSION}
+libmaloc_la_LDFLAGS = @rl_lib@ @math_lib@ -version-info ${FETK_VERSION}
 
 libefence_la_SOURCES =
 libefence_la_LIBADD  = ${EFENCE_LIBS}


--- NEW FILE maloc.spec ---
Summary: Minimal Abstraction Layer for Object-oriented C
Name: maloc
Version: 0.2
Release: 3%{?dist}
Group: Applications/Engineering
License: GPLv2+
URL: http://www.fetk.org
Source0: http://www.fetk.org/codes/%{name}/%{name}-%{version}-1.tar.gz
# removes hardcoded libdir setting
Patch0: maloc-makefile.am.patch
# we like shared libraries
Patch1: maloc-configure.ac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: readline-devel

%description
MALOC is a small, portable, abstract C environment library for
object-oriented C programming. MALOC is used as the foundation layer
for a number of scientific applications, including MC, SG, and
APBS. MALOC can be used as a small stand-alone abstraction environment
for writing portable C programs which need access to resources which
are typically architecture-dependent, such as INET sockets, timing
routines, and so on. MALOC provides abstract datatypes, memory
management routines, timing routines, machine epsilon, access to UNIX
and INET sockets, MPI, and so on. All things that can vary from one
architecture to another are abstracted out of an application code and
placed in MALOC.

%package devel
Summary: Header files and library for developing programs with maloc
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries

%description devel

This package contains libraries and header files needed for program
development using MALOC.

%prep
%setup -n %{name} -q
%patch0 -p0
%patch1 -p0
aclocal
automake --gnu --add-missing
autoconf
autoheader
libtoolize --automake

%build
%configure --disable-static
make %{?_smp_mflags}

make -C doc/doxygen

%install
rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/api/html/*
%{_libdir}/*.so
%{_includedir}/maloc

%changelog
* Thu Aug 06 2009 Tim Fenn <fenn at stanford.edu> - 0.2-3
- add doxygen as buildreq

* Sat Jul 11 2009 Tim Fenn <fenn at stanford.edu> - 0.2-2
- remove pkgconfig dependency
- build doc

* Fri Jul 10 2009 Tim Fenn <fenn at stanford.edu> - 0.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:27:42 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:40:42 -0000	1.2
@@ -0,0 +1 @@
+maloc-0.2-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:27:42 -0000	1.1
+++ sources	21 Aug 2009 18:40:43 -0000	1.2
@@ -0,0 +1 @@
+d48961ef02f5ab977f610ad8e9bff4e5  maloc-0.2-1.tar.gz



From overholt at fedoraproject.org  Fri Aug 21 18:41:05 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 18:41:05 +0000 (UTC)
Subject: rpms/plexus-cli/devel plexus-cli.spec,1.1,1.2
Message-ID: <20090821184105.107B511C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-cli/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26059

Modified Files:
	plexus-cli.spec 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-8
- Add jakarta-commons-cli BR


Index: plexus-cli.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-cli/devel/plexus-cli.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plexus-cli.spec	21 Aug 2009 18:33:34 -0000	1.1
+++ plexus-cli.spec	21 Aug 2009 18:41:04 -0000	1.2
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 Summary:        Command Line Interface facilitator for Plexus
 License:        ASL 2.0 and Plexus
@@ -78,6 +78,7 @@ BuildRequires:  maven-release
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils 
+BuildRequires:  jakarta-commons-cli
 
 Requires:  plexus-classworlds
 Requires:  plexus-containers-container-default
@@ -176,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-8
+- Add jakarta-commons-cli BR
+
 * Thu Aug 20 2009 Andrew Overholt <overholt at redhat.com> 0:1.2-7
 - Remove gcj support
 - Default to building with ant



From overholt at fedoraproject.org  Fri Aug 21 18:41:25 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 18:41:25 +0000 (UTC)
Subject: rpms/eclipse-testframework/devel eclipse-nowin32testfragment.patch, 
	NONE, 1.1 eclipse-testframework-fetch-src.sh, NONE,
	1.1 eclipse-testframework.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821184125.27B9E11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-testframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26104/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-nowin32testfragment.patch 
	eclipse-testframework-fetch-src.sh eclipse-testframework.spec 
	import.log 
Log Message:
Initial import (review bug #518486).


eclipse-nowin32testfragment.patch:
 feature.xml |    8 --------
 1 file changed, 8 deletions(-)

--- NEW FILE eclipse-nowin32testfragment.patch ---
diff -up ./org.eclipse.test-feature/feature.xml.nowin32 ./org.eclipse.test-feature/feature.xml
--- ./org.eclipse.test-feature/feature.xml.nowin32	2008-08-27 10:14:56.000000000 -0400
+++ ./org.eclipse.test-feature/feature.xml	2008-08-27 10:15:04.000000000 -0400
@@ -58,14 +58,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.test.performance.win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
          id="org.junit"
          download-size="0"
          install-size="0"


--- NEW FILE eclipse-testframework-fetch-src.sh ---
#!/bin/sh
usage='usage: $0 <tag>'
name=eclipse-testframework
tag=$1
tar_name=$name-fetched-src-$tag

if [ "x$tag"x = 'xx' ]; then
   echo >&2 "$usage"
   exit 1
fi

rm -fr $tar_name && mkdir $tar_name
pushd $tar_name

# Fetch plugins
for f in \
org.eclipse.ant.optional.junit \
org.eclipse.test \
org.eclipse.test.performance \
org.eclipse.test-feature \
; do
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r $tag $f;
done

popd
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name


--- NEW FILE eclipse-testframework.spec ---
%global eclipse_base   %{_libdir}/eclipse
%global install_loc    %{_datadir}/eclipse/dropins/testframework
%global tag            R3_5

Name:           eclipse-testframework
Version:        3.5.0
Release:        2%{?dist}
Summary:        Eclipse Test Framework

Group:          Development/Tools
License:        EPL
URL:            http://eclipse.org
## sh %{name}-fetch-src.sh %{tag}
Source0:        %{name}-fetched-src-%{tag}.tar.bz2
Source1:        %{name}-fetch-src.sh
# Remove win32 fragment from test feature
Patch0:         eclipse-nowin32testfragment.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: eclipse-pde >= 1:3.5.0
BuildRequires: easymock2
Requires: eclipse-platform >= 3.4.0
Requires: easymock2
Requires: eclipse-jdt

%description
Eclipse Test Framework. Used in conjunction with Eclipse JUnit tests.

%prep
%setup -q -n %{name}-fetched-src-%{tag}
chmod -x org.eclipse.test-feature/*.html
%patch0

mkdir orbitDeps
pushd orbitDeps
ln -s %{_javadir}/easymock2.jar org.easymock_2.4.0.v20090202-0900.jar
popd

%build
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.test -o `pwd`/orbitDeps

%install
%{__rm} -rf %{buildroot}
install -d -m 755 %{buildroot}%{install_loc}

%{__unzip} -q -d %{buildroot}%{install_loc} \
     build/rpmBuild/org.eclipse.test.zip

pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins
rm -fr org.junit*
rm org.easymock_2.4.0.v20090202-0900.jar
ln -s ../../../../../java/easymock2.jar org.easymock_2.4.0.v20090202-0900.jar
popd

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{install_loc}
%doc org.eclipse.test-feature/license.html
%doc org.eclipse.test-feature/epl-v10.html

%changelog
* Fri Aug 21 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-2
- Fix non-standard-dir-perm.

* Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-1
- Initial package.


--- NEW FILE import.log ---
eclipse-testframework-3_5_0-2_fc11:HEAD:eclipse-testframework-3.5.0-2.fc11.src.rpm:1250879895


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:25:11 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:41:24 -0000	1.2
@@ -0,0 +1 @@
+eclipse-testframework-fetched-src-R3_5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:25:11 -0000	1.1
+++ sources	21 Aug 2009 18:41:25 -0000	1.2
@@ -0,0 +1 @@
+6ef74438dfeb4919be5bef810bf93e2d  eclipse-testframework-fetched-src-R3_5.tar.bz2



From pkgdb at fedoraproject.org  Fri Aug 21 18:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:43:12 +0000
Subject: [pkgdb] plexus-digest (Fedora, devel) updated by ausil
Message-ID: <20090821184312.5A28510F88B@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on plexus-digest (Fedora devel) for overholt
ausil approved watchcommits on plexus-digest (Fedora devel) for overholt
ausil approved commit on plexus-digest (Fedora devel) for overholt
ausil approved build on plexus-digest (Fedora devel) for overholt
ausil approved approveacls on plexus-digest (Fedora devel) for overholt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-digest



From pkgdb at fedoraproject.org  Fri Aug 21 18:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:43:12 +0000
Subject: [pkgdb] plexus-digest summary updated by ausil
Message-ID: <20090821184312.4B73410F881@bastion2.fedora.phx.redhat.com>

ausil set package plexus-digest summary to Plexus Digest / Hashcode Components

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-digest



From ausil at fedoraproject.org  Fri Aug 21 18:43:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:43:18 +0000 (UTC)
Subject: rpms/plexus-digest - New directory
Message-ID: <20090821184318.151F711C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-digest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsA26721/rpms/plexus-digest

Log Message:
Directory /cvs/pkgs/rpms/plexus-digest added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:43:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:43:18 +0000 (UTC)
Subject: rpms/plexus-digest/devel - New directory
Message-ID: <20090821184318.3F04211C0381@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-digest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsA26721/rpms/plexus-digest/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-digest/devel added to the repository




From ausil at fedoraproject.org  Fri Aug 21 18:43:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:43:24 +0000 (UTC)
Subject: rpms/plexus-digest Makefile,NONE,1.1
Message-ID: <20090821184324.71CF011C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-digest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsA26721/rpms/plexus-digest

Added Files:
	Makefile 
Log Message:
Setup of module plexus-digest


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-digest
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Fri Aug 21 18:43:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:43:24 +0000 (UTC)
Subject: rpms/plexus-digest/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090821184324.AB50811C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/plexus-digest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsA26721/rpms/plexus-digest/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-digest


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-digest
# $Id: Makefile,v 1.1 2009/08/21 18:43:24 ausil Exp $
NAME := plexus-digest
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 21 18:46:39 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 21 Aug 2009 18:46:39 +0000 (UTC)
Subject: rpms/gnome-do-plugins/devel gnome-do-plugins.spec,1.6,1.7
Message-ID: <20090821184639.D09F811C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27473

Modified Files:
	gnome-do-plugins.spec 
Log Message:
Move non-GData-dependent Google plugins back to main package




Index: gnome-do-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/gnome-do-plugins.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-do-plugins.spec	21 Aug 2009 07:22:00 -0000	1.6
+++ gnome-do-plugins.spec	21 Aug 2009 18:46:39 -0000	1.7
@@ -117,7 +117,7 @@ Requires:       gdata-sharp
 Requires:       gnome-do-plugins = %{version}
 
 %description google
-GNOME Do's Google-related plugins
+GNOME Do's Google-related plugins that utilize GData
 
 %package pidgin
 Summary:        GNOME Do Pidgin plugin
@@ -236,7 +236,9 @@ rm -rf %{buildroot}
 
 %files google
 %defattr(-, root, root, -)
-%{_libdir}/gnome-do/plugins/Google*
+%{_libdir}/gnome-do/plugins/GoogleCalendar*
+%{_libdir}/gnome-do/plugins/GoogleContacts*
+%{_libdir}/gnome-do/plugins/GoogleDocs*
 %{_libdir}/gnome-do/plugins/YouTube*
 
 %files pidgin
@@ -274,7 +276,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/gnome-do/plugins/EOG*
 %exclude %{_libdir}/gnome-do/plugins/*Firefox*
 %exclude %{_libdir}/gnome-do/plugins/*Flickr*
-%exclude %{_libdir}/gnome-do/plugins/Google*
+%exclude %{_libdir}/gnome-do/plugins/GoogleCalendar*
+%exclude %{_libdir}/gnome-do/plugins/GoogleContacts*
+%exclude %{_libdir}/gnome-do/plugins/GoogleDocs*
 %exclude %{_libdir}/gnome-do/plugins/*Pidgin*
 %exclude %{_libdir}/gnome-do/plugins/*Rhythmbox*
 %exclude %{_libdir}/gnome-do/plugins/*Tomboy*



From cheekyboinc at fedoraproject.org  Fri Aug 21 18:53:42 2009
From: cheekyboinc at fedoraproject.org (Stefan Posdzich)
Date: Fri, 21 Aug 2009 18:53:42 +0000 (UTC)
Subject: rpms/maxr/F-10 .cvsignore, 1.3, 1.4 maxr.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <20090821185342.797BE11C00D7@cvs1.fedora.phx.redhat.com>

Author: cheekyboinc

Update of /cvs/pkgs/rpms/maxr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28662

Modified Files:
	.cvsignore maxr.spec sources 
Log Message:
New Upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 May 2009 17:52:09 -0000	1.3
+++ .cvsignore	21 Aug 2009 18:53:42 -0000	1.4
@@ -1 +1 @@
-maxr-0.2.5.tar.gz
+maxr-0.2.6.tar.gz


Index: maxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/F-10/maxr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- maxr.spec	3 May 2009 17:52:10 -0000	1.2
+++ maxr.spec	21 Aug 2009 18:53:42 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		maxr
-Version:	0.2.5
+Version:	0.2.6
 Release:	1%{?dist}
 Summary:	A classic turn-based strategy game
 
@@ -89,6 +89,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Fri Aug 21 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.2.6-1
+- New Upstream Release
+
 * Sun May 03 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.2.5-1
 - New Upstream Release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 May 2009 17:52:10 -0000	1.3
+++ sources	21 Aug 2009 18:53:42 -0000	1.4
@@ -1 +1 @@
-a1425820ac15aeea4089fc6b045cf588  maxr-0.2.5.tar.gz
+14c6545e4038b8319b132d8aa9929194  maxr-0.2.6.tar.gz



From ausil at fedoraproject.org  Fri Aug 21 18:28:57 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:28:57 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object - New directory
Message-ID: <20090821182857.1C7B411C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx21150/rpms/perl-Devel-LeakGuard-Object

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object added to the repository




From pkgdb at fedoraproject.org  Fri Aug 21 18:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:43:11 +0000
Subject: [pkgdb] plexus-digest was added for akurtakov
Message-ID: <20090821184311.5A35010F84D@bastion2.fedora.phx.redhat.com>

ausil has added Package plexus-digest with summary Plexus Digest / Hashcode Components
ausil has approved Package plexus-digest
ausil has added a Fedora devel branch for plexus-digest with an owner of akurtakov
ausil has approved plexus-digest in Fedora devel
ausil has approved Package plexus-digest
ausil has set commit to Approved for 107427 on plexus-digest (Fedora devel)
ausil has set checkout to Approved for 107427 on plexus-digest (Fedora devel)
ausil has set build to Approved for 107427 on plexus-digest (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-digest



From pkgdb at fedoraproject.org  Fri Aug 21 18:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 18:26:38 +0000
Subject: [pkgdb] zyx-liveinstaller was added for sdz
Message-ID: <20090821182638.3C9FD10F84D@bastion2.fedora.phx.redhat.com>

ausil has added Package zyx-liveinstaller with summary Install a running LiveOS rebootlessly
ausil has approved Package zyx-liveinstaller
ausil has added a Fedora devel branch for zyx-liveinstaller with an owner of sdz
ausil has approved zyx-liveinstaller in Fedora devel
ausil has approved Package zyx-liveinstaller
ausil has set commit to Approved for 107427 on zyx-liveinstaller (Fedora devel)
ausil has set checkout to Approved for 107427 on zyx-liveinstaller (Fedora devel)
ausil has set build to Approved for 107427 on zyx-liveinstaller (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zyx-liveinstaller



From ausil at fedoraproject.org  Fri Aug 21 18:28:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 21 Aug 2009 18:28:23 +0000 (UTC)
Subject: rpms/moblin-panel-applications/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090821182823.E684711C00D7@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/moblin-panel-applications/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsM20866/rpms/moblin-panel-applications/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-panel-applications


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-panel-applications
# $Id: Makefile,v 1.1 2009/08/21 18:28:23 ausil Exp $
NAME := moblin-panel-applications
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 21 18:59:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 18:59:15 +0000 (UTC)
Subject: rpms/moblin-panel-applications/devel import.log, NONE,
	1.1 moblin-panel-applications.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090821185915.C197011C00D7@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-serv29836/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-panel-applications.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-panel-applications-0_0_1-1_fc11:HEAD:moblin-panel-applications-0.0.1-1.fc11.src.rpm:1250880749


--- NEW FILE moblin-panel-applications.spec ---
Name:           moblin-panel-applications
Version:        0.0.1
Release:        1%{?dist}
Summary:        Moblin Panel for launching Applications

Group:          System Environment/Libraries
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)

BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
BuildRequires: gnome-menus-devel
BuildRequires: gtk2-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: dbus

%description
The Moblin mutter panel for launching applications.

%prep
%setup -q

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%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
%{_libexecdir}/moblin-panel-applications
%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.applications.service
%{_datadir}/%{name}

%changelog
* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:28:23 -0000	1.1
+++ .cvsignore	21 Aug 2009 18:59:15 -0000	1.2
@@ -0,0 +1 @@
+moblin-panel-applications-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:28:23 -0000	1.1
+++ sources	21 Aug 2009 18:59:15 -0000	1.2
@@ -0,0 +1 @@
+62783ff603f2fc215d7748a0793ed736  moblin-panel-applications-0.0.1.tar.bz2



From overholt at fedoraproject.org  Fri Aug 21 19:00:55 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 19:00:55 +0000 (UTC)
Subject: rpms/plexus-mail-sender/devel plexus-mail-sender.spec,1.1,1.2
Message-ID: <20090821190055.6488411C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-mail-sender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30279

Modified Files:
	plexus-mail-sender.spec 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.a2.10
- Add BR on maven2-plugin-resources


Index: plexus-mail-sender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-mail-sender/devel/plexus-mail-sender.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plexus-mail-sender.spec	21 Aug 2009 18:34:55 -0000	1.1
+++ plexus-mail-sender.spec	21 Aug 2009 19:00:54 -0000	1.2
@@ -32,7 +32,7 @@
 
 Name:           plexus-mail-sender
 Version:        1.0
-Release:        0.a2.9%{?dist}
+Release:        0.a2.10%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -54,6 +54,7 @@ Patch0:         %{name}-clarifylicense.p
 
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 0:2.0.4
+BuildRequires:  maven2-plugin-resources >= 0:2.0.4
 BuildRequires:  dumbster
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
@@ -152,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.a2.10
+- Add BR on maven2-plugin-resources
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.9
 - Remove gcj support
 - Remove javadoc post scriplet



From overholt at fedoraproject.org  Fri Aug 21 19:01:54 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 19:01:54 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.6,1.7
Message-ID: <20090821190154.7619B11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30562

Modified Files:
	plexus-velocity.spec 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.1.7-3.2
- Add ant-contrib BR


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- plexus-velocity.spec	21 Aug 2009 14:23:28 -0000	1.6
+++ plexus-velocity.spec	21 Aug 2009 19:01:53 -0000	1.7
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.7
-Release:        3.1%{?dist}
+Release:        3.2%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -65,6 +65,7 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 %endif
+BuildRequires:  ant-contrib
 BuildRequires:  classworlds >= 0:1.1
 BuildRequires:  jakarta-commons-collections
 BuildRequires:  plexus-container-default
@@ -175,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.1.7-3.2
+- Add ant-contrib BR
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.1.7-3.1
 - Import from Deepak Bhole's work (import from JPackage, update to 1.1.7)
 - Remove gcj support



From overholt at fedoraproject.org  Fri Aug 21 19:02:54 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 19:02:54 +0000 (UTC)
Subject: rpms/plexus-digest/devel import.log, NONE,
	1.1 plexus-digest-1.0-build.xml, NONE,
	1.1 plexus-digest-components.xml, NONE,
	1.1 plexus-digest-jpp-depmap.xml, NONE, 1.1 plexus-digest.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821190254.2092011C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-digest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30919/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-digest-1.0-build.xml 
	plexus-digest-components.xml plexus-digest-jpp-depmap.xml 
	plexus-digest.spec 
Log Message:
Initial import (review bug #518634)



--- NEW FILE import.log ---
plexus-digest-1_0-9_fc11:HEAD:plexus-digest-1.0-9.fc11.src.rpm:1250881272


--- NEW FILE plexus-digest-1.0-build.xml ---
<project name="plexus-digest" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-digest-1.0"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar"/>
      <include name="classworlds/classworlds/1.1/classworlds-1.1.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Digest Component 1.0 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.digest.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/free/BUILD/plexus-digest/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/free/BUILD/plexus-digest/org/codehaus/plexus/plexus-container-default/1.0"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/free/BUILD/plexus-digest/classworlds/classworlds/1.1"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
</project>


--- NEW FILE plexus-digest-components.xml ---
<component-set>
  <components>
    <component>
      <role>org.codehaus.plexus.digest.Digester</role>
      <role-hint>sha1</role-hint>
      <implementation>org.codehaus.plexus.digest.Sha1Digester</implementation>
    </component>
    <component>
      <role>org.codehaus.plexus.digest.Digester</role>
      <role-hint>md5</role-hint>
      <implementation>org.codehaus.plexus.digest.Md5Digester</implementation>
    </component>
    <component>
      <role>org.codehaus.plexus.digest.StreamingDigester</role>
      <role-hint>sha1</role-hint>
      <implementation>org.codehaus.plexus.digest.StreamingSha1Digester</implementation>
    </component>
    <component>
      <role>org.codehaus.plexus.digest.StreamingDigester</role>
      <role-hint>md5</role-hint>
      <implementation>org.codehaus.plexus.digest.StreamingMd5Digester</implementation>
    </component>
  </components>
</component-set>


--- NEW FILE plexus-digest-jpp-depmap.xml ---
<dependencies>
<!--
	<dependency>
	  <maven>
		<groupId>org.codehaus.plexus</groupId>
		<artifactId>plexus-tools</artifactId>
		<version>1.0.5</version>
	  </maven>
	  <jpp>
		<groupId>JPP/plexus</groupId>
		<artifactId>tools</artifactId>
		<version>1.0.5</version>
	  </jpp>
	</dependency>
-->

    <dependency>
        <maven>
            <groupId>com.thoughtworks.qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.1</version>
        </jpp>
    </dependency>
</dependencies>



--- NEW FILE plexus-digest.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven 0
%define without_maven 1

%define parent plexus
%define subname digest

Name:           plexus-digest
Version:        1.0
Release:        9%{?dist}
Epoch:          0
Summary:        Plexus Digest / Hashcode Components
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://plexus.codehaus.org/
Source0:        %{name}-1.0-src.tar.gz
# svn export http://svn.codehaus.org/plexus/tags/plexus-digest-1.0 plexus-digest/
# tar czf plexus-digest-1.0-src.tar.gz plexus-digest/

Source1:                %{name}-jpp-depmap.xml
Source2:                %{name}-%{version}-build.xml
Source3:                %{name}-components.xml

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  jpackage-utils >= 0:1.7.2
BuildRequires:  ant >= 0:1.6
%if %{with_maven}
BuildRequires:  maven2 >= 2.0.4-9
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  maven2-common-poms >= 1.0
BuildRequires:  maven-doxia
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven-release
BuildRequires:  qdox >= 1.5
%endif

BuildRequires:  plexus-maven-plugin
BuildRequires:  plexus-cdc


Requires(post):    jpackage-utils >= 0:1.7.2
Requires(postun):  jpackage-utils >= 0:1.7.2

%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
embedded or for a full scale application server. There are many
reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}

%if ! %{with_maven}
cp %{SOURCE2} build.xml
mkdir -p target/classes/META-INF/plexus
cp %{SOURCE3} target/classes/META-INF/plexus/components.xml
%endif


%build
%if %{with_maven}
mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
        -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        install javadoc:javadoc
#       -Dmaven.test.failure.ignore=true \

%else
export CLASSPATH=$(build-classpath classworlds \
                   plexus/utils plexus/container-default)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} 1.0 JPP/%{parent} %{subname}

(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

cp -pr target/site/apidocs/* \
       $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/

ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*

%changelog
* Fri Aug 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-9
- Fix License, formatting and comments.

* Sun May 17 2009 Fernando Nasser <fnasser at redhat.com> 0:1.0-8
- Fix license

* Tue Apr 30 2009 Yong Yang <yyang at redhat.com> 1.0-7
- Rebuild with new maven2 2.0.8 built in non-bootstrap mode

* Tue Apr 30 2009 Yong Yang <yyang at redhat.com> 1.0-6
- force to BR plexus-cdc alpha 10
- rebuild without maven

* Tue Apr 30 2009 Yong Yang <yyang at redhat.com> 1.0-5
- Add BRs maven-doxia*, qdox
- Enable jpp-depmap
- Rebuild with new maven2 2.0.8 built in non-bootstrap mode
- ignore test failure

* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 1.0-4
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 1.0-3
- Fix release tag

* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> 1.0-2jpp.1
- Import from dbhole's maven 2.0.8 packages, initial building

* Mon Jan 07 2008 Deepak Bhole <dbhole at redhat.com> 1.0-1jpp.1
- Import from JPackage
- Update per Fedora spec

* Wed Nov 14 2007 Ralph Apel <r.apel @ r-apel.de> - 0:1.0-1jpp
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:43:24 -0000	1.1
+++ .cvsignore	21 Aug 2009 19:02:53 -0000	1.2
@@ -0,0 +1 @@
+plexus-digest-1.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:43:24 -0000	1.1
+++ sources	21 Aug 2009 19:02:53 -0000	1.2
@@ -0,0 +1 @@
+4157331c995b33e8ca0396894b591ecf  plexus-digest-1.0-src.tar.gz



From kevin at fedoraproject.org  Fri Aug 21 19:09:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 21 Aug 2009 19:09:46 +0000 (UTC)
Subject: rpms/cnetworkmanager/devel sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 cnetworkmanager.spec, 1.3, 1.4
Message-ID: <20090821190946.34ECE11C00D7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cnetworkmanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv970

Modified Files:
	sources .cvsignore cnetworkmanager.spec 
Log Message:
Update to 0.21.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 16:53:21 -0000	1.3
+++ sources	21 Aug 2009 19:09:45 -0000	1.4
@@ -1 +1 @@
-97720bdecfc2e308f90095aed11fefae  cnetworkmanager-0.21.tar.gz
+3703a43a6d6f3692cb8dbac6372834f2  cnetworkmanager-0.21.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 16:53:21 -0000	1.3
+++ .cvsignore	21 Aug 2009 19:09:45 -0000	1.4
@@ -1 +1 @@
-cnetworkmanager-0.21.tar.gz
+cnetworkmanager-0.21.1.tar.gz


Index: cnetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/devel/cnetworkmanager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cnetworkmanager.spec	11 Aug 2009 16:53:21 -0000	1.3
+++ cnetworkmanager.spec	21 Aug 2009 19:09:45 -0000	1.4
@@ -2,7 +2,7 @@
 
 Summary:        Command-line client for NetworkManager
 Name:           cnetworkmanager
-Version:        0.21
+Version:        0.21.1
 Release:        1%{?dist}
 License:        GPLv2+ and Public Domain
 Url:            http://vidner.net/martin/software/cnetworkmanager/
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/cnetworkmanager-*egg-info
 
 %changelog
+* Fri Aug 21 2009 Kevin Fenzi <kevin at tummy.com> - 0.21.1-1
+- Update to 0.21.1
+
 * Tue Aug 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.21-1
 - Update to 0.21
 



From overholt at fedoraproject.org  Fri Aug 21 19:19:03 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 19:19:03 +0000 (UTC)
Subject: rpms/plexus-mail-sender/devel plexus-mail-sender.spec,1.2,1.3
Message-ID: <20090821191903.14CDE11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-mail-sender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3042

Modified Files:
	plexus-mail-sender.spec 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.11
- Add BRs on maven2-plugin-{compiler,surefire,jar,install.javadoc}


Index: plexus-mail-sender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-mail-sender/devel/plexus-mail-sender.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- plexus-mail-sender.spec	21 Aug 2009 19:00:54 -0000	1.2
+++ plexus-mail-sender.spec	21 Aug 2009 19:19:02 -0000	1.3
@@ -32,7 +32,7 @@
 
 Name:           plexus-mail-sender
 Version:        1.0
-Release:        0.a2.10%{?dist}
+Release:        0.a2.11%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -54,7 +54,12 @@ Patch0:         %{name}-clarifylicense.p
 
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 0:2.0.4
-BuildRequires:  maven2-plugin-resources >= 0:2.0.4
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  dumbster
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
@@ -153,7 +158,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
-* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.a2.10
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.11
+- Add BRs on maven2-plugin-{compiler,surefire,jar,install.javadoc}
+
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.10
 - Add BR on maven2-plugin-resources
 
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.9



From ellert at fedoraproject.org  Fri Aug 21 19:28:20 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Fri, 21 Aug 2009 19:28:20 +0000 (UTC)
Subject: rpms/globus-gsi-proxy-ssl/devel
	globus-gsi-proxy-ssl-asn1-method.patch, NONE,
	1.1 globus-gsi-proxy-ssl.spec, 1.5, 1.6 import.log, 1.3, 1.4
Message-ID: <20090821192820.B399011C00D7@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5098/devel

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Added Files:
	globus-gsi-proxy-ssl-asn1-method.patch 
Log Message:
* Fri Aug 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-6
- Fix for new openssl - ASN1_METHOD no longer supported


globus-gsi-proxy-ssl-asn1-method.patch:
 proxycertinfo.c |    2 ++
 proxycertinfo.h |    2 ++
 proxypolicy.c   |    2 ++
 proxypolicy.h   |    2 ++
 4 files changed, 8 insertions(+)

--- NEW FILE globus-gsi-proxy-ssl-asn1-method.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2009-08-21 20:41:11.830075761 +0200
@@ -33,6 +33,7 @@
 
 #include "proxycertinfo.h"
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 /**
  * @name ASN1_METHOD
  */
@@ -62,6 +63,7 @@
 }
 /* PROXYCERTINFO_asn1_meth() */
 /*@}*/
+#endif
 
 
 /**
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.h globus_gsi_proxy_ssl-1.5/library/proxycertinfo.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.h	2009-08-21 20:44:55.379075927 +0200
@@ -121,7 +121,9 @@
 
 /* functions */
     
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 ASN1_METHOD * PROXYCERTINFO_asn1_meth();
+#endif
 
 PROXYCERTINFO * PROXYCERTINFO_new();
 
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2009-08-21 20:43:23.693075246 +0200
@@ -22,6 +22,7 @@
 
 #include "proxypolicy.h"
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 /**
  * @name Get a method for ASN1 conversion
  */
@@ -50,6 +51,7 @@
 }
 /* PROXYPOLICY_asn1_meth() */
 /* @} */
+#endif
 
 /**
  * @name New
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2009-08-21 20:41:40.682075989 +0200
@@ -102,7 +102,9 @@
 
 /* functions */
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 ASN1_METHOD * PROXYPOLICY_asn1_meth();
+#endif
 
 PROXYPOLICY * PROXYPOLICY_new();
 


Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-gsi-proxy-ssl.spec	21 Aug 2009 13:36:24 -0000	1.5
+++ globus-gsi-proxy-ssl.spec	21 Aug 2009 19:28:20 -0000	1.6
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -26,6 +26,9 @@ Source9:	epstopdf-2.9.5gw
 #		Fix some doxygen warnings:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
 Patch0:		%{name}-doxygen.patch
+#		ASN1_METHOD not available in openssl 1.0.0:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6841
+Patch1:		%{name}-asn1-method.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -89,6 +92,7 @@ Globus GSI Proxy SSL Library Documentati
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -190,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Aug 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-6
+- Fix for new openssl - ASN1_METHOD no longer supported
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-5
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 15:50:38 -0000	1.3
+++ import.log	21 Aug 2009 19:28:20 -0000	1.4
@@ -1,3 +1,4 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:HEAD:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240577820
 globus-gsi-proxy-ssl-1_5-2_fc9:HEAD:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870152
 globus-gsi-proxy-ssl-1_5-3_fc9:HEAD:globus-gsi-proxy-ssl-1.5-3.fc9.src.rpm:1245081016
+globus-gsi-proxy-ssl-1_5-6_fc11:HEAD:globus-gsi-proxy-ssl-1.5-6.fc11.src.rpm:1250882828



From overholt at fedoraproject.org  Fri Aug 21 19:29:12 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 19:29:12 +0000 (UTC)
Subject: rpms/plexus-mail-sender/devel plexus-mail-sender.spec,1.3,1.4
Message-ID: <20090821192912.30FC811C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-mail-sender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5447

Modified Files:
	plexus-mail-sender.spec 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.12
- Force OpenJDK


Index: plexus-mail-sender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-mail-sender/devel/plexus-mail-sender.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- plexus-mail-sender.spec	21 Aug 2009 19:19:02 -0000	1.3
+++ plexus-mail-sender.spec	21 Aug 2009 19:29:12 -0000	1.4
@@ -32,7 +32,7 @@
 
 Name:           plexus-mail-sender
 Version:        1.0
-Release:        0.a2.11%{?dist}
+Release:        0.a2.12%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -63,6 +63,7 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  dumbster
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
+BuildRequires:  java-devel >= 1:1.6.0
 
 BuildArch:      noarch
 
@@ -158,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.12
+- Force OpenJDK
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a2.11
 - Add BRs on maven2-plugin-{compiler,surefire,jar,install.javadoc}
 



From dwalsh at fedoraproject.org  Fri Aug 21 19:30:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 21 Aug 2009 19:30:01 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.627,1.628
Message-ID: <20090821193001.1B7C411C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5682

Modified Files:
	policycoreutils.spec 
Log Message:
* Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.0.71-9
- Don't try to remove restorecond after last erase (done already in %preun).
- Ensure scriptlets exit with status 0.
- Fix %post and %pr



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -p -r1.627 -r1.628
--- policycoreutils.spec	21 Aug 2009 11:14:26 -0000	1.627
+++ policycoreutils.spec	21 Aug 2009 19:30:00 -0000	1.628
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -29,7 +29,8 @@ BuildRequires: pam-devel libsepol-static
 BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed 
 Requires: libsepol >= %{libsepolver} coreutils checkpolicy  libselinux-utils >=  %{libselinuxver} 
-Requires(post): /sbin/service /sbin/chkconfig 
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service  /sbin/chkconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -251,6 +252,7 @@ if [ $1 -eq 0 ]; then
    /sbin/service restorecond stop > /dev/null 2>&1
    /sbin/chkconfig --del restorecond
 fi
+exit 0
 
 %post
 /sbin/chkconfig --add restorecond
@@ -259,12 +261,15 @@ exit 0
 %postun
 if [ "$1" -ge "1" ]; then 
    [ -x /sbin/service ] && /sbin/service restorecond condrestart  > /dev/null
-else
-   [ -x /sbin/service ] && /sbin/service restorecond stop > /dev/null
-   /sbin/chkconfig --del restorecond
 fi
+exit 0
 
 %changelog
+* Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.0.71-9
+- Don't try to remove restorecond after last erase (done already in %%preun).
+- Ensure scriptlets exit with status 0.
+- Fix %%post and %%pr
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.71-8
 - rebuilt with new audit
 



From pbrobinson at fedoraproject.org  Fri Aug 21 19:30:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 19:30:36 +0000 (UTC)
Subject: rpms/mutter-moblin/devel mutter-moblin.spec,1.3,1.4
Message-ID: <20090821193036.B781111C0347@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5899

Modified Files:
	mutter-moblin.spec 
Log Message:
- Move a needed file from devel to main package


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mutter-moblin.spec	20 Aug 2009 15:22:39 -0000	1.3
+++ mutter-moblin.spec	21 Aug 2009 19:30:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           mutter-moblin
 Version:        0.34.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
 Group:          User Interface/Desktops
@@ -67,17 +67,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/lib*.so.*
-%{_libdir}/mutter/plugins/moblin-netbook.so.*
+%{_libdir}/mutter/plugins/moblin-netbook.*
 %{_datadir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
-%{_libdir}/mutter/plugins/moblin-netbook.so
 %{_libdir}/pkgconfig/moblin-panel.pc
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Thu Aug 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.3-2
+- Move a needed file from devel to main package
+
 * Thu Aug 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.3-1
 - New 0.34.3 upstream release.
 



From habig at fedoraproject.org  Fri Aug 21 19:30:56 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Fri, 21 Aug 2009 19:30:56 +0000 (UTC)
Subject: rpms/yum-cron/devel import.log,1.2,1.3 yum-cron.spec,1.14,1.15
Message-ID: <20090821193056.CD86711C00D7@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5950/devel

Modified Files:
	import.log yum-cron.spec 
Log Message:
deal with stale lockdirs, bug 515814 




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Aug 2009 00:04:53 -0000	1.2
+++ import.log	21 Aug 2009 19:30:56 -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-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


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- yum-cron.spec	11 Aug 2009 00:04:53 -0000	1.14
+++ yum-cron.spec	21 Aug 2009 19:30:56 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
 Version: 0.8.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -91,6 +91,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* 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
+
 * Wed Aug 5 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-1
 - deal with stale lockdirs
 



From cheekyboinc at fedoraproject.org  Fri Aug 21 19:31:40 2009
From: cheekyboinc at fedoraproject.org (Stefan Posdzich)
Date: Fri, 21 Aug 2009 19:31:40 +0000 (UTC)
Subject: rpms/maxr/F-11 .cvsignore, 1.3, 1.4 maxr.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <20090821193140.D5EBF11C00D7@cvs1.fedora.phx.redhat.com>

Author: cheekyboinc

Update of /cvs/pkgs/rpms/maxr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6229

Modified Files:
	.cvsignore maxr.spec sources 
Log Message:
New Upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 May 2009 17:55:07 -0000	1.3
+++ .cvsignore	21 Aug 2009 19:31:40 -0000	1.4
@@ -1 +1 @@
-maxr-0.2.5.tar.gz
+maxr-0.2.6.tar.gz


Index: maxr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/F-11/maxr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- maxr.spec	3 May 2009 17:55:07 -0000	1.3
+++ maxr.spec	21 Aug 2009 19:31:40 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		maxr
-Version:	0.2.5
+Version:	0.2.6
 Release:	1%{?dist}
 Summary:	A classic turn-based strategy game
 
@@ -89,6 +89,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Fri Aug 21 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.2.6-1
+- New Upstream Release
+
 * Sun May 03 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.2.5-1
 - New Upstream Release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxr/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 May 2009 17:55:07 -0000	1.3
+++ sources	21 Aug 2009 19:31:40 -0000	1.4
@@ -1 +1 @@
-a1425820ac15aeea4089fc6b045cf588  maxr-0.2.5.tar.gz
+14c6545e4038b8319b132d8aa9929194  maxr-0.2.6.tar.gz



From habig at fedoraproject.org  Fri Aug 21 19:31:47 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Fri, 21 Aug 2009 19:31:47 +0000 (UTC)
Subject: rpms/yum-cron/F-11 .cvsignore, 1.9, 1.10 import.log, 1.1,
	1.2 sources, 1.9, 1.10 yum-cron.spec, 1.12, 1.13
Message-ID: <20090821193148.001AC11C00D7@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-serv6346/F-11

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
deal with stale lockdirs, bug 515814 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Dec 2008 23:08:39 -0000	1.9
+++ .cvsignore	21 Aug 2009 19:31:47 -0000	1.10
@@ -1 +1 @@
-yum-cron-0.8.3.tar.gz
+yum-cron-0.8.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2008 23:08:39 -0000	1.1
+++ import.log	21 Aug 2009 19:31:47 -0000	1.2
@@ -1 +1,2 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Dec 2008 23:08:39 -0000	1.9
+++ sources	21 Aug 2009 19:31:47 -0000	1.10
@@ -1 +1 @@
-e0f8aba0a21739cf1120e5096cd28fad  yum-cron-0.8.3.tar.gz
+c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/yum-cron.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- yum-cron.spec	25 Feb 2009 18:22:33 -0000	1.12
+++ yum-cron.spec	21 Aug 2009 19:31:47 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.3
+Version: 0.8.4
 Release: 2%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* 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
+
+* Wed Aug 5 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-1
+- deal with stale lockdirs
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From habig at fedoraproject.org  Fri Aug 21 19:32:34 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Fri, 21 Aug 2009 19:32:34 +0000 (UTC)
Subject: rpms/yum-cron/F-10 .cvsignore, 1.9, 1.10 import.log, 1.1,
	1.2 sources, 1.9, 1.10 yum-cron.spec, 1.11, 1.12
Message-ID: <20090821193234.1424111C00D7@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-serv6631/F-10

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
deal with stale lockdirs, bug 515814 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Dec 2008 00:30:21 -0000	1.9
+++ .cvsignore	21 Aug 2009 19:32:33 -0000	1.10
@@ -1 +1 @@
-yum-cron-0.8.3.tar.gz
+yum-cron-0.8.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Dec 2008 00:30:22 -0000	1.1
+++ import.log	21 Aug 2009 19:32:33 -0000	1.2
@@ -1 +1,2 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Dec 2008 00:30:22 -0000	1.9
+++ sources	21 Aug 2009 19:32:33 -0000	1.10
@@ -1 +1 @@
-e0f8aba0a21739cf1120e5096cd28fad  yum-cron-0.8.3.tar.gz
+c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/yum-cron.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- yum-cron.spec	30 Dec 2008 00:30:22 -0000	1.11
+++ yum-cron.spec	21 Aug 2009 19:32:33 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.3
-Release: 1%{?dist}
+Version: 0.8.4
+Release: 2%{?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
@@ -91,6 +91,15 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* 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
+
+* Wed Aug 5 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-1
+- deal with stale lockdirs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 14 2008 Alec Habig <ahabig at umn.edu> - 0.8.3-1
 - Change writes to YUMTMP to be appends to work around selinux policy
   oddness in bug 431588



From habig at fedoraproject.org  Fri Aug 21 19:33:29 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Fri, 21 Aug 2009 19:33:29 +0000 (UTC)
Subject: rpms/yum-cron/F-9 .cvsignore, 1.9, 1.10 import.log, 1.1, 1.2 sources,
	1.9, 1.10 yum-cron.spec, 1.11, 1.12
Message-ID: <20090821193329.48A9D11C00D7@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-serv6940/F-9

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
deal with stale lockdirs, bug 515814 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Dec 2008 00:31:30 -0000	1.9
+++ .cvsignore	21 Aug 2009 19:33:29 -0000	1.10
@@ -1 +1 @@
-yum-cron-0.8.3.tar.gz
+yum-cron-0.8.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Dec 2008 00:31:30 -0000	1.1
+++ import.log	21 Aug 2009 19:33:29 -0000	1.2
@@ -1 +1,2 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Dec 2008 00:31:30 -0000	1.9
+++ sources	21 Aug 2009 19:33:29 -0000	1.10
@@ -1 +1 @@
-e0f8aba0a21739cf1120e5096cd28fad  yum-cron-0.8.3.tar.gz
+c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/yum-cron.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- yum-cron.spec	30 Dec 2008 00:31:30 -0000	1.11
+++ yum-cron.spec	21 Aug 2009 19:33:29 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.3
-Release: 1%{?dist}
+Version: 0.8.4
+Release: 2%{?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
@@ -91,6 +91,15 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* 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
+
+* Wed Aug 5 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-1
+- deal with stale lockdirs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 14 2008 Alec Habig <ahabig at umn.edu> - 0.8.3-1
 - Change writes to YUMTMP to be appends to work around selinux policy
   oddness in bug 431588



From pkgdb at fedoraproject.org  Fri Aug 21 19:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 19:35:38 +0000
Subject: [pkgdb] grubby ownership updated
Message-ID: <20090821193539.052CC10F854@bastion2.fedora.phx.redhat.com>

Package grubby in Fedora devel is now owned by pjones

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grubby



From timfenn at fedoraproject.org  Fri Aug 21 19:37:38 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 19:37:38 +0000 (UTC)
Subject: rpms/maloc/devel maloc-maloc.dox.patch,NONE,1.1 maloc.spec,1.1,1.2
Message-ID: <20090821193738.B598711C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/maloc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8533

Modified Files:
	maloc.spec 
Added Files:
	maloc-maloc.dox.patch 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu> - 0.2-4
- patch to remove missing INPUT paths from doxygen build



maloc-maloc.dox.patch:
 maloc.dox |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE maloc-maloc.dox.patch ---
--- doc/doxygen/maloc.dox_orig	2009-08-21 12:26:08.000000000 -0700
+++ doc/doxygen/maloc.dox	2009-08-21 12:27:07.000000000 -0700
@@ -302,9 +302,7 @@
 # with spaces.
 
 INPUT                  = ../../src/base/maloc \
-                         ../../src/blas/maloc \
                          ../../src/psh/maloc \
-                         ../../src/vmath/maloc \
                          ../../src/vsh/maloc \
                          ../../src/vsys/maloc \
                          ../../src/aaa_inc/maloc/maloc.h \


Index: maloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/devel/maloc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maloc.spec	21 Aug 2009 18:39:05 -0000	1.1
+++ maloc.spec	21 Aug 2009 19:37:38 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Minimal Abstraction Layer for Object-oriented C
 Name: maloc
 Version: 0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Engineering
 License: GPLv2+
 URL: http://www.fetk.org
@@ -10,6 +10,8 @@ Source0: http://www.fetk.org/codes/%{nam
 Patch0: maloc-makefile.am.patch
 # we like shared libraries
 Patch1: maloc-configure.ac.patch
+# some INPUT paths are missing, causes failures
+Patch2: maloc-maloc.dox.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: automake
@@ -44,6 +46,7 @@ development using MALOC.
 %setup -n %{name} -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 aclocal
 automake --gnu --add-missing
 autoconf
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 %{_includedir}/maloc
 
 %changelog
+* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu> - 0.2-4
+- patch to remove missing INPUT paths from doxygen build
+
 * Thu Aug 06 2009 Tim Fenn <fenn at stanford.edu> - 0.2-3
 - add doxygen as buildreq
 



From timfenn at fedoraproject.org  Fri Aug 21 19:38:57 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 19:38:57 +0000 (UTC)
Subject: rpms/maloc/F-11 maloc-maloc.dox.patch,NONE,1.1 maloc.spec,1.1,1.2
Message-ID: <20090821193857.51D1311C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/maloc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8926

Modified Files:
	maloc.spec 
Added Files:
	maloc-maloc.dox.patch 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu> - 0.2-4
- patch to remove missing INPUT paths from doxygen build



maloc-maloc.dox.patch:
 maloc.dox |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE maloc-maloc.dox.patch ---
--- doc/doxygen/maloc.dox_orig	2009-08-21 12:26:08.000000000 -0700
+++ doc/doxygen/maloc.dox	2009-08-21 12:27:07.000000000 -0700
@@ -302,9 +302,7 @@
 # with spaces.
 
 INPUT                  = ../../src/base/maloc \
-                         ../../src/blas/maloc \
                          ../../src/psh/maloc \
-                         ../../src/vmath/maloc \
                          ../../src/vsh/maloc \
                          ../../src/vsys/maloc \
                          ../../src/aaa_inc/maloc/maloc.h \


Index: maloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/F-11/maloc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maloc.spec	21 Aug 2009 18:39:42 -0000	1.1
+++ maloc.spec	21 Aug 2009 19:38:57 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Minimal Abstraction Layer for Object-oriented C
 Name: maloc
 Version: 0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Engineering
 License: GPLv2+
 URL: http://www.fetk.org
@@ -10,6 +10,8 @@ Source0: http://www.fetk.org/codes/%{nam
 Patch0: maloc-makefile.am.patch
 # we like shared libraries
 Patch1: maloc-configure.ac.patch
+# some INPUT paths are missing, causes failures
+Patch2: maloc-maloc.dox.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: automake
@@ -44,6 +46,7 @@ development using MALOC.
 %setup -n %{name} -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 aclocal
 automake --gnu --add-missing
 autoconf
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 %{_includedir}/maloc
 
 %changelog
+* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu> - 0.2-4
+- patch to remove missing INPUT paths from doxygen build
+
 * Thu Aug 06 2009 Tim Fenn <fenn at stanford.edu> - 0.2-3
 - add doxygen as buildreq
 



From sdz at fedoraproject.org  Fri Aug 21 19:41:05 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 21 Aug 2009 19:41:05 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel import.log, NONE,
	1.1 zyx-liveinstaller.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090821194105.1AE1411C00D7@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9436/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zyx-liveinstaller.spec 
Log Message:
initial import



--- NEW FILE import.log ---
zyx-liveinstaller-0_1_10-1_fc11:HEAD:zyx-liveinstaller-0.1.10-1.fc11.src.rpm:1250883626


--- NEW FILE zyx-liveinstaller.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           zyx-liveinstaller
Version:        0.1.10
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  desktop-file-utils
BuildRequires:  python-devel
Requires:       usermode


%description
This installer will perfrom a traditional LiveOS installation,
however instead of installing a fresh copy of the LiveOS to
disk to be used on the next reboot, it live migrates the running
LiveOS's root filesystem to disk.  In this fashion it does not
require a reboot to begin using the installed system.


%prep
%setup -q


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zyx-liveinstaller.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_sbindir}/*
%{python_sitelib}/rli/
%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}


%changelog
* Sun Aug 16 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-1
- update to new upstream release
- fix some file locations

* Fri Aug 14 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.9-2
- adopt .spec file from Douglas McClendon
- minor tweaks and changes to fit the guidelines

* Sat Aug 8 2009 Douglas McClendon <dmc at viros.org> - 0.1.9-1
- tweak stupid .present delay workaround (for Guitar-ZyX-0.3)
- catch stderr in /var/log/zyx-liveinstaller.log, and more debug output
- attempt to unmount targets that have been automounted under /media
- genericize attempted unmount of live-osimg-min automounted under /media

* Tue Jul 28 2009 Douglas McClendon <dmc at viros.org> - 0.1.8-1
- zyx only: minor typo, remove liveos lvm devices from list
- rework internal device representation, fixing pre-f11 lvm problem
- add temporary special case for soas live-osimg-min mounting oddity
- more info added to BUGS/FAQ/README

* Mon Jul 27 2009 Douglas McClendon <dmc at viros.org> - 0.1.7-1
- vastly improve FAQ

* Sat Jul 25 2009 Douglas McClendon <dmc at viros.org> - 0.1.6-1
- remove zyx special lvm names from list (like for f11)
- use UUID= in fstab and grub.config, primarily to make 
  grubby happy, but also for consistency with anaconda.
- remove attempted workaround of issue with pre-first-reboot 
  hibernate.  Until grub(?) bug fixed, user must work around 
  at the grub-prompt-instead-of-unhibernation by typing e.g.
  # assuming /boot is on /dev/sda1
  grub> root (hd0,0)
  grub> setup (hd0)
  grub> reboot
  :( sigh...

* Fri Jul 17 2009 Douglas McClendon <dmc at viros.org> - 0.1.5-1
- trying harder to deal with /tmp tmpfs
- noted grubby problems in BUGS

* Fri Jul 17 2009 Douglas McClendon <dmc at viros.org> - 0.1.4-1
- removed facility for launcher desktop icon from xinit,
  but changed .desktop so it is shown under System Tools.
- better/fixed freeing of livemedia resources
- desensitized incompletely implemented installation abort
- try to migrate f11 live-only tmpfs's to rootfs
- support rootfs and swap on lvm
- support wholedisk targets (still need choice exclusion logic)
- top review text now uses long device names rather than short
- output is now logged to /var/log/rliveinst.log
- support ZyX LiveOS again, for now, with same backend
- misc bugfixes and refactorings

* Mon Jul 13 2009 Douglas McClendon <dmc at viros.org> - 0.1.3-1
- workaround fedora/grub problem by disabling hibernate autoboot
  - which I never liked anyway

* Mon Jul 13 2009 Douglas McClendon <dmc at viros.org> - 0.1.2-1
- really fix the grub configuration

* Sun Jul 12 2009 Douglas McClendon <dmc at viros.org> - 0.1.1-1
- fixed bugs with grub configuration
- better banner png compression
- red highlights for unselectable volumes (due to prior selection)
- misc cleanups

* Mon Jul 06 2009 Douglas McClendon <dmc at viros.org> - 0.1-1
- initial release and packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:26:51 -0000	1.1
+++ .cvsignore	21 Aug 2009 19:41:04 -0000	1.2
@@ -0,0 +1 @@
+zyx-liveinstaller-0.1.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:26:51 -0000	1.1
+++ sources	21 Aug 2009 19:41:04 -0000	1.2
@@ -0,0 +1 @@
+5a49ad7ccfe4711a1720e17a785e0a76  zyx-liveinstaller-0.1.10.tar.bz2



From sdz at fedoraproject.org  Fri Aug 21 19:43:00 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 21 Aug 2009 19:43:00 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 import.log, NONE,
	1.1 zyx-liveinstaller.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090821194300.CEB8F11C00D7@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-serv9855/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zyx-liveinstaller.spec 
Log Message:
initial import



--- NEW FILE import.log ---
zyx-liveinstaller-0_1_10-1_fc11:F-11:zyx-liveinstaller-0.1.10-1.fc11.src.rpm:1250883705


--- NEW FILE zyx-liveinstaller.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           zyx-liveinstaller
Version:        0.1.10
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  desktop-file-utils
BuildRequires:  python-devel
Requires:       usermode


%description
This installer will perfrom a traditional LiveOS installation,
however instead of installing a fresh copy of the LiveOS to
disk to be used on the next reboot, it live migrates the running
LiveOS's root filesystem to disk.  In this fashion it does not
require a reboot to begin using the installed system.


%prep
%setup -q


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zyx-liveinstaller.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_sbindir}/*
%{python_sitelib}/rli/
%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/%{name}


%changelog
* Sun Aug 16 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-1
- update to new upstream release
- fix some file locations

* Fri Aug 14 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.9-2
- adopt .spec file from Douglas McClendon
- minor tweaks and changes to fit the guidelines

* Sat Aug 8 2009 Douglas McClendon <dmc at viros.org> - 0.1.9-1
- tweak stupid .present delay workaround (for Guitar-ZyX-0.3)
- catch stderr in /var/log/zyx-liveinstaller.log, and more debug output
- attempt to unmount targets that have been automounted under /media
- genericize attempted unmount of live-osimg-min automounted under /media

* Tue Jul 28 2009 Douglas McClendon <dmc at viros.org> - 0.1.8-1
- zyx only: minor typo, remove liveos lvm devices from list
- rework internal device representation, fixing pre-f11 lvm problem
- add temporary special case for soas live-osimg-min mounting oddity
- more info added to BUGS/FAQ/README

* Mon Jul 27 2009 Douglas McClendon <dmc at viros.org> - 0.1.7-1
- vastly improve FAQ

* Sat Jul 25 2009 Douglas McClendon <dmc at viros.org> - 0.1.6-1
- remove zyx special lvm names from list (like for f11)
- use UUID= in fstab and grub.config, primarily to make 
  grubby happy, but also for consistency with anaconda.
- remove attempted workaround of issue with pre-first-reboot 
  hibernate.  Until grub(?) bug fixed, user must work around 
  at the grub-prompt-instead-of-unhibernation by typing e.g.
  # assuming /boot is on /dev/sda1
  grub> root (hd0,0)
  grub> setup (hd0)
  grub> reboot
  :( sigh...

* Fri Jul 17 2009 Douglas McClendon <dmc at viros.org> - 0.1.5-1
- trying harder to deal with /tmp tmpfs
- noted grubby problems in BUGS

* Fri Jul 17 2009 Douglas McClendon <dmc at viros.org> - 0.1.4-1
- removed facility for launcher desktop icon from xinit,
  but changed .desktop so it is shown under System Tools.
- better/fixed freeing of livemedia resources
- desensitized incompletely implemented installation abort
- try to migrate f11 live-only tmpfs's to rootfs
- support rootfs and swap on lvm
- support wholedisk targets (still need choice exclusion logic)
- top review text now uses long device names rather than short
- output is now logged to /var/log/rliveinst.log
- support ZyX LiveOS again, for now, with same backend
- misc bugfixes and refactorings

* Mon Jul 13 2009 Douglas McClendon <dmc at viros.org> - 0.1.3-1
- workaround fedora/grub problem by disabling hibernate autoboot
  - which I never liked anyway

* Mon Jul 13 2009 Douglas McClendon <dmc at viros.org> - 0.1.2-1
- really fix the grub configuration

* Sun Jul 12 2009 Douglas McClendon <dmc at viros.org> - 0.1.1-1
- fixed bugs with grub configuration
- better banner png compression
- red highlights for unselectable volumes (due to prior selection)
- misc cleanups

* Mon Jul 06 2009 Douglas McClendon <dmc at viros.org> - 0.1-1
- initial release and packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:26:51 -0000	1.1
+++ .cvsignore	21 Aug 2009 19:43:00 -0000	1.2
@@ -0,0 +1 @@
+zyx-liveinstaller-0.1.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:26:51 -0000	1.1
+++ sources	21 Aug 2009 19:43:00 -0000	1.2
@@ -0,0 +1 @@
+5a49ad7ccfe4711a1720e17a785e0a76  zyx-liveinstaller-0.1.10.tar.bz2



From abompard at fedoraproject.org  Fri Aug 21 19:46:55 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 21 Aug 2009 19:46:55 +0000 (UTC)
Subject: rpms/glest/devel .cvsignore, 1.9, 1.10 glest.sh, 1.10,
	1.11 glest.spec, 1.26, 1.27 sources, 1.9, 1.10
Message-ID: <20090821194656.00ED311C00D7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10836

Modified Files:
	.cvsignore glest.sh glest.spec sources 
Log Message:
* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  3.2.2-1
- rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Feb 2009 08:02:17 -0000	1.9
+++ .cvsignore	21 Aug 2009 19:46:55 -0000	1.10
@@ -1 +1 @@
-glest-source-3.2.1.tar.bz2
+glest-source-3.2.2.tar.bz2


Index: glest.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- glest.sh	28 Feb 2009 08:02:17 -0000	1.10
+++ glest.sh	21 Aug 2009 19:46:55 -0000	1.11
@@ -64,7 +64,7 @@ esac
 
 mkdir -p $GLEST_LOCAL_DIR
 cd $GLEST_LOCAL_DIR
-for dir in techs data maps scenarios tilesets; do
+for dir in techs data maps scenarios tilesets tutorials; do
     ln -snf $GLEST_DATA_DIR/$dir $dir
 done
 test -L screens && rm screens


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- glest.spec	25 Jul 2009 00:18:28 -0000	1.26
+++ glest.spec	21 Aug 2009 19:46:55 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           glest
-Version:        3.2.1
-Release:        2%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -8,13 +8,16 @@ License:        GPLv2+
 URL:            http://glest.org
 Source0:        http://www.titusgames.de/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
+Patch0:         glest-3.2.2-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
+BuildRequires:  jam, libX11-devel, SDL-devel, openal-soft-devel, xerces-c-devel
 BuildRequires:  libogg-devel, libvorbis-devel, lua-devel, wxGTK-devel
 BuildRequires:  desktop-file-utils, recode
 
-Requires:       glest-data = %{version}
+# Data version is not in sync:
+# http://glest.org/glest_board/index.php?topic=4252.0
+Requires:       glest-data >= 3.2.1
 # Used in the wrapper script
 Requires:       glx-utils
 Requires:       opengl-games-utils
@@ -33,8 +36,9 @@ exist in the environment and can be cont
 
 %prep
 %setup -q -n %{name}-source-%{version}
+%patch0 -p0 -b .gcc44
 find . -type f | xargs sed -i -e "s/\r//g" 
-recode ISO-8859-1..UTF-8 README
+#recode ISO-8859-1..UTF-8 README
 
 
 %build
@@ -98,7 +102,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README README.linux license.txt
 %{_bindir}/glest
 %{_bindir}/glest_editor
 %{_bindir}/glest-wrapper
@@ -108,6 +111,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  3.2.2-1
+- rebuild
+
+* Fri Jul 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 3.2.1-3
+- fix wrapper script (#501181)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Feb 2009 08:02:17 -0000	1.9
+++ sources	21 Aug 2009 19:46:55 -0000	1.10
@@ -1 +1 @@
-a57d19a4078980ee4c2c010d5a2b75d7  glest-source-3.2.1.tar.bz2
+f4b1df9d80f91d863b697af47c96025a  glest-source-3.2.2.tar.bz2



From pbrobinson at fedoraproject.org  Fri Aug 21 19:50:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 19:50:25 +0000 (UTC)
Subject: rpms/mutter/devel mutter-metawindow.patch, NONE, 1.1 mutter.spec,
	1.5, 1.6
Message-ID: <20090821195025.6EB1611C0417@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11571

Modified Files:
	mutter.spec 
Added Files:
	mutter-metawindow.patch 
Log Message:
- Add upstream patch needed by latest mutter-moblin

mutter-metawindow.patch:
 core/window.c    |   16 ++++++++++++++++
 include/window.h |    2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE mutter-metawindow.patch ---
>From f3e6913d579a2409de1eb7933a664f1c2b51380b Mon Sep 17 00:00:00 2001
From: Tomas Frydrych <tf at linux.intel.com>
Date: Thu, 06 Aug 2009 17:11:11 +0000
Subject: Added meta_window_is_modal()

Queries whether the window is in a modal state, as per the _NET_WM_STATE
protocol.
---
diff --git a/src/core/window.c b/src/core/window.c
index 974c650..d77a553 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8793,3 +8793,19 @@ meta_window_get_client_machine (MetaWindow *window)
   return window->wm_client_machine;
 }
 
+/**
+ * meta_window_is_modal:
+ * @window: a #MetaWindow
+ *
+ * Queries whether the window is in a modal state as described by the
+ * _NET_WM_STATE protocol.
+ *
+ * Return value: (transfer none): TRUE if the window is in modal state.
+ */
+gboolean
+meta_window_is_modal (MetaWindow *window)
+{
+  g_return_val_if_fail (META_IS_WINDOW (window), FALSE);
+
+  return window->wm_state_modal;
+}
diff --git a/src/include/window.h b/src/include/window.h
index f611da8..5295456 100644
--- a/src/include/window.h
+++ b/src/include/window.h
@@ -116,4 +116,5 @@ void        meta_window_delete             (MetaWindow  *window,
                                             guint32      timestamp);
 int         meta_window_get_pid (MetaWindow *window);
 const char *meta_window_get_client_machine (MetaWindow *window);
+gboolean    meta_window_is_modal (MetaWindow *window);
 #endif
--
cgit v0.8.2


Index: mutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mutter.spec	11 Aug 2009 16:28:22 -0000	1.5
+++ mutter.spec	21 Aug 2009 19:50:25 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           mutter
 Version:        2.27.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://git.gnome.org/cgit/mutter
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Patch0:		mutter-metawindow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
@@ -68,6 +69,7 @@ utilities for testing Metacity/Mutter th
 
 %prep
 %setup -q
+%patch0 -p1 -b .metawindows
 
 %build
 autoreconf
@@ -155,6 +157,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 2.27.2-2
+- Add upstream patch needed by latest mutter-moblin
+
 * Tue Aug 11 2009 Peter Robinson <pbrobinson at gmail.com> 2.27.2-1
 - New upstream 2.27.2 release. Drop upstreamed patches.
 



From timfenn at fedoraproject.org  Fri Aug 21 19:51:04 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 19:51:04 +0000 (UTC)
Subject: rpms/maloc/EL-5 maloc-maloc.dox.patch,NONE,1.1 maloc.spec,1.1,1.2
Message-ID: <20090821195104.0CA9C11C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/maloc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11790

Modified Files:
	maloc.spec 
Added Files:
	maloc-maloc.dox.patch 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu> - 0.2-4
- patch to remove missing INPUT paths from doxygen build



maloc-maloc.dox.patch:
 maloc.dox |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE maloc-maloc.dox.patch ---
--- doc/doxygen/maloc.dox_orig	2009-08-21 12:26:08.000000000 -0700
+++ doc/doxygen/maloc.dox	2009-08-21 12:27:07.000000000 -0700
@@ -302,9 +302,7 @@
 # with spaces.
 
 INPUT                  = ../../src/base/maloc \
-                         ../../src/blas/maloc \
                          ../../src/psh/maloc \
-                         ../../src/vmath/maloc \
                          ../../src/vsh/maloc \
                          ../../src/vsys/maloc \
                          ../../src/aaa_inc/maloc/maloc.h \


Index: maloc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maloc/EL-5/maloc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maloc.spec	21 Aug 2009 18:40:43 -0000	1.1
+++ maloc.spec	21 Aug 2009 19:51:03 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Minimal Abstraction Layer for Object-oriented C
 Name: maloc
 Version: 0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Engineering
 License: GPLv2+
 URL: http://www.fetk.org
@@ -10,6 +10,8 @@ Source0: http://www.fetk.org/codes/%{nam
 Patch0: maloc-makefile.am.patch
 # we like shared libraries
 Patch1: maloc-configure.ac.patch
+# some INPUT paths are missing, causes failures
+Patch2: maloc-maloc.dox.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: automake
@@ -44,6 +46,7 @@ development using MALOC.
 %setup -n %{name} -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 aclocal
 automake --gnu --add-missing
 autoconf
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 %{_includedir}/maloc
 
 %changelog
+* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu> - 0.2-4
+- patch to remove missing INPUT paths from doxygen build
+
 * Thu Aug 06 2009 Tim Fenn <fenn at stanford.edu> - 0.2-3
 - add doxygen as buildreq
 



From abompard at fedoraproject.org  Fri Aug 21 19:51:26 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 21 Aug 2009 19:51:26 +0000 (UTC)
Subject: rpms/awstats/F-10 awstats.spec,1.26,1.27
Message-ID: <20090821195126.C913B11C00D7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/awstats/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11919/F-10

Modified Files:
	awstats.spec 
Log Message:
* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  6.9-4
- don't backup the cgi when patching (#518168)



Index: awstats.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awstats/F-10/awstats.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- awstats.spec	31 Dec 2008 08:15:36 -0000	1.26
+++ awstats.spec	21 Aug 2009 19:51:26 -0000	1.27
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.9
-Release:    1%{?dist}
+Release:    4%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -40,7 +40,7 @@ http://localhost/awstats/awstats.pl
 
 %prep
 %setup -q
-%patch0 -p0 -b .CVE-2008-3714
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -160,6 +160,15 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  6.9-4
+- don't backup the cgi when patching (#518168)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Dec 31 2008 Aurelien Bompard <abompard at fedoraproject.org> 6.9-1
 - version 6.9
 - use Debian's version of the CVE-2008-3714 fix



From abompard at fedoraproject.org  Fri Aug 21 19:51:27 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 21 Aug 2009 19:51:27 +0000 (UTC)
Subject: rpms/awstats/F-11 awstats.spec,1.27,1.28
Message-ID: <20090821195127.00EE311C00D7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/awstats/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11919/F-11

Modified Files:
	awstats.spec 
Log Message:
* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  6.9-4
- don't backup the cgi when patching (#518168)



Index: awstats.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awstats/F-11/awstats.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- awstats.spec	24 Feb 2009 03:46:07 -0000	1.27
+++ awstats.spec	21 Aug 2009 19:51:26 -0000	1.28
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.9
-Release:    2%{?dist}
+Release:    4%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -40,7 +40,7 @@ http://localhost/awstats/awstats.pl
 
 %prep
 %setup -q
-%patch0 -p0 -b .CVE-2008-3714
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -160,6 +160,12 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  6.9-4
+- don't backup the cgi when patching (#518168)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From abompard at fedoraproject.org  Fri Aug 21 19:51:27 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Fri, 21 Aug 2009 19:51:27 +0000 (UTC)
Subject: rpms/awstats/devel awstats.spec,1.28,1.29
Message-ID: <20090821195127.28A5811C00D7@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/awstats/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11919/devel

Modified Files:
	awstats.spec 
Log Message:
* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  6.9-4
- don't backup the cgi when patching (#518168)



Index: awstats.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- awstats.spec	24 Jul 2009 17:43:43 -0000	1.28
+++ awstats.spec	21 Aug 2009 19:51:27 -0000	1.29
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.9
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -40,7 +40,7 @@ http://localhost/awstats/awstats.pl
 
 %prep
 %setup -q
-%patch0 -p0 -b .CVE-2008-3714
+%patch0 -p0
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -160,6 +160,9 @@ fi
 
 
 %changelog
+* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  6.9-4
+- don't backup the cgi when patching (#518168)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Fri Aug 21 20:15:10 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 21 Aug 2009 20:15:10 +0000 (UTC)
Subject: rpms/plexus-velocity/devel plexus-velocity.spec,1.7,1.8
Message-ID: <20090821201510.9B84A11C00D7@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16699

Modified Files:
	plexus-velocity.spec 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.1.7-3.3
- Add ant-nodeps BR


Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- plexus-velocity.spec	21 Aug 2009 19:01:53 -0000	1.7
+++ plexus-velocity.spec	21 Aug 2009 20:15:08 -0000	1.8
@@ -40,7 +40,7 @@
 
 Name:           plexus-velocity
 Version:        1.1.7
-Release:        3.2%{?dist}
+Release:        3.3%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
@@ -66,6 +66,7 @@ BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 %endif
 BuildRequires:  ant-contrib
+BuildRequires:  ant-nodeps
 BuildRequires:  classworlds >= 0:1.1
 BuildRequires:  jakarta-commons-collections
 BuildRequires:  plexus-container-default
@@ -176,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.1.7-3.3
+- Add ant-nodeps BR
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 1.1.7-3.2
 - Add ant-contrib BR
 



From pkgdb at fedoraproject.org  Fri Aug 21 20:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:24:48 +0000
Subject: [pkgdb] amarok ownership updated
Message-ID: <20090821202448.52EFD10F854@bastion2.fedora.phx.redhat.com>

Package amarok in Fedora devel is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Fri Aug 21 20:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:25:00 +0000
Subject: [pkgdb] amarok ownership updated
Message-ID: <20090821202500.DA01310F882@bastion2.fedora.phx.redhat.com>

Package amarok in Fedora 11 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Fri Aug 21 20:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:25:04 +0000
Subject: [pkgdb] amarok ownership updated
Message-ID: <20090821202504.A4DB510F88B@bastion2.fedora.phx.redhat.com>

Package amarok in Fedora 10 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Fri Aug 21 20:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:30:52 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested watchbugzilla
Message-ID: <20090821203052.D850010F889@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on mutter-moblin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Fri Aug 21 20:30:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:30:55 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested watchcommits
Message-ID: <20090821203055.D710510F881@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on mutter-moblin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Fri Aug 21 20:30:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:30:55 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested approveacls
Message-ID: <20090821203055.DB13410F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on mutter-moblin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Fri Aug 21 20:30:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:30:59 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested commit
Message-ID: <20090821203059.04F9010F890@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on mutter-moblin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Fri Aug 21 20:31:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:31:05 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested watchbugzilla
Message-ID: <20090821203105.849BF10F80B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on mutter-moblin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Fri Aug 21 20:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:31:06 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested commit
Message-ID: <20090821203106.491CE10F898@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on mutter-moblin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From pkgdb at fedoraproject.org  Fri Aug 21 20:31:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:31:09 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested approveacls
Message-ID: <20090821203109.BF1B210F89B@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on mutter-moblin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From tgl at fedoraproject.org  Fri Aug 21 20:31:26 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 21 Aug 2009 20:31:26 +0000 (UTC)
Subject: rpms/unixODBC/devel odbcint64-config.patch, NONE, 1.1 odbcinst.ini, 
	1.4, 1.5 unixODBC.spec, 1.50, 1.51 import.log, 1.1, NONE
Message-ID: <20090821203126.CE60C11C00D7@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/unixODBC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20095

Modified Files:
	odbcinst.ini unixODBC.spec 
Added Files:
	odbcint64-config.patch 
Removed Files:
	import.log 
Log Message:
Switch to building against qt4; fix misdeclaration of SQLBIGINT and SQLUBIGINT.

odbcint64-config.patch:
 odbc-config.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE odbcint64-config.patch ---
Fix output of odbc_config --header, per bug #518623.
This error results in SQLBIGINT and SQLUBIGINT being misdefined as
int, where they need to be [unsigned] long or long long.


diff -Naur unixODBC-2.2.14.orig/exe/odbc-config.c unixODBC-2.2.14/exe/odbc-config.c
--- unixODBC-2.2.14.orig/exe/odbc-config.c	2008-05-20 08:58:17.000000000 -0400
+++ unixODBC-2.2.14/exe/odbc-config.c	2009-08-21 14:15:35.000000000 -0400
@@ -66,12 +66,15 @@
     printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
 #endif
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 #ifdef ODBCINT64
-    printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
+    printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", xstr(ODBCINT64) );
 #endif
 
 #ifdef UODBCINT64
-    printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
+    printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", xstr(UODBCINT64) );
 #endif
 
 #ifdef DISABLE_INI_CACHING


Index: odbcinst.ini
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/devel/odbcinst.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- odbcinst.ini	20 Feb 2009 17:22:19 -0000	1.4
+++ odbcinst.ini	21 Aug 2009 20:31:26 -0000	1.5
@@ -1,6 +1,4 @@
 # Example driver definitions
-# Note: on a 64-bit machine, change /usr/lib to /usr/lib64
-#
 
 # Driver from the postgresql-odbc package
 # Setup from the unixODBC package
@@ -8,6 +6,8 @@
 Description	= ODBC for PostgreSQL
 Driver		= /usr/lib/psqlodbc.so
 Setup		= /usr/lib/libodbcpsqlS.so
+Driver64	= /usr/lib64/psqlodbc.so
+Setup64		= /usr/lib64/libodbcpsqlS.so
 FileUsage	= 1
 
 
@@ -17,4 +17,6 @@ FileUsage	= 1
 Description	= ODBC for MySQL
 Driver		= /usr/lib/libmyodbc5.so
 Setup		= /usr/lib/libodbcmyS.so
+Driver64	= /usr/lib64/libmyodbc5.so
+Setup64		= /usr/lib64/libodbcmyS.so
 FileUsage	= 1


Index: unixODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- unixODBC.spec	27 Jul 2009 06:33:59 -0000	1.50
+++ unixODBC.spec	21 Aug 2009 20:31:26 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -10,8 +10,8 @@ License: GPLv2+ and LGPLv2+
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
 Source1: odbcinst.ini
 Source2: ODBCConfig.desktop
-Source3: DataManager.desktop
 Source4: conffile.h
+
 Patch1: depcomp.patch
 Patch2: multilib-config.patch
 Patch3: warning-cleanup.patch
@@ -19,10 +19,11 @@ Patch6: export-symbols.patch
 Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
+Patch10: odbcint64-config.patch
 
 Conflicts: iodbc
 BuildRequires: libX11-devel libXt-devel libXext-devel
-BuildRequires: qt3-devel readline-devel
+BuildRequires: qt4-devel readline-devel
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -48,8 +49,8 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description kde
-This package contains components for the ODBCConfig and DataManager
-(KDE) components of unixODBC.
+This package contains components for the ODBCConfig
+(KDE) component of unixODBC.
 
 %prep
 %setup -q
@@ -60,6 +61,8 @@ This package contains components for the
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
 chmod 0644 Drivers/template/*.c
@@ -75,11 +78,9 @@ libtoolize --install || libtoolize
 
 %build
 # pick up qt path
-export QTDIR=
-. /etc/profile.d/qt.sh
+export PATH="%{_qt4_bindir}:$PATH"
 # clean up old moc files
-(cd ODBCConfig && rm -f mclass*.cpp)
-(cd DataManager && rm -f mclass*.cpp)
+(cd odbcinstQ4 && rm -f mC*.cpp)
 
 aclocal
 automake --add-missing
@@ -90,13 +91,12 @@ CFLAGS="%{optflags} -fno-strict-aliasing
 CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS
 
-%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib
+%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib --with-qt-programs="%{_qt4_bindir}" --with-qt-libraries="%{_qt4_libdir}"
 make all
 
 %install
 # pick up qt path
-export QTDIR=
-. /etc/profile.d/qt.sh
+export PATH="%{_qt4_bindir}:$PATH"
 
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -104,14 +104,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixm
 
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp DataManager/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/odbc.xpm
-cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/odbc.xpm
 
 # installing *.desktop files
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
 
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
@@ -177,13 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %files kde
 %defattr(-,root,root)
 %{_bindir}/ODBCConfig
-%{_bindir}/DataManager
-%{_bindir}/DataManagerII
-%{_bindir}/odbctest
 %{_datadir}/applications/ODBCConfig.desktop
-%{_datadir}/applications/DataManager.desktop
-%{_datadir}/pixmaps/LinuxODBC.xpm
-%{_datadir}/pixmaps/odbc.xpm
 %{_libdir}/libodbcinstQ*so
 %{_libdir}/libodbcinstQ*so.*
 
@@ -194,6 +183,15 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* 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.
+Resolves: #514064
+- Use Driver64/Setup64 to eliminate need for hand-adjustment of odbcinst.ini
+Resolves: #514688
+- Fix misdeclaration of SQLBIGINT and SQLUBIGINT in generated header files
+Resolves: #518623
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- import.log DELETED ---



From pkgdb at fedoraproject.org  Fri Aug 21 20:31:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:31:11 +0000
Subject: [pkgdb] mutter-moblin: salimma has requested watchcommits
Message-ID: <20090821203111.E20CC10F8A0@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on mutter-moblin (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mutter-moblin



From rathann at fedoraproject.org  Fri Aug 21 20:31:54 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 21 Aug 2009 20:31:54 +0000 (UTC)
Subject: rpms/gabedit/devel .cvsignore, 1.5, 1.6 gabedit.spec, 1.6,
	1.7 sources, 1.5, 1.6 gabedit.desktop, 1.1, NONE
Message-ID: <20090821203154.5D97E11C00D7@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gabedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20260

Modified Files:
	.cvsignore gabedit.spec sources 
Removed Files:
	gabedit.desktop 
Log Message:
* Fri Aug 21 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.4-1
- updated to latest version (2.2.4)
- shortened the description field
- desktop file has been upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 01:26:26 -0000	1.5
+++ .cvsignore	21 Aug 2009 20:31:53 -0000	1.6
@@ -1 +1 @@
-GabeditSrc2117.tar.gz
+GabeditSrc224.tar.gz


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gabedit.spec	24 Jul 2009 23:24:46 -0000	1.6
+++ gabedit.spec	21 Aug 2009 20:31:54 -0000	1.7
@@ -1,12 +1,11 @@
-%define version	2.1.17
-%define tarver	2117
+%define version	2.2.4
+%define tarver	224
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
 Version:	%{version}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
-Source1:	%{name}.desktop
 Patch2:		%{name}-csh.patch
 URL:		http://gabedit.sourceforge.net/home.html
 License:	MIT
@@ -20,51 +19,21 @@ BuildRequires:	libGLU-devel
 BuildRequires:	libjpeg-devel
 
 %description
-Gabedit is a Graphical User Interface to Gamess-US, Gaussian, Molcas, Molpro
-and MPQC computational chemistry packages. Gabedit includes graphical
-facilities for generating keywords and options, molecule specifications and
-their input sections for even the most advanced calculation types. Gabedit
-includes an advanced Molecule Builder. You can use it to rapidly sketch in
-molecules and examine them in three dimensions. You can build molecules by
-atom, ring, group, amino acid and nucleoside. You can also read geometry from
-a file. Most major molecular file formats are supported.
-
-Gabedit includes a Gamess-US, Gaussian, Molcas, Molpro and MPQC Calculation
-Setup window which allows you to set up Gamess-US, Gaussian, Molcas, Molpro
-and MPQC jobs in a simple and straightforward manner.
-
-Gabedit can graphically display a variety of Gamess-US, Gaussian, Molcas,
-Molpro, MPQC and (partially) ADF calculation results, including the following:
-- Molecular orbitals
-- Surfaces from the electron density, electrostatic potential, NMR shielding
-  density, and other properties.
-- Surfaces may be displayed in solid, translucent and wire mesh modes. They
-  are can be colorcoded by a separate property.
-- Contours (colorcoded), Planes colorcoded, Dipole. XYZ axes and the principal
-  axes of the molecule.
-- Animation of the normal modes corresponding to vibrational frequencies.
-- Animation of the rotation of geometry, surfaces, contours, planes colorcoded,
-  xyz and the principal axes of the molecule.
-- Animation of contours, Animation of planes colorcoded.
-
-Gabedit can display IR and Raman computed spectra.
-
-Gabedit can generate a povray file for geometry (including hydrogen's bond),
-surfaces (including colorcoded surfaces), contours, planes colorcoded.
-
-Gabedit can save picture in BMP, JPEG, PNG, PPM and PS format.
-
-Gabedit can generate automatically a series of pictures for animation
-(vibration, geometry convergence, rotation, contours, planes colorcoded).
+Gabedit is a Graphical User Interface to Gamess-US, Gaussian, Molcas,
+Molpro and MPQC computational chemistry packages. Gabedit includes
+graphical facilities for generating keywords and options, molecule
+specifications and their input sections for even the most advanced
+calculation types. Gabedit includes an advanced Molecule Builder. You
+can use it to rapidly sketch in molecules and examine them in three
+dimensions. You can build molecules by atom, ring, group, amino acid and
+nucleoside. You can also read geometry from a file. Most major molecular
+file formats are supported.
 
 %prep
 %setup -q -n GabeditSrc%{tarver}
 %patch2 -p1
-# remove bundled pre-built binaries
-%{__rm} utils/MolecularMechanics/{createTPLfile,createmmfile}
 # remove Win32-specific files
 %{__rm} -r utils/InnosSetupScriptWin32
-%{__rm} utils/Others/Gabedit206.iss
 echo "external_gtkglarea=1" >> CONFIG
 echo "external_gl2ps=1" >> CONFIG
 
@@ -80,7 +49,7 @@ install -pm755 %{name} %{buildroot}/%{_b
 install -d %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor=fedora \
 	--dir=%{buildroot}%{_datadir}/applications \
-	%{SOURCE1}
+	utils/Others/gabedit.desktop
 
 for size in 16 32 48 ; do
 	install -d %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps
@@ -110,6 +79,11 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* Fri Aug 21 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.4-1
+- updated to latest version (2.2.4)
+- shortened the description field
+- desktop file has been upstreamed
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Feb 2009 01:26:26 -0000	1.5
+++ sources	21 Aug 2009 20:31:54 -0000	1.6
@@ -1 +1 @@
-cd013b995134720cc9e1821d71b7ba5f  GabeditSrc2117.tar.gz
+1015a284693bf9391dfcd5a52891d9db  GabeditSrc224.tar.gz


--- gabedit.desktop DELETED ---



From pkgdb at fedoraproject.org  Fri Aug 21 20:34:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:34:50 +0000
Subject: [pkgdb] agave ownership updated
Message-ID: <20090821203450.AC4FF10F84D@bastion2.fedora.phx.redhat.com>

Package agave in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 20:35:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:35:46 +0000
Subject: [pkgdb] apachetop ownership updated
Message-ID: <20090821203546.C5BF010F854@bastion2.fedora.phx.redhat.com>

Package apachetop in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apachetop



From pkgdb at fedoraproject.org  Fri Aug 21 20:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:35:53 +0000
Subject: [pkgdb] basket ownership updated
Message-ID: <20090821203553.A99FF10F881@bastion2.fedora.phx.redhat.com>

Package basket in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Fri Aug 21 20:35:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:35:59 +0000
Subject: [pkgdb] blobby ownership updated
Message-ID: <20090821203559.2945710F84D@bastion2.fedora.phx.redhat.com>

Package blobby in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/blobby



From pkgdb at fedoraproject.org  Fri Aug 21 20:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:36:03 +0000
Subject: [pkgdb] cryptopp ownership updated
Message-ID: <20090821203603.C23E210F895@bastion2.fedora.phx.redhat.com>

Package cryptopp in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cryptopp



From pkgdb at fedoraproject.org  Fri Aug 21 20:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:36:09 +0000
Subject: [pkgdb] glest ownership updated
Message-ID: <20090821203609.67CD410F854@bastion2.fedora.phx.redhat.com>

Package glest in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Fri Aug 21 20:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:36:14 +0000
Subject: [pkgdb] glest-data ownership updated
Message-ID: <20090821203614.9B08D10F85C@bastion2.fedora.phx.redhat.com>

Package glest-data in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Fri Aug 21 20:36:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:36:32 +0000
Subject: [pkgdb] gwenview ownership updated
Message-ID: <20090821203632.B43C410F84D@bastion2.fedora.phx.redhat.com>

Package gwenview in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gwenview



From jjohnstn at fedoraproject.org  Fri Aug 21 20:36:41 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 21 Aug 2009 20:36:41 +0000 (UTC)
Subject: rpms/eclipse-rse/devel eclipse-rse.spec,1.5,1.6
Message-ID: <20090821203641.A100D11C00D7@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-rse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21282

Modified Files:
	eclipse-rse.spec 
Log Message:

* Fri Aug 21 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1-2
- Add BuildArch noarch.





Index: eclipse-rse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/eclipse-rse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-rse.spec	17 Aug 2009 20:10:19 -0000	1.5
+++ eclipse-rse.spec	21 Aug 2009 20:36:41 -0000	1.6
@@ -4,7 +4,7 @@
 Name: eclipse-rse
 Summary: Eclipse Remote System Explorer
 Version: 3.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: EPL
 URL: http://www.eclipse.org/dsdp/tm/
 
@@ -19,6 +19,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 BuildRequires:    java-devel >= 1.5.0
 
+BuildArch: noarch
+
 BuildRequires: eclipse-pde >= 1:3.4.1
 BuildRequires: eclipse-emf >= 0:2.4.1
 BuildRequires: jakarta-commons-net >= 0:1.4.1-5.4
@@ -86,6 +88,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.rse.sdk-feature/license.html
 
 %changelog
+* Fri Aug 21 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1-2
+- Add BuildArch noarch.
+
 * Mon Aug 17 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1-1
 - Move to 3.1 tarball.
 



From dwmw2 at fedoraproject.org  Fri Aug 21 20:37:42 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 21 Aug 2009 20:37:42 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-ppc64-vs-broadcom.patch, NONE,
	1.1 kernel.spec, 1.1405, 1.1406
Message-ID: <20090821203742.C706611C00D7@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21699

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ppc64-vs-broadcom.patch 
Log Message:
fix b43 on imac g5 (#514787)

linux-2.6-ppc64-vs-broadcom.patch:
 dma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom.patch ---
>From b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 10 Aug 2009 16:36:38 +1000
Subject: [PATCH] powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM

On an iMac G5, the b43 driver is failing to initialise because trying to
set the dma mask to 30-bit fails. Even though there's only 512MiB of RAM
in the machine anyway:
	https://bugzilla.redhat.com/show_bug.cgi?id=514787

We should probably let it succeed if the available RAM in the system
doesn't exceed the requested limit.

Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---
 arch/powerpc/kernel/dma.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 20a60d6..ccf129d 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -7,6 +7,7 @@
 
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/lmb.h>
 #include <asm/bug.h>
 #include <asm/abs_addr.h>
 
@@ -90,11 +91,10 @@ static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
 static int dma_direct_dma_supported(struct device *dev, u64 mask)
 {
 #ifdef CONFIG_PPC64
-	/* Could be improved to check for memory though it better be
-	 * done via some global so platforms can set the limit in case
+	/* Could be improved so platforms can set the limit in case
 	 * they have limited DMA windows
 	 */
-	return mask >= DMA_32BIT_MASK;
+	return mask >= (lmb_end_of_DRAM() - 1);
 #else
 	return 1;
 #endif
-- 
1.6.2.5



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -u -p -r1.1405 -r1.1406
--- kernel.spec	19 Aug 2009 14:21:15 -0000	1.1405
+++ kernel.spec	21 Aug 2009 20:37:42 -0000	1.1406
@@ -612,6 +612,7 @@ Patch142: linux-2.6-ps3-legacy-bootloade
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
+Patch148: linux-2.6-ppc64-vs-broadcom.patch
 Patch149: linux-2.6-efika-not-chrp.patch
 
 Patch160: linux-2.6-execshield.patch
@@ -1212,6 +1213,8 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
+# Fix b43 support on no-iommu machines with <1GiB RAM
+ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
 # Don't show 'CHRP' in /proc/cpuinfo on Efika
 #ApplyPatch linux-2.6-efika-not-chrp.patch
 
@@ -2031,6 +2034,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Fix b43 on iMac G5 (#514787)
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - CVE-2009-2848: execve: must clear current->clear_child_tid
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd



From pkgdb at fedoraproject.org  Fri Aug 21 20:38:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:38:52 +0000
Subject: [pkgdb] libifp ownership updated
Message-ID: <20090821203852.CA19610F854@bastion2.fedora.phx.redhat.com>

Package libifp in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 20:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:38:55 +0000
Subject: [pkgdb] libkexif ownership updated
Message-ID: <20090821203856.04E0010F84D@bastion2.fedora.phx.redhat.com>

Package libkexif in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 20:39:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:39:02 +0000
Subject: [pkgdb] libkipi ownership updated
Message-ID: <20090821203902.4E1AC10F882@bastion2.fedora.phx.redhat.com>

Package libkipi in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkipi



From pkgdb at fedoraproject.org  Fri Aug 21 20:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:39:08 +0000
Subject: [pkgdb] libvisual ownership updated
Message-ID: <20090821203908.2890010F854@bastion2.fedora.phx.redhat.com>

Package libvisual in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvisual



From pkgdb at fedoraproject.org  Fri Aug 21 20:39:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:39:24 +0000
Subject: [pkgdb] libvisual-plugins ownership updated
Message-ID: <20090821203924.A20F410F855@bastion2.fedora.phx.redhat.com>

Package libvisual-plugins in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libvisual-plugins



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:14 +0000
Subject: [pkgdb] mhonarc ownership updated
Message-ID: <20090821204114.C09F510F84D@bastion2.fedora.phx.redhat.com>

Package mhonarc in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mhonarc



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:19 +0000
Subject: [pkgdb] quilt had acl change status
Message-ID: <20090821204119.235E510F855@bastion2.fedora.phx.redhat.com>

bonii has set the watchcommits acl on quilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:19 +0000
Subject: [pkgdb] moodbar ownership updated
Message-ID: <20090821204119.3787310F86F@bastion2.fedora.phx.redhat.com>

Package moodbar in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moodbar



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:27 +0000
Subject: [pkgdb] pdftohtml ownership updated
Message-ID: <20090821204127.2B4E410F889@bastion2.fedora.phx.redhat.com>

Package pdftohtml in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pdftohtml



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:19 +0000
Subject: [pkgdb] quilt had acl change status
Message-ID: <20090821204119.4B1F210F888@bastion2.fedora.phx.redhat.com>

bonii has set the watchbugzilla acl on quilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:28 +0000
Subject: [pkgdb] quilt had acl change status
Message-ID: <20090821204128.8FB6410F897@bastion2.fedora.phx.redhat.com>

bonii has set the commit acl on quilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:29 +0000
Subject: [pkgdb] quilt had acl change status
Message-ID: <20090821204129.D3F1310F899@bastion2.fedora.phx.redhat.com>

bonii has set the approveacls acl on quilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/quilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:32 +0000
Subject: [pkgdb] perl-Jcode ownership updated
Message-ID: <20090821204132.91CDB10F89B@bastion2.fedora.phx.redhat.com>

Package perl-Jcode in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Jcode



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:35 +0000
Subject: [pkgdb] perl-Unicode-Map ownership updated
Message-ID: <20090821204136.149E510F8A1@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-Map in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-Map



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:42 +0000
Subject: [pkgdb] perl-Unicode-Map8 ownership updated
Message-ID: <20090821204142.BF55D10F85C@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-Map8 in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-Map8



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:46 +0000
Subject: [pkgdb] perl-Unicode-MapUTF8 ownership updated
Message-ID: <20090821204146.2B03410F8A2@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-MapUTF8 in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-MapUTF8



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:49 +0000
Subject: [pkgdb] perl-Unicode-String ownership updated
Message-ID: <20090821204149.E4F9010F889@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-String in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-String



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:51 +0000
Subject: [pkgdb] gquilt had acl change status
Message-ID: <20090821204151.2AB1610F8A3@bastion2.fedora.phx.redhat.com>

bonii has set the watchbugzilla acl on gquilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:53 +0000
Subject: [pkgdb] gquilt had acl change status
Message-ID: <20090821204153.4F6C210F8A9@bastion2.fedora.phx.redhat.com>

bonii has set the watchcommits acl on gquilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:53 +0000
Subject: [pkgdb] gquilt had acl change status
Message-ID: <20090821204153.ABB3410F8AA@bastion2.fedora.phx.redhat.com>

bonii has set the commit acl on gquilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:55 +0000
Subject: [pkgdb] php-adodb ownership updated
Message-ID: <20090821204155.17E2910F8B1@bastion2.fedora.phx.redhat.com>

Package php-adodb in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 21 20:41:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:41:55 +0000
Subject: [pkgdb] gquilt had acl change status
Message-ID: <20090821204155.C8D2510F8B5@bastion2.fedora.phx.redhat.com>

bonii has set the approveacls acl on gquilt (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gquilt



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:10 +0000
Subject: [pkgdb] qca ownership updated
Message-ID: <20090821204210.0E90310F8B8@bastion2.fedora.phx.redhat.com>

Package qca in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:05 +0000
Subject: [pkgdb] python-dialog ownership updated
Message-ID: <20090821204205.2B46310F899@bastion2.fedora.phx.redhat.com>

Package python-dialog in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:15 +0000
Subject: [pkgdb] qca-gnupg ownership updated
Message-ID: <20090821204215.4F74F10F88C@bastion2.fedora.phx.redhat.com>

Package qca-gnupg in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca-gnupg



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:18 +0000
Subject: [pkgdb] qca-ossl ownership updated
Message-ID: <20090821204219.085DE10F89B@bastion2.fedora.phx.redhat.com>

Package qca-ossl in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca-ossl



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:19 +0000
Subject: [pkgdb] apachetop ownership updated
Message-ID: <20090821204219.D533E10F8BA@bastion2.fedora.phx.redhat.com>

Package apachetop in Fedora devel is now owned by maxamillion

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apachetop



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:21 +0000
Subject: [pkgdb] qca-tls ownership updated
Message-ID: <20090821204221.EB37D10F8BC@bastion2.fedora.phx.redhat.com>

Package qca-tls in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca-tls



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:25 +0000
Subject: [pkgdb] qca2 ownership updated
Message-ID: <20090821204225.8F55110F89C@bastion2.fedora.phx.redhat.com>

Package qca2 in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:29 +0000
Subject: [pkgdb] showimg ownership updated
Message-ID: <20090821204229.76C1010F8C2@bastion2.fedora.phx.redhat.com>

Package showimg in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/showimg



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:32 +0000
Subject: [pkgdb] stow ownership updated
Message-ID: <20090821204232.D197110F8C4@bastion2.fedora.phx.redhat.com>

Package stow in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:38 +0000
Subject: [pkgdb] taglib ownership updated
Message-ID: <20090821204238.7259310F881@bastion2.fedora.phx.redhat.com>

Package taglib in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:42 +0000
Subject: [pkgdb] tetex-unicode ownership updated
Message-ID: <20090821204242.6B09910F8A5@bastion2.fedora.phx.redhat.com>

Package tetex-unicode in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tetex-unicode



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:45 +0000
Subject: [pkgdb] tiger ownership updated
Message-ID: <20090821204245.C2F7B10F889@bastion2.fedora.phx.redhat.com>

Package tiger in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:53 +0000
Subject: [pkgdb] unrtf ownership updated
Message-ID: <20090821204253.DB83910F8C9@bastion2.fedora.phx.redhat.com>

Package unrtf in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unrtf



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:59 +0000
Subject: [pkgdb] wv ownership updated
Message-ID: <20090821204259.C88BB10F8A9@bastion2.fedora.phx.redhat.com>

Package wv in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wv



From pkgdb at fedoraproject.org  Fri Aug 21 20:43:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:43:03 +0000
Subject: [pkgdb] xbindkeys ownership updated
Message-ID: <20090821204303.44A5510F8CA@bastion2.fedora.phx.redhat.com>

Package xbindkeys in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xbindkeys



From pkgdb at fedoraproject.org  Fri Aug 21 20:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:43:09 +0000
Subject: [pkgdb] xine-lib ownership updated
Message-ID: <20090821204309.47F6910F8B1@bastion2.fedora.phx.redhat.com>

Package xine-lib in Fedora devel is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib



From pkgdb at fedoraproject.org  Fri Aug 21 20:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:43:19 +0000
Subject: [pkgdb] xlhtml ownership updated
Message-ID: <20090821204319.868AB10F8B2@bastion2.fedora.phx.redhat.com>

Package xlhtml in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xlhtml



From mso at fedoraproject.org  Fri Aug 21 20:43:28 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Fri, 21 Aug 2009 20:43:28 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel .cvsignore, 1.2,
	1.3 constantine-backgrounds.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090821204328.AE10711C00D7@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23403

Modified Files:
	.cvsignore constantine-backgrounds.spec sources 
Log Message:


First wallpaper respin.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Aug 2009 22:37:09 -0000	1.2
+++ .cvsignore	21 Aug 2009 20:43:28 -0000	1.3
@@ -1 +1 @@
-constantine-backgrounds-11.90.1.tar.lzma
+constantine-backgrounds-11.90.2.tar.lzma


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- constantine-backgrounds.spec	20 Aug 2009 18:25:58 -0000	1.3
+++ constantine-backgrounds.spec	21 Aug 2009 20:43:28 -0000	1.4
@@ -1,16 +1,12 @@
 Name:           constantine-backgrounds
-Version:        11.90.1
-Release:        3%{?dist}
+Version:        11.90.2
+Release:        1%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
 License:        CC-BY-SA
 URL:            https://fedoraproject.org/wiki/F12_Artwork
-Source0:        https://fedorahosted.org/releases/f/e/fedora-design/%{name}-%{version}.tar.lzma
-# include these here for now, will get into contstantine-backgrounds
-# upstream asap.
-Source1:        constantine-mosaico-metadata.desktop
-Source2:        constantine-underwater-mosaic-metadata.desktop
+Source0:        https://fedorahosted.org/released/design-team/%{name}-%{version}.tar.lzma
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -62,97 +58,12 @@ This package contains aditional KDE desk
 
 
 %build
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# prepare the dir structure
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/constantine
-
-# copy the images and xml files
-cp -a default \
-        $RPM_BUILD_ROOT%{_datadir}/backgrounds/constantine/
-cp -a extras \
-        $RPM_BUILD_ROOT%{_datadir}/backgrounds/constantine/
-        
-# copy metadata xml files
-install -p -m644 -D desktop-backgrounds-constantine.xml \
-        $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine.xml
-install -p -m644 -D desktop-backgrounds-constantine-extras.xml \
-        $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-constantine-extras.xml
-
-## KDE bits
-# constantine-mosaico
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Mosaico/contents/images
-install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Mosaico/metadata.desktop
-(cd $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Mosaico/contents/images
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 640x480.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 800x480.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 800x600.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1024x600.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1024x768.png
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1152x720.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1152x864.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1280x768.png
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1280x800.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1280x960.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1366x768.png
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1440x900.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1440x1080.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1600x1200.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1600x1280.png
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1920x1080.png
-ln -s ../../../../backgrounds/constantine/default/wide/mosaico.png 1920x1200.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 1920x1440.png
-ln -s ../../../../backgrounds/constantine/default/standard/mosaico.png 2048x1536.png
-)
-
-# constantine-underwater-mosaic
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/contents/images
-install -p -D -m644 %{SOURCE2} \
-  $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/metadata.desktop
-(cd $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/contents/images
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 640x480.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 800x480.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 800x600.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1024x600.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1024x768.png
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1152x720.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1152x864.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1200x900.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1280x720.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1280x768.png
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1280x800.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1280x960.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1280x1024.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1366x768.png
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1440x900.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1440x1080.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1600x1200.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1600x1280.png
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1680x1050.png
-# That one's not really 8:5, but it's the closest...
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1920x1080.png
-ln -s ../../../../backgrounds/constantine/default/wide/underwater-mosaic.png 1920x1200.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 1920x1440.png
-ln -s ../../../../backgrounds/constantine/default/standard/underwater-mosaic.png 2048x1536.png
-)
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -175,13 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 %files kde
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/Constantine_Mosaico/
-%{_kde4_datadir}/wallpapers/Constantine_Underwater_Mosaic/
 
 #files extras-kde
 #defattr(-,root,root,-)
 
 
 %changelog
+* Fri Aug 21 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.2-1
+- First wallpaper respin
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 11.90.1-3
 - Provides: system-backgrounds(-kde) (F-12 only)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Aug 2009 22:37:09 -0000	1.2
+++ sources	21 Aug 2009 20:43:28 -0000	1.3
@@ -1 +1 @@
-10d80cda422b5754a84994a79ee35b62  constantine-backgrounds-11.90.1.tar.lzma
+18da6721350f4e8974a2e184ba56e41b  constantine-backgrounds-11.90.2.tar.lzma



From pkgdb at fedoraproject.org  Fri Aug 21 20:42:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:42:49 +0000
Subject: [pkgdb] ulogd ownership updated
Message-ID: <20090821204249.11A1E10F8A3@bastion2.fedora.phx.redhat.com>

Package ulogd in Fedora devel was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ulogd



From rathann at fedoraproject.org  Fri Aug 21 20:43:47 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 21 Aug 2009 20:43:47 +0000 (UTC)
Subject: rpms/gabedit/F-11 .cvsignore, 1.5, 1.6 gabedit.spec, 1.5,
	1.6 sources, 1.5, 1.6 gabedit.desktop, 1.1, NONE
Message-ID: <20090821204347.93B9D11C00D7@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gabedit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23508

Modified Files:
	.cvsignore gabedit.spec sources 
Removed Files:
	gabedit.desktop 
Log Message:
* Fri Aug 21 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.4-1
- updated to latest version (2.2.4)
- shortened the description field
- desktop file has been upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Feb 2009 01:26:26 -0000	1.5
+++ .cvsignore	21 Aug 2009 20:43:47 -0000	1.6
@@ -1 +1 @@
-GabeditSrc2117.tar.gz
+GabeditSrc224.tar.gz


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/F-11/gabedit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gabedit.spec	27 Feb 2009 01:26:26 -0000	1.5
+++ gabedit.spec	21 Aug 2009 20:43:47 -0000	1.6
@@ -1,12 +1,11 @@
-%define version	2.1.17
-%define tarver	2117
+%define version	2.2.4
+%define tarver	224
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
 Version:	%{version}
 Release:	1%{?dist}
 Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
-Source1:	%{name}.desktop
 Patch2:		%{name}-csh.patch
 URL:		http://gabedit.sourceforge.net/home.html
 License:	MIT
@@ -20,51 +19,21 @@ BuildRequires:	libGLU-devel
 BuildRequires:	libjpeg-devel
 
 %description
-Gabedit is a Graphical User Interface to Gamess-US, Gaussian, Molcas, Molpro
-and MPQC computational chemistry packages. Gabedit includes graphical
-facilities for generating keywords and options, molecule specifications and
-their input sections for even the most advanced calculation types. Gabedit
-includes an advanced Molecule Builder. You can use it to rapidly sketch in
-molecules and examine them in three dimensions. You can build molecules by
-atom, ring, group, amino acid and nucleoside. You can also read geometry from
-a file. Most major molecular file formats are supported.
-
-Gabedit includes a Gamess-US, Gaussian, Molcas, Molpro and MPQC Calculation
-Setup window which allows you to set up Gamess-US, Gaussian, Molcas, Molpro
-and MPQC jobs in a simple and straightforward manner.
-
-Gabedit can graphically display a variety of Gamess-US, Gaussian, Molcas,
-Molpro, MPQC and (partially) ADF calculation results, including the following:
-- Molecular orbitals
-- Surfaces from the electron density, electrostatic potential, NMR shielding
-  density, and other properties.
-- Surfaces may be displayed in solid, translucent and wire mesh modes. They
-  are can be colorcoded by a separate property.
-- Contours (colorcoded), Planes colorcoded, Dipole. XYZ axes and the principal
-  axes of the molecule.
-- Animation of the normal modes corresponding to vibrational frequencies.
-- Animation of the rotation of geometry, surfaces, contours, planes colorcoded,
-  xyz and the principal axes of the molecule.
-- Animation of contours, Animation of planes colorcoded.
-
-Gabedit can display IR and Raman computed spectra.
-
-Gabedit can generate a povray file for geometry (including hydrogen's bond),
-surfaces (including colorcoded surfaces), contours, planes colorcoded.
-
-Gabedit can save picture in BMP, JPEG, PNG, PPM and PS format.
-
-Gabedit can generate automatically a series of pictures for animation
-(vibration, geometry convergence, rotation, contours, planes colorcoded).
+Gabedit is a Graphical User Interface to Gamess-US, Gaussian, Molcas,
+Molpro and MPQC computational chemistry packages. Gabedit includes
+graphical facilities for generating keywords and options, molecule
+specifications and their input sections for even the most advanced
+calculation types. Gabedit includes an advanced Molecule Builder. You
+can use it to rapidly sketch in molecules and examine them in three
+dimensions. You can build molecules by atom, ring, group, amino acid and
+nucleoside. You can also read geometry from a file. Most major molecular
+file formats are supported.
 
 %prep
 %setup -q -n GabeditSrc%{tarver}
 %patch2 -p1
-# remove bundled pre-built binaries
-%{__rm} utils/MolecularMechanics/{createTPLfile,createmmfile}
 # remove Win32-specific files
 %{__rm} -r utils/InnosSetupScriptWin32
-%{__rm} utils/Others/Gabedit206.iss
 echo "external_gtkglarea=1" >> CONFIG
 echo "external_gl2ps=1" >> CONFIG
 
@@ -80,7 +49,7 @@ install -pm755 %{name} %{buildroot}/%{_b
 install -d %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor=fedora \
 	--dir=%{buildroot}%{_datadir}/applications \
-	%{SOURCE1}
+	utils/Others/gabedit.desktop
 
 for size in 16 32 48 ; do
 	install -d %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps
@@ -110,6 +79,11 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* Fri Aug 21 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.4-1
+- updated to latest version (2.2.4)
+- shortened the description field
+- desktop file has been upstreamed
+
 * Thu Feb 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.1.17-1
 - updated to latest development version (2.1.17)
 - dropped obsolete patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Feb 2009 01:26:26 -0000	1.5
+++ sources	21 Aug 2009 20:43:47 -0000	1.6
@@ -1 +1 @@
-cd013b995134720cc9e1821d71b7ba5f  GabeditSrc2117.tar.gz
+1015a284693bf9391dfcd5a52891d9db  GabeditSrc224.tar.gz


--- gabedit.desktop DELETED ---



From pkgdb at fedoraproject.org  Fri Aug 21 20:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:48:07 +0000
Subject: [pkgdb] taglib ownership updated
Message-ID: <20090821204807.34BEA10F881@bastion2.fedora.phx.redhat.com>

Package taglib in Fedora devel is now owned by mschwendt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From cweyl at fedoraproject.org  Fri Aug 21 20:48:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 21 Aug 2009 20:48:08 +0000 (UTC)
Subject: rpms/redhat-rpm-config/F-11
	redhat-rpm-config-9.0.3-filtering-macros.patch, NONE,
	1.1 redhat-rpm-config.spec, 1.64, 1.65
Message-ID: <20090821204808.B3D0111C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/redhat-rpm-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24426

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-9.0.3-filtering-macros.patch 
Log Message:
* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-11
- add filtering system macros, w/o backporting other updates (#516240)


redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

--- NEW FILE redhat-rpm-config-9.0.3-filtering-macros.patch ---
--- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
+++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
@@ -224,3 +224,37 @@
 	fi \
 	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
 )}
+
+#==============================================================================
+# ---- Generic auto req/prov filtering macros 
+#
+# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
+
+# prevent anything matching from being scanned for provides
+%filter_provides_in(P) %{expand: \
+%global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# prevent anything matching from being scanned for requires
+%filter_requires_in(P) %{expand: \
+%global __filter_req_cmd %{?__filter_req_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# filter anything matching out of the provides stream
+%filter_from_provides() %{expand: \
+%global __filter_from_prov %{?__filter_from_prov} | %{__sed} -e '%*' \
+}
+
+# filter anything matching out of the requires stream
+%filter_from_requires() %{expand: \
+%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
+}
+
+# actually set up the filtering bits 
+%filter_setup %{expand: \
+%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 "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
+%global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
+}
+


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-rpm-config/F-11/redhat-rpm-config.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- redhat-rpm-config.spec	21 Jul 2009 17:35:50 -0000	1.64
+++ redhat-rpm-config.spec	21 Aug 2009 20:48:08 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -11,6 +11,8 @@ Patch1: limit-smp-16-threads.patch
 Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
 Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
 Patch4: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
+Patch5: redhat-rpm-config-9.0.3-filtering-macros.patch 
+BuildArch: noarch
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -25,6 +27,7 @@ Red Hat specific rpm configuration files
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -37,6 +40,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> 9.0.3-11
+- add filtering system macros, w/o backporting other updates (#516240)
+
 * Tue Jul 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-10
 - always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
 



From tgl at fedoraproject.org  Fri Aug 21 20:49:45 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 21 Aug 2009 20:49:45 +0000 (UTC)
Subject: rpms/unixODBC/F-11 odbcint64-config.patch, NONE, 1.1 odbcinst.ini,
	1.4, 1.5 unixODBC.spec, 1.49, 1.50 import.log, 1.1, NONE
Message-ID: <20090821204945.8990711C00D7@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/unixODBC/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25056

Modified Files:
	odbcinst.ini unixODBC.spec 
Added Files:
	odbcint64-config.patch 
Removed Files:
	import.log 
Log Message:
Switch to building against qt4; fix misdeclaration of SQLBIGINT and SQLUBIGINT.

odbcint64-config.patch:
 odbc-config.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE odbcint64-config.patch ---
Fix output of odbc_config --header, per bug #518623.
This error results in SQLBIGINT and SQLUBIGINT being misdefined as
int, where they need to be [unsigned] long or long long.


diff -Naur unixODBC-2.2.14.orig/exe/odbc-config.c unixODBC-2.2.14/exe/odbc-config.c
--- unixODBC-2.2.14.orig/exe/odbc-config.c	2008-05-20 08:58:17.000000000 -0400
+++ unixODBC-2.2.14/exe/odbc-config.c	2009-08-21 14:15:35.000000000 -0400
@@ -66,12 +66,15 @@
     printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
 #endif
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 #ifdef ODBCINT64
-    printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
+    printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", xstr(ODBCINT64) );
 #endif
 
 #ifdef UODBCINT64
-    printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
+    printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", xstr(UODBCINT64) );
 #endif
 
 #ifdef DISABLE_INI_CACHING


Index: odbcinst.ini
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/F-11/odbcinst.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- odbcinst.ini	20 Feb 2009 17:22:19 -0000	1.4
+++ odbcinst.ini	21 Aug 2009 20:49:45 -0000	1.5
@@ -1,6 +1,4 @@
 # Example driver definitions
-# Note: on a 64-bit machine, change /usr/lib to /usr/lib64
-#
 
 # Driver from the postgresql-odbc package
 # Setup from the unixODBC package
@@ -8,6 +6,8 @@
 Description	= ODBC for PostgreSQL
 Driver		= /usr/lib/psqlodbc.so
 Setup		= /usr/lib/libodbcpsqlS.so
+Driver64	= /usr/lib64/psqlodbc.so
+Setup64		= /usr/lib64/libodbcpsqlS.so
 FileUsage	= 1
 
 
@@ -17,4 +17,6 @@ FileUsage	= 1
 Description	= ODBC for MySQL
 Driver		= /usr/lib/libmyodbc5.so
 Setup		= /usr/lib/libodbcmyS.so
+Driver64	= /usr/lib64/libmyodbc5.so
+Setup64		= /usr/lib64/libodbcmyS.so
 FileUsage	= 1


Index: unixODBC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/F-11/unixODBC.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- unixODBC.spec	9 Jun 2009 11:25:26 -0000	1.49
+++ unixODBC.spec	21 Aug 2009 20:49:45 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.14
-Release: 4%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -10,8 +10,8 @@ License: GPLv2+ and LGPLv2+
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
 Source1: odbcinst.ini
 Source2: ODBCConfig.desktop
-Source3: DataManager.desktop
 Source4: conffile.h
+
 Patch1: depcomp.patch
 Patch2: multilib-config.patch
 Patch3: warning-cleanup.patch
@@ -19,10 +19,11 @@ Patch6: export-symbols.patch
 Patch7: libtool-config.patch
 Patch8: so-version-bump.patch
 Patch9: keep-typedefs.patch
+Patch10: odbcint64-config.patch
 
 Conflicts: iodbc
 BuildRequires: libX11-devel libXt-devel libXext-devel
-BuildRequires: qt3-devel readline-devel
+BuildRequires: qt4-devel readline-devel
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -48,8 +49,8 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description kde
-This package contains components for the ODBCConfig and DataManager
-(KDE) components of unixODBC.
+This package contains components for the ODBCConfig
+(KDE) component of unixODBC.
 
 %prep
 %setup -q
@@ -60,6 +61,8 @@ This package contains components for the
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+
 chmod 0644 Drivers/MiniSQL/*.c
 chmod 0644 Drivers/nn/*.c
 chmod 0644 Drivers/template/*.c
@@ -75,11 +78,9 @@ libtoolize --install || libtoolize
 
 %build
 # pick up qt path
-export QTDIR=
-. /etc/profile.d/qt.sh
+export PATH="%{_qt4_bindir}:$PATH"
 # clean up old moc files
-(cd ODBCConfig && rm -f mclass*.cpp)
-(cd DataManager && rm -f mclass*.cpp)
+(cd odbcinstQ4 && rm -f mC*.cpp)
 
 aclocal
 automake --add-missing
@@ -90,13 +91,12 @@ CFLAGS="%{optflags} -fno-strict-aliasing
 CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS
 
-%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib
+%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib --with-qt-programs="%{_qt4_bindir}" --with-qt-libraries="%{_qt4_libdir}"
 make all
 
 %install
 # pick up qt path
-export QTDIR=
-. /etc/profile.d/qt.sh
+export PATH="%{_qt4_bindir}:$PATH"
 
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -104,14 +104,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixm
 
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp DataManager/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/odbc.xpm
-cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/odbc.xpm
 
 # installing *.desktop files
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
 
 # multilib header hacks
 # we only apply this to known Red Hat multilib arches, per bug #181335
@@ -177,13 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %files kde
 %defattr(-,root,root)
 %{_bindir}/ODBCConfig
-%{_bindir}/DataManager
-%{_bindir}/DataManagerII
-%{_bindir}/odbctest
 %{_datadir}/applications/ODBCConfig.desktop
-%{_datadir}/applications/DataManager.desktop
-%{_datadir}/pixmaps/LinuxODBC.xpm
-%{_datadir}/pixmaps/odbc.xpm
 %{_libdir}/libodbcinstQ*so
 %{_libdir}/libodbcinstQ*so.*
 
@@ -194,6 +183,15 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* 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.
+Resolves: #514064
+- Use Driver64/Setup64 to eliminate need for hand-adjustment of odbcinst.ini
+Resolves: #514688
+- Fix misdeclaration of SQLBIGINT and SQLUBIGINT in generated header files
+Resolves: #518623
+
 * Tue Jun  9 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.2.14-4
 - Properly install *.desktop files
 - No need to ship INSTALL in docs


--- import.log DELETED ---



From timfenn at fedoraproject.org  Fri Aug 21 20:50:21 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 20:50:21 +0000 (UTC)
Subject: rpms/apbs/devel LGPL_V2, NONE, 1.1 apbs-configure.ac.patch, NONE,
	1.1 apbs-makefile.am.patch, NONE, 1.1 apbs.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821205021.A893711C0417@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/apbs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25009/devel

Modified Files:
	.cvsignore sources 
Added Files:
	LGPL_V2 apbs-configure.ac.patch apbs-makefile.am.patch 
	apbs.spec import.log 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu>
- initial CVS commit




--- NEW FILE LGPL_V2 ---
		  GNU LIBRARY GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1991 Free Software Foundation, Inc.
                    51 Franklin Street, Fifth Floor
                    Boston, MA 02110-1301, USA.
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the library GPL.  It is
 numbered 2 because it goes with version 2 of the ordinary GPL.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it.  You can use it for
your libraries, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if
you distribute copies of the library, or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  Our method of protecting your rights has two steps: (1) copyright
the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library.

  Also, for each distributor's protection, we want to make certain
that everyone understands that there is no warranty for this free
library.  If the library is modified by someone else and passed on, we
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.


  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
transforming the program into proprietary software.  To prevent this,
we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.

  Most GNU software, including some libraries, is covered by the ordinary
GNU General Public License, which was designed for utility programs.  This
license, the GNU Library General Public License, applies to certain
designated libraries.  This license is quite different from the ordinary
one; be sure to read it in full, and don't assume that anything in it is
the same as in the ordinary license.

  The reason we have a separate public license for some libraries is that
they blur the distinction we usually make between modifying or adding to a
program and simply using it.  Linking a program with a library, without
changing the library, is in some sense simply using the library, and is
analogous to running a utility program or application program.  However, in
a textual and legal sense, the linked executable is a combined work, a
derivative of the original library, and the ordinary General Public License
treats it as such.

  Because of this blurred distinction, using the ordinary General
Public License for libraries did not effectively promote software
sharing, because most developers did not use the libraries.  We
concluded that weaker conditions might promote sharing better.

  However, unrestricted linking of non-free programs would deprive the
users of those programs of all benefit from the free status of the
libraries themselves.  This Library General Public License is intended to
permit developers of non-free programs to use free libraries, while
preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them.  (We have not seen how to achieve
this as regards changes in header files, but we have achieved it as regards
changes in the actual functions of the Library.)  The hope is that this
will lead to faster development of free libraries.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, while the latter only
works together with the library.

  Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.


		  GNU LIBRARY GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License").  Each licensee is
addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.


  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.


  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.


  6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    c) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    d) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the source code distributed need not include anything that is normally
distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.


  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.


  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.


  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2 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

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!

apbs-configure.ac.patch:
 configure.ac |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE apbs-configure.ac.patch ---
--- configure.ac_orig	2009-07-10 11:37:12.000000000 -0700
+++ configure.ac	2009-07-10 16:02:33.000000000 -0700
@@ -390,7 +390,7 @@
 
 if test -n "${USE_FETK_LIBRARY}"; then
 	maloc_lib_path="${fetk_library_path}"
-	AC_CHECK_FILE(${maloc_lib_path}/libmaloc.a,[maloc_lib="yes"],[maloc_lib=""])
+	AC_CHECK_FILE(${maloc_lib_path}/libmaloc.so,[maloc_lib="yes"],[maloc_lib=""])
 	if test -z "${maloc_lib}"; then
 		AC_MSG_ERROR([Error... Couldn't find FETK library files in the location you specified])
 	fi
@@ -806,7 +806,7 @@
 fi
 LDFLAGS=${LDFLAGS_SAVE};
 CPPFLAGS=${CPPFLAGS_SAVE};
-AC_SUBST(rl_lib)
+# AC_SUBST(rl_lib)
 
 dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK
 dnl # -----------------------
@@ -1028,6 +1028,7 @@
 	blas_lib=${contrib_path}/blas/.libs/libapbsblas.a
 fi
 AC_SUBST(apbs_do_blas)
+AC_SUBST(blas_lib)
 
 dnl # -----------------------
 dnl # If using Portland compilers, do not compile
@@ -1206,7 +1207,9 @@
 else
   apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \
 			${top_apbsdir}/src/aaa_lib/libapbs.la \
-			${maloc_lib} ${lib_list}"
+			${top_apbsdir}/contrib/pmgZ/libapbspmgz.la \
+			${top_apbsdir}/contrib/aqua/libapbsaqua.la \
+			${maloc_lib} ${blas_lib} ${lib_list}"
 fi
 AC_SUBST(apbs_build_libraries)
 

apbs-makefile.am.patch:
 bin/Makefile.am                |   20 ++++++++++----------
 contrib/opal/Makefile.am       |    2 +-
 src/aaa_lib/Makefile.am        |    4 ++--
 tools/arpack/Makefile.am       |    2 +-
 tools/python/Makefile.am       |    3 ++-
 tools/python/vgrid/Makefile.am |    3 ++-
 6 files changed, 18 insertions(+), 16 deletions(-)

--- NEW FILE apbs-makefile.am.patch ---
--- ./tools/python/Makefile.am_orig	2009-07-23 12:08:49.000000000 -0700
+++ ./tools/python/Makefile.am	2009-07-23 13:20:16.000000000 -0700
@@ -16,4 +16,5 @@
 noinst_PROGRAMS       = _apbslib.so
 _apbslib_so_SOURCES   = apbslib.c
 _apbslib_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-_apbslib_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS)
+_apbslib_so_LDFLAGS   = @maloc_lib@ @blas_lib@ $(PY_LDFLAGS)
+_apbslib_so_LDADD    = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so
--- ./tools/python/vgrid/Makefile.am_orig	2009-03-05 12:30:03.000000000 -0800
+++ ./tools/python/vgrid/Makefile.am	2009-07-23 13:20:08.000000000 -0700
@@ -16,5 +16,6 @@
    noinst_PROGRAMS     = _vgrid.so
    _vgrid_so_SOURCES   = vgridlib.c
    _vgrid_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-   _vgrid_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@
+   _vgrid_so_LDFLAGS   = $(PY_LDFLAGS) @maloc_lib@ @lib_list@
+   _vgrid_so_LDADD    = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so
 endif
--- ./tools/arpack/Makefile.am_orig	2009-07-23 13:20:45.000000000 -0700
+++ ./tools/arpack/Makefile.am	2009-07-23 13:20:47.000000000 -0700
@@ -12,7 +12,7 @@
 
 noinst_PROGRAMS  = driver
 driver_SOURCES   = driver.c readhb.f ardriv.f
-driver_LDADD     = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@
+driver_LDADD     = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -latlas
 INCLUDES         = @inc_list@
 AM_CFLAGS           = @CFLAGS@
 AM_LDFLAGS           = @LDFLAGS@ @FFLAGS@
--- ./bin/Makefile.am_orig	2009-07-22 22:08:44.000000000 -0700
+++ ./bin/Makefile.am	2009-07-22 22:11:07.000000000 -0700
@@ -12,24 +12,24 @@
 
 build_libraries = @apbs_build_libraries@
 
-bindir = ${prefix}/bin
+# bindir = ${prefix}/bin
 bin_PROGRAMS     = apbs
 apbs_SOURCES     = main.c 
-apbs_LDADD       = ${build_libraries}
+apbs_LDADD       = ${build_libraries} ./libapbsmainroutines.la
 
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
 lib_LTLIBRARIES = libapbsmainroutines.la
 libapbsmainroutines_la_SOURCES = routines.c
-libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION}
+libapbsmainroutines_la_LDFLAGS = @maloc_lib@ ../src/aaa_lib/libapbs.la -version-info ${APBS_VERSION}
 
 INCLUDES = @inc_list@
 AM_CFLAGS= @wall_pedantic@
 AM_LDFLAGS       = @LDFLAGS@ @FFLAGS@
  
-includedir = ${prefix}/include/apbs
-include_HEADERS = routines.h
+# includedir = ${prefix}/include/apbs
+# include_HEADERS = routines.h
 
-install-data-local:
-	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
-	-chmod 755 ${prefix}/bin/ApbsClient.py
-	-rm -f ${prefix}/bin/wsdl2py 
\ No newline at end of file
+#install-data-local:
+#	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
+#	-chmod 755 ${prefix}/bin/ApbsClient.py
+#	-rm -f ${prefix}/bin/wsdl2py 
--- ./src/aaa_lib/Makefile.am_orig	2009-07-22 22:08:57.000000000 -0700
+++ ./src/aaa_lib/Makefile.am	2009-07-22 22:12:12.000000000 -0700
@@ -18,12 +18,12 @@
 AQUA_LIBS = ${top_builddir}/contrib/aqua/libapbsaqua.la
 BLAS_LIBS = @blas_lib@
 
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
 lib_LTLIBRARIES = libapbs.la
 
 libapbs_la_SOURCES = apbs_link.c
 libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS}
-libapbs_la_LDFLAGS = -version-info ${APBS_VERSION}
+libapbs_la_LDFLAGS = @maloc_lib@ -version-info ${APBS_VERSION}
 
 INCLUDES         = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@
 AM_CFLAGS        = @wall_pedantic@
--- ./contrib/opal/Makefile.am_orig	2009-07-23 17:40:40.000000000 -0700
+++ ./contrib/opal/Makefile.am	2009-07-23 17:40:08.000000000 -0700
@@ -9,7 +9,7 @@
 AUTOMAKE_OPTIONS = no-dependencies
 SUFFIXES = .H .h .C .c .f .o
 
-always_built_SUBDIRS = ZSI
+# always_built_SUBDIRS = ZSI
 
 SUBDIRS = $(always_built_SUBDIRS) .
 


--- NEW FILE apbs.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: apbs
Summary: Adaptive Poisson Boltzmann Solver
Version: 1.1.0
Release: 7%{?dist}
# License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD.
License: LGPLv2+ and BSD
Group: Applications/Engineering
URL: http://apbs.sourceforge.net/
Source0: http://downloads.sourceforge.net/apbs/%{name}-%{version}-source.tar.gz
Source1: LGPL_V2
# adds blas_lib to AC_SUBST so Makefiles are complete
Patch0: apbs-configure.ac.patch
# removes hardcoded prefix setting so DESTDIR works
Patch1: apbs-makefile.am.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: arpack-devel
BuildRequires: atlas-devel
BuildRequires: blas-devel
BuildRequires: maloc-devel
BuildRequires: python-devel
Requires: python-ZSI

%description
APBS is a software package for the numerical solution of the
Poisson-Boltzmann equation (PBE), one of the most popular continuum
models for describing electrostatic interactions between molecular
solutes in salty, aqueous media.  APBS was designed to efficiently
evaluate electrostatic properties for such simulations for a wide
range of length scales to enable the investigation of molecules with
tens to millions of atoms. It is also widely used in molecular
visualization (in such applications as PyMOL).

%package tools
Summary: utility programs that utilize the APBS package
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description tools

The apbs-tools package contains several utility programs for
conversion, analysis and preparation of files that use the adaptive
poisson boltzmann solver library.

%package devel
Summary: Libraries and header files for the APBS package
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel

The apbs-devel package contains the header files and libraries
necessary for developing programs using the adaptive poisson boltzmann
(APBS) solver library.

%package doc
Summary: Documentation for the APBS package
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description doc

The apbs-doc package contains API reference inforemation for
development using the adaptive poisson boltzmann (APBS) solver
library.

%prep
%setup -q -n %{name}-%{version}-source
%patch0 -p0
%patch1 -p0
libtoolize --automake
aclocal
autoheader
automake --gnu
autoconf

install -p -m 644 %{SOURCE1} .

# ensure maloc isn't built
rm -rf contrib/maloc

rm doc/programmer/cooc-filter.sh
rm doc/programmer/apbs.css
rm doc/programmer/html/apbs.css
rm doc/programmer/html/vcap_8h__incl.map
rm doc/programmer/html/vpee_8h__incl.map
rm doc/programmer/html/dummy_8c__incl.map

%build
%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared --disable-static FFLAGS="-I/usr/include/atlas"
# die, rpath, die.
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

sed -i 's|\"/usr/local/apbs-1.1.0\"|\"%{python_sitelib}/apbs\"|g' bin/ApbsClient.py

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} INSTALL='install -p' CPPROG="cp -p"

install -p -m 755 bin/ApbsClient.py %{buildroot}%{_bindir}/

mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/apbs
cp -p contrib/opal/opal-py-1.9.3/wsdl/*.py ${RPM_BUILD_ROOT}%{python_sitelib}/apbs/

mkdir -p %{buildroot}%{_includedir}/apbs
install -p -m 644 src/aaa_inc/apbs/*.h %{buildroot}%{_includedir}/apbs/

# tools
for bin in tools/manip/{psize.py,coulomb,born} tools/mesh/{mgmesh,dxmath,mergedx2,mergedx,value,uhbd_asc2bin,smooth,dx2mol,dx2uhbd,similarity,multivalue,benchmark,analysis} tools/arpack/driver; do
    install -p -m 755 $bin %{buildroot}%{_bindir}/apbs-`basename $bin`
done

# remove unpackaged files from buildroot
rm -f %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING LGPL_V2 README ChangeLog
%{_bindir}/apbs
%{_bindir}/ApbsClient.py
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif
%{_libdir}/libapbs.so.*
%{_libdir}/libapbsmainroutines.so.*
%{python_sitelib}/apbs/

%files tools
%defattr(-,root,root,-)
%{_bindir}/apbs-psize.py
%{_bindir}/apbs-coulomb
%{_bindir}/apbs-born
%{_bindir}/apbs-mgmesh
%{_bindir}/apbs-dxmath
%{_bindir}/apbs-mergedx2
%{_bindir}/apbs-mergedx
%{_bindir}/apbs-value
%{_bindir}/apbs-uhbd_asc2bin
%{_bindir}/apbs-smooth
%{_bindir}/apbs-dx2mol
%{_bindir}/apbs-dx2uhbd
%{_bindir}/apbs-similarity
%{_bindir}/apbs-multivalue
%{_bindir}/apbs-benchmark
%{_bindir}/apbs-analysis
%{_bindir}/apbs-driver

%files devel
%defattr(-,root,root,-)
%{_libdir}/libapbs.so
%{_libdir}/libapbsmainroutines.so
%{_includedir}/apbs

%files doc
%defattr(-,root,root,-)
%doc doc/programmer/

%changelog
* Mon Jul 27 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-7
- remove python byte compiled files in bindir
- loop to add tools

* Sun Jul 26 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-6
- remove check macro

* Fri Jul 24 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-5
- enable and add arpack, python to buildrequires, fix files section accordingly
- add check macro
- move tools to a subpackage
- move doc into subpackage
- spec cleanup

* Thu Jul 23 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-4
- merge aqua and pmgZ into libapbs

* Fri Jul 10 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-3
- separate aqua and pmgZ into separate libraries/packages
- add maloc BuildRequires

* Mon May 04 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-2
- fix RPM_BUILD_ROOT
- rename patches
- add "-q" to setup
- add README to doc
- edit description
- edit license

* Fri Apr 24 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-1
- initial build


--- NEW FILE import.log ---
apbs-1_1_0-7_fc10:HEAD:apbs-1.1.0-7.fc10.src.rpm:1250887770


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:24:12 -0000	1.1
+++ .cvsignore	21 Aug 2009 20:50:21 -0000	1.2
@@ -0,0 +1 @@
+apbs-1.1.0-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:24:12 -0000	1.1
+++ sources	21 Aug 2009 20:50:21 -0000	1.2
@@ -0,0 +1 @@
+ca31ba09714e4fc9acce91e7961569cd  apbs-1.1.0-source.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 21 20:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:50:57 +0000
Subject: [pkgdb] apachetop ownership updated
Message-ID: <20090821205057.8560210F84D@bastion2.fedora.phx.redhat.com>

Package apachetop in Fedora 11 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apachetop



From pkgdb at fedoraproject.org  Fri Aug 21 20:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:50:58 +0000
Subject: [pkgdb] apachetop ownership updated
Message-ID: <20090821205058.E045310F86F@bastion2.fedora.phx.redhat.com>

Package apachetop in Fedora 10 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apachetop



From timfenn at fedoraproject.org  Fri Aug 21 20:51:31 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 20:51:31 +0000 (UTC)
Subject: rpms/apbs/F-11 LGPL_V2, NONE, 1.1 apbs-configure.ac.patch, NONE,
	1.1 apbs-makefile.am.patch, NONE, 1.1 apbs.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821205131.CD73C11C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/apbs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25592/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	LGPL_V2 apbs-configure.ac.patch apbs-makefile.am.patch 
	apbs.spec import.log 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu>
- initial CVS commit




--- NEW FILE LGPL_V2 ---
		  GNU LIBRARY GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1991 Free Software Foundation, Inc.
                    51 Franklin Street, Fifth Floor
                    Boston, MA 02110-1301, USA.
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the library GPL.  It is
 numbered 2 because it goes with version 2 of the ordinary GPL.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it.  You can use it for
your libraries, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if
you distribute copies of the library, or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  Our method of protecting your rights has two steps: (1) copyright
the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library.

  Also, for each distributor's protection, we want to make certain
that everyone understands that there is no warranty for this free
library.  If the library is modified by someone else and passed on, we
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.


  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
transforming the program into proprietary software.  To prevent this,
we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.

  Most GNU software, including some libraries, is covered by the ordinary
GNU General Public License, which was designed for utility programs.  This
license, the GNU Library General Public License, applies to certain
designated libraries.  This license is quite different from the ordinary
one; be sure to read it in full, and don't assume that anything in it is
the same as in the ordinary license.

  The reason we have a separate public license for some libraries is that
they blur the distinction we usually make between modifying or adding to a
program and simply using it.  Linking a program with a library, without
changing the library, is in some sense simply using the library, and is
analogous to running a utility program or application program.  However, in
a textual and legal sense, the linked executable is a combined work, a
derivative of the original library, and the ordinary General Public License
treats it as such.

  Because of this blurred distinction, using the ordinary General
Public License for libraries did not effectively promote software
sharing, because most developers did not use the libraries.  We
concluded that weaker conditions might promote sharing better.

  However, unrestricted linking of non-free programs would deprive the
users of those programs of all benefit from the free status of the
libraries themselves.  This Library General Public License is intended to
permit developers of non-free programs to use free libraries, while
preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them.  (We have not seen how to achieve
this as regards changes in header files, but we have achieved it as regards
changes in the actual functions of the Library.)  The hope is that this
will lead to faster development of free libraries.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, while the latter only
works together with the library.

  Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.


		  GNU LIBRARY GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License").  Each licensee is
addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.


  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.


  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.


  6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    c) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    d) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the source code distributed need not include anything that is normally
distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.


  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.


  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.


  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2 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

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!

apbs-configure.ac.patch:
 configure.ac |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE apbs-configure.ac.patch ---
--- configure.ac_orig	2009-07-10 11:37:12.000000000 -0700
+++ configure.ac	2009-07-10 16:02:33.000000000 -0700
@@ -390,7 +390,7 @@
 
 if test -n "${USE_FETK_LIBRARY}"; then
 	maloc_lib_path="${fetk_library_path}"
-	AC_CHECK_FILE(${maloc_lib_path}/libmaloc.a,[maloc_lib="yes"],[maloc_lib=""])
+	AC_CHECK_FILE(${maloc_lib_path}/libmaloc.so,[maloc_lib="yes"],[maloc_lib=""])
 	if test -z "${maloc_lib}"; then
 		AC_MSG_ERROR([Error... Couldn't find FETK library files in the location you specified])
 	fi
@@ -806,7 +806,7 @@
 fi
 LDFLAGS=${LDFLAGS_SAVE};
 CPPFLAGS=${CPPFLAGS_SAVE};
-AC_SUBST(rl_lib)
+# AC_SUBST(rl_lib)
 
 dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK
 dnl # -----------------------
@@ -1028,6 +1028,7 @@
 	blas_lib=${contrib_path}/blas/.libs/libapbsblas.a
 fi
 AC_SUBST(apbs_do_blas)
+AC_SUBST(blas_lib)
 
 dnl # -----------------------
 dnl # If using Portland compilers, do not compile
@@ -1206,7 +1207,9 @@
 else
   apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \
 			${top_apbsdir}/src/aaa_lib/libapbs.la \
-			${maloc_lib} ${lib_list}"
+			${top_apbsdir}/contrib/pmgZ/libapbspmgz.la \
+			${top_apbsdir}/contrib/aqua/libapbsaqua.la \
+			${maloc_lib} ${blas_lib} ${lib_list}"
 fi
 AC_SUBST(apbs_build_libraries)
 

apbs-makefile.am.patch:
 bin/Makefile.am                |   20 ++++++++++----------
 contrib/opal/Makefile.am       |    2 +-
 src/aaa_lib/Makefile.am        |    4 ++--
 tools/arpack/Makefile.am       |    2 +-
 tools/python/Makefile.am       |    3 ++-
 tools/python/vgrid/Makefile.am |    3 ++-
 6 files changed, 18 insertions(+), 16 deletions(-)

--- NEW FILE apbs-makefile.am.patch ---
--- ./tools/python/Makefile.am_orig	2009-07-23 12:08:49.000000000 -0700
+++ ./tools/python/Makefile.am	2009-07-23 13:20:16.000000000 -0700
@@ -16,4 +16,5 @@
 noinst_PROGRAMS       = _apbslib.so
 _apbslib_so_SOURCES   = apbslib.c
 _apbslib_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-_apbslib_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS)
+_apbslib_so_LDFLAGS   = @maloc_lib@ @blas_lib@ $(PY_LDFLAGS)
+_apbslib_so_LDADD    = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so
--- ./tools/python/vgrid/Makefile.am_orig	2009-03-05 12:30:03.000000000 -0800
+++ ./tools/python/vgrid/Makefile.am	2009-07-23 13:20:08.000000000 -0700
@@ -16,5 +16,6 @@
    noinst_PROGRAMS     = _vgrid.so
    _vgrid_so_SOURCES   = vgridlib.c
    _vgrid_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-   _vgrid_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@
+   _vgrid_so_LDFLAGS   = $(PY_LDFLAGS) @maloc_lib@ @lib_list@
+   _vgrid_so_LDADD    = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so
 endif
--- ./tools/arpack/Makefile.am_orig	2009-07-23 13:20:45.000000000 -0700
+++ ./tools/arpack/Makefile.am	2009-07-23 13:20:47.000000000 -0700
@@ -12,7 +12,7 @@
 
 noinst_PROGRAMS  = driver
 driver_SOURCES   = driver.c readhb.f ardriv.f
-driver_LDADD     = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@
+driver_LDADD     = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -latlas
 INCLUDES         = @inc_list@
 AM_CFLAGS           = @CFLAGS@
 AM_LDFLAGS           = @LDFLAGS@ @FFLAGS@
--- ./bin/Makefile.am_orig	2009-07-22 22:08:44.000000000 -0700
+++ ./bin/Makefile.am	2009-07-22 22:11:07.000000000 -0700
@@ -12,24 +12,24 @@
 
 build_libraries = @apbs_build_libraries@
 
-bindir = ${prefix}/bin
+# bindir = ${prefix}/bin
 bin_PROGRAMS     = apbs
 apbs_SOURCES     = main.c 
-apbs_LDADD       = ${build_libraries}
+apbs_LDADD       = ${build_libraries} ./libapbsmainroutines.la
 
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
 lib_LTLIBRARIES = libapbsmainroutines.la
 libapbsmainroutines_la_SOURCES = routines.c
-libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION}
+libapbsmainroutines_la_LDFLAGS = @maloc_lib@ ../src/aaa_lib/libapbs.la -version-info ${APBS_VERSION}
 
 INCLUDES = @inc_list@
 AM_CFLAGS= @wall_pedantic@
 AM_LDFLAGS       = @LDFLAGS@ @FFLAGS@
  
-includedir = ${prefix}/include/apbs
-include_HEADERS = routines.h
+# includedir = ${prefix}/include/apbs
+# include_HEADERS = routines.h
 
-install-data-local:
-	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
-	-chmod 755 ${prefix}/bin/ApbsClient.py
-	-rm -f ${prefix}/bin/wsdl2py 
\ No newline at end of file
+#install-data-local:
+#	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
+#	-chmod 755 ${prefix}/bin/ApbsClient.py
+#	-rm -f ${prefix}/bin/wsdl2py 
--- ./src/aaa_lib/Makefile.am_orig	2009-07-22 22:08:57.000000000 -0700
+++ ./src/aaa_lib/Makefile.am	2009-07-22 22:12:12.000000000 -0700
@@ -18,12 +18,12 @@
 AQUA_LIBS = ${top_builddir}/contrib/aqua/libapbsaqua.la
 BLAS_LIBS = @blas_lib@
 
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
 lib_LTLIBRARIES = libapbs.la
 
 libapbs_la_SOURCES = apbs_link.c
 libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS}
-libapbs_la_LDFLAGS = -version-info ${APBS_VERSION}
+libapbs_la_LDFLAGS = @maloc_lib@ -version-info ${APBS_VERSION}
 
 INCLUDES         = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@
 AM_CFLAGS        = @wall_pedantic@
--- ./contrib/opal/Makefile.am_orig	2009-07-23 17:40:40.000000000 -0700
+++ ./contrib/opal/Makefile.am	2009-07-23 17:40:08.000000000 -0700
@@ -9,7 +9,7 @@
 AUTOMAKE_OPTIONS = no-dependencies
 SUFFIXES = .H .h .C .c .f .o
 
-always_built_SUBDIRS = ZSI
+# always_built_SUBDIRS = ZSI
 
 SUBDIRS = $(always_built_SUBDIRS) .
 


--- NEW FILE apbs.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: apbs
Summary: Adaptive Poisson Boltzmann Solver
Version: 1.1.0
Release: 7%{?dist}
# License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD.
License: LGPLv2+ and BSD
Group: Applications/Engineering
URL: http://apbs.sourceforge.net/
Source0: http://downloads.sourceforge.net/apbs/%{name}-%{version}-source.tar.gz
Source1: LGPL_V2
# adds blas_lib to AC_SUBST so Makefiles are complete
Patch0: apbs-configure.ac.patch
# removes hardcoded prefix setting so DESTDIR works
Patch1: apbs-makefile.am.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: arpack-devel
BuildRequires: atlas-devel
BuildRequires: blas-devel
BuildRequires: maloc-devel
BuildRequires: python-devel
Requires: python-ZSI

%description
APBS is a software package for the numerical solution of the
Poisson-Boltzmann equation (PBE), one of the most popular continuum
models for describing electrostatic interactions between molecular
solutes in salty, aqueous media.  APBS was designed to efficiently
evaluate electrostatic properties for such simulations for a wide
range of length scales to enable the investigation of molecules with
tens to millions of atoms. It is also widely used in molecular
visualization (in such applications as PyMOL).

%package tools
Summary: utility programs that utilize the APBS package
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description tools

The apbs-tools package contains several utility programs for
conversion, analysis and preparation of files that use the adaptive
poisson boltzmann solver library.

%package devel
Summary: Libraries and header files for the APBS package
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel

The apbs-devel package contains the header files and libraries
necessary for developing programs using the adaptive poisson boltzmann
(APBS) solver library.

%package doc
Summary: Documentation for the APBS package
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description doc

The apbs-doc package contains API reference inforemation for
development using the adaptive poisson boltzmann (APBS) solver
library.

%prep
%setup -q -n %{name}-%{version}-source
%patch0 -p0
%patch1 -p0
libtoolize --automake
aclocal
autoheader
automake --gnu
autoconf

install -p -m 644 %{SOURCE1} .

# ensure maloc isn't built
rm -rf contrib/maloc

rm doc/programmer/cooc-filter.sh
rm doc/programmer/apbs.css
rm doc/programmer/html/apbs.css
rm doc/programmer/html/vcap_8h__incl.map
rm doc/programmer/html/vpee_8h__incl.map
rm doc/programmer/html/dummy_8c__incl.map

%build
%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared --disable-static FFLAGS="-I/usr/include/atlas"
# die, rpath, die.
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

sed -i 's|\"/usr/local/apbs-1.1.0\"|\"%{python_sitelib}/apbs\"|g' bin/ApbsClient.py

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} INSTALL='install -p' CPPROG="cp -p"

install -p -m 755 bin/ApbsClient.py %{buildroot}%{_bindir}/

mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/apbs
cp -p contrib/opal/opal-py-1.9.3/wsdl/*.py ${RPM_BUILD_ROOT}%{python_sitelib}/apbs/

mkdir -p %{buildroot}%{_includedir}/apbs
install -p -m 644 src/aaa_inc/apbs/*.h %{buildroot}%{_includedir}/apbs/

# tools
for bin in tools/manip/{psize.py,coulomb,born} tools/mesh/{mgmesh,dxmath,mergedx2,mergedx,value,uhbd_asc2bin,smooth,dx2mol,dx2uhbd,similarity,multivalue,benchmark,analysis} tools/arpack/driver; do
    install -p -m 755 $bin %{buildroot}%{_bindir}/apbs-`basename $bin`
done

# remove unpackaged files from buildroot
rm -f %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING LGPL_V2 README ChangeLog
%{_bindir}/apbs
%{_bindir}/ApbsClient.py
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif
%{_libdir}/libapbs.so.*
%{_libdir}/libapbsmainroutines.so.*
%{python_sitelib}/apbs/

%files tools
%defattr(-,root,root,-)
%{_bindir}/apbs-psize.py
%{_bindir}/apbs-coulomb
%{_bindir}/apbs-born
%{_bindir}/apbs-mgmesh
%{_bindir}/apbs-dxmath
%{_bindir}/apbs-mergedx2
%{_bindir}/apbs-mergedx
%{_bindir}/apbs-value
%{_bindir}/apbs-uhbd_asc2bin
%{_bindir}/apbs-smooth
%{_bindir}/apbs-dx2mol
%{_bindir}/apbs-dx2uhbd
%{_bindir}/apbs-similarity
%{_bindir}/apbs-multivalue
%{_bindir}/apbs-benchmark
%{_bindir}/apbs-analysis
%{_bindir}/apbs-driver

%files devel
%defattr(-,root,root,-)
%{_libdir}/libapbs.so
%{_libdir}/libapbsmainroutines.so
%{_includedir}/apbs

%files doc
%defattr(-,root,root,-)
%doc doc/programmer/

%changelog
* Mon Jul 27 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-7
- remove python byte compiled files in bindir
- loop to add tools

* Sun Jul 26 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-6
- remove check macro

* Fri Jul 24 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-5
- enable and add arpack, python to buildrequires, fix files section accordingly
- add check macro
- move tools to a subpackage
- move doc into subpackage
- spec cleanup

* Thu Jul 23 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-4
- merge aqua and pmgZ into libapbs

* Fri Jul 10 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-3
- separate aqua and pmgZ into separate libraries/packages
- add maloc BuildRequires

* Mon May 04 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-2
- fix RPM_BUILD_ROOT
- rename patches
- add "-q" to setup
- add README to doc
- edit description
- edit license

* Fri Apr 24 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-1
- initial build


--- NEW FILE import.log ---
apbs-1_1_0-7_fc10:F-11:apbs-1.1.0-7.fc10.src.rpm:1250887853


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:24:12 -0000	1.1
+++ .cvsignore	21 Aug 2009 20:51:31 -0000	1.2
@@ -0,0 +1 @@
+apbs-1.1.0-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:24:12 -0000	1.1
+++ sources	21 Aug 2009 20:51:31 -0000	1.2
@@ -0,0 +1 @@
+ca31ba09714e4fc9acce91e7961569cd  apbs-1.1.0-source.tar.gz



From timfenn at fedoraproject.org  Fri Aug 21 20:52:12 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 21 Aug 2009 20:52:12 +0000 (UTC)
Subject: rpms/apbs/EL-5 LGPL_V2, NONE, 1.1 apbs-configure.ac.patch, NONE,
	1.1 apbs-makefile.am.patch, NONE, 1.1 apbs.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090821205212.2EA1411C00D7@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/apbs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25993/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	LGPL_V2 apbs-configure.ac.patch apbs-makefile.am.patch 
	apbs.spec import.log 
Log Message:
* Fri Aug 21 2009 Tim Fenn <fenn at stanford.edu>
- initial CVS commit




--- NEW FILE LGPL_V2 ---
		  GNU LIBRARY GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1991 Free Software Foundation, Inc.
                    51 Franklin Street, Fifth Floor
                    Boston, MA 02110-1301, USA.
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the library GPL.  It is
 numbered 2 because it goes with version 2 of the ordinary GPL.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it.  You can use it for
your libraries, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if
you distribute copies of the library, or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  Our method of protecting your rights has two steps: (1) copyright
the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library.

  Also, for each distributor's protection, we want to make certain
that everyone understands that there is no warranty for this free
library.  If the library is modified by someone else and passed on, we
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.


  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
transforming the program into proprietary software.  To prevent this,
we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.

  Most GNU software, including some libraries, is covered by the ordinary
GNU General Public License, which was designed for utility programs.  This
license, the GNU Library General Public License, applies to certain
designated libraries.  This license is quite different from the ordinary
one; be sure to read it in full, and don't assume that anything in it is
the same as in the ordinary license.

  The reason we have a separate public license for some libraries is that
they blur the distinction we usually make between modifying or adding to a
program and simply using it.  Linking a program with a library, without
changing the library, is in some sense simply using the library, and is
analogous to running a utility program or application program.  However, in
a textual and legal sense, the linked executable is a combined work, a
derivative of the original library, and the ordinary General Public License
treats it as such.

  Because of this blurred distinction, using the ordinary General
Public License for libraries did not effectively promote software
sharing, because most developers did not use the libraries.  We
concluded that weaker conditions might promote sharing better.

  However, unrestricted linking of non-free programs would deprive the
users of those programs of all benefit from the free status of the
libraries themselves.  This Library General Public License is intended to
permit developers of non-free programs to use free libraries, while
preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them.  (We have not seen how to achieve
this as regards changes in header files, but we have achieved it as regards
changes in the actual functions of the Library.)  The hope is that this
will lead to faster development of free libraries.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, while the latter only
works together with the library.

  Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.


		  GNU LIBRARY GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License").  Each licensee is
addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.


  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.


  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.


  6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    c) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    d) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the source code distributed need not include anything that is normally
distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.


  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.


  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.


  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2 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

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!

apbs-configure.ac.patch:
 configure.ac |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE apbs-configure.ac.patch ---
--- configure.ac_orig	2009-07-10 11:37:12.000000000 -0700
+++ configure.ac	2009-07-10 16:02:33.000000000 -0700
@@ -390,7 +390,7 @@
 
 if test -n "${USE_FETK_LIBRARY}"; then
 	maloc_lib_path="${fetk_library_path}"
-	AC_CHECK_FILE(${maloc_lib_path}/libmaloc.a,[maloc_lib="yes"],[maloc_lib=""])
+	AC_CHECK_FILE(${maloc_lib_path}/libmaloc.so,[maloc_lib="yes"],[maloc_lib=""])
 	if test -z "${maloc_lib}"; then
 		AC_MSG_ERROR([Error... Couldn't find FETK library files in the location you specified])
 	fi
@@ -806,7 +806,7 @@
 fi
 LDFLAGS=${LDFLAGS_SAVE};
 CPPFLAGS=${CPPFLAGS_SAVE};
-AC_SUBST(rl_lib)
+# AC_SUBST(rl_lib)
 
 dnl # BEGIN FETK LIBRARY/HEADER TEST BLOCK
 dnl # -----------------------
@@ -1028,6 +1028,7 @@
 	blas_lib=${contrib_path}/blas/.libs/libapbsblas.a
 fi
 AC_SUBST(apbs_do_blas)
+AC_SUBST(blas_lib)
 
 dnl # -----------------------
 dnl # If using Portland compilers, do not compile
@@ -1206,7 +1207,9 @@
 else
   apbs_build_libraries="${top_apbsdir}/bin/libapbsmainroutines.la \
 			${top_apbsdir}/src/aaa_lib/libapbs.la \
-			${maloc_lib} ${lib_list}"
+			${top_apbsdir}/contrib/pmgZ/libapbspmgz.la \
+			${top_apbsdir}/contrib/aqua/libapbsaqua.la \
+			${maloc_lib} ${blas_lib} ${lib_list}"
 fi
 AC_SUBST(apbs_build_libraries)
 

apbs-makefile.am.patch:
 bin/Makefile.am                |   20 ++++++++++----------
 contrib/opal/Makefile.am       |    2 +-
 src/aaa_lib/Makefile.am        |    4 ++--
 tools/arpack/Makefile.am       |    2 +-
 tools/python/Makefile.am       |    3 ++-
 tools/python/vgrid/Makefile.am |    3 ++-
 6 files changed, 18 insertions(+), 16 deletions(-)

--- NEW FILE apbs-makefile.am.patch ---
--- ./tools/python/Makefile.am_orig	2009-07-23 12:08:49.000000000 -0700
+++ ./tools/python/Makefile.am	2009-07-23 13:20:16.000000000 -0700
@@ -16,4 +16,5 @@
 noinst_PROGRAMS       = _apbslib.so
 _apbslib_so_SOURCES   = apbslib.c
 _apbslib_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-_apbslib_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS)
+_apbslib_so_LDFLAGS   = @maloc_lib@ @blas_lib@ $(PY_LDFLAGS)
+_apbslib_so_LDADD    = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so
--- ./tools/python/vgrid/Makefile.am_orig	2009-03-05 12:30:03.000000000 -0800
+++ ./tools/python/vgrid/Makefile.am	2009-07-23 13:20:08.000000000 -0700
@@ -16,5 +16,6 @@
    noinst_PROGRAMS     = _vgrid.so
    _vgrid_so_SOURCES   = vgridlib.c
    _vgrid_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-   _vgrid_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@
+   _vgrid_so_LDFLAGS   = $(PY_LDFLAGS) @maloc_lib@ @lib_list@
+   _vgrid_so_LDADD    = ${top_builddir}/bin/.libs/libapbsmainroutines.so ${top_builddir}/src/aaa_lib/.libs/libapbs.so
 endif
--- ./tools/arpack/Makefile.am_orig	2009-07-23 13:20:45.000000000 -0700
+++ ./tools/arpack/Makefile.am	2009-07-23 13:20:47.000000000 -0700
@@ -12,7 +12,7 @@
 
 noinst_PROGRAMS  = driver
 driver_SOURCES   = driver.c readhb.f ardriv.f
-driver_LDADD     = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@
+driver_LDADD     = ../../src/aaa_lib/libapbs.la @arpack_lib@ @apbs_build_libraries@ -latlas
 INCLUDES         = @inc_list@
 AM_CFLAGS           = @CFLAGS@
 AM_LDFLAGS           = @LDFLAGS@ @FFLAGS@
--- ./bin/Makefile.am_orig	2009-07-22 22:08:44.000000000 -0700
+++ ./bin/Makefile.am	2009-07-22 22:11:07.000000000 -0700
@@ -12,24 +12,24 @@
 
 build_libraries = @apbs_build_libraries@
 
-bindir = ${prefix}/bin
+# bindir = ${prefix}/bin
 bin_PROGRAMS     = apbs
 apbs_SOURCES     = main.c 
-apbs_LDADD       = ${build_libraries}
+apbs_LDADD       = ${build_libraries} ./libapbsmainroutines.la
 
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
 lib_LTLIBRARIES = libapbsmainroutines.la
 libapbsmainroutines_la_SOURCES = routines.c
-libapbsmainroutines_la_LDFLAGS = -version-info ${APBS_VERSION}
+libapbsmainroutines_la_LDFLAGS = @maloc_lib@ ../src/aaa_lib/libapbs.la -version-info ${APBS_VERSION}
 
 INCLUDES = @inc_list@
 AM_CFLAGS= @wall_pedantic@
 AM_LDFLAGS       = @LDFLAGS@ @FFLAGS@
  
-includedir = ${prefix}/include/apbs
-include_HEADERS = routines.h
+# includedir = ${prefix}/include/apbs
+# include_HEADERS = routines.h
 
-install-data-local:
-	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
-	-chmod 755 ${prefix}/bin/ApbsClient.py
-	-rm -f ${prefix}/bin/wsdl2py 
\ No newline at end of file
+#install-data-local:
+#	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
+#	-chmod 755 ${prefix}/bin/ApbsClient.py
+#	-rm -f ${prefix}/bin/wsdl2py 
--- ./src/aaa_lib/Makefile.am_orig	2009-07-22 22:08:57.000000000 -0700
+++ ./src/aaa_lib/Makefile.am	2009-07-22 22:12:12.000000000 -0700
@@ -18,12 +18,12 @@
 AQUA_LIBS = ${top_builddir}/contrib/aqua/libapbsaqua.la
 BLAS_LIBS = @blas_lib@
 
-libdir = ${prefix}/lib
+# libdir = ${prefix}/lib
 lib_LTLIBRARIES = libapbs.la
 
 libapbs_la_SOURCES = apbs_link.c
 libapbs_la_LIBADD  = ${GEN_LIBS} ${FEM_LIBS} ${MG_LIBS} ${PMGZ_LIBS} ${AQUA_LIBS} ${BLAS_LIBS}
-libapbs_la_LDFLAGS = -version-info ${APBS_VERSION}
+libapbs_la_LDFLAGS = @maloc_lib@ -version-info ${APBS_VERSION}
 
 INCLUDES         = -I${top_srcdir}/src/generic -I${top_srcdir}/src/mg -I${top_srcdir}/src/fem @inc_list@
 AM_CFLAGS        = @wall_pedantic@
--- ./contrib/opal/Makefile.am_orig	2009-07-23 17:40:40.000000000 -0700
+++ ./contrib/opal/Makefile.am	2009-07-23 17:40:08.000000000 -0700
@@ -9,7 +9,7 @@
 AUTOMAKE_OPTIONS = no-dependencies
 SUFFIXES = .H .h .C .c .f .o
 
-always_built_SUBDIRS = ZSI
+# always_built_SUBDIRS = ZSI
 
 SUBDIRS = $(always_built_SUBDIRS) .
 


--- NEW FILE apbs.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: apbs
Summary: Adaptive Poisson Boltzmann Solver
Version: 1.1.0
Release: 7%{?dist}
# License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD.
License: LGPLv2+ and BSD
Group: Applications/Engineering
URL: http://apbs.sourceforge.net/
Source0: http://downloads.sourceforge.net/apbs/%{name}-%{version}-source.tar.gz
Source1: LGPL_V2
# adds blas_lib to AC_SUBST so Makefiles are complete
Patch0: apbs-configure.ac.patch
# removes hardcoded prefix setting so DESTDIR works
Patch1: apbs-makefile.am.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: arpack-devel
BuildRequires: atlas-devel
BuildRequires: blas-devel
BuildRequires: maloc-devel
BuildRequires: python-devel
Requires: python-ZSI

%description
APBS is a software package for the numerical solution of the
Poisson-Boltzmann equation (PBE), one of the most popular continuum
models for describing electrostatic interactions between molecular
solutes in salty, aqueous media.  APBS was designed to efficiently
evaluate electrostatic properties for such simulations for a wide
range of length scales to enable the investigation of molecules with
tens to millions of atoms. It is also widely used in molecular
visualization (in such applications as PyMOL).

%package tools
Summary: utility programs that utilize the APBS package
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description tools

The apbs-tools package contains several utility programs for
conversion, analysis and preparation of files that use the adaptive
poisson boltzmann solver library.

%package devel
Summary: Libraries and header files for the APBS package
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel

The apbs-devel package contains the header files and libraries
necessary for developing programs using the adaptive poisson boltzmann
(APBS) solver library.

%package doc
Summary: Documentation for the APBS package
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description doc

The apbs-doc package contains API reference inforemation for
development using the adaptive poisson boltzmann (APBS) solver
library.

%prep
%setup -q -n %{name}-%{version}-source
%patch0 -p0
%patch1 -p0
libtoolize --automake
aclocal
autoheader
automake --gnu
autoconf

install -p -m 644 %{SOURCE1} .

# ensure maloc isn't built
rm -rf contrib/maloc

rm doc/programmer/cooc-filter.sh
rm doc/programmer/apbs.css
rm doc/programmer/html/apbs.css
rm doc/programmer/html/vcap_8h__incl.map
rm doc/programmer/html/vpee_8h__incl.map
rm doc/programmer/html/dummy_8c__incl.map

%build
%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared --disable-static FFLAGS="-I/usr/include/atlas"
# die, rpath, die.
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

sed -i 's|\"/usr/local/apbs-1.1.0\"|\"%{python_sitelib}/apbs\"|g' bin/ApbsClient.py

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot} INSTALL='install -p' CPPROG="cp -p"

install -p -m 755 bin/ApbsClient.py %{buildroot}%{_bindir}/

mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/apbs
cp -p contrib/opal/opal-py-1.9.3/wsdl/*.py ${RPM_BUILD_ROOT}%{python_sitelib}/apbs/

mkdir -p %{buildroot}%{_includedir}/apbs
install -p -m 644 src/aaa_inc/apbs/*.h %{buildroot}%{_includedir}/apbs/

# tools
for bin in tools/manip/{psize.py,coulomb,born} tools/mesh/{mgmesh,dxmath,mergedx2,mergedx,value,uhbd_asc2bin,smooth,dx2mol,dx2uhbd,similarity,multivalue,benchmark,analysis} tools/arpack/driver; do
    install -p -m 755 $bin %{buildroot}%{_bindir}/apbs-`basename $bin`
done

# remove unpackaged files from buildroot
rm -f %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING LGPL_V2 README ChangeLog
%{_bindir}/apbs
%{_bindir}/ApbsClient.py
%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
%exclude %{_bindir}/*.pyc
%exclude %{_bindir}/*.pyo
%endif
%{_libdir}/libapbs.so.*
%{_libdir}/libapbsmainroutines.so.*
%{python_sitelib}/apbs/

%files tools
%defattr(-,root,root,-)
%{_bindir}/apbs-psize.py
%{_bindir}/apbs-coulomb
%{_bindir}/apbs-born
%{_bindir}/apbs-mgmesh
%{_bindir}/apbs-dxmath
%{_bindir}/apbs-mergedx2
%{_bindir}/apbs-mergedx
%{_bindir}/apbs-value
%{_bindir}/apbs-uhbd_asc2bin
%{_bindir}/apbs-smooth
%{_bindir}/apbs-dx2mol
%{_bindir}/apbs-dx2uhbd
%{_bindir}/apbs-similarity
%{_bindir}/apbs-multivalue
%{_bindir}/apbs-benchmark
%{_bindir}/apbs-analysis
%{_bindir}/apbs-driver

%files devel
%defattr(-,root,root,-)
%{_libdir}/libapbs.so
%{_libdir}/libapbsmainroutines.so
%{_includedir}/apbs

%files doc
%defattr(-,root,root,-)
%doc doc/programmer/

%changelog
* Mon Jul 27 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-7
- remove python byte compiled files in bindir
- loop to add tools

* Sun Jul 26 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-6
- remove check macro

* Fri Jul 24 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-5
- enable and add arpack, python to buildrequires, fix files section accordingly
- add check macro
- move tools to a subpackage
- move doc into subpackage
- spec cleanup

* Thu Jul 23 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-4
- merge aqua and pmgZ into libapbs

* Fri Jul 10 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-3
- separate aqua and pmgZ into separate libraries/packages
- add maloc BuildRequires

* Mon May 04 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-2
- fix RPM_BUILD_ROOT
- rename patches
- add "-q" to setup
- add README to doc
- edit description
- edit license

* Fri Apr 24 2009 Tim Fenn <fenn at stanford.edu> - 1.1.0-1
- initial build


--- NEW FILE import.log ---
apbs-1_1_0-7_fc10:EL-5:apbs-1.1.0-7.fc10.src.rpm:1250887920


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:24:12 -0000	1.1
+++ .cvsignore	21 Aug 2009 20:52:11 -0000	1.2
@@ -0,0 +1 @@
+apbs-1.1.0-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apbs/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:24:12 -0000	1.1
+++ sources	21 Aug 2009 20:52:12 -0000	1.2
@@ -0,0 +1 @@
+ca31ba09714e4fc9acce91e7961569cd  apbs-1.1.0-source.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 21 20:53:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:53:02 +0000
Subject: [pkgdb] pdftohtml ownership updated
Message-ID: <20090821205303.515C410F80B@bastion2.fedora.phx.redhat.com>

Package pdftohtml in Fedora devel is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pdftohtml



From pkgdb at fedoraproject.org  Fri Aug 21 20:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:53:40 +0000
Subject: [pkgdb] apachetop ownership updated
Message-ID: <20090821205340.DC2F710F854@bastion2.fedora.phx.redhat.com>

Package apachetop in Fedora 10 is now owned by maxamillion

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apachetop



From pkgdb at fedoraproject.org  Fri Aug 21 20:53:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:53:41 +0000
Subject: [pkgdb] apachetop ownership updated
Message-ID: <20090821205341.CE60B10F86F@bastion2.fedora.phx.redhat.com>

Package apachetop in Fedora 11 is now owned by maxamillion

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/apachetop



From cweyl at fedoraproject.org  Fri Aug 21 20:54:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 21 Aug 2009 20:54:07 +0000 (UTC)
Subject: rpms/redhat-rpm-config/F-10
	redhat-rpm-config-9.0.3-filtering-macros.patch, NONE,
	1.1 redhat-rpm-config.spec, 1.58, 1.59
Message-ID: <20090821205407.8908911C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/redhat-rpm-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26551

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-9.0.3-filtering-macros.patch 
Log Message:
* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 9.0.3-6
- add filtering system macros, w/o backporting other updates (#516240)


redhat-rpm-config-9.0.3-filtering-macros.patch:
 macros |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

--- NEW FILE redhat-rpm-config-9.0.3-filtering-macros.patch ---
--- redhat-rpm-config-9.0.3/macros.orig	2009-08-07 08:48:50.925412526 -0700
+++ redhat-rpm-config-9.0.3/macros	2009-08-07 08:55:16.374536719 -0700
@@ -224,3 +224,37 @@
 	fi \
 	kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
 )}
+
+#==============================================================================
+# ---- Generic auto req/prov filtering macros 
+#
+# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
+
+# prevent anything matching from being scanned for provides
+%filter_provides_in(P) %{expand: \
+%global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# prevent anything matching from being scanned for requires
+%filter_requires_in(P) %{expand: \
+%global __filter_req_cmd %{?__filter_req_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# filter anything matching out of the provides stream
+%filter_from_provides() %{expand: \
+%global __filter_from_prov %{?__filter_from_prov} | %{__sed} -e '%*' \
+}
+
+# filter anything matching out of the requires stream
+%filter_from_requires() %{expand: \
+%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
+}
+
+# actually set up the filtering bits 
+%filter_setup %{expand: \
+%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 "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
+%global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
+}
+


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-rpm-config/F-10/redhat-rpm-config.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- redhat-rpm-config.spec	21 Jul 2009 17:35:50 -0000	1.58
+++ redhat-rpm-config.spec	21 Aug 2009 20:54:07 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -9,6 +9,7 @@ Source: redhat-rpm-config-%{version}.tar
 Patch0: redhat-rpm-config-9.0.3-fix-requires.patch
 Patch1: limit-smp-16-threads.patch 
 Patch2: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
+Patch3: redhat-rpm-config-9.0.3-filtering-macros.patch 
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -33,6 +34,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 9.0.3-6
+- add filtering system macros, w/o backporting other updates (#516240)
+
 * Tue Jul 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.3-5
 - always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
 



From pkgdb at fedoraproject.org  Fri Aug 21 20:55:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 20:55:25 +0000
Subject: [pkgdb] stow ownership updated
Message-ID: <20090821205525.561BA10F80B@bastion2.fedora.phx.redhat.com>

Package stow in Fedora devel is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From sdz at fedoraproject.org  Fri Aug 21 20:55:50 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 21 Aug 2009 20:55:50 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel zyx-liveinstaller.spec,1.1,1.2
Message-ID: <20090821205550.949EF11C00D7@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27174

Modified Files:
	zyx-liveinstaller.spec 
Log Message:
adjust buildroot according to guidelines



Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/zyx-liveinstaller.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zyx-liveinstaller.spec	21 Aug 2009 19:41:04 -0000	1.1
+++ zyx-liveinstaller.spec	21 Aug 2009 20:55:50 -0000	1.2
@@ -2,14 +2,13 @@
 
 Name:           zyx-liveinstaller
 Version:        0.1.10
-Release:        1%{?dist}
+Release:        2%{?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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -34,7 +33,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zyx-liveinstaller.desktop
 
@@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-2
+- adjust buildroot according to guidelines
+
 * Sun Aug 16 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-1
 - update to new upstream release
 - fix some file locations



From sdz at fedoraproject.org  Fri Aug 21 20:56:22 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 21 Aug 2009 20:56:22 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 zyx-liveinstaller.spec,1.1,1.2
Message-ID: <20090821205622.D831D11C00D7@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-serv27394

Modified Files:
	zyx-liveinstaller.spec 
Log Message:
adjust buildroot according to guidelines



Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zyx-liveinstaller.spec	21 Aug 2009 19:43:00 -0000	1.1
+++ zyx-liveinstaller.spec	21 Aug 2009 20:56:22 -0000	1.2
@@ -2,14 +2,13 @@
 
 Name:           zyx-liveinstaller
 Version:        0.1.10
-Release:        1%{?dist}
+Release:        2%{?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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -34,7 +33,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zyx-liveinstaller.desktop
 
@@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-2
+- adjust buildroot according to guidelines
+
 * Sun Aug 16 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.10-1
 - update to new upstream release
 - fix some file locations



From pkgdb at fedoraproject.org  Fri Aug 21 21:07:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:07:03 +0000
Subject: [pkgdb] tiger ownership updated
Message-ID: <20090821210703.E42C110F80B@bastion2.fedora.phx.redhat.com>

Package tiger in Fedora devel is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:08:30 +0000
Subject: [pkgdb] tiger: bonii has requested watchcommits
Message-ID: <20090821210831.0FCF810F882@bastion2.fedora.phx.redhat.com>

bonii has requested the watchcommits acl on tiger (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:08:28 +0000
Subject: [pkgdb] tiger: bonii has requested watchbugzilla
Message-ID: <20090821210828.473B910F855@bastion2.fedora.phx.redhat.com>

bonii has requested the watchbugzilla acl on tiger (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:08:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:08:36 +0000
Subject: [pkgdb] tiger: bonii has requested commit
Message-ID: <20090821210836.E7B3E10F889@bastion2.fedora.phx.redhat.com>

bonii has requested the commit acl on tiger (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:08:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:08:41 +0000
Subject: [pkgdb] tiger: bonii has requested watchbugzilla
Message-ID: <20090821210841.422F210F895@bastion2.fedora.phx.redhat.com>

bonii has requested the watchbugzilla acl on tiger (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:08:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:08:42 +0000
Subject: [pkgdb] tiger: bonii has requested watchcommits
Message-ID: <20090821210842.62DCD10F89A@bastion2.fedora.phx.redhat.com>

bonii has requested the watchcommits acl on tiger (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:08:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:08:44 +0000
Subject: [pkgdb] tiger: bonii has requested commit
Message-ID: <20090821210844.CB9F610F8A2@bastion2.fedora.phx.redhat.com>

bonii has requested the commit acl on tiger (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Fri Aug 21 21:09:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:09:31 +0000
Subject: [pkgdb] stow: bonii has requested watchbugzilla
Message-ID: <20090821210931.7708A10F86F@bastion2.fedora.phx.redhat.com>

bonii has requested the watchbugzilla acl on stow (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Fri Aug 21 21:09:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:09:32 +0000
Subject: [pkgdb] stow: bonii has requested watchcommits
Message-ID: <20090821210932.A310410F888@bastion2.fedora.phx.redhat.com>

bonii has requested the watchcommits acl on stow (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Fri Aug 21 21:09:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:09:33 +0000
Subject: [pkgdb] stow: bonii has requested commit
Message-ID: <20090821210933.E194610F890@bastion2.fedora.phx.redhat.com>

bonii has requested the commit acl on stow (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Fri Aug 21 21:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:09:37 +0000
Subject: [pkgdb] stow: bonii has requested watchbugzilla
Message-ID: <20090821210937.A4D0210F895@bastion2.fedora.phx.redhat.com>

bonii has requested the watchbugzilla acl on stow (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Fri Aug 21 21:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:09:39 +0000
Subject: [pkgdb] stow: bonii has requested watchcommits
Message-ID: <20090821210939.B13EA10F899@bastion2.fedora.phx.redhat.com>

bonii has requested the watchcommits acl on stow (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Fri Aug 21 21:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:09:41 +0000
Subject: [pkgdb] stow: bonii has requested commit
Message-ID: <20090821210941.B87AB10F89C@bastion2.fedora.phx.redhat.com>

bonii has requested the commit acl on stow (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From rathann at fedoraproject.org  Fri Aug 21 21:10:28 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 21 Aug 2009 21:10:28 +0000 (UTC)
Subject: rpms/gabedit/F-10 .cvsignore, 1.4, 1.5 gabedit.spec, 1.3,
	1.4 sources, 
	1.4, 1.5 gabedit-gl2ps.patch, 1.1, NONE gabedit-gtkgl.patch, 1.2,
	NONE gabedit.desktop, 1.1, NONE
Message-ID: <20090821211028.9E59111C0439@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gabedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31044

Modified Files:
	.cvsignore gabedit.spec sources 
Removed Files:
	gabedit-gl2ps.patch gabedit-gtkgl.patch gabedit.desktop 
Log Message:
* Fri Aug 21 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.4-1
- updated to latest version (2.2.4)
- shortened the description field
- desktop file has been upstreamed
- dropped obsolete patches
- use posttrans for faster installation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2008 21:25:13 -0000	1.4
+++ .cvsignore	21 Aug 2009 21:10:27 -0000	1.5
@@ -1 +1 @@
-Gabedit218Src.tar.gz
+GabeditSrc224.tar.gz


Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/F-10/gabedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gabedit.spec	25 Sep 2008 21:25:13 -0000	1.3
+++ gabedit.spec	21 Aug 2009 21:10:28 -0000	1.4
@@ -1,15 +1,11 @@
-%define version	2.1.8
-%define tarver	218
+%define version	2.2.4
+%define tarver	224
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
 Version:	%{version}
 Release:	1%{?dist}
-Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/Gabedit%{tarver}Src.tar.gz
-#Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
-Source1:	%{name}.desktop
-Patch0:		%{name}-gl2ps.patch
-Patch1:		%{name}-gtkgl.patch
+Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
 Patch2:		%{name}-csh.patch
 URL:		http://gabedit.sourceforge.net/home.html
 License:	MIT
@@ -23,64 +19,23 @@ BuildRequires:	libGLU-devel
 BuildRequires:	libjpeg-devel
 
 %description
-Gabedit is a Graphical User Interface to Gamess-US, Gaussian, Molcas, Molpro
-and MPQC computational chemistry packages. Gabedit includes graphical
-facilities for generating keywords and options, molecule specifications and
-their input sections for even the most advanced calculation types. Gabedit
-includes an advanced Molecule Builder. You can use it to rapidly sketch in
-molecules and examine them in three dimensions. You can build molecules by
-atom, ring, group, amino acid and nucleoside. You can also read geometry from
-a file. Most major molecular file formats are supported.
-
-Gabedit includes a Gamess-US, Gaussian, Molcas, Molpro and MPQC Calculation
-Setup window which allows you to set up Gamess-US, Gaussian, Molcas, Molpro
-and MPQC jobs in a simple and straightforward manner.
-
-Gabedit can graphically display a variety of Gamess-US, Gaussian, Molcas,
-Molpro, MPQC and (partially) ADF calculation results, including the following:
-- Molecular orbitals
-- Surfaces from the electron density, electrostatic potential, NMR shielding
-  density, and other properties.
-- Surfaces may be displayed in solid, translucent and wire mesh modes. They
-  are can be colorcoded by a separate property.
-- Contours (colorcoded), Planes colorcoded, Dipole. XYZ axes and the principal
-  axes of the molecule.
-- Animation of the normal modes corresponding to vibrational frequencies.
-- Animation of the rotation of geometry, surfaces, contours, planes colorcoded,
-  xyz and the principal axes of the molecule.
-- Animation of contours, Animation of planes colorcoded.
-
-Gabedit can display IR and Raman computed spectra.
-
-Gabedit can generate a povray file for geometry (including hydrogen's bond),
-surfaces (including colorcoded surfaces), contours, planes colorcoded.
-
-Gabedit can save picture in BMP, JPEG, PNG, PPM and PS format.
-
-Gabedit can generate automatically a series of pictures for animation
-(vibration, geometry convergence, rotation, contours, planes colorcoded).
+Gabedit is a Graphical User Interface to Gamess-US, Gaussian, Molcas,
+Molpro and MPQC computational chemistry packages. Gabedit includes
+graphical facilities for generating keywords and options, molecule
+specifications and their input sections for even the most advanced
+calculation types. Gabedit includes an advanced Molecule Builder. You
+can use it to rapidly sketch in molecules and examine them in three
+dimensions. You can build molecules by atom, ring, group, amino acid and
+nucleoside. You can also read geometry from a file. Most major molecular
+file formats are supported.
 
 %prep
-%setup -q -n Gabedit%{tarver}Src
-%patch0 -p1 -b .gl2ps
-%patch1 -p1 -b .gtkgl
+%setup -q -n GabeditSrc%{tarver}
 %patch2 -p1
-# remove bundled pre-built binaries
-%{__rm} utils/MolecularMechanics/{createTPLfile,createmmfile}
 # remove Win32-specific files
 %{__rm} -r utils/InnosSetupScriptWin32
-%{__rm} utils/Others/Gabedit206.iss
 echo "external_gtkglarea=1" >> CONFIG
 echo "external_gl2ps=1" >> CONFIG
-# replace deprecated stuff dropped in 2.14
-# it's either this or a 0.5MB patch
-sed -i \
- -e 's/GtkSignalFunc/GCallback/g' \
- -e 's/GTK_SIGNAL_FUNC/G_CALLBACK/g' \
- -e 's/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/g' \
- -e 's/GTK_CHECK_TYPE/G_TYPE_CHECK_INSTANCE_TYPE/g' \
- -e 's/GtkDestroyNotify/GDestroyNotify/g' \
- `find -name "*.c" -o -name "*.h"`
 
 %build
 %{__make} %{?_smp_mflags} COMMONCFLAGS="$RPM_OPT_FLAGS"
@@ -94,7 +49,7 @@ install -pm755 %{name} %{buildroot}/%{_b
 install -d %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor=fedora \
 	--dir=%{buildroot}%{_datadir}/applications \
-	%{SOURCE1}
+	utils/Others/gabedit.desktop
 
 for size in 16 32 48 ; do
 	install -d %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps
@@ -105,15 +60,15 @@ done
 rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_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
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %files
@@ -124,6 +79,13 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* Fri Aug 21 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.4-1
+- updated to latest version (2.2.4)
+- shortened the description field
+- desktop file has been upstreamed
+- dropped obsolete patches
+- use posttrans for faster installation
+
 * Thu Sep 25 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.8-1
 - updated to latest stable version (2.1.8)
 - fixed build with gtk2-2.14


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2008 21:25:13 -0000	1.4
+++ sources	21 Aug 2009 21:10:28 -0000	1.5
@@ -1 +1 @@
-d7cd7ff686773d608ce2bdc517eba2d4  Gabedit218Src.tar.gz
+1015a284693bf9391dfcd5a52891d9db  GabeditSrc224.tar.gz


--- gabedit-gl2ps.patch DELETED ---


--- gabedit-gtkgl.patch DELETED ---


--- gabedit.desktop DELETED ---



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:26 +0000
Subject: [pkgdb] agave ownership updated
Message-ID: <20090821211926.C5EF210F80B@bastion2.fedora.phx.redhat.com>

Package agave in Fedora devel is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:34 +0000
Subject: [pkgdb] agave: bonii has requested watchbugzilla
Message-ID: <20090821211935.1865F10F86F@bastion2.fedora.phx.redhat.com>

bonii has requested the watchbugzilla acl on agave (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:36 +0000
Subject: [pkgdb] agave: bonii has requested watchcommits
Message-ID: <20090821211936.51DCA10F886@bastion2.fedora.phx.redhat.com>

bonii has requested the watchcommits acl on agave (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:38 +0000
Subject: [pkgdb] agave: bonii has requested commit
Message-ID: <20090821211938.84E5B10F88B@bastion2.fedora.phx.redhat.com>

bonii has requested the commit acl on agave (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:42 +0000
Subject: [pkgdb] agave: bonii has requested watchbugzilla
Message-ID: <20090821211942.7F6BD10F890@bastion2.fedora.phx.redhat.com>

bonii has requested the watchbugzilla acl on agave (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:43 +0000
Subject: [pkgdb] agave: bonii has requested watchcommits
Message-ID: <20090821211943.2FAE110F898@bastion2.fedora.phx.redhat.com>

bonii has requested the watchcommits acl on agave (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:19:45 +0000
Subject: [pkgdb] agave: bonii has requested commit
Message-ID: <20090821211945.6857510F89B@bastion2.fedora.phx.redhat.com>

bonii has requested the commit acl on agave (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Fri Aug 21 21:35:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:35:32 +0000
Subject: [pkgdb] ulogd ownership updated
Message-ID: <20090821213532.93A3F10F85C@bastion2.fedora.phx.redhat.com>

Package ulogd in Fedora devel is now owned by sgrubb

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ulogd



From pkgdb at fedoraproject.org  Fri Aug 21 21:39:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:39:26 +0000
Subject: [pkgdb] qca2 ownership updated
Message-ID: <20090821213927.11CB310F84D@bastion2.fedora.phx.redhat.com>

Package qca2 in Fedora devel is now owned by mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From rathann at fedoraproject.org  Fri Aug 21 21:40:24 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 21 Aug 2009 21:40:24 +0000 (UTC)
Subject: rpms/ctorrent/devel ctorrent-CVE-2009-1759.patch, NONE,
	1.1 ctorrent.spec, 1.13, 1.14
Message-ID: <20090821214024.3A58911C043A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4660

Modified Files:
	ctorrent.spec 
Added Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-12.dnh3.3.2
- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)


ctorrent-CVE-2009-1759.patch:
 bencode.cpp |   14 ++++++++++----
 bencode.h   |    2 +-
 btfiles.cpp |   12 ++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

--- NEW FILE ctorrent-CVE-2009-1759.patch ---
Index: bencode.h
===================================================================
--- bencode.h	(revision 301)
+++ bencode.h	(revision 302)
@@ -25,7 +25,7 @@
 size_t decode_list(const char *b,size_t len,const char *keylist);
 size_t decode_rev(const char *b,size_t len,const char *keylist);
 size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method);
-size_t decode_list2path(const char *b, size_t n, char *pathname);
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen);
 size_t bencode_buf(const char *str,size_t len,FILE *fp);
 size_t bencode_str(const char *str, FILE *fp);
 size_t bencode_int(const uint64_t integer, FILE *fp);
Index: bencode.cpp
===================================================================
--- bencode.cpp	(revision 301)
+++ bencode.cpp	(revision 302)
@@ -233,22 +233,28 @@
   return bencode_end_dict_list(fp);
 }
 
-size_t decode_list2path(const char *b, size_t n, char *pathname)
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen)
 {
   const char *pb = b;
   const char *s = (char *) 0;
+  const char *endmax = pathname + maxlen - 1;
   size_t r,q;
 
   if( 'l' != *pb ) return 0;
   pb++;
   n--;
   if( !n ) return 0;
-  for(; n;){
+  while( n && pathname < endmax ){
     if(!(r = buf_str(pb, n, &s, &q)) ) return 0;
+    if( q >= maxlen ) return 0;
     memcpy(pathname, s, q);
     pathname += q;
-    pb += r; n -= r; 
-    if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break;
+    maxlen -= q;
+    pb += r;
+    n -= r; 
+    if( 'e' == *pb ) break;
+    if( pathname >= endmax ) return 0;
+    *pathname++ = PATH_SP;
   }
   *pathname = '\0';
   return (pb - b + 1);
Index: btfiles.cpp
===================================================================
--- btfiles.cpp	(revision 301)
+++ btfiles.cpp	(revision 302)
@@ -471,6 +471,8 @@
     BTFILE *pbf_last = (BTFILE*) 0; 
     BTFILE *pbf = (BTFILE*) 0;
     size_t dl;
+    unsigned long nfiles = 0;
+
     if( decode_query(metabuf,metabuf_len,"info|length",
                     (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
       return -1;
@@ -524,12 +526,18 @@
 #ifndef WINDOWS
       if( !pbf ) return -1;
 #endif
+      nfiles++;
       pbf->bf_length = t;
       m_total_files_length += t;
       r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0,
                        QUERY_POS);
-      if( !r ) return -1;
-      if(!decode_list2path(p + r, n, path)) return -1;
+      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
+        CONSOLE.Warning(1,
+          "error, invalid path in torrent data for file %lu at offset %llu",
+          nfiles, m_total_files_length - t);
+        delete pbf;
+        return -1;
+      }
 
       int f_conv;
       char *tmpfn = new char[strlen(path)*2+5];


Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ctorrent.spec	21 Aug 2009 12:53:34 -0000	1.13
+++ ctorrent.spec	21 Aug 2009 21:40:22 -0000	1.14
@@ -2,12 +2,14 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 11.%{dnh}%{?dist}
+Release: 12.%{dnh}%{?dist}
 Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
 License: GPLv2+
 URL: http://www.rahul.net/dholmes/ctorrent/
 Source0: http://downloads.sourceforge.net/sourceforge/dtorrent/%{name}-%{dnh}.tar.gz
+# http://sourceforge.net/tracker/download.php?group_id=202532&atid=981959&file_id=325065&aid=2782875
+Patch0: %{name}-CVE-2009-1759.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
@@ -17,6 +19,7 @@ performance with minimal system resource
 
 %prep
 %setup -q -n %{name}-%{dnh}
+%patch0 -p0
 
 %build
 %configure
@@ -35,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-12.dnh3.3.2
+- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-11.dnh3.3.2
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:15 +0000
Subject: [pkgdb] taglib: rdieter has requested approveacls
Message-ID: <20090821214315.EAD7E10F80B@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on taglib (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:27 +0000
Subject: [pkgdb] taglib: rdieter has requested watchcommits
Message-ID: <20090821214327.EC21510F80B@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on taglib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:31 +0000
Subject: [pkgdb] taglib: rdieter has requested approveacls
Message-ID: <20090821214331.A591C10F88B@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on taglib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:29 +0000
Subject: [pkgdb] taglib: rdieter has requested commit
Message-ID: <20090821214329.033C110F888@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on taglib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:34 +0000
Subject: [pkgdb] taglib: rdieter has requested watchbugzilla
Message-ID: <20090821214334.351D210F890@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on taglib (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:41 +0000
Subject: [pkgdb] taglib: rdieter has requested watchcommits
Message-ID: <20090821214341.85C5C10F80B@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on taglib (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:44 +0000
Subject: [pkgdb] taglib: rdieter has requested watchbugzilla
Message-ID: <20090821214345.01CEE10F886@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on taglib (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:45 +0000
Subject: [pkgdb] taglib: rdieter has requested commit
Message-ID: <20090821214345.55FD210F899@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on taglib (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:47 +0000
Subject: [pkgdb] taglib: rdieter has requested approveacls
Message-ID: <20090821214347.254E810F89F@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on taglib (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:51 +0000
Subject: [pkgdb] taglib: rdieter has requested approveacls
Message-ID: <20090821214351.52F1010F888@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on taglib (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:43:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:43:52 +0000
Subject: [pkgdb] taglib: rdieter has requested approveacls
Message-ID: <20090821214352.D6A1410F8A1@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on taglib (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Fri Aug 21 21:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:45:33 +0000
Subject: [pkgdb] libkipi ownership updated
Message-ID: <20090821214533.AB62910F7E5@bastion2.fedora.phx.redhat.com>

Package libkipi in Fedora devel is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkipi



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:06 +0000
Subject: [pkgdb] libkexif ownership updated
Message-ID: <20090821214706.8570C10F80B@bastion2.fedora.phx.redhat.com>

Package libkexif in Fedora devel is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:10 +0000
Subject: [pkgdb] libkexif had acl change status
Message-ID: <20090821214709.F29E910F85C@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libkexif (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:11 +0000
Subject: [pkgdb] libkexif had acl change status
Message-ID: <20090821214711.E43DF10F886@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libkexif (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:21 +0000
Subject: [pkgdb] libkexif: rdieter has requested commit
Message-ID: <20090821214721.2657210F854@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on libkexif (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:23 +0000
Subject: [pkgdb] libkexif: rdieter has requested approveacls
Message-ID: <20090821214723.6D6E310F85C@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on libkexif (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:26 +0000
Subject: [pkgdb] libkexif: rdieter has requested approveacls
Message-ID: <20090821214726.7CF7510F899@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on libkexif (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From pkgdb at fedoraproject.org  Fri Aug 21 21:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 21:47:24 +0000
Subject: [pkgdb] libkexif: rdieter has requested commit
Message-ID: <20090821214724.B8D7510F890@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on libkexif (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libkexif



From sgrubb at fedoraproject.org  Fri Aug 21 21:52:47 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 21 Aug 2009 21:52:47 +0000 (UTC)
Subject: rpms/amtu/F-11 amtu-1.0.8-init.patch, NONE, 1.1 amtu.spec, 1.25,
	1.26 sources, 1.11, 1.12 amtu-1.0.7-makefile.patch, 1.1, NONE
Message-ID: <20090821215247.BC7C611C00D7@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/amtu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6820

Modified Files:
	amtu.spec sources 
Added Files:
	amtu-1.0.8-init.patch 
Removed Files:
	amtu-1.0.7-makefile.patch 
Log Message:
* Fri Aug 21 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-1
- new upstream version
- Add init script for bootup system check


amtu-1.0.8-init.patch:
 Makefile.am         |    2 
 configure.in        |    2 
 doc/AMTUHowTo.txt   |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/Makefile.am     |    2 
 init/Makefile.am    |   16 +++++++
 init/amtu.init      |   90 ++++++++++++++++++++++++++++++++++++++++++++
 init/amtu.sysconfig |   11 +++++
 7 files changed, 225 insertions(+), 3 deletions(-)

--- NEW FILE amtu-1.0.8-init.patch ---
diff -urN amtu-1.0.8.orig/configure.in amtu-1.0.8/configure.in
--- amtu-1.0.8.orig/configure.in	2009-07-06 09:39:44.000000000 -0400
+++ amtu-1.0.8/configure.in	2009-07-06 10:11:15.000000000 -0400
@@ -19,7 +19,7 @@
 esac
 AC_CHECK_LIB(laus, laus_open)
 AC_CHECK_LIB(audit, audit_open)
-AC_OUTPUT(Makefile src/Makefile doc/Makefile)
+AC_OUTPUT(Makefile src/Makefile init/Makefile doc/Makefile)
 
 echo .
 echo "
diff -urN amtu-1.0.8.orig/doc/AMTUHowTo.txt amtu-1.0.8/doc/AMTUHowTo.txt
--- amtu-1.0.8.orig/doc/AMTUHowTo.txt	1969-12-31 19:00:00.000000000 -0500
+++ amtu-1.0.8/doc/AMTUHowTo.txt	2009-07-06 10:20:42.000000000 -0400
@@ -0,0 +1,105 @@
+ABSTRACT MACHINE TEST UTILITY HOWTO
+
+
+OVERVIEW
+
+Abstract Machine Test Utility (AMTU) is an administrative utility to check 
+whether the underlying protection mechanism of the hardware are still being 
+enforced. This is a requirement of the Controlled Access Protection Profile 
+(CAPP) FTP_AMT.1, see http://www.radium.ncsc.mil/tpep/library/protection_profiles/CAPP-1.d.pdf.
+AMTU executes the following tests:
+
+* Memory 
+
+Randomly writes to areas of memory and then reading the memory back to 
+ensure the values written remain unchanged. 
+
+* Memory Separation
+
+Ensures that user space programs cannot read and write to areas of memory
+utilized by the likes of Video RAM, kernel code, etc.
+
+* I/O Controller - Network
+
+Verifies random data transmitted is also the data received for each configured
+network device. Only ethernet and token ring devices that are configured and
+up are checked. Async devices are not checked.
+
+* I/O Controller - Disk
+
+Verifies that information written to disks remains unchanged. Only SCSI and IDE
+controllers associated with mounted filesystems are checked.
+
+* Supervisor Mode Instructions
+
+Ensures that the enforcement of the property that privileged instructions
+should only be in supervisor mode is still in effect. The set privileged
+instructions tested to confirm this is architecture dependant.
+
+
+
+TESTED VERSIONS
+
+AMTU has been tested on the following:
+
+* RHEL4 and 5
+* SuSE SLES 8
+* pSeries (32-bit and 64-bit)
+* iSeries (64-bit)
+* zSeries (31-bit)
+* xSeries (32-bit)
+
+
+
+INSTALLING AMTU
+
+VERIFYING SYSTEM REQUIREMENTS AND PREREQUISITES
+
+Before installing AMTU, verify that your system meets the following
+requirements and prerequisites:
+
+* The system is running in the Common Criteria evaluated configuration.
+
+
+COMPILING AND INSTALLING AMTU
+
+Untar the AMTU source tarball.  Then issue the following commands:
+	./bootstrap
+	./configure
+	make
+	make install
+
+Only the last step must be run as root. During the ./configure stage
+you may opt to change various options including default install directory.
+
+When compiling AMTU as a 64-bit application on a PPC64 architecture (with the
+exception of Squadron pSeries), specify
+ 
+	./configure CC=/opt/cross/bin/powerpc64-linux-gcc
+
+where /opt/cross/bin/powerpc64-linux-gcc is the 64-bit gcc compiler.
+
+To compile as a 64-bit application on X86_64 architecture or Squadron pSeries, 
+
+	./configure CC="gcc -m64" 
+
+
+
+RUNNING AMTU
+
+AMTU installs to /usr/bin/amtu by default. You can add optional command line 
+arguments (see the AMTU man page (amtu.8) for more details).
+
+
+
+INTERPRETING RESULTS
+
+AMTU issues the following return codes when executed:
+
+	* -1 - Program abort error
+	*  0 - Successful program completion
+
+If the error is repeatable, you can re-run amtu with the -d option to get 
+more information about the failure. The success or failure of AMTU is logged
+in the audit log files (see auditd.8).
+
diff -urN amtu-1.0.8.orig/doc/Makefile.am amtu-1.0.8/doc/Makefile.am
--- amtu-1.0.8.orig/doc/Makefile.am	2009-07-06 09:39:44.000000000 -0400
+++ amtu-1.0.8/doc/Makefile.am	2009-07-06 09:40:49.000000000 -0400
@@ -1,3 +1,3 @@
 CONFIG_CLEAN_FILES = *.rej *.orig
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) AbstractMachineTestingDesign.doc AMTUHowTo.txt
 man_MANS = amtu.8
diff -urN amtu-1.0.8.orig/init/amtu.init amtu-1.0.8/init/amtu.init
--- amtu-1.0.8.orig/init/amtu.init	1969-12-31 19:00:00.000000000 -0500
+++ amtu-1.0.8/init/amtu.init	2009-07-06 10:17:43.000000000 -0400
@@ -0,0 +1,90 @@
+#!/bin/sh
+#
+# amtu:		Abstract Machine Tests
+#
+# chkconfig: - 96 99
+# description:  This service runs the abstract machine tests to check the \
+#		underlying security assumptions. It can be configured to
+#		halt the machine in the event of failure. The program does
+#		not stay resident, but rather runs once.
+#
+# processname: /sbin/amtu
+# config: /etc/sysconfig/amtu
+#
+# Return values according to LSB for all commands but status:
+# 0 - success
+# 1 - generic or unspecified error
+# 2 - invalid or excess argument(s)
+# 3 - unimplemented feature (e.g. "reload")
+# 4 - insufficient privilege
+# 5 - program is not installed
+# 6 - program is not configured
+# 7 - program is not running
+
+PATH=/sbin:/bin:/usr/bin:/usr/sbin
+prog="amtu"
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Allow anyone to run status
+if [ "$1" = "status" ] ; then
+	exit 0
+fi
+
+# Check that we are root ... so non-root users stop here
+test $EUID = 0  ||  exit 4
+
+# Check config
+test -f /etc/sysconfig/amtu && . /etc/sysconfig/amtu
+
+RETVAL=0
+
+start() {
+	test -x /usr/bin/amtu  || exit 5
+	# Now check that the syconfig is found and has important things
+	# configured
+	test -f /etc/sysconfig/amtu || exit 6
+	test x"$AMTU_HALT_ON_FAILURE" = "x" || exit 6
+	test x"$HALT_COMMAND" = "x" || exit 6
+	echo -n $"Starting $prog: "
+	daemon $prog "$EXTRAOPTIONS"
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ] ; then
+		if [ "$AMTU_HALT_ON_FAILURE" = "yes" ] ; then
+			# Give audit daemon chance to write to disk
+			sleep 3
+			logger "Amtu failed and halt on failure requested"
+			$HALT_COMMAND
+		fi
+	fi
+	return $RETVAL
+}
+
+stop() {
+	/bin/true
+}
+
+# See how we were called.
+case "$1" in
+    start)
+	start
+	;;
+    stop)
+	stop
+	;;
+    status)
+        ;;
+    restart)
+	stop
+	start
+	;;
+    condrestart)
+	;;
+    reload)
+        ;;
+    *)
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+	;;
+esac
+exit $RETVAL
diff -urN amtu-1.0.8.orig/init/amtu.sysconfig amtu-1.0.8/init/amtu.sysconfig
--- amtu-1.0.8.orig/init/amtu.sysconfig	1969-12-31 19:00:00.000000000 -0500
+++ amtu-1.0.8/init/amtu.sysconfig	2009-07-06 10:06:07.000000000 -0400
@@ -0,0 +1,11 @@
+# Add extra options here:
+EXTRAOPTIONS=""
+#
+# This option is used to determine if failing any amtu test should result in
+# the machine being unusable. The default is no, but it can be changed to
+# yes in case this is desired.
+AMTU_HALT_ON_FAILURE="no"
+#
+# Should halt on failure trigger and its set to yes, the following command
+# will be issued to stop the system:
+HALT_COMMAND="poweroff"
diff -urN amtu-1.0.8.orig/init/Makefile.am amtu-1.0.8/init/Makefile.am
--- amtu-1.0.8.orig/init/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ amtu-1.0.8/init/Makefile.am	2009-07-06 10:14:22.000000000 -0400
@@ -0,0 +1,16 @@
+
+CONFIG_CLEAN_FILES = *.rej *.orig
+EXTRA_DIST = amtu.init amtu.sysconfig
+initdir=$(sysconfdir)/rc.d/init.d
+sysconfigdir=$(sysconfdir)/sysconfig
+
+install-data-hook:
+	$(INSTALL_DATA) -D -m 640 ${srcdir}/amtu.sysconfig ${DESTDIR}${sysconfigdir}/amtu
+
+install-exec-hook:
+	$(INSTALL_SCRIPT) -D -m 755 ${srcdir}/amtu.init ${DESTDIR}${initdir}/amtu
+
+uninstall-hook:
+	rm ${DESTDIR}${sysconfigdir}/amtu
+	rm ${DESTDIR}${initdir}/amtu
+
diff -urN amtu-1.0.8.orig/Makefile.am amtu-1.0.8/Makefile.am
--- amtu-1.0.8.orig/Makefile.am	2009-07-06 09:39:44.000000000 -0400
+++ amtu-1.0.8/Makefile.am	2009-07-06 10:10:55.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = src doc
+SUBDIRS = src init doc
 EXTRA_DIST = bootstrap LICENSE CPLv1.0.htm README
 CONFIG_CLEAN_FILES = debug*.list config/*
 


Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/F-11/amtu.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- amtu.spec	1 Jul 2009 15:57:05 -0000	1.25
+++ amtu.spec	21 Aug 2009 21:52:47 -0000	1.26
@@ -1,18 +1,16 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
-Version: 1.0.7
+Version: 1.0.8
 Release: 1%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
 Source0: %{name}-%{version}.tar.gz
-Patch1: amtu-1.0.7-makefile.patch
+Patch1: amtu-1.0.8-init.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audit-libs-devel >= 1.1.2
 BuildRequires: automake
-Requires: audit >= 1.1.2
-
-# Red Hat AMTU SPEC file
+Requires: chkconfig
 
 %description
 Abstract Machine Test Utility (AMTU) is an administrative utility to check
@@ -26,7 +24,6 @@ http://www.radium.ncsc.mil/tpep/library/
 %patch1 -p1
 
 %build
-# next 3 items is to quieten autoreconf
 touch ChangeLog
 touch NEWS
 touch AUTHORS
@@ -41,13 +38,28 @@ make "DESTDIR=${RPM_BUILD_ROOT}" install
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add amtu
+
+%preun
+if [ $1 -eq 0 ]; then
+   /sbin/service amtu stop > /dev/null 2>&1
+   /sbin/chkconfig --del amtu
+fi
+
 %files
 %defattr(-,root,root, -)
-%doc doc/AMTUHowTo.txt COPYING
+%doc doc/AMTUHowTo.txt LICENSE
+%attr(755,root,root) /etc/rc.d/init.d/amtu
+%config(noreplace) %attr(640,root,root) /etc/sysconfig/amtu
 %attr(0750,root,root) %{_bindir}/amtu
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Aug 21 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-1
+- new upstream version
+- Add init script for bootup system check
+
 * Wed Jul 01 2009 Steve Grubb <sgrubb at redhat.com> 1.0.7-1
 - new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Jul 2009 15:57:06 -0000	1.11
+++ sources	21 Aug 2009 21:52:47 -0000	1.12
@@ -1 +1 @@
-8858a47c667ffc4af840d72d8ced6605  amtu-1.0.7.tar.gz
+755b517a3a1cc4092435c349d9b99312  amtu-1.0.8.tar.gz


--- amtu-1.0.7-makefile.patch DELETED ---



From mso at fedoraproject.org  Fri Aug 21 22:01:22 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Fri, 21 Aug 2009 22:01:22 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel constantine-backgrounds.spec, 1.4,
	1.5
Message-ID: <20090821220122.3226D11C00D7@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7969

Modified Files:
	constantine-backgrounds.spec 
Log Message:


Forgot to BR: inkscape.




Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- constantine-backgrounds.spec	21 Aug 2009 20:43:28 -0000	1.4
+++ constantine-backgrounds.spec	21 Aug 2009 22:01:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           constantine-backgrounds
 Version:        11.90.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
+BuildRequires:  inkscape
 # for %%_kde4_* macros
 BuildRequires:	kde-filesystem
 
@@ -92,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.2-2
+- Forgot to BR: inkscape
+
 * Fri Aug 21 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.2-1
 - First wallpaper respin
 



From rathann at fedoraproject.org  Fri Aug 21 22:08:38 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Fri, 21 Aug 2009 22:08:38 +0000 (UTC)
Subject: rpms/ctorrent/F-11 ctorrent-CVE-2009-1759.patch, NONE,
	1.1 ctorrent.spec, 1.11, 1.12
Message-ID: <20090821220838.C1B6211C00D7@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074

Modified Files:
	ctorrent.spec 
Added Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-10.dnh3.3.2
- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)


ctorrent-CVE-2009-1759.patch:
 bencode.cpp |   14 ++++++++++----
 bencode.h   |    2 +-
 btfiles.cpp |   12 ++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

--- NEW FILE ctorrent-CVE-2009-1759.patch ---
Index: bencode.h
===================================================================
--- bencode.h	(revision 301)
+++ bencode.h	(revision 302)
@@ -25,7 +25,7 @@
 size_t decode_list(const char *b,size_t len,const char *keylist);
 size_t decode_rev(const char *b,size_t len,const char *keylist);
 size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method);
-size_t decode_list2path(const char *b, size_t n, char *pathname);
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen);
 size_t bencode_buf(const char *str,size_t len,FILE *fp);
 size_t bencode_str(const char *str, FILE *fp);
 size_t bencode_int(const uint64_t integer, FILE *fp);
Index: bencode.cpp
===================================================================
--- bencode.cpp	(revision 301)
+++ bencode.cpp	(revision 302)
@@ -233,22 +233,28 @@
   return bencode_end_dict_list(fp);
 }
 
-size_t decode_list2path(const char *b, size_t n, char *pathname)
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen)
 {
   const char *pb = b;
   const char *s = (char *) 0;
+  const char *endmax = pathname + maxlen - 1;
   size_t r,q;
 
   if( 'l' != *pb ) return 0;
   pb++;
   n--;
   if( !n ) return 0;
-  for(; n;){
+  while( n && pathname < endmax ){
     if(!(r = buf_str(pb, n, &s, &q)) ) return 0;
+    if( q >= maxlen ) return 0;
     memcpy(pathname, s, q);
     pathname += q;
-    pb += r; n -= r; 
-    if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break;
+    maxlen -= q;
+    pb += r;
+    n -= r; 
+    if( 'e' == *pb ) break;
+    if( pathname >= endmax ) return 0;
+    *pathname++ = PATH_SP;
   }
   *pathname = '\0';
   return (pb - b + 1);
Index: btfiles.cpp
===================================================================
--- btfiles.cpp	(revision 301)
+++ btfiles.cpp	(revision 302)
@@ -471,6 +471,8 @@
     BTFILE *pbf_last = (BTFILE*) 0; 
     BTFILE *pbf = (BTFILE*) 0;
     size_t dl;
+    unsigned long nfiles = 0;
+
     if( decode_query(metabuf,metabuf_len,"info|length",
                     (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
       return -1;
@@ -524,12 +526,18 @@
 #ifndef WINDOWS
       if( !pbf ) return -1;
 #endif
+      nfiles++;
       pbf->bf_length = t;
       m_total_files_length += t;
       r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0,
                        QUERY_POS);
-      if( !r ) return -1;
-      if(!decode_list2path(p + r, n, path)) return -1;
+      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
+        CONSOLE.Warning(1,
+          "error, invalid path in torrent data for file %lu at offset %llu",
+          nfiles, m_total_files_length - t);
+        delete pbf;
+        return -1;
+      }
 
       int f_conv;
       char *tmpfn = new char[strlen(path)*2+5];


Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/F-11/ctorrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ctorrent.spec	26 Feb 2009 21:07:23 -0000	1.11
+++ ctorrent.spec	21 Aug 2009 22:08:38 -0000	1.12
@@ -2,12 +2,14 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 9.%{dnh}%{?dist}
+Release: 10.%{dnh}%{?dist}
 Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
 License: GPLv2+
 URL: http://www.rahul.net/dholmes/ctorrent/
 Source0: http://downloads.sourceforge.net/sourceforge/dtorrent/%{name}-%{dnh}.tar.gz
+# http://sourceforge.net/tracker/download.php?group_id=202532&atid=981959&file_id=325065&aid=2782875
+Patch0: %{name}-CVE-2009-1759.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
@@ -17,6 +19,7 @@ performance with minimal system resource
 
 %prep
 %setup -q -n %{name}-%{dnh}
+%patch0 -p0
 
 %build
 %configure
@@ -35,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-10.dnh3.3.2
+- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
+
 * Tue Feb 26 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-9.dnh3.3.2
 - update to 3.3.2 patch
 - improve summary: and description



From pkgdb at fedoraproject.org  Fri Aug 21 22:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:18:24 +0000
Subject: [pkgdb] perl-Unicode-Map ownership updated
Message-ID: <20090821221824.86B5510F80B@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-Map in Fedora devel is now owned by eseyman

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-Map



From pkgdb at fedoraproject.org  Fri Aug 21 22:18:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:18:57 +0000
Subject: [pkgdb] perl-Unicode-MapUTF8 ownership updated
Message-ID: <20090821221858.66F5010F888@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-MapUTF8 in Fedora devel is now owned by eseyman

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-MapUTF8



From pkgdb at fedoraproject.org  Fri Aug 21 22:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:19:08 +0000
Subject: [pkgdb] perl-Unicode-String ownership updated
Message-ID: <20090821221908.1808B10F84D@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-String in Fedora devel is now owned by eseyman

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-String



From pkgdb at fedoraproject.org  Fri Aug 21 22:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:18:47 +0000
Subject: [pkgdb] perl-Unicode-Map8 ownership updated
Message-ID: <20090821221847.8812C10F881@bastion2.fedora.phx.redhat.com>

Package perl-Unicode-Map8 in Fedora devel is now owned by eseyman

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Unicode-Map8



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:09 +0000
Subject: [pkgdb] libifp ownership updated
Message-ID: <20090821222209.B8D9710F855@bastion2.fedora.phx.redhat.com>

Package libifp in Fedora devel is now owned by konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:20 +0000
Subject: [pkgdb] libifp: konradm has requested watchbugzilla
Message-ID: <20090821222220.46CBA10F86F@bastion2.fedora.phx.redhat.com>

konradm has requested the watchbugzilla acl on libifp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:21 +0000
Subject: [pkgdb] libifp: konradm has requested commit
Message-ID: <20090821222221.3545E10F889@bastion2.fedora.phx.redhat.com>

konradm has requested the commit acl on libifp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:21 +0000
Subject: [pkgdb] libifp: konradm has requested approveacls
Message-ID: <20090821222222.1140510F88C@bastion2.fedora.phx.redhat.com>

konradm has requested the approveacls acl on libifp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:28 +0000
Subject: [pkgdb] libifp: konradm has requested watchcommits
Message-ID: <20090821222228.3793910F890@bastion2.fedora.phx.redhat.com>

konradm has requested the watchcommits acl on libifp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:32 +0000
Subject: [pkgdb] libifp: konradm has requested watchbugzilla
Message-ID: <20090821222233.68EC910F898@bastion2.fedora.phx.redhat.com>

konradm has requested the watchbugzilla acl on libifp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:33 +0000
Subject: [pkgdb] libifp: konradm has requested watchcommits
Message-ID: <20090821222233.A5B3210F897@bastion2.fedora.phx.redhat.com>

konradm has requested the watchcommits acl on libifp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:36 +0000
Subject: [pkgdb] libifp: konradm has requested commit
Message-ID: <20090821222236.1D4FF10F89A@bastion2.fedora.phx.redhat.com>

konradm has requested the commit acl on libifp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:22:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:22:37 +0000
Subject: [pkgdb] libifp: konradm has requested approveacls
Message-ID: <20090821222237.9662F10F89C@bastion2.fedora.phx.redhat.com>

konradm has requested the approveacls acl on libifp (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Fri Aug 21 22:45:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 22:45:39 +0000
Subject: [pkgdb] xbindkeys ownership updated
Message-ID: <20090821224539.B06D510F84D@bastion2.fedora.phx.redhat.com>

Package xbindkeys in Fedora devel is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xbindkeys



From mclasen at fedoraproject.org  Fri Aug 21 22:47:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 21 Aug 2009 22:47:29 +0000 (UTC)
Subject: rpms/control-center/devel font-viewer-icon.patch, NONE,
	1.1 control-center.spec, 1.475, 1.476
Message-ID: <20090821224730.196E711C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16517

Modified Files:
	control-center.spec 
Added Files:
	font-viewer-icon.patch 
Log Message:
Fix the font-viewer icon


font-viewer-icon.patch:
 gnome-font-viewer.desktop.in.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE font-viewer-icon.patch ---
diff -up gnome-control-center-2.27.90/font-viewer/gnome-font-viewer.desktop.in.in.font-viewer-icon gnome-control-center-2.27.90/font-viewer/gnome-font-viewer.desktop.in.in
--- gnome-control-center-2.27.90/font-viewer/gnome-font-viewer.desktop.in.in.font-viewer-icon	2009-08-21 18:41:15.009209398 -0400
+++ gnome-control-center-2.27.90/font-viewer/gnome-font-viewer.desktop.in.in	2009-08-21 18:41:47.904444837 -0400
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Font Viewer
 _Comment=Preview fonts
-Icon=gnome-settings-font
+Icon=preferences-desktop-font
 Exec=gnome-font-viewer %u
 Terminal=false
 Type=Application


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- control-center.spec	20 Aug 2009 18:45:20 -0000	1.475
+++ control-center.spec	21 Aug 2009 22:47:27 -0000	1.476
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -65,6 +65,9 @@ Patch55: unique-ids.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=578109
 Patch56: rotate.patch
 
+#vhttp://bugzilla.gnome.org/show_bug.cgi?id=592642
+Patch57: font-viewer-icon.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
@@ -369,6 +372,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Aug 21 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-4
+- Fix the font-viewer icon
+
 * Thu Aug 20 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-3
 - Fix dragging of rotated monitors in the display capplet
 



From dwalsh at fedoraproject.org  Fri Aug 21 22:58:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 21 Aug 2009 22:58:29 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.28,
	1.29 modules-targeted.conf, 1.137, 1.138 policy-F12.patch, 1.56,
	1.57 selinux-policy.spec, 1.900, 1.901
Message-ID: <20090821225829.4BB7411C00D7@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18769

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Fri Aug 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-4
- Add ABRT policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- modules-minimum.conf	18 Aug 2009 22:29:11 -0000	1.28
+++ modules-minimum.conf	21 Aug 2009 22:58:28 -0000	1.29
@@ -46,6 +46,13 @@ cpufreqselector = module
 # 
 awstats = module
 
+# Layer: services
+# Module: abrt
+#
+# Automatic bug detection and reporting tool
+# 
+abrt = module
+
 # Layer: admin
 # Module: amanda
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- modules-targeted.conf	18 Aug 2009 22:29:11 -0000	1.137
+++ modules-targeted.conf	21 Aug 2009 22:58:28 -0000	1.138
@@ -46,6 +46,13 @@ cpufreqselector = module
 # 
 awstats = module
 
+# Layer: services
+# Module: abrt
+#
+# Automatic bug detection and reporting tool
+# 
+abrt = module
+
 # Layer: admin
 # Module: amanda
 #

policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   16 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  287 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |    9 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  297 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  391 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   14 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  145 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 policy/modules/services/dbus.if                    |   28 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   46 
 policy/modules/services/policykit.te               |   54 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   64 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  262 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1345 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 328 files changed, 14396 insertions(+), 2974 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.56 -r 1.57 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- policy-F12.patch	20 Aug 2009 17:48:51 -0000	1.56
+++ policy-F12.patch	21 Aug 2009 22:58:28 -0000	1.57
@@ -1,16 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.6.28/Changelog
---- nsaserefpolicy/Changelog	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.28/Changelog	2009-08-18 13:23:29.000000000 -0400
-@@ -1,6 +1,3 @@
--- Misc Gentoo fixes from Corentin Labbe.
--- Debian policykit fixes from Martin Orr.
--- Fix unconfined_r use of unconfined_java_t.
- - Add missing x_device rules for XI2 functions, from Eamon Walsh.
- - Add missing rules to make unconfined_cronjob_t a valid cron job domain.
- - Add btrfs and ext4 to labeling targets.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.28/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -34,13 +24,13 @@ diff -b -B --ignore-all-space --exclude-
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context	2009-08-21 18:56:06.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -57,7 +47,7 @@ diff -b -B --ignore-all-space --exclude-
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/securetty_types serefpolicy-3.6.28/config/appconfig-mcs/securetty_types
 --- nsaserefpolicy/config/appconfig-mcs/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/securetty_types	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/securetty_types	2009-08-21 18:56:06.000000000 -0400
 @@ -1 +1,6 @@
 +auditadm_tty_device_t
 +secadm_tty_device_t
@@ -67,7 +57,7 @@ diff -b -B --ignore-all-space --exclude-
  user_tty_device_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.28/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/seusers	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/seusers	2009-08-21 18:56:06.000000000 -0400
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -76,7 +66,7 @@ diff -b -B --ignore-all-space --exclude-
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -93,7 +83,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -109,13 +99,13 @@ diff -b -B --ignore-all-space --exclude-
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context	2009-08-21 18:56:06.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -130,18 +120,18 @@ diff -b -B --ignore-all-space --exclude-
 +user_r:user_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context	2009-08-21 18:56:06.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:svirt_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context	2009-08-21 18:56:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:svirt_image_t:s0
 +system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.28/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mls/default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -165,7 +155,7 @@ diff -b -B --ignore-all-space --exclude-
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts	2009-08-21 18:56:06.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -186,18 +176,18 @@ diff -b -B --ignore-all-space --exclude-
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context	2009-08-21 18:56:06.000000000 -0400
 @@ -0,0 +1 @@
 +system_u:system_r:qemu_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context
 --- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context	2009-08-21 18:56:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +system_u:object_r:virt_image_t:s0
 +system_u:object_r:virt_content_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/securetty_types serefpolicy-3.6.28/config/appconfig-standard/securetty_types
 --- nsaserefpolicy/config/appconfig-standard/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-standard/securetty_types	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/config/appconfig-standard/securetty_types	2009-08-21 18:56:06.000000000 -0400
 @@ -1 +1,6 @@
 +auditadm_tty_device_t
 +secadm_tty_device_t
@@ -207,7 +197,7 @@ diff -b -B --ignore-all-space --exclude-
  user_tty_device_t
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.28/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.28/Makefile	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/Makefile	2009-08-21 18:56:06.000000000 -0400
 @@ -102,8 +102,6 @@
  comment_move_decl := $(SED) -r -f $(support)/comment_move_decl.sed
  gennetfilter := $(PYTHON) -E $(support)/gennetfilter.py
@@ -304,7 +294,7 @@ diff -b -B --ignore-all-space --exclude-
  		false ;\
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-3.6.28/man/man8/rsync_selinux.8
 --- nsaserefpolicy/man/man8/rsync_selinux.8	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/man/man8/rsync_selinux.8	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/man/man8/rsync_selinux.8	2009-08-21 18:56:06.000000000 -0400
 @@ -21,10 +21,18 @@
  .TP
  chcon -t public_content_t /var/rsync
@@ -336,7 +326,7 @@ diff -b -B --ignore-all-space --exclude-
 +selinux(8), rsync(1), chcon(1), setsebool(8), semanage(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.28/man/man8/samba_selinux.8
 --- nsaserefpolicy/man/man8/samba_selinux.8	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/man/man8/samba_selinux.8	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/man/man8/samba_selinux.8	2009-08-21 18:56:06.000000000 -0400
 @@ -20,7 +20,7 @@
  .TP
  This command adds the following entry to /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local:
@@ -354,7 +344,7 @@ diff -b -B --ignore-all-space --exclude-
 +selinux(8), samba(7), chcon(1), setsebool(8), semanage(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.28/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/flask/access_vectors	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/flask/access_vectors	2009-08-21 18:56:06.000000000 -0400
 @@ -544,8 +544,6 @@
  	set_property
  	add
@@ -366,7 +356,7 @@ diff -b -B --ignore-all-space --exclude-
  class x_server
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.28/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/global_tunables	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/global_tunables	2009-08-21 18:56:06.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -404,7 +394,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.28/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/mcs	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/mcs	2009-08-21 18:56:06.000000000 -0400
 @@ -66,8 +66,8 @@
  #
[...3276 lines suppressed...]
++++ serefpolicy-3.6.28/policy/modules/system/udev.fc	2009-08-21 18:56:07.000000000 -0400
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -24626,7 +24914,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.te serefpolicy-3.6.28/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/udev.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/udev.te	2009-08-21 18:56: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;
@@ -24738,7 +25026,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.28/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/unconfined.fc	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/unconfined.fc	2009-08-21 18:56:07.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -24758,7 +25046,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.28/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/unconfined.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/unconfined.if	2009-08-21 18:56:07.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -25266,7 +25554,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.28/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/unconfined.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/unconfined.te	2009-08-21 18:56:07.000000000 -0400
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -25498,8 +25786,8 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.28/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.fc	2009-08-18 13:23:29.000000000 -0400
-@@ -1,4 +1,7 @@
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.fc	2009-08-21 18:56:07.000000000 -0400
+@@ -1,4 +1,8 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
  HOME_DIR/.+		gen_context(system_u:object_r:user_home_t,s0)
@@ -25508,9 +25796,10 @@ diff -b -B --ignore-all-space --exclude-
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
++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.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-20 09:09:55.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-21 18:56:07.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -26876,7 +27165,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3207,501 @@
+@@ -3027,3 +3207,540 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -27358,6 +27647,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	dontaudit $1 userdomain:unix_stream_socket rw_socket_perms;
 +')
++
 +########################################
 +## <summary>
 +##	Append files
@@ -27378,9 +27668,47 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 user_home_dir_t:dir search_dir_perms;
 +	files_search_home($1)
 +')
++
++########################################
++## <summary>
++##	Append files inherited
++##	in a user home subdirectory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_inherit_append_user_home_content_files',`
++	gen_require(`
++		type user_home_t;
++	')
++
++	allow $1 user_home_t:file { getattr append };
++')
++
++########################################
++## <summary>
++##	Append files inherited
++##	in a user tmp files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_inherit_append_user_tmp_files',`
++	gen_require(`
++		type user_tmp_t;
++	')
++
++	allow $1 user_tmp_t:file { getattr append };
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.28/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.te	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.te	2009-08-21 18:56:07.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27468,7 +27796,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.28/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.fc	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/xen.fc	2009-08-21 18:56:07.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -27498,7 +27826,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.28/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.if	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/xen.if	2009-08-21 18:56:07.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -27551,14 +27879,8 @@ 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.28/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.te	2009-08-19 17:23:15.000000000 -0400
-@@ -1,11 +1,18 @@
- 
--policy_module(xen, 1.9.0)
-+policy_module(xen, 1.8.2)
- 
- ########################################
- #
++++ serefpolicy-3.6.28/policy/modules/system/xen.te	2009-08-21 18:57:11.000000000 -0400
+@@ -6,6 +6,13 @@
  # Declarations
  #
  
@@ -27857,7 +28179,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.28/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/support/obj_perm_sets.spt	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/support/obj_perm_sets.spt	2009-08-21 18:56:07.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -27892,7 +28214,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.28/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/users	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/users	2009-08-21 18:56:07.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -27919,7 +28241,7 @@ diff -b -B --ignore-all-space --exclude-
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.28/Rules.modular
 --- nsaserefpolicy/Rules.modular	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/Rules.modular	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/Rules.modular	2009-08-21 18:56:07.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -27957,7 +28279,7 @@ diff -b -B --ignore-all-space --exclude-
 \ No newline at end of file
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.28/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/support/Makefile.devel	2009-08-18 13:23:29.000000000 -0400
++++ serefpolicy-3.6.28/support/Makefile.devel	2009-08-21 18:56:07.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -p -r1.900 -r1.901
--- selinux-policy.spec	20 Aug 2009 17:48:51 -0000	1.900
+++ selinux-policy.spec	21 Aug 2009 22:58:28 -0000	1.901
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-4
+- Add ABRT policy
+
 * Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-3
 - Fix system-config-services policy
 



From gouldwp at fedoraproject.org  Fri Aug 21 23:04:16 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Fri, 21 Aug 2009 23:04:16 +0000 (UTC)
Subject: rpms/netdisco/devel netdisco.spec,1.1,1.2
Message-ID: <20090821230416.0BABB11C00D7@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20119

Modified Files:
	netdisco.spec 
Log Message:



Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco.spec	28 Jul 2009 05:21:19 -0000	1.1
+++ netdisco.spec	21 Aug 2009 23:04:15 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           netdisco 
 Version:        0.95 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A web-based network management tool 
 License:        BSD
 Group:          Applications/Internet 
@@ -120,9 +120,7 @@ install -m0644 netdisco.pm %{buildroot}/
 
 
 %post
-if [ "$1" = "0" ]; then
    /sbin/chkconfig --add %{name}
-fi
 
 
 %preun
@@ -152,8 +150,9 @@ fi
  
 
 %changelog
-* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-2
+* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-3
 - Netdisco network management software.
+- Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section
 - Changed /usr/share/ to %%_datadir in the %%files section
 - Removed patches, substituted with find/perl/xargs replace lines 



From cweyl at fedoraproject.org  Fri Aug 21 23:10:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 21 Aug 2009 23:10:07 +0000 (UTC)
Subject: rpms/perl-Catalyst-Devel/devel .cvsignore, 1.9,
	1.10 perl-Catalyst-Devel.spec, 1.16, 1.17 sources, 1.9, 1.10
Message-ID: <20090821231007.3900411C0439@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21482

Modified Files:
	.cvsignore perl-Catalyst-Devel.spec sources 
Log Message:
* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.20-1
- auto-update to 1.20 (by cpan-spec-update 0.01)
- altered br on perl(File::ChangeNotify) (0.03 => 0.07)
- altered req on perl(File::ChangeNotify) (0.03 => 0.07)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Jul 2009 03:51:47 -0000	1.9
+++ .cvsignore	21 Aug 2009 23:10:06 -0000	1.10
@@ -1 +1 @@
-Catalyst-Devel-1.19.tar.gz
+Catalyst-Devel-1.20.tar.gz


Index: perl-Catalyst-Devel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/perl-Catalyst-Devel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Catalyst-Devel.spec	28 Jul 2009 03:51:47 -0000	1.16
+++ perl-Catalyst-Devel.spec	21 Aug 2009 23:10:07 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Devel
-Version:        1.19
+Version:        1.20
 Release:        1%{?dist}
 Summary:        Catalyst Development Tools
 License:        GPL+ or Artistic
@@ -40,11 +40,11 @@ Requires:       perl(parent)
 Requires:       perl-Catalyst-Runtime-scripts
 
 ### auto-added brs!
-BuildRequires:  perl(File::ChangeNotify) >= 0.03
+BuildRequires:  perl(File::ChangeNotify) >= 0.07
 
 ### auto-added reqs!
 Requires:  perl(Config::General) >= 2.42
-Requires:  perl(File::ChangeNotify) >= 0.03
+Requires:  perl(File::ChangeNotify) >= 0.07
 Requires:  perl(File::Copy::Recursive)
 Requires:  perl(Template) >= 2.14
 
@@ -89,6 +89,11 @@ rm -rf %{buildroot}
 %exclude %{perl_vendorlib}/Catalyst/Restarter/Win32.pm
 
 %changelog
+* Tue Aug 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.20-1
+- auto-update to 1.20 (by cpan-spec-update 0.01)
+- altered br on perl(File::ChangeNotify) (0.03 => 0.07)
+- altered req on perl(File::ChangeNotify) (0.03 => 0.07)
+
 * Mon Jul 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.19-1
 - auto-update to 1.19 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Jul 2009 03:51:47 -0000	1.9
+++ sources	21 Aug 2009 23:10:07 -0000	1.10
@@ -1 +1 @@
-1f3ba33a7f962f122c4b42a59530d09d  Catalyst-Devel-1.19.tar.gz
+eb699ccd64718d7c880959831a734599  Catalyst-Devel-1.20.tar.gz



From gouldwp at fedoraproject.org  Fri Aug 21 23:10:05 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Fri, 21 Aug 2009 23:10:05 +0000 (UTC)
Subject: rpms/netdisco/devel netdisco.init,1.1,1.2
Message-ID: <20090821231005.4F5ED11C0439@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21437

Modified Files:
	netdisco.init 
Log Message:



Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco.init	28 Jul 2009 05:21:19 -0000	1.1
+++ netdisco.init	21 Aug 2009 23:10:04 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # Startup script for the netdisco daemon
 #
-# chkconfig: - 345 95 5
+# chkconfig: 345 95 5
 # description: Startup/shutdown script for the Netdisco Admin Daemon
 # processname: netdisco
 # pidfile: /var/run/netdisco/netdisco.pid



From pkgdb at fedoraproject.org  Fri Aug 21 23:35:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 23:35:20 +0000
Subject: [pkgdb] bittorrent: mikester222 has requested watchcommits
Message-ID: <20090821233520.2E34210F85C@bastion2.fedora.phx.redhat.com>

mikester222 has requested the watchcommits acl on bittorrent (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bittorrent



From pkgdb at fedoraproject.org  Fri Aug 21 23:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 21 Aug 2009 23:35:29 +0000
Subject: [pkgdb] bittorrent: mikester222 has given up watchcommits
Message-ID: <20090821233529.CC5CA10F881@bastion2.fedora.phx.redhat.com>

mikester222 has given up the watchcommits acl on bittorrent (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bittorrent



From pbrobinson at fedoraproject.org  Fri Aug 21 23:36:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 21 Aug 2009 23:36:50 +0000 (UTC)
Subject: rpms/moblin-session/devel moblin-session-mutter.patch, 1.1,
	1.2 moblin-session.spec, 1.1, 1.2
Message-ID: <20090821233650.69D1411C00D7@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27822

Modified Files:
	moblin-session-mutter.patch moblin-session.spec 
Log Message:
- Specify the moblin-netbook plugin so we get an interface on login

moblin-session-mutter.patch:
 moblin-xinitrc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: moblin-session-mutter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/moblin-session-mutter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-session-mutter.patch	17 Aug 2009 18:24:24 -0000	1.1
+++ moblin-session-mutter.patch	21 Aug 2009 23:36:48 -0000	1.2
@@ -5,4 +5,4 @@
  /usr/libexec/moblin-panel-applications &
  
 -metacity --sm-disable
-+mutter --sm-disable
++mutter --sm-disable --mutter-plugins=moblin-netbook


Index: moblin-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/moblin-session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-session.spec	17 Aug 2009 18:24:24 -0000	1.1
+++ moblin-session.spec	21 Aug 2009 23:36:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           moblin-session
 Version:        0.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Moblin User Experience Startup Scripts
 
 Group:          User Interface/Desktops
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/moblin.desktop
 
 %changelog
+* 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
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-4
 - Add patch to start mutter not metacity
 



From pkgdb at fedoraproject.org  Sat Aug 22 00:01:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:01:32 +0000
Subject: [pkgdb] mono-addins (Fedora, 10) updated by toshio
Message-ID: <20090822000132.4AE6210F85C@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono-addins (Fedora 11) for chkr
toshio approved watchcommits on mono-addins (Fedora 11) for chkr
toshio approved commit on mono-addins (Fedora 11) for chkr
toshio approved build on mono-addins (Fedora 11) for chkr
toshio approved approveacls on mono-addins (Fedora 11) for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono-addins



From pkgdb at fedoraproject.org  Sat Aug 22 00:01:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:01:32 +0000
Subject: [pkgdb] mono-addins (Fedora, 10) updated by toshio
Message-ID: <20090822000132.783E810F890@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono-addins (Fedora devel) for chkr
toshio approved watchcommits on mono-addins (Fedora devel) for chkr
toshio approved commit on mono-addins (Fedora devel) for chkr
toshio approved build on mono-addins (Fedora devel) for chkr
toshio approved approveacls on mono-addins (Fedora devel) for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono-addins



From pkgdb at fedoraproject.org  Sat Aug 22 00:01:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:01:32 +0000
Subject: [pkgdb] mono-addins (Fedora, 10) updated by toshio
Message-ID: <20090822000132.707FE10F888@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono-addins (Fedora 10) for chkr
toshio approved watchcommits on mono-addins (Fedora 10) for chkr
toshio approved commit on mono-addins (Fedora 10) for chkr
toshio approved build on mono-addins (Fedora 10) for chkr
toshio approved approveacls on mono-addins (Fedora 10) for chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono-addins



From salimma at fedoraproject.org  Sat Aug 22 00:08:31 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 00:08:31 +0000 (UTC)
Subject: rpms/ikarus/devel ikarus.spec,1.9,1.10
Message-ID: <20090822000831.97F3C11C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/ikarus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2611/devel

Modified Files:
	ikarus.spec 
Log Message:
Update Ikarus source and download URLs as author has graduated;
  old site might not be up for too long




Index: ikarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikarus/devel/ikarus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ikarus.spec	25 Jul 2009 03:15:45 -0000	1.9
+++ ikarus.spec	22 Aug 2009 00:08:31 -0000	1.10
@@ -5,8 +5,8 @@ Summary:        An incremental optimizin
 
 Group:          Development/Languages
 License:        GPLv3
-URL:            http://www.cs.indiana.edu/~aghuloum/ikarus/
-Source0:        http://www.cs.indiana.edu/~aghuloum/ikarus/ikarus-%{version}.tar.gz
+URL:            http://ikarus-scheme.org/
+Source0:        http://ikarus-scheme.org/ikarus-%{version}.tar.gz
 #Patch0:         ikarus-0.0.1-bootfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:23 +0000
Subject: [pkgdb] mono: salimma has requested watchcommits
Message-ID: <20090822001923.85CDA10F80B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on mono (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:23 +0000
Subject: [pkgdb] mono: salimma has requested watchbugzilla
Message-ID: <20090822001924.009F610F85C@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on mono (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:25 +0000
Subject: [pkgdb] mono: salimma has requested commit
Message-ID: <20090822001925.3E8C710F888@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on mono (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:41 +0000
Subject: [pkgdb] mono: salimma has requested watchbugzilla
Message-ID: <20090822001941.441C510F80B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on mono (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:43 +0000
Subject: [pkgdb] mono: salimma has requested commit
Message-ID: <20090822001943.F0ACC10F890@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on mono (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:45 +0000
Subject: [pkgdb] mono: salimma has requested watchcommits
Message-ID: <20090822001945.2E7A310F898@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on mono (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:52 +0000
Subject: [pkgdb] mono: salimma has requested watchbugzilla
Message-ID: <20090822001953.01EF210F89B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on mono (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:53 +0000
Subject: [pkgdb] mono: salimma has requested watchcommits
Message-ID: <20090822001953.3060610F8A0@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on mono (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:19:55 +0000
Subject: [pkgdb] mono: salimma has requested commit
Message-ID: <20090822001955.613AE10F8A5@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on mono (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:20:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:20:08 +0000
Subject: [pkgdb] mono: salimma has requested watchbugzilla
Message-ID: <20090822002008.A7CBE10F888@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on mono (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:20:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:20:08 +0000
Subject: [pkgdb] mono: salimma has requested watchcommits
Message-ID: <20090822002009.15C0C10F88C@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on mono (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sat Aug 22 00:20:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 00:20:13 +0000
Subject: [pkgdb] mono: salimma has requested commit
Message-ID: <20090822002013.6A46910F897@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on mono (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From iarnell at fedoraproject.org  Sat Aug 22 00:50:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 22 Aug 2009 00:50:11 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object/F-10
	perl-Devel-LeakGuard-Object.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090822005011.3296011C0417@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-LeakGuard-Object.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-LeakGuard-Object.spec ---
Name:           perl-Devel-LeakGuard-Object
Version:        0.06
Release:        1%{?dist}
Summary:        Scoped checks for object leaks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-LeakGuard-Object/
Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/Devel-LeakGuard-Object-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(latest)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides tracking of objects, for the purpose of detecting
memory leaks due to circular references or innappropriate caching schemes.

%prep
%setup -q -n Devel-LeakGuard-Object-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Aug 08 2009 Iain Arnell 0.06-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:29:03 -0000	1.1
+++ .cvsignore	22 Aug 2009 00:50:10 -0000	1.2
@@ -0,0 +1 @@
+Devel-LeakGuard-Object-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:29:03 -0000	1.1
+++ sources	22 Aug 2009 00:50:11 -0000	1.2
@@ -0,0 +1 @@
+098c7cf35634bb196be60765f07fdb7d  Devel-LeakGuard-Object-0.06.tar.gz



From iarnell at fedoraproject.org  Sat Aug 22 00:50:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 22 Aug 2009 00:50:11 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object/F-11
	perl-Devel-LeakGuard-Object.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090822005011.6807A11C04D9@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-LeakGuard-Object.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-LeakGuard-Object.spec ---
Name:           perl-Devel-LeakGuard-Object
Version:        0.06
Release:        1%{?dist}
Summary:        Scoped checks for object leaks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-LeakGuard-Object/
Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/Devel-LeakGuard-Object-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(latest)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides tracking of objects, for the purpose of detecting
memory leaks due to circular references or innappropriate caching schemes.

%prep
%setup -q -n Devel-LeakGuard-Object-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Aug 08 2009 Iain Arnell 0.06-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:29:03 -0000	1.1
+++ .cvsignore	22 Aug 2009 00:50:11 -0000	1.2
@@ -0,0 +1 @@
+Devel-LeakGuard-Object-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:29:03 -0000	1.1
+++ sources	22 Aug 2009 00:50:11 -0000	1.2
@@ -0,0 +1 @@
+098c7cf35634bb196be60765f07fdb7d  Devel-LeakGuard-Object-0.06.tar.gz



From iarnell at fedoraproject.org  Sat Aug 22 00:50:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 22 Aug 2009 00:50:11 +0000 (UTC)
Subject: rpms/perl-Devel-LeakGuard-Object/devel
	perl-Devel-LeakGuard-Object.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090822005011.A3EF711C04EF@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-LeakGuard-Object.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-LeakGuard-Object.spec ---
Name:           perl-Devel-LeakGuard-Object
Version:        0.06
Release:        1%{?dist}
Summary:        Scoped checks for object leaks
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-LeakGuard-Object/
Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/Devel-LeakGuard-Object-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(latest)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides tracking of objects, for the purpose of detecting
memory leaks due to circular references or innappropriate caching schemes.

%prep
%setup -q -n Devel-LeakGuard-Object-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Aug 08 2009 Iain Arnell 0.06-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:29:03 -0000	1.1
+++ .cvsignore	22 Aug 2009 00:50:11 -0000	1.2
@@ -0,0 +1 @@
+Devel-LeakGuard-Object-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-LeakGuard-Object/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:29:03 -0000	1.1
+++ sources	22 Aug 2009 00:50:11 -0000	1.2
@@ -0,0 +1 @@
+098c7cf35634bb196be60765f07fdb7d  Devel-LeakGuard-Object-0.06.tar.gz



From gerd at fedoraproject.org  Sat Aug 22 01:06:25 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat, 22 Aug 2009 01:06:25 +0000 (UTC)
Subject: rpms/rakudo/devel .cvsignore, 1.3, 1.4 import.log, 1.4,
	1.5 rakudo.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090822010625.88DE311C00D7@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14780/devel

Modified Files:
	.cvsignore import.log rakudo.spec sources 
Log Message:
update to rakudo 2009-08 on parrot 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Aug 2009 13:49:39 -0000	1.3
+++ .cvsignore	22 Aug 2009 01:06:24 -0000	1.4
@@ -1 +1 @@
-rakudo-2009-07.tar.gz
+rakudo-2009-08.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	12 Aug 2009 20:38:02 -0000	1.4
+++ import.log	22 Aug 2009 01:06:25 -0000	1.5
@@ -2,3 +2,4 @@ rakudo-2009_07-3_fc11:HEAD:rakudo-2009.0
 rakudo-0_0_2009_07_1_4_0-1_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-1.fc11.src.rpm:1249480110
 rakudo-0_0_2009_07_1_4_0-3_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-3.fc11.src.rpm:1249818713
 rakudo-0_0_2009_07_1_4_0-4_fc11:HEAD:rakudo-0.0.2009.07_1.4.0-4.fc11.src.rpm:1250109284
+rakudo-0_0_2009_08_1_5_0-1_fc11:HEAD:rakudo-0.0.2009.08_1.5.0-1.fc11.src.rpm:1250903045


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rakudo.spec	12 Aug 2009 20:38:02 -0000	1.6
+++ rakudo.spec	22 Aug 2009 01:06:25 -0000	1.7
@@ -1,6 +1,6 @@
 %global year 2009
-%global month 07
-%global parrot_version 1.4.0
+%global month 08
+%global parrot_version 1.5.0
 
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
@@ -9,7 +9,7 @@ ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -38,7 +38,7 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
-%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
+#%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
@@ -73,8 +73,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/perl6
 %{parrot_dynext}/perl6_group.so
 %{parrot_dynext}/perl6_ops.so
-%{parrot_dynext}/perl6_ops_cg.so
-%{parrot_dynext}/perl6_ops_cgp.so
 %{parrot_dynext}/perl6_ops_switch.so
 %{par_lang_perl6}/lib/Safe.pm
 %{par_lang_perl6}/lib/Test.pm
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.08_1.5.0-1
+- update to rakudo 2009-08 on parrot 1.5.0
+
 * Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
 - modified source to add a path to the @*INC array
 - force executable permission on shared objects so they get stripped


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 20:38:02 -0000	1.5
+++ sources	22 Aug 2009 01:06:25 -0000	1.6
@@ -1 +1 @@
-8605d1d1987143db58749a983a7801bf  rakudo-2009-07.tar.gz
+a69537605421d44f90a87f47d3ae443b  rakudo-2009-08.tar.gz



From pkgdb at fedoraproject.org  Sat Aug 22 01:08:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 01:08:03 +0000
Subject: [pkgdb] python-dialog ownership updated
Message-ID: <20090822010803.581A010F7E5@bastion2.fedora.phx.redhat.com>

Package python-dialog in Fedora devel is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From oget at fedoraproject.org  Sat Aug 22 01:23:50 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 22 Aug 2009 01:23:50 +0000 (UTC)
Subject: rpms/mscore/F-11 mscore-ConvertFont.ff, NONE, 1.1 mscore.xml, NONE, 
	1.1 .cvsignore, 1.2, 1.3 mscore-separate-commonfiles.patch, 1.1,
	1.2 mscore-use-default-soundfont.patch, 1.1,
	1.2 mscore-use-pclite-soundfont.patch, 1.1, 1.2 mscore.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090822012350.DD09711C00D7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18479

Modified Files:
	.cvsignore mscore-separate-commonfiles.patch 
	mscore-use-default-soundfont.patch 
	mscore-use-pclite-soundfont.patch mscore.spec sources 
Added Files:
	mscore-ConvertFont.ff mscore.xml 
Log Message:
* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
- Update to 0.9.5



--- NEW FILE mscore-ConvertFont.ff ---
#!/usr/bin/fontforge
if ($argc > 1)
    i = 1;
    while ( i < $argc )
	Open($argv[i])
	ttfile = "mscore-" + $fontname + ".ttf"
	Print("Converting ",ttfile)
	Generate(ttfile,"ttf")
	Close()
	i++
    endloop
else
    Print("Usage: $0 font.sfd [font.sfd ...]")
endif


--- NEW FILE mscore.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
	<mime-type type="application/x-musescore">
		<comment>MuseScore file</comment>
		<glob pattern="*.msc"/>
		<glob pattern="*.mscx"/>
		<glob pattern="*.mscz"/>
	</mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Mar 2009 23:19:46 -0000	1.2
+++ .cvsignore	22 Aug 2009 01:23:50 -0000	1.3
@@ -1 +1 @@
-mscore-0.9.4-free.tar.bz2
+mscore-0.9.5-free.tar.bz2

mscore-separate-commonfiles.patch:
 mscore.cpp      |    6 +++---
 mscore.qrc      |   16 ++++++++--------
 preferences.cpp |   12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

Index: mscore-separate-commonfiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-separate-commonfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-separate-commonfiles.patch	23 Mar 2009 23:19:47 -0000	1.1
+++ mscore-separate-commonfiles.patch	22 Aug 2009 01:23:50 -0000	1.2
@@ -1,10 +1,10 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/mscore.cpp
---- mscore-0.9.4.old/mscore/mscore/mscore.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.cpp	2009-02-21 13:10:15.000000000 -0500
-@@ -1576,12 +1576,12 @@ int main(int argc, char* argv[])
-       //
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.cpp mscore-0.9.5/mscore/mscore/mscore.cpp
+--- mscore-0.9.5.old/mscore/mscore/mscore.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.cpp	2009-08-21 16:05:43.000000000 -0400
+@@ -1559,17 +1559,17 @@ int main(int argc, char* argv[])
        //  load internal fonts
        //
+ 
 -      if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore-20.ttf")) {
 +      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-20.ttf")) {
              fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
@@ -16,9 +16,15 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
              fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
              if (!debugMode)
                    exit(-1);
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-21 13:06:05.000000000 -0500
+             }
+-      if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.ttf")) {
++      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz.ttf")) {
+             fprintf(stderr, "Mscore: fatal error: cannot load internal font MuseJazz.ttf\n");
+             if (!debugMode)
+                   exit(-1);
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-21 12:50:24.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 16:05:43.000000000 -0400
 @@ -2,9 +2,9 @@
  <RCC version="1.0">
     <qresource>
@@ -32,26 +38,28 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
        <file>data/text_bold.svg</file>
        <file>data/text_italic.svg</file>
        <file>data/text_left.svg</file>
-@@ -29,11 +29,11 @@
+@@ -29,12 +29,12 @@
        <file>data/viewmag.xpm</file>
        <file>data/subscript.svg</file>
        <file>data/superscript.svg</file>
 -      <file alias="fonts/mscore-20.ttf">fonts/mscore-20.ttf</file>
 -      <file alias="fonts/mscore1-20.ttf">fonts/mscore1-20.ttf</file>
+-      <file>fonts/MuseJazz.ttf</file>
 -      <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
 +
 +
 +
++
        <file>data/splash.jpg</file>
--      <file alias="data/demo.msc">../demos/promenade.msc</file>
+-      <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 +
  
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-21 13:34:13.000000000 -0500
-@@ -122,7 +122,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 16:06:54.000000000 -0400
+@@ -129,7 +129,7 @@ void Preferences::init()
        bgUseColor         = true;
        fgUseColor         = false;
        bgWallpaper        = QString();
@@ -60,16 +68,16 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
        fgColor.setRgb(50, 50, 50);
        bgColor.setRgb(0x76, 0x76, 0x6e);
  
-@@ -163,7 +163,7 @@ void Preferences::init()
+@@ -169,7 +169,7 @@ void Preferences::init()
        layoutBreakColor         = Qt::green;
        antialiasedDrawing       = true;
        sessionStart             = SCORE_SESSION;
--      startScore               = ":/data/demo.msc";
-+      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc";
-       workingDirectory         = ".";
-       lastSaveDirectory        = ".";
-       lastSaveCopyDirectory    = ".";
-@@ -185,7 +185,7 @@ void Preferences::init()
+-      startScore               = ":/data/demo.mscx";
++      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx";
+       workingDirectory         = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+       showSplashScreen         = true;
+ 
+@@ -189,7 +189,7 @@ void Preferences::init()
  
        midiExpandRepeats        = true;
        playRepeats              = true;
@@ -78,13 +86,22 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
  
        alternateNoteEntryMethod = false;
        useMidiOutput            = false;
-@@ -403,8 +403,8 @@ void Preferences::read()
+@@ -328,7 +328,7 @@ void Preferences::read()
+       bgUseColor      = s.value("bgUseColor", true).toBool();
+       fgUseColor      = s.value("fgUseColor", false).toBool();
+       bgWallpaper     = s.value("bgWallpaper").toString();
+-      fgWallpaper     = s.value("fgWallpaper", ":/data/paper3.png").toString();
++      fgWallpaper     = s.value("fgWallpaper", INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png").toString();
+       fgColor         = s.value("fgColor", QColor(50,50,50)).value<QColor>();
+       bgColor         = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
+ 
+@@ -412,8 +412,8 @@ void Preferences::read()
        else if (ss == "empty")
              sessionStart = EMPTY_SESSION;
  
--      startScore     = s.value("startScore", ":/data/demo.msc").toString();
+-      startScore     = s.value("startScore", ":/data/demo.mscx").toString();
 -      instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
-+      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc").toString();
++      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
 +      instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
  
        s.beginGroup("PlayPanel");

mscore-use-default-soundfont.patch:
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-use-default-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-default-soundfont.patch	23 Mar 2009 23:19:47 -0000	1.1
+++ mscore-use-default-soundfont.patch	22 Aug 2009 01:23:50 -0000	1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
-             p = QString(getenv("DEFAULT_SOUNDFONT"));
-       if (p.isEmpty()) {
-             //
--            // fallback to integrated soundfont
-+            // fallback to default soundfont
-             //
--            p = ":/data/piano1.sf2";
-+            p = INSTPREFIX "/share/soundfonts/default.sf2";
-             }
-       bool rv = loadSoundFont(p);
-       if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
-       <file alias="data/demo.msc">../demos/promenade.msc</file>
+       <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 -      <file>data/piano1.sf2</file>
 +
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
        <file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+ 
        enableMidiInput    = true;
        playNotes          = true;
- 
--#ifdef USE_GLOBAL_FLUID
--      soundFont          = INSTPREFIX "/piano1.sf2";
--#else
 -      soundFont          = ":/data/piano1.sf2";
--#endif
 +      soundFont          = INSTPREFIX "/share/soundfonts/default.sf2";
  
        lPort              = "";
        rPort              = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--#ifdef USE_GLOBAL_FLUID
--      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
 -      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
 +      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/default.sf2").toString();
-+
        showNavigator   = s.value("showNavigator", true).toBool();
        showStatusBar   = s.value("showStatusBar", true).toBool();
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+                   p = QString(getenv("DEFAULT_SOUNDFONT"));
+             if (p.isEmpty()) {
+                   //
+-                  // fallback to integrated soundfont
++                  // fallback to default soundfont
+                   //
+-                  p = ":/data/piano1.sf2";
++                  p = INSTPREFIX "/share/soundfonts/default.sf2";
+                   }
+             if (debugMode)
+                   printf("load soundfont <%s>\n", qPrintable(p));

mscore-use-pclite-soundfont.patch:
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: mscore-use-pclite-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-use-pclite-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-pclite-soundfont.patch	12 Jun 2009 01:05:22 -0000	1.1
+++ mscore-use-pclite-soundfont.patch	22 Aug 2009 01:23:50 -0000	1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
-             p = QString(getenv("DEFAULT_SOUNDFONT"));
-       if (p.isEmpty()) {
-             //
--            // fallback to integrated soundfont
-+            // fallback to default soundfont
-             //
--            p = ":/data/piano1.sf2";
-+            p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
-             }
-       bool rv = loadSoundFont(p);
-       if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
-       <file alias="data/demo.msc">../demos/promenade.msc</file>
+       <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 -      <file>data/piano1.sf2</file>
 +
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
        <file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+ 
        enableMidiInput    = true;
        playNotes          = true;
- 
--#ifdef USE_GLOBAL_FLUID
--      soundFont          = INSTPREFIX "/piano1.sf2";
--#else
 -      soundFont          = ":/data/piano1.sf2";
--#endif
 +      soundFont          = INSTPREFIX "/share/soundfonts/PCLite.sf2";
  
        lPort              = "";
        rPort              = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--#ifdef USE_GLOBAL_FLUID
--      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
 -      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
 +      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/PCLite.sf2").toString();
-+
        showNavigator   = s.value("showNavigator", true).toBool();
        showStatusBar   = s.value("showStatusBar", true).toBool();
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+                   p = QString(getenv("DEFAULT_SOUNDFONT"));
+             if (p.isEmpty()) {
+                   //
+-                  // fallback to integrated soundfont
++                  // fallback to default soundfont
+                   //
+-                  p = ":/data/piano1.sf2";
++                  p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
+                   }
+             if (debugMode)
+                   printf("load soundfont <%s>\n", qPrintable(p));


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore.spec	12 Jun 2009 01:05:22 -0000	1.2
+++ mscore.spec	22 Aug 2009 01:23:50 -0000	1.3
@@ -8,8 +8,8 @@
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
-Version:       0.9.4
-Release:       4%{?dist}
+Version:       0.9.5
+Release:       1%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -18,11 +18,15 @@ Group:         Applications/Multimedia
 URL:           http://musescore.org/en
 # Upstream tarball contains a non-free soundfont "Gort's Minipiano"
 # We generate our own tarball by removing this soundfont via:
-#    wget http://downloads.sourceforge.net/mscore/mscore-0.9.4.tar.bz2
-#    tar jxf mscore-*.tar.bz2
+#    wget http://downloads.sourceforge.net/mscore/MuseScore-0.9.5.tar.bz2
+#    tar jxf MuseScore-*.tar.bz2
 #    rm -f mscore-*/mscore/mscore/data/piano1.sf2
-#    tar jcf mscore-0.9.4-free.tar.bz2 mscore-0.9.4/
+#    tar jcf mscore-0.9.5-free.tar.bz2 mscore-0.9.5/
 Source0:       %{name}-%{version}-free.tar.bz2
+# For building the jazz font
+Source1:       %{name}-ConvertFont.ff
+# For mime types
+Source2:       %{name}.xml
 # The upstream provides a stipped down version of AWL plugin for qtdesigner.
 # We don't really need to package this. The full version of AWL plugin
 # will be part of the upcoming muse2.
@@ -42,7 +46,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
@@ -58,6 +61,11 @@ BuildRequires: tex-cm-lgc
 BuildRequires: tetex-font-cm-lgc
 %endif
 
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} >= 12
+BuildRequires: libsndfile-devel >= 1.0.19
+%endif
+
 # fontpackages-1.21 has different behavior
 %if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
@@ -65,8 +73,8 @@ Requires:      %{name}-fonts = %{version
 Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
 %endif
 
-# Doxygen documentation is useless. Hence we don't build it for now.
-# Otherwise it needs:
+# Doxygen documentation is huge and it is for musescore development only. 
+# Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
 # On Fedora < 11 there is no default soundfont
@@ -76,7 +84,10 @@ Requires:      soundfont2-default
 Requires:      PersonalCopy-Lite-soundfont
 %endif
 
-Provides:      musescore = %{name}-%{version}
+# For scripting
+Requires:      qtscriptbindings
+
+Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
 MuseScore is a free cross platform WYSIWYG music notation program. Some
@@ -94,10 +105,11 @@ highlights:
 %package %{fontpackagename}
 Summary:       MuseScore fonts
 Group:         User Interface/X
-License:       GPL+ with exceptions
+License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
 %if "%{fontpackagename}" == "fonts"
-Obsoletes:     mscore-mscore-fonts < 0.9.4-4
+# Note: this line should be updated carefully on each update:
+Obsoletes:     mscore-mscore-fonts < 0.9.5-1
 Provides:      mscore-mscore-fonts = %{version}-%{release}
 %endif
 
@@ -124,12 +136,8 @@ rm mscore/rtf2html/rtf2html
 find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
 find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
 
-# Use global fluidsynth instead of the bundled one:
-sed -i 's|USE_GLOBAL_FLUID FALSE|USE_GLOBAL_FLUID TRUE|' %{name}/CMakeLists.txt
-
 # Do not build the bundled qt scripting interface:
-sed -i 's|BUILD_SCRIPT_INTERFACE TRUE|BUILD_SCRIPT_INTERFACE FALSE|' %{name}/CMakeLists.txt
-sed -i 's|BUILD_SCRIPT_DEBUG TRUE|BUILD_SCRIPT_DEBUG FALSE|' %{name}/CMakeLists.txt
+sed -i 's|scriptgen||' %{name}/CMakeLists.txt
 
 # Fix EOL encoding
 sed 's|\r||' %{name}/rtf2html/README > tmpfile
@@ -142,6 +150,17 @@ sed -i 's|relStaff %%d, %%d|relStaff %%d
 # Remove preshipped fonts. We will build them from source
 rm -f %{name}/%{name}/fonts/*.ttf
 
+# Fix GenericName
+sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
+
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} < 12
+sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
+%endif
+
+# Disable rpath
+sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
+
 %build
 # Build the actual program
 mkdir build
@@ -156,6 +175,7 @@ popd
 # Build fonts from source:
 pushd %{name}/%{name}/fonts
    ./genFont
+   fontforge %{SOURCE1} MuseJazz.sfd
 popd
 
 %install
@@ -166,13 +186,30 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_fontdir}
 install -pm 644 %{name}/%{name}/fonts/%{fontfamilyname}*.ttf %{buildroot}/%{_fontdir}
 
+# Mime type
+mkdir -p %{buildroot}/%{_datadir}/mime/packages
+install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/mime/packages/
+
 # Desktop file
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-install \
+   --dir=%{buildroot}/%{_datadir}/applications \
+   --add-category="X-Notation" \
+   --remove-category="Sequencer" \
+   --remove-category="AudioVideoEditing" \
+   --add-mime-type="audio/midi" \
+   --add-mime-type="text/x-lilypond" \
+   --add-mime-type="application/xml" \
+   %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Move images to the freedesktop location
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/apps/
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/mimetypes/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
+   %{buildroot}/%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-musescore.xpm
 mv %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
    %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
+   %{buildroot}/%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-musescore.png
 mv %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
    %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
 
@@ -196,19 +233,24 @@ pushd %{name}
 popd
 
 %check
-# The tests seem outdated. Skipping.
+# iotest seems outdated. Skipping.
+# rendertest needs the X server. Skipping.
 
 %clean
 rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /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-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -221,6 +263,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/%{name}%{?majorver}
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
 # fontpackages-1.21 has different behavior
@@ -231,6 +274,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %endif
 
 %changelog
+* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
+- Update to 0.9.5
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-6
+- Update the .desktop file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-4
 - Font package cleanup for F-12 (RHBZ#493463)
 - One specfile for all releases


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Mar 2009 23:19:47 -0000	1.2
+++ sources	22 Aug 2009 01:23:50 -0000	1.3
@@ -1 +1 @@
-69dd95b38a848b4f4ce4a4c47a7030ea  mscore-0.9.4-free.tar.bz2
+389c64a782e41376eaa541d5cc47e400  mscore-0.9.5-free.tar.bz2



From oget at fedoraproject.org  Sat Aug 22 01:24:11 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 22 Aug 2009 01:24:11 +0000 (UTC)
Subject: rpms/mscore/F-10 mscore-ConvertFont.ff, NONE, 1.1 mscore.xml, NONE, 
	1.1 .cvsignore, 1.2, 1.3 mscore-separate-commonfiles.patch, 1.1,
	1.2 mscore-use-default-soundfont.patch, 1.1,
	1.2 mscore-use-pclite-soundfont.patch, 1.1, 1.2 mscore.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090822012411.DF5C911C00D7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18565

Modified Files:
	.cvsignore mscore-separate-commonfiles.patch 
	mscore-use-default-soundfont.patch 
	mscore-use-pclite-soundfont.patch mscore.spec sources 
Added Files:
	mscore-ConvertFont.ff mscore.xml 
Log Message:
* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
- Update to 0.9.5



--- NEW FILE mscore-ConvertFont.ff ---
#!/usr/bin/fontforge
if ($argc > 1)
    i = 1;
    while ( i < $argc )
	Open($argv[i])
	ttfile = "mscore-" + $fontname + ".ttf"
	Print("Converting ",ttfile)
	Generate(ttfile,"ttf")
	Close()
	i++
    endloop
else
    Print("Usage: $0 font.sfd [font.sfd ...]")
endif


--- NEW FILE mscore.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
	<mime-type type="application/x-musescore">
		<comment>MuseScore file</comment>
		<glob pattern="*.msc"/>
		<glob pattern="*.mscx"/>
		<glob pattern="*.mscz"/>
	</mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 01:45:04 -0000	1.2
+++ .cvsignore	22 Aug 2009 01:24:11 -0000	1.3
@@ -1 +1 @@
-mscore-0.9.4-free.tar.bz2
+mscore-0.9.5-free.tar.bz2

mscore-separate-commonfiles.patch:
 mscore.cpp      |    6 +++---
 mscore.qrc      |   16 ++++++++--------
 preferences.cpp |   12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

Index: mscore-separate-commonfiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/mscore-separate-commonfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-separate-commonfiles.patch	24 Mar 2009 01:45:04 -0000	1.1
+++ mscore-separate-commonfiles.patch	22 Aug 2009 01:24:11 -0000	1.2
@@ -1,10 +1,10 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/mscore.cpp
---- mscore-0.9.4.old/mscore/mscore/mscore.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.cpp	2009-02-21 13:10:15.000000000 -0500
-@@ -1576,12 +1576,12 @@ int main(int argc, char* argv[])
-       //
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.cpp mscore-0.9.5/mscore/mscore/mscore.cpp
+--- mscore-0.9.5.old/mscore/mscore/mscore.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.cpp	2009-08-21 16:05:43.000000000 -0400
+@@ -1559,17 +1559,17 @@ int main(int argc, char* argv[])
        //  load internal fonts
        //
+ 
 -      if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore-20.ttf")) {
 +      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-20.ttf")) {
              fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
@@ -16,9 +16,15 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
              fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
              if (!debugMode)
                    exit(-1);
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-21 13:06:05.000000000 -0500
+             }
+-      if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.ttf")) {
++      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz.ttf")) {
+             fprintf(stderr, "Mscore: fatal error: cannot load internal font MuseJazz.ttf\n");
+             if (!debugMode)
+                   exit(-1);
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-21 12:50:24.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 16:05:43.000000000 -0400
 @@ -2,9 +2,9 @@
  <RCC version="1.0">
     <qresource>
@@ -32,26 +38,28 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
        <file>data/text_bold.svg</file>
        <file>data/text_italic.svg</file>
        <file>data/text_left.svg</file>
-@@ -29,11 +29,11 @@
+@@ -29,12 +29,12 @@
        <file>data/viewmag.xpm</file>
        <file>data/subscript.svg</file>
        <file>data/superscript.svg</file>
 -      <file alias="fonts/mscore-20.ttf">fonts/mscore-20.ttf</file>
 -      <file alias="fonts/mscore1-20.ttf">fonts/mscore1-20.ttf</file>
+-      <file>fonts/MuseJazz.ttf</file>
 -      <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
 +
 +
 +
++
        <file>data/splash.jpg</file>
--      <file alias="data/demo.msc">../demos/promenade.msc</file>
+-      <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 +
  
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-21 13:34:13.000000000 -0500
-@@ -122,7 +122,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 16:06:54.000000000 -0400
+@@ -129,7 +129,7 @@ void Preferences::init()
        bgUseColor         = true;
        fgUseColor         = false;
        bgWallpaper        = QString();
@@ -60,16 +68,16 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
        fgColor.setRgb(50, 50, 50);
        bgColor.setRgb(0x76, 0x76, 0x6e);
  
-@@ -163,7 +163,7 @@ void Preferences::init()
+@@ -169,7 +169,7 @@ void Preferences::init()
        layoutBreakColor         = Qt::green;
        antialiasedDrawing       = true;
        sessionStart             = SCORE_SESSION;
--      startScore               = ":/data/demo.msc";
-+      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc";
-       workingDirectory         = ".";
-       lastSaveDirectory        = ".";
-       lastSaveCopyDirectory    = ".";
-@@ -185,7 +185,7 @@ void Preferences::init()
+-      startScore               = ":/data/demo.mscx";
++      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx";
+       workingDirectory         = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+       showSplashScreen         = true;
+ 
+@@ -189,7 +189,7 @@ void Preferences::init()
  
        midiExpandRepeats        = true;
        playRepeats              = true;
@@ -78,13 +86,22 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
  
        alternateNoteEntryMethod = false;
        useMidiOutput            = false;
-@@ -403,8 +403,8 @@ void Preferences::read()
+@@ -328,7 +328,7 @@ void Preferences::read()
+       bgUseColor      = s.value("bgUseColor", true).toBool();
+       fgUseColor      = s.value("fgUseColor", false).toBool();
+       bgWallpaper     = s.value("bgWallpaper").toString();
+-      fgWallpaper     = s.value("fgWallpaper", ":/data/paper3.png").toString();
++      fgWallpaper     = s.value("fgWallpaper", INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png").toString();
+       fgColor         = s.value("fgColor", QColor(50,50,50)).value<QColor>();
+       bgColor         = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
+ 
+@@ -412,8 +412,8 @@ void Preferences::read()
        else if (ss == "empty")
              sessionStart = EMPTY_SESSION;
  
--      startScore     = s.value("startScore", ":/data/demo.msc").toString();
+-      startScore     = s.value("startScore", ":/data/demo.mscx").toString();
 -      instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
-+      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc").toString();
++      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
 +      instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
  
        s.beginGroup("PlayPanel");

mscore-use-default-soundfont.patch:
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/mscore-use-default-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-default-soundfont.patch	12 Jun 2009 01:07:59 -0000	1.1
+++ mscore-use-default-soundfont.patch	22 Aug 2009 01:24:11 -0000	1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
-             p = QString(getenv("DEFAULT_SOUNDFONT"));
-       if (p.isEmpty()) {
-             //
--            // fallback to integrated soundfont
-+            // fallback to default soundfont
-             //
--            p = ":/data/piano1.sf2";
-+            p = INSTPREFIX "/share/soundfonts/default.sf2";
-             }
-       bool rv = loadSoundFont(p);
-       if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
-       <file alias="data/demo.msc">../demos/promenade.msc</file>
+       <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 -      <file>data/piano1.sf2</file>
 +
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
        <file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+ 
        enableMidiInput    = true;
        playNotes          = true;
- 
--#ifdef USE_GLOBAL_FLUID
--      soundFont          = INSTPREFIX "/piano1.sf2";
--#else
 -      soundFont          = ":/data/piano1.sf2";
--#endif
 +      soundFont          = INSTPREFIX "/share/soundfonts/default.sf2";
  
        lPort              = "";
        rPort              = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--#ifdef USE_GLOBAL_FLUID
--      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
 -      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
 +      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/default.sf2").toString();
-+
        showNavigator   = s.value("showNavigator", true).toBool();
        showStatusBar   = s.value("showStatusBar", true).toBool();
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+                   p = QString(getenv("DEFAULT_SOUNDFONT"));
+             if (p.isEmpty()) {
+                   //
+-                  // fallback to integrated soundfont
++                  // fallback to default soundfont
+                   //
+-                  p = ":/data/piano1.sf2";
++                  p = INSTPREFIX "/share/soundfonts/default.sf2";
+                   }
+             if (debugMode)
+                   printf("load soundfont <%s>\n", qPrintable(p));

mscore-use-pclite-soundfont.patch:
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: mscore-use-pclite-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/mscore-use-pclite-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-pclite-soundfont.patch	24 Mar 2009 01:45:04 -0000	1.1
+++ mscore-use-pclite-soundfont.patch	22 Aug 2009 01:24:11 -0000	1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
-             p = QString(getenv("DEFAULT_SOUNDFONT"));
-       if (p.isEmpty()) {
-             //
--            // fallback to integrated soundfont
-+            // fallback to default soundfont
-             //
--            p = ":/data/piano1.sf2";
-+            p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
-             }
-       bool rv = loadSoundFont(p);
-       if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
-       <file alias="data/demo.msc">../demos/promenade.msc</file>
+       <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 -      <file>data/piano1.sf2</file>
 +
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
        <file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+ 
        enableMidiInput    = true;
        playNotes          = true;
- 
--#ifdef USE_GLOBAL_FLUID
--      soundFont          = INSTPREFIX "/piano1.sf2";
--#else
 -      soundFont          = ":/data/piano1.sf2";
--#endif
 +      soundFont          = INSTPREFIX "/share/soundfonts/PCLite.sf2";
  
        lPort              = "";
        rPort              = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--#ifdef USE_GLOBAL_FLUID
--      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
 -      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
 +      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/PCLite.sf2").toString();
-+
        showNavigator   = s.value("showNavigator", true).toBool();
        showStatusBar   = s.value("showStatusBar", true).toBool();
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+                   p = QString(getenv("DEFAULT_SOUNDFONT"));
+             if (p.isEmpty()) {
+                   //
+-                  // fallback to integrated soundfont
++                  // fallback to default soundfont
+                   //
+-                  p = ":/data/piano1.sf2";
++                  p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
+                   }
+             if (debugMode)
+                   printf("load soundfont <%s>\n", qPrintable(p));


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/mscore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mscore.spec	12 Jun 2009 01:07:59 -0000	1.3
+++ mscore.spec	22 Aug 2009 01:24:11 -0000	1.4
@@ -8,8 +8,8 @@
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
-Version:       0.9.4
-Release:       4%{?dist}
+Version:       0.9.5
+Release:       1%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -18,11 +18,15 @@ Group:         Applications/Multimedia
 URL:           http://musescore.org/en
 # Upstream tarball contains a non-free soundfont "Gort's Minipiano"
 # We generate our own tarball by removing this soundfont via:
-#    wget http://downloads.sourceforge.net/mscore/mscore-0.9.4.tar.bz2
-#    tar jxf mscore-*.tar.bz2
+#    wget http://downloads.sourceforge.net/mscore/MuseScore-0.9.5.tar.bz2
+#    tar jxf MuseScore-*.tar.bz2
 #    rm -f mscore-*/mscore/mscore/data/piano1.sf2
-#    tar jcf mscore-0.9.4-free.tar.bz2 mscore-0.9.4/
+#    tar jcf mscore-0.9.5-free.tar.bz2 mscore-0.9.5/
 Source0:       %{name}-%{version}-free.tar.bz2
+# For building the jazz font
+Source1:       %{name}-ConvertFont.ff
+# For mime types
+Source2:       %{name}.xml
 # The upstream provides a stipped down version of AWL plugin for qtdesigner.
 # We don't really need to package this. The full version of AWL plugin
 # will be part of the upcoming muse2.
@@ -42,7 +46,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
@@ -58,6 +61,11 @@ BuildRequires: tex-cm-lgc
 BuildRequires: tetex-font-cm-lgc
 %endif
 
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} >= 12
+BuildRequires: libsndfile-devel >= 1.0.19
+%endif
+
 # fontpackages-1.21 has different behavior
 %if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
@@ -65,8 +73,8 @@ Requires:      %{name}-fonts = %{version
 Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
 %endif
 
-# Doxygen documentation is useless. Hence we don't build it for now.
-# Otherwise it needs:
+# Doxygen documentation is huge and it is for musescore development only. 
+# Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
 # On Fedora < 11 there is no default soundfont
@@ -76,7 +84,10 @@ Requires:      soundfont2-default
 Requires:      PersonalCopy-Lite-soundfont
 %endif
 
-Provides:      musescore = %{name}-%{version}
+# For scripting
+Requires:      qtscriptbindings
+
+Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
 MuseScore is a free cross platform WYSIWYG music notation program. Some
@@ -94,10 +105,11 @@ highlights:
 %package %{fontpackagename}
 Summary:       MuseScore fonts
 Group:         User Interface/X
-License:       GPL+ with exceptions
+License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
 %if "%{fontpackagename}" == "fonts"
-Obsoletes:     mscore-mscore-fonts < 0.9.4-4
+# Note: this line should be updated carefully on each update:
+Obsoletes:     mscore-mscore-fonts < 0.9.5-1
 Provides:      mscore-mscore-fonts = %{version}-%{release}
 %endif
 
@@ -124,12 +136,8 @@ rm mscore/rtf2html/rtf2html
 find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
 find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
 
-# Use global fluidsynth instead of the bundled one:
-sed -i 's|USE_GLOBAL_FLUID FALSE|USE_GLOBAL_FLUID TRUE|' %{name}/CMakeLists.txt
-
 # Do not build the bundled qt scripting interface:
-sed -i 's|BUILD_SCRIPT_INTERFACE TRUE|BUILD_SCRIPT_INTERFACE FALSE|' %{name}/CMakeLists.txt
-sed -i 's|BUILD_SCRIPT_DEBUG TRUE|BUILD_SCRIPT_DEBUG FALSE|' %{name}/CMakeLists.txt
+sed -i 's|scriptgen||' %{name}/CMakeLists.txt
 
 # Fix EOL encoding
 sed 's|\r||' %{name}/rtf2html/README > tmpfile
@@ -142,6 +150,17 @@ sed -i 's|relStaff %%d, %%d|relStaff %%d
 # Remove preshipped fonts. We will build them from source
 rm -f %{name}/%{name}/fonts/*.ttf
 
+# Fix GenericName
+sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
+
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} < 12
+sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
+%endif
+
+# Disable rpath
+sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
+
 %build
 # Build the actual program
 mkdir build
@@ -156,6 +175,7 @@ popd
 # Build fonts from source:
 pushd %{name}/%{name}/fonts
    ./genFont
+   fontforge %{SOURCE1} MuseJazz.sfd
 popd
 
 %install
@@ -166,13 +186,30 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_fontdir}
 install -pm 644 %{name}/%{name}/fonts/%{fontfamilyname}*.ttf %{buildroot}/%{_fontdir}
 
+# Mime type
+mkdir -p %{buildroot}/%{_datadir}/mime/packages
+install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/mime/packages/
+
 # Desktop file
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-install \
+   --dir=%{buildroot}/%{_datadir}/applications \
+   --add-category="X-Notation" \
+   --remove-category="Sequencer" \
+   --remove-category="AudioVideoEditing" \
+   --add-mime-type="audio/midi" \
+   --add-mime-type="text/x-lilypond" \
+   --add-mime-type="application/xml" \
+   %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Move images to the freedesktop location
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/apps/
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/mimetypes/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
+   %{buildroot}/%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-musescore.xpm
 mv %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
    %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
+   %{buildroot}/%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-musescore.png
 mv %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
    %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
 
@@ -196,19 +233,24 @@ pushd %{name}
 popd
 
 %check
-# The tests seem outdated. Skipping.
+# iotest seems outdated. Skipping.
+# rendertest needs the X server. Skipping.
 
 %clean
 rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /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-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -221,6 +263,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/%{name}%{?majorver}
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
 # fontpackages-1.21 has different behavior
@@ -231,6 +274,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %endif
 
 %changelog
+* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
+- Update to 0.9.5
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-6
+- Update the .desktop file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-4
 - Font package cleanup for F-12 (RHBZ#493463)
 - One specfile for all releases


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Mar 2009 01:45:04 -0000	1.2
+++ sources	22 Aug 2009 01:24:11 -0000	1.3
@@ -1 +1 @@
-69dd95b38a848b4f4ce4a4c47a7030ea  mscore-0.9.4-free.tar.bz2
+389c64a782e41376eaa541d5cc47e400  mscore-0.9.5-free.tar.bz2



From oget at fedoraproject.org  Sat Aug 22 01:27:15 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 22 Aug 2009 01:27:15 +0000 (UTC)
Subject: rpms/mscore/devel mscore-ConvertFont.ff, NONE, 1.1 mscore.xml, NONE,
	1.1 .cvsignore, 1.2, 1.3 mscore-separate-commonfiles.patch, 1.1,
	1.2 mscore-use-default-soundfont.patch, 1.1,
	1.2 mscore-use-pclite-soundfont.patch, 1.1, 1.2 mscore.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090822012715.A782E11C00D7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mscore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19277

Modified Files:
	.cvsignore mscore-separate-commonfiles.patch 
	mscore-use-default-soundfont.patch 
	mscore-use-pclite-soundfont.patch mscore.spec sources 
Added Files:
	mscore-ConvertFont.ff mscore.xml 
Log Message:
* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
- Update to 0.9.5



--- NEW FILE mscore-ConvertFont.ff ---
#!/usr/bin/fontforge
if ($argc > 1)
    i = 1;
    while ( i < $argc )
	Open($argv[i])
	ttfile = "mscore-" + $fontname + ".ttf"
	Print("Converting ",ttfile)
	Generate(ttfile,"ttf")
	Close()
	i++
    endloop
else
    Print("Usage: $0 font.sfd [font.sfd ...]")
endif


--- NEW FILE mscore.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
	<mime-type type="application/x-musescore">
		<comment>MuseScore file</comment>
		<glob pattern="*.msc"/>
		<glob pattern="*.mscx"/>
		<glob pattern="*.mscz"/>
	</mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Mar 2009 23:19:46 -0000	1.2
+++ .cvsignore	22 Aug 2009 01:27:14 -0000	1.3
@@ -1 +1 @@
-mscore-0.9.4-free.tar.bz2
+mscore-0.9.5-free.tar.bz2

mscore-separate-commonfiles.patch:
 mscore.cpp      |    6 +++---
 mscore.qrc      |   16 ++++++++--------
 preferences.cpp |   12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

Index: mscore-separate-commonfiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore-separate-commonfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-separate-commonfiles.patch	23 Mar 2009 23:19:47 -0000	1.1
+++ mscore-separate-commonfiles.patch	22 Aug 2009 01:27:15 -0000	1.2
@@ -1,10 +1,10 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/mscore.cpp
---- mscore-0.9.4.old/mscore/mscore/mscore.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.cpp	2009-02-21 13:10:15.000000000 -0500
-@@ -1576,12 +1576,12 @@ int main(int argc, char* argv[])
-       //
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.cpp mscore-0.9.5/mscore/mscore/mscore.cpp
+--- mscore-0.9.5.old/mscore/mscore/mscore.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.cpp	2009-08-21 16:05:43.000000000 -0400
+@@ -1559,17 +1559,17 @@ int main(int argc, char* argv[])
        //  load internal fonts
        //
+ 
 -      if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore-20.ttf")) {
 +      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-20.ttf")) {
              fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
@@ -16,9 +16,15 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
              fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
              if (!debugMode)
                    exit(-1);
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-21 13:06:05.000000000 -0500
+             }
+-      if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.ttf")) {
++      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz.ttf")) {
+             fprintf(stderr, "Mscore: fatal error: cannot load internal font MuseJazz.ttf\n");
+             if (!debugMode)
+                   exit(-1);
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-21 12:50:24.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 16:05:43.000000000 -0400
 @@ -2,9 +2,9 @@
  <RCC version="1.0">
     <qresource>
@@ -32,26 +38,28 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
        <file>data/text_bold.svg</file>
        <file>data/text_italic.svg</file>
        <file>data/text_left.svg</file>
-@@ -29,11 +29,11 @@
+@@ -29,12 +29,12 @@
        <file>data/viewmag.xpm</file>
        <file>data/subscript.svg</file>
        <file>data/superscript.svg</file>
 -      <file alias="fonts/mscore-20.ttf">fonts/mscore-20.ttf</file>
 -      <file alias="fonts/mscore1-20.ttf">fonts/mscore1-20.ttf</file>
+-      <file>fonts/MuseJazz.ttf</file>
 -      <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
 +
 +
 +
++
        <file>data/splash.jpg</file>
--      <file alias="data/demo.msc">../demos/promenade.msc</file>
+-      <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 +
  
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-21 13:34:13.000000000 -0500
-@@ -122,7 +122,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 16:06:54.000000000 -0400
+@@ -129,7 +129,7 @@ void Preferences::init()
        bgUseColor         = true;
        fgUseColor         = false;
        bgWallpaper        = QString();
@@ -60,16 +68,16 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
        fgColor.setRgb(50, 50, 50);
        bgColor.setRgb(0x76, 0x76, 0x6e);
  
-@@ -163,7 +163,7 @@ void Preferences::init()
+@@ -169,7 +169,7 @@ void Preferences::init()
        layoutBreakColor         = Qt::green;
        antialiasedDrawing       = true;
        sessionStart             = SCORE_SESSION;
--      startScore               = ":/data/demo.msc";
-+      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc";
-       workingDirectory         = ".";
-       lastSaveDirectory        = ".";
-       lastSaveCopyDirectory    = ".";
-@@ -185,7 +185,7 @@ void Preferences::init()
+-      startScore               = ":/data/demo.mscx";
++      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx";
+       workingDirectory         = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+       showSplashScreen         = true;
+ 
+@@ -189,7 +189,7 @@ void Preferences::init()
  
        midiExpandRepeats        = true;
        playRepeats              = true;
@@ -78,13 +86,22 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
  
        alternateNoteEntryMethod = false;
        useMidiOutput            = false;
-@@ -403,8 +403,8 @@ void Preferences::read()
+@@ -328,7 +328,7 @@ void Preferences::read()
+       bgUseColor      = s.value("bgUseColor", true).toBool();
+       fgUseColor      = s.value("fgUseColor", false).toBool();
+       bgWallpaper     = s.value("bgWallpaper").toString();
+-      fgWallpaper     = s.value("fgWallpaper", ":/data/paper3.png").toString();
++      fgWallpaper     = s.value("fgWallpaper", INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png").toString();
+       fgColor         = s.value("fgColor", QColor(50,50,50)).value<QColor>();
+       bgColor         = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
+ 
+@@ -412,8 +412,8 @@ void Preferences::read()
        else if (ss == "empty")
              sessionStart = EMPTY_SESSION;
  
--      startScore     = s.value("startScore", ":/data/demo.msc").toString();
+-      startScore     = s.value("startScore", ":/data/demo.mscx").toString();
 -      instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
-+      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc").toString();
++      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
 +      instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
  
        s.beginGroup("PlayPanel");

mscore-use-default-soundfont.patch:
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore-use-default-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-default-soundfont.patch	23 Mar 2009 23:19:47 -0000	1.1
+++ mscore-use-default-soundfont.patch	22 Aug 2009 01:27:15 -0000	1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
-             p = QString(getenv("DEFAULT_SOUNDFONT"));
-       if (p.isEmpty()) {
-             //
--            // fallback to integrated soundfont
-+            // fallback to default soundfont
-             //
--            p = ":/data/piano1.sf2";
-+            p = INSTPREFIX "/share/soundfonts/default.sf2";
-             }
-       bool rv = loadSoundFont(p);
-       if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
-       <file alias="data/demo.msc">../demos/promenade.msc</file>
+       <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 -      <file>data/piano1.sf2</file>
 +
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
        <file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+ 
        enableMidiInput    = true;
        playNotes          = true;
- 
--#ifdef USE_GLOBAL_FLUID
--      soundFont          = INSTPREFIX "/piano1.sf2";
--#else
 -      soundFont          = ":/data/piano1.sf2";
--#endif
 +      soundFont          = INSTPREFIX "/share/soundfonts/default.sf2";
  
        lPort              = "";
        rPort              = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--#ifdef USE_GLOBAL_FLUID
--      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
 -      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
 +      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/default.sf2").toString();
-+
        showNavigator   = s.value("showNavigator", true).toBool();
        showStatusBar   = s.value("showStatusBar", true).toBool();
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+                   p = QString(getenv("DEFAULT_SOUNDFONT"));
+             if (p.isEmpty()) {
+                   //
+-                  // fallback to integrated soundfont
++                  // fallback to default soundfont
+                   //
+-                  p = ":/data/piano1.sf2";
++                  p = INSTPREFIX "/share/soundfonts/default.sf2";
+                   }
+             if (debugMode)
+                   printf("load soundfont <%s>\n", qPrintable(p));

mscore-use-pclite-soundfont.patch:
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: mscore-use-pclite-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore-use-pclite-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-pclite-soundfont.patch	12 Jun 2009 00:36:52 -0000	1.1
+++ mscore-use-pclite-soundfont.patch	22 Aug 2009 01:27:15 -0000	1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
-             p = QString(getenv("DEFAULT_SOUNDFONT"));
-       if (p.isEmpty()) {
-             //
--            // fallback to integrated soundfont
-+            // fallback to default soundfont
-             //
--            p = ":/data/piano1.sf2";
-+            p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
-             }
-       bool rv = loadSoundFont(p);
-       if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
-       <file alias="data/demo.msc">../demos/promenade.msc</file>
+       <file alias="data/demo.mscx">../demos/promenade.mscx</file>
 -      <file>data/piano1.sf2</file>
 +
        <file>data/speaker.svg</file>
        <file>data/midiin.svg</file>
        <file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+ 
        enableMidiInput    = true;
        playNotes          = true;
- 
--#ifdef USE_GLOBAL_FLUID
--      soundFont          = INSTPREFIX "/piano1.sf2";
--#else
 -      soundFont          = ":/data/piano1.sf2";
--#endif
 +      soundFont          = INSTPREFIX "/share/soundfonts/PCLite.sf2";
  
        lPort              = "";
        rPort              = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--#ifdef USE_GLOBAL_FLUID
--      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
 -      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
 +      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/PCLite.sf2").toString();
-+
        showNavigator   = s.value("showNavigator", true).toBool();
        showStatusBar   = s.value("showStatusBar", true).toBool();
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+                   p = QString(getenv("DEFAULT_SOUNDFONT"));
+             if (p.isEmpty()) {
+                   //
+-                  // fallback to integrated soundfont
++                  // fallback to default soundfont
+                   //
+-                  p = ":/data/piano1.sf2";
++                  p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
+                   }
+             if (debugMode)
+                   printf("load soundfont <%s>\n", qPrintable(p));


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mscore.spec	6 Aug 2009 04:03:47 -0000	1.4
+++ mscore.spec	22 Aug 2009 01:27:15 -0000	1.5
@@ -8,8 +8,8 @@
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
-Version:       0.9.4
-Release:       6%{?dist}
+Version:       0.9.5
+Release:       1%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -18,11 +18,15 @@ Group:         Applications/Multimedia
 URL:           http://musescore.org/en
 # Upstream tarball contains a non-free soundfont "Gort's Minipiano"
 # We generate our own tarball by removing this soundfont via:
-#    wget http://downloads.sourceforge.net/mscore/mscore-0.9.4.tar.bz2
-#    tar jxf mscore-*.tar.bz2
+#    wget http://downloads.sourceforge.net/mscore/MuseScore-0.9.5.tar.bz2
+#    tar jxf MuseScore-*.tar.bz2
 #    rm -f mscore-*/mscore/mscore/data/piano1.sf2
-#    tar jcf mscore-0.9.4-free.tar.bz2 mscore-0.9.4/
+#    tar jcf mscore-0.9.5-free.tar.bz2 mscore-0.9.5/
 Source0:       %{name}-%{version}-free.tar.bz2
+# For building the jazz font
+Source1:       %{name}-ConvertFont.ff
+# For mime types
+Source2:       %{name}.xml
 # The upstream provides a stipped down version of AWL plugin for qtdesigner.
 # We don't really need to package this. The full version of AWL plugin
 # will be part of the upcoming muse2.
@@ -42,7 +46,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
@@ -58,6 +61,11 @@ BuildRequires: tex-cm-lgc
 BuildRequires: tetex-font-cm-lgc
 %endif
 
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} >= 12
+BuildRequires: libsndfile-devel >= 1.0.19
+%endif
+
 # fontpackages-1.21 has different behavior
 %if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
@@ -65,8 +73,8 @@ Requires:      %{name}-fonts = %{version
 Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
 %endif
 
-# Doxygen documentation is useless. Hence we don't build it for now.
-# Otherwise it needs:
+# Doxygen documentation is huge and it is for musescore development only. 
+# Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
 # On Fedora < 11 there is no default soundfont
@@ -76,7 +84,10 @@ Requires:      soundfont2-default
 Requires:      PersonalCopy-Lite-soundfont
 %endif
 
-Provides:      musescore = %{name}-%{version}
+# For scripting
+Requires:      qtscriptbindings
+
+Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
 MuseScore is a free cross platform WYSIWYG music notation program. Some
@@ -94,10 +105,11 @@ highlights:
 %package %{fontpackagename}
 Summary:       MuseScore fonts
 Group:         User Interface/X
-License:       GPL+ with exceptions
+License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
 %if "%{fontpackagename}" == "fonts"
-Obsoletes:     mscore-mscore-fonts < 0.9.4-4
+# Note: this line should be updated carefully on each update:
+Obsoletes:     mscore-mscore-fonts < 0.9.5-1
 Provides:      mscore-mscore-fonts = %{version}-%{release}
 %endif
 
@@ -124,12 +136,8 @@ rm mscore/rtf2html/rtf2html
 find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
 find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
 
-# Use global fluidsynth instead of the bundled one:
-sed -i 's|USE_GLOBAL_FLUID FALSE|USE_GLOBAL_FLUID TRUE|' %{name}/CMakeLists.txt
-
 # Do not build the bundled qt scripting interface:
-sed -i 's|BUILD_SCRIPT_INTERFACE TRUE|BUILD_SCRIPT_INTERFACE FALSE|' %{name}/CMakeLists.txt
-sed -i 's|BUILD_SCRIPT_DEBUG TRUE|BUILD_SCRIPT_DEBUG FALSE|' %{name}/CMakeLists.txt
+sed -i 's|scriptgen||' %{name}/CMakeLists.txt
 
 # Fix EOL encoding
 sed 's|\r||' %{name}/rtf2html/README > tmpfile
@@ -145,6 +153,14 @@ rm -f %{name}/%{name}/fonts/*.ttf
 # Fix GenericName
 sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
 
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} < 12
+sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
+%endif
+
+# Disable rpath
+sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
+
 %build
 # Build the actual program
 mkdir build
@@ -159,6 +175,7 @@ popd
 # Build fonts from source:
 pushd %{name}/%{name}/fonts
    ./genFont
+   fontforge %{SOURCE1} MuseJazz.sfd
 popd
 
 %install
@@ -169,19 +186,30 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_fontdir}
 install -pm 644 %{name}/%{name}/fonts/%{fontfamilyname}*.ttf %{buildroot}/%{_fontdir}
 
+# Mime type
+mkdir -p %{buildroot}/%{_datadir}/mime/packages
+install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/mime/packages/
+
 # Desktop file
 desktop-file-install \
    --dir=%{buildroot}/%{_datadir}/applications \
-   --remove-category="Application" \
    --add-category="X-Notation" \
    --remove-category="Sequencer" \
    --remove-category="AudioVideoEditing" \
+   --add-mime-type="audio/midi" \
+   --add-mime-type="text/x-lilypond" \
+   --add-mime-type="application/xml" \
    %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Move images to the freedesktop location
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/apps/
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/mimetypes/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
+   %{buildroot}/%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-musescore.xpm
 mv %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
    %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
+   %{buildroot}/%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-musescore.png
 mv %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
    %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
 
@@ -205,19 +233,24 @@ pushd %{name}
 popd
 
 %check
-# The tests seem outdated. Skipping.
+# iotest seems outdated. Skipping.
+# rendertest needs the X server. Skipping.
 
 %clean
 rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /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-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -230,6 +263,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/%{name}%{?majorver}
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
 # fontpackages-1.21 has different behavior
@@ -240,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %endif
 
 %changelog
+* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
+- Update to 0.9.5
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-6
 - Update the .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Mar 2009 23:19:47 -0000	1.2
+++ sources	22 Aug 2009 01:27:15 -0000	1.3
@@ -1 +1 @@
-69dd95b38a848b4f4ce4a4c47a7030ea  mscore-0.9.4-free.tar.bz2
+389c64a782e41376eaa541d5cc47e400  mscore-0.9.5-free.tar.bz2



From mjakubicek at fedoraproject.org  Sat Aug 22 01:59:50 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 22 Aug 2009 01:59:50 +0000 (UTC)
Subject: rpms/html-xml-utils/devel .cvsignore, 1.4, 1.5 html-xml-utils.spec, 
	1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090822015950.6CA6211C00D7@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-serv25402

Modified Files:
	.cvsignore html-xml-utils.spec sources 
Log Message:
- Update to 5.5 (bugfix for self-URL references)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Jul 2009 08:27:50 -0000	1.4
+++ .cvsignore	22 Aug 2009 01:59:50 -0000	1.5
@@ -1 +1 @@
-html-xml-utils-5.4.tar.gz
+html-xml-utils-5.5.tar.gz


Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/devel/html-xml-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- html-xml-utils.spec	25 Jul 2009 02:14:43 -0000	1.9
+++ html-xml-utils.spec	22 Aug 2009 01:59:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           html-xml-utils
-Version:        5.4
-Release:        2%{?dist}
+Version:        5.5
+Release:        1%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
 Group:          Development/Tools
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-1
+- Update to 5.5 (bugfix for self-URL references)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Jul 2009 08:27:51 -0000	1.4
+++ sources	22 Aug 2009 01:59:50 -0000	1.5
@@ -1 +1 @@
-28917ddd90339ab8381f37158423892f  html-xml-utils-5.4.tar.gz
+28c58add86e35a60e602a029c8e2f04b  html-xml-utils-5.5.tar.gz



From mjakubicek at fedoraproject.org  Sat Aug 22 02:11:43 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 22 Aug 2009 02:11:43 +0000 (UTC)
Subject: rpms/html-xml-utils/F-11 html-xml-utils.spec, 1.8, 1.9 sources, 1.4,
	1.5
Message-ID: <20090822021143.631F511C00D7@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/html-xml-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27705

Modified Files:
	html-xml-utils.spec sources 
Log Message:
- Update to 5.5 (bugfix for self-URL references)




Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/F-11/html-xml-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- html-xml-utils.spec	19 Jul 2009 11:32:24 -0000	1.8
+++ html-xml-utils.spec	22 Aug 2009 02:11:43 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           html-xml-utils
-Version:        5.4
+Version:        5.5
 Release:        1%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-1
+- Update to 5.5 (bugfix for self-URL references)
+
 * Sun Jul 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.4-1
 - Update to 5.4 (bug in removal of /./ fixed. Now leaves one / instead of none).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Jul 2009 11:32:24 -0000	1.4
+++ sources	22 Aug 2009 02:11:43 -0000	1.5
@@ -1 +1 @@
-28917ddd90339ab8381f37158423892f  html-xml-utils-5.4.tar.gz
+28c58add86e35a60e602a029c8e2f04b  html-xml-utils-5.5.tar.gz



From mjakubicek at fedoraproject.org  Sat Aug 22 02:12:18 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 22 Aug 2009 02:12:18 +0000 (UTC)
Subject: rpms/html-xml-utils/F-10 html-xml-utils.spec, 1.6, 1.7 sources, 1.4,
	1.5
Message-ID: <20090822021218.264E611C00D7@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/html-xml-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27930

Modified Files:
	html-xml-utils.spec sources 
Log Message:
- Update to 5.5 (bugfix for self-URL references)




Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/F-10/html-xml-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- html-xml-utils.spec	19 Jul 2009 11:32:23 -0000	1.6
+++ html-xml-utils.spec	22 Aug 2009 02:12:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           html-xml-utils
-Version:        5.4
+Version:        5.5
 Release:        1%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-1
+- Update to 5.5 (bugfix for self-URL references)
+
 * Sun Jul 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.4-1
 - Update to 5.4 (bug in removal of /./ fixed. Now leaves one / instead of none).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Jul 2009 11:32:23 -0000	1.4
+++ sources	22 Aug 2009 02:12:18 -0000	1.5
@@ -1 +1 @@
-28917ddd90339ab8381f37158423892f  html-xml-utils-5.4.tar.gz
+28c58add86e35a60e602a029c8e2f04b  html-xml-utils-5.5.tar.gz



From cweyl at fedoraproject.org  Sat Aug 22 02:41:05 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 22 Aug 2009 02:41:05 +0000 (UTC)
Subject: rpms/perl-aliased/devel .cvsignore, 1.4, 1.5 perl-aliased.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090822024105.6899511C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1173

Modified Files:
	.cvsignore perl-aliased.spec sources 
Log Message:
* Sat Aug 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
- auto-update to 0.30 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 May 2008 06:15:07 -0000	1.4
+++ .cvsignore	22 Aug 2009 02:41:05 -0000	1.5
@@ -1 +1 @@
-aliased-0.22.tar.gz
+aliased-0.30.tar.gz


Index: perl-aliased.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/perl-aliased.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-aliased.spec	26 Jul 2009 17:43:55 -0000	1.7
+++ perl-aliased.spec	22 Aug 2009 02:41:05 -0000	1.8
@@ -1,23 +1,25 @@
 Name:           perl-aliased
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        Use shorter versions of class names
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/aliased/
-Source0:        http://www.cpan.org/authors/id/O/OV/OVID/aliased-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/O/OV/OVID/aliased-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Test::Pod::Coverage), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
+
 %description
 aliased is simple in concept but is a rather handy module. It loads the
 class you specify and exports into your namespace a subroutine that returns
 the class name. You can explicitly alias the class to another name or, if
 you prefer, you can do so implicitly. In the latter case, the name of the
-subroutine is the last part of the class name. 
+subroutine is the last part of the class name.
 
 %prep
 %setup -q -n aliased-%{version}
@@ -47,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
+- auto-update to 0.30 (by cpan-spec-update 0.01)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 May 2008 06:15:07 -0000	1.4
+++ sources	22 Aug 2009 02:41:05 -0000	1.5
@@ -1 +1 @@
-06cace025aa108fe4a9af3ae26bb297e  aliased-0.22.tar.gz
+8c2ee486901dae7d1c31e9a2d69c6c8f  aliased-0.30.tar.gz



From oget at fedoraproject.org  Sat Aug 22 02:45:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 22 Aug 2009 02:45:54 +0000 (UTC)
Subject: rpms/deco-archive/F-11 .cvsignore, 1.4, 1.5 deco-archive.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090822024554.8544411C00D7@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1995

Modified Files:
	.cvsignore deco-archive.spec sources 
Log Message:
* Fri Jul 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5-1
- Version update. New extensions: deb, udeb, tar.xz, txz, xz
- Handle .lzma via xz-lzma-compat from now on



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jan 2009 02:00:40 -0000	1.4
+++ .cvsignore	22 Aug 2009 02:45:54 -0000	1.5
@@ -1 +1 @@
-deco-archive-1.4.tar.gz
+deco-archive-1.5.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-11/deco-archive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- deco-archive.spec	5 Apr 2009 01:39:40 -0000	1.5
+++ deco-archive.spec	22 Aug 2009 02:45:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           deco-archive
-Version:        1.4
-Release:        3%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -64,8 +64,6 @@ rm -rf %{buildroot}
 %define do_triggerin() for i in %1; do (if [ ! -e %{_var}/lib/deco/$i ]; then ln -s ../../..%{_datadir}/%{name}/"$i" %{_var}/lib/deco/ || : ; fi); done;
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
-# Not handled (yet?):
-# dpkg-deb (deb,udeb)
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -102,6 +100,11 @@ rm -rf %{buildroot}
 %triggerun -- cabextract
 %do_triggerun cab
 
+%triggerin -- dpkg
+%do_triggerin {deb,udeb}
+%triggerun -- dpkg
+%do_triggerun {deb,udeb}
+
 %triggerin -- unrar
 %do_triggerin {cbr,"rar|[rst][0-9]{2}","part[0-9]+\.rar"}
 %triggerun -- unrar
@@ -132,9 +135,9 @@ rm -rf %{buildroot}
 %triggerun -- lzip
 %do_triggerun {lz,"tar\.lz"}
 
-%triggerin -- lzma
+%triggerin -- xz-lzma-compat
 %do_triggerin {lzma,"tar\.lzma",tlz}
-%triggerun -- lzma
+%triggerun -- xz-lzma-compat
 %do_triggerun {lzma,"tar\.lzma",tlz}
 
 %triggerin -- lzop
@@ -142,6 +145,11 @@ rm -rf %{buildroot}
 %triggerun -- lzop
 %do_triggerun lzo
 
+%triggerin -- xz
+%do_triggerin {"tar\.xz",txz,xz}
+%triggerun -- xz
+%do_triggerun {"tar\.xz",txz,xz}
+
 %triggerin -- rzip
 %do_triggerin {rz,"tar\.rz"}
 %triggerun -- rzip
@@ -163,6 +171,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jul 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5-1
+- Version update. New extensions: deb, udeb, tar.xz, txz, xz
+- Handle .lzma via xz-lzma-compat from now on
+
 * Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-3
 - Handle .zoo format with unzoo (if installed)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jan 2009 02:00:40 -0000	1.4
+++ sources	22 Aug 2009 02:45:54 -0000	1.5
@@ -1 +1 @@
-b48cd159fb73a65a4d6e491351c2e57e  deco-archive-1.4.tar.gz
+e49e1066c5376132acdebe3f2e9d2d84  deco-archive-1.5.tar.gz



From oget at fedoraproject.org  Sat Aug 22 02:50:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 22 Aug 2009 02:50:10 +0000 (UTC)
Subject: rpms/deco-archive/F-10 .cvsignore, 1.4, 1.5 deco-archive.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090822025010.62A0511C0417@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3297

Modified Files:
	.cvsignore deco-archive.spec sources 
Log Message:
* Fri Jul 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5-1
- Version update. New extensions: deb, udeb, tar.xz, txz, xz
- Handle .lzma via xz-lzma-compat from now on



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jan 2009 02:09:36 -0000	1.4
+++ .cvsignore	22 Aug 2009 02:50:09 -0000	1.5
@@ -1 +1 @@
-deco-archive-1.4.tar.gz
+deco-archive-1.5.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/deco-archive.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- deco-archive.spec	5 Apr 2009 01:43:11 -0000	1.5
+++ deco-archive.spec	22 Aug 2009 02:50:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           deco-archive
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -64,8 +64,6 @@ rm -rf %{buildroot}
 %define do_triggerin() for i in %1; do (if [ ! -e %{_var}/lib/deco/$i ]; then ln -s ../../..%{_datadir}/%{name}/"$i" %{_var}/lib/deco/ || : ; fi); done;
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
-# Not handled (yet?):
-# dpkg-deb (deb,udeb)
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -102,6 +100,11 @@ rm -rf %{buildroot}
 %triggerun -- cabextract
 %do_triggerun cab
 
+%triggerin -- dpkg
+%do_triggerin {deb,udeb}
+%triggerun -- dpkg
+%do_triggerun {deb,udeb}
+
 %triggerin -- unrar
 %do_triggerin {cbr,"rar|[rst][0-9]{2}","part[0-9]+\.rar"}
 %triggerun -- unrar
@@ -132,9 +135,9 @@ rm -rf %{buildroot}
 %triggerun -- lzip
 %do_triggerun {lz,"tar\.lz"}
 
-%triggerin -- lzma
+%triggerin -- xz-lzma-compat
 %do_triggerin {lzma,"tar\.lzma",tlz}
-%triggerun -- lzma
+%triggerun -- xz-lzma-compat
 %do_triggerun {lzma,"tar\.lzma",tlz}
 
 %triggerin -- lzop
@@ -142,6 +145,11 @@ rm -rf %{buildroot}
 %triggerun -- lzop
 %do_triggerun lzo
 
+%triggerin -- xz
+%do_triggerin {"tar\.xz",txz,xz}
+%triggerun -- xz
+%do_triggerun {"tar\.xz",txz,xz}
+
 %triggerin -- rzip
 %do_triggerin {rz,"tar\.rz"}
 %triggerun -- rzip
@@ -163,9 +171,16 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
-* Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-2
+* Fri Jul 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5-1
+- Version update. New extensions: deb, udeb, tar.xz, txz, xz
+- Handle .lzma via xz-lzma-compat from now on
+
+* Sat Apr 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-3
 - Handle .zoo format with unzoo (if installed)
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4-1
 - Version update. New extensions: gem and tbz2
 - Handle .shn format (shorten) with ffmpeg (if installed)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jan 2009 02:09:36 -0000	1.4
+++ sources	22 Aug 2009 02:50:10 -0000	1.5
@@ -1 +1 @@
-b48cd159fb73a65a4d6e491351c2e57e  deco-archive-1.4.tar.gz
+e49e1066c5376132acdebe3f2e9d2d84  deco-archive-1.5.tar.gz



From gouldwp at fedoraproject.org  Sat Aug 22 02:56:48 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Sat, 22 Aug 2009 02:56:48 +0000 (UTC)
Subject: rpms/netdisco/F-11 netdisco.init,1.1,1.2 netdisco.spec,1.1,1.2
Message-ID: <20090822025648.F383311C00D7@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4052

Modified Files:
	netdisco.init netdisco.spec 
Log Message:



Index: netdisco.init
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco.init	28 Jul 2009 05:27:19 -0000	1.1
+++ netdisco.init	22 Aug 2009 02:56:48 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # Startup script for the netdisco daemon
 #
-# chkconfig: - 345 95 5
+# chkconfig: 345 95 5
 # description: Startup/shutdown script for the Netdisco Admin Daemon
 # processname: netdisco
 # pidfile: /var/run/netdisco/netdisco.pid


Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netdisco.spec	28 Jul 2009 05:27:19 -0000	1.1
+++ netdisco.spec	22 Aug 2009 02:56:48 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           netdisco 
 Version:        0.95 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A web-based network management tool 
 License:        BSD
 Group:          Applications/Internet 
@@ -120,9 +120,7 @@ install -m0644 netdisco.pm %{buildroot}/
 
 
 %post
-if [ "$1" = "0" ]; then
    /sbin/chkconfig --add %{name}
-fi
 
 
 %preun
@@ -152,8 +150,9 @@ fi
  
 
 %changelog
-* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-2
+* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-3
 - Netdisco network management software.
+- Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section
 - Changed /usr/share/ to %%_datadir in the %%files section
 - Removed patches, substituted with find/perl/xargs replace lines 



From gouldwp at fedoraproject.org  Sat Aug 22 03:35:21 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Sat, 22 Aug 2009 03:35:21 +0000 (UTC)
Subject: rpms/netdisco/devel netdisco.spec,1.2,1.3
Message-ID: <20090822033521.1D8B611C00D7@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10210

Modified Files:
	netdisco.spec 
Log Message:



Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netdisco.spec	21 Aug 2009 23:04:15 -0000	1.2
+++ netdisco.spec	22 Aug 2009 03:35:20 -0000	1.3
@@ -150,7 +150,7 @@ fi
  
 
 %changelog
-* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-3
+* Fri Aug 21 2009 <gouldwp at fedoraproject.org> 0.95-3
 - Netdisco network management software.
 - Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section



From wtogami at fedoraproject.org  Sat Aug 22 03:44:03 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat, 22 Aug 2009 03:44:03 +0000 (UTC)
Subject: rpms/gramps/devel .cvsignore, 1.27, 1.28 gramps.spec, 1.47,
	1.48 sources, 1.27, 1.28
Message-ID: <20090822034403.2B5E711C00D7@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/gramps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11889

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	10 Mar 2009 13:09:12 -0000	1.27
+++ .cvsignore	22 Aug 2009 03:44:02 -0000	1.28
@@ -1 +1 @@
-gramps-3.1.1.tar.gz
+gramps-3.1.2.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gramps.spec	25 Jul 2009 01:24:06 -0000	1.47
+++ gramps.spec	22 Aug 2009 03:44:02 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        3.1.1
-Release:        4%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -122,6 +122,9 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Aug 21 2009 Warren Togami <wtogami at redhat.com> - 3.1.2-1
+- 3.1.2
+
 * Fri Jul 24 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/gramps/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	10 Mar 2009 13:09:12 -0000	1.27
+++ sources	22 Aug 2009 03:44:02 -0000	1.28
@@ -1 +1 @@
-c99ddec4a984989202e25c667fce9984  gramps-3.1.1.tar.gz
+c2e825a212524e78cae9ddbbcb96a302  gramps-3.1.2.tar.gz



From gouldwp at fedoraproject.org  Sat Aug 22 03:48:41 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Sat, 22 Aug 2009 03:48:41 +0000 (UTC)
Subject: rpms/netdisco/devel import.log,1.1,1.2 netdisco.spec,1.3,1.4
Message-ID: <20090822034841.59DB911C00D7@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12765/devel

Modified Files:
	import.log netdisco.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Jul 2009 05:21:19 -0000	1.1
+++ import.log	22 Aug 2009 03:48:41 -0000	1.2
@@ -1 +1,2 @@
 netdisco-0_95-2_fc11:HEAD:netdisco-0.95-2.fc11.src.rpm:1248740814
+netdisco-0_95-3_fc11:HEAD:netdisco-0.95-3.fc11.src.rpm:1250912874


Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/devel/netdisco.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netdisco.spec	22 Aug 2009 03:35:20 -0000	1.3
+++ netdisco.spec	22 Aug 2009 03:48:41 -0000	1.4
@@ -150,7 +150,7 @@ fi
  
 
 %changelog
-* Fri Aug 21 2009 <gouldwp at fedoraproject.org> 0.95-3
+* Sun Jul 26 2009 <gouldwp at fedoraproject.org> 0.95-3
 - Netdisco network management software.
 - Changed %%post section to work correctly with chkconfig
 - Changed %%defattr(-,root,root) to %%defattr(-,root,root,-) in files section



From mclasen at fedoraproject.org  Sat Aug 22 04:03:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 22 Aug 2009 04:03:53 +0000 (UTC)
Subject: rpms/notification-daemon/devel location.patch, NONE,
	1.1 notification-daemon.spec, 1.32, 1.33
Message-ID: <20090822040353.60D4511C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27033

Modified Files:
	notification-daemon.spec 
Added Files:
	location.patch 
Log Message:
Change location of stacked notifications


location.patch:
 notification-daemon.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE location.patch ---
diff -up notification-daemon-0.4.0/data/notification-daemon.schemas.in.position notification-daemon-0.4.0/data/notification-daemon.schemas.in
--- notification-daemon-0.4.0/data/notification-daemon.schemas.in.position	2009-08-21 23:59:46.831206308 -0400
+++ notification-daemon-0.4.0/data/notification-daemon.schemas.in	2009-08-22 00:00:15.556195107 -0400
@@ -6,7 +6,7 @@
    <applyto>/apps/notification-daemon/popup_location</applyto>
    <owner>notification-daemon</owner>
    <type>string</type>
-   <default>bottom_right</default>
+   <default>top_right</default>
    <locale name="C">
     <short>Popup location</short>
     <long>Default popup location on the workspace for stack notifications. Allowed values: &quot;top_left&quot;,&quot;top_right&quot;,&quot;bottom_left&quot; and &quot;bottom_right&quot;</long>


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- notification-daemon.spec	4 Aug 2009 04:25:21 -0000	1.32
+++ notification-daemon.spec	22 Aug 2009 04:03:53 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -38,6 +38,7 @@ Source0: http://www.galago-project.org/f
 # drop libsexy dep
 Patch0: sexy.patch
 Patch1: nodoka.patch
+Patch2: location.patch
 
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop
@@ -49,6 +50,7 @@ user's way.
 %setup -q
 %patch0 -p1 -b .sexy
 %patch1 -p1 -b .nodoka
+%patch2 -p1 -b .location
 
 autoreconf -i -f
 
@@ -109,6 +111,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-8
+- Change location for stacked notifications to top-right
+
 * Tue Aug  4 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-7
 - Fix the libsexy patch to make markup work again
 



From mclasen at fedoraproject.org  Sat Aug 22 04:23:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 22 Aug 2009 04:23:32 +0000 (UTC)
Subject: rpms/gnome-utils/devel dupe-id.patch, NONE, 1.1 gnome-utils.spec,
	1.197, 1.198
Message-ID: <20090822042332.D36DA11C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7845

Modified Files:
	gnome-utils.spec 
Added Files:
	dupe-id.patch 
Log Message:
Fix  a crash in gnome-dictionary


dupe-id.patch:
 gnome-dictionary-preferences.ui |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dupe-id.patch ---
diff -up gnome-utils-2.27.2/gnome-dictionary/data/gnome-dictionary-preferences.ui.dupe-id gnome-utils-2.27.2/gnome-dictionary/data/gnome-dictionary-preferences.ui
--- gnome-utils-2.27.2/gnome-dictionary/data/gnome-dictionary-preferences.ui.dupe-id	2009-08-22 00:18:26.834444654 -0400
+++ gnome-utils-2.27.2/gnome-dictionary/data/gnome-dictionary-preferences.ui	2009-08-22 00:18:39.739443828 -0400
@@ -116,7 +116,7 @@
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkLabel" id="label15">
+          <object class="GtkLabel" id="label18">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Source</property>
             <property name="use_underline">False</property>


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- gnome-utils.spec	1 Aug 2009 01:21:54 -0000	1.197
+++ gnome-utils.spec	22 Aug 2009 04:23:32 -0000	1.198
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.27.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -19,6 +19,9 @@ URL: 	        http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gnome-utils/2.27/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}
@@ -78,6 +81,7 @@ view various system log files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dupe-id
 
 # Hide from menus
 pushd gsearchtool
@@ -303,6 +307,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.2-6
+- Fix a crash in gnome-dictionary
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.2-5
 - Fix a typo
 



From mclasen at fedoraproject.org  Sat Aug 22 05:08:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 22 Aug 2009 05:08:13 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.365,1.366
Message-ID: <20090822050813.A95D111C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16840

Modified Files:
	gnome-panel.spec 
Log Message:
apply clear-recent patch



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -p -r1.365 -r1.366
--- gnome-panel.spec	13 Aug 2009 18:26:38 -0000	1.365
+++ gnome-panel.spec	22 Aug 2009 05:08:13 -0000	1.366
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.27.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -172,6 +172,7 @@ Panel Applets using the libpanel-applet 
 %patch42 -p1 -b .polkit1
 %patch45 -p1 -b .panel-icons
 %patch46 -p1 -b .fix-monitor
+%patch47 -p1 -b .recent-icon
 
 . %{SOURCE6}
 
@@ -370,6 +371,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-9
+- Actually apply the 'clear recent' patch
+
 * Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-8
 - Stricter clock-applet PolicyKit policy
 



From phuang at fedoraproject.org  Sat Aug 22 05:09:22 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 22 Aug 2009 05:09:22 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, 1.3, 1.4 ibus-qt.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090822050922.E65E811C0417@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17152

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20090822 to fix compose key problem


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 06:26:19 -0000	1.3
+++ .cvsignore	22 Aug 2009 05:09:22 -0000	1.4
@@ -1 +1 @@
-ibus-qt-1.2.0.20090821-Source.tar.gz
+ibus-qt-1.2.0.20090822-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ibus-qt.spec	21 Aug 2009 06:33:55 -0000	1.4
+++ ibus-qt.spec	22 Aug 2009 05:09:22 -0000	1.5
@@ -1,5 +1,5 @@
 Name:       ibus-qt
-Version:    1.2.0.20090821
+Version:    1.2.0.20090822
 Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
@@ -64,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibus-qt.so
 
 %changelog
-* Fri Aug 21 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090821-1
-- Update to 1.2.0.2009821
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 06:26:20 -0000	1.3
+++ sources	22 Aug 2009 05:09:22 -0000	1.4
@@ -1 +1 @@
-6a491b8002d8ab21390ce7a3c0029c69  ibus-qt-1.2.0.20090821-Source.tar.gz
+f679d7776bde25b149e50f529543b12b  ibus-qt-1.2.0.20090822-Source.tar.gz



From phuang at fedoraproject.org  Sat Aug 22 05:24:18 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 22 Aug 2009 05:24:18 +0000 (UTC)
Subject: rpms/ibus-qt/devel ibus-qt.spec,1.5,1.6
Message-ID: <20090822052418.E14A911C00A2@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20614

Modified Files:
	ibus-qt.spec 
Log Message:
Include header files in ibus-qt-devel


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ibus-qt.spec	22 Aug 2009 05:09:22 -0000	1.5
+++ ibus-qt.spec	22 Aug 2009 05:24:18 -0000	1.6
@@ -61,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%{_includedir}/*
 %{_libdir}/libibus-qt.so
 
 %changelog



From iarnell at fedoraproject.org  Sat Aug 22 06:56:36 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 22 Aug 2009 06:56:36 +0000 (UTC)
Subject: rpms/perl-Text-Textile/devel .cvsignore, 1.2,
	1.3 perl-Text-Textile.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090822065636.E6D3011C00A2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Text-Textile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7151

Modified Files:
	.cvsignore perl-Text-Textile.spec sources 
Log Message:
* Sat Aug 22 2009 Iain Arnell <iarnell at gmail.com> 2.12-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 May 2009 05:39:46 -0000	1.2
+++ .cvsignore	22 Aug 2009 06:56:35 -0000	1.3
@@ -1 +1 @@
-Text-Textile-2.03.tar.gz
+Text-Textile-2.12.tar.gz


Index: perl-Text-Textile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/perl-Text-Textile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Text-Textile.spec	26 Jul 2009 17:12:40 -0000	1.2
+++ perl-Text-Textile.spec	22 Aug 2009 06:56:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Text-Textile
-Version:        2.03
-Release:        2%{?dist}
+Version:        2.12
+Release:        1%{?dist}
 Summary:        A humane web text generator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 22 2009 Iain Arnell <iarnell at gmail.com> 2.12-1
+- update to latest upstream
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.03-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 May 2009 05:39:46 -0000	1.2
+++ sources	22 Aug 2009 06:56:35 -0000	1.3
@@ -1 +1 @@
-227cc4c97850b4f8448fa2d73c9c328a  Text-Textile-2.03.tar.gz
+2b4a3abc496f3c167b72fdd5549268a8  Text-Textile-2.12.tar.gz



From iarnell at fedoraproject.org  Sat Aug 22 07:03:48 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 22 Aug 2009 07:03:48 +0000 (UTC)
Subject: rpms/perl-Text-Textile/devel perl-Text-Textile.spec,1.3,1.4
Message-ID: <20090822070348.DBD2411C00A2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Text-Textile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8589

Modified Files:
	perl-Text-Textile.spec 
Log Message:
* Sat Aug 22 2009 Iain Arnell <iarnell at gmail.com> 2.12-2
- BR perl(Test::Pod)



Index: perl-Text-Textile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-Textile/devel/perl-Text-Textile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Text-Textile.spec	22 Aug 2009 06:56:35 -0000	1.3
+++ perl-Text-Textile.spec	22 Aug 2009 07:03:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Text-Textile
 Version:        2.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A humane web text generator
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,7 @@ BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(HTML::Entities)
 BuildRequires:  perl(Image::Size)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # undetected requirements
 Requires:       perl(File::Spec)
@@ -53,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 22 2009 Iain Arnell <iarnell at gmail.com> 2.12-2
+- BR perl(Test::Pod)
+
 * Sat Aug 22 2009 Iain Arnell <iarnell at gmail.com> 2.12-1
 - update to latest upstream
 



From pkgdb at fedoraproject.org  Sat Aug 22 07:28:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:28:57 +0000
Subject: [pkgdb] taglib had acl change status
Message-ID: <20090822072857.4532510F855@bastion2.fedora.phx.redhat.com>

mschwendt has set the approveacls acl on taglib (Fedora devel) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Sat Aug 22 07:37:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:37:31 +0000
Subject: [pkgdb] python-dialog: sundaram has requested watchcommits
Message-ID: <20090822073731.DCED310F84D@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on python-dialog (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 07:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:37:32 +0000
Subject: [pkgdb] python-dialog: sundaram has requested watchbugzilla
Message-ID: <20090822073732.55B7710F85C@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on python-dialog (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 07:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:37:35 +0000
Subject: [pkgdb] python-dialog: sundaram has requested approveacls
Message-ID: <20090822073735.C798210F88C@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on python-dialog (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 07:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:37:32 +0000
Subject: [pkgdb] python-dialog: sundaram has requested commit
Message-ID: <20090822073732.8AD8010F882@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on python-dialog (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 07:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:38:58 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090822073858.2AF5F10F84D@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 10 is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Sat Aug 22 07:39:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:39:05 +0000
Subject: [pkgdb] alltray ownership updated
Message-ID: <20090822073905.B503D10F855@bastion2.fedora.phx.redhat.com>

Package alltray in Fedora 11 is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/alltray



From mclasen at fedoraproject.org  Sat Aug 22 07:39:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 22 Aug 2009 07:39:41 +0000 (UTC)
Subject: rpms/cheese/devel trash-menu.patch,NONE,1.1 cheese.spec,1.59,1.60
Message-ID: <20090822073941.335A811C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15292

Modified Files:
	cheese.spec 
Added Files:
	trash-menu.patch 
Log Message:
Update menu sensitivity


trash-menu.patch:
 cheese-window.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

--- NEW FILE trash-menu.patch ---
--- cheese-2.27.90/src/cheese-window.c	2009-08-10 16:03:17.000000000 -0400
+++ hacked/src/cheese-window.c	2009-08-22 03:32:26.482193815 -0400
@@ -172,6 +172,7 @@
   GtkActionGroup *actions_burst;
   GtkActionGroup *actions_fullscreen;
   GtkActionGroup *actions_wide_mode;
+  GtkActionGroup *actions_trash;
 
   GtkUIManager *ui_manager;
 
@@ -559,6 +560,7 @@
 {
   g_object_unref (cheese_window->webcam);
   g_object_unref (cheese_window->actions_main);
+  g_object_unref (cheese_window->actions_trash);
   g_object_unref (cheese_window->actions_account_photo);
   g_object_unref (cheese_window->actions_countdown);
   g_object_unref (cheese_window->actions_effects);
@@ -1182,6 +1184,39 @@
   }
 }
 
+static void
+cheese_window_thumbnails_changed (GtkTreeModel *model,
+                                  CheeseWindow *cheese_window)
+{
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_get_iter_first (model, &iter))
+  {
+    gtk_action_group_set_sensitive (cheese_window->actions_trash, TRUE);
+  }
+  else
+  {
+    gtk_action_group_set_sensitive (cheese_window->actions_trash, FALSE);
+  }
+}
+
+static void
+cheese_window_thumbnail_inserted (GtkTreeModel *model,
+                                  GtkTreePath  *path,
+                                  GtkTreeIter  *iter,
+                                  CheeseWindow *cheese_window)
+{
+  cheese_window_thumbnails_changed (model, cheese_window);
+}
+
+static void
+cheese_window_thumbnail_deleted (GtkTreeModel *model,
+                                 GtkTreePath  *path,
+                                 CheeseWindow *cheese_window)
+{
+  cheese_window_thumbnails_changed (model, cheese_window);
+}
+
 static gboolean
 cheese_window_button_press_event_cb (GtkWidget *iconview, GdkEventButton *event,
                                      CheeseWindow *cheese_window)
@@ -1549,8 +1584,6 @@
   {"Cheese",       NULL,            N_("_Cheese")                       },
 
   {"Edit",         NULL,            N_("_Edit")                         },
-  {"RemoveAll",    NULL,            N_("Move All to Trash"), NULL, NULL,
-   G_CALLBACK (cheese_window_move_all_media_to_trash)},
 
   {"Help",         NULL,            N_("_Help")                         },
 
@@ -1560,6 +1593,11 @@
   {"About",        GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK (cheese_window_cmd_about)},
 };
 
+static const GtkActionEntry action_entries_trash[] = {
+  {"RemoveAll",    NULL,            N_("Move All to Trash"), NULL, NULL,
+   G_CALLBACK (cheese_window_move_all_media_to_trash)},
+};
+
 static const GtkToggleActionEntry action_entries_countdown[] = {
   {"Countdown", NULL, N_("Countdown"), NULL, NULL, G_CALLBACK (cheese_window_set_countdown), FALSE},
 };
@@ -1878,6 +1943,10 @@
                                                                 "ActionsMain",
                                                                 action_entries_main,
                                                                 G_N_ELEMENTS (action_entries_main));
+  cheese_window->actions_trash = cheese_window_action_group_new (cheese_window,
+                                                                 "ActionsTrash",
+                                                                 action_entries_trash,
+                                                                 G_N_ELEMENTS (action_entries_trash));
   cheese_window->actions_toggle = cheese_window_radio_action_group_new (cheese_window,
                                                                         "ActionsRadio",
                                                                         action_entries_toggle,
@@ -2041,6 +2110,13 @@
                     G_CALLBACK (cheese_window_selection_changed_cb), cheese_window);
   g_signal_connect (cheese_window->thumb_view, "button_press_event",
                     G_CALLBACK (cheese_window_button_press_event_cb), cheese_window);
+
+  g_signal_connect (gtk_icon_view_get_model (GTK_ICON_VIEW (cheese_window->thumb_view)), "row-inserted",
+                    G_CALLBACK (cheese_window_thumbnail_inserted), cheese_window);
+  g_signal_connect (gtk_icon_view_get_model (GTK_ICON_VIEW (cheese_window->thumb_view)), "row-deleted",
+                    G_CALLBACK (cheese_window_thumbnail_deleted), cheese_window);
+
+  cheese_window_thumbnails_changed (gtk_icon_view_get_model (GTK_ICON_VIEW (cheese_window->thumb_view)), cheese_window);
 }
 
 void


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- cheese.spec	14 Aug 2009 19:57:24 -0000	1.59
+++ cheese.spec	22 Aug 2009 07:39:39 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           cheese
 Version:        2.27.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
@@ -37,6 +37,9 @@ Requires(preun): GConf2
 #
 Patch0: fix-schemas.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592663
+Patch1: trash-menu.patch
+
 %description
 Cheese is a Photobooth-inspired GNOME application for taking pictures and
 videos from a webcam. It can also apply fancy graphical effects.
@@ -44,6 +47,7 @@ videos from a webcam. It can also apply 
 %prep
 %setup -q
 %patch0 -p1 -b .fix-schemas
+%patch1 -p1 -b .trash-menu
 
 %build
 %configure
@@ -126,6 +130,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.90-3
+- Update sensitivity of menu items
+
 * Fri Aug 14 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.90-2
 - Fix schemas file syntax
 



From pkgdb at fedoraproject.org  Sat Aug 22 07:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:40:19 +0000
Subject: [pkgdb] blobby ownership updated
Message-ID: <20090822074019.D437310F84D@bastion2.fedora.phx.redhat.com>

Package blobby in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/blobby



From pkgdb at fedoraproject.org  Sat Aug 22 07:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:41:12 +0000
Subject: [pkgdb] cryptopp ownership updated
Message-ID: <20090822074112.A78BF10F857@bastion2.fedora.phx.redhat.com>

Package cryptopp in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cryptopp



From pkgdb at fedoraproject.org  Sat Aug 22 07:42:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:42:19 +0000
Subject: [pkgdb] unrtf ownership updated
Message-ID: <20090822074219.D37D110F857@bastion2.fedora.phx.redhat.com>

Package unrtf in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/unrtf



From pkgdb at fedoraproject.org  Sat Aug 22 07:43:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:43:02 +0000
Subject: [pkgdb] wv ownership updated
Message-ID: <20090822074302.DCEDD10F84D@bastion2.fedora.phx.redhat.com>

Package wv in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/wv



From pkgdb at fedoraproject.org  Sat Aug 22 07:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 07:43:18 +0000
Subject: [pkgdb] xlhtml ownership updated
Message-ID: <20090822074318.D44B110F84D@bastion2.fedora.phx.redhat.com>

Package xlhtml in Fedora devel is now owned by sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xlhtml



From tmraz at fedoraproject.org  Sat Aug 22 07:44:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 07:44:17 +0000 (UTC)
Subject: rpms/parrot/devel parrot.spec,1.15,1.16
Message-ID: <20090822074417.C863411C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16242

Modified Files:
	parrot.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
- rebuilt with new openssl



Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- parrot.spec	21 Aug 2009 16:18:02 -0000	1.15
+++ parrot.spec	22 Aug 2009 07:44:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -287,6 +287,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
+- rebuilt with new openssl
+
+* Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
+- new upstream version
+
 * Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
 - ppc test included again
 - include the necessary module Parrot::OpLib::core



From pkgdb at fedoraproject.org  Sat Aug 22 09:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:02:03 +0000
Subject: [pkgdb] python-dialog had acl change status
Message-ID: <20090822090203.C0B0B10F84D@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchbugzilla acl on python-dialog (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:02:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:02:06 +0000
Subject: [pkgdb] python-dialog had acl change status
Message-ID: <20090822090206.243B110F85C@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchcommits acl on python-dialog (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:02:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:02:08 +0000
Subject: [pkgdb] python-dialog had acl change status
Message-ID: <20090822090208.C0A9F10F886@bastion2.fedora.phx.redhat.com>

mjakubicek has set the commit acl on python-dialog (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:02:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:02:10 +0000
Subject: [pkgdb] python-dialog had acl change status
Message-ID: <20090822090210.E51D510F88C@bastion2.fedora.phx.redhat.com>

mjakubicek has set the approveacls acl on python-dialog (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:30:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:30:40 +0000
Subject: [pkgdb] podsleuth ownership updated
Message-ID: <20090822093040.709E210F80B@bastion2.fedora.phx.redhat.com>

Package podsleuth in Fedora devel is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/podsleuth



From pkgdb at fedoraproject.org  Sat Aug 22 09:30:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:30:45 +0000
Subject: [pkgdb] podsleuth ownership updated
Message-ID: <20090822093046.10ADA10F854@bastion2.fedora.phx.redhat.com>

Package podsleuth in Fedora 10 is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/podsleuth



From pkgdb at fedoraproject.org  Sat Aug 22 09:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:30:52 +0000
Subject: [pkgdb] podsleuth ownership updated
Message-ID: <20090822093052.DD10610F80B@bastion2.fedora.phx.redhat.com>

Package podsleuth in Fedora 11 is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/podsleuth



From pkgdb at fedoraproject.org  Sat Aug 22 09:31:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:31:16 +0000
Subject: [pkgdb] ipod-sharp ownership updated
Message-ID: <20090822093116.780C710F854@bastion2.fedora.phx.redhat.com>

Package ipod-sharp in Fedora devel is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipod-sharp



From pkgdb at fedoraproject.org  Sat Aug 22 09:31:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:31:22 +0000
Subject: [pkgdb] ipod-sharp ownership updated
Message-ID: <20090822093122.5FBCE10F882@bastion2.fedora.phx.redhat.com>

Package ipod-sharp in Fedora 10 is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipod-sharp



From pkgdb at fedoraproject.org  Sat Aug 22 09:31:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:31:25 +0000
Subject: [pkgdb] ipod-sharp ownership updated
Message-ID: <20090822093125.6B55210F888@bastion2.fedora.phx.redhat.com>

Package ipod-sharp in Fedora 11 is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipod-sharp



From pkgdb at fedoraproject.org  Sat Aug 22 09:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:32:35 +0000
Subject: [pkgdb] python-dialog ownership updated
Message-ID: <20090822093235.C1D2910F854@bastion2.fedora.phx.redhat.com>

Package python-dialog in Fedora 11 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:32:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:32:36 +0000
Subject: [pkgdb] python-dialog ownership updated
Message-ID: <20090822093236.A793310F85C@bastion2.fedora.phx.redhat.com>

Package python-dialog in Fedora 10 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:17 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093417.5AF2410F854@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on agave (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:19 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093420.1276110F86F@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on agave (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:22 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093422.301B110F886@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on agave (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:25 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093425.60E6D10F895@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on agave (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:27 +0000
Subject: [pkgdb] agave ownership updated
Message-ID: <20090822093427.EB44110F899@bastion2.fedora.phx.redhat.com>

Package agave in Fedora 11 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:33 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093433.41A7710F89C@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on agave (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:36 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093436.20B4010F8A0@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on agave (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:38 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093438.3A4E910F8A3@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on agave (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:40 +0000
Subject: [pkgdb] agave had acl change status
Message-ID: <20090822093440.2233A10F8A8@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on agave (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:34:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:34:42 +0000
Subject: [pkgdb] agave ownership updated
Message-ID: <20090822093442.5B79A10F857@bastion2.fedora.phx.redhat.com>

Package agave in Fedora 10 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:09 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093609.78ED810F855@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on tiger (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:11 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093611.4DC1610F88B@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on tiger (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:10 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093610.679D510F86F@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on tiger (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:12 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093612.8E7CA10F895@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on tiger (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:14 +0000
Subject: [pkgdb] tiger ownership updated
Message-ID: <20090822093614.AF06C10F899@bastion2.fedora.phx.redhat.com>

Package tiger in Fedora 11 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:18 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093618.55E8710F889@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on tiger (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:21 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093621.26EC910F8A3@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on tiger (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:19 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093620.16C2B10F89F@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on tiger (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:22 +0000
Subject: [pkgdb] tiger had acl change status
Message-ID: <20090822093622.2D46810F855@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on tiger (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:23 +0000
Subject: [pkgdb] tiger ownership updated
Message-ID: <20090822093624.08C9310F8A8@bastion2.fedora.phx.redhat.com>

Package tiger in Fedora 10 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tiger



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:45 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093646.09A6B10F88B@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on stow (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:46 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093646.62CA010F897@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on stow (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:47 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093647.D0A2A10F8A9@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on stow (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:47 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093648.0D77910F8AF@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on stow (Fedora 11) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:49 +0000
Subject: [pkgdb] stow ownership updated
Message-ID: <20090822093650.063D010F8B4@bastion2.fedora.phx.redhat.com>

Package stow in Fedora 11 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:52 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093652.56A1810F8B9@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on stow (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:52 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093652.C27A710F8BD@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on stow (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:53 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093653.A2E1910F8C2@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on stow (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:54 +0000
Subject: [pkgdb] stow had acl change status
Message-ID: <20090822093654.D450E10F8C5@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on stow (Fedora 10) to Approved for bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:36:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:36:58 +0000
Subject: [pkgdb] stow ownership updated
Message-ID: <20090822093658.4A23B10F889@bastion2.fedora.phx.redhat.com>

Package stow in Fedora 10 is now owned by bonii

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stow



From pkgdb at fedoraproject.org  Sat Aug 22 09:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:37:16 +0000
Subject: [pkgdb] python-dialog ownership updated
Message-ID: <20090822093716.BEAEB10F8A0@bastion2.fedora.phx.redhat.com>

Package python-dialog in Fedora 10 is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:37:19 +0000
Subject: [pkgdb] python-dialog ownership updated
Message-ID: <20090822093719.BE72210F84D@bastion2.fedora.phx.redhat.com>

Package python-dialog in Fedora 11 is now owned by mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-dialog



From pkgdb at fedoraproject.org  Sat Aug 22 09:37:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:37:53 +0000
Subject: [pkgdb] ulogd ownership updated
Message-ID: <20090822093753.70D6610F88C@bastion2.fedora.phx.redhat.com>

Package ulogd in Fedora 11 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ulogd



From pkgdb at fedoraproject.org  Sat Aug 22 09:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:38:02 +0000
Subject: [pkgdb] ulogd ownership updated
Message-ID: <20090822093802.8989810F898@bastion2.fedora.phx.redhat.com>

Package ulogd in Fedora 10 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ulogd



From pkgdb at fedoraproject.org  Sat Aug 22 09:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:38:53 +0000
Subject: [pkgdb] qca2: abompard has requested watchbugzilla
Message-ID: <20090822093853.9B9B810F89F@bastion2.fedora.phx.redhat.com>

abompard has requested the watchbugzilla acl on qca2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:38:56 +0000
Subject: [pkgdb] qca2: abompard has requested watchcommits
Message-ID: <20090822093856.C99B610F8A9@bastion2.fedora.phx.redhat.com>

abompard has requested the watchcommits acl on qca2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:38:58 +0000
Subject: [pkgdb] qca2: abompard has requested commit
Message-ID: <20090822093858.B619510F854@bastion2.fedora.phx.redhat.com>

abompard has requested the commit acl on qca2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:39:59 +0000
Subject: [pkgdb] qca2: abompard has requested watchcommits
Message-ID: <20090822093959.8789C10F89F@bastion2.fedora.phx.redhat.com>

abompard has requested the watchcommits acl on qca2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:00 +0000
Subject: [pkgdb] qca2: abompard has requested commit
Message-ID: <20090822094000.D9A0D10F8A1@bastion2.fedora.phx.redhat.com>

abompard has requested the commit acl on qca2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:05 +0000
Subject: [pkgdb] qca2: abompard has requested watchbugzilla
Message-ID: <20090822094005.08CA810F854@bastion2.fedora.phx.redhat.com>

abompard has requested the watchbugzilla acl on qca2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:23 +0000
Subject: [pkgdb] qca2: abompard has requested watchcommits
Message-ID: <20090822094023.8514110F882@bastion2.fedora.phx.redhat.com>

abompard has requested the watchcommits acl on qca2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:22 +0000
Subject: [pkgdb] qca2: abompard has requested watchbugzilla
Message-ID: <20090822094022.E312710F857@bastion2.fedora.phx.redhat.com>

abompard has requested the watchbugzilla acl on qca2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:25 +0000
Subject: [pkgdb] qca2: abompard has requested commit
Message-ID: <20090822094025.18B1210F889@bastion2.fedora.phx.redhat.com>

abompard has requested the commit acl on qca2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:48 +0000
Subject: [pkgdb] qca2 ownership updated
Message-ID: <20090822094049.05AE810F854@bastion2.fedora.phx.redhat.com>

Package qca2 in Fedora 11 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 09:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:40:53 +0000
Subject: [pkgdb] qca2 ownership updated
Message-ID: <20090822094053.6D42610F89F@bastion2.fedora.phx.redhat.com>

Package qca2 in Fedora 10 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From dcantrel at fedoraproject.org  Sat Aug 22 09:42:11 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 22 Aug 2009 09:42:11 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.270,1.271
Message-ID: <20090822094211.64FA111C00A2@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6709

Modified Files:
	dhcp.spec 
Log Message:
* Fri Aug 21 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-6
- BR libcap-ng-devel (#517649)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- dhcp.spec	19 Aug 2009 01:14:35 -0000	1.270
+++ dhcp.spec	22 Aug 2009 09:42:11 -0000	1.271
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  5%{?dist}
+Release:  6%{?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.
@@ -62,6 +62,7 @@ BuildRequires: automake
 BuildRequires: groff
 BuildRequires: libtool
 BuildRequires: openldap-devel
+BuildRequires: libcap-ng-devel
 
 Requires(post): chkconfig
 Requires(post): coreutils
@@ -475,6 +476,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Aug 21 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-6
+- BR libcap-ng-devel (#517649)
+
 * Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-5
 - Drop unnecessary capabilities in dhclient (#517649)
 



From pkgdb at fedoraproject.org  Sat Aug 22 09:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:45:04 +0000
Subject: [pkgdb] xbindkeys ownership updated
Message-ID: <20090822094504.7504B10F857@bastion2.fedora.phx.redhat.com>

Package xbindkeys in Fedora 11 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xbindkeys



From pkgdb at fedoraproject.org  Sat Aug 22 09:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:45:05 +0000
Subject: [pkgdb] xbindkeys ownership updated
Message-ID: <20090822094505.85FC610F86F@bastion2.fedora.phx.redhat.com>

Package xbindkeys in Fedora 10 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xbindkeys



From pkgdb at fedoraproject.org  Sat Aug 22 09:46:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:46:30 +0000
Subject: [pkgdb] taglib had acl change status
Message-ID: <20090822094630.487FD10F855@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on taglib (Fedora 11) to Obsolete for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Sat Aug 22 09:46:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:46:33 +0000
Subject: [pkgdb] taglib had acl change status
Message-ID: <20090822094633.C37C910F86F@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on taglib (Fedora 11) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Sat Aug 22 09:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:46:36 +0000
Subject: [pkgdb] taglib had acl change status
Message-ID: <20090822094636.61BC310F85C@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on taglib (Fedora 10) to Approved for rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From phuang at fedoraproject.org  Sat Aug 22 09:49:34 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 22 Aug 2009 09:49:34 +0000 (UTC)
Subject: rpms/ibus-qt/devel ibus-qt.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090822094934.1283211C00A2@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8005

Modified Files:
	ibus-qt.spec sources 
Log Message:
Like qt immodule with libicu


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ibus-qt.spec	22 Aug 2009 05:24:18 -0000	1.6
+++ ibus-qt.spec	22 Aug 2009 09:49:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       ibus-qt
 Version:    1.2.0.20090822
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -65,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Aug 2009 05:09:22 -0000	1.4
+++ sources	22 Aug 2009 09:49:33 -0000	1.5
@@ -1 +1 @@
-f679d7776bde25b149e50f529543b12b  ibus-qt-1.2.0.20090822-Source.tar.gz
+15ec039e2a2f92a6c9075b6c10a2dc57  ibus-qt-1.2.0.20090822-Source.tar.gz



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:45 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095445.91D4510F855@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on libifp (Fedora 11) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:46 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095446.F271810F86F@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on libifp (Fedora 11) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:47 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095447.B0ED210F889@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on libifp (Fedora 11) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:48 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095449.0258610F890@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on libifp (Fedora 11) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:51 +0000
Subject: [pkgdb] libifp ownership updated
Message-ID: <20090822095451.7F55210F898@bastion2.fedora.phx.redhat.com>

Package libifp in Fedora 11 is now owned by konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:56 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095456.6CAEF10F89B@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on libifp (Fedora 10) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:55:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:55:00 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095500.1E92C10F8A5@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on libifp (Fedora 10) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:57 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095457.9C76C10F8A0@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on libifp (Fedora 10) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:54:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:54:58 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090822095458.AF38010F8A1@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on libifp (Fedora 10) to Approved for konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Sat Aug 22 09:55:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 09:55:03 +0000
Subject: [pkgdb] libifp ownership updated
Message-ID: <20090822095503.90DA210F8A9@bastion2.fedora.phx.redhat.com>

Package libifp in Fedora 10 is now owned by konradm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From tmraz at fedoraproject.org  Sat Aug 22 09:57:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 09:57:59 +0000 (UTC)
Subject: rpms/bes/devel bes.spec,1.17,1.18
Message-ID: <20090822095800.0011411C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9519

Modified Files:
	bes.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-3
- rebuilt with new openssl



Index: bes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bes/devel/bes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- bes.spec	21 Aug 2009 12:35:16 -0000	1.17
+++ bes.spec	22 Aug 2009 09:57:59 -0000	1.18
@@ -14,6 +14,7 @@ License:        LGPLv2+
 URL:            http://www.opendap.org/download/BES.html
 Source0:        http://www.opendap.org/pub/source/bes-%{version}.tar.gz
 Patch1:         bes-3.6.2-includes.patch
+Patch2:         bes-3.7.2-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@ Documentation of OPeNDAP BES.
 %prep
 %setup -q
 %patch1 -p1 -b .includes
+%patch2 -p1 -b .openssl
 chmod a-x dispatch/BESStreamResponseHandler*
 
 %build
@@ -156,7 +158,7 @@ exit 0
 %doc __distribution_docs/api-html/
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-3
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-3
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2



From tmraz at fedoraproject.org  Sat Aug 22 09:58:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 09:58:41 +0000 (UTC)
Subject: rpms/bes/devel bes-3.7.2-openssl.patch,NONE,1.1
Message-ID: <20090822095841.2515A11C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9714

Added Files:
	bes-3.7.2-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.7.2-3
- rebuilt with new openssl


bes-3.7.2-openssl.patch:
 SSLClient.cc |    4 ++++
 SSLServer.cc |    4 ++++
 2 files changed, 8 insertions(+)

--- NEW FILE bes-3.7.2-openssl.patch ---
diff -up bes-3.7.2/ppt/SSLClient.cc.openssl bes-3.7.2/ppt/SSLClient.cc
--- bes-3.7.2/ppt/SSLClient.cc.openssl	2009-03-12 22:30:41.000000000 +0100
+++ bes-3.7.2/ppt/SSLClient.cc	2009-08-22 11:56:21.000000000 +0200
@@ -79,7 +79,11 @@ SSLClient::initConnection()
     SSL_library_init() ;
     BESDEBUG( "ppt", "OK" << endl )
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
     SSL_METHOD *method = NULL ;
+#else
+    const SSL_METHOD *method = NULL ;
+#endif
     SSL_CTX *context = NULL ;
 
     BESDEBUG( "ppt", "Creating method and context ... " << endl )
diff -up bes-3.7.2/ppt/SSLServer.cc.openssl bes-3.7.2/ppt/SSLServer.cc
--- bes-3.7.2/ppt/SSLServer.cc.openssl	2009-03-10 03:46:41.000000000 +0100
+++ bes-3.7.2/ppt/SSLServer.cc	2009-08-22 11:54:08.000000000 +0200
@@ -83,7 +83,11 @@ SSLServer::initConnection()
     SSL_library_init() ;
     BESDEBUG( "ppt", "OK" << endl )
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
     SSL_METHOD *method = NULL ;
+#else
+    const SSL_METHOD *method = NULL ;
+#endif
     SSL_CTX *context = NULL ;
     BESDEBUG( "ppt", "Creating method and context ... " << endl )
     method = SSLv3_server_method() ;



From pkgdb at fedoraproject.org  Sat Aug 22 10:01:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 10:01:48 +0000
Subject: [pkgdb] xbindkeys ownership updated
Message-ID: <20090822100148.E4F8510F80B@bastion2.fedora.phx.redhat.com>

Package xbindkeys in Fedora 10 is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xbindkeys



From pkgdb at fedoraproject.org  Sat Aug 22 10:01:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 10:01:52 +0000
Subject: [pkgdb] xbindkeys ownership updated
Message-ID: <20090822100152.15B6610F854@bastion2.fedora.phx.redhat.com>

Package xbindkeys in Fedora 11 is now owned by chkr

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xbindkeys



From pkgdb at fedoraproject.org  Sat Aug 22 10:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 10:23:24 +0000
Subject: [pkgdb] gxine: sundaram has requested watchbugzilla
Message-ID: <20090822102324.E4B8010F84D@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on gxine (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From pkgdb at fedoraproject.org  Sat Aug 22 10:23:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 10:23:26 +0000
Subject: [pkgdb] gxine: sundaram has requested watchcommits
Message-ID: <20090822102326.9854910F85C@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on gxine (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From pkgdb at fedoraproject.org  Sat Aug 22 10:23:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 10:23:27 +0000
Subject: [pkgdb] gxine: sundaram has requested commit
Message-ID: <20090822102327.8B23810F888@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on gxine (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From pkgdb at fedoraproject.org  Sat Aug 22 10:23:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 10:23:31 +0000
Subject: [pkgdb] gxine: sundaram has requested approveacls
Message-ID: <20090822102331.6CC9A10F88C@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on gxine (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From mschwendt at fedoraproject.org  Sat Aug 22 10:41:50 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 22 Aug 2009 10:41:50 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.33,1.34
Message-ID: <20090822104150.18A6F11C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19011

Modified Files:
	taglib.spec 
Log Message:
* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
- Update descriptions (and mention the additional file formats).



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- taglib.spec	27 Jul 2009 05:29:32 -0000	1.33
+++ taglib.spec	22 Aug 2009 10:41:49 -0000	1.34
@@ -1,9 +1,9 @@
 
-# cvsadmin: http://bugzilla.redhat.com/418271
+# Fedora cvs admin requests for taglib: http://bugzilla.redhat.com/418271
 
 Name:       taglib	
 Version:    1.5
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,9 +30,10 @@ BuildRequires: zlib-devel
 
 %description
 TagLib is a library for reading and editing the meta-data of several
-popular audio formats. Currently it supports both ID3v1 and ID3v2 for
-MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
-FLAC files.
+popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3
+files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
+Speex, WavPack, TrueAudio files, as well as APE Tags.
+
 
 %package devel
 Summary: Development files for %{name} 
@@ -40,7 +41,7 @@ Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 %description devel
-%{summary}.
+Files needed when building software with %{name}.
 
 
 %prep
@@ -95,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
+- Update descriptions (and mention the additional file formats).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Sat Aug 22 10:42:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 22 Aug 2009 10:42:57 +0000 (UTC)
Subject: rpms/taglib/devel taglib-1.5-tests.patch, NONE, 1.1 taglib.spec,
	1.34, 1.35
Message-ID: <20090822104257.7064411C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19246

Modified Files:
	taglib.spec 
Added Files:
	taglib-1.5-tests.patch 
Log Message:
* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
- Add %check section and conditionally build with tests.


taglib-1.5-tests.patch:
 test_string.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE taglib-1.5-tests.patch ---
diff -Nur taglib-1.5-orig/tests/test_string.cpp taglib-1.5/tests/test_string.cpp
--- taglib-1.5-orig/tests/test_string.cpp	2008-01-26 11:57:06.000000000 +0100
+++ taglib-1.5/tests/test_string.cpp	2009-08-22 11:17:55.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <tstring.h>
+#include <cstring>
 
 using namespace std;
 using namespace TagLib;


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- taglib.spec	22 Aug 2009 10:41:49 -0000	1.34
+++ taglib.spec	22 Aug 2009 10:42:57 -0000	1.35
@@ -1,6 +1,12 @@
 
 # Fedora cvs admin requests for taglib: http://bugzilla.redhat.com/418271
 
+%bcond_without tests
+
+%if %{with tests}
+%global buildtests -DBUILD_TESTS=ON
+%endif
+
 Name:       taglib	
 Version:    1.5
 Release:    6%{?dist}
@@ -21,6 +27,8 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
+Patch3: taglib-1.5-tests.patch
+
 ## upstream patches
 Patch100: taglib-1.5-kde#161721.patch
 
@@ -47,16 +55,18 @@ Files needed when building software with
 %prep
 %setup -q -n taglib-%{version}%{?beta}
 
+# patch1 not applied
 ## omit for now
 %patch2 -p1 -b .multilib
 
+%patch3 -p1 -b .tests
 %patch100 -p1 -b .kde#161721.patch
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} %{?buildtests} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -72,6 +82,14 @@ rm -fr examples/Makefile*
 rm -f %{buildroot}%{_libdir}/lib*.la
 
 
+%if %{with tests}
+%check
+cp -a tests/data %{_target_platform}/tests
+cd %{_target_platform}
+make check
+%endif
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -97,6 +115,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
+- Add %%check section and conditionally build with tests.
 - Update descriptions (and mention the additional file formats).
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5



From mschwendt at fedoraproject.org  Sat Aug 22 10:44:21 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 22 Aug 2009 10:44:21 +0000 (UTC)
Subject: rpms/taglib/devel taglib-1.5-1.6-ape.patch, NONE,
	1.1 taglib-1.5-1.6-flac.patch, NONE,
	1.1 taglib-1.5-1.6-mpeg-cmake.patch, NONE,
	1.1 taglib-1.5-1.6-mpeg.patch, NONE,
	1.1 taglib-1.5-1.6-ogg.patch, NONE,
	1.1 taglib-1.5-1.6-toolkit.patch, NONE, 1.1 taglib.spec, 1.35,
	1.36 taglib-1.5-kde#161721.patch, 1.1, NONE
Message-ID: <20090822104421.3308411C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19525

Modified Files:
	taglib.spec 
Added Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
Removed Files:
	taglib-1.5-kde#161721.patch 
Log Message:
* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
- Cherry-pick bug-fix patches from 1.6 development (also replaces the
  old taglib-1.5-kde#161721.patch):
  * Fixed crash when saving a Locator APEv2 tag. (BUG:169810)
  * TagLib can now use FLAC padding block. (BUG:107659)
  * Fixed overflow while calculating bitrate of FLAC files with a very
    high bitrate.
  * XiphComment::year() now falls back to YEAR if DATE doesn't exist
    and XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
    exist. (BUG:144396)
  * Fixed a bug in ByteVectorList::split().
  * Fixed a possible crash in the non-const version of String::operator[]
    and in String::operator+=. (BUG:169389)
  * ID3v2.2 frames are now not incorrectly saved. (BUG:176373)
  * Support for ID3v2.2 PIC frames. (BUG:167786)
  * Improved ID3v2.3 genre parsing. (BUG:188578)
  * Better checking of corrupted ID3v2 APIC data. (BUG:168382)
  * Bitrate calculating using the Xing header now uses floating point
    numbers. (BUG:172556)
  * Added support for PRIV ID3v2 frames.
  * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
  * Added support for the POPM (rating/playcount) ID3v2 frame.
  * Fixed crash on handling unsupported ID3v2 frames, e.g. on encrypted
    frames. (BUG:161721)


taglib-1.5-1.6-ape.patch:
 apeitem.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE taglib-1.5-1.6-ape.patch ---
diff -Nur taglib-1.5/taglib/ape/apeitem.cpp taglib/taglib/ape/apeitem.cpp
--- taglib-1.5/taglib/ape/apeitem.cpp	2008-02-12 17:30:25.000000000 +0100
+++ taglib/taglib/ape/apeitem.cpp	2009-01-11 00:15:33.000000000 +0100
@@ -160,14 +160,14 @@
 bool APE::Item::isEmpty() const
 {
   switch(d->type) {
-    case 0:
-    case 1:
+    case Text:
+    case Binary:
       if(d->text.isEmpty())
         return true;
       if(d->text.size() == 1 && d->text.front().isEmpty())
         return true;
       return false;
-    case 2:
+    case Locator:
       return d->value.isEmpty();
     default:
       return false;
@@ -206,8 +206,9 @@
   if(isEmpty())
     return data;
 
-  if(d->type != Item::Binary) {
+  if(d->type == Text) {
     StringList::ConstIterator it = d->text.begin();
+
     value.append(it->data(String::UTF8));
     it++;
     for(; it != d->text.end(); ++it) {

taglib-1.5-1.6-flac.patch:
 flacfile.cpp       |   83 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 flacfile.h         |    1 
 flacproperties.cpp |    2 -
 3 files changed, 78 insertions(+), 8 deletions(-)

--- NEW FILE taglib-1.5-1.6-flac.patch ---
diff -Nur taglib-1.5/taglib/flac/flacfile.cpp taglib/taglib/flac/flacfile.cpp
--- taglib-1.5/taglib/flac/flacfile.cpp	2008-01-31 06:19:03.000000000 +0100
+++ taglib/taglib/flac/flacfile.cpp	2009-07-12 23:53:18.000000000 +0200
@@ -42,6 +42,7 @@
 {
   enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 };
   enum { StreamInfo = 0, Padding, Application, SeekTable, VorbisComment, CueSheet };
+  enum { MinPaddingLength = 4096 };
 }
 
 class FLAC::File::FilePrivate
@@ -167,9 +168,49 @@
       uint blockLength = header.mid(1, 3).toUInt();
 
       if(blockType == VorbisComment) {
-        data[0] = header[0];
-        insert(data, nextBlockOffset, blockLength + 4);
-        break;
+
+        long paddingBreak = 0;
+
+        if(!isLastBlock) {
+          paddingBreak = findPaddingBreak(nextBlockOffset + blockLength + 4,
+                                          nextBlockOffset + d->xiphCommentData.size() + 8,
+                                          &isLastBlock);
+        }
+
+        uint paddingLength = 0;
+
+         if(paddingBreak) {
+
+           // There is space for comment and padding blocks without rewriting the
+           // whole file.  Note: This cannot overflow.
+
+           paddingLength = paddingBreak - (nextBlockOffset + d->xiphCommentData.size() + 8);
+         }
+         else {
+
+           // Not enough space, so we will have to rewrite the whole file
+           // following this block
+
+           paddingLength = d->xiphCommentData.size();
+
+           if(paddingLength < MinPaddingLength)
+             paddingLength = MinPaddingLength;
+
+           paddingBreak = nextBlockOffset + blockLength + 4;
+         }
+
+         ByteVector padding = ByteVector::fromUInt(paddingLength);
+
+         padding[0] = 1;
+
+         if(isLastBlock)
+           padding[0] |= 0x80;
+
+         padding.resize(paddingLength + 4);
+         ByteVector pair(data);
+         pair.append(padding);
+         insert(pair, nextBlockOffset, paddingBreak - nextBlockOffset);
+         break;
       }
 
       nextBlockOffset += blockLength + 4;
@@ -373,11 +414,8 @@
     isLastBlock = (header[0] & 0x80) != 0;
     length = header.mid(1, 3).toUInt();
 
-    if(blockType == Padding) {
-      // debug("FLAC::File::scan() -- Padding found");
-    }
     // Found the vorbis-comment
-    else if(blockType == VorbisComment) {
+    if(blockType == VorbisComment) {
       d->xiphCommentData = readBlock(length);
       d->hasXiphComment = true;
     }
@@ -429,3 +467,34 @@
 
   return -1;
 }
+
+long FLAC::File::findPaddingBreak(long nextBlockOffset, long targetOffset, bool *isLast)
+{
+  // Starting from nextBlockOffset, step over padding blocks to find the
+  // address of a block which is after targetOffset. Return zero if
+  // a non-padding block occurs before that point.
+
+  while(true) {
+    seek(nextBlockOffset);
+
+    ByteVector header = readBlock(4);
+    char blockType = header[0] & 0x7f;
+    bool isLastBlock = header[0] & 0x80;
+    uint length = header.mid(1, 3).toUInt();
+
+    if(blockType != Padding)
+      break;
+
+    nextBlockOffset += 4 + length;
+
+    if(nextBlockOffset >= targetOffset) {
+      *isLast = isLastBlock;
+      return nextBlockOffset;
+    }
+
+    if(isLastBlock)
+      break;
+  }
+
+  return 0;
+}
diff -Nur taglib-1.5/taglib/flac/flacfile.h taglib/taglib/flac/flacfile.h
--- taglib-1.5/taglib/flac/flacfile.h	2008-01-31 05:07:29.000000000 +0100
+++ taglib/taglib/flac/flacfile.h	2009-07-12 23:53:18.000000000 +0200
@@ -191,6 +191,7 @@
       long findID3v2();
       long findID3v1();
       ByteVector xiphCommentData() const;
+      long findPaddingBreak(long nextPageOffset, long targetOffset, bool *isLast);
 
       class FilePrivate;
       FilePrivate *d;
diff -Nur taglib-1.5/taglib/flac/flacproperties.cpp taglib/taglib/flac/flacproperties.cpp
--- taglib-1.5/taglib/flac/flacproperties.cpp	2008-01-11 01:55:09.000000000 +0100
+++ taglib/taglib/flac/flacproperties.cpp	2008-04-08 14:15:20.000000000 +0200
@@ -146,5 +146,5 @@
 
   // Real bitrate:
 
-  d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
+  d->bitrate = d->length > 0 ? ((d->streamLength * 8UL) / d->length) / 1000 : 0;
 }

taglib-1.5-1.6-mpeg-cmake.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE taglib-1.5-1.6-mpeg-cmake.patch ---
diff -Nur taglib-1.5-orig/taglib/CMakeLists.txt taglib-1.5/taglib/CMakeLists.txt
--- taglib-1.5-orig/taglib/CMakeLists.txt	2008-02-12 05:15:20.000000000 +0100
+++ taglib-1.5/taglib/CMakeLists.txt	2009-08-22 12:18:40.000000000 +0200
@@ -62,6 +62,8 @@
 mpeg/id3v2/frames/attachedpictureframe.cpp
 mpeg/id3v2/frames/commentsframe.cpp
 mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
+mpeg/id3v2/frames/popularimeterframe.cpp
+mpeg/id3v2/frames/privateframe.cpp
 mpeg/id3v2/frames/relativevolumeframe.cpp
 mpeg/id3v2/frames/textidentificationframe.cpp
 mpeg/id3v2/frames/uniquefileidentifierframe.cpp

taglib-1.5-1.6-mpeg.patch:
 id3v2/frames/CMakeLists.txt                   |    2 
 id3v2/frames/Makefile.am                      |    4 
 id3v2/frames/attachedpictureframe.cpp         |   56 ++++++++++
 id3v2/frames/attachedpictureframe.h           |   16 ++-
 id3v2/frames/generalencapsulatedobjectframe.h |    4 
 id3v2/frames/popularimeterframe.cpp           |  137 ++++++++++++++++++++++++++
 id3v2/frames/popularimeterframe.h             |  132 +++++++++++++++++++++++++
 id3v2/frames/privateframe.cpp                 |  128 ++++++++++++++++++++++++
 id3v2/frames/privateframe.h                   |  111 +++++++++++++++++++++
 id3v2/id3v2footer.cpp                         |    2 
 id3v2/id3v2footer.h                           |    2 
 id3v2/id3v2framefactory.cpp                   |   63 ++++++++---
 id3v2/id3v2tag.cpp                            |   12 ++
 mpegheader.cpp                                |    4 
 mpegproperties.cpp                            |    6 -
 15 files changed, 649 insertions(+), 30 deletions(-)

--- NEW FILE taglib-1.5-1.6-mpeg.patch ---
diff -Nur taglib-1.5/taglib/mpeg/mpegheader.cpp taglib/taglib/mpeg/mpegheader.cpp
--- taglib-1.5/taglib/mpeg/mpegheader.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/mpegheader.cpp	2009-01-16 06:16:48.000000000 +0100
@@ -164,7 +164,7 @@
 void MPEG::Header::parse(const ByteVector &data)
 {
   if(data.size() < 4 || uchar(data[0]) != 0xff) {
-    debug("MPEG::Header::parse() -- First byte did not mactch MPEG synch.");
+    debug("MPEG::Header::parse() -- First byte did not match MPEG synch.");
     return;
   }
 
@@ -173,7 +173,7 @@
   // Check for the second byte's part of the MPEG synch
 
   if(!flags[23] || !flags[22] || !flags[21]) {
-    debug("MPEG::Header::parse() -- Second byte did not mactch MPEG synch.");
+    debug("MPEG::Header::parse() -- Second byte did not match MPEG synch.");
     return;
   }
 
diff -Nur taglib-1.5/taglib/mpeg/mpegproperties.cpp taglib/taglib/mpeg/mpegproperties.cpp
--- taglib-1.5/taglib/mpeg/mpegproperties.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/mpegproperties.cpp	2009-07-10 16:34:04.000000000 +0200
@@ -218,8 +218,10 @@
       double timePerFrame =
         double(firstHeader.samplesPerFrame()) / firstHeader.sampleRate();
 
-      d->length = int(timePerFrame * d->xingHeader->totalFrames());
-      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / d->length / 1000 : 0;
+      double length = timePerFrame * d->xingHeader->totalFrames();
+
+      d->length = int(length);
+      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / length / 1000 : 0;
   }
   else {
     // Since there was no valid Xing header found, we hope that we're in a constant
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
--- taglib-1.5/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp	2009-07-11 16:27:17.000000000 +0200
@@ -50,7 +50,7 @@
 
 AttachedPictureFrame::AttachedPictureFrame() : Frame("APIC")
 {
-    d = new AttachedPictureFramePrivate;
+  d = new AttachedPictureFramePrivate;
 }
 
 AttachedPictureFrame::AttachedPictureFrame(const ByteVector &data) : Frame(data)
@@ -136,6 +136,12 @@
   int pos = 1;
 
   d->mimeType = readStringField(data, String::Latin1, &pos);
+  /* Now we need at least two more bytes available */	
+  if (pos + 1 >= data.size()) {
+    debug("Truncated picture frame.");
+    return;
+  }
+
   d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
   d->description = readStringField(data, d->textEncoding, &pos);
 
@@ -168,3 +174,51 @@
   d = new AttachedPictureFramePrivate;
   parseFields(fieldData(data));
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// support for ID3v2.2 PIC frames
+////////////////////////////////////////////////////////////////////////////////
+
+void AttachedPictureFrameV22::parseFields(const ByteVector &data)
+{
+  if(data.size() < 5) {
+    debug("A picture frame must contain at least 5 bytes.");
+    return;
+  }
+
+  d->textEncoding = String::Type(data[0]);
+
+  int pos = 1;
+
+  String fixedString = String(data.mid(pos, 3), String::Latin1);
+  pos += 3;
+  // convert fixed string image type to mime string
+  if (fixedString.upper() == "JPG") {
+    d->mimeType = "image/jpeg";
+  } else if (fixedString.upper() == "PNG") {
+    d->mimeType = "image/png";
+  } else {
+    debug("probably unsupported image type");
+    d->mimeType = "image/" + fixedString;
+  }
+
+  d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+  d->description = readStringField(data, d->textEncoding, &pos);
+
+  d->data = data.mid(pos);
+}
+
+AttachedPictureFrameV22::AttachedPictureFrameV22(const ByteVector &data, Header *h)
+{
+  d = new AttachedPictureFramePrivate;
+
+  // set v2.2 header to make fieldData work correctly
+  setHeader(h, true);
+
+  parseFields(fieldData(data));
+
+  // now set the v2.4 header
+  Frame::Header *newHeader = new Frame::Header("APIC");
+  newHeader->setFrameSize(h->frameSize());
+  setHeader(newHeader, false);
+}
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/attachedpictureframe.h taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h
--- taglib-1.5/taglib/mpeg/id3v2/frames/attachedpictureframe.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h	2009-07-11 16:27:17.000000000 +0200
@@ -205,14 +205,24 @@
     protected:
       virtual void parseFields(const ByteVector &data);
       virtual ByteVector renderFields() const;
+      class AttachedPictureFramePrivate;
+      AttachedPictureFramePrivate *d;
 
     private:
-      AttachedPictureFrame(const ByteVector &data, Header *h);
       AttachedPictureFrame(const AttachedPictureFrame &);
       AttachedPictureFrame &operator=(const AttachedPictureFrame &);
+      AttachedPictureFrame(const ByteVector &data, Header *h);
 
-      class AttachedPictureFramePrivate;
-      AttachedPictureFramePrivate *d;
+    };
+
+    //! support for ID3v2.2 PIC frames
+    class TAGLIB_EXPORT AttachedPictureFrameV22 : public AttachedPictureFrame
+    {
+    protected:
+      virtual void parseFields(const ByteVector &data);
+    private:
+      AttachedPictureFrameV22(const ByteVector &data, Header *h);
+      friend class FrameFactory;
     };
   }
 }
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/CMakeLists.txt taglib/taglib/mpeg/id3v2/frames/CMakeLists.txt
--- taglib-1.5/taglib/mpeg/id3v2/frames/CMakeLists.txt	2008-01-31 22:48:39.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/CMakeLists.txt	2008-06-26 17:06:20.000000000 +0200
@@ -2,6 +2,8 @@
 	attachedpictureframe.h
 	commentsframe.h
 	generalencapsulatedobjectframe.h
+	popularimeterframe.h
+	privateframe.h
 	relativevolumeframe.h
 	textidentificationframe.h
 	uniquefileidentifierframe.h
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
--- taglib-1.5/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h	2008-06-19 22:44:39.000000000 +0200
@@ -61,6 +61,10 @@
 
       /*!
        * Constructs a GeneralEncapsulatedObjectFrame frame based on \a data.
+       *
+       * \warning This is \em not data for the encapsulated object, for that use
+       * setObject().  This constructor is used when reading the frame from the
+       * disk.
        */
       explicit GeneralEncapsulatedObjectFrame(const ByteVector &data);
 
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/Makefile.am taglib/taglib/mpeg/id3v2/frames/Makefile.am
--- taglib-1.5/taglib/mpeg/id3v2/frames/Makefile.am	2008-01-31 22:48:28.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/Makefile.am	2008-06-26 17:06:20.000000000 +0200
@@ -10,6 +10,8 @@
 	attachedpictureframe.cpp \
 	commentsframe.cpp \
 	generalencapsulatedobjectframe.cpp \
+	popularimeterframe.cpp \
+	privateframe.cpp \
 	relativevolumeframe.cpp \
 	textidentificationframe.cpp \
 	uniquefileidentifierframe.cpp \
@@ -21,6 +23,8 @@
 	attachedpictureframe.h \
 	commentsframe.h \
 	generalencapsulatedobjectframe.h \
+	popularimeterframe.h \
+	privateframe.h \
 	relativevolumeframe.h \
 	textidentificationframe.h \
 	uniquefileidentifierframe.h \
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/popularimeterframe.cpp taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
--- taglib-1.5/taglib/mpeg/id3v2/frames/popularimeterframe.cpp	1970-01-01 01:00:00.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp	2008-05-22 22:40:14.000000000 +0200
@@ -0,0 +1,137 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Lukas Lalinsky
+    email                : lalinsky 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 version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   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                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tdebug.h>
+
+#include "popularimeterframe.h"
+
+using namespace TagLib;
+using namespace ID3v2;
+
+class PopularimeterFrame::PopularimeterFramePrivate
+{
+public:
+  PopularimeterFramePrivate() : rating(0), counter(0) {}
+  String email;
+  int rating;
+  TagLib::uint counter;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+PopularimeterFrame::PopularimeterFrame() : Frame("POPM")
+{
+  d = new PopularimeterFramePrivate;
+}
+
+PopularimeterFrame::PopularimeterFrame(const ByteVector &data) : Frame(data)
+{
+  d = new PopularimeterFramePrivate;
+  setData(data);
+}
+
+PopularimeterFrame::~PopularimeterFrame()
+{
+  delete d;
+}
+
+String PopularimeterFrame::toString() const
+{
+  return d->email + " rating=" + String::number(d->rating) + " counter=" + String::number(d->counter);
+}
+
+String PopularimeterFrame::email() const
+{
+  return d->email;
+}
+
+void PopularimeterFrame::setEmail(const String &s)
+{
+  d->email = s;
+}
+
+int PopularimeterFrame::rating() const
+{
+  return d->rating;
+}
+
+void PopularimeterFrame::setRating(int s)
+{
+  d->rating = s;
+}
+
+TagLib::uint PopularimeterFrame::counter() const
+{
+  return d->counter;
+}
+
+void PopularimeterFrame::setCounter(TagLib::uint s)
+{
+  d->counter = s;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+void PopularimeterFrame::parseFields(const ByteVector &data)
+{
+  int pos = 0, size = int(data.size());
+
+  d->email = readStringField(data, String::Latin1, &pos);
+
+  d->rating = 0;
+  d->counter = 0;
+  if(pos < size) {
+    d->rating = (unsigned char)(data[pos++]);
+    if(pos < size) {
+      d->counter = data.mid(pos, 4).toUInt();
+    }
+  }
+}
+
+ByteVector PopularimeterFrame::renderFields() const
+{
+  ByteVector data;
+
+  data.append(d->email.data(String::Latin1));
+  data.append(textDelimiter(String::Latin1));
+  data.append(char(d->rating));
+  data.append(ByteVector::fromUInt(d->counter));
+
+  return data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+PopularimeterFrame::PopularimeterFrame(const ByteVector &data, Header *h) : Frame(h)
+{
+  d = new PopularimeterFramePrivate;
+  parseFields(fieldData(data));
+}
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/popularimeterframe.h taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h
--- taglib-1.5/taglib/mpeg/id3v2/frames/popularimeterframe.h	1970-01-01 01:00:00.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h	2008-05-22 14:06:45.000000000 +0200
@@ -0,0 +1,132 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Lukas Lalinsky
+    email                : lalinsky 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 version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   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                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_POPULARIMETERFRAME_H
+#define TAGLIB_POPULARIMETERFRAME_H
+
+#include <id3v2frame.h>
+#include "taglib_export.h"
+
+namespace TagLib {
+
+  namespace ID3v2 {
+
+    //! An implementation of ID3v2 "popularimeter"
+
+    /*!
+     * This implements the ID3v2 popularimeter (POPM frame).  It concists of
+     * an email, a rating and an optional counter.
+     */
+
+    class TAGLIB_EXPORT PopularimeterFrame : public Frame
+    {
+      friend class FrameFactory;
+
+    public:
+      /*!
+       * Construct an empty popularimeter frame.
+       */
+      explicit PopularimeterFrame();
+
+      /*!
+       * Construct a popularimeter based on the data in \a data.
+       */
+      explicit PopularimeterFrame(const ByteVector &data);
+
+      /*!
+       * Destroys this PopularimeterFrame instance.
+       */
+      virtual ~PopularimeterFrame();
+
+      /*!
+       * Returns the text of this popularimeter.
+       *
+       * \see text()
+       */
+      virtual String toString() const;
+
+      /*!
+       * Returns the email.
+       *
+       * \see setEmail()
+       */
+      String email() const;
+
+      /*!
+       * Set the email.
+       *
+       * \see email()
+       */
+      void setEmail(const String &email);
+
+      /*!
+       * Returns the rating.
+       *
+       * \see setRating()
+       */
+      int rating() const;
+
+      /*!
+       * Set the rating.
+       *
+       * \see rating()
+       */
+      void setRating(int rating);
+
+      /*!
+       * Returns the counter.
+       *
+       * \see setCounter()
+       */
+      uint counter() const;
+
+      /*!
+       * Set the counter.
+       *
+       * \see counter()
+       */
+      void setCounter(uint counter);
+
+    protected:
+      // Reimplementations.
+
+      virtual void parseFields(const ByteVector &data);
+      virtual ByteVector renderFields() const;
+
+    private:
+      /*!
+       * The constructor used by the FrameFactory.
+       */
+      PopularimeterFrame(const ByteVector &data, Header *h);
+      PopularimeterFrame(const PopularimeterFrame &);
+      PopularimeterFrame &operator=(const PopularimeterFrame &);
+
+      class PopularimeterFramePrivate;
+      PopularimeterFramePrivate *d;
+    };
+
+  }
+}
+#endif
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/privateframe.cpp taglib/taglib/mpeg/id3v2/frames/privateframe.cpp
--- taglib-1.5/taglib/mpeg/id3v2/frames/privateframe.cpp	1970-01-01 01:00:00.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/privateframe.cpp	2008-06-27 00:11:11.000000000 +0200
@@ -0,0 +1,128 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Serkan Kalyoncu
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler at kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   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                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tbytevectorlist.h>
+#include <id3v2tag.h>
+#include <tdebug.h>
+
+#include "privateframe.h"
+
+using namespace TagLib;
+using namespace ID3v2;
+
+
+class PrivateFrame::PrivateFramePrivate
+{
+public:
+  ByteVector data;
+  String owner;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+PrivateFrame::PrivateFrame() : Frame("PRIV")
+{
+  d = new PrivateFramePrivate;
+}
+
+PrivateFrame::PrivateFrame(const ByteVector &data) : Frame(data)
+{
+  d = new PrivateFramePrivate;
+  setData(data);
+}
+
+PrivateFrame::~PrivateFrame()
+{
+  delete d;
+}
+
+String PrivateFrame::toString() const
+{
+  return d->owner;
+}
+
+String PrivateFrame::owner() const
+{
+  return d->owner;
+}
+
+ByteVector PrivateFrame::data() const
+{
+  return d->data;
+}
+
+void PrivateFrame::setOwner(const String &s)
+{
+  d->owner = s;
+}
+
+void PrivateFrame::setData(const ByteVector & data)
+{
+  d->data = data;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+void PrivateFrame::parseFields(const ByteVector &data)
+{
+  if(data.size() < 2) {
+    debug("A private frame must contain at least 2 bytes.");
+    return;
+  }
+
+  // Owner identifier is assumed to be Latin1
+  
+  const int byteAlign =  1;
+  const int endOfOwner = data.find(textDelimiter(String::Latin1), 0, byteAlign);
+
+  d->owner =  String(data.mid(0, endOfOwner));
+  d->data = data.mid(endOfOwner + 1);
+}
+
+ByteVector PrivateFrame::renderFields() const
+{
+  ByteVector v;
+
+  v.append(d->owner.data(String::Latin1));
+  v.append(textDelimiter(String::Latin1));
+  v.append(d->data);
+
+  return v;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+PrivateFrame::PrivateFrame(const ByteVector &data, Header *h) : Frame(h)
+{
+  d = new PrivateFramePrivate();
+  parseFields(fieldData(data));
+}
diff -Nur taglib-1.5/taglib/mpeg/id3v2/frames/privateframe.h taglib/taglib/mpeg/id3v2/frames/privateframe.h
--- taglib-1.5/taglib/mpeg/id3v2/frames/privateframe.h	1970-01-01 01:00:00.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/frames/privateframe.h	2008-06-27 00:11:11.000000000 +0200
@@ -0,0 +1,111 @@
+/***************************************************************************
+    copyright            : (C) 2008 by Serkan Kalyoncu
+    copyright            : (C) 2008 by Scott Wheeler
+    email                : wheeler at kde.org
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   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                                                                   *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_PRIVATEFRAME_H
+#define TAGLIB_PRIVATEFRAME_H
+
+#include "id3v2frame.h"
+#include "taglib_export.h"
+
+namespace TagLib {
+
+  namespace ID3v2 {
+
+    //! An implementation of ID3v2 privateframe
+
+    class TAGLIB_EXPORT PrivateFrame : public Frame
+    {
+      friend class FrameFactory;
+
+    public:
+      /*!
+       * Construct an empty private frame.
+       */
+      PrivateFrame();
+
+      /*!
+       * Construct a private frame based on the data in \a data.
+       *
+       * \note This is the constructor used when parsing the frame from a file.
+       */
+      explicit PrivateFrame(const ByteVector &data);
+
+      /*!
+       * Destroys this private frame instance.
+       */
+      virtual ~PrivateFrame();
+
+      /*!
+       * Returns the text of this private frame, currently just the owner.
+       *
+       * \see text()
+       */
+      virtual String toString() const;
+
+      /*!
+       * \return The owner of the private frame.
+       * \note This should contain an email address or link to a website.
+       */
+      String owner() const;
+
+      /*!
+       *
+       */
+      ByteVector data() const;
+
+      /*!
+       * Sets the owner of the frame to \a s.
+       * \note This should contain an email address or link to a website.
+       */
+      void setOwner(const String &s);
+
+      /*!
+       *
+       */
+      void setData(const ByteVector &v);
+
+    protected:
+      // Reimplementations.
+
+      virtual void parseFields(const ByteVector &data);
+      virtual ByteVector renderFields() const;
+
+    private:
+      /*!
+       * The constructor used by the FrameFactory.
+       */
+      PrivateFrame(const ByteVector &data, Header *h);
+
+      PrivateFrame(const PrivateFrame &);
+      PrivateFrame &operator=(const PrivateFrame &);
+
+      class PrivateFramePrivate;
+      PrivateFramePrivate *d;
+    };
+
+  }
+}
+#endif
diff -Nur taglib-1.5/taglib/mpeg/id3v2/id3v2footer.cpp taglib/taglib/mpeg/id3v2/id3v2footer.cpp
--- taglib-1.5/taglib/mpeg/id3v2/id3v2footer.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/id3v2footer.cpp	2008-12-05 17:43:38.000000000 +0100
@@ -45,7 +45,7 @@
 
 }
 
-const unsigned int Footer::size()
+TagLib::uint Footer::size()
 {
   return FooterPrivate::size;
 }
diff -Nur taglib-1.5/taglib/mpeg/id3v2/id3v2footer.h taglib/taglib/mpeg/id3v2/id3v2footer.h
--- taglib-1.5/taglib/mpeg/id3v2/id3v2footer.h	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/id3v2footer.h	2008-12-05 01:37:39.000000000 +0100
@@ -62,7 +62,7 @@
       /*!
        * Returns the size of the footer.  Presently this is always 10 bytes.
        */
-      static const unsigned int size();
+      static uint size();
 
       /*!
        * Renders the footer based on the data in \a header.
diff -Nur taglib-1.5/taglib/mpeg/id3v2/id3v2framefactory.cpp taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp
--- taglib-1.5/taglib/mpeg/id3v2/id3v2framefactory.cpp	2008-02-21 01:43:14.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp	2009-07-11 16:27:17.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "id3v2framefactory.h"
 #include "id3v2synchdata.h"
+#include "id3v1genres.h"
 
 #include "frames/attachedpictureframe.h"
 #include "frames/commentsframe.h"
@@ -41,6 +42,8 @@
 #include "frames/generalencapsulatedobjectframe.h"
 #include "frames/urllinkframe.h"
 #include "frames/unsynchronizedlyricsframe.h"
+#include "frames/popularimeterframe.h"
+#include "frames/privateframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -180,7 +183,15 @@
     return f;
   }
 
-  // Relative Volume Adjustment (frames 4.11)
+  // ID3v2.2 Attached Picture
+
+	if(frameID == "PIC") {
+    AttachedPictureFrame *f = new AttachedPictureFrameV22(data, header);
+    d->setTextEncoding(f);
+    return f;
+  }
+
+	// Relative Volume Adjustment (frames 4.11)
 
   if(frameID == "RVA2")
     return new RelativeVolumeFrame(data, header);
@@ -220,6 +231,16 @@
     return f;
   }
 
+  // Popularimeter (frames 4.17)
+
+  if(frameID == "POPM")
+    return new PopularimeterFrame(data, header);
+
+  // Private (frames 4.27)
+
+  if(frameID == "PRIV")
+    return new PrivateFrame(data, header);
+
   return new UnknownFrame(data, header);
 }
 
@@ -280,7 +301,6 @@
     convertFrame("IPL", "TIPL", header);
     convertFrame("MCI", "MCDI", header);
     convertFrame("MLL", "MLLT", header);
-    convertFrame("PIC", "APIC", header);
     convertFrame("POP", "POPM", header);
     convertFrame("REV", "RVRB", header);
     convertFrame("SLT", "SYLT", header);
@@ -382,26 +402,31 @@
 
 void FrameFactory::updateGenre(TextIdentificationFrame *frame) const
 {
-  StringList fields;
-  String s = frame->toString();
+  StringList fields = frame->fieldList();
+  StringList newfields;
 
-  while(s.startsWith("(")) {
-
-    int closing = s.find(")");
-
-    if(closing < 0)
-      break;
-
-    fields.append(s.substr(1, closing - 1));
-
-    s = s.substr(closing + 1);
+  for(StringList::Iterator it = fields.begin(); it != fields.end(); ++it) {
+    String s = *it;
+    int end = s.find(")");
+
+    if(s.startsWith("(") && end > 0) {
+      // "(12)Genre"
+      String text = s.substr(end + 1);
+      int number = s.substr(1, end - 1).toInt();
+      if (number > 0 && number <= 255 && !(ID3v1::genre(number) == text))
+        newfields.append(s.substr(1, end - 1));
+      if (!text.isEmpty())
+        newfields.append(text);
+    }
+    else {
+      // "Genre" or "12"
+      newfields.append(s);
+    }
   }
 
-  if(!s.isEmpty())
-    fields.append(s);
-
-  if(fields.isEmpty())
+  if(newfields.isEmpty())
     fields.append(String::null);
 
-  frame->setText(fields);
+  frame->setText(newfields);
+
 }
diff -Nur taglib-1.5/taglib/mpeg/id3v2/id3v2tag.cpp taglib/taglib/mpeg/id3v2/id3v2tag.cpp
--- taglib-1.5/taglib/mpeg/id3v2/id3v2tag.cpp	2008-02-04 21:33:54.000000000 +0100
+++ taglib/taglib/mpeg/id3v2/id3v2tag.cpp	2009-07-11 16:43:58.000000000 +0200
@@ -125,7 +125,9 @@
 
   for(FrameList::ConstIterator it = comments.begin(); it != comments.end(); ++it)
   {
-    if(static_cast<CommentsFrame *>(*it)->description().isEmpty())
+    CommentsFrame *frame = dynamic_cast<CommentsFrame *>(*it);
+
+    if(frame && frame->description().isEmpty())
       return (*it)->toString();
   }
 
@@ -159,6 +161,9 @@
 
   for(StringList::Iterator it = fields.begin(); it != fields.end(); ++it) {
 
+    if((*it).isEmpty())
+      continue;
+
     bool isNumber = true;
 
     for(String::ConstIterator charIt = (*it).begin();
@@ -347,6 +352,11 @@
   // Loop through the frames rendering them and adding them to the tagData.
 
   for(FrameList::Iterator it = d->frameList.begin(); it != d->frameList.end(); it++) {
+    if ((*it)->header()->frameID().size() != 4) {
+      debug("A frame of unsupported or unknown type \'"
+          + String((*it)->header()->frameID()) + "\' has been discarded");
+      continue;
+    }
     if(!(*it)->header()->tagAlterPreservation())
       tagData.append((*it)->render());
   }

taglib-1.5-1.6-ogg.patch:
 xiphcomment.cpp |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

--- NEW FILE taglib-1.5-1.6-ogg.patch ---
diff -Nur taglib-1.5/taglib/ogg/xiphcomment.cpp taglib/taglib/ogg/xiphcomment.cpp
--- taglib-1.5/taglib/ogg/xiphcomment.cpp	2008-02-04 16:14:46.000000000 +0100
+++ taglib/taglib/ogg/xiphcomment.cpp	2009-07-11 15:17:06.000000000 +0200
@@ -103,16 +103,20 @@
 
 TagLib::uint Ogg::XiphComment::year() const
 {
-  if(d->fieldListMap["DATE"].isEmpty())
-    return 0;
-  return d->fieldListMap["DATE"].front().toInt();
+  if(!d->fieldListMap["DATE"].isEmpty())
+    return d->fieldListMap["DATE"].front().toInt();
+  if(!d->fieldListMap["YEAR"].isEmpty())
+    return d->fieldListMap["YEAR"].front().toInt();
+  return 0;
 }
 
 TagLib::uint Ogg::XiphComment::track() const
 {
-  if(d->fieldListMap["TRACKNUMBER"].isEmpty())
-    return 0;
-  return d->fieldListMap["TRACKNUMBER"].front().toInt();
+  if(!d->fieldListMap["TRACKNUMBER"].isEmpty())
+    return d->fieldListMap["TRACKNUMBER"].front().toInt();
+  if(!d->fieldListMap["TRACKNUM"].isEmpty())
+    return d->fieldListMap["TRACKNUM"].front().toInt();
+  return 0;
 }
 
 void Ogg::XiphComment::setTitle(const String &s)
@@ -142,6 +146,7 @@
 
 void Ogg::XiphComment::setYear(uint i)
 {
+  removeField("YEAR");
   if(i == 0)
     removeField("DATE");
   else
@@ -150,6 +155,7 @@
 
 void Ogg::XiphComment::setTrack(uint i)
 {
+  removeField("TRACKNUM");
   if(i == 0)
     removeField("TRACKNUMBER");
   else

taglib-1.5-1.6-toolkit.patch:
 tbytevector.cpp     |    4 ++--
 tbytevector.h       |    2 +-
 tbytevectorlist.cpp |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE taglib-1.5-1.6-toolkit.patch ---
diff -Nur taglib-1.5/taglib/toolkit/tbytevector.cpp taglib/taglib/toolkit/tbytevector.cpp
--- taglib-1.5/taglib/toolkit/tbytevector.cpp	2008-02-12 04:18:52.000000000 +0100
+++ taglib/taglib/toolkit/tbytevector.cpp	2008-12-04 13:37:36.000000000 +0100
@@ -147,12 +147,12 @@
   public:
     ByteVectorMirror(const ByteVector &source) : v(source) {}
 
-    const char operator[](int index) const
+    char operator[](int index) const
     {
       return v[v.size() - index - 1];
     }
 
-    const char at(int index) const
+    char at(int index) const
     {
       return v.at(v.size() - index - 1);
     }
diff -Nur taglib-1.5/taglib/toolkit/tbytevector.h taglib/taglib/toolkit/tbytevector.h
--- taglib-1.5/taglib/toolkit/tbytevector.h	2008-02-05 19:51:48.000000000 +0100
+++ taglib/taglib/toolkit/tbytevector.h	2009-07-02 22:54:32.000000000 +0200
@@ -30,7 +30,7 @@
 #include "taglib_export.h"
 
 #include <vector>
-#include <ostream>
+#include <iostream>
 
 namespace TagLib {
 
diff -Nur taglib-1.5/taglib/toolkit/tbytevectorlist.cpp taglib/taglib/toolkit/tbytevectorlist.cpp
--- taglib-1.5/taglib/toolkit/tbytevectorlist.cpp	2008-02-04 16:14:45.000000000 +0100
+++ taglib/taglib/toolkit/tbytevectorlist.cpp	2009-07-11 15:24:21.000000000 +0200
@@ -52,7 +52,7 @@
       offset != -1 && (max == 0 || max > int(l.size()) + 1);
       offset = v.find(pattern, offset + pattern.size(), byteAlign))
   {
-    if(offset - previousOffset > 1)
+    if(offset - previousOffset >= 1)
       l.append(v.mid(previousOffset, offset - previousOffset));
     else
       l.append(ByteVector::null);


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- taglib.spec	22 Aug 2009 10:42:57 -0000	1.35
+++ taglib.spec	22 Aug 2009 10:44:21 -0000	1.36
@@ -30,7 +30,12 @@ Patch2:     taglib-1.5rc1-multilib.patch
 Patch3: taglib-1.5-tests.patch
 
 ## upstream patches
-Patch100: taglib-1.5-kde#161721.patch
+Patch101: taglib-1.5-1.6-ape.patch
+Patch102: taglib-1.5-1.6-ogg.patch
+Patch103: taglib-1.5-1.6-flac.patch
+Patch104: taglib-1.5-1.6-toolkit.patch
+Patch105: taglib-1.5-1.6-mpeg.patch
+Patch106: taglib-1.5-1.6-mpeg-cmake.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig
@@ -60,7 +65,12 @@ Files needed when building software with
 %patch2 -p1 -b .multilib
 
 %patch3 -p1 -b .tests
-%patch100 -p1 -b .kde#161721.patch
+%patch101 -p1 -b .ape
+%patch102 -p1 -b .ogg
+%patch103 -p1 -b .flac
+%patch104 -p1 -b .toolkit
+%patch105 -p1 -b .mpeg
+%patch106 -p1 -b .mpeg-build
 
 
 %build
@@ -117,6 +127,29 @@ rm -rf %{buildroot}
 * Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
 - Add %%check section and conditionally build with tests.
 - Update descriptions (and mention the additional file formats).
+- Cherry-pick bug-fix patches from 1.6 development (also replaces the
+  old taglib-1.5-kde#161721.patch):
+  * Fixed crash when saving a Locator APEv2 tag. (BUG:169810)
+  * TagLib can now use FLAC padding block. (BUG:107659)
+  * Fixed overflow while calculating bitrate of FLAC files with a very
+    high bitrate.
+  * XiphComment::year() now falls back to YEAR if DATE doesn't exist
+    and XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
+    exist. (BUG:144396)
+  * Fixed a bug in ByteVectorList::split().
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+  * ID3v2.2 frames are now not incorrectly saved. (BUG:176373)
+  * Support for ID3v2.2 PIC frames. (BUG:167786)
+  * Improved ID3v2.3 genre parsing. (BUG:188578)
+  * Better checking of corrupted ID3v2 APIC data. (BUG:168382)
+  * Bitrate calculating using the Xing header now uses floating point
+    numbers. (BUG:172556)
+  * Added support for PRIV ID3v2 frames.
+  * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
+  * Added support for the POPM (rating/playcount) ID3v2 frame.
+  * Fixed crash on handling unsupported ID3v2 frames, e.g. on encrypted
+    frames. (BUG:161721)
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


--- taglib-1.5-kde#161721.patch DELETED ---



From mschwendt at fedoraproject.org  Sat Aug 22 10:45:43 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 22 Aug 2009 10:45:43 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.36,1.37
Message-ID: <20090822104543.2251D11C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19867

Modified Files:
	taglib.spec 
Log Message:
BR cppunit-devel conditionally


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- taglib.spec	22 Aug 2009 10:44:21 -0000	1.36
+++ taglib.spec	22 Aug 2009 10:45:42 -0000	1.37
@@ -40,6 +40,10 @@ Patch106: taglib-1.5-1.6-mpeg-cmake.patc
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
+%if %{with tests}
+BuildRequires: cppunit-devel
+%endif
+
 
 %description
 TagLib is a library for reading and editing the meta-data of several



From pbrobinson at fedoraproject.org  Sat Aug 22 10:56:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 22 Aug 2009 10:56:05 +0000 (UTC)
Subject: rpms/rest/F-11 .cvsignore, 1.2, 1.3 rest.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090822105605.CF77411C00A2@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rest/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21698

Modified Files:
	.cvsignore rest.spec sources 
Log Message:
- New upstream 0.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rest/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Jul 2009 10:38:43 -0000	1.2
+++ .cvsignore	22 Aug 2009 10:56:05 -0000	1.3
@@ -1 +1 @@
-librest-0.5.tar.bz2
+librest-0.6.tar.bz2


Index: rest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rest/F-11/rest.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rest.spec	18 Jul 2009 10:38:44 -0000	1.1
+++ rest.spec	22 Aug 2009 10:56:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           rest
-Version:        0.5
-Release:        1%{?dist}
+Version:        0.6
+Release:        3%{?dist}
 Summary:        A library for access to RESTful web services
 
 Group:          System Environment/Libraries
@@ -13,12 +13,9 @@ BuildRequires: glib2-devel
 BuildRequires: libsoup-devel
 BuildRequires: libxml2-devel
 BuildRequires: gtk-doc
-BuildRequires: pkgconfig
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 This library was designed to make it easier to access web services that
@@ -34,7 +31,6 @@ Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 Files for development with %{name}.
@@ -42,17 +38,20 @@ Files for development with %{name}.
 %prep
 %setup -q -n librest-%{version}
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
-#Remove libtool archives
-rm -rf %{buildroot}/%{_libdir}/*.la
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
 rm -rf %{buildroot}
@@ -72,9 +71,18 @@ rm -rf %{buildroot}
 %{_includedir}/rest
 %{_libdir}/pkgconfig/rest.pc
 %{_libdir}/librest.so
-%{_datadir}/gtk-doc/html/rest
+%{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-1
+- New upstream 0.6 release
+
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5-3
+- A few minor spec file cleanups
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.5-1
 - Update to 0.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rest/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jul 2009 10:38:44 -0000	1.2
+++ sources	22 Aug 2009 10:56:05 -0000	1.3
@@ -1 +1 @@
-294635fe499313b92a371a9c6dd55e2c  librest-0.5.tar.bz2
+47f9357835885f4cfa0087eeda31659b  librest-0.6.tar.bz2



From mschwendt at fedoraproject.org  Sat Aug 22 10:58:11 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 22 Aug 2009 10:58:11 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.37,1.38
Message-ID: <20090822105811.910EF11C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22094

Modified Files:
	taglib.spec 
Log Message:
point run-time linker in test-suite to newly built taglib


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- taglib.spec	22 Aug 2009 10:45:42 -0000	1.37
+++ taglib.spec	22 Aug 2009 10:58:11 -0000	1.38
@@ -100,7 +100,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la
 %check
 cp -a tests/data %{_target_platform}/tests
 cd %{_target_platform}
-make check
+LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check
 %endif
 
 



From pbrobinson at fedoraproject.org  Sat Aug 22 10:59:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 22 Aug 2009 10:59:53 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.12,1.13
Message-ID: <20090822105953.4813611C00A2@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22467

Modified Files:
	mojito.spec 
Log Message:
- Enable twitter, lastfm, MySpace and Flickr networks


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mojito.spec	19 Aug 2009 16:17:54 -0000	1.12
+++ mojito.spec	22 Aug 2009 10:59:53 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -17,7 +17,6 @@ BuildRequires: libsoup-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: rest-devel
 BuildRequires: intltool
-BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
@@ -33,7 +32,6 @@ Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 Files for development with %{name}.
@@ -47,17 +45,21 @@ sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
 
 %build
-%configure --enable-gtk-doc --with-gnome --with-online=networkmanager --disable-static --enable-lastfm-key --enable-myspace-key --enable-flickr-key
+%configure --with-gnome --with-online=networkmanager --disable-static \
+   --enable-twitter-key=4PEfS48BDCWSHSb1s84ebQ:HqJIWVVJwXNIMaNPuxkYw6wVTL2paNdWkvOg3mXxE \
+   --enable-lastfm-key=b70f696913487a44ea13038e926a096a \
+   --enable-myspace-key=f06906e7522f46f2a08a03e11ef66496:45ee30d3b29c47ffbb65b59bd84d1848bfa93c968b7d487cae68a6790e96c6ef \
+   --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} V=1
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives and static libs.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -100,6 +102,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Sat Aug 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-2
+- Enable twitter, lastfm, MySpace and Flickr networks
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-1
 - Update to 0.20
 



From lucilanga at fedoraproject.org  Sat Aug 22 11:04:07 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 22 Aug 2009 11:04:07 +0000 (UTC)
Subject: rpms/hamlib/devel hamlib.spec,1.39,1.40
Message-ID: <20090822110407.9651511C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24046

Modified Files:
	hamlib.spec 
Log Message:
* Wed Aug 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
- patch0 update
- new upstream release


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- hamlib.spec	25 Jul 2009 02:00:47 -0000	1.39
+++ hamlib.spec	22 Aug 2009 11:04:07 -0000	1.40
@@ -1,16 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           hamlib
-Version:        1.2.8
-Release:        4%{?dist}
+Version:        1.2.9
+Release:        1%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
 License:        GPLv2+ and LGPLv2+
 URL:            http://hamlib.sourceforge.net
-Source0:        ftp://ftp.sourceforge.net/pub/sourceforge/h/ha/hamlib/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 #Install python and perl bindings into proper dirs
-Patch0:         hamlib-bindings-1.2.8.patch
+Patch0:         hamlib-1.2.9-bindings.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -203,6 +203,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Wed Aug 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
+- patch0 update
+- new upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Sat Aug 22 11:04:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 22 Aug 2009 11:04:34 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.90,1.91
Message-ID: <20090822110434.69FFD11C00A2@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24183

Modified Files:
	comps-f12.xml.in 
Log Message:
Add Moblin Desktop Environment group


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- comps-f12.xml.in	21 Aug 2009 15:04:07 -0000	1.90
+++ comps-f12.xml.in	22 Aug 2009 11:04:34 -0000	1.91
@@ -4238,6 +4238,24 @@
     </packagelist>
   </group>
   <group>
+    <id>moblin-desktop</id>
+    <_name>Moblin Desktop Environment</_name>
+    <_description>Moblin is a desktop environment for NetBook/NetTop/MID devices.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">bisho</packagereq>
+      <packagereq type="mandatory">bognor-regis</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-session</packagereq>
+      <packagereq type="mandatory">moblin-sound-theme</packagereq>
+      <packagereq type="default">anjal</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mongolian-support</id>
     <_name>Mongolian Support</_name>
     <_description/>
@@ -6240,6 +6258,7 @@
       <groupid>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>lxde-desktop</groupid>
+      <groupid>moblin-desktop</groupid>
       <groupid>sugar-desktop</groupid>
       <groupid>window-managers</groupid>
       <groupid>xfce-desktop</groupid>



From lucilanga at fedoraproject.org  Sat Aug 22 11:09:25 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 22 Aug 2009 11:09:25 +0000 (UTC)
Subject: rpms/hamlib/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090822110925.B026A11C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25173

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Aug 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
- patch0 update
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	15 Dec 2008 22:18:40 -0000	1.7
+++ .cvsignore	22 Aug 2009 11:09:25 -0000	1.8
@@ -1 +1 @@
-hamlib-1.2.8.tar.gz
+hamlib-1.2.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 Dec 2008 22:18:40 -0000	1.7
+++ sources	22 Aug 2009 11:09:25 -0000	1.8
@@ -1 +1 @@
-74eaf1be4cf1cbdecee54808c6930788  hamlib-1.2.8.tar.gz
+9515288826284d6c8dd569354dacc8e0  hamlib-1.2.9.tar.gz



From lucilanga at fedoraproject.org  Sat Aug 22 11:14:47 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 22 Aug 2009 11:14:47 +0000 (UTC)
Subject: rpms/hamlib/devel hamlib-1.2.9-bindings.patch,NONE,1.1
Message-ID: <20090822111447.D2B2111C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26220

Added Files:
	hamlib-1.2.9-bindings.patch 
Log Message:
update patch

hamlib-1.2.9-bindings.patch:
 Makefile.am |    8 ++++----
 Makefile.in |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE hamlib-1.2.9-bindings.patch ---
diff -Naur hamlib-1.2.9/bindings/Makefile.in hamlib-1.2.9-mod/bindings/Makefile.in
--- hamlib-1.2.9/bindings/Makefile.in	2009-02-25 21:18:37.000000000 +0200
+++ hamlib-1.2.9-mod/bindings/Makefile.in	2009-08-19 08:07:17.000000000 +0300
@@ -268,7 +268,7 @@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 pyexecdir = @pyexecdir@
-pythondir = $(prefix)/lib/python
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -287,7 +287,7 @@
 ##########################################
 # Tcl binding
 tcl_ltlib = hamlibtcl.la
-tcldir = $(prefix)/lib/tcl
+tcldir = $(libdir)/tcl
 PKG_VER = 1.0
 DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
 nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
@@ -672,7 +672,7 @@
 			CC="$(CC)"  \
 			OBJECT="hamlibperl_wrap.o" \
 			VERSION="$(PACKAGE_VERSION)" \
-			LIBS="-L$(top_builddir)/src/.libs -lhamlib"
+			LIBS="-L$(top_builddir)/src/.libs -lhamlib INSTALLDIRS=vendor"
 	sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
 	mv Hamlib-pl-norpath.mk Hamlib-pl.mk
 
@@ -691,7 +691,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
 
 install-perl: Hamlib-pl.mk
-	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
+	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
 
 uninstall-perl: ## Hamlib-pl.mk
 
diff -Naur hamlib-1.2.9/bindings/Makefile.am hamlib-1.2.9-mod/bindings/Makefile.am
--- hamlib-1.2.9/bindings/Makefile.am	2008-06-26 18:23:06.000000000 +0300
+++ hamlib-1.2.9-mod/bindings/Makefile.am	2009-08-19 08:06:17.000000000 +0300
@@ -29,7 +29,7 @@
 			CC="$(CC)"  \
 			OBJECT="hamlibperl_wrap.o" \
 			VERSION="$(PACKAGE_VERSION)" \
-			LIBS="-L$(top_builddir)/src/.libs -lhamlib"
+			LIBS="-L$(top_builddir)/src/.libs -lhamlib INSTALLDIRS=vendor"
 	sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
 	mv Hamlib-pl-norpath.mk Hamlib-pl.mk
 
@@ -49,7 +49,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
 
 install-perl: Hamlib-pl.mk
-	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
+	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
 
 ## ExtUtils::MakeMaker says uninstall is deprecated and won't remove the files
 ## anyway, so we'll have to figure out another way to remove the installed files.
@@ -62,7 +62,7 @@
 
 tcl_ltlib = hamlibtcl.la
 
-tcldir = $(prefix)/lib/tcl
+tcldir = $(libdir)/tcl
 
 PKG_VER=1.0
 DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
@@ -96,7 +96,7 @@
 
 python_ltlib = _Hamlib.la
 
-pythondir = $(prefix)/lib/python
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
 
 nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
 _Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version



From salimma at fedoraproject.org  Sat Aug 22 11:20:48 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 11:20:48 +0000 (UTC)
Subject: rpms/cpdup/EL-5 cpdup-1.14-gcc44.patch, NONE,
	1.1 cpdup-1.14-typos.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 cpdup.spec, 1.3, 1.4 sources, 1.3,
	1.4 cpdup-1.11-explicit_sizes.patch, 1.1, NONE
Message-ID: <20090822112048.3057011C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/cpdup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27562/EL-5

Modified Files:
	.cvsignore cpdup.spec sources 
Added Files:
	cpdup-1.14-gcc44.patch cpdup-1.14-typos.patch 
Removed Files:
	cpdup-1.11-explicit_sizes.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
- Update to 1.14


cpdup-1.14-gcc44.patch:
 cpdup.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cpdup-1.14-gcc44.patch ---
--- cpdup/cpdup.h.gcc44	2008-11-29 17:22:06.000000000 -0500
+++ cpdup/cpdup.h	2009-08-22 06:11:52.916246762 -0400
@@ -11,6 +11,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>

cpdup-1.14-typos.patch:
 cpdup.1 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE cpdup-1.14-typos.patch ---
--- cpdup/cpdup.1.typos	2009-01-09 19:54:00.000000000 -0500
+++ cpdup/cpdup.1	2009-08-22 06:44:14.670245706 -0400
@@ -51,7 +51,7 @@
 The
 .Nm
 utility makes an exact mirror copy of the source in the destination, creating
-and deleting files and directories as necessary.  UTimes, hardlinks,
+and deleting files and directories as necessary.  Utimes, hardlinks,
 softlinks, devices, permissions, and flags are mirrored.  By default,
 .Nm
 asks for confirmation if any file or directory needs to be removed from
@@ -119,7 +119,7 @@
 .It Fl o
 Do not remove any files, just overwrite/add.
 .It Fl m
-Generate and maintain a MD5 checkfile in each directory on the source
+Generate and maintain an MD5 checkfile in each directory on the source
 and do an MD5 check on each file of the destination when the destination
 appears to be the same as the source.  If the check fails,
 .Nm
@@ -162,7 +162,7 @@
 must record the paths for all files it encounters while it operates
 and it is possible that you may run the process out of memory.
 .Pp
-The file found vi the hardlink path will be byte-by-byte compared with the
+The file found via the hardlink path will be byte-by-byte compared with the
 source if the
 .Fl V
 or
@@ -186,7 +186,7 @@
 into slave mode and is used to initiate the slave protocol on a remote
 machine.
 .It Fl k
-Generate and maintain a FSMID checkfile called .FSMID.CHECK in each
+Generate and maintain an FSMID checkfile called .FSMID.CHECK in each
 directory on the target.
 .Nm
 will check the FSMID for each source file or directory against the checkfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jun 2008 13:47:47 -0000	1.3
+++ .cvsignore	22 Aug 2009 11:20:47 -0000	1.4
@@ -1 +1 @@
-cpdup-1.11.tgz
+cpdup-1.14.tgz


Index: cpdup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/EL-5/cpdup.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpdup.spec	11 Jun 2008 20:45:45 -0000	1.3
+++ cpdup.spec	22 Aug 2009 11:20:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           cpdup
-Version:        1.11
-Release:        2%{?dist}
+Version:        1.14
+Release:        1%{?dist}
 Summary:        Filesystem mirroring utility
 
 Group:          Applications/Archiving
@@ -8,8 +8,9 @@ License:        BSD
 URL:            http://apollo.backplane.com/FreeSrc/
 Source0:        http://apollo.backplane.com/FreeSrc/cpdup-%{version}.tgz
 Source1:        Makefile.linux
-Patch0:         cpdup-1.11-explicit_sizes.patch
+Patch0:         cpdup-1.14-gcc44.patch
 Patch1:         cpdup-1.11-unused.patch
+Patch2:         cpdup-1.14-typos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  
@@ -30,13 +31,13 @@ destination directory with a file.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .explicit_sizes
+%patch0 -p1 -b .gcc44
 %patch1 -p1 -b .unused
+%patch2 -p1 -b .typos
 rm md5.c
 
 
 %build
-# configure
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1}
 
 
@@ -58,6 +59,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
+- Update to 1.14
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jun 11 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.11-2
 - Fix build problems with GLIBC on 64-bit archs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jun 2008 13:47:47 -0000	1.3
+++ sources	22 Aug 2009 11:20:47 -0000	1.4
@@ -1 +1 @@
-9b6f25845fc4998d9151d0ef5e7936c5  cpdup-1.11.tgz
+872f41683dd0f6d32bff111e22ad50f7  cpdup-1.14.tgz


--- cpdup-1.11-explicit_sizes.patch DELETED ---



From salimma at fedoraproject.org  Sat Aug 22 11:20:48 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 11:20:48 +0000 (UTC)
Subject: rpms/cpdup/F-10 cpdup-1.14-gcc44.patch, NONE,
	1.1 cpdup-1.14-typos.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 cpdup.spec, 1.4, 1.5 sources, 1.3,
	1.4 cpdup-1.11-explicit_sizes.patch, 1.1, NONE
Message-ID: <20090822112048.9558A11C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/cpdup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27562/F-10

Modified Files:
	.cvsignore cpdup.spec sources 
Added Files:
	cpdup-1.14-gcc44.patch cpdup-1.14-typos.patch 
Removed Files:
	cpdup-1.11-explicit_sizes.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
- Update to 1.14


cpdup-1.14-gcc44.patch:
 cpdup.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cpdup-1.14-gcc44.patch ---
--- cpdup/cpdup.h.gcc44	2008-11-29 17:22:06.000000000 -0500
+++ cpdup/cpdup.h	2009-08-22 06:11:52.916246762 -0400
@@ -11,6 +11,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>

cpdup-1.14-typos.patch:
 cpdup.1 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE cpdup-1.14-typos.patch ---
--- cpdup/cpdup.1.typos	2009-01-09 19:54:00.000000000 -0500
+++ cpdup/cpdup.1	2009-08-22 06:44:14.670245706 -0400
@@ -51,7 +51,7 @@
 The
 .Nm
 utility makes an exact mirror copy of the source in the destination, creating
-and deleting files and directories as necessary.  UTimes, hardlinks,
+and deleting files and directories as necessary.  Utimes, hardlinks,
 softlinks, devices, permissions, and flags are mirrored.  By default,
 .Nm
 asks for confirmation if any file or directory needs to be removed from
@@ -119,7 +119,7 @@
 .It Fl o
 Do not remove any files, just overwrite/add.
 .It Fl m
-Generate and maintain a MD5 checkfile in each directory on the source
+Generate and maintain an MD5 checkfile in each directory on the source
 and do an MD5 check on each file of the destination when the destination
 appears to be the same as the source.  If the check fails,
 .Nm
@@ -162,7 +162,7 @@
 must record the paths for all files it encounters while it operates
 and it is possible that you may run the process out of memory.
 .Pp
-The file found vi the hardlink path will be byte-by-byte compared with the
+The file found via the hardlink path will be byte-by-byte compared with the
 source if the
 .Fl V
 or
@@ -186,7 +186,7 @@
 into slave mode and is used to initiate the slave protocol on a remote
 machine.
 .It Fl k
-Generate and maintain a FSMID checkfile called .FSMID.CHECK in each
+Generate and maintain an FSMID checkfile called .FSMID.CHECK in each
 directory on the target.
 .Nm
 will check the FSMID for each source file or directory against the checkfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jun 2008 13:49:10 -0000	1.3
+++ .cvsignore	22 Aug 2009 11:20:48 -0000	1.4
@@ -1 +1 @@
-cpdup-1.11.tgz
+cpdup-1.14.tgz


Index: cpdup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/F-10/cpdup.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cpdup.spec	11 Jun 2008 20:47:00 -0000	1.4
+++ cpdup.spec	22 Aug 2009 11:20:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           cpdup
-Version:        1.11
-Release:        2%{?dist}
+Version:        1.14
+Release:        1%{?dist}
 Summary:        Filesystem mirroring utility
 
 Group:          Applications/Archiving
@@ -8,8 +8,9 @@ License:        BSD
 URL:            http://apollo.backplane.com/FreeSrc/
 Source0:        http://apollo.backplane.com/FreeSrc/cpdup-%{version}.tgz
 Source1:        Makefile.linux
-Patch0:         cpdup-1.11-explicit_sizes.patch
+Patch0:         cpdup-1.14-gcc44.patch
 Patch1:         cpdup-1.11-unused.patch
+Patch2:         cpdup-1.14-typos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  
@@ -30,13 +31,13 @@ destination directory with a file.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .explicit_sizes
+%patch0 -p1 -b .gcc44
 %patch1 -p1 -b .unused
+%patch2 -p1 -b .typos
 rm md5.c
 
 
 %build
-# configure
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1}
 
 
@@ -58,6 +59,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
+- Update to 1.14
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Jun 11 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.11-2
 - Fix build problems with GLIBC on 64-bit archs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jun 2008 13:49:10 -0000	1.3
+++ sources	22 Aug 2009 11:20:48 -0000	1.4
@@ -1 +1 @@
-9b6f25845fc4998d9151d0ef5e7936c5  cpdup-1.11.tgz
+872f41683dd0f6d32bff111e22ad50f7  cpdup-1.14.tgz


--- cpdup-1.11-explicit_sizes.patch DELETED ---



From salimma at fedoraproject.org  Sat Aug 22 11:20:48 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 11:20:48 +0000 (UTC)
Subject: rpms/cpdup/F-11 cpdup-1.14-gcc44.patch, NONE,
	1.1 cpdup-1.14-typos.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 cpdup.spec, 1.5, 1.6 sources, 1.3,
	1.4 cpdup-1.11-explicit_sizes.patch, 1.1, NONE
Message-ID: <20090822112048.CCCF511C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/cpdup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27562/F-11

Modified Files:
	.cvsignore cpdup.spec sources 
Added Files:
	cpdup-1.14-gcc44.patch cpdup-1.14-typos.patch 
Removed Files:
	cpdup-1.11-explicit_sizes.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
- Update to 1.14


cpdup-1.14-gcc44.patch:
 cpdup.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cpdup-1.14-gcc44.patch ---
--- cpdup/cpdup.h.gcc44	2008-11-29 17:22:06.000000000 -0500
+++ cpdup/cpdup.h	2009-08-22 06:11:52.916246762 -0400
@@ -11,6 +11,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>

cpdup-1.14-typos.patch:
 cpdup.1 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE cpdup-1.14-typos.patch ---
--- cpdup/cpdup.1.typos	2009-01-09 19:54:00.000000000 -0500
+++ cpdup/cpdup.1	2009-08-22 06:44:14.670245706 -0400
@@ -51,7 +51,7 @@
 The
 .Nm
 utility makes an exact mirror copy of the source in the destination, creating
-and deleting files and directories as necessary.  UTimes, hardlinks,
+and deleting files and directories as necessary.  Utimes, hardlinks,
 softlinks, devices, permissions, and flags are mirrored.  By default,
 .Nm
 asks for confirmation if any file or directory needs to be removed from
@@ -119,7 +119,7 @@
 .It Fl o
 Do not remove any files, just overwrite/add.
 .It Fl m
-Generate and maintain a MD5 checkfile in each directory on the source
+Generate and maintain an MD5 checkfile in each directory on the source
 and do an MD5 check on each file of the destination when the destination
 appears to be the same as the source.  If the check fails,
 .Nm
@@ -162,7 +162,7 @@
 must record the paths for all files it encounters while it operates
 and it is possible that you may run the process out of memory.
 .Pp
-The file found vi the hardlink path will be byte-by-byte compared with the
+The file found via the hardlink path will be byte-by-byte compared with the
 source if the
 .Fl V
 or
@@ -186,7 +186,7 @@
 into slave mode and is used to initiate the slave protocol on a remote
 machine.
 .It Fl k
-Generate and maintain a FSMID checkfile called .FSMID.CHECK in each
+Generate and maintain an FSMID checkfile called .FSMID.CHECK in each
 directory on the target.
 .Nm
 will check the FSMID for each source file or directory against the checkfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jun 2008 13:49:10 -0000	1.3
+++ .cvsignore	22 Aug 2009 11:20:48 -0000	1.4
@@ -1 +1 @@
-cpdup-1.11.tgz
+cpdup-1.14.tgz


Index: cpdup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/F-11/cpdup.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cpdup.spec	24 Feb 2009 09:21:57 -0000	1.5
+++ cpdup.spec	22 Aug 2009 11:20:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           cpdup
-Version:        1.11
-Release:        3%{?dist}
+Version:        1.14
+Release:        1%{?dist}
 Summary:        Filesystem mirroring utility
 
 Group:          Applications/Archiving
@@ -8,8 +8,9 @@ License:        BSD
 URL:            http://apollo.backplane.com/FreeSrc/
 Source0:        http://apollo.backplane.com/FreeSrc/cpdup-%{version}.tgz
 Source1:        Makefile.linux
-Patch0:         cpdup-1.11-explicit_sizes.patch
+Patch0:         cpdup-1.14-gcc44.patch
 Patch1:         cpdup-1.11-unused.patch
+Patch2:         cpdup-1.14-typos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  
@@ -30,13 +31,13 @@ destination directory with a file.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .explicit_sizes
+%patch0 -p1 -b .gcc44
 %patch1 -p1 -b .unused
+%patch2 -p1 -b .typos
 rm md5.c
 
 
 %build
-# configure
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1}
 
 
@@ -58,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
+- Update to 1.14
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jun 2008 13:49:10 -0000	1.3
+++ sources	22 Aug 2009 11:20:48 -0000	1.4
@@ -1 +1 @@
-9b6f25845fc4998d9151d0ef5e7936c5  cpdup-1.11.tgz
+872f41683dd0f6d32bff111e22ad50f7  cpdup-1.14.tgz


--- cpdup-1.11-explicit_sizes.patch DELETED ---



From salimma at fedoraproject.org  Sat Aug 22 11:20:49 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 11:20:49 +0000 (UTC)
Subject: rpms/cpdup/devel cpdup-1.14-gcc44.patch, NONE,
	1.1 cpdup-1.14-typos.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 cpdup.spec, 1.6, 1.7 sources, 1.3,
	1.4 cpdup-1.11-explicit_sizes.patch, 1.1, NONE
Message-ID: <20090822112049.1552F11C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/cpdup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27562/devel

Modified Files:
	.cvsignore cpdup.spec sources 
Added Files:
	cpdup-1.14-gcc44.patch cpdup-1.14-typos.patch 
Removed Files:
	cpdup-1.11-explicit_sizes.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
- Update to 1.14


cpdup-1.14-gcc44.patch:
 cpdup.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE cpdup-1.14-gcc44.patch ---
--- cpdup/cpdup.h.gcc44	2008-11-29 17:22:06.000000000 -0500
+++ cpdup/cpdup.h	2009-08-22 06:11:52.916246762 -0400
@@ -11,6 +11,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>

cpdup-1.14-typos.patch:
 cpdup.1 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE cpdup-1.14-typos.patch ---
--- cpdup/cpdup.1.typos	2009-01-09 19:54:00.000000000 -0500
+++ cpdup/cpdup.1	2009-08-22 06:44:14.670245706 -0400
@@ -51,7 +51,7 @@
 The
 .Nm
 utility makes an exact mirror copy of the source in the destination, creating
-and deleting files and directories as necessary.  UTimes, hardlinks,
+and deleting files and directories as necessary.  Utimes, hardlinks,
 softlinks, devices, permissions, and flags are mirrored.  By default,
 .Nm
 asks for confirmation if any file or directory needs to be removed from
@@ -119,7 +119,7 @@
 .It Fl o
 Do not remove any files, just overwrite/add.
 .It Fl m
-Generate and maintain a MD5 checkfile in each directory on the source
+Generate and maintain an MD5 checkfile in each directory on the source
 and do an MD5 check on each file of the destination when the destination
 appears to be the same as the source.  If the check fails,
 .Nm
@@ -162,7 +162,7 @@
 must record the paths for all files it encounters while it operates
 and it is possible that you may run the process out of memory.
 .Pp
-The file found vi the hardlink path will be byte-by-byte compared with the
+The file found via the hardlink path will be byte-by-byte compared with the
 source if the
 .Fl V
 or
@@ -186,7 +186,7 @@
 into slave mode and is used to initiate the slave protocol on a remote
 machine.
 .It Fl k
-Generate and maintain a FSMID checkfile called .FSMID.CHECK in each
+Generate and maintain an FSMID checkfile called .FSMID.CHECK in each
 directory on the target.
 .Nm
 will check the FSMID for each source file or directory against the checkfile


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jun 2008 13:49:10 -0000	1.3
+++ .cvsignore	22 Aug 2009 11:20:48 -0000	1.4
@@ -1 +1 @@
-cpdup-1.11.tgz
+cpdup-1.14.tgz


Index: cpdup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/devel/cpdup.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cpdup.spec	24 Jul 2009 19:32:23 -0000	1.6
+++ cpdup.spec	22 Aug 2009 11:20:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           cpdup
-Version:        1.11
-Release:        4%{?dist}
+Version:        1.14
+Release:        1%{?dist}
 Summary:        Filesystem mirroring utility
 
 Group:          Applications/Archiving
@@ -8,8 +8,9 @@ License:        BSD
 URL:            http://apollo.backplane.com/FreeSrc/
 Source0:        http://apollo.backplane.com/FreeSrc/cpdup-%{version}.tgz
 Source1:        Makefile.linux
-Patch0:         cpdup-1.11-explicit_sizes.patch
+Patch0:         cpdup-1.14-gcc44.patch
 Patch1:         cpdup-1.11-unused.patch
+Patch2:         cpdup-1.14-typos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  
@@ -30,13 +31,13 @@ destination directory with a file.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .explicit_sizes
+%patch0 -p1 -b .gcc44
 %patch1 -p1 -b .unused
+%patch2 -p1 -b .typos
 rm md5.c
 
 
 %build
-# configure
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1}
 
 
@@ -58,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.14-1
+- Update to 1.14
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpdup/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jun 2008 13:49:10 -0000	1.3
+++ sources	22 Aug 2009 11:20:48 -0000	1.4
@@ -1 +1 @@
-9b6f25845fc4998d9151d0ef5e7936c5  cpdup-1.11.tgz
+872f41683dd0f6d32bff111e22ad50f7  cpdup-1.14.tgz


--- cpdup-1.11-explicit_sizes.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Aug 22 11:28:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:28:14 +0000
Subject: [pkgdb] mipv6-daemon: jrowens has requested watchbugzilla
Message-ID: <20090822112814.807E710F855@bastion2.fedora.phx.redhat.com>

jrowens has requested the watchbugzilla acl on mipv6-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 11:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:28:16 +0000
Subject: [pkgdb] mipv6-daemon: jrowens has requested watchcommits
Message-ID: <20090822112816.8EE5B10F86F@bastion2.fedora.phx.redhat.com>

jrowens has requested the watchcommits acl on mipv6-daemon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 11:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:28:23 +0000
Subject: [pkgdb] mipv6-daemon: jrowens has requested watchbugzilla
Message-ID: <20090822112823.B7AF010F886@bastion2.fedora.phx.redhat.com>

jrowens has requested the watchbugzilla acl on mipv6-daemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 11:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:28:24 +0000
Subject: [pkgdb] mipv6-daemon: jrowens has requested watchcommits
Message-ID: <20090822112824.9453E10F890@bastion2.fedora.phx.redhat.com>

jrowens has requested the watchcommits acl on mipv6-daemon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From dwalsh at fedoraproject.org  Sat Aug 22 11:40:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 22 Aug 2009 11:40:17 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.32,
	1.33 setroubleshoot-plugins.spec, 1.37, 1.38 sources, 1.33, 1.34
Message-ID: <20090822114017.6BF1311C0439@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31958

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Sat Aug 22 2009  <dwalsh at redhat.com> - 2.1.16-1
- Fix subject to not include types



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	19 Aug 2009 20:48:18 -0000	1.32
+++ .cvsignore	22 Aug 2009 11:40:17 -0000	1.33
@@ -22,3 +22,4 @@ setroubleshoot-plugins-2.1.12.tar.gz
 setroubleshoot-plugins-2.1.13.tar.gz
 setroubleshoot-plugins-2.1.14.tar.gz
 setroubleshoot-plugins-2.1.15.tar.gz
+setroubleshoot-plugins-2.1.16.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- setroubleshoot-plugins.spec	19 Aug 2009 20:48:18 -0000	1.37
+++ setroubleshoot-plugins.spec	22 Aug 2009 11:40:17 -0000	1.38
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.15
+Version: 2.1.16
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Sat Aug 22 2009  <dwalsh at redhat.com> - 2.1.16-1
+- Fix subject to not include types
+
 * Wed Aug 19 2009  <dwalsh at redhat.com> - 2.1.15-1
   - Fix mislabeled_file.py
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	19 Aug 2009 20:48:18 -0000	1.33
+++ sources	22 Aug 2009 11:40:17 -0000	1.34
@@ -1 +1 @@
-dc3996581624a09cf0a3fae794e58a52  setroubleshoot-plugins-2.1.15.tar.gz
+86f7d1e7260fd423f5940f5892e4a39c  setroubleshoot-plugins-2.1.16.tar.gz



From tmraz at fedoraproject.org  Sat Aug 22 11:45:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 11:45:56 +0000 (UTC)
Subject: rpms/bacula/devel bacula-3.0.2-openssl.patch, NONE, 1.1 bacula.spec,
	1.31, 1.32
Message-ID: <20090822114556.E704511C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv954

Modified Files:
	bacula.spec 
Added Files:
	bacula-3.0.2-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
- rebuilt with new openssl


bacula-3.0.2-openssl.patch:
 crypto.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE bacula-3.0.2-openssl.patch ---
diff -up bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c
--- bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl	2008-11-06 20:10:08.000000000 +0100
+++ bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c	2009-08-22 12:48:20.000000000 +0200
@@ -309,7 +309,11 @@ typedef struct PEM_CB_Context {
  */
 static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
    X509_EXTENSION *ext;
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
    X509V3_EXT_METHOD *method;
+#else
+   const X509V3_EXT_METHOD *method;
+#endif
    ASN1_OCTET_STRING *keyid;
    int i;
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
@@ -973,6 +977,10 @@ void crypto_sign_free(SIGNATURE *sig)
    free (sig);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+#endif
 /*
  * Create a new encryption session.
  *  Returns: A pointer to a CRYPTO_SESSION object on success.


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- bacula.spec	21 Aug 2009 12:33:34 -0000	1.31
+++ bacula.spec	22 Aug 2009 11:45:56 -0000	1.32
@@ -39,6 +39,7 @@ Patch3: bacula-pamd.patch
 #Patch10: bacula-web-smarty.patch
 #Patch11: bacula-2.4.3-orphaned-jobs.patch
 #Patch12: bacula-2.4.3-python26.patch
+Patch13: bacula-3.0.2-openssl.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -365,6 +366,7 @@ pushd bacula-%{version}
 #%patch9 -p0
 #%patch11 -p0
 #%patch12 -p0
+%patch13 -p1 -b .openssl
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -1005,7 +1007,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
 - rebuilt with new openssl
 
 * Mon Aug 10 2009 Jon Ciesla <limb at jcomserv.net - 3.0.2-3



From pkgdb at fedoraproject.org  Sat Aug 22 11:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:47:18 +0000
Subject: [pkgdb] gxine had acl change status
Message-ID: <20090822114718.8278F10F84D@bastion2.fedora.phx.redhat.com>

mso has set the watchbugzilla acl on gxine (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From pkgdb at fedoraproject.org  Sat Aug 22 11:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:47:20 +0000
Subject: [pkgdb] gxine had acl change status
Message-ID: <20090822114720.EC9DE10F85C@bastion2.fedora.phx.redhat.com>

mso has set the watchcommits acl on gxine (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From pkgdb at fedoraproject.org  Sat Aug 22 11:47:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:47:23 +0000
Subject: [pkgdb] gxine had acl change status
Message-ID: <20090822114723.63A8310F882@bastion2.fedora.phx.redhat.com>

mso has set the commit acl on gxine (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From pkgdb at fedoraproject.org  Sat Aug 22 11:47:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:47:25 +0000
Subject: [pkgdb] gxine had acl change status
Message-ID: <20090822114725.B6E6210F88C@bastion2.fedora.phx.redhat.com>

mso has set the approveacls acl on gxine (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gxine



From dwalsh at fedoraproject.org  Sat Aug 22 11:51:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 22 Aug 2009 11:51:13 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.57,
	1.58 selinux-policy.spec, 1.901, 1.902
Message-ID: <20090822115113.5BEF811C00A2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2057

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-5
- Allow cronjobs to read exim_spool_t


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   16 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  287 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |   16 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 policy/modules/kernel/files.fc                     |    3 
 policy/modules/kernel/files.if                     |  297 ++++
 policy/modules/kernel/files.te                     |    6 
 policy/modules/kernel/filesystem.fc                |    2 
 policy/modules/kernel/filesystem.if                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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             |   37 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  391 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   14 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    6 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 policy/modules/services/dbus.if                    |   28 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 policy/modules/services/kerberos.te                |   13 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   46 
 policy/modules/services/policykit.te               |   54 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   63 
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  262 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   32 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  106 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1345 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 328 files changed, 14406 insertions(+), 2974 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- policy-F12.patch	21 Aug 2009 22:58:28 -0000	1.57
+++ policy-F12.patch	22 Aug 2009 11:51:12 -0000	1.58
@@ -3539,16 +3539,18 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(ptchown_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te	2009-08-21 18:56:07.000000000 -0400
-@@ -22,6 +22,7 @@
++++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te	2009-08-22 07:48:07.000000000 -0400
+@@ -22,6 +22,9 @@
  allow pulseaudio_t self:unix_dgram_socket { sendto create_socket_perms };
  allow pulseaudio_t self:tcp_socket create_stream_socket_perms;
  allow pulseaudio_t self:udp_socket create_socket_perms;
 +allow pulseaudio_t self:netlink_kobject_uevent_socket create_socket_perms;
++
++can_exec(pulseaudio_t, pulseaudio_exec_t)
  
  kernel_read_kernel_sysctls(pulseaudio_t)
  
-@@ -47,6 +48,7 @@
+@@ -47,6 +50,7 @@
  
  fs_rw_anon_inodefs_files(pulseaudio_t)
  fs_getattr_tmpfs(pulseaudio_t)
@@ -3556,15 +3558,23 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_all_user_ttys(pulseaudio_t)
  term_use_all_user_ptys(pulseaudio_t)
-@@ -81,12 +83,15 @@
- ')
- 
- optional_policy(`
-+	rpm_dbus_chat(pulseaudio_t)
+@@ -78,6 +82,15 @@
+ 	policykit_domtrans_auth(pulseaudio_t)
+ 	policykit_read_lib(pulseaudio_t)
+ 	policykit_read_reload(pulseaudio_t)
++	policykit_dbus_chat(pulseaudio_t)
 +')
 +
 +optional_policy(`
- 	udev_read_db(pulseaudio_t)
++	rtkit_daemon_system_domain(pulseaudio_t)
++')
++
++optional_policy(`
++	rpm_dbus_chat(pulseaudio_t)
+ ')
+ 
+ optional_policy(`
+@@ -85,8 +98,7 @@
  ')
  
  optional_policy(`
@@ -10536,7 +10546,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.28/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/cron.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/cron.te	2009-08-22 07:19:25.000000000 -0400
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10811,7 +10821,7 @@ diff -b -B --ignore-all-space --exclude-
  	# via redirection of standard out.
  	optional_policy(`
  		rpm_manage_log(system_cronjob_t)
-@@ -419,6 +490,10 @@
+@@ -419,6 +490,14 @@
  ')
  
  optional_policy(`
@@ -10819,10 +10829,14 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	exim_read_spool_files(system_cronjob_t)
++')
++
++optional_policy(`
  	ftp_read_log(system_cronjob_t)
  ')
  
-@@ -429,11 +504,20 @@
+@@ -429,11 +508,20 @@
  ')
  
  optional_policy(`
@@ -10843,7 +10857,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -445,9 +529,11 @@
+@@ -445,9 +533,11 @@
  ')	
  
  optional_policy(`
@@ -10857,7 +10871,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -461,8 +547,7 @@
+@@ -461,8 +551,7 @@
  ')
  
  optional_policy(`
@@ -10867,7 +10881,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -470,24 +555,17 @@
+@@ -470,24 +559,17 @@
  ')
  
  optional_policy(`
@@ -10895,7 +10909,7 @@ diff -b -B --ignore-all-space --exclude-
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -571,6 +649,9 @@
+@@ -571,6 +653,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -10905,7 +10919,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`fcron_crond', `
  	allow crond_t user_cron_spool_t:file manage_file_perms;
  ')
-@@ -590,13 +671,5 @@
+@@ -590,13 +675,5 @@
  #
  
  optional_policy(`
@@ -15532,8 +15546,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/libexec/rtkit-daemon	--	gen_context(system_u:object_r:rtkit_daemon_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit_daemon.if serefpolicy-3.6.28/policy/modules/services/rtkit_daemon.if
 --- nsaserefpolicy/policy/modules/services/rtkit_daemon.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/services/rtkit_daemon.if	2009-08-21 18:56:07.000000000 -0400
-@@ -0,0 +1,64 @@
++++ serefpolicy-3.6.28/policy/modules/services/rtkit_daemon.if	2009-08-22 07:45:49.000000000 -0400
+@@ -0,0 +1,63 @@
 +
 +## <summary>policy for rtkit_daemon</summary>
 +
@@ -15580,8 +15594,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
-+##	Send and receive messages from
-+##	rtkit_daemon over dbus.
++##	Allow rtkit to control scheduling for your process
 +## </summary>
 +## <param name="domain">
 +##	<summary>


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -p -r1.901 -r1.902
--- selinux-policy.spec	21 Aug 2009 22:58:28 -0000	1.901
+++ selinux-policy.spec	22 Aug 2009 11:51:13 -0000	1.902
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-5
+- Allow cronjobs to read exim_spool_t
+
 * Fri Aug 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-4
 - Add ABRT policy
 



From pkgdb at fedoraproject.org  Sat Aug 22 11:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:53:58 +0000
Subject: [pkgdb] mipv6-daemon had acl change status
Message-ID: <20090822115358.422AC10F854@bastion2.fedora.phx.redhat.com>

tgraf has set the watchbugzilla acl on mipv6-daemon (Fedora devel) to Approved for jrowens

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 11:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:54:10 +0000
Subject: [pkgdb] mipv6-daemon had acl change status
Message-ID: <20090822115410.E72C710F881@bastion2.fedora.phx.redhat.com>

tgraf has set the watchbugzilla acl on mipv6-daemon (Fedora 11) to Approved for jrowens

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 11:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:54:01 +0000
Subject: [pkgdb] mipv6-daemon had acl change status
Message-ID: <20090822115401.B9D3C10F889@bastion2.fedora.phx.redhat.com>

tgraf has set the watchcommits acl on mipv6-daemon (Fedora devel) to Approved for jrowens

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 11:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 11:54:13 +0000
Subject: [pkgdb] mipv6-daemon had acl change status
Message-ID: <20090822115413.1367910F888@bastion2.fedora.phx.redhat.com>

tgraf has set the watchcommits acl on mipv6-daemon (Fedora 11) to Approved for jrowens

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mipv6-daemon



From pkgdb at fedoraproject.org  Sat Aug 22 12:03:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 12:03:12 +0000
Subject: [pkgdb] ddclient: jrowens has requested watchbugzilla
Message-ID: <20090822120312.7F2CA10F85C@bastion2.fedora.phx.redhat.com>

jrowens has requested the watchbugzilla acl on ddclient (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ddclient



From pkgdb at fedoraproject.org  Sat Aug 22 12:03:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 12:03:16 +0000
Subject: [pkgdb] ddclient: jrowens has requested watchcommits
Message-ID: <20090822120316.770E710F889@bastion2.fedora.phx.redhat.com>

jrowens has requested the watchcommits acl on ddclient (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ddclient



From dwalsh at fedoraproject.org  Sat Aug 22 12:08:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 22 Aug 2009 12:08:36 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.433,
	1.434 policycoreutils.spec, 1.628, 1.629
Message-ID: <20090822120836.5813611C00A2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5885

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-10
- Fix realpath usage to only happen on argv input from user


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 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_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++
 restorecond/watch.c                         |  254 ++++++++++
 scripts/Makefile                            |    3 
 scripts/chcat                               |    2 
 scripts/sandbox                             |  139 +++++
 scripts/sandbox.8                           |   22 
 scripts/sandbox.py                          |   67 ++
 semanage/semanage                           |   34 +
 semanage/seobject.py                        |   66 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 +++++++++++++++++++++
 setfiles/restore.h                          |   49 +
 setfiles/setfiles.c                         |  687 +++-------------------------
 22 files changed, 1610 insertions(+), 970 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -p -r1.433 -r1.434
--- policycoreutils-rhat.patch	20 Aug 2009 19:51:45 -0000	1.433
+++ policycoreutils-rhat.patch	22 Aug 2009 12:08:34 -0000	1.434
@@ -105,7 +105,7 @@ diff --exclude-from=exclude --exclude=se
 +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.71/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-20 15:30:44.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-22 08:03:13.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -430,7 +430,7 @@ diff --exclude-from=exclude --exclude=se
  	exit(0);
  }
  
-@@ -390,74 +134,35 @@
+@@ -390,74 +134,33 @@
     to see if it is one that we are watching.
  */
  
@@ -511,12 +511,10 @@ diff --exclude-from=exclude --exclude=se
 +	r_opts.verbose = 0;
 +	r_opts.logging = 0;
 +	r_opts.rootpath = NULL;
-+	r_opts.expand_realpath = 0;
 +	r_opts.rootpathlen = 0;
 +	r_opts.outfile = NULL;
 +	r_opts.force = 0;
 +	r_opts.hard_links = 0;
-+	r_opts.expand_realpath = 1;
 +	r_opts.abort_on_error = 0;
 +	r_opts.add_assoc = 0;
 +	r_opts.fts_flags = FTS_PHYSICAL;
@@ -529,7 +527,7 @@ diff --exclude-from=exclude --exclude=se
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -467,38 +172,59 @@
+@@ -467,38 +170,59 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
@@ -1685,8 +1683,8 @@ 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.71/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-20 13:11:02.000000000 -0400
-@@ -0,0 +1,530 @@
++++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-22 07:59:20.000000000 -0400
+@@ -0,0 +1,519 @@
 +#include "restore.h"
 +
 +#define SKIP -2
@@ -1949,17 +1947,6 @@ diff --exclude-from=exclude --exclude=se
 +	dev_t dev_num = 0;
 +	FTS *fts_handle;
 +	FTSENT *ftsent;
-+	
-+	if (r_opts->expand_realpath) {
-+		char *p;
-+		p = realpath(name, NULL);
-+		if (!p) {
-+			fprintf(stderr, "realpath(%s) failed %s\n", name,
-+				strerror(errno));
-+			return -1;
-+		}
-+		name = p;
-+	}
 +
 +	if (r_opts == NULL){
 +		fprintf(stderr,
@@ -2219,8 +2206,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.71/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-20 12:53:16.000000000 -0400
-@@ -0,0 +1,50 @@
++++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-22 08:02:45.000000000 -0400
+@@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
 +#ifndef _GNU_SOURCE
@@ -2256,7 +2243,6 @@ diff --exclude-from=exclude --exclude=se
 +	FILE *outfile;
 +	int force;
 +	struct selabel_handle *hnd;
-+	int expand_realpath;  /* Expand paths via realpath. */
 +	int abort_on_error; /* Abort the file tree walk upon an error. */
 +	int quiet;
 +	int fts_flags; /* Flags to fts, e.g. follow links, follow mounts */
@@ -2273,7 +2259,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/setfiles/setfiles.c policycoreutils-2.0.71/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-08-12 12:08:15.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-22 08:06:25.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE
@@ -2837,7 +2823,7 @@ diff --exclude-from=exclude --exclude=se
 -		goto err;
 -	}
 -
- 
+-
 -	ftsent = fts_read(fts_handle);
 -	if (ftsent != NULL) {
 -		/* Keep the inode of the first one. */
@@ -2881,7 +2867,7 @@ diff --exclude-from=exclude --exclude=se
 -	if (expand_realpath)
 -		free(name);
 -	return rc;
--
+ 
 -err:
 -	if (!strcmp(name, "/"))
 -		mass_relabel_errs = 1;
@@ -2891,7 +2877,7 @@ diff --exclude-from=exclude --exclude=se
  
  #ifndef USE_AUDIT
  static void maybe_audit_mass_relabel(void)
-@@ -729,21 +209,32 @@
+@@ -729,27 +209,37 @@
  	int use_input_file = 0;
  	char *buf = NULL;
  	size_t buf_len;
@@ -2932,7 +2918,13 @@ diff --exclude-from=exclude --exclude=se
  	
  	if (!strcmp(base, SETFILES)) {
  		/* 
-@@ -757,10 +248,10 @@
+ 		 * setfiles:  
+ 		 * Recursive descent,
+-		 * Does not expand paths via realpath, 
+ 		 * Aborts on errors during the file tree walk, 
+ 		 * Try to track inode associations for conflict detection,
+ 		 * Does not follow mounts,
+@@ -757,29 +247,26 @@
  		 */
  		iamrestorecon = 0;
  		recurse = 1;
@@ -2940,14 +2932,17 @@ diff --exclude-from=exclude --exclude=se
 -		abort_on_error = 1;
 -		add_assoc = 1;
 -		fts_flags = FTS_PHYSICAL | FTS_XDEV;
-+		r_opts.expand_realpath = 0;
 +		r_opts.abort_on_error = 1;
 +		r_opts.add_assoc = 1;
 +		r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV;
  		ctx_validate = 1;
  	} else {
  		/*
-@@ -772,14 +263,14 @@
+ 		 * restorecon:  
+ 		 * No recursive descent unless -r/-R,
+-		 * Expands paths via realpath, 
+ 		 * Do not abort on errors during the file tree walk,
+ 		 * Do not try to track inode associations for conflict detection,
  		 * Follows mounts,
  		 * Does lazy validation of contexts upon use. 
  		 */
@@ -2960,14 +2955,13 @@ diff --exclude-from=exclude --exclude=se
 -		abort_on_error = 0;
 -		add_assoc = 0;
 -		fts_flags = FTS_PHYSICAL;
-+		r_opts.expand_realpath = 1;
 +		r_opts.abort_on_error = 0;
 +		r_opts.add_assoc = 0;
 +		r_opts.fts_flags = FTS_PHYSICAL;
  		ctx_validate = 0;
  
  		/* restorecon only:  silent exit if no SELinux.
-@@ -828,11 +319,6 @@
+@@ -828,11 +315,6 @@
  			}
  		case 'e':
  			remove_exclude(optarg);
@@ -2979,7 +2973,7 @@ diff --exclude-from=exclude --exclude=se
  			if (add_exclude(optarg))
  				exit(1);
  			break;
-@@ -841,37 +327,37 @@
+@@ -841,37 +323,37 @@
  			input_filename = optarg;
  			break;			
  		case 'd':
@@ -3026,7 +3020,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'R':
  		case 'r':
-@@ -880,11 +366,11 @@
+@@ -880,11 +362,11 @@
  				break;
  			}
  			if (optind + 1 >= argc) {
@@ -3040,7 +3034,7 @@ diff --exclude-from=exclude --exclude=se
  				fprintf(stderr,
  					"%s: only one -r can be specified\n",
  					argv[0]);
-@@ -895,23 +381,23 @@
+@@ -895,23 +377,23 @@
  		case 's':
  			use_input_file = 1;
  			input_filename = "-";
@@ -3069,7 +3063,7 @@ diff --exclude-from=exclude --exclude=se
  			break;
  		case 'W':
  			warn_no_match = 1;
-@@ -959,18 +445,13 @@
+@@ -959,18 +441,13 @@
  	}
  
  	/* Load the file contexts configuration and check it. */
@@ -3091,14 +3085,22 @@ diff --exclude-from=exclude --exclude=se
  	if (use_input_file) {
  		FILE *f = stdin;
  		ssize_t len;
-@@ -987,31 +468,34 @@
+@@ -987,31 +464,49 @@
  		delim = (null_terminated != 0) ? '\0' : '\n';
  		while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
  			buf[len - 1] = 0;
 -			errors |= process_one(buf);
 +			if (!strcmp(buf, "/"))
 +				mass_relabel = 1;
-+			errors |= process_one(buf, recurse) < 0;
++	
++			char *filename = realpath(buf, NULL);
++			if (!filename) {
++				fprintf(stderr, "realpath(%s) failed %s\n", buf,
++					strerror(errno));
++				return -1;
++			}
++			errors |= process_one(filename, recurse) < 0;
++			free(filename);
  		}
  		if (strcmp(input_filename, "-") != 0)
  			fclose(f);
@@ -3107,7 +3109,14 @@ diff --exclude-from=exclude --exclude=se
 -			errors |= process_one(argv[i]);
 +			if (!strcmp(argv[i], "/"))
 +				mass_relabel = 1;
-+			errors |= process_one(argv[i], recurse) < 0;
++			char *filename = realpath(argv[i], NULL);
++			if (!filename) {
++				fprintf(stderr, "realpath(%s) failed %s\n", argv[i],
++					strerror(errno));
++				return -1;
++			}
++			errors |= process_one(filename, recurse) < 0;
++			free(filename);
  		}
  	}
 -
@@ -3118,15 +3127,15 @@ diff --exclude-from=exclude --exclude=se
  
  	if (warn_no_match)
 -		selabel_stats(hnd);
--
--	selabel_close(hnd);
 +		selabel_stats(r_opts.hnd);
  
--	if (outfile)
--		fclose(outfile);
+-	selabel_close(hnd);
 +	selabel_close(r_opts.hnd);
 +	restore_finish();
  
+-	if (outfile)
+-		fclose(outfile);
+-
 -	for (i = 0; i < excludeCtr; i++) {
 -		free(excludeArray[i].directory);
 -	}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -p -r1.628 -r1.629
--- policycoreutils.spec	21 Aug 2009 19:30:00 -0000	1.628
+++ policycoreutils.spec	22 Aug 2009 12:08:36 -0000	1.629
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -265,6 +265,9 @@ fi
 exit 0
 
 %changelog
+* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-10
+- Fix realpath usage to only happen on argv input from user
+
 * Fri Aug 21 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.0.71-9
 - Don't try to remove restorecond after last erase (done already in %%preun).
 - Ensure scriptlets exit with status 0.



From rathann at fedoraproject.org  Sat Aug 22 12:31:55 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 12:31:55 +0000 (UTC)
Subject: rpms/chemtool/devel .cvsignore, 1.4, 1.5 chemtool-compile.patch, 1.2,
	1.3 chemtool.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090822123155.2D8F111C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/chemtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9947

Modified Files:
	.cvsignore chemtool-compile.patch chemtool.spec sources 
Log Message:
* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
- updated to 1.6.12
- dropped obsolete patch hunks
- moved gtk-update-icon-cache to posttrans scriptlet



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2007 20:13:27 -0000	1.4
+++ .cvsignore	22 Aug 2009 12:31:54 -0000	1.5
@@ -1 +1 @@
-chemtool-1.6.11.tar.gz
+chemtool-1.6.12.tar.gz

chemtool-compile.patch:
 cht-2.5.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Index: chemtool-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/chemtool-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chemtool-compile.patch	26 Aug 2007 20:13:27 -0000	1.2
+++ chemtool-compile.patch	22 Aug 2009 12:31:54 -0000	1.3
@@ -1,16 +1,6 @@
---- chemtool-1.6.11/Makefile.in.compile	2007-08-26 13:53:59.000000000 +0200
-+++ chemtool-1.6.11/Makefile.in	2007-08-26 20:37:00.000000000 +0200
-@@ -230,7 +230,7 @@ chemtool_SOURCES = main.c draw.c graph.c
- AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
- 
- # Link time dependencies.
--LDADD = @LIBINTL@ @GTK_LIBS@
-+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
- 
- # Additional files to be distributed.
- EXTRA_DIST = autogen.sh autoclean.sh
---- chemtool-1.6.11/src-cht/cht-2.5.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/src-cht/cht-2.5.c	2007-08-26 20:30:25.000000000 +0200
+diff -up chemtool-1.6.12/src-cht/cht-2.5.c.compile chemtool-1.6.12/src-cht/cht-2.5.c
+--- chemtool-1.6.12/src-cht/cht-2.5.c.compile	2007-11-10 22:12:35.000000000 +0100
++++ chemtool-1.6.12/src-cht/cht-2.5.c	2009-08-22 13:49:26.000000000 +0200
 @@ -121,11 +121,6 @@
  #define LACK_MEMMOVE
  #define LACK_MEMCPY
@@ -80,14 +70,3 @@
  
  int my_toupper(c)
  int c;
---- chemtool-1.6.11/inout.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/inout.c	2007-08-26 20:30:25.000000000 +0200
-@@ -13,7 +13,7 @@
- #include "gdk/gdkprivate.h"
- #include <locale.h>
- #ifdef EMF
--#include <emf.h>
-+#include <libEMF/emf.h>
- #endif
- #ifdef DISABLE_NLS
- #define _(Text) Text


Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/chemtool.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- chemtool.spec	24 Jul 2009 18:53:20 -0000	1.9
+++ chemtool.spec	22 Aug 2009 12:31:54 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A program for 2D drawing organic molecules
 Name: chemtool
-Version: 1.6.11
-Release: 5%{?dist}
+Version: 1.6.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
@@ -64,13 +64,17 @@ desktop-file-install --vendor=fedora \
 %find_lang %{name}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
 %clean
@@ -88,6 +92,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
+- updated to 1.6.12
+- dropped obsolete patch hunks
+- moved gtk-update-icon-cache to posttrans scriptlet
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2007 20:13:27 -0000	1.4
+++ sources	22 Aug 2009 12:31:54 -0000	1.5
@@ -1 +1 @@
-25c15b2ee73fc89b4e34cafd57daca31  chemtool-1.6.11.tar.gz
+f9e0633cbda09fcfe5a4ea4c56bcd460  chemtool-1.6.12.tar.gz



From rathann at fedoraproject.org  Sat Aug 22 12:36:02 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 12:36:02 +0000 (UTC)
Subject: rpms/chemtool/F-11 .cvsignore, 1.4, 1.5 chemtool-compile.patch, 1.2,
	1.3 chemtool.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090822123602.0F3DC11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/chemtool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11464

Modified Files:
	.cvsignore chemtool-compile.patch chemtool.spec sources 
Log Message:
* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
- updated to 1.6.12
- dropped obsolete patch hunks
- moved gtk-update-icon-cache to posttrans scriptlet



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2007 20:13:27 -0000	1.4
+++ .cvsignore	22 Aug 2009 12:36:01 -0000	1.5
@@ -1 +1 @@
-chemtool-1.6.11.tar.gz
+chemtool-1.6.12.tar.gz

chemtool-compile.patch:
 cht-2.5.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Index: chemtool-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-11/chemtool-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chemtool-compile.patch	26 Aug 2007 20:13:27 -0000	1.2
+++ chemtool-compile.patch	22 Aug 2009 12:36:01 -0000	1.3
@@ -1,16 +1,6 @@
---- chemtool-1.6.11/Makefile.in.compile	2007-08-26 13:53:59.000000000 +0200
-+++ chemtool-1.6.11/Makefile.in	2007-08-26 20:37:00.000000000 +0200
-@@ -230,7 +230,7 @@ chemtool_SOURCES = main.c draw.c graph.c
- AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
- 
- # Link time dependencies.
--LDADD = @LIBINTL@ @GTK_LIBS@
-+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
- 
- # Additional files to be distributed.
- EXTRA_DIST = autogen.sh autoclean.sh
---- chemtool-1.6.11/src-cht/cht-2.5.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/src-cht/cht-2.5.c	2007-08-26 20:30:25.000000000 +0200
+diff -up chemtool-1.6.12/src-cht/cht-2.5.c.compile chemtool-1.6.12/src-cht/cht-2.5.c
+--- chemtool-1.6.12/src-cht/cht-2.5.c.compile	2007-11-10 22:12:35.000000000 +0100
++++ chemtool-1.6.12/src-cht/cht-2.5.c	2009-08-22 13:49:26.000000000 +0200
 @@ -121,11 +121,6 @@
  #define LACK_MEMMOVE
  #define LACK_MEMCPY
@@ -80,14 +70,3 @@
  
  int my_toupper(c)
  int c;
---- chemtool-1.6.11/inout.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/inout.c	2007-08-26 20:30:25.000000000 +0200
-@@ -13,7 +13,7 @@
- #include "gdk/gdkprivate.h"
- #include <locale.h>
- #ifdef EMF
--#include <emf.h>
-+#include <libEMF/emf.h>
- #endif
- #ifdef DISABLE_NLS
- #define _(Text) Text


Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-11/chemtool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- chemtool.spec	24 Feb 2009 07:18:12 -0000	1.8
+++ chemtool.spec	22 Aug 2009 12:36:01 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A program for 2D drawing organic molecules
 Name: chemtool
-Version: 1.6.11
-Release: 4%{?dist}
+Version: 1.6.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
@@ -64,13 +64,17 @@ desktop-file-install --vendor=fedora \
 %find_lang %{name}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
 %clean
@@ -88,6 +92,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
+- updated to 1.6.12
+- dropped obsolete patch hunks
+- moved gtk-update-icon-cache to posttrans scriptlet
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2007 20:13:27 -0000	1.4
+++ sources	22 Aug 2009 12:36:01 -0000	1.5
@@ -1 +1 @@
-25c15b2ee73fc89b4e34cafd57daca31  chemtool-1.6.11.tar.gz
+f9e0633cbda09fcfe5a4ea4c56bcd460  chemtool-1.6.12.tar.gz



From lucilanga at fedoraproject.org  Sat Aug 22 12:37:53 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 22 Aug 2009 12:37:53 +0000 (UTC)
Subject: rpms/libftdi/devel libftdi.spec,1.11,1.12
Message-ID: <20090822123753.4BF3411C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11960

Modified Files:
	libftdi.spec 
Log Message:
* Sat Aug 22 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-7
- add group for udev rule (#517773)


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/libftdi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libftdi.spec	31 Jul 2009 11:07:54 -0000	1.11
+++ libftdi.spec	22 Aug 2009 12:37:53 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:		libftdi
 Version:	0.16
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Library to program and control the FTDI USB controller
 
 Group:		System Environment/Libraries
@@ -14,6 +14,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	libusb-devel, doxygen, boost-devel, python-devel, swig
 Requires:	pkgconfig, udev
+Requires(pre):	shadow-utils
+
 
 %package devel
 Summary:	Header files and static libraries for libftdi
@@ -123,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*.hpp
 %{_libdir}/pkgconfig/libftdipp.pc
 
+%pre
+getent group GROUPNAME >/dev/null || groupadd -r plugdev
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -131,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun c++ -p /sbin/ldconfig
 
 %changelog
+* Sat Aug 22 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-7
+- add group for udev rule (#517773)
+
 * Fri Jul 31 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-6
 - rebuilt with modified patch
 



From rathann at fedoraproject.org  Sat Aug 22 12:39:57 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 12:39:57 +0000 (UTC)
Subject: rpms/chemtool/F-10 .cvsignore, 1.4, 1.5 chemtool-compile.patch, 1.2,
	1.3 chemtool.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090822123957.EE27D11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/chemtool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12409

Modified Files:
	.cvsignore chemtool-compile.patch chemtool.spec sources 
Log Message:
* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
- updated to 1.6.12
- dropped obsolete patch hunks
- moved gtk-update-icon-cache to posttrans scriptlet



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2007 20:13:27 -0000	1.4
+++ .cvsignore	22 Aug 2009 12:39:57 -0000	1.5
@@ -1 +1 @@
-chemtool-1.6.11.tar.gz
+chemtool-1.6.12.tar.gz

chemtool-compile.patch:
 cht-2.5.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Index: chemtool-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-10/chemtool-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- chemtool-compile.patch	26 Aug 2007 20:13:27 -0000	1.2
+++ chemtool-compile.patch	22 Aug 2009 12:39:57 -0000	1.3
@@ -1,16 +1,6 @@
---- chemtool-1.6.11/Makefile.in.compile	2007-08-26 13:53:59.000000000 +0200
-+++ chemtool-1.6.11/Makefile.in	2007-08-26 20:37:00.000000000 +0200
-@@ -230,7 +230,7 @@ chemtool_SOURCES = main.c draw.c graph.c
- AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
- 
- # Link time dependencies.
--LDADD = @LIBINTL@ @GTK_LIBS@
-+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
- 
- # Additional files to be distributed.
- EXTRA_DIST = autogen.sh autoclean.sh
---- chemtool-1.6.11/src-cht/cht-2.5.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/src-cht/cht-2.5.c	2007-08-26 20:30:25.000000000 +0200
+diff -up chemtool-1.6.12/src-cht/cht-2.5.c.compile chemtool-1.6.12/src-cht/cht-2.5.c
+--- chemtool-1.6.12/src-cht/cht-2.5.c.compile	2007-11-10 22:12:35.000000000 +0100
++++ chemtool-1.6.12/src-cht/cht-2.5.c	2009-08-22 13:49:26.000000000 +0200
 @@ -121,11 +121,6 @@
  #define LACK_MEMMOVE
  #define LACK_MEMCPY
@@ -80,14 +70,3 @@
  
  int my_toupper(c)
  int c;
---- chemtool-1.6.11/inout.c.compile	2007-08-26 13:49:26.000000000 +0200
-+++ chemtool-1.6.11/inout.c	2007-08-26 20:30:25.000000000 +0200
-@@ -13,7 +13,7 @@
- #include "gdk/gdkprivate.h"
- #include <locale.h>
- #ifdef EMF
--#include <emf.h>
-+#include <libEMF/emf.h>
- #endif
- #ifdef DISABLE_NLS
- #define _(Text) Text


Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-10/chemtool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- chemtool.spec	19 Feb 2008 20:32:29 -0000	1.7
+++ chemtool.spec	22 Aug 2009 12:39:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A program for 2D drawing organic molecules
 Name: chemtool
-Version: 1.6.11
-Release: 3%{?dist}
+Version: 1.6.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
@@ -64,13 +64,17 @@ desktop-file-install --vendor=fedora \
 %find_lang %{name}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 %{_bindir}/update-desktop-database &> /dev/null ||:
 
 %clean
@@ -88,6 +92,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.12-1
+- updated to 1.6.12
+- dropped obsolete patch hunks
+- moved gtk-update-icon-cache to posttrans scriptlet
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.11-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2007 20:13:27 -0000	1.4
+++ sources	22 Aug 2009 12:39:57 -0000	1.5
@@ -1 +1 @@
-25c15b2ee73fc89b4e34cafd57daca31  chemtool-1.6.11.tar.gz
+f9e0633cbda09fcfe5a4ea4c56bcd460  chemtool-1.6.12.tar.gz



From cebbert at fedoraproject.org  Sat Aug 22 12:43:28 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 22 Aug 2009 12:43:28 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1113, 1.1114 kernel.spec, 1.1730, 1.1731 sources, 1.1071,
	1.1072 upstream, 1.985, 1.986 patch-2.6.31-rc6-git6.bz2.sign,
	1.1, NONE patch-2.6.31-rc6.bz2.sign, 1.1, NONE
Message-ID: <20090822124328.9B8CB11C00A2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13219

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7.bz2.sign 
Removed Files:
	patch-2.6.31-rc6-git6.bz2.sign patch-2.6.31-rc6.bz2.sign 
Log Message:
2.6.31-rc7


--- NEW FILE patch-2.6.31-rc7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKj0eHyGugalF9Dw4RAjSmAKCFx5UWyr47ufID24+cAt+aDkzuFQCcChR4
UL+Pz+UF1aRBLquOIQwNjJY=
=OJAQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1113
retrieving revision 1.1114
diff -u -p -r1.1113 -r1.1114
--- .cvsignore	20 Aug 2009 13:30:13 -0000	1.1113
+++ .cvsignore	22 Aug 2009 12:43:28 -0000	1.1114
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git6.bz2
+patch-2.6.31-rc7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -p -r1.1730 -r1.1731
--- kernel.spec	20 Aug 2009 16:03:17 -0000	1.1730
+++ kernel.spec	22 Aug 2009 12:43:28 -0000	1.1731
@@ -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 6
+%define rcrev 7
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1993,6 +1993,9 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 22 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7
+
 * Thu Aug 20 2009 Mark McLoughlin <markmc at redhat.com>
 - Disable LZMA for xen (#515831)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1071
retrieving revision 1.1072
diff -u -p -r1.1071 -r1.1072
--- sources	20 Aug 2009 13:30:13 -0000	1.1071
+++ sources	22 Aug 2009 12:43:28 -0000	1.1072
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-bf8a969c68cb72946782195934e6f183  patch-2.6.31-rc6-git6.bz2
+4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -p -r1.985 -r1.986
--- upstream	20 Aug 2009 13:30:14 -0000	1.985
+++ upstream	22 Aug 2009 12:43:28 -0000	1.986
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git6.bz2
+patch-2.6.31-rc7.bz2


--- patch-2.6.31-rc6-git6.bz2.sign DELETED ---


--- patch-2.6.31-rc6.bz2.sign DELETED ---



From rathann at fedoraproject.org  Sat Aug 22 12:43:26 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 12:43:26 +0000 (UTC)
Subject: rpms/ctorrent/F-10 ctorrent-CVE-2009-1759.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 ctorrent.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090822124326.9AE7611C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13200

Modified Files:
	.cvsignore ctorrent.spec sources 
Added Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-7.dnh3.3.2
- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
- update to 3.3.2 patch
- improve summary: and description


ctorrent-CVE-2009-1759.patch:
 bencode.cpp |   14 ++++++++++----
 bencode.h   |    2 +-
 btfiles.cpp |   12 ++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

--- NEW FILE ctorrent-CVE-2009-1759.patch ---
Index: bencode.h
===================================================================
--- bencode.h	(revision 301)
+++ bencode.h	(revision 302)
@@ -25,7 +25,7 @@
 size_t decode_list(const char *b,size_t len,const char *keylist);
 size_t decode_rev(const char *b,size_t len,const char *keylist);
 size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method);
-size_t decode_list2path(const char *b, size_t n, char *pathname);
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen);
 size_t bencode_buf(const char *str,size_t len,FILE *fp);
 size_t bencode_str(const char *str, FILE *fp);
 size_t bencode_int(const uint64_t integer, FILE *fp);
Index: bencode.cpp
===================================================================
--- bencode.cpp	(revision 301)
+++ bencode.cpp	(revision 302)
@@ -233,22 +233,28 @@
   return bencode_end_dict_list(fp);
 }
 
-size_t decode_list2path(const char *b, size_t n, char *pathname)
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen)
 {
   const char *pb = b;
   const char *s = (char *) 0;
+  const char *endmax = pathname + maxlen - 1;
   size_t r,q;
 
   if( 'l' != *pb ) return 0;
   pb++;
   n--;
   if( !n ) return 0;
-  for(; n;){
+  while( n && pathname < endmax ){
     if(!(r = buf_str(pb, n, &s, &q)) ) return 0;
+    if( q >= maxlen ) return 0;
     memcpy(pathname, s, q);
     pathname += q;
-    pb += r; n -= r; 
-    if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break;
+    maxlen -= q;
+    pb += r;
+    n -= r; 
+    if( 'e' == *pb ) break;
+    if( pathname >= endmax ) return 0;
+    *pathname++ = PATH_SP;
   }
   *pathname = '\0';
   return (pb - b + 1);
Index: btfiles.cpp
===================================================================
--- btfiles.cpp	(revision 301)
+++ btfiles.cpp	(revision 302)
@@ -471,6 +471,8 @@
     BTFILE *pbf_last = (BTFILE*) 0; 
     BTFILE *pbf = (BTFILE*) 0;
     size_t dl;
+    unsigned long nfiles = 0;
+
     if( decode_query(metabuf,metabuf_len,"info|length",
                     (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
       return -1;
@@ -524,12 +526,18 @@
 #ifndef WINDOWS
       if( !pbf ) return -1;
 #endif
+      nfiles++;
       pbf->bf_length = t;
       m_total_files_length += t;
       r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0,
                        QUERY_POS);
-      if( !r ) return -1;
-      if(!decode_list2path(p + r, n, path)) return -1;
+      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
+        CONSOLE.Warning(1,
+          "error, invalid path in torrent data for file %lu at offset %llu",
+          nfiles, m_total_files_length - t);
+        delete pbf;
+        return -1;
+      }
 
       int f_conv;
       char *tmpfn = new char[strlen(path)*2+5];


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Aug 2007 20:25:47 -0000	1.5
+++ .cvsignore	22 Aug 2009 12:43:26 -0000	1.6
@@ -1 +1 @@
-ctorrent-1.3.4-dnh3.2.tar.gz
+ctorrent-dnh3.3.2.tar.gz


Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/F-10/ctorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ctorrent.spec	19 Feb 2008 20:35:24 -0000	1.8
+++ ctorrent.spec	22 Aug 2009 12:43:26 -0000	1.9
@@ -1,22 +1,25 @@
-%define dnh dnh3.2
+%define dnh dnh3.3.2
 
 Name: ctorrent
 Version: 1.3.4
-Release: 6.%{dnh}%{?dist}
-Summary: BitTorrent Client written in C
+Release: 7.%{dnh}%{?dist}
+Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
 License: GPLv2+
 URL: http://www.rahul.net/dholmes/ctorrent/
-Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/dtorrent/%{name}-%{dnh}.tar.gz
+# http://sourceforge.net/tracker/download.php?group_id=202532&atid=981959&file_id=325065&aid=2782875
+Patch0: %{name}-CVE-2009-1759.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
 %description
-CTorrent is a BitTorrent Client written in C that
-doesn't require any graphical component, such as an X server.
+Enhanced CTorrent is a BitTorrent client for unix-like environments. High
+performance with minimal system resources and dependencies are a priority.
 
 %prep
 %setup -q -n %{name}-%{dnh}
+%patch0 -p0
 
 %build
 %configure
@@ -35,6 +38,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-7.dnh3.3.2
+- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
+- update to 3.3.2 patch
+- improve summary: and description
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.4-6.dnh3.2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Aug 2007 20:25:47 -0000	1.5
+++ sources	22 Aug 2009 12:43:26 -0000	1.6
@@ -1 +1 @@
-23b37cd7b558ad6a27974b311499bab6  ctorrent-1.3.4-dnh3.2.tar.gz
+59b23dd05ff70791cd6449effa7fc3b6  ctorrent-dnh3.3.2.tar.gz



From tmraz at fedoraproject.org  Sat Aug 22 12:59:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 12:59:19 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.32,1.33
Message-ID: <20090822125919.8EE1D11C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15798

Modified Files:
	bacula.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
- rebuilt with new openssl



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- bacula.spec	22 Aug 2009 11:45:56 -0000	1.32
+++ bacula.spec	22 Aug 2009 12:59:19 -0000	1.33
@@ -366,7 +366,7 @@ pushd bacula-%{version}
 #%patch9 -p0
 #%patch11 -p0
 #%patch12 -p0
-%patch13 -p1 -b .openssl
+%patch13 -p2 -b .openssl
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x



From lucilanga at fedoraproject.org  Sat Aug 22 13:17:37 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 22 Aug 2009 13:17:37 +0000 (UTC)
Subject: rpms/libftdi/devel libftdi.spec,1.12,1.13
Message-ID: <20090822131737.2BF1711C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19308

Modified Files:
	libftdi.spec 
Log Message:
* Sat Aug 22 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-7
- add group for udev rule (#517773)


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/libftdi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libftdi.spec	22 Aug 2009 12:37:53 -0000	1.12
+++ libftdi.spec	22 Aug 2009 13:17:35 -0000	1.13
@@ -127,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group GROUPNAME >/dev/null || groupadd -r plugdev
+exit 0
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig



From pkgdb at fedoraproject.org  Sat Aug 22 13:17:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 13:17:44 +0000
Subject: [pkgdb] taglib: mschwendt has requested watchbugzilla
Message-ID: <20090822131744.4150210F86F@bastion2.fedora.phx.redhat.com>

mschwendt has requested the watchbugzilla acl on taglib (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Sat Aug 22 13:17:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 13:17:53 +0000
Subject: [pkgdb] taglib: mschwendt has requested watchbugzilla
Message-ID: <20090822131753.8CB3610F888@bastion2.fedora.phx.redhat.com>

mschwendt has requested the watchbugzilla acl on taglib (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From tmraz at fedoraproject.org  Sat Aug 22 13:19:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:19:31 +0000 (UTC)
Subject: rpms/kftpgrabber/devel kftpgrabber-0.8.1-comment.patch, NONE,
	1.1 kftpgrabber.spec, 1.11, 1.12
Message-ID: <20090822131931.490B811C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kftpgrabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19715

Modified Files:
	kftpgrabber.spec 
Added Files:
	kftpgrabber-0.8.1-comment.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.1-11
- rebuilt with new openssl


kftpgrabber-0.8.1-comment.patch:
 wrapper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kftpgrabber-0.8.1-comment.patch ---
diff -up kftpgrabber-0.8.1/kftpgrabber/src/misc/libs/ssh/wrapper.c.comment kftpgrabber-0.8.1/kftpgrabber/src/misc/libs/ssh/wrapper.c
--- kftpgrabber-0.8.1/kftpgrabber/src/misc/libs/ssh/wrapper.c.comment	2007-04-28 13:35:19.000000000 +0200
+++ kftpgrabber-0.8.1/kftpgrabber/src/misc/libs/ssh/wrapper.c	2009-08-22 15:16:49.000000000 +0200
@@ -80,7 +80,7 @@ HMACCTX *hmac_init(const void *key, int 
     HMAC_CTX *ctx;
     ctx=malloc(sizeof(HMAC_CTX));
 #ifndef OLD_CRYPTO
-    HMAC_CTX_init(ctx); // openssl 0.9.7 requires it.
+    HMAC_CTX_init(ctx); /* openssl 0.9.7 requires it. */
 #endif
     switch(type){
         case HMAC_SHA1:


Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kftpgrabber/devel/kftpgrabber.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kftpgrabber.spec	21 Aug 2009 14:08:57 -0000	1.11
+++ kftpgrabber.spec	22 Aug 2009 13:19:31 -0000	1.12
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 Patch0:         kftpgrabber-0.8.1-cast.patch
+Patch1:         kftpgrabber-0.8.1-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,6 +37,7 @@ Kftpgrabber development files.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .comment
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -107,7 +109,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.1-11
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.1-11
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-10



From tmraz at fedoraproject.org  Sat Aug 22 13:25:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:25:12 +0000 (UTC)
Subject: rpms/bacula/devel bacula-3.0.2-openssl.patch,1.1,1.2
Message-ID: <20090822132512.A4B4911C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20673

Modified Files:
	bacula-3.0.2-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.2-4
- rebuilt with new openssl


bacula-3.0.2-openssl.patch:
 crypto.c |    8 ++++++++
 tls.c    |    4 ++++
 2 files changed, 12 insertions(+)

Index: bacula-3.0.2-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-3.0.2-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bacula-3.0.2-openssl.patch	22 Aug 2009 11:45:56 -0000	1.1
+++ bacula-3.0.2-openssl.patch	22 Aug 2009 13:25:12 -0000	1.2
@@ -24,3 +24,18 @@ diff -up bacula-3.0.2/bacula-3.0.2/src/l
  /*
   * Create a new encryption session.
   *  Returns: A pointer to a CRYPTO_SESSION object on success.
+diff -up bacula-3.0.2/bacula-3.0.2/src/lib/tls.c.openssl bacula-3.0.2/bacula-3.0.2/src/lib/tls.c
+--- bacula-3.0.2/bacula-3.0.2/src/lib/tls.c.openssl	2008-11-22 19:36:12.000000000 +0100
++++ bacula-3.0.2/bacula-3.0.2/src/lib/tls.c	2009-08-22 15:24:30.000000000 +0200
+@@ -315,7 +315,11 @@ bool tls_postconnect_verify_host(JCR *jc
+          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
+ 
+          if (strcmp(extname, "subjectAltName") == 0) {
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
++            const X509V3_EXT_METHOD *method;
++#else
+             X509V3_EXT_METHOD *method;
++#endif
+             STACK_OF(CONF_VALUE) *val;
+             CONF_VALUE *nval;
+             void *extstr = NULL;



From pkgdb at fedoraproject.org  Sat Aug 22 13:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 13:27:00 +0000
Subject: [pkgdb] taglib had acl change status
Message-ID: <20090822132700.A870910F854@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on taglib (Fedora 10) to Approved for mschwendt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From pkgdb at fedoraproject.org  Sat Aug 22 13:27:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 13:27:06 +0000
Subject: [pkgdb] taglib had acl change status
Message-ID: <20090822132706.6CC0810F881@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on taglib (Fedora 11) to Approved for mschwendt

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/taglib



From tmraz at fedoraproject.org  Sat Aug 22 13:30:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:30:39 +0000 (UTC)
Subject: rpms/kftpgrabber/devel kftpgrabber.spec,1.12,1.13
Message-ID: <20090822133039.4E26A11C0347@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kftpgrabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21721

Modified Files:
	kftpgrabber.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.1-11
- rebuilt with new openssl



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kftpgrabber/devel/kftpgrabber.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- kftpgrabber.spec	22 Aug 2009 13:19:31 -0000	1.12
+++ kftpgrabber.spec	22 Aug 2009 13:30:39 -0000	1.13
@@ -9,6 +9,7 @@ URL:            http://kftp.org/
 Source0:        http://www.kftp.org/uploads/files/%{name}-%{version}.tar.bz2
 Patch0:         kftpgrabber-0.8.1-cast.patch
 Patch1:         kftpgrabber-0.8.1-comment.patch
+Patch2:         kftpgrabber-0.8.1-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -38,6 +39,7 @@ Kftpgrabber development files.
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .comment
+%patch2 -p1 -b .openssl
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh



From tmraz at fedoraproject.org  Sat Aug 22 13:31:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:31:06 +0000 (UTC)
Subject: rpms/kftpgrabber/devel kftpgrabber-0.8.1-openssl.patch,NONE,1.1
Message-ID: <20090822133106.0EAB911C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kftpgrabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21863

Added Files:
	kftpgrabber-0.8.1-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.1-11
- rebuilt with new openssl


kftpgrabber-0.8.1-openssl.patch:
 ssl.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE kftpgrabber-0.8.1-openssl.patch ---
diff -up kftpgrabber-0.8.1/kftpgrabber/src/engine/ssl.cpp.openssl kftpgrabber-0.8.1/kftpgrabber/src/engine/ssl.cpp
--- kftpgrabber-0.8.1/kftpgrabber/src/engine/ssl.cpp.openssl	2007-04-28 13:35:22.000000000 +0200
+++ kftpgrabber-0.8.1/kftpgrabber/src/engine/ssl.cpp	2009-08-22 15:29:28.000000000 +0200
@@ -169,7 +169,11 @@ bool Ssl::setClientCertificate(KSSLPKCS1
 
 void Ssl::setConnectionInfo()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_CIPHER *cipher;
+#else
   SSL_CIPHER *cipher;
+#endif
   char buffer[1024];
   
   buffer[0] = 0;



From tmraz at fedoraproject.org  Sat Aug 22 13:33:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:33:16 +0000 (UTC)
Subject: rpms/ctorrent/devel ctorrent.spec,1.14,1.15
Message-ID: <20090822133316.50FD611C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ctorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22297

Modified Files:
	ctorrent.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-13.dnh3.3.2
- rebuilt with new openssl



Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ctorrent.spec	21 Aug 2009 21:40:22 -0000	1.14
+++ ctorrent.spec	22 Aug 2009 13:33:16 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 12.%{dnh}%{?dist}
+Release: 13.%{dnh}%{?dist}
 Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
 License: GPLv2+
@@ -38,12 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-13.dnh3.3.2
+- rebuilt with new openssl
+
 * Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-12.dnh3.3.2
 - fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-11.dnh3.3.2
-- rebuilt with new openssl
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-10.dnh3.3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Sat Aug 22 13:42:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:42:19 +0000 (UTC)
Subject: rpms/mail-notification/devel mail-notification.spec,1.74,1.75
Message-ID: <20090822134219.CF24411C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24491

Modified Files:
	mail-notification.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-15
- rebuilt with new openssl



Index: mail-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- mail-notification.spec	21 Aug 2009 16:36:03 -0000	1.74
+++ mail-notification.spec	22 Aug 2009 13:42:19 -0000	1.75
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -185,13 +185,13 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-15
+- rebuilt with new openssl
+
 * Fri Aug 21 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-14
 - add gtkhtml3-devel pkgconfig requirements into config stuff
   for evolution plugin build
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-13
-- rebuilt with new openssl
-
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Sat Aug 22 13:44:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:44:13 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.18,1.19
Message-ID: <20090822134413.CE36411C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24919

Modified Files:
	ptlib.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-4
- rebuilt with new openssl



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ptlib.spec	21 Aug 2009 15:30:31 -0000	1.18
+++ ptlib.spec	22 Aug 2009 13:44:13 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-3
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-4
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2



From dwalsh at fedoraproject.org  Sat Aug 22 13:50:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sat, 22 Aug 2009 13:50:21 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.118,
	1.119 setroubleshoot.spec, 1.157, 1.158 sources, 1.131, 1.132
Message-ID: <20090822135021.2576311C0417@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26213

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.22-2
- Turn on libcap-ng-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	20 Aug 2009 11:39:48 -0000	1.118
+++ .cvsignore	22 Aug 2009 13:50:20 -0000	1.119
@@ -35,3 +35,4 @@ setroubleshoot-2.2.18.tar.gz
 setroubleshoot-2.2.19.tar.gz
 setroubleshoot-2.2.20.tar.gz
 setroubleshoot-2.2.21.tar.gz
+setroubleshoot-2.2.22.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- setroubleshoot.spec	20 Aug 2009 19:17:26 -0000	1.157
+++ setroubleshoot.spec	22 Aug 2009 13:50:20 -0000	1.158
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.21
+Version: 2.2.22
 Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -9,7 +9,7 @@ Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
-BuildRequires: libpcap-devel
+BuildRequires: libcap-ng-devel
 BuildRequires: intltool gettext python
 BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
 Requires: %{name}-server = %{version}-%{release} 
@@ -210,6 +210,12 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.22-2
+- Turn on libcap-ng-devel
+
+* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.22-1
+- Differentiate between permissive domains and permissive mode
+
 * Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.21-2
 - Turn on libpcap
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- sources	20 Aug 2009 11:39:48 -0000	1.131
+++ sources	22 Aug 2009 13:50:20 -0000	1.132
@@ -1 +1 @@
-535e0277b89dce5486c42b6dbb05b033  setroubleshoot-2.2.21.tar.gz
+6dedae84ab8bf26c64f8bd0a53e6742e  setroubleshoot-2.2.22.tar.gz



From caolanm at fedoraproject.org  Sat Aug 22 13:56:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 22 Aug 2009 13:56:42 +0000 (UTC)
Subject: rpms/hyphen-kn/devel hyph_kn_IN.dic,1.1,1.2 hyphen-kn.spec,1.2,1.3
Message-ID: <20090822135642.287E711C00A2@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-kn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27471

Modified Files:
	hyph_kn_IN.dic hyphen-kn.spec 
Log Message:
latest version


Index: hyph_kn_IN.dic
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-kn/devel/hyph_kn_IN.dic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hyph_kn_IN.dic	8 Apr 2009 08:33:16 -0000	1.1
+++ hyph_kn_IN.dic	22 Aug 2009 13:56:41 -0000	1.2
@@ -1,6 +1,6 @@
 UTF-8
 %  Hyphenation for Kannada
-%  Copyright (C) 2008 Santhosh Thottingal <santhosh.thottingal at gmail.com>
+%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
 %
 %  This library is free software; you can redistribute it and/or
 %  modify it under the terms of the GNU General Public
@@ -16,76 +16,125 @@ UTF-8
 %  License along with this library; if not, write to the Free Software
 %  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 %
-
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?1
-?2
-?1
-?1
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-??2
-2???
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
-1?
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER
+% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
+2?2
+2?2
+% Break before or after any independent vowel.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+% Break after any dependent vowel, but not before.
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+2?1
+% Break before or after any consonant.
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1
+1?1 % can occur in Sanskrit?
+1?1
+1?1
+1?1 % can occur in Sanskrit?
+1?1
+1?1
+1?1
+1?1
+1?1
+% Do not break before a final consonant or conjunct.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2??.
+2???.
+2???.
+2???.
+2???.
+% Do not break before anusvara, visarga, avagraha,
+% length mark and ai length mark.
+2?
+2?
+2?
+2?
+2?
+% Do not break either side of virama (may be within conjunct).
+2?2


Index: hyphen-kn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-kn/devel/hyphen-kn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-kn.spec	25 Jul 2009 02:53:38 -0000	1.2
+++ hyphen-kn.spec	22 Aug 2009 13:56:41 -0000	1.3
@@ -1,8 +1,8 @@
 Name: hyphen-kn
 Summary: Kannada hyphenation rules
-%define upstreamid 20081213
+%define upstreamid 20090815
 Version: 0.%{upstreamid}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_kn_IN.dic
 Group: Applications/Text
 URL: http://wiki.smc.org.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Sat Aug 22 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090815-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20081213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Sat Aug 22 13:59:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 13:59:49 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.19,1.20
Message-ID: <20090822135949.538FF11C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27956

Modified Files:
	ptlib.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-4
- rebuilt with new openssl



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ptlib.spec	22 Aug 2009 13:44:13 -0000	1.19
+++ ptlib.spec	22 Aug 2009 13:59:49 -0000	1.20
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.6.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
-* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-4
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-5
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2



From tmraz at fedoraproject.org  Sat Aug 22 14:02:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 14:02:25 +0000 (UTC)
Subject: rpms/ctorrent/devel ctorrent.spec,1.15,1.16
Message-ID: <20090822140225.CCB5F11C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ctorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28377

Modified Files:
	ctorrent.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-14.dnh3.3.2
- rebuilt with new openssl



Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ctorrent.spec	22 Aug 2009 13:33:16 -0000	1.15
+++ ctorrent.spec	22 Aug 2009 14:02:25 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 13.%{dnh}%{?dist}
+Release: 14.%{dnh}%{?dist}
 Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
 License: GPLv2+
@@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
-* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-13.dnh3.3.2
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-14.dnh3.3.2
 - rebuilt with new openssl
 
 * Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-12.dnh3.3.2



From tmraz at fedoraproject.org  Sat Aug 22 14:03:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 14:03:53 +0000 (UTC)
Subject: rpms/mail-notification/devel mail-notification.spec,1.75,1.76
Message-ID: <20090822140353.B316811C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28655

Modified Files:
	mail-notification.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-16
- rebuilt with new openssl



Index: mail-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- mail-notification.spec	22 Aug 2009 13:42:19 -0000	1.75
+++ mail-notification.spec	22 Aug 2009 14:03:53 -0000	1.76
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -185,7 +185,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
-* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-15
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-16
 - rebuilt with new openssl
 
 * Fri Aug 21 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-14



From rathann at fedoraproject.org  Sat Aug 22 14:24:33 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 14:24:33 +0000 (UTC)
Subject: rpms/ctorrent/EL-5 ctorrent-CVE-2009-1759.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 ctorrent.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090822142433.1E2E911C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32544

Modified Files:
	.cvsignore ctorrent.spec sources 
Added Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-4.dnh3.3.2
- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
- update to 3.3.2 patch
- improve summary: and description
- update License: tag in accordance with current guidelines
- add UserGuide to docs


ctorrent-CVE-2009-1759.patch:
 bencode.cpp |   14 ++++++++++----
 bencode.h   |    2 +-
 btfiles.cpp |   12 ++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

--- NEW FILE ctorrent-CVE-2009-1759.patch ---
Index: bencode.h
===================================================================
--- bencode.h	(revision 301)
+++ bencode.h	(revision 302)
@@ -25,7 +25,7 @@
 size_t decode_list(const char *b,size_t len,const char *keylist);
 size_t decode_rev(const char *b,size_t len,const char *keylist);
 size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method);
-size_t decode_list2path(const char *b, size_t n, char *pathname);
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen);
 size_t bencode_buf(const char *str,size_t len,FILE *fp);
 size_t bencode_str(const char *str, FILE *fp);
 size_t bencode_int(const uint64_t integer, FILE *fp);
Index: bencode.cpp
===================================================================
--- bencode.cpp	(revision 301)
+++ bencode.cpp	(revision 302)
@@ -233,22 +233,28 @@
   return bencode_end_dict_list(fp);
 }
 
-size_t decode_list2path(const char *b, size_t n, char *pathname)
+size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen)
 {
   const char *pb = b;
   const char *s = (char *) 0;
+  const char *endmax = pathname + maxlen - 1;
   size_t r,q;
 
   if( 'l' != *pb ) return 0;
   pb++;
   n--;
   if( !n ) return 0;
-  for(; n;){
+  while( n && pathname < endmax ){
     if(!(r = buf_str(pb, n, &s, &q)) ) return 0;
+    if( q >= maxlen ) return 0;
     memcpy(pathname, s, q);
     pathname += q;
-    pb += r; n -= r; 
-    if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break;
+    maxlen -= q;
+    pb += r;
+    n -= r; 
+    if( 'e' == *pb ) break;
+    if( pathname >= endmax ) return 0;
+    *pathname++ = PATH_SP;
   }
   *pathname = '\0';
   return (pb - b + 1);
Index: btfiles.cpp
===================================================================
--- btfiles.cpp	(revision 301)
+++ btfiles.cpp	(revision 302)
@@ -471,6 +471,8 @@
     BTFILE *pbf_last = (BTFILE*) 0; 
     BTFILE *pbf = (BTFILE*) 0;
     size_t dl;
+    unsigned long nfiles = 0;
+
     if( decode_query(metabuf,metabuf_len,"info|length",
                     (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
       return -1;
@@ -524,12 +526,18 @@
 #ifndef WINDOWS
       if( !pbf ) return -1;
 #endif
+      nfiles++;
       pbf->bf_length = t;
       m_total_files_length += t;
       r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0,
                        QUERY_POS);
-      if( !r ) return -1;
-      if(!decode_list2path(p + r, n, path)) return -1;
+      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
+        CONSOLE.Warning(1,
+          "error, invalid path in torrent data for file %lu at offset %llu",
+          nfiles, m_total_files_length - t);
+        delete pbf;
+        return -1;
+      }
 
       int f_conv;
       char *tmpfn = new char[strlen(path)*2+5];


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 16:53:33 -0000	1.4
+++ .cvsignore	22 Aug 2009 14:24:31 -0000	1.5
@@ -1 +1 @@
-ctorrent-1.3.4-dnh2.1.tar.gz
+ctorrent-dnh3.3.2.tar.gz


Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/ctorrent.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ctorrent.spec	1 Nov 2006 16:53:33 -0000	1.5
+++ ctorrent.spec	22 Aug 2009 14:24:31 -0000	1.6
@@ -1,22 +1,25 @@
-%define dnh dnh2.1
+%define dnh dnh3.3.2
 
 Name: ctorrent
 Version: 1.3.4
-Release: 3.%{dnh}%{?dist}
-Summary: BitTorrent Client written in C
+Release: 4.%{dnh}%{?dist}
+Summary: Command line BitTorrent client for unix-like environments
 Group: Applications/Internet
-License: GPL
+License: GPLv2+
 URL: http://www.rahul.net/dholmes/ctorrent/
-Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/dtorrent/%{name}-%{dnh}.tar.gz
+# http://sourceforge.net/tracker/download.php?group_id=202532&atid=981959&file_id=325065&aid=2782875
+Patch0: %{name}-CVE-2009-1759.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
 %description
-CTorrent is a BitTorrent Client written in C that
-doesn't require any graphical component, such as an X server.
+Enhanced CTorrent is a BitTorrent client for unix-like environments. High
+performance with minimal system resources and dependencies are a priority.
 
 %prep
 %setup -q -n %{name}-%{dnh}
+%patch0 -p0
 
 %build
 %configure
@@ -32,9 +35,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ctorrent
-%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
+%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-4.dnh3.3.2
+- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
+- update to 3.3.2 patch
+- improve summary: and description
+- update License: tag in accordance with current guidelines
+- add UserGuide to docs
+
 * Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-3.dnh2.1
 - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
 - add more docs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Nov 2006 16:53:33 -0000	1.4
+++ sources	22 Aug 2009 14:24:31 -0000	1.5
@@ -1 +1 @@
-5cc1e46e1d1a3144f319cdec43256169  ctorrent-1.3.4-dnh2.1.tar.gz
+59b23dd05ff70791cd6449effa7fc3b6  ctorrent-dnh3.3.2.tar.gz



From tmraz at fedoraproject.org  Sat Aug 22 14:37:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 14:37:51 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.137,1.138
Message-ID: <20090822143751.C7DF111C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2416

Modified Files:
	openssl.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.4.beta3
- constify SSL_CIPHER_description()



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- openssl.spec	21 Aug 2009 13:42:11 -0000	1.137
+++ openssl.spec	22 Aug 2009 14:37:51 -0000	1.138
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{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
@@ -61,6 +61,7 @@ Patch47: openssl-0.9.8j-readme-warning.p
 Patch48: openssl-0.9.8j-bad-mime.patch
 Patch49: openssl-0.9.8k-algo-doc.patch
 Patch50: openssl-1.0.0-beta3-curl.patch
+Patch51: openssl-1.0.0-beta3-const.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
@@ -151,6 +152,7 @@ from other formats to the formats used b
 %patch48 -p1 -b .bad-mime
 %patch49 -p1 -b .algo-doc
 %patch50 -p1 -b .curl
+%patch51 -p1 -b .const
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 
@@ -417,6 +419,9 @@ fi
 /sbin/ldconfig -X
 
 %changelog
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.4.beta3
+- constify SSL_CIPHER_description()
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.3.beta3
 - fix WWW:Curl:Easy reference in tsget
 



From tmraz at fedoraproject.org  Sat Aug 22 14:38:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 14:38:35 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-const.patch,NONE,1.1
Message-ID: <20090822143835.2A19711C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2753

Added Files:
	openssl-1.0.0-beta3-const.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.4.beta3
- constify SSL_CIPHER_description()


openssl-1.0.0-beta3-const.patch:
 doc/ssl/SSL_CIPHER_get_name.pod |    2 +-
 ssl/ssl.h                       |    2 +-
 ssl/ssl_ciph.c                  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-const.patch ---
diff -up openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod.const openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod
--- openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod.const	2009-02-14 22:49:37.000000000 +0100
+++ openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod	2009-08-22 16:15:32.000000000 +0200
@@ -11,7 +11,7 @@ SSL_CIPHER_get_name, SSL_CIPHER_get_bits
  const char *SSL_CIPHER_get_name(const SSL_CIPHER *cipher);
  int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
  char *SSL_CIPHER_get_version(const SSL_CIPHER *cipher);
- char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int size);
+ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int size);
 
 =head1 DESCRIPTION
 
diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.const openssl-1.0.0-beta3/ssl/ssl_ciph.c
--- openssl-1.0.0-beta3/ssl/ssl_ciph.c.const	2009-08-22 15:56:12.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-22 15:56:12.000000000 +0200
@@ -1458,7 +1458,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
 	return(cipherstack);
 	}
 
-char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
+char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 	{
 	int is_export,pkl,kl;
 	const char *ver,*exp_str;
diff -up openssl-1.0.0-beta3/ssl/ssl.h.const openssl-1.0.0-beta3/ssl/ssl.h
--- openssl-1.0.0-beta3/ssl/ssl.h.const	2009-08-22 15:56:11.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl.h	2009-08-22 15:56:12.000000000 +0200
@@ -1638,7 +1638,7 @@ long SSL_get_default_timeout(const SSL *
 
 int SSL_library_init(void );
 
-char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size);
+char *SSL_CIPHER_description(const SSL_CIPHER *,char *buf,int size);
 STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
 
 SSL *SSL_dup(SSL *ssl);



From drago01 at fedoraproject.org  Sat Aug 22 14:42:24 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 22 Aug 2009 14:42:24 +0000 (UTC)
Subject: rpms/compiz/devel compiz-gtk,1.13,1.14 compiz.spec,1.176,1.177
Message-ID: <20090822144224.45C1B11C00A2@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4081

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Fix up the compiz-gtk script


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- compiz-gtk	7 Aug 2009 12:48:16 -0000	1.13
+++ compiz-gtk	22 Aug 2009 14:42:23 -0000	1.14
@@ -5,13 +5,12 @@ function runCompiz() {
 	exec compiz --ignore-desktop-hints --always-swap glib gconf gnomecompat $@
 }
 
-DIRECT=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
 ISSW=`glxinfo | grep "Software Rasterizer" -c`
 
 # Try with direct rendering
 HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-if ( [ $HAVE3D == "Yes" ]  && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
+if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
 	runCompiz $@
 fi
 
@@ -20,7 +19,7 @@ export LIBGL_ALWAYS_INDIRECT=1
 
 HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-if ( [ $DIRECT == "Yes" ] && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
+if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
 	runCompiz $@
 fi
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- compiz.spec	7 Aug 2009 12:45:24 -0000	1.176
+++ compiz.spec	22 Aug 2009 14:42:23 -0000	1.177
@@ -14,7 +14,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -364,6 +364,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-11
+- Fix up the compiz-gtk script
+
 * Fri Aug 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-10
 - Enable direct rendering and always-swap by default
 - Tearing free compiz for INTEL cards ;)



From bpepple at fedoraproject.org  Sat Aug 22 14:43:58 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 22 Aug 2009 14:43:58 +0000 (UTC)
Subject: rpms/pymsn/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE pymsn.spec, 1.11, NONE sources, 1.7, NONE
Message-ID: <20090822144358.E82AC11C00A2@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/pymsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4456

Added Files:
	dead.package 
Removed Files:
	Makefile pymsn.spec sources 
Log Message:
mark package at end of life


--- NEW FILE dead.package ---
pymsn has been made obsolete by papyon.


--- Makefile DELETED ---


--- pymsn.spec DELETED ---


--- sources DELETED ---



From shakthimaan at fedoraproject.org  Sat Aug 22 14:45:54 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sat, 22 Aug 2009 14:45:54 +0000 (UTC)
Subject: rpms/espresso-ab/EL-5 import.log,1.1,1.2
Message-ID: <20090822144554.82A0011C00A2@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/espresso-ab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4696/EL-5

Modified Files:
	import.log 
Log Message:
Added espresso-ab package for EL-5.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/espresso-ab/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Aug 2009 15:09:20 -0000	1.1
+++ import.log	22 Aug 2009 14:45:54 -0000	1.2
@@ -1 +1,2 @@
 espresso-ab-1_0-1_fc11:HEAD:espresso-ab-1.0-1.fc11.src.rpm:1250176406
+espresso-ab-1_0-1_fc11:EL-5:espresso-ab-1.0-1.fc11.src.rpm:1250952684



From rathann at fedoraproject.org  Sat Aug 22 14:55:41 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 14:55:41 +0000 (UTC)
Subject: rpms/ctorrent/EL-5 ctorrent.spec, 1.6, 1.7 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090822145541.A9A0F11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6386

Modified Files:
	ctorrent.spec sources .cvsignore 
Log Message:
revert last commit, we don't put security fixes together with other updates
for EPEL



Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/ctorrent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ctorrent.spec	22 Aug 2009 14:24:31 -0000	1.6
+++ ctorrent.spec	22 Aug 2009 14:55:41 -0000	1.7
@@ -1,25 +1,22 @@
-%define dnh dnh3.3.2
+%define dnh dnh2.1
 
 Name: ctorrent
 Version: 1.3.4
-Release: 4.%{dnh}%{?dist}
-Summary: Command line BitTorrent client for unix-like environments
+Release: 3.%{dnh}%{?dist}
+Summary: BitTorrent Client written in C
 Group: Applications/Internet
-License: GPLv2+
+License: GPL
 URL: http://www.rahul.net/dholmes/ctorrent/
-Source0: http://downloads.sourceforge.net/sourceforge/dtorrent/%{name}-%{dnh}.tar.gz
-# http://sourceforge.net/tracker/download.php?group_id=202532&atid=981959&file_id=325065&aid=2782875
-Patch0: %{name}-CVE-2009-1759.patch
+Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
 %description
-Enhanced CTorrent is a BitTorrent client for unix-like environments. High
-performance with minimal system resources and dependencies are a priority.
+CTorrent is a BitTorrent Client written in C that
+doesn't require any graphical component, such as an X server.
 
 %prep
 %setup -q -n %{name}-%{dnh}
-%patch0 -p0
 
 %build
 %configure
@@ -35,16 +32,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ctorrent
-%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
+%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
 
 %changelog
-* Fri Aug 21 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-4.dnh3.3.2
-- fixed stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
-- update to 3.3.2 patch
-- improve summary: and description
-- update License: tag in accordance with current guidelines
-- add UserGuide to docs
-
 * Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-3.dnh2.1
 - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
 - add more docs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Aug 2009 14:24:31 -0000	1.5
+++ sources	22 Aug 2009 14:55:41 -0000	1.6
@@ -1 +1 @@
-59b23dd05ff70791cd6449effa7fc3b6  ctorrent-dnh3.3.2.tar.gz
+5cc1e46e1d1a3144f319cdec43256169  ctorrent-1.3.4-dnh2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Aug 2009 14:24:31 -0000	1.5
+++ .cvsignore	22 Aug 2009 14:55:41 -0000	1.6
@@ -1 +1 @@
-ctorrent-dnh3.3.2.tar.gz
+ctorrent-1.3.4-dnh2.1.tar.gz



From rathann at fedoraproject.org  Sat Aug 22 14:57:18 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 14:57:18 +0000 (UTC)
Subject: rpms/ctorrent/EL-5 ctorrent-CVE-2009-1759.patch,1.1,NONE
Message-ID: <20090822145718.21BCB11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6768

Removed Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
remove the incorrect patch



--- ctorrent-CVE-2009-1759.patch DELETED ---



From rathann at fedoraproject.org  Sat Aug 22 14:58:08 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 14:58:08 +0000 (UTC)
Subject: rpms/ctorrent/EL-5 ctorrent-CVE-2009-1759.patch, 1.2,
	1.3 ctorrent.spec, 1.7, 1.8
Message-ID: <20090822145808.C4DFE11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7019

Modified Files:
	ctorrent.spec 
Added Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-5.dnh2.1
- fix stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)


ctorrent-CVE-2009-1759.patch:
 bencode.cpp |   14 ++++++++++----
 bencode.h   |    2 +-
 btfiles.cpp |   10 ++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

Index: ctorrent-CVE-2009-1759.patch
===================================================================
RCS file: ctorrent-CVE-2009-1759.patch
diff -N ctorrent-CVE-2009-1759.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ctorrent-CVE-2009-1759.patch	22 Aug 2009 14:58:08 -0000	1.3
@@ -0,0 +1,80 @@
+diff -up ctorrent-dnh2.1/bencode.cpp.orig ctorrent-dnh2.1/bencode.cpp
+--- ctorrent-dnh2.1/bencode.cpp.orig	2006-01-02 03:38:01.000000000 +0100
++++ ctorrent-dnh2.1/bencode.cpp	2009-08-22 16:43:47.000000000 +0200
+@@ -234,22 +234,28 @@ size_t bencode_path2list(const char *pat
+   return bencode_end_dict_list(fp);
+ }
+ 
+-size_t decode_list2path(const char *b, size_t n, char *pathname)
++size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen)
+ {
+   const char *pb = b;
+   const char *s = (char *) 0;
++  const char *endmax = pathname + maxlen - 1;
+   size_t r,q;
+ 
+   if( 'l' != *pb ) return 0;
+   pb++;
+   n--;
+   if( !n ) return 0;
+-  for(; n;){
++  while( n && pathname < endmax ){
+     if(!(r = buf_str(pb, n, &s, &q)) ) return 0;
++    if( q >= maxlen ) return 0;
+     memcpy(pathname, s, q);
+     pathname += q;
+-    pb += r; n -= r; 
+-    if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break;
++    maxlen -= q;
++    pb += r;
++    n -= r; 
++    if( 'e' == *pb ) break;
++    if( pathname >= endmax ) return 0;
++    *pathname++ = PATH_SP;
+   }
+   *pathname = '\0';
+   return (pb - b + 1);
+diff -up ctorrent-dnh2.1/bencode.h.orig ctorrent-dnh2.1/bencode.h
+--- ctorrent-dnh2.1/bencode.h.orig	2005-08-27 05:43:00.000000000 +0200
++++ ctorrent-dnh2.1/bencode.h	2009-08-22 16:44:17.000000000 +0200
+@@ -24,7 +24,7 @@ size_t decode_dict(const char *b,size_t 
+ size_t decode_list(const char *b,size_t len,const char *keylist);
+ size_t decode_rev(const char *b,size_t len,const char *keylist);
+ size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method);
+-size_t decode_list2path(const char *b, size_t n, char *pathname);
++size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen);
+ size_t bencode_buf(const char *str,size_t len,FILE *fp);
+ size_t bencode_str(const char *str, FILE *fp);
+ size_t bencode_int(const int integer, FILE *fp);
+diff -up ctorrent-dnh2.1/btfiles.cpp.orig ctorrent-dnh2.1/btfiles.cpp
+--- ctorrent-dnh2.1/btfiles.cpp.orig	2006-03-20 04:54:53.000000000 +0100
++++ ctorrent-dnh2.1/btfiles.cpp	2009-08-22 16:50:03.000000000 +0200
+@@ -352,6 +352,8 @@ int btFiles::BuildFromMI(const char *met
+     BTFILE *pbf_last = (BTFILE*) 0; 
+     BTFILE *pbf = (BTFILE*) 0;
+     size_t dl;
++    unsigned long nfiles = 0;
++
+     if( decode_query(metabuf,metabuf_len,"info|length",
+                     (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
+       return -1;
+@@ -381,11 +383,19 @@ int btFiles::BuildFromMI(const char *met
+ #ifndef WINDOWS
+       if( !pbf ) return -1;
+ #endif
++      nfiles++;
+       pbf->bf_length = t;
+       m_total_files_length += t;
+       r = decode_query(p, dl, "path", (const char **) 0, &n,(int64_t*) 0,QUERY_POS);
+       if( !r ) return -1;
+       if(!decode_list2path(p + r, n, path)) return -1;
++      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
++        CONSOLE.Warning(1,
++          "error, invalid path in torrent data for file %lu at offset %llu",
++          nfiles, m_total_files_length - t);
++        delete pbf;
++        return -1;
++      }
+       pbf->bf_filename = new char[strlen(path) + 1];
+ #ifndef WINDOWS
+       if( !pbf->bf_filename ) return -1;


Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/ctorrent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ctorrent.spec	22 Aug 2009 14:55:41 -0000	1.7
+++ ctorrent.spec	22 Aug 2009 14:58:08 -0000	1.8
@@ -2,12 +2,13 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 3.%{dnh}%{?dist}
+Release: 5.%{dnh}%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPL
 URL: http://www.rahul.net/dholmes/ctorrent/
 Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
+Patch0: %{name}-CVE-2009-1759.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
@@ -17,6 +18,7 @@ doesn't require any graphical component,
 
 %prep
 %setup -q -n %{name}-%{dnh}
+%patch0 -p1
 
 %build
 %configure
@@ -35,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
 
 %changelog
+* Sat Aug 22 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-5.dnh2.1
+- fix stack-based buffer overflow (CVE-2009-1759, RHBZ #501813)
+
 * Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.3.4-3.dnh2.1
 - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
 - add more docs



From cweyl at fedoraproject.org  Sat Aug 22 15:03:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 22 Aug 2009 15:03:50 +0000 (UTC)
Subject: rpms/perl-aliased/F-11 perl-aliased.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090822150350.C63C211C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-aliased/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8014

Modified Files:
	perl-aliased.spec sources 
Log Message:
* Sat Aug 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
- auto-update to 0.30 (by cpan-spec-update 0.01)



Index: perl-aliased.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/F-11/perl-aliased.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-aliased.spec	27 Feb 2009 05:01:01 -0000	1.6
+++ perl-aliased.spec	22 Aug 2009 15:03:50 -0000	1.7
@@ -1,23 +1,25 @@
 Name:           perl-aliased
-Version:        0.22
-Release:        2%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        Use shorter versions of class names
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/aliased/
-Source0:        http://www.cpan.org/authors/id/O/OV/OVID/aliased-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/O/OV/OVID/aliased-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Test::Pod::Coverage), perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
+
 %description
 aliased is simple in concept but is a rather handy module. It loads the
 class you specify and exports into your namespace a subroutine that returns
 the class name. You can explicitly alias the class to another name or, if
 you prefer, you can do so implicitly. In the latter case, the name of the
-subroutine is the last part of the class name. 
+subroutine is the last part of the class name.
 
 %prep
 %setup -q -n aliased-%{version}
@@ -47,6 +49,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 22 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.30-1
+- auto-update to 0.30 (by cpan-spec-update 0.01)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-aliased/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 May 2008 06:15:07 -0000	1.4
+++ sources	22 Aug 2009 15:03:50 -0000	1.5
@@ -1 +1 @@
-06cace025aa108fe4a9af3ae26bb297e  aliased-0.22.tar.gz
+8c2ee486901dae7d1c31e9a2d69c6c8f  aliased-0.30.tar.gz



From cweyl at fedoraproject.org  Sat Aug 22 15:06:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 22 Aug 2009 15:06:01 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Packages/F-11 perl-Parse-CPAN-Packages.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090822150601.EA78311C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8528

Modified Files:
	perl-Parse-CPAN-Packages.spec sources 
Log Message:
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



Index: perl-Parse-CPAN-Packages.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/F-11/perl-Parse-CPAN-Packages.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Parse-CPAN-Packages.spec	27 Feb 2009 00:19:18 -0000	1.12
+++ perl-Parse-CPAN-Packages.spec	22 Aug 2009 15:06:01 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Parse-CPAN-Packages
-Version:        2.30
+Version:        2.31
 Release:        2%{?dist}
 Summary:        Parse 02packages.details.txt.gz
 License:        GPL+ or Artistic
@@ -8,18 +8,14 @@ URL:            http://search.cpan.org/d
 Source0:        http://www.cpan.org/authors/id/L/LB/LBROCARD/Parse-CPAN-Packages-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-#BuildRequires:  perl(Class::Accessor::Fast)
 BuildRequires:  perl(Compress::Zlib)
 BuildRequires:  perl(CPAN::DistnameInfo)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-#BuildRequires:  perl(IO::Zlib)
 BuildRequires:  perl(Moose)
-#BuildRequires:  perl(Sort::Versions)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(version)
-#Requires:       perl(Class::Accessor::Fast)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -59,6 +55,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed May 13 2009 Steven Pritchard <steve at kspei.com> 2.31-1
+- Update to 2.31.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Feb 2009 15:13:40 -0000	1.6
+++ sources	22 Aug 2009 15:06:01 -0000	1.7
@@ -1 +1 @@
-1865d9860c59aa8c5248c0bc72c2213d  Parse-CPAN-Packages-2.30.tar.gz
+77f124c01c14f9e4ff764320e9412426  Parse-CPAN-Packages-2.31.tar.gz



From pkgdb at fedoraproject.org  Sat Aug 22 15:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:11:54 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151154.9A7D310F85C@bastion2.fedora.phx.redhat.com>

mathstuf has set the watchbugzilla acl on qca2 (Fedora devel) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:11:55 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151155.40C4410F88C@bastion2.fedora.phx.redhat.com>

mathstuf has set the watchcommits acl on qca2 (Fedora devel) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:11:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:11:56 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151156.52A3510F897@bastion2.fedora.phx.redhat.com>

mathstuf has set the commit acl on qca2 (Fedora devel) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:05 +0000
Subject: [pkgdb] qca2 ownership updated
Message-ID: <20090822151205.4549B10F89A@bastion2.fedora.phx.redhat.com>

Package qca2 in Fedora 10 is now owned by mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:07 +0000
Subject: [pkgdb] qca2 ownership updated
Message-ID: <20090822151208.01CF710F89C@bastion2.fedora.phx.redhat.com>

Package qca2 in Fedora 11 is now owned by mathstuf

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:10 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151210.7D4B610F8A2@bastion2.fedora.phx.redhat.com>

mathstuf has set the watchcommits acl on qca2 (Fedora 10) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:10 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151210.7D5DE10F8A3@bastion2.fedora.phx.redhat.com>

mathstuf has set the watchbugzilla acl on qca2 (Fedora 10) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:12 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151212.2D5FA10F881@bastion2.fedora.phx.redhat.com>

mathstuf has set the commit acl on qca2 (Fedora 10) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:14 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151214.BB35A10F8A9@bastion2.fedora.phx.redhat.com>

mathstuf has set the watchcommits acl on qca2 (Fedora 11) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:14 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151214.E64E910F8B1@bastion2.fedora.phx.redhat.com>

mathstuf has set the watchbugzilla acl on qca2 (Fedora 11) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From pkgdb at fedoraproject.org  Sat Aug 22 15:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 15:12:16 +0000
Subject: [pkgdb] qca2 had acl change status
Message-ID: <20090822151216.4E1B510F8B4@bastion2.fedora.phx.redhat.com>

mathstuf has set the commit acl on qca2 (Fedora 11) to Approved for abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/qca2



From tmraz at fedoraproject.org  Sat Aug 22 15:16:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 15:16:24 +0000 (UTC)
Subject: rpms/ice/devel Ice-3.3.1-openssl.patch,NONE,1.1 ice.spec,1.34,1.35
Message-ID: <20090822151624.AC15211C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10999

Modified Files:
	ice.spec 
Added Files:
	Ice-3.3.1-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-5
- rebuilt with new openssl


Ice-3.3.1-openssl.patch:
 Instance.cpp |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE Ice-3.3.1-openssl.patch ---
diff -up Ice-3.3.1/cpp/src/IceSSL/Instance.cpp.openssl Ice-3.3.1/cpp/src/IceSSL/Instance.cpp
--- Ice-3.3.1/cpp/src/IceSSL/Instance.cpp.openssl	2009-03-20 18:52:14.000000000 +0100
+++ Ice-3.3.1/cpp/src/IceSSL/Instance.cpp	2009-08-22 17:14:03.000000000 +0200
@@ -989,7 +989,13 @@ IceSSL::Instance::traceConnection(SSL* s
 {
     Trace out(_logger, _securityTraceCategory);
     out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n";
-    SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER *cipher;
+#else
+    SSL_CIPHER *cipher;
+#endif
+
+    cipher = SSL_get_current_cipher(ssl);
     if(!cipher)
     {
         out << "unknown cipher\n";


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ice.spec	21 Aug 2009 13:56:00 -0000	1.34
+++ ice.spec	22 Aug 2009 15:16:23 -0000	1.35
@@ -36,6 +36,8 @@ Patch5:         patch-rand.txt
 
 Patch6:         ice-php53.patch
 
+Patch7:         Ice-3.3.1-openssl.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support ppc64 at all
@@ -186,6 +188,7 @@ The Ice runtime for PHP applications.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %setup -q -n Ice-3.3.0-man-pages -T -b 2
 
@@ -547,7 +550,7 @@ fi
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-5
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-5
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-4



From rathann at fedoraproject.org  Sat Aug 22 15:21:07 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 15:21:07 +0000 (UTC)
Subject: rpms/ctorrent/EL-5 ctorrent-CVE-2009-1759.patch,1.3,1.4
Message-ID: <20090822152107.218C911C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/ctorrent/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11777

Modified Files:
	ctorrent-CVE-2009-1759.patch 
Log Message:
fix compilation with the backported patch


ctorrent-CVE-2009-1759.patch:
 bencode.cpp |   14 ++++++++++----
 bencode.h   |    2 +-
 btfiles.cpp |   11 +++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

Index: ctorrent-CVE-2009-1759.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/EL-5/ctorrent-CVE-2009-1759.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ctorrent-CVE-2009-1759.patch	22 Aug 2009 14:58:08 -0000	1.3
+++ ctorrent-CVE-2009-1759.patch	22 Aug 2009 15:21:06 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up ctorrent-dnh2.1/bencode.cpp.orig ctorrent-dnh2.1/bencode.cpp
---- ctorrent-dnh2.1/bencode.cpp.orig	2006-01-02 03:38:01.000000000 +0100
-+++ ctorrent-dnh2.1/bencode.cpp	2009-08-22 16:43:47.000000000 +0200
+diff -up ctorrent-dnh2.1/bencode.cpp.cve ctorrent-dnh2.1/bencode.cpp
+--- ctorrent-dnh2.1/bencode.cpp.cve	2006-01-02 03:38:01.000000000 +0100
++++ ctorrent-dnh2.1/bencode.cpp	2009-08-22 17:16:00.000000000 +0200
 @@ -234,22 +234,28 @@ size_t bencode_path2list(const char *pat
    return bencode_end_dict_list(fp);
  }
@@ -34,9 +34,9 @@ diff -up ctorrent-dnh2.1/bencode.cpp.ori
    }
    *pathname = '\0';
    return (pb - b + 1);
-diff -up ctorrent-dnh2.1/bencode.h.orig ctorrent-dnh2.1/bencode.h
---- ctorrent-dnh2.1/bencode.h.orig	2005-08-27 05:43:00.000000000 +0200
-+++ ctorrent-dnh2.1/bencode.h	2009-08-22 16:44:17.000000000 +0200
+diff -up ctorrent-dnh2.1/bencode.h.cve ctorrent-dnh2.1/bencode.h
+--- ctorrent-dnh2.1/bencode.h.cve	2005-08-27 05:43:00.000000000 +0200
++++ ctorrent-dnh2.1/bencode.h	2009-08-22 17:16:00.000000000 +0200
 @@ -24,7 +24,7 @@ size_t decode_dict(const char *b,size_t 
  size_t decode_list(const char *b,size_t len,const char *keylist);
  size_t decode_rev(const char *b,size_t len,const char *keylist);
@@ -46,9 +46,9 @@ diff -up ctorrent-dnh2.1/bencode.h.orig 
  size_t bencode_buf(const char *str,size_t len,FILE *fp);
  size_t bencode_str(const char *str, FILE *fp);
  size_t bencode_int(const int integer, FILE *fp);
-diff -up ctorrent-dnh2.1/btfiles.cpp.orig ctorrent-dnh2.1/btfiles.cpp
---- ctorrent-dnh2.1/btfiles.cpp.orig	2006-03-20 04:54:53.000000000 +0100
-+++ ctorrent-dnh2.1/btfiles.cpp	2009-08-22 16:50:03.000000000 +0200
+diff -up ctorrent-dnh2.1/btfiles.cpp.cve ctorrent-dnh2.1/btfiles.cpp
+--- ctorrent-dnh2.1/btfiles.cpp.cve	2006-03-20 04:54:53.000000000 +0100
++++ ctorrent-dnh2.1/btfiles.cpp	2009-08-22 17:18:20.000000000 +0200
 @@ -352,6 +352,8 @@ int btFiles::BuildFromMI(const char *met
      BTFILE *pbf_last = (BTFILE*) 0; 
      BTFILE *pbf = (BTFILE*) 0;
@@ -58,7 +58,7 @@ diff -up ctorrent-dnh2.1/btfiles.cpp.ori
      if( decode_query(metabuf,metabuf_len,"info|length",
                      (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) )
        return -1;
-@@ -381,11 +383,19 @@ int btFiles::BuildFromMI(const char *met
+@@ -381,11 +383,16 @@ int btFiles::BuildFromMI(const char *met
  #ifndef WINDOWS
        if( !pbf ) return -1;
  #endif
@@ -66,11 +66,10 @@ diff -up ctorrent-dnh2.1/btfiles.cpp.ori
        pbf->bf_length = t;
        m_total_files_length += t;
        r = decode_query(p, dl, "path", (const char **) 0, &n,(int64_t*) 0,QUERY_POS);
-       if( !r ) return -1;
-       if(!decode_list2path(p + r, n, path)) return -1;
+-      if( !r ) return -1;
+-      if(!decode_list2path(p + r, n, path)) return -1;
 +      if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){
-+        CONSOLE.Warning(1,
-+          "error, invalid path in torrent data for file %lu at offset %llu",
++        fprintf(stderr,"error, invalid path in torrent data for file %lu at offset %llu",
 +          nfiles, m_total_files_length - t);
 +        delete pbf;
 +        return -1;



From drago01 at fedoraproject.org  Sat Aug 22 15:30:54 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 22 Aug 2009 15:30:54 +0000 (UTC)
Subject: rpms/compiz/devel compiz-0.8.2-gconf-buildfix.patch, NONE,
	1.1 compiz.spec, 1.177, 1.178
Message-ID: <20090822153054.8385311C00A2@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13546

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.8.2-gconf-buildfix.patch 
Log Message:
fix build

compiz-0.8.2-gconf-buildfix.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE compiz-0.8.2-gconf-buildfix.patch ---
diff -upNr compiz-0.8.2.orign/configure.ac compiz-0.8.2/configure.ac
--- compiz-0.8.2.orign/configure.ac	2009-03-01 13:10:46.000000000 +0100
+++ compiz-0.8.2/configure.ac	2009-08-22 17:25:51.905352173 +0200
@@ -331,7 +331,7 @@ if test "x$use_gtk" = "xyes"; then
 
     if test "x$use_gnome" = "xyes"; then
       PKG_CHECK_MODULES(GNOME_WINDOW_SETTINGS,
-			gnome-window-settings-2.0 gnome-desktop-2.0,
+			gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0,
 			[use_gnome=yes], [use_gnome=no])
     fi
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- compiz.spec	22 Aug 2009 14:42:23 -0000	1.177
+++ compiz.spec	22 Aug 2009 15:30:54 -0000	1.178
@@ -14,7 +14,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +73,9 @@ Patch123: compiz-0.8.2-pin-initial-plugi
 # Make the terminal keybinding work (RH #439665)
 Patch125: compiz-0.8.2-gnome-terminal.patch
 
+#Fix build
+Patch126: compiz-0.8.2-gconf-buildfix.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -149,6 +152,7 @@ popd
 %patch123 -p1 -b .initial-plugins
 %patch125 -p1 -b .gnome-terminal
 %patch108 -p1 -b .pageflip
+%patch126 -p1 -b .gconf
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -364,6 +368,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-12
+- Fix build
+
 * Sat Aug 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-11
 - Fix up the compiz-gtk script
 



From tmraz at fedoraproject.org  Sat Aug 22 15:36:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 15:36:32 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib-2.6.4-openssl.patch, NONE, 1.1 ptlib.spec,
	1.20, 1.21
Message-ID: <20090822153632.EBE8611C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14498

Modified Files:
	ptlib.spec 
Added Files:
	ptlib-2.6.4-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.4-5
- rebuilt with new openssl


ptlib-2.6.4-openssl.patch:
 pssl.cxx |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE ptlib-2.6.4-openssl.patch ---
diff -up ptlib-2.6.4/src/ptclib/pssl.cxx.openssl ptlib-2.6.4/src/ptclib/pssl.cxx
--- ptlib-2.6.4/src/ptclib/pssl.cxx.openssl	2009-07-05 07:52:49.000000000 +0200
+++ ptlib-2.6.4/src/ptclib/pssl.cxx	2009-08-22 17:34:38.000000000 +0200
@@ -800,7 +800,11 @@ PSSLContext::PSSLContext(const void * se
 void PSSLContext::Construct(Method method, const void * sessionId, PINDEX idSize)
 {
   // create the new SSL context
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD * meth;
+#else
   SSL_METHOD * meth;
+#endif
 
   switch (method) {
     case SSLv2:


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ptlib.spec	22 Aug 2009 13:59:49 -0000	1.20
+++ ptlib.spec	22 Aug 2009 15:36:32 -0000	1.21
@@ -4,6 +4,7 @@ Version:	2.6.4
 Release:	5%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+Patch1:		ptlib-2.6.4-openssl.patch
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +37,7 @@ The ptlib-devel package includes the lib
 
 %prep
 %setup -q 
+%patch1 -p1 -b .openssl
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"



From lucilanga at fedoraproject.org  Sat Aug 22 15:43:28 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 22 Aug 2009 15:43:28 +0000 (UTC)
Subject: rpms/libftdi/F-11 libftdi.spec,1.10,1.11
Message-ID: <20090822154328.A6AE311C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16319

Modified Files:
	libftdi.spec 
Log Message:
* Sat Aug 22 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-7
- add group for udev rule (#517773)


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-11/libftdi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libftdi.spec	31 Jul 2009 11:11:51 -0000	1.10
+++ libftdi.spec	22 Aug 2009 15:43:28 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:		libftdi
 Version:	0.16
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Library to program and control the FTDI USB controller
 
 Group:		System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	libusb-devel, doxygen, boost-devel, python-devel, swig
 Requires:	pkgconfig, udev
+Requires(pre):  shadow-utils
 
 %package devel
 Summary:	Header files and static libraries for libftdi
@@ -121,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*.hpp
 %{_libdir}/pkgconfig/libftdipp.pc
 
+%pre
+getent group GROUPNAME >/dev/null || groupadd -r plugdev
+exit 0
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -128,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun c++ -p /sbin/ldconfig
 
 %changelog
+* Sat Aug 22 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-6
+add group for udev rule (#517773)
+
 * Fri Jul 31 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-5
 - rebuilt with newer patch
 



From tmraz at fedoraproject.org  Sat Aug 22 15:57:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 15:57:04 +0000 (UTC)
Subject: rpms/globus-gsi-credential/devel
	globus_gsi_credential-2.2-openssl.patch, NONE,
	1.1 globus-gsi-credential.spec, 1.4, 1.5
Message-ID: <20090822155704.C239211C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globus-gsi-credential/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18292

Modified Files:
	globus-gsi-credential.spec 
Added Files:
	globus_gsi_credential-2.2-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
- rebuilt with new openssl


globus_gsi_credential-2.2-openssl.patch:
 globus_gsi_cred_handle.c |   12 ++++++++++++
 globus_gsi_credential.h  |    4 ++++
 2 files changed, 16 insertions(+)

--- NEW FILE globus_gsi_credential-2.2-openssl.patch ---
diff -up globus_gsi_credential-2.2/library/globus_gsi_credential.h.openssl globus_gsi_credential-2.2/library/globus_gsi_credential.h
--- globus_gsi_credential-2.2/library/globus_gsi_credential.h.openssl	2007-08-06 22:49:25.000000000 +0200
+++ globus_gsi_credential-2.2/library/globus_gsi_credential.h	2009-08-22 10:17:05.000000000 +0200
@@ -158,6 +158,10 @@ typedef struct globus_l_gsi_cred_handle_
  *
  * @see globus_gsi_cred_handle_init
  */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK STACK_OF(OPENSSL_STRING)
+#endif
+
 typedef struct globus_l_gsi_cred_handle_attrs_s *
                                         globus_gsi_cred_handle_attrs_t;
 
diff -up globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c.openssl globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c
--- globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c.openssl	2008-09-11 14:52:50.000000000 +0200
+++ globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c	2009-08-22 11:13:04.000000000 +0200
@@ -1279,7 +1279,11 @@ globus_gsi_cred_get_policies(
         goto exit;
     }
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L 
     if((*policies = sk_new_null()) == NULL)
+#else
+    if((*policies = sk_OPENSSL_STRING_new_null()) == NULL)
+#endif
     {
         GLOBUS_GSI_CRED_OPENSSL_ERROR_RESULT(
             result,
@@ -1358,7 +1362,11 @@ globus_gsi_cred_get_policies(
             goto error_exit;
         }
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L 
         if(sk_push(*policies, final_policy_string) == 0)
+#else
+        if(sk_OPENSSL_STRING_push(*policies, (OPENSSL_STRING)final_policy_string) == 0)
+#endif
         {
             GLOBUS_GSI_CRED_OPENSSL_ERROR_RESULT(
                 result,
@@ -1390,7 +1398,11 @@ globus_gsi_cred_get_policies(
 
     if(*policies != NULL)
     {
+#if OPENSSL_VERSION_NUMBER < 0x10000000L 
         sk_pop_free(*policies, free);
+#else
+        sk_OPENSSL_STRING_pop_free(*policies, free);
+#endif
     }
     *policies = NULL;
     


Index: globus-gsi-credential.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/devel/globus-gsi-credential.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-credential.spec	21 Aug 2009 13:34:36 -0000	1.4
+++ globus-gsi-credential.spec	22 Aug 2009 15:57:04 -0000	1.5
@@ -23,6 +23,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
+Patch1:		globus_gsi_credential-2.2-openssl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -97,6 +98,7 @@ Globus GSI Credential Library Documentat
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch1 -p1 -b .openssl
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -198,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2-4
 - rebuilt with new openssl
 
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-3



From mdomsch at fedoraproject.org  Sat Aug 22 16:00:17 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 22 Aug 2009 16:00:17 +0000 (UTC)
Subject: rpms/dkms/devel .cvsignore, 1.15, 1.16 dkms.spec, 1.22, 1.23 sources,
	1.15, 1.16
Message-ID: <20090822160017.2A58111C0439@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18801

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	15 Apr 2009 04:51:37 -0000	1.15
+++ .cvsignore	22 Aug 2009 16:00:16 -0000	1.16
@@ -1 +1 @@
-dkms-2.0.21.1.tar.gz
+dkms_2.1.0.0.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dkms.spec	24 Jul 2009 20:22:38 -0000	1.22
+++ dkms.spec	22 Aug 2009 16:00:16 -0000	1.23
@@ -1,17 +1,16 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.21.1
-Release: 3%{?dist}
+Version: 2.1.0.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99, lsb
+Requires: bash > 1.99
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
-Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
-Patch0: dkms-modprobe.d.patch
+Source0: http://linux.dell.com/dkms/permalink/dkms_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora}
@@ -26,8 +25,6 @@ module RPMS as originally developed by D
 %prep
 
 %setup -q
-%patch0 -p1
-
 %build
 
 %triggerpostun -- %{name} < 1.90.00-1
@@ -125,6 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
+- update to latest upstream
+- drop Requires: lsb.  avoid calling rpm (recursively) if possible.
+- add recognition for Oracle Enterprise Linux, Oracle VM, Scientific
+  Linux, and VMware 3.x
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.21.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 Apr 2009 04:51:37 -0000	1.15
+++ sources	22 Aug 2009 16:00:16 -0000	1.16
@@ -1 +1 @@
-539113eabf49356b9659c85512927519  dkms-2.0.21.1.tar.gz
+16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz



From tmraz at fedoraproject.org  Sat Aug 22 16:15:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 16:15:17 +0000 (UTC)
Subject: rpms/ocspd/devel openca-ocspd-1.5.1-openssl.patch, NONE,
	1.1 ocspd.spec, 1.5, 1.6
Message-ID: <20090822161517.9CEC911C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ocspd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21449

Modified Files:
	ocspd.spec 
Added Files:
	openca-ocspd-1.5.1-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.5.1-0.7.rc1
- rebuilt with new openssl


openca-ocspd-1.5.1-openssl.patch:
 general.h      |    4 ++++
 ocspd_engine.c |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

--- NEW FILE openca-ocspd-1.5.1-openssl.patch ---
diff -up openca-ocspd-1.5.1-rc1/src/general.h.openssl openca-ocspd-1.5.1-rc1/src/general.h
--- openca-ocspd-1.5.1-rc1/src/general.h.openssl	2009-08-22 18:04:47.000000000 +0200
+++ openca-ocspd-1.5.1-rc1/src/general.h	2009-08-22 18:04:06.000000000 +0200
@@ -279,6 +279,10 @@ typedef struct ca_list_st
 
 	} CA_LIST_ENTRY;
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK STACK_OF(OPENSSL_STRING)
+#endif
+
 typedef struct ocspd_config {
 
 	/* Configuration file name */
diff -up openca-ocspd-1.5.1-rc1/src/ocspd_engine.c.openssl openca-ocspd-1.5.1-rc1/src/ocspd_engine.c
--- openca-ocspd-1.5.1-rc1/src/ocspd_engine.c.openssl	2009-08-22 17:50:07.000000000 +0200
+++ openca-ocspd-1.5.1-rc1/src/ocspd_engine.c	2009-08-22 18:13:19.000000000 +0200
@@ -97,7 +97,11 @@ int ocspd_exec_engine_cmds ( ENGINE *e, 
 	int i, val, num;
 
 	/* Check if there are some commands to be executed */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+        val = sk_OPENSSL_STRING_num(cmds);
+#else
         val = sk_num(cmds);
+#endif
         if(val < 1) {
 		if( ocspd_conf->verbose )
                     syslog(LOG_INFO, "HSM no commands to execute in stack");
@@ -127,7 +131,11 @@ int ocspd_exec_engine_cmds ( ENGINE *e, 
                 const char *cmd = NULL;
 		const char *arg = NULL;
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+                if( (cmd = (const char *)sk_OPENSSL_STRING_value(cmds, i)) == NULL ) {
+#else
                 if( (cmd = sk_value(cmds, i)) == NULL ) {
+#endif
 			continue;
 		}
 
@@ -192,8 +200,13 @@ int ocspd_load_engine_section ( OCSPD_CO
 		return 0;
 
 	/* Initialise the STACK for pre/post commands */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	conf->pre_cmds = sk_OPENSSL_STRING_new_null();
+	conf->post_cmds = sk_OPENSSL_STRING_new_null();
+#else
 	conf->pre_cmds = sk_new_null();
 	conf->post_cmds = sk_new_null();
+#endif
 
 	/* Scan each option and push the value to the right cmds stack */
         for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
@@ -203,12 +216,20 @@ int ocspd_load_engine_section ( OCSPD_CO
                         conf->engine_id = strdup(val->value);
 			syslog( LOG_INFO, "Using Engine '%s'", val->value );
                 } else if( strstr( val->name, ENV_OCSPD_ENGINE_PRE ) != NULL ) {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+			sk_OPENSSL_STRING_push( conf->pre_cmds, (OPENSSL_STRING)val->value );
+#else
 			sk_push( conf->pre_cmds, val->value );
+#endif
 			if( ocspd_conf->verbose )
 			    syslog( LOG_INFO, "Added '%s' to PRE COMMANDS",
 				val->value );
 		} else if ( strstr(val->name, ENV_OCSPD_ENGINE_POST) != NULL) {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+			sk_OPENSSL_STRING_push( conf->post_cmds, (OPENSSL_STRING)val->value );
+#else
 			sk_push( conf->post_cmds, val->value );
+#endif
 			if( ocspd_conf->verbose )
 			    syslog( LOG_INFO, "Added '%s' to POST COMMANDS",
 				val->value );


Index: ocspd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocspd/devel/ocspd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ocspd.spec	21 Aug 2009 14:49:37 -0000	1.5
+++ ocspd.spec	22 Aug 2009 16:15:17 -0000	1.6
@@ -12,6 +12,7 @@ Source:		http://downloads.sourceforge.ne
 Patch1:		openca-ocspd-1.5.1-bufresponse.patch
 Patch2:		openca-ocspd-1.5.1-misc.patch
 Patch3:		openca-ocspd-1.5.1-badcomment.patch
+Patch4:		openca-ocspd-1.5.1-openssl.patch
 URL:		http://www.openca.org/projects/ocspd
 Obsoletes:	openca-ocspd <= %{version}-%{release}
 Provides:	openca-ocspd = %{version}-%{release}
@@ -36,7 +37,7 @@ Mozilla/Firefox/Thunderbird/Apache).
 %patch1 -p1 -b .bufresponse
 %patch2 -p1 -b .misc
 %patch3 -p1 -b .badcomment
-
+%patch4 -p1 -b .openssl
 
 %build
 
@@ -106,7 +107,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5.1-0.7.rc1
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 1.5.1-0.7.rc1
 - rebuilt with new openssl
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-0.6.rc1



From pkgdb at fedoraproject.org  Sat Aug 22 16:38:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:38:36 +0000
Subject: [pkgdb] libp11: kalev has requested watchbugzilla
Message-ID: <20090822163836.A362A10F895@bastion2.fedora.phx.redhat.com>

kalev has requested the watchbugzilla acl on libp11 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 16:38:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:38:40 +0000
Subject: [pkgdb] libp11: kalev has requested commit
Message-ID: <20090822163840.4A26F10F898@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on libp11 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 16:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:38:48 +0000
Subject: [pkgdb] libp11: kalev has requested watchbugzilla
Message-ID: <20090822163848.720D210F89A@bastion2.fedora.phx.redhat.com>

kalev has requested the watchbugzilla acl on libp11 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 16:38:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:38:50 +0000
Subject: [pkgdb] libp11: kalev has requested commit
Message-ID: <20090822163850.A3D9B10F89F@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on libp11 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From mso at fedoraproject.org  Sat Aug 22 16:38:57 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sat, 22 Aug 2009 16:38:57 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel .cvsignore, 1.3,
	1.4 constantine-backgrounds.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090822163857.5453111C00A2@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24928

Modified Files:
	.cvsignore constantine-backgrounds.spec sources 
Log Message:


Bugfix respin.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 20:43:28 -0000	1.3
+++ .cvsignore	22 Aug 2009 16:38:57 -0000	1.4
@@ -1 +1 @@
-constantine-backgrounds-11.90.2.tar.lzma
+constantine-backgrounds-11.90.2.1.tar.lzma


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- constantine-backgrounds.spec	21 Aug 2009 22:01:21 -0000	1.5
+++ constantine-backgrounds.spec	22 Aug 2009 16:38:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           constantine-backgrounds
-Version:        11.90.2
-Release:        2%{?dist}
+Version:        11.90.2.1
+Release:        1%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Martin Sourada <mso at feodraproject.org> - 11.90.2.1-1
+- Extras slideshow bugfix respin
+
 * Fri Aug 21 2009 Martin Sourada <mso at fedoraproject.org> - 11.90.2-2
 - Forgot to BR: inkscape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 20:43:28 -0000	1.3
+++ sources	22 Aug 2009 16:38:57 -0000	1.4
@@ -1 +1 @@
-18da6721350f4e8974a2e184ba56e41b  constantine-backgrounds-11.90.2.tar.lzma
+4388ee40f65d59114bdf2af14093166f  constantine-backgrounds-11.90.2.1.tar.lzma



From pkgdb at fedoraproject.org  Sat Aug 22 16:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:38:56 +0000
Subject: [pkgdb] libp11: kalev has requested watchbugzilla
Message-ID: <20090822163856.8CDA410F85C@bastion2.fedora.phx.redhat.com>

kalev has requested the watchbugzilla acl on libp11 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 16:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:38:58 +0000
Subject: [pkgdb] libp11: kalev has requested commit
Message-ID: <20090822163858.E93A010F8A1@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on libp11 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 16:39:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:39:58 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested watchbugzilla
Message-ID: <20090822163958.AD14C10F898@bastion2.fedora.phx.redhat.com>

kalev has requested the watchbugzilla acl on engine_pkcs11 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:01 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested watchcommits
Message-ID: <20090822164001.9453910F886@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on engine_pkcs11 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:03 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested commit
Message-ID: <20090822164003.2CBC710F89B@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on engine_pkcs11 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:11 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested watchbugzilla
Message-ID: <20090822164011.DC81C10F88C@bastion2.fedora.phx.redhat.com>

kalev has requested the watchbugzilla acl on engine_pkcs11 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:15 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested watchcommits
Message-ID: <20090822164015.3C16210F89C@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on engine_pkcs11 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:17 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested commit
Message-ID: <20090822164017.5B4CC10F8A0@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on engine_pkcs11 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:23 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested watchbugzilla
Message-ID: <20090822164024.52BB710F85C@bastion2.fedora.phx.redhat.com>

kalev has requested the watchbugzilla acl on engine_pkcs11 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:24 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested watchcommits
Message-ID: <20090822164024.EE42510F8A1@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on engine_pkcs11 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 16:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 16:40:27 +0000
Subject: [pkgdb] engine_pkcs11: kalev has requested commit
Message-ID: <20090822164027.2403110F8A5@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on engine_pkcs11 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From salimma at fedoraproject.org  Sat Aug 22 16:52:17 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 16:52:17 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.13,1.14
Message-ID: <20090822165217.D33AD11C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27565

Modified Files:
	llvm.spec 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
- Disable use of position-independent code on 32-bit platforms
  (buggy in LLVM <= 2.5)



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- llvm.spec	10 Aug 2009 03:43:29 -0000	1.13
+++ llvm.spec	22 Aug 2009 16:52:17 -0000	1.14
@@ -15,7 +15,7 @@
 
 Name:           llvm
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -149,6 +149,8 @@ for developing applications that use %{n
 
 %build
 # Note: --enable-pic can be turned off when 2.6 comes out
+#       and up to 2.5, unsafe on 32-bit archs (in our case,
+#       anything but x86_64)
 %configure \
   --libdir=%{_libdir}/%{name} \
   --datadir=%{_datadir}/%{name}-%{version} \
@@ -157,8 +159,9 @@ for developing applications that use %{n
   --enable-debug-runtime \
   --enable-jit \
   --enable-optimized \
-  --enable-pic \
-  --with-pic
+%ifarch x86_64
+  --enable-pic
+%endif
 #   --enable-targets=host-only \
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
@@ -349,6 +352,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
+- Disable use of position-independent code on 32-bit platforms
+  (buggy in LLVM <= 2.5)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Sat Aug 22 17:06:08 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 22 Aug 2009 17:06:08 +0000 (UTC)
Subject: rpms/dkms/devel dkms-modprobe.d.patch,1.1,NONE
Message-ID: <20090822170608.6A79C11C00A2@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29319

Removed Files:
	dkms-modprobe.d.patch 
Log Message:
remove patch now included upstream


--- dkms-modprobe.d.patch DELETED ---



From mjakubicek at fedoraproject.org  Sat Aug 22 17:29:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 22 Aug 2009 17:29:27 +0000 (UTC)
Subject: rpms/splint/devel splint.spec,1.14,1.15
Message-ID: <20090822172927.531BC11C00A2@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/splint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv548

Modified Files:
	splint.spec 
Log Message:
- Specfile sanity revisited: proper Provides/Obsoletes on lclint
  and some other minor changes to make rpmlint silent



Index: splint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/splint/devel/splint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- splint.spec	10 Aug 2009 10:07:08 -0000	1.14
+++ splint.spec	22 Aug 2009 17:29:27 -0000	1.15
@@ -1,16 +1,17 @@
-Name:           splint
-Version:        3.1.2
-Release:        5%{?dist}
-Summary:        An implementation of the lint program
-
-Group:          Development/Tools
-License:        GPLv2+
-URL:            http://www.splint.org/
-Source0:        http://www.splint.org/downloads/%{name}-%{version}.src.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:			splint
+Version:		3.1.2
+Release:		6%{?dist}
+Summary:		An implementation of the lint program
+
+Group:			Development/Tools
+License:		GPLv2+
+URL:			http://www.splint.org/
+Source0:		http://www.splint.org/downloads/%{name}-%{version}.src.tgz
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	flex 
 
-Obsoletes:      lclint
+Obsoletes:		lclint <= 3.0.0
+Provides:		lclint = %{version}-%{release}
 
 %description
 Splint is a tool for statically checking C programs for coding errors and
@@ -46,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.1.2-6
+- Specfile sanity revisited: proper Provides/Obsoletes on lclint
+  and some other minor changes to make rpmlint silent
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.1.2-5
 - Convert specfile to UTF-8.
 
@@ -198,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 - added Summary
 
 * Tue Feb  3 1998 Otto Hammersmith <otto at redhat.com>
-- %doc'ed some stuff
+- %%doc'ed some stuff
 
 * Mon Feb  2 1998 Otto Hammersmith <otto at redhat.com>
 - made /usr/lib/lclint/bin a directory, not the executable



From mdomsch at fedoraproject.org  Sat Aug 22 17:30:54 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 22 Aug 2009 17:30:54 +0000 (UTC)
Subject: rpms/dkms/EL-5 .cvsignore, 1.10, 1.11 dkms.spec, 1.14, 1.15 sources,
	1.10, 1.11
Message-ID: <20090822173054.CA29D11C00A2@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	30 May 2008 20:09:24 -0000	1.10
+++ .cvsignore	22 Aug 2009 17:30:54 -0000	1.11
@@ -1 +1 @@
-dkms-2.0.19.1.tar.gz
+dkms_2.1.0.0.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-5/dkms.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dkms.spec	30 May 2008 20:09:24 -0000	1.14
+++ dkms.spec	22 Aug 2009 17:30:54 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.19.1
+Version: 2.1.0.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -10,10 +10,12 @@ Requires: bash > 1.99
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
-Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
+Source0: http://linux.dell.com/dkms/permalink/dkms_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# when building for Fedora, uncomment this Requires
+
+%if 0%{?fedora}
 Requires: kernel-devel
+%endif
 
 %description
 This package contains the framework for the Dynamic
@@ -100,6 +102,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/kernel/prerm.d/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}
 
+%if 0%{?suse_version}
+# suse doesnt yet support /etc/kernel/{prerm.d,postinst.d}, but will fail build
+# with unowned dirs if we dont own them ourselves
+# when opensuse *does* add this support, we will need to BuildRequires kernel
+%dir %{_sysconfdir}/kernel
+%dir %{_sysconfdir}/kernel/postinst.d
+%dir %{_sysconfdir}/kernel/prerm.d
+%endif
+
+
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
 # enable on initial install
@@ -110,6 +122,24 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
+- update to latest upstream
+- drop Requires: lsb.  avoid calling rpm (recursively) if possible.
+- add recognition for Oracle Enterprise Linux, Oracle VM, Scientific
+  Linux, and VMware 3.x
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.21.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
+- add Requires: lsb
+
+* Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
+- update to latest upstream
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 28 2008 Matt Domsch <Matt_Domsch at dell.com> 2.0.19.1
 - depmod on uninstall before mkinitrd, depmod fix & cleanups
 - find_module_from_ko() could incorrectly return multiple values


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 May 2008 20:09:24 -0000	1.10
+++ sources	22 Aug 2009 17:30:54 -0000	1.11
@@ -1 +1 @@
-d51bb4a0679dcd6152dfa0c37c3b716b  dkms-2.0.19.1.tar.gz
+16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz



From mdomsch at fedoraproject.org  Sat Aug 22 17:32:26 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 22 Aug 2009 17:32:26 +0000 (UTC)
Subject: rpms/dkms/EL-4 .cvsignore, 1.8, 1.9 dkms.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <20090822173226.1229A11C00A2@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1214

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 May 2008 20:07:01 -0000	1.8
+++ .cvsignore	22 Aug 2009 17:32:25 -0000	1.9
@@ -1 +1 @@
-dkms-2.0.19.1.tar.gz
+dkms_2.1.0.0.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-4/dkms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dkms.spec	30 May 2008 20:07:01 -0000	1.11
+++ dkms.spec	22 Aug 2009 17:32:25 -0000	1.12
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.19.1
+Version: 2.1.0.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -10,10 +10,12 @@ Requires: bash > 1.99
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
-Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
+Source0: http://linux.dell.com/dkms/permalink/dkms_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# when building for Fedora, uncomment this Requires
+
+%if 0%{?fedora}
 Requires: kernel-devel
+%endif
 
 %description
 This package contains the framework for the Dynamic
@@ -100,6 +102,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/kernel/prerm.d/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}
 
+%if 0%{?suse_version}
+# suse doesnt yet support /etc/kernel/{prerm.d,postinst.d}, but will fail build
+# with unowned dirs if we dont own them ourselves
+# when opensuse *does* add this support, we will need to BuildRequires kernel
+%dir %{_sysconfdir}/kernel
+%dir %{_sysconfdir}/kernel/postinst.d
+%dir %{_sysconfdir}/kernel/prerm.d
+%endif
+
+
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
 # enable on initial install
@@ -110,6 +122,24 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
+- update to latest upstream
+- drop Requires: lsb.  avoid calling rpm (recursively) if possible.
+- add recognition for Oracle Enterprise Linux, Oracle VM, Scientific
+  Linux, and VMware 3.x
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.21.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
+- add Requires: lsb
+
+* Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
+- update to latest upstream
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 28 2008 Matt Domsch <Matt_Domsch at dell.com> 2.0.19.1
 - depmod on uninstall before mkinitrd, depmod fix & cleanups
 - find_module_from_ko() could incorrectly return multiple values


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 May 2008 20:07:01 -0000	1.9
+++ sources	22 Aug 2009 17:32:25 -0000	1.10
@@ -1 +1 @@
-d51bb4a0679dcd6152dfa0c37c3b716b  dkms-2.0.19.1.tar.gz
+16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz



From pkgdb at fedoraproject.org  Sat Aug 22 17:47:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:47:24 +0000
Subject: [pkgdb] libp11 had acl change status
Message-ID: <20090822174724.AE82310F854@bastion2.fedora.phx.redhat.com>

mra has set the watchbugzilla acl on libp11 (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 17:47:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:47:27 +0000
Subject: [pkgdb] libp11 had acl change status
Message-ID: <20090822174727.4FA0310F86F@bastion2.fedora.phx.redhat.com>

mra has set the commit acl on libp11 (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 17:47:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:47:40 +0000
Subject: [pkgdb] libp11 had acl change status
Message-ID: <20090822174740.69C1E10F88B@bastion2.fedora.phx.redhat.com>

mra has set the commit acl on libp11 (Fedora 10) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 17:47:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:47:39 +0000
Subject: [pkgdb] libp11 had acl change status
Message-ID: <20090822174740.20E3F10F882@bastion2.fedora.phx.redhat.com>

mra has set the watchbugzilla acl on libp11 (Fedora 10) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 17:47:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:47:44 +0000
Subject: [pkgdb] libp11 had acl change status
Message-ID: <20090822174744.AE69210F895@bastion2.fedora.phx.redhat.com>

mra has set the commit acl on libp11 (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 17:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:47:46 +0000
Subject: [pkgdb] libp11 had acl change status
Message-ID: <20090822174746.CA8F910F899@bastion2.fedora.phx.redhat.com>

mra has set the watchbugzilla acl on libp11 (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libp11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:16 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174816.8844510F86F@bastion2.fedora.phx.redhat.com>

mra has set the watchbugzilla acl on engine_pkcs11 (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:17 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174817.BB06310F889@bastion2.fedora.phx.redhat.com>

mra has set the watchcommits acl on engine_pkcs11 (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:18 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174818.4B8A610F88C@bastion2.fedora.phx.redhat.com>

mra has set the commit acl on engine_pkcs11 (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:22 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174822.8B2C610F890@bastion2.fedora.phx.redhat.com>

mra has set the commit acl on engine_pkcs11 (Fedora 10) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:24 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174824.5364010F89B@bastion2.fedora.phx.redhat.com>

mra has set the watchcommits acl on engine_pkcs11 (Fedora 10) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:25 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174825.EFAE910F8A0@bastion2.fedora.phx.redhat.com>

mra has set the watchbugzilla acl on engine_pkcs11 (Fedora 10) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:29 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174829.9D3E810F8A2@bastion2.fedora.phx.redhat.com>

mra has set the commit acl on engine_pkcs11 (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:30 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174830.B634A10F8A5@bastion2.fedora.phx.redhat.com>

mra has set the watchcommits acl on engine_pkcs11 (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From pkgdb at fedoraproject.org  Sat Aug 22 17:48:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 17:48:32 +0000
Subject: [pkgdb] engine_pkcs11 had acl change status
Message-ID: <20090822174832.E2BA510F8A6@bastion2.fedora.phx.redhat.com>

mra has set the watchbugzilla acl on engine_pkcs11 (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/engine_pkcs11



From mdomsch at fedoraproject.org  Sat Aug 22 18:05:23 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 22 Aug 2009 18:05:23 +0000 (UTC)
Subject: rpms/dkms/F-11 .cvsignore, 1.15, 1.16 dkms.spec, 1.21, 1.22 sources,
	1.15, 1.16 dkms-modprobe.d.patch, 1.1, NONE
Message-ID: <20090822180523.7757911C00A2@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6721

Modified Files:
	.cvsignore dkms.spec sources 
Removed Files:
	dkms-modprobe.d.patch 
Log Message:
update to latest upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	15 Apr 2009 04:51:37 -0000	1.15
+++ .cvsignore	22 Aug 2009 18:05:23 -0000	1.16
@@ -1 +1 @@
-dkms-2.0.21.1.tar.gz
+dkms_2.1.0.0.orig.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/dkms.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- dkms.spec	15 Apr 2009 12:53:08 -0000	1.21
+++ dkms.spec	22 Aug 2009 18:05:23 -0000	1.22
@@ -1,17 +1,16 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.21.1
-Release: 2%{?dist}
+Version: 2.1.0.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99, lsb
+Requires: bash > 1.99
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
-Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
-Patch0: dkms-modprobe.d.patch
+Source0: http://linux.dell.com/dkms/permalink/dkms_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora}
@@ -26,8 +25,6 @@ module RPMS as originally developed by D
 %prep
 
 %setup -q
-%patch0 -p1
-
 %build
 
 %triggerpostun -- %{name} < 1.90.00-1
@@ -125,6 +122,15 @@ rm -rf $RPM_BUILD_ROOT
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Sat Aug 22 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0.0-1
+- update to latest upstream
+- drop Requires: lsb.  avoid calling rpm (recursively) if possible.
+- add recognition for Oracle Enterprise Linux, Oracle VM, Scientific
+  Linux, and VMware 3.x
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.21.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
 - add Requires: lsb
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 Apr 2009 04:51:37 -0000	1.15
+++ sources	22 Aug 2009 18:05:23 -0000	1.16
@@ -1 +1 @@
-539113eabf49356b9659c85512927519  dkms-2.0.21.1.tar.gz
+16783c3ecd48a5d6f28242b789fba6a8  dkms_2.1.0.0.orig.tar.gz


--- dkms-modprobe.d.patch DELETED ---



From rdieter at fedoraproject.org  Sat Aug 22 18:07:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 22 Aug 2009 18:07:28 +0000 (UTC)
Subject: rpms/lyx/devel lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.39,
	1.40 lyx.spec, 1.98, 1.99 sources, 1.37,
	1.38 lyx-1.6.3-xdg_open.patch, 1.1, NONE
Message-ID: <20090822180728.A80C811C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7254

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.4-xdg_open.patch 
Removed Files:
	lyx-1.6.3-xdg_open.patch 
Log Message:
* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
- lyx-1.6.4
- handle fonts manually (now EPEL-5 compatible)


lyx-1.6.4-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.4-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	4 Jun 2009 16:55:31 -0000	1.39
+++ .cvsignore	22 Aug 2009 18:07:28 -0000	1.40
@@ -1 +1 @@
-lyx-1.6.3.tar.bz2
+lyx-1.6.4.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- lyx.spec	3 Aug 2009 17:23:58 -0000	1.98
+++ lyx.spec	22 Aug 2009 18:07:28 -0000	1.99
@@ -3,23 +3,28 @@
 %define _with_aiksaurus --with-aiksaurus
 %endif
 
+%if 0%{?fedora} > 9
+%define build_noarch BuildArch: noarch
+%endif
+
 ## lyx-fonts
 %global fontname lyx
 %global common_desc \
 A collection of Math symbol fonts.
-%if 0%{?fedora} > 8
+#if 0%{?fedora} > 8 
+%if 0
 %define fontpackages 1
 BuildRequires: fontpackages-devel
 %else
-## FIXME!!
+%define _fontdir %{_datadir}/fonts/%{fontname}
 %endif
 
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.3
-Release: 3%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -28,7 +33,7 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.3-xdg_open.patch
+Patch1: lyx-1.6.4-xdg_open.patch
 
 Source1: lyxrc.dist
 
@@ -111,9 +116,7 @@ and let the computer take care of the re
 %package common
 Summary:  Common files of %{name} 
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description common 
 {summary}.
 
@@ -132,9 +135,7 @@ Requires: %{fontname}-eufm10-fonts = %{v
 Requires: %{fontname}-msam10-fonts = %{version}-%{release}
 Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
 Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-fonts-compat
 This package only exists to help transition mathml-fonts users to the new
 package split. It will be removed after one distribution release cycle, please
@@ -147,9 +148,7 @@ Summary: Common files of %{fontname}-fon
 # One of the font files (wasy10) is separately licensed GPL+.
 License: Copyright only and GPL+
 %{?fontpackages:Requires: fontpackages-filesystem}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{name}-fonts-common
 This package consists of files used by other %{fontname}-fonts packages.
 
@@ -157,101 +156,73 @@ This package consists of files used by o
 Summary: Cmex10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-cmex10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n cmex10 cmex10.ttf}
 
 %package -n %{fontname}-cmmi10-fonts
 Summary: Cmmi10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-cmmi10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n cmmi10 cmmi10.ttf}
 
 %package -n %{fontname}-cmr10-fonts
 Summary: Cmr10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-cmr10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n cmr10 cmr10.ttf}
 
 %package -n %{fontname}-cmsy10-fonts
 Summary: Cmsy10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-cmsy10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n cmsy10 cmsy10.ttf}
 
 %package -n %{fontname}-esint10-fonts
 Summary: Esint10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-esint10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n esint10 esint10.ttf}
 
 %package -n %{fontname}-eufm10-fonts
 Summary: Eufm10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-eufm10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n eufm10 eufm10.ttf}
 
 %package -n %{fontname}-msam10-fonts
 Summary: Msam10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-msam10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n msam10 msam10.ttf}
 
 %package -n %{fontname}-msbm10-fonts
 Summary: Msbm10 fonts
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-msbm10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n msbm10 msbm10.ttf}
 
 %package -n %{fontname}-wasy10-fonts
 Summary: Wasy10 fonts
 License: GPL+
 Requires: %{fontname}-fonts-common = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-%endif
+%{?build_noarch}
 %description -n %{fontname}-wasy10-fonts
 %common_desc
-%{?_font_pkg:%_font_pkg -n wasy10 wasy10.ttf}
-
 
 %prep
 
@@ -373,9 +344,91 @@ rm -rf %{buildroot}
 %defattr(0644,root,root,0755)
 %doc lib/fonts/BaKoMaFontLicense.txt
 %doc lib/fonts/ReadmeBaKoMa4LyX.txt
+%dir %{_fontdir}
+
+%if 0%{?fontpackages:1}
+%_font_pkg -n cmex10 cmex10.ttf
+%_font_pkg -n cmmi10 cmmi10.ttf
+%_font_pkg -n cmr10 cmr10.ttf
+%_font_pkg -n cmsy10 cmsy10.ttf
+%_font_pkg -n esint10 esint10.ttf
+%_font_pkg -n eufm10 eufm10.ttf
+%_font_pkg -n msam10 msam10.ttf
+%_font_pkg -n msbm10 msbm10.ttf
+%_font_pkg -n wasy10 wasy10.ttf
+%else
+
+%files -n %{fontname}-cmex10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmex10.ttf
+
+%posttrans -n %{fontname}-cmex10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmmi10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmmi10.ttf
+
+%posttrans -n %{fontname}-cmmi10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmr10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmr10.ttf
+
+%posttrans -n %{fontname}-cmr10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmsy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmsy10.ttf
+
+%posttrans -n %{fontname}-cmsy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-esint10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/esint10.ttf
+
+%posttrans -n %{fontname}-esint10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-eufm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/eufm10.ttf
+
+%posttrans -n %{fontname}-eufm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msam10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msam10.ttf
+
+%posttrans -n %{fontname}-msam10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msbm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msbm10.ttf
+
+%posttrans -n %{fontname}-msbm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-wasy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/wasy10.ttf
+
+%posttrans -n %{fontname}-wasy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%endif
 
 
 %changelog
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
+- lyx-1.6.4
+- handle fonts manually (now EPEL-5 compatible)
+
 * Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
 - add lyx-*-fonts subpkgs (#452357, #514549)
 - -common (noarch) subpkg


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	4 Jun 2009 16:55:31 -0000	1.37
+++ sources	22 Aug 2009 18:07:28 -0000	1.38
@@ -1 +1 @@
-c524e72f7e4d64224c6bfdbd84065dd8  lyx-1.6.3.tar.bz2
+3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2


--- lyx-1.6.3-xdg_open.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Aug 22 18:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 18:15:00 +0000
Subject: [pkgdb] pyPdf: kylev has requested commit
Message-ID: <20090822181500.76B4E10F854@bastion2.fedora.phx.redhat.com>

kylev has requested the commit acl on pyPdf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 18:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 18:15:00 +0000
Subject: [pkgdb] pyPdf: kylev has requested watchcommits
Message-ID: <20090822181500.F249610F882@bastion2.fedora.phx.redhat.com>

kylev has requested the watchcommits acl on pyPdf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 18:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 18:15:04 +0000
Subject: [pkgdb] pyPdf: kylev has requested watchbugzilla
Message-ID: <20090822181504.120B910F890@bastion2.fedora.phx.redhat.com>

kylev has requested the watchbugzilla acl on pyPdf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 18:15:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 18:15:13 +0000
Subject: [pkgdb] pyPdf: kylev has requested watchbugzilla
Message-ID: <20090822181513.3B86910F897@bastion2.fedora.phx.redhat.com>

kylev has requested the watchbugzilla acl on pyPdf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 18:15:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 18:15:15 +0000
Subject: [pkgdb] pyPdf: kylev has requested watchcommits
Message-ID: <20090822181515.EA3E410F899@bastion2.fedora.phx.redhat.com>

kylev has requested the watchcommits acl on pyPdf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 18:15:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 18:15:18 +0000
Subject: [pkgdb] pyPdf: kylev has requested commit
Message-ID: <20090822181518.3998410F89F@bastion2.fedora.phx.redhat.com>

kylev has requested the commit acl on pyPdf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From salimma at fedoraproject.org  Sat Aug 22 18:30:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 18:30:05 +0000 (UTC)
Subject: rpms/llvm/F-10 llvm-2.5-gcc44.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 llvm.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <20090822183005.5046F11C0439@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11709/F-10

Modified Files:
	.cvsignore llvm.spec sources 
Added Files:
	llvm-2.5-gcc44.patch 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
- Disable use of position-independent code on 32-bit platforms
  (buggy in LLVM <= 2.5)


llvm-2.5-gcc44.patch:
 Signals.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE llvm-2.5-gcc44.patch ---
--- llvm-2.5/lib/System/Unix/Signals.inc.gcc44	2008-12-05 18:39:24.000000000 -0500
+++ llvm-2.5/lib/System/Unix/Signals.inc	2009-03-04 13:56:32.804820443 -0500
@@ -78,7 +78,7 @@
   for (int i = 0; i < depth; ++i) {
     Dl_info dlinfo;
     dladdr(StackTrace[i], &dlinfo);
-    char* name = strrchr(dlinfo.dli_fname, '/');
+    const char* name = strrchr(dlinfo.dli_fname, '/');
 
     int nwidth;
     if (name == NULL) nwidth = strlen(dlinfo.dli_fname);
@@ -93,7 +93,7 @@
 
     fprintf(stderr, "%-3d", i);
 
-    char* name = strrchr(dlinfo.dli_fname, '/');
+    const char* name = strrchr(dlinfo.dli_fname, '/');
     if (name == NULL) fprintf(stderr, " %-*s", width, dlinfo.dli_fname);
     else              fprintf(stderr, " %-*s", width, name+1);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Jun 2008 02:48:35 -0000	1.4
+++ .cvsignore	22 Aug 2009 18:30:05 -0000	1.5
@@ -1 +1 @@
-llvm-2.3.tar.gz
+llvm-2.5.tar.gz


Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- llvm.spec	5 Mar 2009 01:25:55 -0000	1.10
+++ llvm.spec	22 Aug 2009 18:30:05 -0000	1.11
@@ -14,7 +14,7 @@
 %define debug_package %{nil}
 
 Name:           llvm
-Version:        2.4
+Version:        2.5
 Release:        4%{?dist}
 Summary:        The Low Level Virtual Machine
 
@@ -23,10 +23,12 @@ License:        NCSA
 URL:            http://llvm.org/
 Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
 %if %{?_with_gcc:1}%{!?_with_gcc:0}
-Source1:        http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz
+Source1:        http://llvm.org/releases/%{version}/llvm-gcc-%{lgcc_version}-%{version}.source.tar.gz
 %endif
 Patch0:         llvm-2.1-fix-sed.patch
 Patch1:         llvm-2.4-fix-ocaml.patch
+# http://llvm.org/bugs/show_bug.cgi?id=3726
+Patch2:         llvm-2.5-gcc44.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -143,9 +145,12 @@ for developing applications that use %{n
 
 %patch0 -p1 -b .fix-sed
 %patch1 -p1 -b .fix-ocaml
+%patch2 -p1 -b .gcc44
 
 %build
 # Note: --enable-pic can be turned off when 2.6 comes out
+#       and up to 2.5, unsafe on 32-bit archs (in our case,
+#       anything but x86_64)
 %configure \
   --libdir=%{_libdir}/%{name} \
   --datadir=%{_datadir}/%{name}-%{version} \
@@ -154,8 +159,9 @@ for developing applications that use %{n
   --enable-debug-runtime \
   --enable-jit \
   --enable-optimized \
-  --enable-pic \
-  --with-pic
+%ifarch x86_64
+  --enable-pic
+%endif
 #   --enable-targets=host-only \
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
@@ -346,6 +352,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
+- Disable use of position-independent code on 32-bit platforms
+  (buggy in LLVM <= 2.5)
+
 * Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.4-4
 - Remove build scripts; they require the build directory to work
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Dec 2008 16:01:03 -0000	1.5
+++ sources	22 Aug 2009 18:30:05 -0000	1.6
@@ -1 +1 @@
-bf43eee98c364fd79c7d2b72e645a15e  llvm-2.4.tar.gz
+55df2ea8665c8094ad2ef85187b9fc74  llvm-2.5.tar.gz



From salimma at fedoraproject.org  Sat Aug 22 18:30:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 18:30:05 +0000 (UTC)
Subject: rpms/llvm/F-11 llvm.spec,1.11,1.12
Message-ID: <20090822183005.69C5C11C0439@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11709/F-11

Modified Files:
	llvm.spec 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
- Disable use of position-independent code on 32-bit platforms
  (buggy in LLVM <= 2.5)



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-11/llvm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- llvm.spec	5 Mar 2009 01:25:55 -0000	1.11
+++ llvm.spec	22 Aug 2009 18:30:05 -0000	1.12
@@ -15,7 +15,7 @@
 
 Name:           llvm
 Version:        2.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -23,7 +23,7 @@ License:        NCSA
 URL:            http://llvm.org/
 Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
 %if %{?_with_gcc:1}%{!?_with_gcc:0}
-Source1:        http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz
+Source1:        http://llvm.org/releases/%{version}/llvm-gcc-%{lgcc_version}-%{version}.source.tar.gz
 %endif
 Patch0:         llvm-2.1-fix-sed.patch
 Patch1:         llvm-2.4-fix-ocaml.patch
@@ -149,6 +149,8 @@ for developing applications that use %{n
 
 %build
 # Note: --enable-pic can be turned off when 2.6 comes out
+#       and up to 2.5, unsafe on 32-bit archs (in our case,
+#       anything but x86_64)
 %configure \
   --libdir=%{_libdir}/%{name} \
   --datadir=%{_datadir}/%{name}-%{version} \
@@ -157,8 +159,9 @@ for developing applications that use %{n
   --enable-debug-runtime \
   --enable-jit \
   --enable-optimized \
-  --enable-pic \
-  --with-pic
+%ifarch x86_64
+  --enable-pic
+%endif
 #   --enable-targets=host-only \
 
 make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
@@ -349,6 +352,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
+- Disable use of position-independent code on 32-bit platforms
+  (buggy in LLVM <= 2.5)
+
 * Wed Mar  4 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-2
 - Remove build scripts; they require the build directory to work
 



From tmraz at fedoraproject.org  Sat Aug 22 18:43:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 18:43:55 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd-2.2.0-openssl.patch, NONE, 1.1 vsftpd.spec,
	1.95, 1.96
Message-ID: <20090822184355.C410211C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13743

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.2.0-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
- rebuilt with new openssl


vsftpd-2.2.0-openssl.patch:
 ssl.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE vsftpd-2.2.0-openssl.patch ---
diff -up vsftpd-2.2.0/ssl.c.openssl vsftpd-2.2.0/ssl.c
--- vsftpd-2.2.0/ssl.c.openssl	2009-01-09 21:47:05.000000000 +0100
+++ vsftpd-2.2.0/ssl.c	2009-08-22 20:41:58.000000000 +0200
@@ -537,7 +537,11 @@ get_ssl(struct vsf_session* p_sess, int 
   if (tunable_debug_ssl)
   {
     const char* p_ssl_version = SSL_get_cipher_version(p_ssl);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl);
+#else
     SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl);
+#endif
     const char* p_cipher_name = SSL_CIPHER_get_name(p_ssl_cipher);
     X509* p_ssl_cert = SSL_get_peer_certificate(p_ssl);
     int reused = SSL_session_reused(p_ssl);


Index: vsftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- vsftpd.spec	21 Aug 2009 16:22:44 -0000	1.95
+++ vsftpd.spec	22 Aug 2009 18:43:51 -0000	1.96
@@ -48,6 +48,7 @@ Patch9: vsftpd-2.1.0-userlist_log.patch
 
 Patch10: vsftpd-2.1.0-trim.patch
 Patch12: vsftpd-2.1.1-daemonize_plus.patch
+Patch13: vsftpd-2.2.0-openssl.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -71,6 +72,7 @@ cp %{SOURCE1} .
 %patch9 -p1 -b .userlist_log
 %patch10 -p1 -b .trim
 %patch12 -p1 -b .daemonize_plus
+%patch13 -p1 -b .openssl
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -135,7 +137,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
 - rebuilt with new openssl
 
 * Tue Aug 04 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-0.1.pre4



From rathann at fedoraproject.org  Sat Aug 22 19:12:54 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 19:12:54 +0000 (UTC)
Subject: rpms/tre/devel tre-tests.patch,NONE,1.1 tre.spec,1.14,1.15
Message-ID: <20090822191254.C40DD11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19089

Modified Files:
	tre.spec 
Added Files:
	tre-tests.patch 
Log Message:
* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-2
- added missing defattr for python subpackage
- dropped conditionals for Fedora <10
- used alternative method for rpath removal
- fixed internal testsuite to run with just-built shared library
- dropped unnecessary build dependencies


tre-tests.patch:
 run-tests.sh |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE tre-tests.patch ---
diff -up tre-0.7.6/tests/agrep/run-tests.sh.tests tre-0.7.6/tests/agrep/run-tests.sh
--- tre-0.7.6/tests/agrep/run-tests.sh.tests	2009-03-11 10:44:44.000000000 +0100
+++ tre-0.7.6/tests/agrep/run-tests.sh	2009-08-22 20:20:15.885084058 +0200
@@ -2,6 +2,7 @@
 
 set -e
 
+export LD_LIBRARY_PATH=$top_builddir/lib/.libs
 agrep="$top_builddir/src/agrep"
 
 echo "$builddir $top_builddir $srcdir"


Index: tre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/tre.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tre.spec	28 Jul 2009 14:28:36 -0000	1.14
+++ tre.spec	22 Aug 2009 19:12:53 -0000	1.15
@@ -2,16 +2,16 @@
 
 Name: tre
 Version: 0.7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Libraries
 Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
 Patch0: %{name}-chicken.patch
+# make internal tests of agrep work with just-built shared library
+Patch1: %{name}-tests.patch
 Summary: POSIX compatible regexp library with approximate matching
 URL: http://laurikari.net/tre/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext-devel
-BuildRequires: libtool
 BuildRequires: python-devel
 
 %description
@@ -57,13 +57,12 @@ regexps of any length, any number of err
 # hack to fix python bindings build
 ln -s lib tre
 %patch0 -p1 -b .chicken
+%patch1 -p1 -b .tests
 
 %build
-#%{__libtoolize} --force
-#%{__aclocal} -I m4 -I gnulib/m4
-#%{__automake}
-#%{__autoconf}
 %configure --disable-static --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 pushd python
 %{__python} setup.py build
@@ -79,6 +78,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %find_lang %{name}
 
 %check
+# revert rpath removal for building internal test programs
+sed -i 's|^runpath_var=DIE_RPATH_DIE|runpath_var=LD_RUN_PATH|g' libtool
 %{__make} check
 
 %clean
@@ -101,10 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %files -n python-%{name}
+%defattr(644,root,root,755)
 %{python_sitearch}/tre.so
-%if 0%{?fedora} >= 9
 %{python_sitearch}/*.egg-info
-%endif
 
 %files -n agrep
 %defattr(644,root,root,755)
@@ -112,6 +112,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/agrep.1*
 
 %changelog
+* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-2
+- added missing defattr for python subpackage
+- dropped conditionals for Fedora <10
+- used alternative method for rpath removal
+- fixed internal testsuite to run with just-built shared library
+- dropped unnecessary build dependencies
+
 * Tue Jul 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.7.6-1
 - new version 0.7.6
 



From kalev at fedoraproject.org  Sat Aug 22 19:16:28 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sat, 22 Aug 2009 19:16:28 +0000 (UTC)
Subject: rpms/libp11/devel .cvsignore, 1.3, 1.4 libp11.spec, 1.11,
	1.12 sources, 1.3, 1.4
Message-ID: <20090822191628.C40B311C00A2@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20511

Modified Files:
	.cvsignore libp11.spec sources 
Log Message:
Update to 0.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Dec 2007 16:56:10 -0000	1.3
+++ .cvsignore	22 Aug 2009 19:16:28 -0000	1.4
@@ -1 +1 @@
-libp11-0.2.3.tar.gz
+libp11-0.2.6.tar.gz


Index: libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/libp11.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libp11.spec	21 Aug 2009 14:20:35 -0000	1.11
+++ libp11.spec	22 Aug 2009 19:16:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libp11
-Version:        0.2.3
-Release:        8%{?dist}
+Version:        0.2.6
+Release:        1%{?dist}
 Summary:        Library for using PKCS#11 modules
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@ URL:            http://www.opensc-projec
 Source0:        http://www.opensc-project.org/files/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  doxygen graphviz
 BuildRequires:  openssl-devel pkgconfig libtool-ltdl-devel
 
 %description
@@ -28,12 +29,21 @@ Files for developing with %{name}
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-doc --enable-api-doc
 make %{?_smp_mflags}
 
+# Remove CRLF line endings
+sed -i "s|\r||g" doc/nonpersistent/wiki.out/trac.css
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+# Use %%doc to install documentation in a standard location
+mkdir __docdir
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/{api,wiki}/ __docdir/
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/README __docdir/wiki
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,12 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc doc/README doc/ChangeLog doc/*.html doc/*.css COPYING 
+%doc COPYING NEWS __docdir/wiki
 %{_libdir}/libp11.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples doc/api
+%doc examples __docdir/api
 %exclude %{_libdir}/*.la
 %{_libdir}/libp11.so
 %{_libdir}/pkgconfig/*
@@ -57,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-1
+- Update to 0.2.6
+- Enable building documentation with doxygen
+- Use INSTALL="install -p" to preserve timestamps
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-8
 - rebuilt with new openssl
 
@@ -82,12 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 - Update to latest upstream sources
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.2.2-7
- - Rebuild for deps
+- Rebuild for deps
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.2.2-6
 - Rebuild for selinux ppc32 issue.
 
-
 * Thu Jun 28 2007 Matt Anderson <mra at hp.com> - 0.2.2-5
 - Additional suggestions by tibbs at math.uh.edu, Source0 URL and license in docs
 
@@ -103,4 +117,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Jun 20 2007 Matt Anderson <mra at hp.com> - 0.2.2-1
 - Initial RPM packaging
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Dec 2007 16:56:10 -0000	1.3
+++ sources	22 Aug 2009 19:16:28 -0000	1.4
@@ -1 +1 @@
-28ee2fc73fd82fbaa4a0670c972ca191  libp11-0.2.3.tar.gz
+4ef3471cfabf787e50c7ae9456f7b09b  libp11-0.2.6.tar.gz



From rathann at fedoraproject.org  Sat Aug 22 19:21:42 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 19:21:42 +0000 (UTC)
Subject: rpms/tre/F-11 tre-tests.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 tre.spec, 1.12, 1.13
Message-ID: <20090822192142.3F20B11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tre/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21456

Modified Files:
	.cvsignore sources tre.spec 
Added Files:
	tre-tests.patch 
Log Message:
* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-1
- updated to 0.7.6
- license changed to BSD
- added missing defattr for python subpackage
- dropped conditionals for Fedora <10
- used alternative method for rpath removal
- fixed internal testsuite to run with just-built shared library
- dropped unnecessary build dependencies


tre-tests.patch:
 run-tests.sh |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE tre-tests.patch ---
diff -up tre-0.7.6/tests/agrep/run-tests.sh.tests tre-0.7.6/tests/agrep/run-tests.sh
--- tre-0.7.6/tests/agrep/run-tests.sh.tests	2009-03-11 10:44:44.000000000 +0100
+++ tre-0.7.6/tests/agrep/run-tests.sh	2009-08-22 20:20:15.885084058 +0200
@@ -2,6 +2,7 @@
 
 set -e
 
+export LD_LIBRARY_PATH=$top_builddir/lib/.libs
 agrep="$top_builddir/src/agrep"
 
 echo "$builddir $top_builddir $srcdir"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tre/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jan 2007 02:08:39 -0000	1.3
+++ .cvsignore	22 Aug 2009 19:21:41 -0000	1.4
@@ -1 +1 @@
-tre-0.7.5.tar.bz2
+tre-0.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tre/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jan 2007 02:07:02 -0000	1.3
+++ sources	22 Aug 2009 19:21:41 -0000	1.4
@@ -1 +1 @@
-e72e5c94008865cf720992a0b25d6e89  tre-0.7.5.tar.bz2
+ada884f6524093aa7d4961f0c97dfe01  tre-0.7.6.tar.bz2


Index: tre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tre/F-11/tre.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tre.spec	25 Feb 2009 21:49:32 -0000	1.12
+++ tre.spec	22 Aug 2009 19:21:41 -0000	1.13
@@ -1,17 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: tre
-Version: 0.7.5
-Release: 7%{?dist}
-License: LGPLv2+
+Version: 0.7.6
+Release: 1%{?dist}
+License: BSD
 Group: System Environment/Libraries
 Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
 Patch0: %{name}-chicken.patch
+# make internal tests of agrep work with just-built shared library
+Patch1: %{name}-tests.patch
 Summary: POSIX compatible regexp library with approximate matching
 URL: http://laurikari.net/tre/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext-devel
-BuildRequires: libtool
 BuildRequires: python-devel
 
 %description
@@ -57,13 +57,12 @@ regexps of any length, any number of err
 # hack to fix python bindings build
 ln -s lib tre
 %patch0 -p1 -b .chicken
+%patch1 -p1 -b .tests
 
 %build
-%{__libtoolize} --force
-%{__aclocal} -I m4 -I gnulib/m4
-%{__automake}
-%{__autoconf}
 %configure --disable-static --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 pushd python
 %{__python} setup.py build
@@ -79,6 +78,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %find_lang %{name}
 
 %check
+# revert rpath removal for building internal test programs
+sed -i 's|^runpath_var=DIE_RPATH_DIE|runpath_var=LD_RUN_PATH|g' libtool
 %{__make} check
 
 %clean
@@ -90,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING.LESSER INSTALL LICENSE NEWS README THANKS TODO
+%doc AUTHORS ChangeLog INSTALL LICENSE NEWS README THANKS TODO
 %doc doc/*.html doc/*.css
 %attr(755,root,root) %{_libdir}/libtre.so.*
 
@@ -101,10 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %files -n python-%{name}
+%defattr(644,root,root,755)
 %{python_sitearch}/tre.so
-%if 0%{?fedora} >= 9
 %{python_sitearch}/*.egg-info
-%endif
 
 %files -n agrep
 %defattr(644,root,root,755)
@@ -112,6 +112,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/agrep.1*
 
 %changelog
+* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-1
+- updated to 0.7.6
+- license changed to BSD
+- added missing defattr for python subpackage
+- dropped conditionals for Fedora <10
+- used alternative method for rpath removal
+- fixed internal testsuite to run with just-built shared library
+- dropped unnecessary build dependencies
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rathann at fedoraproject.org  Sat Aug 22 19:54:08 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 19:54:08 +0000 (UTC)
Subject: rpms/tre/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tre.spec, 1.10,
	1.11
Message-ID: <20090822195408.F080F11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tre/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27401

Modified Files:
	.cvsignore sources tre.spec 
Log Message:
* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-1
- updated to 0.7.6
- license changed to BSD
- added missing defattr for python subpackage
- dropped conditionals for Fedora <10
- used alternative method for rpath removal
- fixed internal testsuite to run with just-built shared library
- dropped unnecessary build dependencies



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tre/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Jan 2007 02:08:39 -0000	1.3
+++ .cvsignore	22 Aug 2009 19:54:07 -0000	1.4
@@ -1 +1 @@
-tre-0.7.5.tar.bz2
+tre-0.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tre/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jan 2007 02:07:02 -0000	1.3
+++ sources	22 Aug 2009 19:54:07 -0000	1.4
@@ -1 +1 @@
-e72e5c94008865cf720992a0b25d6e89  tre-0.7.5.tar.bz2
+ada884f6524093aa7d4961f0c97dfe01  tre-0.7.6.tar.bz2


Index: tre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tre/F-10/tre.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tre.spec	19 Feb 2008 20:53:40 -0000	1.10
+++ tre.spec	22 Aug 2009 19:54:07 -0000	1.11
@@ -1,17 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: tre
-Version: 0.7.5
-Release: 5%{?dist}
-License: LGPLv2+
+Version: 0.7.6
+Release: 1%{?dist}
+License: BSD
 Group: System Environment/Libraries
 Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
 Patch0: %{name}-chicken.patch
+# make internal tests of agrep work with just-built shared library
+Patch1: %{name}-tests.patch
 Summary: POSIX compatible regexp library with approximate matching
 URL: http://laurikari.net/tre/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext-devel
-BuildRequires: libtool
 BuildRequires: python-devel
 
 %description
@@ -57,13 +57,12 @@ regexps of any length, any number of err
 # hack to fix python bindings build
 ln -s lib tre
 %patch0 -p1 -b .chicken
+%patch1 -p1 -b .tests
 
 %build
-%{__libtoolize} --force
-%{__aclocal} -I m4 -I gnulib/m4
-%{__automake}
-%{__autoconf}
 %configure --disable-static --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 pushd python
 %{__python} setup.py build
@@ -79,6 +78,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %find_lang %{name}
 
 %check
+# revert rpath removal for building internal test programs
+sed -i 's|^runpath_var=DIE_RPATH_DIE|runpath_var=LD_RUN_PATH|g' libtool
 %{__make} check
 
 %clean
@@ -90,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING.LESSER INSTALL LICENSE NEWS README THANKS TODO
+%doc AUTHORS ChangeLog INSTALL LICENSE NEWS README THANKS TODO
 %doc doc/*.html doc/*.css
 %attr(755,root,root) %{_libdir}/libtre.so.*
 
@@ -101,10 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %files -n python-%{name}
+%defattr(644,root,root,755)
 %{python_sitearch}/tre.so
-%if 0%{?fedora} >= 9
 %{python_sitearch}/*.egg-info
-%endif
 
 %files -n agrep
 %defattr(644,root,root,755)
@@ -112,6 +112,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/agrep.1*
 
 %changelog
+* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-1
+- updated to 0.7.6
+- license changed to BSD
+- added missing defattr for python subpackage
+- dropped conditionals for Fedora <10
+- used alternative method for rpath removal
+- fixed internal testsuite to run with just-built shared library
+- dropped unnecessary build dependencies
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-5
 - Autorebuild for GCC 4.3
 



From rathann at fedoraproject.org  Sat Aug 22 19:55:17 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 22 Aug 2009 19:55:17 +0000 (UTC)
Subject: rpms/tre/F-10 tre-tests.patch,NONE,1.1
Message-ID: <20090822195517.233FA11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/tre/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27657

Added Files:
	tre-tests.patch 
Log Message:
* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-1
- updated to 0.7.6
- license changed to BSD
- added missing defattr for python subpackage
- dropped conditionals for Fedora <10
- used alternative method for rpath removal
- fixed internal testsuite to run with just-built shared library
- dropped unnecessary build dependencies


tre-tests.patch:
 run-tests.sh |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE tre-tests.patch ---
diff -up tre-0.7.6/tests/agrep/run-tests.sh.tests tre-0.7.6/tests/agrep/run-tests.sh
--- tre-0.7.6/tests/agrep/run-tests.sh.tests	2009-03-11 10:44:44.000000000 +0100
+++ tre-0.7.6/tests/agrep/run-tests.sh	2009-08-22 20:20:15.885084058 +0200
@@ -2,6 +2,7 @@
 
 set -e
 
+export LD_LIBRARY_PATH=$top_builddir/lib/.libs
 agrep="$top_builddir/src/agrep"
 
 echo "$builddir $top_builddir $srcdir"



From kalev at fedoraproject.org  Sat Aug 22 20:07:50 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sat, 22 Aug 2009 20:07:50 +0000 (UTC)
Subject: rpms/engine_pkcs11/devel engine_pkcs11.spec,1.8,1.9
Message-ID: <20090822200750.5C44F11C00A2@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/engine_pkcs11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30302

Modified Files:
	engine_pkcs11.spec 
Log Message:
Rebuilt with new libp11



Index: engine_pkcs11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/engine_pkcs11/devel/engine_pkcs11.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- engine_pkcs11.spec	21 Aug 2009 13:14:58 -0000	1.8
+++ engine_pkcs11.spec	22 Aug 2009 20:07:48 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           engine_pkcs11
 Version:        0.1.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A PKCS#11 engine for use with OpenSSL
 
 Group:          Development/Libraries
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Kalev Lember <kalev at smartlink.ee> - 0.1.4-7
+- Rebuilt with new libp11
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.4-6
 - rebuilt with new openssl
 



From pghmcfc at fedoraproject.org  Sat Aug 22 20:18:28 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sat, 22 Aug 2009 20:18:28 +0000 (UTC)
Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay-svn252.patch, NONE,
	1.1 perl-Net-SSLeay.spec, 1.16, 1.17
Message-ID: <20090822201828.04F0F11C00A2@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv944

Modified Files:
	perl-Net-SSLeay.spec 
Added Files:
	perl-Net-SSLeay-svn252.patch 
Log Message:
update to svn trunk (rev 252), needed due to omission of MD2 functionality
from OpenSSL 1.0.0 (CPAN RT#48916)


perl-Net-SSLeay-svn252.patch:
 Changes                 |   32 
 README.Win32            |   28 
 SSLeay.xs               |   70 +
 constants.c             |   12 
 lib/Net/SSLeay.pm       |  404 ++++----
 ppport.h                | 2327 +++++++++++++++++++++++++++++++++++++++---------
 t/local/00_ptr_cast.t   |   11 
 t/local/06_tcpecho.t    |    2 
 t/local/07_sslecho.t    |   18 
 t/local/50_digest.t     |    8 
 t/local/ptr_cast_test.c |    4 
 typemap                 |    2 
 12 files changed, 2315 insertions(+), 603 deletions(-)

--- NEW FILE perl-Net-SSLeay-svn252.patch ---
Index: typemap
===================================================================
--- typemap	(revision 230)
+++ typemap	(working copy)
@@ -13,8 +13,10 @@
 BIO *           T_IV
 BIO_METHOD *    T_IV
 EVP_PKEY *      T_IV
+const EVP_MD *  T_IV
 CERT *          T_IV
 LHASH *         T_IV
+struct lhash_st_SSL_SESSION *	T_IV
 struct cert_st * T_IV
 X509_STORE_CTX * T_IV
 ASN1_UTCTIME *   T_IV
Index: SSLeay.xs
===================================================================
--- SSLeay.xs	(revision 230)
+++ SSLeay.xs	(working copy)
@@ -89,18 +89,27 @@
  */
 #undef _
 
+/* Sigh: openssl 1.0 has
+ typedef void *BLOCK;
+which conflicts with perls
+ typedef struct block BLOCK;
+*/
+#define BLOCK OPENSSL_BLOCK
 #include <openssl/err.h>
 #include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include <openssl/buffer.h>
 #include <openssl/ssl.h>
 #include <openssl/comp.h>    /* openssl-0.9.6a forgets to include this */
+#ifndef OPENSSL_NO_MD2
 #include <openssl/md2.h>
+#endif
 #include <openssl/md4.h>
 #include <openssl/md5.h>     /* openssl-SNAP-20020227 does not automatically include this */
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/engine.h>
+#undef BLOCK
 
 /* Debugging output */
 
@@ -470,7 +479,7 @@
 	return res;
 }
 
-#ifdef SSL_F_SSL_SET_HELLO_EXTENSION
+#if defined(SSL_F_SSL_SET_HELLO_EXTENSION) || defined(SSL_F_SSL_SET_SESSION_TICKET_EXT)
 static HV* ssleay_session_secret_cbs = (HV*)NULL;
 
 ssleay_session_secret_cb_t*
@@ -1243,6 +1252,14 @@
      SSL_CTX *      ctx
      long	    op
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+
+struct lhash_st_SSL_SESSION *
+SSL_CTX_sessions(ctx)
+     SSL_CTX *          ctx
+
+#else
+
 LHASH *
 SSL_CTX_sessions(ctx)
      SSL_CTX *          ctx
@@ -1253,6 +1270,8 @@
      OUTPUT:
      RETVAL
 
+#endif
+
 unsigned long
 SSL_CTX_sess_number(ctx)
      SSL_CTX *          ctx
@@ -1499,9 +1518,6 @@
 		sv_setpvn( ST(0), buf, strlen(buf));
 	OPENSSL_free(buf); /* mem was allocated by openssl */
 
-# WTF is the point of this function?
-# The NID_* constants aren't bound anyway and no one can remember
-# those undocumented numbers anyway.
 void
 X509_NAME_get_text_by_NID(name,nid)
 	X509_NAME *    name
@@ -1515,7 +1531,7 @@
 
 	New(0, buf, length+1, char);
 	if (X509_NAME_get_text_by_NID(name, nid, buf, length + 1))
-		sv_setpvn( ST(0), buf, length + 1);
+		sv_setpvn( ST(0), buf, length);
 	Safefree(buf);
 
 X509 *
@@ -1729,6 +1745,9 @@
          sv_setpvn( ST(0), buffer, i );
      BIO_free(bp);
 
+
+#ifndef OPENSSL_NO_MD2
+
 void
 MD2(data)
 	PREINIT:
@@ -1745,6 +1764,8 @@
 		XSRETURN_UNDEF;
 	}
 
+#endif
+
 void
 MD4(data)
 	PREINIT:
@@ -1978,6 +1999,10 @@
 		SSL_CTX_set_cert_verify_callback(ctx, ssleay_ctx_cert_verify_cb_invoke, cb);
 	}
 
+X509_NAME_STACK *
+SSL_CTX_get_client_CA_list(ctx)
+	SSL_CTX *ctx
+
 void 
 SSL_CTX_set_client_CA_list(ctx,list)
      SSL_CTX *	ctx
@@ -2124,11 +2149,15 @@
 SSL_renegotiate(s)
      SSL *	s
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
+
 int	
 SSL_SESSION_cmp(a,b)
      SSL_SESSION *	a
      SSL_SESSION *	b
 
+#endif
+
 void *
 SSL_SESSION_get_ex_data(ss,idx)
      SSL_SESSION *	ss
@@ -2167,6 +2196,23 @@
 SSL_set_accept_state(s)
      SSL *	s
 
+void
+sk_X509_NAME_free(sk)
+	X509_NAME_STACK *sk
+
+int
+sk_X509_NAME_num(sk)
+	X509_NAME_STACK *sk
+
+X509_NAME *
+sk_X509_NAME_value(sk,i)
+	X509_NAME_STACK *sk
+	int i
+
+X509_NAME_STACK *
+SSL_get_client_CA_list(s)
+	SSL *	s
+
 void 
 SSL_set_client_CA_list(s,list)
      SSL *	s
@@ -2637,7 +2683,7 @@
 
 
 
-#ifdef SSL_F_SSL_SET_HELLO_EXTENSION
+#if defined(SSL_F_SSL_SET_HELLO_EXTENSION)
 int
 SSL_set_hello_extension(s, type, data)
      SSL *   s
@@ -2651,6 +2697,10 @@
      OUTPUT:
      RETVAL
 
+#endif
+
+#if defined(SSL_F_SSL_SET_HELLO_EXTENSION) || defined(SSL_F_SSL_SET_SESSION_TICKET_EXT)
+
 void 
 SSL_set_session_secret_cb(s,func,data=NULL)
 	SSL * s
@@ -2671,4 +2721,12 @@
 
 #endif
 
+int EVP_add_digest(const EVP_MD *digest)
+
+#ifndef OPENSSL_NO_SHA256
+const EVP_MD *EVP_sha256()
+
+#endif
[...4901 lines suppressed...]
 #ifndef IS_NUMBER_NAN
 #  define IS_NUMBER_NAN                  0x20
 #endif
-
-/* GROK_NUMERIC_RADIX depends on grok_numeric_radix */
 #ifndef GROK_NUMERIC_RADIX
 #  define GROK_NUMERIC_RADIX(sp, send)   grok_numeric_radix(sp, send)
 #endif
@@ -4407,7 +5798,7 @@
             return TRUE;
         }
     }
-#endif /* PERL_VERSION */
+#endif
 #endif /* USE_LOCALE_NUMERIC */
     /* always try "." if numeric radix didn't match because
      * we may have data from different locales mixed */
@@ -4420,8 +5811,6 @@
 #endif
 #endif
 
-/* grok_number depends on grok_numeric_radix */
-
 #ifndef grok_number
 #if defined(NEED_grok_number)
 static int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
@@ -4638,10 +6027,10 @@
 
 #ifndef grok_bin
 #if defined(NEED_grok_bin)
-static UV DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+static UV DPPP_(my_grok_bin)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
 static
 #else
-extern UV DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+extern UV DPPP_(my_grok_bin)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
 #endif
 
 #ifdef grok_bin
@@ -4652,7 +6041,7 @@
 
 #if defined(NEED_grok_bin) || defined(NEED_grok_bin_GLOBAL)
 UV
-DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
+DPPP_(my_grok_bin)(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result)
 {
     const char *s = start;
     STRLEN len = *len_p;
@@ -4740,10 +6129,10 @@
 
 #ifndef grok_hex
 #if defined(NEED_grok_hex)
-static UV DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+static UV DPPP_(my_grok_hex)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
 static
 #else
-extern UV DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+extern UV DPPP_(my_grok_hex)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
 #endif
 
 #ifdef grok_hex
@@ -4754,7 +6143,7 @@
 
 #if defined(NEED_grok_hex) || defined(NEED_grok_hex_GLOBAL)
 UV
-DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
+DPPP_(my_grok_hex)(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result)
 {
     const char *s = start;
     STRLEN len = *len_p;
@@ -4842,10 +6231,10 @@
 
 #ifndef grok_oct
 #if defined(NEED_grok_oct)
-static UV DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+static UV DPPP_(my_grok_oct)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
 static
 #else
-extern UV DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+extern UV DPPP_(my_grok_oct)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
 #endif
 
 #ifdef grok_oct
@@ -4856,7 +6245,7 @@
 
 #if defined(NEED_grok_oct) || defined(NEED_grok_oct_GLOBAL)
 UV
-DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
+DPPP_(my_grok_oct)(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result)
 {
     const char *s = start;
     STRLEN len = *len_p;
@@ -4933,6 +6322,40 @@
 #endif
 #endif
 
+#if !defined(my_snprintf)
+#if defined(NEED_my_snprintf)
+static int DPPP_(my_my_snprintf)(char * buffer, const Size_t len, const char * format, ...);
+static
+#else
+extern int DPPP_(my_my_snprintf)(char * buffer, const Size_t len, const char * format, ...);
+#endif
+
+#define my_snprintf DPPP_(my_my_snprintf)
+#define Perl_my_snprintf DPPP_(my_my_snprintf)
+
+#if defined(NEED_my_snprintf) || defined(NEED_my_snprintf_GLOBAL)
+
+int
+DPPP_(my_my_snprintf)(char *buffer, const Size_t len, const char *format, ...)
+{
+    dTHX;
+    int retval;
+    va_list ap;
+    va_start(ap, format);
+#ifdef HAS_VSNPRINTF
+    retval = vsnprintf(buffer, len, format, ap);
+#else
+    retval = vsprintf(buffer, format, ap);
+#endif
+    va_end(ap);
+    if (retval >= (int)len)
+	Perl_croak(aTHX_ "panic: my_snprintf buffer overflow");
+    return retval;
+}
+
+#endif
+#endif
+
 #ifdef NO_XSLOCKS
 #  ifdef dJMPENV
 #    define dXCPT             dJMPENV; int rEtV = 0
@@ -4949,6 +6372,66 @@
 #  endif
 #endif
 
+#if !defined(my_strlcat)
+#if defined(NEED_my_strlcat)
+static Size_t DPPP_(my_my_strlcat)(char * dst, const char * src, Size_t size);
+static
+#else
+extern Size_t DPPP_(my_my_strlcat)(char * dst, const char * src, Size_t size);
+#endif
+
+#define my_strlcat DPPP_(my_my_strlcat)
+#define Perl_my_strlcat DPPP_(my_my_strlcat)
+
+#if defined(NEED_my_strlcat) || defined(NEED_my_strlcat_GLOBAL)
+
+Size_t
+DPPP_(my_my_strlcat)(char *dst, const char *src, Size_t size)
+{
+    Size_t used, length, copy;
+
+    used = strlen(dst);
+    length = strlen(src);
+    if (size > 0 && used < size - 1) {
+        copy = (length >= size - used) ? size - used - 1 : length;
+        memcpy(dst + used, src, copy);
+        dst[used + copy] = '\0';
+    }
+    return used + length;
+}
+#endif
+#endif
+
+#if !defined(my_strlcpy)
+#if defined(NEED_my_strlcpy)
+static Size_t DPPP_(my_my_strlcpy)(char * dst, const char * src, Size_t size);
+static
+#else
+extern Size_t DPPP_(my_my_strlcpy)(char * dst, const char * src, Size_t size);
+#endif
+
+#define my_strlcpy DPPP_(my_my_strlcpy)
+#define Perl_my_strlcpy DPPP_(my_my_strlcpy)
+
+#if defined(NEED_my_strlcpy) || defined(NEED_my_strlcpy_GLOBAL)
+
+Size_t
+DPPP_(my_my_strlcpy)(char *dst, const char *src, Size_t size)
+{
+    Size_t length, copy;
+
+    length = strlen(src);
+    if (size > 0) {
+        copy = (length >= size) ? size - 1 : length;
+        memcpy(dst, src, copy);
+        dst[copy] = '\0';
+    }
+    return length;
+}
+
+#endif
+#endif
+
 #endif /* _P_P_PORTABILITY_H_ */
 
 /* End of File ppport.h */


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Net-SSLeay.spec	21 Aug 2009 15:22:21 -0000	1.16
+++ perl-Net-SSLeay.spec	22 Aug 2009 20:18:27 -0000	1.17
@@ -1,11 +1,12 @@
 Name:		perl-Net-SSLeay
 Version:	1.35
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Perl extension for using OpenSSL
 Group:		Development/Libraries
 License:	OpenSSL
 URL:		http://search.cpan.org/dist/Net-SSLeay/
 Source0:	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz
+Patch0:		perl-Net-SSLeay-svn252.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(ExtUtils::MakeMaker), openssl-devel
@@ -28,6 +29,10 @@ so you can write servers or clients for 
 
 %prep
 %setup -q -n Net-SSLeay-%{version}
+
+# Upstream patch removing MD2 support, needed for OpenSSL 1.0
+%patch0
+
 %{__chmod} -c 644 examples/*
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
 for f in Credits lib/Net/SSLeay.pm; do
@@ -66,11 +71,15 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile
 %{_mandir}/man3/Net::SSLeay*.3*
 
 %changelog
+* Sat Aug 22 2009 Paul Howarth <paul at city-fan.org> - 1.35-7
+- update to svn trunk (rev 252), needed due to omission of MD2 functionality
+  from OpenSSL 1.0.0 (CPAN RT#48916)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.35-6
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.35-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sun Mar  8 2009 Paul Howarth <paul at city-fan.org> - 1.35-4
 - filter out unwanted provides for perl shared objects



From tmraz at fedoraproject.org  Sat Aug 22 20:23:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 20:23:36 +0000 (UTC)
Subject: rpms/tqsllib/devel tqsllib-2.0-openssl.patch, 1.2, 1.3 tqsllib.spec,
	1.6, 1.7
Message-ID: <20090822202336.6E1FF11C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tqsllib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1962

Modified Files:
	tqsllib-2.0-openssl.patch tqsllib.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
- rebuilt with new openssl


tqsllib-2.0-openssl.patch:
 openssl_cert.cpp |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Index: tqsllib-2.0-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib-2.0-openssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tqsllib-2.0-openssl.patch	12 Jan 2009 13:05:08 -0000	1.2
+++ tqsllib-2.0-openssl.patch	22 Aug 2009 20:23:36 -0000	1.3
@@ -1,6 +1,7 @@
---- tqsllib-2.0/openssl_cert.cpp	2005-03-11 14:47:11.000000000 +0200
-+++ tqsllib-2.0-mod/openssl_cert.cpp	2009-01-12 14:58:00.000000000 +0200
-@@ -1178,7 +1178,7 @@
+diff -up tqsllib-2.0/openssl_cert.cpp.openssl tqsllib-2.0/openssl_cert.cpp
+--- tqsllib-2.0/openssl_cert.cpp.openssl	2005-03-11 13:47:11.000000000 +0100
++++ tqsllib-2.0/openssl_cert.cpp	2009-08-22 22:12:52.000000000 +0200
+@@ -1178,7 +1178,7 @@ tqsl_verifyDataBlock(tQSL_Cert cert, con
  	}
  	EVP_VerifyInit(&ctx, EVP_sha1());
  	EVP_VerifyUpdate(&ctx, data, datalen);
@@ -9,12 +10,38 @@
  		tQSL_Error = TQSL_OPENSSL_ERROR;
  		return 1;
  	}
-@@ -1288,7 +1288,7 @@
+@@ -1260,6 +1260,11 @@ tqsl_getCertificateRequestCountry(tQSL_C
+ 	return 0;
+ }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define asc2uni OPENSSL_asc2uni
++#define uni2asc OPENSSL_uni2asc
++#endif
++
+ static int
+ tqsl_add_bag_attribute(PKCS12_SAFEBAG *bag, const char *oidname, const string& value) {
+ 	int nid;
+@@ -1288,7 +1293,7 @@ tqsl_add_bag_attribute(PKCS12_SAFEBAG *b
  							sk_ASN1_TYPE_push(attrib->value.set, val);
  #if (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00906000
  							attrib->set = 1;
 -#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00907000
-+#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00908000
++#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) >= 0x00908000
  							attrib->single = 0;
  #else
  #error "Unexpected OpenSSL version; check X509_ATTRIBUTE struct compatibility"
+@@ -1479,8 +1484,13 @@ tqsl_exportPKCS12File(tQSL_Cert cert, co
+ 
+ 	/* Form into PKCS12 data */
+ 	p12 = PKCS12_init(NID_pkcs7_data);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	ASN1_seq_pack((STACK_OF(OPENSSL_BLOCK)*)safes, (int(*)(void*, unsigned char**))i2d_PKCS7, &(p12)->authsafes->d.data->data,
++		&(p12)->authsafes->d.data->length);
++#else
+ 	ASN1_seq_pack_PKCS7(safes, (int(*)())i2d_PKCS7, &(p12)->authsafes->d.data->data,
+ 		&(p12)->authsafes->d.data->length);
++#endif
+ 	sk_PKCS7_pop_free(safes, PKCS7_free);
+ 	safes = 0;
+ 	PKCS12_set_mac(p12, p12password, -1, 0, 0, PKCS12_DEFAULT_ITER, 0);


Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tqsllib.spec	21 Aug 2009 16:14:15 -0000	1.6
+++ tqsllib.spec	22 Aug 2009 20:23:36 -0000	1.7
@@ -31,7 +31,7 @@ as well as a static tqsllib library and 
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b openssl
+%patch0 -p1 -b .openssl
 
 %build
 #openssl, expat, zlib detection is broken on other archs
@@ -79,7 +79,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-8



From firewing at fedoraproject.org  Sat Aug 22 20:25:40 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Sat, 22 Aug 2009 20:25:40 +0000 (UTC)
Subject: rpms/fwbackups/F-11 .cvsignore, 1.13, 1.14 fwbackups.spec, 1.29,
	1.30 sources, 1.13, 1.14
Message-ID: <20090822202540.57AFA11C00A2@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2300

Modified Files:
	.cvsignore fwbackups.spec sources 
Log Message:
* Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
- Update to 1.43.3rc4 (fixes #518690)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Aug 2009 17:56:05 -0000	1.13
+++ .cvsignore	22 Aug 2009 20:25:39 -0000	1.14
@@ -1 +1 @@
-fwbackups-1.43.3rc3.tar.bz2
+fwbackups-1.43.3rc4.tar.bz2


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/fwbackups.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- fwbackups.spec	6 Aug 2009 17:56:05 -0000	1.29
+++ fwbackups.spec	22 Aug 2009 20:25:40 -0000	1.30
@@ -1,11 +1,13 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.5.rc3%{?dist}
+Release:           0.6.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
-Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc3.tar.bz2
+Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc4.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
@@ -31,7 +33,7 @@ or from the contents of an external fold
 
 
 %prep
-%setup -q -n %{name}-%{version}rc3
+%setup -q -n %{name}-%{version}rc4
 
 %build
 %configure
@@ -62,8 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/fedora-*.desktop
+%{python_sitelib}/%{name}/
 
 %changelog
+* Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
+- Update to 1.43.3rc4 (fixes #518690)
+
 * Thu Aug 6 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.5.rc3
 - Update to 1.43.3rc3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Aug 2009 17:56:05 -0000	1.13
+++ sources	22 Aug 2009 20:25:40 -0000	1.14
@@ -1 +1 @@
-765e2e972354ef4e7fe70e98ee1d7a11  fwbackups-1.43.3rc3.tar.bz2
+ed3e2f39b96ff3f51409358eb21ac863  fwbackups-1.43.3rc4.tar.bz2



From pkgdb at fedoraproject.org  Sat Aug 22 20:26:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:26:25 +0000
Subject: [pkgdb] glest ownership updated
Message-ID: <20090822202625.E630410F855@bastion2.fedora.phx.redhat.com>

Package glest in Fedora devel is now owned by bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:26:41 +0000
Subject: [pkgdb] glest: bruno has requested watchbugzilla
Message-ID: <20090822202642.2175C10F86F@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on glest (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:26:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:26:43 +0000
Subject: [pkgdb] glest: bruno has requested watchcommits
Message-ID: <20090822202643.7089010F886@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on glest (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:26:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:26:43 +0000
Subject: [pkgdb] glest: bruno has requested commit
Message-ID: <20090822202643.D848510F88C@bastion2.fedora.phx.redhat.com>

bruno has requested the commit acl on glest (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:26:56 +0000
Subject: [pkgdb] glest: bruno has requested approveacls
Message-ID: <20090822202656.9C92410F854@bastion2.fedora.phx.redhat.com>

bruno has requested the approveacls acl on glest (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:27:08 +0000
Subject: [pkgdb] glest: bruno has requested watchbugzilla
Message-ID: <20090822202708.1C95310F886@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on glest (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:27:09 +0000
Subject: [pkgdb] glest: bruno has requested watchcommits
Message-ID: <20090822202710.20FE310F89B@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on glest (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:27:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:27:10 +0000
Subject: [pkgdb] glest: bruno has requested commit
Message-ID: <20090822202710.DD33E10F888@bastion2.fedora.phx.redhat.com>

bruno has requested the commit acl on glest (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:27:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:27:13 +0000
Subject: [pkgdb] glest: bruno has requested approveacls
Message-ID: <20090822202713.7CE6810F854@bastion2.fedora.phx.redhat.com>

bruno has requested the approveacls acl on glest (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:37 +0000
Subject: [pkgdb] glest-data ownership updated
Message-ID: <20090822203337.C6B4310F84D@bastion2.fedora.phx.redhat.com>

Package glest-data in Fedora devel is now owned by bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:45 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203345.D5FB910F857@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on glest (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:46 +0000
Subject: [pkgdb] glest-data: bruno has requested watchcommits
Message-ID: <20090822203346.45A6810F888@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on glest-data (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:45 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203346.0682010F881@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on glest (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:47 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203347.6600010F898@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on glest (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:48 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203348.E597D10F89B@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on glest (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:50 +0000
Subject: [pkgdb] glest-data: bruno has requested commit
Message-ID: <20090822203349.F3F5810F89C@bastion2.fedora.phx.redhat.com>

bruno has requested the commit acl on glest-data (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:51 +0000
Subject: [pkgdb] glest ownership updated
Message-ID: <20090822203351.0C0E710F8A1@bastion2.fedora.phx.redhat.com>

Package glest in Fedora 11 is now owned by bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:51 +0000
Subject: [pkgdb] glest-data: bruno has requested approveacls
Message-ID: <20090822203351.304F710F8A5@bastion2.fedora.phx.redhat.com>

bruno has requested the approveacls acl on glest-data (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:52 +0000
Subject: [pkgdb] glest-data: bruno has requested watchbugzilla
Message-ID: <20090822203353.014C310F8A9@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on glest-data (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:54 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203354.4CA4A10F8AA@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on glest (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:54 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203354.7795510F8B2@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on glest (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:54 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203354.DC1F810F8B6@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on glest (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:56 +0000
Subject: [pkgdb] glest had acl change status
Message-ID: <20090822203356.2E68E10F8BA@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on glest (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:58 +0000
Subject: [pkgdb] glest-data: bruno has requested watchbugzilla
Message-ID: <20090822203358.771E810F8BE@bastion2.fedora.phx.redhat.com>

bruno has requested the watchbugzilla acl on glest-data (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:58 +0000
Subject: [pkgdb] glest ownership updated
Message-ID: <20090822203358.D872610F8C1@bastion2.fedora.phx.redhat.com>

Package glest in Fedora 10 is now owned by bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest



From pkgdb at fedoraproject.org  Sat Aug 22 20:33:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:33:59 +0000
Subject: [pkgdb] glest-data: bruno has requested watchcommits
Message-ID: <20090822203359.1FD0B10F8C4@bastion2.fedora.phx.redhat.com>

bruno has requested the watchcommits acl on glest-data (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:34:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:34:01 +0000
Subject: [pkgdb] glest-data: bruno has requested commit
Message-ID: <20090822203401.AD73910F855@bastion2.fedora.phx.redhat.com>

bruno has requested the commit acl on glest-data (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:34:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:34:03 +0000
Subject: [pkgdb] glest-data: bruno has requested approveacls
Message-ID: <20090822203403.D198010F8C6@bastion2.fedora.phx.redhat.com>

bruno has requested the approveacls acl on glest-data (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From firewing at fedoraproject.org  Sat Aug 22 20:36:25 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Sat, 22 Aug 2009 20:36:25 +0000 (UTC)
Subject: rpms/fwbackups/F-10 .cvsignore, 1.13, 1.14 fwbackups.spec, 1.29,
	1.30 sources, 1.13, 1.14
Message-ID: <20090822203625.694C011C00A2@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4050/F-10

Modified Files:
	.cvsignore fwbackups.spec sources 
Log Message:
* Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
- Update to 1.43.3rc4 (fixes #518690)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Aug 2009 17:56:05 -0000	1.13
+++ .cvsignore	22 Aug 2009 20:36:25 -0000	1.14
@@ -1 +1 @@
-fwbackups-1.43.3rc3.tar.bz2
+fwbackups-1.43.3rc4.tar.bz2


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/fwbackups.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- fwbackups.spec	6 Aug 2009 17:56:05 -0000	1.29
+++ fwbackups.spec	22 Aug 2009 20:36:25 -0000	1.30
@@ -1,11 +1,13 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.5.rc3%{?dist}
+Release:           0.6.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
-Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc3.tar.bz2
+Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc4.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
@@ -31,7 +33,7 @@ or from the contents of an external fold
 
 
 %prep
-%setup -q -n %{name}-%{version}rc3
+%setup -q -n %{name}-%{version}rc4
 
 %build
 %configure
@@ -62,8 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/fedora-*.desktop
+%{python_sitelib}/%{name}/
 
 %changelog
+* Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
+- Update to 1.43.3rc4 (fixes #518690)
+
 * Thu Aug 6 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.5.rc3
 - Update to 1.43.3rc3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Aug 2009 17:56:05 -0000	1.13
+++ sources	22 Aug 2009 20:36:25 -0000	1.14
@@ -1 +1 @@
-765e2e972354ef4e7fe70e98ee1d7a11  fwbackups-1.43.3rc3.tar.bz2
+ed3e2f39b96ff3f51409358eb21ac863  fwbackups-1.43.3rc4.tar.bz2



From firewing at fedoraproject.org  Sat Aug 22 20:36:25 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Sat, 22 Aug 2009 20:36:25 +0000 (UTC)
Subject: rpms/fwbackups/devel .cvsignore, 1.13, 1.14 fwbackups.spec, 1.32,
	1.33 sources, 1.13, 1.14
Message-ID: <20090822203625.A075011C00A2@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4050/devel

Modified Files:
	.cvsignore fwbackups.spec sources 
Log Message:
* Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
- Update to 1.43.3rc4 (fixes #518690)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Aug 2009 17:56:05 -0000	1.13
+++ .cvsignore	22 Aug 2009 20:36:25 -0000	1.14
@@ -1 +1 @@
-fwbackups-1.43.3rc3.tar.bz2
+fwbackups-1.43.3rc4.tar.bz2


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/fwbackups.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- fwbackups.spec	6 Aug 2009 17:56:05 -0000	1.32
+++ fwbackups.spec	22 Aug 2009 20:36:25 -0000	1.33
@@ -1,11 +1,13 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.6.rc3%{?dist}
+Release:           0.7.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
-Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc3.tar.bz2
+Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}rc4.tar.bz2
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
@@ -31,7 +33,7 @@ or from the contents of an external fold
 
 
 %prep
-%setup -q -n %{name}-%{version}rc3
+%setup -q -n %{name}-%{version}rc4
 
 %build
 %configure
@@ -62,8 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.*
 %{_datadir}/applications/fedora-*.desktop
+%{python_sitelib}/%{name}/
 
 %changelog
+* Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
+- Update to 1.43.3rc4 (fixes #518690)
+
 * Thu Aug 6 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc3
 - Update to 1.43.3rc3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Aug 2009 17:56:05 -0000	1.13
+++ sources	22 Aug 2009 20:36:25 -0000	1.14
@@ -1 +1 @@
-765e2e972354ef4e7fe70e98ee1d7a11  fwbackups-1.43.3rc3.tar.bz2
+ed3e2f39b96ff3f51409358eb21ac863  fwbackups-1.43.3rc4.tar.bz2



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:52 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203852.44E6010F854@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on glest-data (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:53 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203854.16CE010F85C@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on glest-data (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:55 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203855.3E0F210F88B@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on glest-data (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:54 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203854.777FE10F882@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on glest-data (Fedora 11) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:57 +0000
Subject: [pkgdb] glest-data ownership updated
Message-ID: <20090822203857.61DC110F897@bastion2.fedora.phx.redhat.com>

Package glest-data in Fedora 11 is now owned by bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:58 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203858.DB0CB10F89A@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on glest-data (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:39:00 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203900.514F710F8A2@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on glest-data (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:38:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:38:59 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203859.322BA10F89F@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on glest-data (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:39:01 +0000
Subject: [pkgdb] glest-data had acl change status
Message-ID: <20090822203901.70E0710F8A6@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on glest-data (Fedora 10) to Approved for bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From pkgdb at fedoraproject.org  Sat Aug 22 20:39:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 20:39:03 +0000
Subject: [pkgdb] glest-data ownership updated
Message-ID: <20090822203903.A191F10F8AA@bastion2.fedora.phx.redhat.com>

Package glest-data in Fedora 10 is now owned by bruno

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/glest-data



From tmraz at fedoraproject.org  Sat Aug 22 20:48:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 22 Aug 2009 20:48:19 +0000 (UTC)
Subject: rpms/gsoap/devel gsoap-2.7-openssl.patch, NONE, 1.1 gsoap.spec, 1.14,
	1.15
Message-ID: <20090822204819.D43A611C00A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6306

Modified Files:
	gsoap.spec 
Added Files:
	gsoap-2.7-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
- rebuilt with new openssl


gsoap-2.7-openssl.patch:
 stdsoap2.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gsoap-2.7-openssl.patch ---
diff -up gsoap-2.7/gsoap/stdsoap2.cpp.openssl gsoap-2.7/gsoap/stdsoap2.cpp
--- gsoap-2.7/gsoap/stdsoap2.cpp.openssl	2008-10-02 19:36:28.000000000 +0200
+++ gsoap-2.7/gsoap/stdsoap2.cpp	2009-08-22 22:20:49.000000000 +0200
@@ -4153,7 +4153,12 @@ again:
           { X509_EXTENSION *ext = X509_get_ext(peer, i);
             const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
             if (ext_str && !strcmp(ext_str, "subjectAltName"))
-            { X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+            {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+              const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+#else
+              X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+#endif
               void *ext_data;
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
               const unsigned char *data;


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gsoap.spec	21 Aug 2009 13:46:43 -0000	1.14
+++ gsoap.spec	22 Aug 2009 20:48:19 -0000	1.15
@@ -8,6 +8,7 @@ URL: http://gsoap2.sourceforge.net
 Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.12.tar.gz
 Patch0: use_libtool-2.7.12.patch
 Patch1: unused_args.patch
+Patch2: gsoap-2.7-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -48,6 +49,7 @@ gSOAP generated stubs
 
 %patch1 -p1
 
+%patch2 -p1
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 
@@ -249,7 +251,7 @@ make check
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.12-4



From kalev at fedoraproject.org  Sat Aug 22 20:58:52 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sat, 22 Aug 2009 20:58:52 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel .cvsignore, 1.2, 1.3 mingw32-libp11.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090822205852.927C411C00A2@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9002

Modified Files:
	.cvsignore mingw32-libp11.spec sources 
Log Message:
Update to 0.2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Apr 2009 08:25:16 -0000	1.2
+++ .cvsignore	22 Aug 2009 20:58:52 -0000	1.3
@@ -1 +1 @@
-libp11-0.2.4.tar.gz
+libp11-0.2.6.tar.gz


Index: mingw32-libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/mingw32-libp11.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-libp11.spec	25 Jul 2009 12:22:44 -0000	1.2
+++ mingw32-libp11.spec	22 Aug 2009 20:58:52 -0000	1.3
@@ -5,8 +5,8 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libp11
-Version:        0.2.4
-Release:        2%{?dist}
+Version:        0.2.6
+Release:        1%{?dist}
 Summary:        MingGW Windows libp11 library
 
 Group:          Development/Libraries
@@ -45,10 +45,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Remove documentation from a wrong place.
-# We install it with %doc instead.
+# We install it with %%doc instead.
 rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libp11
 
 
@@ -58,9 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc doc/README NEWS COPYING 
-%{_mingw32_bindir}/libp11-0.dll
-%{_mingw32_libdir}/libp11-0.dll.def
+%doc COPYING NEWS
+%{_mingw32_bindir}/libp11-1.dll
+%{_mingw32_libdir}/libp11-1.dll.def
 %{_mingw32_libdir}/libp11.dll.a
 %{_mingw32_libdir}/libp11.la
 %{_mingw32_libdir}/pkgconfig/*
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-1
+- Update to 0.2.6
+- Use INSTALL="install -p" to preserve timestamps
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Apr 2009 08:25:16 -0000	1.2
+++ sources	22 Aug 2009 20:58:52 -0000	1.3
@@ -1 +1 @@
-9e2c5cbececde245e2d2f535bd49ce35  libp11-0.2.4.tar.gz
+4ef3471cfabf787e50c7ae9456f7b09b  libp11-0.2.6.tar.gz



From kalev at fedoraproject.org  Sat Aug 22 21:00:19 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sat, 22 Aug 2009 21:00:19 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel import.log,1.1,NONE
Message-ID: <20090822210019.D7DB411C0347@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9285

Removed Files:
	import.log 
Log Message:
Remove import.log



--- import.log DELETED ---



From bruno at fedoraproject.org  Sat Aug 22 21:02:28 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 22 Aug 2009 21:02:28 +0000 (UTC)
Subject: rpms/glest/devel glest.spec,1.27,1.28
Message-ID: <20090822210228.4655211C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559

Modified Files:
	glest.spec 
Log Message:
Recent version changes in the spec included a patch name that shouldn't have
been changed.




Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- glest.spec	21 Aug 2009 19:46:55 -0000	1.27
+++ glest.spec	22 Aug 2009 21:02:28 -0000	1.28
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://glest.org
 Source0:        http://www.titusgames.de/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
-Patch0:         glest-3.2.2-gcc44.patch
+Patch0:         glest-3.2.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-soft-devel, xerces-c-devel



From gerd at fedoraproject.org  Sat Aug 22 21:09:21 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat, 22 Aug 2009 21:09:21 +0000 (UTC)
Subject: rpms/rakudo/devel rakudo.spec,1.7,1.8
Message-ID: <20090822210921.F0ED311C00A2@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10722

Modified Files:
	rakudo.spec 
Log Message:
add a patch to add a path to the @*INC array


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rakudo.spec	22 Aug 2009 01:06:25 -0000	1.7
+++ rakudo.spec	22 Aug 2009 21:09:21 -0000	1.8
@@ -9,13 +9,14 @@ ExcludeArch:ppc
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
 URL:            http://www.rakudo.org/
 
 Source0:        http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{year}-%{month}.tar.gz
+Patch0:         rakudo.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +39,8 @@ http://perl6-projects.org
 
 %prep
 %setup -q -n %{name}-%{year}-%{month}
-#%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
+%patch0 -p0
+%{__perl} -pi -e "s,'PATH_EXT','%{par_lang_perl6}/lib'," src/builtins/globals.pir
 exit 0
 
 %build
@@ -81,11 +83,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.08_1.5.0-1
+* Sat Aug 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.08_1.5.0-2
+- add a patch to add a path to the @*INC array
 - update to rakudo 2009-08 on parrot 1.5.0
 
 * Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
-- modified source to add a path to the @*INC array
 - force executable permission on shared objects so they get stripped
 
 * Thu Aug 6 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-2



From salimma at fedoraproject.org  Sat Aug 22 21:18:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 21:18:32 +0000 (UTC)
Subject: rpms/llvm/F-10 llvm.spec,1.11,1.12
Message-ID: <20090822211832.62D9A11C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12274/F-10

Modified Files:
	llvm.spec 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
- Only disable PIC on %ix86; ppc actually needs it



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-10/llvm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- llvm.spec	22 Aug 2009 18:30:05 -0000	1.11
+++ llvm.spec	22 Aug 2009 21:18:32 -0000	1.12
@@ -15,7 +15,7 @@
 
 Name:           llvm
 Version:        2.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -159,7 +159,7 @@ for developing applications that use %{n
   --enable-debug-runtime \
   --enable-jit \
   --enable-optimized \
-%ifarch x86_64
+%ifnarch %ix86
   --enable-pic
 %endif
 #   --enable-targets=host-only \
@@ -352,6 +352,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
+- Only disable PIC on %%ix86; ppc actually needs it
+
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
 - Disable use of position-independent code on 32-bit platforms
   (buggy in LLVM <= 2.5)



From salimma at fedoraproject.org  Sat Aug 22 21:18:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 21:18:32 +0000 (UTC)
Subject: rpms/llvm/F-11 llvm.spec,1.12,1.13
Message-ID: <20090822211832.7CB0511C00E4@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12274/F-11

Modified Files:
	llvm.spec 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
- Only disable PIC on %ix86; ppc actually needs it



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/F-11/llvm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- llvm.spec	22 Aug 2009 18:30:05 -0000	1.12
+++ llvm.spec	22 Aug 2009 21:18:32 -0000	1.13
@@ -15,7 +15,7 @@
 
 Name:           llvm
 Version:        2.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -159,7 +159,7 @@ for developing applications that use %{n
   --enable-debug-runtime \
   --enable-jit \
   --enable-optimized \
-%ifarch x86_64
+%ifnarch %ix86
   --enable-pic
 %endif
 #   --enable-targets=host-only \
@@ -352,6 +352,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
+- Only disable PIC on %%ix86; ppc actually needs it
+
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
 - Disable use of position-independent code on 32-bit platforms
   (buggy in LLVM <= 2.5)



From salimma at fedoraproject.org  Sat Aug 22 21:18:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 22 Aug 2009 21:18:32 +0000 (UTC)
Subject: rpms/llvm/devel llvm.spec,1.14,1.15
Message-ID: <20090822211832.A41FF11C00A2@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12274/devel

Modified Files:
	llvm.spec 
Log Message:
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
- Only disable PIC on %ix86; ppc actually needs it



Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- llvm.spec	22 Aug 2009 16:52:17 -0000	1.14
+++ llvm.spec	22 Aug 2009 21:18:32 -0000	1.15
@@ -15,7 +15,7 @@
 
 Name:           llvm
 Version:        2.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -159,7 +159,7 @@ for developing applications that use %{n
   --enable-debug-runtime \
   --enable-jit \
   --enable-optimized \
-%ifarch x86_64
+%ifnarch %ix86
   --enable-pic
 %endif
 #   --enable-targets=host-only \
@@ -352,6 +352,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
+- Only disable PIC on %%ix86; ppc actually needs it
+
 * Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-4
 - Disable use of position-independent code on 32-bit platforms
   (buggy in LLVM <= 2.5)



From gerd at fedoraproject.org  Sat Aug 22 21:20:51 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sat, 22 Aug 2009 21:20:51 +0000 (UTC)
Subject: rpms/rakudo/devel rakudo.patch,NONE,1.1
Message-ID: <20090822212051.E303111C00A2@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13453

Added Files:
	rakudo.patch 
Log Message:
patch file added

rakudo.patch:
 globals.pir |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE rakudo.patch ---
--- src/builtins/globals.pir	2009-08-18 20:49:15.000000000 +0200
+++ src/builtins/globals.pir.new	2009-08-22 22:37:11.000000000 +0200
@@ -28,6 +28,7 @@
     $S0 = env['PERL6LIB']
     $P0 = split ':', $S0
     push $P0, '.'
+    push $P0, 'PATH_EXT'
     $P0 = 'list'($P0)
     $P0 = $P0.'Array'()
     set_hll_global '@INC', $P0



From karlik at fedoraproject.org  Sat Aug 22 21:39:22 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Sat, 22 Aug 2009 21:39:22 +0000 (UTC)
Subject: rpms/warzone2100/devel warzone2100.spec,1.28,1.29
Message-ID: <20090822213922.A2ADB11C00A2@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445

Modified Files:
	warzone2100.spec 
Log Message:
Rebuilt


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/warzone2100.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- warzone2100.spec	11 Aug 2009 19:58:03 -0000	1.28
+++ warzone2100.spec	22 Aug 2009 21:39:22 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           warzone2100
 Version:        2.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 Group:          Amusements/Games
@@ -10,7 +10,7 @@ Source0:        http://download.gna.org/
 Source1:        http://guide.wz2100.net/files/sequences.wz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
+BuildRequires: physfs-devel SDL_net-devel openal-soft-devel bison flex zip
 BuildRequires: libpng-devel libogg-devel libvorbis-devel
 BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel
 BuildRequires: automake >= 1.8
@@ -67,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/sequences.wz
 
 %changelog
+* Sat Aug 22 2009 Karol Trzcionka <karlikt at gmail.com> - 2.2.1-3
+- Rebuilt with new physfs
+- Rebuilt with openal-soft-devel instead of openal-devel
+
 * Tue Aug 11 2009 Karol Trzcionka <karlikt at gmail.com> - 2.2.1-2
 - Fix BuildRequires
 



From pkgdb at fedoraproject.org  Sat Aug 22 22:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:23:11 +0000
Subject: [pkgdb] mkinitrd: katzj has given up watchbugzilla
Message-ID: <20090822222311.6B66610F85C@bastion2.fedora.phx.redhat.com>

katzj has given up the watchbugzilla acl on mkinitrd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Sat Aug 22 22:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:23:15 +0000
Subject: [pkgdb] mkinitrd: katzj has given up watchbugzilla
Message-ID: <20090822222315.50AA510F889@bastion2.fedora.phx.redhat.com>

katzj has given up the watchbugzilla acl on mkinitrd (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Sat Aug 22 22:23:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:23:17 +0000
Subject: [pkgdb] mkinitrd: katzj has given up watchbugzilla
Message-ID: <20090822222317.150B610F895@bastion2.fedora.phx.redhat.com>

katzj has given up the watchbugzilla acl on mkinitrd (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mkinitrd



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:08 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222408.913BE10F857@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on booty (Fedora devel) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:12 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222412.5516810F889@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on booty (Fedora devel) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:15 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222415.399E410F89F@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on booty (Fedora 7) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:16 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222416.8D8AC10F8A5@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on booty (Fedora 7) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:18 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222418.E54F410F8A8@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on booty (Fedora 8) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:20 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222420.BF79D10F8AF@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on booty (Fedora 8) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:22 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222422.2EBC110F8B7@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on booty (Fedora 9) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:24 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222424.E6E5E10F8BD@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on booty (Fedora 9) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:27 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222427.7B18110F8C1@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on booty (Fedora 10) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:30 +0000
Subject: [pkgdb] booty had acl change status
Message-ID: <20090822222430.A9DF710F886@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on booty (Fedora 10) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/booty



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:40 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20090822222440.3B90810F889@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora devel) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:41 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20090822222441.7F31610F890@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on python (Fedora devel) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:48 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20090822222448.72EF510F8D0@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora 10) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:50 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20090822222450.B69A710F8D2@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on python (Fedora 10) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:54 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20090822222454.A01BD10F898@bastion2.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python (Fedora 11) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sat Aug 22 22:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 22:24:56 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20090822222455.F1D0410F8D4@bastion2.fedora.phx.redhat.com>

katzj has set the watchcommits acl on python (Fedora 11) to Obsolete for katzj

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python



From bruno at fedoraproject.org  Sat Aug 22 22:37:53 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 22 Aug 2009 22:37:53 +0000 (UTC)
Subject: rpms/glest/devel glest.spec,1.28,1.29
Message-ID: <20090822223753.6766011C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27201

Modified Files:
	glest.spec 
Log Message:
Simplified %patch usage.




Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- glest.spec	22 Aug 2009 21:02:28 -0000	1.28
+++ glest.spec	22 Aug 2009 22:37:50 -0000	1.29
@@ -36,7 +36,7 @@ exist in the environment and can be cont
 
 %prep
 %setup -q -n %{name}-source-%{version}
-%patch0 -p0 -b .gcc44
+%patch0
 find . -type f | xargs sed -i -e "s/\r//g" 
 #recode ISO-8859-1..UTF-8 README
 



From mbooth at fedoraproject.org  Sat Aug 22 22:45:40 2009
From: mbooth at fedoraproject.org (mbooth)
Date: Sat, 22 Aug 2009 22:45:40 +0000 (UTC)
Subject: rpms/eclipse-dltk/devel eclipse-dltk.spec,1.6,1.7
Message-ID: <20090822224540.3704A11C00A2@cvs1.fedora.phx.redhat.com>

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28365/eclipse-dltk/devel

Modified Files:
	eclipse-dltk.spec 
Log Message:
* Mon Aug 20 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-3
- Add a SDK package.
- Require Mylyn >= 3.2.


Index: eclipse-dltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/eclipse-dltk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-dltk.spec	10 Aug 2009 05:56:45 -0000	1.6
+++ eclipse-dltk.spec	22 Aug 2009 22:45:39 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dltk
 Version:   1.0.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -23,7 +23,7 @@ BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:3.5.0
 BuildRequires:    eclipse-emf >= 2.5.0
-BuildRequires:    eclipse-mylyn
+BuildRequires:    eclipse-mylyn >= 3.2
 BuildRequires:    eclipse-rse
 Requires:         java
 Requires:         jpackage-utils
@@ -74,7 +74,7 @@ XOTCL extension for the TCL Eclipse plug
 Summary:   Mylyn integration for Eclipse DLTK projects
 Group:     Development/Tools
 Requires:  %{name} = %{version}-%{release}
-Requires:  eclipse-mylyn
+Requires:  eclipse-mylyn >= 3.2
 
 %description mylyn
 Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit
@@ -89,6 +89,22 @@ Requires:  eclipse-rse
 %description rse
 Remote Development Support via RSE for DLTK based IDEs.
 
+%package   sdk
+Summary:   Eclipse DLTK SDK
+Group:     System Environment/Libraries
+Requires:  java-javadoc
+Requires:  eclipse-pde >= 1:3.5.0
+Requires:  %{name}       = %{version}-%{release}
+Requires:  %{name}-ruby  = %{version}-%{release}
+Requires:  %{name}-tcl   = %{version}-%{release}
+Requires:  %{name}-itcl  = %{version}-%{release}
+Requires:  %{name}-xotcl = %{version}-%{release}
+Requires:  %{name}-mylyn = %{version}-%{release}
+Requires:  %{name}-rse   = %{version}-%{release}
+
+%description sdk
+Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK).
+
 # TODO: Python IDE, Javascript IDE
 
 %prep
@@ -107,32 +123,54 @@ if [ ! -z "$JARS" ]; then
 fi
 
 %build
+# Note: Use date from the cvs tag as the context qualifier.
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v20090617"
+
 # build all features
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.core \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.ruby \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.tcl \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.itcl \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.xotcl \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "mylyn"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.rse \
-  -d "rse"
+  -a "$OPTIONS" -d "rse"
+
+# build all sdk features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.core.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.ruby.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.tcl.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.itcl.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.xotcl.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn.sdk \
+  -a "$OPTIONS" -d "mylyn"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.rse.sdk \
+  -a "$OPTIONS" -d "rse"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-core  build/rpmBuild/org.eclipse.dltk.core.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-ruby  build/rpmBuild/org.eclipse.dltk.ruby.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-tcl   build/rpmBuild/org.eclipse.dltk.tcl.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-itcl  build/rpmBuild/org.eclipse.dltk.itcl.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-xotcl build/rpmBuild/org.eclipse.dltk.xotcl.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-mylyn build/rpmBuild/org.eclipse.dltk.mylyn.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-rse   build/rpmBuild/org.eclipse.dltk.rse.zip
+
+SUBPACKAGES="core ruby tcl itcl xotcl mylyn rse"
+for s in $SUBPACKAGES ; do
+  unzip -q -n -d %{buildroot}%{eclipse_dropin}/dltk-$s  build/rpmBuild/org.eclipse.dltk.$s.zip
+  unzip -q -n -d %{buildroot}%{eclipse_dropin}/dltk-sdk build/rpmBuild/org.eclipse.dltk.$s.sdk.zip
+
+  # the non-sdk builds are a subset of the sdk builds, so delete duplicate features & plugins from the sdks
+  (cd %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/features | xargs rm -rf)
+  (cd %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins && ls %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/plugins | xargs rm -rf)
+done
 
 %clean
 rm -rf %{buildroot}
@@ -172,7 +210,16 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/dltk-rse
 %doc org.eclipse.dltk.rse-feature/rootfiles/*
 
+%files sdk
+%defattr(-,root,root,-)
+%{eclipse_dropin}/dltk-sdk
+%doc org.eclipse.dltk.core.sdk/rootfiles/*
+
 %changelog
+* Mon Aug 20 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-3
+- Add a SDK package.
+- Require Mylyn >= 3.2.
+
 * Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.0-2
 - Add RSE plugin.
 



From mclasen at fedoraproject.org  Sat Aug 22 22:53:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 22 Aug 2009 22:53:36 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel memmapsdialog.patch, NONE,
	1.1 gnome-system-monitor.spec, 1.146, 1.147
Message-ID: <20090822225336.2289011C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30584

Modified Files:
	gnome-system-monitor.spec 
Added Files:
	memmapsdialog.patch 
Log Message:
cosmetic fixes


memmapsdialog.patch:
 memmaps.cpp |   39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

--- NEW FILE memmapsdialog.patch ---
--- gnome-system-monitor-2.27.4/src/memmaps.cpp	2009-07-11 08:50:19.000000000 -0400
+++ hacked/src/memmaps.cpp	2009-08-22 18:42:09.037680410 -0400
@@ -452,18 +452,17 @@
 	g_free (memmaps);
 }
 
-
-
-static gboolean window_delete_event(GtkWidget *, GdkEvent *, gpointer data)
+static void
+dialog_response (GtkDialog *dialog, gint response_id, gpointer data)
 {
 	MemMapsData * const mmdata = static_cast<MemMapsData*>(data);
 
 	g_source_remove (mmdata->timer);
 
 	delete mmdata;
-	return FALSE;
-}
 
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+}
 
 static MemMapsData*
 create_memmapsdata (ProcData *procdata)
@@ -601,27 +600,17 @@
 	mmdata = create_memmapsdata (procdata);
 	mmdata->info = info;
 
-	memmapsdialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_transient_for(GTK_WINDOW(memmapsdialog), GTK_WINDOW(procdata->app));
-	gtk_window_set_destroy_with_parent(GTK_WINDOW(memmapsdialog), TRUE);
-	// gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-	gtk_window_set_title(GTK_WINDOW(memmapsdialog), _("Memory Maps"));
+	memmapsdialog = gtk_dialog_new_with_buttons (_("Memory Maps"), GTK_WINDOW (procdata->app),
+                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                                     NULL);
 	gtk_window_set_resizable(GTK_WINDOW(memmapsdialog), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(memmapsdialog), 575, 400);
-	// gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-	gtk_container_set_border_width(GTK_CONTAINER(memmapsdialog), 12);
+	gtk_dialog_set_has_separator(GTK_DIALOG(memmapsdialog), FALSE);
+	gtk_container_set_border_width(GTK_CONTAINER(memmapsdialog), 5);
 
-	GtkWidget *mainbox = gtk_vbox_new(FALSE, 12);
-	gtk_container_add(GTK_CONTAINER(memmapsdialog), mainbox);
-
-	vbox = mainbox;
-	gtk_box_set_spacing (GTK_BOX (vbox), 2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-	dialog_vbox = gtk_vbox_new (FALSE, 6);
+	dialog_vbox = GTK_DIALOG (memmapsdialog)->vbox;
 	gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
-	gtk_box_pack_start (GTK_BOX (vbox), dialog_vbox, TRUE, TRUE, 0);
-
 
 	label = procman_make_label_for_mmaps_or_ofiles (
 		_("_Memory maps for process \"%s\" (PID %u):"),
@@ -643,10 +632,10 @@
 
 	gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolled, TRUE, TRUE, 0);
 
-	gtk_widget_show_all (memmapsdialog);
+        g_signal_connect (G_OBJECT (memmapsdialog), "response",
+			 G_CALLBACK(dialog_response), mmdata);
 
-	g_signal_connect(G_OBJECT(memmapsdialog), "delete-event",
-			 G_CALLBACK(window_delete_event), mmdata);
+	gtk_widget_show_all (memmapsdialog);
 
 	mmdata->timer = g_timeout_add_seconds (5, memmaps_timer, mmdata);
 


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- gnome-system-monitor.spec	25 Jul 2009 00:48:14 -0000	1.146
+++ gnome-system-monitor.spec	22 Aug 2009 22:53:35 -0000	1.147
@@ -12,7 +12,7 @@
 Summary: Process and resource monitor
 Name: gnome-system-monitor
 Version: 2.27.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -49,6 +49,12 @@ Patch1: session.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=495730
 Patch2: polkit1.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592747
+Patch3: buttons.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=592758
+Patch4: memmapsdialog.patch
+
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -65,6 +71,8 @@ such as CPU and memory.
 %patch0 -p1 -b .polkit
 %patch1 -p1 -b .session
 %patch2 -p1 -b .polkit1
+%patch3 -p1 -b .buttons
+%patch4 -p1 -b .memmapsdialog
 
 autoreconf -i -f
 
@@ -147,6 +155,10 @@ scrollkeeper-update -q
 
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-3
+- Fix a button image
+- Add a close button to the memmaps dialog
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bruno at fedoraproject.org  Sat Aug 22 23:00:29 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 22 Aug 2009 23:00:29 +0000 (UTC)
Subject: rpms/glest/devel glest.spec,1.29,1.30
Message-ID: <20090822230029.EC92E11C0347@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31654

Modified Files:
	glest.spec 
Log Message:
It looks like the gcc44 patch is upstream now.




Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- glest.spec	22 Aug 2009 22:37:50 -0000	1.29
+++ glest.spec	22 Aug 2009 23:00:29 -0000	1.30
@@ -8,7 +8,6 @@ License:        GPLv2+
 URL:            http://glest.org
 Source0:        http://www.titusgames.de/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
-Patch0:         glest-3.2.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-soft-devel, xerces-c-devel
@@ -36,7 +35,6 @@ exist in the environment and can be cont
 
 %prep
 %setup -q -n %{name}-source-%{version}
-%patch0
 find . -type f | xargs sed -i -e "s/\r//g" 
 #recode ISO-8859-1..UTF-8 README
 



From pkgdb at fedoraproject.org  Sat Aug 22 23:08:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 23:08:03 +0000
Subject: [pkgdb] pyPdf had acl change status
Message-ID: <20090822230803.7B3CA10F854@bastion2.fedora.phx.redhat.com>

fschwarz has set the watchbugzilla acl on pyPdf (Fedora devel) to Approved for kylev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 23:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 23:08:04 +0000
Subject: [pkgdb] pyPdf had acl change status
Message-ID: <20090822230804.87D8710F86F@bastion2.fedora.phx.redhat.com>

fschwarz has set the watchcommits acl on pyPdf (Fedora devel) to Approved for kylev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 23:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 23:08:05 +0000
Subject: [pkgdb] pyPdf had acl change status
Message-ID: <20090822230805.743DE10F889@bastion2.fedora.phx.redhat.com>

fschwarz has set the commit acl on pyPdf (Fedora devel) to Approved for kylev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 23:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 23:08:10 +0000
Subject: [pkgdb] pyPdf had acl change status
Message-ID: <20090822230811.05E2D10F890@bastion2.fedora.phx.redhat.com>

fschwarz has set the watchbugzilla acl on pyPdf (Fedora 11) to Approved for kylev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 23:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 23:08:11 +0000
Subject: [pkgdb] pyPdf had acl change status
Message-ID: <20090822230811.4F98410F898@bastion2.fedora.phx.redhat.com>

fschwarz has set the watchcommits acl on pyPdf (Fedora 11) to Approved for kylev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From pkgdb at fedoraproject.org  Sat Aug 22 23:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 22 Aug 2009 23:08:12 +0000
Subject: [pkgdb] pyPdf had acl change status
Message-ID: <20090822230812.A04CD10F89B@bastion2.fedora.phx.redhat.com>

fschwarz has set the commit acl on pyPdf (Fedora 11) to Approved for kylev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyPdf



From mclasen at fedoraproject.org  Sat Aug 22 23:10:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 22 Aug 2009 23:10:06 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel buttons.patch,NONE,1.1
Message-ID: <20090822231006.4B7AE11C0439@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv702

Added Files:
	buttons.patch 
Log Message:
forgotten patch


buttons.patch:
 procdialogs.cpp |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

--- NEW FILE buttons.patch ---
diff -up gnome-system-monitor-2.27.4/src/procdialogs.cpp.buttons gnome-system-monitor-2.27.4/src/procdialogs.cpp
--- gnome-system-monitor-2.27.4/src/procdialogs.cpp.buttons	2009-08-22 16:50:30.072430091 -0400
+++ gnome-system-monitor-2.27.4/src/procdialogs.cpp	2009-08-22 16:52:41.435680298 -0400
@@ -190,27 +190,16 @@ procdialog_create_renice_dialog (ProcDat
 	gtk_dialog_set_has_separator (GTK_DIALOG (renice_dialog), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (renice_dialog), 5);
 
-	button = gtk_button_new ();
+	button = gtk_button_new_with_mnemonic (_("Change _Priority"));
 	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-		
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-	gtk_container_add (GTK_CONTAINER (button), align);
-		
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (align), hbox);
-
 	icon = gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON);
-	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
-
-	label = gtk_label_new_with_mnemonic (_("Change _Priority"));
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtk_button_set_image (GTK_BUTTON (button), icon);
 
 	gtk_dialog_add_action_widget (GTK_DIALOG (renice_dialog), button, 100);
 
   	gtk_dialog_set_default_response (GTK_DIALOG (renice_dialog), 100);
   	new_nice_value = -100;
-  	  
+
     	dialog_vbox = GTK_DIALOG (dialog)->vbox;
 	gtk_box_set_spacing (GTK_BOX (dialog_vbox), 2);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);



From mclasen at fedoraproject.org  Sun Aug 23 00:12:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 23 Aug 2009 00:12:04 +0000 (UTC)
Subject: rpms/totem/devel button-images.patch, NONE, 1.1 totem.spec, 1.250,
	1.251
Message-ID: <20090823001205.0C55011C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11302

Modified Files:
	totem.spec 
Added Files:
	button-images.patch 
Log Message:
Respect button-images setting better


button-images.patch:
 plugins.ui |   71 ++++++-------------------------------------------------------
 1 file changed, 7 insertions(+), 64 deletions(-)

--- NEW FILE button-images.patch ---
--- totem-2.27.2/data/plugins.ui	2009-04-17 08:56:43.000000000 -0400
+++ hacked/data/plugins.ui	2009-08-22 20:03:01.281431488 -0400
@@ -3,6 +3,10 @@
   SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
 <interface>
 
+<object class="GtkImage" id="configure_button_image">
+  <property name="stock">gtk-preferences</property>
+  <property name="icon_size">4</property>
+</object>
 <object class="GtkVBox" id="plugins_vbox">
   <property name="visible">True</property>
   <property name="homogeneous">False</property>
@@ -378,71 +382,10 @@
     	      <property name="can_focus">True</property>
     	      <property name="relief">GTK_RELIEF_NORMAL</property>
     	      <property name="focus_on_click">True</property>
+    	      <property name="image">configure_button_image</property>
+              <property name="label" translatable="yes">C_onfigure...</property>
+              <property name="use_underline">True</property>
     	      <signal name="clicked" handler="configure_button_cb"/>
-
-    	      <child>
-    		<object class="GtkAlignment" id="alignment1">
-    		  <property name="visible">True</property>
-    		  <property name="xalign">0.5</property>
-    		  <property name="yalign">0.5</property>
-    		  <property name="xscale">0</property>
-    		  <property name="yscale">0</property>
-    		  <property name="top_padding">0</property>
-    		  <property name="bottom_padding">0</property>
-    		  <property name="left_padding">0</property>
-    		  <property name="right_padding">0</property>
-
-    		  <child>
-    		    <object class="GtkHBox" id="hbox2">
-    		      <property name="visible">True</property>
-    		      <property name="homogeneous">False</property>
-    		      <property name="spacing">2</property>
-
-    		      <child>
-    			<object class="GtkImage" id="image1">
-    			  <property name="visible">True</property>
-    			  <property name="stock">gtk-preferences</property>
-    			  <property name="icon_size">4</property>
-    			  <property name="xalign">0.5</property>
-    			  <property name="yalign">0.5</property>
-    			  <property name="xpad">0</property>
-    			  <property name="ypad">0</property>
-    			</object>
-    			<packing>
-    			  <property name="padding">0</property>
-    			  <property name="expand">False</property>
-    			  <property name="fill">False</property>
-    			</packing>
-    		      </child>
-
-    		      <child>
-    			<object class="GtkLabel" id="label2">
-    			  <property name="visible">True</property>
-    			  <property name="label" translatable="yes">C_onfigure...</property>
-    			  <property name="use_underline">True</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>
-    			</object>
-    			<packing>
-    			  <property name="padding">0</property>
-    			  <property name="expand">False</property>
-    			  <property name="fill">False</property>
-    			</packing>
-    		      </child>
-    		    </object>
-    		  </child>
-    		</object>
-    	      </child>
     	    </object>
     	    <packing>
     	      <property name="padding">0</property>


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- totem.spec	21 Aug 2009 16:13:05 -0000	1.250
+++ totem.spec	23 Aug 2009 00:12:03 -0000	1.251
@@ -6,13 +6,16 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.27/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592760
+Patch0: button-images.patch
+
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 Requires(post): GConf2 >= 2.14
@@ -181,6 +184,7 @@ audio and video files in the properties 
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-images
 
 %build
 
@@ -193,7 +197,8 @@ export MOZILLA_PLUGINDIR=%{_libdir}/mozi
   --enable-mozilla \
   --enable-nautilus \
   --disable-scrollkeeper \
-  --disable-nvtv
+  --disable-nvtv \
+  --disable-vala
 
 make %{?_smp_mflags}
 
@@ -376,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-6
+- Respect the button-images setting better
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-5
 - rebuilt with new openssl
 



From mclasen at fedoraproject.org  Sun Aug 23 00:45:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 23 Aug 2009 00:45:39 +0000 (UTC)
Subject: rpms/rhythmbox/devel button-images.patch, NONE, 1.1 rhythmbox.spec, 
	1.257, 1.258
Message-ID: <20090823004539.F220C11C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16594

Modified Files:
	rhythmbox.spec 
Added Files:
	button-images.patch 
Log Message:
Respect button-images better


button-images.patch:
 plugins.ui |   43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

--- NEW FILE button-images.patch ---
diff -up rhythmbox-0.12.3/data/ui/plugins.ui.button-images rhythmbox-0.12.3/data/ui/plugins.ui
--- rhythmbox-0.12.3/data/ui/plugins.ui.button-images	2009-08-22 20:35:33.773436149 -0400
+++ rhythmbox-0.12.3/data/ui/plugins.ui	2009-08-22 20:38:07.670430227 -0400
@@ -2,6 +2,10 @@
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="configure_button_image">
+    <property name="stock">gtk-preferences</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkHBox" id="edit_plugins">
     <property name="visible">True</property>
     <property name="border_width">6</property>
@@ -237,42 +241,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-preferences</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_onfigure...</property>
-                            <property name="use_underline">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>
+                <property name="image">configure_button_image</property>
+                <property name="label" translatable="yes">C_onfigure...</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- rhythmbox.spec	20 Aug 2009 03:15:46 -0000	1.257
+++ rhythmbox.spec	23 Aug 2009 00:45:38 -0000	1.258
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -50,6 +50,8 @@ ExcludeArch:    s390 s390x
 Patch0: 0001-Fix-audio-CD-activation.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592404
 Patch1: spinner.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592763
+Patch2: button-images.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -84,6 +86,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 %patch0 -p1 -b .audiocd
 %patch1 -p1 -b .spinner
+%patch2 -p1 -b .button-images
 
 # 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/' '{}' ';'
@@ -221,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-5
+- Respect the button-images setting better
+
 * Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-4
 - Use the right spinner icon
 



From mclasen at fedoraproject.org  Sun Aug 23 00:52:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 23 Aug 2009 00:52:52 +0000 (UTC)
Subject: rpms/rhythmbox/devel button-images.patch,1.1,1.2
Message-ID: <20090823005252.198CF11C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17205

Modified Files:
	button-images.patch 
Log Message:
button-images fixes


button-images.patch:
 library-prefs.ui |   43 +++++++------------------------------------
 plugins.ui       |   43 +++++++------------------------------------
 2 files changed, 14 insertions(+), 72 deletions(-)

Index: button-images.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/button-images.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- button-images.patch	23 Aug 2009 00:45:38 -0000	1.1
+++ button-images.patch	23 Aug 2009 00:52:51 -0000	1.2
@@ -1,3 +1,63 @@
+diff -up rhythmbox-0.12.3/data/ui/library-prefs.ui.button-images rhythmbox-0.12.3/data/ui/library-prefs.ui
+--- rhythmbox-0.12.3/data/ui/library-prefs.ui.button-images	2009-08-22 20:47:48.703681374 -0400
++++ rhythmbox-0.12.3/data/ui/library-prefs.ui	2009-08-22 20:47:30.172680891 -0400
+@@ -2,6 +2,10 @@
+ <interface>
+   <!-- interface-requires gtk+ 2.12 -->
+   <!-- interface-naming-policy toplevel-contextual -->
++  <object class="GtkImage" id="edit_button_image">
++    <property name="stock">gtk-edit</property>
++    <property name="icon_size">4</property>
++  </object>
+   <object class="GtkVBox" id="library_vbox">
+     <property name="visible">True</property>
+     <property name="border_width">12</property>
+@@ -305,42 +309,9 @@
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">True</property>
+-                        <child>
+-                          <object class="GtkAlignment" id="alignment4">
+-                            <property name="visible">True</property>
+-                            <property name="xscale">0</property>
+-                            <property name="yscale">0</property>
+-                            <child>
+-                              <object class="GtkHBox" id="hbox19">
+-                                <property name="visible">True</property>
+-                                <property name="spacing">2</property>
+-                                <child>
+-                                  <object class="GtkImage" id="image2">
+-                                    <property name="visible">True</property>
+-                                    <property name="stock">gtk-edit</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkLabel" id="label24">
+-                                    <property name="visible">True</property>
+-                                    <property name="label" translatable="yes">_Edit...</property>
+-                                    <property name="use_underline">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>
++                        <property name="image">edit_button_image</property>
++                        <property name="label" translatable="yes">_Edit...</property>
++                        <property name="use_underline">True</property>
+                       </object>
+                       <packing>
+                         <property name="expand">False</property>
 diff -up rhythmbox-0.12.3/data/ui/plugins.ui.button-images rhythmbox-0.12.3/data/ui/plugins.ui
 --- rhythmbox-0.12.3/data/ui/plugins.ui.button-images	2009-08-22 20:35:33.773436149 -0400
 +++ rhythmbox-0.12.3/data/ui/plugins.ui	2009-08-22 20:38:07.670430227 -0400



From victorv at fedoraproject.org  Sun Aug 23 01:00:25 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Sun, 23 Aug 2009 01:00:25 +0000 (UTC)
Subject: rpms/cobertura/F-11 cobertura-1.9.pom, NONE,
	1.1 cobertura-build_xml.patch, NONE,
	1.1 cobertura-runtime-1.9.pom, NONE, 1.1 cobertura-scripts.patch,
	NONE, 1.1 cobertura.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090823010025.C275F11C0347@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/cobertura/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18847/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	cobertura-1.9.pom cobertura-build_xml.patch 
	cobertura-runtime-1.9.pom cobertura-scripts.patch 
	cobertura.spec import.log 
Log Message:
Backport rawhide (F-12) -> F-11



--- NEW FILE cobertura-1.9.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>JPP</groupId>
  <artifactId>cobertura</artifactId>
  <version>1.9</version>

  <dependencies>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>oro</artifactId>
      <version>2.0.8</version>
    </dependency>
    <dependency>
      <groupId>JPP/asm2</groupId>
      <artifactId>asm2</artifactId>
      <version>2.2.1</version>
    </dependency>
    <dependency>
      <groupId>JPP/asm2</groupId>
      <artifactId>asm2-tree</artifactId>
      <version>2.2.1</version>
    </dependency>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>log4j</artifactId>
      <version>1.2.9</version>
    </dependency>
  </dependencies>

</project>

cobertura-build_xml.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cobertura-build_xml.patch ---
--- build.xml.sav	2007-07-19 18:03:37.000000000 +0200
+++ build.xml	2007-07-19 18:05:47.000000000 +0200
@@ -236,7 +236,7 @@
 			<report format="frames" todir="${build.reports.dir}/junit-html" />
 		</junitreport>
 
-		<fail message="Tests failed." if="test.failed" />
+		<echo message="Tests failed is ${test.failed}" />
 	</target>
 
 	<target name="coverage-report">


--- NEW FILE cobertura-runtime-1.9.pom ---
<?xml version="1.0" ?>
<project>
  <modelVersion>4.0.0</modelVersion>

  <groupId>net.sourceforge.cobertura</groupId>
  <artifactId>cobertura-runtime</artifactId>
  <name>Cobertura :: Limited Runtime</name>
  <version>1.9</version>
  <packaging>pom</packaging>

  <description>
    Cobertura Runtime artifact to prevent unneeded dependencies at runtime.
  </description>

  <licenses>
    <license>
      <name>The GNU General Public License, Version 2</name>
      <url>http://www.gnu.org/licenses/gpl.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>

  <dependencies>
    <dependency>
      <groupId>net.sourceforge.cobertura</groupId>
      <artifactId>cobertura</artifactId>
      <version>1.9</version>
      <exclusions>
        <exclusion>
          <groupId>oro</groupId>
          <artifactId>oro</artifactId>
        </exclusion>
        <exclusion>
          <groupId>asm</groupId>
          <artifactId>asm</artifactId>
        </exclusion>
        <exclusion>
          <groupId>asm</groupId>
          <artifactId>asm-tree</artifactId>
        </exclusion>
        <exclusion>
          <groupId>log4j</groupId>
          <artifactId>log4j</artifactId>
        </exclusion>
      </exclusions>
    </dependency>
  </dependencies>

</project>

cobertura-scripts.patch:
 cobertura-check.sh      |   10 +++++++++-
 cobertura-instrument.sh |   10 +++++++++-
 cobertura-merge.sh      |   10 +++++++++-
 cobertura-report.sh     |   10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

--- NEW FILE cobertura-scripts.patch ---
--- cobertura-check.sh.sav	2007-06-05 20:39:54.000000000 +0200
+++ cobertura-check.sh	2007-07-20 15:12:12.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.check.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.check.Main $*
--- cobertura-instrument.sh.sav	2007-06-05 20:39:53.000000000 +0200
+++ cobertura-instrument.sh	2007-07-20 15:12:19.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.instrument.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.instrument.Main $*
--- cobertura-merge.sh.sav	2007-06-05 20:39:54.000000000 +0200
+++ cobertura-merge.sh	2007-07-20 15:12:28.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.merge.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.merge.Main $*
--- cobertura-report.sh.sav	2007-06-05 20:39:53.000000000 +0200
+++ cobertura-report.sh	2007-07-20 15:12:34.000000000 +0200
@@ -1 +1,9 @@
-java -cp `dirname $0`/cobertura.jar:`dirname $0`/lib/asm-2.2.1.jar:`dirname $0`/lib/asm-tree-2.2.1.jar:`dirname $0`/lib/log4j-1.2.9.jar:`dirname $0`/lib/jakarta-oro-2.0.8.jar net.sourceforge.cobertura.reporting.Main $*
+#!/bin/sh
+export CLASSPATH=$(build-classpath \
+cobertura \
+asm2/asm2 \
+asm2/asm2-tree \
+log4j \
+oro \
+)
+java net.sourceforge.cobertura.reporting.Main $*


--- NEW FILE cobertura.spec ---
# Prevent brp-java-repack-jars from being run
%global __jar_repack %{nil}

# Links the system JAR
# %1 - the sys jar
# %2 - the symlink (optional)
%global lnSysJAR() %__ln_s -f %{_javadir}/%{*} ;

Name:           cobertura
Version:        1.9
Release:        3%{?dist}
Summary:        Java tool that calculates the percentage of code accessed by tests

Group:          Development/Libraries
License:        ASL 1.1 and GPLv2+
URL:            http://cobertura.sourceforge.net/

Source0:        http://prdownloads.sourceforge.net/cobertura/cobertura-1.9-src.tar.gz
Source1:        %{name}-%{version}.pom
Source2:        %{name}-runtime-%{version}.pom
Patch0:         cobertura-build_xml.patch
Patch1:         cobertura-scripts.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant
BuildRequires:  ant-junit
BuildRequires:  ant-trax
BuildRequires:  asm2
BuildRequires:  dos2unix
BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  jakarta-oro
BuildRequires:  jaxen
BuildRequires:  jdom
BuildRequires:  junit
BuildRequires:  log4j
BuildRequires:  xalan-j2
BuildRequires:  xerces-j2
BuildRequires:  xml-commons-jaxp-1.3-apis

Requires:       ant
Requires:       asm2
Requires:       jpackage-utils
Requires:       java
Requires:       jakarta-oro
Requires:       junit
Requires:       log4j

Requires(post): jpackage-utils
Requires(postun): jpackage-utils

BuildArch:      noarch

%description
Cobertura is a free Java tool that calculates the percentage of code 
accessed by tests. It can be used to identify which parts of your 
Java program are lacking test coverage. It is based on jcoverage.

%package        javadoc
Summary:        Javadoc 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 -b .sav
%patch1 -b .sav
find . -type f -name '*.jar' | xargs -t rm

dos2unix -k ChangeLog COPYING COPYRIGHT README

%build
pushd lib
%lnSysJAR asm2/asm2.jar
%lnSysJAR asm2/asm2-tree.jar
%lnSysJAR jaxen.jar
%lnSysJAR jdom.jar
%lnSysJAR junit.jar
%lnSysJAR oro.jar
%lnSysJAR log4j.jar
%lnSysJAR xalan-j2.jar
pushd xerces
%lnSysJAR xerces-j2.jar
%lnSysJAR xml-commons-jaxp-1.3-apis.jar
popd
popd

export CLASSPATH=
export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
%ant compile test jar javadoc

%install
%__rm -rf %{buildroot}

# jar
%__mkdir_p %{buildroot}%{_javadir}
%__cp -a %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
%__ln_s ${jar} ${jar/-%{version}/}; done)
%add_to_maven_depmap cobertura cobertura %{version} JPP %{name}
%add_to_maven_depmap cobertura cobertura-runtime %{version} JPP %{name}
%add_to_maven_depmap net.sourceforge.cobertura cobertura %{version} JPP %{name}
%add_to_maven_depmap net.sourceforge.cobertura cobertura-runtime %{version} JPP %{name}

# pom
%__mkdir_p %{buildroot}%{_datadir}/maven2/poms
%__cp -a %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
%__cp -a %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-runtime.pom

%__mkdir_p  %{buildroot}%{_sysconfdir}/ant.d
%__cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
ant cobertura junit log4j oro xerces-j2
EOF

# bin
%__mkdir_p %{buildroot}%{_bindir}
%__install -m 755 cobertura-check.sh %{buildroot}%{_bindir}/cobertura-check
%__install -m 755 cobertura-instrument.sh %{buildroot}%{_bindir}/cobertura-instrument
%__install -m 755 cobertura-merge.sh %{buildroot}%{_bindir}/cobertura-merge
%__install -m 755 cobertura-report.sh %{buildroot}%{_bindir}/cobertura-report

# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
%__cp -a build/api/* %{buildroot}%{_javadocdir}/%{name}

%clean
%__rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING COPYRIGHT README
%attr(0755,root,root) %{_bindir}/*
%{_javadir}/*.jar
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
%{_datadir}/maven2/poms/JPP-%{name}*.pom
%config(noreplace) %{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}

%changelog
* Wed Aug 19 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-3
- Fix B(R) according to guidelines
- Use the  lnSysJAR macro
- Prevent brp-java-repack-jars from being run
* Sun Aug 09 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-2
- The license tag is changed according to http://cobertura.sourceforge.net/license.html
* Fri Jun 19 2009  Victor Vasilyev <victor.vasilyev at sun.com> 1.9-1
- release 1.9


--- NEW FILE import.log ---
cobertura-1_9-3_fc11:F-11:cobertura-1.9-3.fc11.src.rpm:1250989481


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Aug 2009 00:02:18 -0000	1.1
+++ .cvsignore	23 Aug 2009 01:00:24 -0000	1.2
@@ -0,0 +1 @@
+cobertura-1.9-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Aug 2009 00:02:18 -0000	1.1
+++ sources	23 Aug 2009 01:00:25 -0000	1.2
@@ -0,0 +1 @@
+0b23286374edc1e0a9ed7dd592b0fed3  cobertura-1.9-src.tar.gz



From bruno at fedoraproject.org  Sun Aug 23 01:04:31 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 23 Aug 2009 01:04:31 +0000 (UTC)
Subject: rpms/glest/devel glest.spec,1.30,1.31
Message-ID: <20090823010431.06DEC11C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19490

Modified Files:
	glest.spec 
Log Message:
There is now a different missing cstdio include that there was in the
previous version.




Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- glest.spec	22 Aug 2009 23:00:29 -0000	1.30
+++ glest.spec	23 Aug 2009 01:04:30 -0000	1.31
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://glest.org
 Source0:        http://www.titusgames.de/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
+#http://sourceforge.net/tracker/?func=detail&aid=2842833&group_id=127297
+Patch0:         glest-3.2.2-missing-cstdio-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-soft-devel, xerces-c-devel
@@ -35,6 +37,7 @@ exist in the environment and can be cont
 
 %prep
 %setup -q -n %{name}-source-%{version}
+%patch0
 find . -type f | xargs sed -i -e "s/\r//g" 
 #recode ISO-8859-1..UTF-8 README
 



From bruno at fedoraproject.org  Sun Aug 23 01:05:52 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 23 Aug 2009 01:05:52 +0000 (UTC)
Subject: rpms/glest/devel glest-3.2.2-missing-cstdio-include.patch, NONE,
	1.1 glest-3.0.0-gcc43.patch, 1.1, NONE glest-3.0.0-unicode.patch,
	1.1, NONE glest-3.2.0-gcc44.patch, 1.1, NONE
Message-ID: <20090823010552.D529911C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19755

Added Files:
	glest-3.2.2-missing-cstdio-include.patch 
Removed Files:
	glest-3.0.0-gcc43.patch glest-3.0.0-unicode.patch 
	glest-3.2.0-gcc44.patch 
Log Message:
Remove obsolete patch files and add new patch file I forgot to add in the
previous commit.



glest-3.2.2-missing-cstdio-include.patch:
 socket.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE glest-3.2.2-missing-cstdio-include.patch ---
*** shared_lib/sources/platform/posix/socket.cpp.orig	2009-04-03 12:40:41.000000000 -0500
--- shared_lib/sources/platform/posix/socket.cpp	2009-08-22 19:57:25.000000000 -0500
***************
*** 9,14 ****
--- 9,15 ----
  #include "socket.h"
  
  #include <cstring>
+ #include <cstdio>
  #include <cstdlib>
  #include <stdexcept>
  #include <sstream>


--- glest-3.0.0-gcc43.patch DELETED ---


--- glest-3.0.0-unicode.patch DELETED ---


--- glest-3.2.0-gcc44.patch DELETED ---



From pgordon at fedoraproject.org  Sun Aug 23 01:07:08 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 23 Aug 2009 01:07:08 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkit-1.1.12-no-execmem.patch, NONE,
	1.1 webkitgtk.spec, 1.15, 1.16
Message-ID: <20090823010708.3440111C00A2@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20038

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.1.12-no-execmem.patch 
Log Message:
Fix bugs #516057 (gets whacked by selinux execmem check) and #518639 (webkitgtk-doc package effectively empty). Bump min libsoup required version.

webkit-1.1.12-no-execmem.patch:
 Platform.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE webkit-1.1.12-no-execmem.patch ---
diff -up ./JavaScriptCore/wtf/Platform.h.old ./JavaScriptCore/wtf/Platform.h
--- ./JavaScriptCore/wtf/Platform.h.old	2009-08-22 15:00:39.306173267 -0700
+++ ./JavaScriptCore/wtf/Platform.h	2009-08-22 15:03:40.551182842 -0700
@@ -675,7 +675,7 @@
 #endif
 /* Setting this flag prevents the assembler from using RWX memory; this may improve
    security but currectly comes at a significant performance cost. */
-#if PLATFORM(ARM)
+#if PLATFORM(ARM) || PLATFORM(X86) || PLATFORM(X86_64)
 #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
 #else
 #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- webkitgtk.spec	29 Jul 2009 15:24:57 -0000	1.15
+++ webkitgtk.spec	23 Aug 2009 01:07:07 -0000	1.16
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -46,7 +46,9 @@ License:	LGPLv2+ and BSD
 URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
-Patch0:         webkit-1.1.12-atomic-word.patch
+
+Patch0: 	webkit-1.1.12-atomic-word.patch
+Patch1: 	webkit-1.1.12-no-execmem.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,7 +63,7 @@ BuildRequires:	gnome-keyring-devel
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	gtk2-devel
-BuildRequires:	libsoup-devel >= 2.25.91
+BuildRequires:	libsoup-devel >= 2.27.4
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libxslt-devel
@@ -110,6 +112,7 @@ LICENSE, README, and AUTHORS files.
 %prep
 %setup -qn "webkit-%{version}"
 %patch0 -p1
+%patch1 -b .no-execmem
 
 %build
 %configure							\
@@ -154,6 +157,8 @@ install -m 755 Programs/GtkLauncher %{bu
 
 %add_to_doc_files JavaScriptCore/THANKS
 
+%add_to_doc_files WebKit/gtk/NEWS
+
 
 %clean
 rm -rf %{buildroot}
@@ -166,7 +171,6 @@ rm -rf %{buildroot}
 
 %files -f webkit.lang
 %defattr(-,root,root,-)
-%doc WebKit/gtk/NEWS
 %exclude %{_libdir}/*.la
 %{_libdir}/libwebkit-1.0.so.*
 %{_libexecdir}/%{name}/
@@ -185,6 +189,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.12-2
+- Add patch to forcibly disable RWX memory in the x86/x86-64 assembler.
+  + no-execmem.patch
+- Use %%add_to_doc_files to add the gtk/NEWS file instead of %%doc, which
+  clobbered the doc files before they could be properly installed to the -doc
+  subpackage.
+- Resolves: #516057 (gets whacked by selinux execmem check) and #516057
+  (webkitgtk-doc package effectively empty).
+- Update minimum required libsoup version.
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.12-1
 - Update to 1.1.12
 



From bruno at fedoraproject.org  Sun Aug 23 01:16:00 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 23 Aug 2009 01:16:00 +0000 (UTC)
Subject: rpms/glest/devel glest.spec,1.31,1.32
Message-ID: <20090823011600.A0E2A11C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21062

Modified Files:
	glest.spec 
Log Message:
Reenable ppc builds since there have been a lot of changes since it was
disabled and I want to have the reporter retest it.




Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- glest.spec	23 Aug 2009 01:04:30 -0000	1.31
+++ glest.spec	23 Aug 2009 01:15:59 -0000	1.32
@@ -24,7 +24,9 @@ Requires:       glx-utils
 Requires:       opengl-games-utils
 
 # Does not work on PPC (see README.Linux). Bug 219540.
-ExcludeArch:    ppc ppc64
+# It's been a long time so I want to reenable this in rawhide and ask for
+# the reporter to retest it.
+#ExcludeArch:    ppc ppc64
 
 %description
 Glest is a free 3D real time strategy game, that can be modified



From rdieter at fedoraproject.org  Sun Aug 23 01:20:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 01:20:49 +0000 (UTC)
Subject: rpms/maxima/devel .cvsignore, 1.31, 1.32 maxima.spec, 1.136,
	1.137 sources, 1.29, 1.30
Message-ID: <20090823012049.633C211C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22210

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.1-1
- maxima-5.19.1
- -gui: optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	19 Apr 2009 02:18:54 -0000	1.31
+++ .cvsignore	23 Aug 2009 01:20:48 -0000	1.32
@@ -2,4 +2,4 @@ clog
 macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
-maxima-5.18.1.tar.gz
+maxima-5.19.1.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- maxima.spec	19 Aug 2009 01:14:37 -0000	1.136
+++ maxima.spec	23 Aug 2009 01:20:48 -0000	1.137
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.19.0
+Version: 5.19.1
 
-Release: 2%{?dist} 
+Release: 1%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -299,12 +299,16 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post gui
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun gui
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans gui
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then
@@ -429,6 +433,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.1-1
+- maxima-5.19.1
+- -gui: optimize scriptlets
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.0-2
 - safer evaluation of %%sbcl_ver macro
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	19 Apr 2009 02:18:54 -0000	1.29
+++ sources	23 Aug 2009 01:20:49 -0000	1.30
@@ -1,4 +1,4 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
-8be7388ad31b975335623b390bc2516e  maxima-5.18.1.tar.gz
+5b23dcfccad10988e344a839a0fbbe2b  maxima-5.19.1.tar.gz



From bruno at fedoraproject.org  Sun Aug 23 01:21:27 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 23 Aug 2009 01:21:27 +0000 (UTC)
Subject: rpms/glest/devel glest.spec,1.32,1.33
Message-ID: <20090823012127.4C3DB11C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22229

Modified Files:
	glest.spec 
Log Message:
Update changelog to match what's changed in the build.




Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- glest.spec	23 Aug 2009 01:15:59 -0000	1.32
+++ glest.spec	23 Aug 2009 01:21:26 -0000	1.33
@@ -114,8 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  3.2.2-1
-- rebuild
+* Sat Aug 22 2009 Bruno Wolff III <bruno at wolff.to> -  3.2.2-1
+- rebuild for openal-soft version change
+- reenable ppc to allow retesting of 219540
+- Update to 3.2.2 to pick up some networking fixes
 
 * Fri Jul 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 3.2.1-3
 - fix wrapper script (#501181)



From mclasen at fedoraproject.org  Sun Aug 23 01:33:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 23 Aug 2009 01:33:52 +0000 (UTC)
Subject: rpms/gedit/devel button-images.patch, 1.1, 1.2 gedit.spec, 1.201,
	1.202
Message-ID: <20090823013352.18E6B11C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25131

Modified Files:
	button-images.patch gedit.spec 
Log Message:
Respect button-images setting


button-images.patch:
 docinfo.ui |   67 ++++++-------------------------------------------------------
 1 file changed, 7 insertions(+), 60 deletions(-)

Index: button-images.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/button-images.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- button-images.patch	16 Jul 2009 18:04:05 -0000	1.1
+++ button-images.patch	23 Aug 2009 01:33:51 -0000	1.2
@@ -1,23 +1,23 @@
-diff -up gedit-2.27.2/plugins/sort/sort.ui.button-images gedit-2.27.2/plugins/sort/sort.ui
---- gedit-2.27.2/plugins/sort/sort.ui.button-images	2009-07-16 13:54:14.208338015 -0400
-+++ gedit-2.27.2/plugins/sort/sort.ui	2009-07-16 13:56:25.653333726 -0400
-@@ -9,6 +9,10 @@
-     <property name="page_size">0</property>
-     <property name="value">1</property>
-   </object>
-+  <object class="GtkImage" id="sort_image">
-+    <property name="stock">gtk-sort-ascending</property>
+diff -up gedit-2.27.4/plugins/docinfo/docinfo.ui.button-images gedit-2.27.4/plugins/docinfo/docinfo.ui
+--- gedit-2.27.4/plugins/docinfo/docinfo.ui.button-images	2009-08-22 21:24:45.878430797 -0400
++++ gedit-2.27.4/plugins/docinfo/docinfo.ui	2009-08-22 21:26:27.996679948 -0400
+@@ -1,6 +1,10 @@
+ <?xml version="1.0"?>
+ <!--*- mode: xml -*-->
+ <interface>
++  <object class="GtkImage" id="update_image">
++    <property name="stock">gtk-refresh</property>
 +    <property name="icon_size">4</property>
 +  </object>
-   <object class="GtkDialog" id="sort_dialog">
-     <property name="title" translatable="yes">Sort</property>
-     <property name="type">GTK_WINDOW_TOPLEVEL</property>
-@@ -50,66 +54,9 @@
+   <object class="GtkDialog" id="dialog">
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Document Statistics</property>
+@@ -44,66 +48,9 @@
                  <property name="can_focus">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
 -                <child>
--                  <object class="GtkAlignment" id="alignment6">
+-                  <object class="GtkAlignment" id="alignment1">
 -                    <property name="visible">True</property>
 -                    <property name="xalign">0.5</property>
 -                    <property name="yalign">0.5</property>
@@ -28,14 +28,14 @@ diff -up gedit-2.27.2/plugins/sort/sort.
 -                    <property name="left_padding">0</property>
 -                    <property name="right_padding">0</property>
 -                    <child>
--                      <object class="GtkHBox" id="hbox15">
+-                      <object class="GtkHBox" id="hbox2">
 -                        <property name="visible">True</property>
 -                        <property name="homogeneous">False</property>
 -                        <property name="spacing">2</property>
 -                        <child>
--                          <object class="GtkImage" id="image8">
+-                          <object class="GtkImage" id="image1">
 -                            <property name="visible">True</property>
--                            <property name="stock">gtk-sort-ascending</property>
+-                            <property name="stock">gtk-refresh</property>
 -                            <property name="icon_size">4</property>
 -                            <property name="xalign">0.5</property>
 -                            <property name="yalign">0.5</property>
@@ -49,9 +49,9 @@ diff -up gedit-2.27.2/plugins/sort/sort.
 -                          </packing>
 -                        </child>
 -                        <child>
--                          <object class="GtkLabel" id="label19">
+-                          <object class="GtkLabel" id="label29">
 -                            <property name="visible">True</property>
--                            <property name="label" translatable="yes">_Sort</property>
+-                            <property name="label" translatable="yes">_Update</property>
 -                            <property name="use_underline">True</property>
 -                            <property name="use_markup">False</property>
 -                            <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -76,439 +76,9 @@ diff -up gedit-2.27.2/plugins/sort/sort.
 -                    </child>
 -                  </object>
 -                </child>
-+                <property name="image">sort_image</property>
-+                <property name="label" translatable="yes">_Sort</property>
++                <property name="image">update_image</property>
++                <property name="label" translatable="yes">_Update</property>
 +                <property name="use_underline">True</property>
                </object>
              </child>
-             <child>
-diff -up gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c.button-images gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c
---- gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c.button-images	2009-07-16 13:51:51.765583774 -0400
-+++ gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c	2009-07-16 13:48:42.535583423 -0400
-@@ -223,12 +223,18 @@ create_dialog (GeditSpellCheckerDialog *
- 	GtkTreeViewColumn *column;
- 	GtkCellRenderer *cell;
- 	GtkTreeSelection *selection;
--	gboolean ret;
--	gchar *ui_file;
- 	gchar *root_objects[] = {
- 		"content",
-+		"check_word_image",
-+		"add_word_image",
-+                "ignore_image",
-+                "change_image",
-+                "ignore_all_image",
-+                "change_all_image",
- 		NULL
- 	};
-+	gboolean ret;
-+	gchar *ui_file;
- 	
- 	g_return_if_fail (dlg != NULL);
- 
-diff -up gedit-2.27.2/plugins/spell/spell-checker.ui.button-images gedit-2.27.2/plugins/spell/spell-checker.ui
---- gedit-2.27.2/plugins/spell/spell-checker.ui.button-images	2009-07-16 13:08:59.501579700 -0400
-+++ gedit-2.27.2/plugins/spell/spell-checker.ui	2009-07-16 13:48:08.324355869 -0400
-@@ -1,6 +1,30 @@
- <?xml version="1.0"?>
- <!--*- mode: xml -*-->
- <interface>
-+  <object class="GtkImage" id="check_word_image">
-+    <property name="stock">gtk-spell-check</property>
-+    <property name="icon_size">4</property>
-+  </object>
-+  <object class="GtkImage" id="add_word_image">
-+    <property name="stock">gtk-add</property>
-+    <property name="icon_size">4</property>
-+  </object>
-+  <object class="GtkImage" id="ignore_image">
-+     <property name="stock">gtk-go-down</property>
-+     <property name="icon_size">4</property>
-+  </object>
-+  <object class="GtkImage" id="change_image">
-+     <property name="stock">gtk-convert</property>
-+     <property name="icon_size">4</property>
-+  </object>
-+  <object class="GtkImage" id="ignore_all_image">
-+    <property name="stock">gtk-goto-bottom</property>
-+    <property name="icon_size">4</property>
-+  </object>
-+  <object class="GtkImage" id="change_all_image">
-+     <property name="stock">gtk-convert</property>
-+     <property name="icon_size">4</property>
-+  </object>
-   <object class="GtkWindow" id="check_spelling_window">
-     <property name="visible">True</property>
-     <property name="title" translatable="yes">Check spelling</property>
-@@ -121,58 +145,9 @@
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
--                    <child>
--                      <object class="GtkAlignment" id="alignment1">
--                        <property name="visible">True</property>
--                        <property name="xalign">0.5</property>
--                        <property name="yalign">0.5</property>
--                        <property name="xscale">0</property>
--                        <property name="yscale">0</property>
--                        <child>
--                          <object class="GtkHBox" id="hbox4">
--                            <property name="visible">True</property>
--                            <property name="homogeneous">False</property>
--                            <property name="spacing">2</property>
--                            <child>
--                              <object class="GtkImage" id="image1">
--                                <property name="visible">True</property>
--                                <property name="stock">gtk-spell-check</property>
--                                <property name="icon_size">4</property>
--                                <property name="xalign">0.5</property>
--                                <property name="yalign">0.5</property>
--                                <property name="xpad">0</property>
--                                <property name="ypad">0</property>
--                              </object>
--                              <packing>
--                                <property name="padding">0</property>
--                                <property name="expand">False</property>
--                                <property name="fill">False</property>
--                              </packing>
--                            </child>
--                            <child>
--                              <object class="GtkLabel" id="label8">
--                                <property name="visible">True</property>
--                                <property name="label" translatable="yes">Check _Word</property>
--                                <property name="use_underline">True</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>
--                              </object>
--                              <packing>
--                                <property name="padding">0</property>
--                                <property name="expand">False</property>
--                                <property name="fill">False</property>
--                              </packing>
--                            </child>
--                          </object>
--                        </child>
--                      </object>
--                    </child>
-+                    <property name="image">check_word_image</property>
-+                    <property name="label" translatable="yes">Check _Word</property>
-+                    <property name="use_underline">True</property>
-                   </object>
-                   <packing>
-                     <property name="padding">0</property>
-@@ -272,58 +247,9 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
--                        <child>
--                          <object class="GtkAlignment" id="alignment4">
--                            <property name="visible">True</property>
--                            <property name="xalign">0.5</property>
--                            <property name="yalign">0.5</property>
--                            <property name="xscale">0</property>
--                            <property name="yscale">0</property>
--                            <child>
--                              <object class="GtkHBox" id="hbox7">
--                                <property name="visible">True</property>
--                                <property name="homogeneous">False</property>
--                                <property name="spacing">2</property>
--                                <child>
--                                  <object class="GtkImage" id="image4">
--                                    <property name="visible">True</property>
--                                    <property name="stock">gtk-go-down</property>
--                                    <property name="icon_size">4</property>
--                                    <property name="xalign">0.5</property>
--                                    <property name="yalign">0.5</property>
--                                    <property name="xpad">0</property>
--                                    <property name="ypad">0</property>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkLabel" id="label11">
--                                    <property name="visible">True</property>
--                                    <property name="label" translatable="yes">_Ignore</property>
--                                    <property name="use_underline">True</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>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                              </object>
--                            </child>
--                          </object>
--                        </child>
-+                        <property name="image">ignore_image</property>
-+                        <property name="label" translatable="yes">_Ignore</property>
-+                        <property name="use_underline">True</property>
-                       </object>
-                       <packing>
-                         <property name="left_attach">0</property>
-@@ -338,58 +264,9 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
--                        <child>
--                          <object class="GtkAlignment" id="alignment21">
--                            <property name="visible">True</property>
--                            <property name="xalign">0.5</property>
--                            <property name="yalign">0.5</property>
--                            <property name="xscale">0</property>
--                            <property name="yscale">0</property>
--                            <child>
--                              <object class="GtkHBox" id="hbox30">
--                                <property name="visible">True</property>
--                                <property name="homogeneous">False</property>
--                                <property name="spacing">2</property>
--                                <child>
--                                  <object class="GtkImage" id="image21">
--                                    <property name="visible">True</property>
--                                    <property name="stock">gtk-convert</property>
--                                    <property name="icon_size">4</property>
--                                    <property name="xalign">0.5</property>
--                                    <property name="yalign">0.5</property>
--                                    <property name="xpad">0</property>
--                                    <property name="ypad">0</property>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkLabel" id="label42">
--                                    <property name="visible">True</property>
--                                    <property name="label" translatable="yes">Cha_nge</property>
--                                    <property name="use_underline">True</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>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                              </object>
--                            </child>
--                          </object>
--                        </child>
-+                        <property name="image">change_image</property>
-+                        <property name="label" translatable="yes">Cha_nge</property>
-+                        <property name="use_underline">True</property>
-                       </object>
-                       <packing>
-                         <property name="left_attach">0</property>
-@@ -404,58 +281,9 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
--                        <child>
--                          <object class="GtkAlignment" id="alignment5">
--                            <property name="visible">True</property>
--                            <property name="xalign">0.5</property>
--                            <property name="yalign">0.5</property>
--                            <property name="xscale">0</property>
--                            <property name="yscale">0</property>
--                            <child>
--                              <object class="GtkHBox" id="hbox8">
--                                <property name="visible">True</property>
--                                <property name="homogeneous">False</property>
--                                <property name="spacing">2</property>
--                                <child>
--                                  <object class="GtkImage" id="image5">
--                                    <property name="visible">True</property>
--                                    <property name="stock">gtk-goto-bottom</property>
--                                    <property name="icon_size">4</property>
--                                    <property name="xalign">0.5</property>
--                                    <property name="yalign">0.5</property>
--                                    <property name="xpad">0</property>
--                                    <property name="ypad">0</property>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkLabel" id="label12">
--                                    <property name="visible">True</property>
--                                    <property name="label" translatable="yes">Ignore _All</property>
--                                    <property name="use_underline">True</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>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                              </object>
--                            </child>
--                          </object>
--                        </child>
-+                        <property name="image">ignore_all_image</property>
-+                        <property name="label" translatable="yes">Ignore _All</property>
-+                        <property name="use_underline">True</property>
-                       </object>
-                       <packing>
-                         <property name="left_attach">1</property>
-@@ -470,58 +298,9 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
--                        <child>
--                          <object class="GtkAlignment" id="alignment22">
--                            <property name="visible">True</property>
--                            <property name="xalign">0.5</property>
--                            <property name="yalign">0.5</property>
--                            <property name="xscale">0</property>
--                            <property name="yscale">0</property>
--                            <child>
--                              <object class="GtkHBox" id="hbox31">
--                                <property name="visible">True</property>
--                                <property name="homogeneous">False</property>
--                                <property name="spacing">2</property>
--                                <child>
--                                  <object class="GtkImage" id="image22">
--                                    <property name="visible">True</property>
--                                    <property name="stock">gtk-convert</property>
--                                    <property name="icon_size">4</property>
--                                    <property name="xalign">0.5</property>
--                                    <property name="yalign">0.5</property>
--                                    <property name="xpad">0</property>
--                                    <property name="ypad">0</property>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkLabel" id="label43">
--                                    <property name="visible">True</property>
--                                    <property name="label" translatable="yes">Change A_ll</property>
--                                    <property name="use_underline">True</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>
--                                  </object>
--                                  <packing>
--                                    <property name="padding">0</property>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                  </packing>
--                                </child>
--                              </object>
--                            </child>
--                          </object>
--                        </child>
-+                        <property name="image">change_all_image</property>
-+                        <property name="label" translatable="yes">Change A_ll</property>
-+                        <property name="use_underline">True</property>
-                       </object>
-                       <packing>
-                         <property name="left_attach">1</property>
-@@ -573,58 +352,9 @@
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
--                            <child>
--                              <object class="GtkAlignment" id="alignment2">
--                                <property name="visible">True</property>
--                                <property name="xalign">0.5</property>
--                                <property name="yalign">0.5</property>
--                                <property name="xscale">0</property>
--                                <property name="yscale">0</property>
--                                <child>
--                                  <object class="GtkHBox" id="hbox5">
--                                    <property name="visible">True</property>
--                                    <property name="homogeneous">False</property>
--                                    <property name="spacing">2</property>
--                                    <child>
--                                      <object class="GtkImage" id="image2">
--                                        <property name="visible">True</property>
--                                        <property name="stock">gtk-add</property>
--                                        <property name="icon_size">4</property>
--                                        <property name="xalign">0.5</property>
--                                        <property name="yalign">0.5</property>
--                                        <property name="xpad">0</property>
--                                        <property name="ypad">0</property>
--                                      </object>
--                                      <packing>
--                                        <property name="padding">0</property>
--                                        <property name="expand">False</property>
--                                        <property name="fill">False</property>
--                                      </packing>
--                                    </child>
--                                    <child>
--                                      <object class="GtkLabel" id="label9">
--                                        <property name="visible">True</property>
--                                        <property name="label" translatable="yes">Add w_ord</property>
--                                        <property name="use_underline">True</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>
--                                      </object>
--                                      <packing>
--                                        <property name="padding">0</property>
--                                        <property name="expand">False</property>
--                                        <property name="fill">False</property>
--                                      </packing>
--                                    </child>
--                                  </object>
--                                </child>
--                              </object>
--                            </child>
-+                            <property name="image">add_word_image</property>
-+                            <property name="label" translatable="yes">Add w_ord</property>
-+                            <property name="use_underline">True</property>
-                           </object>
-                           <packing>
-                             <property name="padding">0</property>
+           </object>


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- gedit.spec	11 Aug 2009 04:31:24 -0000	1.201
+++ gedit.spec	23 Aug 2009 01:33:51 -0000	1.202
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.27.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -48,6 +48,9 @@ Patch2: gedit-2.25.5-fix-python-path.pat
 # http://bugzilla.gnome.org/show_bug.cgi?id=587053
 Patch3: print-to-file.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592766
+Patch4: button-images.patch
+
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -114,6 +117,7 @@ Install gedit-devel if you want to write
 
 %patch2 -p1 -b .fix-python-path
 %patch3 -p1 -b .print-to-file
+%patch4 -p1 -b .button-images
 
 %build
 autoreconf -f -i
@@ -229,6 +233,9 @@ fi
 
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.4-2
+- Respect button-images setting
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.4-1
 - Update to 2.27.4
 



From bruno at fedoraproject.org  Sun Aug 23 01:54:01 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 23 Aug 2009 01:54:01 +0000 (UTC)
Subject: rpms/glest-data/devel glest-data.spec,1.15,1.16
Message-ID: <20090823015401.82BA711C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28506

Modified Files:
	glest-data.spec 
Log Message:
Allow glest-data and glest versions to be different.




Index: glest-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-data.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- glest-data.spec	25 Jul 2009 00:18:44 -0000	1.15
+++ glest-data.spec	23 Aug 2009 01:54:01 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           glest-data
 Version:        3.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Data files for the game Glest
 
 Group:          Amusements/Games
@@ -19,7 +19,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 
 BuildRequires:  ImageMagick, recode
-Requires:       glest = %{version}
+# Currently glest and glest-data versions are out of sync.
+Requires:       glest >= %{version}
 
 # Glest does not work on PPC. Bug 219540.
 ExcludeArch:    ppc ppc64
@@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Bruno Wolff III <bruno at wolff.to> - 3.2.1-2
+- Allow glest-data and glest versions to be different
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bruno at fedoraproject.org  Sun Aug 23 01:56:25 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sun, 23 Aug 2009 01:56:25 +0000 (UTC)
Subject: rpms/glest-data/devel glest-data.spec,1.16,1.17
Message-ID: <20090823015625.D0DEB11C00A2@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/glest-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29013

Modified Files:
	glest-data.spec 
Log Message:
Reenable ppc/ppc64 builds




Index: glest-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-data.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- glest-data.spec	23 Aug 2009 01:54:01 -0000	1.16
+++ glest-data.spec	23 Aug 2009 01:56:25 -0000	1.17
@@ -23,7 +23,8 @@ BuildRequires:  ImageMagick, recode
 Requires:       glest >= %{version}
 
 # Glest does not work on PPC. Bug 219540.
-ExcludeArch:    ppc ppc64
+# Allow retesting of this bug since it has been a long time
+# ExcludeArch:    ppc ppc64
 
 
 %description
@@ -90,8 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Aug 22 2009 Bruno Wolff III <bruno at wolff.to> - 3.2.1-2
+* Sat Aug 22 2009 Bruno Wolff III <bruno at wolff.to> - 3.2.1-3
 - Allow glest-data and glest versions to be different
+- Reenable ppc/ppc64 builds to allow retesting of 219540
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pfj at fedoraproject.org  Sun Aug 23 03:50:53 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 23 Aug 2009 03:50:53 +0000 (UTC)
Subject: rpms/mono-cecil-flowanalysis/F-10 import.log,1.1,1.2
Message-ID: <20090823035053.8F3B311C00A2@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-cecil-flowanalysis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18559/F-10

Modified Files:
	import.log 
Log Message:

Update to mono-cecil-flowanaylsis 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-cecil-flowanalysis/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Jan 2009 23:53:21 -0000	1.1
+++ import.log	23 Aug 2009 03:50:52 -0000	1.2
@@ -1 +1,2 @@
 mono-cecil-flowanalysis-0_1-0_7_20080409svn100264_fc11:F-10:mono-cecil-flowanalysis-0.1-0.7.20080409svn100264.fc11.src.rpm:1233186758
+mono-cecil-flowanalysis-0_1-0_7_20080409svn100264_fc12:F-10:mono-cecil-flowanalysis-0.1-0.7.20080409svn100264.fc12.src.rpm:1250999410



From oget at fedoraproject.org  Sun Aug 23 05:16:49 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 23 Aug 2009 05:16:49 +0000 (UTC)
Subject: rpms/hydrogen/devel .cvsignore, 1.4, 1.5 hydrogen.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <20090823051649.3C77B11C00A2@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29649

Modified Files:
	.cvsignore hydrogen.spec sources 
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
- Update to 0.9.4-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 19:34:24 -0000	1.4
+++ .cvsignore	23 Aug 2009 05:16:47 -0000	1.5
@@ -1 +1 @@
-hydrogen-0.9.4-rc1-1.tar.gz
+hydrogen-0.9.4-rc2.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- hydrogen.spec	5 Aug 2009 23:52:41 -0000	1.13
+++ hydrogen.spec	23 Aug 2009 05:16:47 -0000	1.14
@@ -1,12 +1,11 @@
-%global prerel rc1.1
-%global prerel2 rc1-1
+%global prerel rc2
 
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.6.%{prerel}%{?dist}
+Release:      0.7.%{prerel}%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
 License:      GPLv2+
@@ -31,7 +30,7 @@ Hydrogen is an advanced drum machine for
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel2}
+%setup -q -n %{name}-%{version}-%{prerel}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
 
@@ -61,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icon
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
 
-# No need to package these (they will not be installed automatically in rc2):
+# No need to package these (they will not be installed automatically in rc3?):
 rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
       $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
 
@@ -92,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
+- Update to 0.9.4-rc2
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.6.rc1.1
 - Update .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Apr 2009 19:34:25 -0000	1.4
+++ sources	23 Aug 2009 05:16:47 -0000	1.5
@@ -1 +1 @@
-88f036f32153843997837a95c46ecbc5  hydrogen-0.9.4-rc1-1.tar.gz
+92337e1fddcbe9b9581b7a43d8823c9e  hydrogen-0.9.4-rc2.tar.gz



From oget at fedoraproject.org  Sun Aug 23 05:17:46 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 23 Aug 2009 05:17:46 +0000 (UTC)
Subject: rpms/hydrogen/F-11 .cvsignore, 1.4, 1.5 hydrogen.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <20090823051746.CB47211C00A2@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29925

Modified Files:
	.cvsignore hydrogen.spec sources 
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
- Update to 0.9.4-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 19:34:24 -0000	1.4
+++ .cvsignore	23 Aug 2009 05:17:46 -0000	1.5
@@ -1 +1 @@
-hydrogen-0.9.4-rc1-1.tar.gz
+hydrogen-0.9.4-rc2.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-11/hydrogen.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- hydrogen.spec	15 Jul 2009 02:16:51 -0000	1.11
+++ hydrogen.spec	23 Aug 2009 05:17:46 -0000	1.12
@@ -1,12 +1,11 @@
-%global prerel rc1.1
-%global prerel2 rc1-1
+%global prerel rc2
 
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.4.%{prerel}%{?dist}
+Release:      0.7.%{prerel}%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
 License:      GPLv2+
@@ -31,7 +30,7 @@ Hydrogen is an advanced drum machine for
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel2}
+%setup -q -n %{name}-%{version}-%{prerel}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
 
@@ -49,8 +48,9 @@ scons install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor fedora              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
   --add-category X-Drumming                       \
-  --add-category X-MIDI                           \
+  --add-category Midi                             \
   --add-category X-Jack                           \
+  --add-category AudioVideoEditing                \
   --remove-mime-type text/xml                     \
   --delete-original                               \
   $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
@@ -60,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icon
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
 
-# No need to package these (they will not be installed automatically in rc2):
+# No need to package these (they will not be installed automatically in rc3?):
 rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
       $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
 
@@ -91,6 +91,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
+- Update to 0.9.4-rc2
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.6.rc1.1
+- Update .desktop file
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-0.5.rc1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.4.rc1.1
 - Rebuild against new lash build on F-12 due to the e2fsprogs split
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Apr 2009 19:34:25 -0000	1.4
+++ sources	23 Aug 2009 05:17:46 -0000	1.5
@@ -1 +1 @@
-88f036f32153843997837a95c46ecbc5  hydrogen-0.9.4-rc1-1.tar.gz
+92337e1fddcbe9b9581b7a43d8823c9e  hydrogen-0.9.4-rc2.tar.gz



From oget at fedoraproject.org  Sun Aug 23 05:23:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sun, 23 Aug 2009 05:23:10 +0000 (UTC)
Subject: rpms/hydrogen/F-10 .cvsignore, 1.4, 1.5 hydrogen.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090823052310.E835B11C00A2@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30733

Modified Files:
	.cvsignore hydrogen.spec sources 
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
- Update to 0.9.4-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	14 Apr 2009 19:55:56 -0000	1.4
+++ .cvsignore	23 Aug 2009 05:23:10 -0000	1.5
@@ -1 +1 @@
-hydrogen-0.9.4-rc1-1.tar.gz
+hydrogen-0.9.4-rc2.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/hydrogen.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hydrogen.spec	14 Apr 2009 19:55:56 -0000	1.8
+++ hydrogen.spec	23 Aug 2009 05:23:10 -0000	1.9
@@ -1,12 +1,11 @@
-%global prerel rc1.1
-%global prerel2 rc1-1
+%global prerel rc2
 
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.4
-Release:      0.2.%{prerel}%{?dist}
+Release:      0.7.%{prerel}%{?dist}
 URL:          http://www.hydrogen-music.org/
-Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
+Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel}.tar.gz
 # For convenience, to take the svn snapshot:
 Source9:      hydrogen-snapshot.sh
 License:      GPLv2+
@@ -31,7 +30,7 @@ Hydrogen is an advanced drum machine for
 professional yet simple and intuitive pattern-based drum programming.
 
 %prep
-%setup -q -n %{name}-%{version}-%{prerel2}
+%setup -q -n %{name}-%{version}-%{prerel}
 patch -p0 < patches/portaudio.patch
 patch -p0 < patches/portmidi.patch
 
@@ -46,22 +45,22 @@ scons install DESTDIR=$RPM_BUILD_ROOT
 
 
 # install hydrogen.desktop properly.
-#rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
 desktop-file-install --vendor fedora              \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
   --add-category X-Drumming                       \
-  --add-category X-MIDI                           \
+  --add-category Midi                             \
   --add-category X-Jack                           \
+  --add-category AudioVideoEditing                \
   --remove-mime-type text/xml                     \
   --delete-original                               \
   $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
 
 # Move the icon to the proper place
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
 
-# No need to package these (they will not be installed automatically in rc2):
+# No need to package these (they will not be installed automatically in rc3?):
 rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
       $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
 
@@ -92,6 +91,18 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 
 %changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.7.rc2
+- Update to 0.9.4-rc2
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.6.rc1.1
+- Update .desktop file
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-0.5.rc1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.4.rc1.1
+- Rebuild against new lash build on F-12 due to the e2fsprogs split
+
 * Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.2.rc1.1
 - Update to 0.9.4-rc1-1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	14 Apr 2009 19:55:56 -0000	1.4
+++ sources	23 Aug 2009 05:23:10 -0000	1.5
@@ -1 +1 @@
-88f036f32153843997837a95c46ecbc5  hydrogen-0.9.4-rc1-1.tar.gz
+92337e1fddcbe9b9581b7a43d8823c9e  hydrogen-0.9.4-rc2.tar.gz



From rakesh at fedoraproject.org  Sun Aug 23 05:25:56 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 23 Aug 2009 05:25:56 +0000 (UTC)
Subject: rpms/ratproxy/F-11 ratproxy-report-full-path-to-image.patch, NONE, 
	1.1 import.log, 1.2, 1.3 ratproxy.spec, 1.3, 1.4
Message-ID: <20090823052556.CF9D011C00A2@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ratproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31167/F-11

Modified Files:
	import.log ratproxy.spec 
Added Files:
	ratproxy-report-full-path-to-image.patch 
Log Message:
Applied Steve Milner's 1.58 update patch


ratproxy-report-full-path-to-image.patch:
 ratproxy-report.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ratproxy-report-full-path-to-image.patch ---
--- ratproxy-report.sh	2008-12-31 08:30:49.000000000 -0500
+++ ratproxy-report.sh.fix	2009-08-20 16:04:31.322665331 -0400
@@ -50,7 +50,7 @@
 <style>
 a:link, a:visited { text-decoration: none; color: green }
 a:hover { text-decoration: underline; color: red }
-body { background-color: white; background-image: url('ratproxy-back.png'); background-repeat: no-repeat; }
+body { background-color: white; background-image: url('/usr/share/ratproxy/images/ratproxy-back.png'); background-repeat: no-repeat; }
 </style>
 </head>
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 19:32:21 -0000	1.2
+++ import.log	23 Aug 2009 05:25:56 -0000	1.3
@@ -1,2 +1,3 @@
 ratproxy-1_51-4_fc10:HEAD:ratproxy-1.51-4.fc10.src.rpm:1232367157
 ratproxy-1_56-1_fc11:HEAD:ratproxy-1.56-1.fc11.src.rpm:1239564444
+ratproxy-1_58-1_fc11:F-11:ratproxy-1.58-1.fc11.src.rpm:1251005455


Index: ratproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/F-11/ratproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ratproxy.spec	12 Apr 2009 19:32:21 -0000	1.3
+++ ratproxy.spec	23 Aug 2009 05:25:56 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           ratproxy
-Version:        1.56
+Version:        1.58
 Release:        1%{?dist}
 Summary:        A passive web application security assessment tool
 Group:          Applications/Internet
@@ -9,6 +9,7 @@ URL:            http://code.google.com/p
 # generate-tarball.sh removes that binary and makes source0 tarball.
 Source0:        ratproxy-1.56-nobinary.tar.gz
 Source1:        generate-tarball.sh
+Patch0:        ratproxy-report-full-path-to-image.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 
@@ -25,6 +26,7 @@ and XSS defenses, and much more.
 
 %prep
 %setup -q -n %{name}
+%patch0
 
 %build
 sed -i -e 's at -O3@-O2@' Makefile
@@ -34,7 +36,8 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/
-
+install -p ratproxy-report.sh $RPM_BUILD_ROOT/%{_bindir}/ratproxy-report
+install -Dp ratproxy-back.png $RPM_BUILD_ROOT/%{_datadir}/%{name}/images/ratproxy-back.png
 rm doc/Solaris.README
 chmod 644 doc/*
 
@@ -45,8 +48,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/%{name}
+%{_bindir}/ratproxy-report
+%{_datadir}/%{name}/*
 
 %changelog
+* Thu Aug 20 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 1.58-1
+- Updated to 1.58
+
 * Mon Apr 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.56-1
 - Updated to 1.56
 



From rakesh at fedoraproject.org  Sun Aug 23 05:33:25 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 23 Aug 2009 05:33:25 +0000 (UTC)
Subject: rpms/ratproxy/devel ratproxy-report-full-path-to-image.patch, NONE, 
	1.1 import.log, 1.2, 1.3 ratproxy.spec, 1.5, 1.6
Message-ID: <20090823053325.9A37611C00A2@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32227/devel

Modified Files:
	import.log ratproxy.spec 
Added Files:
	ratproxy-report-full-path-to-image.patch 
Log Message:
Updates to 1.58


ratproxy-report-full-path-to-image.patch:
 ratproxy-report.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ratproxy-report-full-path-to-image.patch ---
--- ratproxy-report.sh	2008-12-31 08:30:49.000000000 -0500
+++ ratproxy-report.sh.fix	2009-08-20 16:04:31.322665331 -0400
@@ -50,7 +50,7 @@
 <style>
 a:link, a:visited { text-decoration: none; color: green }
 a:hover { text-decoration: underline; color: red }
-body { background-color: white; background-image: url('ratproxy-back.png'); background-repeat: no-repeat; }
+body { background-color: white; background-image: url('/usr/share/ratproxy/images/ratproxy-back.png'); background-repeat: no-repeat; }
 </style>
 </head>
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	12 Apr 2009 19:32:21 -0000	1.2
+++ import.log	23 Aug 2009 05:33:25 -0000	1.3
@@ -1,2 +1,3 @@
 ratproxy-1_51-4_fc10:HEAD:ratproxy-1.51-4.fc10.src.rpm:1232367157
 ratproxy-1_56-1_fc11:HEAD:ratproxy-1.56-1.fc11.src.rpm:1239564444
+ratproxy-1_58-1_fc11:HEAD:ratproxy-1.58-1.fc11.src.rpm:1251005916


Index: ratproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/ratproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ratproxy.spec	21 Aug 2009 15:40:29 -0000	1.5
+++ ratproxy.spec	23 Aug 2009 05:33:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ratproxy
-Version:        1.56
-Release:        3%{?dist}
+Version:        1.58
+Release:        1%{?dist}
 Summary:        A passive web application security assessment tool
 Group:          Applications/Internet
 License:        ASL 2.0
@@ -9,6 +9,7 @@ URL:            http://code.google.com/p
 # generate-tarball.sh removes that binary and makes source0 tarball.
 Source0:        ratproxy-1.56-nobinary.tar.gz
 Source1:        generate-tarball.sh
+Patch0:        ratproxy-report-full-path-to-image.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 
@@ -25,6 +26,7 @@ and XSS defenses, and much more.
 
 %prep
 %setup -q -n %{name}
+%patch0
 
 %build
 sed -i -e 's at -O3@-O2@' Makefile
@@ -34,7 +36,8 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/
-
+install -p ratproxy-report.sh $RPM_BUILD_ROOT/%{_bindir}/ratproxy-report
+install -Dp ratproxy-back.png $RPM_BUILD_ROOT/%{_datadir}/%{name}/images/ratproxy-back.png
 rm doc/Solaris.README
 chmod 644 doc/*
 
@@ -45,8 +48,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/%{name}
+%{_bindir}/ratproxy-report
+%{_datadir}/%{name}/*
 
 %changelog
+* Thu Aug 23 2009 Rakesh Pandit <rakesh at fedorapeople.org> - 1.58-1
+- Adjusted Steve's patch for updateing to 1.58 # 518542
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.56-3
 - rebuilt with new openssl
 



From mclasen at fedoraproject.org  Sun Aug 23 06:02:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 23 Aug 2009 06:02:15 +0000 (UTC)
Subject: rpms/gnome-games/devel mines-cosmetics.patch, NONE,
	1.1 mines-fixes.patch, NONE, 1.1 mines-keys-fix.patch, NONE,
	1.1 mines-redraw-fix.patch, NONE, 1.1 mines-sensitive-fix.patch,
	NONE, 1.1 mines-visible-fix.patch, NONE, 1.1 gnome-games.spec,
	1.227, 1.228
Message-ID: <20090823060215.B2AF011C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4008

Modified Files:
	gnome-games.spec 
Added Files:
	mines-cosmetics.patch mines-fixes.patch mines-keys-fix.patch 
	mines-redraw-fix.patch mines-sensitive-fix.patch 
	mines-visible-fix.patch 
Log Message:
fix various issues in Mines


mines-cosmetics.patch:
 gnomine.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE mines-cosmetics.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c       2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c    2009-08-23 01:42:41.527430702 -0400
@@ -865,7 +870,10 @@
   "    </menu>"
   "    <menu action='HelpMenu'>"
   "      <menuitem action='Contents'/>"
-  "      <menuitem action='About'/>" "    </menu>" "  </menubar>" "</ui>";
+  "      <menuitem action='About'/>"
+  "    </menu>"
+  "  </menubar>"
+  "</ui>";
 
 static GtkUIManager *
 create_ui_manager (const gchar * group)


mines-fixes.patch:
 gnomine.c |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE mines-fixes.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c	2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c	2009-08-23 01:42:41.527430702 -0400
@@ -290,7 +290,9 @@
   set_flabel (GTK_MINEFIELD (mfield));
 
   gtk_action_set_visible (pause_action, TRUE);
+  gtk_action_set_sensitive (pause_action, TRUE);
   gtk_action_set_visible (resume_action, FALSE);
+  gtk_action_set_sensitive (resume_action, FALSE);
   gtk_widget_hide (resume_container);
   gtk_widget_show (mfield_container);
 }
@@ -647,7 +649,7 @@
 }
 
 
-static void
+static gboolean
 pause_key_callback(GtkWidget *widget, GdkEventKey *event,
 gpointer data )
 {
@@ -658,8 +660,11 @@
       resume_game_cb(NULL, NULL); // Resume the game
     else
       pause_callback(NULL, NULL, NULL); // Pause the game
+
+    return TRUE;
   }
-			
+
+  return FALSE;
 }
 
 
@@ -865,7 +870,10 @@
   "    </menu>"
   "    <menu action='HelpMenu'>"
   "      <menuitem action='Contents'/>"
-  "      <menuitem action='About'/>" "    </menu>" "  </menubar>" "</ui>";
+  "      <menuitem action='About'/>"
+  "    </menu>"
+  "  </menubar>"
+  "</ui>";
 
 static GtkUIManager *
 create_ui_manager (const gchar * group)
@@ -1067,12 +1075,6 @@
 
   verify_ranges ();
 
-  /* This is evil, but the normal button focus indicator 
-   * interferes with the face (but we still want the button
-   * to be the default). */
-  gtk_rc_parse_string
-    ("style \"gnomine\" { GtkButton::interior-focus = 0 } class \"GtkButton\" style \"gnomine\"");
-
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), _(APP_NAME_LONG));
     
@@ -1081,7 +1083,6 @@
   games_stock_init ();
 
   gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-
   g_signal_connect (G_OBJECT (window), "delete_event",
 		    G_CALLBACK (quit_game), NULL);
   g_signal_connect (G_OBJECT (window), "focus_out_event",
@@ -1094,6 +1095,7 @@
                     G_CALLBACK (pause_key_callback), NULL); 
 
   all_boxes = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (all_boxes);
 
   gtk_container_add (GTK_CONTAINER (window), all_boxes);
 
@@ -1101,6 +1103,7 @@
   accel_group = gtk_ui_manager_get_accel_group (ui_manager);
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
   box = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
+  gtk_widget_show (box);
   gtk_box_pack_start (GTK_BOX (all_boxes), box, FALSE, FALSE, 0);
 
   button_table = gtk_table_new (1, 3, FALSE);
@@ -1189,7 +1192,8 @@
 
   new_game ();
 
-  gtk_widget_show_all (window);
+  gtk_widget_show_all (button_table);
+  gtk_widget_show (window);
 
   /* Must be after the window has been created. */
   if (xpos >= 0 && ypos >= 0)

mines-keys-fix.patch:
 gnomine.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE mines-keys-fix.patch ---
diff -up gnome-games-2.27.90/gnomine/gnomine.c.keys-fix gnome-games-2.27.90/gnomine/gnomine.c
--- gnome-games-2.27.90/gnomine/gnomine.c.keys-fix	2009-08-23 01:51:04.282681892 -0400
+++ gnome-games-2.27.90/gnomine/gnomine.c	2009-08-23 01:52:19.483680172 -0400
@@ -647,7 +647,7 @@ window_state_callback (GtkWidget * widge
 }
 
 
-static void
+static gboolean
 pause_key_callback(GtkWidget *widget, GdkEventKey *event,
 gpointer data )
 {
@@ -658,8 +658,11 @@ gpointer data )
       resume_game_cb(NULL, NULL); // Resume the game
     else
       pause_callback(NULL, NULL, NULL); // Pause the game
+
+    return TRUE;
   }
-			
+
+  return FALSE;
 }
 
 

mines-redraw-fix.patch:
 gnomine.c |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE mines-redraw-fix.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c       2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c    2009-08-23 01:42:41.527430702 -0400
@@ -1067,12 +1075,6 @@
 
   verify_ranges ();
 
-  /* This is evil, but the normal button focus indicator 
-   * interferes with the face (but we still want the button
-   * to be the default). */
-  gtk_rc_parse_string
-    ("style \"gnomine\" { GtkButton::interior-focus = 0 } class \"GtkButton\" style \"gnomine\"");
-
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), _(APP_NAME_LONG));
     

mines-sensitive-fix.patch:
 gnomine.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE mines-sensitive-fix.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c       2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c    2009-08-23 01:42:41.527430702 -0400
@@ -290,7 +290,9 @@
   set_flabel (GTK_MINEFIELD (mfield));
 
   gtk_action_set_visible (pause_action, TRUE);
+  gtk_action_set_sensitive (pause_action, TRUE);
   gtk_action_set_visible (resume_action, FALSE);
+  gtk_action_set_sensitive (resume_action, FALSE);
   gtk_widget_hide (resume_container);
   gtk_widget_show (mfield_container);
 }


mines-visible-fix.patch:
 gnomine.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE mines-visible-fix.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c       2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c    2009-08-23 01:42:41.527430702 -0400
@@ -1094,6 +1095,7 @@
                     G_CALLBACK (pause_key_callback), NULL); 
 
   all_boxes = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (all_boxes);
 
   gtk_container_add (GTK_CONTAINER (window), all_boxes);
 
@@ -1101,6 +1103,7 @@
   accel_group = gtk_ui_manager_get_accel_group (ui_manager);
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
   box = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
+  gtk_widget_show (box);
   gtk_box_pack_start (GTK_BOX (all_boxes), box, FALSE, FALSE, 0);
 
   button_table = gtk_table_new (1, 3, FALSE);
@@ -1189,7 +1192,8 @@
 
   new_game ();
 
-  gtk_widget_show_all (window);
+  gtk_widget_show_all (button_table);
+  gtk_widget_show (window);
 
   /* Must be after the window has been created. */
   if (xpos >= 0 && ypos >= 0)



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- gnome-games.spec	14 Aug 2009 23:05:14 -0000	1.227
+++ gnome-games.spec	23 Aug 2009 06:02:13 -0000	1.228
@@ -46,7 +46,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -55,6 +55,17 @@ Source: http://download.gnome.org/source
 Patch0: ggz-api-changes.patch
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592774
+Patch2: mines-visible-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=574118
+Patch3: mines-redraw-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592775
+Patch4: mines-cosmetics.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592776
+Patch5: mines-keys-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592777
+Patch6: mines-sensitive-fix.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-games-devel
 URL: http://projects.gnome.org/gnome-games/
@@ -133,6 +144,12 @@ This package contains user documentation
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
 
+%patch2 -p1 -b .visible-fix
+%patch3 -p1 -b .redraw-fix
+%patch4 -p1 -b .cosmetics
+%patch5 -p1 -b .keys-fix
+%patch6 -p1 -b .sensitive-fix
+
 sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
   -e 's/GNOMEtris/GnomeFallingBlocks/g' \
   po/*.po gnometris/help/*/*.po gnometris/help/C/gnometris.xml \
@@ -485,6 +502,9 @@ fi
 
 
 %changelog
+* Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
+- Fix various issues in Mines
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
 - Updated to 2.27.90
 



From mclasen at fedoraproject.org  Sun Aug 23 06:30:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 23 Aug 2009 06:30:52 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.476,1.477
Message-ID: <20090823063052.7147E11C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8070

Modified Files:
	control-center.spec 
Log Message:
unapplied patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- control-center.spec	21 Aug 2009 22:47:27 -0000	1.476
+++ control-center.spec	23 Aug 2009 06:30:50 -0000	1.477
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -193,6 +193,7 @@ utilities.
 %patch50 -p1 -b .slideshow-ui
 %patch55 -p1 -b .unique-ids
 %patch56 -p1 -b .rotate
+%patch57 -p1 -b .font-viewer-icon
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -372,6 +373,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-5
+- Apply the patch...
+
 * Fri Aug 21 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-4
 - Fix the font-viewer icon
 



From rakesh at fedoraproject.org  Sun Aug 23 07:08:55 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 23 Aug 2009 07:08:55 +0000 (UTC)
Subject: rpms/examiner/F-11 examiner-0.5-examiner_hashes_pl.patch, NONE,
	1.1 examiner.spec, 1.3, 1.4 import.log, 1.1, 1.2
Message-ID: <20090823070855.CD6A411C00A2@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/examiner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12898/F-11

Modified Files:
	examiner.spec import.log 
Added Files:
	examiner-0.5-examiner_hashes_pl.patch 
Log Message:
Fixed #515452


examiner-0.5-examiner_hashes_pl.patch:
 examiner_hashes.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE examiner-0.5-examiner_hashes_pl.patch ---
--- examiner-0.5.org/os/linux/examiner_hashes.pl	2009-08-23 12:30:17.119579762 +0530
+++ examiner-0.5/os/linux/examiner_hashes.pl	2009-08-23 12:34:22.883579938 +0530
@@ -1,6 +1,6 @@
 $loaded_library=1;
 
-syscalls = (
+$syscalls = (
 	1 => "exit",
 	2 => "fork",
 	3 => "read",
@@ -240,7 +240,7 @@
 	237 => "fremovexattr",
 );
 
-socketcall = (
+$socketcall = (
 	1 => "SOCKET",
 	2 => "BIND",
 	3 => "CONNECT",


Index: examiner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/F-11/examiner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- examiner.spec	24 Feb 2009 15:48:57 -0000	1.3
+++ examiner.spec	23 Aug 2009 07:08:54 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           examiner
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utility to disassemble and comment foreign executable binaries 
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.academicunderground.org/%{name}/
 Source0:        http://www.academicunderground.org/examiner/%{name}-%{version}.tar.gz
+Patch0:         examiner-0.5-examiner_hashes_pl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl
@@ -24,6 +25,7 @@ not analyze live running code.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 # empty build
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.5-5
+- Applied  examiner-0.5-examiner_hashes_pl.patch #515452
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Dec 2008 16:06:18 -0000	1.1
+++ import.log	23 Aug 2009 07:08:54 -0000	1.2
@@ -1 +1,2 @@
 examiner-0_5-2_fc9:HEAD:examiner-0.5-2.fc9.src.rpm:1228881614
+examiner-0_5-5_fc11:F-11:examiner-0.5-5.fc11.src.rpm:1251011636



From rakesh at fedoraproject.org  Sun Aug 23 07:13:45 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 23 Aug 2009 07:13:45 +0000 (UTC)
Subject: rpms/examiner/devel examiner-0.5-examiner_hashes_pl.patch, NONE,
	1.1 examiner.spec, 1.4, 1.5 import.log, 1.1, 1.2
Message-ID: <20090823071345.7ED8911C00A2@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/examiner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13864/devel

Modified Files:
	examiner.spec import.log 
Added Files:
	examiner-0.5-examiner_hashes_pl.patch 
Log Message:
Fixed #515452


examiner-0.5-examiner_hashes_pl.patch:
 examiner_hashes.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE examiner-0.5-examiner_hashes_pl.patch ---
--- examiner-0.5.org/os/linux/examiner_hashes.pl	2009-08-23 12:30:17.119579762 +0530
+++ examiner-0.5/os/linux/examiner_hashes.pl	2009-08-23 12:34:22.883579938 +0530
@@ -1,6 +1,6 @@
 $loaded_library=1;
 
-syscalls = (
+$syscalls = (
 	1 => "exit",
 	2 => "fork",
 	3 => "read",
@@ -240,7 +240,7 @@
 	237 => "fremovexattr",
 );
 
-socketcall = (
+$socketcall = (
 	1 => "SOCKET",
 	2 => "BIND",
 	3 => "CONNECT",


Index: examiner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/devel/examiner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- examiner.spec	24 Jul 2009 22:24:57 -0000	1.4
+++ examiner.spec	23 Aug 2009 07:13:44 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           examiner
 Version:        0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utility to disassemble and comment foreign executable binaries 
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.academicunderground.org/%{name}/
 Source0:        http://www.academicunderground.org/examiner/%{name}-%{version}.tar.gz
+Patch0:         examiner-0.5-examiner_hashes_pl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl
@@ -24,6 +25,7 @@ not analyze live running code.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 # empty build
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.5-6
+- Applied  examiner-0.5-examiner_hashes_pl.patch #515452
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Dec 2008 16:06:18 -0000	1.1
+++ import.log	23 Aug 2009 07:13:44 -0000	1.2
@@ -1 +1,2 @@
 examiner-0_5-2_fc9:HEAD:examiner-0.5-2.fc9.src.rpm:1228881614
+examiner-0_5-6_fc11:HEAD:examiner-0.5-6.fc11.src.rpm:1251011846



From pingou at fedoraproject.org  Sun Aug 23 07:49:52 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun, 23 Aug 2009 07:49:52 +0000 (UTC)
Subject: rpms/R-Biostrings/F-11 R-Biostrings.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090823074952.2B55011C00A2@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18387/F-11

Modified Files:
	R-Biostrings.spec sources 
Log Message:
Update to 2.12.8


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/R-Biostrings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-Biostrings.spec	13 Jul 2009 06:42:50 -0000	1.4
+++ R-Biostrings.spec	23 Aug 2009 07:49:51 -0000	1.5
@@ -3,7 +3,7 @@
 %global Rvers     2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.7
+Version:          2.12.8
 Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
@@ -92,6 +92,12 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Sun Aug 23 2009 pingou <pingou at pingoured.fr> 2.12.8-1
+- Update to 2.12.8
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 13 2009 pingou <pingou at pingoured.fr> 2.12.7-1
 - Update to 2.12.7
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jul 2009 06:42:50 -0000	1.4
+++ sources	23 Aug 2009 07:49:51 -0000	1.5
@@ -1 +1 @@
-6f3290160c40b098ae187af3bc795594  Biostrings_2.12.7.tar.gz
+c259e4549febc5509f7ce4907953c992  Biostrings_2.12.8.tar.gz



From pingou at fedoraproject.org  Sun Aug 23 07:49:52 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun, 23 Aug 2009 07:49:52 +0000 (UTC)
Subject: rpms/R-Biostrings/F-10 R-Biostrings.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090823074952.2BFA011C00EF@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18387/F-10

Modified Files:
	R-Biostrings.spec sources 
Log Message:
Update to 2.12.8


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-10/R-Biostrings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-Biostrings.spec	13 Jul 2009 06:42:49 -0000	1.4
+++ R-Biostrings.spec	23 Aug 2009 07:49:50 -0000	1.5
@@ -3,7 +3,7 @@
 %global Rvers     2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.7
+Version:          2.12.8
 Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
@@ -92,6 +92,12 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Sun Aug 23 2009 pingou <pingou at pingoured.fr> 2.12.8-1
+- Update to 2.12.8
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 13 2009 pingou <pingou at pingoured.fr> 2.12.7-1
 - Update to 2.12.7
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jul 2009 06:42:50 -0000	1.4
+++ sources	23 Aug 2009 07:49:50 -0000	1.5
@@ -1 +1 @@
-6f3290160c40b098ae187af3bc795594  Biostrings_2.12.7.tar.gz
+c259e4549febc5509f7ce4907953c992  Biostrings_2.12.8.tar.gz



From pingou at fedoraproject.org  Sun Aug 23 07:49:52 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun, 23 Aug 2009 07:49:52 +0000 (UTC)
Subject: rpms/R-Biostrings/devel .cvsignore, 1.4, 1.5 R-Biostrings.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090823074952.2ECA411C0417@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biostrings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18387/devel

Modified Files:
	.cvsignore R-Biostrings.spec sources 
Log Message:
Update to 2.12.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Jul 2009 06:32:16 -0000	1.4
+++ .cvsignore	23 Aug 2009 07:49:51 -0000	1.5
@@ -1 +1 @@
-Biostrings_2.12.7.tar.gz
+Biostrings_2.12.8.tar.gz


Index: R-Biostrings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/R-Biostrings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-Biostrings.spec	24 Jul 2009 16:07:41 -0000	1.5
+++ R-Biostrings.spec	23 Aug 2009 07:49:51 -0000	1.6
@@ -3,8 +3,8 @@
 %global Rvers     2.9.0
 
 Name:             R-%{packname}
-Version:          2.12.7
-Release:          2%{?dist}
+Version:          2.12.8
+Release:          1%{?dist}
 Summary:          String objects representing biological sequences
 
 Group:            Applications/Engineering 
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/include
 
 %changelog
+* Sun Aug 23 2009 pingou <pingou at pingoured.fr> 2.12.8-1
+- Update to 2.12.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biostrings/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Jul 2009 06:32:16 -0000	1.4
+++ sources	23 Aug 2009 07:49:51 -0000	1.5
@@ -1 +1 @@
-6f3290160c40b098ae187af3bc795594  Biostrings_2.12.7.tar.gz
+c259e4549febc5509f7ce4907953c992  Biostrings_2.12.8.tar.gz



From lucilanga at fedoraproject.org  Sun Aug 23 08:52:05 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 23 Aug 2009 08:52:05 +0000 (UTC)
Subject: rpms/hamlib/devel hamlib-1.2.9-bindings.patch, 1.1, 1.2 hamlib.spec,
	1.40, 1.41
Message-ID: <20090823085205.81C1111C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26881

Modified Files:
	hamlib-1.2.9-bindings.patch hamlib.spec 
Log Message:
update patch

hamlib-1.2.9-bindings.patch:
 Makefile.am |    8 ++++----
 Makefile.in |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: hamlib-1.2.9-bindings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib-1.2.9-bindings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hamlib-1.2.9-bindings.patch	22 Aug 2009 11:14:47 -0000	1.1
+++ hamlib-1.2.9-bindings.patch	23 Aug 2009 08:52:03 -0000	1.2
@@ -24,7 +24,7 @@ diff -Naur hamlib-1.2.9/bindings/Makefil
  			OBJECT="hamlibperl_wrap.o" \
  			VERSION="$(PACKAGE_VERSION)" \
 -			LIBS="-L$(top_builddir)/src/.libs -lhamlib"
-+			LIBS="-L$(top_builddir)/src/.libs -lhamlib INSTALLDIRS=vendor"
++			LIBS="-L$(top_builddir)/src/.libs -lhamlib" INSTALLDIRS=vendor
  	sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
  	mv Hamlib-pl-norpath.mk Hamlib-pl.mk
  
@@ -45,7 +45,7 @@ diff -Naur hamlib-1.2.9/bindings/Makefil
  			OBJECT="hamlibperl_wrap.o" \
  			VERSION="$(PACKAGE_VERSION)" \
 -			LIBS="-L$(top_builddir)/src/.libs -lhamlib"
-+			LIBS="-L$(top_builddir)/src/.libs -lhamlib INSTALLDIRS=vendor"
++			LIBS="-L$(top_builddir)/src/.libs -lhamlib" INSTALLDIRS=vendor
  	sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
  	mv Hamlib-pl-norpath.mk Hamlib-pl.mk
  


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- hamlib.spec	22 Aug 2009 11:04:07 -0000	1.40
+++ hamlib.spec	23 Aug 2009 08:52:03 -0000	1.41
@@ -149,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, - )
 %doc AUTHORS ChangeLog PLAN COPYING.LIB COPYING README THANKS TODO
 %{_bindir}/*
 %{_sbindir}/*
@@ -158,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README.developer
 %{_libdir}/libhamlib.so
 %{_datadir}/aclocal/hamlib.m4
@@ -174,24 +174,24 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}
 
 %files c++
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{_libdir}/libhamlib++.so.*
 
 %files c++-devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{_libdir}/libhamlib++.so
 %{_includedir}/hamlib/rigclass.h
 %{_includedir}/hamlib/rotclass.h
 
 %files perl
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{perl_vendorarch}/*
 
 %files python
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{python_sitelib}/*.py*
 %{python_sitelib}/_Hamlib.so
@@ -203,7 +203,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
-* Wed Aug 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
+* Wed Aug 23 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
+- misc cleanups
 - patch0 update
 - new upstream release
 



From jorton at fedoraproject.org  Sun Aug 23 08:54:49 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 23 Aug 2009 08:54:49 +0000 (UTC)
Subject: rpms/subversion/devel .cvsignore, 1.35, 1.36 sources, 1.42,
	1.43 subversion.spec, 1.150, 1.151 upstream, 1.28, 1.29
Message-ID: <20090823085449.B221F11C00A2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27316

Modified Files:
	.cvsignore sources subversion.spec upstream 
Log Message:
* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
- update to 1.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	12 Aug 2009 15:57:35 -0000	1.35
+++ .cvsignore	23 Aug 2009 08:54:49 -0000	1.36
@@ -1 +1 @@
-subversion-1.6.4.tar.bz2
+subversion-1.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	12 Aug 2009 15:57:35 -0000	1.42
+++ sources	23 Aug 2009 08:54:49 -0000	1.43
@@ -1 +1 @@
-11e3fa838c9a558cadc378f2807572e2  subversion-1.6.4.tar.bz2
+1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- subversion.spec	18 Aug 2009 09:36:04 -0000	1.150
+++ subversion.spec	23 Aug 2009 08:54:49 -0000	1.151
@@ -14,8 +14,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.4
-Release: 4%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -238,6 +238,7 @@ sed -i "/^dependency_libs/{
 export LANG=C LC_ALL=C
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
+export LIBC_FATAL_STDERR_=1
 make check check-swig-pl check-swig-py CLEANUP=yes
 # check-swig-rb omitted: it runs svnserve
 %endif
@@ -326,6 +327,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
+- update to 1.6.5
+
 * Tue Aug 18 2009 Joe Orton <jorton at redhat.com> 1.6.4-4
 - rebuild
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- upstream	12 Aug 2009 15:57:36 -0000	1.28
+++ upstream	23 Aug 2009 08:54:49 -0000	1.29
@@ -1 +1 @@
-subversion-1.6.4.tar.bz2
+subversion-1.6.5.tar.bz2



From jorton at fedoraproject.org  Sun Aug 23 08:55:13 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 23 Aug 2009 08:55:13 +0000 (UTC)
Subject: rpms/subversion/F-11 sources,1.40,1.41 subversion.spec,1.143,1.144
Message-ID: <20090823085513.3011E11C00A2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27462

Modified Files:
	sources subversion.spec 
Log Message:
* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
- update to 1.6.5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	7 Aug 2009 07:35:01 -0000	1.40
+++ sources	23 Aug 2009 08:55:12 -0000	1.41
@@ -1 +1 @@
-9649be6c47b7d915dce75a1198900c25  subversion-1.6.4.tar.gz
+1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/subversion.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- subversion.spec	7 Aug 2009 07:35:01 -0000	1.143
+++ subversion.spec	23 Aug 2009 08:55:12 -0000	1.144
@@ -14,8 +14,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.4
-Release: 2%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -325,6 +325,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
+- update to 1.6.5
+
 * Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
 - update to 1.6.4
 



From jorton at fedoraproject.org  Sun Aug 23 08:59:46 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 23 Aug 2009 08:59:46 +0000 (UTC)
Subject: rpms/subversion/F-11 subversion.spec,1.144,1.145
Message-ID: <20090823085946.540F611C00A2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28041

Modified Files:
	subversion.spec 
Log Message:
-fix build


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-11/subversion.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- subversion.spec	23 Aug 2009 08:55:12 -0000	1.144
+++ subversion.spec	23 Aug 2009 08:59:46 -0000	1.145
@@ -19,7 +19,7 @@ Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
-Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz
+Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.bz2
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el



From jorton at fedoraproject.org  Sun Aug 23 09:02:14 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 23 Aug 2009 09:02:14 +0000 (UTC)
Subject: rpms/subversion/F-10 sources,1.37,1.38 subversion.spec,1.130,1.131
Message-ID: <20090823090214.9009C11C00A2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28491

Modified Files:
	sources subversion.spec 
Log Message:
* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
- update to 1.6.5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	7 Aug 2009 07:42:00 -0000	1.37
+++ sources	23 Aug 2009 09:02:14 -0000	1.38
@@ -1 +1 @@
-9649be6c47b7d915dce75a1198900c25  subversion-1.6.4.tar.gz
+1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/subversion.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- subversion.spec	7 Aug 2009 07:42:00 -0000	1.130
+++ subversion.spec	23 Aug 2009 09:02:14 -0000	1.131
@@ -14,12 +14,12 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.6.4
-Release: 2%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
-Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz
+Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.bz2
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
@@ -286,6 +286,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1
+- update to 1.6.5
+
 * Fri Aug  7 2009 Joe Orton <jorton at redhat.com> 1.6.4-2
 - update to 1.6.4
 



From llaumgui at fedoraproject.org  Sun Aug 23 09:12:55 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sun, 23 Aug 2009 09:12:55 +0000 (UTC)
Subject: rpms/php-ezc-AuthenticationDatabaseTiein/devel Makefile, NONE,
	1.1 import.log, NONE,
	1.1 php-ezc-AuthenticationDatabaseTiein.spec, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090823091255.1ACE911C00A2@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-AuthenticationDatabaseTiein/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29884/devel

Added Files:
	Makefile import.log php-ezc-AuthenticationDatabaseTiein.spec 
	sources 
Log Message:
Initial build



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---
php-ezc-AuthenticationDatabaseTiein-1_1-1_fc11:HEAD:php-ezc-AuthenticationDatabaseTiein-1.1-1.fc11.src.rpm:1251018708


--- NEW FILE php-ezc-AuthenticationDatabaseTiein.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name AuthenticationDatabaseTiein
%define channel components.ez.no

Name:           php-ezc-AuthenticationDatabaseTiein
Version:        1.1
Release:        1%{?dist}
Summary:        Provides a Database filter for the Authentication component

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Authentication) >= 1.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.

AuthenticationDatabaseTiein provides a Database filter for the Authentication
component by using the Database component, and an implementation of a database
store (backend) for OpenID authentication.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_database_autoload.php
%{pear_phpdir}/ezc/autoload/authentication_openid_autoload.php


%changelog
* Wed Jul 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1-1
- Initial packaging


--- NEW FILE sources ---
cdb0498c0dbb203ddb8cd1c2dace21b2  AuthenticationDatabaseTiein-1.1.tgz



From llaumgui at fedoraproject.org  Sun Aug 23 09:13:16 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sun, 23 Aug 2009 09:13:16 +0000 (UTC)
Subject: rpms/php-ezc-AuthenticationDatabaseTiein/F-10 Makefile, NONE,
	1.1 import.log, NONE,
	1.1 php-ezc-AuthenticationDatabaseTiein.spec, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090823091316.5B66611C00A2@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-AuthenticationDatabaseTiein/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30294/F-10

Added Files:
	Makefile import.log php-ezc-AuthenticationDatabaseTiein.spec 
	sources 
Log Message:
Initial build



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---
php-ezc-AuthenticationDatabaseTiein-1_1-1_fc11:F-10:php-ezc-AuthenticationDatabaseTiein-1.1-1.fc11.src.rpm:1251018761


--- NEW FILE php-ezc-AuthenticationDatabaseTiein.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name AuthenticationDatabaseTiein
%define channel components.ez.no

Name:           php-ezc-AuthenticationDatabaseTiein
Version:        1.1
Release:        1%{?dist}
Summary:        Provides a Database filter for the Authentication component

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Authentication) >= 1.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.

AuthenticationDatabaseTiein provides a Database filter for the Authentication
component by using the Database component, and an implementation of a database
store (backend) for OpenID authentication.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_database_autoload.php
%{pear_phpdir}/ezc/autoload/authentication_openid_autoload.php


%changelog
* Wed Jul 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1-1
- Initial packaging


--- NEW FILE sources ---
cdb0498c0dbb203ddb8cd1c2dace21b2  AuthenticationDatabaseTiein-1.1.tgz



From llaumgui at fedoraproject.org  Sun Aug 23 09:13:20 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sun, 23 Aug 2009 09:13:20 +0000 (UTC)
Subject: rpms/php-ezc-AuthenticationDatabaseTiein/F-11 Makefile, NONE,
	1.1 import.log, NONE,
	1.1 php-ezc-AuthenticationDatabaseTiein.spec, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090823091320.A5BB811C00A2@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-AuthenticationDatabaseTiein/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30496/F-11

Added Files:
	Makefile import.log php-ezc-AuthenticationDatabaseTiein.spec 
	sources 
Log Message:
Initial build



***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE import.log ---
php-ezc-AuthenticationDatabaseTiein-1_1-1_fc11:F-11:php-ezc-AuthenticationDatabaseTiein-1.1-1.fc11.src.rpm:1251018776


--- NEW FILE php-ezc-AuthenticationDatabaseTiein.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name AuthenticationDatabaseTiein
%define channel components.ez.no

Name:           php-ezc-AuthenticationDatabaseTiein
Version:        1.1
Release:        1%{?dist}
Summary:        Provides a Database filter for the Authentication component

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.2.1
Requires:       php-bcmath
Requires:       php-ldap
Requires:       php-pear(%{channel}/Authentication) >= 1.1
Requires:       php-pear(%{channel}/Database) >= 1.3
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
The purpose of the Authentication component is to provide support for different
means of identification and authentication of users using different providers
and protocols.

AuthenticationDatabaseTiein provides a Database filter for the Authentication
component by using the Database component, and an implementation of a database
store (backend) for OpenID authentication.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/authentication_database_autoload.php
%{pear_phpdir}/ezc/autoload/authentication_openid_autoload.php


%changelog
* Wed Jul 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1-1
- Initial packaging


--- NEW FILE sources ---
cdb0498c0dbb203ddb8cd1c2dace21b2  AuthenticationDatabaseTiein-1.1.tgz



From llaumgui at fedoraproject.org  Sun Aug 23 09:24:22 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sun, 23 Aug 2009 09:24:22 +0000 (UTC)
Subject: rpms/php-ezc-Feed/devel import.log, NONE, 1.1 php-ezc-Feed.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090823092422.A3B8411C00A2@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Feed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32260/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Feed.spec 
Log Message:
Initial build



--- NEW FILE import.log ---
php-ezc-Feed-1_2_1-1_fc11:HEAD:php-ezc-Feed-1.2.1-1.fc11.src.rpm:1251019437


--- NEW FILE php-ezc-Feed.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Feed
%define channel components.ez.no

Name:           php-ezc-Feed
Version:        1.2.1
Release:        1%{?dist}
Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component handles parsing and creating RSS1, RSS2 and ATOM feeds, with
support for different feed modules (dc, content, creativeCommons, geo, iTunes).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/feed_autoload.php


%changelog
* Tue Jul 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:05 -0000	1.1
+++ .cvsignore	23 Aug 2009 09:24:22 -0000	1.2
@@ -0,0 +1 @@
+Feed-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:05 -0000	1.1
+++ sources	23 Aug 2009 09:24:22 -0000	1.2
@@ -0,0 +1 @@
+1e707631a20b2a393c87d594a89dd685  Feed-1.2.1.tgz



From llaumgui at fedoraproject.org  Sun Aug 23 09:24:31 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sun, 23 Aug 2009 09:24:31 +0000 (UTC)
Subject: rpms/php-ezc-Feed/F-11 import.log, NONE, 1.1 php-ezc-Feed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090823092431.184FB11C00A2@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Feed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Feed.spec 
Log Message:
Initial build



--- NEW FILE import.log ---
php-ezc-Feed-1_2_1-1_fc11:F-11:php-ezc-Feed-1.2.1-1.fc11.src.rpm:1251019446


--- NEW FILE php-ezc-Feed.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Feed
%define channel components.ez.no

Name:           php-ezc-Feed
Version:        1.2.1
Release:        1%{?dist}
Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component handles parsing and creating RSS1, RSS2 and ATOM feeds, with
support for different feed modules (dc, content, creativeCommons, geo, iTunes).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/feed_autoload.php


%changelog
* Tue Jul 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:05 -0000	1.1
+++ .cvsignore	23 Aug 2009 09:24:30 -0000	1.2
@@ -0,0 +1 @@
+Feed-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:05 -0000	1.1
+++ sources	23 Aug 2009 09:24:30 -0000	1.2
@@ -0,0 +1 @@
+1e707631a20b2a393c87d594a89dd685  Feed-1.2.1.tgz



From llaumgui at fedoraproject.org  Sun Aug 23 09:24:49 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Sun, 23 Aug 2009 09:24:49 +0000 (UTC)
Subject: rpms/php-ezc-Feed/F-10 import.log, NONE, 1.1 php-ezc-Feed.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090823092449.291C311C00A2@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Feed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32487/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-ezc-Feed.spec 
Log Message:
Initial build



--- NEW FILE import.log ---
php-ezc-Feed-1_2_1-1_fc11:F-10:php-ezc-Feed-1.2.1-1.fc11.src.rpm:1251019461


--- NEW FILE php-ezc-Feed.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Feed
%define channel components.ez.no

Name:           php-ezc-Feed
Version:        1.2.1
Release:        1%{?dist}
Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds

Group:          Development/Libraries
License:        BSD
URL:            http://ezcomponents.org/
Source0:        http://components.ez.no/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  php-pear >= 1:1.4.9-1.2
BuildRequires:  php-channel(%{channel})
Requires:       php-common >= 5.1.1
Requires:       php-pear(%{channel}/Base) >= 1.6.1
Requires(post): %{__pear}
Requires(postun): %{__pear}

Provides:       php-pear(%{channel}/%{pear_name}) = %{version}


%description
This component handles parsing and creating RSS1, RSS2 and ATOM feeds, with
support for different feed modules (dc, content, creativeCommons, geo, iTunes).


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml

# Move documentation
mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
rm -rf %{buildroot}%{pear_docdir}

# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*

# Install XML package description
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}


%clean
rm -rf %{buildroot}


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{name}.xml >/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{channel}/%{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/data/%{pear_name}
%{pear_phpdir}/ezc/%{pear_name}
%{pear_phpdir}/ezc/autoload/feed_autoload.php


%changelog
* Tue Jul 14 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.2.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	14 Aug 2009 16:14:05 -0000	1.1
+++ .cvsignore	23 Aug 2009 09:24:49 -0000	1.2
@@ -0,0 +1 @@
+Feed-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Feed/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	14 Aug 2009 16:14:05 -0000	1.1
+++ sources	23 Aug 2009 09:24:49 -0000	1.2
@@ -0,0 +1 @@
+1e707631a20b2a393c87d594a89dd685  Feed-1.2.1.tgz



From jorton at fedoraproject.org  Sun Aug 23 10:11:04 2009
From: jorton at fedoraproject.org (jorton)
Date: Sun, 23 Aug 2009 10:11:04 +0000 (UTC)
Subject: rpms/httpd/F-10 httpd.logrotate, 1.3, 1.4 httpd.spec, 1.128,
	1.129 sources, 1.20, 1.21
Message-ID: <20090823101104.80C6311C00A2@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5508

Modified Files:
	httpd.logrotate httpd.spec sources 
Log Message:
* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
- update to 2.2.13
- add delaycompress to logrotate config



Index: httpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-10/httpd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- httpd.logrotate	18 Nov 2004 11:59:52 -0000	1.3
+++ httpd.logrotate	23 Aug 2009 10:11:04 -0000	1.4
@@ -2,6 +2,7 @@
     missingok
     notifempty
     sharedscripts
+    delaycompress
     postrotate
 	/bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
     endscript


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-10/httpd.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- httpd.spec	6 Mar 2009 14:04:40 -0000	1.128
+++ httpd.spec	23 Aug 2009 10:11:04 -0000	1.129
@@ -8,8 +8,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.11
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -39,7 +39,6 @@ Patch25: httpd-2.0.54-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
-Patch55: httpd-2.2.4-oldflush.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -127,7 +126,6 @@ Security (TLS) protocols.
 %patch26 -p1 -b .suenable
 
 %patch54 -p1 -b .authnoprov
-%patch55 -p1 -b .oldflush
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -482,6 +480,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 2.2.13-1
+- update to 2.2.13
+- add delaycompress to logrotate config
+
 * Mon Feb  9 2009 Joe Orton <jorton at redhat.com> 2.2.11-2
 - update to 2.2.11 (#482960)
 - Require apr-util-ldap (#471898)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/httpd/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Mar 2009 14:04:40 -0000	1.20
+++ sources	23 Aug 2009 10:11:04 -0000	1.21
@@ -1 +1 @@
-03e0a99a5de0f3f568a0087fb9993af9  httpd-2.2.11.tar.gz
+2803e35be6650f5b739e6e91faa824dd  httpd-2.2.13.tar.gz



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:16 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112916.8EA7110F87B@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora devel was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:17 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112917.135E310F881@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora 6 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:19 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112919.50E3E10F88C@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora 7 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:21 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112921.1AA1410F894@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:22 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112923.1E2D010F86F@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora 8 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:24 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112924.2D49910F899@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora 9 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:25 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112925.C852510F89B@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora 10 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:27 +0000
Subject: [pkgdb] avarice ownership updated
Message-ID: <20090823112927.2D47210F878@bastion2.fedora.phx.redhat.com>

Package avarice in Fedora 11 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:55 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823112955.9BA6710F86F@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora devel was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:56 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823112956.A018610F87C@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:59 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823112959.C294810F88C@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 5 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:29:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:29:58 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823112958.3B0CE10F884@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 7 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:01 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823113001.462CB10F89F@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 6 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:02 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823113002.8D1AE10F894@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 8 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:05 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823113005.812BC10F879@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 10 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:03 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823113003.C805F10F89A@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 9 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:24 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113024.CB72A10F86F@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora devel was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:06 +0000
Subject: [pkgdb] avrdude ownership updated
Message-ID: <20090823113006.A541310F878@bastion2.fedora.phx.redhat.com>

Package avrdude in Fedora 11 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:30 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113030.2374710F88B@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:33 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113033.7D89810F8A2@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 8 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:34 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113034.4D14F10F895@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 6 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:34 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113034.AE56810F890@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 7 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:34 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113034.DA63F10F8A8@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 9 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:35 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113035.38C2C10F8AA@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 10 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:30:36 +0000
Subject: [pkgdb] libopenraw ownership updated
Message-ID: <20090823113036.7480B10F894@bastion2.fedora.phx.redhat.com>

Package libopenraw in Fedora 11 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopenraw



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:07 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113107.92BEC10F810@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora devel was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:08 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113109.0189210F877@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:11 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113111.7A66110F899@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora 6 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:12 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113112.EB41A10F89B@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora 7 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:12 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113113.1001210F8A1@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora 8 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:17 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113117.6D09110F88B@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora 10 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:18 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113118.D5EA610F88C@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora 9 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:21 +0000
Subject: [pkgdb] nautilus-python ownership updated
Message-ID: <20090823113122.10F2810F8A3@bastion2.fedora.phx.redhat.com>

Package nautilus-python in Fedora 11 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/nautilus-python



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:37 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113138.03C3110F8A5@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora devel was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:40 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113140.AEE8B10F8B7@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora 6 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:39 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113139.F258D10F8A9@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora 7 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:40 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113140.BF6E210F8B8@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora EPEL 5 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:44 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113144.2886310F894@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora 9 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:45 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113145.7E23410F8C1@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora 8 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:46 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113146.2228710F8AF@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora 11 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From pkgdb at fedoraproject.org  Sun Aug 23 11:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 11:31:46 +0000
Subject: [pkgdb] uisp ownership updated
Message-ID: <20090823113146.408C810F8C4@bastion2.fedora.phx.redhat.com>

Package uisp in Fedora 10 was orphaned by trondd

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/uisp



From abompard at fedoraproject.org  Sun Aug 23 11:35:22 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 11:35:22 +0000 (UTC)
Subject: rpms/spring/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 spring.spec,
	1.3, 1.4
Message-ID: <20090823113522.5851911C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16917/F-10

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
- New release: 0.80.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jul 2009 21:40:23 -0000	1.3
+++ .cvsignore	23 Aug 2009 11:35:21 -0000	1.4
@@ -1 +1 @@
-spring_0.79.1.2_src.tar.gz
+spring_0.80.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jul 2009 21:40:23 -0000	1.3
+++ sources	23 Aug 2009 11:35:22 -0000	1.4
@@ -1 +1 @@
-408b0359a43ae2a34798a6f41fe6f82a  spring_0.79.1.2_src.tar.gz
+d01e9f54e32fb61a4fee7d655e7f87f4  spring_0.80.2_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/spring.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- spring.spec	18 Jul 2009 21:40:23 -0000	1.3
+++ spring.spec	23 Aug 2009 11:35:22 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.79.1.2
+Version:        0.80.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -13,17 +13,18 @@ Group:          Amusements/Games
 License:        GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
 
 URL:            http://springrts.com
-Source0:        http://springrts.com/dl/spring_%{version}_src.tar.gz
+Source0:        http://springrts.com/dl/spring_%{version}_src.tar.lzma
 Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
-Patch0:         spring-0.79.1.2-allegro.patch
+Patch0:         spring-0.80.2-allegro.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake SDL-devel openal-devel boost-devel DevIL-devel
-BuildRequires:  glew-devel libvorbis-devel java-devel DevIL-ILUT-devel
+BuildRequires:  glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:  freetype-devel python-devel allegro-devel zip
+BuildRequires:  java-devel-openjdk
 BuildRequires:  desktop-file-utils
 
 Requires:       spring-lobby spring-installer spring-maps-default
@@ -54,7 +55,7 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
-chmod -x rts/lib/7zip/*
+find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
@@ -134,6 +135,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
+- New release: 0.80.2
+
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.79.1.2-4
+- Use lzma compressed upstream tarball.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.79.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 19 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.79.1.2-2
+- use OpenJDK's version of Java
+
 * Sat Jul 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.79.1.2-1
 - version 0.79.1.2
 - remove obsolete fonts hack



From abompard at fedoraproject.org  Sun Aug 23 11:35:22 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 11:35:22 +0000 (UTC)
Subject: rpms/spring/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 spring.spec,
	1.4, 1.5
Message-ID: <20090823113522.9DB5211C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16917/F-11

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
- New release: 0.80.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jul 2009 21:40:24 -0000	1.3
+++ .cvsignore	23 Aug 2009 11:35:22 -0000	1.4
@@ -1 +1 @@
-spring_0.79.1.2_src.tar.gz
+spring_0.80.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jul 2009 21:40:24 -0000	1.3
+++ sources	23 Aug 2009 11:35:22 -0000	1.4
@@ -1 +1 @@
-408b0359a43ae2a34798a6f41fe6f82a  spring_0.79.1.2_src.tar.gz
+d01e9f54e32fb61a4fee7d655e7f87f4  spring_0.80.2_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- spring.spec	19 Jul 2009 06:59:18 -0000	1.4
+++ spring.spec	23 Aug 2009 11:35:22 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           spring
-Version:        0.79.1.2
-Release:        2%{?dist}
+Version:        0.80.2
+Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
 Group:          Amusements/Games
@@ -13,11 +13,11 @@ Group:          Amusements/Games
 License:        GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
 
 URL:            http://springrts.com
-Source0:        http://springrts.com/dl/spring_%{version}_src.tar.gz
+Source0:        http://springrts.com/dl/spring_%{version}_src.tar.lzma
 Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
-Patch0:         spring-0.79.1.2-allegro.patch
+Patch0:         spring-0.80.2-allegro.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,7 +55,7 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
-chmod -x rts/lib/7zip/*
+find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
@@ -135,6 +135,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
+- New release: 0.80.2
+
+* Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.79.1.2-4
+- Use lzma compressed upstream tarball.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.79.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 19 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.79.1.2-2
 - use OpenJDK's version of Java
 



From abompard at fedoraproject.org  Sun Aug 23 11:35:23 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 11:35:23 +0000 (UTC)
Subject: rpms/spring/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 spring.spec,
	1.6, 1.7
Message-ID: <20090823113523.43ECB11C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16917/devel

Modified Files:
	.cvsignore sources spring.spec 
Log Message:
* Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
- New release: 0.80.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 19:41:21 -0000	1.4
+++ .cvsignore	23 Aug 2009 11:35:22 -0000	1.5
@@ -1 +1 @@
-spring_0.79.1.2_src.tar.lzma
+spring_0.80.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 19:41:21 -0000	1.4
+++ sources	23 Aug 2009 11:35:23 -0000	1.5
@@ -1 +1 @@
-fe22719f1df985051584767b19261dbc  spring_0.79.1.2_src.tar.lzma
+d01e9f54e32fb61a4fee7d655e7f87f4  spring_0.80.2_src.tar.lzma


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- spring.spec	12 Aug 2009 19:41:21 -0000	1.6
+++ spring.spec	23 Aug 2009 11:35:23 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           spring
-Version:        0.79.1.2
-Release:        4%{?dist}
+Version:        0.80.2
+Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
 Group:          Amusements/Games
@@ -17,11 +17,11 @@ Source0:        http://springrts.com/dl/
 Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
-Patch0:         spring-0.79.1.2-allegro.patch
+Patch0:         spring-0.80.2-allegro.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake SDL-devel openal-devel boost-devel DevIL-devel
+BuildRequires:  cmake SDL-devel openal-soft-devel boost-devel DevIL-devel
 BuildRequires:  glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:  freetype-devel python-devel allegro-devel zip
 BuildRequires:  java-devel-openjdk
@@ -55,7 +55,7 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
-chmod -x rts/lib/7zip/*
+find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
@@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.2-1
+- New release: 0.80.2
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.79.1.2-4
 - Use lzma compressed upstream tarball.
 



From abompard at fedoraproject.org  Sun Aug 23 11:39:45 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 11:39:45 +0000 (UTC)
Subject: rpms/springlobby/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 springlobby.spec, 1.10, 1.11
Message-ID: <20090823113945.4A7AE11C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17789/devel

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
- version 0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Jul 2009 21:03:51 -0000	1.5
+++ .cvsignore	23 Aug 2009 11:39:45 -0000	1.6
@@ -1 +1 @@
-springlobby-0.3.tar.bz2
+springlobby-0.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Jul 2009 21:03:51 -0000	1.5
+++ sources	23 Aug 2009 11:39:45 -0000	1.6
@@ -1 +1 @@
-c080c84f6d481f402c541b1b0f877ffc  springlobby-0.3.tar.bz2
+ba0e60f5389f582fe57a7d98b1926604  springlobby-0.19.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- springlobby.spec	21 Aug 2009 15:56:26 -0000	1.10
+++ springlobby.spec	23 Aug 2009 11:39:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           springlobby
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
 Group:          Amusements/Games
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
+- version 0.19
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-3
 - rebuilt with new openssl
 



From abompard at fedoraproject.org  Sun Aug 23 11:39:44 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 11:39:44 +0000 (UTC)
Subject: rpms/springlobby/F-10 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 springlobby.spec, 1.4, 1.5
Message-ID: <20090823113944.D9B9611C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17789/F-10

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
- version 0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Jul 2009 21:03:50 -0000	1.5
+++ .cvsignore	23 Aug 2009 11:39:44 -0000	1.6
@@ -1 +1 @@
-springlobby-0.3.tar.bz2
+springlobby-0.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Jul 2009 21:03:50 -0000	1.5
+++ sources	23 Aug 2009 11:39:44 -0000	1.6
@@ -1 +1 @@
-c080c84f6d481f402c541b1b0f877ffc  springlobby-0.3.tar.bz2
+ba0e60f5389f582fe57a7d98b1926604  springlobby-0.19.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-10/springlobby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- springlobby.spec	18 Jul 2009 21:03:50 -0000	1.4
+++ springlobby.spec	23 Aug 2009 11:39:44 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.3
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
+- version 0.19
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-3
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.3
 - version 0.3
 



From abompard at fedoraproject.org  Sun Aug 23 11:39:45 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 11:39:45 +0000 (UTC)
Subject: rpms/springlobby/F-11 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 springlobby.spec, 1.9, 1.10
Message-ID: <20090823113945.1F48B11C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17789/F-11

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
- version 0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Jul 2009 21:03:50 -0000	1.5
+++ .cvsignore	23 Aug 2009 11:39:44 -0000	1.6
@@ -1 +1 @@
-springlobby-0.3.tar.bz2
+springlobby-0.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Jul 2009 21:03:50 -0000	1.5
+++ sources	23 Aug 2009 11:39:44 -0000	1.6
@@ -1 +1 @@
-c080c84f6d481f402c541b1b0f877ffc  springlobby-0.3.tar.bz2
+ba0e60f5389f582fe57a7d98b1926604  springlobby-0.19.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/springlobby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- springlobby.spec	18 Jul 2009 21:03:50 -0000	1.9
+++ springlobby.spec	23 Aug 2009 11:39:44 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.3
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
+- version 0.19
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-3
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.3
 - version 0.3
 



From pbrobinson at fedoraproject.org  Sun Aug 23 11:41:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 23 Aug 2009 11:41:22 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.3,1.4
Message-ID: <20090823114122.0B41611C00A2@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18256

Modified Files:
	bisho.spec 
Log Message:
- Add missing dep for new release


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bisho.spec	12 Aug 2009 12:22:21 -0000	1.3
+++ bisho.spec	23 Aug 2009 11:41:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -22,6 +22,10 @@ BuildRequires: gettext
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 %description
 A tool to configure user and account details for the mojito social network 
 aggregation service.
@@ -34,11 +38,12 @@ sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-schemas
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -48,8 +53,25 @@ desktop-file-validate %{buildroot}/%{_da
 %clean
 rm -rf %{buildroot}
 
+%pre
+if [ "$1" -gt 1 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas >/dev/null || :
+fi
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+
+%preun
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /dev/null || :
+fi
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -64,11 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS TODO
 %{_bindir}/bisho
+%{_sysconfdir}/gconf/schemas/callback.schemas
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
-* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-1
+* Sun Aug 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-2
+- Add missing dep for new release
+
+* Wed Aug 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-1
 - New upstream 0.11 release
 
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.7-3



From musuruan at fedoraproject.org  Sun Aug 23 12:26:59 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 23 Aug 2009 12:26:59 +0000 (UTC)
Subject: rpms/hatari/devel .cvsignore, 1.7, 1.8 hatari.spec, 1.14,
	1.15 sources, 1.7, 1.8 hatari.png, 1.1, NONE
Message-ID: <20090823122700.268DA11C00A2@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26584

Modified Files:
	.cvsignore hatari.spec sources 
Removed Files:
	hatari.png 
Log Message:
* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
- updated to upstream 1.3.0
- disabled new upstream python UI
- updated icon cache snippets
- used upstream Mac OS X icons
- preserved french man page timestamp



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Jan 2009 15:30:10 -0000	1.7
+++ .cvsignore	23 Aug 2009 12:26:58 -0000	1.8
@@ -1 +1 @@
-hatari-1.2.0.tar.bz2
+hatari-1.3.0.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/hatari.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hatari.spec	10 Aug 2009 20:25:39 -0000	1.14
+++ hatari.spec	23 Aug 2009 12:26:58 -0000	1.15
@@ -1,17 +1,17 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
 URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
-Source1: hatari.png
-Source2: hatari.desktop
-Source3: hatari-README.tos
+Source1: hatari.desktop
+Source2: hatari-README.tos
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
+BuildRequires: libicns-utils
 BuildRequires: desktop-file-utils
 Requires: hicolor-icon-theme
 
@@ -35,42 +35,44 @@ of the old ST games and demos.
 %prep
 %setup -q
 
-cp -p %{SOURCE3} README.tos
+cp -p %{SOURCE2} README.tos
 
 # Fix Makefile not to strip binaries during make install
 sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/' Makefile.cnf.in
 
+# Do not install python UI
+sed -i 's|$(MAKE) -C python-ui/ install||' Makefile
+
 
 %build
 %configure --datadir=%{_datadir}/hatari
 # It does not compile with smp_mflags
 make 
 
-# Build hmsa tool
-make -C tools/hmsa
-
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} 
 
-# Install hmsa tool
-install -d -m 755 %{buildroot}%{_bindir}
-install -m 755 tools/hmsa/hmsa %{buildroot}%{_bindir}
-
 # Install French man page
 install -d -m 755 %{buildroot}%{_mandir}/fr/man1
-install -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
+install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
 
 # Install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
+install -d -m 755 %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE2}
+  %{SOURCE1}
+
+# Extract Mac OS X icons
+icns2png -x src/gui-osx/Hatari.icns 
 
-# Install icon
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+# Install icons
+for i in 16 32 48 128; do
+  install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  install -m 644 Hatari_${i}x${i}x32.png \
+    %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/hatari.png
+done
 
 # Remove installed doc files
 rm -rf  %{buildroot}%{_docdir}/%{name}
@@ -81,19 +83,20 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
@@ -103,13 +106,20 @@ fi
 %{_mandir}/man1/hatari.1*
 %{_mandir}/fr/man1/hatari.1*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %doc gpl.txt readme.txt doc/{*.txt,*.html,images}
 %doc tools/hmsa/readme-hmsa.txt
 %doc README.tos
 
 
 %changelog
+* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
+- updated to upstream 1.3.0
+- disabled new upstream python UI
+- updated icon cache snippets
+- used upstream Mac OS X icons
+- preserved french man page timestamp
+
 * Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
 - updated Source0 URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Jan 2009 15:30:10 -0000	1.7
+++ sources	23 Aug 2009 12:26:58 -0000	1.8
@@ -1 +1 @@
-4aecd42784fae8c5e8c9a9a341146fbb  hatari-1.2.0.tar.bz2
+1440230be3dd38098f4e0ef36b0a90df  hatari-1.3.0.tar.bz2



From julian at fedoraproject.org  Sun Aug 23 12:29:55 2009
From: julian at fedoraproject.org (julian)
Date: Sun, 23 Aug 2009 12:29:55 +0000 (UTC)
Subject: rpms/entertainer/devel entertainer.spec,1.1,1.2
Message-ID: <20090823122955.7110611C00A2@cvs1.fedora.phx.redhat.com>

Author: julian

Update of /cvs/pkgs/rpms/entertainer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26929

Modified Files:
	entertainer.spec 
Log Message:

Removing the pyclutter-cairo dependency and setting it to the whole pyclutter package instead.



Index: entertainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/entertainer/devel/entertainer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- entertainer.spec	28 Jul 2009 10:30:48 -0000	1.1
+++ entertainer.spec	23 Aug 2009 12:29:55 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		entertainer
 Version:	0.4.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A simple mediacenter based on clutter
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -36,10 +36,8 @@ Requires:	python-eyed3
 #We need python-storm-sqlite because python-storm pulls in the mysql backend by default
 Requires:	python-storm-sqlite
 Requires:	python-twisted
-#The pyclutter modules needed for interface and playback
-Requires:	pyclutter-gtk
-Requires:	pyclutter-gst
-Requires:	pyclutter-cairo
+#The pyclutter-cairo subpackage was removed and we need all pyclutter subpackages anyway
+Requires:	pyclutter
 #Needed for hicolor directory ownership
 Requires:	hicolor-icon-theme
 
@@ -135,6 +133,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 #Icon Cache updated
 
 %changelog
+* Sun Aug 23 2009 Julian Aloofi <julian at, fedoraproject.org> 0.4.2-6
+- Requires the whole pyclutter package now due to the cairo subpackage removal
+
+
 * Mon Jul 27 2009 Julian Aloofi <julian at, fedoraproject.org> 0.4.2-5
 - Added desktop files for the managing apps
 



From musuruan at fedoraproject.org  Sun Aug 23 12:40:33 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 23 Aug 2009 12:40:33 +0000 (UTC)
Subject: rpms/hatari/F-11 .cvsignore, 1.7, 1.8 hatari.spec, 1.13,
	1.14 sources, 1.7, 1.8 hatari.png, 1.1, NONE
Message-ID: <20090823124033.22B9C11C0489@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29094

Modified Files:
	.cvsignore hatari.spec sources 
Removed Files:
	hatari.png 
Log Message:
* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
- updated to upstream 1.3.0
- disabled new upstream python UI
- updated icon cache snippets
- used upstream Mac OS X icons
- preserved french man page timestamp



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Jan 2009 15:30:10 -0000	1.7
+++ .cvsignore	23 Aug 2009 12:40:32 -0000	1.8
@@ -1 +1 @@
-hatari-1.2.0.tar.bz2
+hatari-1.3.0.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/hatari.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- hatari.spec	10 Aug 2009 20:27:04 -0000	1.13
+++ hatari.spec	23 Aug 2009 12:40:32 -0000	1.14
@@ -1,17 +1,17 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
 URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
-Source1: hatari.png
-Source2: hatari.desktop
-Source3: hatari-README.tos
+Source1: hatari.desktop
+Source2: hatari-README.tos
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
+BuildRequires: libicns-utils
 BuildRequires: desktop-file-utils
 Requires: hicolor-icon-theme
 
@@ -35,42 +35,44 @@ of the old ST games and demos.
 %prep
 %setup -q
 
-cp -p %{SOURCE3} README.tos
+cp -p %{SOURCE2} README.tos
 
 # Fix Makefile not to strip binaries during make install
 sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/' Makefile.cnf.in
 
+# Do not install python UI
+sed -i 's|$(MAKE) -C python-ui/ install||' Makefile
+
 
 %build
 %configure --datadir=%{_datadir}/hatari
 # It does not compile with smp_mflags
 make 
 
-# Build hmsa tool
-make -C tools/hmsa
-
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} 
 
-# Install hmsa tool
-install -d -m 755 %{buildroot}%{_bindir}
-install -m 755 tools/hmsa/hmsa %{buildroot}%{_bindir}
-
 # Install French man page
 install -d -m 755 %{buildroot}%{_mandir}/fr/man1
-install -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
+install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
 
 # Install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
+install -d -m 755 %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE2}
+  %{SOURCE1}
+
+# Extract Mac OS X icons
+icns2png -x src/gui-osx/Hatari.icns 
 
-# Install icon
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+# Install icons
+for i in 16 32 48 128; do
+  install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  install -m 644 Hatari_${i}x${i}x32.png \
+    %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/hatari.png
+done
 
 # Remove installed doc files
 rm -rf  %{buildroot}%{_docdir}/%{name}
@@ -81,19 +83,20 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
@@ -103,13 +106,20 @@ fi
 %{_mandir}/man1/hatari.1*
 %{_mandir}/fr/man1/hatari.1*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %doc gpl.txt readme.txt doc/{*.txt,*.html,images}
 %doc tools/hmsa/readme-hmsa.txt
 %doc README.tos
 
 
 %changelog
+* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
+- updated to upstream 1.3.0
+- disabled new upstream python UI
+- updated icon cache snippets
+- used upstream Mac OS X icons
+- preserved french man page timestamp
+
 * Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
 - updated Source0 URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Jan 2009 15:30:10 -0000	1.7
+++ sources	23 Aug 2009 12:40:32 -0000	1.8
@@ -1 +1 @@
-4aecd42784fae8c5e8c9a9a341146fbb  hatari-1.2.0.tar.bz2
+1440230be3dd38098f4e0ef36b0a90df  hatari-1.3.0.tar.bz2



From lucilanga at fedoraproject.org  Sun Aug 23 12:51:57 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 23 Aug 2009 12:51:57 +0000 (UTC)
Subject: rpms/libftdi/F-10 libftdi.spec,1.6,1.7
Message-ID: <20090823125157.3D5A611C00A2@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31659

Modified Files:
	libftdi.spec 
Log Message:
* Sun Aug 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-4
- add group for udev rule (#517773)


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-10/libftdi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libftdi.spec	31 Jul 2009 12:01:19 -0000	1.6
+++ libftdi.spec	23 Aug 2009 12:51:57 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:		libftdi
 Version:	0.16
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Library to program and control the FTDI USB controller
 
 Group:		System Environment/Libraries
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*.hpp
 %{_libdir}/pkgconfig/libftdipp.pc
 
+%pre
+getent group GROUPNAME >/dev/null || groupadd -r plugdev
+exit 0
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -130,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun c++ -p /sbin/ldconfig
 
 %changelog
+* Sun Aug 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-4
+- add group for udev rule (#517773)
+
 * Fri Jul 31 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-3
 - fix multilib conflict in libftdi-config
 



From musuruan at fedoraproject.org  Sun Aug 23 12:53:52 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 23 Aug 2009 12:53:52 +0000 (UTC)
Subject: rpms/hatari/F-10 .cvsignore, 1.7, 1.8 hatari.spec, 1.12,
	1.13 sources, 1.7, 1.8 hatari.png, 1.1, NONE
Message-ID: <20090823125352.D0A4211C00A2@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32086

Modified Files:
	.cvsignore hatari.spec sources 
Removed Files:
	hatari.png 
Log Message:
* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
- updated to upstream 1.3.0
- disabled new upstream python UI
- updated icon cache snippets
- used upstream Mac OS X icons
- preserved french man page timestamp



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Jan 2009 21:00:32 -0000	1.7
+++ .cvsignore	23 Aug 2009 12:53:52 -0000	1.8
@@ -1 +1 @@
-hatari-1.2.0.tar.bz2
+hatari-1.3.0.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/hatari.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hatari.spec	10 Aug 2009 20:28:40 -0000	1.12
+++ hatari.spec	23 Aug 2009 12:53:52 -0000	1.13
@@ -1,17 +1,17 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
 URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
-Source1: hatari.png
-Source2: hatari.desktop
-Source3: hatari-README.tos
+Source1: hatari.desktop
+Source2: hatari-README.tos
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
+BuildRequires: libicns-utils
 BuildRequires: desktop-file-utils
 Requires: hicolor-icon-theme
 
@@ -35,42 +35,44 @@ of the old ST games and demos.
 %prep
 %setup -q
 
-cp -p %{SOURCE3} README.tos
+cp -p %{SOURCE2} README.tos
 
 # Fix Makefile not to strip binaries during make install
 sed -i 's/@INSTALL_PROGRAM@ -s/@INSTALL_PROGRAM@/' Makefile.cnf.in
 
+# Do not install python UI
+sed -i 's|$(MAKE) -C python-ui/ install||' Makefile
+
 
 %build
 %configure --datadir=%{_datadir}/hatari
 # It does not compile with smp_mflags
 make 
 
-# Build hmsa tool
-make -C tools/hmsa
-
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} 
 
-# Install hmsa tool
-install -d -m 755 %{buildroot}%{_bindir}
-install -m 755 tools/hmsa/hmsa %{buildroot}%{_bindir}
-
 # Install French man page
 install -d -m 755 %{buildroot}%{_mandir}/fr/man1
-install -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
+install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1
 
 # Install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
+install -d -m 755 %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE2}
+  %{SOURCE1}
+
+# Extract Mac OS X icons
+icns2png -x src/gui-osx/Hatari.icns 
 
-# Install icon
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-cp %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+# Install icons
+for i in 16 32 48 128; do
+  install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  install -m 644 Hatari_${i}x${i}x32.png \
+    %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/hatari.png
+done
 
 # Remove installed doc files
 rm -rf  %{buildroot}%{_docdir}/%{name}
@@ -81,19 +83,20 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
@@ -103,13 +106,20 @@ fi
 %{_mandir}/man1/hatari.1*
 %{_mandir}/fr/man1/hatari.1*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %doc gpl.txt readme.txt doc/{*.txt,*.html,images}
 %doc tools/hmsa/readme-hmsa.txt
 %doc README.tos
 
 
 %changelog
+* Sat Aug 22 2009 Andrea Musuruane <musuruan at gmail.com> 1.3.0-1
+- updated to upstream 1.3.0
+- disabled new upstream python UI
+- updated icon cache snippets
+- used upstream Mac OS X icons
+- preserved french man page timestamp
+
 * Mon Aug 10 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-4
 - updated Source0 URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Jan 2009 21:00:32 -0000	1.7
+++ sources	23 Aug 2009 12:53:52 -0000	1.8
@@ -1 +1 @@
-4aecd42784fae8c5e8c9a9a341146fbb  hatari-1.2.0.tar.bz2
+1440230be3dd38098f4e0ef36b0a90df  hatari-1.3.0.tar.bz2



From heffer at fedoraproject.org  Sun Aug 23 12:54:39 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 23 Aug 2009 12:54:39 +0000 (UTC)
Subject: rpms/openttd-opengfx/devel .cvsignore, 1.2, 1.3 openttd-opengfx.spec,
	1.2, 1.3 sources, 1.2, 1.3 MD5SUM.opengfx, 1.1, NONE
Message-ID: <20090823125439.745E211C00A2@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd-opengfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32311

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Removed Files:
	MD5SUM.opengfx 
Log Message:
* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 May 2009 13:08:48 -0000	1.2
+++ .cvsignore	23 Aug 2009 12:54:38 -0000	1.3
@@ -1 +1 @@
-ogfx_source.zip
+opengfx-0.1.0-alpha6-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/openttd-opengfx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openttd-opengfx.spec	25 Jul 2009 20:55:12 -0000	1.2
+++ openttd-opengfx.spec	23 Aug 2009 12:54:39 -0000	1.3
@@ -1,21 +1,19 @@
-%define filename ogfx_source
+%define realname opengfx
+%define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0
-Release:        0.5.alpha4.2%{?dist}
+Version:        0.1.0
+Release:        0.1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
-URL:            http://www.tt-forums.net/viewtopic.php?f=36&t=40162
-# Upstream told me that this link could be broken anytime soon as the source
-# is moving to a VCS
-Source0:        http://bzr.jaspervries.nl/newgrf/opengfx/ogfx_source.zip
-Source1:        MD5SUM.opengfx
+URL:            http://dev.openttdcoop.org/projects/opengfx
+Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec
+BuildRequires:  grfcodec dos2unix
 Requires:       openttd
 
 
@@ -26,36 +24,21 @@ graphics from the original game.
 
 
 %prep
-%setup -q -c -n %{filename}
-
-tr -d \\r < readme.txt > readme.txt.unix
-iconv -f iso-8859-1 -t utf-8 readme.txt.unix > readme.txt.utf-8
-touch -r readme.txt readme.txt.utf-8
-rm readme.txt.unix
-mv readme.txt.utf-8 readme.txt
-
-tr -d \\r < SOURCE_README.txt > SOURCE_README.txt.unix
-touch -r SOURCE_README.txt SOURCE_README.txt.unix
-mv SOURCE_README.txt.unix SOURCE_README.txt
-
-tr -d \\r < COPYING > COPYING.unix
-touch -r COPYING COPYING.unix
-mv COPYING.unix COPYING
+%setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
+dos2unix docs/authoroverview.csv docs/changelog.ptxt docs/license.ptxt \
+    docs/readme.ptxt docs/aoHTMLoutput/config.inc.php \
+    docs/aoHTMLoutput/script.php docs/aoHTMLoutput/style.css
 
 
 %build
-grfcodec -e -p 2 opengfx1r.grf
-grfcodec -e -p 2 opengfxcr.grf
-grfcodec -e -p 2 opengfxhr.grf
-grfcodec -e -p 2 opengfxir.grf
-grfcodec -e -p 2 opengfxtr.grf
-grfcodec -e -p 2 opengfxw.grf
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/openttd/data
-install -pm 644 opengfx*.grf $RPM_BUILD_ROOT%{_datadir}/openttd/data
-install -pm 644 opengfx.obg $RPM_BUILD_ROOT%{_datadir}/openttd/data
+make install INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/openttd/data
 
 # OpenGFX doesn't have a sound file yet so this is required
 # otherwise OpenTTD refuses to start
@@ -64,7 +47,6 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 %check
 cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
-md5sum --check %{SOURCE1}
 
 
 %clean
@@ -73,11 +55,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc authoroverview.xls COPYING readme.txt SOURCE_README.txt
+%doc docs/*.txt
+%doc docs/aoHTMLoutput/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
+- new upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.5.alpha4.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 May 2009 13:08:48 -0000	1.2
+++ sources	23 Aug 2009 12:54:39 -0000	1.3
@@ -1 +1 @@
-86d1526c07706fc451e3ef404991ebe6  ogfx_source.zip
+b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz


--- MD5SUM.opengfx DELETED ---



From bochecha at fedoraproject.org  Sun Aug 23 13:05:13 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sun, 23 Aug 2009 13:05:13 +0000 (UTC)
Subject: rpms/klavaro/devel .cvsignore, 1.2, 1.3 klavaro.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090823130513.A841F11C00A2@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/klavaro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1342

Modified Files:
	.cvsignore klavaro.spec sources 
Log Message:
Update to 1.2.3.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jul 2009 19:45:07 -0000	1.2
+++ .cvsignore	23 Aug 2009 13:05:13 -0000	1.3
@@ -1 +1 @@
-klavaro-1.2.1.tar.bz2
+klavaro-1.2.3.tar.bz2


Index: klavaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/devel/klavaro.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- klavaro.spec	25 Jul 2009 04:39:14 -0000	1.2
+++ klavaro.spec	23 Aug 2009 13:05:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           klavaro
-Version:        1.2.1
-Release:        4%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Typing tutor
 
 Group:          Applications/Multimedia
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jul 2009 19:45:07 -0000	1.2
+++ sources	23 Aug 2009 13:05:13 -0000	1.3
@@ -1 +1 @@
-fc704e757f7763713ad84d29865cb401  klavaro-1.2.1.tar.bz2
+199bde5a20f30c10113dd7bea5cc7b13  klavaro-1.2.3.tar.bz2



From musuruan at fedoraproject.org  Sun Aug 23 13:22:14 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 23 Aug 2009 13:22:14 +0000 (UTC)
Subject: rpms/libicns/devel libicns.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090823132214.65ADE11C00A2@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/libicns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5546

Modified Files:
	libicns.spec sources 
Log Message:
* Sun Aug 23 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-3
- Updated to new upstream 0.7.0 that was released without bumping the version



Index: libicns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/devel/libicns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libicns.spec	25 Jul 2009 05:56:19 -0000	1.6
+++ libicns.spec	23 Aug 2009 13:22:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libicns
 Version:        0.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for manipulating Macintosh icns files
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-3
+- Updated to new upstream 0.7.0 that was released without bumping the version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Jun 2009 15:51:08 -0000	1.5
+++ sources	23 Aug 2009 13:22:13 -0000	1.6
@@ -1 +1 @@
-d2539bb1bec033395ad908311c49a954  libicns-0.7.0.tar.gz
+e2932389d10ccee20dc922155165c8f8  libicns-0.7.0.tar.gz



From musuruan at fedoraproject.org  Sun Aug 23 13:29:40 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 23 Aug 2009 13:29:40 +0000 (UTC)
Subject: rpms/libicns/F-11 libicns.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090823132940.B5C1C11C00A2@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/libicns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7042

Modified Files:
	libicns.spec sources 
Log Message:
* Sun Aug 23 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-3
- Updated to new upstream 0.7.0 that was released without bumping the version



Index: libicns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-11/libicns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libicns.spec	13 Jun 2009 15:59:10 -0000	1.5
+++ libicns.spec	23 Aug 2009 13:29:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libicns
 Version:        0.7.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library for manipulating Macintosh icns files
 
 Group:          System Environment/Libraries
@@ -88,6 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-3
+- Updated to new upstream 0.7.0 that was released without bumping the version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 13 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-1
 - Updated to upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Jun 2009 15:59:11 -0000	1.5
+++ sources	23 Aug 2009 13:29:39 -0000	1.6
@@ -1 +1 @@
-d2539bb1bec033395ad908311c49a954  libicns-0.7.0.tar.gz
+e2932389d10ccee20dc922155165c8f8  libicns-0.7.0.tar.gz



From ensc at fedoraproject.org  Sun Aug 23 13:30:04 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 23 Aug 2009 13:30:04 +0000 (UTC)
Subject: rpms/util-vserver/devel util-vserver.spec, 1.48, 1.49 sources, 1.13,
	1.14 .cvsignore, 1.6, 1.7
Message-ID: <20090823133004.EFADA11C0375@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7203

Modified Files:
	util-vserver.spec sources .cvsignore 
Log Message:
- updated to svn 2847 snapshot
- added -python subpackage



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- util-vserver.spec	27 Jul 2009 06:40:33 -0000	1.48
+++ util-vserver.spec	23 Aug 2009 13:30:04 -0000	1.49
@@ -12,7 +12,6 @@
 %endif
 
 %bcond_with		xalan
-
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -22,18 +21,19 @@
 
 %global _localstatedir	%_var
 
+%{!?python_sitearch:%global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.215
-Release:	%release_func 8
+Version:	0.30.215+svn2847
+Release:	%release_func 0
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
-Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
+#Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -65,7 +65,7 @@ Requires:		util-linux
 %package build
 Summary:		Tools which can be used to build vservers
 Group:			Applications/System
-Requires:		rpm wget binutils tar e2fsprogs rsync
+Requires:		rpm wget binutils tar
 Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
@@ -98,6 +98,12 @@ Group:			Development/Libraries
 Requires:		pkgconfig
 Requires:		%name-lib = %version-%release
 
+%package python
+Summary:		Python bindings to develop vserver-based applications
+Group:			Development/Libraries
+BuildRequires:		python
+Requires:		%name-lib = %version-%release
+
 
 %description
 util-vserver provides the components and a framework to setup virtual
@@ -171,6 +177,16 @@ can't interact with services in the main
 This package contains header files and libraries which are needed to
 develop VServer related applications.
 
+%description python
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains the files needed to interface with the
+Linux-VServer API from Python.
+
 
 %prep
 %setup -q
@@ -181,6 +197,7 @@ sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !
 %build
 %configure --with-initrddir=%_initrddir --enable-release \
 	   --with-crypto-api=nss \
+	   --with-python \
 	   %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc
 
 %__make %{?_smp_mflags} all
@@ -191,7 +208,8 @@ sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !
 rm -rf $RPM_BUILD_ROOT
 %__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution
 
-rm -f $RPM_BUILD_ROOT/%_libdir/*.la
+rm -f $RPM_BUILD_ROOT%_libdir/*.la \
+      $RPM_BUILD_ROOT%python_sitearch/*.*a
 
 MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
@@ -262,10 +280,6 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-*
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
-%pre build
-# TODO: remove in FC9...
-d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
-
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -365,7 +379,16 @@ test "$1" = 0  || %_initrddir/rebootmgr 
 %doc lib/apidoc/html
 
 
+%files python
+%defattr(-,root,root,-)
+%python_sitearch/*.so
+
+
 %changelog
+* Sun Aug 23 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.215+svn2847-0
+- updated to svn 2847 snapshot
+- added -python subpackage
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30.215-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Apr 2008 08:58:48 -0000	1.13
+++ sources	23 Aug 2009 13:30:04 -0000	1.14
@@ -1,2 +1 @@
-befd9b8e5311e87395b67ee381d83649  util-vserver-0.30.215.tar.bz2
-783de8acf8f16e56c1b8cf4a7b683994  util-vserver-0.30.215.tar.bz2.asc
+5682ed047a44d8e027bd780fc43cf982  util-vserver-0.30.215+svn2847.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Apr 2008 08:58:48 -0000	1.6
+++ .cvsignore	23 Aug 2009 13:30:04 -0000	1.7
@@ -1,2 +1 @@
-util-vserver-0.30.215.tar.bz2
-util-vserver-0.30.215.tar.bz2.asc
+util-vserver-0.30.215+svn2847.tar.bz2



From musuruan at fedoraproject.org  Sun Aug 23 13:37:01 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sun, 23 Aug 2009 13:37:01 +0000 (UTC)
Subject: rpms/libicns/F-10 libicns.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20090823133701.0429311C00A2@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/libicns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8595

Modified Files:
	libicns.spec sources 
Log Message:
* Sun Aug 23 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-3
- Updated to new upstream 0.7.0 that was released without bumping the version



Index: libicns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-10/libicns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libicns.spec	13 Jun 2009 16:13:33 -0000	1.4
+++ libicns.spec	23 Aug 2009 13:37:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libicns
 Version:        0.7.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library for manipulating Macintosh icns files
 
 Group:          System Environment/Libraries
@@ -88,6 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-3
+- Updated to new upstream 0.7.0 that was released without bumping the version
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 13 2009 Andrea Musuruane <musuruan at gmail.com> - 0.7.0-1
 - Updated to upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Jun 2009 16:13:33 -0000	1.5
+++ sources	23 Aug 2009 13:37:00 -0000	1.6
@@ -1 +1 @@
-d2539bb1bec033395ad908311c49a954  libicns-0.7.0.tar.gz
+e2932389d10ccee20dc922155165c8f8  libicns-0.7.0.tar.gz



From ensc at fedoraproject.org  Sun Aug 23 13:39:00 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 23 Aug 2009 13:39:00 +0000 (UTC)
Subject: rpms/util-vserver/devel util-vserver.spec,1.49,1.50
Message-ID: <20090823133900.94B4511C00A2@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9067

Modified Files:
	util-vserver.spec 
Log Message:
fixed python BRs



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- util-vserver.spec	23 Aug 2009 13:30:04 -0000	1.49
+++ util-vserver.spec	23 Aug 2009 13:39:00 -0000	1.50
@@ -101,7 +101,7 @@ Requires:		%name-lib = %version-%release
 %package python
 Summary:		Python bindings to develop vserver-based applications
 Group:			Development/Libraries
-BuildRequires:		python
+BuildRequires:		python-devel ctags
 Requires:		%name-lib = %version-%release
 
 



From ensc at fedoraproject.org  Sun Aug 23 13:43:38 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 23 Aug 2009 13:43:38 +0000 (UTC)
Subject: rpms/util-vserver/devel util-vserver.spec,1.50,1.51
Message-ID: <20090823134338.0CA7311C00A2@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10223

Modified Files:
	util-vserver.spec 
Log Message:
increased release to fix broken build; 'cvs tag -f' does not work anymore :(


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- util-vserver.spec	23 Aug 2009 13:39:00 -0000	1.50
+++ util-vserver.spec	23 Aug 2009 13:43:37 -0000	1.51
@@ -28,7 +28,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.215+svn2847
-Release:	%release_func 0
+Release:	%release_func 143596525
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/



From bochecha at fedoraproject.org  Sun Aug 23 13:44:03 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sun, 23 Aug 2009 13:44:03 +0000 (UTC)
Subject: rpms/klavaro/devel .cvsignore, 1.3, 1.4 klavaro.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090823134403.1020B11C00A2@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/klavaro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10243

Modified Files:
	.cvsignore klavaro.spec sources 
Log Message:
Update to 1.2.4.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Aug 2009 13:05:13 -0000	1.3
+++ .cvsignore	23 Aug 2009 13:44:02 -0000	1.4
@@ -1 +1 @@
-klavaro-1.2.3.tar.bz2
+klavaro-1.2.4.tar.bz2


Index: klavaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/devel/klavaro.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- klavaro.spec	23 Aug 2009 13:05:13 -0000	1.3
+++ klavaro.spec	23 Aug 2009 13:44:02 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           klavaro
-Version:        1.2.3
+Version:        1.2.4
 Release:        1%{?dist}
 Summary:        Typing tutor
 
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.4-1
+- Update to 1.2.4
+
 * Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.3-1
 - Update to 1.2.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2009 13:05:13 -0000	1.3
+++ sources	23 Aug 2009 13:44:02 -0000	1.4
@@ -1 +1 @@
-199bde5a20f30c10113dd7bea5cc7b13  klavaro-1.2.3.tar.bz2
+ca33e061b90719f511cdb1d49d2ffd5e  klavaro-1.2.4.tar.bz2



From dwalsh at fedoraproject.org  Sun Aug 23 13:55:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun, 23 Aug 2009 13:55:48 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.58,
	1.59 selinux-policy.spec, 1.902, 1.903
Message-ID: <20090823135548.D5CCA11C00A2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13532

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-6
- Add capability setting to dhcpc and gpm


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   16 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |   16 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  391 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 policy/modules/services/dbus.if                    |   28 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpm.te                     |    1 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   46 
 policy/modules/services/policykit.te               |   54 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +-
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  163 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 ++++++++
 policy/modules/services/xserver.te                 |  306 ++++
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  262 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1345 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 330 files changed, 14434 insertions(+), 2977 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- policy-F12.patch	22 Aug 2009 11:51:12 -0000	1.58
+++ policy-F12.patch	23 Aug 2009 13:55:48 -0000	1.59
@@ -3051,8 +3051,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.28/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/apps/nsplugin.te	2009-08-21 18:56:06.000000000 -0400
-@@ -0,0 +1,287 @@
++++ serefpolicy-3.6.28/policy/modules/apps/nsplugin.te	2009-08-22 09:36:26.000000000 -0400
+@@ -0,0 +1,288 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3266,6 +3266,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow nsplugin_config_t self:unix_stream_socket create_stream_socket_perms;
 +
 +fs_search_auto_mountpoints(nsplugin_config_t)
++fs_list_inotifyfs(nsplugin_config_t)
 +
 +can_exec(nsplugin_config_t, nsplugin_rw_t)
 +manage_dirs_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
@@ -5516,7 +5517,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.28/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/files.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/files.if	2009-08-22 09:30:11.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5593,11 +5594,12 @@ diff -b -B --ignore-all-space --exclude-
  ##	Mount a filesystem on a directory with the default file type.
  ## </summary>
  ## <param name="domain">
-@@ -1931,6 +1971,27 @@
+@@ -1931,6 +1971,28 @@
  	allow $1 etc_t:dir list_dir_perms;
  	read_files_pattern($1, etc_t, etc_t)
  	read_lnk_files_pattern($1, etc_t, etc_t)
 +	files_read_etc_runtime_files($1)
++	files_read_config_files($1)
 +')
 +
 +########################################
@@ -5621,7 +5623,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2418,6 +2479,11 @@
+@@ -2418,6 +2480,11 @@
  	')
  
  	delete_files_pattern($1, file_t, file_t)
@@ -5633,7 +5635,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3449,6 +3515,24 @@
+@@ -3449,6 +3516,24 @@
  
  ########################################
  ## <summary>
@@ -5658,7 +5660,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read all tmp files.
  ## </summary>
  ## <param name="domain">
-@@ -3515,6 +3599,8 @@
+@@ -3515,6 +3600,8 @@
  	delete_lnk_files_pattern($1, tmpfile, tmpfile)
  	delete_fifo_files_pattern($1, tmpfile, tmpfile)
  	delete_sock_files_pattern($1, tmpfile, tmpfile)
@@ -5667,7 +5669,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3623,7 +3709,12 @@
+@@ -3623,7 +3710,12 @@
  		type usr_t;
  	')
  
@@ -5681,7 +5683,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3662,6 +3753,7 @@
+@@ -3662,6 +3754,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)
@@ -5689,7 +5691,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -4188,6 +4280,24 @@
+@@ -4188,6 +4281,24 @@
  
  ########################################
  ## <summary>
@@ -5714,7 +5716,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search the /var/lib directory.
  ## </summary>
  ## <param name="domain">
-@@ -4955,7 +5065,7 @@
+@@ -4955,7 +5066,7 @@
  	selinux_compute_member($1)
  
  	# Need sys_admin capability for mounting
@@ -5723,7 +5725,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 +5087,15 @@
+@@ -4977,12 +5088,15 @@
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
  
@@ -5740,7 +5742,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -5003,3 +5116,173 @@
+@@ -5003,3 +5117,173 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -6472,8 +6474,8 @@ 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.28/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/roles/staff.te	2009-08-21 18:56:07.000000000 -0400
-@@ -15,156 +15,109 @@
++++ serefpolicy-3.6.28/policy/modules/roles/staff.te	2009-08-22 08:58:55.000000000 -0400
+@@ -15,156 +15,110 @@
  # Local policy
  #
  
@@ -6662,6 +6664,7 @@ diff -b -B --ignore-all-space --exclude-
 -	wireshark_role(staff_r, staff_t)
 +	setroubleshoot_stream_connect(staff_t)
 +	setroubleshoot_dbus_chat(staff_t)
++	setroubleshoot_dbus_chat_fixit(staff_t)
  ')
  
  optional_policy(`
@@ -8254,8 +8257,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.28/policy/modules/services/abrt.fc
 --- nsaserefpolicy/policy/modules/services/abrt.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/services/abrt.fc	2009-08-21 18:56:07.000000000 -0400
-@@ -0,0 +1,14 @@
++++ serefpolicy-3.6.28/policy/modules/services/abrt.fc	2009-08-22 09:29:03.000000000 -0400
+@@ -0,0 +1,13 @@
 +
 +/etc/rc\.d/init\.d/abrt	        --      gen_context(system_u:object_r:abrt_initrc_exec_t,s0)
 +
@@ -8269,7 +8272,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/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)
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.6.28/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.28/policy/modules/services/abrt.if	2009-08-21 18:56:07.000000000 -0400
@@ -9983,7 +9985,16 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.28/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/bluetooth.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/bluetooth.te	2009-08-23 09:52:11.000000000 -0400
+@@ -56,7 +56,7 @@
+ 
+ allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw 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 };
+ allow bluetooth_t self:fifo_file rw_fifo_file_perms;
+ allow bluetooth_t self:shm create_shm_perms;
+ allow bluetooth_t self:socket create_stream_socket_perms;
 @@ -64,6 +64,7 @@
  allow bluetooth_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow bluetooth_t self:tcp_socket create_stream_socket_perms;
@@ -11892,6 +11903,17 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_read_reload(gnomeclock_t)
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.6.28/policy/modules/services/gpm.te
+--- nsaserefpolicy/policy/modules/services/gpm.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/gpm.te	2009-08-22 09:46:40.000000000 -0400
+@@ -28,6 +28,7 @@
+ #
+ 
+ allow gpm_t self:capability { setuid dac_override sys_admin sys_tty_config };
++allow gpm_t self:process { getcap setcap };
+ allow gpm_t self:unix_stream_socket create_stream_socket_perms;
+ 
+ allow gpm_t gpm_conf_t:dir list_dir_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.fc serefpolicy-3.6.28/policy/modules/services/gpsd.fc
 --- nsaserefpolicy/policy/modules/services/gpsd.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/gpsd.fc	2009-08-21 18:56:07.000000000 -0400
@@ -12312,6 +12334,18 @@ diff -b -B --ignore-all-space --exclude-
  sysnet_dns_name_resolve(kpropd_t)
  
  kerberos_use(kpropd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.6.28/policy/modules/services/kerneloops.te
+--- nsaserefpolicy/policy/modules/services/kerneloops.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/kerneloops.te	2009-08-23 09:52:27.000000000 -0400
+@@ -22,7 +22,7 @@
+ #
+ 
+ allow kerneloops_t self:capability sys_nice;
+-allow kerneloops_t self:process { setsched getsched signal };
++allow kerneloops_t self:process { getcap setcap setsched getsched signal };
+ allow kerneloops_t self:fifo_file rw_file_perms;
+ 
+ manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.6.28/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/ktalk.te	2009-08-21 18:56:07.000000000 -0400
@@ -16478,7 +16512,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.28/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/setroubleshoot.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/setroubleshoot.if	2009-08-22 08:58:44.000000000 -0400
 @@ -16,8 +16,8 @@
  	')
  
@@ -16490,7 +16524,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -36,6 +36,63 @@
+@@ -36,6 +36,84 @@
  		type setroubleshootd_t, setroubleshoot_var_run_t;
  	')
  
@@ -16522,6 +16556,27 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Send and receive messages from
++##	setroubleshoot over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`setroubleshoot_dbus_chat_fixit',`
++	gen_require(`
++		type setroubleshoot_fixit_t;
++		class dbus send_msg;
++	')
++
++	allow $1 setroubleshoot_fixit_t:dbus send_msg;
++	allow setroubleshoot_fixit_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
 +##	All of the rules required to administrate 
 +##	an setroubleshoot environment
 +## </summary>
@@ -16963,7 +17018,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.28/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/smartmon.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/smartmon.te	2009-08-23 09:52:51.000000000 -0400
 @@ -19,6 +19,10 @@
  type fsdaemon_tmp_t;
  files_tmp_file(fsdaemon_tmp_t)
@@ -16980,7 +17035,7 @@ diff -b -B --ignore-all-space --exclude-
  allow fsdaemon_t self:capability { setgid sys_rawio sys_admin };
  dontaudit fsdaemon_t self:capability sys_tty_config;
 -allow fsdaemon_t self:process signal_perms;
-+allow fsdaemon_t self:process { signal_perms setfscreate };
++allow fsdaemon_t self:process { getcap setcap signal_perms setfscreate };
  allow fsdaemon_t self:fifo_file rw_fifo_file_perms;
  allow fsdaemon_t self:unix_dgram_socket create_socket_perms;
  allow fsdaemon_t self:unix_stream_socket create_stream_socket_perms;
@@ -22836,9 +22891,13 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.28/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/logging.te	2009-08-21 18:56:07.000000000 -0400
-@@ -126,7 +126,7 @@
- allow auditd_t self:process { signal_perms setpgid setsched };
++++ serefpolicy-3.6.28/policy/modules/system/logging.te	2009-08-23 09:54:54.000000000 -0400
+@@ -123,10 +123,10 @@
+ 
+ allow auditd_t self:capability { chown fsetid sys_nice sys_resource };
+ dontaudit auditd_t self:capability sys_tty_config;
+-allow auditd_t self:process { signal_perms setpgid setsched };
++allow auditd_t self:process { getcap signal_perms setcap setpgid setsched };
  allow auditd_t self:file rw_file_perms;
  allow auditd_t self:unix_dgram_socket create_socket_perms;
 -allow auditd_t self:fifo_file rw_file_perms;
@@ -22863,7 +22922,7 @@ diff -b -B --ignore-all-space --exclude-
 -allow audisp_t self:process setsched;
 -allow audisp_t self:fifo_file rw_file_perms;
 +allow audisp_t self:capability { dac_override sys_nice };
-+allow audisp_t self:process { signal_perms setsched };
++allow audisp_t self:process { getcap signal_perms setcap setsched };
 +allow audisp_t self:fifo_file rw_fifo_file_perms;
  allow audisp_t self:unix_stream_socket create_stream_socket_perms;
  allow audisp_t self:unix_dgram_socket create_socket_perms;
@@ -24666,7 +24725,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.28/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/sysnetwork.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/sysnetwork.te	2009-08-22 09:47:05.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -24677,7 +24736,7 @@ diff -b -B --ignore-all-space --exclude-
  type dhcpc_state_t;
  files_type(dhcpc_state_t)
  
-@@ -41,21 +44,22 @@
+@@ -41,21 +44,23 @@
  #
  # DHCP client local policy
  #
@@ -24689,7 +24748,8 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit dhcpc_t self:capability { dac_read_search sys_module };
 -allow dhcpc_t self:process signal_perms;
 -allow dhcpc_t self:fifo_file rw_file_perms;
-+allow dhcpc_t self:process { setfscreate ptrace signal_perms };
++allow dhcpc_t self:process { getcap setcap setfscreate ptrace signal_perms };
++
 +allow dhcpc_t self:fifo_file rw_fifo_file_perms;
  allow dhcpc_t self:tcp_socket create_stream_socket_perms;
  allow dhcpc_t self:udp_socket create_socket_perms;
@@ -24705,7 +24765,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(dhcpc_t, dhcpc_state_t, dhcpc_state_t)
  filetrans_pattern(dhcpc_t, dhcp_state_t, dhcpc_state_t, file)
  
-@@ -66,6 +70,8 @@
+@@ -66,6 +71,8 @@
  # Allow read/write to /etc/resolv.conf and /etc/ntp.conf. Note that any files
  # in /etc created by dhcpcd will be labelled net_conf_t.
  allow dhcpc_t net_conf_t:file manage_file_perms;
@@ -24714,7 +24774,7 @@ diff -b -B --ignore-all-space --exclude-
  files_etc_filetrans(dhcpc_t, net_conf_t, file)
  
  # create temp files
-@@ -83,9 +89,6 @@
+@@ -83,9 +90,6 @@
  kernel_read_kernel_sysctls(dhcpc_t)
  kernel_use_fds(dhcpc_t)
  
@@ -24724,7 +24784,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(dhcpc_t)
  corenet_all_recvfrom_netlabel(dhcpc_t)
  corenet_tcp_sendrecv_all_if(dhcpc_t)
-@@ -107,15 +110,6 @@
+@@ -107,15 +111,6 @@
  # for SSP:
  dev_read_urand(dhcpc_t)
  
@@ -24740,7 +24800,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_getattr_all_fs(dhcpc_t)
  fs_search_auto_mountpoints(dhcpc_t)
  
-@@ -124,6 +118,20 @@
+@@ -124,6 +119,20 @@
  term_dontaudit_use_unallocated_ttys(dhcpc_t)
  term_dontaudit_use_generic_ptys(dhcpc_t)
  
@@ -24761,7 +24821,7 @@ diff -b -B --ignore-all-space --exclude-
  init_rw_utmp(dhcpc_t)
  
  logging_send_syslog_msg(dhcpc_t)
-@@ -183,25 +191,23 @@
+@@ -183,25 +192,23 @@
  ')
  
  optional_policy(`
@@ -24795,7 +24855,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,6 +218,7 @@
+@@ -212,6 +219,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -24803,7 +24863,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -223,6 +230,10 @@
+@@ -223,6 +231,10 @@
  ')
  
  optional_policy(`
@@ -24814,7 +24874,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)
-@@ -234,9 +245,9 @@
+@@ -234,9 +246,9 @@
  # Ifconfig local policy
  #
  
@@ -24826,7 +24886,7 @@ diff -b -B --ignore-all-space --exclude-
  allow ifconfig_t self:fd use;
  allow ifconfig_t self:fifo_file rw_fifo_file_perms;
  allow ifconfig_t self:sock_file read_sock_file_perms;
-@@ -249,8 +260,11 @@
+@@ -249,8 +261,11 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -24838,7 +24898,7 @@ diff -b -B --ignore-all-space --exclude-
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
  allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
-@@ -257,11 +271,19 @@
+@@ -257,11 +272,19 @@
  allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
  allow ifconfig_t self:tcp_socket { create ioctl };
  
@@ -24858,7 +24918,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_rw_tun_tap_dev(ifconfig_t)
  
-@@ -269,15 +291,18 @@
+@@ -269,15 +292,18 @@
  # for IPSEC setup:
  dev_read_urand(ifconfig_t)
  
@@ -24881,7 +24941,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_read_root_files(ifconfig_t)
  
-@@ -294,6 +319,8 @@
+@@ -294,6 +320,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -24890,7 +24950,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -330,8 +357,21 @@
+@@ -330,8 +358,21 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -p -r1.902 -r1.903
--- selinux-policy.spec	22 Aug 2009 11:51:13 -0000	1.902
+++ selinux-policy.spec	23 Aug 2009 13:55:48 -0000	1.903
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-6
+- Add capability setting to dhcpc and gpm
+
 * Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-5
 - Allow cronjobs to read exim_spool_t
 



From iarnell at fedoraproject.org  Sun Aug 23 14:06:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 23 Aug 2009 14:06:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-View-Mason/devel .cvsignore, 1.2,
	1.3 perl-Catalyst-View-Mason.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090823140649.5CCF011C00A2@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-View-Mason/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15752

Modified Files:
	.cvsignore perl-Catalyst-View-Mason.spec sources 
Log Message:
* Sun Aug 23 2009 Iain Arnell <iarnell at gmail.com> 0.18-1
- update to latest upstream (for compatibility with Catalyst::Runtime 5.80010)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-Mason/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 May 2009 03:14:36 -0000	1.2
+++ .cvsignore	23 Aug 2009 14:06:48 -0000	1.3
@@ -1 +1 @@
-Catalyst-View-Mason-0.17.tar.gz
+Catalyst-View-Mason-0.18.tar.gz


Index: perl-Catalyst-View-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-View-Mason/devel/perl-Catalyst-View-Mason.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Catalyst-View-Mason.spec	26 Jul 2009 04:18:21 -0000	1.2
+++ perl-Catalyst-View-Mason.spec	23 Aug 2009 14:06:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-View-Mason
-Version:        0.17
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Mason View Class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Iain Arnell <iarnell at gmail.com> 0.18-1
+- update to latest upstream (for compatibility with Catalyst::Runtime 5.80010)
+
 * 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-View-Mason/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 May 2009 03:14:37 -0000	1.2
+++ sources	23 Aug 2009 14:06:49 -0000	1.3
@@ -1 +1 @@
-c01fe11d969d7c9762a315f22605c1a6  Catalyst-View-Mason-0.17.tar.gz
+43babe65905c38da7ebb9bed4dcb212c  Catalyst-View-Mason-0.18.tar.gz



From heffer at fedoraproject.org  Sun Aug 23 14:12:34 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 23 Aug 2009 14:12:34 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-11 .cvsignore, 1.2, 1.3 openttd-opengfx.spec,
	1.1, 1.2 sources, 1.2, 1.3 MD5SUM.opengfx, 1.1, NONE
Message-ID: <20090823141234.DCB6E11C00A2@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd-opengfx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17007

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Removed Files:
	MD5SUM.opengfx 
Log Message:
* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 May 2009 13:02:13 -0000	1.2
+++ .cvsignore	23 Aug 2009 14:12:34 -0000	1.3
@@ -1 +1 @@
-ogfx_source.zip
+opengfx-0.1.0-alpha6-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/openttd-opengfx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openttd-opengfx.spec	29 May 2009 13:02:13 -0000	1.1
+++ openttd-opengfx.spec	23 Aug 2009 14:12:34 -0000	1.2
@@ -1,21 +1,19 @@
-%define filename ogfx_source
+%define realname opengfx
+%define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0
-Release:        0.4.alpha4.2%{?dist}
+Version:        0.1.0
+Release:        0.1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
-URL:            http://www.tt-forums.net/viewtopic.php?f=36&t=40162
-# Upstream told me that this link could be broken anytime soon as the source
-# is moving to a VCS
-Source0:        http://bzr.jaspervries.nl/newgrf/opengfx/ogfx_source.zip
-Source1:        MD5SUM.opengfx
+URL:            http://dev.openttdcoop.org/projects/opengfx
+Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec
+BuildRequires:  grfcodec dos2unix
 Requires:       openttd
 
 
@@ -26,36 +24,21 @@ graphics from the original game.
 
 
 %prep
-%setup -q -c -n %{filename}
-
-tr -d \\r < readme.txt > readme.txt.unix
-iconv -f iso-8859-1 -t utf-8 readme.txt.unix > readme.txt.utf-8
-touch -r readme.txt readme.txt.utf-8
-rm readme.txt.unix
-mv readme.txt.utf-8 readme.txt
-
-tr -d \\r < SOURCE_README.txt > SOURCE_README.txt.unix
-touch -r SOURCE_README.txt SOURCE_README.txt.unix
-mv SOURCE_README.txt.unix SOURCE_README.txt
-
-tr -d \\r < COPYING > COPYING.unix
-touch -r COPYING COPYING.unix
-mv COPYING.unix COPYING
+%setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
+dos2unix docs/authoroverview.csv docs/changelog.ptxt docs/license.ptxt \
+    docs/readme.ptxt docs/aoHTMLoutput/config.inc.php \
+    docs/aoHTMLoutput/script.php docs/aoHTMLoutput/style.css
 
 
 %build
-grfcodec -e -p 2 opengfx1r.grf
-grfcodec -e -p 2 opengfxcr.grf
-grfcodec -e -p 2 opengfxhr.grf
-grfcodec -e -p 2 opengfxir.grf
-grfcodec -e -p 2 opengfxtr.grf
-grfcodec -e -p 2 opengfxw.grf
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/openttd/data
-install -pm 644 opengfx*.grf $RPM_BUILD_ROOT%{_datadir}/openttd/data
-install -pm 644 opengfx.obg $RPM_BUILD_ROOT%{_datadir}/openttd/data
+make install INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/openttd/data
 
 # OpenGFX doesn't have a sound file yet so this is required
 # otherwise OpenTTD refuses to start
@@ -64,7 +47,6 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 %check
 cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
-md5sum --check %{SOURCE1}
 
 
 %clean
@@ -73,11 +55,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc authoroverview.xls COPYING readme.txt SOURCE_README.txt
+%doc docs/*.txt
+%doc docs/aoHTMLoutput/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
+- new upstream release
+
 * Thu May 28 2009 Felix Kaechele <heffer at fedoraproject.org> - 0-0.4.alpha4.2
 - added md5 check
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 May 2009 13:02:13 -0000	1.2
+++ sources	23 Aug 2009 14:12:34 -0000	1.3
@@ -1 +1 @@
-86d1526c07706fc451e3ef404991ebe6  ogfx_source.zip
+b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz


--- MD5SUM.opengfx DELETED ---



From bochecha at fedoraproject.org  Sun Aug 23 14:17:32 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sun, 23 Aug 2009 14:17:32 +0000 (UTC)
Subject: rpms/klavaro/F-11 .cvsignore, 1.2, 1.3 klavaro.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090823141732.4247711C00A2@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/klavaro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17939

Modified Files:
	.cvsignore klavaro.spec sources 
Log Message:
Update to 1.2.4.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jul 2009 19:47:57 -0000	1.2
+++ .cvsignore	23 Aug 2009 14:17:31 -0000	1.3
@@ -1 +1 @@
-klavaro-1.2.1.tar.bz2
+klavaro-1.2.4.tar.bz2


Index: klavaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/F-11/klavaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- klavaro.spec	15 Jul 2009 19:47:57 -0000	1.1
+++ klavaro.spec	23 Aug 2009 14:17:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           klavaro
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Typing tutor
 
 Group:          Applications/Multimedia
@@ -83,6 +83,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.4-1
+- Update to 1.2.4
+
+* Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3
+
 * Wed Jul 15 2009 Fabian Affolter <fabian at bernewireless.net> - 1.2.1-3
 - Fixed license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jul 2009 19:47:57 -0000	1.2
+++ sources	23 Aug 2009 14:17:32 -0000	1.3
@@ -1 +1 @@
-fc704e757f7763713ad84d29865cb401  klavaro-1.2.1.tar.bz2
+ca33e061b90719f511cdb1d49d2ffd5e  klavaro-1.2.4.tar.bz2



From heffer at fedoraproject.org  Sun Aug 23 14:19:08 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 23 Aug 2009 14:19:08 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-10 .cvsignore, 1.2, 1.3 openttd-opengfx.spec,
	1.1, 1.2 sources, 1.2, 1.3 MD5SUM.opengfx, 1.1, NONE
Message-ID: <20090823141908.05ADB11C00A2@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd-opengfx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18407

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Removed Files:
	MD5SUM.opengfx 
Log Message:
* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 May 2009 12:44:28 -0000	1.2
+++ .cvsignore	23 Aug 2009 14:19:07 -0000	1.3
@@ -1 +1 @@
-ogfx_source.zip
+opengfx-0.1.0-alpha6-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/openttd-opengfx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openttd-opengfx.spec	29 May 2009 12:44:28 -0000	1.1
+++ openttd-opengfx.spec	23 Aug 2009 14:19:07 -0000	1.2
@@ -1,21 +1,19 @@
-%define filename ogfx_source
+%define realname opengfx
+%define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0
-Release:        0.4.alpha4.2%{?dist}
+Version:        0.1.0
+Release:        0.1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
-URL:            http://www.tt-forums.net/viewtopic.php?f=36&t=40162
-# Upstream told me that this link could be broken anytime soon as the source
-# is moving to a VCS
-Source0:        http://bzr.jaspervries.nl/newgrf/opengfx/ogfx_source.zip
-Source1:        MD5SUM.opengfx
+URL:            http://dev.openttdcoop.org/projects/opengfx
+Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec
+BuildRequires:  grfcodec dos2unix
 Requires:       openttd
 
 
@@ -26,36 +24,21 @@ graphics from the original game.
 
 
 %prep
-%setup -q -c -n %{filename}
-
-tr -d \\r < readme.txt > readme.txt.unix
-iconv -f iso-8859-1 -t utf-8 readme.txt.unix > readme.txt.utf-8
-touch -r readme.txt readme.txt.utf-8
-rm readme.txt.unix
-mv readme.txt.utf-8 readme.txt
-
-tr -d \\r < SOURCE_README.txt > SOURCE_README.txt.unix
-touch -r SOURCE_README.txt SOURCE_README.txt.unix
-mv SOURCE_README.txt.unix SOURCE_README.txt
-
-tr -d \\r < COPYING > COPYING.unix
-touch -r COPYING COPYING.unix
-mv COPYING.unix COPYING
+%setup -q -n %{realname}-%{version}%{?prever:-%{prever}}-source 
+dos2unix docs/authoroverview.csv docs/changelog.ptxt docs/license.ptxt \
+    docs/readme.ptxt docs/aoHTMLoutput/config.inc.php \
+    docs/aoHTMLoutput/script.php docs/aoHTMLoutput/style.css
 
 
 %build
-grfcodec -e -p 2 opengfx1r.grf
-grfcodec -e -p 2 opengfxcr.grf
-grfcodec -e -p 2 opengfxhr.grf
-grfcodec -e -p 2 opengfxir.grf
-grfcodec -e -p 2 opengfxtr.grf
-grfcodec -e -p 2 opengfxw.grf
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/openttd/data
-install -pm 644 opengfx*.grf $RPM_BUILD_ROOT%{_datadir}/openttd/data
-install -pm 644 opengfx.obg $RPM_BUILD_ROOT%{_datadir}/openttd/data
+make install INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/openttd/data
 
 # OpenGFX doesn't have a sound file yet so this is required
 # otherwise OpenTTD refuses to start
@@ -64,7 +47,6 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 %check
 cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
-md5sum --check %{SOURCE1}
 
 
 %clean
@@ -73,11 +55,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc authoroverview.xls COPYING readme.txt SOURCE_README.txt
+%doc docs/*.txt
+%doc docs/aoHTMLoutput/
 %{_datadir}/openttd/data/*
 
 
 %changelog
+* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
+- new upstream release
+
 * Thu May 28 2009 Felix Kaechele <heffer at fedoraproject.org> - 0-0.4.alpha4.2
 - added md5 check
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 May 2009 12:44:28 -0000	1.2
+++ sources	23 Aug 2009 14:19:07 -0000	1.3
@@ -1 +1 @@
-86d1526c07706fc451e3ef404991ebe6  ogfx_source.zip
+b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz


--- MD5SUM.opengfx DELETED ---



From pkgdb at fedoraproject.org  Sun Aug 23 14:55:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 14:55:58 +0000
Subject: [pkgdb] php-adodb ownership updated
Message-ID: <20090823145558.490A310F894@bastion2.fedora.phx.redhat.com>

Package php-adodb in Fedora devel is now owned by giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From heffer at fedoraproject.org  Sun Aug 23 15:00:02 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 23 Aug 2009 15:00:02 +0000 (UTC)
Subject: rpms/openttd/devel .cvsignore, 1.3, 1.4 openttd.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090823150003.149DA11C0426@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27209

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
- new upstream release 0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 15:27:18 -0000	1.3
+++ .cvsignore	23 Aug 2009 15:00:01 -0000	1.4
@@ -1 +1 @@
-openttd-0.7.1-source.tar.bz2
+openttd-0.7.2-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/openttd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openttd.spec	25 Jul 2009 20:54:59 -0000	1.5
+++ openttd.spec	23 Aug 2009 15:00:01 -0000	1.6
@@ -2,8 +2,8 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        Transport system simulation game
 
 Group:          Amusements/Games
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
+- new upstream release 0.7.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 15:27:18 -0000	1.3
+++ sources	23 Aug 2009 15:00:01 -0000	1.4
@@ -1 +1 @@
-8d9b6e7afef15d4ea12f73207a0bfeb6  openttd-0.7.1-source.tar.bz2
+d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2



From bochecha at fedoraproject.org  Sun Aug 23 15:01:32 2009
From: bochecha at fedoraproject.org (Mathieu Bridon)
Date: Sun, 23 Aug 2009 15:01:32 +0000 (UTC)
Subject: rpms/klavaro/F-10 .cvsignore, 1.2, 1.3 klavaro.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090823150132.6B25811C00A2@cvs1.fedora.phx.redhat.com>

Author: bochecha

Update of /cvs/pkgs/rpms/klavaro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26628

Modified Files:
	.cvsignore klavaro.spec sources 
Log Message:
Update to 1.2.4.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jul 2009 19:46:25 -0000	1.2
+++ .cvsignore	23 Aug 2009 15:01:32 -0000	1.3
@@ -1 +1 @@
-klavaro-1.2.1.tar.bz2
+klavaro-1.2.4.tar.bz2


Index: klavaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/F-10/klavaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- klavaro.spec	15 Jul 2009 19:46:25 -0000	1.1
+++ klavaro.spec	23 Aug 2009 15:01:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           klavaro
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Typing tutor
 
 Group:          Applications/Multimedia
@@ -83,6 +83,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.4-1
+- Update to 1.2.4
+
+* Sun Aug 23 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3
+
 * Wed Jul 15 2009 Fabian Affolter <fabian at bernewireless.net> - 1.2.1-3
 - Fixed license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klavaro/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jul 2009 19:46:25 -0000	1.2
+++ sources	23 Aug 2009 15:01:32 -0000	1.3
@@ -1 +1 @@
-fc704e757f7763713ad84d29865cb401  klavaro-1.2.1.tar.bz2
+ca33e061b90719f511cdb1d49d2ffd5e  klavaro-1.2.4.tar.bz2



From heffer at fedoraproject.org  Sun Aug 23 15:16:43 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 23 Aug 2009 15:16:43 +0000 (UTC)
Subject: rpms/openttd/F-11 .cvsignore, 1.3, 1.4 openttd.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090823151643.35CC411C00A2@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30295

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
- new upstream release 0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 18:24:57 -0000	1.3
+++ .cvsignore	23 Aug 2009 15:16:41 -0000	1.4
@@ -1 +1 @@
-openttd-0.7.1-source.tar.bz2
+openttd-0.7.2-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/openttd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openttd.spec	12 Jun 2009 18:24:57 -0000	1.4
+++ openttd.spec	23 Aug 2009 15:16:41 -0000	1.5
@@ -2,7 +2,7 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.1
+Version:        0.7.2
 Release:        1%{?dist}
 Summary:        Transport system simulation game
 
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
+- new upstream release 0.7.2
+
 * Fri Jun 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.1-1
 - upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 18:24:57 -0000	1.3
+++ sources	23 Aug 2009 15:16:41 -0000	1.4
@@ -1 +1 @@
-8d9b6e7afef15d4ea12f73207a0bfeb6  openttd-0.7.1-source.tar.bz2
+d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2



From heffer at fedoraproject.org  Sun Aug 23 15:18:20 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 23 Aug 2009 15:18:20 +0000 (UTC)
Subject: rpms/openttd/F-10 .cvsignore, 1.3, 1.4 openttd.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090823151820.E7D9911C00A2@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/openttd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30690

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
- new upstream release 0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Jun 2009 18:37:48 -0000	1.3
+++ .cvsignore	23 Aug 2009 15:18:20 -0000	1.4
@@ -1 +1 @@
-openttd-0.7.1-source.tar.bz2
+openttd-0.7.2-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-10/openttd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openttd.spec	12 Jun 2009 18:37:49 -0000	1.4
+++ openttd.spec	23 Aug 2009 15:18:20 -0000	1.5
@@ -2,7 +2,7 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.1
+Version:        0.7.2
 Release:        1%{?dist}
 Summary:        Transport system simulation game
 
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
+- new upstream release 0.7.2
+
 * Fri Jun 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.1-1
 - upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Jun 2009 18:37:49 -0000	1.3
+++ sources	23 Aug 2009 15:18:20 -0000	1.4
@@ -1 +1 @@
-8d9b6e7afef15d4ea12f73207a0bfeb6  openttd-0.7.1-source.tar.bz2
+d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2



From ynemoy at fedoraproject.org  Sun Aug 23 15:56:10 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sun, 23 Aug 2009 15:56:10 +0000 (UTC)
Subject: rpms/ghc-tar/devel ghc-tar.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090823155610.734CB11C00A2@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-tar.spec import.log 
Log Message:
Initial Import


--- NEW FILE ghc-tar.spec ---
%global pkg_name tar
%global ghc_version 6.10.1

%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.3.0.0
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc = %{ghc_version}
%if %{with doc}
BuildRequires:  ghc-doc = %{ghc_version}
%endif
%if %{with prof}
BuildRequires:  ghc-prof = %{ghc_version}
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary: Documentation for %{name}
Group: Development/Libraries
Requires: ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary: Profiling libraries for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%cabal_configure --ghc %{!?without_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
%endif
%ghc_gen_scripts


%install
rm -rf $RPM_BUILD_ROOT
%cabal_install
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc
%defattr(-,root,root,-)
%{pkg_docdir}
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Tue Mar  3 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
ghc-tar-0_3_0_0-1_fc10:HEAD:ghc-tar-0.3.0.0-1.fc10.src.rpm:1251042951


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:21:20 -0000	1.1
+++ .cvsignore	23 Aug 2009 15:56:10 -0000	1.2
@@ -0,0 +1 @@
+tar-0.3.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:21:20 -0000	1.1
+++ sources	23 Aug 2009 15:56:10 -0000	1.2
@@ -0,0 +1 @@
+3e77fe5b25566ab16adc5496b64bd0bd  tar-0.3.0.0.tar.gz



From ynemoy at fedoraproject.org  Sun Aug 23 16:10:23 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sun, 23 Aug 2009 16:10:23 +0000 (UTC)
Subject: rpms/ghc-tar/devel ghc-tar.spec,1.1,1.2
Message-ID: <20090823161023.57CF911C0426@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9183

Modified Files:
	ghc-tar.spec 
Log Message:
Updated to latest cabal2spec


Index: ghc-tar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/ghc-tar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-tar.spec	23 Aug 2009 15:56:10 -0000	1.1
+++ ghc-tar.spec	23 Aug 2009 16:10:23 -0000	1.2
@@ -1,8 +1,4 @@
 %global pkg_name tar
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -12,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -22,12 +18,13 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
+BuildRequires:  ghc-rpm-macros
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -67,7 +64,8 @@ Requires: %{name}-devel = %{version}-%{r
 Requires: ghc-prof = %{ghc_version}
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -76,7 +74,7 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -125,9 +123,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -138,5 +135,8 @@ fi
 
 
 %changelog
+* Sun Aug 23 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-2
+- updated to latest cabal2spec output
+
 * Tue Mar  3 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-1
 - initial packaging for Fedora created by cabal2spec



From rathann at fedoraproject.org  Sun Aug 23 16:13:07 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 23 Aug 2009 16:13:07 +0000 (UTC)
Subject: rpms/crm114/devel .cvsignore, 1.6, 1.7 crm114-rpm.patch, 1.4,
	1.5 crm114.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090823161307.B580D11C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/crm114/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9772

Modified Files:
	.cvsignore crm114-rpm.patch crm114.spec sources 
Log Message:
* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.11.20090807
- updated to 20090807 "BlameThorstenAndJenny"
- dropped upstreamed patch hunks, rebased patch
- updated source URL
- license changed to GPLv3
- needs release note: .css files format has changed, they must be rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Jan 2009 23:47:24 -0000	1.6
+++ .cvsignore	23 Aug 2009 16:13:07 -0000	1.7
@@ -1 +1 @@
-crm114-20080703-BlameVT.src.tar.gz
+crm114-20090807-BlameThorstenAndJenny.src.tar.gz

crm114-rpm.patch:
 Makefile |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Index: crm114-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- crm114-rpm.patch	9 Jul 2008 18:38:45 -0000	1.4
+++ crm114-rpm.patch	23 Aug 2009 16:13:07 -0000	1.5
@@ -1,43 +1,27 @@
-diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Makefile
---- crm114-20080703-BlameVT.src/Makefile.r	2008-07-01 01:28:43.000000000 +0200
-+++ crm114-20080703-BlameVT.src/Makefile	2008-07-09 19:57:41.000000000 +0200
-@@ -72,7 +72,7 @@ SYSTEMTYPE = POSIX
+diff -up crm114-20090807-BlameThorstenAndJenny.src/Makefile.r crm114-20090807-BlameThorstenAndJenny.src/Makefile
+--- crm114-20090807-BlameThorstenAndJenny.src/Makefile.r	2009-08-07 17:22:37.000000000 +0200
++++ crm114-20090807-BlameThorstenAndJenny.src/Makefile	2009-08-23 17:31:00.000000000 +0200
+@@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
  #  really picayune stuff.
- #  
+ #
  #  Our default is with debugging, full optimization, and lots of warnings:
--CFLAGS += -g -O3 -Wall
-+#CFLAGS += -g -O3 -Wall
- #     turn this one on for no optimization, but debugging and time profiling:
- #CFLAGS += -g -O0 -Wall -pg
- #     turn this one on for really picayune debugging:
-@@ -84,7 +84,7 @@ CFLAGS += -g -O3 -Wall
+-CFLAGS += -O3 -Wall
++CFLAGS += $(OPTFLAGS)
+ #     turn this one on for no optimization, but debugging
+ #CFLAGS += -g -O0 -Wall
+ #
+@@ -111,7 +111,7 @@ CFLAGS += -O3 -Wall
+ #   Comment this out if you want dynamic linking
+ #
  #    BSD users - do NOT use -static-libgcc!!!
- #LDFLAGS += -static -static-libgcc 
+-LDFLAGS += -static -static-libgcc
++#LDFLAGS += -static -static-libgcc
  #    use this one if you want program profiling.
--LDFLAGS += -static -static-libgcc -pg
-+#LDFLAGS += -static -static-libgcc -pg
- #
- #   Any standard install flags?  We nominally use protection 755
- INSTALLFLAGS += -m 755
-@@ -454,13 +454,13 @@ osbf-util: osbf-util.c crm_osbf_maintena
- 		crm_util_errorhandlers.o \
- 		crm_osbf_maintenance.o -lm -ltre -o osbf-util
- 
--cssdiff: cssdiff.c crm_util_errorhandlers.o $(HFILES)
-+cssdiff: cssdiff.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
- 	$(CC)  $(CFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' -c cssdiff.c -o cssdiff.o
- 	$(CC)  $(CFLAGS) $(LDFLAGS) \
- 		crm_util_errorhandlers.o \
- 		crm_str_funcs.o -ltre cssdiff.o -o cssdiff
- 
--cssmerge: cssmerge.c crm_util_errorhandlers.o $(HFILES)
-+cssmerge: cssmerge.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
- 	$(CC)  $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \
- 		crm_str_funcs.o \
- 		crm_util_errorhandlers.o \
-@@ -493,13 +493,13 @@ install_utils:
+ #LDFLAGS += -static -static-libgcc -pg
+ #LDFLAGS += -pg
+@@ -350,13 +350,13 @@ install_utils:
  	#    Installing Utilities
- 	#	
+ 	#
  	$(MAKE) cssmerge cssutil cssdiff osbf-util
 -	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
@@ -54,7 +38,7 @@ diff -up crm114-20080703-BlameVT.src/Mak
  
  
  # use different name so we can keep it around along with default one
-@@ -508,15 +508,15 @@ install_engine: crm114
+@@ -365,15 +365,15 @@ install_engine: crm114
  	#
  	#    Installing engine
  	#
@@ -65,13 +49,13 @@ diff -up crm114-20080703-BlameVT.src/Mak
 -	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
--	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)	
+-	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
 -	-install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
-+	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)	
++	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
 +	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
  


Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- crm114.spec	24 Jul 2009 19:39:10 -0000	1.10
+++ crm114.spec	23 Aug 2009 16:13:07 -0000	1.11
@@ -1,15 +1,14 @@
-%define cvsver 20080703
-%define codename BlameVT
-%define rel 10
+%define cvsver 20090807
+%define codename BlameThorstenAndJenny
 
 Summary: CRM114 Bayesian Spam Detector
 Name: crm114
 Version: 0
-Release: 1.%{rel}.%{cvsver}%{?dist}
+Release: 1.11.%{cvsver}%{?dist}
 URL: http://crm114.sourceforge.net/
-License: GPLv2
+License: GPLv3
 Group: Applications/Text
-Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.src.tar.gz
+Source0: http://crm114.sourceforge.net/tarballs/%{name}-%{cvsver}-%{codename}.src.tar.gz
 Patch0: %{name}-rpm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: tre-devel
@@ -36,7 +35,7 @@ Major Emacs mode for editing crm114 scri
 chmod 644 mailfilter.cf
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +61,13 @@ make megatest
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.11.20090807
+- updated to 20090807 "BlameThorstenAndJenny"
+- dropped upstreamed patch hunks, rebased patch
+- updated source URL
+- license changed to GPLv3
+- needs release note: .css files format has changed, they must be rebuilt
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-1.10.20080703
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Jan 2009 23:47:24 -0000	1.6
+++ sources	23 Aug 2009 16:13:07 -0000	1.7
@@ -1 +1 @@
-51ba5490d9787de9461a28a79da59586  crm114-20080703-BlameVT.src.tar.gz
+e3bccda2a497aa1bc78999229b427650  crm114-20090807-BlameThorstenAndJenny.src.tar.gz



From ynemoy at fedoraproject.org  Sun Aug 23 16:18:32 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sun, 23 Aug 2009 16:18:32 +0000 (UTC)
Subject: rpms/ghc-tar/F-11 ghc-tar.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090823161832.87C4E11C00A2@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-tar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10891

Modified Files:
	sources 
Added Files:
	ghc-tar.spec 
Log Message:
Initial F-11 branch



--- NEW FILE ghc-tar.spec ---
%global pkg_name tar

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        0.3.0.0
Release:        2%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary: Documentation for %{name}
Group: Development/Libraries
Requires: ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary: Profiling libraries for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Sun Aug 23 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-2
- updated to latest cabal2spec output

* Tue Mar  3 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-1
- initial packaging for Fedora created by cabal2spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:21:20 -0000	1.1
+++ sources	23 Aug 2009 16:18:32 -0000	1.2
@@ -0,0 +1 @@
+3e77fe5b25566ab16adc5496b64bd0bd  tar-0.3.0.0.tar.gz



From tmz at fedoraproject.org  Sun Aug 23 16:33:47 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sun, 23 Aug 2009 16:33:47 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.77, 1.78 git.spec, 1.90, 1.91 sources, 
	1.77, 1.78
Message-ID: <20090823163347.2875611C00A2@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14740

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	29 Jul 2009 11:49:52 -0000	1.77
+++ .cvsignore	23 Aug 2009 16:33:46 -0000	1.78
@@ -1 +1 @@
-git-1.6.4.tar.bz2
+git-1.6.4.1.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- git.spec	21 Aug 2009 13:30:59 -0000	1.90
+++ git.spec	23 Aug 2009 16:33:46 -0000	1.91
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.4
-Release:        2%{?dist}
+Version:        1.6.4.1
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sat Aug 22 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.1-1
+- git-1.6.4.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.4-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	29 Jul 2009 11:49:52 -0000	1.77
+++ sources	23 Aug 2009 16:33:46 -0000	1.78
@@ -1 +1 @@
-d41e3d43c8f1d23024fb3d3fe6aa3858  git-1.6.4.tar.bz2
+bdc9b8be7d56a3beabad2d228f2e8e9a  git-1.6.4.1.tar.bz2



From abompard at fedoraproject.org  Sun Aug 23 16:51:11 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 16:51:11 +0000 (UTC)
Subject: rpms/spring/F-10 spring-0.80.2-allegro.patch, NONE,
	1.1 spring-0.79.1.2-allegro.patch, 1.1, NONE
Message-ID: <20090823165111.DE22011C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17965/F-10

Added Files:
	spring-0.80.2-allegro.patch 
Removed Files:
	spring-0.79.1.2-allegro.patch 
Log Message:
forgot to cvs add the patch

spring-0.80.2-allegro.patch:
 CMakeLists.txt                |    3 +-
 build/cmake/FindAllegro.cmake |   61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

--- NEW FILE spring-0.80.2-allegro.patch ---
diff -up ./rts/build/cmake/FindAllegro.cmake.allegro ./rts/build/cmake/FindAllegro.cmake
--- ./rts/build/cmake/FindAllegro.cmake.allegro	2009-08-22 20:07:41.000000000 +0200
+++ ./rts/build/cmake/FindAllegro.cmake	2009-08-22 20:07:41.000000000 +0200
@@ -0,0 +1,61 @@
+# http://guichan.googlecode.com/svn/trunk/CMake/Modules/FindAllegro.cmake
+# - Try to find Allegro
+# Once done this will define
+#
+#  ALLEGRO_FOUND - system has Allegro
+#  ALLEGRO_INCLUDE_DIRS - the Allegro include directory
+#  ALLEGRO_LIBRARIES - Link these to use Allegro
+#  ALLEGRO_DEFINITIONS - Compiler switches required for using Allegro
+#
+#  Copyright (c) 2008 Olof Naessen <olof.naessen at gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+  # in cache already
+  set(ALLEGRO_FOUND TRUE)
+else (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+  find_program(ALLEGROCONFIG_EXECUTABLE NAMES allegro-config PATHS
+     /opt/local/bin
+  )
+
+  #reset vars
+  set(ALLEGRO_LIBRARIES)
+  set(ALLEGRO_INCLUDE_DIRS)
+
+  # if allegro-config has been found
+  if(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_LIBRARIES)
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_INCLUDE_DIRS)
+
+    if(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+      set(ALLEGRO_FOUND TRUE)
+    endif(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+    set( ALLEGRO_LIBRARIES ${ALLEGRO_LIBRARIES} CACHE STRING "The libraries for allegro" )
+
+    mark_as_advanced(ALLEGRO_LIBRARIES ALLEGRO_INCLUDE_DIRS)
+
+  endif(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+  if (ALLEGRO_FOUND)
+    if (NOT Allegro_FIND_QUIETLY)
+      message(STATUS "Found Allegro: ${ALLEGRO_LIBRARIES}")
+    endif (NOT Allegro_FIND_QUIETLY)
+  else (ALLEGRO_FOUND)
+    if (Allegro_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Allegro")
+    endif (Allegro_FIND_REQUIRED)
+  endif (ALLEGRO_FOUND)
+
+  # show the ALLEGRO_INCLUDE_DIRS and ALLEGRO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(ALLEGRO_INCLUDE_DIRS ALLEGRO_LIBRARIES)
+
+endif (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
diff -up ./rts/CMakeLists.txt.allegro ./rts/CMakeLists.txt
--- ./rts/CMakeLists.txt.allegro	2009-08-21 20:58:58.000000000 +0200
+++ ./rts/CMakeLists.txt	2009-08-22 20:10:22.000000000 +0200
@@ -57,7 +57,8 @@ FIND_PACKAGE(OpenGL REQUIRED)
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLUT REQUIRED)
 FIND_PACKAGE(GLEW REQUIRED)
-LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY})
+FIND_PACKAGE(Allegro REQUIRED)
+LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY} ${ALLEGRO_LIBRARIES})
 
 FIND_PACKAGE(Freetype REQUIRED)
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})


--- spring-0.79.1.2-allegro.patch DELETED ---



From abompard at fedoraproject.org  Sun Aug 23 16:51:12 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 16:51:12 +0000 (UTC)
Subject: rpms/spring/F-11 spring-0.80.2-allegro.patch, NONE,
	1.1 spring-0.79.1.2-allegro.patch, 1.1, NONE
Message-ID: <20090823165112.248C911C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17965/F-11

Added Files:
	spring-0.80.2-allegro.patch 
Removed Files:
	spring-0.79.1.2-allegro.patch 
Log Message:
forgot to cvs add the patch

spring-0.80.2-allegro.patch:
 CMakeLists.txt                |    3 +-
 build/cmake/FindAllegro.cmake |   61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

--- NEW FILE spring-0.80.2-allegro.patch ---
diff -up ./rts/build/cmake/FindAllegro.cmake.allegro ./rts/build/cmake/FindAllegro.cmake
--- ./rts/build/cmake/FindAllegro.cmake.allegro	2009-08-22 20:07:41.000000000 +0200
+++ ./rts/build/cmake/FindAllegro.cmake	2009-08-22 20:07:41.000000000 +0200
@@ -0,0 +1,61 @@
+# http://guichan.googlecode.com/svn/trunk/CMake/Modules/FindAllegro.cmake
+# - Try to find Allegro
+# Once done this will define
+#
+#  ALLEGRO_FOUND - system has Allegro
+#  ALLEGRO_INCLUDE_DIRS - the Allegro include directory
+#  ALLEGRO_LIBRARIES - Link these to use Allegro
+#  ALLEGRO_DEFINITIONS - Compiler switches required for using Allegro
+#
+#  Copyright (c) 2008 Olof Naessen <olof.naessen at gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+  # in cache already
+  set(ALLEGRO_FOUND TRUE)
+else (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+  find_program(ALLEGROCONFIG_EXECUTABLE NAMES allegro-config PATHS
+     /opt/local/bin
+  )
+
+  #reset vars
+  set(ALLEGRO_LIBRARIES)
+  set(ALLEGRO_INCLUDE_DIRS)
+
+  # if allegro-config has been found
+  if(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_LIBRARIES)
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_INCLUDE_DIRS)
+
+    if(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+      set(ALLEGRO_FOUND TRUE)
+    endif(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+    set( ALLEGRO_LIBRARIES ${ALLEGRO_LIBRARIES} CACHE STRING "The libraries for allegro" )
+
+    mark_as_advanced(ALLEGRO_LIBRARIES ALLEGRO_INCLUDE_DIRS)
+
+  endif(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+  if (ALLEGRO_FOUND)
+    if (NOT Allegro_FIND_QUIETLY)
+      message(STATUS "Found Allegro: ${ALLEGRO_LIBRARIES}")
+    endif (NOT Allegro_FIND_QUIETLY)
+  else (ALLEGRO_FOUND)
+    if (Allegro_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Allegro")
+    endif (Allegro_FIND_REQUIRED)
+  endif (ALLEGRO_FOUND)
+
+  # show the ALLEGRO_INCLUDE_DIRS and ALLEGRO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(ALLEGRO_INCLUDE_DIRS ALLEGRO_LIBRARIES)
+
+endif (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
diff -up ./rts/CMakeLists.txt.allegro ./rts/CMakeLists.txt
--- ./rts/CMakeLists.txt.allegro	2009-08-21 20:58:58.000000000 +0200
+++ ./rts/CMakeLists.txt	2009-08-22 20:10:22.000000000 +0200
@@ -57,7 +57,8 @@ FIND_PACKAGE(OpenGL REQUIRED)
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLUT REQUIRED)
 FIND_PACKAGE(GLEW REQUIRED)
-LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY})
+FIND_PACKAGE(Allegro REQUIRED)
+LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY} ${ALLEGRO_LIBRARIES})
 
 FIND_PACKAGE(Freetype REQUIRED)
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})


--- spring-0.79.1.2-allegro.patch DELETED ---



From abompard at fedoraproject.org  Sun Aug 23 16:51:12 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 23 Aug 2009 16:51:12 +0000 (UTC)
Subject: rpms/spring/devel spring-0.80.2-allegro.patch, NONE,
	1.1 spring-0.79.1.2-allegro.patch, 1.1, NONE
Message-ID: <20090823165112.6AAFF11C00A2@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17965/devel

Added Files:
	spring-0.80.2-allegro.patch 
Removed Files:
	spring-0.79.1.2-allegro.patch 
Log Message:
forgot to cvs add the patch

spring-0.80.2-allegro.patch:
 CMakeLists.txt                |    3 +-
 build/cmake/FindAllegro.cmake |   61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

--- NEW FILE spring-0.80.2-allegro.patch ---
diff -up ./rts/build/cmake/FindAllegro.cmake.allegro ./rts/build/cmake/FindAllegro.cmake
--- ./rts/build/cmake/FindAllegro.cmake.allegro	2009-08-22 20:07:41.000000000 +0200
+++ ./rts/build/cmake/FindAllegro.cmake	2009-08-22 20:07:41.000000000 +0200
@@ -0,0 +1,61 @@
+# http://guichan.googlecode.com/svn/trunk/CMake/Modules/FindAllegro.cmake
+# - Try to find Allegro
+# Once done this will define
+#
+#  ALLEGRO_FOUND - system has Allegro
+#  ALLEGRO_INCLUDE_DIRS - the Allegro include directory
+#  ALLEGRO_LIBRARIES - Link these to use Allegro
+#  ALLEGRO_DEFINITIONS - Compiler switches required for using Allegro
+#
+#  Copyright (c) 2008 Olof Naessen <olof.naessen at gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+  # in cache already
+  set(ALLEGRO_FOUND TRUE)
+else (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+  find_program(ALLEGROCONFIG_EXECUTABLE NAMES allegro-config PATHS
+     /opt/local/bin
+  )
+
+  #reset vars
+  set(ALLEGRO_LIBRARIES)
+  set(ALLEGRO_INCLUDE_DIRS)
+
+  # if allegro-config has been found
+  if(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_LIBRARIES)
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_INCLUDE_DIRS)
+
+    if(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+      set(ALLEGRO_FOUND TRUE)
+    endif(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+    set( ALLEGRO_LIBRARIES ${ALLEGRO_LIBRARIES} CACHE STRING "The libraries for allegro" )
+
+    mark_as_advanced(ALLEGRO_LIBRARIES ALLEGRO_INCLUDE_DIRS)
+
+  endif(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+  if (ALLEGRO_FOUND)
+    if (NOT Allegro_FIND_QUIETLY)
+      message(STATUS "Found Allegro: ${ALLEGRO_LIBRARIES}")
+    endif (NOT Allegro_FIND_QUIETLY)
+  else (ALLEGRO_FOUND)
+    if (Allegro_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Allegro")
+    endif (Allegro_FIND_REQUIRED)
+  endif (ALLEGRO_FOUND)
+
+  # show the ALLEGRO_INCLUDE_DIRS and ALLEGRO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(ALLEGRO_INCLUDE_DIRS ALLEGRO_LIBRARIES)
+
+endif (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
diff -up ./rts/CMakeLists.txt.allegro ./rts/CMakeLists.txt
--- ./rts/CMakeLists.txt.allegro	2009-08-21 20:58:58.000000000 +0200
+++ ./rts/CMakeLists.txt	2009-08-22 20:10:22.000000000 +0200
@@ -57,7 +57,8 @@ FIND_PACKAGE(OpenGL REQUIRED)
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLUT REQUIRED)
 FIND_PACKAGE(GLEW REQUIRED)
-LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY})
+FIND_PACKAGE(Allegro REQUIRED)
+LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_IL_LIBRARY} ${DEVIL_ILU_LIBRARY} ${ALLEGRO_LIBRARIES})
 
 FIND_PACKAGE(Freetype REQUIRED)
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})


--- spring-0.79.1.2-allegro.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Aug 23 17:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 17:23:12 +0000
Subject: [pkgdb] php-adodb ownership updated
Message-ID: <20090823172312.E014D10F86F@bastion2.fedora.phx.redhat.com>

Package php-adodb in Fedora 11 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Sun Aug 23 17:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 17:23:13 +0000
Subject: [pkgdb] php-adodb ownership updated
Message-ID: <20090823172313.CFC4310F878@bastion2.fedora.phx.redhat.com>

Package php-adodb in Fedora 10 was orphaned by abompard

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From jspaleta at fedoraproject.org  Sun Aug 23 17:25:05 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun, 23 Aug 2009 17:25:05 +0000 (UTC)
Subject: rpms/gourmet/devel gourmet.spec,1.15,1.16 sources,1.9,1.10
Message-ID: <20090823172505.1F54611C00A2@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25445

Modified Files:
	gourmet.spec sources 
Log Message:
* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-1
- Latest upstream release, major changes include plugin system for capabilities



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/gourmet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gourmet.spec	25 Jul 2009 01:04:56 -0000	1.15
+++ gourmet.spec	23 Aug 2009 17:25:04 -0000	1.16
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gourmet
-Version:	0.13.4
-Release:	6%{?dist}
+Version:	0.15.0
+Release:	1%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://grecipe-manager.sourceforge.net
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}-2.tar.gz
+Source0:	http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -28,7 +28,7 @@ files and exports webpages & other forma
 
 %prep
 %setup -q
-chmod -x data/recipe.dtd
+#chmod -x data/recipe.dtd
 
 %build
 
@@ -58,7 +58,7 @@ rm -rf %buildroot
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc CHANGES PKG-INFO README TODO
-%doc documentation
+#%doc documentation
 %_bindir/gourmet
 # sitelib stuff
 %{python_sitelib}/gourmet
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-1
+- Latest upstream release, major changes include plugin system for capabilities
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 Jul 2007 07:14:11 -0000	1.9
+++ sources	23 Aug 2009 17:25:04 -0000	1.10
@@ -1 +1 @@
-d60b319f05543f837d40abf32c0d1fa8  gourmet-0.13.4-2.tar.gz
+a53d8dd05893755cf634f2e75b4e9696  gourmet-0.15.0.tar.gz



From dwalsh at fedoraproject.org  Sun Aug 23 17:39:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun, 23 Aug 2009 17:39:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.59,1.60
Message-ID: <20090823173952.3E48111C00A2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28917

Modified Files:
	policy-F12.patch 
Log Message:
* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-6
- Add capability setting to dhcpc and gpm


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   16 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 -
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |   16 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  155 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  391 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 policy/modules/services/gpm.te                     |    1 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   46 
 policy/modules/services/policykit.te               |   54 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  183 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 ++++
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 +++++++-
 policy/modules/services/xserver.te                 |  306 +++-
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  268 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.if                      |   21 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1364 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 331 files changed, 14520 insertions(+), 2978 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- policy-F12.patch	23 Aug 2009 13:55:48 -0000	1.59
+++ policy-F12.patch	23 Aug 2009 17:39:51 -0000	1.60
@@ -11114,7 +11114,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.28/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/dbus.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/dbus.if	2009-08-23 12:50:58.000000000 -0400
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -11215,6 +11215,31 @@ diff -b -B --ignore-all-space --exclude-
  	ifdef(`hide_broken_symptoms', `
  		dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
  	')
+@@ -405,3 +421,24 @@
+ 
+ 	typeattribute $1 dbusd_unconfined;
+ ')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	system dbus lib files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dbus_manage_lib_files',`
++	gen_require(`
++		type system_dbus_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	manage_files_pattern($1, system_dbus_var_lib_t, system_dbus_var_lib_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.28/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/dbus.te	2009-08-21 18:56:07.000000000 -0400
@@ -17533,7 +17558,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.28/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/ssh.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/ssh.if	2009-08-23 12:58:23.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -17770,7 +17795,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  ## <summary>
-@@ -603,3 +638,63 @@
+@@ -603,3 +638,83 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -17834,6 +17859,26 @@ diff -b -B --ignore-all-space --exclude-
 +	read_lnk_files_pattern($1, home_ssh_t, home_ssh_t)
 +	userdom_search_user_home_dirs($1)
 +')
++
++########################################
++## <summary>
++##	Set the attributes of sshd key files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ssh_setattr_key_files',`
++	gen_require(`
++		type sshd_key_t;
++	')
++
++	allow $1 sshd_key_t:file setattr;
++	files_search_pids($1)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.28/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/ssh.te	2009-08-21 18:56:07.000000000 -0400
@@ -18030,7 +18075,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.6.28/policy/modules/services/sssd.if
 --- nsaserefpolicy/policy/modules/services/sssd.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/sssd.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/sssd.if	2009-08-23 12:49:30.000000000 -0400
 @@ -12,12 +12,32 @@
  #
  interface(`sssd_domtrans',`
@@ -21231,7 +21276,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.28/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/init.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/init.te	2009-08-23 13:00:32.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -21515,7 +21560,23 @@ 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)
-@@ -422,8 +478,6 @@
+@@ -374,13 +430,14 @@
+ 
+ miscfiles_read_localization(initrc_t)
+ # slapd needs to read cert files from its initscript
+-miscfiles_read_certs(initrc_t)
++miscfiles_manage_cert_files(initrc_t)
+ 
+ modutils_read_module_config(initrc_t)
+ modutils_domtrans_insmod(initrc_t)
+ 
+ seutil_read_config(initrc_t)
+ 
++userdom_read_admin_home_files(initrc_t)
+ userdom_read_user_home_content_files(initrc_t)
+ # Allow access to the sysadm TTYs. Note that this will give access to the 
+ # TTYs to any process in the initrc_t domain. Therefore, daemons and such
+@@ -422,8 +479,6 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -21524,7 +21585,7 @@ 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 +504,9 @@
+@@ -450,11 +505,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -21537,7 +21598,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 +516,7 @@
+@@ -464,6 +517,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -21545,7 +21606,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 +545,13 @@
+@@ -492,11 +546,13 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
@@ -21559,7 +21620,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -515,6 +570,33 @@
+@@ -515,6 +571,33 @@
  	')
  ')
  
@@ -21593,14 +21654,17 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -569,8 +651,16 @@
+@@ -567,10 +650,19 @@
+ 	dbus_connect_system_bus(initrc_t)
+ 	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
- 
- 	optional_policy(`
-+		consolekit_dbus_chat(initrc_t)
-+	')
++	dbus_manage_lib_files(initrc_t)
 +
 +	optional_policy(`
++		consolekit_dbus_chat(initrc_t)
++	')
+ 
+ 	optional_policy(`
  		networkmanager_dbus_chat(initrc_t)
  	')
 +
@@ -21610,7 +21674,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -590,6 +680,10 @@
+@@ -590,6 +682,10 @@
  ')
  
  optional_policy(`
@@ -21621,7 +21685,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +740,20 @@
+@@ -646,20 +742,20 @@
  ')
  
  optional_policy(`
@@ -21648,7 +21712,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +762,7 @@
+@@ -668,6 +764,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -21656,7 +21720,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -696,7 +791,6 @@
+@@ -696,7 +793,6 @@
  ')
  
  optional_policy(`
@@ -21664,7 +21728,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -718,8 +812,6 @@
+@@ -718,8 +814,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -21673,7 +21737,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -732,10 +824,12 @@
+@@ -732,13 +826,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -21686,7 +21750,19 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +848,15 @@
++	ssh_setattr_key_files(initrc_t)
+ ')
+ 
+ optional_policy(`
+@@ -747,6 +844,7 @@
+ 
+ optional_policy(`
+ 	udev_rw_db(initrc_t)
++	udev_manage_pid_files(initrc_t)
+ ')
+ 
+ optional_policy(`
+@@ -754,6 +852,15 @@
  ')
  
  optional_policy(`
@@ -21702,7 +21778,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +867,13 @@
+@@ -764,6 +871,13 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -21716,7 +21792,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +899,31 @@
+@@ -789,3 +903,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -24985,6 +25061,35 @@ diff -b -B --ignore-all-space --exclude-
  
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /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.28/policy/modules/system/udev.if
+--- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/udev.if	2009-08-23 12:54:42.000000000 -0400
+@@ -168,4 +168,25 @@
+ 
+ 	dev_list_all_dev_nodes($1)
+ 	allow $1 udev_tbl_t:file rw_file_perms;
++	allow $1 udev_tbl_t:file unlink;
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	udev pid files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`udev_manage_pid_files',`
++	gen_require(`
++		type udev_var_run_t;
++	')
++
++	files_search_var_lib($1)
++	manage_files_pattern($1, udev_var_run_t, udev_var_run_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.28/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/system/udev.te	2009-08-21 18:56:07.000000000 -0400
@@ -25872,7 +25977,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.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-23 13:00:14.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -27238,7 +27343,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3207,540 @@
+@@ -3027,3 +3207,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -27525,7 +27630,26 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
-+##	Execute user home files.
++##	Read admin home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`userdom_read_admin_home_files',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	read_files_pattern($1, admin_home_t, admin_home_t)
++')
++
++########################################
++## <summary>
++##	Execute admin home files.
 +## </summary>
 +## <param name="domain">
 +##	<summary>



From pkgdb at fedoraproject.org  Sun Aug 23 17:50:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 17:50:34 +0000
Subject: [pkgdb] fmit: maximilinux has requested watchcommits
Message-ID: <20090823175034.8830410F810@bastion2.fedora.phx.redhat.com>

maximilinux has requested the watchcommits acl on fmit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fmit



From rathann at fedoraproject.org  Sun Aug 23 18:09:53 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 23 Aug 2009 18:09:53 +0000 (UTC)
Subject: rpms/gl2ps/devel gl2ps-buildsys.patch, NONE, 1.1 gl2ps-noexit.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 gl2ps.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090823180953.C764411C00A2@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gl2ps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2439

Modified Files:
	.cvsignore gl2ps.spec sources 
Added Files:
	gl2ps-buildsys.patch gl2ps-noexit.patch 
Log Message:
* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 1.3.3-1
- updated to 1.3.3
- removed calls to exit(3)
- added a simple build system (Makefile)
- dropped libtool dependency
- 1.3.3 added a new symbol, so made it versioned
- added examples to -devel docs


gl2ps-buildsys.patch:
 Makefile |   34 ++++++++++++++++++++++++++++++++++
 Version  |    4 ++++
 2 files changed, 38 insertions(+)

--- NEW FILE gl2ps-buildsys.patch ---
diff -up gl2ps-1.3.3/Makefile.b gl2ps-1.3.3/Makefile
--- gl2ps-1.3.3/Makefile.b	2009-08-23 19:58:39.000000000 +0200
+++ gl2ps-1.3.3/Makefile	2009-08-23 19:47:15.000000000 +0200
@@ -0,0 +1,34 @@
+OPTFLAGS = -O2 -Wall
+EXTRALIBS = -lGL -lm
+CFLAGS += $(OPTFLAGS) -fPIC
+LDFLAGS += $(EXTRALIBS)
+LDFLAGS += -Wl,--version-script=Version
+MAJOR = 0
+MINOR = 0
+MICRO = 0
+NAME = gl2ps
+HEADERS = gl2ps.h
+OBJS = gl2ps.o
+SLIBNAME_SO = lib$(NAME).so
+SLIBNAME_WITH_MAJOR = $(SLIBNAME_SO).$(MAJOR)
+SLIBNAME = $(SLIBNAME_WITH_MAJOR).$(MINOR).$(MICRO)
+SLIBDIR = /usr/lib
+INCLUDEDIR = /usr/include
+
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+all: $(SLIBNAME)
+
+clean:
+	rm -f $(OBJS) $(SLIBNAME)
+
+$(SLIBNAME): $(OBJS)
+	$(CC) -shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR) -o $@ $(filter %.o,$^) $(LDFLAGS)
+
+install:
+	mkdir -p $(DESTDIR){$(SLIBDIR),$(INCLUDEDIR)}
+	install -pm755 $(SLIBNAME) $(DESTDIR)$(SLIBDIR)
+	ln -s $(SLIBNAME) $(DESTDIR)$(SLIBDIR)/$(SLIBNAME_WITH_MAJOR)
+	ln -s $(SLIBNAME_WITH_MAJOR) $(DESTDIR)$(SLIBDIR)/$(SLIBNAME_SO)
+	install -pm644 $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
diff -up gl2ps-1.3.3/Version.b gl2ps-1.3.3/Version
--- gl2ps-1.3.3/Version.b	2009-08-23 19:58:44.000000000 +0200
+++ gl2ps-1.3.3/Version	2009-08-23 19:58:01.000000000 +0200
@@ -0,0 +1,4 @@
+GL2PS_1.3.3 {
+    global:
+        gl2psGetOptions;
+};

gl2ps-noexit.patch:
 gl2ps.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gl2ps-noexit.patch ---
diff -up gl2ps-1.3.3/gl2ps.c.noexit gl2ps-1.3.3/gl2ps.c
--- gl2ps-1.3.3/gl2ps.c.noexit	2009-02-28 23:08:14.000000000 +0100
+++ gl2ps-1.3.3/gl2ps.c	2009-08-23 19:02:17.000000000 +0200
@@ -319,7 +319,7 @@ static void *gl2psMalloc(size_t size)
   ptr = malloc(size);
   if(!ptr){
     gl2psMsg(GL2PS_ERROR, "Couldn't allocate requested memory");
-    exit(1);
+    return(NULL);
   }
   return(ptr);
 }
@@ -330,7 +330,7 @@ static void *gl2psRealloc(void *ptr, siz
   ptr = realloc(ptr, size);
   if(!ptr){
     gl2psMsg(GL2PS_ERROR, "Couldn't reallocate requested memory");
-    exit(1);
+    return(NULL);
   }
   return(ptr);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jul 2008 23:25:32 -0000	1.2
+++ .cvsignore	23 Aug 2009 18:09:53 -0000	1.3
@@ -1 +1 @@
-gl2ps-1.3.2.tgz
+gl2ps-1.3.3.tgz


Index: gl2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/devel/gl2ps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gl2ps.spec	25 Jul 2009 00:16:55 -0000	1.4
+++ gl2ps.spec	23 Aug 2009 18:09:53 -0000	1.5
@@ -1,15 +1,15 @@
 Summary:	An OpenGL to PostScript printing library
 Summary(pl):	Biblioteka drukowania z OpenGL-a do PostScriptu
 Name:		gl2ps
-Version:	1.3.2
-Release:	3%{?dist}
+Version:	1.3.3
+Release:	1%{?dist}
 License:	LGPLv2+ or GL2PS
 Group:		System Environment/Libraries
 Source0:	http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz
-# Source0-md5:	15cf4a6a790c109fc03c6601660d73a7
+Patch0:		%{name}-noexit.patch
+Patch1:		%{name}-buildsys.patch
 URL:		http://www.geuz.org/gl2ps/
 BuildRequires:	libGL-devel
-BuildRequires:	libtool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
 %description
@@ -61,19 +61,15 @@ Pliki nag??wkowe biblioteki GL2PS.
 
 %prep
 %setup -q
+%patch0 -p1 -b .noexit
+%patch1 -p1 -b .b
 
 %build
-libtool --mode=compile %{__cc} %{optflags} -c -o gl2ps.lo gl2ps.c
-libtool --mode=link %{__cc} %{optflags} -o libgl2ps.la gl2ps.lo -rpath %{_libdir} -lGL -lm
+make OPTFLAGS="%{optflags}" %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}{%{_libdir},%{_includedir}}
-
-libtool --mode=install install libgl2ps.la %{buildroot}%{_libdir}
-install -pm644 gl2ps.h %{buildroot}%{_includedir}
-
-rm %{buildroot}%{_libdir}/libgl2ps.{l,}a
+make SLIBDIR=%{_libdir} DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %{buildroot}
@@ -88,11 +84,19 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(644,root,root,755)
-%doc gl2ps.pdf TODO
-%attr(755,root,root) %{_libdir}/libgl2ps.so
+%doc gl2ps.pdf TODO gl2psTest*.c
+%{_libdir}/libgl2ps.so
 %{_includedir}/gl2ps.h
 
 %changelog
+* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 1.3.3-1
+- updated to 1.3.3
+- removed calls to exit(3)
+- added a simple build system (Makefile)
+- dropped libtool dependency
+- 1.3.3 added a new symbol, so made it versioned
+- added examples to -devel docs
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2008 23:25:32 -0000	1.2
+++ sources	23 Aug 2009 18:09:53 -0000	1.3
@@ -1 +1 @@
-15cf4a6a790c109fc03c6601660d73a7  gl2ps-1.3.2.tgz
+f2f513f0cd2b5e49902c503edc291487  gl2ps-1.3.3.tgz



From kevin at fedoraproject.org  Sun Aug 23 18:15:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 23 Aug 2009 18:15:11 +0000 (UTC)
Subject: rpms/supybot-meetbot/devel sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 supybot-meetbot.spec, 1.5, 1.6
Message-ID: <20090823181511.7EDC811C0371@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3537

Modified Files:
	sources .cvsignore supybot-meetbot.spec 
Log Message:
Update to 0.1.3 release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 17:59:21 -0000	1.3
+++ sources	23 Aug 2009 18:15:11 -0000	1.4
@@ -1 +1 @@
-933262dd707de735ae763f6046d4e77e  MeetBot-0.1.2.tar.gz
+113a9c5ec0f8607e35821365c59d833d  MeetBot-0.1.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 17:59:21 -0000	1.3
+++ .cvsignore	23 Aug 2009 18:15:11 -0000	1.4
@@ -1 +1 @@
-MeetBot-0.1.2.tar.gz
+MeetBot-0.1.3.tar.gz


Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/devel/supybot-meetbot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- supybot-meetbot.spec	27 Jul 2009 05:09:39 -0000	1.5
+++ supybot-meetbot.spec	23 Aug 2009 18:15:11 -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:           supybot-meetbot
-Version:        0.1.2
-Release:        2%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
 Group:          Applications/Internet
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Sun Aug 23 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.3-1
+- Update to 0.1.3 release. 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Sun Aug 23 18:16:15 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 23 Aug 2009 18:16:15 +0000 (UTC)
Subject: rpms/perl/devel macros.perl,NONE,1.1 perl.spec,1.228,1.229
Message-ID: <20090823181615.0FF6911C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3796

Modified Files:
	perl.spec 
Added Files:
	macros.perl 
Log Message:
* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-79
- add helper filtering macros to -devel, for perl-* package invocation
  (#502402)



--- NEW FILE macros.perl ---
# Sensible Perl-specific RPM build macros 
#
# Note that these depend on the generic filtering system being in place in
# rpm core.
#
# Chris Weyl <cweyl at alumni.drew.edu> 2009

# 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)
#
# This should also give a good sense of how to use these macros.

%define perl_default_filter %{expand: \
%filter_provides_in %{perl_vendorarch}/.*\\.so$ \
%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \
%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.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- perl.spec	31 Jul 2009 16:09:07 -0000	1.228
+++ perl.spec	23 Aug 2009 18:16:14 -0000	1.229
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        78%{?dist}
+Release:        79%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -18,6 +18,7 @@ Url:            http://www.perl.org/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/perl-%{perl_version}.tar.gz
 Source11:       filter-requires.sh
 Source12:       perl-5.8.0-libnet.cfg
+Source13:       macros.perl
 
 # Specific to Fedora/RHEL
 Patch1:         perl-5.8.0-root.patch
@@ -1189,6 +1190,13 @@ done
 install -p -m 644 %{SOURCE12} %{comp_perl_lib}/Net/libnet.cfg
 
 #
+# perl RPM macros
+#
+
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+install -p -m 644 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/
+
+#
 # Core modules removal
 #
 find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
@@ -1630,6 +1638,7 @@ TMPDIR="$PWD/tmp" make test
 %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h
 %{_bindir}/xsubpp
 %{_mandir}/man1/xsubpp*
+%{_sysconfdir}/rpm/macros.perl
 
 %files suidperl
 %defattr(-,root,root,-)
@@ -1930,6 +1939,10 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-79
+- add helper filtering macros to -devel, for perl-* package invocation
+  (#502402)
+
 * Fri Jul 31 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-78
 - Add configure option -DDEBUGGING=-g (#156113)
 



From cweyl at fedoraproject.org  Sun Aug 23 18:22:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 23 Aug 2009 18:22:45 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel .cvsignore, 1.5, 1.6 perl-Net-CUPS.spec,
	1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20090823182245.629F911C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5298

Modified Files:
	.cvsignore perl-Net-CUPS.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-1
- auto-update to 0.61 (by cpan-spec-update 0.01)
- added a new req on perl(Test::More) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jan 2009 19:01:39 -0000	1.5
+++ .cvsignore	23 Aug 2009 18:22:44 -0000	1.6
@@ -1,5 +1 @@
-Net-CUPS-0.59.tar.gz
-clog
-*.rpm
-*.gz
-Net-Cups-*
+Net-CUPS-0.61.tar.gz


Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Net-CUPS.spec	26 Jul 2009 13:38:58 -0000	1.13
+++ perl-Net-CUPS.spec	23 Aug 2009 18:22:45 -0000	1.14
@@ -1,16 +1,16 @@
 Name:           perl-Net-CUPS
-Version:        0.59
-Release:        4%{?dist}
+Version:        0.61
+Release:        1%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-CUPS/
-Source0:        http://www.cpan.org/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # non-perl
-BuildRequires:  cups-devel 
+BuildRequires:  cups-devel
 
 # perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -34,7 +34,7 @@ rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} + 
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-1
+- auto-update to 0.61 (by cpan-spec-update 0.01)
+- added a new req on perl(Test::More) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.59-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jan 2009 19:01:39 -0000	1.5
+++ sources	23 Aug 2009 18:22:45 -0000	1.6
@@ -1 +1 @@
-415619f4e5fac5f5dd8727b1321efd68  Net-CUPS-0.59.tar.gz
+1aba74db9bcf15396005091f826b50e8  Net-CUPS-0.61.tar.gz



From cweyl at fedoraproject.org  Sun Aug 23 18:24:39 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 23 Aug 2009 18:24:39 +0000 (UTC)
Subject: rpms/perl-Getopt-Long-Descriptive/devel .cvsignore, 1.2,
	1.3 perl-Getopt-Long-Descriptive.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090823182439.7E90E11C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5775

Modified Files:
	.cvsignore perl-Getopt-Long-Descriptive.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.077-1
- auto-update to 0.077 (by cpan-spec-update 0.01)
- added a new br on perl(List::Util) (version 0)
- added a new br on perl(Sub::Exporter) (version 0)
- added a new req on perl(List::Util) (version 0)
- added a new req on perl(Params::Validate) (version 0.74)
- added a new req on perl(Sub::Exporter) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jul 2008 17:35:00 -0000	1.2
+++ .cvsignore	23 Aug 2009 18:24:39 -0000	1.3
@@ -1 +1 @@
-Getopt-Long-Descriptive-0.074.tar.gz
+Getopt-Long-Descriptive-0.077.tar.gz


Index: perl-Getopt-Long-Descriptive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel/perl-Getopt-Long-Descriptive.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Getopt-Long-Descriptive.spec	26 Jul 2009 06:15:57 -0000	1.4
+++ perl-Getopt-Long-Descriptive.spec	23 Aug 2009 18:24:39 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           perl-Getopt-Long-Descriptive
-Version:        0.074
-Release:        4%{?dist}
+Version:        0.077
+Release:        1%{?dist}
 Summary:        Getopt::Long with usage text
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Getopt-Long-Descriptive/
-Source0:        http://www.cpan.org/authors/id/H/HD/HDP/Getopt-Long-Descriptive-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -13,13 +13,17 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Params::Validate) >= 0.74
+BuildRequires:  perl(List::Util)
+BuildRequires:  perl(Sub::Exporter)
 # test
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 
-# not automagically picked up...
 Requires:       perl(IO::Scalar)
+Requires:       perl(List::Util)
+Requires:       perl(Params::Validate) >= 0.74
+Requires:       perl(Sub::Exporter)
 
 %description
 Convenient wrapper for Getopt::Long and program usage output.
@@ -56,6 +60,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.077-1
+- auto-update to 0.077 (by cpan-spec-update 0.01)
+- added a new br on perl(List::Util) (version 0)
+- added a new br on perl(Sub::Exporter) (version 0)
+- added a new req on perl(List::Util) (version 0)
+- added a new req on perl(Params::Validate) (version 0.74)
+- added a new req on perl(Sub::Exporter) (version 0)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jul 2008 17:35:00 -0000	1.2
+++ sources	23 Aug 2009 18:24:39 -0000	1.3
@@ -1 +1 @@
-bf4931dfd87314376ecb74dc8d205944  Getopt-Long-Descriptive-0.074.tar.gz
+a39971f6f138ebe6004438402620d032  Getopt-Long-Descriptive-0.077.tar.gz



From kevin at fedoraproject.org  Sun Aug 23 18:27:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 23 Aug 2009 18:27:26 +0000 (UTC)
Subject: rpms/supybot-meetbot/F-11 sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 supybot-meetbot.spec, 1.3, 1.4
Message-ID: <20090823182726.89E5111C00A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6380

Modified Files:
	sources .cvsignore supybot-meetbot.spec 
Log Message:
Update to 0.1.3 release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 18:04:53 -0000	1.3
+++ sources	23 Aug 2009 18:27:26 -0000	1.4
@@ -1 +1 @@
-933262dd707de735ae763f6046d4e77e  MeetBot-0.1.2.tar.gz
+113a9c5ec0f8607e35821365c59d833d  MeetBot-0.1.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 18:04:53 -0000	1.3
+++ .cvsignore	23 Aug 2009 18:27:26 -0000	1.4
@@ -1 +1 @@
-MeetBot-0.1.2.tar.gz
+MeetBot-0.1.3.tar.gz


Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/F-11/supybot-meetbot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- supybot-meetbot.spec	15 Jul 2009 18:04:53 -0000	1.3
+++ supybot-meetbot.spec	23 Aug 2009 18:27:26 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-meetbot
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
@@ -43,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Sun Aug 23 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.3-1
+- Update to 0.1.3 release. 
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.2-1
 - Update to 0.1.2 release. 
 



From mschwendt at fedoraproject.org  Sun Aug 23 18:28:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 23 Aug 2009 18:28:26 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.38,1.39
Message-ID: <20090823182826.6819311C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6642

Modified Files:
	taglib.spec 
Log Message:
* Sun Aug 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-7
- Build API documentation into -doc package.



Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- taglib.spec	22 Aug 2009 10:58:11 -0000	1.38
+++ taglib.spec	23 Aug 2009 18:28:26 -0000	1.39
@@ -7,9 +7,12 @@
 %global buildtests -DBUILD_TESTS=ON
 %endif
 
+%bcond_without doc
+%global apidocdir __api-doc_fedora
+
 Name:       taglib	
 Version:    1.5
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -43,6 +46,10 @@ BuildRequires: zlib-devel
 %if %{with tests}
 BuildRequires: cppunit-devel
 %endif
+%if %{with doc}
+BuildRequires: doxygen
+BuildRequires: graphviz
+%endif
 
 
 %description
@@ -52,11 +59,25 @@ files, Ogg Vorbis comments and ID3 tags 
 Speex, WavPack, TrueAudio files, as well as APE Tags.
 
 
+%if %{with doc}
+%package doc
+Summary: API Documentation for %{name}
+Group: Documentation
+
+%description doc
+This is API documentation generated from the TagLib source code.
+%endif
+
+
 %package devel
 Summary: Development files for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+%if ! %{with doc}
+Obsoletes: %{name}-doc
+%endif
+
 %description devel
 Files needed when building software with %{name}.
 
@@ -85,6 +106,12 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+%if %{with doc}
+cd doc
+doxygen taglib.doxygen
+cd -
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -92,9 +119,15 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr examples/.deps
-rm -fr examples/Makefile*
+rm -fr examples/Makefile* examples/CMake*
 rm -f %{buildroot}%{_libdir}/lib*.la
 
+%if %{with doc}
+rm -fr %{apidocdir} ; mkdir %{apidocdir}
+cp -a doc/html doc/*.png %{apidocdir}
+ln -s html/index.html %{apidocdir}
+%endif
+
 
 %if %{with tests}
 %check
@@ -126,8 +159,17 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with doc}
+%files doc
+%defattr(-,root,root,-)
+%doc %{apidocdir}/*
+%endif
+
 
 %changelog
+* Sun Aug 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-7
+- Build API documentation into -doc package.
+
 * Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
 - Add %%check section and conditionally build with tests.
 - Update descriptions (and mention the additional file formats).



From cweyl at fedoraproject.org  Sun Aug 23 18:30:04 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 23 Aug 2009 18:30:04 +0000 (UTC)
Subject: rpms/perl-Getopt-Long-Descriptive/F-11
	perl-Getopt-Long-Descriptive.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090823183004.DD9D611C0426@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7115

Modified Files:
	perl-Getopt-Long-Descriptive.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.077-1
- auto-update to 0.077 (by cpan-spec-update 0.01)
- added a new br on perl(List::Util) (version 0)
- added a new br on perl(Sub::Exporter) (version 0)
- added a new req on perl(List::Util) (version 0)
- added a new req on perl(Params::Validate) (version 0.74)
- added a new req on perl(Sub::Exporter) (version 0)



Index: perl-Getopt-Long-Descriptive.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-11/perl-Getopt-Long-Descriptive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Getopt-Long-Descriptive.spec	26 Feb 2009 17:08:36 -0000	1.3
+++ perl-Getopt-Long-Descriptive.spec	23 Aug 2009 18:30:04 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           perl-Getopt-Long-Descriptive
-Version:        0.074
-Release:        3%{?dist}
+Version:        0.077
+Release:        1%{?dist}
 Summary:        Getopt::Long with usage text
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Getopt-Long-Descriptive/
-Source0:        http://www.cpan.org/authors/id/H/HD/HDP/Getopt-Long-Descriptive-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -13,13 +13,17 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Params::Validate) >= 0.74
+BuildRequires:  perl(List::Util)
+BuildRequires:  perl(Sub::Exporter)
 # test
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 
-# not automagically picked up...
 Requires:       perl(IO::Scalar)
+Requires:       perl(List::Util)
+Requires:       perl(Params::Validate) >= 0.74
+Requires:       perl(Sub::Exporter)
 
 %description
 Convenient wrapper for Getopt::Long and program usage output.
@@ -56,6 +60,17 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.077-1
+- auto-update to 0.077 (by cpan-spec-update 0.01)
+- added a new br on perl(List::Util) (version 0)
+- added a new br on perl(Sub::Exporter) (version 0)
+- added a new req on perl(List::Util) (version 0)
+- added a new req on perl(Params::Validate) (version 0.74)
+- added a new req on perl(Sub::Exporter) (version 0)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.074-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.074-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Getopt-Long-Descriptive/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jul 2008 17:35:00 -0000	1.2
+++ sources	23 Aug 2009 18:30:04 -0000	1.3
@@ -1 +1 @@
-bf4931dfd87314376ecb74dc8d205944  Getopt-Long-Descriptive-0.074.tar.gz
+a39971f6f138ebe6004438402620d032  Getopt-Long-Descriptive-0.077.tar.gz



From mschwendt at fedoraproject.org  Sun Aug 23 18:30:10 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 23 Aug 2009 18:30:10 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.39,1.40
Message-ID: <20090823183010.8841611C0426@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7193

Modified Files:
	taglib.spec 
Log Message:
noarch -doc pkg


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- taglib.spec	23 Aug 2009 18:28:26 -0000	1.39
+++ taglib.spec	23 Aug 2009 18:30:10 -0000	1.40
@@ -63,6 +63,9 @@ Speex, WavPack, TrueAudio files, as well
 %package doc
 Summary: API Documentation for %{name}
 Group: Documentation
+%if 0%{?fedora} > 10
+BuildArch: noarch
+%endif
 
 %description doc
 This is API documentation generated from the TagLib source code.



From mschwendt at fedoraproject.org  Sun Aug 23 18:32:14 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 23 Aug 2009 18:32:14 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.40,1.41
Message-ID: <20090823183214.EF2EE11C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8239

Modified Files:
	taglib.spec 
Log Message:
noarch sub-pkg for F10, too


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- taglib.spec	23 Aug 2009 18:30:10 -0000	1.40
+++ taglib.spec	23 Aug 2009 18:32:14 -0000	1.41
@@ -63,7 +63,7 @@ Speex, WavPack, TrueAudio files, as well
 %package doc
 Summary: API Documentation for %{name}
 Group: Documentation
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
 



From agoode at fedoraproject.org  Sun Aug 23 18:37:23 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Sun, 23 Aug 2009 18:37:23 +0000 (UTC)
Subject: rpms/htmldoc/EL-5 htmldoc-1.8.27-fortify-fail.patch, NONE,
	1.1 htmldoc-1.8.27-scanf-overflows.patch, NONE, 1.1 htmldoc.spec,
	1.6, 1.7
Message-ID: <20090823183723.A899511C00A2@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/htmldoc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9303

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-fortify-fail.patch 
	htmldoc-1.8.27-scanf-overflows.patch 
Log Message:
* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-8
- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
- Fix scanf overflows (#512513)


htmldoc-1.8.27-fortify-fail.patch:
 ps-pdf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE htmldoc-1.8.27-fortify-fail.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
@@ -8619,7 +8619,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.text.buffer, (char *)data);
+        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
         get_color(_htmlTextColor, r->data.text.rgb);
         break;
     case RENDER_IMAGE :
@@ -8640,7 +8640,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.link, (char *)data);
+        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
         break;
   }
 

htmldoc-1.8.27-scanf-overflows.patch:
 htmllib.cxx      |    2 +-
 htmllib.cxx.orig |only
 ps-pdf.cxx       |    2 +-
 ps-pdf.cxx.orig  |only
 util.cxx         |    2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE htmldoc-1.8.27-scanf-overflows.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/htmllib.cxx htmldoc-1.8.27/htmldoc/htmllib.cxx
--- htmldoc-1.8.27~/htmldoc/htmllib.cxx	2009-08-13 19:25:30.066734472 -0400
+++ htmldoc-1.8.27/htmldoc/htmllib.cxx	2009-08-13 19:25:38.997733603 -0400
@@ -2154,7 +2154,7 @@
 	  * assigned charset...
 	  */
 
-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
+          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
           for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: htmllib.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:25:30.076736152 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:25:39.010735889 -0400
@@ -12515,7 +12515,7 @@
 	  * assigned charset...
 	  */
 
-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
+	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
 	  for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: ps-pdf.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/util.cxx htmldoc-1.8.27/htmldoc/util.cxx
--- htmldoc-1.8.27~/htmldoc/util.cxx	2005-04-24 15:20:32.000000000 -0400
+++ htmldoc-1.8.27/htmldoc/util.cxx	2009-08-13 19:25:39.014737749 -0400
@@ -484,7 +484,7 @@
     PageWidth  = 595;
     PageLength = 792;
   }
-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
+  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
   {
    /*
     * Custom size...


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/EL-5/htmldoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- htmldoc.spec	14 Feb 2009 03:44:11 -0000	1.6
+++ htmldoc.spec	23 Aug 2009 18:37:23 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	7%{?dist}
-Summary:	Convert HTML source files into HTML, PostScript, or PDF
+Release:	8%{?dist}
+Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
 
@@ -13,6 +13,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 Source:		http://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
 
 Patch0:		htmldoc-1.8.27-desktop-icon.patch
+Patch3:		htmldoc-1.8.27-scanf-overflows.patch
+Patch4:		htmldoc-1.8.27-fortify-fail.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -37,9 +39,15 @@ you to change options and generate docum
 # fix up hardcoded documentation path
 sed -i 's/\(\$prefix\/share\/doc\/htmldoc\)/\1-%{version}/g' configure
 
-# fix desktop icon (upstream bug STR #169)
+# fix desktop icon (http://www.htmldoc.org/str.php?L169)
 %patch0 -p1 -b .desktop-icon
 
+# fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
+%patch3 -p1 -b .scanf-overflows
+
+# fix limitation of -D_FORTIFY_SOURCE=2
+%patch4 -p1 -b .fortify-fail
+
 
 %build
 %configure
@@ -65,8 +73,8 @@ install -d ${RPM_BUILD_ROOT}%{_datadir}/
 cp -a desktop/htmldoc.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages
 
 # desktop file
-desktop-file-install --vendor fedora                            \
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+desktop-file-install --vendor fedora				\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--remove-category=X-Red-Hat-Base			\
 	--add-mime-type=application/vnd.htmldoc-book		\
 	desktop/htmldoc.desktop
@@ -76,7 +84,7 @@ desktop-file-install --vendor fedora    
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 # scriptlet for MIME
@@ -90,7 +98,7 @@ update-desktop-database &> /dev/null || 
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 # scriptlet for MIME
@@ -117,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-8
+- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
+- Fix scanf overflows (#512513)
+
 * Sat Aug 30 2008 Adam Goode <adam at spicenitz.org> - 1.8.27-7
 - RPM 4.6 fix for patch tag
 



From agoode at fedoraproject.org  Sun Aug 23 18:41:48 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Sun, 23 Aug 2009 18:41:48 +0000 (UTC)
Subject: rpms/htmldoc/EL-4 htmldoc-1.8.27-fortify-fail.patch, NONE,
	1.1 htmldoc-1.8.27-scanf-overflows.patch, NONE, 1.1 htmldoc.spec,
	1.14, 1.15
Message-ID: <20090823184148.80B0B11C00A2@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/htmldoc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10223

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-fortify-fail.patch 
	htmldoc-1.8.27-scanf-overflows.patch 
Log Message:
* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-8
- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
- Fix scanf overflows (#512513)


htmldoc-1.8.27-fortify-fail.patch:
 ps-pdf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE htmldoc-1.8.27-fortify-fail.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
@@ -8619,7 +8619,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.text.buffer, (char *)data);
+        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
         get_color(_htmlTextColor, r->data.text.rgb);
         break;
     case RENDER_IMAGE :
@@ -8640,7 +8640,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.link, (char *)data);
+        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
         break;
   }
 

htmldoc-1.8.27-scanf-overflows.patch:
 htmllib.cxx      |    2 +-
 htmllib.cxx.orig |only
 ps-pdf.cxx       |    2 +-
 ps-pdf.cxx.orig  |only
 util.cxx         |    2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE htmldoc-1.8.27-scanf-overflows.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/htmllib.cxx htmldoc-1.8.27/htmldoc/htmllib.cxx
--- htmldoc-1.8.27~/htmldoc/htmllib.cxx	2009-08-13 19:25:30.066734472 -0400
+++ htmldoc-1.8.27/htmldoc/htmllib.cxx	2009-08-13 19:25:38.997733603 -0400
@@ -2154,7 +2154,7 @@
 	  * assigned charset...
 	  */
 
-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
+          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
           for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: htmllib.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:25:30.076736152 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:25:39.010735889 -0400
@@ -12515,7 +12515,7 @@
 	  * assigned charset...
 	  */
 
-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
+	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
 	    continue;
 
 	  for (ch = 0; ch < 256; ch ++)
Only in htmldoc-1.8.27/htmldoc: ps-pdf.cxx.orig
diff -ur htmldoc-1.8.27~/htmldoc/util.cxx htmldoc-1.8.27/htmldoc/util.cxx
--- htmldoc-1.8.27~/htmldoc/util.cxx	2005-04-24 15:20:32.000000000 -0400
+++ htmldoc-1.8.27/htmldoc/util.cxx	2009-08-13 19:25:39.014737749 -0400
@@ -484,7 +484,7 @@
     PageWidth  = 595;
     PageLength = 792;
   }
-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
+  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
   {
    /*
     * Custom size...


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/EL-4/htmldoc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- htmldoc.spec	14 Feb 2009 04:59:58 -0000	1.14
+++ htmldoc.spec	23 Aug 2009 18:41:48 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	7%{?dist}.1
-Summary:	Convert HTML source files into HTML, PostScript, or PDF
+Release:	8%{?dist}
+Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
 
@@ -13,6 +13,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 Source:		http://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
 
 Patch0:		htmldoc-1.8.27-desktop-icon.patch
+Patch3:		htmldoc-1.8.27-scanf-overflows.patch
+Patch4:		htmldoc-1.8.27-fortify-fail.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel xorg-x11-devel desktop-file-utils
@@ -37,9 +39,15 @@ you to change options and generate docum
 # fix up hardcoded documentation path
 sed -i 's/\(\$prefix\/share\/doc\/htmldoc\)/\1-%{version}/g' configure
 
-# fix desktop icon (upstream bug STR #169)
+# fix desktop icon (http://www.htmldoc.org/str.php?L169)
 %patch0 -p1 -b .desktop-icon
 
+# fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
+%patch3 -p1 -b .scanf-overflows
+
+# fix limitation of -D_FORTIFY_SOURCE=2
+%patch4 -p1 -b .fortify-fail
+
 
 %build
 %configure
@@ -65,8 +73,8 @@ install -d ${RPM_BUILD_ROOT}%{_datadir}/
 cp -a desktop/htmldoc.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages
 
 # desktop file
-desktop-file-install --vendor fedora                            \
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+desktop-file-install --vendor fedora				\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	--remove-category=X-Red-Hat-Base			\
 	--add-mime-type=application/vnd.htmldoc-book		\
 	desktop/htmldoc.desktop
@@ -76,7 +84,7 @@ desktop-file-install --vendor fedora    
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 # scriptlet for MIME
@@ -90,7 +98,7 @@ update-desktop-database &> /dev/null || 
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 # scriptlet for MIME
@@ -117,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-8
+- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
+- Fix scanf overflows (#512513)
+
 * Fri Feb 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-7.1
 - Update BuildRequires for EL-4
 



From rdieter at fedoraproject.org  Sun Aug 23 18:43:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 18:43:21 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.1-buildsys_phonon.patch, NONE,
	1.1 kdelibs.spec, 1.505, 1.506
Message-ID: <20090823184321.A96B011C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10669

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-buildsys_phonon.patch 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)


kdelibs-4.3.1-buildsys_phonon.patch:
 FindQt4.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-buildsys_phonon.patch ---
diff -up kdelibs-4.3.0/cmake/modules/FindQt4.cmake.phonon kdelibs-4.3.0/cmake/modules/FindQt4.cmake
--- kdelibs-4.3.0/cmake/modules/FindQt4.cmake.phonon	2009-06-03 06:54:39.000000000 -0500
+++ kdelibs-4.3.0/cmake/modules/FindQt4.cmake	2009-08-23 13:20:43.382639081 -0500
@@ -739,9 +739,10 @@ IF (QT4_QMAKE_FOUND)
     )
   
   # Set QT_PHONON_INCLUDE_DIR
-  FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+  FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon
     PATHS
     ${QT_INCLUDE_DIR}/phonon
+    ${QT_HEADERS_DIR}/phonon
     NO_DEFAULT_PATH
     )
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -p -r1.505 -r1.506
--- kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.505
+++ kdelibs.spec	23 Aug 2009 18:43:21 -0000	1.506
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -94,6 +94,7 @@ Patch103: kdelibs-4.3.1-copyurls.patch
 Patch104: kdelibs-4.3.1-copyrename.patch
 #?http://bugs.kde.org/200815
 Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
+Patch106: kdelibs-4.3.1-buildsys_phonon.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -234,6 +235,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch103 -p0 -b .copyurls
 %patch104 -p0 -b .copyrename
 %patch105 -p0 -b .toolbarEditCrash
+%patch106 -p1 -b .buildsys_phonon
+
 
 %build
 
@@ -415,6 +418,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
+- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
+
 * Wed Aug 19 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-6
 - fix crash when editting toolbars (kdebug:200815)
 



From mccann at fedoraproject.org  Sun Aug 23 18:43:41 2009
From: mccann at fedoraproject.org (William Jon McCann)
Date: Sun, 23 Aug 2009 18:43:41 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel .cvsignore, 1.4,
	1.5 sound-theme-freedesktop.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090823184341.DAF3811C00A2@cvs1.fedora.phx.redhat.com>

Author: mccann

Update of /cvs/pkgs/rpms/sound-theme-freedesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10773

Modified Files:
	.cvsignore sound-theme-freedesktop.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jul 2009 20:34:34 -0000	1.4
+++ .cvsignore	23 Aug 2009 18:43:41 -0000	1.5
@@ -1 +1 @@
-sound-theme-freedesktop-0.3.tar.bz2
+sound-theme-freedesktop-0.4.tar.bz2


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sound-theme-freedesktop.spec	28 Jul 2009 20:37:06 -0000	1.10
+++ sound-theme-freedesktop.spec	23 Aug 2009 18:43:41 -0000	1.11
@@ -1,9 +1,9 @@
 Name: sound-theme-freedesktop
-Version: 0.3
-Release: 2%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
-Source0: http://people.freedesktop.org/~lennart/sound-theme-freedesktop-%{version}.tar.bz2
+Source0: http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-%{version}.tar.bz2
 # For details on the licenses used, see README
 License: GPLv2+ and LGPLv2+ and CC-BY-SA and CC-BY
 Url: http://www.freedesktop.org/wiki/Specifications/sound-theme-spec
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sounds/freedesktop/stereo/*.ogg
 
 %changelog
+* Sun Aug 23 2009 Jon McCann <jmccann at redhat.com> 0.4-1
+- New release adds screen capture sound
+
 * Tue Jul 28 2009 Lennart Poettering <lpoetter at redhat.com> 0.3-2
 - Forgot tarball
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jul 2009 20:34:34 -0000	1.4
+++ sources	23 Aug 2009 18:43:41 -0000	1.5
@@ -1 +1 @@
-58fc5e0d9cfd228a59c3af65a7d4f517  sound-theme-freedesktop-0.3.tar.bz2
+c451bc443b53c1e3d6dc0151b5296800  sound-theme-freedesktop-0.4.tar.bz2



From mschwendt at fedoraproject.org  Sun Aug 23 18:44:02 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 23 Aug 2009 18:44:02 +0000 (UTC)
Subject: rpms/taglib/devel taglib.spec,1.41,1.42
Message-ID: <20090823184402.EAA4911C00A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10911

Modified Files:
	taglib.spec 
Log Message:
delete doxygen md5 files


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- taglib.spec	23 Aug 2009 18:32:14 -0000	1.41
+++ taglib.spec	23 Aug 2009 18:44:02 -0000	1.42
@@ -129,6 +129,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la
 rm -fr %{apidocdir} ; mkdir %{apidocdir}
 cp -a doc/html doc/*.png %{apidocdir}
 ln -s html/index.html %{apidocdir}
+find %{apidocdir} -name '*.md5' | xargs rm
 %endif
 
 



From rdieter at fedoraproject.org  Sun Aug 23 18:47:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 18:47:46 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.202,1.203
Message-ID: <20090823184746.ED0C511C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11608

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
- -kstars-libs subpkg, make -kstars not multilib'd



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- kdeedu.spec	20 Aug 2009 13:26:04 -0000	1.202
+++ kdeedu.spec	23 Aug 2009 18:47:46 -0000	1.203
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -47,7 +47,6 @@ BuildRequires: python-devel python
 BuildRequires: readline-devel
 BuildRequires: xplanet
 
-
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
 #+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
@@ -57,11 +56,10 @@ BuildRequires: xplanet
 # help multilib upgrades 
 Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# split pkgs, (temporary?) upgrade path -- Rex
-Requires: %{name}-kstars = %{version}-%{release}
 %if 0%{?fedora} < 12
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+Requires: %{name}-kstars = %{version}-%{release}
 %endif
 # blinken
 Requires: sj-stevehand-fonts
@@ -107,11 +105,21 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
+# help multilib upgrades
+Obsoletes: kdeedu-kstars < 4.3.0-6
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-kstars-libs%{?_isa} = %{version}-%{release}
 #Requires(hint): xplanet
 %description kstars
 %{summary}.
 
+%package kstars-libs
+Summary: Runtime libraries for kstars 
+Group:   System Environment/Libraries
+Requires: %{name}-kstars = %{version}-%{release}
+%description kstars-libs
+%{summary}.
+
 %package marble
 Summary: A World Atlas
 Group:   Amusements/Games
@@ -404,6 +412,9 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kstars/
 %{_kde4_appsdir}/kstars/
 %{_kde4_iconsdir}/hicolor/*/*/kstars.*
+
+%files kstars-libs
+%defattr(-,root,root,-)
 %{_kde4_libdir}/libSatLib.so.*
 
 %files marble
@@ -469,6 +480,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
+- -kstars-libs subpkg, make -kstars not multilib'd
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
 - add Obsoletes to help multilib upgrades
 - -marble-libs: move marble plugins here



From epienbro at fedoraproject.org  Sun Aug 23 18:50:36 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sun, 23 Aug 2009 18:50:36 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel macros.mingw32, 1.5,
	1.6 mingw32-filesystem.spec, 1.26, 1.27
Message-ID: <20090823185036.8A28211C0376@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12316

Modified Files:
	macros.mingw32 mingw32-filesystem.spec 
Log Message:
Fixed a small rpmlint warning caused by the debuginfo generation macro
Thanks to Kalev Lember for spotting this



Index: macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/macros.mingw32,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- macros.mingw32	22 Jun 2009 10:18:35 -0000	1.5
+++ macros.mingw32	23 Aug 2009 18:50:36 -0000	1.6
@@ -62,7 +62,7 @@
 %_mingw32_debug_package(n:) \
 %package %{-n:-n %{-n*}-}debuginfo \
 Summary: Debug information for package %{name} \
-Group: Development/debug \
+Group: Development/Debug \
 %description %{-n:-n %{-n*}-}debuginfo \
 This package provides debug information for package %{name}.\
 Debug information is useful when developing applications that use this\


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mingw32-filesystem.spec	25 Jul 2009 12:16:43 -0000	1.26
+++ mingw32-filesystem.spec	23 Aug 2009 18:50:36 -0000	1.27
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        52
-Release:        3%{?dist}
+Version:        53
+Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -165,6 +165,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 53-1
+- Fixed a small rpmlint warning caused by the debuginfo generation macro
+  Thanks to Kalev Lember for spotting this
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 52-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kevin at fedoraproject.org  Sun Aug 23 18:50:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 23 Aug 2009 18:50:48 +0000 (UTC)
Subject: rpms/supybot-meetbot/EL-5 supybot-meetbot.spec, 1.3, 1.4 sources,
	1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <20090823185048.27DEC11C00A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/supybot-meetbot/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12398

Modified Files:
	supybot-meetbot.spec sources .cvsignore 
Log Message:
Update to 0.1.3 release.



Index: supybot-meetbot.spec
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/EL-5/supybot-meetbot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- supybot-meetbot.spec	15 Jul 2009 18:11:01 -0000	1.3
+++ supybot-meetbot.spec	23 Aug 2009 18:50:47 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-meetbot
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        Plugin for Supybot for handling IRC meetings
 
@@ -43,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/supybot/plugins/MeetBot
 
 %changelog
+* Sun Aug 23 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.3-1
+- Update to 0.1.3 release. 
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.2-1
 - Update to 0.1.2 release. 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jul 2009 18:11:01 -0000	1.3
+++ sources	23 Aug 2009 18:50:47 -0000	1.4
@@ -1 +1 @@
-933262dd707de735ae763f6046d4e77e  MeetBot-0.1.2.tar.gz
+113a9c5ec0f8607e35821365c59d833d  MeetBot-0.1.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supybot-meetbot/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Jul 2009 18:11:01 -0000	1.3
+++ .cvsignore	23 Aug 2009 18:50:47 -0000	1.4
@@ -1 +1 @@
-MeetBot-0.1.2.tar.gz
+MeetBot-0.1.3.tar.gz



From kevin at fedoraproject.org  Sun Aug 23 19:19:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 23 Aug 2009 19:19:28 +0000 (UTC)
Subject: rpms/cnetworkmanager/F-11 sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 cnetworkmanager.spec, 1.1,
	1.2 cnetworkmanager-0.8.4-docs.patch, 1.1, NONE
Message-ID: <20090823191929.1152A11C00A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/cnetworkmanager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18459

Modified Files:
	sources .cvsignore cnetworkmanager.spec 
Removed Files:
	cnetworkmanager-0.8.4-docs.patch 
Log Message:
Update to 0.21.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 May 2009 04:54:49 -0000	1.2
+++ sources	23 Aug 2009 19:19:26 -0000	1.3
@@ -1 +1 @@
-8f3eccaeff900cd68e19785f13c813ab  cnetworkmanager-0.8.4.tar.gz
+3703a43a6d6f3692cb8dbac6372834f2  cnetworkmanager-0.21.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 May 2009 04:54:49 -0000	1.2
+++ .cvsignore	23 Aug 2009 19:19:26 -0000	1.3
@@ -1 +1 @@
-cnetworkmanager-0.8.4.tar.gz
+cnetworkmanager-0.21.1.tar.gz


Index: cnetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/cnetworkmanager/F-11/cnetworkmanager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cnetworkmanager.spec	18 May 2009 04:54:49 -0000	1.1
+++ cnetworkmanager.spec	23 Aug 2009 19:19:26 -0000	1.2
@@ -1,13 +1,14 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary:        Command-line client for NetworkManager
 Name:           cnetworkmanager
-Version:        0.8.4
-Release:        2%{?dist}
+Version:        0.21.1
+Release:        1%{?dist}
 License:        GPLv2+ and Public Domain
 Url:            http://vidner.net/martin/software/cnetworkmanager/
 Source0:        http://vidner.net/martin/software/cnetworkmanager/%{name}-%{version}.tar.gz
-Patch0:         cnetworkmanager-0.8.4-docs.patch
 Group:          Applications/Communications
-BuildRequires:  python
+BuildRequires:  python-devel
 Requires:       dbus-python
 Requires:       pygobject2
 Requires:       NetworkManager
@@ -21,16 +22,13 @@ to supplement or replace the GUI applets
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-make PREFIX=%{_prefix}
+python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} sysconfdir=%{_sysconfdir}
-
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/cnetworkmanager/pbkdf2.py
+python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT --prefix=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,13 +37,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc COPYING NEWS README
 %{_bindir}/cnetworkmanager
-%dir %{_datadir}/cnetworkmanager
-%{_datadir}/cnetworkmanager/cnetworkmanager
-%{_datadir}/cnetworkmanager/pbkdf2.py*
+%{python_sitelib}/networkmanager
+%{python_sitelib}/dbusclient
 %{_sysconfdir}/dbus-1/system.d/cnetworkmanager.conf
-%{_sysconfdir}/dbus-1/system.d/cnetworkmanager-06.conf
+%{python_sitelib}/cnetworkmanager-*egg-info
 
 %changelog
+* Fri Aug 21 2009 Kevin Fenzi <kevin at tummy.com> - 0.21.1-1
+- Update to 0.21.1
+
+* Tue Aug 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.21-1
+- Update to 0.21
+
+* Sat Aug 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.20-1
+- Update to 0.20
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 12 2009 Kevin Fenzi <kevin at tummy.com> - 0.8.4-2
 - Review fixes
 


--- cnetworkmanager-0.8.4-docs.patch DELETED ---



From mbarnes at fedoraproject.org  Sun Aug 23 19:19:46 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 23 Aug 2009 19:19:46 +0000 (UTC)
Subject: rpms/pygtk2/devel .cvsignore, 1.44, 1.45 pygtk2.spec, 1.32,
	1.33 sources, 1.44, 1.45 pygtk-2.15.2-gtk-2.16.defs.patch, 1.1, NONE
Message-ID: <20090823191946.20F5D11C00A2@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18513

Modified Files:
	.cvsignore pygtk2.spec sources 
Removed Files:
	pygtk-2.15.2-gtk-2.16.defs.patch 
Log Message:

* Sun Aug 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.16.0-1.fc12
- Update to 2.16.0
- Remove patch for RH bug #511082 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	21 Jun 2009 11:59:31 -0000	1.44
+++ .cvsignore	23 Aug 2009 19:19:45 -0000	1.45
@@ -1 +1 @@
-pygtk-2.15.2.tar.bz2
+pygtk-2.16.0.tar.bz2


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- pygtk2.spec	18 Aug 2009 20:13:15 -0000	1.32
+++ pygtk2.spec	23 Aug 2009 19:19:45 -0000	1.33
@@ -14,8 +14,8 @@
 ### Abstract ###
 
 Name: pygtk2
-Version: 2.15.2
-Release: 4%{?dist}
+Version: 2.16.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -31,9 +31,6 @@ Patch0: pygtk-nodisplay-exception.patch
 # RH bug #379051 / GNOME bug #523001
 Patch1: pygtk2-2.12.1-pygtk-generic-cell-renderer-activate.patch
 
-# RH bug #511082
-Patch2: pygtk-2.15.2-gtk-2.16.defs.patch
-
 ### Dependencies ###
 
 # Leave these requirements alone!  RPM isn't smart enough
@@ -105,7 +102,6 @@ This package contains documentation file
 %setup -q -n pygtk-%{version}
 %patch0 -p1
 %patch1 -p1 -b .pygtk-generic-cell-renderer-activate
-%patch2 -p1 -b .gtk-2.16-types.defs
 
 %build
 %configure --enable-thread --enable-numpy
@@ -167,6 +163,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Sun Aug 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.16.0-1.fc12
+- Update to 2.16.0
+- Remove patch for RH bug #511082 (fixed upstream).
+
 * Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.15.2-4
 - Drop the explicit Requires: numpy as per new packaging guidelines.  If
   your app calls gtk.gdk.get_pixels_array() you need to pull numpy in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	21 Jun 2009 11:59:31 -0000	1.44
+++ sources	23 Aug 2009 19:19:46 -0000	1.45
@@ -1 +1 @@
-63a56626ed1689aaaa69b860d686d03f  pygtk-2.15.2.tar.bz2
+bd0d437fefd6d5390f5d770a495cd50c  pygtk-2.16.0.tar.bz2


--- pygtk-2.15.2-gtk-2.16.defs.patch DELETED ---



From rdieter at fedoraproject.org  Sun Aug 23 19:20:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 19:20:17 +0000 (UTC)
Subject: rpms/kile/devel .cvsignore, 1.13, 1.14 kile.spec, 1.49, 1.50 sources,
	1.14, 1.15
Message-ID: <20090823192017.D842011C0376@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18751

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.1-0.3.b2
- kile-2.1b2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 Jun 2009 19:21:09 -0000	1.13
+++ .cvsignore	23 Aug 2009 19:20:17 -0000	1.14
@@ -1 +1 @@
-kile-2.1b1.tar.bz2
+kile-2.1b2.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/kile.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- kile.spec	25 Jul 2009 04:36:54 -0000	1.49
+++ kile.spec	23 Aug 2009 19:20:17 -0000	1.50
@@ -1,10 +1,10 @@
 
-%define pre b1
+%define pre b2
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 2.1
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -127,6 +127,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.1-0.3.b2
+- kile-2.1b2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.2.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kile/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	17 Jun 2009 19:21:10 -0000	1.14
+++ sources	23 Aug 2009 19:20:17 -0000	1.15
@@ -1 +1 @@
-9e181c43e8b07e5ed26ab13b716bfc6d  kile-2.1b1.tar.bz2
+1fa720754e199037f6b47e541df767ff  kile-2.1b2.tar.bz2



From kzak at fedoraproject.org  Sun Aug 23 19:25:24 2009
From: kzak at fedoraproject.org (kzak)
Date: Sun, 23 Aug 2009 19:25:24 +0000 (UTC)
Subject: rpms/util-linux-ng/devel
	util-linux-ng-2.16-libblkid-compression.patch, NONE,
	1.1 util-linux-ng.spec, 1.56, 1.57
Message-ID: <20090823192524.A596A11C00A2@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-serv19826

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-libblkid-compression.patch 
Log Message:
* Sun Aug 23 2009 Karel Zak <kzak at redhat.com> 2.16-7
- fix #518572 - blkid requires ext2.ko to be decompressed on installation media


util-linux-ng-2.16-libblkid-compression.patch:
 ext.c |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

--- NEW FILE util-linux-ng-2.16-libblkid-compression.patch ---
>From e94e99523d8a3d0218fe16b0a7a2c5886ccbc652 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Sun, 23 Aug 2009 20:33:10 +0200
Subject: [PATCH] libblkid: add *.ko.gz support to modules.dep parser

Address-Red-Hat-Bug: #518572
Signed-off-by: Karel Zak <kzak at redhat.com>
---
 shlibs/blkid/src/probers/ext.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c
index a4d35d1..c27411d 100644
--- a/shlibs/blkid/src/probers/ext.c
+++ b/shlibs/blkid/src/probers/ext.c
@@ -224,8 +224,8 @@ static int check_for_modules(const char *fs_name)
 #ifdef __linux__
 	struct utsname	uts;
 	FILE		*f;
-	char		buf[1024], *cp, *t;
-	int		i;
+	char		buf[1024], *cp;
+	int		namesz;
 
 	if (uname(&uts))
 		return 0;
@@ -234,6 +234,9 @@ static int check_for_modules(const char *fs_name)
 	f = fopen(buf, "r");
 	if (!f)
 		return 0;
+
+	namesz = strlen(fs_name);
+
 	while (!feof(f)) {
 		if (!fgets(buf, sizeof(buf), f))
 			break;
@@ -244,13 +247,10 @@ static int check_for_modules(const char *fs_name)
 		if ((cp = strrchr(buf, '/')) == NULL)
 			continue;
 		cp++;
-		i = strlen(cp);
-		if (i > 3) {
-			t = cp + i - 3;
-			if (!strcmp(t, ".ko"))
-				*t = 0;
-		}
-		if (!strcmp(cp, fs_name)) {
+
+		if (!strncmp(cp, fs_name, namesz) &&
+		    (!strcmp(cp + namesz, ".ko") ||
+		     !strcmp(cp + namesz, ".ko.gz"))) {
 			fclose(f);
 			return 1;
 		}
-- 
1.6.2.5



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- util-linux-ng.spec	21 Aug 2009 11:21:10 -0000	1.56
+++ util-linux-ng.spec	23 Aug 2009 19:25:24 -0000	1.57
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 6%{?dist}
+Release: 7%{?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
@@ -103,8 +103,13 @@ Patch5: util-linux-ng-2.16-blkid-cachefi
 Patch7: util-linux-ng-2.13-login-lastlog.patch
 # 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
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -200,6 +205,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 unset LINGUAS || :
@@ -710,6 +716,9 @@ fi
 
 
 %changelog
+* Sun Aug 23 2009 Karel Zak <kzak at redhat.com> 2.16-7
+- fix #518572 - blkid requires ext2.ko to be decompressed on installation media
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-6
 - rebuilt with new audit
 



From cweyl at fedoraproject.org  Sun Aug 23 19:27:44 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 23 Aug 2009 19:27:44 +0000 (UTC)
Subject: rpms/perl-Devel-GlobalDestruction/devel
	perl-Devel-GlobalDestruction.spec, 1.5, 1.6
Message-ID: <20090823192744.8075611C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Devel-GlobalDestruction/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20305

Modified Files:
	perl-Devel-GlobalDestruction.spec 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-7
- bump



Index: perl-Devel-GlobalDestruction.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-GlobalDestruction/devel/perl-Devel-GlobalDestruction.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Devel-GlobalDestruction.spec	26 Jul 2009 05:41:48 -0000	1.5
+++ perl-Devel-GlobalDestruction.spec	23 Aug 2009 19:27:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       perl-Devel-GlobalDestruction 
 Version:    0.02 
-Release:    6%{?dist}
+Release:    7%{?dist}
 # see lib/Devel/GlobalDestruction.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -14,7 +14,6 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Scope::Guard)
 BuildRequires: perl(Sub::Exporter)
 
-
 # don't "provide" private Perl libs
 %global _use_internal_dependency_generator 0
 %global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
@@ -63,6 +62,9 @@ rm -rf %{buildroot} 
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-7
+- bump
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jspaleta at fedoraproject.org  Sun Aug 23 19:30:37 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun, 23 Aug 2009 19:30:37 +0000 (UTC)
Subject: rpms/gourmet/devel gourmet.spec,1.16,1.17
Message-ID: <20090823193037.643B611C0371@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20922

Modified Files:
	gourmet.spec 
Log Message:
* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-2
- Small buildrequires fix.



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/gourmet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gourmet.spec	23 Aug 2009 17:25:04 -0000	1.16
+++ gourmet.spec	23 Aug 2009 19:30:36 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.15.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
@@ -14,7 +14,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildArch:	noarch
 BuildRequires:	python-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:  gettext,intltool
 
 Requires: gnome-python2, gnome-python2-gnomeprint
 Requires: metakit
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-2
+- Small buildrequires fix.
+
 * Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-1
 - Latest upstream release, major changes include plugin system for capabilities
 



From rdieter at fedoraproject.org  Sun Aug 23 19:30:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 19:30:34 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.270,1.271
Message-ID: <20090823193034.9156C11C04E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20873

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
- -akonadi: move plasma_engine_calendar here
- drop Requires: kdm (F-12+)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- kdebase-workspace.spec	19 Aug 2009 23:20:21 -0000	1.270
+++ kdebase-workspace.spec	23 Aug 2009 19:30:29 -0000	1.271
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -94,7 +94,9 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
+%if 0%{?fedora} < 12
 Requires: kdm = %{version}-%{release}
+%endif
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -208,6 +210,8 @@ Requires: PyKDE4 >= %{version}
 %package akonadi
 Summary: Akonadi integration for KDE Workspace
 Group: User Interface/Desktops
+Provides: plasma-engine-akonadi = %{version}-%{release}
+Provides: plasma-engine-calendar = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi
 %description akonadi
@@ -451,6 +455,8 @@ fi
 #?akonadi
 %exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -527,9 +533,15 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
+- -akonadi: move plasma_engine_calendar here
+- drop Requires: kdm (F-12+)
+
 * Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - adjust default-applets patch to not load plasma-networkmanagement
 



From kalev at fedoraproject.org  Sun Aug 23 19:33:39 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sun, 23 Aug 2009 19:33:39 +0000 (UTC)
Subject: rpms/mingw32-opensc/devel mingw32-opensc.spec,1.3,1.4
Message-ID: <20090823193339.9AE0111C00A2@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22369

Modified Files:
	mingw32-opensc.spec 
Log Message:
Automatically generate debuginfo subpackage



Index: mingw32-opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/mingw32-opensc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-opensc.spec	25 Jul 2009 14:27:17 -0000	1.3
+++ mingw32-opensc.spec	23 Aug 2009 19:33:39 -0000	1.4
@@ -3,10 +3,11 @@
 %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-opensc
 Version:        0.11.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MingGW Windows OpenSC library
 
 Group:          Development/Libraries
@@ -18,7 +19,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-filesystem >= 53
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-iconv
@@ -39,6 +40,9 @@ eID cards have also been confirmed to wo
 This is the MinGW cross-compiled Windows library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n opensc-%{version}
 %patch1 -p1 -b .config
@@ -122,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.8-3
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kalev at fedoraproject.org  Sun Aug 23 19:35:20 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sun, 23 Aug 2009 19:35:20 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel mingw32-libp11.spec,1.3,1.4
Message-ID: <20090823193520.6087A11C00A2@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22768

Modified Files:
	mingw32-libp11.spec 
Log Message:
Automatically generate debuginfo subpackage



Index: mingw32-libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/mingw32-libp11.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-libp11.spec	22 Aug 2009 20:58:52 -0000	1.3
+++ mingw32-libp11.spec	23 Aug 2009 19:35:20 -0000	1.4
@@ -3,10 +3,11 @@
 %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-libp11
 Version:        0.2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MingGW Windows libp11 library
 
 Group:          Development/Libraries
@@ -17,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 53
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-libltdl
@@ -34,6 +35,9 @@ make using PKCS#11 implementations easie
 This is the MinGW cross-compiled Windows library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libp11-%{version}
 
@@ -68,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-2
+- Automatically generate debuginfo subpackage
+
 * Sat Aug 22 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-1
 - Update to 0.2.6
 - Use INSTALL="install -p" to preserve timestamps



From jspaleta at fedoraproject.org  Sun Aug 23 19:44:09 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun, 23 Aug 2009 19:44:09 +0000 (UTC)
Subject: rpms/gourmet/F-11 gourmet.spec,1.14,1.15 sources,1.9,1.10
Message-ID: <20090823194409.BB9CD11C00A2@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24674

Modified Files:
	gourmet.spec sources 
Log Message:
* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-2
- Small buildrequires fix.
* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-1
- Latest upstream release, major changes include plugin system for capabilities




Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/F-11/gourmet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gourmet.spec	25 Feb 2009 00:25:29 -0000	1.14
+++ gourmet.spec	23 Aug 2009 19:44:09 -0000	1.15
@@ -1,20 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gourmet
-Version:	0.13.4
-Release:	5%{?dist}
+Version:	0.15.0
+Release:	2%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://grecipe-manager.sourceforge.net
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}-2.tar.gz
+Source0:	http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
 BuildRequires:	python-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:  gettext,intltool
 
 Requires: gnome-python2, gnome-python2-gnomeprint
 Requires: metakit
@@ -28,7 +28,7 @@ files and exports webpages & other forma
 
 %prep
 %setup -q
-chmod -x data/recipe.dtd
+#chmod -x data/recipe.dtd
 
 %build
 
@@ -58,7 +58,7 @@ rm -rf %buildroot
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc CHANGES PKG-INFO README TODO
-%doc documentation
+#%doc documentation
 %_bindir/gourmet
 # sitelib stuff
 %{python_sitelib}/gourmet
@@ -69,6 +69,15 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-2
+- Small buildrequires fix.
+
+* Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-1
+- Latest upstream release, major changes include plugin system for capabilities
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.4-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.13.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 Jul 2007 07:14:11 -0000	1.9
+++ sources	23 Aug 2009 19:44:09 -0000	1.10
@@ -1 +1 @@
-d60b319f05543f837d40abf32c0d1fa8  gourmet-0.13.4-2.tar.gz
+a53d8dd05893755cf634f2e75b4e9696  gourmet-0.15.0.tar.gz



From pkgdb at fedoraproject.org  Sun Aug 23 20:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 20:05:23 +0000
Subject: [pkgdb] php-adodb ownership updated
Message-ID: <20090823200523.CCACB10F86F@bastion2.fedora.phx.redhat.com>

Package php-adodb in Fedora 11 is now owned by giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Sun Aug 23 20:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 20:05:27 +0000
Subject: [pkgdb] php-adodb ownership updated
Message-ID: <20090823200527.54C8B10F879@bastion2.fedora.phx.redhat.com>

Package php-adodb in Fedora 10 is now owned by giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From cweyl at fedoraproject.org  Sun Aug 23 20:41:41 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 23 Aug 2009 20:41:41 +0000 (UTC)
Subject: rpms/perl-libwww-perl/devel perl-libwww-perl.spec,1.33,1.34
Message-ID: <20090823204141.662FB11C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-libwww-perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3831

Modified Files:
	perl-libwww-perl.spec 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.831-1
- update to 5.831



Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- perl-libwww-perl.spec	26 Jul 2009 17:47:13 -0000	1.33
+++ perl-libwww-perl.spec	23 Aug 2009 20:41:39 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
-Version:        5.825
-Release:        3%{?dist}
+Version:        5.831
+Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.831-1
+- update to 5.831
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.825-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Sun Aug 23 21:04:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 23 Aug 2009 21:04:49 +0000 (UTC)
Subject: rpms/nss/devel nss-softokn-config.in, NONE, 1.1 nss-softokn.pc.in, 
	NONE, 1.1 nss-util-config.in, NONE, 1.1 nss-util.pc.in, NONE, 1.1
Message-ID: <20090823210449.8DCD611C00A2@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8146

Added Files:
	nss-softokn-config.in nss-softokn.pc.in nss-util-config.in 
	nss-util.pc.in 
Log Message:
Add package configuration files for nss-softoken and nss-util


--- NEW FILE nss-softokn-config.in ---
#!/bin/sh

prefix=@prefix@

major_version=@MOD_MAJOR_VERSION@
minor_version=@MOD_MINOR_VERSION@
patch_version=@MOD_PATCH_VERSION@

usage()
{
	cat <<EOF
Usage: nss-softokn-config [OPTIONS] [LIBRARIES]
Options:
	[--prefix[=DIR]]
	[--exec-prefix[=DIR]]
	[--includedir[=DIR]]
	[--libdir[=DIR]]
	[--version]
	[--libs]
	[--cflags]
Dynamic Libraries:
	softokn3
EOF
	exit $1
}

if test $# -eq 0; then
	usage 1 1>&2
fi

lib_ssl=no
lib_smime=no
lib_nss=no
lib_nssutil=no

while test $# -gt 0; do
  case "$1" in
  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  *) optarg= ;;
  esac

  case $1 in
    --prefix=*)
      prefix=$optarg
      ;;
    --prefix)
      echo_prefix=yes
      ;;
    --exec-prefix=*)
      exec_prefix=$optarg
      ;;
    --exec-prefix)
      echo_exec_prefix=yes
      ;;
    --includedir=*)
      includedir=$optarg
      ;;
    --includedir)
      echo_includedir=yes
      ;;
    --libdir=*)
      libdir=$optarg
      ;;
    --libdir)
      echo_libdir=yes
      ;;
    --version)
      echo ${major_version}.${minor_version}.${patch_version}
      ;;
    --cflags)
      echo_cflags=yes
      ;;
    --libs)
      echo_libs=yes
      ;;
    ssl)
      lib_ssl=no
      ;;
    smime)
      lib_smime=no
      ;;
    nss)
      lib_nss=no
      ;;
    nssutil)
      lib_nssutil=yes
      ;;
    *)
      usage 1 1>&2
      ;;
  esac
  shift
done

# Set variables that may be dependent upon other variables
if test -z "$exec_prefix"; then
    exec_prefix=`pkg-config --variable=exec_prefix nss`
fi
if test -z "$includedir"; then
    includedir=`pkg-config --variable=includedir nss`
fi
if test -z "$libdir"; then
    libdir=`pkg-config --variable=libdir nss`
fi

if test "$echo_prefix" = "yes"; then
    echo $prefix
fi

if test "$echo_exec_prefix" = "yes"; then
    echo $exec_prefix
fi

if test "$echo_includedir" = "yes"; then
    echo $includedir
fi

if test "$echo_libdir" = "yes"; then
    echo $libdir
fi

if test "$echo_cflags" = "yes"; then
    echo -I$includedir
fi

if test "$echo_libs" = "yes"; then
      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
      if test -n "$lib_ssl"; then
	libdirs="$libdirs -lssl${major_version}"
      fi
      if test -n "$lib_smime"; then
	libdirs="$libdirs -lsmime${major_version}"
      fi
      if test -n "$lib_nss"; then
	libdirs="$libdirs -lnss${major_version}"
      fi
      if test -n "$lib_nssutil"; then
	libdirs="$libdirs -lnssutil${major_version}"
      fi
      echo $libdirs
fi      



--- NEW FILE nss-softokn.pc.in ---
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: SOFTKN
Description: Network Security Services Softoken PKCS #11 Module
Version: %SOFTOKEN_VERSION%
Requires: nspr >= %NSPR_VERSION%
Requires: nss-util >= %NSSUTIL_VERSION%
Cflags: -I${includedir}


--- NEW FILE nss-util-config.in ---
#!/bin/sh

prefix=@prefix@

major_version=@MOD_MAJOR_VERSION@
minor_version=@MOD_MINOR_VERSION@
patch_version=@MOD_PATCH_VERSION@

usage()
{
	cat <<EOF
Usage: nss-util-config [OPTIONS] [LIBRARIES]
Options:
	[--prefix[=DIR]]
	[--exec-prefix[=DIR]]
	[--includedir[=DIR]]
	[--libdir[=DIR]]
	[--version]
	[--libs]
	[--cflags]
Dynamic Libraries:
	nssutil
EOF
	exit $1
}

if test $# -eq 0; then
	usage 1 1>&2
fi

lib_ssl=no
lib_smime=no
lib_nss=no
lib_nssutil=yes

while test $# -gt 0; do
  case "$1" in
  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  *) optarg= ;;
  esac

  case $1 in
    --prefix=*)
      prefix=$optarg
      ;;
    --prefix)
      echo_prefix=yes
      ;;
    --exec-prefix=*)
      exec_prefix=$optarg
      ;;
    --exec-prefix)
      echo_exec_prefix=yes
      ;;
    --includedir=*)
      includedir=$optarg
      ;;
    --includedir)
      echo_includedir=yes
      ;;
    --libdir=*)
      libdir=$optarg
      ;;
    --libdir)
      echo_libdir=yes
      ;;
    --version)
      echo ${major_version}.${minor_version}.${patch_version}
      ;;
    --cflags)
      echo_cflags=yes
      ;;
    --libs)
      echo_libs=yes
      ;;
    ssl)
      lib_ssl=no
      ;;
    smime)
      lib_smime=no
      ;;
    nss)
      lib_nss=no
      ;;
    nssutil)
      lib_nssutil=yes
      ;;
    *)
      usage 1 1>&2
      ;;
  esac
  shift
done

# Set variables that may be dependent upon other variables
if test -z "$exec_prefix"; then
    exec_prefix=`pkg-config --variable=exec_prefix nssutil`
fi
if test -z "$includedir"; then
    includedir=`pkg-config --variable=includedir nssutil`
fi
if test -z "$libdir"; then
    libdir=`pkg-config --variable=libdir nssutil`
fi

if test "$echo_prefix" = "yes"; then
    echo $prefix
fi

if test "$echo_exec_prefix" = "yes"; then
    echo $exec_prefix
fi

if test "$echo_includedir" = "yes"; then
    echo $includedir
fi

if test "$echo_libdir" = "yes"; then
    echo $libdir
fi

if test "$echo_cflags" = "yes"; then
    echo -I$includedir
fi

if test "$echo_libs" = "yes"; then
      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
      if test -n "$lib_ssl"; then
	libdirs="$libdirs -lssl${major_version}"
      fi
      if test -n "$lib_smime"; then
	libdirs="$libdirs -lsmime${major_version}"
      fi
      if test -n "$lib_nss"; then
	libdirs="$libdirs -lnss${major_version}"
      fi
      if test -n "$lib_nssutil"; then
	libdirs="$libdirs -lnssutil${major_version}"
      fi
      echo $libdirs
fi      



--- NEW FILE nss-util.pc.in ---
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: NSS-UTIL
Description: Network Security Services Utility Library
Version: %NSSUTIL_VERSION%
Requires: nspr >= %NSPR_VERSION%
Libs: -lnssutil3
Cflags: -I${includedir}



From pkgdb at fedoraproject.org  Sun Aug 23 21:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 21:08:31 +0000
Subject: [pkgdb] boo (Fedora, 11) updated by toshio
Message-ID: <20090823210831.BF86410F877@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on boo (Fedora 10) for palango
toshio approved watchcommits on boo (Fedora 10) for palango
toshio approved commit on boo (Fedora 10) for palango
toshio approved build on boo (Fedora 10) for palango
toshio approved approveacls on boo (Fedora 10) for palango

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/boo



From pkgdb at fedoraproject.org  Sun Aug 23 21:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 21:08:31 +0000
Subject: [pkgdb] boo (Fedora, 11) updated by toshio
Message-ID: <20090823210831.D223810F881@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on boo (Fedora devel) for palango
toshio approved watchcommits on boo (Fedora devel) for palango
toshio approved commit on boo (Fedora devel) for palango
toshio approved build on boo (Fedora devel) for palango
toshio approved approveacls on boo (Fedora devel) for palango

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/boo



From pkgdb at fedoraproject.org  Sun Aug 23 21:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 21:08:31 +0000
Subject: [pkgdb] boo (Fedora, 11) updated by toshio
Message-ID: <20090823210831.E123110F890@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on boo (Fedora 11) for palango
toshio approved watchcommits on boo (Fedora 11) for palango
toshio approved commit on boo (Fedora 11) for palango
toshio approved build on boo (Fedora 11) for palango
toshio approved approveacls on boo (Fedora 11) for palango

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/boo



From pkgdb at fedoraproject.org  Sun Aug 23 21:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 23 Aug 2009 21:12:02 +0000
Subject: [pkgdb] perl-Jcode ownership updated
Message-ID: <20090823211202.BA03510F879@bastion2.fedora.phx.redhat.com>

Package perl-Jcode in Fedora devel is now owned by pghmcfc

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Jcode



From emaldonado at fedoraproject.org  Sun Aug 23 21:17:44 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 23 Aug 2009 21:17:44 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.86,1.87
Message-ID: <20090823211744.6B5B311C00A2@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11346

Modified Files:
	nss.spec 
Log Message:
split off nss-softokn and nss-util as subpackages with their own rpms


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- nss.spec	21 Aug 2009 01:48:33 -0000	1.86
+++ nss.spec	23 Aug 2009 21:17:44 -0000	1.87
@@ -8,16 +8,19 @@
     %{__os_install_post} \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
 %{nil}
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          10%{?dist}
+Release:          11%{?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 >= %{version}
+Requires:         nss-softokn >= %{version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +40,10 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source8:          nss-prelink.conf
+Source10:         nss-util.pc.in
+Source11:         nss-util-config.in
+Source20:         nss-softokn.pc.in
+Source21:         nss-softokn-config.in
 Source12:         %{name}-pem-20090622.tar.bz2
 Source13:         PayPalEE.cert
 Source14:         PayPalICA.cert
@@ -53,6 +60,46 @@ server applications. Applications built 
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
+%package util
+Summary:          Network Security Services Utilities Library
+Group:            System Environment/Base
+Conflicts:        nss < 3.12.3.99.3-8
+#Provides:         nss >= 3.12.3.99.3-11
+#Provides:	  	  libnssutil3.so
+#Requires:         nss >= 3.12.3.99.3-11
+
+%description util
+Utilities for Network Security Services and the Softoken module
+
+# We shouln't need to have a devel subpackage as util will be used in the
+# context of nss or nss-softoken. keeping to please rpmlint.
+# 
+%package util-devel
+Summary:          Development libraries for Network Security Services Utilities
+Group:            Development/Libraries
+Conflicts:        nss-devel < 3.12.3.99.3-8
+#Provides:         nss-devel >= 3.12.3.99.3-11
+#Requires:         nss-util >= 3.12.3.99.3-11
+Requires:         nss-util = %{version}-%{release}
+Requires:         nspr-devel >= %{nspr_version}
+Requires:         pkgconfig
+
+%description util-devel
+Header and utility library files for doing development with Network Security Services.
+
+%package softokn
+Summary:          Network Security Services Soktoken Module
+Group:            System Environment/Base
+Conflicts:        nss < 3.12.3.99.3-8
+#Provides:         nss
+#Provides:	  	  libsoftokn3.so, shlibsign
+Requires:         sqlite
+Requires:         nss-util >= %{version}
+Requires:         nss-softokn-freebl >= %{version}
+
+%description softokn
+Network Security Services Softoken Cryptographic Module
+
 %package softokn-freebl
 Summary:          Freebl library for the Network Security Services
 Group:            System Environment/Base
@@ -68,6 +115,18 @@ v3 certificates, and other security stan
 Install the nss-softokn-freebl package if you need the freebl 
 library.
 
+%package softokn-devel
+Summary:          Development libraries for Network Security Services
+Group:            Development/Libraries
+Conflicts:        nss-devel < 3.12.3.99.3-8
+#Provides:         nss-devel >= 3.12.3.99.3-11
+Requires:         nss-softokn = %{version}-%{release}
+Requires:         nspr-devel >= %{nspr_version}
+Requires:         nss-util-devel
+Requires:         pkgconfig
+
+%description softokn-devel
+Header and Library files for doing development with Network Security Services.
 
 %package tools
 Summary:          Tools for the Network Security Services
@@ -90,6 +149,8 @@ manipulate the NSS certificate and key d
 Summary:          Development libraries for Network Security Services
 Group:            Development/Libraries
 Requires:         nss = %{version}-%{release}
+Requires:         nss-util-devel
+Requires:         nss-softokn-devel 
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
 
@@ -190,6 +251,65 @@ export NSS_VPATCH
 
 chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
+# Set up our package file
+%{__mkdir_p} ./mozilla/dist/pkgconfig
+%{__cat} %{SOURCE10} | sed -e "s,%%libdir%%,%{_libdir},g" \
+                          -e "s,%%prefix%%,%{_prefix},g" \
+                          -e "s,%%exec_prefix%%,%{_prefix},g" \
+                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
+                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
+                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \
+                          ./mozilla/dist/pkgconfig/nss-util.pc
+
+NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
+NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
+NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
+
+export NSSUTIL_VMAJOR 
+export NSSUTIL_VMINOR 
+export NSSUTIL_VPATCH
+
+%{__cat} %{SOURCE11} | sed -e "s, at libdir@,%{_libdir},g" \
+                          -e "s, at prefix@,%{_prefix},g" \
+                          -e "s, at exec_prefix@,%{_prefix},g" \
+                          -e "s, at includedir@,%{_includedir}/nss3,g" \
+                          -e "s, at MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \
+                          -e "s, at MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \
+                          -e "s, at MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \
+                          > ./mozilla/dist/pkgconfig/nss-util-config
+
+chmod 755 ./mozilla/dist/pkgconfig/nss-util-config
+
+# Set up our package file
+%{__mkdir_p} ./mozilla/dist/pkgconfig
+%{__cat} %{SOURCE20} | sed -e "s,%%libdir%%,%{_libdir},g" \
+                          -e "s,%%prefix%%,%{_prefix},g" \
+                          -e "s,%%exec_prefix%%,%{_prefix},g" \
+                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
+                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
+                          -e "s,%%SOFTKN_VERSION%%,%{version},g" > \
+                          ./mozilla/dist/pkgconfig/nss-softokn.pc
+
+SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
+SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
+SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
+
+export SOFTOKEN_VMAJOR 
+export SOFTOKEN_VMINOR 
+export SOFTOKEN_VPATCH
+
+%{__cat} %{SOURCE21} | sed -e "s, at libdir@,%{_libdir},g" \
+                          -e "s, at prefix@,%{_prefix},g" \
+                          -e "s, at exec_prefix@,%{_prefix},g" \
+                          -e "s, at includedir@,%{_includedir}/nss3,g" \
+                          -e "s, at MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
+                          -e "s, at MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
+                          -e "s, at MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
+                          > ./mozilla/dist/pkgconfig/nss-softokn-config
+
+chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config
+
+
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
 
@@ -228,7 +348,7 @@ killall $RANDSERV || :
 rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
 cd ../../../../
 
 killall $RANDSERV || :
@@ -262,7 +382,7 @@ do
 done
 
 # Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk
+for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
 do
   ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
@@ -302,6 +422,10 @@ done
 # Copy the package configuration files
 %{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
 %{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
+%{__install} -p ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
+%{__install} -p ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
+%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -310,29 +434,100 @@ done
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
 
+%post util
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%post softokn
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%post softokn-freebl
+/sbin/ldconfig >/dev/null 2>/dev/null
+
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
 
+%postun util
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%postun softokn
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%postun softokn-freebl
+/sbin/ldconfig >/dev/null 2>/dev/null
 
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
-/%{_lib}/libnssutil3.so
-/%{_lib}/libnssdbm3.so
 /%{_lib}/libssl3.so
 /%{_lib}/libsmime3.so
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
 /%{_lib}/libnssckbi.so
 /%{_lib}/libnsspem.so
-%{unsupported_tools_directory}/shlibsign
-%dir %{_libdir}/nss
-%dir %{unsupported_tools_directory}
 %dir %{_sysconfdir}/pki/nssdb
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
+
+%files util
+%defattr(-,root,root)
+/%{_lib}/libnssutil3.so
+
+%files util-devel
+%defattr(-,root,root)
+%{_libdir}/libnssutil3.so
+%{_libdir}/pkgconfig/nss-util.pc
+%{_bindir}/nss-util-config
+
+%dir %{_includedir}/nss3
+# these are marked as public export in
+# mozilla/security/nss/lib/util/manifest.mk
+%{_includedir}/nss3/base64.h
+%{_includedir}/nss3/ciferfam.h
+%{_includedir}/nss3/nssb64.h
+%{_includedir}/nss3/nssb64t.h
+%{_includedir}/nss3/nsslocks.h
+%{_includedir}/nss3/nssilock.h
+%{_includedir}/nss3/nssilckt.h
+%{_includedir}/nss3/nssrwlk.h
+%{_includedir}/nss3/nssrwlkt.h
+%{_includedir}/nss3/nssutil.h
+%{_includedir}/nss3/pkcs11.h
+%{_includedir}/nss3/pkcs11f.h
+%{_includedir}/nss3/pkcs11n.h
+%{_includedir}/nss3/pkcs11p.h
+%{_includedir}/nss3/pkcs11t.h
+%{_includedir}/nss3/pkcs11u.h
+%{_includedir}/nss3/portreg.h
+%{_includedir}/nss3/secasn1.h
+%{_includedir}/nss3/secasn1t.h
+%{_includedir}/nss3/seccomon.h
+%{_includedir}/nss3/secder.h
+%{_includedir}/nss3/secdert.h
+%{_includedir}/nss3/secdig.h
+%{_includedir}/nss3/secdigt.h
+%{_includedir}/nss3/secerr.h
+%{_includedir}/nss3/secitem.h
+%{_includedir}/nss3/secoid.h
+%{_includedir}/nss3/secoidt.h
+%{_includedir}/nss3/secport.h
+%{_includedir}/nss3/utilrename.h
+
+%files softokn
+%defattr(-,root,root)
+/%{_lib}/libnssdbm3.so
+/%{_lib}/libnssdbm3.chk
+/%{_lib}/libsoftokn3.so
+/%{_lib}/libsoftokn3.chk
+# shared with nss-tools
+%dir %{_libdir}/nss
+#%dir %{saved_files_dir}
+%dir %{unsupported_tools_directory}
+%{unsupported_tools_directory}/shlibsign
+#%{saved_files_dir}/nss-softokn-prelink.conf
+# we don't own %{_sysconfdir}/prelink.conf.d and
+# must rely on triggers to install and remove our
+# configuration file
+#%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 %dir %{_sysconfdir}/prelink.conf.d
 %{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
@@ -341,6 +536,38 @@ done
 /%{_lib}/libfreebl3.so
 /%{_lib}/libfreebl3.chk
 
+%files softokn-devel
+%defattr(-,root,root)
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
+%{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
+%{_libdir}/pkgconfig/nss-softokn.pc
+%{_bindir}/nss-softokn-config
+#
+# The following headers are those exported public in
+# mozilla/security/nss/lib/freebl/manifest.mn and
+# mozilla/security/nss/lib/softoken/manifest.mn
+#
+# The following list is short because many headers, such as
+# the pkcs #11 ones, have been provided by nss-util-devel
+# which installed them before us.
+#
+%{_includedir}/nss3/blapit.h
+%{_includedir}/nss3/ecl-exp.h
+%{_includedir}/nss3/hasht.h
+%{_includedir}/nss3/sechash.h
+%{_includedir}/nss3/nsslowhash.h
+%{_includedir}/nss3/secmodt.h
+%{_includedir}/nss3/shsign.h
+
+%files softokn-freebl
+%defattr(-,root,root)
+/%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
+
 %files tools
 %defattr(-,root,root)
 %{_bindir}/certutil
@@ -363,11 +590,9 @@ done
 %{unsupported_tools_directory}/vfyserv
 %{unsupported_tools_directory}/vfychain
 
-
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
-%{_libdir}/libnssutil3.so
 %{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
@@ -381,13 +606,9 @@ done
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
 
-%dir %{_includedir}/nss3
-%{_includedir}/nss3/base64.h
-%{_includedir}/nss3/blapit.h
 %{_includedir}/nss3/cert.h
 %{_includedir}/nss3/certdb.h
 %{_includedir}/nss3/certt.h
-%{_includedir}/nss3/ciferfam.h
 %{_includedir}/nss3/cmmf.h
 %{_includedir}/nss3/cmmft.h
 %{_includedir}/nss3/cms.h
@@ -397,8 +618,6 @@ done
 %{_includedir}/nss3/crmft.h
 %{_includedir}/nss3/cryptohi.h
 %{_includedir}/nss3/cryptoht.h
-%{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/hasht.h
 %{_includedir}/nss3/jar-ds.h
 %{_includedir}/nss3/jar.h
 %{_includedir}/nss3/jarfile.h
@@ -407,17 +626,9 @@ done
 %{_includedir}/nss3/keyt.h
 %{_includedir}/nss3/keythi.h
 %{_includedir}/nss3/nss.h
-%{_includedir}/nss3/nssb64.h
-%{_includedir}/nss3/nssb64t.h
 %{_includedir}/nss3/nssckbi.h
-%{_includedir}/nss3/nssilckt.h
-%{_includedir}/nss3/nssilock.h
-%{_includedir}/nss3/nsslocks.h
 %{_includedir}/nss3/nsslowhash.h
 %{_includedir}/nss3/nsspem.h
-%{_includedir}/nss3/nssrwlk.h
-%{_includedir}/nss3/nssrwlkt.h
-%{_includedir}/nss3/nssutil.h
 %{_includedir}/nss3/ocsp.h
 %{_includedir}/nss3/ocspt.h
 %{_includedir}/nss3/p12.h
@@ -428,42 +639,22 @@ done
 %{_includedir}/nss3/pk11priv.h
 %{_includedir}/nss3/pk11pub.h
 %{_includedir}/nss3/pk11sdr.h
-%{_includedir}/nss3/pkcs11.h
-%{_includedir}/nss3/pkcs11f.h
-%{_includedir}/nss3/pkcs11n.h
-%{_includedir}/nss3/pkcs11p.h
-%{_includedir}/nss3/pkcs11t.h
-%{_includedir}/nss3/pkcs11u.h
 %{_includedir}/nss3/pkcs12.h
 %{_includedir}/nss3/pkcs12t.h
 %{_includedir}/nss3/pkcs7t.h
-%{_includedir}/nss3/portreg.h
 %{_includedir}/nss3/preenc.h
-%{_includedir}/nss3/secasn1.h
-%{_includedir}/nss3/secasn1t.h
-%{_includedir}/nss3/seccomon.h
-%{_includedir}/nss3/secder.h
-%{_includedir}/nss3/secdert.h
-%{_includedir}/nss3/secdig.h
-%{_includedir}/nss3/secdigt.h
-%{_includedir}/nss3/secerr.h
-%{_includedir}/nss3/sechash.h
-%{_includedir}/nss3/secitem.h
 %{_includedir}/nss3/secmime.h
 %{_includedir}/nss3/secmod.h
-%{_includedir}/nss3/secmodt.h
 %{_includedir}/nss3/secoid.h
 %{_includedir}/nss3/secoidt.h
 %{_includedir}/nss3/secpkcs5.h
 %{_includedir}/nss3/secpkcs7.h
 %{_includedir}/nss3/secport.h
-%{_includedir}/nss3/shsign.h
 %{_includedir}/nss3/smime.h
 %{_includedir}/nss3/ssl.h
 %{_includedir}/nss3/sslerr.h
 %{_includedir}/nss3/sslproto.h
 %{_includedir}/nss3/sslt.h
-%{_includedir}/nss3/utilrename.h
 
 
 %files pkcs11-devel
@@ -483,6 +674,10 @@ done
 
 
 %changelog
+* Sun Aug 23 2009 Elio Maldonado+emaldona at redhat.com - 3.12.3.99.3-11
+- split off nss-softokn and nss-util as subpackages with their own rpms
+- first phase of splitting nss-softokn and nss-util as their own packages
+
 * Thu Aug 20 2009 Elio Maldonado <emaldona at redhat.com> - 3.12.3.99.3-10
 - must install libnssutil3.since nss-util is untagged at the moment
 - preserve time stamps when installing various files



From uwog at fedoraproject.org  Sun Aug 23 21:40:46 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sun, 23 Aug 2009 21:40:46 +0000 (UTC)
Subject: rpms/abiword/devel .cvsignore, 1.29, 1.30 abiword.spec, 1.92,
	1.93 sources, 1.29, 1.30
Message-ID: <20090823214046.1B56811C00A2@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16309

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	2 Aug 2009 14:15:54 -0000	1.29
+++ .cvsignore	23 Aug 2009 21:40:45 -0000	1.30
@@ -1,2 +1,2 @@
-abiword-2.7.8.tar.gz
-abiword-docs-2.7.8.tar.gz
+abiword-2.7.9.tar.gz
+abiword-docs-2.7.9.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- abiword.spec	5 Aug 2009 03:10:55 -0000	1.92
+++ abiword.spec	23 Aug 2009 21:40:45 -0000	1.93
@@ -1,13 +1,13 @@
 %define majorversion 2
 %define minorversion 7
-%define microversion 8
+%define microversion 9
 
 %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
+* Sun Aug 23 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.9-1
+- New upstream version
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.7.8-2
 - drop Req: mathml-fonts (dep moved to gtkmathview)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	2 Aug 2009 14:15:54 -0000	1.29
+++ sources	23 Aug 2009 21:40:45 -0000	1.30
@@ -1,2 +1,2 @@
-cf6df9b80015080c7b26cec10217917b  abiword-2.7.8.tar.gz
-a84537df3879bf09bf81d9e40dd3e5bd  abiword-docs-2.7.8.tar.gz
+fe9f6b173b866d98686ac3e8a1d23096  abiword-2.7.9.tar.gz
+c2474fcb5cf1b8c0a72ce080ea18b963  abiword-docs-2.7.9.tar.gz



From bpepple at fedoraproject.org  Sun Aug 23 22:07:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 23 Aug 2009 22:07:45 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel telepathy-gabble.spec,1.63,1.64
Message-ID: <20090823220745.2A57811C00A2@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21357

Modified Files:
	telepathy-gabble.spec 
Log Message:
* Thu Aug 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.1-2
- Enable libuuid support.



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- telepathy-gabble.spec	20 Aug 2009 20:39:50 -0000	1.63
+++ telepathy-gabble.spec	23 Aug 2009 22:07:44 -0000	1.64
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -15,7 +15,8 @@ BuildRequires:  dbus-glib-devel >= 0.78
 BuildRequires:  loudmouth-devel >= 1.3.2
 BuildRequires:  telepathy-glib-devel >= 0.7.34
 BuildRequires:  glib2-devel >= 2.16
-BuildRequires:	libsoup-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  libsoup-devel
 BuildRequires:  libxslt
 BuildRequires:  python
 
@@ -58,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.1-2
+- Enable libuuid support.
+
 * Thu Aug 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.1-1
 - Update to 0.8.1.
 



From bpepple at fedoraproject.org  Sun Aug 23 22:12:56 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 23 Aug 2009 22:12:56 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-11 telepathy-gabble.spec,1.54,1.55
Message-ID: <20090823221256.D6EE011C00A2@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23136

Modified Files:
	telepathy-gabble.spec 
Log Message:
* Sun Aug 23 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-2
- Enable uuid support. 



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-11/telepathy-gabble.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- telepathy-gabble.spec	9 Apr 2009 23:29:58 -0000	1.54
+++ telepathy-gabble.spec	23 Aug 2009 22:12:56 -0000	1.55
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.7.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -18,7 +18,8 @@ BuildRequires:  dbus-glib-devel >= 0.78
 BuildRequires:  loudmouth-devel >= 1.3.2
 BuildRequires:  telepathy-glib-devel >= 0.7.29
 BuildRequires:  glib2-devel >= 2.16
-BuildRequires:	libsoup-devel
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libsoup-devel
 BuildRequires:  libxslt
 BuildRequires:  python
 # Needed to autoreconf for patch.
@@ -65,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-2
+- Enable uuid support. 
+
 * Thu Apr  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.26-1
 - Update to 0.7.26.
 



From rdieter at fedoraproject.org  Sun Aug 23 23:09:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 23:09:56 +0000 (UTC)
Subject: rpms/ktorrent/devel ktorrent.spec, 1.102,
	1.103 ktorrent-3.2.1-kdebug#188447.patch, 1.1, NONE
Message-ID: <20090823230956.B157311C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1879

Modified Files:
	ktorrent.spec 
Removed Files:
	ktorrent-3.2.1-kdebug#188447.patch 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
- -libs to make multilib friendly



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- ktorrent.spec	12 Aug 2009 15:50:17 -0000	1.102
+++ ktorrent.spec	23 Aug 2009 23:09:54 -0000	1.103
@@ -3,7 +3,7 @@
 
 Name:           ktorrent
 Version:        3.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gmp-devel
 BuildRequires: GeoIP-devel
-# libtaskmanager support
+# libtaskmanager support, for plasma applet
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
 BuildRequires: kdepimlibs-devel
@@ -27,22 +27,45 @@ BuildRequires: taglib-devel
 
 %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} 
+# help multilib upgrades
+Obsoletes: ktorrent < 3.2.3-2
+
+Provides: plasma-engine-ktorrent = %{version}-%{release}
+# possible temporary upgrade path for kde-plasma-ktorrent split
+#if 0%{?fedora} < 12
+#Requires: kde-plasma-ktorrent = %{version}-%{release}
+#endif
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
 integration, download of torrent files, upload speed capping, internet
 searching using various search engines, UDP Trackers and UPnP support.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package        devel
 Summary:        Headers and libraries for building apps that use ktorrent
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       kdelibs4-devel
-
 %description    devel
 The headers and libraries used for developing applications on top of ktorrent.
 
+%package -n kde-plasma-ktorrent
+Summary: ktorrent plasma applet
+Group: Applications/Internet
+Requires: plasma-engine-ktorrent = %{version}-%{release}
+%description -n kde-plasma-ktorrent
+%{summary}.
+
+
 %prep
 %setup -q
 
@@ -55,7 +78,7 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=
 
 %install
 %{__rm} -rf %{buildroot}
@@ -105,19 +128,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
-%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.11*
-%{_kde4_libdir}/libktcore.so.9*
-%{_kde4_libdir}/libktupnp.so.4*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
 %{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
-%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libbtcore.so.11*
+%{_kde4_libdir}/libktcore.so.9*
+%{_kde4_libdir}/libktupnp.so.4*
 
 %files devel
 %defattr(-,root,root,-)
@@ -127,7 +150,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/libktupnp.so
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
+%files -n kde-plasma-ktorrent
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
+
+
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
+- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
+- -libs to make multilib friendly
+
 * Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
 - ktorrent-3.2.3
 


--- ktorrent-3.2.1-kdebug#188447.patch DELETED ---



From rdieter at fedoraproject.org  Sun Aug 23 23:12:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 23:12:42 +0000 (UTC)
Subject: rpms/kdeedu/F-11 kdeedu.spec,1.182,1.183
Message-ID: <20090823231243.0367811C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3249

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
- -kstars-libs subpkg, make -kstars not multilib'd



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- kdeedu.spec	20 Aug 2009 14:15:16 -0000	1.182
+++ kdeedu.spec	23 Aug 2009 23:12:42 -0000	1.183
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -47,7 +47,6 @@ BuildRequires: python-devel python
 BuildRequires: readline-devel
 BuildRequires: xplanet
 
-
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
 #+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
@@ -57,11 +56,10 @@ BuildRequires: xplanet
 # help multilib upgrades 
 Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# split pkgs, (temporary?) upgrade path -- Rex
-Requires: %{name}-kstars = %{version}-%{release}
 %if 0%{?fedora} < 12
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+Requires: %{name}-kstars = %{version}-%{release}
 %endif
 # blinken
 Requires: sj-stevehand-fonts
@@ -107,11 +105,21 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
+# help multilib upgrades
+Obsoletes: kdeedu-kstars < 4.3.0-6
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-kstars-libs%{?_isa} = %{version}-%{release}
 #Requires(hint): xplanet
 %description kstars
 %{summary}.
 
+%package kstars-libs
+Summary: Runtime libraries for kstars 
+Group:   System Environment/Libraries
+Requires: %{name}-kstars = %{version}-%{release}
+%description kstars-libs
+%{summary}.
+
 %package marble
 Summary: A World Atlas
 Group:   Amusements/Games
@@ -404,6 +412,9 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kstars/
 %{_kde4_appsdir}/kstars/
 %{_kde4_iconsdir}/hicolor/*/*/kstars.*
+
+%files kstars-libs
+%defattr(-,root,root,-)
 %{_kde4_libdir}/libSatLib.so.*
 
 %files marble
@@ -469,6 +480,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
+- -kstars-libs subpkg, make -kstars not multilib'd
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
 - add Obsoletes to help multilib upgrades
 - -marble-libs: move marble plugins here



From rdieter at fedoraproject.org  Sun Aug 23 23:13:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 23 Aug 2009 23:13:22 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.154,1.155
Message-ID: <20090823231322.8CC3E11C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3467

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
- -kstars-libs subpkg, make -kstars not multilib'd



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdeedu.spec	20 Aug 2009 14:15:47 -0000	1.154
+++ kdeedu.spec	23 Aug 2009 23:13:22 -0000	1.155
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -47,7 +47,6 @@ BuildRequires: python-devel python
 BuildRequires: readline-devel
 BuildRequires: xplanet
 
-
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
 #+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
@@ -57,11 +56,10 @@ BuildRequires: xplanet
 # help multilib upgrades 
 Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# split pkgs, (temporary?) upgrade path -- Rex
-Requires: %{name}-kstars = %{version}-%{release}
 %if 0%{?fedora} < 12
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+Requires: %{name}-kstars = %{version}-%{release}
 %endif
 # blinken
 Requires: sj-stevehand-fonts
@@ -107,11 +105,21 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
+# help multilib upgrades
+Obsoletes: kdeedu-kstars < 4.3.0-6
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-kstars-libs%{?_isa} = %{version}-%{release}
 #Requires(hint): xplanet
 %description kstars
 %{summary}.
 
+%package kstars-libs
+Summary: Runtime libraries for kstars 
+Group:   System Environment/Libraries
+Requires: %{name}-kstars = %{version}-%{release}
+%description kstars-libs
+%{summary}.
+
 %package marble
 Summary: A World Atlas
 Group:   Amusements/Games
@@ -404,6 +412,9 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/kstars/
 %{_kde4_appsdir}/kstars/
 %{_kde4_iconsdir}/hicolor/*/*/kstars.*
+
+%files kstars-libs
+%defattr(-,root,root,-)
 %{_kde4_libdir}/libSatLib.so.*
 
 %files marble
@@ -469,6 +480,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
+- -kstars-libs subpkg, make -kstars not multilib'd
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
 - add Obsoletes to help multilib upgrades
 - -marble-libs: move marble plugins here



From ke4qqq at fedoraproject.org  Mon Aug 24 00:21:33 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:21:33 +0000 (UTC)
Subject: rpms/zikula/devel zikula-1.1.2-config.patch, NONE,
	1.1 zikulahash.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log,
	1.1, 1.2 sources, 1.2, 1.3 zikula.spec, 1.2,
	1.3 zikula-1.1.1-config.patch, 1.1, NONE
Message-ID: <20090824002133.B114811C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17628/devel

Modified Files:
	.cvsignore import.log sources zikula.spec 
Added Files:
	zikula-1.1.2-config.patch zikulahash.patch 
Removed Files:
	zikula-1.1.1-config.patch 
Log Message:
* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
- upgraded to 1.1.2 to match upstream bug 514301
- changed php version requirements to 5.1.2 to remove bundling of sha256 library
- added symlinks silencing per ian wellers bug 511137
- silenced selinux problems
- Added requires for php-Smarty, php-adodb, php-mcrypt
- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237



zikula-1.1.2-config.patch:
 config.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zikula-1.1.2-config.patch ---
--- config/config.php	2008-06-06 14:03:14.000000000 +0200
+++ config/config.php.diff	2009-01-26 10:16:12.000000000 +0100
@@ -36,7 +36,7 @@
 global $PNConfig;
 $PNConfig['System']['installed']   = 0;         // installer will change this during installation
 $PNConfig['System']['tabletype']   = 'myisam';  // installer will change this during installation
-$PNConfig['System']['temp']        = 'pnTemp';  // installer will change this during installation
+$PNConfig['System']['temp']        = '/var/lib/zikula/pnTemp';  // installer will change this during installation
 $PNConfig['System']['prefix']      = 'zk';      // installer will change this during installation
 $PNConfig['System']['development'] = 0;         // should be set to 0/false when cutting a release for production use
 

zikulahash.patch:
 DataUtil.class.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zikulahash.patch ---
diff -rupN old/includes/DataUtil.class.php new/includes/DataUtil.class.php
--- includes/DataUtil.class.php	2008-12-08 13:31:42.000000000 -0500
+++ includes/DataUtil.class.php	2009-08-23 19:48:25.169290742 -0400
@@ -448,9 +448,9 @@ class DataUtil
                 return bin2hex(mhash(MHASH_SHA256, $string));
             } else {
                 if (!class_exists('SHA256')) {
-                    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
+                #    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
                 }
-                return SHA256::hash($string);
+                return hash('sha256', $string);
             }
         }
         else if ($type == 'md5') {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 16:03:44 -0000	1.2
+++ .cvsignore	24 Aug 2009 00:21:32 -0000	1.3
@@ -1 +1 @@
-Zikula-1.1.1-CORE.tar.gz
+Zikula-1.1.2-CORE.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Mar 2009 16:03:44 -0000	1.1
+++ import.log	24 Aug 2009 00:21:32 -0000	1.2
@@ -1 +1,2 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
+zikula-1_1_2-1_fc11:HEAD:zikula-1.1.2-1.fc11.src.rpm:1251073198


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2009 16:03:44 -0000	1.2
+++ sources	24 Aug 2009 00:21:32 -0000	1.3
@@ -1 +1 @@
-d09fee4fc1f4756bff11f61c6d3797a1  Zikula-1.1.1-CORE.tar.gz
+585a1f8cec31fd33f64aa3968590a93d  Zikula-1.1.2-CORE.zip


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/zikula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zikula.spec	27 Jul 2009 09:02:02 -0000	1.2
+++ zikula.spec	24 Aug 2009 00:21:32 -0000	1.3
@@ -1,42 +1,55 @@
 Name: zikula
-Version: 1.1.1
-Release: 13%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Zikula is a free open source Web Application Framework
-Group:	Applications/Publishing
+Group:   Applications/Publishing
 License: GPLv2+
 # There is some content in this package that is LGPL with the bulk
 # GPLv2+ thus overall package should be GPLv2+ 
 URL: http://www.zikula.org/
-Source0: Zikula-%{version}-CORE.tar.gz 
+Source0: Zikula-%{version}-CORE.zip
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: zikula.conf
 #this is being discussed upstream - for the moment it is a fedora only file
 #see http://groups.google.com/group/zikula-discussions/browse_thread/thread/2f44d45a975d1515/
-Patch: %{name}-%{version}-config.patch
+Patch0: %{name}-%{version}-config.patch
 #Patch is recorded in ticket 901 on the zikula trac instance
+Patch1: %{name}hash.patch
+#Patch changes the sha256 hash function that's called to use php5's implementation.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 5.2.0
-Requires: php-mysql >= 5.2.0
-Requires: php-pgsql >= 5.2.0
+Requires: php >= 5.1.2
+Requires: php-mysql >= 5.1.2
+Requires: php-pgsql >= 5.1.2
+Requires: php-Smarty
+Requires: php-mcrypt
+Requires: php-adodb
+Requires: php-simplepie
+Requires: php-IDNA_Convert
+Requires: php-mbstring
+Requires: symlinks
+Requires(post): symlinks
 Requires(pre): policycoreutils
 
 %description
-Zikula is a free open source Web Application Framework. \
-It can be used to develop robust, secure, interactive and \
-editable websites and web based applications. Zikula is written \
-in PHP object oriented and fully modular. It requires a database \
- and may use all leading database platforms like MySQL, \
-PostgreSQL and Microsoft SQL Server. \
+A free open source Web Application Framework. 
+It can be used to develop robust, secure, interactive and 
+editable websites and web based applications. Zikula is written 
+in PHP, object oriented, and fully modular. It requires a database 
+ and may use all leading database platforms like MySQL, 
+PostgreSQL and Microsoft SQL Server. 
 Zikula is the successor to the PostNuke project.
 
 %pre
-semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || :
+semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
+semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
 
 %prep
 %setup -c -qn %{name}-%{version}
-%patch -p0 
+%patch0 -p0 
+%patch1 -p0
+dos2unix docs/Zikula_1_1_2-MYSQL.sql
 
 %build
 #nothing really for this section but rpmbuild complains if build is empty
@@ -48,6 +61,19 @@ rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
 
+# Following are deleted as Zikula checks the internal system looking for these libs
+# before using the 'bundled' versions. 
+rm -rf includes/classes/encryption
+rm -rf includes/classes/hashes
+rm -rf includes/classes/JSON
+
+# Following are deleted and symlinks will be created below to link to the 
+# appropriate site packages. 
+rm -rf includes/classes/Smarty
+rm -rf includes/classes/adodb
+rm -rf includes/classes/SimplePie
+rm -rf includes/classes/idna
+
 cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name}
 install -m 0644 *php robots.txt  %{buildroot}/%{_datadir}/%{name}
 
@@ -56,8 +82,11 @@ cp -pr pnTemp -t %{buildroot}/%{_localst
 install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php
 ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php
 install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf
-
-
+#ln -sf %{_datadir}/php/adodb/ %{buildroot}/%{_datadir}/%{name}/includes/classes/adodb || :
+#ln -sf %{_datadir}/php/Smarty/ %{buildroot}/%{_datadir}/%{name}/includes/classes/Smarty || :
+#ln -sf %{_datadir}/php/php-simplepie/ %{buildroot}/%{_datadir}/%{name}/includes/classes/SimplePie || :
+#ln -sf %{_datadir}/php/IDNA_Convert/ %{buildroot}/%{_datadir}/%{name}/includes/classes/idna || :
+#symlinks -crs %{buildroot}/%{_datadir}/%{name}/includes/
 rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess
 
 #changinng encoding
@@ -87,13 +116,26 @@ rm -rf %{buildroot}
 
 
 %post
-ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || :
-symlinks -crs /usr/share/zikula || :
+ln -sf /usr/share/doc/zikula-1.1.2 /usr/share/zikula/docs > /dev/null 2>&1 || :
+ln -sf /usr/share/php/adodb /usr/share/zikula/includes/classes/adodb > /dev/null 2>&1 || :
+ln -sf /usr/share/php/Smarty /usr/share/zikula/includes/classes/Smarty > /dev/null 2>&1 || :
+ln -sf /usr/share/php/php-simplepie /usr/share/zikula/includes/classes/SimplePie > /dev/null 2>&1 || :
+ln -sf /usr/share/php/IDNA_Convert /usr/share/zikula/includes/classes/idna > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
+* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+- upgraded to 1.1.2 to match upstream bug 514301
+- changed php version requirements to 5.1.2 to remove bundling of sha256 library
+- added symlinks silencing per ian wellers bug 511137
+- silenced selinux problems 
+- Added requires for php-Smarty, php-adodb, php-mcrypt
+- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237
+
+* Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
+- Upstream docs advise that PHP >= 4.3 is correct requirement
+ 
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 


--- zikula-1.1.1-config.patch DELETED ---



From ke4qqq at fedoraproject.org  Mon Aug 24 00:22:56 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:22:56 +0000 (UTC)
Subject: rpms/zikula/F-10 zikula-1.1.2-config.patch, NONE,
	1.1 zikulahash.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 zikula.spec, 1.2, 1.3 zikula-1.1.1-config.patch, 1.1, NONE
Message-ID: <20090824002256.1D71A11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18142/F-10

Modified Files:
	.cvsignore import.log sources zikula.spec 
Added Files:
	zikula-1.1.2-config.patch zikulahash.patch 
Removed Files:
	zikula-1.1.1-config.patch 
Log Message:
* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
- upgraded to 1.1.2 to match upstream bug 514301
- changed php version requirements to 5.1.2 to remove bundling of sha256 library
- added symlinks silencing per ian wellers bug 511137
- silenced selinux problems
- Added requires for php-Smarty, php-adodb, php-mcrypt
- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237



zikula-1.1.2-config.patch:
 config.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zikula-1.1.2-config.patch ---
--- config/config.php	2008-06-06 14:03:14.000000000 +0200
+++ config/config.php.diff	2009-01-26 10:16:12.000000000 +0100
@@ -36,7 +36,7 @@
 global $PNConfig;
 $PNConfig['System']['installed']   = 0;         // installer will change this during installation
 $PNConfig['System']['tabletype']   = 'myisam';  // installer will change this during installation
-$PNConfig['System']['temp']        = 'pnTemp';  // installer will change this during installation
+$PNConfig['System']['temp']        = '/var/lib/zikula/pnTemp';  // installer will change this during installation
 $PNConfig['System']['prefix']      = 'zk';      // installer will change this during installation
 $PNConfig['System']['development'] = 0;         // should be set to 0/false when cutting a release for production use
 

zikulahash.patch:
 DataUtil.class.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zikulahash.patch ---
diff -rupN old/includes/DataUtil.class.php new/includes/DataUtil.class.php
--- includes/DataUtil.class.php	2008-12-08 13:31:42.000000000 -0500
+++ includes/DataUtil.class.php	2009-08-23 19:48:25.169290742 -0400
@@ -448,9 +448,9 @@ class DataUtil
                 return bin2hex(mhash(MHASH_SHA256, $string));
             } else {
                 if (!class_exists('SHA256')) {
-                    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
+                #    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
                 }
-                return SHA256::hash($string);
+                return hash('sha256', $string);
             }
         }
         else if ($type == 'md5') {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 16:09:29 -0000	1.2
+++ .cvsignore	24 Aug 2009 00:22:55 -0000	1.3
@@ -1 +1 @@
-Zikula-1.1.1-CORE.tar.gz
+Zikula-1.1.2-CORE.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Mar 2009 16:09:29 -0000	1.1
+++ import.log	24 Aug 2009 00:22:55 -0000	1.2
@@ -1 +1,2 @@
 zikula-1_1_1-12_fc10:F-10:zikula-1.1.1-12.fc10.src.rpm:1237565237
+zikula-1_1_2-1_fc11:F-10:zikula-1.1.2-1.fc11.src.rpm:1251073342


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2009 16:09:29 -0000	1.2
+++ sources	24 Aug 2009 00:22:55 -0000	1.3
@@ -1 +1 @@
-d09fee4fc1f4756bff11f61c6d3797a1  Zikula-1.1.1-CORE.tar.gz
+585a1f8cec31fd33f64aa3968590a93d  Zikula-1.1.2-CORE.zip


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/zikula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zikula.spec	20 Aug 2009 19:25:10 -0000	1.2
+++ zikula.spec	24 Aug 2009 00:22:55 -0000	1.3
@@ -1,42 +1,55 @@
 Name: zikula
-Version: 1.1.1
-Release: 13%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Zikula is a free open source Web Application Framework
-Group:	Applications/Publishing
+Group:   Applications/Publishing
 License: GPLv2+
 # There is some content in this package that is LGPL with the bulk
 # GPLv2+ thus overall package should be GPLv2+ 
 URL: http://www.zikula.org/
-Source0: Zikula-%{version}-CORE.tar.gz 
+Source0: Zikula-%{version}-CORE.zip
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: zikula.conf
 #this is being discussed upstream - for the moment it is a fedora only file
 #see http://groups.google.com/group/zikula-discussions/browse_thread/thread/2f44d45a975d1515/
-Patch: %{name}-%{version}-config.patch
+Patch0: %{name}-%{version}-config.patch
 #Patch is recorded in ticket 901 on the zikula trac instance
+Patch1: %{name}hash.patch
+#Patch changes the sha256 hash function that's called to use php5's implementation.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 4.3
-Requires: php-mysql >= 4.3
-Requires: php-pgsql >= 4.3
+Requires: php >= 5.1.2
+Requires: php-mysql >= 5.1.2
+Requires: php-pgsql >= 5.1.2
+Requires: php-Smarty
+Requires: php-mcrypt
+Requires: php-adodb
+Requires: php-simplepie
+Requires: php-IDNA_Convert
+Requires: php-mbstring
+Requires: symlinks
+Requires(post): symlinks
 Requires(pre): policycoreutils
 
 %description
-Zikula is a free open source Web Application Framework. \
-It can be used to develop robust, secure, interactive and \
-editable websites and web based applications. Zikula is written \
-in PHP object oriented and fully modular. It requires a database \
- and may use all leading database platforms like MySQL, \
-PostgreSQL and Microsoft SQL Server. \
+A free open source Web Application Framework. 
+It can be used to develop robust, secure, interactive and 
+editable websites and web based applications. Zikula is written 
+in PHP, object oriented, and fully modular. It requires a database 
+ and may use all leading database platforms like MySQL, 
+PostgreSQL and Microsoft SQL Server. 
 Zikula is the successor to the PostNuke project.
 
 %pre
-semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || :
+semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
+semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
 
 %prep
 %setup -c -qn %{name}-%{version}
-%patch -p0 
+%patch0 -p0 
+%patch1 -p0
+dos2unix docs/Zikula_1_1_2-MYSQL.sql
 
 %build
 #nothing really for this section but rpmbuild complains if build is empty
@@ -48,6 +61,19 @@ rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
 
+# Following are deleted as Zikula checks the internal system looking for these libs
+# before using the 'bundled' versions. 
+rm -rf includes/classes/encryption
+rm -rf includes/classes/hashes
+rm -rf includes/classes/JSON
+
+# Following are deleted and symlinks will be created below to link to the 
+# appropriate site packages. 
+rm -rf includes/classes/Smarty
+rm -rf includes/classes/adodb
+rm -rf includes/classes/SimplePie
+rm -rf includes/classes/idna
+
 cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name}
 install -m 0644 *php robots.txt  %{buildroot}/%{_datadir}/%{name}
 
@@ -56,8 +82,11 @@ cp -pr pnTemp -t %{buildroot}/%{_localst
 install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php
 ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php
 install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf
-
-
+#ln -sf %{_datadir}/php/adodb/ %{buildroot}/%{_datadir}/%{name}/includes/classes/adodb || :
+#ln -sf %{_datadir}/php/Smarty/ %{buildroot}/%{_datadir}/%{name}/includes/classes/Smarty || :
+#ln -sf %{_datadir}/php/php-simplepie/ %{buildroot}/%{_datadir}/%{name}/includes/classes/SimplePie || :
+#ln -sf %{_datadir}/php/IDNA_Convert/ %{buildroot}/%{_datadir}/%{name}/includes/classes/idna || :
+#symlinks -crs %{buildroot}/%{_datadir}/%{name}/includes/
 rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess
 
 #changinng encoding
@@ -87,13 +116,26 @@ rm -rf %{buildroot}
 
 
 %post
-ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || :
-symlinks -crs /usr/share/zikula || :
+ln -sf /usr/share/doc/zikula-1.1.2 /usr/share/zikula/docs > /dev/null 2>&1 || :
+ln -sf /usr/share/php/adodb /usr/share/zikula/includes/classes/adodb > /dev/null 2>&1 || :
+ln -sf /usr/share/php/Smarty /usr/share/zikula/includes/classes/Smarty > /dev/null 2>&1 || :
+ln -sf /usr/share/php/php-simplepie /usr/share/zikula/includes/classes/SimplePie > /dev/null 2>&1 || :
+ln -sf /usr/share/php/IDNA_Convert /usr/share/zikula/includes/classes/idna > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+- upgraded to 1.1.2 to match upstream bug 514301
+- changed php version requirements to 5.1.2 to remove bundling of sha256 library
+- added symlinks silencing per ian wellers bug 511137
+- silenced selinux problems 
+- Added requires for php-Smarty, php-adodb, php-mcrypt
+- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237
+
 * Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
 - Upstream docs advise that PHP >= 4.3 is correct requirement
-
+ 
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 


--- zikula-1.1.1-config.patch DELETED ---



From ke4qqq at fedoraproject.org  Mon Aug 24 00:24:35 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:24:35 +0000 (UTC)
Subject: rpms/zikula/F-11 zikula-1.1.2-config.patch, NONE,
	1.1 zikulahash.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 zikula.spec, 1.2, 1.3 zikula-1.1.1-config.patch, 1.1, NONE
Message-ID: <20090824002435.02DB511C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18634/F-11

Modified Files:
	.cvsignore import.log sources zikula.spec 
Added Files:
	zikula-1.1.2-config.patch zikulahash.patch 
Removed Files:
	zikula-1.1.1-config.patch 
Log Message:
* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
- upgraded to 1.1.2 to match upstream bug 514301
- changed php version requirements to 5.1.2 to remove bundling of sha256 library
- added symlinks silencing per ian wellers bug 511137
- silenced selinux problems
- Added requires for php-Smarty, php-adodb, php-mcrypt
- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237



zikula-1.1.2-config.patch:
 config.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zikula-1.1.2-config.patch ---
--- config/config.php	2008-06-06 14:03:14.000000000 +0200
+++ config/config.php.diff	2009-01-26 10:16:12.000000000 +0100
@@ -36,7 +36,7 @@
 global $PNConfig;
 $PNConfig['System']['installed']   = 0;         // installer will change this during installation
 $PNConfig['System']['tabletype']   = 'myisam';  // installer will change this during installation
-$PNConfig['System']['temp']        = 'pnTemp';  // installer will change this during installation
+$PNConfig['System']['temp']        = '/var/lib/zikula/pnTemp';  // installer will change this during installation
 $PNConfig['System']['prefix']      = 'zk';      // installer will change this during installation
 $PNConfig['System']['development'] = 0;         // should be set to 0/false when cutting a release for production use
 

zikulahash.patch:
 DataUtil.class.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zikulahash.patch ---
diff -rupN old/includes/DataUtil.class.php new/includes/DataUtil.class.php
--- includes/DataUtil.class.php	2008-12-08 13:31:42.000000000 -0500
+++ includes/DataUtil.class.php	2009-08-23 19:48:25.169290742 -0400
@@ -448,9 +448,9 @@ class DataUtil
                 return bin2hex(mhash(MHASH_SHA256, $string));
             } else {
                 if (!class_exists('SHA256')) {
-                    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
+                #    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
                 }
-                return SHA256::hash($string);
+                return hash('sha256', $string);
             }
         }
         else if ($type == 'md5') {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 16:03:44 -0000	1.2
+++ .cvsignore	24 Aug 2009 00:24:34 -0000	1.3
@@ -1 +1 @@
-Zikula-1.1.1-CORE.tar.gz
+Zikula-1.1.2-CORE.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Mar 2009 16:03:44 -0000	1.1
+++ import.log	24 Aug 2009 00:24:34 -0000	1.2
@@ -1 +1,2 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
+zikula-1_1_2-1_fc11:F-11:zikula-1.1.2-1.fc11.src.rpm:1251073425


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2009 16:03:44 -0000	1.2
+++ sources	24 Aug 2009 00:24:34 -0000	1.3
@@ -1 +1 @@
-d09fee4fc1f4756bff11f61c6d3797a1  Zikula-1.1.1-CORE.tar.gz
+585a1f8cec31fd33f64aa3968590a93d  Zikula-1.1.2-CORE.zip


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/zikula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zikula.spec	20 Aug 2009 19:25:10 -0000	1.2
+++ zikula.spec	24 Aug 2009 00:24:34 -0000	1.3
@@ -1,42 +1,55 @@
 Name: zikula
-Version: 1.1.1
-Release: 13%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Zikula is a free open source Web Application Framework
-Group:	Applications/Publishing
+Group:   Applications/Publishing
 License: GPLv2+
 # There is some content in this package that is LGPL with the bulk
 # GPLv2+ thus overall package should be GPLv2+ 
 URL: http://www.zikula.org/
-Source0: Zikula-%{version}-CORE.tar.gz 
+Source0: Zikula-%{version}-CORE.zip
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: zikula.conf
 #this is being discussed upstream - for the moment it is a fedora only file
 #see http://groups.google.com/group/zikula-discussions/browse_thread/thread/2f44d45a975d1515/
-Patch: %{name}-%{version}-config.patch
+Patch0: %{name}-%{version}-config.patch
 #Patch is recorded in ticket 901 on the zikula trac instance
+Patch1: %{name}hash.patch
+#Patch changes the sha256 hash function that's called to use php5's implementation.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 4.3
-Requires: php-mysql >= 4.3
-Requires: php-pgsql >= 4.3
+Requires: php >= 5.1.2
+Requires: php-mysql >= 5.1.2
+Requires: php-pgsql >= 5.1.2
+Requires: php-Smarty
+Requires: php-mcrypt
+Requires: php-adodb
+Requires: php-simplepie
+Requires: php-IDNA_Convert
+Requires: php-mbstring
+Requires: symlinks
+Requires(post): symlinks
 Requires(pre): policycoreutils
 
 %description
-Zikula is a free open source Web Application Framework. \
-It can be used to develop robust, secure, interactive and \
-editable websites and web based applications. Zikula is written \
-in PHP object oriented and fully modular. It requires a database \
- and may use all leading database platforms like MySQL, \
-PostgreSQL and Microsoft SQL Server. \
+A free open source Web Application Framework. 
+It can be used to develop robust, secure, interactive and 
+editable websites and web based applications. Zikula is written 
+in PHP, object oriented, and fully modular. It requires a database 
+ and may use all leading database platforms like MySQL, 
+PostgreSQL and Microsoft SQL Server. 
 Zikula is the successor to the PostNuke project.
 
 %pre
-semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || :
+semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
+semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
 
 %prep
 %setup -c -qn %{name}-%{version}
-%patch -p0 
+%patch0 -p0 
+%patch1 -p0
+dos2unix docs/Zikula_1_1_2-MYSQL.sql
 
 %build
 #nothing really for this section but rpmbuild complains if build is empty
@@ -48,6 +61,19 @@ rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
 
+# Following are deleted as Zikula checks the internal system looking for these libs
+# before using the 'bundled' versions. 
+rm -rf includes/classes/encryption
+rm -rf includes/classes/hashes
+rm -rf includes/classes/JSON
+
+# Following are deleted and symlinks will be created below to link to the 
+# appropriate site packages. 
+rm -rf includes/classes/Smarty
+rm -rf includes/classes/adodb
+rm -rf includes/classes/SimplePie
+rm -rf includes/classes/idna
+
 cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name}
 install -m 0644 *php robots.txt  %{buildroot}/%{_datadir}/%{name}
 
@@ -56,8 +82,11 @@ cp -pr pnTemp -t %{buildroot}/%{_localst
 install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php
 ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php
 install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf
-
-
+#ln -sf %{_datadir}/php/adodb/ %{buildroot}/%{_datadir}/%{name}/includes/classes/adodb || :
+#ln -sf %{_datadir}/php/Smarty/ %{buildroot}/%{_datadir}/%{name}/includes/classes/Smarty || :
+#ln -sf %{_datadir}/php/php-simplepie/ %{buildroot}/%{_datadir}/%{name}/includes/classes/SimplePie || :
+#ln -sf %{_datadir}/php/IDNA_Convert/ %{buildroot}/%{_datadir}/%{name}/includes/classes/idna || :
+#symlinks -crs %{buildroot}/%{_datadir}/%{name}/includes/
 rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess
 
 #changinng encoding
@@ -87,13 +116,26 @@ rm -rf %{buildroot}
 
 
 %post
-ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || :
-symlinks -crs /usr/share/zikula || :
+ln -sf /usr/share/doc/zikula-1.1.2 /usr/share/zikula/docs > /dev/null 2>&1 || :
+ln -sf /usr/share/php/adodb /usr/share/zikula/includes/classes/adodb > /dev/null 2>&1 || :
+ln -sf /usr/share/php/Smarty /usr/share/zikula/includes/classes/Smarty > /dev/null 2>&1 || :
+ln -sf /usr/share/php/php-simplepie /usr/share/zikula/includes/classes/SimplePie > /dev/null 2>&1 || :
+ln -sf /usr/share/php/IDNA_Convert /usr/share/zikula/includes/classes/idna > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+- upgraded to 1.1.2 to match upstream bug 514301
+- changed php version requirements to 5.1.2 to remove bundling of sha256 library
+- added symlinks silencing per ian wellers bug 511137
+- silenced selinux problems 
+- Added requires for php-Smarty, php-adodb, php-mcrypt
+- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237
+
 * Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
 - Upstream docs advise that PHP >= 4.3 is correct requirement
-
+ 
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 


--- zikula-1.1.1-config.patch DELETED ---



From ke4qqq at fedoraproject.org  Mon Aug 24 00:26:25 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:26:25 +0000 (UTC)
Subject: rpms/zikula/EL-5 zikula-1.1.2-config.patch, NONE,
	1.1 zikulahash.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 zikula.spec, 1.2, 1.3 zikula-1.1.1-config.patch, 1.1, NONE
Message-ID: <20090824002625.0C6EA11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19150/EL-5

Modified Files:
	.cvsignore import.log sources zikula.spec 
Added Files:
	zikula-1.1.2-config.patch zikulahash.patch 
Removed Files:
	zikula-1.1.1-config.patch 
Log Message:
* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
- upgraded to 1.1.2 to match upstream bug 514301
- changed php version requirements to 5.1.2 to remove bundling of sha256 library
- added symlinks silencing per ian wellers bug 511137
- silenced selinux problems
- Added requires for php-Smarty, php-adodb, php-mcrypt
- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237



zikula-1.1.2-config.patch:
 config.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE zikula-1.1.2-config.patch ---
--- config/config.php	2008-06-06 14:03:14.000000000 +0200
+++ config/config.php.diff	2009-01-26 10:16:12.000000000 +0100
@@ -36,7 +36,7 @@
 global $PNConfig;
 $PNConfig['System']['installed']   = 0;         // installer will change this during installation
 $PNConfig['System']['tabletype']   = 'myisam';  // installer will change this during installation
-$PNConfig['System']['temp']        = 'pnTemp';  // installer will change this during installation
+$PNConfig['System']['temp']        = '/var/lib/zikula/pnTemp';  // installer will change this during installation
 $PNConfig['System']['prefix']      = 'zk';      // installer will change this during installation
 $PNConfig['System']['development'] = 0;         // should be set to 0/false when cutting a release for production use
 

zikulahash.patch:
 DataUtil.class.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zikulahash.patch ---
diff -rupN old/includes/DataUtil.class.php new/includes/DataUtil.class.php
--- includes/DataUtil.class.php	2008-12-08 13:31:42.000000000 -0500
+++ includes/DataUtil.class.php	2009-08-23 19:48:25.169290742 -0400
@@ -448,9 +448,9 @@ class DataUtil
                 return bin2hex(mhash(MHASH_SHA256, $string));
             } else {
                 if (!class_exists('SHA256')) {
-                    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
+                #    Loader::requireOnce('includes/classes/hashes/sha256.class.php');
                 }
-                return SHA256::hash($string);
+                return hash('sha256', $string);
             }
         }
         else if ($type == 'md5') {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2009 16:11:30 -0000	1.2
+++ .cvsignore	24 Aug 2009 00:26:24 -0000	1.3
@@ -1 +1 @@
-Zikula-1.1.1-CORE.tar.gz
+Zikula-1.1.2-CORE.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Mar 2009 16:11:30 -0000	1.1
+++ import.log	24 Aug 2009 00:26:24 -0000	1.2
@@ -1 +1,2 @@
 zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397
+zikula-1_1_2-1_fc11:EL-5:zikula-1.1.2-1.fc11.src.rpm:1251073550


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2009 16:11:30 -0000	1.2
+++ sources	24 Aug 2009 00:26:24 -0000	1.3
@@ -1 +1 @@
-d09fee4fc1f4756bff11f61c6d3797a1  Zikula-1.1.1-CORE.tar.gz
+585a1f8cec31fd33f64aa3968590a93d  Zikula-1.1.2-CORE.zip


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/zikula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zikula.spec	20 Aug 2009 19:23:42 -0000	1.2
+++ zikula.spec	24 Aug 2009 00:26:24 -0000	1.3
@@ -1,42 +1,55 @@
 Name: zikula
-Version: 1.1.1
-Release: 13%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Zikula is a free open source Web Application Framework
-Group:	Applications/Publishing
+Group:   Applications/Publishing
 License: GPLv2+
 # There is some content in this package that is LGPL with the bulk
 # GPLv2+ thus overall package should be GPLv2+ 
 URL: http://www.zikula.org/
-Source0: Zikula-%{version}-CORE.tar.gz 
+Source0: Zikula-%{version}-CORE.zip
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: zikula.conf
 #this is being discussed upstream - for the moment it is a fedora only file
 #see http://groups.google.com/group/zikula-discussions/browse_thread/thread/2f44d45a975d1515/
-Patch: %{name}-%{version}-config.patch
+Patch0: %{name}-%{version}-config.patch
 #Patch is recorded in ticket 901 on the zikula trac instance
+Patch1: %{name}hash.patch
+#Patch changes the sha256 hash function that's called to use php5's implementation.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: httpd
-Requires: php >= 4.3
-Requires: php-mysql >= 4.3
-Requires: php-pgsql >= 4.3
+Requires: php >= 5.1.2
+Requires: php-mysql >= 5.1.2
+Requires: php-pgsql >= 5.1.2
+Requires: php-Smarty
+Requires: php-mcrypt
+Requires: php-adodb
+Requires: php-simplepie
+Requires: php-IDNA_Convert
+Requires: php-mbstring
+Requires: symlinks
+Requires(post): symlinks
 Requires(pre): policycoreutils
 
 %description
-Zikula is a free open source Web Application Framework. \
-It can be used to develop robust, secure, interactive and \
-editable websites and web based applications. Zikula is written \
-in PHP object oriented and fully modular. It requires a database \
- and may use all leading database platforms like MySQL, \
-PostgreSQL and Microsoft SQL Server. \
+A free open source Web Application Framework. 
+It can be used to develop robust, secure, interactive and 
+editable websites and web based applications. Zikula is written 
+in PHP, object oriented, and fully modular. It requires a database 
+ and may use all leading database platforms like MySQL, 
+PostgreSQL and Microsoft SQL Server. 
 Zikula is the successor to the PostNuke project.
 
 %pre
-semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php || :
+semanage fcontext -a -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
+semanage fcontext -m -t httpd_var_run_t %{_sysconfdir}/%{name}/config.php > /dev/null 2>&1 || :
 
 %prep
 %setup -c -qn %{name}-%{version}
-%patch -p0 
+%patch0 -p0 
+%patch1 -p0
+dos2unix docs/Zikula_1_1_2-MYSQL.sql
 
 %build
 #nothing really for this section but rpmbuild complains if build is empty
@@ -48,6 +61,19 @@ rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
 
+# Following are deleted as Zikula checks the internal system looking for these libs
+# before using the 'bundled' versions. 
+rm -rf includes/classes/encryption
+rm -rf includes/classes/hashes
+rm -rf includes/classes/JSON
+
+# Following are deleted and symlinks will be created below to link to the 
+# appropriate site packages. 
+rm -rf includes/classes/Smarty
+rm -rf includes/classes/adodb
+rm -rf includes/classes/SimplePie
+rm -rf includes/classes/idna
+
 cp -pr config images includes install javascript language modules system themes -t %{buildroot}/%{_datadir}/%{name}
 install -m 0644 *php robots.txt  %{buildroot}/%{_datadir}/%{name}
 
@@ -56,8 +82,11 @@ cp -pr pnTemp -t %{buildroot}/%{_localst
 install -m 0664 ./config/config.php %{buildroot}/%{_sysconfdir}/%{name}/config.php
 ln -sf %{_sysconfdir}/%{name}/config.php %{buildroot}/%{_datadir}/%{name}/config/config.php
 install -m 0644 -D -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zikula.conf
-
-
+#ln -sf %{_datadir}/php/adodb/ %{buildroot}/%{_datadir}/%{name}/includes/classes/adodb || :
+#ln -sf %{_datadir}/php/Smarty/ %{buildroot}/%{_datadir}/%{name}/includes/classes/Smarty || :
+#ln -sf %{_datadir}/php/php-simplepie/ %{buildroot}/%{_datadir}/%{name}/includes/classes/SimplePie || :
+#ln -sf %{_datadir}/php/IDNA_Convert/ %{buildroot}/%{_datadir}/%{name}/includes/classes/idna || :
+#symlinks -crs %{buildroot}/%{_datadir}/%{name}/includes/
 rm -f %{buildroot}/%{datadir}/%{name}/includes/.htaccess
 
 #changinng encoding
@@ -87,13 +116,26 @@ rm -rf %{buildroot}
 
 
 %post
-ln -sf /usr/share/doc/zikula-1.1.1 /usr/share/zikula/docs || :
-symlinks -crs /usr/share/zikula || :
+ln -sf /usr/share/doc/zikula-1.1.2 /usr/share/zikula/docs > /dev/null 2>&1 || :
+ln -sf /usr/share/php/adodb /usr/share/zikula/includes/classes/adodb > /dev/null 2>&1 || :
+ln -sf /usr/share/php/Smarty /usr/share/zikula/includes/classes/Smarty > /dev/null 2>&1 || :
+ln -sf /usr/share/php/php-simplepie /usr/share/zikula/includes/classes/SimplePie > /dev/null 2>&1 || :
+ln -sf /usr/share/php/IDNA_Convert /usr/share/zikula/includes/classes/idna > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula/includes/ > /dev/null 2>&1 || :
+symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+- upgraded to 1.1.2 to match upstream bug 514301
+- changed php version requirements to 5.1.2 to remove bundling of sha256 library
+- added symlinks silencing per ian wellers bug 511137
+- silenced selinux problems 
+- Added requires for php-Smarty, php-adodb, php-mcrypt
+- Deleted unused JSON, encrypytion, and hashes libraries which were bundled for 493237
+
 * Wed Aug 12 2009 Paul W. Frields <stickster at gmail.com> - 1.1.1-13
 - Upstream docs advise that PHP >= 4.3 is correct requirement
-
+ 
 * Sat Mar 14 2009 David Nalley <david at gnsa.us> 1.1.1-12
 - appended zero exit snippet to all pre and post lines
 


--- zikula-1.1.1-config.patch DELETED ---



From rdieter at fedoraproject.org  Mon Aug 24 00:34:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 00:34:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec, 1.189,
	1.190 solid-bluetoothTrunkTo42.diff, 1.2, NONE
Message-ID: <20090824003441.C631911C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20815

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	solid-bluetoothTrunkTo42.diff 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
- -akonadi: move plasma_engine_calendar here
- drop Requires: kdm (F-12+)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- kdebase-workspace.spec	20 Aug 2009 00:12:48 -0000	1.189
+++ kdebase-workspace.spec	24 Aug 2009 00:34:41 -0000	1.190
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -94,7 +94,9 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
+%if 0%{?fedora} < 12
 Requires: kdm = %{version}-%{release}
+%endif
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -208,6 +210,8 @@ Requires: PyKDE4 >= %{version}
 %package akonadi
 Summary: Akonadi integration for KDE Workspace
 Group: User Interface/Desktops
+Provides: plasma-engine-akonadi = %{version}-%{release}
+Provides: plasma-engine-calendar = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi
 %description akonadi
@@ -451,6 +455,8 @@ fi
 #?akonadi
 %exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -527,9 +533,15 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
+- -akonadi: move plasma_engine_calendar here
+- drop Requires: kdm (F-12+)
+
 * Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - adjust default-applets patch to not load plasma-networkmanagement
 


--- solid-bluetoothTrunkTo42.diff DELETED ---



From rdieter at fedoraproject.org  Mon Aug 24 00:35:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 00:35:12 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 kdebase-workspace.spec, 1.239,
	1.240 solid-bluetoothTrunkTo42.diff, 1.2, NONE
Message-ID: <20090824003512.9188711C00A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20978

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	solid-bluetoothTrunkTo42.diff 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
- -akonadi: move plasma_engine_calendar here
- drop Requires: kdm (F-12+)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- kdebase-workspace.spec	20 Aug 2009 00:12:48 -0000	1.239
+++ kdebase-workspace.spec	24 Aug 2009 00:35:12 -0000	1.240
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -94,7 +94,9 @@ Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
+%if 0%{?fedora} < 12
 Requires: kdm = %{version}-%{release}
+%endif
 Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
@@ -208,6 +210,8 @@ Requires: PyKDE4 >= %{version}
 %package akonadi
 Summary: Akonadi integration for KDE Workspace
 Group: User Interface/Desktops
+Provides: plasma-engine-akonadi = %{version}-%{release}
+Provides: plasma-engine-calendar = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi
 %description akonadi
@@ -451,6 +455,8 @@ fi
 #?akonadi
 %exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -527,9 +533,15 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
+%{_kde4_libdir}/kde4/plasma_engine_calendar.so
+%{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 
 
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
+- -akonadi: move plasma_engine_calendar here
+- drop Requires: kdm (F-12+)
+
 * Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - adjust default-applets patch to not load plasma-networkmanagement
 


--- solid-bluetoothTrunkTo42.diff DELETED ---



From ke4qqq at fedoraproject.org  Mon Aug 24 00:43:04 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:43:04 +0000 (UTC)
Subject: rpms/zikula/devel import.log,1.2,1.3 zikula.spec,1.3,1.4
Message-ID: <20090824004304.EB8CF11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22508/devel

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
- added requirement for dos2unix




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Aug 2009 00:21:32 -0000	1.2
+++ import.log	24 Aug 2009 00:43:04 -0000	1.3
@@ -1,2 +1,3 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
 zikula-1_1_2-1_fc11:HEAD:zikula-1.1.2-1.fc11.src.rpm:1251073198
+zikula-1_1_2-2_fc11:HEAD:zikula-1.1.2-2.fc11.src.rpm:1251074540


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/zikula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zikula.spec	24 Aug 2009 00:21:32 -0000	1.3
+++ zikula.spec	24 Aug 2009 00:43:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,6 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
+Requires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -125,7 +126,10 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
-* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
+- added requirement for dos2unix
+
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
 - upgraded to 1.1.2 to match upstream bug 514301
 - changed php version requirements to 5.1.2 to remove bundling of sha256 library
 - added symlinks silencing per ian wellers bug 511137



From ke4qqq at fedoraproject.org  Mon Aug 24 00:43:51 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:43:51 +0000 (UTC)
Subject: rpms/zikula/F-10 import.log,1.2,1.3 zikula.spec,1.3,1.4
Message-ID: <20090824004351.A568011C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22774/F-10

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
- added requirement for dos2unix




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Aug 2009 00:22:55 -0000	1.2
+++ import.log	24 Aug 2009 00:43:51 -0000	1.3
@@ -1,2 +1,3 @@
 zikula-1_1_1-12_fc10:F-10:zikula-1.1.1-12.fc10.src.rpm:1237565237
 zikula-1_1_2-1_fc11:F-10:zikula-1.1.2-1.fc11.src.rpm:1251073342
+zikula-1_1_2-2_fc11:F-10:zikula-1.1.2-2.fc11.src.rpm:1251074609


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/zikula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zikula.spec	24 Aug 2009 00:22:55 -0000	1.3
+++ zikula.spec	24 Aug 2009 00:43:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,6 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
+Requires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -125,7 +126,10 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
-* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
+- added requirement for dos2unix
+
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
 - upgraded to 1.1.2 to match upstream bug 514301
 - changed php version requirements to 5.1.2 to remove bundling of sha256 library
 - added symlinks silencing per ian wellers bug 511137



From ke4qqq at fedoraproject.org  Mon Aug 24 00:44:25 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:44:25 +0000 (UTC)
Subject: rpms/zikula/F-11 import.log,1.2,1.3 zikula.spec,1.3,1.4
Message-ID: <20090824004425.F07FE11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23017/F-11

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
- added requirement for dos2unix




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Aug 2009 00:24:34 -0000	1.2
+++ import.log	24 Aug 2009 00:44:25 -0000	1.3
@@ -1,2 +1,3 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
 zikula-1_1_2-1_fc11:F-11:zikula-1.1.2-1.fc11.src.rpm:1251073425
+zikula-1_1_2-2_fc11:F-11:zikula-1.1.2-2.fc11.src.rpm:1251074647


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/zikula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zikula.spec	24 Aug 2009 00:24:34 -0000	1.3
+++ zikula.spec	24 Aug 2009 00:44:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,6 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
+Requires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -125,7 +126,10 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
-* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
+- added requirement for dos2unix
+
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
 - upgraded to 1.1.2 to match upstream bug 514301
 - changed php version requirements to 5.1.2 to remove bundling of sha256 library
 - added symlinks silencing per ian wellers bug 511137



From ke4qqq at fedoraproject.org  Mon Aug 24 00:45:12 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 00:45:12 +0000 (UTC)
Subject: rpms/zikula/EL-5 import.log,1.2,1.3 zikula.spec,1.3,1.4
Message-ID: <20090824004512.BB8D011C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23858/EL-5

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
- added requirement for dos2unix




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Aug 2009 00:26:24 -0000	1.2
+++ import.log	24 Aug 2009 00:45:12 -0000	1.3
@@ -1,2 +1,3 @@
 zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397
 zikula-1_1_2-1_fc11:EL-5:zikula-1.1.2-1.fc11.src.rpm:1251073550
+zikula-1_1_2-2_fc11:EL-5:zikula-1.1.2-2.fc11.src.rpm:1251074682


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/zikula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zikula.spec	24 Aug 2009 00:26:24 -0000	1.3
+++ zikula.spec	24 Aug 2009 00:45:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,6 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
+Requires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -125,7 +126,10 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
-* Sat Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
+- added requirement for dos2unix
+
+* Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-1
 - upgraded to 1.1.2 to match upstream bug 514301
 - changed php version requirements to 5.1.2 to remove bundling of sha256 library
 - added symlinks silencing per ian wellers bug 511137



From pgordon at fedoraproject.org  Mon Aug 24 00:55:40 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 24 Aug 2009 00:55:40 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkitgtk.spec,1.16,1.17
Message-ID: <20090824005540.5450711C00A2@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25761/devel

Modified Files:
	webkitgtk.spec 
Log Message:
Correct bug# in last %changelog entry.


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- webkitgtk.spec	23 Aug 2009 01:07:07 -0000	1.16
+++ webkitgtk.spec	24 Aug 2009 00:55:39 -0000	1.17
@@ -195,7 +195,7 @@ rm -rf %{buildroot}
 - Use %%add_to_doc_files to add the gtk/NEWS file instead of %%doc, which
   clobbered the doc files before they could be properly installed to the -doc
   subpackage.
-- Resolves: #516057 (gets whacked by selinux execmem check) and #516057
+- Resolves: #516057 (gets whacked by selinux execmem check) and #518693
   (webkitgtk-doc package effectively empty).
 - Update minimum required libsoup version.
 



From ke4qqq at fedoraproject.org  Mon Aug 24 01:01:45 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 01:01:45 +0000 (UTC)
Subject: rpms/zikula/devel import.log,1.3,1.4 zikula.spec,1.4,1.5
Message-ID: <20090824010145.C8EEE11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26818/devel

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
- changed requirement for dos2unix to build requirement




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Aug 2009 00:43:04 -0000	1.3
+++ import.log	24 Aug 2009 01:01:45 -0000	1.4
@@ -1,3 +1,4 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
 zikula-1_1_2-1_fc11:HEAD:zikula-1.1.2-1.fc11.src.rpm:1251073198
 zikula-1_1_2-2_fc11:HEAD:zikula-1.1.2-2.fc11.src.rpm:1251074540
+zikula-1_1_2-3_fc11:HEAD:zikula-1.1.2-3.fc11.src.rpm:1251075657


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/devel/zikula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zikula.spec	24 Aug 2009 00:43:04 -0000	1.4
+++ zikula.spec	24 Aug 2009 01:01:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,7 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
-Requires: dos2unix
+BuildRequires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -126,6 +126,9 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
+- changed requirement for dos2unix to build requirement 
+
 * Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
 - added requirement for dos2unix
 



From ke4qqq at fedoraproject.org  Mon Aug 24 01:09:41 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 01:09:41 +0000 (UTC)
Subject: rpms/zikula/F-10 import.log,1.3,1.4 zikula.spec,1.4,1.5
Message-ID: <20090824010941.DA3FC11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28303/F-10

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
- changed requirement for dos2unix to build requirement




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/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 00:43:51 -0000	1.3
+++ import.log	24 Aug 2009 01:09:41 -0000	1.4
@@ -1,3 +1,4 @@
 zikula-1_1_1-12_fc10:F-10:zikula-1.1.1-12.fc10.src.rpm:1237565237
 zikula-1_1_2-1_fc11:F-10:zikula-1.1.2-1.fc11.src.rpm:1251073342
 zikula-1_1_2-2_fc11:F-10:zikula-1.1.2-2.fc11.src.rpm:1251074609
+zikula-1_1_2-3_fc11:F-10:zikula-1.1.2-3.fc11.src.rpm:1251076130


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-10/zikula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zikula.spec	24 Aug 2009 00:43:51 -0000	1.4
+++ zikula.spec	24 Aug 2009 01:09:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,7 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
-Requires: dos2unix
+BuildRequires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -126,6 +126,9 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
+- changed requirement for dos2unix to build requirement 
+
 * Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
 - added requirement for dos2unix
 



From ke4qqq at fedoraproject.org  Mon Aug 24 01:16:40 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 01:16:40 +0000 (UTC)
Subject: rpms/zikula/F-11 import.log,1.3,1.4 zikula.spec,1.4,1.5
Message-ID: <20090824011640.4D72F11C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30190/F-11

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
- changed requirement for dos2unix to build requirement




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/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 00:44:25 -0000	1.3
+++ import.log	24 Aug 2009 01:16:39 -0000	1.4
@@ -1,3 +1,4 @@
 zikula-1_1_1-12_fc10:HEAD:zikula-1.1.1-12.fc10.src.rpm:1237564874
 zikula-1_1_2-1_fc11:F-11:zikula-1.1.2-1.fc11.src.rpm:1251073425
 zikula-1_1_2-2_fc11:F-11:zikula-1.1.2-2.fc11.src.rpm:1251074647
+zikula-1_1_2-3_fc11:F-11:zikula-1.1.2-3.fc11.src.rpm:1251076575


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/F-11/zikula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zikula.spec	24 Aug 2009 00:44:25 -0000	1.4
+++ zikula.spec	24 Aug 2009 01:16:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,7 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
-Requires: dos2unix
+BuildRequires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -126,6 +126,9 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
+- changed requirement for dos2unix to build requirement 
+
 * Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
 - added requirement for dos2unix
 



From ke4qqq at fedoraproject.org  Mon Aug 24 01:17:46 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 24 Aug 2009 01:17:46 +0000 (UTC)
Subject: rpms/zikula/EL-5 import.log,1.3,1.4 zikula.spec,1.4,1.5
Message-ID: <20090824011746.3A3A711C00A2@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zikula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30484/EL-5

Modified Files:
	import.log zikula.spec 
Log Message:
* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
- changed requirement for dos2unix to build requirement



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Aug 2009 00:45:12 -0000	1.3
+++ import.log	24 Aug 2009 01:17:46 -0000	1.4
@@ -1,3 +1,4 @@
 zikula-1_1_1-12_fc10:EL-5:zikula-1.1.1-12.fc10.src.rpm:1237565397
 zikula-1_1_2-1_fc11:EL-5:zikula-1.1.2-1.fc11.src.rpm:1251073550
 zikula-1_1_2-2_fc11:EL-5:zikula-1.1.2-2.fc11.src.rpm:1251074682
+zikula-1_1_2-3_fc11:EL-5:zikula-1.1.2-3.fc11.src.rpm:1251076644


Index: zikula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zikula/EL-5/zikula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zikula.spec	24 Aug 2009 00:45:12 -0000	1.4
+++ zikula.spec	24 Aug 2009 01:17:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name: zikula
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Zikula is a free open source Web Application Framework
 Group:   Applications/Publishing
 License: GPLv2+
@@ -29,7 +29,7 @@ Requires: php-simplepie
 Requires: php-IDNA_Convert
 Requires: php-mbstring
 Requires: symlinks
-Requires: dos2unix
+BuildRequires: dos2unix
 Requires(post): symlinks
 Requires(pre): policycoreutils
 
@@ -126,6 +126,9 @@ symlinks -crs /usr/share/zikula/includes
 symlinks -crs /usr/share/zikula > /dev/null 2>&1 || :
 
 %changelog
+* Sun Aug 24 2009 David Nalley <david at gnsa.us> 1.1.2-3
+- changed requirement for dos2unix to build requirement 
+
 * Sun Aug 23 2009 David Nalley <david at gnsa.us> 1.1.2-2
 - added requirement for dos2unix
 



From mclasen at fedoraproject.org  Mon Aug 24 01:24:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 01:24:53 +0000 (UTC)
Subject: rpms/yelp/devel ellipsis.patch,NONE,1.1 yelp.spec,1.166,1.167
Message-ID: <20090824012453.27C1E11C00A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31782

Modified Files:
	yelp.spec 
Added Files:
	ellipsis.patch 
Log Message:
Remove space before ellipsis in menuitems


ellipsis.patch:
 LINGUAS  |    1 
 en_US.po | 1471 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1472 insertions(+)

--- NEW FILE ellipsis.patch ---
diff -up yelp-2.27.2/po/en_US.po.ellipsis yelp-2.27.2/po/en_US.po
--- yelp-2.27.2/po/en_US.po.ellipsis	2009-08-23 21:20:11.306577494 -0400
+++ yelp-2.27.2/po/en_US.po	2009-08-23 21:12:19.760570894 -0400
@@ -0,0 +1,1471 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-23 21:11-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/info.xml.in.h:1
+msgid "GNU Info Pages"
+msgstr ""
+
+#: ../data/info.xml.in.h:2
+msgid "Traditional command line help (info)"
+msgstr ""
+
+#: ../data/man.xml.in.h:1
+msgid "Applications"
+msgstr ""
+
+#: ../data/man.xml.in.h:2
+msgid "BLT Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:3
+msgid "Configuration Files"
+msgstr ""
+
+#: ../data/man.xml.in.h:4
+msgid "Curses Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:5 ../data/toc.xml.in.h:35
+msgid "Development"
+msgstr ""
+
+#: ../data/man.xml.in.h:6
+msgid "FORTRAN Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:7 ../data/toc.xml.in.h:56
+msgid "Games"
+msgstr ""
+
+#: ../data/man.xml.in.h:8
+msgid "Hardware Devices"
+msgstr ""
+
+#: ../data/man.xml.in.h:9
+msgid "Kernel Routines"
+msgstr ""
+
+#: ../data/man.xml.in.h:10
+msgid "Manual Pages"
+msgstr ""
+
+#: ../data/man.xml.in.h:11
+msgid "Network Audio Sound Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:12
+msgid "OpenSSL Applications"
+msgstr ""
+
+#: ../data/man.xml.in.h:13
+msgid "OpenSSL Configuration"
+msgstr ""
+
+#: ../data/man.xml.in.h:14
+msgid "OpenSSL Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:15
+msgid "OpenSSL Overviews"
+msgstr ""
+
+#: ../data/man.xml.in.h:16
+msgid "Overviews"
+msgstr ""
+
+#: ../data/man.xml.in.h:17
+msgid "POSIX Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:18
+msgid "POSIX Headers"
+msgstr ""
+
+#: ../data/man.xml.in.h:19
+msgid "Perl Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:20
+msgid "Qt Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:21
+msgid "Readline Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:22
+msgid "Section 0p"
+msgstr ""
+
+#: ../data/man.xml.in.h:23
+msgid "Section 1m"
+msgstr ""
+
+#: ../data/man.xml.in.h:24
+msgid "Section 1ssl"
+msgstr ""
+
+#: ../data/man.xml.in.h:25
+msgid "Section 1x"
+msgstr ""
+
+#: ../data/man.xml.in.h:26
+msgid "Section 2"
+msgstr ""
+
+#: ../data/man.xml.in.h:27
+msgid "Section 3blt"
+msgstr ""
+
+#: ../data/man.xml.in.h:28
+msgid "Section 3f"
+msgstr ""
+
+#: ../data/man.xml.in.h:29
+msgid "Section 3nas"
+msgstr ""
+
+#: ../data/man.xml.in.h:30
+msgid "Section 3p"
+msgstr ""
+
+#: ../data/man.xml.in.h:31
+msgid "Section 3qt"
+msgstr ""
+
+#: ../data/man.xml.in.h:32
+msgid "Section 3readline"
+msgstr ""
+
+#: ../data/man.xml.in.h:33
+msgid "Section 3ssl"
+msgstr ""
+
+#: ../data/man.xml.in.h:34
+msgid "Section 3tiff"
+msgstr ""
+
+#: ../data/man.xml.in.h:35
+msgid "Section 4"
+msgstr ""
+
+#: ../data/man.xml.in.h:36
+msgid "Section 4x"
+msgstr ""
+
+#: ../data/man.xml.in.h:37
+msgid "Section 5"
+msgstr ""
+
+#: ../data/man.xml.in.h:38
+msgid "Section 5ssl"
+msgstr ""
+
+#: ../data/man.xml.in.h:39
+msgid "Section 5x"
+msgstr ""
+
+#: ../data/man.xml.in.h:40
+msgid "Section 6"
+msgstr ""
+
+#: ../data/man.xml.in.h:41
+msgid "Section 6x"
+msgstr ""
+
+#: ../data/man.xml.in.h:42
+msgid "Section 7ssl"
+msgstr ""
+
+#: ../data/man.xml.in.h:43
+msgid "Section 7x"
+msgstr ""
+
+#: ../data/man.xml.in.h:44
+msgid "Section 9"
+msgstr ""
+
+#: ../data/man.xml.in.h:45
+msgid "Sections 1, 1p, 1g and 1t"
+msgstr ""
+
+#: ../data/man.xml.in.h:46
+msgid "Sections 3, 3o, and 3t"
+msgstr ""
+
+#: ../data/man.xml.in.h:47
+msgid "Sections 3form and 3menu"
+msgstr ""
+
+#: ../data/man.xml.in.h:48
+msgid "Sections 3ncurses and 3curses"
+msgstr ""
+
+#: ../data/man.xml.in.h:49
+msgid "Sections 3pm and 3perl"
+msgstr ""
+
+#: ../data/man.xml.in.h:50
+msgid "Sections 3x and 3X11"
+msgstr ""
+
+#: ../data/man.xml.in.h:51
+msgid "Sections 7 and 7gcc"
+msgstr ""
+
+#: ../data/man.xml.in.h:52
+msgid "Sections 8 and 8l"
+msgstr ""
+
+#: ../data/man.xml.in.h:53
+msgid "System Administration"
+msgstr ""
+
+#: ../data/man.xml.in.h:54
+msgid "System Calls"
+msgstr ""
+
+#: ../data/man.xml.in.h:55
+msgid "System V Form/Menu Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:56
+msgid "TIFF Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:57
+msgid "Termcap Applications"
+msgstr ""
+
+#: ../data/man.xml.in.h:58
+msgid "Traditional command line help (man)"
+msgstr ""
+
+#: ../data/man.xml.in.h:59
+msgid "X11 Applications"
+msgstr ""
+
+#: ../data/man.xml.in.h:60
+msgid "X11 Configuration"
+msgstr ""
+
+#: ../data/man.xml.in.h:61
+msgid "X11 Devices"
+msgstr ""
+
+#: ../data/man.xml.in.h:62
+msgid "X11 Functions"
+msgstr ""
+
+#: ../data/man.xml.in.h:63
+msgid "X11 Games"
+msgstr ""
+
+#: ../data/man.xml.in.h:64
+msgid "X11 Overviews"
+msgstr ""
+
+#: ../data/toc.xml.in.h:1
+msgid "2D Graphics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:2
+msgid "3D Graphics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:3 ../data/ui/yelp-preferences.ui.h:1
+msgid "Accessibility"
+msgstr ""
+
+#: ../data/toc.xml.in.h:4
+msgid "Action Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:5
+msgid "Adventure Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:6
+msgid "Amusement"
+msgstr ""
+
+#: ../data/toc.xml.in.h:7
+msgid "Applications for viewing and manipulating graphics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:8
+msgid "Applications related to audio and video"
+msgstr ""
+
+#: ../data/toc.xml.in.h:9
+msgid "Applications that teach or aid in learning"
+msgstr ""
+
+#: ../data/toc.xml.in.h:10
+msgid "Arcade Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:11
+msgid "Archiving Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:12
+msgid "Art"
+msgstr ""
+
+#: ../data/toc.xml.in.h:13
+msgid "Artificial Intelligence"
+msgstr ""
+
+#: ../data/toc.xml.in.h:14
+msgid "Astronomy"
+msgstr ""
+
+#: ../data/toc.xml.in.h:15
+msgid "Biology"
+msgstr ""
+
+#: ../data/toc.xml.in.h:16
+msgid "Blocks Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:17
+msgid "Board Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:18
+msgid "Building"
+msgstr ""
+
+#: ../data/toc.xml.in.h:19
+msgid "Calculator"
+msgstr ""
+
+#: ../data/toc.xml.in.h:20
+msgid "Calendar"
+msgstr ""
+
+#: ../data/toc.xml.in.h:21
+msgid "Card Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:22
+msgid "Charting Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:23
+msgid "Chat"
+msgstr ""
+
+#: ../data/toc.xml.in.h:24
+msgid "Chemistry"
+msgstr ""
+
+#: ../data/toc.xml.in.h:25
+msgid "Clocks"
+msgstr ""
+
+#: ../data/toc.xml.in.h:26
+msgid "Compression Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:27
+msgid "Computer Science"
+msgstr ""
+
+#: ../data/toc.xml.in.h:28
+msgid "Construction"
+msgstr ""
+
+#: ../data/toc.xml.in.h:29
+msgid "Contact Management"
+msgstr ""
+
+#: ../data/toc.xml.in.h:30
+msgid "Data Visualization"
+msgstr ""
+
+#: ../data/toc.xml.in.h:31
+msgid "Databases"
+msgstr ""
+
+#: ../data/toc.xml.in.h:32
+msgid "Debuggers"
+msgstr ""
+
+#: ../data/toc.xml.in.h:33
+msgid "Desktop"
+msgstr ""
+
+#: ../data/toc.xml.in.h:34
+msgid "Desktop Settings"
+msgstr ""
+
+#: ../data/toc.xml.in.h:36
+msgid "Dialup"
+msgstr ""
+
+#: ../data/toc.xml.in.h:37
+msgid "Dictionaries"
+msgstr ""
+
+#. Translators: this is a menu title for burning audio and video to dics
+#: ../data/toc.xml.in.h:39
+msgid "Disc Burning"
+msgstr ""
+
+#: ../data/toc.xml.in.h:40
+msgid "Economy"
+msgstr ""
+
+#: ../data/toc.xml.in.h:41
+msgid "Education"
+msgstr ""
+
+#: ../data/toc.xml.in.h:42
+msgid "Electricity"
+msgstr ""
+
+#: ../data/toc.xml.in.h:43
+msgid "Electronics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:44
+msgid "Email Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:45
+msgid "Emulator"
+msgstr ""
+
+#: ../data/toc.xml.in.h:46
+msgid "Engineering"
+msgstr ""
+
+#: ../data/toc.xml.in.h:47
+msgid "File Manager"
+msgstr ""
+
+#: ../data/toc.xml.in.h:48
+msgid "File Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:49
+msgid "File Transfer"
+msgstr ""
+
+#: ../data/toc.xml.in.h:50
+msgid "Filesystem"
+msgstr ""
+
+#: ../data/toc.xml.in.h:51
+msgid "Financial Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:52
+msgid "Flow Charting Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:53
+msgid "GNOME Applications"
+msgstr ""
+
+#: ../data/toc.xml.in.h:54
+msgid "GTK"
+msgstr ""
+
+#: ../data/toc.xml.in.h:55
+msgid "GUI Designers"
+msgstr ""
+
+#: ../data/toc.xml.in.h:57
+msgid "Generic applications for the GNOME environment"
+msgstr ""
+
+#: ../data/toc.xml.in.h:58
+msgid "Generic applications for the KDE environment"
+msgstr ""
+
+#: ../data/toc.xml.in.h:59
+msgid "Geography"
+msgstr ""
+
+#: ../data/toc.xml.in.h:60
+msgid "Geology"
+msgstr ""
+
+#: ../data/toc.xml.in.h:61
+msgid "Geoscience"
+msgstr ""
+
+#: ../data/toc.xml.in.h:62
+msgid "Graphics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:63
+msgid "Guides and manuals for applications that connect to the outside world"
+msgstr ""
+
+#: ../data/toc.xml.in.h:64
+msgid "Guides for getting involved in development"
+msgstr ""
+
+#: ../data/toc.xml.in.h:65
+msgid "Ham Radio"
+msgstr ""
+
+#: ../data/toc.xml.in.h:66
+msgid "Hardware Settings"
+msgstr ""
+
+#: ../data/toc.xml.in.h:67
+msgid "Have some fun"
+msgstr ""
+
+#: ../data/toc.xml.in.h:68
+msgid "History"
+msgstr ""
+
+#: ../data/toc.xml.in.h:69
+msgid "IDEs"
+msgstr ""
+
+#: ../data/toc.xml.in.h:70
+msgid "IRC Clients"
+msgstr ""
+
+#: ../data/toc.xml.in.h:71
+msgid "Image Processing"
+msgstr ""
+
+#: ../data/toc.xml.in.h:72
+msgid "Instant Messaging"
+msgstr ""
+
+#: ../data/toc.xml.in.h:73
+msgid "Internet"
+msgstr ""
+
+#: ../data/toc.xml.in.h:74
+msgid "Java"
+msgstr ""
+
+#: ../data/toc.xml.in.h:75
+msgid "KDE Applications"
+msgstr ""
+
+#: ../data/toc.xml.in.h:76
+msgid "Kids Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:77
+msgid ""
+"Learn more about making your system more accessible for a range of "
+"disabilities"
+msgstr ""
+
+#: ../data/toc.xml.in.h:78
+msgid "Licenses"
+msgstr ""
+
+#: ../data/toc.xml.in.h:79
+msgid "Literature"
+msgstr ""
+
+#: ../data/toc.xml.in.h:80
+msgid "Logic Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:81
+msgid "Math"
+msgstr ""
+
+#: ../data/toc.xml.in.h:82
+msgid "Medical Software"
+msgstr ""
+
+#: ../data/toc.xml.in.h:83
+msgid "Midi"
+msgstr ""
+
+#: ../data/toc.xml.in.h:84
+msgid "Miscellaneous Documentation"
+msgstr ""
+
+#: ../data/toc.xml.in.h:85
+msgid "Mixers"
+msgstr ""
+
+#: ../data/toc.xml.in.h:86
+msgid "Monitor"
+msgstr ""
+
+#: ../data/toc.xml.in.h:87
+msgid "Motif"
+msgstr ""
+
+#: ../data/toc.xml.in.h:88
+msgid "Music"
+msgstr ""
+
+#: ../data/toc.xml.in.h:89
+msgid "News"
+msgstr ""
+
+#: ../data/toc.xml.in.h:90
+msgid "Numerical Analysis"
+msgstr ""
+
+#: ../data/toc.xml.in.h:91
+msgid "OCR"
+msgstr ""
+
+#: ../data/toc.xml.in.h:92
+msgid "Office Applications"
+msgstr ""
+
+#: ../data/toc.xml.in.h:93
+msgid "Office applications"
+msgstr ""
+
+#: ../data/toc.xml.in.h:94
+msgid "Other Documentation"
+msgstr ""
+
+#: ../data/toc.xml.in.h:95
+msgid "P2P"
+msgstr ""
+
+#: ../data/toc.xml.in.h:96
+msgid "PDA Communication"
+msgstr ""
+
+#: ../data/toc.xml.in.h:97
+msgid "Package Manager"
+msgstr ""
+
+#: ../data/toc.xml.in.h:98
+msgid "Parallel Computing"
+msgstr ""
+
+#: ../data/toc.xml.in.h:99
+msgid "Photography"
+msgstr ""
+
+#: ../data/toc.xml.in.h:100
+msgid "Physics"
+msgstr ""
+
+#. Translators: this is a menu title for audio and video players
+#: ../data/toc.xml.in.h:102
+msgid "Players"
+msgstr ""
+
+#: ../data/toc.xml.in.h:103
+msgid "Presentation Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:104 ../src/yelp-print.c:337 ../src/yelp-print.c:364
+msgid "Printing"
+msgstr ""
+
+#: ../data/toc.xml.in.h:105
+msgid "Profiling Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:106
+msgid "Project Management Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:107
+msgid "Publishing"
+msgstr ""
+
+#: ../data/toc.xml.in.h:108
+msgid "Qt"
+msgstr ""
+
+#: ../data/toc.xml.in.h:109
+msgid "Raster Graphics"
+msgstr ""
+
+#. Translators: this is a menu title for audio and video recorders
+#: ../data/toc.xml.in.h:111
+msgid "Recorders"
+msgstr ""
+
+#: ../data/toc.xml.in.h:112
+msgid "Remote Access"
+msgstr ""
+
+#: ../data/toc.xml.in.h:113
+msgid "Revision Control"
+msgstr ""
+
+#: ../data/toc.xml.in.h:114
+msgid "Robotics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:115
+msgid "Role Playing Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:116
+msgid "Scanning"
+msgstr ""
+
+#: ../data/toc.xml.in.h:117
+msgid "Science"
+msgstr ""
+
+#: ../data/toc.xml.in.h:118
+msgid "Security"
+msgstr ""
+
+#: ../data/toc.xml.in.h:119
+msgid "Sequencers"
+msgstr ""
+
+#: ../data/toc.xml.in.h:120
+msgid "Settings"
+msgstr ""
+
+#: ../data/toc.xml.in.h:121
+msgid "Settings users can manipulate to make their environment more pleasant"
+msgstr ""
+
+#: ../data/toc.xml.in.h:122
+msgid "Simulation Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:123
+msgid "Sound"
+msgstr ""
+
+#: ../data/toc.xml.in.h:124
+msgid "Sound &amp; Video"
+msgstr ""
+
+#: ../data/toc.xml.in.h:125
+msgid "Sound &amp; Video Editing"
+msgstr ""
+
+#: ../data/toc.xml.in.h:126
+msgid "Sports"
+msgstr ""
+
+#: ../data/toc.xml.in.h:127
+msgid "Sports Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:128
+msgid "Spreadsheet Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:129
+msgid "Strategy Games"
+msgstr ""
+
+#: ../data/toc.xml.in.h:130
+msgid "System"
+msgstr ""
+
+#: ../data/toc.xml.in.h:131
+msgid "TV"
+msgstr ""
+
+#: ../data/toc.xml.in.h:132
+msgid "Telephony"
+msgstr ""
+
+#: ../data/toc.xml.in.h:133
+msgid "Telephony Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:134
+msgid "Terminal Emulator"
+msgstr ""
+
+#: ../data/toc.xml.in.h:135
+msgid "Text Editors"
+msgstr ""
+
+#: ../data/toc.xml.in.h:136
+msgid "Text Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:137
+msgid "Tools to help you manage your computer"
+msgstr ""
+
+#: ../data/toc.xml.in.h:138
+msgid "Translation Tools"
+msgstr ""
+
+#: ../data/toc.xml.in.h:139
+msgid "Tuners"
+msgstr ""
+
+#: ../data/toc.xml.in.h:140
+msgid "Utilities"
+msgstr ""
+
+#: ../data/toc.xml.in.h:141
+msgid "Utilities to help you get work done"
+msgstr ""
+
+#: ../data/toc.xml.in.h:142
+msgid "Vector Graphics"
+msgstr ""
+
+#: ../data/toc.xml.in.h:143
+msgid "Video"
+msgstr ""
+
+#: ../data/toc.xml.in.h:144
+msgid "Video Conference"
+msgstr ""
+
+#. Translators: This is a menu title for graphics viewing applications
+#: ../data/toc.xml.in.h:146
+msgid "Viewer"
+msgstr ""
+
+#: ../data/toc.xml.in.h:147
+msgid "Web Browser"
+msgstr ""
+
+#: ../data/toc.xml.in.h:148
+msgid "Web Development"
+msgstr ""
+
+#: ../data/toc.xml.in.h:149
+msgid "Welcome to the GNOME Help Browser"
+msgstr ""
+
+#: ../data/toc.xml.in.h:150
+msgid "Word Processors"
+msgstr ""
+
+#: ../data/ui/yelp-bookmarks.ui.h:1
+msgid "Bookmarks"
+msgstr ""
+
+#: ../data/ui/yelp-bookmarks.ui.h:2
+msgid "Re_name"
+msgstr ""
+
+#: ../data/ui/yelp-bookmarks.ui.h:3
+msgid "_Bookmarks:"
+msgstr ""
+
+#: ../data/ui/yelp-bookmarks-add.ui.h:1
+msgid "Add Bookmark"
+msgstr ""
+
+#: ../data/ui/yelp-bookmarks-add.ui.h:2
+msgid "_Title:"
+msgstr ""
+
+#: ../data/ui/yelp-open-location.ui.h:1
+msgid "Open Location"
+msgstr ""
+
+#: ../data/ui/yelp-open-location.ui.h:2
+msgid "_Location:"
+msgstr ""
+
+#: ../data/ui/yelp-preferences.ui.h:2
+msgid "Fonts"
+msgstr ""
+
+#: ../data/ui/yelp-preferences.ui.h:3
+msgid "Preferences"
+msgstr ""
+
+#: ../data/ui/yelp-preferences.ui.h:4
+msgid "_Browse with caret"
+msgstr ""
+
+#: ../data/ui/yelp-preferences.ui.h:5
+msgid "_Fixed width:"
+msgstr ""
+
+#: ../data/ui/yelp-preferences.ui.h:6
+msgid "_Use system fonts"
+msgstr ""
+
+#: ../data/ui/yelp-preferences.ui.h:7
+msgid "_Variable width:"
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:1
+msgid "Font for fixed text"
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:2
+msgid "Font for text"
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:3
+msgid "Font for text with fixed width."
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:4
+msgid "Font for text with variable width."
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:5
+msgid "Use a keyboard-controllable caret when viewing pages."
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:6
+msgid "Use caret"
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:7
+msgid "Use system fonts"
+msgstr ""
+
+#: ../data/yelp.schemas.in.h:8
+msgid "Use the default fonts set for the system."
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:149
+msgid "Open Bookmark in New Window"
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:153
+msgid "Rename Bookmark"
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:157
+msgid "Remove Bookmark"
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:315
+#, c-format
+msgid "A bookmark titled %s already exists for this page."
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:391
+#, c-format
+msgid "A bookmark titled <b>%s</b> already exists for this page."
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:404
+msgid "Help Topics"
+msgstr ""
+
+#: ../src/yelp-bookmarks.c:419
+msgid "Document Sections"
+msgstr ""
+
+#: ../src/yelp-db-print.c:258 ../src/yelp-db-print.c:350
+#: ../src/yelp-docbook.c:275 ../src/yelp-docbook.c:367 ../src/yelp-info.c:243
+#: ../src/yelp-info.c:338 ../src/yelp-mallard.c:280 ../src/yelp-man.c:292
+#: ../src/yelp-man.c:385 ../src/yelp-toc.c:266 ../src/yelp-toc.c:365
+msgid "Page not found"
+msgstr ""
+
+#: ../src/yelp-db-print.c:259 ../src/yelp-docbook.c:276 ../src/yelp-info.c:244
+#: ../src/yelp-mallard.c:281 ../src/yelp-man.c:293
+#, c-format
+msgid "The page %s was not found in the document %s."
+msgstr ""
+
+#: ../src/yelp-db-print.c:351 ../src/yelp-docbook.c:368 ../src/yelp-info.c:339
+#: ../src/yelp-man.c:386
+#, c-format
+msgid "The requested page was not found in the document %s."
+msgstr ""
+
+#: ../src/yelp-db-print.c:392 ../src/yelp-docbook.c:410 ../src/yelp-info.c:380
+#: ../src/yelp-man.c:429
+msgid "File not found"
+msgstr ""
+
+#: ../src/yelp-db-print.c:393 ../src/yelp-docbook.c:411 ../src/yelp-info.c:381
+#: ../src/yelp-man.c:430
+#, c-format
+msgid "The file ?%s? does not exist."
+msgstr ""
+
+#: ../src/yelp-db-print.c:406 ../src/yelp-db-print.c:418
+#: ../src/yelp-docbook.c:424 ../src/yelp-docbook.c:436 ../src/yelp-info.c:395
+#: ../src/yelp-man.c:458 ../src/yelp-toc.c:437
+msgid "Could not parse file"
+msgstr ""
+
+#: ../src/yelp-db-print.c:407 ../src/yelp-docbook.c:425
+#, c-format
+msgid ""
+"The file ?%s? could not be parsed because it is not a well-formed XML "
+"document."
+msgstr ""
+
+#: ../src/yelp-db-print.c:419 ../src/yelp-docbook.c:437
+#, c-format
+msgid ""
+"The file ?%s? could not be parsed because one or more of its included files "
+"is not a well-formed XML document."
+msgstr ""
+
+#: ../src/yelp-db-print.c:766 ../src/yelp-docbook.c:787
+msgid "Unknown"
+msgstr ""
+
+#: ../src/yelp-error.c:132 ../src/yelp-error.c:139
+msgid "Unknown Error"
+msgstr ""
+
+#: ../src/yelp-error.c:136 ../src/yelp-window.c:1705
+msgid "Could Not Read File"
+msgstr ""
+
+#: ../src/yelp-error.c:146
+msgid "No information is available about this error."
+msgstr ""
+
+#: ../src/yelp-info.c:396
+#, c-format
+msgid ""
+"The file ?%s? could not be parsed because it is not a well-formed info page."
+msgstr ""
+
+#: ../src/yelp-io-channel.c:132
+#, c-format
+msgid ""
+"The file ?%s? could not be read and decoded. The file may be compressed in "
+"an unsupported format."
+msgstr ""
+
+#: ../src/yelp-main.c:90
+msgid "Use a private session"
+msgstr ""
+
+#: ../src/yelp-main.c:99
+msgid "Define which cache directory to use"
+msgstr ""
+
+#. Commandline parsing is done here
+#: ../src/yelp-main.c:356
+msgid " GNOME Help Browser"
+msgstr ""
+
+#: ../src/yelp-main.c:376 ../yelp.desktop.in.in.h:2
+msgid "Help"
+msgstr ""
+
+#: ../src/yelp-mallard.c:311
+msgid "Directory not found"
+msgstr ""
+
+#: ../src/yelp-mallard.c:312
+#, c-format
+msgid "The directory ?%s? does not exist."
+msgstr ""
+
+#: ../src/yelp-man.c:459
+#, c-format
+msgid ""
+"The file ?%s? could not be parsed because it is not a well-formed man page."
+msgstr ""
+
+#: ../src/yelp-print.c:97
+msgid "Print"
+msgstr ""
+
+#: ../src/yelp-print.c:167
+msgid "Preparing to print"
+msgstr ""
+
+#: ../src/yelp-print.c:261
+msgid "Printing is not supported on this printer"
+msgstr ""
+
+#: ../src/yelp-print.c:264
+#, c-format
+msgid "Printer %s does not support postscript printing."
+msgstr ""
+
+#: ../src/yelp-print.c:366
+msgid "Waiting to print"
+msgstr ""
+
+#: ../src/yelp-print.c:578
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../src/yelp-print.c:582
+#, c-format
+msgid "It was not possible to print your document: %s"
+msgstr ""
+
+#: ../src/yelp-search-parser.c:67
+msgid "the GNOME Support Forums"
+msgstr ""
+
+#: ../src/yelp-search-parser.c:285
+#, c-format
+msgid "No results for \"%s\""
+msgstr ""
+
+#: ../src/yelp-search-parser.c:286
+msgid ""
+"Try using different words to describe the problem you're having or the topic "
+"you want help with."
+msgstr ""
+
+#: ../src/yelp-search-parser.c:289
+#, c-format
+msgid "Search results for \"%s\""
+msgstr ""
+
+#. TRANSLATORS: Please don't do anything funny with the
+#. * format arguement.  It isn't really going through a printf
+#. * The %s is used to indicate where the name of the site (linked)
+#. * should be.  This is done in the XSLT
+#.
+#: ../src/yelp-search-parser.c:303
+#, c-format
+msgid "Repeat the search online at %s"
+msgstr ""
+
+#. Translators: Do not translate this list exactly.  These are
+#. * colon-separated words that aren't useful for choosing search
+#. * results; they will be different for each language. Include
+#. * pronouns, articles, very common verbs and prepositions,
+#. * words from question structures like "tell me about" and
+#. * "how do I", and words for functional states like "not",
+#. * "work", and "broken".
+#.
+#: ../src/yelp-search-parser.c:874
+msgid ""
+"a:about:an:are:as:at:be:broke:broken:by:can:can't:dialog:dialogue:do:doesn't:"
+"doesnt:don't:dont:explain:for:from:get:gets:got:make:makes:not:when:has:have:"
+"help:how:i:in:is:it:item:me:my:of:on:or:tell:that:the:thing:this:to:what:"
+"where:who:will:with:won't:wont:why:work:working:works"
+msgstr ""
+
+#. Translators: This is a list of common prefixes for words.
+#. * Do not translate this directly.  Instead, use a colon
+#. * seperated list of word-starts.  In English, an example
+#. * is re-.  If there is none, please use the term NULL
+#. * If there is only one, please put a colon after.
+#. * E.g. if the common prefix is re then the string would be
+#. * "re:"
+#.
+#: ../src/yelp-search-parser.c:890
+msgid "re"
+msgstr ""
+
+#. Translators: This is a list of (guess what?) common suffixes
+#. * to words.  Things that may be put at ends of words to slightly
+#. * alter their meaning (like -ing and -s in English).  This is a
+#. * colon seperated list (I like colons).  If there are none,
+#. * please use the string NULL.  If there is only 1, please
+#. * add a colon at the end of the list
+#.
+#: ../src/yelp-search-parser.c:899
+msgid "ers:er:ing:es:s:'s"
+msgstr ""
+
+#: ../src/yelp-search-parser.c:1095
+msgid "No Comment"
+msgstr ""
+
+#. Much bigger problems
+#: ../src/yelp-search.c:238
+msgid "Search could not be processed"
+msgstr ""
+
+#: ../src/yelp-search.c:239
+msgid "The requested search could not be processed."
+msgstr ""
+
+#: ../src/yelp-search.c:366
+msgid "Cannot process the search"
+msgstr ""
+
+#: ../src/yelp-search.c:367
+msgid "The search processor returned invalid results"
+msgstr ""
+
+#: ../src/yelp-toc.c:267
+#, c-format
+msgid "The page %s was not found in the TOC."
+msgstr ""
+
+#: ../src/yelp-toc.c:366
+msgid "The requested page was not found in the TOC."
+msgstr ""
+
+#: ../src/yelp-toc.c:438
+msgid ""
+"The TOC file could not be parsed because it is not a well-formed XML "
+"document."
+msgstr ""
+
+#: ../src/yelp-transform.c:86
+msgid "Invalid Stylesheet"
+msgstr ""
+
+#: ../src/yelp-transform.c:87
+#, c-format
+msgid "The XSLT stylesheet ?%s? is either missing, or it is not valid."
+msgstr ""
+
+#: ../src/yelp-transform.c:122
+msgid "Broken Transformation"
+msgstr ""
+
+#: ../src/yelp-transform.c:123
+msgid "An unknown error occurred while attempting to transform the document."
+msgstr ""
+
+#: ../src/yelp-transform.c:389
+msgid "No href attribute found on yelp:document\n"
+msgstr ""
+
+#: ../src/yelp-transform.c:404
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/yelp-window.c:306
+msgid "_File"
+msgstr ""
+
+#: ../src/yelp-window.c:307
+msgid "_Edit"
+msgstr ""
+
+#: ../src/yelp-window.c:308
+msgid "_Go"
+msgstr ""
+
+#: ../src/yelp-window.c:309
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../src/yelp-window.c:310
+msgid "_Help"
+msgstr ""
+
+#: ../src/yelp-window.c:313
+msgid "_New Window"
+msgstr ""
+
+#: ../src/yelp-window.c:318
+msgid "Print This Document ..."
+msgstr "Print This Document..."
+
+#: ../src/yelp-window.c:323
+msgid "Print This Page ..."
+msgstr "Print This Page..."
+
+#: ../src/yelp-window.c:328
+msgid "About This Document"
+msgstr ""
+
+#: ../src/yelp-window.c:333
+msgid "Open _Location"
+msgstr ""
+
+#: ../src/yelp-window.c:338
+msgid "_Close Window"
+msgstr ""
+
+#: ../src/yelp-window.c:344
+msgid "_Copy"
+msgstr ""
+
+#: ../src/yelp-window.c:350
+msgid "_Select All"
+msgstr ""
+
+#: ../src/yelp-window.c:355
+msgid "_Find..."
+msgstr ""
+
+#: ../src/yelp-window.c:360
+msgid "Find Pre_vious"
+msgstr ""
+
+#: ../src/yelp-window.c:362
+msgid "Find previous occurrence of the word or phrase"
+msgstr ""
+
+#: ../src/yelp-window.c:365
+msgid "Find Ne_xt"
+msgstr ""
+
+#: ../src/yelp-window.c:367
+msgid "Find next occurrence of the word or phrase"
+msgstr ""
+
+#: ../src/yelp-window.c:370
+msgid "_Preferences"
+msgstr ""
+
+#: ../src/yelp-window.c:375
+msgid "_Reload"
+msgstr ""
+
+#: ../src/yelp-window.c:387
+msgid "_Back"
+msgstr ""
+
+#: ../src/yelp-window.c:389
+msgid "Show previous page in history"
+msgstr ""
+
+#: ../src/yelp-window.c:392
+msgid "_Forward"
+msgstr ""
+
+#: ../src/yelp-window.c:394
+msgid "Show next page in history"
+msgstr ""
+
+#: ../src/yelp-window.c:397
+msgid "_Help Topics"
+msgstr ""
+
+#: ../src/yelp-window.c:399
+msgid "Go to the listing of help topics"
+msgstr ""
+
+#: ../src/yelp-window.c:402
+msgid "_Previous Section"
+msgstr ""
+
+#: ../src/yelp-window.c:407
+msgid "_Next Section"
+msgstr ""
+
+#: ../src/yelp-window.c:412 ../src/yelp-window.c:444
+msgid "_Contents"
+msgstr ""
+
+#: ../src/yelp-window.c:418
+msgid "_Add Bookmark"
+msgstr ""
+
+#: ../src/yelp-window.c:423
+msgid "_Edit Bookmarks..."
+msgstr ""
+
+#: ../src/yelp-window.c:429
+msgid "_Open Link"
+msgstr ""
+
+#: ../src/yelp-window.c:434
+msgid "Open Link in _New Window"
+msgstr ""
+
+#: ../src/yelp-window.c:439
+msgid "_Copy Link Address"
+msgstr ""
+
+#: ../src/yelp-window.c:446
+msgid "Help On this application"
+msgstr ""
+
+#: ../src/yelp-window.c:449
+msgid "_About"
+msgstr ""
+
+#: ../src/yelp-window.c:454
+msgid "Copy _Email Address"
+msgstr ""
+
+#: ../src/yelp-window.c:526
+msgid "Help Browser"
+msgstr ""
+
+#: ../src/yelp-window.c:621 ../src/yelp-window.c:673 ../src/yelp-window.c:1767
+msgid "Loading..."
+msgstr ""
+
+#: ../src/yelp-window.c:622 ../src/yelp-window.c:674
+msgid "Unknown Page"
+msgstr ""
+
+#: ../src/yelp-window.c:1044 ../src/yelp-window.c:1106
+#: ../src/yelp-window.c:1115
+#, c-format
+msgid "The requested URI \"%s\" is invalid"
+msgstr ""
+
+#: ../src/yelp-window.c:1045 ../src/yelp-window.c:1108
+#: ../src/yelp-window.c:1116
+msgid "Unable to load page"
+msgstr ""
+
+#: ../src/yelp-window.c:1325
+msgid "_Search:"
+msgstr ""
+
+#: ../src/yelp-window.c:1326
+msgid "Search for other documentation"
+msgstr ""
+
+#: ../src/yelp-window.c:1346
+msgid "Cannot create window"
+msgstr ""
+
+#: ../src/yelp-window.c:1352
+msgid "Cannot create search component"
+msgstr ""
+
+#: ../src/yelp-window.c:1524
+msgid "Fin_d:"
+msgstr ""
+
+#: ../src/yelp-window.c:1546
+msgid "Find _Previous"
+msgstr ""
+
+#: ../src/yelp-window.c:1558
+msgid "Find _Next"
+msgstr ""
+
+#: ../src/yelp-window.c:1571
+msgid "Phrase not found"
+msgstr ""
+
+#: ../src/yelp-window.c:1702
+#, c-format
+msgid ""
+"The file ?%s? could not be read.  This file might be missing, or you might "
+"not have permissions to read it."
+msgstr ""
+
+#. Note to translators: put here your name (and address) so it
+#. * will show up in the "about" box
+#: ../src/yelp-window.c:2572
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/yelp-window.c:2575
+msgid "Yelp"
+msgstr ""
+
+#: ../src/yelp-window.c:2577
+msgid "A documentation browser and viewer for the Gnome Desktop."
+msgstr ""
+
+#: ../yelp.desktop.in.in.h:1
+msgid "Get help with GNOME"
+msgstr ""
diff -up yelp-2.27.2/po/LINGUAS.ellipsis yelp-2.27.2/po/LINGUAS
--- yelp-2.27.2/po/LINGUAS.ellipsis	2009-08-23 21:20:00.333574022 -0400
+++ yelp-2.27.2/po/LINGUAS	2009-08-23 21:10:52.270843205 -0400
@@ -20,6 +20,7 @@ da
 de
 dz
 el
+en_US
 en_CA
 en_GB
 eo


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- yelp.spec	28 Jul 2009 05:22:16 -0000	1.166
+++ yelp.spec	24 Aug 2009 01:24:52 -0000	1.167
@@ -19,7 +19,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Version: 2.27.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.27/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -34,6 +34,8 @@ Patch3: yelp-2.15.91-use-pango.patch
 
 Patch12: libxul.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592762
+Patch13: ellipsis.patch
 
 License: GPLv2+
 Group: Applications/System
@@ -87,6 +89,7 @@ documentation written in DocBook.
 %patch3 -p1 -b .use-pango
 #%patch6 -p1 -b .hp
 %patch12 -p1 -b .libxul
+%patch13 -p1 -b .ellipsis
 
 # force regeneration
 rm data/yelp.schemas
@@ -157,6 +160,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.3-2
+- Remove space before ellipsis in menuitems
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.3-1
 - Update to 2.27.3
 



From lennart at fedoraproject.org  Mon Aug 24 01:50:30 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Mon, 24 Aug 2009 01:50:30 +0000 (UTC)
Subject: rpms/pulseaudio/devel default.pa-for-gdm, 1.1, 1.2 pulseaudio.spec, 
	1.92, 1.93
Message-ID: <20090824015030.B4DD411C0376@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4617

Modified Files:
	default.pa-for-gdm pulseaudio.spec 
Log Message:
drop x11/bt modules from gdm session since it lacks a session manager and a bt applet


Index: default.pa-for-gdm
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/default.pa-for-gdm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- default.pa-for-gdm	19 Aug 2009 02:58:53 -0000	1.1
+++ default.pa-for-gdm	24 Aug 2009 01:50:30 -0000	1.2
@@ -1,7 +1,6 @@
 load-module module-device-restore
 load-module module-card-restore
 load-module module-udev-detect
-load-module module-bluetooth-discover
 load-module module-native-protocol-unix
 load-module module-default-device-restore
 load-module module-rescue-streams
@@ -9,5 +8,4 @@ load-module module-always-sink
 load-module module-intended-roles
 load-module module-suspend-on-idle
 load-module module-console-kit
-load-module module-x11-xsmp
 load-module module-position-event-sounds


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- pulseaudio.spec	21 Aug 2009 15:31:19 -0000	1.92
+++ pulseaudio.spec	24 Aug 2009 01:50:30 -0000	1.93
@@ -192,8 +192,6 @@ License:	LGPLv2+
 Group:          Applications/Multimedia
 Requires:       %{name} = %{version}-%{release}
 Requires:	gdm >= 1:2.22.0
-Requires:	pulseaudio-module-bluetooth
-Requires:	pulseaudio-module-x11
 # for the gdm user
 Requires(pre):  gdm
 



From cweyl at fedoraproject.org  Mon Aug 24 02:11:16 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:11:16 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel perl-Net-CUPS.spec,1.14,1.15
Message-ID: <20090824021116.13CB911C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8253

Modified Files:
	perl-Net-CUPS.spec 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
- add filtering to remove private so metadata



Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-Net-CUPS.spec	23 Aug 2009 18:22:45 -0000	1.14
+++ perl-Net-CUPS.spec	24 Aug 2009 02:11:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Net-CUPS
 Version:        0.61
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -16,9 +16,11 @@ BuildRequires:  cups-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 
+%{?perl_default_filter}
+
 %description
 Net::CUPS is an interface to the Common Unix Printing System API.  If you feel
-an urge to control CUPS servers via perl, this is a good way to do it :)
+an urge to control CUPS servers via Perl, this is a good way to do it :)
 
 %prep
 %setup -q -n Net-CUPS-%{version}
@@ -55,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
+- add filtering to remove private so metadata
+
 * Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-1
 - auto-update to 0.61 (by cpan-spec-update 0.01)
 - added a new req on perl(Test::More) (version 0)



From cweyl at fedoraproject.org  Mon Aug 24 02:11:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:11:52 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/F-11 perl-Net-CUPS.spec, 1.12, 1.13 sources, 1.5,
	1.6
Message-ID: <20090824021152.4F22B11C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8470

Modified Files:
	perl-Net-CUPS.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
- add filtering to remove private so metadata



Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/F-11/perl-Net-CUPS.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Net-CUPS.spec	26 Feb 2009 22:59:42 -0000	1.12
+++ perl-Net-CUPS.spec	24 Aug 2009 02:11:52 -0000	1.13
@@ -1,24 +1,26 @@
 Name:           perl-Net-CUPS
-Version:        0.59
-Release:        3%{?dist}
+Version:        0.61
+Release:        2%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-CUPS/
-Source0:        http://www.cpan.org/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # non-perl
-BuildRequires:  cups-devel 
+BuildRequires:  cups-devel
 
 # perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 
+%{?perl_default_filter}
+
 %description
 Net::CUPS is an interface to the Common Unix Printing System API.  If you feel
-an urge to control CUPS servers via perl, this is a good way to do it :)
+an urge to control CUPS servers via Perl, this is a good way to do it :)
 
 %prep
 %setup -q -n Net-CUPS-%{version}
@@ -34,7 +36,7 @@ rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} + 
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
@@ -55,6 +57,16 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
+- add filtering to remove private so metadata
+
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-1
+- auto-update to 0.61 (by cpan-spec-update 0.01)
+- added a new req on perl(Test::More) (version 0)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.59-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.59-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jan 2009 19:01:39 -0000	1.5
+++ sources	24 Aug 2009 02:11:52 -0000	1.6
@@ -1 +1 @@
-415619f4e5fac5f5dd8727b1321efd68  Net-CUPS-0.59.tar.gz
+1aba74db9bcf15396005091f826b50e8  Net-CUPS-0.61.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 02:12:11 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:12:11 +0000 (UTC)
Subject: rpms/perl-App-Cmd/devel .cvsignore, 1.4, 1.5 perl-App-Cmd.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090824021211.1971211C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8592

Modified Files:
	.cvsignore perl-App-Cmd.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.206-1
- auto-update to 0.206 (by cpan-spec-update 0.01)
- altered br on perl(Getopt::Long::Descriptive) (0.06 => 0.075)
- altered req on perl(Getopt::Long::Descriptive) (0.06 => 0.075)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Aug 2009 18:56:24 -0000	1.4
+++ .cvsignore	24 Aug 2009 02:12:10 -0000	1.5
@@ -1 +1 @@
-App-Cmd-0.204.tar.gz
+App-Cmd-0.206.tar.gz


Index: perl-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/perl-App-Cmd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-App-Cmd.spec	8 Aug 2009 18:56:24 -0000	1.7
+++ perl-App-Cmd.spec	24 Aug 2009 02:12:10 -0000	1.8
@@ -1,5 +1,5 @@
 Name:       perl-App-Cmd
-Version:    0.204
+Version:    0.206
 Release:    1%{?dist}
 # see lib/App/Cmd.pm
 License:    GPL+ or Artistic
@@ -12,7 +12,7 @@ Requires:   perl(:MODULE_COMPAT_%(eval "
 BuildArch:  noarch
 
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(Getopt::Long::Descriptive) >= 0.06
+BuildRequires: perl(Getopt::Long::Descriptive) >= 0.075
 BuildRequires: perl(IO::TieCombine) >= 1
 BuildRequires: perl(Module::Pluggable::Object)
 BuildRequires: perl(Sub::Exporter) >= 0.975
@@ -20,7 +20,7 @@ BuildRequires: perl(Sub::Install)
 BuildRequires: perl(Test::More)
 
 ### auto-added reqs!
-Requires:       perl(Getopt::Long::Descriptive) >= 0.06
+Requires:       perl(Getopt::Long::Descriptive) >= 0.075
 Requires:       perl(Module::Pluggable::Object)
 Requires:       perl(Sub::Exporter) >= 0.975
 Requires:       perl(Sub::Install)
@@ -82,6 +82,11 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.206-1
+- auto-update to 0.206 (by cpan-spec-update 0.01)
+- altered br on perl(Getopt::Long::Descriptive) (0.06 => 0.075)
+- altered req on perl(Getopt::Long::Descriptive) (0.06 => 0.075)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
 - auto-update to 0.204 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Aug 2009 18:56:24 -0000	1.4
+++ sources	24 Aug 2009 02:12:10 -0000	1.5
@@ -1 +1 @@
-779f2a6291f794b449767db600c40f27  App-Cmd-0.204.tar.gz
+14b921942c7840b63a3fe0335ab69849  App-Cmd-0.206.tar.gz



From lennart at fedoraproject.org  Mon Aug 24 02:13:02 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Mon, 24 Aug 2009 02:13:02 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore, 1.39, 1.40 pulseaudio.spec, 1.93, 
	1.94 sources, 1.41, 1.42
Message-ID: <20090824021302.E28E211C00A2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8860

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
new test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	19 Aug 2009 02:58:53 -0000	1.39
+++ .cvsignore	24 Aug 2009 02:13:02 -0000	1.40
@@ -1 +1 @@
-pulseaudio-0.9.16-test5.tar.gz
+pulseaudio-0.9.16-test6.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- pulseaudio.spec	24 Aug 2009 01:50:30 -0000	1.93
+++ pulseaudio.spec	24 Aug 2009 02:13:02 -0000	1.94
@@ -1,10 +1,10 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        8.test5%{?dist}
+Release:        9.test6%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
-Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test5.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
 Source1:        default.pa-for-gdm
 URL:            http://pulseaudio.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +20,6 @@ BuildRequires:  xmltoman
 BuildRequires:  tcp_wrappers-devel
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
-BuildRequires:  liboil-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
@@ -199,7 +198,7 @@ Requires(pre):  gdm
 This package contains GDM integration hooks for the PulseAudio sound server.
 
 %prep
-%setup -q -T -b0 -n pulseaudio-0.9.16-test5
+%setup -q -T -b0 -n pulseaudio-0.9.16-test6
 
 %build
 %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access --disable-hal
@@ -434,6 +433,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Mon Aug 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-9.test6
+- New test release
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-8.test5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	19 Aug 2009 02:58:53 -0000	1.41
+++ sources	24 Aug 2009 02:13:02 -0000	1.42
@@ -1 +1 @@
-4c3cf86f8759a5900aced24f3ecad742  pulseaudio-0.9.16-test5.tar.gz
+03bb80acdc9c82bd69feca510d65e1e3  pulseaudio-0.9.16-test6.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 02:14:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:14:25 +0000 (UTC)
Subject: rpms/perl-Module-Starter/devel .cvsignore, 1.4,
	1.5 perl-Module-Starter.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090824021425.0D85F11C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Starter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9178

Modified Files:
	.cvsignore perl-Module-Starter.spec sources 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1:1.52-1
- auto-update to 1.52 (by cpan-spec-update 0.01)
- added a new br on perl(ExtUtils::Command) (version 0)
- added a new br on perl(ExtUtils::MakeMaker) (version 0)
- added a new br on perl(File::Spec) (version 0)
- added a new br on perl(Getopt::Long) (version 0)
- added a new br on perl(Pod::Usage) (version 0)
- added a new br on perl(Test::More) (version 0)
- added a new req on perl(ExtUtils::Command) (version 0)
- added a new req on perl(File::Spec) (version 0)
- added a new req on perl(Getopt::Long) (version 0)
- added a new req on perl(Pod::Usage) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Starter/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Nov 2008 18:30:05 -0000	1.4
+++ .cvsignore	24 Aug 2009 02:14:24 -0000	1.5
@@ -1 +1 @@
-Module-Starter-1.50.tar.gz
+Module-Starter-1.52.tar.gz


Index: perl-Module-Starter.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Starter/devel/perl-Module-Starter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Module-Starter.spec	26 Jul 2009 11:21:00 -0000	1.9
+++ perl-Module-Starter.spec	24 Aug 2009 02:14:24 -0000	1.10
@@ -1,26 +1,39 @@
 Name:           perl-Module-Starter
 Epoch:          1
-Version:        1.50
-Release:        4%{?dist}
+Version:        1.52
+Release:        1%{?dist}
 Summary:        A simple starter kit for any module
 
 Group:          Development/Libraries
-License:        GPL+ or Artistic        
-URL:            http://search.cpan.org/dist/Module-Starter            
+License:        GPL+ or Artistic
+URL:            http://search.cpan.org/dist/Module-Starter
 Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/Module-Starter-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## core
-BuildRequires:  perl
-BuildRequires: perl(Test::More), perl(ExtUtils::Command), perl(File::Spec)
-## non-core
-BuildRequires:  perl(Getopt::Long), perl(Pod::Usage)
-BuildRequires:  perl(Test::Pod::Coverage), perl(Test::Pod)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::Command)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(Pod::Usage)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Pod)
 
-BuildArch: noarch 
+BuildArch: noarch
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
+### auto-added reqs!
+Requires:       perl(ExtUtils::Command)
+Requires:       perl(File::Spec)
+Requires:       perl(Getopt::Long)
+Requires:       perl(Pod::Usage)
+
+%{?perl_default_filter:
+%filter_requires_in %{perl_vendorlib}/Module/Starter/Simple.pm
+%perl_default_filter
+}
+
 %description
 This is a CPAN module/utility to assist in the creation of new modules in a
 sensible and sane fashion.  Unless you're interested in extending the
@@ -67,6 +80,19 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1:1.52-1
+- auto-update to 1.52 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::Command) (version 0)
+- added a new br on perl(ExtUtils::MakeMaker) (version 0)
+- added a new br on perl(File::Spec) (version 0)
+- added a new br on perl(Getopt::Long) (version 0)
+- added a new br on perl(Pod::Usage) (version 0)
+- added a new br on perl(Test::More) (version 0)
+- added a new req on perl(ExtUtils::Command) (version 0)
+- added a new req on perl(File::Spec) (version 0)
+- added a new req on perl(Getopt::Long) (version 0)
+- added a new req on perl(Pod::Usage) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.50-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -92,8 +118,8 @@ rm -rf %{buildroot}
 - bump for build & release
 
 * Sun Aug 06 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.42-2
-- add additional br's for test suite: 
+- add additional br's for test suite:
   perl(Test::Pod::Coverage), perl(Test::Pod)
 
-* Sat Aug 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.42-1 
+* Sat Aug 05 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.42-1
 - Initial spec file for F-E


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Starter/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Nov 2008 05:21:59 -0000	1.5
+++ sources	24 Aug 2009 02:14:24 -0000	1.6
@@ -1 +1 @@
-a7a351e96e9eaa3cc9f4902146a385df  Module-Starter-1.50.tar.gz
+57456ca6102b719923a9ca61eb8c3194  Module-Starter-1.52.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 02:22:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:22:45 +0000 (UTC)
Subject: rpms/perl-WWW-Mechanize/devel .cvsignore, 1.12,
	1.13 perl-WWW-Mechanize.spec, 1.19, 1.20 sources, 1.12, 1.13
Message-ID: <20090824022245.F04D811C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11414

Modified Files:
	.cvsignore perl-WWW-Mechanize.spec sources 
Log Message:
* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
- auto-update to 1.60 (by cpan-spec-update 0.01)
- added a new br on perl(Carp) (version 0)
- added a new br on perl(File::Temp) (version 0)
- added a new br on perl(FindBin) (version 0)
- added a new br on perl(Getopt::Long) (version 0)
- added a new br on perl(HTML::Form) (version 1.038)
- added a new br on perl(HTML::HeadParser) (version 0)
- added a new br on perl(HTML::Parser) (version 3.33)
- altered br on perl(HTML::TokeParser) (0 => 2.28)
- added a new br on perl(HTTP::Daemon) (version 0)
- added a new br on perl(HTTP::Request) (version 1.3)
- altered br on perl(HTTP::Server::Simple) (0 => 0.35)
- added a new br on perl(HTTP::Server::Simple::CGI) (version 0)
- added a new br on perl(HTTP::Status) (version 0)
- added a new br on perl(LWP) (version 5.829)
- altered br on perl(LWP::UserAgent) (0 => 5.829)
- added a new br on perl(Pod::Usage) (version 0)
- altered br on perl(Test::More) (0 => 0.34)
- altered br on perl(Test::Warn) (0 => 0.11)
- added a new br on perl(URI::file) (version 0)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(File::Temp) (version 0)
- added a new req on perl(FindBin) (version 0)
- added a new req on perl(Getopt::Long) (version 0)
- added a new req on perl(HTML::Form) (version 1.038)
- added a new req on perl(HTML::HeadParser) (version 0)
- added a new req on perl(HTML::Parser) (version 3.33)
- added a new req on perl(HTML::TokeParser) (version 2.28)
- added a new req on perl(HTTP::Daemon) (version 0)
- added a new req on perl(HTTP::Request) (version 1.3)
- added a new req on perl(HTTP::Server::Simple) (version 0.35)
- added a new req on perl(HTTP::Server::Simple::CGI) (version 0)
- added a new req on perl(HTTP::Status) (version 0)
- added a new req on perl(LWP) (version 5.829)
- added a new req on perl(LWP::UserAgent) (version 5.829)
- added a new req on perl(Pod::Usage) (version 0)
- added a new req on perl(URI) (version 1.36)
- added a new req on perl(URI::URL) (version 0)
- added a new req on perl(URI::file) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Feb 2009 04:01:03 -0000	1.12
+++ .cvsignore	24 Aug 2009 02:22:45 -0000	1.13
@@ -1 +1 @@
-WWW-Mechanize-1.54.tar.gz
+WWW-Mechanize-1.60.tar.gz


Index: perl-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/devel/perl-WWW-Mechanize.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-WWW-Mechanize.spec	26 Jul 2009 17:27:26 -0000	1.19
+++ perl-WWW-Mechanize.spec	24 Aug 2009 02:22:45 -0000	1.20
@@ -6,29 +6,71 @@
 %bcond_with livetests
 
 Name:           perl-WWW-Mechanize
-Version:        1.54
-Release:        3%{?dist}
+Version:        1.60
+Release:        1%{?dist}
 Summary:        Automates web page form & link interaction
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/WWW-Mechanize/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/WWW-Mechanize-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/WWW-Mechanize-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::More) >= 0.34
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Test::Memory::Cycle), perl(Test::Taint), perl(Test::Warn)
-BuildRequires:  perl(HTML::TokeParser), perl(LWP::UserAgent), perl(URI::URL)
+BuildRequires:  perl(Test::Memory::Cycle)
+BuildRequires:  perl(Test::Taint)
+BuildRequires:  perl(Test::Warn) >= 0.11
+BuildRequires:  perl(HTML::TokeParser) >= 2.28
+BuildRequires:  perl(LWP::UserAgent) >= 5.829
+BuildRequires:  perl(URI::URL)
 BuildRequires:  perl(IO::Socket::SSL)
 BuildRequires:  perl(URI) >= 1.36
-BuildRequires:  perl(HTTP::Server::Simple)
+BuildRequires:  perl(HTTP::Server::Simple) >= 0.35
 BuildRequires:  perl(HTTP::Response::Encoding) >= 0.05
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(File::Temp)
+Requires:       perl(FindBin)
+Requires:       perl(Getopt::Long)
+Requires:       perl(HTML::Form) >= 1.038
+Requires:       perl(HTML::HeadParser)
+Requires:       perl(HTML::Parser) >= 3.33
+Requires:       perl(HTML::TokeParser) >= 2.28
+Requires:       perl(HTTP::Daemon)
+Requires:       perl(HTTP::Request) >= 1.3
+Requires:       perl(HTTP::Server::Simple) >= 0.35
+Requires:       perl(HTTP::Server::Simple::CGI)
+Requires:       perl(HTTP::Status)
+Requires:       perl(LWP) >= 5.829
+Requires:       perl(LWP::UserAgent) >= 5.829
+Requires:       perl(Pod::Usage)
+Requires:       perl(URI) >= 1.36
+Requires:       perl(URI::URL)
+Requires:       perl(URI::file)
+
+### auto-added brs!
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(HTML::Form) >= 1.038
+BuildRequires:  perl(HTML::HeadParser)
+BuildRequires:  perl(HTML::Parser) >= 3.33
+BuildRequires:  perl(HTTP::Daemon)
+BuildRequires:  perl(HTTP::Request) >= 1.3
+BuildRequires:  perl(HTTP::Server::Simple::CGI)
+BuildRequires:  perl(HTTP::Status)
+BuildRequires:  perl(LWP) >= 5.829
+BuildRequires:  perl(Pod::Usage)
+BuildRequires:  perl(URI::file)
+
 %description
 "WWW::Mechanize", or Mech for short, helps you automate interaction
 with a website.  It supports performing a sequence of page fetches
@@ -62,7 +104,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} + 
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 
 %{_fixperms} %{buildroot}/*
@@ -78,14 +120,55 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes etc/www-mechanize-logo.png  
+%doc Changes etc/www-mechanize-logo.png
 %{_bindir}/mech-dump
-%{perl_vendorlib}/WWW/
+%{perl_vendorlib}/*
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.60-1
+- auto-update to 1.60 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp) (version 0)
+- added a new br on perl(File::Temp) (version 0)
+- added a new br on perl(FindBin) (version 0)
+- added a new br on perl(Getopt::Long) (version 0)
+- added a new br on perl(HTML::Form) (version 1.038)
+- added a new br on perl(HTML::HeadParser) (version 0)
+- added a new br on perl(HTML::Parser) (version 3.33)
+- altered br on perl(HTML::TokeParser) (0 => 2.28)
+- added a new br on perl(HTTP::Daemon) (version 0)
+- added a new br on perl(HTTP::Request) (version 1.3)
+- altered br on perl(HTTP::Server::Simple) (0 => 0.35)
+- added a new br on perl(HTTP::Server::Simple::CGI) (version 0)
+- added a new br on perl(HTTP::Status) (version 0)
+- added a new br on perl(LWP) (version 5.829)
+- altered br on perl(LWP::UserAgent) (0 => 5.829)
+- added a new br on perl(Pod::Usage) (version 0)
+- altered br on perl(Test::More) (0 => 0.34)
+- altered br on perl(Test::Warn) (0 => 0.11)
+- added a new br on perl(URI::file) (version 0)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(File::Temp) (version 0)
+- added a new req on perl(FindBin) (version 0)
+- added a new req on perl(Getopt::Long) (version 0)
+- added a new req on perl(HTML::Form) (version 1.038)
+- added a new req on perl(HTML::HeadParser) (version 0)
+- added a new req on perl(HTML::Parser) (version 3.33)
+- added a new req on perl(HTML::TokeParser) (version 2.28)
+- added a new req on perl(HTTP::Daemon) (version 0)
+- added a new req on perl(HTTP::Request) (version 1.3)
+- added a new req on perl(HTTP::Server::Simple) (version 0.35)
+- added a new req on perl(HTTP::Server::Simple::CGI) (version 0)
+- added a new req on perl(HTTP::Status) (version 0)
+- added a new req on perl(LWP) (version 5.829)
+- added a new req on perl(LWP::UserAgent) (version 5.829)
+- added a new req on perl(Pod::Usage) (version 0)
+- added a new req on perl(URI) (version 1.36)
+- added a new req on perl(URI::URL) (version 0)
+- added a new req on perl(URI::file) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.54-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Feb 2009 04:01:03 -0000	1.12
+++ sources	24 Aug 2009 02:22:45 -0000	1.13
@@ -1 +1 @@
-27257ee2a33348df181c866d865925fb  WWW-Mechanize-1.54.tar.gz
+bd3bf56f28881c5363d1c599ff43a632  WWW-Mechanize-1.60.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 02:49:37 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:49:37 +0000 (UTC)
Subject: rpms/perl-SQL-Translator/F-11 perl-SQL-Translator.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090824024937.50AE711C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Translator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17108

Modified Files:
	perl-SQL-Translator.spec sources 
Log Message:
* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11001-1
- auto-update to 0.11001 (by cpan-spec-update 0.01)
- added a new br on perl(Carp::Clan) (version 0)
- altered br on perl(Digest::SHA1) (2.00 => 2)
- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
- added a new br on perl(File::ShareDir) (version 1)
- altered br on perl(IO::Scalar) (0 => 2.11)
- altered br on perl(Parse::RecDescent) (1.94 => 1.096)
- altered br on perl(YAML) (0.39 => 0.66)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Carp::Clan) (version 0)
- added a new req on perl(Class::Base) (version 0)
- altered req on perl(Class::Data::Inheritable) (0 => 0.02)
- added a new req on perl(Class::MakeMethods) (version 0)
- added a new req on perl(DBI) (version 0)
- added a new req on perl(Digest::SHA1) (version 2)
- added a new req on perl(File::ShareDir) (version 1)
- added a new req on perl(File::Spec) (version 0)
- added a new req on perl(IO::Dir) (version 0)
- added a new req on perl(IO::Scalar) (version 2.11)
- added a new req on perl(Parse::RecDescent) (version 1.096)
- added a new req on perl(Pod::Usage) (version 0)
- added a new req on perl(XML::Writer) (version 0.5)



Index: perl-SQL-Translator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/F-11/perl-SQL-Translator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-SQL-Translator.spec	27 May 2009 03:33:02 -0000	1.9
+++ perl-SQL-Translator.spec	24 Aug 2009 02:49:36 -0000	1.10
@@ -1,118 +1,153 @@
 Name:           perl-SQL-Translator
-Version:        0.09004
-Release:        2%{?dist}
+Version:        0.11001
+Release:        1%{?dist}
 Summary:        Manipulate structured data definitions (SQL and more)
 # see, e.g., lib/SQL/Translator.pm
 License:        GPLv2
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/SQL-Translator/
-Source0:        http://www.cpan.org/authors/id/J/JR/JROBINSON/SQL-Translator-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JR/JROBINSON/SQL-Translator-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # not automatically detected
 Requires:       perl(Class::Accessor::Fast)
-Requires:       perl(Class::Data::Inheritable)
+Requires:       perl(Class::Data::Inheritable) >= 0.02
 
 # core
-BuildRequires: perl(File::Basename) 
-BuildRequires: perl(File::Spec) 
-BuildRequires: perl(IO::Dir) 
-BuildRequires: perl(IO::File) 
-BuildRequires: perl(Pod::Usage) 
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(IO::Dir)
+BuildRequires: perl(IO::File)
+BuildRequires: perl(Pod::Usage)
 BuildRequires: perl(Test::More)                 >= 0.6
-#BuildRequires: perl(Text::ParseWords) 
+#BuildRequires: perl(Text::ParseWords)
 # cpan
-BuildRequires:  perl(Class::Accessor::Fast) 
-BuildRequires:  perl(Class::Base) 
+BuildRequires:  perl(Class::Accessor::Fast)
+BuildRequires:  perl(Class::Base)
 BuildRequires:  perl(Class::Data::Inheritable)  >= 0.02
-BuildRequires:  perl(Class::MakeMethods) 
+BuildRequires:  perl(Class::MakeMethods)
 BuildRequires:  perl(DBI)
-BuildRequires:  perl(Digest::SHA1)              >= 2.00
-BuildRequires:  perl(GD) 
-BuildRequires:  perl(Graph::Directed) 
-BuildRequires:  perl(GraphViz) 
-BuildRequires:  perl(IO::Scalar) 
+BuildRequires:  perl(Digest::SHA1)              >= 2
+BuildRequires:  perl(GD)
+BuildRequires:  perl(Graph::Directed)
+BuildRequires:  perl(GraphViz)
+BuildRequires:  perl(IO::Scalar) >= 2.11
 BuildRequires:  perl(Log::Log4perl)
-BuildRequires:  perl(Module::Build) 
-BuildRequires:  perl(Parse::RecDescent)         >= 1.94
+BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Parse::RecDescent)         >= 1.096
 # >= 0.2602 avail in FC-5+
 BuildRequires:  perl(Spreadsheet::ParseExcel)
 BuildRequires:  perl(Template)                  >= 2.1
 BuildRequires:  perl(Text::RecordParser)        >= 0.02
 BuildRequires:  perl(XML::Writer)               >= 0.5
 BuildRequires:  perl(XML::XPath)                >= 1.13
-BuildRequires:  perl(YAML)                      >= 0.39
+BuildRequires:  perl(YAML)                      >= 0.66
 # test
-BuildRequires:  perl(Test::Differences) 
+BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(XML::Parser)
 
+### auto-added reqs!
+Requires:       perl(Carp::Clan)
+Requires:       perl(Class::Base)
+Requires:       perl(Class::MakeMethods)
+Requires:       perl(DBI)
+Requires:       perl(Digest::SHA1) >= 2
+Requires:       perl(File::ShareDir) >= 1
+Requires:       perl(File::Spec)
+Requires:       perl(IO::Dir)
+Requires:       perl(IO::Scalar) >= 2.11
+Requires:       perl(Parse::RecDescent) >= 1.096
+Requires:       perl(Pod::Usage)
+Requires:       perl(XML::Writer) >= 0.5
+
+### auto-added brs!
+BuildRequires:  perl(Carp::Clan)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(File::ShareDir) >= 1
+BuildRequires:  perl(CPAN)
+
+%{?perl_default_filter:
+%filter_from_requires /perl(:)/d
+%perl_default_filter
+}
+
 %description
-SQL::Translator is a group of Perl modules that converts vendor-specific 
+SQL::Translator is a group of Perl modules that converts vendor-specific
 SQL table definitions into other formats, such as other vendor-specific
-SQL, ER diagrams, documentation (POD and HTML), XML, and Class::DBI 
-classes.  The main focus of SQL::Translator is SQL, but parsers exist 
-for other structured data formats, including Excel spreadsheets and 
-arbitrarily delimited text files.  Through the separation of the code into 
-parsers and producers with an object model in between, it?s possible to 
-combine any parser with any producer, to plug in custom parsers or 
+SQL, ER diagrams, documentation (POD and HTML), XML, and Class::DBI
+classes.  The main focus of SQL::Translator is SQL, but parsers exist
+for other structured data formats, including Excel spreadsheets and
+arbitrarily delimited text files.  Through the separation of the code into
+parsers and producers with an object model in between, it?s possible to
+combine any parser with any producer, to plug in custom parsers or
 producers, or to manipulate the parsed data via the built-in object model.
-Presently only the definition parts of SQL are handled (CREATE, ALTER), 
+Presently only the definition parts of SQL are handled (CREATE, ALTER),
 not the manipulation of data (INSERT, UPDATE, DELETE).
 
 %prep
 %setup -q -n SQL-Translator-%{version}
 
 find . -type f -exec chmod -c -x {} +
-perl -pi -e 's|^#!/usr/local/bin/perl|#!/usr/bin/perl|' t/*.t 
-
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(Producer::BaseTest)/d'
-EOF
-
-%define __perl_provides %{_builddir}/SQL-Translator-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(:)/d'
-EOF
-
-%define __perl_requires %{_builddir}/SQL-Translator-%{version}/%{name}-req
-chmod +x %{__perl_requires}
+perl -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' t/*.t
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-./Build install destdir=%{buildroot} create_packlist=0
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
 
 %check
-./Build test
+make test
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS Changes LICENSE README images/ t/
+%doc AUTHORS BUGS Changes LICENSE README share/ t/
 %{_bindir}/*
 %{perl_vendorlib}/*
 %{_mandir}/man[13]/*
 
 %changelog
+* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11001-1
+- auto-update to 0.11001 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp::Clan) (version 0)
+- altered br on perl(Digest::SHA1) (2.00 => 2)
+- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
+- added a new br on perl(File::ShareDir) (version 1)
+- altered br on perl(IO::Scalar) (0 => 2.11)
+- altered br on perl(Parse::RecDescent) (1.94 => 1.096)
+- altered br on perl(YAML) (0.39 => 0.66)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+- added a new req on perl(Carp::Clan) (version 0)
+- added a new req on perl(Class::Base) (version 0)
+- altered req on perl(Class::Data::Inheritable) (0 => 0.02)
+- added a new req on perl(Class::MakeMethods) (version 0)
+- added a new req on perl(DBI) (version 0)
+- added a new req on perl(Digest::SHA1) (version 2)
+- added a new req on perl(File::ShareDir) (version 1)
+- added a new req on perl(File::Spec) (version 0)
+- added a new req on perl(IO::Dir) (version 0)
+- added a new req on perl(IO::Scalar) (version 2.11)
+- added a new req on perl(Parse::RecDescent) (version 1.096)
+- added a new req on perl(Pod::Usage) (version 0)
+- added a new req on perl(XML::Writer) (version 0.5)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09004-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 27 2009 Iain Arnell <iarnell at gmail.com> 0.09004-2
 - add missing requires Class::Accessor::Fast and Class::Data::Inheritable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Mar 2009 20:07:27 -0000	1.6
+++ sources	24 Aug 2009 02:49:36 -0000	1.7
@@ -1 +1 @@
-0f54df1319ad5c5c6e833cbb5d51e383  SQL-Translator-0.09004.tar.gz
+09475b116f9d4f160418955225b99bdb  SQL-Translator-0.11001.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 02:49:43 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:49:43 +0000 (UTC)
Subject: rpms/perl-SQL-Translator/devel .cvsignore, 1.7,
	1.8 perl-SQL-Translator.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090824024943.869A111C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-SQL-Translator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17193

Modified Files:
	.cvsignore perl-SQL-Translator.spec sources 
Log Message:
* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11001-1
- auto-update to 0.11001 (by cpan-spec-update 0.01)
- added a new br on perl(Carp::Clan) (version 0)
- altered br on perl(Digest::SHA1) (2.00 => 2)
- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
- added a new br on perl(File::ShareDir) (version 1)
- altered br on perl(IO::Scalar) (0 => 2.11)
- altered br on perl(Parse::RecDescent) (1.94 => 1.096)
- altered br on perl(YAML) (0.39 => 0.66)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Carp::Clan) (version 0)
- added a new req on perl(Class::Base) (version 0)
- altered req on perl(Class::Data::Inheritable) (0 => 0.02)
- added a new req on perl(Class::MakeMethods) (version 0)
- added a new req on perl(DBI) (version 0)
- added a new req on perl(Digest::SHA1) (version 2)
- added a new req on perl(File::ShareDir) (version 1)
- added a new req on perl(File::Spec) (version 0)
- added a new req on perl(IO::Dir) (version 0)
- added a new req on perl(IO::Scalar) (version 2.11)
- added a new req on perl(Parse::RecDescent) (version 1.096)
- added a new req on perl(Pod::Usage) (version 0)
- added a new req on perl(XML::Writer) (version 0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Mar 2009 20:08:30 -0000	1.7
+++ .cvsignore	24 Aug 2009 02:49:43 -0000	1.8
@@ -1,8 +1 @@
-SQL-Translator-0.09004.tar.gz
-*.gz
-*.tar
-*.rpm
-noarch
-clog
-.build*
-*.bak
+SQL-Translator-0.11001.tar.gz


Index: perl-SQL-Translator.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/perl-SQL-Translator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-SQL-Translator.spec	26 Jul 2009 16:25:05 -0000	1.10
+++ perl-SQL-Translator.spec	24 Aug 2009 02:49:43 -0000	1.11
@@ -1,118 +1,150 @@
 Name:           perl-SQL-Translator
-Version:        0.09004
-Release:        3%{?dist}
+Version:        0.11001
+Release:        1%{?dist}
 Summary:        Manipulate structured data definitions (SQL and more)
 # see, e.g., lib/SQL/Translator.pm
 License:        GPLv2
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/SQL-Translator/
-Source0:        http://www.cpan.org/authors/id/J/JR/JROBINSON/SQL-Translator-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/J/JR/JROBINSON/SQL-Translator-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # not automatically detected
 Requires:       perl(Class::Accessor::Fast)
-Requires:       perl(Class::Data::Inheritable)
+Requires:       perl(Class::Data::Inheritable) >= 0.02
 
 # core
-BuildRequires: perl(File::Basename) 
-BuildRequires: perl(File::Spec) 
-BuildRequires: perl(IO::Dir) 
-BuildRequires: perl(IO::File) 
-BuildRequires: perl(Pod::Usage) 
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(IO::Dir)
+BuildRequires: perl(IO::File)
+BuildRequires: perl(Pod::Usage)
 BuildRequires: perl(Test::More)                 >= 0.6
-#BuildRequires: perl(Text::ParseWords) 
+#BuildRequires: perl(Text::ParseWords)
 # cpan
-BuildRequires:  perl(Class::Accessor::Fast) 
-BuildRequires:  perl(Class::Base) 
+BuildRequires:  perl(Class::Accessor::Fast)
+BuildRequires:  perl(Class::Base)
 BuildRequires:  perl(Class::Data::Inheritable)  >= 0.02
-BuildRequires:  perl(Class::MakeMethods) 
+BuildRequires:  perl(Class::MakeMethods)
 BuildRequires:  perl(DBI)
-BuildRequires:  perl(Digest::SHA1)              >= 2.00
-BuildRequires:  perl(GD) 
-BuildRequires:  perl(Graph::Directed) 
-BuildRequires:  perl(GraphViz) 
-BuildRequires:  perl(IO::Scalar) 
+BuildRequires:  perl(Digest::SHA1)              >= 2
+BuildRequires:  perl(GD)
+BuildRequires:  perl(Graph::Directed)
+BuildRequires:  perl(GraphViz)
+BuildRequires:  perl(IO::Scalar) >= 2.11
 BuildRequires:  perl(Log::Log4perl)
-BuildRequires:  perl(Module::Build) 
-BuildRequires:  perl(Parse::RecDescent)         >= 1.94
+BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Parse::RecDescent)         >= 1.096
 # >= 0.2602 avail in FC-5+
 BuildRequires:  perl(Spreadsheet::ParseExcel)
 BuildRequires:  perl(Template)                  >= 2.1
 BuildRequires:  perl(Text::RecordParser)        >= 0.02
 BuildRequires:  perl(XML::Writer)               >= 0.5
 BuildRequires:  perl(XML::XPath)                >= 1.13
-BuildRequires:  perl(YAML)                      >= 0.39
+BuildRequires:  perl(YAML)                      >= 0.66
 # test
-BuildRequires:  perl(Test::Differences) 
+BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(XML::Parser)
 
+### auto-added reqs!
+Requires:       perl(Carp::Clan)
+Requires:       perl(Class::Base)
+Requires:       perl(Class::MakeMethods)
+Requires:       perl(DBI)
+Requires:       perl(Digest::SHA1) >= 2
+Requires:       perl(File::ShareDir) >= 1
+Requires:       perl(File::Spec)
+Requires:       perl(IO::Dir)
+Requires:       perl(IO::Scalar) >= 2.11
+Requires:       perl(Parse::RecDescent) >= 1.096
+Requires:       perl(Pod::Usage)
+Requires:       perl(XML::Writer) >= 0.5
+
+### auto-added brs!
+BuildRequires:  perl(Carp::Clan)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(File::ShareDir) >= 1
+BuildRequires:  perl(CPAN)
+
+%{?perl_default_filter:
+%filter_from_requires /perl(:)/d
+%perl_default_filter
+}
+
 %description
-SQL::Translator is a group of Perl modules that converts vendor-specific 
+SQL::Translator is a group of Perl modules that converts vendor-specific
 SQL table definitions into other formats, such as other vendor-specific
-SQL, ER diagrams, documentation (POD and HTML), XML, and Class::DBI 
-classes.  The main focus of SQL::Translator is SQL, but parsers exist 
-for other structured data formats, including Excel spreadsheets and 
-arbitrarily delimited text files.  Through the separation of the code into 
-parsers and producers with an object model in between, it?s possible to 
-combine any parser with any producer, to plug in custom parsers or 
+SQL, ER diagrams, documentation (POD and HTML), XML, and Class::DBI
+classes.  The main focus of SQL::Translator is SQL, but parsers exist
+for other structured data formats, including Excel spreadsheets and
+arbitrarily delimited text files.  Through the separation of the code into
+parsers and producers with an object model in between, it?s possible to
+combine any parser with any producer, to plug in custom parsers or
 producers, or to manipulate the parsed data via the built-in object model.
-Presently only the definition parts of SQL are handled (CREATE, ALTER), 
+Presently only the definition parts of SQL are handled (CREATE, ALTER),
 not the manipulation of data (INSERT, UPDATE, DELETE).
 
 %prep
 %setup -q -n SQL-Translator-%{version}
 
 find . -type f -exec chmod -c -x {} +
-perl -pi -e 's|^#!/usr/local/bin/perl|#!/usr/bin/perl|' t/*.t 
-
-# Filter unwanted Provides:
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(Producer::BaseTest)/d'
-EOF
-
-%define __perl_provides %{_builddir}/SQL-Translator-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(:)/d'
-EOF
-
-%define __perl_requires %{_builddir}/SQL-Translator-%{version}/%{name}-req
-chmod +x %{__perl_requires}
+perl -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' t/*.t
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-./Build install destdir=%{buildroot} create_packlist=0
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
 
 %check
-./Build test
+make test
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS Changes LICENSE README images/ t/
+%doc AUTHORS BUGS Changes LICENSE README share/ t/
 %{_bindir}/*
 %{perl_vendorlib}/*
 %{_mandir}/man[13]/*
 
 %changelog
+* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.11001-1
+- auto-update to 0.11001 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp::Clan) (version 0)
+- altered br on perl(Digest::SHA1) (2.00 => 2)
+- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
+- added a new br on perl(File::ShareDir) (version 1)
+- altered br on perl(IO::Scalar) (0 => 2.11)
+- altered br on perl(Parse::RecDescent) (1.94 => 1.096)
+- altered br on perl(YAML) (0.39 => 0.66)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+- added a new req on perl(Carp::Clan) (version 0)
+- added a new req on perl(Class::Base) (version 0)
+- altered req on perl(Class::Data::Inheritable) (0 => 0.02)
+- added a new req on perl(Class::MakeMethods) (version 0)
+- added a new req on perl(DBI) (version 0)
+- added a new req on perl(Digest::SHA1) (version 2)
+- added a new req on perl(File::ShareDir) (version 1)
+- added a new req on perl(File::Spec) (version 0)
+- added a new req on perl(IO::Dir) (version 0)
+- added a new req on perl(IO::Scalar) (version 2.11)
+- added a new req on perl(Parse::RecDescent) (version 1.096)
+- added a new req on perl(Pod::Usage) (version 0)
+- added a new req on perl(XML::Writer) (version 0.5)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09004-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Translator/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	8 Mar 2009 20:07:27 -0000	1.6
+++ sources	24 Aug 2009 02:49:43 -0000	1.7
@@ -1 +1 @@
-0f54df1319ad5c5c6e833cbb5d51e383  SQL-Translator-0.09004.tar.gz
+09475b116f9d4f160418955225b99bdb  SQL-Translator-0.11001.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 02:55:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 02:55:33 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/devel .cvsignore, 1.9,
	1.10 perl-MooseX-Types.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20090824025533.34BAC11C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18362

Modified Files:
	.cvsignore perl-MooseX-Types.spec sources 
Log Message:
* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
- auto-update to 0.18 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	8 Aug 2009 04:23:11 -0000	1.9
+++ .cvsignore	24 Aug 2009 02:55:32 -0000	1.10
@@ -1 +1 @@
-MooseX-Types-0.16.tar.gz
+MooseX-Types-0.18.tar.gz


Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/perl-MooseX-Types.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-MooseX-Types.spec	8 Aug 2009 04:23:11 -0000	1.14
+++ perl-MooseX-Types.spec	24 Aug 2009 02:55:33 -0000	1.15
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-Types
-Version:    0.16
+Version:    0.18
 Release:    1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
+- auto-update to 0.18 (by cpan-spec-update 0.01)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
 - auto-update to 0.16 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Aug 2009 04:23:11 -0000	1.9
+++ sources	24 Aug 2009 02:55:33 -0000	1.10
@@ -1 +1 @@
-393527bf60ca5b3c48fb1758f066f541  MooseX-Types-0.16.tar.gz
+9bd54195f2e07c319a792bb7b4c9d8bd  MooseX-Types-0.18.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 03:00:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 03:00:34 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/devel .cvsignore, 1.2,
	1.3 perl-MooseX-Types-DateTime.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090824030034.202BA11C0371@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19404

Modified Files:
	.cvsignore perl-MooseX-Types-DateTime.spec sources 
Log Message:
* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- auto-update to 0.04 (by cpan-spec-update 0.01)
- altered br on perl(DateTime::Locale) (0 => 0.4001)
- altered br on perl(DateTime::TimeZone) (0.7701 => 0.95)
- added a new req on perl(DateTime) (version 0.4302)
- added a new req on perl(DateTime::Format::DateParse) (version 0.04)
- added a new req on perl(DateTime::Format::Flexible) (version 0.05)
- added a new req on perl(DateTime::Format::Natural) (version 0.71)
- added a new req on perl(DateTime::Locale) (version 0.4001)
- added a new req on perl(DateTime::TimeZone) (version 0.95)
- added a new req on perl(DateTimeX::Easy) (version 0.082)
- added a new req on perl(Moose) (version 0.41)
- added a new req on perl(MooseX::Types) (version 0.04)
- added a new req on perl(Time::Duration::Parse) (version 0.06)
- added a new req on perl(namespace::clean) (version 0.08)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jan 2009 02:45:25 -0000	1.2
+++ .cvsignore	24 Aug 2009 03:00:33 -0000	1.3
@@ -1 +1 @@
-MooseX-Types-DateTime-0.03.tar.gz
+MooseX-Types-DateTime-0.04.tar.gz


Index: perl-MooseX-Types-DateTime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/perl-MooseX-Types-DateTime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-Types-DateTime.spec	26 Jul 2009 11:32:33 -0000	1.3
+++ perl-MooseX-Types-DateTime.spec	24 Aug 2009 03:00:33 -0000	1.4
@@ -1,25 +1,25 @@
-Name:       perl-MooseX-Types-DateTime 
-Version:    0.03 
-Release:    5%{?dist}
+Name:       perl-MooseX-Types-DateTime
+Version:    0.04
+Release:    1%{?dist}
 # see, e.g., lib/MooseX/Types/DateTime.pm
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
 Summary:    DateTime related constraints and coercions for Moose
-Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/MooseX-Types-DateTime-%{version}.tar.gz 
+Source:     http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/MooseX-Types-DateTime-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-Types-DateTime
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
-BuildRequires: perl(ExtUtils::MakeMaker) 
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(DateTime) >= 0.4302
 BuildRequires: perl(DateTime::Format::DateParse) >= 0.04
 BuildRequires: perl(DateTime::Format::Flexible) >= 0.05
 BuildRequires: perl(DateTime::Format::Natural) >= 0.71
 # stupid versions... grr
 #BuildRequires: perl(DateTime::Locale) >= 0.4001
-BuildRequires: perl(DateTime::Locale)
-BuildRequires: perl(DateTime::TimeZone) >= 0.7701
+BuildRequires: perl(DateTime::Locale) >= 0.4001
+BuildRequires: perl(DateTime::TimeZone) >= 0.95
 BuildRequires: perl(DateTimeX::Easy) >= 0.082
 BuildRequires: perl(Moose) >= 0.41
 BuildRequires: perl(MooseX::Types) >= 0.04
@@ -32,6 +32,19 @@ BuildRequires: perl(Time::Duration::Pars
 BuildRequires: perl(DateTime::Format::DateManip)
 
 
+### auto-added reqs!
+Requires:       perl(DateTime) >= 0.4302
+Requires:       perl(DateTime::Format::DateParse) >= 0.04
+Requires:       perl(DateTime::Format::Flexible) >= 0.05
+Requires:       perl(DateTime::Format::Natural) >= 0.71
+Requires:       perl(DateTime::Locale) >= 0.4001
+Requires:       perl(DateTime::TimeZone) >= 0.95
+Requires:       perl(DateTimeX::Easy) >= 0.082
+Requires:       perl(Moose) >= 0.41
+Requires:       perl(MooseX::Types) >= 0.04
+Requires:       perl(Time::Duration::Parse) >= 0.06
+Requires:       perl(namespace::clean) >= 0.08
+
 %description
 This module packages several type constraints (Moose::Util::TypeConstraints)
 and coercions designed to work with the DateTime suite of objects.
@@ -59,15 +72,31 @@ find %{buildroot} -depth -type d -exec r
 make test
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes 
+%doc Changes
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
+- auto-update to 0.04 (by cpan-spec-update 0.01)
+- altered br on perl(DateTime::Locale) (0 => 0.4001)
+- altered br on perl(DateTime::TimeZone) (0.7701 => 0.95)
+- added a new req on perl(DateTime) (version 0.4302)
+- added a new req on perl(DateTime::Format::DateParse) (version 0.04)
+- added a new req on perl(DateTime::Format::Flexible) (version 0.05)
+- added a new req on perl(DateTime::Format::Natural) (version 0.71)
+- added a new req on perl(DateTime::Locale) (version 0.4001)
+- added a new req on perl(DateTime::TimeZone) (version 0.95)
+- added a new req on perl(DateTimeX::Easy) (version 0.082)
+- added a new req on perl(Moose) (version 0.41)
+- added a new req on perl(MooseX::Types) (version 0.04)
+- added a new req on perl(Time::Duration::Parse) (version 0.06)
+- added a new req on perl(namespace::clean) (version 0.08)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -83,4 +112,3 @@ rm -rf %{buildroot} 
 * Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jan 2009 02:45:25 -0000	1.2
+++ sources	24 Aug 2009 03:00:33 -0000	1.3
@@ -1 +1 @@
-a270e7d20c23ef23ee782563187d93c5  MooseX-Types-DateTime-0.03.tar.gz
+c5c3961d053a8d21faf439a95091dde7  MooseX-Types-DateTime-0.04.tar.gz



From cweyl at fedoraproject.org  Mon Aug 24 03:02:11 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 24 Aug 2009 03:02:11 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/F-11 perl-MooseX-Types.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20090824030211.57C1011C00A2@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19800

Modified Files:
	perl-MooseX-Types.spec sources 
Log Message:
* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
- auto-update to 0.18 (by cpan-spec-update 0.01)



Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-11/perl-MooseX-Types.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-MooseX-Types.spec	8 Aug 2009 05:54:04 -0000	1.10
+++ perl-MooseX-Types.spec	24 Aug 2009 03:02:11 -0000	1.11
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-Types
-Version:    0.16
+Version:    0.18
 Release:    1%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 24 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-1
+- auto-update to 0.18 (by cpan-spec-update 0.01)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.16-1
 - auto-update to 0.16 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Aug 2009 05:54:05 -0000	1.7
+++ sources	24 Aug 2009 03:02:11 -0000	1.8
@@ -1 +1 @@
-393527bf60ca5b3c48fb1758f066f541  MooseX-Types-0.16.tar.gz
+9bd54195f2e07c319a792bb7b4c9d8bd  MooseX-Types-0.18.tar.gz



From mbarnes at fedoraproject.org  Mon Aug 24 04:16:50 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 24 Aug 2009 04:16:50 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.14,
	1.116.2.15 evolution.spec, 
	1.394.2.29, 1.394.2.30 sources, 1.116.2.18, 1.116.2.19
Message-ID: <20090824041650.3D7B911C0044@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20854

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Sun Aug 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit 94c361b.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.14
retrieving revision 1.116.2.15
diff -u -p -r1.116.2.14 -r1.116.2.15
--- .cvsignore	18 Aug 2009 19:01:04 -0000	1.116.2.14
+++ .cvsignore	24 Aug 2009 04:16:49 -0000	1.116.2.15
@@ -1 +1 @@
-evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2
+evolution-2.27.91-kill-bonobo-94c361b.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.29
retrieving revision 1.394.2.30
diff -u -p -r1.394.2.29 -r1.394.2.30
--- evolution.spec	19 Aug 2009 02:44:45 -0000	1.394.2.29
+++ evolution.spec	24 Aug 2009 04:16:49 -0000	1.394.2.30
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 0cc0035
+%define hash 94c361b
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.90
-Release: 3.kb.1%{?dist}
+Version: 2.27.91
+Release: 1.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -590,8 +590,8 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
 #%{evo_plugin_dir}/org-gnome-publish-calendar.xml
 
-%{evo_plugin_dir}/org-gnome-save-calendar.eplug
-%{evo_plugin_dir}/liborg-gnome-save-calendar.so
+#%{evo_plugin_dir}/org-gnome-save-calendar.eplug
+#%{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
 %{evo_plugin_dir}/org-gnome-subject-thread.eplug
 %{evo_plugin_dir}/liborg-gnome-subject-thread.so
@@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Sun Aug 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.1.fc12
+- Snapshot of "kill-bonobo" branch at commit 94c361b.
+
 * Tue Aug 18 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-3.kb.1.fc12
 - Snapshot of "kill-bonobo" branch at commit 0cc0035.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.18
retrieving revision 1.116.2.19
diff -u -p -r1.116.2.18 -r1.116.2.19
--- sources	18 Aug 2009 19:01:04 -0000	1.116.2.18
+++ sources	24 Aug 2009 04:16:49 -0000	1.116.2.19
@@ -1 +1 @@
-8354380b462d71b8c28a937a74588e18  evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2
+950e447ca2cb899275671669d9f565f8  evolution-2.27.91-kill-bonobo-94c361b.tar.bz2



From fabbione at fedoraproject.org  Mon Aug 24 04:31:19 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 04:31:19 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.28, 1.29 cluster.spec, 1.57,
	1.58 sources, 1.29, 1.30
Message-ID: <20090824043119.B49F511C0044@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24146

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.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	20 Aug 2009 11:08:45 -0000	1.28
+++ .cvsignore	24 Aug 2009 04:31:19 -0000	1.29
@@ -1 +1 @@
-cluster-3.0.1.tar.gz
+cluster-3.0.2.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- cluster.spec	20 Aug 2009 11:08:45 -0000	1.57
+++ cluster.spec	24 Aug 2009 04:31:19 -0000	1.58
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.1
+Version: 3.0.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -301,6 +301,9 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-1
+- New upstream release
+
 * Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	20 Aug 2009 11:08:45 -0000	1.29
+++ sources	24 Aug 2009 04:31:19 -0000	1.30
@@ -1 +1 @@
-77252edca5f1d11d74610bf9a89d7445  cluster-3.0.1.tar.gz
+d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz



From fabbione at fedoraproject.org  Mon Aug 24 04:34:43 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 04:34:43 +0000 (UTC)
Subject: rpms/fence-agents/devel .cvsignore, 1.12, 1.13 fence-agents.spec,
	1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20090824043443.DD55011C0044@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24847

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release.
Update runtime dependencies.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Aug 2009 11:04:56 -0000	1.12
+++ .cvsignore	24 Aug 2009 04:34:43 -0000	1.13
@@ -1 +1 @@
-fence-agents-3.0.1.tar.gz
+fence-agents-3.0.2.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fence-agents.spec	20 Aug 2009 11:04:56 -0000	1.14
+++ fence-agents.spec	24 Aug 2009 04:34:43 -0000	1.15
@@ -18,7 +18,7 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.1
+Version: 3.0.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -27,7 +27,8 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils pyOpenSSL
+Requires: pexpect net-snmp-utils libvirt-client
+Requires: perl-Net-Telnet
 
 ## Setup/build bits
 
@@ -85,6 +86,8 @@ power management for several devices.
 %changelog
 * Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
 - New upstream release
+- spec file updates:
+  * remove dust from runtime dependencies
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Aug 2009 11:04:56 -0000	1.12
+++ sources	24 Aug 2009 04:34:43 -0000	1.13
@@ -1 +1 @@
-6e4349514e78860082df7eb61bc91bf5  fence-agents-3.0.1.tar.gz
+bbad9ff97a7ce268e43de2cc2aa297f7  fence-agents-3.0.2.tar.gz



From emaldonado at fedoraproject.org  Mon Aug 24 04:37:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 24 Aug 2009 04:37:06 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-3.12.3.99.3-stripped.tar.bz2, 1.1,
	NONE
Message-ID: <20090824043706.8CF1C11C0044@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25193

Removed Files:
	nss-softokn-3.12.3.99.3-stripped.tar.bz2 
Log Message:
Belongs in the lookaside cache, not here.



--- nss-softokn-3.12.3.99.3-stripped.tar.bz2 DELETED ---



From mclasen at fedoraproject.org  Mon Aug 24 04:38:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 04:38:42 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel fix-gtkbuilder-conversion.patch, NONE, 
	1.1 gnome-screensaver.spec, 1.223, 1.224
Message-ID: <20090824043842.3A44E11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25597

Modified Files:
	gnome-screensaver.spec 
Added Files:
	fix-gtkbuilder-conversion.patch 
Log Message:


fix-gtkbuilder-conversion.patch:
 data/lock-dialog-default.ui |   18 ------------------
 src/gs-lock-plug.c          |    4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)

--- NEW FILE fix-gtkbuilder-conversion.patch ---
--- gnome-screensaver-2.27.0/data/lock-dialog-default.ui	2009-08-24 00:27:51.169693536 -0400
+++ hacked/data/lock-dialog-default.ui	2009-08-24 00:26:35.149714591 -0400
@@ -1,22 +1,6 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
-  <object class="GtkWindow" id="window1">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">window1</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_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
-    <child>
       <object class="GtkFrame" id="lock-dialog">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
@@ -518,6 +502,4 @@
           <placeholder/>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
--- gnome-screensaver-2.27.0/src/gs-lock-plug.c	2009-08-24 00:27:51.178703972 -0400
+++ hacked/src/gs-lock-plug.c	2009-08-24 00:15:20.646571022 -0400
@@ -1658,8 +1658,8 @@
 
         builder = gtk_builder_new();
 
-        if (!gtk_builder_add_from_file (builder,filename ,&error)) {
-                g_warning ("Couldn't load builder file: %s", error->message);
+        if (!gtk_builder_add_from_file (builder,gtkbuilder,&error)) {
+                g_warning ("Couldn't load builder file '%s': %s", gtkbuilder, error->message);
                 g_error_free(error);
                 g_free (gtkbuilder);
                 return FALSE;


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- gnome-screensaver.spec	18 Aug 2009 19:49:14 -0000	1.223
+++ gnome-screensaver.spec	24 Aug 2009 04:38:42 -0000	1.224
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -33,6 +33,8 @@ Patch9: use-gtkbuilder.patch
 Patch10: button-images.patch
 # from upstream
 Patch11: gnome-screensaver-2.27.0-gamma.patch
+# from upstream
+Patch12: fix-gtkbuilder-conversion.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -89,6 +91,7 @@ simple, sane, secure defaults and be wel
 %patch9 -p1 -b .use-gtkbuilder
 %patch10 -p1 -b .button-images
 %patch11 -p1 -b .gamma
+%patch12 -p1 -b .fix-gtkbuilder-conversion
 
 libtoolize --force --copy
 
@@ -165,6 +168,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-10
+- Fix GtkBuilder conversion
+
 * Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.27.0-9
 - gnome-screensaver-2.27.0-gamma.patch: Backport patch to fix gamma fadeout
   (#508513)



From sandeen at fedoraproject.org  Mon Aug 24 04:53:38 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 24 Aug 2009 04:53:38 +0000 (UTC)
Subject: rpms/e2fsprogs/devel .cvsignore, 1.33, 1.34 e2fsprogs.spec, 1.148, 
	1.149 sources, 1.33, 1.34 e2fsprogs-1.41.8-filefrag-fix.patch,
	1.1, NONE e2fsprogs-1.41.8-freefrag-defrag.patch, 1.1, NONE
Message-ID: <20090824045338.5282C11C0044@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29037

Modified Files:
	.cvsignore e2fsprogs.spec sources 
Removed Files:
	e2fsprogs-1.41.8-filefrag-fix.patch 
	e2fsprogs-1.41.8-freefrag-defrag.patch 
Log Message:
* Sun Aug 23 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	12 Jul 2009 23:39:15 -0000	1.33
+++ .cvsignore	24 Aug 2009 04:53:37 -0000	1.34
@@ -1 +1 @@
-e2fsprogs-1.41.8.tar.gz
+e2fsprogs-1.41.9.tar.gz


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- e2fsprogs.spec	6 Aug 2009 02:15:34 -0000	1.148
+++ e2fsprogs.spec	24 Aug 2009 04:53:38 -0000	1.149
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
-Version: 1.41.8
-Release: 6%{?dist}
+Version: 1.41.9
+Release: 1%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -13,8 +13,7 @@ Source0: http://downloads.sourceforge.ne
 Source1: ext2_types-wrapper.h
 
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-1.41.8-filefrag-fix.patch
-Patch4: e2fsprogs-1.41.8-freefrag-defrag.patch
+Patch3: e2fsprogs-1.41.9-defrag.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,10 +139,8 @@ It was originally inspired by the Multic
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# fix filefrag
-%patch3 -p1 -b .filefrag
-# frag tools
-%patch4 -p1 -b .frag
+# defrag command for testing, from non-release branch
+%patch3 -p1 -b .defrag
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -304,6 +301,9 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Sun Aug 23 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-1
+- New upstream release
+
 * Fri Aug 05 2009 Eric Sandeen <sandeen at redhat.com> 1.41.8-6
 - Fix filefrag in fallback case
 - Add e2freefrag & e4defrag (experimental)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	12 Jul 2009 23:39:15 -0000	1.33
+++ sources	24 Aug 2009 04:53:38 -0000	1.34
@@ -1 +1 @@
-6708cc8e484809fc5cfb232882e48489  e2fsprogs-1.41.8.tar.gz
+52f60a9e19a02f142f5546f1b5681927  e2fsprogs-1.41.9.tar.gz


--- e2fsprogs-1.41.8-filefrag-fix.patch DELETED ---


--- e2fsprogs-1.41.8-freefrag-defrag.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Aug 24 04:56:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 04:56:11 +0000
Subject: [pkgdb] hyphen-as was added for pnemade
Message-ID: <20090824045611.D2DBE10F86F@bastion2.fedora.phx.redhat.com>

petersen has added Package hyphen-as with summary Assamese hyphenation rules
petersen has approved Package hyphen-as
petersen has added a Fedora devel branch for hyphen-as with an owner of pnemade
petersen has approved hyphen-as in Fedora devel
petersen has approved Package hyphen-as
petersen has set commit to Approved for 107427 on hyphen-as (Fedora devel)
petersen has set checkout to Approved for 107427 on hyphen-as (Fedora devel)
petersen has set build to Approved for 107427 on hyphen-as (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-as



From pkgdb at fedoraproject.org  Mon Aug 24 04:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 04:56:13 +0000
Subject: [pkgdb] hyphen-as summary updated by petersen
Message-ID: <20090824045613.2850B10F879@bastion2.fedora.phx.redhat.com>

petersen set package hyphen-as summary to Assamese hyphenation rules

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-as



From pkgdb at fedoraproject.org  Mon Aug 24 04:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 04:56:13 +0000
Subject: [pkgdb] hyphen-as (Fedora, 11) updated by petersen
Message-ID: <20090824045613.3A92A10F881@bastion2.fedora.phx.redhat.com>

petersen approved watchbugzilla on hyphen-as (Fedora devel) for i18n-team
petersen approved watchcommits on hyphen-as (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-as



From pkgdb at fedoraproject.org  Mon Aug 24 04:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 04:56:13 +0000
Subject: [pkgdb] hyphen-as (Fedora, 11) updated by petersen
Message-ID: <20090824045613.4485010F88C@bastion2.fedora.phx.redhat.com>

petersen added a Fedora 11 branch for hyphen-as
petersen has set commit to Approved for 107427 on hyphen-as (Fedora 11)
petersen has set checkout to Approved for 107427 on hyphen-as (Fedora 11)
petersen has set build to Approved for 107427 on hyphen-as (Fedora 11)
petersen approved watchbugzilla on hyphen-as (Fedora 11) for i18n-team
petersen approved watchcommits on hyphen-as (Fedora 11) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-as



From petersen at fedoraproject.org  Mon Aug 24 04:56:19 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 24 Aug 2009 04:56:19 +0000 (UTC)
Subject: rpms/hyphen-as - New directory
Message-ID: <20090824045619.1EC2E11C0044@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hyphen-as
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsG29624/rpms/hyphen-as

Log Message:
Directory /cvs/pkgs/rpms/hyphen-as added to the repository




From petersen at fedoraproject.org  Mon Aug 24 04:56:19 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 24 Aug 2009 04:56:19 +0000 (UTC)
Subject: rpms/hyphen-as/devel - New directory
Message-ID: <20090824045619.42E6111C0262@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hyphen-as/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsG29624/rpms/hyphen-as/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-as/devel added to the repository




From petersen at fedoraproject.org  Mon Aug 24 04:56:25 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 24 Aug 2009 04:56:25 +0000 (UTC)
Subject: rpms/hyphen-as Makefile,NONE,1.1
Message-ID: <20090824045625.E47DF11C0044@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hyphen-as
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsG29624/rpms/hyphen-as

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-as


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-as
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Mon Aug 24 04:56:26 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 24 Aug 2009 04:56:26 +0000 (UTC)
Subject: rpms/hyphen-as/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824045626.2E6EE11C0044@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/hyphen-as/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/CVSROOT/admin/tmpcvsG29624/rpms/hyphen-as/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-as


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-as
# $Id: Makefile,v 1.1 2009/08/24 04:56:26 petersen Exp $
NAME := hyphen-as
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sandeen at fedoraproject.org  Mon Aug 24 05:00:12 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 24 Aug 2009 05:00:12 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.9-defrag.patch,NONE,1.1
Message-ID: <20090824050012.A262111C0426@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30263

Added Files:
	e2fsprogs-1.41.9-defrag.patch 
Log Message:
And the missing patch...


e2fsprogs-1.41.9-defrag.patch:
 Makefile.in        |    3 
 configure          |    2 
 configure.in       |    2 
 misc/Makefile.in   |   26 
 misc/e4defrag.8.in |   76 +
 misc/e4defrag.c    | 2153 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 2256 insertions(+), 6 deletions(-)

--- NEW FILE e2fsprogs-1.41.9-defrag.patch ---
Index: e2fsprogs-1.41.9/misc/e4defrag.8.in
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.9/misc/e4defrag.8.in
@@ -0,0 +1,76 @@
+.TH E4DEFRAG 8 "May 2009" "e4defrag version 2.0"
+.SH NAME
+e4defrag \- online defragmenter for ext4 filesystem
+.SH SYNOPSIS
+.B e4defrag
+[
+.B \-c
+]
+[
+.B \-v
+]
+.I target
+\&...
+.SH DESCRIPTION
+.B e4defrag
+reduces fragmentation of extent based file. The file targeted by
+.B e4defrag
+is created on ext4 filesystem made with "-O extent" option (see
+.BR mke2fs (8)).
+The targeted file gets more contiguous blocks and improves the file access
+speed.
+.PP
+.I target
+is a regular file, a directory, or a device that is mounted as ext4 filesystem.
+If
+.I target
+is a directory,
+.B e4defrag
+reduces fragmentation of all files in it. If
+.I target
+is a device,
+.B e4defrag
+gets the mount point of it and reduces fragmentation of all files in this mount
+point.
+.SH OPTIONS
+.TP
+.B \-c
+Get the fragmentation count and calculate fragmentation score based on it
+before and after defrag. By seeing this score, we can determine whether we
+should execute
+.B e4defrag
+to
+.IR target .
+When used with
+.B \-v
+option, the fragmentation count before and after defrag is printed for each
+file.
+.IP
+If this option is specified,
+.I target
+is never defragmented.
+.TP
+.B \-v
+Print error messages and the fragmentation count before and after defrag for
+each file.
+.SH NOTES
+.B e4defrag
+does not support swap file, files in lost+found directory, and files allocated
+in indirect blocks. When
+.I target
+is a device or a mount point,
+.B e4defrag
+doesn't defragment files in mount point of other device.
+.PP
+Non-privileged users can execute
+.B e4defrag
+to their own file, but the score is not printed if
+.B \-c
+option is specified. Therefore, it is desirable to be executed by root user.
+.SH AUTHOR
+Written by Akira Fujita <a-fujita at rs.jp.nec.com> and Takashi Sato
+<t-sato at yk.jp.nec.com>.
+.SH SEE ALSO
+.BR mke2fs (8),
+.BR mount (8).
+
Index: e2fsprogs-1.41.9/misc/e4defrag.c
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.9/misc/e4defrag.c
@@ -0,0 +1,2153 @@
+/*
+ * e4defrag.c - ext4 filesystem defragmenter
+ *
+ * Copyright (C) 2009 NEC Software Tohoku, Ltd.
+ *
+ * Author: Akira Fujita	<a-fujita at rs.jp.nec.com>
+ *         Takashi Sato	<t-sato at yk.jp.nec.com>
+ */
+
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#endif
+
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <ctype.h>
+#include <dirent.h>
+#include <endian.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ftw.h>
+#include <limits.h>
+#include <mntent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ext2fs/ext2_types.h>
+#include <ext2fs/ext2fs.h>
+#include <linux/fs.h>
+#include <ext2fs/fiemap.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <sys/syscall.h>
+#include <sys/vfs.h>
+
+/* A relatively new ioctl interface ... */
+#ifndef EXT4_IOC_MOVE_EXT
+#define EXT4_IOC_MOVE_EXT      _IOWR('f', 15, struct move_extent)
+#endif
+
+/* Macro functions */
+#define PRINT_ERR_MSG(msg)	fprintf(stderr, "%s\n", (msg))
+#define IN_FTW_PRINT_ERR_MSG(msg)	\
+	fprintf(stderr, "\t%s\t\t[ NG ]\n", (msg))
+#define PRINT_FILE_NAME(file)	fprintf(stderr, " \"%s\"\n", (file))
+#define PRINT_ERR_MSG_WITH_ERRNO(msg)	\
+	fprintf(stderr, "\t%s:%s\t[ NG ]\n", (msg), strerror(errno))
+#define STATISTIC_ERR_MSG(msg)	\
+	fprintf(stderr, "\t%s\n", (msg))
+#define STATISTIC_ERR_MSG_WITH_ERRNO(msg)	\
+	fprintf(stderr, "\t%s:%s\n", (msg), strerror(errno))
+#define min(x, y) (((x) > (y)) ? (y) : (x))
+#define SECTOR_TO_BLOCK(sectors, blocksize) \
+	((sectors) / ((blocksize) >> 9))
+#define CALC_SCORE(ratio) \
+	((ratio) > 10 ? (80 + 20 * (ratio) / 100) : (8 * (ratio)))
+/* Wrap up the free function */
+#define FREE(tmp)				\
+	do {					\
+		if ((tmp) != NULL)		\
+			free(tmp);		\
+	} while (0)				\
+/* Insert list2 after list1 */
+#define insert(list1, list2)			\
+	do {					\
+		list2->next = list1->next;	\
+		list1->next->prev = list2;	\
+		list2->prev = list1;		\
+		list1->next = list2;		\
+	} while (0)
+
+/* To delete unused warning */
+#ifdef __GNUC__
+#define EXT2FS_ATTR(x) __attribute__(x)
+#else
+#define EXT2FS_ATTR(x)
+#endif
+
+/* The mode of defrag */
+#define DETAIL			0x01
+#define STATISTIC		0x02
+
+#define DEVNAME			0
+#define DIRNAME			1
+#define FILENAME		2
+
+#define FTW_OPEN_FD		2000
+
+#define FS_EXT4			"ext4"
+#define ROOT_UID		0
+
+#define BOUND_SCORE		55
+#define SHOW_FRAG_FILES	5
+
+/* Magic number for ext4 */
+#define EXT4_SUPER_MAGIC	0xEF53
+
+/* Definition of flex_bg */
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
+
+/* The following macro is used for ioctl FS_IOC_FIEMAP
+ * EXTENT_MAX_COUNT:	the maximum number of extents for exchanging between
+ *			kernel-space and user-space per ioctl
+ */
[...1963 lines suppressed...]
+								 argv[i]);
+			/* Defrag single file process */
+			file_defrag(argv[i], &buf, FTW_F, NULL);
+			if (succeed_cnt != 0)
+				printf(" Success:\t\t\t[1/1]\n");
+			else
+				printf(" Success:\t\t\t[0/1]\n");
+
+			break;
+		}
+
+		if (succeed_cnt != 0)
+			success_flag = 1;
+		if (mode_flag & STATISTIC) {
+			if (current_uid != ROOT_UID) {
+				printf(" Done.\n");
+				continue;
+			}
+
+			if (!succeed_cnt) {
+				if (mode_flag & DETAIL)
+					printf("\n");
+
+				if (arg_type == DEVNAME)
+					printf(" In this device(%s), "
+					"none can be defragmented.\n", argv[i]);
+				else if (arg_type == DIRNAME)
+					printf(" In this directory(%s), "
+					"none can be defragmented.\n", argv[i]);
+				else
+					printf(" This file(%s) "
+					"can't be defragmented.\n", argv[i]);
+			} else {
+				float files_ratio = 0.0;
+				float score = 0.0;
+				files_ratio = (float)(extents_before_defrag -
+						extents_after_defrag) *
+						100 / files_block_count;
+				score = CALC_SCORE(files_ratio);
+				printf("\n Total/best extents\t\t\t\t%d/%d\n"
+					" Fragmentation ratio\t\t\t\t%.2f%%\n"
+					" Fragmentation score\t\t\t\t%.2f\n",
+						extents_before_defrag,
+						extents_after_defrag,
+						files_ratio, score);
+				printf(" [0-30 no problem:"
+					" 31-55 a little bit fragmented:"
+					" 55- needs defrag]\n");
+
+				if (arg_type == DEVNAME)
+					printf(" This device(%s) ", argv[i]);
+				else if (arg_type == DIRNAME)
+					printf(" This directory(%s) ", argv[i]);
+				else
+					printf(" This file(%s) ", argv[i]);
+
+				if (score > BOUND_SCORE)
+					printf("needs defragmentation.\n");
+				else
+					printf("does not need "
+							"defragmentation.\n");
+			}
+			printf(" Done.\n");
+		}
+
+	}
+
+	if (success_flag)
+		return 0;
+
+	exit(1);
+
+out:
+	printf(MSG_USAGE);
+	exit(1);
+}
+
Index: e2fsprogs-1.41.9/misc/Makefile.in
===================================================================
--- e2fsprogs-1.41.9.orig/misc/Makefile.in
+++ e2fsprogs-1.41.9/misc/Makefile.in
@@ -51,6 +51,7 @@ BLKID_OBJS=	blkid.o
 FILEFRAG_OBJS=	filefrag.o
 E2UNDO_OBJS=  e2undo.o
 E2FREEFRAG_OBJS= e2freefrag.o
+E4DEFRAG_OBJS=  e4defrag.o
 
 PROFILED_TUNE2FS_OBJS=	profiled/tune2fs.o profiled/util.o
 PROFILED_MKLPF_OBJS=	profiled/mklost+found.o
@@ -68,7 +69,7 @@ PROFILED_FSCK_OBJS=	profiled/fsck.o prof
 PROFILED_BLKID_OBJS=	profiled/blkid.o
 PROFILED_FILEFRAG_OBJS=	profiled/filefrag.o
 PROFILED_E2UNDO_OBJS=	profiled/e2undo.o
-
+PROFILED_E4DEFRAG_OBJS= profiled/e4defrag.o
 
 XTRA_CFLAGS=	-I$(srcdir)/../e2fsck -I.
 
@@ -99,12 +100,12 @@ COMPILE_ET=$(top_builddir)/lib/et/compil
 @PROFILE_CMT@	$(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
-	$(FMANPAGES) $(LPROGS)
+	$(FMANPAGES) $(LPROGS) e4defrag
 
 @PROFILE_CMT at all:: tune2fs.profiled blkid.profiled e2image.profiled \
 	e2undo.profiled mke2fs.profiled dumpe2fs.profiled fsck.profiled \
 	logsave.profiled filefrag.profiled uuidgen.profiled uuidd.profiled \
-	e2image.profiled
+	e2image.profiled e4defrag.profiled
 
 profiled:
 @PROFILE_CMT@	$(E) "	MKDIR $@"
@@ -191,6 +192,15 @@ e2undo.profiled: $(PROFILED_E2UNDO_OBJS)
 	$(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
 		$(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
 
+e4defrag: $(E4DEFRAG_OBJS)
+	$(E) "  LD $@"
+	$(Q) $(CC) $(ALL_LDFLAGS) -o e4defrag $(E4DEFRAG_OBJS)
+
+e4defrag.profiled: $(PROFILED_E4DEFRAG_OBJS)
+	$(E) "  LD $@"
+	$(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e4defrag.profiled \
+		$(PROFILED_E4DEFRAG_OBJS)
+
 base_device: base_device.c
 	$(E) "	LD $@"
 	$(Q) $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
@@ -338,6 +348,10 @@ e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e
 	$(E) "	SUBST $@"
 	$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
 
+e4defrag.8: $(DEP_SUBSTITUTE) $(srcdir)/e4defrag.8.in
+	$(E) "  SUBST $@"
+	$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e4defrag.8.in e4defrag.8
+
 dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in 
 	$(E) "	SUBST $@"
 	$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
@@ -394,6 +408,10 @@ installdirs:
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
 		$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
 
+install-e4defrag: e4defrag e4defrag.8 installdirs
+	$(INSTALL_PROGRAM) e4defrag $(DESTDIR)$(bindir)/e4defrag
+	$(INSTALL_DATA) e4defrag.8 $(DESTDIR)$(man8dir)/e4defrag.8
+
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	$(Q) for i in $(SPROGS); do \
 		echo "	INSTALL $(root_sbindir)/$$i"; \
@@ -551,7 +569,7 @@ clean:
 		blkid.profiled tune2fs.profiled e2image.profiled \
 		e2undo.profiled mke2fs.profiled dumpe2fs.profiled \
 		logsave.profiled filefrag.profiled uuidgen.profiled \
-		uuidd.profiled e2image.profiled \
+		uuidd.profiled e2image.profiled e4defrag \
 		profiled/*.o \#* *.s *.o *.a *~ core gmon.out
 
 mostlyclean: clean
Index: e2fsprogs-1.41.9/configure
===================================================================
--- e2fsprogs-1.41.9.orig/configure
+++ e2fsprogs-1.41.9/configure
@@ -15790,7 +15790,7 @@ fi
 
 
 
-for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit
+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: e2fsprogs-1.41.9/configure.in
===================================================================
--- e2fsprogs-1.41.9.orig/configure.in
+++ e2fsprogs-1.41.9/configure.in
@@ -828,7 +828,7 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
 	[#include <sys/types.h>
 	 #include <sys/socket.h>])
 dnl
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit)
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate)
 dnl
 dnl Check to see if -lsocket is required (solaris) to make something
 dnl that uses socket() to compile; this is needed for the UUID library
Index: e2fsprogs-1.41.9/Makefile.in
===================================================================
--- e2fsprogs-1.41.9.orig/Makefile.in
+++ e2fsprogs-1.41.9/Makefile.in
@@ -57,6 +57,9 @@ clean-doc:
 distclean-doc:
 	-test -d doc && cd doc && $(MAKE) distclean
 
+install-e4defrag: subs all-libs-recursive
+	$(MAKE) -C misc install-e4defrag
+
 install: subs all-libs-recursive install-progs-recursive \
   install-shlibs-libs-recursive install-doc-libs
 	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi



From pnemade at fedoraproject.org  Mon Aug 24 05:03:46 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 24 Aug 2009 05:03:46 +0000 (UTC)
Subject: rpms/hyphen-as/devel hyph_as_IN.dic, NONE, 1.1 hyphen-as.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20090824050346.9EE6F11C0044@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-as/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31032/devel

Added Files:
	hyph_as_IN.dic hyphen-as.spec import.log 
Log Message:
* Thu Aug 20 2009 Parag <pnemade at redhat.com> - 0.20090820-1
- initial version




--- NEW FILE hyph_as_IN.dic ---
UTF-8
%  Hyphenation for Assamese
%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
2?2
2?2
% Break before or after any independent vowel.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Break after any dependent vowel, but not before.
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
% Break before or after any consonant.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Do not break after khanda ta.
1?2
% Do not break before a final consonant or conjunct.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2???.
2???.
2???.
2???.
% Do not break before chandrabindu, anusvara, visarga, avagraha,
% nukta and au length mark.
2?
2?
2?
2?
2?
2?
% Do not break either side of virama (may be within conjunct).
2?2


--- NEW FILE hyphen-as.spec ---
Name: hyphen-as
Summary: Assamese hyphenation rules
%define upstreamid 20090820
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_as_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Assamese hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Thu Aug 20 2009 Parag <pnemade at redhat.com> - 0.20090820-1
- initial version


--- NEW FILE import.log ---
hyphen-as-0_20090820-1_fc11:HEAD:hyphen-as-0.20090820-1.fc11.src.rpm:1251090411



From bskeggs at fedoraproject.org  Mon Aug 24 05:05:49 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Mon, 24 Aug 2009 05:05:49 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.476,
	1.477 xserver-1.6.1-nouveau.patch, 1.1, 1.2
Message-ID: <20090824050549.E333B11C0044@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31574

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-nouveau.patch 
Log Message:
* Mon Aug 24 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.99-40.20090820
- xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
  should work on them now, there's accel issues on some of them but we can
  fallback to shadowfb in the driver and keep KMS support.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- xorg-x11-server.spec	21 Aug 2009 18:33:32 -0000	1.476
+++ xorg-x11-server.spec	24 Aug 2009 05:05:49 -0000	1.477
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   39.%{gitdate}%{?dist}
+Release:   40.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Aug 24 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.99-40.20090820
+- xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
+  should work on them now, there's accel issues on some of them but we can
+  fallback to shadowfb in the driver and keep KMS support.
+
 * Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 1.6.99-39.20090820
 - xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
   the driver returned real modes (and has no EDID).

xserver-1.6.1-nouveau.patch:
 glx/glxdri.c                       |    7 +++++--
 glx/glxdri2.c                      |    7 +++++--
 hw/xfree86/common/xf86AutoConfig.c |   19 +++++++++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.1-nouveau.patch	23 Jun 2009 04:02:10 -0000	1.1
+++ xserver-1.6.1-nouveau.patch	24 Aug 2009 05:05:49 -0000	1.2
@@ -78,7 +78,7 @@ diff --git a/hw/xfree86/common/xf86AutoC
 index bc4c80b..d8fa80f 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -180,7 +180,32 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -180,7 +180,23 @@ videoPtrToDriverList(struct pci_device *dev,
  	    break;
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
@@ -96,16 +96,7 @@ index bc4c80b..d8fa80f 100644
 +		driverList[0] = "nv";
 +		break;
 +	    default:
-+		switch (dev->device_id & 0xfff0) {
-+		/* Non-functional with both nouveau and nv */
-+		case 0x0840:
-+		case 0x0860:
-+		    driverList[0] = "vesa";
-+		    break;
-+		default:
-+		    driverList[0] = "nouveau";
-+		    break;
-+		}
++		driverList[0] = "nouveau";
 +		break;
 +	    }
 +	    break;



From pnemade at fedoraproject.org  Mon Aug 24 05:05:51 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 24 Aug 2009 05:05:51 +0000 (UTC)
Subject: rpms/hyphen-as/F-11 hyph_as_IN.dic, NONE, 1.1 hyphen-as.spec, NONE,
	1.1
Message-ID: <20090824050551.8AA9911C0044@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/hyphen-as/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31554

Added Files:
	hyph_as_IN.dic hyphen-as.spec 
Log Message:
* Thu Aug 20 2009 Parag <pnemade at redhat.com> - 0.20090820-1
- initial version




--- NEW FILE hyph_as_IN.dic ---
UTF-8
%  Hyphenation for Assamese
%  Copyright (C) 2008-2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
%
%  This library is free software; you can redistribute it and/or
%  modify it under the terms of the GNU General Public
%  License as published by the Free Software Foundation;
%  version 3 or later version of the License.
%
%  This library is distributed in the hope that it will be useful,
%  but WITHOUT ANY WARRANTY; without even the implied warranty of
%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
%  Lesser General Public License for more details.
%
%  You should have received a copy of the GNU General Public
%  License along with this library; if not, write to the Free Software
%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
%
% GENERAL RULE
% Do not break either side of ZERO-WIDTH JOINER
% (U+200D) and ZERO-WIDTH NON-JOINER (U+200C)
2?2
2?2
% Break before or after any independent vowel.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Break after any dependent vowel, but not before.
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
2?1
% Break before or after any consonant.
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
1?1
% Do not break after khanda ta.
1?2
% Do not break before a final consonant or conjunct.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2??.
2???.
2???.
2???.
2???.
% Do not break before chandrabindu, anusvara, visarga, avagraha,
% nukta and au length mark.
2?
2?
2?
2?
2?
2?
% Do not break either side of virama (may be within conjunct).
2?2


--- NEW FILE hyphen-as.spec ---
Name: hyphen-as
Summary: Assamese hyphenation rules
%define upstreamid 20090820
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://git.savannah.gnu.org/cgit/smc.git/plain/hyphenation/hyph_as_IN.dic
Group: Applications/Text
URL: http://wiki.smc.org.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch

Requires: hyphen

%description
Assamese hyphenation rules.

%prep
%setup -T -q -c
cp -p %{SOURCE0} .

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_datadir}/hyphen/*

%changelog
* Thu Aug 20 2009 Parag <pnemade at redhat.com> - 0.20090820-1
- initial version



From jnovy at fedoraproject.org  Mon Aug 24 06:06:05 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 24 Aug 2009 06:06:05 +0000 (UTC)
Subject: rpms/gphoto2/devel .cvsignore, 1.22, 1.23 gphoto2.spec, 1.101,
	1.102 sources, 1.24, 1.25
Message-ID: <20090824060605.1ED7811C0044@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/gphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9999

Modified Files:
	.cvsignore gphoto2.spec sources 
Log Message:
* Mon Aug 24 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-1
- update to 2.4.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	8 Apr 2009 06:41:34 -0000	1.22
+++ .cvsignore	24 Aug 2009 06:06:03 -0000	1.23
@@ -1 +1 @@
-gphoto2-2.4.5.tar.bz2
+gphoto2-2.4.7.tar.bz2


Index: gphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gphoto2.spec	25 Jul 2009 01:07:34 -0000	1.101
+++ gphoto2.spec	24 Aug 2009 06:06:04 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
-Version: 2.4.5
-Release: 2%{?dist}
+Version: 2.4.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Mon Aug 24 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-1
+- update to 2.4.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	8 Apr 2009 06:41:35 -0000	1.24
+++ sources	24 Aug 2009 06:06:04 -0000	1.25
@@ -1 +1 @@
-cccbe437804c863b87807444ec58a8ac  gphoto2-2.4.5.tar.bz2
+a0bd7629040735f16e510b63edf386dd  gphoto2-2.4.7.tar.bz2



From mclasen at fedoraproject.org  Mon Aug 24 06:08:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 06:08:29 +0000 (UTC)
Subject: rpms/empathy/devel presence-icons.patch, NONE, 1.1 empathy.spec,
	1.68, 1.69
Message-ID: <20090824060829.AB34A11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10515

Modified Files:
	empathy.spec 
Added Files:
	presence-icons.patch 
Log Message:
Make presence icons show up in the menus


presence-icons.patch:
 empathy-presence-chooser.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE presence-icons.patch ---
--- empathy-2.27.5/libempathy-gtk/empathy-presence-chooser.c	2009-07-29 04:18:26.000000000 -0400
+++ hacked/libempathy-gtk/empathy-presence-chooser.c	2009-08-24 02:00:31.892689425 -0400
@@ -223,7 +223,7 @@
 
 	gtk_list_store_insert_with_values (store, NULL, -1,
 		COL_STATUS_TEXT, _("Edit Custom Messages..."),
-		COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
+		COL_STATE_ICON_NAME, NULL,
 		COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
 		COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
 		-1);
@@ -1049,6 +1049,7 @@
 	gtk_widget_show (image);
 
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 	gtk_widget_show (item);
 
 	g_object_set_data_full (G_OBJECT (item),


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- empathy.spec	4 Aug 2009 04:41:27 -0000	1.68
+++ empathy.spec	24 Aug 2009 06:08:29 -0000	1.69
@@ -11,7 +11,7 @@
 
 Name:		empathy
 Version:	2.27.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -28,6 +28,9 @@ Patch1:		%{name}-broken-pkgconfig.patch
 
 Patch2:		clutter.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592853
+Patch3:		presence-icons.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -131,6 +134,7 @@ bindings to the libempathy and libempath
 %setup -q
 %patch1 -p1 -b .pkgconfig
 %patch2 -p1 -b .clutter
+%patch3 -p1 -b .presence-icons
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -238,6 +242,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-3
+- Make presence icons show up in the menus
+
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-2
 - Enable map and location features
 



From mclasen at fedoraproject.org  Mon Aug 24 06:19:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 06:19:19 +0000 (UTC)
Subject: rpms/libtheora/devel .cvsignore, 1.16, 1.17 libtheora.spec, 1.39,
	1.40 sources, 1.16, 1.17
Message-ID: <20090824061919.E7A2F11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libtheora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12556

Modified Files:
	.cvsignore libtheora.spec sources 
Log Message:
1.1beta3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	14 Aug 2009 03:18:26 -0000	1.16
+++ .cvsignore	24 Aug 2009 06:19:18 -0000	1.17
@@ -1 +1 @@
-libtheora-1.1beta2.tar.xz
+libtheora-1.1beta3.tar.xz


Index: libtheora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- libtheora.spec	14 Aug 2009 03:18:26 -0000	1.39
+++ libtheora.spec	24 Aug 2009 06:19:18 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
-Version: 1.1beta2
+Version: 1.1beta3
 Release: 1%{?dist}
 Epoch: 1
 License: BSD
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1.1beta3
+- 1.1beta3
+
 * Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.1beta2
 - 1.1beta2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtheora/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	14 Aug 2009 03:18:26 -0000	1.16
+++ sources	24 Aug 2009 06:19:18 -0000	1.17
@@ -1 +1 @@
-0503c6be02665e8193cf3f7b5a71828b  libtheora-1.1beta2.tar.xz
+b9ace22fcb96ec4170a32c29daf41e82  libtheora-1.1beta3.tar.xz



From fabbione at fedoraproject.org  Mon Aug 24 06:51:36 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 06:51:36 +0000 (UTC)
Subject: rpms/cluster/devel cp_workaround.diff, NONE, 1.1 cluster.spec, 1.58,
	1.59
Message-ID: <20090824065137.2D0B011C0044@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19052

Modified Files:
	cluster.spec 
Added Files:
	cp_workaround.diff 
Log Message:
Add temporary workaround for cp behaviour change


cp_workaround.diff:
 install.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cp_workaround.diff ---
diff -Naurd cluster-3.0.2.orig/make/install.mk cluster-3.0.2/make/install.mk
--- cluster-3.0.2.orig/make/install.mk	2009-08-21 16:28:25.000000000 +0200
+++ cluster-3.0.2/make/install.mk	2009-08-24 08:39:09.000000000 +0200
@@ -4,7 +4,7 @@
 	install -m644 ${LIBDIRT} ${libdir}
 endif
 ifdef LIBSYMT
-	cp -a ${LIBSYMT} ${libdir}
+	cp -d ${LIBSYMT} ${libdir}
 endif
 ifdef INCDIRT
 	install -d ${incdir}
@@ -23,7 +23,7 @@
 endif
 ifdef SBINSYMT
 	install -d ${sbindir}
-	cp -a ${SBINSYMT} ${sbindir}
+	cp -d ${SBINSYMT} ${sbindir}
 endif
 ifdef LCRSOT
 	install -d ${libexecdir}/lcrso


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- cluster.spec	24 Aug 2009 04:31:19 -0000	1.58
+++ cluster.spec	24 Aug 2009 06:51:35 -0000	1.59
@@ -19,11 +19,12 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.2
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Patch0: cp_workaround.diff
 
 ## Setup/build bits
 
@@ -39,6 +40,7 @@ BuildRequires: openldap-devel perl(ExtUt
 
 %prep
 %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
+%patch0 -p1
 
 %build
 ./configure \
@@ -301,6 +303,9 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* 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
 



From mmaslano at fedoraproject.org  Mon Aug 24 07:02:45 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 24 Aug 2009 07:02:45 +0000 (UTC)
Subject: rpms/perl-DBIx-Simple/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090824070245.80B9211C0044@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBIx-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21788

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Aug 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.32-1
- Specfile autogenerated by cpanspec 1.78.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Aug 2009 18:26:00 -0000	1.1
+++ .cvsignore	24 Aug 2009 07:02:45 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Simple-1.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Aug 2009 18:26:00 -0000	1.1
+++ sources	24 Aug 2009 07:02:45 -0000	1.2
@@ -0,0 +1 @@
+c1d7bf0ab453e7e00715d9d4e71102d8  DBIx-Simple-1.32.tar.gz



From mmaslano at fedoraproject.org  Mon Aug 24 07:04:23 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 24 Aug 2009 07:04:23 +0000 (UTC)
Subject: rpms/perl-DBIx-Simple/devel perl-DBIx-Simple.spec,NONE,1.1
Message-ID: <20090824070423.66DBF11C0044@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-DBIx-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22110

Added Files:
	perl-DBIx-Simple.spec 
Log Message:
Add spec file.



--- NEW FILE perl-DBIx-Simple.spec ---
Name:           perl-DBIx-Simple
Version:        1.32
Release:        1%{?dist}
Summary:        Easy-to-use OO interface to DBI
License:        Public Domain
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Simple/
Source0:        http://www.cpan.org/authors/id/J/JU/JUERD/DBIx-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(DBI) >= 1.21
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
DBIx::Simple provides a simplified interface to DBI, Perl's powerful
database module.

%prep
%setup -q -n DBIx-Simple-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Aug 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.32-1
- Specfile autogenerated by cpanspec 1.78.



From caolanm at fedoraproject.org  Mon Aug 24 07:43:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 24 Aug 2009 07:43:47 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1989,1.1990
Message-ID: <20090824074347.B318B11C0044@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28970

Modified Files:
	openoffice.org.spec 
Log Message:
hyphen-as require


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -p -r1.1989 -r1.1990
--- openoffice.org.spec	21 Aug 2009 15:04:05 -0000	1.1989
+++ openoffice.org.spec	24 Aug 2009 07:43:45 -0000	1.1990
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%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}
@@ -35,7 +35,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        3.1.1
-Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}.1
+Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
 Group:		Applications/Productivity
@@ -1284,7 +1284,7 @@ Provides additional zulu translations an
 Summary: Assamese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-as
+Requires: hunspell-as, hyphen-as
 Requires: lohit-fonts-bengali
 Obsoletes: openoffice.org2-langpack-as_IN < 1:3.0.0
 
@@ -4208,6 +4208,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 24 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
+- hyphen-as require
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.1.1
 - rebuilt with new openssl
 



From drago01 at fedoraproject.org  Mon Aug 24 08:02:01 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 08:02:01 +0000 (UTC)
Subject: rpms/hotssh/F-11 hotssh.spec,1.4,1.5
Message-ID: <20090824080201.91EF411C0044@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hotssh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32565

Modified Files:
	hotssh.spec 
Log Message:
fix url


Index: hotssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotssh/F-11/hotssh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hotssh.spec	25 Feb 2009 03:57:46 -0000	1.4
+++ hotssh.spec	24 Aug 2009 08:02:00 -0000	1.5
@@ -4,13 +4,13 @@
 Summary: Secure Shell Client
 Name: hotssh
 Version: 0.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://ftp.gnome.org/pub/GNOME/sources/hotssh/0.2/hotssh-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
-URL: http://www.gnome.org/parojects/hotssh
+URL: http://www.gnome.org/projects/hotssh
 BuildRequires: desktop-file-utils
 BuildRequires: python-devel
 BuildRequires: intltool
@@ -64,6 +64,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.2.6-3
+- Fix URL
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From drago01 at fedoraproject.org  Mon Aug 24 08:02:10 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 08:02:10 +0000 (UTC)
Subject: rpms/hotssh/F-10 hotssh.spec,1.2,1.3
Message-ID: <20090824080210.152F311C0044@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hotssh/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32618

Modified Files:
	hotssh.spec 
Log Message:
fix url


Index: hotssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotssh/F-10/hotssh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hotssh.spec	19 Dec 2008 15:54:11 -0000	1.2
+++ hotssh.spec	24 Aug 2009 08:02:09 -0000	1.3
@@ -4,13 +4,13 @@
 Summary: Secure Shell Client
 Name: hotssh
 Version: 0.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://ftp.gnome.org/pub/GNOME/sources/hotssh/0.2/hotssh-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
-URL: http://www.gnome.org/parojects/hotssh
+URL: http://www.gnome.org/projects/hotssh
 BuildRequires: desktop-file-utils
 BuildRequires: python-devel
 BuildRequires: intltool
@@ -64,6 +64,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.2.6-2
+- Fix URL
+
 * Thu Dec 18 2008 Colin Walters <walters at redhat.com> - 0.2.6-1
 - New upstream
 



From drago01 at fedoraproject.org  Mon Aug 24 08:02:19 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 08:02:19 +0000 (UTC)
Subject: rpms/hotssh/devel hotssh.spec,1.5,1.6
Message-ID: <20090824080219.7871311C0044@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/hotssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32659

Modified Files:
	hotssh.spec 
Log Message:
fix url


Index: hotssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotssh/devel/hotssh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hotssh.spec	25 Jul 2009 02:12:00 -0000	1.5
+++ hotssh.spec	24 Aug 2009 08:02:19 -0000	1.6
@@ -4,13 +4,13 @@
 Summary: Secure Shell Client
 Name: hotssh
 Version: 0.2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://ftp.gnome.org/pub/GNOME/sources/hotssh/0.2/hotssh-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
-URL: http://www.gnome.org/parojects/hotssh
+URL: http://www.gnome.org/projects/hotssh
 BuildRequires: desktop-file-utils
 BuildRequires: python-devel
 BuildRequires: intltool
@@ -64,6 +64,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.2.6-4
+- Fix URL
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Mon Aug 24 08:38:19 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 24 Aug 2009 08:38:19 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-kojiutimensatskip.patch, 1.1,
	1.2 coreutils.spec, 1.268, 1.269
Message-ID: <20090824083819.B2BEF11C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6020

Modified Files:
	coreutils-7.5-kojiutimensatskip.patch coreutils.spec 
Log Message:
Better fix than workaround the koji insufficient utimensat support issue to prevent failures in other packages

coreutils-7.5-kojiutimensatskip.patch:
 copy.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Index: coreutils-7.5-kojiutimensatskip.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.5-kojiutimensatskip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-7.5-kojiutimensatskip.patch	21 Aug 2009 11:49:01 -0000	1.1
+++ coreutils-7.5-kojiutimensatskip.patch	24 Aug 2009 08:38:17 -0000	1.2
@@ -1,26 +1,18 @@
-diff -urNp coreutils-7.5-orig/tests/cp/preserve-slink-time coreutils-7.5/tests/cp/preserve-slink-time
---- coreutils-7.5-orig/tests/cp/preserve-slink-time	2009-08-15 17:25:32.000000000 +0200
-+++ coreutils-7.5/tests/cp/preserve-slink-time	2009-08-21 12:45:41.000000000 +0200
-@@ -28,6 +28,10 @@ grep '^#define HAVE_UTIMENSAT' "$CONFIG_
- 
- ln -s no-such dangle || framework_failure
- 
-+cp -Pp dangle d3 2>error
-+grep 'Function not implemented' error > /dev/null &&
-+  skip_test_ 'utimensat function not implemented'
-+
- # If the current file system lacks sub-second resolution, sleep for 2s to
- # ensure that the times on the copy are different from those of the original.
- case $(stat --format=%y dangle) in
-diff -urNp coreutils-7.5-orig/tests/mv/part-symlink coreutils-7.5/tests/mv/part-symlink
---- coreutils-7.5-orig/tests/mv/part-symlink	2009-08-15 17:25:32.000000000 +0200
-+++ coreutils-7.5/tests/mv/part-symlink	2009-08-21 12:52:13.000000000 +0200
-@@ -201,6 +201,8 @@ cat <<\EOF > $expected
- 
- EOF
- 
-+grep 'Function not implemented' $actual > /dev/null &&
-+  skip_test_ 'utimensat function not implemented'
- # Redirect to stderr, since stdout is already taken.
- compare $expected $actual 1>&2 || fail=1
- 
+diff -urNp coreutils-7.5-orig/src/copy.c coreutils-7.5/src/copy.c
+--- coreutils-7.5-orig/src/copy.c
++++ coreutils-7.5/src/copy.c
+@@ -124,7 +124,13 @@ static inline int
+ utimens_symlink (char const *file, struct timespec const *timespec)
+ {
+ #if HAVE_UTIMENSAT
+-  return utimensat (AT_FDCWD, file, timespec, AT_SYMLINK_NOFOLLOW);
++  int err = utimensat (AT_FDCWD, file, timespec, AT_SYMLINK_NOFOLLOW);
++  /* When configuring on a system with new headers and libraries, and
++     running on one with a kernel that is old enough to lack the syscall,
++     utimensat fails with ENOTSUP.  Ignore that.  */
++  if (err && errno == ENOSYS)
++    err = 0;
++  return err;
+ #else
+   /* Don't set errno=ENOTSUP here as we don't want
+      to output an error message for this case.  */


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- coreutils.spec	21 Aug 2009 11:49:02 -0000	1.268
+++ coreutils.spec	24 Aug 2009 08:38:17 -0000	1.269
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,12 +18,12 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
+Patch1: coreutils-7.5-kojiutimensatskip.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
 Patch101: coreutils-6.10-manpages.patch
 Patch102: coreutils-7.4-sttytcsadrain.patch
-Patch103: coreutils-7.5-kojiutimensatskip.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -108,12 +108,12 @@ Libraries for coreutils package.
 %setup -q
 
 # From upstream
+%patch1 -p1 -b .kojiutimensat
 
 # Our patches
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
 %patch102 -p1 -b .tcsadrain
-%patch103 -p1 -b .kojiutimensat
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -328,6 +328,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Mon Aug 24 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-2
+- Better fix than workaround the koji insufficient utimensat
+  support issue to prevent failures in other packages
+
 * Fri Aug 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-1
 - New upstream release 7.5, remove already applied patches,
   defuzz few others, xz in default set(by dependencies),



From petersen at fedoraproject.org  Mon Aug 24 08:40:58 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 24 Aug 2009 08:40:58 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.91,1.92
Message-ID: <20090824084058.57DB911C0044@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6377

Modified Files:
	comps-f12.xml.in 
Log Message:
update un-core-fonts-* to un-core-*-fonts


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- comps-f12.xml.in	22 Aug 2009 11:04:34 -0000	1.91
+++ comps-f12.xml.in	24 Aug 2009 08:40:57 -0000	1.92
@@ -1811,7 +1811,7 @@
       <packagereq type="default">smc-meera-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
-      <packagereq type="default">un-core-fonts-dotum</packagereq>
+      <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
       <packagereq type="optional">allgeyer-musisync-fonts</packagereq>
@@ -3754,12 +3754,12 @@
       <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="default">un-core-fonts-batang</packagereq>
-      <packagereq type="default">un-core-fonts-dinaru</packagereq>
-      <packagereq type="default">un-core-fonts-dotum</packagereq>
-      <packagereq type="default">un-core-fonts-graphic</packagereq>
-      <packagereq type="default">un-core-fonts-gungseo</packagereq>
-      <packagereq type="default">un-core-fonts-pilgi</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>
+      <packagereq type="default">un-core-graphic-fonts</packagereq>
+      <packagereq type="default">un-core-gungseo-fonts</packagereq>
+      <packagereq type="default">un-core-pilgi-fonts</packagereq>
       <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-batang-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-dotum-fonts</packagereq>



From xhorak at fedoraproject.org  Mon Aug 24 08:46:46 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 24 Aug 2009 08:46:46 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.174,1.175
Message-ID: <20090824084646.CDA7A11C0044@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7007

Modified Files:
	xulrunner.spec 
Log Message:
Fix build


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- xulrunner.spec	21 Aug 2009 13:40:34 -0000	1.174
+++ xulrunner.spec	24 Aug 2009 08:46:46 -0000	1.175
@@ -63,6 +63,7 @@ BuildRequires:  sqlite-devel >= %{sqlite
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libnotify-devel
+BuildRequires:  autoconf213
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}



From mschwendt at fedoraproject.org  Mon Aug 24 09:21:25 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 24 Aug 2009 09:21:25 +0000 (UTC)
Subject: rpms/audacious/devel audacious-2.1-pluginprio.patch, NONE,
	1.1 audacious.spec, 1.50, 1.51
Message-ID: <20090824092125.CE1E911C0044@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11560

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.1-pluginprio.patch 
Log Message:
* Mon Aug 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-3
- Default to PulseAudio output plugin: Fix pluginenum.c indentation
  to make output plugin default/priority init work. Actually, when I
  noticed this bug, I went a step further and copied a rewrite from
  upstream devel scm.


audacious-2.1-pluginprio.patch:
 pluginenum.c |   70 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 29 deletions(-)

--- NEW FILE audacious-2.1-pluginprio.patch ---
diff -Nur audacious-2.1-orig/src/audacious/pluginenum.c audacious-2.1/src/audacious/pluginenum.c
--- audacious-2.1-orig/src/audacious/pluginenum.c	2009-07-07 00:39:12.000000000 +0200
+++ audacious-2.1/src/audacious/pluginenum.c	2009-08-24 10:53:57.000000000 +0200
@@ -913,56 +913,68 @@
     g_free(cfg.enabled_dplugins);
     cfg.enabled_dplugins = NULL;
 
-    if (!cfg.outputplugin) {
-        for (prio = 10; prio >= 0; prio--) {
-            for (node = op_data.output_list; node; node = g_list_next(node)) {
+    if (!cfg.outputplugin)
+    {
+        for (prio = 10; prio >= 0; prio--)
+        {
+            for (node = op_data.output_list; node; node = g_list_next(node))
+            {
                 op = OUTPUT_PLUGIN(node->data);
 
                 if (op->probe_priority != prio)
                     continue;
 
-		if (op->init)
-		{
-		    OutputPluginInitStatus ret = op->init();
-		    if (ret == OUTPUT_PLUGIN_INIT_NO_DEVICES)
-		    {
-		        g_message("Plugin %s reports no devices. Attempting to avert disaster, trying others.\n",
-                                  g_path_get_basename(op->filename));
-                    }
-                    else if (ret == OUTPUT_PLUGIN_INIT_FAIL)
-                    {
-		        g_message("Plugin %s was unable to initialise. Attemping to avert disaster, trying others.\n",
-		                  g_path_get_basename(op->filename));
-                    }
-                    else if (ret == OUTPUT_PLUGIN_INIT_FOUND_DEVICES)
-                    {
+                if (op->init)
+                {
+                    OutputPluginInitStatus ret = op->init();
+                    gchar *base_filename = g_path_get_basename(op->filename);
+                    switch (ret) {
+                    case OUTPUT_PLUGIN_INIT_NO_DEVICES:
+                        g_message("Plugin %s reports no devices. Attempting to avert disaster, trying others.",
+                            base_filename);
+                        break;
+                    case OUTPUT_PLUGIN_INIT_FAIL:
+                        g_message("Plugin %s was unable to initialise. Attemping to avert disaster, trying others.",
+                            base_filename);
+                        break;
+                    case OUTPUT_PLUGIN_INIT_FOUND_DEVICES:
+                        g_message("Plugin %s found devices.", base_filename);
                         if (!op_data.current_output_plugin)
                             op_data.current_output_plugin = op;
-                    }
-                    else if (!op_data.current_output_plugin)
-                    {
-		        g_message("Plugin %s did not report status, and no plugin has worked yet. Do you still need to convert it? Selecting for now...\n",
-		                  g_path_get_basename(op->filename));
-
+                        break;
+                    default:
+                        g_message("Plugin %s did not report status, and no plugin has worked yet. "
+                            "Do you still need to convert it? Selecting for now...",
+                            base_filename);
                         if (!op_data.current_output_plugin)
                             op_data.current_output_plugin = op;
+                        break;
                     }
-		}
+                    g_free(base_filename);
+                }
             }
         }
     }
     else
     {
-        for (node = op_data.output_list; node; node = g_list_next(node)) {
+        for (node = op_data.output_list; node; node = g_list_next(node))
+        {
+            gchar *plugin_base_filename;
+            gchar *op_base_filename;
             op = OUTPUT_PLUGIN(node->data);
 
-            if (op->init) {
-                plugin_set_current((Plugin *)op);
+            if (op->init)
+            {
+                plugin_set_current((Plugin *) op);
                 op->init();
             }
 
-            if (!g_ascii_strcasecmp(g_path_get_basename(cfg.outputplugin), g_path_get_basename(op->filename)))
+            plugin_base_filename = g_path_get_basename(cfg.outputplugin);
+            op_base_filename = g_path_get_basename(op->filename);
+            if (!g_ascii_strcasecmp(plugin_base_filename, op_base_filename))
                 op_data.current_output_plugin = op;
+            g_free(plugin_base_filename);
+            g_free(op_base_filename);
         }
     }
 


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- audacious.spec	24 Jul 2009 17:31:27 -0000	1.50
+++ audacious.spec	24 Aug 2009 09:21:24 -0000	1.51
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -14,6 +14,9 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 
+# will be obsolete in > 2.1
+Patch0: audacious-2.1-pluginprio.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -67,7 +70,7 @@ Files needed when building software for 
 
 %prep
 %setup -q -n %{name}-%{version}
-
+%patch0 -p1 -b .pluginprio
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
@@ -149,6 +152,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon Aug 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-3
+- Default to PulseAudio output plugin: Fix pluginenum.c indentation
+  to make output plugin default/priority init work. Actually, when I
+  noticed this bug, I went a step further and copied a rewrite from
+  upstream devel scm.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From schwab at fedoraproject.org  Mon Aug 24 09:22:26 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 24 Aug 2009 09:22:26 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.281, 1.282 glibc-fedora.patch, 1.315,
	1.316 glibc.spec, 1.408, 1.409 import.log, 1.24, 1.25 sources,
	1.306, 1.307
Message-ID: <20090824092226.921FC11C0044@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11889/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- .cvsignore	17 Aug 2009 13:52:39 -0000	1.281
+++ .cvsignore	24 Aug 2009 09:22:25 -0000	1.282
@@ -1,2 +1,2 @@
-glibc-2.10-277-g677760a-fedora.tar.bz2
-glibc-2.10-277-g677760a.tar.bz2
+glibc-2.10-288-ga0e25a8-fedora.tar.bz2
+glibc-2.10-288-ga0e25a8.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- glibc-fedora.patch	17 Aug 2009 13:52:40 -0000	1.315
+++ glibc-fedora.patch	24 Aug 2009 09:22:26 -0000	1.316
@@ -1,6 +1,6 @@
---- glibc-2.10-277-g677760a/ChangeLog
-+++ glibc-2.10.90-13/ChangeLog
-@@ -390,6 +390,11 @@
+--- glibc-2.10-288-ga0e25a8/ChangeLog
++++ glibc-2.10.90-15/ChangeLog
+@@ -426,6 +426,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -655,6 +660,16 @@
+@@ -691,6 +696,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -21,15 +21,10 @@
 +	* timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
 +	string when the timezone ends in DST.
 +
-+	* sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
-+	before call.
-+	* sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):
-+	Likewise.
-+
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9053,6 +9068,13 @@
+@@ -9089,6 +9099,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -43,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9348,6 +9370,10 @@
+@@ -9384,6 +9401,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -54,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10605,6 +10631,15 @@
+@@ -10641,6 +10662,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -70,8 +65,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-277-g677760a/ChangeLog.15
-+++ glibc-2.10.90-13/ChangeLog.15
+--- glibc-2.10-288-ga0e25a8/ChangeLog.15
++++ glibc-2.10.90-15/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -137,8 +132,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-277-g677760a/ChangeLog.16
-+++ glibc-2.10.90-13/ChangeLog.16
+--- glibc-2.10-288-ga0e25a8/ChangeLog.16
++++ glibc-2.10.90-15/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -310,8 +305,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-277-g677760a/Makeconfig
-+++ glibc-2.10.90-13/Makeconfig
+--- glibc-2.10-288-ga0e25a8/Makeconfig
++++ glibc-2.10.90-15/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -328,8 +323,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-277-g677760a/csu/Makefile
-+++ glibc-2.10.90-13/csu/Makefile
+--- glibc-2.10-288-ga0e25a8/csu/Makefile
++++ glibc-2.10.90-15/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -340,8 +335,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-277-g677760a/csu/elf-init.c
-+++ glibc-2.10.90-13/csu/elf-init.c
+--- glibc-2.10-288-ga0e25a8/csu/elf-init.c
++++ glibc-2.10.90-15/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;
@@ -366,8 +361,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-277-g677760a/debug/tst-chk1.c
-+++ glibc-2.10.90-13/debug/tst-chk1.c
+--- glibc-2.10-288-ga0e25a8/debug/tst-chk1.c
++++ glibc-2.10.90-15/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -396,8 +391,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-277-g677760a/elf/ldconfig.c
-+++ glibc-2.10.90-13/elf/ldconfig.c
+--- glibc-2.10-288-ga0e25a8/elf/ldconfig.c
++++ glibc-2.10.90-15/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -479,8 +474,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-277-g677760a/elf/tst-stackguard1.c
-+++ glibc-2.10.90-13/elf/tst-stackguard1.c
+--- glibc-2.10-288-ga0e25a8/elf/tst-stackguard1.c
++++ glibc-2.10.90-15/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -505,16 +500,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-277-g677760a/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-13/include/bits/stdlib-ldbl.h
+--- glibc-2.10-288-ga0e25a8/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-15/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-277-g677760a/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-13/include/bits/wchar-ldbl.h
+--- glibc-2.10-288-ga0e25a8/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-15/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-277-g677760a/include/features.h
-+++ glibc-2.10.90-13/include/features.h
+--- glibc-2.10-288-ga0e25a8/include/features.h
++++ glibc-2.10.90-15/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -531,8 +526,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-277-g677760a/intl/locale.alias
-+++ glibc-2.10.90-13/intl/locale.alias
+--- glibc-2.10-288-ga0e25a8/intl/locale.alias
++++ glibc-2.10.90-15/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -542,8 +537,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-277-g677760a/libio/stdio.h
-+++ glibc-2.10.90-13/libio/stdio.h
+--- glibc-2.10-288-ga0e25a8/libio/stdio.h
++++ glibc-2.10.90-15/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.  */
@@ -557,8 +552,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-277-g677760a/locale/iso-4217.def
-+++ glibc-2.10.90-13/locale/iso-4217.def
+--- glibc-2.10-288-ga0e25a8/locale/iso-4217.def
++++ glibc-2.10.90-15/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -650,8 +645,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-277-g677760a/locale/programs/locarchive.c
-+++ glibc-2.10.90-13/locale/programs/locarchive.c
+--- glibc-2.10-288-ga0e25a8/locale/programs/locarchive.c
++++ glibc-2.10.90-15/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,
@@ -683,8 +678,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-277-g677760a/localedata/Makefile
-+++ glibc-2.10.90-13/localedata/Makefile
+--- glibc-2.10-288-ga0e25a8/localedata/Makefile
++++ glibc-2.10.90-15/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -693,8 +688,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-277-g677760a/localedata/SUPPORTED
-+++ glibc-2.10.90-13/localedata/SUPPORTED
+--- glibc-2.10-288-ga0e25a8/localedata/SUPPORTED
++++ glibc-2.10.90-15/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -736,8 +731,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-277-g677760a/localedata/locales/cy_GB
-+++ glibc-2.10.90-13/localedata/locales/cy_GB
+--- glibc-2.10-288-ga0e25a8/localedata/locales/cy_GB
++++ glibc-2.10.90-15/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>"
@@ -752,8 +747,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-277-g677760a/localedata/locales/en_GB
-+++ glibc-2.10.90-13/localedata/locales/en_GB
+--- glibc-2.10-288-ga0e25a8/localedata/locales/en_GB
++++ glibc-2.10.90-15/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>"
@@ -765,8 +760,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-277-g677760a/localedata/locales/no_NO
-+++ glibc-2.10.90-13/localedata/locales/no_NO
+--- glibc-2.10-288-ga0e25a8/localedata/locales/no_NO
++++ glibc-2.10.90-15/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -837,8 +832,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-277-g677760a/localedata/locales/zh_TW
-+++ glibc-2.10.90-13/localedata/locales/zh_TW
+--- glibc-2.10-288-ga0e25a8/localedata/locales/zh_TW
++++ glibc-2.10.90-15/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -866,8 +861,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-277-g677760a/malloc/mcheck.c
-+++ glibc-2.10.90-13/malloc/mcheck.c
+--- glibc-2.10-288-ga0e25a8/malloc/mcheck.c
++++ glibc-2.10.90-15/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -943,8 +938,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-277-g677760a/manual/libc.texinfo
-+++ glibc-2.10.90-13/manual/libc.texinfo
+--- glibc-2.10-288-ga0e25a8/manual/libc.texinfo
++++ glibc-2.10.90-15/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -954,8 +949,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-277-g677760a/misc/sys/cdefs.h
-+++ glibc-2.10.90-13/misc/sys/cdefs.h
+--- glibc-2.10-288-ga0e25a8/misc/sys/cdefs.h
++++ glibc-2.10.90-15/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)
@@ -999,17 +994,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-277-g677760a/nis/nss
-+++ glibc-2.10.90-13/nis/nss
+--- glibc-2.10-288-ga0e25a8/nis/nss
++++ glibc-2.10.90-15/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-277-g677760a/nptl/ChangeLog
-+++ glibc-2.10.90-13/nptl/ChangeLog
-@@ -3683,6 +3683,15 @@
+--- glibc-2.10-288-ga0e25a8/nptl/ChangeLog
++++ glibc-2.10.90-15/nptl/ChangeLog
+@@ -3687,6 +3687,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1025,7 +1020,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4419,6 +4428,11 @@
+@@ -4423,6 +4432,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1037,7 +1032,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6493,6 +6507,11 @@
+@@ -6497,6 +6511,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1049,8 +1044,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-277-g677760a/nptl/Makefile
-+++ glibc-2.10.90-13/nptl/Makefile
+--- glibc-2.10-288-ga0e25a8/nptl/Makefile
++++ glibc-2.10.90-15/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1083,9 +1078,9 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-277-g677760a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-13/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-@@ -187,4 +187,7 @@
+--- glibc-2.10-288-ga0e25a8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-15/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
  
@@ -1093,8 +1088,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-277-g677760a/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-288-ga0e25a8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1102,8 +1097,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-277-g677760a/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-13/nptl/tst-stackguard1.c
+--- glibc-2.10-288-ga0e25a8/nptl/tst-stackguard1.c
++++ glibc-2.10.90-15/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1128,8 +1123,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-277-g677760a/nscd/nscd.conf
-+++ glibc-2.10.90-13/nscd/nscd.conf
+--- glibc-2.10-288-ga0e25a8/nscd/nscd.conf
++++ glibc-2.10.90-15/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1139,8 +1134,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-277-g677760a/nscd/nscd.init
-+++ glibc-2.10.90-13/nscd/nscd.init
+--- glibc-2.10-288-ga0e25a8/nscd/nscd.init
++++ glibc-2.10.90-15/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1197,9 +1192,9 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-277-g677760a/posix/Makefile
-+++ glibc-2.10.90-13/posix/Makefile
-@@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
+--- glibc-2.10-288-ga0e25a8/posix/Makefile
++++ glibc-2.10.90-15/posix/Makefile
+@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
  
@@ -1219,8 +1214,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-277-g677760a/posix/getconf.speclist.h
-+++ glibc-2.10.90-13/posix/getconf.speclist.h
+--- glibc-2.10-288-ga0e25a8/posix/getconf.speclist.h
++++ glibc-2.10.90-15/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1261,8 +1256,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-277-g677760a/streams/Makefile
-+++ glibc-2.10.90-13/streams/Makefile
+--- glibc-2.10-288-ga0e25a8/streams/Makefile
++++ glibc-2.10.90-15/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1272,8 +1267,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-277-g677760a/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-13/sysdeps/generic/dl-cache.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-15/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1289,8 +1284,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-277-g677760a/sysdeps/i386/Makefile
-+++ glibc-2.10.90-13/sysdeps/i386/Makefile
+--- glibc-2.10-288-ga0e25a8/sysdeps/i386/Makefile
++++ glibc-2.10.90-15/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1315,8 +1310,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-277-g677760a/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-13/sysdeps/ia64/Makefile
+--- glibc-2.10-288-ga0e25a8/sysdeps/ia64/Makefile
++++ glibc-2.10.90-15/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1328,8 +1323,8 @@
  endif
  endif
  
---- glibc-2.10-277-g677760a/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-13/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-288-ga0e25a8/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-15/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1681,8 +1676,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-277-g677760a/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-13/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-288-ga0e25a8/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-15/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1768,27 +1763,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-277-g677760a/sysdeps/powerpc/powerpc32/____longjmp_chk.S
-+++ glibc-2.10.90-13/sysdeps/powerpc/powerpc32/____longjmp_chk.S
-@@ -49,8 +49,16 @@
- #define CHECK_SP(reg) \
- 	cmplw	reg, r1;				\
- 	bge+	.Lok;					\
-+	cfi_remember_state;				\
-+	mflr	r0;					\
-+	stwu	r1,-16(r1);				\
-+	cfi_adjust_cfa_offset (16);			\
-+	stw	r0,20(r1);				\
-+	cfi_offset (lr, 4);				\
- 	LOAD_ARG;					\
- 	bl	HIDDEN_JUMPTARGET (__fortify_fail);	\
-+	nop;						\
-+	cfi_restore_state;				\
- .Lok:
- 
- #include <__longjmp-common.S>
---- glibc-2.10-277-g677760a/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-13/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-288-ga0e25a8/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-15/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1797,27 +1773,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-277-g677760a/sysdeps/powerpc/powerpc64/____longjmp_chk.S
-+++ glibc-2.10.90-13/sysdeps/powerpc/powerpc64/____longjmp_chk.S
-@@ -32,8 +32,16 @@
- #define CHECK_SP(reg) \
- 	cmpld	reg, r1;				\
- 	bge+	.Lok;					\
-+	cfi_remember_state;				\
-+	mflr	r0;					\
-+	std	r0,16(r1);				\
-+	stdu	r1,-112(r1);				\
-+	cfi_adjust_cfa_offset (112);			\
-+	cfi_offset (lr, 16);				\
- 	ld	r3,.LC1 at toc(2);				\
- 	bl	HIDDEN_JUMPTARGET (__fortify_fail);	\
-+	nop;						\
-+	cfi_restore_state;				\
- .Lok:
- 
- #include <__longjmp-common.S>
---- glibc-2.10-277-g677760a/sysdeps/unix/nice.c
-+++ glibc-2.10.90-13/sysdeps/unix/nice.c
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/nice.c
++++ glibc-2.10.90-15/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1832,8 +1789,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1849,8 +1806,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1898,8 +1855,8 @@
      }
    else
  #endif
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1942,8 +1899,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1962,8 +1919,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-15/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.
@@ -2024,8 +1981,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2058,29 +2015,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-15/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-277-g677760a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-15/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-277-g677760a/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-15/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-277-g677760a/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2106,8 +2063,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2117,8 +2074,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2164,8 +2121,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-277-g677760a/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-13/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2184,8 +2141,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-277-g677760a/timezone/zic.c
-+++ glibc-2.10.90-13/timezone/zic.c
+--- glibc-2.10-288-ga0e25a8/timezone/zic.c
++++ glibc-2.10.90-15/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- glibc.spec	17 Aug 2009 13:52:40 -0000	1.408
+++ glibc.spec	24 Aug 2009 09:22:26 -0000	1.409
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-277-g677760a
+%define glibcsrcdir glibc-2.10-288-ga0e25a8
 %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: 14
+Release: 15
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -65,12 +65,14 @@ BuildRequires: gcc >= 3.2
 %else
 %define nptl_target_cpu %{_target_cpu}
 %endif
-# Need AS_NEEDED directive
-# Need --hash-style=* support
 %ifarch %{multiarcharches}
 # Need STT_IFUNC support
 BuildRequires: binutils >= 2.19.51.0.10
+# Earlier releases have broken support for IRELATIVE relocations
+Conflicts: prelink < 0.4.2
 %else
+# Need AS_NEEDED directive
+# Need --hash-style=* support
 BuildRequires: binutils >= 2.17.50.0.2-5
 %endif
 BuildRequires: gcc >= 3.2.1-5
@@ -1026,6 +1028,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Aug 24 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-15
+- Update from master.
+  - fix fortify failure with longjmp from alternate stack (#512103).
+- Add conflict with prelink (#509655).
+
 * Mon Aug 17 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-14
 - Update from master.
   - fix pthread_cond_signal (#516469)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- import.log	17 Aug 2009 13:52:40 -0000	1.24
+++ import.log	24 Aug 2009 09:22:26 -0000	1.25
@@ -22,3 +22,4 @@ glibc-2_10_90-11:HEAD:glibc-2.10.90-11.s
 glibc-2_10_90-12:HEAD:glibc-2.10.90-12.src.rpm:1249300698
 glibc-2_10_90-13:HEAD:glibc-2.10.90-13.src.rpm:1249897909
 glibc-2_10_90-14:HEAD:glibc-2.10.90-14.src.rpm:1250516718
+glibc-2_10_90-15:HEAD:glibc-2.10.90-15.src.rpm:1251105646


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- sources	17 Aug 2009 13:52:40 -0000	1.306
+++ sources	24 Aug 2009 09:22:26 -0000	1.307
@@ -1,2 +1,2 @@
-41e4a4c404fc8eece82f2f06d3d88412  glibc-2.10-277-g677760a-fedora.tar.bz2
-3c2a0514ce198c7b9c47e538187bff0c  glibc-2.10-277-g677760a.tar.bz2
+0d6e5b8a41e599c8f34fa469b9bc6230  glibc-2.10-288-ga0e25a8-fedora.tar.bz2
+61679ed6d703591818e6981884571415  glibc-2.10-288-ga0e25a8.tar.bz2



From pnemade at fedoraproject.org  Mon Aug 24 09:26:40 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 24 Aug 2009 09:26:40 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.92,1.93
Message-ID: <20090824092640.404E911C0044@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12720

Modified Files:
	comps-f12.xml.in 
Log Message:
- Added packages hyphen-as, hyphen-bn, hyphen-mr



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- comps-f12.xml.in	24 Aug 2009 08:40:57 -0000	1.92
+++ comps-f12.xml.in	24 Aug 2009 09:26:39 -0000	1.93
@@ -141,6 +141,7 @@
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-as</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
@@ -455,6 +456,7 @@
       <packagereq type="mandatory">m17n-db-bengali</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
       <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="moodle">moodle-bn</packagereq>
@@ -4186,6 +4188,7 @@
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-mr</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-mr</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Marathi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>



From ovasik at fedoraproject.org  Mon Aug 24 09:45:05 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 24 Aug 2009 09:45:05 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.5-kojiutimensatskip.patch,1.2,1.3
Message-ID: <20090824094505.D751F11C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15424

Modified Files:
	coreutils-7.5-kojiutimensatskip.patch 
Log Message:
fix typo

coreutils-7.5-kojiutimensatskip.patch:
 copy.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Index: coreutils-7.5-kojiutimensatskip.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-7.5-kojiutimensatskip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- coreutils-7.5-kojiutimensatskip.patch	24 Aug 2009 08:38:17 -0000	1.2
+++ coreutils-7.5-kojiutimensatskip.patch	24 Aug 2009 09:45:05 -0000	1.3
@@ -9,7 +9,7 @@ diff -urNp coreutils-7.5-orig/src/copy.c
 +  int err = utimensat (AT_FDCWD, file, timespec, AT_SYMLINK_NOFOLLOW);
 +  /* When configuring on a system with new headers and libraries, and
 +     running on one with a kernel that is old enough to lack the syscall,
-+     utimensat fails with ENOTSUP.  Ignore that.  */
++     utimensat fails with ENOSYS.  Ignore that.  */
 +  if (err && errno == ENOSYS)
 +    err = 0;
 +  return err;



From sbose at fedoraproject.org  Mon Aug 24 10:00:35 2009
From: sbose at fedoraproject.org (sbose)
Date: Mon, 24 Aug 2009 10:00:35 +0000 (UTC)
Subject: rpms/ctdb/devel .cvsignore, 1.8, 1.9 ctdb.spec, 1.11, 1.12 sources, 
	1.8, 1.9
Message-ID: <20090824100035.8AB5311C0371@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18498

Modified Files:
	.cvsignore ctdb.spec sources 
Log Message:
Update to ctdb version 1.0.88



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Jul 2009 12:00:56 -0000	1.8
+++ .cvsignore	24 Aug 2009 10:00:35 -0000	1.9
@@ -1 +1 @@
-ctdb-1.0.87.tar.bz2
+ctdb-1.0.88.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ctdb.spec	24 Jul 2009 19:46:50 -0000	1.11
+++ ctdb.spec	24 Aug 2009 10:00:35 -0000	1.12
@@ -2,8 +2,8 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.87
-Release: 2%{?dist}
+Version: 1.0.88
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://ctdb.samba.org/
@@ -132,6 +132,25 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Mon Aug 17 2009 Sumit Bose <sbose at redhat.com> - 1.0.88-1
+ - Update to ctdb version 1.0.88
+
+* Mon Aug 17 2009 : Version 1.0.88
+ - Add a new state for eventscripts : DISABLED.
+   Add two new commands "ctdb enablescript/disablescript" to enable/disable
+   eventscripts at runtime.
+ - Bugfixes for TDB from rusty.
+ - Merge/Port changes from upstream TDB library by rusty.
+ - Additional new tests from MartinS. Tests for stop/continue.
+ - Initial patch to rework vacuuming/repacking process from Wolfgang Mueller.
+ - Updates from Michael Adam for persistent writes.
+ - Updates from MartinS to handle the new STOPPED bit in the test framework.
+ - Make it possible to enable/disable the RECMASTER and LMASTER roles
+   at runtime. Add two new commands
+   "ctdb setlmasterrole/setrecmasterrole on/off"
+ - Make it possible to enable/disable the natgw feature at runtime. Add
+   the command "ctdb setnatgwstate on/off"
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.87-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Jul 2009 12:00:57 -0000	1.8
+++ sources	24 Aug 2009 10:00:35 -0000	1.9
@@ -1 +1 @@
-f925406352e087c9f32ec3084578c29e  ctdb-1.0.87.tar.bz2
+cf1cc1f409312a1bcca14968638d1e2f  ctdb-1.0.88.tar.bz2



From mcrha at fedoraproject.org  Mon Aug 24 10:03:42 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 24 Aug 2009 10:03:42 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.100, 1.101 gtkhtml3.spec, 1.157, 
	1.158 sources, 1.100, 1.101
Message-ID: <20090824100342.12DAE11C0044@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19171

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 3.27.91-1.fc12
- Update to 3.27.91




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	10 Aug 2009 14:55:24 -0000	1.100
+++ .cvsignore	24 Aug 2009 10:03:41 -0000	1.101
@@ -1 +1 @@
-gtkhtml-3.27.90.tar.bz2
+gtkhtml-3.27.91.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- gtkhtml3.spec	10 Aug 2009 14:55:24 -0000	1.157
+++ gtkhtml3.spec	24 Aug 2009 10:03:41 -0000	1.158
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.27.90
+Version: 3.27.91
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 3.27.91-1.fc12
+- Update to 3.27.91
+
 * Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 3.27.90-1.fc12
 - Update to 3.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	10 Aug 2009 14:55:24 -0000	1.100
+++ sources	24 Aug 2009 10:03:41 -0000	1.101
@@ -1 +1 @@
-6e17cf6415852dbc7bbc44a362dfa7ac  gtkhtml-3.27.90.tar.bz2
+f1c36826886078f6899b0e5f5dfa5a08  gtkhtml-3.27.91.tar.bz2



From sbose at fedoraproject.org  Mon Aug 24 10:17:04 2009
From: sbose at fedoraproject.org (sbose)
Date: Mon, 24 Aug 2009 10:17:04 +0000 (UTC)
Subject: rpms/ctdb/EL-5 .cvsignore, 1.7, 1.8 ctdb.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20090824101704.6164A11C0044@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21820

Modified Files:
	.cvsignore ctdb.spec sources 
Log Message:
Update to ctdb version 1.0.88



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jul 2009 12:15:17 -0000	1.7
+++ .cvsignore	24 Aug 2009 10:17:04 -0000	1.8
@@ -1 +1 @@
-ctdb-1.0.87.tar.bz2
+ctdb-1.0.88.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/EL-5/ctdb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ctdb.spec	17 Jul 2009 12:15:17 -0000	1.9
+++ ctdb.spec	24 Aug 2009 10:17:04 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 1.0.87
+Version: 1.0.88
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -132,6 +132,25 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Mon Aug 17 2009 Sumit Bose <sbose at redhat.com> - 1.0.88-1
+ - Update to ctdb version 1.0.88
+
+* Mon Aug 17 2009 : Version 1.0.88
+ - Add a new state for eventscripts : DISABLED.
+   Add two new commands "ctdb enablescript/disablescript" to enable/disable
+   eventscripts at runtime.
+ - Bugfixes for TDB from rusty.
+ - Merge/Port changes from upstream TDB library by rusty.
+ - Additional new tests from MartinS. Tests for stop/continue.
+ - Initial patch to rework vacuuming/repacking process from Wolfgang Mueller.
+ - Updates from Michael Adam for persistent writes.
+ - Updates from MartinS to handle the new STOPPED bit in the test framework.
+ - Make it possible to enable/disable the RECMASTER and LMASTER roles
+   at runtime. Add two new commands
+   "ctdb setlmasterrole/setrecmasterrole on/off"
+ - Make it possible to enable/disable the natgw feature at runtime. Add
+   the command "ctdb setnatgwstate on/off"
+
 * Fri Jul 17 2009 Sumit Bose <sbose at redhat.com> - 1.0.87-1
  - Update to ctdb version 1.0.87
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Jul 2009 12:15:17 -0000	1.7
+++ sources	24 Aug 2009 10:17:04 -0000	1.8
@@ -1 +1 @@
-f925406352e087c9f32ec3084578c29e  ctdb-1.0.87.tar.bz2
+cf1cc1f409312a1bcca14968638d1e2f  ctdb-1.0.88.tar.bz2



From than at fedoraproject.org  Mon Aug 24 10:25:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 24 Aug 2009 10:25:04 +0000 (UTC)
Subject: rpms/doxygen/devel doxygen-1.6.0-timestamp.patch, NONE,
	1.1 doxygen.spec, 1.68, 1.69
Message-ID: <20090824102504.E014111C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24271

Modified Files:
	doxygen.spec 
Added Files:
	doxygen-1.6.0-timestamp.patch 
Log Message:
- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
  HTMP_TIMESTAMP is disable by default



doxygen-1.6.0-timestamp.patch:
 config.xml        |    4 ++++
 configoptions.cpp |    8 ++++++++
 htmlgen.cpp       |    5 ++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE doxygen-1.6.0-timestamp.patch ---
diff -up doxygen-1.6.0/src/config.cpp.orig doxygen-1.6.0/src/config.cpp
diff -up doxygen-1.6.0/src/config.l.orig doxygen-1.6.0/src/config.l
diff -up doxygen-1.6.0/src/configoptions.cpp.orig doxygen-1.6.0/src/configoptions.cpp
--- doxygen-1.6.0/src/configoptions.cpp.orig	2009-08-24 12:04:45.000000000 +0200
+++ doxygen-1.6.0/src/configoptions.cpp	2009-08-24 12:06:34.000000000 +0200
@@ -1072,6 +1072,14 @@ void addConfigOptions(Config *cfg)
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
+  cb = cfg->addBool(
+                 "HTML_TIMESTAMP",
+                 "If the HTML_TIMESTAMP tag is set to YES then the generated HTML\n"
+                 "documentation will contain the timesstamp.",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTML");
+  //----
   cs = cfg->addString(
                  "HTML_STYLESHEET",
                  "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"
diff -up doxygen-1.6.0/src/config.xml.orig doxygen-1.6.0/src/config.xml
--- doxygen-1.6.0/src/config.xml.orig	2009-08-24 11:55:46.000000000 +0200
+++ doxygen-1.6.0/src/config.xml	2009-08-24 12:03:06.000000000 +0200
@@ -751,6 +751,10 @@ The HTML_FOOTER tag can be used to speci
 each generated HTML page. If it is left blank doxygen will generate a 
 standard footer. 
 ' defval='' depends='GENERATE_HTML'/>
+    <option type='bool' id='HTML_TIMESTAMP' docs='
+If the HTML_TIMESTAMP tag is set to YES then the generated HTML
+documentation will contain the timesstamp.
+' defval='' depends='GENERATE_HTML'/>
     <option type='string' id='HTML_STYLESHEET' format='file' docs='
 The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 style sheet that is used by each HTML page. It can be used to 
diff -up doxygen-1.6.0/src/htmlgen.cpp.orig doxygen-1.6.0/src/htmlgen.cpp
--- doxygen-1.6.0/src/htmlgen.cpp.orig	2009-08-24 11:55:20.000000000 +0200
+++ doxygen-1.6.0/src/htmlgen.cpp	2009-08-24 11:53:29.000000000 +0200
@@ -56,6 +56,7 @@ static const char search_script[]=
 
 static QCString g_header;
 static QCString g_footer;
+static bool timestamp=false;
 
 //------------------------- Pictures for the Tabs ------------------------
 
@@ -640,6 +641,8 @@ void HtmlGenerator::init()
   if (!Config_getString("HTML_FOOTER").isEmpty()) 
   {
     g_footer=fileToString(Config_getString("HTML_FOOTER"));
+    if (Config_getBool("HTML_TIMESTAMP"))
+      timestamp=true;
     //printf("g_footer='%s'\n",g_footer.data());
   }
   createSubDirs(d);
@@ -864,7 +867,7 @@ static void writePageFooter(QTextStream 
   {
     t << "<hr size=\"1\"/><address style=\"text-align: right;\"><small>";
     t << theTranslator->trGeneratedAt(
-        dateToString(TRUE),
+        dateToString(timestamp),
         Config_getString("PROJECT_NAME")
         );
     t << "&nbsp;" << endl << "<a href=\"http://www.doxygen.org/index.html\">";


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- doxygen.spec	21 Aug 2009 14:46:13 -0000	1.68
+++ doxygen.spec	24 Aug 2009 10:25:04 -0000	1.69
@@ -6,11 +6,12 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 Patch1: doxygen-1.6.0-config.patch
+Patch2: doxygen-1.6.0-timestamp.patch
 Group: Development/Tools
 # No version is specified.
 License: GPL+
@@ -49,6 +50,7 @@ are used by doxygen.
 %setup -q
 
 %patch1 -p1 -b .config
+%patch2 -p1 -b .timestamp
 
 %build
 unset QTDIR
@@ -99,6 +101,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 1.6.0-2
+- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
+  HTMP_TIMESTAMP is disable by default
+
 * Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.6.0-1
 - 1.6.0
 



From palango at fedoraproject.org  Mon Aug 24 10:39:33 2009
From: palango at fedoraproject.org (palango)
Date: Mon, 24 Aug 2009 10:39:33 +0000 (UTC)
Subject: rpms/boo/devel boo-0.9.1.3287-src-libdir.patch, NONE,
	1.1 boo-pkgconfig_path_fix.patch, NONE, 1.1 boo-targets.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 boo.spec, 1.21, 1.22 sources, 1.4,
	1.5 boo-exclude-VS-as-target.patch, 1.1, NONE boo-extras.patch,
	1.1, NONE boo-libdir.patch, 1.4, NONE boo-mono.patch, 1.1, NONE
Message-ID: <20090824103933.797D711C0044@cvs1.fedora.phx.redhat.com>

Author: palango

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27152

Modified Files:
	.cvsignore boo.spec sources 
Added Files:
	boo-0.9.1.3287-src-libdir.patch boo-pkgconfig_path_fix.patch 
	boo-targets.patch 
Removed Files:
	boo-exclude-VS-as-target.patch boo-extras.patch 
	boo-libdir.patch boo-mono.patch 
Log Message:
update to 0.9.1

boo-0.9.1.3287-src-libdir.patch:
 bin/Makefile.am    |    2 +-
 configure.in.in    |    2 +-
 extras/Makefile.am |    2 +-
 extras/booc.in     |    4 ++--
 extras/booi.in     |    4 ++--
 extras/booish.in   |    4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE boo-0.9.1.3287-src-libdir.patch ---
# SourceFucker.pl: Fix hardcoded references to libdir
diff -uraN boo-0.9.1.3287-src.orig/bin/Makefile.am boo-0.9.1.3287-src/bin/Makefile.am
--- boo-0.9.1.3287-src.orig/bin/Makefile.am	2009-03-16 10:04:26.000000000 +0100
+++ boo-0.9.1.3287-src/bin/Makefile.am	2009-08-02 16:22:47.496535586 +0200
@@ -1,4 +1,4 @@
-boodir = $(prefix)/lib/boo
+boodir = $(libdir)/boo
 boo_DATA = booc.exe booi.exe booish.exe booc.rsp booc.exe.config booi.exe.config booish.exe.config
 
 BOO_GAC_DLLS = Boo.Lang.dll \
diff -uraN boo-0.9.1.3287-src.orig/configure.in.in boo-0.9.1.3287-src/configure.in.in
--- boo-0.9.1.3287-src.orig/configure.in.in	2008-04-21 14:59:38.000000000 +0200
+++ boo-0.9.1.3287-src/configure.in.in	2009-08-02 16:22:40.161535208 +0200
@@ -14,7 +14,7 @@
 
 AC_PATH_PROG(GACUTIL, gacutil, no)
 
-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(prefix)/lib'
+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(libdir)'
 AC_SUBST(GACUTIL_FLAGS)
 
 AC_OUTPUT([
diff -uraN boo-0.9.1.3287-src.orig/extras/booc.in boo-0.9.1.3287-src/extras/booc.in
--- boo-0.9.1.3287-src.orig/extras/booc.in	2008-06-02 14:50:54.000000000 +0200
+++ boo-0.9.1.3287-src/extras/booc.in	2009-08-02 16:22:40.550535135 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -x @prefix@/bin/cli ]; then
-    env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booc.exe $BOOC_OPTIONS "$@"
+    env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booc.exe $BOOC_OPTIONS "$@"
 else
-    env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booc.exe $BOOC_OPTIONS "$@"
+    env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booc.exe $BOOC_OPTIONS "$@"
 fi
 
diff -uraN boo-0.9.1.3287-src.orig/extras/booi.in boo-0.9.1.3287-src/extras/booi.in
--- boo-0.9.1.3287-src.orig/extras/booi.in	2008-06-02 14:50:54.000000000 +0200
+++ boo-0.9.1.3287-src/extras/booi.in	2009-08-02 16:22:40.296535427 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -x @prefix@/bin/cli ]; then
-    env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booi.exe $BOOI_OPTIONS "$@"
+    env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booi.exe $BOOI_OPTIONS "$@"
 else
-    env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booi.exe $BOOI_OPTIONS "$@"
+    env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booi.exe $BOOI_OPTIONS "$@"
 fi
 
diff -uraN boo-0.9.1.3287-src.orig/extras/booish.in boo-0.9.1.3287-src/extras/booish.in
--- boo-0.9.1.3287-src.orig/extras/booish.in	2008-06-02 14:50:54.000000000 +0200
+++ boo-0.9.1.3287-src/extras/booish.in	2009-08-02 16:22:40.285535245 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -x @prefix@/bin/cli ]; then
-    env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booish.exe $BOOISH_OPTIONS "$@"
+    env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booish.exe $BOOISH_OPTIONS "$@"
 else
-    env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booish.exe $BOOISH_OPTIONS "$@"
+    env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booish.exe $BOOISH_OPTIONS "$@"
 fi
 
diff -uraN boo-0.9.1.3287-src.orig/extras/Makefile.am boo-0.9.1.3287-src/extras/Makefile.am
--- boo-0.9.1.3287-src.orig/extras/Makefile.am	2008-04-21 14:59:18.000000000 +0200
+++ boo-0.9.1.3287-src/extras/Makefile.am	2009-08-02 16:22:40.714535421 +0200
@@ -1,4 +1,4 @@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = boo.pc
 
 gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/

boo-pkgconfig_path_fix.patch:
 boo.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE boo-pkgconfig_path_fix.patch ---
--- boo-0.9.1.3287-src.orig/extras/boo.pc.in	2008-04-21 14:59:18.000000000 +0200
+++ boo-0.9.1.3287-src/extras/boo.pc.in	2009-08-02 18:39:46.918537910 +0200
@@ -6,4 +6,4 @@
 Name: Boo
 Description: A wrist friendly language for the CLI
 Version: @VERSION@
-Libs: -r:${libdir}/boo/Boo.Lang.dll -r:${libdir}/boo/Boo.Lang.Useful.dll -r:${libdir}/boo/Boo.Lang.CodeDom.dll -r:${libdir}/boo/Boo.Lang.Compiler.dll -r:${libdir}/boo/Boo.Lang.Parser.dll -r:${libdir}/boo/Boo.Lang.Interpreter.dll
+Libs: -r:${libdir}/mono/boo/Boo.Lang.dll -r:${libdir}/mono/boo/Boo.Lang.Useful.dll -r:${libdir}/mono/boo/Boo.Lang.CodeDom.dll -r:${libdir}/mono/boo/Boo.Lang.Compiler.dll -r:${libdir}/mono/boo/Boo.Lang.Parser.dll -r:${libdir}/mono/boo/Boo.Lang.Interpreter.dll

boo-targets.patch:
 default.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE boo-targets.patch ---
diff -uraN boo-0.9.1.3287-src.orig/default.build boo-0.9.1.3287-src/default.build
--- boo-0.9.1.3287-src.orig/default.build	2009-03-16 09:34:14.000000000 +0100
+++ boo-0.9.1.3287-src/default.build	2009-08-02 16:27:42.375537512 +0200
@@ -71,7 +71,7 @@
 		<property name="nosign" value="true" overwrite="true" />
 	</target>
 
-	<target name="all" depends="booc, booi, booish, boo-pkgconfig, Boo.Lang.CodeDom, Boo.Lang.Useful, boo, Boo.Microsoft.Build.Tasks, update-vs2005-env, Boo.Lang.PatternMatching">
+	<target name="all" depends="booc, booi, booish, boo-pkgconfig, Boo.Lang.CodeDom, Boo.Lang.Useful, boo, Boo.Lang.PatternMatching">
 		<call target="gendarme" if="${gendarme.dir != ''}" />
 	</target>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Feb 2008 16:19:34 -0000	1.4
+++ .cvsignore	24 Aug 2009 10:39:32 -0000	1.5
@@ -1 +1 @@
-boo-0.8.1.2865-src.zip
+boo-0.9.1.3287-src.zip


Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- boo.spec	24 Jul 2009 18:19:54 -0000	1.21
+++ boo.spec	24 Aug 2009 10:39:33 -0000	1.22
@@ -1,19 +1,19 @@
+%define debug_package %{nil}
 %define monodir %{_libdir}
 
 Summary: Boo is an OO statically typed language for CLI
 Name: boo
-Version: 0.8.1.2865
-Release: 8%{?dist}
+Version: 0.9.1.3287
+Release: 1%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://boo.codehaus.org
 Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.zip
-Patch0: boo-libdir.patch
-Patch1: boo-extras.patch
-Patch2: boo-exclude-VS-as-target.patch
-Patch3:	boo-mono.patch
-# Not sent upstream as far, package needs updating.
+# accepted in upstream
+Patch0: boo-0.9.1.3287-src-libdir.patch
+Patch1: boo-targets.patch
+Patch2: boo-pkgconfig_path_fix.patch
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -33,15 +33,9 @@ Development files for boo
 
 %prep
 %setup -q -c
-%patch0 -p1 -b .original
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .exclude-VS-as-target.patch
-%patch3 -b .mono
-sed -i -e 's!${libdir}!%{monodir}!' extras/booc.in
-sed -i -e 's!${libdir}!%{monodir}!' extras/booi.in
-sed -i -e 's!${libdir}!%{monodir}!' extras/booish.in
-sed -i -e 's!@libdir@!%{_libdir}!' extras/boo.pc.in
-sed -i -e 's!${prefix}!%{_prefix}!' extras/boo.pc.in
+%patch0 -p1 -b .libdir-original
+%patch1 -p1 -b .targets-original
+%patch2 -p1 -b .pc-original
 # Get rid of prebuilt dll files
 rm -rf bin/*.dll bin/pt/*.dll
 
@@ -62,7 +56,7 @@ update-mime-database %{_datadir}/mime &>
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc license.txt notice.txt readme.txt docs/BooManifesto.sxw
 %{monodir}/boo*/
 %dir %{monodir}/mono/boo
@@ -78,6 +72,9 @@ update-mime-database %{_datadir}/mime &>
 %{monodir}/pkgconfig/boo.pc
 
 %changelog
+* Sun Aug 02 2009 Paul Lange <palango at gmx.de> - 0.9.1.3287-1
+- Update to boo 9.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.2865-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -202,4 +199,3 @@ update-mime-database %{_datadir}/mime &>
 
 * Sat Apr 15 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7.5.2003-1
 - Initial import and debug for FE (spec file based on the mono project one)
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Feb 2008 16:19:34 -0000	1.4
+++ sources	24 Aug 2009 10:39:33 -0000	1.5
@@ -1 +1 @@
-93b0a0657ca285ea3aca6ffa3b7ba35c  boo-0.8.1.2865-src.zip
+7fed4903a6015777fa4a589f0d0ea397  boo-0.9.1.3287-src.zip


--- boo-exclude-VS-as-target.patch DELETED ---


--- boo-extras.patch DELETED ---


--- boo-libdir.patch DELETED ---


--- boo-mono.patch DELETED ---



From rhughes at fedoraproject.org  Mon Aug 24 10:41:03 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 24 Aug 2009 10:41:03 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.66,
	1.67 gnome-power-manager.spec, 1.172, 1.173 sources, 1.67, 1.68
Message-ID: <20090824104103.BD8EE11C0044@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27443

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-1
- Update to 2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	11 Aug 2009 11:18:28 -0000	1.66
+++ .cvsignore	24 Aug 2009 10:41:03 -0000	1.67
@@ -1 +1 @@
-gnome-power-manager-2.27.5.tar.bz2
+gnome-power-manager-2.27.91.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- gnome-power-manager.spec	11 Aug 2009 11:18:28 -0000	1.172
+++ gnome-power-manager.spec	24 Aug 2009 10:41:03 -0000	1.173
@@ -4,8 +4,8 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.27.5
-Release: 2%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -181,6 +181,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.5-2
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	11 Aug 2009 11:18:28 -0000	1.67
+++ sources	24 Aug 2009 10:41:03 -0000	1.68
@@ -1 +1 @@
-2a987ee22fb611a575eff73baea12b4c  gnome-power-manager-2.27.5.tar.bz2
+ec817ce482a9da2dbc2a78d40d384e3c  gnome-power-manager-2.27.91.tar.bz2



From twaugh at fedoraproject.org  Mon Aug 24 10:42:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 10:42:32 +0000 (UTC)
Subject: rpms/gutenprint/F-11 gutenprint.spec,1.53,1.54
Message-ID: <20090824104232.D819211C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27761

Modified Files:
	gutenprint.spec 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
- Enabled simplified CUPS drivers (bug #518030).



Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-11/gutenprint.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gutenprint.spec	3 Aug 2009 08:52:28 -0000	1.53
+++ gutenprint.spec	24 Aug 2009 10:42:32 -0000	1.54
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -144,7 +144,8 @@ Epson, HP and compatible printers..
             --with-user-guide --with-samples \
             --with-escputil --with-test --disable-rpath \
 	    --enable-cups-1_2-enhancements \
-	    --disable-cups-ppds
+	    --disable-cups-ppds \
+	    --enable-simplified-cups-ppds
 
 make %{?_smp_mflags}
  
@@ -261,6 +262,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
+- Enabled simplified CUPS drivers (bug #518030).
+
 * Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
 - Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.
 



From pnemade at fedoraproject.org  Mon Aug 24 10:42:41 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 24 Aug 2009 10:42:41 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.93,1.94
Message-ID: <20090824104241.B19CE11C0044@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27651

Modified Files:
	comps-f12.xml.in 
Log Message:
- Few more m17n-* packages addition



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- comps-f12.xml.in	24 Aug 2009 09:26:39 -0000	1.93
+++ comps-f12.xml.in	24 Aug 2009 10:42:41 -0000	1.94
@@ -859,6 +859,7 @@
     <uservisible>true</uservisible>
     <langonly>cs</langonly>
     <packagelist>
+      <packagereq type="mandatory">m17n-contrib-czech</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-cs</packagereq>
       <packagereq type="conditional" requires="autocorr-en">autocorr-cs</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-cs</packagereq>
@@ -3121,6 +3122,7 @@
       <packagereq type="default">m17n-contrib-gujarati</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-contrib-kannada</packagereq>
+      <packagereq type="default">m17n-contrib-maithili</packagereq>
       <packagereq type="default">m17n-contrib-malayalam</packagereq>
       <packagereq type="default">m17n-contrib-marathi</packagereq>
       <packagereq type="default">m17n-contrib-oriya</packagereq>
@@ -3531,6 +3533,7 @@
     <langonly>ks</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-kashmiri-fonts</packagereq>
+      <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-hindi</packagereq>
@@ -4076,12 +4079,12 @@
     <uservisible>true</uservisible>
     <langonly>mai</langonly>
     <packagelist>
+      <packagereq type="mandatory">lohit-maithili-fonts</packagereq>
+      <packagereq type="mandatory">m17n-contrib-maithili</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Maithili</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mai_IN</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">lohit-maithili-fonts</packagereq>
-      <packagereq type="default">m17n-contrib-maithili</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4797,6 +4800,7 @@
     <langonly>sa</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
+      <packagereq type="mandatory">m17n-db-sanskrit</packagereq>
     </packagelist>
   </group>
   <group>



From twaugh at fedoraproject.org  Mon Aug 24 10:43:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 10:43:02 +0000 (UTC)
Subject: rpms/gutenprint/F-10 gutenprint.spec,1.47,1.48
Message-ID: <20090824104302.CB83C11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27907

Modified Files:
	gutenprint.spec 
Log Message:
* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
- Enabled simplified CUPS drivers (bug #518030).



Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gutenprint.spec	3 Aug 2009 08:53:17 -0000	1.47
+++ gutenprint.spec	24 Aug 2009 10:43:02 -0000	1.48
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        2%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -144,7 +144,8 @@ Epson, HP and compatible printers..
             --with-user-guide --with-samples \
             --with-escputil --with-test --disable-rpath \
 	    --enable-cups-1_2-enhancements \
-	    --disable-cups-ppds
+	    --disable-cups-ppds \
+	    --enable-simplified-cups-ppds
 
 make %{?_smp_mflags}
  
@@ -261,10 +262,13 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
-* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-2
+* Tue Aug 18 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-4
+- Enabled simplified CUPS drivers (bug #518030).
+
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-3
 - Silence gutenprint-foomaticppdupdate on gutenprint-foomatic upgrade.
 
-* Fri Jul 31 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-1
+* Fri Jul 31 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-2
 - 5.2.4.  Re-enabled compiler optimization for ppc64.
 
 * Thu Jul 30 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-8



From pkgdb at fedoraproject.org  Mon Aug 24 10:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 10:49:52 +0000
Subject: [pkgdb] fuse: donv has requested watchcommits
Message-ID: <20090824104952.CB35B10F88C@bastion2.fedora.phx.redhat.com>

donv has requested the watchcommits acl on fuse (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Mon Aug 24 10:51:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 10:51:05 +0000
Subject: [pkgdb] fuse: donv has requested watchcommits
Message-ID: <20090824105105.55D2A10F879@bastion2.fedora.phx.redhat.com>

donv has requested the watchcommits acl on fuse (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From mcrha at fedoraproject.org  Mon Aug 24 10:52:49 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 24 Aug 2009 10:52:49 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.112,
	1.113 evolution-data-server-1.11.5-fix-64bit-acinclude.patch,
	1.2, 1.3 evolution-data-server.spec, 1.271, 1.272 sources, 1.112,
	1.113
Message-ID: <20090824105249.7745811C0044@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29264

Modified Files:
	.cvsignore 
	evolution-data-server-1.11.5-fix-64bit-acinclude.patch 
	evolution-data-server.spec sources 
Log Message:
* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
- Update to 2.27.91




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- .cvsignore	10 Aug 2009 15:06:00 -0000	1.112
+++ .cvsignore	24 Aug 2009 10:52:49 -0000	1.113
@@ -1 +1 @@
-evolution-data-server-2.27.90.tar.bz2
+evolution-data-server-2.27.91.tar.bz2

evolution-data-server-1.11.5-fix-64bit-acinclude.patch:
 evo_ldap_check.m4 |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

Index: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-1.11.5-fix-64bit-acinclude.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evolution-data-server-1.11.5-fix-64bit-acinclude.patch	10 Aug 2009 15:06:00 -0000	1.2
+++ evolution-data-server-1.11.5-fix-64bit-acinclude.patch	24 Aug 2009 10:52:49 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude evolution-data-server-2.27.90/acinclude.m4
---- evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude	2009-08-10 13:05:37.000000000 +0200
-+++ evolution-data-server-2.27.90/acinclude.m4	2009-08-10 17:03:16.000000000 +0200
-@@ -43,6 +43,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+diff -up evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-data-server-2.27.91/m4/evo_ldap_check.m4
+--- evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude	2009-08-24 12:45:52.000000000 +0200
++++ evolution-data-server-2.27.91/m4/evo_ldap_check.m4	2009-08-24 12:48:08.000000000 +0200
+@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
  		[AS_HELP_STRING([--with-static-ldap],
  		[Link LDAP support statically into evolution])])
  	AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
@@ -20,7 +20,7 @@ diff -up evolution-data-server-2.27.90/a
  	case $ac_cv_with_openldap in
  	no|"")
  		with_openldap=no
-@@ -53,7 +65,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
  	*)
  		with_openldap=$ac_cv_with_openldap
  		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
@@ -29,7 +29,7 @@ diff -up evolution-data-server-2.27.90/a
  		;;
  	esac
  
-@@ -89,20 +101,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
  		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
  		AC_CHECK_LIB(lber, ber_get_tag, [
  			if test "$with_static_ldap" = "yes"; then


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- evolution-data-server.spec	21 Aug 2009 13:19:36 -0000	1.271
+++ evolution-data-server.spec	24 Aug 2009 10:52:49 -0000	1.272
@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.27.90
-Release: 2%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
+- Update to 2.27.91
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.90-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	10 Aug 2009 15:06:01 -0000	1.112
+++ sources	24 Aug 2009 10:52:49 -0000	1.113
@@ -1 +1 @@
-526cce784d1d8ede8ca1c1fec4d25739  evolution-data-server-2.27.90.tar.bz2
+00503d1ad0c6afba8ed8543fd80e1adb  evolution-data-server-2.27.91.tar.bz2



From mcrha at fedoraproject.org  Mon Aug 24 11:07:28 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 24 Aug 2009 11:07:28 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.119, 1.120 evolution.spec, 1.413,
	1.414 sources, 1.119,
	1.120 evolution-2.27.90-fix-libevolution-cal-shared.patch, 1.1, NONE
Message-ID: <20090824110728.2D4C111C0044@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32202

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.27.90-fix-libevolution-cal-shared.patch 
Log Message:
* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
- Update to 2.27.91
- Remove patch for GNOME bug #591414 (fixed upstream).




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- .cvsignore	10 Aug 2009 15:11:03 -0000	1.119
+++ .cvsignore	24 Aug 2009 11:07:27 -0000	1.120
@@ -1 +1 @@
-evolution-2.27.90.tar.bz2
+evolution-2.27.91.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- evolution.spec	14 Aug 2009 21:55:02 -0000	1.413
+++ evolution.spec	24 Aug 2009 11:07:27 -0000	1.414
@@ -5,7 +5,7 @@
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
 %define gtk2_version 2.14.0
-%define gtkhtml_version 3.27.90
+%define gtkhtml_version 3.27.91
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libbonobo_version 2.20.3
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.90
-Release: 3%{?dist}
+Version: 2.27.91
+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
 
-# GNOME bug #591414
-Patch13: evolution-2.27.90-fix-libevolution-cal-shared.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 .fix-libevolution-cal-shared
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -700,6 +696,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
+- Update to 2.27.91
+- Remove patch for GNOME bug #591414 (fixed upstream).
+
 * Fri Aug 14 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.90-3.fc12
 - Add patch for GNOME bug #591414 (calendar library linked as module).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	10 Aug 2009 15:11:04 -0000	1.119
+++ sources	24 Aug 2009 11:07:27 -0000	1.120
@@ -1 +1 @@
-4c42df966be237cf5043943af3e7faa8  evolution-2.27.90.tar.bz2
+4f28ce4302ec26ea1b3ecb93c920c07c  evolution-2.27.91.tar.bz2


--- evolution-2.27.90-fix-libevolution-cal-shared.patch DELETED ---



From mcrha at fedoraproject.org  Mon Aug 24 11:19:11 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 24 Aug 2009 11:19:11 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.47,
	1.48 evolution-exchange.spec, 1.69, 1.70 sources, 1.47, 1.48
Message-ID: <20090824111911.42EC111C0044@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2184

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
- Update to 2.27.91




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	10 Aug 2009 15:13:23 -0000	1.47
+++ .cvsignore	24 Aug 2009 11:19:10 -0000	1.48
@@ -1 +1 @@
-evolution-exchange-2.27.90.tar.bz2
+evolution-exchange-2.27.91.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- evolution-exchange.spec	21 Aug 2009 13:20:19 -0000	1.69
+++ evolution-exchange.spec	24 Aug 2009 11:19:11 -0000	1.70
@@ -17,8 +17,8 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.27.90
-Release: 2%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
+- Update to 2.27.91
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.90-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	10 Aug 2009 15:13:23 -0000	1.47
+++ sources	24 Aug 2009 11:19:11 -0000	1.48
@@ -1 +1 @@
-4d20afa1028c1246bbc3fa839871dfd7  evolution-exchange-2.27.90.tar.bz2
+eafad1ffb69389878b12757114e1574d  evolution-exchange-2.27.91.tar.bz2



From salimma at fedoraproject.org  Mon Aug 24 11:22:00 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 24 Aug 2009 11:22:00 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.77,1.78
Message-ID: <20090824112200.BB3C911C0044@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2683

Modified Files:
	banshee.spec 
Log Message:
* Mon Aug 24 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
- Rebuild for boo update



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- banshee.spec	24 Jul 2009 17:50:15 -0000	1.77
+++ banshee.spec	24 Aug 2009 11:22:00 -0000	1.78
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -199,6 +199,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
+- Rebuild for boo update
+
 * Fri Jul 24 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 salimma at fedoraproject.org  Mon Aug 24 11:24:31 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 24 Aug 2009 11:24:31 +0000 (UTC)
Subject: rpms/boo/devel boo.spec,1.22,1.23
Message-ID: <20090824112431.40E9011C0044@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3026

Modified Files:
	boo.spec 
Log Message:
Fix typo in changelog



Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- boo.spec	24 Aug 2009 10:39:33 -0000	1.22
+++ boo.spec	24 Aug 2009 11:24:31 -0000	1.23
@@ -73,7 +73,7 @@ update-mime-database %{_datadir}/mime &>
 
 %changelog
 * Sun Aug 02 2009 Paul Lange <palango at gmx.de> - 0.9.1.3287-1
-- Update to boo 9.1
+- Update to boo 0.9.1
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.2865-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From mcrha at fedoraproject.org  Mon Aug 24 11:34:11 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 24 Aug 2009 11:34:11 +0000 (UTC)
Subject: rpms/evolution-mapi/devel .cvsignore, 1.12, 1.13 evolution-mapi.spec,
	1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20090824113411.5517011C0044@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-mapi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5027

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Log Message:
* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 0.27.91-1
- Update to 0.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Aug 2009 10:54:54 -0000	1.12
+++ .cvsignore	24 Aug 2009 11:34:10 -0000	1.13
@@ -1 +1 @@
-evolution-mapi-0.27.90.tar.bz2
+evolution-mapi-0.27.91.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/evolution-mapi.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- evolution-mapi.spec	10 Aug 2009 10:54:54 -0000	1.16
+++ evolution-mapi.spec	24 Aug 2009 11:34:10 -0000	1.17
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.27.90
+Version: 0.27.91
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 0.27.91-1
+- Update to 0.27.91
+
 * Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 0.27.90-1
 - Update to 0.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Aug 2009 10:54:54 -0000	1.12
+++ sources	24 Aug 2009 11:34:11 -0000	1.13
@@ -1 +1 @@
-7ed859e1519af29cfbe9a8cdbb4723ef  evolution-mapi-0.27.90.tar.bz2
+6085d71635aa31d6bfca11aafb258a45  evolution-mapi-0.27.91.tar.bz2



From twaugh at fedoraproject.org  Mon Aug 24 11:37:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 11:37:40 +0000 (UTC)
Subject: rpms/hplip/devel hplip-clear-previous-state-reasons.patch, NONE,
	1.1 hplip-state-reasons-newline.patch, NONE, 1.1 hplip.spec,
	1.223, 1.224
Message-ID: <20090824113740.5527711C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5541

Modified Files:
	hplip.spec 
Added Files:
	hplip-clear-previous-state-reasons.patch 
	hplip-state-reasons-newline.patch 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Fixed state reasons handling problems (bug #501338).


hplip-clear-previous-state-reasons.patch:
 hp.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE hplip-clear-previous-state-reasons.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons	2009-08-04 22:35:33.000000000 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-08-24 09:55:28.941900902 +0100
@@ -570,6 +570,14 @@ static int loop_test(HPMUD_DEVICE dd, HP
 {
    int status, stat;
    const char *pstate, *old_state=NULL;
+   static int first_time = 1;
+
+   if (first_time)
+   {
+      first_time = 0;
+      old_state = ("media-empty-error,media-jam-error,"
+		   "cover-open-error,toner-empty-error,other");
+   }
 
    while (1)
    {
@@ -768,6 +776,10 @@ int main(int argc, char *argv[])
                   pthread_cond_init(&pa.done_cond, NULL);
                   pthread_create(&pa.tid, NULL, (void *(*)(void*))pjl_read_thread, (void *)&pa);
                }
+
+	       /* Clear any errors left over from a previous run. */
+	       loop_test (hd, cd, &pa, argv[0], printer, argv[2], argv[1],
+			  argv[3]);
             }
 
             stat = hpmud_write_channel(hd, cd, buf+total, size, EXCEPTION_TIMEOUT, &n);

hplip-state-reasons-newline.patch:
 hpcups.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE hplip-state-reasons-newline.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.state-reasons-newline hplip-3.9.8/prnt/backend/hp.c
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline	2009-08-24 10:40:32.407070376 +0100
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp	2009-08-24 11:04:14.374016107 +0100
@@ -315,7 +315,7 @@ int HPCups::initContext (char **argv)
         m_pSys->pPC->constructor_error != PLUGIN_LIBRARY_MISSING &&
         m_pSys->DisplayStatus != DISPLAY_PRINTING_CANCELED)
     {
-	BUG("PrintContext creation failed, error = %d", m_pSys->pPC->constructor_error);
+	BUG("PrintContext creation failed, error = %d\n", m_pSys->pPC->constructor_error);
 	return 1;
     }
 
@@ -347,11 +347,11 @@ int HPCups::initContext (char **argv)
 	    case WARN_LOW_INK_YELLOW:
 	    case WARN_LOW_INK_MULTIPLE_PENS:
 	    {
-	       BUG ("STATE: +marker-supply-low-warning\n");
+	       fputs ("STATE: +marker-supply-low-warning\n", stderr);
 	       break;
 	    }
 	    default:
-	       BUG ("STATE: -marker-supply-low-warning\n");
+	       fputs ("STATE: -marker-supply-low-warning\n", stderr);
 	}
     }
 
@@ -678,7 +678,7 @@ void CancelPrintJob (int sig)
 int main (int argc, char **argv)
 {
     int iRet = hpCups.ProcessJob (argc, argv);
-    BUG("hpcups: returning status %d from main", iRet);
+    BUG("hpcups: returning status %d from main\n", iRet);
     return iRet;
 }
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- hplip.spec	21 Aug 2009 13:51:04 -0000	1.223
+++ hplip.spec	24 Aug 2009 11:37:40 -0000	1.224
@@ -1,7 +1,8 @@
+%define __find_provides %{_datadir}/system-config-printer/postscriptdriver.prov
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -17,6 +18,8 @@ Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
+Patch5: hplip-clear-previous-state-reasons.patch
+Patch6: hplip-state-reasons-newline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -109,6 +112,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make sure to avoid handwritten asm.
 %patch4 -p1 -b .no-asm
 
+# Clear previous state reasons in the hp backend (bug #501338).
+%patch5 -p1 -b .clear-previous-state-reasons
+
+# Don't hide state reason changes by missing out newlines in stderr.
+%patch6 -p1 -b .state-reasons-newline
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -310,6 +319,9 @@ fi
 exit 0
 
 %changelog
+* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Fixed state reasons handling problems (bug #501338).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-7
 - rebuilt with new openssl
 



From than at fedoraproject.org  Mon Aug 24 11:37:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 24 Aug 2009 11:37:53 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork-4.3.0-jabber-kde#111537.patch, NONE,
	1.1 kdenetwork.spec, 1.195, 1.196
Message-ID: <20090824113753.E0A7411C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5401

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.0-jabber-kde#111537.patch 
Log Message:
fix bz#515586


kdenetwork-4.3.0-jabber-kde#111537.patch:
 jabberaccount.cpp |   10 ++++++++++
 jabberaccount.h   |   10 ++++++++++
 jabbercontact.cpp |   15 ++++++++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)

--- NEW FILE kdenetwork-4.3.0-jabber-kde#111537.patch ---
Index: kopete/protocols/jabber/jabberaccount.h
===================================================================
--- kopete/protocols/jabber/jabberaccount.h	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.h	(Revision 985395)
@@ -128,6 +128,16 @@
 	 * called when the account is removed in the config ui
 	*/
 	virtual bool removeAccount();
+
+	/**
+	 * return if kopete show all messges from all resources to one session
+	 */
+	bool mergeMessages();
+
+	/**
+	 * set if kopete will merge all messages to one session
+	 */
+	void setMergeMessages(bool b);
 	
 #ifdef JINGLE_SUPPORT
 	JingleCallsManager *jingleCallsManager() const {return m_jcm;}
Index: kopete/protocols/jabber/jabbercontact.cpp
===================================================================
--- kopete/protocols/jabber/jabbercontact.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabbercontact.cpp	(Revision 985395)
@@ -341,7 +341,10 @@
 					m.setPlainBody( i18n("%1 has ended his/her participation in the chat session.", metaContact()->displayName()) );
 					m.setDirection( Kopete::Message::Internal );
 
-					mManager->appendMessage ( m, message.from().resource () );
+					if ( account()->mergeMessages() )
+						mManager->appendMessage ( m, QString() );
+					else
+						mManager->appendMessage ( m, message.from().resource () );
 				}
 			}
 		}
@@ -426,7 +429,10 @@
 	// append message to (eventually new) manager and preselect the originating resource
 	if ( newMessage )
 	{
-		mManager->appendMessage ( *newMessage, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( *newMessage, QString() );
+		else
+			mManager->appendMessage ( *newMessage, message.from().resource () );
 
 		delete newMessage;
 	}
@@ -450,7 +456,10 @@
 		msg.setDirection( Kopete::Message::Inbound );
 		msg.setRequestedPlugin( viewPlugin );
 
-		mManager->appendMessage ( msg, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( msg, QString() );
+		else
+			mManager->appendMessage ( msg, message.from().resource () );
 	}
 }
 
Index: kopete/protocols/jabber/jabberaccount.cpp
===================================================================
--- kopete/protocols/jabber/jabberaccount.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.cpp	(Revision 985395)
@@ -1720,6 +1720,16 @@
 		Kopete::AccountManager::self()->removeAccount( this ); //this will delete this
 }
 
+void JabberAccount::setMergeMessages(bool b)
+{
+	configGroup()->writeEntry("MergeMessages", b);
+}
+
+bool JabberAccount::mergeMessages()
+{
+	return configGroup()->readEntry("MergeMessages", true);
+}
+
 /*
 JabberMoodAction::JabberMoodAction(const Mood::Type type, QObject *parent):
 KAction(parent)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdenetwork.spec	5 Aug 2009 12:59:57 -0000	1.195
+++ kdenetwork.spec	24 Aug 2009 11:37:53 -0000	1.196
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -12,8 +12,12 @@ Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+
 # upstream patches (4.3 branch):
 
+# upstream patches (4.4 branch):
+Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
@@ -94,6 +98,8 @@ Requires: kdelibs4-devel
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
 
+# 4.4 upstream patches
+%patch200 -p0 -b .bz#515586-kopete
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +186,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- fix bz#515586, backport patch to fix this issue
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From twaugh at fedoraproject.org  Mon Aug 24 11:38:12 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 11:38:12 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-clear-previous-state-reasons.patch, NONE,
	1.1 hplip-state-reasons-newline.patch, NONE, 1.1 hplip.spec,
	1.218, 1.219
Message-ID: <20090824113812.BE62D11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5639

Modified Files:
	hplip.spec 
Added Files:
	hplip-clear-previous-state-reasons.patch 
	hplip-state-reasons-newline.patch 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Fixed state reasons handling problems (bug #501338).


hplip-clear-previous-state-reasons.patch:
 hp.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE hplip-clear-previous-state-reasons.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons	2009-08-04 22:35:33.000000000 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-08-24 09:55:28.941900902 +0100
@@ -570,6 +570,14 @@ static int loop_test(HPMUD_DEVICE dd, HP
 {
    int status, stat;
    const char *pstate, *old_state=NULL;
+   static int first_time = 1;
+
+   if (first_time)
+   {
+      first_time = 0;
+      old_state = ("media-empty-error,media-jam-error,"
+		   "cover-open-error,toner-empty-error,other");
+   }
 
    while (1)
    {
@@ -768,6 +776,10 @@ int main(int argc, char *argv[])
                   pthread_cond_init(&pa.done_cond, NULL);
                   pthread_create(&pa.tid, NULL, (void *(*)(void*))pjl_read_thread, (void *)&pa);
                }
+
+	       /* Clear any errors left over from a previous run. */
+	       loop_test (hd, cd, &pa, argv[0], printer, argv[2], argv[1],
+			  argv[3]);
             }
 
             stat = hpmud_write_channel(hd, cd, buf+total, size, EXCEPTION_TIMEOUT, &n);

hplip-state-reasons-newline.patch:
 hpcups.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE hplip-state-reasons-newline.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.state-reasons-newline hplip-3.9.8/prnt/backend/hp.c
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline	2009-08-24 10:40:32.407070376 +0100
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp	2009-08-24 11:04:14.374016107 +0100
@@ -315,7 +315,7 @@ int HPCups::initContext (char **argv)
         m_pSys->pPC->constructor_error != PLUGIN_LIBRARY_MISSING &&
         m_pSys->DisplayStatus != DISPLAY_PRINTING_CANCELED)
     {
-	BUG("PrintContext creation failed, error = %d", m_pSys->pPC->constructor_error);
+	BUG("PrintContext creation failed, error = %d\n", m_pSys->pPC->constructor_error);
 	return 1;
     }
 
@@ -347,11 +347,11 @@ int HPCups::initContext (char **argv)
 	    case WARN_LOW_INK_YELLOW:
 	    case WARN_LOW_INK_MULTIPLE_PENS:
 	    {
-	       BUG ("STATE: +marker-supply-low-warning\n");
+	       fputs ("STATE: +marker-supply-low-warning\n", stderr);
 	       break;
 	    }
 	    default:
-	       BUG ("STATE: -marker-supply-low-warning\n");
+	       fputs ("STATE: -marker-supply-low-warning\n", stderr);
 	}
     }
 
@@ -678,7 +678,7 @@ void CancelPrintJob (int sig)
 int main (int argc, char **argv)
 {
     int iRet = hpCups.ProcessJob (argc, argv);
-    BUG("hpcups: returning status %d from main", iRet);
+    BUG("hpcups: returning status %d from main\n", iRet);
     return iRet;
 }
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- hplip.spec	19 Aug 2009 10:56:45 -0000	1.218
+++ hplip.spec	24 Aug 2009 11:38:12 -0000	1.219
@@ -1,7 +1,8 @@
+%define __find_provides %{_datadir}/system-config-printer/postscriptdriver.prov
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 6%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -17,6 +18,8 @@ Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
+Patch5: hplip-clear-previous-state-reasons.patch
+Patch6: hplip-state-reasons-newline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -109,6 +112,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make sure to avoid handwritten asm.
 %patch4 -p1 -b .no-asm
 
+# Clear previous state reasons in the hp backend (bug #501338).
+%patch5 -p1 -b .clear-previous-state-reasons
+
+# Don't hide state reason changes by missing out newlines in stderr.
+%patch6 -p1 -b .state-reasons-newline
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -310,6 +319,12 @@ fi
 exit 0
 
 %changelog
+* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Fixed state reasons handling problems (bug #501338).
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-7
+- rebuilt with new openssl
+
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
 - Make sure to avoid handwritten asm.
 - Don't use obsolete configure options.



From jwrdegoede at fedoraproject.org  Mon Aug 24 11:47:18 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 24 Aug 2009 11:47:18 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1731,1.1732
Message-ID: <20090824114718.78DCF11C0044@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7010

Modified Files:
	kernel.spec 
Log Message:
Add kbd BuildRequires for dracut image generation


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1731
retrieving revision 1.1732
diff -u -p -r1.1731 -r1.1732
--- kernel.spec	22 Aug 2009 12:43:28 -0000	1.1731
+++ kernel.spec	24 Aug 2009 11:47:18 -0000	1.1732
@@ -498,6 +498,10 @@ BuildRequires: elfutils-libelf-devel zli
 BuildRequires: dracut-kernel >= 0.7
 BuildRequires: dracut-generic >= 0.7
 %endif
+# For dracut image generation, cannot go in dracut package as its arch specific
+%ifnarch s390 s390x
+BuildRequires: kbd
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0



From fabbione at fedoraproject.org  Mon Aug 24 12:11:07 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 12:11:07 +0000 (UTC)
Subject: rpms/cluster/F-11 .cvsignore, 1.23, 1.24 cluster.spec, 1.49,
	1.50 sources, 1.24, 1.25
Message-ID: <20090824121107.DC56F11C0044@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11069

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release fixes 3 critical issues



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	24 Mar 2009 09:06:11 -0000	1.23
+++ .cvsignore	24 Aug 2009 12:11:05 -0000	1.24
@@ -1 +1 @@
-cluster-3.0.0.rc1.tar.gz
+cluster-3.0.2.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/cluster.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- cluster.spec	28 Jul 2009 12:47:52 -0000	1.49
+++ cluster.spec	24 Aug 2009 12:11:05 -0000	1.50
@@ -18,8 +18,8 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.0
-Release: 20%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.2
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -191,6 +191,7 @@ The Red Hat Cluster libraries developmen
 %{_includedir}/libcman.h
 %{_includedir}/libdlm*.h
 %{_includedir}/libfence.h
+%{_includedir}/libfenced.h
 %{_includedir}/liblogthread.h
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
@@ -300,7 +301,10 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
+* 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
 - New upstream release
 - spec file updates:
   * Update copyright header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	28 Jul 2009 12:47:53 -0000	1.24
+++ sources	24 Aug 2009 12:11:05 -0000	1.25
@@ -1 +1 @@
-93101d0f3c724a46caee1f9f16abe4af  cluster-3.0.0.tar.gz
+d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz



From pmachata at fedoraproject.org  Mon Aug 24 12:11:09 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 24 Aug 2009 12:11:09 +0000 (UTC)
Subject: rpms/bison/devel bison.spec,1.40,1.41
Message-ID: <20090824121109.A07A811C0044@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/bison/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11108

Modified Files:
	bison.spec 
Log Message:
- Fix installation with --excludedocs
- Resolves: #515939



Index: bison.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bison/devel/bison.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- bison.spec	24 Jul 2009 18:05:29 -0000	1.40
+++ bison.spec	24 Aug 2009 12:11:09 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A GNU general-purpose parser generator
 Name: bison
 Version: 2.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -87,11 +87,15 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/ya
 gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info*
 
 %post
-/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison).                        The GNU parser generator." || :
+if [ -f %{_infodir}/bison.info.gz ]; then # for --excludedocs
+   /sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison).                        The GNU parser generator." || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison).                        The GNU parser generator." || :
+    if [ -f %{_infodir}/bison.info.gz ]; then # for --excludedocs
+      /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison).                        The GNU parser generator." || :
+    fi
 fi
 
 # The distribution contains also source files.  These are used by m4
@@ -115,6 +119,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Petr Machata <pmachata at redhat.com> - 2.4.1-4
+- Fix installation with --excludedocs
+- Resolves: #515939
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Aug 24 12:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 12:14:17 +0000
Subject: [pkgdb] fuse had acl change status
Message-ID: <20090824121417.243C310F879@bastion2.fedora.phx.redhat.com>

peter has set the watchcommits acl on fuse (Fedora devel) to Approved for donv

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From pkgdb at fedoraproject.org  Mon Aug 24 12:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 12:14:27 +0000
Subject: [pkgdb] fuse had acl change status
Message-ID: <20090824121427.E662610F890@bastion2.fedora.phx.redhat.com>

peter has set the watchcommits acl on fuse (Fedora 11) to Approved for donv

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fuse



From mbroz at fedoraproject.org  Mon Aug 24 12:23:11 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Mon, 24 Aug 2009 12:23:11 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2-2_02_52-fix-pvcreate-partition.patch, NONE,
	1.1 lvm2-2_02_52-fix-pvs-global-lock.patch, NONE, 1.1 lvm2.spec,
	1.169, 1.170
Message-ID: <20090824122311.1AEA311C0044@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12873

Modified Files:
	lvm2.spec 
Added Files:
	lvm2-2_02_52-fix-pvcreate-partition.patch 
	lvm2-2_02_52-fix-pvs-global-lock.patch 
Log Message:
Fix global locking in PV reporting commands (2.02.49).
Fix pvcreate on a partition (2.02.51).
Build clvmd with both cman and corosync support.



lvm2-2_02_52-fix-pvcreate-partition.patch:
 WHATS_NEW            |    4 ++++
 lib/device/dev-md.c  |   12 +++++++-----
 lib/filters/filter.c |   10 ++++++++++
 lib/filters/filter.h |    1 +
 4 files changed, 22 insertions(+), 5 deletions(-)

--- NEW FILE lvm2-2_02_52-fix-pvcreate-partition.patch ---
--- LVM2.2.02.51.old/lib/device/dev-md.c	2009-08-01 19:14:52.000000000 +0200
+++ LVM2.2.02.51/lib/device/dev-md.c	2009-08-24 14:13:39.000000000 +0200
@@ -137,13 +137,15 @@ static int _md_sysfs_attribute_snprintf(
 	if (!sysfs_dir || !*sysfs_dir)
 		return ret;
 
-check_md_major:
-	if (MAJOR(dev) != md_major()) {
-		if (get_primary_dev(sysfs_dir, blkdev, &dev))
-			goto check_md_major;
-		return ret;
+	if (MAJOR(dev) == blkext_major()) {
+		/* lookup parent MD device from blkext partition */
+		if (!get_primary_dev(sysfs_dir, blkdev, &dev))
+			return ret;
 	}
 
+	if (MAJOR(dev) != md_major())
+		return ret;
+
 	ret = dm_snprintf(path, size, "%s/dev/block/%d:%d/md/%s", sysfs_dir,
 			  (int)MAJOR(dev), (int)MINOR(dev), attribute);
 	if (ret < 0) {
--- LVM2.2.02.51.old/lib/filters/filter.c	2009-07-10 00:34:02.000000000 +0200
+++ LVM2.2.02.51/lib/filters/filter.c	2009-08-24 14:13:39.000000000 +0200
@@ -38,6 +38,7 @@ typedef struct {
 } device_info_t;
 
 static int _md_major = -1;
+static int _blkext_major = -1;
 static int _device_mapper_major = -1;
 
 int md_major(void)
@@ -45,6 +46,11 @@ int md_major(void)
 	return _md_major;
 }
 
+int blkext_major(void)
+{
+	return _blkext_major;
+}
+
 /*
  * Devices are only checked for partition tables if their minor number
  * is a multiple of the number corresponding to their type below
@@ -197,6 +203,10 @@ static int _scan_proc_dev(const char *pr
 		if (!strncmp("md", line + i, 2) && isspace(*(line + i + 2)))
 			_md_major = line_maj;
 
+		/* Look for blkext device */
+		if (!strncmp("blkext", line + i, 6) && isspace(*(line + i + 6)))
+			_blkext_major = line_maj;
+
 		/* Look for device-mapper device */
 		/* FIXME Cope with multiple majors */
 		if (!strncmp("device-mapper", line + i, 13) && isspace(*(line + i + 13)))
--- LVM2.2.02.51.old/lib/filters/filter.h	2007-08-20 22:55:25.000000000 +0200
+++ LVM2.2.02.51/lib/filters/filter.h	2009-08-24 14:13:39.000000000 +0200
@@ -36,6 +36,7 @@ struct dev_filter *lvm_type_filter_creat
 void lvm_type_filter_destroy(struct dev_filter *f);
 
 int md_major(void);
+int blkext_major(void);
 int max_partitions(int major);
 
 #endif
--- LVM2.2.02.51.old/WHATS_NEW	2009-08-06 19:08:01.000000000 +0200
+++ LVM2.2.02.51/WHATS_NEW	2009-08-24 14:14:06.000000000 +0200
@@ -1,3 +1,7 @@
+Version 2.02.52 -
+=================================
+  Fix pvcreate on a partition (2.02.51).
+
 Version 2.02.51 - 6th August 2009
 =================================
   Fix locking in clvmd (2.02.50).

lvm2-2_02_52-fix-pvs-global-lock.patch:
 WHATS_NEW       |    1 +
 tools/toollib.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE lvm2-2_02_52-fix-pvs-global-lock.patch ---
--- LVM2.2.02.51.old/tools/toollib.c	2009-07-21 13:10:49.000000000 +0200
+++ LVM2.2.02.51/tools/toollib.c	2009-08-24 14:15:08.000000000 +0200
@@ -643,7 +643,7 @@ int process_each_pv(struct cmd_context *
 
 	dm_list_init(&tags);
 
-	if (lock_global && !lock_vol(cmd, VG_GLOBAL, LCK_READ)) {
+	if (lock_global && !lock_vol(cmd, VG_GLOBAL, LCK_VG_READ)) {
 		log_error("Unable to obtain global lock.");
 		return ECMD_FAILED;
 	}
--- LVM2.2.02.51.old/WHATS_NEW	2009-08-24 14:14:58.000000000 +0200
+++ LVM2.2.02.51/WHATS_NEW	2009-08-24 14:15:25.000000000 +0200
@@ -1,5 +1,6 @@
 Version 2.02.52 -
 =================================
+  Fix global locking in PV reporting commands (2.02.49).
   Fix pvcreate on a partition (2.02.51).
 
 Version 2.02.51 - 6th August 2009


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- lvm2.spec	6 Aug 2009 19:48:20 -0000	1.169
+++ lvm2.spec	24 Aug 2009 12:23:10 -0000	1.170
@@ -8,7 +8,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.51
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -16,6 +16,8 @@ Source0: ftp://sources.redhat.com/pub/lv
 
 # Customise lvmconf.sh for built-in clustered locking in Fedora
 Patch0: cluster-locking-built-in.patch
+Patch1: lvm2-2_02_52-fix-pvcreate-partition.patch
+Patch2: lvm2-2_02_52-fix-pvs-global-lock.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -41,6 +43,8 @@ or more physical volumes and creating on
 %prep
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .locking
+%patch1 -p1 -b .partition
+%patch2 -p1 -b .globallock
 
 %build
 %define _exec_prefix /
@@ -48,7 +52,7 @@ or more physical volumes and creating on
 %define _sbindir /sbin
 %define _libdir /%{_lib}
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=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
+%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
 make %{?_smp_mflags}
 
 %install
@@ -306,6 +310,11 @@ This package contains the device-mapper 
 
 
 %changelog
+* Mon Aug 24 2009 Milan Broz <mbroz at redhat.com> - 2.02.51-3
+- Fix global locking in PV reporting commands (2.02.49).
+- Fix pvcreate on a partition (2.02.51).
+- Build clvmd with both cman and corosync support.
+
 * Thu Aug 6 2009 Alasdair Kergon <agk at redhat.com> - 2.02.51-2
 - Fix clvmd locking broken in 2.02.50-1.
 - Only change LV /dev symlinks on ACTIVATE not PRELOAD (so not done twice).



From pmachata at fedoraproject.org  Mon Aug 24 12:26:18 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 24 Aug 2009 12:26:18 +0000 (UTC)
Subject: rpms/flex/devel flex.spec,1.59,1.60
Message-ID: <20090824122618.46BBF11C0044@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13283

Modified Files:
	flex.spec 
Log Message:
- Fix installation with --excludedocs
- Resolves: #515928



Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- flex.spec	24 Jul 2009 22:53:10 -0000	1.59
+++ flex.spec	24 Aug 2009 12:26:18 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -55,11 +55,15 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %find_lang flex
 
 %post
-/sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||:
+if [ -f %{_infodir}/flex.info.gz ]; then # for --excludedocs
+   /sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||:
+fi
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
+    if [ -f %{_infodir}/flex.info.gz ]; then # for --excludedocs
+	/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir ||:
+    fi
 fi
 
 %check
@@ -80,6 +84,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_infodir}/flex.info*
 
 %changelog
+* Mon Aug 24 2009 Petr Machata <pmachata at redhat.com> - 2.5.35-7
+- Fix installation with --excludedocs
+- Resolves: #515928
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.35-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Aug 24 12:38:40 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 24 Aug 2009 12:38:40 +0000 (UTC)
Subject: rpms/perl/devel perl.spec,1.229,1.230
Message-ID: <20090824123840.23D8711C0044@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15577

Modified Files:
	perl.spec 
Log Message:
- Remove -DDEBUGGING=-g, we are not ready yet.


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- perl.spec	23 Aug 2009 18:16:14 -0000	1.229
+++ perl.spec	24 Aug 2009 12:38:39 -0000	1.230
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        79%{?dist}
+Release:        80%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1091,9 +1091,9 @@ sed -i "s|LIB             = ./zlib-src|L
 echo "RPM Build arch: %{_arch}"
 
 # use "lib", not %{_lib}, for privlib, sitelib, and vendorlib
+# To build production version, we would need -DDEBUGGING=-g
 
 /bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
-	-DDEBUGGING=-g \
 	-Accflags="-DPERL_USE_SAFE_PUTENV" \
         -Dversion=%{perl_version} \
         -Dmyhostname=localhost \
@@ -1939,6 +1939,9 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-80
+- Remove -DDEBUGGING=-g, we are not ready yet.
+
 * Fri Aug 21 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-79
 - add helper filtering macros to -devel, for perl-* package invocation
   (#502402)



From dnovotny at fedoraproject.org  Mon Aug 24 12:56:14 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon, 24 Aug 2009 12:56:14 +0000 (UTC)
Subject: rpms/emacs/F-11 emacs.spec,1.127,1.128
Message-ID: <20090824125614.468BA11C0044@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18390

Modified Files:
	emacs.spec 
Log Message:
adding alsa-lib-devel to BuildRequires




Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- emacs.spec	3 Aug 2009 08:48:09 -0000	1.127
+++ emacs.spec	24 Aug 2009 12:56:11 -0000	1.128
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -33,6 +33,7 @@ BuildRequires: libjpeg-devel, libtiff-de
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
 BuildRequires: autoconf, automake, bzip2, cairo, texinfo
 BuildRequires: librsvg2-devel
+BuildRequires: alsa-lib-devel, libotf
 Requires: librsvg2
 %ifarch %{ix86}
 BuildRequires: setarch
@@ -372,6 +373,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Aug 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-2
+- added alsa to BuildRequires (#518659), also libotf
+
 * Mon Aug 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-1
 - new upstream version 23.1
 



From caolanm at fedoraproject.org  Mon Aug 24 13:03:19 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 24 Aug 2009 13:03:19 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes62.patch, NONE,
	1.1 openoffice.org.spec, 1.1990,
	1.1991 openoffice.org-3.1.1.ooo104306.moverecentlyused.patch,
	1.2, NONE openoffice.org-3.1.1.oooXXXXX.dmake.patch, 1.7, NONE
Message-ID: <20090824130319.AC97E11C0044@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19899

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes62.patch 
Removed Files:
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch 
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
rebuild against now 64bit-safe unixODBC headers

workspace.cmcfixes62.patch:
 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx               |    1 
 binfilter/prj/build.lst                                     |    2 
 connectivity/source/drivers/odbcbase/OConnection.cxx        |    2 
 connectivity/source/drivers/odbcbase/OPreparedStatement.cxx |   16 -
 connectivity/source/drivers/odbcbase/OResultSet.cxx         |    6 
 connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx |    8 
 connectivity/source/drivers/odbcbase/OStatement.cxx         |    8 
 connectivity/source/drivers/odbcbase/OTools.cxx             |   70 ++---
 connectivity/source/inc/odbc/OFunctiondefs.hxx              |    8 
 connectivity/source/inc/odbc/OFunctions.hxx                 |   44 +--
 connectivity/source/inc/odbc/OResultSet.hxx                 |    2 
 connectivity/source/inc/odbc/OResultSetMetaData.hxx         |    4 
 connectivity/source/inc/odbc/OStatement.hxx                 |    2 
 connectivity/source/inc/odbc/OTools.hxx                     |   12 
 dbaccess/source/ui/dlg/odbcconfig.cxx                       |    8 
 dmake/dag.c                                                 |    9 
 dmake/expand.c                                              |   26 +-
 dmake/getinp.c                                              |    6 
 dmake/make.c                                                |   15 -
 dmake/path.c                                                |   10 
 dmake/rulparse.c                                            |    5 
 postprocess/prj/build.lst                                   |    2 
 sfx2/inc/pch/precompiled_sfx2.hxx                           |    1 
 sfx2/source/appl/sfxpicklist.cxx                            |    4 
 sfx2/source/doc/objstor.cxx                                 |    3 
 sfx2/util/makefile.mk                                       |    1 
 shell/inc/systemshell.hxx                                   |   53 ----
 shell/prj/build.lst                                         |    3 
 shell/prj/d.lst                                             |    4 
 shell/source/unix/sysshell/makefile.mk                      |    4 
 shell/source/unix/sysshell/recently_used_file_handler.cxx   |    1 
 shell/source/unix/sysshell/systemshell.cxx                  |  151 ------------
 solenv/inc/libs.mk                                          |    2 
 vcl/aqua/inc/salinst.h                                      |    2 
 vcl/aqua/source/app/salinst.cxx                             |   55 ++++
 vcl/inc/vcl/salinst.hxx                                     |    1 
 vcl/inc/vcl/svapp.hxx                                       |   14 +
 vcl/os2/inc/salinst.h                                       |    1 
 vcl/os2/source/app/salinst.cxx                              |    4 
 vcl/source/app/svapp.cxx                                    |    6 
 vcl/unx/gtk/app/gtkinst.cxx                                 |   21 +
 vcl/unx/headless/svpinst.cxx                                |    4 
 vcl/unx/headless/svpinst.hxx                                |    2 
 vcl/unx/inc/plugins/gtk/gtkinst.hxx                         |    1 
 vcl/unx/inc/salinst.h                                       |    1 
 vcl/unx/source/app/salinst.cxx                              |   20 +
 vcl/win/inc/salinst.h                                       |    1 
 vcl/win/source/app/salinst.cxx                              |   23 +
 48 files changed, 298 insertions(+), 351 deletions(-)

--- NEW FILE workspace.cmcfixes62.patch ---
Index: dbaccess/source/ui/dlg/odbcconfig.cxx
===================================================================
--- dbaccess/source/ui/dlg/odbcconfig.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ dbaccess/source/ui/dlg/odbcconfig.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -82,7 +82,7 @@
 // so don't touch this
 #if defined(WIN) || defined(WNT)
 #define SQL_API __stdcall
-// At least under some circumstances, the below #include <odbc/sqlext.h> re-
+// At least under some circumstances, the below #include <sqlext.h> re-
 // defines SQL_API to an empty string, leading to a compiler warning on MSC; to
 // not break the current behavior, this is worked around by locally disabling
 // that warning:
@@ -97,13 +97,7 @@
 #define DONT_TD_VOID
 #endif
 
-#ifdef SYSTEM_ODBC_HEADERS
 #include <sqlext.h>
-#else
-#ifndef __SQLEXT_H
-#include <odbc/sqlext.h>
-#endif
-#endif
 
 #if defined(WIN) || defined(WNT)
 #if defined _MSC_VER
Index: sfx2/source/doc/objstor.cxx
===================================================================
--- sfx2/source/doc/objstor.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/source/doc/objstor.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -99,7 +99,6 @@
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <shell/systemshell.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/documentconstants.hxx>
@@ -821,7 +820,7 @@
                 if ( aUrl.GetProtocol() == INET_PROT_FILE )
                 {
                     const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
-                    SystemShell::AddToRecentDocumentList(
+                    Application::AddToRecentDocumentList(
                         aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
                         (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
                 }
Index: sfx2/source/appl/sfxpicklist.cxx
===================================================================
--- sfx2/source/appl/sfxpicklist.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/source/appl/sfxpicklist.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -43,8 +43,6 @@
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <shell/systemshell.hxx>
-
 // ----------------------------------------------------------------------------
 
 #include <sfx2/app.hxx>
@@ -470,7 +468,7 @@
                 pDocSh->Get_Impl()->bWaitingForPicklist = sal_False;
 
                 if ( aURL.GetProtocol() == INET_PROT_FILE )
-                    SystemShell::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
+                    Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
 			}
             break;
 		}
Index: sfx2/inc/pch/precompiled_sfx2.hxx
===================================================================
--- sfx2/inc/pch/precompiled_sfx2.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/inc/pch/precompiled_sfx2.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -484,7 +484,6 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
 #include "sj2/sjapplet.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
Index: sfx2/util/makefile.mk
===================================================================
--- sfx2/util/makefile.mk	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/util/makefile.mk	(.../cws/cmcfixes62)	(revision 275310)
@@ -91,7 +91,6 @@
 		$(TOOLSLIB) \
 		$(I18NISOLANGLIB) \
 		$(SAXLIB) \
-		$(SYSSHELLLIB) \
 		$(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
 		$(CPPUHELPERLIB) \
Index: vcl/source/app/svapp.cxx
===================================================================
--- vcl/source/app/svapp.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/source/app/svapp.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -1989,6 +1989,12 @@
     return SalGetDesktopEnvironment();
 }
 
+void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    ImplSVData* pSVData = ImplGetSVData();
+    pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
+}
+
 BOOL Application::IsAccessibilityEnabled()
 {
     return FALSE;
Index: vcl/os2/source/app/salinst.cxx
===================================================================
--- vcl/os2/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/os2/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -811,6 +811,10 @@
 	return (void*) "";
 }
 
+void Os2SalInstance::AddToRecentDocumentList(const rtl::OUString& /*rFileUrl*/, const rtl::OUString& /*rMimeType*/)
+{
+}
+
 // -----------------------------------------------------------------------
 
 SalTimer* Os2SalInstance::CreateSalTimer()
Index: vcl/os2/inc/salinst.h
===================================================================
--- vcl/os2/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/os2/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -96,6 +96,7 @@
     virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void				AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSalFrameStyle );
Index: vcl/aqua/source/app/salinst.cxx
===================================================================
--- vcl/aqua/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/aqua/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -55,6 +55,14 @@
 #include "saltimer.h"
 #include "vclnsapp.h"
 
+#include <comphelper/processfactory.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
+#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include "premac.h"
 #include <Foundation/Foundation.h>
 #include <ApplicationServices/ApplicationServices.h>
@@ -64,6 +72,7 @@
 
 
 using namespace std;
+using namespace ::com::sun::star;
 
 extern BOOL ImplSVMain();
 
@@ -1017,6 +1026,52 @@
 	return (void*)"";
 }
 
+// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
+// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+{
+    rtl::OUString extUrl;
+        
+    uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
+    if (sm.is())
+    {
+        uno::Reference< beans::XPropertySet > pset;
+        sm->queryInterface( getCppuType( &pset )) >>= pset;
+        if (pset.is())
+        {
+            uno::Reference< uno::XComponentContext > context;
+            static const rtl::OUString DEFAULT_CONTEXT( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) );
+            pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
+            if (context.is())
+                extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl);
+        }
+    }
+    return extUrl;
+}
+
+void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+    // Convert file URL for external use (see above)
+    rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
+    if( 0 == externalUrl.getLength() )
+        externalUrl = rFileUrl;
+    
+    if( externalUrl.getLength() )
+    {
+        NSString* pString = [[NSString alloc] initWithCharacters: externalUrl.getStr() length: externalUrl.getLength()];
+        NSURL* pURL = [NSURL URLWithString: pString];
+
+        if( pURL )
+        {
+            NSDocumentController* pCtrl = [NSDocumentController sharedDocumentController];
+            [pCtrl noteNewRecentDocumentURL: pURL];
+        }
+        if( pString )
+            [pString release];
+    }
+}
+
+
 // -----------------------------------------------------------------------
 
 SalTimer* AquaSalInstance::CreateSalTimer()
Index: vcl/aqua/inc/salinst.h
===================================================================
--- vcl/aqua/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/aqua/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -143,9 +143,11 @@
     virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
     virtual void            SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
     virtual void            SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
 
+
     static void handleAppDefinedEvent( NSEvent* pEvent );
     
     // check whether a particular string is passed on the command line
Index: vcl/inc/vcl/salinst.hxx
===================================================================
--- vcl/inc/vcl/salinst.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/inc/vcl/salinst.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -171,6 +171,7 @@
 
     enum ConnectionIdentifierType { AsciiCString, Blob };
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
+    virtual void        AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
 };
 
 // called from SVMain
Index: vcl/inc/vcl/svapp.hxx
===================================================================
--- vcl/inc/vcl/svapp.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/inc/vcl/svapp.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -479,6 +479,20 @@
      */
     static const ::rtl::OUString& GetDesktopEnvironment();
 
+    /** Add a file to the system shells recent document list if there is any.
+          This function may have no effect under Unix because there is no 
+          standard API among the different desktop managers.
+          
+          @param rFileUrl
+                    The file url of the document.
+                    
+          @param rMimeType
+          The mime content type of the document specified by aFileUrl.
+          If an empty string will be provided "application/octet-stream"
+          will be used.
+    */
+    static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
 private:
 
     DECL_STATIC_LINK( Application, PostEventHandler, void* );
Index: vcl/unx/source/app/salinst.cxx
===================================================================
--- vcl/unx/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <osl/module.hxx>
 #include <salunx.h>
 
 #ifndef _VOS_MUTEX_HXX
@@ -276,3 +276,21 @@
 {
 	delete pFrame;
 }
+
+extern "C" { static void SAL_CALL thisModule() {} }
+
+void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST(RTL_CONSTASCII_USTRINGPARAM("add_to_recently_used_file_list"));
+    const rtl::OUString LIB_RECENT_FILE(RTL_CONSTASCII_USTRINGPARAM("librecentfile.so"));
+    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
+
+    PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
+
+    osl::Module module;
+    module.loadRelative( &thisModule, LIB_RECENT_FILE );
+    if (module.is())
+        add_to_recently_used_file_list = (PFUNC_ADD_TO_RECENTLY_USED_LIST)module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST);
+    if (add_to_recently_used_file_list)
+        add_to_recently_used_file_list(rFileUrl, rMimeType);
+}
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
--- vcl/unx/gtk/app/gtkinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/gtk/app/gtkinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -206,6 +206,27 @@
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
+void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+#if GTK_CHECK_VERSION(2,10,0)
+    GtkRecentManager *manager = gtk_recent_manager_get_default ();
+    gtk_recent_manager_add_item (manager, rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+    (void)rMimeType;
+#else
+    static void * (* sym_gtk_recent_manager_get_default) () =
+        (void * (*)())dlsym(NULL, "gtk_recent_manager_get_default");
+    static void   (* sym_gtk_recent_manager_add_item) (void *, const char *) = 
+        (void (*)(void *, const char*))dlsym(NULL, "gtk_recent_manager_add_item");
+    if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item)
+    {
+        sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(),
+            rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+    }
+    else
+        X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType);
+#endif
+}
+
 GtkYieldMutex::GtkYieldMutex()
 {
 }
Index: vcl/unx/headless/svpinst.cxx
===================================================================
--- vcl/unx/headless/svpinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/headless/svpinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -504,6 +504,10 @@
 	}
 }
 
+void SvpSalInstance::AddToRecentDocumentList(const rtl::OUString&, const rtl::OUString&)
+{
+}
+
 SvpSalTimer::~SvpSalTimer()
 {
 }
Index: vcl/unx/headless/svpinst.hxx
===================================================================
--- vcl/unx/headless/svpinst.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/headless/svpinst.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -193,6 +193,8 @@
     virtual SalSession*		CreateSalSession();
 
     virtual void*			GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 #endif // _SV_SALINST_HXX
Index: vcl/unx/inc/plugins/gtk/gtkinst.hxx
===================================================================
--- vcl/unx/inc/plugins/gtk/gtkinst.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/inc/plugins/gtk/gtkinst.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -91,6 +91,7 @@
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
     virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
     virtual SalSystem*			CreateSalSystem();
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 class GtkSalSystem : public X11SalSystem
Index: vcl/unx/inc/salinst.h
===================================================================
--- vcl/unx/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -115,6 +115,7 @@
 
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
 
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
     bool isPrinterInit() const 
     {
Index: vcl/win/source/app/salinst.cxx
===================================================================
--- vcl/win/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/win/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -39,7 +39,7 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
-
+#include <osl/file.hxx>
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <wincomp.hxx>
@@ -70,6 +70,7 @@
 #include <GdiPlus.h>
 #include <GdiPlusEnums.h>
 #include <GdiPlusColor.h>
+#include <Shlobj.h>
 
 #if defined _MSC_VER
 #pragma warning(pop)
@@ -1089,6 +1090,26 @@
 
 // -----------------------------------------------------------------------
 
+/** Add a file to the system shells recent document list if there is any.
+      This function may have no effect under Unix because there is no 
+      standard API among the different desktop managers.
+      
+      @param aFileUrl
+                The file url of the document.
+*/
+void WinSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+    rtl::OUString system_path;
+    osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(rFileUrl, system_path);
+    
+    OSL_ENSURE(osl::FileBase::E_None == rc, "Invalid file url");
+    
+    if (osl::FileBase::E_None == rc)
+        SHAddToRecentDocs(SHARD_PATHW, system_path.getStr());        
+}
+
+// -----------------------------------------------------------------------
+
 SalTimer* WinSalInstance::CreateSalTimer()
 {
 	return new WinSalTimer();
Index: vcl/win/inc/salinst.h
===================================================================
--- vcl/win/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/win/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -88,6 +88,7 @@
     virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
     static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
 };
Index: shell/source/unix/sysshell/systemshell.cxx
===================================================================
--- shell/source/unix/sysshell/systemshell.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/source/unix/sysshell/systemshell.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,151 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: systemshell.cxx,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_shell.hxx"
-#include "systemshell.hxx"
-
-#include <comphelper/processfactory.hxx>
-
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_Hpp_
-#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
-#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include "osl/module.hxx"
-
-using namespace ::com::sun::star;
-
-#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
-
-const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST = UNISTRING("add_to_recently_used_file_list");
-const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so");
-const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext");
-
-void * (* sym_gtk_recent_manager_get_default) () = NULL;
-void   (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL;
-
-// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
-// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
-{
-	rtl::OUString extUrl;
-		
-	uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
-	if (sm.is())
-	{
-		uno::Reference< beans::XPropertySet > pset;
-		sm->queryInterface( getCppuType( &pset )) >>= pset;
-		if (pset.is())
-		{
-			uno::Reference< uno::XComponentContext > context;
-			pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
-			if (context.is())
-				extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl);
-		}
-	}
-	return extUrl;
-}
-
-namespace SystemShell {
-    
-    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
-        
-    //##############################
-    rtl::OUString get_absolute_library_url(const rtl::OUString& /*lib_name*/)
-    {
-        rtl::OUString url;
-        if (osl::Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(AddToRecentDocumentList), url))
-        {        
-            sal_Int32 index = url.lastIndexOf('/');
-            url = url.copy(0, index + 1);
-            url += LIB_RECENT_FILE;
-        }
-        return url;
-    }
-    
-    bool init_recent_manager_api()
-    {
-        oslModule hDefault;
-        if( osl_getModuleHandle( NULL, &hDefault ) )
-        {
-            sym_gtk_recent_manager_get_default = (void * (*)())
-                osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default");
-            sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) 
-                osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item");
-            
-        }
-        bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item);
-        return ret;
-    }
-            
-    
-    //##############################
-    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType)
-    {
-        static bool bIsRecentManagerPresent = init_recent_manager_api();
-        
-        // Convert file URL for external use (see above)
-        rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
-        if( 0 == externalUrl.getLength() )
-            externalUrl = aFileUrl;
-        
-        if( bIsRecentManagerPresent )
-        {
-            void * recent_manager = sym_gtk_recent_manager_get_default();
-            sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr());
-        }
-        else
-        {
-            rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
-        
-            if (librecentfile_url.getLength())
-            {
-                osl::Module module(librecentfile_url);
-
-                if (module.is())
-                {
-                    // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
-                    // not allowed in gcc 3.3 without permissive.
-                    PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 
-                        reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
-                
-                    if (add_to_recently_used_file_list)
-                        add_to_recently_used_file_list(aFileUrl, aMimeType);
-                }
-            }
-        }        
-    }
-    
-} // namespace SystemShell
-
Index: shell/source/unix/sysshell/recently_used_file_handler.cxx
===================================================================
--- shell/source/unix/sysshell/recently_used_file_handler.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
  
-#include "systemshell.hxx"
 #include "osl/process.h"
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
Index: shell/source/unix/sysshell/makefile.mk
===================================================================
--- shell/source/unix/sysshell/makefile.mk	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/source/unix/sysshell/makefile.mk	(.../cws/cmcfixes62)	(revision 275310)
@@ -48,10 +48,6 @@
 
 .IF "$(OS)" != "MACOSX"
 
-LIB1OBJFILES=$(SLO)$/systemshell.obj
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
-
 SLOFILES=$(SLO)$/recently_used_file.obj \
          $(SLO)$/recently_used_file_handler.obj
 
Index: shell/inc/systemshell.hxx
===================================================================
--- shell/inc/systemshell.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/inc/systemshell.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: systemshell.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SYSTEMSHELL_HXX_
-#define _SYSTEMSHELL_HXX_
-
-#include <rtl/ustring.hxx>
-
-namespace SystemShell
-{
-    /** Add a file to the system shells recent document list if there is any.
-          This function may have no effect under Unix because there is no 
-          standard API among the different desktop managers.
-          
-          @param aFileUrl
-                    The file url of the document.
-					
-		  @param aMimeType
-		  The mime content type of the document specified by aFileUrl.
-		  If an empty string will be provided "application/octet-stream"
-		  will be used.
-    */
-    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType);
-}
-
-#endif
Index: shell/prj/build.lst
===================================================================
--- shell/prj/build.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/prj/build.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -10,9 +10,6 @@
 sl    shell\source\cmdmail                         nmake   -   p   sl_cmdmail sl_inc NULL
 sl    shell\source\all                             nmake   -   all sl_all sl_inc NULL
 sl    shell\source\unix\sysshell                   nmake   -   u   sl_unix_sysshell sl_all sl_inc NULL
-sl    shell\source\aqua\sysshell                   nmake   -   u   sl_aqua_sysshell sl_all sl_inc NULL
-sl    shell\source\win32\sysshell                  nmake   -   w   sl_win32_sysshell sl_inc NULL
-sl    shell\source\os2\sysshell                    nmake   -   p   sl_os2_sysshell sl_inc NULL
 sl    shell\source\tools\lngconvex                 nmake   -   w   sl_win32_lngconv sl_inc NULL
 sl    shell\source\tools\regsvrex                  nmake   -   w   sl_win32_regsvrex  sl_inc NULL
 sl    shell\source\all\zipfile                     nmake   -   w   sl_all_zipfile  sl_inc NULL
Index: shell/prj/d.lst
===================================================================
--- shell/prj/d.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/prj/d.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,7 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\shell
-
-..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx
-
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
Index: connectivity/source/inc/odbc/OResultSet.hxx
===================================================================
--- connectivity/source/inc/odbc/OResultSet.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OResultSet.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -128,7 +128,7 @@
 			typedef ::std::vector<ORowSetValue>			TDataRow;
 
 			TVoidVector									m_aBindVector;
-			::std::vector<sal_Int32>					m_aLengthVector;
+			::std::vector<SQLLEN>						m_aLengthVector;
             ::std::map<sal_Int32,SWORD>					m_aODBCColumnTypes;
 			::com::sun::star::uno::Sequence<sal_Int8>	m_aBookmark;
 
Index: connectivity/source/inc/odbc/OResultSetMetaData.hxx
===================================================================
--- connectivity/source/inc/odbc/OResultSetMetaData.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OResultSetMetaData.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -80,13 +80,13 @@
 			virtual ~OResultSetMetaData();
 
 
-            static  SWORD getNumColAttrib(OConnection* _pConnection
+            static SQLLEN getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-            static SWORD getColumnODBCType(OConnection* _pConnection
+            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
Index: connectivity/source/inc/odbc/OTools.hxx
===================================================================
--- connectivity/source/inc/odbc/OTools.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OTools.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -197,7 +197,7 @@
 			static ::rtl::OUString getStringValue(	OConnection* _pConnection,	
 													SQLHANDLE _aStatementHandle,
 													sal_Int32 columnIndex,
-													SWORD  _fSqlType,
+													SQLSMALLINT _fSqlType,
 													sal_Bool &_bWasNull,
 													const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 													rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -205,7 +205,7 @@
 			static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,	
 																			SQLHANDLE _aStatementHandle,
 																			sal_Int32 columnIndex,
-																			SWORD  _fSqlType,
+																			SQLSMALLINT _fSqlType,
 																			sal_Bool &_bWasNull,
 																			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 			static void getValue(	OConnection* _pConnection,	
@@ -215,7 +215,7 @@
 									sal_Bool &_bWasNull,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 									void* _pValue,
-									SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+									SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
 			/** 
 				bindData copies the from pValue to pData
@@ -229,10 +229,10 @@
 			static void bindData(	SQLSMALLINT _nOdbcType,
 									sal_Bool _bUseWChar,
 									sal_Int8 *&_pData,
-									SQLINTEGER*& pLen,
+									SQLLEN*& pLen,
 									const void* _pValue,
 									rtl_TextEncoding _nTextEncoding,
-									SQLUINTEGER& _nColumnSize);
+									SQLULEN& _nColumnSize);
 
 			static void bindParameter(	OConnection* _pConnection,	
 										SQLHANDLE _hStmt,
@@ -254,7 +254,7 @@
 									SQLSMALLINT _nMaxLen,
 									const void* _pValue,
 									void*		_pData,
-									SQLINTEGER *pLen,
+									SQLLEN *pLen,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 									rtl_TextEncoding _nTextEncoding,
 									sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
Index: connectivity/source/inc/odbc/OStatement.hxx
===================================================================
--- connectivity/source/inc/odbc/OStatement.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OStatement.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -130,7 +130,7 @@
 			*/
 			virtual OResultSet* createResulSet();
 
-            sal_Int32 getRowCount () throw( ::com::sun::star::sdbc::SQLException);
+            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
 
 
 			void disposeResultSet();
Index: connectivity/source/inc/odbc/OFunctiondefs.hxx
===================================================================
--- connectivity/source/inc/odbc/OFunctiondefs.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OFunctiondefs.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -41,7 +41,7 @@
 
 // just to go with calling convention of windows
 #define SQL_API __stdcall
-#include <odbc/sqlext.h>
+#include <sqlext.h>
 #undef SQL_API
 #define SQL_API __stdcall
 
@@ -67,7 +67,7 @@
 #define ALLREADY_HAVE_OS2_TYPES
 #define DONT_TD_VOID
 #include <svpm.h>
-#include <odbc/sqlext.h>
+#include <sqlext.h>
 #define SDB_ODBC_CHAR UCHAR
 #endif // OS2
 
@@ -135,11 +135,7 @@
 #endif
 #define CALLBACK
 #define EXPORT
-#ifdef SYSTEM_ODBC_HEADERS
 #include <sqlext.h>
-#else
-#include <odbc/sqlext.h>
-#endif
 #undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal
 			// definiert.
 
Index: connectivity/source/inc/odbc/OFunctions.hxx
===================================================================
--- connectivity/source/inc/odbc/OFunctions.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OFunctions.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -187,7 +187,7 @@
 													SQLSMALLINT *		StringLengthPtr,
 													SQLSMALLINT *		TypePtr,
 													SQLSMALLINT *		SubTypePtr,
-													SQLINTEGER *		LengthPtr,
+													SQLLEN *			LengthPtr,
 													SQLSMALLINT *		PrecisionPtr,
 													SQLSMALLINT *		ScalePtr,
 													SQLSMALLINT *		NullablePtr);
@@ -203,8 +203,8 @@
 													SQLSMALLINT			Precision,
 													SQLSMALLINT			Scale,
 													SQLPOINTER			DataPtr,
-													SQLINTEGER *		StringLengthPtr,
-													SQLINTEGER *		IndicatorPtr);
+													SQLLEN *			StringLengthPtr,
+													SQLLEN *			IndicatorPtr);
 
 	#define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
 	*/
@@ -221,11 +221,11 @@
 													SQLSMALLINT			InputOutputType,
 													SQLSMALLINT			ValueType,
 													SQLSMALLINT			ParameterType,
-													SQLUINTEGER			ColumnSize,
+													SQLULEN				ColumnSize,
 													SQLSMALLINT			DecimalDigits,
 													SQLPOINTER			ParameterValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
 
@@ -266,7 +266,7 @@
 	typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT			StatementHandle,
 													SQLUSMALLINT		ParameterNumber,
 													SQLSMALLINT *		DataTypePtr,
-													SQLUINTEGER *		ParameterSizePtr,
+													SQLULEN *			ParameterSizePtr,
 													SQLSMALLINT *		DecimalDigitsPtr,
 													SQLSMALLINT *		NullablePtr);
 
@@ -284,13 +284,13 @@
 
 	typedef SQLRETURN  (SQL_API  *T3SQLPutData) (		SQLHSTMT			StatementHandle,
 													SQLPOINTER			DataPtr,
-													SQLINTEGER			StrLen_or_Ind);
+													SQLLEN				StrLen_or_Ind);
 
 	#define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
 
 	// Retrieving results and information about results
 	typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (	SQLHSTMT			StatementHandle,
-													SQLINTEGER *		RowCountPtr);
+													SQLLEN *			RowCountPtr);
 
 	#define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
 
@@ -300,12 +300,12 @@
 	#define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (	SQLHSTMT			StatementHandle,
-													SQLSMALLINT			ColumnNumber,
+													SQLUSMALLINT		ColumnNumber,
 													SQLCHAR *			ColumnName,
 													SQLSMALLINT			BufferLength,
 													SQLSMALLINT *		NameLengthPtr,
 													SQLSMALLINT *		DataTypePtr,
-													SQLUINTEGER *		ColumnSizePtr,
+													SQLULEN *			ColumnSizePtr,
 													SQLSMALLINT *		DecimalDigitsPtr,
 													SQLSMALLINT *		NullablePtr);
 
@@ -317,7 +317,7 @@
 													SQLPOINTER			CharacterAttributePtr,
 													SQLSMALLINT			BufferLength,
 													SQLSMALLINT *		StringLengthPtr,
-													SQLPOINTER			NumericAttributePtr);
+													SQLLEN *			NumericAttributePtr);
 
 	#define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
 
@@ -325,8 +325,8 @@
 													SQLUSMALLINT		ColumnNumber,
 													SQLSMALLINT			TargetType,
 													SQLPOINTER			TargetValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
 
@@ -336,7 +336,7 @@
 
 	typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (	SQLHSTMT			StatementHandle,
 													SQLSMALLINT			FetchOrientation,
-													SQLINTEGER			FetchOffset);
+													SQLLEN				FetchOffset);
 
 	#define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
 
@@ -344,20 +344,20 @@
 													SQLUSMALLINT		ColumnNumber,
 													SQLSMALLINT			TargetType,
 													SQLPOINTER			TargetValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (		SQLHSTMT			StatementHandle,
-													SQLUSMALLINT		RowNumber,
+													SQLSETPOSIROW		RowNumber,
 													SQLUSMALLINT		Operation,
 													SQLUSMALLINT		LockType);
 
 	#define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (	SQLHSTMT		StatementHandle,
-														SQLUSMALLINT	Operation);
+														SQLSMALLINT	Operation);
 
 	#define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
 
@@ -461,15 +461,15 @@
 	#define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT			StatementHandle,
-													SQLSMALLINT			IdentifierType,
+													SQLUSMALLINT		IdentifierType,
 													SQLCHAR *			CatalogName,
 													SQLSMALLINT			NameLength1,
 													SQLCHAR *			SchemaName,
 													SQLSMALLINT			NameLength2,
 													SQLCHAR *			TableName,
 													SQLSMALLINT			NameLength3,
-													SQLSMALLINT			Scope,
-													SQLSMALLINT			Nullable);
+													SQLUSMALLINT		Scope,
+													SQLUSMALLINT		Nullable);
 
 	#define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
 
Index: connectivity/source/drivers/odbcbase/OConnection.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OConnection.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OConnection.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -108,7 +108,7 @@
 	SQLRETURN nSQLRETURN = 0;
 	SDB_ODBC_CHAR szConnStrOut[4096];
 	SDB_ODBC_CHAR szConnStrIn[2048];
-	SWORD cbConnStrOut;
+	SQLSMALLINT cbConnStrOut;
 	memset(szConnStrOut,'\0',4096);
 	memset(szConnStrIn,'\0',2048);
 	::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding()));
Index: connectivity/source/drivers/odbcbase/OTools.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OTools.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OTools.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -56,16 +56,16 @@
 						sal_Bool &_bWasNull,
 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 						void* _pValue,
-						SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+						SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::getValue" );
-	SQLINTEGER pcbValue = SQL_NULL_DATA;
+	SQLLEN pcbValue = SQL_NULL_DATA;
 	OTools::ThrowException(_pConnection,
 							(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 										(SQLUSMALLINT)columnIndex,
 										_nType,
 										_pValue,
-										(SQLINTEGER)_rSize,
+										_nSize,
 										&pcbValue),
 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
 	_bWasNull = pcbValue == SQL_NULL_DATA;
@@ -86,12 +86,12 @@
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::bindParameter" );
 	SQLRETURN nRetcode;
-	SWORD   fSqlType;
-	SWORD   fCType;
-	SDWORD  nMaxLen = 0;
+	SQLSMALLINT fSqlType;
+	SQLSMALLINT fCType;
+	SQLLEN  nMaxLen = 0;
 	//	void*&   pData   = pDataBuffer;
-	SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
-	SQLUINTEGER nColumnSize=0;
+	SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
+	SQLULEN nColumnSize=0;
 	SQLSMALLINT	nDecimalDigits=0;
 
 	OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
@@ -123,10 +123,10 @@
 void OTools::bindData(	SQLSMALLINT _nOdbcType,
 						sal_Bool _bUseWChar,
 						sal_Int8 *&_pData,
-						SQLINTEGER*& pLen,
+						SQLLEN*& pLen,
 						const void* _pValue,
 						rtl_TextEncoding _nTextEncoding,
-						SQLUINTEGER& _nColumnSize)
+						SQLULEN& _nColumnSize)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::bindData" );
 	_nColumnSize = 0;
@@ -222,7 +222,7 @@
 			{
 				sal_Int32 nLen = 0;
                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-				*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+				*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 			}
 			break;
 		case SQL_LONGVARCHAR:
@@ -235,21 +235,21 @@
 				::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
 				nLen = aString.getLength();
 			}
-			*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+			*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 		}   break;
 		case SQL_DATE:
 			*(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(DATE_STRUCT);
+			*pLen = (SQLLEN)sizeof(DATE_STRUCT);
 			_nColumnSize = 10;
 			break;
 		case SQL_TIME:
 			*(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(TIME_STRUCT);
+			*pLen = (SQLLEN)sizeof(TIME_STRUCT);
 			_nColumnSize = 8;
 			break;
 		case SQL_TIMESTAMP:
 			*(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
+			*pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
 			_nColumnSize = 19;
 			break;
 	}
@@ -262,7 +262,7 @@
 						SQLSMALLINT _nMaxLen,
 						const void* _pValue,
 						void* _pData,
-						SQLINTEGER *pLen,
+						SQLLEN *pLen,
 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 						rtl_TextEncoding _nTextEncoding,
 						sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -271,7 +271,7 @@
 	SQLRETURN nRetcode;
 	SQLSMALLINT   fSqlType;
 	SQLSMALLINT   fCType;
-	SQLSMALLINT   nMaxLen = _nMaxLen;
+	SQLLEN nMaxLen = _nMaxLen;
 
 	OTools::getBindTypes(	sal_False,
 							_bUseOldTimeDate,
@@ -375,7 +375,7 @@
 					_pData = (void*)(columnIndex);
 					sal_Int32 nLen = 0;
                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 				}
 					break;
 				case SQL_LONGVARCHAR:
@@ -383,7 +383,7 @@
 					_pData = (void*)(columnIndex);
 					sal_Int32 nLen = 0;
 					nLen = ((::rtl::OUString*)_pValue)->getLength();
-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 				}   break;
 				case SQL_DATE:
 					*pLen = sizeof(DATE_STRUCT);
@@ -446,10 +446,10 @@
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::ThrowException" );
 
 	SDB_ODBC_CHAR szSqlState[5];
-	SDWORD pfNativeError;
+	SQLINTEGER pfNativeError;
 	SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
 	szErrorMessage[0] = '\0';
-	SWORD pcbErrorMsg = 0;
+	SQLSMALLINT pcbErrorMsg = 0;
 
 	// Informationen zur letzten Operation:
 	// wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
@@ -478,7 +478,7 @@
 Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
 										 SQLHANDLE _aStatementHandle,
 										 sal_Int32 columnIndex,
-										 SWORD  _fSqlType,
+										 SQLSMALLINT _fSqlType,
 										 sal_Bool &_bWasNull,
 										 const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
 {
@@ -486,14 +486,14 @@
 	char aCharArray[2048];
 	// Erstmal versuchen, die Daten mit dem kleinen Puffer
 	// abzuholen:
-	SQLINTEGER nMaxLen = sizeof aCharArray - 1;
+	SQLLEN nMaxLen = sizeof aCharArray - 1;
 	//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-	SQLINTEGER pcbValue = 0;
+	SQLLEN pcbValue = 0;
 	OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 										(SQLUSMALLINT)columnIndex,
 										_fSqlType,
 										(SQLPOINTER)aCharArray,
-										(SQLINTEGER)nMaxLen,
+										nMaxLen,
 										&pcbValue),
 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 
@@ -540,7 +540,7 @@
 ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
 									   SQLHANDLE _aStatementHandle,
 									   sal_Int32 columnIndex,
-									   SWORD  _fSqlType,
+									   SQLSMALLINT _fSqlType,
 									   sal_Bool &_bWasNull,
 									   const Reference< XInterface >& _xInterface,
 									   rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
@@ -555,15 +555,15 @@
 		{
 			sal_Unicode waCharArray[2048];
 			// read the unicode data
-			sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
+			SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
 			//	GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
 
-			SQLINTEGER pcbValue=0;
+			SQLLEN pcbValue=0;
 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_WCHAR,
 												&waCharArray,
-												(SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
+												(SQLLEN)nMaxLen*sizeof(sal_Unicode),
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 			_bWasNull = pcbValue == SQL_NULL_DATA;
@@ -571,7 +571,7 @@
 				return ::rtl::OUString();
 			// Bei Fehler bricht der GETDATA-Makro mit return ab,
 			// bei NULL mit break!
-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
 			waCharArray[nLen] = 0;
 			aData = ::rtl::OUString(waCharArray);
 
@@ -595,7 +595,7 @@
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_WCHAR,
 												&waCharArray,
-												(SQLINTEGER)nLen+1,
+												(SQLLEN)nLen+1,
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 				nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
@@ -610,21 +610,21 @@
 			char aCharArray[2048];
 			// Erstmal versuchen, die Daten mit dem kleinen Puffer
 			// abzuholen:
-			SDWORD nMaxLen = sizeof aCharArray - 1;
+			SQLLEN nMaxLen = sizeof aCharArray - 1;
 			//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-			SQLINTEGER pcbValue = 0;
+			SQLLEN pcbValue = 0;
 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_CHAR,
 												&aCharArray,
-												(SQLINTEGER)nMaxLen,
+												nMaxLen,
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 			_bWasNull = pcbValue == SQL_NULL_DATA;
 			if(_bWasNull)
 				return ::rtl::OUString();
 
-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
 			aCharArray[nLen] = 0;
 			if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
 				--nLen;
Index: connectivity/source/drivers/odbcbase/OStatement.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OStatement.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OStatement.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -250,13 +250,13 @@
     m_xResultSet = Reference< XResultSet >();
 }
 //--------------------------------------------------------------------
-sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
+SQLLEN OStatement_Base::getRowCount () throw( SQLException)
 {
 	::osl::MutexGuard aGuard( m_aMutex );
 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 
-	sal_Int32	numRows = 0;
+	SQLLEN numRows = 0;
 
 	try {
 		THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows));
@@ -523,7 +523,9 @@
 		SQLRETURN nError = N3SQLMoreResults(m_aStatementHandle);
 		if(nError == SQL_SUCCESS)
 		{
-			N3SQLRowCount(m_aStatementHandle,&pArray[j]);
+			SQLLEN nRowCount=0;
+			N3SQLRowCount(m_aStatementHandle,&nRowCount);
+			pArray[j] = nRowCount;
 		}
 	}
 	return aRet;
Index: connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -446,11 +446,11 @@
 	checkParameterIndex(parameterIndex);
 
 	sal_Int8* lenBuf = getLengthBuf (parameterIndex);
-	*(SDWORD*)lenBuf = SQL_NULL_DATA;
+	*(SQLLEN*)lenBuf = SQL_NULL_DATA;
 
 
-	SQLINTEGER	prec = 0;
-	SQLUINTEGER nColumnSize = 0;
+	SQLLEN prec = 0;
+	SQLULEN nColumnSize = 0;
 	if (sqlType == SQL_CHAR || sqlType == SQL_VARCHAR || sqlType == SQL_LONGVARCHAR)
 	{
 		prec = 1;
@@ -476,7 +476,7 @@
 											nDecimalDigits,
 											NULL,
 											prec,
-											(SDWORD*)lenBuf
+											(SQLLEN*)lenBuf
 											);
 	OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
@@ -861,7 +861,7 @@
 
     // Bind the parameter with SQL_LEN_DATA_AT_EXEC
 	SQLSMALLINT   Ctype = SQL_C_CHAR;
-	SDWORD	atExec = SQL_LEN_DATA_AT_EXEC (length);
+	SQLLEN	atExec = SQL_LEN_DATA_AT_EXEC (length);
 	memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex));
 	memcpy (lenBuf, &atExec, sizeof (atExec));
 
@@ -872,14 +872,14 @@
 	OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
 	N3SQLBindParameter(m_aStatementHandle,
 						(SQLUSMALLINT)ParameterIndex,
-						(SQLSMALLINT)SQL_PARAM_INPUT,
+						(SQLUSMALLINT)SQL_PARAM_INPUT,
 						Ctype,
 						(SQLSMALLINT)SQLtype,
-						(SQLUINTEGER)length,
+						(SQLULEN)length,
 						0,
 						dataBuf,
 						sizeof(ParameterIndex),
-						(SDWORD*)lenBuf);
+						(SQLLEN*)lenBuf);
 
 	// Save the input stream
 	boundParams[ParameterIndex - 1].setInputStream (x, length);
Index: connectivity/source/drivers/odbcbase/OResultSet.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OResultSet.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OResultSet.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -843,8 +843,8 @@
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-	SQLSMALLINT nMaxLen = 20;
-	SQLINTEGER nRealLen = 0;
+	SQLLEN nMaxLen = 20;
+	SQLLEN nRealLen = 0;
 	Sequence<sal_Int8> aBookmark(nMaxLen);
 
 	SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
@@ -925,7 +925,7 @@
     sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) );
 	if ( bPositionByBookmark )
 	{
-		SQLINTEGER nRealLen = 0;
+		SQLLEN nRealLen = 0;
 		nRet = N3SQLBindCol(m_aStatementHandle,
 							0,
 							SQL_C_VARBOOKMARK,
Index: connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -86,13 +86,13 @@
 	return  sValue;
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
+SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 _ident) throw(SQLException, RuntimeException)
 {
-	SWORD nValue=0;
+	SQLLEN nValue=0;
 	OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle,
 										 (SQLUSMALLINT)_column,
 										 (SQLUSMALLINT)_ident,
@@ -117,13 +117,13 @@
 	return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
+SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
                                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    SWORD nType = 0;
+    SQLSMALLINT nType = 0;
     try
 	{
 		nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);
Index: solenv/inc/libs.mk
===================================================================
--- solenv/inc/libs.mk	(.../tags/DEV300_m55)	(revision 275310)
+++ solenv/inc/libs.mk	(.../cws/cmcfixes62)	(revision 275310)
@@ -266,7 +266,6 @@
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-SYSSHELLLIB=-lsysshell
 .IF "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -475,7 +474,6 @@
 FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
-SYSSHELLLIB=sysshell.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = cppunit.lib
 XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
Index: binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
===================================================================
--- binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -138,7 +138,6 @@
 #include <unotools/tempfile.hxx>
 #include <ucbhelper/content.hxx>
 #include <sot/storinfo.hxx>
-#include <shell/systemshell.hxx>
 
 #include "objsh.hxx"
 #include "request.hxx"
Index: binfilter/prj/build.lst
===================================================================
--- binfilter/prj/build.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ binfilter/prj/build.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,4 +1,4 @@
-bf      binfilter :     idl basic goodies xmlscript connectivity framework stoc uui offuh shell NULL
+bf      binfilter :     idl basic goodies xmlscript connectivity framework stoc uui offuh NULL
 bf	binfilter											usr1	-	all	bf_mkout NULL
 bf	binfilter\bf_svtools\source\inc						get		-	all	bf_svt_sinc NULL
 bf  binfilter\bf_svtools\source\config					nmake	-	all bf_svt_config NULL
Index: dmake/dag.c
===================================================================
--- dmake/dag.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/dag.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -369,14 +369,17 @@
 	 /* strip out any \<nl> combinations where \ is the current
 	  * CONTINUATION char */
 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
-	    if( p[1] == '\n' )
-	       strcpy( p, p+2 );
+	    if( p[1] == '\n' ) {
+	       size_t len = strlen(p+2)+1;
+	       memmove ( p, p+2, len );
+	    }
 	    else
 	       p++;
 
 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
 	 if( p != q ) {
-	    strcpy( q, p);
+	    size_t len = strlen(p)+1;
+	    memmove( q, p, len );
 	    p = q;
 	 }
 
Index: dmake/make.c
===================================================================
--- dmake/make.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/make.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -1352,8 +1352,10 @@
        * Nothing in Expand() should be able to change dynamic macros. */
       cmnd = Expand( rp->st_string );
 
-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
-	 strcpy(cmnd,p);
+      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
+	 size_t len = strlen(p)+1;
+	 memmove(cmnd,p,len);
+      }
 
       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
        * possible for the user to reset it to, for example
@@ -1381,8 +1383,10 @@
 	 shell  = ((l_attr & A_SHELL) != 0);
 
 	 /* clean up the attributes that we may have just added. */
-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
-	    strcpy(cmnd,p);
+	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
+	    size_t len = strlen(p)+1;
+	    memmove(cmnd,p,len);
+	 }
       }
 
 #if defined(MSDOS)
@@ -1477,8 +1481,9 @@
    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
       /* Remove the \<nl> sequences. */
       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
+	 size_t len = strlen(n+2)+1;
 	 DB_PRINT( "make", ("fixing [%s]", p) );
-	 strcpy( n, n+2 );
+	 memmove( n, n+2, len );
 	 p = n;
       }
       /* Look for an escape sequence and replace it by it's corresponding
Index: dmake/expand.c
===================================================================
--- dmake/expand.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/expand.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -230,6 +230,7 @@
 char *tok;
 {
    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
+      size_t len;
       switch( tok[1] ) {
 	 case 'a' : *tok = 0x07; break;
 	 case 'b' : *tok = '\b'; break;
@@ -246,13 +247,15 @@
 	    register int j = 0;
 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
 	       j = (j << 3) + (tok[1] - '0');
-	       strcpy( tok+1, tok+2 );
+	       len = strlen(tok+2)+1;
+	       memmove( tok+1, tok+2, len );
 	    }
 	    j = (j << 3) + (tok[1] - '0');
 	    *tok = j;
 	 }
       }
-      strcpy( tok+1, tok+2 );
+      len = strlen(tok+2)+1;
+      memmove( tok+1, tok+2, len );
    }
 }
 
@@ -365,7 +368,8 @@
       if( (e = Basename(s)) != s) {
 	 if( !(mod & DIRECTORY_FLAG) ) {
 	    /* Move the basename to the start. */
-	    strcpy(s, e);
+	    size_t len = strlen(e)+1;
+	    memmove(s, e, len);
 	 }
 	 else
 	    s = e;
@@ -382,7 +386,8 @@
 
       if( !(mod & FILE_FLAG) ) {
 	 /* Move the suffix to the start. */
-	 strcpy( s, e );
+	 size_t len = strlen(e)+1;
+         memmove(s, e, len);
       }
       else
 	 s = e;
@@ -725,8 +730,10 @@
 	      done = !lev;
 	      break;
             } else {
+              size_t len;
 	      s[1] = ' ';
-	      strcpy( s, s+1 );
+              len = strlen(s+1)+1;
+	      memmove( s, s+1, len );
 	    }
 	    /*FALLTHRU*/
 	 case ' ':
@@ -835,8 +842,10 @@
        * converted them to a real space. Let's verify this. */
       for( p=s; *p && *p != edelim && *p; p++ ) {
 	if( p[0] == '\\' && p[1] == '\n' ) {
+	  size_t len;
 	  p[1] = ' ';
-	  strcpy( p, p+1 );
+	  len = strlen(p+1)+1;
+	  memmove( p, p+1, len );
 	}
       }
       if( !*p )
@@ -1120,7 +1129,10 @@
       *flag = 1;
       res   = Expand( start );
 
-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
+      if( (t = DmStrSpn( res, " \t" )) != res ) {
+          size_t len = strlen(t)+1;
+          memmove( res, t, len );
+      }
    }
 
    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
Index: dmake/getinp.c
===================================================================
--- dmake/getinp.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/getinp.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -169,7 +169,8 @@
 	  * text lines on input.  The maximum size of this is governened by
 	  * Buffer_size */
 	    if( q != p && q[-1] == CONTINUATION_CHAR ) {
-	       strcpy( q, q+1 );
+	       size_t len = strlen(q+1)+1;
+	       memmove( q, q+1, len );
 	       q--;
 	       cont = FALSE;
 	    }
@@ -290,7 +291,8 @@
    while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
       if( Comment || State == NORMAL_SCAN )
 	 if( c != str && c[-1] == ESCAPE_CHAR ) {
-	    strcpy( c-1, c );        /* copy it left, due to \# */
+	    size_t len = strlen(c)+1;
+	    memmove( c-1, c, len );  /* copy it left, due to \# */
 	    if( pend ) (*pend)--;    /* shift tail pointer left */
 	 }
 	 else {
Index: dmake/path.c
===================================================================
--- dmake/path.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/path.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -172,6 +172,7 @@
    char *tpath;
    int hasdriveletter = 0;
    int delentry;
+   size_t len;
 
    DB_ENTER( "Clean_path" );
 
@@ -231,14 +232,16 @@
 	    p++;
 	 }
 	 while( *p == *DirSepStr);
-	 strcpy(t+1,p);
+	 len = strlen(p)+1;
+	 memmove(t+1,p,len);
 	 continue;
       }
 
       /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
        * the start of the path. */
       if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
-	 strcpy(q,p+1);
+	 len = strlen(p+1)+1;
+	 memmove(q,p+1,len);
 	 q = tpath;
 	 continue;
       }
@@ -268,7 +271,8 @@
 	 }
 	 while( *t == *DirSepStr);
 	 /* q points to first letter of the current directory/file. */
-	 strcpy(q,t);
+	 len = strlen(t)+1;
+	 memmove(q,t,len);
 	 q = tpath;
       }
       else
Index: dmake/rulparse.c
===================================================================
--- dmake/rulparse.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/rulparse.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -897,7 +897,7 @@
 	 /* Handle %-targets. */
 	 CELLPTR cur;
 	 CELLPTR tpq = NIL(CELL);
-	 CELLPTR nprq;
+	 CELLPTR nprq = NULL;
 
 #ifdef DBUG
 	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
@@ -915,7 +915,8 @@
 
 	    if( *name == '\'' && name[len-1]=='\'' ){
 	       name[len-1] = '\0';
-	       strcpy(name,name+1);
+	       len = strlen(name+1)+1;
+	       memmove(name,name+1,len);
 	       /* add indirect prerequisite */
 	       _add_indirect_prereq( cur );
 	    }
Index: postprocess/prj/build.lst
===================================================================
--- postprocess/prj/build.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ postprocess/prj/build.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native shell slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -p -r1.1990 -r1.1991
--- openoffice.org.spec	24 Aug 2009 07:43:45 -0000	1.1990
+++ openoffice.org.spec	24 Aug 2009 13:03:19 -0000	1.1991
@@ -152,11 +152,10 @@ Patch74: workspace.dr72.patch
 Patch75: workspace.vcl103.patch
 Patch76: workspace.cmcfixes61.patch
 Patch77: workspace.os132.patch
-Patch78: openoffice.org-3.1.1.oooXXXXX.dmake.patch
+Patch78: workspace.cmcfixes62.patch
 Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch80: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
-Patch81: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch82: workspace.os131.patch
+Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch81: workspace.os131.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1694,11 +1693,10 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch75 -p0 -b .workspace.vcl103.patch
 %patch76 -p0 -b .workspace.cmcfixes61.patch
 %patch77 -p0 -b .workspace.os132.patch
-%patch78 -p0 -b .oooXXXXX.dmake.patch
+%patch78 -p0 -b .workspace.cmcfixes62.patch
 %patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch80 -p0 -b .ooo104306.moverecentlyused.patch
-%patch81 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch82 -p0 -b .workspace.os131.patch
+%patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch81 -p0 -b .workspace.os131.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4210,6 +4208,8 @@ fi
 %changelog
 * Mon Aug 24 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
 - hyphen-as require
+- add workspace.cmcfixes62.patch for 64bit odbc goodness and rebuild
+  against now 64bit-safe unixODBC headers
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.1.1
 - rebuilt with new openssl


--- openoffice.org-3.1.1.ooo104306.moverecentlyused.patch DELETED ---


--- openoffice.org-3.1.1.oooXXXXX.dmake.patch DELETED ---



From harald at fedoraproject.org  Mon Aug 24 13:03:47 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 24 Aug 2009 13:03:47 +0000 (UTC)
Subject: rpms/udev/devel start_udev,1.84,1.85 udev.spec,1.289,1.290
Message-ID: <20090824130347.66AD511C0044@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20059

Modified Files:
	start_udev udev.spec 
Log Message:
* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 145-6
- ifnarch s390 for usbutils

* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-5
- do not make extra nodes in parallel
- restorecon on /dev



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- start_udev	14 Jul 2009 10:32:54 -0000	1.84
+++ start_udev	24 Aug 2009 13:03:46 -0000	1.85
@@ -119,7 +119,9 @@ make_extra_nodes () {
 	[ -c /dev/fuse ] || /bin/mknod -m 0666 /dev/fuse c 10 229
 	#/bin/chown root:root /dev/fuse
 
-	[ -x /sbin/restorecon ] && /sbin/restorecon /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/net/tun /dev/ppp /dev/lp0 /dev/lp1 /dev/lp2 /dev/lp3 /dev/fuse
+	if [ -x /sbin/restorecon ]; then
+		/sbin/restorecon -R /dev
+	fi
 
 	if [ -x "$MAKEDEV" ]; then
 		for i in /etc/udev/makedev.d/*.nodes; do
@@ -139,7 +141,7 @@ make_extra_nodes () {
 							xargs_simple -n 100 $MAKEDEV -x -a -S ) \
 							> "$md5file"
 					fi
-					. "$md5file" >/dev/null 2>&1
+					. "$md5file" >$udev_root/null 2>&1
 				else
 						( sed -e 's,#.*,,g' "$i" | \
 							xargs_simple -n 100 $MAKEDEV -x )
@@ -245,7 +247,7 @@ LANG=C awk "\$2 == \"${udev_root%/}\" &&
 	ret=$[$ret + $?]
 }
 
-make_extra_nodes &
+make_extra_nodes 
 cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
 rm -fr $udev_root/.udev > "$udev_root/null" 2>&1
@@ -272,13 +274,13 @@ if [ -f "/sys/class/tty/console/uevent" 
 	udevtimeout=$(getval udevtimeout $cmdline)
 
 	if strstr "$cmdline" udevdebug; then
-		/sbin/udevadm control --log_priority=debug
+		/sbin/udevadm control --log-priority=debug
 	fi
 	if strstr "$cmdline" udevinfo; then
-		/sbin/udevadm control --log_priority=info
+		/sbin/udevadm control --log-priority=info
 	fi
 	if strstr "$cmdline" udevchilds; then
-		/sbin/udevadm control --max_childs_running=$(getval udevchilds $cmdline)
+		/sbin/udevadm control --max-childs=$(getval udevchilds $cmdline)
 	fi
 
         /sbin/udevadm control --env=STARTUP=1


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- udev.spec	4 Aug 2009 09:16:53 -0000	1.289
+++ udev.spec	24 Aug 2009 13:03:47 -0000	1.290
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -38,9 +38,10 @@ BuildRequires: libxslt
 BuildRequires: hwdata
 BuildRequires: gobject-introspection-devel >= 0.6.2
 BuildRequires: gtk-doc
+%ifnarch s390 s390x
 BuildRequires: usbutils >= 0.82
+%endif
 BuildRequires: libtool >= 2.2.6
-
 Requires: libselinux >= 0:1.17.9-2 sed 
 Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
 Requires: util-linux-ng >= 2.15.1
@@ -351,6 +352,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 145-6
+- ifnarch s390 for usbutils
+
+* Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-5
+- do not make extra nodes in parallel
+- restorecon on /dev
+
 * Tue Aug 04 2009 Harald Hoyer <harald at redhat.com> 145-4
 - --enable-debug 
 - add patch for timestamps in debugging output



From fabbione at fedoraproject.org  Mon Aug 24 13:04:28 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 13:04:28 +0000 (UTC)
Subject: rpms/fence-agents/devel fence-agents.spec,1.15,1.16
Message-ID: <20090824130428.C6C3811C0044@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20197

Modified Files:
	fence-agents.spec 
Log Message:
Fix changelog mess



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fence-agents.spec	24 Aug 2009 04:34:43 -0000	1.15
+++ fence-agents.spec	24 Aug 2009 13:04:28 -0000	1.16
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.2
-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/
@@ -84,11 +84,17 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
-* Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
+* 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
 
+* 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
 



From lkundrak at fedoraproject.org  Mon Aug 24 13:04:55 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Mon, 24 Aug 2009 13:04:55 +0000 (UTC)
Subject: rpms/pulseaudio/EL-5 pulseaudio-0.9.10-libtool.patch, NONE,
	1.1 pulseaudio.spec, 1.5, 1.6
Message-ID: <20090824130455.A3A4F11C0044@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/pulseaudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20472

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.10-libtool.patch 
Log Message:
* Mon Aug 24 2009 Lubomir Rintel <lkundrak at v3.sk> 0.9.10-1.3
- Work around broken libtool (#455842, Michal Schmidt)


pulseaudio-0.9.10-libtool.patch:
 ltdl-bind-now.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pulseaudio-0.9.10-libtool.patch ---
Workaround libtool 1.5.22 bugs

Lennart in http://pulseaudio.org/wiki/KnownIncompatibilities said:
  libtool's libltdl 1.5.22 is buggy and causes PA to abort immediately after
  startup with a mutex locking error. Upgrade to 1.5.24 at least.

The mutex locking error is caused by lt_dlmutex_register() calling the new
unlock function. A workaround could be to ignore the call to the unlock
function made by lt_dlmutex_register().

But there's yet another bug. The seterror function is not set by
lt_dlmutex_register(). Therefore the get/set symmetry is broken.
lt_dlmutex_register() won't allow us to not set a get function and since
neither lt_dlmutex_seterror_func nor lt_dllast_error are visible outside of
ltdl.c, we cannot even fix it afterwards. We could try to avoid ltdl functions
which depend on LT_DLMUTEX_{SET,GET}ERROR. lt_dlopenext() is one of those. It
can be worked around by using lt_dlopen() instead and using the filename with
the ".so" extension. But there may be other things affected by broken
LT_DLMUTEX_SET_ERROR. At the very least, any error messages from ltdl would
show up as '(null)'.

In the end the easiest fix is to skip calling lt_dlmutex_register() completely.
It was meant to provide thread-safety for ltdl, but it could not work in all
situations, later libtool releases deprecated this function and libtool 2.2
does not have it anymore. PA stopped using it in v0.9.15.
I don't know whether PA loads modules from a single thread only or not. If not,
we could add locking around ltdl calls in PA.

--
Michal Schmidt <mschmidt at redhat.com>

Index: pulseaudio-0.9.10/src/daemon/ltdl-bind-now.c
===================================================================
--- pulseaudio-0.9.10.orig/src/daemon/ltdl-bind-now.c
+++ pulseaudio-0.9.10/src/daemon/ltdl-bind-now.c
@@ -154,7 +154,7 @@ void pa_ltdl_init(void) {
     pa_assert_se(lt_dlinit() == 0);
     pa_assert_se(libtool_mutex = pa_mutex_new(TRUE, FALSE));
 #ifdef HAVE_LT_DLMUTEX_REGISTER
-    pa_assert_se(lt_dlmutex_register(libtool_lock, libtool_unlock, libtool_set_error, libtool_get_error) == 0);
+//  pa_assert_se(lt_dlmutex_register(libtool_lock, libtool_unlock, libtool_set_error, libtool_get_error) == 0);
 #endif
 
 #ifdef PA_BIND_NOW


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/EL-5/pulseaudio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pulseaudio.spec	16 Jul 2009 14:57:42 -0000	1.5
+++ pulseaudio.spec	24 Aug 2009 13:04:55 -0000	1.6
@@ -3,11 +3,12 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.10
-Release:	1%{?dist}.2
+Release:	1%{?dist}.3
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
 Patch0:         pulseaudio-0.9.10-CVE-2009-1894.patch
+Patch1:         pulseaudio-0.9.10-libtool.patch
 URL:		http://pulseaudio.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers
@@ -151,6 +152,7 @@ This package contains command line utili
 %prep
 %setup -q -T -b0
 %patch0 -p1 -b .CVE-2009-1894
+%patch1 -p1 -b .libtool
 
 %build
 %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
@@ -370,6 +372,9 @@ fi
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Mon Aug 24 2009 Lubomir Rintel <lkundrak at v3.sk> 0.9.10-1.3
+- Work around broken libtool (#455842, Michal Schmidt)
+
 * Thu Jul 16 2009 Lubomir Rintel <lkundrak at v3.sk> 0.9.10-1.2
 - Fix CVE-2009-1894
 



From dwalsh at fedoraproject.org  Mon Aug 24 13:09:09 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 24 Aug 2009 13:09:09 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.60,1.61
Message-ID: <20090824130909.9181911C0044@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22081

Modified Files:
	policy-F12.patch 
Log Message:
* Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-6
- Add capability setting to dhcpc and gpm


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   16 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.te                 |   25 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.te                  |   16 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   60 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  173 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  391 +++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   49 
 policy/modules/services/policykit.te               |   60 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   10 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   82 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  183 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 +++-
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 +++++++-
 policy/modules/services/xserver.te                 |  306 +++-
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  268 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   24 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.if                      |   21 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1370 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 331 files changed, 14553 insertions(+), 2980 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- policy-F12.patch	23 Aug 2009 17:39:51 -0000	1.60
+++ policy-F12.patch	24 Aug 2009 13:09:08 -0000	1.61
@@ -4933,7 +4933,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.28/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/devices.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/devices.if	2009-08-24 08:40:29.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -5954,7 +5954,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.28/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/filesystem.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/filesystem.if	2009-08-24 08:48:26.000000000 -0400
 @@ -1537,6 +1537,24 @@
  
  ########################################
@@ -5980,10 +5980,28 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search inotifyfs filesystem. 
  ## </summary>
  ## <param name="domain">
-@@ -2542,6 +2560,24 @@
+@@ -2542,6 +2560,42 @@
  
  ########################################
  ## <summary>
++##	List NFS server directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_list_nfsd_fs',`
++	gen_require(`
++		type nfsd_fs_t;
++	')
++
++	allow $1 nfsd_fs_t:dir list_dir_perms;
++')
++
++########################################
++## <summary>
 +##	Getattr files on an nfsd filesystem
 +## </summary>
 +## <param name="domain">
@@ -6005,7 +6023,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write NFS server files.
  ## </summary>
  ## <param name="domain">
-@@ -3971,3 +4007,122 @@
+@@ -3971,3 +4025,122 @@
  	relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
  	relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
  ')
@@ -11930,11 +11948,13 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.6.28/policy/modules/services/gpm.te
 --- nsaserefpolicy/policy/modules/services/gpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/gpm.te	2009-08-22 09:46:40.000000000 -0400
-@@ -28,6 +28,7 @@
++++ serefpolicy-3.6.28/policy/modules/services/gpm.te	2009-08-24 08:51:22.000000000 -0400
+@@ -27,7 +27,8 @@
+ # Local policy
  #
  
- allow gpm_t self:capability { setuid dac_override sys_admin sys_tty_config };
+-allow gpm_t self:capability { setuid dac_override sys_admin sys_tty_config };
++allow gpm_t self:capability { setpcap setuid dac_override sys_admin sys_tty_config };
 +allow gpm_t self:process { getcap setcap };
  allow gpm_t self:unix_stream_socket create_stream_socket_perms;
  
@@ -14116,7 +14136,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.6.28/policy/modules/services/policykit.if
 --- nsaserefpolicy/policy/modules/services/policykit.if	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/policykit.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/policykit.if	2009-08-24 08:45:46.000000000 -0400
 @@ -17,6 +17,8 @@
  		class dbus send_msg;
  	')
@@ -14134,7 +14154,17 @@ diff -b -B --ignore-all-space --exclude-
  ##	allow the specified role the policy_auth domain,
  ## </summary>
  ## <param name="domain">
-@@ -206,4 +207,47 @@
+@@ -62,6 +63,9 @@
+ 
+ 	policykit_domtrans_auth($1)
+ 	role $2 types policykit_auth_t;
++
++	allow $1 policykit_auth_t:process signal;
++	ps_process_pattern(policykit_auth_t, $1)
+ ')
+ 
+ ########################################
+@@ -206,4 +209,47 @@
  
  	files_search_var_lib($1)
  	read_files_pattern($1, policykit_var_lib_t, policykit_var_lib_t)
@@ -14184,7 +14214,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.28/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/policykit.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/policykit.te	2009-08-24 08:38:20.000000000 -0400
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -14201,7 +14231,7 @@ diff -b -B --ignore-all-space --exclude-
  
  policykit_domtrans_auth(policykit_t)
  
-@@ -62,13 +63,25 @@
+@@ -62,27 +63,46 @@
  files_read_etc_files(policykit_t)
  files_read_usr_files(policykit_t)
  
@@ -14223,16 +14253,21 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		consolekit_dbus_chat(policykit_t)
 +	')
++
++	optional_policy(`
++		rpm_dbus_chat(policykit_t)
++	')
 +')
  
  ########################################
  #
-@@ -76,13 +89,16 @@
+ # polkit_auth local policy
  #
  
- allow policykit_auth_t self:capability setgid;
+-allow policykit_auth_t self:capability setgid;
 -allow policykit_auth_t self:process getattr;
 -allow policykit_auth_t self:fifo_file rw_file_perms;
++allow policykit_auth_t self:capability { setgid setuid };
 +allow policykit_auth_t self:process { getattr getsched };
 +allow policykit_auth_t self:fifo_file rw_fifo_file_perms;
 +
@@ -14247,7 +14282,7 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -92,12 +108,13 @@
+@@ -92,12 +112,13 @@
  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 })
  
@@ -14263,7 +14298,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(policykit_auth_t)
  
-@@ -106,7 +123,7 @@
+@@ -106,7 +127,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -14272,7 +14307,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -119,6 +136,14 @@
+@@ -119,6 +140,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -14287,7 +14322,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -126,7 +151,8 @@
+@@ -126,7 +155,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -14297,7 +14332,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 +182,12 @@
+@@ -156,9 +186,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -14311,7 +14346,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -170,7 +199,8 @@
+@@ -170,7 +203,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -22967,7 +23002,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.28/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/logging.te	2009-08-23 09:54:54.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/logging.te	2009-08-24 08:36:53.000000000 -0400
 @@ -123,10 +123,10 @@
  
  allow auditd_t self:capability { chown fsetid sys_nice sys_resource };
@@ -22997,7 +23032,7 @@ diff -b -B --ignore-all-space --exclude-
 -allow audisp_t self:capability sys_nice;
 -allow audisp_t self:process setsched;
 -allow audisp_t self:fifo_file rw_file_perms;
-+allow audisp_t self:capability { dac_override sys_nice };
++allow audisp_t self:capability { dac_override setpcap sys_nice };
 +allow audisp_t self:process { getcap signal_perms setcap setsched };
 +allow audisp_t self:fifo_file rw_fifo_file_perms;
  allow audisp_t self:unix_stream_socket create_stream_socket_perms;
@@ -24801,7 +24836,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.28/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/sysnetwork.te	2009-08-22 09:47:05.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/sysnetwork.te	2009-08-24 08:37:08.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -24818,7 +24853,7 @@ diff -b -B --ignore-all-space --exclude-
  #
 -allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_resource sys_tty_config };
 -dontaudit dhcpc_t self:capability sys_tty_config;
-+allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_nice sys_resource sys_tty_config };
++allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service setpcap sys_nice sys_resource sys_tty_config };
 +dontaudit dhcpc_t self:capability { sys_tty_config sys_ptrace };
  # for access("/etc/bashrc", X_OK) on Red Hat
  dontaudit dhcpc_t self:capability { dac_read_search sys_module };
@@ -25063,7 +25098,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.28/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/udev.if	2009-08-23 12:54:42.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/udev.if	2009-08-24 08:41:52.000000000 -0400
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)
@@ -25977,7 +26012,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.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-23 13:00:14.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-24 08:49:32.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -26342,7 +26377,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -420,34 +424,43 @@
+@@ -420,34 +424,48 @@
  ##	is the prefix for user_t).
  ##	</summary>
  ## </param>
@@ -26378,13 +26413,18 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_rw_generic_usb_dev($1)
 +	dev_read_video_dev($1)
 +	dev_write_video_dev($1)
++	dev_rw_wireless($1)
++
++	miscfiles_dontaudit_write_fonts($1)
++
++	optional_policy(`
++		udev_read_db($1)
++	')
  
 -	xserver_user_client($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(`
 +		xserver_user_client($1, user_tmpfs_t)
 +		xserver_xsession_entry_type($1)
@@ -26404,7 +26444,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -497,11 +510,7 @@
+@@ -497,11 +515,7 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -26417,7 +26457,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -511,182 +520,195 @@
+@@ -511,182 +525,195 @@
  	# 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 };
@@ -26438,26 +26478,26 @@ 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)
  
--	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)
@@ -26650,16 +26690,16 @@ diff -b -B --ignore-all-space --exclude-
 -			postgresql_stream_connect($1_t)
 -			postgresql_tcp_connect($1_t)
 +			postgresql_stream_connect($1_usertype)
++		')
  		')
++
++	optional_policy(`
++		# to allow monitoring of pcmcia status
++		pcmcia_read_pid($1_usertype)
  	')
  
  	optional_policy(`
 -		resmgr_stream_connect($1_t)
-+		# to allow monitoring of pcmcia status
-+		pcmcia_read_pid($1_usertype)
-+	')
-+
-+	optional_policy(`
 +		pcscd_read_pub_files($1_usertype)
 +		pcscd_stream_connect($1_usertype)
  	')
@@ -26689,18 +26729,20 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -714,13 +736,26 @@
+@@ -714,13 +741,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)
 +
@@ -26711,9 +26753,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)
 +		')
@@ -26721,7 +26761,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -738,70 +773,71 @@
+@@ -738,70 +778,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26826,7 +26866,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -838,6 +874,28 @@
+@@ -838,6 +879,28 @@
  	# Local policy
  	#
  
@@ -26855,7 +26895,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -868,7 +926,10 @@
+@@ -868,7 +931,10 @@
  
  	userdom_restricted_user_template($1)
  
@@ -26867,18 +26907,18 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -876,14 +937,19 @@
+@@ -876,14 +942,19 @@
  	#
  
  	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.
@@ -26892,7 +26932,7 @@ diff -b -B --ignore-all-space --exclude-
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -891,28 +957,47 @@
+@@ -891,28 +962,47 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -26908,15 +26948,15 @@ diff -b -B --ignore-all-space --exclude-
 +		devicekit_dbus_chat($1_usertype)
 +		devicekit_dbus_chat_disk($1_usertype)
 +		devicekit_dbus_chat_power($1_usertype)
-+	')
-+
-+	optional_policy(`
-+		fprintd_dbus_chat($1_t)
  	')
  
  	optional_policy(`
 -		dbus_role_template($1, $1_r, $1_t)
 -		dbus_system_bus_client($1_t)
++		fprintd_dbus_chat($1_t)
++	')
++
++	optional_policy(`
 +		gnomeclock_dbus_chat($1_t)
 +	')	  
  
@@ -26947,7 +26987,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -946,8 +1031,8 @@
+@@ -946,8 +1036,8 @@
  	# Declarations
  	#
  
@@ -26957,7 +26997,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -956,11 +1041,12 @@
+@@ -956,11 +1046,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -26972,7 +27012,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,36 +1064,53 @@
+@@ -978,36 +1069,53 @@
  		')
  	')
  
@@ -27040,7 +27080,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1042,7 +1145,7 @@
+@@ -1042,7 +1150,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -27049,7 +27089,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1154,7 @@
+@@ -1051,8 +1159,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -27059,7 +27099,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1177,8 @@
+@@ -1075,7 +1182,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -27069,7 +27109,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1194,7 @@
+@@ -1091,6 +1199,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -27077,7 +27117,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1202,6 @@
+@@ -1098,8 +1207,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27086,7 +27126,15 @@ 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)
-@@ -1154,20 +1256,6 @@
+@@ -1126,6 +1233,7 @@
+ 	files_exec_usr_src_files($1_t)
+ 
+ 	fs_getattr_all_fs($1_t)
++	fs_list_all($1_t)
+ 	fs_set_all_quotas($1_t)
+ 	fs_exec_noxattr($1_t)
+ 
+@@ -1154,20 +1262,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27107,7 +27155,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1301,7 @@
+@@ -1213,6 +1307,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27115,7 +27163,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1367,15 @@
+@@ -1278,11 +1373,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27131,7 +27179,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1467,13 @@
+@@ -1374,12 +1473,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -27146,7 +27194,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1506,14 @@
+@@ -1412,6 +1512,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27161,7 +27209,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1529,11 @@
+@@ -1427,9 +1535,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27173,7 +27221,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1590,25 @@
+@@ -1486,6 +1596,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27199,7 +27247,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1683,8 @@
+@@ -1560,6 +1689,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27208,7 +27256,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1778,7 @@
+@@ -1653,6 +1784,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27216,7 +27264,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)
  ')
-@@ -1780,19 +1906,32 @@
+@@ -1780,19 +1912,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -27256,7 +27304,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1966,7 @@
+@@ -1827,6 +1972,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -27264,7 +27312,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2514,7 @@
+@@ -2374,7 +2520,7 @@
  
  ########################################
  ## <summary>
@@ -27273,7 +27321,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2868,32 @@
+@@ -2728,11 +2874,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27308,7 +27356,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3021,25 @@
+@@ -2860,7 +3027,25 @@
  		type user_tmp_t;
  	')
  
@@ -27335,7 +27383,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3076,7 @@
+@@ -2897,6 +3082,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27343,7 +27391,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3207,559 @@
+@@ -3027,3 +3213,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From rdieter at fedoraproject.org  Mon Aug 24 13:13:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 13:13:35 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.94,1.95
Message-ID: <20090824131335.B9B0811C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23027

Modified Files:
	comps-f12.xml.in 
Log Message:
kde-desktop: +kdm +kde-plasma-ktorrent



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- comps-f12.xml.in	24 Aug 2009 10:42:41 -0000	1.94
+++ comps-f12.xml.in	24 Aug 2009 13:13:35 -0000	1.95
@@ -3593,6 +3593,7 @@
       <packagereq type="default">kdeplasma-addons</packagereq>
       <packagereq type="default">kdeutils</packagereq>
       <packagereq type="default">kdeutils-printer-applet</packagereq>
+      <packagereq type="default">kdm</packagereq>
       <packagereq type="default">kftpgrabber</packagereq>
       <packagereq type="default">kipi-plugins</packagereq>
       <packagereq type="default">konq-plugins</packagereq>
@@ -3616,6 +3617,8 @@
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
+      <packagereq type="optional">kde-plasma-ktorrent</packagereq>
+      <packagereq type="optional">kde-plasma-networkmanagement</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
       <packagereq type="optional">kdeartwork</packagereq>
       <packagereq type="optional">kdeartwork-sounds</packagereq>
@@ -3624,7 +3627,6 @@
       <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-plasma-networkmanagement</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>



From fabbione at fedoraproject.org  Mon Aug 24 13:14:37 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 13:14:37 +0000 (UTC)
Subject: rpms/fence-agents/F-11 .cvsignore, 1.6, 1.7 fence-agents.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <20090824131437.697E611C0044@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-serv23359

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release fix critical regression



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-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:16:31 -0000	1.6
+++ .cvsignore	24 Aug 2009 13:14:37 -0000	1.7
@@ -1 +1 @@
-fence-agents-3.0.0.rc1.tar.gz
+fence-agents-3.0.2.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fence-agents.spec	28 Jul 2009 17:41:32 -0000	1.9
+++ fence-agents.spec	24 Aug 2009 13:14:37 -0000	1.10
@@ -18,8 +18,8 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.0
-Release: 14%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.2
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -27,7 +27,8 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils pyOpenSSL
+Requires: pexpect net-snmp-utils libvirt
+Requires: perl-Net-Telnet
 
 ## Setup/build bits
 
@@ -83,7 +84,12 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
+* 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
 - 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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Jul 2009 17:41:32 -0000	1.7
+++ sources	24 Aug 2009 13:14:37 -0000	1.8
@@ -1 +1 @@
-7bc650a9654a4e5059120243666b5eb5  fence-agents-3.0.0.tar.gz
+bbad9ff97a7ce268e43de2cc2aa297f7  fence-agents-3.0.2.tar.gz



From fabbione at fedoraproject.org  Mon Aug 24 13:16:28 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 13:16:28 +0000 (UTC)
Subject: rpms/fence-agents/F-11 fence-agents.spec,1.10,1.11
Message-ID: <20090824131628.544A511C0044@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-serv23839

Modified Files:
	fence-agents.spec 
Log Message:
Retag.



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fence-agents.spec	24 Aug 2009 13:14:37 -0000	1.10
+++ fence-agents.spec	24 Aug 2009 13:16:28 -0000	1.11
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.2
-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/
@@ -84,6 +84,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
+- Retag in cvs
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-1
 - New upstream release
 - spec file updates:



From harald at fedoraproject.org  Mon Aug 24 13:18:52 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 24 Aug 2009 13:18:52 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.12,1.13
Message-ID: <20090824131852.88A2D11C0044@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24478

Modified Files:
	dracut.spec 
Log Message:
* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 0.9-2
- removed kdb requirement (because s390x does not have it)



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- dracut.spec	14 Aug 2009 16:02:07 -0000	1.12
+++ dracut.spec	24 Aug 2009 13:18:52 -0000	1.13
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.9
-Release: 1%{?rdist}
+Release: 2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -43,10 +43,7 @@ Requires: cryptsetup-luks
 Requires: bridge-utils
 Requires: file
 Requires: bzip2
-%ifnarch s390 s390x
 Requires: dmraid
-Requires: kbd
-%endif
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
@@ -145,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 0.9-2
+- removed kdb requirement (because s390x does not have it)
+
 * Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
 - version 0.9
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS



From mcrha at fedoraproject.org  Mon Aug 24 13:19:58 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 24 Aug 2009 13:19:58 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.272, 
	1.273
Message-ID: <20090824131958.974C311C0044@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24697

Modified Files:
	evolution-data-server.spec 
Log Message:
Use aclocal -I m4 as acinclude.m4 is divided there now



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- evolution-data-server.spec	24 Aug 2009 10:52:49 -0000	1.272
+++ evolution-data-server.spec	24 Aug 2009 13:19:58 -0000	1.273
@@ -205,7 +205,7 @@ fi
 %endif
 
 # Regenerate configure to pick up configure.in and acinclude.m4 changes.
-aclocal
+aclocal -I m4
 autoheader
 automake
 libtoolize



From mcpierce at fedoraproject.org  Mon Aug 24 13:23:35 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon, 24 Aug 2009 13:23:35 +0000 (UTC)
Subject: rpms/rubygem-gruff/devel .cvsignore, 1.2, 1.3 rubygem-gruff.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090824132335.65B9A11C0044@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-gruff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25499

Modified Files:
	.cvsignore rubygem-gruff.spec sources 
Log Message:
* Mon Aug 24 2009 Darryl Pierce <dpierce at redhat.com> - 0.3.6-1
- Release 0.3.6 of Gruff.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 17:26:21 -0000	1.2
+++ .cvsignore	24 Aug 2009 13:23:35 -0000	1.3
@@ -1 +1 @@
-gruff-0.3.4.gem
+gruff-0.3.6.gem


Index: rubygem-gruff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/devel/rubygem-gruff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-gruff.spec	27 Jul 2009 03:30:21 -0000	1.4
+++ rubygem-gruff.spec	24 Aug 2009 13:23:35 -0000	1.5
@@ -7,15 +7,15 @@
 
 Summary:	Beautiful graphs for one or multiple datasets
 Name:		rubygem-%{gemname}
-Version:	0.3.4
-Release:	5%{?dist}
+Version:	0.3.6
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://nubyonrails.com/pages/gruff
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	rubygems
-Requires:	rubygem(hoe) >= 1.7.0
+Requires:	rubygem(hoe) >= 1.12.1
 Requires:	ruby-RMagick
 BuildRequires:	rubygems
 BuildArch:	noarch
@@ -35,17 +35,18 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
-chmod +x %{installroot}/test/test_spider.rb 
-chmod +x %{installroot}/test/test_pie.rb 
-chmod +x %{installroot}/test/test_photo.rb 
-chmod +x %{installroot}/test/test_base.rb 
-chmod +x %{installroot}/test/test_stacked_area.rb 
-chmod +x %{installroot}/test/test_stacked_bar.rb 
-chmod +x %{installroot}/test/test_net.rb 
-chmod +x %{installroot}/test/test_sidestacked_bar.rb 
-chmod +x %{installroot}/test/test_area.rb 
-chmod +x %{installroot}/test/test_bar.rb 
-chmod +x %{installroot}/test/test_line.rb 
+chmod +x %{installroot}/test/test_dot.rb
+chmod +x %{installroot}/test/test_spider.rb
+chmod +x %{installroot}/test/test_pie.rb
+chmod +x %{installroot}/test/test_photo.rb
+chmod +x %{installroot}/test/test_base.rb
+chmod +x %{installroot}/test/test_stacked_area.rb
+chmod +x %{installroot}/test/test_stacked_bar.rb
+chmod +x %{installroot}/test/test_net.rb
+chmod +x %{installroot}/test/test_sidestacked_bar.rb
+chmod +x %{installroot}/test/test_area.rb
+chmod +x %{installroot}/test/test_bar.rb
+chmod +x %{installroot}/test/test_line.rb
 chmod +x %{installroot}/test/test_scene.rb
 
 %clean
@@ -63,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 24 2009 Darryl Pierce <dpierce at redhat.com> - 0.3.6-1
+- Release 0.3.6 of Gruff.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 17:26:21 -0000	1.2
+++ sources	24 Aug 2009 13:23:35 -0000	1.3
@@ -1 +1 @@
-ca63fd2a6716c49f953c0af43ce96b43  gruff-0.3.4.gem
+c6f71ac8b6b39dd7e53ca445ebaf411b  gruff-0.3.6.gem



From mcpierce at fedoraproject.org  Mon Aug 24 13:33:13 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon, 24 Aug 2009 13:33:13 +0000 (UTC)
Subject: rpms/rubygem-gruff/F-10 .cvsignore, 1.2, 1.3 rubygem-gruff.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090824133313.51D7611C0044@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-gruff/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27275

Modified Files:
	.cvsignore rubygem-gruff.spec sources 
Log Message:
* Mon Aug 24 2009 Darryl Pierce <dpierce at redhat.com> - 0.3.6-1
- Release 0.36 of Gruff.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 17:56:07 -0000	1.2
+++ .cvsignore	24 Aug 2009 13:33:10 -0000	1.3
@@ -1 +1 @@
-gruff-0.3.4.gem
+gruff-0.3.6.gem


Index: rubygem-gruff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/F-10/rubygem-gruff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-gruff.spec	17 Dec 2008 22:26:15 -0000	1.2
+++ rubygem-gruff.spec	24 Aug 2009 13:33:11 -0000	1.3
@@ -7,7 +7,7 @@
 
 Summary:       Beautiful graphs for one or multiple datasets
 Name:          rubygem-%{gemname}
-Version:       0.3.4
+Version:       0.3.6
 Release:       3%{?dist}
 Group:         Development/Languages
 License:       MIT
@@ -15,7 +15,7 @@ URL:           http://nubyonrails.com/pa
 Source0:       http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      rubygems
-Requires:      rubygem(hoe) >= 1.7.0
+Requires:      rubygem(hoe) >= 1.12.1
 Requires:      ruby-RMagick
 BuildRequires: rubygems
 BuildArch:     noarch
@@ -35,17 +35,18 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
-chmod +x %{installroot}/test/test_spider.rb 
-chmod +x %{installroot}/test/test_pie.rb 
-chmod +x %{installroot}/test/test_photo.rb 
-chmod +x %{installroot}/test/test_base.rb 
-chmod +x %{installroot}/test/test_stacked_area.rb 
-chmod +x %{installroot}/test/test_stacked_bar.rb 
-chmod +x %{installroot}/test/test_net.rb 
-chmod +x %{installroot}/test/test_sidestacked_bar.rb 
-chmod +x %{installroot}/test/test_area.rb 
-chmod +x %{installroot}/test/test_bar.rb 
-chmod +x %{installroot}/test/test_line.rb 
+chmod +x %{installroot}/test/test_dot.rb
+chmod +x %{installroot}/test/test_spider.rb
+chmod +x %{installroot}/test/test_pie.rb
+chmod +x %{installroot}/test/test_photo.rb
+chmod +x %{installroot}/test/test_base.rb
+chmod +x %{installroot}/test/test_stacked_area.rb
+chmod +x %{installroot}/test/test_stacked_bar.rb
+chmod +x %{installroot}/test/test_net.rb
+chmod +x %{installroot}/test/test_sidestacked_bar.rb
+chmod +x %{installroot}/test/test_area.rb
+chmod +x %{installroot}/test/test_bar.rb
+chmod +x %{installroot}/test/test_line.rb
 chmod +x %{installroot}/test/test_scene.rb
 
 %clean
@@ -63,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 24 2009 Darryl Pierce <dpierce at redhat.com> - 0.3.6-1
+- Release 0.36 of Gruff.
+
 * Wed Dec 17 2008 Darryl Pierce <dpierce at redhat.com> - 0.3.4-3
 - Added a requirement for ruby-RMagick.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 17:56:07 -0000	1.2
+++ sources	24 Aug 2009 13:33:11 -0000	1.3
@@ -1 +1 @@
-ca63fd2a6716c49f953c0af43ce96b43  gruff-0.3.4.gem
+c6f71ac8b6b39dd7e53ca445ebaf411b  gruff-0.3.6.gem



From otaylor at fedoraproject.org  Mon Aug 24 13:39:45 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Mon, 24 Aug 2009 13:39:45 +0000 (UTC)
Subject: rpms/metacity/devel
	Should-set-RestartStyleHint-to-RestartIfRunning-when.patch, NONE,
	1.1 metacity.spec, 1.196, 1.197
Message-ID: <20090824133945.D2C6311C0044@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29245

Modified Files:
	metacity.spec 
Added Files:
	Should-set-RestartStyleHint-to-RestartIfRunning-when.patch 
Log Message:
* Sat Aug 22 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-5
- Add a fix for http://bugzilla.gnome.org/show_bug.cgi?id=588119,
  remove no-longer-needed no-lame-dialog patch


Should-set-RestartStyleHint-to-RestartIfRunning-when.patch:
 display-private.h |    2 +-
 display.c         |   16 ++++------------
 main.c            |    5 ++---
 session.c         |    9 ---------
 4 files changed, 7 insertions(+), 25 deletions(-)

--- NEW FILE Should-set-RestartStyleHint-to-RestartIfRunning-when.patch ---
>From a3de65d5d1861f755ced7cad291fbbd4f1b8ef51 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Sat, 22 Aug 2009 15:00:57 -0400
Subject: [PATCH] Should set RestartStyleHint to RestartIfRunning when replaced

This reverts most of commit abbd057eb967e6ab462ffe305f41b2b04d417b25;

 - It's fine to call meta_session_shutdown() after the display
   is closed, since it's talking over the ICE connection
 - We should not call warn_about_lame_clients_and_finish_interact()
   unless we are interacting with the window manager in a session
   save.

However, the part of abbd057 that fixed accessing freed memory was
fixing a real problem; this patches does the same thing in a simpler
way by fixing an obvious type in meta_display_close() where it was
NULL'ing out the local variable 'display' rather than the global
variable 'the_display' and adding keeping the check in meta_finalize()
that was added in abbd057.

The order of calling meta_session_shutdown() and
calling meta_display_close() is reverted back to the old order to
make it clear that it's OK if the display way already closed previously.

http://bugzilla.gnome.org/show_bug.cgi?id=588119
---
 src/core/display-private.h |    2 +-
 src/core/display.c         |   16 ++++------------
 src/core/main.c            |    5 ++---
 src/core/session.c         |    8 --------
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/core/display-private.h b/src/core/display-private.h
index 19287f3..9c8ebc6 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -329,7 +329,7 @@ MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
 void          meta_display_grab                (MetaDisplay *display);
 void          meta_display_ungrab              (MetaDisplay *display);
 
-void          meta_display_unmanage_screen     (MetaDisplay **display,
+void          meta_display_unmanage_screen     (MetaDisplay *display,
                                                 MetaScreen  *screen,
                                                 guint32      timestamp);
 
diff --git a/src/core/display.c b/src/core/display.c
index 55c374a..8e35a35 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -926,7 +926,7 @@ meta_display_close (MetaDisplay *display,
     meta_compositor_destroy (display->compositor);
   
   g_free (display);
-  display = NULL;
+  the_display = NULL;
 
   meta_quit (META_EXIT_SUCCESS);
 }
@@ -4762,13 +4762,10 @@ process_selection_clear (MetaDisplay   *display,
       meta_verbose ("Got selection clear for screen %d on display %s\n",
                     screen->number, display->name);
       
-      meta_display_unmanage_screen (&display, 
+      meta_display_unmanage_screen (display, 
                                     screen,
                                     event->xselectionclear.time);
 
-      if (!display)
-        the_display = NULL;
-
       /* display and screen may both be invalid memory... */
       
       return;
@@ -4790,12 +4787,10 @@ process_selection_clear (MetaDisplay   *display,
 }
 
 void
-meta_display_unmanage_screen (MetaDisplay **displayp,
+meta_display_unmanage_screen (MetaDisplay *display,
                               MetaScreen  *screen,
                               guint32      timestamp)
 {
-  MetaDisplay *display = *displayp;
-
   meta_verbose ("Unmanaging screen %d on display %s\n",
                 screen->number, display->name);
   
@@ -4805,10 +4800,7 @@ meta_display_unmanage_screen (MetaDisplay **displayp,
   display->screens = g_slist_remove (display->screens, screen);
 
   if (display->screens == NULL)
-    {
-      meta_display_close (display, timestamp);
-      *displayp = NULL;
-    }
+    meta_display_close (display, timestamp);
 }
 
 void
diff --git a/src/core/main.c b/src/core/main.c
index a36a396..44d317e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -361,12 +361,11 @@ static void
 meta_finalize (void)
 {
   MetaDisplay *display = meta_get_display();
-
-  meta_session_shutdown ();
-
   if (display)
     meta_display_close (display,
                         CurrentTime); /* I doubt correct timestamps matter here */
+
+  meta_session_shutdown ();
 }
 
 static void
diff --git a/src/core/session.c b/src/core/session.c
index 7e3b389..0d69350 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -376,14 +376,6 @@ meta_session_shutdown (void)
   SmProp *props[1];
   char hint = SmRestartIfRunning;
 
-  if (!meta_get_display ())
-    {
-      meta_verbose ("Cannot close session because there is no display");
-      return;
-    }
-
-  warn_about_lame_clients_and_finish_interact (FALSE);
-
   if (session_connection == NULL)
     return;
   
-- 
1.6.4



Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- metacity.spec	5 Aug 2009 22:33:26 -0000	1.196
+++ metacity.spec	24 Aug 2009 13:39:44 -0000	1.197
@@ -1,15 +1,15 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=135056
 Patch5: dnd-keynav.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=584723
-Patch6: no-lame-dialog.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=588119
+Patch6: Should-set-RestartStyleHint-to-RestartIfRunning-when.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -71,7 +71,7 @@ API. This package exists purely for tech
 %setup -q
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
-%patch6 -p1 -b .no-lame-dialog
+%patch6 -p1 -b .restart-if-running
 
 # force regeneration
 rm src/metacity.schemas
@@ -179,6 +179,10 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Sat Aug 22 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-5
+- Add a fix for http://bugzilla.gnome.org/show_bug.cgi?id=588119,
+  remove no-longer-needed no-lame-dialog patch
+
 * Wed Aug  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.27.0-4
 - Change the default theme to Clearlooks
 



From fabbione at fedoraproject.org  Mon Aug 24 13:40:19 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 13:40:19 +0000 (UTC)
Subject: rpms/cluster/F-10 .cvsignore, 1.13, 1.14 cluster.spec, 1.27,
	1.28 sources, 1.14, 1.15
Message-ID: <20090824134019.C031611C0426@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29276

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release fixes 3 critical issues



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	3 Nov 2008 15:18:02 -0000	1.13
+++ .cvsignore	24 Aug 2009 13:40:19 -0000	1.14
@@ -1 +1 @@
-cluster-2.99.12.tar.gz
+cluster-3.0.2.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-10/cluster.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cluster.spec	31 Jul 2009 08:25:11 -0000	1.27
+++ cluster.spec	24 Aug 2009 13:40:19 -0000	1.28
@@ -18,8 +18,8 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.0
-Release: 20%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.2
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -191,6 +191,7 @@ The Red Hat Cluster libraries developmen
 %{_includedir}/libcman.h
 %{_includedir}/libdlm*.h
 %{_includedir}/libfence.h
+%{_includedir}/libfenced.h
 %{_includedir}/liblogthread.h
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
@@ -300,7 +301,10 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
+* 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
 - New upstream release
 - spec file updates:
   * Update copyright header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	31 Jul 2009 08:25:11 -0000	1.14
+++ sources	24 Aug 2009 13:40:19 -0000	1.15
@@ -1 +1 @@
-93101d0f3c724a46caee1f9f16abe4af  cluster-3.0.0.tar.gz
+d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz



From mcpierce at fedoraproject.org  Mon Aug 24 13:43:16 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Mon, 24 Aug 2009 13:43:16 +0000 (UTC)
Subject: rpms/rubygem-gruff/F-11 .cvsignore, 1.2, 1.3 rubygem-gruff.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090824134316.5362B11C0044@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-gruff/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30245

Modified Files:
	.cvsignore rubygem-gruff.spec sources 
Log Message:
* Mon Aug 24 2009 Darryl L. Pierce <dpierce at redhat.com> - 0.3.6-1
- Release 0.3.6 of Gruff.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 17:26:21 -0000	1.2
+++ .cvsignore	24 Aug 2009 13:43:15 -0000	1.3
@@ -1 +1 @@
-gruff-0.3.4.gem
+gruff-0.3.6.gem


Index: rubygem-gruff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/F-11/rubygem-gruff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-gruff.spec	25 Feb 2009 21:48:14 -0000	1.3
+++ rubygem-gruff.spec	24 Aug 2009 13:43:15 -0000	1.4
@@ -7,7 +7,7 @@
 
 Summary:	Beautiful graphs for one or multiple datasets
 Name:		rubygem-%{gemname}
-Version:	0.3.4
+Version:	0.3.6
 Release:	4%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -15,7 +15,7 @@ URL:		http://nubyonrails.com/pages/gruff
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	rubygems
-Requires:	rubygem(hoe) >= 1.7.0
+Requires:	rubygem(hoe) >= 1.12.1
 Requires:	ruby-RMagick
 BuildRequires:	rubygems
 BuildArch:	noarch
@@ -35,17 +35,18 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
-chmod +x %{installroot}/test/test_spider.rb 
-chmod +x %{installroot}/test/test_pie.rb 
-chmod +x %{installroot}/test/test_photo.rb 
-chmod +x %{installroot}/test/test_base.rb 
-chmod +x %{installroot}/test/test_stacked_area.rb 
-chmod +x %{installroot}/test/test_stacked_bar.rb 
-chmod +x %{installroot}/test/test_net.rb 
-chmod +x %{installroot}/test/test_sidestacked_bar.rb 
-chmod +x %{installroot}/test/test_area.rb 
-chmod +x %{installroot}/test/test_bar.rb 
-chmod +x %{installroot}/test/test_line.rb 
+chmod +x %{installroot}/test/test_dot.rb
+chmod +x %{installroot}/test/test_spider.rb
+chmod +x %{installroot}/test/test_pie.rb
+chmod +x %{installroot}/test/test_photo.rb
+chmod +x %{installroot}/test/test_base.rb
+chmod +x %{installroot}/test/test_stacked_area.rb
+chmod +x %{installroot}/test/test_stacked_bar.rb
+chmod +x %{installroot}/test/test_net.rb
+chmod +x %{installroot}/test/test_sidestacked_bar.rb
+chmod +x %{installroot}/test/test_area.rb
+chmod +x %{installroot}/test/test_bar.rb
+chmod +x %{installroot}/test/test_line.rb
 chmod +x %{installroot}/test/test_scene.rb
 
 %clean
@@ -63,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 24 2009 Darryl L. Pierce <dpierce at redhat.com> - 0.3.6-1
+- Release 0.3.6 of Gruff.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-gruff/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 17:26:21 -0000	1.2
+++ sources	24 Aug 2009 13:43:16 -0000	1.3
@@ -1 +1 @@
-ca63fd2a6716c49f953c0af43ce96b43  gruff-0.3.4.gem
+c6f71ac8b6b39dd7e53ca445ebaf411b  gruff-0.3.6.gem



From fabbione at fedoraproject.org  Mon Aug 24 13:43:24 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 24 Aug 2009 13:43:24 +0000 (UTC)
Subject: rpms/fence-agents/F-10 .cvsignore, 1.3, 1.4 fence-agents.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090824134324.94EA211C0044@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-serv30311

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release fix critical regression



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Mar 2009 07:33:44 -0000	1.3
+++ .cvsignore	24 Aug 2009 13:43:24 -0000	1.4
@@ -1 +1 @@
-fence-agents-3.0.0.alpha6.tar.gz
+fence-agents-3.0.2.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/fence-agents.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- fence-agents.spec	31 Jul 2009 08:26:43 -0000	1.5
+++ fence-agents.spec	24 Aug 2009 13:43:24 -0000	1.6
@@ -18,8 +18,8 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.0
-Release: 14%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.2
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -27,7 +27,8 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils pyOpenSSL
+Requires: pexpect net-snmp-utils libvirt
+Requires: perl-Net-Telnet
 
 ## Setup/build bits
 
@@ -83,7 +84,12 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
+* 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
 - 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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 08:26:43 -0000	1.4
+++ sources	24 Aug 2009 13:43:24 -0000	1.5
@@ -1 +1 @@
-7bc650a9654a4e5059120243666b5eb5  fence-agents-3.0.0.tar.gz
+bbad9ff97a7ce268e43de2cc2aa297f7  fence-agents-3.0.2.tar.gz



From rhughes at fedoraproject.org  Mon Aug 24 13:47:00 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 24 Aug 2009 13:47:00 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.96,1.97
Message-ID: <20090824134700.AED7A11C0044@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30981

Modified Files:
	gnome-packagekit.spec 
Log Message:
* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-1
- New upstream version



Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- gnome-packagekit.spec	11 Aug 2009 11:07:02 -0000	1.96
+++ gnome-packagekit.spec	24 Aug 2009 13:47:00 -0000	1.97
@@ -14,9 +14,9 @@
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   2.27.5
+Version:   2.27.91
 #Release:   0.1.%{?alphatag}git%{?dist}
-Release:   3%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -34,6 +34,7 @@ Requires:  dbus-x11 >= %{dbus_version}
 Requires:  PackageKit >= %{packagekit_version}
 Requires:  PackageKit-libs >= %{packagekit_version}
 Requires:  PackageKit-gtk-module >= %{packagekit_version}
+Requires:  PackageKit-device-rebind >= %{packagekit_version}
 Requires:  shared-mime-info
 Requires:  iso-codes
 Requires:  libcanberra >= %{libcanberra_version}
@@ -69,6 +70,7 @@ BuildRequires: intltool
 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}
 
@@ -221,6 +223,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-1
+- New upstream version
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.27.5-3
 - Use bzipped upstream tarball.
 



From rhughes at fedoraproject.org  Mon Aug 24 13:49:27 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 24 Aug 2009 13:49:27 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.52, 1.53 PackageKit.spec, 1.111,
	1.112 sources, 1.53, 1.54
Message-ID: <20090824134927.7EECF11C0044@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31550

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090824git
- Update to a newer git snapshot from the 0.5.x series.
- Enable GUdev functionality and create a device-rebind subpackage.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	19 Aug 2009 16:28:41 -0000	1.52
+++ .cvsignore	24 Aug 2009 13:49:27 -0000	1.53
@@ -1 +1 @@
-PackageKit-0.5.2-20090819.tar.gz
+PackageKit-0.5.2-20090824.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- PackageKit.spec	19 Aug 2009 16:28:42 -0000	1.111
+++ PackageKit.spec	24 Aug 2009 13:49:27 -0000	1.112
@@ -3,7 +3,7 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090819
+%define alphatag			20090824
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -52,6 +52,7 @@ BuildRequires: python-devel
 BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 BuildRequires: gettext
+BuildRequires: libgudev1-devel
 BuildRequires: xulrunner-devel
 BuildRequires: libarchive-devel
 BuildRequires: gstreamer-devel
@@ -223,6 +224,16 @@ Requires: PackageKit-glib = %{version}-%
 A simple helper that offers to install new packages on the command line
 using PackageKit.
 
+%package device-rebind
+Summary: Device rebind functionality for PackageKit
+Group: Development/Libraries
+Requires: PackageKit-glib = %{version}-%{release}
+
+%description device-rebind
+The device rebind functionality offer the ability to re-initialize devices
+after firmware has been installed by PackageKit. This removes the need for the
+user to restart the computer or remove and re-insert the device.
+
 %prep
 %setup -q -n %{?name}-%{?version}-%{?alphatag}
 #%setup -q
@@ -391,6 +402,12 @@ update-mime-database %{_datadir}/mime &>
 %{_sysconfdir}/profile.d/*
 %{_libexecdir}/pk-command-not-found
 
+%files device-rebind
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_sbindir}/pk-device-rebind
+%{_datadir}/man/man1/pk-device-rebind.1.gz
+
 %files glib-devel
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
@@ -419,6 +436,10 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090824git
+- Update to a newer git snapshot from the 0.5.x series.
+- Enable GUdev functionality and create a device-rebind subpackage.
+
 * Wed Aug 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090819git
 - Update to a git snapshot from the 0.5.x series.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	19 Aug 2009 16:28:42 -0000	1.53
+++ sources	24 Aug 2009 13:49:27 -0000	1.54
@@ -1 +1 @@
-4be61177f1608e0c67e2dc53177fb170  PackageKit-0.5.2-20090819.tar.gz
+65d1187374f4fbf9022c5caa4ad53aa7  PackageKit-0.5.2-20090824.tar.gz



From mgrepl at fedoraproject.org  Mon Aug 24 13:58:25 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon, 24 Aug 2009 13:58:25 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.47,
	1.48 selinux-policy.spec, 1.900, 1.901
Message-ID: <20090824135825.DED4211C0044@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-serv659

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow pptp dac_override capability



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.if               |   18 +
 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/usermanage.te        |    1 
 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              |   15 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 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          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   30 +++
 policy/modules/kernel/files.if            |    3 
 policy/modules/kernel/kernel.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    |    9 
 policy/modules/roles/unprivuser.te        |    4 
 policy/modules/roles/xguest.te            |    6 
 policy/modules/services/apache.fc         |    4 
 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/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/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    6 
 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            |   14 +
 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             |   19 ++
 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/rpc.te            |   12 +
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/sasl.te           |    2 
 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/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |    8 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 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             |    2 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 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       |   33 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 143 files changed, 2360 insertions(+), 646 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- policy-20090521.patch	20 Aug 2009 14:29:53 -0000	1.47
+++ policy-20090521.patch	24 Aug 2009 13:58:23 -0000	1.48
@@ -748,6 +748,31 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	ssh_rw_pipes(gitosis_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.12/policy/modules/apps/gnome.te
+--- nsaserefpolicy/policy/modules/apps/gnome.te	2009-06-25 10:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/apps/gnome.te	2009-08-24 09:15:41.000000000 +0200
+@@ -114,6 +114,21 @@
+ 
+ userdom_dontaudit_search_admin_dir(gconfdefaultsm_t)
+ 
++# if $HOME/.gconf is labeled as user_home_t
++userdom_user_home_dir_filetrans_pattern(gconfdefaultsm_t, { file })
++userdom_manage_user_home_content_dirs(gconfdefaultsm_t)
++userdom_manage_user_home_content_files(gconfdefaultsm_t)
++
++tunable_policy(`use_nfs_home_dirs',`
++        fs_manage_nfs_dirs(gconfdefaultsm_t)
++        fs_manage_nfs_files(gconfdefaultsm_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++        fs_manage_cifs_dirs(gconfdefaultsm_t)
++        fs_manage_cifs_files(gconfdefaultsm_t)
++')
++
+ optional_policy(`
+         consolekit_dbus_chat(gconfdefaultsm_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.6.12/policy/modules/apps/gpg.if
 --- nsaserefpolicy/policy/modules/apps/gpg.if	2009-06-25 10:19:43.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/apps/gpg.if	2009-08-18 15:05:46.000000000 +0200
@@ -2766,8 +2791,22 @@ diff -b -B --ignore-all-space --exclude-
  permissive fprintd_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.12/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/ftp.te	2009-07-03 08:22:14.000000000 +0200
-@@ -91,6 +91,9 @@
++++ serefpolicy-3.6.12/policy/modules/services/ftp.te	2009-08-24 09:30:32.000000000 +0200
+@@ -85,12 +85,23 @@
+ type xferlog_t;
+ logging_log_file(xferlog_t)
+ 
++ifdef(`enable_mcs',`
++	init_ranged_daemon_domain(ftpd_t, ftpd_exec_t, s0 - mcs_systemhigh)
++')
++
++ifdef(`enable_mls',`
++	init_ranged_daemon_domain(ftpd_t, ftpd_exec_t, mls_systemhigh)
++')  
++
+ ########################################
+ #
+ # ftpd local policy
  #
  
  allow ftpd_t self:capability { chown fowner fsetid setgid setuid sys_chroot sys_nice sys_resource };
@@ -2777,7 +2816,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit ftpd_t self:capability sys_tty_config;
  allow ftpd_t self:process signal_perms;
  allow ftpd_t self:process { getcap setcap setsched setrlimit };
-@@ -99,6 +102,7 @@
+@@ -99,6 +110,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
  allow ftpd_t self:udp_socket create_socket_perms;
@@ -2785,7 +2824,7 @@ diff -b -B --ignore-all-space --exclude-
  allow ftpd_t self:key manage_key_perms;
  
  allow ftpd_t ftpd_etc_t:file read_file_perms;
-@@ -129,8 +133,7 @@
+@@ -129,8 +141,7 @@
  allow ftpd_t ftpdctl_tmp_t:sock_file { getattr unlink };
  
  # Create and modify /var/log/xferlog.
@@ -3675,6 +3714,18 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.6.12/policy/modules/services/ppp.te
+--- nsaserefpolicy/policy/modules/services/ppp.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/ppp.te	2009-08-24 15:30:24.000000000 +0200
+@@ -218,7 +218,7 @@
+ # PPTP Local policy
+ #
+ 
+-allow pptp_t self:capability { net_raw net_admin };
++allow pptp_t self:capability { dac_read_search dac_override net_raw net_admin };
+ dontaudit pptp_t self:capability sys_tty_config;
+ allow pptp_t self:process signal;
+ allow pptp_t self:fifo_file rw_fifo_file_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.12/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/privoxy.te	2009-06-25 10:21:01.000000000 +0200
@@ -4208,6 +4259,19 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
  manage_files_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.12/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/squid.te	2009-08-23 20:37:28.000000000 +0200
+@@ -67,7 +67,9 @@
+ 
+ can_exec(squid_t, squid_exec_t)
+ 
++manage_dirs_pattern(squid_t, squid_log_t, squid_log_t)
+ manage_files_pattern(squid_t, squid_log_t, squid_log_t)
++manage_lnk_files_pattern(squid_t, squid_log_t, squid_log_t)
+ logging_log_filetrans(squid_t, squid_log_t, { file dir })
+ 
+ manage_files_pattern(squid_t, squid_var_run_t, squid_var_run_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/ssh.if	2009-07-20 14:31:17.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -p -r1.900 -r1.901
--- selinux-policy.spec	20 Aug 2009 11:27:42 -0000	1.900
+++ selinux-policy.spec	24 Aug 2009 13:58:24 -0000	1.901
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 79%{?dist}
+Release: 80%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 24 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-80
+- Allow pptp dac_override capability
+
 * Thu Aug 20 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-79
 - Fixes for racoon 
 - Fixes for ptchown



From twaugh at fedoraproject.org  Mon Aug 24 14:09:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 14:09:58 +0000 (UTC)
Subject: rpms/foomatic/F-11 foomatic.spec,1.222,1.223 sources,1.75,1.76
Message-ID: <20090824140958.4328C11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3514

Modified Files:
	foomatic.spec sources 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-7
- Restored db-hpijs.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/foomatic.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- foomatic.spec	21 Aug 2009 10:15:19 -0000	1.222
+++ foomatic.spec	24 Aug 2009 14:09:57 -0000	1.223
@@ -2,11 +2,12 @@
 %define dbver_snap 20090819
 %define enginever 4.0.2
 %define filtersver 4.0.2
+%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -18,6 +19,7 @@ Source0: http://www.openprinting.org/dow
 
 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)
 
@@ -82,7 +84,7 @@ queues (foomatic-configure) and to print
 The site http://www.linuxprinting.org/ is based on this database.
 
 %prep
-%setup -q -c -a 1 -a 2
+%setup -q -c -a 1 -a 2 -a 3
 
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
@@ -95,6 +97,9 @@ chmod a+x mkinstalldirs
 %patch102 -p1
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+popd
+
 pushd foomatic-db-%{dbver_snap}
 cd db/source
 
@@ -142,6 +147,11 @@ pushd foomatic-db-%{dbver_snap}
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+%configure
+make PREFIX=%{_prefix} CFLAGS="$RPM_OPTFLAGS"
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -171,6 +181,13 @@ make	DESTDIR=%buildroot PREFIX=%{_prefix
 
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+make	DESTDIR=%buildroot PREFIX=%{_prefix} \
+	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
+	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
+	install
+popd
+
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
 
@@ -228,6 +245,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-11/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	21 Aug 2009 10:15:19 -0000	1.75
+++ sources	24 Aug 2009 14:09:57 -0000	1.76
@@ -1,3 +1,4 @@
 9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
 8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
 b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz



From rdieter at fedoraproject.org  Mon Aug 24 14:10:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 14:10:42 +0000 (UTC)
Subject: rpms/ktorrent/devel ktorrent.spec,1.103,1.104
Message-ID: <20090824141042.0472711C0426@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3675

Modified Files:
	ktorrent.spec 
Log Message:
drop VERBOSE... used only in my own local testing



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- ktorrent.spec	23 Aug 2009 23:09:54 -0000	1.103
+++ ktorrent.spec	24 Aug 2009 14:10:40 -0000	1.104
@@ -78,7 +78,7 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 %{__rm} -rf %{buildroot}



From rdieter at fedoraproject.org  Mon Aug 24 14:13:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 14:13:47 +0000 (UTC)
Subject: rpms/ktorrent/F-11 ktorrent.spec, 1.98,
	1.99 ktorrent-3.2.1-kdebug#188447.patch, 1.1, NONE
Message-ID: <20090824141347.5F7AB11C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4419

Modified Files:
	ktorrent.spec 
Removed Files:
	ktorrent-3.2.1-kdebug#188447.patch 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
- -libs to make multilib friendly



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- ktorrent.spec	12 Aug 2009 16:10:52 -0000	1.98
+++ ktorrent.spec	24 Aug 2009 14:13:47 -0000	1.99
@@ -3,7 +3,7 @@
 
 Name:           ktorrent
 Version:        3.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gmp-devel
 BuildRequires: GeoIP-devel
-# libtaskmanager support
+# libtaskmanager support, for plasma applet
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
 BuildRequires: kdepimlibs-devel
@@ -27,22 +27,45 @@ BuildRequires: taglib-devel
 
 %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} 
+# help multilib upgrades
+Obsoletes: ktorrent < 3.2.3-2
+
+Provides: plasma-engine-ktorrent = %{version}-%{release}
+# possible temporary upgrade path for kde-plasma-ktorrent split
+#if 0%{?fedora} < 12
+#Requires: kde-plasma-ktorrent = %{version}-%{release}
+#endif
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
 integration, download of torrent files, upload speed capping, internet
 searching using various search engines, UDP Trackers and UPnP support.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package        devel
 Summary:        Headers and libraries for building apps that use ktorrent
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       kdelibs4-devel
-
 %description    devel
 The headers and libraries used for developing applications on top of ktorrent.
 
+%package -n kde-plasma-ktorrent
+Summary: ktorrent plasma applet
+Group: Applications/Internet
+Requires: plasma-engine-ktorrent = %{version}-%{release}
+%description -n kde-plasma-ktorrent
+%{summary}.
+
+
 %prep
 %setup -q
 
@@ -105,19 +128,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
-%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.11*
-%{_kde4_libdir}/libktcore.so.9*
-%{_kde4_libdir}/libktupnp.so.4*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
 %{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
-%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libbtcore.so.11*
+%{_kde4_libdir}/libktcore.so.9*
+%{_kde4_libdir}/libktupnp.so.4*
 
 %files devel
 %defattr(-,root,root,-)
@@ -127,7 +150,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/libktupnp.so
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
+%files -n kde-plasma-ktorrent
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
+
+
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
+- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
+- -libs to make multilib friendly
+
 * Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
 - ktorrent-3.2.3
 


--- ktorrent-3.2.1-kdebug#188447.patch DELETED ---



From rdieter at fedoraproject.org  Mon Aug 24 14:14:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 14:14:06 +0000 (UTC)
Subject: rpms/ktorrent/F-10 ktorrent.spec, 1.89,
	1.90 ktorrent-3.2.1-kdebug#188447.patch, 1.1, NONE
Message-ID: <20090824141406.9D68E11C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4552

Modified Files:
	ktorrent.spec 
Removed Files:
	ktorrent-3.2.1-kdebug#188447.patch 
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
- -libs to make multilib friendly



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- ktorrent.spec	12 Aug 2009 16:15:23 -0000	1.89
+++ ktorrent.spec	24 Aug 2009 14:14:06 -0000	1.90
@@ -3,7 +3,7 @@
 
 Name:           ktorrent
 Version:        3.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gmp-devel
 BuildRequires: GeoIP-devel
-# libtaskmanager support
+# libtaskmanager support, for plasma applet
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
 BuildRequires: kdepimlibs-devel
@@ -27,22 +27,45 @@ BuildRequires: taglib-devel
 
 %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} 
+# help multilib upgrades
+Obsoletes: ktorrent < 3.2.3-2
+
+Provides: plasma-engine-ktorrent = %{version}-%{release}
+# possible temporary upgrade path for kde-plasma-ktorrent split
+#if 0%{?fedora} < 12
+#Requires: kde-plasma-ktorrent = %{version}-%{release}
+#endif
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
 integration, download of torrent files, upload speed capping, internet
 searching using various search engines, UDP Trackers and UPnP support.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package        devel
 Summary:        Headers and libraries for building apps that use ktorrent
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       kdelibs4-devel
-
 %description    devel
 The headers and libraries used for developing applications on top of ktorrent.
 
+%package -n kde-plasma-ktorrent
+Summary: ktorrent plasma applet
+Group: Applications/Internet
+Requires: plasma-engine-ktorrent = %{version}-%{release}
+%description -n kde-plasma-ktorrent
+%{summary}.
+
+
 %prep
 %setup -q
 
@@ -105,19 +128,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
-%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.11*
-%{_kde4_libdir}/libktcore.so.9*
-%{_kde4_libdir}/libktupnp.so.4*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
 %{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
-%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libbtcore.so.11*
+%{_kde4_libdir}/libktcore.so.9*
+%{_kde4_libdir}/libktupnp.so.4*
 
 %files devel
 %defattr(-,root,root,-)
@@ -127,7 +150,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/libktupnp.so
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
+%files -n kde-plasma-ktorrent
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
+
+
 %changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
+- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
+- -libs to make multilib friendly
+
 * Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
 - ktorrent-3.2.3
 


--- ktorrent-3.2.1-kdebug#188447.patch DELETED ---



From twaugh at fedoraproject.org  Mon Aug 24 14:20:18 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 14:20:18 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.224,1.225
Message-ID: <20090824142018.B74BC11C0376@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5738

Modified Files:
	hplip.spec 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Build no longer requires libudev-devel.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- hplip.spec	24 Aug 2009 11:37:40 -0000	1.224
+++ hplip.spec	24 Aug 2009 14:20:18 -0000	1.225
@@ -39,7 +39,6 @@ BuildRequires: python-devel
 BuildRequires: libjpeg-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libusb-devel
-BuildRequires: libudev-devel
 BuildRequires: openssl-devel
 BuildRequires: sane-backends-devel
 BuildRequires: dbus-devel
@@ -320,6 +319,7 @@ exit 0
 
 %changelog
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-7



From twaugh at fedoraproject.org  Mon Aug 24 14:20:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 14:20:54 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.219,1.220
Message-ID: <20090824142054.5143411C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5919

Modified Files:
	hplip.spec 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Build no longer requires libudev-devel.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- hplip.spec	24 Aug 2009 11:38:12 -0000	1.219
+++ hplip.spec	24 Aug 2009 14:20:54 -0000	1.220
@@ -39,7 +39,6 @@ BuildRequires: python-devel
 BuildRequires: libjpeg-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libusb-devel
-BuildRequires: libudev-devel
 BuildRequires: openssl-devel
 BuildRequires: sane-backends-devel
 BuildRequires: dbus-devel
@@ -320,6 +319,7 @@ exit 0
 
 %changelog
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-7



From twaugh at fedoraproject.org  Mon Aug 24 14:35:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 14:35:43 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.fdi,1.5,1.6 hplip.spec,1.220,1.221
Message-ID: <20090824143543.8779C11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8771

Modified Files:
	hplip.spec 
Added Files:
	hplip.fdi 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Use hal rules instead of udev for F-11 (no udev ACL support).



Index: hplip.fdi
===================================================================
RCS file: hplip.fdi
diff -N hplip.fdi
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip.fdi	24 Aug 2009 14:35:42 -0000	1.6
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+
+<deviceinfo version="0.2">
+  <device>
+    <!-- HPLIP-driven printers and scanners -->
+    <match key="info.subsystem" contains="usb_device">
+      <match key="usb_device.vendor_id" int="0x03f0">
+        <append key="info.capabilities" type="strlist">scanner</append>
+      </match>
+    </match>
+
+    <!-- Set ACLs -->
+    <match key="info.capabilities" contains="scanner">
+      <append key="info.capabilities" type="strlist">access_control</append>
+      <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      <merge key="access_control.type" type="string">scanner</merge>
+    </match>
+  </device>
+</deviceinfo>


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- hplip.spec	24 Aug 2009 14:20:54 -0000	1.220
+++ hplip.spec	24 Aug 2009 14:35:42 -0000	1.221
@@ -14,6 +14,7 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Source1: hplip.fdi
 Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
@@ -122,7 +123,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install --enable-udev-acl-rules
+	--enable-hpijs-install
 
 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
@@ -137,7 +138,7 @@ make install DESTDIR=%{buildroot}
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
 	%{buildroot}%{_docdir} \
-	%{buildroot}%{_datadir}/hal/fdi
+	%{buildroot}%{_sysconfdir}/udev/rules.d/*
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -159,6 +160,10 @@ desktop-file-install --vendor HP				\
 	--add-category Application				\
 	hplip.desktop
 
+mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+
+
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
 
@@ -172,13 +177,16 @@ rm -f %{buildroot}%{_datadir}/hplip/hpij
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
+# Remove the hal preprobe rules as they were causing breakage (bug #479648).
+rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_sysconfdir}/udev/rules.d/*
+%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -319,6 +327,7 @@ exit 0
 
 %changelog
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Use hal rules instead of udev for F-11 (no udev ACL support).
 - Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).
 



From rdieter at fedoraproject.org  Mon Aug 24 14:41:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 14:41:53 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.31, 1.32 ktorrent.spec, 1.104,
	1.105 sources, 1.31, 1.32
Message-ID: <20090824144153.1F0BA11C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10789

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
- upstream tarball respin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	12 Aug 2009 15:50:17 -0000	1.31
+++ .cvsignore	24 Aug 2009 14:41:52 -0000	1.32
@@ -1 +1 @@
-ktorrent-3.2.3.tar.bz2
+ktorrent-3.2.3-1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- ktorrent.spec	24 Aug 2009 14:10:40 -0000	1.104
+++ ktorrent.spec	24 Aug 2009 14:41:52 -0000	1.105
@@ -3,12 +3,12 @@
 
 Name:           ktorrent
 Version:        3.2.3
-Release:        2%{?dist}
+Release:        3%{?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}/ktorrent-%{version}-1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
+- upstream tarball respin
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
 - kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
 - -libs to make multilib friendly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Aug 2009 15:50:17 -0000	1.31
+++ sources	24 Aug 2009 14:41:52 -0000	1.32
@@ -1 +1 @@
-5c65b9e30107b922f025650887e4dee7  ktorrent-3.2.3.tar.bz2
+f1430998c17925e4c6a08ce062f53ff2  ktorrent-3.2.3-1.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug 24 14:44:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 14:44:35 +0000 (UTC)
Subject: rpms/mutter-moblin/devel mutter-moblin.spec,1.4,1.5
Message-ID: <20090824144435.6694611C0044@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11413

Modified Files:
	mutter-moblin.spec 
Log Message:
- require mutter


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mutter-moblin.spec	21 Aug 2009 19:30:36 -0000	1.4
+++ mutter-moblin.spec	24 Aug 2009 14:44:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mutter-moblin
 Version:        0.34.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
 Group:          User Interface/Desktops
@@ -23,6 +23,7 @@ BuildRequires: libtool
 BuildRequires: gnome-common
 
 Requires: redhat-menus
+Requires: mutter
 
 %description
 Moblin Netbook plugin for Mutter. This is the main gui interface to Moblin.
@@ -77,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.3-3
+- Require mutter
+
 * Thu Aug 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.3-2
 - Move a needed file from devel to main package
 



From karsten at fedoraproject.org  Mon Aug 24 14:44:36 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 24 Aug 2009 14:44:36 +0000 (UTC)
Subject: rpms/usbutils/devel usbutils.spec,1.29,1.30
Message-ID: <20090824144436.1550411C0044@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/usbutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11368

Modified Files:
	usbutils.spec 
Log Message:
- drop ExcludeArch: s390 s390x as we need this package on s390x to be able to build
  p.e. udev without any hacks



Index: usbutils.spec
===================================================================
RCS file: /cvs/extras/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- usbutils.spec	27 Jul 2009 06:39:27 -0000	1.29
+++ usbutils.spec	24 Aug 2009 14:44:35 -0000	1.30
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 0.82
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
@@ -11,7 +11,6 @@ BuildRequires: autoconf, libtool, libusb
 Summary: Linux USB utilities
 Group: Applications/System
 Conflicts: hotplug < 3:2002_01_14-2
-ExcludeArch: s390 s390x
 Patch0: usbutils-0.82-hwdata.patch
 
 %description 
@@ -45,6 +44,10 @@ sed -i 's|usbids=/usr/share/usb.ids|usbi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 0.82-5
+- drop ExcludeArch: s390 s390x as we need this package on s390x to be able to build
+  p.e. udev without any hacks
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Aug 24 14:47:40 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 14:47:40 +0000 (UTC)
Subject: rpms/perl-XML-Parser/devel perl-XML-Parser.spec,1.29,1.30
Message-ID: <20090824144740.B06B211C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-XML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12074

Modified Files:
	perl-XML-Parser.spec 
Log Message:
rebuild


Index: perl-XML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Parser/devel/perl-XML-Parser.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- perl-XML-Parser.spec	26 Jul 2009 17:36:32 -0000	1.29
+++ perl-XML-Parser.spec	24 Aug 2009 14:47:40 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser
 Version:        2.36
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl module for parsing XML files
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.36-6
+- rebuild against perl without DEBUGGING defined
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.36-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mgrepl at fedoraproject.org  Mon Aug 24 14:48:05 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon, 24 Aug 2009 14:48:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.48,1.49
Message-ID: <20090824144805.C11F011C0044@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-serv12192

Modified Files:
	policy-20090521.patch 
Log Message:
- Allow pptp dac_override capability



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.if               |   18 +
 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/usermanage.te        |    1 
 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              |   15 +
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |    1 
 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          |    2 
 policy/modules/kernel/devices.if          |  145 +++++++++++++++
 policy/modules/kernel/devices.te          |   13 +
 policy/modules/kernel/domain.if           |   45 +---
 policy/modules/kernel/domain.te           |   30 +++
 policy/modules/kernel/files.if            |    3 
 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    |    9 
 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         |    4 
 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/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/dbus.if           |    4 
 policy/modules/services/dcc.te            |    8 
 policy/modules/services/ddclient.if       |   25 ++
 policy/modules/services/devicekit.te      |    6 
 policy/modules/services/dnsmasq.te        |    4 
 policy/modules/services/dovecot.if        |   34 +--
 policy/modules/services/dovecot.te        |   20 +-
 policy/modules/services/exim.te           |    6 
 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            |   14 +
 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             |   19 ++
 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/rpc.te            |   12 +
 policy/modules/services/rsync.te          |    2 
 policy/modules/services/sasl.te           |    2 
 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/spamassassin.fc   |    8 
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/services/squid.te          |    2 
 policy/modules/services/ssh.if            |   23 ++
 policy/modules/services/ssh.te            |    8 
 policy/modules/services/uucp.te           |    2 
 policy/modules/services/virt.te           |   27 ++
 policy/modules/services/xserver.fc        |    2 
 policy/modules/services/xserver.if        |   41 ++++
 policy/modules/services/xserver.te        |   11 -
 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             |    2 
 policy/modules/system/ipsec.te            |   61 +++++-
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   11 +
 policy/modules/system/locallogin.te       |    6 
 policy/modules/system/miscfiles.fc        |    1 
 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       |   33 ++-
 policy/modules/system/virtual.te          |    5 
 policy/modules/system/xen.te              |    1 
 147 files changed, 2364 insertions(+), 648 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- policy-20090521.patch	24 Aug 2009 13:58:23 -0000	1.48
+++ policy-20090521.patch	24 Aug 2009 14:48:05 -0000	1.49
@@ -1980,6 +1980,29 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.6.12/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/kernel/storage.fc	2009-08-24 16:29:47.000000000 +0200
+@@ -28,6 +28,7 @@
+ /dev/megadev.*		-c	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/mspblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
++/dev/mtd.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.6.12/policy/modules/kernel/storage.if
+--- nsaserefpolicy/policy/modules/kernel/storage.if	2009-04-07 21:54:48.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/kernel/storage.if	2009-08-24 16:26:39.000000000 +0200
+@@ -529,7 +529,7 @@
+ 
+ 	')
+ 
+-	dontaudit $1 removable_device_t:blk_file { getattr ioctl read };
++	dontaudit $1 removable_device_t:blk_file read_blk_file_perms;
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.6.12/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/kernel/terminal.if	2009-06-25 10:21:01.000000000 +0200
@@ -2178,6 +2201,29 @@ diff -b -B --ignore-all-space --exclude-
  		files_dontaudit_getattr_boot_dirs(xguest_t)
  		files_search_mnt(xguest_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.fc serefpolicy-3.6.12/policy/modules/services/afs.fc
+--- nsaserefpolicy/policy/modules/services/afs.fc	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/afs.fc	2009-08-24 16:34:56.000000000 +0200
+@@ -26,7 +26,7 @@
+ /vicepb				gen_context(system_u:object_r:afs_files_t,s0)
+ /vicepc				gen_context(system_u:object_r:afs_files_t,s0)
+ 
+-
++/usr/vice/cache(/.*)?  		gen_context(system_u:object_r:afs_cache_t,s0)
+ /usr/vice/etc/afsd	--	gen_context(system_u:object_r:afs_exec_t,s0)
+ 
+ /var/cache/afs(/.*)?		gen_context(system_u:object_r:afs_cache_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.te serefpolicy-3.6.12/policy/modules/services/afs.te
+--- nsaserefpolicy/policy/modules/services/afs.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/afs.te	2009-08-24 16:32:10.000000000 +0200
+@@ -331,6 +331,7 @@
+ files_mounton_mnt(afs_t)
+ files_read_etc_files(afs_t)
+ files_rw_etc_runtime_files(afs_t)
++files_read_usr_files(afs_t)
+ 
+ fs_getattr_xattr_fs(afs_t)
+ fs_mount_nfs(afs_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.12/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/apache.fc	2009-06-25 10:21:01.000000000 +0200



From caolanm at fedoraproject.org  Mon Aug 24 14:50:36 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 24 Aug 2009 14:50:36 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.defaultdoclang.patch, NONE,
	1.1 openoffice.org.spec, 1.1991,
	1.1992 planned.workspace.defaultdoclang.patch, 1.10, NONE
Message-ID: <20090824145036.B07FA11C0376@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12740

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.defaultdoclang.patch 
Removed Files:
	planned.workspace.defaultdoclang.patch 
Log Message:
workspace no longer planned, now ready for qa

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(-)

--- NEW FILE workspace.defaultdoclang.patch ---
Index: reportdesign/source/core/api/ReportComponent.cxx
===================================================================
--- reportdesign/source/core/api/ReportComponent.cxx	(revision 267481)
+++ reportdesign/source/core/api/ReportComponent.cxx	(working copy)
@@ -41,10 +41,12 @@
 #include "ReportControlModel.hxx"
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 // #include <svx/unoshape.hxx>
 #include <svx/unolingu.hxx>
 #include <svtools/syslocale.hxx>
 #include <svtools/lingucfg.hxx>
+#include <i18npool/mslangid.hxx>
 // =============================================================================
 namespace reportdesign
 {
@@ -96,12 +98,14 @@
     try
     {
         SvtLinguConfig aLinguConfig;
+        using namespace ::com::sun::star::i18n::ScriptType;
+
         aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale"))) >>= aCharLocale;
-        LanguageType eCurLang = SvxLocaleToLanguage( aCharLocale );
+        LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocale), LATIN);
         aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK")))  >>= aCharLocaleAsian;
-        LanguageType eCurLangCJK = SvxLocaleToLanguage( aCharLocaleAsian );
+        LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleAsian), ASIAN);
         aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL")))  >>= aCharLocaleComplex;
-        LanguageType eCurLangCTL = SvxLocaleToLanguage( aCharLocaleComplex );
+        LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleComplex), COMPLEX);
 
         Font aLatin,aCJK,aCTL;
         lcl_getDefaultFonts(aLatin,aCJK,aCTL,eCurLang,eCurLangCJK,eCurLangCTL);
Index: linguistic/source/lngopt.cxx
===================================================================
--- linguistic/source/lngopt.cxx	(revision 267481)
+++ linguistic/source/lngopt.cxx	(working copy)
@@ -46,7 +46,9 @@
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <unotools/processfactory.hxx>
+#include <i18npool/mslangid.hxx>
 
 using namespace utl;
 using namespace osl;
@@ -100,13 +102,13 @@
 }
 
 
-BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal)
+BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
 {
 	BOOL bRes = FALSE;
 
 	Locale	aNew;
 	rVal >>= aNew;
-	INT16 nNew = LocaleToLanguage( aNew );
+        INT16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
 	if (nNew != rLanguage)
 	{
 		Locale	aLocale( CreateLocale( rLanguage ) );
@@ -149,17 +151,17 @@
 		case WID_HYPH_MIN_WORD_LENGTH :		pnVal = &pData->nHyphMinWordLength;	break;
 		case WID_DEFAULT_LOCALE :
 		{
-			bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal );
+			bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal, ::com::sun::star::i18n::ScriptType::LATIN );
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CJK :
 		{
-			bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal );
+			bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal, ::com::sun::star::i18n::ScriptType::ASIAN );
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CTL :
 		{
-			bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal );
+			bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal, ::com::sun::star::i18n::ScriptType::COMPLEX );
 			break;
 		}
 		default :
@@ -226,19 +228,19 @@
 		case WID_HYPH_MIN_WORD_LENGTH :		pnVal = &pData->nHyphMinWordLength;	break;
 		case WID_DEFAULT_LOCALE :
 		{
-			Locale aLocale( CreateLocale( pData->nDefaultLanguage ) );
+			Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage ) );
 			rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CJK :
 		{
-			Locale aLocale( CreateLocale( pData->nDefaultLanguage_CJK ) );
+			Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CJK ) );
 			rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CTL :
 		{
-			Locale aLocale( CreateLocale( pData->nDefaultLanguage_CTL ) );
+			Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CTL ) );
 			rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
 			break;
 		}
Index: linguistic/source/lngopt.hxx
===================================================================
--- linguistic/source/lngopt.hxx	(revision 267481)
+++ linguistic/source/lngopt.hxx	(working copy)
@@ -77,7 +77,7 @@
 
 	BOOL SetLocale_Impl( INT16 &rLanguage,
 			::com::sun::star::uno::Any &rOld,
-			const ::com::sun::star::uno::Any &rVal);
+			const ::com::sun::star::uno::Any &rVal, sal_Int16 nType );
 
 public:
 	LinguOptions();
Index: sc/source/ui/app/scmod2.cxx
===================================================================
--- sc/source/ui/app/scmod2.cxx	(revision 267481)
+++ sc/source/ui/app/scmod2.cxx	(working copy)
@@ -37,7 +37,8 @@
 
 #include <svx/unolingu.hxx>
 #include <svtools/lingucfg.hxx>
-
+#include <i18npool/mslangid.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
@@ -62,9 +63,9 @@
 	SvtLinguOptions aOptions;
 	aConfig.GetOptions( aOptions );
 
-	rDefLang = aOptions.nDefaultLanguage;
-	rCjkLang = aOptions.nDefaultLanguage_CJK;
-	rCtlLang = aOptions.nDefaultLanguage_CTL;
+	rDefLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
+	rCjkLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
+	rCtlLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
 	rAutoSpell = aOptions.bIsSpellAuto;
 }
 
Index: sd/source/core/drawdoc.cxx
===================================================================
--- sd/source/core/drawdoc.cxx	(revision 267481)
+++ sd/source/core/drawdoc.cxx	(working copy)
@@ -34,6 +34,7 @@
 #include "PageListWatcher.hxx"
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/forbiddencharacterstable.hxx>
 
 #include <svx/svxids.hrc>
@@ -230,9 +231,12 @@
 		SvtLinguOptions			aOptions;
 		aLinguConfig.GetOptions( aOptions );
 
-		SetLanguage( aOptions.nDefaultLanguage, EE_CHAR_LANGUAGE );
-		SetLanguage( aOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK );
-		SetLanguage( aOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL );
+		SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, 
+            ::com::sun::star::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE );
+		SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK,
+            ::com::sun::star::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK );
+		SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, 
+            ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL );
 
 		mbOnlineSpell = aOptions.bIsSpellAuto;
 	}
Index: sd/source/ui/notes/EditWindow.cxx
===================================================================
--- sd/source/ui/notes/EditWindow.cxx	(revision 267481)
+++ sd/source/ui/notes/EditWindow.cxx	(working copy)
@@ -34,6 +34,8 @@
 #include "EditWindow.hxx"
 
 #include "sdmod.hxx"
+#include <i18npool/mslangid.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
 #include <vcl/scrbar.hxx>
@@ -174,9 +176,9 @@
             {   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
                 DEFAULTFONT_CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
         };
-        aTable[0].nLang = aOpt.nDefaultLanguage;
-        aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
-        aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
+        aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
+        aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
+        aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
         //
         for (int i = 0;  i < 3;  ++i)
         {
Index: sd/source/ui/presenter/PresenterTextView.cxx
===================================================================
--- sd/source/ui/presenter/PresenterTextView.cxx	(revision 267481)
+++ sd/source/ui/presenter/PresenterTextView.cxx	(working copy)
@@ -33,6 +33,7 @@
 
 #include "PresenterTextView.hxx"
 
+#include <i18npool/mslangid.hxx>
 #include <cppcanvas/vclfactory.hxx>
 #include <svtools/itempool.hxx>
 #include <svtools/itemset.hxx>
@@ -52,7 +53,9 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/util/Color.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -381,9 +384,9 @@
             {   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
                 DEFAULTFONT_CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
         };
-        aTable[0].nLang = aOpt.nDefaultLanguage;
-        aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
-        aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
+        aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
+        aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
+        aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
         //
         for (int i = 0;  i < 3;  ++i)
         {
Index: i18npool/source/isolang/mslangid.cxx
===================================================================
--- i18npool/source/isolang/mslangid.cxx	(revision 267481)
+++ i18npool/source/isolang/mslangid.cxx	(working copy)
@@ -41,6 +41,9 @@
 LanguageType MsLangId::nConfiguredSystemLanguage   = LANGUAGE_SYSTEM;
 LanguageType MsLangId::nConfiguredSystemUILanguage = LANGUAGE_SYSTEM;
 
+LanguageType MsLangId::nConfiguredWesternFallback  = LANGUAGE_SYSTEM;
+LanguageType MsLangId::nConfiguredAsianFallback    = LANGUAGE_SYSTEM;
+LanguageType MsLangId::nConfiguredComplexFallback  = LANGUAGE_SYSTEM;
 
 // static
 void MsLangId::setConfiguredSystemLanguage( LanguageType nLang )
@@ -55,8 +58,25 @@
     nConfiguredSystemUILanguage = nLang;
 }
 
+// static
+void MsLangId::setConfiguredWesternFallback( LanguageType nLang )
+{
+    nConfiguredWesternFallback = nLang;
+}
 
 // static
+void MsLangId::setConfiguredAsianFallback( LanguageType nLang )
+{
+    nConfiguredAsianFallback = nLang;
+}
+
+// static
+void MsLangId::setConfiguredComplexFallback( LanguageType nLang )
+{
+    nConfiguredComplexFallback = nLang;
+}
+
+// static
 inline LanguageType MsLangId::simplifySystemLanguages( LanguageType nLang )
 {
     switch (nLang)
@@ -120,6 +140,41 @@
 
 
 // static
+LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType )
+{
+    if (nLang == LANGUAGE_NONE)
+        return nLang;
+
+    nLang = getRealLanguage(nLang);
+    if (nType != ::com::sun::star::i18n::ScriptType::WEAK && getScriptType(nLang) != nType)
+    {
+        switch(nType)
+        {
+            case ::com::sun::star::i18n::ScriptType::ASIAN:
+                if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_CHINESE_SIMPLIFIED;
+                else
+                    nLang = nConfiguredComplexFallback;
+                break;
+            case ::com::sun::star::i18n::ScriptType::COMPLEX:
+                if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_HINDI;
+                else
+                    nLang = nConfiguredComplexFallback;
+                break;
+            default:
+                if (nConfiguredWesternFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_ENGLISH_US;
+                else
+                    nLang = nConfiguredWesternFallback;
+                break;
+                break;
+        }
+    }
+    return nLang;
+}
+
+// static
 void MsLangId::convertLanguageToLocale( LanguageType nLang,
         ::com::sun::star::lang::Locale & rLocale )
 {
Index: i18npool/inc/i18npool/mslangid.hxx
===================================================================
--- i18npool/inc/i18npool/mslangid.hxx	(revision 267481)
+++ i18npool/inc/i18npool/mslangid.hxx	(working copy)
@@ -216,6 +216,9 @@
     static LanguageType getRealLanguageWithoutConfig( LanguageType nLang );
 
 
+    static LanguageType resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType );
+
+
     /** Whether locale has a Right-To-Left orientation. */
     static bool isRightToLeft( LanguageType nLang );
 
@@ -246,6 +249,9 @@
         configuration! */
     static void setConfiguredSystemLanguage( LanguageType nLang );
     static void setConfiguredSystemUILanguage( LanguageType nLang );
+    static void setConfiguredWesternFallback( LanguageType nLang );
+    static void setConfiguredComplexFallback( LanguageType nLang );
+    static void setConfiguredAsianFallback( LanguageType nLang );
 
 // ---------------------------------------------------------------------------
 
@@ -274,6 +280,10 @@
     static LanguageType         nConfiguredSystemLanguage;
     static LanguageType         nConfiguredSystemUILanguage;
 
+    static LanguageType         nConfiguredWesternFallback;
+    static LanguageType         nConfiguredAsianFallback;
+    static LanguageType         nConfiguredComplexFallback;
+
     static LanguageType getPlatformSystemLanguage();
     static LanguageType getPlatformSystemUILanguage();
 
Index: sw/source/ui/app/docshini.cxx
===================================================================
--- sw/source/ui/app/docshini.cxx	(revision 267481)
+++ sw/source/ui/app/docshini.cxx	(working copy)
@@ -37,6 +37,7 @@
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
+#include <i18npool/mslangid.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
 #include <svtools/zforlist.hxx>
@@ -58,6 +59,7 @@
 #endif
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <rtl/logfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/xtable.hxx>
@@ -791,9 +793,9 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-    sal_Int16   nVal = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
 	aDfltSet.Put( SvxLanguageItem( nVal, RES_CHRATR_LANGUAGE ) );
     aDfltSet.Put( SvxLanguageItem( eCJK, RES_CHRATR_CJK_LANGUAGE ) );
     aDfltSet.Put( SvxLanguageItem( eCTL, RES_CHRATR_CTL_LANGUAGE ) );
Index: sw/source/ui/app/appopt.cxx
===================================================================
--- sw/source/ui/app/appopt.cxx	(revision 267481)
+++ sw/source/ui/app/appopt.cxx	(working copy)
@@ -35,6 +35,8 @@
 #include <cmdid.h>		  	// Funktion-Ids
 #endif
 
+#include <com/sun/star/i18n/ScriptType.hpp>
+
 #define _SVSTDARR_STRINGSDTOR
 #include <svtools/svstdarr.hxx>
 
@@ -54,6 +56,7 @@
 #include <svx/optgrid.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <i18npool/mslangid.hxx>
 #include <fontcfg.hxx>
 #include <optload.hxx>
 #include <optcomp.hxx>
@@ -191,16 +194,25 @@
 		pRet->Put(SwPtrItem(FN_PARAM_PRINTER, pPrt));*/
 
         SvtLinguConfig aLinguCfg;
+        Locale aLocale;
+        LanguageType nLang;
 
+        using namespace ::com::sun::star::i18n::ScriptType;
+
         Any aLang = aLinguCfg.GetProperty(C2U("DefaultLocale"));
-        Locale aLocale;
         aLang >>= aLocale;
-        pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_LANGUAGE));
+        nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), LATIN);
+        pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE));
 
         aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CJK"));
         aLang >>= aLocale;
-        pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CJK_LANGUAGE));
+        nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), ASIAN);
+        pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE));
 
+        aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CTL"));
+        aLang >>= aLocale;
+        nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), COMPLEX);
+        pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE));
     }
 	if(bTextDialog)
 		pRet->Put(SwPtrItem(FN_PARAM_STDFONTS, GetStdFontConfig()));
Index: sw/source/ui/dialog/ascfldlg.cxx
===================================================================
--- sw/source/ui/dialog/ascfldlg.cxx	(revision 267481)
+++ sw/source/ui/dialog/ascfldlg.cxx	(working copy)
@@ -35,6 +35,8 @@
 #endif
 #include <hintids.hxx>
 #include <rtl/textenc.h>
+#include <i18npool/mslangid.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svtools/lingucfg.hxx>
 #include <fontcfg.hxx>
 #include <swmodule.hxx>
@@ -234,14 +236,14 @@
                     switch(nAppScriptType)
                     {
                         case SCRIPTTYPE_ASIAN:
-                            aOpt.SetLanguage(aLinguOpt.nDefaultLanguage_CJK);
+                            aOpt.SetLanguage(MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, SCRIPTTYPE_ASIAN));
                         break;
                         case SCRIPTTYPE_COMPLEX:
-                            aOpt.SetLanguage(aLinguOpt.nDefaultLanguage_CTL);
+                            aOpt.SetLanguage(MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, SCRIPTTYPE_COMPLEX));
                         break;
                         //SCRIPTTYPE_LATIN:
                         default:
-                            aOpt.SetLanguage(aLinguOpt.nDefaultLanguage);
+                            aOpt.SetLanguage(MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, SCRIPTTYPE_LATIN));
                     }
                 }
 			}
Index: sw/source/ui/config/fontcfg.cxx
===================================================================
--- sw/source/ui/config/fontcfg.cxx	(revision 267481)
+++ sw/source/ui/config/fontcfg.cxx	(working copy)
@@ -33,10 +33,12 @@
 
 
 #include <fontcfg.hxx>
+#include <i18npool/mslangid.hxx>
 #include <vcl/outdev.hxx>
 #include <svtools/lingucfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <swtypes.hxx>
 
 #include <unomid.h>
@@ -116,9 +118,10 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-	sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
     for(sal_Int16 i = 0; i < DEF_FONT_COUNT; i++)
     {
         sDefaultFonts[i] = GetDefaultFor(i,
@@ -163,9 +166,10 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-	sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
     for(sal_uInt16 nProp = 0;
         nProp < sal::static_int_cast< sal_uInt16, sal_Int32 >( aNames.getLength() );
             nProp++)
@@ -198,9 +202,10 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-	sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
     String sDefFont(GetDefaultFor(FONT_STANDARD, eWestern));
     String sDefFontCJK(GetDefaultFor(FONT_STANDARD_CJK, eCJK));
     String sDefFontCTL(GetDefaultFor(FONT_STANDARD_CTL, eCTL));
@@ -320,9 +325,11 @@
     {
         SvtLinguOptions aLinguOpt;
         SvtLinguConfig().GetOptions( aLinguOpt );
-        sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                    eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                    eCTL = aLinguOpt.nDefaultLanguage_CTL;
+
+        sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                  eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                  eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
         // #i92090# default height value sets back to -1
         const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
         const bool bIsDefaultHeight = nHeight == nDefaultHeight;
Index: sw/source/ui/lingu/olmenu.cxx
===================================================================
--- sw/source/ui/lingu/olmenu.cxx	(revision 267481)
+++ sw/source/ui/lingu/olmenu.cxx	(working copy)
@@ -62,6 +62,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/dlgutil.hxx>
 #include <svtools/itemset.hxx>
 #include <svx/langitem.hxx>
@@ -168,7 +169,7 @@
 		SvtLinguOptions aLinguOpt;
 		SvtLinguConfig().GetOptions( aLinguOpt );
 		// The default document language from "Tools/Options - Language Settings - Languages: Western"
-		aLangList[0] = aLinguOpt.nDefaultLanguage;
+		aLangList[0] = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
 		// The one from "Tools/Options - Language Settings - Languages: User interface"
 		aLangList[1] = rSettings.GetUILanguage();
 		// The one from "Tools/Options - Language Settings - Languages: Locale setting"
Index: sw/util/makefile.mk
===================================================================
--- sw/util/makefile.mk	(revision 267481)
+++ sw/util/makefile.mk	(working copy)
@@ -190,6 +190,7 @@
 			$(SVLLIB) \
 			$(UNOTOOLSLIB) \
             $(TOOLSLIB) \
+			$(I18NISOLANGLIB) \
 			$(COMPHELPERLIB) \
 			$(UCBHELPERLIB)	\
 			$(CPPUHELPERLIB)	\
Index: chart2/source/tools/CharacterProperties.cxx
===================================================================
--- chart2/source/tools/CharacterProperties.cxx	(revision 267481)
+++ chart2/source/tools/CharacterProperties.cxx	(working copy)
@@ -51,9 +51,11 @@
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <comphelper/InlineContainer.hxx>
 
+
 // header for struct SvtLinguConfig
 #ifndef _SVTOOLS_LINGUCFG_HXX_
 #include <svtools/lingucfg.hxx>
@@ -471,16 +473,21 @@
     const float fDefaultFontHeight = 13.0;
 
     SvtLinguConfig aLinguConfig;
-    lang::Locale aDefaultLocale( C2U( "en" ), C2U( "US" ), OUString() );
+    lang::Locale aDefaultLocale;
     aLinguConfig.GetProperty(C2U("DefaultLocale")) >>= aDefaultLocale;
     lang::Locale aDefaultLocale_CJK;
     aLinguConfig.GetProperty(C2U("DefaultLocale_CJK")) >>= aDefaultLocale_CJK;
     lang::Locale aDefaultLocale_CTL;
     aLinguConfig.GetProperty(C2U("DefaultLocale_CTL")) >>= aDefaultLocale_CTL;
 
-    Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale ), DEFAULTFONT_FLAGS_ONLYONE, 0 );   
-    Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK ), DEFAULTFONT_FLAGS_ONLYONE, 0 );
-    Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL ), DEFAULTFONT_FLAGS_ONLYONE, 0 );
+    using namespace ::com::sun::star::i18n::ScriptType;
+    LanguageType nLang;
+    nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aDefaultLocale), LATIN);
+    Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );   
+    nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK), ASIAN);
+    Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
+    nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL), COMPLEX);
+    Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
 
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) );
Index: desktop/source/app/langselect.cxx
===================================================================
--- desktop/source/app/langselect.cxx	(revision 267481)
+++ desktop/source/app/langselect.cxx	(working copy)
@@ -104,7 +104,7 @@
         ::rtl::OUString sWin16SysLocale;
         aWin16SysLocale >>= sWin16SysLocale;
         if( sWin16SysLocale.getLength())
-            setDefaultLocale(sWin16SysLocale);
+            setDefaultLanguage(sWin16SysLocale);
     }
     catch(const Exception&)
     {
@@ -116,9 +116,8 @@
         OUString usLocale;
         Reference< XPropertySet > xLocaleProp(getConfigAccess(
             "org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW);
-           // "org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW);
         xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale;     
-            setDefaultLocale(usLocale);
+            setDefaultLanguage(usLocale);
     } 
     catch (Exception&) 
     {
@@ -160,89 +159,33 @@
 
     // #i32939# setting of default document locale
     // #i32939# this should not be based on the UI language
-    setDefaultLocale(aLocaleString);
+    setDefaultLanguage(aLocaleString);
 
-    // fallback: set en-US as default Western locale if no Western locale is set
-    OUString usWesternName = OUString::createFromAscii("DefaultLocale");
-    try
-    {       
-        Reference< XPropertySet > xProp(getConfigAccess(
-            "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-        OUString usValue;
-        xProp->getPropertyValue(usWesternName) >>= usValue;
-        if (usValue.getLength() == 0)
-        {
-            // there is no western document language selected
-            // if the selected locale is a western locale, this
-            // will become the default western docuemnt language
-            // otherwise, fall back to en-US
-            OUString usDefault = OUString::createFromAscii("en-US");
-            try
-            {
-                xProp->setPropertyValue(usWesternName, makeAny(usDefault));
-                Reference< XChangesBatch >(xProp,UNO_QUERY_THROW)->commitChanges();
-            }
-            catch ( PropertyVetoException )
-            {
-                // we are not allowed to change this
-            }
-        }
-    }
-    catch ( Exception& )
-    {
-    }
-
     return bSuccess;
 }
 
-void LanguageSelection::setDefaultLocale(const OUString& usUILocale)
+void LanguageSelection::setDefaultLanguage(const OUString& sLocale)
 {
-    // #i32939# setting of default document locale
-    // org.openoffice.Office.Linguistic/General/DefaultLocale
-    // org.openoffice.Office.Linguistic/General/DefaultLocale_CJK
-    // org.openoffice.Office.Linguistic/General/DefaultLocale_CTL
+    // #i32939# setting of default document language
+    //
+    // See #i42730# for rules for determining source of settings
 
-    // determine script type of UI locale
-    LanguageType ltUILocale = MsLangId::convertIsoStringToLanguage(usUILocale);
-    sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(ltUILocale);
+    // determine script type of locale
+    LanguageType nLang = MsLangId::convertIsoStringToLanguage(sLocale);
+    sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(nLang);
 
-    try
+    switch (nScriptType)
     {
-        Reference< XPropertySet > xProp(getConfigAccess(
-                                            "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-        OUString usName = OUString::createFromAscii("DefaultLocale");
-        switch (nScriptType)
-        {
-            case SCRIPTTYPE_ASIAN:
-                usName = OUString::createFromAscii("DefaultLocale_CJK");
-                break;
-            case SCRIPTTYPE_COMPLEX:
-                usName = OUString::createFromAscii("DefaultLocale_CTL");
-                break;
-        }
-        OUString usValue;
-        xProp->getPropertyValue(usName) >>= usValue;
-        if (usValue.getLength() == 0)
-        {
-            // there is no document language set, for the script type selected
-            // in the UI
-            // covert the LanguageType we've got from the LanguageTable back to
-            // an iso string and store it
-            OUString usDefault = MsLangId::convertLanguageToIsoString(ltUILocale);
-            try
-            {
-                xProp->setPropertyValue(usName, makeAny(usDefault));
-                Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
-            }
-            catch ( PropertyVetoException )
-            {
-                // we are not allowed to change this
-            }
-        }
+        case SCRIPTTYPE_ASIAN:
+            MsLangId::setConfiguredAsianFallback( nLang );
+            break;
+        case SCRIPTTYPE_COMPLEX:
+            MsLangId::setConfiguredComplexFallback( nLang );
+            break;
+        default:
+            MsLangId::setConfiguredWesternFallback( nLang );
+            break;
     }
-    catch ( Exception& )
-    {
-    }
 }
 
 OUString LanguageSelection::getLanguageString()
Index: desktop/source/app/langselect.hxx
===================================================================
--- desktop/source/app/langselect.hxx	(revision 267481)
+++ desktop/source/app/langselect.hxx	(working copy)
@@ -60,7 +60,7 @@
     static rtl::OUString getUserLanguage();
     static rtl::OUString getSystemLanguage();
     static void resetUserLanguage();
-    static void setDefaultLocale(const rtl::OUString&);
+    static void setDefaultLanguage(const rtl::OUString&);
 
 public:
     static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str);
Index: svx/source/dialog/optgdlg.cxx
===================================================================
--- svx/source/dialog/optgdlg.cxx	(revision 267481)
+++ svx/source/dialog/optgdlg.cxx	(working copy)
@@ -103,6 +103,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XSet.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <vcl/svapp.hxx>
 
@@ -1201,8 +1202,13 @@
 
     // initialize user interface language selection
     SvtLanguageTable* pLanguageTable = new SvtLanguageTable;
-    String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) );
-    aUserInterfaceLB.InsertEntry(aStr);
+    const String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) );
+
+    String aUILang(aStr);
+    aUILang += String::CreateFromAscii(" - ");
+    aUILang += pLanguageTable->GetString( Application::GetSettings().GetUILanguage() );
+
+    aUserInterfaceLB.InsertEntry(aUILang);
     aUserInterfaceLB.SetEntryData(0, 0);
     aUserInterfaceLB.SelectEntryPos(0);
     try
@@ -1264,16 +1270,24 @@
     }
 
     aWesternLanguageLB.SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
-    aAsianLanguageLB  .SetLanguageList( LANG_LIST_CJK     | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
+    aWesternLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::LATIN );
+    aAsianLanguageLB.SetLanguageList( LANG_LIST_CJK     | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
+    aAsianLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::ASIAN );
     aComplexLanguageLB.SetLanguageList( LANG_LIST_CTL     | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
-    aLocaleSettingLB  .SetLanguageList( LANG_LIST_ALL     | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
-    aLocaleSettingLB.InsertLanguage( LANGUAGE_SYSTEM );
+    aComplexLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX );
 
-    // insert SYSTEM entry, no specific currency
-    aCurrencyLB.InsertEntry( aStr );
+    aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL     | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
+    aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK );
+
+    const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
+    const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM );
+    // insert SYSTEM entry
+    String aDefaultCurr(aStr);
+    aDefaultCurr += String::CreateFromAscii(" - ");
+    aDefaultCurr += rCurr.GetBankSymbol();
+    aCurrencyLB.InsertEntry( aDefaultCurr );
     // all currencies
     String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( "  " ) );
-    const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
     USHORT nCurrCount = rCurrTab.Count();
     // first entry is SYSTEM, skip it
     for ( USHORT j=1; j < nCurrCount; ++j )
@@ -1282,7 +1296,7 @@
         String aStr_( pCurr->GetBankSymbol() );
         aStr_ += aTwoSpace;
         aStr_ += pCurr->GetSymbol();
-        aStr = ApplyLreOrRleEmbedding( aStr_ );
+        aStr_ = ApplyLreOrRleEmbedding( aStr_ );
         aStr_ += aTwoSpace;
         aStr_ += ApplyLreOrRleEmbedding( pLanguageTable->GetString( pCurr->GetLanguage() ) );
         USHORT nPos = aCurrencyLB.InsertEntry( aStr_ );
@@ -1496,7 +1510,7 @@
 		if(!bCurrentDocCBChecked)
 		{
 			Any aValue;
-			Locale aLocale = SvxCreateLocale( eSelectLang );
+			Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false );
 			aValue <<= aLocale;
 			OUString aPropName( C2U("DefaultLocale") );
             pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
@@ -1505,7 +1519,8 @@
 		}
 		if(pCurrentDocShell)
 		{
-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_LANGUAGE));
+			rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
+                SID_ATTR_LANGUAGE));
 			bRet = TRUE;
 		}
 	}
@@ -1516,7 +1531,7 @@
 		if(!bCurrentDocCBChecked)
 		{
 			Any aValue;
-			Locale aLocale = SvxCreateLocale( eSelectLang );
+			Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false );
 			aValue <<= aLocale;
 			OUString aPropName( C2U("DefaultLocale_CJK") );
             pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
@@ -1525,7 +1540,8 @@
 		}
 		if(pCurrentDocShell)
 		{
-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CJK_LANGUAGE));
+			rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
+                SID_ATTR_CHAR_CJK_LANGUAGE));
 			bRet = TRUE;
 		}
 	}
@@ -1536,7 +1552,7 @@
 		if(!bCurrentDocCBChecked)
 		{
 			Any aValue;
-			Locale aLocale = SvxCreateLocale( eSelectLang );
+			Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false );
 			aValue <<= aLocale;
 			OUString aPropName( C2U("DefaultLocale_CTL") );
             pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
@@ -1545,7 +1561,8 @@
 		}
 		if(pCurrentDocShell)
 		{
-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CTL_LANGUAGE));
+			rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
+                SID_ATTR_CHAR_CTL_LANGUAGE));
 			bRet = TRUE;
 		}
 	}
@@ -1645,13 +1662,18 @@
         aWestLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale"));
         Locale aLocale;
         aWestLang >>= aLocale;
-        eCurLang = SvxLocaleToLanguage( aLocale );
+
+        eCurLang = MsLangId::convertLocaleToLanguage( aLocale );
+
         aCJKLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale_CJK"));
+        aLocale = Locale();
         aCJKLang >>= aLocale;
-        eCurLangCJK = SvxLocaleToLanguage( aLocale );
+        eCurLangCJK = MsLangId::convertLocaleToLanguage( aLocale );
+
         aCTLLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale_CTL"));
+        aLocale = Locale();
         aCTLLang >>= aLocale;
-        eCurLangCTL = SvxLocaleToLanguage( aLocale );
+        eCurLangCTL = MsLangId::convertLocaleToLanguage( aLocale );
     }
     catch(Exception&)
     {
@@ -1663,13 +1685,25 @@
         aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
 		const SfxPoolItem* pLang;
 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
-			eCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+        {
+	        LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+            if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang)
+                eCurLang = eTempCurLang;
+        }
 
 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pLang))
-			eCurLangCJK = ((const SvxLanguageItem*)pLang)->GetValue();
+        {
+			LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+            if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang)
+                eCurLangCJK = eTempCurLang;
+        }
 
 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pLang))
-			eCurLangCTL = ((const SvxLanguageItem*)pLang)->GetValue();
+        {
+			LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+            if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang)
+                eCurLangCTL = eTempCurLang;
+        }
 	}
     if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang)
         aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE);
Index: svx/source/dialog/langbox.cxx
===================================================================
--- svx/source/dialog/langbox.cxx	(revision 267481)
+++ svx/source/dialog/langbox.cxx	(working copy)
@@ -37,8 +37,9 @@
 #include <com/sun/star/linguistic2/XLinguServiceManager.hdl>
 #endif
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <linguistic/misc.hxx>
-#include<rtl/ustring.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include <svtools/langtab.hxx>
@@ -315,6 +316,13 @@
 
 USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos )
 {
+    return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
+}
+
+//------------------------------------------------------------------------
+
+USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType )
+{
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the 
     // replacement already exists and if so don't add an entry with identical 
@@ -329,6 +337,15 @@
 	String aStrEntry = m_pLangTable->GetString( nLang );
 	if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
 		aStrEntry = m_aAllString;
+
+    LanguageType nRealLang = nLang;
+    if (nRealLang == LANGUAGE_SYSTEM)
+    {
+        nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
+        aStrEntry.AppendAscii(" - ");
+        aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
+    }
+
     aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
 
 	USHORT nAt = 0;
@@ -343,7 +360,7 @@
                 m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() );
         }
         bFound = m_pSpellUsedLang ?
-                    lcl_SeqHasLang( *m_pSpellUsedLang, nLang ) : FALSE;
+                    lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE;
 
         nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
 	}
@@ -356,6 +373,13 @@
 
 //------------------------------------------------------------------------
 
+USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos )
+{
+    return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
+}
+
+//------------------------------------------------------------------------
+
 USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
         BOOL bCheckEntry, USHORT nPos )
 {
Index: svx/inc/svx/langbox.hxx
===================================================================
--- svx/inc/svx/langbox.hxx	(revision 267481)
+++ svx/inc/svx/langbox.hxx	(working copy)
@@ -77,6 +77,7 @@
 
     SVX_DLLPRIVATE void                    Init();
     SVX_DLLPRIVATE USHORT                  ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked );
+    SVX_DLLPRIVATE USHORT                  ImplInsertLanguage(LanguageType, USHORT, sal_Int16 );
 
 public:
     SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE);
@@ -88,6 +89,7 @@
 							BOOL bCheckSpellAvail = FALSE );
 
 	USHORT			InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND );
+	USHORT			InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND );
     USHORT          InsertLanguage( const LanguageType eLangType,
                             BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND );
 	void			RemoveLanguage( const LanguageType eLangType );
Index: svtools/source/config/lingucfg.cxx
===================================================================
--- svtools/source/config/lingucfg.cxx	(revision 267481)
+++ svtools/source/config/lingucfg.cxx	(working copy)
@@ -72,69 +72,38 @@
 ///////////////////////////////////////////////////////////////////////////
 
 
-static lang::Locale lcl_CreateLocale( LanguageType eLang )
-{
-    lang::Locale aLocale;
-	if ( eLang != LANGUAGE_NONE )
-		MsLangId::convertLanguageToLocale( eLang, aLocale );
-
-	return aLocale;
-}
-
-
-static INT16 lcl_LocaleToLanguage( const lang::Locale& rLocale )
-{
-	//	empty Locale -> LANGUAGE_NONE
-	if ( rLocale.Language.getLength() == 0 )
-		return LANGUAGE_NONE;
-
-	//	Variant of Locale is ignored
-	return MsLangId::convertLocaleToLanguage( rLocale );
-}
-
-
 static BOOL lcl_SetLocale( INT16 &rLanguage, const uno::Any &rVal )
 {
-	BOOL bSucc = FALSE;
+    BOOL bSucc = FALSE;
 
     lang::Locale aNew;
-	if (rVal >>= aNew)	// conversion successful?
-	{
-		INT16 nNew = lcl_LocaleToLanguage( aNew );
-		if (nNew != rLanguage)
-		{
-			rLanguage = nNew;
-			bSucc = TRUE;
-		}
-	}
-
-	return bSucc;
+    if (rVal >>= aNew)	// conversion successful?
+    {
+        INT16 nNew = MsLangId::convertLocaleToLanguage( aNew );
+        if (nNew != rLanguage)
+        {
+            rLanguage = nNew;
+            bSucc = TRUE;
+        }
+    }
+    return bSucc;
 }
 
 
-static inline INT16 lcl_CfgLocaleStrToLanguage( const OUString &rCfgLocaleStr )
-{
-	INT16 nRes = LANGUAGE_NONE;
-    if (0 != rCfgLocaleStr.getLength())
-        nRes = MsLangId::convertIsoStringToLanguage( rCfgLocaleStr );
-    return nRes;
-}
-
-
 static inline const OUString lcl_LanguageToCfgLocaleStr( INT16 nLanguage )
 {
     OUString aRes;
-    if (LANGUAGE_NONE != nLanguage)
+    if (LANGUAGE_SYSTEM != nLanguage)
         aRes = MsLangId::convertLanguageToIsoString( nLanguage );
     return aRes;
 }
 
 
-static void lcl_CfgAnyToLanguage( const uno::Any &rVal, INT16& rLanguage )
+static INT16 lcl_CfgAnyToLanguage( const uno::Any &rVal )
 {
-	OUString aTmp;
-    if ((rVal >>= aTmp)  &&  0 != aTmp.getLength())
-       rLanguage = MsLangId::convertIsoStringToLanguage( aTmp );
+    OUString aTmp;
+    rVal >>= aTmp;
+    return (aTmp.getLength() == 0) ? LANGUAGE_SYSTEM : MsLangId::convertIsoStringToLanguage( aTmp );
 }
 
 
@@ -143,10 +112,9 @@
 SvtLinguOptions::SvtLinguOptions()
 {
     nDefaultLanguage = LANGUAGE_NONE;
-
 	nDefaultLanguage_CJK = LANGUAGE_NONE;
 	nDefaultLanguage_CTL = LANGUAGE_NONE;
-
+    
 	// general options
 	bIsUseDictionaryList	=
 	bIsIgnoreControlCharacters	= TRUE;
@@ -428,19 +396,19 @@
         }
         case UPH_DEFAULT_LOCALE :
         {
-            lang::Locale aLocale( lcl_CreateLocale( rOpt.nDefaultLanguage ) );
+            lang::Locale aLocale( MsLangId::convertLanguageToLocale( rOpt.nDefaultLanguage, false ) );
             aRes.setValue( &aLocale, ::getCppuType((lang::Locale*)0 ));
             break;
         }
         case UPH_DEFAULT_LOCALE_CJK :
         {
-            lang::Locale aLocale( lcl_CreateLocale( rOpt.nDefaultLanguage_CJK ) );
+            lang::Locale aLocale( MsLangId::convertLanguageToLocale( rOpt.nDefaultLanguage_CJK, false ) );
             aRes.setValue( &aLocale, ::getCppuType((lang::Locale*)0 ));
             break;
         }
         case UPH_DEFAULT_LOCALE_CTL :
         {
-            lang::Locale aLocale( lcl_CreateLocale( rOpt.nDefaultLanguage_CTL ) );
+            lang::Locale aLocale( MsLangId::convertLanguageToLocale( rOpt.nDefaultLanguage_CTL, false ) );
             aRes.setValue( &aLocale, ::getCppuType((lang::Locale*)0 ));
             break;
         }
@@ -654,7 +622,7 @@
             switch ( nPropertyHandle )
             {
                 case UPH_DEFAULT_LOCALE : 
-                    { rOpt.bRODefaultLanguage = pROStates[i]; lcl_CfgAnyToLanguage( rVal, rOpt.nDefaultLanguage ); } break;
+                    { rOpt.bRODefaultLanguage = pROStates[i]; rOpt.nDefaultLanguage = lcl_CfgAnyToLanguage( rVal ); } break;
                 case UPH_ACTIVE_DICTIONARIES : 
                     { rOpt.bROActiveDics = pROStates[i]; rVal >>= rOpt.aActiveDics;   } break;
                 case UPH_IS_USE_DICTIONARY_LIST : 
@@ -662,9 +630,9 @@
                 case UPH_IS_IGNORE_CONTROL_CHARACTERS : 
                     { rOpt.bROIsIgnoreControlCharacters = pROStates[i]; rVal >>= rOpt.bIsIgnoreControlCharacters;    } break;
                 case UPH_DEFAULT_LOCALE_CJK : 
-                    { rOpt.bRODefaultLanguage_CJK = pROStates[i]; lcl_CfgAnyToLanguage( rVal, rOpt.nDefaultLanguage_CJK );    } break;
+                    { rOpt.bRODefaultLanguage_CJK = pROStates[i]; rOpt.nDefaultLanguage_CJK = lcl_CfgAnyToLanguage( rVal );    } break;
                 case UPH_DEFAULT_LOCALE_CTL : 
-                    { rOpt.bRODefaultLanguage_CTL = pROStates[i]; lcl_CfgAnyToLanguage( rVal, rOpt.nDefaultLanguage_CTL );    } break;
+                    { rOpt.bRODefaultLanguage_CTL = pROStates[i]; rOpt.nDefaultLanguage_CTL = lcl_CfgAnyToLanguage( rVal );    } break;
 
                 case UPH_IS_SPELL_UPPER_CASE : 
                     { rOpt.bROIsSpellUpperCase = pROStates[i]; rVal >>= rOpt.bIsSpellUpperCase; } break;
--- reportdesign/util/makefile.mk	2009-03-12 23:12:05.000000000 +0000
+++ reportdesign/util/makefile.mk	2009-03-12 23:10:02.000000000 +0000
@@ -58,6 +58,7 @@
 		$(FWELIB)				\
 		$(SFXLIB)				\
 		$(TOOLSLIB) 			\
+		$(I18NISOLANGLIB) \
 		$(SVLLIB)				\
 		$(SVTOOLLIB)			\
 		$(UNOTOOLSLIB)			\


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -p -r1.1991 -r1.1992
--- openoffice.org.spec	24 Aug 2009 13:03:19 -0000	1.1991
+++ openoffice.org.spec	24 Aug 2009 14:50:36 -0000	1.1992
@@ -72,7 +72,7 @@ BuildRequires:  pentaho-reporting-flow-e
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
-Patch2:  planned.workspace.defaultdoclang.patch
+Patch2:  workspace.defaultdoclang.patch
 %if %{gtkprintui}
 Patch3:  openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif


--- planned.workspace.defaultdoclang.patch DELETED ---



From dwayne at fedoraproject.org  Mon Aug 24 14:53:59 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Mon, 24 Aug 2009 14:53:59 +0000 (UTC)
Subject: rpms/translate-toolkit/devel
	translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch, NONE,
	1.1 translate-toolkit.spec, 1.34, 1.35
Message-ID: <20090824145359.8713911C0044@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13456

Modified Files:
	translate-toolkit.spec 
Added Files:
	translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch 
Log Message:
* Wed Aug 5 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:
 pypo.py    |    2 +-
 test_po.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch ---
--- src/trunk/translate/storage/pypo.py	2009/08/21 14:25:28	12243
+++ src/trunk/translate/storage/pypo.py	2009/08/24 11:17:10	12244
@@ -477,7 +477,7 @@
         return super(pounit, self).istranslated() and not self.isobsolete()
 
     def istranslatable(self):
-        return not (self.isheader() or self.isblank())
+        return not (self.isheader() or self.isblank() or self.isobsolete())
 
     def isfuzzy(self):
         return self.hastypecomment("fuzzy")
Index: test_po.py
===================================================================
--- src/trunk/translate/storage/test_po.py	2009/08/21 14:25:28	12243
+++ src/trunk/translate/storage/test_po.py	2009/08/24 11:17:10	12244
@@ -448,8 +448,10 @@
         print pofile
         unit = pofile.units[0]
         assert not unit.isobsolete()
+        assert unit.istranslatable()
         unit.makeobsolete()
         assert unit.isobsolete()
+        assert not unit.istranslatable()
         print pofile
         assert str(unit) == poexpected
 



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- translate-toolkit.spec	5 Aug 2009 05:46:57 -0000	1.34
+++ translate-toolkit.spec	24 Aug 2009 14:53:59 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:           translate-toolkit
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
@@ -12,6 +12,8 @@ Source0:        http://downloads.sourcef
 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
@@ -68,6 +70,7 @@ toolkit or to use the libraries in other
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p2
 
 
 %build
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 5 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
 - Update to 1.4.0 final
 



From rdieter at fedoraproject.org  Mon Aug 24 14:58:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 14:58:54 +0000 (UTC)
Subject: rpms/ktorrent/F-10 .cvsignore, 1.30, 1.31 ktorrent.spec, 1.90,
	1.91 sources, 1.30, 1.31
Message-ID: <20090824145854.97E8111C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14606

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
- upstream tarball respin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	12 Aug 2009 16:15:23 -0000	1.30
+++ .cvsignore	24 Aug 2009 14:58:54 -0000	1.31
@@ -1 +1 @@
-ktorrent-3.2.3.tar.bz2
+ktorrent-3.2.3-1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- ktorrent.spec	24 Aug 2009 14:14:06 -0000	1.90
+++ ktorrent.spec	24 Aug 2009 14:58:54 -0000	1.91
@@ -3,12 +3,12 @@
 
 Name:           ktorrent
 Version:        3.2.3
-Release:        2%{?dist}
+Release:        3%{?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}/ktorrent-%{version}-1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
+- upstream tarball respin
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
 - kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
 - -libs to make multilib friendly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	12 Aug 2009 16:15:23 -0000	1.30
+++ sources	24 Aug 2009 14:58:54 -0000	1.31
@@ -1 +1 @@
-5c65b9e30107b922f025650887e4dee7  ktorrent-3.2.3.tar.bz2
+f1430998c17925e4c6a08ce062f53ff2  ktorrent-3.2.3-1.tar.bz2



From cebbert at fedoraproject.org  Mon Aug 24 15:01:18 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 24 Aug 2009 15:01:18 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1114, 1.1115 kernel.spec, 1.1732, 1.1733 sources, 1.1072,
	1.1073 upstream, 1.986, 1.987
Message-ID: <20090824150118.4B6DF11C0044@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15180

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git1.bz2.sign 
Log Message:
2.6.31-rc7-git1


--- NEW FILE patch-2.6.31-rc7-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKkIi+yGugalF9Dw4RAj3UAJ9ee5o5eKXr4H6lfjpEpm8dL9NkCwCfQkUP
sbX39sJV4yS7tmRYia54GKQ=
=CnYC
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1114
retrieving revision 1.1115
diff -u -p -r1.1114 -r1.1115
--- .cvsignore	22 Aug 2009 12:43:28 -0000	1.1114
+++ .cvsignore	24 Aug 2009 15:01:16 -0000	1.1115
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
+patch-2.6.31-rc7-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1732
retrieving revision 1.1733
diff -u -p -r1.1732 -r1.1733
--- kernel.spec	24 Aug 2009 11:47:18 -0000	1.1732
+++ kernel.spec	24 Aug 2009 15:01:16 -0000	1.1733
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1997,6 +1997,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git1
+
 * Sat Aug 22 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1072
retrieving revision 1.1073
diff -u -p -r1.1072 -r1.1073
--- sources	22 Aug 2009 12:43:28 -0000	1.1072
+++ sources	24 Aug 2009 15:01:16 -0000	1.1073
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
+22d1b4c17bde1034e332dc2505c9f15a  patch-2.6.31-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -p -r1.986 -r1.987
--- upstream	22 Aug 2009 12:43:28 -0000	1.986
+++ upstream	24 Aug 2009 15:01:16 -0000	1.987
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
+patch-2.6.31-rc7-git1.bz2



From mnagy at fedoraproject.org  Mon Aug 24 15:01:45 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Mon, 24 Aug 2009 15:01:45 +0000 (UTC)
Subject: rpms/vsftpd/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 vsftpd-2.1.0-pam_hostname.patch, 1.2, 1.3 vsftpd.spec, 1.96, 1.97
Message-ID: <20090824150145.D5E5E11C0044@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15322

Modified Files:
	.cvsignore sources vsftpd-2.1.0-pam_hostname.patch vsftpd.spec 
Log Message:
* Tue Aug 24 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-1
- update to latest upstream release 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Aug 2009 06:23:01 -0000	1.20
+++ .cvsignore	24 Aug 2009 15:01:45 -0000	1.21
@@ -1 +1 @@
-vsftpd-2.2.0pre4.tar.gz
+vsftpd-2.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 06:23:01 -0000	1.20
+++ sources	24 Aug 2009 15:01:45 -0000	1.21
@@ -1 +1 @@
-d628511be9092be8d167830d5c1d6889  vsftpd-2.2.0pre4.tar.gz
+e4eb190af270ae65d57a84274a38ec31  vsftpd-2.2.0.tar.gz

vsftpd-2.1.0-pam_hostname.patch:
 sysdeputil.c |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Index: vsftpd-2.1.0-pam_hostname.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-pam_hostname.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vsftpd-2.1.0-pam_hostname.patch	4 Aug 2009 06:23:01 -0000	1.2
+++ vsftpd-2.1.0-pam_hostname.patch	24 Aug 2009 15:01:45 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
---- vsftpd-2.2.0/sysdeputil.c.pam_hostname	2009-07-14 06:03:31.000000000 +0200
-+++ vsftpd-2.2.0/sysdeputil.c	2009-08-04 08:00:00.000000000 +0200
+--- vsftpd-2.2.0/sysdeputil.c.pam_hostname	2009-08-08 03:51:10.000000000 +0200
++++ vsftpd-2.2.0/sysdeputil.c	2009-08-24 12:24:07.220623773 +0200
 @@ -16,6 +16,10 @@
  #include "tunables.h"
  #include "builddefs.h"
@@ -12,7 +12,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
  /* For Linux, this adds nothing :-) */
  #include "port/porting_junk.h"
  
-@@ -316,6 +320,10 @@ vsf_sysdep_check_auth(struct mystr* p_us
+@@ -325,6 +329,10 @@ vsf_sysdep_check_auth(struct mystr* p_us
                        const struct mystr* p_remote_host)
  {
    int retval;
@@ -20,10 +20,10 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
 +  struct sockaddr_in sin;
 +  struct hostent *host;
 +#endif
+   pam_item_t item;
    const char* pam_user_name = 0;
    struct pam_conv the_conv =
-   {
-@@ -335,7 +343,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
+@@ -345,7 +353,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
      return 0;
    }
  #ifdef PAM_RHOST
@@ -37,7 +37,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
    if (retval != PAM_SUCCESS)
    {
      (void) pam_end(s_pamh, retval);
-@@ -547,7 +560,7 @@ vsf_sysdep_has_capabilities(void)
+@@ -558,7 +571,7 @@ vsf_sysdep_has_capabilities(void)
    }
    return s_runtime_has_caps;
  }
@@ -46,7 +46,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
    #ifndef VSF_SYSDEP_HAVE_LIBCAP
  static int
  do_checkcap(void)
-@@ -1069,7 +1082,7 @@ vsf_sysutil_recv_fd(const int sock_fd)
+@@ -1080,7 +1093,7 @@ vsf_sysutil_recv_fd(const int sock_fd)
    msg.msg_flags = 0;
    /* In case something goes wrong, set the fd to -1 before the syscall */
    p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg));


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- vsftpd.spec	22 Aug 2009 18:43:51 -0000	1.96
+++ vsftpd.spec	24 Aug 2009 15:01:45 -0000	1.97
@@ -2,14 +2,14 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 0.2.pre4%{?dist}
+Release: 1%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
 # OpenSSL link exception
 License: GPLv2 with exceptions
 URL: http://vsftpd.beasts.org/
-Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}pre4.tar.gz
+Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
 Source1: vsftpd.xinetd
 Source2: vsftpd.pam
 Source3: vsftpd.ftpusers
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Tue Aug 24 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-1
+- update to latest upstream release 2.2.0
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
 - rebuilt with new openssl
 



From limb at fedoraproject.org  Mon Aug 24 15:06:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 24 Aug 2009 15:06:58 +0000 (UTC)
Subject: rpms/inksmoto/devel .cvsignore, 1.7, 1.8 inksmoto.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090824150658.395B511C0044@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16329

Modified Files:
	.cvsignore inksmoto.spec sources 
Log Message:
0.6.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Apr 2009 12:45:55 -0000	1.7
+++ .cvsignore	24 Aug 2009 15:06:57 -0000	1.8
@@ -1 +1 @@
-inksmoto-0.6.0~rc1.tar.gz
+inksmoto-0.6.0.tar.gz


Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/inksmoto.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- inksmoto.spec	25 Jul 2009 03:24:34 -0000	1.11
+++ inksmoto.spec	24 Aug 2009 15:06:57 -0000	1.12
@@ -1,12 +1,12 @@
 Name: inksmoto
 Version: 0.6.0
-Release:  1.rc1%{?dist}.1
+Release:  2%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc1.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Mon Aug 24 2009 Jon Ciesla <limb at jcomserv.net> - 0.6.0-2
+- 0.6.0 final.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-1.rc1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 Apr 2009 12:45:55 -0000	1.7
+++ sources	24 Aug 2009 15:06:57 -0000	1.8
@@ -1 +1 @@
-d05f8c328c2d782f7d2ba2282ca3a052  inksmoto-0.6.0~rc1.tar.gz
+01a0fcb17f0c9658fe8c5b6db584c772  inksmoto-0.6.0.tar.gz



From ankursinha at fedoraproject.org  Mon Aug 24 15:07:43 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 24 Aug 2009 15:07:43 +0000 (UTC)
Subject: rpms/fpaste/devel .cvsignore, 1.3, 1.4 fpaste.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090824150743.3E18F11C0044@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16547

Modified Files:
	.cvsignore fpaste.spec sources 
Log Message:
new upstream release - 0.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 14:53:01 -0000	1.3
+++ .cvsignore	24 Aug 2009 15:07:42 -0000	1.4
@@ -1 +1 @@
-fpaste-0.3.3.tar.bz2
+fpaste-0.3.4.tar.bz2


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/fpaste.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fpaste.spec	21 Aug 2009 17:40:08 -0000	1.3
+++ fpaste.spec	24 Aug 2009 15:07:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fpaste
-Version:	0.3.3
-Release:	2%{?dist}
+Version:	0.3.4
+Release:	1%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,17 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Mon Aug 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.4-1
+- New release
+- Validate paste size and content as non-binary before sending; user is prompted Y/N to override for huge pastes or binary content.
+- Added options --printonly and --confirm to show or ask user before sending
+- --sysinfo updated: Added blkid, top CPU hogs, top memory hogs, X errors,h/w virtualization, 64-bit capable, and last few reboot/runlevel changes
+- Workaround to read user input from raw_input following sys.stdin EOF
+- Guess language syntax from common file extension(s)
+- --help usage compacted and grouped
+- Check that 'xsel' is installed for clipboard input support; silent fail on output
+- Use 'fpaste/x.x.x' User-agent header
+- bug fixes
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-2
 - Added xsel in requires
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 14:53:01 -0000	1.3
+++ sources	24 Aug 2009 15:07:43 -0000	1.4
@@ -1 +1 @@
-456b4c7bfdd71330713d5e7915b4f921  fpaste-0.3.3.tar.bz2
+a98caf897c44517139b768ba6c9e224f  fpaste-0.3.4.tar.bz2



From rdieter at fedoraproject.org  Mon Aug 24 15:12:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 15:12:48 +0000 (UTC)
Subject: rpms/ktorrent/F-11 .cvsignore, 1.31, 1.32 ktorrent.spec, 1.99,
	1.100 sources, 1.31, 1.32
Message-ID: <20090824151248.E447111C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18308

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
- upstream tarball respin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	12 Aug 2009 16:10:52 -0000	1.31
+++ .cvsignore	24 Aug 2009 15:12:48 -0000	1.32
@@ -1 +1 @@
-ktorrent-3.2.3.tar.bz2
+ktorrent-3.2.3-1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- ktorrent.spec	24 Aug 2009 14:13:47 -0000	1.99
+++ ktorrent.spec	24 Aug 2009 15:12:48 -0000	1.100
@@ -3,12 +3,12 @@
 
 Name:           ktorrent
 Version:        3.2.3
-Release:        2%{?dist}
+Release:        3%{?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}/ktorrent-%{version}-1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-3
+- upstream tarball respin
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
 - kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
 - -libs to make multilib friendly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	12 Aug 2009 16:10:52 -0000	1.31
+++ sources	24 Aug 2009 15:12:48 -0000	1.32
@@ -1 +1 @@
-5c65b9e30107b922f025650887e4dee7  ktorrent-3.2.3.tar.bz2
+f1430998c17925e4c6a08ce062f53ff2  ktorrent-3.2.3-1.tar.bz2



From rhughes at fedoraproject.org  Mon Aug 24 15:13:18 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 24 Aug 2009 15:13:18 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.53,
	1.54 gnome-packagekit.spec, 1.97, 1.98 sources, 1.54, 1.55
Message-ID: <20090824151318.B567A11C0044@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18471

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-2
- Actually upload the correct tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	11 Aug 2009 11:07:02 -0000	1.53
+++ .cvsignore	24 Aug 2009 15:13:18 -0000	1.54
@@ -1 +1 @@
-gnome-packagekit-2.27.5.tar.bz2
+gnome-packagekit-2.27.91.tar.bz2


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- gnome-packagekit.spec	24 Aug 2009 13:47:00 -0000	1.97
+++ gnome-packagekit.spec	24 Aug 2009 15:13:18 -0000	1.98
@@ -16,7 +16,7 @@ Summary:   Session applications to manag
 Name:      gnome-packagekit
 Version:   2.27.91
 #Release:   0.1.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -223,6 +223,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-2
+- Actually upload the correct tarball.
+
 * Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.91-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	11 Aug 2009 11:07:03 -0000	1.54
+++ sources	24 Aug 2009 15:13:18 -0000	1.55
@@ -1 +1 @@
-5df9afc494e7e83fa8cfc7335e550a7c  gnome-packagekit-2.27.5.tar.bz2
+cb39d7818d627ebb5bd0d489b550ba4d  gnome-packagekit-2.27.91.tar.bz2



From ankursinha at fedoraproject.org  Mon Aug 24 15:17:40 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 24 Aug 2009 15:17:40 +0000 (UTC)
Subject: rpms/fpaste/F-10 .cvsignore, 1.3, 1.4 fpaste.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090824151740.8229611C0044@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19408

Modified Files:
	.cvsignore fpaste.spec sources 
Log Message:
new release 0.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 15:07:19 -0000	1.3
+++ .cvsignore	24 Aug 2009 15:17:40 -0000	1.4
@@ -1 +1 @@
-fpaste-0.3.3.tar.bz2
+fpaste-0.3.4.tar.bz2


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/fpaste.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fpaste.spec	21 Aug 2009 17:43:10 -0000	1.3
+++ fpaste.spec	24 Aug 2009 15:17:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fpaste
-Version:	0.3.3
-Release:	2%{?dist}
+Version:	0.3.4
+Release:	1%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,17 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Mon Aug 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.4-1
+- New release
+- Validate paste size and content as non-binary before sending; user is prompted Y/N to override for huge pastes or binary content.
+- Added options --printonly and --confirm to show or ask user before sending
+- --sysinfo updated: Added blkid, top CPU hogs, top memory hogs, X errors,h/w virtualization, 64-bit capable, and last few reboot/runlevel changes
+- Workaround to read user input from raw_input following sys.stdin EOF
+- Guess language syntax from common file extension(s)
+- --help usage compacted and grouped
+- Check that 'xsel' is installed for clipboard input support; silent fail on output
+- Use 'fpaste/x.x.x' User-agent header
+- bug fixes
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-2
 - Added xsel in requires
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 15:07:19 -0000	1.3
+++ sources	24 Aug 2009 15:17:40 -0000	1.4
@@ -1 +1 @@
-456b4c7bfdd71330713d5e7915b4f921  fpaste-0.3.3.tar.bz2
+a98caf897c44517139b768ba6c9e224f  fpaste-0.3.4.tar.bz2



From lennart at fedoraproject.org  Mon Aug 24 15:17:56 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Mon, 24 Aug 2009 15:17:56 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.94,1.95 sources,1.42,1.43
Message-ID: <20090824151756.1AB5011C0044@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19485

Modified Files:
	pulseaudio.spec sources 
Log Message:
fix build for ppc


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- pulseaudio.spec	24 Aug 2009 02:13:02 -0000	1.94
+++ pulseaudio.spec	24 Aug 2009 15:17:55 -0000	1.95
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        9.test6%{?dist}
+Release:        10.test6%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
@@ -433,6 +433,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Mon Aug 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-10.test6
+- Fix build for ppc
+
 * Mon Aug 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-9.test6
 - New test release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	24 Aug 2009 02:13:02 -0000	1.42
+++ sources	24 Aug 2009 15:17:55 -0000	1.43
@@ -1 +1 @@
-03bb80acdc9c82bd69feca510d65e1e3  pulseaudio-0.9.16-test6.tar.gz
+a2f5c6c43e67ee77acb8d46bbf4838f2  pulseaudio-0.9.16-test6.tar.gz



From ankursinha at fedoraproject.org  Mon Aug 24 15:18:39 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 24 Aug 2009 15:18:39 +0000 (UTC)
Subject: rpms/fpaste/F-11 .cvsignore, 1.3, 1.4 fpaste.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20090824151839.8F3B211C0044@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/fpaste/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19746

Modified Files:
	.cvsignore fpaste.spec sources 
Log Message:
new release 0.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Aug 2009 17:01:04 -0000	1.3
+++ .cvsignore	24 Aug 2009 15:18:39 -0000	1.4
@@ -1 +1 @@
-fpaste-0.3.3.tar.bz2
+fpaste-0.3.4.tar.bz2


Index: fpaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/fpaste.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fpaste.spec	21 Aug 2009 17:36:23 -0000	1.4
+++ fpaste.spec	24 Aug 2009 15:18:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		fpaste
-Version:	0.3.3
-Release:	2%{?dist}
+Version:	0.3.4
+Release:	1%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
@@ -38,6 +38,17 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Mon Aug 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.4-1
+- New release
+- Validate paste size and content as non-binary before sending; user is prompted Y/N to override for huge pastes or binary content.
+- Added options --printonly and --confirm to show or ask user before sending
+- --sysinfo updated: Added blkid, top CPU hogs, top memory hogs, X errors,h/w virtualization, 64-bit capable, and last few reboot/runlevel changes
+- Workaround to read user input from raw_input following sys.stdin EOF
+- Guess language syntax from common file extension(s)
+- --help usage compacted and grouped
+- Check that 'xsel' is installed for clipboard input support; silent fail on output
+- Use 'fpaste/x.x.x' User-agent header
+- bug fixes
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-2
 - Added xsel in requires
 * Fri Aug 21 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpaste/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Aug 2009 17:01:04 -0000	1.3
+++ sources	24 Aug 2009 15:18:39 -0000	1.4
@@ -1 +1 @@
-456b4c7bfdd71330713d5e7915b4f921  fpaste-0.3.3.tar.bz2
+a98caf897c44517139b768ba6c9e224f  fpaste-0.3.4.tar.bz2



From karsten at fedoraproject.org  Mon Aug 24 15:19:15 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 24 Aug 2009 15:19:15 +0000 (UTC)
Subject: rpms/udev/devel udev.spec,1.290,1.291
Message-ID: <20090824151915.B818B11C0044@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19916

Modified Files:
	udev.spec 
Log Message:
- drop ifnarch s390x for usbutils, as we now have usbutils for s390x


Index: udev.spec
===================================================================
RCS file: /cvs/extras/rpms/udev/devel/udev.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- udev.spec	24 Aug 2009 13:03:47 -0000	1.290
+++ udev.spec	24 Aug 2009 15:19:15 -0000	1.291
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -38,9 +38,7 @@ BuildRequires: libxslt
 BuildRequires: hwdata
 BuildRequires: gobject-introspection-devel >= 0.6.2
 BuildRequires: gtk-doc
-%ifnarch s390 s390x
 BuildRequires: usbutils >= 0.82
-%endif
 BuildRequires: libtool >= 2.2.6
 Requires: libselinux >= 0:1.17.9-2 sed 
 Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
@@ -352,6 +350,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 145-7
+- drop ifnarch s390x for usbutils, as we now have usbutils for s390x
+
 * Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 145-6
 - ifnarch s390 for usbutils
 



From rdieter at fedoraproject.org  Mon Aug 24 15:25:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 15:25:56 +0000 (UTC)
Subject: rpms/konversation/devel konversation.spec,1.32,1.33
Message-ID: <20090824152556.F191811C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21238

Modified Files:
	konversation.spec 
Log Message:
* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.6.alpha6
- BR: qca2-devel, libXScrnSaver-devel



Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- konversation.spec	11 Aug 2009 16:11:07 -0000	1.32
+++ konversation.spec	24 Aug 2009 15:25:56 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           konversation
 Version:        1.2
-Release:        0.5.%{pre}%{?dist}
+Release:        0.6.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -16,7 +16,9 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdepimlibs-devel
+BuildRequires:  libXScrnSaver-devel
 BuildRequires:  phonon-devel
+BuildRequires:  qca2-devel
 
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 Requires: kdelibs4 >= %{kde4_version}
@@ -95,6 +97,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.6.alpha6
+- BR: qca2-devel, libXScrnSaver-devel
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.5.alpha6
 - add min kdelibs4 version
 



From rdieter at fedoraproject.org  Mon Aug 24 15:29:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 24 Aug 2009 15:29:24 +0000 (UTC)
Subject: rpms/konversation/F-11 konversation.spec,1.26,1.27
Message-ID: <20090824152924.7411111C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21934

Modified Files:
	konversation.spec 
Log Message:
* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.6.alpha6
- BR: qca2-devel, libXScrnSaver-devel



Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- konversation.spec	11 Aug 2009 16:25:13 -0000	1.26
+++ konversation.spec	24 Aug 2009 15:29:24 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           konversation
 Version:        1.2
-Release:        0.5.%{pre}%{?dist}
+Release:        0.6.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -16,7 +16,9 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdepimlibs-devel
+BuildRequires:  libXScrnSaver-devel
 BuildRequires:  phonon-devel
+BuildRequires:  qca2-devel
 
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 Requires: kdelibs4 >= %{kde4_version}
@@ -95,6 +97,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.6.alpha6
+- BR: qca2-devel, libXScrnSaver-devel
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.5.alpha6
 - add min kdelibs4 version
 



From nphilipp at fedoraproject.org  Mon Aug 24 15:45:31 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 24 Aug 2009 15:45:31 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.14, 1.15 python-slip.spec, 1.16,
	1.17 sources, 1.15, 1.16
Message-ID: <20090824154531.50DED11C0044@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25684

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Oct 2008 14:59:43 -0000	1.14
+++ .cvsignore	24 Aug 2009 15:45:30 -0000	1.15
@@ -1 +1 @@
-python-slip-0.1.15.tar.bz2
+python-slip-0.2.0.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-slip.spec	26 Jul 2009 23:07:25 -0000	1.16
+++ python-slip.spec	24 Aug 2009 15:45:30 -0000	1.17
@@ -3,14 +3,14 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.1.15
-Release:    4%{?dist}
+Version:    0.2.0
+Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
 Group:      System Environment/Libraries
 License:    GPLv2+
-URL:        http://nphilipp.fedorapeople.org/python-slip/
-Source0:    http://nphilipp.fedorapeople.org/python-slip/%{name}-%{version}.tar.bz2
+URL:        http://fedorahosted.org/python-slip
+Source0:    http://fedorahosted.org/releases/$(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
@@ -28,7 +28,12 @@ Summary:    Convenience functions for db
 Group:      System Environment/Libraries
 Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:   dbus-python >= 0.80
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} < 12 && 0%{?rhel} < 6
 Requires:   PolicyKit >= 0.8-3
+%else
+Conflicts:  PolicyKit < 0.8-3
+Requires:   polkit >= 0.94
+%endif
 
 %description dbus
 The Simple Library for Python packages contain miscellaneous code for
@@ -67,7 +72,7 @@ rm -rf %buildroot
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING doc/dbus
 %dir %{python_sitelib}/slip/
 %{python_sitelib}/slip/__init__.py*
 %{python_sitelib}/slip/util
@@ -85,14 +90,15 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.15-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 24 2009 Nils Philippsen <nils at redhat.com> - 0.2.0-1
+- use PolicyKit version 1.0 if possible (#518996)
+- update and ship dbus README
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Aug 21 2009 Nils Philippsen <nils at redhat.com>
+- require polkit >= 0.94 from F-12 on
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.15-2
-- Rebuild for Python 2.6
+* Thu Nov 27 2008 Nils Philippsen <nphilipp at redhat.com
+- use fedorahosted.org URLs
 
 * Tue Oct 14 2008 Nils Philippsen <nphilipp at redhat.com> - 0.1.15
 - add slip.dbus.polkit.AreAuthorizationsObtainable()


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	15 Oct 2008 14:59:43 -0000	1.15
+++ sources	24 Aug 2009 15:45:30 -0000	1.16
@@ -1 +1 @@
-38acbefd625956ff74cac2eb7597d95a  python-slip-0.1.15.tar.bz2
+ce999316f515dd2c911cab7a3737c4d1  python-slip-0.2.0.tar.bz2



From nphilipp at fedoraproject.org  Mon Aug 24 15:49:06 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 24 Aug 2009 15:49:06 +0000 (UTC)
Subject: rpms/python-slip/devel python-slip.spec, 1.17, 1.18 sources, 1.16,
	1.17
Message-ID: <20090824154906.F3B9611C0044@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26403

Modified Files:
	python-slip.spec sources 
Log Message:
use simplified source URL



Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-slip.spec	24 Aug 2009 15:45:30 -0000	1.17
+++ python-slip.spec	24 Aug 2009 15:49:06 -0000	1.18
@@ -10,7 +10,7 @@ Summary:    Miscellaneous convenience, e
 Group:      System Environment/Libraries
 License:    GPLv2+
 URL:        http://fedorahosted.org/python-slip
-Source0:    http://fedorahosted.org/releases/$(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0:    http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	24 Aug 2009 15:45:30 -0000	1.16
+++ sources	24 Aug 2009 15:49:06 -0000	1.17
@@ -1 +1 @@
-ce999316f515dd2c911cab7a3737c4d1  python-slip-0.2.0.tar.bz2
+e8e974fd71b30b294021b25c03ce4f25  python-slip-0.2.0.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug 24 15:49:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 15:49:53 +0000 (UTC)
Subject: rpms/bognor-regis/devel .cvsignore, 1.6, 1.7 bognor-regis.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20090824154953.0258111C0044@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bognor-regis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26606

Modified Files:
	.cvsignore bognor-regis.spec sources 
Log Message:
- New upstream 0.4.10 release, add translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Jul 2009 18:56:58 -0000	1.6
+++ .cvsignore	24 Aug 2009 15:49:52 -0000	1.7
@@ -1 +1 @@
-bognor-regis-0.4.9.tar.bz2
+bognor-regis-0.4.10.tar.bz2


Index: bognor-regis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/devel/bognor-regis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bognor-regis.spec	7 Aug 2009 11:41:53 -0000	1.8
+++ bognor-regis.spec	24 Aug 2009 15:49:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           bognor-regis
-Version:        0.4.9
-Release:        2%{?dist}
+Version:        0.4.10
+Release:        1%{?dist}
 Summary:        Media daemon and play queue manager
 
 Group:          Applications/Multimedia
@@ -48,6 +48,8 @@ make install DESTDIR=%{buildroot} INSTAL
 #Remove libtool archives.
 rm -rf %{buildroot}/%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -55,7 +57,7 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libbognor-regis-0.4.so.0.0.0
@@ -70,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/libbognor-regis-0.4.so
 
 %changelog
+* Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-1
+- New upstream 0.4.10 release, add translations
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.9-2
 - Spec file cleanups
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Jul 2009 18:56:58 -0000	1.6
+++ sources	24 Aug 2009 15:49:52 -0000	1.7
@@ -1 +1 @@
-100078c9bac85f59f0b42aa750c95221  bognor-regis-0.4.9.tar.bz2
+361b667b97e7d5d49cc6420b6c344269  bognor-regis-0.4.10.tar.bz2



From nalin at fedoraproject.org  Mon Aug 24 15:51:29 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 24 Aug 2009 15:51:29 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.4-ncurses.patch, 1.2,
	NONE krb5-1.6.3-cc_gen_new-locks.patch, 1.1, NONE
Message-ID: <20090824155129.E888711C0044@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26999

Removed Files:
	krb5-1.4-ncurses.patch krb5-1.6.3-cc_gen_new-locks.patch 
Log Message:
- no longer referenced in .spec



--- krb5-1.4-ncurses.patch DELETED ---


--- krb5-1.6.3-cc_gen_new-locks.patch DELETED ---



From nalin at fedoraproject.org  Mon Aug 24 15:51:36 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Mon, 24 Aug 2009 15:51:36 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-openssl-1.0.patch, NONE, 1.1 krb5.spec,
	1.209, 1.210
Message-ID: <20090824155136.5D48F11C0044@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26937

Modified Files:
	krb5.spec 
Added Files:
	krb5-1.7-openssl-1.0.patch 
Log Message:
- work around a compile problem with new openssl


krb5-1.7-openssl-1.0.patch:
 pkinit_crypto_openssl.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE krb5-1.7-openssl-1.0.patch ---
This isn't a proper fix (it doesn't actually switch to using the new API),
but it'll do for now.
diff -up src/plugins/preauth/pkinit/pkinit_crypto_openssl.c src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.openssl-1.0	2009-01-23 01:51:03.000000000 -0500
+++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2009-08-24 11:19:35.000000000 -0400
@@ -3652,7 +3652,11 @@ decode_data(unsigned char **out_data, un
     if (buf == NULL)
 	goto cleanup;
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
     retval = EVP_PKEY_decrypt(buf, data, (int)data_len, pkey);
+#else
+    retval = EVP_PKEY_decrypt_old(buf, data, (int)data_len, pkey);
+#endif
     if (retval <= 0) {
 	pkiDebug("unable to decrypt received data (len=%d)\n", data_len);
 	goto cleanup;


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- krb5.spec	21 Aug 2009 14:11:01 -0000	1.209
+++ krb5.spec	24 Aug 2009 15:51:36 -0000	1.210
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -78,6 +78,7 @@ Patch86: krb5-1.7-time_t_size.patch
 Patch87: krb5-1.7-errs.patch
 Patch88: krb5-1.7-sizeof.patch
 Patch89: krb5-1.7-largefile.patch
+Patch90: krb5-1.7-openssl-1.0.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -207,12 +208,18 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Mon Aug 24 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-7
+- work around a compile problem with new openssl
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-6
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Tue Jul  7 2009 Nalin Dahyabhai <nalin at redhat.com> 1.7-5
+- rebuild to pick up the current forms of various patches
+
 * Mon Jul  6 2009 Nalin Dahyabhai <nalin at redhat.com>
 - simplify the man pages patch by only preprocessing the files we care about
   and moving shared configure.in logic into a shared function
@@ -1456,6 +1463,7 @@ popd
 %patch87 -p1 -b .errs
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
+%patch90 -p0 -b .openssl-1.0
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex



From dwayne at fedoraproject.org  Mon Aug 24 15:59:10 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Mon, 24 Aug 2009 15:59:10 +0000 (UTC)
Subject: rpms/translate-toolkit/F-11
	translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch, NONE,
	1.1 translate-toolkit.spec, 1.33, 1.34
Message-ID: <20090824155910.0FD4311C0044@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-serv28463

Modified Files:
	translate-toolkit.spec 
Added 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.0-2
- Upstream bug #1114 - obsolete messages should not be translatable


translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch:
 pypo.py    |    2 +-
 test_po.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch ---
--- src/trunk/translate/storage/pypo.py	2009/08/21 14:25:28	12243
+++ src/trunk/translate/storage/pypo.py	2009/08/24 11:17:10	12244
@@ -477,7 +477,7 @@
         return super(pounit, self).istranslated() and not self.isobsolete()
 
     def istranslatable(self):
-        return not (self.isheader() or self.isblank())
+        return not (self.isheader() or self.isblank() or self.isobsolete())
 
     def isfuzzy(self):
         return self.hastypecomment("fuzzy")
Index: test_po.py
===================================================================
--- src/trunk/translate/storage/test_po.py	2009/08/21 14:25:28	12243
+++ src/trunk/translate/storage/test_po.py	2009/08/24 11:17:10	12244
@@ -448,8 +448,10 @@
         print pofile
         unit = pofile.units[0]
         assert not unit.isobsolete()
+        assert unit.istranslatable()
         unit.makeobsolete()
         assert unit.isobsolete()
+        assert not unit.istranslatable()
         print pofile
         assert str(unit) == poexpected
 



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/translate-toolkit.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- translate-toolkit.spec	5 Aug 2009 06:16:50 -0000	1.33
+++ translate-toolkit.spec	24 Aug 2009 15:59:09 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           translate-toolkit
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
@@ -12,6 +12,8 @@ Source0:        http://downloads.sourcef
 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
@@ -68,6 +70,7 @@ toolkit or to use the libraries in other
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p2
 
 
 %build
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Update to 1.4.0 final
 



From pbrobinson at fedoraproject.org  Mon Aug 24 16:14:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 16:14:58 +0000 (UTC)
Subject: rpms/bognor-regis/devel bognor-regis.spec,1.9,1.10
Message-ID: <20090824161458.C450311C0044@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bognor-regis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32177

Modified Files:
	bognor-regis.spec 
Log Message:
- Add new GConf2 build requirement


Index: bognor-regis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/devel/bognor-regis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bognor-regis.spec	24 Aug 2009 15:49:52 -0000	1.9
+++ bognor-regis.spec	24 Aug 2009 16:14:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bognor-regis
 Version:        0.4.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Media daemon and play queue manager
 
 Group:          Applications/Multimedia
@@ -9,6 +9,7 @@ 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)
 
+BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gstreamer-devel
@@ -72,6 +73,9 @@ rm -rf %{buildroot}
 %{_libdir}/libbognor-regis-0.4.so
 
 %changelog
+* Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-2
+- Add new GConf2 build requirement
+
 * Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-1
 - New upstream 0.4.10 release, add translations
 



From twaugh at fedoraproject.org  Mon Aug 24 16:23:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 16:23:08 +0000 (UTC)
Subject: rpms/hplip/devel hplip-parenths.patch, NONE, 1.1 hplip.spec, 1.225, 
	1.226
Message-ID: <20090824162308.C592D11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1226

Modified Files:
	hplip.spec 
Added Files:
	hplip-parenths.patch 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Fixed typos in page sizes (bug #515469).


hplip-parenths.patch:
 hpcups.drv.in |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE hplip-parenths.patch ---
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths	2009-08-24 17:20:34.608890337 +0100
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-24 17:22:04.606015304 +0100
@@ -214,7 +214,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -260,7 +260,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -890,7 +890,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -936,7 +936,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1132,7 +1132,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -1178,7 +1178,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1348,7 +1348,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -1394,7 +1394,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1758,7 +1758,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -1804,7 +1804,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1985,7 +1985,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -2031,7 +2031,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -2225,7 +2225,7 @@ Manufacturer "HP"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -2285,7 +2285,7 @@ Manufacturer "HP"
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -3852,7 +3852,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
@@ -3912,7 +3912,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
@@ -4114,7 +4114,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
@@ -4174,7 +4174,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
@@ -4341,7 +4341,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -4387,7 +4387,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- hplip.spec	24 Aug 2009 14:20:18 -0000	1.225
+++ hplip.spec	24 Aug 2009 16:23:08 -0000	1.226
@@ -20,6 +20,7 @@ Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
 Patch5: hplip-clear-previous-state-reasons.patch
 Patch6: hplip-state-reasons-newline.patch
+Patch7: hplip-parenths.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -117,6 +118,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Don't hide state reason changes by missing out newlines in stderr.
 %patch6 -p1 -b .state-reasons-newline
 
+# Fixed typos in page sizes (bug #515469).
+%patch7 -p1 -b .parenths
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -319,6 +323,7 @@ exit 0
 
 %changelog
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Fixed typos in page sizes (bug #515469).
 - Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).
 



From twaugh at fedoraproject.org  Mon Aug 24 16:24:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 24 Aug 2009 16:24:03 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-parenths.patch, NONE, 1.1 hplip.spec, 1.221,
	1.222
Message-ID: <20090824162403.9DE7F11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1442

Modified Files:
	hplip.spec 
Added Files:
	hplip-parenths.patch 
Log Message:
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
- Fixed typos in page sizes (bug #515469).


hplip-parenths.patch:
 hpcups.drv.in |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE hplip-parenths.patch ---
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths	2009-08-24 17:20:34.608890337 +0100
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-24 17:22:04.606015304 +0100
@@ -214,7 +214,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -260,7 +260,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -890,7 +890,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -936,7 +936,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1132,7 +1132,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -1178,7 +1178,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1348,7 +1348,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -1394,7 +1394,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1758,7 +1758,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -1804,7 +1804,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -1985,7 +1985,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -2031,7 +2031,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -2225,7 +2225,7 @@ Manufacturer "HP"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -2285,7 +2285,7 @@ Manufacturer "HP"
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
@@ -3852,7 +3852,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
@@ -3912,7 +3912,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
@@ -4114,7 +4114,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
@@ -4174,7 +4174,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
@@ -4341,7 +4341,7 @@ Manufacturer "HP"
          "<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
   CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
   CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
@@ -4387,7 +4387,7 @@ Manufacturer "HP"
          "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
   CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" 
          "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
-  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
+  CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
   CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
          "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- hplip.spec	24 Aug 2009 14:35:42 -0000	1.221
+++ hplip.spec	24 Aug 2009 16:24:03 -0000	1.222
@@ -21,6 +21,7 @@ Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
 Patch5: hplip-clear-previous-state-reasons.patch
 Patch6: hplip-state-reasons-newline.patch
+Patch7: hplip-parenths.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -118,6 +119,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Don't hide state reason changes by missing out newlines in stderr.
 %patch6 -p1 -b .state-reasons-newline
 
+# Fixed typos in page sizes (bug #515469).
+%patch7 -p1 -b .parenths
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -327,6 +331,7 @@ exit 0
 
 %changelog
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
+- Fixed typos in page sizes (bug #515469).
 - Use hal rules instead of udev for F-11 (no udev ACL support).
 - Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).



From pkgdb at fedoraproject.org  Mon Aug 24 16:28:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 16:28:00 +0000
Subject: [pkgdb] fpaste: sundaram has requested watchbugzilla
Message-ID: <20090824162800.6B2B310F878@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on fpaste (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Mon Aug 24 16:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 16:28:07 +0000
Subject: [pkgdb] fpaste: sundaram has requested commit
Message-ID: <20090824162807.93B8A10F87B@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on fpaste (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Mon Aug 24 16:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 16:28:11 +0000
Subject: [pkgdb] fpaste: sundaram has requested watchcommits
Message-ID: <20090824162811.D370110F88B@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on fpaste (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Mon Aug 24 16:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 16:28:13 +0000
Subject: [pkgdb] fpaste: sundaram has requested approveacls
Message-ID: <20090824162813.7894810F890@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on fpaste (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From spot at fedoraproject.org  Mon Aug 24 16:31:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:31:03 +0000 (UTC)
Subject: rpms/logjam/EL-5 0001-Add-Location-support-to-the-logjam.patch, NONE,
	1.1 0001-Add-automake-1.11-to-autogen.sh.patch, NONE,
	1.1 0001-Add-possibility-to-insert-link-by-nickname.patch, NONE,
	1.1 0001-Add-support-of-the-User-Agent-header.patch, NONE,
	1.1 0001-Adds-titles-to-links-and-images-and-link-to-images.patch,
	NONE, 1.1 logjam.spec, 1.32, 1.33
Message-ID: <20090824163103.2E4B611C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818/EL-5

Modified Files:
	logjam.spec 
Added Files:
	0001-Add-Location-support-to-the-logjam.patch 
	0001-Add-automake-1.11-to-autogen.sh.patch 
	0001-Add-possibility-to-insert-link-by-nickname.patch 
	0001-Add-support-of-the-User-Agent-header.patch 
	0001-Adds-titles-to-links-and-images-and-link-to-images.patch 
Log Message:
get logjam working again

0001-Add-Location-support-to-the-logjam.patch:
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 -
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 ++++++++++++++++++++++++++++
 src/jamview.h                               |    1 
 src/menu.c                                  |    2 +
 src/preview.c                               |    5 ++-
 8 files changed, 70 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-Location-support-to-the-logjam.patch ---
>From 7ab07309963ac85c42ab7f235ac39189091a2718 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 13:53:04 +0300
Subject: [PATCH] Add 'Location' support to the logjam

Originally patch was taken from:
	https://bugs.launchpad.net/ubuntu/+source/logjam/+bug/223939

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 +-
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 +++++++++++++++++++++++++++
 src/jamview.h                               |    1 +
 src/menu.c                                  |    2 +
 src/preview.c                               |    4 ++-
 8 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/protocol/liblivejournal/livejournal/entry.c b/protocol/liblivejournal/livejournal/entry.c
index 838fd42..5bdf12e 100644
--- a/protocol/liblivejournal/livejournal/entry.c
+++ b/protocol/liblivejournal/livejournal/entry.c
@@ -49,6 +49,8 @@ lj_entry_copy(LJEntry *e) {
 		newe->mood = g_strdup(e->mood);
 	if (e->music)
 		newe->music = g_strdup(e->music);
+	if (e->location)
+		newe->location = g_strdup(e->location);
 	if (e->taglist)
 		newe->taglist = g_strdup(e->taglist);
 	if (e->pickeyword)
@@ -61,6 +63,7 @@ lj_entry_free(LJEntry *e) {
 	g_free(e->event);
 	g_free(e->mood);
 	g_free(e->music);
+	g_free(e->location);
 	g_free(e->taglist);
 	g_free(e->pickeyword);
 	g_free(e);
@@ -136,6 +139,8 @@ lj_entry_set_request_fields(LJEntry *entry, LJRequest *request) {
 		lj_request_add_int(request, "prop_current_moodid", entry->moodid);
 	else
 		lj_request_add(request, "prop_current_moodid", "");
+	lj_request_add(request,
+			"prop_current_location", entry->location ? entry->location : "");
 	lj_request_add(request, 
 			"prop_current_music", entry->music ? entry->music : "");
 	lj_request_add(request, 
@@ -191,6 +196,12 @@ lj_entry_load_metadata(LJEntry *entry,
 			g_set_error(err, 0, 0, "Bad UTF-8 in current_music");
 			return FALSE;
 		}
+	} else if (strcmp(key, "current_location") == 0) {
+		entry->location = g_strdup(value);
+		if (!verify_utf8(&entry->location)) {
+			g_set_error(err, 0, 0, "Bad UTF-8 in current_location");
+			return FALSE;
+		}
 	} else if (strcmp(key, "taglist") == 0) {
 		entry->taglist = g_strdup(value);
 		if (!verify_utf8(&entry->taglist)) {
@@ -255,6 +266,7 @@ lj_entry_to_xml_node(LJEntry *entry, void* doc) {
 		}
 	}
 	XML_ENTRY_META_SET(music);
+	XML_ENTRY_META_SET(location);
 	XML_ENTRY_META_SET(taglist);
 	XML_ENTRY_META_SET(pickeyword);
 	if (entry->preformatted)
@@ -479,6 +491,7 @@ lj_entry_load_from_xml_node(LJEntry *entry, xmlDocPtr doc, xmlNodePtr node) {
 			}
 		}
 		else XML_ENTRY_META_GET(music)
+		else XML_ENTRY_META_GET(location)
 		else XML_ENTRY_META_GET(taglist)
 		else XML_ENTRY_META_GET(pickeyword)
 		else if (xmlStrcmp(cur->name, BAD_CAST "preformatted") == 0) {
@@ -605,6 +618,7 @@ rfc822_load_entry(const char *key, const char *val, LJEntry *entry) {
 	RFC822_GET(subject)
 	else RFC822_GET(mood) /* XXX id */
 	else RFC822_GET(music)
+	else RFC822_GET(location)
 	else RFC822_GET(taglist)
 	else RFC822_GET(pickeyword)
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
@@ -748,6 +762,7 @@ lj_entry_to_rfc822(LJEntry *entry, gboolean includeempty) {
 	append_field(str, "Subject", entry->subject, includeempty);
 	append_field(str, "Mood", entry->mood, includeempty);
 	append_field(str, "Music", entry->music, includeempty);
+	append_field(str, "Location", entry->location, includeempty);
 	append_field(str, "TagList", entry->taglist, includeempty);
 	append_field(str, "PicKeyword", entry->pickeyword, includeempty);
 	g_string_append(str, "\n");
diff --git a/protocol/liblivejournal/livejournal/entry.h b/protocol/liblivejournal/livejournal/entry.h
index 4a138e5..2d35f89 100644
--- a/protocol/liblivejournal/livejournal/entry.h
+++ b/protocol/liblivejournal/livejournal/entry.h
@@ -52,7 +52,7 @@ typedef struct _LJEntry {
 	char *event;
 
 	int moodid;  /* a moodid is only meaningful in the context of a particular LJServer. */
-	char *mood, *music, *taglist, *pickeyword;
+	char *mood, *music, *location, *taglist, *pickeyword;
 	gboolean preformatted;
 	gboolean backdated;
 	LJCommentsType comments;
diff --git a/src/jamdoc.c b/src/jamdoc.c
index b3cdf99..ced84a0 100644
--- a/src/jamdoc.c
+++ b/src/jamdoc.c
@@ -240,6 +240,14 @@ jam_doc_set_music(JamDoc *doc, const char *music) {
 	string_replace(&doc->entry->music, music ? g_strdup(music) : NULL);
 }
 const char *
+jam_doc_get_location(JamDoc *doc) {
+	return doc->entry->location;
+}
+void
+jam_doc_set_location(JamDoc *doc, const char *location) {
+	string_replace(&doc->entry->location, location ? g_strdup(location) : NULL);
+}
+const char *
 jam_doc_get_taglist(JamDoc *doc) {
 	return doc->entry->taglist;
 }
diff --git a/src/jamdoc.h b/src/jamdoc.h
index 21fae13..99fa8b4 100644
--- a/src/jamdoc.h
+++ b/src/jamdoc.h
@@ -63,6 +63,9 @@ void           jam_doc_set_moodid(JamDoc *doc, int moodid);
 const char *   jam_doc_get_music(JamDoc *doc);
 void           jam_doc_set_music(JamDoc *doc, const char *music);
 
+const char *   jam_doc_get_location(JamDoc *doc);
+void           jam_doc_set_location(JamDoc *doc, const char *location);
+
 const char *   jam_doc_get_taglist(JamDoc *doc);
 void           jam_doc_set_taglist(JamDoc *doc, const char *taglist);
 
diff --git a/src/jamview.c b/src/jamview.c
index ecd1fc2..cb00b3a 100644
--- a/src/jamview.c
+++ b/src/jamview.c
@@ -43,6 +43,9 @@ struct _JamView {
 	GtkWidget *musicbar;
 	GtkWidget *musicbutton, *music;
 
+	GtkWidget *locationbar;
+	GtkWidget *location;
+
 	GtkWidget *tagsbar;
 	GtkWidget *tags;
 
@@ -428,6 +431,39 @@ tags_select_cb(JamView *view) {
 }
 
 static void
+location_add(JamView *view) {
+	view->location = gtk_entry_new();
+	view->locationbar = labelled_box_new_sg(_("_Location:"), view->location, view->sizegroup);
+	gtk_box_pack_start(GTK_BOX(view), view->locationbar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(view), view->locationbar, view->moodpicbar ? 2 : 1);
+	gtk_widget_show_all(view->locationbar);
+}
+static void
+location_remove(JamView *view) {
+	jam_doc_set_location(view->doc, NULL);
+	gtk_widget_destroy(view->locationbar);
+	view->locationbar = view->location = NULL;
+}
+static gboolean
+location_visible(JamView *view) {
+	return view->locationbar != NULL;
+}
+static void
+location_load(JamView *view) {
+	const char *location = jam_doc_get_location(view->doc);
+	if (location)
+		show_meta(view, JAM_VIEW_LOCATION);
+	if (location_visible(view))
+		gtk_entry_set_text(GTK_ENTRY(view->location), location ? location : "");
+}
+static void
+location_store(JamView *view) {
+	const char *location = gtk_entry_get_text(GTK_ENTRY(view->location));
+	if (location[0] == 0) location = NULL;
+	jam_doc_set_location(view->doc, location);
+}
+
+static void
 tags_add(JamView *view) {
 	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
@@ -590,6 +626,7 @@ static struct {
 	{ "mood",         TRUE, STD(mood),         mood_account_changed     },
 	{ "picture",      TRUE, STD(picture),      picture_account_changed  },
 	{ "music",        TRUE, STD(music),        NULL },
+	{ "location",     TRUE, STD(location),     NULL },
 	{ "tags",         TRUE, STD(tags),         NULL },
 	{ "preformatted", TRUE, STD(preformatted), NULL },
 	{ "datesel",      TRUE, STD(datesel),      NULL },
diff --git a/src/jamview.h b/src/jamview.h
index 0862054..a4efbf5 100644
--- a/src/jamview.h
+++ b/src/jamview.h
@@ -21,6 +21,7 @@ typedef enum {
 	JAM_VIEW_MOOD,
 	JAM_VIEW_PIC,
 	JAM_VIEW_MUSIC,
+	JAM_VIEW_LOCATION,
 	JAM_VIEW_TAGS,
 	JAM_VIEW_PREFORMATTED,
 	JAM_VIEW_DATESEL,
diff --git a/src/menu.c b/src/menu.c
index 6ca6e23..97bd611 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,6 +56,7 @@ enum {
 	ACTION_VIEW_MOOD,
 	ACTION_VIEW_PICTURE,
 	ACTION_VIEW_MUSIC,
+	ACTION_VIEW_LOCATION,
 	ACTION_VIEW_TAGS,
 	ACTION_VIEW_PREFORMATTED,
 	ACTION_VIEW_DATESEL,
@@ -430,6 +431,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/View/_Picture"),           NULL, menu_view_cb, ACTION_VIEW_PICTURE,      "<CheckItem>" },
 { N_("/View/_Tags"),              NULL, menu_view_cb, ACTION_VIEW_TAGS,         "<CheckItem>" },
 { N_("/View/M_usic"),             NULL, menu_view_cb, ACTION_VIEW_MUSIC,        "<CheckItem>" },
+{ N_("/View/_Location"),          NULL, menu_view_cb, ACTION_VIEW_LOCATION,     "<CheckItem>" },
 { N_("/View/_Preformatted"),      NULL, menu_view_cb, ACTION_VIEW_PREFORMATTED, "<CheckItem>" },
 { N_("/View/_Comments"),          NULL, menu_view_cb, ACTION_VIEW_COMMENTS,     "<CheckItem>" },
 
diff --git a/src/preview.c b/src/preview.c
index b3abc2e..5ee3fbc 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -179,11 +179,13 @@ entry_prepare_preview(LJEntry *entry) {
 		g_string_append(str, "</tr></table><hr/><br/>");
 	}
 
-	if (entry->mood || entry->music || entry->taglist) {
+	if (entry->mood || entry->music || entry->location || entry->taglist) {
 		if (entry->mood)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Mood"), entry->mood);
 		if (entry->music)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Music"), entry->music);
+		if (entry->location)
+			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Location"), entry->location);
 		if (entry->taglist)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Tags"), entry->taglist);
 		g_string_append(str, "<br/>");
-- 
1.6.4


0001-Add-automake-1.11-to-autogen.sh.patch:
 autogen.sh |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Add-automake-1.11-to-autogen.sh.patch ---
>From bbe8da1dd21a193d232e6b63ed37cb30ea2068ca Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 14:52:09 +0300
Subject: [PATCH] Add automake-1.11 to autogen.sh

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 autogen.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4b72b88..b01b5f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,12 +311,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-- 
1.6.4


0001-Add-possibility-to-insert-link-by-nickname.patch:
 link-journal.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Add-possibility-to-insert-link-by-nickname.patch ---
>From 43ff911da0f0d81a264bc52e8db565e0fb52c2af Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 15:56:28 +0300
Subject: [PATCH] Add possibility to insert link by nickname

Originally patch was found here:
	http://people.freebsd.org/~novel/patches/non-freebsd/logjam452_userlink.diff

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/link-journal.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/link-journal.c b/src/link-journal.c
index d70e70d..ec47e2d 100644
--- a/src/link-journal.c
+++ b/src/link-journal.c
@@ -44,11 +44,12 @@ make_usertype_omenu() {
 void
 link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkWidget *dlg;
-	GtkWidget *vbox, *hbox, *entry, *omenu;
+	GtkWidget *vbox, *hbox, *entry, *entry_name, *omenu;
 	GtkSizeGroup *sizegroup;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *username = NULL;
+	char *usernick = NULL;
 	int usertype;
 	gboolean selection = FALSE;
 
@@ -78,6 +79,11 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	hbox = labelled_box_new_sg(_("_Username:"), entry, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	entry_name = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(entry_name), TRUE);
+	hbox = labelled_box_new_sg(_("_Nickname:"), entry_name, sizegroup);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
 	omenu = make_usertype_omenu();
 	hbox = labelled_box_new_sg(_("User _Type:"), omenu, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -89,6 +95,7 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		return;
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -102,6 +109,41 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usernick && *usernick) {
+		gchar *link;
+		gchar *img;
+		JamAccount *acc = jam_doc_get_account(doc);
+
+		xml_escape(&username);
+		xml_escape(&usernick);
+
+		if (usertype == 0)
+			img = g_strdup("userinfo.gif");
+		else
+			img = g_strdup("community.gif");
+
+		link = g_strdup_printf(
+			"<a href='%s/userinfo.bml?user=%s'>"
+				"<img src='%s/img/%s' alt='[info]' align='absmiddle' width='17' height='17' border='0' />"
+			"</a>"
+			"<a style='FONT-WEIGHT: 800' href='%s/users/%s'>%s</a>",
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			img,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			usernick);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(img);
+		free(username);
+		free(usernick);
+		return;
+	}
+
 	gtk_text_buffer_insert(buffer, &start, "<lj ", -1);
 	if (usertype == 0)
 		gtk_text_buffer_insert(buffer, &start, "user=\"", -1);
-- 
1.6.4


0001-Add-support-of-the-User-Agent-header.patch:
 network-curl.c     |    2 ++
 network-internal.h |    5 +++++
 network-libxml.c   |    7 +++++++
 network-soup.c     |    5 ++++-
 network-win32.c    |    3 +--
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-support-of-the-User-Agent-header.patch ---
>From 511a6b7ba39438bc5edaac7c27f1283bf04b75b1 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 20:42:00 +0300
Subject: [PATCH] Add support of the User-Agent header

Starting from 22.08.2009 the Livejournal refuses all programs which has
not well-formed User-Agent string. Details here:
http://www.livejournal.com/bots/

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/network-curl.c     |    2 ++
 src/network-internal.h |    5 +++++
 src/network-libxml.c   |    7 +++++++
 src/network-soup.c     |    5 ++++-
 src/network-win32.c    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/network-curl.c b/src/network-curl.c
index 12bdc81..94db0af 100644
--- a/src/network-curl.c
+++ b/src/network-curl.c
@@ -96,6 +96,8 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 	}
 
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, LOGJAM_USER_AGENT);
+
 	if (headers) {
 		GSList *l;
 		for (l = headers; l; l = l->next)
diff --git a/src/network-internal.h b/src/network-internal.h
index 991edfc..9103bc8 100644
--- a/src/network-internal.h
+++ b/src/network-internal.h
@@ -9,6 +9,11 @@
 
 #include "network.h"
 
+/* constants to apply User-Agent header */
+#define LOGJAM_HOME_URL		"http://logjam.danga.com"
+#define LOGJAM_AUTHOR_EMAIL	"martine at danga.com"
+#define LOGJAM_USER_AGENT	LOGJAM_HOME_URL "; " LOGJAM_AUTHOR_EMAIL
+
 /* network-internal -- interface to http, used by network.
  * provides a blocking and nonblocking interface.
  * implemented by
diff --git a/src/network-libxml.c b/src/network-libxml.c
index 8f2c4d7..4f97737 100644
--- a/src/network-libxml.c
+++ b/src/network-libxml.c
@@ -25,6 +25,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 	gboolean success = FALSE;
 	int len;
 	NetStatusProgress progress;
+	gchar *user_agent;
 
 	if (conf.options.netdump && post) 
 		fprintf(stderr, _("Request: [%s]\n"), post->str);
@@ -44,16 +45,22 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		xmlNanoHTTPScanProxy(NULL);
 	}
 
+	user_agent = g_strdup_printf("User-Agent: %s\r\n", LOGJAM_USER_AGENT);
 	if (headers) {
 		GString *hs = g_string_new(NULL);
 		GSList *l;
+		g_string_append(hs, user_agent);
 		for (l = headers; l; l = l->next) {
 			g_string_append(hs, l->data);
 			g_string_append(hs, "\r\n");
 		}
 		headerstr = hs->str;
 		g_string_free(hs, FALSE);
+		g_free(user_agent);
+	} else {
+		headerstr = user_agent;
 	}
+
 	if (post)
 		ctx = xmlNanoHTTPMethod(url, "POST",
 				post->str, NULL, headerstr, post->len);
diff --git a/src/network-soup.c b/src/network-soup.c
index 9e28d9c..24b8e45 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -57,10 +57,13 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_PROXY_URI, suri,
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
 			NULL);
 		soup_uri_free(suri);
 	} else
-		session = soup_session_sync_new ();
+		session = soup_session_sync_new_with_options (
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
+			NULL);
 
 	req = soup_message_new(post ? "POST" : "GET", url);
 	g_signal_connect(G_OBJECT(req), "got-chunk",
diff --git a/src/network-win32.c b/src/network-win32.c
index a2429aa..d4d1796 100644
--- a/src/network-win32.c
+++ b/src/network-win32.c
@@ -126,7 +126,7 @@ net_post_blocking(const char *surl, GSList *headers, GString *post,
 	host = urlc.lpszHostName;
 	host[urlc.dwHostNameLength] = 0;
 
-	if ((hInternet = InternetOpen("LogJam-Win32",
+	if ((hInternet = InternetOpen(LOGJAM_USER_AGENT,
 			INTERNET_OPEN_TYPE_PRECONFIG,
 			NULL, NULL, 0)) != NULL) {
 
-- 
1.6.4


0001-Adds-titles-to-links-and-images-and-link-to-images.patch:
 html_markup.c |    5 +++++
 imagelink.c   |   32 +++++++++++++++++++++++++++++---
 link.c        |   16 +++++++++++++---
 menu.c        |    6 +++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Adds-titles-to-links-and-images-and-link-to-images.patch ---
>From 14038cb91ef71252d9e46c5c4f4060e79ee49259 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Fri, 1 May 2009 23:27:26 +0300
Subject: [PATCH] Adds titles to links and images and link to images

This adds:
* title to the dialog for image and link
* link to image dialog
* blockquote option for formatting

Originally patch was observed here:
http://bugzilla.redhat.com/show_bug.cgi?id=434754#c1

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/html_markup.c |    5 +++++
 src/imagelink.c   |   32 +++++++++++++++++++++++++++++---
 src/link.c        |   16 +++++++++++++---
 src/menu.c        |    5 +++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/html_markup.c b/src/html_markup.c
index 36ec4e7..9c5a796 100644
--- a/src/html_markup.c
+++ b/src/html_markup.c
@@ -74,3 +74,8 @@ void
 html_mark_monospaced(JamDoc *doc) {
 	html_mark_tag(doc, "tt");
 }
+
+void
+html_mark_blockquote(JamDoc *doc) {
+	html_mark_tag(doc, "blockquote");
+}
diff --git a/src/imagelink.c b/src/imagelink.c
index a9f296d..21ac938 100644
--- a/src/imagelink.c
+++ b/src/imagelink.c
@@ -13,7 +13,7 @@
 
 typedef struct {
 	GtkWidget *dlg;
-	GtkWidget *url, *get, *width, *height;
+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
 } ImageDlg;
 
 static void
@@ -88,6 +88,14 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
 			FALSE, FALSE, 0);
 
+	idlg->tit = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
+		FALSE, FALSE, 0);
+	idlg->anchor = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
+		FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	dimbox = gtk_vbox_new(FALSE, 6);
@@ -132,6 +140,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *sel = NULL, *url = NULL;
+	const gchar *tit, *anch;
 	const char *data;
 	int width = -1, height = -1;
 
@@ -161,9 +170,15 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 
 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
 		xml_escape(&url);
-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
+		anch = gtk_entry_get_text(GTK_ENTRY(idlg->anchor));
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, anch, -1);
+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
+		}
+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
 		gtk_text_buffer_insert(buffer, &start, url, -1);
-		gtk_text_buffer_insert(buffer, &start, "'", -1);
+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
 		g_free(url);
 
 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
@@ -182,7 +197,18 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 			gtk_text_buffer_insert(buffer, &start, data, -1);
 			g_free(data);
 		}
+
+		tit = gtk_entry_get_text(GTK_ENTRY(idlg->tit));
+		if (tit && *tit) {
+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, tit, -1);
+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
+		}
+
 		gtk_text_buffer_insert(buffer, &start, " />", -1);
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "</a>", -1);
+		}
 	}
 
 	g_free(sel);
diff --git a/src/link.c b/src/link.c
index 0be2e98..596eb30 100644
--- a/src/link.c
+++ b/src/link.c
@@ -17,6 +17,7 @@
 typedef struct {
 	GtkWidget *dlg;
 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
+	GtkWidget *titl;
 	JamDoc *doc;
 	gint sel_type, clip_type;
 	gchar *sel_input, *clip_input;
@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
 static void
 make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	GtkWidget *vbox;
-	GtkWidget *subbox;
+	GtkWidget *subbox, *hhr;
 	GSList *rgroup;
 
 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
@@ -114,6 +115,9 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
+	ld->titl = gtk_entry_new();
+	hhr = labelled_box_new(_("Link Title:"), ld->titl);
+	gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), 
 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
 
 static char*
 get_link(LinkDialog *ld, JamAccount *acc) {
-	char *url, *user, *text;
+	char *url, *user, *text, *title;
 	char *link = NULL;
 
 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
@@ -187,10 +191,15 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	xml_escape(&user);
 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
 	xml_escape(&text);
+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
 		/* build a "url" link. */
-		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		if (title && *title) {
+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
+		} else {
+			link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		}
 	} else if (ld->ruser &&
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
 		/* build a "friends" link. */
@@ -204,6 +213,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	g_free(url);
 	g_free(user);
 	g_free(text);
+	g_free(title);
 	
 	return link;
 }
diff --git a/src/menu.c b/src/menu.c
index 7fa74f2..5cdd37e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -321,6 +321,10 @@ static void
 menu_html_mark_monospaced(JamWin *jw) {
 	html_mark_monospaced(jw->doc);
 }
+static void
+menu_html_mark_blockquote(JamWin *jw) {
+	html_mark_blockquote(jw->doc);
+}
 
 void manager_dialog(GtkWidget *parent);
 
@@ -435,6 +439,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
 { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
 { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
+{ N_("/HTML/_Blockquote"),			"<ctl><alt>Q", menu_html_mark_blockquote },
 
 { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
 { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },
-- 
1.6.4



Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-5/logjam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- logjam.spec	23 Aug 2007 23:13:10 -0000	1.32
+++ logjam.spec	24 Aug 2009 16:31:03 -0000	1.33
@@ -1,14 +1,19 @@
-%define use_xmms 0
+%define use_xmms 1
 
 Name:		logjam
 Version:	4.5.3
-Release:	8%{?dist}.1
+Release:	36%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+# Now, we get source from git
+# git clone git://github.com/martine/LogJam.git logjam-git
+# find logjam-git -depth -name .git -type d -exec rm -rf {} \;
+# tar cvfj logjam-git-20090824.tar.bz2 logjam-git/
+Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -16,18 +21,31 @@ BuildRequires:	xmms-devel
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
-BuildRequires:	autoconf, intltool
+BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch2:		logjam-4.4.1-backdated.patch
-Patch3:		logjam-4.4.1-cleanups.patch
-Patch4:		logjam-4.4.1-fedora-desktop.patch
-Patch5:		logjam-4.5-patch8-manfix.patch
-Patch6:		logjam-4.5.2-gtkhtml38.patch
-Patch7:		logjam-4.4.1-ru.po.asp.patch
-Patch8:		logjam-4.5.3-gtkspell.patch
-Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
-Patch10:	logjam-4.5.3-rhythmbox-fix.patch
+Patch1:		logjam-4.4.1-fedora-desktop.patch
+Patch2:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
+Patch3:		logjam-4.5.3-disable-threads.patch
+Patch4:		0001-Adds-titles-to-links-and-images-and-link-to-images.patch
+Patch5:		logjam-4.5.3-tags.patch
+Patch6:		logjam-4.5.3-start_in_dock.patch
+Patch7:		logjam-4.5.3-no_quit_when_docked.patch
+Patch8:		logjam-4.5.3-close_when_send.patch
+Patch9:		logjam-4.5.3-showloginhistory.patch
+Patch10:	logjam-4.5.3-libtool.patch
+Patch11:	logjam-4.5.3-keep-drafts.patch
+Patch12:	logjam-4.5.3-mpris.diff
+Patch13:	logjam-4.5.3-save-tags.diff
+# From: http://github.com/andy-shev/LogJam/commit/1426ae5af7f0c1ba4084f0ce0e0b63c43c763dc7
+Patch14:	0001-Add-support-of-the-User-Agent-header.patch
+# From: http://github.com/andy-shev/LogJam/commit/7ab07309963ac85c42ab7f235ac39189091a2718
+Patch15:	0001-Add-Location-support-to-the-logjam.patch
+# From: http://github.com/andy-shev/LogJam/commit/43ff911da0f0d81a264bc52e8db565e0fb52c2af
+Patch16:	0001-Add-possibility-to-insert-link-by-nickname.patch
+# From: http://github.com/andy-shev/LogJam/commit/bbe8da1dd21a193d232e6b63ed37cb30ea2068ca
+Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -45,22 +63,44 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q
-%patch2 -p1 -b .backdated
-%patch3 -p1 -b .cleanups
-%patch4 -p1 -b .desktop
-%patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml38
-%patch7 -p1 -b .ru.po
-%patch8 -p1 -b .bz186906
-%patch9 -p1 -b .docklet-context-menu
-%patch10 -p1 -b .rhythmboxfix
+%setup -q -n logjam-git
+%patch1 -p1 -b .desktop
+# %%patch5 -p1 -b .manfix
+%patch2 -p1 -b .docklet-context-menu
+%patch3 -p1 -b .disable-threads
+%patch4 -p1 -b .title
+%patch5 -p1 -b .tags
+%patch6 -p1 -b .start-in-dock
+%patch7 -p1 -b .no_quit_when_docked
+%patch8 -p1 -b .close_when_send
+%patch9 -p1 -b .showloginhistory
+%if 0%{fedora} >= 11
+%patch10 -p1 -b .libtool
+%endif
+%patch11 -p1 -b .keep_drafts
+%patch12 -p1 -b .mpris
+%patch13 -p1 -b .save-tags
+%patch14 -p1 -b .user-agent
+%patch15 -p1 -b .location
+%patch16 -p1 -b .link-by-nickname
+%patch17 -p1 -b .automake111
+
+%if 0%{fedora} >= 10
+libtoolize
+rm -rf aclocal.m4
+autoupdate
+intltoolize --force
+%endif
 
 %build
-autoconf
+touch NEWS README AUTHORS
+# Passing NOCONFIGURE=true keeps configure from running.
+NOCONFIGURE=true ./autogen.sh
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
+%else
+	--without-xmms
 %endif
 make
 
@@ -69,7 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Rename locale dir, bugzilla 210206
-mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+if [ -d $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 ]; then
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+fi
 %find_lang %{name}
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -94,8 +136,110 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Jul 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-8.1
-- disable xmms for EL-5
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
+- use properly formed user-agent string (Andy Shevchenko) (bz 518757)
+- rebase to git master (bz 518758)
+- Add Location support (Andy Shevchenko, from Ubuntu)
+- Add link-by-nickname support (Andy Shevchenko, from FreeBSD)
+- clean out merged patches
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:4.5.3-35
+- Convert specfile to UTF-8.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
+- conditionalize libtool fun for F10+
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
+- only move broken locale dir if it gets created
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
+- conditionalize libtool fun for F11+
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
+- rebuild with all patches in place
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
+- add support for lj-embed tags
+- add support for MPRIS music detection (Andy Shevchenko)
+- improve tag handling (Andy Shevchenko)
+
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-28
+- add patch to enable "keep drafts" functionality
+  see: http://community.livejournal.com/logjam_dev/37274.html
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-26
+- libtoolize to support newer libtool
+- intltoolize so we get translations
+
+* Mon Jul 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-25
+- fix docked behavior again (bz 447146)
+- fix config option to start in dock again (bz 445998)
+- fix patch8 to apply with fuzz=0
+- add patch to enable/disable "logged in since" history popup as config option
+
+* Tue Jul  1 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-24
+- fix ukranian translation (bz 447145)
+- fix docked behavior (bz 447146)
+- add close when send option (bz 447147)
+- fix image resize sigsegv (bz 452170)
+
+* Tue May 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-23
+- add explicit without-xmms conditional (bz 445996)
+- add configuration option to start in dock (bz 445998)
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-22
+- re-enable threading where we really need it only
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-21
+- disable more threading
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-20
+- revert disable-threading patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-19
+- i'm going to beat autoconf
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-18
+- seriously, this is getting old now. added libtool to BR.
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-17
+- properly autotool
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-16
+- add Makefile.in bits to tags patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-15
+- fix tags patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-14 
+- missed one patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-13
+- disable unused threading on linux, resolves bz 435124
+- enable tags support (bz 434754)
+- add support for titles to links and images and links for images (bz 434754)
+- set default spellcheck lang to en_US (en was the old default, but didn't work)
+
+* Sat Feb 16 2008 Jesse Keating <jkeating at redhat.com> - 4.5.3-12
+- Rebuild for new libsoup
+
+* Wed Jan 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-11
+- apply patch for new libsoup from bz 430966
+
+* Tue Jan 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-10
+- rebuild for new libsoup
+
+* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-9.2
+- rebuild for BuildID, license fix (GPLv2+)
+
+* Mon Mar 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-9.1
+- rebuild for new gtkhtml, new patch to detect it
 
 * Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-8
 - Rename a locale directory to resolve bugzilla 210206
@@ -262,5 +406,5 @@ rm -rf $RPM_BUILD_ROOT
  - Added fix for James Manning, Web Links browser launch
 * Tue Feb 13 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Upgraded to add GNOME build option.
-* Sun Oct 08 2000 Alexander Gr?fe <nachtfalke at retrogra.de>
+* Sun Oct 08 2000 Alexander Gr??fe <nachtfalke at retrogra.de>
  - inital version of the RPM.



From spot at fedoraproject.org  Mon Aug 24 16:31:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:31:02 +0000 (UTC)
Subject: rpms/logjam/EL-4 0001-Add-Location-support-to-the-logjam.patch, NONE,
	1.1 0001-Add-automake-1.11-to-autogen.sh.patch, NONE,
	1.1 0001-Add-possibility-to-insert-link-by-nickname.patch, NONE,
	1.1 0001-Add-support-of-the-User-Agent-header.patch, NONE,
	1.1 0001-Adds-titles-to-links-and-images-and-link-to-images.patch,
	NONE, 1.1 logjam.spec, 1.19, 1.20
Message-ID: <20090824163102.D774811C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818/EL-4

Modified Files:
	logjam.spec 
Added Files:
	0001-Add-Location-support-to-the-logjam.patch 
	0001-Add-automake-1.11-to-autogen.sh.patch 
	0001-Add-possibility-to-insert-link-by-nickname.patch 
	0001-Add-support-of-the-User-Agent-header.patch 
	0001-Adds-titles-to-links-and-images-and-link-to-images.patch 
Log Message:
get logjam working again

0001-Add-Location-support-to-the-logjam.patch:
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 -
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 ++++++++++++++++++++++++++++
 src/jamview.h                               |    1 
 src/menu.c                                  |    2 +
 src/preview.c                               |    5 ++-
 8 files changed, 70 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-Location-support-to-the-logjam.patch ---
>From 7ab07309963ac85c42ab7f235ac39189091a2718 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 13:53:04 +0300
Subject: [PATCH] Add 'Location' support to the logjam

Originally patch was taken from:
	https://bugs.launchpad.net/ubuntu/+source/logjam/+bug/223939

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 +-
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 +++++++++++++++++++++++++++
 src/jamview.h                               |    1 +
 src/menu.c                                  |    2 +
 src/preview.c                               |    4 ++-
 8 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/protocol/liblivejournal/livejournal/entry.c b/protocol/liblivejournal/livejournal/entry.c
index 838fd42..5bdf12e 100644
--- a/protocol/liblivejournal/livejournal/entry.c
+++ b/protocol/liblivejournal/livejournal/entry.c
@@ -49,6 +49,8 @@ lj_entry_copy(LJEntry *e) {
 		newe->mood = g_strdup(e->mood);
 	if (e->music)
 		newe->music = g_strdup(e->music);
+	if (e->location)
+		newe->location = g_strdup(e->location);
 	if (e->taglist)
 		newe->taglist = g_strdup(e->taglist);
 	if (e->pickeyword)
@@ -61,6 +63,7 @@ lj_entry_free(LJEntry *e) {
 	g_free(e->event);
 	g_free(e->mood);
 	g_free(e->music);
+	g_free(e->location);
 	g_free(e->taglist);
 	g_free(e->pickeyword);
 	g_free(e);
@@ -136,6 +139,8 @@ lj_entry_set_request_fields(LJEntry *entry, LJRequest *request) {
 		lj_request_add_int(request, "prop_current_moodid", entry->moodid);
 	else
 		lj_request_add(request, "prop_current_moodid", "");
+	lj_request_add(request,
+			"prop_current_location", entry->location ? entry->location : "");
 	lj_request_add(request, 
 			"prop_current_music", entry->music ? entry->music : "");
 	lj_request_add(request, 
@@ -191,6 +196,12 @@ lj_entry_load_metadata(LJEntry *entry,
 			g_set_error(err, 0, 0, "Bad UTF-8 in current_music");
 			return FALSE;
 		}
+	} else if (strcmp(key, "current_location") == 0) {
+		entry->location = g_strdup(value);
+		if (!verify_utf8(&entry->location)) {
+			g_set_error(err, 0, 0, "Bad UTF-8 in current_location");
+			return FALSE;
+		}
 	} else if (strcmp(key, "taglist") == 0) {
 		entry->taglist = g_strdup(value);
 		if (!verify_utf8(&entry->taglist)) {
@@ -255,6 +266,7 @@ lj_entry_to_xml_node(LJEntry *entry, void* doc) {
 		}
 	}
 	XML_ENTRY_META_SET(music);
+	XML_ENTRY_META_SET(location);
 	XML_ENTRY_META_SET(taglist);
 	XML_ENTRY_META_SET(pickeyword);
 	if (entry->preformatted)
@@ -479,6 +491,7 @@ lj_entry_load_from_xml_node(LJEntry *entry, xmlDocPtr doc, xmlNodePtr node) {
 			}
 		}
 		else XML_ENTRY_META_GET(music)
+		else XML_ENTRY_META_GET(location)
 		else XML_ENTRY_META_GET(taglist)
 		else XML_ENTRY_META_GET(pickeyword)
 		else if (xmlStrcmp(cur->name, BAD_CAST "preformatted") == 0) {
@@ -605,6 +618,7 @@ rfc822_load_entry(const char *key, const char *val, LJEntry *entry) {
 	RFC822_GET(subject)
 	else RFC822_GET(mood) /* XXX id */
 	else RFC822_GET(music)
+	else RFC822_GET(location)
 	else RFC822_GET(taglist)
 	else RFC822_GET(pickeyword)
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
@@ -748,6 +762,7 @@ lj_entry_to_rfc822(LJEntry *entry, gboolean includeempty) {
 	append_field(str, "Subject", entry->subject, includeempty);
 	append_field(str, "Mood", entry->mood, includeempty);
 	append_field(str, "Music", entry->music, includeempty);
+	append_field(str, "Location", entry->location, includeempty);
 	append_field(str, "TagList", entry->taglist, includeempty);
 	append_field(str, "PicKeyword", entry->pickeyword, includeempty);
 	g_string_append(str, "\n");
diff --git a/protocol/liblivejournal/livejournal/entry.h b/protocol/liblivejournal/livejournal/entry.h
index 4a138e5..2d35f89 100644
--- a/protocol/liblivejournal/livejournal/entry.h
+++ b/protocol/liblivejournal/livejournal/entry.h
@@ -52,7 +52,7 @@ typedef struct _LJEntry {
 	char *event;
 
 	int moodid;  /* a moodid is only meaningful in the context of a particular LJServer. */
-	char *mood, *music, *taglist, *pickeyword;
+	char *mood, *music, *location, *taglist, *pickeyword;
 	gboolean preformatted;
 	gboolean backdated;
 	LJCommentsType comments;
diff --git a/src/jamdoc.c b/src/jamdoc.c
index b3cdf99..ced84a0 100644
--- a/src/jamdoc.c
+++ b/src/jamdoc.c
@@ -240,6 +240,14 @@ jam_doc_set_music(JamDoc *doc, const char *music) {
 	string_replace(&doc->entry->music, music ? g_strdup(music) : NULL);
 }
 const char *
+jam_doc_get_location(JamDoc *doc) {
+	return doc->entry->location;
+}
+void
+jam_doc_set_location(JamDoc *doc, const char *location) {
+	string_replace(&doc->entry->location, location ? g_strdup(location) : NULL);
+}
+const char *
 jam_doc_get_taglist(JamDoc *doc) {
 	return doc->entry->taglist;
 }
diff --git a/src/jamdoc.h b/src/jamdoc.h
index 21fae13..99fa8b4 100644
--- a/src/jamdoc.h
+++ b/src/jamdoc.h
@@ -63,6 +63,9 @@ void           jam_doc_set_moodid(JamDoc *doc, int moodid);
 const char *   jam_doc_get_music(JamDoc *doc);
 void           jam_doc_set_music(JamDoc *doc, const char *music);
 
+const char *   jam_doc_get_location(JamDoc *doc);
+void           jam_doc_set_location(JamDoc *doc, const char *location);
+
 const char *   jam_doc_get_taglist(JamDoc *doc);
 void           jam_doc_set_taglist(JamDoc *doc, const char *taglist);
 
diff --git a/src/jamview.c b/src/jamview.c
index ecd1fc2..cb00b3a 100644
--- a/src/jamview.c
+++ b/src/jamview.c
@@ -43,6 +43,9 @@ struct _JamView {
 	GtkWidget *musicbar;
 	GtkWidget *musicbutton, *music;
 
+	GtkWidget *locationbar;
+	GtkWidget *location;
+
 	GtkWidget *tagsbar;
 	GtkWidget *tags;
 
@@ -428,6 +431,39 @@ tags_select_cb(JamView *view) {
 }
 
 static void
+location_add(JamView *view) {
+	view->location = gtk_entry_new();
+	view->locationbar = labelled_box_new_sg(_("_Location:"), view->location, view->sizegroup);
+	gtk_box_pack_start(GTK_BOX(view), view->locationbar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(view), view->locationbar, view->moodpicbar ? 2 : 1);
+	gtk_widget_show_all(view->locationbar);
+}
+static void
+location_remove(JamView *view) {
+	jam_doc_set_location(view->doc, NULL);
+	gtk_widget_destroy(view->locationbar);
+	view->locationbar = view->location = NULL;
+}
+static gboolean
+location_visible(JamView *view) {
+	return view->locationbar != NULL;
+}
+static void
+location_load(JamView *view) {
+	const char *location = jam_doc_get_location(view->doc);
+	if (location)
+		show_meta(view, JAM_VIEW_LOCATION);
+	if (location_visible(view))
+		gtk_entry_set_text(GTK_ENTRY(view->location), location ? location : "");
+}
+static void
+location_store(JamView *view) {
+	const char *location = gtk_entry_get_text(GTK_ENTRY(view->location));
+	if (location[0] == 0) location = NULL;
+	jam_doc_set_location(view->doc, location);
+}
+
+static void
 tags_add(JamView *view) {
 	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
@@ -590,6 +626,7 @@ static struct {
 	{ "mood",         TRUE, STD(mood),         mood_account_changed     },
 	{ "picture",      TRUE, STD(picture),      picture_account_changed  },
 	{ "music",        TRUE, STD(music),        NULL },
+	{ "location",     TRUE, STD(location),     NULL },
 	{ "tags",         TRUE, STD(tags),         NULL },
 	{ "preformatted", TRUE, STD(preformatted), NULL },
 	{ "datesel",      TRUE, STD(datesel),      NULL },
diff --git a/src/jamview.h b/src/jamview.h
index 0862054..a4efbf5 100644
--- a/src/jamview.h
+++ b/src/jamview.h
@@ -21,6 +21,7 @@ typedef enum {
 	JAM_VIEW_MOOD,
 	JAM_VIEW_PIC,
 	JAM_VIEW_MUSIC,
+	JAM_VIEW_LOCATION,
 	JAM_VIEW_TAGS,
 	JAM_VIEW_PREFORMATTED,
 	JAM_VIEW_DATESEL,
diff --git a/src/menu.c b/src/menu.c
index 6ca6e23..97bd611 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,6 +56,7 @@ enum {
 	ACTION_VIEW_MOOD,
 	ACTION_VIEW_PICTURE,
 	ACTION_VIEW_MUSIC,
+	ACTION_VIEW_LOCATION,
 	ACTION_VIEW_TAGS,
 	ACTION_VIEW_PREFORMATTED,
 	ACTION_VIEW_DATESEL,
@@ -430,6 +431,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/View/_Picture"),           NULL, menu_view_cb, ACTION_VIEW_PICTURE,      "<CheckItem>" },
 { N_("/View/_Tags"),              NULL, menu_view_cb, ACTION_VIEW_TAGS,         "<CheckItem>" },
 { N_("/View/M_usic"),             NULL, menu_view_cb, ACTION_VIEW_MUSIC,        "<CheckItem>" },
+{ N_("/View/_Location"),          NULL, menu_view_cb, ACTION_VIEW_LOCATION,     "<CheckItem>" },
 { N_("/View/_Preformatted"),      NULL, menu_view_cb, ACTION_VIEW_PREFORMATTED, "<CheckItem>" },
 { N_("/View/_Comments"),          NULL, menu_view_cb, ACTION_VIEW_COMMENTS,     "<CheckItem>" },
 
diff --git a/src/preview.c b/src/preview.c
index b3abc2e..5ee3fbc 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -179,11 +179,13 @@ entry_prepare_preview(LJEntry *entry) {
 		g_string_append(str, "</tr></table><hr/><br/>");
 	}
 
-	if (entry->mood || entry->music || entry->taglist) {
+	if (entry->mood || entry->music || entry->location || entry->taglist) {
 		if (entry->mood)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Mood"), entry->mood);
 		if (entry->music)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Music"), entry->music);
+		if (entry->location)
+			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Location"), entry->location);
 		if (entry->taglist)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Tags"), entry->taglist);
 		g_string_append(str, "<br/>");
-- 
1.6.4


0001-Add-automake-1.11-to-autogen.sh.patch:
 autogen.sh |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Add-automake-1.11-to-autogen.sh.patch ---
>From bbe8da1dd21a193d232e6b63ed37cb30ea2068ca Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 14:52:09 +0300
Subject: [PATCH] Add automake-1.11 to autogen.sh

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 autogen.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4b72b88..b01b5f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,12 +311,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-- 
1.6.4


0001-Add-possibility-to-insert-link-by-nickname.patch:
 link-journal.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Add-possibility-to-insert-link-by-nickname.patch ---
>From 43ff911da0f0d81a264bc52e8db565e0fb52c2af Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 15:56:28 +0300
Subject: [PATCH] Add possibility to insert link by nickname

Originally patch was found here:
	http://people.freebsd.org/~novel/patches/non-freebsd/logjam452_userlink.diff

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/link-journal.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/link-journal.c b/src/link-journal.c
index d70e70d..ec47e2d 100644
--- a/src/link-journal.c
+++ b/src/link-journal.c
@@ -44,11 +44,12 @@ make_usertype_omenu() {
 void
 link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkWidget *dlg;
-	GtkWidget *vbox, *hbox, *entry, *omenu;
+	GtkWidget *vbox, *hbox, *entry, *entry_name, *omenu;
 	GtkSizeGroup *sizegroup;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *username = NULL;
+	char *usernick = NULL;
 	int usertype;
 	gboolean selection = FALSE;
 
@@ -78,6 +79,11 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	hbox = labelled_box_new_sg(_("_Username:"), entry, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	entry_name = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(entry_name), TRUE);
+	hbox = labelled_box_new_sg(_("_Nickname:"), entry_name, sizegroup);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
 	omenu = make_usertype_omenu();
 	hbox = labelled_box_new_sg(_("User _Type:"), omenu, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -89,6 +95,7 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		return;
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -102,6 +109,41 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usernick && *usernick) {
+		gchar *link;
+		gchar *img;
+		JamAccount *acc = jam_doc_get_account(doc);
+
+		xml_escape(&username);
+		xml_escape(&usernick);
+
+		if (usertype == 0)
+			img = g_strdup("userinfo.gif");
+		else
+			img = g_strdup("community.gif");
+
+		link = g_strdup_printf(
+			"<a href='%s/userinfo.bml?user=%s'>"
+				"<img src='%s/img/%s' alt='[info]' align='absmiddle' width='17' height='17' border='0' />"
+			"</a>"
+			"<a style='FONT-WEIGHT: 800' href='%s/users/%s'>%s</a>",
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			img,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			usernick);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(img);
+		free(username);
+		free(usernick);
+		return;
+	}
+
 	gtk_text_buffer_insert(buffer, &start, "<lj ", -1);
 	if (usertype == 0)
 		gtk_text_buffer_insert(buffer, &start, "user=\"", -1);
-- 
1.6.4


0001-Add-support-of-the-User-Agent-header.patch:
 network-curl.c     |    2 ++
 network-internal.h |    5 +++++
 network-libxml.c   |    7 +++++++
 network-soup.c     |    5 ++++-
 network-win32.c    |    3 +--
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-support-of-the-User-Agent-header.patch ---
>From 511a6b7ba39438bc5edaac7c27f1283bf04b75b1 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 20:42:00 +0300
Subject: [PATCH] Add support of the User-Agent header

Starting from 22.08.2009 the Livejournal refuses all programs which has
not well-formed User-Agent string. Details here:
http://www.livejournal.com/bots/

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/network-curl.c     |    2 ++
 src/network-internal.h |    5 +++++
 src/network-libxml.c   |    7 +++++++
 src/network-soup.c     |    5 ++++-
 src/network-win32.c    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/network-curl.c b/src/network-curl.c
index 12bdc81..94db0af 100644
--- a/src/network-curl.c
+++ b/src/network-curl.c
@@ -96,6 +96,8 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 	}
 
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, LOGJAM_USER_AGENT);
+
 	if (headers) {
 		GSList *l;
 		for (l = headers; l; l = l->next)
diff --git a/src/network-internal.h b/src/network-internal.h
index 991edfc..9103bc8 100644
--- a/src/network-internal.h
+++ b/src/network-internal.h
@@ -9,6 +9,11 @@
 
 #include "network.h"
 
+/* constants to apply User-Agent header */
+#define LOGJAM_HOME_URL		"http://logjam.danga.com"
+#define LOGJAM_AUTHOR_EMAIL	"martine at danga.com"
+#define LOGJAM_USER_AGENT	LOGJAM_HOME_URL "; " LOGJAM_AUTHOR_EMAIL
+
 /* network-internal -- interface to http, used by network.
  * provides a blocking and nonblocking interface.
  * implemented by
diff --git a/src/network-libxml.c b/src/network-libxml.c
index 8f2c4d7..4f97737 100644
--- a/src/network-libxml.c
+++ b/src/network-libxml.c
@@ -25,6 +25,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 	gboolean success = FALSE;
 	int len;
 	NetStatusProgress progress;
+	gchar *user_agent;
 
 	if (conf.options.netdump && post) 
 		fprintf(stderr, _("Request: [%s]\n"), post->str);
@@ -44,16 +45,22 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		xmlNanoHTTPScanProxy(NULL);
 	}
 
+	user_agent = g_strdup_printf("User-Agent: %s\r\n", LOGJAM_USER_AGENT);
 	if (headers) {
 		GString *hs = g_string_new(NULL);
 		GSList *l;
+		g_string_append(hs, user_agent);
 		for (l = headers; l; l = l->next) {
 			g_string_append(hs, l->data);
 			g_string_append(hs, "\r\n");
 		}
 		headerstr = hs->str;
 		g_string_free(hs, FALSE);
+		g_free(user_agent);
+	} else {
+		headerstr = user_agent;
 	}
+
 	if (post)
 		ctx = xmlNanoHTTPMethod(url, "POST",
 				post->str, NULL, headerstr, post->len);
diff --git a/src/network-soup.c b/src/network-soup.c
index 9e28d9c..24b8e45 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -57,10 +57,13 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_PROXY_URI, suri,
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
 			NULL);
 		soup_uri_free(suri);
 	} else
-		session = soup_session_sync_new ();
+		session = soup_session_sync_new_with_options (
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
+			NULL);
 
 	req = soup_message_new(post ? "POST" : "GET", url);
 	g_signal_connect(G_OBJECT(req), "got-chunk",
diff --git a/src/network-win32.c b/src/network-win32.c
index a2429aa..d4d1796 100644
--- a/src/network-win32.c
+++ b/src/network-win32.c
@@ -126,7 +126,7 @@ net_post_blocking(const char *surl, GSList *headers, GString *post,
 	host = urlc.lpszHostName;
 	host[urlc.dwHostNameLength] = 0;
 
-	if ((hInternet = InternetOpen("LogJam-Win32",
+	if ((hInternet = InternetOpen(LOGJAM_USER_AGENT,
 			INTERNET_OPEN_TYPE_PRECONFIG,
 			NULL, NULL, 0)) != NULL) {
 
-- 
1.6.4


0001-Adds-titles-to-links-and-images-and-link-to-images.patch:
 html_markup.c |    5 +++++
 imagelink.c   |   32 +++++++++++++++++++++++++++++---
 link.c        |   16 +++++++++++++---
 menu.c        |    6 +++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Adds-titles-to-links-and-images-and-link-to-images.patch ---
>From 14038cb91ef71252d9e46c5c4f4060e79ee49259 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Fri, 1 May 2009 23:27:26 +0300
Subject: [PATCH] Adds titles to links and images and link to images

This adds:
* title to the dialog for image and link
* link to image dialog
* blockquote option for formatting

Originally patch was observed here:
http://bugzilla.redhat.com/show_bug.cgi?id=434754#c1

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/html_markup.c |    5 +++++
 src/imagelink.c   |   32 +++++++++++++++++++++++++++++---
 src/link.c        |   16 +++++++++++++---
 src/menu.c        |    5 +++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/html_markup.c b/src/html_markup.c
index 36ec4e7..9c5a796 100644
--- a/src/html_markup.c
+++ b/src/html_markup.c
@@ -74,3 +74,8 @@ void
 html_mark_monospaced(JamDoc *doc) {
 	html_mark_tag(doc, "tt");
 }
+
+void
+html_mark_blockquote(JamDoc *doc) {
+	html_mark_tag(doc, "blockquote");
+}
diff --git a/src/imagelink.c b/src/imagelink.c
index a9f296d..21ac938 100644
--- a/src/imagelink.c
+++ b/src/imagelink.c
@@ -13,7 +13,7 @@
 
 typedef struct {
 	GtkWidget *dlg;
-	GtkWidget *url, *get, *width, *height;
+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
 } ImageDlg;
 
 static void
@@ -88,6 +88,14 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
 			FALSE, FALSE, 0);
 
+	idlg->tit = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
+		FALSE, FALSE, 0);
+	idlg->anchor = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
+		FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	dimbox = gtk_vbox_new(FALSE, 6);
@@ -132,6 +140,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *sel = NULL, *url = NULL;
+	const gchar *tit, *anch;
 	const char *data;
 	int width = -1, height = -1;
 
@@ -161,9 +170,15 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 
 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
 		xml_escape(&url);
-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
+		anch = gtk_entry_get_text(GTK_ENTRY(idlg->anchor));
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, anch, -1);
+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
+		}
+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
 		gtk_text_buffer_insert(buffer, &start, url, -1);
-		gtk_text_buffer_insert(buffer, &start, "'", -1);
+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
 		g_free(url);
 
 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
@@ -182,7 +197,18 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 			gtk_text_buffer_insert(buffer, &start, data, -1);
 			g_free(data);
 		}
+
+		tit = gtk_entry_get_text(GTK_ENTRY(idlg->tit));
+		if (tit && *tit) {
+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, tit, -1);
+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
+		}
+
 		gtk_text_buffer_insert(buffer, &start, " />", -1);
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "</a>", -1);
+		}
 	}
 
 	g_free(sel);
diff --git a/src/link.c b/src/link.c
index 0be2e98..596eb30 100644
--- a/src/link.c
+++ b/src/link.c
@@ -17,6 +17,7 @@
 typedef struct {
 	GtkWidget *dlg;
 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
+	GtkWidget *titl;
 	JamDoc *doc;
 	gint sel_type, clip_type;
 	gchar *sel_input, *clip_input;
@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
 static void
 make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	GtkWidget *vbox;
-	GtkWidget *subbox;
+	GtkWidget *subbox, *hhr;
 	GSList *rgroup;
 
 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
@@ -114,6 +115,9 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
+	ld->titl = gtk_entry_new();
+	hhr = labelled_box_new(_("Link Title:"), ld->titl);
+	gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), 
 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
 
 static char*
 get_link(LinkDialog *ld, JamAccount *acc) {
-	char *url, *user, *text;
+	char *url, *user, *text, *title;
 	char *link = NULL;
 
 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
@@ -187,10 +191,15 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	xml_escape(&user);
 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
 	xml_escape(&text);
+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
 		/* build a "url" link. */
-		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		if (title && *title) {
+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
+		} else {
+			link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		}
 	} else if (ld->ruser &&
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
 		/* build a "friends" link. */
@@ -204,6 +213,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	g_free(url);
 	g_free(user);
 	g_free(text);
+	g_free(title);
 	
 	return link;
 }
diff --git a/src/menu.c b/src/menu.c
index 7fa74f2..5cdd37e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -321,6 +321,10 @@ static void
 menu_html_mark_monospaced(JamWin *jw) {
 	html_mark_monospaced(jw->doc);
 }
+static void
+menu_html_mark_blockquote(JamWin *jw) {
+	html_mark_blockquote(jw->doc);
+}
 
 void manager_dialog(GtkWidget *parent);
 
@@ -435,6 +439,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
 { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
 { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
+{ N_("/HTML/_Blockquote"),			"<ctl><alt>Q", menu_html_mark_blockquote },
 
 { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
 { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },
-- 
1.6.4



Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-4/logjam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- logjam.spec	23 Aug 2007 23:13:06 -0000	1.19
+++ logjam.spec	24 Aug 2009 16:31:02 -0000	1.20
@@ -2,32 +2,50 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	8%{?dist}.1
+Release:	36%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+# Now, we get source from git
+# git clone git://github.com/martine/LogJam.git logjam-git
+# find logjam-git -depth -name .git -type d -exec rm -rf {} \;
+# tar cvfj logjam-git-20090824.tar.bz2 logjam-git/
+Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
 %endif
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-BuildRequires:	libsoup-devel, gnutls-devel, libgcrypt-devel
-BuildRequires:	autoconf, intltool
+BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
+BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch2:		logjam-4.4.1-backdated.patch
-Patch3:		logjam-4.4.1-cleanups.patch
-Patch4:		logjam-4.4.1-fedora-desktop.patch
-Patch5:		logjam-4.5-patch8-manfix.patch
-Patch6:		logjam-4.5.2-gtkhtml38.patch
-Patch7:		logjam-4.4.1-ru.po.asp.patch
-Patch8:		logjam-4.5.3-gtkspell.patch
-Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
-Patch10:	logjam-4.5.3-rhythmbox-fix.patch
+Patch1:		logjam-4.4.1-fedora-desktop.patch
+Patch2:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
+Patch3:		logjam-4.5.3-disable-threads.patch
+Patch4:		0001-Adds-titles-to-links-and-images-and-link-to-images.patch
+Patch5:		logjam-4.5.3-tags.patch
+Patch6:		logjam-4.5.3-start_in_dock.patch
+Patch7:		logjam-4.5.3-no_quit_when_docked.patch
+Patch8:		logjam-4.5.3-close_when_send.patch
+Patch9:		logjam-4.5.3-showloginhistory.patch
+Patch10:	logjam-4.5.3-libtool.patch
+Patch11:	logjam-4.5.3-keep-drafts.patch
+Patch12:	logjam-4.5.3-mpris.diff
+Patch13:	logjam-4.5.3-save-tags.diff
+# From: http://github.com/andy-shev/LogJam/commit/1426ae5af7f0c1ba4084f0ce0e0b63c43c763dc7
+Patch14:	0001-Add-support-of-the-User-Agent-header.patch
+# From: http://github.com/andy-shev/LogJam/commit/7ab07309963ac85c42ab7f235ac39189091a2718
+Patch15:	0001-Add-Location-support-to-the-logjam.patch
+# From: http://github.com/andy-shev/LogJam/commit/43ff911da0f0d81a264bc52e8db565e0fb52c2af
+Patch16:	0001-Add-possibility-to-insert-link-by-nickname.patch
+# From: http://github.com/andy-shev/LogJam/commit/bbe8da1dd21a193d232e6b63ed37cb30ea2068ca
+Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -45,22 +63,44 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q
-%patch2 -p1 -b .backdated
-%patch3 -p1 -b .cleanups
-%patch4 -p1 -b .desktop
-%patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml38
-%patch7 -p1 -b .ru.po
-%patch8 -p1 -b .bz186906
-%patch9 -p1 -b .docklet-context-menu
-%patch10 -p1 -b .rhythmboxfix
+%setup -q -n logjam-git
+%patch1 -p1 -b .desktop
+# %%patch5 -p1 -b .manfix
+%patch2 -p1 -b .docklet-context-menu
+%patch3 -p1 -b .disable-threads
+%patch4 -p1 -b .title
+%patch5 -p1 -b .tags
+%patch6 -p1 -b .start-in-dock
+%patch7 -p1 -b .no_quit_when_docked
+%patch8 -p1 -b .close_when_send
+%patch9 -p1 -b .showloginhistory
+%if 0%{fedora} >= 11
+%patch10 -p1 -b .libtool
+%endif
+%patch11 -p1 -b .keep_drafts
+%patch12 -p1 -b .mpris
+%patch13 -p1 -b .save-tags
+%patch14 -p1 -b .user-agent
+%patch15 -p1 -b .location
+%patch16 -p1 -b .link-by-nickname
+%patch17 -p1 -b .automake111
+
+%if 0%{fedora} >= 10
+libtoolize
+rm -rf aclocal.m4
+autoupdate
+intltoolize --force
+%endif
 
 %build
-autoconf
+touch NEWS README AUTHORS
+# Passing NOCONFIGURE=true keeps configure from running.
+NOCONFIGURE=true ./autogen.sh
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
+%else
+	--without-xmms
 %endif
 make
 
@@ -69,7 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Rename locale dir, bugzilla 210206
-mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+if [ -d $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 ]; then
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/en_US.UTF-8 $RPM_BUILD_ROOT%{_datadir}/locale/en_US
+fi
 %find_lang %{name}
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -94,8 +136,110 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Jul 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-8.1
-- disable sqlite for EL-4
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
+- use properly formed user-agent string (Andy Shevchenko) (bz 518757)
+- rebase to git master (bz 518758)
+- Add Location support (Andy Shevchenko, from Ubuntu)
+- Add link-by-nickname support (Andy Shevchenko, from FreeBSD)
+- clean out merged patches
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:4.5.3-35
+- Convert specfile to UTF-8.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
+- conditionalize libtool fun for F10+
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-32
+- only move broken locale dir if it gets created
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-31
+- conditionalize libtool fun for F11+
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-30
+- rebuild with all patches in place
+
+* Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-29
+- add support for lj-embed tags
+- add support for MPRIS music detection (Andy Shevchenko)
+- improve tag handling (Andy Shevchenko)
+
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-28
+- add patch to enable "keep drafts" functionality
+  see: http://community.livejournal.com/logjam_dev/37274.html
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-26
+- libtoolize to support newer libtool
+- intltoolize so we get translations
+
+* Mon Jul 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-25
+- fix docked behavior again (bz 447146)
+- fix config option to start in dock again (bz 445998)
+- fix patch8 to apply with fuzz=0
+- add patch to enable/disable "logged in since" history popup as config option
+
+* Tue Jul  1 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-24
+- fix ukranian translation (bz 447145)
+- fix docked behavior (bz 447146)
+- add close when send option (bz 447147)
+- fix image resize sigsegv (bz 452170)
+
+* Tue May 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-23
+- add explicit without-xmms conditional (bz 445996)
+- add configuration option to start in dock (bz 445998)
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-22
+- re-enable threading where we really need it only
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-21
+- disable more threading
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-20
+- revert disable-threading patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-19
+- i'm going to beat autoconf
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-18
+- seriously, this is getting old now. added libtool to BR.
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-17
+- properly autotool
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-16
+- add Makefile.in bits to tags patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-15
+- fix tags patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-14 
+- missed one patch
+
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-13
+- disable unused threading on linux, resolves bz 435124
+- enable tags support (bz 434754)
+- add support for titles to links and images and links for images (bz 434754)
+- set default spellcheck lang to en_US (en was the old default, but didn't work)
+
+* Sat Feb 16 2008 Jesse Keating <jkeating at redhat.com> - 4.5.3-12
+- Rebuild for new libsoup
+
+* Wed Jan 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-11
+- apply patch for new libsoup from bz 430966
+
+* Tue Jan 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-10
+- rebuild for new libsoup
+
+* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-9.2
+- rebuild for BuildID, license fix (GPLv2+)
+
+* Mon Mar 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-9.1
+- rebuild for new gtkhtml, new patch to detect it
 
 * Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-8
 - Rename a locale directory to resolve bugzilla 210206
@@ -262,5 +406,5 @@ rm -rf $RPM_BUILD_ROOT
  - Added fix for James Manning, Web Links browser launch
 * Tue Feb 13 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Upgraded to add GNOME build option.
-* Sun Oct 08 2000 Alexander Gr?fe <nachtfalke at retrogra.de>
+* Sun Oct 08 2000 Alexander Gr??fe <nachtfalke at retrogra.de>
  - inital version of the RPM.



From spot at fedoraproject.org  Mon Aug 24 16:31:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:31:03 +0000 (UTC)
Subject: rpms/logjam/F-10 0001-Add-Location-support-to-the-logjam.patch, NONE,
	1.1 0001-Add-automake-1.11-to-autogen.sh.patch, NONE,
	1.1 0001-Add-possibility-to-insert-link-by-nickname.patch, NONE,
	1.1 0001-Add-support-of-the-User-Agent-header.patch, NONE,
	1.1 0001-Adds-titles-to-links-and-images-and-link-to-images.patch,
	NONE, 1.1 logjam-4.5.3-tags.patch, 1.4, 1.5 logjam.spec, 1.53, 1.54
Message-ID: <20090824163103.A5E1011C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818/F-10

Modified Files:
	logjam-4.5.3-tags.patch logjam.spec 
Added Files:
	0001-Add-Location-support-to-the-logjam.patch 
	0001-Add-automake-1.11-to-autogen.sh.patch 
	0001-Add-possibility-to-insert-link-by-nickname.patch 
	0001-Add-support-of-the-User-Agent-header.patch 
	0001-Adds-titles-to-links-and-images-and-link-to-images.patch 
Log Message:
get logjam working again

0001-Add-Location-support-to-the-logjam.patch:
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 -
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 ++++++++++++++++++++++++++++
 src/jamview.h                               |    1 
 src/menu.c                                  |    2 +
 src/preview.c                               |    5 ++-
 8 files changed, 70 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-Location-support-to-the-logjam.patch ---
>From 7ab07309963ac85c42ab7f235ac39189091a2718 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 13:53:04 +0300
Subject: [PATCH] Add 'Location' support to the logjam

Originally patch was taken from:
	https://bugs.launchpad.net/ubuntu/+source/logjam/+bug/223939

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 +-
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 +++++++++++++++++++++++++++
 src/jamview.h                               |    1 +
 src/menu.c                                  |    2 +
 src/preview.c                               |    4 ++-
 8 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/protocol/liblivejournal/livejournal/entry.c b/protocol/liblivejournal/livejournal/entry.c
index 838fd42..5bdf12e 100644
--- a/protocol/liblivejournal/livejournal/entry.c
+++ b/protocol/liblivejournal/livejournal/entry.c
@@ -49,6 +49,8 @@ lj_entry_copy(LJEntry *e) {
 		newe->mood = g_strdup(e->mood);
 	if (e->music)
 		newe->music = g_strdup(e->music);
+	if (e->location)
+		newe->location = g_strdup(e->location);
 	if (e->taglist)
 		newe->taglist = g_strdup(e->taglist);
 	if (e->pickeyword)
@@ -61,6 +63,7 @@ lj_entry_free(LJEntry *e) {
 	g_free(e->event);
 	g_free(e->mood);
 	g_free(e->music);
+	g_free(e->location);
 	g_free(e->taglist);
 	g_free(e->pickeyword);
 	g_free(e);
@@ -136,6 +139,8 @@ lj_entry_set_request_fields(LJEntry *entry, LJRequest *request) {
 		lj_request_add_int(request, "prop_current_moodid", entry->moodid);
 	else
 		lj_request_add(request, "prop_current_moodid", "");
+	lj_request_add(request,
+			"prop_current_location", entry->location ? entry->location : "");
 	lj_request_add(request, 
 			"prop_current_music", entry->music ? entry->music : "");
 	lj_request_add(request, 
@@ -191,6 +196,12 @@ lj_entry_load_metadata(LJEntry *entry,
 			g_set_error(err, 0, 0, "Bad UTF-8 in current_music");
 			return FALSE;
 		}
+	} else if (strcmp(key, "current_location") == 0) {
+		entry->location = g_strdup(value);
+		if (!verify_utf8(&entry->location)) {
+			g_set_error(err, 0, 0, "Bad UTF-8 in current_location");
+			return FALSE;
+		}
 	} else if (strcmp(key, "taglist") == 0) {
 		entry->taglist = g_strdup(value);
 		if (!verify_utf8(&entry->taglist)) {
@@ -255,6 +266,7 @@ lj_entry_to_xml_node(LJEntry *entry, void* doc) {
 		}
 	}
 	XML_ENTRY_META_SET(music);
+	XML_ENTRY_META_SET(location);
 	XML_ENTRY_META_SET(taglist);
 	XML_ENTRY_META_SET(pickeyword);
 	if (entry->preformatted)
@@ -479,6 +491,7 @@ lj_entry_load_from_xml_node(LJEntry *entry, xmlDocPtr doc, xmlNodePtr node) {
 			}
 		}
 		else XML_ENTRY_META_GET(music)
+		else XML_ENTRY_META_GET(location)
 		else XML_ENTRY_META_GET(taglist)
 		else XML_ENTRY_META_GET(pickeyword)
 		else if (xmlStrcmp(cur->name, BAD_CAST "preformatted") == 0) {
@@ -605,6 +618,7 @@ rfc822_load_entry(const char *key, const char *val, LJEntry *entry) {
 	RFC822_GET(subject)
 	else RFC822_GET(mood) /* XXX id */
 	else RFC822_GET(music)
+	else RFC822_GET(location)
 	else RFC822_GET(taglist)
 	else RFC822_GET(pickeyword)
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
@@ -748,6 +762,7 @@ lj_entry_to_rfc822(LJEntry *entry, gboolean includeempty) {
 	append_field(str, "Subject", entry->subject, includeempty);
 	append_field(str, "Mood", entry->mood, includeempty);
 	append_field(str, "Music", entry->music, includeempty);
+	append_field(str, "Location", entry->location, includeempty);
 	append_field(str, "TagList", entry->taglist, includeempty);
 	append_field(str, "PicKeyword", entry->pickeyword, includeempty);
 	g_string_append(str, "\n");
diff --git a/protocol/liblivejournal/livejournal/entry.h b/protocol/liblivejournal/livejournal/entry.h
index 4a138e5..2d35f89 100644
--- a/protocol/liblivejournal/livejournal/entry.h
+++ b/protocol/liblivejournal/livejournal/entry.h
@@ -52,7 +52,7 @@ typedef struct _LJEntry {
 	char *event;
 
 	int moodid;  /* a moodid is only meaningful in the context of a particular LJServer. */
-	char *mood, *music, *taglist, *pickeyword;
+	char *mood, *music, *location, *taglist, *pickeyword;
 	gboolean preformatted;
 	gboolean backdated;
 	LJCommentsType comments;
diff --git a/src/jamdoc.c b/src/jamdoc.c
index b3cdf99..ced84a0 100644
--- a/src/jamdoc.c
+++ b/src/jamdoc.c
@@ -240,6 +240,14 @@ jam_doc_set_music(JamDoc *doc, const char *music) {
 	string_replace(&doc->entry->music, music ? g_strdup(music) : NULL);
 }
 const char *
+jam_doc_get_location(JamDoc *doc) {
+	return doc->entry->location;
+}
+void
+jam_doc_set_location(JamDoc *doc, const char *location) {
+	string_replace(&doc->entry->location, location ? g_strdup(location) : NULL);
+}
+const char *
 jam_doc_get_taglist(JamDoc *doc) {
 	return doc->entry->taglist;
 }
diff --git a/src/jamdoc.h b/src/jamdoc.h
index 21fae13..99fa8b4 100644
--- a/src/jamdoc.h
+++ b/src/jamdoc.h
@@ -63,6 +63,9 @@ void           jam_doc_set_moodid(JamDoc *doc, int moodid);
 const char *   jam_doc_get_music(JamDoc *doc);
 void           jam_doc_set_music(JamDoc *doc, const char *music);
 
+const char *   jam_doc_get_location(JamDoc *doc);
+void           jam_doc_set_location(JamDoc *doc, const char *location);
+
 const char *   jam_doc_get_taglist(JamDoc *doc);
 void           jam_doc_set_taglist(JamDoc *doc, const char *taglist);
 
diff --git a/src/jamview.c b/src/jamview.c
index ecd1fc2..cb00b3a 100644
--- a/src/jamview.c
+++ b/src/jamview.c
@@ -43,6 +43,9 @@ struct _JamView {
 	GtkWidget *musicbar;
 	GtkWidget *musicbutton, *music;
 
+	GtkWidget *locationbar;
+	GtkWidget *location;
+
 	GtkWidget *tagsbar;
 	GtkWidget *tags;
 
@@ -428,6 +431,39 @@ tags_select_cb(JamView *view) {
 }
 
 static void
+location_add(JamView *view) {
+	view->location = gtk_entry_new();
+	view->locationbar = labelled_box_new_sg(_("_Location:"), view->location, view->sizegroup);
+	gtk_box_pack_start(GTK_BOX(view), view->locationbar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(view), view->locationbar, view->moodpicbar ? 2 : 1);
+	gtk_widget_show_all(view->locationbar);
+}
+static void
+location_remove(JamView *view) {
+	jam_doc_set_location(view->doc, NULL);
+	gtk_widget_destroy(view->locationbar);
+	view->locationbar = view->location = NULL;
+}
+static gboolean
+location_visible(JamView *view) {
+	return view->locationbar != NULL;
+}
+static void
+location_load(JamView *view) {
+	const char *location = jam_doc_get_location(view->doc);
+	if (location)
+		show_meta(view, JAM_VIEW_LOCATION);
+	if (location_visible(view))
+		gtk_entry_set_text(GTK_ENTRY(view->location), location ? location : "");
+}
+static void
+location_store(JamView *view) {
+	const char *location = gtk_entry_get_text(GTK_ENTRY(view->location));
+	if (location[0] == 0) location = NULL;
+	jam_doc_set_location(view->doc, location);
+}
+
+static void
 tags_add(JamView *view) {
 	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
@@ -590,6 +626,7 @@ static struct {
 	{ "mood",         TRUE, STD(mood),         mood_account_changed     },
 	{ "picture",      TRUE, STD(picture),      picture_account_changed  },
 	{ "music",        TRUE, STD(music),        NULL },
+	{ "location",     TRUE, STD(location),     NULL },
 	{ "tags",         TRUE, STD(tags),         NULL },
 	{ "preformatted", TRUE, STD(preformatted), NULL },
 	{ "datesel",      TRUE, STD(datesel),      NULL },
diff --git a/src/jamview.h b/src/jamview.h
index 0862054..a4efbf5 100644
--- a/src/jamview.h
+++ b/src/jamview.h
@@ -21,6 +21,7 @@ typedef enum {
 	JAM_VIEW_MOOD,
 	JAM_VIEW_PIC,
 	JAM_VIEW_MUSIC,
+	JAM_VIEW_LOCATION,
 	JAM_VIEW_TAGS,
 	JAM_VIEW_PREFORMATTED,
 	JAM_VIEW_DATESEL,
diff --git a/src/menu.c b/src/menu.c
index 6ca6e23..97bd611 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,6 +56,7 @@ enum {
 	ACTION_VIEW_MOOD,
 	ACTION_VIEW_PICTURE,
 	ACTION_VIEW_MUSIC,
+	ACTION_VIEW_LOCATION,
 	ACTION_VIEW_TAGS,
 	ACTION_VIEW_PREFORMATTED,
 	ACTION_VIEW_DATESEL,
@@ -430,6 +431,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/View/_Picture"),           NULL, menu_view_cb, ACTION_VIEW_PICTURE,      "<CheckItem>" },
 { N_("/View/_Tags"),              NULL, menu_view_cb, ACTION_VIEW_TAGS,         "<CheckItem>" },
 { N_("/View/M_usic"),             NULL, menu_view_cb, ACTION_VIEW_MUSIC,        "<CheckItem>" },
+{ N_("/View/_Location"),          NULL, menu_view_cb, ACTION_VIEW_LOCATION,     "<CheckItem>" },
 { N_("/View/_Preformatted"),      NULL, menu_view_cb, ACTION_VIEW_PREFORMATTED, "<CheckItem>" },
 { N_("/View/_Comments"),          NULL, menu_view_cb, ACTION_VIEW_COMMENTS,     "<CheckItem>" },
 
diff --git a/src/preview.c b/src/preview.c
index b3abc2e..5ee3fbc 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -179,11 +179,13 @@ entry_prepare_preview(LJEntry *entry) {
 		g_string_append(str, "</tr></table><hr/><br/>");
 	}
 
-	if (entry->mood || entry->music || entry->taglist) {
+	if (entry->mood || entry->music || entry->location || entry->taglist) {
 		if (entry->mood)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Mood"), entry->mood);
 		if (entry->music)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Music"), entry->music);
+		if (entry->location)
+			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Location"), entry->location);
 		if (entry->taglist)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Tags"), entry->taglist);
 		g_string_append(str, "<br/>");
-- 
1.6.4


0001-Add-automake-1.11-to-autogen.sh.patch:
 autogen.sh |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Add-automake-1.11-to-autogen.sh.patch ---
>From bbe8da1dd21a193d232e6b63ed37cb30ea2068ca Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 14:52:09 +0300
Subject: [PATCH] Add automake-1.11 to autogen.sh

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 autogen.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4b72b88..b01b5f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,12 +311,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-- 
1.6.4


0001-Add-possibility-to-insert-link-by-nickname.patch:
 link-journal.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Add-possibility-to-insert-link-by-nickname.patch ---
>From 43ff911da0f0d81a264bc52e8db565e0fb52c2af Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 15:56:28 +0300
Subject: [PATCH] Add possibility to insert link by nickname

Originally patch was found here:
	http://people.freebsd.org/~novel/patches/non-freebsd/logjam452_userlink.diff

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/link-journal.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/link-journal.c b/src/link-journal.c
index d70e70d..ec47e2d 100644
--- a/src/link-journal.c
+++ b/src/link-journal.c
@@ -44,11 +44,12 @@ make_usertype_omenu() {
 void
 link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkWidget *dlg;
-	GtkWidget *vbox, *hbox, *entry, *omenu;
+	GtkWidget *vbox, *hbox, *entry, *entry_name, *omenu;
 	GtkSizeGroup *sizegroup;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *username = NULL;
+	char *usernick = NULL;
 	int usertype;
 	gboolean selection = FALSE;
 
@@ -78,6 +79,11 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	hbox = labelled_box_new_sg(_("_Username:"), entry, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	entry_name = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(entry_name), TRUE);
+	hbox = labelled_box_new_sg(_("_Nickname:"), entry_name, sizegroup);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
 	omenu = make_usertype_omenu();
 	hbox = labelled_box_new_sg(_("User _Type:"), omenu, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -89,6 +95,7 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		return;
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -102,6 +109,41 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usernick && *usernick) {
+		gchar *link;
+		gchar *img;
+		JamAccount *acc = jam_doc_get_account(doc);
+
+		xml_escape(&username);
+		xml_escape(&usernick);
+
+		if (usertype == 0)
+			img = g_strdup("userinfo.gif");
+		else
+			img = g_strdup("community.gif");
+
+		link = g_strdup_printf(
+			"<a href='%s/userinfo.bml?user=%s'>"
+				"<img src='%s/img/%s' alt='[info]' align='absmiddle' width='17' height='17' border='0' />"
+			"</a>"
+			"<a style='FONT-WEIGHT: 800' href='%s/users/%s'>%s</a>",
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			img,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			usernick);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(img);
+		free(username);
+		free(usernick);
+		return;
+	}
+
 	gtk_text_buffer_insert(buffer, &start, "<lj ", -1);
 	if (usertype == 0)
 		gtk_text_buffer_insert(buffer, &start, "user=\"", -1);
-- 
1.6.4


0001-Add-support-of-the-User-Agent-header.patch:
 network-curl.c     |    2 ++
 network-internal.h |    5 +++++
 network-libxml.c   |    7 +++++++
 network-soup.c     |    5 ++++-
 network-win32.c    |    3 +--
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-support-of-the-User-Agent-header.patch ---
>From 511a6b7ba39438bc5edaac7c27f1283bf04b75b1 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 20:42:00 +0300
Subject: [PATCH] Add support of the User-Agent header

Starting from 22.08.2009 the Livejournal refuses all programs which has
not well-formed User-Agent string. Details here:
http://www.livejournal.com/bots/

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/network-curl.c     |    2 ++
 src/network-internal.h |    5 +++++
 src/network-libxml.c   |    7 +++++++
 src/network-soup.c     |    5 ++++-
 src/network-win32.c    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/network-curl.c b/src/network-curl.c
index 12bdc81..94db0af 100644
--- a/src/network-curl.c
+++ b/src/network-curl.c
@@ -96,6 +96,8 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 	}
 
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, LOGJAM_USER_AGENT);
+
 	if (headers) {
 		GSList *l;
 		for (l = headers; l; l = l->next)
diff --git a/src/network-internal.h b/src/network-internal.h
index 991edfc..9103bc8 100644
--- a/src/network-internal.h
+++ b/src/network-internal.h
@@ -9,6 +9,11 @@
 
 #include "network.h"
 
+/* constants to apply User-Agent header */
+#define LOGJAM_HOME_URL		"http://logjam.danga.com"
+#define LOGJAM_AUTHOR_EMAIL	"martine at danga.com"
+#define LOGJAM_USER_AGENT	LOGJAM_HOME_URL "; " LOGJAM_AUTHOR_EMAIL
+
 /* network-internal -- interface to http, used by network.
  * provides a blocking and nonblocking interface.
  * implemented by
diff --git a/src/network-libxml.c b/src/network-libxml.c
index 8f2c4d7..4f97737 100644
--- a/src/network-libxml.c
+++ b/src/network-libxml.c
@@ -25,6 +25,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 	gboolean success = FALSE;
 	int len;
 	NetStatusProgress progress;
+	gchar *user_agent;
 
 	if (conf.options.netdump && post) 
 		fprintf(stderr, _("Request: [%s]\n"), post->str);
@@ -44,16 +45,22 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		xmlNanoHTTPScanProxy(NULL);
 	}
 
+	user_agent = g_strdup_printf("User-Agent: %s\r\n", LOGJAM_USER_AGENT);
 	if (headers) {
 		GString *hs = g_string_new(NULL);
 		GSList *l;
+		g_string_append(hs, user_agent);
 		for (l = headers; l; l = l->next) {
 			g_string_append(hs, l->data);
 			g_string_append(hs, "\r\n");
 		}
 		headerstr = hs->str;
 		g_string_free(hs, FALSE);
+		g_free(user_agent);
+	} else {
+		headerstr = user_agent;
 	}
+
 	if (post)
 		ctx = xmlNanoHTTPMethod(url, "POST",
 				post->str, NULL, headerstr, post->len);
diff --git a/src/network-soup.c b/src/network-soup.c
index 9e28d9c..24b8e45 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -57,10 +57,13 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_PROXY_URI, suri,
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
 			NULL);
 		soup_uri_free(suri);
 	} else
-		session = soup_session_sync_new ();
+		session = soup_session_sync_new_with_options (
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
+			NULL);
 
 	req = soup_message_new(post ? "POST" : "GET", url);
 	g_signal_connect(G_OBJECT(req), "got-chunk",
diff --git a/src/network-win32.c b/src/network-win32.c
index a2429aa..d4d1796 100644
--- a/src/network-win32.c
+++ b/src/network-win32.c
@@ -126,7 +126,7 @@ net_post_blocking(const char *surl, GSList *headers, GString *post,
 	host = urlc.lpszHostName;
 	host[urlc.dwHostNameLength] = 0;
 
-	if ((hInternet = InternetOpen("LogJam-Win32",
+	if ((hInternet = InternetOpen(LOGJAM_USER_AGENT,
 			INTERNET_OPEN_TYPE_PRECONFIG,
 			NULL, NULL, 0)) != NULL) {
 
-- 
1.6.4


0001-Adds-titles-to-links-and-images-and-link-to-images.patch:
 html_markup.c |    5 +++++
 imagelink.c   |   32 +++++++++++++++++++++++++++++---
 link.c        |   16 +++++++++++++---
 menu.c        |    6 +++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Adds-titles-to-links-and-images-and-link-to-images.patch ---
>From 14038cb91ef71252d9e46c5c4f4060e79ee49259 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Fri, 1 May 2009 23:27:26 +0300
Subject: [PATCH] Adds titles to links and images and link to images

This adds:
* title to the dialog for image and link
* link to image dialog
* blockquote option for formatting

Originally patch was observed here:
http://bugzilla.redhat.com/show_bug.cgi?id=434754#c1

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/html_markup.c |    5 +++++
 src/imagelink.c   |   32 +++++++++++++++++++++++++++++---
 src/link.c        |   16 +++++++++++++---
 src/menu.c        |    5 +++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/html_markup.c b/src/html_markup.c
index 36ec4e7..9c5a796 100644
--- a/src/html_markup.c
+++ b/src/html_markup.c
@@ -74,3 +74,8 @@ void
 html_mark_monospaced(JamDoc *doc) {
 	html_mark_tag(doc, "tt");
 }
+
+void
+html_mark_blockquote(JamDoc *doc) {
+	html_mark_tag(doc, "blockquote");
+}
diff --git a/src/imagelink.c b/src/imagelink.c
index a9f296d..21ac938 100644
--- a/src/imagelink.c
+++ b/src/imagelink.c
@@ -13,7 +13,7 @@
 
 typedef struct {
 	GtkWidget *dlg;
-	GtkWidget *url, *get, *width, *height;
+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
 } ImageDlg;
 
 static void
@@ -88,6 +88,14 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
 			FALSE, FALSE, 0);
 
+	idlg->tit = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
+		FALSE, FALSE, 0);
+	idlg->anchor = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
+		FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	dimbox = gtk_vbox_new(FALSE, 6);
@@ -132,6 +140,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *sel = NULL, *url = NULL;
+	const gchar *tit, *anch;
 	const char *data;
 	int width = -1, height = -1;
 
@@ -161,9 +170,15 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 
 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
 		xml_escape(&url);
-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
+		anch = gtk_entry_get_text(GTK_ENTRY(idlg->anchor));
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, anch, -1);
+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
+		}
+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
 		gtk_text_buffer_insert(buffer, &start, url, -1);
-		gtk_text_buffer_insert(buffer, &start, "'", -1);
+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
 		g_free(url);
 
 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
@@ -182,7 +197,18 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 			gtk_text_buffer_insert(buffer, &start, data, -1);
 			g_free(data);
 		}
+
+		tit = gtk_entry_get_text(GTK_ENTRY(idlg->tit));
+		if (tit && *tit) {
+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, tit, -1);
+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
+		}
+
 		gtk_text_buffer_insert(buffer, &start, " />", -1);
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "</a>", -1);
+		}
 	}
 
 	g_free(sel);
diff --git a/src/link.c b/src/link.c
index 0be2e98..596eb30 100644
--- a/src/link.c
+++ b/src/link.c
@@ -17,6 +17,7 @@
 typedef struct {
 	GtkWidget *dlg;
 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
+	GtkWidget *titl;
 	JamDoc *doc;
 	gint sel_type, clip_type;
 	gchar *sel_input, *clip_input;
@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
 static void
 make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	GtkWidget *vbox;
-	GtkWidget *subbox;
+	GtkWidget *subbox, *hhr;
 	GSList *rgroup;
 
 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
@@ -114,6 +115,9 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
+	ld->titl = gtk_entry_new();
+	hhr = labelled_box_new(_("Link Title:"), ld->titl);
+	gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), 
 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
 
 static char*
 get_link(LinkDialog *ld, JamAccount *acc) {
-	char *url, *user, *text;
+	char *url, *user, *text, *title;
 	char *link = NULL;
 
 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
@@ -187,10 +191,15 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	xml_escape(&user);
 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
 	xml_escape(&text);
+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
 		/* build a "url" link. */
-		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		if (title && *title) {
+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
+		} else {
+			link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		}
 	} else if (ld->ruser &&
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
 		/* build a "friends" link. */
@@ -204,6 +213,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	g_free(url);
 	g_free(user);
 	g_free(text);
+	g_free(title);
 	
 	return link;
 }
diff --git a/src/menu.c b/src/menu.c
index 7fa74f2..5cdd37e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -321,6 +321,10 @@ static void
 menu_html_mark_monospaced(JamWin *jw) {
 	html_mark_monospaced(jw->doc);
 }
+static void
+menu_html_mark_blockquote(JamWin *jw) {
+	html_mark_blockquote(jw->doc);
+}
 
 void manager_dialog(GtkWidget *parent);
 
@@ -435,6 +439,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
 { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
 { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
+{ N_("/HTML/_Blockquote"),			"<ctl><alt>Q", menu_html_mark_blockquote },
 
 { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
 { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },
-- 
1.6.4


logjam-4.5.3-tags.patch:
 protocol/liblivejournal/livejournal/Makefile.am   |    3 
 protocol/liblivejournal/livejournal/gettags.c     |   65 +++++++
 protocol/liblivejournal/livejournal/gettags.h     |   16 +
 protocol/liblivejournal/livejournal/livejournal.h |    1 
 protocol/liblivejournal/livejournal/tags.h        |   18 ++
 protocol/liblivejournal/livejournal/types.c       |   13 +
 src/Makefile.am                                   |    1 
 src/jamview.c                                     |   24 ++
 src/tags.c                                        |  181 ++++++++++++++++++++++
 src/tags.h                                        |    6 
 10 files changed, 327 insertions(+), 1 deletion(-)

Index: logjam-4.5.3-tags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-10/logjam-4.5.3-tags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- logjam-4.5.3-tags.patch	11 Mar 2008 21:58:59 -0000	1.4
+++ logjam-4.5.3-tags.patch	24 Aug 2009 16:31:03 -0000	1.5
@@ -169,52 +169,6 @@ diff -up /dev/null logjam-4.5.3/protocol
 +	g_free(gettags);
 +}
 +
-diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in
---- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags	2006-01-19 03:18:52.000000000 -0500
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in	2008-03-11 17:57:21.000000000 -0400
-@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
- liblivejournal_la_SOURCES = \
- 	md5.c              md5.h            \
- 	protocol.c         protocol.h       \
--	friends.h                           \
-+	friends.h          tags.h           \
- 	serveruser.c       serveruser.h     \
- 	entry.c            entry.h          \
- 	types.c            types.h          \
-@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \
- 	getchallenge.c     getchallenge.h   \
- 	getevents.c        getevents.h      \
- 	getfriends.c       getfriends.h     \
-+	gettags.c          gettags.h        \
- 	syncitems.c        syncitems.h      \
- 	sync.c             sync.h           \
- 	livejournal.h
-@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES =
- am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \
- 	types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \
- 	editfriends.lo editfriendgroups.lo editpostevent.lo \
--	getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo
-+	getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo
- liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/editfriends.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/getchallenge.Plo \
-- at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \
-@@ -247,6 +248,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@
 diff -up /dev/null logjam-4.5.3/src/tags.c
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
 +++ logjam-4.5.3/src/tags.c	2008-03-11 17:53:46.000000000 -0400
@@ -421,26 +375,6 @@ diff -up logjam-4.5.3/src/Makefile.am.ta
            $(HTML_MARKUP)
  
  src_preview = $(PREVIEW)
-diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in
---- logjam-4.5.3/src/Makefile.in.tags	2006-01-19 03:18:44.000000000 -0500
-+++ logjam-4.5.3/src/Makefile.in	2008-03-11 17:53:46.000000000 -0400
-@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
-           undo.c undo.h \
-           userlabel.c userlabel.h \
-           get_cmd_out.c get_cmd_out.h \
-+          tags.c tags.h \
-           $(HTML_MARKUP)
- 
- 
-@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini
- 	login.c login.h manager.c spawn.c spawn.h icons.c icons.h \
- 	music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \
- 	pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \
--	userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \
-+	userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \
- 	html_markup.h network-win32.c network-fork.c network-soup.c \
- 	network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \
- 	docklet.c preview.c preview.h journalstore-sqlite.c \
 diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c
 --- logjam-4.5.3/src/jamview.c.tags	2008-03-11 17:53:46.000000000 -0400
 +++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- logjam.spec	27 Apr 2009 21:38:34 -0000	1.53
+++ logjam.spec	24 Aug 2009 16:31:03 -0000	1.54
@@ -2,13 +2,18 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	33%{?dist}
+Release:	36%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+# Now, we get source from git
+# git clone git://github.com/martine/LogJam.git logjam-git
+# find logjam-git -depth -name .git -type d -exec rm -rf {} \;
+# tar cvfj logjam-git-20090824.tar.bz2 logjam-git/
+Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -17,34 +22,30 @@ BuildRequires:	curl-devel, gtk2-devel, g
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
-BuildRequires:	dbus-devel
+BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch2:		logjam-4.4.1-backdated.patch
-Patch3:		logjam-4.4.1-cleanups.patch
-Patch4:		logjam-4.4.1-fedora-desktop.patch
-Patch5:		logjam-4.5-patch8-manfix.patch
-Patch6:		logjam-4.5.3-gtkhtml314.patch
-Patch7:		logjam-4.4.1-ru.po.asp.patch
-Patch8:		logjam-4.5.3-gtkspell.patch
-Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
-Patch10:	logjam-4.5.3-rhythmbox-fix.patch
-Patch11:	logjam-libsoup24.diff
-Patch12:	logjam-4.5.3-disable-threads.patch
-Patch13:	logjam-title.patch
-Patch14:	logjam-4.5.3-tags.patch
-Patch15:	logjam-4.5.3-default-spelllang-en-US.patch
-Patch16:	logjam-4.5.3-start_in_dock.patch
-Patch17:	logjam-4.5.3-uk.po.patch
-Patch18:	logjam-4.5.3-no_quit_when_docked.patch
-Patch19:	logjam-4.5.3-close_when_send.patch
-Patch20:	logjam-4.5.3-imageresize.patch
-Patch21:	logjam-4.5.3-showloginhistory.patch
-Patch22:	logjam-4.5.3-libtool.patch
-Patch23:	logjam-4.5.3-keep-drafts.patch
-Patch24:	logjam-4.5.3-lj-embed.patch
-Patch25:	logjam-4.5.3-mpris.diff
-Patch26:	logjam-4.5.3-save-tags.diff
+Patch1:		logjam-4.4.1-fedora-desktop.patch
+Patch2:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
+Patch3:		logjam-4.5.3-disable-threads.patch
+Patch4:		0001-Adds-titles-to-links-and-images-and-link-to-images.patch
+Patch5:		logjam-4.5.3-tags.patch
+Patch6:		logjam-4.5.3-start_in_dock.patch
+Patch7:		logjam-4.5.3-no_quit_when_docked.patch
+Patch8:		logjam-4.5.3-close_when_send.patch
+Patch9:		logjam-4.5.3-showloginhistory.patch
+Patch10:	logjam-4.5.3-libtool.patch
+Patch11:	logjam-4.5.3-keep-drafts.patch
+Patch12:	logjam-4.5.3-mpris.diff
+Patch13:	logjam-4.5.3-save-tags.diff
+# From: http://github.com/andy-shev/LogJam/commit/1426ae5af7f0c1ba4084f0ce0e0b63c43c763dc7
+Patch14:	0001-Add-support-of-the-User-Agent-header.patch
+# From: http://github.com/andy-shev/LogJam/commit/7ab07309963ac85c42ab7f235ac39189091a2718
+Patch15:	0001-Add-Location-support-to-the-logjam.patch
+# From: http://github.com/andy-shev/LogJam/commit/43ff911da0f0d81a264bc52e8db565e0fb52c2af
+Patch16:	0001-Add-possibility-to-insert-link-by-nickname.patch
+# From: http://github.com/andy-shev/LogJam/commit/bbe8da1dd21a193d232e6b63ed37cb30ea2068ca
+Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -62,34 +63,27 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q
-%patch2 -p1 -b .backdated
-%patch3 -p1 -b .cleanups
-%patch4 -p1 -b .desktop
-%patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml314
-%patch7 -p1 -b .ru.po
-%patch8 -p1 -b .bz186906
-%patch9 -p1 -b .docklet-context-menu
-%patch10 -p1 -b .rhythmboxfix
-%patch11 -p1 -b .libsoup
-%patch12 -p1 -b .disable-threads
-%patch13 -p1 -b .title
-%patch14 -p1 -b .tags
-%patch15 -p1 -b .default-spelllang-en-US
-%patch16 -p1 -b .start-in-dock
-%patch17 -p1 -b .uk.po
-%patch18 -p1 -b .no_quit_when_docked
-%patch19 -p1 -b .close_when_send
-%patch20 -p1 -b .imageresize
-%patch21 -p1 -b .showloginhistory
+%setup -q -n logjam-git
+%patch1 -p1 -b .desktop
+# %%patch5 -p1 -b .manfix
+%patch2 -p1 -b .docklet-context-menu
+%patch3 -p1 -b .disable-threads
+%patch4 -p1 -b .title
+%patch5 -p1 -b .tags
+%patch6 -p1 -b .start-in-dock
+%patch7 -p1 -b .no_quit_when_docked
+%patch8 -p1 -b .close_when_send
+%patch9 -p1 -b .showloginhistory
 %if 0%{fedora} >= 11
-%patch22 -p1 -b .libtool
+%patch10 -p1 -b .libtool
 %endif
-%patch23 -p1 -b .keep_drafts
-%patch24 -p1 -b .lj-embed
-%patch25 -p1 -b .mpris
-%patch26 -p1 -b .save-tags
+%patch11 -p1 -b .keep_drafts
+%patch12 -p1 -b .mpris
+%patch13 -p1 -b .save-tags
+%patch14 -p1 -b .user-agent
+%patch15 -p1 -b .location
+%patch16 -p1 -b .link-by-nickname
+%patch17 -p1 -b .automake111
 
 %if 0%{fedora} >= 10
 libtoolize
@@ -100,9 +94,8 @@ intltoolize --force
 
 %build
 touch NEWS README AUTHORS
-aclocal
-autoconf
-automake --add-missing
+# Passing NOCONFIGURE=true keeps configure from running.
+NOCONFIGURE=true ./autogen.sh
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -143,6 +136,19 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
+- use properly formed user-agent string (Andy Shevchenko) (bz 518757)
+- rebase to git master (bz 518758)
+- Add Location support (Andy Shevchenko, from Ubuntu)
+- Add link-by-nickname support (Andy Shevchenko, from FreeBSD)
+- clean out merged patches
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:4.5.3-35
+- Convert specfile to UTF-8.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
 - conditionalize libtool fun for F10+
 
@@ -400,5 +406,5 @@ rm -rf $RPM_BUILD_ROOT
  - Added fix for James Manning, Web Links browser launch
 * Tue Feb 13 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Upgraded to add GNOME build option.
-* Sun Oct 08 2000 Alexander Gr?fe <nachtfalke at retrogra.de>
+* Sun Oct 08 2000 Alexander Gr??fe <nachtfalke at retrogra.de>
  - inital version of the RPM.



From spot at fedoraproject.org  Mon Aug 24 16:31:04 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:31:04 +0000 (UTC)
Subject: rpms/logjam/F-11 0001-Add-Location-support-to-the-logjam.patch, NONE,
	1.1 0001-Add-automake-1.11-to-autogen.sh.patch, NONE,
	1.1 0001-Add-possibility-to-insert-link-by-nickname.patch, NONE,
	1.1 0001-Add-support-of-the-User-Agent-header.patch, NONE,
	1.1 0001-Adds-titles-to-links-and-images-and-link-to-images.patch,
	NONE, 1.1 logjam-4.5.3-tags.patch, 1.4, 1.5 logjam.spec, 1.55, 1.56
Message-ID: <20090824163104.13C9011C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818/F-11

Modified Files:
	logjam-4.5.3-tags.patch logjam.spec 
Added Files:
	0001-Add-Location-support-to-the-logjam.patch 
	0001-Add-automake-1.11-to-autogen.sh.patch 
	0001-Add-possibility-to-insert-link-by-nickname.patch 
	0001-Add-support-of-the-User-Agent-header.patch 
	0001-Adds-titles-to-links-and-images-and-link-to-images.patch 
Log Message:
get logjam working again

0001-Add-Location-support-to-the-logjam.patch:
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 -
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 ++++++++++++++++++++++++++++
 src/jamview.h                               |    1 
 src/menu.c                                  |    2 +
 src/preview.c                               |    5 ++-
 8 files changed, 70 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-Location-support-to-the-logjam.patch ---
>From 7ab07309963ac85c42ab7f235ac39189091a2718 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 13:53:04 +0300
Subject: [PATCH] Add 'Location' support to the logjam

Originally patch was taken from:
	https://bugs.launchpad.net/ubuntu/+source/logjam/+bug/223939

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 +-
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 +++++++++++++++++++++++++++
 src/jamview.h                               |    1 +
 src/menu.c                                  |    2 +
 src/preview.c                               |    4 ++-
 8 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/protocol/liblivejournal/livejournal/entry.c b/protocol/liblivejournal/livejournal/entry.c
index 838fd42..5bdf12e 100644
--- a/protocol/liblivejournal/livejournal/entry.c
+++ b/protocol/liblivejournal/livejournal/entry.c
@@ -49,6 +49,8 @@ lj_entry_copy(LJEntry *e) {
 		newe->mood = g_strdup(e->mood);
 	if (e->music)
 		newe->music = g_strdup(e->music);
+	if (e->location)
+		newe->location = g_strdup(e->location);
 	if (e->taglist)
 		newe->taglist = g_strdup(e->taglist);
 	if (e->pickeyword)
@@ -61,6 +63,7 @@ lj_entry_free(LJEntry *e) {
 	g_free(e->event);
 	g_free(e->mood);
 	g_free(e->music);
+	g_free(e->location);
 	g_free(e->taglist);
 	g_free(e->pickeyword);
 	g_free(e);
@@ -136,6 +139,8 @@ lj_entry_set_request_fields(LJEntry *entry, LJRequest *request) {
 		lj_request_add_int(request, "prop_current_moodid", entry->moodid);
 	else
 		lj_request_add(request, "prop_current_moodid", "");
+	lj_request_add(request,
+			"prop_current_location", entry->location ? entry->location : "");
 	lj_request_add(request, 
 			"prop_current_music", entry->music ? entry->music : "");
 	lj_request_add(request, 
@@ -191,6 +196,12 @@ lj_entry_load_metadata(LJEntry *entry,
 			g_set_error(err, 0, 0, "Bad UTF-8 in current_music");
 			return FALSE;
 		}
+	} else if (strcmp(key, "current_location") == 0) {
+		entry->location = g_strdup(value);
+		if (!verify_utf8(&entry->location)) {
+			g_set_error(err, 0, 0, "Bad UTF-8 in current_location");
+			return FALSE;
+		}
 	} else if (strcmp(key, "taglist") == 0) {
 		entry->taglist = g_strdup(value);
 		if (!verify_utf8(&entry->taglist)) {
@@ -255,6 +266,7 @@ lj_entry_to_xml_node(LJEntry *entry, void* doc) {
 		}
 	}
 	XML_ENTRY_META_SET(music);
+	XML_ENTRY_META_SET(location);
 	XML_ENTRY_META_SET(taglist);
 	XML_ENTRY_META_SET(pickeyword);
 	if (entry->preformatted)
@@ -479,6 +491,7 @@ lj_entry_load_from_xml_node(LJEntry *entry, xmlDocPtr doc, xmlNodePtr node) {
 			}
 		}
 		else XML_ENTRY_META_GET(music)
+		else XML_ENTRY_META_GET(location)
 		else XML_ENTRY_META_GET(taglist)
 		else XML_ENTRY_META_GET(pickeyword)
 		else if (xmlStrcmp(cur->name, BAD_CAST "preformatted") == 0) {
@@ -605,6 +618,7 @@ rfc822_load_entry(const char *key, const char *val, LJEntry *entry) {
 	RFC822_GET(subject)
 	else RFC822_GET(mood) /* XXX id */
 	else RFC822_GET(music)
+	else RFC822_GET(location)
 	else RFC822_GET(taglist)
 	else RFC822_GET(pickeyword)
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
@@ -748,6 +762,7 @@ lj_entry_to_rfc822(LJEntry *entry, gboolean includeempty) {
 	append_field(str, "Subject", entry->subject, includeempty);
 	append_field(str, "Mood", entry->mood, includeempty);
 	append_field(str, "Music", entry->music, includeempty);
+	append_field(str, "Location", entry->location, includeempty);
 	append_field(str, "TagList", entry->taglist, includeempty);
 	append_field(str, "PicKeyword", entry->pickeyword, includeempty);
 	g_string_append(str, "\n");
diff --git a/protocol/liblivejournal/livejournal/entry.h b/protocol/liblivejournal/livejournal/entry.h
index 4a138e5..2d35f89 100644
--- a/protocol/liblivejournal/livejournal/entry.h
+++ b/protocol/liblivejournal/livejournal/entry.h
@@ -52,7 +52,7 @@ typedef struct _LJEntry {
 	char *event;
 
 	int moodid;  /* a moodid is only meaningful in the context of a particular LJServer. */
-	char *mood, *music, *taglist, *pickeyword;
+	char *mood, *music, *location, *taglist, *pickeyword;
 	gboolean preformatted;
 	gboolean backdated;
 	LJCommentsType comments;
diff --git a/src/jamdoc.c b/src/jamdoc.c
index b3cdf99..ced84a0 100644
--- a/src/jamdoc.c
+++ b/src/jamdoc.c
@@ -240,6 +240,14 @@ jam_doc_set_music(JamDoc *doc, const char *music) {
 	string_replace(&doc->entry->music, music ? g_strdup(music) : NULL);
 }
 const char *
+jam_doc_get_location(JamDoc *doc) {
+	return doc->entry->location;
+}
+void
+jam_doc_set_location(JamDoc *doc, const char *location) {
+	string_replace(&doc->entry->location, location ? g_strdup(location) : NULL);
+}
+const char *
 jam_doc_get_taglist(JamDoc *doc) {
 	return doc->entry->taglist;
 }
diff --git a/src/jamdoc.h b/src/jamdoc.h
index 21fae13..99fa8b4 100644
--- a/src/jamdoc.h
+++ b/src/jamdoc.h
@@ -63,6 +63,9 @@ void           jam_doc_set_moodid(JamDoc *doc, int moodid);
 const char *   jam_doc_get_music(JamDoc *doc);
 void           jam_doc_set_music(JamDoc *doc, const char *music);
 
+const char *   jam_doc_get_location(JamDoc *doc);
+void           jam_doc_set_location(JamDoc *doc, const char *location);
+
 const char *   jam_doc_get_taglist(JamDoc *doc);
 void           jam_doc_set_taglist(JamDoc *doc, const char *taglist);
 
diff --git a/src/jamview.c b/src/jamview.c
index ecd1fc2..cb00b3a 100644
--- a/src/jamview.c
+++ b/src/jamview.c
@@ -43,6 +43,9 @@ struct _JamView {
 	GtkWidget *musicbar;
 	GtkWidget *musicbutton, *music;
 
+	GtkWidget *locationbar;
+	GtkWidget *location;
+
 	GtkWidget *tagsbar;
 	GtkWidget *tags;
 
@@ -428,6 +431,39 @@ tags_select_cb(JamView *view) {
 }
 
 static void
+location_add(JamView *view) {
+	view->location = gtk_entry_new();
+	view->locationbar = labelled_box_new_sg(_("_Location:"), view->location, view->sizegroup);
+	gtk_box_pack_start(GTK_BOX(view), view->locationbar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(view), view->locationbar, view->moodpicbar ? 2 : 1);
+	gtk_widget_show_all(view->locationbar);
+}
+static void
+location_remove(JamView *view) {
+	jam_doc_set_location(view->doc, NULL);
+	gtk_widget_destroy(view->locationbar);
+	view->locationbar = view->location = NULL;
+}
+static gboolean
+location_visible(JamView *view) {
+	return view->locationbar != NULL;
+}
+static void
+location_load(JamView *view) {
+	const char *location = jam_doc_get_location(view->doc);
+	if (location)
+		show_meta(view, JAM_VIEW_LOCATION);
+	if (location_visible(view))
+		gtk_entry_set_text(GTK_ENTRY(view->location), location ? location : "");
+}
+static void
+location_store(JamView *view) {
+	const char *location = gtk_entry_get_text(GTK_ENTRY(view->location));
+	if (location[0] == 0) location = NULL;
+	jam_doc_set_location(view->doc, location);
+}
+
+static void
 tags_add(JamView *view) {
 	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
@@ -590,6 +626,7 @@ static struct {
 	{ "mood",         TRUE, STD(mood),         mood_account_changed     },
 	{ "picture",      TRUE, STD(picture),      picture_account_changed  },
 	{ "music",        TRUE, STD(music),        NULL },
+	{ "location",     TRUE, STD(location),     NULL },
 	{ "tags",         TRUE, STD(tags),         NULL },
 	{ "preformatted", TRUE, STD(preformatted), NULL },
 	{ "datesel",      TRUE, STD(datesel),      NULL },
diff --git a/src/jamview.h b/src/jamview.h
index 0862054..a4efbf5 100644
--- a/src/jamview.h
+++ b/src/jamview.h
@@ -21,6 +21,7 @@ typedef enum {
 	JAM_VIEW_MOOD,
 	JAM_VIEW_PIC,
 	JAM_VIEW_MUSIC,
+	JAM_VIEW_LOCATION,
 	JAM_VIEW_TAGS,
 	JAM_VIEW_PREFORMATTED,
 	JAM_VIEW_DATESEL,
diff --git a/src/menu.c b/src/menu.c
index 6ca6e23..97bd611 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,6 +56,7 @@ enum {
 	ACTION_VIEW_MOOD,
 	ACTION_VIEW_PICTURE,
 	ACTION_VIEW_MUSIC,
+	ACTION_VIEW_LOCATION,
 	ACTION_VIEW_TAGS,
 	ACTION_VIEW_PREFORMATTED,
 	ACTION_VIEW_DATESEL,
@@ -430,6 +431,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/View/_Picture"),           NULL, menu_view_cb, ACTION_VIEW_PICTURE,      "<CheckItem>" },
 { N_("/View/_Tags"),              NULL, menu_view_cb, ACTION_VIEW_TAGS,         "<CheckItem>" },
 { N_("/View/M_usic"),             NULL, menu_view_cb, ACTION_VIEW_MUSIC,        "<CheckItem>" },
+{ N_("/View/_Location"),          NULL, menu_view_cb, ACTION_VIEW_LOCATION,     "<CheckItem>" },
 { N_("/View/_Preformatted"),      NULL, menu_view_cb, ACTION_VIEW_PREFORMATTED, "<CheckItem>" },
 { N_("/View/_Comments"),          NULL, menu_view_cb, ACTION_VIEW_COMMENTS,     "<CheckItem>" },
 
diff --git a/src/preview.c b/src/preview.c
index b3abc2e..5ee3fbc 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -179,11 +179,13 @@ entry_prepare_preview(LJEntry *entry) {
 		g_string_append(str, "</tr></table><hr/><br/>");
 	}
 
-	if (entry->mood || entry->music || entry->taglist) {
+	if (entry->mood || entry->music || entry->location || entry->taglist) {
 		if (entry->mood)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Mood"), entry->mood);
 		if (entry->music)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Music"), entry->music);
+		if (entry->location)
+			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Location"), entry->location);
 		if (entry->taglist)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Tags"), entry->taglist);
 		g_string_append(str, "<br/>");
-- 
1.6.4


0001-Add-automake-1.11-to-autogen.sh.patch:
 autogen.sh |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Add-automake-1.11-to-autogen.sh.patch ---
>From bbe8da1dd21a193d232e6b63ed37cb30ea2068ca Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 14:52:09 +0300
Subject: [PATCH] Add automake-1.11 to autogen.sh

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 autogen.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4b72b88..b01b5f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,12 +311,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-- 
1.6.4


0001-Add-possibility-to-insert-link-by-nickname.patch:
 link-journal.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Add-possibility-to-insert-link-by-nickname.patch ---
>From 43ff911da0f0d81a264bc52e8db565e0fb52c2af Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 15:56:28 +0300
Subject: [PATCH] Add possibility to insert link by nickname

Originally patch was found here:
	http://people.freebsd.org/~novel/patches/non-freebsd/logjam452_userlink.diff

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/link-journal.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/link-journal.c b/src/link-journal.c
index d70e70d..ec47e2d 100644
--- a/src/link-journal.c
+++ b/src/link-journal.c
@@ -44,11 +44,12 @@ make_usertype_omenu() {
 void
 link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkWidget *dlg;
-	GtkWidget *vbox, *hbox, *entry, *omenu;
+	GtkWidget *vbox, *hbox, *entry, *entry_name, *omenu;
 	GtkSizeGroup *sizegroup;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *username = NULL;
+	char *usernick = NULL;
 	int usertype;
 	gboolean selection = FALSE;
 
@@ -78,6 +79,11 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	hbox = labelled_box_new_sg(_("_Username:"), entry, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	entry_name = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(entry_name), TRUE);
+	hbox = labelled_box_new_sg(_("_Nickname:"), entry_name, sizegroup);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
 	omenu = make_usertype_omenu();
 	hbox = labelled_box_new_sg(_("User _Type:"), omenu, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -89,6 +95,7 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		return;
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -102,6 +109,41 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usernick && *usernick) {
+		gchar *link;
+		gchar *img;
+		JamAccount *acc = jam_doc_get_account(doc);
+
+		xml_escape(&username);
+		xml_escape(&usernick);
+
+		if (usertype == 0)
+			img = g_strdup("userinfo.gif");
+		else
+			img = g_strdup("community.gif");
+
+		link = g_strdup_printf(
+			"<a href='%s/userinfo.bml?user=%s'>"
+				"<img src='%s/img/%s' alt='[info]' align='absmiddle' width='17' height='17' border='0' />"
+			"</a>"
+			"<a style='FONT-WEIGHT: 800' href='%s/users/%s'>%s</a>",
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			img,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			usernick);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(img);
+		free(username);
+		free(usernick);
+		return;
+	}
+
 	gtk_text_buffer_insert(buffer, &start, "<lj ", -1);
 	if (usertype == 0)
 		gtk_text_buffer_insert(buffer, &start, "user=\"", -1);
-- 
1.6.4


0001-Add-support-of-the-User-Agent-header.patch:
 network-curl.c     |    2 ++
 network-internal.h |    5 +++++
 network-libxml.c   |    7 +++++++
 network-soup.c     |    5 ++++-
 network-win32.c    |    3 +--
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-support-of-the-User-Agent-header.patch ---
>From 511a6b7ba39438bc5edaac7c27f1283bf04b75b1 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 20:42:00 +0300
Subject: [PATCH] Add support of the User-Agent header

Starting from 22.08.2009 the Livejournal refuses all programs which has
not well-formed User-Agent string. Details here:
http://www.livejournal.com/bots/

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/network-curl.c     |    2 ++
 src/network-internal.h |    5 +++++
 src/network-libxml.c   |    7 +++++++
 src/network-soup.c     |    5 ++++-
 src/network-win32.c    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/network-curl.c b/src/network-curl.c
index 12bdc81..94db0af 100644
--- a/src/network-curl.c
+++ b/src/network-curl.c
@@ -96,6 +96,8 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 	}
 
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, LOGJAM_USER_AGENT);
+
 	if (headers) {
 		GSList *l;
 		for (l = headers; l; l = l->next)
diff --git a/src/network-internal.h b/src/network-internal.h
index 991edfc..9103bc8 100644
--- a/src/network-internal.h
+++ b/src/network-internal.h
@@ -9,6 +9,11 @@
 
 #include "network.h"
 
+/* constants to apply User-Agent header */
+#define LOGJAM_HOME_URL		"http://logjam.danga.com"
+#define LOGJAM_AUTHOR_EMAIL	"martine at danga.com"
+#define LOGJAM_USER_AGENT	LOGJAM_HOME_URL "; " LOGJAM_AUTHOR_EMAIL
+
 /* network-internal -- interface to http, used by network.
  * provides a blocking and nonblocking interface.
  * implemented by
diff --git a/src/network-libxml.c b/src/network-libxml.c
index 8f2c4d7..4f97737 100644
--- a/src/network-libxml.c
+++ b/src/network-libxml.c
@@ -25,6 +25,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 	gboolean success = FALSE;
 	int len;
 	NetStatusProgress progress;
+	gchar *user_agent;
 
 	if (conf.options.netdump && post) 
 		fprintf(stderr, _("Request: [%s]\n"), post->str);
@@ -44,16 +45,22 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		xmlNanoHTTPScanProxy(NULL);
 	}
 
+	user_agent = g_strdup_printf("User-Agent: %s\r\n", LOGJAM_USER_AGENT);
 	if (headers) {
 		GString *hs = g_string_new(NULL);
 		GSList *l;
+		g_string_append(hs, user_agent);
 		for (l = headers; l; l = l->next) {
 			g_string_append(hs, l->data);
 			g_string_append(hs, "\r\n");
 		}
 		headerstr = hs->str;
 		g_string_free(hs, FALSE);
+		g_free(user_agent);
+	} else {
+		headerstr = user_agent;
 	}
+
 	if (post)
 		ctx = xmlNanoHTTPMethod(url, "POST",
 				post->str, NULL, headerstr, post->len);
diff --git a/src/network-soup.c b/src/network-soup.c
index 9e28d9c..24b8e45 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -57,10 +57,13 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_PROXY_URI, suri,
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
 			NULL);
 		soup_uri_free(suri);
 	} else
-		session = soup_session_sync_new ();
+		session = soup_session_sync_new_with_options (
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
+			NULL);
 
 	req = soup_message_new(post ? "POST" : "GET", url);
 	g_signal_connect(G_OBJECT(req), "got-chunk",
diff --git a/src/network-win32.c b/src/network-win32.c
index a2429aa..d4d1796 100644
--- a/src/network-win32.c
+++ b/src/network-win32.c
@@ -126,7 +126,7 @@ net_post_blocking(const char *surl, GSList *headers, GString *post,
 	host = urlc.lpszHostName;
 	host[urlc.dwHostNameLength] = 0;
 
-	if ((hInternet = InternetOpen("LogJam-Win32",
+	if ((hInternet = InternetOpen(LOGJAM_USER_AGENT,
 			INTERNET_OPEN_TYPE_PRECONFIG,
 			NULL, NULL, 0)) != NULL) {
 
-- 
1.6.4


0001-Adds-titles-to-links-and-images-and-link-to-images.patch:
 html_markup.c |    5 +++++
 imagelink.c   |   32 +++++++++++++++++++++++++++++---
 link.c        |   16 +++++++++++++---
 menu.c        |    6 +++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Adds-titles-to-links-and-images-and-link-to-images.patch ---
>From 14038cb91ef71252d9e46c5c4f4060e79ee49259 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Fri, 1 May 2009 23:27:26 +0300
Subject: [PATCH] Adds titles to links and images and link to images

This adds:
* title to the dialog for image and link
* link to image dialog
* blockquote option for formatting

Originally patch was observed here:
http://bugzilla.redhat.com/show_bug.cgi?id=434754#c1

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/html_markup.c |    5 +++++
 src/imagelink.c   |   32 +++++++++++++++++++++++++++++---
 src/link.c        |   16 +++++++++++++---
 src/menu.c        |    5 +++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/html_markup.c b/src/html_markup.c
index 36ec4e7..9c5a796 100644
--- a/src/html_markup.c
+++ b/src/html_markup.c
@@ -74,3 +74,8 @@ void
 html_mark_monospaced(JamDoc *doc) {
 	html_mark_tag(doc, "tt");
 }
+
+void
+html_mark_blockquote(JamDoc *doc) {
+	html_mark_tag(doc, "blockquote");
+}
diff --git a/src/imagelink.c b/src/imagelink.c
index a9f296d..21ac938 100644
--- a/src/imagelink.c
+++ b/src/imagelink.c
@@ -13,7 +13,7 @@
 
 typedef struct {
 	GtkWidget *dlg;
-	GtkWidget *url, *get, *width, *height;
+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
 } ImageDlg;
 
 static void
@@ -88,6 +88,14 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
 			FALSE, FALSE, 0);
 
+	idlg->tit = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
+		FALSE, FALSE, 0);
+	idlg->anchor = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
+		FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	dimbox = gtk_vbox_new(FALSE, 6);
@@ -132,6 +140,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *sel = NULL, *url = NULL;
+	const gchar *tit, *anch;
 	const char *data;
 	int width = -1, height = -1;
 
@@ -161,9 +170,15 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 
 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
 		xml_escape(&url);
-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
+		anch = gtk_entry_get_text(GTK_ENTRY(idlg->anchor));
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, anch, -1);
+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
+		}
+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
 		gtk_text_buffer_insert(buffer, &start, url, -1);
-		gtk_text_buffer_insert(buffer, &start, "'", -1);
+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
 		g_free(url);
 
 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
@@ -182,7 +197,18 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 			gtk_text_buffer_insert(buffer, &start, data, -1);
 			g_free(data);
 		}
+
+		tit = gtk_entry_get_text(GTK_ENTRY(idlg->tit));
+		if (tit && *tit) {
+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, tit, -1);
+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
+		}
+
 		gtk_text_buffer_insert(buffer, &start, " />", -1);
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "</a>", -1);
+		}
 	}
 
 	g_free(sel);
diff --git a/src/link.c b/src/link.c
index 0be2e98..596eb30 100644
--- a/src/link.c
+++ b/src/link.c
@@ -17,6 +17,7 @@
 typedef struct {
 	GtkWidget *dlg;
 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
+	GtkWidget *titl;
 	JamDoc *doc;
 	gint sel_type, clip_type;
 	gchar *sel_input, *clip_input;
@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
 static void
 make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	GtkWidget *vbox;
-	GtkWidget *subbox;
+	GtkWidget *subbox, *hhr;
 	GSList *rgroup;
 
 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
@@ -114,6 +115,9 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
+	ld->titl = gtk_entry_new();
+	hhr = labelled_box_new(_("Link Title:"), ld->titl);
+	gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), 
 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
 
 static char*
 get_link(LinkDialog *ld, JamAccount *acc) {
-	char *url, *user, *text;
+	char *url, *user, *text, *title;
 	char *link = NULL;
 
 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
@@ -187,10 +191,15 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	xml_escape(&user);
 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
 	xml_escape(&text);
+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
 		/* build a "url" link. */
-		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		if (title && *title) {
+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
+		} else {
+			link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		}
 	} else if (ld->ruser &&
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
 		/* build a "friends" link. */
@@ -204,6 +213,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	g_free(url);
 	g_free(user);
 	g_free(text);
+	g_free(title);
 	
 	return link;
 }
diff --git a/src/menu.c b/src/menu.c
index 7fa74f2..5cdd37e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -321,6 +321,10 @@ static void
 menu_html_mark_monospaced(JamWin *jw) {
 	html_mark_monospaced(jw->doc);
 }
+static void
+menu_html_mark_blockquote(JamWin *jw) {
+	html_mark_blockquote(jw->doc);
+}
 
 void manager_dialog(GtkWidget *parent);
 
@@ -435,6 +439,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
 { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
 { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
+{ N_("/HTML/_Blockquote"),			"<ctl><alt>Q", menu_html_mark_blockquote },
 
 { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
 { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },
-- 
1.6.4


logjam-4.5.3-tags.patch:
 protocol/liblivejournal/livejournal/Makefile.am   |    3 
 protocol/liblivejournal/livejournal/gettags.c     |   65 +++++++
 protocol/liblivejournal/livejournal/gettags.h     |   16 +
 protocol/liblivejournal/livejournal/livejournal.h |    1 
 protocol/liblivejournal/livejournal/tags.h        |   18 ++
 protocol/liblivejournal/livejournal/types.c       |   13 +
 src/Makefile.am                                   |    1 
 src/jamview.c                                     |   24 ++
 src/tags.c                                        |  181 ++++++++++++++++++++++
 src/tags.h                                        |    6 
 10 files changed, 327 insertions(+), 1 deletion(-)

Index: logjam-4.5.3-tags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-11/logjam-4.5.3-tags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- logjam-4.5.3-tags.patch	11 Mar 2008 21:58:59 -0000	1.4
+++ logjam-4.5.3-tags.patch	24 Aug 2009 16:31:03 -0000	1.5
@@ -169,52 +169,6 @@ diff -up /dev/null logjam-4.5.3/protocol
 +	g_free(gettags);
 +}
 +
-diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in
---- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags	2006-01-19 03:18:52.000000000 -0500
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in	2008-03-11 17:57:21.000000000 -0400
-@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
- liblivejournal_la_SOURCES = \
- 	md5.c              md5.h            \
- 	protocol.c         protocol.h       \
--	friends.h                           \
-+	friends.h          tags.h           \
- 	serveruser.c       serveruser.h     \
- 	entry.c            entry.h          \
- 	types.c            types.h          \
-@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \
- 	getchallenge.c     getchallenge.h   \
- 	getevents.c        getevents.h      \
- 	getfriends.c       getfriends.h     \
-+	gettags.c          gettags.h        \
- 	syncitems.c        syncitems.h      \
- 	sync.c             sync.h           \
- 	livejournal.h
-@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES =
- am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \
- 	types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \
- 	editfriends.lo editfriendgroups.lo editpostevent.lo \
--	getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo
-+	getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo
- liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/editfriends.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/getchallenge.Plo \
-- at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \
-@@ -247,6 +248,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@
 diff -up /dev/null logjam-4.5.3/src/tags.c
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
 +++ logjam-4.5.3/src/tags.c	2008-03-11 17:53:46.000000000 -0400
@@ -421,26 +375,6 @@ diff -up logjam-4.5.3/src/Makefile.am.ta
            $(HTML_MARKUP)
  
  src_preview = $(PREVIEW)
-diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in
---- logjam-4.5.3/src/Makefile.in.tags	2006-01-19 03:18:44.000000000 -0500
-+++ logjam-4.5.3/src/Makefile.in	2008-03-11 17:53:46.000000000 -0400
-@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
-           undo.c undo.h \
-           userlabel.c userlabel.h \
-           get_cmd_out.c get_cmd_out.h \
-+          tags.c tags.h \
-           $(HTML_MARKUP)
- 
- 
-@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini
- 	login.c login.h manager.c spawn.c spawn.h icons.c icons.h \
- 	music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \
- 	pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \
--	userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \
-+	userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \
- 	html_markup.h network-win32.c network-fork.c network-soup.c \
- 	network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \
- 	docklet.c preview.c preview.h journalstore-sqlite.c \
 diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c
 --- logjam-4.5.3/src/jamview.c.tags	2008-03-11 17:53:46.000000000 -0400
 +++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-11/logjam.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- logjam.spec	27 Apr 2009 21:38:35 -0000	1.55
+++ logjam.spec	24 Aug 2009 16:31:03 -0000	1.56
@@ -2,13 +2,18 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	33%{?dist}
+Release:	36%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+# Now, we get source from git
+# git clone git://github.com/martine/LogJam.git logjam-git
+# find logjam-git -depth -name .git -type d -exec rm -rf {} \;
+# tar cvfj logjam-git-20090824.tar.bz2 logjam-git/
+Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -17,34 +22,30 @@ BuildRequires:	curl-devel, gtk2-devel, g
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
-BuildRequires:	dbus-devel
+BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch2:		logjam-4.4.1-backdated.patch
-Patch3:		logjam-4.4.1-cleanups.patch
-Patch4:		logjam-4.4.1-fedora-desktop.patch
-Patch5:		logjam-4.5-patch8-manfix.patch
-Patch6:		logjam-4.5.3-gtkhtml314.patch
-Patch7:		logjam-4.4.1-ru.po.asp.patch
-Patch8:		logjam-4.5.3-gtkspell.patch
-Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
-Patch10:	logjam-4.5.3-rhythmbox-fix.patch
-Patch11:	logjam-libsoup24.diff
-Patch12:	logjam-4.5.3-disable-threads.patch
-Patch13:	logjam-title.patch
-Patch14:	logjam-4.5.3-tags.patch
-Patch15:	logjam-4.5.3-default-spelllang-en-US.patch
-Patch16:	logjam-4.5.3-start_in_dock.patch
-Patch17:	logjam-4.5.3-uk.po.patch
-Patch18:	logjam-4.5.3-no_quit_when_docked.patch
-Patch19:	logjam-4.5.3-close_when_send.patch
-Patch20:	logjam-4.5.3-imageresize.patch
-Patch21:	logjam-4.5.3-showloginhistory.patch
-Patch22:	logjam-4.5.3-libtool.patch
-Patch23:	logjam-4.5.3-keep-drafts.patch
-Patch24:	logjam-4.5.3-lj-embed.patch
-Patch25:	logjam-4.5.3-mpris.diff
-Patch26:	logjam-4.5.3-save-tags.diff
+Patch1:		logjam-4.4.1-fedora-desktop.patch
+Patch2:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
+Patch3:		logjam-4.5.3-disable-threads.patch
+Patch4:		0001-Adds-titles-to-links-and-images-and-link-to-images.patch
+Patch5:		logjam-4.5.3-tags.patch
+Patch6:		logjam-4.5.3-start_in_dock.patch
+Patch7:		logjam-4.5.3-no_quit_when_docked.patch
+Patch8:		logjam-4.5.3-close_when_send.patch
+Patch9:		logjam-4.5.3-showloginhistory.patch
+Patch10:	logjam-4.5.3-libtool.patch
+Patch11:	logjam-4.5.3-keep-drafts.patch
+Patch12:	logjam-4.5.3-mpris.diff
+Patch13:	logjam-4.5.3-save-tags.diff
+# From: http://github.com/andy-shev/LogJam/commit/1426ae5af7f0c1ba4084f0ce0e0b63c43c763dc7
+Patch14:	0001-Add-support-of-the-User-Agent-header.patch
+# From: http://github.com/andy-shev/LogJam/commit/7ab07309963ac85c42ab7f235ac39189091a2718
+Patch15:	0001-Add-Location-support-to-the-logjam.patch
+# From: http://github.com/andy-shev/LogJam/commit/43ff911da0f0d81a264bc52e8db565e0fb52c2af
+Patch16:	0001-Add-possibility-to-insert-link-by-nickname.patch
+# From: http://github.com/andy-shev/LogJam/commit/bbe8da1dd21a193d232e6b63ed37cb30ea2068ca
+Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -62,34 +63,27 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q
-%patch2 -p1 -b .backdated
-%patch3 -p1 -b .cleanups
-%patch4 -p1 -b .desktop
-%patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml314
-%patch7 -p1 -b .ru.po
-%patch8 -p1 -b .bz186906
-%patch9 -p1 -b .docklet-context-menu
-%patch10 -p1 -b .rhythmboxfix
-%patch11 -p1 -b .libsoup
-%patch12 -p1 -b .disable-threads
-%patch13 -p1 -b .title
-%patch14 -p1 -b .tags
-%patch15 -p1 -b .default-spelllang-en-US
-%patch16 -p1 -b .start-in-dock
-%patch17 -p1 -b .uk.po
-%patch18 -p1 -b .no_quit_when_docked
-%patch19 -p1 -b .close_when_send
-%patch20 -p1 -b .imageresize
-%patch21 -p1 -b .showloginhistory
+%setup -q -n logjam-git
+%patch1 -p1 -b .desktop
+# %%patch5 -p1 -b .manfix
+%patch2 -p1 -b .docklet-context-menu
+%patch3 -p1 -b .disable-threads
+%patch4 -p1 -b .title
+%patch5 -p1 -b .tags
+%patch6 -p1 -b .start-in-dock
+%patch7 -p1 -b .no_quit_when_docked
+%patch8 -p1 -b .close_when_send
+%patch9 -p1 -b .showloginhistory
 %if 0%{fedora} >= 11
-%patch22 -p1 -b .libtool
+%patch10 -p1 -b .libtool
 %endif
-%patch23 -p1 -b .keep_drafts
-%patch24 -p1 -b .lj-embed
-%patch25 -p1 -b .mpris
-%patch26 -p1 -b .save-tags
+%patch11 -p1 -b .keep_drafts
+%patch12 -p1 -b .mpris
+%patch13 -p1 -b .save-tags
+%patch14 -p1 -b .user-agent
+%patch15 -p1 -b .location
+%patch16 -p1 -b .link-by-nickname
+%patch17 -p1 -b .automake111
 
 %if 0%{fedora} >= 10
 libtoolize
@@ -100,9 +94,8 @@ intltoolize --force
 
 %build
 touch NEWS README AUTHORS
-aclocal
-autoconf
-automake --add-missing
+# Passing NOCONFIGURE=true keeps configure from running.
+NOCONFIGURE=true ./autogen.sh
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -143,6 +136,19 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
+- use properly formed user-agent string (Andy Shevchenko) (bz 518757)
+- rebase to git master (bz 518758)
+- Add Location support (Andy Shevchenko, from Ubuntu)
+- Add link-by-nickname support (Andy Shevchenko, from FreeBSD)
+- clean out merged patches
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:4.5.3-35
+- Convert specfile to UTF-8.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
 - conditionalize libtool fun for F10+
 
@@ -400,5 +406,5 @@ rm -rf $RPM_BUILD_ROOT
  - Added fix for James Manning, Web Links browser launch
 * Tue Feb 13 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Upgraded to add GNOME build option.
-* Sun Oct 08 2000 Alexander Gr?fe <nachtfalke at retrogra.de>
+* Sun Oct 08 2000 Alexander Gr??fe <nachtfalke at retrogra.de>
  - inital version of the RPM.



From spot at fedoraproject.org  Mon Aug 24 16:31:04 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:31:04 +0000 (UTC)
Subject: rpms/logjam/devel 0001-Add-Location-support-to-the-logjam.patch,
	NONE, 1.1 0001-Add-automake-1.11-to-autogen.sh.patch, NONE,
	1.1 0001-Add-possibility-to-insert-link-by-nickname.patch, NONE,
	1.1 0001-Add-support-of-the-User-Agent-header.patch, NONE,
	1.1 0001-Adds-titles-to-links-and-images-and-link-to-images.patch,
	NONE, 1.1 logjam-4.5.3-tags.patch, 1.4, 1.5 logjam.spec, 1.57, 1.58
Message-ID: <20090824163104.6ECC411C0262@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818/devel

Modified Files:
	logjam-4.5.3-tags.patch logjam.spec 
Added Files:
	0001-Add-Location-support-to-the-logjam.patch 
	0001-Add-automake-1.11-to-autogen.sh.patch 
	0001-Add-possibility-to-insert-link-by-nickname.patch 
	0001-Add-support-of-the-User-Agent-header.patch 
	0001-Adds-titles-to-links-and-images-and-link-to-images.patch 
Log Message:
get logjam working again

0001-Add-Location-support-to-the-logjam.patch:
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 -
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 ++++++++++++++++++++++++++++
 src/jamview.h                               |    1 
 src/menu.c                                  |    2 +
 src/preview.c                               |    5 ++-
 8 files changed, 70 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-Location-support-to-the-logjam.patch ---
>From 7ab07309963ac85c42ab7f235ac39189091a2718 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 13:53:04 +0300
Subject: [PATCH] Add 'Location' support to the logjam

Originally patch was taken from:
	https://bugs.launchpad.net/ubuntu/+source/logjam/+bug/223939

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 +-
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 +++++++++++++++++++++++++++
 src/jamview.h                               |    1 +
 src/menu.c                                  |    2 +
 src/preview.c                               |    4 ++-
 8 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/protocol/liblivejournal/livejournal/entry.c b/protocol/liblivejournal/livejournal/entry.c
index 838fd42..5bdf12e 100644
--- a/protocol/liblivejournal/livejournal/entry.c
+++ b/protocol/liblivejournal/livejournal/entry.c
@@ -49,6 +49,8 @@ lj_entry_copy(LJEntry *e) {
 		newe->mood = g_strdup(e->mood);
 	if (e->music)
 		newe->music = g_strdup(e->music);
+	if (e->location)
+		newe->location = g_strdup(e->location);
 	if (e->taglist)
 		newe->taglist = g_strdup(e->taglist);
 	if (e->pickeyword)
@@ -61,6 +63,7 @@ lj_entry_free(LJEntry *e) {
 	g_free(e->event);
 	g_free(e->mood);
 	g_free(e->music);
+	g_free(e->location);
 	g_free(e->taglist);
 	g_free(e->pickeyword);
 	g_free(e);
@@ -136,6 +139,8 @@ lj_entry_set_request_fields(LJEntry *entry, LJRequest *request) {
 		lj_request_add_int(request, "prop_current_moodid", entry->moodid);
 	else
 		lj_request_add(request, "prop_current_moodid", "");
+	lj_request_add(request,
+			"prop_current_location", entry->location ? entry->location : "");
 	lj_request_add(request, 
 			"prop_current_music", entry->music ? entry->music : "");
 	lj_request_add(request, 
@@ -191,6 +196,12 @@ lj_entry_load_metadata(LJEntry *entry,
 			g_set_error(err, 0, 0, "Bad UTF-8 in current_music");
 			return FALSE;
 		}
+	} else if (strcmp(key, "current_location") == 0) {
+		entry->location = g_strdup(value);
+		if (!verify_utf8(&entry->location)) {
+			g_set_error(err, 0, 0, "Bad UTF-8 in current_location");
+			return FALSE;
+		}
 	} else if (strcmp(key, "taglist") == 0) {
 		entry->taglist = g_strdup(value);
 		if (!verify_utf8(&entry->taglist)) {
@@ -255,6 +266,7 @@ lj_entry_to_xml_node(LJEntry *entry, void* doc) {
 		}
 	}
 	XML_ENTRY_META_SET(music);
+	XML_ENTRY_META_SET(location);
 	XML_ENTRY_META_SET(taglist);
 	XML_ENTRY_META_SET(pickeyword);
 	if (entry->preformatted)
@@ -479,6 +491,7 @@ lj_entry_load_from_xml_node(LJEntry *entry, xmlDocPtr doc, xmlNodePtr node) {
 			}
 		}
 		else XML_ENTRY_META_GET(music)
+		else XML_ENTRY_META_GET(location)
 		else XML_ENTRY_META_GET(taglist)
 		else XML_ENTRY_META_GET(pickeyword)
 		else if (xmlStrcmp(cur->name, BAD_CAST "preformatted") == 0) {
@@ -605,6 +618,7 @@ rfc822_load_entry(const char *key, const char *val, LJEntry *entry) {
 	RFC822_GET(subject)
 	else RFC822_GET(mood) /* XXX id */
 	else RFC822_GET(music)
+	else RFC822_GET(location)
 	else RFC822_GET(taglist)
 	else RFC822_GET(pickeyword)
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
@@ -748,6 +762,7 @@ lj_entry_to_rfc822(LJEntry *entry, gboolean includeempty) {
 	append_field(str, "Subject", entry->subject, includeempty);
 	append_field(str, "Mood", entry->mood, includeempty);
 	append_field(str, "Music", entry->music, includeempty);
+	append_field(str, "Location", entry->location, includeempty);
 	append_field(str, "TagList", entry->taglist, includeempty);
 	append_field(str, "PicKeyword", entry->pickeyword, includeempty);
 	g_string_append(str, "\n");
diff --git a/protocol/liblivejournal/livejournal/entry.h b/protocol/liblivejournal/livejournal/entry.h
index 4a138e5..2d35f89 100644
--- a/protocol/liblivejournal/livejournal/entry.h
+++ b/protocol/liblivejournal/livejournal/entry.h
@@ -52,7 +52,7 @@ typedef struct _LJEntry {
 	char *event;
 
 	int moodid;  /* a moodid is only meaningful in the context of a particular LJServer. */
-	char *mood, *music, *taglist, *pickeyword;
+	char *mood, *music, *location, *taglist, *pickeyword;
 	gboolean preformatted;
 	gboolean backdated;
 	LJCommentsType comments;
diff --git a/src/jamdoc.c b/src/jamdoc.c
index b3cdf99..ced84a0 100644
--- a/src/jamdoc.c
+++ b/src/jamdoc.c
@@ -240,6 +240,14 @@ jam_doc_set_music(JamDoc *doc, const char *music) {
 	string_replace(&doc->entry->music, music ? g_strdup(music) : NULL);
 }
 const char *
+jam_doc_get_location(JamDoc *doc) {
+	return doc->entry->location;
+}
+void
+jam_doc_set_location(JamDoc *doc, const char *location) {
+	string_replace(&doc->entry->location, location ? g_strdup(location) : NULL);
+}
+const char *
 jam_doc_get_taglist(JamDoc *doc) {
 	return doc->entry->taglist;
 }
diff --git a/src/jamdoc.h b/src/jamdoc.h
index 21fae13..99fa8b4 100644
--- a/src/jamdoc.h
+++ b/src/jamdoc.h
@@ -63,6 +63,9 @@ void           jam_doc_set_moodid(JamDoc *doc, int moodid);
 const char *   jam_doc_get_music(JamDoc *doc);
 void           jam_doc_set_music(JamDoc *doc, const char *music);
 
+const char *   jam_doc_get_location(JamDoc *doc);
+void           jam_doc_set_location(JamDoc *doc, const char *location);
+
 const char *   jam_doc_get_taglist(JamDoc *doc);
 void           jam_doc_set_taglist(JamDoc *doc, const char *taglist);
 
diff --git a/src/jamview.c b/src/jamview.c
index ecd1fc2..cb00b3a 100644
--- a/src/jamview.c
+++ b/src/jamview.c
@@ -43,6 +43,9 @@ struct _JamView {
 	GtkWidget *musicbar;
 	GtkWidget *musicbutton, *music;
 
+	GtkWidget *locationbar;
+	GtkWidget *location;
+
 	GtkWidget *tagsbar;
 	GtkWidget *tags;
 
@@ -428,6 +431,39 @@ tags_select_cb(JamView *view) {
 }
 
 static void
+location_add(JamView *view) {
+	view->location = gtk_entry_new();
+	view->locationbar = labelled_box_new_sg(_("_Location:"), view->location, view->sizegroup);
+	gtk_box_pack_start(GTK_BOX(view), view->locationbar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(view), view->locationbar, view->moodpicbar ? 2 : 1);
+	gtk_widget_show_all(view->locationbar);
+}
+static void
+location_remove(JamView *view) {
+	jam_doc_set_location(view->doc, NULL);
+	gtk_widget_destroy(view->locationbar);
+	view->locationbar = view->location = NULL;
+}
+static gboolean
+location_visible(JamView *view) {
+	return view->locationbar != NULL;
+}
+static void
+location_load(JamView *view) {
+	const char *location = jam_doc_get_location(view->doc);
+	if (location)
+		show_meta(view, JAM_VIEW_LOCATION);
+	if (location_visible(view))
+		gtk_entry_set_text(GTK_ENTRY(view->location), location ? location : "");
+}
+static void
+location_store(JamView *view) {
+	const char *location = gtk_entry_get_text(GTK_ENTRY(view->location));
+	if (location[0] == 0) location = NULL;
+	jam_doc_set_location(view->doc, location);
+}
+
+static void
 tags_add(JamView *view) {
 	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
@@ -590,6 +626,7 @@ static struct {
 	{ "mood",         TRUE, STD(mood),         mood_account_changed     },
 	{ "picture",      TRUE, STD(picture),      picture_account_changed  },
 	{ "music",        TRUE, STD(music),        NULL },
+	{ "location",     TRUE, STD(location),     NULL },
 	{ "tags",         TRUE, STD(tags),         NULL },
 	{ "preformatted", TRUE, STD(preformatted), NULL },
 	{ "datesel",      TRUE, STD(datesel),      NULL },
diff --git a/src/jamview.h b/src/jamview.h
index 0862054..a4efbf5 100644
--- a/src/jamview.h
+++ b/src/jamview.h
@@ -21,6 +21,7 @@ typedef enum {
 	JAM_VIEW_MOOD,
 	JAM_VIEW_PIC,
 	JAM_VIEW_MUSIC,
+	JAM_VIEW_LOCATION,
 	JAM_VIEW_TAGS,
 	JAM_VIEW_PREFORMATTED,
 	JAM_VIEW_DATESEL,
diff --git a/src/menu.c b/src/menu.c
index 6ca6e23..97bd611 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,6 +56,7 @@ enum {
 	ACTION_VIEW_MOOD,
 	ACTION_VIEW_PICTURE,
 	ACTION_VIEW_MUSIC,
+	ACTION_VIEW_LOCATION,
 	ACTION_VIEW_TAGS,
 	ACTION_VIEW_PREFORMATTED,
 	ACTION_VIEW_DATESEL,
@@ -430,6 +431,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/View/_Picture"),           NULL, menu_view_cb, ACTION_VIEW_PICTURE,      "<CheckItem>" },
 { N_("/View/_Tags"),              NULL, menu_view_cb, ACTION_VIEW_TAGS,         "<CheckItem>" },
 { N_("/View/M_usic"),             NULL, menu_view_cb, ACTION_VIEW_MUSIC,        "<CheckItem>" },
+{ N_("/View/_Location"),          NULL, menu_view_cb, ACTION_VIEW_LOCATION,     "<CheckItem>" },
 { N_("/View/_Preformatted"),      NULL, menu_view_cb, ACTION_VIEW_PREFORMATTED, "<CheckItem>" },
 { N_("/View/_Comments"),          NULL, menu_view_cb, ACTION_VIEW_COMMENTS,     "<CheckItem>" },
 
diff --git a/src/preview.c b/src/preview.c
index b3abc2e..5ee3fbc 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -179,11 +179,13 @@ entry_prepare_preview(LJEntry *entry) {
 		g_string_append(str, "</tr></table><hr/><br/>");
 	}
 
-	if (entry->mood || entry->music || entry->taglist) {
+	if (entry->mood || entry->music || entry->location || entry->taglist) {
 		if (entry->mood)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Mood"), entry->mood);
 		if (entry->music)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Music"), entry->music);
+		if (entry->location)
+			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Location"), entry->location);
 		if (entry->taglist)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Tags"), entry->taglist);
 		g_string_append(str, "<br/>");
-- 
1.6.4


0001-Add-automake-1.11-to-autogen.sh.patch:
 autogen.sh |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Add-automake-1.11-to-autogen.sh.patch ---
>From bbe8da1dd21a193d232e6b63ed37cb30ea2068ca Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 14:52:09 +0300
Subject: [PATCH] Add automake-1.11 to autogen.sh

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 autogen.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4b72b88..b01b5f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,12 +311,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-- 
1.6.4


0001-Add-possibility-to-insert-link-by-nickname.patch:
 link-journal.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Add-possibility-to-insert-link-by-nickname.patch ---
>From 43ff911da0f0d81a264bc52e8db565e0fb52c2af Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 15:56:28 +0300
Subject: [PATCH] Add possibility to insert link by nickname

Originally patch was found here:
	http://people.freebsd.org/~novel/patches/non-freebsd/logjam452_userlink.diff

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/link-journal.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/link-journal.c b/src/link-journal.c
index d70e70d..ec47e2d 100644
--- a/src/link-journal.c
+++ b/src/link-journal.c
@@ -44,11 +44,12 @@ make_usertype_omenu() {
 void
 link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkWidget *dlg;
-	GtkWidget *vbox, *hbox, *entry, *omenu;
+	GtkWidget *vbox, *hbox, *entry, *entry_name, *omenu;
 	GtkSizeGroup *sizegroup;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *username = NULL;
+	char *usernick = NULL;
 	int usertype;
 	gboolean selection = FALSE;
 
@@ -78,6 +79,11 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	hbox = labelled_box_new_sg(_("_Username:"), entry, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	entry_name = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(entry_name), TRUE);
+	hbox = labelled_box_new_sg(_("_Nickname:"), entry_name, sizegroup);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
 	omenu = make_usertype_omenu();
 	hbox = labelled_box_new_sg(_("User _Type:"), omenu, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -89,6 +95,7 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		return;
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -102,6 +109,41 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usernick && *usernick) {
+		gchar *link;
+		gchar *img;
+		JamAccount *acc = jam_doc_get_account(doc);
+
+		xml_escape(&username);
+		xml_escape(&usernick);
+
+		if (usertype == 0)
+			img = g_strdup("userinfo.gif");
+		else
+			img = g_strdup("community.gif");
+
+		link = g_strdup_printf(
+			"<a href='%s/userinfo.bml?user=%s'>"
+				"<img src='%s/img/%s' alt='[info]' align='absmiddle' width='17' height='17' border='0' />"
+			"</a>"
+			"<a style='FONT-WEIGHT: 800' href='%s/users/%s'>%s</a>",
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			img,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			usernick);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(img);
+		free(username);
+		free(usernick);
+		return;
+	}
+
 	gtk_text_buffer_insert(buffer, &start, "<lj ", -1);
 	if (usertype == 0)
 		gtk_text_buffer_insert(buffer, &start, "user=\"", -1);
-- 
1.6.4


0001-Add-support-of-the-User-Agent-header.patch:
 network-curl.c     |    2 ++
 network-internal.h |    5 +++++
 network-libxml.c   |    7 +++++++
 network-soup.c     |    5 ++++-
 network-win32.c    |    3 +--
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-support-of-the-User-Agent-header.patch ---
>From 511a6b7ba39438bc5edaac7c27f1283bf04b75b1 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 20:42:00 +0300
Subject: [PATCH] Add support of the User-Agent header

Starting from 22.08.2009 the Livejournal refuses all programs which has
not well-formed User-Agent string. Details here:
http://www.livejournal.com/bots/

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/network-curl.c     |    2 ++
 src/network-internal.h |    5 +++++
 src/network-libxml.c   |    7 +++++++
 src/network-soup.c     |    5 ++++-
 src/network-win32.c    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/network-curl.c b/src/network-curl.c
index 12bdc81..94db0af 100644
--- a/src/network-curl.c
+++ b/src/network-curl.c
@@ -96,6 +96,8 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 	}
 
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, LOGJAM_USER_AGENT);
+
 	if (headers) {
 		GSList *l;
 		for (l = headers; l; l = l->next)
diff --git a/src/network-internal.h b/src/network-internal.h
index 991edfc..9103bc8 100644
--- a/src/network-internal.h
+++ b/src/network-internal.h
@@ -9,6 +9,11 @@
 
 #include "network.h"
 
+/* constants to apply User-Agent header */
+#define LOGJAM_HOME_URL		"http://logjam.danga.com"
+#define LOGJAM_AUTHOR_EMAIL	"martine at danga.com"
+#define LOGJAM_USER_AGENT	LOGJAM_HOME_URL "; " LOGJAM_AUTHOR_EMAIL
+
 /* network-internal -- interface to http, used by network.
  * provides a blocking and nonblocking interface.
  * implemented by
diff --git a/src/network-libxml.c b/src/network-libxml.c
index 8f2c4d7..4f97737 100644
--- a/src/network-libxml.c
+++ b/src/network-libxml.c
@@ -25,6 +25,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 	gboolean success = FALSE;
 	int len;
 	NetStatusProgress progress;
+	gchar *user_agent;
 
 	if (conf.options.netdump && post) 
 		fprintf(stderr, _("Request: [%s]\n"), post->str);
@@ -44,16 +45,22 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		xmlNanoHTTPScanProxy(NULL);
 	}
 
+	user_agent = g_strdup_printf("User-Agent: %s\r\n", LOGJAM_USER_AGENT);
 	if (headers) {
 		GString *hs = g_string_new(NULL);
 		GSList *l;
+		g_string_append(hs, user_agent);
 		for (l = headers; l; l = l->next) {
 			g_string_append(hs, l->data);
 			g_string_append(hs, "\r\n");
 		}
 		headerstr = hs->str;
 		g_string_free(hs, FALSE);
+		g_free(user_agent);
+	} else {
+		headerstr = user_agent;
 	}
+
 	if (post)
 		ctx = xmlNanoHTTPMethod(url, "POST",
 				post->str, NULL, headerstr, post->len);
diff --git a/src/network-soup.c b/src/network-soup.c
index 9e28d9c..24b8e45 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -57,10 +57,13 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_PROXY_URI, suri,
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
 			NULL);
 		soup_uri_free(suri);
 	} else
-		session = soup_session_sync_new ();
+		session = soup_session_sync_new_with_options (
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
+			NULL);
 
 	req = soup_message_new(post ? "POST" : "GET", url);
 	g_signal_connect(G_OBJECT(req), "got-chunk",
diff --git a/src/network-win32.c b/src/network-win32.c
index a2429aa..d4d1796 100644
--- a/src/network-win32.c
+++ b/src/network-win32.c
@@ -126,7 +126,7 @@ net_post_blocking(const char *surl, GSList *headers, GString *post,
 	host = urlc.lpszHostName;
 	host[urlc.dwHostNameLength] = 0;
 
-	if ((hInternet = InternetOpen("LogJam-Win32",
+	if ((hInternet = InternetOpen(LOGJAM_USER_AGENT,
 			INTERNET_OPEN_TYPE_PRECONFIG,
 			NULL, NULL, 0)) != NULL) {
 
-- 
1.6.4


0001-Adds-titles-to-links-and-images-and-link-to-images.patch:
 html_markup.c |    5 +++++
 imagelink.c   |   32 +++++++++++++++++++++++++++++---
 link.c        |   16 +++++++++++++---
 menu.c        |    6 +++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Adds-titles-to-links-and-images-and-link-to-images.patch ---
>From 14038cb91ef71252d9e46c5c4f4060e79ee49259 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Fri, 1 May 2009 23:27:26 +0300
Subject: [PATCH] Adds titles to links and images and link to images

This adds:
* title to the dialog for image and link
* link to image dialog
* blockquote option for formatting

Originally patch was observed here:
http://bugzilla.redhat.com/show_bug.cgi?id=434754#c1

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/html_markup.c |    5 +++++
 src/imagelink.c   |   32 +++++++++++++++++++++++++++++---
 src/link.c        |   16 +++++++++++++---
 src/menu.c        |    5 +++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/html_markup.c b/src/html_markup.c
index 36ec4e7..9c5a796 100644
--- a/src/html_markup.c
+++ b/src/html_markup.c
@@ -74,3 +74,8 @@ void
 html_mark_monospaced(JamDoc *doc) {
 	html_mark_tag(doc, "tt");
 }
+
+void
+html_mark_blockquote(JamDoc *doc) {
+	html_mark_tag(doc, "blockquote");
+}
diff --git a/src/imagelink.c b/src/imagelink.c
index a9f296d..21ac938 100644
--- a/src/imagelink.c
+++ b/src/imagelink.c
@@ -13,7 +13,7 @@
 
 typedef struct {
 	GtkWidget *dlg;
-	GtkWidget *url, *get, *width, *height;
+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
 } ImageDlg;
 
 static void
@@ -88,6 +88,14 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
 			FALSE, FALSE, 0);
 
+	idlg->tit = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
+		FALSE, FALSE, 0);
+	idlg->anchor = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
+		FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	dimbox = gtk_vbox_new(FALSE, 6);
@@ -132,6 +140,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *sel = NULL, *url = NULL;
+	const gchar *tit, *anch;
 	const char *data;
 	int width = -1, height = -1;
 
@@ -161,9 +170,15 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 
 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
 		xml_escape(&url);
-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
+		anch = gtk_entry_get_text(GTK_ENTRY(idlg->anchor));
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, anch, -1);
+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
+		}
+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
 		gtk_text_buffer_insert(buffer, &start, url, -1);
-		gtk_text_buffer_insert(buffer, &start, "'", -1);
+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
 		g_free(url);
 
 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
@@ -182,7 +197,18 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 			gtk_text_buffer_insert(buffer, &start, data, -1);
 			g_free(data);
 		}
+
+		tit = gtk_entry_get_text(GTK_ENTRY(idlg->tit));
+		if (tit && *tit) {
+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, tit, -1);
+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
+		}
+
 		gtk_text_buffer_insert(buffer, &start, " />", -1);
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "</a>", -1);
+		}
 	}
 
 	g_free(sel);
diff --git a/src/link.c b/src/link.c
index 0be2e98..596eb30 100644
--- a/src/link.c
+++ b/src/link.c
@@ -17,6 +17,7 @@
 typedef struct {
 	GtkWidget *dlg;
 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
+	GtkWidget *titl;
 	JamDoc *doc;
 	gint sel_type, clip_type;
 	gchar *sel_input, *clip_input;
@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
 static void
 make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	GtkWidget *vbox;
-	GtkWidget *subbox;
+	GtkWidget *subbox, *hhr;
 	GSList *rgroup;
 
 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
@@ -114,6 +115,9 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
+	ld->titl = gtk_entry_new();
+	hhr = labelled_box_new(_("Link Title:"), ld->titl);
+	gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), 
 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
 
 static char*
 get_link(LinkDialog *ld, JamAccount *acc) {
-	char *url, *user, *text;
+	char *url, *user, *text, *title;
 	char *link = NULL;
 
 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
@@ -187,10 +191,15 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	xml_escape(&user);
 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
 	xml_escape(&text);
+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
 		/* build a "url" link. */
-		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		if (title && *title) {
+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
+		} else {
+			link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		}
 	} else if (ld->ruser &&
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
 		/* build a "friends" link. */
@@ -204,6 +213,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	g_free(url);
 	g_free(user);
 	g_free(text);
+	g_free(title);
 	
 	return link;
 }
diff --git a/src/menu.c b/src/menu.c
index 7fa74f2..5cdd37e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -321,6 +321,10 @@ static void
 menu_html_mark_monospaced(JamWin *jw) {
 	html_mark_monospaced(jw->doc);
 }
+static void
+menu_html_mark_blockquote(JamWin *jw) {
+	html_mark_blockquote(jw->doc);
+}
 
 void manager_dialog(GtkWidget *parent);
 
@@ -435,6 +439,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
 { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
 { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
+{ N_("/HTML/_Blockquote"),			"<ctl><alt>Q", menu_html_mark_blockquote },
 
 { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
 { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },
-- 
1.6.4


logjam-4.5.3-tags.patch:
 protocol/liblivejournal/livejournal/Makefile.am   |    3 
 protocol/liblivejournal/livejournal/gettags.c     |   65 +++++++
 protocol/liblivejournal/livejournal/gettags.h     |   16 +
 protocol/liblivejournal/livejournal/livejournal.h |    1 
 protocol/liblivejournal/livejournal/tags.h        |   18 ++
 protocol/liblivejournal/livejournal/types.c       |   13 +
 src/Makefile.am                                   |    1 
 src/jamview.c                                     |   24 ++
 src/tags.c                                        |  181 ++++++++++++++++++++++
 src/tags.h                                        |    6 
 10 files changed, 327 insertions(+), 1 deletion(-)

Index: logjam-4.5.3-tags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/devel/logjam-4.5.3-tags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- logjam-4.5.3-tags.patch	11 Mar 2008 21:58:59 -0000	1.4
+++ logjam-4.5.3-tags.patch	24 Aug 2009 16:31:04 -0000	1.5
@@ -169,52 +169,6 @@ diff -up /dev/null logjam-4.5.3/protocol
 +	g_free(gettags);
 +}
 +
-diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in
---- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags	2006-01-19 03:18:52.000000000 -0500
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in	2008-03-11 17:57:21.000000000 -0400
-@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
- liblivejournal_la_SOURCES = \
- 	md5.c              md5.h            \
- 	protocol.c         protocol.h       \
--	friends.h                           \
-+	friends.h          tags.h           \
- 	serveruser.c       serveruser.h     \
- 	entry.c            entry.h          \
- 	types.c            types.h          \
-@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \
- 	getchallenge.c     getchallenge.h   \
- 	getevents.c        getevents.h      \
- 	getfriends.c       getfriends.h     \
-+	gettags.c          gettags.h        \
- 	syncitems.c        syncitems.h      \
- 	sync.c             sync.h           \
- 	livejournal.h
-@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES =
- am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \
- 	types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \
- 	editfriends.lo editfriendgroups.lo editpostevent.lo \
--	getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo
-+	getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo
- liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/editfriends.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/getchallenge.Plo \
-- at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \
-@@ -247,6 +248,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@
 diff -up /dev/null logjam-4.5.3/src/tags.c
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
 +++ logjam-4.5.3/src/tags.c	2008-03-11 17:53:46.000000000 -0400
@@ -421,26 +375,6 @@ diff -up logjam-4.5.3/src/Makefile.am.ta
            $(HTML_MARKUP)
  
  src_preview = $(PREVIEW)
-diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in
---- logjam-4.5.3/src/Makefile.in.tags	2006-01-19 03:18:44.000000000 -0500
-+++ logjam-4.5.3/src/Makefile.in	2008-03-11 17:53:46.000000000 -0400
-@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
-           undo.c undo.h \
-           userlabel.c userlabel.h \
-           get_cmd_out.c get_cmd_out.h \
-+          tags.c tags.h \
-           $(HTML_MARKUP)
- 
- 
-@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini
- 	login.c login.h manager.c spawn.c spawn.h icons.c icons.h \
- 	music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \
- 	pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \
--	userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \
-+	userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \
- 	html_markup.h network-win32.c network-fork.c network-soup.c \
- 	network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \
- 	docklet.c preview.c preview.h journalstore-sqlite.c \
 diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c
 --- logjam-4.5.3/src/jamview.c.tags	2008-03-11 17:53:46.000000000 -0400
 +++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- logjam.spec	10 Aug 2009 09:19:57 -0000	1.57
+++ logjam.spec	24 Aug 2009 16:31:04 -0000	1.58
@@ -2,13 +2,18 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	35%{?dist}
+Release:	36%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+# Now, we get source from git
+# git clone git://github.com/martine/LogJam.git logjam-git
+# find logjam-git -depth -name .git -type d -exec rm -rf {} \;
+# tar cvfj logjam-git-20090824.tar.bz2 logjam-git/
+Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -17,34 +22,30 @@ BuildRequires:	curl-devel, gtk2-devel, g
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
-BuildRequires:	dbus-devel
+BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch2:		logjam-4.4.1-backdated.patch
-Patch3:		logjam-4.4.1-cleanups.patch
-Patch4:		logjam-4.4.1-fedora-desktop.patch
-Patch5:		logjam-4.5-patch8-manfix.patch
-Patch6:		logjam-4.5.3-gtkhtml314.patch
-Patch7:		logjam-4.4.1-ru.po.asp.patch
-Patch8:		logjam-4.5.3-gtkspell.patch
-Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
-Patch10:	logjam-4.5.3-rhythmbox-fix.patch
-Patch11:	logjam-libsoup24.diff
-Patch12:	logjam-4.5.3-disable-threads.patch
-Patch13:	logjam-title.patch
-Patch14:	logjam-4.5.3-tags.patch
-Patch15:	logjam-4.5.3-default-spelllang-en-US.patch
-Patch16:	logjam-4.5.3-start_in_dock.patch
-Patch17:	logjam-4.5.3-uk.po.patch
-Patch18:	logjam-4.5.3-no_quit_when_docked.patch
-Patch19:	logjam-4.5.3-close_when_send.patch
-Patch20:	logjam-4.5.3-imageresize.patch
-Patch21:	logjam-4.5.3-showloginhistory.patch
-Patch22:	logjam-4.5.3-libtool.patch
-Patch23:	logjam-4.5.3-keep-drafts.patch
-Patch24:	logjam-4.5.3-lj-embed.patch
-Patch25:	logjam-4.5.3-mpris.diff
-Patch26:	logjam-4.5.3-save-tags.diff
+Patch1:		logjam-4.4.1-fedora-desktop.patch
+Patch2:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
+Patch3:		logjam-4.5.3-disable-threads.patch
+Patch4:		0001-Adds-titles-to-links-and-images-and-link-to-images.patch
+Patch5:		logjam-4.5.3-tags.patch
+Patch6:		logjam-4.5.3-start_in_dock.patch
+Patch7:		logjam-4.5.3-no_quit_when_docked.patch
+Patch8:		logjam-4.5.3-close_when_send.patch
+Patch9:		logjam-4.5.3-showloginhistory.patch
+Patch10:	logjam-4.5.3-libtool.patch
+Patch11:	logjam-4.5.3-keep-drafts.patch
+Patch12:	logjam-4.5.3-mpris.diff
+Patch13:	logjam-4.5.3-save-tags.diff
+# From: http://github.com/andy-shev/LogJam/commit/1426ae5af7f0c1ba4084f0ce0e0b63c43c763dc7
+Patch14:	0001-Add-support-of-the-User-Agent-header.patch
+# From: http://github.com/andy-shev/LogJam/commit/7ab07309963ac85c42ab7f235ac39189091a2718
+Patch15:	0001-Add-Location-support-to-the-logjam.patch
+# From: http://github.com/andy-shev/LogJam/commit/43ff911da0f0d81a264bc52e8db565e0fb52c2af
+Patch16:	0001-Add-possibility-to-insert-link-by-nickname.patch
+# From: http://github.com/andy-shev/LogJam/commit/bbe8da1dd21a193d232e6b63ed37cb30ea2068ca
+Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -62,34 +63,27 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q
-%patch2 -p1 -b .backdated
-%patch3 -p1 -b .cleanups
-%patch4 -p1 -b .desktop
-%patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml314
-%patch7 -p1 -b .ru.po
-%patch8 -p1 -b .bz186906
-%patch9 -p1 -b .docklet-context-menu
-%patch10 -p1 -b .rhythmboxfix
-%patch11 -p1 -b .libsoup
-%patch12 -p1 -b .disable-threads
-%patch13 -p1 -b .title
-%patch14 -p1 -b .tags
-%patch15 -p1 -b .default-spelllang-en-US
-%patch16 -p1 -b .start-in-dock
-%patch17 -p1 -b .uk.po
-%patch18 -p1 -b .no_quit_when_docked
-%patch19 -p1 -b .close_when_send
-%patch20 -p1 -b .imageresize
-%patch21 -p1 -b .showloginhistory
+%setup -q -n logjam-git
+%patch1 -p1 -b .desktop
+# %%patch5 -p1 -b .manfix
+%patch2 -p1 -b .docklet-context-menu
+%patch3 -p1 -b .disable-threads
+%patch4 -p1 -b .title
+%patch5 -p1 -b .tags
+%patch6 -p1 -b .start-in-dock
+%patch7 -p1 -b .no_quit_when_docked
+%patch8 -p1 -b .close_when_send
+%patch9 -p1 -b .showloginhistory
 %if 0%{fedora} >= 11
-%patch22 -p1 -b .libtool
+%patch10 -p1 -b .libtool
 %endif
-%patch23 -p1 -b .keep_drafts
-%patch24 -p1 -b .lj-embed
-%patch25 -p1 -b .mpris
-%patch26 -p1 -b .save-tags
+%patch11 -p1 -b .keep_drafts
+%patch12 -p1 -b .mpris
+%patch13 -p1 -b .save-tags
+%patch14 -p1 -b .user-agent
+%patch15 -p1 -b .location
+%patch16 -p1 -b .link-by-nickname
+%patch17 -p1 -b .automake111
 
 %if 0%{fedora} >= 10
 libtoolize
@@ -100,9 +94,8 @@ intltoolize --force
 
 %build
 touch NEWS README AUTHORS
-aclocal
-autoconf
-automake --add-missing
+# Passing NOCONFIGURE=true keeps configure from running.
+NOCONFIGURE=true ./autogen.sh
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -143,6 +136,13 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
+- use properly formed user-agent string (Andy Shevchenko) (bz 518757)
+- rebase to git master (bz 518758)
+- Add Location support (Andy Shevchenko, from Ubuntu)
+- Add link-by-nickname support (Andy Shevchenko, from FreeBSD)
+- clean out merged patches
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:4.5.3-35
 - Convert specfile to UTF-8.
 



From spot at fedoraproject.org  Mon Aug 24 16:32:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:32:22 +0000 (UTC)
Subject: rpms/logjam/EL-5 logjam-4.5.3-close_when_send.patch, NONE,
	1.1 logjam-4.5.3-disable-threads.patch, NONE,
	1.1 logjam-4.5.3-keep-drafts.patch, NONE,
	1.1 logjam-4.5.3-libtool.patch, NONE,
	1.1 logjam-4.5.3-mpris.diff, NONE,
	1.1 logjam-4.5.3-no_quit_when_docked.patch, NONE,
	1.1 logjam-4.5.3-save-tags.diff, NONE,
	1.1 logjam-4.5.3-showloginhistory.patch, NONE,
	1.1 logjam-4.5.3-start_in_dock.patch, NONE,
	1.1 logjam-4.5.3-tags.patch, NONE, 1.1
Message-ID: <20090824163222.5995B11C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3170/EL-5

Added Files:
	logjam-4.5.3-close_when_send.patch 
	logjam-4.5.3-disable-threads.patch 
	logjam-4.5.3-keep-drafts.patch logjam-4.5.3-libtool.patch 
	logjam-4.5.3-mpris.diff logjam-4.5.3-no_quit_when_docked.patch 
	logjam-4.5.3-save-tags.diff 
	logjam-4.5.3-showloginhistory.patch 
	logjam-4.5.3-start_in_dock.patch logjam-4.5.3-tags.patch 
Log Message:
get logjam working again

logjam-4.5.3-close_when_send.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 jam.c      |    8 ++++++++
 settings.c |    6 ++++++
 4 files changed, 17 insertions(+)

--- NEW FILE logjam-4.5.3-close_when_send.patch ---
diff -up logjam-4.5.3/src/jam.c.close-when-send logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-18 10:31:30.000000000 +0300
@@ -363,6 +363,10 @@ action_cb(GtkWidget *w, JamWin *jw) {
 	} else {
 		g_warning("action callback, but no default action?\n");
 	}
+#ifdef USE_DOCK
+	if (conf.options.close_when_send && app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+#endif
 }
 
 static void
@@ -395,6 +399,10 @@ delete_cb(GtkWidget *w, JamWin *jw) {
 	} else {
 		delete_server_entry(jw);
 	}
+#ifdef USE_DOCK
+	if (conf.options.close_when_send && app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+#endif
 }
 
 static void
diff -up logjam-4.5.3/src/conf_xml.c.close-when-send logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2008-05-18 09:49:33.000000000 +0300
@@ -183,6 +183,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(autosave)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
+		READOPTION(close_when_send)
 		READOPTION(docklet)
 		READOPTION(start_in_dock)
 		READOPTION(cffloat)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(autosave);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
+	WRITEOPTION(close_when_send);
 	WRITEOPTION(docklet);
 	WRITEOPTION(start_in_dock);
 	WRITEOPTION(cffloatraise);
diff -up logjam-4.5.3/src/settings.c.close-when-send logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2008-05-18 09:56:35.000000000 +0300
@@ -85,6 +85,8 @@ static SettingsWidget settingswidgets[] 
 	{ "ui_font", &conf.uifont,
 		SW_CUSTOM, N_("Entry display font:") },
 #ifndef G_OS_WIN32
+	{ "ui_close_when_send", &conf.options.close_when_send,
+		SW_TOGGLE, N_("Close main window after sending") },
 	{ "ui_docklet", &conf.options.docklet,
 		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },
 	{ "ui_start_in_dock", &conf.options.start_in_dock,
@@ -397,6 +399,10 @@ uisettings(JamWin *jw) {
 			G_CALLBACK(sec_changed_cb), sw);
 	groupedbox_pack(GROUPEDBOX(post), sw_make("ui_defaultsecurity"), FALSE);
 
+#ifdef USE_DOCK
+	groupedbox_pack(GROUPEDBOX(post), sw_make("ui_close_when_send"), FALSE);
+#endif /* USE_DOCK */
+
 	entry = groupedbox_new_with_text(_("Entries"));
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
diff -up logjam-4.5.3/src/conf.h.close-when-send logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2008-05-18 09:52:36.000000000 +0300
@@ -51,6 +51,7 @@ typedef struct {
 	gboolean autosave;
 	gboolean cfautostart;
 	gboolean cfusemask;
+	gboolean close_when_send;
 	gboolean docklet;
 	gboolean cffloat;
 	gboolean cffloatraise;

logjam-4.5.3-disable-threads.patch:
 history.c      |    4 ++++
 init.c         |    4 ++--
 network-fork.c |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE logjam-4.5.3-disable-threads.patch ---
diff -up logjam-4.5.3/src/init.c.BAD logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.BAD	2008-03-11 14:48:18.000000000 -0400
+++ logjam-4.5.3/src/init.c	2008-03-11 14:49:35.000000000 -0400
@@ -177,13 +177,13 @@ setup_locales() {
 
 static void
 setup_glibgdk() {
-#ifdef HAVE_GTK
+#if defined (HAVE_GTK) && defined (G_OS_WIN32)
 	/* calls to these thread inits must happen before any other
 	 * g* calls. */
 	if (!g_thread_supported()) g_thread_init(NULL);
 	gdk_threads_init();
 	gdk_threads_enter();
-#endif /* HAVE_GTK */
+#endif /* HAVE_GTK && G_OS_WIN32 */
 
 	g_type_init();
 
diff -up logjam-4.5.3/src/history.c.BAD logjam-4.5.3/src/history.c
--- logjam-4.5.3/src/history.c.BAD	2008-03-18 16:02:18.000000000 -0400
+++ logjam-4.5.3/src/history.c	2008-03-18 16:02:36.000000000 -0400
@@ -368,9 +368,13 @@ hc_show_current(history_calendar_dlg *hc
 
 static gint
 hc_list_click_idle_cb(gpointer d) {
+#if defined (G_OS_WIN32)
 	gdk_threads_enter();
+#endif
 	hc_show_current(d);
+#if defined (G_OS_WIN32)
 	gdk_threads_leave();
+#endif
 	return FALSE;
 }
 	
diff -up logjam-4.5.3/src/network-fork.c.hack logjam-4.5.3/src/network-fork.c
--- logjam-4.5.3/src/network-fork.c.hack	2008-03-18 16:31:40.000000000 -0400
+++ logjam-4.5.3/src/network-fork.c	2008-03-18 16:32:06.000000000 -0400
@@ -171,6 +171,7 @@ net_post_mainloop(const char *url, GSLis
 		GString *response;
 		GError *err = NULL;
 
+        	if (!g_thread_supported ()) g_thread_init (NULL);
 		response = net_post_blocking(url, headers, post, fork_cb, &forkdata, &err);
 		if (response == NULL) {
 			int len = strlen(err->message);

logjam-4.5.3-keep-drafts.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 jam.c      |    2 +-
 settings.c |    6 ++++++
 4 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE logjam-4.5.3-keep-drafts.patch ---
diff -up logjam-4.5.3/src/conf.h.keep_drafts logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2009-04-02 13:08:45.000000000 -0400
@@ -62,6 +62,7 @@ typedef struct {
 	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
+	gboolean keepsaveddrafts;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/conf_xml.c.keep_drafts logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2009-04-02 13:08:15.000000000 -0400
@@ -181,6 +181,7 @@ parseoptions(Configuration *c, xmlDocPtr
 #endif
 		READOPTION(revertusejournal)
 		READOPTION(autosave)
+		READOPTION(keepsaveddrafts)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(close_when_send)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 #endif
 	WRITEOPTION(revertusejournal);
 	WRITEOPTION(autosave);
+	WRITEOPTION(keepsaveddrafts);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(close_when_send);
diff -up logjam-4.5.3/src/jam.c.keep_drafts logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2009-04-02 13:06:49.000000000 -0400
@@ -340,7 +340,7 @@ jam_submit_entry(JamWin *jw) {
 	ctx = net_ctx_gtk_new(GTK_WINDOW(jw), NULL);
 	if (jam_host_do_post(jam_account_get_host(acc), ctx, jw->doc, NULL)) {
 		gint type = jam_doc_get_entry_type(jw->doc);
-		if (type == ENTRY_DRAFT) {
+		if (type == ENTRY_DRAFT && !conf.options.keepsaveddrafts) {
 			if (jam_confirm(GTK_WINDOW(jw),
 					_("Delete"), _("Delete this draft from disk?")))
 				delete_draft(jw);
diff -up logjam-4.5.3/src/settings.c.keep_drafts logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2009-04-02 13:06:49.000000000 -0400
@@ -74,6 +74,10 @@ static SettingsWidget settingswidgets[] 
 
 	{ "ui_allowmultipleinstances", &conf.options.allowmultipleinstances,
 		SW_TOGGLE, N_("Allow multiple _instances of LogJam to run simultaneously") },
+	
+	{ "ui_keepsaveddrafts", &conf.options.keepsaveddrafts, 
+		SW_TOGGLE, N_("_Keep saved drafts after posting") },
+	
 #ifdef HAVE_GTKSPELL
 	{ "ui_spellcheck", &conf.options.usespellcheck, 
 		SW_TOGGLE, N_("_Use spell check") },
@@ -409,6 +413,8 @@ uisettings(JamWin *jw) {
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_autosave"), FALSE);
+	
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_keepsaveddrafts"), FALSE);
 
 #ifdef HAVE_GTKSPELL
 	{

logjam-4.5.3-libtool.patch:
 Makefile.am  |    1 +
 configure.in |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE logjam-4.5.3-libtool.patch ---
diff -up logjam-4.5.3/configure.in.libtool logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.libtool	2009-02-16 12:03:43.000000000 -0500
+++ logjam-4.5.3/configure.in	2009-02-16 12:04:00.000000000 -0500
@@ -1,5 +1,6 @@
 AC_PREREQ(2.52)
 AC_INIT(logjam, 4.5.3, evan at livejournal.com)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/jam.c)
diff -up logjam-4.5.3/Makefile.am.libtool logjam-4.5.3/Makefile.am
--- logjam-4.5.3/Makefile.am.libtool	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/Makefile.am	2009-02-16 12:03:44.000000000 -0500
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 if WITH_GTK
 MAYBE_IMAGES = images

logjam-4.5.3-mpris.diff:
 configure.in    |    7 +
 src/Makefile.am |    5 -
 src/conf.h      |    1 
 src/conf_xml.c  |    3 
 src/init.c      |   16 +++
 src/jamview.c   |   10 +-
 src/lj_dbus.c   |  244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lj_dbus.h   |   68 +++++++++++++++
 src/music.c     |    3 
 src/music.h     |    3 
 src/settings.c  |   58 +++++++++++--
 11 files changed, 405 insertions(+), 13 deletions(-)

--- NEW FILE logjam-4.5.3-mpris.diff ---
diff -up logjam-4.5.3/configure.in.dbus logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/configure.in	2009-04-23 00:38:34.000000000 +0300
@@ -220,6 +220,13 @@ AC_SUBST(LIVEJOURNAL_CFLAGS)
 AC_SUBST(LIVEJOURNAL_LIBS)
 dnl end liblivejournal dependencies.
 
+dnl D-Bus API
+MODULES="dbus-1 dbus-glib-1"
+PKG_CHECK_MODULES(DBUSAPI, $MODULES)
+AC_SUBST(DBUSAPI_CFLAGS)
+AC_SUBST(DBUSAPI_LIBS)
+dnl D-Bus API
+
 AM_CONDITIONAL(WITH_XMMS, test "$with_xmms" = "yes")
 AM_CONDITIONAL(WITH_HTML, test "$with_gtkhtml" != "no")
 AM_CONDITIONAL(WITH_RSVG, test "$with_librsvg" = "yes")
diff -up logjam-4.5.3/src/conf.h.dbus logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2009-04-23 22:10:14.000000000 +0300
@@ -92,6 +92,7 @@ typedef struct {
 	char *spawn_command;
 
 	char *music_command;
+	gboolean music_mpris;
 
 	char *proxy;
 	char *proxyuser, *proxypass;
diff -up logjam-4.5.3/src/conf_xml.c.dbus logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.dbus	2009-04-23 22:19:10.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2009-04-24 15:40:45.000000000 +0300
@@ -257,6 +257,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node
 		XML_GET_CONF("proxyauth", parseproxyauth)
 		XML_GET_STR("spawncommand", c->spawn_command)
 		XML_GET_STR("musiccommand", c->music_command)
+		XML_GET_BOOL("musicmpris", c->music_mpris)
 #endif /* G_OS_WIN32 */
 		XML_GET_INT("cfuserinterval", c->cfuserinterval)
 		XML_GET_INT("cfthreshold", c->cfthreshold)
@@ -396,6 +397,8 @@ conf_write(Configuration *c, char *base)
 
 	if (c->music_command)
 		xmlAddTN(root, "musiccommand", c->music_command);
+	if (c->music_mpris)
+		xmlNewChild(root, NULL, BAD_CAST "musicmpris", NULL);
 #endif
 
 	if (c->cfuserinterval) {
diff -up logjam-4.5.3/src/init.c.dbus logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/init.c	2009-04-25 11:56:05.000000000 +0300
@@ -29,6 +29,7 @@
 #include "conf_xml.h"
 #include "jamdoc.h"
 #include "cmdline.h"
+#include "lj_dbus.h"
 
 #ifdef HAVE_GTK
 #include "login.h"
@@ -120,6 +121,9 @@ init_app(int *argc, gchar *argv[]) {
 }
 
 #ifdef HAVE_GTK
+
+extern JamDBus *jdbus;
+
 static void
 run_gtk(JamDoc *doc) {
 	gchar *accelpath;
@@ -148,8 +152,20 @@ run_gtk(JamDoc *doc) {
 		jam_doc_set_account(doc, acc);
 	}
 
+	jdbus = lj_dbus_new();
+	if (conf.music_mpris) {
+		GError *error = NULL;
+		if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+			g_printerr("Error: %s\n", error->message);
+			g_error_free(error);
+		}
+	}
+
 	jam_run(doc);
 
+	lj_dbus_close(jdbus);
+	jdbus = NULL;
+
 	g_object_unref(G_OBJECT(app.remote));
 
 	gtk_accel_map_save(accelpath);
diff -up logjam-4.5.3/src/jamview.c.dbus logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.dbus	2009-04-25 13:39:45.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-25 14:27:56.000000000 +0300
@@ -20,6 +20,7 @@
 #include "marshalers.h"
 #include "datesel.h"
 #include "tags.h"
+#include "lj_dbus.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -356,7 +357,12 @@ picture_store(JamView *view) {
 static void
 music_refresh_cb(JamView *view) {
 	GError *err = NULL;
-	gchar *music = music_detect(&err);
+	gchar *music;
+
+	if (conf.music_mpris)
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	else
+		music = music_detect(&err);
 
 	if (music) {
 		gtk_entry_set_text(GTK_ENTRY(view->music), music);
@@ -373,7 +379,7 @@ static void
 music_add(JamView *view) {
 	view->music = gtk_entry_new();
 	view->musicbar = labelled_box_new_sg(_("_Music:"), view->music, view->sizegroup);
-	if (music_can_detect(NULL)) {
+	if (conf.music_mpris || music_can_detect(NULL)) {
 		GtkWidget *refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 		g_signal_connect_swapped(G_OBJECT(refresh), "clicked",
 				G_CALLBACK(music_refresh_cb), view);
diff -up logjam-4.5.3/src/lj_dbus.c.dbus logjam-4.5.3/src/lj_dbus.c
--- logjam-4.5.3/src/lj_dbus.c.dbus	2009-04-25 13:40:31.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.c	2009-04-25 14:21:30.000000000 +0300
@@ -0,0 +1,244 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ *
+ * See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification
+ */
+
+#include <string.h>		/* memset */
+
+#include "lj_dbus.h"
+
+#define MPRIS_IF	"org.freedesktop.MediaPlayer"
+
+/* Internal prototypes */
+static gboolean lj_dbus_open(JamDBus *jd);
+static gboolean lj_dbus_append_player(JamDBus *jd, gchar *dest);
+static void lj_dbus_players_clear(JamDBus *jd);
+static gboolean lj_dbus_players_find(JamDBus *jd, GError **error);
+
+/* Implementation */
+static gboolean
+lj_dbus_open(JamDBus *jd) {
+	GError *error = NULL;
+
+	jd->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (jd->bus == NULL) {
+		g_printerr("Failed to open connection to bus: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+    }
+	return TRUE;
+}
+
+void lj_dbus_close(JamDBus *jd) {
+	if (jd == NULL)
+		return;
+	lj_dbus_players_clear(jd);
+	dbus_g_connection_unref(jd->bus);
+}
+
+JamDBus *
+lj_dbus_new(void) {
+	JamDBus *jd = (JamDBus *) g_malloc0(sizeof(JamDBus));
+
+	if (lj_dbus_open(jd) == FALSE) {
+		g_free(jd);
+		return NULL;
+	}
+	return jd;
+}
+
+static gboolean
+lj_dbus_append_player(JamDBus *jd, gchar *dest) {
+	MediaPlayer *player;
+	DBusGProxy *proxy;
+	GError *error = NULL;
+	gchar *name;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/", MPRIS_IF);
+
+	if (!dbus_g_proxy_call(proxy, "Identity", &error, G_TYPE_INVALID,
+						   G_TYPE_STRING, &name, G_TYPE_INVALID)) {
+		g_printerr("Error: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	player = (MediaPlayer *) g_malloc0(sizeof(MediaPlayer));
+	player->dest = g_strdup(dest);
+	player->name = g_strdup(name);
+	player->proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/Player", MPRIS_IF);
+
+	if (g_str_has_suffix(dest, "audacious"))
+		player->hint |= MPRIS_HINT_BAD_STATUS;
+
+	jd->player = g_list_append(jd->player, (gpointer) player);
+
+	g_free(name);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+static void
+lj_dbus_players_clear(JamDBus *jd) {
+	GList *list;
+
+	if (jd->player == NULL)
+		return;
+
+	for (list = g_list_first(jd->player); list; list = g_list_next(list)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		g_object_unref(player->proxy);
+		if (player->name)
+			g_free(player->name);
+		if (player->dest)
+			g_free(player->dest);
+	}
+	g_list_free(jd->player);
+	jd->player = NULL;
+}
+
+static gboolean
+lj_dbus_players_find(JamDBus *jd, GError **error) {
+	DBusGProxy *proxy;
+	gchar **names, **p;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+	if (!dbus_g_proxy_call(proxy, "ListNames", error, G_TYPE_INVALID,
+						   G_TYPE_STRV, &names, G_TYPE_INVALID)) {
+		return FALSE;
+	}
+
+	for (p = names; *p; p++) {
+		if (g_str_has_prefix(*p, "org.mpris.")) {
+			lj_dbus_append_player(jd, *p);
+		}
+	}
+
+	g_strfreev(names);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+gboolean
+lj_dbus_mpris_update_list(JamDBus *jd, GError **error) {
+	if (jd == NULL)
+		return FALSE;
+	lj_dbus_players_clear(jd);
+	return lj_dbus_players_find(jd, error);
+}
+
+#define DBUS_TYPE_MPRIS_STATUS \
+	(dbus_g_type_get_struct("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE \
+	(dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+
+/* TODO: Connect to status change signal */
+
+gboolean
+lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error) {
+	GValueArray *array = NULL;
+	GHashTable *info = NULL;
+	GValue *value;
+	MediaPlayer *player;
+
+	if (jd == NULL)
+		return FALSE;
+
+	if (list == NULL)
+		return FALSE;
+
+	if ((player = (MediaPlayer *) list->data) == NULL)
+		return FALSE;
+
+	memset((void *) &player->info, 0, sizeof(MetaInfo));
+
+	if (player->hint & MPRIS_HINT_BAD_STATUS) {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   G_TYPE_INT, &player->info.status, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+	} else {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   DBUS_TYPE_MPRIS_STATUS, &array, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+
+		value = g_value_array_get_nth(array, 0);
+		player->info.status = g_value_get_int(value);
+		g_value_array_free(array);
+	}
+
+	if (player->info.status == MPRIS_STATUS_PLAYING) {
+		if (!dbus_g_proxy_call(player->proxy, "GetMetadata", error, G_TYPE_INVALID,
+							   DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &info, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+		value = (GValue *) g_hash_table_lookup(info, "artist");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.artist, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "album");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.album, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "title");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.title, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+	}
+
+	return TRUE;
+}
+
+GQuark
+lj_dbus_error_quark(void) {
+	static GQuark quark = 0;
+	if (quark == 0)
+		quark = g_quark_from_static_string("dbus-error-quark");
+	return quark;
+}
+
+/* TODO: User defined format */
+
+gchar *
+lj_dbus_mpris_current_music(JamDBus *jd, GError **error) {
+	gchar *music;
+	GList *list;
+
+	if (!lj_dbus_mpris_update_list(jd, error))
+		return NULL;
+
+	list = jd ? jd->player : NULL;
+
+	if (lj_dbus_mpris_update_info(jd, list, error)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		if (player->info.status == MPRIS_STATUS_PLAYING) {
+			music = g_strdup_printf("%s - %s - %s",
+						player->info.artist[0] ? player->info.artist : _("Unknown Artist"),
+						player->info.album[0] ? player->info.album: _("Unknown Album"),
+						player->info.title[0] ? player->info.title: _("Unknown Track"));
+			return music;
+		} else {
+			g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NOT_PLAYING,
+				_("Player is stopped."));
+		}
+	} else if (error == NULL || *error == NULL) {
+		g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NO_PLAYER,
+			_("No players found."));
+	}
+	return NULL;
+}
+
+/* lj_dbus.c */
+
diff -up logjam-4.5.3/src/lj_dbus.h.dbus logjam-4.5.3/src/lj_dbus.h
--- logjam-4.5.3/src/lj_dbus.h.dbus	2009-04-25 13:40:36.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.h	2009-04-25 14:25:27.000000000 +0300
@@ -0,0 +1,68 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef lj_dbus_h
+#define lj_dbus_h
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+/* Take care about i18n strings */
+#ifndef _
+#ifdef GETTEXT_PACKAGE
+#include <glib/gi18n-lib.h>
+#else
+#define _(x)	x
+#endif
+#endif		/* _ */
+
+#define MPRIS_INFO_LEN	128
+
+typedef struct _MetaInfo MetaInfo;
+struct _MetaInfo {
+	gchar artist[MPRIS_INFO_LEN];
+	gchar album[MPRIS_INFO_LEN];
+	gchar title[MPRIS_INFO_LEN];
+
+#define	MPRIS_STATUS_PLAYING	0
+#define	MPRIS_STATUS_PAUSED		1
+#define	MPRIS_STATUS_STOPPED	2
+
+	gint status;
+};
+
+typedef struct _MediaPlayer MediaPlayer;
+struct _MediaPlayer {
+	gchar *name;
+	gchar *dest;
+	DBusGProxy *proxy;
+	MetaInfo info;
+
+#define MPRIS_HINT_BAD_STATUS	1 << 0
+
+	gint hint;
+};
+
+typedef struct _JamDBus JamDBus;
+struct _JamDBus {
+	DBusGConnection *bus;
+	GList *player;
+};
+
+void lj_dbus_close(JamDBus *jd);
+JamDBus *lj_dbus_new(void);
+
+gboolean lj_dbus_mpris_update_list(JamDBus *jd, GError **error);
+gboolean lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error);
+
+#define MPRIS_ERROR_NOT_PLAYING		1
+#define MPRIS_ERROR_NO_PLAYER		2
+
+gchar *lj_dbus_mpris_current_music(JamDBus *jd, GError **error);
+
+#endif /* lj_dbus_h */
+
diff -up logjam-4.5.3/src/Makefile.am.dbus logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.dbus	2009-04-23 00:44:11.000000000 +0300
+++ logjam-4.5.3/src/Makefile.am	2009-04-24 15:59:08.000000000 +0300
@@ -3,7 +3,7 @@ bin_PROGRAMS = logjam
 localedir=$(datadir)/locale
 
 # AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/protocol/blogger -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@ @DBUSAPI_CFLAGS@
 
 ACCOUNT = account.h account.c host.c livejournal.c
 # blogger.c
@@ -50,6 +50,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           settings.c settings.h $(GROUPEDBOX) tie.c tie.h \
           $(HISTORY) $(OFFLINE) \
           jam.c jam.h $(USEJOURNAL) \
+          lj_dbus.c lj_dbus.h \
           security.c security.h about.c thanks.h \
           menu.c menu.h $(TOOLS) smartquotes.c smartquotes.h \
           $(LOGIN) manager.c \
@@ -116,7 +117,7 @@ logjam_SOURCES += journalstore-xml.c
 endif
 
 # logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la $(top_builddir)/protocol/blogger/libblogger.la @LOGJAM_LIBS@ @NETWORK_LIBS@
-logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@
+logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@ @DBUSAPI_LIBS@
 
 ctags:
 	@version=`ctags --version | head -1`; \
diff -up logjam-4.5.3/src/music.c.dbus logjam-4.5.3/src/music.c
--- logjam-4.5.3/src/music.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/music.c	2009-04-25 01:11:29.000000000 +0300
@@ -9,8 +9,11 @@
 #include "gtk-all.h"
 
 #include "conf.h"
+#include "lj_dbus.h"
 #include "music.h"
 
+JamDBus *jdbus = NULL;
+
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
diff -up logjam-4.5.3/src/music.h.dbus logjam-4.5.3/src/music.h
--- logjam-4.5.3/src/music.h.dbus	2005-02-21 20:30:27.000000000 +0200
+++ logjam-4.5.3/src/music.h	2009-04-25 01:05:55.000000000 +0300
@@ -8,6 +8,9 @@
 #define music_h
 
 #include "conf.h" /* CommandList */
+#include "lj_dbus.h"
+
+extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
diff -up logjam-4.5.3/src/settings.c.dbus logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.dbus	2009-04-25 13:41:03.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2009-04-25 15:19:42.000000000 +0300
@@ -24,6 +24,7 @@
 #include "tie.h"
 #include "account.h"
 #include "jamview.h"
+#include "lj_dbus.h"
 
 /* what's this?  all of these funny structures in the settings box?
  * well, instead of creating and tearing down all of these widgets, i
@@ -101,6 +102,8 @@ static SettingsWidget settingswidgets[] 
 
 	{ "music_command", &conf.music_command,
 		SW_COMMAND, N_("Detect music from:"), (gpointer)music_commands },
+	{ "music_mpris", &conf.music_mpris,
+		SW_TOGGLE, N_("Detect music via MPRIS") },
 
 	{ "net_useproxy", &conf.options.useproxy, 
 		SW_TOGGLE, N_("Use _proxy server") },
@@ -169,6 +172,19 @@ toggle_tie_enable(GtkWidget *toggle, Gtk
 }
 
 static void
+toggle_disable_cb(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+}
+static void
+toggle_tie_disable(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+	g_signal_connect(G_OBJECT(toggle), "toggled",
+			G_CALLBACK(toggle_disable_cb), target);
+}
+
+static void
 toggle_tie(SettingsWidget *sw) {
 	tie_toggle(GTK_TOGGLE_BUTTON(sw->widget), (gboolean*)sw->conf);
 }
@@ -499,16 +515,21 @@ static void
 music_diagnose(GtkWidget *button) {
 	GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(button));
 	GError *err = NULL;
-	char *music, *result;
-	MusicSource source = music_current_source();
+	char *music = NULL, *result;
+	MusicSource source = MUSIC_SOURCE_NONE;
 
-	if (!music_can_detect(&err)) {
-		jam_warning(dlg, "%s", err->message);
-		g_error_free(err);
-		return;
+	if (conf.music_mpris) {
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	} else {
+		source = music_current_source();
+		if (!music_can_detect(&err)) {
+			jam_warning(dlg, "%s", err->message);
+			g_error_free(err);
+			return;
+		}
+		music = music_detect(&err);
 	}
 
-	music = music_detect(&err);
 	if (!music) {
 		if (source == MUSIC_SOURCE_XMMS &&
 				err->domain == G_SPAWN_ERROR && err->code == G_SPAWN_ERROR_NOENT) {
@@ -555,21 +576,40 @@ proxysettings(void) {
 	return group;
 }
 
+static void
+mpris_update_cb(GtkToggleButton *button, JamDBus *jd) {
+	GError *error = NULL;
+	if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+		GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+		jam_warning(dlg, _("Error detecting music: %s"), error->message);
+		g_error_free(error);
+	}
+}
+
 static GtkWidget*
 programsettings(JamWin *jw) {
 	GtkWidget *group;
-	GtkWidget *button, *hbox;
+	GtkWidget *button, *vbox, *hbox;
 	SettingsWidget *sw;
 	JamView *jv = jam_win_get_cur_view(jw);
 	
 	group = groupedbox_new_with_text(_("Programs"));
 	groupedbox_pack(GROUPEDBOX(group), sw_make("web_spawn"), FALSE);
 
-	groupedbox_pack(GROUPEDBOX(group), sw_make("music_command"), FALSE);
+	vbox = sw_make("music_command");
+	groupedbox_pack(GROUPEDBOX(group), vbox, FALSE);
 	sw = sw_lookup("music_command");
 	g_signal_connect_swapped(G_OBJECT(sw->widget), "changed",
 			G_CALLBACK(jam_view_settings_changed), jv);
 
+	button = sw_make("music_mpris");
+	groupedbox_pack(GROUPEDBOX(group), button, FALSE);
+	g_signal_connect(G_OBJECT(button), "toggled",
+			G_CALLBACK(mpris_update_cb), jdbus);
+	toggle_tie_disable(button, vbox);
+	g_signal_connect_swapped(G_OBJECT(button), "toggled",
+			G_CALLBACK(jam_view_settings_changed), jv);
+
 	button = gtk_button_new_with_mnemonic(_("_Diagnose"));
 	g_signal_connect(G_OBJECT(button), "clicked",
 			G_CALLBACK(music_diagnose), NULL);

logjam-4.5.3-no_quit_when_docked.patch:
 jam.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE logjam-4.5.3-no_quit_when_docked.patch ---
diff -up logjam-4.5.3/src/jam.c.no_quit_when_docked logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.no_quit_when_docked	2008-07-28 13:55:37.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2008-07-28 14:00:57.000000000 -0400
@@ -757,6 +757,11 @@ jam_quit(JamWin *jw) {
 
 static gboolean
 delete_event_cb(JamWin *jw) {
+#ifdef USE_DOCK
+	if (app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+	else
+#endif
 	jam_quit(jw);
 	return TRUE; /* don't ever let this delete the window; quit will do it. */
 }

logjam-4.5.3-save-tags.diff:
 jamview.c |    3 +-
 tags.c    |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 tags.h    |    2 -
 3 files changed, 73 insertions(+), 6 deletions(-)

--- NEW FILE logjam-4.5.3-save-tags.diff ---
diff -up logjam-4.5.3/src/jamview.c.save logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.save	2009-04-26 10:26:39.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-26 10:28:00.000000000 +0300
@@ -418,7 +424,8 @@ tags_select_cb(JamView *view) {
 
   tags = tags_dialog(toplevel,
 		     JAM_ACCOUNT_LJ(view->account), 
-		     jam_doc_get_usejournal(view->doc));
+		     jam_doc_get_usejournal(view->doc),
+		     (gchar *) gtk_entry_get_text(GTK_ENTRY(view->tags)));
 
   if (tags) {
       gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
diff -up logjam-4.5.3/src/tags.c.save logjam-4.5.3/src/tags.c
--- logjam-4.5.3/src/tags.c.save	2009-04-26 10:05:38.000000000 +0300
+++ logjam-4.5.3/src/tags.c	2009-04-26 15:15:13.000000000 +0300
@@ -78,8 +78,23 @@ create_tag_string (GtkTreeModel *model,
   return FALSE;
 }
 
+static void
+tags_set_fg(GtkTreeViewColumn *column, GtkCellRenderer *cell,
+	    GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+  GSList *prev = (GSList *) data;
+  gchar *text;
+
+  gtk_tree_model_get(model, iter, 1, &text, -1);
+  if (prev && g_slist_find_custom(prev, text, g_utf8_collate))
+    g_object_set(G_OBJECT(cell), "foreground", "Red", NULL);
+  else
+    g_object_set(G_OBJECT(cell), "foreground", "Black", NULL);
+  g_free(text);
+}
+
 GtkWidget* 
-taglist_create (GSList *l)
+taglist_create (GSList *l, GSList **head)
 {
   GtkWidget *treeview;
   GtkListStore *store;
@@ -87,20 +102,37 @@ taglist_create (GSList *l)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   guint i;
+  GSList *prev = *head, *p;
 
   /* create model */
   store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
   for (i = 0; i < g_slist_length (l); i++)
     {
       LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+      gboolean check = FALSE;
 
+      if (prev && (p = g_slist_find_custom(prev, t->tag, g_utf8_collate)) != NULL) {
+        check = TRUE;
+        prev = g_slist_remove_link(prev, p);
+        g_free(p->data);
+        g_slist_free1(p);
+      }
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  0, FALSE,
+			  0, check,
 			  1, t->tag,
 			  -1);
     }
 
+  /* rest of the typed tags */
+  for (p = prev; p; p = g_slist_next(p)) {
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter,
+      		  0, TRUE,
+      		  1, p->data,
+      		  -1);
+  }
+
   /* create treeview */
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
@@ -120,20 +152,44 @@ taglist_create (GSList *l)
   column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
 						     renderer, "text", 1,
 						     NULL);
+
+  gtk_tree_view_column_set_cell_data_func(column, renderer, tags_set_fg,
+					  prev, NULL);
+
   gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (treeview, column);
  
+  /* update head of the prev list */
+  *head = prev;
   g_object_unref (store);
 
   return treeview;
 }
 
+static GSList *
+tags_split(gchar *typed) {
+  GSList *head = NULL;
+  gchar **result, **p;
+
+  if (typed == NULL || *typed == '\0')
+    return NULL;
+
+  for (p = result = g_strsplit(typed, ",", 0); *p; p++) {
+    gchar *token = g_strstrip(*p);
+    if (*token)
+      head = g_slist_prepend(head, g_utf8_strdown(token, -1));
+  }
+  g_strfreev(result);
+  return head;
+}
+
 gchar* 
-tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed)
 {
   GtkWidget *dlg, *sw, *tv;
   GSList *list = NULL;
   gchar *taglist = NULL;
+  GSList *prev;
 
   if (acc == NULL) return NULL;
 
@@ -156,7 +212,8 @@ tags_dialog (GtkWidget *win, JamAccountL
 				  GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
 
-  tv = taglist_create (list);
+  prev = tags_split(typed);
+  tv = taglist_create (list, &prev);
   gtk_container_add (GTK_CONTAINER (sw), tv);
 
   gtk_window_resize(dlg, 60, 210);
@@ -177,5 +234,14 @@ tags_dialog (GtkWidget *win, JamAccountL
 
   gtk_widget_destroy (dlg);
   
+  /* free rest of prev list */
+  if (prev) {
+    GSList *p;
+    for (p = prev; p; p = g_slist_next(p)) {
+      g_free(p->data);
+    }
+    g_slist_free(prev);
+  }
+
   return taglist;
 }
diff -up logjam-4.5.3/src/tags.h.save logjam-4.5.3/src/tags.h
--- logjam-4.5.3/src/tags.h.save	2009-04-26 10:22:25.000000000 +0300
+++ logjam-4.5.3/src/tags.h	2009-04-26 10:22:03.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef _TAGS_H_
 #define _TAGS_H_
 
-gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed);
 
 #endif /* _TAGS_H_ */

logjam-4.5.3-showloginhistory.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 login.c    |    3 +++
 settings.c |    3 +++
 4 files changed, 9 insertions(+)

--- NEW FILE logjam-4.5.3-showloginhistory.patch ---
diff -up logjam-4.5.3/src/conf.h.BAD logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.BAD	2008-07-28 14:20:23.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2008-07-28 14:21:08.000000000 -0400
@@ -59,6 +59,7 @@ typedef struct {
 	gboolean friends_hidestats;
 	gboolean allowmultipleinstances;
 	gboolean smartquotes;
+	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
 #endif /* HAVE_GTK */
diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.BAD	2008-07-28 14:19:17.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2008-07-28 14:20:16.000000000 -0400
@@ -191,6 +191,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(friends_hidestats)
 		READOPTION(allowmultipleinstances)
 		READOPTION(smartquotes)
+		READOPTION(showloginhistory)
 
 		XML_GET_IF("showmeta", parseshowmeta(options, doc, node);)
 
@@ -335,6 +336,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(friends_hidestats);
 	WRITEOPTION(allowmultipleinstances);
 	WRITEOPTION(smartquotes);
+	WRITEOPTION(showloginhistory);
 
 	writeshowmeta(options, node);
 #endif /* HAVE_GTK */
diff -up logjam-4.5.3/src/login.c.BAD logjam-4.5.3/src/login.c
--- logjam-4.5.3/src/login.c.BAD	2008-07-28 14:30:27.000000000 -0400
+++ logjam-4.5.3/src/login.c	2008-07-28 14:30:55.000000000 -0400
@@ -292,6 +292,9 @@ login_check_lastupdate(GtkWindow *parent
 	gboolean ret = TRUE;
 	JamAccount *acc = JAM_ACCOUNT(acclj);
 
+	if (!conf.options.showloginhistory)
+		return TRUE;
+
 	deltat = time(NULL) - acclj->lastupdate;
 	if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */
 		return TRUE;
diff -up logjam-4.5.3/src/settings.c.BAD logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.BAD	2008-07-28 14:21:36.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2008-07-28 14:24:59.000000000 -0400
@@ -80,6 +80,8 @@ static SettingsWidget settingswidgets[] 
 	{ "ui_spell_language", &conf.spell_language,
 		SW_TEXT, N_("Entry _language:") },
 #endif
+	{ "ui_showloginhistory", &conf.options.showloginhistory,
+		SW_TOGGLE, N_("Show login history (number of days since last login)") },
 	{ "ui_smartquotes", &conf.options.smartquotes,
 		SW_TOGGLE, N_("Automatically change _quotes to matching pairs") },
 	{ "ui_font", &conf.uifont,
@@ -430,6 +432,7 @@ uisettings(JamWin *jw) {
 	}
 #endif
 
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_showloginhistory"), TRUE);
 	groupedbox_pack(GROUPEDBOX(entry),
 			sw_make("ui_smartquotes"), FALSE);
 	

logjam-4.5.3-start_in_dock.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 jam.c      |    8 ++++++--
 settings.c |    3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE logjam-4.5.3-start_in_dock.patch ---
Allow start logjam in system tray (no main window at start).

diff -up logjam-4.5.3/src/conf_xml.c.orig logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.orig	2008-05-11 14:35:48.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2008-05-11 14:55:24.000000000 +0300
@@ -184,6 +184,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(docklet)
+		READOPTION(start_in_dock)
 		READOPTION(cffloat)
 		READOPTION(cffloatraise)
 		READOPTION(friends_hidestats)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(docklet);
+	WRITEOPTION(start_in_dock);
 	WRITEOPTION(cffloatraise);
 	WRITEOPTION(cffloat);
 	WRITEOPTION(friends_hidestats);
diff -up logjam-4.5.3/src/jam.c.orig logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.orig	2005-09-10 04:45:01.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-11 14:56:59.000000000 +0300
@@ -832,8 +845,6 @@
 	gtk_widget_show(vbox);
 	jam_update_actions(jw);
 
-	gtk_widget_show(GTK_WIDGET(jw));
-
 	/* suck a bunch of events in. */
 	while (gtk_events_pending())
 		gtk_main_iteration();
@@ -853,7 +864,13 @@
 #ifdef USE_DOCK
 	if (conf.options.docklet)
 		docklet_setup(GTK_WINDOW(jw));
+
+	if (app.docklet) {
+		if (!conf.options.start_in_dock)
+			gtk_widget_show(GTK_WIDGET(jw));
+	} else
 #endif
+	gtk_widget_show(GTK_WIDGET(jw));
 
 	draftentry = jam_load_autosave(jw);
 	if (draftentry) {
diff -up logjam-4.5.3/src/conf.h.orig logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.orig	2005-02-21 19:46:10.000000000 +0200
+++ logjam-4.5.3/src/conf.h	2008-05-11 14:54:16.000000000 +0300
@@ -59,6 +59,7 @@ typedef struct {
 	gboolean allowmultipleinstances;
 	gboolean smartquotes;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
+	gboolean start_in_dock;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/settings.c.orig logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.orig	2005-02-21 20:31:21.000000000 +0200
+++ logjam-4.5.3/src/settings.c	2008-05-11 14:59:13.000000000 +0300
@@ -87,6 +87,8 @@ static SettingsWidget settingswidgets[] 
 #ifndef G_OS_WIN32
 	{ "ui_docklet", &conf.options.docklet,
 		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },
+	{ "ui_start_in_dock", &conf.options.start_in_dock,
+		SW_TOGGLE, N_("Start in system tray") },
 #endif
 
 #ifndef G_OS_WIN32
@@ -460,6 +468,7 @@ uisettings(JamWin *jw) {
 	g_signal_connect(G_OBJECT(button), "toggled",
 			G_CALLBACK(docklet_change_cb), jw);
 	groupedbox_pack(GROUPEDBOX(misc), button, FALSE);
+	groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE);
 #endif /* USE_DOCK */
 
 	return vbox;

logjam-4.5.3-tags.patch:
 protocol/liblivejournal/livejournal/Makefile.am   |    3 
 protocol/liblivejournal/livejournal/gettags.c     |   65 +++++++
 protocol/liblivejournal/livejournal/gettags.h     |   16 +
 protocol/liblivejournal/livejournal/livejournal.h |    1 
 protocol/liblivejournal/livejournal/tags.h        |   18 ++
 protocol/liblivejournal/livejournal/types.c       |   13 +
 src/Makefile.am                                   |    1 
 src/jamview.c                                     |   24 ++
 src/tags.c                                        |  181 ++++++++++++++++++++++
 src/tags.h                                        |    6 
 10 files changed, 327 insertions(+), 1 deletion(-)

--- NEW FILE logjam-4.5.3-tags.patch ---
diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,18 @@
+/* liblivejournal - a client library for LiveJournal.
+ * Copyright (C) 2003 Evan Martin <evan at livejournal.com>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef __LIVEJOURNAL_TAGS_H__
+#define __LIVEJOURNAL_TAGS_H__
+
+typedef struct _LJTag {
+	char *tag;
+	guint32 count;
+} LJTag;
+
+LJTag *lj_tag_new(void);
+void   lj_tag_free(LJTag *t);
+
+#endif /* __LIVEJOURNAL_TAGS_H__ */
diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c
--- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags	2005-10-23 21:29:32.000000000 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c	2008-03-11 17:53:46.000000000 -0400
@@ -14,6 +14,7 @@
 
 #include "entry.h"
 #include "friends.h"
+#include "tags.h"
 #include "types.h"
 
 char*
@@ -75,6 +76,18 @@ lj_friend_compare_username(gconstpointer
 	return strcmp(fa->username, fb->username);
 }
 
+LJTag*
+lj_tag_new(void) {
+    LJTag *t = g_new0(LJTag, 1);
+    return t;
+}
+
+void
+lj_tag_free(LJTag *t) {
+   g_free(t->tag);
+   g_free(t);
+}
+
 void 
 lj_security_append_to_request(LJSecurity *security, LJRequest *request) {
 	char *text = NULL;
diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am
--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags	2005-08-24 22:42:14.000000000 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am	2008-03-11 17:53:46.000000000 -0400
@@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
 liblivejournal_la_SOURCES = \
 	md5.c              md5.h            \
 	protocol.c         protocol.h       \
-	friends.h                           \
+	friends.h          tags.h           \    
 	serveruser.c       serveruser.h     \
 	entry.c            entry.h          \
 	types.c            types.h          \
@@ -21,6 +21,7 @@ liblivejournal_la_SOURCES = \
 	getchallenge.c     getchallenge.h   \
 	getevents.c        getevents.h      \
 	getfriends.c       getfriends.h     \
+	gettags.c          gettags.h        \
 	syncitems.c        syncitems.h      \
 	sync.c             sync.h           \
 	livejournal.h
diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h
--- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h	2008-03-11 17:53:46.000000000 -0400
@@ -16,5 +16,6 @@
 #include <livejournal/serveruser.h>
 #include <livejournal/friends.h>
 #include <livejournal/entry.h>
+#include <livejournal/tags.h>
 
 #endif /* __LIVEJOURNAL_H__ */
diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,16 @@
+
+#ifndef __LIVEJOURNAL_GETTAGS_H__
+#define __LIVEJOURNAL_GETTAGS_H__
+
+#include <livejournal/verb.h>
+
+typedef struct {
+	LJVerb verb;
+	GHashTable *tags;
+} LJGetTags;
+
+LJGetTags* lj_gettags_new(LJUser *user, const gchar *journal);
+void       lj_gettags_free(LJGetTags *gettags, gboolean includetags);
+
+#endif /* __LIVEJOURNAL_GETTAGS_H__ */
+
diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,65 @@
+
+#include <config.h>
+
+#include <glib.h>
+
+#include "tags.h"
+#include "gettags.h"
+
+static void
+read_tags(LJResult *result, GHashTable *tags) {
+	LJTag *t;
+	int i, count;
+	guint32 mask;
+	char *value;
+
+	count = lj_result_get_int(result, "tag_count");
+	for (i = 1; i <= count; i++) {
+		t = lj_tag_new();
+		t->tag = g_strdup(lj_result_getf(result, "tag_%d_name", i));
+
+        value = lj_result_getf(result, "tag_%d_uses", i);
+		if (value) t->count = lj_color_to_int(value);
+
+		g_hash_table_insert(tags, t->tag, t);
+	}
+}
+
+static void
+parse_result(LJVerb *verb) {
+	GHashTable *tags;
+	
+	tags = g_hash_table_new(g_str_hash, g_str_equal);
+
+	read_tags(verb->result, tags);
+	((LJGetTags*)verb)->tags = tags;
+}
+
+LJGetTags*
+lj_gettags_new(LJUser *user, const gchar *journal) {
+	LJGetTags *gettags = g_new0(LJGetTags, 1);
+	LJVerb *verb = (LJVerb*)gettags;
+
+	lj_verb_init(verb, user, "getusertags", FALSE, parse_result);
+    if (journal)
+	    lj_request_add(verb->request, "usejournal", journal);
+
+	return gettags;
+}
+
+static void
+hash_tag_free_cb(gpointer key, LJTag *t, gpointer data) {
+	lj_tag_free(t);
+}
+
+void
+lj_gettags_free(LJGetTags *gettags, gboolean includetags) {
+	if (gettags->tags) {
+		if (includetags)
+			g_hash_table_foreach(gettags->tags,
+					(GHFunc)hash_tag_free_cb, NULL);
+		g_hash_table_destroy(gettags->tags);
+	}
+	g_free(gettags);
+}
+
diff -up /dev/null logjam-4.5.3/src/tags.c
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/src/tags.c	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,181 @@
+
+#include "gtk-all.h"
+
+#include <livejournal/livejournal.h>
+#include <livejournal/gettags.h>
+
+#include "account.h"
+#include "tags.h"
+
+static void
+tags_hash_list_cb (gpointer key, LJTag *t, GSList **list) 
+{
+  *list = g_slist_append(*list, t);
+}
+
+static gboolean
+load_tags (GtkWindow *parent, JamAccountLJ *acc, gchar *journal, GSList **l) 
+{
+  LJGetTags *gettags;
+  NetContext *ctx;
+  
+  ctx = net_ctx_gtk_new (parent, _("Loading Tags"));
+  gettags = lj_gettags_new (jam_account_lj_get_user (acc), journal);
+  if (!net_run_verb_ctx ((LJVerb*) gettags, ctx, NULL)) 
+    { 
+      lj_gettags_free (gettags, TRUE);
+      net_ctx_gtk_free (ctx);
+      return FALSE;
+    }
+  
+  g_hash_table_foreach (gettags->tags, (GHFunc) tags_hash_list_cb, l);
+  
+  lj_gettags_free (gettags, FALSE);
+  net_ctx_gtk_free (ctx);
+  
+  return TRUE;
+}
+
+static void
+tag_toggled (GtkCellRendererToggle *cell,
+	     gchar                 *path_str,
+	     gpointer               data)
+{
+  GtkTreeModel *model = (GtkTreeModel *)data;
+  GtkTreeIter  iter;
+  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
+  gboolean tag;
+
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get (model, &iter, 0, &tag, -1);
+
+  tag ^= 1;
+
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, tag, -1);
+
+  gtk_tree_path_free (path);
+}
+
+gboolean
+create_tag_string (GtkTreeModel *model,
+		   GtkTreePath  *path,
+		   GtkTreeIter  *iter,
+		   gpointer     data)
+{
+  gchar *tag;
+  gboolean is_sel;
+  gchar **tagstr = (gchar **) data;
+    
+  gtk_tree_model_get (model, iter, 0, &is_sel, -1);
+  if (is_sel)
+    {
+      gchar *buf = *tagstr;
+      gtk_tree_model_get (model, iter, 1, &tag, -1);
+      *tagstr = g_strconcat (buf, tag, ", ", NULL);
+      g_free (buf);
+    }
+
+  return FALSE;
+}
+
+GtkWidget* 
+taglist_create (GSList *l)
+{
+  GtkWidget *treeview;
+  GtkListStore *store;
+  GtkTreeIter iter;
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
+  guint i;
+
+  /* create model */
+  store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
+  for (i = 0; i < g_slist_length (l); i++)
+    {
+      LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter,
+			  0, FALSE,
+			  1, t->tag,
+			  -1);
+    }
+
+  /* create treeview */
+  treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), 1);
+
+  /* add columns */
+  renderer = gtk_cell_renderer_toggle_new ();
+  g_signal_connect (renderer, "toggled",
+		    G_CALLBACK (tag_toggled), 
+		    GTK_TREE_MODEL (store));
+  column = gtk_tree_view_column_new_with_attributes ("#", 
+						     renderer, "active", 0,
+						     NULL);
+  gtk_tree_view_append_column (treeview, column);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
+						     renderer, "text", 1,
+						     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, 1);
+  gtk_tree_view_append_column (treeview, column);
+ 
+  g_object_unref (store);
+
+  return treeview;
+}
+
+gchar* 
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+{
+  GtkWidget *dlg, *sw, *tv;
+  GSList *list = NULL;
+  gchar *taglist = NULL;
+
+  if (acc == NULL) return NULL;
+
+  load_tags (GTK_WINDOW (win), acc, journal, &list);
+  
+  dlg = gtk_dialog_new_with_buttons (_("Select tags"),
+                                     GTK_WINDOW (win),
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_STOCK_OK,
+                                     GTK_RESPONSE_OK,
+                                     GTK_STOCK_CLOSE,
+                                     GTK_RESPONSE_CLOSE,
+                                     NULL);
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+				       GTK_SHADOW_ETCHED_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+				  GTK_POLICY_AUTOMATIC,
+				  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
+
+  tv = taglist_create (list);
+  gtk_container_add (GTK_CONTAINER (sw), tv);
+
+  gtk_window_resize(dlg, 60, 210);
+  gtk_widget_show_all (sw);
+
+  if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK)
+    {
+      taglist = g_strdup ("");
+      gtk_tree_model_foreach (gtk_tree_view_get_model (tv),
+			      create_tag_string,
+			      &taglist);
+      if (g_ascii_strcasecmp (taglist, "") == 0) 
+	{
+	  g_free (taglist);
+	  taglist = NULL;
+	}
+    }  
+
+  gtk_widget_destroy (dlg);
+  
+  return taglist;
+}
diff -up /dev/null logjam-4.5.3/src/tags.h
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/src/tags.h	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _TAGS_H_
+#define _TAGS_H_
+
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+
+#endif /* _TAGS_H_ */
diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.tags	2005-10-23 21:16:08.000000000 -0400
+++ logjam-4.5.3/src/Makefile.am	2008-03-11 17:53:46.000000000 -0400
@@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           undo.c undo.h \
           userlabel.c userlabel.h \
           get_cmd_out.c get_cmd_out.h \
+          tags.c tags.h \
           $(HTML_MARKUP)
 
 src_preview = $(PREVIEW)
diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.tags	2008-03-11 17:53:46.000000000 -0400
+++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400
@@ -19,6 +19,7 @@
 #include "security.h"
 #include "marshalers.h"
 #include "datesel.h"
+#include "tags.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -408,11 +409,34 @@ music_store(JamView *view) {
 	jam_doc_set_music(view->doc, music);
 }
 
+static void tags_store(JamView *view);
+
+static void
+tags_select_cb(JamView *view) {
+  gchar *tags;
+  GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
+
+  tags = tags_dialog(toplevel,
+		     JAM_ACCOUNT_LJ(view->account), 
+		     jam_doc_get_usejournal(view->doc));
+
+  if (tags) {
+      gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
+      tags_store(view);
+  }
+}
+
 static void
 tags_add(JamView *view) {
+	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
 	view->tagsbar = labelled_box_new_sg(_("_Tags:"), view->tags, view->sizegroup);
 	gtk_box_pack_start(GTK_BOX(view), view->tagsbar, FALSE, FALSE, 0);
+	tagbutton = gtk_button_new_with_label("...");
+	g_signal_connect_swapped(G_OBJECT(tagbutton), "clicked",
+				 G_CALLBACK(tags_select_cb), view);
+	gtk_box_pack_start(GTK_BOX(view->tagsbar),
+			   tagbutton, FALSE, FALSE, 0);
 	gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1);
 	gtk_widget_show_all(view->tagsbar);
 }



From spot at fedoraproject.org  Mon Aug 24 16:32:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:32:21 +0000 (UTC)
Subject: rpms/logjam/EL-4 logjam-4.5.3-close_when_send.patch, NONE,
	1.1 logjam-4.5.3-disable-threads.patch, NONE,
	1.1 logjam-4.5.3-keep-drafts.patch, NONE,
	1.1 logjam-4.5.3-libtool.patch, NONE,
	1.1 logjam-4.5.3-mpris.diff, NONE,
	1.1 logjam-4.5.3-no_quit_when_docked.patch, NONE,
	1.1 logjam-4.5.3-save-tags.diff, NONE,
	1.1 logjam-4.5.3-showloginhistory.patch, NONE,
	1.1 logjam-4.5.3-start_in_dock.patch, NONE,
	1.1 logjam-4.5.3-tags.patch, NONE, 1.1
Message-ID: <20090824163221.9B51811C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3170/EL-4

Added Files:
	logjam-4.5.3-close_when_send.patch 
	logjam-4.5.3-disable-threads.patch 
	logjam-4.5.3-keep-drafts.patch logjam-4.5.3-libtool.patch 
	logjam-4.5.3-mpris.diff logjam-4.5.3-no_quit_when_docked.patch 
	logjam-4.5.3-save-tags.diff 
	logjam-4.5.3-showloginhistory.patch 
	logjam-4.5.3-start_in_dock.patch logjam-4.5.3-tags.patch 
Log Message:
get logjam working again

logjam-4.5.3-close_when_send.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 jam.c      |    8 ++++++++
 settings.c |    6 ++++++
 4 files changed, 17 insertions(+)

--- NEW FILE logjam-4.5.3-close_when_send.patch ---
diff -up logjam-4.5.3/src/jam.c.close-when-send logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-18 10:31:30.000000000 +0300
@@ -363,6 +363,10 @@ action_cb(GtkWidget *w, JamWin *jw) {
 	} else {
 		g_warning("action callback, but no default action?\n");
 	}
+#ifdef USE_DOCK
+	if (conf.options.close_when_send && app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+#endif
 }
 
 static void
@@ -395,6 +399,10 @@ delete_cb(GtkWidget *w, JamWin *jw) {
 	} else {
 		delete_server_entry(jw);
 	}
+#ifdef USE_DOCK
+	if (conf.options.close_when_send && app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+#endif
 }
 
 static void
diff -up logjam-4.5.3/src/conf_xml.c.close-when-send logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2008-05-18 09:49:33.000000000 +0300
@@ -183,6 +183,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(autosave)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
+		READOPTION(close_when_send)
 		READOPTION(docklet)
 		READOPTION(start_in_dock)
 		READOPTION(cffloat)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(autosave);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
+	WRITEOPTION(close_when_send);
 	WRITEOPTION(docklet);
 	WRITEOPTION(start_in_dock);
 	WRITEOPTION(cffloatraise);
diff -up logjam-4.5.3/src/settings.c.close-when-send logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2008-05-18 09:56:35.000000000 +0300
@@ -85,6 +85,8 @@ static SettingsWidget settingswidgets[] 
 	{ "ui_font", &conf.uifont,
 		SW_CUSTOM, N_("Entry display font:") },
 #ifndef G_OS_WIN32
+	{ "ui_close_when_send", &conf.options.close_when_send,
+		SW_TOGGLE, N_("Close main window after sending") },
 	{ "ui_docklet", &conf.options.docklet,
 		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },
 	{ "ui_start_in_dock", &conf.options.start_in_dock,
@@ -397,6 +399,10 @@ uisettings(JamWin *jw) {
 			G_CALLBACK(sec_changed_cb), sw);
 	groupedbox_pack(GROUPEDBOX(post), sw_make("ui_defaultsecurity"), FALSE);
 
+#ifdef USE_DOCK
+	groupedbox_pack(GROUPEDBOX(post), sw_make("ui_close_when_send"), FALSE);
+#endif /* USE_DOCK */
+
 	entry = groupedbox_new_with_text(_("Entries"));
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
diff -up logjam-4.5.3/src/conf.h.close-when-send logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2008-05-18 09:52:36.000000000 +0300
@@ -51,6 +51,7 @@ typedef struct {
 	gboolean autosave;
 	gboolean cfautostart;
 	gboolean cfusemask;
+	gboolean close_when_send;
 	gboolean docklet;
 	gboolean cffloat;
 	gboolean cffloatraise;

logjam-4.5.3-disable-threads.patch:
 history.c      |    4 ++++
 init.c         |    4 ++--
 network-fork.c |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE logjam-4.5.3-disable-threads.patch ---
diff -up logjam-4.5.3/src/init.c.BAD logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.BAD	2008-03-11 14:48:18.000000000 -0400
+++ logjam-4.5.3/src/init.c	2008-03-11 14:49:35.000000000 -0400
@@ -177,13 +177,13 @@ setup_locales() {
 
 static void
 setup_glibgdk() {
-#ifdef HAVE_GTK
+#if defined (HAVE_GTK) && defined (G_OS_WIN32)
 	/* calls to these thread inits must happen before any other
 	 * g* calls. */
 	if (!g_thread_supported()) g_thread_init(NULL);
 	gdk_threads_init();
 	gdk_threads_enter();
-#endif /* HAVE_GTK */
+#endif /* HAVE_GTK && G_OS_WIN32 */
 
 	g_type_init();
 
diff -up logjam-4.5.3/src/history.c.BAD logjam-4.5.3/src/history.c
--- logjam-4.5.3/src/history.c.BAD	2008-03-18 16:02:18.000000000 -0400
+++ logjam-4.5.3/src/history.c	2008-03-18 16:02:36.000000000 -0400
@@ -368,9 +368,13 @@ hc_show_current(history_calendar_dlg *hc
 
 static gint
 hc_list_click_idle_cb(gpointer d) {
+#if defined (G_OS_WIN32)
 	gdk_threads_enter();
+#endif
 	hc_show_current(d);
+#if defined (G_OS_WIN32)
 	gdk_threads_leave();
+#endif
 	return FALSE;
 }
 	
diff -up logjam-4.5.3/src/network-fork.c.hack logjam-4.5.3/src/network-fork.c
--- logjam-4.5.3/src/network-fork.c.hack	2008-03-18 16:31:40.000000000 -0400
+++ logjam-4.5.3/src/network-fork.c	2008-03-18 16:32:06.000000000 -0400
@@ -171,6 +171,7 @@ net_post_mainloop(const char *url, GSLis
 		GString *response;
 		GError *err = NULL;
 
+        	if (!g_thread_supported ()) g_thread_init (NULL);
 		response = net_post_blocking(url, headers, post, fork_cb, &forkdata, &err);
 		if (response == NULL) {
 			int len = strlen(err->message);

logjam-4.5.3-keep-drafts.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 jam.c      |    2 +-
 settings.c |    6 ++++++
 4 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE logjam-4.5.3-keep-drafts.patch ---
diff -up logjam-4.5.3/src/conf.h.keep_drafts logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2009-04-02 13:08:45.000000000 -0400
@@ -62,6 +62,7 @@ typedef struct {
 	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
+	gboolean keepsaveddrafts;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/conf_xml.c.keep_drafts logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2009-04-02 13:08:15.000000000 -0400
@@ -181,6 +181,7 @@ parseoptions(Configuration *c, xmlDocPtr
 #endif
 		READOPTION(revertusejournal)
 		READOPTION(autosave)
+		READOPTION(keepsaveddrafts)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(close_when_send)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 #endif
 	WRITEOPTION(revertusejournal);
 	WRITEOPTION(autosave);
+	WRITEOPTION(keepsaveddrafts);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(close_when_send);
diff -up logjam-4.5.3/src/jam.c.keep_drafts logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2009-04-02 13:06:49.000000000 -0400
@@ -340,7 +340,7 @@ jam_submit_entry(JamWin *jw) {
 	ctx = net_ctx_gtk_new(GTK_WINDOW(jw), NULL);
 	if (jam_host_do_post(jam_account_get_host(acc), ctx, jw->doc, NULL)) {
 		gint type = jam_doc_get_entry_type(jw->doc);
-		if (type == ENTRY_DRAFT) {
+		if (type == ENTRY_DRAFT && !conf.options.keepsaveddrafts) {
 			if (jam_confirm(GTK_WINDOW(jw),
 					_("Delete"), _("Delete this draft from disk?")))
 				delete_draft(jw);
diff -up logjam-4.5.3/src/settings.c.keep_drafts logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.keep_drafts	2009-04-02 13:06:49.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2009-04-02 13:06:49.000000000 -0400
@@ -74,6 +74,10 @@ static SettingsWidget settingswidgets[] 
 
 	{ "ui_allowmultipleinstances", &conf.options.allowmultipleinstances,
 		SW_TOGGLE, N_("Allow multiple _instances of LogJam to run simultaneously") },
+	
+	{ "ui_keepsaveddrafts", &conf.options.keepsaveddrafts, 
+		SW_TOGGLE, N_("_Keep saved drafts after posting") },
+	
 #ifdef HAVE_GTKSPELL
 	{ "ui_spellcheck", &conf.options.usespellcheck, 
 		SW_TOGGLE, N_("_Use spell check") },
@@ -409,6 +413,8 @@ uisettings(JamWin *jw) {
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_autosave"), FALSE);
+	
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_keepsaveddrafts"), FALSE);
 
 #ifdef HAVE_GTKSPELL
 	{

logjam-4.5.3-libtool.patch:
 Makefile.am  |    1 +
 configure.in |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE logjam-4.5.3-libtool.patch ---
diff -up logjam-4.5.3/configure.in.libtool logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.libtool	2009-02-16 12:03:43.000000000 -0500
+++ logjam-4.5.3/configure.in	2009-02-16 12:04:00.000000000 -0500
@@ -1,5 +1,6 @@
 AC_PREREQ(2.52)
 AC_INIT(logjam, 4.5.3, evan at livejournal.com)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/jam.c)
diff -up logjam-4.5.3/Makefile.am.libtool logjam-4.5.3/Makefile.am
--- logjam-4.5.3/Makefile.am.libtool	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/Makefile.am	2009-02-16 12:03:44.000000000 -0500
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 if WITH_GTK
 MAYBE_IMAGES = images

logjam-4.5.3-mpris.diff:
 configure.in    |    7 +
 src/Makefile.am |    5 -
 src/conf.h      |    1 
 src/conf_xml.c  |    3 
 src/init.c      |   16 +++
 src/jamview.c   |   10 +-
 src/lj_dbus.c   |  244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lj_dbus.h   |   68 +++++++++++++++
 src/music.c     |    3 
 src/music.h     |    3 
 src/settings.c  |   58 +++++++++++--
 11 files changed, 405 insertions(+), 13 deletions(-)

--- NEW FILE logjam-4.5.3-mpris.diff ---
diff -up logjam-4.5.3/configure.in.dbus logjam-4.5.3/configure.in
--- logjam-4.5.3/configure.in.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/configure.in	2009-04-23 00:38:34.000000000 +0300
@@ -220,6 +220,13 @@ AC_SUBST(LIVEJOURNAL_CFLAGS)
 AC_SUBST(LIVEJOURNAL_LIBS)
 dnl end liblivejournal dependencies.
 
+dnl D-Bus API
+MODULES="dbus-1 dbus-glib-1"
+PKG_CHECK_MODULES(DBUSAPI, $MODULES)
+AC_SUBST(DBUSAPI_CFLAGS)
+AC_SUBST(DBUSAPI_LIBS)
+dnl D-Bus API
+
 AM_CONDITIONAL(WITH_XMMS, test "$with_xmms" = "yes")
 AM_CONDITIONAL(WITH_HTML, test "$with_gtkhtml" != "no")
 AM_CONDITIONAL(WITH_RSVG, test "$with_librsvg" = "yes")
diff -up logjam-4.5.3/src/conf.h.dbus logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2009-04-23 22:10:14.000000000 +0300
@@ -92,6 +92,7 @@ typedef struct {
 	char *spawn_command;
 
 	char *music_command;
+	gboolean music_mpris;
 
 	char *proxy;
 	char *proxyuser, *proxypass;
diff -up logjam-4.5.3/src/conf_xml.c.dbus logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.dbus	2009-04-23 22:19:10.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2009-04-24 15:40:45.000000000 +0300
@@ -257,6 +257,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node
 		XML_GET_CONF("proxyauth", parseproxyauth)
 		XML_GET_STR("spawncommand", c->spawn_command)
 		XML_GET_STR("musiccommand", c->music_command)
+		XML_GET_BOOL("musicmpris", c->music_mpris)
 #endif /* G_OS_WIN32 */
 		XML_GET_INT("cfuserinterval", c->cfuserinterval)
 		XML_GET_INT("cfthreshold", c->cfthreshold)
@@ -396,6 +397,8 @@ conf_write(Configuration *c, char *base)
 
 	if (c->music_command)
 		xmlAddTN(root, "musiccommand", c->music_command);
+	if (c->music_mpris)
+		xmlNewChild(root, NULL, BAD_CAST "musicmpris", NULL);
 #endif
 
 	if (c->cfuserinterval) {
diff -up logjam-4.5.3/src/init.c.dbus logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/init.c	2009-04-25 11:56:05.000000000 +0300
@@ -29,6 +29,7 @@
 #include "conf_xml.h"
 #include "jamdoc.h"
 #include "cmdline.h"
+#include "lj_dbus.h"
 
 #ifdef HAVE_GTK
 #include "login.h"
@@ -120,6 +121,9 @@ init_app(int *argc, gchar *argv[]) {
 }
 
 #ifdef HAVE_GTK
+
+extern JamDBus *jdbus;
+
 static void
 run_gtk(JamDoc *doc) {
 	gchar *accelpath;
@@ -148,8 +152,20 @@ run_gtk(JamDoc *doc) {
 		jam_doc_set_account(doc, acc);
 	}
 
+	jdbus = lj_dbus_new();
+	if (conf.music_mpris) {
+		GError *error = NULL;
+		if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+			g_printerr("Error: %s\n", error->message);
+			g_error_free(error);
+		}
+	}
+
 	jam_run(doc);
 
+	lj_dbus_close(jdbus);
+	jdbus = NULL;
+
 	g_object_unref(G_OBJECT(app.remote));
 
 	gtk_accel_map_save(accelpath);
diff -up logjam-4.5.3/src/jamview.c.dbus logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.dbus	2009-04-25 13:39:45.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-25 14:27:56.000000000 +0300
@@ -20,6 +20,7 @@
 #include "marshalers.h"
 #include "datesel.h"
 #include "tags.h"
+#include "lj_dbus.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -356,7 +357,12 @@ picture_store(JamView *view) {
 static void
 music_refresh_cb(JamView *view) {
 	GError *err = NULL;
-	gchar *music = music_detect(&err);
+	gchar *music;
+
+	if (conf.music_mpris)
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	else
+		music = music_detect(&err);
 
 	if (music) {
 		gtk_entry_set_text(GTK_ENTRY(view->music), music);
@@ -373,7 +379,7 @@ static void
 music_add(JamView *view) {
 	view->music = gtk_entry_new();
 	view->musicbar = labelled_box_new_sg(_("_Music:"), view->music, view->sizegroup);
-	if (music_can_detect(NULL)) {
+	if (conf.music_mpris || music_can_detect(NULL)) {
 		GtkWidget *refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 		g_signal_connect_swapped(G_OBJECT(refresh), "clicked",
 				G_CALLBACK(music_refresh_cb), view);
diff -up logjam-4.5.3/src/lj_dbus.c.dbus logjam-4.5.3/src/lj_dbus.c
--- logjam-4.5.3/src/lj_dbus.c.dbus	2009-04-25 13:40:31.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.c	2009-04-25 14:21:30.000000000 +0300
@@ -0,0 +1,244 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ *
+ * See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification
+ */
+
+#include <string.h>		/* memset */
+
+#include "lj_dbus.h"
+
+#define MPRIS_IF	"org.freedesktop.MediaPlayer"
+
+/* Internal prototypes */
+static gboolean lj_dbus_open(JamDBus *jd);
+static gboolean lj_dbus_append_player(JamDBus *jd, gchar *dest);
+static void lj_dbus_players_clear(JamDBus *jd);
+static gboolean lj_dbus_players_find(JamDBus *jd, GError **error);
+
+/* Implementation */
+static gboolean
+lj_dbus_open(JamDBus *jd) {
+	GError *error = NULL;
+
+	jd->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (jd->bus == NULL) {
+		g_printerr("Failed to open connection to bus: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+    }
+	return TRUE;
+}
+
+void lj_dbus_close(JamDBus *jd) {
+	if (jd == NULL)
+		return;
+	lj_dbus_players_clear(jd);
+	dbus_g_connection_unref(jd->bus);
+}
+
+JamDBus *
+lj_dbus_new(void) {
+	JamDBus *jd = (JamDBus *) g_malloc0(sizeof(JamDBus));
+
+	if (lj_dbus_open(jd) == FALSE) {
+		g_free(jd);
+		return NULL;
+	}
+	return jd;
+}
+
+static gboolean
+lj_dbus_append_player(JamDBus *jd, gchar *dest) {
+	MediaPlayer *player;
+	DBusGProxy *proxy;
+	GError *error = NULL;
+	gchar *name;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/", MPRIS_IF);
+
+	if (!dbus_g_proxy_call(proxy, "Identity", &error, G_TYPE_INVALID,
+						   G_TYPE_STRING, &name, G_TYPE_INVALID)) {
+		g_printerr("Error: %s\n", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	player = (MediaPlayer *) g_malloc0(sizeof(MediaPlayer));
+	player->dest = g_strdup(dest);
+	player->name = g_strdup(name);
+	player->proxy = dbus_g_proxy_new_for_name(jd->bus, dest, "/Player", MPRIS_IF);
+
+	if (g_str_has_suffix(dest, "audacious"))
+		player->hint |= MPRIS_HINT_BAD_STATUS;
+
+	jd->player = g_list_append(jd->player, (gpointer) player);
+
+	g_free(name);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+static void
+lj_dbus_players_clear(JamDBus *jd) {
+	GList *list;
+
+	if (jd->player == NULL)
+		return;
+
+	for (list = g_list_first(jd->player); list; list = g_list_next(list)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		g_object_unref(player->proxy);
+		if (player->name)
+			g_free(player->name);
+		if (player->dest)
+			g_free(player->dest);
+	}
+	g_list_free(jd->player);
+	jd->player = NULL;
+}
+
+static gboolean
+lj_dbus_players_find(JamDBus *jd, GError **error) {
+	DBusGProxy *proxy;
+	gchar **names, **p;
+
+	proxy = dbus_g_proxy_new_for_name(jd->bus,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+	if (!dbus_g_proxy_call(proxy, "ListNames", error, G_TYPE_INVALID,
+						   G_TYPE_STRV, &names, G_TYPE_INVALID)) {
+		return FALSE;
+	}
+
+	for (p = names; *p; p++) {
+		if (g_str_has_prefix(*p, "org.mpris.")) {
+			lj_dbus_append_player(jd, *p);
+		}
+	}
+
+	g_strfreev(names);
+	g_object_unref(proxy);
+
+	return TRUE;
+}
+
+gboolean
+lj_dbus_mpris_update_list(JamDBus *jd, GError **error) {
+	if (jd == NULL)
+		return FALSE;
+	lj_dbus_players_clear(jd);
+	return lj_dbus_players_find(jd, error);
+}
+
+#define DBUS_TYPE_MPRIS_STATUS \
+	(dbus_g_type_get_struct("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID))
+#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE \
+	(dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
+
+/* TODO: Connect to status change signal */
+
+gboolean
+lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error) {
+	GValueArray *array = NULL;
+	GHashTable *info = NULL;
+	GValue *value;
+	MediaPlayer *player;
+
+	if (jd == NULL)
+		return FALSE;
+
+	if (list == NULL)
+		return FALSE;
+
+	if ((player = (MediaPlayer *) list->data) == NULL)
+		return FALSE;
+
+	memset((void *) &player->info, 0, sizeof(MetaInfo));
+
+	if (player->hint & MPRIS_HINT_BAD_STATUS) {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   G_TYPE_INT, &player->info.status, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+	} else {
+		if (!dbus_g_proxy_call(player->proxy, "GetStatus", error, G_TYPE_INVALID,
+							   DBUS_TYPE_MPRIS_STATUS, &array, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+
+		value = g_value_array_get_nth(array, 0);
+		player->info.status = g_value_get_int(value);
+		g_value_array_free(array);
+	}
+
+	if (player->info.status == MPRIS_STATUS_PLAYING) {
+		if (!dbus_g_proxy_call(player->proxy, "GetMetadata", error, G_TYPE_INVALID,
+							   DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &info, G_TYPE_INVALID)) {
+			return FALSE;
+		}
+		value = (GValue *) g_hash_table_lookup(info, "artist");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.artist, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "album");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.album, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+
+		value = (GValue *) g_hash_table_lookup(info, "title");
+		if (value != NULL && G_VALUE_HOLDS_STRING(value)) {
+			g_strlcpy(player->info.title, g_value_get_string(value), MPRIS_INFO_LEN);
+		}
+	}
+
+	return TRUE;
+}
+
+GQuark
+lj_dbus_error_quark(void) {
+	static GQuark quark = 0;
+	if (quark == 0)
+		quark = g_quark_from_static_string("dbus-error-quark");
+	return quark;
+}
+
+/* TODO: User defined format */
+
+gchar *
+lj_dbus_mpris_current_music(JamDBus *jd, GError **error) {
+	gchar *music;
+	GList *list;
+
+	if (!lj_dbus_mpris_update_list(jd, error))
+		return NULL;
+
+	list = jd ? jd->player : NULL;
+
+	if (lj_dbus_mpris_update_info(jd, list, error)) {
+		MediaPlayer *player = (MediaPlayer *) list->data;
+		if (player->info.status == MPRIS_STATUS_PLAYING) {
+			music = g_strdup_printf("%s - %s - %s",
+						player->info.artist[0] ? player->info.artist : _("Unknown Artist"),
+						player->info.album[0] ? player->info.album: _("Unknown Album"),
+						player->info.title[0] ? player->info.title: _("Unknown Track"));
+			return music;
+		} else {
+			g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NOT_PLAYING,
+				_("Player is stopped."));
+		}
+	} else if (error == NULL || *error == NULL) {
+		g_set_error(error, lj_dbus_error_quark(), MPRIS_ERROR_NO_PLAYER,
+			_("No players found."));
+	}
+	return NULL;
+}
+
+/* lj_dbus.c */
+
diff -up logjam-4.5.3/src/lj_dbus.h.dbus logjam-4.5.3/src/lj_dbus.h
--- logjam-4.5.3/src/lj_dbus.h.dbus	2009-04-25 13:40:36.000000000 +0300
+++ logjam-4.5.3/src/lj_dbus.h	2009-04-25 14:25:27.000000000 +0300
@@ -0,0 +1,68 @@
+/* logjam - a GTK client for LiveJournal.
+ * Copyright (C) 2009 Andy Shevchenko <andy at smile.org.ua>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef lj_dbus_h
+#define lj_dbus_h
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+/* Take care about i18n strings */
+#ifndef _
+#ifdef GETTEXT_PACKAGE
+#include <glib/gi18n-lib.h>
+#else
+#define _(x)	x
+#endif
+#endif		/* _ */
+
+#define MPRIS_INFO_LEN	128
+
+typedef struct _MetaInfo MetaInfo;
+struct _MetaInfo {
+	gchar artist[MPRIS_INFO_LEN];
+	gchar album[MPRIS_INFO_LEN];
+	gchar title[MPRIS_INFO_LEN];
+
+#define	MPRIS_STATUS_PLAYING	0
+#define	MPRIS_STATUS_PAUSED		1
+#define	MPRIS_STATUS_STOPPED	2
+
+	gint status;
+};
+
+typedef struct _MediaPlayer MediaPlayer;
+struct _MediaPlayer {
+	gchar *name;
+	gchar *dest;
+	DBusGProxy *proxy;
+	MetaInfo info;
+
+#define MPRIS_HINT_BAD_STATUS	1 << 0
+
+	gint hint;
+};
+
+typedef struct _JamDBus JamDBus;
+struct _JamDBus {
+	DBusGConnection *bus;
+	GList *player;
+};
+
+void lj_dbus_close(JamDBus *jd);
+JamDBus *lj_dbus_new(void);
+
+gboolean lj_dbus_mpris_update_list(JamDBus *jd, GError **error);
+gboolean lj_dbus_mpris_update_info(JamDBus *jd, GList *list, GError **error);
+
+#define MPRIS_ERROR_NOT_PLAYING		1
+#define MPRIS_ERROR_NO_PLAYER		2
+
+gchar *lj_dbus_mpris_current_music(JamDBus *jd, GError **error);
+
+#endif /* lj_dbus_h */
+
diff -up logjam-4.5.3/src/Makefile.am.dbus logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.dbus	2009-04-23 00:44:11.000000000 +0300
+++ logjam-4.5.3/src/Makefile.am	2009-04-24 15:59:08.000000000 +0300
@@ -3,7 +3,7 @@ bin_PROGRAMS = logjam
 localedir=$(datadir)/locale
 
 # AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/protocol/blogger -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/protocol/liblivejournal -I$(top_srcdir)/util/gxr @LOGJAM_CFLAGS@ @NETWORK_CFLAGS@ @DBUSAPI_CFLAGS@
 
 ACCOUNT = account.h account.c host.c livejournal.c
 # blogger.c
@@ -50,6 +50,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           settings.c settings.h $(GROUPEDBOX) tie.c tie.h \
           $(HISTORY) $(OFFLINE) \
           jam.c jam.h $(USEJOURNAL) \
+          lj_dbus.c lj_dbus.h \
           security.c security.h about.c thanks.h \
           menu.c menu.h $(TOOLS) smartquotes.c smartquotes.h \
           $(LOGIN) manager.c \
@@ -116,7 +117,7 @@ logjam_SOURCES += journalstore-xml.c
 endif
 
 # logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la $(top_builddir)/protocol/blogger/libblogger.la @LOGJAM_LIBS@ @NETWORK_LIBS@
-logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@
+logjam_LDADD=$(top_builddir)/protocol/liblivejournal/livejournal/liblivejournal.la @LOGJAM_LIBS@ @NETWORK_LIBS@ @DBUSAPI_LIBS@
 
 ctags:
 	@version=`ctags --version | head -1`; \
diff -up logjam-4.5.3/src/music.c.dbus logjam-4.5.3/src/music.c
--- logjam-4.5.3/src/music.c.dbus	2009-04-22 23:46:38.000000000 +0300
+++ logjam-4.5.3/src/music.c	2009-04-25 01:11:29.000000000 +0300
@@ -9,8 +9,11 @@
 #include "gtk-all.h"
 
 #include "conf.h"
+#include "lj_dbus.h"
 #include "music.h"
 
+JamDBus *jdbus = NULL;
+
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
diff -up logjam-4.5.3/src/music.h.dbus logjam-4.5.3/src/music.h
--- logjam-4.5.3/src/music.h.dbus	2005-02-21 20:30:27.000000000 +0200
+++ logjam-4.5.3/src/music.h	2009-04-25 01:05:55.000000000 +0300
@@ -8,6 +8,9 @@
 #define music_h
 
 #include "conf.h" /* CommandList */
+#include "lj_dbus.h"
+
+extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
diff -up logjam-4.5.3/src/settings.c.dbus logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.dbus	2009-04-25 13:41:03.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2009-04-25 15:19:42.000000000 +0300
@@ -24,6 +24,7 @@
 #include "tie.h"
 #include "account.h"
 #include "jamview.h"
+#include "lj_dbus.h"
 
 /* what's this?  all of these funny structures in the settings box?
  * well, instead of creating and tearing down all of these widgets, i
@@ -101,6 +102,8 @@ static SettingsWidget settingswidgets[] 
 
 	{ "music_command", &conf.music_command,
 		SW_COMMAND, N_("Detect music from:"), (gpointer)music_commands },
+	{ "music_mpris", &conf.music_mpris,
+		SW_TOGGLE, N_("Detect music via MPRIS") },
 
 	{ "net_useproxy", &conf.options.useproxy, 
 		SW_TOGGLE, N_("Use _proxy server") },
@@ -169,6 +172,19 @@ toggle_tie_enable(GtkWidget *toggle, Gtk
 }
 
 static void
+toggle_disable_cb(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+}
+static void
+toggle_tie_disable(GtkWidget *toggle, GtkWidget *target) {
+	gtk_widget_set_sensitive(target, 
+			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)));
+	g_signal_connect(G_OBJECT(toggle), "toggled",
+			G_CALLBACK(toggle_disable_cb), target);
+}
+
+static void
 toggle_tie(SettingsWidget *sw) {
 	tie_toggle(GTK_TOGGLE_BUTTON(sw->widget), (gboolean*)sw->conf);
 }
@@ -499,16 +515,21 @@ static void
 music_diagnose(GtkWidget *button) {
 	GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(button));
 	GError *err = NULL;
-	char *music, *result;
-	MusicSource source = music_current_source();
+	char *music = NULL, *result;
+	MusicSource source = MUSIC_SOURCE_NONE;
 
-	if (!music_can_detect(&err)) {
-		jam_warning(dlg, "%s", err->message);
-		g_error_free(err);
-		return;
+	if (conf.music_mpris) {
+		music = lj_dbus_mpris_current_music(jdbus, &err);
+	} else {
+		source = music_current_source();
+		if (!music_can_detect(&err)) {
+			jam_warning(dlg, "%s", err->message);
+			g_error_free(err);
+			return;
+		}
+		music = music_detect(&err);
 	}
 
-	music = music_detect(&err);
 	if (!music) {
 		if (source == MUSIC_SOURCE_XMMS &&
 				err->domain == G_SPAWN_ERROR && err->code == G_SPAWN_ERROR_NOENT) {
@@ -555,21 +576,40 @@ proxysettings(void) {
 	return group;
 }
 
+static void
+mpris_update_cb(GtkToggleButton *button, JamDBus *jd) {
+	GError *error = NULL;
+	if (!lj_dbus_mpris_update_list(jdbus, &error)) {
+		GtkWindow *dlg = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+		jam_warning(dlg, _("Error detecting music: %s"), error->message);
+		g_error_free(error);
+	}
+}
+
 static GtkWidget*
 programsettings(JamWin *jw) {
 	GtkWidget *group;
-	GtkWidget *button, *hbox;
+	GtkWidget *button, *vbox, *hbox;
 	SettingsWidget *sw;
 	JamView *jv = jam_win_get_cur_view(jw);
 	
 	group = groupedbox_new_with_text(_("Programs"));
 	groupedbox_pack(GROUPEDBOX(group), sw_make("web_spawn"), FALSE);
 
-	groupedbox_pack(GROUPEDBOX(group), sw_make("music_command"), FALSE);
+	vbox = sw_make("music_command");
+	groupedbox_pack(GROUPEDBOX(group), vbox, FALSE);
 	sw = sw_lookup("music_command");
 	g_signal_connect_swapped(G_OBJECT(sw->widget), "changed",
 			G_CALLBACK(jam_view_settings_changed), jv);
 
+	button = sw_make("music_mpris");
+	groupedbox_pack(GROUPEDBOX(group), button, FALSE);
+	g_signal_connect(G_OBJECT(button), "toggled",
+			G_CALLBACK(mpris_update_cb), jdbus);
+	toggle_tie_disable(button, vbox);
+	g_signal_connect_swapped(G_OBJECT(button), "toggled",
+			G_CALLBACK(jam_view_settings_changed), jv);
+
 	button = gtk_button_new_with_mnemonic(_("_Diagnose"));
 	g_signal_connect(G_OBJECT(button), "clicked",
 			G_CALLBACK(music_diagnose), NULL);

logjam-4.5.3-no_quit_when_docked.patch:
 jam.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE logjam-4.5.3-no_quit_when_docked.patch ---
diff -up logjam-4.5.3/src/jam.c.no_quit_when_docked logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.no_quit_when_docked	2008-07-28 13:55:37.000000000 -0400
+++ logjam-4.5.3/src/jam.c	2008-07-28 14:00:57.000000000 -0400
@@ -757,6 +757,11 @@ jam_quit(JamWin *jw) {
 
 static gboolean
 delete_event_cb(JamWin *jw) {
+#ifdef USE_DOCK
+	if (app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+	else
+#endif
 	jam_quit(jw);
 	return TRUE; /* don't ever let this delete the window; quit will do it. */
 }

logjam-4.5.3-save-tags.diff:
 jamview.c |    3 +-
 tags.c    |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 tags.h    |    2 -
 3 files changed, 73 insertions(+), 6 deletions(-)

--- NEW FILE logjam-4.5.3-save-tags.diff ---
diff -up logjam-4.5.3/src/jamview.c.save logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.save	2009-04-26 10:26:39.000000000 +0300
+++ logjam-4.5.3/src/jamview.c	2009-04-26 10:28:00.000000000 +0300
@@ -418,7 +424,8 @@ tags_select_cb(JamView *view) {
 
   tags = tags_dialog(toplevel,
 		     JAM_ACCOUNT_LJ(view->account), 
-		     jam_doc_get_usejournal(view->doc));
+		     jam_doc_get_usejournal(view->doc),
+		     (gchar *) gtk_entry_get_text(GTK_ENTRY(view->tags)));
 
   if (tags) {
       gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
diff -up logjam-4.5.3/src/tags.c.save logjam-4.5.3/src/tags.c
--- logjam-4.5.3/src/tags.c.save	2009-04-26 10:05:38.000000000 +0300
+++ logjam-4.5.3/src/tags.c	2009-04-26 15:15:13.000000000 +0300
@@ -78,8 +78,23 @@ create_tag_string (GtkTreeModel *model,
   return FALSE;
 }
 
+static void
+tags_set_fg(GtkTreeViewColumn *column, GtkCellRenderer *cell,
+	    GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+  GSList *prev = (GSList *) data;
+  gchar *text;
+
+  gtk_tree_model_get(model, iter, 1, &text, -1);
+  if (prev && g_slist_find_custom(prev, text, g_utf8_collate))
+    g_object_set(G_OBJECT(cell), "foreground", "Red", NULL);
+  else
+    g_object_set(G_OBJECT(cell), "foreground", "Black", NULL);
+  g_free(text);
+}
+
 GtkWidget* 
-taglist_create (GSList *l)
+taglist_create (GSList *l, GSList **head)
 {
   GtkWidget *treeview;
   GtkListStore *store;
@@ -87,20 +102,37 @@ taglist_create (GSList *l)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   guint i;
+  GSList *prev = *head, *p;
 
   /* create model */
   store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
   for (i = 0; i < g_slist_length (l); i++)
     {
       LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+      gboolean check = FALSE;
 
+      if (prev && (p = g_slist_find_custom(prev, t->tag, g_utf8_collate)) != NULL) {
+        check = TRUE;
+        prev = g_slist_remove_link(prev, p);
+        g_free(p->data);
+        g_slist_free1(p);
+      }
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-			  0, FALSE,
+			  0, check,
 			  1, t->tag,
 			  -1);
     }
 
+  /* rest of the typed tags */
+  for (p = prev; p; p = g_slist_next(p)) {
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter,
+      		  0, TRUE,
+      		  1, p->data,
+      		  -1);
+  }
+
   /* create treeview */
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
@@ -120,20 +152,44 @@ taglist_create (GSList *l)
   column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
 						     renderer, "text", 1,
 						     NULL);
+
+  gtk_tree_view_column_set_cell_data_func(column, renderer, tags_set_fg,
+					  prev, NULL);
+
   gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (treeview, column);
  
+  /* update head of the prev list */
+  *head = prev;
   g_object_unref (store);
 
   return treeview;
 }
 
+static GSList *
+tags_split(gchar *typed) {
+  GSList *head = NULL;
+  gchar **result, **p;
+
+  if (typed == NULL || *typed == '\0')
+    return NULL;
+
+  for (p = result = g_strsplit(typed, ",", 0); *p; p++) {
+    gchar *token = g_strstrip(*p);
+    if (*token)
+      head = g_slist_prepend(head, g_utf8_strdown(token, -1));
+  }
+  g_strfreev(result);
+  return head;
+}
+
 gchar* 
-tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed)
 {
   GtkWidget *dlg, *sw, *tv;
   GSList *list = NULL;
   gchar *taglist = NULL;
+  GSList *prev;
 
   if (acc == NULL) return NULL;
 
@@ -156,7 +212,8 @@ tags_dialog (GtkWidget *win, JamAccountL
 				  GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
 
-  tv = taglist_create (list);
+  prev = tags_split(typed);
+  tv = taglist_create (list, &prev);
   gtk_container_add (GTK_CONTAINER (sw), tv);
 
   gtk_window_resize(dlg, 60, 210);
@@ -177,5 +234,14 @@ tags_dialog (GtkWidget *win, JamAccountL
 
   gtk_widget_destroy (dlg);
   
+  /* free rest of prev list */
+  if (prev) {
+    GSList *p;
+    for (p = prev; p; p = g_slist_next(p)) {
+      g_free(p->data);
+    }
+    g_slist_free(prev);
+  }
+
   return taglist;
 }
diff -up logjam-4.5.3/src/tags.h.save logjam-4.5.3/src/tags.h
--- logjam-4.5.3/src/tags.h.save	2009-04-26 10:22:25.000000000 +0300
+++ logjam-4.5.3/src/tags.h	2009-04-26 10:22:03.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef _TAGS_H_
 #define _TAGS_H_
 
-gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal, gchar *typed);
 
 #endif /* _TAGS_H_ */

logjam-4.5.3-showloginhistory.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 login.c    |    3 +++
 settings.c |    3 +++
 4 files changed, 9 insertions(+)

--- NEW FILE logjam-4.5.3-showloginhistory.patch ---
diff -up logjam-4.5.3/src/conf.h.BAD logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.BAD	2008-07-28 14:20:23.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2008-07-28 14:21:08.000000000 -0400
@@ -59,6 +59,7 @@ typedef struct {
 	gboolean friends_hidestats;
 	gboolean allowmultipleinstances;
 	gboolean smartquotes;
+	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
 #endif /* HAVE_GTK */
diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.BAD	2008-07-28 14:19:17.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2008-07-28 14:20:16.000000000 -0400
@@ -191,6 +191,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(friends_hidestats)
 		READOPTION(allowmultipleinstances)
 		READOPTION(smartquotes)
+		READOPTION(showloginhistory)
 
 		XML_GET_IF("showmeta", parseshowmeta(options, doc, node);)
 
@@ -335,6 +336,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(friends_hidestats);
 	WRITEOPTION(allowmultipleinstances);
 	WRITEOPTION(smartquotes);
+	WRITEOPTION(showloginhistory);
 
 	writeshowmeta(options, node);
 #endif /* HAVE_GTK */
diff -up logjam-4.5.3/src/login.c.BAD logjam-4.5.3/src/login.c
--- logjam-4.5.3/src/login.c.BAD	2008-07-28 14:30:27.000000000 -0400
+++ logjam-4.5.3/src/login.c	2008-07-28 14:30:55.000000000 -0400
@@ -292,6 +292,9 @@ login_check_lastupdate(GtkWindow *parent
 	gboolean ret = TRUE;
 	JamAccount *acc = JAM_ACCOUNT(acclj);
 
+	if (!conf.options.showloginhistory)
+		return TRUE;
+
 	deltat = time(NULL) - acclj->lastupdate;
 	if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */
 		return TRUE;
diff -up logjam-4.5.3/src/settings.c.BAD logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.BAD	2008-07-28 14:21:36.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2008-07-28 14:24:59.000000000 -0400
@@ -80,6 +80,8 @@ static SettingsWidget settingswidgets[] 
 	{ "ui_spell_language", &conf.spell_language,
 		SW_TEXT, N_("Entry _language:") },
 #endif
+	{ "ui_showloginhistory", &conf.options.showloginhistory,
+		SW_TOGGLE, N_("Show login history (number of days since last login)") },
 	{ "ui_smartquotes", &conf.options.smartquotes,
 		SW_TOGGLE, N_("Automatically change _quotes to matching pairs") },
 	{ "ui_font", &conf.uifont,
@@ -430,6 +432,7 @@ uisettings(JamWin *jw) {
 	}
 #endif
 
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_showloginhistory"), TRUE);
 	groupedbox_pack(GROUPEDBOX(entry),
 			sw_make("ui_smartquotes"), FALSE);
 	

logjam-4.5.3-start_in_dock.patch:
 conf.h     |    1 +
 conf_xml.c |    2 ++
 jam.c      |    8 ++++++--
 settings.c |    3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE logjam-4.5.3-start_in_dock.patch ---
Allow start logjam in system tray (no main window at start).

diff -up logjam-4.5.3/src/conf_xml.c.orig logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.orig	2008-05-11 14:35:48.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2008-05-11 14:55:24.000000000 +0300
@@ -184,6 +184,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(docklet)
+		READOPTION(start_in_dock)
 		READOPTION(cffloat)
 		READOPTION(cffloatraise)
 		READOPTION(friends_hidestats)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(docklet);
+	WRITEOPTION(start_in_dock);
 	WRITEOPTION(cffloatraise);
 	WRITEOPTION(cffloat);
 	WRITEOPTION(friends_hidestats);
diff -up logjam-4.5.3/src/jam.c.orig logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.orig	2005-09-10 04:45:01.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-11 14:56:59.000000000 +0300
@@ -832,8 +845,6 @@
 	gtk_widget_show(vbox);
 	jam_update_actions(jw);
 
-	gtk_widget_show(GTK_WIDGET(jw));
-
 	/* suck a bunch of events in. */
 	while (gtk_events_pending())
 		gtk_main_iteration();
@@ -853,7 +864,13 @@
 #ifdef USE_DOCK
 	if (conf.options.docklet)
 		docklet_setup(GTK_WINDOW(jw));
+
+	if (app.docklet) {
+		if (!conf.options.start_in_dock)
+			gtk_widget_show(GTK_WIDGET(jw));
+	} else
 #endif
+	gtk_widget_show(GTK_WIDGET(jw));
 
 	draftentry = jam_load_autosave(jw);
 	if (draftentry) {
diff -up logjam-4.5.3/src/conf.h.orig logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.orig	2005-02-21 19:46:10.000000000 +0200
+++ logjam-4.5.3/src/conf.h	2008-05-11 14:54:16.000000000 +0300
@@ -59,6 +59,7 @@ typedef struct {
 	gboolean allowmultipleinstances;
 	gboolean smartquotes;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
+	gboolean start_in_dock;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/settings.c.orig logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.orig	2005-02-21 20:31:21.000000000 +0200
+++ logjam-4.5.3/src/settings.c	2008-05-11 14:59:13.000000000 +0300
@@ -87,6 +87,8 @@ static SettingsWidget settingswidgets[] 
 #ifndef G_OS_WIN32
 	{ "ui_docklet", &conf.options.docklet,
 		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },
+	{ "ui_start_in_dock", &conf.options.start_in_dock,
+		SW_TOGGLE, N_("Start in system tray") },
 #endif
 
 #ifndef G_OS_WIN32
@@ -460,6 +468,7 @@ uisettings(JamWin *jw) {
 	g_signal_connect(G_OBJECT(button), "toggled",
 			G_CALLBACK(docklet_change_cb), jw);
 	groupedbox_pack(GROUPEDBOX(misc), button, FALSE);
+	groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE);
 #endif /* USE_DOCK */
 
 	return vbox;

logjam-4.5.3-tags.patch:
 protocol/liblivejournal/livejournal/Makefile.am   |    3 
 protocol/liblivejournal/livejournal/gettags.c     |   65 +++++++
 protocol/liblivejournal/livejournal/gettags.h     |   16 +
 protocol/liblivejournal/livejournal/livejournal.h |    1 
 protocol/liblivejournal/livejournal/tags.h        |   18 ++
 protocol/liblivejournal/livejournal/types.c       |   13 +
 src/Makefile.am                                   |    1 
 src/jamview.c                                     |   24 ++
 src/tags.c                                        |  181 ++++++++++++++++++++++
 src/tags.h                                        |    6 
 10 files changed, 327 insertions(+), 1 deletion(-)

--- NEW FILE logjam-4.5.3-tags.patch ---
diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,18 @@
+/* liblivejournal - a client library for LiveJournal.
+ * Copyright (C) 2003 Evan Martin <evan at livejournal.com>
+ *
+ * vim: tabstop=4 shiftwidth=4 noexpandtab :
+ */
+
+#ifndef __LIVEJOURNAL_TAGS_H__
+#define __LIVEJOURNAL_TAGS_H__
+
+typedef struct _LJTag {
+	char *tag;
+	guint32 count;
+} LJTag;
+
+LJTag *lj_tag_new(void);
+void   lj_tag_free(LJTag *t);
+
+#endif /* __LIVEJOURNAL_TAGS_H__ */
diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c
--- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags	2005-10-23 21:29:32.000000000 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c	2008-03-11 17:53:46.000000000 -0400
@@ -14,6 +14,7 @@
 
 #include "entry.h"
 #include "friends.h"
+#include "tags.h"
 #include "types.h"
 
 char*
@@ -75,6 +76,18 @@ lj_friend_compare_username(gconstpointer
 	return strcmp(fa->username, fb->username);
 }
 
+LJTag*
+lj_tag_new(void) {
+    LJTag *t = g_new0(LJTag, 1);
+    return t;
+}
+
+void
+lj_tag_free(LJTag *t) {
+   g_free(t->tag);
+   g_free(t);
+}
+
 void 
 lj_security_append_to_request(LJSecurity *security, LJRequest *request) {
 	char *text = NULL;
diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am
--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags	2005-08-24 22:42:14.000000000 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am	2008-03-11 17:53:46.000000000 -0400
@@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
 liblivejournal_la_SOURCES = \
 	md5.c              md5.h            \
 	protocol.c         protocol.h       \
-	friends.h                           \
+	friends.h          tags.h           \    
 	serveruser.c       serveruser.h     \
 	entry.c            entry.h          \
 	types.c            types.h          \
@@ -21,6 +21,7 @@ liblivejournal_la_SOURCES = \
 	getchallenge.c     getchallenge.h   \
 	getevents.c        getevents.h      \
 	getfriends.c       getfriends.h     \
+	gettags.c          gettags.h        \
 	syncitems.c        syncitems.h      \
 	sync.c             sync.h           \
 	livejournal.h
diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h
--- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags	2005-02-21 12:46:10.000000000 -0500
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h	2008-03-11 17:53:46.000000000 -0400
@@ -16,5 +16,6 @@
 #include <livejournal/serveruser.h>
 #include <livejournal/friends.h>
 #include <livejournal/entry.h>
+#include <livejournal/tags.h>
 
 #endif /* __LIVEJOURNAL_H__ */
diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,16 @@
+
+#ifndef __LIVEJOURNAL_GETTAGS_H__
+#define __LIVEJOURNAL_GETTAGS_H__
+
+#include <livejournal/verb.h>
+
+typedef struct {
+	LJVerb verb;
+	GHashTable *tags;
+} LJGetTags;
+
+LJGetTags* lj_gettags_new(LJUser *user, const gchar *journal);
+void       lj_gettags_free(LJGetTags *gettags, gboolean includetags);
+
+#endif /* __LIVEJOURNAL_GETTAGS_H__ */
+
diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,65 @@
+
+#include <config.h>
+
+#include <glib.h>
+
+#include "tags.h"
+#include "gettags.h"
+
+static void
+read_tags(LJResult *result, GHashTable *tags) {
+	LJTag *t;
+	int i, count;
+	guint32 mask;
+	char *value;
+
+	count = lj_result_get_int(result, "tag_count");
+	for (i = 1; i <= count; i++) {
+		t = lj_tag_new();
+		t->tag = g_strdup(lj_result_getf(result, "tag_%d_name", i));
+
+        value = lj_result_getf(result, "tag_%d_uses", i);
+		if (value) t->count = lj_color_to_int(value);
+
+		g_hash_table_insert(tags, t->tag, t);
+	}
+}
+
+static void
+parse_result(LJVerb *verb) {
+	GHashTable *tags;
+	
+	tags = g_hash_table_new(g_str_hash, g_str_equal);
+
+	read_tags(verb->result, tags);
+	((LJGetTags*)verb)->tags = tags;
+}
+
+LJGetTags*
+lj_gettags_new(LJUser *user, const gchar *journal) {
+	LJGetTags *gettags = g_new0(LJGetTags, 1);
+	LJVerb *verb = (LJVerb*)gettags;
+
+	lj_verb_init(verb, user, "getusertags", FALSE, parse_result);
+    if (journal)
+	    lj_request_add(verb->request, "usejournal", journal);
+
+	return gettags;
+}
+
+static void
+hash_tag_free_cb(gpointer key, LJTag *t, gpointer data) {
+	lj_tag_free(t);
+}
+
+void
+lj_gettags_free(LJGetTags *gettags, gboolean includetags) {
+	if (gettags->tags) {
+		if (includetags)
+			g_hash_table_foreach(gettags->tags,
+					(GHFunc)hash_tag_free_cb, NULL);
+		g_hash_table_destroy(gettags->tags);
+	}
+	g_free(gettags);
+}
+
diff -up /dev/null logjam-4.5.3/src/tags.c
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/src/tags.c	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,181 @@
+
+#include "gtk-all.h"
+
+#include <livejournal/livejournal.h>
+#include <livejournal/gettags.h>
+
+#include "account.h"
+#include "tags.h"
+
+static void
+tags_hash_list_cb (gpointer key, LJTag *t, GSList **list) 
+{
+  *list = g_slist_append(*list, t);
+}
+
+static gboolean
+load_tags (GtkWindow *parent, JamAccountLJ *acc, gchar *journal, GSList **l) 
+{
+  LJGetTags *gettags;
+  NetContext *ctx;
+  
+  ctx = net_ctx_gtk_new (parent, _("Loading Tags"));
+  gettags = lj_gettags_new (jam_account_lj_get_user (acc), journal);
+  if (!net_run_verb_ctx ((LJVerb*) gettags, ctx, NULL)) 
+    { 
+      lj_gettags_free (gettags, TRUE);
+      net_ctx_gtk_free (ctx);
+      return FALSE;
+    }
+  
+  g_hash_table_foreach (gettags->tags, (GHFunc) tags_hash_list_cb, l);
+  
+  lj_gettags_free (gettags, FALSE);
+  net_ctx_gtk_free (ctx);
+  
+  return TRUE;
+}
+
+static void
+tag_toggled (GtkCellRendererToggle *cell,
+	     gchar                 *path_str,
+	     gpointer               data)
+{
+  GtkTreeModel *model = (GtkTreeModel *)data;
+  GtkTreeIter  iter;
+  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
+  gboolean tag;
+
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get (model, &iter, 0, &tag, -1);
+
+  tag ^= 1;
+
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, tag, -1);
+
+  gtk_tree_path_free (path);
+}
+
+gboolean
+create_tag_string (GtkTreeModel *model,
+		   GtkTreePath  *path,
+		   GtkTreeIter  *iter,
+		   gpointer     data)
+{
+  gchar *tag;
+  gboolean is_sel;
+  gchar **tagstr = (gchar **) data;
+    
+  gtk_tree_model_get (model, iter, 0, &is_sel, -1);
+  if (is_sel)
+    {
+      gchar *buf = *tagstr;
+      gtk_tree_model_get (model, iter, 1, &tag, -1);
+      *tagstr = g_strconcat (buf, tag, ", ", NULL);
+      g_free (buf);
+    }
+
+  return FALSE;
+}
+
+GtkWidget* 
+taglist_create (GSList *l)
+{
+  GtkWidget *treeview;
+  GtkListStore *store;
+  GtkTreeIter iter;
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
+  guint i;
+
+  /* create model */
+  store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
+  for (i = 0; i < g_slist_length (l); i++)
+    {
+      LJTag *t = (LJTag *) g_slist_nth_data (l, i);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter,
+			  0, FALSE,
+			  1, t->tag,
+			  -1);
+    }
+
+  /* create treeview */
+  treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), 1);
+
+  /* add columns */
+  renderer = gtk_cell_renderer_toggle_new ();
+  g_signal_connect (renderer, "toggled",
+		    G_CALLBACK (tag_toggled), 
+		    GTK_TREE_MODEL (store));
+  column = gtk_tree_view_column_new_with_attributes ("#", 
+						     renderer, "active", 0,
+						     NULL);
+  gtk_tree_view_append_column (treeview, column);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes (_("Tag name"), 
+						     renderer, "text", 1,
+						     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, 1);
+  gtk_tree_view_append_column (treeview, column);
+ 
+  g_object_unref (store);
+
+  return treeview;
+}
+
+gchar* 
+tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal)
+{
+  GtkWidget *dlg, *sw, *tv;
+  GSList *list = NULL;
+  gchar *taglist = NULL;
+
+  if (acc == NULL) return NULL;
+
+  load_tags (GTK_WINDOW (win), acc, journal, &list);
+  
+  dlg = gtk_dialog_new_with_buttons (_("Select tags"),
+                                     GTK_WINDOW (win),
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_STOCK_OK,
+                                     GTK_RESPONSE_OK,
+                                     GTK_STOCK_CLOSE,
+                                     GTK_RESPONSE_CLOSE,
+                                     NULL);
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+				       GTK_SHADOW_ETCHED_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+				  GTK_POLICY_AUTOMATIC,
+				  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0);
+
+  tv = taglist_create (list);
+  gtk_container_add (GTK_CONTAINER (sw), tv);
+
+  gtk_window_resize(dlg, 60, 210);
+  gtk_widget_show_all (sw);
+
+  if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK)
+    {
+      taglist = g_strdup ("");
+      gtk_tree_model_foreach (gtk_tree_view_get_model (tv),
+			      create_tag_string,
+			      &taglist);
+      if (g_ascii_strcasecmp (taglist, "") == 0) 
+	{
+	  g_free (taglist);
+	  taglist = NULL;
+	}
+    }  
+
+  gtk_widget_destroy (dlg);
+  
+  return taglist;
+}
diff -up /dev/null logjam-4.5.3/src/tags.h
--- /dev/null	2008-03-11 09:22:57.310023055 -0400
+++ logjam-4.5.3/src/tags.h	2008-03-11 17:53:46.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _TAGS_H_
+#define _TAGS_H_
+
+gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal);
+
+#endif /* _TAGS_H_ */
diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am
--- logjam-4.5.3/src/Makefile.am.tags	2005-10-23 21:16:08.000000000 -0400
+++ logjam-4.5.3/src/Makefile.am	2008-03-11 17:53:46.000000000 -0400
@@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
           undo.c undo.h \
           userlabel.c userlabel.h \
           get_cmd_out.c get_cmd_out.h \
+          tags.c tags.h \
           $(HTML_MARKUP)
 
 src_preview = $(PREVIEW)
diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c
--- logjam-4.5.3/src/jamview.c.tags	2008-03-11 17:53:46.000000000 -0400
+++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400
@@ -19,6 +19,7 @@
 #include "security.h"
 #include "marshalers.h"
 #include "datesel.h"
+#include "tags.h"
 
 #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
 
@@ -408,11 +409,34 @@ music_store(JamView *view) {
 	jam_doc_set_music(view->doc, music);
 }
 
+static void tags_store(JamView *view);
+
+static void
+tags_select_cb(JamView *view) {
+  gchar *tags;
+  GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
+
+  tags = tags_dialog(toplevel,
+		     JAM_ACCOUNT_LJ(view->account), 
+		     jam_doc_get_usejournal(view->doc));
+
+  if (tags) {
+      gtk_entry_set_text(GTK_ENTRY(view->tags), tags);
+      tags_store(view);
+  }
+}
+
 static void
 tags_add(JamView *view) {
+	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
 	view->tagsbar = labelled_box_new_sg(_("_Tags:"), view->tags, view->sizegroup);
 	gtk_box_pack_start(GTK_BOX(view), view->tagsbar, FALSE, FALSE, 0);
+	tagbutton = gtk_button_new_with_label("...");
+	g_signal_connect_swapped(G_OBJECT(tagbutton), "clicked",
+				 G_CALLBACK(tags_select_cb), view);
+	gtk_box_pack_start(GTK_BOX(view->tagsbar),
+			   tagbutton, FALSE, FALSE, 0);
 	gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1);
 	gtk_widget_show_all(view->tagsbar);
 }



From spot at fedoraproject.org  Mon Aug 24 16:33:07 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:33:07 +0000 (UTC)
Subject: rpms/logjam/EL-4 sources,1.8,1.9
Message-ID: <20090824163307.EBE0111C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3333/EL-4

Modified Files:
	sources 
Log Message:
new source


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Feb 2006 23:09:27 -0000	1.8
+++ sources	24 Aug 2009 16:33:07 -0000	1.9
@@ -1 +1 @@
-48092c00e1f40ebee431b4e0071ae273  logjam-4.5.3.tar.bz2
+aebe99f64fa31fdf5e83ed55d319e76a  logjam-git-20090824.tar.bz2



From spot at fedoraproject.org  Mon Aug 24 16:33:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:33:08 +0000 (UTC)
Subject: rpms/logjam/EL-5 sources,1.8,1.9
Message-ID: <20090824163308.1BBD111C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3333/EL-5

Modified Files:
	sources 
Log Message:
new source


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Feb 2006 23:09:51 -0000	1.8
+++ sources	24 Aug 2009 16:33:08 -0000	1.9
@@ -1 +1 @@
-48092c00e1f40ebee431b4e0071ae273  logjam-4.5.3.tar.bz2
+aebe99f64fa31fdf5e83ed55d319e76a  logjam-git-20090824.tar.bz2



From spot at fedoraproject.org  Mon Aug 24 16:33:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:33:08 +0000 (UTC)
Subject: rpms/logjam/F-10 sources,1.8,1.9
Message-ID: <20090824163308.430EA11C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3333/F-10

Modified Files:
	sources 
Log Message:
new source


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Feb 2006 23:09:51 -0000	1.8
+++ sources	24 Aug 2009 16:33:08 -0000	1.9
@@ -1 +1 @@
-48092c00e1f40ebee431b4e0071ae273  logjam-4.5.3.tar.bz2
+aebe99f64fa31fdf5e83ed55d319e76a  logjam-git-20090824.tar.bz2



From spot at fedoraproject.org  Mon Aug 24 16:33:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:33:08 +0000 (UTC)
Subject: rpms/logjam/F-11 sources,1.8,1.9
Message-ID: <20090824163308.6BC6211C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3333/F-11

Modified Files:
	sources 
Log Message:
new source


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Feb 2006 23:09:51 -0000	1.8
+++ sources	24 Aug 2009 16:33:08 -0000	1.9
@@ -1 +1 @@
-48092c00e1f40ebee431b4e0071ae273  logjam-4.5.3.tar.bz2
+aebe99f64fa31fdf5e83ed55d319e76a  logjam-git-20090824.tar.bz2



From spot at fedoraproject.org  Mon Aug 24 16:33:08 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:33:08 +0000 (UTC)
Subject: rpms/logjam/devel .cvsignore,1.6,1.7 sources,1.8,1.9
Message-ID: <20090824163308.A567B11C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3333/devel

Modified Files:
	.cvsignore sources 
Log Message:
new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Feb 2006 23:09:51 -0000	1.6
+++ .cvsignore	24 Aug 2009 16:33:08 -0000	1.7
@@ -1,4 +1 @@
-logjam-4.4.1.tar.bz2
-logjam-4.5.1.tar.bz2
-logjam-4.5.2.tar.bz2
-logjam-4.5.3.tar.bz2
+logjam-git-20090824.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Feb 2006 23:09:51 -0000	1.8
+++ sources	24 Aug 2009 16:33:08 -0000	1.9
@@ -1 +1 @@
-48092c00e1f40ebee431b4e0071ae273  logjam-4.5.3.tar.bz2
+aebe99f64fa31fdf5e83ed55d319e76a  logjam-git-20090824.tar.bz2



From karsten at fedoraproject.org  Mon Aug 24 16:44:29 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 24 Aug 2009 16:44:29 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.17,1.18
Message-ID: <20090824164429.D9F6D11C0044@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6381

Modified Files:
	tigervnc.spec 
Log Message:
- fix ifnarch s390x for server-module


Index: tigervnc.spec
===================================================================
RCS file: /cvs/extras/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- tigervnc.spec	21 Aug 2009 16:08:32 -0000	1.17
+++ tigervnc.spec	24 Aug 2009 16:44:29 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.91
-Release:	0.16%{?dist}
+Release:	0.17%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -79,11 +79,11 @@ Obsoletes:	vnc-server < 4.1.3-2, vnc-lib
 Provides:	tightvnc-server-module = 1.5.0-0.15.20090204svn3586
 Obsoletes:	tightvnc-server-module < 1.5.0-0.15.20090204svn3586
 Requires:	xorg-x11-server-Xorg
-%endif
 
 %description server-module
 This package contains libvnc.so module to X server, allowing others
 to access the desktop on your machine.
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -246,6 +246,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 0.0.91-0.17
+- fix ifnarch s390x for server-module
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.0.91-0.16
 - rebuilt with new openssl
 



From shakthimaan at fedoraproject.org  Mon Aug 24 16:45:29 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Mon, 24 Aug 2009 16:45:29 +0000 (UTC)
Subject: rpms/mcu8051ide/F-10 mcu8051-1.1-desktop-exec-path-fix.patch, 1.2, 
	1.3 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mcu8051ide.spec,
	1.2, 1.3 sources, 1.3, 1.4 add-she-bang-itcl.patch, 1.1, NONE
Message-ID: <20090824164529.77BB711C0044@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6603/F-10

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Added Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
Removed Files:
	add-she-bang-itcl.patch 
Log Message:
Updated mcu8051ide to upstream 1.3 sources.


mcu8051-1.1-desktop-exec-path-fix.patch:
 mcu8051ide.desktop |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: mcu8051-1.1-desktop-exec-path-fix.patch
===================================================================
RCS file: mcu8051-1.1-desktop-exec-path-fix.patch
diff -N mcu8051-1.1-desktop-exec-path-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mcu8051-1.1-desktop-exec-path-fix.patch	24 Aug 2009 16:45:29 -0000	1.3
@@ -0,0 +1,20 @@
+diff -up mcu8051ide-1.1/mcu8051ide.desktop.fix mcu8051ide-1.1/mcu8051ide.desktop
+--- mcu8051ide-1.1/mcu8051ide.desktop.fix	2009-05-26 20:10:28.000000000 +0530
++++ mcu8051ide-1.1/mcu8051ide.desktop	2009-05-26 20:10:49.000000000 +0530
+@@ -3,14 +3,13 @@ Categories=Development;
+ Comment=Graphical IDE for MCS-51 based microcontrollers
+ Comment[en_US]=Graphical IDE for MCS-51 based microcontrollers
+ Encoding=UTF-8
+-Exec[$e]=mcu8051ide
++Exec=mcu8051ide
+ GenericName=MCU 8051 IDE
+ GenericName[en_US]=MCU 8051 IDE
+-Icon=mcu8051ide.png
++Icon=mcu8051ide
+ MimeType=
+ Name=MCU 8051 IDE
+ Name[en_US]=MCU 8051 IDE
+-Path[$e]=
+ StartupNotify=false
+ Terminal=false
+ TerminalOptions=


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 17:21:37 -0000	1.3
+++ .cvsignore	24 Aug 2009 16:45:29 -0000	1.4
@@ -1 +1 @@
-mcu8051ide-1.2.tar.gz
+mcu8051ide-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Aug 2009 17:21:37 -0000	1.2
+++ import.log	24 Aug 2009 16:45:29 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/mcu8051ide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mcu8051ide.spec	7 Aug 2009 17:21:37 -0000	1.2
+++ mcu8051ide.spec	24 Aug 2009 16:45:29 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           mcu8051ide
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
@@ -7,7 +7,7 @@ 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
+Patch0:         mcu8051-1.1-desktop-exec-path-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,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 +24,7 @@ Integrated Development Enviroment for so
 
 %prep
 %setup -q 
-%patch0 -p1 -b .fix
+%patch0 -p1 -b .desktop
 
 %build
 %configure
@@ -55,6 +55,12 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* 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-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 17:21:37 -0000	1.3
+++ sources	24 Aug 2009 16:45:29 -0000	1.4
@@ -1 +1 @@
-caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz
+b656a4e71be3f661e956657da9b5cd13  mcu8051ide-1.3.tar.gz


--- add-she-bang-itcl.patch DELETED ---



From shakthimaan at fedoraproject.org  Mon Aug 24 16:47:29 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Mon, 24 Aug 2009 16:47:29 +0000 (UTC)
Subject: rpms/mcu8051ide/F-11 mcu8051-1.1-desktop-exec-path-fix.patch, 1.2, 
	1.3 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mcu8051ide.spec,
	1.2, 1.3 sources, 1.3, 1.4 add-she-bang-itcl.patch, 1.1, NONE
Message-ID: <20090824164729.70D3211C0044@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7102/F-11

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Added Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
Removed Files:
	add-she-bang-itcl.patch 
Log Message:
Updated to mcu8051ide 1.3 upstream sources.


mcu8051-1.1-desktop-exec-path-fix.patch:
 mcu8051ide.desktop |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: mcu8051-1.1-desktop-exec-path-fix.patch
===================================================================
RCS file: mcu8051-1.1-desktop-exec-path-fix.patch
diff -N mcu8051-1.1-desktop-exec-path-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mcu8051-1.1-desktop-exec-path-fix.patch	24 Aug 2009 16:47:28 -0000	1.3
@@ -0,0 +1,20 @@
+diff -up mcu8051ide-1.1/mcu8051ide.desktop.fix mcu8051ide-1.1/mcu8051ide.desktop
+--- mcu8051ide-1.1/mcu8051ide.desktop.fix	2009-05-26 20:10:28.000000000 +0530
++++ mcu8051ide-1.1/mcu8051ide.desktop	2009-05-26 20:10:49.000000000 +0530
+@@ -3,14 +3,13 @@ Categories=Development;
+ Comment=Graphical IDE for MCS-51 based microcontrollers
+ Comment[en_US]=Graphical IDE for MCS-51 based microcontrollers
+ Encoding=UTF-8
+-Exec[$e]=mcu8051ide
++Exec=mcu8051ide
+ GenericName=MCU 8051 IDE
+ GenericName[en_US]=MCU 8051 IDE
+-Icon=mcu8051ide.png
++Icon=mcu8051ide
+ MimeType=
+ Name=MCU 8051 IDE
+ Name[en_US]=MCU 8051 IDE
+-Path[$e]=
+ StartupNotify=false
+ Terminal=false
+ TerminalOptions=


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 17:24:06 -0000	1.3
+++ .cvsignore	24 Aug 2009 16:47:28 -0000	1.4
@@ -1 +1 @@
-mcu8051ide-1.2.tar.gz
+mcu8051ide-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Aug 2009 17:24:06 -0000	1.2
+++ import.log	24 Aug 2009 16:47:28 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/mcu8051ide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mcu8051ide.spec	7 Aug 2009 17:24:07 -0000	1.2
+++ mcu8051ide.spec	24 Aug 2009 16:47:29 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           mcu8051ide
-Version:        1.2
+Version:        1.3
 Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
@@ -7,7 +7,7 @@ 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
+Patch0:         mcu8051-1.1-desktop-exec-path-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,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 +24,7 @@ Integrated Development Enviroment for so
 
 %prep
 %setup -q 
-%patch0 -p1 -b .fix
+%patch0 -p1 -b .desktop
 
 %build
 %configure
@@ -55,6 +55,12 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* 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-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 17:24:07 -0000	1.3
+++ sources	24 Aug 2009 16:47:29 -0000	1.4
@@ -1 +1 @@
-caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz
+b656a4e71be3f661e956657da9b5cd13  mcu8051ide-1.3.tar.gz


--- add-she-bang-itcl.patch DELETED ---



From spot at fedoraproject.org  Mon Aug 24 16:58:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:58:03 +0000 (UTC)
Subject: rpms/logjam/EL-4 logjam.spec,1.20,1.21
Message-ID: <20090824165803.7D90011C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9095/EL-4

Modified Files:
	logjam.spec 
Log Message:
fix epel


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-4/logjam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- logjam.spec	24 Aug 2009 16:31:02 -0000	1.20
+++ logjam.spec	24 Aug 2009 16:58:03 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	36%{?dist}
+Release:	36%{?dist}.1
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -21,7 +21,7 @@ BuildRequires:	xmms-devel
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
-BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	autoconf, automake, libtool, intltool, popt, m4
 BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,9 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36.1
+- EL-4: Use popt, not popt-devel
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
 - use properly formed user-agent string (Andy Shevchenko) (bz 518757)
 - rebase to git master (bz 518758)



From spot at fedoraproject.org  Mon Aug 24 16:58:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 16:58:03 +0000 (UTC)
Subject: rpms/logjam/EL-5 logjam.spec,1.33,1.34
Message-ID: <20090824165803.93C7E11C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9095/EL-5

Modified Files:
	logjam.spec 
Log Message:
fix epel


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-5/logjam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- logjam.spec	24 Aug 2009 16:31:03 -0000	1.33
+++ logjam.spec	24 Aug 2009 16:58:03 -0000	1.34
@@ -1,8 +1,8 @@
-%define use_xmms 1
+%define use_xmms 0
 
 Name:		logjam
 Version:	4.5.3
-Release:	36%{?dist}
+Release:	36%{?dist}.1
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -136,6 +136,9 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36.1
+- EL-5: Use popt, not popt-devel, also disable xmms
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
 - use properly formed user-agent string (Andy Shevchenko) (bz 518757)
 - rebase to git master (bz 518758)



From spot at fedoraproject.org  Mon Aug 24 17:06:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 17:06:45 +0000 (UTC)
Subject: rpms/logjam/EL-5 logjam.spec,1.34,1.35
Message-ID: <20090824170645.4251111C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/logjam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10749

Modified Files:
	logjam.spec 
Log Message:
actually apply popt fix


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/EL-5/logjam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- logjam.spec	24 Aug 2009 16:58:03 -0000	1.34
+++ logjam.spec	24 Aug 2009 17:06:45 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	36%{?dist}.1
+Release:	36%{?dist}.2
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -21,7 +21,7 @@ BuildRequires:	xmms-devel
 BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
-BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
+BuildRequires:	autoconf, automake, libtool, intltool, popt, m4
 BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,8 +136,11 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36.2
+- EL-5: Use popt, not popt-devel
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36.1
-- EL-5: Use popt, not popt-devel, also disable xmms
+- EL-5: Disable xmms
 
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
 - use properly formed user-agent string (Andy Shevchenko) (bz 518757)



From mschwendt at fedoraproject.org  Mon Aug 24 17:50:31 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 24 Aug 2009 17:50:31 +0000 (UTC)
Subject: extras-repoclosure rc-report.py,1.65,1.66
Message-ID: <20090824175031.76E5611C0376@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19663

Modified Files:
	rc-report.py 
Log Message:
update the whitelist
 - drop Fedora 7 entries
 - keep kmod*
 - send no mail for llvm-devel.ppc64 in F10 ppc



Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- rc-report.py	5 Aug 2009 09:50:39 -0000	1.65
+++ rc-report.py	24 Aug 2009 17:50:30 -0000	1.66
@@ -55,12 +55,14 @@
 
 
 def whiteListed(b): # Just a hook, not a generic white-list feature.
-    # These two in Fedora 7 Everything most likely won't be fixed.
-    if b.name.startswith('kmod-em8300') and b.repoid.startswith('fedora-7'):
+    if b.name.startswith('kmod'):  # gah ;)  temporarily catch them all
         return True
-    elif b.name.startswith('kmod-sysprof') and b.repoid.startswith('fedora-7'):
-        return True
-    elif b.name.startswith('kmod'):  # gah ;)  temporarily catch them all
+    else:
+        return False
+
+
+def noMailWhiteList(b):
+    if b.name.startswith('llvm-devel') and b.repoid.startswith('fedora-10-ppc'):
         return True
     else:
         return False
@@ -273,6 +275,8 @@
 if not opts.noowners:
     brokendeps.sort(bdSortByOwnerAndName)
     for b in brokendeps:
+        if noMailWhiteList(b):
+            continue
         if b.new:
             print 'NEW breakage: %s in %s' % (b.pkgid, b.repoid)
         if b.mail:



From overholt at fedoraproject.org  Mon Aug 24 17:57:54 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 24 Aug 2009 17:57:54 +0000 (UTC)
Subject: rpms/maven2/devel maven2-2.0.8-excludeexternaljars.patch, NONE,
	1.1 maven2-enable-bootstrap-repository.patch, NONE,
	1.1 maven2-plugins-catch-uncaught-exceptions.patch, NONE,
	1.1 maven2-plugins-dependency-plugin-import-fix.patch, NONE,
	1.1 maven2-plugins-disablecobertura.patch, NONE,
	1.1 maven2-plugins-doxiaupdatefix.patch, NONE,
	1.1 maven2-shade-plugin-replacement.patch, NONE,
	1.1 maven2-site-plugin-addservletdep.patch, NONE,
	1.1 maven2-use-unversioned-classworlds.patch, NONE,
	1.1 maven2-versionless-depmap.xml, NONE, 1.1 .cvsignore, 1.2,
	1.3 maven2.spec, 1.20, 1.21 sources, 1.2,
	1.3 maven2-MNG-3118.patch, 1.2,
	NONE maven2-addjdomtobootstrappath.patch, 1.1,
	NONE maven2-ant17.patch, 1.1, NONE maven2-buildallplugins.patch,
	1.1, NONE maven2-commons-cli-1.1.patch, 1.1,
	NONE maven2-disable-itests.patch, 1.1,
	NONE maven2-enable-unbuilt-modules.patch, 1.1,
	NONE maven2-fastjar-manifest-fix.patch, 1.1,
	NONE maven2-jpprepolayout.patch, 1.1,
	NONE maven2-noexternaljavadoclinks.patch, 1.1,
	NONE maven2-plugins-disablecglib.patch, 1.1,
	NONE maven2-plugins-plexus151.patch, 1.1, NONE
Message-ID: <20090824175754.5FBA311C0044@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21389

Modified Files:
	.cvsignore maven2.spec sources 
Added Files:
	maven2-2.0.8-excludeexternaljars.patch 
	maven2-enable-bootstrap-repository.patch 
	maven2-plugins-catch-uncaught-exceptions.patch 
	maven2-plugins-dependency-plugin-import-fix.patch 
	maven2-plugins-disablecobertura.patch 
	maven2-plugins-doxiaupdatefix.patch 
	maven2-shade-plugin-replacement.patch 
	maven2-site-plugin-addservletdep.patch 
	maven2-use-unversioned-classworlds.patch 
	maven2-versionless-depmap.xml 
Removed Files:
	maven2-MNG-3118.patch maven2-addjdomtobootstrappath.patch 
	maven2-ant17.patch maven2-buildallplugins.patch 
	maven2-commons-cli-1.1.patch maven2-disable-itests.patch 
	maven2-enable-unbuilt-modules.patch 
	maven2-fastjar-manifest-fix.patch maven2-jpprepolayout.patch 
	maven2-noexternaljavadoclinks.patch 
	maven2-plugins-disablecglib.patch 
	maven2-plugins-plexus151.patch 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.1
- Import 2.0.8 work from Deepak Bhole
- Explicitly disable gcj support
- Set bootstrap
- Fix up LICENSE.txt files

maven2-2.0.8-excludeexternaljars.patch:
 pom.xml |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE maven2-2.0.8-excludeexternaljars.patch ---
--- ./maven2/maven-core/pom.xml.sav	2007-12-12 16:21:15.000000000 -0500
+++ ./maven2/maven-core/pom.xml	2007-12-12 16:21:10.000000000 -0500
@@ -39,21 +39,23 @@
                   <exclude>junit:junit</exclude>
                   <exclude>jmock:jmock</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
+                  <exclude>com.jcraft:jsch</exclude>
+                  <exclude>org.codehaus.plexus:plexus-utils</exclude>
+                  <exclude>commons-cli:commons-cli</exclude>
+                  <exclude>org.apache.maven.doxia:doxia-sink-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-file</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-shared</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-provider-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-common</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-external</exclude>
+                  <exclude>org.codehaus.plexus:plexus-container-default</exclude>
+                  <exclude>org.codehaus.plexus:plexus-interactivity-api</exclude>
+                  <exclude>jdom:jdom</exclude>
+                  <exclude>jtidy:jtidy</exclude>
                 </excludes>
               </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.Xpp3Dom
-                    </exclude>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.pull.*
-                    </exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
             </configuration>
           </execution>
         </executions>

maven2-enable-bootstrap-repository.patch:
 pom-4.0.0.xml |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE maven2-enable-bootstrap-repository.patch ---
--- maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2008-01-02 19:54:58.000000000 -0500
+++ maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-01-02 19:56:27.000000000 -0500
@@ -24,6 +24,15 @@ under the License.
 
   <repositories>
     <repository>
+      <id>bootstrap_repo</id>
+      <name>Maven Bootstrap Repository</name>
+      <layout>jpp</layout>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Repository</name>
       <layout>jpp</layout>
@@ -48,6 +57,18 @@ under the License.
 
   <pluginRepositories>
      <pluginRepository>
+      <id>bootstrap_repo</id>
+      <name>Maven Bootstrap Plugin Repository</name>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <layout>jpp</layout>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+     </pluginRepository>
+     <pluginRepository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Plugin Repository</name>
       <url>file:///usr/share/maven2/repository</url>

maven2-plugins-catch-uncaught-exceptions.patch:
 maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java    |    5 +++++
 maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java |    5 +++++
 2 files changed, 10 insertions(+)

--- NEW FILE maven2-plugins-catch-uncaught-exceptions.patch ---
--- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav	2007-10-16 10:25:00.000000000 -0400
+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java	2007-10-16 10:26:27.000000000 -0400
@@ -241,6 +241,11 @@ public abstract class AbstractDependency
             throw new MojoExecutionException( "Error unpacking file: " + file + " to: " + location + "\r\n"
                 + e.toString(), e );
         }
+        catch ( IOException ioe )
+        {   
+            throw new MojoExecutionException( "I/O exception when unpacking file: " + file, ioe );
+        }
+
     }
 
     private void silenceUnarchiver( UnArchiver unArchiver )
--- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java.sav	2007-10-16 10:23:42.000000000 -0400
+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java	2007-10-16 10:26:51.000000000 -0400
@@ -62,6 +62,11 @@ public final class AssemblyFileUtils
         {
             throw new ArchiveExpansionException( "Error unpacking file: " + source + "to: " + destDir, e );
         }
+        catch ( IOException ioe )
+        {   
+            throw new ArchiveExpansionException( "I/O exception when unpacking file: " + source, ioe );
+        }
+
     }
 
     /**

maven2-plugins-dependency-plugin-import-fix.patch:
 AbstractDependencyMojo.java |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE maven2-plugins-dependency-plugin-import-fix.patch ---
--- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav	2007-10-17 17:23:05.000000000 -0400
+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java	2007-10-17 17:24:49.000000000 -0400
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.dependen
  */
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 

maven2-plugins-disablecobertura.patch:
 maven-dependency-plugin/pom.xml |   15 ---------------
 maven-enforcer-plugin/pom.xml   |   15 ---------------
 2 files changed, 30 deletions(-)

--- NEW FILE maven2-plugins-disablecobertura.patch ---
diff -up ./maven2-plugins/maven-dependency-plugin/pom.xml.sav ./maven2-plugins/maven-dependency-plugin/pom.xml
--- ./maven2-plugins/maven-dependency-plugin/pom.xml.sav	2007-07-04 12:36:14.000000000 -0400
+++ ./maven2-plugins/maven-dependency-plugin/pom.xml	2008-04-03 15:01:06.000000000 -0400
@@ -75,21 +75,6 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 		<resources>
 			<!-- Include the apache process LICENSE and NOTICE files.-->
 			<!--uncomment for release. Commented out for now to enable eclipse-plugin to work-->
diff -up ./maven2-plugins/maven-enforcer-plugin/pom.xml.sav ./maven2-plugins/maven-enforcer-plugin/pom.xml
--- ./maven2-plugins/maven-enforcer-plugin/pom.xml.sav	2008-04-03 15:01:20.000000000 -0400
+++ ./maven2-plugins/maven-enforcer-plugin/pom.xml	2008-04-03 15:01:35.000000000 -0400
@@ -53,21 +53,6 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 		<resources>
 			<!-- Include super-pom defined main/resources
 			Removing this section will break the build.

maven2-plugins-doxiaupdatefix.patch:
 maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java   |   15 ++--------
 maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java |   14 ++-------
 2 files changed, 7 insertions(+), 22 deletions(-)

--- NEW FILE maven2-plugins-doxiaupdatefix.patch ---
--- ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.sav	2007-10-15 16:29:04.000000000 -0400
+++ ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2007-10-15 17:15:42.000000000 -0400
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.javadoc;
  * under the License.
  */
 
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -214,20 +215,11 @@ public class JavadocReport
     {
         try
         {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
+            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
+            SiteRendererSink sink = new SiteRendererSink( context );
 
             generate( sink, Locale.getDefault() );
         }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
         catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
--- ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java.sav	2007-10-15 16:27:27.000000000 -0400
+++ ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java	2007-10-15 17:15:23.000000000 -0400
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -218,20 +219,12 @@ public class AntlrHtmlReport
     {
         try
         {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
+            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
+    
+            SiteRendererSink sink = new SiteRendererSink( context );
 
             generate( sink, Locale.getDefault() );
         }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
         catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )

maven2-shade-plugin-replacement.patch:
 pom.xml |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE maven2-shade-plugin-replacement.patch ---
diff -up ./maven2/maven-core/pom.xml.sav ./maven2/maven-core/pom.xml
--- ./maven2/maven-core/pom.xml.sav	2008-04-07 20:42:34.000000000 -0400
+++ ./maven2/maven-core/pom.xml	2008-04-07 21:26:45.000000000 -0400
@@ -10,9 +10,9 @@
   <build>
     <plugins>
       <plugin>
-	    <groupId>org.codehaus.mojo</groupId>
-        <artifactId>shade-maven-plugin</artifactId>
-        <version>1.0-alpha-13</version>
+	    <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -28,7 +28,7 @@
                 true
               </keepDependenciesWithProvidedScope>
               <transformers>
-                <transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
               </transformers>
               <artifactSet>
                 <excludes>
@@ -196,4 +196,4 @@
       <artifactId>classworlds</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

maven2-site-plugin-addservletdep.patch:
 pom.xml |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE maven2-site-plugin-addservletdep.patch ---
--- ./maven2-plugins/maven-site-plugin/pom.xml.sav	2007-12-17 15:45:29.000000000 -0500
+++ ./maven2-plugins/maven-site-plugin/pom.xml	2007-12-17 15:45:44.000000000 -0500
@@ -190,6 +190,11 @@ under the License.
       <version>6.0.0rc0</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
       <version>1.0-beta-1</version>

maven2-use-unversioned-classworlds.patch:
 mvn |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maven2-use-unversioned-classworlds.patch ---
--- maven2/maven-core/src/bin/mvn.sav	2008-01-02 19:45:36.000000000 -0500
+++ maven2/maven-core/src/bin/mvn	2008-01-02 19:45:48.000000000 -0500
@@ -160,7 +160,7 @@ fi
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/boot/classworlds-*.jar \
+  -classpath "${M2_HOME}"/boot/classworlds*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}"  \
   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS


--- NEW FILE maven2-versionless-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>commons-collections</groupId>
			<artifactId>commons-collections</artifactId>
			<version>2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-collections</artifactId>
			<version>2.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-httpclient</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-net</groupId>
			<artifactId>commons-net</artifactId>
			<version>1.1.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-net</artifactId>
			<version>1.1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>clover</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.11</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.11</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>com.cenqua.clover</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.12</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.12</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>doxia</groupId>
			<artifactId>doxia-sink-api</artifactId>
			<version>1.0-alpha-4</version>
		</maven>
		<jpp>
			<groupId>JPP/maven-doxia</groupId>
			<artifactId>sink-api</artifactId>
			<version>1.0-alpha-4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>doxia</groupId>
			<artifactId>doxia-core</artifactId>
			<version>1.0-alpha-4</version>
		</maven>
		<jpp>
			<groupId>JPP/maven-doxia</groupId>
			<artifactId>core</artifactId>
			<version>1.0-alpha-4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>bsh</groupId>
			<artifactId>bsh</artifactId>
			<version>1.3.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bsh</artifactId>
			<version>1.3.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>checkstyle</groupId>
			<artifactId>checkstyle</artifactId>
			<version>4.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>checkstyle</artifactId>
			<version>4.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>checkstyle</groupId>
			<artifactId>checkstyle-optional</artifactId>
			<version>4.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>checkstyle</artifactId>
			<version>1.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>oro</groupId>
			<artifactId>oro</artifactId>
			<version>2.0.7</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>oro</artifactId>
			<version>2.0.7</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-beanutils</groupId>
			<artifactId>commons-beanutils</artifactId>
			<version>1.7.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-beanutils</artifactId>
			<version>1.7.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-beanutils</groupId>
			<artifactId>commons-beanutils-core</artifactId>
			<version>1.7.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-beanutils</artifactId>
			<version>1.7.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-codec</groupId>
			<artifactId>commons-codec</artifactId>
			<version>1.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-codec</artifactId>
			<version>1.3</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-logging</groupId>
			<artifactId>commons-logging-api</artifactId>
			<version>1.0.4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-logging-api</artifactId>
			<version>1.0.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-logging</groupId>
			<artifactId>commons-logging</artifactId>
			<version>1.0.4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-logging</artifactId>
			<version>1.0.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>ant</groupId>
			<artifactId>ant-launcher</artifactId>
			<version>1.6.5</version>
		</maven>
[...3660 lines suppressed...]
            <artifactId>core</artifactId>
            <version>1.0-alpha-15</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-site</artifactId>
            <version>1.0-alpha-15</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>site</artifactId>
            <version>1.0-alpha-15</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-ojb</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-ojb</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-jpa</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-jpa</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-hibernate-store</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-hibernate-store</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-ldap</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-ldap</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-prevayler</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-prevayler</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-dom4j</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-dom4j</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugins-sandbox</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugins-sandbox</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-stash</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-stash</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-dtd</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-dtd</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-velocity</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-velocity</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-jdbc</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-jdbc</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello</artifactId>
            <version>1.0-alpha-15</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>modello</artifactId>
            <version>1.0-alpha-15</version>
        </jpp>
        </dependency>

    <!-- dependencies cancelled out just for maven -->
	<dependency>
		<maven>
			<groupId>jmock</groupId>
			<artifactId>jmock</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP/maven2</groupId>
			<artifactId>empty-dep</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>jmock</groupId>
			<artifactId>jmock-cglib</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP/maven2</groupId>
			<artifactId>empty-dep</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>
</dependencies>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2007 00:52:40 -0000	1.2
+++ .cvsignore	24 Aug 2009 17:57:53 -0000	1.3
@@ -5,3 +5,4 @@ maven2-maven-site-plugin.tar.gz
 maven2-model-v3.jar
 maven2-plugins-060420-src.tar.gz
 maven2-src.tar.gz
+maven2-plugins-070705-src.tar.gz


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 maven2.specIndex: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- maven2.spec	25 Jul 2009 11:52:09 -0000	1.20
+++ maven2.spec	24 Aug 2009 17:57:54 -0000	1.21
@@ -28,18 +28,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define gcj_support 0
 
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
-%define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
-%define _with_bootstrap 1
+%define with_bootstrap 1
+%define without_bootstrap 0
 
-%define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
-%define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
-
-%define maven_version   2.0.4
+%define maven_version   2.0.8
 %define NONFREE 0
 
 %define base_name maven
@@ -50,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        12.19%{?dist}
+Release:        1.1%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -58,13 +54,13 @@ Group:          Development/Build Tools
 License:        ASL 2.0 and MIT and BSD
 URL:            http://maven.apache.org/
 
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.4 maven2
+# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven2
 # tar czf maven2-src.tar.gz maven2
 Source0:        %{name}-src.tar.gz
 
-# svn export -r {2006-04-20} http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
-# tar czf maven2-plugins-060420-src.tar.gz maven2-plugins
-Source2:        %{name}-plugins-060420-src.tar.gz
+# svn export -r {2007-07-05} http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
+# tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
+Source2:        %{name}-plugins-070705-src.tar.gz
 
 # No source location for these. They are ascii files generated from maven
 # repositories, and are not in cvs/svn
@@ -86,32 +82,33 @@ Source8:        %{name}-maven-site-plugi
 
 Source9:          %{name}-run-it-tests.sh
 
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.4/maven-model
+# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
 # cd maven-model
 # mvn -P all-models package 
-# Find model jar in target/maven-model-2.0.4.jar
+# Find model jar in target/maven-model-2.0.8.jar
 Source10:       %{name}-model-v3.jar
-Source11:        %{name}-MavenJPackageDepmap.java
-Source12:        %{name}-addjdom-depmap.xml
-Source13:        %{name}-empty-dep.pom
+Source11:       %{name}-MavenJPackageDepmap.java
+Source12:       %{name}-addjdom-depmap.xml
+Source13:       %{name}-empty-dep.pom
 
 # Empty jar file with just a manifest. No source destination to specify
-Source14:        %{name}-empty-dep.jar
-Source15:        %{name}-jpp-script
-Source16:        %{name}-jpp-readme.html
-
-Patch0:          maven2-disable-itests.patch
-Patch1:          maven2-addjdomtobootstrappath.patch
-Patch2:          maven2-plugins-plexus151.patch
-Patch3:          %{name}-jpprepolayout.patch
-Patch4:          %{name}-plugins-disablecglib.patch
-Patch5:          %{name}-buildallplugins.patch
-Patch6:          %{name}-enable-unbuilt-modules.patch
-Patch7:          %{name}-fastjar-manifest-fix.patch
-Patch8:          %{name}-noexternaljavadoclinks.patch 
-Patch9:          %{name}-ant17.patch
-Patch10:         %{name}-MNG-3118.patch
-Patch11:         %{name}-commons-cli-1.1.patch
+Source14:       %{name}-empty-dep.jar
+Source15:       %{name}-jpp-script
+Source16:       %{name}-jpp-readme.html
+Source17:       %{name}-versionless-depmap.xml
+
+Patch0:         maven2-addjdomtobootstrappath.patch
+Patch1:         %{name}-jpprepolayout.patch
+Patch2:         %{name}-fastjar-manifest-fix.patch
+Patch3:         %{name}-plugins-doxiaupdatefix.patch
+Patch4:         %{name}-plugins-catch-uncaught-exceptions.patch
+Patch5:         %{name}-plugins-dependency-plugin-import-fix.patch
+Patch6:         %{name}-%{version}-excludeexternaljars.patch
+Patch7:         %{name}-site-plugin-addservletdep.patch
+Patch8:         %{name}-enable-bootstrap-repository.patch
+Patch9:         %{name}-use-unversioned-classworlds.patch
+Patch10:        %{name}-plugins-disablecobertura.patch
+Patch11:        %{name}-shade-plugin-replacement.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    java-1.6.0-openjdk-devel
@@ -127,6 +124,7 @@ BuildRequires:    classworlds >= 1.1
 BuildRequires:    clover
 %endif
 BuildRequires:    dom4j >= 1.6.1
+BuildRequires:    tomcat5
 BuildRequires:    tomcat5-servlet-2.4-api
 BuildRequires:    gnu.regexp >= 1.1.4
 BuildRequires:    httpunit >= 1.6
@@ -144,12 +142,9 @@ BuildRequires:    jline >= 0.8.1
 BuildRequires:    jsch >= 0.1.20
 BuildRequires:    jtidy >= 1.0
 BuildRequires:    junit >= 3.8.2
-BuildRequires:    maven2-common-poms >= 1.0-4
-BuildRequires:    maven-doxia >= 1.0-0.a7.3
+BuildRequires:    maven2-common-poms >= 1.0-8
 BuildRequires:    maven-jxr >= 1.0-2
-BuildRequires:    maven-surefire >= 1.5.3-2
-BuildRequires:    maven-surefire-booter >= 1.5.3-2
-BuildRequires:    maven-wagon >= 1.0
+BuildRequires:    maven-wagon >= 1.0-0.1.b2
 BuildRequires:    nekohtml >= 0.9.3
 BuildRequires:    oro >= 2.0.8
 BuildRequires:    plexus-ant-factory >= 1.0-0.a1.2
@@ -168,6 +163,8 @@ BuildRequires:    saxon-scripts
 BuildRequires:    velocity >= 1.4
 BuildRequires:    xerces-j2 >= 2.7.1
 BuildRequires:    xalan-j2 >= 2.6.0
+BuildRequires:    xmlrpc
+BuildRequires:    xmlunit
 
 %if %{with_itests}
 BuildRequires:    log4j >= 1.2.13
@@ -176,6 +173,7 @@ BuildRequires:    xml-commons-apis >= 1.
 
 %if %{without_bootstrap}
 BuildRequires:    %{name} = %{epoch}:%{version}
+BuildRequires:    maven2-plugin-ant
 BuildRequires:    maven2-plugin-assembly
 BuildRequires:    maven2-plugin-clean
 BuildRequires:    maven2-plugin-compiler
@@ -183,20 +181,25 @@ BuildRequires:    maven2-plugin-install
 BuildRequires:    maven2-plugin-jar
 BuildRequires:    maven2-plugin-javadoc
 BuildRequires:    maven2-plugin-plugin
-BuildRequires:    maven2-plugin-release
 BuildRequires:    maven2-plugin-resources
 BuildRequires:    maven2-plugin-site
 BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-archiver
+BuildRequires:    maven-doxia >= 1.0-0.a9
 BuildRequires:    maven-scm >= 0:1.0-0.b3.2
 BuildRequires:    maven-scm-test >= 0:1.0-0.b3.2
 BuildRequires:    maven-shared-file-management >= 1.0-4
 BuildRequires:    maven-shared-plugin-testing-harness >= 1.0-4
-BuildRequires:  modello >= 1.0-0.a8.3
+BuildRequires:    maven-surefire >= 2.0
+BuildRequires:    maven-surefire-booter >= 2.0
+BuildRequires:    modello >= 1.0-0.a8.3
 BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires:    plexus-maven-plugin >= 1.3.5
 %endif
 
 Requires:        ant >= 1.6.5
 Requires:        antlr >= 2.7.4
+Requires:    	 aqute-bndlib
 Requires:        bsh >= 1.3.0
 #Requires:       cglib >= 2.1.0
 Requires:        checkstyle >= 4.1
@@ -228,14 +231,10 @@ Requires:        jsch >= 0.1.20
 Requires(post):  jsch >= 0.1.20
 Requires:        jtidy >= 1.0
 Requires:        junit >= 3.8.2
-Requires:        maven2-common-poms >= 1.0-4
-Requires:        maven-doxia >= 1.0-0.a7.3
-Requires(post):  maven-doxia >= 1.0-0.a7.3
+Requires:        maven2-common-poms >= 1.0-8
 Requires:        maven-jxr >= 1.0
-Requires:        maven-surefire >= 1.5.3-2
-Requires:        maven-surefire-booter >= 1.5.3-2
-Requires:        maven-wagon >= 1.0
-Requires(post):  maven-wagon >= 1.0
+Requires:        maven-wagon >= 1.0-0.1.b2
+Requires(post):  maven-wagon >= 1.0-0.1.b2
 Requires:        nekohtml >= 0.9.3
 Requires:        oro >= 2.0.8
 Requires:        plexus-ant-factory >= 1.0-0.a1.2
@@ -256,16 +255,28 @@ Requires:        rhino >= 1.5
[...1806 lines suppressed...]
+%{_datadir}/%{name}/plugins/javadoc-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jxr-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/javadoc-plugin*.jar.*
 %endif
 
 
 %files plugin-one
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/one-plugin.jar
+%{_datadir}/%{name}/plugins/one-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/one-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/one-plugin*.jar.*
 %endif
 
 
 %files plugin-plugin
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/plugin-plugin.jar
+%{_datadir}/%{name}/plugins/plugin-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin*.jar.*
 %endif
 
 
 %files plugin-pmd
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/pmd-plugin.jar
+%{_datadir}/%{name}/plugins/pmd-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/pmd-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/pmd-plugin*.jar.*
 %endif
 
 
 %files plugin-project-info-reports
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/project-info-reports-plugin.jar
+%{_datadir}/%{name}/plugins/project-info-reports-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/project-info-reports-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/project-info-reports-plugin*.jar.*
 %endif
 
 
 %files plugin-rar
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/rar-plugin.jar
+%{_datadir}/%{name}/plugins/rar-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/rar-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/rar-plugin*.jar.*
 %endif
 
 
-%files plugin-release
+%files plugin-remote-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/release-plugin.jar
+%{_datadir}/%{name}/plugins/remote-resources-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/release-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin.jar.*
 %endif
 
 
@@ -2216,90 +2603,84 @@ fi
 %defattr(-,root,root,-)
 %doc maven2-plugins/maven-repository-plugin/LICENSE.txt
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/repository-plugin.jar
+%{_datadir}/%{name}/plugins/repository-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-plugin*.jar.*
 %endif
 
 %files plugin-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/resources-plugin.jar
+%{_datadir}/%{name}/plugins/resources-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/resources-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/resources-plugin*.jar.*
 %endif
 
 
 %files plugin-site
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/site-plugin.jar
+%{_datadir}/%{name}/plugins/site-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/site-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/site-plugin*.jar.*
 %endif
 
 
 %files plugin-source
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/source-plugin.jar
+%{_datadir}/%{name}/plugins/source-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/source-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/source-plugin*.jar.*
 %endif
 
 
-%files plugin-surefire
+%files plugin-stage
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/surefire-plugin.jar
+%{_datadir}/%{name}/plugins/stage-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/surefire-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/stage-plugin*.jar.*
 %endif
 
-
-%files plugin-surefire-report
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/surefire-report-plugin.jar
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/surefire-report-plugin.jar.*
-%endif
-
-
 %files plugin-verifier
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/verifier-plugin.jar
+%{_datadir}/%{name}/plugins/verifier-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/verifier-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/verifier-plugin*.jar.*
 %endif
 
 
 %files plugin-war
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/war-plugin.jar
+%{_datadir}/%{name}/plugins/war-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/war-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/war-plugin*.jar.*
 %endif
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.1
+- Import 2.0.8 work from Deepak Bhole
+- Explicitly disable gcj support
+- Set bootstrap
+- Fix up LICENSE.txt files
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.4-12.19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2007 00:52:40 -0000	1.2
+++ sources	24 Aug 2009 17:57:54 -0000	1.3
@@ -1,7 +1,8 @@
-e6ad023874fce8fec9f8f975b96685c1  m2_jar_repo.tar.gz
-357c94ddd53c899169ff6da4d1b95b40  m2_pom_repo.tar.gz
 dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
 de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
-1b28906cd308ed60db75e2973f0fbb22  maven2-model-v3.jar
 d556f5883f89a7348de42767fcb1aabe  maven2-plugins-060420-src.tar.gz
-36465a60f5d7542c79df98ec6369205f  maven2-src.tar.gz
+13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
+a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
+ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
+b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
+e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz


--- maven2-MNG-3118.patch DELETED ---


--- maven2-addjdomtobootstrappath.patch DELETED ---


--- maven2-ant17.patch DELETED ---


--- maven2-buildallplugins.patch DELETED ---


--- maven2-commons-cli-1.1.patch DELETED ---


--- maven2-disable-itests.patch DELETED ---


--- maven2-enable-unbuilt-modules.patch DELETED ---


--- maven2-fastjar-manifest-fix.patch DELETED ---


--- maven2-jpprepolayout.patch DELETED ---


--- maven2-noexternaljavadoclinks.patch DELETED ---


--- maven2-plugins-disablecglib.patch DELETED ---


--- maven2-plugins-plexus151.patch DELETED ---



From overholt at fedoraproject.org  Mon Aug 24 17:58:34 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 24 Aug 2009 17:58:34 +0000 (UTC)
Subject: rpms/maven2/devel maven2-addjdomtobootstrappath.patch, 1.2,
	1.3 maven2-fastjar-manifest-fix.patch, 1.2,
	1.3 maven2-jpprepolayout.patch, 1.2, 1.3
Message-ID: <20090824175834.ED6FF11C0044@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21590

Added Files:
	maven2-addjdomtobootstrappath.patch 
	maven2-fastjar-manifest-fix.patch maven2-jpprepolayout.patch 
Log Message:
Re-add patches that were accidentally removed.

maven2-addjdomtobootstrappath.patch:
 MANIFEST.MF |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: maven2-addjdomtobootstrappath.patch
===================================================================
RCS file: maven2-addjdomtobootstrappath.patch
diff -N maven2-addjdomtobootstrappath.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven2-addjdomtobootstrappath.patch	24 Aug 2009 17:58:34 -0000	1.3
@@ -0,0 +1,8 @@
+diff -up ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF
+--- ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF.sav	2008-11-27 16:47:53.000000000 -0500
++++ ./maven2/bootstrap/bootstrap-installer/src/main/resources/META-INF/MANIFEST.MF	2008-11-27 16:48:22.000000000 -0500
+@@ -1,3 +1,3 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.maven.bootstrap.installer.BootstrapInstaller
+-Class-Path: bootstrap-mini-2.0.8-SNAPSHOT.jar plexus-utils-1.0.4.jar
++Class-Path: bootstrap-mini-2.0.8-SNAPSHOT.jar plexus-utils-1.0.4.jar jdom-1.0.jar

maven2-fastjar-manifest-fix.patch:
 build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: maven2-fastjar-manifest-fix.patch
===================================================================
RCS file: maven2-fastjar-manifest-fix.patch
diff -N maven2-fastjar-manifest-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven2-fastjar-manifest-fix.patch	24 Aug 2009 17:58:34 -0000	1.3
@@ -0,0 +1,9 @@
+--- ./maven2/bootstrap/bootstrap-mini/build.sav	2007-08-14 10:37:28.000000000 -0400
++++ ./maven2/bootstrap/bootstrap-mini/build	2007-08-14 10:36:09.000000000 -0400
+@@ -17,5 +17,5 @@ mkdir -p ${classesDir}
+ )
+ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+ 
+-( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
++( cd ${classesDir} ; /bin/cp -f ../../src/main/resources/META-INF/MANIFEST.MF META-INF/; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
+ ret=$?; if [ $ret != 0 ]; then exit $ret; fi

maven2-jpprepolayout.patch:
 bootstrap.sh                                                                                                             |    2 
 bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java                 |    9 +
 bootstrap/bootstrap-mini/build                                                                                           |    5 
 bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java                 |   20 +-
 bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java                                  |   77 +++++++++-
 maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java                          |   22 ++
 maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java |    4 
 maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java                     |    4 
 maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java                    |   33 +++-
 maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java                            |   12 +
 maven-artifact/src/main/resources/META-INF/plexus/components.xml                                                         |    6 
 maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java                                |    9 +
 maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java                               |   17 +-
 maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml                                                  |   21 ++
 14 files changed, 213 insertions(+), 28 deletions(-)

Index: maven2-jpprepolayout.patch
===================================================================
RCS file: maven2-jpprepolayout.patch
diff -N maven2-jpprepolayout.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ maven2-jpprepolayout.patch	24 Aug 2009 17:58:34 -0000	1.3
@@ -0,0 +1,478 @@
+--- ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav	2007-12-12 15:58:38.000000000 -0500
++++ ./maven2/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java	2007-12-12 15:59:53.000000000 -0500
+@@ -224,9 +224,16 @@ public class DefaultPluginVersionManager
+         }
+ 
+         // if we still haven't found a version, then fail early before we get into the update goop.
+-        if ( StringUtils.isEmpty( version ) )
++        if ( StringUtils.isEmpty( version ) && ((System.getProperty("maven2.offline.mode") == null) && 
++                                               (System.getProperty("maven2.jpp.mode") == null)))
++
+         {
+             throw new PluginVersionNotFoundException( groupId, artifactId );
++        } else if (((System.getProperty("maven2.offline.mode") != null) || 
++                    (System.getProperty("maven2.jpp.mode") != null))) {
++            // Doesn't matter what we have here. We need *something* because metadata 
++            // is not retrieved in offline mode, so there needs to be some kind of version
++            version = "2.0.8";
+         }
+ 
+         // if the plugin registry is inactive, then the rest of this goop is useless...
+--- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav	2007-12-12 15:59:59.000000000 -0500
++++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java	2007-12-12 16:01:51.000000000 -0500
+@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac
+ import org.apache.maven.artifact.handler.ArtifactHandler;
+ import org.apache.maven.artifact.metadata.ArtifactMetadata;
+ import org.apache.maven.artifact.repository.ArtifactRepository;
++import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
++
++import java.util.Hashtable;
+ 
+ /**
+  * @author jdcasey
+@@ -42,10 +45,24 @@ public class DefaultRepositoryLayout
+ 
+         StringBuffer path = new StringBuffer();
+ 
++        String baseVersion = artifact.getBaseVersion();
++        String version = artifact.getVersion();
++
++        if (( System.getProperty("maven2.offline.mode") != null  && 
++              System.getProperty("maven2.ignore.versions") != null ) || 
++            ( System.getProperty("maven2.jpp.mode") != null) ) { 
++            MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
++            Hashtable newInfo = map.getMappedInfo(artifact.getGroupId(), artifact.getArtifactId(), version);
++
++            //System.err.println("Replacing[1] " + baseVersion + " and " + version + " with " + (String) newInfo.get("version") + " in offline+ignore versions mode");
++            baseVersion = (String) newInfo.get("version");
++            version = baseVersion;
++        }
++
+         path.append( formatAsDirectory( artifact.getGroupId() ) ).append( PATH_SEPARATOR );
+         path.append( artifact.getArtifactId() ).append( PATH_SEPARATOR );
+-        path.append( artifact.getBaseVersion() ).append( PATH_SEPARATOR );
+-        path.append( artifact.getArtifactId() ).append( ARTIFACT_SEPARATOR ).append( artifact.getVersion() );
++        path.append( baseVersion ).append( PATH_SEPARATOR );
++        path.append( artifact.getArtifactId() ).append( ARTIFACT_SEPARATOR ).append( version );
+ 
+         if ( artifact.hasClassifier() )
+         {
+@@ -76,7 +93,17 @@ public class DefaultRepositoryLayout
+ 
+             if ( metadata.storedInArtifactVersionDirectory() )
+             {
+-                path.append( metadata.getBaseVersion() ).append( PATH_SEPARATOR );
++               String baseVersion = metadata.getBaseVersion();
++
++           if (( System.getProperty("maven2.offline.mode") != null  && 
++                 System.getProperty("maven2.ignore.versions") != null ) || 
++               ( System.getProperty("maven2.jpp.mode") != null) ) {
++                   MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
++                   Hashtable newInfo = map.getMappedInfo(metadata.getGroupId(), metadata.getArtifactId(), baseVersion);
++
++                   baseVersion = (String) newInfo.get("version");
++               }
++                path.append( baseVersion ).append( PATH_SEPARATOR );
+             }
+         }
+ 
+--- ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav	2007-12-12 16:01:58.000000000 -0500
++++ ./maven2/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java	2007-12-12 16:03:29.000000000 -0500
+@@ -267,7 +267,8 @@ public class DefaultArtifactCollector
+                             // set the recommended version
+                             // TODO: maybe its better to just pass the range through to retrieval and use a transformation?
+                             ArtifactVersion version;
+-                            if ( !artifact.isSelectedVersionKnown() )
++                            if ( !artifact.isSelectedVersionKnown() && 
++                                 System.getProperty("maven2.ignore.versions") == null)
+                             {
+                                 List versions = artifact.getAvailableVersions();
+                                 if ( versions == null )
+@@ -302,7 +303,14 @@ public class DefaultArtifactCollector
+                                 version = artifact.getSelectedVersion();
+                             }
+ 
+-                            artifact.selectVersion( version.toString() );
++                            if ( !artifact.isSelectedVersionKnown() && 
++                                System.getProperty("maven2.ignore.versions") != null )
++                            {
++                                artifact.selectVersion( "2.0.8" );
++                            } else {
++                               artifact.selectVersion( version.toString() );
++                            }
++
+                             fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
+                         }
+ 
+--- ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav	2007-12-12 16:03:35.000000000 -0500
++++ ./maven2/maven-artifact/src/main/resources/META-INF/plexus/components.xml	2007-12-12 16:04:00.000000000 -0500
+@@ -31,6 +31,12 @@ under the License.
+       <implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
+     </component>
+ 
++    <component>
++      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
++      <role-hint>jpp</role-hint>
++      <implementation>org.apache.maven.artifact.repository.layout.JPackageRepositoryLayout</implementation>
++    </component>
++
+     <!--
+      |
+      | ArtifactHandlerManager
+--- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav	2007-12-12 16:04:07.000000000 -0500
++++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2007-12-12 16:04:39.000000000 -0500
+@@ -88,7 +88,9 @@ public class DefaultRepositoryMetadataMa
+ 
+                     boolean metadataIsEmpty = true;
+ 
+-                    if ( checkForUpdates )
++                    if ( checkForUpdates && 
++                       ((System.getProperty("maven2.offline.mode") == null) && 
++                           (System.getProperty("maven2.jpp.mode") == null)))
+                     {
+                         getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
+ 
+--- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav	2007-12-12 16:04:56.000000000 -0500
++++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java	2007-12-12 16:05:31.000000000 -0500
+@@ -184,7 +184,9 @@ public class DefaultArtifactResolver
+                 try
+                 {
+                     // TODO: force should be passed to the wagon manager
+-                    if ( artifact.getRepository() != null )
++                    if ( artifact.getRepository() != null && 
++                       ((System.getProperty("maven2.offline.mode") == null) && 
++                           (System.getProperty("maven2.jpp.mode") == null)))
+                     {
+                         // the transformations discovered the artifact - so use it exclusively
+                         wagonManager.getArtifact( artifact, artifact.getRepository() );
+--- ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav	2007-12-12 16:05:36.000000000 -0500
++++ ./maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java	2007-12-12 16:06:56.000000000 -0500
+@@ -340,9 +340,25 @@ public class DefaultWagonManager
+         else if ( repository.isBlacklisted() )
+         {
+             getLogger().debug( "Skipping blacklisted repository " + repository.getId() );
+-        }
+-        else
+-        {
++        } 
++        else if ( ((System.getProperty("maven2.offline.mode") != null) || 
++                       (System.getProperty("maven2.jpp.mode") != null)) && 
++                        !repository.getUrl().startsWith("file:") ) {
++           getLogger().warn( "Skipping non filebased repository " + repository.getUrl() + " in full offline mode");
++       }
++       else
++       {
++            // Else policy is enabled, this is not a blacklisted repo, and we 
++            // may or may not be in jpp/offline mode. If we are not in 
++            // jpp/offline mode, __jpp_repo__ needs to be disabled.
++
++            if (System.getProperty("maven2.usejppjars") == null &&
++                 System.getProperty("maven2.jpp.mode") == null &&
++                 repository.getId().equals("__jpp_repo__")) {
++                    getLogger().warn( "Skipping jpp repository " + repository.getUrl() + " in vanilla mode");
++                    return;
++            }
++
+             getLogger().debug( "Trying repository " + repository.getId() );
+             getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy(),
+                            false );
+--- ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav	2007-12-12 16:07:02.000000000 -0500
++++ ./maven2/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java	2007-12-12 16:08:54.000000000 -0500
+@@ -43,7 +43,7 @@ import java.util.List;
+ public class DefaultModelValidator
+     implements ModelValidator
+ {
+-    private static final String ID_REGEX = "[A-Za-z0-9_\\-.]+";
++    private static final String ID_REGEX = "[A-Za-z0-9_/\\\\.-]+";
+ 
+     ///////////////////////////////////////////////////////////////////////////
+     // ModelValidator Implementation
+@@ -88,7 +88,18 @@ public class DefaultModelValidator
+ 
+             validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), dependencySourceHint( d ) );
+ 
+-            validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
++            // Check disabled in "ignore versions" mode. On many occassions, JPackage 
++            // builds modules that are not built by default in a project. A lot of 
++            // these seem to have missing versions for dependencies, so we omit 
++            // validation check for version in the "ignore versions" mode.
++ 
++            if (System.getProperty("maven2.ignore.versions") == null) {
++                validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
++            } else {
++                if ( d.getVersion() == null ) {
++                    d.setVersion("2.0.8");
++                }
++            }
+ 
+             if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
+             {
+@@ -212,7 +223,7 @@ public class DefaultModelValidator
+             boolean match = id.matches( ID_REGEX );
+             if ( !match )
+             {
+-                result.addMessage( "'" + fieldName + "' with value '" + id + "' does not match a valid id pattern." );
++                result.addMessage( "'" + fieldName + "' with value '" + id + "' does not match a valid id pattern: " + ID_REGEX);
+             }
+             return match;
+         }
+--- ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2007-12-12 16:09:05.000000000 -0500
++++ ./maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2007-12-12 16:09:55.000000000 -0500
+@@ -24,6 +24,15 @@ under the License.
+ 
+   <repositories>
+     <repository>
++      <id>__jpp_repo__</id>
++      <name>JPackage Maven Repository</name>
++      <layout>jpp</layout>
++      <url>file:///usr/share/maven2/repository</url>
++      <snapshots>
++        <enabled>true</enabled>
++      </snapshots>
++    </repository>
++    <repository>
+       <id>central</id>
+       <name>Maven Repository Switchboard</name>
+       <layout>default</layout>
+@@ -38,6 +47,18 @@ under the License.
+   </repositories>
+ 
+   <pluginRepositories>
++     <pluginRepository>
++      <id>__jpp_repo__</id>
++      <name>JPackage Maven Plugin Repository</name>
++      <url>file:///usr/share/maven2/repository</url>
++      <layout>jpp</layout>
++      <snapshots>
++        <enabled>true</enabled>
++      </snapshots>
++      <releases>
++        <updatePolicy>never</updatePolicy>
++      </releases>
++    </pluginRepository>
+     <pluginRepository>
+       <id>central</id>
+       <name>Maven Plugin Repository</name>
+--- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java.sav	2007-12-12 16:10:04.000000000 -0500
++++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/model/Repository.java	2007-12-12 16:15:03.000000000 -0500
+@@ -18,6 +18,8 @@ package org.apache.maven.bootstrap.model
+ 
+ import java.io.File;
+ import java.util.Collections;
++import java.util.Hashtable;
++import org.apache.maven.artifact.repository.layout.MavenJPackageDepmap;
+ 
+ /**
+  * Repository path management.
+@@ -35,6 +37,12 @@ public class Repository
+ 
+     private String layout = LAYOUT_DEFAULT;
+ 
++    public static final String LAYOUT_JPP = "jpp";
++
++    private static final char GROUP_SEPARATOR = '.';
++
++    private static final char PATH_SEPARATOR = '/';
++
+     private String id;
+ 
+     private boolean releases = true;
+@@ -64,7 +72,25 @@ public class Repository
+     public String getArtifactPath( Dependency dependency )
+     {
+         String repositoryPath;
+-        if ( LAYOUT_LEGACY.equals( layout ) )
++        if ( LAYOUT_JPP.equals( layout ) )
++        {
++
++           String groupId, artifactId;
++
++           MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
++           Hashtable newInfo = map.getMappedInfo(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
++
++           groupId = (String) newInfo.get("group");
++           artifactId = (String) newInfo.get("artifact");
++           
++           if (dependency.getType().equals("pom")) {
++               return getMetadataPath(groupId, artifactId, dependency.getVersion(), dependency.getType(), dependency.getArtifact());
++           }
++
++            // Same as legacy layout
++            repositoryPath = groupId + "/" + artifactId + ".jar";
++        }
++        else if ( LAYOUT_LEGACY.equals( layout ) )
+         {
+             repositoryPath = dependency.getArtifactDirectory() + "/" + dependency.getType() + "s/" +
+                 dependency.getArtifact();
+@@ -94,7 +120,30 @@ public class Repository
+         Dependency dependency = new Dependency( groupId, artifactId, version, type, Collections.EMPTY_LIST );
+ 
+         String repositoryPath;
+-        if ( LAYOUT_LEGACY.equals( layout ) )
++        if ( LAYOUT_JPP.equals( layout ) ) 
++        {
++            if (filename.substring(filename.length()-4).equals(".pom") || type.equals("pom")) {
++ 
++                MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
++                Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
++ 
++                groupId = (String) newInfo.get("group");
++                artifactId = (String) newInfo.get("artifact");
++ 
++                String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
++                repositoryPath = System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms") + "/" + fName;
++                java.io.File f;
++ 
++                // .substring(6) removes preceeding file://
++                f = new File(basedir.substring(6) + "/" + repositoryPath);
++                if (!f.exists()) {
++                    repositoryPath = System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms") + "/" + fName;
++                }
++            } else {
++                 repositoryPath = System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms") + "/" + filename;
++            }
++        }
++        else if ( LAYOUT_LEGACY.equals( layout ) )
+         {
+             repositoryPath = dependency.getArtifactDirectory() + "/poms/" + filename;
+         }
+@@ -102,11 +151,29 @@ public class Repository
+         {
+             repositoryPath = dependency.getGroupId().replace( '.', '/' );
+             repositoryPath = repositoryPath + "/" + dependency.getArtifactId();
+-            if ( version != null )
++
++            String newVersion = version;
++            String newFilename = filename;
++
++            if (    ( 
++                       ( System.getProperty("maven2.offline.mode") != null && 
++                         System.getProperty("maven2.ignore.versions") != null ) ||
++                       (System.getProperty("maven2.jpp.mode") != null) 
++                   ) && 
++                version != null) {
++                MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
++                Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
++
++                newVersion = (String) newInfo.get("version");
++
++                newFilename = filename.replaceFirst(dependency.getVersion(), newVersion);
++            }
++
++            if ( newVersion != null )
+             {
+-                repositoryPath = repositoryPath + "/" + dependency.getVersion();
++                repositoryPath = repositoryPath + "/" + newVersion;
+             }
+-            repositoryPath = repositoryPath + "/" + filename;
++            repositoryPath = repositoryPath + "/" + newFilename;
+         }
+         else
+         {
+--- ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java.sav	2007-12-12 16:15:12.000000000 -0500
++++ ./maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/download/OnlineArtifactDownloader.java	2007-12-12 16:16:53.000000000 -0500
+@@ -49,7 +49,8 @@ public class OnlineArtifactDownloader
+ 
+     private String proxyPassword;
+ 
+-    private static final String REPO_URL = "http://repo1.maven.org/maven2";
++    private static final String INTERNAL_REPO_URL = "__INTERNAL_REPO_PLACEHOLDER__";
++    private static final String EXTERNAL_REPO_URL = "__EXTERNAL_REPO_PLACEHOLDER__";
+ 
+     private Map downloadedArtifacts = new HashMap();
+ 
+@@ -170,7 +171,10 @@ public class OnlineArtifactDownloader
+             try
+             {
+                 String version = dep.getVersion();
+-                if ( snapshot )
++                if ( snapshot && 
++                   ((System.getProperty("maven2.offline.mode") == null) && 
++                       (System.getProperty("maven2.jpp.mode") == null)) )
++
+                 {
+                     String filename = "maven-metadata-" + remoteRepo.getId() + ".xml";
+                     File localFile = getLocalRepository().getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
+@@ -252,7 +256,10 @@ public class OnlineArtifactDownloader
+ 
+                     file.getParentFile().mkdirs();
+ 
+-                    if ( !file.exists() || version.indexOf( "SNAPSHOT" ) >= 0 )
++                    if ( (!file.exists() || version.indexOf( "SNAPSHOT" ) >= 0) && 
++                       ((System.getProperty("maven2.offline.mode") == null) && 
++                           (System.getProperty("maven2.jpp.mode") == null)) )
++
+                     {
+                         String filename = dep.getArtifactId() + "-" + version + ".pom";
+                         String metadataPath = remoteRepo.getMetadataPath( dep.getGroupId(), dep.getArtifactId(),
+@@ -340,11 +347,8 @@ public class OnlineArtifactDownloader
+ 
+         if ( remoteRepositories.isEmpty() )
+         {
+-            // TODO: use super POM?
+-            remoteRepositories.add( new Repository( "central", REPO_URL, Repository.LAYOUT_DEFAULT, false, true ) );
+-            // TODO: use maven root POM?
+-            remoteRepositories.add( new Repository( "apache.snapshots", "http://people.apache.org/repo/m2-snapshot-repository/",
+-                                                    Repository.LAYOUT_DEFAULT, true, false ) );
++            remoteRepositories.add( new Repository( "internal", INTERNAL_REPO_URL, Repository.LAYOUT_JPP, true, true ) );
++            remoteRepositories.add( new Repository( "external", EXTERNAL_REPO_URL, Repository.LAYOUT_JPP, true, true ) );
+         }
+ 
+         return remoteRepositories;
+--- ./maven2/bootstrap/bootstrap-mini/build.sav	2007-12-12 16:16:59.000000000 -0500
++++ ./maven2/bootstrap/bootstrap-mini/build	2007-12-12 16:17:21.000000000 -0500
+@@ -9,6 +9,11 @@ rm -rf bootstrap-mini.jar ${buildDir} > 
+ mkdir -p ${classesDir}
+ 
+ "$JAVA_HOME/bin/javac" -g -d ${classesDir} `find ${srcDir} -name '*.java'`
++# FIXME: Is there a better way to make the compiler see the jdom classes? 
++# setting CLASSPATH, or giving -cp/-classpath didn't work :(
++(cd ${classesDir} 
++   jar xf $JDOMCLASS 
++)
+ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+ 
+ ( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
+--- ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java.sav	2007-12-12 16:17:29.000000000 -0500
++++ ./maven2/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java	2007-12-12 16:18:25.000000000 -0500
+@@ -57,6 +57,8 @@ public class BootstrapInstaller
+ 
+     private boolean offline;
+ 
++    private String settingsFile;
++
+     public BootstrapInstaller( SimpleArgumentParser parser )
+         throws Exception
+     {
+@@ -72,6 +74,8 @@ public class BootstrapInstaller
+         this.updateSnapshots = parser.isArgumentSet( "--update-snapshots" );
+ 
+         this.offline = parser.isArgumentSet( "--offline" );
++
++       this.settingsFile = parser.getArgumentValue( "--settings" );
+     }
+ 
+     public static void main( String[] args )
+@@ -215,6 +219,11 @@ public class BootstrapInstaller
+             cli.createArgument().setValue( "--update-snapshots" );
+         }
+ 
++        if (this.settingsFile != null) {
++            cli.createArgument().setValue( "-s" );
++            cli.createArgument().setValue( this.settingsFile ); 
++        }
++
+         for ( int i = 0; i < args.length; i++ )
+         {
+             cli.createArgument().setValue( args[i] );
+--- ./maven2/bootstrap.sh.sav	2007-12-12 16:18:30.000000000 -0500
++++ ./maven2/bootstrap.sh	2007-12-12 16:18:47.000000000 -0500
+@@ -8,7 +8,7 @@ if [ -z "$JAVA_HOME" ]; then
+   exit 1
+ fi
+ 
+-JAVACMD="$JAVA_HOME/bin/java"
++JAVACMD="$JAVA_HOME/bin/java -classpath $CLASSPATH"
+ 
+ (
+   cd bootstrap/bootstrap-mini



From pkgdb at fedoraproject.org  Mon Aug 24 18:11:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:11:51 +0000
Subject: [pkgdb] fpaste had acl change status
Message-ID: <20090824181152.2097510F87C@bastion2.fedora.phx.redhat.com>

ankursinha has set the watchbugzilla acl on fpaste (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Mon Aug 24 18:11:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:11:53 +0000
Subject: [pkgdb] fpaste had acl change status
Message-ID: <20090824181153.C2E3F10F88B@bastion2.fedora.phx.redhat.com>

ankursinha has set the watchcommits acl on fpaste (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Mon Aug 24 18:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:11:58 +0000
Subject: [pkgdb] fpaste had acl change status
Message-ID: <20090824181158.365CE10F895@bastion2.fedora.phx.redhat.com>

ankursinha has set the commit acl on fpaste (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From pkgdb at fedoraproject.org  Mon Aug 24 18:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:11:58 +0000
Subject: [pkgdb] fpaste had acl change status
Message-ID: <20090824181158.9F31310F899@bastion2.fedora.phx.redhat.com>

ankursinha has set the approveacls acl on fpaste (Fedora devel) to Approved for sundaram

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fpaste



From linville at fedoraproject.org  Mon Aug 24 18:24:41 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Mon, 24 Aug 2009 18:24:41 +0000 (UTC)
Subject: rpms/b43-fwcutter/devel .cvsignore, 1.4, 1.5 b43-fwcutter.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090824182441.9FADA11C0044@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/b43-fwcutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27656

Modified Files:
	.cvsignore b43-fwcutter.spec sources 
Log Message:
Update for b43-fwcutter-012


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/b43-fwcutter/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Feb 2008 20:50:47 -0000	1.4
+++ .cvsignore	24 Aug 2009 18:24:41 -0000	1.5
@@ -1 +1 @@
-b43-fwcutter-011.tar.bz2
+b43-fwcutter-012.tar.bz2


Index: b43-fwcutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/b43-fwcutter/devel/b43-fwcutter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- b43-fwcutter.spec	24 Jul 2009 17:45:13 -0000	1.7
+++ b43-fwcutter.spec	24 Aug 2009 18:24:41 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           b43-fwcutter
-Version:        011
-Release:        6%{?dist}
+Version:        012
+Release:        1%{?dist}
 Summary:        Firmware extraction tool for Broadcom wireless driver
 
 Group:          System Environment/Base
 License:        BSD
-URL:            http://bcm43xx.berlios.de/
-Source0:        http://download.berlios.de/bcm43xx/%{name}-%{version}.tar.bz2
+URL:            http://bu3sch.de/b43/fwcutter/
+Source0:        http://bu3sch.de/b43/fwcutter/%{name}-%{version}.tar.bz2
 Source1:        README.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README README.Fedora
 
 %changelog
+* Mon Aug 24 2009 John W. Linville <linville at redhat.com> 012-1
+- Update for b43-fwcutter-012
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 011-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/b43-fwcutter/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Feb 2008 20:50:47 -0000	1.4
+++ sources	24 Aug 2009 18:24:41 -0000	1.5
@@ -1 +1 @@
-3db2f4de85a459451f5b391cf67a8d44  b43-fwcutter-011.tar.bz2
+69eadf67b459f313a8d6b37aaabef96c  b43-fwcutter-012.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 24 18:38:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:38:06 +0000
Subject: [pkgdb] icu: denisarnaud has requested watchcommits
Message-ID: <20090824183806.0D7E710F877@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on icu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Mon Aug 24 18:38:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:38:20 +0000
Subject: [pkgdb] icu: denisarnaud has requested watchbugzilla
Message-ID: <20090824183820.A841110F86F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on icu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Mon Aug 24 18:38:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 18:38:26 +0000
Subject: [pkgdb] icu: denisarnaud has requested watchcommits
Message-ID: <20090824183827.0879B10F878@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on icu (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From simo at fedoraproject.org  Mon Aug 24 18:56:24 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 24 Aug 2009 18:56:24 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 sssd.spec, 
	1.17, 1.18 sssd-0.4.1-conf_check.patch, 1.1,
	NONE sssd-0.4.1-cve-2009-2410.patch, 1.1,
	NONE sssd-0.4.1-debug_fn.patch, 1.1,
	NONE sssd-0.4.1-reload_conf.patch, 1.1,
	NONE sssd-0.4.1-reload_conf_2.patch, 1.1, NONE
Message-ID: <20090824185624.8EE2211C0044@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1947

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	sssd-0.4.1-conf_check.patch sssd-0.4.1-cve-2009-2410.patch 
	sssd-0.4.1-debug_fn.patch sssd-0.4.1-reload_conf.patch 
	sssd-0.4.1-reload_conf_2.patch 
Log Message:
* Mon Aug 24 2009 Simo Sorce <ssorce at redhat.com> - 0.5.0-0
- New upstream release 0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	8 Jun 2009 16:22:12 -0000	1.8
+++ .cvsignore	24 Aug 2009 18:56:24 -0000	1.9
@@ -1 +1 @@
-sssd-0.4.1.tar.gz
+sssd-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 Jun 2009 16:22:12 -0000	1.9
+++ sources	24 Aug 2009 18:56:24 -0000	1.10
@@ -1 +1 @@
-b1c6c3532e5bcc22de4849e52f9bad0a  sssd-0.4.1.tar.gz
+7566dcac75e7248ca99b4dd0bb49c1ee  sssd-0.5.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sssd.spec	29 Jul 2009 11:21:47 -0000	1.17
+++ sssd.spec	24 Aug 2009 18:56:24 -0000	1.18
@@ -1,6 +1,6 @@
 Name: sssd
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.5.0
+Release: 0%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -12,20 +12,19 @@ Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
-Patch010: sssd-0.4.1-debug_fn.patch
-Patch011: sssd-0.4.1-conf_check.patch
-Patch012: sssd-0.4.1-reload_conf.patch
-Patch013: sssd-0.4.1-reload_conf_2.patch
-Patch014: sssd-0.4.1-cve-2009-2410.patch
 
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
+Requires: libtdb >= 1.1.3
 
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
 
 %define servicename sssd
+%define sssdstatedir %{_localstatedir}/lib/sss
+%define dbpath %{sssdstatedir}/db
+%define pipepath %{sssdstatedir}/pipes
 
 ### Build Dependencies ###
 
@@ -48,6 +47,8 @@ BuildRequires: pcre-devel
 BuildRequires: libxslt
 BuildRequires: libxml2
 BuildRequires: docbook-style-xsl
+BuildRequires: krb5-devel
+BuildRequires: c-ares-devel
 
 %description
 Provides a set of daemons to manage access to remote directories and
@@ -59,17 +60,11 @@ services for projects like FreeIPA.
 %prep
 %setup -q
 
-%patch010 -p1 -b .debug_fn
-%patch011 -p1 -b .conf_check
-%patch012 -p1 -b .reload_conf
-%patch013 -p1 -b .reload_conf_2
-%patch014 -p1 -b .cve-2009-2410
-
 %build
 %configure \
     --without-tests \
-    --without-policykit \
-    --without-infopipe \
+    --with-db-path=%{dbpath} \
+    --with-pipe-path=%{pipepath} \
     --with-init-dir=%{_initrddir} \
     --enable-nsslibdir=/%{_lib}
 
@@ -86,7 +81,9 @@ rm -f \
     $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.la \
     $RPM_BUILD_ROOT/%{_libdir}/ldb/memberof.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.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
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
@@ -108,10 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{servicename}/
 %{_libdir}/%{name}/
 %{_libdir}/ldb/memberof.so
-%dir /var/lib/sss/
-%attr(700,root,root) %dir /var/lib/sss/db
-%dir /var/lib/sss/pipes
-%attr(700,root,root) %dir /var/lib/sss/pipes/private
+%{_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
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
 /%{_lib}/libnss_sss.so.2
@@ -119,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
+%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 
 %post
 /sbin/ldconfig
@@ -137,6 +136,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* 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-4
 - Fix for CVE-2009-2410 - Native SSSD users with no password set could log in
   without a password. (Patch by Stephen Gallagher)


--- sssd-0.4.1-conf_check.patch DELETED ---


--- sssd-0.4.1-cve-2009-2410.patch DELETED ---


--- sssd-0.4.1-debug_fn.patch DELETED ---


--- sssd-0.4.1-reload_conf.patch DELETED ---


--- sssd-0.4.1-reload_conf_2.patch DELETED ---



From rvinyard at fedoraproject.org  Mon Aug 24 18:56:35 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon, 24 Aug 2009 18:56:35 +0000 (UTC)
Subject: rpms/dbus-cxx/devel .cvsignore, 1.11, 1.12 dbus-cxx.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <20090824185635.1009711C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2002

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Jul 2009 15:28:03 -0000	1.11
+++ .cvsignore	24 Aug 2009 18:56:34 -0000	1.12
@@ -1 +1,2 @@
-dbus-cxx-0.4.1.tar.bz2
+dbus-cxx-0.4.2.tar.bz2
+dbus-cxx-0.4.2-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/dbus-cxx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- dbus-cxx.spec	24 Jul 2009 20:02:01 -0000	1.11
+++ dbus-cxx.spec	24 Aug 2009 18:56:34 -0000	1.12
@@ -1,11 +1,12 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.1
-Release:          2%{?dist}
+Version:          0.4.2
+Release:          1%{?dist}
 License:          GPLv3
-URL:              http://dbus-cxx.sourceforge.net
+URL:              http://dbus-cxx.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://downloads.sourceforge.net/dbus-cxx/dbus-cxx-%{version}.tar.bz2
+Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    dbus-devel >= 1.2
 BuildRequires:    libsigc++20-devel >= 2.0.0
@@ -38,6 +39,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the dbus-cxx
@@ -91,7 +95,7 @@ This package contains the libraries and 
 developing dbus-cxx-glibmm applications.
 
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-static=no --enable-tools --enable-glibmm
@@ -152,6 +156,10 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
 
 %changelog
+* Mon Aug 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.2-1
+- New release
+- Made docs noarch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Jul 2009 15:28:03 -0000	1.11
+++ sources	24 Aug 2009 18:56:34 -0000	1.12
@@ -1 +1,2 @@
-51b388678d5403c7f2e768ba3e092546  dbus-cxx-0.4.1.tar.bz2
+2bcb056206b8b8b6257e6069a626a97e  dbus-cxx-0.4.2.tar.bz2
+4a124dabe55a7054adbf7cfaa6c8ef18  dbus-cxx-0.4.2-doc.tar.bz2



From rvinyard at fedoraproject.org  Mon Aug 24 18:56:42 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon, 24 Aug 2009 18:56:42 +0000 (UTC)
Subject: rpms/dbus-cxx/F-11 .cvsignore, 1.11, 1.12 dbus-cxx.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <20090824185642.64CC911C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2049

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Jul 2009 15:28:13 -0000	1.11
+++ .cvsignore	24 Aug 2009 18:56:42 -0000	1.12
@@ -1 +1,2 @@
-dbus-cxx-0.4.1.tar.bz2
+dbus-cxx-0.4.2.tar.bz2
+dbus-cxx-0.4.2-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/dbus-cxx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dbus-cxx.spec	6 Jul 2009 15:28:13 -0000	1.10
+++ dbus-cxx.spec	24 Aug 2009 18:56:42 -0000	1.11
@@ -1,11 +1,12 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.1
+Version:          0.4.2
 Release:          1%{?dist}
 License:          GPLv3
-URL:              http://dbus-cxx.sourceforge.net
+URL:              http://dbus-cxx.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://downloads.sourceforge.net/dbus-cxx/dbus-cxx-%{version}.tar.bz2
+Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    dbus-devel >= 1.2
 BuildRequires:    libsigc++20-devel >= 2.0.0
@@ -38,6 +39,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the dbus-cxx
@@ -91,7 +95,7 @@ This package contains the libraries and 
 developing dbus-cxx-glibmm applications.
 
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-static=no --enable-tools --enable-glibmm
@@ -152,6 +156,13 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
 
 %changelog
+* Mon Aug 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.2-1
+- New release
+- Made docs noarch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.1-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Jul 2009 15:28:13 -0000	1.11
+++ sources	24 Aug 2009 18:56:42 -0000	1.12
@@ -1 +1,2 @@
-51b388678d5403c7f2e768ba3e092546  dbus-cxx-0.4.1.tar.bz2
+2bcb056206b8b8b6257e6069a626a97e  dbus-cxx-0.4.2.tar.bz2
+4a124dabe55a7054adbf7cfaa6c8ef18  dbus-cxx-0.4.2-doc.tar.bz2



From rvinyard at fedoraproject.org  Mon Aug 24 18:56:49 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon, 24 Aug 2009 18:56:49 +0000 (UTC)
Subject: rpms/dbus-cxx/F-10 .cvsignore, 1.11, 1.12 dbus-cxx.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <20090824185649.5A80D11C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/dbus-cxx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155

Modified Files:
	.cvsignore dbus-cxx.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Jul 2009 15:28:23 -0000	1.11
+++ .cvsignore	24 Aug 2009 18:56:49 -0000	1.12
@@ -1 +1,2 @@
-dbus-cxx-0.4.1.tar.bz2
+dbus-cxx-0.4.2.tar.bz2
+dbus-cxx-0.4.2-doc.tar.bz2


Index: dbus-cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/dbus-cxx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dbus-cxx.spec	6 Jul 2009 15:28:23 -0000	1.10
+++ dbus-cxx.spec	24 Aug 2009 18:56:49 -0000	1.11
@@ -1,11 +1,12 @@
 Summary:          C++ bindings for the DBus library
 Name:             dbus-cxx
-Version:          0.4.1
+Version:          0.4.2
 Release:          1%{?dist}
 License:          GPLv3
-URL:              http://dbus-cxx.sourceforge.net
+URL:              http://dbus-cxx.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://downloads.sourceforge.net/dbus-cxx/dbus-cxx-%{version}.tar.bz2
+Source0:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}.tar.bz2
+Source1:          http://downloads.sourceforge.net/dbus-cxx/%{name}-%{version}-doc.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    dbus-devel >= 1.2
 BuildRequires:    libsigc++20-devel >= 2.0.0
@@ -38,6 +39,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the dbus-cxx
@@ -91,7 +95,7 @@ This package contains the libraries and 
 developing dbus-cxx-glibmm applications.
 
 %prep
-%setup -q
+%setup -q -b 1
 
 %build
 %configure --enable-static=no --enable-tools --enable-glibmm
@@ -152,6 +156,13 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/dbus-cxx-0.4/dbus-cxx-glibmm/
 
 %changelog
+* Mon Aug 24 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.2-1
+- New release
+- Made docs noarch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.1-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-cxx/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Jul 2009 15:28:23 -0000	1.11
+++ sources	24 Aug 2009 18:56:49 -0000	1.12
@@ -1 +1,2 @@
-51b388678d5403c7f2e768ba3e092546  dbus-cxx-0.4.1.tar.bz2
+2bcb056206b8b8b6257e6069a626a97e  dbus-cxx-0.4.2.tar.bz2
+4a124dabe55a7054adbf7cfaa6c8ef18  dbus-cxx-0.4.2-doc.tar.bz2



From spot at fedoraproject.org  Mon Aug 24 19:02:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:02:57 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.54, 1.55 asymptote.spec, 1.68,
	1.69 sources, 1.54, 1.55
Message-ID: <20090824190257.DFD5811C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3516

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
update to 1.85


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	20 Aug 2009 14:37:46 -0000	1.54
+++ .cvsignore	24 Aug 2009 19:02:57 -0000	1.55
@@ -1 +1 @@
-asymptote-1.84.src.tgz
+asymptote-1.85.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- asymptote.spec	20 Aug 2009 14:37:46 -0000	1.68
+++ asymptote.spec	24 Aug 2009 19:02:57 -0000	1.69
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.84
+Version:        1.85
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -150,6 +150,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.85-1
+- update to 1.85
+
 * Thu Aug 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.84-1
 - update to 1.84
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	20 Aug 2009 14:37:46 -0000	1.54
+++ sources	24 Aug 2009 19:02:57 -0000	1.55
@@ -1 +1 @@
-046be32c5d1f84fb3d34e044f0d95e7e  asymptote-1.84.src.tgz
+41254066198abeb4379fc3989891b670  asymptote-1.85.src.tgz



From overholt at fedoraproject.org  Mon Aug 24 19:12:58 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 24 Aug 2009 19:12:58 +0000 (UTC)
Subject: rpms/maven2/devel maven2-MNG-3139.patch, NONE,
	1.1 maven2-plugins-javadoc-newdoxia.patch, NONE,
	1.1 maven2-plugins-jpprepolayout.patch, NONE,
	1.1 maven2-plugins-project-info-reports-jdkversion.patch, NONE,
	1.1 maven2-sourcetarget.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 maven2-plugins-doxiaupdatefix.patch, 1.1, 1.2 maven2.spec,
	1.21, 1.22 sources, 1.3, 1.4
Message-ID: <20090824191258.2284211C0044@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5517

Modified Files:
	.cvsignore maven2-plugins-doxiaupdatefix.patch maven2.spec 
	sources 
Added Files:
	maven2-MNG-3139.patch maven2-plugins-javadoc-newdoxia.patch 
	maven2-plugins-jpprepolayout.patch 
	maven2-plugins-project-info-reports-jdkversion.patch 
	maven2-sourcetarget.patch 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
- Import 2.0.8 work from Deepak Bhole:
-- Fix maven-remote-resources-plugin
-- Handle artifacts other than just poms and jars
-- Cope with empty version XML tags
-- Prevent unecessary files to end up in lib
-- Fix handling of RELEASE versions
-- Added BR for java-devel
-- Fixed artifact path setting code for upstream group/artifactids
- Import these fixes from Permaine Cheung:
-- Change maven-archiver to maven-shared-archiver
-- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
-- Add missing Requires: maven-archiver to maven2-plugin-jar
-- Add missing Requires: ant to maven2-plugin-ant
-- Add missing Requires: maven-shared-plugin-tools-beanshell, 
   maven-shared-plugin-tools-java to maven2-plugin-docck and
   maven2-plugin-plugin
-- Add missing Requires: to maven2-plugin-install
- Import these fixes from Yong Yang:
-- add maven2-plugins-jpprepolayout.patch
-- Add missing BR xom
-- Add missing BR maven-shared-io in non-bootstrap mode
-- Add missing Requires xom
-- Add missing Requires: maven-enforcer-rule-api in non-bootstrap mode
-- Add missing Requires: maven-shared-invoker in non-bootstrap mode
-- Add missing Requires: maven-shared-io in non-bootstrap mode
-- Add missing Requires: maven-shared-jar in non-bootstrap mode
-- Add missing Requires: maven-shared-model-converter in non-bootstrap mode
-- Add missing Requires: maven-shared-verifier in non-bootstrap mode
-- Add missing Requires: for all subpackages
- Import these fixes from Fernando Nasser:
-- Project Report Info plugin can't cope with a JAR without a JDK version on it
-- Parent poms sometimes come as type "xml", adjust JPackageRepositoryLayout
-- Test for jar in JPackageRepositoryLayout as pom may not have the
   packaging set
-- Update javadoc plugin to 2.4 to get rid of 2.3 bugs
-- Modify MJAVADOC-137 oatch to exclude part reverted by MJAVADOC-196
-- Add patch for javadoc plugin (MJAVADOC-137)
-- Remove jetty from site plugin dependencies
-- Install the model-all JAR
-- Build model-all.jar for model-v3 needed by maven-shared-model-converter
-- Add missing BRs in non-bootstrap mode:
-- Add missing BR maven-embedder
-- Add missing BR maven-shared-dependency-analyzer
-- Add missing BR maven-shared-dependency-tree
-- Add missing BR maven-shared-downloader
-- Add missing BR maven-enforcer-rule-api
-- Add missing BR maven-shared-invoker
-- Add missing BR maven-shared-jar
-- Add missing BR maven-shared-model-converter
-- Add missing BR maven-shared-plugin-testing-tools
-- Add missing BR maven-shared-plugin-tools-api
-- Add missing BR maven-shared-plugin-tools-beanshell
-- Add missing BR maven-shared-plugin-tools-java
-- Add missing BR maven-shared-reporting-impl
-- Add missing BR maven-shared-verifier
-- Add missing BR maven2-plugin-ant
-- Add missing BR maven2-plugin-clean
-- Add missing BR plexus-mail-sender
-- Add missing BR plexus-resources
-- Add missing BRs in non-bootstrap mode:
-- Add missing BR maven-doxia-sitetools
-- Add missing BR maven-surefire-provider-junit
-- Add missing BR maven2-plugin-shade in non-bootstrap mode
-- Add missing BR plexus-digest in non-bootstrap mode
-- Add missing BR  maven-shared-common-artifact-filters
-- Add missing BR  maven-shared-repository-builder
-- Rebuild with plexus-archiver rolled back to a7 to avoid compilation errors
-- Adapt for commons-logging 1.1
-- Specify source and target 1.4
-- Add missing BRs to ant-nodeps, ant-junit, aqute-bndlib and javamail
-- Remove extra maven- from maven-shared poms and jars in bootstrap binaries
-- Require newer version of plexus-archiver to match maven-archiver
-- Move maven-doxia to outside the bootstrap condition
-- Add missing BR saxpath
- Import these fixes from David Walluck:
-- add patch for MNG-3139

maven2-MNG-3139.patch:
 DefaultRepositoryMetadataManager.java |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE maven2-MNG-3139.patch ---
--- maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2008/03/24 20:05:11	640549
+++ maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2009/02/24 20:07:37	747533
@@ -195,8 +195,7 @@
             ArtifactRepositoryPolicy policy =
                 metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
 
-            if ( ( policy.isEnabled() && !repository.isBlacklisted() )
-                && ( loadMetadata( metadata, repository, localRepository, previousMetadata ) ) )
+            if ( policy.isEnabled() && loadMetadata( metadata, repository, localRepository, previousMetadata ) )
             {
                 metadata.setRepository( repository );
                 selected = repository;

maven2-plugins-javadoc-newdoxia.patch:
 JavadocReport.java |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

--- NEW FILE maven2-plugins-javadoc-newdoxia.patch ---
--- maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2009-01-31 12:28:40.393331000 -0500
+++ maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2009-01-31 18:17:01.921601000 -0500
@@ -26,6 +26,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.codehaus.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -219,24 +220,18 @@
     {
         try
         {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
-
+            RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
+            SiteRendererSink sink = new SiteRendererSink( context );
             generate( sink, Locale.getDefault() );
         }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
-        catch ( IOException e )
+        catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
                 + " report generation:" + e.getMessage(), e );
         }
-        catch ( MavenReportException e )
+        catch ( RuntimeException e )
         {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
+            getLog().error( e.getMessage(), e );
         }
     }
 

maven2-plugins-jpprepolayout.patch:
 maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java |    6 +++++-
 maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java                       |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE maven2-plugins-jpprepolayout.patch ---
diff -up maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
--- maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav	2007-05-18 09:25:57.000000000 -0400
+++ maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java	2009-05-05 16:38:37.000000000 -0400
@@ -118,7 +118,11 @@ public abstract class AbstractProjectInf
         {
             if ( version == null )
             {
-                version = Artifact.RELEASE_VERSION;
+                if (System.getProperty("maven2.ignore.versions") != null) {
+                    version = "2.0.8";
+                } else {
+                    version = Artifact.RELEASE_VERSION;
+                }
             }
             VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
             artifact = factory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar",
diff -up maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
--- maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav	2009-05-05 16:36:38.000000000 -0400
+++ maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java	2009-05-05 16:36:47.000000000 -0400
@@ -376,7 +376,11 @@ public abstract class AbstractSiteRender
         {
             if ( version == null )
             {
-                version = Artifact.RELEASE_VERSION;
+                if (System.getProperty("maven2.ignore.versions") != null) {
+                    version = "2.0.8";
+                } else {
+                    version = Artifact.RELEASE_VERSION;
+                }
             }
             VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
             artifact = artifactFactory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec,

maven2-plugins-project-info-reports-jdkversion.patch:
 DependenciesRenderer.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE maven2-plugins-project-info-reports-jdkversion.patch ---
--- maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java.orig	2009-02-05 18:41:35.075639000 -0500
+++ maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java	2009-02-05 18:50:43.416432000 -0500
@@ -372,7 +372,10 @@
 
                         try
                         {
-                            highestjdk = Math.max( highestjdk, Double.parseDouble( jarDetails.getJdkRevision() ) );
+                            String jdkrevision = jarDetails.getJdkRevision();
+                            if (jdkrevision != null) {
+                                highestjdk = Math.max( highestjdk, Double.parseDouble( jdkrevision ) );
+                            }
                         }
                         catch ( NumberFormatException e )
                         {

maven2-sourcetarget.patch:
 pom.xml |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE maven2-sourcetarget.patch ---
--- maven2/pom.xml.orig	2008-12-15 19:25:32.425274000 -0500
+++ maven2/pom.xml	2008-12-15 19:25:38.498479000 -0500
@@ -66,6 +66,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.0.2</version>
+          <configuration>
+             <source>1.4</source>
+             <target>1.4</target>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Aug 2009 17:57:53 -0000	1.3
+++ .cvsignore	24 Aug 2009 19:12:57 -0000	1.4
@@ -6,3 +6,4 @@ maven2-model-v3.jar
 maven2-plugins-060420-src.tar.gz
 maven2-src.tar.gz
 maven2-plugins-070705-src.tar.gz
+maven-javadoc-plugin-2.4-src.tar.gz

maven2-plugins-doxiaupdatefix.patch:
 AntlrHtmlReport.java |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

Index: maven2-plugins-doxiaupdatefix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2-plugins-doxiaupdatefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-plugins-doxiaupdatefix.patch	24 Aug 2009 17:57:54 -0000	1.1
+++ maven2-plugins-doxiaupdatefix.patch	24 Aug 2009 19:12:57 -0000	1.2
@@ -1,36 +1,3 @@
---- ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.sav	2007-10-15 16:29:04.000000000 -0400
-+++ ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2007-10-15 17:15:42.000000000 -0400
-@@ -19,6 +19,7 @@ package org.apache.maven.plugin.javadoc;
-  * under the License.
-  */
- 
-+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
- import org.apache.maven.doxia.siterenderer.Renderer;
- import org.apache.maven.doxia.siterenderer.RendererException;
- import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-@@ -214,20 +215,11 @@ public class JavadocReport
-     {
-         try
-         {
--            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
-+            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
-+            SiteRendererSink sink = new SiteRendererSink( context );
- 
-             generate( sink, Locale.getDefault() );
-         }
--        catch ( RendererException e )
--        {
--            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
--                + " report generation:" + e.getMessage(), e );
--        }
--        catch ( IOException e )
--        {
--            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
--                + " report generation:" + e.getMessage(), e );
--        }
-         catch ( MavenReportException e )
-         {
-             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
 --- ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java.sav	2007-10-15 16:27:27.000000000 -0400
 +++ ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java	2007-10-15 17:15:23.000000000 -0400
 @@ -25,6 +25,7 @@ import java.util.Iterator;


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- maven2.spec	24 Aug 2009 17:57:54 -0000	1.21
+++ maven2.spec	24 Aug 2009 19:12:57 -0000	1.22
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.1%{?dist}
+Release:        1.2%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -62,6 +62,12 @@ Source0:        %{name}-src.tar.gz
 # tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
 Source2:        %{name}-plugins-070705-src.tar.gz
 
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
+# has several bugs
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4
+# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin-2.4
+Source22: maven-javadoc-plugin-2.4-src.tar.gz
+
 # No source location for these. They are ascii files generated from maven
 # repositories, and are not in cvs/svn
 # The files were originally aquired from: http://repo1.maven.org/maven2/
@@ -109,13 +115,22 @@ Patch8:         %{name}-enable-bootstrap
 Patch9:         %{name}-use-unversioned-classworlds.patch
 Patch10:        %{name}-plugins-disablecobertura.patch
 Patch11:        %{name}-shade-plugin-replacement.patch
+Patch12:        %{name}-sourcetarget.patch
+# javadoc 2.4 uses an old doxia method
+Patch15:        %{name}-plugins-javadoc-newdoxia.patch
+# This plugin can't cope with a JAR without a JDK version on it
+Patch16:        %{name}-plugins-project-info-reports-jdkversion.patch
+Patch17:        %{name}-MNG-3139.patch
+Patch18:	%{name}-plugins-jpprepolayout.patch
 
-BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    java-1.6.0-openjdk-devel
+BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
 
 BuildRequires:    ant >= 1.6.5
+BuildRequires:    ant-junit
 BuildRequires:    antlr >= 2.7.4
+BuildRequires:    aqute-bndlib
 BuildRequires:    bsh >= 1.3.0
 #BuildRequires:   cglib >= 2.1.0
 BuildRequires:    checkstyle >= 4.1
@@ -145,6 +160,7 @@ BuildRequires:    junit >= 3.8.2
 BuildRequires:    maven2-common-poms >= 1.0-8
 BuildRequires:    maven-jxr >= 1.0-2
 BuildRequires:    maven-wagon >= 1.0-0.1.b2
+BuildRequires:    maven-doxia >= 1.0-0.a9
 BuildRequires:    nekohtml >= 0.9.3
 BuildRequires:    oro >= 2.0.8
 BuildRequires:    plexus-ant-factory >= 1.0-0.a1.2
@@ -160,11 +176,17 @@ BuildRequires:    pmd >= 3.6
 BuildRequires:    qdox >= 1.5
 BuildRequires:    rhino >= 1.5
 BuildRequires:    saxon-scripts
+BuildRequires:    saxpath
 BuildRequires:    velocity >= 1.4
 BuildRequires:    xerces-j2 >= 2.7.1
 BuildRequires:    xalan-j2 >= 2.6.0
 BuildRequires:    xmlrpc
 BuildRequires:    xmlunit
+BuildRequires:    xom
+
+# FIXME these should be Requires for commons-logging 1.1
+BuildRequires:    avalon-framework
+BuildRequires:    avalon-logkit
 
 %if %{with_itests}
 BuildRequires:    log4j >= 1.2.13
@@ -182,19 +204,41 @@ BuildRequires:    maven2-plugin-jar
 BuildRequires:    maven2-plugin-javadoc
 BuildRequires:    maven2-plugin-plugin
 BuildRequires:    maven2-plugin-resources
+BuildRequires:    maven2-plugin-shade
 BuildRequires:    maven2-plugin-site
 BuildRequires:    maven2-plugin-surefire
-BuildRequires:    maven-archiver
-BuildRequires:    maven-doxia >= 1.0-0.a9
+BuildRequires:    maven-shared-archiver
+BuildRequires:    maven-doxia-sitetools
+BuildRequires:    maven-embedder
 BuildRequires:    maven-scm >= 0:1.0-0.b3.2
 BuildRequires:    maven-scm-test >= 0:1.0-0.b3.2
-BuildRequires:    maven-shared-file-management >= 1.0-4
-BuildRequires:    maven-shared-plugin-testing-harness >= 1.0-4
+BuildRequires:    maven-shared-common-artifact-filters
+BuildRequires:    maven-shared-dependency-analyzer
+BuildRequires:    maven-shared-dependency-tree
+BuildRequires:    maven-shared-downloader
+BuildRequires:    maven-enforcer-rule-api
+BuildRequires:    maven-shared-file-management >= 1.0
+BuildRequires:	  maven-shared-io
+BuildRequires:    maven-shared-plugin-testing-harness >= 1.0
+BuildRequires:    maven-shared-repository-builder
+BuildRequires:    maven-shared-invoker
+BuildRequires:    maven-shared-jar
+BuildRequires:    maven-shared-model-converter
+BuildRequires:    maven-shared-plugin-testing-tools
+BuildRequires:    maven-shared-plugin-tools-api
+BuildRequires:    maven-shared-plugin-tools-beanshell
+BuildRequires:    maven-shared-plugin-tools-java
+BuildRequires:    maven-shared-reporting-impl
+BuildRequires:    maven-shared-verifier
 BuildRequires:    maven-surefire >= 2.0
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven-surefire-booter >= 2.0
 BuildRequires:    modello >= 1.0-0.a8.3
 BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires:    plexus-digest
 BuildRequires:    plexus-maven-plugin >= 1.3.5
+BuildRequires:    plexus-mail-sender
+BuildRequires:    plexus-resources
 %endif
 
 Requires:        ant >= 1.6.5
@@ -257,6 +301,7 @@ Requires:        xerces-j2 >= 2.7.1
 Requires:        xalan-j2 >= 2.6.0
 Requires:        xmlrpc
 Requires:        xmlunit
+Requires:        xom
 
 %if %{without_bootstrap}
 Requires:		 %{name} = %{epoch}:%{version}
@@ -264,8 +309,13 @@ Requires:        maven-doxia >= 1.0-0.a9
 Requires(post):  maven-doxia >= 1.0-0.a9
 Requires:        maven-scm >= 0:1.0-0.b3.2
 Requires:        maven-scm-test >= 0:1.0-0.b3.2
+Requires:        maven-enforcer-rule-api
+Requires:        maven-shared-invoker
+Requires:	 maven-shared-io
 Requires:        maven-shared-file-management >= 1.0-4
-Requires:        maven-shared-plugin-testing-harness >= 1.0-4
+Requires:        maven-shared-jar
+Requires:        maven-shared-model-converter
+Requires:        maven-shared-verifier
 Requires:        maven-surefire >= 2.0
 Requires:        maven-surefire-booter >= 2.0
 Requires:        modello >= 1.0-0.a8.3
@@ -314,6 +364,15 @@ Group:          Development/Documentatio
 %package        plugin-ant
 Summary:        Ant plugin for maven
 Group:          Development/Build Tools
+Requires:       ant >= 1.6.5
+Requires:       ant-junit
+Requires:       ant-nodeps
+Requires:       junit >= 3.8.2
+Requires:       maven-wagon >= 1.0-0.1.b2
+Requires:       plexus-utils >= 1.2
+Requires:       xalan-j2 >= 2.6.0
+Requires:    	xml-commons-apis >= 1.3.02
+Requires:	plexus-container-default
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -330,6 +389,13 @@ Generates an Ant build file for the proj
 Summary:        Antlr plugin for maven
 Group:          Development/Build Tools
 Requires:       antlr >= 2.7.4
+Requires:	plexus-container-default
+Requires:       plexus-i18n >= 1.0
+%if %{without_bootstrap}
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
+%endif
+Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -346,8 +412,10 @@ Generates sources from an Antlr grammar.
 Summary:        Antrun plugin for maven
 Group:          Development/Build Tools
 Requires:       ant >= 1.6.5
+Requires:    	maven-embedder
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -369,6 +437,18 @@ Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+Requires:    	maven-shared-file-management >= 1.0
+Requires:    	maven-shared-archiver
+Requires:	plexus-container-default
+Requires:    	maven-shared-repository-builder
+Requires:    	maven-shared-common-artifact-filters
+Requires:	maven-shared-plugin-testing-tools
+Requires:	maven-shared-test-tools
+Requires:       jmock >= 1.0.1
+Requires:       jdom >= 1.0
+Requires:       jaxen >= 1.1
+Requires:    	saxpath
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -387,6 +467,10 @@ Requires:       maven-scm
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
+Requires:       maven-scm >= 0:1.0-0.b3.2
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -403,11 +487,18 @@ Summary:        Changes plugin for maven
 Group:          Development/Build Tools
 %if %{without_bootstrap}
 Requires:       maven-doxia
+Requires:       maven-doxia-sitetools >= 1.0
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       velocity
 Requires:       commons-httpclient
+Requires:       plexus-velocity >= 1.1.2
+Requires:       plexus-mail-sender
+Requires:       glassfish-javamail
+Requires:       jakarta-commons-lang
+Requires:       velocity
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -423,10 +514,13 @@ occured between different releases of yo
 Summary:        Checkstyle plugin for maven
 Group:          Development/Build Tools
 Requires:       checkstyle >= 4.1
+Requires:	checkstyle-optional >= 4.1
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-velocity >= 1.1.2
+Requires:       plexus-resources
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -465,6 +559,9 @@ Requires:       junit >= 3.8.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-compiler >= 1.5.1
+Requires:       plexus-resources
+Requires:       clover
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -502,6 +599,12 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+Requires:       maven-shared-file-management >= 1.0-4
+Requires:       junit >= 3.8.2
+Requires:       plexus-container-default
+Requires:       maven-shared-dependency-analyzer
+Requires:       maven-shared-dependency-tree
+
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -553,6 +656,13 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils
+Requires:       maven-shared-plugin-tools-beanshell >= 2.2
+Requires:       maven-shared-plugin-tools-java >= 2.2
+Requires:       commons-httpclient
+Requires:       jakarta-commons-logging >= 1.0.4
+Requires:       maven-shared-file-management >= 1.0-4
+Requires:       maven-shared-plugin-tools-api
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -571,6 +681,8 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       maven-shared-verifier
+Requires:       xmlunit
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -588,6 +700,15 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       plexus-archiver >= 1.0
+Requires:       jmock >= 1.0.1
+Requires:       jdom >= 1.0
+Requires:       jaxen >= 1.1
+Requires:    	saxpath
+Requires:       plexus-interactivity >= 1.0
+Requires:	maven-shared-plugin-testing-tools
+Requires:	maven-shared-test-tools
+Requires:       aqute-bndlib
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -625,6 +746,7 @@ Requires:       maven-shared
 %endif
 Requires:       plexus-utils
 Requires:       bsh
+Requires:       maven-enforcer-rule-api
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -644,6 +766,8 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       jakarta-commons-lang
 Requires:       plexus-utils
+Requires:       jakarta-commons-lang
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -660,6 +784,7 @@ Summary:        Help plugin for maven
 Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-shared-plugin-tools-api
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -679,6 +804,7 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon >= 1.0-0.1.b2
 Requires:       plexus-utils >= 1.2
+Requires:       jmock >= 1.0.1
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -694,6 +820,7 @@ Creates/updates an IDEA workspace for th
 %package        plugin-install
 Summary:        Install plugin for maven
 Group:          Development/Build Tools
+Requires:       plexus-digest >= 1.0
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -713,6 +840,9 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 %if %{without_bootstrap}
 Requires:       maven-shared
+Requires:       maven-shared-invoker
+Requires:       maven-shared-file-management >= 1.0-4
+Requires:	maven-shared-io
 %endif
 Requires:       bsh
 
@@ -732,7 +862,9 @@ Summary:        Jar plugin for maven
 Group:          Development/Build Tools
 Requires:       jakarta-commons-lang >= 2.1
 Requires:       maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-shared-archiver >= 2.3
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       plexus-utils >= 1.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -754,6 +886,8 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-archiver >= 1.0
+Requires:       plexus-utils >= 1.2
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -772,6 +906,8 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+Requires:       junit >= 3.8.2
+Requires:       maven-shared-model-converter
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -788,6 +924,12 @@ Summary:        Plugin plugin for maven
 Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-shared-plugin-tools-beanshell >= 2.2
+Requires:       maven-shared-plugin-tools-java >= 2.2
+Requires:    	maven-shared-reporting-impl
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       plexus-utils >= 1.2
+Requires:       plexus-container-default
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -806,7 +948,11 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       plexus-resources
 Requires:       pmd >= 3.3
+Requires:       jaxen >= 1.1
+Requires:       xom
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -826,6 +972,13 @@ Requires:       jakarta-commons-validato
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-i18n >= 1.0
+Requires:    	maven-shared-reporting-impl
+Requires:       maven-shared-jar
+Requires:       maven-shared-dependency-tree
+Requires:       maven-wagon
+Requires:       maven-scm >= 0:1.0-0.b3.2
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -863,6 +1016,7 @@ Requires:       plexus-velocity
 Requires:       velocity
 %if %{without_bootstrap}
 Requires:       maven-shared
+Requires:       maven-shared-downloader
 Requires:       plexus-resources
 %endif
 
@@ -897,7 +1051,8 @@ Plugin to help with repository-based tas
 %package        plugin-resources
 Summary:        Resources plugin for maven
 Group:          Development/Build Tools
-Requires:       jakarta-commons-io >= 1.1
+#Requires:       jakarta-commons-io >= 1.1
+Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -916,7 +1071,8 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 %if %{without_bootstrap}
-Requires:       maven-doxia >= 1.0
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
 %endif
 Requires:       plexus-utils >= 1.2
 
@@ -935,7 +1091,9 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
+Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default >= 1.0
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -945,6 +1103,7 @@ Requires(postun):    java-gcj-compat
 
 %description    plugin-source
 Builds a JAR of sources for use in IDEs and distribution to the repository.
+
 %package        plugin-stage
 Summary:        Stage plugin for maven
 Group:          Development/Build Tools
@@ -952,6 +1111,7 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon
 Requires:       plexus-utils
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -989,6 +1149,7 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -1005,12 +1166,29 @@ Builds a WAR from the current project.
 # Extract the plugins
 tar xzf %{SOURCE2}
 
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
+# has several bugs
+rm -rf maven2-plugins/maven-javadoc-plugin
+pushd maven2-plugins
+tar xzf %{SOURCE22}
+popd
+
 # Use an older version of site plugin because newer one requires newer doxia 
 # (1.0a8) which is not compatible with the older one (1.0a7) which is needed 
 # by other parts of maven
 #rm -rf maven2-plugins/maven-site-plugin
 #tar xzf %{SOURCE8}
 
+# javadoc 2.4 uses an old doxia method
+%patch15 -b .sav
+
+# This plugin can't cope with a JAR without a JDK version on it
+%patch16 -b .sav
+
+%patch17 -b .sav
+
+%patch18 -b .sav
+
 # Remove dependencies on org.codehaus.doxia.* (it is now
 # org.apache.maven.doxia, and in the interest of maintaining just one
 # doxia jar, we substitute things accordingly)
@@ -1018,7 +1196,7 @@ tar xzf %{SOURCE2}
 for i in    maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
-            maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
+            maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
             maven2-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
             maven2/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
             maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
@@ -1058,6 +1236,7 @@ done
 %patch9 -b .sav
 %patch10 -b .sav
 %patch11 -b .sav
+%patch12 -b .sav
 
 # FIXME: Maven eclipse plugin tests are disabled for now, until a way
 # is found to stop it from connecting to the web despite offline mode.
@@ -1121,6 +1300,9 @@ cp -p %{SOURCE13} m2_repo/repository/JPP
 cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
 
 %build
+# Fix maven-remote-resources-plugin
+# we now use plexus-velocity 1.1.7 which has the correct descriptor with a hint.
+rm -f maven2-plugins/maven-remote-resources-plugin/src/main/resources/META-INF/plexus/components.xml
 
 # Wire in jdom dependency
 cp -p maven2/maven-artifact/pom.xml maven2/maven-artifact/pom.xml.withoutjdom
@@ -1183,7 +1365,7 @@ cp ../../../../m2_home_local/repository/
 cp ../../../../m2_home_local/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar jtidy.jar
 )
 
-build-jar-repository -s -p $M2_HOME/lib jdom maven-wagon/wagon-file maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external
+build-jar-repository -s -p $M2_HOME/lib jdom maven-wagon/file maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external
 %endif
 
 # Build plugins
@@ -1206,11 +1388,21 @@ sed -i -e s:"<module>maven-clover-plugin
 
 # Now build everything
 # FIXME: Need to build in two stages to get around gcj bug that causes plugin reload to fail
-$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify  
+#$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify  
+$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify  
 $M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry --fail-at-end jar:jar install:install
 
 popd >& /dev/null
 
+%if ! %{with_bootstrap}
+# Build model-all JAR  (for model-v3 classes)
+pushd maven2/maven-model >& /dev/null
+
+$M2_HOME/bin/mvn -e -s %{maven_settings_file} $MAVEN_OPTS -P all-models package
+
+popd >& /dev/null
+%endif
+
 # Build complete. Run it tests.
 
 %if %{with_itests}
@@ -1348,6 +1540,9 @@ pushd %{name}
 
         install -m 644 $project/target/$project-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-%{version}.jar
 
+        if [ "$project" == "maven-model" ]; then
+          install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
+        fi
     done
 popd
 
@@ -2375,8 +2570,6 @@ fi
 
 %files plugin-dependency
 %defattr(-,root,root,-)
-# No longer there in 2.0.8
-#%doc maven2-plugins/maven-dependency-plugin/LICENSE.txt
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/dependency-plugin*.jar
 
@@ -2595,7 +2788,7 @@ fi
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin*.jar.*
 %endif
 
 
@@ -2675,6 +2868,84 @@ fi
 %endif
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
+- Import 2.0.8 work from Deepak Bhole:
+-- Fix maven-remote-resources-plugin
+-- Handle artifacts other than just poms and jars
+-- Cope with empty version XML tags
+-- Prevent unecessary files to end up in lib
+-- Fix handling of RELEASE versions
+-- Added BR for java-devel
+-- Fixed artifact path setting code for upstream group/artifactids
+- Import these fixes from Permaine Cheung:
+-- Change maven-archiver to maven-shared-archiver
+-- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
+-- Add missing Requires: maven-archiver to maven2-plugin-jar
+-- Add missing Requires: ant to maven2-plugin-ant
+-- Add missing Requires: maven-shared-plugin-tools-beanshell, 
+   maven-shared-plugin-tools-java to maven2-plugin-docck and
+   maven2-plugin-plugin
+-- Add missing Requires: to maven2-plugin-install
+- Import these fixes from Yong Yang:
+-- add maven2-plugins-jpprepolayout.patch
+-- Add missing BR xom
+-- Add missing BR maven-shared-io in non-bootstrap mode
+-- Add missing Requires xom
+-- Add missing Requires: maven-enforcer-rule-api in non-bootstrap mode
+-- Add missing Requires: maven-shared-invoker in non-bootstrap mode
+-- Add missing Requires: maven-shared-io in non-bootstrap mode
+-- Add missing Requires: maven-shared-jar in non-bootstrap mode
+-- Add missing Requires: maven-shared-model-converter in non-bootstrap mode
+-- Add missing Requires: maven-shared-verifier in non-bootstrap mode
+-- Add missing Requires: for all subpackages
+- Import these fixes from Fernando Nasser:
+-- Project Report Info plugin can't cope with a JAR without a JDK version on it
+-- Parent poms sometimes come as type "xml", adjust JPackageRepositoryLayout
+-- Test for jar in JPackageRepositoryLayout as pom may not have the
+   packaging set
+-- Update javadoc plugin to 2.4 to get rid of 2.3 bugs
+-- Modify MJAVADOC-137 oatch to exclude part reverted by MJAVADOC-196
+-- Add patch for javadoc plugin (MJAVADOC-137)
+-- Remove jetty from site plugin dependencies
+-- Install the model-all JAR
+-- Build model-all.jar for model-v3 needed by maven-shared-model-converter
+-- Add missing BRs in non-bootstrap mode:
+-- Add missing BR maven-embedder
+-- Add missing BR maven-shared-dependency-analyzer
+-- Add missing BR maven-shared-dependency-tree
+-- Add missing BR maven-shared-downloader
+-- Add missing BR maven-enforcer-rule-api
+-- Add missing BR maven-shared-invoker
+-- Add missing BR maven-shared-jar
+-- Add missing BR maven-shared-model-converter
+-- Add missing BR maven-shared-plugin-testing-tools
+-- Add missing BR maven-shared-plugin-tools-api
+-- Add missing BR maven-shared-plugin-tools-beanshell
+-- Add missing BR maven-shared-plugin-tools-java
+-- Add missing BR maven-shared-reporting-impl
+-- Add missing BR maven-shared-verifier
+-- Add missing BR maven2-plugin-ant
+-- Add missing BR maven2-plugin-clean
+-- Add missing BR plexus-mail-sender
+-- Add missing BR plexus-resources
+-- Add missing BRs in non-bootstrap mode:
+-- Add missing BR maven-doxia-sitetools
+-- Add missing BR maven-surefire-provider-junit
+-- Add missing BR maven2-plugin-shade in non-bootstrap mode
+-- Add missing BR plexus-digest in non-bootstrap mode
+-- Add missing BR  maven-shared-common-artifact-filters
+-- Add missing BR  maven-shared-repository-builder
+-- Rebuild with plexus-archiver rolled back to a7 to avoid compilation errors
+-- Adapt for commons-logging 1.1
+-- Specify source and target 1.4
+-- Add missing BRs to ant-nodeps, ant-junit, aqute-bndlib and javamail
+-- Remove extra maven- from maven-shared poms and jars in bootstrap binaries
+-- Require newer version of plexus-archiver to match maven-archiver
+-- Move maven-doxia to outside the bootstrap condition
+-- Add missing BR saxpath
+- Import these fixes from David Walluck:
+-- add patch for MNG-3139
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.1
 - Import 2.0.8 work from Deepak Bhole
 - Explicitly disable gcj support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Aug 2009 17:57:54 -0000	1.3
+++ sources	24 Aug 2009 19:12:57 -0000	1.4
@@ -6,3 +6,4 @@ a9b9ce42ffbba60eb1833f0a773f7aa7  maven2
 ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
 b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
 e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz
+7e6b7b8d83ae3498fe2c55a999278445  maven-javadoc-plugin-2.4-src.tar.gz



From mclasen at fedoraproject.org  Mon Aug 24 19:14:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 19:14:29 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.113, 1.114 glib2.spec, 1.214,
	1.215 sources, 1.115, 1.116
Message-ID: <20090824191429.8FD2811C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5804

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.21.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- .cvsignore	18 Jul 2009 01:00:47 -0000	1.113
+++ .cvsignore	24 Aug 2009 19:14:29 -0000	1.114
@@ -1 +1 @@
-glib-2.21.4.tar.bz2
+glib-2.21.5.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- glib2.spec	2 Aug 2009 05:42:18 -0000	1.214
+++ glib2.spec	24 Aug 2009 19:14:29 -0000	1.215
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.21.4
-Release: 3%{?dist}
+Version: 2.21.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.21.4-3
 - Save some space
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	18 Jul 2009 01:00:48 -0000	1.115
+++ sources	24 Aug 2009 19:14:29 -0000	1.116
@@ -1 +1 @@
-5092c5b479ba80065dc164d27e63000f  glib-2.21.4.tar.bz2
+5f3f19c4a8088c51e21cad5b8ea166e5  glib-2.21.5.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 24 19:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:15:40 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20090824191540.5AF8C10F877@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on icu (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Mon Aug 24 19:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:16:07 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20090824191607.307B510F878@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on icu (Fedora 11) to Approved for denisarnaud

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Mon Aug 24 19:17:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:17:01 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20090824191701.77FB410F877@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on icu (Fedora devel) to Approved for denisarnaud

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pkgdb at fedoraproject.org  Mon Aug 24 19:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:36:53 +0000
Subject: [pkgdb] sphinxbase was added for jjames
Message-ID: <20090824193653.442C410F878@bastion2.fedora.phx.redhat.com>

kevin has added Package sphinxbase with summary Common library for CMU Sphinx voice recognition products
kevin has approved Package sphinxbase
kevin has added a Fedora devel branch for sphinxbase with an owner of jjames
kevin has approved sphinxbase in Fedora devel
kevin has approved Package sphinxbase
kevin has set commit to Approved for 107427 on sphinxbase (Fedora devel)
kevin has set checkout to Approved for 107427 on sphinxbase (Fedora devel)
kevin has set build to Approved for 107427 on sphinxbase (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinxbase



From pkgdb at fedoraproject.org  Mon Aug 24 19:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:36:55 +0000
Subject: [pkgdb] sphinxbase (Fedora, 11) updated by kevin
Message-ID: <20090824193655.1581410F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sphinxbase
kevin has set commit to Approved for 107427 on sphinxbase (Fedora 11)
kevin has set checkout to Approved for 107427 on sphinxbase (Fedora 11)
kevin has set build to Approved for 107427 on sphinxbase (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinxbase



From pkgdb at fedoraproject.org  Mon Aug 24 19:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:36:55 +0000
Subject: [pkgdb] sphinxbase summary updated by kevin
Message-ID: <20090824193655.0821910F881@bastion2.fedora.phx.redhat.com>

kevin set package sphinxbase summary to Common library for CMU Sphinx voice recognition products

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/sphinxbase



From kevin at fedoraproject.org  Mon Aug 24 19:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:03 +0000 (UTC)
Subject: rpms/sphinxbase - New directory
Message-ID: <20090824193703.218B211C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sphinxbase
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10929/rpms/sphinxbase

Log Message:
Directory /cvs/pkgs/rpms/sphinxbase added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:03 +0000 (UTC)
Subject: rpms/sphinxbase/devel - New directory
Message-ID: <20090824193703.4219C11C0262@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sphinxbase/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10929/rpms/sphinxbase/devel

Log Message:
Directory /cvs/pkgs/rpms/sphinxbase/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:37:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:09 +0000 (UTC)
Subject: rpms/sphinxbase Makefile,NONE,1.1
Message-ID: <20090824193709.62A4C11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sphinxbase
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10929/rpms/sphinxbase

Added Files:
	Makefile 
Log Message:
Setup of module sphinxbase


--- NEW FILE Makefile ---
# Top level Makefile for module sphinxbase
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:37:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:09 +0000 (UTC)
Subject: rpms/sphinxbase/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824193709.C888311C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sphinxbase/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc10929/rpms/sphinxbase/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sphinxbase


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sphinxbase
# $Id: Makefile,v 1.1 2009/08/24 19:37:09 kevin Exp $
NAME := sphinxbase
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:37:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:37:40 +0000
Subject: [pkgdb] pocketsphinx was added for jjames
Message-ID: <20090824193740.E29A610F881@bastion2.fedora.phx.redhat.com>

kevin has added Package pocketsphinx with summary Real-time speech recognition
kevin has approved Package pocketsphinx
kevin has added a Fedora devel branch for pocketsphinx with an owner of jjames
kevin has approved pocketsphinx in Fedora devel
kevin has approved Package pocketsphinx
kevin has set commit to Approved for 107427 on pocketsphinx (Fedora devel)
kevin has set checkout to Approved for 107427 on pocketsphinx (Fedora devel)
kevin has set build to Approved for 107427 on pocketsphinx (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pocketsphinx



From pkgdb at fedoraproject.org  Mon Aug 24 19:37:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:37:42 +0000
Subject: [pkgdb] pocketsphinx summary updated by kevin
Message-ID: <20090824193742.61D2D10F88C@bastion2.fedora.phx.redhat.com>

kevin set package pocketsphinx summary to Real-time speech recognition

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pocketsphinx



From pkgdb at fedoraproject.org  Mon Aug 24 19:37:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:37:42 +0000
Subject: [pkgdb] pocketsphinx (Fedora, 11) updated by kevin
Message-ID: <20090824193742.6AA9010F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pocketsphinx
kevin has set commit to Approved for 107427 on pocketsphinx (Fedora 11)
kevin has set checkout to Approved for 107427 on pocketsphinx (Fedora 11)
kevin has set build to Approved for 107427 on pocketsphinx (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pocketsphinx



From kevin at fedoraproject.org  Mon Aug 24 19:37:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:51 +0000 (UTC)
Subject: rpms/pocketsphinx - New directory
Message-ID: <20090824193751.17DE811C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pocketsphinx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11166/rpms/pocketsphinx

Log Message:
Directory /cvs/pkgs/rpms/pocketsphinx added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:37:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:51 +0000 (UTC)
Subject: rpms/pocketsphinx/devel - New directory
Message-ID: <20090824193751.493F711C0373@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pocketsphinx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11166/rpms/pocketsphinx/devel

Log Message:
Directory /cvs/pkgs/rpms/pocketsphinx/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:37:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:58 +0000 (UTC)
Subject: rpms/pocketsphinx Makefile,NONE,1.1
Message-ID: <20090824193758.0F61F11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pocketsphinx
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11166/rpms/pocketsphinx

Added Files:
	Makefile 
Log Message:
Setup of module pocketsphinx


--- NEW FILE Makefile ---
# Top level Makefile for module pocketsphinx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:37:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:37:58 +0000 (UTC)
Subject: rpms/pocketsphinx/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824193758.528A411C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pocketsphinx/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11166/rpms/pocketsphinx/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pocketsphinx


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pocketsphinx
# $Id: Makefile,v 1.1 2009/08/24 19:37:58 kevin Exp $
NAME := pocketsphinx
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:38:47 +0000
Subject: [pkgdb] vanessa_logger was added for hubbitus
Message-ID: <20090824193847.23A0210F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package vanessa_logger with summary Generic logging layer
kevin has approved Package vanessa_logger
kevin has added a Fedora devel branch for vanessa_logger with an owner of hubbitus
kevin has approved vanessa_logger in Fedora devel
kevin has approved Package vanessa_logger
kevin has set commit to Approved for 107427 on vanessa_logger (Fedora devel)
kevin has set checkout to Approved for 107427 on vanessa_logger (Fedora devel)
kevin has set build to Approved for 107427 on vanessa_logger (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_logger



From pkgdb at fedoraproject.org  Mon Aug 24 19:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:38:48 +0000
Subject: [pkgdb] vanessa_logger summary updated by kevin
Message-ID: <20090824193848.C8C7010F88B@bastion2.fedora.phx.redhat.com>

kevin set package vanessa_logger summary to Generic logging layer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_logger



From pkgdb at fedoraproject.org  Mon Aug 24 19:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:38:48 +0000
Subject: [pkgdb] vanessa_logger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090824193848.CE65110F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vanessa_logger
kevin has set commit to Approved for 107427 on vanessa_logger (Fedora 10)
kevin has set checkout to Approved for 107427 on vanessa_logger (Fedora 10)
kevin has set build to Approved for 107427 on vanessa_logger (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_logger



From pkgdb at fedoraproject.org  Mon Aug 24 19:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:38:48 +0000
Subject: [pkgdb] vanessa_logger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090824193848.DA17510F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for vanessa_logger
kevin has set commit to Approved for 107427 on vanessa_logger (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on vanessa_logger (Fedora EPEL 5)
kevin has set build to Approved for 107427 on vanessa_logger (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_logger



From pkgdb at fedoraproject.org  Mon Aug 24 19:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:38:48 +0000
Subject: [pkgdb] vanessa_logger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090824193848.E1E5010F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vanessa_logger
kevin has set commit to Approved for 107427 on vanessa_logger (Fedora 11)
kevin has set checkout to Approved for 107427 on vanessa_logger (Fedora 11)
kevin has set build to Approved for 107427 on vanessa_logger (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_logger



From kevin at fedoraproject.org  Mon Aug 24 19:38:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:38:56 +0000 (UTC)
Subject: rpms/vanessa_logger - New directory
Message-ID: <20090824193856.1510611C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_logger
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw11498/rpms/vanessa_logger

Log Message:
Directory /cvs/pkgs/rpms/vanessa_logger added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:38:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:38:56 +0000 (UTC)
Subject: rpms/vanessa_logger/devel - New directory
Message-ID: <20090824193856.3A94211C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_logger/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw11498/rpms/vanessa_logger/devel

Log Message:
Directory /cvs/pkgs/rpms/vanessa_logger/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:39:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:39:02 +0000 (UTC)
Subject: rpms/vanessa_logger/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824193902.8FA4A11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_logger/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw11498/rpms/vanessa_logger/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vanessa_logger


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vanessa_logger
# $Id: Makefile,v 1.1 2009/08/24 19:39:02 kevin Exp $
NAME := vanessa_logger
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Aug 24 19:39:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:39:02 +0000 (UTC)
Subject: rpms/vanessa_logger Makefile,NONE,1.1
Message-ID: <20090824193902.46D2F11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_logger
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw11498/rpms/vanessa_logger

Added Files:
	Makefile 
Log Message:
Setup of module vanessa_logger


--- NEW FILE Makefile ---
# Top level Makefile for module vanessa_logger
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 24 19:39:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:39:56 +0000
Subject: [pkgdb] ipplan was added for topdog
Message-ID: <20090824193956.EAB3F10F878@bastion2.fedora.phx.redhat.com>

kevin has added Package ipplan with summary Web-based IP address manager and tracker
kevin has approved Package ipplan
kevin has added a Fedora devel branch for ipplan with an owner of topdog
kevin has approved ipplan in Fedora devel
kevin has approved Package ipplan
kevin has set commit to Approved for 107427 on ipplan (Fedora devel)
kevin has set checkout to Approved for 107427 on ipplan (Fedora devel)
kevin has set build to Approved for 107427 on ipplan (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipplan



From spot at fedoraproject.org  Mon Aug 24 19:39:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:39:58 +0000 (UTC)
Subject: rpms/R/F-10 R.spec,1.61,1.62 sources,1.23,1.24
Message-ID: <20090824193958.9DEA511C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887/F-10

Modified Files:
	R.spec sources 
Log Message:
update to 2.9.2


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/R.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- R.spec	9 Jul 2009 20:59:53 -0000	1.61
+++ R.spec	24 Aug 2009 19:39:58 -0000	1.62
@@ -5,7 +5,7 @@
 %endif
 
 Name: R
-Version: 2.9.1
+Version: 2.9.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -57,26 +57,26 @@ Requires: perl, sed, gawk, texlive-latex
 # depend on one of these submodules rather than just R. These are provided for 
 # packager convenience.
 Provides: R-base = %{version}
-Provides: R-boot = 1.2.37
-Provides: R-class = 7.2.47
+Provides: R-boot = 1.2.38
+Provides: R-class = 7.2.48
 Provides: R-cluster = 1.12.0
 Provides: R-codetools = 0.2.2
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.36
+Provides: R-foreign = 0.8.37
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.2
 Provides: R-lattice = 0.17.25
-Provides: R-MASS = 7.2.47
-Provides: R-Matrix = 0.999375.29
+Provides: R-MASS = 7.2.48
+Provides: R-Matrix = 0.999375.30
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5.5
-Provides: R-nlme = 3.1.92
-Provides: R-nnet = 7.2.47
-Provides: R-rpart = 3.1.44
-Provides: R-spatial = 7.2.47
+Provides: R-nlme = 3.1.93
+Provides: R-nnet = 7.2.48
+Provides: R-rpart = 3.1.45
+Provides: R-spatial = 7.2.48
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
@@ -84,7 +84,7 @@ Provides: R-survival = 2.35.4
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
-Provides: R-VR = 7.2.47
+Provides: R-VR = 7.2.48
 
 %description core
 A language and environment for statistical computing and graphics.
@@ -234,13 +234,15 @@ make pdf
 make info
 
 # Convert to UTF-8
-for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do
   iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
   mv $i{.utf8,}
 done
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf
+make DESTDIR=${RPM_BUILD_ROOT} install install-info
+make DESTDIR=${RPM_BUILD_ROOT} install-pdf
+
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old
 install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}
@@ -271,7 +273,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/
 sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html
 
 for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do
-	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
+  sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
 # Fix exec bits
@@ -994,6 +996,15 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.2-1
+- Update to 2.9.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.1-2
+- don't try to make the PDFs in rawhide/i586
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.1-1
 - update to 2.9.1
 - fix versioned provides
@@ -1303,8 +1314,8 @@ R CMD javareconf \
   avoiding warnings about UTF-8 locale not being supported
 
 * Mon Mar 15 2004 Martyn Plummer <plummer at iarc.fr>
-- No need to export optimization flags. This is done by %configure
-- Folded info installation into %makeinstall 
+- No need to export optimization flags. This is done by %%configure
+- Folded info installation into %%makeinstall 
 - Check that RPM_BASE_ROOT is not set to "/" before cleaning up
 
 * Thu Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
@@ -1313,7 +1324,7 @@ R CMD javareconf \
 * Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
 - Changes from James Henstridge <james at daa.com.au> to allow building on IA64:
 - Added BuildRequires for tcl-devel tk-devel tetex-latex
-- Use the %configure macro to call the configure script
+- Use the %%configure macro to call the configure script
 - Pass --with-tcl-config and --with-tk-config arguments to configure
 - Set rhome to point to the build root during "make install"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Jul 2009 20:59:54 -0000	1.23
+++ sources	24 Aug 2009 19:39:58 -0000	1.24
@@ -1 +1 @@
-54a79eebdf0cec3fd2c489fc94d99b00  R-2.9.1.tar.gz
+112e2a1306cf71320e45d14e87e5b913  R-2.9.2.tar.gz



From spot at fedoraproject.org  Mon Aug 24 19:39:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:39:58 +0000 (UTC)
Subject: rpms/R/EL-5 R.spec,1.39,1.40 sources,1.19,1.20
Message-ID: <20090824193958.6B31311C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887/EL-5

Modified Files:
	R.spec sources 
Log Message:
update to 2.9.2


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- R.spec	9 Jul 2009 20:59:48 -0000	1.39
+++ R.spec	24 Aug 2009 19:39:58 -0000	1.40
@@ -5,7 +5,7 @@
 %endif
 
 Name: R
-Version: 2.9.1
+Version: 2.9.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -57,25 +57,25 @@ Requires: perl, sed, gawk, tetex-latex, 
 # depend on one of these submodules rather than just R. These are provided for 
 # packager convenience.
 Provides: R-base = %{version}
-Provides: R-boot = 1.2.37
-Provides: R-class = 7.2.47
+Provides: R-boot = 1.2.38
+Provides: R-class = 7.2.48
 Provides: R-cluster = 1.12.0
 Provides: R-codetools = 0.2.2
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.36
+Provides: R-foreign = 0.8.37
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.2
 Provides: R-lattice = 0.17.25
-Provides: R-MASS = 7.2.47
-Provides: R-Matrix = 0.999375.29
+Provides: R-MASS = 7.2.48
+Provides: R-Matrix = 0.999375.30
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5.5
-Provides: R-nlme = 3.1.92
-Provides: R-nnet = 7.2.47
-Provides: R-rpart = 3.1.44
-Provides: R-spatial = 7.2.47
+Provides: R-nlme = 3.1.93
+Provides: R-nnet = 7.2.48
+Provides: R-rpart = 3.1.45
+Provides: R-spatial = 7.2.48
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
@@ -83,7 +83,7 @@ Provides: R-survival = 2.35.4
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
-Provides: R-VR = 7.2.47
+Provides: R-VR = 7.2.48
 
 %description core
 A language and environment for statistical computing and graphics.
@@ -198,7 +198,7 @@ make pdf
 make info
 
 # Convert to UTF-8
-for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do
   iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
   mv $i{.utf8,}
 done
@@ -235,7 +235,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/
 sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html
 
 for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do
-	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
+  sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
 # Fix exec bits
@@ -932,6 +932,9 @@ fi
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.2-1
+- Update to 2.9.2
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.1-1
 - update to 2.9.1
 - fix versioned provides
@@ -1243,8 +1246,8 @@ fi
   avoiding warnings about UTF-8 locale not being supported
 
 * Mon Mar 15 2004 Martyn Plummer <plummer at iarc.fr>
-- No need to export optimization flags. This is done by %configure
-- Folded info installation into %makeinstall 
+- No need to export optimization flags. This is done by %%configure
+- Folded info installation into %%makeinstall 
 - Check that RPM_BASE_ROOT is not set to "/" before cleaning up
 
 * Thu Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
@@ -1253,7 +1256,7 @@ fi
 * Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
 - Changes from James Henstridge <james at daa.com.au> to allow building on IA64:
 - Added BuildRequires for tcl-devel tk-devel tetex-latex
-- Use the %configure macro to call the configure script
+- Use the %%configure macro to call the configure script
 - Pass --with-tcl-config and --with-tk-config arguments to configure
 - Set rhome to point to the build root during "make install"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Jul 2009 20:59:48 -0000	1.19
+++ sources	24 Aug 2009 19:39:58 -0000	1.20
@@ -1 +1 @@
-54a79eebdf0cec3fd2c489fc94d99b00  R-2.9.1.tar.gz
+112e2a1306cf71320e45d14e87e5b913  R-2.9.2.tar.gz



From spot at fedoraproject.org  Mon Aug 24 19:39:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:39:59 +0000 (UTC)
Subject: rpms/R/devel .cvsignore, 1.21, 1.22 R.spec, 1.64, 1.65 sources, 1.23,
	1.24
Message-ID: <20090824193959.3663611C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:
update to 2.9.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Jul 2009 20:59:55 -0000	1.21
+++ .cvsignore	24 Aug 2009 19:39:58 -0000	1.22
@@ -1 +1 @@
-R-2.9.1.tar.gz
+R-2.9.2.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- R.spec	24 Jul 2009 16:06:36 -0000	1.64
+++ R.spec	24 Aug 2009 19:39:58 -0000	1.65
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.9.1
-Release: 3%{?dist}
+Version: 2.9.2
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -57,26 +57,26 @@ Requires: perl, sed, gawk, texlive-latex
 # depend on one of these submodules rather than just R. These are provided for 
 # packager convenience.
 Provides: R-base = %{version}
-Provides: R-boot = 1.2.37
-Provides: R-class = 7.2.47
+Provides: R-boot = 1.2.38
+Provides: R-class = 7.2.48
 Provides: R-cluster = 1.12.0
 Provides: R-codetools = 0.2.2
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.36
+Provides: R-foreign = 0.8.37
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.2
 Provides: R-lattice = 0.17.25
-Provides: R-MASS = 7.2.47
-Provides: R-Matrix = 0.999375.29
+Provides: R-MASS = 7.2.48
+Provides: R-Matrix = 0.999375.30
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5.5
-Provides: R-nlme = 3.1.92
-Provides: R-nnet = 7.2.47
-Provides: R-rpart = 3.1.44
-Provides: R-spatial = 7.2.47
+Provides: R-nlme = 3.1.93
+Provides: R-nnet = 7.2.48
+Provides: R-rpart = 3.1.45
+Provides: R-spatial = 7.2.48
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
@@ -84,7 +84,7 @@ Provides: R-survival = 2.35.4
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
-Provides: R-VR = 7.2.47
+Provides: R-VR = 7.2.48
 
 %description core
 A language and environment for statistical computing and graphics.
@@ -230,24 +230,18 @@ export FCFLAGS="%{optflags}"
 make 
 (cd src/nmath/standalone; make)
 #make check-all
-# 2009-07-10 
-# PDF generation is not working correctly in i586/rawhide, probably a texlive bug
-%ifnarch i586
 make pdf
-%endif
 make info
 
 # Convert to UTF-8
-for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do
   iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
   mv $i{.utf8,}
 done
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install install-info
-%ifnarch i586
 make DESTDIR=${RPM_BUILD_ROOT} install-pdf
-%endif
 
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old
@@ -271,9 +265,7 @@ install -m0755 %{SOURCE2} $RPM_BUILD_ROO
 
 # Fix multilib
 touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
-%ifnarch i586
 touch -r NEWS doc/manual/*.pdf
-%endif
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R
 
 # Fix html/packages.html
@@ -281,7 +273,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/
 sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html
 
 for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do
-	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
+  sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
 # Fix exec bits
@@ -1004,6 +996,9 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.2-1
+- Update to 2.9.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -1319,8 +1314,8 @@ R CMD javareconf \
   avoiding warnings about UTF-8 locale not being supported
 
 * Mon Mar 15 2004 Martyn Plummer <plummer at iarc.fr>
-- No need to export optimization flags. This is done by %configure
-- Folded info installation into %makeinstall 
+- No need to export optimization flags. This is done by %%configure
+- Folded info installation into %%makeinstall 
 - Check that RPM_BASE_ROOT is not set to "/" before cleaning up
 
 * Thu Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
@@ -1329,7 +1324,7 @@ R CMD javareconf \
 * Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
 - Changes from James Henstridge <james at daa.com.au> to allow building on IA64:
 - Added BuildRequires for tcl-devel tk-devel tetex-latex
-- Use the %configure macro to call the configure script
+- Use the %%configure macro to call the configure script
 - Pass --with-tcl-config and --with-tk-config arguments to configure
 - Set rhome to point to the build root during "make install"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Jul 2009 20:59:55 -0000	1.23
+++ sources	24 Aug 2009 19:39:59 -0000	1.24
@@ -1 +1 @@
-54a79eebdf0cec3fd2c489fc94d99b00  R-2.9.1.tar.gz
+112e2a1306cf71320e45d14e87e5b913  R-2.9.2.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 24 19:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:39:59 +0000
Subject: [pkgdb] ipplan summary updated by kevin
Message-ID: <20090824194000.0B61F10F894@bastion2.fedora.phx.redhat.com>

kevin set package ipplan summary to Web-based IP address manager and tracker

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipplan



From spot at fedoraproject.org  Mon Aug 24 19:39:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:39:58 +0000 (UTC)
Subject: rpms/R/EL-4 R.spec,1.33,1.34 sources,1.13,1.14
Message-ID: <20090824193958.449E311C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887/EL-4

Modified Files:
	R.spec sources 
Log Message:
update to 2.9.2


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/R.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- R.spec	9 Jul 2009 20:59:46 -0000	1.33
+++ R.spec	24 Aug 2009 19:39:58 -0000	1.34
@@ -5,7 +5,7 @@
 %endif
 
 Name: R
-Version: 2.9.1
+Version: 2.9.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -56,25 +56,25 @@ Requires: perl, sed, gawk, tetex-latex, 
 # depend on one of these submodules rather than just R. These are provided for 
 # packager convenience.
 Provides: R-base = %{version}
-Provides: R-boot = 1.2.37
-Provides: R-class = 7.2.47
+Provides: R-boot = 1.2.38
+Provides: R-class = 7.2.48
 Provides: R-cluster = 1.12.0
 Provides: R-codetools = 0.2.2
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.36
+Provides: R-foreign = 0.8.37
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.2
 Provides: R-lattice = 0.17.25
-Provides: R-MASS = 7.2.47
-Provides: R-Matrix = 0.999375.29
+Provides: R-MASS = 7.2.48
+Provides: R-Matrix = 0.999375.30
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5.5
-Provides: R-nlme = 3.1.92
-Provides: R-nnet = 7.2.47
-Provides: R-rpart = 3.1.44
-Provides: R-spatial = 7.2.47
+Provides: R-nlme = 3.1.93
+Provides: R-nnet = 7.2.48
+Provides: R-rpart = 3.1.45
+Provides: R-spatial = 7.2.48
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
@@ -82,7 +82,7 @@ Provides: R-survival = 2.35.4
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
-Provides: R-VR = 7.2.47
+Provides: R-VR = 7.2.48
 
 %description core
 A language and environment for statistical computing and graphics.
@@ -206,7 +206,7 @@ make pdf
 make info
 
 # Convert to UTF-8
-for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do
   iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
   mv $i{.utf8,}
 done
@@ -243,7 +243,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/
 sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html
 
 for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do
-	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
+  sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
 # Fix exec bits
@@ -940,6 +940,9 @@ fi
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.2-1
+- Update to 2.9.2
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.1-1
 - update to 2.9.1
 - fix versioned provides
@@ -1253,8 +1256,8 @@ fi
   avoiding warnings about UTF-8 locale not being supported
 
 * Mon Mar 15 2004 Martyn Plummer <plummer at iarc.fr>
-- No need to export optimization flags. This is done by %configure
-- Folded info installation into %makeinstall 
+- No need to export optimization flags. This is done by %%configure
+- Folded info installation into %%makeinstall 
 - Check that RPM_BASE_ROOT is not set to "/" before cleaning up
 
 * Thu Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
@@ -1263,7 +1266,7 @@ fi
 * Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
 - Changes from James Henstridge <james at daa.com.au> to allow building on IA64:
 - Added BuildRequires for tcl-devel tk-devel tetex-latex
-- Use the %configure macro to call the configure script
+- Use the %%configure macro to call the configure script
 - Pass --with-tcl-config and --with-tk-config arguments to configure
 - Set rhome to point to the build root during "make install"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Jul 2009 20:59:47 -0000	1.13
+++ sources	24 Aug 2009 19:39:58 -0000	1.14
@@ -1 +1 @@
-54a79eebdf0cec3fd2c489fc94d99b00  R-2.9.1.tar.gz
+112e2a1306cf71320e45d14e87e5b913  R-2.9.2.tar.gz



From spot at fedoraproject.org  Mon Aug 24 19:39:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:39:58 +0000 (UTC)
Subject: rpms/R/F-11 R.spec,1.62,1.63 sources,1.23,1.24
Message-ID: <20090824193958.E366F11C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11887/F-11

Modified Files:
	R.spec sources 
Log Message:
update to 2.9.2


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/R.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- R.spec	9 Jul 2009 20:59:54 -0000	1.62
+++ R.spec	24 Aug 2009 19:39:58 -0000	1.63
@@ -5,7 +5,7 @@
 %endif
 
 Name: R
-Version: 2.9.1
+Version: 2.9.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -57,26 +57,26 @@ Requires: perl, sed, gawk, texlive-latex
 # depend on one of these submodules rather than just R. These are provided for 
 # packager convenience.
 Provides: R-base = %{version}
-Provides: R-boot = 1.2.37
-Provides: R-class = 7.2.47
+Provides: R-boot = 1.2.38
+Provides: R-class = 7.2.48
 Provides: R-cluster = 1.12.0
 Provides: R-codetools = 0.2.2
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.36
+Provides: R-foreign = 0.8.37
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.2
 Provides: R-lattice = 0.17.25
-Provides: R-MASS = 7.2.47
-Provides: R-Matrix = 0.999375.29
+Provides: R-MASS = 7.2.48
+Provides: R-Matrix = 0.999375.30
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.5.5
-Provides: R-nlme = 3.1.92
-Provides: R-nnet = 7.2.47
-Provides: R-rpart = 3.1.44
-Provides: R-spatial = 7.2.47
+Provides: R-nlme = 3.1.93
+Provides: R-nnet = 7.2.48
+Provides: R-rpart = 3.1.45
+Provides: R-spatial = 7.2.48
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
@@ -84,7 +84,7 @@ Provides: R-survival = 2.35.4
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
-Provides: R-VR = 7.2.47
+Provides: R-VR = 7.2.48
 
 %description core
 A language and environment for statistical computing and graphics.
@@ -234,13 +234,15 @@ make pdf
 make info
 
 # Convert to UTF-8
-for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do
+for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do
   iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
   mv $i{.utf8,}
 done
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf
+make DESTDIR=${RPM_BUILD_ROOT} install install-info
+make DESTDIR=${RPM_BUILD_ROOT} install-pdf
+
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old
 install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}
@@ -271,7 +273,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/
 sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html
 
 for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do
-	sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
+  sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i
 done
 
 # Fix exec bits
@@ -994,6 +996,15 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.2-1
+- Update to 2.9.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.1-2
+- don't try to make the PDFs in rawhide/i586
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.1-1
 - update to 2.9.1
 - fix versioned provides
@@ -1303,8 +1314,8 @@ R CMD javareconf \
   avoiding warnings about UTF-8 locale not being supported
 
 * Mon Mar 15 2004 Martyn Plummer <plummer at iarc.fr>
-- No need to export optimization flags. This is done by %configure
-- Folded info installation into %makeinstall 
+- No need to export optimization flags. This is done by %%configure
+- Folded info installation into %%makeinstall 
 - Check that RPM_BASE_ROOT is not set to "/" before cleaning up
 
 * Thu Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
@@ -1313,7 +1324,7 @@ R CMD javareconf \
 * Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
 - Changes from James Henstridge <james at daa.com.au> to allow building on IA64:
 - Added BuildRequires for tcl-devel tk-devel tetex-latex
-- Use the %configure macro to call the configure script
+- Use the %%configure macro to call the configure script
 - Pass --with-tcl-config and --with-tk-config arguments to configure
 - Set rhome to point to the build root during "make install"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Jul 2009 20:59:54 -0000	1.23
+++ sources	24 Aug 2009 19:39:58 -0000	1.24
@@ -1 +1 @@
-54a79eebdf0cec3fd2c489fc94d99b00  R-2.9.1.tar.gz
+112e2a1306cf71320e45d14e87e5b913  R-2.9.2.tar.gz



From pkgdb at fedoraproject.org  Mon Aug 24 19:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:39:59 +0000
Subject: [pkgdb] ipplan (Fedora EPEL, 5) updated by kevin
Message-ID: <20090824194000.1835B10F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ipplan
kevin has set commit to Approved for 107427 on ipplan (Fedora 10)
kevin has set checkout to Approved for 107427 on ipplan (Fedora 10)
kevin has set build to Approved for 107427 on ipplan (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipplan



From pkgdb at fedoraproject.org  Mon Aug 24 19:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:39:59 +0000
Subject: [pkgdb] ipplan (Fedora EPEL, 5) updated by kevin
Message-ID: <20090824194000.5D4C510F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ipplan
kevin has set commit to Approved for 107427 on ipplan (Fedora 11)
kevin has set checkout to Approved for 107427 on ipplan (Fedora 11)
kevin has set build to Approved for 107427 on ipplan (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipplan



From pkgdb at fedoraproject.org  Mon Aug 24 19:40:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:40:00 +0000
Subject: [pkgdb] ipplan (Fedora EPEL, 5) updated by kevin
Message-ID: <20090824194000.6DBF110F8A0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ipplan
kevin has set commit to Approved for 107427 on ipplan (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on ipplan (Fedora EPEL 5)
kevin has set build to Approved for 107427 on ipplan (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ipplan



From kevin at fedoraproject.org  Mon Aug 24 19:40:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:40:07 +0000 (UTC)
Subject: rpms/ipplan/devel - New directory
Message-ID: <20090824194007.5721111C04AA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ipplan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12003/rpms/ipplan/devel

Log Message:
Directory /cvs/pkgs/rpms/ipplan/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:40:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:40:07 +0000 (UTC)
Subject: rpms/ipplan - New directory
Message-ID: <20090824194007.17F1B11C0426@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ipplan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12003/rpms/ipplan

Log Message:
Directory /cvs/pkgs/rpms/ipplan added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:40:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:40:13 +0000 (UTC)
Subject: rpms/ipplan Makefile,NONE,1.1
Message-ID: <20090824194013.6C86211C0426@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ipplan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12003/rpms/ipplan

Added Files:
	Makefile 
Log Message:
Setup of module ipplan


--- NEW FILE Makefile ---
# Top level Makefile for module ipplan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:40:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:40:13 +0000 (UTC)
Subject: rpms/ipplan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090824194013.BB69211C0426@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ipplan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh12003/rpms/ipplan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipplan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ipplan
# $Id: Makefile,v 1.1 2009/08/24 19:40:13 kevin Exp $
NAME := ipplan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:41:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:41:18 +0000
Subject: [pkgdb] desktop-effects was added for otaylor
Message-ID: <20090824194118.4AE2E10F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package desktop-effects with summary Switch GNOME window management and effects
kevin has approved Package desktop-effects
kevin has added a Fedora devel branch for desktop-effects with an owner of otaylor
kevin has approved desktop-effects in Fedora devel
kevin has approved Package desktop-effects
kevin has set commit to Approved for 107427 on desktop-effects (Fedora devel)
kevin has set checkout to Approved for 107427 on desktop-effects (Fedora devel)
kevin has set build to Approved for 107427 on desktop-effects (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/desktop-effects



From pkgdb at fedoraproject.org  Mon Aug 24 19:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:41:20 +0000
Subject: [pkgdb] desktop-effects summary updated by kevin
Message-ID: <20090824194120.47D9010F894@bastion2.fedora.phx.redhat.com>

kevin set package desktop-effects summary to Switch GNOME window management and effects

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/desktop-effects



From pkgdb at fedoraproject.org  Mon Aug 24 19:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:41:20 +0000
Subject: [pkgdb] desktop-effects (Fedora, devel) updated by kevin
Message-ID: <20090824194120.54B2110F89A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on desktop-effects (Fedora devel) for drago01
kevin approved watchcommits on desktop-effects (Fedora devel) for drago01
kevin approved commit on desktop-effects (Fedora devel) for drago01
kevin approved build on desktop-effects (Fedora devel) for drago01
kevin approved approveacls on desktop-effects (Fedora devel) for drago01

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/desktop-effects



From kevin at fedoraproject.org  Mon Aug 24 19:41:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:41:29 +0000 (UTC)
Subject: rpms/desktop-effects - New directory
Message-ID: <20090824194129.1DAE411C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/desktop-effects
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12627/rpms/desktop-effects

Log Message:
Directory /cvs/pkgs/rpms/desktop-effects added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:41:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:41:29 +0000 (UTC)
Subject: rpms/desktop-effects/devel - New directory
Message-ID: <20090824194129.3DADD11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12627/rpms/desktop-effects/devel

Log Message:
Directory /cvs/pkgs/rpms/desktop-effects/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:41:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:41:35 +0000 (UTC)
Subject: rpms/desktop-effects Makefile,NONE,1.1
Message-ID: <20090824194135.2C8B611C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/desktop-effects
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12627/rpms/desktop-effects

Added Files:
	Makefile 
Log Message:
Setup of module desktop-effects


--- NEW FILE Makefile ---
# Top level Makefile for module desktop-effects
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:41:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:41:35 +0000 (UTC)
Subject: rpms/desktop-effects/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824194135.7CF4F11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM12627/rpms/desktop-effects/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module desktop-effects


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: desktop-effects
# $Id: Makefile,v 1.1 2009/08/24 19:41:35 kevin Exp $
NAME := desktop-effects
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:42:14 +0000
Subject: [pkgdb] hunspell-ak was added for caolanm
Message-ID: <20090824194214.860E510F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-ak with summary Akan hunspell dictionary
kevin has approved Package hunspell-ak
kevin has added a Fedora devel branch for hunspell-ak with an owner of caolanm
kevin has approved hunspell-ak in Fedora devel
kevin has approved Package hunspell-ak
kevin has set commit to Approved for 107427 on hunspell-ak (Fedora devel)
kevin has set checkout to Approved for 107427 on hunspell-ak (Fedora devel)
kevin has set build to Approved for 107427 on hunspell-ak (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ak



From pkgdb at fedoraproject.org  Mon Aug 24 19:42:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:42:15 +0000
Subject: [pkgdb] hunspell-ak summary updated by kevin
Message-ID: <20090824194215.DFE9310F8A1@bastion2.fedora.phx.redhat.com>

kevin set package hunspell-ak summary to Akan hunspell dictionary

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-ak



From kevin at fedoraproject.org  Mon Aug 24 19:42:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:42:24 +0000 (UTC)
Subject: rpms/hunspell-ak - New directory
Message-ID: <20090824194224.1F1B911C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ak
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi12860/rpms/hunspell-ak

Log Message:
Directory /cvs/pkgs/rpms/hunspell-ak added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:42:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:42:24 +0000 (UTC)
Subject: rpms/hunspell-ak/devel - New directory
Message-ID: <20090824194224.5052011C0373@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ak/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi12860/rpms/hunspell-ak/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-ak/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:42:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:42:30 +0000 (UTC)
Subject: rpms/hunspell-ak Makefile,NONE,1.1
Message-ID: <20090824194230.B028311C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ak
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi12860/rpms/hunspell-ak

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-ak


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-ak
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:42:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:42:31 +0000 (UTC)
Subject: rpms/hunspell-ak/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824194231.07D4111C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-ak/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi12860/rpms/hunspell-ak/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-ak


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-ak
# $Id: Makefile,v 1.1 2009/08/24 19:42:30 kevin Exp $
NAME := hunspell-ak
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From spot at fedoraproject.org  Mon Aug 24 19:43:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:43:56 +0000 (UTC)
Subject: rpms/rpy/F-10 rpy.spec,1.38,1.39
Message-ID: <20090824194356.EF4AD11C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13243/F-10

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.2


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-10/rpy.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- rpy.spec	9 Jul 2009 21:26:43 -0000	1.38
+++ rpy.spec	24 Aug 2009 19:43:56 -0000	1.39
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.9.1
+%define rver   2.9.2
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       1.0.3
-Release:       9%{?dist}
+Release:       10%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:       GPLv2+
@@ -77,6 +77,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-10
+- rebuild for R 2.9.2
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-9
 - rebuild for R 2.9.1
 



From spot at fedoraproject.org  Mon Aug 24 19:43:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:43:57 +0000 (UTC)
Subject: rpms/rpy/F-11 rpy.spec,1.41,1.42
Message-ID: <20090824194357.281E511C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13243/F-11

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.2


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/rpy.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- rpy.spec	9 Jul 2009 21:26:45 -0000	1.41
+++ rpy.spec	24 Aug 2009 19:43:57 -0000	1.42
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.9.1
+%define rver   2.9.2
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.3
-Release:       3%{?dist}
+Release:       4%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-4
+- rebuild for R-2.9.2
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-3
 - rebuild for R-2.9.1
 



From spot at fedoraproject.org  Mon Aug 24 19:43:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 24 Aug 2009 19:43:57 +0000 (UTC)
Subject: rpms/rpy/devel rpy.spec,1.44,1.45
Message-ID: <20090824194357.50D9011C0044@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/rpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13243/devel

Modified Files:
	rpy.spec 
Log Message:
rebuild for 2.9.2


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- rpy.spec	27 Jul 2009 03:14:48 -0000	1.44
+++ rpy.spec	24 Aug 2009 19:43:57 -0000	1.45
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.9.1
+%define rver   2.9.2
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
-Release:       4%{?dist}
+Release:       5%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz
 License:       MPLv1.1 or GPLv2+ or LGPLv2+
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-5
+- rebuild for R 2.9.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Aug 24 19:44:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 19:44:33 +0000 (UTC)
Subject: rpms/pexpect/EL-4 dead.package, NONE, 1.1 pexpect.spec, 1.10,
	NONE sources, 1.5, NONE
Message-ID: <20090824194433.9960D11C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pexpect/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13471

Added Files:
	dead.package 
Removed Files:
	pexpect.spec sources 
Log Message:
package is in rhel



--- NEW FILE dead.package ---
package is in RHEL


--- pexpect.spec DELETED ---


--- sources DELETED ---



From ausil at fedoraproject.org  Mon Aug 24 19:45:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 19:45:12 +0000 (UTC)
Subject: rpms/pexpect/EL-5 dead.package, NONE, 1.1 pexpect.spec, 1.19,
	NONE sources, 1.7, NONE
Message-ID: <20090824194512.260E311C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pexpect/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13649

Added Files:
	dead.package 
Removed Files:
	pexpect.spec sources 
Log Message:
package exists in rhel



--- NEW FILE dead.package ---
Package exists in rhel


--- pexpect.spec DELETED ---


--- sources DELETED ---



From jjames at fedoraproject.org  Mon Aug 24 19:49:09 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 19:49:09 +0000 (UTC)
Subject: rpms/sphinxbase/devel import.log, NONE,
	1.1 sphinxbase-0.4.1-python.patch, NONE, 1.1 sphinxbase.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090824194909.C5AF511C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/sphinxbase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15458/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sphinxbase-0.4.1-python.patch sphinxbase.spec 
Log Message:
Initial checkin.



--- NEW FILE import.log ---
sphinxbase-0_4_1-1_fc11:HEAD:sphinxbase-0.4.1-1.fc11.src.rpm:1251143249

sphinxbase-0.4.1-python.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sphinxbase-0.4.1-python.patch ---
diff -dur sphinxbase-0.4.1.ORIG/python/Makefile.in sphinxbase-0.4.1/python/Makefile.in
--- sphinxbase-0.4.1.ORIG/python/Makefile.in	2008-11-29 14:42:40.000000000 -0700
+++ sphinxbase-0.4.1/python/Makefile.in	2009-03-18 21:36:50.000000000 -0600
@@ -421,7 +421,7 @@
 @BUILD_PYTHON_TRUE at all-local: pymod-build-stamp
 
 @BUILD_PYTHON_TRUE at install-exec-local: pymod-build-stamp
- at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
+ at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --skip-build --root $(DESTDIR)
 
 @BUILD_PYTHON_TRUE at uninstall-local:
 @BUILD_PYTHON_TRUE@	$(PYTHON) setup.py bogus_uninstall --prefix $(DESTDIR)$(prefix)


--- NEW FILE sphinxbase.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           sphinxbase
Version:        0.4.1
Release:        1%{?dist}
Summary:        Common library for CMU Sphinx voice recognition products

Group:          Development/Libraries
License:        BSD
URL:            http://www.cmusphinx.org/
Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
# This patch has not been sent upstream, as it fixes a Fedora-specific problem.
# Install the Python egg in the Fedora way.
Patch0:         sphinxbase-0.4.1-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  alsa-lib-devel, blas-devel, doxygen, lapack-devel
BuildRequires:  perl, python-setuptools-devel, tex(latex)

%description
Sphinxbase is a common library for CMU Sphinx voice recognition products.
This package does not provide voice recognition by itself.

%package devel
Summary:        Header and other development files for sphinxbase
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}, pkgconfig

%description devel
Header files and other development files for sphinxbase.

%package libs
Summary:        Libraries for sphinxbase
Group:          Development/Libraries

%description libs
The libraries for sphinxbase.

%package python
Summary:        Python interface to sphinxbase
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description python
Python interface to sphinxbase.

%prep
%setup -q
%patch0 -p1

iconv -f ISO8859-1 -t UTF-8 AUTHORS > AUTHORS.new
mv -f AUTHORS.new AUTHORS

%build
%configure --disable-dependency-tracking --disable-static

# Get rid of undesirable hardcoded runpaths
sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

# Get rid of undesirable direct library dependencies
sed -i -e 's/-lpthread -lm -lblas -llapack/-lm/g' src/libsphinxad/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/fe/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/feat/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/lm/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/util/Makefile
sed -i -e 's/-lasound //g' src/sphinx_adtools/Makefile
sed -i -e 's/-lasound //g' src/sphinx_cepview/Makefile
sed -i -e 's/-lasound //g' src/sphinx_fe/Makefile
sed -i -e 's/-lasound //g' src/sphinx_jsgf2fsg/Makefile
sed -i -e 's/-lasound //g' src/sphinx_lmtools/Makefile

# Build the programs and libraries
make %{?_smp_mflags}

# Build the man pages
cd doc
export LD_LIBRARY_PATH=../src/libsphinxbase/.libs:../src/libsphinxad/.libs
for prog in sphinx_cepview sphinx_fe; do
  perl args2man.pl ../src/${prog}/${prog} < ${prog}.1.in > ${prog}.1
done
perl args2man.pl ../src/sphinx_adtools/sphinx_pitch < sphinx_pitch.1.in > sphinx_pitch.1
perl args2man.pl ../src/sphinx_lmtools/sphinx_lm_eval < sphinx_lm_eval.1.in > sphinx_lm_eval.1

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

# Install the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/sphinxbase
%{_libdir}/libsphinxad.so
%{_libdir}/libsphinxbase.so
%{_libdir}/pkgconfig/sphinxbase.pc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libsphinxad.so.*
%{_libdir}/libsphinxbase.so.*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/*

%changelog
* Mon Jun  1 2009 Jerry James <loganjerry at gmail.com> - 0.4.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sphinxbase/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:37:09 -0000	1.1
+++ .cvsignore	24 Aug 2009 19:49:09 -0000	1.2
@@ -0,0 +1 @@
+sphinxbase-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sphinxbase/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:37:09 -0000	1.1
+++ sources	24 Aug 2009 19:49:09 -0000	1.2
@@ -0,0 +1 @@
+7e36d3efcf70a37bb3c56c780abb6f8d  sphinxbase-0.4.1.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 24 19:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:49:10 +0000
Subject: [pkgdb] pexpect ownership updated
Message-ID: <20090824194910.CB72710F87B@bastion2.fedora.phx.redhat.com>

Package pexpect in Fedora EPEL 5 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pexpect



From pkgdb at fedoraproject.org  Mon Aug 24 19:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:49:10 +0000
Subject: [pkgdb] pexpect (un)retirement
Message-ID: <20090824194910.D53F610F881@bastion2.fedora.phx.redhat.com>

Package pexpect in Fedora EPEL 5 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pexpect



From pkgdb at fedoraproject.org  Mon Aug 24 19:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:49:14 +0000
Subject: [pkgdb] pexpect ownership updated
Message-ID: <20090824194914.1F24310F88C@bastion2.fedora.phx.redhat.com>

Package pexpect in Fedora EPEL 4 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pexpect



From pkgdb at fedoraproject.org  Mon Aug 24 19:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:49:14 +0000
Subject: [pkgdb] pexpect (un)retirement
Message-ID: <20090824194914.2BB3A10F894@bastion2.fedora.phx.redhat.com>

Package pexpect in Fedora EPEL 4 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pexpect



From lucilanga at fedoraproject.org  Mon Aug 24 19:50:17 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 24 Aug 2009 19:50:17 +0000 (UTC)
Subject: rpms/hamlib/devel hamlib.spec,1.41,1.42
Message-ID: <20090824195017.7D4B711C0376@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15811

Modified Files:
	hamlib.spec 
Log Message:
* Wed Aug 23 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
- new install rule for docs for new doxygen
- misc cleanups
- patch0 update
- new upstream release


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- hamlib.spec	23 Aug 2009 08:52:03 -0000	1.41
+++ hamlib.spec	24 Aug 2009 19:50:17 -0000	1.42
@@ -109,10 +109,13 @@ make -C doc doc
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 #install documentation
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
-for f in `ls doc/html/`
-	do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html/search
+for f in `find doc/html/ -type f -maxdepth 1`
+	do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/`echo $f | cut -d '/' -f2`
 done
+for f in `find doc/html/search -type f -maxdepth 1`
+	do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/`echo $f | cut -d '/' -f3`
+ done
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
 
@@ -204,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 23 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.9-1
+- new install rule for docs for new doxygen
 - misc cleanups
 - patch0 update
 - new upstream release



From pkgdb at fedoraproject.org  Mon Aug 24 19:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:51:27 +0000
Subject: [pkgdb] moblin-panel-myzone was added for pbrobinson
Message-ID: <20090824195127.708E110F877@bastion2.fedora.phx.redhat.com>

kevin has added Package moblin-panel-myzone with summary Moblin Panel for MyZone
kevin has approved Package moblin-panel-myzone
kevin has added a Fedora devel branch for moblin-panel-myzone with an owner of pbrobinson
kevin has approved moblin-panel-myzone in Fedora devel
kevin has approved Package moblin-panel-myzone
kevin has set commit to Approved for 107427 on moblin-panel-myzone (Fedora devel)
kevin has set checkout to Approved for 107427 on moblin-panel-myzone (Fedora devel)
kevin has set build to Approved for 107427 on moblin-panel-myzone (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-myzone



From pkgdb at fedoraproject.org  Mon Aug 24 19:51:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:51:28 +0000
Subject: [pkgdb] moblin-panel-myzone summary updated by kevin
Message-ID: <20090824195129.10AFE10F87B@bastion2.fedora.phx.redhat.com>

kevin set package moblin-panel-myzone summary to Moblin Panel for MyZone

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-myzone



From kevin at fedoraproject.org  Mon Aug 24 19:51:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:51:35 +0000 (UTC)
Subject: rpms/moblin-panel-myzone - New directory
Message-ID: <20090824195135.1644311C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-myzone
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ16208/rpms/moblin-panel-myzone

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-myzone added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:51:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:51:35 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel - New directory
Message-ID: <20090824195135.38F0411C0372@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ16208/rpms/moblin-panel-myzone/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-myzone/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 24 19:51:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:51:28 +0000
Subject: [pkgdb] moblin-panel-myzone (Fedora, 11) updated by kevin
Message-ID: <20090824195129.232B410F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for moblin-panel-myzone
kevin has set commit to Approved for 107427 on moblin-panel-myzone (Fedora 11)
kevin has set checkout to Approved for 107427 on moblin-panel-myzone (Fedora 11)
kevin has set build to Approved for 107427 on moblin-panel-myzone (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-myzone



From kevin at fedoraproject.org  Mon Aug 24 19:51:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:51:41 +0000 (UTC)
Subject: rpms/moblin-panel-myzone Makefile,NONE,1.1
Message-ID: <20090824195141.5CD1911C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-myzone
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ16208/rpms/moblin-panel-myzone

Added Files:
	Makefile 
Log Message:
Setup of module moblin-panel-myzone


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-panel-myzone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From jjames at fedoraproject.org  Mon Aug 24 19:51:39 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 19:51:39 +0000 (UTC)
Subject: rpms/sphinxbase/F-11 sphinxbase-0.4.1-python.patch, NONE,
	1.1 sphinxbase.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090824195139.38FD711C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/sphinxbase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16191/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	sphinxbase-0.4.1-python.patch sphinxbase.spec 
Log Message:
Initial checkin for F-11.


sphinxbase-0.4.1-python.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sphinxbase-0.4.1-python.patch ---
diff -dur sphinxbase-0.4.1.ORIG/python/Makefile.in sphinxbase-0.4.1/python/Makefile.in
--- sphinxbase-0.4.1.ORIG/python/Makefile.in	2008-11-29 14:42:40.000000000 -0700
+++ sphinxbase-0.4.1/python/Makefile.in	2009-03-18 21:36:50.000000000 -0600
@@ -421,7 +421,7 @@
 @BUILD_PYTHON_TRUE at all-local: pymod-build-stamp
 
 @BUILD_PYTHON_TRUE at install-exec-local: pymod-build-stamp
- at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
+ at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --skip-build --root $(DESTDIR)
 
 @BUILD_PYTHON_TRUE at uninstall-local:
 @BUILD_PYTHON_TRUE@	$(PYTHON) setup.py bogus_uninstall --prefix $(DESTDIR)$(prefix)


--- NEW FILE sphinxbase.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           sphinxbase
Version:        0.4.1
Release:        1%{?dist}
Summary:        Common library for CMU Sphinx voice recognition products

Group:          Development/Libraries
License:        BSD
URL:            http://www.cmusphinx.org/
Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
# This patch has not been sent upstream, as it fixes a Fedora-specific problem.
# Install the Python egg in the Fedora way.
Patch0:         sphinxbase-0.4.1-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  alsa-lib-devel, blas-devel, doxygen, lapack-devel
BuildRequires:  perl, python-setuptools-devel, tex(latex)

%description
Sphinxbase is a common library for CMU Sphinx voice recognition products.
This package does not provide voice recognition by itself.

%package devel
Summary:        Header and other development files for sphinxbase
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}, pkgconfig

%description devel
Header files and other development files for sphinxbase.

%package libs
Summary:        Libraries for sphinxbase
Group:          Development/Libraries

%description libs
The libraries for sphinxbase.

%package python
Summary:        Python interface to sphinxbase
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description python
Python interface to sphinxbase.

%prep
%setup -q
%patch0 -p1

iconv -f ISO8859-1 -t UTF-8 AUTHORS > AUTHORS.new
mv -f AUTHORS.new AUTHORS

%build
%configure --disable-dependency-tracking --disable-static

# Get rid of undesirable hardcoded runpaths
sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

# Get rid of undesirable direct library dependencies
sed -i -e 's/-lpthread -lm -lblas -llapack/-lm/g' src/libsphinxad/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/fe/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/feat/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/lm/Makefile
sed -i -e 's/-lasound //g' src/libsphinxbase/util/Makefile
sed -i -e 's/-lasound //g' src/sphinx_adtools/Makefile
sed -i -e 's/-lasound //g' src/sphinx_cepview/Makefile
sed -i -e 's/-lasound //g' src/sphinx_fe/Makefile
sed -i -e 's/-lasound //g' src/sphinx_jsgf2fsg/Makefile
sed -i -e 's/-lasound //g' src/sphinx_lmtools/Makefile

# Build the programs and libraries
make %{?_smp_mflags}

# Build the man pages
cd doc
export LD_LIBRARY_PATH=../src/libsphinxbase/.libs:../src/libsphinxad/.libs
for prog in sphinx_cepview sphinx_fe; do
  perl args2man.pl ../src/${prog}/${prog} < ${prog}.1.in > ${prog}.1
done
perl args2man.pl ../src/sphinx_adtools/sphinx_pitch < sphinx_pitch.1.in > sphinx_pitch.1
perl args2man.pl ../src/sphinx_lmtools/sphinx_lm_eval < sphinx_lm_eval.1.in > sphinx_lm_eval.1

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

# Install the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/sphinxbase
%{_libdir}/libsphinxad.so
%{_libdir}/libsphinxbase.so
%{_libdir}/pkgconfig/sphinxbase.pc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libsphinxad.so.*
%{_libdir}/libsphinxbase.so.*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/*

%changelog
* Mon Jun  1 2009 Jerry James <loganjerry at gmail.com> - 0.4.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sphinxbase/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:37:09 -0000	1.1
+++ .cvsignore	24 Aug 2009 19:51:38 -0000	1.2
@@ -0,0 +1 @@
+sphinxbase-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sphinxbase/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:37:09 -0000	1.1
+++ sources	24 Aug 2009 19:51:38 -0000	1.2
@@ -0,0 +1 @@
+7e36d3efcf70a37bb3c56c780abb6f8d  sphinxbase-0.4.1.tar.bz2



From kevin at fedoraproject.org  Mon Aug 24 19:51:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:51:41 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824195141.AD0DC11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ16208/rpms/moblin-panel-myzone/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-panel-myzone


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-panel-myzone
# $Id: Makefile,v 1.1 2009/08/24 19:51:41 kevin Exp $
NAME := moblin-panel-myzone
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:52:10 +0000
Subject: [pkgdb] moblin-panel-people was added for pbrobinson
Message-ID: <20090824195210.59C7810F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package moblin-panel-people with summary Moblin Panel for People
kevin has approved Package moblin-panel-people
kevin has added a Fedora devel branch for moblin-panel-people with an owner of pbrobinson
kevin has approved moblin-panel-people in Fedora devel
kevin has approved Package moblin-panel-people
kevin has set commit to Approved for 107427 on moblin-panel-people (Fedora devel)
kevin has set checkout to Approved for 107427 on moblin-panel-people (Fedora devel)
kevin has set build to Approved for 107427 on moblin-panel-people (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-people



From pkgdb at fedoraproject.org  Mon Aug 24 19:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:52:11 +0000
Subject: [pkgdb] moblin-panel-people summary updated by kevin
Message-ID: <20090824195211.9256510F88B@bastion2.fedora.phx.redhat.com>

kevin set package moblin-panel-people summary to Moblin Panel for People

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-people



From pkgdb at fedoraproject.org  Mon Aug 24 19:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:52:11 +0000
Subject: [pkgdb] moblin-panel-people (Fedora, 11) updated by kevin
Message-ID: <20090824195211.9CBC310F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for moblin-panel-people
kevin has set commit to Approved for 107427 on moblin-panel-people (Fedora 11)
kevin has set checkout to Approved for 107427 on moblin-panel-people (Fedora 11)
kevin has set build to Approved for 107427 on moblin-panel-people (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-people



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:05 +0000
Subject: [pkgdb] tokyotyrant was added for silas
Message-ID: <20090824195305.49DF210F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package tokyotyrant with summary A network interface to Tokyo Cabinet
kevin has approved Package tokyotyrant
kevin has added a Fedora devel branch for tokyotyrant with an owner of silas
kevin has approved tokyotyrant in Fedora devel
kevin has approved Package tokyotyrant
kevin has set commit to Approved for 107427 on tokyotyrant (Fedora devel)
kevin has set checkout to Approved for 107427 on tokyotyrant (Fedora devel)
kevin has set build to Approved for 107427 on tokyotyrant (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:06 +0000
Subject: [pkgdb] tokyotyrant summary updated by kevin
Message-ID: <20090824195307.0767F10F88B@bastion2.fedora.phx.redhat.com>

kevin set package tokyotyrant summary to A network interface to Tokyo Cabinet

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From kevin at fedoraproject.org  Mon Aug 24 19:53:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:53:15 +0000 (UTC)
Subject: rpms/tokyotyrant - New directory
Message-ID: <20090824195315.1B96211C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tokyotyrant
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW16668/rpms/tokyotyrant

Log Message:
Directory /cvs/pkgs/rpms/tokyotyrant added to the repository




From pkgdb at fedoraproject.org  Mon Aug 24 19:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:06 +0000
Subject: [pkgdb] tokyotyrant (Fedora, 11) updated by kevin
Message-ID: <20090824195307.48F1E10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for tokyotyrant
kevin has set commit to Approved for 107427 on tokyotyrant (Fedora 11)
kevin has set checkout to Approved for 107427 on tokyotyrant (Fedora 11)
kevin has set build to Approved for 107427 on tokyotyrant (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tokyotyrant



From kevin at fedoraproject.org  Mon Aug 24 19:53:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:53:15 +0000 (UTC)
Subject: rpms/tokyotyrant/devel - New directory
Message-ID: <20090824195315.36D4611C0372@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW16668/rpms/tokyotyrant/devel

Log Message:
Directory /cvs/pkgs/rpms/tokyotyrant/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:53:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:53:21 +0000 (UTC)
Subject: rpms/tokyotyrant Makefile,NONE,1.1
Message-ID: <20090824195321.2653B11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tokyotyrant
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW16668/rpms/tokyotyrant

Added Files:
	Makefile 
Log Message:
Setup of module tokyotyrant


--- NEW FILE Makefile ---
# Top level Makefile for module tokyotyrant
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:53:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:53:21 +0000 (UTC)
Subject: rpms/tokyotyrant/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090824195321.51B8911C0372@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW16668/rpms/tokyotyrant/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tokyotyrant


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tokyotyrant
# $Id: Makefile,v 1.1 2009/08/24 19:53:21 kevin Exp $
NAME := tokyotyrant
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:53:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:32 +0000
Subject: [pkgdb] oooqs2 ownership updated
Message-ID: <20090824195335.6063310F884@bastion2.fedora.phx.redhat.com>

Package oooqs2 in Fedora devel was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/oooqs2



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:50 +0000
Subject: [pkgdb] moblin-panel-pasteboard was added for pbrobinson
Message-ID: <20090824195352.5A40110F879@bastion2.fedora.phx.redhat.com>

kevin has added Package moblin-panel-pasteboard with summary Moblin Panel for Paste Board
kevin has approved Package moblin-panel-pasteboard
kevin has added a Fedora devel branch for moblin-panel-pasteboard with an owner of pbrobinson
kevin has approved moblin-panel-pasteboard in Fedora devel
kevin has approved Package moblin-panel-pasteboard
kevin has set commit to Approved for 107427 on moblin-panel-pasteboard (Fedora devel)
kevin has set checkout to Approved for 107427 on moblin-panel-pasteboard (Fedora devel)
kevin has set build to Approved for 107427 on moblin-panel-pasteboard (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-pasteboard



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:54 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195354.3926610F88C@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora devel was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:54 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195354.609FA10F894@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora devel has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:55 +0000
Subject: [pkgdb] moblin-panel-pasteboard summary updated by kevin
Message-ID: <20090824195356.1BAC410F898@bastion2.fedora.phx.redhat.com>

kevin set package moblin-panel-pasteboard summary to Moblin Panel for Paste Board

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-pasteboard



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:57 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195358.1CBAB10F8A2@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 7 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:55 +0000
Subject: [pkgdb] moblin-panel-pasteboard (Fedora, 11) updated by kevin
Message-ID: <20090824195356.2FA9510F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for moblin-panel-pasteboard
kevin has set commit to Approved for 107427 on moblin-panel-pasteboard (Fedora 11)
kevin has set checkout to Approved for 107427 on moblin-panel-pasteboard (Fedora 11)
kevin has set build to Approved for 107427 on moblin-panel-pasteboard (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-pasteboard



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:00 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195401.1BEAD10F8B3@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 4 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:53:58 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195358.25C5410F8A6@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 7 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:00 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195401.3924310F8A9@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 4 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:00 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195401.15D8410F8B2@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 3 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:00 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195401.517CA10F89A@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 3 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:01 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195401.B537410F8AA@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 5 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:01 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195401.CF82E10F8A5@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 5 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:02 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195403.1BED110F8B4@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 6 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:02 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195403.20A2710F8B6@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 6 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:03 +0000
Subject: [pkgdb] kphone ownership updated
Message-ID: <20090824195404.0589C10F8B7@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 9 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From kevin at fedoraproject.org  Mon Aug 24 19:54:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:54:06 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard - New directory
Message-ID: <20090824195406.16A7F11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16929/rpms/moblin-panel-pasteboard

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-pasteboard added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:54:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:54:06 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard/devel - New directory
Message-ID: <20090824195406.3462111C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16929/rpms/moblin-panel-pasteboard/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-pasteboard/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:54:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:54:12 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090824195412.89FD111C0439@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16929/rpms/moblin-panel-pasteboard/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-panel-pasteboard


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-panel-pasteboard
# $Id: Makefile,v 1.1 2009/08/24 19:54:12 kevin Exp $
NAME := moblin-panel-pasteboard
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:27 +0000
Subject: [pkgdb] kpowersave (un)retirement
Message-ID: <20090824195427.2B4C710F88C@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora devel has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From kevin at fedoraproject.org  Mon Aug 24 19:54:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:54:12 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard Makefile,NONE,1.1
Message-ID: <20090824195412.40D9411C0417@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16929/rpms/moblin-panel-pasteboard

Added Files:
	Makefile 
Log Message:
Setup of module moblin-panel-pasteboard


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-panel-pasteboard
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:03 +0000
Subject: [pkgdb] kphone (un)retirement
Message-ID: <20090824195404.0BD9710F8B9@bastion2.fedora.phx.redhat.com>

Package kphone in Fedora 9 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kphone



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:30 +0000
Subject: [pkgdb] kpowersave ownership updated
Message-ID: <20090824195430.59EAF10F8CA@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 7 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:30 +0000
Subject: [pkgdb] kpowersave ownership updated
Message-ID: <20090824195430.708C410F8CF@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 6 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:30 +0000
Subject: [pkgdb] kpowersave (un)retirement
Message-ID: <20090824195430.74FAA10F8D1@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 6 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:30 +0000
Subject: [pkgdb] kpowersave (un)retirement
Message-ID: <20090824195430.8897910F8D2@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 7 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:33 +0000
Subject: [pkgdb] kpowersave ownership updated
Message-ID: <20090824195433.56C2010F8D4@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 8 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:33 +0000
Subject: [pkgdb] kpowersave (un)retirement
Message-ID: <20090824195433.622DF10F8D8@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 8 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:34 +0000
Subject: [pkgdb] kpowersave ownership updated
Message-ID: <20090824195434.E005910F8DC@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 9 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:34 +0000
Subject: [pkgdb] kpowersave (un)retirement
Message-ID: <20090824195435.1943610F8E0@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 9 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:35 +0000
Subject: [pkgdb] kpowersave ownership updated
Message-ID: <20090824195436.0BFD510F8F0@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 10 is now owned by rdieter

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:35 +0000
Subject: [pkgdb] kpowersave (un)retirement
Message-ID: <20090824195436.1C51310F8FC@bastion2.fedora.phx.redhat.com>

Package kpowersave in Fedora 10 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kpowersave



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:43 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195443.1F05310F8FE@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora devel was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:43 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195443.274CE10F900@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora devel has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:47 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195447.360A110F902@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 1 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:47 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195447.2B3AF10F89B@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 1 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:48 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195448.7F16910F8A2@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 2 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:48 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195448.86E8D10F904@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 2 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:49 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195449.CF4D510F907@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 3 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:49 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195449.E6F6410F909@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 3 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:51 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195451.2FEE510F90A@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 4 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:51 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195451.3CD8B10F90C@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 4 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:52 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195452.3690910F90F@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 5 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:52 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195452.3D3B710F912@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 5 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:53 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195453.3DBED10F914@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Red Hat Linux 9 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:53 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195453.437B810F916@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Red Hat Linux 9 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:55 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195455.401FF10F8B3@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 9 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:55 +0000
Subject: [pkgdb] gpgme03 ownership updated
Message-ID: <20090824195456.1419A10F8AF@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 10 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:55 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195455.4BB4810F919@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 9 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:54:55 +0000
Subject: [pkgdb] gpgme03 (un)retirement
Message-ID: <20090824195456.19CA410F91A@bastion2.fedora.phx.redhat.com>

Package gpgme03 in Fedora 10 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gpgme03



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:20 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824195520.8ABF310F8A5@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora devel was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:22 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824195522.20F5710F8AB@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora 8 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:23 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824195523.4F29010F8B0@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora 7 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:25 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824195525.CC8EC10F91D@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora 10 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:24 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824195524.71F5010F91B@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora 9 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:28 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824195528.2ABCB10F91F@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora 11 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:47 +0000
Subject: [pkgdb] perl-Search-Xapian was added for rakesh
Message-ID: <20090824195547.81EAE10F89F@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Search-Xapian with summary Xapian perl bindings
kevin has approved Package perl-Search-Xapian
kevin has added a Fedora devel branch for perl-Search-Xapian with an owner of rakesh
kevin has approved perl-Search-Xapian in Fedora devel
kevin has approved Package perl-Search-Xapian
kevin has set commit to Approved for 107427 on perl-Search-Xapian (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Search-Xapian (Fedora devel)
kevin has set build to Approved for 107427 on perl-Search-Xapian (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Search-Xapian



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:48 +0000
Subject: [pkgdb] perl-Search-Xapian summary updated by kevin
Message-ID: <20090824195549.1249D10F8B4@bastion2.fedora.phx.redhat.com>

kevin set package perl-Search-Xapian summary to Xapian perl bindings

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Search-Xapian



From pkgdb at fedoraproject.org  Mon Aug 24 19:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:48 +0000
Subject: [pkgdb] perl-Search-Xapian (Fedora, 10) updated by kevin
Message-ID: <20090824195549.1B5BE10F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Search-Xapian
kevin has set commit to Approved for 107427 on perl-Search-Xapian (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Search-Xapian (Fedora 10)
kevin has set build to Approved for 107427 on perl-Search-Xapian (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Search-Xapian



From kevin at fedoraproject.org  Mon Aug 24 19:55:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:55:58 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/devel - New directory
Message-ID: <20090824195558.3D43011C0262@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Search-Xapian/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg17386/rpms/perl-Search-Xapian/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Search-Xapian/devel added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:55:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:55:58 +0000 (UTC)
Subject: rpms/perl-Search-Xapian - New directory
Message-ID: <20090824195558.1B1DB11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Search-Xapian
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg17386/rpms/perl-Search-Xapian

Log Message:
Directory /cvs/pkgs/rpms/perl-Search-Xapian added to the repository




From kevin at fedoraproject.org  Mon Aug 24 19:56:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:56:03 +0000 (UTC)
Subject: rpms/perl-Search-Xapian Makefile,NONE,1.1
Message-ID: <20090824195603.DC59E11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Search-Xapian
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg17386/rpms/perl-Search-Xapian

Added Files:
	Makefile 
Log Message:
Setup of module perl-Search-Xapian


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Search-Xapian
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 24 19:56:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 24 Aug 2009 19:56:04 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090824195604.14E1A11C0044@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Search-Xapian/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg17386/rpms/perl-Search-Xapian/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Search-Xapian


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Search-Xapian
# $Id: Makefile,v 1.1 2009/08/24 19:56:03 kevin Exp $
NAME := perl-Search-Xapian
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 24 19:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:55:48 +0000
Subject: [pkgdb] perl-Search-Xapian (Fedora, 10) updated by kevin
Message-ID: <20090824195549.2600C10F8BC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Search-Xapian
kevin has set commit to Approved for 107427 on perl-Search-Xapian (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Search-Xapian (Fedora 11)
kevin has set build to Approved for 107427 on perl-Search-Xapian (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Search-Xapian



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:11 +0000
Subject: [pkgdb] perl-Network-IPv4Addr ownership updated
Message-ID: <20090824195612.1DE0D10F8C5@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora devel was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:12 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (un)retirement
Message-ID: <20090824195612.26F4F10F8C8@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora devel has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:13 +0000
Subject: [pkgdb] perl-Network-IPv4Addr ownership updated
Message-ID: <20090824195613.E5CA010F922@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora 9 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:13 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (un)retirement
Message-ID: <20090824195614.0697310F925@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora 9 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:15 +0000
Subject: [pkgdb] perl-Network-IPv4Addr ownership updated
Message-ID: <20090824195615.932AD10F927@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora 10 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:15 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (un)retirement
Message-ID: <20090824195615.9FB4F10F92A@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora 10 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:17 +0000
Subject: [pkgdb] perl-Network-IPv4Addr ownership updated
Message-ID: <20090824195617.3EF7210F92D@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora EPEL 5 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:17 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (un)retirement
Message-ID: <20090824195617.4BB0810F930@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora EPEL 5 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:20 +0000
Subject: [pkgdb] perl-Network-IPv4Addr ownership updated
Message-ID: <20090824195620.376DF10F934@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora 11 was orphaned by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Mon Aug 24 19:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 19:56:20 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (un)retirement
Message-ID: <20090824195620.8BA7D10F937@bastion2.fedora.phx.redhat.com>

Package perl-Network-IPv4Addr in Fedora 11 has been retired by ausil

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From toshio at fedoraproject.org  Mon Aug 24 20:00:49 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Mon, 24 Aug 2009 20:00:49 +0000 (UTC)
Subject: rpms/pygpgme/devel pygpgme.spec, 1.15, 1.16 sources, 1.3,
	1.4 pygpgme-0.1-gpgme_ctx_set_engine_info.patch, 1.1,
	NONE pygpgme-0.1-py23.patch, 1.1,
	NONE pygpgme-0.1-symmetric_encryption_support.patch, 1.1, NONE
Message-ID: <20090824200049.1AD9F11C0371@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/pygpgme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18593

Modified Files:
	pygpgme.spec sources 
Removed Files:
	pygpgme-0.1-gpgme_ctx_set_engine_info.patch 
	pygpgme-0.1-py23.patch 
	pygpgme-0.1-symmetric_encryption_support.patch 
Log Message:

* Mon Aug 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-16.20090824bzr68
- Rebase to new upstream snapshot
- Patches merged upstream
- Fixes deprecation warnings on py2.6/py3.0
- Remove py2.3 patch -- only needed for EPEL-4



Index: pygpgme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- pygpgme.spec	29 Jul 2009 00:19:18 -0000	1.15
+++ pygpgme.spec	24 Aug 2009 20:00:48 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        15.20090121bzr54%{?dist}
+Release:        16.20090824bzr68%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
@@ -14,16 +14,13 @@ URL:            http://cheeseshop.python
 # for generating keys
 #
 # Steps to create snapshot:
-# bzr branch lp:pygpgme -r54
+# bzr branch lp:pygpgme -r68
 # cd pygpgme
 # patch -p0 < ../pygpgme-examples.patch
 # python setup.py sdist
 # tarball is in dist/pygpgme-0.1.tar.gz
 Source0:        pygpgme-0.1.tar.gz
 #Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Patch0:         pygpgme-0.1-py23.patch
-Patch1:         pygpgme-0.1-gpgme_ctx_set_engine_info.patch
-Patch2:         pygpgme-0.1-symmetric_encryption_support.patch
 # Patch to make generating a tarball (sdist) work.  Applied prior to creating
 # the Source0.
 Patch100:       pygpgme-examples.patch
@@ -39,11 +36,6 @@ the GPGME library.
 %prep
 %setup -q
 
-# Patch necessary for python version 2.3 and below.
-%patch0 -p1 -b .py23
-%patch1 -p1 -b .ctx_set_engine
-%patch2 -p1 -b .sym_encrypt
-
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -75,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-16.20090824bzr68
+- Rebase to new upstream snapshot
+- Patches merged upstream
+- Fixes deprecation warnings on py2.6/py3.0
+- Remove py2.3 patch -- only needed for EPEL-4
+
 * Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.1-15.20090121bzr54
 - Add a second patch from mitr for symmetric_encryption_support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jan 2009 18:45:10 -0000	1.3
+++ sources	24 Aug 2009 20:00:48 -0000	1.4
@@ -1 +1 @@
-8e5abdf0ec34c48ad6f9a42697704917  pygpgme-0.1.tar.gz
+988ba280a620d28d05b4f5d4c1ac7170  pygpgme-0.1.tar.gz


--- pygpgme-0.1-gpgme_ctx_set_engine_info.patch DELETED ---


--- pygpgme-0.1-py23.patch DELETED ---


--- pygpgme-0.1-symmetric_encryption_support.patch DELETED ---



From chkr at fedoraproject.org  Mon Aug 24 20:03:40 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 24 Aug 2009 20:03:40 +0000 (UTC)
Subject: rpms/mono-addins/F-10 mono-addins-0.3.1-exception-fix.patch, NONE, 
	1.1 mono-addins.spec, 1.10, 1.11
Message-ID: <20090824200340.DC7C411C0044@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/mono-addins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343

Modified Files:
	mono-addins.spec 
Added Files:
	mono-addins-0.3.1-exception-fix.patch 
Log Message:
* Mon Aug 24 2009 Christian Krause <chkr at fedoraproject.org> - 0.3.1-3.3
- add upstream bug fix to prevent exception when no local addins can
be found (BZ #514936)


mono-addins-0.3.1-exception-fix.patch:
 ExtensionNode.cs |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mono-addins-0.3.1-exception-fix.patch ---
diff -uNr mono-addins-0.3.1.old/Mono.Addins/Mono.Addins/ExtensionNode.cs mono-addins-0.3.1/Mono.Addins/Mono.Addins/ExtensionNode.cs
--- mono-addins-0.3.1.old/Mono.Addins/Mono.Addins/ExtensionNode.cs	2008-01-30 23:37:52.000000000 +0100
+++ mono-addins-0.3.1/Mono.Addins/Mono.Addins/ExtensionNode.cs	2009-07-31 17:17:12.000000000 +0200
@@ -123,7 +123,6 @@
 				if (childrenLoaded)
 					return childNodes;
 				
-				childrenLoaded = true;
 				
 				try {
 					if (treeNode.Children.Count == 0) {
@@ -135,6 +134,8 @@
 					AddinManager.ReportError (null, null, ex, false);
 					childNodes = ExtensionNodeList.Empty;
 					return childNodes;
+				} finally {
+					childrenLoaded = true;
 				}
 
 				ArrayList list = new ArrayList ();


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/F-10/mono-addins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mono-addins.spec	2 Mar 2009 13:46:45 -0000	1.10
+++ mono-addins.spec	24 Aug 2009 20:03:40 -0000	1.11
@@ -2,12 +2,15 @@
 
 Name:		mono-addins
 Version:	0.3.1
-Release:	3%{?dist}.2
+Release:	3%{?dist}.3
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	GPLv2
 Patch0:		mono-addins.patch
 Patch1:		mono-addins-fix_addin_scan.patch
+# use upstream bug fix to prevent exception:
+# http://anonsvn.mono-project.com/viewvc?view=revision&revision=112158
+Patch2:		mono-addins-0.3.1-exception-fix.patch
 URL:		http://www.mono-project.com/
 Source0:	%{name}-%{version}.tar.bz2	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +36,7 @@ and for creating libraries which extend 
 %setup -q
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .fix_addin_scan
+%patch2 -p1 -b .exception-fix
 autoreconf -f -i -s
 
 %build
@@ -63,6 +67,10 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Aug 24 2009 Christian Krause <chkr at fedoraproject.org> - 0.3.1-3.3
+- add upstream bug fix to prevent exception when no local addins can
+be found (BZ #514936)
+
 * Mon Mar 02 2009 David Nielsen <dnielsen at fedoraproject.org> - 0.3.1-3.2
 - spec change suggested by ivazquez
 



From ausil at fedoraproject.org  Mon Aug 24 20:05:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:05:33 +0000 (UTC)
Subject: rpms/perl-Net-IPv4Addr/EL-4 perl-Net-IPv4Addr.spec,1.1,1.2
Message-ID: <20090824200533.CF4F811C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753

Modified Files:
	perl-Net-IPv4Addr.spec 
Log Message:
Obsoletes the older perl-Network-IPv4Addr module



Index: perl-Net-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/EL-4/perl-Net-IPv4Addr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-IPv4Addr.spec	6 May 2007 15:47:46 -0000	1.1
+++ perl-Net-IPv4Addr.spec	24 Aug 2009 20:05:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-IPv4Addr
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for manipulating IPv4 addresses
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Obsoletes: perl-Network-IPv4Addr < 0.10-1
 
 %description
 Net::IPv4Addr provides functions for parsing IPv4 addresses both in traditional
@@ -53,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-3
+- Obsoletes perl-Network-IPv4Addr
+- no provides as code needs changing to use the new version
+
 * Sat May 05 2007 Sindre Pedersen Bj?rdal <foolish[AT]guezz.net> - 0.10-2
 - Add missing build dependencies
 - Fix License



From ausil at fedoraproject.org  Mon Aug 24 20:06:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:06:49 +0000 (UTC)
Subject: rpms/perl-Net-IPv4Addr/EL-5 perl-Net-IPv4Addr.spec,1.1,1.2
Message-ID: <20090824200649.699D911C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20224

Modified Files:
	perl-Net-IPv4Addr.spec 
Log Message:
Obsolets perl-Network-IPv4Addr 



Index: perl-Net-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/EL-5/perl-Net-IPv4Addr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Net-IPv4Addr.spec	6 May 2007 15:50:05 -0000	1.1
+++ perl-Net-IPv4Addr.spec	24 Aug 2009 20:06:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-IPv4Addr
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for manipulating IPv4 addresses
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Obsoletes: perl-Network-IPv4Addr < 0.10-1
 
 %description
 Net::IPv4Addr provides functions for parsing IPv4 addresses both in traditional
@@ -53,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-3
+- Obsoletes perl-Network-IPv4Addr
+- no provides as code needs changing to use the new version
+
 * Sat May 05 2007 Sindre Pedersen Bj?rdal <foolish[AT]guezz.net> - 0.10-2
 - Add missing build dependencies
 - Fix License



From limb at fedoraproject.org  Mon Aug 24 20:07:06 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 24 Aug 2009 20:07:06 +0000 (UTC)
Subject: rpms/kicad/devel kicad.spec,1.19,1.20
Message-ID: <20090824200706.194EB11C0044@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/kicad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20303

Modified Files:
	kicad.spec 
Log Message:
Multilib path correction, BZ 518916.



Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/devel/kicad.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- kicad.spec	25 Jul 2009 04:36:08 -0000	1.19
+++ kicad.spec	24 Aug 2009 20:07:05 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           kicad
 Version:        2009.07.07
-Release:        3.rev1863%{?dist}
+Release:        4.rev1863%{?dist}
 Summary:        Electronic schematic diagrams and printed circuit board artwork
 Summary(fr):    Saisie de sch?ma ?lectronique et trac? de circuit imprim?
 
@@ -164,6 +164,7 @@ iconv -f iso8859-1 -t utf-8 AUTHORS.txt 
 #multilibs
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
+%{__sed} -i "s|/usr/lib/kicad|/usr/lib64/kicad|" %{SOURCE3}
 %endif
 
 
@@ -340,6 +341,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Jon Ciesla <limb at jcomserv.net> - 2009.07.07-4.rev1863
+- Multilib path correction, BZ 518916.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009.07.07-3.rev1863
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Mon Aug 24 20:07:13 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 24 Aug 2009 20:07:13 +0000 (UTC)
Subject: rpms/hunspell-ak/devel akan_ns__mfuaasekyer__-0.3-fx.xpi, NONE,
	1.1 hunspell-ak.spec, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090824200713.CE9DA11C0044@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20411/devel

Added Files:
	akan_ns__mfuaasekyer__-0.3-fx.xpi hunspell-ak.spec import.log 
Log Message:



--- NEW FILE akan_ns__mfuaasekyer__-0.3-fx.xpi ---
PK
@?bsf????e????M?d??f?{???????E?YmzN3??`K??m???F@?
y?4?????B?T??m?X3Ht? ?n??
X??g??4?Nz@?YH??w?+??????N?????d?,?C?`???n??7?????5`e?."?L??????*2JO
%????A??K2x???uD(<A@?,?????:E?W??????#??,/1?jp?!?-???#??????E??	?&~)d[3g
??Y)0R???h?`?*m0??bB??(6*?
??????Y?3?
??u?4????t??51?hWH?????????l????PK
???^?????????^?????9?7???<????5-2i??x??&*
'?oIt???????7M??????&Y??ZJ3
??R?B`g?S?????"???????slsc?&????5?,?????~??R?z????jm,#?d??'_??K??ac?
cMA?J<@???1?T??M???&?????U?
?8?b^???*~q%
????*$p???KE?Xa/??
0?sV???"]['?5?]R*U??T_?v??:~$?0?.u?+e&??<???????RshW?z???? j??^??`?5??????F??F????a?iC?e?????? ?}???g????????(????
\?x?q?f??????m.???M????.??-???V????????z?K$`MU??P?Yl???E[<?,?2OKP????1??x?l?p????"K?o]T3???x`??_r???K??5???|7?K??|?wu?????R??r_?
???%BX?A|m??{suOU-\?~?s?(s?h??????e?????c?y?J?????p??[RD?"?????;
?v??L?X?`(?[?}?w??1?????????n?>??
~J???P?MVz??k???N?DY?N???N?
N1?*^|1C?`??U]??(?ys??C??|LN?hKrV???n????}N?"uI????)"???c??v?????A}e?f?}?.?????1??i????????S?l?!
??8???U<3???'%4??p=s??????n>?b??rL??j????2K?v???N?l?ttp???%k?????Bc?K?~??\??
???y0???I??W???)??0d??P??S=Ty? l??+??)???gw%`??????[c?$3#?!?5??7?1??/j?N??/"\?????C???E??H??!D?=???
??X??~??X=&d???????9?}??5??Wp????
2??????y?
??
1;;Z"??????<Cg?X?7???~N???{
?YId	)$?
???
?)
?}^???}?[]?l?q?$'<k>/9?~?k????zPAUifH7????A????3?|B=???? ?1|R
?g?V??Fi?????B;?????st?6>?:???>??????G????Nv?????!????Q*
??????-?T???/U??S???kHvg}?%<??K??kz???|?m?X??!P???
.w/??
?????rO??=?-?G???'??S5b?7,I?y
??????
??v??q?'h??9]j???Y??}g????5mdA?????N?$u??QTL
u??-???3XZG???%w?pP?
!;va?]???#??L[???W?*
?(?
???I??
?kA???????u??a???0????sh'???j???kEZq???\?ec?IS?Q?9?
??*<??.??^??*????I?H???c???<?6?S}?[a}?????
cy????????u)S??t??`???????&zFsQg??s?d????1??Y???4??	?U?<z???????T`???ls???H??<???>(0P??P?????Xt???p??Son????K@]??z?N??=????#??????v????c???Q???
>???v?UX?W??^
??
?4)?ii??^=[?????>????J2N??d@?Y???????o????
?\??g?
??I?~?zd?=??A????
???9????]<&?/@????I{T????K+?@??????
???????`t?.ViAJ??n?nj^4???j?t???S?<????+???+?F???R=r?????,i?nd????????W??q???>x&??
v??0?????.???#V????x???~???C??=???9?XW???H
????g??K{?6??w??0??????:?L???)?????>?h????FGQW?c"?
usN?(4??AR?eK^?x??T??5=??????????????
F??
dt????
F]?v)???_l?,?0?H??????????T?L?
??:c??????n??bf?"??/I???eC#%#|????47
??"???'?n?9??[3???a???rq???????k+D??jw?5)$^?pa?p???????b?M?\??f?$?7?@mrh}??r??	??e?)G???R?\f?
?Sk?^???<+????{?d???k0??=z????KJ?6???Q?(????v7?;???%??,l+ ?y"7??"h????????P1=??|?l?}l[%?ln? 
k8*s?y?m????D?$?26a-?????hs??????)?????#??f???G?????EN~????uY??P?g?S??;?5?v>?5??`\y?!*\F}??eV????q?????&?V$???P"????????U|-{????Y6\?	?COp??????N3??m?
?T??K=i.?????j?<?9[C$?Yg?5^<8?N??Q?=??G???????????]iyM.?????]++??=W5?k?????r?nh)t6??B???j/L??@?
N???QA:
???a2q??X?O5?>|??????
???p?Y??ew??d?H;??^?P???????-?xr?L?@????h???E\?n??<^??.?@A??????(?1??AoR
?%?g??????*^????:??????Pyq??Ak5.???>???	/J?~[??q%R?:?p?y?"??v??/?ONn?J?v?
?????v?b?v?_@_`???-?\?ueG?i??????o0??`??i?B?Us??F???l?-?????????i?_??}N1?6b
a^??V\??????1w?4
O?????h??e;???????7??0??&?Smx??????l
?'!???$??\??B?t?(4?=)???5?yPyJ?
?Z?y?=Y??2?i_5t?a	?y?)?J:?|?????????=o???b1?z4h[?	G>lh?B?5~??m???1???
?8:?`??? '?$^1??@??h`?P??????/???6@[x	???F1?2??+&"??5??8?^??Z\?Hh??8????Y?s???b???	9?Y???	??k`?t????gT??
?J=?????
R???{?E
????j?>??aNr?"??4GQ?\KbR??g???b??9{r???0?}9?2??1?G???EU?
??@?/A??e
 {???!??rn?/? S?8 at H??%N??Io?d4=?@?3P??3????OSv:?P???}?*?????j??G/V`??[??s????7?~rT(??#?B??F??w???9[?T??O???8*N??k$??E14?1???1QVn ??{???rv?r?%?{?HjE?I(W??1?^q]?/??sG-h??K??3\{??!??8x?m
??"
??0z?????5?????
y]?-?lF?	???x?????:?x??o%*??_`Q?y~J?L0??.?k?	???J?*N???}??q?9??f5?S?Y???L?d7??[E???'??X?????(?W??4?Z?6?$?6?y?z?RZ'|?f3
C?
?h{B\?i?V!G???????!d?"???0*Ik'?n????3/???0??4?????????qe????L-?-????2???hcy?8^?
???r??J????ka????#?"<?7?????8?K??_?Ug?7??8pC{????{??.
\&?<?Ch?1????????"??%?I?*]\?????|?#|??qf T[?d????(??k??R/:+''?6??V??c??V7??z?,z
sMT??n??sP?
QC????X?Y?????"kr?e?=l?g???nv????a\??$?9?Qu??;?l?.??Y?zyG?0?<????<?bG??~?9}n?
4???w??????8o?7=?U8?Ljty????g?4
???????#MV???N,U???eG??"?y+Z?\??/?H?C????m:?_??A??ZCt?52v?YHK??!Cg??qN0???5???y?$????}??!)??OA??!???dI????8Yt???s?8??m	_N??d??yevn????e??#?\??W??}??^?
!Z??5s???????F???~?yV????A????3X$}?u	x?-??j?&??RB^??????P?8?8,?n????"??
?.?Lp????B[.y?
z'?????&?C???O??m????.??^?^)?y??/???!???K.?????u?*???gj??????E?E???+???;?
?/;???
??G?3m=?LG????ygi}M???"i???Rl'??Uz??~??
??\?D|XI?z???Se?=&??-??,?A!n<QW?e?W?W#On?a????y????
?qsv?e	?????????????rb?>???UG???i.?????????%fo>b?????bn}n![?<??.????,????????????
?? 7?
[$.????i*@?|	???g1????
?`;?+??(??2???G? N?i1???????Nas??,?v????W?$?z<????}?D_g@?3?m??K?????!?Y g?v?/}Ryc~?5?????
-?	J~???? ?8?P9
???:?&	1@]?	k????????B??a???:1??j??q??JV?$??
???j1B:?ks??p?\7h?m?nk1z???.R#:????h?!???/|e????%???5??3r??n???j?8?D???r??
Q?H??L?<[??w(??dR??$???rd
?y;???$P?A??Q??M?'?~_?\???Ca?y?#?V?	uJ?}$?(?M??6???}?t?:Qfy-?????=v?F4?v???Qv???/??????yI?r??'?%???Q??8{#????6???%41J????L???+N6??<???*???)	??WIz??LB~?????h??:?a?C?d?H?~WOE?E??5_?E???6/[???.?<??2_????4k!K2}??1????,?%?Y?0?????????$?5`o??_z?P????,?:?
^??=???/?_????xtG???+?t?l+^?Oz?,??????9
2h?ip??q??O?_?K????u???|??WF)?"
????Lu7?L??p?/?????0?{PD?+?5oNH?5`?9
;
??X??@?J.6???7??`Q?G?Yo?#?????m????e??yb???[O?V?{????Z???????????LG^q????Nn????e??`??m??)a????????????O:'.G??qM??????Nz?$T?\^'>w???k???>S???????|Ju??????????,WD?
?)r#9*?a?>???9gkoH*C??jw?x??F6?W?I%?????gJXj?p)??*?v??<??[??>t???ZI???Ls?s?D|?;?????Y1??????KD??????<?|2P????.j+d?8?z??2?=???u}????=w?\-?<???J?_??k?????>???????B'?N(??E
i?}??+??????z?pG?Xw??9????!?@!?P/U?|??@??U????x???O?3xp?}?|???R?O???y?A????|?U
K??Y+??????K?}?u?yV?4?ss???=???#???l?s????2+?e??U
li?E?n??<??^?:??2??,? Q?x??I????????M?V??g:?
H?????v??;f?:??/?6?:s?-????{O?9??.???y,5?v???????????%O????B{#????>0U2??????? ?O?????|?w?f?Y????H???J????*?*k?@??"???9?b5$<?r?\???yL?i??CT?????Y????
???eXv??j?es???)????>?.
?
U?????^G????X???	??/?????:{?x9|????????g????,k???F?w??>?P?zQ?l7~?GL?6y????
<
?bb?w????.????????5?u?50????-?????*?V???b??LF??&??
???	-?V?i????	7 at W??S?
??)?K???o?%??w?????????]?????~??
A??????{?[?O???r?"??w??`?t
r??T?P_???~K???
?,??`5W??6?n??x
???a??????!?????u?a??
a?? ??e#??uj??a??]?ztI?????????@\q{??.?n2???
??{??????O??w???????????<?@)??{~??b???pK3o?2???\l???h????C_???]}v???_?????X_'07???o?^??D??G???Pt?L??u?3T?6??j#?;R6G?m??5?????F-?o??p4?|?~I??QO?3?W?#d????????~??o^?K?g????@?	??????"?)w9??Q??')?
W}[l	1zM????D?n0?>}??!
??x]?X??????p?E??=?2
t????ZC?j?c?:)?: ????M??yC?w?????????^?+?P??N?
???!?e}??)=mdRZC??Axy??????N???????<0??YU?I??OzD?9<wk3??G]????z???f"????	?v?^ >q,J???t&?
??!]?4?z??=9???F????????CM?x
x?????l????t?i?????<h??-?a??x2?????$??g???+????w??
?h????K??3????xJT;l???qn???''I	*?`~?g.>?k??????x3?vX?}???f_5?????????T^?4ut?"????t???3???ZG?"#???km?B?I-BM???'?|??l:&atn6?'???
?%?j]?<9?%w^/??m?smH?6y6?Y6?96???aGg?C$ ??Zg?????????6????\???x?g???E???,)?X?)jbI???C????m???s?g?6???????W?T_????XU????dqG? ?	i???KV?Q???s?:)?8??F????HW?K??Mk??(?}G?g??q?6?i	??

??)?9???B??k?(???4ZKF+?[4???E????)
???+g?^_?G]??p??
??????\R	8y?z??O? ^c??????c?t?8?R??9GC??	?
K????G?.Z??QB?f??1?<
d?[??????????g
???'}]?D??????)4?'?z??C?m????1?)7~??_x??0??w
?#?6????H??7	??7?Xi?a????i?&?XI?Y?<??g???Hv
????????7????z?0??^????_-??|?n??6????@fy???P?Y??$??`??N+?
?????K?'?5Z?aA??n???2)??+??Y???	y*Xb?w?6=?v?0??[zt?F???#A?S??????_n????r(;???B??b?d!??W??y*J???z??A?N???????E"|/?????r?k?n?A3???k?+

????K?z????Nm3r<??1?????R1????V?c?%??>??????u?F????
???)<??P???]q?o,}K?{H?;????????1???M???????????iQ?b???{???6???????????
c??e?Jy????Z?E??????[??
GOQ?<?T??
sV????4?Aq??q???f??4M=mAz?uI???pg?????????y~??H?_x?`b%6+?g???|Q+2??[?8??8K?????l@???u1?
??????B?`!???Zvc????3?_???
?D??K?#?4?A???????5V):J???+h??G???|w???????\??J?_?l?B??m???)hK??V????g?p??,u?jQE???????:??}b
?z?S?;?2??di?z??"???0??p^??5cK??
?B??=??????????{????????D??%?)zp?????|4????4?Er???
?yg???n?U|Yz??[k??(Fbq.m??v????7?????~?????7?"'V??H??????w?L??D?a%>??
M(?v???~,)!8??D??`???_??P?%B52?y
??	?????;??<Qb{F??u?aL???3??G?>?Pw?KA\W??T
W?!x_??"????c?#???5?N?3??]??
t~???l#Q??T??N?Yb?@????5?ix?)6=qw?k?H?	????C?[?m ^
??Z0?cFo4????D???????\B-?kf??N?9~Cw?7?????3?V??"????#?????????????????j??g'??3??&??.?????S??_????T????X???X?4?+U??4???n?.??Is??K?q?N??'-?3[??&?L at Q???),??X??|??y?Y????_??	
??Xt?h??*?? U????fM}?>jd?`????P??~*??4Y??6????????mox8????f????5$\J??ve???xm??U??<?B??7?k4.[?)??-??+W(T??H??tWL????PmD@???z?5j?	B?Go7???lu@??j2??0??N'???F??|??D?*Z?n??_0????B$E[?P22????????<W?hmQ?U???q#??u??/?`??)?
?C??
?z?*???Sp???	?
{?{clHE??HB?I?U/?(b????j%V??`Um??=
?????QW?2,?k??Rw7?P1??2?????{?s4??{??vm?W??6?gv?k??2q????????p?knm???zQ?+??V?????y????=?F?+?n??}?-??????[???s????,??.?m?
??~a-rR?S?9???sl*4??\??x???W?!e???????B3??????K?g??z??:??r??/.??0???
?fXT{b??ld?#S??C???"??8Ig"??#?'=?????1?90g??s????Z??? ?%?????EN.X@?S(??T?KR???A?O??
?????????G?C????;?} ???]???????.??)?4????wX??M^?m?E5GNf??"?m?@uz8*X?'|a_h.?".?g???/??B?ws??????T?yC??J????????V???Z??7????????h?y:?&??
????)
??^??'r?MG?}?<(?????	D?qvY;??5??SJC??????X?Z?R5)?C???K}l%???G[?l?Q????4?W?@{?s?LY	^*7?3B??h??Dqsa?1?IS,??T??dA+?
??????
?j?N?3Fm??]????#/??T?x??*IPb????i?2??E?b???
?|???S???)??B???`?2??[\??5??O???C\b?O?Y'V8
???M??????r?FM??????A/qW?????hE?e?????????;?3?????n??aMg
???U?C*???y?????/?????8c?K?.??r?-O?1Z?
?????Gq???????Ce-a?????&/??????f?|?#';?%?G?+??A????|?k???!??C,?3??ST"?O.??;?r^??ON#????xF????{t???G?F
[??E?^?{?+??XQ?????*??$??Lh? ?????V.??:}?co??k???K?<??$?aaVO???X?FJpo???t
z?'??
????dmi???tpE??7?sY ?*,???UN7?????p?E4?]?iMKJ?7?B?B3?)G}YO?$???5?????3z?42??5.-????u??r`D?~QO??O)P??tP`?}????~?j???????????w????]n??/????R????~?p??q???N???
?6?G???????K,?<?????DvcV1????Xm?^P??????aOxut??8??1?B???e?F)???@G?C????}?R?#??GR??9??;?Uc???M??7??????
T?Mf?g
}?bI?j?
??J?Kg?????8 H:?,?8I?M???n{??$\?????$???]$j?????o???\ ?H?????f??????9?.?zG_????????????)???P?!?H?z?XN	P???#?3?????;
"???<wF?1??????75?#9???-}??
O?c???~??(????8?rp?7?#O??.b
???????k???P?a?r?/?o?L??
5<Md?IW??:?f?.?#?mo???F?&#E????B
????/=sx?Z??Y?o????Q???Y?^
4gI??7?? ?a??=Z??!m~?
??/??9w???8+?????q*?%5C?U?{???Z0??!?8????:?<?D?*"?o??W???????W?????????|?,8???7K?????KR?*O?k4?f????????S]-??????????#?????L??"?4????'?f3*????b?l???B?U?m?q?
@?f#PIP,$`??3?cv???]?"rg

??0q??t?^CNon??c???bi?1?B??*<o?ijO??7\zK???!????#E?FU?sUm
<`????(??=??HL??"py???jH?~?"?"BN4?ZW???6?L*oN?N?????'?kr??j?e{??????????10?T+?5%>?????;?????p<?}?
????D??e???[y?]?t????????I??o&djHbP?9
?????F?N??	J8??d??8??n8??????8??|(-?
L?gl&.#4??_?>?#??D?zb?a?	\79w?~W??V??h?o?(?????a??W??Q??o?0???{???30B{??-y8?????_)r??@D?W?w?zW<????DE?[??67???2??????"p?????W?V??H,w6xRm?????A2?Xj?
??;?.`?.z?Bs???r7????CA????????N?p2?F9?????\|e
??)??
??(?y????{+?F?g??%)*-CaD?X?BD?'
m??En'???K??4?w??/u?}???]?????????????Q
?N??>?7?6?????k}?.??OwV?#?ta?^p~?o2?)?ow?D??g%;?B??+b?tl:|???8??-???aw-J?/+#?*B??,?wK????e7????r???
?
?2	?L?`????<G??K???^???9dQ)3???i?Nc?????MNq(7?E??????[?"?Q??`+8?B??d?O?:??
??)\????S5YB?????n??
??4?N?S?	HJ^/,??[????'n??
?m~??g?????[h???9C???@????1=\m?
$????p|H???eY??)l?d
4?????????3????????o?btB??$??oZ'?;??J?/?????????V??_`lf?Bm?*??XQ??d??R???????R4n?\^??I???????d?WZ???$v????iY?.?YW???;
}?i^?^???U?6???1et???f'?a;ijh???a?????????????	??1,n
??d?i8???v?c??d?4
@e??gnyYXU???N?	??g(
???2??W[??e?c?.?????A?+M????w$?g??U(|0? ??|Y??y?????????%6qY?_4??<?I??????}??v0.p????y1JC,???Z8,@??s	$?B???!o?!?R\???.Hx??"???????????iw]?=I??|I?????'J3????>?=h?$??B????tT$?1??? ??W?????XHb
???Tk]uT????#???_????o???????S;y/e??a?k?'
t??g?Ub4?$"?%b???c?????d7 o7?]??y??W??)?+%????$?????	????SSD??Z???[<?????1B#??6_ at m?t??Ic?yB?D???G??ZJds]E??????fD?N8y??=?????A? f??A`?M?G?-???q???rx??W?????"8?_?-?
?k?????????????wPBA?i??ndH??y??y? ?????O?????P???wt?t??z????U? ?L?F?x&
3]~O_?mi?#?X??~?h?,???
?>???RHKZ??'nzl?Q???z?$R????f?????#???0??0?T?C>`=?????????6?M??????????q?????????
??aqk???z??	?zlw1)}Fu*???@??4??????
???{L~??I:??????l7???o?l?d?
?a??
?n??????C??=???a=s?7???g^/`

?+????g&,????w?d?s??k"??8P at 7??i?a????????????r?ixqOtklQ%k(H?aU??e???t???p?t?Rl?;?|b8?????
???Wm!?Y?V,??x???W?j?U??X????M"@}[?k?w,?M?S????:?Q]???K?\????y???4g?z????W#t??;'?4$
r]???c??o?e?lf???????7S2`??(??[0???????|A4;??
?z???D??/???????<?v????<???X}KjQ1}??????C??m????:?v,??@r?iE????dX??4$pBJ???a?0??;??H?t
????+=?????8V???????T[????-='???+?K?P??]???????????!l?
????o?%??~>S(U???!?;?l???I.???v???o??????T?k?~?????U??*Y??	)???????K???????
????m??????D????i???!??????Q??l??^13?????K??X3S???'?+Vi?bu??z_*?
1??#*?B)???+W?L???????dc???`w???:?3??{/?*Z??3?gA?%"?????k??FB#?
)D1?h?[9?
????$'(????!z???????S".?5?s?WR}??!?;GbZ?
??
?^??\???hI?'Z??k6{?
?????VVI???e?????m?b?(?%????>;>?H]K-d???7?w?;?dy?i}6x1??vuy?y?;}U	?Q{??p?9??]????p?K>
?'i1m?
=E?Cg??????6^????p???/@#J??L)lck?)%Z?\??5g'a????b6f???R?K	U????%??F??&???D????;??J%^?]X??n??R????????I???-?????]???&?????(j?G!8???K?Y!H?q???k?]??????Y?X?oWW=LJ]???=?y^??O5N?R????g_???4
?I?s}??????7;??'};n?S*T???`??[??y@??yX?Go?I&]_\????#T?????q???&K4???{??v?
>S??_*???q3?<??O_P??:????m#?u:?????k?X?\?
?????S????I(`AH?lq??&g???3?|?0X?q.??2????kH0??}+???
???~(?>c?Ut?????O:ZA;?4??0?P?6?e?????*ty?>??ZXS??a?$???&K????J?Hp?55??(U??J????nNF?*?u?]???S?????=Q???H
?????V?@?9???Dhk??3?j+P(?%(???<?q?e???8?P?l?r??-?GM^?(8???yt?<?"?Y??TM??A0??G??F?l#??5?o???N?GL&?????xg????W??A???????u?j%?]?_?,}?m???Y?<lcI?v???^?D}SO??????W??F?t?x?J?I+?????[??Wkr]R]3?J?u?&?W?MZm??
??%????VbL-?t?[.?u??/??.c?hD??b????y??
qu??t??!?Sa??A?
????X@
?????????YV?Z????1??q???w8~#??k.?{?p?}Qb??o&?/??:hM??m???1N?
??
)?.?<=?c?N?_??<????????m??&8??m(???U?i??g???A???B??2gU?2	P2??)t??#?????C#???????d"?$TN??m???Ps?rt??(???\???G:?~{?????N???ks??$>?m,D???????/Q?????	?????W?k`???e?M3w??j?????;:x?\?????x?-Z?Yb?}U????"9?+??J??j(?+?g?uS9??R=?J????h???????D?1n!?Y?T?*?XL?^d%?T???<?G=;zR???|??H?????~?$??X]??d???hNw???%??o???S{?:????A?C?P??#??`?j?$?????F}????J=??a?W	@??U?Gh??%??z?"?-
[???MDm,}l
?d???\???t??";????F?3??_?Ux?@?"??9???????=?F?B?LCIa?>?L-g?kw/???@?????r4@?=1
\\????iyk[?C?? ??lO?a???Q_??F`?????iKS?lb??`??J?????=+9/V?MM??O|_??N??I???q?????D4??f?5;g?J???????N=??7?!?oku?;?????xJ+?Z??9>4SN?m????^1???0;

????Z??r?L?&???T?	Y???B??/?"????6[?V??>????"???r"~U[??
?l2_???
?L#W?Y?Uot??U?[5?+.???`????[?L65O????0?Of???^????b????g?b??"Nu??F?
?c5^??K?\?>:UB????E????c3??~.????e????%?L???v???U"o/??L
??????T?????w?v??s??H?,bc%???H?{
F?s?:??????D^????Y??T?????????9??/
?vf??K??????,?')-??????ILsA??&P?Zq>O?g'??
?'?????W:???@??w?B?@
??	h??d?LT?P??W?r&
 ??????f?R?}??8w|??[??.?^n????R???v2?	s?7G?v???:????jV??c????B?''???4?????h@??J*y?b???<=??zm+?????9v?d??\??|???K??j?????k??2??Pe??Y?ZaD?,?.???P-?p??H???~E?????`?S?kQ???=??L~6????Pe??N-??P???Cvjt<?????I'8?I???x;Q???ae??@;?4?9??$????j=L?i?6?	?????%??:?TV:n}?g?X??`
?%
x?,A???e8??i[r??DI?]???zrC???????CD????a????????*??=??oLG?S4??`?H????l??G???M??+?????^???V??w??<FhxQIUq?9V?!V????GH?q???w:??26??<x?g????c?M?j<1&<C?9]
?0S^?V?{XW??ODD?Ho?q??9??7@A??[?h?j??);5<(
?9t?a??=?|????Z?????
????3??IN?
T+L?y^??;|cB??M????
?w??.6??W?m?U???I+"?w?%??:???KDt?@?K~?y?7?W?y??v)??,?
???q???xJ	?8&Yli?q?????v"n
H;??|?Si1??????^?vj???'N??Zh";???<?0
e????3??????.??i?$??K?4??yV
??8e?T8??
BRK ??
?@~_a??f?1Jcf?t?1?S!?M?"n?_UU????X?Oi??W?Z?!n???%???B)?b>C3?-?E??`l
(???6?_C?ne???T\}a??L??????yp?<%?s???`??N?xJ?b%???E???()?d??
?U(3?U??7?^??$(d?}|????o???????i???"??U??!???E7~?)t,
u?~Vz??Vxa?Z???y?p???q??C?Q?
??????
m?
dZU{e????-?,-??	Q??A?Z.b?!??S@y??d?%t?*?NI6Qe???8????M(?o??X???K???2W7Vfi??
?o?????G?!ev?Om??`07#c
5??$??_5RK?ElU???.!9pM???Hea???1?f0w8?yZ?A??`???P?`x at 2??!??rMRn????2???-v]
???RE?W?ha?L??????????s??H-?????,??!???B?9???@w{?e??U??tG??a;W???g?
H?N????)?>?3???j???	???;S???X???[?????$w>}S????j+U???V???u?}?\????9H?D`
?ih?Q\?/;l?Cz???
???{??x)t?g9? ????????<??K?V?u???[-8?`??@??I?6/'?M???6?iz??&N?TVc~h-?;8??? ??V?X??	??????[A???a??
6^?4[^g??_?v?+??W?Ei?g?s??F?4C????????q???????/?Ek??&=#??s??=?x?zu?:?}???n???MX??G??i?e?4tl???P?g)???N??|:W?????
???p???)????5????????????y??=?v??6?
y/??#?7?}?
??????R?/U????q?fO?-?>?????Ln2?????=,?G??6?"?M??!T?????	f?W???u???,X????f/?E{??6?? ??K???E8??h7?sI_K???????????r->? l??-?2??@??d??/?o"???f
??S????R???O?+J??Y&?r?CHJ%??????|??>S?;???????Jj?qW?QE??[)?????c??LD.????qt?S???
?Z?J?0C?Wnd?????}-V|????64x?????_?_??W?H??=1??xU?^???[??w??k ]?^??x?{????`7'????????Q??T	?z=??1
nZ???3a? ??????????yS)???[???Q?o???????=??S?#$3??3?
*??z?|?????c??]??G?t.?,K?'?B??H??D??XU,?LaQ??J?#0N4??)}!PW[g??0?R??.'????@???x?????+2l??V
>??4 i#Bd??iG8H?"?M????L?T?x???*(???e
v??U?Y??Q at G?W??4{u|/2? ?????m~[A?i!?B6"T?Id4???p?e<???~???(?X??Z
qNi9????f]@????5???????V?>?'??,~T]???

?7??'?a?/??%??QL(??*E9&?????????F??&???w???1?P`?????2s{??ZO????y)??W????=?????/???<?h????p?:H?????F?????
aJ)?6
?(???`_???N?JQ?y????Y????????t?\=?S???????c?????yd?jr???<??f????4?'=?I?O?????`g?J??F?\3?V????md*"=iB/Y?,KQ8????z?85??U???dX??/?(??????#?C???"*?T{aR????AzM????$????A??(??Rx?q??K@?k2!ek?B?R|M
?cdV&??F?T??JS?x?}S3e<??;?z`??^?.L????c7????zP?7
?v????=}<T2`???????:h????ga?|#?	?????_'??G???P????W??>n!??X*????h?'Vo??f\?H??h??`?4G???@????lZ?????n<y??5?7X^\???IR+?8?=?%?m???E????Y???5?R??W????z
??K1??iEs?`?.@?????,???????M???????W??????7t?M???{??#??
y?3c?#;?r+pH?U~???t?K 3?-G????*
?N?V\?bYn?t???O??$g?r(?$}?4??zY??M??8??}V?????}?w?Lm???r??}??e??T}?2???$??0y2-P
4??@m?9??[k??rJb?<??el?????#=?8??U	L?&?\?4???1??A??"#?;???`??L at Ip?k?z`?%????c.[???K?&1?Zl????????1?7;?Oz.g9???A?'??h*?'???^???g??y??)]??SZN4????g???s?
??;>%\??@~???Y8??!yH?>?,?I???
?Qh?|a??????}f
:;z?v???/?4??4(sS?s??_?@??????/6c%???????U??SO?? ?Q?
@?r????S???$?"??47??????^P
?0?Y??x?b????#c?#?f9?x??U?????D????????XR????#?t%?%??&??????^?dU?^???&}In?6D	??L56?h???????#8???}?aw[V5d?\I??s?????
"1T???m?????/c???Rn?YJ<???0?3???Fwl??????;?????2u??(???Q?_m&????K
???X??,???B?>w?[1\?6G????=?S(?y??U??{???<.??????????g????{????J??R?W????=n"??Pe?????s?%UT%??????B???? ?x?S????WI?1??5?????z^???Bf?u??x@?cY?%:??@?qE??m?m?[??? ?=?????????????gp?P?;Hy5:?Q?Vrw?I'i?Nt???9&??q,he????c?T?Q\??k?K*????
>?.U??j???zM???U?$????)u?q?J?kR??<?o??*??:?,?????	tY)W$P??HY?.f??*?E,f	U??6G6?X??d??3?
V?4?4?
}?M?F?i?Ub????{*??E??O?$f_??L???
??o`??L??6?5ho}C?g?F>?v???9h?>h1?9???L?z??-?w?T????\??_-?N??????????? ?cV??Y?j_??N??????-?^g????????G?f?i9?rY??@??"-
.?k??A??
????=?<??????=:?0?s
Y?HY?T?)??????pK?s?Zr??x????
???????3?s??????a?=?[#??62-H??????R
?|X??3???
??n?f?
Sr?????bf~???g9?^l?????"J
d??)??(v???D?Q?<??x?vF??{Q??#?????2?t?O??m$]?"?
?]?W?0???w???!]{?Qb?kUQ??e9??u??c?Znu?*O??j???&c?Z???l????3??9?&????,???)?>?"OH?U??V9[??M??k???9?@GY_????Q+?Y?H?????Ig??l??Fi??DYr?!???B[???}?$???t??`oJD??O_??U??????????#???j?/td?B5?t??d?I?+??F?*?
?i/"`??????
?&??;????"
??R!4Z"?*cv??????x???
6??L%?}s?t?"?%!?(??FOK??U`??r8??????{L???u?#K?Z"??_???G??=d?????QI??	*n{*sS??{??5??i???s? ?????/?RF???v??
??'?_W????R?~D?R?????????%??v???v???D_??8d??o?T?$`??k?!??(h??<y?o
??<E???	???p?oC??f?{4{f3???p??^?Q?Dw5@????????*???????K???B?@_??<????????Ey???jw^??F??y]?+aI3 at x???yVp??v
??q???b??1?R?????'4U???_????Lc(@z/???j???,???!?'?:}??M?+y?C9??t?s?5(f.?~?`v?B?Y???r~??LFe??M%Z?&|???kl?????	????j?3V?VQ??g??`g?fa?hg???????2l??+;??a?!w
?BD?sE???z<`??&??EQ[a?$e}Jb?L#&Z???z at 5l#?T?.?????0???tn?q?G,p????:@8??.?af?b????? AzQm}??
?? ??g?g???s??$???d???c?{????1B??S?????:???9??
?0??#KG1???
????B??Q??D??Q^??|jw\??D????U^??Q?p????G??!??x?I??<?/?????}8)??O???'LE??q`??????????G?A
?v??C??L??]	dV?BN3?Oe?m,?[?k??qe?`+??v???Ch???d"??/?B?U????'??Y??$w,??Ww@??p??4??/5?g=??|s at 6????????d??
?M??9 S?;??????i3w???[??3???g&_???s???FR??
??c?P???R??R????Ds???H??.??>/???ie?08?'Y?????-?Ex<]Bg?^??|?????|???	ej?????}?e,Q??K~R????i???m???????WN
~Mb??k?;U???k????x??7???1??'K?m6??????~??4????_?v?l??e?o?w?h_l?9???'\??????K?og??GD^?_A??ED?[???B?q(s%?H???%?q|?E???;???#,n
?(
KZO??X?o*?z6???956u!I?+c?_??Aw???I??;????????s??2M????'?? ?C??k?f?cy???????6p:<???S???:M.???dp???Q?o??m?	??:!%G??1
??3?o,????n(
*+?7?????[?
?+??<???n???sF??????????:??q?M????*;P???=???S?f
? ?$?'?7%??%?Gy?s??YEy??:??y?????tJ?l/????u??YV8PL;??k?+?6?7???,
E*/??e??f???)=@v?bJQ+5S???UB?????ZO???F???L_0L???}V???	!????
?Kd68]?D{?Q????&
?I?6?<?_?????=f??? ?BB????$??cp
C??L??5?f.?`v?-???FiH??(???/?????~???i)????%???Mt??qV(?
?\?@??>\?,*$???
??????L????'?????mel??9??"".???????f?[??"?O???w=??0fz/?h????(???-,?yC?#?X??]/r?????L??XR"H??[?G??O7hcE6??9???Q??H]S???U0?#???n?w??
7?R0???^g??s?U?????t?=?ds?_'Bk??[*6X??N?z????2??j????y?Q_??Rj??#??UC?g^??6?

??a?????IfV^&;GWw!?f;U*s?_[>???i???A?????;r?U?B2C??c0?????|??ySL
JC3?Y?{r8c$?/E?o?{h??d??M???y8?{v?k?G??d???*??o??Wg?=?co?x?i??????y?]?6J?{qYEm??"?{?'???Y?????7?F????3
???ia??@$b?3?o?,v4?D?L??????p??z????
?o???7T???x???L??W`?-_4
~??F5?u??????}<J???U????,?@T?????)?&???p??i???uw??????Os???d????H???2??????`^??s?
fr?nO??I?B????\<?&???M?zQ`975S?????
????k??k7??OD?P?0,????O??
p/???>G??L???????
????H??2F??U??Ei(??@?W??L?y?? ???ou????Er????+pIz?-?5?Z??	??Rx$g?
???????5&P?^???@???i????B??	y8?.?T9??S?*vc?~T????h2?#???
??????$????nr???BX??[?Ql????]?>?#???????Zw
w
??????X???????S?????K??=??%??1????X[TVpy?+??g????c?cn??j('????1????=
????5???e?.ijA+????_r M??X?w:?
???a0O???;?3???n???E??/??F=1?:'???A}U?%??{\2???SJ??3?????!?|?????????#?%?VPL?#y????!Hx?i?r?hyS?9.?w=????XYx???Bsv$u_???V??o2?:??B?zCGy7?????'???????T????d?!r?2???[?@i?hH_???g?$?1?U={gYS????d???w??M)???*?@?#s??}5???.?)?9?p?u?G???b???H????Rt???(????[?>?A	+&?7?i?5??????{?r??X?J?5?5Z??^T,?#i???|
??f?a?+?^??!?D*?
?????27?????f?R?4X	?x???o7n)????x
c+??z?(3m??????qG?n?{tO??kv.Z.g?	?ZX4???CH??4????pf??????P??i?f???<??
????????h?g.?:?:??????A?7??	???????????FQtK{KF??YT)8E??S+??2}?????&?y??Bq)?-????j??^??????f|????Fx??1?2=D? n?=]?PV??\
??g??????/u>}?(???*???s?I??HT%?i?????y<9?????X?????9?	?Q???????v?r?Z??Hb???{R??^ ????[?
?k?!_???W[Sp??4?????rF?????T-??????&?m??Wq?T)
?a?^<??\r5W???_b
v????}????j????AFB??x?I?\)T??E?s_<?!????????y??_???-??,?????>?f??X???????%??nh??`?|?)Cy??F? R???S~????2?8????A?o?6;?h???s???;?1?
???'K?Y??O???	?r]?w???l?UY?yx??dCF?{)??&??? 5??$??k?|???KN????xj-?^&?|???yt?????u?!4q???/?c_?4????B\_/j??-??ad?Z$+?|y?v??????d?F??????~?d?tj?Hu????<?n
?????jp}'?E?T?A?e??r???>? Yb?????%5??R2???????H?D?<E0???v???9?h?????v??f?M??r?'???%f>;???wS?{l?R??&??????a?,M?!?V\e???|????=oD?L?k???0????T
??l
}7???'????tK?]vtl??#
f*???g??#????????W??O?=,???q?????
?R9$:'(INa?e ??#?e?'?kd?]A?g???mq=!=???G?Z????????????.???h/?d*0?
??Wrlf
?:(C??%???y???P?t?4??b??????@WVi??V?
?>"???6?	L???^J?a?bt?????_???e????t0Il?-??????E?x
??ezE??mi??#>?B??`Ekq??M1?D??????tn?????X??#?`??Q?f?B?M??&?N"??Z	"???. ??k
Sa?1a?t?p	?2\
???\#X??IU??+TX?????aq?F?h??n~K?]	?????t?'?+?%???~?????ea??????e?T]H?mv??5???ff?g??R??E3?7???q?7??t?8??T??[????'??'?gD????????Q??
/{??Zd????~???'Lf??T?j7??V????????!??u??A?sa?c???????????????Y?
?????
?gb????27O?
???????^s???S?m??O"????#?"?1??:??#??3?
~{???EgI
?g?
]@??????8??{????X??????????h?@?2\|??:?????y?*???*]?
h?a?%G:??%??????9?T-??????m?{???????1.?vs??,????zqP??V?/?#?krWeyF?J??2?E?P??????????7?e???H-?O?"???T?????????Q??
Zz?N??+????Gt??????????X?Wss?q(-#?t???????O???wd}.????<?j??u[?=
?DN#?o?b'|??p??q??/?%?53R??2?~2h??FD?&EO?I?????????{$??.?
????17?????$?r????P?*J??z??"?????>Rh?Re??j??jW???W at G1zzt????e6/rz	?G?S?P8???n??\V!??N:?????)9i??RV???????J9?;?0???[?HAR??iw??1??S?y'k??W(???????4}?'7
I???8??{??9?
S?*????U?c?=?c?%??@???"Y:?^?7?????
???.?Kn??m?dc??e???/?p?????[8?????}#?2?-pO,??lLU?v????????d?2
S9??O?
??c??X|#m	Rv|1?<??^2???D?????????{?g5G???/?IH??>?9??>y?YLS?/Y,???ba,H?V??????;MG?m|??(?/???SiN]u?~m????n??Pl8!???3
Q??~om?;?0?<??|???#
Z?y??t?
L"???S?6??5t????-i???0??T?"??????
V?7? ???3???.?????;T??????i]?f?	B??~??t}???Md??????4?_?:f??x?2??*
I??2???&n?f=?h?8{?oF8'#???P;e!?>?Z?
x???.??_3?????ko??v???)R??sg'Et?$9?(???Y???l???v
??????.??_?M??w??R??hfd?/??C&J??S?CD?k
?y???Al?5?kL??@??,???E???e?(????G=f???????OO?R4K?%Q????Y?a?????d/?[???RN???m?d?gM????s?2??1????2??-[???}???rj?9\?k??,D?Ui5?Q???x?i???`??}????4?????m;??
?D?`c?j?T?
KA?k?Mm?????"[
?^?3<???D?Jw?CV??t?\?m1dt?1??m??<?G?n
6
??????]?e?{??y+	?????@OLO?y6,?91?0F.?
??=2??<??????S??_;saO??a'?2???G?E??$5%n?l? ?R=???c/???2???p???f????Y6??. C?~????6?=$?~	S"y	yjb?YG?J#2?????1????????g?!,??"????????????l????u?m?S???AO?E#??+^y?+???z9K???==v??:I??w?5?????X??????,?K?D??1????v?7??H?dV???l$Y?_???99]??ly????U?L%h??Z?#	]??X??P?>??m^??;&????[??:???z"g(?????w??F??R????q'???=??V??H??k????!?Is??4q_?4"???b?qB?>`???Ky??t??|4?Sr???j????+?vT???W?V???Z?????`??HOvo?N????bF?Z??g?a?|?W??(~??R?
?/R
?????9?m??M?Z)??<?h?s?ec?`M]B
?l?t-?aH???_?@???`?n??V??}E!?>??@!?I
??wL???WJ? ?sQ?n??Kw?4m[?SSKr?(??84t?	/?"??]??]?j(KB7?^??? ??t???$)e???%?`??=[???_ ???C???y?`?"u????Z?h>?l?3?????1??l?
D?q?w?(??????1Zf?}??[p???*?-%"??EM?|????~Dd???"??=?????~?U	?`?p???*o??{?)7??S?4?=?e???E??vVG?????L??|kr-?=k???????v?k???lF???BBv??y?Y5??x}???z??R?d<?n???>?-??;?L?2??t???U?4?o?????#T??9B?????PYC?Y?H?v??RyO???W???R5f????x?Pq=c!????+?k????Jag??}??(??E?d???:??????????X?
rvr???????$?p?&2???+?
Z????#g?O0j?Od{E?OJL ?,?>?8]?,C??h??X?R?*/?y!4?KP???k??l?yQ????2??l?+?n?'g?{??d??]??
??'_??.??0????????e?[}i*??h?FY??????U???;???????????u?????T????f??oB at dS????n?eeB??{????6y?n?$???????k?????A$?/????:?????oa?*??8,?x)?"?:x?T?
?M?	}??B?EP???L|8w?{?P??????(?x*?x????????O|??g???#
?U?V???OH?????W?/???1T?s?-W?????.40?Z1j???D?+O^?c?UudaFOB@g???A
,???
n?s ?'?????M?3i?X???????"??en?>
M????hBL?&.6G?!?H?:o
q????????4j???M?<??????z?b?????p]????
????CQ???????t?JT?tc?~2?v??[OV?+^???[??
?2???1??????Ju"?Qc?????B??ct???*%HX????<sU?Y???????????g	n2?	B
??7?d???@??????k??onpr?4???V?h?r??]?7G?E????1?7?? ]\Y???t??R???&??x;?a{^?&C???'?w???0yq??@"7?n???aW?
-{?>??ul?O?>]"????-??iH?<??:??Zy??R:Z'|???`?
?G???"?`??n?a?Y"????k??-??#??,???~??t?
??g???@+?????p??????6???
v?w????'?@???Q??#Lr????V'v$5??u????m???qO??]??|Yu?pm?B????????????????:o?zGC?
?G??
?U?q?
u??%??>?}?k?(??7?/Y?ft?I???v?Lw#??
?I?\B????&??b??J)P$U??ZxP??"a-???
???Q????wn
?m??a?}^?????2?)??m?Yx???0"i????????0?<hK?"?X?0wAB.x?U?
rl??????? ?e0.????#E
BB2?4v???3t?4uf0?????743SS??
?To <??y????w?? 6?^?0}??????z+??%??3S1
?*?????H7h???????v??b???~k?o?o?+??\?????lG?.??{??
?1
E?QG????????N?N??m?Ov\??]?a?z??2B??
p?"-?l?t~??x?Sa??0
??U?U!?XM(?
:????&??s ????l?\??????o?6?9,0c|?x'?uC?t?????Cs?????M[r+???.8A??!?????s?? ??
[??$x?nO?Z?3?V??z?o??//p????
????+???????#/?"?-/??2??]Ny?\p??Kk??C???
?fdM9???;Ig?<?
r?g??j24c???????'??,??

/???p??"?G?{?	h8?s??3J???Y??r??????2%??`24???2(?#%??=?W?)??9?????ld??;3??=??P
??????????.\??X????^T????)??fh=???m?W?7?7??o??U.PhH{=????t0,?9??*???c??.?R:
????g?,+???A?au?f?E?1]T????g??KE;??G	??F????M-?????j?????z!?y>%?h}9?Nrs??^T	?*?c?	.DZ)bl???l(0?=!4?"?1?<4????>?MaQ?????'?}z??@?)???3_A?????k?\?,u???c?;??Y$???+?1?
]?q???Y^be??r-j73??b???C??%	?LH0
??TCJI$[??1??^?Y?0??K??F{?V???I????y??????<%?J[?*???????CA??f;?_??_?????.v?l?J???LJ<t?k?d:{??vh?)????&U????????pN??IhT@>:1a?=>??#sL[????K??:
p?J??w?Rus!h??/fAkF??Wi?{??o??;|???7??<? ?.?2o??W?sb@[d??$m????~=,??x????d?~?????U?E?6qQ!?m??????_X?3[?I?
2??eZV?D)?a\?????m?t6l&3??w??????/??PeeIi??uU?%:????????<#f1	?Z?e5?[??|k
?<T-?fV???|???;??>fO????RP????/???
???Y??t???????Y?2??8SF???C?Fdo?mK???x??????k?#?<????
??????G$??K<\??.?I{
?/?)n?P?jbblor??/?J[?Usn?:i^????Z?MWt^3h??????R?l?i?^????{?	?m?????8??!??~?vH?=?K???@?R-???y&?}????(??p??;??mv?????~??^?l?MQFK????e?sQ??@3???2o`?6"|??>|e?p`)P.@Gb1???p?4?v??3b????????jr.????Iv????t???B??i3??Y?xS?i?U??}?{%?~??M^?o??????<?}D,?)F?j?8K??????(2?
<V??8b@@??5z?%????????????VQ?_????a?e??'???/Y.$???R'??f\?F??????R?J!.	??q????
?(?B???=?R(#??
@yE??????)??????Z?????x?????1C{!)?UJ??????Q?sD?y?h?auGy????FvJ-???????e?rM?c	?>??^E?????MU?w?#_w???2^?B??m????vP???xX|?<???S??`?b??UV4!b??T@
b???_??#Y]=??
?4v7?????J%?d?R???????c?????<??p?
??c??z??.C?_m/Y.?C?l?L?J?,r??Xf??@b???+d_M????T{b??\??fv?@?!?HK???zJ??]eT?dmd,??(<??????j??3K????o???|????????????E?R ??Fh?????S?/????M?V???????y??'/E?D(i?N??V??z?7???????#?;????t?9??c?E#r??N/S?????Z?T??@?x?????(?8??!7??q(??@??}0(|m??5?l?-T?U+?c??;??g???
?&??-?V???v??]C?05?7???M?S???????, 1*u)??i????
?*?P?!53"9?4?Ho???]fH?-8??Xs??R?B8?????f? ~i?::m/??Y???????q?
]b?:??@x??
??q?6??pUIN?6Q3????????k??vp????a??T???{????Q
?:?X?????4b?'Qg?-????Zwk:
??1y?????,e?D|M."???Am'?D?f???4?Ll(6????f?'?G??HB4H?
-~;???3
?D?n???;???cJ?#?????$???-%??a?G?p??\???)*$?)`??-V????\3z?r^)??????Y3??q?
???on???zk?k????mP#(?d???|88{]l?4|H?I??1?&P??An?U?BZ?c?t?Q???>?o}??]????
?^L2JW??(?t??0;??l/(???????z?
x????q?9
?u??S??????'??u?[]??Y???*?_?? -???h?/K?2??????2ey)?.?&qJ1?fj?zAT?%?h????,????dv?7r??
?Z???????)D?
?+y??\???5???????y??HE???iz?
???0?g??2?J???J,?3??+??????R?DwL??pO
cM&?7a???HDK?AZ??????\?4!??Y??????`0?%?Mm"??????5?1??J?????/?A?S_~?s???(EX)?!???#?5F???"?"?;C?IZQ???@qE`???D66??}?On[?M?gL???l4??e????????/.=??Me?R?	L?f?C_???U?E?Ra|?
?????'? ?
?)`?m?n
???'?D?/??b??Gw??pk?e{70[e?`?8????#G)?* /????q(???b???p?s?????7??[?p=E?X?~M?????#\?j]??? ???????o??
?????A??X?8???!??_?5??)"?????L4UU?e[Pq??????WU?;??n,??_G?iL$:?#?z?/8??diSr?M6???xO????????????J??*?????,?`KE?EzJ???n??JX????{??m?^J?8??n?7???????51?y&PF????
?:?m?()D~?<
?z??3???R01??R????H8?O?9???u???|??U?$
??;~8~ZI?f?-g??U3?N???@??????:^?N??W_
WD?????j7z??	??Blr????0)?+????ST???	h*
9?6|?b
`,????????jE?r?Z0??u?{/"??+h)?Q?!?
q?|`?d??????,?D???N??	?X???J>K?S??????0h????b:???X.????<?\)?:??T?????dV
????o5??B<G?}?)=!?N???]?4???V
?C?ij?]]:?x???\:?????R??[?W?zT??????@???d?m????f??!? 4??B?	???]???/F???~??kJ????S?T???x???S?/??a??I/Wb?????Z??4?~?7WR?<?I)????!|?H?]&q?o???%e(n?Bu!??
?5??SE-<?v????????Pq'
?D???uI\i*u\????qY???D????E???V.??s?:jM?S?>=???R???3?x}??{???>??????!??x?4??Et??yp?d?#??]V??}?)?????o???JY?W?@7SJ!?
!???;?2???<me^?????a??0??$?????n?:zsJX.?*|???bN?{)FVD?V?_?????VW??:???h? ????lAD??60????q??!?????bIU [??????x??????{??M???c??G?R??%?l?[O??{?B????5?5?e*?N?U?>?G??r?u$?q?5x?x????
?K???J??5??????9??|&1?uba'4
?????)+7?D??y?/Z'd[????"
;?E??`??@??H?kx.J-W<?M	;
??QM?L?|1QZ8??Wy???b?????2??h????c????Wx??R?F?????Ej;????'?s?u?1?r?f??f?Z??pT(??-)????pl?W~Qkv?X??????S?o9k/Z??"??I???x?A?
???h?{????8A?W?$???y>N?Wg??????@N?u???-???j??K??est&??x?]1????-%z?zl?c??vg?z7$JK?????h????)=s?0z?5/?v?w%?Kl????C1?pw??(?????^?P?$??#Z ????*?>?^???????e?f7n@n2h0 at r?p??X?D???g?e}30.??q?=?K%?RP:?????	n???"?tG??Q?????t??Q?5~??3?,*??1??Z?u??l3"??@GV?S?????C??J?T????39??P?@??J???UM??B/HWY4W??
;???E????s???=:_<???k:???68?????C	{?y)c??BO\??Y?`??H??F?=?v??
{?
?4T??8??t!??*Y
?S?b?j?I???????????S?5o?a??9????m??.?X?i???????X???????	a?+1?u???R?5?d\?P
???u?,v?$)?????X5???9?T?3=? ?I
+??wl?9"m?s}w|????.???<}??V??(??G?'????)RNy??,???????????????
?J?$P?}??S??a|???3yq??8\??????,?
s?i??b?p?????????]????<%l?o-Lc?@P?0J?9??p???"??Q?i8?????f"???JH]L	cY??r??????;L??-??
~?
?%$??#??V??"?>iva?h?c??j??r??Q6*???:?(?C<I'??
???z??>%????
J?B??5??????'*?H??ln!k????}U-i;?`N????-????h???)nO??????M[??!?j???????{??|????$@?IW????SzgY?
?0???0???q?EF??????yx?r???????????? ??????????2X??(?~????????????)z?.Kq??BJ???T30?l????jt???j????2???R??Qz?
????YbL:?oB?8????s?3??y
?????s???`#???@C????&=?iq???!??/?J?
?Cu??(???gdV??p*z??nG?m?????2???j?????U&?{G??ef?e???r?C???v????)??x? /)k?H:1?y4?b??tK/LLoE?>LN??U+?j?T?Eq?~?????6???6???N6TY?6??-???+?}E?? v???p????????p3?X??uh???Q?3?5W\???????{??QKyL??
????@??@AW?4???
?&ee?T??[up????p??pQ???Xx??p??S??????il!?|s*??
j??^Z????2?I?h=
???1&!b??????vX	3X?rgb??*??t??^Y???`????B?????%G?O???k3?f?
)?g?
????????"i????N?7j?E????1 ?????r??+?^Gud0?5??w??ox??ME_ at A
?9?????????? ???EN:?T?L??$????z?sUJK?
Y?
?????9?H
U??k?y
?	Keq???
.
_?h??H>?eo??=?<'?N???.X?p??=??????Z?????w.jN?y??c??/??_=???L??????hy?qQ?}?w??Gh)?'.Vy!?WXv?uP?+Z??!?n>?F?^?Q????O?$D5/]=yM??????tjfb?x`)l/????
????W	x??'7???c?????????????	Gs{??^?????r`???
?7????sh2
6?'?j?????????J??A*5????N??M+?g?:9?u/j?J??g}o?/?2\?%??]"?R??q?'%?zK??-????y6?l??_??e??????s???:????x?G/=?S??]E?^r_?>h???H?O-`)??|??i???T?+?Le?P#X?Jq??w?2D}??
~??
p???y^(y??u??qJqt?F?k?9?f??L?()?t??]??9?"U3%F??
??/????!QJS???,!????+XA3???'??tF)F
?o????1?\1???????}?0???Z???7?Y)???$?k?m?y?[??s????g?[???H*e?
??|??l??_?tb???0S?Zx?S???b !??zWCu???N7otbD?i	=.?aa?^?+~G????L???"?c&?aN?AVc??9???????a.?z?0Xm??U???????@?tk^???????P?RY?[??Y?%??j????~??Wvb?+??C??C?	???E-7??\Wb'Wk?*?q>?G??~????o????V?? =???q?1m$???:??????Z?p=?I?w?5????9??xT??j@?]?????Q??q??J?{m??z??????H???L`w?vf?(?Z?|7?$????\&#???D0pSi?a??ThJ?E??B?cpf??.L????@?W????????]U??Z?
?M?????7??24?RH?Q^?????Y?
??]*?O??_;k?-?????M???8??????T?"?D?m|?t?j????k?
0f??n?/?2I?WF9nCT'
?z?I???5P????S\z51]??(??N.s:?<???o???'??N???Sk?m??T?i????*S?*W??v?????j?X?,?Tp?@?w??I?*/$nH??Sf?N?2/8(0Ff\???U~DZ)??8?{??????>f?7?????V?o?D?????????s
??%????Z?G??$?&M?V?Vm:????w?e?m???M??-???Cf?????#???
?P????????????????"????"?X???????.(cR	yiW??
G????H???????????
FbX????DD?7N???wa?N???]????i?f?{U?['[5?S??H?R?"?????V?<#$??b?+?P?'?1?;(j?E??N??????^?!?x?f?????hB?x??AH????	!???-?F?{?${??O.?~?JcV??Qt$?6???Bw)??*u:?w?3??*?
_-???U??? Cg	?G????UMacSA??'RB??uae?l??F?-:??-^?I???5V??/?}+?|??4X????w????9"iq??a?N??U????x~rBK????kIflJ?'???=??~O?U????l9?D??-|?i
?T??e);?y4S??????8|??
???g??b??q^r??U3C??o???????????i???qS]??$?O!?oNc7??3!u
2k?imJ6?i<]Kk?+,H???Z???{???/?j*?n???>?.?????I5G????V?>?u?U?F?A?w??"?????%j?w'}/????cXX?s\\	??TA?????2??????Z???0%??PQ8AP?A?8??G????
z??????

????????~??sF,?C?1????I??2?T????r5??fb???]D\?i??X????U?c?V&-?L???_???????EYd??2?K?NB'?Ru?&:x!3??X???
??1???}?p	???O?]?|?|
}
?'O?N
rH?E\?^9?mrF?4V??t?iZWaF?????~??w??'wQ7??R~c?3?otu3{?U??#<?q?w"P???{??????E????P??T?RlQ?l???=BXG??hR???ip??c%? 
?SUe?)*?<???@js~?U??&??
f?%?5???>???)??on*??????%?xr?????a+????t????l}???Q???V@??g??S?mhW???"?{?2	????H??|W???qZ?i5B???i9_}??g?L%
Z?q#???wbZ?V???.????q???h?_?u=?????????B????0d?BX???c?!9&??KH?? H+??
kc4[???5??????16c?}i??7??h?j;?????{v?|`??~???bL?G???U???U????0.??F?d?|??????,??}?V??????AAQl????iO??bi?i??xE??????5]??y~??
???6??)O??7?P	???VK?v??????,????Tfw???~?~??
o?v>?:M?2?jON?\)?v? 71%???e???m??gJ?GY????K?t??k???d[???b?k?_sc??R:Ly*??{C\????
?t??EW???#~??Qh??z???`???~????6?.p?#??9Z$r?????0e???Q?QIB???o*:#??v?
??V?? 8?M??
?)Z?h?i???=CM?>??a?8NK????? (?/????Pog!Z~?

q?f????g+?U?
??1<?I?.S??r;???mN??? K??g???Z+?Wo??9??M?_,Hq ??????Ge????+?\u?f2P?d????L????????
???V?b?[d?&s5F??4?&????|?Qm???-?W?/??(
??;4m????(
??e??=??B???Y???h??W????}????G????t??b?wf?t??4??	&T?
????V????"]??7q????,???=n??n??~~?tWt??t!?Q??????|;?????au
????N/??m??L???s?w?V??dz;??!)???XH?_????b??U _DQ??|?7?)?Z???@#??K?02???3+?]!?P;Z????M?J???{???(C<?"????????b
??a1???K???????h?8??#?Q	n"??6???w??O(m?????;4?@?G8_?4Di^Og?g????CH?	m?W?@???????%?~?????>e"?h?_;]?*4#?G[?*
?;??H????[?>????????R????K??????&`&?C??F7?_?F??????qR??Og5?
D92p_?LJ5	C?d??
v?e???,m???????
E???D+?Y
u!????K?S?Z?? a???C??????}[??#??|oi]?f??"??*??s?^????]???????b0??v?c)0I]m?^?T?{?q-?*??S??Y???+uD?"[??????f??Ju??E`?];,7???T?{>(Z#??]?G???a???(?[3???k?JgK????H at S??p??<?~?3JH?EL3??y?I!???Ik?????U??'??????e:-??sM???????Pi?V^????S??_?"????i?#???73???w???p59?N??????b_???K)6f??CU]2K????
????????|??s]???g?L?]{??:?}ku}?r?R;H+\?h??????t?I?)	??d??a\7Ei?)?K??f?o1??f?1?{*E???oBo???f????5?cJ??yJa?x?$???>??\?k??||q?Y
-???W??5?r?6]?4-??rY??
-Z<?????????D??,??????O/??U#?"??B?nx?C`\?,????????T??U*?7????z?|??&??"fr??q{??gbJ??<fm:	???? U`??EK!???: ??w???2w???"???#5E0?5R?r??g?^????m?|?.?? ?-x?g
??;6\	x?M6w;??a???A????b?g1?????i2???y????<???U/y??z???;???m??k?????l?v???"P`???O3?	?
????9???????cB??T??l
6?:N3?T?UQO?f?|7j???d?????z????S??p
??=?L??
>8
??{_??m?0???W?t?Z9??z_?B?N/??r}???la?`K??A?a??U?s????7?????W???&}??/??V?~cm??p?Q?????iZ-]?/?5??h?/???q???U??s7??????W??M?]?b1?s??O???M?????}j?p?uo?o??s???U?4H?? ?????U<f:1
???)F~?_DW?
($?f?Z?ZQ?[?K?V{')???s???CVHZ?hG??E[?O??x??o????]????&j'?=/+??I?*
???????????j8?]J?h???;Uq?s??%???Dg?9+????mq	?/3??i??M?*??Vu2?R?E?Va?D
?\r?Spx?g???7i???<???????Z???2
????EOM?{?$???Y?O????}ut2J???O??]/.Zk??,???WJ?t???DEh???n7=??????p??e?????]??O?y^t???j?l<??*8/???p??{?.\P????{?}Kw6Q?m?|?A?93&????m8????f????[Ze????x?Bu?$?????!??v?????(&oGx?&?z?Y(??r????p2W ?&J??u?1?
?Ua	l??<?r??g?0??u??~l??M9(???Sy????H???B^??v?????[?&9??ha?E??9?L,???S??gwL?g;6????thD??????????`I?f???2???f%j?oT???x??????j"-??
?M?SY
A?
Y?9????[9?m???????x?AF???T?*h??uHeE?3??=?7]?%q??|???it?9?????N
U??.'????f?!?k;?)?~}/1?
?!.????2?i?0T^P???????5bZ%='V??/??4?Zc???J??F??????$R
?=??????22?Bls??(a????$??ke????*
9????:.2?I??'d???8-????CHi??0q?%9?mVk??X@??a&"????e?$'???J????@???G??s-???8???Q<?{U`lf?????{?6??)??x?2?p[??Y????7r?w???=b8a?+???5??;o?
?oH??
2????d??????????????<@???????S?G??????? ??;??V
??J?^??????PK
??q????!?EI?QZ8Pi?<ry????B??U?<?9C?????!?
M?ym]W???.???I?J?4??
??Dc;???Hx???~??????4G?CQ(i??)??Q)A`v?I~??Q?
???__Z???x??,??6=?G"?V?l?J??????????jh?HJ???k,??D??????l??6??p???>?{???(-g??????cez????+??????N???`?????y






--- NEW FILE hunspell-ak.spec ---
Name: hunspell-ak
Summary: Akan hunspell dictionaries
Version: 0.3
Release: 1%{?dist}
Group: Applications/Text
Source: http://releases.mozilla.org/pub/mozilla.org/addons/9978/akan_ns__mfuaasekyer__-%{version}-fx.xpi
URL: http://kasahorow.org/content/akan-ns??mfuaasekyer??
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#https://addons.mozilla.org/en-US/firefox/versions/license/73122
License: LGPLv3
BuildArch: noarch
BuildRequires: redland

Requires: hunspell

%description
Akan hunspell dictionaries.

%prep
%setup -q -c

%build
rdfproc hunspell-oc parse install.rdf
rdfproc hunspell-oc print | grep install-manifest | grep -v targetApplication | sed -e 's/.*#//' | sed -e 's/], "/: /'| sed -e 's/"}//' > CREDITS

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p dictionaries/ak-GH.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/ak_GH.aff
cp -p dictionaries/ak-GH.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/ak_GH.dic

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CREDITS
%{_datadir}/myspell/*

%changelog
* Fri Aug 21 2009 Caolan McNamara <caolanm at redhat.com> - 0.3-1
- initial version


--- NEW FILE import.log ---
hunspell-ak-0_3-1_fc11:HEAD:hunspell-ak-0.3-1.fc11.src.rpm:1251144382



From ausil at fedoraproject.org  Mon Aug 24 20:08:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:08:52 +0000 (UTC)
Subject: rpms/perl-Net-IPv4Addr/F-10 perl-Net-IPv4Addr.spec,1.2,1.3
Message-ID: <20090824200852.8105E11C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20806

Modified Files:
	perl-Net-IPv4Addr.spec 
Log Message:
obsoletes perl-Network-IPv4Addr



Index: perl-Net-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/F-10/perl-Net-IPv4Addr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Net-IPv4Addr.spec	6 Mar 2008 14:58:30 -0000	1.2
+++ perl-Net-IPv4Addr.spec	24 Aug 2009 20:08:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Net-IPv4Addr
 Version:        0.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for manipulating IPv4 addresses
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Obsoletes: perl-Network-IPv4Addr < 0.10-1
 
 %description
 Net::IPv4Addr provides functions for parsing IPv4 addresses both in traditional
@@ -53,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-4
+- Obsoletes perl-Network-IPv4Addr
+- no provides as code needs changing to use the new version
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-3
 - rebuild for new perl
 



From mbarnes at fedoraproject.org  Mon Aug 24 20:09:15 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 24 Aug 2009 20:09:15 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.30,1.394.2.31
Message-ID: <20090824200915.4D8A411C0376@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21032

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Add new BR.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.30
retrieving revision 1.394.2.31
diff -u -p -r1.394.2.30 -r1.394.2.31
--- evolution.spec	24 Aug 2009 04:16:49 -0000	1.394.2.30
+++ evolution.spec	24 Aug 2009 20:09:14 -0000	1.394.2.31
@@ -110,6 +110,7 @@ BuildRequires: gvfs
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+BuildRequires: libcanberra-devel
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgweather-devel >= %{libgweather_version}



From ausil at fedoraproject.org  Mon Aug 24 20:10:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:10:11 +0000 (UTC)
Subject: rpms/perl-Net-IPv4Addr/F-11 perl-Net-IPv4Addr.spec,1.3,1.4
Message-ID: <20090824201011.BE69D11C0417@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21289

Modified Files:
	perl-Net-IPv4Addr.spec 
Log Message:
* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-3
- Obsoletes perl-Network-IPv4Addr
- no provides as code needs changing to use the new version



Index: perl-Net-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/F-11/perl-Net-IPv4Addr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-IPv4Addr.spec	26 Feb 2009 23:10:59 -0000	1.3
+++ perl-Net-IPv4Addr.spec	24 Aug 2009 20:10:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-IPv4Addr
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension for manipulating IPv4 addresses
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Obsoletes: perl-Network-IPv4Addr < 0.10-1
 
 %description
 Net::IPv4Addr provides functions for parsing IPv4 addresses both in traditional
@@ -53,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-5
+- Obsoletes perl-Network-IPv4Addr
+- no provides as code needs changing to use the new version
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Aug 24 20:11:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:11:31 +0000 (UTC)
Subject: rpms/perl-Net-IPv4Addr/devel perl-Net-IPv4Addr.spec,1.4,1.5
Message-ID: <20090824201131.A802611C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21668

Modified Files:
	perl-Net-IPv4Addr.spec 
Log Message:
* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-3
- Obsoletes perl-Network-IPv4Addr
- no provides as code needs changing to use the new version



Index: perl-Net-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/devel/perl-Net-IPv4Addr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Net-IPv4Addr.spec	26 Jul 2009 13:41:51 -0000	1.4
+++ perl-Net-IPv4Addr.spec	24 Aug 2009 20:11:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-IPv4Addr
 Version:        0.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl extension for manipulating IPv4 addresses
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Obsoletes: perl-Network-IPv4Addr < 0.10-1
 
 %description
 Net::IPv4Addr provides functions for parsing IPv4 addresses both in traditional
@@ -53,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.10-6
+- Obsoletes perl-Network-IPv4Addr
+- no provides as code needs changing to use the new version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Aug 24 20:13:50 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:13:50 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/devel dead.package, NONE, 1.1 import.log,
	1.1, NONE perl-Network-IPv4Addr.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <20090824201350.140DD11C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22189

Added Files:
	dead.package 
Removed Files:
	import.log perl-Network-IPv4Addr.spec sources 
Log Message:
this is dead



--- NEW FILE dead.package ---
this is replaced by perl-Net-Addr


--- import.log DELETED ---


--- perl-Network-IPv4Addr.spec DELETED ---


--- sources DELETED ---



From ausil at fedoraproject.org  Mon Aug 24 20:14:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:14:30 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/F-11 dead.package, NONE, 1.1 import.log, 
	1.1, NONE perl-Network-IPv4Addr.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <20090824201430.B112111C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22383

Added Files:
	dead.package 
Removed Files:
	import.log perl-Network-IPv4Addr.spec sources 
Log Message:
 this is dead



--- NEW FILE dead.package ---
this is replaced by perl-Net-Addr


--- import.log DELETED ---


--- perl-Network-IPv4Addr.spec DELETED ---


--- sources DELETED ---



From ausil at fedoraproject.org  Mon Aug 24 20:15:13 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:15:13 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/EL-5 dead.package, NONE, 1.1 import.log, 
	1.1, NONE perl-Network-IPv4Addr.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20090824201513.6A87911C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22577

Added Files:
	dead.package 
Removed Files:
	import.log perl-Network-IPv4Addr.spec sources 
Log Message:
this is dead



--- NEW FILE dead.package ---
this is replaced by perl-Net-Addr


--- import.log DELETED ---


--- perl-Network-IPv4Addr.spec DELETED ---


--- sources DELETED ---



From ausil at fedoraproject.org  Mon Aug 24 20:15:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 20:15:48 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/F-10 dead.package, NONE, 1.1 import.log, 
	1.1, NONE perl-Network-IPv4Addr.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20090824201548.B597011C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22823

Added Files:
	dead.package 
Removed Files:
	import.log perl-Network-IPv4Addr.spec sources 
Log Message:
this is dead



--- NEW FILE dead.package ---
this is replaced by perl-Net-Addr


--- import.log DELETED ---


--- perl-Network-IPv4Addr.spec DELETED ---


--- sources DELETED ---



From jjames at fedoraproject.org  Mon Aug 24 20:15:53 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 20:15:53 +0000 (UTC)
Subject: rpms/latexmk/F-10 .cvsignore, 1.9, 1.10 latexmk.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20090824201553.95C9911C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22692/F-10

Modified Files:
	.cvsignore latexmk.spec sources 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
- Update to 4.10 to correctly handle files produced by epstopdf.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Jun 2009 15:44:24 -0000	1.9
+++ .cvsignore	24 Aug 2009 20:15:53 -0000	1.10
@@ -1 +1 @@
-latexmk-407.zip
+latexmk-410.zip


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/latexmk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- latexmk.spec	1 Jun 2009 15:44:25 -0000	1.10
+++ latexmk.spec	24 Aug 2009 20:15:53 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.07
+Version:        4.10
 Release:        1%{?dist}
 Summary:        A make-like utility for LaTeX files
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.phys.psu.edu/~collins/software/latexmk-jcc/
-Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-407.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-410.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
+- Update to 4.10 to correctly handle files produced by epstopdf.
+
 * Mon Jun  1 2009 Jerry James <loganjerry at gmail.com> - 4.07-1
 - Update to 4.07 to correct problem with exiting from preview-continuous mode.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Jun 2009 15:44:25 -0000	1.9
+++ sources	24 Aug 2009 20:15:53 -0000	1.10
@@ -1 +1 @@
-b17d286848da0156c0dae009fac4a150  latexmk-407.zip
+cda2adc346f130bd6a503710fb20b0ed  latexmk-410.zip



From jjames at fedoraproject.org  Mon Aug 24 20:15:53 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 20:15:53 +0000 (UTC)
Subject: rpms/latexmk/F-11 .cvsignore, 1.9, 1.10 latexmk.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <20090824201553.E0FEF11C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22692/F-11

Modified Files:
	.cvsignore latexmk.spec sources 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
- Update to 4.10 to correctly handle files produced by epstopdf.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Jun 2009 15:44:25 -0000	1.9
+++ .cvsignore	24 Aug 2009 20:15:53 -0000	1.10
@@ -1 +1 @@
-latexmk-407.zip
+latexmk-410.zip


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/latexmk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- latexmk.spec	1 Jun 2009 15:44:25 -0000	1.11
+++ latexmk.spec	24 Aug 2009 20:15:53 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.07
+Version:        4.10
 Release:        1%{?dist}
 Summary:        A make-like utility for LaTeX files
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.phys.psu.edu/~collins/software/latexmk-jcc/
-Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-407.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-410.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
+- Update to 4.10 to correctly handle files produced by epstopdf.
+
 * Mon Jun  1 2009 Jerry James <loganjerry at gmail.com> - 4.07-1
 - Update to 4.07 to correct problem with exiting from preview-continuous mode.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Jun 2009 15:44:25 -0000	1.9
+++ sources	24 Aug 2009 20:15:53 -0000	1.10
@@ -1 +1 @@
-b17d286848da0156c0dae009fac4a150  latexmk-407.zip
+cda2adc346f130bd6a503710fb20b0ed  latexmk-410.zip



From jjames at fedoraproject.org  Mon Aug 24 20:15:54 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 20:15:54 +0000 (UTC)
Subject: rpms/latexmk/devel .cvsignore, 1.9, 1.10 latexmk.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090824201554.2CB6511C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22692/devel

Modified Files:
	.cvsignore latexmk.spec sources 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
- Update to 4.10 to correctly handle files produced by epstopdf.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Jun 2009 15:44:26 -0000	1.9
+++ .cvsignore	24 Aug 2009 20:15:53 -0000	1.10
@@ -1 +1 @@
-latexmk-407.zip
+latexmk-410.zip


Index: latexmk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- latexmk.spec	25 Jul 2009 04:59:46 -0000	1.12
+++ latexmk.spec	24 Aug 2009 20:15:54 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.07
-Release:        2%{?dist}
+Version:        4.10
+Release:        1%{?dist}
 Summary:        A make-like utility for LaTeX files
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.phys.psu.edu/~collins/software/latexmk-jcc/
-Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-407.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-410.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 4.10-1
+- Update to 4.10 to correctly handle files produced by epstopdf.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Jun 2009 15:44:26 -0000	1.9
+++ sources	24 Aug 2009 20:15:54 -0000	1.10
@@ -1 +1 @@
-b17d286848da0156c0dae009fac4a150  latexmk-407.zip
+cda2adc346f130bd6a503710fb20b0ed  latexmk-410.zip



From otaylor at fedoraproject.org  Mon Aug 24 20:16:52 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Mon, 24 Aug 2009 20:16:52 +0000 (UTC)
Subject: rpms/desktop-effects/devel desktop-effects.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090824201652.D0F2D11C0044@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/desktop-effects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22916/devel

Modified Files:
	.cvsignore sources 
Added Files:
	desktop-effects.spec import.log 
Log Message:
Initial import (#518900)



--- NEW FILE desktop-effects.spec ---
Name:           desktop-effects
Version:        0.8.1
Release:        1%{?dist}
Summary:        Switch GNOME window management and effects

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://git.fedoraproject.org/git/desktop-effects.git
Source0:        https://fedorahosted.org/released/desktop-effects/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  desktop-file-utils
BuildRequires:  GConf2-devel
BuildRequires:  gtk2-devel
BuildRequires:  intltool
BuildRequires:  libglade2-devel
BuildRequires:  libXcomposite-devel

Requires:       gnome-session
Requires:       hicolor-icon-theme

%description
desktop-effects provides a preference dialog to allow switching the GNOME
desktop between three different window managers: Metacity (the standard
GNOME 2 window manager), Compiz (offering 3D acceleration and special
effects), and GNOME Shell, which offers a preview of the GNOME 3 user
experience.

%prep
%setup -q

%build
%configure

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-validate %{buildroot}%{_datadir}/applications/desktop-effects.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/desktop-effects
%{_datadir}/icons/hicolor/*/apps/desktop-effects.png
%{_datadir}/applications/desktop-effects.desktop
%{_datadir}/desktop-effects/

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ] ; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ] ; then
  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi

%changelog
* Mon Aug 24 2009 Owen Taylor <otaylor at redhat.com> - 0.8.1-1
- Update to 0.8.1 (fixes leftover debugging hack)

* Mon Aug 24 2009 Owen Taylor <otaylor at redhat.com> - 0.8.0-2
- Add dist to release
- BuildRequire intltool and desktop-file-utils
- Point Source: at https://fedorahosted.org/released

* Sun Aug 23 2009 Owen Taylor <otaylor at redhat.com> - 0.8.0-1
- Initial version



--- NEW FILE import.log ---
desktop-effects-0_8_1-1_fc11:HEAD:desktop-effects-0.8.1-1.fc11.src.rpm:1251144932


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:41:35 -0000	1.1
+++ .cvsignore	24 Aug 2009 20:16:52 -0000	1.2
@@ -0,0 +1 @@
+desktop-effects-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/desktop-effects/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:41:35 -0000	1.1
+++ sources	24 Aug 2009 20:16:52 -0000	1.2
@@ -0,0 +1 @@
+6550cc3095f0d14f0bf2a5a1d0df1dc5  desktop-effects-0.8.1.tar.bz2



From myoung at fedoraproject.org  Mon Aug 24 20:17:13 2009
From: myoung at fedoraproject.org (myoung)
Date: Mon, 24 Aug 2009 20:17:13 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7-git1.bz2.sign, NONE,
	1.1.2.2 patch-2.6.31-rc7.bz2.sign, NONE, 1.1.2.2 .cvsignore,
	1.1014.2.26, 1.1014.2.27 config-x86-generic, 1.68.6.18,
	1.68.6.19 kernel.spec, 1.1294.2.55, 1.1294.2.56 sources,
	1.976.2.27, 1.976.2.28 upstream, 1.888.2.26,
	1.888.2.27 xen.pvops.post.patch, 1.1.2.22,
	1.1.2.23 patch-2.6.31-rc6-git6.bz2.sign, 1.1.2.2,
	NONE patch-2.6.31-rc6.bz2.sign, 1.1.2.2, NONE
Message-ID: <20090824201713.0D6A311C0044@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23175

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-x86-generic kernel.spec sources upstream 
	xen.pvops.post.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc7-git1.bz2.sign patch-2.6.31-rc7.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc6-git6.bz2.sign patch-2.6.31-rc6.bz2.sign 
Log Message:
disable stackprotector for i686 again to get a working pvops build



--- NEW FILE patch-2.6.31-rc7-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKkIi+yGugalF9Dw4RAj3UAJ9ee5o5eKXr4H6lfjpEpm8dL9NkCwCfQkUP
sbX39sJV4yS7tmRYia54GKQ=
=CnYC
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.31-rc7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKj0eHyGugalF9Dw4RAjSmAKCFx5UWyr47ufID24+cAt+aDkzuFQCcChR4
UL+Pz+UF1aRBLquOIQwNjJY=
=OJAQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.26
retrieving revision 1.1014.2.27
diff -u -p -r1.1014.2.26 -r1.1014.2.27
--- .cvsignore	20 Aug 2009 18:50:20 -0000	1.1014.2.26
+++ .cvsignore	24 Aug 2009 20:17:11 -0000	1.1014.2.27
@@ -5,5 +5,5 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git6.bz2
+patch-2.6.31-rc7.bz2
+patch-2.6.31-rc7-git1.bz2


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.18
retrieving revision 1.68.6.19
diff -u -p -r1.68.6.18 -r1.68.6.19
--- config-x86-generic	18 Aug 2009 19:26:45 -0000	1.68.6.18
+++ config-x86-generic	24 Aug 2009 20:17:11 -0000	1.68.6.19
@@ -115,7 +115,7 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR is not set
 
 CONFIG_SECCOMP=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.55
retrieving revision 1.1294.2.56
diff -u -p -r1.1294.2.55 -r1.1294.2.56
--- kernel.spec	20 Aug 2009 18:50:20 -0000	1.1294.2.55
+++ kernel.spec	24 Aug 2009 20:17:11 -0000	1.1294.2.56
@@ -60,9 +60,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 6
+%define rcrev 7
 # The git snapshot level
-%define gitrev 6
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -501,6 +501,10 @@ BuildRequires: elfutils-libelf-devel zli
 BuildRequires: dracut-kernel >= 0.7
 BuildRequires: dracut-generic >= 0.7
 %endif
+# For dracut image generation, cannot go in dracut package as its arch specific
+%ifnarch s390 s390x
+BuildRequires: kbd
+%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -2002,6 +2006,15 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 24 2009 Michael Young <m.a.young at durham.ac.uk>
+- turn off stackprotector on i686 for a clean build
+
+* Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git1
+
+* Sat Aug 22 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7
+
 * Thu Aug 20 2009 Michael Young <m.a.young at durham.ac.uk>
 - test a i686 stackprotector patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.27
retrieving revision 1.976.2.28
diff -u -p -r1.976.2.27 -r1.976.2.28
--- sources	20 Aug 2009 18:50:21 -0000	1.976.2.27
+++ sources	24 Aug 2009 20:17:12 -0000	1.976.2.28
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-056ab6d753725f14d2d44eec2c1f471f  patch-2.6.31-rc6.bz2
-bf8a969c68cb72946782195934e6f183  patch-2.6.31-rc6-git6.bz2
+4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
+22d1b4c17bde1034e332dc2505c9f15a  patch-2.6.31-rc7-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.26
retrieving revision 1.888.2.27
diff -u -p -r1.888.2.26 -r1.888.2.27
--- upstream	20 Aug 2009 18:50:21 -0000	1.888.2.26
+++ upstream	24 Aug 2009 20:17:12 -0000	1.888.2.27
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc6.bz2
-patch-2.6.31-rc6-git6.bz2
+patch-2.6.31-rc7.bz2
+patch-2.6.31-rc7-git1.bz2

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/pci-swiotlb.c         |    5 ++---
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -p -r1.1.2.22 -r1.1.2.23
--- xen.pvops.post.patch	20 Aug 2009 18:50:23 -0000	1.1.2.22
+++ xen.pvops.post.patch	24 Aug 2009 20:17:12 -0000	1.1.2.23
@@ -84,31 +84,3 @@ index 6af96ee..1e66b18 100644
  #endif
  	if (xen_wants_swiotlb())
  		swiotlb = 1;
-diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 2e58099..3ebcbb2 100644
---- a/arch/x86/xen/enlighten.c
-+++ b/arch/x86/xen/enlighten.c
-@@ -51,6 +51,7 @@
- #include <asm/pgtable.h>
- #include <asm/tlbflush.h>
- #include <asm/reboot.h>
-+#include <asm/stackprotector.h>
- 
- #include "xen-ops.h"
- #include "mmu.h"
-@@ -1013,13 +1014,8 @@ asmlinkage void __init xen_start_kernel(void)
- 	pv_apic_ops = xen_apic_ops;
- 	pv_mmu_ops = xen_mmu_ops;
- 
--#ifdef CONFIG_X86_64
--	/*
--	 * Setup percpu state.  We only need to do this for 64-bit
--	 * because 32-bit already has %fs set properly.
--	 */
--	load_percpu_segment(0);
--#endif
-+	setup_stack_canary_segment(0);
-+	switch_to_new_gdt(0);
- 
- 	xen_init_irq_ops();
- 	xen_init_cpuid_mask();


--- patch-2.6.31-rc6-git6.bz2.sign DELETED ---


--- patch-2.6.31-rc6.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Mon Aug 24 20:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 20:37:37 +0000
Subject: [pkgdb] libertas-usb8388-firmware ownership updated
Message-ID: <20090824203737.461E110F877@bastion2.fedora.phx.redhat.com>

Package libertas-usb8388-firmware in Fedora devel is now owned by linville

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libertas-usb8388-firmware



From cebbert at fedoraproject.org  Mon Aug 24 20:39:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 24 Aug 2009 20:39:12 +0000 (UTC)
Subject: rpms/kernel/F-11 mm_for_maps-shift-down_read-to-the-caller.patch,
	NONE, 
	1.1.2.1 mm_for_maps-simplify-use-ptrace_may_access.patch, NONE,
	1.1.2.1
	mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1679.2.15, 1.1679.2.16
Message-ID: <20090824203912.E4B7F11C0044@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28629

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	mm_for_maps-shift-down_read-to-the-caller.patch 
	mm_for_maps-simplify-use-ptrace_may_access.patch 
	mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch 
Log Message:
Fix CVE-2009-2691: local information disclosure in /proc

mm_for_maps-shift-down_read-to-the-caller.patch:
 base.c       |    8 +++-----
 task_mmu.c   |    1 +
 task_nommu.c |    1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mm_for_maps-shift-down_read-to-the-caller.patch ---
>From 00f89d218523b9bf6b522349c039d5ac80aa536d Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 10 Jul 2009 03:27:38 +0200
Subject: mm_for_maps: shift down_read(mmap_sem) to the caller

From: Oleg Nesterov <oleg at redhat.com>

commit 00f89d218523b9bf6b522349c039d5ac80aa536d upstream.

mm_for_maps() takes ->mmap_sem after security checks, this looks
strange and obfuscates the locking rules. Move this lock to its
single caller, m_start().

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: James Morris <jmorris at namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/proc/base.c       |    8 +++-----
 fs/proc/task_mmu.c   |    1 +
 fs/proc/task_nommu.c |    1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -235,9 +235,8 @@ static int check_mem_permission(struct t
 struct mm_struct *mm_for_maps(struct task_struct *task)
 {
 	struct mm_struct *mm = get_task_mm(task);
-	if (!mm)
-		return NULL;
-	if (mm != current->mm) {
+
+	if (mm && mm != current->mm) {
 		/*
 		 * task->mm can be changed before security check,
 		 * in that case we must notice the change after.
@@ -245,10 +244,9 @@ struct mm_struct *mm_for_maps(struct tas
 		if (!ptrace_may_access(task, PTRACE_MODE_READ) ||
 		    mm != task->mm) {
 			mmput(mm);
-			return NULL;
+			mm = NULL;
 		}
 	}
-	down_read(&mm->mmap_sem);
 	return mm;
 }
 
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -119,6 +119,7 @@ static void *m_start(struct seq_file *m,
 	mm = mm_for_maps(priv->task);
 	if (!mm)
 		return NULL;
+	down_read(&mm->mmap_sem);
 
 	tail_vma = get_gate_vma(priv->task);
 	priv->tail_vma = tail_vma;
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -189,6 +189,7 @@ static void *m_start(struct seq_file *m,
 		priv->task = NULL;
 		return NULL;
 	}
+	down_read(&mm->mmap_sem);
 
 	/* start from the Nth VMA */
 	for (p = rb_first(&mm->mm_rb); p; p = rb_next(p))

mm_for_maps-simplify-use-ptrace_may_access.patch:
 base.c |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE mm_for_maps-simplify-use-ptrace_may_access.patch ---
>From 13f0feafa6b8aead57a2a328e2fca6a5828bf286 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg at redhat.com>
Date: Tue, 23 Jun 2009 21:25:32 +0200
Subject: mm_for_maps: simplify, use ptrace_may_access()

From: Oleg Nesterov <oleg at redhat.com>

commit 13f0feafa6b8aead57a2a328e2fca6a5828bf286 upstream.

It would be nice to kill __ptrace_may_access(). It requires task_lock(),
but this lock is only needed to read mm->flags in the middle.

Convert mm_for_maps() to use ptrace_may_access(), this also simplifies
the code a little bit.

Also, we do not need to take ->mmap_sem in advance. In fact I think
mm_for_maps() should not play with ->mmap_sem at all, the caller should
take this lock.

With or without this patch, without ->cred_guard_mutex held we can race
with exec() and get the new ->mm but check old creds.

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Reviewed-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: James Morris <jmorris at namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/proc/base.c |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -237,20 +237,19 @@ struct mm_struct *mm_for_maps(struct tas
 	struct mm_struct *mm = get_task_mm(task);
 	if (!mm)
 		return NULL;
+	if (mm != current->mm) {
+		/*
+		 * task->mm can be changed before security check,
+		 * in that case we must notice the change after.
+		 */
+		if (!ptrace_may_access(task, PTRACE_MODE_READ) ||
+		    mm != task->mm) {
+			mmput(mm);
+			return NULL;
+		}
+	}
 	down_read(&mm->mmap_sem);
-	task_lock(task);
-	if (task->mm != mm)
-		goto out;
-	if (task->mm != current->mm &&
-	    __ptrace_may_access(task, PTRACE_MODE_READ) < 0)
-		goto out;
-	task_unlock(task);
 	return mm;
-out:
-	task_unlock(task);
-	up_read(&mm->mmap_sem);
-	mmput(mm);
-	return NULL;
 }
 
 static int proc_pid_cmdline(struct task_struct *task, char * buffer)

mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch:
 base.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch ---
>From 704b836cbf19e885f8366bccb2e4b0474346c02d Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg at redhat.com>
Date: Fri, 10 Jul 2009 03:27:40 +0200
Subject: mm_for_maps: take ->cred_guard_mutex to fix the race with exec

From: Oleg Nesterov <oleg at redhat.com>

commit 704b836cbf19e885f8366bccb2e4b0474346c02d upstream.

The problem is minor, but without ->cred_guard_mutex held we can race
with exec() and get the new ->mm but check old creds.

Now we do not need to re-check task->mm after ptrace_may_access(), it
can't be changed to the new mm under us.

Strictly speaking, this also fixes another very minor problem. Unless
security check fails or the task exits mm_for_maps() should never
return NULL, the caller should get either old or new ->mm.

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: James Morris <jmorris at namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/proc/base.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -234,19 +234,19 @@ static int check_mem_permission(struct t
 
 struct mm_struct *mm_for_maps(struct task_struct *task)
 {
-	struct mm_struct *mm = get_task_mm(task);
+	struct mm_struct *mm;
 
-	if (mm && mm != current->mm) {
-		/*
-		 * task->mm can be changed before security check,
-		 * in that case we must notice the change after.
-		 */
-		if (!ptrace_may_access(task, PTRACE_MODE_READ) ||
-		    mm != task->mm) {
-			mmput(mm);
-			mm = NULL;
-		}
+	if (mutex_lock_killable(&task->cred_exec_mutex))
+		return NULL;
+
+	mm = get_task_mm(task);
+	if (mm && mm != current->mm &&
+			!ptrace_may_access(task, PTRACE_MODE_READ)) {
+		mmput(mm);
+		mm = NULL;
 	}
+	mutex_unlock(&task->cred_exec_mutex);
+
 	return mm;
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.15
retrieving revision 1.1679.2.16
diff -u -p -r1.1679.2.15 -r1.1679.2.16
--- kernel.spec	21 Aug 2009 09:50:36 -0000	1.1679.2.15
+++ kernel.spec	24 Aug 2009 20:39:12 -0000	1.1679.2.16
@@ -832,7 +832,13 @@ Patch12030: md-avoid-dereferencing-NULL-
 # CVE-2009-2847
 Patch12040: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
+# CVE-2009-2691
+Patch12050: mm_for_maps-simplify-use-ptrace_may_access.patch
+Patch12060: mm_for_maps-shift-down_read-to-the-caller.patch
+Patch12070: mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch
+
 # make gcc stop optimizing away null pointer tests
+# (fixes similar bugs to CVE-2009-1897)
 Patch13000: add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
 %endif
@@ -1564,6 +1570,11 @@ ApplyPatch md-avoid-dereferencing-NULL-p
 # CVE-2009-2847
 ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
+# CVE-2009-2691
+ApplyPatch mm_for_maps-simplify-use-ptrace_may_access.patch
+ApplyPatch mm_for_maps-shift-down_read-to-the-caller.patch
+ApplyPatch mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch
+
 # don't optimize out null pointer tests
 ApplyPatch add-fno-delete-null-pointer-checks-to-gcc-cflags.patch
 
@@ -2167,6 +2178,9 @@ fi
 # and build.
 
 %changelog
+* Mon Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-217.2.16
+- Fix CVE-2009-2691: local information disclosure in /proc
+
 * Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Fix b43 on iMac G5 (#514787)
 



From iarnell at fedoraproject.org  Mon Aug 24 20:40:37 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon, 24 Aug 2009 20:40:37 +0000 (UTC)
Subject: rpms/grfcodec/devel compile.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 fedora-build.patch, 1.1, 1.2 grfcodec.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090824204037.EFABC11C0426@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/grfcodec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28916

Modified Files:
	.cvsignore fedora-build.patch grfcodec.spec sources 
Added Files:
	compile.patch 
Log Message:
* Mon Aug 24 2009 Iain Arnell <iarnell at gmail.com> 0.9.11-0.4.r2177
- update to current svn revision to remove "status updates"


compile.patch:
 getopt.c    |    4 ++--
 grfdiff.cc  |    4 ++--
 readinfo.cc |    1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE compile.patch ---
diff -up grfcodec/getopt.c.orig grfcodec/getopt.c
--- grfcodec/getopt.c.orig	2006-09-06 00:22:55.000000000 +0200
+++ grfcodec/getopt.c	2009-08-24 17:46:44.000000000 +0200
@@ -157,7 +157,7 @@ static enum
 
 char *getenv ();
 
-static char *my_index (const char *string, int chr)
+static const char *my_index (const char *string, int chr)
 {
   while (*string)
     {
@@ -520,7 +520,7 @@ int _getopt_internal (int argc, char *co
 
   {
     char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    const char *temp = my_index (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
     if (*nextchar == '\0')
diff -up grfcodec/grfdiff.cc.orig grfcodec/grfdiff.cc
--- grfcodec/grfdiff.cc.orig	2009-07-25 20:58:43.000000000 +0200
+++ grfcodec/grfdiff.cc	2009-08-24 17:47:56.000000000 +0200
@@ -253,7 +253,7 @@ void grfstore::getorgdata(U16 *size, U8 
 	fseek(grf, fpos_cur, SEEK_SET);
 }
 
-char *basename(const char *filename)
+char *grfbasename(const char *filename)
 {
 	static char bname[32];
 	fnsplit(filename, NULL, NULL, bname, NULL);
@@ -389,7 +389,7 @@ int mkdiff()
 	}
 
 	if (grd) {
-		char *noext = basename(grffile[1]);
+		char *noext = grfbasename(grffile[1]);
 		char *p;
 
 		for (p = noext; *p; p++) { *p = tolower(*p); }
diff -up grfcodec/readinfo.cc.orig grfcodec/readinfo.cc
--- grfcodec/readinfo.cc.orig	2009-08-03 21:49:30.000000000 +0200
+++ grfcodec/readinfo.cc	2009-08-24 17:47:25.000000000 +0200
@@ -39,6 +39,7 @@ Version 7: Add backslash escapes
 #include<string>
 #include<sstream>
 #include<iomanip>
+#include<cstdio>
 
 using namespace std;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 May 2009 03:17:43 -0000	1.2
+++ .cvsignore	24 Aug 2009 20:40:37 -0000	1.3
@@ -1 +1 @@
-grfcodec-r2111.tar.gz
+grfcodec-r2177.tar.gz

fedora-build.patch:
 Makefile        |    6 +++---
 Makefile.common |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: fedora-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/fedora-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fedora-build.patch	7 May 2009 03:17:43 -0000	1.1
+++ fedora-build.patch	24 Aug 2009 20:40:37 -0000	1.2
@@ -1,46 +1,7 @@
-diff -up grfcodec/getopt.c.fedora grfcodec/getopt.c
---- grfcodec/getopt.c.fedora	2006-09-06 00:22:55.000000000 +0200
-+++ grfcodec/getopt.c	2009-05-03 17:10:43.000000000 +0200
-@@ -157,7 +157,7 @@ static enum
- 
- char *getenv ();
- 
--static char *my_index (const char *string, int chr)
-+static const char *my_index (const char *string, int chr)
- {
-   while (*string)
-     {
-@@ -520,7 +520,7 @@ int _getopt_internal (int argc, char *co
- 
-   {
-     char c = *nextchar++;
--    char *temp = my_index (optstring, c);
-+    const char *temp = my_index (optstring, c);
- 
-     /* Increment `optind' when we start to process its last character.  */
-     if (*nextchar == '\0')
-diff -up /dev/null grfcodec/grfmrgc.S
---- /dev/null	2009-04-28 11:20:28.402126054 +0200
-+++ grfcodec/grfmrgc.S	2009-05-03 17:10:43.000000000 +0200
-@@ -0,0 +1,14 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+.section .data
-+.global _grfmrg,_grfmrgsize,grfmrg,grfmrgsize
-+
-+	.align 4
-+grfmrgsize:
-+_grfmrgsize: .int _grfmrg_end-_grfmrg
-+
-+grfmrg:
-+_grfmrg:	.incbin "grfmrgc.bin"
-+_grfmrg_end:
-diff -up grfcodec/Makefile.common.fedora grfcodec/Makefile.common
---- grfcodec/Makefile.common.fedora	2006-09-06 18:55:55.000000000 +0200
-+++ grfcodec/Makefile.common	2009-05-03 17:10:43.000000000 +0200
-@@ -7,14 +7,14 @@ FORCE:
+diff -up grfcodec/Makefile.common.orig grfcodec/Makefile.common
+--- grfcodec/Makefile.common.orig	2009-07-25 20:58:43.000000000 +0200
++++ grfcodec/Makefile.common	2009-08-24 17:54:59.000000000 +0200
+@@ -7,7 +7,7 @@ FORCE:
  	$(_C)make -f $(MAKEFILE) $(_S) $(@:%_r=%)
  	$(_E) [STRIP/UPX] $(@:%_r=%)
  	$(_C)strip  $(@:%_r=%)$(REL_EXE)
@@ -49,84 +10,42 @@ diff -up grfcodec/Makefile.common.fedora
  
  release: grfcodec_r grfdiff_r grfmerge_r
  
- # grfmrg.bin (the binary code included in grfdiff) can be either BCC or GCC code
- grfmrg.bin:	grfmerge.exe
- 	$(_E) [UPX] $@
--	$(_C)upx $(_Q) --best $< -o $@
-+	$(_C)upx $(_Q) --best $< -o $@ ||:
- 
- # make grfmerge.exe (as grfmrgc.bin) optimized for size instead of speed
- grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%.c=%.os)
-@@ -23,7 +23,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%
+@@ -18,7 +18,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%
  	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
  	$(_E) [STRIP/UPX] $@
  	$(_C)strip $@
 -	$(_C)upx $(_Q) --best $@
 +	$(_C)upx $(_Q) --best $@ ||:
  
- # making an assembly file which includes the above code; first for BCC
- grfmrg.ah:	grfmrg.bin 
-@@ -36,9 +36,9 @@ grfmrg.obj:	grfmrg.asm grfmrg.ah
- 	$(_C)tasm32 /dM32 /ml $< -c -o $@
- 
- # and then for GCC
--grfmrg.o:	grfmrgc.asm grfmrgc.bin
--	$(_E) [NASM] $@
--	$(_C)nasm -f $(NASMFORMAT) $< -o $@
-+grfmrg.o:	grfmrgc.S grfmrgc.bin
-+	$(_E) [AS] $@
-+	$(_C)as $< -o $@
- 
- ttdpal.h:	$(PAL_FILES) pal2c.pl
+ grfmrg.c:	grfmrgc.bin grfmrgc.pl
  	$(_E) [PERL] $@
-@@ -49,15 +49,15 @@ ttdpal.h:	$(PAL_FILES) pal2c.pl
- readinfo.o: readinfo.cc
- 	$(_E) [CPP] $@
- 	$(BOOST_WARN)	
--	$(_C)$(CXX) -c -o $@ -MMD -MG -MF $@.d $(CXXFLAGS) $<
-+	$(_C)$(CXX) -c -o $@ -MMD -MF $@.d $(CXXFLAGS) $<
- 
- %.o : %.c
- 	$(_E) [CC] $@
--	$(_C)$(CC) -c -o $@ -MMD -MG -MF $@.d $(CFLAGS) $<
-+	$(_C)$(CC) -c -o $@ -MMD -MF $@.d $(CFLAGS) $<
- 
- %.o : %.cc
- 	$(_E) [CPP] $@
--	$(_C)$(CXX) -c -o $@ -MMD -MG -MF $@.d $(CXXFLAGS) $<
-+	$(_C)$(CXX) -c -o $@ -MMD -MF $@.d $(CXXFLAGS) $<
- 
- % : %.o
- 	$(_E) [LD] $@
-@@ -76,7 +76,7 @@ readinfo.o: readinfo.cc
- # same as above but optimized for size not speed
- %.os : %.c
- 	$(_E) [CC] $@
--	$(_C)$(CC) -c -o $@ -MD -MG -MF $@.d $(CFLAGS) -Os $<
-+	$(_C)$(CC) -c -o $@ -MD -MF $@.d $(CFLAGS) -Os $<
- 
- % :: %.os
- 	$(_E) [LD] $@
-diff -up grfcodec/Makefile.fedora grfcodec/Makefile
---- grfcodec/Makefile.fedora	2009-05-03 17:12:30.000000000 +0200
-+++ grfcodec/Makefile	2009-05-03 17:12:45.000000000 +0200
-@@ -22,7 +22,7 @@ CXX = g++
+diff -up grfcodec/Makefile.orig grfcodec/Makefile
+--- grfcodec/Makefile.orig	2009-08-04 03:19:35.000000000 +0200
++++ grfcodec/Makefile	2009-08-24 17:54:47.000000000 +0200
+@@ -68,7 +68,7 @@ endif
+ endif
+ 
  # use 386 instructions but optimize for pentium II/III
- #CFLAGS = -g -DWIN32 -O3 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
- #CFLAGS = -g -DGCC64 -O3 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
--CFLAGS = -g -DGCC32 -O3 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
-+CFLAGS = -g -DGCC32 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
- CXXFLAGS = $(CFLAGS)
- #LDOPT = -g -Wl,--subsystem,console -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32
- #LDOPT = -Wl,--subsystem,console,-s
-diff -up grfcodec/readinfo.cc.fedora grfcodec/readinfo.cc
---- grfcodec/readinfo.cc.fedora	2009-04-28 21:17:02.000000000 +0200
-+++ grfcodec/readinfo.cc	2009-05-03 17:10:43.000000000 +0200
-@@ -39,6 +39,7 @@ Version 7: Add backslash escapes
- #include<string>
- #include<sstream>
- #include<iomanip>
-+#include<cstdio>
+-CFLAGS = -g -D$(TYPESIZE) -O3 -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
++CFLAGS = -g -D$(TYPESIZE) -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
+ 
+ ifeq ($(DEBUG),1)
+ CFLAGS += -DDEBUG
+@@ -221,7 +221,7 @@ FORCE:
+ 	$(_C)$(MAKE) ${_S} $(@:%_r=%)
+ 	$(_E) [STRIP/UPX] $(@:%_r=%)
+ 	$(_C)$(STRIP)  $(@:%_r=%)
+-	$(_C)upx $(_Q) --best  $(@:%_r=%)
++	$(_C)upx $(_Q) --best  $(@:%_r=%) ||:
+ 
+ release: $(GRFCODEC)_r $(GRFDIFF)_r $(GRFMERGE)_r
  
- using namespace std;
+@@ -232,7 +232,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%
+ 	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
+ 	$(_E) [STRIP/UPX] $@
+ 	$(_C)$(STRIP) $@
+-	$(_C)upx $(_Q) --best $@
++	$(_C)upx $(_Q) --best $@ ||:
  
+ grfmrg.c:	grfmrgc.bin grfmrgc.pl
+ 	$(_E) [PERL] $@


Index: grfcodec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/grfcodec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- grfcodec.spec	25 Jul 2009 01:27:09 -0000	1.2
+++ grfcodec.spec	24 Aug 2009 20:40:37 -0000	1.3
@@ -1,16 +1,17 @@
 Name:           grfcodec
 Version:        0.9.11
-Release:        0.3.r2111%{?dist}
+Release:        0.4.r2177%{?dist}
 Summary:        A suite of programs to modify Transport Tycoon Deluxe's GRF files
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.ttdpatch.net/grfcodec/
-# svn export -r2111 svn://svn.ttdpatch.net/misc/grfcodec
-# tar -czf grfcodec-r2111.tar.gz grfcodec
-Source0:        grfcodec-r2111.tar.gz
-# use gas, not nasm; fix build problems with gcc4.4; ignore upx failures; don't
-# pass -O3 to gcc
+# svn export -r2177 svn://svn.ttdpatch.net/misc/grfcodec
+# tar -czf grfcodec-r2177.tar.gz grfcodec
+Source0:        grfcodec-r2177.tar.gz
+# ignore upx failures; don't pass -O3 to gcc
 Patch0:         fedora-build.patch
+# fix build problems
+Patch1:         compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -24,6 +25,7 @@ A suite of programs to modify Transport 
 %prep
 %setup -q -n %{name}
 %patch0 -p 1 -b .fedora
+%patch1 -p 1 -b .compile
 
 for f in *.txt; do
   iconv -f iso8859-1 -t utf-8 $f >$f.conv 
@@ -54,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 24 2009 Iain Arnell <iarnell at gmail.com> 0.9.11-0.4.r2177
+- update to current svn revision to remove "status updates"
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.11-0.3.r2111
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 May 2009 03:17:43 -0000	1.2
+++ sources	24 Aug 2009 20:40:37 -0000	1.3
@@ -1 +1 @@
-16286f814fb0cbbb24ed0253a98c0ab0  grfcodec-r2111.tar.gz
+a55bb56ed594f6ed4fe8a7717d8bc5c7  grfcodec-r2177.tar.gz



From drago01 at fedoraproject.org  Mon Aug 24 20:40:41 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 20:40:41 +0000 (UTC)
Subject: rpms/compiz/devel .cvsignore, 1.41, 1.42 compiz.spec, 1.178,
	1.179 sources, 1.46,
	1.47 desktop-effects-0.7.17-wall-plugin.patch, 1.1,
	NONE desktop-effects-linguas.patch, 1.2, NONE
Message-ID: <20090824204041.86BCC11C0426@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28933

Modified Files:
	.cvsignore compiz.spec sources 
Removed Files:
	desktop-effects-0.7.17-wall-plugin.patch 
	desktop-effects-linguas.patch 
Log Message:
use separte desktop-effects package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	25 May 2009 19:46:42 -0000	1.41
+++ .cvsignore	24 Aug 2009 20:40:40 -0000	1.42
@@ -1 +1,2 @@
 compiz-0.8.2.tar.bz2
+kde-desktop-effects-0.0.6.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- compiz.spec	22 Aug 2009 15:30:54 -0000	1.178
+++ compiz.spec	24 Aug 2009 20:40:40 -0000	1.179
@@ -1,5 +1,4 @@
-%define		dialogversion	0.7.18
-%define 	kde_dialogversion 0.0.5
+%define 	kde_dialogversion 0.0.6
 
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall
 
@@ -46,26 +45,21 @@ BuildRequires:  fuse-devel
 BuildRequires:	cairo-devel
 BuildRequires:	libtool
 
-Source0:       http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
-Source1:	desktop-effects-%{dialogversion}.tar.bz2
-Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
-Source3:        compiz-gtk
-Source4:        compiz-gtk.desktop
+Source0:	http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
+Source1:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
+Source2:        compiz-gtk
+Source3:        compiz-gtk.desktop
 
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
 
-
 # Patches that are not upstream
-Patch102: desktop-effects-0.7.17-wall-plugin.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
 Patch107: compiz-0.8.2-wall.patch
 Patch108: compiz-pageflip.patch
 #Patch110: scale-key.patch
-# update translations in desktop-effects
-Patch115: desktop-effects-linguas.patch
 
 # Make sure configuration plugins never get unloaded
 Patch123: compiz-0.8.2-pin-initial-plugins.patch
@@ -103,9 +97,7 @@ windows and compositing manager.
 %package gnome
 Summary: Compiz gnome integration bits
 Group: User Interface/Desktops
-Requires: gnome-session >= 2.19.6-5
-Requires: metacity >= 2.18
-Requires: libwnck >= 2.15.4
+Requires: desktop-effects
 Requires: %{name} = %{version}
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -131,15 +123,9 @@ and other kde integration related stuff.
 
 
 %prep
-%setup -q -T -b1 -n desktop-effects-%{dialogversion}
-%setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
+%setup -q -T -b1 -n kde-desktop-effects-%{kde_dialogversion}
 %setup -q
 
-pushd ../desktop-effects-%{dialogversion}
-%patch102 -p1 -b .wall-plugin
-%patch115 -p1 -b .linguas
-popd
-
 %patch103 -p1 -b .composite-cube-logo
 %if 0%{?fedora}
 %patch105 -p1 -b .fedora-logo
@@ -183,11 +169,6 @@ automake
 
 make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
 
-# desktop-effects
-cd ../desktop-effects-%{dialogversion}
-%configure
-make %{?_smp_mflags}
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -195,19 +176,11 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INS
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-echo INSTALLING DESKTOP EFFECTS
-pushd ../desktop-effects-%{dialogversion}
-make DESTDIR=$RPM_BUILD_ROOT install || exit 1
-desktop-file-install --vendor redhat --delete-original    \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
-popd
-
-install %SOURCE3 $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
 
 desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE4
+  %SOURCE3
 
 # kde-desktop-effects
 echo INSTALLING KDE DESKTOP EFFECTS
@@ -219,7 +192,7 @@ cp -a ChangeLog COPYING README $RPM_BUIL
 iconlist="16 24 32 36 48 96"
 for i in $iconlist; do
  mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/
- cp -p ../desktop-effects-%{dialogversion}/desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
+ cp -p desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
 done
 
 desktop-file-install --vendor=""              \
@@ -264,11 +237,6 @@ for p in %{core_plugins} %{gnome_plugins
 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
-
 
 %pre gnome
 if [ "$1" -gt 1 ]; then
@@ -293,13 +261,6 @@ if [ "$1" -eq 0 ]; then
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
 fi
 
-%postun gnome
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
-
-
 
 %post kde
 update-desktop-database -q %{_datadir}/applications/kde
@@ -328,7 +289,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_bindir}/compiz-gtk
 %{_bindir}/gtk-window-decorator
-%{_bindir}/desktop-effects
 %{_libdir}/window-manager-settings/libcompiz.so
 %{_datadir}/gnome/wm-properties/compiz-wm.desktop
 %{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
@@ -336,13 +296,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/compiz/desktop-effects.glade
 %{_datadir}/applications/compiz-gtk.desktop
 %exclude %{_datadir}/applications/compiz.desktop
-%{_datadir}/applications/redhat-desktop-effects.desktop
-%{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
-%{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
-%{_datadir}/icons/hicolor/32x32/apps/desktop-effects.png
-%{_datadir}/icons/hicolor/36x36/apps/desktop-effects.png
-%{_datadir}/icons/hicolor/48x48/apps/desktop-effects.png
-%{_datadir}/icons/hicolor/96x96/apps/desktop-effects.png
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 
@@ -368,6 +321,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-13
+- Drop desktop-effects
+- Make compiz-gnome require desktop-effects
+- Drop now redundant requires
+- Update kde desktop effects to 0.0.6 (includes its own icon)
+
 * Sat Aug 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-12
 - Fix build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	25 May 2009 19:46:42 -0000	1.46
+++ sources	24 Aug 2009 20:40:41 -0000	1.47
@@ -1,4 +1,2 @@
-d56f2f6456fc89b06e1e0d21cab74f55  desktop-effects-0.7.18.tar.bz2
-7a7766f43797239ca0a4a0881d91f646  kde-desktop-effects-0.0.5.tar.bz2
-892ce372ff673202db52034a0473f262  glx_tfp_test.c
 c161975eb0fe8deac7be8d99408a80fc  compiz-0.8.2.tar.bz2
+e40e51ba5837a11bea58231b6ae49611  kde-desktop-effects-0.0.6.tar.bz2


--- desktop-effects-0.7.17-wall-plugin.patch DELETED ---


--- desktop-effects-linguas.patch DELETED ---



From drago01 at fedoraproject.org  Mon Aug 24 20:42:45 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 20:42:45 +0000 (UTC)
Subject: rpms/compiz/devel compiz.spec,1.179,1.180
Message-ID: <20090824204245.903ED11C0044@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29476

Modified Files:
	compiz.spec 
Log Message:
bump release


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- compiz.spec	24 Aug 2009 20:40:40 -0000	1.179
+++ compiz.spec	24 Aug 2009 20:42:45 -0000	1.180
@@ -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:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From katzj at fedoraproject.org  Mon Aug 24 20:43:19 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Mon, 24 Aug 2009 20:43:19 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.21, 1.22 livecd-tools.spec,
	1.28, 1.29 sources, 1.22, 1.23
Message-ID: <20090824204319.E6AE811C0044@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29698

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
* Mon Aug 24 2009 Jeremy Katz <katzj at redhat.com> - 026-1
- More resize2fs -M usage
- Work with dracut-based initramfs
- Some error handling updates



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	30 Jul 2009 20:47:06 -0000	1.21
+++ .cvsignore	24 Aug 2009 20:43:19 -0000	1.22
@@ -1 +1 @@
-livecd-tools-025.tar.bz2
+livecd-tools-026.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- livecd-tools.spec	30 Jul 2009 20:47:06 -0000	1.28
+++ livecd-tools.spec	24 Aug 2009 20:43:19 -0000	1.29
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 025
+Version: 026
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -81,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Mon Aug 24 2009 Jeremy Katz <katzj at redhat.com> - 026-1
+- More resize2fs -M usage
+- Work with dracut-based initramfs
+- Some error handling updates
+
 * Thu Jul 30 2009 Jeremy Katz <katzj at redhat.com> - 025-1
 - Bind mount /dev/shm also (#502921)
 - Update man pages (Michel Duquaine, #505742)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	30 Jul 2009 20:47:06 -0000	1.22
+++ sources	24 Aug 2009 20:43:19 -0000	1.23
@@ -1 +1 @@
-5f66482e1143c3717b356df0ec61b864  livecd-tools-025.tar.bz2
+1318d7c6e255b6825a262a662d5d6f22  livecd-tools-026.tar.bz2



From pghmcfc at fedoraproject.org  Mon Aug 24 20:49:02 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon, 24 Aug 2009 20:49:02 +0000 (UTC)
Subject: rpms/perl-Jcode/devel .cvsignore, 1.5, 1.6 perl-Jcode.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <20090824204902.CAA9A11C0044@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Jcode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31326

Modified Files:
	.cvsignore perl-Jcode.spec sources 
Log Message:
- Update to 2.07 (fix mime_encode, CPAN RT#29049)
- Run test suite in "C" locale to support build on old distributions
- Fix argument order for find with -depth
- Encode manpages in UTF-8
- Include old Changes file too
- Mark POD file as %doc
- Add explicit perl(MIME::Base64) dependency for MIME header support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jcode/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Aug 2006 16:00:39 -0000	1.5
+++ .cvsignore	24 Aug 2009 20:49:02 -0000	1.6
@@ -1 +1 @@
-Jcode-2.06.tar.gz
+Jcode-2.07.tar.gz


Index: perl-Jcode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jcode/devel/perl-Jcode.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-Jcode.spec	26 Jul 2009 08:51:53 -0000	1.19
+++ perl-Jcode.spec	24 Aug 2009 20:49:02 -0000	1.20
@@ -1,56 +1,65 @@
-Name:           perl-Jcode
-Version:        2.06
-Release:        9%{?dist}
-
-Summary:        Perl extension interface for converting Japanese text
-
-License:        GPL+ or Artistic
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/Jcode/
-Source0:        http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-2.06.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:      noarch
-BuildRequires:  perl-devel >= 3:5.8.1, perl-Test-Simple
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:		perl-Jcode
+Version:	2.07
+Release:	1%{?dist}
+Summary:	Perl extension interface for converting Japanese text
+License:	GPL+ or Artistic
+Group:		Development/Libraries
+URL:		http://search.cpan.org/dist/Jcode/
+Source0:	http://www.cpan.org/authors/id/D/DA/DANKOGAI/Jcode-%{version}.tar.gz
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	perl(ExtUtils::MakeMaker), perl(MIME::Base64), perl(Test::More)
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:	perl(MIME::Base64)
 
 %description
 %{summary}.
 
-
 %prep
 %setup -q -n Jcode-%{version}
 
+# Fix character encoding of pod file
+%{__mv} Jcode/Nihongo.pod Jcode/Nihongo.pod.euc-jp
+%{__sed} -e 's/^=encoding euc-jp/=encoding utf8/' Jcode/Nihongo.pod.euc-jp |
+	/usr/bin/iconv -f euc-jp -t utf-8 -o Jcode/Nihongo.pod
+%{__rm} Jcode/Nihongo.pod.euc-jp
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}
 
 %check
-make test
-
+LC_ALL=C %{__make} test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
-%{perl_vendorlib}/Jcode*
-%{_mandir}/man3/*.3*
-
+%doc Changes* README
+%{perl_vendorlib}/Jcode.pm
+%dir %{perl_vendorlib}/Jcode/
+%doc %{perl_vendorlib}/Jcode/Nihongo.pod
+%{_mandir}/man3/Jcode.3pm*
+%{_mandir}/man3/Jcode::Nihongo.3pm*
 
 %changelog
+* Mon Aug 24 2009 Paul Howarth <paul at city-fan.org> - 2.07-1
+- Update to 2.07 (fix mime_encode, CPAN RT#29049)
+- Run test suite in "C" locale to support build on old distributions
+- Fix argument order for find with -depth
+- Encode manpages in UTF-8
+- Include old Changes file too
+- Mark POD file as %%doc
+- Add explicit perl(MIME::Base64) dependency for MIME header support
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.06-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Jcode/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Aug 2006 16:00:39 -0000	1.5
+++ sources	24 Aug 2009 20:49:02 -0000	1.6
@@ -1 +1 @@
-56d787a94cbb557d8b21d10972befd94  Jcode-2.06.tar.gz
+f6c52253ff69a44c38a9183c469f6eb0  Jcode-2.07.tar.gz



From uwog at fedoraproject.org  Mon Aug 24 20:49:20 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 24 Aug 2009 20:49:20 +0000 (UTC)
Subject: rpms/abiword/devel abiword.spec,1.93,1.94
Message-ID: <20090824204920.37B6D11C0044@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31475

Modified Files:
	abiword.spec 
Log Message:
Make abiword actually depend on libabiword.




Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- abiword.spec	23 Aug 2009 21:40:45 -0000	1.93
+++ abiword.spec	24 Aug 2009 20:49:20 -0000	1.94
@@ -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+
@@ -18,6 +18,7 @@ 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,
@@ -178,6 +179,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Aug 24 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.9-2
+- Make abiword depend on libabiword
+
 * Sun Aug 23 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.9-1
 - New upstream version
 



From salimma at fedoraproject.org  Mon Aug 24 20:49:30 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 24 Aug 2009 20:49:30 +0000 (UTC)
Subject: rpms/vala/F-11 .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 vala.spec,
	1.39, 1.40
Message-ID: <20090824204930.8182411C0044@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31638/F-11

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
Build vala 0.7.5 for F-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	7 Jul 2009 19:31:09 -0000	1.22
+++ .cvsignore	24 Aug 2009 20:49:30 -0000	1.23
@@ -1 +1 @@
-vala-0.7.4.tar.bz2
+vala-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	7 Jul 2009 19:31:09 -0000	1.22
+++ sources	24 Aug 2009 20:49:30 -0000	1.23
@@ -1 +1 @@
-c2bd7765e49e9c1b5fddc9e0aa69a927  vala-0.7.4.tar.bz2
+a102d582b2ac75b6bcdc5785683263fc  vala-0.7.5.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-11/vala.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- vala.spec	14 Jul 2009 08:22:25 -0000	1.39
+++ vala.spec	24 Aug 2009 20:49:30 -0000	1.40
@@ -14,8 +14,8 @@
 %endif
 
 Name:           vala
-Version:        0.7.4
-Release:        2%{?dist}
+Version:        0.7.5
+Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -25,8 +25,6 @@ URL:            http://live.gnome.org/Va
 Source0:        http://download.gnome.org/sources/vala/0.7/vala-%{version}.tar.bz2
 Source1:	vala-mode.el
 Source2:	vala-init.el
-# http://bugzilla.gnome.org/show_bug.cgi?id=587444
-Patch0:         vala-0.7.4-moduleinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel flex bison devhelp gecko-libs >= 1.9
@@ -116,7 +114,6 @@ An Emacs mode for editing Vala source co
 
 %prep
 %setup -q
-%patch0 -p1 -b .moduleinit
 
 
 %build
@@ -187,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.5-1
+- Update to 0.7.5
+
 * Tue Jul 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.4-2
 - Patch broken ModuleInit attribute (upstream bug 587444)
 



From xhorak at fedoraproject.org  Mon Aug 24 20:50:18 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 24 Aug 2009 20:50:18 +0000 (UTC)
Subject: rpms/thunderbird/F-10 .cvsignore, 1.24, 1.25 sources, 1.31,
	1.32 thunderbird.spec, 1.124, 1.125
Message-ID: <20090824205018.72EC011C0376@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31970

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
Update to 2.0.0.23


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Mar 2009 15:36:17 -0000	1.24
+++ .cvsignore	24 Aug 2009 20:50:18 -0000	1.25
@@ -1,2 +1,4 @@
 thunderbird-2.0.0.21-source.tar.bz2
 thunderbird-langpacks-2.0.0.21-20090320.tar.bz2
+thunderbird-langpacks-2.0.0.23-20090818.tar.bz2
+thunderbird-2.0.0.23-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	20 Mar 2009 15:36:17 -0000	1.31
+++ sources	24 Aug 2009 20:50:18 -0000	1.32
@@ -1,2 +1,2 @@
-55e24753a7ccf2fbf0272987dd4bb086  thunderbird-2.0.0.21-source.tar.bz2
-d693cb3a9592397fcacca20e4e72bb35  thunderbird-langpacks-2.0.0.21-20090320.tar.bz2
+d145e82960a8498bacefabe6489ae395  thunderbird-2.0.0.23-source.tar.bz2
+01cf1f2d7f3c80552d26695735efbbef  thunderbird-langpacks-2.0.0.23-20090818.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- thunderbird.spec	30 Mar 2009 14:11:54 -0000	1.124
+++ thunderbird.spec	24 Aug 2009 20:50:18 -0000	1.125
@@ -7,8 +7,8 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        2.0.0.21
-Release:        2%{?dist}
+Version:        2.0.0.23
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -18,7 +18,7 @@ Group:          Applications/Internet
 %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20090320.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20090818.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -329,6 +329,9 @@ fi
 #===============================================================================
 
 %changelog
+* Fri Aug 21 2009 Jan Horak <jhorak at redhat.com> - 2.0.0.23-1
+- Update to 2.0.0.23
+
 * Mon Mar 30 2009 Jan Horak <jhorak at redhat.com> - 2.0.0.21-2
 - Fixed open-browser.sh to use xdg-open instead of gnome-open
 



From drago01 at fedoraproject.org  Mon Aug 24 20:53:43 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 20:53:43 +0000 (UTC)
Subject: rpms/compiz/devel compiz.spec,1.180,1.181
Message-ID: <20090824205343.2BCE311C0044@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32703

Modified Files:
	compiz.spec 
Log Message:
fix build


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- compiz.spec	24 Aug 2009 20:42:45 -0000	1.180
+++ compiz.spec	24 Aug 2009 20:53:43 -0000	1.181
@@ -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:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,10 +206,8 @@ find $RPM_BUILD_ROOT -name '*.a' -exec r
 
 
 %find_lang compiz
-%find_lang desktop-effects
 
 cat compiz.lang > core-files.txt
-cat desktop-effects.lang > gnome-files.txt
 
 for f in %{core_plugins}; do
   echo %{_libdir}/compiz/lib$f.so
@@ -321,6 +319,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-14
+- Fix build
+
 * Mon Aug 24 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-13
 - Drop desktop-effects
 - Make compiz-gnome require desktop-effects



From awjb at fedoraproject.org  Mon Aug 24 20:57:26 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 24 Aug 2009 20:57:26 +0000 (UTC)
Subject: rpms/synce-trayicon/F-10 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 synce-trayicon.spec, 1.17, 1.18
Message-ID: <20090824205726.B828711C0044@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-trayicon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv830/F-10

Modified Files:
	.cvsignore sources synce-trayicon.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jun 2008 11:09:15 -0000	1.3
+++ .cvsignore	24 Aug 2009 20:57:26 -0000	1.4
@@ -1 +1 @@
-synce-trayicon-0.11.tar.gz
+synce-trayicon-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jun 2008 11:09:15 -0000	1.3
+++ sources	24 Aug 2009 20:57:26 -0000	1.4
@@ -1 +1 @@
-dc24b3260d25ace872f1f5f8fab87714  synce-trayicon-0.11.tar.gz
+5fa55255a7b202e467441e4cbac8dc89  synce-trayicon-0.14.tar.gz


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-10/synce-trayicon.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- synce-trayicon.spec	6 Sep 2008 19:12:01 -0000	1.17
+++ synce-trayicon.spec	24 Aug 2009 20:57:26 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
-Version:        0.11
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -11,8 +11,9 @@ Source0:        http://dl.sf.net/synce/s
 Source1:        synce-trayicon.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  librapi-devel >= 0.11.1
-BuildRequires:  librra-devel >= 0.11.1
+BuildRequires:  librapi-devel >= 0.14
+BuildRequires:  librra-devel >= 0.14
+BuildRequires:  orange-devel >= 0.3.2 dynamite-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgtop2-devel
 BuildRequires:  libxml2-devel
@@ -25,8 +26,9 @@ BuildRequires:  hal-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gnome-keyring-devel
 BuildRequires:  libnotify-devel
+BuildRequires:  intltool
 
-Requires: GConf2
+Requires: gnome-session
 
 %description
 %{summary}
@@ -68,8 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 %{_sysconfdir}/gconf/schemas/synce-trayicon.schemas
 %{_mandir}/man1/synce-trayicon.1.gz
+%{_datadir}/gnome/autostart/
 
 %changelog
+* Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-1
+- version upgrade
+
+* Sun Feb 08 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.13-1
+- version upgrade (#457949)
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.11-2
 - fix license tag
 



From awjb at fedoraproject.org  Mon Aug 24 20:57:26 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 24 Aug 2009 20:57:26 +0000 (UTC)
Subject: rpms/synce-trayicon/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 synce-trayicon.spec, 1.19, 1.20
Message-ID: <20090824205726.E7E5111C0044@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-trayicon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv830/F-11

Modified Files:
	.cvsignore sources synce-trayicon.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Mar 2009 19:21:56 -0000	1.4
+++ .cvsignore	24 Aug 2009 20:57:26 -0000	1.5
@@ -1 +1 @@
-synce-trayicon-0.13.tar.gz
+synce-trayicon-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Mar 2009 19:21:56 -0000	1.4
+++ sources	24 Aug 2009 20:57:26 -0000	1.5
@@ -1 +1 @@
-279d117111426aac21a25843dc48e2a6  synce-trayicon-0.13.tar.gz
+5fa55255a7b202e467441e4cbac8dc89  synce-trayicon-0.14.tar.gz


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/F-11/synce-trayicon.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- synce-trayicon.spec	27 Mar 2009 19:21:56 -0000	1.19
+++ synce-trayicon.spec	24 Aug 2009 20:57:26 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           synce-trayicon
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
@@ -11,8 +11,8 @@ Source0:        http://dl.sf.net/synce/s
 Source1:        synce-trayicon.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  librapi-devel >= 0.13
-BuildRequires:  librra-devel >= 0.13
+BuildRequires:  librapi-devel >= 0.14
+BuildRequires:  librra-devel >= 0.14
 BuildRequires:  orange-devel >= 0.3.2
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgtop2-devel
@@ -73,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome/autostart/
 
 %changelog
+* Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-1
+- version upgrade
+
 * Sun Feb 08 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.13-1
 - version upgrade (#457949)



From awjb at fedoraproject.org  Mon Aug 24 20:57:27 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 24 Aug 2009 20:57:27 +0000 (UTC)
Subject: rpms/synce-trayicon/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 synce-trayicon.spec, 1.20, 1.21
Message-ID: <20090824205727.5AC5911C0044@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-trayicon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv830/devel

Modified Files:
	.cvsignore sources synce-trayicon.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Mar 2009 19:21:56 -0000	1.4
+++ .cvsignore	24 Aug 2009 20:57:26 -0000	1.5
@@ -1 +1 @@
-synce-trayicon-0.13.tar.gz
+synce-trayicon-0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Mar 2009 19:21:56 -0000	1.4
+++ sources	24 Aug 2009 20:57:27 -0000	1.5
@@ -1 +1 @@
-279d117111426aac21a25843dc48e2a6  synce-trayicon-0.13.tar.gz
+5fa55255a7b202e467441e4cbac8dc89  synce-trayicon-0.14.tar.gz


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- synce-trayicon.spec	27 Jul 2009 05:17:47 -0000	1.20
+++ synce-trayicon.spec	24 Aug 2009 20:57:27 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -11,8 +11,8 @@ Source0:        http://dl.sf.net/synce/s
 Source1:        synce-trayicon.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  librapi-devel >= 0.13
-BuildRequires:  librra-devel >= 0.13
+BuildRequires:  librapi-devel >= 0.14
+BuildRequires:  librra-devel >= 0.14
 BuildRequires:  orange-devel >= 0.3.2
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgtop2-devel
@@ -73,8 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome/autostart/
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Jul 21 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.14-1
+- version upgrade
 
 * Sun Feb 08 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.13-1



From ajax at fedoraproject.org  Mon Aug 24 21:01:52 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 24 Aug 2009 21:01:52 +0000 (UTC)
Subject: rpms/plymouth/devel charge.plymouth, 1.3, 1.4 plymouth.spec, 1.136, 
	1.137
Message-ID: <20090824210152.2207511C0044@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2218

Modified Files:
	charge.plymouth plymouth.spec 
Log Message:
* Mon Aug 24 2009 Adam Jackson <ajax at redhat.com> 0.7.0-2
- Set charge bgcolor to black. (#519052)



Index: charge.plymouth
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/charge.plymouth,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- charge.plymouth	14 May 2009 17:49:35 -0000	1.3
+++ charge.plymouth	24 Aug 2009 21:01:51 -0000	1.4
@@ -9,5 +9,5 @@ HorizontalAlignment=.5
 VerticalAlignment=.5
 Transition=none
 TransitionDuration=0.0
-BackgroundStartColor=0x416fa7
-BackgroundEndColor=0x4b83c1
+BackgroundStartColor=0x000000
+BackgroundEndColor=0x000000


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- plymouth.spec	11 Aug 2009 17:56:49 -0000	1.136
+++ plymouth.spec	24 Aug 2009 21:01:51 -0000	1.137
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -265,7 +265,7 @@ cp $RPM_SOURCE_DIR/boot-duration $RPM_BU
 
 # Add charge, our new default
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
-cp $RPM_SOURCE_DIR/charge.plymouth $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
 cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
 
 # Drop glow, it's not very Fedora-y
@@ -444,6 +444,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Aug 24 2009 Adam Jackson <ajax at redhat.com> 0.7.0-2
+- Set charge bgcolor to black. (#519052)
+
 * Tue Aug 11 2009 Ray Strode <rstrode at redhat.com> 0.7.0-1
 - Update to 0.7.0
 



From behdad at fedoraproject.org  Mon Aug 24 21:02:11 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 24 Aug 2009 21:02:11 +0000 (UTC)
Subject: rpms/pango/devel .cvsignore, 1.94, 1.95 pango.spec, 1.175,
	1.176 sources, 1.95, 1.96
Message-ID: <20090824210211.B53FE11C0044@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2471

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Tue Aug 17 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.5-1 
- 1.25.5 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- .cvsignore	17 Aug 2009 23:23:05 -0000	1.94
+++ .cvsignore	24 Aug 2009 21:02:11 -0000	1.95
@@ -1 +1 @@
-pango-1.25.4.tar.bz2
+pango-1.25.5.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- pango.spec	20 Aug 2009 11:31:48 -0000	1.175
+++ pango.spec	24 Aug 2009 21:02:11 -0000	1.176
@@ -8,8 +8,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.25.4
-Release: 2%{?dist}
+Version: 1.25.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Tue Aug 17 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.5-1
+- 1.25.5
+
 * Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2
 - fix autoconf host on s390x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	17 Aug 2009 23:23:05 -0000	1.95
+++ sources	24 Aug 2009 21:02:11 -0000	1.96
@@ -1 +1 @@
-c46848c6a065e0a71764626a1fcf995e  pango-1.25.4.tar.bz2
+3f0b5f9b58f951ddaffbdb45b2d12741  pango-1.25.5.tar.bz2



From behdad at fedoraproject.org  Mon Aug 24 21:03:01 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 24 Aug 2009 21:03:01 +0000 (UTC)
Subject: rpms/pango/devel pango.spec,1.176,1.177
Message-ID: <20090824210301.BEFDC11C0044@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2740

Modified Files:
	pango.spec 
Log Message:
* Mon Aug 24 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.5-1 
- 1.25.5 



Index: pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pango/devel/pango.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- pango.spec	24 Aug 2009 21:02:11 -0000	1.176
+++ pango.spec	24 Aug 2009 21:03:01 -0000	1.177
@@ -228,7 +228,7 @@ fi
 
 
 %changelog
-* Tue Aug 17 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.5-1
+* Mon Aug 24 2009 Behdad Esfahbod <besfahbo at redhat.com> - 1.25.5-1
 - 1.25.5
 
 * Thu Aug 20 2009 Karsten Hopp <karsten at redhat.com> 1.25.4-2



From drago01 at fedoraproject.org  Mon Aug 24 21:04:02 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 24 Aug 2009 21:04:02 +0000 (UTC)
Subject: rpms/compiz/devel compiz.spec,1.181,1.182
Message-ID: <20090824210402.D5EF511C0044@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3075

Modified Files:
	compiz.spec 
Log Message:
fix build


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- compiz.spec	24 Aug 2009 20:53:43 -0000	1.181
+++ compiz.spec	24 Aug 2009 21:04:02 -0000	1.182
@@ -291,7 +291,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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}/compiz/desktop-effects.glade
 %{_datadir}/applications/compiz-gtk.desktop
 %exclude %{_datadir}/applications/compiz.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas



From xhorak at fedoraproject.org  Mon Aug 24 21:04:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Mon, 24 Aug 2009 21:04:12 +0000 (UTC)
Subject: rpms/thunderbird/F-10 thunderbird-2.0-visibility.patch, NONE,
	1.1 thunderbird.spec, 1.125, 1.126
Message-ID: <20090824210412.AB18A11C0044@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3150

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-2.0-visibility.patch 
Log Message:
Fix build

thunderbird-2.0-visibility.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE thunderbird-2.0-visibility.patch ---
diff -up mozilla/configure.vis mozilla/configure
--- mozilla/configure.vis	2009-08-19 14:43:58.000000000 +0200
+++ mozilla/configure	2009-08-19 15:15:11.000000000 +0200
@@ -8015,7 +8015,7 @@ EOF
                       if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
                         if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then
                           if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
-                            ac_cv_visibility_pragma=yes
+                            ac_cv_visibility_pragma=no
                           fi
                         fi
                       fi


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- thunderbird.spec	24 Aug 2009 20:50:18 -0000	1.125
+++ thunderbird.spec	24 Aug 2009 21:04:12 -0000	1.126
@@ -31,6 +31,7 @@ Source100:      find-external-requires
 # Build patches
 Patch1:         firefox-2.0-link-layout.patch
 Patch2:         firefox-1.0-prdtoa.patch
+Patch3:         thunderbird-2.0-visibility.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -105,6 +106,13 @@ cd mozilla
 %patch1 -p1 -b .link-layout
 %patch2 -p0
 
+# Pragma visibility is broken on most platforms for some reason.
+# It works on i386 so leave it alone there.  Disable elsewhere.
+# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
+%ifnarch i386
+%patch3  -p1
+%endif
+
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
 %patch24 -p1 -b .default-applications



From mclasen at fedoraproject.org  Mon Aug 24 21:07:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 21:07:07 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.54, 1.55 libsoup.spec, 1.98,
	1.99 sources, 1.54, 1.55
Message-ID: <20090824210707.062F411C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2567

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	11 Aug 2009 04:49:59 -0000	1.54
+++ .cvsignore	24 Aug 2009 21:07:06 -0000	1.55
@@ -1 +1 @@
-libsoup-2.27.90.tar.bz2
+libsoup-2.27.91.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- libsoup.spec	11 Aug 2009 04:49:59 -0000	1.98
+++ libsoup.spec	24 Aug 2009 21:07:06 -0000	1.99
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.27.90
+Version: 2.27.91
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	11 Aug 2009 04:49:59 -0000	1.54
+++ sources	24 Aug 2009 21:07:06 -0000	1.55
@@ -1 +1 @@
-5bad95448a9ea59ca590567c41854fbb  libsoup-2.27.90.tar.bz2
+58e5518a483fbef0b72f142e63f43e9f  libsoup-2.27.91.tar.bz2



From myoung at fedoraproject.org  Mon Aug 24 21:09:26 2009
From: myoung at fedoraproject.org (myoung)
Date: Mon, 24 Aug 2009 21:09:26 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1294.2.56,
	1.1294.2.57 xen.pvops.post.patch, 1.1.2.23, 1.1.2.24
Message-ID: <20090824210926.5E95B11C0044@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4439

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec xen.pvops.post.patch 
Log Message:
turn stactprotector off again for i686 to get a working pvops build



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.56
retrieving revision 1.1294.2.57
diff -u -p -r1.1294.2.56 -r1.1294.2.57
--- kernel.spec	24 Aug 2009 20:17:11 -0000	1.1294.2.56
+++ kernel.spec	24 Aug 2009 21:09:25 -0000	1.1294.2.57
@@ -2007,7 +2007,7 @@ fi
 
 %changelog
 * Mon Aug 24 2009 Michael Young <m.a.young at durham.ac.uk>
-- turn off stackprotector on i686 for a clean build
+- turn off stackprotector on i686 for a working build
 
 * Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git1

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/pci-swiotlb.c         |    5 ++---
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -p -r1.1.2.23 -r1.1.2.24
--- xen.pvops.post.patch	24 Aug 2009 20:17:12 -0000	1.1.2.23
+++ xen.pvops.post.patch	24 Aug 2009 21:09:26 -0000	1.1.2.24
@@ -1,4 +1,4 @@
-Reapply and merge in Fedora changes
+Reapply and merge in Fedora changes 
 
 --- a/drivers/pci/pci.h	2009-02-25 20:16:13.000000000 +0000
 +++ b/drivers/pci/pci.h	2009-02-25 20:40:21.000000000 +0000



From jjames at fedoraproject.org  Mon Aug 24 21:10:47 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 21:10:47 +0000 (UTC)
Subject: rpms/xemacs/F-10 xemacs-21.5.28-image-overflow.patch, NONE,
	1.1 xemacs-21.5.28-3d-athena.patch, 1.1,
	1.2 xemacs-21.5.28-destdir.patch, 1.1, 1.2 xemacs.spec, 1.43, 1.44
Message-ID: <20090824211047.7612711C0426@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4746

Modified Files:
	xemacs-21.5.28-3d-athena.patch xemacs-21.5.28-destdir.patch 
	xemacs.spec 
Added Files:
	xemacs-21.5.28-image-overflow.patch 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.28-10
- Fix image overflow bug (CVE-2009-2688).
- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune).
- Rebase patches to eliminate fuzz/offsets.


xemacs-21.5.28-image-overflow.patch:
 glyphs-eimage.c |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE xemacs-21.5.28-image-overflow.patch ---
--- xemacs-21.5.28/src/glyphs-eimage.c	2007-02-21 03:49:33.000000000 -0700
+++ xemacs-21.5.28/src/glyphs-eimage.c	2009-08-24 14:59:29.422973833 -0600
@@ -401,6 +401,7 @@
    */
 
   {
+    UINT_64_BIT pixels_sq;
     int jpeg_gray = 0;		/* if we're dealing with a grayscale */
     /* Step 4: set parameters for decompression.   */
 
@@ -423,7 +424,10 @@
     jpeg_start_decompress (&cinfo);
 
     /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
-
+    pixels_sq =
+      (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
+    if (pixels_sq > ((size_t) -1) / 3)
+      signal_image_error ("JPEG image too large to instantiate", instantiator);
     unwind.eimage =
       xnew_binbytes (cinfo.output_width * cinfo.output_height * 3);
     if (!unwind.eimage)
@@ -669,6 +673,7 @@
   {
     ColorMapObject *cmo = unwind.giffile->SColorMap;
     int i, j, row, pass, interlace, slice;
+    UINT_64_BIT pixels_sq;
     Binbyte *eip;
     /* interlaced gifs have rows in this order:
        0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
@@ -677,6 +682,9 @@
 
     height = unwind.giffile->SHeight;
     width = unwind.giffile->SWidth;
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount))
+      signal_image_error ("GIF image too large to instantiate", instantiator);
     unwind.eimage =
       xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount);
     if (!unwind.eimage)
@@ -940,11 +948,15 @@
   {
     int y;
     Binbyte **row_pointers;
+    UINT_64_BIT pixels_sq;
     height = info_ptr->height;
     width = info_ptr->width;
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq > ((size_t) -1) / 3)
+      signal_image_error ("PNG image too large to instantiate", instantiator);
 
     /* Wow, allocate all the memory.  Truly, exciting. */
-    unwind.eimage = xnew_array_and_zero (Binbyte, width * height * 3);
+    unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3));
     /* libpng expects that the image buffer passed in contains a
        picture to draw on top of if the png has any transparencies.
        This could be a good place to pass that in... */
@@ -1291,6 +1303,7 @@
 
     uint32 *raster;
     Binbyte *ep;
+    UINT_64_BIT pixels_sq;
 
     assert (!NILP (data));
 
@@ -1313,12 +1326,15 @@
 
     TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
     TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
-    unwind.eimage = xnew_binbytes (width * height * 3);
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq >= 1 << 29)
+      signal_image_error ("TIFF image too large to instantiate", instantiator);
+    unwind.eimage = xnew_binbytes ((size_t) pixels_sq * 3);
 
     /* #### This is little more than proof-of-concept/function testing.
        It needs to be reimplemented via scanline reads for both memory
        compactness. */
-    raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
+    raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32)));
     if (raster != NULL)
       {
 	int i, j;

xemacs-21.5.28-3d-athena.patch:
 configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: xemacs-21.5.28-3d-athena.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-10/xemacs-21.5.28-3d-athena.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.28-3d-athena.patch	6 Jul 2008 21:14:09 -0000	1.1
+++ xemacs-21.5.28-3d-athena.patch	24 Aug 2009 21:10:46 -0000	1.2
@@ -1,6 +1,6 @@
 --- a/configure.ac	Sat Mar 15 12:21:11 2008 +0100
 +++ b/configure.ac	Fri Apr 04 10:48:58 2008 -0700
-@@ -4241,17 +4241,17 @@ if test "$with_x11" = "yes" -a "$detect_
+@@ -4221,17 +4221,17 @@ if test "$with_x11" = "yes" -a "$detect_
      AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
        [
          dnl Must not be a 3d library...

xemacs-21.5.28-destdir.patch:
 Makefile.in.in                     |   72 ++++++++++++++++++++-----------------
 dynodump/Makefile.in.in            |    2 +
 etc/tests/external-widget/Makefile |    2 +
 lib-src/Makefile.in.in             |   12 +++---
 lwlib/Makefile.in.in               |    2 +
 man/Makefile                       |    2 +
 modules/base64/Makefile            |    2 +
 modules/common/Makefile.common     |    4 +-
 modules/zlib/Makefile              |    2 +
 netinstall/Makefile.in.in          |    4 +-
 src/Makefile.in.in                 |   16 ++++----
 tests/tooltalk/Makefile            |    2 +
 12 files changed, 75 insertions(+), 47 deletions(-)

Index: xemacs-21.5.28-destdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-10/xemacs-21.5.28-destdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.28-destdir.patch	6 Jun 2007 21:26:20 -0000	1.1
+++ xemacs-21.5.28-destdir.patch	24 Aug 2009 21:10:47 -0000	1.2
@@ -186,7 +186,7 @@ diff -ru xemacs-21.5.24.orig/lib-src/Mak
  ## For performance and consistency, no built-in rules
  .SUFFIXES:
  .SUFFIXES: .c .h .o
-@@ -244,26 +246,26 @@
+@@ -245,26 +247,26 @@
  ## just run them directly from lib-src.
  ${archlibdir}: all
  	@echo; echo "Installing utilities run internally by XEmacs."
@@ -320,7 +320,7 @@ diff -ru xemacs-21.5.24.orig/src/Makefil
  PROGNAME=@PROGNAME@
  prefix=@prefix@
  SRC=@srcdir@
-@@ -1068,7 +1070,7 @@
+@@ -1065,7 +1067,7 @@
  #ifdef HAVE_SHLIB
  MAKEPATH=../lib-src/make-path
  install: $(PROGNAME)
@@ -329,7 +329,7 @@ diff -ru xemacs-21.5.24.orig/src/Makefil
  	- at echo "Copying include files for ellcc..."
  	- at hdir=`pwd`; \
  	cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
-@@ -1082,12 +1084,12 @@
+@@ -1079,12 +1081,12 @@
  		test -d s && hdrtars="$$hdrtars s/*"; \
  		test -d m && hdrtars="$$hdrtars m/*"; \
  		test -n "$$hdrtars" && (tar cf - $$hdrtars) | \


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-10/xemacs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xemacs.spec	20 Jul 2008 15:44:23 -0000	1.43
+++ xemacs.spec	24 Aug 2009 21:10:47 -0000	1.44
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.28
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -47,6 +47,7 @@ Patch9:         %{name}-21.5.28-destdir.
 Patch10:        %{name}-21.5.28-revert-modified-245017.patch
 Patch11:        %{name}-21.5.28-autoconf262-449626.patch
 Patch12:        %{name}-21.5.28-3d-athena.patch
+Patch13:        %{name}-21.5.28-image-overflow.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,6 +92,7 @@ Requires:       xemacs-packages-base >= 
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
+Requires:       xorg-x11-fonts-misc
 Requires(post): coreutils
 Provides:       xemacs(bin) = %{version}-%{release}
 
@@ -205,6 +207,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch10 -p0
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
@@ -545,6 +548,11 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.28-10
+- Fix image overflow bug (CVE-2009-2688).
+- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune).
+- Rebase patches to eliminate fuzz/offsets.
+
 * Sun Jul 20 2008 Ville Skytt? <ville.skytta at iki.fi> - 21.5.28-9
 - Rebuild.
 



From jjames at fedoraproject.org  Mon Aug 24 21:11:30 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 21:11:30 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs-21.5.29-image-overflow.patch, NONE,
	1.1 xemacs-21.5.29-no-xft.patch, NONE,
	1.1 xemacs-21.5.25-mk-nochk-features.patch, 1.1,
	1.2 xemacs-21.5.25-x-paths.patch, 1.1,
	1.2 xemacs-21.5.28-courier-default.patch, 1.2, 1.3 xemacs.spec,
	1.48, 1.49
Message-ID: <20090824211130.60D9C11C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4935

Modified Files:
	xemacs-21.5.25-mk-nochk-features.patch 
	xemacs-21.5.25-x-paths.patch 
	xemacs-21.5.28-courier-default.patch xemacs.spec 
Added Files:
	xemacs-21.5.29-image-overflow.patch 
	xemacs-21.5.29-no-xft.patch 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
- Fix image overflow bug (CVE-2009-2688).
- Fix calling xft-font-create-object in non-Xft builds (#512623).
- Rebase patches to eliminate fuzz/offsets.


xemacs-21.5.29-image-overflow.patch:
 glyphs-eimage.c |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE xemacs-21.5.29-image-overflow.patch ---
--- xemacs-21.5.29/src/glyphs-eimage.c	2009-05-18 08:51:08.000000000 -0600
+++ xemacs-21.5.29/src/glyphs-eimage.c	2009-08-24 10:21:21.274947236 -0600
@@ -409,6 +409,7 @@
    */
 
   {
+    UINT_64_BIT pixels_sq;
     int jpeg_gray = 0;		/* if we're dealing with a grayscale */
     /* Step 4: set parameters for decompression.   */
 
@@ -431,7 +432,10 @@
     jpeg_start_decompress (&cinfo);
 
     /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
-
+    pixels_sq =
+      (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
+    if (pixels_sq > ((size_t) -1) / 3)
+      signal_image_error ("JPEG image too large to instantiate", instantiator);
     unwind.eimage =
       xnew_binbytes (cinfo.output_width * cinfo.output_height * 3);
     if (!unwind.eimage)
@@ -677,6 +681,7 @@
   {
     ColorMapObject *cmo = unwind.giffile->SColorMap;
     int i, j, row, pass, interlace, slice;
+    UINT_64_BIT pixels_sq;
     Binbyte *eip;
     /* interlaced gifs have rows in this order:
        0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
@@ -685,6 +690,9 @@
 
     height = unwind.giffile->SHeight;
     width = unwind.giffile->SWidth;
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount))
+      signal_image_error ("GIF image too large to instantiate", instantiator);
     unwind.eimage =
       xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount);
     if (!unwind.eimage)
@@ -948,11 +956,15 @@
   {
     int y;
     Binbyte **row_pointers;
+    UINT_64_BIT pixels_sq;
     height = info_ptr->height;
     width = info_ptr->width;
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq > ((size_t) -1) / 3)
+      signal_image_error ("PNG image too large to instantiate", instantiator);
 
     /* Wow, allocate all the memory.  Truly, exciting. */
-    unwind.eimage = xnew_array_and_zero (Binbyte, width * height * 3);
+    unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3));
     /* libpng expects that the image buffer passed in contains a
        picture to draw on top of if the png has any transparencies.
        This could be a good place to pass that in... */
@@ -1299,6 +1311,7 @@
 
     uint32 *raster;
     Binbyte *ep;
+    UINT_64_BIT pixels_sq;
 
     assert (!NILP (data));
 
@@ -1321,12 +1334,15 @@
 
     TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
     TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
-    unwind.eimage = xnew_binbytes (width * height * 3);
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq >= 1 << 29)
+      signal_image_error ("TIFF image too large to instantiate", instantiator);
+    unwind.eimage = xnew_binbytes ((size_t) pixels_sq * 3);
 
     /* #### This is little more than proof-of-concept/function testing.
        It needs to be reimplemented via scanline reads for both memory
        compactness. */
-    raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
+    raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32)));
     if (raster != NULL)
       {
 	int i, j;

xemacs-21.5.29-no-xft.patch:
 font.el |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xemacs-21.5.29-no-xft.patch ---
--- xemacs-21.5.29/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/font.el	2009-08-24 13:24:14.634385245 -0600
@@ -582,6 +582,7 @@
     (if (or (not (stringp fontname))
 	    (not (string-match font-x-font-regexp fontname)))
 	(if (and (stringp fontname)
+		 (featurep 'xft-fonts)
 		 (string-match font-xft-font-regexp fontname))
 	    ;; Return an XFT font. 
 	    (xft-font-create-object fontname)

xemacs-21.5.25-mk-nochk-features.patch:
 Makefile.in.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xemacs-21.5.25-mk-nochk-features.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs-21.5.25-mk-nochk-features.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.25-mk-nochk-features.patch	6 Apr 2006 16:27:53 -0000	1.1
+++ xemacs-21.5.25-mk-nochk-features.patch	24 Aug 2009 21:11:29 -0000	1.2
@@ -1,6 +1,6 @@
 --- xemacs-21.5.25/Makefile.in.in.orig	2005-12-31 14:41:23.000000000 +0200
 +++ xemacs-21.5.25/Makefile.in.in	2006-03-30 23:53:48.000000000 +0300
-@@ -375,7 +375,7 @@
+@@ -387,7 +387,7 @@
  
  install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
  

xemacs-21.5.25-x-paths.patch:
 Emacs.ad |    2 +-
 xemacs.1 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: xemacs-21.5.25-x-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs-21.5.25-x-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.25-x-paths.patch	6 Apr 2006 16:27:53 -0000	1.1
+++ xemacs-21.5.25-x-paths.patch	24 Aug 2009 21:11:29 -0000	1.2
@@ -11,7 +11,7 @@
  ! personal customizations should be put into ~/.Xresources instead.)
 --- xemacs-21.5.25/etc/xemacs.1.orig	2001-04-12 21:20:52.000000000 +0300
 +++ xemacs-21.5.25/etc/xemacs.1	2006-03-30 23:36:47.000000000 +0300
-@@ -293,7 +293,7 @@
+@@ -288,7 +288,7 @@
  Sets the color of the text.
  
  See the file

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: /cvs/pkgs/rpms/xemacs/F-11/xemacs-21.5.28-courier-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-21.5.28-courier-default.patch	12 Mar 2009 17:01:29 -0000	1.2
+++ xemacs-21.5.28-courier-default.patch	24 Aug 2009 21:11:29 -0000	1.3
@@ -1,7 +1,11 @@
---- src/faces.c	22 Apr 2007 19:58:59 -0000	1.55
-+++ src/faces.c	21 May 2007 14:51:50 -0000
-@@ -2399,3 +2399,3 @@
-        (list1 (device_symbol), 
+--- 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 */


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xemacs.spec	2 Jul 2009 20:14:58 -0000	1.48
+++ xemacs.spec	24 Aug 2009 21:11:30 -0000	1.49
@@ -11,6 +11,7 @@
 %bcond_without  nox
 %bcond_without  xim
 %ifarch ia64
+# no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39
 %bcond_with     modules
 %else
 %bcond_without  modules
@@ -20,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        1%{?snap:.%{snap}}%{?dist}
+Release:        2%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -39,9 +40,13 @@ Source5:        xemacs-sitestart.el
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
+# Applied upstream 2009-07-01
+Patch2:         %{name}-21.5.29-image-overflow.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
+# Sent upstream 2009-08-24
+Patch6:         %{name}-21.5.29-no-xft.patch
 Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-03-12
@@ -199,6 +204,7 @@ rm -f configure.in
 sed -i -e /tetris/d lisp/menubar-items.el
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %ifarch ia64
 touch -r aclocal.m4 aclocal.m4-stamp
@@ -206,7 +212,8 @@ touch -r aclocal.m4 aclocal.m4-stamp
 touch -r aclocal.m4-stamp aclocal.m4
 %endif
 %patch5 -p1
-%patch8 -p0 -F 1
+%patch6 -p1
+%patch8 -p1
 %patch9 -p1
 %patch14 -p1
 
@@ -551,6 +558,11 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-2
+- Fix image overflow bug (CVE-2009-2688).
+- Fix calling xft-font-create-object in non-Xft builds (#512623).
+- Rebase patches to eliminate fuzz/offsets.
+
 * Wed May 20 2009 Ville Skytt? <ville.skytta at iki.fi> - 21.5.29-1
 - Update to 21.5.29; gtk-gcc4, finder-lisp-dir, 3d-athena, autoconf262,
   doc-encodings, revert-modified, and xemacs-base-autoloads patches applied



From jjames at fedoraproject.org  Mon Aug 24 21:11:52 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 21:11:52 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs-21.5.29-image-overflow.patch, NONE,
	1.1 xemacs-21.5.29-no-xft.patch, NONE,
	1.1 xemacs-21.5.25-mk-nochk-features.patch, 1.1,
	1.2 xemacs-21.5.25-x-paths.patch, 1.1,
	1.2 xemacs-21.5.28-courier-default.patch, 1.2, 1.3 xemacs.spec,
	1.50, 1.51
Message-ID: <20090824211152.60DD211C0044@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5098

Modified Files:
	xemacs-21.5.25-mk-nochk-features.patch 
	xemacs-21.5.25-x-paths.patch 
	xemacs-21.5.28-courier-default.patch xemacs.spec 
Added Files:
	xemacs-21.5.29-image-overflow.patch 
	xemacs-21.5.29-no-xft.patch 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
- Fix image overflow bug (CVE-2009-2688).
- Fix calling xft-font-create-object in non-Xft builds (#512623).
- Rebase patches to eliminate fuzz/offsets.


xemacs-21.5.29-image-overflow.patch:
 glyphs-eimage.c |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE xemacs-21.5.29-image-overflow.patch ---
--- xemacs-21.5.29/src/glyphs-eimage.c	2009-05-18 08:51:08.000000000 -0600
+++ xemacs-21.5.29/src/glyphs-eimage.c	2009-08-24 10:21:21.274947236 -0600
@@ -409,6 +409,7 @@
    */
 
   {
+    UINT_64_BIT pixels_sq;
     int jpeg_gray = 0;		/* if we're dealing with a grayscale */
     /* Step 4: set parameters for decompression.   */
 
@@ -431,7 +432,10 @@
     jpeg_start_decompress (&cinfo);
 
     /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
-
+    pixels_sq =
+      (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
+    if (pixels_sq > ((size_t) -1) / 3)
+      signal_image_error ("JPEG image too large to instantiate", instantiator);
     unwind.eimage =
       xnew_binbytes (cinfo.output_width * cinfo.output_height * 3);
     if (!unwind.eimage)
@@ -677,6 +681,7 @@
   {
     ColorMapObject *cmo = unwind.giffile->SColorMap;
     int i, j, row, pass, interlace, slice;
+    UINT_64_BIT pixels_sq;
     Binbyte *eip;
     /* interlaced gifs have rows in this order:
        0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
@@ -685,6 +690,9 @@
 
     height = unwind.giffile->SHeight;
     width = unwind.giffile->SWidth;
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount))
+      signal_image_error ("GIF image too large to instantiate", instantiator);
     unwind.eimage =
       xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount);
     if (!unwind.eimage)
@@ -948,11 +956,15 @@
   {
     int y;
     Binbyte **row_pointers;
+    UINT_64_BIT pixels_sq;
     height = info_ptr->height;
     width = info_ptr->width;
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq > ((size_t) -1) / 3)
+      signal_image_error ("PNG image too large to instantiate", instantiator);
 
     /* Wow, allocate all the memory.  Truly, exciting. */
-    unwind.eimage = xnew_array_and_zero (Binbyte, width * height * 3);
+    unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3));
     /* libpng expects that the image buffer passed in contains a
        picture to draw on top of if the png has any transparencies.
        This could be a good place to pass that in... */
@@ -1299,6 +1311,7 @@
 
     uint32 *raster;
     Binbyte *ep;
+    UINT_64_BIT pixels_sq;
 
     assert (!NILP (data));
 
@@ -1321,12 +1334,15 @@
 
     TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
     TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
-    unwind.eimage = xnew_binbytes (width * height * 3);
+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
+    if (pixels_sq >= 1 << 29)
+      signal_image_error ("TIFF image too large to instantiate", instantiator);
+    unwind.eimage = xnew_binbytes ((size_t) pixels_sq * 3);
 
     /* #### This is little more than proof-of-concept/function testing.
        It needs to be reimplemented via scanline reads for both memory
        compactness. */
-    raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
+    raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32)));
     if (raster != NULL)
       {
 	int i, j;

xemacs-21.5.29-no-xft.patch:
 font.el |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xemacs-21.5.29-no-xft.patch ---
--- xemacs-21.5.29/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/font.el	2009-08-24 13:24:14.634385245 -0600
@@ -582,6 +582,7 @@
     (if (or (not (stringp fontname))
 	    (not (string-match font-x-font-regexp fontname)))
 	(if (and (stringp fontname)
+		 (featurep 'xft-fonts)
 		 (string-match font-xft-font-regexp fontname))
 	    ;; Return an XFT font. 
 	    (xft-font-create-object fontname)

xemacs-21.5.25-mk-nochk-features.patch:
 Makefile.in.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xemacs-21.5.25-mk-nochk-features.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs-21.5.25-mk-nochk-features.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.25-mk-nochk-features.patch	6 Apr 2006 16:27:53 -0000	1.1
+++ xemacs-21.5.25-mk-nochk-features.patch	24 Aug 2009 21:11:51 -0000	1.2
@@ -1,6 +1,6 @@
 --- xemacs-21.5.25/Makefile.in.in.orig	2005-12-31 14:41:23.000000000 +0200
 +++ xemacs-21.5.25/Makefile.in.in	2006-03-30 23:53:48.000000000 +0300
-@@ -375,7 +375,7 @@
+@@ -387,7 +387,7 @@
  
  install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
  

xemacs-21.5.25-x-paths.patch:
 Emacs.ad |    2 +-
 xemacs.1 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: xemacs-21.5.25-x-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs-21.5.25-x-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.25-x-paths.patch	6 Apr 2006 16:27:53 -0000	1.1
+++ xemacs-21.5.25-x-paths.patch	24 Aug 2009 21:11:51 -0000	1.2
@@ -11,7 +11,7 @@
  ! personal customizations should be put into ~/.Xresources instead.)
 --- xemacs-21.5.25/etc/xemacs.1.orig	2001-04-12 21:20:52.000000000 +0300
 +++ xemacs-21.5.25/etc/xemacs.1	2006-03-30 23:36:47.000000000 +0300
-@@ -293,7 +293,7 @@
+@@ -288,7 +288,7 @@
  Sets the color of the text.
  
  See the file

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: /cvs/pkgs/rpms/xemacs/devel/xemacs-21.5.28-courier-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xemacs-21.5.28-courier-default.patch	12 Mar 2009 17:01:29 -0000	1.2
+++ xemacs-21.5.28-courier-default.patch	24 Aug 2009 21:11:51 -0000	1.3
@@ -1,7 +1,11 @@
---- src/faces.c	22 Apr 2007 19:58:59 -0000	1.55
-+++ src/faces.c	21 May 2007 14:51:50 -0000
-@@ -2399,3 +2399,3 @@
-        (list1 (device_symbol), 
+--- 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 */


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xemacs.spec	13 Aug 2009 11:46:46 -0000	1.50
+++ xemacs.spec	24 Aug 2009 21:11:52 -0000	1.51
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        2%{?snap:.%{snap}}%{?dist}
+Release:        3%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -40,9 +40,13 @@ Source5:        xemacs-sitestart.el
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
+# Applied upstream 2009-07-01
+Patch2:         %{name}-21.5.29-image-overflow.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
+# Sent upstream 2009-08-24
+Patch6:         %{name}-21.5.29-no-xft.patch
 Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
 # Sent upstream 2009-03-12
@@ -200,6 +204,7 @@ rm -f configure.in
 sed -i -e /tetris/d lisp/menubar-items.el
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %ifarch ia64
 touch -r aclocal.m4 aclocal.m4-stamp
@@ -207,7 +212,8 @@ touch -r aclocal.m4 aclocal.m4-stamp
 touch -r aclocal.m4-stamp aclocal.m4
 %endif
 %patch5 -p1
-%patch8 -p0 -F 1
+%patch6 -p1
+%patch8 -p1
 %patch9 -p1
 %patch14 -p1
 
@@ -552,6 +558,11 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
+- Fix image overflow bug (CVE-2009-2688).
+- Fix calling xft-font-create-object in non-Xft builds (#512623).
+- Rebase patches to eliminate fuzz/offsets.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 21.5.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From simo at fedoraproject.org  Mon Aug 24 21:13:27 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Mon, 24 Aug 2009 21:13:27 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 sssd.spec,
	1.21, 1.22 sssd-0.4.1-conf_check.patch, 1.1,
	NONE sssd-0.4.1-cve-2009-2410.patch, 1.1,
	NONE sssd-0.4.1-debug_fn.patch, 1.1,
	NONE sssd-0.4.1-reload_conf.patch, 1.1,
	NONE sssd-0.4.1-reload_conf_2.patch, 1.1, NONE
Message-ID: <20090824211327.86CC611C0044@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5603

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	sssd-0.4.1-conf_check.patch sssd-0.4.1-cve-2009-2410.patch 
	sssd-0.4.1-debug_fn.patch sssd-0.4.1-reload_conf.patch 
	sssd-0.4.1-reload_conf_2.patch 
Log Message:
* Mon Aug 24 2009 Simo Sorce <ssorce at redhat.com> - 0.5.0-0
- New upstream release 0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	8 Jun 2009 17:40:52 -0000	1.10
+++ .cvsignore	24 Aug 2009 21:13:27 -0000	1.11
@@ -1 +1 @@
-sssd-0.4.1.tar.gz
+sssd-0.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	8 Jun 2009 17:40:52 -0000	1.10
+++ sources	24 Aug 2009 21:13:27 -0000	1.11
@@ -1 +1 @@
-b1c6c3532e5bcc22de4849e52f9bad0a  sssd-0.4.1.tar.gz
+7566dcac75e7248ca99b4dd0bb49c1ee  sssd-0.5.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sssd.spec	29 Jul 2009 11:27:19 -0000	1.21
+++ sssd.spec	24 Aug 2009 21:13:27 -0000	1.22
@@ -1,6 +1,6 @@
 Name: sssd
-Version: 0.4.1
-Release: 3%{?dist}
+Version: 0.5.0
+Release: 0%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -12,20 +12,19 @@ Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
-Patch010: sssd-0.4.1-debug_fn.patch
-Patch011: sssd-0.4.1-conf_check.patch
-Patch012: sssd-0.4.1-reload_conf.patch
-Patch013: sssd-0.4.1-reload_conf_2.patch
-Patch014: sssd-0.4.1-cve-2009-2410.patch
 
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
+Requires: libtdb >= 1.1.3
 
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
 
 %define servicename sssd
+%define sssdstatedir %{_localstatedir}/lib/sss
+%define dbpath %{sssdstatedir}/db
+%define pipepath %{sssdstatedir}/pipes
 
 ### Build Dependencies ###
 
@@ -48,6 +47,8 @@ BuildRequires: pcre-devel
 BuildRequires: libxslt
 BuildRequires: libxml2
 BuildRequires: docbook-style-xsl
+BuildRequires: krb5-devel
+BuildRequires: c-ares-devel
 
 %description
 Provides a set of daemons to manage access to remote directories and
@@ -59,17 +60,11 @@ services for projects like FreeIPA.
 %prep
 %setup -q
 
-%patch010 -p1 -b .debug_fn
-%patch011 -p1 -b .conf_check
-%patch012 -p1 -b .reload_conf
-%patch013 -p1 -b .reload_conf_2
-%patch014 -p1 -b .cve-2009-2410
-
 %build
 %configure \
     --without-tests \
-    --without-policykit \
-    --without-infopipe \
+    --with-db-path=%{dbpath} \
+    --with-pipe-path=%{pipepath} \
     --with-init-dir=%{_initrddir} \
     --enable-nsslibdir=/%{_lib}
 
@@ -86,7 +81,9 @@ rm -f \
     $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.la \
     $RPM_BUILD_ROOT/%{_libdir}/ldb/memberof.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.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
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
@@ -108,10 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{servicename}/
 %{_libdir}/%{name}/
 %{_libdir}/ldb/memberof.so
-%dir /var/lib/sss/
-%attr(700,root,root) %dir /var/lib/sss/db
-%dir /var/lib/sss/pipes
-%attr(700,root,root) %dir /var/lib/sss/pipes/private
+%{_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
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
 /%{_lib}/libnss_sss.so.2
@@ -119,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
+%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 
 %post
 /sbin/ldconfig
@@ -137,6 +136,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* 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
 - Fix for CVE-2009-2410 - Native SSSD users with no password set could log in
   without a password. (Patch by Stephen Gallagher)


--- sssd-0.4.1-conf_check.patch DELETED ---


--- sssd-0.4.1-cve-2009-2410.patch DELETED ---


--- sssd-0.4.1-debug_fn.patch DELETED ---


--- sssd-0.4.1-reload_conf.patch DELETED ---


--- sssd-0.4.1-reload_conf_2.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Aug 24 21:16:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 21:16:17 +0000
Subject: [pkgdb] icu: denisarnaud has requested watchbugzilla
Message-ID: <20090824211617.2E38410F86F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on icu (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From pbrobinson at fedoraproject.org  Mon Aug 24 21:20:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 21:20:11 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090824212011.A1E9A11C0376@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-serv5909/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-panel-myzone-0_0_1-2_fc11:HEAD:moblin-panel-myzone-0.0.1-2.fc11.src.rpm:1251148070


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:51:41 -0000	1.1
+++ .cvsignore	24 Aug 2009 21:20:11 -0000	1.2
@@ -0,0 +1 @@
+moblin-panel-myzone-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:51:41 -0000	1.1
+++ sources	24 Aug 2009 21:20:11 -0000	1.2
@@ -0,0 +1 @@
+4f7bfb14fa11d183c5cd0e150ed51806  moblin-panel-myzone-0.0.1.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug 24 21:23:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 21:23:13 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel moblin-panel-myzone.spec, NONE,
	1.1 import.log, 1.1, 1.2
Message-ID: <20090824212313.B259511C0044@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-serv7813/devel

Modified Files:
	import.log 
Added Files:
	moblin-panel-myzone.spec 
Log Message:
- initial import



--- NEW FILE moblin-panel-myzone.spec ---
Name:           moblin-panel-myzone
Version:        0.0.1
Release:        2%{?dist}
Summary:        Moblin Panel for MyZone

Group:          System Environment/Libraries
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)

BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: jana-devel
BuildRequires: mojito-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: dbus

%description
The Moblin mutter panel for MyZone. MyZone allows you to see 
that status of friends on social networks, chekck what you 
have on in your calendar, and more.

%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

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%find_lang %{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libpenge.so.*
%{_libexecdir}/moblin-panel-myzone
%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.myzone.service
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/libpenge.so

%changelog
* Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-2
- Updates from review

* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
- Initial packaging


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Aug 2009 21:20:11 -0000	1.1
+++ import.log	24 Aug 2009 21:23:13 -0000	1.2
@@ -1 +1,2 @@
 moblin-panel-myzone-0_0_1-2_fc11:HEAD:moblin-panel-myzone-0.0.1-2.fc11.src.rpm:1251148070
+moblin-panel-myzone-0_0_1-2_fc11:HEAD:moblin-panel-myzone-0.0.1-2.fc11.src.rpm:1251148888



From jwilson at fedoraproject.org  Mon Aug 24 21:33:36 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 24 Aug 2009 21:33:36 +0000 (UTC)
Subject: rpms/dmidecode/devel dmidecode-add-hewlett-packard-to-dmioem.patch, 
	NONE, 1.1 dmidecode-add-socket-lga1366.patch, NONE,
	1.1 dmidecode-pcie-v2-id.patch, NONE,
	1.1 dmidecode-recognize-more-memory.patch, NONE,
	1.1 dmidecode-smbios-2.6.1-additions.patch, NONE,
	1.1 dmidecode-warn-on-unsupported-smbios-version.patch, NONE,
	1.1 dmidecode.spec, 1.37, 1.38
Message-ID: <20090824213336.C6A0C11C0044@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8987

Modified Files:
	dmidecode.spec 
Added Files:
	dmidecode-add-hewlett-packard-to-dmioem.patch 
	dmidecode-add-socket-lga1366.patch dmidecode-pcie-v2-id.patch 
	dmidecode-recognize-more-memory.patch 
	dmidecode-smbios-2.6.1-additions.patch 
	dmidecode-warn-on-unsupported-smbios-version.patch 
Log Message:
* Mon Aug 24 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.38
- Add support for newer sockets, processors and pcie slot types


dmidecode-add-hewlett-packard-to-dmioem.patch:
 dmioem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dmidecode-add-hewlett-packard-to-dmioem.patch ---
--- dmidecode/dmioem.c~	2008/10/28 09:41:07	1.9
+++ dmidecode/dmioem.c	2009/07/27 12:07:39	1.10
@@ -41,7 +41,7 @@
  */
 void dmi_set_vendor(const char *s)
 {
-	if (strcmp(s, "HP") == 0)
+	if (strcmp(s, "HP") == 0 || strcmp(s, "Hewlett-Packard") == 0)
 		dmi_vendor = VENDOR_HP;
 }
 

dmidecode-add-socket-lga1366.patch:
 dmidecode.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE dmidecode-add-socket-lga1366.patch ---
--- dmidecode/dmidecode.c~	2009/06/19 11:55:35	1.142
+++ dmidecode/dmidecode.c	2009/07/27 12:20:01	1.143
@@ -1042,10 +1042,11 @@
 		"Socket LGA775",
 		"Socket S1",
 		"Socket AM2",
-		"Socket F (1207)" /* 0x18 */
+		"Socket F (1207)",
+		"Socket LGA1366" /* 0x19 */
 	};
 
-	if (code >= 0x01 && code <= 0x18)
+	if (code >= 0x01 && code <= 0x19)
 		return upgrade[code - 0x01];
 	return out_of_spec;
 }

dmidecode-pcie-v2-id.patch:
 dmidecode.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE dmidecode-pcie-v2-id.patch ---
--- dmidecode-2.10/dmidecode.c~	2009-08-24 16:09:42.228443932 -0400
+++ dmidecode-2.10/dmidecode.c	2009-08-24 16:23:50.480316768 -0400
@@ -1541,12 +1541,18 @@ static const char *dmi_slot_type(u8 code
 		"PCI Express x2",
 		"PCI Express x4",
 		"PCI Express x8",
-		"PCI Express x16" /* 0xAA */
+		"PCI Express x16", /* 0xAA */
+		"PCI Express Gen 2",
+		"PCI Express Gen 2 x1",
+		"PCI Express Gen 2 x2",
+		"PCI Express Gen 2 x4",
+		"PCI Express Gen 2 x8",
+		"PCI Express Gen 2 x16", /* 0xB0 */
 	};
 
 	if (code >= 0x01 && code <= 0x13)
 		return type[code - 0x01];
-	if (code >= 0xA0 && code <= 0xAA)
+	if (code >= 0xA0 && code <= 0xB0)
 		return type_0xA0[code - 0xA0];
 	return out_of_spec;
 }

dmidecode-recognize-more-memory.patch:
 dmidecode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dmidecode-recognize-more-memory.patch ---
--- dmidecode/dmidecode.c~	2009/04/30 08:19:37	1.141
+++ dmidecode/dmidecode.c	2009/06/19 11:55:35	1.142
@@ -2007,7 +2007,7 @@
 
 static void dmi_memory_array_capacity(u32 code)
 {
-	if (code == 0x8000000)
+	if (code == 0x80000000)
 		printf(" Unknown");
 	else
 	{

dmidecode-smbios-2.6.1-additions.patch:
 dmidecode.c |   39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

--- NEW FILE dmidecode-smbios-2.6.1-additions.patch ---
--- dmidecode-2.10/dmidecode.c~	2009-08-24 17:09:16.724316584 -0400
+++ dmidecode-2.10/dmidecode.c	2009-08-24 17:09:58.299317081 -0400
@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
 
 static const char *dmi_system_wake_up_type(u8 code)
 {
-	/* 3.3.2.1 */
+	/* 3.3.2.2 */
 	static const char *type[] = {
 		"Reserved", /* 0x00 */
 		"Other",
@@ -719,6 +719,12 @@ static const char *dmi_processor_family(
 		{ 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */
 		{ 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */
 
+		{ 0xAB, "Dual-Core Xeon 5200" },
+		{ 0xAC, "Dual-Core Xeon 7200" },
+		{ 0xAD, "Quad-Core Xeon 7300" },
+		{ 0xAE, "Quad-Core Xeon 7400" },
+		{ 0xAF, "Multi-Core Xeon 7400" },
+
 		{ 0xB0, "Pentium III Xeon" },
 		{ 0xB1, "Pentium III Speedstep" },
 		{ 0xB2, "Pentium 4" },
@@ -741,6 +747,8 @@ static const char *dmi_processor_family(
 		{ 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */
 		{ 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */
 		{ 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */
+		{ 0xC6, "Core i7" },
+		{ 0xC7, "Dual-Core Celeron" },
 
 		{ 0xC8, "IBM390" },
 		{ 0xC9, "G4" },
@@ -753,6 +761,17 @@ static const char *dmi_processor_family(
 		{ 0xD4, "C7" },
 		{ 0xD5, "Eden" },
 
+		{ 0xD6, "Multi-Core Xeon" },
+		{ 0xD7, "Dual-Core Xeon 3xxx" },
+		{ 0xD8, "Quad-Core Xeon 3xxx" },
+
+		{ 0xDA, "Dual-Core Xeon 5xxx" },
+		{ 0xDB, "Quad-Core Xeon 5xxx" },
+
+		{ 0xDD, "Dual-Core Xeon 7xxx" },
+		{ 0xDD, "Quad-Core Xeon 7xxx" },
+		{ 0xDD, "Multi-Core Xeon 7xxx" },
+
 		{ 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */
 		{ 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */
 		{ 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */
@@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi
 		"4-way Set-associative",
 		"Fully Associative",
 		"8-way Set-associative",
-		"16-way Set-associative" /* 0x08 */
+		"16-way Set-associative"
+		"12-way Set-associative"
+		"24-way Set-associative"
+		"32-way Set-associative"
+		"48-way Set-associative"
+		"64-way Set-associative" /* 0x0D */
 	};
 
-	if (code >= 0x01 && code <= 0x08)
+	if (code >= 0x01 && code <= 0x0D)
 		return type[code - 0x01];
 	return out_of_spec;
 }
@@ -2126,10 +2150,15 @@ static const char *dmi_memory_device_typ
 		"RDRAM",
 		"DDR",
 		"DDR2",
-		"DDR2 FB-DIMM" /* 0x14 */
+		"DDR2 FB-DIMM",
+		"Reserved",
+		"Reserved",
+		"Reserved",
+		"DDR3",
+		"FBD2", /* 0x19 */
 	};
 
-	if (code >= 0x01 && code <= 0x14)
+	if (code >= 0x01 && code <= 0x19)
 		return type[code - 0x01];
 	return out_of_spec;
 }

dmidecode-warn-on-unsupported-smbios-version.patch:
 dmidecode.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE dmidecode-warn-on-unsupported-smbios-version.patch ---
--- dmidecode/dmidecode.c~	2008/11/14 10:27:31	1.140
+++ dmidecode/dmidecode.c	2009/04/30 08:19:37	1.141
@@ -66,6 +66,8 @@
 #define out_of_spec "<OUT OF SPEC>"
 static const char *bad_index = "<BAD INDEX>";
 
+#define SUPPORTED_SMBIOS_VER 0x0206
+
 /*
  * Type-independant Stuff
  */
@@ -4005,6 +4007,13 @@
 	u8 *data;
 	int i = 0;
 
+	if (ver > SUPPORTED_SMBIOS_VER)
+	{
+		printf("# SMBIOS implementations newer than version %u.%u are not\n"
+		       "# fully supported by this version of dmidecode.\n",
+		       SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF);
+	}
+
 	if (opt.flags & FLAG_DUMP_BIN)
 	{
 		dmi_table_dump(base, len, devmem);


Index: dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- dmidecode.spec	24 Jul 2009 20:22:52 -0000	1.37
+++ dmidecode.spec	24 Aug 2009 21:33:36 -0000	1.38
@@ -1,11 +1,17 @@
 Summary:        Tool to analyse BIOS DMI data
 Name:           dmidecode
 Version:        2.10
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.2
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:	dmidecode-%{version}.tar.bz2
+Patch0:         dmidecode-add-hewlett-packard-to-dmioem.patch
+Patch1:         dmidecode-recognize-more-memory.patch
+Patch2:         dmidecode-add-socket-lga1366.patch
+Patch3:         dmidecode-warn-on-unsupported-smbios-version.patch
+Patch4:         dmidecode-pcie-v2-id.patch
+Patch5:         dmidecode-smbios-2.6.1-additions.patch
 URL:		http://www.nongnu.org/dmidecode/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: 	/usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
@@ -25,6 +31,12 @@ I/O ports (e.g. serial, parallel, USB).
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -48,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Mon Aug 24 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.38
+- Add support for newer sockets, processors and pcie slot types
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.10-1.36.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From myoung at fedoraproject.org  Mon Aug 24 21:34:54 2009
From: myoung at fedoraproject.org (myoung)
Date: Mon, 24 Aug 2009 21:34:54 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1294.2.57,
	1.1294.2.58 xen.pvops.post.patch, 1.1.2.24, 1.1.2.25
Message-ID: <20090824213454.5964511C0044@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8787

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec xen.pvops.post.patch 
Log Message:
pvops build failed, possibly due to CVS weirdness. Try committing again




xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/pci-swiotlb.c         |    5 ++---
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -p -r1.1.2.24 -r1.1.2.25
--- xen.pvops.post.patch	24 Aug 2009 21:09:26 -0000	1.1.2.24
+++ xen.pvops.post.patch	24 Aug 2009 21:34:54 -0000	1.1.2.25
@@ -1,4 +1,4 @@
-Reapply and merge in Fedora changes 
+Reapply and merge in Fedora changes
 
 --- a/drivers/pci/pci.h	2009-02-25 20:16:13.000000000 +0000
 +++ b/drivers/pci/pci.h	2009-02-25 20:40:21.000000000 +0000



From salimma at fedoraproject.org  Mon Aug 24 21:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 24 Aug 2009 21:44:32 +0000 (UTC)
Subject: rpms/vala/EL-5 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 vala.spec,
	1.30, 1.31
Message-ID: <20090824214432.50D3611C0044@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10059/EL-5

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
- Update F-10 and EL-5 to 0.7.5
- Remove obsoleted patch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	7 Jul 2009 19:31:08 -0000	1.21
+++ .cvsignore	24 Aug 2009 21:44:32 -0000	1.22
@@ -1 +1 @@
-vala-0.7.4.tar.bz2
+vala-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Jul 2009 19:31:08 -0000	1.21
+++ sources	24 Aug 2009 21:44:32 -0000	1.22
@@ -1 +1 @@
-c2bd7765e49e9c1b5fddc9e0aa69a927  vala-0.7.4.tar.bz2
+a102d582b2ac75b6bcdc5785683263fc  vala-0.7.5.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/EL-5/vala.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- vala.spec	7 Jul 2009 19:31:08 -0000	1.30
+++ vala.spec	24 Aug 2009 21:44:32 -0000	1.31
@@ -14,7 +14,7 @@
 %endif
 
 Name:           vala
-Version:        0.7.4
+Version:        0.7.5
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -117,7 +117,7 @@ An Emacs mode for editing Vala source co
 
 
 %build
-%configure --enable-vapigen --enable-gen-project
+%configure --enable-vapigen
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -184,6 +184,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.5-1
+- Update to 0.7.5
+
+* Tue Jul 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.4-2
+- Patch broken ModuleInit attribute (upstream bug 587444)
+
 * Tue Jul  7 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.4-1
 - Update to 0.7.4
 



From salimma at fedoraproject.org  Mon Aug 24 21:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 24 Aug 2009 21:44:32 +0000 (UTC)
Subject: rpms/vala/F-11 vala-0.7.4-moduleinit.patch,1.2,NONE
Message-ID: <20090824214432.9ABC011C0262@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10059/F-11

Removed Files:
	vala-0.7.4-moduleinit.patch 
Log Message:
- Update F-10 and EL-5 to 0.7.5
- Remove obsoleted patch




--- vala-0.7.4-moduleinit.patch DELETED ---



From salimma at fedoraproject.org  Mon Aug 24 21:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 24 Aug 2009 21:44:32 +0000 (UTC)
Subject: rpms/vala/F-10 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 vala.spec,
	1.37, 1.38 vala-0.7.4-moduleinit.patch, 1.2, NONE
Message-ID: <20090824214432.79F2B11C0044@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10059/F-10

Modified Files:
	.cvsignore sources vala.spec 
Removed Files:
	vala-0.7.4-moduleinit.patch 
Log Message:
- Update F-10 and EL-5 to 0.7.5
- Remove obsoleted patch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	7 Jul 2009 19:31:08 -0000	1.21
+++ .cvsignore	24 Aug 2009 21:44:32 -0000	1.22
@@ -1 +1 @@
-vala-0.7.4.tar.bz2
+vala-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Jul 2009 19:31:09 -0000	1.21
+++ sources	24 Aug 2009 21:44:32 -0000	1.22
@@ -1 +1 @@
-c2bd7765e49e9c1b5fddc9e0aa69a927  vala-0.7.4.tar.bz2
+a102d582b2ac75b6bcdc5785683263fc  vala-0.7.5.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-10/vala.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- vala.spec	14 Jul 2009 08:22:25 -0000	1.37
+++ vala.spec	24 Aug 2009 21:44:32 -0000	1.38
@@ -14,8 +14,8 @@
 %endif
 
 Name:           vala
-Version:        0.7.4
-Release:        2%{?dist}
+Version:        0.7.5
+Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -25,8 +25,6 @@ URL:            http://live.gnome.org/Va
 Source0:        http://download.gnome.org/sources/vala/0.7/vala-%{version}.tar.bz2
 Source1:	vala-mode.el
 Source2:	vala-init.el
-# http://bugzilla.gnome.org/show_bug.cgi?id=587444
-Patch0:         vala-0.7.4-moduleinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel flex bison devhelp gecko-libs >= 1.9
@@ -116,7 +114,6 @@ An Emacs mode for editing Vala source co
 
 %prep
 %setup -q
-%patch0 -p1 -b .moduleinit
 
 
 %build
@@ -187,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.5-1
+- Update to 0.7.5
+
 * Tue Jul 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.4-2
 - Patch broken ModuleInit attribute (upstream bug 587444)
 


--- vala-0.7.4-moduleinit.patch DELETED ---



From pbrobinson at fedoraproject.org  Mon Aug 24 21:47:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 21:47:39 +0000 (UTC)
Subject: rpms/moblin-panel-pasteboard/devel import.log, NONE,
	1.1 moblin-panel-pasteboard.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090824214739.28CBA11C0044@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-pasteboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10412/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-panel-pasteboard.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-panel-pasteboard-0_0_1-1_fc11:HEAD:moblin-panel-pasteboard-0.0.1-1.fc11.src.rpm:1251149299


--- NEW FILE moblin-panel-pasteboard.spec ---
Name:           moblin-panel-pasteboard
Version:        0.0.1
Release:        1%{?dist}
Summary:        Moblin Panel for Paste Board

Group:          System Environment/Libraries
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)

BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: dbus

%description
The Moblin mutter panel for Paste Board.

%prep
%setup -q

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%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
%{_libexecdir}/moblin-panel-pasteboard
%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.pasteboard.service
%{_datadir}/%{name}

%changelog
* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:54:12 -0000	1.1
+++ .cvsignore	24 Aug 2009 21:47:38 -0000	1.2
@@ -0,0 +1 @@
+moblin-panel-pasteboard-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-pasteboard/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:54:12 -0000	1.1
+++ sources	24 Aug 2009 21:47:38 -0000	1.2
@@ -0,0 +1 @@
+021077a72d5ed786a6eaa6dab232cd90  moblin-panel-pasteboard-0.0.1.tar.bz2



From rstrode at fedoraproject.org  Mon Aug 24 21:50:48 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 24 Aug 2009 21:50:48 +0000 (UTC)
Subject: rpms/gdm/devel .cvsignore, 1.77, 1.78 gdm.spec, 1.482, 1.483 sources,
	1.112, 1.113
Message-ID: <20090824215048.6475F11C0044@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11502

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
- update to 2.27.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	20 Jul 2009 17:53:48 -0000	1.77
+++ .cvsignore	24 Aug 2009 21:50:48 -0000	1.78
@@ -1 +1 @@
-gdm-2.27.4.tar.bz2
+gdm-2.27.90.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -p -r1.482 -r1.483
--- gdm.spec	21 Aug 2009 10:28:08 -0000	1.482
+++ gdm.spec	24 Aug 2009 21:50:48 -0000	1.483
@@ -15,13 +15,13 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.27.4
-Release: 7%{?dist}
+Version: 2.27.90
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
-Source: http://download.gnome.org/sources/gdm/2.25/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.27/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdm-password.pam
@@ -391,6 +391,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Aug 24 2009 Ray Strode <rstrode at redhat.com> 1:2.27.90-1
+- update to 2.27.90
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:2.27.4-7
 - rebuilt with new audit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	20 Jul 2009 17:53:48 -0000	1.112
+++ sources	24 Aug 2009 21:50:48 -0000	1.113
@@ -1 +1 @@
-82f19b1c68d70638d6f4a6676b1b438e  gdm-2.27.4.tar.bz2
+3b82e93e8bca941f35c35b3ec85d9acc  gdm-2.27.90.tar.bz2



From pbrobinson at fedoraproject.org  Mon Aug 24 22:00:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 22:00:02 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel moblin-panel-myzone.spec,1.1,1.2
Message-ID: <20090824220003.3C66911C0417@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-serv12479

Modified Files:
	moblin-panel-myzone.spec 
Log Message:
- release bump


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-myzone.spec	24 Aug 2009 21:23:13 -0000	1.1
+++ moblin-panel-myzone.spec	24 Aug 2009 22:00:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           moblin-panel-myzone
 Version:        0.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin Panel for MyZone
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-3
+- Bump release
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-2
 - Updates from review
 



From rstrode at fedoraproject.org  Mon Aug 24 22:01:12 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 24 Aug 2009 22:01:12 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.483,1.484
Message-ID: <20090824220112.95FB511C0044@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12704

Modified Files:
	gdm.spec 
Log Message:
add buildrequires



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- gdm.spec	24 Aug 2009 21:50:48 -0000	1.483
+++ gdm.spec	24 Aug 2009 22:01:12 -0000	1.484
@@ -59,6 +59,7 @@ Requires: pulseaudio-gdm-hooks
 Requires: libXau >= 1.0.4-4
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+BuildRequires: pkgconfig(libcanberra-gtk)
 BuildRequires: scrollkeeper >= 0:%{scrollkeeper_version}
 BuildRequires: pango-devel >= 0:%{pango_version}
 BuildRequires: gtk2-devel >= 0:%{gtk2_version}



From pbrobinson at fedoraproject.org  Mon Aug 24 22:20:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 24 Aug 2009 22:20:50 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.95,1.96
Message-ID: <20090824222050.9879711C0044@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14925

Modified Files:
	comps-f12.xml.in 
Log Message:
- add some more newly committed Moblin packages


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- comps-f12.xml.in	24 Aug 2009 13:13:35 -0000	1.95
+++ comps-f12.xml.in	24 Aug 2009 22:20:49 -0000	1.96
@@ -4258,8 +4258,12 @@
       <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-myzone</packagereq>
+      <packagereq type="mandatory">moblin-panel-pasteboard</packagereq>
+      <packagereq type="mandatory">moblin-panel-people</packagereq>
       <packagereq type="mandatory">moblin-session</packagereq>
       <packagereq type="mandatory">moblin-sound-theme</packagereq>
+      <packagereq type="mandatory">mutter</packagereq>
       <packagereq type="default">anjal</packagereq>
     </packagelist>
   </group>



From pkgdb at fedoraproject.org  Mon Aug 24 22:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:25:07 +0000
Subject: [pkgdb] mono: caillon has given up commit
Message-ID: <20090824222507.DA60110F86F@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on mono (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Mon Aug 24 22:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:25:10 +0000
Subject: [pkgdb] mono: caillon has given up commit
Message-ID: <20090824222510.8A64910F879@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on mono (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Mon Aug 24 22:25:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:25:17 +0000
Subject: [pkgdb] mono: caillon has given up commit
Message-ID: <20090824222517.D3E8B10F884@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on mono (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Mon Aug 24 22:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:25:25 +0000
Subject: [pkgdb] mono: caillon has given up commit
Message-ID: <20090824222525.A6E8410F86F@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on mono (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Mon Aug 24 22:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:25:29 +0000
Subject: [pkgdb] mono: caillon has given up commit
Message-ID: <20090824222529.A266310F879@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on mono (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Mon Aug 24 22:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:25:33 +0000
Subject: [pkgdb] mono: caillon has given up commit
Message-ID: <20090824222533.8CB2F10F890@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on mono (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:31 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222631.9929910F878@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:35 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222635.4D75A10F88B@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:38 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222638.D8C8110F881@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 1)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:41 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222641.B8D0D10F890@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 2)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:44 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222644.826DC10F895@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Red Hat Linux 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:48 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222648.8C64410F897@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:51 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222651.1BC0710F87B@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:54 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222654.5593A10F89F@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Mon Aug 24 22:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 24 Aug 2009 22:26:57 +0000
Subject: [pkgdb] Pyrex: caillon has given up commit
Message-ID: <20090824222657.C0D3510F8A2@bastion2.fedora.phx.redhat.com>

caillon has given up the commit acl on Pyrex (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Pyrex



From ausil at fedoraproject.org  Mon Aug 24 22:28:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 22:28:21 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.3,1.4
Message-ID: <20090824222821.DE68811C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16508

Modified Files:
	nss-util.spec 
Log Message:
Requires nss-devel for the -devel package dont obsolete provide it we only have a subset of headers.
dont ship the headers in nss-util



Index: nss-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-util.spec	20 Aug 2009 19:37:49 -0000	1.3
+++ nss-util.spec	24 Aug 2009 22:28:21 -0000	1.4
@@ -43,11 +43,10 @@ Utilities for Network Security Services 
 %package devel
 Summary:          Development libraries for Network Security Services Utilities
 Group:            Development/Libraries
-Obsoletes:        nss-devel < 3.12.3.99.3-8
-Provides:         nss-devel = 3.12.3.99.3-8
 Requires:         nss-util = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
+Requires:         nss-devel
 
 %description devel
 Header and utility library files for doing development with Network Security Services.
@@ -164,7 +163,6 @@ done
 %files
 %defattr(-,root,root)
 /%{_lib}/libnssutil3.so
-%{_includedir}/nss3
 
 %files devel
 %defattr(-,root,root)
@@ -208,6 +206,10 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-10
+- dont include the headers in nss-util only in the -devel package
+- nss-util-devel Requires nss-devel since its only providing a subset of the headers.
+
 * Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-9
 - Provide nss-devel since we obsolete it
 



From nushio at fedoraproject.org  Mon Aug 24 22:29:00 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Mon, 24 Aug 2009 22:29:00 +0000 (UTC)
Subject: rpms/gnome-do/F-11 gnome-do.spec,1.41,1.42
Message-ID: <20090824222900.0CA2E11C0044@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16700

Modified Files:
	gnome-do.spec 
Log Message:



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-11/gnome-do.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gnome-do.spec	21 Aug 2009 04:13:15 -0000	1.41
+++ gnome-do.spec	24 Aug 2009 22:28:59 -0000	1.42
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -77,6 +77,7 @@ desktop-file-install --delete-original  
 
 #own this dir:
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/
 
 %find_lang %{name}
 
@@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 24 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-2
+- Fixes gnome-do plugin permissions. 
+
 * Thu Aug 20 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-1
 - Update to 0.8.2
 



From ausil at fedoraproject.org  Mon Aug 24 22:29:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 22:29:11 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.4,1.5
Message-ID: <20090824222911.AA66D11C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16757

Modified Files:
	nss-util.spec 
Log Message:
bump to -10



Index: nss-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-util.spec	24 Aug 2009 22:28:21 -0000	1.4
+++ nss-util.spec	24 Aug 2009 22:29:11 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-Release:          9%{?dist}
+Release:          10%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries



From nushio at fedoraproject.org  Mon Aug 24 22:29:32 2009
From: nushio at fedoraproject.org (Juan Manuel Rodriguez Moreno)
Date: Mon, 24 Aug 2009 22:29:32 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.40,1.41
Message-ID: <20090824222932.6294111C0044@cvs1.fedora.phx.redhat.com>

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16818

Modified Files:
	gnome-do.spec 
Log Message:



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gnome-do.spec	21 Aug 2009 04:13:16 -0000	1.40
+++ gnome-do.spec	24 Aug 2009 22:29:32 -0000	1.41
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -77,6 +77,7 @@ desktop-file-install --delete-original  
 
 #own this dir:
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/
 
 %find_lang %{name}
 
@@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Aug 24 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-2
+- Fixes gnome-do plugin permissions. 
+
 * Thu Aug 20 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-1
 - Update to 0.8.2
 



From jjames at fedoraproject.org  Mon Aug 24 22:30:42 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 22:30:42 +0000 (UTC)
Subject: rpms/xemacs-packages-base/devel
	xemacs-packages-base-20090624-apel-503185.patch, NONE,
	1.1 xemacs-packages-base-20090624-dired-504422.patch, NONE,
	1.1 xemacs-packages-base-20090824-timer.patch, NONE,
	1.1 xemacs-packages-base.spec, 1.7, 1.8
Message-ID: <20090824223042.A5F0911C0371@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17131/devel

Modified Files:
	xemacs-packages-base.spec 
Added Files:
	xemacs-packages-base-20090624-apel-503185.patch 
	xemacs-packages-base-20090624-dired-504422.patch 
	xemacs-packages-base-20090824-timer.patch 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
- Add APEL patch to fix bz 503185 for XEmacs.
- Add dired patch to fix bz 504422.
- Add itimer patch preemptively.


xemacs-packages-base-20090624-apel-503185.patch:
 ChangeLog          |    4 +
 ChangeLog.upstream |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 Makefile           |   22 +++++---
 README.en          |   11 ----
 README.ja          |   13 -----
 alist.el           |  101 ++++++++++++++++++++++++++++++++++++++++
 apel-ver.el        |    9 ++-
 atype.el           |    4 -
 broken.el          |    4 -
 calist.el          |    6 +-
 emu.el             |    4 -
 file-detect.el     |    4 -
 filename.el        |   62 +++++++++++++++----------
 install.el         |   91 ++++++++++++++++++++++++++----------
 inv-xemacs.el      |    4 -
 invisible.el       |    4 -
 mcharset.el        |    4 -
 mcs-20.el          |    4 -
 mcs-ltn1.el        |    4 -
 mcs-xmu.el         |    4 -
 mule-caesar.el     |    4 -
 path-util.el       |    4 -
 pccl-20.el         |    4 -
 pccl.el            |    4 -
 pces-20.el         |    4 -
 pces-raw.el        |    4 -
 pces-xfc.el        |    4 -
 pces-xm.el         |    4 -
 pces.el            |    4 -
 pcustom.el         |    4 -
 poe-xemacs.el      |  122 ++++++++++++++++++++++++++++++++++++++++---------
 poe.el             |   74 +++++++++++++++++++++++------
 poem-ltn1.el       |    4 -
 poem-xm.el         |   17 ++++--
 poem.el            |   14 ++++-
 product.el         |    4 -
 pym.el             |    4 -
 richtext.el        |    4 -
 static.el          |    4 -
 39 files changed, 592 insertions(+), 185 deletions(-)

--- NEW FILE xemacs-packages-base-20090624-apel-503185.patch ---
Index: xemacs-packages/apel/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog,v
retrieving revision 1.42
diff -d -u -r1.42 ChangeLog
--- xemacs-packages/apel/ChangeLog	15 Aug 2007 07:38:42 -0000	1.42
+++ xemacs-packages/apel/ChangeLog	3 Jul 2009 22:02:50 -0000
@@ -1,3 +1,7 @@
+2009-07-01  Jerry James  <james at xemacs.org>
+
+	* *.el, README.*, ChangeLog.upstream: Sync with 10.7.
+
 2007-08-15  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.33 released.
Index: xemacs-packages/apel/ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog.upstream,v
retrieving revision 1.1
diff -d -u -r1.1 ChangeLog.upstream
--- xemacs-packages/apel/ChangeLog.upstream	6 Dec 2005 10:47:17 -0000	1.1
+++ xemacs-packages/apel/ChangeLog.upstream	3 Jul 2009 22:02:51 -0000
@@ -1,3 +1,130 @@
+2007-02-14  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL: Version 10.7 released.
+
+	* Makefile (VERSION): Update to 10.7.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL-MK (config-apel-package): Use
+	`install-get-default-package-directory'.
+
+	* install.el (install-get-default-package-directory): New
+	function.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* apel-ver.el (apel-ver): Change APEL version to 10.7.
+
+2005-05-08  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* poem-xm.el (char-valid-p): New alias.
+
+2006-12-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Avoid an error concerning
+	PACKAGEDIR with old XEmacs that doesn't use the package system.
+
+2006-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-update-package-files): Use
+	batch-update-directory-autoloads if it is available instead of
+	batch-update-directory.
+
+2006-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Check for
+	(early|late|last)-package-hierarchies and configure-package-path
+	as well as (early|late|last)-packages.
+
+2006-11-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* time-stamp.el: Remove.  Suggested by Stephen Gildea, the
+	maintainer of time-stamp.el.
+
+	* EMU-ELS (emu-modules): Exclude it.
+
+	* README.en, README.ja: Remove time-stamp.el entry.
+
+2006-04-24  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-detect-elisp-directory): Fix 2002-11-29
+	change; assume default-load-path contains nil; use regexp-quote to
+	compare directories even in Emacs.
+
+2005-12-06  Ville Skytt?  <scop at xemacs.org>
+
+	* poe.el (minor-mode-overriding-map-alist): Doc fix.
+
+	* product.el (product-version-as-string): Doc fix.
+
+2002-11-29  Ben Wing  <ben at xemacs.org>
+
+	* install.el (install-detect-elisp-directory): Fix problems
+	handling backslashes in filenames (Windows).
+
+2005-06-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* filename.el (filename-special-filter-1): New macro defined for
+	filename-special-filter to use aref instead of sref for the recent
+	Emacsen.
+	(filename-special-filter): Use it.
+
+2005-06-05  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
+
+2005-05-10  TAKAHASHI Kaoru  <kaoru at kaisei.org>
+
+	* poe.el (split-string): Import from Emacs 22. Add omit-nulls
+	argument.
+
+2005-05-03  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poem.el (characterp): Use `char-valid-p' if it exists.
+	* poem.el (char-or-char-int-p): Ditto.
+
+2005-02-23  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Attempt to load `timer-funcs'
+	before `timer'.
+
+2004-09-27  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* README.en, README.ja (CVS): Remove the description about
+	developers' pserver access.
+
+2004-02-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* calist.el (use-calist-package): Add missing arg to `format'.
+
+2004-01-26  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* Makefile: Make `elc' into the default entry.
+
+2004-01-07  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Don't use `defadvice' in order to
+	avoid a conflict with the Gnus version.
+
+2003-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Fully implement it for the recent
+	XEmacsen when the fsf-compat package is not available.
+	(run-at-time-tick-tock): Check closely whether a bug is in
+	`start-itimer'.
+
+2003-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Redefine it to make it punctual.
+
+2003-09-05  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poem-xm.el (char-length): Don't use `defun-maybe' to define it
+	since this module may be installed as the XEmacs package which
+	should be usable by all the XEmacs 21.x series.
+
+

 2003-07-05  Yuuichi Teranishi  <teranisi at gohome.org>
 
 	* APEL: Version 10.6 released.
@@ -278,7 +405,7 @@
 	(minor-mode-map-alist): Ditto.
 
 	* README.en ((d) make.bat (for MS-DOS family)): New section.
-	* README.ja ((d) make.bat $B$rMxMQ$9$k(B (MS-DOS $B7O(B OS $B$N>l9g(B)):
+	* README.ja ((d) make.bat $(B$rMxMQ$9$k(B (MS-DOS $(B7O(B OS $(B$N>l9g(B)):
 	Ditto.
 
 2000-12-22  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
@@ -3064,7 +3191,7 @@
 
 	* APEL: Version 8.4 was released.
 
-	* EMU-ELS: Don't use HIRAGANA LETTER A ($B$"(B) to detect character
+	* EMU-ELS: Don't use HIRAGANA LETTER A ($(B$"(B) to detect character
  	indexing (Emacs 20.3 or later).
 
 1998-04-20  MORIOKA Tomohiko  <morioka at jaist.ac.jp>
Index: xemacs-packages/apel/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/Makefile,v
retrieving revision 1.43
diff -d -u -r1.43 Makefile
--- xemacs-packages/apel/Makefile	15 Aug 2007 07:38:42 -0000	1.43
+++ xemacs-packages/apel/Makefile	3 Jul 2009 22:02:51 -0000
@@ -18,7 +18,7 @@
 # Boston, MA  02110-1301  USA
 
 VERSION = 1.33
-AUTHOR_VERSION = 10.6
+AUTHOR_VERSION = 10.7
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = apel
 PKG_TYPE = regular
@@ -27,22 +27,26 @@
 
 include ../../Local.rules.inc
 
-ELCS = apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
+ELCS = alist.elc apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
 	install.elc inv-xemacs.elc invisible.elc mcharset.elc \
-	mcs-20.elc mcs-ltn1.elc mule-caesar.elc path-util.elc \
-	pccl.elc poe-xemacs.elc poe.elc poem-ltn1.elc poem-xm.elc \
-	poem.elc product.elc pym.elc richtext.elc static.elc \
-	pcustom.elc pces.elc pces-raw.elc pces-20.elc pces-xfc.elc \
-	atype.elc file-detect.elc
+	mule-caesar.elc path-util.elc pccl.elc pces-20.elc pces-xfc.elc \
+	pces.elc pcustom.elc poe-xemacs.elc poe.elc poem.elc product.elc \
+	pym.elc richtext.elc static.elc
 
 ## The following files are no longer in upstream apel, but tm needs them.
 ELCS += std11.elc std11-parse.elc
 
+## The following files are considered obsolete, but bbdb-rmail needs them.
+ELCS += atype.elc file-detect.elc
+
+## The following files are only needed for non-MULE XEmacsen.
+ELCS += mcs-ltn1.elc poem-ltn1.elc
+
 EXTRA_SOURCES = README.en ChangeLog.upstream
 
 ifeq ($(BUILD_WITHOUT_MULE),)
-# ELCS += emu-x20.elc
-ELCS += mcs-xm.elc pccl-20.elc pces-xm.elc mcs-xmu.elc
+ELCS += mcs-20.elc mcs-xm.elc mcs-xmu.elc pccl-20.elc \
+	pces-raw.elc pces-xm.elc poem-xm.elc
 EXTRA_SOURCES += README.ja
 endif
 
Index: xemacs-packages/apel/README.en
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.en,v
retrieving revision 1.4
diff -d -u -r1.4 README.en
--- xemacs-packages/apel/README.en	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.en	3 Jul 2009 22:02:51 -0000
@@ -99,11 +99,6 @@
 
   tinycustom.el --- emulation module of custom.el
 
-** time-stamp.el
-
-This is a utility to maintain last change time stamps in files edited
-by Emacs.
-
 ** timezone.el
 
 This is a utility of time zone.  This is a Y2K fixed version.   This
@@ -242,7 +237,7 @@
 to really regularize eol codes to CRLF.  If you need further
 information, see the following URL (n.b. Japanese only)
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 * load-path (for Emacs or MULE)
 
@@ -493,9 +488,5 @@
 
 with your account name and your public key for ssh.  cvsroot is
 :ext:cvs at cvs.m17n.org:/cvs/root.
-
-If you cannot use ssh, please send UNIX /etc/passwd style crypted
-password.  you can commit with the cvsroot
-:pserver:<accountname>@cvs.m17n.org:/cvs/root.
 
 We hope you will join the open development.
Index: xemacs-packages/apel/README.ja
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.ja,v
retrieving revision 1.4
diff -d -u -r1.4 README.ja
--- xemacs-packages/apel/README.ja	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.ja	3 Jul 2009 22:02:51 -0000
@@ -95,10 +95,6 @@
 
   tinycustom.el --- custom.el $B$N%(%_%e%l!<%7%g%s$r9T$J$&(B
 
-** time-stamp.el
-
-Emacs $B$K$h$kJT=8$N:]!":G=*=$@5;~9o$rJ]B8$9$k$?$a$N%f!<%F%#%j%F%#!#(B
-
 ** timezone.el
 
 $B%?%$%`%>!<%s%f!<%F%#%j%F%#!#(B2000 $BG/LdBjBP1~HG!#(BEmacs 18 $B$H(B GNUS 3.14.4
@@ -229,7 +225,7 @@
 
 $B>e5-$NNc$G$O!"(Bmeadow $B$N%P%$%J%j$,(B c:\usr\Meadow\1.10\bin\meadow95.exe
 $B$K%$%s%9%H!<%k$5$l$F$$$k$3$H$rA0Ds$K$7$F$$$^$9!#$=$NA0Ds$K4p$E$-!"(BAPEL
-$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B 
+$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B
 
   c:\usr\Meadow\site-lisp
 
@@ -311,7 +307,7 @@
 $B$-$^$;$s$N$G9TKv%3!<%I$r(B CRLF $B$K=$@5$7$F$*;H$$2<$5$$!#$3$NLdBj$K$D$$$F(B
 $B>\$7$/$O!"(B
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 $B$r$4;2>H2<$5$$!#(B
 
@@ -585,10 +581,5 @@
 
 $B$K%"%+%&%s%HL>$H!"(Bssh $B$N8x3+80$rAw$C$F$/$@$5$$!#(Bssh $B7PM3$G$O!"(Bcvsroot
 $B$O(B :ext:cvs at cvs.m17n.org:/cvs/root $B$H$J$j$^$9!#(B
-
-$B$I$&$7$F$b(B ssh $B$,;H$($J$$>l9g!"(Bpserver $B7PM3$G$b3+H/$K;22C$G$-$^$9!#$3(B
-$B$N>l9g!"(BUNIX $B$N(B /etc/passwd $BMM<0$G0E9f2=$5$l$?%Q%9%o!<%I$rAw$C$F2<$5$$!#(B
-$B$3$N>l9g(B cvsroot $B$O(B :pserver:<$B%"%+%&%s%HL>(B>@cvs.m17n.org:/cvs/root $B$H(B
-$B$J$j$^$9!#(B
 
 $B3+$+$l$?3+H/$K;22C$7$F$/$@$5$k$3$H$r4|BT$7$^$9!#(B
Index: xemacs-packages/apel/alist.el
===================================================================
RCS file: xemacs-packages/apel/alist.el
diff -N xemacs-packages/apel/alist.el
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-packages/apel/alist.el	3 Jul 2009 22:02:51 -0000
@@ -0,0 +1,101 @@
+;;; alist.el --- utility functions for association list
+
+;; Copyright (C) 1993,1994,1995,1996,1998,2000 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
+;; Keywords: alist
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+;;;###autoload
+(defun put-alist (key value alist)
+  "Set cdr of an element (KEY . ...) in ALIST to VALUE and return ALIST.
+If there is no such element, create a new pair (KEY . VALUE) and
+return a new alist whose car is the new pair and cdr is ALIST."
+  (let ((elm (assoc key alist)))
+    (if elm
+	(progn
+	  (setcdr elm value)
+	  alist)
+      (cons (cons key value) alist))))
+
+;;;###autoload
+(defun del-alist (key alist)
+  "Delete an element whose car equals KEY from ALIST.
+Return the modified ALIST."
+  (let ((pair (assoc key alist)))
+    (if pair
+	(delq pair alist)
+      alist)))
+
+;;;###autoload
+(defun set-alist (symbol key value)
+  "Set cdr of an element (KEY . ...) in the alist bound to SYMBOL to VALUE."
+  (or (boundp symbol)
+      (set symbol nil))
+  (set symbol (put-alist key value (symbol-value symbol))))
+
+;;;###autoload
+(defun remove-alist (symbol key)
+  "Delete an element whose car equals KEY from the alist bound to SYMBOL."
+  (and (boundp symbol)
+       (set symbol (del-alist key (symbol-value symbol)))))
+
+;;;###autoload
+(defun modify-alist (modifier default)
+  "Store elements in the alist MODIFIER in the alist DEFAULT.
+Return the modified alist."
+  (mapcar (function
+	   (lambda (as)
+	     (setq default (put-alist (car as)(cdr as) default))))
+	  modifier)
+  default)
+
+;;;###autoload
+(defun set-modified-alist (symbol modifier)
+  "Store elements in the alist MODIFIER in an alist bound to SYMBOL.
+If SYMBOL is not bound, set it to nil at first."
+  (if (not (boundp symbol))
+      (set symbol nil))
+  (set symbol (modify-alist modifier (eval symbol))))
+
+
+;;; @ association-vector-list
+;;;
+
+;;;###autoload
+(defun vassoc (key avlist)
+  "Search AVLIST for an element whose first element equals KEY.
+AVLIST is a list of vectors.
+See also `assoc'."
+  (while (and avlist
+	      (not (equal key (aref (car avlist) 0))))
+    (setq avlist (cdr avlist)))
+  (and avlist
+       (car avlist)))
+
+
+;;; @ end
+;;;
+
+(require 'product)
+(product-provide (provide 'alist) (require 'apel-ver))
+
+;;; alist.el ends here
Index: xemacs-packages/apel/apel-ver.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/apel-ver.el,v
retrieving revision 1.2
diff -d -u -r1.2 apel-ver.el
--- xemacs-packages/apel/apel-ver.el	6 Dec 2005 10:47:17 -0000	1.2
+++ xemacs-packages/apel/apel-ver.el	3 Jul 2009 22:02:51 -0000
@@ -1,6 +1,6 @@
 ;;; apel-ver.el --- Declare APEL version.
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei at aqua.ocn.ne.jp>
 ;;	Keiichi Suzuki <keiichi at nanap.org>
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -43,7 +43,8 @@
   ;; (product-define "APEL" nil '(10 3))	; Released 30 December 2000
   ;; (product-define "APEL" nil '(10 4))	; Released 04 October 2002
   ;; (product-define "APEL" nil '(10 5))	; Released 06 June 2003
-  (product-define "APEL" nil '(10 6))		; Released 05 July 2003
+  ;; (product-define "APEL" nil '(10 6))	; Released 05 July 2003
+  (product-define "APEL" nil '(10 7))
   )
 
 (defun apel-version ()
Index: xemacs-packages/apel/atype.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/atype.el,v
retrieving revision 1.5
diff -d -u -r1.5 atype.el
--- xemacs-packages/apel/atype.el	6 Dec 2005 10:47:17 -0000	1.5
+++ xemacs-packages/apel/atype.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/broken.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/broken.el,v
retrieving revision 1.5
diff -d -u -r1.5 broken.el
--- xemacs-packages/apel/broken.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/broken.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/calist.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/calist.el,v
retrieving revision 1.3
diff -d -u -r1.3 calist.el
--- xemacs-packages/apel/calist.el	10 Jul 2000 04:41:04 -0000	1.3
+++ xemacs-packages/apel/calist.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,7 +48,7 @@
 	      (if (intern-soft (symbol-name sym)
 			       calist-field-match-method-obarray)
 		  (signal 'conflict-of-calist-symbol
-			  (list (format "Conflict of symbol %s")))
+			  (list (format "Conflict of symbol %s" sym)))
 		(if (fboundp sym)
 		    (define-calist-field-match-method
 		      sym (symbol-function sym))
Index: xemacs-packages/apel/emu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/emu.el,v
retrieving revision 1.9
diff -d -u -r1.9 emu.el
--- xemacs-packages/apel/emu.el	6 Dec 2005 10:47:18 -0000	1.9
+++ xemacs-packages/apel/emu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/file-detect.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/file-detect.el,v
retrieving revision 1.5
diff -d -u -r1.5 file-detect.el
--- xemacs-packages/apel/file-detect.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/file-detect.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/filename.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/filename.el,v
retrieving revision 1.4
diff -d -u -r1.4 filename.el
--- xemacs-packages/apel/filename.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/filename.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -34,8 +34,8 @@
   "Apply initial ARGUMENT to sequence of FUNCTIONS.
 FUNCTIONS is list of functions.
 
-(poly-funcall '(f1 f2 .. fn) arg) is as same as
-(fn .. (f2 (f1 arg)) ..).
+\(poly-funcall '(f1 f2 .. fn) arg) is as same as
+\(fn .. (f2 (f1 arg)) ..).
 
 For example, (poly-funcall '(car number-to-string) '(100)) returns
 \"100\"."
@@ -71,7 +71,7 @@
 Moreover, if you want to convert Japanese filename to roman string by kakasi,
 
 \(if \(exec-installed-p \"kakasi\"\)
-    \(setq file-name-filters
+    \(setq filename-filters
 	  \(append '\(filename-japanese-to-roman-string\) filename-filters\)\)\)")
 
 ;;; @ filters
@@ -91,26 +91,40 @@
   (let ((code (char-int character)))
     (or (< code 32)(= code 127))))
 
+(eval-when-compile
+  (defmacro filename-special-filter-1 (string)
+    (let (sref inc-i)
+      (if (or (not (fboundp 'sref))
+	      (>= emacs-major-version 21)
+	      (and (= emacs-major-version 20)
+		   (>= emacs-minor-version 3)))
+	  (setq sref 'aref
+		inc-i '(1+ i))
+	(setq sref 'aref
+	      inc-i '(+ i (char-length chr))))
+      (` (let ((len (length (, string)))
+	       (b 0)(i 0)
+	       (dest ""))
+	   (while (< i len)
+	     (let ((chr ((, sref) (, string) i))
+		   (lst filename-replacement-alist)
+		   ret)
+	       (while (and lst (not ret))
+		 (if (if (functionp (car (car lst)))
+			 (setq ret (funcall (car (car lst)) chr))
+		       (setq ret (memq chr (car (car lst)))))
+		     t			; quit this loop.
+		   (setq lst (cdr lst))))
+	       (if ret
+		   (setq dest (concat dest (substring (, string) b i)
+				      (cdr (car lst)))
+			 i (, inc-i)
+			 b i)
+		 (setq i (, inc-i)))))
+	   (concat dest (substring (, string) b)))))))
+
 (defun filename-special-filter (string)
-  (let ((len (length string))
-	(b 0)(i 0)
-	(dest ""))
-    (while (< i len)
-      (let ((chr (sref string i))
-            (lst filename-replacement-alist)
-            ret)
-        (while (and lst (not ret))
-          (if (if (functionp (car (car lst)))
-                  (setq ret (funcall (car (car lst)) chr))
-                (setq ret (memq chr (car (car lst)))))
-              t                         ; quit this loop.
-            (setq lst (cdr lst))))
-	(if ret
-	    (setq dest (concat dest (substring string b i)(cdr (car lst)))
-		  i (+ i (char-length chr))
-		  b i)
-	  (setq i (+ i (char-length chr))))))
-    (concat dest (substring string b))))
+  (filename-special-filter-1 string))
 
 (defun filename-eliminate-top-low-lines (string)
   (if (string-match "^_+" string)
Index: xemacs-packages/apel/install.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/install.el,v
retrieving revision 1.6
diff -d -u -r1.6 install.el
--- xemacs-packages/apel/install.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/install.el	3 Jul 2009 22:02:51 -0000
@@ -1,8 +1,9 @@
 ;;; install.el --- Emacs Lisp package install utility
 
-;; Copyright (C) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+;; 	Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka at jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Created: 1996/08/18
 ;; Keywords: install, byte-compile, directory detection
 
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -158,6 +159,9 @@
     ;; v18 does not have standard site directory.
     "local.lisp"))
 
+;; Avoid compile warning.
+(eval-when-compile (autoload 'replace-in-string "subr"))
+
 (defun install-detect-elisp-directory (&optional prefix elisp-prefix
 						 allow-version-specific)
   (or prefix
@@ -165,28 +169,36 @@
   (or elisp-prefix
       (setq elisp-prefix install-elisp-prefix))
   (or (catch 'tag
-	(let ((rest default-load-path)
-	      (regexp (concat "^"
-			      ;; XEmacs change: handle backslashes (Windows)
-			      (regexp-quote (replace-in-string
-					     (file-name-as-directory
-					      (expand-file-name elisp-prefix))
-					     "\\\\" "/"))
-			      ".*/"
-			      (regexp-quote
-			       (replace-in-string prefix "\\\\" "/"))
-			      "/?$")))
+	(let ((rest (delq nil (copy-sequence default-load-path)))
+	      (regexp
+	       (concat "^"
+		       (regexp-quote (if (featurep 'xemacs)
+					 ;; Handle backslashes (Windows)
+					 (replace-in-string
+					  (file-name-as-directory
+					   (expand-file-name prefix))
+					  "\\\\" "/")
+				       (file-name-as-directory
+					(expand-file-name prefix))))
+		       ".*/"
+		       (regexp-quote
+			(if (featurep 'xemacs)
+			    ;; Handle backslashes (Windows)
+			    (replace-in-string elisp-prefix "\\\\" "/")
+			  elisp-prefix))
+		       "/?$"))
+	      dir)
 	  (while rest
-	    ;; XEmacs change: handle backslashes (Windows)
-	    (if (string-match regexp
-			      (replace-in-string (car rest) "\\\\" "/"))
+	    (setq dir (if (featurep 'xemacs)
+			  ;; Handle backslashes (Windows)
+			  (replace-in-string (car rest) "\\\\" "/")
+			(car rest)))
+	    (if (string-match regexp dir)
 		(if (or allow-version-specific
 			(not (string-match (format "/%d\\.%d"
 						   emacs-major-version
 						   emacs-minor-version)
-					   ;; XEmacs change: handle backslashes
-					   (replace-in-string (car rest)
-							      "\\\\" "/"))))
+					   dir)))
 		    (throw 'tag (car rest))))
 	    (setq rest (cdr rest)))))
       (expand-file-name (concat (if (and (not (featurep 'xemacs))
@@ -215,6 +227,32 @@
 ;;; @ for XEmacs package system
 ;;;
 
+(defun install-get-default-package-directory ()
+  (let ((dirs (append
+	       (cond
+		((boundp 'early-package-hierarchies)
+		 (append (if early-package-load-path
+			     early-package-hierarchies)
+			 (if late-package-load-path
+			     late-package-hierarchies)
+			 (if last-package-load-path
+			     last-package-hierarchies)) )
+		((boundp 'early-packages)
+		 (append (if early-package-load-path
+			     early-packages)
+			 (if late-package-load-path
+			     late-packages)
+			 (if last-package-load-path
+			     last-packages)) ))
+	       (if (and (boundp 'configure-package-path)
+			(listp configure-package-path))
+		   (delete "" configure-package-path))))
+	dir)
+    (while (and (setq dir (car dirs))
+		(not (file-exists-p dir)))
+      (setq dirs (cdr dirs)))
+    dir))
+
 (defun install-update-package-files (package dir &optional just-print)
   (cond
    (just-print
@@ -233,10 +271,13 @@
     (princ (format "Wrote %s\n"
 		   (expand-file-name "custom-load.elc" dir))))
    (t
-    (setq autoload-package-name package)
-
-    (let ((command-line-args-left (list dir)))
-      (batch-update-directory))
+    (if (fboundp 'batch-update-directory-autoloads)
+	;; XEmacs 21.5.19 and newer.
+	(let ((command-line-args-left (list package dir)))
+	  (batch-update-directory-autoloads))
+      (setq autoload-package-name package)
+      (let ((command-line-args-left (list dir)))
+	(batch-update-directory)))
 
     (let ((command-line-args-left (list dir)))
       (Custom-make-dependencies))
Index: xemacs-packages/apel/inv-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/inv-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 inv-xemacs.el
--- xemacs-packages/apel/inv-xemacs.el	10 Jul 2000 04:41:04 -0000	1.2
+++ xemacs-packages/apel/inv-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/invisible.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/invisible.el,v
retrieving revision 1.2
diff -d -u -r1.2 invisible.el
--- xemacs-packages/apel/invisible.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/invisible.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcharset.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcharset.el,v
retrieving revision 1.4
diff -d -u -r1.4 mcharset.el
--- xemacs-packages/apel/mcharset.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/mcharset.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-20.el,v
retrieving revision 1.6
diff -d -u -r1.6 mcs-20.el
--- xemacs-packages/apel/mcs-20.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/mcs-20.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mcs-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-ltn1.el,v
retrieving revision 1.3
diff -d -u -r1.3 mcs-ltn1.el
--- xemacs-packages/apel/mcs-ltn1.el	6 Dec 2005 10:47:18 -0000	1.3
+++ xemacs-packages/apel/mcs-ltn1.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-xmu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-xmu.el,v
retrieving revision 1.1
diff -d -u -r1.1 mcs-xmu.el
--- xemacs-packages/apel/mcs-xmu.el	10 Jul 2000 04:41:05 -0000	1.1
+++ xemacs-packages/apel/mcs-xmu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mule-caesar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mule-caesar.el,v
retrieving revision 1.4
diff -d -u -r1.4 mule-caesar.el
--- xemacs-packages/apel/mule-caesar.el	10 Jul 2000 04:41:05 -0000	1.4
+++ xemacs-packages/apel/mule-caesar.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/path-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/path-util.el,v
retrieving revision 1.5
diff -d -u -r1.5 path-util.el
--- xemacs-packages/apel/path-util.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/path-util.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl-20.el,v
retrieving revision 1.4
diff -d -u -r1.4 pccl-20.el
--- xemacs-packages/apel/pccl-20.el	14 Aug 2007 21:23:02 -0000	1.4
+++ xemacs-packages/apel/pccl-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl.el,v
retrieving revision 1.6
diff -d -u -r1.6 pccl.el
--- xemacs-packages/apel/pccl.el	14 Aug 2007 21:23:02 -0000	1.6
+++ xemacs-packages/apel/pccl.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; ##### Much of the logic here is flawed in the context of XEmacs
 ;;; packages.  All the static-if and broken-facility stuff is evaluated at
Index: xemacs-packages/apel/pces-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-20.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-20.el
--- xemacs-packages/apel/pces-20.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pces-raw.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-raw.el,v
retrieving revision 1.3
diff -d -u -r1.3 pces-raw.el
--- xemacs-packages/apel/pces-raw.el	10 Jul 2000 04:41:05 -0000	1.3
+++ xemacs-packages/apel/pces-raw.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xfc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xfc.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xfc.el
--- xemacs-packages/apel/pces-xfc.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xfc.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xm.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xm.el
--- xemacs-packages/apel/pces-xm.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xm.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces.el
--- xemacs-packages/apel/pces.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pcustom.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pcustom.el,v
retrieving revision 1.2
diff -d -u -r1.2 pcustom.el
--- xemacs-packages/apel/pcustom.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/pcustom.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/poe-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 poe-xemacs.el
--- xemacs-packages/apel/poe-xemacs.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/poe-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -82,33 +82,113 @@
 ;;;
 
 (condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
     (require 'timer)
-  (error
+  (error nil))
+(or
+ (or (featurep 'timer-funcs) (featurep 'timer))
+ (progn
    (require 'itimer)
-   (defun-maybe run-at-time (time repeat function &rest args)
-     (start-itimer (make-temp-name "rat")
-		   `(lambda ()
-		      (,function , at args))
-		   time repeat))
+   (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+       (defun-maybe run-at-time (time repeat function &rest args)
+	 (start-itimer (make-temp-name "rat")
+		       `(lambda ()
+			  (,function , at args))
+		       time repeat))
+     (defun-maybe run-at-time (time repeat function &rest args)
+       "Function emulating the function of the same name of Emacs.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+       (apply #'start-itimer "run-at-time"
+	      function (if time (max time 1e-9) 1e-9)
+	      repeat nil t args)))
    (defalias 'cancel-timer 'delete-itimer)
    (defun with-timeout-handler (tag)
      (throw tag 'timeout))
    (defmacro-maybe with-timeout (list &rest body)
      (let ((seconds (car list))
 	   (timeout-forms (cdr list)))
-     `(let ((with-timeout-tag (cons nil nil))
-	    with-timeout-value with-timeout-timer)
-	(if (catch with-timeout-tag
-	      (progn
-		(setq with-timeout-timer
-		      (run-at-time ,seconds nil
-				   'with-timeout-handler
-				   with-timeout-tag))
-		(setq with-timeout-value (progn . ,body))
-		nil))
-	    (progn . ,timeout-forms)
-	  (cancel-timer with-timeout-timer)
-	  with-timeout-value))))))
+       `(let ((with-timeout-tag (cons nil nil))
+	      with-timeout-value with-timeout-timer)
+	  (if (catch with-timeout-tag
+		(progn
+		  (setq with-timeout-timer
+			(run-at-time ,seconds nil
+				     'with-timeout-handler
+				     with-timeout-tag))
+		  (setq with-timeout-value (progn . ,body))
+		  nil))
+	      (progn . ,timeout-forms)
+	    (cancel-timer with-timeout-timer)
+	    with-timeout-value))))))
+
+(require 'broken)
+
+(broken-facility run-at-time-tick-tock
+  "`run-at-time' is not punctual."
+  ;; Note that it doesn't support XEmacsen prior to the version 19.15
+  ;; since `start-itimer' doesn't pass arguments to a timer function.
+  (or (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+      (condition-case nil
+	  (progn
+	    (unless (or itimer-process itimer-timer)
+	      (itimer-driver-start))
+	    ;; Check whether there is a bug to which the difference of
+	    ;; the present time and the time when the itimer driver was
+	    ;; woken up is subtracted from the initial itimer value.
+	    (let* ((inhibit-quit t)
+		   (ctime (current-time))
+		   (itimer-timer-last-wakeup
+		    (prog1
+			ctime
+		      (setcar ctime (1- (car ctime)))))
+		   (itimer-list nil)
+		   (itimer (start-itimer "run-at-time" 'ignore 5)))
+	      (sleep-for 0.1) ;; Accept the timeout interrupt.
+	      (prog1
+		  (> (itimer-value itimer) 0)
+		(delete-itimer itimer))))
+	(error nil))))
+
+(when-broken run-at-time-tick-tock
+  (defalias 'run-at-time
+    (lambda (time repeat function &rest args)
+      "Function emulating the function of the same name of Emacs.
+It works correctly for TIME even if there is a bug in the XEmacs core.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+      (let ((itimers (list nil)))
+	(setcar
+	 itimers
+	 (apply #'start-itimer "fixed-run-at-time"
+		(lambda (itimers repeat function &rest args)
+		  (let ((itimer (car itimers)))
+		    (if repeat
+			(progn
+			  (set-itimer-function
+			   itimer
+			   (lambda (itimer repeat function &rest args)
+			     (set-itimer-restart itimer repeat)
+			     (set-itimer-function itimer function)
+			     (set-itimer-function-arguments itimer args)
+			     (apply function args)))
+			  (set-itimer-function-arguments
+			   itimer
+			   (append (list itimer repeat function) args)))
+		      (set-itimer-function
+		       itimer
+		       (lambda (itimer function &rest args)
+			 (delete-itimer itimer)
+			 (apply function args)))
+		      (set-itimer-function-arguments
+		       itimer
+		       (append (list itimer function) args)))))
+		1e-9 (if time (max time 1e-9) 1e-9)
+		nil t itimers repeat function args))))))
 
 
 ;;; @ to avoid bug of XEmacs 19.14
Index: xemacs-packages/apel/poe.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe.el,v
retrieving revision 1.7
diff -d -u -r1.7 poe.el
--- xemacs-packages/apel/poe.el	6 Dec 2005 10:47:18 -0000	1.7
+++ xemacs-packages/apel/poe.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -1523,20 +1523,62 @@
 			 ls (- ls 65536))))
 	    (setq time (append (list ms ls) (nth 2 time))))))))
 
-;; Emacs 20.1/XEmacs 20.3(?) and later: (split-string STRING &optional PATTERN)
-;; Here is a XEmacs version.
-(defun-maybe split-string (string &optional pattern)
-  "Return a list of substrings of STRING which are separated by PATTERN.
-If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
-  (or pattern
-      (setq pattern "[ \f\t\n\r\v]+"))
-  ;; The FSF version of this function takes care not to cons in case
-  ;; of infloop.  Maybe we should synch?
-  (let (parts (start 0))
-    (while (string-match pattern string start)
-      (setq parts (cons (substring string start (match-beginning 0)) parts)
-	    start (match-end 0)))
-    (nreverse (cons (substring string start) parts))))
+(defconst-maybe split-string-default-separators "[ \f\t\n\r\v]+"
+  "The default value of separators for `split-string'.
+
+A regexp matching strings of whitespace.  May be locale-dependent
+\(as yet unimplemented).  Should not match non-breaking spaces.
+
+Warning: binding this to a different value and using it as default is
+likely to have undesired semantics.")
+
+;; Here is a Emacs 22 version. OMIT-NULLS
+(defun-maybe split-string (string &optional separators omit-nulls)
+  "Split STRING into substrings bounded by matches for SEPARATORS.
+
+The beginning and end of STRING, and each match for SEPARATORS, are
+splitting points.  The substrings matching SEPARATORS are removed, and
+the substrings between the splitting points are collected as a list,
+which is returned.
+
+If SEPARATORS is non-nil, it should be a regular expression matching text
+which separates, but is not part of, the substrings.  If nil it defaults to
+`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
+OMIT-NULLS is forced to t.
+
+If OMIT-NULLS is t, zero-length substrings are omitted from the list \(so
+that for the default value of SEPARATORS leading and trailing whitespace
+are effectively trimmed).  If nil, all zero-length substrings are retained,
+which correctly parses CSV format, for example.
+
+Note that the effect of `(split-string STRING)' is the same as
+`(split-string STRING split-string-default-separators t)').  In the rare
+case that you wish to retain zero-length substrings when splitting on
+whitespace, use `(split-string STRING split-string-default-separators)'.
+
+Modifies the match data; use `save-match-data' if necessary."
+  (let ((keep-nulls (not (if separators omit-nulls t)))
+	(rexp (or separators split-string-default-separators))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< start (length string)))
+      (setq notfirst t)
+      (if (or keep-nulls (< start (match-beginning 0)))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (if (or keep-nulls (< start (length string)))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
 

 
 ;;; @ Window commands emulation. (lisp/window.el)
Index: xemacs-packages/apel/poem-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-ltn1.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-ltn1.el
--- xemacs-packages/apel/poem-ltn1.el	24 Mar 2002 20:52:46 -0000	1.4
+++ xemacs-packages/apel/poem-ltn1.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/poem-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-xm.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-xm.el
--- xemacs-packages/apel/poem-xm.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/poem-xm.el	3 Jul 2009 22:02:52 -0000
@@ -1,6 +1,6 @@
 ;;; poem-xm.el --- poem module for XEmacs-mule; -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2002,2003,2005 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Keywords: emulation, compatibility, Mule
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -68,9 +68,14 @@
   "Return index of character succeeding CHAR whose index is INDEX."
   `(1+ ,index))
 
-(defun-maybe char-length (char)
-  "Return indexing length of multi-byte form of CHAR."
-  1)
+(if (not (fboundp 'char-length))
+    (defalias 'char-length
+      (lambda (char)
+	"Return number of bytes a CHARACTER occupies in a string or buffer.
+It always returns 1 in XEmacs.  It is for compatibility with MULE 2.3."
+	1)))
+
+(defalias-maybe 'char-valid-p 'characterp)
 
 
 ;;; @ string
Index: xemacs-packages/apel/poem.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem.el,v
retrieving revision 1.5
diff -d -u -r1.5 poem.el
--- xemacs-packages/apel/poem.el	6 Oct 2000 08:33:45 -0000	1.5
+++ xemacs-packages/apel/poem.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -77,9 +77,15 @@
 
 (defalias-maybe 'int-char 'identity)
 
-(defalias-maybe 'characterp 'integerp)
+(defalias-maybe 'characterp
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(defalias-maybe 'char-or-char-int-p
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
 (defun-maybe char-octet (ch &optional n)
   "Return the octet numbered N (should be 0 or 1) of char CH.
Index: xemacs-packages/apel/product.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/product.el,v
retrieving revision 1.3
diff -d -u -r1.3 product.el
--- xemacs-packages/apel/product.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/product.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pym.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pym.el,v
retrieving revision 1.2
diff -d -u -r1.2 pym.el
--- xemacs-packages/apel/pym.el	6 Dec 2005 10:47:19 -0000	1.2
+++ xemacs-packages/apel/pym.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/richtext.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/richtext.el,v
retrieving revision 1.3
diff -d -u -r1.3 richtext.el
--- xemacs-packages/apel/richtext.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/richtext.el	3 Jul 2009 22:02:52 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/static.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/static.el,v
retrieving revision 1.4
diff -d -u -r1.4 static.el
--- xemacs-packages/apel/static.el	6 Dec 2005 10:47:19 -0000	1.4
+++ xemacs-packages/apel/static.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 

xemacs-packages-base-20090624-dired-504422.patch:
 dired.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-base-20090624-dired-504422.patch ---
Index: xemacs-packages/dired/dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired.el,v
retrieving revision 1.11
diff -d -u -r1.11 dired.el
--- xemacs-packages/dired/dired.el	13 Jan 2008 14:51:20 -0000	1.11
+++ xemacs-packages/dired/dired.el	24 Jun 2009 16:33:11 -0000
@@ -219,7 +219,7 @@
 
 ;;;###autoload
 (defcustom dired-use-ls-dired
-  (and (string-match "gnu" system-configuration)
+  (and (string-match "gnu\\|linux" system-configuration)
        ;; Only supported for XEmacs >= 21.5 and GNU Emacs >= 21.4 (I think)
        (or (and (featurep 'xemacs)
 		(fboundp 'emacs-version>=)
@@ -2849,7 +2849,7 @@
 	(if (save-excursion
 	      (goto-char bol)
 	      (re-search-forward
-	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9@]"
+	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9 at .]"
 	       bof t))
 	    (progn
 	      (setq modes-start (match-beginning 0)

xemacs-packages-base-20090824-timer.patch:
 ChangeLog |   10 ++++++++++
 Makefile  |    2 +-
 timer.el  |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-base-20090824-timer.patch ---
--- xemacs-packages/fsf-compat/ChangeLog	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/ChangeLog	2009-08-24 16:20:07.752947063 -0600
@@ -1,3 +1,13 @@
+2009-07-30  Norbert Koch  <viteno at xemacs.org>
+
+	* Makefile (VERSION): XEmacs package 1.18 released.
+
+2009-07-30  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* timer.el (timer-set-idle-time): Use right type of argument to
+	set-itimer-restart.  Fixes issue547.
+	Thanks to the anonymous reporter.
+
 2008-04-14  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.17 released.
--- xemacs-packages/fsf-compat/Makefile	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/Makefile	2009-08-24 16:19:49.650969431 -0600
@@ -19,7 +19,7 @@
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.17
+VERSION = 1.18
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = fsf-compat
--- xemacs-packages/fsf-compat/timer.el	2004-10-22 09:23:00.000000000 -0600
+++ xemacs-packages/fsf-compat/timer.el	2009-08-24 16:19:49.652131279 -0600
@@ -65,7 +65,7 @@
   (set-itimer-is-idle timer t)
   (set-itimer-value timer secs)
   (when repeat
-    (set-itimer-restart timer repeat))
+    (set-itimer-restart timer secs))
   timer)
 
 ;; timer-next-integral-multiple-of-time and timer-relative-time have moved


Index: xemacs-packages-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/devel/xemacs-packages-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xemacs-packages-base.spec	27 Jul 2009 07:46:21 -0000	1.7
+++ xemacs-packages-base.spec	24 Aug 2009 22:30:42 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-base
 Version:        20090217
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -13,6 +13,12 @@ URL:            http://www.xemacs.org/Do
 # Tarball created with Source99
 Source0:        %{name}-%{version}.tar.lzma
 Source99:       %{name}-checkout.sh
+# This patch has been committed upstream.  Update to a newer APEL.
+Patch0:         xemacs-packages-base-20090624-apel-503185.patch
+# This patch has been committed upstream.  Fix a couple of dired bugs.
+Patch1:         xemacs-packages-base-20090624-dired-504422.patch
+# This patch has been committed upstream.  Fix a timer bug.
+Patch2:         xemacs-packages-base-20090824-timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +51,9 @@ developing or debugging the packages.
 
 %prep
 %setup -q
+%patch0
+%patch1
+%patch2
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
@@ -107,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
+- Add APEL patch to fix bz 503185 for XEmacs.
+- Add dired patch to fix bz 504422.
+- Add itimer patch preemptively.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090217-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjames at fedoraproject.org  Mon Aug 24 22:30:42 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 24 Aug 2009 22:30:42 +0000 (UTC)
Subject: rpms/xemacs-packages-base/F-11
	xemacs-packages-base-20090624-apel-503185.patch, NONE,
	1.1 xemacs-packages-base-20090624-dired-504422.patch, NONE,
	1.1 xemacs-packages-base-20090824-timer.patch, NONE,
	1.1 xemacs-packages-base.spec, 1.6, 1.7
Message-ID: <20090824223042.3ED6911C0371@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17131/F-11

Modified Files:
	xemacs-packages-base.spec 
Added Files:
	xemacs-packages-base-20090624-apel-503185.patch 
	xemacs-packages-base-20090624-dired-504422.patch 
	xemacs-packages-base-20090824-timer.patch 
Log Message:
* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
- Add APEL patch to fix bz 503185 for XEmacs.
- Add dired patch to fix bz 504422.
- Add itimer patch preemptively.


xemacs-packages-base-20090624-apel-503185.patch:
 ChangeLog          |    4 +
 ChangeLog.upstream |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 Makefile           |   22 +++++---
 README.en          |   11 ----
 README.ja          |   13 -----
 alist.el           |  101 ++++++++++++++++++++++++++++++++++++++++
 apel-ver.el        |    9 ++-
 atype.el           |    4 -
 broken.el          |    4 -
 calist.el          |    6 +-
 emu.el             |    4 -
 file-detect.el     |    4 -
 filename.el        |   62 +++++++++++++++----------
 install.el         |   91 ++++++++++++++++++++++++++----------
 inv-xemacs.el      |    4 -
 invisible.el       |    4 -
 mcharset.el        |    4 -
 mcs-20.el          |    4 -
 mcs-ltn1.el        |    4 -
 mcs-xmu.el         |    4 -
 mule-caesar.el     |    4 -
 path-util.el       |    4 -
 pccl-20.el         |    4 -
 pccl.el            |    4 -
 pces-20.el         |    4 -
 pces-raw.el        |    4 -
 pces-xfc.el        |    4 -
 pces-xm.el         |    4 -
 pces.el            |    4 -
 pcustom.el         |    4 -
 poe-xemacs.el      |  122 ++++++++++++++++++++++++++++++++++++++++---------
 poe.el             |   74 +++++++++++++++++++++++------
 poem-ltn1.el       |    4 -
 poem-xm.el         |   17 ++++--
 poem.el            |   14 ++++-
 product.el         |    4 -
 pym.el             |    4 -
 richtext.el        |    4 -
 static.el          |    4 -
 39 files changed, 592 insertions(+), 185 deletions(-)

--- NEW FILE xemacs-packages-base-20090624-apel-503185.patch ---
Index: xemacs-packages/apel/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog,v
retrieving revision 1.42
diff -d -u -r1.42 ChangeLog
--- xemacs-packages/apel/ChangeLog	15 Aug 2007 07:38:42 -0000	1.42
+++ xemacs-packages/apel/ChangeLog	3 Jul 2009 22:02:50 -0000
@@ -1,3 +1,7 @@
+2009-07-01  Jerry James  <james at xemacs.org>
+
+	* *.el, README.*, ChangeLog.upstream: Sync with 10.7.
+
 2007-08-15  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.33 released.
Index: xemacs-packages/apel/ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/ChangeLog.upstream,v
retrieving revision 1.1
diff -d -u -r1.1 ChangeLog.upstream
--- xemacs-packages/apel/ChangeLog.upstream	6 Dec 2005 10:47:17 -0000	1.1
+++ xemacs-packages/apel/ChangeLog.upstream	3 Jul 2009 22:02:51 -0000
@@ -1,3 +1,130 @@
+2007-02-14  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL: Version 10.7 released.
+
+	* Makefile (VERSION): Update to 10.7.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* APEL-MK (config-apel-package): Use
+	`install-get-default-package-directory'.
+
+	* install.el (install-get-default-package-directory): New
+	function.
+
+2006-12-20  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* apel-ver.el (apel-ver): Change APEL version to 10.7.
+
+2005-05-08  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
+
+	* poem-xm.el (char-valid-p): New alias.
+
+2006-12-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Avoid an error concerning
+	PACKAGEDIR with old XEmacs that doesn't use the package system.
+
+2006-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-update-package-files): Use
+	batch-update-directory-autoloads if it is available instead of
+	batch-update-directory.
+
+2006-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* APEL-MK (config-apel-package): Check for
+	(early|late|last)-package-hierarchies and configure-package-path
+	as well as (early|late|last)-packages.
+
+2006-11-13  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* time-stamp.el: Remove.  Suggested by Stephen Gildea, the
+	maintainer of time-stamp.el.
+
+	* EMU-ELS (emu-modules): Exclude it.
+
+	* README.en, README.ja: Remove time-stamp.el entry.
+
+2006-04-24  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* install.el (install-detect-elisp-directory): Fix 2002-11-29
+	change; assume default-load-path contains nil; use regexp-quote to
+	compare directories even in Emacs.
+
+2005-12-06  Ville Skytt?  <scop at xemacs.org>
+
+	* poe.el (minor-mode-overriding-map-alist): Doc fix.
+
+	* product.el (product-version-as-string): Doc fix.
+
+2002-11-29  Ben Wing  <ben at xemacs.org>
+
+	* install.el (install-detect-elisp-directory): Fix problems
+	handling backslashes in filenames (Windows).
+
+2005-06-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* filename.el (filename-special-filter-1): New macro defined for
+	filename-special-filter to use aref instead of sref for the recent
+	Emacsen.
+	(filename-special-filter): Use it.
+
+2005-06-05  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
+
+2005-05-10  TAKAHASHI Kaoru  <kaoru at kaisei.org>
+
+	* poe.el (split-string): Import from Emacs 22. Add omit-nulls
+	argument.
+
+2005-05-03  Tatsuya Kinoshita  <tats at vega.ocn.ne.jp>
+
+	* poem.el (characterp): Use `char-valid-p' if it exists.
+	* poem.el (char-or-char-int-p): Ditto.
+
+2005-02-23  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Attempt to load `timer-funcs'
+	before `timer'.
+
+2004-09-27  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* README.en, README.ja (CVS): Remove the description about
+	developers' pserver access.
+
+2004-02-06  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* calist.el (use-calist-package): Add missing arg to `format'.
+
+2004-01-26  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* Makefile: Make `elc' into the default entry.
+
+2004-01-07  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Don't use `defadvice' in order to
+	avoid a conflict with the Gnus version.
+
+2003-12-12  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Fully implement it for the recent
+	XEmacsen when the fsf-compat package is not available.
+	(run-at-time-tick-tock): Check closely whether a bug is in
+	`start-itimer'.
+
+2003-12-11  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poe-xemacs.el (run-at-time): Redefine it to make it punctual.
+
+2003-09-05  Katsumi Yamaoka  <yamaoka at jpl.org>
+
+	* poem-xm.el (char-length): Don't use `defun-maybe' to define it
+	since this module may be installed as the XEmacs package which
+	should be usable by all the XEmacs 21.x series.
+
+

 2003-07-05  Yuuichi Teranishi  <teranisi at gohome.org>
 
 	* APEL: Version 10.6 released.
@@ -278,7 +405,7 @@
 	(minor-mode-map-alist): Ditto.
 
 	* README.en ((d) make.bat (for MS-DOS family)): New section.
-	* README.ja ((d) make.bat $B$rMxMQ$9$k(B (MS-DOS $B7O(B OS $B$N>l9g(B)):
+	* README.ja ((d) make.bat $(B$rMxMQ$9$k(B (MS-DOS $(B7O(B OS $(B$N>l9g(B)):
 	Ditto.
 
 2000-12-22  MORIOKA Tomohiko  <tomo at kanji.zinbun.kyoto-u.ac.jp>
@@ -3064,7 +3191,7 @@
 
 	* APEL: Version 8.4 was released.
 
-	* EMU-ELS: Don't use HIRAGANA LETTER A ($B$"(B) to detect character
+	* EMU-ELS: Don't use HIRAGANA LETTER A ($(B$"(B) to detect character
  	indexing (Emacs 20.3 or later).
 
 1998-04-20  MORIOKA Tomohiko  <morioka at jaist.ac.jp>
Index: xemacs-packages/apel/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/Makefile,v
retrieving revision 1.43
diff -d -u -r1.43 Makefile
--- xemacs-packages/apel/Makefile	15 Aug 2007 07:38:42 -0000	1.43
+++ xemacs-packages/apel/Makefile	3 Jul 2009 22:02:51 -0000
@@ -18,7 +18,7 @@
 # Boston, MA  02110-1301  USA
 
 VERSION = 1.33
-AUTHOR_VERSION = 10.6
+AUTHOR_VERSION = 10.7
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = apel
 PKG_TYPE = regular
@@ -27,22 +27,26 @@
 
 include ../../Local.rules.inc
 
-ELCS = apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
+ELCS = alist.elc apel-ver.elc broken.elc calist.elc emu.elc filename.elc \
 	install.elc inv-xemacs.elc invisible.elc mcharset.elc \
-	mcs-20.elc mcs-ltn1.elc mule-caesar.elc path-util.elc \
-	pccl.elc poe-xemacs.elc poe.elc poem-ltn1.elc poem-xm.elc \
-	poem.elc product.elc pym.elc richtext.elc static.elc \
-	pcustom.elc pces.elc pces-raw.elc pces-20.elc pces-xfc.elc \
-	atype.elc file-detect.elc
+	mule-caesar.elc path-util.elc pccl.elc pces-20.elc pces-xfc.elc \
+	pces.elc pcustom.elc poe-xemacs.elc poe.elc poem.elc product.elc \
+	pym.elc richtext.elc static.elc
 
 ## The following files are no longer in upstream apel, but tm needs them.
 ELCS += std11.elc std11-parse.elc
 
+## The following files are considered obsolete, but bbdb-rmail needs them.
+ELCS += atype.elc file-detect.elc
+
+## The following files are only needed for non-MULE XEmacsen.
+ELCS += mcs-ltn1.elc poem-ltn1.elc
+
 EXTRA_SOURCES = README.en ChangeLog.upstream
 
 ifeq ($(BUILD_WITHOUT_MULE),)
-# ELCS += emu-x20.elc
-ELCS += mcs-xm.elc pccl-20.elc pces-xm.elc mcs-xmu.elc
+ELCS += mcs-20.elc mcs-xm.elc mcs-xmu.elc pccl-20.elc \
+	pces-raw.elc pces-xm.elc poem-xm.elc
 EXTRA_SOURCES += README.ja
 endif
 
Index: xemacs-packages/apel/README.en
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.en,v
retrieving revision 1.4
diff -d -u -r1.4 README.en
--- xemacs-packages/apel/README.en	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.en	3 Jul 2009 22:02:51 -0000
@@ -99,11 +99,6 @@
 
   tinycustom.el --- emulation module of custom.el
 
-** time-stamp.el
-
-This is a utility to maintain last change time stamps in files edited
-by Emacs.
-
 ** timezone.el
 
 This is a utility of time zone.  This is a Y2K fixed version.   This
@@ -242,7 +237,7 @@
 to really regularize eol codes to CRLF.  If you need further
 information, see the following URL (n.b. Japanese only)
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 * load-path (for Emacs or MULE)
 
@@ -493,9 +488,5 @@
 
 with your account name and your public key for ssh.  cvsroot is
 :ext:cvs at cvs.m17n.org:/cvs/root.
-
-If you cannot use ssh, please send UNIX /etc/passwd style crypted
-password.  you can commit with the cvsroot
-:pserver:<accountname>@cvs.m17n.org:/cvs/root.
 
 We hope you will join the open development.
Index: xemacs-packages/apel/README.ja
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/README.ja,v
retrieving revision 1.4
diff -d -u -r1.4 README.ja
--- xemacs-packages/apel/README.ja	6 Dec 2005 10:47:17 -0000	1.4
+++ xemacs-packages/apel/README.ja	3 Jul 2009 22:02:51 -0000
@@ -95,10 +95,6 @@
 
   tinycustom.el --- custom.el $B$N%(%_%e%l!<%7%g%s$r9T$J$&(B
 
-** time-stamp.el
-
-Emacs $B$K$h$kJT=8$N:]!":G=*=$@5;~9o$rJ]B8$9$k$?$a$N%f!<%F%#%j%F%#!#(B
-
 ** timezone.el
 
 $B%?%$%`%>!<%s%f!<%F%#%j%F%#!#(B2000 $BG/LdBjBP1~HG!#(BEmacs 18 $B$H(B GNUS 3.14.4
@@ -229,7 +225,7 @@
 
 $B>e5-$NNc$G$O!"(Bmeadow $B$N%P%$%J%j$,(B c:\usr\Meadow\1.10\bin\meadow95.exe
 $B$K%$%s%9%H!<%k$5$l$F$$$k$3$H$rA0Ds$K$7$F$$$^$9!#$=$NA0Ds$K4p$E$-!"(BAPEL
-$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B 
+$B$N%b%8%e!<%k$N$&$A!"(Bmeadow $B$N%P!<%8%g%s$K0MB8$7$J$$%b%8%e!<%k$r(B
 
   c:\usr\Meadow\site-lisp
 
@@ -311,7 +307,7 @@
 $B$-$^$;$s$N$G9TKv%3!<%I$r(B CRLF $B$K=$@5$7$F$*;H$$2<$5$$!#$3$NLdBj$K$D$$$F(B
 $B>\$7$/$O!"(B
 
-  http://openlab.ring.gr.jp/skk/cvswin-ja.html 
+  http://openlab.ring.gr.jp/skk/cvswin-ja.html
 
 $B$r$4;2>H2<$5$$!#(B
 
@@ -585,10 +581,5 @@
 
 $B$K%"%+%&%s%HL>$H!"(Bssh $B$N8x3+80$rAw$C$F$/$@$5$$!#(Bssh $B7PM3$G$O!"(Bcvsroot
 $B$O(B :ext:cvs at cvs.m17n.org:/cvs/root $B$H$J$j$^$9!#(B
-
-$B$I$&$7$F$b(B ssh $B$,;H$($J$$>l9g!"(Bpserver $B7PM3$G$b3+H/$K;22C$G$-$^$9!#$3(B
-$B$N>l9g!"(BUNIX $B$N(B /etc/passwd $BMM<0$G0E9f2=$5$l$?%Q%9%o!<%I$rAw$C$F2<$5$$!#(B
-$B$3$N>l9g(B cvsroot $B$O(B :pserver:<$B%"%+%&%s%HL>(B>@cvs.m17n.org:/cvs/root $B$H(B
-$B$J$j$^$9!#(B
 
 $B3+$+$l$?3+H/$K;22C$7$F$/$@$5$k$3$H$r4|BT$7$^$9!#(B
Index: xemacs-packages/apel/alist.el
===================================================================
RCS file: xemacs-packages/apel/alist.el
diff -N xemacs-packages/apel/alist.el
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-packages/apel/alist.el	3 Jul 2009 22:02:51 -0000
@@ -0,0 +1,101 @@
+;;; alist.el --- utility functions for association list
+
+;; Copyright (C) 1993,1994,1995,1996,1998,2000 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
+;; Keywords: alist
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+;;;###autoload
+(defun put-alist (key value alist)
+  "Set cdr of an element (KEY . ...) in ALIST to VALUE and return ALIST.
+If there is no such element, create a new pair (KEY . VALUE) and
+return a new alist whose car is the new pair and cdr is ALIST."
+  (let ((elm (assoc key alist)))
+    (if elm
+	(progn
+	  (setcdr elm value)
+	  alist)
+      (cons (cons key value) alist))))
+
+;;;###autoload
+(defun del-alist (key alist)
+  "Delete an element whose car equals KEY from ALIST.
+Return the modified ALIST."
+  (let ((pair (assoc key alist)))
+    (if pair
+	(delq pair alist)
+      alist)))
+
+;;;###autoload
+(defun set-alist (symbol key value)
+  "Set cdr of an element (KEY . ...) in the alist bound to SYMBOL to VALUE."
+  (or (boundp symbol)
+      (set symbol nil))
+  (set symbol (put-alist key value (symbol-value symbol))))
+
+;;;###autoload
+(defun remove-alist (symbol key)
+  "Delete an element whose car equals KEY from the alist bound to SYMBOL."
+  (and (boundp symbol)
+       (set symbol (del-alist key (symbol-value symbol)))))
+
+;;;###autoload
+(defun modify-alist (modifier default)
+  "Store elements in the alist MODIFIER in the alist DEFAULT.
+Return the modified alist."
+  (mapcar (function
+	   (lambda (as)
+	     (setq default (put-alist (car as)(cdr as) default))))
+	  modifier)
+  default)
+
+;;;###autoload
+(defun set-modified-alist (symbol modifier)
+  "Store elements in the alist MODIFIER in an alist bound to SYMBOL.
+If SYMBOL is not bound, set it to nil at first."
+  (if (not (boundp symbol))
+      (set symbol nil))
+  (set symbol (modify-alist modifier (eval symbol))))
+
+
+;;; @ association-vector-list
+;;;
+
+;;;###autoload
+(defun vassoc (key avlist)
+  "Search AVLIST for an element whose first element equals KEY.
+AVLIST is a list of vectors.
+See also `assoc'."
+  (while (and avlist
+	      (not (equal key (aref (car avlist) 0))))
+    (setq avlist (cdr avlist)))
+  (and avlist
+       (car avlist)))
+
+
+;;; @ end
+;;;
+
+(require 'product)
+(product-provide (provide 'alist) (require 'apel-ver))
+
+;;; alist.el ends here
Index: xemacs-packages/apel/apel-ver.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/apel-ver.el,v
retrieving revision 1.2
diff -d -u -r1.2 apel-ver.el
--- xemacs-packages/apel/apel-ver.el	6 Dec 2005 10:47:17 -0000	1.2
+++ xemacs-packages/apel/apel-ver.el	3 Jul 2009 22:02:51 -0000
@@ -1,6 +1,6 @@
 ;;; apel-ver.el --- Declare APEL version.
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei at aqua.ocn.ne.jp>
 ;;	Keiichi Suzuki <keiichi at nanap.org>
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -43,7 +43,8 @@
   ;; (product-define "APEL" nil '(10 3))	; Released 30 December 2000
   ;; (product-define "APEL" nil '(10 4))	; Released 04 October 2002
   ;; (product-define "APEL" nil '(10 5))	; Released 06 June 2003
-  (product-define "APEL" nil '(10 6))		; Released 05 July 2003
+  ;; (product-define "APEL" nil '(10 6))	; Released 05 July 2003
+  (product-define "APEL" nil '(10 7))
   )
 
 (defun apel-version ()
Index: xemacs-packages/apel/atype.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/atype.el,v
retrieving revision 1.5
diff -d -u -r1.5 atype.el
--- xemacs-packages/apel/atype.el	6 Dec 2005 10:47:17 -0000	1.5
+++ xemacs-packages/apel/atype.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/broken.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/broken.el,v
retrieving revision 1.5
diff -d -u -r1.5 broken.el
--- xemacs-packages/apel/broken.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/broken.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/calist.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/calist.el,v
retrieving revision 1.3
diff -d -u -r1.3 calist.el
--- xemacs-packages/apel/calist.el	10 Jul 2000 04:41:04 -0000	1.3
+++ xemacs-packages/apel/calist.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,7 +48,7 @@
 	      (if (intern-soft (symbol-name sym)
 			       calist-field-match-method-obarray)
 		  (signal 'conflict-of-calist-symbol
-			  (list (format "Conflict of symbol %s")))
+			  (list (format "Conflict of symbol %s" sym)))
 		(if (fboundp sym)
 		    (define-calist-field-match-method
 		      sym (symbol-function sym))
Index: xemacs-packages/apel/emu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/emu.el,v
retrieving revision 1.9
diff -d -u -r1.9 emu.el
--- xemacs-packages/apel/emu.el	6 Dec 2005 10:47:18 -0000	1.9
+++ xemacs-packages/apel/emu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/file-detect.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/file-detect.el,v
retrieving revision 1.5
diff -d -u -r1.5 file-detect.el
--- xemacs-packages/apel/file-detect.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/file-detect.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/filename.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/filename.el,v
retrieving revision 1.4
diff -d -u -r1.4 filename.el
--- xemacs-packages/apel/filename.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/filename.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -34,8 +34,8 @@
   "Apply initial ARGUMENT to sequence of FUNCTIONS.
 FUNCTIONS is list of functions.
 
-(poly-funcall '(f1 f2 .. fn) arg) is as same as
-(fn .. (f2 (f1 arg)) ..).
+\(poly-funcall '(f1 f2 .. fn) arg) is as same as
+\(fn .. (f2 (f1 arg)) ..).
 
 For example, (poly-funcall '(car number-to-string) '(100)) returns
 \"100\"."
@@ -71,7 +71,7 @@
 Moreover, if you want to convert Japanese filename to roman string by kakasi,
 
 \(if \(exec-installed-p \"kakasi\"\)
-    \(setq file-name-filters
+    \(setq filename-filters
 	  \(append '\(filename-japanese-to-roman-string\) filename-filters\)\)\)")
 
 ;;; @ filters
@@ -91,26 +91,40 @@
   (let ((code (char-int character)))
     (or (< code 32)(= code 127))))
 
+(eval-when-compile
+  (defmacro filename-special-filter-1 (string)
+    (let (sref inc-i)
+      (if (or (not (fboundp 'sref))
+	      (>= emacs-major-version 21)
+	      (and (= emacs-major-version 20)
+		   (>= emacs-minor-version 3)))
+	  (setq sref 'aref
+		inc-i '(1+ i))
+	(setq sref 'aref
+	      inc-i '(+ i (char-length chr))))
+      (` (let ((len (length (, string)))
+	       (b 0)(i 0)
+	       (dest ""))
+	   (while (< i len)
+	     (let ((chr ((, sref) (, string) i))
+		   (lst filename-replacement-alist)
+		   ret)
+	       (while (and lst (not ret))
+		 (if (if (functionp (car (car lst)))
+			 (setq ret (funcall (car (car lst)) chr))
+		       (setq ret (memq chr (car (car lst)))))
+		     t			; quit this loop.
+		   (setq lst (cdr lst))))
+	       (if ret
+		   (setq dest (concat dest (substring (, string) b i)
+				      (cdr (car lst)))
+			 i (, inc-i)
+			 b i)
+		 (setq i (, inc-i)))))
+	   (concat dest (substring (, string) b)))))))
+
 (defun filename-special-filter (string)
-  (let ((len (length string))
-	(b 0)(i 0)
-	(dest ""))
-    (while (< i len)
-      (let ((chr (sref string i))
-            (lst filename-replacement-alist)
-            ret)
-        (while (and lst (not ret))
-          (if (if (functionp (car (car lst)))
-                  (setq ret (funcall (car (car lst)) chr))
-                (setq ret (memq chr (car (car lst)))))
-              t                         ; quit this loop.
-            (setq lst (cdr lst))))
-	(if ret
-	    (setq dest (concat dest (substring string b i)(cdr (car lst)))
-		  i (+ i (char-length chr))
-		  b i)
-	  (setq i (+ i (char-length chr))))))
-    (concat dest (substring string b))))
+  (filename-special-filter-1 string))
 
 (defun filename-eliminate-top-low-lines (string)
   (if (string-match "^_+" string)
Index: xemacs-packages/apel/install.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/install.el,v
retrieving revision 1.6
diff -d -u -r1.6 install.el
--- xemacs-packages/apel/install.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/install.el	3 Jul 2009 22:02:51 -0000
@@ -1,8 +1,9 @@
 ;;; install.el --- Emacs Lisp package install utility
 
-;; Copyright (C) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+;; 	Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka at jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Created: 1996/08/18
 ;; Keywords: install, byte-compile, directory detection
 
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -158,6 +159,9 @@
     ;; v18 does not have standard site directory.
     "local.lisp"))
 
+;; Avoid compile warning.
+(eval-when-compile (autoload 'replace-in-string "subr"))
+
 (defun install-detect-elisp-directory (&optional prefix elisp-prefix
 						 allow-version-specific)
   (or prefix
@@ -165,28 +169,36 @@
   (or elisp-prefix
       (setq elisp-prefix install-elisp-prefix))
   (or (catch 'tag
-	(let ((rest default-load-path)
-	      (regexp (concat "^"
-			      ;; XEmacs change: handle backslashes (Windows)
-			      (regexp-quote (replace-in-string
-					     (file-name-as-directory
-					      (expand-file-name elisp-prefix))
-					     "\\\\" "/"))
-			      ".*/"
-			      (regexp-quote
-			       (replace-in-string prefix "\\\\" "/"))
-			      "/?$")))
+	(let ((rest (delq nil (copy-sequence default-load-path)))
+	      (regexp
+	       (concat "^"
+		       (regexp-quote (if (featurep 'xemacs)
+					 ;; Handle backslashes (Windows)
+					 (replace-in-string
+					  (file-name-as-directory
+					   (expand-file-name prefix))
+					  "\\\\" "/")
+				       (file-name-as-directory
+					(expand-file-name prefix))))
+		       ".*/"
+		       (regexp-quote
+			(if (featurep 'xemacs)
+			    ;; Handle backslashes (Windows)
+			    (replace-in-string elisp-prefix "\\\\" "/")
+			  elisp-prefix))
+		       "/?$"))
+	      dir)
 	  (while rest
-	    ;; XEmacs change: handle backslashes (Windows)
-	    (if (string-match regexp
-			      (replace-in-string (car rest) "\\\\" "/"))
+	    (setq dir (if (featurep 'xemacs)
+			  ;; Handle backslashes (Windows)
+			  (replace-in-string (car rest) "\\\\" "/")
+			(car rest)))
+	    (if (string-match regexp dir)
 		(if (or allow-version-specific
 			(not (string-match (format "/%d\\.%d"
 						   emacs-major-version
 						   emacs-minor-version)
-					   ;; XEmacs change: handle backslashes
-					   (replace-in-string (car rest)
-							      "\\\\" "/"))))
+					   dir)))
 		    (throw 'tag (car rest))))
 	    (setq rest (cdr rest)))))
       (expand-file-name (concat (if (and (not (featurep 'xemacs))
@@ -215,6 +227,32 @@
 ;;; @ for XEmacs package system
 ;;;
 
+(defun install-get-default-package-directory ()
+  (let ((dirs (append
+	       (cond
+		((boundp 'early-package-hierarchies)
+		 (append (if early-package-load-path
+			     early-package-hierarchies)
+			 (if late-package-load-path
+			     late-package-hierarchies)
+			 (if last-package-load-path
+			     last-package-hierarchies)) )
+		((boundp 'early-packages)
+		 (append (if early-package-load-path
+			     early-packages)
+			 (if late-package-load-path
+			     late-packages)
+			 (if last-package-load-path
+			     last-packages)) ))
+	       (if (and (boundp 'configure-package-path)
+			(listp configure-package-path))
+		   (delete "" configure-package-path))))
+	dir)
+    (while (and (setq dir (car dirs))
+		(not (file-exists-p dir)))
+      (setq dirs (cdr dirs)))
+    dir))
+
 (defun install-update-package-files (package dir &optional just-print)
   (cond
    (just-print
@@ -233,10 +271,13 @@
     (princ (format "Wrote %s\n"
 		   (expand-file-name "custom-load.elc" dir))))
    (t
-    (setq autoload-package-name package)
-
-    (let ((command-line-args-left (list dir)))
-      (batch-update-directory))
+    (if (fboundp 'batch-update-directory-autoloads)
+	;; XEmacs 21.5.19 and newer.
+	(let ((command-line-args-left (list package dir)))
+	  (batch-update-directory-autoloads))
+      (setq autoload-package-name package)
+      (let ((command-line-args-left (list dir)))
+	(batch-update-directory)))
 
     (let ((command-line-args-left (list dir)))
       (Custom-make-dependencies))
Index: xemacs-packages/apel/inv-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/inv-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 inv-xemacs.el
--- xemacs-packages/apel/inv-xemacs.el	10 Jul 2000 04:41:04 -0000	1.2
+++ xemacs-packages/apel/inv-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/invisible.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/invisible.el,v
retrieving revision 1.2
diff -d -u -r1.2 invisible.el
--- xemacs-packages/apel/invisible.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/invisible.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcharset.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcharset.el,v
retrieving revision 1.4
diff -d -u -r1.4 mcharset.el
--- xemacs-packages/apel/mcharset.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/mcharset.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-20.el,v
retrieving revision 1.6
diff -d -u -r1.6 mcs-20.el
--- xemacs-packages/apel/mcs-20.el	6 Dec 2005 10:47:18 -0000	1.6
+++ xemacs-packages/apel/mcs-20.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mcs-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-ltn1.el,v
retrieving revision 1.3
diff -d -u -r1.3 mcs-ltn1.el
--- xemacs-packages/apel/mcs-ltn1.el	6 Dec 2005 10:47:18 -0000	1.3
+++ xemacs-packages/apel/mcs-ltn1.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/mcs-xmu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mcs-xmu.el,v
retrieving revision 1.1
diff -d -u -r1.1 mcs-xmu.el
--- xemacs-packages/apel/mcs-xmu.el	10 Jul 2000 04:41:05 -0000	1.1
+++ xemacs-packages/apel/mcs-xmu.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/mule-caesar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/mule-caesar.el,v
retrieving revision 1.4
diff -d -u -r1.4 mule-caesar.el
--- xemacs-packages/apel/mule-caesar.el	10 Jul 2000 04:41:05 -0000	1.4
+++ xemacs-packages/apel/mule-caesar.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/path-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/path-util.el,v
retrieving revision 1.5
diff -d -u -r1.5 path-util.el
--- xemacs-packages/apel/path-util.el	6 Dec 2005 10:47:18 -0000	1.5
+++ xemacs-packages/apel/path-util.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl-20.el,v
retrieving revision 1.4
diff -d -u -r1.4 pccl-20.el
--- xemacs-packages/apel/pccl-20.el	14 Aug 2007 21:23:02 -0000	1.4
+++ xemacs-packages/apel/pccl-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pccl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pccl.el,v
retrieving revision 1.6
diff -d -u -r1.6 pccl.el
--- xemacs-packages/apel/pccl.el	14 Aug 2007 21:23:02 -0000	1.6
+++ xemacs-packages/apel/pccl.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; ##### Much of the logic here is flawed in the context of XEmacs
 ;;; packages.  All the static-if and broken-facility stuff is evaluated at
Index: xemacs-packages/apel/pces-20.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-20.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-20.el
--- xemacs-packages/apel/pces-20.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-20.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pces-raw.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-raw.el,v
retrieving revision 1.3
diff -d -u -r1.3 pces-raw.el
--- xemacs-packages/apel/pces-raw.el	10 Jul 2000 04:41:05 -0000	1.3
+++ xemacs-packages/apel/pces-raw.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xfc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xfc.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xfc.el
--- xemacs-packages/apel/pces-xfc.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xfc.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces-xm.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces-xm.el
--- xemacs-packages/apel/pces-xm.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces-xm.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pces.el,v
retrieving revision 1.2
diff -d -u -r1.2 pces.el
--- xemacs-packages/apel/pces.el	10 Jul 2000 04:41:05 -0000	1.2
+++ xemacs-packages/apel/pces.el	3 Jul 2009 22:02:51 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/pcustom.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pcustom.el,v
retrieving revision 1.2
diff -d -u -r1.2 pcustom.el
--- xemacs-packages/apel/pcustom.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/pcustom.el	3 Jul 2009 22:02:51 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/poe-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe-xemacs.el,v
retrieving revision 1.2
diff -d -u -r1.2 poe-xemacs.el
--- xemacs-packages/apel/poe-xemacs.el	10 Jul 2000 04:41:06 -0000	1.2
+++ xemacs-packages/apel/poe-xemacs.el	3 Jul 2009 22:02:51 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -82,33 +82,113 @@
 ;;;
 
 (condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
     (require 'timer)
-  (error
+  (error nil))
+(or
+ (or (featurep 'timer-funcs) (featurep 'timer))
+ (progn
    (require 'itimer)
-   (defun-maybe run-at-time (time repeat function &rest args)
-     (start-itimer (make-temp-name "rat")
-		   `(lambda ()
-		      (,function , at args))
-		   time repeat))
+   (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+       (defun-maybe run-at-time (time repeat function &rest args)
+	 (start-itimer (make-temp-name "rat")
+		       `(lambda ()
+			  (,function , at args))
+		       time repeat))
+     (defun-maybe run-at-time (time repeat function &rest args)
+       "Function emulating the function of the same name of Emacs.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+       (apply #'start-itimer "run-at-time"
+	      function (if time (max time 1e-9) 1e-9)
+	      repeat nil t args)))
    (defalias 'cancel-timer 'delete-itimer)
    (defun with-timeout-handler (tag)
      (throw tag 'timeout))
    (defmacro-maybe with-timeout (list &rest body)
      (let ((seconds (car list))
 	   (timeout-forms (cdr list)))
-     `(let ((with-timeout-tag (cons nil nil))
-	    with-timeout-value with-timeout-timer)
-	(if (catch with-timeout-tag
-	      (progn
-		(setq with-timeout-timer
-		      (run-at-time ,seconds nil
-				   'with-timeout-handler
-				   with-timeout-tag))
-		(setq with-timeout-value (progn . ,body))
-		nil))
-	    (progn . ,timeout-forms)
-	  (cancel-timer with-timeout-timer)
-	  with-timeout-value))))))
+       `(let ((with-timeout-tag (cons nil nil))
+	      with-timeout-value with-timeout-timer)
+	  (if (catch with-timeout-tag
+		(progn
+		  (setq with-timeout-timer
+			(run-at-time ,seconds nil
+				     'with-timeout-handler
+				     with-timeout-tag))
+		  (setq with-timeout-value (progn . ,body))
+		  nil))
+	      (progn . ,timeout-forms)
+	    (cancel-timer with-timeout-timer)
+	    with-timeout-value))))))
+
+(require 'broken)
+
+(broken-facility run-at-time-tick-tock
+  "`run-at-time' is not punctual."
+  ;; Note that it doesn't support XEmacsen prior to the version 19.15
+  ;; since `start-itimer' doesn't pass arguments to a timer function.
+  (or (and (= emacs-major-version 19) (<= emacs-minor-version 14))
+      (condition-case nil
+	  (progn
+	    (unless (or itimer-process itimer-timer)
+	      (itimer-driver-start))
+	    ;; Check whether there is a bug to which the difference of
+	    ;; the present time and the time when the itimer driver was
+	    ;; woken up is subtracted from the initial itimer value.
+	    (let* ((inhibit-quit t)
+		   (ctime (current-time))
+		   (itimer-timer-last-wakeup
+		    (prog1
+			ctime
+		      (setcar ctime (1- (car ctime)))))
+		   (itimer-list nil)
+		   (itimer (start-itimer "run-at-time" 'ignore 5)))
+	      (sleep-for 0.1) ;; Accept the timeout interrupt.
+	      (prog1
+		  (> (itimer-value itimer) 0)
+		(delete-itimer itimer))))
+	(error nil))))
+
+(when-broken run-at-time-tick-tock
+  (defalias 'run-at-time
+    (lambda (time repeat function &rest args)
+      "Function emulating the function of the same name of Emacs.
+It works correctly for TIME even if there is a bug in the XEmacs core.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+      (let ((itimers (list nil)))
+	(setcar
+	 itimers
+	 (apply #'start-itimer "fixed-run-at-time"
+		(lambda (itimers repeat function &rest args)
+		  (let ((itimer (car itimers)))
+		    (if repeat
+			(progn
+			  (set-itimer-function
+			   itimer
+			   (lambda (itimer repeat function &rest args)
+			     (set-itimer-restart itimer repeat)
+			     (set-itimer-function itimer function)
+			     (set-itimer-function-arguments itimer args)
+			     (apply function args)))
+			  (set-itimer-function-arguments
+			   itimer
+			   (append (list itimer repeat function) args)))
+		      (set-itimer-function
+		       itimer
+		       (lambda (itimer function &rest args)
+			 (delete-itimer itimer)
+			 (apply function args)))
+		      (set-itimer-function-arguments
+		       itimer
+		       (append (list itimer function) args)))))
+		1e-9 (if time (max time 1e-9) 1e-9)
+		nil t itimers repeat function args))))))
 
 
 ;;; @ to avoid bug of XEmacs 19.14
Index: xemacs-packages/apel/poe.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poe.el,v
retrieving revision 1.7
diff -d -u -r1.7 poe.el
--- xemacs-packages/apel/poe.el	6 Dec 2005 10:47:18 -0000	1.7
+++ xemacs-packages/apel/poe.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -1523,20 +1523,62 @@
 			 ls (- ls 65536))))
 	    (setq time (append (list ms ls) (nth 2 time))))))))
 
-;; Emacs 20.1/XEmacs 20.3(?) and later: (split-string STRING &optional PATTERN)
-;; Here is a XEmacs version.
-(defun-maybe split-string (string &optional pattern)
-  "Return a list of substrings of STRING which are separated by PATTERN.
-If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
-  (or pattern
-      (setq pattern "[ \f\t\n\r\v]+"))
-  ;; The FSF version of this function takes care not to cons in case
-  ;; of infloop.  Maybe we should synch?
-  (let (parts (start 0))
-    (while (string-match pattern string start)
-      (setq parts (cons (substring string start (match-beginning 0)) parts)
-	    start (match-end 0)))
-    (nreverse (cons (substring string start) parts))))
+(defconst-maybe split-string-default-separators "[ \f\t\n\r\v]+"
+  "The default value of separators for `split-string'.
+
+A regexp matching strings of whitespace.  May be locale-dependent
+\(as yet unimplemented).  Should not match non-breaking spaces.
+
+Warning: binding this to a different value and using it as default is
+likely to have undesired semantics.")
+
+;; Here is a Emacs 22 version. OMIT-NULLS
+(defun-maybe split-string (string &optional separators omit-nulls)
+  "Split STRING into substrings bounded by matches for SEPARATORS.
+
+The beginning and end of STRING, and each match for SEPARATORS, are
+splitting points.  The substrings matching SEPARATORS are removed, and
+the substrings between the splitting points are collected as a list,
+which is returned.
+
+If SEPARATORS is non-nil, it should be a regular expression matching text
+which separates, but is not part of, the substrings.  If nil it defaults to
+`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
+OMIT-NULLS is forced to t.
+
+If OMIT-NULLS is t, zero-length substrings are omitted from the list \(so
+that for the default value of SEPARATORS leading and trailing whitespace
+are effectively trimmed).  If nil, all zero-length substrings are retained,
+which correctly parses CSV format, for example.
+
+Note that the effect of `(split-string STRING)' is the same as
+`(split-string STRING split-string-default-separators t)').  In the rare
+case that you wish to retain zero-length substrings when splitting on
+whitespace, use `(split-string STRING split-string-default-separators)'.
+
+Modifies the match data; use `save-match-data' if necessary."
+  (let ((keep-nulls (not (if separators omit-nulls t)))
+	(rexp (or separators split-string-default-separators))
+	(start 0)
+	notfirst
+	(list nil))
+    (while (and (string-match rexp string
+			      (if (and notfirst
+				       (= start (match-beginning 0))
+				       (< start (length string)))
+				  (1+ start) start))
+		(< start (length string)))
+      (setq notfirst t)
+      (if (or keep-nulls (< start (match-beginning 0)))
+	  (setq list
+		(cons (substring string start (match-beginning 0))
+		      list)))
+      (setq start (match-end 0)))
+    (if (or keep-nulls (< start (length string)))
+	(setq list
+	      (cons (substring string start)
+		    list)))
+    (nreverse list)))
 

 
 ;;; @ Window commands emulation. (lisp/window.el)
Index: xemacs-packages/apel/poem-ltn1.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-ltn1.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-ltn1.el
--- xemacs-packages/apel/poem-ltn1.el	24 Mar 2002 20:52:46 -0000	1.4
+++ xemacs-packages/apel/poem-ltn1.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/poem-xm.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem-xm.el,v
retrieving revision 1.4
diff -d -u -r1.4 poem-xm.el
--- xemacs-packages/apel/poem-xm.el	6 Dec 2005 10:47:18 -0000	1.4
+++ xemacs-packages/apel/poem-xm.el	3 Jul 2009 22:02:52 -0000
@@ -1,6 +1,6 @@
 ;;; poem-xm.el --- poem module for XEmacs-mule; -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2002,2003,2005 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo at m17n.org>
 ;; Keywords: emulation, compatibility, Mule
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -68,9 +68,14 @@
   "Return index of character succeeding CHAR whose index is INDEX."
   `(1+ ,index))
 
-(defun-maybe char-length (char)
-  "Return indexing length of multi-byte form of CHAR."
-  1)
+(if (not (fboundp 'char-length))
+    (defalias 'char-length
+      (lambda (char)
+	"Return number of bytes a CHARACTER occupies in a string or buffer.
+It always returns 1 in XEmacs.  It is for compatibility with MULE 2.3."
+	1)))
+
+(defalias-maybe 'char-valid-p 'characterp)
 
 
 ;;; @ string
Index: xemacs-packages/apel/poem.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/poem.el,v
retrieving revision 1.5
diff -d -u -r1.5 poem.el
--- xemacs-packages/apel/poem.el	6 Oct 2000 08:33:45 -0000	1.5
+++ xemacs-packages/apel/poem.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -77,9 +77,15 @@
 
 (defalias-maybe 'int-char 'identity)
 
-(defalias-maybe 'characterp 'integerp)
+(defalias-maybe 'characterp
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(defalias-maybe 'char-or-char-int-p
+  (cond
+   ((fboundp 'char-valid-p) 'char-valid-p)
+   (t 'integerp)))
 
 (defun-maybe char-octet (ch &optional n)
   "Return the octet numbered N (should be 0 or 1) of char CH.
Index: xemacs-packages/apel/product.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/product.el,v
retrieving revision 1.3
diff -d -u -r1.3 product.el
--- xemacs-packages/apel/product.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/product.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/pym.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/pym.el,v
retrieving revision 1.2
diff -d -u -r1.2 pym.el
--- xemacs-packages/apel/pym.el	6 Dec 2005 10:47:19 -0000	1.2
+++ xemacs-packages/apel/pym.el	3 Jul 2009 22:02:52 -0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
Index: xemacs-packages/apel/richtext.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/richtext.el,v
retrieving revision 1.3
diff -d -u -r1.3 richtext.el
--- xemacs-packages/apel/richtext.el	6 Dec 2005 10:47:19 -0000	1.3
+++ xemacs-packages/apel/richtext.el	3 Jul 2009 22:02:52 -0000
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
Index: xemacs-packages/apel/static.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/apel/static.el,v
retrieving revision 1.4
diff -d -u -r1.4 static.el
--- xemacs-packages/apel/static.el	6 Dec 2005 10:47:19 -0000	1.4
+++ xemacs-packages/apel/static.el	3 Jul 2009 22:02:52 -0000
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 

xemacs-packages-base-20090624-dired-504422.patch:
 dired.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-base-20090624-dired-504422.patch ---
Index: xemacs-packages/dired/dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired.el,v
retrieving revision 1.11
diff -d -u -r1.11 dired.el
--- xemacs-packages/dired/dired.el	13 Jan 2008 14:51:20 -0000	1.11
+++ xemacs-packages/dired/dired.el	24 Jun 2009 16:33:11 -0000
@@ -219,7 +219,7 @@
 
 ;;;###autoload
 (defcustom dired-use-ls-dired
-  (and (string-match "gnu" system-configuration)
+  (and (string-match "gnu\\|linux" system-configuration)
        ;; Only supported for XEmacs >= 21.5 and GNU Emacs >= 21.4 (I think)
        (or (and (featurep 'xemacs)
 		(fboundp 'emacs-version>=)
@@ -2849,7 +2849,7 @@
 	(if (save-excursion
 	      (goto-char bol)
 	      (re-search-forward
-	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9@]"
+	       "[^ ][-r][-w][^ ][-r][-w][^ ][-r][-w][^ ][-+ 0-9 at .]"
 	       bof t))
 	    (progn
 	      (setq modes-start (match-beginning 0)

xemacs-packages-base-20090824-timer.patch:
 ChangeLog |   10 ++++++++++
 Makefile  |    2 +-
 timer.el  |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE xemacs-packages-base-20090824-timer.patch ---
--- xemacs-packages/fsf-compat/ChangeLog	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/ChangeLog	2009-08-24 16:20:07.752947063 -0600
@@ -1,3 +1,13 @@
+2009-07-30  Norbert Koch  <viteno at xemacs.org>
+
+	* Makefile (VERSION): XEmacs package 1.18 released.
+
+2009-07-30  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* timer.el (timer-set-idle-time): Use right type of argument to
+	set-itimer-restart.  Fixes issue547.
+	Thanks to the anonymous reporter.
+
 2008-04-14  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.17 released.
--- xemacs-packages/fsf-compat/Makefile	2008-04-14 01:30:44.000000000 -0600
+++ xemacs-packages/fsf-compat/Makefile	2009-08-24 16:19:49.650969431 -0600
@@ -19,7 +19,7 @@
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.17
+VERSION = 1.18
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta at xemacs.org>
 PACKAGE = fsf-compat
--- xemacs-packages/fsf-compat/timer.el	2004-10-22 09:23:00.000000000 -0600
+++ xemacs-packages/fsf-compat/timer.el	2009-08-24 16:19:49.652131279 -0600
@@ -65,7 +65,7 @@
   (set-itimer-is-idle timer t)
   (set-itimer-value timer secs)
   (when repeat
-    (set-itimer-restart timer repeat))
+    (set-itimer-restart timer secs))
   timer)
 
 ;; timer-next-integral-multiple-of-time and timer-relative-time have moved


Index: xemacs-packages-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/F-11/xemacs-packages-base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xemacs-packages-base.spec	6 Mar 2009 22:51:21 -0000	1.6
+++ xemacs-packages-base.spec	24 Aug 2009 22:30:41 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-base
 Version:        20090217
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -13,6 +13,12 @@ URL:            http://www.xemacs.org/Do
 # Tarball created with Source99
 Source0:        %{name}-%{version}.tar.lzma
 Source99:       %{name}-checkout.sh
+# This patch has been committed upstream.  Update to a newer APEL.
+Patch0:         xemacs-packages-base-20090624-apel-503185.patch
+# This patch has been committed upstream.  Fix a couple of dired bugs.
+Patch1:         xemacs-packages-base-20090624-dired-504422.patch
+# This patch has been committed upstream.  Fix a timer bug.
+Patch2:         xemacs-packages-base-20090824-timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +51,9 @@ developing or debugging the packages.
 
 %prep
 %setup -q
+%patch0
+%patch1
+%patch2
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
@@ -107,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
+- Add APEL patch to fix bz 503185 for XEmacs.
+- Add dired patch to fix bz 504422.
+- Add itimer patch preemptively.
+
 * Sat Mar  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 20090217-1
 - Update to 2009-02-17.
 - Compress source tarball with lzma.



From ausil at fedoraproject.org  Mon Aug 24 22:41:07 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 22:41:07 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.87,1.88
Message-ID: <20090824224107.D1DA311C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18039

Modified Files:
	nss.spec 
Log Message:
drop the nss-util subpackages



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- nss.spec	23 Aug 2009 21:17:44 -0000	1.87
+++ nss.spec	24 Aug 2009 22:41:06 -0000	1.88
@@ -60,33 +60,6 @@ server applications. Applications built 
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
-%package util
-Summary:          Network Security Services Utilities Library
-Group:            System Environment/Base
-Conflicts:        nss < 3.12.3.99.3-8
-#Provides:         nss >= 3.12.3.99.3-11
-#Provides:	  	  libnssutil3.so
-#Requires:         nss >= 3.12.3.99.3-11
-
-%description util
-Utilities for Network Security Services and the Softoken module
-
-# We shouln't need to have a devel subpackage as util will be used in the
-# context of nss or nss-softoken. keeping to please rpmlint.
-# 
-%package util-devel
-Summary:          Development libraries for Network Security Services Utilities
-Group:            Development/Libraries
-Conflicts:        nss-devel < 3.12.3.99.3-8
-#Provides:         nss-devel >= 3.12.3.99.3-11
-#Requires:         nss-util >= 3.12.3.99.3-11
-Requires:         nss-util = %{version}-%{release}
-Requires:         nspr-devel >= %{nspr_version}
-Requires:         pkgconfig
-
-%description util-devel
-Header and utility library files for doing development with Network Security Services.
-
 %package softokn
 Summary:          Network Security Services Soktoken Module
 Group:            System Environment/Base
@@ -374,7 +347,7 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+for file in libsoftokn3.so libfreebl3.so libnss3.so \
             libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
@@ -427,6 +400,39 @@ done
 %{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
 %{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
+#remove the nss-util-devel headers
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/ciferfam.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64t.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslocks.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilock.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilckt.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlk.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlkt.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssutil.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11f.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11n.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11p.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11t.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11u.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/portreg.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1t.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/seccomon.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secder.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secdert.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secdig.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secdigt.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secerr.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secitem.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secoid.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secoidt.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secport.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -468,49 +474,6 @@ done
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
 
-%files util
-%defattr(-,root,root)
-/%{_lib}/libnssutil3.so
-
-%files util-devel
-%defattr(-,root,root)
-%{_libdir}/libnssutil3.so
-%{_libdir}/pkgconfig/nss-util.pc
-%{_bindir}/nss-util-config
-
-%dir %{_includedir}/nss3
-# these are marked as public export in
-# mozilla/security/nss/lib/util/manifest.mk
-%{_includedir}/nss3/base64.h
-%{_includedir}/nss3/ciferfam.h
-%{_includedir}/nss3/nssb64.h
-%{_includedir}/nss3/nssb64t.h
-%{_includedir}/nss3/nsslocks.h
-%{_includedir}/nss3/nssilock.h
-%{_includedir}/nss3/nssilckt.h
-%{_includedir}/nss3/nssrwlk.h
-%{_includedir}/nss3/nssrwlkt.h
-%{_includedir}/nss3/nssutil.h
-%{_includedir}/nss3/pkcs11.h
-%{_includedir}/nss3/pkcs11f.h
-%{_includedir}/nss3/pkcs11n.h
-%{_includedir}/nss3/pkcs11p.h
-%{_includedir}/nss3/pkcs11t.h
-%{_includedir}/nss3/pkcs11u.h
-%{_includedir}/nss3/portreg.h
-%{_includedir}/nss3/secasn1.h
-%{_includedir}/nss3/secasn1t.h
-%{_includedir}/nss3/seccomon.h
-%{_includedir}/nss3/secder.h
-%{_includedir}/nss3/secdert.h
-%{_includedir}/nss3/secdig.h
-%{_includedir}/nss3/secdigt.h
-%{_includedir}/nss3/secerr.h
-%{_includedir}/nss3/secitem.h
-%{_includedir}/nss3/secoid.h
-%{_includedir}/nss3/secoidt.h
-%{_includedir}/nss3/secport.h
-%{_includedir}/nss3/utilrename.h
 
 %files softokn
 %defattr(-,root,root)
@@ -606,6 +569,7 @@ done
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
 
+
 %{_includedir}/nss3/cert.h
 %{_includedir}/nss3/certdb.h
 %{_includedir}/nss3/certt.h
@@ -674,6 +638,9 @@ done
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-12
+- kill off the nss-util nss-util-devel subpackages
+
 * Sun Aug 23 2009 Elio Maldonado+emaldona at redhat.com - 3.12.3.99.3-11
 - split off nss-softokn and nss-util as subpackages with their own rpms
 - first phase of splitting nss-softokn and nss-util as their own packages



From ausil at fedoraproject.org  Mon Aug 24 22:43:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 22:43:22 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.88,1.89
Message-ID: <20090824224322.1666D11C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18749

Modified Files:
	nss.spec 
Log Message:
clean up post and postun for util package



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- nss.spec	24 Aug 2009 22:41:06 -0000	1.88
+++ nss.spec	24 Aug 2009 22:43:21 -0000	1.89
@@ -14,7 +14,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          11%{?dist}
+Release:          12%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -440,9 +440,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-%post util
-/sbin/ldconfig >/dev/null 2>/dev/null
-
 %post softokn
 /sbin/ldconfig >/dev/null 2>/dev/null
 
@@ -453,9 +450,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-%postun util
-/sbin/ldconfig >/dev/null 2>/dev/null
-
 %postun softokn
 /sbin/ldconfig >/dev/null 2>/dev/null
 



From mclasen at fedoraproject.org  Mon Aug 24 22:46:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 24 Aug 2009 22:46:44 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.45, 1.46 gvfs.spec, 1.151,
	1.152 sources, 1.45, 1.46
Message-ID: <20090824224645.05EAA11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19181

Modified Files:
	.cvsignore gvfs.spec sources 
Log Message:
1.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	10 Aug 2009 17:09:43 -0000	1.45
+++ .cvsignore	24 Aug 2009 22:46:44 -0000	1.46
@@ -1 +1 @@
-gvfs-1.3.4.tar.bz2
+gvfs-1.3.5.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- gvfs.spec	17 Aug 2009 14:32:02 -0000	1.151
+++ gvfs.spec	24 Aug 2009 22:46:44 -0000	1.152
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.3.4
-Release: 7%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -35,20 +35,6 @@ BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch1: gvfs-archive-integration.patch
-# Bad mount prefix stripping in g_daemon_file_get_path()
-# http://bugzilla.gnome.org/show_bug.cgi?id=590862
-Patch4: gvfs-1.3.4-dont-strip-mount-prefix-for-local-paths.patch
-# GDaemonMount calculates wrong root path when mount_prefix is set
-# http://bugzilla.gnome.org/show_bug.cgi?id=590730
-Patch5: gvfs-1.3.5-gdaemonmount-root-path.patch
-Patch6: gvfs-1.3.5-mountspec-prefix-ensure-ending-path-separator.patch
-# nautilus can't create "unamed folder X" if it exist on the target via sftp
-# https://bugzilla.redhat.com/show_bug.cgi?id=512611
-Patch7: gvfs-1.3.5-mkdir-exists-error.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=497631
-Patch8: gvfs-1.2.2-dnssd-deadlock.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=504339
-Patch9: gvfs-1.2.3-sftp-40sec-timeout.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
 Patch10: 0001-Add-AFC-backend.patch
 
@@ -143,12 +129,6 @@ and iPod Touches to applications using g
 %prep
 %setup -q
 %patch1 -p1 -b .archive-integration
-%patch4 -p1 -b .mount-prefix
-%patch5 -p1 -b .root-path
-%patch6 -p1 -b .prefix-slash
-%patch7 -p1 -b .sftp-mkdir
-%patch8 -p1 -b .dnssd-deadlock
-%patch9 -p1 -b .sftp-timeout
 %patch10 -p1 -b .afc
 
 %build
@@ -303,6 +283,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasne <mclasen at redhat.com> - 1.3.5-1
+- Update to 1.3.5
+
 * Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-7
 - Fix Nautilus can't create "untitled folder" on sftp mounts (#512611)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	10 Aug 2009 17:09:44 -0000	1.45
+++ sources	24 Aug 2009 22:46:44 -0000	1.46
@@ -1 +1 @@
-4c9b83c873a3757dde0052bafcebb7dc  gvfs-1.3.4.tar.bz2
+3d3d43f381716d973880ef55abea1aa6  gvfs-1.3.5.tar.bz2



From orion at fedoraproject.org  Mon Aug 24 22:49:42 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 24 Aug 2009 22:49:42 +0000 (UTC)
Subject: rpms/wgrib/devel .cvsignore, 1.4, 1.5 Changes, 1.4, 1.5 sources, 1.4,
	1.5 wgrib.spec, 1.9, 1.10
Message-ID: <20090824224942.86B4711C0044@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19585

Modified Files:
	.cvsignore Changes sources wgrib.spec 
Log Message:
* Mon Aug 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.13b-1
- Update to 1.8.0.13b



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Sep 2008 16:08:07 -0000	1.4
+++ .cvsignore	24 Aug 2009 22:49:41 -0000	1.5
@@ -1 +1 @@
-wgrib.c.v1.8.0.12u
+wgrib.c.v1.8.0.13b


Index: Changes
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/Changes,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- Changes	4 Sep 2008 16:08:07 -0000	1.4
+++ Changes	24 Aug 2009 22:49:42 -0000	1.5
@@ -1,3 +1,13 @@
+v1.8.0.13b 6/09 updated ncep table 129
+v1.8.0.13a 5/09 added SUNSD ncep table 133
+v1.8.0.13 5/09 added -cmc by NCO request, updated ncep table 129
+v1.8.0.12z: 4/09 updated/added ectables: 128, 129, 131, 132, 133, 140, 150, 
+    151, 160, 162, 170, 171, 173, 174, 180, 190, 200, 210, 211, 228
+v1.8.0.12y: 3/09 added #include <stdlib.h> to BDSunpk.c (Lulin Song)
+	fix: bit 1 table 7 doesn't apply to lambert conformal
+v1.8.0.12x: 11/08 make center LAMI point to DWD tables (Davide Sacchetti)  (removed)
+v1.8.0.12w: 9/08 (preliminary) MDL table
+v1.8.0.12v: 8/08 polar & lambert conformal grid: dx/dy now respect bit 1 of resolution flag
 v1.8.0.12u: 4/08 update time ranges for CFSRR
 v1.8.0.12t: 3/08 update table ncep table 129, fix ncep table 133, #205
 v1.8.0.12s: 1/08 update ncep table 133 (CFSRR)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Sep 2008 16:08:07 -0000	1.4
+++ sources	24 Aug 2009 22:49:42 -0000	1.5
@@ -1 +1 @@
-bdd893c4b5d955ff1b7c9d05e3a473ec  wgrib.c.v1.8.0.12u
+abe0e8c9ed97a80c9a029970effa325d  wgrib.c.v1.8.0.13b


Index: wgrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib/devel/wgrib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- wgrib.spec	27 Jul 2009 07:13:03 -0000	1.9
+++ wgrib.spec	24 Aug 2009 22:49:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           wgrib
-Version:        1.8.0.12u
-Release:        3%{?dist}
+Version:        1.8.0.13b
+Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB files
 
 Group:          Applications/Engineering
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.8.0.13b-1
+- Update to 1.8.0.13b
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0.12u-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From behdad at fedoraproject.org  Mon Aug 24 23:19:00 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 24 Aug 2009 23:19:00 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.79, 1.80 sources, 1.80, 1.81 vte.spec, 
	1.153, 1.154 vte-gcc44.patch, 1.1, NONE
Message-ID: <20090824231900.A4D7C11C0044@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24833

Modified Files:
	.cvsignore sources vte.spec 
Removed Files:
	vte-gcc44.patch 
Log Message:
* Mon Aug 24 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.1-1 
- Update to 0.21.1 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	31 May 2009 06:00:57 -0000	1.79
+++ .cvsignore	24 Aug 2009 23:18:58 -0000	1.80
@@ -1 +1 @@
-vte-0.20.3.tar.bz2
+vte-0.21.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	10 Jun 2009 05:52:22 -0000	1.80
+++ sources	24 Aug 2009 23:18:58 -0000	1.81
@@ -1 +1 @@
-90de70ddd1340be308430ded74d6b8d6  vte-0.20.5.tar.bz2
+311b1ee9861c3572307d9a7404797505  vte-0.21.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- vte.spec	27 Jul 2009 06:59:22 -0000	1.153
+++ vte.spec	24 Aug 2009 23:18:58 -0000	1.154
@@ -3,8 +3,8 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.20.5
-Release: 3%{?dist}
+Version: 0.21.1
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Aug 24 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.1-1
+- Update to 0.21.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- vte-gcc44.patch DELETED ---



From orion at fedoraproject.org  Mon Aug 24 22:56:41 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 24 Aug 2009 22:56:41 +0000 (UTC)
Subject: rpms/wgrib2/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wgrib2.spec,
	1.9, 1.10
Message-ID: <20090824225641.245EF11C0044@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21232

Modified Files:
	.cvsignore sources wgrib2.spec 
Log Message:
* Mon Aug 24 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.1-1
- Update to 1.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Aug 2009 18:23:58 -0000	1.6
+++ .cvsignore	24 Aug 2009 22:56:40 -0000	1.7
@@ -1 +1,2 @@
-wgrib2-1.8.0.tar.gz
+wgrib2-1.8.1.tar.gz
+wgrib2.tgz.v1.8.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 18:23:58 -0000	1.6
+++ sources	24 Aug 2009 22:56:40 -0000	1.7
@@ -1 +1,2 @@
-5f966acef09c2fcc0d19747d8a279cdb  wgrib2-1.8.0.tar.gz
+fb0133f44cf8fa0c7b11076e749c1190  wgrib2-1.8.1.tar.gz
+67f1bb7f5af7d498aa5e51c23f8a7219  wgrib2.tgz.v1.8.1


Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- wgrib2.spec	20 Aug 2009 18:23:58 -0000	1.9
+++ wgrib2.spec	24 Aug 2009 22:56:40 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           wgrib2
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
@@ -11,6 +11,7 @@ URL:            http://www.cpc.ncep.noaa
 # spectool -g wgrib2.spec
 # make prep
 # tar czf wgrib2-%{version}.tar.gz grib2
+# The original tar ball is kept in the lookaside cache as well
 #Source0:        ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v%{version}
 Source0:        wgrib2-%{version}.tar.gz
 Source1:        config.h
@@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.1-1
+- Update to 1.8.1
+
 * Thu Aug 20 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.0-1
 - Update to 1.8.0
 - Only ship the wgrib2 source



From ausil at fedoraproject.org  Mon Aug 24 23:31:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 24 Aug 2009 23:31:26 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.89,1.90
Message-ID: <20090824233126.AAF7C11C0044@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27819

Modified Files:
	nss.spec 
Log Message:
remove from -devel %files the 3 headers that are in nss-util-devel



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- nss.spec	24 Aug 2009 22:43:21 -0000	1.89
+++ nss.spec	24 Aug 2009 23:31:26 -0000	1.90
@@ -14,7 +14,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-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
@@ -603,11 +603,8 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %{_includedir}/nss3/preenc.h
 %{_includedir}/nss3/secmime.h
 %{_includedir}/nss3/secmod.h
-%{_includedir}/nss3/secoid.h
-%{_includedir}/nss3/secoidt.h
 %{_includedir}/nss3/secpkcs5.h
 %{_includedir}/nss3/secpkcs7.h
-%{_includedir}/nss3/secport.h
 %{_includedir}/nss3/smime.h
 %{_includedir}/nss3/ssl.h
 %{_includedir}/nss3/sslerr.h
@@ -632,6 +629,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-13
+- remove from -devel the 3 headers that ship in nss-util-devel
+
 * Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-12
 - kill off the nss-util nss-util-devel subpackages
 



From pkgdb at fedoraproject.org  Tue Aug 25 00:12:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:12:51 +0000
Subject: [pkgdb] basket ownership updated
Message-ID: <20090825001251.D3EF410F877@bastion2.fedora.phx.redhat.com>

Package basket in Fedora devel is now owned by lspooky

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:13:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:13:26 +0000
Subject: [pkgdb] basket: lspooky has requested watchbugzilla
Message-ID: <20090825001326.23B5410F877@bastion2.fedora.phx.redhat.com>

lspooky has requested the watchbugzilla acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:13:34 +0000
Subject: [pkgdb] basket: lspooky has requested commit
Message-ID: <20090825001334.E940510F884@bastion2.fedora.phx.redhat.com>

lspooky has requested the commit acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:14:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:14:13 +0000
Subject: [pkgdb] basket: lspooky has given up watchbugzilla
Message-ID: <20090825001413.B4E1A10F877@bastion2.fedora.phx.redhat.com>

lspooky has given up the watchbugzilla acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:14:17 +0000
Subject: [pkgdb] basket: lspooky has given up commit
Message-ID: <20090825001417.AF29E10F87C@bastion2.fedora.phx.redhat.com>

lspooky has given up the commit acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:14:16 +0000
Subject: [pkgdb] basket: lspooky has given up watchcommits
Message-ID: <20090825001416.C4D8410F879@bastion2.fedora.phx.redhat.com>

lspooky has given up the watchcommits acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From mclasen at fedoraproject.org  Tue Aug 25 00:17:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 00:17:56 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.113, 1.114 gtk2.spec, 1.397,
	1.398 sources, 1.122, 1.123
Message-ID: <20090825001756.16F5611C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4571

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.17.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- .cvsignore	18 Aug 2009 04:04:47 -0000	1.113
+++ .cvsignore	25 Aug 2009 00:17:55 -0000	1.114
@@ -1 +1 @@
-gtk+-2.17.8.tar.bz2
+gtk+-2.17.9.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- gtk2.spec	18 Aug 2009 04:04:47 -0000	1.397
+++ gtk2.spec	25 Aug 2009 00:17:55 -0000	1.398
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.8
+%define base_version 2.17.9
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -27,8 +27,6 @@ Source3: im-cedilla.conf
 
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
-# http://bugzilla.redhat.com/show_bug.cgi?id=478400
-# Patch1: default_printer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -140,7 +138,6 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-# %patch1 -p0 -b .default-printer
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -385,6 +382,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.9-1
+- Update to 2.17.9
+
 * Tue Aug 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.8-1
 - Update to 2.17.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	18 Aug 2009 04:04:47 -0000	1.122
+++ sources	25 Aug 2009 00:17:55 -0000	1.123
@@ -1 +1 @@
-7e0a37e4cc40f74963886031d0df2182  gtk+-2.17.8.tar.bz2
+44323cc81628be422c59059086e33353  gtk+-2.17.9.tar.bz2



From pkgdb at fedoraproject.org  Tue Aug 25 00:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:18:08 +0000
Subject: [pkgdb] basket: lspooky has requested watchbugzilla
Message-ID: <20090825001808.1D79010F86F@bastion2.fedora.phx.redhat.com>

lspooky has requested the watchbugzilla acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:18:09 +0000
Subject: [pkgdb] basket: lspooky has requested watchcommits
Message-ID: <20090825001809.5840110F878@bastion2.fedora.phx.redhat.com>

lspooky has requested the watchcommits acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:18:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:18:10 +0000
Subject: [pkgdb] basket: lspooky has requested commit
Message-ID: <20090825001810.4BD0010F881@bastion2.fedora.phx.redhat.com>

lspooky has requested the commit acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From pkgdb at fedoraproject.org  Tue Aug 25 00:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 00:13:29 +0000
Subject: [pkgdb] basket: lspooky has requested watchcommits
Message-ID: <20090825001329.4053710F879@bastion2.fedora.phx.redhat.com>

lspooky has requested the watchcommits acl on basket (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/basket



From lennart at fedoraproject.org  Tue Aug 25 00:39:31 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 25 Aug 2009 00:39:31 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec,1.16,1.17
Message-ID: <20090825003931.EF9CD11C0044@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9643

Modified Files:
	paprefs.spec 
Log Message:
Add dbus-glib to deps


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- paprefs.spec	25 Aug 2009 00:30:12 -0000	1.16
+++ paprefs.spec	25 Aug 2009 00:39:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           paprefs
 Version:        0.9.9
-Release:        0.git20090825%{?dist}
+Release:        1.git20090825%{?dist}
 Summary:        Management tool for PulseAudio
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -15,6 +15,7 @@ BuildRequires:  lynx
 BuildRequires:  desktop-file-utils
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  intltool
+BuildRequires:	dbus-glib-devel
 
 %description
 PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog
@@ -51,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Tue Aug 25 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-1.git20090825
+- Add dbus-glib to deps
+
 * Tue Aug 25 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-0.git20090825
 - Snapshot
 



From cebbert at fedoraproject.org  Tue Aug 25 00:43:51 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 25 Aug 2009 00:43:51 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1115, 1.1116 kernel.spec, 1.1733, 1.1734 sources, 1.1073,
	1.1074 upstream, 1.987, 1.988 patch-2.6.31-rc7-git1.bz2.sign,
	1.1, NONE
Message-ID: <20090825004351.B77C511C0044@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10547

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git2.bz2.sign 
Removed Files:
	patch-2.6.31-rc7-git1.bz2.sign 
Log Message:
2.6.31-rc7-git2


--- NEW FILE patch-2.6.31-rc7-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKkyupyGugalF9Dw4RAtufAJ9VBD3m60ddbWAtXvnvfrDdUOSk2gCePW7R
DbCEWkxNKAn5dvFcmJen+w0=
=056/
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1115
retrieving revision 1.1116
diff -u -p -r1.1115 -r1.1116
--- .cvsignore	24 Aug 2009 15:01:16 -0000	1.1115
+++ .cvsignore	25 Aug 2009 00:43:51 -0000	1.1116
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git1.bz2
+patch-2.6.31-rc7-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1733
retrieving revision 1.1734
diff -u -p -r1.1733 -r1.1734
--- kernel.spec	24 Aug 2009 15:01:16 -0000	1.1733
+++ kernel.spec	25 Aug 2009 00:43:51 -0000	1.1734
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1998,6 +1998,9 @@ fi
 
 %changelog
 * Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git2
+
+* Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git1
 
 * Sat Aug 22 2009 Chuck Ebbert <cebbert at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1073
retrieving revision 1.1074
diff -u -p -r1.1073 -r1.1074
--- sources	24 Aug 2009 15:01:16 -0000	1.1073
+++ sources	25 Aug 2009 00:43:51 -0000	1.1074
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-22d1b4c17bde1034e332dc2505c9f15a  patch-2.6.31-rc7-git1.bz2
+fb0cac7a741028e2ef185e8e87a51515  patch-2.6.31-rc7-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -p -r1.987 -r1.988
--- upstream	24 Aug 2009 15:01:16 -0000	1.987
+++ upstream	25 Aug 2009 00:43:51 -0000	1.988
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git1.bz2
+patch-2.6.31-rc7-git2.bz2


--- patch-2.6.31-rc7-git1.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Tue Aug 25 00:44:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 00:44:27 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-config.patch,1.1,1.2
Message-ID: <20090825004427.C1D2F11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10683

Modified Files:
	nautilus-config.patch 
Log Message:
fix patch


nautilus-config.patch:
 apps_nautilus_preferences.schemas.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: nautilus-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nautilus-config.patch	13 Aug 2009 01:29:25 -0000	1.1
+++ nautilus-config.patch	25 Aug 2009 00:44:27 -0000	1.2
@@ -1,15 +1,6 @@
 diff -up nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in.config nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in
 --- nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in.config	2009-08-12 21:07:44.331994084 -0400
 +++ nautilus-2.27.4/libnautilus-private/apps_nautilus_preferences.schemas.in	2009-08-12 21:26:31.258991695 -0400
-@@ -149,7 +149,7 @@
-     </schema>
- 
-     <schema>
--      <key>/schemas/apps/nautilus/preferences/media_autorun_never_</key>
-+      <key>/schemas/apps/nautilus/preferences/media_autorun_never</key>
-       <applyto>/apps/nautilus/preferences/media_autorun_never</applyto>
-       <owner>nautilus</owner>
-       <type>bool</type>
 @@ -169,7 +169,7 @@
        <owner>nautilus</owner>
        <type>list</type>



From whot at fedoraproject.org  Tue Aug 25 00:44:22 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 25 Aug 2009 00:44:22 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.57, 1.58 sources, 1.56,
	1.57 xorg-x11-proto-devel.spec, 1.106, 1.107
Message-ID: <20090825004422.F3AD611C0044@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-serv10670

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-29
- inputproto 1.9.99.902



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	6 Aug 2009 01:56:13 -0000	1.57
+++ .cvsignore	25 Aug 2009 00:44:22 -0000	1.58
@@ -25,7 +25,7 @@ xproxymanagementprotocol-1.0.2.tar.bz2
 randrproto-1.2.99.3.tar.bz2
 glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
-inputproto-1.9.99.15.tar.bz2
+inputproto-1.9.99.902.tar.bz2
 randrproto-1.3.0.tar.bz2
 xextproto-7.1.0.tar.bz2
 fixesproto-4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	6 Aug 2009 01:56:13 -0000	1.56
+++ sources	25 Aug 2009 00:44:22 -0000	1.57
@@ -21,7 +21,7 @@ f00844a63d6e76b69eb0eb5e41eed843  xf86vi
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
-87a569587d6141af0aa0ab4b604d083a  inputproto-1.9.99.15.tar.bz2
+1937db6f8881409a1fc8b45bcc01f4ad  inputproto-1.9.99.902.tar.bz2
 a49416013fff33c853efb32f1926551e  randrproto-1.3.0.tar.bz2
 d54562771718a02508c6e0255409145d  xextproto-7.1.0.tar.bz2
 157644edb3cd526f2cb164eb79c52bad  fixesproto-4.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.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- xorg-x11-proto-devel.spec	6 Aug 2009 01:56:13 -0000	1.106
+++ xorg-x11-proto-devel.spec	25 Aug 2009 00:44:22 -0000	1.107
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -23,7 +23,7 @@ Source4:  http://www.x.org/pub/individua
 Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.0.2.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.15.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
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
@@ -258,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-29
+- inputproto 1.9.99.902
+
 * Thu Aug 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-28
 - xextproto 7.1.0
 



From mclasen at fedoraproject.org  Tue Aug 25 00:50:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 00:50:28 +0000 (UTC)
Subject: rpms/libsoup/devel libsoup.spec,1.99,1.100
Message-ID: <20090825005028.3616C11C0376@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11884

Modified Files:
	libsoup.spec 
Log Message:
fix BRs



Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- libsoup.spec	24 Aug 2009 21:07:06 -0000	1.99
+++ libsoup.spec	25 Aug 2009 00:50:27 -0000	1.100
@@ -20,6 +20,7 @@ BuildRequires: libxml2-devel
 BuildRequires: libproxy-devel
 BuildRequires: sqlite-devel
 BuildRequires: GConf2-devel
+BuildRequires: gnome-keyring-devel
 
 %description
 Libsoup is an HTTP library implementation in C. It was originally part



From airlied at fedoraproject.org  Tue Aug 25 00:53:29 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 25 Aug 2009 00:53:29 +0000 (UTC)
Subject: rpms/kernel/devel drm-next.patch, 1.13, 1.14 drm-page-flip.patch,
	1.3, 1.4 drm-vga-arb.patch, 1.5, 1.6 kernel.spec, 1.1734, 1.1735
Message-ID: <20090825005329.CCE4311C0044@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12468

Modified Files:
	drm-page-flip.patch drm-vga-arb.patch kernel.spec 
Added Files:
	drm-next.patch 
Log Message:
* Tue Aug 25 2009 Dave Airlie <airlied at redhat.com>
- pull in drm-next tree + rebase around it


drm-next.patch:
 drivers/gpu/drm/Makefile               |    2 
 drivers/gpu/drm/drm_crtc.c             |   76 ++-
 drivers/gpu/drm/drm_crtc_helper.c      |   44 +
 drivers/gpu/drm/drm_drv.c              |    4 
 drivers/gpu/drm/drm_edid.c             |   70 ++-
 drivers/gpu/drm/drm_encoder_slave.c    |  116 +++++
 drivers/gpu/drm/drm_modes.c            |  424 ++++++++++++++++++-
 drivers/gpu/drm/drm_sysfs.c            |   28 +
 drivers/gpu/drm/i915/i915_dma.c        |   35 -
 drivers/gpu/drm/i915/intel_lvds.c      |   22 
 drivers/gpu/drm/i915/intel_sdvo.c      |   41 -
 drivers/gpu/drm/radeon/Makefile        |   15 
 drivers/gpu/drm/radeon/mkregtable.c    |  726 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/r300.c          |   45 --
 drivers/gpu/drm/radeon/radeon_object.h |    1 
 drivers/gpu/drm/radeon/radeon_ttm.c    |   33 +
 drivers/gpu/drm/radeon/reg_srcs/r300   |  728 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/reg_srcs/rv515  |  486 ++++++++++++++++++++++
 drivers/gpu/drm/radeon/rv515.c         |   64 --
 drivers/gpu/drm/ttm/ttm_bo.c           |  295 ++++++++-----
 drivers/gpu/drm/ttm/ttm_bo_util.c      |    4 
 drivers/gpu/drm/ttm/ttm_global.c       |    4 
 drivers/gpu/drm/ttm/ttm_memory.c       |  508 +++++++++++++++++++----
 drivers/gpu/drm/ttm/ttm_module.c       |   58 ++
 drivers/gpu/drm/ttm/ttm_tt.c           |   37 -
 include/drm/drmP.h                     |   50 +-
 include/drm/drm_crtc.h                 |   12 
 include/drm/drm_encoder_slave.h        |  162 +++++++
 include/drm/drm_mode.h                 |   11 
 include/drm/drm_sysfs.h                |   12 
 include/drm/ttm/ttm_bo_api.h           |   13 
 include/drm/ttm/ttm_bo_driver.h        |   94 +++-
 include/drm/ttm/ttm_memory.h           |   43 +
 include/drm/ttm/ttm_module.h           |    2 
 34 files changed, 3763 insertions(+), 502 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.13 -r 1.14 drm-next.patchIndex: drm-next.patch
===================================================================
RCS file: drm-next.patch
diff -N drm-next.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-next.patch	25 Aug 2009 00:53:28 -0000	1.14
@@ -0,0 +1,6379 @@
+commit 50f153036c9d9e4ae1768d5ca9c2ad4184f7a0b7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 21 13:21:01 2009 +1000
+
+    drm/radeon/kms: generate the safe register tables.
+    
+    Previously we just made these offline and included them,
+    but no reason we can't generate them at build time.
+    
+    TODO: add rs690 + r100/r200 when done.
+    should we do rs480/rs690 no tcl version?
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 759e4f83f418f4001e724042b4c0e408d615d9ec
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Thu Aug 20 10:29:09 2009 +0200
+
+    drm/ttm: Fixes for "Memory accounting rework."
+    
+    ttm:
+    Fix error paths when kobject_add returns an error.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Thu Aug 20 10:29:08 2009 +0200
+
+    drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
+    
+    ttm:
+    Remove a stray debug printout.
+    Remove a re-init of the lru spinlock at device init.
+    
+    radeon:
+    Fix the size of the bo_global allocation.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 51c8b4071d84d46cc100baa5931ad06b2a823c95
+Merge: a987fca... 6c30c53...
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 20 13:38:04 2009 +1000
+
+    Merge Linus master to drm-next
+    
+    linux-next conflict reported needed resolution.
+    
+    Conflicts:
+    	drivers/gpu/drm/drm_crtc.c
+    	drivers/gpu/drm/drm_edid.c
+    	drivers/gpu/drm/i915/intel_sdvo.c
+    	drivers/gpu/drm/radeon/radeon_ttm.c
+    	drivers/gpu/drm/ttm/ttm_bo.c
+
+commit a987fcaa805fcb24ba885c2e29fd4fdb6816f08f
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Tue Aug 18 16:51:56 2009 +0200
+
+    ttm: Make parts of a struct ttm_bo_device global.
+    
+    Common resources, like memory accounting and swap lists should be
+    global and not per device. Introduce a struct ttm_bo_global to
+    accomodate this, and register it with sysfs. Add a small sysfs interface
+    to return the number of active buffer objects.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit 5fd9cbad3a4ae82c83c55b9c621d156c326724ef
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Mon Aug 17 16:28:39 2009 +0200
+
+    drm/ttm: Memory accounting rework.
+    
+    Use inclusive zones to simplify accounting and its sysfs representation.
+    Use DMA32 accounting where applicable.
+    
+    Add a sysfs interface to make the heuristically determined limits
+    readable and configurable.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit e9840be8c23601285a70520b4898818f28ce8c2b
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Tue Aug 18 10:27:57 2009 +0200
+
+    drm/ttm: Add a virtual ttm sysfs device.
+    
+    The device directory will be the base directory of the
+    sysfs representation of other ttm subsystems.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit 327c225bd548bf7871f116a0baa5ebdac884e452
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Mon Aug 17 16:28:37 2009 +0200
+
+    drm: Enable drm drivers to add drm sysfs devices.
+    
+    Export utility functions for drivers to add specialized devices in the
+    sysfs drm class subdirectory.
+    
+    Initially this will be needed form TTM to add a virtual device that
+    handles power management.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit a0724fcf829e5afb66159ef68cb16a805ea11b42
+Author: Pekka Paalanen <pq at iki.fi>
+Date:   Mon Aug 17 01:18:38 2009 +0300
+
+    drm/ttm: optimize bo_kmap_type values
+    
+    A micro-optimization on the function ttm_kmap_obj_virtual().
+    
+    By defining the values of enum ttm_bo_kmap_obj::bo_kmap_type to have a
+    bit indicating iomem, size of the function ttm_kmap_obj_virtual() will be
+    reduced by 16 bytes on x86_64 (gcc 4.1.2).
+    
+    ttm_kmap_obj_virtual() may be heavily used, when buffer objects are
+    accessed via wrappers, that work for both kinds of memory addresses:
+    iomem cookies and kernel virtual.
+    
+    Signed-off-by: Pekka Paalanen <pq at iki.fi>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 949ef70e2d1a5c12178875f513df34fc85d91a38
+Author: Pekka Paalanen <pq at iki.fi>
+Date:   Mon Aug 17 19:49:19 2009 +0300
+
+    drm/kms: no need to return void value (encoder)
+    
+    Cc: Francisco Jerez <currojerez at riseup.net>
+    Signed-off-by: Pekka Paalanen <pq at iki.fi>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 53bd83899f5ba6b0da8f5ef976129273854a72d4
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Wed Jul 1 10:04:40 2009 -0700
+
+    drm: clarify scaling property names
+    
+    Now that we're using the scaling property in the Intel driver I noticed
+    that the names were a bit confusing.  I've corrected them according to
+    our discussion on IRC and the mailing list, though I've left out
+    potential new additions for a new scaling property with an integer (or
+    two) for the scaling factor.  None of the drivers implement that today,
+    but if someone wants to do it, I think it could be done with the
+    addition of a single new type and a new property to describe the
+    scaling factor in the X and Y directions.
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Acked-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 776f3360de6ed246e973577828f725681120fd7a
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Wed Aug 19 15:56:37 2009 +1000
+
+    drm: fixup includes in encoder slave header files.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 453a7d46dca88704ed88b364c445ff55680a8557
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Wed Aug 19 15:51:55 2009 +1000
+
+    drm: remove root requirement from DRM_IOCTL_SET_VERSION (+ DRM_IOCTL_AUTH_MAGIC)
+    
+    Just a DRM_MASTER flag is sufficient here, though maybe this call is
+    totally deprecated anyway (xf86-video-intel still calls it though).
+    
+    (airlied: drop ioctl auth_magic as discussed on mailing list also)
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit cfcf4738cd6b5d7bed1473acad76d6430cf1fb0a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 13 13:31:54 2009 +1000
+
+    drm: fixup include file in drm_encoder_slave
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit a75f0236292a5fca65f26efedca48bd07db1834d
[...5986 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-page-flip.patch:
 drivers/gpu/drm/drm_crtc.c              |  169 +++++++++++++++++++++++++++++++-
 drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
 drivers/gpu/drm/drm_drv.c               |    1 
 drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++
 drivers/gpu/drm/drm_irq.c               |   43 ++++++++
 drivers/gpu/drm/i915/i915_drv.c         |    1 
 drivers/gpu/drm/i915/intel_display.c    |   24 +++-
 drivers/gpu/drm/nouveau/nv04_crtc.c     |    2 
 drivers/gpu/drm/nouveau/nv50_crtc.c     |    2 
 drivers/gpu/drm/radeon/radeon_display.c |    3 
 include/drm/drm.h                       |   25 ++++
 include/drm/drmP.h                      |   32 ++++++
 include/drm/drm_crtc.h                  |   27 +++++
 include/drm/drm_crtc_helper.h           |    4 
 include/drm/drm_mode.h                  |   16 +++
 15 files changed, 415 insertions(+), 14 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drm-page-flip.patch	12 Aug 2009 21:13:59 -0000	1.3
+++ drm-page-flip.patch	25 Aug 2009 00:53:29 -0000	1.4
@@ -1,34 +1,6 @@
-commit f2884697ef0e0064a189d5baacf565d6742687f1
-Author: Kristian H?gsberg <krh at hinata.local>
-Date:   Mon Jul 13 09:07:19 2009 -0400
-
-    Add modesetting pageflip ioctl and corresponding drm event
-    
-    This patch adds a vblank synced pageflip ioctl for to the modesetting
-    family of ioctls.  The ioctl takes a crtc and an fb and schedules a
-    pageflip to the new fb at the next coming vertical blank event.  This
-    feature lets userspace implement tear-free updating of the screen contents
-    with hw-guaranteed low latency page flipping.
-    
-    The ioctl is asynchronous in that it returns immediately and then later
-    notifies the client by making an event available for reading on the drm fd.
-    This lets applications add the drm fd to their main loop and handle other
-    tasks while waiting for the flip to happen.  The event includes the time
-    of the flip, the frame counter and a 64 bit opaque token provided by
-    user space in the ioctl.
-    
-    Based on work and suggestions from
-    	Jesse Barnes <jbarnes at virtuousgeek.org>,
-    	Jakob Bornecrantz <wallbraker at gmail.com>,
-    	Chris Wilson <chris at chris-wilson.co.uk>
-    
-    Signed-off-by: Kristian H?gsberg <krh at redhat.com>
-    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-
-diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 8fab789..f598ce0 100644
---- a/drivers/gpu/drm/drm_crtc.c
-+++ b/drivers/gpu/drm/drm_crtc.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c	2009-08-25 09:52:41.000000000 +1000
 @@ -34,6 +34,8 @@
  #include "drmP.h"
  #include "drm_crtc.h"
@@ -38,7 +10,7 @@ index 8fab789..f598ce0 100644
  struct drm_prop_enum_list {
  	int type;
  	char *name;
-@@ -342,6 +344,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
+@@ -329,6 +331,34 @@ void drm_framebuffer_cleanup(struct drm_
  EXPORT_SYMBOL(drm_framebuffer_cleanup);
  
  /**
@@ -73,7 +45,7 @@ index 8fab789..f598ce0 100644
   * drm_crtc_init - Initialise a new CRTC object
   * @dev: DRM device
   * @crtc: CRTC object to init
-@@ -352,17 +382,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
+@@ -339,17 +369,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
   *
   * Inits a new object created as base part of an driver crtc object.
   */
@@ -94,7 +66,7 @@ index 8fab789..f598ce0 100644
  	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_crtc_init);
-@@ -381,6 +413,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
+@@ -368,6 +400,9 @@ void drm_crtc_cleanup(struct drm_crtc *c
  {
  	struct drm_device *dev = crtc->dev;
  
@@ -104,7 +76,7 @@ index 8fab789..f598ce0 100644
  	if (crtc->gamma_store) {
  		kfree(crtc->gamma_store);
  		crtc->gamma_store = NULL;
-@@ -388,6 +423,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
+@@ -375,6 +410,7 @@ void drm_crtc_cleanup(struct drm_crtc *c
  
  	drm_mode_object_put(dev, &crtc->base);
  	list_del(&crtc->head);
@@ -112,7 +84,7 @@ index 8fab789..f598ce0 100644
  	dev->mode_config.num_crtc--;
  }
  EXPORT_SYMBOL(drm_crtc_cleanup);
-@@ -2452,3 +2488,134 @@ out:
+@@ -2478,3 +2514,134 @@ out:
  	mutex_unlock(&dev->mode_config.mutex);
  	return ret;
  }
@@ -247,11 +219,10 @@ index 8fab789..f598ce0 100644
 +
 +	return ret;
 +}
-diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index 3da9cfa..5a26bab 100644
---- a/drivers/gpu/drm/drm_crtc_helper.c
-+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -868,8 +868,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-08-25 09:52:41.000000000 +1000
+@@ -874,8 +874,10 @@ int drm_crtc_helper_set_config(struct dr
  		old_fb = set->crtc->fb;
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
@@ -262,7 +233,7 @@ index 3da9cfa..5a26bab 100644
  		if (ret != 0)
  		    goto fail_set_mode;
  	}
-@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
+@@ -1101,3 +1103,13 @@ int drm_helper_resume_force_mode(struct 
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -276,11 +247,10 @@ index 3da9cfa..5a26bab 100644
 +	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 +}
 +EXPORT_SYMBOL(drm_crtc_helper_set_base);
-diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index b39d7bf..c66c993 100644
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c	2009-08-25 09:52:41.000000000 +1000
+@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
@@ -288,11 +258,10 @@ index b39d7bf..c66c993 100644
  };
  
  #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
-diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 251bc0e..dcd9c66 100644
---- a/drivers/gpu/drm/drm_fops.c
-+++ b/drivers/gpu/drm/drm_fops.c
-@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c	2009-08-25 09:52:41.000000000 +1000
+@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode 
  
  	INIT_LIST_HEAD(&priv->lhead);
  	INIT_LIST_HEAD(&priv->fbs);
@@ -301,7 +270,7 @@ index 251bc0e..dcd9c66 100644
  
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
-@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, str
  {
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev = file_priv->minor->dev;
@@ -311,7 +280,7 @@ index 251bc0e..dcd9c66 100644
  	int retcode = 0;
  
  	lock_kernel();
-@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, str
  	if (file_priv->minor->master)
  		drm_master_release(dev, filp);
  
@@ -331,7 +300,7 @@ index 251bc0e..dcd9c66 100644
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_release(dev, file_priv);
  
-@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, str
  }
  EXPORT_SYMBOL(drm_release);
  
@@ -389,10 +358,9 @@ index 251bc0e..dcd9c66 100644
 +	return mask;
  }
  EXPORT_SYMBOL(drm_poll);
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index b4a3dbc..c7a17f6 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:52:41.000000000 +1000
 @@ -34,6 +34,7 @@
   */
  
@@ -401,7 +369,7 @@ index b4a3dbc..c7a17f6 100644
  
  #include <linux/interrupt.h>	/* For task queue support */
  
-@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
+@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *
  	return 0;
  }
  
@@ -446,7 +414,7 @@ index b4a3dbc..c7a17f6 100644
  static void vblank_disable_fn(unsigned long arg)
  {
  	struct drm_device *dev = (struct drm_device *)arg;
-@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
+@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *d
  		atomic_set(&dev->vblank_refcount[i], 0);
  	}
  
@@ -455,7 +423,7 @@ index b4a3dbc..c7a17f6 100644
  	dev->vblank_disable_allowed = 0;
  
  	return 0;
-@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
+@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device
  {
  	atomic_inc(&dev->_vblank_count[crtc]);
  	DRM_WAKEUP(&dev->vbl_queue[crtc]);
@@ -463,10 +431,9 @@ index b4a3dbc..c7a17f6 100644
  }
  EXPORT_SYMBOL(drm_handle_vblank);
 +
-diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index fc4b68a..322b0f2 100644
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-08-25 09:52:41.000000000 +1000
 @@ -203,6 +203,7 @@ static struct drm_driver driver = {
  		 .mmap = drm_gem_mmap,
  		 .poll = drm_poll,
@@ -475,11 +442,10 @@ index fc4b68a..322b0f2 100644
  #ifdef CONFIG_COMPAT
  		 .compat_ioctl = i915_compat_ioctl,
  #endif
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 508838e..697c31a 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -863,6 +863,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:52:41.000000000 +1000
+@@ -917,6 +917,8 @@ intel_pipe_set_base(struct drm_crtc *crt
  	u32 dspcntr, alignment;
  	int ret;
  
@@ -488,7 +454,7 @@ index 508838e..697c31a 100644
  	/* no fb bound */
  	if (!crtc->fb) {
  		DRM_DEBUG("No FB bound\n");
-@@ -898,17 +900,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -952,17 +954,14 @@ intel_pipe_set_base(struct drm_crtc *crt
  		BUG();
  	}
  
@@ -506,7 +472,7 @@ index 508838e..697c31a 100644
  		return ret;
  	}
  
-@@ -944,7 +943,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -998,7 +997,6 @@ intel_pipe_set_base(struct drm_crtc *crt
  	default:
  		DRM_ERROR("Unknown color depth\n");
  		i915_gem_object_unpin(obj);
@@ -514,7 +480,7 @@ index 508838e..697c31a 100644
  		return -EINVAL;
  	}
  	if (IS_I965G(dev)) {
-@@ -972,13 +970,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1026,13 +1024,11 @@ intel_pipe_set_base(struct drm_crtc *crt
  		I915_READ(dspbase);
  	}
  
@@ -529,7 +495,7 @@ index 508838e..697c31a 100644
  
  	if (!dev->primary->master)
  		return 0;
-@@ -2364,7 +2360,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2605,7 +2601,9 @@ static int intel_crtc_mode_set(struct dr
  	I915_WRITE(dspcntr_reg, dspcntr);
  
  	/* Flush the plane changes */
@@ -539,7 +505,7 @@ index 508838e..697c31a 100644
  
  	intel_update_watermarks(dev);
  
-@@ -2840,6 +2838,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
+@@ -3081,6 +3079,7 @@ static const struct drm_crtc_funcs intel
  	.gamma_set = intel_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = intel_crtc_destroy,
@@ -547,7 +513,7 @@ index 508838e..697c31a 100644
  };
  
  
-@@ -2852,7 +2851,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3093,7 +3092,7 @@ static void intel_crtc_init(struct drm_d
  	if (intel_crtc == NULL)
  		return;
  
@@ -556,7 +522,7 @@ index 508838e..697c31a 100644
  
  	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
  	intel_crtc->pipe = pipe;
-@@ -3071,9 +3070,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
+@@ -3327,9 +3326,18 @@ static int intel_user_framebuffer_create
  	return drm_gem_handle_create(file_priv, object, handle);
  }
  
@@ -575,11 +541,34 @@ index 508838e..697c31a 100644
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 3efcf1a..4d73f0b 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-08-25 09:52:41.000000000 +1000
+@@ -1122,7 +1122,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
+ 	nv_crtc->mode_set.num_connectors = 0;
+ 
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-08-25 09:52:41.000000000 +1000
+@@ -810,7 +810,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
+ 	crtc->mode_set.num_connectors = 0;
+ 
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf	2009-08-25 09:35:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c	2009-08-25 09:52:41.000000000 +1000
+@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeo
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
@@ -587,7 +576,7 @@ index 3efcf1a..4d73f0b 100644
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
-@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
+@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_
  	if (radeon_crtc == NULL)
  		return;
  
@@ -596,131 +585,21 @@ index 3efcf1a..4d73f0b 100644
  
  	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
  	radeon_crtc->crtc_id = index;
-diff --git a/include/drm/drm.h b/include/drm/drm.h
-index 7cb50bd..1920323 100644
---- a/include/drm/drm.h
-+++ b/include/drm/drm.h
-@@ -686,6 +686,7 @@ struct drm_gem_open {
- #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
- 
- /**
-  * Device specific ioctls should only be in their respective headers
-@@ -698,6 +699,30 @@ struct drm_gem_open {
- #define DRM_COMMAND_BASE                0x40
- #define DRM_COMMAND_END			0xA0
- 
-+/**
-+ * Header for events written back to userspace on the drm fd.  The
-+ * type defines the type of event, the length specifies the total
-+ * length of the event (including the header), and user_data is
-+ * typically a 64 bit value passed with the ioctl that triggered the
-+ * event.  A read on the drm fd will always only return complete
-+ * events, that is, if for example the read buffer is 100 bytes, and
-+ * there are two 64 byte events pending, only one will be returned.
-+ */
-+struct drm_event {
-+	__u32 type;
-+	__u32 length;
-+};
-+
-+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
-+
-+struct drm_event_page_flip {
-+	struct drm_event base;
-+	__u64 user_data;
-+	__u32 tv_sec;
-+	__u32 tv_usec;
-+	__u32 frame;
-+};
-+
- /* typedef area */
- #ifndef __KERNEL__
- typedef struct drm_clip_rect drm_clip_rect_t;
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..4ff43ab 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -402,6 +402,14 @@ struct drm_buf_entry {
- 	struct drm_freelist freelist;
- };
- 
-+/* Event queued up for userspace to read */
-+struct drm_pending_event {
-+	struct drm_event *event;
-+	struct list_head link;
-+	struct drm_file *file_priv;
-+	void (*destroy) (struct drm_pending_event *event);
-+};
-+
- /** File private data */
- struct drm_file {
- 	int authenticated;
-@@ -425,6 +433,9 @@ struct drm_file {
- 	struct drm_master *master; /* master this node is currently associated with
- 				      N.B. not always minor->master */
- 	struct list_head fbs;
-+
-+	wait_queue_head_t event_wait;
-+	struct list_head event_list;
- };
- 
- /** Wait queue */
-@@ -873,6 +884,16 @@ struct drm_minor {
- 	struct drm_mode_group mode_group;
- };
- 
-+struct drm_pending_flip {
-+	struct drm_pending_event pending_event;
-+	struct drm_framebuffer *old_fb;
-+	struct drm_crtc *crtc;
-+	u32 frame;
-+	int pipe;
-+	struct list_head link;
-+	struct drm_event_page_flip event;
-+};
-+
- /**
-  * DRM device structure. This structure represent a complete card that
-  * may contain multiple heads.
-@@ -972,6 +993,13 @@ struct drm_device {
- 
- 	u32 max_vblank_count;           /**< size of vblank counter register */
+diff -up linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf linux-2.6.30.noarch/include/drm/drm_crtc_helper.h
+--- linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf	2009-06-10 13:05:27.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_crtc_helper.h	2009-08-25 09:52:41.000000000 +1000
+@@ -123,4 +123,8 @@ static inline void drm_connector_helper_
+ }
  
-+	struct work_struct flip_work;
+ extern int drm_helper_resume_force_mode(struct drm_device *dev);
 +
-+	/**
-+	 * List of objects waiting on flip completion
-+	 */
-+	struct list_head flip_list;
++extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
++				    struct drm_framebuffer *old_fb);
 +
- 	/*@} */
- 	cycles_t ctx_start;
- 	cycles_t lck_start;
-@@ -1108,6 +1136,8 @@ extern int drm_lastclose(struct drm_device *dev);
- extern int drm_open(struct inode *inode, struct file *filp);
- extern int drm_stub_open(struct inode *inode, struct file *filp);
- extern int drm_fasync(int fd, struct file *filp, int on);
-+extern ssize_t drm_read(struct file *filp, char __user *buffer,
-+			size_t count, loff_t *offset);
- extern int drm_release(struct inode *inode, struct file *filp);
- 
- 				/* Mapping support (drm_vm.h) */
-@@ -1274,6 +1304,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
- extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
- extern int drm_modeset_ctl(struct drm_device *dev, void *data,
- 			   struct drm_file *file_priv);
-+extern void drm_finish_pending_flip(struct drm_device *dev,
-+				   struct drm_pending_flip *f, u32 frame);
- 
- 				/* AGP/GART support (drm_agpsupport.h) */
- extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
-diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
-index 7300fb8..0b5dc47 100644
---- a/include/drm/drm_crtc.h
-+++ b/include/drm/drm_crtc.h
+ #endif
+diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.pf linux-2.6.30.noarch/include/drm/drm_crtc.h
+--- linux-2.6.30.noarch/include/drm/drm_crtc.h.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-08-25 09:52:41.000000000 +1000
 @@ -238,6 +238,12 @@ struct drm_display_info {
  };
  
@@ -791,7 +670,7 @@ index 7300fb8..0b5dc47 100644
  	/* if you are using the helper */
  	void *helper_private;
  };
-@@ -589,6 +613,7 @@ struct drm_mode_config {
+@@ -595,6 +619,7 @@ struct drm_mode_config {
  
  extern void drm_crtc_init(struct drm_device *dev,
  			  struct drm_crtc *crtc,
@@ -799,31 +678,61 @@ index 7300fb8..0b5dc47 100644
  			  const struct drm_crtc_funcs *funcs);
  extern void drm_crtc_cleanup(struct drm_crtc *crtc);
  
-@@ -736,4 +761,6 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+@@ -742,6 +767,8 @@ extern int drm_mode_gamma_get_ioctl(stru
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
 +extern int drm_mode_page_flip_ioctl(struct drm_device *dev, void *data,
 +				    struct drm_file *file_priv);
- #endif /* __DRM_CRTC_H__ */
-diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 6769ff6..dd10566 100644
---- a/include/drm/drm_crtc_helper.h
-+++ b/include/drm/drm_crtc_helper.h
-@@ -123,4 +123,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
- }
+ extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
+ 				int hdisplay, int vdisplay, int vrefresh,
+ 				bool reduced, bool interlaced);
+diff -up linux-2.6.30.noarch/include/drm/drm.h.pf linux-2.6.30.noarch/include/drm/drm.h
+--- linux-2.6.30.noarch/include/drm/drm.h.pf	2009-06-10 13:05:27.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm.h	2009-08-25 09:52:41.000000000 +1000
+@@ -686,6 +686,7 @@ struct drm_gem_open {
+ #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
++#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
  
- extern int drm_helper_resume_force_mode(struct drm_device *dev);
+ /**
+  * Device specific ioctls should only be in their respective headers
+@@ -698,6 +699,30 @@ struct drm_gem_open {
+ #define DRM_COMMAND_BASE                0x40
+ #define DRM_COMMAND_END			0xA0
+ 
++/**
++ * Header for events written back to userspace on the drm fd.  The
++ * type defines the type of event, the length specifies the total
++ * length of the event (including the header), and user_data is
++ * typically a 64 bit value passed with the ioctl that triggered the
++ * event.  A read on the drm fd will always only return complete
++ * events, that is, if for example the read buffer is 100 bytes, and
++ * there are two 64 byte events pending, only one will be returned.
++ */
++struct drm_event {
++	__u32 type;
++	__u32 length;
++};
 +
-+extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
-+				    struct drm_framebuffer *old_fb);
++#define DRM_EVENT_MODE_PAGE_FLIP 0x01
 +
- #endif
-diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
-index ae304cc..464b779 100644
---- a/include/drm/drm_mode.h
-+++ b/include/drm/drm_mode.h
-@@ -265,4 +265,20 @@ struct drm_mode_crtc_lut {
++struct drm_event_page_flip {
++	struct drm_event base;
++	__u64 user_data;
++	__u32 tv_sec;
++	__u32 tv_usec;
++	__u32 frame;
++};
++
+ /* typedef area */
+ #ifndef __KERNEL__
+ typedef struct drm_clip_rect drm_clip_rect_t;
+diff -up linux-2.6.30.noarch/include/drm/drm_mode.h.pf linux-2.6.30.noarch/include/drm/drm_mode.h
+--- linux-2.6.30.noarch/include/drm/drm_mode.h.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_mode.h	2009-08-25 09:52:41.000000000 +1000
+@@ -268,4 +268,20 @@ struct drm_mode_crtc_lut {
  	__u64 blue;
  };
  
@@ -844,27 +753,80 @@ index ae304cc..464b779 100644
 +};
 +
  #endif
-diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c
---- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~	2009-07-24 19:38:36.000000000 -0400
-+++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-07-26 18:06:06.000000000 -0400
-@@ -1014,7 +1014,7 @@ nv04_crtc_create(struct drm_device *dev,
- 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
- 	nv_crtc->mode_set.num_connectors = 0;
+diff -up linux-2.6.30.noarch/include/drm/drmP.h.pf linux-2.6.30.noarch/include/drm/drmP.h
+--- linux-2.6.30.noarch/include/drm/drmP.h.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:52:41.000000000 +1000
+@@ -426,6 +426,14 @@ struct drm_buf_entry {
+ 	struct drm_freelist freelist;
+ };
  
--	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
-+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
- 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
++/* Event queued up for userspace to read */
++struct drm_pending_event {
++	struct drm_event *event;
++	struct list_head link;
++	struct drm_file *file_priv;
++	void (*destroy) (struct drm_pending_event *event);
++};
++
+ /** File private data */
+ struct drm_file {
+ 	int authenticated;
+@@ -449,6 +457,9 @@ struct drm_file {
+ 	struct drm_master *master; /* master this node is currently associated with
+ 				      N.B. not always minor->master */
+ 	struct list_head fbs;
++
++	wait_queue_head_t event_wait;
++	struct list_head event_list;
+ };
  
-diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c
---- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~	2009-07-24 19:38:36.000000000 -0400
-+++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-07-26 18:06:23.000000000 -0400
-@@ -796,7 +796,7 @@ nv50_crtc_create(struct drm_device *dev,
- 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
- 	crtc->mode_set.num_connectors = 0;
+ /** Wait queue */
+@@ -897,6 +908,16 @@ struct drm_minor {
+ 	struct drm_mode_group mode_group;
+ };
  
--	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
-+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
- 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
++struct drm_pending_flip {
++	struct drm_pending_event pending_event;
++	struct drm_framebuffer *old_fb;
++	struct drm_crtc *crtc;
++	u32 frame;
++	int pipe;
++	struct list_head link;
++	struct drm_event_page_flip event;
++};
++
+ /**
+  * DRM device structure. This structure represent a complete card that
+  * may contain multiple heads.
+@@ -996,6 +1017,13 @@ struct drm_device {
+ 
+ 	u32 max_vblank_count;           /**< size of vblank counter register */
+ 
++	struct work_struct flip_work;
++
++	/**
++	 * List of objects waiting on flip completion
++	 */
++	struct list_head flip_list;
++
+ 	/*@} */
+ 	cycles_t ctx_start;
+ 	cycles_t lck_start;
+@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_devi
+ extern int drm_open(struct inode *inode, struct file *filp);
+ extern int drm_stub_open(struct inode *inode, struct file *filp);
+ extern int drm_fasync(int fd, struct file *filp, int on);
++extern ssize_t drm_read(struct file *filp, char __user *buffer,
++			size_t count, loff_t *offset);
+ extern int drm_release(struct inode *inode, struct file *filp);
  
+ 				/* Mapping support (drm_vm.h) */
+@@ -1300,6 +1330,8 @@ extern void drm_vblank_pre_modeset(struc
+ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+ extern int drm_modeset_ctl(struct drm_device *dev, void *data,
+ 			   struct drm_file *file_priv);
++extern void drm_finish_pending_flip(struct drm_device *dev,
++				   struct drm_pending_flip *f, u32 frame);
+ 
+ 				/* AGP/GART support (drm_agpsupport.h) */
+ extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);

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   |   23 +++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |    9 +++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    3 +++
 11 files changed, 120 insertions(+)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- drm-vga-arb.patch	5 Aug 2009 00:18:52 -0000	1.5
+++ drm-vga-arb.patch	25 Aug 2009 00:53:29 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:57:03.000000000 +1000
 @@ -38,6 +38,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
@@ -56,18 +56,18 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->driver->irq_uninstall(dev);
  
  	free_irq(dev->pdev->irq, dev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb	2009-08-05 07:03:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-05 10:15:15.000000000 +1000
-@@ -33,6 +33,7 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-25 09:57:03.000000000 +1000
+@@ -32,6 +32,7 @@
+ #include "intel_drv.h"
  #include "i915_drm.h"
  #include "i915_drv.h"
- 
 +#include <linux/vgaarb.h>
- #define I915_DRV	"i915_drv"
  
  /* Really want an OS-independent resettable timer.  Would like to have
-@@ -984,6 +985,19 @@ static int i915_probe_agp(struct drm_dev
+  * this loop run for (eg) 3 sec, but have the timer reset every time
+@@ -979,6 +980,19 @@ static int i915_probe_agp(struct drm_dev
  	return 0;
  }
  
@@ -87,7 +87,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1029,6 +1043,11 @@ static int i915_load_modeset_init(struct
+@@ -1024,6 +1038,11 @@ static int i915_load_modeset_init(struct
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -99,7 +99,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1278,6 +1297,7 @@ int i915_driver_unload(struct drm_device
+@@ -1284,6 +1303,7 @@ int i915_driver_unload(struct drm_device
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -107,10 +107,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	}
  
  	if (dev->pdev->msi_enabled)
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-05 10:15:15.000000000 +1000
-@@ -760,6 +760,7 @@ static inline void opregion_enable_asle(
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-25 09:57:03.000000000 +1000
+@@ -761,6 +761,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);
@@ -118,9 +118,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  /**
   * Lock test for when it's just for synchronization of ring access.
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-25 09:57:03.000000000 +1000
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -129,9 +129,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #define INTEL_GMCH_ENABLED	0x4
  #define INTEL_GMCH_MEM_MASK	0x1
  #define INTEL_GMCH_MEM_64M	0x1
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:57:03.000000000 +1000
 @@ -3871,3 +3871,26 @@ struct drm_encoder *intel_best_encoder(s
  
  	return &intel_output->enc;
@@ -159,19 +159,19 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	pci_write_config_word(bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
 +	return 0;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-25 09:57:03.000000000 +1000
 @@ -161,4 +161,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 -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb	2009-08-05 10:14:23.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-05 10:15:15.000000000 +1000
-@@ -1497,6 +1497,20 @@ void r100_vram_init_sizes(struct radeon_
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-25 09:57:03.000000000 +1000
+@@ -1574,6 +1574,20 @@ void r100_vram_init_sizes(struct radeon_
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -192,9 +192,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-25 09:57:03.000000000 +1000
 @@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_devi
  void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
  void r100_errata(struct radeon_device *rdev);
@@ -203,7 +203,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -84,6 +85,7 @@ static struct radeon_asic r100_asic = {
+@@ -85,6 +86,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -211,7 +211,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -147,6 +149,7 @@ static struct radeon_asic r300_asic = {
+@@ -149,6 +151,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -219,7 +219,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -190,6 +193,7 @@ static struct radeon_asic r420_asic = {
+@@ -193,6 +196,7 @@ static struct radeon_asic r420_asic = {
  	.init = &r300_init,
  	.errata = &r420_errata,
  	.vram_info = &r420_vram_info,
@@ -227,7 +227,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r420_mc_init,
  	.mc_fini = &r420_mc_fini,
-@@ -240,6 +244,7 @@ static struct radeon_asic rs400_asic = {
+@@ -244,6 +248,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -235,7 +235,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -292,6 +297,7 @@ static struct radeon_asic rs600_asic = {
+@@ -299,6 +304,7 @@ static struct radeon_asic rs600_asic = {
  	.init = &r300_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
@@ -243,15 +243,15 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -337,6 +343,7 @@ static struct radeon_asic rs690_asic = {
- 	.init = &r300_init,
+@@ -346,6 +352,7 @@ static struct radeon_asic rs690_asic = {
+ 	.init = &rs690_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -389,6 +396,7 @@ static struct radeon_asic rv515_asic = {
+@@ -399,6 +406,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -259,7 +259,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -432,6 +440,7 @@ static struct radeon_asic r520_asic = {
+@@ -445,6 +453,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -267,9 +267,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-05 10:15:29.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-25 09:57:03.000000000 +1000
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -278,7 +278,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -475,7 +476,18 @@ void radeon_combios_fini(struct radeon_d
+@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_d
  int radeon_modeset_init(struct radeon_device *rdev);
  void radeon_modeset_fini(struct radeon_device *rdev);
  
@@ -297,7 +297,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /*
   * Radeon device.
   */
-@@ -566,6 +578,12 @@ int radeon_device_init(struct radeon_dev
+@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_dev
  		/* Initialize surface registers */
  		radeon_surface_init(rdev);
  
@@ -310,7 +310,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		/* TODO: disable VGA need to use VGA request */
  		/* BIOS*/
  		if (!radeon_get_bios(rdev)) {
-@@ -700,6 +718,7 @@ void radeon_device_fini(struct radeon_de
+@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_de
  		radeon_agp_fini(rdev);
  #endif
  		radeon_irq_kms_fini(rdev);
@@ -318,10 +318,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		radeon_fence_driver_fini(rdev);
  		radeon_clocks_fini(rdev);
  		radeon_object_fini(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-05 10:15:15.000000000 +1000
-@@ -579,6 +579,7 @@ struct radeon_asic {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-25 09:57:03.000000000 +1000
+@@ -580,6 +580,7 @@ struct radeon_asic {
  	int (*suspend)(struct radeon_device *rdev);
  	void (*errata)(struct radeon_device *rdev);
  	void (*vram_info)(struct radeon_device *rdev);
@@ -329,7 +329,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	int (*gpu_reset)(struct radeon_device *rdev);
  	int (*mc_init)(struct radeon_device *rdev);
  	void (*mc_fini)(struct radeon_device *rdev);
-@@ -879,6 +880,7 @@ static inline void radeon_ring_write(str
+@@ -917,6 +918,7 @@ static inline void radeon_ring_write(str
  #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))
@@ -337,10 +337,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #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 -up linux-2.6.30.noarch/include/drm/drmP.h.arb linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-05 10:15:15.000000000 +1000
-@@ -797,6 +797,9 @@ struct drm_driver {
+diff -up linux-2.6.30.noarch/include/drm/drmP.h.da linux-2.6.30.noarch/include/drm/drmP.h
+--- linux-2.6.30.noarch/include/drm/drmP.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:57:03.000000000 +1000
+@@ -821,6 +821,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1734
retrieving revision 1.1735
diff -u -p -r1.1734 -r1.1735
--- kernel.spec	25 Aug 2009 00:43:51 -0000	1.1734
+++ kernel.spec	25 Aug 2009 00:53:29 -0000	1.1735
@@ -680,6 +680,7 @@ Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 
 # nouveau + drm fixes
+Patch1812: drm-next.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1303,6 +1304,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
 
 ApplyPatch drm-nouveau.patch
@@ -1997,6 +1999,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 25 2009 Dave Airlie <airlied at redhat.com>
+- pull in drm-next tree + rebase around it
+
 * Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git2
 



From mclasen at fedoraproject.org  Tue Aug 25 00:34:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 00:34:41 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.98, 1.99 nautilus.spec, 1.280,
	1.281 sources, 1.103, 1.104
Message-ID: <20090825003441.8BCAC11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8432

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	14 Jul 2009 04:06:30 -0000	1.98
+++ .cvsignore	25 Aug 2009 00:34:41 -0000	1.99
@@ -1 +1 @@
-nautilus-2.27.4.tar.bz2
+nautilus-2.27.91.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- nautilus.spec	13 Aug 2009 01:29:25 -0000	1.280
+++ nautilus.spec	25 Aug 2009 00:34:41 -0000	1.281
@@ -14,8 +14,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.27.4
-Release:	5%{?dist}
+Version: 	2.27.91
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -85,11 +85,6 @@ Patch10:        nautilus-gvfs-desktop-ke
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=590647
-Patch18:	nautilus_always_open_appicon.patch
-Patch19:	nautilus_menu_icons_only2.patch
-Patch20:	nautilus-menu-icons3.patch
-
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -126,9 +121,6 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .always-open-appicon
-%patch19 -p1 -b .go-icons
-%patch20 -p1 -b .spatial-icons
 
 %build
 
@@ -268,6 +260,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Wed Aug 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-5
 - Turn off autorun for x-content/software
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sources	14 Jul 2009 04:06:30 -0000	1.103
+++ sources	25 Aug 2009 00:34:41 -0000	1.104
@@ -1 +1 @@
-17fefc8d3f65cd5349213cd70c25c44f  nautilus-2.27.4.tar.bz2
+a7f654d0553307e80985aceb08946224  nautilus-2.27.91.tar.bz2



From lennart at fedoraproject.org  Tue Aug 25 00:30:12 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 25 Aug 2009 00:30:12 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec, 1.15, 1.16 sources, 1.6,
	1.7 paprefs-0.9.7-modulepath.patch, 1.1, NONE
Message-ID: <20090825003012.DCB3711C0426@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7594

Modified Files:
	paprefs.spec sources 
Removed Files:
	paprefs-0.9.7-modulepath.patch 
Log Message:
new snapshot


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- paprefs.spec	25 Jul 2009 23:13:54 -0000	1.15
+++ paprefs.spec	25 Aug 2009 00:30:12 -0000	1.16
@@ -1,31 +1,32 @@
 Name:           paprefs
-Version:        0.9.8
-Release:        2%{?dist}
+Version:        0.9.9
+Release:        0.git20090825%{?dist}
 Summary:        Management tool for PulseAudio
-
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/paprefs
-Source0:        http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.tar.gz
+Source0:        http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.git20090825.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       pulseaudio-module-gconf
-
-BuildRequires:  gconfmm26-devel libglademm24-devel lynx desktop-file-utils pulseaudio-libs-devel
-BuildRequires: intltool
+Requires:	gnome-packagekit
+BuildRequires:  gconfmm26-devel
+BuildRequires:  libglademm24-devel 
+BuildRequires:  lynx
+BuildRequires:  desktop-file-utils
+BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  intltool
 
 %description
 PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog
 for the PulseAudio sound server.
 
 %prep
-%setup -q
-
+%setup -q -n paprefs-0.9.9
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -41,7 +42,6 @@ desktop-file-install \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc LICENSE doc/README
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Tue Aug 25 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-0.git20090825
+- Snapshot
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Apr 2009 17:01:15 -0000	1.6
+++ sources	25 Aug 2009 00:30:12 -0000	1.7
@@ -1 +1 @@
-1c54aa1ef52e65097996f5930a816230  paprefs-0.9.8.tar.gz
+9b713eebbb930c2d959ea4114c334390  paprefs-0.9.9.git20090825.tar.gz


--- paprefs-0.9.7-modulepath.patch DELETED ---



From cebbert at fedoraproject.org  Tue Aug 25 00:57:46 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 25 Aug 2009 00:57:46 +0000 (UTC)
Subject: rpms/kernel/devel xen-fb-probe-fix.patch, NONE,
	1.1 xen-x86-fix-stackprotect.patch, NONE,
	1.1 xen-x86-no-stackprotect.patch, NONE, 1.1 kernel.spec, 1.1735,
	1.1736
Message-ID: <20090825005746.8538511C0044@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13899

Modified Files:
	kernel.spec 
Added Files:
	xen-fb-probe-fix.patch xen-x86-fix-stackprotect.patch 
	xen-x86-no-stackprotect.patch 
Log Message:
Fix Xen boot (#508120)

xen-fb-probe-fix.patch:
 xen-fbfront.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xen-fb-probe-fix.patch ---
As soon as the framebuffer is registered, our methods may be called by the
kernel. This leads to a crash as xenfb_refresh() gets called before we have
the irq.

Connect to the backend before registering our framebuffer with the kernel.

Signed-off-by: Michal Schmidt <mschmidt at redhat.com>

--
Index: linux-git/drivers/video/xen-fbfront.c
===================================================================
--- linux-git.orig/drivers/video/xen-fbfront.c
+++ linux-git/drivers/video/xen-fbfront.c
@@ -454,6 +454,10 @@ static int __devinit xenfb_probe(struct 
 
 	xenfb_init_shared_page(info, fb_info);
 
+	ret = xenfb_connect_backend(dev, info);
+	if (ret < 0)
+		goto error;
+
 	ret = register_framebuffer(fb_info);
 	if (ret) {
 		fb_deferred_io_cleanup(fb_info);
@@ -464,10 +468,6 @@ static int __devinit xenfb_probe(struct 
 	}
 	info->fb_info = fb_info;
 
-	ret = xenfb_connect_backend(dev, info);
-	if (ret < 0)
-		goto error;
-
 	xenfb_make_preferred_console();
 	return 0;
 


xen-x86-fix-stackprotect.patch:
 Makefile    |    4 ++++
 enlighten.c |   22 ++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE xen-x86-fix-stackprotect.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 17 Aug 2009 19:26:53 +0000 (-0700)
Subject: xen: rearrange things to fix stackprotector
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Flinux-2.6-tip.git;a=commitdiff_plain;h=ce2eef33d3

xen: rearrange things to fix stackprotector

Make sure the stack-protector segment registers are properly set up
before calling any functions which may have stack-protection compiled
into them.

[ Impact: prevent Xen early-boot crash when stack-protector is enabled ]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 3b767d0..a5b9288 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -5,6 +5,10 @@ CFLAGS_REMOVE_time.o = -pg
 CFLAGS_REMOVE_irq.o = -pg
 endif
 
+# Make sure early boot has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_enlighten.o		:= $(nostackp)
+
 obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 			time.o xen-asm.o xen-asm_$(BITS).o \
 			grant-table.o suspend.o
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f09e8c3..edcf72a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -925,10 +925,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	xen_domain_type = XEN_PV_DOMAIN;
 
-	BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
-
-	xen_setup_features();
-
 	/* Install Xen paravirt ops */
 	pv_info = xen_info;
 	pv_init_ops = xen_init_ops;
@@ -937,8 +933,15 @@ asmlinkage void __init xen_start_kernel(void)
 	pv_apic_ops = xen_apic_ops;
 	pv_mmu_ops = xen_mmu_ops;
 
-	xen_init_irq_ops();
+#ifdef CONFIG_X86_64
+	/*
+	 * Setup percpu state.  We only need to do this for 64-bit
+	 * because 32-bit already has %fs set properly.
+	 */
+	load_percpu_segment(0);
+#endif
 
+	xen_init_irq_ops();
 	xen_init_cpuid_mask();
 
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -948,6 +951,8 @@ asmlinkage void __init xen_start_kernel(void)
 	set_xen_basic_apic_ops();
 #endif
 
+	xen_setup_features();
+
 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
@@ -955,13 +960,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	machine_ops = xen_machine_ops;
 
-#ifdef CONFIG_X86_64
-	/*
-	 * Setup percpu state.  We only need to do this for 64-bit
-	 * because 32-bit already has %fs set properly.
-	 */
-	load_percpu_segment(0);
-#endif
 	/*
 	 * The only reliable way to retain the initial address of the
 	 * percpu gdt_page is to remember it here, so we can go and

xen-x86-no-stackprotect.patch:
 Makefile |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE xen-x86-no-stackprotect.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 17 Aug 2009 19:25:41 +0000 (-0700)
Subject: x86: make sure load_percpu_segment has no stackprotector
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Flinux-2.6-tip.git;a=commitdiff_plain;h=5416c26635

x86: make sure load_percpu_segment has no stackprotector

load_percpu_segment() is used to set up the per-cpu segment registers,
which are also used for -fstack-protector.  Make sure that the
load_percpu_segment() function doesn't have stackprotector enabled.

[ Impact: allow percpu setup before calling stack-protected functions ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 4e242f9..8b5b9b6 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_common.o = -pg
 endif
 
+# Make sure load_percpu_segment has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_common.o		:= $(nostackp)
+
 obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
 obj-y			+= proc.o capflags.o powerflags.o common.o
 obj-y			+= vmware.o hypervisor.o


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -p -r1.1735 -r1.1736
--- kernel.spec	25 Aug 2009 00:53:29 -0000	1.1735
+++ kernel.spec	25 Aug 2009 00:57:46 -0000	1.1736
@@ -723,6 +723,11 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
+# fix xen boot
+Patch12020: xen-fb-probe-fix.patch
+Patch12021: xen-x86-fix-stackprotect.patch
+Patch12022: xen-x86-no-stackprotect.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1333,6 +1338,13 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+# Patches headed upstream
+
+# fix xen boot
+ApplyPatch xen-fb-probe-fix.patch
+ApplyPatch xen-x86-fix-stackprotect.patch
+ApplyPatch xen-x86-no-stackprotect.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1999,6 +2011,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.173.rc7.git2
+- Fix Xen boot (#508120)
+
 * Tue Aug 25 2009 Dave Airlie <airlied at redhat.com>
 - pull in drm-next tree + rebase around it
 



From mclasen at fedoraproject.org  Tue Aug 25 01:10:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:10:27 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.22, 1.23 gucharmap.spec, 1.40,
	1.41 sources, 1.22, 1.23
Message-ID: <20090825011027.3372211C0426@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16070

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.27.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	13 Jul 2009 02:32:36 -0000	1.22
+++ .cvsignore	25 Aug 2009 01:10:26 -0000	1.23
@@ -1 +1 @@
-gucharmap-2.26.3.1.tar.bz2
+gucharmap-2.27.0-git.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gucharmap.spec	25 Jul 2009 01:50:56 -0000	1.40
+++ gucharmap.spec	25 Aug 2009 01:10:26 -0000	1.41
@@ -3,18 +3,15 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.26.3.1
-Release:        3%{?dist}
+Version:        2.27.0
+Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
 Group:          Applications/System
 License:        GPLv2+ and GFDL and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.26/gucharmap-%{version}.tar.bz2
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=588734
-Patch0: button-images.patch
+Source:         http://download.gnome.org/sources/gucharmap/2.26/gucharmap-%{version}-git.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -50,8 +47,7 @@ The gucharmap-devel package contains hea
 needed to use the libgucharmap library.
 
 %prep
-%setup -q
-%patch0 -p1 -b .button-images
+%setup -q -n %{name}-%{version}-git
 
 %build
 %configure --disable-gtk-immodules --disable-scrollkeeper


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	13 Jul 2009 02:32:36 -0000	1.22
+++ sources	25 Aug 2009 01:10:26 -0000	1.23
@@ -1 +1 @@
-3d13ad452860b1facc9765713bc96d33  gucharmap-2.26.3.1.tar.bz2
+a99f6fa40fae8ce110fd7dae9673d664  gucharmap-2.27.0-git.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 01:11:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:11:49 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.281,1.282
Message-ID: <20090825011149.856D611C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16445

Modified Files:
	nautilus.spec 
Log Message:
Fix file lists



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- nautilus.spec	25 Aug 2009 00:34:41 -0000	1.281
+++ nautilus.spec	25 Aug 2009 01:11:49 -0000	1.282
@@ -243,6 +243,7 @@ fi
 %{_mandir}/man1/nautilus-connect-server.1.gz
 %{_mandir}/man1/nautilus-file-management-properties.1.gz
 %{_mandir}/man1/nautilus.1.gz
+%{_libexecdir}/nautilus-convert-metadata
 
 
 %files extensions



From mclasen at fedoraproject.org  Tue Aug 25 01:15:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:15:17 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.29, 1.30 gtksourceview2.spec,
	1.36, 1.37 sources, 1.29, 1.30
Message-ID: <20090825011517.9012511C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17135

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	28 Jul 2009 04:39:38 -0000	1.29
+++ .cvsignore	25 Aug 2009 01:15:17 -0000	1.30
@@ -1 +1 @@
-gtksourceview-2.7.3.tar.bz2
+gtksourceview-2.7.4.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gtksourceview2.spec	28 Jul 2009 04:39:38 -0000	1.36
+++ gtksourceview2.spec	25 Aug 2009 01:15:17 -0000	1.37
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.7.3
+Version: 2.7.4
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.4-1
+- Update to 2.7.4
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.7.3-1
 - Update to 2.7.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	28 Jul 2009 04:39:38 -0000	1.29
+++ sources	25 Aug 2009 01:15:17 -0000	1.30
@@ -1 +1 @@
-ea30aecfbd55ebf40c6cf5a0f254f9ba  gtksourceview-2.7.3.tar.bz2
+d57e4839a37899810d84f628482e2baf  gtksourceview-2.7.4.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 01:19:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:19:36 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.60, 1.61 at-spi.spec, 1.117,
	1.118 sources, 1.60, 1.61
Message-ID: <20090825011936.0F7DF11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17893

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	16 Mar 2009 18:06:57 -0000	1.60
+++ .cvsignore	25 Aug 2009 01:19:35 -0000	1.61
@@ -1 +1 @@
-at-spi-1.26.0.tar.bz2
+at-spi-1.27.91.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- at-spi.spec	24 Jul 2009 17:27:41 -0000	1.117
+++ at-spi.spec	25 Aug 2009 01:19:35 -0000	1.118
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
-Version: 1.26.0
-Release: 3%{?dist}
+Version: 1.27.91
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.26/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.27/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1.27.91-1
+- YUpdate to 2.27.91
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	16 Mar 2009 18:06:57 -0000	1.60
+++ sources	25 Aug 2009 01:19:35 -0000	1.61
@@ -1 +1 @@
-3f2f7d29b45eff08adf56af0d31d3984  at-spi-1.26.0.tar.bz2
+2d872beac64c9311851f1120ce0ae50d  at-spi-1.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 01:27:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:27:55 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.118,1.119
Message-ID: <20090825012755.CB7B411C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20168

Modified Files:
	at-spi.spec 
Log Message:
fix file lists



Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- at-spi.spec	25 Aug 2009 01:19:35 -0000	1.118
+++ at-spi.spec	25 Aug 2009 01:27:55 -0000	1.119
@@ -136,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gtk-2.0/modules/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/at-spi.schemas
+%{_sysconfdir}/xdg/autostart/at-spi-registryd.desktop
 
 %files devel
 %defattr(-,root,root)



From mclasen at fedoraproject.org  Tue Aug 25 01:35:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:35:40 +0000 (UTC)
Subject: rpms/gconf-editor/devel .cvsignore, 1.32, 1.33 gconf-editor.spec,
	1.71, 1.72 sources, 1.32, 1.33
Message-ID: <20090825013540.2E49211C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gconf-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21715

Modified Files:
	.cvsignore gconf-editor.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	17 Mar 2009 17:17:06 -0000	1.32
+++ .cvsignore	25 Aug 2009 01:35:39 -0000	1.33
@@ -1 +1 @@
-gconf-editor-2.26.0.tar.bz2
+gconf-editor-2.27.91.tar.bz2


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- gconf-editor.spec	30 Jul 2009 00:47:44 -0000	1.71
+++ gconf-editor.spec	25 Aug 2009 01:35:39 -0000	1.72
@@ -7,18 +7,14 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.26.0
-Release: 4%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gconf-editor/2.26/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gconf-editor/2.27/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.redhat.com/show_bug.cgi?id=505645
-# http://bugzilla.gnome.org/show_bug.cgi?id=585596
-Patch0: polkit1.patch
-
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
@@ -44,9 +40,6 @@ sources.
 
 %prep
 %setup -q
-%patch0 -p1 -b .polkit1
-
-autoreconf -f -i
 
 %build
 %configure --disable-scrollkeeper
@@ -112,6 +105,9 @@ fi
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	17 Mar 2009 17:17:06 -0000	1.32
+++ sources	25 Aug 2009 01:35:39 -0000	1.33
@@ -1 +1 @@
-2dc76415b22d805cfacfcd5fb98f185c  gconf-editor-2.26.0.tar.bz2
+a5d6b03d819b1f16d6d4a4419719a6eb  gconf-editor-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 01:27:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:27:49 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.26, 1.27 mousetweaks.spec, 1.33,
	1.34 sources, 1.26, 1.27
Message-ID: <20090825012749.B12C011C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19831

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	11 Aug 2009 04:28:44 -0000	1.26
+++ .cvsignore	25 Aug 2009 01:27:49 -0000	1.27
@@ -1 +1 @@
-mousetweaks-2.27.90.tar.bz2
+mousetweaks-2.27.91.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mousetweaks.spec	11 Aug 2009 04:28:44 -0000	1.33
+++ mousetweaks.spec	25 Aug 2009 01:27:49 -0000	1.34
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.27.90
+Version:	2.27.91
 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 Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	11 Aug 2009 04:28:44 -0000	1.26
+++ sources	25 Aug 2009 01:27:49 -0000	1.27
@@ -1 +1 @@
-7efc79e4f3cba91ceda99b33bca6b11d  mousetweaks-2.27.90.tar.bz2
+1bfd44b288c960eb3ae10c146c8e474f  mousetweaks-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 01:55:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 01:55:39 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.31,
	1.32 gnome-settings-daemon.spec, 1.116, 1.117 sources, 1.32, 1.33
Message-ID: <20090825015539.15D2E11C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	14 Aug 2009 10:13:47 -0000	1.31
+++ .cvsignore	25 Aug 2009 01:55:38 -0000	1.32
@@ -1 +1 @@
-gnome-settings-daemon-2.27.90.tar.bz2
+gnome-settings-daemon-2.27.91.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- gnome-settings-daemon.spec	14 Aug 2009 17:17:59 -0000	1.116
+++ gnome-settings-daemon.spec	25 Aug 2009 01:55:38 -0000	1.117
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.27.90
-Release:	2%{?dist}
+Version:	2.27.91
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -32,7 +32,6 @@ BuildRequires:	gettext
 BuildRequires:  autoconf, automake, libtool, intltool
 BuildRequires:  fontconfig-devel
 
-Patch0:		0001-Update-gnome-volume-control-code.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=524499
@@ -56,7 +55,6 @@ developing applications that use %{name}
 %prep
 %setup -q
 
-%patch0 -p1 -b .gvc-update
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .locate-pointer
 
@@ -172,6 +170,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Aug 24 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 2.27.90-2
 - Update gnome-volume-control code
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	14 Aug 2009 10:13:47 -0000	1.32
+++ sources	25 Aug 2009 01:55:38 -0000	1.33
@@ -1 +1 @@
-806a8c063c81a63b650ec2ae9d645c90  gnome-settings-daemon-2.27.90.tar.bz2
+cb5ce91b824bb46031531195f9dbe4c4  gnome-settings-daemon-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:00:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:00:48 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.90, 1.91 file-roller.spec,
	1.153, 1.154 sources, 1.90, 1.91
Message-ID: <20090825020048.1B24611C0373@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26470

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	11 Aug 2009 04:58:02 -0000	1.90
+++ .cvsignore	25 Aug 2009 02:00:47 -0000	1.91
@@ -1 +1 @@
-file-roller-2.27.90.tar.bz2
+file-roller-2.27.91.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- file-roller.spec	15 Aug 2009 02:45:03 -0000	1.153
+++ file-roller.spec	25 Aug 2009 02:00:47 -0000	1.154
@@ -10,14 +10,12 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.27.90
-Release: 	2%{?dist}
+Version:	2.27.91
+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.27/file-roller-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=591868
-Patch0:		cab.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -53,9 +51,6 @@ such as tar or zip files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .cab
-
-autoreconf -f -i
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -132,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
 - Make opening .cab files work
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	11 Aug 2009 04:58:02 -0000	1.90
+++ sources	25 Aug 2009 02:00:47 -0000	1.91
@@ -1 +1 @@
-db1518ae05a998de0dc4be8819fe1a71  file-roller-2.27.90.tar.bz2
+6bded6c57b3489c926d089fea388f788  file-roller-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:03:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:03:06 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.56, 1.57 orca.spec, 1.95, 1.96 sources,
	1.57, 1.58
Message-ID: <20090825020306.4AE3211C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27079

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	10 Aug 2009 21:37:30 -0000	1.56
+++ .cvsignore	25 Aug 2009 02:03:05 -0000	1.57
@@ -1 +1 @@
-orca-2.27.90.tar.bz2
+orca-2.27.91.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- orca.spec	11 Aug 2009 04:01:53 -0000	1.95
+++ orca.spec	25 Aug 2009 02:03:06 -0000	1.96
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.27.90
+Version:	2.27.91
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	10 Aug 2009 21:37:30 -0000	1.57
+++ sources	25 Aug 2009 02:03:06 -0000	1.58
@@ -1 +1 @@
-87e039760fbd5df9fccab4bc21328f6a  orca-2.27.90.tar.bz2
+c799b7963cd2809de159a34590159d54  orca-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:05:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:05:50 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore, 1.43, 1.44 gok.spec, 1.85, 1.86 sources, 
	1.43, 1.44
Message-ID: <20090825020550.DDCD311C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27579

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	11 Aug 2009 04:37:41 -0000	1.43
+++ .cvsignore	25 Aug 2009 02:05:50 -0000	1.44
@@ -1 +1 @@
-gok-2.27.90.tar.bz2
+gok-2.27.91.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- gok.spec	11 Aug 2009 04:37:41 -0000	1.85
+++ gok.spec	25 Aug 2009 02:05:50 -0000	1.86
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.27.90
+Version: 2.27.91
 Release: 1%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
@@ -150,6 +150,9 @@ scrollkeeper-update -q
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	11 Aug 2009 04:37:41 -0000	1.43
+++ sources	25 Aug 2009 02:05:50 -0000	1.44
@@ -1 +1 @@
-827dcdc41807a51e6cd106189fa4b26a  gok-2.27.90.tar.bz2
+1dc6b51b5f17573bbcffd43b2b06e1d3  gok-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:09:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:09:25 +0000 (UTC)
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.28,
	1.29 gnome-user-docs.spec, 1.42, 1.43 sources, 1.28, 1.29
Message-ID: <20090825020925.4E72311C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28221

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.27.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	14 Apr 2009 20:27:10 -0000	1.28
+++ .cvsignore	25 Aug 2009 02:09:25 -0000	1.29
@@ -1 +1 @@
-gnome-user-docs-2.26.1.tar.bz2
+gnome-user-docs-2.27.1.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gnome-user-docs.spec	25 Jul 2009 00:49:41 -0000	1.42
+++ gnome-user-docs.spec	25 Aug 2009 02:09:25 -0000	1.43
@@ -1,9 +1,9 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.26.1
-Release:	2%{?dist}
+Version:        2.27.1
+Release:	1%{?dist}
 License:        GFDL
-Source:         http://download.gnome.org/sources/gnome-user-docs/2.26/gnome-user-docs-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-user-docs/2.27/gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ exit 0
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.1-1
+- Update to 2.27.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	14 Apr 2009 20:27:11 -0000	1.28
+++ sources	25 Aug 2009 02:09:25 -0000	1.29
@@ -1 +1 @@
-519ad5fa8e7a2ce31dd42fc2c67d824a  gnome-user-docs-2.26.1.tar.bz2
+e98cc366e36568c39da66d2e4523fd2e  gnome-user-docs-2.27.1.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:13:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:13:09 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.40,
	1.41 gnome-doc-utils.spec, 1.73, 1.74 sources, 1.40, 1.41
Message-ID: <20090825021309.9A87111C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28800

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.17.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	28 Jul 2009 05:07:52 -0000	1.40
+++ .cvsignore	25 Aug 2009 02:13:09 -0000	1.41
@@ -1 +1 @@
-gnome-doc-utils-0.17.3.tar.bz2
+gnome-doc-utils-0.17.4.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gnome-doc-utils.spec	28 Jul 2009 05:07:52 -0000	1.73
+++ gnome-doc-utils.spec	25 Aug 2009 02:13:09 -0000	1.74
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.17.3
+Version: 0.17.4
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xml/mallard
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.17.4-1
+- Update to 0.17.4
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 0.17.3-1
 - Update to 0.17.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	28 Jul 2009 05:07:52 -0000	1.40
+++ sources	25 Aug 2009 02:13:09 -0000	1.41
@@ -1 +1 @@
-eac1ee2a039a2e66c4de32bc656f7be6  gnome-doc-utils-0.17.3.tar.bz2
+708ec43e56a1e07f70bb435d2142dcd2  gnome-doc-utils-0.17.4.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:14:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:14:53 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.81, 1.82 gnome-themes.spec,
	1.145, 1.146 sources, 1.86, 1.87
Message-ID: <20090825021453.99F7F11C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29260

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	11 Aug 2009 04:22:35 -0000	1.81
+++ .cvsignore	25 Aug 2009 02:14:53 -0000	1.82
@@ -1 +1 @@
-gnome-themes-2.27.90.tar.bz2
+gnome-themes-2.27.91.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- gnome-themes.spec	11 Aug 2009 04:22:35 -0000	1.145
+++ gnome-themes.spec	25 Aug 2009 02:14:53 -0000	1.146
@@ -1,6 +1,6 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.27.90
+Version: 2.27.91
 Release:1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.27/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	11 Aug 2009 04:22:35 -0000	1.86
+++ sources	25 Aug 2009 02:14:53 -0000	1.87
@@ -1 +1 @@
-08d107578b73f037c7abee2b0069df39  gnome-themes-2.27.90.tar.bz2
+07c20c0db310dc0eec00606319d034a4  gnome-themes-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:23:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:23:33 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.94, 1.95 gedit.spec, 1.202,
	1.203 sources, 1.96, 1.97
Message-ID: <20090825022333.ADB7511C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30468

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.27.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- .cvsignore	11 Aug 2009 04:31:24 -0000	1.94
+++ .cvsignore	25 Aug 2009 02:23:33 -0000	1.95
@@ -1 +1 @@
-gedit-2.27.4.tar.bz2
+gedit-2.27.5.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- gedit.spec	23 Aug 2009 01:33:51 -0000	1.202
+++ gedit.spec	25 Aug 2009 02:23:33 -0000	1.203
@@ -17,8 +17,8 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.27.4
-Release: 	2%{?dist}
+Version: 	2.27.5
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -48,9 +48,6 @@ Patch2: gedit-2.25.5-fix-python-path.pat
 # http://bugzilla.gnome.org/show_bug.cgi?id=587053
 Patch3: print-to-file.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592766
-Patch4: button-images.patch
-
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -117,10 +114,10 @@ Install gedit-devel if you want to write
 
 %patch2 -p1 -b .fix-python-path
 %patch3 -p1 -b .print-to-file
-%patch4 -p1 -b .button-images
 
-%build
 autoreconf -f -i
+
+%build
 %configure \
 	--disable-scrollkeeper \
 	--disable-gtk-doc \
@@ -233,6 +230,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.5-1
+- Update to 2.27.5
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.4-2
 - Respect button-images setting
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	11 Aug 2009 04:31:24 -0000	1.96
+++ sources	25 Aug 2009 02:23:33 -0000	1.97
@@ -1 +1 @@
-4797c4f48806f91b4770a5278ffa3d1e  gedit-2.27.4.tar.bz2
+f567d96a10490c9bade811b94e855e67  gedit-2.27.5.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:28:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:28:19 +0000 (UTC)
Subject: rpms/gnome-devel-docs/devel .cvsignore, 1.9,
	1.10 gnome-devel-docs.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20090825022819.3642111C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-devel-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32062

Modified Files:
	.cvsignore gnome-devel-docs.spec sources 
Log Message:
2.27.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Apr 2009 20:19:41 -0000	1.9
+++ .cvsignore	25 Aug 2009 02:28:18 -0000	1.10
@@ -1 +1 @@
-gnome-devel-docs-2.26.1.tar.bz2
+gnome-devel-docs-2.27.1.tar.bz2


Index: gnome-devel-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gnome-devel-docs.spec	25 Jul 2009 00:36:57 -0000	1.13
+++ gnome-devel-docs.spec	25 Aug 2009 02:28:18 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: GNOME developer documentation
 Name: gnome-devel-docs
-Version: 2.26.1
-Release: 2%{?dist}
+Version: 2.27.1
+Release: 1%{?dist}
 License: GFDL
 Group: System Environment/Libraries
 URL: http://library.gnome.org
-Source: http://download.gnome.org/sources/gnome-devel-docs/2.26/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-devel-docs/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gnome-doc-utils
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/platform-overview
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.1-1
+- Update to 2.27.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-devel-docs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Apr 2009 20:19:41 -0000	1.9
+++ sources	25 Aug 2009 02:28:18 -0000	1.10
@@ -1 +1 @@
-bd0ecf6d74888cd15a908b99da9877b3  gnome-devel-docs-2.26.1.tar.bz2
+85ad7f99be674be6cdb665e9ad482afd  gnome-devel-docs-2.27.1.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:36:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:36:46 +0000 (UTC)
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.199,1.200
Message-ID: <20090825023646.31E3711C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1144

Modified Files:
	gnome-utils.spec 
Log Message:
fix BRs



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- gnome-utils.spec	25 Aug 2009 02:26:05 -0000	1.199
+++ gnome-utils.spec	25 Aug 2009 02:36:46 -0000	1.200
@@ -27,6 +27,7 @@ BuildRequires: 	glib2-devel >= %{glib2_v
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
+BuildRequires:  libcanberra-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libX11-devel
 BuildRequires:	libgtop2-devel



From mclasen at fedoraproject.org  Tue Aug 25 02:43:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:43:17 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.87, 1.88 eog.spec, 1.150, 1.151 sources,
	1.87, 1.88
Message-ID: <20090825024317.7BBD111C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2601

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	14 Aug 2009 22:47:05 -0000	1.87
+++ .cvsignore	25 Aug 2009 02:43:17 -0000	1.88
@@ -1 +1 @@
-eog-2.27.90.tar.bz2
+eog-2.27.91.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- eog.spec	14 Aug 2009 22:47:05 -0000	1.150
+++ eog.spec	25 Aug 2009 02:43:17 -0000	1.151
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.27.90
+Version: 2.27.91
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.27/%{name}-%{version}.tar.bz2
@@ -170,6 +170,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
 - 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	14 Aug 2009 22:47:05 -0000	1.87
+++ sources	25 Aug 2009 02:43:17 -0000	1.88
@@ -1 +1 @@
-3f44ee2f23c612a242f060b1e85a976b  eog-2.27.90.tar.bz2
+b23c7b143ab2599834a184886ba24483  eog-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:44:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:44:12 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.48, 1.49 sources, 1.48,
	1.49 tomboy.spec, 1.122, 1.123
Message-ID: <20090825024412.A38B111C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2694

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.15.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	11 Aug 2009 05:00:19 -0000	1.48
+++ .cvsignore	25 Aug 2009 02:44:12 -0000	1.49
@@ -1 +1 @@
-tomboy-0.15.5.tar.bz2
+tomboy-0.15.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	11 Aug 2009 05:00:19 -0000	1.48
+++ sources	25 Aug 2009 02:44:12 -0000	1.49
@@ -1 +1 @@
-832178964083828fd7af045d09b4355c  tomboy-0.15.5.tar.bz2
+966ee38e413a5ca0a8c27218d3b05763  tomboy-0.15.6.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- tomboy.spec	20 Aug 2009 22:44:56 -0000	1.122
+++ tomboy.spec	25 Aug 2009 02:44:12 -0000	1.123
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.15.5
-Release: 	2%{?dist}
+Version:        0.15.6
+Release: 	1%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -140,6 +140,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.15.6-1
+- Update to 0.15.6
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15.5-2
 - Build for ppc64.
 



From mclasen at fedoraproject.org  Tue Aug 25 02:45:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:45:01 +0000 (UTC)
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.200,1.201
Message-ID: <20090825024501.DB9B511C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3045

Modified Files:
	gnome-utils.spec 
Log Message:
fix file lists



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- gnome-utils.spec	25 Aug 2009 02:36:46 -0000	1.200
+++ gnome-utils.spec	25 Aug 2009 02:45:01 -0000	1.201
@@ -290,6 +290,7 @@ fi
 %{_mandir}/man1/gnome-dictionary.1.gz
 %{_mandir}/man1/gnome-search-tool.1.gz
 %{_mandir}/man1/baobab.1.gz
+%{_mandir}/man1/gnome-screenshot.1.gz
 
 %files devel
 %{_libdir}/libgdict-1.0.so



From mclasen at fedoraproject.org  Tue Aug 25 02:56:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:56:15 +0000 (UTC)
Subject: rpms/yelp/devel .cvsignore, 1.52, 1.53 sources, 1.54, 1.55 yelp.spec,
	1.167, 1.168
Message-ID: <20090825025615.7E44311C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4794

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.27.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	28 Jul 2009 05:22:15 -0000	1.52
+++ .cvsignore	25 Aug 2009 02:56:15 -0000	1.53
@@ -1 +1 @@
-yelp-2.27.3.tar.bz2
+yelp-2.27.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	28 Jul 2009 05:22:16 -0000	1.54
+++ sources	25 Aug 2009 02:56:15 -0000	1.55
@@ -1 +1 @@
-d1a2294818e6fd5baa2b528df482a873  yelp-2.27.3.tar.bz2
+69f50e2396c8806c17147fafc2dd8adf  yelp-2.27.4.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- yelp.spec	24 Aug 2009 01:24:52 -0000	1.167
+++ yelp.spec	25 Aug 2009 02:56:15 -0000	1.168
@@ -18,8 +18,8 @@
 
 Summary: Help browser for the GNOME desktop
 Name: yelp
-Version: 2.27.3
-Release: 2%{?dist}
+Version: 2.27.4
+Release: 1%{?dist}
 Source: http://download.gnome.org/sources/yelp/2.27/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -160,6 +160,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
 * Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.3-2
 - Remove space before ellipsis in menuitems
 



From mclasen at fedoraproject.org  Tue Aug 25 02:59:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:59:04 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.7, 1.8 libchamplain.spec, 1.9,
	1.10 sources, 1.7, 1.8
Message-ID: <20090825025904.C9E6811C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6080

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
0.3.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Aug 2009 04:27:20 -0000	1.7
+++ .cvsignore	25 Aug 2009 02:59:04 -0000	1.8
@@ -1 +1 @@
-libchamplain-0.3.90.tar.bz2
+libchamplain-0.3.91.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libchamplain.spec	11 Aug 2009 04:43:44 -0000	1.9
+++ libchamplain.spec	25 Aug 2009 02:59:04 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.3.90
+Version:	0.3.91
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.3/champlain-gtk
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.91-1
+- Update to 0.3.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.90-1
 - Update to 0.3.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 04:27:21 -0000	1.7
+++ sources	25 Aug 2009 02:59:04 -0000	1.8
@@ -1 +1 @@
-7a09721b41cba2947bdc9ab4216e34a9  libchamplain-0.3.90.tar.bz2
+6d0108dfea8acc473a1efe10c4bde694  libchamplain-0.3.91.tar.bz2



From rdieter at fedoraproject.org  Tue Aug 25 03:11:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 25 Aug 2009 03:11:05 +0000 (UTC)
Subject: rpms/xdg-utils/devel .cvsignore, 1.10, 1.11 sources, 1.9,
	1.10 xdg-utils.spec, 1.21, 1.22
Message-ID: <20090825031105.926A211C025F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8122

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-10.20090824cvs
- 20090824cvs snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Nov 2008 20:25:45 -0000	1.10
+++ .cvsignore	25 Aug 2009 03:11:05 -0000	1.11
@@ -1 +1 @@
-xdg-utils-20081121cvs.tgz
+xdg-utils-20090824cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Nov 2008 20:25:45 -0000	1.9
+++ sources	25 Aug 2009 03:11:05 -0000	1.10
@@ -1 +1 @@
-7a48ac172faa3e8acaf383185b050830  xdg-utils-20081121cvs.tgz
+78598c3e7ff5877577dd5c83ada1a925  xdg-utils-20090824cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xdg-utils.spec	27 Jul 2009 07:43:40 -0000	1.21
+++ xdg-utils.spec	25 Aug 2009 03:11:05 -0000	1.22
@@ -1,10 +1,10 @@
 
-%define cvs 20081121cvs
+%define cvs 20090824cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 9.%{cvs}%{?dist}
+Release: 10.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-10.20090824cvs
+- 20090824cvs snapshot
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-9.20081121cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Tue Aug 25 03:18:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 03:18:41 +0000 (UTC)
Subject: rpms/nss/devel nss.spec, 1.90, 1.91 nss-util-config.in, 1.1,
	NONE nss-util.pc.in, 1.1, NONE
Message-ID: <20090825031842.01FE711C025F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9457

Modified Files:
	nss.spec 
Removed Files:
	nss-util-config.in nss-util.pc.in 
Log Message:
dont install the nss-util pkgconfig files



Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- nss.spec	24 Aug 2009 23:31:26 -0000	1.90
+++ nss.spec	25 Aug 2009 03:18:41 -0000	1.91
@@ -40,8 +40,6 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source8:          nss-prelink.conf
-Source10:         nss-util.pc.in
-Source11:         nss-util-config.in
 Source20:         nss-softokn.pc.in
 Source21:         nss-softokn-config.in
 Source12:         %{name}-pem-20090622.tar.bz2
@@ -226,32 +224,6 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-c
 
 # Set up our package file
 %{__mkdir_p} ./mozilla/dist/pkgconfig
-%{__cat} %{SOURCE10} | sed -e "s,%%libdir%%,%{_libdir},g" \
-                          -e "s,%%prefix%%,%{_prefix},g" \
-                          -e "s,%%exec_prefix%%,%{_prefix},g" \
-                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
-                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \
-                          ./mozilla/dist/pkgconfig/nss-util.pc
-
-NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
-NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
-NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
-
-export NSSUTIL_VMAJOR 
-export NSSUTIL_VMINOR 
-export NSSUTIL_VPATCH
-
-%{__cat} %{SOURCE11} | sed -e "s, at libdir@,%{_libdir},g" \
-                          -e "s, at prefix@,%{_prefix},g" \
-                          -e "s, at exec_prefix@,%{_prefix},g" \
-                          -e "s, at includedir@,%{_includedir}/nss3,g" \
-                          -e "s, at MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \
-                          -e "s, at MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \
-                          -e "s, at MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \
-                          > ./mozilla/dist/pkgconfig/nss-util-config
-
-chmod 755 ./mozilla/dist/pkgconfig/nss-util-config
 
 # Set up our package file
 %{__mkdir_p} ./mozilla/dist/pkgconfig
@@ -395,8 +367,6 @@ done
 # Copy the package configuration files
 %{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
 %{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
-%{__install} -p ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
 %{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
 %{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
@@ -629,6 +599,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-14
+- don install the nss-util pkgconfig bits
+
 * Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-13
 - remove from -devel the 3 headers that ship in nss-util-devel
 


--- nss-util-config.in DELETED ---


--- nss-util.pc.in DELETED ---



From ausil at fedoraproject.org  Tue Aug 25 03:19:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 03:19:16 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.91,1.92
Message-ID: <20090825031916.79D7511C025F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9642

Modified Files:
	nss.spec 
Log Message:
bump



Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- nss.spec	25 Aug 2009 03:18:41 -0000	1.91
+++ nss.spec	25 Aug 2009 03:19:16 -0000	1.92
@@ -14,7 +14,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          13%{?dist}
+Release:          14%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries



From mclasen at fedoraproject.org  Tue Aug 25 03:19:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 03:19:35 +0000 (UTC)
Subject: rpms/libchamplain/devel libchamplain.spec,1.10,1.11
Message-ID: <20090825031935.AF8D311C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9768

Modified Files:
	libchamplain.spec 
Log Message:
fix spec



Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libchamplain.spec	25 Aug 2009 02:59:04 -0000	1.10
+++ libchamplain.spec	25 Aug 2009 03:19:35 -0000	1.11
@@ -79,7 +79,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.3.so.3.0.1
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.3.so.3.0.2
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From bskeggs at fedoraproject.org  Tue Aug 25 03:15:10 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 25 Aug 2009 03:15:10 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.319, 1.320 drm-nouveau.patch,
	1.44, 1.45 kernel.spec, 1.1736, 1.1737
Message-ID: <20090825031510.3F82E11C025F@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8728

Modified Files:
	config-generic drm-nouveau.patch kernel.spec 
Log Message:
* Tue Aug 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.174.rc7.git2
- drm-nouveau.patch: upstream update, pre-nv50 tv-out + misc fixes




Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- config-generic	18 Aug 2009 17:48:11 -0000	1.319
+++ config-generic	25 Aug 2009 03:15:08 -0000	1.320
@@ -2247,6 +2247,7 @@ CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_KMS=y
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I2C_CH7006=m
 
 #
 # PCMCIA character devices

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   44 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  529 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5190 ++++++
 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   |  518 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  628 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   92 
 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       |  374 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1182 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   64 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  933 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  936 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  441 
 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       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1018 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  611 
 drivers/gpu/drm/nouveau/nv04_display.c      |  291 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  815 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  299 
 drivers/gpu/drm/nouveau/nv50_display.c      |  855 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  253 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58110 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.44 -r 1.45 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- drm-nouveau.patch	11 Aug 2009 05:49:52 -0000	1.44
+++ drm-nouveau.patch	25 Aug 2009 03:15:09 -0000	1.45
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..5ea10e5 100644
+index 39b393d..49b21cc 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -143,3 +143,33 @@ config DRM_SAVAGE
+@@ -143,3 +143,47 @@ 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.
@@ -36,15 +36,30 @@ index 39b393d..5ea10e5 100644
 +	  Say Y here if you want to control the backlight of your display
 +	  (e.g. a laptop panel).
 +
++menu "I2C encoder or helper chips"
++     depends on DRM
++
++config DRM_I2C_CH7006
++	tristate "Chrontel ch7006 TV encoder"
++	default m if DRM_NOUVEAU
++	help
++	  Support for Chrontel ch7006 and similar TV encoders, found
++	  on some nVidia video cards.
++
++	  This driver is currently only useful if you're also using
++	  the nouveau driver.
++
++endmenu
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index fe23f29..4c6a38d 100644
+index 5f0aec4..f0ef455 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -27,3 +27,4 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -27,3 +27,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
  obj-$(CONFIG_DRM_SIS)   += sis/
  obj-$(CONFIG_DRM_SAVAGE)+= savage/
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
++obj-y			+= i2c/
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
 index 6246e3f..436e2fe 100644
 --- a/drivers/gpu/drm/drm_bufs.c
@@ -103,9 +118,1379 @@ index 6246e3f..436e2fe 100644
  			     (map->type == _DRM_SHM));
  	if (ret) {
  		if (map->type == _DRM_REGISTERS)
+diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
+new file mode 100644
+index 0000000..6d2abaf
+--- /dev/null
++++ b/drivers/gpu/drm/i2c/Makefile
+@@ -0,0 +1,4 @@
++ccflags-y := -Iinclude/drm
++
++ch7006-y := ch7006_drv.o ch7006_mode.o
++obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
+diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
+new file mode 100644
+index 0000000..47421ba
+--- /dev/null
++++ b/drivers/gpu/drm/i2c/ch7006_drv.c
+@@ -0,0 +1,529 @@
++/*
++ * Copyright (C) 2009 Francisco Jerez.
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
++ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#include "ch7006_priv.h"
++
++/* DRM encoder functions */
++
++static void ch7006_encoder_set_config(struct drm_encoder *encoder,
++				      void *params)
++{
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	priv->params = params;
++}
++
++static void ch7006_encoder_destroy(struct drm_encoder *encoder)
++{
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	drm_property_destroy(encoder->dev, priv->scale_property);
++
++	kfree(priv);
++	to_encoder_slave(encoder)->slave_priv = NULL;
++
++	drm_i2c_encoder_destroy(encoder);
++}
++
++static void  ch7006_encoder_dpms(struct drm_encoder *encoder, int mode)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++	struct ch7006_state *state = &priv->state;
++
++	ch7006_dbg(client, "\n");
++
++	if (mode == priv->last_dpms)
++		return;
++	priv->last_dpms = mode;
++
++	ch7006_setup_power_state(encoder);
++
++	ch7006_load_reg(client, state, CH7006_POWER);
++}
++
++static void ch7006_encoder_save(struct drm_encoder *encoder)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	ch7006_dbg(client, "\n");
++
++	ch7006_state_save(client, &priv->saved_state);
++}
++
++static void ch7006_encoder_restore(struct drm_encoder *encoder)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	ch7006_dbg(client, "\n");
++
++	ch7006_state_load(client, &priv->saved_state);
++}
++
++static bool ch7006_encoder_mode_fixup(struct drm_encoder *encoder,
++				      struct drm_display_mode *mode,
++				      struct drm_display_mode *adjusted_mode)
++{
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	/* The ch7006 is painfully picky with the input timings so no
++	 * custom modes for now... */
++
++	priv->mode = ch7006_lookup_mode(encoder, mode);
++
++	return !!priv->mode;
++}
++
++static int ch7006_encoder_mode_valid(struct drm_encoder *encoder,
++				     struct drm_display_mode *mode)
++{
++	if (ch7006_lookup_mode(encoder, mode))
++		return MODE_OK;
++	else
++		return MODE_BAD;
++}
++
++static void ch7006_encoder_mode_set(struct drm_encoder *encoder,
++				     struct drm_display_mode *drm_mode,
++				     struct drm_display_mode *adjusted_mode)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++	struct ch7006_encoder_params *params = priv->params;
++	struct ch7006_state *state = &priv->state;
++	uint8_t *regs = state->regs;
++	struct ch7006_mode *mode = priv->mode;
++	struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];
++	int start_active;
++
++	ch7006_dbg(client, "\n");
++
++	regs[CH7006_DISPMODE] = norm->dispmode | mode->dispmode;
++	regs[CH7006_BWIDTH] = 0;
++	regs[CH7006_INPUT_FORMAT] = bitf(CH7006_INPUT_FORMAT_FORMAT,
[...14498 lines suppressed...]
++#define NV_PRAMDAC_TV_VSYNC_DELAY			0x00680728
++#define NV_PRAMDAC_TV_HTOTAL				0x0068072c
++#define NV_PRAMDAC_TV_HSKEW				0x00680730
++#define NV_PRAMDAC_TV_HSYNC_DELAY			0x00680734
++#define NV_PRAMDAC_TV_HSYNC_DELAY2			0x00680738
++
++#define NV_PRAMDAC_TV_SETUP                             0x00680700
++
 +#define NV_PRAMDAC_FP_VDISPLAY_END			0x00680800
 +#define NV_PRAMDAC_FP_VTOTAL				0x00680804
 +#define NV_PRAMDAC_FP_VCRTC				0x00680808
@@ -54217,6 +58206,7 @@ index 0000000..90623b0
 +#	define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12		(1 << 24)
 +#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS		(1 << 28)
 +#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE		(2 << 28)
++#define NV_PRAMDAC_FP_MARGIN_COLOR			0x0068084c
 +#define NV_PRAMDAC_850					0x00680850
 +#define NV_PRAMDAC_85C					0x0068085c
 +#define NV_PRAMDAC_FP_DEBUG_0				0x00680880
@@ -54242,12 +58232,16 @@ index 0000000..90623b0
 +#	define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE		(1 << 16)
 +#define NV_PRAMDAC_FP_TMDS_DATA				0x006808b4
 +
++#define NV_PRAMDAC_8C0                                  0x006808c0
++
 +/* Some kind of switch */
 +#define NV_PRAMDAC_900					0x00680900
 +#define NV_PRAMDAC_A20					0x00680A20
 +#define NV_PRAMDAC_A24					0x00680A24
 +#define NV_PRAMDAC_A34					0x00680A34
 +
++#define NV_PRAMDAC_CTV					0x00680c00
++
 +/* names fabricated from NV_USER_DAC info */
 +#define NV_PRMDIO_PIXEL_MASK		0x006813c6
 +#	define NV_PRMDIO_PIXEL_MASK_MASK	0xff
@@ -54335,10 +58329,10 @@ index 0000000..90623b0
 +
 +#endif
 diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
-index 6538d42..ebc9532 100644
+index 87c0625..863ac5e 100644
 --- a/drivers/gpu/drm/ttm/ttm_bo.c
 +++ b/drivers/gpu/drm/ttm/ttm_bo.c
-@@ -89,6 +89,7 @@ int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
+@@ -123,6 +123,7 @@ int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
  	}
  	return 0;
  }
@@ -54346,7 +58340,7 @@ index 6538d42..ebc9532 100644
  
  static void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
  {
-@@ -843,6 +844,7 @@ int ttm_bo_wait_cpu(struct ttm_buffer_object *bo, bool no_wait)
+@@ -883,6 +884,7 @@ int ttm_bo_wait_cpu(struct ttm_buffer_object *bo, bool no_wait)
  
  	return ret;
  }
@@ -54354,7 +58348,7 @@ index 6538d42..ebc9532 100644
  
  int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
  		       uint32_t proposed_placement,
-@@ -1628,12 +1630,14 @@ int ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait)
+@@ -1722,12 +1724,14 @@ int ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait)
  	ttm_bo_unreserve(bo);
  	return ret;
  }
@@ -54379,10 +58373,10 @@ index b940fdf..cfa6af4 100644
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..46e72e9 100644
+index e0f1c1f..84e2fa6 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -1216,6 +1216,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
+@@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
  extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
  
  				/* Buffer management support (drm_bufs.h) */
@@ -54391,12 +58385,104 @@ index 45b67d9..46e72e9 100644
  extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
  extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
  extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
+diff --git a/include/drm/i2c/ch7006.h b/include/drm/i2c/ch7006.h
+new file mode 100644
+index 0000000..8390b43
+--- /dev/null
++++ b/include/drm/i2c/ch7006.h
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (C) 2009 Francisco Jerez.
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
++ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#ifndef __DRM_I2C_CH7006_H__
++#define __DRM_I2C_CH7006_H__
++
++/**
++ * struct ch7006_encoder_params
++ *
++ * Describes how the ch7006 is wired up with the GPU. It should be
++ * used as the @params parameter of its @set_config method.
++ *
++ * See "http://www.chrontel.com/pdf/7006.pdf" for their precise
++ * meaning.
++ */
++struct ch7006_encoder_params {
++	enum {
++		CH7006_FORMAT_RGB16 = 0,
++		CH7006_FORMAT_YCrCb24m16,
++		CH7006_FORMAT_RGB24m16,
++		CH7006_FORMAT_RGB15,
++		CH7006_FORMAT_RGB24m12C,
++		CH7006_FORMAT_RGB24m12I,
++		CH7006_FORMAT_RGB24m8,
++		CH7006_FORMAT_RGB16m8,
++		CH7006_FORMAT_RGB15m8,
++		CH7006_FORMAT_YCrCb24m8,
++	} input_format;
++
++	enum {
++		CH7006_CLOCK_SLAVE = 0,
++		CH7006_CLOCK_MASTER,
++	} clock_mode;
++
++	enum {
++		CH7006_CLOCK_EDGE_NEG = 0,
++		CH7006_CLOCK_EDGE_POS,
++	} clock_edge;
++
++	int xcm, pcm;
++
++	enum {
++		CH7006_SYNC_SLAVE = 0,
++		CH7006_SYNC_MASTER,
++	} sync_direction;
++
++	enum {
++		CH7006_SYNC_SEPARATED = 0,
++		CH7006_SYNC_EMBEDDED,
++	} sync_encoding;
++
++	enum {
++		CH7006_POUT_1_8V = 0,
++		CH7006_POUT_3_3V,
++	} pout_level;
++
++	enum {
++		CH7006_ACTIVE_HSYNC = 0,
++		CH7006_ACTIVE_DSTART,
++	} active_detect;
++};
++
++#endif
 diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
 new file mode 100644
-index 0000000..3e52b24
+index 0000000..2050357
 --- /dev/null
 +++ b/include/drm/nouveau_drm.h
-@@ -0,0 +1,214 @@
+@@ -0,0 +1,216 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -54549,9 +58635,11 @@ index 0000000..3e52b24
 +	uint32_t offset;
 +	uint32_t nr_buffers;
 +	uint32_t nr_relocs;
-+	uint32_t pad0;
++	uint32_t nr_dwords;
 +	uint64_t buffers;
 +	uint64_t relocs;
++	uint32_t suffix0;
++	uint32_t suffix1;
 +};
 +
 +struct drm_nouveau_gem_pin {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1736
retrieving revision 1.1737
diff -u -p -r1.1736 -r1.1737
--- kernel.spec	25 Aug 2009 00:57:46 -0000	1.1736
+++ kernel.spec	25 Aug 2009 03:15:09 -0000	1.1737
@@ -2011,6 +2011,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.174.rc7.git2
+- drm-nouveau.patch: upstream update, pre-nv50 tv-out + misc fixes
+
 * Tue Aug 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.173.rc7.git2
 - Fix Xen boot (#508120)
 



From mclasen at fedoraproject.org  Tue Aug 25 02:26:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:26:05 +0000 (UTC)
Subject: rpms/gnome-utils/devel .cvsignore, 1.75, 1.76 gnome-utils.spec,
	1.198, 1.199 sources, 1.79, 1.80
Message-ID: <20090825022605.D264811C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30911

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	16 Jun 2009 04:50:24 -0000	1.75
+++ .cvsignore	25 Aug 2009 02:26:05 -0000	1.76
@@ -1 +1 @@
-gnome-utils-2.27.2.tar.bz2
+gnome-utils-2.27.91.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- gnome-utils.spec	22 Aug 2009 04:23:32 -0000	1.198
+++ gnome-utils.spec	25 Aug 2009 02:26:05 -0000	1.199
@@ -8,8 +8,8 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.27.2
-Release:        6%{?dist}
+Version:        2.27.91
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -307,6 +307,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.91-1
+- Update to 2.27.91
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.2-6
 - Fix a crash in gnome-dictionary
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	16 Jun 2009 04:50:25 -0000	1.79
+++ sources	25 Aug 2009 02:26:05 -0000	1.80
@@ -1 +1 @@
-b7ee7d23f2713334c68ebf5121186219  gnome-utils-2.27.2.tar.bz2
+5c795e19e03274d838197ea1e0e9b516  gnome-utils-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 02:37:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 02:37:04 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.33, 1.34 cheese.spec, 1.60,
	1.61 sources, 1.33, 1.34
Message-ID: <20090825023704.4F47211C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv881

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	11 Aug 2009 04:52:23 -0000	1.33
+++ .cvsignore	25 Aug 2009 02:37:04 -0000	1.34
@@ -1 +1 @@
-cheese-2.27.90.tar.bz2
+cheese-2.27.91.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cheese.spec	22 Aug 2009 07:39:39 -0000	1.60
+++ cheese.spec	25 Aug 2009 02:37:04 -0000	1.61
@@ -1,6 +1,6 @@
 Name:           cheese
-Version:        2.27.90
-Release:        3%{?dist}
+Version:        2.27.91
+Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
@@ -34,9 +34,6 @@ Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
 
-#
-Patch0: fix-schemas.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=592663
 Patch1: trash-menu.patch
 
@@ -46,7 +43,6 @@ videos from a webcam. It can also apply 
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-schemas
 %patch1 -p1 -b .trash-menu
 
 %build
@@ -130,6 +126,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Sat Aug 22 2009 Matthias Clasen  <mclasen at redhat.com> 2.27.90-3
 - Update sensitivity of menu items
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	11 Aug 2009 04:52:23 -0000	1.33
+++ sources	25 Aug 2009 02:37:04 -0000	1.34
@@ -1 +1 @@
-3b30e2dba1e5e2c08c71a5b9734b6f27  cheese-2.27.90.tar.bz2
+ba7d1ab6f4f671ad46bcc5addc9a14f1  cheese-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 03:36:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 03:36:31 +0000 (UTC)
Subject: rpms/yelp/devel yelp-use-pango.patch, NONE, 1.1 yelp.spec, 1.168,
	1.169
Message-ID: <20090825033631.ED74E11C025F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13148

Modified Files:
	yelp.spec 
Added Files:
	yelp-use-pango.patch 
Log Message:
fix spec


yelp-use-pango.patch:
 yelp-main.c |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE yelp-use-pango.patch ---
diff -up yelp-2.27.4/src/yelp-main.c.use-pango yelp-2.27.4/src/yelp-main.c
--- yelp-2.27.4/src/yelp-main.c.use-pango	2009-08-06 20:18:11.000000000 -0400
+++ yelp-2.27.4/src/yelp-main.c	2009-08-24 23:20:45.955969896 -0400
@@ -412,18 +412,6 @@ main (int argc, char **argv) 
 #endif /* WITH_SMCLIENT */
 
 	if (private || !main_is_running ()) {
-		const gchar          *env;
-
-		/* workaround for bug #329461 */
-		env = g_getenv ("MOZ_ENABLE_PANGO");
-		
-		if (env == NULL ||
-		    *env == '\0' ||
-		    g_str_equal(env, "0")) 
-			{
-				g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE);
-			}
-		
 		if (session_started) {
 			main_restore_session ();
 		} else {


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- yelp.spec	25 Aug 2009 02:56:15 -0000	1.168
+++ yelp.spec	25 Aug 2009 03:36:31 -0000	1.169
@@ -24,7 +24,7 @@ Source: http://download.gnome.org/source
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
-Patch3: yelp-2.15.91-use-pango.patch
+Patch3: yelp-use-pango.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497559
 # Patch6: hp.patch
 
@@ -32,7 +32,7 @@ Patch3: yelp-2.15.91-use-pango.patch
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
 #Patch8: yelp-2.18.1-posix-man.patch
 
-Patch12: libxul.patch
+# Patch12: libxul.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=592762
 Patch13: ellipsis.patch
@@ -88,7 +88,7 @@ documentation written in DocBook.
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
 #%patch6 -p1 -b .hp
-%patch12 -p1 -b .libxul
+#%patch12 -p1 -b .libxul
 %patch13 -p1 -b .ellipsis
 
 # force regeneration



From mclasen at fedoraproject.org  Tue Aug 25 03:40:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 03:40:33 +0000 (UTC)
Subject: rpms/control-center/devel .cvsignore, 1.93, 1.94 control-center.spec,
	1.477, 1.478 no-tweaks.patch, 1.2, 1.3 sources, 1.96, 1.97
Message-ID: <20090825034033.B7FE111C0439@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13802

Modified Files:
	.cvsignore control-center.spec no-tweaks.patch sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	18 Aug 2009 00:47:04 -0000	1.93
+++ .cvsignore	25 Aug 2009 03:40:33 -0000	1.94
@@ -1 +1 @@
-gnome-control-center-2.27.90.tar.bz2
+gnome-control-center-2.27.91.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- control-center.spec	23 Aug 2009 06:30:50 -0000	1.477
+++ control-center.spec	25 Aug 2009 03:40:33 -0000	1.478
@@ -23,8 +23,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.27.90
-Release: 5%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -59,15 +59,6 @@ Patch47: save-as.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591375
 Patch50: slideshow-ui.patch
 
-# from upstream
-Patch55: unique-ids.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=578109
-Patch56: rotate.patch
-
-#vhttp://bugzilla.gnome.org/show_bug.cgi?id=592642
-Patch57: font-viewer-icon.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
@@ -191,9 +182,6 @@ utilities.
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .slideshow-ui
-%patch55 -p1 -b .unique-ids
-%patch56 -p1 -b .rotate
-%patch57 -p1 -b .font-viewer-icon
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -373,6 +361,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-5
 - Apply the patch...
 

no-tweaks.patch:
 Makefile.am                   |    3 
 appearance/Makefile.am        |    2 
 appearance/appearance-main.c  |    1 
 appearance/data/appearance.ui |  364 ------------------------------------------
 4 files changed, 1 insertion(+), 369 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- no-tweaks.patch	10 Aug 2009 16:14:29 -0000	1.2
+++ no-tweaks.patch	25 Aug 2009 03:40:33 -0000	1.3
@@ -1,35 +1,7 @@
-diff --git a/capplets/Makefile.am b/capplets/Makefile.am
-index d88c1d3..e30d861 100644
---- a/capplets/Makefile.am
-+++ b/capplets/Makefile.am
-@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
- 	keybindings		\
- 	keyboard		\
- 	mouse			\
--	network			\
--	windows
-+	network
- 
- SUBDIRS = $(always_built_SUBDIRS)
- 
-diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
-index 226e4ec..b940d73 100644
---- a/capplets/appearance/Makefile.am
-+++ b/capplets/appearance/Makefile.am
-@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
- 	appearance-themes.h \
- 	appearance-style.c \
- 	appearance-style.h \
--	appearance-ui.c \
--	appearance-ui.h \
- 	gedit-message-area.c \
- 	gedit-message-area.h \
- 	gnome-wp-info.c \
-diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
-index 369af02..86e4957 100644
---- a/capplets/appearance/appearance-main.c
-+++ b/capplets/appearance/appearance-main.c
-@@ -172,7 +172,6 @@ main (int argc, char **argv)
+diff -up gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.91/capplets/appearance/appearance-main.c
+--- gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks	2009-08-24 06:54:41.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/appearance-main.c	2009-08-24 23:31:28.843978482 -0400
+@@ -165,7 +165,6 @@ main (int argc, char **argv)
    desktop_init (data, (const gchar **) wallpaper_files);
    g_strfreev (wallpaper_files);
    font_init (data);
@@ -37,21 +9,22 @@ index 369af02..86e4957 100644
  
    /* prepare the main window */
    w = appearance_capplet_get_widget (data, "appearance_window");
-diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
-index a68894e..0270d4b 100644
---- a/capplets/appearance/data/appearance.ui
-+++ b/capplets/appearance/data/appearance.ui
-@@ -1506,365 +1506,6 @@
+diff -up gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui
+--- gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks	2009-08-24 23:34:19.741986359 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui	2009-08-24 23:36:37.898966013 -0400
+@@ -1530,370 +1530,6 @@
                  <property name="tab_fill">False</property>
                </packing>
              </child>
 -            <child>
 -              <object class="GtkVBox" id="interface_vbox">
+-                <property name="orientation">vertical</property>
 -                <property name="visible">True</property>
 -                <property name="border_width">12</property>
 -                <property name="spacing">18</property>
 -                <child>
 -                  <object class="GtkVBox" id="vbox23">
+-                    <property name="orientation">vertical</property>
 -                    <property name="visible">True</property>
 -                    <property name="spacing">6</property>
 -                    <child>
@@ -85,6 +58,7 @@ index a68894e..0270d4b 100644
 -                        </child>
 -                        <child>
 -                          <object class="GtkVBox" id="vbox24">
+-                            <property name="orientation">vertical</property>
 -                            <property name="visible">True</property>
 -                            <property name="spacing">6</property>
 -                            <child>
@@ -182,6 +156,7 @@ index a68894e..0270d4b 100644
 -                </child>
 -                <child>
 -                  <object class="GtkVBox" id="vbox25">
+-                    <property name="orientation">vertical</property>
 -                    <property name="visible">True</property>
 -                    <property name="spacing">6</property>
 -                    <child>
@@ -215,6 +190,7 @@ index a68894e..0270d4b 100644
 -                        </child>
 -                        <child>
 -                          <object class="GtkVBox" id="vbox26">
+-                            <property name="orientation">vertical</property>
 -                            <property name="visible">True</property>
 -                            <child>
 -                              <object class="GtkMenuBar" id="menubar">
@@ -407,3 +383,28 @@ index a68894e..0270d4b 100644
            </object>
            <packing>
              <property name="position">1</property>
+diff -up gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/appearance/Makefile.am
+--- gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks	2009-07-16 10:33:13.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/Makefile.am	2009-08-24 23:31:28.842973536 -0400
+@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
+ 	appearance-themes.h \
+ 	appearance-style.c \
+ 	appearance-style.h \
+-	appearance-ui.c \
+-	appearance-ui.h \
+ 	gedit-message-area.c \
+ 	gedit-message-area.h \
+ 	gnome-wp-info.c \
+diff -up gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/Makefile.am
+--- gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks	2009-08-24 06:54:41.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/Makefile.am	2009-08-24 23:31:28.841988564 -0400
+@@ -6,8 +6,7 @@ SUBDIRS = \
+ 	keybindings		\
+ 	keyboard		\
+ 	mouse			\
+-	network			\
+-	windows
++	network
+ 
+ DIST_SUBDIRS = \
+ 	common			\


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	18 Aug 2009 00:47:04 -0000	1.96
+++ sources	25 Aug 2009 03:40:33 -0000	1.97
@@ -1 +1 @@
-e60ba889c281e23079da2889144e5b48  gnome-control-center-2.27.90.tar.bz2
+fffc2c207a11f3f4d97828514200e61e  gnome-control-center-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 04:03:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 04:03:12 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.478,1.479
Message-ID: <20090825040312.0D61611C0346@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19669

Modified Files:
	control-center.spec 
Log Message:
fix file lists



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- control-center.spec	25 Aug 2009 03:40:33 -0000	1.478
+++ control-center.spec	25 Aug 2009 04:03:11 -0000	1.479
@@ -268,6 +268,7 @@ rm -rf $RPM_BUILD_ROOT
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule 		       \
    %{_sysconfdir}/gconf/schemas/control-center.schemas \
+   %{_sysconfdir}/gconf/schemas/gnome-control-center.schemas \
    %{_sysconfdir}/gconf/schemas/fontilus.schemas \
      > /dev/null || :
 update-desktop-database --quiet %{_datadir}/applications
@@ -280,7 +281,7 @@ fi
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    for f in fontilus.schemas control-center.schemas; do
+    for f in fontilus.schemas control-center.schemas gnome-control-center.schemas; do
         if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
             gconftool-2 --makefile-uninstall-rule \
 		%{_sysconfdir}/gconf/schemas/$f \
@@ -292,7 +293,7 @@ fi
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    for f in fontilus.schemas control-center.schemas; do
+    for f in fontilus.schemas control-center.schemas gnome-control-center.schemas; do
         if [ -f %{_sysconfdir}/gconf/schemas/$f ]; then
             gconftool-2 --makefile-uninstall-rule \
 		%{_sysconfdir}/gconf/schemas/$f \
@@ -342,6 +343,7 @@ fi
 %{_bindir}/gnome-thumbnail-font
 %{_libdir}/*.so.*
 %{_sysconfdir}/gconf/schemas/control-center.schemas
+%{_sysconfdir}/gconf/schemas/gnome-control-center.schemas
 %{_sysconfdir}/gconf/schemas/fontilus.schemas
 %{_sysconfdir}/xdg/menus/gnomecc.menu
 %{_sysconfdir}/xdg/autostart/gnome-at-session.desktop



From whot at fedoraproject.org  Tue Aug 25 04:03:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 25 Aug 2009 04:03:46 +0000 (UTC)
Subject: rpms/libXi/devel .cvsignore, 1.19, 1.20 commitid, 1.5,
	1.6 libXi.spec, 1.38, 1.39 sources, 1.20, 1.21
Message-ID: <20090825040346.A360611C0346@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30443

Modified Files:
	.cvsignore commitid libXi.spec sources 
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	4 Aug 2009 22:44:38 -0000	1.19
+++ .cvsignore	25 Aug 2009 04:03:46 -0000	1.20
@@ -1 +1 @@
-libXi-20090805.tar.bz2
+libXi-20090825.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/commitid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- commitid	4 Aug 2009 22:44:38 -0000	1.5
+++ commitid	25 Aug 2009 04:03:46 -0000	1.6
@@ -1 +1 @@
-bc3900ea706438005f8b5613de4d9fb6bd954f62
+2ce629c30745fc4027d2a95745bf21e8d8c7b893


Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libXi.spec	4 Aug 2009 22:44:38 -0000	1.38
+++ libXi.spec	25 Aug 2009 04:03:46 -0000	1.39
@@ -1,10 +1,10 @@
 %define tarball libXi
-%define gitdate 20090805
+%define gitdate 20090825
 
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.2.99
-Release: 10.%{gitdate}%{?dist}
+Release: 11.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -17,7 +17,7 @@ Source1:    make-git-snapshot.sh
 BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: pkgconfig(inputproto) >= 1.9.99.14
+BuildRequires: pkgconfig(inputproto) >= 1.9.99.902
 BuildRequires: libX11-devel >= 1.2.99
 BuildRequires: libXext-devel
 BuildRequires: libXau-devel
@@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libXi.so.6
-%{_libdir}/libXi.so.6.0.0
+%{_libdir}/libXi.so.6.1.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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
+
 * Wed Aug 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-10.20090805
 - Update to today's git master
 - Re-enable parallel builds, the man page makefile is fixed now.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 22:44:38 -0000	1.20
+++ sources	25 Aug 2009 04:03:46 -0000	1.21
@@ -1 +1 @@
-778252cf450025f852466c656f5ae87f  libXi-20090805.tar.bz2
+ffa25245465d6547b8d93870c201cb0a  libXi-20090825.tar.bz2



From nucleo at fedoraproject.org  Tue Aug 25 04:18:20 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue, 25 Aug 2009 04:18:20 +0000 (UTC)
Subject: rpms/psimedia/F-11 psimedia.spec,1.1,1.2
Message-ID: <20090825041820.31BBF11C00D7@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/psimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8782/F-11

Modified Files:
	psimedia.spec 
Log Message:
Fix psi crash


Index: psimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psimedia/F-11/psimedia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- psimedia.spec	17 Jul 2009 16:05:49 -0000	1.1
+++ psimedia.spec	25 Aug 2009 04:18:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           psimedia
 Version:        1.0.3
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Audio and video RTP services for Psi-like IM clients
 
 Group:          Applications/Multimedia
@@ -12,6 +12,9 @@ Source1:        psimedia.desktop
 Patch0:         psimedia-demo.patch
 Requires:       psi >= 0.13
 
+# psi crashes if gstreamer-plugins-good not installed
+Requires:       gstreamer-plugins-good
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -57,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/psi/plugins/libgstprovider.so
 
 %changelog
+* Tue Aug 25 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-4
+- Added BR gstreamer-plugins-good to avoid psi crash
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-2
 - Fixed patch for using libdir in plugins path
 - Group changed to Applications/Multimedia



From nucleo at fedoraproject.org  Tue Aug 25 04:18:20 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Tue, 25 Aug 2009 04:18:20 +0000 (UTC)
Subject: rpms/psimedia/devel psimedia.spec,1.2,1.3
Message-ID: <20090825041820.46E3511C0346@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/psimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8782/devel

Modified Files:
	psimedia.spec 
Log Message:
Fix psi crash


Index: psimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psimedia/devel/psimedia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- psimedia.spec	26 Jul 2009 19:34:54 -0000	1.2
+++ psimedia.spec	25 Aug 2009 04:18:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           psimedia
 Version:        1.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Audio and video RTP services for Psi-like IM clients
 
 Group:          Applications/Multimedia
@@ -12,6 +12,9 @@ Source1:        psimedia.desktop
 Patch0:         psimedia-demo.patch
 Requires:       psi >= 0.13
 
+# psi crashes if gstreamer-plugins-good not installed
+Requires:       gstreamer-plugins-good
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -57,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/psi/plugins/libgstprovider.so
 
 %changelog
+* Tue Aug 25 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-4
+- Added BR gstreamer-plugins-good to avoid psi crash
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From whot at fedoraproject.org  Tue Aug 25 04:21:24 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 25 Aug 2009 04:21:24 +0000 (UTC)
Subject: rpms/libXtst/devel .cvsignore, 1.10, 1.11 libXtst.spec, 1.28,
	1.29 sources, 1.10, 1.11
Message-ID: <20090825042124.353C211C00D7@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXtst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9530

Modified Files:
	.cvsignore libXtst.spec sources 
Log Message:
* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.2-1
- libXtst 1.0.99.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	22 Jul 2009 13:45:05 -0000	1.10
+++ .cvsignore	25 Aug 2009 04:21:23 -0000	1.11
@@ -1 +1 @@
-libXtst-1.0.99.1.tar.bz2
+libXtst-1.0.99.2.tar.bz2


Index: libXtst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libXtst.spec	25 Jul 2009 05:15:40 -0000	1.28
+++ libXtst.spec	25 Aug 2009 04:21:23 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
-Version: 1.0.99.1
-Release: 3%{?dist}
+Version: 1.0.99.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/XTest*.3*
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.2-1
+- libXtst 1.0.99.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.99.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	22 Jul 2009 13:45:05 -0000	1.10
+++ sources	25 Aug 2009 04:21:23 -0000	1.11
@@ -1 +1 @@
-c41044b5c3af20e7abcfb874ea743b52  libXtst-1.0.99.1.tar.bz2
+b5edc35ca9b9ba4133a3fa34cb1b00f8  libXtst-1.0.99.2.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 04:27:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 04:27:19 +0000 (UTC)
Subject: rpms/epiphany/devel .cvsignore, 1.85, 1.86 epiphany.spec, 1.240,
	1.241 sources, 1.88, 1.89
Message-ID: <20090825042719.4E9BC11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10578

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	11 Aug 2009 04:20:47 -0000	1.85
+++ .cvsignore	25 Aug 2009 04:27:18 -0000	1.86
@@ -1 +1 @@
-epiphany-2.27.90.tar.bz2
+epiphany-2.27.91.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- epiphany.spec	12 Aug 2009 17:04:57 -0000	1.240
+++ epiphany.spec	25 Aug 2009 04:27:18 -0000	1.241
@@ -7,7 +7,7 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.27.90
+Version: 2.27.91
 Release: 1%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
@@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- sources	11 Aug 2009 04:20:47 -0000	1.88
+++ sources	25 Aug 2009 04:27:19 -0000	1.89
@@ -1 +1 @@
-afdba03b15e6e4e40b5e46edc592d847  epiphany-2.27.90.tar.bz2
+3d275ded5c0626fac0b53ef7cfb20663  epiphany-2.27.91.tar.bz2



From silas at fedoraproject.org  Tue Aug 25 04:54:40 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Tue, 25 Aug 2009 04:54:40 +0000 (UTC)
Subject: rpms/tokyotyrant/devel 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: <20090825045440.8532111C00D7@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15916/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tokyotyrant-1.1.33.build.patch tokyotyrant.init 
	tokyotyrant.logrotate tokyotyrant.spec tokyotyrant.sysconfig 
Log Message:
* 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 import.log ---
tokyotyrant-1_1_33-5_fc12:HEAD:tokyotyrant-1.1.33-5.fc12.src.rpm:1251175673

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.33
Release:          5%{?dist}
Summary:          A network interface to Tokyo Cabinet

Group:            Applications/Databases
License:          LGPLv2+
URL:              http://tokyocabinet.sourceforge.net
Source0:          http://tokyocabinet.sourceforge.net/tyrantpkg/%{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
* 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=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/.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	25 Aug 2009 04:54:40 -0000	1.2
@@ -0,0 +1 @@
+tokyotyrant-1.1.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/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	25 Aug 2009 04:54:40 -0000	1.2
@@ -0,0 +1 @@
+880d6af48458bc04b993bdae6ecc543d  tokyotyrant-1.1.33.tar.gz



From mclasen at fedoraproject.org  Tue Aug 25 04:43:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 04:43:00 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.241,1.242
Message-ID: <20090825044300.4EF5411C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13795

Modified Files:
	epiphany.spec 
Log Message:
drop obsolete patch



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- epiphany.spec	25 Aug 2009 04:27:18 -0000	1.241
+++ epiphany.spec	25 Aug 2009 04:43:00 -0000	1.242
@@ -51,7 +51,6 @@ BuildRequires: libsoup-devel
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
 Patch2: epiphany-default-bookmarks.patch
-Patch3: clear-button.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -97,7 +96,6 @@ Install epiphany-devel if you want to wr
 
 %patch0 -p1 -b .homepage
 %patch2 -p1 -b .default-bookmarks
-%patch3 -p1 -b .clear-button
 
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF



From whot at fedoraproject.org  Tue Aug 25 04:56:13 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 25 Aug 2009 04:56:13 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.58, 1.59 sources, 1.57,
	1.58 xorg-x11-proto-devel.spec, 1.107, 1.108
Message-ID: <20090825045613.0186611C00D7@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-serv16324

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-30
- recordproto 1.13.99.1
- xextproto 7.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	25 Aug 2009 00:44:22 -0000	1.58
+++ .cvsignore	25 Aug 2009 04:56:12 -0000	1.59
@@ -7,7 +7,7 @@ fixesproto-4.0.tar.bz2
 fontsproto-2.0.2.tar.bz2
 glproto-1.4.9.tar.bz2
 kbproto-1.0.3.tar.bz2
-recordproto-1.13.2.tar.bz2
+recordproto-1.13.99.1.tar.bz2
 renderproto-0.11.tar.bz2
 resourceproto-1.0.2.tar.bz2
 scrnsaverproto-1.1.0.tar.bz2
@@ -27,5 +27,5 @@ glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-1.9.99.902.tar.bz2
 randrproto-1.3.0.tar.bz2
-xextproto-7.1.0.tar.bz2
+xextproto-7.1.1.tar.bz2
 fixesproto-4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	25 Aug 2009 00:44:22 -0000	1.57
+++ sources	25 Aug 2009 04:56:12 -0000	1.58
@@ -5,7 +5,7 @@ d80acad88411e7944b9b085463d53302  dmxpro
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
-0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
+1ab825ee2dbf32dd4a09cfca89d0fad7  recordproto-1.13.99.1.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
 5d551850e6f4acdf49a13f4eb3a5bbfa  scrnsaverproto-1.1.0.tar.bz2
@@ -23,5 +23,5 @@ c9f8cebfba72bfab674bc0170551fb8d  glprot
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 1937db6f8881409a1fc8b45bcc01f4ad  inputproto-1.9.99.902.tar.bz2
 a49416013fff33c853efb32f1926551e  randrproto-1.3.0.tar.bz2
-d54562771718a02508c6e0255409145d  xextproto-7.1.0.tar.bz2
+fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
 157644edb3cd526f2cb164eb79c52bad  fixesproto-4.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.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- xorg-x11-proto-devel.spec	25 Aug 2009 00:44:22 -0000	1.107
+++ xorg-x11-proto-devel.spec	25 Aug 2009 04:56:12 -0000	1.108
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -26,13 +26,13 @@ Source8:  http://www.x.org/pub/individua
 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
-Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.2.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.0.2.tar.bz2
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
 Source19: http://www.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
-Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.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.1.2.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.tar.bz2
@@ -187,7 +187,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/panoramiXproto.h
 %{_includedir}/X11/extensions/randr.h
 %{_includedir}/X11/extensions/randrproto.h
-%{_includedir}/X11/extensions/record.h
+%{_includedir}/X11/extensions/recordconst.h
+%{_includedir}/X11/extensions/recordproto.h
 %{_includedir}/X11/extensions/recordstr.h
 %{_includedir}/X11/extensions/render.h
 %{_includedir}/X11/extensions/renderproto.h
@@ -258,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-30
+- recordproto 1.13.99.1
+- xextproto 7.1.1
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-29
 - inputproto 1.9.99.902
 



From mclasen at fedoraproject.org  Tue Aug 25 04:56:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 04:56:27 +0000 (UTC)
Subject: rpms/unique/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 unique.spec,
	1.9, 1.10
Message-ID: <20090825045627.9CBBA11C00D7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/unique/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16370

Modified Files:
	.cvsignore sources unique.spec 
Log Message:
1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unique/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Apr 2009 07:37:00 -0000	1.5
+++ .cvsignore	25 Aug 2009 04:56:27 -0000	1.6
@@ -1 +1 @@
-libunique-1.0.8.tar.gz
+libunique-1.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unique/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Apr 2009 07:37:00 -0000	1.5
+++ sources	25 Aug 2009 04:56:27 -0000	1.6
@@ -1 +1 @@
-8ea35a7d8da7ef2952cd79f9e1324053  libunique-1.0.8.tar.gz
+f33749109768d43ef69ca7e8ffa7cfb7  libunique-1.1.2.tar.bz2


Index: unique.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unique/devel/unique.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- unique.spec	27 Jul 2009 06:32:57 -0000	1.9
+++ unique.spec	25 Aug 2009 04:56:27 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           unique
-Version:        1.0.8
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Single instance support for applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
-Source0:        http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.gz
+Source0:        http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhatcom> - 1.1.2-1
+- Update to 1.1.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From allisson at fedoraproject.org  Tue Aug 25 05:14:46 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 25 Aug 2009 05:14:46 +0000 (UTC)
Subject: rpms/emesene/F-11 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 emesene.spec, 1.7, 1.8 sources, 1.4, 1.5 emesene.desktop,
	1.1, NONE
Message-ID: <20090825051446.B0A2C11C00D7@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19917/F-11

Modified Files:
	.cvsignore emesene.spec sources 
Added Files:
	import.log 
Removed Files:
	emesene.desktop 
Log Message:

Update to 1.5



--- NEW FILE import.log ---
emesene-1_5-2_fc11:F-11:emesene-1.5-2.fc11.src.rpm:1251177266


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Aug 2008 01:02:52 -0000	1.4
+++ .cvsignore	25 Aug 2009 05:14:46 -0000	1.5
@@ -1 +1 @@
-emesene-1.0.1.tar.gz
+emesene-1.5.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/emesene.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- emesene.spec	24 Feb 2009 14:56:11 -0000	1.7
+++ emesene.spec	25 Aug 2009 05:14:46 -0000	1.8
@@ -1,109 +1,127 @@
-%define appdir  %{_datadir}/%{name}
-%define menudir %{_datadir}/applications
-%define icondir %{_datadir}/pixmaps
-%define podir   %{appdir}/po
-
 Name:           emesene
-Version:        1.0.1
-Release:        5%{?dist}
-Summary:        Instant messaging client for Windows Live Messenger (tm) network
+Version:        1.5
+Release:        2%{?dist}
+Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Source1:        emesene.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-
-BuildRequires:  desktop-file-utils, gettext
-Requires:       gtk2
-Requires:       gnome-python2-extras
-Requires:       python
+BuildRequires:  desktop-file-utils, gettext, python-devel
+Requires: gnome-python2-extras
+Requires: python pygtk2
+Requires: dbus-python
+Requires: alsa-utils notify-python
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkspell
+
 
 %description
-emesene is an instant messaging client for Windows Live Messenger (tm) network.
+Emesene is a MSN Messenger client writed in Python and
+GTK. The main idea is to make a client similar to the official MSN
+Messenger client but kepping it simple and with a nice GUI.
+
+Emesene is a python/gtk MSN messenger clone, it uses msnlib (MSNP9)
+and try to be a nice looking and simple MSN client.
+
+You can login, send formated messages, smilies, use autoreply, change
+status, change nick, send nudges and all the stuff you can do in a
+normal MSN client except, file transfers,custom emoticons and display
+picture.
+
+
 
 %prep
 %setup -q
+find -name \*~ |xargs rm -fv
 
 
 %build
-%{nil}
+python setup.py build_ext -i
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT%{appdir}
-%{__install} -d $RPM_BUILD_ROOT%{menudir}
-%{__install} -d $RPM_BUILD_ROOT%{icondir}
-%{__install} -d $RPM_BUILD_ROOT%{_bindir}
-
-%{__cp} -R * $RPM_BUILD_ROOT%{appdir}/
-/bin/echo '%{appdir}/%{name}' > $RPM_BUILD_ROOT%{_bindir}/emesene
-%{__cp} themes/default/trayicon.png $RPM_BUILD_ROOT%{icondir}/emesene.png
-desktop-file-install --dir $RPM_BUILD_ROOT%{menudir}/ %{SOURCE1}
-
-# Controller.py and %{bindir}/emesene should be executable
-%{__chmod} 755 $RPM_BUILD_ROOT%{appdir}/Controller.py
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/emesene
 
-# handling locale files
-#%find_lang %{name}
+install -D -m 644 misc/%name.1 %buildroot%_mandir/man1/%name.1
+install -D -m 644 misc/%name.png %buildroot%_datadir/icons/hicolor/48x48/apps/%name.png
+install -D -m 644 misc/%name.svg %buildroot%_datadir/icons/hicolor/scalable/apps/%name.png
+install -D -m 644 misc/%name.desktop %buildroot%_datadir/applications/%name.desktop
+desktop-file-validate %buildroot%_datadir/applications/%name.desktop
+
+mkdir -p %buildroot%{_libdir}/%name
+
+cp -r ../%name-%version %buildroot%{_datadir}/%name
+cd %buildroot%{_datadir}/%name
+rm -rf COPYING README GPL LGPL emesene.bat Winamp.py misc/%name.desktop misc/%name.1 libmimic build setup.py po/templates/ %name.pot PKG-INFO PSF debug*.list
+
+mv libmimic.so %buildroot%_libdir/%name
+cd po
+for dir in *;do echo "%lang($dir) %{_datadir}/%name/po/$dir" >> $RPM_BUILD_DIR/%name-%version/%name.lang
+done
+
+
+mkdir -p %buildroot%_bindir/
+cat > %buildroot%_bindir/%name << EOF
+#!/bin/sh
+cd %{_datadir}/%name
+exec ./%name
+EOF
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%defattr(-,root,root,-)
-%doc docs
-%doc COPYING
-%dir %{appdir}
-%dir %{podir}
-%lang(ar) %{podir}/ar
-%lang(ca) %{podir}/ca
-%lang(de) %{podir}/de
-%lang(es) %{podir}/es
-%lang(et) %{podir}/et
-%lang(fi) %{podir}/fi
-%lang(fr) %{podir}/fr
-%lang(hu) %{podir}/hu
-%lang(it) %{podir}/it
-%lang(nb_NO) %{podir}/nb_NO
-%lang(nl) %{podir}/nl
-%lang(pt) %{podir}/pt
-%lang(pt_BR) %{podir}/pt_BR
-%lang(sv) %{podir}/sv
-%lang(tr) %{podir}/tr
-%lang(zh_CN) %{podir}/zh_CN
-%lang(zh_TW) %{podir}/zh_TW
-%lang(da) %{podir}/da
-%lang(el) %{podir}/el
-%lang(en_GB) %{podir}/en_GB
-%lang(eu) %{podir}/eu
-%lang(ga) %{podir}/ga
-%lang(gl) %{podir}/gl
-%lang(he) %{podir}/he
-%lang(hr) %{podir}/hr
-%lang(is) %{podir}/is
-%lang(ja) %{podir}/ja
-%lang(lv) %{podir}/lv
-%lang(nds) %{podir}/nds
-%lang(nn) %{podir}/nn
-%lang(sl) %{podir}/sl
-%lang(sq) %{podir}/sq
-%lang(sr) %{podir}/sr
-%lang(th) %{podir}/th
-%lang(nb) %{podir}/nb
-%{appdir}/[A-Za-oq-z_]*
-%{appdir}/plugins_base
-%{appdir}/pygif
-%{_bindir}/emesene
-%{menudir}/emesene.desktop
-%{icondir}/emesene.png
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%files -f %name.lang
+%defattr(-,root,root)
+%doc README COPYING
+%attr(755,root,root) %_bindir/%name
+%_mandir/man1/%name.1*
+%{_datadir}/%name/%name
+%{_datadir}/%name/*.py
+%{_datadir}/%name/*.pyc
+%{_datadir}/%name/*.pyo
+%{_datadir}/%name/*.png
+%{_datadir}/%name/abstract
+%{_datadir}/%name/conversation_themes
+%{_datadir}/%name/emesenelib
+%{_datadir}/%name/hotmlog.htm
+%_libdir/%name/libmimic.so
+%{_datadir}/%name/misc
+%{_datadir}/%name/plugins_base
+%{_datadir}/%name/smilies
+%{_datadir}/%name/sound_themes
+%{_datadir}/%name/themes
+%dir %{_datadir}/%name/po
+%{_datadir}/icons/hicolor/48x48/apps/emesene.png
+%{_datadir}/icons/hicolor/scalable/apps/emesene.png
+
+%_datadir/applications/%name.desktop
 
 
 %changelog
+* Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-2
+- Added python-devel to BR.
+
+* Tue Aug 25 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 1.5-1
+- Rewrite spec file
+- Many new features including experimental support for webcams
+- http://emesene-msn.blogspot.com/2009/08/emesene-15-awesome-has-been-released.html
+
+* 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
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Aug 2008 01:02:52 -0000	1.4
+++ sources	25 Aug 2009 05:14:46 -0000	1.5
@@ -1 +1 @@
-49f77e190b8c991c32a07ac07cf88d13  emesene-1.0.1.tar.gz
+b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz


--- emesene.desktop DELETED ---



From allisson at fedoraproject.org  Tue Aug 25 05:16:08 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 25 Aug 2009 05:16:08 +0000 (UTC)
Subject: rpms/emesene/F-10 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 emesene.spec, 1.5, 1.6 sources, 1.4, 1.5 emesene.desktop,
	1.1, NONE
Message-ID: <20090825051608.A993D11C00D7@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20281/F-10

Modified Files:
	.cvsignore emesene.spec sources 
Added Files:
	import.log 
Removed Files:
	emesene.desktop 
Log Message:

Update to 1.5



--- NEW FILE import.log ---
emesene-1_5-2_fc11:F-10:emesene-1.5-2.fc11.src.rpm:1251177353


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Aug 2008 01:02:52 -0000	1.4
+++ .cvsignore	25 Aug 2009 05:16:08 -0000	1.5
@@ -1 +1 @@
-emesene-1.0.1.tar.gz
+emesene-1.5.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/emesene.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- emesene.spec	6 Aug 2008 01:02:52 -0000	1.5
+++ emesene.spec	25 Aug 2009 05:16:08 -0000	1.6
@@ -1,109 +1,133 @@
-%define appdir  %{_datadir}/%{name}
-%define menudir %{_datadir}/applications
-%define icondir %{_datadir}/pixmaps
-%define podir   %{appdir}/po
-
 Name:           emesene
-Version:        1.0.1
-Release:        3%{?dist}
-Summary:        Instant messaging client for Windows Live Messenger (tm) network
+Version:        1.5
+Release:        2%{?dist}
+Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Source1:        emesene.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-
-BuildRequires:  desktop-file-utils, gettext
-Requires:       gtk2
-Requires:       gnome-python2-extras
-Requires:       python
+BuildRequires:  desktop-file-utils, gettext, python-devel
+Requires: gnome-python2-extras
+Requires: python pygtk2
+Requires: dbus-python
+Requires: alsa-utils notify-python
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkspell
+
 
 %description
-emesene is an instant messaging client for Windows Live Messenger (tm) network.
+Emesene is a MSN Messenger client writed in Python and
+GTK. The main idea is to make a client similar to the official MSN
+Messenger client but kepping it simple and with a nice GUI.
+
+Emesene is a python/gtk MSN messenger clone, it uses msnlib (MSNP9)
+and try to be a nice looking and simple MSN client.
+
+You can login, send formated messages, smilies, use autoreply, change
+status, change nick, send nudges and all the stuff you can do in a
+normal MSN client except, file transfers,custom emoticons and display
+picture.
+
+
 
 %prep
 %setup -q
+find -name \*~ |xargs rm -fv
 
 
 %build
-%{nil}
+python setup.py build_ext -i
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT%{appdir}
-%{__install} -d $RPM_BUILD_ROOT%{menudir}
-%{__install} -d $RPM_BUILD_ROOT%{icondir}
-%{__install} -d $RPM_BUILD_ROOT%{_bindir}
-
-%{__cp} -R * $RPM_BUILD_ROOT%{appdir}/
-/bin/echo '%{appdir}/%{name}' > $RPM_BUILD_ROOT%{_bindir}/emesene
-%{__cp} themes/default/trayicon.png $RPM_BUILD_ROOT%{icondir}/emesene.png
-desktop-file-install --dir $RPM_BUILD_ROOT%{menudir}/ %{SOURCE1}
-
-# Controller.py and %{bindir}/emesene should be executable
-%{__chmod} 755 $RPM_BUILD_ROOT%{appdir}/Controller.py
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/emesene
 
-# handling locale files
-#%find_lang %{name}
+install -D -m 644 misc/%name.1 %buildroot%_mandir/man1/%name.1
+install -D -m 644 misc/%name.png %buildroot%_datadir/icons/hicolor/48x48/apps/%name.png
+install -D -m 644 misc/%name.svg %buildroot%_datadir/icons/hicolor/scalable/apps/%name.png
+install -D -m 644 misc/%name.desktop %buildroot%_datadir/applications/%name.desktop
+desktop-file-validate %buildroot%_datadir/applications/%name.desktop
+
+mkdir -p %buildroot%{_libdir}/%name
+
+cp -r ../%name-%version %buildroot%{_datadir}/%name
+cd %buildroot%{_datadir}/%name
+rm -rf COPYING README GPL LGPL emesene.bat Winamp.py misc/%name.desktop misc/%name.1 libmimic build setup.py po/templates/ %name.pot PKG-INFO PSF debug*.list
+
+mv libmimic.so %buildroot%_libdir/%name
+cd po
+for dir in *;do echo "%lang($dir) %{_datadir}/%name/po/$dir" >> $RPM_BUILD_DIR/%name-%version/%name.lang
+done
+
+
+mkdir -p %buildroot%_bindir/
+cat > %buildroot%_bindir/%name << EOF
+#!/bin/sh
+cd %{_datadir}/%name
+exec ./%name
+EOF
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%files -f %name.lang
+%defattr(-,root,root)
+%doc README COPYING
+%attr(755,root,root) %_bindir/%name
+%_mandir/man1/%name.1*
+%{_datadir}/%name/%name
+%{_datadir}/%name/*.py
+%{_datadir}/%name/*.pyc
+%{_datadir}/%name/*.pyo
+%{_datadir}/%name/*.png
+%{_datadir}/%name/abstract
+%{_datadir}/%name/conversation_themes
+%{_datadir}/%name/emesenelib
+%{_datadir}/%name/hotmlog.htm
+%_libdir/%name/libmimic.so
+%{_datadir}/%name/misc
+%{_datadir}/%name/plugins_base
+%{_datadir}/%name/smilies
+%{_datadir}/%name/sound_themes
+%{_datadir}/%name/themes
+%dir %{_datadir}/%name/po
+%{_datadir}/icons/hicolor/48x48/apps/emesene.png
+%{_datadir}/icons/hicolor/scalable/apps/emesene.png
 
-%files
-%defattr(-,root,root,-)
-%doc docs
-%doc COPYING
-%dir %{appdir}
-%dir %{podir}
-%lang(ar) %{podir}/ar
-%lang(ca) %{podir}/ca
-%lang(de) %{podir}/de
-%lang(es) %{podir}/es
-%lang(et) %{podir}/et
-%lang(fi) %{podir}/fi
-%lang(fr) %{podir}/fr
-%lang(hu) %{podir}/hu
-%lang(it) %{podir}/it
-%lang(nb_NO) %{podir}/nb_NO
-%lang(nl) %{podir}/nl
-%lang(pt) %{podir}/pt
-%lang(pt_BR) %{podir}/pt_BR
-%lang(sv) %{podir}/sv
-%lang(tr) %{podir}/tr
-%lang(zh_CN) %{podir}/zh_CN
-%lang(zh_TW) %{podir}/zh_TW
-%lang(da) %{podir}/da
-%lang(el) %{podir}/el
-%lang(en_GB) %{podir}/en_GB
-%lang(eu) %{podir}/eu
-%lang(ga) %{podir}/ga
-%lang(gl) %{podir}/gl
-%lang(he) %{podir}/he
-%lang(hr) %{podir}/hr
-%lang(is) %{podir}/is
-%lang(ja) %{podir}/ja
-%lang(lv) %{podir}/lv
-%lang(nds) %{podir}/nds
-%lang(nn) %{podir}/nn
-%lang(sl) %{podir}/sl
-%lang(sq) %{podir}/sq
-%lang(sr) %{podir}/sr
-%lang(th) %{podir}/th
-%lang(nb) %{podir}/nb
-%{appdir}/[A-Za-oq-z_]*
-%{appdir}/plugins_base
-%{appdir}/pygif
-%{_bindir}/emesene
-%{menudir}/emesene.desktop
-%{icondir}/emesene.png
+%_datadir/applications/%name.desktop
 
 
 %changelog
+* Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-2
+- Added python-devel to BR.
+
+* Tue Aug 25 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 1.5-1
+- Rewrite spec file
+- Many new features including experimental support for webcams
+- http://emesene-msn.blogspot.com/2009/08/emesene-15-awesome-has-been-released.html
+
+* 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
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.1-4
+- Rebuild for Python 2.6
+
 * Wed Aug 06 2008 Caius Chance <cchance at redhat.com> - 1.0.1-3.fc10
 - Resolves: rhbz#456671
   - (MSN servers rejected "application id" which reverted nickname change.)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Aug 2008 01:02:52 -0000	1.4
+++ sources	25 Aug 2009 05:16:08 -0000	1.5
@@ -1 +1 @@
-49f77e190b8c991c32a07ac07cf88d13  emesene-1.0.1.tar.gz
+b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz


--- emesene.desktop DELETED ---



From lucilanga at fedoraproject.org  Tue Aug 25 05:26:49 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 25 Aug 2009 05:26:49 +0000 (UTC)
Subject: rpms/evolution-rss/devel .cvsignore, 1.7, 1.8 evolution-rss.spec,
	1.31, 1.32 sources, 1.8, 1.9
Message-ID: <20090825052649.CBD0511C00D7@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22012

Modified Files:
	.cvsignore evolution-rss.spec sources 
Log Message:
* Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Jul 2009 18:23:24 -0000	1.7
+++ .cvsignore	25 Aug 2009 05:26:49 -0000	1.8
@@ -1 +1 @@
-evolution-rss-0.1.3-20090729.tar.gz
+evolution-rss-0.1.4.tar.gz


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- evolution-rss.spec	29 Jul 2009 18:53:04 -0000	1.31
+++ evolution-rss.spec	25 Aug 2009 05:26:49 -0000	1.32
@@ -2,20 +2,20 @@
 # git clone git://git.gnome.org/evolution-rss
 # git archive --format=tar --prefix=evolution-rss-0.1.3/ %{git_version} | gzip > evolution-rss-0.1.3-%{gitdate}.tar.gz
 
-%define gitdate 20090729
-%define git_version e4d929a
-%define tarfile %{name}-%{version}-%{gitdate}.tar.gz
-%define snapshot %{gitdate}git
+#%define gitdate 20090729
+#%define git_version e4d929a
+#%define tarfile %{name}-%{version}-%{gitdate}.tar.gz
+#%define snapshot %{gitdate}git
 
 
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
-Version:	0.1.3
-Release:	1.%{snapshot}%{?dist}
+Version:	0.1.4
+Release:	1%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
-Source:		%{tarfile}
+Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -41,7 +41,6 @@ This is an evolution plugin which enable
 %setup -q -n evolution-rss-%{version}
 
 %build
-./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -93,6 +92,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
+- new upstream release
+
 * Wed Jul 29 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.3-1.20090729git
 - drop patch0 - fixed upstream
 - update to git snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Jul 2009 18:23:24 -0000	1.8
+++ sources	25 Aug 2009 05:26:49 -0000	1.9
@@ -1 +1 @@
-182a10de49ca492aea64078c2309c4b5  evolution-rss-0.1.3-20090729.tar.gz
+7b3241f4fba1675bc894951d211d5fc6  evolution-rss-0.1.4.tar.gz



From allisson at fedoraproject.org  Tue Aug 25 05:12:44 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 25 Aug 2009 05:12:44 +0000 (UTC)
Subject: rpms/emesene/devel import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 emesene.spec, 1.8, 1.9 sources, 1.4, 1.5 emesene.desktop,
	1.1, NONE
Message-ID: <20090825051244.176F811C00D7@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19530/devel

Modified Files:
	.cvsignore emesene.spec sources 
Added Files:
	import.log 
Removed Files:
	emesene.desktop 
Log Message:

Update to 1.5



--- NEW FILE import.log ---
emesene-1_5-2_fc11:HEAD:emesene-1.5-2.fc11.src.rpm:1251177087


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Aug 2008 01:02:52 -0000	1.4
+++ .cvsignore	25 Aug 2009 05:12:43 -0000	1.5
@@ -1 +1 @@
-emesene-1.0.1.tar.gz
+emesene-1.5.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/emesene.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- emesene.spec	24 Jul 2009 22:08:19 -0000	1.8
+++ emesene.spec	25 Aug 2009 05:12:43 -0000	1.9
@@ -1,109 +1,124 @@
-%define appdir  %{_datadir}/%{name}
-%define menudir %{_datadir}/applications
-%define icondir %{_datadir}/pixmaps
-%define podir   %{appdir}/po
-
 Name:           emesene
-Version:        1.0.1
-Release:        6%{?dist}
-Summary:        Instant messaging client for Windows Live Messenger (tm) network
+Version:        1.5
+Release:        2%{?dist}
+Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Source1:        emesene.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-
-BuildRequires:  desktop-file-utils, gettext
-Requires:       gtk2
-Requires:       gnome-python2-extras
-Requires:       python
+BuildRequires:  desktop-file-utils, gettext, python-devel
+Requires: gnome-python2-extras
+Requires: python pygtk2
+Requires: dbus-python
+Requires: alsa-utils notify-python
+Requires: gnome-python2-extras
+Requires: gnome-python2-gtkspell
+
 
 %description
-emesene is an instant messaging client for Windows Live Messenger (tm) network.
+Emesene is a MSN Messenger client writed in Python and
+GTK. The main idea is to make a client similar to the official MSN
+Messenger client but kepping it simple and with a nice GUI.
+
+Emesene is a python/gtk MSN messenger clone, it uses msnlib (MSNP9)
+and try to be a nice looking and simple MSN client.
+
+You can login, send formated messages, smilies, use autoreply, change
+status, change nick, send nudges and all the stuff you can do in a
+normal MSN client except, file transfers,custom emoticons and display
+picture.
+
+
 
 %prep
 %setup -q
+find -name \*~ |xargs rm -fv
 
 
 %build
-%{nil}
+python setup.py build_ext -i
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT%{appdir}
-%{__install} -d $RPM_BUILD_ROOT%{menudir}
-%{__install} -d $RPM_BUILD_ROOT%{icondir}
-%{__install} -d $RPM_BUILD_ROOT%{_bindir}
-
-%{__cp} -R * $RPM_BUILD_ROOT%{appdir}/
-/bin/echo '%{appdir}/%{name}' > $RPM_BUILD_ROOT%{_bindir}/emesene
-%{__cp} themes/default/trayicon.png $RPM_BUILD_ROOT%{icondir}/emesene.png
-desktop-file-install --dir $RPM_BUILD_ROOT%{menudir}/ %{SOURCE1}
-
-# Controller.py and %{bindir}/emesene should be executable
-%{__chmod} 755 $RPM_BUILD_ROOT%{appdir}/Controller.py
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/emesene
 
-# handling locale files
-#%find_lang %{name}
+install -D -m 644 misc/%name.1 %buildroot%_mandir/man1/%name.1
+install -D -m 644 misc/%name.png %buildroot%_datadir/icons/hicolor/48x48/apps/%name.png
+install -D -m 644 misc/%name.svg %buildroot%_datadir/icons/hicolor/scalable/apps/%name.png
+install -D -m 644 misc/%name.desktop %buildroot%_datadir/applications/%name.desktop
+desktop-file-validate %buildroot%_datadir/applications/%name.desktop
+
+mkdir -p %buildroot%{_libdir}/%name
+
+cp -r ../%name-%version %buildroot%{_datadir}/%name
+cd %buildroot%{_datadir}/%name
+rm -rf COPYING README GPL LGPL emesene.bat Winamp.py misc/%name.desktop misc/%name.1 libmimic build setup.py po/templates/ %name.pot PKG-INFO PSF debug*.list
+
+mv libmimic.so %buildroot%_libdir/%name
+cd po
+for dir in *;do echo "%lang($dir) %{_datadir}/%name/po/$dir" >> $RPM_BUILD_DIR/%name-%version/%name.lang
+done
+
+
+mkdir -p %buildroot%_bindir/
+cat > %buildroot%_bindir/%name << EOF
+#!/bin/sh
+cd %{_datadir}/%name
+exec ./%name
+EOF
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%defattr(-,root,root,-)
-%doc docs
-%doc COPYING
-%dir %{appdir}
-%dir %{podir}
-%lang(ar) %{podir}/ar
-%lang(ca) %{podir}/ca
-%lang(de) %{podir}/de
-%lang(es) %{podir}/es
-%lang(et) %{podir}/et
-%lang(fi) %{podir}/fi
-%lang(fr) %{podir}/fr
-%lang(hu) %{podir}/hu
-%lang(it) %{podir}/it
-%lang(nb_NO) %{podir}/nb_NO
-%lang(nl) %{podir}/nl
-%lang(pt) %{podir}/pt
-%lang(pt_BR) %{podir}/pt_BR
-%lang(sv) %{podir}/sv
-%lang(tr) %{podir}/tr
-%lang(zh_CN) %{podir}/zh_CN
-%lang(zh_TW) %{podir}/zh_TW
-%lang(da) %{podir}/da
-%lang(el) %{podir}/el
-%lang(en_GB) %{podir}/en_GB
-%lang(eu) %{podir}/eu
-%lang(ga) %{podir}/ga
-%lang(gl) %{podir}/gl
-%lang(he) %{podir}/he
-%lang(hr) %{podir}/hr
-%lang(is) %{podir}/is
-%lang(ja) %{podir}/ja
-%lang(lv) %{podir}/lv
-%lang(nds) %{podir}/nds
-%lang(nn) %{podir}/nn
-%lang(sl) %{podir}/sl
-%lang(sq) %{podir}/sq
-%lang(sr) %{podir}/sr
-%lang(th) %{podir}/th
-%lang(nb) %{podir}/nb
-%{appdir}/[A-Za-oq-z_]*
-%{appdir}/plugins_base
-%{appdir}/pygif
-%{_bindir}/emesene
-%{menudir}/emesene.desktop
-%{icondir}/emesene.png
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%files -f %name.lang
+%defattr(-,root,root)
+%doc README COPYING
+%attr(755,root,root) %_bindir/%name
+%_mandir/man1/%name.1*
+%{_datadir}/%name/%name
+%{_datadir}/%name/*.py
+%{_datadir}/%name/*.pyc
+%{_datadir}/%name/*.pyo
+%{_datadir}/%name/*.png
+%{_datadir}/%name/abstract
+%{_datadir}/%name/conversation_themes
+%{_datadir}/%name/emesenelib
+%{_datadir}/%name/hotmlog.htm
+%_libdir/%name/libmimic.so
+%{_datadir}/%name/misc
+%{_datadir}/%name/plugins_base
+%{_datadir}/%name/smilies
+%{_datadir}/%name/sound_themes
+%{_datadir}/%name/themes
+%dir %{_datadir}/%name/po
+%{_datadir}/icons/hicolor/48x48/apps/emesene.png
+%{_datadir}/icons/hicolor/scalable/apps/emesene.png
+
+%_datadir/applications/%name.desktop
 
 
 %changelog
+* Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-2
+- Added python-devel to BR.
+
+* Tue Aug 25 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 1.5-1
+- Rewrite spec file
+- Many new features including experimental support for webcams
+- http://emesene-msn.blogspot.com/2009/08/emesene-15-awesome-has-been-released.html
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Aug 2008 01:02:52 -0000	1.4
+++ sources	25 Aug 2009 05:12:43 -0000	1.5
@@ -1 +1 @@
-49f77e190b8c991c32a07ac07cf88d13  emesene-1.0.1.tar.gz
+b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz


--- emesene.desktop DELETED ---



From cweyl at fedoraproject.org  Tue Aug 25 06:19:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:19:01 +0000 (UTC)
Subject: rpms/perl-Parse-BACKPAN-Packages/devel .cvsignore, 1.2,
	1.3 perl-Parse-BACKPAN-Packages.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090825061901.7CC4211C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31238

Modified Files:
	.cvsignore perl-Parse-BACKPAN-Packages.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
- auto-update to 0.35 (by cpan-spec-update 0.01)
- added a new req on perl(App::Cache) (version 0)
- added a new req on perl(CPAN::DistnameInfo) (version 0)
- added a new req on perl(Class::Accessor::Fast) (version 0)
- added a new req on perl(Compress::Zlib) (version 0)
- added a new req on perl(IO::Zlib) (version 0)
- added a new req on perl(LWP::UserAgent) (version 0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Mar 2009 17:01:57 -0000	1.2
+++ .cvsignore	25 Aug 2009 06:18:59 -0000	1.3
@@ -1 +1 @@
-Parse-BACKPAN-Packages-0.34.tar.gz
+Parse-BACKPAN-Packages-0.35.tar.gz


Index: perl-Parse-BACKPAN-Packages.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel/perl-Parse-BACKPAN-Packages.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Parse-BACKPAN-Packages.spec	26 Jul 2009 14:06:52 -0000	1.2
+++ perl-Parse-BACKPAN-Packages.spec	25 Aug 2009 06:18:59 -0000	1.3
@@ -1,15 +1,15 @@
-Name:       perl-Parse-BACKPAN-Packages 
-Version:    0.34 
-Release:    2%{?dist}
+Name:       perl-Parse-BACKPAN-Packages
+Version:    0.35
+Release:    1%{?dist}
 # lib/Parse/BACKPAN/Packages.pm -> GPL+ or Artistic
 # lib/Parse/BACKPAN/Packages/Distribution.pm -> GPL+ or Artistic
 # lib/Parse/BACKPAN/Packages/File.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Provide an index of BACKPAN 
-Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz 
+Summary:    Provide an index of BACKPAN
+Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/Parse-BACKPAN-Packages
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -29,6 +29,14 @@ BuildRequires: perl(Test::Pod::Coverage)
 # 'use base' strikes again...
 Requires:      perl(Class::Accessor::Chained::Fast)
 
+### auto-added reqs!
+Requires:       perl(App::Cache)
+Requires:       perl(CPAN::DistnameInfo)
+Requires:       perl(Class::Accessor::Fast)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(IO::Zlib)
+Requires:       perl(LWP::UserAgent)
+
 %description
 The Comprehensive Perl Archive Network (CPAN) is a very useful
 collection of Perl code. However, in order to keep CPAN relatively
@@ -59,15 +67,24 @@ find %{buildroot} -depth -type d -exec r
 %{?_with_network_tests: make test }
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README 
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- auto-update to 0.35 (by cpan-spec-update 0.01)
+- added a new req on perl(App::Cache) (version 0)
+- added a new req on perl(CPAN::DistnameInfo) (version 0)
+- added a new req on perl(Class::Accessor::Fast) (version 0)
+- added a new req on perl(Compress::Zlib) (version 0)
+- added a new req on perl(IO::Zlib) (version 0)
+- added a new req on perl(LWP::UserAgent) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -78,4 +95,3 @@ rm -rf %{buildroot} 
 * Thu Mar 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.34-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Mar 2009 17:01:57 -0000	1.2
+++ sources	25 Aug 2009 06:18:59 -0000	1.3
@@ -1 +1 @@
-278a232a6b987e4ff0db45f5ac191f3f  Parse-BACKPAN-Packages-0.34.tar.gz
+984425779933b0125122b9a9c3e5abd8  Parse-BACKPAN-Packages-0.35.tar.gz



From transif at fedoraproject.org  Tue Aug 25 06:21:26 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 25 Aug 2009 06:21:26 +0000 (UTC)
Subject: comps/po zh_TW.po,1.24,1.25
Message-ID: <20090825062126.97C4411C00D7@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31816/po

Modified Files:
	zh_TW.po 
Log Message:
Sending translation for Chinese (Traditional)


Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- zh_TW.po	29 Apr 2009 20:00:24 -0000	1.24
+++ zh_TW.po	25 Aug 2009 06:21:25 -0000	1.25
@@ -1,14 +1,15 @@
-# translation of comps.HEAD.po to
+# translation of comps.HEAD.zh_TW.po to Traditional Chinese
 # Terry Chuang <tchuang at redhat.com>, 2008, 2009.
+# translation of comps.HEAD.po to
 # translation of zh_TW.po to
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD\n"
+"Project-Id-Version: comps.HEAD.zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-04-01 12:33+1000\n"
+"PO-Revision-Date: 2009-08-25 16:17+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
-"Language-Team:  <zh at li.org>\n"
+"Language-Team: Traditional Chinese <en at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -418,15 +419,13 @@ msgstr "??????????????????????????? QT ?
 
 #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
 #: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:93
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
+msgid "Install these tools to enable the system to print or act as a print server."
 msgstr "???????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:83 ../comps-f11.xml.in.h:94 ../comps-el4.xml.in.h:29
 #: ../comps-el5.xml.in.h:31
-msgid ""
-"Install this group of packages to use the base graphical (X) user interface."
+msgid "Install this group of packages to use the base graphical (X) user interface."
 msgstr "???????????????????????????????????????????????????X?????????????????????"
 
 #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:81
@@ -672,8 +671,7 @@ msgstr "?????????"
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:169
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
@@ -803,8 +801,7 @@ msgstr "????????????????????????????????
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:200
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
+msgid "The packages in this group are core libraries needed to develop applications."
 msgstr "??????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
@@ -815,21 +812,18 @@ msgstr "?????????????????????????????? I
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:202
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??????????????????????????? X ?????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:203
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:204
-msgid ""
-"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgid "These packages include network-based servers such as DHCP, Kerberos and NIS."
 msgstr "??????????????????????????????????????????????????? DHCP, Kerberos ??? NIS???"
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
@@ -883,8 +877,7 @@ msgstr "????????????????????????????????
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
-msgstr ""
-"???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
+msgstr "???????????????????????????????????????????????? automake, gcc, perl, python ?????? debuggers???"
 
 #: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
 #: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:213
@@ -940,21 +933,18 @@ msgstr ""
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
-msgstr ""
-"???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:221
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:222
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "?????????????????????????????????????????????????????????????????????"
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
@@ -969,8 +959,7 @@ msgstr ""
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:225
-msgid ""
-"This package group allows you to run a DNS name server (BIND) on the system."
+msgid "This package group allows you to run a DNS name server (BIND) on the system."
 msgstr "???????????????????????????????????????????????? DNS ??????????????????BIND??????"
 
 #: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
@@ -1259,19 +1248,16 @@ msgid "Amazigh Support"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:13
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:27
-#, fuzzy
 msgid "Chichewa Support"
-msgstr "????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:31
-#, fuzzy
 msgid "Coptic Support"
-msgstr "????????????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:37
 msgid "Design and Simulation tools for hardware engineers"
@@ -1282,9 +1268,8 @@ msgid "Electronic Lab"
 msgstr "Electronic Lab?????????????????????"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Fijian Support"
-msgstr "??????????????????"
+msgstr "????????????????????????"
 
 #: ../comps-f11.xml.in.h:61
 msgid "Font design and packaging"
@@ -1299,47 +1284,40 @@ msgid "Friulian Support"
 msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:83
-#, fuzzy
 msgid "Hiligaynon Support"
-msgstr "??????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:96
-#, fuzzy
 msgid "Interlingua Support"
-msgstr "??????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:109
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "????????????????????????"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Latin Support"
-msgstr "?????????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:126
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "????????????????????????"
 
 #: ../comps-f11.xml.in.h:133
-#, fuzzy
 msgid "Maltese Support"
-msgstr "???????????????"
+msgstr "??????????????????"
 
 #: ../comps-f11.xml.in.h:134
-#, fuzzy
 msgid "Manx Support"
-msgstr "???????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
@@ -1358,14 +1336,12 @@ msgid "Online Help and Documentation"
 msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:164
-#, fuzzy
 msgid "Sanskrit Support"
-msgstr "??????????????????"
+msgstr "????????????"
 
 #: ../comps-f11.xml.in.h:165
-#, fuzzy
 msgid "Sardinian Support"
-msgstr "??????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
@@ -1375,8 +1351,7 @@ msgstr "Sugar ????????????"
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
-msgstr ""
-"????????? Feodra ?????? 32 ?????? Windows ???????????????????????????????????????????????????????????????"
+msgstr "????????? Feodra ?????? 32 ?????? Windows ???????????????????????????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:186
 msgid ""
@@ -1385,14 +1360,12 @@ msgid ""
 msgstr "???????????? Objective CAML ??????????????????????????????????????????"
 
 #: ../comps-f11.xml.in.h:188
-#, fuzzy
 msgid "Swahili Support"
-msgstr "??????????????????"
+msgstr "?????????????????????"
 
 #: ../comps-f11.xml.in.h:196
-#, fuzzy
 msgid "Tetum Support"
-msgstr "??????????????????"
+msgstr "???????????????"
 
 #: ../comps-f11.xml.in.h:223
 msgid ""
@@ -1457,18 +1430,15 @@ msgid "This group is a collection of net
 msgstr "????????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????????????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "???????????????????????????????????????????????????"
 
 #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
@@ -1476,6 +1446,6 @@ msgid "XEmacs"
 msgstr "XEmacs"
 
 #: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????????????????????????????????????????"
+



From cweyl at fedoraproject.org  Tue Aug 25 06:21:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:21:09 +0000 (UTC)
Subject: rpms/perl-Class-Accessor-Grouped/devel .cvsignore, 1.5,
	1.6 perl-Class-Accessor-Grouped.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090825062109.B720F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31643

Modified Files:
	.cvsignore perl-Class-Accessor-Grouped.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
- auto-update to 0.09000 (by cpan-spec-update 0.01)
- added a new br on perl(Carp) (version 0)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new br on perl(Scalar::Util) (version 0)
- added a new br on perl(Sub::Identify) (version 0)
- added a new br on perl(Sub::Name) (version 0.04)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(Class::Inspector) (version 0)
- added a new req on perl(MRO::Compat) (version 0)
- added a new req on perl(Scalar::Util) (version 0)
- added a new req on perl(Sub::Name) (version 0.04)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Apr 2009 07:06:38 -0000	1.5
+++ .cvsignore	25 Aug 2009 06:21:09 -0000	1.6
@@ -1 +1 @@
-Class-Accessor-Grouped-0.08003.tar.gz
+Class-Accessor-Grouped-0.09000.tar.gz


Index: perl-Class-Accessor-Grouped.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel/perl-Class-Accessor-Grouped.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Class-Accessor-Grouped.spec	26 Jul 2009 04:20:47 -0000	1.9
+++ perl-Class-Accessor-Grouped.spec	25 Aug 2009 06:21:09 -0000	1.10
@@ -1,26 +1,40 @@
 Name:           perl-Class-Accessor-Grouped
-Version:        0.08003
-Release:        2%{?dist}
+Version:        0.09000
+Release:        1%{?dist}
 Summary:        Lets you build groups of accessors
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-Accessor-Grouped/
-Source0:        http://www.cpan.org/authors/id/C/CL/CLACO/Class-Accessor-Grouped-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/Class-Accessor-Grouped-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(ExtUtils::MakeMaker) 
-#BuildRequires: perl(Carp) 
-#BuildRequires: perl(Scalar::Util) 
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+#BuildRequires: perl(Carp)
+#BuildRequires: perl(Scalar::Util)
 # cpan
-BuildRequires:  perl(Class::Inspector) 
-BuildRequires:  perl(MRO::Compat) 
+BuildRequires:  perl(Class::Inspector)
+BuildRequires:  perl(MRO::Compat)
 # test
 BuildRequires:  perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(Class::Inspector)
+Requires:       perl(MRO::Compat)
+Requires:       perl(Scalar::Util)
+Requires:       perl(Sub::Name) >= 0.04
+
+### auto-added brs!
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Sub::Identify)
+BuildRequires:  perl(Sub::Name) >= 0.04
+BuildRequires:  perl(CPAN)
+
 %description
 This class lets you build groups of accessors that will call different
 getters and setters.
@@ -28,7 +42,7 @@ getters and setters.
 %prep
 %setup -q -n Class-Accessor-Grouped-%{version}
 
-#find t/ -type f -name '*.t' -chmod 
+#find t/ -type f -name '*.t' -chmod
 perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t
 
 # Filter unwanted Provides:
@@ -79,6 +93,20 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
+- auto-update to 0.09000 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp) (version 0)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new br on perl(Scalar::Util) (version 0)
+- added a new br on perl(Sub::Identify) (version 0)
+- added a new br on perl(Sub::Name) (version 0.04)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Class::Inspector) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+- added a new req on perl(Scalar::Util) (version 0)
+- added a new req on perl(Sub::Name) (version 0.04)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08003-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Apr 2009 07:06:38 -0000	1.5
+++ sources	25 Aug 2009 06:21:09 -0000	1.6
@@ -1 +1 @@
-327376dab6b9867685f59a2560fc0ae7  Class-Accessor-Grouped-0.08003.tar.gz
+3e45eaf661a67dfc86becec239712355  Class-Accessor-Grouped-0.09000.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:24:37 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:24:37 +0000 (UTC)
Subject: rpms/perl-MooseX-MethodAttributes/F-11
	perl-MooseX-MethodAttributes.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090825062437.9913A11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32336

Modified Files:
	perl-MooseX-MethodAttributes.spec sources 
Log Message:
* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
- auto-update to 0.15 (by cpan-spec-update 0.01)
- added a new br on perl(MRO::Compat) (version 0)
- added a new req on perl(MRO::Compat) (version 0)
- added a new req on perl(Moose) (version 0.79)
- added a new req on perl(MooseX::Types) (version 0.06)
- added a new req on perl(namespace::clean) (version 0)



Index: perl-MooseX-MethodAttributes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-11/perl-MooseX-MethodAttributes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-MooseX-MethodAttributes.spec	16 Jun 2009 15:39:32 -0000	1.1
+++ perl-MooseX-MethodAttributes.spec	25 Aug 2009 06:24:37 -0000	1.2
@@ -1,5 +1,5 @@
 Name:       perl-MooseX-MethodAttributes
-Version:    0.14
+Version:    0.15
 Release:    1%{?dist}
 # lib/MooseX/MethodAttributes.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -14,11 +14,18 @@ BuildArch:  noarch
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Moose) >= 0.79
 BuildRequires: perl(MooseX::Types) >= 0.06
+BuildRequires: perl(MRO::Compat)
 BuildRequires: perl(namespace::clean)
 # testing
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Exception)
 
+### auto-added reqs!
+Requires:       perl(MRO::Compat)
+Requires:       perl(Moose) >= 0.79
+Requires:       perl(MooseX::Types) >= 0.06
+Requires:       perl(namespace::clean)
+
 %description
 This module allows code attributes of methods to be introspected using
 Moose meta method objects.
@@ -53,6 +60,17 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.15-1
+- auto-update to 0.15 (by cpan-spec-update 0.01)
+- added a new br on perl(MRO::Compat) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+- added a new req on perl(Moose) (version 0.79)
+- added a new req on perl(MooseX::Types) (version 0.06)
+- added a new req on perl(namespace::clean) (version 0)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jun 09 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
 - auto-update to 0.14 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MethodAttributes/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Jun 2009 15:03:09 -0000	1.2
+++ sources	25 Aug 2009 06:24:37 -0000	1.3
@@ -1 +1 @@
-a59f37947f93e9d54da849670467fbe7  MooseX-MethodAttributes-0.14.tar.gz
+c89f2e09781bae3ea17f4421d5c6097b  MooseX-MethodAttributes-0.15.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:26:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:26:24 +0000 (UTC)
Subject: rpms/perl-local-lib/devel .cvsignore, 1.5, 1.6 perl-local-lib.spec, 
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090825062624.1D1BA11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-local-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32620

Modified Files:
	.cvsignore perl-local-lib.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004005-1
- auto-update to 1.004005 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Aug 2009 07:59:17 -0000	1.5
+++ .cvsignore	25 Aug 2009 06:26:23 -0000	1.6
@@ -1 +1 @@
-local-lib-1.004004.tar.gz
+local-lib-1.004005.tar.gz


Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/perl-local-lib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-local-lib.spec	11 Aug 2009 07:59:17 -0000	1.5
+++ perl-local-lib.spec	25 Aug 2009 06:26:23 -0000	1.6
@@ -1,5 +1,5 @@
 Name:       perl-local-lib
-Version:    1.004004
+Version:    1.004005
 Release:    1%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004005-1
+- auto-update to 1.004005 (by cpan-spec-update 0.01)
+
 * Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004004-1
 - auto-update to 1.004004 (by cpan-spec-update 0.01)
 - added a new br on perl(ExtUtils::Install) (version 1.43)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 07:59:17 -0000	1.5
+++ sources	25 Aug 2009 06:26:23 -0000	1.6
@@ -1 +1 @@
-119be92d2d55b8234d9609287725b290  local-lib-1.004004.tar.gz
+80fc0977311592f7937a448c4b6577c5  local-lib-1.004005.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:26:42 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:26:42 +0000 (UTC)
Subject: rpms/perl-Class-Accessor-Grouped/F-11
	perl-Class-Accessor-Grouped.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090825062642.EC0F611C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Accessor-Grouped/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32735

Modified Files:
	perl-Class-Accessor-Grouped.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
- auto-update to 0.09000 (by cpan-spec-update 0.01)
- added a new br on perl(Carp) (version 0)
- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
- added a new br on perl(Scalar::Util) (version 0)
- added a new br on perl(Sub::Identify) (version 0)
- added a new br on perl(Sub::Name) (version 0.04)
- added a new br on CPAN (inc::Module::AutoInstall found)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(Class::Inspector) (version 0)
- added a new req on perl(MRO::Compat) (version 0)
- added a new req on perl(Scalar::Util) (version 0)
- added a new req on perl(Sub::Name) (version 0.04)



Index: perl-Class-Accessor-Grouped.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/F-11/perl-Class-Accessor-Grouped.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Class-Accessor-Grouped.spec	2 Apr 2009 07:06:38 -0000	1.8
+++ perl-Class-Accessor-Grouped.spec	25 Aug 2009 06:26:42 -0000	1.9
@@ -1,26 +1,40 @@
 Name:           perl-Class-Accessor-Grouped
-Version:        0.08003
+Version:        0.09000
 Release:        1%{?dist}
 Summary:        Lets you build groups of accessors
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-Accessor-Grouped/
-Source0:        http://www.cpan.org/authors/id/C/CL/CLACO/Class-Accessor-Grouped-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/Class-Accessor-Grouped-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # core
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(ExtUtils::MakeMaker) 
-#BuildRequires: perl(Carp) 
-#BuildRequires: perl(Scalar::Util) 
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+#BuildRequires: perl(Carp)
+#BuildRequires: perl(Scalar::Util)
 # cpan
-BuildRequires:  perl(Class::Inspector) 
-BuildRequires:  perl(MRO::Compat) 
+BuildRequires:  perl(Class::Inspector)
+BuildRequires:  perl(MRO::Compat)
 # test
 BuildRequires:  perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(Class::Inspector)
+Requires:       perl(MRO::Compat)
+Requires:       perl(Scalar::Util)
+Requires:       perl(Sub::Name) >= 0.04
+
+### auto-added brs!
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Sub::Identify)
+BuildRequires:  perl(Sub::Name) >= 0.04
+BuildRequires:  perl(CPAN)
+
 %description
 This class lets you build groups of accessors that will call different
 getters and setters.
@@ -28,7 +42,7 @@ getters and setters.
 %prep
 %setup -q -n Class-Accessor-Grouped-%{version}
 
-#find t/ -type f -name '*.t' -chmod 
+#find t/ -type f -name '*.t' -chmod
 perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t
 
 # Filter unwanted Provides:
@@ -79,6 +93,23 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09000-1
+- auto-update to 0.09000 (by cpan-spec-update 0.01)
+- added a new br on perl(Carp) (version 0)
+- altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)
+- added a new br on perl(Scalar::Util) (version 0)
+- added a new br on perl(Sub::Identify) (version 0)
+- added a new br on perl(Sub::Name) (version 0.04)
+- added a new br on CPAN (inc::Module::AutoInstall found)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Class::Inspector) (version 0)
+- added a new req on perl(MRO::Compat) (version 0)
+- added a new req on perl(Scalar::Util) (version 0)
+- added a new req on perl(Sub::Name) (version 0.04)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08003-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 02 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.08003-1
 - update to 0.08003
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor-Grouped/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Apr 2009 07:06:38 -0000	1.5
+++ sources	25 Aug 2009 06:26:42 -0000	1.6
@@ -1 +1 @@
-327376dab6b9867685f59a2560fc0ae7  Class-Accessor-Grouped-0.08003.tar.gz
+3e45eaf661a67dfc86becec239712355  Class-Accessor-Grouped-0.09000.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:30:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:30:48 +0000 (UTC)
Subject: rpms/perl-Object-InsideOut/devel .cvsignore, 1.10,
	1.11 perl-Object-InsideOut.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20090825063048.B0E4F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv911

Modified Files:
	.cvsignore perl-Object-InsideOut.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 3.56-1
- auto-update to 3.56 (by cpan-spec-update 0.01)
- altered br on perl(Scalar::Util) (1.19 => 1.21)
- added a new req on perl(B) (version 0)
- added a new req on perl(Config) (version 0)
- added a new req on perl(Data::Dumper) (version 0)
- added a new req on perl(Exception::Class) (version 1.29)
- added a new req on perl(Scalar::Util) (version 1.21)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 May 2009 06:20:02 -0000	1.10
+++ .cvsignore	25 Aug 2009 06:30:47 -0000	1.11
@@ -1 +1 @@
-Object-InsideOut-3.55.tar.gz
+Object-InsideOut-3.56.tar.gz


Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/perl-Object-InsideOut.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Object-InsideOut.spec	26 Jul 2009 13:51:52 -0000	1.13
+++ perl-Object-InsideOut.spec	25 Aug 2009 06:30:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Object-InsideOut
-Version:        3.55
-Release:        2%{?dist}
+Version:        3.56
+Release:        1%{?dist}
 Summary:        Comprehensive inside-out object support module
 
 Group:          Development/Libraries
@@ -20,11 +20,18 @@ Requires:  perl(:MODULE_COMPAT_%(eval "`
 ### auto-added brs!
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Data::Dumper)
-BuildRequires:  perl(Scalar::Util) >= 1.19
+BuildRequires:  perl(Scalar::Util) >= 1.21
 BuildRequires:  perl(Config)
 BuildRequires:  perl(Test::More) >= 0.5
 BuildRequires:  perl(B)
 
+### auto-added reqs!
+Requires:       perl(B)
+Requires:       perl(Config)
+Requires:       perl(Data::Dumper)
+Requires:       perl(Exception::Class) >= 1.29
+Requires:       perl(Scalar::Util) >= 1.21
+
 %description
 This module provides comprehensive support for implementing classes using the
 inside-out object model.
@@ -92,6 +99,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 3.56-1
+- auto-update to 3.56 (by cpan-spec-update 0.01)
+- altered br on perl(Scalar::Util) (1.19 => 1.21)
+- added a new req on perl(B) (version 0)
+- added a new req on perl(Config) (version 0)
+- added a new req on perl(Data::Dumper) (version 0)
+- added a new req on perl(Exception::Class) (version 1.29)
+- added a new req on perl(Scalar::Util) (version 1.21)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.55-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 May 2009 06:20:03 -0000	1.10
+++ sources	25 Aug 2009 06:30:47 -0000	1.11
@@ -1 +1 @@
-d1b08cac98b65e4b8f3239c6a3e8fc06  Object-InsideOut-3.55.tar.gz
+a7b2ade392eb7582f38177ceb675ffb0  Object-InsideOut-3.56.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:32:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:32:07 +0000 (UTC)
Subject: rpms/perl-POE/devel .cvsignore, 1.11, 1.12 perl-POE.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090825063207.62CD111C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1221

Modified Files:
	.cvsignore perl-POE.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
- auto-update to 1.007 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jun 2009 07:22:52 -0000	1.11
+++ .cvsignore	25 Aug 2009 06:32:06 -0000	1.12
@@ -1 +1 @@
-POE-1.006.tar.gz
+POE-1.007.tar.gz


Index: perl-POE.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/perl-POE.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-POE.spec	26 Jul 2009 13:55:34 -0000	1.17
+++ perl-POE.spec	25 Aug 2009 06:32:07 -0000	1.18
@@ -1,6 +1,6 @@
 Name:      perl-POE
-Version:   1.006
-Release:   2%{?dist}
+Version:   1.007
+Release:   1%{?dist}
 Summary:   POE - portable multitasking and networking framework for Perl
 
 Group:     Development/Libraries
@@ -45,13 +45,25 @@ BuildRequires:  perl(Errno) >= 1.09
 BuildRequires:  perl(IO::Handle) >= 1.27
 BuildRequires:  perl(Socket) >= 1.7
 BuildRequires:  perl(IO::Tty) >= 1.08
-BuildRequires:  perl(POE::Test::Loops) >= 1.004
+BuildRequires:  perl(POE::Test::Loops) >= 1.021
 BuildRequires:  perl(POSIX) >= 1.02
 BuildRequires:  perl(File::Spec) >= 0.87
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Test::Harness) >= 2.26
 BuildRequires:  perl(Carp)
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(Errno) >= 1.09
+Requires:       perl(Exporter)
+Requires:       perl(File::Spec) >= 0.87
+Requires:       perl(IO::Handle) >= 1.27
+Requires:       perl(IO::Tty) >= 1.08
+Requires:       perl(POE::Test::Loops) >= 1.021
+Requires:       perl(POSIX) >= 1.02
+Requires:       perl(Socket) >= 1.7
+Requires:       perl(Storable) >= 2.16
+
 %description
 POE is a framework for cooperative, event driven multitasking in Perl.
 Other languages have similar frameworks. Python has Twisted. TCL has "the
@@ -142,6 +154,23 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
+- auto-update to 1.007 (by cpan-spec-update 0.01)
+
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
+- auto-update to 1.007 (by cpan-spec-update 0.01)
+- altered br on perl(POE::Test::Loops) (1.004 => 1.021)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(Errno) (version 1.09)
+- added a new req on perl(Exporter) (version 0)
+- added a new req on perl(File::Spec) (version 0.87)
+- added a new req on perl(IO::Handle) (version 1.27)
+- added a new req on perl(IO::Tty) (version 1.08)
+- added a new req on perl(POE::Test::Loops) (version 1.021)
+- added a new req on perl(POSIX) (version 1.02)
+- added a new req on perl(Socket) (version 1.7)
+- added a new req on perl(Storable) (version 2.16)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.006-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jun 2009 07:22:53 -0000	1.11
+++ sources	25 Aug 2009 06:32:07 -0000	1.12
@@ -1 +1 @@
-13c4ee6ab28b5ca1d031e654a50a3859  POE-1.006.tar.gz
+c7e8822bd11ed36a2f716f60e58da2e6  POE-1.007.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:34:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:34:08 +0000 (UTC)
Subject: rpms/perl-local-lib/F-11 perl-local-lib.spec, 1.2, 1.3 sources, 1.3,
	1.4
Message-ID: <20090825063408.7AEF911C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-local-lib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2441

Modified Files:
	perl-local-lib.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004005-1
- auto-update to 1.004005 (by cpan-spec-update 0.01)



Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/F-11/perl-local-lib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-local-lib.spec	19 May 2009 05:59:11 -0000	1.2
+++ perl-local-lib.spec	25 Aug 2009 06:34:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:       perl-local-lib
-Version:    1.004000
+Version:    1.004005
 Release:    1%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -19,6 +19,17 @@ BuildRequires: perl(Module::Build) >= 0.
 # testing...
 BuildRequires: perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(CPAN) >= 1.80
+Requires:       perl(ExtUtils::CBuilder)
+Requires:       perl(ExtUtils::Install) >= 1.43
+Requires:       perl(ExtUtils::MakeMaker) >= 6.31
+Requires:       perl(ExtUtils::ParseXS)
+Requires:       perl(Module::Build) >= 0.28
+
+### auto-added brs!
+BuildRequires:  perl(ExtUtils::Install) >= 1.43
+
 %description
 This module provides a quick, convenient way of bootstrapping a user-
 local Perl module library located within the user's home directory. It
@@ -63,6 +74,25 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004005-1
+- auto-update to 1.004005 (by cpan-spec-update 0.01)
+
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004004-1
+- auto-update to 1.004004 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::Install) (version 1.43)
+- added a new req on perl(CPAN) (version 1.80)
+- added a new req on perl(ExtUtils::CBuilder) (version 0)
+- added a new req on perl(ExtUtils::Install) (version 1.43)
+- added a new req on perl(ExtUtils::MakeMaker) (version 6.31)
+- added a new req on perl(ExtUtils::ParseXS) (version 0)
+- added a new req on perl(Module::Build) (version 0.28)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.004001-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 03 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004001-1
+- auto-update to 1.004001 (by cpan-spec-update 0.01)
+
 * Tue May 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004000-1
 - auto-update to 1.004000 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (6.31 => 6.42)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 May 2009 05:59:11 -0000	1.3
+++ sources	25 Aug 2009 06:34:08 -0000	1.4
@@ -1 +1 @@
-c009951bbedbd9042505353361b1edfe  local-lib-1.004000.tar.gz
+80fc0977311592f7937a448c4b6577c5  local-lib-1.004005.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:34:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:34:40 +0000 (UTC)
Subject: rpms/perl-Parse-BACKPAN-Packages/F-11
	perl-Parse-BACKPAN-Packages.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090825063440.7594E11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2609

Modified Files:
	perl-Parse-BACKPAN-Packages.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
- auto-update to 0.35 (by cpan-spec-update 0.01)
- added a new req on perl(App::Cache) (version 0)
- added a new req on perl(CPAN::DistnameInfo) (version 0)
- added a new req on perl(Class::Accessor::Fast) (version 0)
- added a new req on perl(Compress::Zlib) (version 0)
- added a new req on perl(IO::Zlib) (version 0)
- added a new req on perl(LWP::UserAgent) (version 0)



Index: perl-Parse-BACKPAN-Packages.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-11/perl-Parse-BACKPAN-Packages.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Parse-BACKPAN-Packages.spec	9 Mar 2009 17:01:57 -0000	1.1
+++ perl-Parse-BACKPAN-Packages.spec	25 Aug 2009 06:34:40 -0000	1.2
@@ -1,15 +1,15 @@
-Name:       perl-Parse-BACKPAN-Packages 
-Version:    0.34 
+Name:       perl-Parse-BACKPAN-Packages
+Version:    0.35
 Release:    1%{?dist}
 # lib/Parse/BACKPAN/Packages.pm -> GPL+ or Artistic
 # lib/Parse/BACKPAN/Packages/Distribution.pm -> GPL+ or Artistic
 # lib/Parse/BACKPAN/Packages/File.pm -> GPL+ or Artistic
-License:    GPL+ or Artistic 
+License:    GPL+ or Artistic
 Group:      Development/Libraries
-Summary:    Provide an index of BACKPAN 
-Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz 
+Summary:    Provide an index of BACKPAN
+Source:     http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-BACKPAN-Packages-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/Parse-BACKPAN-Packages
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch:  noarch
 
@@ -29,6 +29,14 @@ BuildRequires: perl(Test::Pod::Coverage)
 # 'use base' strikes again...
 Requires:      perl(Class::Accessor::Chained::Fast)
 
+### auto-added reqs!
+Requires:       perl(App::Cache)
+Requires:       perl(CPAN::DistnameInfo)
+Requires:       perl(Class::Accessor::Fast)
+Requires:       perl(Compress::Zlib)
+Requires:       perl(IO::Zlib)
+Requires:       perl(LWP::UserAgent)
+
 %description
 The Comprehensive Perl Archive Network (CPAN) is a very useful
 collection of Perl code. However, in order to keep CPAN relatively
@@ -59,15 +67,27 @@ find %{buildroot} -depth -type d -exec r
 %{?_with_network_tests: make test }
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README 
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-1
+- auto-update to 0.35 (by cpan-spec-update 0.01)
+- added a new req on perl(App::Cache) (version 0)
+- added a new req on perl(CPAN::DistnameInfo) (version 0)
+- added a new req on perl(Class::Accessor::Fast) (version 0)
+- added a new req on perl(Compress::Zlib) (version 0)
+- added a new req on perl(IO::Zlib) (version 0)
+- added a new req on perl(LWP::UserAgent) (version 0)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.34-1
 - submission
 - conditionalize tests; they require network access
@@ -75,4 +95,3 @@ rm -rf %{buildroot} 
 * Thu Mar 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.34-0
 - initial RPM packaging
 - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-BACKPAN-Packages/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Mar 2009 17:01:57 -0000	1.2
+++ sources	25 Aug 2009 06:34:40 -0000	1.3
@@ -1 +1 @@
-278a232a6b987e4ff0db45f5ac191f3f  Parse-BACKPAN-Packages-0.34.tar.gz
+984425779933b0125122b9a9c3e5abd8  Parse-BACKPAN-Packages-0.35.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:37:21 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:37:21 +0000 (UTC)
Subject: rpms/perl-Class-Method-Modifiers/F-11
	perl-Class-Method-Modifiers.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090825063721.C233F11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-Method-Modifiers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3143

Modified Files:
	perl-Class-Method-Modifiers.spec sources 
Log Message:
* Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
- auto-update to 1.04 (by cpan-spec-update 0.01)



Index: perl-Class-Method-Modifiers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/F-11/perl-Class-Method-Modifiers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Class-Method-Modifiers.spec	8 Jun 2009 05:58:10 -0000	1.5
+++ perl-Class-Method-Modifiers.spec	25 Aug 2009 06:37:21 -0000	1.6
@@ -1,6 +1,6 @@
 
 Name:       perl-Class-Method-Modifiers
-Version:    1.02
+Version:    1.04
 Release:    1%{?dist}
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -65,6 +65,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Jul 31 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
+- auto-update to 1.04 (by cpan-spec-update 0.01)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.02-1
 - auto-update to 1.02 (by cpan-spec-update 0.01)
 - altered br on perl(ExtUtils::MakeMaker) (0 => 6.42)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Method-Modifiers/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jun 2009 05:58:10 -0000	1.3
+++ sources	25 Aug 2009 06:37:21 -0000	1.4
@@ -1 +1 @@
-8f7564176826b01f5b1deab8a73646d3  Class-Method-Modifiers-1.02.tar.gz
+bf278d379903849d492ab975d6504cbe  Class-Method-Modifiers-1.04.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:38:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:38:34 +0000 (UTC)
Subject: rpms/perl-Object-InsideOut/F-11 perl-Object-InsideOut.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <20090825063834.88E4911C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Object-InsideOut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3362

Modified Files:
	perl-Object-InsideOut.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 3.56-1
- auto-update to 3.56 (by cpan-spec-update 0.01)
- altered br on perl(Scalar::Util) (1.19 => 1.21)
- added a new req on perl(B) (version 0)
- added a new req on perl(Config) (version 0)
- added a new req on perl(Data::Dumper) (version 0)
- added a new req on perl(Exception::Class) (version 1.29)
- added a new req on perl(Scalar::Util) (version 1.21)



Index: perl-Object-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/F-11/perl-Object-InsideOut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Object-InsideOut.spec	26 Feb 2009 23:40:38 -0000	1.11
+++ perl-Object-InsideOut.spec	25 Aug 2009 06:38:33 -0000	1.12
@@ -1,21 +1,37 @@
 Name:           perl-Object-InsideOut
-Version:        3.51
-Release:        2%{?dist}
-Summary:        Comprehensive inside-out object support module 
+Version:        3.56
+Release:        1%{?dist}
+Summary:        Comprehensive inside-out object support module
 
 Group:          Development/Libraries
-License:        GPL+ or Artistic        
-URL:            http://search.cpan.org/dist/Object-InsideOut            
+License:        GPL+ or Artistic
+URL:            http://search.cpan.org/dist/Object-InsideOut
 Source0: http://search.cpan.org/CPAN/authors/id/J/JD/JDHEDDEN/Object-InsideOut-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Exception::Class) >= 1.22
+BuildRequires:  perl(Exception::Class) >= 1.29
 BuildRequires:  perl(Want) >= 0.12
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+### auto-added brs!
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(Scalar::Util) >= 1.21
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Test::More) >= 0.5
+BuildRequires:  perl(B)
+
+### auto-added reqs!
+Requires:       perl(B)
+Requires:       perl(Config)
+Requires:       perl(Data::Dumper)
+Requires:       perl(Exception::Class) >= 1.29
+Requires:       perl(Scalar::Util) >= 1.21
+
 %description
 This module provides comprehensive support for implementing classes using the
 inside-out object model.
@@ -48,7 +64,7 @@ cat << \EOF > %{name}-prov
     sed -e '/^perl(Object::InsideOut)$/d'
 EOF
 
-%define __perl_provides %{_builddir}/Object-InsideOut-%{version}/%{name}-prov 
+%define __perl_provides %{_builddir}/Object-InsideOut-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 
@@ -83,6 +99,28 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 3.56-1
+- auto-update to 3.56 (by cpan-spec-update 0.01)
+- altered br on perl(Scalar::Util) (1.19 => 1.21)
+- added a new req on perl(B) (version 0)
+- added a new req on perl(Config) (version 0)
+- added a new req on perl(Data::Dumper) (version 0)
+- added a new req on perl(Exception::Class) (version 1.29)
+- added a new req on perl(Scalar::Util) (version 1.21)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.55-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 3.55-1
+- auto-update to 3.55 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::MakeMaker) (version 0)
+- added a new br on perl(Data::Dumper) (version 0)
+- added a new br on perl(Scalar::Util) (version 1.19)
+- added a new br on perl(Config) (version 0)
+- added a new br on perl(Test::More) (version 0.5)
+- altered br on perl(Exception::Class) (1.22 => 1.29)
+- added a new br on perl(B) (version 0)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.51-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -118,7 +156,7 @@ rm -rf %{buildroot}
 - drop some unneeded bits from the spec
 
 * Wed Jul  5 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.45-1
-- bump release for build 
+- bump release for build
 
 * Mon Jul  3 2006 Chris Weyl <cweyl at alumni.drew.edu> 1.45-0.1
 - corrected url's.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-InsideOut/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Oct 2008 06:24:52 -0000	1.9
+++ sources	25 Aug 2009 06:38:34 -0000	1.10
@@ -1 +1 @@
-220951eaa39f7055db6b5aac35ccd337  Object-InsideOut-3.51.tar.gz
+a7b2ade392eb7582f38177ceb675ffb0  Object-InsideOut-3.56.tar.gz



From cweyl at fedoraproject.org  Tue Aug 25 06:47:27 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:47:27 +0000 (UTC)
Subject: rpms/perl-POE-API-Peek/devel .cvsignore, 1.4,
	1.5 perl-POE-API-Peek.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090825064727.7240D11C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-API-Peek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4392

Modified Files:
	.cvsignore perl-POE-API-Peek.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1:1.34-1
- drop old workarounds
- auto-update to 1.34 (by cpan-spec-update 0.01)
- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
- altered br on perl(POE) (0.29 => 1.0001)
- added a new br on perl(Test::Distribution) (version 0)
- added a new br on perl(Test::NoWarnings) (version 0)
- added a new br on perl(Test::Pod::Coverage) (version 0)
- added a new req on perl(Devel::Size) (version 0)
- added a new req on perl(POE) (version 1.0001)
- Add epoch of 1 (1.0802 => 1.34)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Mar 2007 16:11:09 -0000	1.4
+++ .cvsignore	25 Aug 2009 06:47:26 -0000	1.5
@@ -1 +1 @@
-POE-API-Peek-1.0802.tar.gz
+POE-API-Peek-1.34.tar.gz


Index: perl-POE-API-Peek.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/perl-POE-API-Peek.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-POE-API-Peek.spec	26 Jul 2009 13:55:50 -0000	1.8
+++ perl-POE-API-Peek.spec	25 Aug 2009 06:47:27 -0000	1.9
@@ -1,37 +1,29 @@
-# Note:  The signature check for this perl dist. is disabled by default, as it
-# requires network access and would thus fail in the buildsys' mock
-# environments.  To build locally while enabling the test, either:
-#
-#   rpmbuild ... --define '_with_network_tests 1' ...
-#   rpmbuild ... --with network_tests ...
-#   define _with_network_tests 1 in your ~/.rpmmacros
-#
-# Note that right now, the only way to run tests locally from a cvs sandbox
-# "make noarch" type scenario is the third one.
-
 Name:           perl-POE-API-Peek
-Version:        1.0802
-Release:        5%{?dist}
+Epoch:          1
+Version:        1.34
+Release:        1%{?dist}
 Summary:        Peek into the internals of a running POE environment
 License:        BSD
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/POE-API-Peek/
-Source0:        http://www.cpan.org/authors/id/S/SU/SUNGO/POE-API-Peek-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SU/SUNGO/POE-API-Peek-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Devel::Size)
-BuildRequires:  perl(POE) >= 0.29
+BuildRequires:  perl(POE) >= 1.0001
 BuildRequires:  perl(Test::More)
 
-%{?_with_network_tests:BuildRequires: perl(Module::Signature) }
-
-## cpanspec autogenerated -- retained for the curious
-#Requires:       perl(Devel::Size)
-#Requires:       perl(POE) >= 0.29
-
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+### auto-added reqs!
+Requires:       perl(Devel::Size)
+Requires:       perl(POE) >= 1.0001
+
+### auto-added brs!
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(Test::Distribution)
+BuildRequires:  perl(Test::NoWarnings)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 %description
 POE::API::Peek extends the POE::Kernel interface to provide clean access to
@@ -41,9 +33,6 @@ data is also available.
 %prep
 %setup -q -n POE-API-Peek-%{version}
 
-# do this now, as our next few lines with disturb the signed package
-%{?_with_network_tests: perl t/000-signature.t}
-
 # beat $VERSION into submission, for proper auto-provides
 cd lib/POE/API
 MODVER=$(echo `grep 'our $VERSION' Peek.pm` '; print $VERSION;' | perl)
@@ -64,9 +53,6 @@ find %{buildroot} -depth -type d -exec r
 %{_fixperms} %{buildroot}/*
 
 %check
-# if we were going to do this, it'd be done already :)
-rm t/000-signature.t
-
 make test
 
 %clean
@@ -74,11 +60,23 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README 
+%doc LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1:1.34-1
+- drop old workarounds
+- auto-update to 1.34 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::MakeMaker) (version 6.42)
+- altered br on perl(POE) (0.29 => 1.0001)
+- added a new br on perl(Test::Distribution) (version 0)
+- added a new br on perl(Test::NoWarnings) (version 0)
+- added a new br on perl(Test::Pod::Coverage) (version 0)
+- added a new req on perl(Devel::Size) (version 0)
+- added a new req on perl(POE) (version 1.0001)
+- Add epoch of 1 (1.0802 => 1.34)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0802-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-API-Peek/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Mar 2007 16:11:09 -0000	1.4
+++ sources	25 Aug 2009 06:47:27 -0000	1.5
@@ -1 +1 @@
-1f8af31c4bf49ca18bcb76e8790cd4f7  POE-API-Peek-1.0802.tar.gz
+4c483bd98f7e0b45787dc8085f5c73ba  POE-API-Peek-1.34.tar.gz



From lucilanga at fedoraproject.org  Tue Aug 25 06:48:54 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 25 Aug 2009 06:48:54 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss.spec,1.32,1.33
Message-ID: <20090825064854.A740F11C00D7@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4702

Modified Files:
	evolution-rss.spec 
Log Message:
* Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
- force main render gecko
- new upstream release


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- evolution-rss.spec	25 Aug 2009 05:26:49 -0000	1.32
+++ evolution-rss.spec	25 Aug 2009 06:48:54 -0000	1.33
@@ -41,7 +41,7 @@ This is an evolution plugin which enable
 %setup -q -n evolution-rss-%{version}
 
 %build
-%configure
+%configure --with-primary-render=gecko
 make %{?_smp_mflags}
 
 %install
@@ -93,6 +93,7 @@ fi
 
 %changelog
 * Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
+- force main render gecko
 - new upstream release
 
 * Wed Jul 29 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.3-1.20090729git



From cweyl at fedoraproject.org  Tue Aug 25 06:50:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Tue, 25 Aug 2009 06:50:56 +0000 (UTC)
Subject: rpms/perl-POE-Component-Client-DNS/devel .cvsignore, 1.4,
	1.5 perl-POE-Component-Client-DNS.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090825065056.6AFE911C00D7@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5132

Modified Files:
	.cvsignore perl-POE-Component-Client-DNS.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
- auto-update to 1.04 (by cpan-spec-update 0.01)
- added a new br on perl(ExtUtils::MakeMaker) (version 0)
- altered br on perl(POE) (0.31 => 1.007)
- added a new req on perl(Net::DNS) (version 0.59)
- added a new req on perl(POE) (version 1.007)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 May 2009 05:16:24 -0000	1.4
+++ .cvsignore	25 Aug 2009 06:50:56 -0000	1.5
@@ -1 +1 @@
-POE-Component-Client-DNS-1.03.tar.gz
+POE-Component-Client-DNS-1.04.tar.gz


Index: perl-POE-Component-Client-DNS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Client-DNS/devel/perl-POE-Component-Client-DNS.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-POE-Component-Client-DNS.spec	26 Jul 2009 13:56:21 -0000	1.8
+++ perl-POE-Component-Client-DNS.spec	25 Aug 2009 06:50:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Client-DNS
-Version:        1.03
-Release:        2%{?dist}
+Version:        1.04
+Release:        1%{?dist}
 Summary:        Non-blocking/concurrent DNS queries using Net::DNS and POE
 
 Group:          Development/Libraries
@@ -11,12 +11,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
-BuildRequires:  perl(POE) >= 0.31
+BuildRequires:  perl(POE) >= 1.007
 BuildRequires:  perl(Net::DNS) >= 0.59
-
-### auto-added brs!
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 
+### auto-added reqs!
+Requires:       perl(Net::DNS) >= 0.59
+Requires:       perl(POE) >= 1.007
+
 %description
 POE::Component::Client::DNS provides a facility for non-blocking, concurrent
 DNS requests. Using POE, it allows other tasks to run while waiting for name
@@ -63,6 +66,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.04-1
+- auto-update to 1.04 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::MakeMaker) (version 0)
+- altered br on perl(POE) (0.31 => 1.007)
+- added a new req on perl(Net::DNS) (version 0.59)
+- added a new req on perl(POE) (version 1.007)
+
 * Sun Jul 26 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/extras/rpms/perl-POE-Component-Client-DNS/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 May 2009 05:16:24 -0000	1.4
+++ sources	25 Aug 2009 06:50:56 -0000	1.5
@@ -1 +1 @@
-d1e01606205819d7f694c22e8ad90a92  POE-Component-Client-DNS-1.03.tar.gz
+81328c4af17a40e34d5f37fe5768f428  POE-Component-Client-DNS-1.04.tar.gz



From lucilanga at fedoraproject.org  Tue Aug 25 06:52:18 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 25 Aug 2009 06:52:18 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 .cvsignore, 1.6, 1.7 evolution-rss.spec,
	1.29, 
	1.30 sources, 1.7, 1.8 evolution-rss-0.1.2-updateinterval.patch,
	1.1, NONE
Message-ID: <20090825065218.E3E0411C00D7@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5450

Modified Files:
	.cvsignore evolution-rss.spec sources 
Removed Files:
	evolution-rss-0.1.2-updateinterval.patch 
Log Message:
* Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
- force main render gecko
- drop patch0 fixed upstream
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	19 Nov 2008 15:13:55 -0000	1.6
+++ .cvsignore	25 Aug 2009 06:52:18 -0000	1.7
@@ -1 +1 @@
-evolution-rss-0.1.2.tar.gz
+evolution-rss-0.1.4.tar.gz


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- evolution-rss.spec	3 Aug 2009 23:02:57 -0000	1.29
+++ evolution-rss.spec	25 Aug 2009 06:52:18 -0000	1.30
@@ -1,12 +1,11 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
-Version:	0.1.2
-Release:	12%{?dist}
+Version:	0.1.4
+Release:	1%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
-Patch0:		evolution-rss-0.1.2-updateinterval.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -29,10 +28,9 @@ This is an evolution plugin which enable
 
 %prep
 %setup -q -n evolution-rss-%{version}
-%patch0 -p0 -b .updateinterval
 
 %build
-%configure
+%configure --with-primary-render=gecko
 make %{?_smp_mflags}
 
 %install
@@ -83,6 +81,11 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
+- force main render gecko
+- drop patch0 fixed upstream
+- new upstream release
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.1.2-12
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Nov 2008 15:13:55 -0000	1.7
+++ sources	25 Aug 2009 06:52:18 -0000	1.8
@@ -1 +1 @@
-a7c04b6f330c49785d34f59a19537798  evolution-rss-0.1.2.tar.gz
+7b3241f4fba1675bc894951d211d5fc6  evolution-rss-0.1.4.tar.gz


--- evolution-rss-0.1.2-updateinterval.patch DELETED ---



From salimma at fedoraproject.org  Tue Aug 25 07:02:01 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 25 Aug 2009 07:02:01 +0000 (UTC)
Subject: rpms/mono/devel mono.spec,1.139,1.140
Message-ID: <20090825070201.AB31211C00D7@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6502

Modified Files:
	mono.spec 
Log Message:
* 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
    monodoc, mono-extras and mono-web
  * mono-web no longer pull in mono-extras



Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- mono.spec	29 Jul 2009 22:22:57 -0000	1.139
+++ mono.spec	25 Aug 2009 07:02:01 -0000	1.140
@@ -1,8 +1,8 @@
-#%define svnver	138447
+#%define svnver 138447
 
 Name:           mono
 Version:        2.4.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -57,7 +57,7 @@ metadata access libraries.
 %package core
 Summary:        The Mono CIL runtime, suitable for running .NET code
 Group:          Development/Languages
-Requires:	libgdiplus
+Requires:       libgdiplus
 
 %description core
 This package contains the core of the Mono runtime including its
@@ -78,7 +78,7 @@ assembler and other various tools.
 
 %package nunit
 Summary:        NUnit Testing Framework
-License:	zlib with acknowledgement
+License:        zlib with acknowledgement
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
 Requires:       glib2-devel
@@ -141,6 +141,15 @@ This package provides a fully managed im
 System.Windows.Forms, the default graphical toolkit for .NET
 applications.
 
+%package wcf
+Summary:        Mono implementation of Windows Communication Foundation
+Group:          Development/Languages
+Requires:       mono-core = %{version}-%{release}
+
+%description wcf
+This package provides an implementation of WCF, the Windows Communication
+Foundation.
+
 %package web
 Summary:        ASP.NET, Remoting, and Web Services for Mono
 Group:          Development/Languages
@@ -154,7 +163,7 @@ development of web application, web serv
 Summary:        Development files for system.web
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
-Requires:	mono-web = %{version}-%{release} pkgconfig
+Requires:       mono-web = %{version}-%{release} pkgconfig
 
 %description web-devel
 This package provides the .pc file for mono-web
@@ -238,9 +247,9 @@ no longer maintained. MySQL AB now provi
 which is fully managed and actively maintained.
 
 %package -n monodoc
-Summary:	The mono documentation system
-Group:		Documentation
-Requires:	mono-core = %{version}-%{release}
+Summary:        The mono documentation system
+Group:          Documentation
+Requires:       mono-core = %{version}-%{release}
 
 %description -n monodoc
 monodoc is the documentation package for the mono .NET environment
@@ -255,9 +264,9 @@ Requires: mono-core = %{version}-%{relea
 Development file for monodoc
 
 %package moonlight
-Summary:	All the parts required for moonlight compilation
-Group:		Development/Libraries
-Requires:	mono-core = %{version}-%{release}
+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
@@ -304,7 +313,7 @@ sed -i -e 's!$(prefix)/lib/!%{_libdir}/!
 autoreconf -f -i -s
 
 # Add undeclared Arg
-sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
+sed -i "61a #define ARG_MAX     _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
 rm -rf mcs/class/lib/monolite/*
@@ -372,28 +381,19 @@ install monodir %{buildroot}%{_bindir}
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
 %{_bindir}/monodir
-%{_bindir}/mono-api-*
-%mono_bin csharp
-%{_bindir}/gacutil1
-%mono_bin mod
-%mono_bin mono-cil-strip
-%{monodir}/?.0/mono-api-info*
 %{_bindir}/mono-test-install
-%{_bindir}/gacutil2
 %mono_bin certmgr
 %mono_bin chktrust
+%mono_bin csharp
 %mono_bin gacutil
+%{_bindir}/gacutil1
+%{_bindir}/gacutil2
 %mono_bin gmcs
 %mono_bin mcs
 %{_bindir}/mcs1
 %mono_bin mozroots
-%mono_bin mconfig
 %mono_bin setreg
 %mono_bin sn
-%mono_bin installvst
-%mono_bin monolinker
-%{monodir}/?.0/installutil.*
-%{monodir}/3.5/System.Web.Extensions*
 %{monodir}/2.0/System.Xml.Linq.dll
 %{_libdir}/libmono.so.*
 %{_libdir}/libmono-profiler-logging.so.*
@@ -405,12 +405,8 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/mozroots.1.gz
 %{_mandir}/man1/setreg.1.gz
 %{_mandir}/man1/sn.1.gz
-%{_mandir}/man1/monolinker.1.gz
-%{_mandir}/man1/resgen.1.gz
-%{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man5/mono-config.5.gz
 %{_mandir}/man1/csharp.1.gz
-%{_mandir}/man1/mono-cil-strip.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -423,41 +419,27 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll I18N.West
 %gac_dll ICSharpCode.SharpZipLib
 %{monodir}/compat-*/ICSharpCode.SharpZipLib.dll
+%{monodir}/gac/Mono.Cecil
+%{monodir}/gac/Mono.Cecil.Mdb
+%gac_dll cscompmgd
+%gac_dll CustomMarshalers
 %gac_dll Microsoft.VisualC
 %gac_dll Mono.C5
 %gac_dll Mono.Cairo
-%{monodir}/gac/Mono.Cecil
-%{monodir}/gac/Mono.Cecil.Mdb
 %gac_dll Mono.CompilerServices.SymbolWriter
+%gac_dll Mono.CSharp
+%gac_dll System.Drawing
 %gac_dll Mono.GetOptions
+%gac_dll Mono.Management
 %gac_dll Mono.Posix
 %gac_dll Mono.Security
+%gac_dll Mono.Simd
+%gac_dll OpenSystem.C
 %gac_dll System
 %gac_dll System.Configuration
-%gac_dll System.Drawing
+%gac_dll System.Core
 %gac_dll System.Security
 %gac_dll System.Xml
-%gac_dll System.Core
-%gac_dll System.Configuration.Install
-%gac_dll Mono.CSharp
-%gac_dll Mono.Management
-%gac_dll Mono.Simd
-%gac_dll System.Web
-%gac_dll System.Web.Abstractions
-%gac_dll System.Web.DynamicData
-%gac_dll System.Web.Routing
-%gac_dll System.Web.Services
-%gac_dll System.Web.Extensions.Design
-%gac_dll System.Web.Extensions
-%gac_dll System.Web.Mvc
-%{monodir}/compat-2.0/System.Web.Extensions*dll
-%gac_dll System.ComponentModel.DataAnnotations
-%gac_dll System.IdentityModel.Selectors
-%gac_dll System.IdentityModel
-%gac_dll System.Runtime.Serialization
-%gac_dll cscompmgd
-%gac_dll CustomMarshalers
-%gac_dll OpenSystem.C
 %{monodir}/gac/System.Xml.Linq
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
@@ -468,17 +450,17 @@ install monodir %{buildroot}%{_bindir}
 %config (noreplace) %{_sysconfdir}/mono/config
 %config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
-%config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
 %{_libdir}/mono-source-libs/
 
 %files devel
 %defattr(-,root,root,-)
+%{_bindir}/mono-api-*
+%{monodir}/?.0/mono-api-info*
 %{_bindir}/monodis
-%{_bindir}/pedump
+%{_bindir}/al1
 %mono_bin_1 al al
 %mono_bin_2 al2 al
-%{_bindir}/al1
 %mono_bin caspol
 %mono_bin cert2spc
 %mono_bin cilc
@@ -487,6 +469,8 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_1 genxs1 genxs
 %{_bindir}/genxs
 %mono_bin sgen
+%{monodir}/?.0/installutil.*
+%mono_bin installvst
 %mono_bin_1 ilasm ilasm
 %{_bindir}/ilasm1
 %mono_bin_2 ilasm2 ilasm
@@ -495,16 +479,20 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin mkbundle
 %{_bindir}/mkbundle1
 %{_bindir}/mkbundle2
+%mono_bin mono-cil-strip
+%mono_bin monolinker
 %mono_bin_1 monop monop
 %{_bindir}/monop1
 %mono_bin_2 monop2 monop
 %mono_bin mono-shlib-cop
 %mono_bin mono-xmltool
+%{_bindir}/pedump
 %mono_bin permview
 %mono_bin prj2make
-%mono_bin_1 resgen resgen
 %{_bindir}/resgen1
+%mono_bin_1 resgen resgen
 %mono_bin_2 resgen2 resgen
+%{_mandir}/man1/resgen.1.gz
 %mono_bin secutil
 %mono_bin signcode
 %mono_bin xbuild
@@ -519,6 +507,8 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/macpack.1.gz
 %{_mandir}/man1/makecert.1.gz
 %{_mandir}/man1/mkbundle.1.gz
+%{_mandir}/man1/mono-cil-strip.1.gz
+%{_mandir}/man1/monolinker.1.gz
 %{_mandir}/man1/mono-shlib-cop.1.gz
 %{_mandir}/man1/mono-xmltool.1.gz
 %{_mandir}/man1/monodis.1.gz
@@ -610,31 +600,42 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_1 mono-service mono-service
 %mono_bin_2 mono-service2 mono-service
 %{monodir}/gac/mono-service
+%gac_dll System.Configuration.Install
 %gac_dll System.Management
 %gac_dll System.Messaging
 %gac_dll System.ServiceProcess
-%gac_dll System.ServiceModel
 %gac_dll Microsoft.Vsa
 %gac_dll Mono.Messaging.RabbitMQ
 %gac_dll Mono.Messaging
 %gac_dll RabbitMQ.Client
 
-%files winforms
-%defattr(-,root,root,-)
-%gac_dll System.Windows.Forms
-%gac_dll Accessibility
-%gac_dll System.Design
-%gac_dll System.Drawing.Design
+%files wcf
+%defattr(-, root, root, -)
+%gac_dll System.IdentityModel
+%gac_dll System.IdentityModel.Selectors
+%gac_dll System.Runtime.Serialization
+%gac_dll System.ServiceModel
+%gac_dll System.ServiceModel.Web
 
 %files web
 %defattr(-,root,root,-)
 %gac_dll Mono.Http
 %gac_dll Mono.Web
-%gac_dll Mono.WebBrowser
+%gac_dll System.ComponentModel.DataAnnotations
 %gac_dll System.Runtime.Remoting
 %gac_dll System.Runtime.Serialization.Formatters.Soap
-%gac_dll System.ServiceModel.Web
+%gac_dll System.Web
+%gac_dll System.Web.Abstractions
+%gac_dll System.Web.DynamicData
+%gac_dll System.Web.Extensions
+%gac_dll System.Web.Extensions.Design
+%{monodir}/compat-2.0/System.Web.Extensions*dll
+%{monodir}/3.5/System.Web.Extensions*
+%gac_dll System.Web.Mvc
+%gac_dll System.Web.Routing
+%gac_dll System.Web.Services
 %mono_bin disco
+%mono_bin mconfig
 %mono_bin soapsuds
 %mono_bin_1 wsdl wsdl
 %{_bindir}/wsdl1
@@ -642,6 +643,7 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin_2 xsd2 xsd
 %mono_bin_1 xsd xsd
 %{_mandir}/man1/disco.1.gz
+%{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man1/soapsuds.1.gz
 %{_mandir}/man1/wsdl.1.gz
 %{_mandir}/man1/xsd.1.gz
@@ -649,6 +651,7 @@ install monodir %{buildroot}%{_bindir}
 %config (noreplace) %{_sysconfdir}/mono/2.0/Browsers/Compat.browser
 %config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/web.config
 %mono_bin httpcfg
 %{_mandir}/man1/httpcfg.1.gz
@@ -659,6 +662,16 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/system.web.extensions_1.0.pc
 %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
 
+%files winforms
+%defattr(-,root,root,-)
+%gac_dll Accessibility
+%gac_dll System.Design
+%gac_dll System.Drawing.Design
+%gac_dll System.Windows.Forms
+# Put here temporarily to break dependency issues
+# (cf. openSUSE packaging). Will be fixed post 1.2.5
+%gac_dll Mono.WebBrowser
+
 %files data
 %defattr(-,root,root,-)
 %mono_bin sqlsharp
@@ -709,6 +722,7 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/monodoc/*
 %{_libdir}/mono/monodoc/monodoc.dll
 %mono_bin mdoc
+%mono_bin mod
 %{_bindir}/mdoc-*
 %{_bindir}/mdass*
 %{_bindir}/mdval*
@@ -723,6 +737,12 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* 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
+    monodoc, mono-extras and mono-web
+  * mono-web no longer pull in mono-extras
+
 * Wed Jul 29 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2.3.1
 - Update to 2.4.2.3
 
@@ -984,7 +1004,7 @@ install monodir %{buildroot}%{_bindir}
 * Mon Apr 07 2008 Xavier Lamien <lxtnow at gmail.com> - 1.9-4
 - Added undeclared function bug #xxxx.
 
-* Mon Mar 17 2008 Xavier Lamien	<lxtnow at gmail.com> - 1.9-3
+* Mon Mar 17 2008 Xavier Lamien <lxtnow at gmail.com> - 1.9-3
 - Added require on mono-nunit-devel
 
 * Thu Mar 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-2



From lucilanga at fedoraproject.org  Tue Aug 25 07:08:01 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 25 Aug 2009 07:08:01 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 .cvsignore, 1.6, 1.7 evolution-rss.spec,
	1.29, 
	1.30 sources, 1.7, 1.8 evolution-rss-0.1.2-updateinterval.patch,
	1.1, NONE
Message-ID: <20090825070801.5933511C00D7@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7789

Modified Files:
	.cvsignore evolution-rss.spec sources 
Removed Files:
	evolution-rss-0.1.2-updateinterval.patch 
Log Message:
* Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Nov 2008 05:57:19 -0000	1.6
+++ .cvsignore	25 Aug 2009 07:07:58 -0000	1.7
@@ -1 +1 @@
-evolution-rss-0.1.2.tar.gz
+evolution-rss-0.1.4.tar.gz


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- evolution-rss.spec	4 Aug 2009 08:25:07 -0000	1.29
+++ evolution-rss.spec	25 Aug 2009 07:08:00 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
-Version: 0.1.2
-Release: 9%{?dist}
+Version: 0.1.4
+Release: 1%{?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 Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
+- new upstream release
+
 * Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 0.1.2-9
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Nov 2008 05:57:19 -0000	1.7
+++ sources	25 Aug 2009 07:08:00 -0000	1.8
@@ -1 +1 @@
-a7c04b6f330c49785d34f59a19537798  evolution-rss-0.1.2.tar.gz
+7b3241f4fba1675bc894951d211d5fc6  evolution-rss-0.1.4.tar.gz


--- evolution-rss-0.1.2-updateinterval.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug 25 07:37:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 07:37:55 +0000
Subject: [pkgdb] icu had acl change status
Message-ID: <20090825073755.F249E10F878@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on icu (Fedora 11) to Approved for denisarnaud

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icu



From whot at fedoraproject.org  Tue Aug 25 07:41:56 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 25 Aug 2009 07:41:56 +0000 (UTC)
Subject: rpms/libXtst/devel libXtst.spec,1.29,1.30
Message-ID: <20090825074156.DF0E411C00D7@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXtst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11477

Modified Files:
	libXtst.spec 
Log Message:
* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.2-2
- libXtst provides record.h now



Index: libXtst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXtst.spec	25 Aug 2009 04:21:23 -0000	1.29
+++ libXtst.spec	25 Aug 2009 07:41:55 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -63,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/XTest.h
+%{_includedir}/X11/extensions/record.h
 %if %{with_static}
 %{_libdir}/libXtst.a
 %endif
@@ -71,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/XTest*.3*
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.2-2
+- libXtst provides record.h now
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.2-1
 - libXtst 1.0.99.2
 



From transif at fedoraproject.org  Tue Aug 25 08:10:34 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Tue, 25 Aug 2009 08:10:34 +0000 (UTC)
Subject: comps/po is.po,1.18,1.19
Message-ID: <20090825081034.2A8B711C0439@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16099/po

Modified Files:
	is.po 
Log Message:
Sending translation for Icelandic


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.18 -r 1.19 is.poIndex: is.po
===================================================================
RCS file: /cvs/pkgs/comps/po/is.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- is.po	10 Jun 2009 12:30:55 -0000	1.18
+++ is.po	25 Aug 2009 08:10:32 -0000	1.19
@@ -1,6 +1,6 @@
 # translation of comps.HEAD.po to icelandic
 # ?slensk ???ing comps.HEAD.po
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2009 Free Software Foundation
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Richard Allen <ra at ra.is>, 2002.
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 08:08+0000\n"
+"POT-Creation-Date: 2009-04-29 15:51-0400\n"
 "PO-Revision-Date: 2009-06-10 12:30+0000\n"
 "Last-Translator: Sveinn ? Felli <sveinki at nett.is>\n"
 "Language-Team: icelandic <kde-isl at molar.is>\n"
@@ -18,283 +18,279 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
-#: ../comps-f12.xml.in.h:1
+#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "L?tt skj?bor?sumhverfi sem virkar vel ? aflminni v?lum."
 
-#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:3 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Kerfisstj?rnunart?l"
 
-#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:4
+#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "Afr?kanska"
 
-#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:5
+#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "Alb?nska"
 
-#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:7 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Forrit"
 
-#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:8
+#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "?mis forrit sem leysa m?rg verkefni af hendi"
 
-#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:9 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arab?ska"
 
-#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:10 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Armenska"
 
-#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:11
+#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "Assam?ska"
 
-#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:12 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Umbrot og ritstj?rn"
 
-#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:14
+#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
 msgid "Base"
 msgstr "Grunnur"
 
-#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:15 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Grunnkerfi?"
 
-#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:16
+#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
 msgid "Basic support for the Ruby programming language."
 msgstr "Grunnstu?ningur vi? forritunarm?li? Ruby"
 
-#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:17
+#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
 msgid "Basque Support"
 msgstr "Baskneska"
 
-#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:18
+#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
 msgid "Belarusian Support"
 msgstr "Hv?t-r?ssneska"
 
-#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:19
+#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
 msgid "Bengali Support"
 msgstr "Bengalska"
 
-#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
-#: ../comps-f12.xml.in.h:20
+#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
 msgid "Bhutanese Support"
 msgstr "Bh?tanska"
 
-#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
-#: ../comps-f12.xml.in.h:21
+#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
 msgid "Bosnian Support"
 msgstr "Bosn?ska"
 
-#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
-#: ../comps-f12.xml.in.h:22
+#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
 msgid "Brazilian Portuguese Support"
 msgstr "Bras?l?sk port?galska"
 
-#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
-#: ../comps-f12.xml.in.h:23
+#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
 msgid "Breton Support"
 msgstr "Bret?nska"
 
-#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
-#: ../comps-f12.xml.in.h:24 ../comps-el5.xml.in.h:8
-msgid "Buildsystem building group"
-msgstr "Buildsystem building group"
-
-#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
-#: ../comps-f12.xml.in.h:25
+#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
 msgid "Bulgarian Support"
 msgstr "B?lgarska"
 
-#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
-#: ../comps-f12.xml.in.h:26
+#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
 msgid "Catalan Support"
 msgstr "Katal?nska"
 
-#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
-#: ../comps-f12.xml.in.h:28
+#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
+#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
 msgid "Chinese Support"
 msgstr "K?nverska"
[...1687 lines suppressed...]
 msgstr "Kazakh?ska"
 
-#: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:111
+#: ../comps-f11.xml.in.h:111
 msgid "Kinyarwanda Support"
 msgstr "Kinyarwanda"
 
-#: ../comps-f11.xml.in.h:118 ../comps-f12.xml.in.h:118
+#: ../comps-f11.xml.in.h:118
 msgid "Latin Support"
 msgstr "Latneska"
 
-#: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:126
+#: ../comps-f11.xml.in.h:126
 msgid "Luxembourgish Support"
 msgstr "L?xemborg?ska"
 
-#: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:130
+#: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "Malagasy"
 
-#: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:133
+#: ../comps-f11.xml.in.h:133
 msgid "Maltese Support"
 msgstr "Maltneska"
 
-#: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:134
+#: ../comps-f11.xml.in.h:134
 msgid "Manx Support"
 msgstr "Manx"
 
-#: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:137
+#: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
 msgstr "MinGW fj?lkerfa umstaflari (cross-compiler)"
 
-#: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:146
+#: ../comps-f11.xml.in.h:147
 msgid "OCaml"
 msgstr "OCaml"
 
-#: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:147
+#: ../comps-f11.xml.in.h:148
 msgid "Occitan Support"
 msgstr "Occitan"
 
-#: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:150
+#: ../comps-f11.xml.in.h:151
 msgid "Online Help and Documentation"
 msgstr "Nettengd hj?lp og skj?lun"
 
-#: ../comps-f11.xml.in.h:163 ../comps-f12.xml.in.h:163
+#: ../comps-f11.xml.in.h:164
 msgid "Sanskrit Support"
 msgstr "Sanskr?t"
 
-#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:164
+#: ../comps-f11.xml.in.h:165
 msgid "Sardinian Support"
 msgstr "Sard?n?ska"
 
-#: ../comps-f11.xml.in.h:181 ../comps-f12.xml.in.h:181
+#: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
 msgstr "SUGAR skj?bor?sumhverfi"
 
-#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:182
+#: ../comps-f11.xml.in.h:183
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1344,21 +1385,21 @@ msgstr ""
 "Windows umhverfi?, pr?fanir ?eirra og ger? uppsetningarpakka, allt gert ? "
 "Fedora."
 
-#: ../comps-f11.xml.in.h:185 ../comps-f12.xml.in.h:185
+#: ../comps-f11.xml.in.h:186
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "?r?unart?l fyrir Objective CAML forritunarm?li? og tengd a?ger?as?fn."
 
-#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:187
+#: ../comps-f11.xml.in.h:188
 msgid "Swahili Support"
 msgstr "Swahili"
 
-#: ../comps-f11.xml.in.h:195 ../comps-f12.xml.in.h:195
+#: ../comps-f11.xml.in.h:196
 msgid "Tetum Support"
 msgstr "Tetum"
 
-#: ../comps-f11.xml.in.h:222 ../comps-f12.xml.in.h:222
+#: ../comps-f11.xml.in.h:223
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1366,11 +1407,11 @@ msgstr ""
 "?essi pakkah?pur inniheldur ?mis t?l fyrir h?nnun, breytingar, me?h?ndlun og "
 "p?kkun ? letri."
 
-#: ../comps-f11.xml.in.h:234 ../comps-f12.xml.in.h:234
+#: ../comps-f11.xml.in.h:235
 msgid "Turkmen Support"
 msgstr "T?rkmen?ska"
 
-#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:236
+#: ../comps-f11.xml.in.h:237
 msgid "Upper Sorbian Support"
 msgstr "Efri Sorbian"
 
@@ -1378,11 +1419,11 @@ msgstr "Efri Sorbian"
 msgid "Applications for a variety of tasks"
 msgstr "?mis forrit til ?missa verka"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Upphringinetsstu?ningur"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1390,7 +1431,7 @@ msgstr ""
 "GNOME er ?flugt myndr?nt vinnuumhverfi sem inniheldur spjald, skj?bor?, "
 "kerfissm?myndir og myndr?nann skr?arstj?ra."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1398,7 +1439,7 @@ msgstr ""
 "KDE er ?flugt myndr?nt vinnuumhverfi sem inniheldur spjald, skj?bor?, "
 "kerfissm?myndir og myndr?nann skr?arstj?ra."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1406,11 +1447,11 @@ msgstr ""
 "Forrit sem kallast ritlar. ?etta eru t?lin sem gera ??r kleyft a? b?a til og "
 "breyta skr?m. ?etta inniheldur me?al annars Emacs og Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "XEmacs ritillinn."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1418,27 +1459,30 @@ msgstr ""
 "?essi t?l gera ??r kleyft a? b?a til skj?l ? DocBook sni?i og breyta ?eim ? "
 "HTML, PDF, Postscript og texta."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?essi pakkah?pur inniheldur ?msa s?rh?f?a net?j?na."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
-msgid "This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+msgid ""
+"This group is a collection of tools and resources of Arabic environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? arab?sku."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
-msgid "This group is a collection of tools and resources of Hebrew environments."
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+msgid ""
+"This group is a collection of tools and resources of Hebrew environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? hebresku."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
-msgid "This group is a collection of tools and resources of Japanese environments."
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+msgid ""
+"This group is a collection of tools and resources of Japanese environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? jap?nsku."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
-msgid "This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:65
+msgid ""
+"This group is a collection of tools and resources of Czech environments."
 msgstr "?essi pakkah?pur inniheldur ?mis t?l fyrir stu?ning vi? t?kknesku."
-



From topdog at fedoraproject.org  Tue Aug 25 08:14:33 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 25 Aug 2009 08:14:33 +0000 (UTC)
Subject: rpms/ipplan/devel README.ipplan, NONE, 1.1 import.log, NONE,
	1.1 ipplan-mysql.sql, NONE, 1.1 ipplan-pgsql.sql, NONE,
	1.1 ipplan-set-adodb-path.patch, NONE,
	1.1 ipplan-set-menus-path.patch, NONE,
	1.1 ipplan-set-phpmailer-path.patch, NONE,
	1.1 ipplan-use-qmagic.patch, NONE, 1.1 ipplan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090825081433.49E5A11C00D7@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/ipplan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.ipplan import.log ipplan-mysql.sql ipplan-pgsql.sql 
	ipplan-set-adodb-path.patch ipplan-set-menus-path.patch 
	ipplan-set-phpmailer-path.patch ipplan-use-qmagic.patch 
	ipplan.spec 
Log Message:
* Tue Aug 25 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Initial import




--- NEW FILE README.ipplan ---

Configuration - Mysql
1) create the database by issuing the following at the command prompt:

   mysqladmin -p create ipplan

2) add a database user for ipplan using mysql -p
   GRANT SELECT,INSERT,UPDATE,DELETE on ipplan.*
       TO ipplan at localhost IDENTIFIED by 'password';

   Change the above password to whatever you wish

3) modify the user and password info in the /etc/ipplan/config.php,
   additional settings can be changed in the /etc/ipplan/config.php 
   at this stage too. See /usr/share/doc/ipplan-*/README for more 
   information.

   Make sure you leave transaction support enabled in /etc/ipplan/config.php

4) Import the database schema into the database

  mysql -p ipplan < /usr/share/doc/ipplan-*/sql/ipplan-mysql.sql

5) Point your web browser to the main IPplan web page (http://mywebserver.com/ipplan), 
   select the admin drop down menu and add customers, groups and users using the admin 
   user defined in the config.php file - you MUST create at least one regular user 
   one group and one customer

Configuration - Postgresql
1) Create the database, database user and tables by issuing the following at the
   command prompt as the postgres user (su - postgres):
  
  su - postgres
  createuser -P ipplan
        Enter password for new role:
        Enter it again:
        Shall the new role be a superuser? (y/n) n
        Shall the new role be allowed to create databases? (y/n) n
        Shall the new role be allowed to create more new roles? (y/n) n
  
  createdb -O ipplan ipplan

  Make sure that the ipplan user is allowed to connect to the ipplan
  database from another user by modifying the pg_hba.conf file and
  adding the following then restart the postgresql service

        host   ipplan       ipplan      127.0.0.1/32          md5
        host   ipplan       ipplan         ::1/128            md5
        local  ipplan       ipplan                            md5

  Import the database schema

  psql -U ipplan < /usr/share/doc/ipplan-*/sql/ipplan-pgsql.sql

2) Modify the user and password info in the config.php script, additional
   settings can be changed /etc/ipplan/config.php at this stage too.
   See the /usr/share/doc/ipplan-*/README for more information.

3) now point your web browser to the main IPplan web page
   (http://mywebserver.com/ipplan), select the admin drop down menu and add
   customers, groups and users using the admin user defined in the config.php
   file - you MUST create at least one regular user, one group and one customer

Configuration - Oracle
Oracle is not supported on fedora


--- NEW FILE import.log ---
ipplan-4_92-3_fc11:HEAD:ipplan-4.92-3.fc11.src.rpm:1251187587


--- NEW FILE ipplan-mysql.sql ---

CREATE TABLE area (
areaaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
areaindex                BIGINT NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (areaindex)
)TYPE=INNODB;


ALTER TABLE area ADD  UNIQUE INDEX area_customer  (customer, descrip);


ALTER TABLE area ADD  UNIQUE INDEX area_areaaddr  (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP NOT NULL
)TYPE=INNODB;


ALTER TABLE auditlog ADD  INDEX auditlog_dt  (dt);


CREATE TABLE base (
baseaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
subnetsize               INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
baseindex                BIGINT NOT NULL AUTO_INCREMENT,
admingrp                 VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT UNSIGNED DEFAULT 0,
swipmod                  DATETIME,
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


ALTER TABLE base ADD  UNIQUE INDEX base_baseaddr  (baseaddr, customer);


ALTER TABLE base ADD  INDEX base_customer  (customer);


ALTER TABLE base ADD  INDEX base_admingrp  (admingrp);


CREATE TABLE baseadd (
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


CREATE TABLE custinfo (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE custadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
)TYPE=INNODB;


ALTER TABLE customer ADD  UNIQUE INDEX customer_custdescrip  (custdescrip);


ALTER TABLE customer ADD  INDEX customer_crm  (crm);


ALTER TABLE customer ADD  INDEX customer_admingrp  (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) NOT NULL DEFAULT 'N',
resaddr                  SMALLINT UNSIGNED DEFAULT 0,
grpopt                   INT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (grp)
)TYPE=INNODB;


ALTER TABLE grp ADD  UNIQUE INDEX grp_grpdescrip  (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                BIGINT NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
lastpol                  DATETIME,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddr ADD  INDEX ipaddr_baseindex  (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddradd ADD  INDEX ipaddradd_baseindex  (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
dstipaddr                INT UNSIGNED NOT NULL DEFAULT 0,
dstcustomer              SMALLINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE ipaddrlnk ADD  UNIQUE INDEX ipaddrlnk_uniq  (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_dst  (dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_src  (ipaddr, customer);


CREATE TABLE requestip (
requestindex             INTEGER NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP NOT NULL,
info                     LONGTEXT,
                 PRIMARY KEY (requestindex)
)TYPE=INNODB;


ALTER TABLE requestip ADD  UNIQUE INDEX requestip_desc  (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT UNSIGNED NOT NULL DEFAULT 0,
rangesize                INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               BIGINT NOT NULL AUTO_INCREMENT,
areaindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (rangeindex)
)TYPE=INNODB;


ALTER TABLE netrange ADD  INDEX range_rangeaddr  (rangeaddr, customer);


ALTER TABLE netrange ADD  UNIQUE INDEX range_customer  (customer, descrip);


ALTER TABLE netrange ADD  INDEX range_areaindex  (areaindex);


CREATE TABLE revdns (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE revdns ADD  INDEX revdns_customer  (customer);


CREATE TABLE version (
version                  INTEGER NOT NULL DEFAULT 0
)TYPE=INNODB;


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
)TYPE=INNODB;


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE usergrp ADD  UNIQUE INDEX usergrp_userid  (userid, grp);


ALTER TABLE usergrp ADD  INDEX usergrp_grp  (grp);


CREATE TABLE bounds (
boundsaddr               INT UNSIGNED NOT NULL DEFAULT 0,
boundssize               INT UNSIGNED NOT NULL DEFAULT 0,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE bounds ADD  INDEX bounds_grp  (grp);


ALTER TABLE bounds ADD  INDEX bounds_boundsaddr  (boundsaddr);


CREATE TABLE fwdzone (
data_id                  BIGINT NOT NULL AUTO_INCREMENT,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  DATETIME,
regmod                   DATE,
expiremod                DATETIME,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
)TYPE=INNODB;


ALTER TABLE fwdzone ADD  INDEX fwdzone_customer  (customer);


ALTER TABLE fwdzone ADD  INDEX fwdzone_domain  (domain);


CREATE TABLE fwdzoneadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
data_id                  BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255)
)TYPE=INNODB;


ALTER TABLE fwdzoneadd ADD  UNIQUE INDEX fwdzoneadd_customer  (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   BIGINT NOT NULL AUTO_INCREMENT,
data_id                  BIGINT NOT NULL DEFAULT 0,
lastmod                  DATETIME,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INTEGER NOT NULL DEFAULT 0,
userid                   VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (recidx)
)TYPE=INNODB;


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_data_id  (data_id);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_sortorder  (sortorder);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_customer  (customer);


CREATE TABLE fwddns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE fwddns ADD  INDEX fwddns_id  (id);


CREATE TABLE zones (
id                       BIGINT NOT NULL AUTO_INCREMENT,
zoneip                   INT UNSIGNED NOT NULL DEFAULT 0,
zonesize                 INT UNSIGNED NOT NULL DEFAULT 0,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  DATETIME,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (id)
)TYPE=INNODB;


ALTER TABLE zones ADD  INDEX zones_customer  (customer);


ALTER TABLE zones ADD  INDEX zones_zoneip  (zoneip);


CREATE TABLE zonedns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE zonedns ADD  INDEX zonedns_id  (id);


BEGIN;


INSERT INTO version (version) VALUES (22);


COMMIT;



--- NEW FILE ipplan-pgsql.sql ---
CREATE TABLE area (
areaaddr                 INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
areaindex                SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (areaindex)
);


CREATE UNIQUE INDEX area_customer ON area (customer, descrip);


CREATE UNIQUE INDEX area_areaaddr ON area (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
);


CREATE INDEX auditlog_dt ON auditlog (dt);


CREATE TABLE base (
baseaddr                 INT8 DEFAULT 0 NOT NULL,
subnetsize               INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
baseindex                SERIAL,
admingrp                 VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT8 DEFAULT 0,
swipmod                  TIMESTAMP,
                 PRIMARY KEY (baseindex)
);


CREATE UNIQUE INDEX base_baseaddr ON base (baseaddr, customer);


CREATE INDEX base_customer ON base (customer);


CREATE INDEX base_admingrp ON base (admingrp);


CREATE TABLE baseadd (
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
);


CREATE TABLE custinfo (
customer                 INT4 DEFAULT 0 NOT NULL,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
);


CREATE TABLE custadd (
customer                 INT4 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
);


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SERIAL,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
);


CREATE UNIQUE INDEX customer_custdescrip ON customer (custdescrip);


CREATE INDEX customer_crm ON customer (crm);


CREATE INDEX customer_admingrp ON customer (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) DEFAULT 'N' NOT NULL,
resaddr                  INT4 DEFAULT 0,
grpopt                   INT8 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (grp)
);


CREATE UNIQUE INDEX grp_grpdescrip ON grp (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
lastpol                  TIMESTAMP,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddr_baseindex ON ipaddr (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddradd_baseindex ON ipaddradd (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
dstipaddr                INT8 DEFAULT 0 NOT NULL,
dstcustomer              INT4 DEFAULT 0 NOT NULL
);


CREATE UNIQUE INDEX ipaddrlnk_uniq ON ipaddrlnk (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_dst ON ipaddrlnk (dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_src ON ipaddrlnk (ipaddr, customer);


CREATE TABLE requestip (
requestindex             SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
info                     TEXT,
                 PRIMARY KEY (requestindex)
);


CREATE UNIQUE INDEX requestip_desc ON requestip (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT8 DEFAULT 0 NOT NULL,
rangesize                INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               SERIAL,
areaindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (rangeindex)
);


CREATE INDEX range_rangeaddr ON netrange (rangeaddr, customer);


CREATE UNIQUE INDEX range_customer ON netrange (customer, descrip);


CREATE INDEX range_areaindex ON netrange (areaindex);


CREATE TABLE revdns (
customer                 INT4 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX revdns_customer ON revdns (customer);


CREATE TABLE schema (
version                  INT4 DEFAULT 0 NOT NULL
);


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
);


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE UNIQUE INDEX usergrp_userid ON usergrp (userid, grp);


CREATE INDEX usergrp_grp ON usergrp (grp);


CREATE TABLE bounds (
boundsaddr               INT8 DEFAULT 0 NOT NULL,
boundssize               INT8 DEFAULT 0 NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE INDEX bounds_grp ON bounds (grp);


CREATE INDEX bounds_boundsaddr ON bounds (boundsaddr);


CREATE TABLE fwdzone (
data_id                  SERIAL,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  TIMESTAMP,
regmod                   DATE,
expiremod                TIMESTAMP,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 INT4 DEFAULT 0 NOT NULL,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
);


CREATE INDEX fwdzone_customer ON fwdzone (customer);


CREATE INDEX fwdzone_domain ON fwdzone (domain);


CREATE TABLE fwdzoneadd (
customer                 INT4 DEFAULT 0 NOT NULL,
data_id                  INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255)
);


CREATE UNIQUE INDEX fwdzoneadd_customer ON fwdzoneadd (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   SERIAL,
data_id                  INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INT4 DEFAULT 0 NOT NULL,
userid                   VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (recidx)
);


CREATE INDEX fwdzonerec_data_id ON fwdzonerec (data_id);


CREATE INDEX fwdzonerec_sortorder ON fwdzonerec (sortorder);


CREATE INDEX fwdzonerec_customer ON fwdzonerec (customer);


CREATE TABLE fwddns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX fwddns_id ON fwddns (id);


CREATE TABLE zones (
id                       SERIAL,
zoneip                   INT8 DEFAULT 0 NOT NULL,
zonesize                 INT8 DEFAULT 0 NOT NULL,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  TIMESTAMP,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (id)
);


CREATE INDEX zones_customer ON zones (customer);


CREATE INDEX zones_zoneip ON zones (zoneip);


CREATE TABLE zonedns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX zonedns_id ON zonedns (id);


BEGIN;


INSERT INTO schema (version) VALUES (22);


COMMIT;



ipplan-set-adodb-path.patch:
 admin/changepassword.php     |    2 +-
 admin/deletebounds.php       |    2 +-
 admin/displayauditlog.php    |    4 ++--
 admin/displayboundsform.php  |    2 +-
 admin/exportbase.php         |    2 +-
 admin/exportbaseform.php     |    2 +-
 admin/exportip.php           |    2 +-
 admin/exportipform.php       |    2 +-
 admin/importbase.php         |    2 +-
 admin/importbaseform.php     |    2 +-
 admin/importip.php           |    2 +-
 admin/importipform.php       |    2 +-
 admin/maintenance.php        |    2 +-
 admin/schemacreate.php       |    4 ++--
 admin/usermanager.php        |    2 +-
 contrib/ipplan-poller.php    |    2 +-
 user/changesettings.php      |    2 +-
 user/createarea.php          |    2 +-
 user/createrange.php         |    2 +-
 user/createsubnet.php        |    2 +-
 user/createsubnetform.php    |    2 +-
 user/deletearea.php          |    2 +-
 user/deletecustomer.php      |    2 +-
 user/deleterange.php         |    2 +-
 user/displaybase.php         |    2 +-
 user/displaybaseform.php     |    2 +-
 user/displaycustomerform.php |    2 +-
 user/displayoverlap.php      |    2 +-
 user/displayoverlapform.php  |    2 +-
 user/displayrouter.php       |    2 +-
 user/displayrouterform.php   |    2 +-
 user/displaysubnet.php       |    4 ++--
 user/displayswip.php         |    2 +-
 user/displayswipform.php     |    2 +-
 user/emailswip.php           |    2 +-
 user/exportdhcp.php          |    2 +-
 user/exportview.php          |    2 +-
 user/findfree.php            |    2 +-
 user/findfreeform.php        |    2 +-
 user/modifyarearange.php     |    2 +-
 user/modifyarearangeform.php |    2 +-
 user/modifybase.php          |    2 +-
 user/modifybaseform.php      |    2 +-
 user/modifycustomer.php      |    2 +-
 user/modifydns.php           |    2 +-
 user/modifydnsform.php       |    2 +-
 user/modifydnsrecord.php     |    2 +-
 user/modifydnsrecordform.php |    2 +-
 user/modifyipform.php        |    2 +-
 user/modifyipformmul.php     |    2 +-
 user/modifysubnet.php        |    2 +-
 user/modifyzone.php          |    2 +-
 user/modifyzoneform.php      |    2 +-
 user/ping.php                |    2 +-
 user/requestip.php           |    2 +-
 user/searchall.php           |    2 +-
 user/searchallform.php       |    2 +-
 user/traceroute.php          |    2 +-
 user/treeview.php            |    2 +-
 59 files changed, 62 insertions(+), 62 deletions(-)

--- NEW FILE ipplan-set-adodb-path.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/changepassword.php	2009-07-27 18:08:20.964259380 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/deletebounds.php	2009-07-27 18:08:20.976259668 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/displayauditlog.php ipplan/admin/displayauditlog.php
--- ipplan.orig/admin/displayauditlog.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayauditlog.php	2009-07-27 18:08:21.010259547 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
@@ -135,7 +135,7 @@
 insert($w,text(my_("Total records:")." ".$cnt));
 
 /*
-include_once('../adodb/adodb-pager.inc.php');
+include_once('/usr/share/php/adodb/adodb-pager.inc.php');
 $sql = "SELECT userid, action, dt FROM auditlog ORDER BY dt DESC";
 
 function callback($buffer) {
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-27 18:08:20.978259300 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbaseform.php ipplan/admin/exportbaseform.php
--- ipplan.orig/admin/exportbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbaseform.php	2009-07-27 18:08:21.012260319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbase.php ipplan/admin/exportbase.php
--- ipplan.orig/admin/exportbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbase.php	2009-07-27 18:08:20.966259550 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 require_once("../class.templib.php");
diff -ruN ipplan.orig/admin/exportipform.php ipplan/admin/exportipform.php
--- ipplan.orig/admin/exportipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportipform.php	2009-07-27 18:08:21.014260770 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportip.php ipplan/admin/exportip.php
--- ipplan.orig/admin/exportip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportip.php	2009-07-27 18:08:21.001494556 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/importbaseform.php ipplan/admin/importbaseform.php
--- ipplan.orig/admin/importbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbaseform.php	2009-07-27 18:08:21.017259720 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbase.php	2009-07-27 18:08:20.973259193 +0200
@@ -56,7 +56,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/importipform.php ipplan/admin/importipform.php
--- ipplan.orig/admin/importipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importipform.php	2009-07-27 18:08:21.073260965 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importip.php ipplan/admin/importip.php
--- ipplan.orig/admin/importip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importip.php	2009-07-27 18:08:20.984259075 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/maintenance.php ipplan/admin/maintenance.php
--- ipplan.orig/admin/maintenance.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/maintenance.php	2009-07-27 18:08:20.992259086 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/schemacreate.php ipplan/admin/schemacreate.php
--- ipplan.orig/admin/schemacreate.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/schemacreate.php	2009-07-27 18:08:21.069260682 +0200
@@ -22,8 +22,8 @@
 define("SCHEMA", 22);
 
 require_once("../ipplanlib.php");
-//require_once('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//require_once('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-27 18:06:42.469260813 +0200
+++ ipplan/admin/usermanager.php	2009-07-27 18:08:21.042259729 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-02-22 23:44:50.000000000 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-27 18:08:20.377259554 +0200
@@ -39,7 +39,7 @@
 // define the nmap command for scan with dns lookup
 define("NMAP_CMDH", "-sP -PE -q -R -v -oG");
 
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 
 $timestamp = FALSE;
diff -ruN ipplan.orig/user/changesettings.php ipplan/user/changesettings.php
--- ipplan.orig/user/changesettings.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/changesettings.php	2009-07-27 18:08:20.707259358 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createarea.php	2009-07-27 18:08:20.825259282 +0200
@@ -20,7 +20,7 @@
 // Modify capabilities added by Denes Magyar (fat at poison.hu) 22/02/05
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createrange.php	2009-07-27 18:08:20.857259235 +0200
@@ -63,7 +63,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnetform.php ipplan/user/createsubnetform.php
--- ipplan.orig/user/createsubnetform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnetform.php	2009-07-27 18:08:20.799259298 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnet.php	2009-07-27 18:08:20.724259386 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletearea.php ipplan/user/deletearea.php
--- ipplan.orig/user/deletearea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletearea.php	2009-07-27 18:08:20.710259490 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletecustomer.php ipplan/user/deletecustomer.php
--- ipplan.orig/user/deletecustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletecustomer.php	2009-07-27 18:08:20.550259181 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deleterange.php ipplan/user/deleterange.php
--- ipplan.orig/user/deleterange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deleterange.php	2009-07-27 18:08:20.809260311 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybaseform.php ipplan/user/displaybaseform.php
--- ipplan.orig/user/displaybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybaseform.php	2009-07-27 18:08:20.791259227 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybase.php ipplan/user/displaybase.php
--- ipplan.orig/user/displaybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybase.php	2009-07-27 18:08:20.488259765 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaycustomerform.php ipplan/user/displaycustomerform.php
--- ipplan.orig/user/displaycustomerform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaycustomerform.php	2009-07-27 18:08:20.879259357 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlapform.php ipplan/user/displayoverlapform.php
--- ipplan.orig/user/displayoverlapform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlapform.php	2009-07-27 18:08:20.875259262 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlap.php ipplan/user/displayoverlap.php
--- ipplan.orig/user/displayoverlap.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlap.php	2009-07-27 18:08:20.593259271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouterform.php ipplan/user/displayrouterform.php
--- ipplan.orig/user/displayrouterform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouterform.php	2009-07-27 18:08:20.872259229 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouter.php ipplan/user/displayrouter.php
--- ipplan.orig/user/displayrouter.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouter.php	2009-07-27 18:08:20.770259123 +0200
@@ -93,7 +93,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaysubnet.php	2009-07-27 18:08:20.849259064 +0200
@@ -19,8 +19,8 @@
 //
 
 require_once("../ipplanlib.php");
-//include('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//include('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswipform.php ipplan/user/displayswipform.php
--- ipplan.orig/user/displayswipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswipform.php	2009-07-27 18:08:20.479259953 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswip.php ipplan/user/displayswip.php
--- ipplan.orig/user/displayswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswip.php	2009-07-27 18:08:20.764259337 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/emailswip.php ipplan/user/emailswip.php
--- ipplan.orig/user/emailswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/emailswip.php	2009-07-27 18:08:20.588259651 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportdhcp.php	2009-07-27 18:08:20.717259269 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/exportview.php ipplan/user/exportview.php
--- ipplan.orig/user/exportview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportview.php	2009-07-27 18:08:20.888259800 +0200
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfreeform.php ipplan/user/findfreeform.php
--- ipplan.orig/user/findfreeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfreeform.php	2009-07-27 18:08:20.540261810 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfree.php ipplan/user/findfree.php
--- ipplan.orig/user/findfree.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfree.php	2009-07-27 18:08:20.781259273 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearangeform.php ipplan/user/modifyarearangeform.php
--- ipplan.orig/user/modifyarearangeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearangeform.php	2009-07-27 18:08:20.793260240 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearange.php ipplan/user/modifyarearange.php
--- ipplan.orig/user/modifyarearange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearange.php	2009-07-27 18:08:20.886259388 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybaseform.php ipplan/user/modifybaseform.php
--- ipplan.orig/user/modifybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybaseform.php	2009-07-27 18:08:20.860259626 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybase.php	2009-07-27 18:08:20.504259535 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifycustomer.php	2009-07-27 18:08:20.527258935 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsform.php ipplan/user/modifydnsform.php
--- ipplan.orig/user/modifydnsform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsform.php	2009-07-27 18:08:20.733259100 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydns.php	2009-07-27 18:08:20.584259051 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/modifydnsrecordform.php ipplan/user/modifydnsrecordform.php
--- ipplan.orig/user/modifydnsrecordform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecordform.php	2009-07-27 18:08:20.492259765 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-27 18:08:20.749259692 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipformmul.php ipplan/user/modifyipformmul.php
--- ipplan.orig/user/modifyipformmul.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipformmul.php	2009-07-27 18:08:20.555259277 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipform.php	2009-07-27 18:08:20.571259438 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifysubnet.php	2009-07-27 18:08:20.869259218 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzoneform.php ipplan/user/modifyzoneform.php
--- ipplan.orig/user/modifyzoneform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzoneform.php	2009-07-27 18:08:20.760259037 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzone.php	2009-07-27 18:08:20.821259349 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/ping.php ipplan/user/ping.php
--- ipplan.orig/user/ping.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/ping.php	2009-07-27 18:08:20.783260234 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/requestip.php	2009-07-27 18:08:20.806260271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchallform.php ipplan/user/searchallform.php
--- ipplan.orig/user/searchallform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchallform.php	2009-07-27 18:08:20.546259497 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchall.php	2009-07-27 18:08:20.536259319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/traceroute.php ipplan/user/traceroute.php
--- ipplan.orig/user/traceroute.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/traceroute.php	2009-07-27 18:08:20.482259840 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-07-27 18:06:42.474261590 +0200
+++ ipplan/user/treeview.php	2009-07-27 18:08:20.787259612 +0200
@@ -20,7 +20,7 @@
 // Bcracknell 03/11/2005 - Added tree menu display of Customers/Areas/Ranges & Subnets
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");

ipplan-set-menus-path.patch:
 ipplan/admin/usermanager.php |   20 ++++++++++----------
 ipplan/ipplanlib.php         |   19 ++++++++++---------
 ipplan/user/treeview.php     |   20 ++++++++++----------
 ipplanlib.php                |    2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

--- NEW FILE ipplan-set-menus-path.patch ---
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/usermanager.php	2009-07-23 18:39:21.905261618 +0200
@@ -22,9 +22,9 @@
 require_once("../adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 require_once("../auth.php");
 
 
@@ -38,7 +38,7 @@
 isset($_COOKIE["ipplanLanguage"]) && myLanguage($_COOKIE['ipplanLanguage']);
 
 newhtml($p);
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p,my_("User Manager"));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu-hidden.css")));
@@ -190,12 +190,12 @@
 insert($view, block("<i>".my_("Click on a group or user")."</i>"));
 
 $mid = new TreeMenu();
-$mid->setDirroot('../menus');
-$mid->setLibjsdir('../menus/libjs/');
-$mid->setImgdir('../menus/menuimages/');
-$mid->setImgwww('../menus/menuimages/');
-$mid->setIcondir('../menus/menuicons/');
-$mid->setIconwww('../menus/menuicons/');
+$mid->setDirroot('/usr/share/php/php-layers-menu');
+$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+$mid->setImgwww('../../menus/menuimages/');
+$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+$mid->setIconwww('../../menus/menuicons/');
 $mid->SetMenuStructureString($MENU);
 $mid->setIconsize(16, 16);
 $mid->parseStructureForMenu('treemenu1');
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/ipplanlib.php	2009-07-23 18:49:26.576261171 +0200
@@ -540,8 +540,9 @@
     $BASE_URL = base_url();
     $BASE_DIR = base_dir();
 
-    $myDirPath = $BASE_DIR . '/menus/';
-    $myWwwPath = $BASE_URL . '/menus/';
+    $myDirPath = '/usr/share/php/php-layers-menu/';
+    $myMenPath = str_replace('/ipplan','',$BASE_URL);
+    $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
     require_once $myDirPath . 'lib/PHPLIB.php';
@@ -583,13 +584,13 @@
         insert($w, script("",array("language"=>"JavaScript","type"=>"text/javascript","src"=> $myWwwPath . 'libjs/layersmenu.js')));
 
         $mid= new LayersMenu(6, 7, 2, 1);
-        $mid->setDirroot ($BASE_DIR.'/menus/');
-        $mid->setLibjsdir($BASE_DIR.'/menus/libjs/');
-        $mid->setImgdir  ($BASE_DIR.'/menus/menuimages/');
-        $mid->setImgwww  ($BASE_URL.'/menus/menuimages/');
-        $mid->setIcondir ($BASE_DIR.'/menus/menuicons/');
-        $mid->setIconwww ($BASE_URL.'/menus/menuicons/');
-        $mid->setTpldir  ($BASE_DIR.'/menus/templates/');
+        $mid->setDirroot ('/usr/share/php/php-layers-menu/');
+        $mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+        $mid->setImgdir  ('/usr/share/php/php-layers-menu/menuimages/');
+        $mid->setImgwww  ('../../menus/menuimages/');
+        $mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
+        $mid->setIconwww ('../../menus/menuicons/');
+        $mid->setTpldir  ('/usr/share/php/php-layers-menu/templates/');
         $mid->SetMenuStructureString($ADMIN_MENU);
         $mid->setIconsize(16, 16);
         $mid->parseStructureForMenu('hormenu1');
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/treeview.php	2009-07-23 18:52:03.193261518 +0200
@@ -24,9 +24,9 @@
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 
 $auth = new SQLAuthenticator(REALM, REALMERROR);
 
@@ -39,7 +39,7 @@
 $title=my_("Display subnet information");
 newhtml($p);
 
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p, $title);
 
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
@@ -133,12 +133,12 @@
   	}
 
 	$mid = new TreeMenu();
-	$mid->setDirroot('../menus');
-	$mid->setLibjsdir('../menus/libjs/');
-	$mid->setImgdir('../menus/menuimages/');
-	$mid->setImgwww('../menus/menuimages/');
-	$mid->setIcondir('../menus/menuicons/');
-	$mid->setIconwww('../menus/menuicons/');
+	$mid->setDirroot('/usr/share/php/php-layers-menu');
+	$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+	$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+	$mid->setImgwww('../../menus/menuimages/');
+	$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+	$mid->setIconwww('../../menus/menuicons/');
 	if(!$menustring) myError($w,$p, my_("No customers"));
 	$mid->setMenuStructureString($menustring);
 	$mid->setIconsize(16, 16);
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-07-27 18:18:17.073261816 +0200
+++ ipplan/ipplanlib.php	2009-07-27 18:19:44.414278370 +0200
@@ -545,7 +545,7 @@
     $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
-    require_once $myDirPath . 'lib/PHPLIB.php';
+    require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
     require_once $myDirPath . 'lib/layersmenu-common.inc.php';
     require_once $myDirPath . 'lib/layersmenu.inc.php';
     require_once $BASE_DIR  . '/menudefs.php';

ipplan-set-phpmailer-path.patch:
 displaysubnet.php      |    8 ++++----
 displaysubnet.php.orig |    8 ++++----
 requestip.php          |    4 ++--
 swiplib.php            |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE ipplan-set-phpmailer-path.patch ---
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-08-23 11:17:07.326552632 +0200
+++ ipplan/user/displaysubnet.php	2009-08-23 11:28:14.122554254 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/displaysubnet.php.orig ipplan/user/displaysubnet.php.orig
--- ipplan.orig/user/displaysubnet.php.orig	2009-08-23 11:16:42.634555924 +0200
+++ ipplan/user/displaysubnet.php.orig	2009-08-23 11:26:26.055552579 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-08-23 11:17:07.345554665 +0200
+++ ipplan/user/requestip.php	2009-08-23 11:27:11.342553873 +0200
@@ -140,10 +140,10 @@
             $custdescrip=$ds->GetCustomerDescrip($cust);
 
             //Send email notification that IP Request was entered 
-            require("../class.phpmailer.php");
+            require("/usr/share/php/PHPMailer/class.phpmailer.php");
             $mail = new PHPMailer();
             $mail->IsSMTP(); // telling the class to use SMTP
-            $mail->SetLanguage("en", "../");
+            $mail->SetLanguage("en");
             $mail->Host = EMAILSERVER; // SMTP server
             $mail->From = HELPDESKEMAIL;
             $mail->IsHTML(false);
diff -ruN ipplan.orig/user/swiplib.php ipplan/user/swiplib.php
--- ipplan.orig/user/swiplib.php	2009-07-17 00:15:20.000000000 +0200
+++ ipplan/user/swiplib.php	2009-08-23 11:23:16.109553193 +0200
@@ -154,10 +154,10 @@
 // email the swip entry
 function emailSWIP($swip) {
 
-    require_once("../class.phpmailer.php");
+    require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
     $mail = new PHPMailer();
     $mail->IsSMTP(); // telling the class to use SMTP
-    $mail->SetLanguage("en", "../");
+    $mail->SetLanguage("en");
     $mail->Host = EMAILSERVER; // SMTP server
     $mail->From = REGADMINEMAIL;
     $mail->FromName = "IP Plan";

ipplan-use-qmagic.patch:
 admin/changepassword.php    |    4 -
 admin/deletebounds.php      |    2 
 admin/displayboundsform.php |    2 
 admin/importbase.php        |   14 ++---
 admin/usermanager.php       |   86 +++++++++++++++++------------------
 auth.php                    |    6 +-
 class.dbflib.php            |   92 +++++++++++++++++++-------------------
 class.dnslib.php            |  106 ++++++++++++++++++++++----------------------
 contrib/ipplan-poller.php   |   18 +++----
 user/createarea.php         |    4 -
 user/createrange.php        |    4 -
 user/createsubnet.php       |    2 
 user/displaysubnet.php      |   52 ++++++++++-----------
 user/exportdhcp.php         |    2 
 user/modifybase.php         |    4 -
 user/modifycustomer.php     |   62 ++++++++++++-------------
 user/modifydns.php          |   10 ++--
 user/modifydnsrecord.php    |   52 ++++++++++-----------
 user/modifyipform.php       |    6 +-
 user/modifysubnet.php       |   28 +++++------
 user/modifyzone.php         |    2 
 user/requestip.php          |   16 +++---
 user/searchall.php          |   82 +++++++++++++++++-----------------
 23 files changed, 328 insertions(+), 328 deletions(-)

--- NEW FILE ipplan-use-qmagic.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-07-24 16:35:37.067261296 +0200
+++ ipplan/admin/changepassword.php	2009-07-24 16:52:07.366262054 +0200
@@ -67,8 +67,8 @@
 
       $ds->DbfTransactionStart();
       $result=&$ds->ds->Execute("UPDATE users
-                              SET password=".$ds->ds->qstr($password)."
-                              WHERE userid=".$ds->ds->qstr($userid));
+                              SET password=".$ds->ds->QMagic($password)."
+                              WHERE userid=".$ds->ds->QMagic($userid));
       $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
       if ($result) {
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-07-24 16:35:37.068261756 +0200
+++ ipplan/admin/deletebounds.php	2009-07-24 16:51:07.699261009 +0200
@@ -54,7 +54,7 @@
 
 $ds->DbfTransactionStart();
 $result=&$ds->ds->Execute("DELETE FROM bounds
-                        WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+                        WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
   
 if ($result) {
    $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-07-24 16:35:37.072265328 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-24 16:51:25.950266841 +0200
@@ -51,7 +51,7 @@
 
 $where="";
 if ($grp) {
-   $where="WHERE grp=".$ds->ds->qstr($grp);
+   $where="WHERE grp=".$ds->ds->QMagic($grp);
 }
 
 $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-07-24 16:35:37.085272914 +0200
+++ ipplan/admin/importbase.php	2009-07-24 16:51:47.829261312 +0200
@@ -206,10 +206,10 @@
            insert($w,block("<b>".sprintf(my_("Row is duplicate - updating with [ %s, %s ]"), $ipaddr, $descrip)."</b>"));
 
            $result=&$ds->ds->Execute("UPDATE base
-                   SET descrip=".$ds->ds->qstr($descrip).",
+                   SET descrip=".$ds->ds->QMagic($descrip).",
                    lastmod=".$ds->ds->DBTimeStamp(time()).",
-                   userid=".$ds->ds->qstr(getAuthUsername()).",
-                   admingrp=".$ds->ds->qstr($admingrp)."
+                   userid=".$ds->ds->QMagic(getAuthUsername()).",
+                   admingrp=".$ds->ds->QMagic($admingrp)."
                    WHERE customer=$cust AND
                    baseaddr=$base");
 
@@ -225,12 +225,12 @@
                $result = &$ds->ds->Execute("INSERT INTO baseadd
                        (info, baseindex)
                        VALUES
-                       (".$ds->ds->qstr($info).",
+                       (".$ds->ds->QMagic($info).",
                         $baseindex)");
                // Second, try to update.
                if ( $result == FALSE ) {
                    $result=&$ds->ds->Execute("UPDATE baseadd
-                           SET info=".$ds->ds->qstr($info)."                                 
+                           SET info=".$ds->ds->QMagic($info)."                                 
                            WHERE baseindex=$baseindex");
 
                    if ( $result == FALSE ) {
@@ -267,12 +267,12 @@
                    $result = &$ds->ds->Execute("INSERT INTO baseadd
                            (info, baseindex)
                            VALUES
-                           (".$ds->ds->qstr($info).",
+                           (".$ds->ds->QMagic($info).",
                             $baseindex)");
                    // Second, try to update.
                    if ( $result == FALSE ) {
                        $result=&$ds->ds->Execute("UPDATE baseadd
-                               SET info=".$ds->ds->qstr($info)."                                 
+                               SET info=".$ds->ds->QMagic($info)."                                 
                                WHERE baseindex=$baseindex");
 
                        if ( $result == FALSE ) {
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-24 16:35:37.096261011 +0200
+++ ipplan/admin/usermanager.php	2009-07-24 16:50:49.924261394 +0200
@@ -96,8 +96,8 @@
 if ($usersearch != "") {
     $result=&$ds->ds->Execute("SELECT userid, userdescrip
             FROM users
-            WHERE userid LIKE ".$ds->ds->qstr("%".$usersearch."%")
-            ." OR userdescrip LIKE ".$ds->ds->qstr("%".$usersearch."%"));
+            WHERE userid LIKE ".$ds->ds->QMagic("%".$usersearch."%")
+            ." OR userdescrip LIKE ".$ds->ds->QMagic("%".$usersearch."%"));
 
     $MENU=".|".my_("Search Result")."\n";
     $count=0;
@@ -293,7 +293,7 @@
     list($ipaddr, $userid, $grp, $grpdescrip, $createcust, $grpview) = myRegister("S:ipaddr S:userid S:grp S:grpdescrip S:createcust S:grpview");
     $grp=trim($grp);
     $grpdescrip=trim($grpdescrip);
-    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->qstr($userid));
+    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->QMagic($userid));
     if ($result) {
         $row=$result->FetchRow();
     }
@@ -362,7 +362,7 @@
         // in a table and allow the user to delete them.
 
         insert($con, generic("br"));
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->qstr($userid));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->QMagic($userid));
         $lst=array();
 
         while($row = $result->FetchRow()) {
@@ -399,7 +399,7 @@
 
     list($ipaddr, $size, $grp) = myRegister("S:ipaddr S:size S:grp");
 
-    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->qstr($grp));
+    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->QMagic($grp));
     $row=$result->FetchRow();
     $grpdescrip=$row["grpdescrip"];
     $createcust=$row["createcust"];
@@ -474,7 +474,7 @@
         insert($f2,submit(array("value"=>my_("Add User"))));
         // Edit users assigned to the group.
 
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->qstr($grp));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->QMagic($grp));
 
         $lst=array();
         while($row = $result->FetchRow()) {
@@ -568,7 +568,7 @@
 
     $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
             FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)."
+            WHERE grp=".$ds->ds->QMagic($grp)."
             ORDER BY boundsaddr");
 
     // logic here is:
@@ -706,25 +706,25 @@
         $ds->DbfTransactionStart();
         // emulates mysql REPLACE
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid));
+                WHERE userid=".$ds->ds->QMagic($userid));
         $result=&$ds->ds->Execute("INSERT INTO users
                 (userid, userdescrip, useremail, password)
                 VALUES
-                (".$ds->ds->qstr($userid).",
-                 ".$ds->ds->qstr($userdescrip).",
-                 ".$ds->ds->qstr($useremail).",
-                 ".$ds->ds->qstr($password).")");
+                (".$ds->ds->QMagic($userid).",
+                 ".$ds->ds->QMagic($userdescrip).",
+                 ".$ds->ds->QMagic($useremail).",
+                 ".$ds->ds->QMagic($password).")");
 
         // add group if user selected a group other than "No group"
         if (!empty($grp)) {
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid)." AND
-                    grp=".$ds->ds->qstr($grp));
+                    WHERE userid=".$ds->ds->QMagic($userid)." AND
+                    grp=".$ds->ds->QMagic($grp));
             $result=&$ds->ds->Execute("INSERT INTO usergrp
                     (userid, grp)
                     VALUES
-                    (".$ds->ds->qstr($userid).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($userid).",
+                     ".$ds->ds->QMagic($grp).")");
         }
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -779,9 +779,9 @@
         $result=&$ds->ds->Execute("INSERT INTO grp
                 (grp, createcust, grpdescrip, grpopt, resaddr)
                 VALUES
-                (".$ds->ds->qstr($grp).",
-                 ".$ds->ds->qstr($createcust).",
-                 ".$ds->ds->qstr($grpdescrip).",
+                (".$ds->ds->QMagic($grp).",
+                 ".$ds->ds->QMagic($createcust).",
+                 ".$ds->ds->QMagic($grpdescrip).",
                  ".$grpbit.", $resaddr)");
 
         if ($result) {
@@ -803,8 +803,8 @@
 
     $ds->DbfTransactionStart();
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     if ($result) {
         $ds->DbfTransactionEnd();
         insert($w,text(my_("User deleted from group")));
@@ -835,9 +835,9 @@
     if ($userid) {
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid)) and
+                WHERE userid=".$ds->ds->QMagic($userid)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid));
+                    WHERE userid=".$ds->ds->QMagic($userid));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -853,8 +853,8 @@
         $userid=$usergrp;
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM usergrp
-                WHERE userid=".$ds->ds->qstr($userid)." AND
-                grp=".$ds->ds->qstr($grp));
+                WHERE userid=".$ds->ds->QMagic($userid)." AND
+                grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -874,7 +874,7 @@
         // check if grp has customers
         $result=&$ds->ds->Execute("SELECT custdescrip
                 FROM customer
-                WHERE admingrp=".$ds->ds->qstr($grp));
+                WHERE admingrp=".$ds->ds->QMagic($grp));
         if ($row=$result->FetchRow()) {
             $formerror .=my_("Cannot delete group because the following customers are assigned to the group:");
             do {
@@ -886,7 +886,7 @@
         // check if grp has subnets
         $result=&$ds->ds->Execute("SELECT baseaddr, descrip
                 FROM base
-                WHERE admingrp=".$ds->ds->qstr($grp)."
+                WHERE admingrp=".$ds->ds->QMagic($grp)."
                 ORDER BY baseaddr");
         if ($row=$result->FetchRow()) {
             $formerror .= my_("Cannot delete group because the following subnets are assigned to the group:");
@@ -898,11 +898,11 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM grp
-                WHERE grp=".$ds->ds->qstr($grp)) and
+                WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE grp=".$ds->ds->qstr($grp)) and
+                    WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM bounds
-                    WHERE grp=".$ds->ds->qstr($grp));
+                    WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -934,8 +934,8 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("UPDATE users
-                SET password=".$ds->ds->qstr($password)."
-                WHERE userid=".$ds->ds->qstr($userid));
+                SET password=".$ds->ds->QMagic($password)."
+                WHERE userid=".$ds->ds->QMagic($userid));
         $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
         if ($result) {
@@ -961,13 +961,13 @@
     $ds->DbfTransactionStart();
     // emulate mysql REPLACE
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     $result=&$ds->ds->Execute("INSERT INTO usergrp
             (userid, grp)
             VALUES
-            (".$ds->ds->qstr($userid).",
-             ".$ds->ds->qstr($grp).")");
+            (".$ds->ds->QMagic($userid).",
+             ".$ds->ds->QMagic($grp).")");
 
     if ($result) {
         $ds->DbfTransactionEnd();
@@ -1007,11 +1007,11 @@
         }
 
         $result=&$ds->ds->Execute("UPDATE grp
-                SET grpdescrip=".$ds->ds->qstr($grpdescrip).",
-                createcust=".$ds->ds->qstr($createcust).",
+                SET grpdescrip=".$ds->ds->QMagic($grpdescrip).",
+                createcust=".$ds->ds->QMagic($createcust).",
                 grpopt=".$grpbit.",
                 resaddr=".$resaddr."
-                WHERE grp=".$ds->ds->qstr($grp));
+                WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -1037,7 +1037,7 @@
 
         // creating readonly group?
         if ($base == 0 and $size == 0) {
-            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->qstr($grp))) {
+            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->QMagic($grp))) {
                 $formerror .= my_("Boundary cannot be created - overlaps with existing boundary")."\n";
             }
         }
@@ -1065,7 +1065,7 @@
             $result=&$ds->ds->Execute("INSERT INTO bounds
                     (boundsaddr, boundssize, grp)
                     VALUES
-                    ($base, $size, ".$ds->ds->qstr($grp).")");
+                    ($base, $size, ".$ds->ds->QMagic($grp).")");
 
             if ($result) {
                 $ds->DbfTransactionEnd();
@@ -1090,7 +1090,7 @@
                 ($boundsaddr < boundsaddr AND
                  $boundsaddr+$boundssize >
                  boundsaddr + boundssize - 1)) AND
-            grp=".$ds->ds->qstr($grp));
+            grp=".$ds->ds->QMagic($grp));
     if ($result->FetchRow()) {
         return 1;
     }
@@ -1101,7 +1101,7 @@
     list($grp, $boundsaddr) = myRegister("S:grp S:boundsaddr");
 
     $result=&$ds->ds->Execute("DELETE FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+            WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
 
     if ($result) {
         $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/auth.php ipplan/auth.php
--- ipplan.orig/auth.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/auth.php	2009-07-24 16:49:49.184261940 +0200
@@ -192,14 +192,14 @@
           $passwd=crypt($passwd, 'xq');
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
-                                   users.password=".$ds->qstr($passwd)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
+                                   users.password=".$ds->QMagic($passwd)." AND
                                    users.userid=usergrp.userid");
        }
        else {
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
                                    users.userid=usergrp.userid");
        }
        
diff -ruN ipplan.orig/class.dbflib.php ipplan/class.dbflib.php
--- ipplan.orig/class.dbflib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dbflib.php	2009-07-24 16:49:36.394261175 +0200
@@ -143,14 +143,14 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
         $result = &$this->ds->Execute("UPDATE ipaddr
-                SET userinf=".$this->ds->qstr($user).",
-                location=".$this->ds->qstr($location).",
-                telno=".$this->ds->qstr($telno).",
-                macaddr=".$this->ds->qstr($macaddr).",
-                descrip=".$this->ds->qstr($descrip).",
-                hname=".$this->ds->qstr($hname).",
+                SET userinf=".$this->ds->QMagic($user).",
+                location=".$this->ds->QMagic($location).",
+                telno=".$this->ds->QMagic($telno).",
+                macaddr=".$this->ds->QMagic($macaddr).",
+                descrip=".$this->ds->QMagic($descrip).",
+                hname=".$this->ds->QMagic($hname).",
                 lastmod=".$this->ds->DBTimeStamp(time()).",
-                userid=".$this->ds->qstr($userid)."
+                userid=".$this->ds->QMagic($userid)."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr");
         }
@@ -159,16 +159,16 @@
                     (userinf, location, telno, macaddr, descrip, hname,
                      baseindex, ipaddr, lastmod, userid)
                     VALUES
-                    (".$this->ds->qstr($user).",
-                     ".$this->ds->qstr($location).",
-                     ".$this->ds->qstr($telno).",
-                     ".$this->ds->qstr($macaddr).",
-                     ".$this->ds->qstr($descrip).",
-                     ".$this->ds->qstr($hname).",
+                    (".$this->ds->QMagic($user).",
+                     ".$this->ds->QMagic($location).",
+                     ".$this->ds->QMagic($telno).",
+                     ".$this->ds->QMagic($macaddr).",
+                     ".$this->ds->QMagic($descrip).",
+                     ".$this->ds->QMagic($hname).",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr($userid).")");
+                     ".$this->ds->QMagic($userid).")");
         }
 
         // always try to update record - record could not exist, which
@@ -183,7 +183,7 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
             $result = &$this->ds->Execute("UPDATE ipaddradd
-                    SET info=".$this->ds->qstr($info)."
+                    SET info=".$this->ds->QMagic($info)."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ipaddr");
         // this generates a "duplicate key" error if no update
@@ -195,7 +195,7 @@
                 $result = &$this->ds->Execute("INSERT INTO ipaddradd
                         (info, baseindex, ipaddr)
                         VALUES
-                        (".$this->ds->qstr($info).",
+                        (".$this->ds->QMagic($info).",
                          $baseindex,
                          $ipaddr)");
             }
@@ -208,9 +208,9 @@
         $userid = getAuthUsername();
 
         $result = &$this->ds->Execute("UPDATE ipaddr
-                           SET $field=".$this->ds->qstr($value).",
+                           SET $field=".$this->ds->QMagic($value).",
                               lastmod=".$this->ds->DBTimeStamp(time()).",
-                              userid=".$this->ds->qstr($userid)."
+                              userid=".$this->ds->QMagic($userid)."
                            WHERE baseindex=$baseindex AND ipaddr=$ipaddr");
 
         // record does not exist, error
@@ -331,11 +331,11 @@
                                baseopt, customer, userid, lastmod)
                            VALUES
                               ($baseaddr, $subnetsize,
-                              ".$this->ds->qstr($descrip).",
-                              ".$this->ds->qstr($grp).",
+                              ".$this->ds->QMagic($descrip).",
+                              ".$this->ds->QMagic($grp).",
                                $dhcp,
                                $cust,
-                              ".$this->ds->qstr($userid).",
+                              ".$this->ds->QMagic($userid).",
                               ".$this->ds->DBTimeStamp(time()).")");
 
         if (DBF_TYPE == "mysql" or DBF_TYPE == "maxsql") {
@@ -360,7 +360,7 @@
                             WHERE base.baseindex=$baseindex AND
                                base.customer=customer.customer AND
                                customer.admingrp=usergrp.grp AND
-                               usergrp.userid=".$this->ds->qstr($userid));
+                               usergrp.userid=".$this->ds->QMagic($userid));
 
         if ($row = $result->FetchRow()) {
             return $row["admingrp"];
@@ -376,9 +376,9 @@
         // could use GetRow here
         $result = &$this->ds->Execute("SELECT usergrp.grp
                             FROM usergrp, grp
-                            WHERE usergrp.userid=".$this->ds->qstr($userid)." AND
+                            WHERE usergrp.userid=".$this->ds->QMagic($userid)." AND
                                usergrp.grp=grp.grp AND
-                               grp.createcust=".$this->ds->qstr('Y'));
+                               grp.createcust=".$this->ds->QMagic('Y'));
 
         if ($row = $result->FetchRow()) {
             return $row["grp"];
@@ -425,7 +425,7 @@
 
         $string = " IN (";
         foreach($grps as $value) {
-            $string .= $this->ds->qstr($value).",";
+            $string .= $this->ds->QMagic($value).",";
         }
         return substr($string, 0, -1).")";
     }
@@ -457,7 +457,7 @@
 
         $result = &$this->ds->Execute("SELECT count(*) AS cnt
                          FROM bounds
-                         WHERE grp=".$this->ds->qstr($grp));
+                         WHERE grp=".$this->ds->QMagic($grp));
         $row = $result->FetchRow();
         // no bounds, group can do anything
         if ($row["cnt"] == 0) {
@@ -470,7 +470,7 @@
                                   boundsaddr + boundssize - 1) AND
                                   ($boundsaddr+$boundssize-1 BETWEEN boundsaddr AND 
                                       boundsaddr + boundssize - 1)) AND
-                                  grp=".$this->ds->qstr($grp));
+                                  grp=".$this->ds->QMagic($grp));
 
         if ($result->FetchRow()) {
             return 1;
@@ -719,16 +719,16 @@
                     (userinf, location, telno, descrip, hname,
                      baseindex, ipaddr, lastmod, lastpol, userid)
                     VALUES
-                    (".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("Unknown - added by IPplan poller").",
-                     ".$this->ds->qstr("").",
+                    (".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("Unknown - added by IPplan poller").",
+                     ".$this->ds->QMagic("").",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr("POLLER").")");
+                     ".$this->ds->QMagic("POLLER").")");
         }
 
     }
@@ -942,8 +942,8 @@
                 $this->ds->Execute("INSERT INTO auditlog
                         (action, userid, dt)
                         VALUES
-                        (".$this->ds->qstr(substr($message,0,254)).",
-                         ".$this->ds->qstr(getAuthUsername()).",
+                        (".$this->ds->QMagic(substr($message,0,254)).",
+                         ".$this->ds->QMagic(getAuthUsername()).",
                          ".$this->ds->DBTimeStamp(time()).")");
             }
             else if (is_array($message)) {
@@ -960,8 +960,8 @@
                     $this->ds->Execute("INSERT INTO auditlog
                             (action, userid, dt)
                             VALUES
-                            (".$this->ds->qstr(substr($value,0,254)).",
-                             ".$this->ds->qstr(getAuthUsername()).",
+                            (".$this->ds->QMagic(substr($value,0,254)).",
+                             ".$this->ds->QMagic(getAuthUsername()).",
                              ".$this->ds->DBTimeStamp(time()).")");
                 }
 
@@ -983,10 +983,10 @@
         if (!empty($search)) {
             switch ($expr) {
                 case "NLIKE":
-                    $sql="$var NOT LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var NOT LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "EXACT":
-                    $sql="$var = ".$this->ds->qstr("$search");
+                    $sql="$var = ".$this->ds->QMagic("$search");
                     break;
                 case "RLIKE":
                 // default is RLIKE, need to protect for DBF's without RLIKE
@@ -994,11 +994,11 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var ~ ".$this->ds->qstr("$search");
+                        $sql="$var ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "NRLIKE":
@@ -1006,22 +1006,22 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var NOT RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var NOT RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var NOT ~ ".$this->ds->qstr("$search");
+                        $sql="$var NOT ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "LIKE":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "END":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search");
                     break;
                 // default is START search
                 default:
-                    $sql="$var LIKE ".$this->ds->qstr("$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("$search%");
             }
             // should there be an AND?
             if ($addand) {
diff -ruN ipplan.orig/class.dnslib.php ipplan/class.dnslib.php
--- ipplan.orig/class.dnslib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dnslib.php	2009-07-24 16:49:13.294270409 +0200
@@ -262,10 +262,10 @@
                      recordtype, userid, ip_hostname) ".
                     "VALUES ($this->cust, $dataid, ". $i.",".
                     $this->ds->DBTimeStamp(time()).",".
-                    $this->ds->qstr($host).",".
-                    $this->ds->qstr($recordtype).",".
-                    $this->ds->qstr(getAuthUsername()).",".
-                    $this->ds->qstr($iphostname).")" );
+                    $this->ds->QMagic($host).",".
+                    $this->ds->QMagic($recordtype).",".
+                    $this->ds->QMagic(getAuthUsername()).",".
+                    $this->ds->QMagic($iphostname).")" );
             if (!$result) {
                 return FALSE;
             }
@@ -288,7 +288,7 @@
                         (id, hname, horder)
                         VALUES
                         ($dataid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
                 if (!$result) {
                     return FALSE;
@@ -340,23 +340,23 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
                 ", serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",createmod=".$this->ds->DBDate($this->createmod).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
                 ",expiremod=".$this->ds->DBDate($this->expiremod).
                 ",regmod=".$this->ds->DBDate($this->regmod).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND data_id=".$dataid );
 
         if($this->ds->GetRow("SELECT info
@@ -364,7 +364,7 @@
                 WHERE customer=$cust AND
                 data_id=$dataid")) {   // should have FOR UPDATE here!
             $result = $this->ds->Execute("UPDATE fwdzoneadd ".
-                "set info=".$this->ds->qstr($this->info).
+                "set info=".$this->ds->QMagic($this->info).
                 " WHERE customer=$cust AND data_id=".$dataid );
         } 
         else {  // no record, insert
@@ -372,7 +372,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
         }
@@ -398,23 +398,23 @@
             createmod, lastmod, expiremod, regmod, serialdate, serialnum, ttl, refresh, retry, 
             expire, minimum, responsiblemail, userid, zonefilepath1, zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust,".
-                $this->ds->qstr($this->domain).",".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->domain).",".
+                $this->ds->QMagic("E").",".
                 $this->ds->DBDate($this->createmod).",".
                 $this->ds->DBTimeStamp(time()).",".
                 $this->ds->DBDate($this->expiremod).",".
                 $this->ds->DBDate($this->regmod).",".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -427,7 +427,7 @@
                 $result=$this->ds->Execute("SELECT data_id 
                         FROM fwdzone
                         WHERE customer=$this->cust AND 
-                        domain=".$this->ds->qstr($this->domain));
+                        domain=".$this->ds->QMagic($this->domain));
                 $temprow = $result->FetchRow();
                 $dataid=$temprow["data_id"];
             }
@@ -436,7 +436,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
             return $dataid;
@@ -465,7 +465,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT domain FROM fwdzone 
-                WHERE customer=$cust AND domain = ".$this->ds->qstr($this->domain));
+                WHERE customer=$cust AND domain = ".$this->ds->QMagic($this->domain));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -499,11 +499,11 @@
                         (data_id, host, recordtype, ip_hostname, sortorder, customer, userid, lastmod)
                         SELECT $dataid AS data_id, fwdzonerec.host, fwdzonerec.recordtype, 
                             fwdzonerec.ip_hostname, fwdzonerec.sortorder, fwdzonerec.customer, 
-                            ".$this->ds->qstr(getAuthUsername())." AS userid,
+                            ".$this->ds->QMagic(getAuthUsername())." AS userid,
                             ".$this->ds->DBTimeStamp(time())." AS lastmod
                         FROM fwdzonerec, fwdzone
                         WHERE fwdzonerec.data_id=fwdzone.data_id AND 
-                            fwdzone.domain=".$this->ds->qstr("template.com"));
+                            fwdzone.domain=".$this->ds->QMagic("template.com"));
 
                 }
                 $this->err = 0;
@@ -526,9 +526,9 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
-                ", error_message=".$this->ds->qstr("").
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
+                ", error_message=".$this->ds->QMagic("").
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
                 ", serialnum=$this->serialnum".
                 " WHERE customer=$cust AND data_id=".$dataid);
@@ -798,7 +798,7 @@
                         (id, hname, horder)
                         VALUES
                         ($zoneid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
 
                 if (!$result) {
@@ -854,22 +854,22 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE zones SET zoneip=$zoneip".
-                ",zone=".$this->ds->qstr($this->zone).
+                ",zone=".$this->ds->QMagic($this->zone).
                 ",zonesize=$size".
-                ",serialdate=".$this->ds->qstr($this->serialdate).
+                ",serialdate=".$this->ds->QMagic($this->serialdate).
                 ",serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND id=".$zoneid );
 
         // delete all the DNS records first to preserve correct order
@@ -896,20 +896,20 @@
                  lastmod, responsiblemail, userid, zonefilepath1, 
                  zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust, $this->zoneip,".
-                $this->ds->qstr($this->zone).", $this->size,".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->zone).", $this->size,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic("E").",".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
                 $this->ds->DBTimeStamp(time()).",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -953,7 +953,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT zone FROM zones
-                WHERE customer=$cust AND zone = ".$this->ds->qstr($this->zone));
+                WHERE customer=$cust AND zone = ".$this->ds->QMagic($this->zone));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -999,10 +999,10 @@
         $this->Serial();
 
         $result = $this->ds->Execute("UPDATE zones ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
-                ", error_message=".$this->ds->qstr("").
+                ", error_message=".$this->ds->QMagic("").
                 ", serialnum=$this->serialnum ".
                 " WHERE customer=$cust AND id=$zoneid");
 
@@ -1155,8 +1155,8 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-        "set serialdate=".$this->ds->qstr($this->serialdate).
-        ", userid=".$this->ds->qstr(getAuthUsername()).
+        "set serialdate=".$this->ds->QMagic($this->serialdate).
+        ", userid=".$this->ds->QMagic(getAuthUsername()).
         ", serialnum=$this->serialnum".
         " WHERE customer=$cust AND data_id=".$zoneid);
 
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-07-24 16:35:37.098269923 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-24 16:48:58.061261570 +0200
@@ -242,7 +242,7 @@
 
                 if ($hostnames) {
                     $result = $ds->Execute("UPDATE ipaddr
-                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->qstr($hname)."
+                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->QMagic($hname)."
                             WHERE baseindex=$baseindex AND
                             ipaddr=$ipaddr");
                 }
@@ -258,23 +258,23 @@
                             (userinf, location, telno, descrip, hname,
                              baseindex, ipaddr, lastmod, lastpol, userid)
                             VALUES
-                            (".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("Unknown - added by IPplan command line poller").",
-                             ".$ds->qstr($hname).",
+                            (".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("Unknown - added by IPplan command line poller").",
+                             ".$ds->QMagic($hname).",
                              $baseindex, 
                              $ipaddr,
                              ".$ds->DBTimeStamp(time()).",
                              ".$ds->DBTimeStamp(time()).",
-                             ".$ds->qstr("POLLER").")");
+                             ".$ds->QMagic("POLLER").")");
 
                     if ($audit) {
                         $ds->Execute("INSERT INTO auditlog
                                 (action, userid, dt)
                                 VALUES
-                                (".$ds->qstr(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
-                                 ".$ds->qstr("POLLER").",
+                                (".$ds->QMagic(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
+                                 ".$ds->QMagic("POLLER").",
                                  ".$ds->DBTimeStamp(time()).")");
                     }
                 }
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-07-24 16:35:37.104261224 +0200
+++ ipplan/user/createarea.php	2009-07-24 16:45:44.647275743 +0200
@@ -84,7 +84,7 @@
       $ds->DbfTransactionStart();
       if ($action=="modify") {
           $result=&$ds->ds->Execute("UPDATE area SET areaaddr=$base, 
-                  descrip=".$ds->ds->qstr($descrip)." WHERE areaindex=$areaindex") and
+                  descrip=".$ds->ds->QMagic($descrip)." WHERE areaindex=$areaindex") and
           $ds->AuditLog(array("event"=>151, "action"=>"modify area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
@@ -93,7 +93,7 @@
           $result=&$ds->ds->Execute("INSERT INTO area
                   (areaaddr, descrip, customer)
                   VALUES
-                  ($base, ".$ds->ds->qstr($descrip).", $cust)") and
+                  ($base, ".$ds->ds->QMagic($descrip).", $cust)") and
           $ds->AuditLog(array("event"=>150, "action"=>"create area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-07-24 16:35:37.106272084 +0200
+++ ipplan/user/createrange.php	2009-07-24 16:45:10.911264478 +0200
@@ -166,7 +166,7 @@
         if ($action=="modify") {
 
             $result=&$ds->ds->Execute("UPDATE netrange SET areaindex=$areaindex, 
-                    descrip=".$ds->ds->qstr($descrip).",
+                    descrip=".$ds->ds->QMagic($descrip).",
                     rangeaddr=$base, rangesize=$size
                     WHERE rangeindex=$rangeindex") and
                 $ds->AuditLog(array("event"=>161, "action"=>"modify range", 
@@ -179,7 +179,7 @@
                      customer)
                     VALUES
                     ($base, $size, $areaindex,
-                     ".$ds->ds->qstr($descrip).",
+                     ".$ds->ds->QMagic($descrip).",
                      $cust)") and
                     $ds->AuditLog(array("event"=>160, "action"=>"create range", 
                                 "descrip"=>$descrip, "user"=>getAuthUsername(), "areaindex"=>$areaindex,
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-07-24 16:35:37.111261269 +0200
+++ ipplan/user/createsubnet.php	2009-07-24 16:47:00.295261634 +0200
@@ -219,7 +219,7 @@
                 $result = &$ds->ds->Execute("INSERT INTO baseadd
                         (info, baseindex)
                         VALUES
-                        (".$ds->ds->qstr($info).", $id)");
+                        (".$ds->ds->QMagic($info).", $id)");
             }
 
             $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-07-24 16:35:37.134260756 +0200
+++ ipplan/user/displaysubnet.php	2009-07-24 16:45:26.829261752 +0200
@@ -221,7 +221,7 @@
                                     WHERE base.customer=$cust AND
                                     base.baseindex=ipaddr.baseindex AND
                                     ipaddr.ipaddr!=$ip AND
-                                    ipaddr.macaddr=".$ds->ds->qstr($macaddr))) {
+                                    ipaddr.macaddr=".$ds->ds->QMagic($macaddr))) {
                             $formerror .= sprintf(my_("Duplicate MAC address: %s"), $oldmacaddr)."\n";
                             insert($w,anchor("searchall.php?cust=".$cust."&field=macaddr&search=".$macaddr,
                                 my_("Show duplicate MAC addresses")));
@@ -302,7 +302,7 @@
                                     WHERE requestindex=$request");
                             $gw=$ds->ds->GetOne("SELECT ipaddr FROM ipaddr
                                     WHERE baseindex=$baseindex AND 
-                                       descrip LIKE ".$ds->ds->qstr("GW%"));
+                                       descrip LIKE ".$ds->ds->QMagic("GW%"));
 
                             $body="?Subject=IP address request actioned&body=";
                             $body2="The request details submitted: $requestdesc\n\n";
@@ -925,15 +925,15 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot delete
         if($recs == 1) {
             $row=$result->FetchRow();
@@ -944,7 +944,7 @@
 
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$recidx") and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dom_id) and
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
                             "user"=>getAuthUsername(), "id"=>$recidx));
@@ -979,13 +979,13 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot update
         if($recs == 1) {
             // does domain name of record match ip records hostname?
@@ -1005,13 +1005,13 @@
             }
 
             insert($w,textbr(my_("IP hostname field in DNS forward zone modified")));
-            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->qstr($hnametmp).",
+            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->QMagic($hnametmp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
-                    userid=".$ds->ds->qstr(getAuthUsername())."
+                    userid=".$ds->ds->QMagic(getAuthUsername())."
                     WHERE customer=$cust AND
-                    recordtype=".$ds->ds->qstr("A")." AND 
-                    ip_hostname=".$ds->ds->qstr(inet_ntoa($ip))) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                    recordtype=".$ds->ds->QMagic("A")." AND 
+                    ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip))) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
@@ -1042,12 +1042,12 @@
             $result = &$ds->ds->Execute("SELECT length(domain) AS domainlen, data_id, domain
                     FROM fwdzone
                     WHERE customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain
+                    ".$ds->ds->QMagic($hname."$")." $regex domain
                     ORDER BY domainlen DESC");
 
             $recs=$result->PO_RecordCount("fwdzone", 
                     "customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain");
+                    ".$ds->ds->QMagic($hname."$")." $regex domain");
 
             // must be exactly one matching zone only, or more than one zone
             // sorted DESC. If second case, use first record for longest match
@@ -1063,12 +1063,12 @@
                          recordtype, error_message, userid, ip_hostname) ".
                         "VALUES ($cust, $dataid, 9999,".
                         $ds->ds->DBTimeStamp(time()).",".
-                        $ds->ds->qstr($hnametmp).",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr(getAuthUsername()).",".
-                        $ds->ds->qstr(inet_ntoa($ip)).")" ) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                        $ds->ds->QMagic($hnametmp).",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic(getAuthUsername()).",".
+                        $ds->ds->QMagic(inet_ntoa($ip)).")" ) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-07-24 16:35:37.142261270 +0200
+++ ipplan/user/exportdhcp.php	2009-07-24 16:47:14.257261620 +0200
@@ -150,7 +150,7 @@
     $result_ip=&$ds->ds->Execute("SELECT ipaddr, macaddr, hname
             FROM ipaddr
             WHERE baseindex=$baseindex AND
-            userinf LIKE ".$ds->ds->qstr("%".DHCPRESERVED."%")."
+            userinf LIKE ".$ds->ds->QMagic("%".DHCPRESERVED."%")."
             ORDER BY ipaddr");
 
     $iprange_dynamicIPs=array();
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-07-24 16:35:37.157277068 +0200
+++ ipplan/user/modifybase.php	2009-07-24 16:48:36.765261577 +0200
@@ -224,7 +224,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size*2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
 
         $ds->AuditLog(array("event"=>173, "action"=>"join subnet", 
@@ -240,7 +240,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size/2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
         // ... and create new subnet
         $timetmp=time();
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-07-24 16:35:37.160261295 +0200
+++ ipplan/user/modifycustomer.php	2009-07-24 16:48:21.805261227 +0200
@@ -126,9 +126,9 @@
             $result=&$ds->ds->Execute("INSERT INTO customer
                     (custdescrip, crm, admingrp)
                     VALUES
-                    (".$ds->ds->qstr($custdescrip).",
-                     ".$ds->ds->qstr($crm).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($custdescrip).",
+                     ".$ds->ds->QMagic($crm).",
+                     ".$ds->ds->QMagic($grp).")");
 
             // did not fail due to key error?
             if ($result) {
@@ -139,7 +139,7 @@
                     // emulate getting the last insert_id
                     $result=&$ds->ds->Execute("SELECT customer 
                             FROM customer
-                            WHERE custdescrip=".$ds->ds->qstr($custdescrip));
+                            WHERE custdescrip=".$ds->ds->QMagic($custdescrip));
                     $temprow = $result->FetchRow();
                     $cust=$temprow["customer"];
                 }
@@ -160,9 +160,9 @@
             }
 
             $result=&$ds->ds->Execute("UPDATE customer
-                    SET custdescrip=".$ds->ds->qstr($custdescrip).",
-                    crm=".$ds->ds->qstr($crm).",
-                    admingrp=".$ds->ds->qstr($grp)."
+                    SET custdescrip=".$ds->ds->QMagic($custdescrip).",
+                    crm=".$ds->ds->QMagic($crm).",
+                    admingrp=".$ds->ds->QMagic($grp)."
                     WHERE customer=$cust");
 
             // did not fail due to key error?
@@ -176,7 +176,7 @@
         // test for CRM duplicates - this is not a unique key and cannot be 
         if (!empty($crm)) {
             $recs=$ds->ds->GetOne("SELECT count(*) AS cnt FROM customer 
-                    WHERE crm=".$ds->ds->qstr($crm));
+                    WHERE crm=".$ds->ds->QMagic($crm));
             if ($recs > 1) {  //duplicate ?
                 insert($w,text(my_("The CRM field has already been used for another customer"), array("color"=>"#FF0000")));
                 insert($w,textbr());
@@ -200,25 +200,25 @@
                      phne, mbox)
                     VALUES
                     ($cust,
-                     ".$ds->ds->qstr("").",
-                     ".$ds->ds->qstr($org).",
-                     ".$ds->ds->qstr($street).",
-                     ".$ds->ds->qstr($city).",
-                     ".$ds->ds->qstr($state).",
-                     ".$ds->ds->qstr($zipcode).",
-                     ".$ds->ds->qstr($cntry).",
-                     ".$ds->ds->qstr($nichandl).",
-                     ".$ds->ds->qstr($lname).",
-                     ".$ds->ds->qstr($fname).",
-                     ".$ds->ds->qstr($mname).",
-                     ".$ds->ds->qstr($torg).",
-                     ".$ds->ds->qstr($tstreet).",
-                     ".$ds->ds->qstr($tcity).",
-                     ".$ds->ds->qstr($tstate).",
-                     ".$ds->ds->qstr($tzipcode).",
-                     ".$ds->ds->qstr($tcntry).",
-                     ".$ds->ds->qstr($phne).",
-                     ".$ds->ds->qstr($mbox).")");
+                     ".$ds->ds->QMagic("").",
+                     ".$ds->ds->QMagic($org).",
+                     ".$ds->ds->QMagic($street).",
+                     ".$ds->ds->QMagic($city).",
+                     ".$ds->ds->QMagic($state).",
+                     ".$ds->ds->QMagic($zipcode).",
+                     ".$ds->ds->QMagic($cntry).",
+                     ".$ds->ds->QMagic($nichandl).",
+                     ".$ds->ds->QMagic($lname).",
+                     ".$ds->ds->QMagic($fname).",
+                     ".$ds->ds->QMagic($mname).",
+                     ".$ds->ds->QMagic($torg).",
+                     ".$ds->ds->QMagic($tstreet).",
+                     ".$ds->ds->QMagic($tcity).",
+                     ".$ds->ds->QMagic($tstate).",
+                     ".$ds->ds->QMagic($tzipcode).",
+                     ".$ds->ds->QMagic($tcntry).",
+                     ".$ds->ds->QMagic($phne).",
+                     ".$ds->ds->QMagic($mbox).")");
 
             // delete all the DNS records first to preserve correct order
             $result=&$ds->ds->Execute("DELETE FROM revdns
@@ -235,8 +235,8 @@
                             (customer, hname, ipaddr, horder)
                             VALUES
                             ($cust,
-                             ".$ds->ds->qstr($hnametemp).",
-                             ".$ds->ds->qstr($ipaddrtemp).",
+                             ".$ds->ds->QMagic($hnametemp).",
+                             ".$ds->ds->QMagic($ipaddrtemp).",
                              $i)");
                 }
             }
@@ -245,7 +245,7 @@
                         FROM custadd
                         WHERE customer=$cust")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE custadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE customer=$cust");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -256,7 +256,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO custadd
                             (info, customer)
                             VALUES
-                            (".$ds->ds->qstr($info).", $cust)");
+                            (".$ds->ds->QMagic($info).", $cust)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-07-24 16:35:37.165261158 +0200
+++ ipplan/user/modifydns.php	2009-07-24 16:47:32.669263630 +0200
@@ -245,10 +245,10 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $ds->dataid, 9999,".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".               // myhost or myhost.mydomain.com.
-            $ds->ds->qstr($recordtype).",".         // A, MX, NS
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" );       // ip address for A, or 10 myhost for MX
+            $ds->ds->QMagic($host).",".               // myhost or myhost.mydomain.com.
+            $ds->ds->QMagic($recordtype).",".         // A, MX, NS
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" );       // ip address for A, or 10 myhost for MX
             */
 
             $ds->AuditLog(array("event"=>111, "action"=>"add forward zone", "cust"=>$cust,
@@ -316,7 +316,7 @@
     if ($dataid==0) {
         $dataid = &$ds->ds->GetCol("SELECT data_id
                 FROM fwdzone 
-                WHERE customer=$cust AND error_message=".$ds->ds->qstr("E")."
+                WHERE customer=$cust AND error_message=".$ds->ds->QMagic("E")."
                 ORDER BY domain ");
     }
     
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-07-24 16:35:37.170261039 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-24 16:46:37.127261298 +0200
@@ -81,7 +81,7 @@
 if ($action=="delete") {
     if (!$dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain))) {
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain))) {
         myError($w,$p, my_("Could not find the zone - possibly deleted by another user"));
     }
 
@@ -110,7 +110,7 @@
                     $baseindex=$row1["baseindex"];
 
                     $ds->ds->Execute("UPDATE ipaddr
-                            SET hname=".$ds->ds->qstr($row["host"])."
+                            SET hname=".$ds->ds->QMagic($row["host"])."
                             WHERE baseindex=$baseindex AND ipaddr=".inet_aton($row["ip_hostname"]));
                     insert($w,textbr(sprintf(my_("IP record %s updated in subnet '%s' due to deletion of auto created A record"), $row["ip_hostname"], $row1["descrip"])));
                 }
@@ -118,7 +118,7 @@
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$value") and
             $ds->ds->Execute("UPDATE fwdzone 
-                    SET error_message=".$ds->ds->qstr("E").",
+                    SET error_message=".$ds->ds->QMagic("E").",
                     lastmod=".$ds->ds->DBTimeStamp(time()).
                     " WHERE customer=$cust AND data_id=".$dom_id) and 
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
@@ -161,7 +161,7 @@
     $result = &$ds->ds->Execute("SELECT fwdzonerec.recidx, fwdzonerec.sortorder 
             FROM fwdzone, fwdzonerec
             WHERE fwdzone.customer=$cust AND 
-            fwdzone.domain=".$ds->ds->qstr($domain)." AND
+            fwdzone.domain=".$ds->ds->QMagic($domain)." AND
             fwdzone.data_id=fwdzonerec.data_id
             ORDER by fwdzonerec.sortorder");
 
@@ -297,14 +297,14 @@
     $result = &$ds->ds->Execute("SELECT customer 
                                 FROM fwdzonerec 
                                 WHERE customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
 
     $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
     if($recs > 0) {
         myError($w,$p, my_("Cannot create duplicate records"));
     }
@@ -317,12 +317,12 @@
         $result = &$ds->ds->Execute("SELECT ip_hostname 
                 FROM fwdzonerec 
                 WHERE customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
 
         $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
         if($recs == 1) {
             $updateiprec=1;
         }
@@ -361,12 +361,12 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $zoneid, ". $sortorder.",".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".
-            $ds->ds->qstr($recordtype).",".
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" ) and
+            $ds->ds->QMagic($host).",".
+            $ds->ds->QMagic($recordtype).",".
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
@@ -392,7 +392,7 @@
     }
     $dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain));
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain));
 
     // Updated DB here.
     // Log the Transaction.
@@ -411,14 +411,14 @@
     }
 
     $result = &$ds->ds->Execute("UPDATE fwdzonerec SET sortorder=".$sortorder.
-            ", host=".$ds->ds->qstr($host).
+            ", host=".$ds->ds->QMagic($host).
             ", lastmod=".$ds->ds->DBTimeStamp(time()).
-            ", recordtype=".$ds->ds->qstr($recordtype).
-            ", userid=".$ds->ds->qstr(getAuthUsername()).
-            ", ip_hostname=".$ds->ds->qstr($iphostname).
+            ", recordtype=".$ds->ds->QMagic($recordtype).
+            ", userid=".$ds->ds->QMagic(getAuthUsername()).
+            ", ip_hostname=".$ds->ds->QMagic($iphostname).
             " WHERE customer=$cust AND recidx=".$dataid ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
@@ -458,7 +458,7 @@
 
 $result = &$ds->ds->Execute("SELECT domain, data_id FROM fwdzone 
                             WHERE customer=$cust AND 
-                            slaveonly=".$ds->ds->qstr("N")."
+                            slaveonly=".$ds->ds->QMagic("N")."
                             ORDER BY domain");
 if (!$result) {
    myError($w,$p, my_("No domains found. Create some domains and try again."));
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-07-24 16:35:37.175260999 +0200
+++ ipplan/user/modifyipform.php	2009-07-24 16:47:47.499261554 +0200
@@ -192,7 +192,7 @@
 
             // add serialized info from file upload
             $ds->ds->Execute("UPDATE ipaddradd
-                    SET infobin=".$ds->ds->qstr(serialize($files))."
+                    SET infobin=".$ds->ds->QMagic(serialize($files))."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ip");
             // this generates a "duplicate key" error if no update
@@ -202,7 +202,7 @@
                 $ds->ds->Execute("INSERT INTO ipaddradd
                         (infobin, baseindex, ipaddr)
                         VALUES
-                        (".$ds->ds->qstr(serialize($files)).",
+                        (".$ds->ds->QMagic(serialize($files)).",
                          $baseindex,
                          $ip)");
             }
@@ -235,7 +235,7 @@
 
         // add serialized info after file deteled
         $ds->ds->Execute("UPDATE ipaddradd
-                SET infobin=".$ds->ds->qstr(empty($files) ? "" : serialize($files))."
+                SET infobin=".$ds->ds->QMagic(empty($files) ? "" : serialize($files))."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ip") and
             $ds->AuditLog(array("event"=>141, "action"=>"delete file", 
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-07-24 16:35:37.177261840 +0200
+++ ipplan/user/modifysubnet.php	2009-07-24 16:44:56.606265283 +0200
@@ -129,11 +129,11 @@
                 // between base and baseadd is baseindex column
                 if ($duplicatesubnet==0) {
                     $result=&$ds->ds->Execute("UPDATE base
-                            SET descrip=".$ds->ds->qstr($descrip).",
-                            admingrp=".$ds->ds->qstr($grp).",
+                            SET descrip=".$ds->ds->QMagic($descrip).",
+                            admingrp=".$ds->ds->QMagic($grp).",
                             customer=$cust,
                             lastmod=".$ds->ds->DBTimeStamp(time()).",
-                            userid=".$ds->ds->qstr($userid)."
+                            userid=".$ds->ds->QMagic($userid)."
                             WHERE baseindex=$baseindex");
                     
                     $ds->AuditLog(array("event"=>174, "action"=>"move subnet", 
@@ -163,13 +163,13 @@
                                         (ipaddr, userinf, location, telno,
                                          descrip, lastmod, userid, baseindex)
                                         VALUES
-                                        (".$ds->ds->qstr($tempipaddr).",
-                                         ".$ds->ds->qstr($tempuser).",
-                                         ".$ds->ds->qstr($templocation).",
-                                         ".$ds->ds->qstr($temptelno).",
-                                         ".$ds->ds->qstr($tempdescrip).",
+                                        (".$ds->ds->QMagic($tempipaddr).",
+                                         ".$ds->ds->QMagic($tempuser).",
+                                         ".$ds->ds->QMagic($templocation).",
+                                         ".$ds->ds->QMagic($temptelno).",
+                                         ".$ds->ds->QMagic($tempdescrip).",
                                          $templastmod,
-                                         ".$ds->ds->qstr($tempuserid).",
+                                         ".$ds->ds->QMagic($tempuserid).",
                                          $id)");
                             } // end while
                         }
@@ -206,11 +206,11 @@
 
             $ds->DbfTransactionStart();
             $result=&$ds->ds->Execute("UPDATE base
-                    SET descrip=".$ds->ds->qstr($descrip).",
-                    admingrp=".$ds->ds->qstr($grp).",
+                    SET descrip=".$ds->ds->QMagic($descrip).",
+                    admingrp=".$ds->ds->QMagic($grp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
                     baseopt=$dhcp,
-                    userid=".$ds->ds->qstr($userid)."
+                    userid=".$ds->ds->QMagic($userid)."
                     WHERE baseindex=$baseindex") and
                 $ds->AuditLog(array("event"=>171, "action"=>"modify subnet", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "baseaddr"=>inet_ntoa($base),
@@ -242,7 +242,7 @@
                         FROM baseadd
                         WHERE baseindex=$baseindex")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE baseadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE baseindex=$baseindex");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -253,7 +253,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO baseadd
                             (info, baseindex)
                             VALUES
-                            (".$ds->ds->qstr($info).", $baseindex)");
+                            (".$ds->ds->QMagic($info).", $baseindex)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-07-24 16:35:37.182261244 +0200
+++ ipplan/user/modifyzone.php	2009-07-24 16:46:00.574261375 +0200
@@ -276,7 +276,7 @@
                 WHERE zones.customer=base.customer AND 
                 base.baseindex=ipaddr.baseindex AND 
                 zones.customer=$cust AND
-                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->qstr("E").") AND
+                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->QMagic("E").") AND
                 ipaddr.ipaddr >= zones.zoneip AND 
                 ipaddr.ipaddr < zones.zoneip+zones.zonesize");
     }
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-07-24 16:35:37.186261178 +0200
+++ ipplan/user/requestip.php	2009-07-24 16:46:16.008271108 +0200
@@ -120,14 +120,14 @@
                  hname, telno, macaddr, info)
                 VALUES
                 ($cust,
-                 ".$ds->ds->qstr($request).",
-                 ".$ds->ds->qstr($user).",
-                 ".$ds->ds->qstr($location).",
-                 ".$ds->ds->qstr($descrip).",
-                 ".$ds->ds->qstr($hname).",
-                 ".$ds->ds->qstr($telno).",
-                 ".$ds->ds->qstr($newmacaddr).",
-                 ".$ds->ds->qstr($info).")") and
+                 ".$ds->ds->QMagic($request).",
+                 ".$ds->ds->QMagic($user).",
+                 ".$ds->ds->QMagic($location).",
+                 ".$ds->ds->QMagic($descrip).",
+                 ".$ds->ds->QMagic($hname).",
+                 ".$ds->ds->QMagic($telno).",
+                 ".$ds->ds->QMagic($newmacaddr).",
+                 ".$ds->ds->QMagic($info).")") and
                 $ds->AuditLog(array("event"=>200, "action"=>"request ip", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "userinf"=>$user,
                             "location"=>$location, "hname"=>$hname, "telno"=>$telno, 
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-07-24 16:35:37.191261348 +0200
+++ ipplan/user/searchall.php	2009-07-24 16:48:04.835262321 +0200
@@ -94,35 +94,35 @@
       myError($w,$p, my_("Regular expression repetition-operator operand invalid"));
    }
 /*   if ($field == "any") {
-      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search).")";
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search);
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info RLIKE ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else if (DBF_TYPE=="postgres7") {
@@ -131,65 +131,65 @@
    }
    /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname ~ ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info ~ ".$ds->ds->qstr($search).")";
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location ~ ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno ~ ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip ~ ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname ~ ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr($search);
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info ~ ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else {
     /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%").")";
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%").")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "location")
-      $where="WHERE ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "template") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%");
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%");
    }
 }
 


--- NEW FILE ipplan.spec ---
Name:		ipplan
Version:	4.92
Release:	3%{?dist}
Summary:	Web-based IP address manager and tracker
Group:		Applications/Internet
License:	GPLv2+
URL:		http://iptrack.sourceforge.net/
Source0:	http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}.tar.gz
Source1:	%{name}-mysql.sql
Source2:	%{name}-pgsql.sql
Source3:	README.%{name}
# Fedora specific patches to use libraries shipped with fedora
Patch1:		ipplan-set-menus-path.patch
Patch2:		ipplan-set-adodb-path.patch
Patch3:		ipplan-use-qmagic.patch
Patch4:		ipplan-set-phpmailer-path.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php, httpd
Requires:	php-gettext, php-snmp
Requires:	php-layers-menu, php-adodb, php-PHPMailer

%description
IPplan is an administrative tool for ISPs and network service companies.
It goes beyond IP address management to provide DNS administration,
configuration file management, circuit management and storing of hardware
information, all customizable via templates. IPplan can handle a single
network or cater for multiple networks and customers with overlapping address
space. Making managing IP addresses and address spaces simple and easy.
It is written in PHP and requires a MySQL or PostgresSQL database.

%prep
%setup -q -n %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

find . -name README.html -delete
find . -type f -print0 | xargs -0 sed -i 's/\r//'
sed -i -e "s/\(\.*\"UPLOADDIRECTORY\"[^'\"]*['\"]\)[^'\"]*\(['\"].*\)/\1\/var\/cache\/ipplan\2/" config.php
sed -i 's|/tmp/|%{_tmppath}/%{name}/|' config.php
find . -type f -exec chmod a-x {} \;
#remove bundled phplayersmenu
rm -rf menus/
sed -i 's:/usr/local:/usr:' contrib/*.{pl,php}
mkdir sql
cp -p %SOURCE1 %SOURCE2 sql
cp %SOURCE3 %{name}-README.fedora
#remove bundled adodb
rm -rf adodb/
#remove bundled phpMailer
rm -f class.smtp.php class.phpmailer.php phpmailer.lang-en.php
cat <<EOF >%{name}.conf
# %{name}
# %{summary}
# %{version}a
#
Alias /%{name} %{_datadir}/%{name}
Alias /menus %{_datadir}/php/php-layers-menu

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	AllowOverride Limit Options FileInfo
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

<DirectoryMatch "^%{_datadir}/%{name}/(.*/)?(adodb|templates)/(.*)?">
	Order Deny,Allow
	Deny from all
</DirectoryMatch>
EOF

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/images
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/user
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -p -d $RPM_BUILD_ROOT%{_localstatedir}/cache/%{name}
cp -pr admin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
cp -pr images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
cp -pr layout/* $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
cp -pr templates/* $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
cp -pr themes/* $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
cp -pr user/* $RPM_BUILD_ROOT%{_datadir}/%{name}/user
cp -pr locale/* $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -D -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
install -p -D -m0644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -D -m0644 *.html $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.js $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.css $RPM_BUILD_ROOT%{_datadir}/%{name}/
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -fs ../../..%{_sysconfdir}/%{name}/config.php .
popd

for lang in locale/*; do
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
	if [ -f $lang/LC_MESSAGES/*.mo ]; then
		for file in $lang/LC_MESSAGES/*.mo; do
			rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES/`basename $file`
			cp -a $file $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES/%{name}.mo
			pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
			ln -fs ../../../../locale/`basename $lang`/LC_MESSAGES/%{name}.mo messages.mo
			popd
		done
	fi
done
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc gpl.html %{name}-README.fedora contrib PORTERS INTERNALS CONTRIBUTORS INSTALL-POSTGRESQL TODO TRANSLATIONS TRIGGERS UPGRADE sql
%dir %{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/%{name}
%{_datadir}/%{name}/*

%changelog
* Mon Aug 24 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Remove unnessesary dependency on /sbin/service

* Sun Aug 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-2
- Use Fedora bundled php-PHPMailer
- Fix License tag
- Remove apache restart
- Remove in spec password generation

* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-1
- Update to version 4.92

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-3.a
- Use Packaged HTML_Template_PHPLIB

* Thu Jul 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-2.a
- Made changes to use fedora supplied libraries

* Sat Jul 11 2009 Andrew Colin Kissa <andrew at topdog-software.com> - 4.91-1.a
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:40:13 -0000	1.1
+++ .cvsignore	25 Aug 2009 08:14:32 -0000	1.2
@@ -0,0 +1 @@
+ipplan-4.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:40:13 -0000	1.1
+++ sources	25 Aug 2009 08:14:32 -0000	1.2
@@ -0,0 +1 @@
+2540b381744d1891b53b660fffc5ec56  ipplan-4.92.tar.gz



From topdog at fedoraproject.org  Tue Aug 25 08:19:25 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 25 Aug 2009 08:19:25 +0000 (UTC)
Subject: rpms/ipplan/F-10 README.ipplan, NONE, 1.1 import.log, NONE,
	1.1 ipplan-mysql.sql, NONE, 1.1 ipplan-pgsql.sql, NONE,
	1.1 ipplan-set-adodb-path.patch, NONE,
	1.1 ipplan-set-menus-path.patch, NONE,
	1.1 ipplan-set-phpmailer-path.patch, NONE,
	1.1 ipplan-use-qmagic.patch, NONE, 1.1 ipplan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090825081925.C6B6311C00D7@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/ipplan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17652/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.ipplan import.log ipplan-mysql.sql ipplan-pgsql.sql 
	ipplan-set-adodb-path.patch ipplan-set-menus-path.patch 
	ipplan-set-phpmailer-path.patch ipplan-use-qmagic.patch 
	ipplan.spec 
Log Message:
* Tue Aug 25 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Initial import




--- NEW FILE README.ipplan ---

Configuration - Mysql
1) create the database by issuing the following at the command prompt:

   mysqladmin -p create ipplan

2) add a database user for ipplan using mysql -p
   GRANT SELECT,INSERT,UPDATE,DELETE on ipplan.*
       TO ipplan at localhost IDENTIFIED by 'password';

   Change the above password to whatever you wish

3) modify the user and password info in the /etc/ipplan/config.php,
   additional settings can be changed in the /etc/ipplan/config.php 
   at this stage too. See /usr/share/doc/ipplan-*/README for more 
   information.

   Make sure you leave transaction support enabled in /etc/ipplan/config.php

4) Import the database schema into the database

  mysql -p ipplan < /usr/share/doc/ipplan-*/sql/ipplan-mysql.sql

5) Point your web browser to the main IPplan web page (http://mywebserver.com/ipplan), 
   select the admin drop down menu and add customers, groups and users using the admin 
   user defined in the config.php file - you MUST create at least one regular user 
   one group and one customer

Configuration - Postgresql
1) Create the database, database user and tables by issuing the following at the
   command prompt as the postgres user (su - postgres):
  
  su - postgres
  createuser -P ipplan
        Enter password for new role:
        Enter it again:
        Shall the new role be a superuser? (y/n) n
        Shall the new role be allowed to create databases? (y/n) n
        Shall the new role be allowed to create more new roles? (y/n) n
  
  createdb -O ipplan ipplan

  Make sure that the ipplan user is allowed to connect to the ipplan
  database from another user by modifying the pg_hba.conf file and
  adding the following then restart the postgresql service

        host   ipplan       ipplan      127.0.0.1/32          md5
        host   ipplan       ipplan         ::1/128            md5
        local  ipplan       ipplan                            md5

  Import the database schema

  psql -U ipplan < /usr/share/doc/ipplan-*/sql/ipplan-pgsql.sql

2) Modify the user and password info in the config.php script, additional
   settings can be changed /etc/ipplan/config.php at this stage too.
   See the /usr/share/doc/ipplan-*/README for more information.

3) now point your web browser to the main IPplan web page
   (http://mywebserver.com/ipplan), select the admin drop down menu and add
   customers, groups and users using the admin user defined in the config.php
   file - you MUST create at least one regular user, one group and one customer

Configuration - Oracle
Oracle is not supported on fedora


--- NEW FILE import.log ---
ipplan-4_92-3_fc11:F-10:ipplan-4.92-3.fc11.src.rpm:1251188256


--- NEW FILE ipplan-mysql.sql ---

CREATE TABLE area (
areaaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
areaindex                BIGINT NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (areaindex)
)TYPE=INNODB;


ALTER TABLE area ADD  UNIQUE INDEX area_customer  (customer, descrip);


ALTER TABLE area ADD  UNIQUE INDEX area_areaaddr  (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP NOT NULL
)TYPE=INNODB;


ALTER TABLE auditlog ADD  INDEX auditlog_dt  (dt);


CREATE TABLE base (
baseaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
subnetsize               INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
baseindex                BIGINT NOT NULL AUTO_INCREMENT,
admingrp                 VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT UNSIGNED DEFAULT 0,
swipmod                  DATETIME,
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


ALTER TABLE base ADD  UNIQUE INDEX base_baseaddr  (baseaddr, customer);


ALTER TABLE base ADD  INDEX base_customer  (customer);


ALTER TABLE base ADD  INDEX base_admingrp  (admingrp);


CREATE TABLE baseadd (
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


CREATE TABLE custinfo (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE custadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
)TYPE=INNODB;


ALTER TABLE customer ADD  UNIQUE INDEX customer_custdescrip  (custdescrip);


ALTER TABLE customer ADD  INDEX customer_crm  (crm);


ALTER TABLE customer ADD  INDEX customer_admingrp  (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) NOT NULL DEFAULT 'N',
resaddr                  SMALLINT UNSIGNED DEFAULT 0,
grpopt                   INT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (grp)
)TYPE=INNODB;


ALTER TABLE grp ADD  UNIQUE INDEX grp_grpdescrip  (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                BIGINT NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
lastpol                  DATETIME,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddr ADD  INDEX ipaddr_baseindex  (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddradd ADD  INDEX ipaddradd_baseindex  (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
dstipaddr                INT UNSIGNED NOT NULL DEFAULT 0,
dstcustomer              SMALLINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE ipaddrlnk ADD  UNIQUE INDEX ipaddrlnk_uniq  (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_dst  (dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_src  (ipaddr, customer);


CREATE TABLE requestip (
requestindex             INTEGER NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP NOT NULL,
info                     LONGTEXT,
                 PRIMARY KEY (requestindex)
)TYPE=INNODB;


ALTER TABLE requestip ADD  UNIQUE INDEX requestip_desc  (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT UNSIGNED NOT NULL DEFAULT 0,
rangesize                INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               BIGINT NOT NULL AUTO_INCREMENT,
areaindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (rangeindex)
)TYPE=INNODB;


ALTER TABLE netrange ADD  INDEX range_rangeaddr  (rangeaddr, customer);


ALTER TABLE netrange ADD  UNIQUE INDEX range_customer  (customer, descrip);


ALTER TABLE netrange ADD  INDEX range_areaindex  (areaindex);


CREATE TABLE revdns (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE revdns ADD  INDEX revdns_customer  (customer);


CREATE TABLE version (
version                  INTEGER NOT NULL DEFAULT 0
)TYPE=INNODB;


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
)TYPE=INNODB;


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE usergrp ADD  UNIQUE INDEX usergrp_userid  (userid, grp);


ALTER TABLE usergrp ADD  INDEX usergrp_grp  (grp);


CREATE TABLE bounds (
boundsaddr               INT UNSIGNED NOT NULL DEFAULT 0,
boundssize               INT UNSIGNED NOT NULL DEFAULT 0,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE bounds ADD  INDEX bounds_grp  (grp);


ALTER TABLE bounds ADD  INDEX bounds_boundsaddr  (boundsaddr);


CREATE TABLE fwdzone (
data_id                  BIGINT NOT NULL AUTO_INCREMENT,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  DATETIME,
regmod                   DATE,
expiremod                DATETIME,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
)TYPE=INNODB;


ALTER TABLE fwdzone ADD  INDEX fwdzone_customer  (customer);


ALTER TABLE fwdzone ADD  INDEX fwdzone_domain  (domain);


CREATE TABLE fwdzoneadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
data_id                  BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255)
)TYPE=INNODB;


ALTER TABLE fwdzoneadd ADD  UNIQUE INDEX fwdzoneadd_customer  (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   BIGINT NOT NULL AUTO_INCREMENT,
data_id                  BIGINT NOT NULL DEFAULT 0,
lastmod                  DATETIME,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INTEGER NOT NULL DEFAULT 0,
userid                   VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (recidx)
)TYPE=INNODB;


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_data_id  (data_id);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_sortorder  (sortorder);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_customer  (customer);


CREATE TABLE fwddns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE fwddns ADD  INDEX fwddns_id  (id);


CREATE TABLE zones (
id                       BIGINT NOT NULL AUTO_INCREMENT,
zoneip                   INT UNSIGNED NOT NULL DEFAULT 0,
zonesize                 INT UNSIGNED NOT NULL DEFAULT 0,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  DATETIME,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (id)
)TYPE=INNODB;


ALTER TABLE zones ADD  INDEX zones_customer  (customer);


ALTER TABLE zones ADD  INDEX zones_zoneip  (zoneip);


CREATE TABLE zonedns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE zonedns ADD  INDEX zonedns_id  (id);


BEGIN;


INSERT INTO version (version) VALUES (22);


COMMIT;



--- NEW FILE ipplan-pgsql.sql ---
CREATE TABLE area (
areaaddr                 INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
areaindex                SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (areaindex)
);


CREATE UNIQUE INDEX area_customer ON area (customer, descrip);


CREATE UNIQUE INDEX area_areaaddr ON area (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
);


CREATE INDEX auditlog_dt ON auditlog (dt);


CREATE TABLE base (
baseaddr                 INT8 DEFAULT 0 NOT NULL,
subnetsize               INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
baseindex                SERIAL,
admingrp                 VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT8 DEFAULT 0,
swipmod                  TIMESTAMP,
                 PRIMARY KEY (baseindex)
);


CREATE UNIQUE INDEX base_baseaddr ON base (baseaddr, customer);


CREATE INDEX base_customer ON base (customer);


CREATE INDEX base_admingrp ON base (admingrp);


CREATE TABLE baseadd (
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
);


CREATE TABLE custinfo (
customer                 INT4 DEFAULT 0 NOT NULL,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
);


CREATE TABLE custadd (
customer                 INT4 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
);


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SERIAL,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
);


CREATE UNIQUE INDEX customer_custdescrip ON customer (custdescrip);


CREATE INDEX customer_crm ON customer (crm);


CREATE INDEX customer_admingrp ON customer (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) DEFAULT 'N' NOT NULL,
resaddr                  INT4 DEFAULT 0,
grpopt                   INT8 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (grp)
);


CREATE UNIQUE INDEX grp_grpdescrip ON grp (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
lastpol                  TIMESTAMP,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddr_baseindex ON ipaddr (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddradd_baseindex ON ipaddradd (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
dstipaddr                INT8 DEFAULT 0 NOT NULL,
dstcustomer              INT4 DEFAULT 0 NOT NULL
);


CREATE UNIQUE INDEX ipaddrlnk_uniq ON ipaddrlnk (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_dst ON ipaddrlnk (dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_src ON ipaddrlnk (ipaddr, customer);


CREATE TABLE requestip (
requestindex             SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
info                     TEXT,
                 PRIMARY KEY (requestindex)
);


CREATE UNIQUE INDEX requestip_desc ON requestip (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT8 DEFAULT 0 NOT NULL,
rangesize                INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               SERIAL,
areaindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (rangeindex)
);


CREATE INDEX range_rangeaddr ON netrange (rangeaddr, customer);


CREATE UNIQUE INDEX range_customer ON netrange (customer, descrip);


CREATE INDEX range_areaindex ON netrange (areaindex);


CREATE TABLE revdns (
customer                 INT4 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX revdns_customer ON revdns (customer);


CREATE TABLE schema (
version                  INT4 DEFAULT 0 NOT NULL
);


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
);


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE UNIQUE INDEX usergrp_userid ON usergrp (userid, grp);


CREATE INDEX usergrp_grp ON usergrp (grp);


CREATE TABLE bounds (
boundsaddr               INT8 DEFAULT 0 NOT NULL,
boundssize               INT8 DEFAULT 0 NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE INDEX bounds_grp ON bounds (grp);


CREATE INDEX bounds_boundsaddr ON bounds (boundsaddr);


CREATE TABLE fwdzone (
data_id                  SERIAL,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  TIMESTAMP,
regmod                   DATE,
expiremod                TIMESTAMP,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 INT4 DEFAULT 0 NOT NULL,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
);


CREATE INDEX fwdzone_customer ON fwdzone (customer);


CREATE INDEX fwdzone_domain ON fwdzone (domain);


CREATE TABLE fwdzoneadd (
customer                 INT4 DEFAULT 0 NOT NULL,
data_id                  INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255)
);


CREATE UNIQUE INDEX fwdzoneadd_customer ON fwdzoneadd (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   SERIAL,
data_id                  INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INT4 DEFAULT 0 NOT NULL,
userid                   VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (recidx)
);


CREATE INDEX fwdzonerec_data_id ON fwdzonerec (data_id);


CREATE INDEX fwdzonerec_sortorder ON fwdzonerec (sortorder);


CREATE INDEX fwdzonerec_customer ON fwdzonerec (customer);


CREATE TABLE fwddns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX fwddns_id ON fwddns (id);


CREATE TABLE zones (
id                       SERIAL,
zoneip                   INT8 DEFAULT 0 NOT NULL,
zonesize                 INT8 DEFAULT 0 NOT NULL,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  TIMESTAMP,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (id)
);


CREATE INDEX zones_customer ON zones (customer);


CREATE INDEX zones_zoneip ON zones (zoneip);


CREATE TABLE zonedns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX zonedns_id ON zonedns (id);


BEGIN;


INSERT INTO schema (version) VALUES (22);


COMMIT;



ipplan-set-adodb-path.patch:
 admin/changepassword.php     |    2 +-
 admin/deletebounds.php       |    2 +-
 admin/displayauditlog.php    |    4 ++--
 admin/displayboundsform.php  |    2 +-
 admin/exportbase.php         |    2 +-
 admin/exportbaseform.php     |    2 +-
 admin/exportip.php           |    2 +-
 admin/exportipform.php       |    2 +-
 admin/importbase.php         |    2 +-
 admin/importbaseform.php     |    2 +-
 admin/importip.php           |    2 +-
 admin/importipform.php       |    2 +-
 admin/maintenance.php        |    2 +-
 admin/schemacreate.php       |    4 ++--
 admin/usermanager.php        |    2 +-
 contrib/ipplan-poller.php    |    2 +-
 user/changesettings.php      |    2 +-
 user/createarea.php          |    2 +-
 user/createrange.php         |    2 +-
 user/createsubnet.php        |    2 +-
 user/createsubnetform.php    |    2 +-
 user/deletearea.php          |    2 +-
 user/deletecustomer.php      |    2 +-
 user/deleterange.php         |    2 +-
 user/displaybase.php         |    2 +-
 user/displaybaseform.php     |    2 +-
 user/displaycustomerform.php |    2 +-
 user/displayoverlap.php      |    2 +-
 user/displayoverlapform.php  |    2 +-
 user/displayrouter.php       |    2 +-
 user/displayrouterform.php   |    2 +-
 user/displaysubnet.php       |    4 ++--
 user/displayswip.php         |    2 +-
 user/displayswipform.php     |    2 +-
 user/emailswip.php           |    2 +-
 user/exportdhcp.php          |    2 +-
 user/exportview.php          |    2 +-
 user/findfree.php            |    2 +-
 user/findfreeform.php        |    2 +-
 user/modifyarearange.php     |    2 +-
 user/modifyarearangeform.php |    2 +-
 user/modifybase.php          |    2 +-
 user/modifybaseform.php      |    2 +-
 user/modifycustomer.php      |    2 +-
 user/modifydns.php           |    2 +-
 user/modifydnsform.php       |    2 +-
 user/modifydnsrecord.php     |    2 +-
 user/modifydnsrecordform.php |    2 +-
 user/modifyipform.php        |    2 +-
 user/modifyipformmul.php     |    2 +-
 user/modifysubnet.php        |    2 +-
 user/modifyzone.php          |    2 +-
 user/modifyzoneform.php      |    2 +-
 user/ping.php                |    2 +-
 user/requestip.php           |    2 +-
 user/searchall.php           |    2 +-
 user/searchallform.php       |    2 +-
 user/traceroute.php          |    2 +-
 user/treeview.php            |    2 +-
 59 files changed, 62 insertions(+), 62 deletions(-)

--- NEW FILE ipplan-set-adodb-path.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/changepassword.php	2009-07-27 18:08:20.964259380 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/deletebounds.php	2009-07-27 18:08:20.976259668 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/displayauditlog.php ipplan/admin/displayauditlog.php
--- ipplan.orig/admin/displayauditlog.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayauditlog.php	2009-07-27 18:08:21.010259547 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
@@ -135,7 +135,7 @@
 insert($w,text(my_("Total records:")." ".$cnt));
 
 /*
-include_once('../adodb/adodb-pager.inc.php');
+include_once('/usr/share/php/adodb/adodb-pager.inc.php');
 $sql = "SELECT userid, action, dt FROM auditlog ORDER BY dt DESC";
 
 function callback($buffer) {
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-27 18:08:20.978259300 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbaseform.php ipplan/admin/exportbaseform.php
--- ipplan.orig/admin/exportbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbaseform.php	2009-07-27 18:08:21.012260319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbase.php ipplan/admin/exportbase.php
--- ipplan.orig/admin/exportbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbase.php	2009-07-27 18:08:20.966259550 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 require_once("../class.templib.php");
diff -ruN ipplan.orig/admin/exportipform.php ipplan/admin/exportipform.php
--- ipplan.orig/admin/exportipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportipform.php	2009-07-27 18:08:21.014260770 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportip.php ipplan/admin/exportip.php
--- ipplan.orig/admin/exportip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportip.php	2009-07-27 18:08:21.001494556 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/importbaseform.php ipplan/admin/importbaseform.php
--- ipplan.orig/admin/importbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbaseform.php	2009-07-27 18:08:21.017259720 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbase.php	2009-07-27 18:08:20.973259193 +0200
@@ -56,7 +56,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/importipform.php ipplan/admin/importipform.php
--- ipplan.orig/admin/importipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importipform.php	2009-07-27 18:08:21.073260965 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importip.php ipplan/admin/importip.php
--- ipplan.orig/admin/importip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importip.php	2009-07-27 18:08:20.984259075 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/maintenance.php ipplan/admin/maintenance.php
--- ipplan.orig/admin/maintenance.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/maintenance.php	2009-07-27 18:08:20.992259086 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/schemacreate.php ipplan/admin/schemacreate.php
--- ipplan.orig/admin/schemacreate.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/schemacreate.php	2009-07-27 18:08:21.069260682 +0200
@@ -22,8 +22,8 @@
 define("SCHEMA", 22);
 
 require_once("../ipplanlib.php");
-//require_once('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//require_once('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-27 18:06:42.469260813 +0200
+++ ipplan/admin/usermanager.php	2009-07-27 18:08:21.042259729 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-02-22 23:44:50.000000000 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-27 18:08:20.377259554 +0200
@@ -39,7 +39,7 @@
 // define the nmap command for scan with dns lookup
 define("NMAP_CMDH", "-sP -PE -q -R -v -oG");
 
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 
 $timestamp = FALSE;
diff -ruN ipplan.orig/user/changesettings.php ipplan/user/changesettings.php
--- ipplan.orig/user/changesettings.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/changesettings.php	2009-07-27 18:08:20.707259358 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createarea.php	2009-07-27 18:08:20.825259282 +0200
@@ -20,7 +20,7 @@
 // Modify capabilities added by Denes Magyar (fat at poison.hu) 22/02/05
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createrange.php	2009-07-27 18:08:20.857259235 +0200
@@ -63,7 +63,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnetform.php ipplan/user/createsubnetform.php
--- ipplan.orig/user/createsubnetform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnetform.php	2009-07-27 18:08:20.799259298 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnet.php	2009-07-27 18:08:20.724259386 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletearea.php ipplan/user/deletearea.php
--- ipplan.orig/user/deletearea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletearea.php	2009-07-27 18:08:20.710259490 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletecustomer.php ipplan/user/deletecustomer.php
--- ipplan.orig/user/deletecustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletecustomer.php	2009-07-27 18:08:20.550259181 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deleterange.php ipplan/user/deleterange.php
--- ipplan.orig/user/deleterange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deleterange.php	2009-07-27 18:08:20.809260311 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybaseform.php ipplan/user/displaybaseform.php
--- ipplan.orig/user/displaybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybaseform.php	2009-07-27 18:08:20.791259227 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybase.php ipplan/user/displaybase.php
--- ipplan.orig/user/displaybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybase.php	2009-07-27 18:08:20.488259765 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaycustomerform.php ipplan/user/displaycustomerform.php
--- ipplan.orig/user/displaycustomerform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaycustomerform.php	2009-07-27 18:08:20.879259357 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlapform.php ipplan/user/displayoverlapform.php
--- ipplan.orig/user/displayoverlapform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlapform.php	2009-07-27 18:08:20.875259262 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlap.php ipplan/user/displayoverlap.php
--- ipplan.orig/user/displayoverlap.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlap.php	2009-07-27 18:08:20.593259271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouterform.php ipplan/user/displayrouterform.php
--- ipplan.orig/user/displayrouterform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouterform.php	2009-07-27 18:08:20.872259229 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouter.php ipplan/user/displayrouter.php
--- ipplan.orig/user/displayrouter.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouter.php	2009-07-27 18:08:20.770259123 +0200
@@ -93,7 +93,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaysubnet.php	2009-07-27 18:08:20.849259064 +0200
@@ -19,8 +19,8 @@
 //
 
 require_once("../ipplanlib.php");
-//include('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//include('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswipform.php ipplan/user/displayswipform.php
--- ipplan.orig/user/displayswipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswipform.php	2009-07-27 18:08:20.479259953 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswip.php ipplan/user/displayswip.php
--- ipplan.orig/user/displayswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswip.php	2009-07-27 18:08:20.764259337 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/emailswip.php ipplan/user/emailswip.php
--- ipplan.orig/user/emailswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/emailswip.php	2009-07-27 18:08:20.588259651 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportdhcp.php	2009-07-27 18:08:20.717259269 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/exportview.php ipplan/user/exportview.php
--- ipplan.orig/user/exportview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportview.php	2009-07-27 18:08:20.888259800 +0200
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfreeform.php ipplan/user/findfreeform.php
--- ipplan.orig/user/findfreeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfreeform.php	2009-07-27 18:08:20.540261810 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfree.php ipplan/user/findfree.php
--- ipplan.orig/user/findfree.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfree.php	2009-07-27 18:08:20.781259273 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearangeform.php ipplan/user/modifyarearangeform.php
--- ipplan.orig/user/modifyarearangeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearangeform.php	2009-07-27 18:08:20.793260240 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearange.php ipplan/user/modifyarearange.php
--- ipplan.orig/user/modifyarearange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearange.php	2009-07-27 18:08:20.886259388 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybaseform.php ipplan/user/modifybaseform.php
--- ipplan.orig/user/modifybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybaseform.php	2009-07-27 18:08:20.860259626 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybase.php	2009-07-27 18:08:20.504259535 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifycustomer.php	2009-07-27 18:08:20.527258935 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsform.php ipplan/user/modifydnsform.php
--- ipplan.orig/user/modifydnsform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsform.php	2009-07-27 18:08:20.733259100 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydns.php	2009-07-27 18:08:20.584259051 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/modifydnsrecordform.php ipplan/user/modifydnsrecordform.php
--- ipplan.orig/user/modifydnsrecordform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecordform.php	2009-07-27 18:08:20.492259765 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-27 18:08:20.749259692 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipformmul.php ipplan/user/modifyipformmul.php
--- ipplan.orig/user/modifyipformmul.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipformmul.php	2009-07-27 18:08:20.555259277 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipform.php	2009-07-27 18:08:20.571259438 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifysubnet.php	2009-07-27 18:08:20.869259218 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzoneform.php ipplan/user/modifyzoneform.php
--- ipplan.orig/user/modifyzoneform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzoneform.php	2009-07-27 18:08:20.760259037 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzone.php	2009-07-27 18:08:20.821259349 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/ping.php ipplan/user/ping.php
--- ipplan.orig/user/ping.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/ping.php	2009-07-27 18:08:20.783260234 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/requestip.php	2009-07-27 18:08:20.806260271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchallform.php ipplan/user/searchallform.php
--- ipplan.orig/user/searchallform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchallform.php	2009-07-27 18:08:20.546259497 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchall.php	2009-07-27 18:08:20.536259319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/traceroute.php ipplan/user/traceroute.php
--- ipplan.orig/user/traceroute.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/traceroute.php	2009-07-27 18:08:20.482259840 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-07-27 18:06:42.474261590 +0200
+++ ipplan/user/treeview.php	2009-07-27 18:08:20.787259612 +0200
@@ -20,7 +20,7 @@
 // Bcracknell 03/11/2005 - Added tree menu display of Customers/Areas/Ranges & Subnets
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");

ipplan-set-menus-path.patch:
 ipplan/admin/usermanager.php |   20 ++++++++++----------
 ipplan/ipplanlib.php         |   19 ++++++++++---------
 ipplan/user/treeview.php     |   20 ++++++++++----------
 ipplanlib.php                |    2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

--- NEW FILE ipplan-set-menus-path.patch ---
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/usermanager.php	2009-07-23 18:39:21.905261618 +0200
@@ -22,9 +22,9 @@
 require_once("../adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 require_once("../auth.php");
 
 
@@ -38,7 +38,7 @@
 isset($_COOKIE["ipplanLanguage"]) && myLanguage($_COOKIE['ipplanLanguage']);
 
 newhtml($p);
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p,my_("User Manager"));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu-hidden.css")));
@@ -190,12 +190,12 @@
 insert($view, block("<i>".my_("Click on a group or user")."</i>"));
 
 $mid = new TreeMenu();
-$mid->setDirroot('../menus');
-$mid->setLibjsdir('../menus/libjs/');
-$mid->setImgdir('../menus/menuimages/');
-$mid->setImgwww('../menus/menuimages/');
-$mid->setIcondir('../menus/menuicons/');
-$mid->setIconwww('../menus/menuicons/');
+$mid->setDirroot('/usr/share/php/php-layers-menu');
+$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+$mid->setImgwww('../../menus/menuimages/');
+$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+$mid->setIconwww('../../menus/menuicons/');
 $mid->SetMenuStructureString($MENU);
 $mid->setIconsize(16, 16);
 $mid->parseStructureForMenu('treemenu1');
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/ipplanlib.php	2009-07-23 18:49:26.576261171 +0200
@@ -540,8 +540,9 @@
     $BASE_URL = base_url();
     $BASE_DIR = base_dir();
 
-    $myDirPath = $BASE_DIR . '/menus/';
-    $myWwwPath = $BASE_URL . '/menus/';
+    $myDirPath = '/usr/share/php/php-layers-menu/';
+    $myMenPath = str_replace('/ipplan','',$BASE_URL);
+    $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
     require_once $myDirPath . 'lib/PHPLIB.php';
@@ -583,13 +584,13 @@
         insert($w, script("",array("language"=>"JavaScript","type"=>"text/javascript","src"=> $myWwwPath . 'libjs/layersmenu.js')));
 
         $mid= new LayersMenu(6, 7, 2, 1);
-        $mid->setDirroot ($BASE_DIR.'/menus/');
-        $mid->setLibjsdir($BASE_DIR.'/menus/libjs/');
-        $mid->setImgdir  ($BASE_DIR.'/menus/menuimages/');
-        $mid->setImgwww  ($BASE_URL.'/menus/menuimages/');
-        $mid->setIcondir ($BASE_DIR.'/menus/menuicons/');
-        $mid->setIconwww ($BASE_URL.'/menus/menuicons/');
-        $mid->setTpldir  ($BASE_DIR.'/menus/templates/');
+        $mid->setDirroot ('/usr/share/php/php-layers-menu/');
+        $mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+        $mid->setImgdir  ('/usr/share/php/php-layers-menu/menuimages/');
+        $mid->setImgwww  ('../../menus/menuimages/');
+        $mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
+        $mid->setIconwww ('../../menus/menuicons/');
+        $mid->setTpldir  ('/usr/share/php/php-layers-menu/templates/');
         $mid->SetMenuStructureString($ADMIN_MENU);
         $mid->setIconsize(16, 16);
         $mid->parseStructureForMenu('hormenu1');
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/treeview.php	2009-07-23 18:52:03.193261518 +0200
@@ -24,9 +24,9 @@
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 
 $auth = new SQLAuthenticator(REALM, REALMERROR);
 
@@ -39,7 +39,7 @@
 $title=my_("Display subnet information");
 newhtml($p);
 
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p, $title);
 
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
@@ -133,12 +133,12 @@
   	}
 
 	$mid = new TreeMenu();
-	$mid->setDirroot('../menus');
-	$mid->setLibjsdir('../menus/libjs/');
-	$mid->setImgdir('../menus/menuimages/');
-	$mid->setImgwww('../menus/menuimages/');
-	$mid->setIcondir('../menus/menuicons/');
-	$mid->setIconwww('../menus/menuicons/');
+	$mid->setDirroot('/usr/share/php/php-layers-menu');
+	$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+	$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+	$mid->setImgwww('../../menus/menuimages/');
+	$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+	$mid->setIconwww('../../menus/menuicons/');
 	if(!$menustring) myError($w,$p, my_("No customers"));
 	$mid->setMenuStructureString($menustring);
 	$mid->setIconsize(16, 16);
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-07-27 18:18:17.073261816 +0200
+++ ipplan/ipplanlib.php	2009-07-27 18:19:44.414278370 +0200
@@ -545,7 +545,7 @@
     $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
-    require_once $myDirPath . 'lib/PHPLIB.php';
+    require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
     require_once $myDirPath . 'lib/layersmenu-common.inc.php';
     require_once $myDirPath . 'lib/layersmenu.inc.php';
     require_once $BASE_DIR  . '/menudefs.php';

ipplan-set-phpmailer-path.patch:
 displaysubnet.php      |    8 ++++----
 displaysubnet.php.orig |    8 ++++----
 requestip.php          |    4 ++--
 swiplib.php            |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE ipplan-set-phpmailer-path.patch ---
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-08-23 11:17:07.326552632 +0200
+++ ipplan/user/displaysubnet.php	2009-08-23 11:28:14.122554254 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/displaysubnet.php.orig ipplan/user/displaysubnet.php.orig
--- ipplan.orig/user/displaysubnet.php.orig	2009-08-23 11:16:42.634555924 +0200
+++ ipplan/user/displaysubnet.php.orig	2009-08-23 11:26:26.055552579 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-08-23 11:17:07.345554665 +0200
+++ ipplan/user/requestip.php	2009-08-23 11:27:11.342553873 +0200
@@ -140,10 +140,10 @@
             $custdescrip=$ds->GetCustomerDescrip($cust);
 
             //Send email notification that IP Request was entered 
-            require("../class.phpmailer.php");
+            require("/usr/share/php/PHPMailer/class.phpmailer.php");
             $mail = new PHPMailer();
             $mail->IsSMTP(); // telling the class to use SMTP
-            $mail->SetLanguage("en", "../");
+            $mail->SetLanguage("en");
             $mail->Host = EMAILSERVER; // SMTP server
             $mail->From = HELPDESKEMAIL;
             $mail->IsHTML(false);
diff -ruN ipplan.orig/user/swiplib.php ipplan/user/swiplib.php
--- ipplan.orig/user/swiplib.php	2009-07-17 00:15:20.000000000 +0200
+++ ipplan/user/swiplib.php	2009-08-23 11:23:16.109553193 +0200
@@ -154,10 +154,10 @@
 // email the swip entry
 function emailSWIP($swip) {
 
-    require_once("../class.phpmailer.php");
+    require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
     $mail = new PHPMailer();
     $mail->IsSMTP(); // telling the class to use SMTP
-    $mail->SetLanguage("en", "../");
+    $mail->SetLanguage("en");
     $mail->Host = EMAILSERVER; // SMTP server
     $mail->From = REGADMINEMAIL;
     $mail->FromName = "IP Plan";

ipplan-use-qmagic.patch:
 admin/changepassword.php    |    4 -
 admin/deletebounds.php      |    2 
 admin/displayboundsform.php |    2 
 admin/importbase.php        |   14 ++---
 admin/usermanager.php       |   86 +++++++++++++++++------------------
 auth.php                    |    6 +-
 class.dbflib.php            |   92 +++++++++++++++++++-------------------
 class.dnslib.php            |  106 ++++++++++++++++++++++----------------------
 contrib/ipplan-poller.php   |   18 +++----
 user/createarea.php         |    4 -
 user/createrange.php        |    4 -
 user/createsubnet.php       |    2 
 user/displaysubnet.php      |   52 ++++++++++-----------
 user/exportdhcp.php         |    2 
 user/modifybase.php         |    4 -
 user/modifycustomer.php     |   62 ++++++++++++-------------
 user/modifydns.php          |   10 ++--
 user/modifydnsrecord.php    |   52 ++++++++++-----------
 user/modifyipform.php       |    6 +-
 user/modifysubnet.php       |   28 +++++------
 user/modifyzone.php         |    2 
 user/requestip.php          |   16 +++---
 user/searchall.php          |   82 +++++++++++++++++-----------------
 23 files changed, 328 insertions(+), 328 deletions(-)

--- NEW FILE ipplan-use-qmagic.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-07-24 16:35:37.067261296 +0200
+++ ipplan/admin/changepassword.php	2009-07-24 16:52:07.366262054 +0200
@@ -67,8 +67,8 @@
 
       $ds->DbfTransactionStart();
       $result=&$ds->ds->Execute("UPDATE users
-                              SET password=".$ds->ds->qstr($password)."
-                              WHERE userid=".$ds->ds->qstr($userid));
+                              SET password=".$ds->ds->QMagic($password)."
+                              WHERE userid=".$ds->ds->QMagic($userid));
       $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
       if ($result) {
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-07-24 16:35:37.068261756 +0200
+++ ipplan/admin/deletebounds.php	2009-07-24 16:51:07.699261009 +0200
@@ -54,7 +54,7 @@
 
 $ds->DbfTransactionStart();
 $result=&$ds->ds->Execute("DELETE FROM bounds
-                        WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+                        WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
   
 if ($result) {
    $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-07-24 16:35:37.072265328 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-24 16:51:25.950266841 +0200
@@ -51,7 +51,7 @@
 
 $where="";
 if ($grp) {
-   $where="WHERE grp=".$ds->ds->qstr($grp);
+   $where="WHERE grp=".$ds->ds->QMagic($grp);
 }
 
 $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-07-24 16:35:37.085272914 +0200
+++ ipplan/admin/importbase.php	2009-07-24 16:51:47.829261312 +0200
@@ -206,10 +206,10 @@
            insert($w,block("<b>".sprintf(my_("Row is duplicate - updating with [ %s, %s ]"), $ipaddr, $descrip)."</b>"));
 
            $result=&$ds->ds->Execute("UPDATE base
-                   SET descrip=".$ds->ds->qstr($descrip).",
+                   SET descrip=".$ds->ds->QMagic($descrip).",
                    lastmod=".$ds->ds->DBTimeStamp(time()).",
-                   userid=".$ds->ds->qstr(getAuthUsername()).",
-                   admingrp=".$ds->ds->qstr($admingrp)."
+                   userid=".$ds->ds->QMagic(getAuthUsername()).",
+                   admingrp=".$ds->ds->QMagic($admingrp)."
                    WHERE customer=$cust AND
                    baseaddr=$base");
 
@@ -225,12 +225,12 @@
                $result = &$ds->ds->Execute("INSERT INTO baseadd
                        (info, baseindex)
                        VALUES
-                       (".$ds->ds->qstr($info).",
+                       (".$ds->ds->QMagic($info).",
                         $baseindex)");
                // Second, try to update.
                if ( $result == FALSE ) {
                    $result=&$ds->ds->Execute("UPDATE baseadd
-                           SET info=".$ds->ds->qstr($info)."                                 
+                           SET info=".$ds->ds->QMagic($info)."                                 
                            WHERE baseindex=$baseindex");
 
                    if ( $result == FALSE ) {
@@ -267,12 +267,12 @@
                    $result = &$ds->ds->Execute("INSERT INTO baseadd
                            (info, baseindex)
                            VALUES
-                           (".$ds->ds->qstr($info).",
+                           (".$ds->ds->QMagic($info).",
                             $baseindex)");
                    // Second, try to update.
                    if ( $result == FALSE ) {
                        $result=&$ds->ds->Execute("UPDATE baseadd
-                               SET info=".$ds->ds->qstr($info)."                                 
+                               SET info=".$ds->ds->QMagic($info)."                                 
                                WHERE baseindex=$baseindex");
 
                        if ( $result == FALSE ) {
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-24 16:35:37.096261011 +0200
+++ ipplan/admin/usermanager.php	2009-07-24 16:50:49.924261394 +0200
@@ -96,8 +96,8 @@
 if ($usersearch != "") {
     $result=&$ds->ds->Execute("SELECT userid, userdescrip
             FROM users
-            WHERE userid LIKE ".$ds->ds->qstr("%".$usersearch."%")
-            ." OR userdescrip LIKE ".$ds->ds->qstr("%".$usersearch."%"));
+            WHERE userid LIKE ".$ds->ds->QMagic("%".$usersearch."%")
+            ." OR userdescrip LIKE ".$ds->ds->QMagic("%".$usersearch."%"));
 
     $MENU=".|".my_("Search Result")."\n";
     $count=0;
@@ -293,7 +293,7 @@
     list($ipaddr, $userid, $grp, $grpdescrip, $createcust, $grpview) = myRegister("S:ipaddr S:userid S:grp S:grpdescrip S:createcust S:grpview");
     $grp=trim($grp);
     $grpdescrip=trim($grpdescrip);
-    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->qstr($userid));
+    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->QMagic($userid));
     if ($result) {
         $row=$result->FetchRow();
     }
@@ -362,7 +362,7 @@
         // in a table and allow the user to delete them.
 
         insert($con, generic("br"));
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->qstr($userid));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->QMagic($userid));
         $lst=array();
 
         while($row = $result->FetchRow()) {
@@ -399,7 +399,7 @@
 
     list($ipaddr, $size, $grp) = myRegister("S:ipaddr S:size S:grp");
 
-    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->qstr($grp));
+    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->QMagic($grp));
     $row=$result->FetchRow();
     $grpdescrip=$row["grpdescrip"];
     $createcust=$row["createcust"];
@@ -474,7 +474,7 @@
         insert($f2,submit(array("value"=>my_("Add User"))));
         // Edit users assigned to the group.
 
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->qstr($grp));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->QMagic($grp));
 
         $lst=array();
         while($row = $result->FetchRow()) {
@@ -568,7 +568,7 @@
 
     $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
             FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)."
+            WHERE grp=".$ds->ds->QMagic($grp)."
             ORDER BY boundsaddr");
 
     // logic here is:
@@ -706,25 +706,25 @@
         $ds->DbfTransactionStart();
         // emulates mysql REPLACE
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid));
+                WHERE userid=".$ds->ds->QMagic($userid));
         $result=&$ds->ds->Execute("INSERT INTO users
                 (userid, userdescrip, useremail, password)
                 VALUES
-                (".$ds->ds->qstr($userid).",
-                 ".$ds->ds->qstr($userdescrip).",
-                 ".$ds->ds->qstr($useremail).",
-                 ".$ds->ds->qstr($password).")");
+                (".$ds->ds->QMagic($userid).",
+                 ".$ds->ds->QMagic($userdescrip).",
+                 ".$ds->ds->QMagic($useremail).",
+                 ".$ds->ds->QMagic($password).")");
 
         // add group if user selected a group other than "No group"
         if (!empty($grp)) {
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid)." AND
-                    grp=".$ds->ds->qstr($grp));
+                    WHERE userid=".$ds->ds->QMagic($userid)." AND
+                    grp=".$ds->ds->QMagic($grp));
             $result=&$ds->ds->Execute("INSERT INTO usergrp
                     (userid, grp)
                     VALUES
-                    (".$ds->ds->qstr($userid).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($userid).",
+                     ".$ds->ds->QMagic($grp).")");
         }
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -779,9 +779,9 @@
         $result=&$ds->ds->Execute("INSERT INTO grp
                 (grp, createcust, grpdescrip, grpopt, resaddr)
                 VALUES
-                (".$ds->ds->qstr($grp).",
-                 ".$ds->ds->qstr($createcust).",
-                 ".$ds->ds->qstr($grpdescrip).",
+                (".$ds->ds->QMagic($grp).",
+                 ".$ds->ds->QMagic($createcust).",
+                 ".$ds->ds->QMagic($grpdescrip).",
                  ".$grpbit.", $resaddr)");
 
         if ($result) {
@@ -803,8 +803,8 @@
 
     $ds->DbfTransactionStart();
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     if ($result) {
         $ds->DbfTransactionEnd();
         insert($w,text(my_("User deleted from group")));
@@ -835,9 +835,9 @@
     if ($userid) {
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid)) and
+                WHERE userid=".$ds->ds->QMagic($userid)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid));
+                    WHERE userid=".$ds->ds->QMagic($userid));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -853,8 +853,8 @@
         $userid=$usergrp;
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM usergrp
-                WHERE userid=".$ds->ds->qstr($userid)." AND
-                grp=".$ds->ds->qstr($grp));
+                WHERE userid=".$ds->ds->QMagic($userid)." AND
+                grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -874,7 +874,7 @@
         // check if grp has customers
         $result=&$ds->ds->Execute("SELECT custdescrip
                 FROM customer
-                WHERE admingrp=".$ds->ds->qstr($grp));
+                WHERE admingrp=".$ds->ds->QMagic($grp));
         if ($row=$result->FetchRow()) {
             $formerror .=my_("Cannot delete group because the following customers are assigned to the group:");
             do {
@@ -886,7 +886,7 @@
         // check if grp has subnets
         $result=&$ds->ds->Execute("SELECT baseaddr, descrip
                 FROM base
-                WHERE admingrp=".$ds->ds->qstr($grp)."
+                WHERE admingrp=".$ds->ds->QMagic($grp)."
                 ORDER BY baseaddr");
         if ($row=$result->FetchRow()) {
             $formerror .= my_("Cannot delete group because the following subnets are assigned to the group:");
@@ -898,11 +898,11 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM grp
-                WHERE grp=".$ds->ds->qstr($grp)) and
+                WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE grp=".$ds->ds->qstr($grp)) and
+                    WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM bounds
-                    WHERE grp=".$ds->ds->qstr($grp));
+                    WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -934,8 +934,8 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("UPDATE users
-                SET password=".$ds->ds->qstr($password)."
-                WHERE userid=".$ds->ds->qstr($userid));
+                SET password=".$ds->ds->QMagic($password)."
+                WHERE userid=".$ds->ds->QMagic($userid));
         $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
         if ($result) {
@@ -961,13 +961,13 @@
     $ds->DbfTransactionStart();
     // emulate mysql REPLACE
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     $result=&$ds->ds->Execute("INSERT INTO usergrp
             (userid, grp)
             VALUES
-            (".$ds->ds->qstr($userid).",
-             ".$ds->ds->qstr($grp).")");
+            (".$ds->ds->QMagic($userid).",
+             ".$ds->ds->QMagic($grp).")");
 
     if ($result) {
         $ds->DbfTransactionEnd();
@@ -1007,11 +1007,11 @@
         }
 
         $result=&$ds->ds->Execute("UPDATE grp
-                SET grpdescrip=".$ds->ds->qstr($grpdescrip).",
-                createcust=".$ds->ds->qstr($createcust).",
+                SET grpdescrip=".$ds->ds->QMagic($grpdescrip).",
+                createcust=".$ds->ds->QMagic($createcust).",
                 grpopt=".$grpbit.",
                 resaddr=".$resaddr."
-                WHERE grp=".$ds->ds->qstr($grp));
+                WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -1037,7 +1037,7 @@
 
         // creating readonly group?
         if ($base == 0 and $size == 0) {
-            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->qstr($grp))) {
+            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->QMagic($grp))) {
                 $formerror .= my_("Boundary cannot be created - overlaps with existing boundary")."\n";
             }
         }
@@ -1065,7 +1065,7 @@
             $result=&$ds->ds->Execute("INSERT INTO bounds
                     (boundsaddr, boundssize, grp)
                     VALUES
-                    ($base, $size, ".$ds->ds->qstr($grp).")");
+                    ($base, $size, ".$ds->ds->QMagic($grp).")");
 
             if ($result) {
                 $ds->DbfTransactionEnd();
@@ -1090,7 +1090,7 @@
                 ($boundsaddr < boundsaddr AND
                  $boundsaddr+$boundssize >
                  boundsaddr + boundssize - 1)) AND
-            grp=".$ds->ds->qstr($grp));
+            grp=".$ds->ds->QMagic($grp));
     if ($result->FetchRow()) {
         return 1;
     }
@@ -1101,7 +1101,7 @@
     list($grp, $boundsaddr) = myRegister("S:grp S:boundsaddr");
 
     $result=&$ds->ds->Execute("DELETE FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+            WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
 
     if ($result) {
         $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/auth.php ipplan/auth.php
--- ipplan.orig/auth.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/auth.php	2009-07-24 16:49:49.184261940 +0200
@@ -192,14 +192,14 @@
           $passwd=crypt($passwd, 'xq');
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
-                                   users.password=".$ds->qstr($passwd)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
+                                   users.password=".$ds->QMagic($passwd)." AND
                                    users.userid=usergrp.userid");
        }
        else {
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
                                    users.userid=usergrp.userid");
        }
        
diff -ruN ipplan.orig/class.dbflib.php ipplan/class.dbflib.php
--- ipplan.orig/class.dbflib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dbflib.php	2009-07-24 16:49:36.394261175 +0200
@@ -143,14 +143,14 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
         $result = &$this->ds->Execute("UPDATE ipaddr
-                SET userinf=".$this->ds->qstr($user).",
-                location=".$this->ds->qstr($location).",
-                telno=".$this->ds->qstr($telno).",
-                macaddr=".$this->ds->qstr($macaddr).",
-                descrip=".$this->ds->qstr($descrip).",
-                hname=".$this->ds->qstr($hname).",
+                SET userinf=".$this->ds->QMagic($user).",
+                location=".$this->ds->QMagic($location).",
+                telno=".$this->ds->QMagic($telno).",
+                macaddr=".$this->ds->QMagic($macaddr).",
+                descrip=".$this->ds->QMagic($descrip).",
+                hname=".$this->ds->QMagic($hname).",
                 lastmod=".$this->ds->DBTimeStamp(time()).",
-                userid=".$this->ds->qstr($userid)."
+                userid=".$this->ds->QMagic($userid)."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr");
         }
@@ -159,16 +159,16 @@
                     (userinf, location, telno, macaddr, descrip, hname,
                      baseindex, ipaddr, lastmod, userid)
                     VALUES
-                    (".$this->ds->qstr($user).",
-                     ".$this->ds->qstr($location).",
-                     ".$this->ds->qstr($telno).",
-                     ".$this->ds->qstr($macaddr).",
-                     ".$this->ds->qstr($descrip).",
-                     ".$this->ds->qstr($hname).",
+                    (".$this->ds->QMagic($user).",
+                     ".$this->ds->QMagic($location).",
+                     ".$this->ds->QMagic($telno).",
+                     ".$this->ds->QMagic($macaddr).",
+                     ".$this->ds->QMagic($descrip).",
+                     ".$this->ds->QMagic($hname).",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr($userid).")");
+                     ".$this->ds->QMagic($userid).")");
         }
 
         // always try to update record - record could not exist, which
@@ -183,7 +183,7 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
             $result = &$this->ds->Execute("UPDATE ipaddradd
-                    SET info=".$this->ds->qstr($info)."
+                    SET info=".$this->ds->QMagic($info)."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ipaddr");
         // this generates a "duplicate key" error if no update
@@ -195,7 +195,7 @@
                 $result = &$this->ds->Execute("INSERT INTO ipaddradd
                         (info, baseindex, ipaddr)
                         VALUES
-                        (".$this->ds->qstr($info).",
+                        (".$this->ds->QMagic($info).",
                          $baseindex,
                          $ipaddr)");
             }
@@ -208,9 +208,9 @@
         $userid = getAuthUsername();
 
         $result = &$this->ds->Execute("UPDATE ipaddr
-                           SET $field=".$this->ds->qstr($value).",
+                           SET $field=".$this->ds->QMagic($value).",
                               lastmod=".$this->ds->DBTimeStamp(time()).",
-                              userid=".$this->ds->qstr($userid)."
+                              userid=".$this->ds->QMagic($userid)."
                            WHERE baseindex=$baseindex AND ipaddr=$ipaddr");
 
         // record does not exist, error
@@ -331,11 +331,11 @@
                                baseopt, customer, userid, lastmod)
                            VALUES
                               ($baseaddr, $subnetsize,
-                              ".$this->ds->qstr($descrip).",
-                              ".$this->ds->qstr($grp).",
+                              ".$this->ds->QMagic($descrip).",
+                              ".$this->ds->QMagic($grp).",
                                $dhcp,
                                $cust,
-                              ".$this->ds->qstr($userid).",
+                              ".$this->ds->QMagic($userid).",
                               ".$this->ds->DBTimeStamp(time()).")");
 
         if (DBF_TYPE == "mysql" or DBF_TYPE == "maxsql") {
@@ -360,7 +360,7 @@
                             WHERE base.baseindex=$baseindex AND
                                base.customer=customer.customer AND
                                customer.admingrp=usergrp.grp AND
-                               usergrp.userid=".$this->ds->qstr($userid));
+                               usergrp.userid=".$this->ds->QMagic($userid));
 
         if ($row = $result->FetchRow()) {
             return $row["admingrp"];
@@ -376,9 +376,9 @@
         // could use GetRow here
         $result = &$this->ds->Execute("SELECT usergrp.grp
                             FROM usergrp, grp
-                            WHERE usergrp.userid=".$this->ds->qstr($userid)." AND
+                            WHERE usergrp.userid=".$this->ds->QMagic($userid)." AND
                                usergrp.grp=grp.grp AND
-                               grp.createcust=".$this->ds->qstr('Y'));
+                               grp.createcust=".$this->ds->QMagic('Y'));
 
         if ($row = $result->FetchRow()) {
             return $row["grp"];
@@ -425,7 +425,7 @@
 
         $string = " IN (";
         foreach($grps as $value) {
-            $string .= $this->ds->qstr($value).",";
+            $string .= $this->ds->QMagic($value).",";
         }
         return substr($string, 0, -1).")";
     }
@@ -457,7 +457,7 @@
 
         $result = &$this->ds->Execute("SELECT count(*) AS cnt
                          FROM bounds
-                         WHERE grp=".$this->ds->qstr($grp));
+                         WHERE grp=".$this->ds->QMagic($grp));
         $row = $result->FetchRow();
         // no bounds, group can do anything
         if ($row["cnt"] == 0) {
@@ -470,7 +470,7 @@
                                   boundsaddr + boundssize - 1) AND
                                   ($boundsaddr+$boundssize-1 BETWEEN boundsaddr AND 
                                       boundsaddr + boundssize - 1)) AND
-                                  grp=".$this->ds->qstr($grp));
+                                  grp=".$this->ds->QMagic($grp));
 
         if ($result->FetchRow()) {
             return 1;
@@ -719,16 +719,16 @@
                     (userinf, location, telno, descrip, hname,
                      baseindex, ipaddr, lastmod, lastpol, userid)
                     VALUES
-                    (".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("Unknown - added by IPplan poller").",
-                     ".$this->ds->qstr("").",
+                    (".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("Unknown - added by IPplan poller").",
+                     ".$this->ds->QMagic("").",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr("POLLER").")");
+                     ".$this->ds->QMagic("POLLER").")");
         }
 
     }
@@ -942,8 +942,8 @@
                 $this->ds->Execute("INSERT INTO auditlog
                         (action, userid, dt)
                         VALUES
-                        (".$this->ds->qstr(substr($message,0,254)).",
-                         ".$this->ds->qstr(getAuthUsername()).",
+                        (".$this->ds->QMagic(substr($message,0,254)).",
+                         ".$this->ds->QMagic(getAuthUsername()).",
                          ".$this->ds->DBTimeStamp(time()).")");
             }
             else if (is_array($message)) {
@@ -960,8 +960,8 @@
                     $this->ds->Execute("INSERT INTO auditlog
                             (action, userid, dt)
                             VALUES
-                            (".$this->ds->qstr(substr($value,0,254)).",
-                             ".$this->ds->qstr(getAuthUsername()).",
+                            (".$this->ds->QMagic(substr($value,0,254)).",
+                             ".$this->ds->QMagic(getAuthUsername()).",
                              ".$this->ds->DBTimeStamp(time()).")");
                 }
 
@@ -983,10 +983,10 @@
         if (!empty($search)) {
             switch ($expr) {
                 case "NLIKE":
-                    $sql="$var NOT LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var NOT LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "EXACT":
-                    $sql="$var = ".$this->ds->qstr("$search");
+                    $sql="$var = ".$this->ds->QMagic("$search");
                     break;
                 case "RLIKE":
                 // default is RLIKE, need to protect for DBF's without RLIKE
@@ -994,11 +994,11 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var ~ ".$this->ds->qstr("$search");
+                        $sql="$var ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "NRLIKE":
@@ -1006,22 +1006,22 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var NOT RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var NOT RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var NOT ~ ".$this->ds->qstr("$search");
+                        $sql="$var NOT ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "LIKE":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "END":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search");
                     break;
                 // default is START search
                 default:
-                    $sql="$var LIKE ".$this->ds->qstr("$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("$search%");
             }
             // should there be an AND?
             if ($addand) {
diff -ruN ipplan.orig/class.dnslib.php ipplan/class.dnslib.php
--- ipplan.orig/class.dnslib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dnslib.php	2009-07-24 16:49:13.294270409 +0200
@@ -262,10 +262,10 @@
                      recordtype, userid, ip_hostname) ".
                     "VALUES ($this->cust, $dataid, ". $i.",".
                     $this->ds->DBTimeStamp(time()).",".
-                    $this->ds->qstr($host).",".
-                    $this->ds->qstr($recordtype).",".
-                    $this->ds->qstr(getAuthUsername()).",".
-                    $this->ds->qstr($iphostname).")" );
+                    $this->ds->QMagic($host).",".
+                    $this->ds->QMagic($recordtype).",".
+                    $this->ds->QMagic(getAuthUsername()).",".
+                    $this->ds->QMagic($iphostname).")" );
             if (!$result) {
                 return FALSE;
             }
@@ -288,7 +288,7 @@
                         (id, hname, horder)
                         VALUES
                         ($dataid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
                 if (!$result) {
                     return FALSE;
@@ -340,23 +340,23 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
                 ", serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",createmod=".$this->ds->DBDate($this->createmod).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
                 ",expiremod=".$this->ds->DBDate($this->expiremod).
                 ",regmod=".$this->ds->DBDate($this->regmod).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND data_id=".$dataid );
 
         if($this->ds->GetRow("SELECT info
@@ -364,7 +364,7 @@
                 WHERE customer=$cust AND
                 data_id=$dataid")) {   // should have FOR UPDATE here!
             $result = $this->ds->Execute("UPDATE fwdzoneadd ".
-                "set info=".$this->ds->qstr($this->info).
+                "set info=".$this->ds->QMagic($this->info).
                 " WHERE customer=$cust AND data_id=".$dataid );
         } 
         else {  // no record, insert
@@ -372,7 +372,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
         }
@@ -398,23 +398,23 @@
             createmod, lastmod, expiremod, regmod, serialdate, serialnum, ttl, refresh, retry, 
             expire, minimum, responsiblemail, userid, zonefilepath1, zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust,".
-                $this->ds->qstr($this->domain).",".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->domain).",".
+                $this->ds->QMagic("E").",".
                 $this->ds->DBDate($this->createmod).",".
                 $this->ds->DBTimeStamp(time()).",".
                 $this->ds->DBDate($this->expiremod).",".
                 $this->ds->DBDate($this->regmod).",".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -427,7 +427,7 @@
                 $result=$this->ds->Execute("SELECT data_id 
                         FROM fwdzone
                         WHERE customer=$this->cust AND 
-                        domain=".$this->ds->qstr($this->domain));
+                        domain=".$this->ds->QMagic($this->domain));
                 $temprow = $result->FetchRow();
                 $dataid=$temprow["data_id"];
             }
@@ -436,7 +436,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
             return $dataid;
@@ -465,7 +465,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT domain FROM fwdzone 
-                WHERE customer=$cust AND domain = ".$this->ds->qstr($this->domain));
+                WHERE customer=$cust AND domain = ".$this->ds->QMagic($this->domain));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -499,11 +499,11 @@
                         (data_id, host, recordtype, ip_hostname, sortorder, customer, userid, lastmod)
                         SELECT $dataid AS data_id, fwdzonerec.host, fwdzonerec.recordtype, 
                             fwdzonerec.ip_hostname, fwdzonerec.sortorder, fwdzonerec.customer, 
-                            ".$this->ds->qstr(getAuthUsername())." AS userid,
+                            ".$this->ds->QMagic(getAuthUsername())." AS userid,
                             ".$this->ds->DBTimeStamp(time())." AS lastmod
                         FROM fwdzonerec, fwdzone
                         WHERE fwdzonerec.data_id=fwdzone.data_id AND 
-                            fwdzone.domain=".$this->ds->qstr("template.com"));
+                            fwdzone.domain=".$this->ds->QMagic("template.com"));
 
                 }
                 $this->err = 0;
@@ -526,9 +526,9 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
-                ", error_message=".$this->ds->qstr("").
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
+                ", error_message=".$this->ds->QMagic("").
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
                 ", serialnum=$this->serialnum".
                 " WHERE customer=$cust AND data_id=".$dataid);
@@ -798,7 +798,7 @@
                         (id, hname, horder)
                         VALUES
                         ($zoneid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
 
                 if (!$result) {
@@ -854,22 +854,22 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE zones SET zoneip=$zoneip".
-                ",zone=".$this->ds->qstr($this->zone).
+                ",zone=".$this->ds->QMagic($this->zone).
                 ",zonesize=$size".
-                ",serialdate=".$this->ds->qstr($this->serialdate).
+                ",serialdate=".$this->ds->QMagic($this->serialdate).
                 ",serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND id=".$zoneid );
 
         // delete all the DNS records first to preserve correct order
@@ -896,20 +896,20 @@
                  lastmod, responsiblemail, userid, zonefilepath1, 
                  zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust, $this->zoneip,".
-                $this->ds->qstr($this->zone).", $this->size,".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->zone).", $this->size,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic("E").",".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
                 $this->ds->DBTimeStamp(time()).",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -953,7 +953,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT zone FROM zones
-                WHERE customer=$cust AND zone = ".$this->ds->qstr($this->zone));
+                WHERE customer=$cust AND zone = ".$this->ds->QMagic($this->zone));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -999,10 +999,10 @@
         $this->Serial();
 
         $result = $this->ds->Execute("UPDATE zones ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
-                ", error_message=".$this->ds->qstr("").
+                ", error_message=".$this->ds->QMagic("").
                 ", serialnum=$this->serialnum ".
                 " WHERE customer=$cust AND id=$zoneid");
 
@@ -1155,8 +1155,8 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-        "set serialdate=".$this->ds->qstr($this->serialdate).
-        ", userid=".$this->ds->qstr(getAuthUsername()).
+        "set serialdate=".$this->ds->QMagic($this->serialdate).
+        ", userid=".$this->ds->QMagic(getAuthUsername()).
         ", serialnum=$this->serialnum".
         " WHERE customer=$cust AND data_id=".$zoneid);
 
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-07-24 16:35:37.098269923 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-24 16:48:58.061261570 +0200
@@ -242,7 +242,7 @@
 
                 if ($hostnames) {
                     $result = $ds->Execute("UPDATE ipaddr
-                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->qstr($hname)."
+                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->QMagic($hname)."
                             WHERE baseindex=$baseindex AND
                             ipaddr=$ipaddr");
                 }
@@ -258,23 +258,23 @@
                             (userinf, location, telno, descrip, hname,
                              baseindex, ipaddr, lastmod, lastpol, userid)
                             VALUES
-                            (".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("Unknown - added by IPplan command line poller").",
-                             ".$ds->qstr($hname).",
+                            (".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("Unknown - added by IPplan command line poller").",
+                             ".$ds->QMagic($hname).",
                              $baseindex, 
                              $ipaddr,
                              ".$ds->DBTimeStamp(time()).",
                              ".$ds->DBTimeStamp(time()).",
-                             ".$ds->qstr("POLLER").")");
+                             ".$ds->QMagic("POLLER").")");
 
                     if ($audit) {
                         $ds->Execute("INSERT INTO auditlog
                                 (action, userid, dt)
                                 VALUES
-                                (".$ds->qstr(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
-                                 ".$ds->qstr("POLLER").",
+                                (".$ds->QMagic(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
+                                 ".$ds->QMagic("POLLER").",
                                  ".$ds->DBTimeStamp(time()).")");
                     }
                 }
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-07-24 16:35:37.104261224 +0200
+++ ipplan/user/createarea.php	2009-07-24 16:45:44.647275743 +0200
@@ -84,7 +84,7 @@
       $ds->DbfTransactionStart();
       if ($action=="modify") {
           $result=&$ds->ds->Execute("UPDATE area SET areaaddr=$base, 
-                  descrip=".$ds->ds->qstr($descrip)." WHERE areaindex=$areaindex") and
+                  descrip=".$ds->ds->QMagic($descrip)." WHERE areaindex=$areaindex") and
           $ds->AuditLog(array("event"=>151, "action"=>"modify area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
@@ -93,7 +93,7 @@
           $result=&$ds->ds->Execute("INSERT INTO area
                   (areaaddr, descrip, customer)
                   VALUES
-                  ($base, ".$ds->ds->qstr($descrip).", $cust)") and
+                  ($base, ".$ds->ds->QMagic($descrip).", $cust)") and
           $ds->AuditLog(array("event"=>150, "action"=>"create area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-07-24 16:35:37.106272084 +0200
+++ ipplan/user/createrange.php	2009-07-24 16:45:10.911264478 +0200
@@ -166,7 +166,7 @@
         if ($action=="modify") {
 
             $result=&$ds->ds->Execute("UPDATE netrange SET areaindex=$areaindex, 
-                    descrip=".$ds->ds->qstr($descrip).",
+                    descrip=".$ds->ds->QMagic($descrip).",
                     rangeaddr=$base, rangesize=$size
                     WHERE rangeindex=$rangeindex") and
                 $ds->AuditLog(array("event"=>161, "action"=>"modify range", 
@@ -179,7 +179,7 @@
                      customer)
                     VALUES
                     ($base, $size, $areaindex,
-                     ".$ds->ds->qstr($descrip).",
+                     ".$ds->ds->QMagic($descrip).",
                      $cust)") and
                     $ds->AuditLog(array("event"=>160, "action"=>"create range", 
                                 "descrip"=>$descrip, "user"=>getAuthUsername(), "areaindex"=>$areaindex,
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-07-24 16:35:37.111261269 +0200
+++ ipplan/user/createsubnet.php	2009-07-24 16:47:00.295261634 +0200
@@ -219,7 +219,7 @@
                 $result = &$ds->ds->Execute("INSERT INTO baseadd
                         (info, baseindex)
                         VALUES
-                        (".$ds->ds->qstr($info).", $id)");
+                        (".$ds->ds->QMagic($info).", $id)");
             }
 
             $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-07-24 16:35:37.134260756 +0200
+++ ipplan/user/displaysubnet.php	2009-07-24 16:45:26.829261752 +0200
@@ -221,7 +221,7 @@
                                     WHERE base.customer=$cust AND
                                     base.baseindex=ipaddr.baseindex AND
                                     ipaddr.ipaddr!=$ip AND
-                                    ipaddr.macaddr=".$ds->ds->qstr($macaddr))) {
+                                    ipaddr.macaddr=".$ds->ds->QMagic($macaddr))) {
                             $formerror .= sprintf(my_("Duplicate MAC address: %s"), $oldmacaddr)."\n";
                             insert($w,anchor("searchall.php?cust=".$cust."&field=macaddr&search=".$macaddr,
                                 my_("Show duplicate MAC addresses")));
@@ -302,7 +302,7 @@
                                     WHERE requestindex=$request");
                             $gw=$ds->ds->GetOne("SELECT ipaddr FROM ipaddr
                                     WHERE baseindex=$baseindex AND 
-                                       descrip LIKE ".$ds->ds->qstr("GW%"));
+                                       descrip LIKE ".$ds->ds->QMagic("GW%"));
 
                             $body="?Subject=IP address request actioned&body=";
                             $body2="The request details submitted: $requestdesc\n\n";
@@ -925,15 +925,15 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot delete
         if($recs == 1) {
             $row=$result->FetchRow();
@@ -944,7 +944,7 @@
 
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$recidx") and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dom_id) and
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
                             "user"=>getAuthUsername(), "id"=>$recidx));
@@ -979,13 +979,13 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot update
         if($recs == 1) {
             // does domain name of record match ip records hostname?
@@ -1005,13 +1005,13 @@
             }
 
             insert($w,textbr(my_("IP hostname field in DNS forward zone modified")));
-            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->qstr($hnametmp).",
+            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->QMagic($hnametmp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
-                    userid=".$ds->ds->qstr(getAuthUsername())."
+                    userid=".$ds->ds->QMagic(getAuthUsername())."
                     WHERE customer=$cust AND
-                    recordtype=".$ds->ds->qstr("A")." AND 
-                    ip_hostname=".$ds->ds->qstr(inet_ntoa($ip))) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                    recordtype=".$ds->ds->QMagic("A")." AND 
+                    ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip))) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
@@ -1042,12 +1042,12 @@
             $result = &$ds->ds->Execute("SELECT length(domain) AS domainlen, data_id, domain
                     FROM fwdzone
                     WHERE customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain
+                    ".$ds->ds->QMagic($hname."$")." $regex domain
                     ORDER BY domainlen DESC");
 
             $recs=$result->PO_RecordCount("fwdzone", 
                     "customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain");
+                    ".$ds->ds->QMagic($hname."$")." $regex domain");
 
             // must be exactly one matching zone only, or more than one zone
             // sorted DESC. If second case, use first record for longest match
@@ -1063,12 +1063,12 @@
                          recordtype, error_message, userid, ip_hostname) ".
                         "VALUES ($cust, $dataid, 9999,".
                         $ds->ds->DBTimeStamp(time()).",".
-                        $ds->ds->qstr($hnametmp).",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr(getAuthUsername()).",".
-                        $ds->ds->qstr(inet_ntoa($ip)).")" ) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                        $ds->ds->QMagic($hnametmp).",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic(getAuthUsername()).",".
+                        $ds->ds->QMagic(inet_ntoa($ip)).")" ) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-07-24 16:35:37.142261270 +0200
+++ ipplan/user/exportdhcp.php	2009-07-24 16:47:14.257261620 +0200
@@ -150,7 +150,7 @@
     $result_ip=&$ds->ds->Execute("SELECT ipaddr, macaddr, hname
             FROM ipaddr
             WHERE baseindex=$baseindex AND
-            userinf LIKE ".$ds->ds->qstr("%".DHCPRESERVED."%")."
+            userinf LIKE ".$ds->ds->QMagic("%".DHCPRESERVED."%")."
             ORDER BY ipaddr");
 
     $iprange_dynamicIPs=array();
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-07-24 16:35:37.157277068 +0200
+++ ipplan/user/modifybase.php	2009-07-24 16:48:36.765261577 +0200
@@ -224,7 +224,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size*2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
 
         $ds->AuditLog(array("event"=>173, "action"=>"join subnet", 
@@ -240,7 +240,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size/2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
         // ... and create new subnet
         $timetmp=time();
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-07-24 16:35:37.160261295 +0200
+++ ipplan/user/modifycustomer.php	2009-07-24 16:48:21.805261227 +0200
@@ -126,9 +126,9 @@
             $result=&$ds->ds->Execute("INSERT INTO customer
                     (custdescrip, crm, admingrp)
                     VALUES
-                    (".$ds->ds->qstr($custdescrip).",
-                     ".$ds->ds->qstr($crm).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($custdescrip).",
+                     ".$ds->ds->QMagic($crm).",
+                     ".$ds->ds->QMagic($grp).")");
 
             // did not fail due to key error?
             if ($result) {
@@ -139,7 +139,7 @@
                     // emulate getting the last insert_id
                     $result=&$ds->ds->Execute("SELECT customer 
                             FROM customer
-                            WHERE custdescrip=".$ds->ds->qstr($custdescrip));
+                            WHERE custdescrip=".$ds->ds->QMagic($custdescrip));
                     $temprow = $result->FetchRow();
                     $cust=$temprow["customer"];
                 }
@@ -160,9 +160,9 @@
             }
 
             $result=&$ds->ds->Execute("UPDATE customer
-                    SET custdescrip=".$ds->ds->qstr($custdescrip).",
-                    crm=".$ds->ds->qstr($crm).",
-                    admingrp=".$ds->ds->qstr($grp)."
+                    SET custdescrip=".$ds->ds->QMagic($custdescrip).",
+                    crm=".$ds->ds->QMagic($crm).",
+                    admingrp=".$ds->ds->QMagic($grp)."
                     WHERE customer=$cust");
 
             // did not fail due to key error?
@@ -176,7 +176,7 @@
         // test for CRM duplicates - this is not a unique key and cannot be 
         if (!empty($crm)) {
             $recs=$ds->ds->GetOne("SELECT count(*) AS cnt FROM customer 
-                    WHERE crm=".$ds->ds->qstr($crm));
+                    WHERE crm=".$ds->ds->QMagic($crm));
             if ($recs > 1) {  //duplicate ?
                 insert($w,text(my_("The CRM field has already been used for another customer"), array("color"=>"#FF0000")));
                 insert($w,textbr());
@@ -200,25 +200,25 @@
                      phne, mbox)
                     VALUES
                     ($cust,
-                     ".$ds->ds->qstr("").",
-                     ".$ds->ds->qstr($org).",
-                     ".$ds->ds->qstr($street).",
-                     ".$ds->ds->qstr($city).",
-                     ".$ds->ds->qstr($state).",
-                     ".$ds->ds->qstr($zipcode).",
-                     ".$ds->ds->qstr($cntry).",
-                     ".$ds->ds->qstr($nichandl).",
-                     ".$ds->ds->qstr($lname).",
-                     ".$ds->ds->qstr($fname).",
-                     ".$ds->ds->qstr($mname).",
-                     ".$ds->ds->qstr($torg).",
-                     ".$ds->ds->qstr($tstreet).",
-                     ".$ds->ds->qstr($tcity).",
-                     ".$ds->ds->qstr($tstate).",
-                     ".$ds->ds->qstr($tzipcode).",
-                     ".$ds->ds->qstr($tcntry).",
-                     ".$ds->ds->qstr($phne).",
-                     ".$ds->ds->qstr($mbox).")");
+                     ".$ds->ds->QMagic("").",
+                     ".$ds->ds->QMagic($org).",
+                     ".$ds->ds->QMagic($street).",
+                     ".$ds->ds->QMagic($city).",
+                     ".$ds->ds->QMagic($state).",
+                     ".$ds->ds->QMagic($zipcode).",
+                     ".$ds->ds->QMagic($cntry).",
+                     ".$ds->ds->QMagic($nichandl).",
+                     ".$ds->ds->QMagic($lname).",
+                     ".$ds->ds->QMagic($fname).",
+                     ".$ds->ds->QMagic($mname).",
+                     ".$ds->ds->QMagic($torg).",
+                     ".$ds->ds->QMagic($tstreet).",
+                     ".$ds->ds->QMagic($tcity).",
+                     ".$ds->ds->QMagic($tstate).",
+                     ".$ds->ds->QMagic($tzipcode).",
+                     ".$ds->ds->QMagic($tcntry).",
+                     ".$ds->ds->QMagic($phne).",
+                     ".$ds->ds->QMagic($mbox).")");
 
             // delete all the DNS records first to preserve correct order
             $result=&$ds->ds->Execute("DELETE FROM revdns
@@ -235,8 +235,8 @@
                             (customer, hname, ipaddr, horder)
                             VALUES
                             ($cust,
-                             ".$ds->ds->qstr($hnametemp).",
-                             ".$ds->ds->qstr($ipaddrtemp).",
+                             ".$ds->ds->QMagic($hnametemp).",
+                             ".$ds->ds->QMagic($ipaddrtemp).",
                              $i)");
                 }
             }
@@ -245,7 +245,7 @@
                         FROM custadd
                         WHERE customer=$cust")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE custadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE customer=$cust");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -256,7 +256,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO custadd
                             (info, customer)
                             VALUES
-                            (".$ds->ds->qstr($info).", $cust)");
+                            (".$ds->ds->QMagic($info).", $cust)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-07-24 16:35:37.165261158 +0200
+++ ipplan/user/modifydns.php	2009-07-24 16:47:32.669263630 +0200
@@ -245,10 +245,10 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $ds->dataid, 9999,".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".               // myhost or myhost.mydomain.com.
-            $ds->ds->qstr($recordtype).",".         // A, MX, NS
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" );       // ip address for A, or 10 myhost for MX
+            $ds->ds->QMagic($host).",".               // myhost or myhost.mydomain.com.
+            $ds->ds->QMagic($recordtype).",".         // A, MX, NS
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" );       // ip address for A, or 10 myhost for MX
             */
 
             $ds->AuditLog(array("event"=>111, "action"=>"add forward zone", "cust"=>$cust,
@@ -316,7 +316,7 @@
     if ($dataid==0) {
         $dataid = &$ds->ds->GetCol("SELECT data_id
                 FROM fwdzone 
-                WHERE customer=$cust AND error_message=".$ds->ds->qstr("E")."
+                WHERE customer=$cust AND error_message=".$ds->ds->QMagic("E")."
                 ORDER BY domain ");
     }
     
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-07-24 16:35:37.170261039 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-24 16:46:37.127261298 +0200
@@ -81,7 +81,7 @@
 if ($action=="delete") {
     if (!$dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain))) {
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain))) {
         myError($w,$p, my_("Could not find the zone - possibly deleted by another user"));
     }
 
@@ -110,7 +110,7 @@
                     $baseindex=$row1["baseindex"];
 
                     $ds->ds->Execute("UPDATE ipaddr
-                            SET hname=".$ds->ds->qstr($row["host"])."
+                            SET hname=".$ds->ds->QMagic($row["host"])."
                             WHERE baseindex=$baseindex AND ipaddr=".inet_aton($row["ip_hostname"]));
                     insert($w,textbr(sprintf(my_("IP record %s updated in subnet '%s' due to deletion of auto created A record"), $row["ip_hostname"], $row1["descrip"])));
                 }
@@ -118,7 +118,7 @@
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$value") and
             $ds->ds->Execute("UPDATE fwdzone 
-                    SET error_message=".$ds->ds->qstr("E").",
+                    SET error_message=".$ds->ds->QMagic("E").",
                     lastmod=".$ds->ds->DBTimeStamp(time()).
                     " WHERE customer=$cust AND data_id=".$dom_id) and 
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
@@ -161,7 +161,7 @@
     $result = &$ds->ds->Execute("SELECT fwdzonerec.recidx, fwdzonerec.sortorder 
             FROM fwdzone, fwdzonerec
             WHERE fwdzone.customer=$cust AND 
-            fwdzone.domain=".$ds->ds->qstr($domain)." AND
+            fwdzone.domain=".$ds->ds->QMagic($domain)." AND
             fwdzone.data_id=fwdzonerec.data_id
             ORDER by fwdzonerec.sortorder");
 
@@ -297,14 +297,14 @@
     $result = &$ds->ds->Execute("SELECT customer 
                                 FROM fwdzonerec 
                                 WHERE customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
 
     $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
     if($recs > 0) {
         myError($w,$p, my_("Cannot create duplicate records"));
     }
@@ -317,12 +317,12 @@
         $result = &$ds->ds->Execute("SELECT ip_hostname 
                 FROM fwdzonerec 
                 WHERE customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
 
         $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
         if($recs == 1) {
             $updateiprec=1;
         }
@@ -361,12 +361,12 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $zoneid, ". $sortorder.",".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".
-            $ds->ds->qstr($recordtype).",".
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" ) and
+            $ds->ds->QMagic($host).",".
+            $ds->ds->QMagic($recordtype).",".
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
@@ -392,7 +392,7 @@
     }
     $dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain));
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain));
 
     // Updated DB here.
     // Log the Transaction.
@@ -411,14 +411,14 @@
     }
 
     $result = &$ds->ds->Execute("UPDATE fwdzonerec SET sortorder=".$sortorder.
-            ", host=".$ds->ds->qstr($host).
+            ", host=".$ds->ds->QMagic($host).
             ", lastmod=".$ds->ds->DBTimeStamp(time()).
-            ", recordtype=".$ds->ds->qstr($recordtype).
-            ", userid=".$ds->ds->qstr(getAuthUsername()).
-            ", ip_hostname=".$ds->ds->qstr($iphostname).
+            ", recordtype=".$ds->ds->QMagic($recordtype).
+            ", userid=".$ds->ds->QMagic(getAuthUsername()).
+            ", ip_hostname=".$ds->ds->QMagic($iphostname).
             " WHERE customer=$cust AND recidx=".$dataid ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
@@ -458,7 +458,7 @@
 
 $result = &$ds->ds->Execute("SELECT domain, data_id FROM fwdzone 
                             WHERE customer=$cust AND 
-                            slaveonly=".$ds->ds->qstr("N")."
+                            slaveonly=".$ds->ds->QMagic("N")."
                             ORDER BY domain");
 if (!$result) {
    myError($w,$p, my_("No domains found. Create some domains and try again."));
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-07-24 16:35:37.175260999 +0200
+++ ipplan/user/modifyipform.php	2009-07-24 16:47:47.499261554 +0200
@@ -192,7 +192,7 @@
 
             // add serialized info from file upload
             $ds->ds->Execute("UPDATE ipaddradd
-                    SET infobin=".$ds->ds->qstr(serialize($files))."
+                    SET infobin=".$ds->ds->QMagic(serialize($files))."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ip");
             // this generates a "duplicate key" error if no update
@@ -202,7 +202,7 @@
                 $ds->ds->Execute("INSERT INTO ipaddradd
                         (infobin, baseindex, ipaddr)
                         VALUES
-                        (".$ds->ds->qstr(serialize($files)).",
+                        (".$ds->ds->QMagic(serialize($files)).",
                          $baseindex,
                          $ip)");
             }
@@ -235,7 +235,7 @@
 
         // add serialized info after file deteled
         $ds->ds->Execute("UPDATE ipaddradd
-                SET infobin=".$ds->ds->qstr(empty($files) ? "" : serialize($files))."
+                SET infobin=".$ds->ds->QMagic(empty($files) ? "" : serialize($files))."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ip") and
             $ds->AuditLog(array("event"=>141, "action"=>"delete file", 
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-07-24 16:35:37.177261840 +0200
+++ ipplan/user/modifysubnet.php	2009-07-24 16:44:56.606265283 +0200
@@ -129,11 +129,11 @@
                 // between base and baseadd is baseindex column
                 if ($duplicatesubnet==0) {
                     $result=&$ds->ds->Execute("UPDATE base
-                            SET descrip=".$ds->ds->qstr($descrip).",
-                            admingrp=".$ds->ds->qstr($grp).",
+                            SET descrip=".$ds->ds->QMagic($descrip).",
+                            admingrp=".$ds->ds->QMagic($grp).",
                             customer=$cust,
                             lastmod=".$ds->ds->DBTimeStamp(time()).",
-                            userid=".$ds->ds->qstr($userid)."
+                            userid=".$ds->ds->QMagic($userid)."
                             WHERE baseindex=$baseindex");
                     
                     $ds->AuditLog(array("event"=>174, "action"=>"move subnet", 
@@ -163,13 +163,13 @@
                                         (ipaddr, userinf, location, telno,
                                          descrip, lastmod, userid, baseindex)
                                         VALUES
-                                        (".$ds->ds->qstr($tempipaddr).",
-                                         ".$ds->ds->qstr($tempuser).",
-                                         ".$ds->ds->qstr($templocation).",
-                                         ".$ds->ds->qstr($temptelno).",
-                                         ".$ds->ds->qstr($tempdescrip).",
+                                        (".$ds->ds->QMagic($tempipaddr).",
+                                         ".$ds->ds->QMagic($tempuser).",
+                                         ".$ds->ds->QMagic($templocation).",
+                                         ".$ds->ds->QMagic($temptelno).",
+                                         ".$ds->ds->QMagic($tempdescrip).",
                                          $templastmod,
-                                         ".$ds->ds->qstr($tempuserid).",
+                                         ".$ds->ds->QMagic($tempuserid).",
                                          $id)");
                             } // end while
                         }
@@ -206,11 +206,11 @@
 
             $ds->DbfTransactionStart();
             $result=&$ds->ds->Execute("UPDATE base
-                    SET descrip=".$ds->ds->qstr($descrip).",
-                    admingrp=".$ds->ds->qstr($grp).",
+                    SET descrip=".$ds->ds->QMagic($descrip).",
+                    admingrp=".$ds->ds->QMagic($grp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
                     baseopt=$dhcp,
-                    userid=".$ds->ds->qstr($userid)."
+                    userid=".$ds->ds->QMagic($userid)."
                     WHERE baseindex=$baseindex") and
                 $ds->AuditLog(array("event"=>171, "action"=>"modify subnet", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "baseaddr"=>inet_ntoa($base),
@@ -242,7 +242,7 @@
                         FROM baseadd
                         WHERE baseindex=$baseindex")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE baseadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE baseindex=$baseindex");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -253,7 +253,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO baseadd
                             (info, baseindex)
                             VALUES
-                            (".$ds->ds->qstr($info).", $baseindex)");
+                            (".$ds->ds->QMagic($info).", $baseindex)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-07-24 16:35:37.182261244 +0200
+++ ipplan/user/modifyzone.php	2009-07-24 16:46:00.574261375 +0200
@@ -276,7 +276,7 @@
                 WHERE zones.customer=base.customer AND 
                 base.baseindex=ipaddr.baseindex AND 
                 zones.customer=$cust AND
-                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->qstr("E").") AND
+                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->QMagic("E").") AND
                 ipaddr.ipaddr >= zones.zoneip AND 
                 ipaddr.ipaddr < zones.zoneip+zones.zonesize");
     }
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-07-24 16:35:37.186261178 +0200
+++ ipplan/user/requestip.php	2009-07-24 16:46:16.008271108 +0200
@@ -120,14 +120,14 @@
                  hname, telno, macaddr, info)
                 VALUES
                 ($cust,
-                 ".$ds->ds->qstr($request).",
-                 ".$ds->ds->qstr($user).",
-                 ".$ds->ds->qstr($location).",
-                 ".$ds->ds->qstr($descrip).",
-                 ".$ds->ds->qstr($hname).",
-                 ".$ds->ds->qstr($telno).",
-                 ".$ds->ds->qstr($newmacaddr).",
-                 ".$ds->ds->qstr($info).")") and
+                 ".$ds->ds->QMagic($request).",
+                 ".$ds->ds->QMagic($user).",
+                 ".$ds->ds->QMagic($location).",
+                 ".$ds->ds->QMagic($descrip).",
+                 ".$ds->ds->QMagic($hname).",
+                 ".$ds->ds->QMagic($telno).",
+                 ".$ds->ds->QMagic($newmacaddr).",
+                 ".$ds->ds->QMagic($info).")") and
                 $ds->AuditLog(array("event"=>200, "action"=>"request ip", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "userinf"=>$user,
                             "location"=>$location, "hname"=>$hname, "telno"=>$telno, 
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-07-24 16:35:37.191261348 +0200
+++ ipplan/user/searchall.php	2009-07-24 16:48:04.835262321 +0200
@@ -94,35 +94,35 @@
       myError($w,$p, my_("Regular expression repetition-operator operand invalid"));
    }
 /*   if ($field == "any") {
-      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search).")";
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search);
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info RLIKE ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else if (DBF_TYPE=="postgres7") {
@@ -131,65 +131,65 @@
    }
    /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname ~ ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info ~ ".$ds->ds->qstr($search).")";
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location ~ ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno ~ ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip ~ ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname ~ ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr($search);
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info ~ ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else {
     /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%").")";
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%").")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "location")
-      $where="WHERE ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "template") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%");
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%");
    }
 }
 


--- NEW FILE ipplan.spec ---
Name:		ipplan
Version:	4.92
Release:	3%{?dist}
Summary:	Web-based IP address manager and tracker
Group:		Applications/Internet
License:	GPLv2+
URL:		http://iptrack.sourceforge.net/
Source0:	http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}.tar.gz
Source1:	%{name}-mysql.sql
Source2:	%{name}-pgsql.sql
Source3:	README.%{name}
# Fedora specific patches to use libraries shipped with fedora
Patch1:		ipplan-set-menus-path.patch
Patch2:		ipplan-set-adodb-path.patch
Patch3:		ipplan-use-qmagic.patch
Patch4:		ipplan-set-phpmailer-path.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php, httpd
Requires:	php-gettext, php-snmp
Requires:	php-layers-menu, php-adodb, php-PHPMailer

%description
IPplan is an administrative tool for ISPs and network service companies.
It goes beyond IP address management to provide DNS administration,
configuration file management, circuit management and storing of hardware
information, all customizable via templates. IPplan can handle a single
network or cater for multiple networks and customers with overlapping address
space. Making managing IP addresses and address spaces simple and easy.
It is written in PHP and requires a MySQL or PostgresSQL database.

%prep
%setup -q -n %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

find . -name README.html -delete
find . -type f -print0 | xargs -0 sed -i 's/\r//'
sed -i -e "s/\(\.*\"UPLOADDIRECTORY\"[^'\"]*['\"]\)[^'\"]*\(['\"].*\)/\1\/var\/cache\/ipplan\2/" config.php
sed -i 's|/tmp/|%{_tmppath}/%{name}/|' config.php
find . -type f -exec chmod a-x {} \;
#remove bundled phplayersmenu
rm -rf menus/
sed -i 's:/usr/local:/usr:' contrib/*.{pl,php}
mkdir sql
cp -p %SOURCE1 %SOURCE2 sql
cp %SOURCE3 %{name}-README.fedora
#remove bundled adodb
rm -rf adodb/
#remove bundled phpMailer
rm -f class.smtp.php class.phpmailer.php phpmailer.lang-en.php
cat <<EOF >%{name}.conf
# %{name}
# %{summary}
# %{version}a
#
Alias /%{name} %{_datadir}/%{name}
Alias /menus %{_datadir}/php/php-layers-menu

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	AllowOverride Limit Options FileInfo
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

<DirectoryMatch "^%{_datadir}/%{name}/(.*/)?(adodb|templates)/(.*)?">
	Order Deny,Allow
	Deny from all
</DirectoryMatch>
EOF

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/images
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/user
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -p -d $RPM_BUILD_ROOT%{_localstatedir}/cache/%{name}
cp -pr admin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
cp -pr images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
cp -pr layout/* $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
cp -pr templates/* $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
cp -pr themes/* $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
cp -pr user/* $RPM_BUILD_ROOT%{_datadir}/%{name}/user
cp -pr locale/* $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -D -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
install -p -D -m0644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -D -m0644 *.html $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.js $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.css $RPM_BUILD_ROOT%{_datadir}/%{name}/
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -fs ../../..%{_sysconfdir}/%{name}/config.php .
popd

for lang in locale/*; do
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
	if [ -f $lang/LC_MESSAGES/*.mo ]; then
		for file in $lang/LC_MESSAGES/*.mo; do
			rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES/`basename $file`
			cp -a $file $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES/%{name}.mo
			pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
			ln -fs ../../../../locale/`basename $lang`/LC_MESSAGES/%{name}.mo messages.mo
			popd
		done
	fi
done
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc gpl.html %{name}-README.fedora contrib PORTERS INTERNALS CONTRIBUTORS INSTALL-POSTGRESQL TODO TRANSLATIONS TRIGGERS UPGRADE sql
%dir %{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/%{name}
%{_datadir}/%{name}/*

%changelog
* Mon Aug 24 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Remove unnessesary dependency on /sbin/service

* Sun Aug 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-2
- Use Fedora bundled php-PHPMailer
- Fix License tag
- Remove apache restart
- Remove in spec password generation

* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-1
- Update to version 4.92

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-3.a
- Use Packaged HTML_Template_PHPLIB

* Thu Jul 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-2.a
- Made changes to use fedora supplied libraries

* Sat Jul 11 2009 Andrew Colin Kissa <andrew at topdog-software.com> - 4.91-1.a
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:40:13 -0000	1.1
+++ .cvsignore	25 Aug 2009 08:19:25 -0000	1.2
@@ -0,0 +1 @@
+ipplan-4.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:40:13 -0000	1.1
+++ sources	25 Aug 2009 08:19:25 -0000	1.2
@@ -0,0 +1 @@
+2540b381744d1891b53b660fffc5ec56  ipplan-4.92.tar.gz



From caolanm at fedoraproject.org  Tue Aug 25 08:20:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 25 Aug 2009 08:20:41 +0000 (UTC)
Subject: rpms/hunspell-is/devel hunspell-is.spec,1.5,1.6
Message-ID: <20090825082041.6BB1111C0375@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18003

Modified Files:
	hunspell-is.spec 
Log Message:
latest effort


Index: hunspell-is.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/hunspell-is.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hunspell-is.spec	25 Jul 2009 02:30:10 -0000	1.5
+++ hunspell-is.spec	25 Aug 2009 08:20:41 -0000	1.6
@@ -1,11 +1,11 @@
 Name: hunspell-is
 Summary: Icelandic hunspell dictionaries
-%define upstreamid 20060928
+%define upstreamid 20090823
 Version: 0.%{upstreamid}
-Release: 5%{?dist}
-Source: http://hunspell.sourceforge.net/is_IS.zip
+Release: 1%{?dist}
+Source: http://extensions.services.openoffice.org/files/2829/1/Icelandic-dict-2009-08-23.oxt
 Group: Applications/Text
-URL: http://wiki.services.openoffice.org/wiki/Dictionaries#Icelandic_.28Iceland.29
+URL: http://extensions.services.openoffice.org/project/dict-is
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2+
 BuildArch: noarch
@@ -20,7 +20,7 @@ Icelandic hunspell dictionaries.
 
 %build
 chmod -x *
-for i in README_is_IS.txt; do
+for i in LICENSE_en_US.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
@@ -34,17 +34,20 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p is_IS.dic is_IS.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cp -p dictionaries/is_IS.* $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_is_IS.txt
+%doc LICENSE_en_US.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Aug 25 2009 Caol?n McNamara <caolanm at redhat.com> - 0.20090823-1
+- most recent effort
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20060928-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Tue Aug 25 08:24:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 25 Aug 2009 08:24:22 +0000 (UTC)
Subject: rpms/hunspell-is/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090825082422.85A5911C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18906

Modified Files:
	.cvsignore sources 
Log Message:
latest effort


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Sep 2008 16:16:28 -0000	1.2
+++ .cvsignore	25 Aug 2009 08:24:22 -0000	1.3
@@ -1 +1 @@
-is_IS.zip
+Icelandic-dict-2009-08-23.oxt


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2008 16:16:28 -0000	1.2
+++ sources	25 Aug 2009 08:24:22 -0000	1.3
@@ -1 +1 @@
-81ed5481a9ceaf10923d92c37d303a43  is_IS.zip
+fa21fbd9e67bff014f4a159bbb7ed98c  Icelandic-dict-2009-08-23.oxt



From whot at fedoraproject.org  Tue Aug 25 08:24:55 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 25 Aug 2009 08:24:55 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.69, 1.70 commitid, 1.32,
	1.33 sources, 1.64, 1.65 xorg-x11-server.spec, 1.477,
	1.478 xserver-1.6.99-vga-arb.patch, 1.6, 1.7
Message-ID: <20090825082455.7736D11C00D7@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19076

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
	xserver-1.6.99-vga-arb.patch 
Log Message:
* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-41.20090825
- Today's git snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	20 Aug 2009 21:40:48 -0000	1.69
+++ .cvsignore	25 Aug 2009 08:24:54 -0000	1.70
@@ -1 +1 @@
-xorg-server-20090820.tar.xz
+xorg-server-20090825.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- commitid	20 Aug 2009 21:40:48 -0000	1.32
+++ commitid	25 Aug 2009 08:24:54 -0000	1.33
@@ -1 +1 @@
-9d8fc33cae2fee7777edd20658dbf6a3ffb3d557
+0f9ffc887ca1471e98df746253d9300e03e46a15


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	20 Aug 2009 21:40:48 -0000	1.64
+++ sources	25 Aug 2009 08:24:54 -0000	1.65
@@ -1 +1 @@
-ea807505ea5c7e6c2d1a7f1cadce4f6f  xorg-server-20090820.tar.xz
+2155224c1468113477aed53561b09063  xorg-server-20090825.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- xorg-x11-server.spec	24 Aug 2009 05:05:49 -0000	1.477
+++ xorg-x11-server.spec	25 Aug 2009 08:24:54 -0000	1.478
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090820
+%define gitdate 20090825
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   40.%{gitdate}%{?dist}
+Release:   41.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-41.20090825
+- Today's git snapshot.
+
 * Mon Aug 24 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.99-40.20090820
 - xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
   should work on them now, there's accel issues on some of them but we can

xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1151 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1522 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xserver-1.6.99-vga-arb.patch	11 Aug 2009 04:13:13 -0000	1.6
+++ xserver-1.6.99-vga-arb.patch	25 Aug 2009 08:24:55 -0000	1.7
@@ -39,7 +39,7 @@ index 1e3438e..a1219d6 100644
 +	AC_CHECK_FUNCS([pci_device_vgaarb_init])
  	LIBS=$SAVE_LIBS
  	CFLAGS=$SAVE_CFLAGS
- 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
+ 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
 diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
 index f3e201b..ad27210 100644
 --- a/hw/xfree86/common/Makefile.am



From topdog at fedoraproject.org  Tue Aug 25 08:25:15 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 25 Aug 2009 08:25:15 +0000 (UTC)
Subject: rpms/ipplan/F-11 README.ipplan, NONE, 1.1 import.log, NONE,
	1.1 ipplan-mysql.sql, NONE, 1.1 ipplan-pgsql.sql, NONE,
	1.1 ipplan-set-adodb-path.patch, NONE,
	1.1 ipplan-set-menus-path.patch, NONE,
	1.1 ipplan-set-phpmailer-path.patch, NONE,
	1.1 ipplan-use-qmagic.patch, NONE, 1.1 ipplan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090825082515.AD9AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/ipplan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19111/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.ipplan import.log ipplan-mysql.sql ipplan-pgsql.sql 
	ipplan-set-adodb-path.patch ipplan-set-menus-path.patch 
	ipplan-set-phpmailer-path.patch ipplan-use-qmagic.patch 
	ipplan.spec 
Log Message:
* Tue Aug 25 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Initial import




--- NEW FILE README.ipplan ---

Configuration - Mysql
1) create the database by issuing the following at the command prompt:

   mysqladmin -p create ipplan

2) add a database user for ipplan using mysql -p
   GRANT SELECT,INSERT,UPDATE,DELETE on ipplan.*
       TO ipplan at localhost IDENTIFIED by 'password';

   Change the above password to whatever you wish

3) modify the user and password info in the /etc/ipplan/config.php,
   additional settings can be changed in the /etc/ipplan/config.php 
   at this stage too. See /usr/share/doc/ipplan-*/README for more 
   information.

   Make sure you leave transaction support enabled in /etc/ipplan/config.php

4) Import the database schema into the database

  mysql -p ipplan < /usr/share/doc/ipplan-*/sql/ipplan-mysql.sql

5) Point your web browser to the main IPplan web page (http://mywebserver.com/ipplan), 
   select the admin drop down menu and add customers, groups and users using the admin 
   user defined in the config.php file - you MUST create at least one regular user 
   one group and one customer

Configuration - Postgresql
1) Create the database, database user and tables by issuing the following at the
   command prompt as the postgres user (su - postgres):
  
  su - postgres
  createuser -P ipplan
        Enter password for new role:
        Enter it again:
        Shall the new role be a superuser? (y/n) n
        Shall the new role be allowed to create databases? (y/n) n
        Shall the new role be allowed to create more new roles? (y/n) n
  
  createdb -O ipplan ipplan

  Make sure that the ipplan user is allowed to connect to the ipplan
  database from another user by modifying the pg_hba.conf file and
  adding the following then restart the postgresql service

        host   ipplan       ipplan      127.0.0.1/32          md5
        host   ipplan       ipplan         ::1/128            md5
        local  ipplan       ipplan                            md5

  Import the database schema

  psql -U ipplan < /usr/share/doc/ipplan-*/sql/ipplan-pgsql.sql

2) Modify the user and password info in the config.php script, additional
   settings can be changed /etc/ipplan/config.php at this stage too.
   See the /usr/share/doc/ipplan-*/README for more information.

3) now point your web browser to the main IPplan web page
   (http://mywebserver.com/ipplan), select the admin drop down menu and add
   customers, groups and users using the admin user defined in the config.php
   file - you MUST create at least one regular user, one group and one customer

Configuration - Oracle
Oracle is not supported on fedora


--- NEW FILE import.log ---
ipplan-4_92-3_fc11:F-11:ipplan-4.92-3.fc11.src.rpm:1251188586


--- NEW FILE ipplan-mysql.sql ---

CREATE TABLE area (
areaaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
areaindex                BIGINT NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (areaindex)
)TYPE=INNODB;


ALTER TABLE area ADD  UNIQUE INDEX area_customer  (customer, descrip);


ALTER TABLE area ADD  UNIQUE INDEX area_areaaddr  (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP NOT NULL
)TYPE=INNODB;


ALTER TABLE auditlog ADD  INDEX auditlog_dt  (dt);


CREATE TABLE base (
baseaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
subnetsize               INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
baseindex                BIGINT NOT NULL AUTO_INCREMENT,
admingrp                 VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT UNSIGNED DEFAULT 0,
swipmod                  DATETIME,
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


ALTER TABLE base ADD  UNIQUE INDEX base_baseaddr  (baseaddr, customer);


ALTER TABLE base ADD  INDEX base_customer  (customer);


ALTER TABLE base ADD  INDEX base_admingrp  (admingrp);


CREATE TABLE baseadd (
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


CREATE TABLE custinfo (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE custadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
)TYPE=INNODB;


ALTER TABLE customer ADD  UNIQUE INDEX customer_custdescrip  (custdescrip);


ALTER TABLE customer ADD  INDEX customer_crm  (crm);


ALTER TABLE customer ADD  INDEX customer_admingrp  (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) NOT NULL DEFAULT 'N',
resaddr                  SMALLINT UNSIGNED DEFAULT 0,
grpopt                   INT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (grp)
)TYPE=INNODB;


ALTER TABLE grp ADD  UNIQUE INDEX grp_grpdescrip  (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                BIGINT NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
lastpol                  DATETIME,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddr ADD  INDEX ipaddr_baseindex  (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddradd ADD  INDEX ipaddradd_baseindex  (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
dstipaddr                INT UNSIGNED NOT NULL DEFAULT 0,
dstcustomer              SMALLINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE ipaddrlnk ADD  UNIQUE INDEX ipaddrlnk_uniq  (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_dst  (dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_src  (ipaddr, customer);


CREATE TABLE requestip (
requestindex             INTEGER NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP NOT NULL,
info                     LONGTEXT,
                 PRIMARY KEY (requestindex)
)TYPE=INNODB;


ALTER TABLE requestip ADD  UNIQUE INDEX requestip_desc  (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT UNSIGNED NOT NULL DEFAULT 0,
rangesize                INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               BIGINT NOT NULL AUTO_INCREMENT,
areaindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (rangeindex)
)TYPE=INNODB;


ALTER TABLE netrange ADD  INDEX range_rangeaddr  (rangeaddr, customer);


ALTER TABLE netrange ADD  UNIQUE INDEX range_customer  (customer, descrip);


ALTER TABLE netrange ADD  INDEX range_areaindex  (areaindex);


CREATE TABLE revdns (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE revdns ADD  INDEX revdns_customer  (customer);


CREATE TABLE version (
version                  INTEGER NOT NULL DEFAULT 0
)TYPE=INNODB;


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
)TYPE=INNODB;


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE usergrp ADD  UNIQUE INDEX usergrp_userid  (userid, grp);


ALTER TABLE usergrp ADD  INDEX usergrp_grp  (grp);


CREATE TABLE bounds (
boundsaddr               INT UNSIGNED NOT NULL DEFAULT 0,
boundssize               INT UNSIGNED NOT NULL DEFAULT 0,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE bounds ADD  INDEX bounds_grp  (grp);


ALTER TABLE bounds ADD  INDEX bounds_boundsaddr  (boundsaddr);


CREATE TABLE fwdzone (
data_id                  BIGINT NOT NULL AUTO_INCREMENT,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  DATETIME,
regmod                   DATE,
expiremod                DATETIME,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
)TYPE=INNODB;


ALTER TABLE fwdzone ADD  INDEX fwdzone_customer  (customer);


ALTER TABLE fwdzone ADD  INDEX fwdzone_domain  (domain);


CREATE TABLE fwdzoneadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
data_id                  BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255)
)TYPE=INNODB;


ALTER TABLE fwdzoneadd ADD  UNIQUE INDEX fwdzoneadd_customer  (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   BIGINT NOT NULL AUTO_INCREMENT,
data_id                  BIGINT NOT NULL DEFAULT 0,
lastmod                  DATETIME,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INTEGER NOT NULL DEFAULT 0,
userid                   VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (recidx)
)TYPE=INNODB;


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_data_id  (data_id);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_sortorder  (sortorder);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_customer  (customer);


CREATE TABLE fwddns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE fwddns ADD  INDEX fwddns_id  (id);


CREATE TABLE zones (
id                       BIGINT NOT NULL AUTO_INCREMENT,
zoneip                   INT UNSIGNED NOT NULL DEFAULT 0,
zonesize                 INT UNSIGNED NOT NULL DEFAULT 0,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  DATETIME,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (id)
)TYPE=INNODB;


ALTER TABLE zones ADD  INDEX zones_customer  (customer);


ALTER TABLE zones ADD  INDEX zones_zoneip  (zoneip);


CREATE TABLE zonedns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE zonedns ADD  INDEX zonedns_id  (id);


BEGIN;


INSERT INTO version (version) VALUES (22);


COMMIT;



--- NEW FILE ipplan-pgsql.sql ---
CREATE TABLE area (
areaaddr                 INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
areaindex                SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (areaindex)
);


CREATE UNIQUE INDEX area_customer ON area (customer, descrip);


CREATE UNIQUE INDEX area_areaaddr ON area (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
);


CREATE INDEX auditlog_dt ON auditlog (dt);


CREATE TABLE base (
baseaddr                 INT8 DEFAULT 0 NOT NULL,
subnetsize               INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
baseindex                SERIAL,
admingrp                 VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT8 DEFAULT 0,
swipmod                  TIMESTAMP,
                 PRIMARY KEY (baseindex)
);


CREATE UNIQUE INDEX base_baseaddr ON base (baseaddr, customer);


CREATE INDEX base_customer ON base (customer);


CREATE INDEX base_admingrp ON base (admingrp);


CREATE TABLE baseadd (
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
);


CREATE TABLE custinfo (
customer                 INT4 DEFAULT 0 NOT NULL,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
);


CREATE TABLE custadd (
customer                 INT4 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
);


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SERIAL,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
);


CREATE UNIQUE INDEX customer_custdescrip ON customer (custdescrip);


CREATE INDEX customer_crm ON customer (crm);


CREATE INDEX customer_admingrp ON customer (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) DEFAULT 'N' NOT NULL,
resaddr                  INT4 DEFAULT 0,
grpopt                   INT8 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (grp)
);


CREATE UNIQUE INDEX grp_grpdescrip ON grp (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
lastpol                  TIMESTAMP,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddr_baseindex ON ipaddr (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddradd_baseindex ON ipaddradd (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
dstipaddr                INT8 DEFAULT 0 NOT NULL,
dstcustomer              INT4 DEFAULT 0 NOT NULL
);


CREATE UNIQUE INDEX ipaddrlnk_uniq ON ipaddrlnk (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_dst ON ipaddrlnk (dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_src ON ipaddrlnk (ipaddr, customer);


CREATE TABLE requestip (
requestindex             SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
info                     TEXT,
                 PRIMARY KEY (requestindex)
);


CREATE UNIQUE INDEX requestip_desc ON requestip (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT8 DEFAULT 0 NOT NULL,
rangesize                INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               SERIAL,
areaindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (rangeindex)
);


CREATE INDEX range_rangeaddr ON netrange (rangeaddr, customer);


CREATE UNIQUE INDEX range_customer ON netrange (customer, descrip);


CREATE INDEX range_areaindex ON netrange (areaindex);


CREATE TABLE revdns (
customer                 INT4 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX revdns_customer ON revdns (customer);


CREATE TABLE schema (
version                  INT4 DEFAULT 0 NOT NULL
);


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
);


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE UNIQUE INDEX usergrp_userid ON usergrp (userid, grp);


CREATE INDEX usergrp_grp ON usergrp (grp);


CREATE TABLE bounds (
boundsaddr               INT8 DEFAULT 0 NOT NULL,
boundssize               INT8 DEFAULT 0 NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE INDEX bounds_grp ON bounds (grp);


CREATE INDEX bounds_boundsaddr ON bounds (boundsaddr);


CREATE TABLE fwdzone (
data_id                  SERIAL,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  TIMESTAMP,
regmod                   DATE,
expiremod                TIMESTAMP,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 INT4 DEFAULT 0 NOT NULL,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
);


CREATE INDEX fwdzone_customer ON fwdzone (customer);


CREATE INDEX fwdzone_domain ON fwdzone (domain);


CREATE TABLE fwdzoneadd (
customer                 INT4 DEFAULT 0 NOT NULL,
data_id                  INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255)
);


CREATE UNIQUE INDEX fwdzoneadd_customer ON fwdzoneadd (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   SERIAL,
data_id                  INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INT4 DEFAULT 0 NOT NULL,
userid                   VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (recidx)
);


CREATE INDEX fwdzonerec_data_id ON fwdzonerec (data_id);


CREATE INDEX fwdzonerec_sortorder ON fwdzonerec (sortorder);


CREATE INDEX fwdzonerec_customer ON fwdzonerec (customer);


CREATE TABLE fwddns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX fwddns_id ON fwddns (id);


CREATE TABLE zones (
id                       SERIAL,
zoneip                   INT8 DEFAULT 0 NOT NULL,
zonesize                 INT8 DEFAULT 0 NOT NULL,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  TIMESTAMP,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (id)
);


CREATE INDEX zones_customer ON zones (customer);


CREATE INDEX zones_zoneip ON zones (zoneip);


CREATE TABLE zonedns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX zonedns_id ON zonedns (id);


BEGIN;


INSERT INTO schema (version) VALUES (22);


COMMIT;



ipplan-set-adodb-path.patch:
 admin/changepassword.php     |    2 +-
 admin/deletebounds.php       |    2 +-
 admin/displayauditlog.php    |    4 ++--
 admin/displayboundsform.php  |    2 +-
 admin/exportbase.php         |    2 +-
 admin/exportbaseform.php     |    2 +-
 admin/exportip.php           |    2 +-
 admin/exportipform.php       |    2 +-
 admin/importbase.php         |    2 +-
 admin/importbaseform.php     |    2 +-
 admin/importip.php           |    2 +-
 admin/importipform.php       |    2 +-
 admin/maintenance.php        |    2 +-
 admin/schemacreate.php       |    4 ++--
 admin/usermanager.php        |    2 +-
 contrib/ipplan-poller.php    |    2 +-
 user/changesettings.php      |    2 +-
 user/createarea.php          |    2 +-
 user/createrange.php         |    2 +-
 user/createsubnet.php        |    2 +-
 user/createsubnetform.php    |    2 +-
 user/deletearea.php          |    2 +-
 user/deletecustomer.php      |    2 +-
 user/deleterange.php         |    2 +-
 user/displaybase.php         |    2 +-
 user/displaybaseform.php     |    2 +-
 user/displaycustomerform.php |    2 +-
 user/displayoverlap.php      |    2 +-
 user/displayoverlapform.php  |    2 +-
 user/displayrouter.php       |    2 +-
 user/displayrouterform.php   |    2 +-
 user/displaysubnet.php       |    4 ++--
 user/displayswip.php         |    2 +-
 user/displayswipform.php     |    2 +-
 user/emailswip.php           |    2 +-
 user/exportdhcp.php          |    2 +-
 user/exportview.php          |    2 +-
 user/findfree.php            |    2 +-
 user/findfreeform.php        |    2 +-
 user/modifyarearange.php     |    2 +-
 user/modifyarearangeform.php |    2 +-
 user/modifybase.php          |    2 +-
 user/modifybaseform.php      |    2 +-
 user/modifycustomer.php      |    2 +-
 user/modifydns.php           |    2 +-
 user/modifydnsform.php       |    2 +-
 user/modifydnsrecord.php     |    2 +-
 user/modifydnsrecordform.php |    2 +-
 user/modifyipform.php        |    2 +-
 user/modifyipformmul.php     |    2 +-
 user/modifysubnet.php        |    2 +-
 user/modifyzone.php          |    2 +-
 user/modifyzoneform.php      |    2 +-
 user/ping.php                |    2 +-
 user/requestip.php           |    2 +-
 user/searchall.php           |    2 +-
 user/searchallform.php       |    2 +-
 user/traceroute.php          |    2 +-
 user/treeview.php            |    2 +-
 59 files changed, 62 insertions(+), 62 deletions(-)

--- NEW FILE ipplan-set-adodb-path.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/changepassword.php	2009-07-27 18:08:20.964259380 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/deletebounds.php	2009-07-27 18:08:20.976259668 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/displayauditlog.php ipplan/admin/displayauditlog.php
--- ipplan.orig/admin/displayauditlog.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayauditlog.php	2009-07-27 18:08:21.010259547 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
@@ -135,7 +135,7 @@
 insert($w,text(my_("Total records:")." ".$cnt));
 
 /*
-include_once('../adodb/adodb-pager.inc.php');
+include_once('/usr/share/php/adodb/adodb-pager.inc.php');
 $sql = "SELECT userid, action, dt FROM auditlog ORDER BY dt DESC";
 
 function callback($buffer) {
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-27 18:08:20.978259300 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbaseform.php ipplan/admin/exportbaseform.php
--- ipplan.orig/admin/exportbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbaseform.php	2009-07-27 18:08:21.012260319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbase.php ipplan/admin/exportbase.php
--- ipplan.orig/admin/exportbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbase.php	2009-07-27 18:08:20.966259550 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 require_once("../class.templib.php");
diff -ruN ipplan.orig/admin/exportipform.php ipplan/admin/exportipform.php
--- ipplan.orig/admin/exportipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportipform.php	2009-07-27 18:08:21.014260770 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportip.php ipplan/admin/exportip.php
--- ipplan.orig/admin/exportip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportip.php	2009-07-27 18:08:21.001494556 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/importbaseform.php ipplan/admin/importbaseform.php
--- ipplan.orig/admin/importbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbaseform.php	2009-07-27 18:08:21.017259720 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbase.php	2009-07-27 18:08:20.973259193 +0200
@@ -56,7 +56,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/importipform.php ipplan/admin/importipform.php
--- ipplan.orig/admin/importipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importipform.php	2009-07-27 18:08:21.073260965 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importip.php ipplan/admin/importip.php
--- ipplan.orig/admin/importip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importip.php	2009-07-27 18:08:20.984259075 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/maintenance.php ipplan/admin/maintenance.php
--- ipplan.orig/admin/maintenance.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/maintenance.php	2009-07-27 18:08:20.992259086 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/schemacreate.php ipplan/admin/schemacreate.php
--- ipplan.orig/admin/schemacreate.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/schemacreate.php	2009-07-27 18:08:21.069260682 +0200
@@ -22,8 +22,8 @@
 define("SCHEMA", 22);
 
 require_once("../ipplanlib.php");
-//require_once('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//require_once('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-27 18:06:42.469260813 +0200
+++ ipplan/admin/usermanager.php	2009-07-27 18:08:21.042259729 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-02-22 23:44:50.000000000 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-27 18:08:20.377259554 +0200
@@ -39,7 +39,7 @@
 // define the nmap command for scan with dns lookup
 define("NMAP_CMDH", "-sP -PE -q -R -v -oG");
 
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 
 $timestamp = FALSE;
diff -ruN ipplan.orig/user/changesettings.php ipplan/user/changesettings.php
--- ipplan.orig/user/changesettings.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/changesettings.php	2009-07-27 18:08:20.707259358 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createarea.php	2009-07-27 18:08:20.825259282 +0200
@@ -20,7 +20,7 @@
 // Modify capabilities added by Denes Magyar (fat at poison.hu) 22/02/05
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createrange.php	2009-07-27 18:08:20.857259235 +0200
@@ -63,7 +63,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnetform.php ipplan/user/createsubnetform.php
--- ipplan.orig/user/createsubnetform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnetform.php	2009-07-27 18:08:20.799259298 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnet.php	2009-07-27 18:08:20.724259386 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletearea.php ipplan/user/deletearea.php
--- ipplan.orig/user/deletearea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletearea.php	2009-07-27 18:08:20.710259490 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletecustomer.php ipplan/user/deletecustomer.php
--- ipplan.orig/user/deletecustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletecustomer.php	2009-07-27 18:08:20.550259181 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deleterange.php ipplan/user/deleterange.php
--- ipplan.orig/user/deleterange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deleterange.php	2009-07-27 18:08:20.809260311 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybaseform.php ipplan/user/displaybaseform.php
--- ipplan.orig/user/displaybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybaseform.php	2009-07-27 18:08:20.791259227 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybase.php ipplan/user/displaybase.php
--- ipplan.orig/user/displaybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybase.php	2009-07-27 18:08:20.488259765 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaycustomerform.php ipplan/user/displaycustomerform.php
--- ipplan.orig/user/displaycustomerform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaycustomerform.php	2009-07-27 18:08:20.879259357 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlapform.php ipplan/user/displayoverlapform.php
--- ipplan.orig/user/displayoverlapform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlapform.php	2009-07-27 18:08:20.875259262 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlap.php ipplan/user/displayoverlap.php
--- ipplan.orig/user/displayoverlap.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlap.php	2009-07-27 18:08:20.593259271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouterform.php ipplan/user/displayrouterform.php
--- ipplan.orig/user/displayrouterform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouterform.php	2009-07-27 18:08:20.872259229 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouter.php ipplan/user/displayrouter.php
--- ipplan.orig/user/displayrouter.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouter.php	2009-07-27 18:08:20.770259123 +0200
@@ -93,7 +93,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaysubnet.php	2009-07-27 18:08:20.849259064 +0200
@@ -19,8 +19,8 @@
 //
 
 require_once("../ipplanlib.php");
-//include('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//include('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswipform.php ipplan/user/displayswipform.php
--- ipplan.orig/user/displayswipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswipform.php	2009-07-27 18:08:20.479259953 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswip.php ipplan/user/displayswip.php
--- ipplan.orig/user/displayswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswip.php	2009-07-27 18:08:20.764259337 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/emailswip.php ipplan/user/emailswip.php
--- ipplan.orig/user/emailswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/emailswip.php	2009-07-27 18:08:20.588259651 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportdhcp.php	2009-07-27 18:08:20.717259269 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/exportview.php ipplan/user/exportview.php
--- ipplan.orig/user/exportview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportview.php	2009-07-27 18:08:20.888259800 +0200
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfreeform.php ipplan/user/findfreeform.php
--- ipplan.orig/user/findfreeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfreeform.php	2009-07-27 18:08:20.540261810 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfree.php ipplan/user/findfree.php
--- ipplan.orig/user/findfree.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfree.php	2009-07-27 18:08:20.781259273 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearangeform.php ipplan/user/modifyarearangeform.php
--- ipplan.orig/user/modifyarearangeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearangeform.php	2009-07-27 18:08:20.793260240 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearange.php ipplan/user/modifyarearange.php
--- ipplan.orig/user/modifyarearange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearange.php	2009-07-27 18:08:20.886259388 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybaseform.php ipplan/user/modifybaseform.php
--- ipplan.orig/user/modifybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybaseform.php	2009-07-27 18:08:20.860259626 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybase.php	2009-07-27 18:08:20.504259535 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifycustomer.php	2009-07-27 18:08:20.527258935 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsform.php ipplan/user/modifydnsform.php
--- ipplan.orig/user/modifydnsform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsform.php	2009-07-27 18:08:20.733259100 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydns.php	2009-07-27 18:08:20.584259051 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/modifydnsrecordform.php ipplan/user/modifydnsrecordform.php
--- ipplan.orig/user/modifydnsrecordform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecordform.php	2009-07-27 18:08:20.492259765 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-27 18:08:20.749259692 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipformmul.php ipplan/user/modifyipformmul.php
--- ipplan.orig/user/modifyipformmul.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipformmul.php	2009-07-27 18:08:20.555259277 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipform.php	2009-07-27 18:08:20.571259438 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifysubnet.php	2009-07-27 18:08:20.869259218 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzoneform.php ipplan/user/modifyzoneform.php
--- ipplan.orig/user/modifyzoneform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzoneform.php	2009-07-27 18:08:20.760259037 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzone.php	2009-07-27 18:08:20.821259349 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/ping.php ipplan/user/ping.php
--- ipplan.orig/user/ping.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/ping.php	2009-07-27 18:08:20.783260234 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/requestip.php	2009-07-27 18:08:20.806260271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchallform.php ipplan/user/searchallform.php
--- ipplan.orig/user/searchallform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchallform.php	2009-07-27 18:08:20.546259497 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchall.php	2009-07-27 18:08:20.536259319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/traceroute.php ipplan/user/traceroute.php
--- ipplan.orig/user/traceroute.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/traceroute.php	2009-07-27 18:08:20.482259840 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-07-27 18:06:42.474261590 +0200
+++ ipplan/user/treeview.php	2009-07-27 18:08:20.787259612 +0200
@@ -20,7 +20,7 @@
 // Bcracknell 03/11/2005 - Added tree menu display of Customers/Areas/Ranges & Subnets
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");

ipplan-set-menus-path.patch:
 ipplan/admin/usermanager.php |   20 ++++++++++----------
 ipplan/ipplanlib.php         |   19 ++++++++++---------
 ipplan/user/treeview.php     |   20 ++++++++++----------
 ipplanlib.php                |    2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

--- NEW FILE ipplan-set-menus-path.patch ---
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/usermanager.php	2009-07-23 18:39:21.905261618 +0200
@@ -22,9 +22,9 @@
 require_once("../adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 require_once("../auth.php");
 
 
@@ -38,7 +38,7 @@
 isset($_COOKIE["ipplanLanguage"]) && myLanguage($_COOKIE['ipplanLanguage']);
 
 newhtml($p);
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p,my_("User Manager"));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu-hidden.css")));
@@ -190,12 +190,12 @@
 insert($view, block("<i>".my_("Click on a group or user")."</i>"));
 
 $mid = new TreeMenu();
-$mid->setDirroot('../menus');
-$mid->setLibjsdir('../menus/libjs/');
-$mid->setImgdir('../menus/menuimages/');
-$mid->setImgwww('../menus/menuimages/');
-$mid->setIcondir('../menus/menuicons/');
-$mid->setIconwww('../menus/menuicons/');
+$mid->setDirroot('/usr/share/php/php-layers-menu');
+$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+$mid->setImgwww('../../menus/menuimages/');
+$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+$mid->setIconwww('../../menus/menuicons/');
 $mid->SetMenuStructureString($MENU);
 $mid->setIconsize(16, 16);
 $mid->parseStructureForMenu('treemenu1');
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/ipplanlib.php	2009-07-23 18:49:26.576261171 +0200
@@ -540,8 +540,9 @@
     $BASE_URL = base_url();
     $BASE_DIR = base_dir();
 
-    $myDirPath = $BASE_DIR . '/menus/';
-    $myWwwPath = $BASE_URL . '/menus/';
+    $myDirPath = '/usr/share/php/php-layers-menu/';
+    $myMenPath = str_replace('/ipplan','',$BASE_URL);
+    $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
     require_once $myDirPath . 'lib/PHPLIB.php';
@@ -583,13 +584,13 @@
         insert($w, script("",array("language"=>"JavaScript","type"=>"text/javascript","src"=> $myWwwPath . 'libjs/layersmenu.js')));
 
         $mid= new LayersMenu(6, 7, 2, 1);
-        $mid->setDirroot ($BASE_DIR.'/menus/');
-        $mid->setLibjsdir($BASE_DIR.'/menus/libjs/');
-        $mid->setImgdir  ($BASE_DIR.'/menus/menuimages/');
-        $mid->setImgwww  ($BASE_URL.'/menus/menuimages/');
-        $mid->setIcondir ($BASE_DIR.'/menus/menuicons/');
-        $mid->setIconwww ($BASE_URL.'/menus/menuicons/');
-        $mid->setTpldir  ($BASE_DIR.'/menus/templates/');
+        $mid->setDirroot ('/usr/share/php/php-layers-menu/');
+        $mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+        $mid->setImgdir  ('/usr/share/php/php-layers-menu/menuimages/');
+        $mid->setImgwww  ('../../menus/menuimages/');
+        $mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
+        $mid->setIconwww ('../../menus/menuicons/');
+        $mid->setTpldir  ('/usr/share/php/php-layers-menu/templates/');
         $mid->SetMenuStructureString($ADMIN_MENU);
         $mid->setIconsize(16, 16);
         $mid->parseStructureForMenu('hormenu1');
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/treeview.php	2009-07-23 18:52:03.193261518 +0200
@@ -24,9 +24,9 @@
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 
 $auth = new SQLAuthenticator(REALM, REALMERROR);
 
@@ -39,7 +39,7 @@
 $title=my_("Display subnet information");
 newhtml($p);
 
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p, $title);
 
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
@@ -133,12 +133,12 @@
   	}
 
 	$mid = new TreeMenu();
-	$mid->setDirroot('../menus');
-	$mid->setLibjsdir('../menus/libjs/');
-	$mid->setImgdir('../menus/menuimages/');
-	$mid->setImgwww('../menus/menuimages/');
-	$mid->setIcondir('../menus/menuicons/');
-	$mid->setIconwww('../menus/menuicons/');
+	$mid->setDirroot('/usr/share/php/php-layers-menu');
+	$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+	$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+	$mid->setImgwww('../../menus/menuimages/');
+	$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+	$mid->setIconwww('../../menus/menuicons/');
 	if(!$menustring) myError($w,$p, my_("No customers"));
 	$mid->setMenuStructureString($menustring);
 	$mid->setIconsize(16, 16);
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-07-27 18:18:17.073261816 +0200
+++ ipplan/ipplanlib.php	2009-07-27 18:19:44.414278370 +0200
@@ -545,7 +545,7 @@
     $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
-    require_once $myDirPath . 'lib/PHPLIB.php';
+    require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
     require_once $myDirPath . 'lib/layersmenu-common.inc.php';
     require_once $myDirPath . 'lib/layersmenu.inc.php';
     require_once $BASE_DIR  . '/menudefs.php';

ipplan-set-phpmailer-path.patch:
 displaysubnet.php      |    8 ++++----
 displaysubnet.php.orig |    8 ++++----
 requestip.php          |    4 ++--
 swiplib.php            |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE ipplan-set-phpmailer-path.patch ---
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-08-23 11:17:07.326552632 +0200
+++ ipplan/user/displaysubnet.php	2009-08-23 11:28:14.122554254 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/displaysubnet.php.orig ipplan/user/displaysubnet.php.orig
--- ipplan.orig/user/displaysubnet.php.orig	2009-08-23 11:16:42.634555924 +0200
+++ ipplan/user/displaysubnet.php.orig	2009-08-23 11:26:26.055552579 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-08-23 11:17:07.345554665 +0200
+++ ipplan/user/requestip.php	2009-08-23 11:27:11.342553873 +0200
@@ -140,10 +140,10 @@
             $custdescrip=$ds->GetCustomerDescrip($cust);
 
             //Send email notification that IP Request was entered 
-            require("../class.phpmailer.php");
+            require("/usr/share/php/PHPMailer/class.phpmailer.php");
             $mail = new PHPMailer();
             $mail->IsSMTP(); // telling the class to use SMTP
-            $mail->SetLanguage("en", "../");
+            $mail->SetLanguage("en");
             $mail->Host = EMAILSERVER; // SMTP server
             $mail->From = HELPDESKEMAIL;
             $mail->IsHTML(false);
diff -ruN ipplan.orig/user/swiplib.php ipplan/user/swiplib.php
--- ipplan.orig/user/swiplib.php	2009-07-17 00:15:20.000000000 +0200
+++ ipplan/user/swiplib.php	2009-08-23 11:23:16.109553193 +0200
@@ -154,10 +154,10 @@
 // email the swip entry
 function emailSWIP($swip) {
 
-    require_once("../class.phpmailer.php");
+    require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
     $mail = new PHPMailer();
     $mail->IsSMTP(); // telling the class to use SMTP
-    $mail->SetLanguage("en", "../");
+    $mail->SetLanguage("en");
     $mail->Host = EMAILSERVER; // SMTP server
     $mail->From = REGADMINEMAIL;
     $mail->FromName = "IP Plan";

ipplan-use-qmagic.patch:
 admin/changepassword.php    |    4 -
 admin/deletebounds.php      |    2 
 admin/displayboundsform.php |    2 
 admin/importbase.php        |   14 ++---
 admin/usermanager.php       |   86 +++++++++++++++++------------------
 auth.php                    |    6 +-
 class.dbflib.php            |   92 +++++++++++++++++++-------------------
 class.dnslib.php            |  106 ++++++++++++++++++++++----------------------
 contrib/ipplan-poller.php   |   18 +++----
 user/createarea.php         |    4 -
 user/createrange.php        |    4 -
 user/createsubnet.php       |    2 
 user/displaysubnet.php      |   52 ++++++++++-----------
 user/exportdhcp.php         |    2 
 user/modifybase.php         |    4 -
 user/modifycustomer.php     |   62 ++++++++++++-------------
 user/modifydns.php          |   10 ++--
 user/modifydnsrecord.php    |   52 ++++++++++-----------
 user/modifyipform.php       |    6 +-
 user/modifysubnet.php       |   28 +++++------
 user/modifyzone.php         |    2 
 user/requestip.php          |   16 +++---
 user/searchall.php          |   82 +++++++++++++++++-----------------
 23 files changed, 328 insertions(+), 328 deletions(-)

--- NEW FILE ipplan-use-qmagic.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-07-24 16:35:37.067261296 +0200
+++ ipplan/admin/changepassword.php	2009-07-24 16:52:07.366262054 +0200
@@ -67,8 +67,8 @@
 
       $ds->DbfTransactionStart();
       $result=&$ds->ds->Execute("UPDATE users
-                              SET password=".$ds->ds->qstr($password)."
-                              WHERE userid=".$ds->ds->qstr($userid));
+                              SET password=".$ds->ds->QMagic($password)."
+                              WHERE userid=".$ds->ds->QMagic($userid));
       $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
       if ($result) {
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-07-24 16:35:37.068261756 +0200
+++ ipplan/admin/deletebounds.php	2009-07-24 16:51:07.699261009 +0200
@@ -54,7 +54,7 @@
 
 $ds->DbfTransactionStart();
 $result=&$ds->ds->Execute("DELETE FROM bounds
-                        WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+                        WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
   
 if ($result) {
    $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-07-24 16:35:37.072265328 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-24 16:51:25.950266841 +0200
@@ -51,7 +51,7 @@
 
 $where="";
 if ($grp) {
-   $where="WHERE grp=".$ds->ds->qstr($grp);
+   $where="WHERE grp=".$ds->ds->QMagic($grp);
 }
 
 $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-07-24 16:35:37.085272914 +0200
+++ ipplan/admin/importbase.php	2009-07-24 16:51:47.829261312 +0200
@@ -206,10 +206,10 @@
            insert($w,block("<b>".sprintf(my_("Row is duplicate - updating with [ %s, %s ]"), $ipaddr, $descrip)."</b>"));
 
            $result=&$ds->ds->Execute("UPDATE base
-                   SET descrip=".$ds->ds->qstr($descrip).",
+                   SET descrip=".$ds->ds->QMagic($descrip).",
                    lastmod=".$ds->ds->DBTimeStamp(time()).",
-                   userid=".$ds->ds->qstr(getAuthUsername()).",
-                   admingrp=".$ds->ds->qstr($admingrp)."
+                   userid=".$ds->ds->QMagic(getAuthUsername()).",
+                   admingrp=".$ds->ds->QMagic($admingrp)."
                    WHERE customer=$cust AND
                    baseaddr=$base");
 
@@ -225,12 +225,12 @@
                $result = &$ds->ds->Execute("INSERT INTO baseadd
                        (info, baseindex)
                        VALUES
-                       (".$ds->ds->qstr($info).",
+                       (".$ds->ds->QMagic($info).",
                         $baseindex)");
                // Second, try to update.
                if ( $result == FALSE ) {
                    $result=&$ds->ds->Execute("UPDATE baseadd
-                           SET info=".$ds->ds->qstr($info)."                                 
+                           SET info=".$ds->ds->QMagic($info)."                                 
                            WHERE baseindex=$baseindex");
 
                    if ( $result == FALSE ) {
@@ -267,12 +267,12 @@
                    $result = &$ds->ds->Execute("INSERT INTO baseadd
                            (info, baseindex)
                            VALUES
-                           (".$ds->ds->qstr($info).",
+                           (".$ds->ds->QMagic($info).",
                             $baseindex)");
                    // Second, try to update.
                    if ( $result == FALSE ) {
                        $result=&$ds->ds->Execute("UPDATE baseadd
-                               SET info=".$ds->ds->qstr($info)."                                 
+                               SET info=".$ds->ds->QMagic($info)."                                 
                                WHERE baseindex=$baseindex");
 
                        if ( $result == FALSE ) {
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-24 16:35:37.096261011 +0200
+++ ipplan/admin/usermanager.php	2009-07-24 16:50:49.924261394 +0200
@@ -96,8 +96,8 @@
 if ($usersearch != "") {
     $result=&$ds->ds->Execute("SELECT userid, userdescrip
             FROM users
-            WHERE userid LIKE ".$ds->ds->qstr("%".$usersearch."%")
-            ." OR userdescrip LIKE ".$ds->ds->qstr("%".$usersearch."%"));
+            WHERE userid LIKE ".$ds->ds->QMagic("%".$usersearch."%")
+            ." OR userdescrip LIKE ".$ds->ds->QMagic("%".$usersearch."%"));
 
     $MENU=".|".my_("Search Result")."\n";
     $count=0;
@@ -293,7 +293,7 @@
     list($ipaddr, $userid, $grp, $grpdescrip, $createcust, $grpview) = myRegister("S:ipaddr S:userid S:grp S:grpdescrip S:createcust S:grpview");
     $grp=trim($grp);
     $grpdescrip=trim($grpdescrip);
-    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->qstr($userid));
+    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->QMagic($userid));
     if ($result) {
         $row=$result->FetchRow();
     }
@@ -362,7 +362,7 @@
         // in a table and allow the user to delete them.
 
         insert($con, generic("br"));
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->qstr($userid));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->QMagic($userid));
         $lst=array();
 
         while($row = $result->FetchRow()) {
@@ -399,7 +399,7 @@
 
     list($ipaddr, $size, $grp) = myRegister("S:ipaddr S:size S:grp");
 
-    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->qstr($grp));
+    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->QMagic($grp));
     $row=$result->FetchRow();
     $grpdescrip=$row["grpdescrip"];
     $createcust=$row["createcust"];
@@ -474,7 +474,7 @@
         insert($f2,submit(array("value"=>my_("Add User"))));
         // Edit users assigned to the group.
 
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->qstr($grp));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->QMagic($grp));
 
         $lst=array();
         while($row = $result->FetchRow()) {
@@ -568,7 +568,7 @@
 
     $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
             FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)."
+            WHERE grp=".$ds->ds->QMagic($grp)."
             ORDER BY boundsaddr");
 
     // logic here is:
@@ -706,25 +706,25 @@
         $ds->DbfTransactionStart();
         // emulates mysql REPLACE
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid));
+                WHERE userid=".$ds->ds->QMagic($userid));
         $result=&$ds->ds->Execute("INSERT INTO users
                 (userid, userdescrip, useremail, password)
                 VALUES
-                (".$ds->ds->qstr($userid).",
-                 ".$ds->ds->qstr($userdescrip).",
-                 ".$ds->ds->qstr($useremail).",
-                 ".$ds->ds->qstr($password).")");
+                (".$ds->ds->QMagic($userid).",
+                 ".$ds->ds->QMagic($userdescrip).",
+                 ".$ds->ds->QMagic($useremail).",
+                 ".$ds->ds->QMagic($password).")");
 
         // add group if user selected a group other than "No group"
         if (!empty($grp)) {
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid)." AND
-                    grp=".$ds->ds->qstr($grp));
+                    WHERE userid=".$ds->ds->QMagic($userid)." AND
+                    grp=".$ds->ds->QMagic($grp));
             $result=&$ds->ds->Execute("INSERT INTO usergrp
                     (userid, grp)
                     VALUES
-                    (".$ds->ds->qstr($userid).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($userid).",
+                     ".$ds->ds->QMagic($grp).")");
         }
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -779,9 +779,9 @@
         $result=&$ds->ds->Execute("INSERT INTO grp
                 (grp, createcust, grpdescrip, grpopt, resaddr)
                 VALUES
-                (".$ds->ds->qstr($grp).",
-                 ".$ds->ds->qstr($createcust).",
-                 ".$ds->ds->qstr($grpdescrip).",
+                (".$ds->ds->QMagic($grp).",
+                 ".$ds->ds->QMagic($createcust).",
+                 ".$ds->ds->QMagic($grpdescrip).",
                  ".$grpbit.", $resaddr)");
 
         if ($result) {
@@ -803,8 +803,8 @@
 
     $ds->DbfTransactionStart();
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     if ($result) {
         $ds->DbfTransactionEnd();
         insert($w,text(my_("User deleted from group")));
@@ -835,9 +835,9 @@
     if ($userid) {
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid)) and
+                WHERE userid=".$ds->ds->QMagic($userid)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid));
+                    WHERE userid=".$ds->ds->QMagic($userid));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -853,8 +853,8 @@
         $userid=$usergrp;
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM usergrp
-                WHERE userid=".$ds->ds->qstr($userid)." AND
-                grp=".$ds->ds->qstr($grp));
+                WHERE userid=".$ds->ds->QMagic($userid)." AND
+                grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -874,7 +874,7 @@
         // check if grp has customers
         $result=&$ds->ds->Execute("SELECT custdescrip
                 FROM customer
-                WHERE admingrp=".$ds->ds->qstr($grp));
+                WHERE admingrp=".$ds->ds->QMagic($grp));
         if ($row=$result->FetchRow()) {
             $formerror .=my_("Cannot delete group because the following customers are assigned to the group:");
             do {
@@ -886,7 +886,7 @@
         // check if grp has subnets
         $result=&$ds->ds->Execute("SELECT baseaddr, descrip
                 FROM base
-                WHERE admingrp=".$ds->ds->qstr($grp)."
+                WHERE admingrp=".$ds->ds->QMagic($grp)."
                 ORDER BY baseaddr");
         if ($row=$result->FetchRow()) {
             $formerror .= my_("Cannot delete group because the following subnets are assigned to the group:");
@@ -898,11 +898,11 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM grp
-                WHERE grp=".$ds->ds->qstr($grp)) and
+                WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE grp=".$ds->ds->qstr($grp)) and
+                    WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM bounds
-                    WHERE grp=".$ds->ds->qstr($grp));
+                    WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -934,8 +934,8 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("UPDATE users
-                SET password=".$ds->ds->qstr($password)."
-                WHERE userid=".$ds->ds->qstr($userid));
+                SET password=".$ds->ds->QMagic($password)."
+                WHERE userid=".$ds->ds->QMagic($userid));
         $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
         if ($result) {
@@ -961,13 +961,13 @@
     $ds->DbfTransactionStart();
     // emulate mysql REPLACE
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     $result=&$ds->ds->Execute("INSERT INTO usergrp
             (userid, grp)
             VALUES
-            (".$ds->ds->qstr($userid).",
-             ".$ds->ds->qstr($grp).")");
+            (".$ds->ds->QMagic($userid).",
+             ".$ds->ds->QMagic($grp).")");
 
     if ($result) {
         $ds->DbfTransactionEnd();
@@ -1007,11 +1007,11 @@
         }
 
         $result=&$ds->ds->Execute("UPDATE grp
-                SET grpdescrip=".$ds->ds->qstr($grpdescrip).",
-                createcust=".$ds->ds->qstr($createcust).",
+                SET grpdescrip=".$ds->ds->QMagic($grpdescrip).",
+                createcust=".$ds->ds->QMagic($createcust).",
                 grpopt=".$grpbit.",
                 resaddr=".$resaddr."
-                WHERE grp=".$ds->ds->qstr($grp));
+                WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -1037,7 +1037,7 @@
 
         // creating readonly group?
         if ($base == 0 and $size == 0) {
-            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->qstr($grp))) {
+            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->QMagic($grp))) {
                 $formerror .= my_("Boundary cannot be created - overlaps with existing boundary")."\n";
             }
         }
@@ -1065,7 +1065,7 @@
             $result=&$ds->ds->Execute("INSERT INTO bounds
                     (boundsaddr, boundssize, grp)
                     VALUES
-                    ($base, $size, ".$ds->ds->qstr($grp).")");
+                    ($base, $size, ".$ds->ds->QMagic($grp).")");
 
             if ($result) {
                 $ds->DbfTransactionEnd();
@@ -1090,7 +1090,7 @@
                 ($boundsaddr < boundsaddr AND
                  $boundsaddr+$boundssize >
                  boundsaddr + boundssize - 1)) AND
-            grp=".$ds->ds->qstr($grp));
+            grp=".$ds->ds->QMagic($grp));
     if ($result->FetchRow()) {
         return 1;
     }
@@ -1101,7 +1101,7 @@
     list($grp, $boundsaddr) = myRegister("S:grp S:boundsaddr");
 
     $result=&$ds->ds->Execute("DELETE FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+            WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
 
     if ($result) {
         $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/auth.php ipplan/auth.php
--- ipplan.orig/auth.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/auth.php	2009-07-24 16:49:49.184261940 +0200
@@ -192,14 +192,14 @@
           $passwd=crypt($passwd, 'xq');
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
-                                   users.password=".$ds->qstr($passwd)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
+                                   users.password=".$ds->QMagic($passwd)." AND
                                    users.userid=usergrp.userid");
        }
        else {
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
                                    users.userid=usergrp.userid");
        }
        
diff -ruN ipplan.orig/class.dbflib.php ipplan/class.dbflib.php
--- ipplan.orig/class.dbflib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dbflib.php	2009-07-24 16:49:36.394261175 +0200
@@ -143,14 +143,14 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
         $result = &$this->ds->Execute("UPDATE ipaddr
-                SET userinf=".$this->ds->qstr($user).",
-                location=".$this->ds->qstr($location).",
-                telno=".$this->ds->qstr($telno).",
-                macaddr=".$this->ds->qstr($macaddr).",
-                descrip=".$this->ds->qstr($descrip).",
-                hname=".$this->ds->qstr($hname).",
+                SET userinf=".$this->ds->QMagic($user).",
+                location=".$this->ds->QMagic($location).",
+                telno=".$this->ds->QMagic($telno).",
+                macaddr=".$this->ds->QMagic($macaddr).",
+                descrip=".$this->ds->QMagic($descrip).",
+                hname=".$this->ds->QMagic($hname).",
                 lastmod=".$this->ds->DBTimeStamp(time()).",
-                userid=".$this->ds->qstr($userid)."
+                userid=".$this->ds->QMagic($userid)."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr");
         }
@@ -159,16 +159,16 @@
                     (userinf, location, telno, macaddr, descrip, hname,
                      baseindex, ipaddr, lastmod, userid)
                     VALUES
-                    (".$this->ds->qstr($user).",
-                     ".$this->ds->qstr($location).",
-                     ".$this->ds->qstr($telno).",
-                     ".$this->ds->qstr($macaddr).",
-                     ".$this->ds->qstr($descrip).",
-                     ".$this->ds->qstr($hname).",
+                    (".$this->ds->QMagic($user).",
+                     ".$this->ds->QMagic($location).",
+                     ".$this->ds->QMagic($telno).",
+                     ".$this->ds->QMagic($macaddr).",
+                     ".$this->ds->QMagic($descrip).",
+                     ".$this->ds->QMagic($hname).",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr($userid).")");
+                     ".$this->ds->QMagic($userid).")");
         }
 
         // always try to update record - record could not exist, which
@@ -183,7 +183,7 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
             $result = &$this->ds->Execute("UPDATE ipaddradd
-                    SET info=".$this->ds->qstr($info)."
+                    SET info=".$this->ds->QMagic($info)."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ipaddr");
         // this generates a "duplicate key" error if no update
@@ -195,7 +195,7 @@
                 $result = &$this->ds->Execute("INSERT INTO ipaddradd
                         (info, baseindex, ipaddr)
                         VALUES
-                        (".$this->ds->qstr($info).",
+                        (".$this->ds->QMagic($info).",
                          $baseindex,
                          $ipaddr)");
             }
@@ -208,9 +208,9 @@
         $userid = getAuthUsername();
 
         $result = &$this->ds->Execute("UPDATE ipaddr
-                           SET $field=".$this->ds->qstr($value).",
+                           SET $field=".$this->ds->QMagic($value).",
                               lastmod=".$this->ds->DBTimeStamp(time()).",
-                              userid=".$this->ds->qstr($userid)."
+                              userid=".$this->ds->QMagic($userid)."
                            WHERE baseindex=$baseindex AND ipaddr=$ipaddr");
 
         // record does not exist, error
@@ -331,11 +331,11 @@
                                baseopt, customer, userid, lastmod)
                            VALUES
                               ($baseaddr, $subnetsize,
-                              ".$this->ds->qstr($descrip).",
-                              ".$this->ds->qstr($grp).",
+                              ".$this->ds->QMagic($descrip).",
+                              ".$this->ds->QMagic($grp).",
                                $dhcp,
                                $cust,
-                              ".$this->ds->qstr($userid).",
+                              ".$this->ds->QMagic($userid).",
                               ".$this->ds->DBTimeStamp(time()).")");
 
         if (DBF_TYPE == "mysql" or DBF_TYPE == "maxsql") {
@@ -360,7 +360,7 @@
                             WHERE base.baseindex=$baseindex AND
                                base.customer=customer.customer AND
                                customer.admingrp=usergrp.grp AND
-                               usergrp.userid=".$this->ds->qstr($userid));
+                               usergrp.userid=".$this->ds->QMagic($userid));
 
         if ($row = $result->FetchRow()) {
             return $row["admingrp"];
@@ -376,9 +376,9 @@
         // could use GetRow here
         $result = &$this->ds->Execute("SELECT usergrp.grp
                             FROM usergrp, grp
-                            WHERE usergrp.userid=".$this->ds->qstr($userid)." AND
+                            WHERE usergrp.userid=".$this->ds->QMagic($userid)." AND
                                usergrp.grp=grp.grp AND
-                               grp.createcust=".$this->ds->qstr('Y'));
+                               grp.createcust=".$this->ds->QMagic('Y'));
 
         if ($row = $result->FetchRow()) {
             return $row["grp"];
@@ -425,7 +425,7 @@
 
         $string = " IN (";
         foreach($grps as $value) {
-            $string .= $this->ds->qstr($value).",";
+            $string .= $this->ds->QMagic($value).",";
         }
         return substr($string, 0, -1).")";
     }
@@ -457,7 +457,7 @@
 
         $result = &$this->ds->Execute("SELECT count(*) AS cnt
                          FROM bounds
-                         WHERE grp=".$this->ds->qstr($grp));
+                         WHERE grp=".$this->ds->QMagic($grp));
         $row = $result->FetchRow();
         // no bounds, group can do anything
         if ($row["cnt"] == 0) {
@@ -470,7 +470,7 @@
                                   boundsaddr + boundssize - 1) AND
                                   ($boundsaddr+$boundssize-1 BETWEEN boundsaddr AND 
                                       boundsaddr + boundssize - 1)) AND
-                                  grp=".$this->ds->qstr($grp));
+                                  grp=".$this->ds->QMagic($grp));
 
         if ($result->FetchRow()) {
             return 1;
@@ -719,16 +719,16 @@
                     (userinf, location, telno, descrip, hname,
                      baseindex, ipaddr, lastmod, lastpol, userid)
                     VALUES
-                    (".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("Unknown - added by IPplan poller").",
-                     ".$this->ds->qstr("").",
+                    (".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("Unknown - added by IPplan poller").",
+                     ".$this->ds->QMagic("").",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr("POLLER").")");
+                     ".$this->ds->QMagic("POLLER").")");
         }
 
     }
@@ -942,8 +942,8 @@
                 $this->ds->Execute("INSERT INTO auditlog
                         (action, userid, dt)
                         VALUES
-                        (".$this->ds->qstr(substr($message,0,254)).",
-                         ".$this->ds->qstr(getAuthUsername()).",
+                        (".$this->ds->QMagic(substr($message,0,254)).",
+                         ".$this->ds->QMagic(getAuthUsername()).",
                          ".$this->ds->DBTimeStamp(time()).")");
             }
             else if (is_array($message)) {
@@ -960,8 +960,8 @@
                     $this->ds->Execute("INSERT INTO auditlog
                             (action, userid, dt)
                             VALUES
-                            (".$this->ds->qstr(substr($value,0,254)).",
-                             ".$this->ds->qstr(getAuthUsername()).",
+                            (".$this->ds->QMagic(substr($value,0,254)).",
+                             ".$this->ds->QMagic(getAuthUsername()).",
                              ".$this->ds->DBTimeStamp(time()).")");
                 }
 
@@ -983,10 +983,10 @@
         if (!empty($search)) {
             switch ($expr) {
                 case "NLIKE":
-                    $sql="$var NOT LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var NOT LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "EXACT":
-                    $sql="$var = ".$this->ds->qstr("$search");
+                    $sql="$var = ".$this->ds->QMagic("$search");
                     break;
                 case "RLIKE":
                 // default is RLIKE, need to protect for DBF's without RLIKE
@@ -994,11 +994,11 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var ~ ".$this->ds->qstr("$search");
+                        $sql="$var ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "NRLIKE":
@@ -1006,22 +1006,22 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var NOT RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var NOT RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var NOT ~ ".$this->ds->qstr("$search");
+                        $sql="$var NOT ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "LIKE":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "END":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search");
                     break;
                 // default is START search
                 default:
-                    $sql="$var LIKE ".$this->ds->qstr("$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("$search%");
             }
             // should there be an AND?
             if ($addand) {
diff -ruN ipplan.orig/class.dnslib.php ipplan/class.dnslib.php
--- ipplan.orig/class.dnslib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dnslib.php	2009-07-24 16:49:13.294270409 +0200
@@ -262,10 +262,10 @@
                      recordtype, userid, ip_hostname) ".
                     "VALUES ($this->cust, $dataid, ". $i.",".
                     $this->ds->DBTimeStamp(time()).",".
-                    $this->ds->qstr($host).",".
-                    $this->ds->qstr($recordtype).",".
-                    $this->ds->qstr(getAuthUsername()).",".
-                    $this->ds->qstr($iphostname).")" );
+                    $this->ds->QMagic($host).",".
+                    $this->ds->QMagic($recordtype).",".
+                    $this->ds->QMagic(getAuthUsername()).",".
+                    $this->ds->QMagic($iphostname).")" );
             if (!$result) {
                 return FALSE;
             }
@@ -288,7 +288,7 @@
                         (id, hname, horder)
                         VALUES
                         ($dataid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
                 if (!$result) {
                     return FALSE;
@@ -340,23 +340,23 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
                 ", serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",createmod=".$this->ds->DBDate($this->createmod).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
                 ",expiremod=".$this->ds->DBDate($this->expiremod).
                 ",regmod=".$this->ds->DBDate($this->regmod).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND data_id=".$dataid );
 
         if($this->ds->GetRow("SELECT info
@@ -364,7 +364,7 @@
                 WHERE customer=$cust AND
                 data_id=$dataid")) {   // should have FOR UPDATE here!
             $result = $this->ds->Execute("UPDATE fwdzoneadd ".
-                "set info=".$this->ds->qstr($this->info).
+                "set info=".$this->ds->QMagic($this->info).
                 " WHERE customer=$cust AND data_id=".$dataid );
         } 
         else {  // no record, insert
@@ -372,7 +372,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
         }
@@ -398,23 +398,23 @@
             createmod, lastmod, expiremod, regmod, serialdate, serialnum, ttl, refresh, retry, 
             expire, minimum, responsiblemail, userid, zonefilepath1, zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust,".
-                $this->ds->qstr($this->domain).",".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->domain).",".
+                $this->ds->QMagic("E").",".
                 $this->ds->DBDate($this->createmod).",".
                 $this->ds->DBTimeStamp(time()).",".
                 $this->ds->DBDate($this->expiremod).",".
                 $this->ds->DBDate($this->regmod).",".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -427,7 +427,7 @@
                 $result=$this->ds->Execute("SELECT data_id 
                         FROM fwdzone
                         WHERE customer=$this->cust AND 
-                        domain=".$this->ds->qstr($this->domain));
+                        domain=".$this->ds->QMagic($this->domain));
                 $temprow = $result->FetchRow();
                 $dataid=$temprow["data_id"];
             }
@@ -436,7 +436,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
             return $dataid;
@@ -465,7 +465,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT domain FROM fwdzone 
-                WHERE customer=$cust AND domain = ".$this->ds->qstr($this->domain));
+                WHERE customer=$cust AND domain = ".$this->ds->QMagic($this->domain));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -499,11 +499,11 @@
                         (data_id, host, recordtype, ip_hostname, sortorder, customer, userid, lastmod)
                         SELECT $dataid AS data_id, fwdzonerec.host, fwdzonerec.recordtype, 
                             fwdzonerec.ip_hostname, fwdzonerec.sortorder, fwdzonerec.customer, 
-                            ".$this->ds->qstr(getAuthUsername())." AS userid,
+                            ".$this->ds->QMagic(getAuthUsername())." AS userid,
                             ".$this->ds->DBTimeStamp(time())." AS lastmod
                         FROM fwdzonerec, fwdzone
                         WHERE fwdzonerec.data_id=fwdzone.data_id AND 
-                            fwdzone.domain=".$this->ds->qstr("template.com"));
+                            fwdzone.domain=".$this->ds->QMagic("template.com"));
 
                 }
                 $this->err = 0;
@@ -526,9 +526,9 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
-                ", error_message=".$this->ds->qstr("").
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
+                ", error_message=".$this->ds->QMagic("").
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
                 ", serialnum=$this->serialnum".
                 " WHERE customer=$cust AND data_id=".$dataid);
@@ -798,7 +798,7 @@
                         (id, hname, horder)
                         VALUES
                         ($zoneid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
 
                 if (!$result) {
@@ -854,22 +854,22 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE zones SET zoneip=$zoneip".
-                ",zone=".$this->ds->qstr($this->zone).
+                ",zone=".$this->ds->QMagic($this->zone).
                 ",zonesize=$size".
-                ",serialdate=".$this->ds->qstr($this->serialdate).
+                ",serialdate=".$this->ds->QMagic($this->serialdate).
                 ",serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND id=".$zoneid );
 
         // delete all the DNS records first to preserve correct order
@@ -896,20 +896,20 @@
                  lastmod, responsiblemail, userid, zonefilepath1, 
                  zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust, $this->zoneip,".
-                $this->ds->qstr($this->zone).", $this->size,".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->zone).", $this->size,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic("E").",".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
                 $this->ds->DBTimeStamp(time()).",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -953,7 +953,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT zone FROM zones
-                WHERE customer=$cust AND zone = ".$this->ds->qstr($this->zone));
+                WHERE customer=$cust AND zone = ".$this->ds->QMagic($this->zone));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -999,10 +999,10 @@
         $this->Serial();
 
         $result = $this->ds->Execute("UPDATE zones ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
-                ", error_message=".$this->ds->qstr("").
+                ", error_message=".$this->ds->QMagic("").
                 ", serialnum=$this->serialnum ".
                 " WHERE customer=$cust AND id=$zoneid");
 
@@ -1155,8 +1155,8 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-        "set serialdate=".$this->ds->qstr($this->serialdate).
-        ", userid=".$this->ds->qstr(getAuthUsername()).
+        "set serialdate=".$this->ds->QMagic($this->serialdate).
+        ", userid=".$this->ds->QMagic(getAuthUsername()).
         ", serialnum=$this->serialnum".
         " WHERE customer=$cust AND data_id=".$zoneid);
 
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-07-24 16:35:37.098269923 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-24 16:48:58.061261570 +0200
@@ -242,7 +242,7 @@
 
                 if ($hostnames) {
                     $result = $ds->Execute("UPDATE ipaddr
-                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->qstr($hname)."
+                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->QMagic($hname)."
                             WHERE baseindex=$baseindex AND
                             ipaddr=$ipaddr");
                 }
@@ -258,23 +258,23 @@
                             (userinf, location, telno, descrip, hname,
                              baseindex, ipaddr, lastmod, lastpol, userid)
                             VALUES
-                            (".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("Unknown - added by IPplan command line poller").",
-                             ".$ds->qstr($hname).",
+                            (".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("Unknown - added by IPplan command line poller").",
+                             ".$ds->QMagic($hname).",
                              $baseindex, 
                              $ipaddr,
                              ".$ds->DBTimeStamp(time()).",
                              ".$ds->DBTimeStamp(time()).",
-                             ".$ds->qstr("POLLER").")");
+                             ".$ds->QMagic("POLLER").")");
 
                     if ($audit) {
                         $ds->Execute("INSERT INTO auditlog
                                 (action, userid, dt)
                                 VALUES
-                                (".$ds->qstr(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
-                                 ".$ds->qstr("POLLER").",
+                                (".$ds->QMagic(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
+                                 ".$ds->QMagic("POLLER").",
                                  ".$ds->DBTimeStamp(time()).")");
                     }
                 }
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-07-24 16:35:37.104261224 +0200
+++ ipplan/user/createarea.php	2009-07-24 16:45:44.647275743 +0200
@@ -84,7 +84,7 @@
       $ds->DbfTransactionStart();
       if ($action=="modify") {
           $result=&$ds->ds->Execute("UPDATE area SET areaaddr=$base, 
-                  descrip=".$ds->ds->qstr($descrip)." WHERE areaindex=$areaindex") and
+                  descrip=".$ds->ds->QMagic($descrip)." WHERE areaindex=$areaindex") and
           $ds->AuditLog(array("event"=>151, "action"=>"modify area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
@@ -93,7 +93,7 @@
           $result=&$ds->ds->Execute("INSERT INTO area
                   (areaaddr, descrip, customer)
                   VALUES
-                  ($base, ".$ds->ds->qstr($descrip).", $cust)") and
+                  ($base, ".$ds->ds->QMagic($descrip).", $cust)") and
           $ds->AuditLog(array("event"=>150, "action"=>"create area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-07-24 16:35:37.106272084 +0200
+++ ipplan/user/createrange.php	2009-07-24 16:45:10.911264478 +0200
@@ -166,7 +166,7 @@
         if ($action=="modify") {
 
             $result=&$ds->ds->Execute("UPDATE netrange SET areaindex=$areaindex, 
-                    descrip=".$ds->ds->qstr($descrip).",
+                    descrip=".$ds->ds->QMagic($descrip).",
                     rangeaddr=$base, rangesize=$size
                     WHERE rangeindex=$rangeindex") and
                 $ds->AuditLog(array("event"=>161, "action"=>"modify range", 
@@ -179,7 +179,7 @@
                      customer)
                     VALUES
                     ($base, $size, $areaindex,
-                     ".$ds->ds->qstr($descrip).",
+                     ".$ds->ds->QMagic($descrip).",
                      $cust)") and
                     $ds->AuditLog(array("event"=>160, "action"=>"create range", 
                                 "descrip"=>$descrip, "user"=>getAuthUsername(), "areaindex"=>$areaindex,
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-07-24 16:35:37.111261269 +0200
+++ ipplan/user/createsubnet.php	2009-07-24 16:47:00.295261634 +0200
@@ -219,7 +219,7 @@
                 $result = &$ds->ds->Execute("INSERT INTO baseadd
                         (info, baseindex)
                         VALUES
-                        (".$ds->ds->qstr($info).", $id)");
+                        (".$ds->ds->QMagic($info).", $id)");
             }
 
             $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-07-24 16:35:37.134260756 +0200
+++ ipplan/user/displaysubnet.php	2009-07-24 16:45:26.829261752 +0200
@@ -221,7 +221,7 @@
                                     WHERE base.customer=$cust AND
                                     base.baseindex=ipaddr.baseindex AND
                                     ipaddr.ipaddr!=$ip AND
-                                    ipaddr.macaddr=".$ds->ds->qstr($macaddr))) {
+                                    ipaddr.macaddr=".$ds->ds->QMagic($macaddr))) {
                             $formerror .= sprintf(my_("Duplicate MAC address: %s"), $oldmacaddr)."\n";
                             insert($w,anchor("searchall.php?cust=".$cust."&field=macaddr&search=".$macaddr,
                                 my_("Show duplicate MAC addresses")));
@@ -302,7 +302,7 @@
                                     WHERE requestindex=$request");
                             $gw=$ds->ds->GetOne("SELECT ipaddr FROM ipaddr
                                     WHERE baseindex=$baseindex AND 
-                                       descrip LIKE ".$ds->ds->qstr("GW%"));
+                                       descrip LIKE ".$ds->ds->QMagic("GW%"));
 
                             $body="?Subject=IP address request actioned&body=";
                             $body2="The request details submitted: $requestdesc\n\n";
@@ -925,15 +925,15 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot delete
         if($recs == 1) {
             $row=$result->FetchRow();
@@ -944,7 +944,7 @@
 
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$recidx") and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dom_id) and
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
                             "user"=>getAuthUsername(), "id"=>$recidx));
@@ -979,13 +979,13 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot update
         if($recs == 1) {
             // does domain name of record match ip records hostname?
@@ -1005,13 +1005,13 @@
             }
 
             insert($w,textbr(my_("IP hostname field in DNS forward zone modified")));
-            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->qstr($hnametmp).",
+            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->QMagic($hnametmp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
-                    userid=".$ds->ds->qstr(getAuthUsername())."
+                    userid=".$ds->ds->QMagic(getAuthUsername())."
                     WHERE customer=$cust AND
-                    recordtype=".$ds->ds->qstr("A")." AND 
-                    ip_hostname=".$ds->ds->qstr(inet_ntoa($ip))) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                    recordtype=".$ds->ds->QMagic("A")." AND 
+                    ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip))) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
@@ -1042,12 +1042,12 @@
             $result = &$ds->ds->Execute("SELECT length(domain) AS domainlen, data_id, domain
                     FROM fwdzone
                     WHERE customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain
+                    ".$ds->ds->QMagic($hname."$")." $regex domain
                     ORDER BY domainlen DESC");
 
             $recs=$result->PO_RecordCount("fwdzone", 
                     "customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain");
+                    ".$ds->ds->QMagic($hname."$")." $regex domain");
 
             // must be exactly one matching zone only, or more than one zone
             // sorted DESC. If second case, use first record for longest match
@@ -1063,12 +1063,12 @@
                          recordtype, error_message, userid, ip_hostname) ".
                         "VALUES ($cust, $dataid, 9999,".
                         $ds->ds->DBTimeStamp(time()).",".
-                        $ds->ds->qstr($hnametmp).",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr(getAuthUsername()).",".
-                        $ds->ds->qstr(inet_ntoa($ip)).")" ) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                        $ds->ds->QMagic($hnametmp).",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic(getAuthUsername()).",".
+                        $ds->ds->QMagic(inet_ntoa($ip)).")" ) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-07-24 16:35:37.142261270 +0200
+++ ipplan/user/exportdhcp.php	2009-07-24 16:47:14.257261620 +0200
@@ -150,7 +150,7 @@
     $result_ip=&$ds->ds->Execute("SELECT ipaddr, macaddr, hname
             FROM ipaddr
             WHERE baseindex=$baseindex AND
-            userinf LIKE ".$ds->ds->qstr("%".DHCPRESERVED."%")."
+            userinf LIKE ".$ds->ds->QMagic("%".DHCPRESERVED."%")."
             ORDER BY ipaddr");
 
     $iprange_dynamicIPs=array();
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-07-24 16:35:37.157277068 +0200
+++ ipplan/user/modifybase.php	2009-07-24 16:48:36.765261577 +0200
@@ -224,7 +224,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size*2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
 
         $ds->AuditLog(array("event"=>173, "action"=>"join subnet", 
@@ -240,7 +240,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size/2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
         // ... and create new subnet
         $timetmp=time();
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-07-24 16:35:37.160261295 +0200
+++ ipplan/user/modifycustomer.php	2009-07-24 16:48:21.805261227 +0200
@@ -126,9 +126,9 @@
             $result=&$ds->ds->Execute("INSERT INTO customer
                     (custdescrip, crm, admingrp)
                     VALUES
-                    (".$ds->ds->qstr($custdescrip).",
-                     ".$ds->ds->qstr($crm).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($custdescrip).",
+                     ".$ds->ds->QMagic($crm).",
+                     ".$ds->ds->QMagic($grp).")");
 
             // did not fail due to key error?
             if ($result) {
@@ -139,7 +139,7 @@
                     // emulate getting the last insert_id
                     $result=&$ds->ds->Execute("SELECT customer 
                             FROM customer
-                            WHERE custdescrip=".$ds->ds->qstr($custdescrip));
+                            WHERE custdescrip=".$ds->ds->QMagic($custdescrip));
                     $temprow = $result->FetchRow();
                     $cust=$temprow["customer"];
                 }
@@ -160,9 +160,9 @@
             }
 
             $result=&$ds->ds->Execute("UPDATE customer
-                    SET custdescrip=".$ds->ds->qstr($custdescrip).",
-                    crm=".$ds->ds->qstr($crm).",
-                    admingrp=".$ds->ds->qstr($grp)."
+                    SET custdescrip=".$ds->ds->QMagic($custdescrip).",
+                    crm=".$ds->ds->QMagic($crm).",
+                    admingrp=".$ds->ds->QMagic($grp)."
                     WHERE customer=$cust");
 
             // did not fail due to key error?
@@ -176,7 +176,7 @@
         // test for CRM duplicates - this is not a unique key and cannot be 
         if (!empty($crm)) {
             $recs=$ds->ds->GetOne("SELECT count(*) AS cnt FROM customer 
-                    WHERE crm=".$ds->ds->qstr($crm));
+                    WHERE crm=".$ds->ds->QMagic($crm));
             if ($recs > 1) {  //duplicate ?
                 insert($w,text(my_("The CRM field has already been used for another customer"), array("color"=>"#FF0000")));
                 insert($w,textbr());
@@ -200,25 +200,25 @@
                      phne, mbox)
                     VALUES
                     ($cust,
-                     ".$ds->ds->qstr("").",
-                     ".$ds->ds->qstr($org).",
-                     ".$ds->ds->qstr($street).",
-                     ".$ds->ds->qstr($city).",
-                     ".$ds->ds->qstr($state).",
-                     ".$ds->ds->qstr($zipcode).",
-                     ".$ds->ds->qstr($cntry).",
-                     ".$ds->ds->qstr($nichandl).",
-                     ".$ds->ds->qstr($lname).",
-                     ".$ds->ds->qstr($fname).",
-                     ".$ds->ds->qstr($mname).",
-                     ".$ds->ds->qstr($torg).",
-                     ".$ds->ds->qstr($tstreet).",
-                     ".$ds->ds->qstr($tcity).",
-                     ".$ds->ds->qstr($tstate).",
-                     ".$ds->ds->qstr($tzipcode).",
-                     ".$ds->ds->qstr($tcntry).",
-                     ".$ds->ds->qstr($phne).",
-                     ".$ds->ds->qstr($mbox).")");
+                     ".$ds->ds->QMagic("").",
+                     ".$ds->ds->QMagic($org).",
+                     ".$ds->ds->QMagic($street).",
+                     ".$ds->ds->QMagic($city).",
+                     ".$ds->ds->QMagic($state).",
+                     ".$ds->ds->QMagic($zipcode).",
+                     ".$ds->ds->QMagic($cntry).",
+                     ".$ds->ds->QMagic($nichandl).",
+                     ".$ds->ds->QMagic($lname).",
+                     ".$ds->ds->QMagic($fname).",
+                     ".$ds->ds->QMagic($mname).",
+                     ".$ds->ds->QMagic($torg).",
+                     ".$ds->ds->QMagic($tstreet).",
+                     ".$ds->ds->QMagic($tcity).",
+                     ".$ds->ds->QMagic($tstate).",
+                     ".$ds->ds->QMagic($tzipcode).",
+                     ".$ds->ds->QMagic($tcntry).",
+                     ".$ds->ds->QMagic($phne).",
+                     ".$ds->ds->QMagic($mbox).")");
 
             // delete all the DNS records first to preserve correct order
             $result=&$ds->ds->Execute("DELETE FROM revdns
@@ -235,8 +235,8 @@
                             (customer, hname, ipaddr, horder)
                             VALUES
                             ($cust,
-                             ".$ds->ds->qstr($hnametemp).",
-                             ".$ds->ds->qstr($ipaddrtemp).",
+                             ".$ds->ds->QMagic($hnametemp).",
+                             ".$ds->ds->QMagic($ipaddrtemp).",
                              $i)");
                 }
             }
@@ -245,7 +245,7 @@
                         FROM custadd
                         WHERE customer=$cust")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE custadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE customer=$cust");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -256,7 +256,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO custadd
                             (info, customer)
                             VALUES
-                            (".$ds->ds->qstr($info).", $cust)");
+                            (".$ds->ds->QMagic($info).", $cust)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-07-24 16:35:37.165261158 +0200
+++ ipplan/user/modifydns.php	2009-07-24 16:47:32.669263630 +0200
@@ -245,10 +245,10 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $ds->dataid, 9999,".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".               // myhost or myhost.mydomain.com.
-            $ds->ds->qstr($recordtype).",".         // A, MX, NS
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" );       // ip address for A, or 10 myhost for MX
+            $ds->ds->QMagic($host).",".               // myhost or myhost.mydomain.com.
+            $ds->ds->QMagic($recordtype).",".         // A, MX, NS
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" );       // ip address for A, or 10 myhost for MX
             */
 
             $ds->AuditLog(array("event"=>111, "action"=>"add forward zone", "cust"=>$cust,
@@ -316,7 +316,7 @@
     if ($dataid==0) {
         $dataid = &$ds->ds->GetCol("SELECT data_id
                 FROM fwdzone 
-                WHERE customer=$cust AND error_message=".$ds->ds->qstr("E")."
+                WHERE customer=$cust AND error_message=".$ds->ds->QMagic("E")."
                 ORDER BY domain ");
     }
     
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-07-24 16:35:37.170261039 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-24 16:46:37.127261298 +0200
@@ -81,7 +81,7 @@
 if ($action=="delete") {
     if (!$dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain))) {
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain))) {
         myError($w,$p, my_("Could not find the zone - possibly deleted by another user"));
     }
 
@@ -110,7 +110,7 @@
                     $baseindex=$row1["baseindex"];
 
                     $ds->ds->Execute("UPDATE ipaddr
-                            SET hname=".$ds->ds->qstr($row["host"])."
+                            SET hname=".$ds->ds->QMagic($row["host"])."
                             WHERE baseindex=$baseindex AND ipaddr=".inet_aton($row["ip_hostname"]));
                     insert($w,textbr(sprintf(my_("IP record %s updated in subnet '%s' due to deletion of auto created A record"), $row["ip_hostname"], $row1["descrip"])));
                 }
@@ -118,7 +118,7 @@
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$value") and
             $ds->ds->Execute("UPDATE fwdzone 
-                    SET error_message=".$ds->ds->qstr("E").",
+                    SET error_message=".$ds->ds->QMagic("E").",
                     lastmod=".$ds->ds->DBTimeStamp(time()).
                     " WHERE customer=$cust AND data_id=".$dom_id) and 
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
@@ -161,7 +161,7 @@
     $result = &$ds->ds->Execute("SELECT fwdzonerec.recidx, fwdzonerec.sortorder 
             FROM fwdzone, fwdzonerec
             WHERE fwdzone.customer=$cust AND 
-            fwdzone.domain=".$ds->ds->qstr($domain)." AND
+            fwdzone.domain=".$ds->ds->QMagic($domain)." AND
             fwdzone.data_id=fwdzonerec.data_id
             ORDER by fwdzonerec.sortorder");
 
@@ -297,14 +297,14 @@
     $result = &$ds->ds->Execute("SELECT customer 
                                 FROM fwdzonerec 
                                 WHERE customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
 
     $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
     if($recs > 0) {
         myError($w,$p, my_("Cannot create duplicate records"));
     }
@@ -317,12 +317,12 @@
         $result = &$ds->ds->Execute("SELECT ip_hostname 
                 FROM fwdzonerec 
                 WHERE customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
 
         $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
         if($recs == 1) {
             $updateiprec=1;
         }
@@ -361,12 +361,12 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $zoneid, ". $sortorder.",".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".
-            $ds->ds->qstr($recordtype).",".
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" ) and
+            $ds->ds->QMagic($host).",".
+            $ds->ds->QMagic($recordtype).",".
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
@@ -392,7 +392,7 @@
     }
     $dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain));
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain));
 
     // Updated DB here.
     // Log the Transaction.
@@ -411,14 +411,14 @@
     }
 
     $result = &$ds->ds->Execute("UPDATE fwdzonerec SET sortorder=".$sortorder.
-            ", host=".$ds->ds->qstr($host).
+            ", host=".$ds->ds->QMagic($host).
             ", lastmod=".$ds->ds->DBTimeStamp(time()).
-            ", recordtype=".$ds->ds->qstr($recordtype).
-            ", userid=".$ds->ds->qstr(getAuthUsername()).
-            ", ip_hostname=".$ds->ds->qstr($iphostname).
+            ", recordtype=".$ds->ds->QMagic($recordtype).
+            ", userid=".$ds->ds->QMagic(getAuthUsername()).
+            ", ip_hostname=".$ds->ds->QMagic($iphostname).
             " WHERE customer=$cust AND recidx=".$dataid ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
@@ -458,7 +458,7 @@
 
 $result = &$ds->ds->Execute("SELECT domain, data_id FROM fwdzone 
                             WHERE customer=$cust AND 
-                            slaveonly=".$ds->ds->qstr("N")."
+                            slaveonly=".$ds->ds->QMagic("N")."
                             ORDER BY domain");
 if (!$result) {
    myError($w,$p, my_("No domains found. Create some domains and try again."));
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-07-24 16:35:37.175260999 +0200
+++ ipplan/user/modifyipform.php	2009-07-24 16:47:47.499261554 +0200
@@ -192,7 +192,7 @@
 
             // add serialized info from file upload
             $ds->ds->Execute("UPDATE ipaddradd
-                    SET infobin=".$ds->ds->qstr(serialize($files))."
+                    SET infobin=".$ds->ds->QMagic(serialize($files))."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ip");
             // this generates a "duplicate key" error if no update
@@ -202,7 +202,7 @@
                 $ds->ds->Execute("INSERT INTO ipaddradd
                         (infobin, baseindex, ipaddr)
                         VALUES
-                        (".$ds->ds->qstr(serialize($files)).",
+                        (".$ds->ds->QMagic(serialize($files)).",
                          $baseindex,
                          $ip)");
             }
@@ -235,7 +235,7 @@
 
         // add serialized info after file deteled
         $ds->ds->Execute("UPDATE ipaddradd
-                SET infobin=".$ds->ds->qstr(empty($files) ? "" : serialize($files))."
+                SET infobin=".$ds->ds->QMagic(empty($files) ? "" : serialize($files))."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ip") and
             $ds->AuditLog(array("event"=>141, "action"=>"delete file", 
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-07-24 16:35:37.177261840 +0200
+++ ipplan/user/modifysubnet.php	2009-07-24 16:44:56.606265283 +0200
@@ -129,11 +129,11 @@
                 // between base and baseadd is baseindex column
                 if ($duplicatesubnet==0) {
                     $result=&$ds->ds->Execute("UPDATE base
-                            SET descrip=".$ds->ds->qstr($descrip).",
-                            admingrp=".$ds->ds->qstr($grp).",
+                            SET descrip=".$ds->ds->QMagic($descrip).",
+                            admingrp=".$ds->ds->QMagic($grp).",
                             customer=$cust,
                             lastmod=".$ds->ds->DBTimeStamp(time()).",
-                            userid=".$ds->ds->qstr($userid)."
+                            userid=".$ds->ds->QMagic($userid)."
                             WHERE baseindex=$baseindex");
                     
                     $ds->AuditLog(array("event"=>174, "action"=>"move subnet", 
@@ -163,13 +163,13 @@
                                         (ipaddr, userinf, location, telno,
                                          descrip, lastmod, userid, baseindex)
                                         VALUES
-                                        (".$ds->ds->qstr($tempipaddr).",
-                                         ".$ds->ds->qstr($tempuser).",
-                                         ".$ds->ds->qstr($templocation).",
-                                         ".$ds->ds->qstr($temptelno).",
-                                         ".$ds->ds->qstr($tempdescrip).",
+                                        (".$ds->ds->QMagic($tempipaddr).",
+                                         ".$ds->ds->QMagic($tempuser).",
+                                         ".$ds->ds->QMagic($templocation).",
+                                         ".$ds->ds->QMagic($temptelno).",
+                                         ".$ds->ds->QMagic($tempdescrip).",
                                          $templastmod,
-                                         ".$ds->ds->qstr($tempuserid).",
+                                         ".$ds->ds->QMagic($tempuserid).",
                                          $id)");
                             } // end while
                         }
@@ -206,11 +206,11 @@
 
             $ds->DbfTransactionStart();
             $result=&$ds->ds->Execute("UPDATE base
-                    SET descrip=".$ds->ds->qstr($descrip).",
-                    admingrp=".$ds->ds->qstr($grp).",
+                    SET descrip=".$ds->ds->QMagic($descrip).",
+                    admingrp=".$ds->ds->QMagic($grp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
                     baseopt=$dhcp,
-                    userid=".$ds->ds->qstr($userid)."
+                    userid=".$ds->ds->QMagic($userid)."
                     WHERE baseindex=$baseindex") and
                 $ds->AuditLog(array("event"=>171, "action"=>"modify subnet", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "baseaddr"=>inet_ntoa($base),
@@ -242,7 +242,7 @@
                         FROM baseadd
                         WHERE baseindex=$baseindex")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE baseadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE baseindex=$baseindex");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -253,7 +253,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO baseadd
                             (info, baseindex)
                             VALUES
-                            (".$ds->ds->qstr($info).", $baseindex)");
+                            (".$ds->ds->QMagic($info).", $baseindex)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-07-24 16:35:37.182261244 +0200
+++ ipplan/user/modifyzone.php	2009-07-24 16:46:00.574261375 +0200
@@ -276,7 +276,7 @@
                 WHERE zones.customer=base.customer AND 
                 base.baseindex=ipaddr.baseindex AND 
                 zones.customer=$cust AND
-                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->qstr("E").") AND
+                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->QMagic("E").") AND
                 ipaddr.ipaddr >= zones.zoneip AND 
                 ipaddr.ipaddr < zones.zoneip+zones.zonesize");
     }
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-07-24 16:35:37.186261178 +0200
+++ ipplan/user/requestip.php	2009-07-24 16:46:16.008271108 +0200
@@ -120,14 +120,14 @@
                  hname, telno, macaddr, info)
                 VALUES
                 ($cust,
-                 ".$ds->ds->qstr($request).",
-                 ".$ds->ds->qstr($user).",
-                 ".$ds->ds->qstr($location).",
-                 ".$ds->ds->qstr($descrip).",
-                 ".$ds->ds->qstr($hname).",
-                 ".$ds->ds->qstr($telno).",
-                 ".$ds->ds->qstr($newmacaddr).",
-                 ".$ds->ds->qstr($info).")") and
+                 ".$ds->ds->QMagic($request).",
+                 ".$ds->ds->QMagic($user).",
+                 ".$ds->ds->QMagic($location).",
+                 ".$ds->ds->QMagic($descrip).",
+                 ".$ds->ds->QMagic($hname).",
+                 ".$ds->ds->QMagic($telno).",
+                 ".$ds->ds->QMagic($newmacaddr).",
+                 ".$ds->ds->QMagic($info).")") and
                 $ds->AuditLog(array("event"=>200, "action"=>"request ip", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "userinf"=>$user,
                             "location"=>$location, "hname"=>$hname, "telno"=>$telno, 
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-07-24 16:35:37.191261348 +0200
+++ ipplan/user/searchall.php	2009-07-24 16:48:04.835262321 +0200
@@ -94,35 +94,35 @@
       myError($w,$p, my_("Regular expression repetition-operator operand invalid"));
    }
 /*   if ($field == "any") {
-      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search).")";
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search);
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info RLIKE ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else if (DBF_TYPE=="postgres7") {
@@ -131,65 +131,65 @@
    }
    /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname ~ ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info ~ ".$ds->ds->qstr($search).")";
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location ~ ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno ~ ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip ~ ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname ~ ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr($search);
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info ~ ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else {
     /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%").")";
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%").")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "location")
-      $where="WHERE ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "template") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%");
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%");
    }
 }
 


--- NEW FILE ipplan.spec ---
Name:		ipplan
Version:	4.92
Release:	3%{?dist}
Summary:	Web-based IP address manager and tracker
Group:		Applications/Internet
License:	GPLv2+
URL:		http://iptrack.sourceforge.net/
Source0:	http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}.tar.gz
Source1:	%{name}-mysql.sql
Source2:	%{name}-pgsql.sql
Source3:	README.%{name}
# Fedora specific patches to use libraries shipped with fedora
Patch1:		ipplan-set-menus-path.patch
Patch2:		ipplan-set-adodb-path.patch
Patch3:		ipplan-use-qmagic.patch
Patch4:		ipplan-set-phpmailer-path.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php, httpd
Requires:	php-gettext, php-snmp
Requires:	php-layers-menu, php-adodb, php-PHPMailer

%description
IPplan is an administrative tool for ISPs and network service companies.
It goes beyond IP address management to provide DNS administration,
configuration file management, circuit management and storing of hardware
information, all customizable via templates. IPplan can handle a single
network or cater for multiple networks and customers with overlapping address
space. Making managing IP addresses and address spaces simple and easy.
It is written in PHP and requires a MySQL or PostgresSQL database.

%prep
%setup -q -n %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

find . -name README.html -delete
find . -type f -print0 | xargs -0 sed -i 's/\r//'
sed -i -e "s/\(\.*\"UPLOADDIRECTORY\"[^'\"]*['\"]\)[^'\"]*\(['\"].*\)/\1\/var\/cache\/ipplan\2/" config.php
sed -i 's|/tmp/|%{_tmppath}/%{name}/|' config.php
find . -type f -exec chmod a-x {} \;
#remove bundled phplayersmenu
rm -rf menus/
sed -i 's:/usr/local:/usr:' contrib/*.{pl,php}
mkdir sql
cp -p %SOURCE1 %SOURCE2 sql
cp %SOURCE3 %{name}-README.fedora
#remove bundled adodb
rm -rf adodb/
#remove bundled phpMailer
rm -f class.smtp.php class.phpmailer.php phpmailer.lang-en.php
cat <<EOF >%{name}.conf
# %{name}
# %{summary}
# %{version}a
#
Alias /%{name} %{_datadir}/%{name}
Alias /menus %{_datadir}/php/php-layers-menu

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	AllowOverride Limit Options FileInfo
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

<DirectoryMatch "^%{_datadir}/%{name}/(.*/)?(adodb|templates)/(.*)?">
	Order Deny,Allow
	Deny from all
</DirectoryMatch>
EOF

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/images
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/user
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -p -d $RPM_BUILD_ROOT%{_localstatedir}/cache/%{name}
cp -pr admin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
cp -pr images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
cp -pr layout/* $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
cp -pr templates/* $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
cp -pr themes/* $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
cp -pr user/* $RPM_BUILD_ROOT%{_datadir}/%{name}/user
cp -pr locale/* $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -D -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
install -p -D -m0644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -D -m0644 *.html $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.js $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.css $RPM_BUILD_ROOT%{_datadir}/%{name}/
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -fs ../../..%{_sysconfdir}/%{name}/config.php .
popd

for lang in locale/*; do
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
	if [ -f $lang/LC_MESSAGES/*.mo ]; then
		for file in $lang/LC_MESSAGES/*.mo; do
			rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES/`basename $file`
			cp -a $file $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES/%{name}.mo
			pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
			ln -fs ../../../../locale/`basename $lang`/LC_MESSAGES/%{name}.mo messages.mo
			popd
		done
	fi
done
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc gpl.html %{name}-README.fedora contrib PORTERS INTERNALS CONTRIBUTORS INSTALL-POSTGRESQL TODO TRANSLATIONS TRIGGERS UPGRADE sql
%dir %{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/%{name}
%{_datadir}/%{name}/*

%changelog
* Mon Aug 24 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Remove unnessesary dependency on /sbin/service

* Sun Aug 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-2
- Use Fedora bundled php-PHPMailer
- Fix License tag
- Remove apache restart
- Remove in spec password generation

* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-1
- Update to version 4.92

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-3.a
- Use Packaged HTML_Template_PHPLIB

* Thu Jul 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-2.a
- Made changes to use fedora supplied libraries

* Sat Jul 11 2009 Andrew Colin Kissa <andrew at topdog-software.com> - 4.91-1.a
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:40:13 -0000	1.1
+++ .cvsignore	25 Aug 2009 08:25:14 -0000	1.2
@@ -0,0 +1 @@
+ipplan-4.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:40:13 -0000	1.1
+++ sources	25 Aug 2009 08:25:15 -0000	1.2
@@ -0,0 +1 @@
+2540b381744d1891b53b660fffc5ec56  ipplan-4.92.tar.gz



From caolanm at fedoraproject.org  Tue Aug 25 08:30:59 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 25 Aug 2009 08:30:59 +0000 (UTC)
Subject: rpms/hunspell-is/devel hunspell-is.spec,1.6,1.7
Message-ID: <20090825083059.A4FB611C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20293

Modified Files:
	hunspell-is.spec 
Log Message:
bad chmod


Index: hunspell-is.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/hunspell-is.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hunspell-is.spec	25 Aug 2009 08:20:41 -0000	1.6
+++ hunspell-is.spec	25 Aug 2009 08:30:59 -0000	1.7
@@ -19,7 +19,6 @@ Icelandic hunspell dictionaries.
 %setup -q -c -n hunspell-is
 
 %build
-chmod -x *
 for i in LICENSE_en_US.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



From pkgdb at fedoraproject.org  Tue Aug 25 08:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 08:48:00 +0000
Subject: [pkgdb] grfcodec: heffer has requested commit
Message-ID: <20090825084800.8AD2510F86F@bastion2.fedora.phx.redhat.com>

heffer has requested the commit acl on grfcodec (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 08:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 08:48:03 +0000
Subject: [pkgdb] grfcodec: heffer has requested watchbugzilla
Message-ID: <20090825084803.56CDE10F87B@bastion2.fedora.phx.redhat.com>

heffer has requested the watchbugzilla acl on grfcodec (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 08:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 08:48:04 +0000
Subject: [pkgdb] grfcodec: heffer has requested watchcommits
Message-ID: <20090825084804.F3E5B10F88B@bastion2.fedora.phx.redhat.com>

heffer has requested the watchcommits acl on grfcodec (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 08:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 08:48:19 +0000
Subject: [pkgdb] grfcodec: heffer has requested commit
Message-ID: <20090825084820.08EEA10F898@bastion2.fedora.phx.redhat.com>

heffer has requested the commit acl on grfcodec (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 08:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 08:48:17 +0000
Subject: [pkgdb] grfcodec: heffer has requested watchcommits
Message-ID: <20090825084817.CD6D310F895@bastion2.fedora.phx.redhat.com>

heffer has requested the watchcommits acl on grfcodec (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 08:48:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 08:48:15 +0000
Subject: [pkgdb] grfcodec: heffer has requested watchbugzilla
Message-ID: <20090825084815.3EE0B10F86F@bastion2.fedora.phx.redhat.com>

heffer has requested the watchbugzilla acl on grfcodec (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From topdog at fedoraproject.org  Tue Aug 25 08:29:56 2009
From: topdog at fedoraproject.org (topdog)
Date: Tue, 25 Aug 2009 08:29:56 +0000 (UTC)
Subject: rpms/ipplan/EL-5 README.ipplan, NONE, 1.1 import.log, NONE,
	1.1 ipplan-mysql.sql, NONE, 1.1 ipplan-pgsql.sql, NONE,
	1.1 ipplan-set-adodb-path.patch, NONE,
	1.1 ipplan-set-menus-path.patch, NONE,
	1.1 ipplan-set-phpmailer-path.patch, NONE,
	1.1 ipplan-use-qmagic.patch, NONE, 1.1 ipplan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090825082956.1269211C00D7@cvs1.fedora.phx.redhat.com>

Author: topdog

Update of /cvs/pkgs/rpms/ipplan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20033/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	README.ipplan import.log ipplan-mysql.sql ipplan-pgsql.sql 
	ipplan-set-adodb-path.patch ipplan-set-menus-path.patch 
	ipplan-set-phpmailer-path.patch ipplan-use-qmagic.patch 
	ipplan.spec 
Log Message:
* Tue Aug 25 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Initial import




--- NEW FILE README.ipplan ---

Configuration - Mysql
1) create the database by issuing the following at the command prompt:

   mysqladmin -p create ipplan

2) add a database user for ipplan using mysql -p
   GRANT SELECT,INSERT,UPDATE,DELETE on ipplan.*
       TO ipplan at localhost IDENTIFIED by 'password';

   Change the above password to whatever you wish

3) modify the user and password info in the /etc/ipplan/config.php,
   additional settings can be changed in the /etc/ipplan/config.php 
   at this stage too. See /usr/share/doc/ipplan-*/README for more 
   information.

   Make sure you leave transaction support enabled in /etc/ipplan/config.php

4) Import the database schema into the database

  mysql -p ipplan < /usr/share/doc/ipplan-*/sql/ipplan-mysql.sql

5) Point your web browser to the main IPplan web page (http://mywebserver.com/ipplan), 
   select the admin drop down menu and add customers, groups and users using the admin 
   user defined in the config.php file - you MUST create at least one regular user 
   one group and one customer

Configuration - Postgresql
1) Create the database, database user and tables by issuing the following at the
   command prompt as the postgres user (su - postgres):
  
  su - postgres
  createuser -P ipplan
        Enter password for new role:
        Enter it again:
        Shall the new role be a superuser? (y/n) n
        Shall the new role be allowed to create databases? (y/n) n
        Shall the new role be allowed to create more new roles? (y/n) n
  
  createdb -O ipplan ipplan

  Make sure that the ipplan user is allowed to connect to the ipplan
  database from another user by modifying the pg_hba.conf file and
  adding the following then restart the postgresql service

        host   ipplan       ipplan      127.0.0.1/32          md5
        host   ipplan       ipplan         ::1/128            md5
        local  ipplan       ipplan                            md5

  Import the database schema

  psql -U ipplan < /usr/share/doc/ipplan-*/sql/ipplan-pgsql.sql

2) Modify the user and password info in the config.php script, additional
   settings can be changed /etc/ipplan/config.php at this stage too.
   See the /usr/share/doc/ipplan-*/README for more information.

3) now point your web browser to the main IPplan web page
   (http://mywebserver.com/ipplan), select the admin drop down menu and add
   customers, groups and users using the admin user defined in the config.php
   file - you MUST create at least one regular user, one group and one customer

Configuration - Oracle
Oracle is not supported on fedora


--- NEW FILE import.log ---
ipplan-4_92-3_fc11:EL-5:ipplan-4.92-3.fc11.src.rpm:1251188942


--- NEW FILE ipplan-mysql.sql ---

CREATE TABLE area (
areaaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
areaindex                BIGINT NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (areaindex)
)TYPE=INNODB;


ALTER TABLE area ADD  UNIQUE INDEX area_customer  (customer, descrip);


ALTER TABLE area ADD  UNIQUE INDEX area_areaaddr  (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP NOT NULL
)TYPE=INNODB;


ALTER TABLE auditlog ADD  INDEX auditlog_dt  (dt);


CREATE TABLE base (
baseaddr                 INT UNSIGNED NOT NULL DEFAULT 0,
subnetsize               INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
baseindex                BIGINT NOT NULL AUTO_INCREMENT,
admingrp                 VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT UNSIGNED DEFAULT 0,
swipmod                  DATETIME,
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


ALTER TABLE base ADD  UNIQUE INDEX base_baseaddr  (baseaddr, customer);


ALTER TABLE base ADD  INDEX base_customer  (customer);


ALTER TABLE base ADD  INDEX base_admingrp  (admingrp);


CREATE TABLE baseadd (
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
)TYPE=INNODB;


CREATE TABLE custinfo (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE custadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
)TYPE=INNODB;


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
)TYPE=INNODB;


ALTER TABLE customer ADD  UNIQUE INDEX customer_custdescrip  (custdescrip);


ALTER TABLE customer ADD  INDEX customer_crm  (crm);


ALTER TABLE customer ADD  INDEX customer_admingrp  (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) NOT NULL DEFAULT 'N',
resaddr                  SMALLINT UNSIGNED DEFAULT 0,
grpopt                   INT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (grp)
)TYPE=INNODB;


ALTER TABLE grp ADD  UNIQUE INDEX grp_grpdescrip  (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                BIGINT NOT NULL DEFAULT 0,
lastmod                  TIMESTAMP NOT NULL,
lastpol                  DATETIME,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddr ADD  INDEX ipaddr_baseindex  (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobin                  LONGBLOB,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
)TYPE=INNODB;


ALTER TABLE ipaddradd ADD  INDEX ipaddradd_baseindex  (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT UNSIGNED NOT NULL DEFAULT 0,
baseindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
dstipaddr                INT UNSIGNED NOT NULL DEFAULT 0,
dstcustomer              SMALLINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE ipaddrlnk ADD  UNIQUE INDEX ipaddrlnk_uniq  (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_dst  (dstipaddr, dstcustomer);


ALTER TABLE ipaddrlnk ADD  INDEX ipaddrlnk_src  (ipaddr, customer);


CREATE TABLE requestip (
requestindex             INTEGER NOT NULL AUTO_INCREMENT,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP NOT NULL,
info                     LONGTEXT,
                 PRIMARY KEY (requestindex)
)TYPE=INNODB;


ALTER TABLE requestip ADD  UNIQUE INDEX requestip_desc  (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT UNSIGNED NOT NULL DEFAULT 0,
rangesize                INT UNSIGNED NOT NULL DEFAULT 0,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               BIGINT NOT NULL AUTO_INCREMENT,
areaindex                BIGINT NOT NULL DEFAULT 0,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (rangeindex)
)TYPE=INNODB;


ALTER TABLE netrange ADD  INDEX range_rangeaddr  (rangeaddr, customer);


ALTER TABLE netrange ADD  UNIQUE INDEX range_customer  (customer, descrip);


ALTER TABLE netrange ADD  INDEX range_areaindex  (areaindex);


CREATE TABLE revdns (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE revdns ADD  INDEX revdns_customer  (customer);


CREATE TABLE version (
version                  INTEGER NOT NULL DEFAULT 0
)TYPE=INNODB;


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
)TYPE=INNODB;


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE usergrp ADD  UNIQUE INDEX usergrp_userid  (userid, grp);


ALTER TABLE usergrp ADD  INDEX usergrp_grp  (grp);


CREATE TABLE bounds (
boundsaddr               INT UNSIGNED NOT NULL DEFAULT 0,
boundssize               INT UNSIGNED NOT NULL DEFAULT 0,
grp                      VARCHAR(40) NOT NULL
)TYPE=INNODB;


ALTER TABLE bounds ADD  INDEX bounds_grp  (grp);


ALTER TABLE bounds ADD  INDEX bounds_boundsaddr  (boundsaddr);


CREATE TABLE fwdzone (
data_id                  BIGINT NOT NULL AUTO_INCREMENT,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  DATETIME,
regmod                   DATE,
expiremod                DATETIME,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
)TYPE=INNODB;


ALTER TABLE fwdzone ADD  INDEX fwdzone_customer  (customer);


ALTER TABLE fwdzone ADD  INDEX fwdzone_domain  (domain);


CREATE TABLE fwdzoneadd (
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
data_id                  BIGINT NOT NULL DEFAULT 0,
info                     LONGTEXT,
infobinfn                VARCHAR(255)
)TYPE=INNODB;


ALTER TABLE fwdzoneadd ADD  UNIQUE INDEX fwdzoneadd_customer  (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   BIGINT NOT NULL AUTO_INCREMENT,
data_id                  BIGINT NOT NULL DEFAULT 0,
lastmod                  DATETIME,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INTEGER NOT NULL DEFAULT 0,
userid                   VARCHAR(40) NOT NULL,
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (recidx)
)TYPE=INNODB;


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_data_id  (data_id);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_sortorder  (sortorder);


ALTER TABLE fwdzonerec ADD  INDEX fwdzonerec_customer  (customer);


CREATE TABLE fwddns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE fwddns ADD  INDEX fwddns_id  (id);


CREATE TABLE zones (
id                       BIGINT NOT NULL AUTO_INCREMENT,
zoneip                   INT UNSIGNED NOT NULL DEFAULT 0,
zonesize                 INT UNSIGNED NOT NULL DEFAULT 0,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  DATETIME,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INTEGER DEFAULT 0,
ttl                      INTEGER DEFAULT 0,
refresh                  INTEGER DEFAULT 0,
retry                    INTEGER DEFAULT 0,
expire                   INTEGER DEFAULT 0,
minimum                  INTEGER DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  DATETIME,
slaveonly                VARCHAR(1) NOT NULL DEFAULT 'N',
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 SMALLINT UNSIGNED NOT NULL DEFAULT 0,
                 PRIMARY KEY (id)
)TYPE=INNODB;


ALTER TABLE zones ADD  INDEX zones_customer  (customer);


ALTER TABLE zones ADD  INDEX zones_zoneip  (zoneip);


CREATE TABLE zonedns (
id                       BIGINT NOT NULL DEFAULT 0,
hname                    VARCHAR(100) NOT NULL,
horder                   TINYINT UNSIGNED NOT NULL DEFAULT 0
)TYPE=INNODB;


ALTER TABLE zonedns ADD  INDEX zonedns_id  (id);


BEGIN;


INSERT INTO version (version) VALUES (22);


COMMIT;



--- NEW FILE ipplan-pgsql.sql ---
CREATE TABLE area (
areaaddr                 INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
areaindex                SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (areaindex)
);


CREATE UNIQUE INDEX area_customer ON area (customer, descrip);


CREATE UNIQUE INDEX area_areaaddr ON area (areaaddr, customer);


CREATE TABLE auditlog (
userid                   VARCHAR(40),
action                   VARCHAR(254) NOT NULL,
dt                       TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
);


CREATE INDEX auditlog_dt ON auditlog (dt);


CREATE TABLE base (
baseaddr                 INT8 DEFAULT 0 NOT NULL,
subnetsize               INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
baseindex                SERIAL,
admingrp                 VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
userid                   VARCHAR(40),
baseopt                  INT8 DEFAULT 0,
swipmod                  TIMESTAMP,
                 PRIMARY KEY (baseindex)
);


CREATE UNIQUE INDEX base_baseaddr ON base (baseaddr, customer);


CREATE INDEX base_customer ON base (customer);


CREATE INDEX base_admingrp ON base (admingrp);


CREATE TABLE baseadd (
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (baseindex)
);


CREATE TABLE custinfo (
customer                 INT4 DEFAULT 0 NOT NULL,
org                      VARCHAR(100),
street                   VARCHAR(255),
city                     VARCHAR(80),
state                    VARCHAR(2),
zipcode                  VARCHAR(10),
cntry                    VARCHAR(2),
maint                    VARCHAR(80),
nichandl                 VARCHAR(80),
lname                    VARCHAR(80),
fname                    VARCHAR(80),
mname                    VARCHAR(80),
torg                     VARCHAR(100),
tstreet                  VARCHAR(255),
tcity                    VARCHAR(80),
tstate                   VARCHAR(2),
tzipcode                 VARCHAR(10),
tcntry                   VARCHAR(2),
phne                     VARCHAR(20),
mbox                     VARCHAR(100),
                 PRIMARY KEY (customer)
);


CREATE TABLE custadd (
customer                 INT4 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (customer)
);


CREATE TABLE customer (
custdescrip              VARCHAR(80) NOT NULL,
customer                 SERIAL,
crm                      VARCHAR(20),
admingrp                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (customer)
);


CREATE UNIQUE INDEX customer_custdescrip ON customer (custdescrip);


CREATE INDEX customer_crm ON customer (crm);


CREATE INDEX customer_admingrp ON customer (admingrp);


CREATE TABLE grp (
grpdescrip               VARCHAR(80) NOT NULL,
grp                      VARCHAR(40) NOT NULL,
createcust               VARCHAR(1) DEFAULT 'N' NOT NULL,
resaddr                  INT4 DEFAULT 0,
grpopt                   INT8 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (grp)
);


CREATE UNIQUE INDEX grp_grpdescrip ON grp (grpdescrip);


CREATE TABLE ipaddr (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
baseindex                INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
lastpol                  TIMESTAMP,
userid                   VARCHAR(40),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddr_baseindex ON ipaddr (baseindex);


CREATE TABLE ipaddradd (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobin                  BYTEA,
infobinfn                VARCHAR(255),
                 PRIMARY KEY (ipaddr, baseindex)
);


CREATE INDEX ipaddradd_baseindex ON ipaddradd (baseindex);


CREATE TABLE ipaddrlnk (
ipaddr                   INT8 DEFAULT 0 NOT NULL,
baseindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
dstipaddr                INT8 DEFAULT 0 NOT NULL,
dstcustomer              INT4 DEFAULT 0 NOT NULL
);


CREATE UNIQUE INDEX ipaddrlnk_uniq ON ipaddrlnk (baseindex, ipaddr, customer, dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_dst ON ipaddrlnk (dstipaddr, dstcustomer);


CREATE INDEX ipaddrlnk_src ON ipaddrlnk (ipaddr, customer);


CREATE TABLE requestip (
requestindex             SERIAL,
customer                 INT4 DEFAULT 0 NOT NULL,
requestdesc              VARCHAR(80),
userinf                  VARCHAR(80),
location                 VARCHAR(80),
telno                    VARCHAR(15),
descrip                  VARCHAR(80),
hname                    VARCHAR(100),
macaddr                  VARCHAR(12),
lastmod                  TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
info                     TEXT,
                 PRIMARY KEY (requestindex)
);


CREATE UNIQUE INDEX requestip_desc ON requestip (customer, requestdesc);


CREATE TABLE netrange (
rangeaddr                INT8 DEFAULT 0 NOT NULL,
rangesize                INT8 DEFAULT 0 NOT NULL,
descrip                  VARCHAR(80) NOT NULL,
rangeindex               SERIAL,
areaindex                INT8 DEFAULT 0 NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (rangeindex)
);


CREATE INDEX range_rangeaddr ON netrange (rangeaddr, customer);


CREATE UNIQUE INDEX range_customer ON netrange (customer, descrip);


CREATE INDEX range_areaindex ON netrange (areaindex);


CREATE TABLE revdns (
customer                 INT4 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
ipaddr                   VARCHAR(15) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX revdns_customer ON revdns (customer);


CREATE TABLE schema (
version                  INT4 DEFAULT 0 NOT NULL
);


CREATE TABLE users (
userid                   VARCHAR(40) NOT NULL,
userdescrip              VARCHAR(80) NOT NULL,
useremail                VARCHAR(64),
password                 VARCHAR(40) NOT NULL,
                 PRIMARY KEY (userid)
);


CREATE TABLE usergrp (
userid                   VARCHAR(40) NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE UNIQUE INDEX usergrp_userid ON usergrp (userid, grp);


CREATE INDEX usergrp_grp ON usergrp (grp);


CREATE TABLE bounds (
boundsaddr               INT8 DEFAULT 0 NOT NULL,
boundssize               INT8 DEFAULT 0 NOT NULL,
grp                      VARCHAR(40) NOT NULL
);


CREATE INDEX bounds_grp ON bounds (grp);


CREATE INDEX bounds_boundsaddr ON bounds (boundsaddr);


CREATE TABLE fwdzone (
data_id                  SERIAL,
domain                   VARCHAR(254) NOT NULL,
createmod                DATE,
lastmod                  TIMESTAMP,
regmod                   DATE,
expiremod                TIMESTAMP,
engineer                 VARCHAR(254),
error_message            VARCHAR(254),
responsiblemail          VARCHAR(64),
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
customer                 INT4 DEFAULT 0 NOT NULL,
admingrp                 VARCHAR(40),
                 PRIMARY KEY (data_id)
);


CREATE INDEX fwdzone_customer ON fwdzone (customer);


CREATE INDEX fwdzone_domain ON fwdzone (domain);


CREATE TABLE fwdzoneadd (
customer                 INT4 DEFAULT 0 NOT NULL,
data_id                  INT8 DEFAULT 0 NOT NULL,
info                     TEXT,
infobinfn                VARCHAR(255)
);


CREATE UNIQUE INDEX fwdzoneadd_customer ON fwdzoneadd (customer, data_id);


CREATE TABLE fwdzonerec (
recidx                   SERIAL,
data_id                  INT8 DEFAULT 0 NOT NULL,
lastmod                  TIMESTAMP,
host                     VARCHAR(254) NOT NULL,
recordtype               VARCHAR(5) NOT NULL,
ip_hostname              VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
sortorder                INT4 DEFAULT 0 NOT NULL,
userid                   VARCHAR(40) NOT NULL,
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (recidx)
);


CREATE INDEX fwdzonerec_data_id ON fwdzonerec (data_id);


CREATE INDEX fwdzonerec_sortorder ON fwdzonerec (sortorder);


CREATE INDEX fwdzonerec_customer ON fwdzonerec (customer);


CREATE TABLE fwddns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX fwddns_id ON fwddns (id);


CREATE TABLE zones (
id                       SERIAL,
zoneip                   INT8 DEFAULT 0 NOT NULL,
zonesize                 INT8 DEFAULT 0 NOT NULL,
zone                     VARCHAR(254) NOT NULL,
error_message            VARCHAR(254),
lastmod                  TIMESTAMP,
serialdate               VARCHAR(8) NOT NULL,
serialnum                INT4 DEFAULT 0,
ttl                      INT4 DEFAULT 0,
refresh                  INT4 DEFAULT 0,
retry                    INT4 DEFAULT 0,
expire                   INT4 DEFAULT 0,
minimum                  INT4 DEFAULT 0,
userid                   VARCHAR(40),
lastexp                  TIMESTAMP,
slaveonly                VARCHAR(1) DEFAULT 'N' NOT NULL,
zonefilepath1            VARCHAR(254),
zonefilepath2            VARCHAR(254),
responsiblemail          VARCHAR(64),
customer                 INT4 DEFAULT 0 NOT NULL,
                 PRIMARY KEY (id)
);


CREATE INDEX zones_customer ON zones (customer);


CREATE INDEX zones_zoneip ON zones (zoneip);


CREATE TABLE zonedns (
id                       INT8 DEFAULT 0 NOT NULL,
hname                    VARCHAR(100) NOT NULL,
horder                   SMALLINT DEFAULT 0 NOT NULL
);


CREATE INDEX zonedns_id ON zonedns (id);


BEGIN;


INSERT INTO schema (version) VALUES (22);


COMMIT;



ipplan-set-adodb-path.patch:
 admin/changepassword.php     |    2 +-
 admin/deletebounds.php       |    2 +-
 admin/displayauditlog.php    |    4 ++--
 admin/displayboundsform.php  |    2 +-
 admin/exportbase.php         |    2 +-
 admin/exportbaseform.php     |    2 +-
 admin/exportip.php           |    2 +-
 admin/exportipform.php       |    2 +-
 admin/importbase.php         |    2 +-
 admin/importbaseform.php     |    2 +-
 admin/importip.php           |    2 +-
 admin/importipform.php       |    2 +-
 admin/maintenance.php        |    2 +-
 admin/schemacreate.php       |    4 ++--
 admin/usermanager.php        |    2 +-
 contrib/ipplan-poller.php    |    2 +-
 user/changesettings.php      |    2 +-
 user/createarea.php          |    2 +-
 user/createrange.php         |    2 +-
 user/createsubnet.php        |    2 +-
 user/createsubnetform.php    |    2 +-
 user/deletearea.php          |    2 +-
 user/deletecustomer.php      |    2 +-
 user/deleterange.php         |    2 +-
 user/displaybase.php         |    2 +-
 user/displaybaseform.php     |    2 +-
 user/displaycustomerform.php |    2 +-
 user/displayoverlap.php      |    2 +-
 user/displayoverlapform.php  |    2 +-
 user/displayrouter.php       |    2 +-
 user/displayrouterform.php   |    2 +-
 user/displaysubnet.php       |    4 ++--
 user/displayswip.php         |    2 +-
 user/displayswipform.php     |    2 +-
 user/emailswip.php           |    2 +-
 user/exportdhcp.php          |    2 +-
 user/exportview.php          |    2 +-
 user/findfree.php            |    2 +-
 user/findfreeform.php        |    2 +-
 user/modifyarearange.php     |    2 +-
 user/modifyarearangeform.php |    2 +-
 user/modifybase.php          |    2 +-
 user/modifybaseform.php      |    2 +-
 user/modifycustomer.php      |    2 +-
 user/modifydns.php           |    2 +-
 user/modifydnsform.php       |    2 +-
 user/modifydnsrecord.php     |    2 +-
 user/modifydnsrecordform.php |    2 +-
 user/modifyipform.php        |    2 +-
 user/modifyipformmul.php     |    2 +-
 user/modifysubnet.php        |    2 +-
 user/modifyzone.php          |    2 +-
 user/modifyzoneform.php      |    2 +-
 user/ping.php                |    2 +-
 user/requestip.php           |    2 +-
 user/searchall.php           |    2 +-
 user/searchallform.php       |    2 +-
 user/traceroute.php          |    2 +-
 user/treeview.php            |    2 +-
 59 files changed, 62 insertions(+), 62 deletions(-)

--- NEW FILE ipplan-set-adodb-path.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/changepassword.php	2009-07-27 18:08:20.964259380 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/deletebounds.php	2009-07-27 18:08:20.976259668 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/displayauditlog.php ipplan/admin/displayauditlog.php
--- ipplan.orig/admin/displayauditlog.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayauditlog.php	2009-07-27 18:08:21.010259547 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
@@ -135,7 +135,7 @@
 insert($w,text(my_("Total records:")." ".$cnt));
 
 /*
-include_once('../adodb/adodb-pager.inc.php');
+include_once('/usr/share/php/adodb/adodb-pager.inc.php');
 $sql = "SELECT userid, action, dt FROM auditlog ORDER BY dt DESC";
 
 function callback($buffer) {
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-27 18:08:20.978259300 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbaseform.php ipplan/admin/exportbaseform.php
--- ipplan.orig/admin/exportbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbaseform.php	2009-07-27 18:08:21.012260319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportbase.php ipplan/admin/exportbase.php
--- ipplan.orig/admin/exportbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportbase.php	2009-07-27 18:08:20.966259550 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 require_once("../class.templib.php");
diff -ruN ipplan.orig/admin/exportipform.php ipplan/admin/exportipform.php
--- ipplan.orig/admin/exportipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportipform.php	2009-07-27 18:08:21.014260770 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/exportip.php ipplan/admin/exportip.php
--- ipplan.orig/admin/exportip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/exportip.php	2009-07-27 18:08:21.001494556 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/importbaseform.php ipplan/admin/importbaseform.php
--- ipplan.orig/admin/importbaseform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbaseform.php	2009-07-27 18:08:21.017259720 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importbase.php	2009-07-27 18:08:20.973259193 +0200
@@ -56,7 +56,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/importipform.php ipplan/admin/importipform.php
--- ipplan.orig/admin/importipform.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importipform.php	2009-07-27 18:08:21.073260965 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/importip.php ipplan/admin/importip.php
--- ipplan.orig/admin/importip.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/importip.php	2009-07-27 18:08:20.984259075 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.templib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/admin/maintenance.php ipplan/admin/maintenance.php
--- ipplan.orig/admin/maintenance.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/maintenance.php	2009-07-27 18:08:20.992259086 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/admin/schemacreate.php ipplan/admin/schemacreate.php
--- ipplan.orig/admin/schemacreate.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/schemacreate.php	2009-07-27 18:08:21.069260682 +0200
@@ -22,8 +22,8 @@
 define("SCHEMA", 22);
 
 require_once("../ipplanlib.php");
-//require_once('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//require_once('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-27 18:06:42.469260813 +0200
+++ ipplan/admin/usermanager.php	2009-07-27 18:08:21.042259729 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-02-22 23:44:50.000000000 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-27 18:08:20.377259554 +0200
@@ -39,7 +39,7 @@
 // define the nmap command for scan with dns lookup
 define("NMAP_CMDH", "-sP -PE -q -R -v -oG");
 
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 
 $timestamp = FALSE;
diff -ruN ipplan.orig/user/changesettings.php ipplan/user/changesettings.php
--- ipplan.orig/user/changesettings.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/changesettings.php	2009-07-27 18:08:20.707259358 +0200
@@ -20,7 +20,7 @@
 
 require_once("../config.php");
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createarea.php	2009-07-27 18:08:20.825259282 +0200
@@ -20,7 +20,7 @@
 // Modify capabilities added by Denes Magyar (fat at poison.hu) 22/02/05
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createrange.php	2009-07-27 18:08:20.857259235 +0200
@@ -63,7 +63,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnetform.php ipplan/user/createsubnetform.php
--- ipplan.orig/user/createsubnetform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnetform.php	2009-07-27 18:08:20.799259298 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/createsubnet.php	2009-07-27 18:08:20.724259386 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletearea.php ipplan/user/deletearea.php
--- ipplan.orig/user/deletearea.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletearea.php	2009-07-27 18:08:20.710259490 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deletecustomer.php ipplan/user/deletecustomer.php
--- ipplan.orig/user/deletecustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deletecustomer.php	2009-07-27 18:08:20.550259181 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/deleterange.php ipplan/user/deleterange.php
--- ipplan.orig/user/deleterange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/deleterange.php	2009-07-27 18:08:20.809260311 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybaseform.php ipplan/user/displaybaseform.php
--- ipplan.orig/user/displaybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybaseform.php	2009-07-27 18:08:20.791259227 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaybase.php ipplan/user/displaybase.php
--- ipplan.orig/user/displaybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaybase.php	2009-07-27 18:08:20.488259765 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displaycustomerform.php ipplan/user/displaycustomerform.php
--- ipplan.orig/user/displaycustomerform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaycustomerform.php	2009-07-27 18:08:20.879259357 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlapform.php ipplan/user/displayoverlapform.php
--- ipplan.orig/user/displayoverlapform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlapform.php	2009-07-27 18:08:20.875259262 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayoverlap.php ipplan/user/displayoverlap.php
--- ipplan.orig/user/displayoverlap.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayoverlap.php	2009-07-27 18:08:20.593259271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouterform.php ipplan/user/displayrouterform.php
--- ipplan.orig/user/displayrouterform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouterform.php	2009-07-27 18:08:20.872259229 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayrouter.php ipplan/user/displayrouter.php
--- ipplan.orig/user/displayrouter.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayrouter.php	2009-07-27 18:08:20.770259123 +0200
@@ -93,7 +93,7 @@
 }
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displaysubnet.php	2009-07-27 18:08:20.849259064 +0200
@@ -19,8 +19,8 @@
 //
 
 require_once("../ipplanlib.php");
-//include('../adodb/adodb-errorhandler.inc.php');
-require_once("../adodb/adodb.inc.php");
+//include('/usr/share/php/adodb/adodb-errorhandler.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswipform.php ipplan/user/displayswipform.php
--- ipplan.orig/user/displayswipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswipform.php	2009-07-27 18:08:20.479259953 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/displayswip.php ipplan/user/displayswip.php
--- ipplan.orig/user/displayswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/displayswip.php	2009-07-27 18:08:20.764259337 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/emailswip.php ipplan/user/emailswip.php
--- ipplan.orig/user/emailswip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/emailswip.php	2009-07-27 18:08:20.588259651 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("swiplib.php");
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportdhcp.php	2009-07-27 18:08:20.717259269 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../auth.php");
 
diff -ruN ipplan.orig/user/exportview.php ipplan/user/exportview.php
--- ipplan.orig/user/exportview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/exportview.php	2009-07-27 18:08:20.888259800 +0200
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfreeform.php ipplan/user/findfreeform.php
--- ipplan.orig/user/findfreeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfreeform.php	2009-07-27 18:08:20.540261810 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/findfree.php ipplan/user/findfree.php
--- ipplan.orig/user/findfree.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/findfree.php	2009-07-27 18:08:20.781259273 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearangeform.php ipplan/user/modifyarearangeform.php
--- ipplan.orig/user/modifyarearangeform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearangeform.php	2009-07-27 18:08:20.793260240 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyarearange.php ipplan/user/modifyarearange.php
--- ipplan.orig/user/modifyarearange.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyarearange.php	2009-07-27 18:08:20.886259388 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybaseform.php ipplan/user/modifybaseform.php
--- ipplan.orig/user/modifybaseform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybaseform.php	2009-07-27 18:08:20.860259626 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifybase.php	2009-07-27 18:08:20.504259535 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifycustomer.php	2009-07-27 18:08:20.527258935 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsform.php ipplan/user/modifydnsform.php
--- ipplan.orig/user/modifydnsform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsform.php	2009-07-27 18:08:20.733259100 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydns.php	2009-07-27 18:08:20.584259051 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/modifydnsrecordform.php ipplan/user/modifydnsrecordform.php
--- ipplan.orig/user/modifydnsrecordform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecordform.php	2009-07-27 18:08:20.492259765 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-27 18:08:20.749259692 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipformmul.php ipplan/user/modifyipformmul.php
--- ipplan.orig/user/modifyipformmul.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipformmul.php	2009-07-27 18:08:20.555259277 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyipform.php	2009-07-27 18:08:20.571259438 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifysubnet.php	2009-07-27 18:08:20.869259218 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzoneform.php ipplan/user/modifyzoneform.php
--- ipplan.orig/user/modifyzoneform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzoneform.php	2009-07-27 18:08:20.760259037 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/modifyzone.php	2009-07-27 18:08:20.821259349 +0200
@@ -21,7 +21,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../class.dnslib.php");
 require_once("../layout/class.layout");
diff -ruN ipplan.orig/user/ping.php ipplan/user/ping.php
--- ipplan.orig/user/ping.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/ping.php	2009-07-27 18:08:20.783260234 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/requestip.php	2009-07-27 18:08:20.806260271 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchallform.php ipplan/user/searchallform.php
--- ipplan.orig/user/searchallform.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchallform.php	2009-07-27 18:08:20.546259497 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/searchall.php	2009-07-27 18:08:20.536259319 +0200
@@ -19,7 +19,7 @@
 //
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/traceroute.php ipplan/user/traceroute.php
--- ipplan.orig/user/traceroute.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/traceroute.php	2009-07-27 18:08:20.482259840 +0200
@@ -22,7 +22,7 @@
 define("NOCOMPRESS", "TRUE");
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../config.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-07-27 18:06:42.474261590 +0200
+++ ipplan/user/treeview.php	2009-07-27 18:08:20.787259612 +0200
@@ -20,7 +20,7 @@
 // Bcracknell 03/11/2005 - Added tree menu display of Customers/Areas/Ranges & Subnets
 
 require_once("../ipplanlib.php");
-require_once("../adodb/adodb.inc.php");
+require_once("/usr/share/php/adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");

ipplan-set-menus-path.patch:
 ipplan/admin/usermanager.php |   20 ++++++++++----------
 ipplan/ipplanlib.php         |   19 ++++++++++---------
 ipplan/user/treeview.php     |   20 ++++++++++----------
 ipplanlib.php                |    2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

--- NEW FILE ipplan-set-menus-path.patch ---
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-03-18 22:44:03.000000000 +0200
+++ ipplan/admin/usermanager.php	2009-07-23 18:39:21.905261618 +0200
@@ -22,9 +22,9 @@
 require_once("../adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 require_once("../auth.php");
 
 
@@ -38,7 +38,7 @@
 isset($_COOKIE["ipplanLanguage"]) && myLanguage($_COOKIE['ipplanLanguage']);
 
 newhtml($p);
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p,my_("User Manager"));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu-hidden.css")));
@@ -190,12 +190,12 @@
 insert($view, block("<i>".my_("Click on a group or user")."</i>"));
 
 $mid = new TreeMenu();
-$mid->setDirroot('../menus');
-$mid->setLibjsdir('../menus/libjs/');
-$mid->setImgdir('../menus/menuimages/');
-$mid->setImgwww('../menus/menuimages/');
-$mid->setIcondir('../menus/menuicons/');
-$mid->setIconwww('../menus/menuicons/');
+$mid->setDirroot('/usr/share/php/php-layers-menu');
+$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+$mid->setImgwww('../../menus/menuimages/');
+$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+$mid->setIconwww('../../menus/menuicons/');
 $mid->SetMenuStructureString($MENU);
 $mid->setIconsize(16, 16);
 $mid->parseStructureForMenu('treemenu1');
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/ipplanlib.php	2009-07-23 18:49:26.576261171 +0200
@@ -540,8 +540,9 @@
     $BASE_URL = base_url();
     $BASE_DIR = base_dir();
 
-    $myDirPath = $BASE_DIR . '/menus/';
-    $myWwwPath = $BASE_URL . '/menus/';
+    $myDirPath = '/usr/share/php/php-layers-menu/';
+    $myMenPath = str_replace('/ipplan','',$BASE_URL);
+    $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
     require_once $myDirPath . 'lib/PHPLIB.php';
@@ -583,13 +584,13 @@
         insert($w, script("",array("language"=>"JavaScript","type"=>"text/javascript","src"=> $myWwwPath . 'libjs/layersmenu.js')));
 
         $mid= new LayersMenu(6, 7, 2, 1);
-        $mid->setDirroot ($BASE_DIR.'/menus/');
-        $mid->setLibjsdir($BASE_DIR.'/menus/libjs/');
-        $mid->setImgdir  ($BASE_DIR.'/menus/menuimages/');
-        $mid->setImgwww  ($BASE_URL.'/menus/menuimages/');
-        $mid->setIcondir ($BASE_DIR.'/menus/menuicons/');
-        $mid->setIconwww ($BASE_URL.'/menus/menuicons/');
-        $mid->setTpldir  ($BASE_DIR.'/menus/templates/');
+        $mid->setDirroot ('/usr/share/php/php-layers-menu/');
+        $mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+        $mid->setImgdir  ('/usr/share/php/php-layers-menu/menuimages/');
+        $mid->setImgwww  ('../../menus/menuimages/');
+        $mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
+        $mid->setIconwww ('../../menus/menuicons/');
+        $mid->setTpldir  ('/usr/share/php/php-layers-menu/templates/');
         $mid->SetMenuStructureString($ADMIN_MENU);
         $mid->setIconsize(16, 16);
         $mid->parseStructureForMenu('hormenu1');
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-03-18 22:43:59.000000000 +0200
+++ ipplan/user/treeview.php	2009-07-23 18:52:03.193261518 +0200
@@ -24,9 +24,9 @@
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 
 $auth = new SQLAuthenticator(REALM, REALMERROR);
 
@@ -39,7 +39,7 @@
 $title=my_("Display subnet information");
 newhtml($p);
 
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p, $title);
 
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
@@ -133,12 +133,12 @@
   	}
 
 	$mid = new TreeMenu();
-	$mid->setDirroot('../menus');
-	$mid->setLibjsdir('../menus/libjs/');
-	$mid->setImgdir('../menus/menuimages/');
-	$mid->setImgwww('../menus/menuimages/');
-	$mid->setIcondir('../menus/menuicons/');
-	$mid->setIconwww('../menus/menuicons/');
+	$mid->setDirroot('/usr/share/php/php-layers-menu');
+	$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+	$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+	$mid->setImgwww('../../menus/menuimages/');
+	$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+	$mid->setIconwww('../../menus/menuicons/');
 	if(!$menustring) myError($w,$p, my_("No customers"));
 	$mid->setMenuStructureString($menustring);
 	$mid->setIconsize(16, 16);
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-07-27 18:18:17.073261816 +0200
+++ ipplan/ipplanlib.php	2009-07-27 18:19:44.414278370 +0200
@@ -545,7 +545,7 @@
     $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
-    require_once $myDirPath . 'lib/PHPLIB.php';
+    require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
     require_once $myDirPath . 'lib/layersmenu-common.inc.php';
     require_once $myDirPath . 'lib/layersmenu.inc.php';
     require_once $BASE_DIR  . '/menudefs.php';

ipplan-set-phpmailer-path.patch:
 displaysubnet.php      |    8 ++++----
 displaysubnet.php.orig |    8 ++++----
 requestip.php          |    4 ++--
 swiplib.php            |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE ipplan-set-phpmailer-path.patch ---
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-08-23 11:17:07.326552632 +0200
+++ ipplan/user/displaysubnet.php	2009-08-23 11:28:14.122554254 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/displaysubnet.php.orig ipplan/user/displaysubnet.php.orig
--- ipplan.orig/user/displaysubnet.php.orig	2009-08-23 11:16:42.634555924 +0200
+++ ipplan/user/displaysubnet.php.orig	2009-08-23 11:26:26.055552579 +0200
@@ -261,10 +261,10 @@
                         }
 
                         if ($sendwarningmail) {
-                            require_once("../class.phpmailer.php");
+                            require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                             $mail = new PHPMailer();
                             $mail->IsSMTP(); // telling the class to use SMTP
-                            $mail->SetLanguage("en", "../");
+                            $mail->SetLanguage("en");
                             $mail->Host = EMAILSERVER; // SMTP server
                             $mail->From = HELPDESKEMAIL;
                             $mail->IsHTML(false);
@@ -347,10 +347,10 @@
                             else {
 
                                 //Send email notification that IP Request was entered 
-                                require_once("../class.phpmailer.php");
+                                require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
                                 $mail = new PHPMailer();
                                 $mail->IsSMTP(); // telling the class to use SMTP
-                                $mail->SetLanguage("en", "../");
+                                $mail->SetLanguage("en");
                                 $mail->Host = EMAILSERVER; // SMTP server
                                 $mail->From = HELPDESKEMAIL;
                                 $mail->IsHTML(false);
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-08-23 11:17:07.345554665 +0200
+++ ipplan/user/requestip.php	2009-08-23 11:27:11.342553873 +0200
@@ -140,10 +140,10 @@
             $custdescrip=$ds->GetCustomerDescrip($cust);
 
             //Send email notification that IP Request was entered 
-            require("../class.phpmailer.php");
+            require("/usr/share/php/PHPMailer/class.phpmailer.php");
             $mail = new PHPMailer();
             $mail->IsSMTP(); // telling the class to use SMTP
-            $mail->SetLanguage("en", "../");
+            $mail->SetLanguage("en");
             $mail->Host = EMAILSERVER; // SMTP server
             $mail->From = HELPDESKEMAIL;
             $mail->IsHTML(false);
diff -ruN ipplan.orig/user/swiplib.php ipplan/user/swiplib.php
--- ipplan.orig/user/swiplib.php	2009-07-17 00:15:20.000000000 +0200
+++ ipplan/user/swiplib.php	2009-08-23 11:23:16.109553193 +0200
@@ -154,10 +154,10 @@
 // email the swip entry
 function emailSWIP($swip) {
 
-    require_once("../class.phpmailer.php");
+    require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
     $mail = new PHPMailer();
     $mail->IsSMTP(); // telling the class to use SMTP
-    $mail->SetLanguage("en", "../");
+    $mail->SetLanguage("en");
     $mail->Host = EMAILSERVER; // SMTP server
     $mail->From = REGADMINEMAIL;
     $mail->FromName = "IP Plan";

ipplan-use-qmagic.patch:
 admin/changepassword.php    |    4 -
 admin/deletebounds.php      |    2 
 admin/displayboundsform.php |    2 
 admin/importbase.php        |   14 ++---
 admin/usermanager.php       |   86 +++++++++++++++++------------------
 auth.php                    |    6 +-
 class.dbflib.php            |   92 +++++++++++++++++++-------------------
 class.dnslib.php            |  106 ++++++++++++++++++++++----------------------
 contrib/ipplan-poller.php   |   18 +++----
 user/createarea.php         |    4 -
 user/createrange.php        |    4 -
 user/createsubnet.php       |    2 
 user/displaysubnet.php      |   52 ++++++++++-----------
 user/exportdhcp.php         |    2 
 user/modifybase.php         |    4 -
 user/modifycustomer.php     |   62 ++++++++++++-------------
 user/modifydns.php          |   10 ++--
 user/modifydnsrecord.php    |   52 ++++++++++-----------
 user/modifyipform.php       |    6 +-
 user/modifysubnet.php       |   28 +++++------
 user/modifyzone.php         |    2 
 user/requestip.php          |   16 +++---
 user/searchall.php          |   82 +++++++++++++++++-----------------
 23 files changed, 328 insertions(+), 328 deletions(-)

--- NEW FILE ipplan-use-qmagic.patch ---
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
--- ipplan.orig/admin/changepassword.php	2009-07-24 16:35:37.067261296 +0200
+++ ipplan/admin/changepassword.php	2009-07-24 16:52:07.366262054 +0200
@@ -67,8 +67,8 @@
 
       $ds->DbfTransactionStart();
       $result=&$ds->ds->Execute("UPDATE users
-                              SET password=".$ds->ds->qstr($password)."
-                              WHERE userid=".$ds->ds->qstr($userid));
+                              SET password=".$ds->ds->QMagic($password)."
+                              WHERE userid=".$ds->ds->QMagic($userid));
       $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
       if ($result) {
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
--- ipplan.orig/admin/deletebounds.php	2009-07-24 16:35:37.068261756 +0200
+++ ipplan/admin/deletebounds.php	2009-07-24 16:51:07.699261009 +0200
@@ -54,7 +54,7 @@
 
 $ds->DbfTransactionStart();
 $result=&$ds->ds->Execute("DELETE FROM bounds
-                        WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+                        WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
   
 if ($result) {
    $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
--- ipplan.orig/admin/displayboundsform.php	2009-07-24 16:35:37.072265328 +0200
+++ ipplan/admin/displayboundsform.php	2009-07-24 16:51:25.950266841 +0200
@@ -51,7 +51,7 @@
 
 $where="";
 if ($grp) {
-   $where="WHERE grp=".$ds->ds->qstr($grp);
+   $where="WHERE grp=".$ds->ds->QMagic($grp);
 }
 
 $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
--- ipplan.orig/admin/importbase.php	2009-07-24 16:35:37.085272914 +0200
+++ ipplan/admin/importbase.php	2009-07-24 16:51:47.829261312 +0200
@@ -206,10 +206,10 @@
            insert($w,block("<b>".sprintf(my_("Row is duplicate - updating with [ %s, %s ]"), $ipaddr, $descrip)."</b>"));
 
            $result=&$ds->ds->Execute("UPDATE base
-                   SET descrip=".$ds->ds->qstr($descrip).",
+                   SET descrip=".$ds->ds->QMagic($descrip).",
                    lastmod=".$ds->ds->DBTimeStamp(time()).",
-                   userid=".$ds->ds->qstr(getAuthUsername()).",
-                   admingrp=".$ds->ds->qstr($admingrp)."
+                   userid=".$ds->ds->QMagic(getAuthUsername()).",
+                   admingrp=".$ds->ds->QMagic($admingrp)."
                    WHERE customer=$cust AND
                    baseaddr=$base");
 
@@ -225,12 +225,12 @@
                $result = &$ds->ds->Execute("INSERT INTO baseadd
                        (info, baseindex)
                        VALUES
-                       (".$ds->ds->qstr($info).",
+                       (".$ds->ds->QMagic($info).",
                         $baseindex)");
                // Second, try to update.
                if ( $result == FALSE ) {
                    $result=&$ds->ds->Execute("UPDATE baseadd
-                           SET info=".$ds->ds->qstr($info)."                                 
+                           SET info=".$ds->ds->QMagic($info)."                                 
                            WHERE baseindex=$baseindex");
 
                    if ( $result == FALSE ) {
@@ -267,12 +267,12 @@
                    $result = &$ds->ds->Execute("INSERT INTO baseadd
                            (info, baseindex)
                            VALUES
-                           (".$ds->ds->qstr($info).",
+                           (".$ds->ds->QMagic($info).",
                             $baseindex)");
                    // Second, try to update.
                    if ( $result == FALSE ) {
                        $result=&$ds->ds->Execute("UPDATE baseadd
-                               SET info=".$ds->ds->qstr($info)."                                 
+                               SET info=".$ds->ds->QMagic($info)."                                 
                                WHERE baseindex=$baseindex");
 
                        if ( $result == FALSE ) {
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-07-24 16:35:37.096261011 +0200
+++ ipplan/admin/usermanager.php	2009-07-24 16:50:49.924261394 +0200
@@ -96,8 +96,8 @@
 if ($usersearch != "") {
     $result=&$ds->ds->Execute("SELECT userid, userdescrip
             FROM users
-            WHERE userid LIKE ".$ds->ds->qstr("%".$usersearch."%")
-            ." OR userdescrip LIKE ".$ds->ds->qstr("%".$usersearch."%"));
+            WHERE userid LIKE ".$ds->ds->QMagic("%".$usersearch."%")
+            ." OR userdescrip LIKE ".$ds->ds->QMagic("%".$usersearch."%"));
 
     $MENU=".|".my_("Search Result")."\n";
     $count=0;
@@ -293,7 +293,7 @@
     list($ipaddr, $userid, $grp, $grpdescrip, $createcust, $grpview) = myRegister("S:ipaddr S:userid S:grp S:grpdescrip S:createcust S:grpview");
     $grp=trim($grp);
     $grpdescrip=trim($grpdescrip);
-    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->qstr($userid));
+    $result=&$ds->ds->Execute("SELECT * FROM users WHERE userid=".$ds->ds->QMagic($userid));
     if ($result) {
         $row=$result->FetchRow();
     }
@@ -362,7 +362,7 @@
         // in a table and allow the user to delete them.
 
         insert($con, generic("br"));
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->qstr($userid));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE userid=".$ds->ds->QMagic($userid));
         $lst=array();
 
         while($row = $result->FetchRow()) {
@@ -399,7 +399,7 @@
 
     list($ipaddr, $size, $grp) = myRegister("S:ipaddr S:size S:grp");
 
-    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->qstr($grp));
+    $result=&$ds->ds->Execute("SELECT * FROM grp WHERE grp=".$ds->ds->QMagic($grp));
     $row=$result->FetchRow();
     $grpdescrip=$row["grpdescrip"];
     $createcust=$row["createcust"];
@@ -474,7 +474,7 @@
         insert($f2,submit(array("value"=>my_("Add User"))));
         // Edit users assigned to the group.
 
-        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->qstr($grp));
+        $result=&$ds->ds->Execute("SELECT * FROM usergrp WHERE grp=".$ds->ds->QMagic($grp));
 
         $lst=array();
         while($row = $result->FetchRow()) {
@@ -568,7 +568,7 @@
 
     $result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
             FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)."
+            WHERE grp=".$ds->ds->QMagic($grp)."
             ORDER BY boundsaddr");
 
     // logic here is:
@@ -706,25 +706,25 @@
         $ds->DbfTransactionStart();
         // emulates mysql REPLACE
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid));
+                WHERE userid=".$ds->ds->QMagic($userid));
         $result=&$ds->ds->Execute("INSERT INTO users
                 (userid, userdescrip, useremail, password)
                 VALUES
-                (".$ds->ds->qstr($userid).",
-                 ".$ds->ds->qstr($userdescrip).",
-                 ".$ds->ds->qstr($useremail).",
-                 ".$ds->ds->qstr($password).")");
+                (".$ds->ds->QMagic($userid).",
+                 ".$ds->ds->QMagic($userdescrip).",
+                 ".$ds->ds->QMagic($useremail).",
+                 ".$ds->ds->QMagic($password).")");
 
         // add group if user selected a group other than "No group"
         if (!empty($grp)) {
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid)." AND
-                    grp=".$ds->ds->qstr($grp));
+                    WHERE userid=".$ds->ds->QMagic($userid)." AND
+                    grp=".$ds->ds->QMagic($grp));
             $result=&$ds->ds->Execute("INSERT INTO usergrp
                     (userid, grp)
                     VALUES
-                    (".$ds->ds->qstr($userid).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($userid).",
+                     ".$ds->ds->QMagic($grp).")");
         }
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -779,9 +779,9 @@
         $result=&$ds->ds->Execute("INSERT INTO grp
                 (grp, createcust, grpdescrip, grpopt, resaddr)
                 VALUES
-                (".$ds->ds->qstr($grp).",
-                 ".$ds->ds->qstr($createcust).",
-                 ".$ds->ds->qstr($grpdescrip).",
+                (".$ds->ds->QMagic($grp).",
+                 ".$ds->ds->QMagic($createcust).",
+                 ".$ds->ds->QMagic($grpdescrip).",
                  ".$grpbit.", $resaddr)");
 
         if ($result) {
@@ -803,8 +803,8 @@
 
     $ds->DbfTransactionStart();
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     if ($result) {
         $ds->DbfTransactionEnd();
         insert($w,text(my_("User deleted from group")));
@@ -835,9 +835,9 @@
     if ($userid) {
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM users
-                WHERE userid=".$ds->ds->qstr($userid)) and
+                WHERE userid=".$ds->ds->QMagic($userid)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE userid=".$ds->ds->qstr($userid));
+                    WHERE userid=".$ds->ds->QMagic($userid));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -853,8 +853,8 @@
         $userid=$usergrp;
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM usergrp
-                WHERE userid=".$ds->ds->qstr($userid)." AND
-                grp=".$ds->ds->qstr($grp));
+                WHERE userid=".$ds->ds->QMagic($userid)." AND
+                grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -874,7 +874,7 @@
         // check if grp has customers
         $result=&$ds->ds->Execute("SELECT custdescrip
                 FROM customer
-                WHERE admingrp=".$ds->ds->qstr($grp));
+                WHERE admingrp=".$ds->ds->QMagic($grp));
         if ($row=$result->FetchRow()) {
             $formerror .=my_("Cannot delete group because the following customers are assigned to the group:");
             do {
@@ -886,7 +886,7 @@
         // check if grp has subnets
         $result=&$ds->ds->Execute("SELECT baseaddr, descrip
                 FROM base
-                WHERE admingrp=".$ds->ds->qstr($grp)."
+                WHERE admingrp=".$ds->ds->QMagic($grp)."
                 ORDER BY baseaddr");
         if ($row=$result->FetchRow()) {
             $formerror .= my_("Cannot delete group because the following subnets are assigned to the group:");
@@ -898,11 +898,11 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("DELETE FROM grp
-                WHERE grp=".$ds->ds->qstr($grp)) and
+                WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM usergrp
-                    WHERE grp=".$ds->ds->qstr($grp)) and
+                    WHERE grp=".$ds->ds->QMagic($grp)) and
             $result=&$ds->ds->Execute("DELETE FROM bounds
-                    WHERE grp=".$ds->ds->qstr($grp));
+                    WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -934,8 +934,8 @@
 
         $ds->DbfTransactionStart();
         $result=&$ds->ds->Execute("UPDATE users
-                SET password=".$ds->ds->qstr($password)."
-                WHERE userid=".$ds->ds->qstr($userid));
+                SET password=".$ds->ds->QMagic($password)."
+                WHERE userid=".$ds->ds->QMagic($userid));
         $ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
 
         if ($result) {
@@ -961,13 +961,13 @@
     $ds->DbfTransactionStart();
     // emulate mysql REPLACE
     $result=&$ds->ds->Execute("DELETE FROM usergrp
-            WHERE userid=".$ds->ds->qstr($userid)." AND
-            grp=".$ds->ds->qstr($grp));
+            WHERE userid=".$ds->ds->QMagic($userid)." AND
+            grp=".$ds->ds->QMagic($grp));
     $result=&$ds->ds->Execute("INSERT INTO usergrp
             (userid, grp)
             VALUES
-            (".$ds->ds->qstr($userid).",
-             ".$ds->ds->qstr($grp).")");
+            (".$ds->ds->QMagic($userid).",
+             ".$ds->ds->QMagic($grp).")");
 
     if ($result) {
         $ds->DbfTransactionEnd();
@@ -1007,11 +1007,11 @@
         }
 
         $result=&$ds->ds->Execute("UPDATE grp
-                SET grpdescrip=".$ds->ds->qstr($grpdescrip).",
-                createcust=".$ds->ds->qstr($createcust).",
+                SET grpdescrip=".$ds->ds->QMagic($grpdescrip).",
+                createcust=".$ds->ds->QMagic($createcust).",
                 grpopt=".$grpbit.",
                 resaddr=".$resaddr."
-                WHERE grp=".$ds->ds->qstr($grp));
+                WHERE grp=".$ds->ds->QMagic($grp));
 
         if ($result) {
             $ds->DbfTransactionEnd();
@@ -1037,7 +1037,7 @@
 
         // creating readonly group?
         if ($base == 0 and $size == 0) {
-            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->qstr($grp))) {
+            if ($ds->ds->GetOne("SELECT count(*) AS cnt FROM bounds WHERE grp=".$ds->ds->QMagic($grp))) {
                 $formerror .= my_("Boundary cannot be created - overlaps with existing boundary")."\n";
             }
         }
@@ -1065,7 +1065,7 @@
             $result=&$ds->ds->Execute("INSERT INTO bounds
                     (boundsaddr, boundssize, grp)
                     VALUES
-                    ($base, $size, ".$ds->ds->qstr($grp).")");
+                    ($base, $size, ".$ds->ds->QMagic($grp).")");
 
             if ($result) {
                 $ds->DbfTransactionEnd();
@@ -1090,7 +1090,7 @@
                 ($boundsaddr < boundsaddr AND
                  $boundsaddr+$boundssize >
                  boundsaddr + boundssize - 1)) AND
-            grp=".$ds->ds->qstr($grp));
+            grp=".$ds->ds->QMagic($grp));
     if ($result->FetchRow()) {
         return 1;
     }
@@ -1101,7 +1101,7 @@
     list($grp, $boundsaddr) = myRegister("S:grp S:boundsaddr");
 
     $result=&$ds->ds->Execute("DELETE FROM bounds
-            WHERE grp=".$ds->ds->qstr($grp)." AND boundsaddr=$boundsaddr");
+            WHERE grp=".$ds->ds->QMagic($grp)." AND boundsaddr=$boundsaddr");
 
     if ($result) {
         $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/auth.php ipplan/auth.php
--- ipplan.orig/auth.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/auth.php	2009-07-24 16:49:49.184261940 +0200
@@ -192,14 +192,14 @@
           $passwd=crypt($passwd, 'xq');
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
-                                   users.password=".$ds->qstr($passwd)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
+                                   users.password=".$ds->QMagic($passwd)." AND
                                    users.userid=usergrp.userid");
        }
        else {
           $result=$ds->Execute("SELECT usergrp.grp AS grp
                                 FROM users, usergrp
-                                WHERE users.userid=".$ds->qstr($user)." AND
+                                WHERE users.userid=".$ds->QMagic($user)." AND
                                    users.userid=usergrp.userid");
        }
        
diff -ruN ipplan.orig/class.dbflib.php ipplan/class.dbflib.php
--- ipplan.orig/class.dbflib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dbflib.php	2009-07-24 16:49:36.394261175 +0200
@@ -143,14 +143,14 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
         $result = &$this->ds->Execute("UPDATE ipaddr
-                SET userinf=".$this->ds->qstr($user).",
-                location=".$this->ds->qstr($location).",
-                telno=".$this->ds->qstr($telno).",
-                macaddr=".$this->ds->qstr($macaddr).",
-                descrip=".$this->ds->qstr($descrip).",
-                hname=".$this->ds->qstr($hname).",
+                SET userinf=".$this->ds->QMagic($user).",
+                location=".$this->ds->QMagic($location).",
+                telno=".$this->ds->QMagic($telno).",
+                macaddr=".$this->ds->QMagic($macaddr).",
+                descrip=".$this->ds->QMagic($descrip).",
+                hname=".$this->ds->QMagic($hname).",
                 lastmod=".$this->ds->DBTimeStamp(time()).",
-                userid=".$this->ds->qstr($userid)."
+                userid=".$this->ds->QMagic($userid)."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr");
         }
@@ -159,16 +159,16 @@
                     (userinf, location, telno, macaddr, descrip, hname,
                      baseindex, ipaddr, lastmod, userid)
                     VALUES
-                    (".$this->ds->qstr($user).",
-                     ".$this->ds->qstr($location).",
-                     ".$this->ds->qstr($telno).",
-                     ".$this->ds->qstr($macaddr).",
-                     ".$this->ds->qstr($descrip).",
-                     ".$this->ds->qstr($hname).",
+                    (".$this->ds->QMagic($user).",
+                     ".$this->ds->QMagic($location).",
+                     ".$this->ds->QMagic($telno).",
+                     ".$this->ds->QMagic($macaddr).",
+                     ".$this->ds->QMagic($descrip).",
+                     ".$this->ds->QMagic($hname).",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr($userid).")");
+                     ".$this->ds->QMagic($userid).")");
         }
 
         // always try to update record - record could not exist, which
@@ -183,7 +183,7 @@
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ipaddr")) {   // should have FOR UPDATE here!
             $result = &$this->ds->Execute("UPDATE ipaddradd
-                    SET info=".$this->ds->qstr($info)."
+                    SET info=".$this->ds->QMagic($info)."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ipaddr");
         // this generates a "duplicate key" error if no update
@@ -195,7 +195,7 @@
                 $result = &$this->ds->Execute("INSERT INTO ipaddradd
                         (info, baseindex, ipaddr)
                         VALUES
-                        (".$this->ds->qstr($info).",
+                        (".$this->ds->QMagic($info).",
                          $baseindex,
                          $ipaddr)");
             }
@@ -208,9 +208,9 @@
         $userid = getAuthUsername();
 
         $result = &$this->ds->Execute("UPDATE ipaddr
-                           SET $field=".$this->ds->qstr($value).",
+                           SET $field=".$this->ds->QMagic($value).",
                               lastmod=".$this->ds->DBTimeStamp(time()).",
-                              userid=".$this->ds->qstr($userid)."
+                              userid=".$this->ds->QMagic($userid)."
                            WHERE baseindex=$baseindex AND ipaddr=$ipaddr");
 
         // record does not exist, error
@@ -331,11 +331,11 @@
                                baseopt, customer, userid, lastmod)
                            VALUES
                               ($baseaddr, $subnetsize,
-                              ".$this->ds->qstr($descrip).",
-                              ".$this->ds->qstr($grp).",
+                              ".$this->ds->QMagic($descrip).",
+                              ".$this->ds->QMagic($grp).",
                                $dhcp,
                                $cust,
-                              ".$this->ds->qstr($userid).",
+                              ".$this->ds->QMagic($userid).",
                               ".$this->ds->DBTimeStamp(time()).")");
 
         if (DBF_TYPE == "mysql" or DBF_TYPE == "maxsql") {
@@ -360,7 +360,7 @@
                             WHERE base.baseindex=$baseindex AND
                                base.customer=customer.customer AND
                                customer.admingrp=usergrp.grp AND
-                               usergrp.userid=".$this->ds->qstr($userid));
+                               usergrp.userid=".$this->ds->QMagic($userid));
 
         if ($row = $result->FetchRow()) {
             return $row["admingrp"];
@@ -376,9 +376,9 @@
         // could use GetRow here
         $result = &$this->ds->Execute("SELECT usergrp.grp
                             FROM usergrp, grp
-                            WHERE usergrp.userid=".$this->ds->qstr($userid)." AND
+                            WHERE usergrp.userid=".$this->ds->QMagic($userid)." AND
                                usergrp.grp=grp.grp AND
-                               grp.createcust=".$this->ds->qstr('Y'));
+                               grp.createcust=".$this->ds->QMagic('Y'));
 
         if ($row = $result->FetchRow()) {
             return $row["grp"];
@@ -425,7 +425,7 @@
 
         $string = " IN (";
         foreach($grps as $value) {
-            $string .= $this->ds->qstr($value).",";
+            $string .= $this->ds->QMagic($value).",";
         }
         return substr($string, 0, -1).")";
     }
@@ -457,7 +457,7 @@
 
         $result = &$this->ds->Execute("SELECT count(*) AS cnt
                          FROM bounds
-                         WHERE grp=".$this->ds->qstr($grp));
+                         WHERE grp=".$this->ds->QMagic($grp));
         $row = $result->FetchRow();
         // no bounds, group can do anything
         if ($row["cnt"] == 0) {
@@ -470,7 +470,7 @@
                                   boundsaddr + boundssize - 1) AND
                                   ($boundsaddr+$boundssize-1 BETWEEN boundsaddr AND 
                                       boundsaddr + boundssize - 1)) AND
-                                  grp=".$this->ds->qstr($grp));
+                                  grp=".$this->ds->QMagic($grp));
 
         if ($result->FetchRow()) {
             return 1;
@@ -719,16 +719,16 @@
                     (userinf, location, telno, descrip, hname,
                      baseindex, ipaddr, lastmod, lastpol, userid)
                     VALUES
-                    (".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("").",
-                     ".$this->ds->qstr("Unknown - added by IPplan poller").",
-                     ".$this->ds->qstr("").",
+                    (".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("").",
+                     ".$this->ds->QMagic("Unknown - added by IPplan poller").",
+                     ".$this->ds->QMagic("").",
                      $baseindex, 
                      $ipaddr,
                      ".$this->ds->DBTimeStamp(time()).",
                      ".$this->ds->DBTimeStamp(time()).",
-                     ".$this->ds->qstr("POLLER").")");
+                     ".$this->ds->QMagic("POLLER").")");
         }
 
     }
@@ -942,8 +942,8 @@
                 $this->ds->Execute("INSERT INTO auditlog
                         (action, userid, dt)
                         VALUES
-                        (".$this->ds->qstr(substr($message,0,254)).",
-                         ".$this->ds->qstr(getAuthUsername()).",
+                        (".$this->ds->QMagic(substr($message,0,254)).",
+                         ".$this->ds->QMagic(getAuthUsername()).",
                          ".$this->ds->DBTimeStamp(time()).")");
             }
             else if (is_array($message)) {
@@ -960,8 +960,8 @@
                     $this->ds->Execute("INSERT INTO auditlog
                             (action, userid, dt)
                             VALUES
-                            (".$this->ds->qstr(substr($value,0,254)).",
-                             ".$this->ds->qstr(getAuthUsername()).",
+                            (".$this->ds->QMagic(substr($value,0,254)).",
+                             ".$this->ds->QMagic(getAuthUsername()).",
                              ".$this->ds->DBTimeStamp(time()).")");
                 }
 
@@ -983,10 +983,10 @@
         if (!empty($search)) {
             switch ($expr) {
                 case "NLIKE":
-                    $sql="$var NOT LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var NOT LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "EXACT":
-                    $sql="$var = ".$this->ds->qstr("$search");
+                    $sql="$var = ".$this->ds->QMagic("$search");
                     break;
                 case "RLIKE":
                 // default is RLIKE, need to protect for DBF's without RLIKE
@@ -994,11 +994,11 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var ~ ".$this->ds->qstr("$search");
+                        $sql="$var ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "NRLIKE":
@@ -1006,22 +1006,22 @@
                         return "";
                     }
                     if (DBF_TYPE=="mysql" or DBF_TYPE=="maxsql") {
-                        $sql="$var NOT RLIKE ".$this->ds->qstr("$search");
+                        $sql="$var NOT RLIKE ".$this->ds->QMagic("$search");
                         break;
                     }
                     if (DBF_TYPE=="postgres7") {
-                        $sql="$var NOT ~ ".$this->ds->qstr("$search");
+                        $sql="$var NOT ~ ".$this->ds->QMagic("$search");
                         break;
                     }
                 case "LIKE":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search%");
                     break;
                 case "END":
-                    $sql="$var LIKE ".$this->ds->qstr("%$search");
+                    $sql="$var LIKE ".$this->ds->QMagic("%$search");
                     break;
                 // default is START search
                 default:
-                    $sql="$var LIKE ".$this->ds->qstr("$search%");
+                    $sql="$var LIKE ".$this->ds->QMagic("$search%");
             }
             // should there be an AND?
             if ($addand) {
diff -ruN ipplan.orig/class.dnslib.php ipplan/class.dnslib.php
--- ipplan.orig/class.dnslib.php	2009-03-18 22:43:54.000000000 +0200
+++ ipplan/class.dnslib.php	2009-07-24 16:49:13.294270409 +0200
@@ -262,10 +262,10 @@
                      recordtype, userid, ip_hostname) ".
                     "VALUES ($this->cust, $dataid, ". $i.",".
                     $this->ds->DBTimeStamp(time()).",".
-                    $this->ds->qstr($host).",".
-                    $this->ds->qstr($recordtype).",".
-                    $this->ds->qstr(getAuthUsername()).",".
-                    $this->ds->qstr($iphostname).")" );
+                    $this->ds->QMagic($host).",".
+                    $this->ds->QMagic($recordtype).",".
+                    $this->ds->QMagic(getAuthUsername()).",".
+                    $this->ds->QMagic($iphostname).")" );
             if (!$result) {
                 return FALSE;
             }
@@ -288,7 +288,7 @@
                         (id, hname, horder)
                         VALUES
                         ($dataid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
                 if (!$result) {
                     return FALSE;
@@ -340,23 +340,23 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
                 ", serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",createmod=".$this->ds->DBDate($this->createmod).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
                 ",expiremod=".$this->ds->DBDate($this->expiremod).
                 ",regmod=".$this->ds->DBDate($this->regmod).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND data_id=".$dataid );
 
         if($this->ds->GetRow("SELECT info
@@ -364,7 +364,7 @@
                 WHERE customer=$cust AND
                 data_id=$dataid")) {   // should have FOR UPDATE here!
             $result = $this->ds->Execute("UPDATE fwdzoneadd ".
-                "set info=".$this->ds->qstr($this->info).
+                "set info=".$this->ds->QMagic($this->info).
                 " WHERE customer=$cust AND data_id=".$dataid );
         } 
         else {  // no record, insert
@@ -372,7 +372,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
         }
@@ -398,23 +398,23 @@
             createmod, lastmod, expiremod, regmod, serialdate, serialnum, ttl, refresh, retry, 
             expire, minimum, responsiblemail, userid, zonefilepath1, zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust,".
-                $this->ds->qstr($this->domain).",".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->domain).",".
+                $this->ds->QMagic("E").",".
                 $this->ds->DBDate($this->createmod).",".
                 $this->ds->DBTimeStamp(time()).",".
                 $this->ds->DBDate($this->expiremod).",".
                 $this->ds->DBDate($this->regmod).",".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -427,7 +427,7 @@
                 $result=$this->ds->Execute("SELECT data_id 
                         FROM fwdzone
                         WHERE customer=$this->cust AND 
-                        domain=".$this->ds->qstr($this->domain));
+                        domain=".$this->ds->QMagic($this->domain));
                 $temprow = $result->FetchRow();
                 $dataid=$temprow["data_id"];
             }
@@ -436,7 +436,7 @@
                 $result = $this->ds->Execute("INSERT into fwdzoneadd (customer, data_id, info) ".
                         "VALUES ($this->cust,".
                         $dataid.",".
-                        $this->ds->qstr($this->info).")" );
+                        $this->ds->QMagic($this->info).")" );
             }
 
             return $dataid;
@@ -465,7 +465,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT domain FROM fwdzone 
-                WHERE customer=$cust AND domain = ".$this->ds->qstr($this->domain));
+                WHERE customer=$cust AND domain = ".$this->ds->QMagic($this->domain));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -499,11 +499,11 @@
                         (data_id, host, recordtype, ip_hostname, sortorder, customer, userid, lastmod)
                         SELECT $dataid AS data_id, fwdzonerec.host, fwdzonerec.recordtype, 
                             fwdzonerec.ip_hostname, fwdzonerec.sortorder, fwdzonerec.customer, 
-                            ".$this->ds->qstr(getAuthUsername())." AS userid,
+                            ".$this->ds->QMagic(getAuthUsername())." AS userid,
                             ".$this->ds->DBTimeStamp(time())." AS lastmod
                         FROM fwdzonerec, fwdzone
                         WHERE fwdzonerec.data_id=fwdzone.data_id AND 
-                            fwdzone.domain=".$this->ds->qstr("template.com"));
+                            fwdzone.domain=".$this->ds->QMagic("template.com"));
 
                 }
                 $this->err = 0;
@@ -526,9 +526,9 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
-                ", error_message=".$this->ds->qstr("").
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
+                ", error_message=".$this->ds->QMagic("").
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
                 ", serialnum=$this->serialnum".
                 " WHERE customer=$cust AND data_id=".$dataid);
@@ -798,7 +798,7 @@
                         (id, hname, horder)
                         VALUES
                         ($zoneid,
-                         ".$this->ds->qstr($hnametemp).",
+                         ".$this->ds->QMagic($hnametemp).",
                          $i)");
 
                 if (!$result) {
@@ -854,22 +854,22 @@
 
         // Updated DB here.
         $result = $this->ds->Execute("UPDATE zones SET zoneip=$zoneip".
-                ",zone=".$this->ds->qstr($this->zone).
+                ",zone=".$this->ds->QMagic($this->zone).
                 ",zonesize=$size".
-                ",serialdate=".$this->ds->qstr($this->serialdate).
+                ",serialdate=".$this->ds->QMagic($this->serialdate).
                 ",serialnum=$this->serialnum".
                 ",ttl=".$this->ttl.
                 ",refresh=".$this->refresh.
                 ",retry=".$this->retry.
                 ",expire=".$this->expire.
                 ",minimum=".$this->minimum.
-                ",error_message=".$this->ds->qstr("E").
-                ",responsiblemail=".$this->ds->qstr($this->responsiblemail).
-                ",userid=".$this->ds->qstr(getAuthUsername()).
-                ",zonefilepath1=".$this->ds->qstr($this->zonepath).
-                ",zonefilepath2=".$this->ds->qstr($this->seczonepath).
+                ",error_message=".$this->ds->QMagic("E").
+                ",responsiblemail=".$this->ds->QMagic($this->responsiblemail).
+                ",userid=".$this->ds->QMagic(getAuthUsername()).
+                ",zonefilepath1=".$this->ds->QMagic($this->zonepath).
+                ",zonefilepath2=".$this->ds->QMagic($this->seczonepath).
                 ",lastmod=".$this->ds->DBTimeStamp(time()).
-                ",slaveonly=".$this->ds->qstr($this->slaveonly).
+                ",slaveonly=".$this->ds->QMagic($this->slaveonly).
                 " WHERE customer=$cust AND id=".$zoneid );
 
         // delete all the DNS records first to preserve correct order
@@ -896,20 +896,20 @@
                  lastmod, responsiblemail, userid, zonefilepath1, 
                  zonefilepath2, slaveonly) ".
                 "VALUES ($this->cust, $this->zoneip,".
-                $this->ds->qstr($this->zone).", $this->size,".
-                $this->ds->qstr($this->serialdate).", $this->serialnum,".
-                $this->ds->qstr("E").",".
+                $this->ds->QMagic($this->zone).", $this->size,".
+                $this->ds->QMagic($this->serialdate).", $this->serialnum,".
+                $this->ds->QMagic("E").",".
                 $this->ttl.",".
                 $this->refresh.",".
                 $this->retry.",".
                 $this->expire.",".
                 $this->minimum.",".
                 $this->ds->DBTimeStamp(time()).",".
-                $this->ds->qstr($this->responsiblemail).",".
-                $this->ds->qstr(getAuthUsername()).",".
-                $this->ds->qstr($this->zonepath).",".
-                $this->ds->qstr($this->seczonepath).",".
-                $this->ds->qstr($this->slaveonly).")" );
+                $this->ds->QMagic($this->responsiblemail).",".
+                $this->ds->QMagic(getAuthUsername()).",".
+                $this->ds->QMagic($this->zonepath).",".
+                $this->ds->QMagic($this->seczonepath).",".
+                $this->ds->QMagic($this->slaveonly).")" );
 
         // did not fail due to key error?
         // should not fail as we checked this already!
@@ -953,7 +953,7 @@
         // could use unique key on database to do check, but requires extra key
         // just to add a new record
         $restemp=$this->ds->Execute("SELECT zone FROM zones
-                WHERE customer=$cust AND zone = ".$this->ds->qstr($this->zone));
+                WHERE customer=$cust AND zone = ".$this->ds->QMagic($this->zone));
 
         if ($restemp->FetchRow()) {
             // domain already exists, fail transaction
@@ -999,10 +999,10 @@
         $this->Serial();
 
         $result = $this->ds->Execute("UPDATE zones ".
-                "set serialdate=".$this->ds->qstr($this->serialdate).
-                ", userid=".$this->ds->qstr(getAuthUsername()).
+                "set serialdate=".$this->ds->QMagic($this->serialdate).
+                ", userid=".$this->ds->QMagic(getAuthUsername()).
                 ", lastexp=".$this->ds->DBTimeStamp(time()).
-                ", error_message=".$this->ds->qstr("").
+                ", error_message=".$this->ds->QMagic("").
                 ", serialnum=$this->serialnum ".
                 " WHERE customer=$cust AND id=$zoneid");
 
@@ -1155,8 +1155,8 @@
 
         // Update DNS Database Serial Count.  Update Serial Count only when we export.
         $result = $this->ds->Execute("UPDATE fwdzone ".
-        "set serialdate=".$this->ds->qstr($this->serialdate).
-        ", userid=".$this->ds->qstr(getAuthUsername()).
+        "set serialdate=".$this->ds->QMagic($this->serialdate).
+        ", userid=".$this->ds->QMagic(getAuthUsername()).
         ", serialnum=$this->serialnum".
         " WHERE customer=$cust AND data_id=".$zoneid);
 
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
--- ipplan.orig/contrib/ipplan-poller.php	2009-07-24 16:35:37.098269923 +0200
+++ ipplan/contrib/ipplan-poller.php	2009-07-24 16:48:58.061261570 +0200
@@ -242,7 +242,7 @@
 
                 if ($hostnames) {
                     $result = $ds->Execute("UPDATE ipaddr
-                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->qstr($hname)."
+                            SET lastpol=".$ds->DBTimeStamp(time()).", hname=".$ds->QMagic($hname)."
                             WHERE baseindex=$baseindex AND
                             ipaddr=$ipaddr");
                 }
@@ -258,23 +258,23 @@
                             (userinf, location, telno, descrip, hname,
                              baseindex, ipaddr, lastmod, lastpol, userid)
                             VALUES
-                            (".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("").",
-                             ".$ds->qstr("Unknown - added by IPplan command line poller").",
-                             ".$ds->qstr($hname).",
+                            (".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("").",
+                             ".$ds->QMagic("Unknown - added by IPplan command line poller").",
+                             ".$ds->QMagic($hname).",
                              $baseindex, 
                              $ipaddr,
                              ".$ds->DBTimeStamp(time()).",
                              ".$ds->DBTimeStamp(time()).",
-                             ".$ds->qstr("POLLER").")");
+                             ".$ds->QMagic("POLLER").")");
 
                     if ($audit) {
                         $ds->Execute("INSERT INTO auditlog
                                 (action, userid, dt)
                                 VALUES
-                                (".$ds->qstr(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
-                                 ".$ds->qstr("POLLER").",
+                                (".$ds->QMagic(sprintf("User POLLER added ip record %s customer %u index %u", $key, $cust, $baseindex)).",
+                                 ".$ds->QMagic("POLLER").",
                                  ".$ds->DBTimeStamp(time()).")");
                     }
                 }
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
--- ipplan.orig/user/createarea.php	2009-07-24 16:35:37.104261224 +0200
+++ ipplan/user/createarea.php	2009-07-24 16:45:44.647275743 +0200
@@ -84,7 +84,7 @@
       $ds->DbfTransactionStart();
       if ($action=="modify") {
           $result=&$ds->ds->Execute("UPDATE area SET areaaddr=$base, 
-                  descrip=".$ds->ds->qstr($descrip)." WHERE areaindex=$areaindex") and
+                  descrip=".$ds->ds->QMagic($descrip)." WHERE areaindex=$areaindex") and
           $ds->AuditLog(array("event"=>151, "action"=>"modify area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
@@ -93,7 +93,7 @@
           $result=&$ds->ds->Execute("INSERT INTO area
                   (areaaddr, descrip, customer)
                   VALUES
-                  ($base, ".$ds->ds->qstr($descrip).", $cust)") and
+                  ($base, ".$ds->ds->QMagic($descrip).", $cust)") and
           $ds->AuditLog(array("event"=>150, "action"=>"create area", 
                     "descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
                     "cust"=>$cust));
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
--- ipplan.orig/user/createrange.php	2009-07-24 16:35:37.106272084 +0200
+++ ipplan/user/createrange.php	2009-07-24 16:45:10.911264478 +0200
@@ -166,7 +166,7 @@
         if ($action=="modify") {
 
             $result=&$ds->ds->Execute("UPDATE netrange SET areaindex=$areaindex, 
-                    descrip=".$ds->ds->qstr($descrip).",
+                    descrip=".$ds->ds->QMagic($descrip).",
                     rangeaddr=$base, rangesize=$size
                     WHERE rangeindex=$rangeindex") and
                 $ds->AuditLog(array("event"=>161, "action"=>"modify range", 
@@ -179,7 +179,7 @@
                      customer)
                     VALUES
                     ($base, $size, $areaindex,
-                     ".$ds->ds->qstr($descrip).",
+                     ".$ds->ds->QMagic($descrip).",
                      $cust)") and
                     $ds->AuditLog(array("event"=>160, "action"=>"create range", 
                                 "descrip"=>$descrip, "user"=>getAuthUsername(), "areaindex"=>$areaindex,
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
--- ipplan.orig/user/createsubnet.php	2009-07-24 16:35:37.111261269 +0200
+++ ipplan/user/createsubnet.php	2009-07-24 16:47:00.295261634 +0200
@@ -219,7 +219,7 @@
                 $result = &$ds->ds->Execute("INSERT INTO baseadd
                         (info, baseindex)
                         VALUES
-                        (".$ds->ds->qstr($info).", $id)");
+                        (".$ds->ds->QMagic($info).", $id)");
             }
 
             $ds->DbfTransactionEnd();
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
--- ipplan.orig/user/displaysubnet.php	2009-07-24 16:35:37.134260756 +0200
+++ ipplan/user/displaysubnet.php	2009-07-24 16:45:26.829261752 +0200
@@ -221,7 +221,7 @@
                                     WHERE base.customer=$cust AND
                                     base.baseindex=ipaddr.baseindex AND
                                     ipaddr.ipaddr!=$ip AND
-                                    ipaddr.macaddr=".$ds->ds->qstr($macaddr))) {
+                                    ipaddr.macaddr=".$ds->ds->QMagic($macaddr))) {
                             $formerror .= sprintf(my_("Duplicate MAC address: %s"), $oldmacaddr)."\n";
                             insert($w,anchor("searchall.php?cust=".$cust."&field=macaddr&search=".$macaddr,
                                 my_("Show duplicate MAC addresses")));
@@ -302,7 +302,7 @@
                                     WHERE requestindex=$request");
                             $gw=$ds->ds->GetOne("SELECT ipaddr FROM ipaddr
                                     WHERE baseindex=$baseindex AND 
-                                       descrip LIKE ".$ds->ds->qstr("GW%"));
+                                       descrip LIKE ".$ds->ds->QMagic("GW%"));
 
                             $body="?Subject=IP address request actioned&body=";
                             $body2="The request details submitted: $requestdesc\n\n";
@@ -925,15 +925,15 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.error_message=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.error_message=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot delete
         if($recs == 1) {
             $row=$result->FetchRow();
@@ -944,7 +944,7 @@
 
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$recidx") and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dom_id) and
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
                             "user"=>getAuthUsername(), "id"=>$recidx));
@@ -979,13 +979,13 @@
                 FROM fwdzone, fwdzonerec 
                 WHERE fwdzone.data_id=fwdzonerec.data_id AND
                 fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
 
         $recs=$result->PO_RecordCount("fwdzone, fwdzonerec", 
                 "fwdzone.data_id=fwdzonerec.data_id AND fwdzone.customer=$cust AND
-                fwdzonerec.recordtype=".$ds->ds->qstr("A")." AND 
-                fwdzonerec.ip_hostname=".$ds->ds->qstr(inet_ntoa($ip)));
+                fwdzonerec.recordtype=".$ds->ds->QMagic("A")." AND 
+                fwdzonerec.ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip)));
         // must be exactly one A record on one domain else cannot update
         if($recs == 1) {
             // does domain name of record match ip records hostname?
@@ -1005,13 +1005,13 @@
             }
 
             insert($w,textbr(my_("IP hostname field in DNS forward zone modified")));
-            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->qstr($hnametmp).",
+            $ds->ds->Execute("UPDATE fwdzonerec SET host=".$ds->ds->QMagic($hnametmp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
-                    userid=".$ds->ds->qstr(getAuthUsername())."
+                    userid=".$ds->ds->QMagic(getAuthUsername())."
                     WHERE customer=$cust AND
-                    recordtype=".$ds->ds->qstr("A")." AND 
-                    ip_hostname=".$ds->ds->qstr(inet_ntoa($ip))) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                    recordtype=".$ds->ds->QMagic("A")." AND 
+                    ip_hostname=".$ds->ds->QMagic(inet_ntoa($ip))) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
@@ -1042,12 +1042,12 @@
             $result = &$ds->ds->Execute("SELECT length(domain) AS domainlen, data_id, domain
                     FROM fwdzone
                     WHERE customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain
+                    ".$ds->ds->QMagic($hname."$")." $regex domain
                     ORDER BY domainlen DESC");
 
             $recs=$result->PO_RecordCount("fwdzone", 
                     "customer=$cust AND
-                    ".$ds->ds->qstr($hname."$")." $regex domain");
+                    ".$ds->ds->QMagic($hname."$")." $regex domain");
 
             // must be exactly one matching zone only, or more than one zone
             // sorted DESC. If second case, use first record for longest match
@@ -1063,12 +1063,12 @@
                          recordtype, error_message, userid, ip_hostname) ".
                         "VALUES ($cust, $dataid, 9999,".
                         $ds->ds->DBTimeStamp(time()).",".
-                        $ds->ds->qstr($hnametmp).",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr("A").",".
-                        $ds->ds->qstr(getAuthUsername()).",".
-                        $ds->ds->qstr(inet_ntoa($ip)).")" ) and
-            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->qstr("E").
+                        $ds->ds->QMagic($hnametmp).",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic("A").",".
+                        $ds->ds->QMagic(getAuthUsername()).",".
+                        $ds->ds->QMagic(inet_ntoa($ip)).")" ) and
+            $ds->ds->Execute("UPDATE fwdzone SET error_message=".$ds->ds->QMagic("E").
                     " WHERE customer=$cust AND data_id=".$dataid) and
             $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
                     "user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
--- ipplan.orig/user/exportdhcp.php	2009-07-24 16:35:37.142261270 +0200
+++ ipplan/user/exportdhcp.php	2009-07-24 16:47:14.257261620 +0200
@@ -150,7 +150,7 @@
     $result_ip=&$ds->ds->Execute("SELECT ipaddr, macaddr, hname
             FROM ipaddr
             WHERE baseindex=$baseindex AND
-            userinf LIKE ".$ds->ds->qstr("%".DHCPRESERVED."%")."
+            userinf LIKE ".$ds->ds->QMagic("%".DHCPRESERVED."%")."
             ORDER BY ipaddr");
 
     $iprange_dynamicIPs=array();
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
--- ipplan.orig/user/modifybase.php	2009-07-24 16:35:37.157277068 +0200
+++ ipplan/user/modifybase.php	2009-07-24 16:48:36.765261577 +0200
@@ -224,7 +224,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size*2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
 
         $ds->AuditLog(array("event"=>173, "action"=>"join subnet", 
@@ -240,7 +240,7 @@
         $result=&$ds->ds->Execute("UPDATE base
                 SET subnetsize=$size/2,
                 lastmod=".$ds->ds->DBTimeStamp(time()).",
-                userid=".$ds->ds->qstr(getAuthUsername())."
+                userid=".$ds->ds->QMagic(getAuthUsername())."
                 WHERE baseindex=$baseindex");
         // ... and create new subnet
         $timetmp=time();
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
--- ipplan.orig/user/modifycustomer.php	2009-07-24 16:35:37.160261295 +0200
+++ ipplan/user/modifycustomer.php	2009-07-24 16:48:21.805261227 +0200
@@ -126,9 +126,9 @@
             $result=&$ds->ds->Execute("INSERT INTO customer
                     (custdescrip, crm, admingrp)
                     VALUES
-                    (".$ds->ds->qstr($custdescrip).",
-                     ".$ds->ds->qstr($crm).",
-                     ".$ds->ds->qstr($grp).")");
+                    (".$ds->ds->QMagic($custdescrip).",
+                     ".$ds->ds->QMagic($crm).",
+                     ".$ds->ds->QMagic($grp).")");
 
             // did not fail due to key error?
             if ($result) {
@@ -139,7 +139,7 @@
                     // emulate getting the last insert_id
                     $result=&$ds->ds->Execute("SELECT customer 
                             FROM customer
-                            WHERE custdescrip=".$ds->ds->qstr($custdescrip));
+                            WHERE custdescrip=".$ds->ds->QMagic($custdescrip));
                     $temprow = $result->FetchRow();
                     $cust=$temprow["customer"];
                 }
@@ -160,9 +160,9 @@
             }
 
             $result=&$ds->ds->Execute("UPDATE customer
-                    SET custdescrip=".$ds->ds->qstr($custdescrip).",
-                    crm=".$ds->ds->qstr($crm).",
-                    admingrp=".$ds->ds->qstr($grp)."
+                    SET custdescrip=".$ds->ds->QMagic($custdescrip).",
+                    crm=".$ds->ds->QMagic($crm).",
+                    admingrp=".$ds->ds->QMagic($grp)."
                     WHERE customer=$cust");
 
             // did not fail due to key error?
@@ -176,7 +176,7 @@
         // test for CRM duplicates - this is not a unique key and cannot be 
         if (!empty($crm)) {
             $recs=$ds->ds->GetOne("SELECT count(*) AS cnt FROM customer 
-                    WHERE crm=".$ds->ds->qstr($crm));
+                    WHERE crm=".$ds->ds->QMagic($crm));
             if ($recs > 1) {  //duplicate ?
                 insert($w,text(my_("The CRM field has already been used for another customer"), array("color"=>"#FF0000")));
                 insert($w,textbr());
@@ -200,25 +200,25 @@
                      phne, mbox)
                     VALUES
                     ($cust,
-                     ".$ds->ds->qstr("").",
-                     ".$ds->ds->qstr($org).",
-                     ".$ds->ds->qstr($street).",
-                     ".$ds->ds->qstr($city).",
-                     ".$ds->ds->qstr($state).",
-                     ".$ds->ds->qstr($zipcode).",
-                     ".$ds->ds->qstr($cntry).",
-                     ".$ds->ds->qstr($nichandl).",
-                     ".$ds->ds->qstr($lname).",
-                     ".$ds->ds->qstr($fname).",
-                     ".$ds->ds->qstr($mname).",
-                     ".$ds->ds->qstr($torg).",
-                     ".$ds->ds->qstr($tstreet).",
-                     ".$ds->ds->qstr($tcity).",
-                     ".$ds->ds->qstr($tstate).",
-                     ".$ds->ds->qstr($tzipcode).",
-                     ".$ds->ds->qstr($tcntry).",
-                     ".$ds->ds->qstr($phne).",
-                     ".$ds->ds->qstr($mbox).")");
+                     ".$ds->ds->QMagic("").",
+                     ".$ds->ds->QMagic($org).",
+                     ".$ds->ds->QMagic($street).",
+                     ".$ds->ds->QMagic($city).",
+                     ".$ds->ds->QMagic($state).",
+                     ".$ds->ds->QMagic($zipcode).",
+                     ".$ds->ds->QMagic($cntry).",
+                     ".$ds->ds->QMagic($nichandl).",
+                     ".$ds->ds->QMagic($lname).",
+                     ".$ds->ds->QMagic($fname).",
+                     ".$ds->ds->QMagic($mname).",
+                     ".$ds->ds->QMagic($torg).",
+                     ".$ds->ds->QMagic($tstreet).",
+                     ".$ds->ds->QMagic($tcity).",
+                     ".$ds->ds->QMagic($tstate).",
+                     ".$ds->ds->QMagic($tzipcode).",
+                     ".$ds->ds->QMagic($tcntry).",
+                     ".$ds->ds->QMagic($phne).",
+                     ".$ds->ds->QMagic($mbox).")");
 
             // delete all the DNS records first to preserve correct order
             $result=&$ds->ds->Execute("DELETE FROM revdns
@@ -235,8 +235,8 @@
                             (customer, hname, ipaddr, horder)
                             VALUES
                             ($cust,
-                             ".$ds->ds->qstr($hnametemp).",
-                             ".$ds->ds->qstr($ipaddrtemp).",
+                             ".$ds->ds->QMagic($hnametemp).",
+                             ".$ds->ds->QMagic($ipaddrtemp).",
                              $i)");
                 }
             }
@@ -245,7 +245,7 @@
                         FROM custadd
                         WHERE customer=$cust")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE custadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE customer=$cust");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -256,7 +256,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO custadd
                             (info, customer)
                             VALUES
-                            (".$ds->ds->qstr($info).", $cust)");
+                            (".$ds->ds->QMagic($info).", $cust)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
--- ipplan.orig/user/modifydns.php	2009-07-24 16:35:37.165261158 +0200
+++ ipplan/user/modifydns.php	2009-07-24 16:47:32.669263630 +0200
@@ -245,10 +245,10 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $ds->dataid, 9999,".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".               // myhost or myhost.mydomain.com.
-            $ds->ds->qstr($recordtype).",".         // A, MX, NS
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" );       // ip address for A, or 10 myhost for MX
+            $ds->ds->QMagic($host).",".               // myhost or myhost.mydomain.com.
+            $ds->ds->QMagic($recordtype).",".         // A, MX, NS
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" );       // ip address for A, or 10 myhost for MX
             */
 
             $ds->AuditLog(array("event"=>111, "action"=>"add forward zone", "cust"=>$cust,
@@ -316,7 +316,7 @@
     if ($dataid==0) {
         $dataid = &$ds->ds->GetCol("SELECT data_id
                 FROM fwdzone 
-                WHERE customer=$cust AND error_message=".$ds->ds->qstr("E")."
+                WHERE customer=$cust AND error_message=".$ds->ds->QMagic("E")."
                 ORDER BY domain ");
     }
     
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
--- ipplan.orig/user/modifydnsrecord.php	2009-07-24 16:35:37.170261039 +0200
+++ ipplan/user/modifydnsrecord.php	2009-07-24 16:46:37.127261298 +0200
@@ -81,7 +81,7 @@
 if ($action=="delete") {
     if (!$dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain))) {
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain))) {
         myError($w,$p, my_("Could not find the zone - possibly deleted by another user"));
     }
 
@@ -110,7 +110,7 @@
                     $baseindex=$row1["baseindex"];
 
                     $ds->ds->Execute("UPDATE ipaddr
-                            SET hname=".$ds->ds->qstr($row["host"])."
+                            SET hname=".$ds->ds->QMagic($row["host"])."
                             WHERE baseindex=$baseindex AND ipaddr=".inet_aton($row["ip_hostname"]));
                     insert($w,textbr(sprintf(my_("IP record %s updated in subnet '%s' due to deletion of auto created A record"), $row["ip_hostname"], $row1["descrip"])));
                 }
@@ -118,7 +118,7 @@
             $result = &$ds->ds->Execute("DELETE FROM fwdzonerec 
                     WHERE customer=$cust AND recidx=$value") and
             $ds->ds->Execute("UPDATE fwdzone 
-                    SET error_message=".$ds->ds->qstr("E").",
+                    SET error_message=".$ds->ds->QMagic("E").",
                     lastmod=".$ds->ds->DBTimeStamp(time()).
                     " WHERE customer=$cust AND data_id=".$dom_id) and 
             $ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
@@ -161,7 +161,7 @@
     $result = &$ds->ds->Execute("SELECT fwdzonerec.recidx, fwdzonerec.sortorder 
             FROM fwdzone, fwdzonerec
             WHERE fwdzone.customer=$cust AND 
-            fwdzone.domain=".$ds->ds->qstr($domain)." AND
+            fwdzone.domain=".$ds->ds->QMagic($domain)." AND
             fwdzone.data_id=fwdzonerec.data_id
             ORDER by fwdzonerec.sortorder");
 
@@ -297,14 +297,14 @@
     $result = &$ds->ds->Execute("SELECT customer 
                                 FROM fwdzonerec 
                                 WHERE customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
 
     $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND data_id=$zoneid AND
-            host=".$ds->ds->qstr($host)." AND
-            recordtype=".$ds->ds->qstr($recordtype)." AND 
-            ip_hostname=".$ds->ds->qstr($iphostname));
+            host=".$ds->ds->QMagic($host)." AND
+            recordtype=".$ds->ds->QMagic($recordtype)." AND 
+            ip_hostname=".$ds->ds->QMagic($iphostname));
     if($recs > 0) {
         myError($w,$p, my_("Cannot create duplicate records"));
     }
@@ -317,12 +317,12 @@
         $result = &$ds->ds->Execute("SELECT ip_hostname 
                 FROM fwdzonerec 
                 WHERE customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
 
         $recs=$result->PO_RecordCount("fwdzonerec", "customer=$cust AND
-                recordtype=".$ds->ds->qstr("A")." AND 
-                ip_hostname=".$ds->ds->qstr($iphostname));
+                recordtype=".$ds->ds->QMagic("A")." AND 
+                ip_hostname=".$ds->ds->QMagic($iphostname));
         if($recs == 1) {
             $updateiprec=1;
         }
@@ -361,12 +361,12 @@
              recordtype, userid, ip_hostname) ".
             "VALUES ($cust, $zoneid, ". $sortorder.",".
             $ds->ds->DBTimeStamp(time()).",".
-            $ds->ds->qstr($host).",".
-            $ds->ds->qstr($recordtype).",".
-            $ds->ds->qstr(getAuthUsername()).",".
-            $ds->ds->qstr($iphostname).")" ) and
+            $ds->ds->QMagic($host).",".
+            $ds->ds->QMagic($recordtype).",".
+            $ds->ds->QMagic(getAuthUsername()).",".
+            $ds->ds->QMagic($iphostname).")" ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
@@ -392,7 +392,7 @@
     }
     $dom_id=$ds->ds->GetOne("SELECT data_id
                 FROM fwdzone
-                WHERE customer=$cust AND domain=".$ds->ds->qstr($domain));
+                WHERE customer=$cust AND domain=".$ds->ds->QMagic($domain));
 
     // Updated DB here.
     // Log the Transaction.
@@ -411,14 +411,14 @@
     }
 
     $result = &$ds->ds->Execute("UPDATE fwdzonerec SET sortorder=".$sortorder.
-            ", host=".$ds->ds->qstr($host).
+            ", host=".$ds->ds->QMagic($host).
             ", lastmod=".$ds->ds->DBTimeStamp(time()).
-            ", recordtype=".$ds->ds->qstr($recordtype).
-            ", userid=".$ds->ds->qstr(getAuthUsername()).
-            ", ip_hostname=".$ds->ds->qstr($iphostname).
+            ", recordtype=".$ds->ds->QMagic($recordtype).
+            ", userid=".$ds->ds->QMagic(getAuthUsername()).
+            ", ip_hostname=".$ds->ds->QMagic($iphostname).
             " WHERE customer=$cust AND recidx=".$dataid ) and
         $ds->ds->Execute("UPDATE fwdzone 
-            SET error_message=".$ds->ds->qstr("E").",
+            SET error_message=".$ds->ds->QMagic("E").",
             lastmod=".$ds->ds->DBTimeStamp(time()).
             " WHERE customer=$cust AND data_id=".$dom_id) and
         $ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
@@ -458,7 +458,7 @@
 
 $result = &$ds->ds->Execute("SELECT domain, data_id FROM fwdzone 
                             WHERE customer=$cust AND 
-                            slaveonly=".$ds->ds->qstr("N")."
+                            slaveonly=".$ds->ds->QMagic("N")."
                             ORDER BY domain");
 if (!$result) {
    myError($w,$p, my_("No domains found. Create some domains and try again."));
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
--- ipplan.orig/user/modifyipform.php	2009-07-24 16:35:37.175260999 +0200
+++ ipplan/user/modifyipform.php	2009-07-24 16:47:47.499261554 +0200
@@ -192,7 +192,7 @@
 
             // add serialized info from file upload
             $ds->ds->Execute("UPDATE ipaddradd
-                    SET infobin=".$ds->ds->qstr(serialize($files))."
+                    SET infobin=".$ds->ds->QMagic(serialize($files))."
                     WHERE baseindex=$baseindex AND
                     ipaddr=$ip");
             // this generates a "duplicate key" error if no update
@@ -202,7 +202,7 @@
                 $ds->ds->Execute("INSERT INTO ipaddradd
                         (infobin, baseindex, ipaddr)
                         VALUES
-                        (".$ds->ds->qstr(serialize($files)).",
+                        (".$ds->ds->QMagic(serialize($files)).",
                          $baseindex,
                          $ip)");
             }
@@ -235,7 +235,7 @@
 
         // add serialized info after file deteled
         $ds->ds->Execute("UPDATE ipaddradd
-                SET infobin=".$ds->ds->qstr(empty($files) ? "" : serialize($files))."
+                SET infobin=".$ds->ds->QMagic(empty($files) ? "" : serialize($files))."
                 WHERE baseindex=$baseindex AND
                 ipaddr=$ip") and
             $ds->AuditLog(array("event"=>141, "action"=>"delete file", 
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
--- ipplan.orig/user/modifysubnet.php	2009-07-24 16:35:37.177261840 +0200
+++ ipplan/user/modifysubnet.php	2009-07-24 16:44:56.606265283 +0200
@@ -129,11 +129,11 @@
                 // between base and baseadd is baseindex column
                 if ($duplicatesubnet==0) {
                     $result=&$ds->ds->Execute("UPDATE base
-                            SET descrip=".$ds->ds->qstr($descrip).",
-                            admingrp=".$ds->ds->qstr($grp).",
+                            SET descrip=".$ds->ds->QMagic($descrip).",
+                            admingrp=".$ds->ds->QMagic($grp).",
                             customer=$cust,
                             lastmod=".$ds->ds->DBTimeStamp(time()).",
-                            userid=".$ds->ds->qstr($userid)."
+                            userid=".$ds->ds->QMagic($userid)."
                             WHERE baseindex=$baseindex");
                     
                     $ds->AuditLog(array("event"=>174, "action"=>"move subnet", 
@@ -163,13 +163,13 @@
                                         (ipaddr, userinf, location, telno,
                                          descrip, lastmod, userid, baseindex)
                                         VALUES
-                                        (".$ds->ds->qstr($tempipaddr).",
-                                         ".$ds->ds->qstr($tempuser).",
-                                         ".$ds->ds->qstr($templocation).",
-                                         ".$ds->ds->qstr($temptelno).",
-                                         ".$ds->ds->qstr($tempdescrip).",
+                                        (".$ds->ds->QMagic($tempipaddr).",
+                                         ".$ds->ds->QMagic($tempuser).",
+                                         ".$ds->ds->QMagic($templocation).",
+                                         ".$ds->ds->QMagic($temptelno).",
+                                         ".$ds->ds->QMagic($tempdescrip).",
                                          $templastmod,
-                                         ".$ds->ds->qstr($tempuserid).",
+                                         ".$ds->ds->QMagic($tempuserid).",
                                          $id)");
                             } // end while
                         }
@@ -206,11 +206,11 @@
 
             $ds->DbfTransactionStart();
             $result=&$ds->ds->Execute("UPDATE base
-                    SET descrip=".$ds->ds->qstr($descrip).",
-                    admingrp=".$ds->ds->qstr($grp).",
+                    SET descrip=".$ds->ds->QMagic($descrip).",
+                    admingrp=".$ds->ds->QMagic($grp).",
                     lastmod=".$ds->ds->DBTimeStamp(time()).",
                     baseopt=$dhcp,
-                    userid=".$ds->ds->qstr($userid)."
+                    userid=".$ds->ds->QMagic($userid)."
                     WHERE baseindex=$baseindex") and
                 $ds->AuditLog(array("event"=>171, "action"=>"modify subnet", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "baseaddr"=>inet_ntoa($base),
@@ -242,7 +242,7 @@
                         FROM baseadd
                         WHERE baseindex=$baseindex")) {   // should have FOR UPDATE here!
                 $result = &$ds->ds->Execute("UPDATE baseadd
-                        SET info=".$ds->ds->qstr($info)."
+                        SET info=".$ds->ds->QMagic($info)."
                         WHERE baseindex=$baseindex");
             // this generates a "duplicate key" error if no update
             // should be OK under normal circumstances, but generates error under
@@ -253,7 +253,7 @@
                     $result = &$ds->ds->Execute("INSERT INTO baseadd
                             (info, baseindex)
                             VALUES
-                            (".$ds->ds->qstr($info).", $baseindex)");
+                            (".$ds->ds->QMagic($info).", $baseindex)");
                 }
             }
 
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
--- ipplan.orig/user/modifyzone.php	2009-07-24 16:35:37.182261244 +0200
+++ ipplan/user/modifyzone.php	2009-07-24 16:46:00.574261375 +0200
@@ -276,7 +276,7 @@
                 WHERE zones.customer=base.customer AND 
                 base.baseindex=ipaddr.baseindex AND 
                 zones.customer=$cust AND
-                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->qstr("E").") AND
+                ($sqlfn >= zones.serialdate OR zones.error_message=".$ds->ds->QMagic("E").") AND
                 ipaddr.ipaddr >= zones.zoneip AND 
                 ipaddr.ipaddr < zones.zoneip+zones.zonesize");
     }
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php	2009-07-24 16:35:37.186261178 +0200
+++ ipplan/user/requestip.php	2009-07-24 16:46:16.008271108 +0200
@@ -120,14 +120,14 @@
                  hname, telno, macaddr, info)
                 VALUES
                 ($cust,
-                 ".$ds->ds->qstr($request).",
-                 ".$ds->ds->qstr($user).",
-                 ".$ds->ds->qstr($location).",
-                 ".$ds->ds->qstr($descrip).",
-                 ".$ds->ds->qstr($hname).",
-                 ".$ds->ds->qstr($telno).",
-                 ".$ds->ds->qstr($newmacaddr).",
-                 ".$ds->ds->qstr($info).")") and
+                 ".$ds->ds->QMagic($request).",
+                 ".$ds->ds->QMagic($user).",
+                 ".$ds->ds->QMagic($location).",
+                 ".$ds->ds->QMagic($descrip).",
+                 ".$ds->ds->QMagic($hname).",
+                 ".$ds->ds->QMagic($telno).",
+                 ".$ds->ds->QMagic($newmacaddr).",
+                 ".$ds->ds->QMagic($info).")") and
                 $ds->AuditLog(array("event"=>200, "action"=>"request ip", 
                             "descrip"=>$descrip, "user"=>getAuthUsername(), "userinf"=>$user,
                             "location"=>$location, "hname"=>$hname, "telno"=>$telno, 
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
--- ipplan.orig/user/searchall.php	2009-07-24 16:35:37.191261348 +0200
+++ ipplan/user/searchall.php	2009-07-24 16:48:04.835262321 +0200
@@ -94,35 +94,35 @@
       myError($w,$p, my_("Regular expression repetition-operator operand invalid"));
    }
 /*   if ($field == "any") {
-      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search).")";
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr RLIKE ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND 
-                 ipaddradd.info RLIKE ".$ds->ds->qstr($search);
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info RLIKE ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info RLIKE ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else if (DBF_TYPE=="postgres7") {
@@ -131,65 +131,65 @@
    }
    /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.location ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.telno ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.descrip ~ ".$ds->ds->qstr($search);
-      $where.=" OR ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where ="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.location ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.telno ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.descrip ~ ".$ds->ds->QMagic($search);
+      $where.=" OR ipaddr.hname ~ ".$ds->ds->QMagic($search);
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info ~ ".$ds->ds->qstr($search).")";
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search).")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.userinf ~ ".$ds->ds->QMagic($search);
    else if ($field == "location")
-      $where="WHERE ipaddr.location ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.location ~ ".$ds->ds->QMagic($search);
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.telno ~ ".$ds->ds->QMagic($search);
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.descrip ~ ".$ds->ds->QMagic($search);
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.hname ~ ".$ds->ds->QMagic($search);
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->qstr($search);
+      $where="WHERE ipaddr.macaddr ~ ".$ds->ds->QMagic($search);
    else if ($field == "template" and $tmplfield == "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr($search);
+                 ipaddradd.info ~ ".$ds->ds->QMagic($search);
    } else if ($field == "template" and $tmplfield != "any") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND ipaddr.baseindex = ipaddradd.baseindex AND
-                 ipaddradd.info ~ ".$ds->ds->qstr(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
+                 ipaddradd.info ~ ".$ds->ds->QMagic(".*\:\"".$tmplfield."\"\;.*\".*".$search.".*\"\;");
    }
 }
 else {
     /*
    if ($field == "any") {
-      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
-      $where.=" OR ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where ="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
+      $where.=" OR ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
       $where.=" OR (ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%").")";
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%").")";
    }
    else */
    if ($field == "userinf")
-      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.userinf LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "location")
-      $where="WHERE ipaddr.location LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.location LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "telno")
-      $where="WHERE ipaddr.telno LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.telno LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "descrip")
-      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.descrip LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "hname")
-      $where="WHERE ipaddr.hname LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.hname LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "macaddr")
-      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->qstr("%".$search."%");
+      $where="WHERE ipaddr.macaddr LIKE ".$ds->ds->QMagic("%".$search."%");
    else if ($field == "template") {
       $addtables=", ipaddradd";
       $where="WHERE ipaddr.ipaddr=ipaddradd.ipaddr AND 
-                 ipaddradd.info LIKE ".$ds->ds->qstr("%".$search."%");
+                 ipaddradd.info LIKE ".$ds->ds->QMagic("%".$search."%");
    }
 }
 


--- NEW FILE ipplan.spec ---
Name:		ipplan
Version:	4.92
Release:	3%{?dist}
Summary:	Web-based IP address manager and tracker
Group:		Applications/Internet
License:	GPLv2+
URL:		http://iptrack.sourceforge.net/
Source0:	http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}.tar.gz
Source1:	%{name}-mysql.sql
Source2:	%{name}-pgsql.sql
Source3:	README.%{name}
# Fedora specific patches to use libraries shipped with fedora
Patch1:		ipplan-set-menus-path.patch
Patch2:		ipplan-set-adodb-path.patch
Patch3:		ipplan-use-qmagic.patch
Patch4:		ipplan-set-phpmailer-path.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	php, httpd
Requires:	php-gettext, php-snmp
Requires:	php-layers-menu, php-adodb, php-PHPMailer

%description
IPplan is an administrative tool for ISPs and network service companies.
It goes beyond IP address management to provide DNS administration,
configuration file management, circuit management and storing of hardware
information, all customizable via templates. IPplan can handle a single
network or cater for multiple networks and customers with overlapping address
space. Making managing IP addresses and address spaces simple and easy.
It is written in PHP and requires a MySQL or PostgresSQL database.

%prep
%setup -q -n %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

find . -name README.html -delete
find . -type f -print0 | xargs -0 sed -i 's/\r//'
sed -i -e "s/\(\.*\"UPLOADDIRECTORY\"[^'\"]*['\"]\)[^'\"]*\(['\"].*\)/\1\/var\/cache\/ipplan\2/" config.php
sed -i 's|/tmp/|%{_tmppath}/%{name}/|' config.php
find . -type f -exec chmod a-x {} \;
#remove bundled phplayersmenu
rm -rf menus/
sed -i 's:/usr/local:/usr:' contrib/*.{pl,php}
mkdir sql
cp -p %SOURCE1 %SOURCE2 sql
cp %SOURCE3 %{name}-README.fedora
#remove bundled adodb
rm -rf adodb/
#remove bundled phpMailer
rm -f class.smtp.php class.phpmailer.php phpmailer.lang-en.php
cat <<EOF >%{name}.conf
# %{name}
# %{summary}
# %{version}a
#
Alias /%{name} %{_datadir}/%{name}
Alias /menus %{_datadir}/php/php-layers-menu

<Directory %{_datadir}/%{name}>
	Options +FollowSymLinks
	AllowOverride Limit Options FileInfo
</Directory>

<Directory %{_sysconfdir}/%{name}>
	Order Deny,Allow
	Deny from all
</Directory>

<DirectoryMatch "^%{_datadir}/%{name}/(.*/)?(adodb|templates)/(.*)?">
	Order Deny,Allow
	Deny from all
</DirectoryMatch>
EOF

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/images
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/user
install -p -d $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -p -d $RPM_BUILD_ROOT%{_localstatedir}/cache/%{name}
cp -pr admin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/admin
cp -pr images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
cp -pr layout/* $RPM_BUILD_ROOT%{_datadir}/%{name}/layout
cp -pr templates/* $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
cp -pr themes/* $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
cp -pr user/* $RPM_BUILD_ROOT%{_datadir}/%{name}/user
cp -pr locale/* $RPM_BUILD_ROOT%{_datadir}/%{name}/locale
install -p -D -m0644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
install -p -D -m0644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -p -D -m0644 *.html $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.js $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -p -D -m0644 *.css $RPM_BUILD_ROOT%{_datadir}/%{name}/
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -fs ../../..%{_sysconfdir}/%{name}/config.php .
popd

for lang in locale/*; do
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES
	mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
	if [ -f $lang/LC_MESSAGES/*.mo ]; then
		for file in $lang/LC_MESSAGES/*.mo; do
			rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES/`basename $file`
			cp -a $file $RPM_BUILD_ROOT%{_datadir}/locale/`basename $lang`/LC_MESSAGES/%{name}.mo
			pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/locale/`basename $lang`/LC_MESSAGES
			ln -fs ../../../../locale/`basename $lang`/LC_MESSAGES/%{name}.mo messages.mo
			popd
		done
	fi
done
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc gpl.html %{name}-README.fedora contrib PORTERS INTERNALS CONTRIBUTORS INSTALL-POSTGRESQL TODO TRANSLATIONS TRIGGERS UPGRADE sql
%dir %{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%attr(0700,apache,apache) %dir %{_localstatedir}/cache/%{name}
%{_datadir}/%{name}/*

%changelog
* Mon Aug 24 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Remove unnessesary dependency on /sbin/service

* Sun Aug 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-2
- Use Fedora bundled php-PHPMailer
- Fix License tag
- Remove apache restart
- Remove in spec password generation

* Fri Aug 14 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-1
- Update to version 4.92

* Mon Jul 27 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-3.a
- Use Packaged HTML_Template_PHPLIB

* Thu Jul 23 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.91-2.a
- Made changes to use fedora supplied libraries

* Sat Jul 11 2009 Andrew Colin Kissa <andrew at topdog-software.com> - 4.91-1.a
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:40:13 -0000	1.1
+++ .cvsignore	25 Aug 2009 08:29:55 -0000	1.2
@@ -0,0 +1 @@
+ipplan-4.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipplan/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:40:13 -0000	1.1
+++ sources	25 Aug 2009 08:29:55 -0000	1.2
@@ -0,0 +1 @@
+2540b381744d1891b53b660fffc5ec56  ipplan-4.92.tar.gz



From jzeleny at fedoraproject.org  Tue Aug 25 08:58:13 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Tue, 25 Aug 2009 08:58:13 +0000 (UTC)
Subject: rpms/openldap/devel openldap.spec,1.145,1.146
Message-ID: <20090825085813.DA4A611C00D7@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24680

Modified Files:
	openldap.spec 
Log Message:
Updated spec file - correct installation of openldap group


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- openldap.spec	21 Aug 2009 14:54:10 -0000	1.145
+++ openldap.spec	25 Aug 2009 08:58:12 -0000	1.146
@@ -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
@@ -82,7 +82,7 @@ customized LDAP clients.
 Summary: LDAP server
 # OpenLDAP server includes Berkeley DB library, which is licensed under Sleepycat and BSD licenses)
 License: OpenLDAP and (Sleepycat and BSD)
-Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /usr/sbin/groupadd, /sbin/chkconfig, /sbin/runuser
 Group: System Environment/Daemons
 
 %description servers
@@ -405,7 +405,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre servers
 # Take care to only do ownership-changing if we're adding the user.
-if /usr/sbin/useradd -c "LDAP User" -u 55 \
+getent group ldap > /dev/null || \
+/usr/sbin/groupadd -r -g 55 ldap
+if /usr/sbin/useradd -c "LDAP User" -u 55 -g ldap \
     -s /sbin/nologin -r -d /var/lib/ldap ldap 2> /dev/null ; then
     if [ -d /var/lib/ldap ] ; then
         for dbfile in /var/lib/ldap/* ; do
@@ -604,6 +606,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Aug 25 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-4
+- updated %pre script to correctly install openldap group
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-3
 - rebuilt with new openssl
 



From than at fedoraproject.org  Tue Aug 25 09:14:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 25 Aug 2009 09:14:58 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork-4.3.0-jabber-kde#111537.patch, NONE,
	1.1 kdenetwork.spec, 1.191, 1.192
Message-ID: <20090825091458.68A2311C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27687

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.0-jabber-kde#111537.patch 
Log Message:
fix bz#515586, backport patch to fix this issue


kdenetwork-4.3.0-jabber-kde#111537.patch:
 jabberaccount.cpp |   10 ++++++++++
 jabberaccount.h   |   10 ++++++++++
 jabbercontact.cpp |   15 ++++++++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)

--- NEW FILE kdenetwork-4.3.0-jabber-kde#111537.patch ---
Index: kopete/protocols/jabber/jabberaccount.h
===================================================================
--- kopete/protocols/jabber/jabberaccount.h	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.h	(Revision 985395)
@@ -128,6 +128,16 @@
 	 * called when the account is removed in the config ui
 	*/
 	virtual bool removeAccount();
+
+	/**
+	 * return if kopete show all messges from all resources to one session
+	 */
+	bool mergeMessages();
+
+	/**
+	 * set if kopete will merge all messages to one session
+	 */
+	void setMergeMessages(bool b);
 	
 #ifdef JINGLE_SUPPORT
 	JingleCallsManager *jingleCallsManager() const {return m_jcm;}
Index: kopete/protocols/jabber/jabbercontact.cpp
===================================================================
--- kopete/protocols/jabber/jabbercontact.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabbercontact.cpp	(Revision 985395)
@@ -341,7 +341,10 @@
 					m.setPlainBody( i18n("%1 has ended his/her participation in the chat session.", metaContact()->displayName()) );
 					m.setDirection( Kopete::Message::Internal );
 
-					mManager->appendMessage ( m, message.from().resource () );
+					if ( account()->mergeMessages() )
+						mManager->appendMessage ( m, QString() );
+					else
+						mManager->appendMessage ( m, message.from().resource () );
 				}
 			}
 		}
@@ -426,7 +429,10 @@
 	// append message to (eventually new) manager and preselect the originating resource
 	if ( newMessage )
 	{
-		mManager->appendMessage ( *newMessage, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( *newMessage, QString() );
+		else
+			mManager->appendMessage ( *newMessage, message.from().resource () );
 
 		delete newMessage;
 	}
@@ -450,7 +456,10 @@
 		msg.setDirection( Kopete::Message::Inbound );
 		msg.setRequestedPlugin( viewPlugin );
 
-		mManager->appendMessage ( msg, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( msg, QString() );
+		else
+			mManager->appendMessage ( msg, message.from().resource () );
 	}
 }
 
Index: kopete/protocols/jabber/jabberaccount.cpp
===================================================================
--- kopete/protocols/jabber/jabberaccount.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.cpp	(Revision 985395)
@@ -1720,6 +1720,16 @@
 		Kopete::AccountManager::self()->removeAccount( this ); //this will delete this
 }
 
+void JabberAccount::setMergeMessages(bool b)
+{
+	configGroup()->writeEntry("MergeMessages", b);
+}
+
+bool JabberAccount::mergeMessages()
+{
+	return configGroup()->readEntry("MergeMessages", true);
+}
+
 /*
 JabberMoodAction::JabberMoodAction(const Mood::Type type, QObject *parent):
 KAction(parent)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- kdenetwork.spec	5 Aug 2009 13:01:17 -0000	1.191
+++ kdenetwork.spec	25 Aug 2009 09:14:58 -0000	1.192
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -12,8 +12,12 @@ Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+
 # upstream patches (4.3 branch):
 
+# upstream patches (4.4 branch):
+Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
@@ -94,6 +98,8 @@ Requires: kdelibs4-devel
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
 
+# 4.4 upstream patches
+%patch200 -p0 -b .bz#515586-kopete
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +186,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- fix bz#515586, backport patch to fix this issue
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From than at fedoraproject.org  Tue Aug 25 09:16:18 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 25 Aug 2009 09:16:18 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.3.0-jabber-kde#111537.patch, NONE,
	1.1 kdenetwork.spec, 1.173, 1.174
Message-ID: <20090825091618.6F13211C00D7@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27961

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.0-jabber-kde#111537.patch 
Log Message:
- fix bz#515586, backport patch to fix this issue


kdenetwork-4.3.0-jabber-kde#111537.patch:
 jabberaccount.cpp |   10 ++++++++++
 jabberaccount.h   |   10 ++++++++++
 jabbercontact.cpp |   15 ++++++++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)

--- NEW FILE kdenetwork-4.3.0-jabber-kde#111537.patch ---
Index: kopete/protocols/jabber/jabberaccount.h
===================================================================
--- kopete/protocols/jabber/jabberaccount.h	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.h	(Revision 985395)
@@ -128,6 +128,16 @@
 	 * called when the account is removed in the config ui
 	*/
 	virtual bool removeAccount();
+
+	/**
+	 * return if kopete show all messges from all resources to one session
+	 */
+	bool mergeMessages();
+
+	/**
+	 * set if kopete will merge all messages to one session
+	 */
+	void setMergeMessages(bool b);
 	
 #ifdef JINGLE_SUPPORT
 	JingleCallsManager *jingleCallsManager() const {return m_jcm;}
Index: kopete/protocols/jabber/jabbercontact.cpp
===================================================================
--- kopete/protocols/jabber/jabbercontact.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabbercontact.cpp	(Revision 985395)
@@ -341,7 +341,10 @@
 					m.setPlainBody( i18n("%1 has ended his/her participation in the chat session.", metaContact()->displayName()) );
 					m.setDirection( Kopete::Message::Internal );
 
-					mManager->appendMessage ( m, message.from().resource () );
+					if ( account()->mergeMessages() )
+						mManager->appendMessage ( m, QString() );
+					else
+						mManager->appendMessage ( m, message.from().resource () );
 				}
 			}
 		}
@@ -426,7 +429,10 @@
 	// append message to (eventually new) manager and preselect the originating resource
 	if ( newMessage )
 	{
-		mManager->appendMessage ( *newMessage, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( *newMessage, QString() );
+		else
+			mManager->appendMessage ( *newMessage, message.from().resource () );
 
 		delete newMessage;
 	}
@@ -450,7 +456,10 @@
 		msg.setDirection( Kopete::Message::Inbound );
 		msg.setRequestedPlugin( viewPlugin );
 
-		mManager->appendMessage ( msg, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( msg, QString() );
+		else
+			mManager->appendMessage ( msg, message.from().resource () );
 	}
 }
 
Index: kopete/protocols/jabber/jabberaccount.cpp
===================================================================
--- kopete/protocols/jabber/jabberaccount.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.cpp	(Revision 985395)
@@ -1720,6 +1720,16 @@
 		Kopete::AccountManager::self()->removeAccount( this ); //this will delete this
 }
 
+void JabberAccount::setMergeMessages(bool b)
+{
+	configGroup()->writeEntry("MergeMessages", b);
+}
+
+bool JabberAccount::mergeMessages()
+{
+	return configGroup()->readEntry("MergeMessages", true);
+}
+
 /*
 JabberMoodAction::JabberMoodAction(const Mood::Type type, QObject *parent):
 KAction(parent)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- kdenetwork.spec	5 Aug 2009 13:01:17 -0000	1.173
+++ kdenetwork.spec	25 Aug 2009 09:16:18 -0000	1.174
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -12,8 +12,12 @@ Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+
 # upstream patches (4.3 branch):
 
+# upstream patches (4.4 branch):
+Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
@@ -94,6 +98,8 @@ Requires: kdelibs4-devel
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
 
+# 4.4 upstream patches
+%patch200 -p0 -b .bz#515586-kopete
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +186,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- fix bz#515586, backport patch to fix this issue
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From pkgdb at fedoraproject.org  Tue Aug 25 09:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:24:01 +0000
Subject: [pkgdb] hyphen-gu ownership updated
Message-ID: <20090825092401.90A9710F884@bastion2.fedora.phx.redhat.com>

Package hyphen-gu in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Tue Aug 25 09:23:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:23:53 +0000
Subject: [pkgdb] hyphen-gu ownership updated
Message-ID: <20090825092353.6593710F877@bastion2.fedora.phx.redhat.com>

Package hyphen-gu in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Tue Aug 25 09:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:25:26 +0000
Subject: [pkgdb] hyphen-hi ownership updated
Message-ID: <20090825092526.308B310F877@bastion2.fedora.phx.redhat.com>

Package hyphen-hi in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Tue Aug 25 09:25:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:25:35 +0000
Subject: [pkgdb] hyphen-hi ownership updated
Message-ID: <20090825092535.9EA0910F879@bastion2.fedora.phx.redhat.com>

Package hyphen-hi in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Tue Aug 25 09:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:26:14 +0000
Subject: [pkgdb] hyphen-kn ownership updated
Message-ID: <20090825092614.7B43E10F87C@bastion2.fedora.phx.redhat.com>

Package hyphen-kn in Fedora devel was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-kn



From pkgdb at fedoraproject.org  Tue Aug 25 09:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:26:31 +0000
Subject: [pkgdb] hyphen-kn ownership updated
Message-ID: <20090825092631.E586010F877@bastion2.fedora.phx.redhat.com>

Package hyphen-kn in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-kn



From pkgdb at fedoraproject.org  Tue Aug 25 09:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:27:14 +0000
Subject: [pkgdb] hyphen-ml ownership updated
Message-ID: <20090825092714.6219110F879@bastion2.fedora.phx.redhat.com>

Package hyphen-ml in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Tue Aug 25 09:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:27:38 +0000
Subject: [pkgdb] hyphen-ml ownership updated
Message-ID: <20090825092738.9913D10F877@bastion2.fedora.phx.redhat.com>

Package hyphen-ml in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Tue Aug 25 09:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:28:07 +0000
Subject: [pkgdb] hyphen-or ownership updated
Message-ID: <20090825092807.8638210F87B@bastion2.fedora.phx.redhat.com>

Package hyphen-or in Fedora devel was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Tue Aug 25 09:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:28:11 +0000
Subject: [pkgdb] hyphen-or ownership updated
Message-ID: <20090825092811.298C110F86F@bastion2.fedora.phx.redhat.com>

Package hyphen-or in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Tue Aug 25 09:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:28:32 +0000
Subject: [pkgdb] hyphen-pa ownership updated
Message-ID: <20090825092832.5BF9010F890@bastion2.fedora.phx.redhat.com>

Package hyphen-pa in Fedora devel was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Tue Aug 25 09:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:28:51 +0000
Subject: [pkgdb] hyphen-ta ownership updated
Message-ID: <20090825092851.68CF310F877@bastion2.fedora.phx.redhat.com>

Package hyphen-ta in Fedora devel was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Tue Aug 25 09:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:28:54 +0000
Subject: [pkgdb] hyphen-ta ownership updated
Message-ID: <20090825092854.943FA10F881@bastion2.fedora.phx.redhat.com>

Package hyphen-ta in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Tue Aug 25 09:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:29:13 +0000
Subject: [pkgdb] hyphen-te ownership updated
Message-ID: <20090825092913.53F3310F895@bastion2.fedora.phx.redhat.com>

Package hyphen-te in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Tue Aug 25 09:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:29:27 +0000
Subject: [pkgdb] hyphen-gu ownership updated
Message-ID: <20090825092927.C674C10F881@bastion2.fedora.phx.redhat.com>

Package hyphen-gu in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From pkgdb at fedoraproject.org  Tue Aug 25 09:29:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:29:32 +0000
Subject: [pkgdb] hyphen-gu had acl change status
Message-ID: <20090825092932.589B510F877@bastion2.fedora.phx.redhat.com>

pnemade has set the approveacls acl on hyphen-gu (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-gu



From kasal at fedoraproject.org  Tue Aug 25 09:29:32 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 25 Aug 2009 09:29:32 +0000 (UTC)
Subject: rpms/perl-Alien-wxWidgets/devel perl-Alien-wxWidgets-SONAME.patch,
	1.1, 1.2 perl-Alien-wxWidgets.spec, 1.22, 1.23
Message-ID: <20090825092932.DB5EC11C00D7@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29605

Modified Files:
	perl-Alien-wxWidgets-SONAME.patch perl-Alien-wxWidgets.spec 
Log Message:
* Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 0.44-2
- fix the soname patch

perl-Alien-wxWidgets-SONAME.patch:
 Any_wx_config_Bakefile.pm |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: perl-Alien-wxWidgets-SONAME.patch
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets-SONAME.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Alien-wxWidgets-SONAME.patch	20 Aug 2009 15:19:20 -0000	1.1
+++ perl-Alien-wxWidgets-SONAME.patch	25 Aug 2009 09:29:32 -0000	1.2
@@ -1,27 +1,35 @@
-2009-08-20  Stepan Kasal  <skasal at redhat.com>
-	
+2009-08-24  Stepan Kasal  <skasal at redhat.com>
+
+perl-Wx did not run if wxGTK-devel was not installed.
+
+The problem was that the package containes list of dynamic libraries
+to open, and that it had the *.so links, that are normally used by ld
+only, not by the dynamic linker.  Consequently, these links go to the
+devel subpackage in every sane distro.
+
+soname can be displayed by objdump or eu-readelf.  But first, we need
+the full path name; for standard paths, gcc can help.
+
+2009-08-24  Stepan Kasal  <skasal at redhat.com>
+
 	* inc/My/Build/Any_wx_config_Bakefile.pm: convert the lib*.so
-	file name to the canonical name (soname); the *.so symlink
-	usually belongs to package *-devel and may not be available at
-	runtime.
-
---- Alien-wxWidgets-0.42/inc/My/Build/Any_wx_config_Bakefile.pm.orig	2008-11-08 00:52:22.000000000 +0100
-+++ Alien-wxWidgets-0.42/inc/My/Build/Any_wx_config_Bakefile.pm	2009-08-20 15:51:52.000000000 +0200
-@@ -32,6 +32,17 @@
+	file name to the canonical soname.
+
+--- Alien-wxWidgets-0.44/inc/My/Build/Any_wx_config_Bakefile.pm.soname	2009-08-09 13:13:40.000000000 +0200
++++ Alien-wxWidgets-0.44/inc/My/Build/Any_wx_config_Bakefile.pm	2009-08-24 15:44:10.000000000 +0200
+@@ -35,7 +35,14 @@
                                && $lib =~ m/(?:gtk2?|mac)[ud]{0,2}-/;
          my $dll = "lib${name}." . $self->awx_dlext;
  
-+	open PIPE1, "ldconfig -p |";
-+	while (<PIPE1>) {
-+		if (s/^\s+${dll}\s(.*\s)?=>\s+//) {
-+			for (`objdump -p $_`) {
-+				if (s/^\s+SONAME\s+//) { chomp; $dll = $_; }
-+			}
-+			last;
-+		}
+-        $data{dlls}{$key} = { dll  => $dll,
++	my $dll_path = `gcc -print-file-name=$dll`;
++	chomp $dll_path;
++	my $dll_soname = 'not_found';
++	if ( -r "$dll_path" && `objdump -p $dll_path` =~ m/^\s+SONAME\s+(\S+)/m) {
++		$dll_soname = $1;
 +	}
-+	close PIPE1;
 +
-         $data{dlls}{$key} = { dll  => $dll,
++        $data{dlls}{$key} = { dll  => $dll_soname,
                                link => $lib };
      }
+     if( $self->awx_is_monolithic ) {


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Alien-wxWidgets.spec	20 Aug 2009 15:19:20 -0000	1.22
+++ perl-Alien-wxWidgets.spec	25 Aug 2009 09:29:32 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-Alien-wxWidgets
 Version:        0.44
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 0.44-2
+- fix the soname patch
+
 * Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.44-1
 - new upstream version
 - add patch to remember the canonical sonames of libraries, so that



From kasal at fedoraproject.org  Tue Aug 25 09:29:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 25 Aug 2009 09:29:52 +0000 (UTC)
Subject: rpms/perl-Wx/devel perl-Wx.spec,1.32,1.33
Message-ID: <20090825092952.6FD5B11C00D7@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29678

Modified Files:
	perl-Wx.spec 
Log Message:
- rebuild with perl-Alien-wxWidgets-0.44-2


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- perl-Wx.spec	20 Aug 2009 15:32:41 -0000	1.32
+++ perl-Wx.spec	25 Aug 2009 09:29:52 -0000	1.33
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-7
+- rebuild with perl-Alien-wxWidgets-0.44-2
+
+* Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-7
 - rebuild against patched perl-Alien-wxWidgets
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91-6



From pkgdb at fedoraproject.org  Tue Aug 25 09:29:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:29:55 +0000
Subject: [pkgdb] hyphen-ml ownership updated
Message-ID: <20090825092955.DC4D710F877@bastion2.fedora.phx.redhat.com>

Package hyphen-ml in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ml



From pkgdb at fedoraproject.org  Tue Aug 25 09:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:31:46 +0000
Subject: [pkgdb] hyphen-sa: pnemade has requested watchcommits
Message-ID: <20090825093146.87D7410F87B@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchcommits acl on hyphen-sa (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Tue Aug 25 09:31:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:31:48 +0000
Subject: [pkgdb] hyphen-sa: pnemade has requested commit
Message-ID: <20090825093149.0EF2210F88B@bastion2.fedora.phx.redhat.com>

pnemade has requested the commit acl on hyphen-sa (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Tue Aug 25 09:33:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:33:13 +0000
Subject: [pkgdb] hyphen-kn ownership updated
Message-ID: <20090825093313.0BFC310F89A@bastion2.fedora.phx.redhat.com>

Package hyphen-kn in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-kn



From pkgdb at fedoraproject.org  Tue Aug 25 09:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:33:33 +0000
Subject: [pkgdb] hyphen-ta ownership updated
Message-ID: <20090825093333.D11B510F8A1@bastion2.fedora.phx.redhat.com>

Package hyphen-ta in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Tue Aug 25 09:33:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:33:43 +0000
Subject: [pkgdb] hyphen-te ownership updated
Message-ID: <20090825093343.59D4510F8A3@bastion2.fedora.phx.redhat.com>

Package hyphen-te in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Tue Aug 25 09:33:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:33:46 +0000
Subject: [pkgdb] hyphen-te ownership updated
Message-ID: <20090825093346.95F7910F878@bastion2.fedora.phx.redhat.com>

Package hyphen-te in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Tue Aug 25 09:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:34:38 +0000
Subject: [pkgdb] hyphen-or ownership updated
Message-ID: <20090825093438.7B9E110F877@bastion2.fedora.phx.redhat.com>

Package hyphen-or in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Tue Aug 25 09:34:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:34:25 +0000
Subject: [pkgdb] hyphen-pa ownership updated
Message-ID: <20090825093425.A40D610F88C@bastion2.fedora.phx.redhat.com>

Package hyphen-pa in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Tue Aug 25 09:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:34:41 +0000
Subject: [pkgdb] hyphen-or ownership updated
Message-ID: <20090825093441.6473C10F890@bastion2.fedora.phx.redhat.com>

Package hyphen-or in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-or



From pkgdb at fedoraproject.org  Tue Aug 25 09:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:39:12 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090825093912.C9B2410F878@bastion2.fedora.phx.redhat.com>

caolanm has set the watchbugzilla acl on hyphen-sa (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Tue Aug 25 09:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:39:15 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090825093915.DE17A10F87C@bastion2.fedora.phx.redhat.com>

caolanm has set the watchcommits acl on hyphen-sa (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Tue Aug 25 09:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:39:18 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090825093918.F06D210F884@bastion2.fedora.phx.redhat.com>

caolanm has set the commit acl on hyphen-sa (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Tue Aug 25 09:39:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:39:27 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090825093927.EC32B10F88C@bastion2.fedora.phx.redhat.com>

caolanm has set the approveacls acl on hyphen-sa (Fedora devel) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From pkgdb at fedoraproject.org  Tue Aug 25 09:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:39:30 +0000
Subject: [pkgdb] hyphen-sa had acl change status
Message-ID: <20090825093930.7DAD310F894@bastion2.fedora.phx.redhat.com>

caolanm has set the approveacls acl on hyphen-sa (Fedora 11) to Approved for pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From twaugh at fedoraproject.org  Tue Aug 25 09:43:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 09:43:57 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.222,1.223
Message-ID: <20090825094357.E008111C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32539

Modified Files:
	hplip.spec 
Log Message:
Removed accidentally-committed testing stuff.


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- hplip.spec	24 Aug 2009 16:24:03 -0000	1.222
+++ hplip.spec	25 Aug 2009 09:43:57 -0000	1.223
@@ -1,4 +1,3 @@
-%define __find_provides %{_datadir}/system-config-printer/postscriptdriver.prov
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8



From twaugh at fedoraproject.org  Tue Aug 25 09:44:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 09:44:16 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.226,1.227
Message-ID: <20090825094416.ABFD711C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32638

Modified Files:
	hplip.spec 
Log Message:
Removed accidentally-committed testing stuff.


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- hplip.spec	24 Aug 2009 16:23:08 -0000	1.226
+++ hplip.spec	25 Aug 2009 09:44:16 -0000	1.227
@@ -1,4 +1,3 @@
-%define __find_provides %{_datadir}/system-config-printer/postscriptdriver.prov
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8



From xhorak at fedoraproject.org  Tue Aug 25 09:46:00 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 25 Aug 2009 09:46:00 +0000 (UTC)
Subject: rpms/thunderbird/F-10 thunderbird-elif.patch, NONE,
	1.1 thunderbird.spec, 1.126, 1.127
Message-ID: <20090825094600.870AD11C00D7@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv432

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-elif.patch 
Log Message:
Fix build

thunderbird-elif.patch:
 nsAppRunner.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE thunderbird-elif.patch ---
diff -up mozilla/toolkit/xre/nsAppRunner.cpp.elif mozilla/toolkit/xre/nsAppRunner.cpp
--- mozilla/toolkit/xre/nsAppRunner.cpp.elif	2009-08-25 10:57:48.000000000 +0200
+++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-08-25 10:57:50.000000000 +0200
@@ -1370,7 +1370,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
   if (NS_FAILED(rv))
     return rv;
 
-#elif
+#else
 #error Oops, you need platform-specific code here
 #endif
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- thunderbird.spec	24 Aug 2009 21:04:12 -0000	1.126
+++ thunderbird.spec	25 Aug 2009 09:46:00 -0000	1.127
@@ -32,6 +32,7 @@ Source100:      find-external-requires
 Patch1:         firefox-2.0-link-layout.patch
 Patch2:         firefox-1.0-prdtoa.patch
 Patch3:         thunderbird-2.0-visibility.patch
+Patch4:         thunderbird-elif.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -107,11 +108,9 @@ cd mozilla
 %patch2 -p0
 
 # Pragma visibility is broken on most platforms for some reason.
-# It works on i386 so leave it alone there.  Disable elsewhere.
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
-%ifnarch i386
 %patch3  -p1
-%endif
+%patch4  -p1 -b .elif
 
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader



From jzeleny at fedoraproject.org  Tue Aug 25 09:46:32 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Tue, 25 Aug 2009 09:46:32 +0000 (UTC)
Subject: rpms/openldap/F-11 openldap.spec,1.142,1.143
Message-ID: <20090825094632.147BA11C00D7@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv573

Modified Files:
	openldap.spec 
Log Message:
fix of spec file - group ldap created with correct gid (#517919)


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-11/openldap.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- openldap.spec	9 Jun 2009 11:50:54 -0000	1.142
+++ openldap.spec	25 Aug 2009 09:46:31 -0000	1.143
@@ -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
@@ -82,7 +82,7 @@ customized LDAP clients.
 Summary: LDAP server
 # OpenLDAP server includes Berkeley DB library, which is licensed under Sleepycat and BSD licenses)
 License: OpenLDAP and (Sleepycat and BSD)
-Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /usr/sbin/groupadd, /sbin/chkconfig, /sbin/runuser
 Group: System Environment/Daemons
 
 %description servers
@@ -405,7 +405,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre servers
 # Take care to only do ownership-changing if we're adding the user.
-if /usr/sbin/useradd -c "LDAP User" -u 55 \
+getent group ldap > /dev/null || \
+/usr/sbin/groupadd -r -g 55 ldap
+if /usr/sbin/useradd -c "LDAP User" -u 55 -g ldap \
     -s /sbin/nologin -r -d /var/lib/ldap ldap 2> /dev/null ; then
     if [ -d /var/lib/ldap ] ; then
         for dbfile in /var/lib/ldap/* ; do
@@ -604,6 +606,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Aug 25 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-5
+- fix of spec file - group ldap created with correct gid
+
 * Tue Jun 09 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-4
 - added $SLAPD_URLS variable to init script (#504504)
 



From nphilipp at fedoraproject.org  Tue Aug 25 09:54:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 25 Aug 2009 09:54:58 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.80, 1.81 sources,
	1.93, 1.94 system-config-services.spec, 1.95, 1.96
Message-ID: <20090825095458.0AD8A11C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1755

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	11 Aug 2009 15:01:38 -0000	1.80
+++ .cvsignore	25 Aug 2009 09:54:57 -0000	1.81
@@ -1 +1 @@
-system-config-services-0.99.35.tar.bz2
+system-config-services-0.99.36.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- sources	11 Aug 2009 15:01:38 -0000	1.93
+++ sources	25 Aug 2009 09:54:57 -0000	1.94
@@ -1 +1 @@
-5b3b801a303432ea88f9417d7a347818  system-config-services-0.99.35.tar.bz2
+eea4b6520f036a1bfd9a3acd56912de2  system-config-services-0.99.36.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- system-config-services.spec	11 Aug 2009 15:01:38 -0000	1.95
+++ system-config-services.spec	25 Aug 2009 09:54:57 -0000	1.96
@@ -1,9 +1,17 @@
 %{!?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()")}
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%bcond_without polkit1
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%bcond_without polkitauthagent
+%endif
+
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.35
+Version: 0.99.36
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -26,9 +34,13 @@ Requires: pygtk2-libglade
 Requires: python >= 2.3.0
 Requires: dbus-python
 Requires: python-slip >= 0.1.11
+%if %{with polkit1}
+Requires: python-slip-dbus >= 0.2.0
+%else
 Requires: python-slip-dbus >= 0.1.15
+%endif
 Requires: python-slip-gtk
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%if %{with polkitauthagent}
 Requires: PolicyKit-authentication-agent
 %else
 Requires: PolicyKit-gnome
@@ -50,7 +62,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%buildroot install
+make DESTDIR=%buildroot \
+%if %{with polkit1}
+    POLKIT0_SUPPORTED=0 \
+%else
+    POLKIT1_SUPPORTED=0 \
+%endif
+    install
 
 desktop-file-install --vendor system --delete-original      \
   --dir %{buildroot}%{_datadir}/applications                \
@@ -88,11 +106,18 @@ rm -rf %{buildroot}
 
 %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Services.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Services.service
+%if %{with polkit1}
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.services.policy
+%else
 %{_datadir}/PolicyKit/policy/org.fedoraproject.config.services.policy
+%endif
 
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.36-1
+- support PolicyKit 1.0 (#500007)
+
 * Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.35-1
 - use "chkconfig --type ..." if available (#467871)
 



From pkgdb at fedoraproject.org  Tue Aug 25 09:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:29:06 +0000
Subject: [pkgdb] hyphen-hi ownership updated
Message-ID: <20090825092906.1399910F87B@bastion2.fedora.phx.redhat.com>

Package hyphen-hi in Fedora 11 is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-hi



From pkgdb at fedoraproject.org  Tue Aug 25 09:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:28:35 +0000
Subject: [pkgdb] hyphen-pa ownership updated
Message-ID: <20090825092835.B0CEF10F879@bastion2.fedora.phx.redhat.com>

Package hyphen-pa in Fedora 11 was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Tue Aug 25 09:33:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:33:09 +0000
Subject: [pkgdb] hyphen-kn ownership updated
Message-ID: <20090825093309.1031110F897@bastion2.fedora.phx.redhat.com>

Package hyphen-kn in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-kn



From pkgdb at fedoraproject.org  Tue Aug 25 09:29:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:29:09 +0000
Subject: [pkgdb] hyphen-te ownership updated
Message-ID: <20090825092909.C30B210F87C@bastion2.fedora.phx.redhat.com>

Package hyphen-te in Fedora devel was orphaned by caolanm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-te



From pkgdb at fedoraproject.org  Tue Aug 25 09:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:34:22 +0000
Subject: [pkgdb] hyphen-pa ownership updated
Message-ID: <20090825093422.B7D4E10F881@bastion2.fedora.phx.redhat.com>

Package hyphen-pa in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pa



From pkgdb at fedoraproject.org  Tue Aug 25 09:33:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:33:30 +0000
Subject: [pkgdb] hyphen-ta ownership updated
Message-ID: <20090825093330.C6C4B10F89F@bastion2.fedora.phx.redhat.com>

Package hyphen-ta in Fedora devel is now owned by pnemade

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ta



From pkgdb at fedoraproject.org  Tue Aug 25 09:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 09:31:44 +0000
Subject: [pkgdb] hyphen-sa: pnemade has requested watchbugzilla
Message-ID: <20090825093144.C3D2910F810@bastion2.fedora.phx.redhat.com>

pnemade has requested the watchbugzilla acl on hyphen-sa (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-sa



From tmraz at fedoraproject.org  Tue Aug 25 10:17:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 10:17:17 +0000 (UTC)
Subject: rpms/conexus/devel conexus-0.8.0-openssl.patch, NONE,
	1.1 conexus.spec, 1.22, 1.23
Message-ID: <20090825101717.ED25111C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4980

Modified Files:
	conexus.spec 
Added Files:
	conexus-0.8.0-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
- rebuilt with new openssl


conexus-0.8.0-openssl.patch:
 context.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE conexus-0.8.0-openssl.patch ---
diff -up conexus-0.8.0/conexus-ssl/context.cpp.openssl conexus-0.8.0/conexus-ssl/context.cpp
--- conexus-0.8.0/conexus-ssl/context.cpp.openssl	2008-11-10 18:27:15.000000000 +0100
+++ conexus-0.8.0/conexus-ssl/context.cpp	2009-08-25 12:13:57.000000000 +0200
@@ -29,7 +29,11 @@ namespace Conexus
     Context::Context ( Method m ) :
         m_method ( m )
     {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      const SSL_METHOD* meth;
+#else
       SSL_METHOD* meth;
+#endif
 
       switch ( m )
       {


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- conexus.spec	21 Aug 2009 12:51:45 -0000	1.22
+++ conexus.spec	25 Aug 2009 10:17:17 -0000	1.23
@@ -6,6 +6,7 @@ License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://downloads.sourceforge.net/conexus/%{name}-%{version}.tar.bz2
+Patch1:           conexus-0.8.0-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    glibmm24-devel >= 2.6.0
 BuildRequires:    cppunit-devel >= 1.11
@@ -160,6 +161,7 @@ developing conexus-nspr applications.
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 
 %build
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
@@ -279,7 +281,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/conexus-0.8/conexus-nss/
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2



From nphilipp at fedoraproject.org  Tue Aug 25 10:22:26 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 25 Aug 2009 10:22:26 +0000 (UTC)
Subject: rpms/python-slip/devel .cvsignore, 1.15, 1.16 python-slip.spec, 1.18,
	1.19 sources, 1.17, 1.18
Message-ID: <20090825102226.B972A11C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-slip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5665

Modified Files:
	.cvsignore python-slip.spec sources 
Log Message:
version 0.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Aug 2009 15:45:30 -0000	1.15
+++ .cvsignore	25 Aug 2009 10:22:26 -0000	1.16
@@ -1 +1 @@
-python-slip-0.2.0.tar.bz2
+python-slip-0.2.1.tar.bz2


Index: python-slip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/python-slip.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- python-slip.spec	24 Aug 2009 15:49:06 -0000	1.18
+++ python-slip.spec	25 Aug 2009 10:22:26 -0000	1.19
@@ -3,7 +3,7 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:       python-slip
-Version:    0.2.0
+Version:    0.2.1
 Release:    1%{?dist}
 Summary:    Miscellaneous convenience, extension and workaround code for Python
 
@@ -90,6 +90,9 @@ rm -rf %buildroot
 %{python_sitelib}/slip.gtk-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.2.1-1
+- ship slip.gtk.tools
+
 * Mon Aug 24 2009 Nils Philippsen <nils at redhat.com> - 0.2.0-1
 - use PolicyKit version 1.0 if possible (#518996)
 - update and ship dbus README


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-slip/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Aug 2009 15:49:06 -0000	1.17
+++ sources	25 Aug 2009 10:22:26 -0000	1.18
@@ -1 +1 @@
-e8e974fd71b30b294021b25c03ce4f25  python-slip-0.2.0.tar.bz2
+1d453a89eb6da5193f66d5f61edf9ab7  python-slip-0.2.1.tar.bz2



From tmraz at fedoraproject.org  Tue Aug 25 10:29:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 10:29:59 +0000 (UTC)
Subject: rpms/bro/devel bro-20080804-openssl.patch, NONE, 1.1 bro.spec, 1.6,
	1.7
Message-ID: <20090825102959.4EEC211C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6414

Modified Files:
	bro.spec 
Added Files:
	bro-20080804-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
- rebuilt with new openssl


bro-20080804-openssl.patch:
 X509.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bro-20080804-openssl.patch ---
diff -up bro-20080804/src/X509.cc.openssl bro-20080804/src/X509.cc
--- bro-20080804/src/X509.cc.openssl	2006-10-07 04:20:48.000000000 +0200
+++ bro-20080804/src/X509.cc	2009-08-25 12:28:10.000000000 +0200
@@ -191,7 +191,7 @@ int X509_Cert::verifyChain(Contents_SSL*
 	// but in chain format).
 
 	// Init the stack.
-	STACK_OF(X509)* untrustedCerts = sk_new_null();
+	STACK_OF(X509)* untrustedCerts = sk_X509_new_null();
 	if ( ! untrustedCerts )
 		{
 		// Internal error allocating stack of untrusted certs.
@@ -232,7 +232,7 @@ int X509_Cert::verifyChain(Contents_SSL*
 		else
 			// The remaining certificates (if any) are put into
 			// the list of untrusted certificates
-			sk_push(untrustedCerts, (char*) pTemp);
+			sk_X509_push(untrustedCerts, pTemp);
 
 		tempLength += certLength + 3;
 		}
@@ -258,7 +258,7 @@ int X509_Cert::verifyChain(Contents_SSL*
 	// Free the stack, incuding. contents.
 
 	// FIXME: could this break Bro's memory tracking?
-	sk_pop_free(untrustedCerts, free);
+	sk_X509_pop_free(untrustedCerts, ((void (*)(X509 *))free);
 
 	return ret;
 	}


Index: bro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bro.spec	21 Aug 2009 12:40:28 -0000	1.6
+++ bro.spec	25 Aug 2009 10:29:59 -0000	1.7
@@ -19,6 +19,7 @@ Source2: bro-%{snapshot}.rc
 Patch0: bro-%{snapshot}-installpolicy.patch
 Patch1: bro-%{snapshot}-configurein.patch
 Patch2: bro-20080804-configure-opt-check.patch
+Patch3: bro-20080804-openssl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel openssl-devel zlib-devel ncurses-devel automake autoconf libtool flex bison file-devel bind-devel
@@ -42,6 +43,7 @@ connecting to certain services, or patte
 %patch0 -p1 -b .installpolicy
 %patch1 -p1 -b .configurein
 %patch2 -p1 -b .optcheck
+%patch3 -p1 -b .openssl
 
 %build
 ./autogen.sh
@@ -115,7 +117,7 @@ fi
 %{_localstatedir}/lib/bro
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.6.20080804svn
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20080804svn



From timlau at fedoraproject.org  Tue Aug 25 10:31:38 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue, 25 Aug 2009 10:31:38 +0000 (UTC)
Subject: rpms/postr/devel postr.spec,1.17,1.18
Message-ID: <20090825103138.D2A1211C00D7@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6648

Modified Files:
	postr.spec 
Log Message:
use the %{_libdir} macro to store nautilus extentions in the right place on x86_64 systems


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- postr.spec	5 Aug 2009 07:58:26 -0000	1.17
+++ postr.spec	25 Aug 2009 10:31:38 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -64,8 +64,8 @@ touch --no-create %{_datadir}/icons/hico
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
 %{_bindir}/%{name}
-%{_prefix}/lib/nautilus/extensions-2.0/python/postrExtension.py*
-%{_prefix}/lib/nautilus/extensions-1.0/python/postrExtension.py*
+%{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
+%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -73,6 +73,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
+- use %%%{_libdir} in %%files to put the nautilus extension in the right place
+
 * Wed Aug 5 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-4
 - Added fix_upload_button.patch to fix the upload button
 



From timlau at fedoraproject.org  Tue Aug 25 10:36:45 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue, 25 Aug 2009 10:36:45 +0000 (UTC)
Subject: rpms/postr/F-11 postr.spec,1.16,1.17
Message-ID: <20090825103645.170B711C00D7@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7281

Modified Files:
	postr.spec 
Log Message:
use the %{_libdir} macro to store nautilus extentions in the right place on x86_64 systems


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-11/postr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- postr.spec	5 Aug 2009 08:08:07 -0000	1.16
+++ postr.spec	25 Aug 2009 10:36:44 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -64,8 +64,8 @@ touch --no-create %{_datadir}/icons/hico
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
 %{_bindir}/%{name}
-%{_prefix}/lib/nautilus/extensions-2.0/python/postrExtension.py*
-%{_prefix}/lib/nautilus/extensions-1.0/python/postrExtension.py*
+%{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
+%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -73,6 +73,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
+- use %%%{_libdir} in %%files to put the nautilus extension in the right place
+
 * Wed Aug 5 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-4
 - Added fix_upload_button.patch to fix the upload button
 



From sharkcz at fedoraproject.org  Tue Aug 25 10:45:26 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 25 Aug 2009 10:45:26 +0000 (UTC)
Subject: rpms/atari++/devel .cvsignore, 1.2, 1.3 atari++.spec, 1.5,
	1.6 sources, 1.3, 1.4 atari++-1.56-termios.patch, 1.1, NONE
Message-ID: <20090825104526.4DA2C11C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9070

Modified Files:
	.cvsignore atari++.spec sources 
Removed Files:
	atari++-1.56-termios.patch 
Log Message:
* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
- update to version 1.57



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Nov 2008 20:32:02 -0000	1.2
+++ .cvsignore	25 Aug 2009 10:45:25 -0000	1.3
@@ -1 +1 @@
-atari++.tgz
+atari++_1.57.tar.gz


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/devel/atari++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- atari++.spec	24 Jul 2009 17:28:09 -0000	1.5
+++ atari++.spec	25 Aug 2009 10:45:25 -0000	1.6
@@ -1,13 +1,12 @@
 Name:           atari++
-Version:        1.56
-Release:        3%{?dist}
+Version:        1.57
+Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
 Group:          Applications/Emulators
 License:        TPL
 URL:            http://www.xl-project.com/
-Source0:        http://www.xl-project.com/download/atari++.tgz
-Patch0:         %{name}-1.56-termios.patch
+Source0:        http://www.xl-project.com/download/%{name}_%{version}.tar.gz
 # be verbose during compile
 Patch1:         %{name}-verbose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,7 +25,6 @@ the AtariXL operating system closely.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .termios
 %patch1 -p1 -b .verbose
 
 # fix encoding
@@ -61,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
+- update to version 1.57
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.56-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 May 2009 11:53:18 -0000	1.3
+++ sources	25 Aug 2009 10:45:26 -0000	1.4
@@ -1 +1 @@
-33643e8335c3f01777a66b2a3aadd944  atari++.tgz
+4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz


--- atari++-1.56-termios.patch DELETED ---



From sharkcz at fedoraproject.org  Tue Aug 25 10:49:15 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 25 Aug 2009 10:49:15 +0000 (UTC)
Subject: rpms/atari++/F-11 .cvsignore, 1.2, 1.3 atari++.spec, 1.4,
	1.5 sources, 1.3, 1.4 atari++-1.56-termios.patch, 1.1, NONE
Message-ID: <20090825104915.3FB1411C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10146

Modified Files:
	.cvsignore atari++.spec sources 
Removed Files:
	atari++-1.56-termios.patch 
Log Message:
* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
- update to version 1.57



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Nov 2008 20:32:02 -0000	1.2
+++ .cvsignore	25 Aug 2009 10:49:14 -0000	1.3
@@ -1 +1 @@
-atari++.tgz
+atari++_1.57.tar.gz


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/atari++.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- atari++.spec	8 Jun 2009 08:34:40 -0000	1.4
+++ atari++.spec	25 Aug 2009 10:49:15 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           atari++
-Version:        1.56
-Release:        2%{?dist}
+Version:        1.57
+Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
 Group:          Applications/Emulators
 License:        TPL
 URL:            http://www.xl-project.com/
-Source0:        http://www.xl-project.com/download/atari++.tgz
-Patch0:         %{name}-1.56-termios.patch
+Source0:        http://www.xl-project.com/download/%{name}_%{version}.tar.gz
 # be verbose during compile
 Patch1:         %{name}-verbose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,7 +25,6 @@ the AtariXL operating system closely.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .termios
 %patch1 -p1 -b .verbose
 
 # fix encoding
@@ -61,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
+- update to version 1.57
+
 * Fri Jun  5 2009 Dan Hor?k <dan[at]danny.cz> 1.56-2
 - add patch for sparc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 May 2009 12:00:53 -0000	1.3
+++ sources	25 Aug 2009 10:49:15 -0000	1.4
@@ -1 +1 @@
-33643e8335c3f01777a66b2a3aadd944  atari++.tgz
+4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz


--- atari++-1.56-termios.patch DELETED ---



From sharkcz at fedoraproject.org  Tue Aug 25 10:50:42 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 25 Aug 2009 10:50:42 +0000 (UTC)
Subject: rpms/atari++/F-10 .cvsignore, 1.2, 1.3 atari++.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090825105042.91FF711C0375@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10572

Modified Files:
	.cvsignore atari++.spec sources 
Log Message:
* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
- update to version 1.57



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Nov 2008 21:01:45 -0000	1.2
+++ .cvsignore	25 Aug 2009 10:50:42 -0000	1.3
@@ -1 +1 @@
-atari++.tgz
+atari++_1.57.tar.gz


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/atari++.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- atari++.spec	18 May 2009 12:02:23 -0000	1.2
+++ atari++.spec	25 Aug 2009 10:50:42 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           atari++
-Version:        1.56
+Version:        1.57
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
 Group:          Applications/Emulators
 License:        TPL
 URL:            http://www.xl-project.com/
-Source0:        http://www.xl-project.com/download/atari++.tgz
+Source0:        http://www.xl-project.com/download/%{name}_%{version}.tar.gz
 # be verbose during compile
 Patch1:         %{name}-verbose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
+- update to version 1.57
+
+* Fri Jun  5 2009 Dan Hor?k <dan[at]danny.cz> 1.56-2
+- add patch for sparc
+
 * Mon May 18 2009 Dan Hor?k <dan[at]danny.cz> 1.56-1
 - update to version 1.56
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 May 2009 12:02:23 -0000	1.3
+++ sources	25 Aug 2009 10:50:42 -0000	1.4
@@ -1 +1 @@
-33643e8335c3f01777a66b2a3aadd944  atari++.tgz
+4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz



From nphilipp at fedoraproject.org  Tue Aug 25 10:54:56 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 25 Aug 2009 10:54:56 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.81, 1.82 sources,
	1.94, 1.95 system-config-services.spec, 1.96, 1.97
Message-ID: <20090825105456.0B38311C00D7@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11490

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.37



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	25 Aug 2009 09:54:57 -0000	1.81
+++ .cvsignore	25 Aug 2009 10:54:55 -0000	1.82
@@ -1 +1 @@
-system-config-services-0.99.36.tar.bz2
+system-config-services-0.99.37.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	25 Aug 2009 09:54:57 -0000	1.94
+++ sources	25 Aug 2009 10:54:55 -0000	1.95
@@ -1 +1 @@
-eea4b6520f036a1bfd9a3acd56912de2  system-config-services-0.99.36.tar.bz2
+58f3ada2a1d5b22b3b8ccfcdc0bd5bd6  system-config-services-0.99.37.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- system-config-services.spec	25 Aug 2009 09:54:57 -0000	1.96
+++ system-config-services.spec	25 Aug 2009 10:54:55 -0000	1.97
@@ -11,7 +11,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.36
+Version: 0.99.37
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.37-1
+- differentiate dbus interfaces in derived classes
+
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.36-1
 - support PolicyKit 1.0 (#500007)
 



From timlau at fedoraproject.org  Tue Aug 25 10:37:08 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue, 25 Aug 2009 10:37:08 +0000 (UTC)
Subject: rpms/postr/F-10 postr.spec,1.12,1.13
Message-ID: <20090825103708.5183B11C00D7@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7349

Modified Files:
	postr.spec 
Log Message:
use the %{_libdir} macro to store nautilus extentions in the right place on x86_64 systems


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-10/postr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- postr.spec	5 Aug 2009 08:21:55 -0000	1.12
+++ postr.spec	25 Aug 2009 10:37:08 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -64,8 +64,8 @@ touch --no-create %{_datadir}/icons/hico
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
 %{_bindir}/%{name}
-%{_prefix}/lib/nautilus/extensions-2.0/python/postrExtension.py*
-%{_prefix}/lib/nautilus/extensions-1.0/python/postrExtension.py*
+%{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
+%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -73,6 +73,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
+- use %%%{_libdir} in %%files to put the nautilus extension in the right place
+
 * Wed Aug 5 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-4
 - Added fix_upload_button.patch to fix the upload button
 



From sharkcz at fedoraproject.org  Tue Aug 25 10:51:34 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 25 Aug 2009 10:51:34 +0000 (UTC)
Subject: rpms/atari++/EL-5 .cvsignore, 1.2, 1.3 atari++.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090825105134.ABD2311C00D7@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/atari++/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10814

Modified Files:
	.cvsignore atari++.spec sources 
Log Message:
* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
- update to version 1.57



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Nov 2008 20:32:02 -0000	1.2
+++ .cvsignore	25 Aug 2009 10:51:34 -0000	1.3
@@ -1 +1 @@
-atari++.tgz
+atari++_1.57.tar.gz


Index: atari++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/atari++.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- atari++.spec	18 May 2009 12:04:01 -0000	1.2
+++ atari++.spec	25 Aug 2009 10:51:34 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           atari++
-Version:        1.56
+Version:        1.57
 Release:        1%{?dist}
 Summary:        Unix based emulator of the Atari eight bit computers
 
 Group:          Applications/Emulators
 License:        TPL
 URL:            http://www.xl-project.com/
-Source0:        http://www.xl-project.com/download/atari++.tgz
+Source0:        http://www.xl-project.com/download/%{name}_%{version}.tar.gz
 # be verbose during compile
 Patch1:         %{name}-verbose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Dan Hor?k <dan[at]danny.cz> 1.57-1
+- update to version 1.57
+
+* Fri Jun  5 2009 Dan Hor?k <dan[at]danny.cz> 1.56-2
+- add patch for sparc
+
 * Mon May 18 2009 Dan Hor?k <dan[at]danny.cz> 1.56-1
 - update to version 1.56
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/atari++/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 May 2009 12:04:01 -0000	1.3
+++ sources	25 Aug 2009 10:51:34 -0000	1.4
@@ -1 +1 @@
-33643e8335c3f01777a66b2a3aadd944  atari++.tgz
+4e4b888121c0bb8deb8ef7afd106234d  atari++_1.57.tar.gz



From tmraz at fedoraproject.org  Tue Aug 25 11:00:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 11:00:33 +0000 (UTC)
Subject: rpms/bro/devel bro-20080804-openssl.patch,1.1,1.2
Message-ID: <20090825110033.4D3D811C0439@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12522

Modified Files:
	bro-20080804-openssl.patch 
Log Message:
- missing ) typo


bro-20080804-openssl.patch:
 X509.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: bro-20080804-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro-20080804-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bro-20080804-openssl.patch	25 Aug 2009 10:29:59 -0000	1.1
+++ bro-20080804-openssl.patch	25 Aug 2009 11:00:32 -0000	1.2
@@ -24,7 +24,7 @@ diff -up bro-20080804/src/X509.cc.openss
  
  	// FIXME: could this break Bro's memory tracking?
 -	sk_pop_free(untrustedCerts, free);
-+	sk_X509_pop_free(untrustedCerts, ((void (*)(X509 *))free);
++	sk_X509_pop_free(untrustedCerts, ((void (*)(X509 *))free));
  
  	return ret;
  	}



From karsten at fedoraproject.org  Tue Aug 25 11:04:50 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 25 Aug 2009 11:04:50 +0000 (UTC)
Subject: rpms/akonadi/devel akonadi.spec,1.42,1.43
Message-ID: <20090825110450.7AB3111C00D7@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13321

Modified Files:
	akonadi.spec 
Log Message:
- bump and rebuild, as s390x picked up an old boost library


Index: akonadi.spec
===================================================================
RCS file: /cvs/extras/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- akonadi.spec	30 Jul 2009 17:46:54 -0000	1.42
+++ akonadi.spec	25 Aug 2009 11:04:50 -0000	1.43
@@ -2,7 +2,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -119,6 +119,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 1.2.0-2
+- bump and rebuild, as s390x picked up an old boost library
+
 * Thu Jul 30 2009 Luk?? Tinkl <ltinkl at redhat.com> - 1.2.0-1
 - Akonadi 1.2.0
 



From twaugh at fedoraproject.org  Tue Aug 25 11:08:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 11:08:03 +0000 (UTC)
Subject: rpms/hplip/devel hplip-non-scripts.patch, NONE, 1.1 hplip.spec,
	1.227, 1.228
Message-ID: <20090825110803.31B8A11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13921

Modified Files:
	hplip.spec 
Added Files:
	hplip-non-scripts.patch 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
- Don't install base/*.py with executable bit set.


hplip-non-scripts.patch:
 Makefile.am |    2 +-
 Makefile.in |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE hplip-non-scripts.patch ---
diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
--- hplip-3.9.8/Makefile.am.non-scripts	2009-08-25 12:02:59.790202347 +0100
+++ hplip-3.9.8/Makefile.am	2009-08-25 12:03:32.234212568 +0100
@@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin
 # base
 basedir = $(hplipdir)/base
 
-dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
 	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
 	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
 	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
diff -up hplip-3.9.8/Makefile.in.non-scripts hplip-3.9.8/Makefile.in
--- hplip-3.9.8/Makefile.in.non-scripts	2009-08-25 12:03:37.345077328 +0100
+++ hplip-3.9.8/Makefile.in	2009-08-25 12:04:08.766078065 +0100
@@ -428,7 +428,7 @@ am__ptest_SOURCES_DIST = pcard/ptest.c p
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	fat.$(OBJEXT)
 ptest_OBJECTS = $(am_ptest_OBJECTS)
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at ptest_DEPENDENCIES = libhpmud.la
-am__dist_base_SCRIPTS_DIST = base/maint.py base/codes.py base/g.py \
+am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \
 	base/pml.py base/status.py base/__init__.py base/mfpdtf.py \
 	base/utils.py base/wifi.py base/device.py base/logger.py \
 	base/slp.py base/exif.py base/strings.py base/magic.py \
@@ -3701,7 +3701,7 @@ cups_drv = prnt/drv/hpcups.drv
 
 # base
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at basedir = $(hplipdir)/base
- at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
+ at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- hplip.spec	25 Aug 2009 09:44:16 -0000	1.227
+++ hplip.spec	25 Aug 2009 11:08:02 -0000	1.228
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -20,6 +20,7 @@ Patch4: hplip-no-asm.patch
 Patch5: hplip-clear-previous-state-reasons.patch
 Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
+Patch8: hplip-non-scripts.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -120,6 +121,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed typos in page sizes (bug #515469).
 %patch7 -p1 -b .parenths
 
+# Don't install base/*.py with executable bit set.
+%patch8 -p1 -b .non-scripts
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -321,6 +325,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
+- Don't install base/*.py with executable bit set.
+
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
 - Fixed typos in page sizes (bug #515469).
 - Build no longer requires libudev-devel.



From twaugh at fedoraproject.org  Tue Aug 25 11:09:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 11:09:03 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-non-scripts.patch, NONE, 1.1 hplip.spec, 1.223,
	1.224
Message-ID: <20090825110903.5268F11C00D7@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14129

Modified Files:
	hplip.spec 
Added Files:
	hplip-non-scripts.patch 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
- Don't install base/*.py with executable bit set.


hplip-non-scripts.patch:
 Makefile.am |    2 +-
 Makefile.in |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE hplip-non-scripts.patch ---
diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
--- hplip-3.9.8/Makefile.am.non-scripts	2009-08-25 12:02:59.790202347 +0100
+++ hplip-3.9.8/Makefile.am	2009-08-25 12:03:32.234212568 +0100
@@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin
 # base
 basedir = $(hplipdir)/base
 
-dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
 	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
 	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
 	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
diff -up hplip-3.9.8/Makefile.in.non-scripts hplip-3.9.8/Makefile.in
--- hplip-3.9.8/Makefile.in.non-scripts	2009-08-25 12:03:37.345077328 +0100
+++ hplip-3.9.8/Makefile.in	2009-08-25 12:04:08.766078065 +0100
@@ -428,7 +428,7 @@ am__ptest_SOURCES_DIST = pcard/ptest.c p
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	fat.$(OBJEXT)
 ptest_OBJECTS = $(am_ptest_OBJECTS)
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at ptest_DEPENDENCIES = libhpmud.la
-am__dist_base_SCRIPTS_DIST = base/maint.py base/codes.py base/g.py \
+am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \
 	base/pml.py base/status.py base/__init__.py base/mfpdtf.py \
 	base/utils.py base/wifi.py base/device.py base/logger.py \
 	base/slp.py base/exif.py base/strings.py base/magic.py \
@@ -3701,7 +3701,7 @@ cups_drv = prnt/drv/hpcups.drv
 
 # base
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at basedir = $(hplipdir)/base
- at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
+ at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- hplip.spec	25 Aug 2009 09:43:57 -0000	1.223
+++ hplip.spec	25 Aug 2009 11:09:03 -0000	1.224
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -21,6 +21,7 @@ Patch4: hplip-no-asm.patch
 Patch5: hplip-clear-previous-state-reasons.patch
 Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
+Patch8: hplip-non-scripts.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -121,6 +122,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed typos in page sizes (bug #515469).
 %patch7 -p1 -b .parenths
 
+# Don't install base/*.py with executable bit set.
+%patch8 -p1 -b .non-scripts
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -329,6 +333,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
+- Don't install base/*.py with executable bit set.
+
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
 - Fixed typos in page sizes (bug #515469).
 - Use hal rules instead of udev for F-11 (no udev ACL support).



From dnovotny at fedoraproject.org  Tue Aug 25 11:11:05 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 25 Aug 2009 11:11:05 +0000 (UTC)
Subject: rpms/file/devel file-5.03-multilib.patch, NONE, 1.1 file.spec, 1.105,
	1.106
Message-ID: <20090825111105.5A71211C00D7@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419

Modified Files:
	file.spec 
Added Files:
	file-5.03-multilib.patch 
Log Message:
fix multilib bug (#515767)


file-5.03-multilib.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE file-5.03-multilib.patch ---
diff -up file-5.03/magic/Makefile.am.multilib file-5.03/magic/Makefile.am
--- file-5.03/magic/Makefile.am.multilib	2009-08-25 12:45:46.000000000 +0200
+++ file-5.03/magic/Makefile.am	2009-08-25 12:50:09.000000000 +0200
@@ -234,5 +234,5 @@ FILE_COMPILE_DEP = $(FILE_COMPILE)
 endif
 
 ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
-	$(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
+	$(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)/*
 	@mv $(MAGIC_FRAGMENT_BASE).mgc $@


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- file.spec	6 Aug 2009 09:55:02 -0000	1.105
+++ file.spec	25 Aug 2009 11:11:05 -0000	1.106
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch2: file-5.00-mdmp.patch
 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
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +70,8 @@ file(1) command.
 %patch4 -p1
 #fixes #510429
 %patch5 -p1
+#fixes #515767
+%patch6 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -143,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 25 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-9
+- fix #515767 -  multilib: file /usr/share/misc/magic.mgc conflicts
+
 * Thu Aug 06 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-8
 - rebuild for #515767 -  multilib: file /usr/share/misc/magic.mgc conflicts
 



From dnovotny at fedoraproject.org  Tue Aug 25 11:24:45 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 25 Aug 2009 11:24:45 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.133,1.134
Message-ID: <20090825112445.B948E11C00D7@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17454

Modified Files:
	emacs.spec 
Log Message:
fix #518659



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- emacs.spec	13 Aug 2009 10:16:04 -0000	1.133
+++ emacs.spec	25 Aug 2009 11:24:45 -0000	1.134
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -42,6 +42,7 @@ Requires: emacs-common = %{epoch}:%{vers
 Requires: hunspell, aspell
 # bz#507852
 BuildRequires: librsvg2-devel
+BuildRequires: alsa-lib-devel, libotf
 Requires: librsvg2
 # Desktop integration
 BuildRequires: desktop-file-utils
@@ -369,6 +370,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Aug 25 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-4
+- alsa-lib-devel added to BuildRequires (#518659)
+
 * Thu Aug 13 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-3
 - fixed Name and GenericName in desktop file (#514599)
 



From tmraz at fedoraproject.org  Tue Aug 25 11:27:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 11:27:59 +0000 (UTC)
Subject: rpms/bro/devel bro-20080804-openssl.patch,1.2,1.3
Message-ID: <20090825112759.6920611C00D7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18184

Modified Files:
	bro-20080804-openssl.patch 
Log Message:
- more openssl safestack fixes needed


bro-20080804-openssl.patch:
 X509.cc          |    6 +++---
 ssl-analyzer.pac |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: bro-20080804-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro-20080804-openssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bro-20080804-openssl.patch	25 Aug 2009 11:00:32 -0000	1.2
+++ bro-20080804-openssl.patch	25 Aug 2009 11:27:59 -0000	1.3
@@ -1,6 +1,36 @@
+diff -up bro-20080804/src/ssl-analyzer.pac.openssl bro-20080804/src/ssl-analyzer.pac
+--- bro-20080804/src/ssl-analyzer.pac.openssl	2007-11-29 08:03:58.000000000 +0100
++++ bro-20080804/src/ssl-analyzer.pac	2009-08-25 13:27:00.000000000 +0200
+@@ -379,7 +379,7 @@ refine analyzer SSLAnalyzer += {
+ 			STACK_OF(X509)* untrusted_certs = 0;
+ 			if ( certificates->size() > 1 )
+ 				{
+-				untrusted_certs = sk_new_null();
++				untrusted_certs = sk_X509_new_null();
+ 				if ( ! untrusted_certs )
+ 					{
+ 					// X509_V_ERR_OUT_OF_MEM;
+@@ -402,7 +402,7 @@ refine analyzer SSLAnalyzer += {
+ 						return false;
+ 						}
+ 
+-					sk_push(untrusted_certs, (char*) pTemp);
++					sk_X509_push(untrusted_certs, pTemp);
+ 					}
+ 				}
+ 
+@@ -414,7 +414,7 @@ refine analyzer SSLAnalyzer += {
+ 				certificate_error(csc.error);
+ 			X509_STORE_CTX_cleanup(&csc);
+ 
+-			sk_pop_free(untrusted_certs, free_X509);
++			sk_X509_pop_free(untrusted_certs, X509_free);
+ 			}
+ 
+ 		X509_free(pCert);
 diff -up bro-20080804/src/X509.cc.openssl bro-20080804/src/X509.cc
 --- bro-20080804/src/X509.cc.openssl	2006-10-07 04:20:48.000000000 +0200
-+++ bro-20080804/src/X509.cc	2009-08-25 12:28:10.000000000 +0200
++++ bro-20080804/src/X509.cc	2009-08-25 13:25:19.000000000 +0200
 @@ -191,7 +191,7 @@ int X509_Cert::verifyChain(Contents_SSL*
  	// but in chain format).
  
@@ -24,7 +54,7 @@ diff -up bro-20080804/src/X509.cc.openss
  
  	// FIXME: could this break Bro's memory tracking?
 -	sk_pop_free(untrustedCerts, free);
-+	sk_X509_pop_free(untrustedCerts, ((void (*)(X509 *))free));
++	sk_X509_pop_free(untrustedCerts, X509_free);
  
  	return ret;
  	}



From caolanm at fedoraproject.org  Tue Aug 25 11:41:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 25 Aug 2009 11:41:23 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl104.patch, NONE,
	1.1 openoffice.org.spec, 1.1992,
	1.1993 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch, 1.1, NONE
Message-ID: <20090825114123.8691B11C00D7@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20958

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl104.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch 
Log Message:
rename to accepted workspace

workspace.vcl104.patch:
 sm.cxx |   40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

--- NEW FILE workspace.vcl104.patch ---
diff -ru vcl.orig/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
--- vcl.orig/unx/source/app/sm.cxx	2009-04-27 08:31:01.000000000 +0100
+++ vcl/unx/source/app/sm.cxx	2009-04-27 14:38:55.000000000 +0100
@@ -48,6 +48,7 @@
 #include <saldisp.hxx>
 #include <salframe.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <salinst.h>
 
 #include <osl/conditn.h>
@@ -187,6 +188,7 @@
 static SmProp*	pSmProps = NULL;
 static SmProp**	ppSmProps = NULL;
 static int		nSmProps = 0;
+static unsigned char   *pSmRestartHint = NULL;
 
 
 static void BuildSmPropertyList()
@@ -195,7 +197,7 @@
 	{
 		ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
 
-		nSmProps = 4;
+		nSmProps = 5;
 		pSmProps = new SmProp[ nSmProps ];
 
 		pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
@@ -243,6 +245,15 @@
 		pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
 		pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
 
+		pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+		pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+		pSmProps[ 4 ].num_vals	= 1;
+		pSmProps[ 4 ].vals		= new SmPropValue;
+		pSmProps[ 4 ].vals->value	= malloc(1);
+		pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
+		*pSmRestartHint = SmRestartIfRunning;
+		pSmProps[ 4 ].vals->length	= 1;
+
 		ppSmProps = new SmProp*[ nSmProps ];
 		for( int i = 0; i < nSmProps; i++ )
 			ppSmProps[ i ] = &pSmProps[i];
@@ -257,6 +268,31 @@
 IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
 {
     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+
+    static bool bFirstShutdown=true;
+    if (pThis != 0 && bFirstShutdown) //first shutdown request
+    {
+        bFirstShutdown = false;
+        /*
+          If we have no actual frames open, e.g. we launched a quickstarter,
+          and then shutdown all our frames leaving just a quickstarter running,
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
+          task of the quick-starter)
+        */
+        *pSmRestartHint = SmRestartNever;
+        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
+        {
+            Window *pWindow = (*it)->GetWindow();
+            if (pWindow && pWindow->IsVisible())
+            {
+                *pSmRestartHint = SmRestartIfRunning;
+                break;
+            }
+        }
+    }
+
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( pThis != 0, false );
@@ -385,7 +421,7 @@
         ICEConnectionObserver::lock();
         SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
         SmcSaveYourselfDone( aSmcConnection, True );
-        SMprintf( "sent SaveYourselfDone\n" );
+        SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
         bDocSaveDone = true;
         ICEConnectionObserver::unlock();
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -p -r1.1992 -r1.1993
--- openoffice.org.spec	24 Aug 2009 14:50:36 -0000	1.1992
+++ openoffice.org.spec	25 Aug 2009 11:41:23 -0000	1.1993
@@ -136,7 +136,7 @@ Patch58: openoffice.org-3.1.0.ooo90439.s
 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: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch62: workspace.vcl104.patch
 Patch63: workspace.evoab2def.patch
 Patch64: workspace.cmcfixes59.patch
 Patch65: workspace.impress174.patch
@@ -1677,7 +1677,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %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 .ooo101379.vcl.qstart.SM.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


--- openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Aug 25 11:49:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 11:49:24 +0000
Subject: [pkgdb] grfcodec had acl change status
Message-ID: <20090825114924.4C12F10F878@bastion2.fedora.phx.redhat.com>

iarnell has set the watchbugzilla acl on grfcodec (Fedora devel) to Approved for heffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 11:49:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 11:49:26 +0000
Subject: [pkgdb] grfcodec had acl change status
Message-ID: <20090825114926.5E64B10F87B@bastion2.fedora.phx.redhat.com>

iarnell has set the watchcommits acl on grfcodec (Fedora devel) to Approved for heffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 11:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 11:49:29 +0000
Subject: [pkgdb] grfcodec had acl change status
Message-ID: <20090825114929.E3FDB10F884@bastion2.fedora.phx.redhat.com>

iarnell has set the commit acl on grfcodec (Fedora devel) to Approved for heffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 11:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 11:49:36 +0000
Subject: [pkgdb] grfcodec had acl change status
Message-ID: <20090825114936.690A510F88C@bastion2.fedora.phx.redhat.com>

iarnell has set the watchcommits acl on grfcodec (Fedora 11) to Approved for heffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 11:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 11:49:38 +0000
Subject: [pkgdb] grfcodec had acl change status
Message-ID: <20090825114938.C889910F894@bastion2.fedora.phx.redhat.com>

iarnell has set the commit acl on grfcodec (Fedora 11) to Approved for heffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From pkgdb at fedoraproject.org  Tue Aug 25 11:49:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 11:49:34 +0000
Subject: [pkgdb] grfcodec had acl change status
Message-ID: <20090825114934.BA3B210F879@bastion2.fedora.phx.redhat.com>

iarnell has set the watchbugzilla acl on grfcodec (Fedora 11) to Approved for heffer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/grfcodec



From rathann at fedoraproject.org  Tue Aug 25 11:29:17 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 25 Aug 2009 11:29:17 +0000 (UTC)
Subject: rpms/iscan-firmware/devel .cvsignore, 1.2, 1.3 iscan-firmware.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090825112917.9275F11C00D7@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/iscan-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18573

Modified Files:
	.cvsignore iscan-firmware.spec sources 
Log Message:
* Tue Aug 25 2009 Dominik Mierzejewski <rpm at greysector.net> 2.1.1-1
- updated firmwares for: 4490, GT-1500, V10/V100, V200, V30/V300, V350, V500



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iscan-firmware/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 02:11:36 -0000	1.2
+++ .cvsignore	25 Aug 2009 11:29:17 -0000	1.3
@@ -1,11 +1,12 @@
-esci-interpreter-gt-f720-0.0.0-1.i386.rpm
-iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm
+esci-interpreter-gt-f720-0.0.1-2.i386.rpm
+iscan-plugin-gt-1500-2.1.1-2.c2.i386.rpm
 iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm
 iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm
 iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm
 iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm
-iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm
-iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm
-iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm
-iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm
+iscan-plugin-gt-f670-2.1.0-3.c2.i386.rpm
+iscan-plugin-gt-f700-2.1.0-3.c2.i386.rpm
+iscan-plugin-gt-s600-2.1.0-3.c2.i386.rpm
+iscan-plugin-gt-x750-2.1.0-5.c2.i386.rpm
 iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm
+iscan-plugin-gt-x770-2.1.1-2.c2.i386.rpm


Index: iscan-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscan-firmware/devel/iscan-firmware.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- iscan-firmware.spec	25 Jul 2009 03:37:59 -0000	1.3
+++ iscan-firmware.spec	25 Aug 2009 11:29:17 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Firmware for Epson flatbed scanners
 Name:		iscan-firmware
-Version:	2.1.0
-Release:	4%{?dist}
+Version:	2.1.1
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 URL:		http://www.avasys.jp/english/linux_e/index.html
 # Perfection 2480/2580 PHOTO
@@ -13,19 +13,19 @@ Source2:	http://lx1.avasys.jp/iscan/v118
 # Perfection 4180 PHOTO
 Source3:	http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm
 # Perfection 4490 PHOTO
-Source4:	http://lx1.avasys.jp/iscan/v1180/iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm
+Source4:	http://linux.avasys.jp/drivers/scanner-plugins/GT-X750/iscan-plugin-gt-x750-2.1.0-5.c2.i386.rpm
 # Perfection V10 / V100 PHOTO
-Source5:	http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm
+Source5:	http://linux.avasys.jp/drivers/scanner-plugins/GT-S600/iscan-plugin-gt-s600-2.1.0-3.c2.i386.rpm
 # Perfection V200 PHOTO
-Source6:	http://linux.avasys.jp/drivers/iscan/plugins/iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm
+Source6:	http://linux.avasys.jp/drivers/scanner-plugins/GT-F670/iscan-plugin-gt-f670-2.1.0-3.c2.i386.rpm
 # Perfection V350 PHOTO
-Source7:	http://lx1.avasys.jp/iscan/2.3.0/iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm
+Source7:	http://linux.avasys.jp/drivers/scanner-plugins/GT-F700/iscan-plugin-gt-f700-2.1.0-3.c2.i386.rpm
 # GT-1500
-Source8:	http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm
+Source8:	http://linux.avasys.jp/drivers/scanner-plugins/GT-1500/iscan-plugin-gt-1500-2.1.1-2.c2.i386.rpm
 # Perfection V30 / V300
-Source9:	http://linux.avasys.jp/drivers/iscan/plugins/esci-interpreter-gt-f720-0.0.0-1.i386.rpm
+Source9:	http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/esci-interpreter-gt-f720-0.0.1-2.i386.rpm
 # Perfection V500 PHOTO
-Source10:	http://lx1.avasys.jp/iscan/2.12.0/iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm
+Source10:	http://linux.avasys.jp/drivers/scanner-plugins/GT-X770/iscan-plugin-gt-x770-2.1.1-2.c2.i386.rpm
 Group:		System Environment/Base
 BuildArch:	noarch
 Requires:	udev
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 /lib/firmware/epson
 
 %changelog
+* Tue Aug 25 2009 Dominik Mierzejewski <rpm at greysector.net> 2.1.1-1
+- updated firmwares for: 4490, GT-1500, V10/V100, V200, V30/V300, V350, V500
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iscan-firmware/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Mar 2009 02:11:36 -0000	1.2
+++ sources	25 Aug 2009 11:29:17 -0000	1.3
@@ -1,11 +1,12 @@
-a40321092887e426b04408840ad29b50  esci-interpreter-gt-f720-0.0.0-1.i386.rpm
-ed12335648c893eda194afee38e51351  iscan-plugin-gt-1500-2.1.0-2.c2.i386.rpm
+1499b440d7ed69cf6f4f37558b9f7f69  esci-interpreter-gt-f720-0.0.1-2.i386.rpm
+d7962635b164d92a45d51a9804ec0cc8  iscan-plugin-gt-1500-2.1.1-2.c2.i386.rpm
 f76725766f44debe3f3fec06d0e2023b  iscan-plugin-gt-9400-1.0.0-1.c2.i386.rpm
 8b1c398ef58769d9ceb77ad771515de3  iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm
 b72a512a927b9f2020af817c5a541ae8  iscan-plugin-gt-f520-1.0.0-1.c2.i386.rpm
 5f4137fd69198617b95bd59261affd75  iscan-plugin-gt-f600-1.0.0-1.c2.i386.rpm
-b03b4e52d3c7c784599b1191b4d6740a  iscan-plugin-gt-f670-2.1.0-2.c2.i386.rpm
-cf191e84b03b28a8b0f629d60ba0b36e  iscan-plugin-gt-f700-2.0.0-0.c2.i386.rpm
-bda9d1dfe5c9524084b01e46a7a9f5e3  iscan-plugin-gt-s600-2.0.0-1.c2.i386.rpm
-02c151a49608ae911b1e200672ed236f  iscan-plugin-gt-x750-1.0.0-1.c2.i386.rpm
+193e270a38ac9941f03e012bb3bb4483  iscan-plugin-gt-f670-2.1.0-3.c2.i386.rpm
+314a471e2cfa99eff045d4870b94e561  iscan-plugin-gt-f700-2.1.0-3.c2.i386.rpm
+62e48226b0cf2661f3cb3f59a6a6a50e  iscan-plugin-gt-s600-2.1.0-3.c2.i386.rpm
+d6b816660e2179b7f97bf698bb0062dd  iscan-plugin-gt-x750-2.1.0-5.c2.i386.rpm
 c33515ec3e57eed680cd599452141d45  iscan-plugin-gt-x770-2.1.0-1.c2.i386.rpm
+b31551fe905414c2235f8871f9c1100e  iscan-plugin-gt-x770-2.1.1-2.c2.i386.rpm



From nbecker at fedoraproject.org  Tue Aug 25 12:00:59 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 25 Aug 2009 12:00:59 +0000 (UTC)
Subject: rpms/libotf/devel .cvsignore, 1.3, 1.4 libotf.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20090825120059.E867911C0348@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25205

Modified Files:
	.cvsignore libotf.spec sources 
Log Message:
Update to 0.9.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libotf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Aug 2008 11:10:14 -0000	1.3
+++ .cvsignore	25 Aug 2009 12:00:59 -0000	1.4
@@ -1 +1 @@
-libotf-0.9.8.tar.gz
+libotf-0.9.9.tar.gz


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/devel/libotf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libotf.spec	25 Jul 2009 06:22:14 -0000	1.4
+++ libotf.spec	25 Aug 2009 12:00:59 -0000	1.5
@@ -1,6 +1,6 @@
-Name:		libotf
-Version:	0.9.8
-Release:	3%{?dist}
+gName:		libotf
+Version:	0.9.9
+Release:	1%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/libotf-config
 
 %changelog
+* Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
+- Update to 0.9.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libotf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Aug 2008 11:10:14 -0000	1.3
+++ sources	25 Aug 2009 12:00:59 -0000	1.4
@@ -1 +1 @@
-586e806cf585e26ce5f3a51c472fe2d5  libotf-0.9.8.tar.gz
+95e5452263bf8e75ece988e6d827b55c  libotf-0.9.9.tar.gz



From nbecker at fedoraproject.org  Tue Aug 25 12:01:37 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 25 Aug 2009 12:01:37 +0000 (UTC)
Subject: rpms/libotf/devel libotf.spec,1.5,1.6
Message-ID: <20090825120137.947F111C0348@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25342

Modified Files:
	libotf.spec 
Log Message:
Update to 0.9.9



Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/devel/libotf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libotf.spec	25 Aug 2009 12:00:59 -0000	1.5
+++ libotf.spec	25 Aug 2009 12:01:37 -0000	1.6
@@ -1,4 +1,4 @@
-gName:		libotf
+Name:		libotf
 Version:	0.9.9
 Release:	1%{?dist}
 Summary:	A Library for handling OpenType Font



From nbecker at fedoraproject.org  Tue Aug 25 12:05:38 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 25 Aug 2009 12:05:38 +0000 (UTC)
Subject: rpms/libotf/F-11 .cvsignore, 1.3, 1.4 libotf.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090825120538.61F7A11C0348@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25999

Modified Files:
	.cvsignore libotf.spec sources 
Log Message:
update to 0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Aug 2008 11:10:14 -0000	1.3
+++ .cvsignore	25 Aug 2009 12:05:38 -0000	1.4
@@ -1 +1 @@
-libotf-0.9.8.tar.gz
+libotf-0.9.9.tar.gz


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-11/libotf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libotf.spec	25 Feb 2009 17:19:42 -0000	1.3
+++ libotf.spec	25 Aug 2009 12:05:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		libotf
-Version:	0.9.8
-Release:	2%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -78,6 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/libotf-config
 
 %changelog
+* Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
+- Update to 0.9.9
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Aug 2008 11:10:14 -0000	1.3
+++ sources	25 Aug 2009 12:05:38 -0000	1.4
@@ -1 +1 @@
-586e806cf585e26ce5f3a51c472fe2d5  libotf-0.9.8.tar.gz
+95e5452263bf8e75ece988e6d827b55c  libotf-0.9.9.tar.gz



From nbecker at fedoraproject.org  Tue Aug 25 12:13:07 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue, 25 Aug 2009 12:13:07 +0000 (UTC)
Subject: rpms/libotf/F-10 .cvsignore, 1.3, 1.4 libotf.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090825121307.88B4211C0348@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27675

Modified Files:
	.cvsignore libotf.spec sources 
Log Message:
update to 0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Aug 2008 11:10:14 -0000	1.3
+++ .cvsignore	25 Aug 2009 12:13:07 -0000	1.4
@@ -1 +1 @@
-libotf-0.9.8.tar.gz
+libotf-0.9.9.tar.gz


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-10/libotf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libotf.spec	8 Aug 2008 11:10:14 -0000	1.2
+++ libotf.spec	25 Aug 2009 12:13:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		libotf
-Version:	0.9.8
+Version:	0.9.9
 Release:	1%{?dist}
 Summary:	A Library for handling OpenType Font
 
@@ -78,6 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/libotf-config
 
 %changelog
+* Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
+- Update to 0.9.9
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Aug  8 2008 Neal Becker <ndbecker2 at gmail.com> - 0.9.8-1
 - Update to 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Aug 2008 11:10:14 -0000	1.3
+++ sources	25 Aug 2009 12:13:07 -0000	1.4
@@ -1 +1 @@
-586e806cf585e26ce5f3a51c472fe2d5  libotf-0.9.8.tar.gz
+95e5452263bf8e75ece988e6d827b55c  libotf-0.9.9.tar.gz



From tmraz at fedoraproject.org  Tue Aug 25 12:14:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 12:14:08 +0000 (UTC)
Subject: rpms/dclib/devel dclib-0.3.23-openssl.patch, NONE, 1.1 dclib.spec, 
	1.24, 1.25
Message-ID: <20090825121408.A8C2D11C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28076

Modified Files:
	dclib.spec 
Added Files:
	dclib-0.3.23-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
- rebuilt with new openssl


dclib-0.3.23-openssl.patch:
 cssl.cpp |   22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

--- NEW FILE dclib-0.3.23-openssl.patch ---
diff -up dclib-0.3.23/dclib/core/cssl.cpp.openssl dclib-0.3.23/dclib/core/cssl.cpp
--- dclib-0.3.23/dclib/core/cssl.cpp.openssl	2009-01-07 23:13:52.000000000 +0100
+++ dclib-0.3.23/dclib/core/cssl.cpp	2009-08-25 14:12:21.000000000 +0200
@@ -86,7 +86,11 @@ void CSSL::DeInitSSLLibrary()
 /** */
 SSL_CTX * CSSL::InitClientCTX()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
 	SSL_METHOD *method;
+#endif
 	SSL_CTX *ctx = NULL;
 
 	method = SSLv23_client_method();		/* Create new client-method instance */
@@ -109,7 +113,11 @@ SSL_CTX * CSSL::InitClientCTX()
 /** */
 SSL_CTX * CSSL::InitServerCTX()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
 	SSL_METHOD *method;
+#endif
 	SSL_CTX *ctx = NULL;
 
 	method = SSLv23_server_method();		/* Create new client-method instance */
@@ -130,9 +138,14 @@ SSL_CTX * CSSL::InitServerCTX()
 /** */
 SSL_CTX * CSSL::NewTLSv1ClientCTX()
 {
-	SSL_METHOD * method = TLSv1_client_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
+	SSL_METHOD *method;
+#endif
 	SSL_CTX * ctx = NULL;
 	
+	method = TLSv1_client_method();
 	if ( method != NULL )
 	{
 		ctx = SSL_CTX_new(method);
@@ -149,9 +162,14 @@ SSL_CTX * CSSL::NewTLSv1ClientCTX()
 /** */
 SSL_CTX * CSSL::NewTLSv1ServerCTX()
 {
-	SSL_METHOD * method = TLSv1_server_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
+	SSL_METHOD *method;
+#endif
 	SSL_CTX * ctx = NULL;
 	
+	method = TLSv1_server_method();
 	if ( method != NULL )
 	{
 		ctx = SSL_CTX_new(method);


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dclib.spec	21 Aug 2009 13:01:02 -0000	1.24
+++ dclib.spec	25 Aug 2009 12:14:08 -0000	1.25
@@ -7,6 +7,7 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
+Patch1:         dclib-0.3.23-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
 BuildRequires:  automake, autoconf
@@ -35,6 +36,7 @@ on dclib.
 
 %build
 %configure --disable-static
+%patch1 -p1 -b .openssl
 make %{?_smp_mflags}
 
 
@@ -70,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.23-4
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.23-3



From tmraz at fedoraproject.org  Tue Aug 25 12:20:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 12:20:24 +0000 (UTC)
Subject: rpms/dclib/devel dclib.spec,1.25,1.26
Message-ID: <20090825122024.869B811C043A@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29245

Modified Files:
	dclib.spec 
Log Message:
- oops copy&paste error



Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- dclib.spec	25 Aug 2009 12:14:08 -0000	1.25
+++ dclib.spec	25 Aug 2009 12:20:24 -0000	1.26
@@ -32,11 +32,11 @@ on dclib.
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 
 
 %build
 %configure --disable-static
-%patch1 -p1 -b .openssl
 make %{?_smp_mflags}
 
 



From tmraz at fedoraproject.org  Tue Aug 25 12:22:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 12:22:08 +0000 (UTC)
Subject: rpms/erlang/devel erlang.spec,1.42,1.43
Message-ID: <20090825122208.5469411C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29832

Modified Files:
	erlang.spec 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - R13B-01.2
- rebuilt with new openssl



Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- erlang.spec	21 Aug 2009 13:17:22 -0000	1.42
+++ erlang.spec	25 Aug 2009 12:22:08 -0000	1.43
@@ -1,9 +1,9 @@
 %define ver R13B
-%define rel 2
+%define rel 01
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.1%{?dist}
+Release:        %{rel}.2%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - R13B-2.1
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - R13B-01.2
 - rebuilt with new openssl
 
 * Mon Aug 10 2009 Gerard Milmeister <gemi at bluewin.ch> - R13B-01.1



From limb at fedoraproject.org  Tue Aug 25 11:58:20 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 25 Aug 2009 11:58:20 +0000 (UTC)
Subject: rpms/kicad/F-11 kicad.spec,1.17,1.18
Message-ID: <20090825115820.D494911C00D7@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/kicad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24627

Modified Files:
	kicad.spec 
Log Message:
Multilib path correction, BZ 518916



Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-11/kicad.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kicad.spec	4 Aug 2009 08:23:42 -0000	1.17
+++ kicad.spec	25 Aug 2009 11:58:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           kicad
 Version:        2009.07.07
-Release:        3.rev1863%{?dist}
+Release:        4.rev1863%{?dist}
 Summary:        Electronic schematic diagrams and printed circuit board artwork
 Summary(fr):    Saisie de sch?ma ?lectronique et trac? de circuit imprim?
 
@@ -164,6 +164,7 @@ iconv -f iso8859-1 -t utf-8 AUTHORS.txt 
 #multilibs
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
+%{__sed} -i "s|/usr/lib/kicad|/usr/lib64/kicad|" %{SOURCE3}
 %endif
 
 
@@ -340,6 +341,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Jon Ciesla <limb at jcomserv.net> - 2009.07.07-4.rev1863
+- Multilib path correction, BZ 518916.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009.07.07-3.rev1863
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From limb at fedoraproject.org  Tue Aug 25 12:21:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 25 Aug 2009 12:21:35 +0000 (UTC)
Subject: rpms/kicad/F-10 kicad.spec,1.16,1.17
Message-ID: <20090825122135.D7D5511C0348@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/kicad/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665

Modified Files:
	kicad.spec 
Log Message:
Multilib path correction, BZ 518916



Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-10/kicad.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kicad.spec	4 Aug 2009 08:26:37 -0000	1.16
+++ kicad.spec	25 Aug 2009 12:21:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           kicad
 Version:        2009.07.07
-Release:        3.rev1863%{?dist}
+Release:        4.rev1863%{?dist}
 Summary:        Electronic schematic diagrams and printed circuit board artwork
 Summary(fr):    Saisie de sch?ma ?lectronique et trac? de circuit imprim?
 
@@ -164,6 +164,7 @@ iconv -f iso8859-1 -t utf-8 AUTHORS.txt 
 #multilibs
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
+%{__sed} -i "s|/usr/lib/kicad|/usr/lib64/kicad|" %{SOURCE3}
 %endif
 
 
@@ -340,6 +341,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Jon Ciesla <limb at jcomserv.net> - 2009.07.07-4.rev1863
+- Multilib path correction, BZ 518916.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2009.07.07-3.rev1863
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From buc at fedoraproject.org  Tue Aug 25 12:37:12 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue, 25 Aug 2009 12:37:12 +0000 (UTC)
Subject: rpms/enca/devel .cvsignore, 1.4, 1.5 enca.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <20090825123712.E99CD11C0348@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv344

Modified Files:
	.cvsignore enca.spec sources 
Log Message:
Update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 15:57:22 -0000	1.4
+++ .cvsignore	25 Aug 2009 12:37:12 -0000	1.5
@@ -1 +1 @@
-enca-1.9.tar.bz2
+enca-1.10.tar.bz2


Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/enca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- enca.spec	24 Jul 2009 22:09:37 -0000	1.9
+++ enca.spec	25 Aug 2009 12:37:12 -0000	1.10
@@ -1,11 +1,11 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.9
-Release: 6%{?dist}
+Version: 1.10
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Text
-Source: http://trific.ath.cx/Ftp/enca/enca-%{version}.tar.bz2
-URL: http://trific.ath.cx/software/enca/
+Source: http://dl.cihar.com/enca/enca-%{version}.tar.bz2
+URL: http://gitorious.org/enca
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -84,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/libenca.so.*
 %{_mandir}/*/*
-%doc AUTHORS COPYING FAQ NEWS README THANKS TODO
+%doc AUTHORS COPYING FAQ README THANKS TODO
 
 %files devel
 %defattr(-,root,root)
@@ -96,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.10-1
+- Update to 1.10
+- Change urls for new upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Dec 2005 15:57:22 -0000	1.4
+++ sources	25 Aug 2009 12:37:12 -0000	1.5
@@ -1 +1 @@
-b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2
+1831947fb4a9dec6c84bad71ec7ac378  enca-1.10.tar.bz2



From timlau at fedoraproject.org  Tue Aug 25 12:42:19 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue, 25 Aug 2009 12:42:19 +0000 (UTC)
Subject: rpms/postr/devel postr.spec,1.18,1.19
Message-ID: <20090825124219.26FBF11C0348@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1258

Modified Files:
	postr.spec 
Log Message:
removed BuildArch: noarch to get it to build for each arch


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- postr.spec	25 Aug 2009 10:31:38 -0000	1.18
+++ postr.spec	25 Aug 2009 12:42:18 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -11,7 +11,6 @@ URL:            http://www.burtonini.com
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 Patch0:		fix_upload_button.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
@@ -73,6 +72,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-6
+- removed BuildArch: noarch to get it to build for each arch
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
 - use %%%{_libdir} in %%files to put the nautilus extension in the right place
 



From than at fedoraproject.org  Tue Aug 25 12:57:26 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 25 Aug 2009 12:57:26 +0000 (UTC)
Subject: rpms/doxygen/devel .cvsignore, 1.30, 1.31 doxygen.spec, 1.69,
	1.70 sources, 1.31, 1.32
Message-ID: <20090825125726.ED1D511C0348@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4188

Modified Files:
	.cvsignore doxygen.spec sources 
Log Message:
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	21 Aug 2009 14:46:13 -0000	1.30
+++ .cvsignore	25 Aug 2009 12:57:26 -0000	1.31
@@ -17,3 +17,4 @@ doxygen-1.5.7.1.src.tar.gz
 doxygen-1.5.8.src.tar.gz
 doxygen-1.5.9.src.tar.gz
 doxygen-1.6.0.src.tar.gz
+doxygen-1.6.1.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- doxygen.spec	24 Aug 2009 10:25:04 -0000	1.69
+++ doxygen.spec	25 Aug 2009 12:57:26 -0000	1.70
@@ -5,8 +5,8 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.6.0
-Release: 2%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 Epoch: 1
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Than Ngo <than at redhat.com> - 1.6.1-1
+- 1.6.1
+
 * Mon Aug 24 2009 Than Ngo <than at redhat.com> - 1.6.0-2
 - fix #516339, allow to enable/disable timstamp to avoid the multilib issue
   HTMP_TIMESTAMP is disable by default


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	21 Aug 2009 14:46:13 -0000	1.31
+++ sources	25 Aug 2009 12:57:26 -0000	1.32
@@ -1 +1 @@
-54b2e1fe0de7071fe135bd0297d903ff  doxygen-1.6.0.src.tar.gz
+2ec343643e134f0d3ce2069420bcb4f0  doxygen-1.6.1.src.tar.gz



From nphilipp at fedoraproject.org  Tue Aug 25 12:50:40 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 25 Aug 2009 12:50:40 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.69, 1.70 sources, 1.72,
	1.73 system-config-samba.spec, 1.77, 1.78
Message-ID: <20090825125040.204CC11C043A@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3152

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.77



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	28 May 2009 09:40:35 -0000	1.69
+++ .cvsignore	25 Aug 2009 12:50:39 -0000	1.70
@@ -1 +1 @@
-system-config-samba-1.2.76.tar.bz2
+system-config-samba-1.2.77.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	28 May 2009 09:40:35 -0000	1.72
+++ sources	25 Aug 2009 12:50:39 -0000	1.73
@@ -1 +1 @@
-f8ee841b850fa921a0ce2be292d3f1f6  system-config-samba-1.2.76.tar.bz2
+54f839a7638c2b8330580d0446f1ef47  system-config-samba-1.2.77.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- system-config-samba.spec	27 Jul 2009 05:25:10 -0000	1.77
+++ system-config-samba.spec	25 Aug 2009 12:50:39 -0000	1.78
@@ -1,16 +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()")}
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%bcond_without polkit1
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%bcond_without polkitauthagent
+%endif
+
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.76
-Release: 2%{?dist}
+Version: 1.2.77
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
@@ -21,7 +29,7 @@ Obsoletes: system-config-samba < 1.2.68
 Conflicts: system-config-samba < 1.2.68
 Requires: dbus-python
 Requires: libselinux-python
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%if %{with polkitauthagent}
 Requires: PolicyKit-authentication-agent
 %else
 Requires: PolicyKit-gnome
@@ -29,7 +37,11 @@ Requires: PolicyKit-gnome
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
+%if %{with polkit1}
+Requires: python-slip-dbus >= 0.2.0
+%else
 Requires: python-slip-dbus >= 0.1.7
+%endif
 Requires: samba
 Requires: samba-common
 Requires: hicolor-icon-theme
@@ -46,7 +58,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%buildroot \
+%if %{with polkit1}
+    POLKIT0_SUPPORTED=0 \
+%else
+    POLKIT1_SUPPORTED=0 \
+%endif
+    install
 
 desktop-file-install --vendor system --delete-original       \
   --dir %{buildroot}%{_datadir}/applications             \
@@ -81,14 +99,21 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/system-config-samba.png
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_datadir}/dbus-1/system-services/*.service
-%{_datadir}/PolicyKit/policy/*.policy
+%if %{with polkit1}
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.services.policy
+%else
+%{_datadir}/PolicyKit/policy/org.fedoraproject.config.services.policy
+%endif
 %{python_sitelib}/scsamba
 %{python_sitelib}/scsamba-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.76-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 1.2.77-1
+- support PolicyKit 1.0
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Thu May 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.76-1
 - handle missing smb.conf (#477944)



From nphilipp at fedoraproject.org  Tue Aug 25 13:13:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 25 Aug 2009 13:13:04 +0000 (UTC)
Subject: rpms/system-config-samba/devel sources, 1.73,
	1.74 system-config-samba.spec, 1.78, 1.79
Message-ID: <20090825131304.C247011C0348@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6632

Modified Files:
	sources system-config-samba.spec 
Log Message:
fix file list



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	25 Aug 2009 12:50:39 -0000	1.73
+++ sources	25 Aug 2009 13:13:04 -0000	1.74
@@ -1 +1 @@
-54f839a7638c2b8330580d0446f1ef47  system-config-samba-1.2.77.tar.bz2
+73a1bc0f717cc68967b483793dcf7d6c  system-config-samba-1.2.77.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- system-config-samba.spec	25 Aug 2009 12:50:39 -0000	1.78
+++ system-config-samba.spec	25 Aug 2009 13:13:04 -0000	1.79
@@ -100,9 +100,9 @@ fi
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_datadir}/dbus-1/system-services/*.service
 %if %{with polkit1}
-%{_datadir}/polkit-1/actions/org.fedoraproject.config.services.policy
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.samba.policy
 %else
-%{_datadir}/PolicyKit/policy/org.fedoraproject.config.services.policy
+%{_datadir}/PolicyKit/policy/org.fedoraproject.config.samba.policy
 %endif
 %{python_sitelib}/scsamba
 %{python_sitelib}/scsamba-%{version}-py%{python_version}.egg-info
@@ -110,6 +110,9 @@ fi
 
 %changelog
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 1.2.77-1
+- fix file list
+
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com>
 - support PolicyKit 1.0
 
 * Thu May 28 2009 Nils Philippsen <nils at redhat.com>



From jkratoch at fedoraproject.org  Tue Aug 25 13:13:04 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 25 Aug 2009 13:13:04 +0000 (UTC)
Subject: rpms/gdb/devel gdb-bz515434-qsort_cmp.patch, NONE, 1.1 gdb.spec,
	1.378, 1.379
Message-ID: <20090825131304.CEC0311C0372@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6668

Modified Files:
	gdb.spec 
Added Files:
	gdb-bz515434-qsort_cmp.patch 
Log Message:
* Tue Aug 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-5
- Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).


gdb-bz515434-qsort_cmp.patch:
 b/gdb/testsuite/gdb.base/solib-overlap-lib.c  |   27 +++++
 b/gdb/testsuite/gdb.base/solib-overlap-main.c |   25 ++++
 b/gdb/testsuite/gdb.base/solib-overlap.exp    |  135 ++++++++++++++++++++++++++
 gdb-6.8.50.20090818/gdb/objfiles.c            |    8 +
 4 files changed, 195 insertions(+)

--- NEW FILE gdb-bz515434-qsort_cmp.patch ---
--- gdb-6.8.50.20090818/gdb/objfiles.c-orig	2009-08-25 14:19:04.000000000 +0200
+++ gdb-6.8.50.20090818/gdb/objfiles.c	2009-08-25 14:28:07.000000000 +0200
@@ -820,12 +820,16 @@ qsort_cmp (const void *a, const void *b)
 
   if (sect1_addr < sect2_addr)
     {
+#if 0	/* qsort_cmp ICE */
       gdb_assert (obj_section_endaddr (sect1) <= sect2_addr);
+#endif	/* qsort_cmp ICE */
       return -1;
     }
   else if (sect1_addr > sect2_addr)
     {
+#if 0	/* qsort_cmp ICE */
       gdb_assert (sect1_addr >= obj_section_endaddr (sect2));
+#endif	/* qsort_cmp ICE */
       return 1;
     }
 
@@ -841,11 +845,13 @@ qsort_cmp (const void *a, const void *b)
 static struct obj_section *
 preferred_obj_section (struct obj_section *a, struct obj_section *b)
 {
+#if 0	/* qsort_cmp ICE */
   gdb_assert (obj_section_addr (a) == obj_section_addr (b));
   gdb_assert ((a->objfile->separate_debug_objfile == b->objfile)
 	      || (b->objfile->separate_debug_objfile == a->objfile));
   gdb_assert ((a->objfile->separate_debug_objfile_backlink == b->objfile)
 	      || (b->objfile->separate_debug_objfile_backlink == a->objfile));
+#endif	/* qsort_cmp ICE */
 
   if (a->objfile->separate_debug_objfile != NULL)
     return a;
@@ -908,7 +914,9 @@ update_section_map (struct obj_section *
     {
       /* Some duplicates were eliminated.
 	 The new size shouldn't be less than half of the original. */
+#if 0	/* qsort_cmp ICE */
       gdb_assert (map_size / 2 <= j);
+#endif	/* qsort_cmp ICE */
       map_size = j;
 
       map = xrealloc (map, map_size * sizeof (*map));  /* Trim excess space.  */

2009-08-25  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.base/solib-overlap.exp, gdb.base/solib-overlap-lib.c,
	gdb.base/solib-overlap-main.c: New.

--- /dev/null
+++ b/gdb/testsuite/gdb.base/solib-overlap-lib.c
@@ -0,0 +1,27 @@
+/* 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/>.
+
+   Contributed by Jan Kratochvil <jan.kratochvil at redhat.com>.  */
+
+void
+libsym (void)
+{
+}
+
+#ifdef SYMB
+void
+libsymb (void)
+{
+}
+#endif
--- /dev/null
+++ b/gdb/testsuite/gdb.base/solib-overlap-main.c
@@ -0,0 +1,25 @@
+/* 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/>.
+
+   Contributed by Jan Kratochvil <jan.kratochvil at redhat.com>.  */
+
+#include <unistd.h>
+
+int
+main (void)
+{
+  sleep (60);
+
+  return 1;
+}
--- /dev/null
+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
@@ -0,0 +1,135 @@
+# 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/>.
+#
+# Contributed by Jan Kratochvil <jan.kratochvil at redhat.com>.
+
+# Test GDB can cope with two libraries loaded with overlapping VMA ranges.
+# Prelink libraries first so they can be loaded and their native address.
+# In such case `struct linkmap'.l_addr will be zero.  Provide different
+# unprelinked library files on the disk which have zero-based VMAs.  These
+# different files should have their .dynamic section at a different offset in
+# page size so that we get for
+#   warning: .dynamic section for "..." is not at the expected address
+# the reason
+#   (wrong library or version mismatch?)
+# and not:
+#   difference appears to be caused by prelink, adjusting expectations
+# In such case both disk libraries will be loaded at VMAs starting at zero.
+
+if [skip_shlib_tests] {
+    return 0
+}
+
+# Are we on a target board?  It is required for attaching to a process.
+if [is_remote target] {
+    return 0
+}
+
+# Library file.
+set libname "solib-overlap-lib"
+set srcfile_lib ${srcdir}/${subdir}/${libname}.c
+# Binary file.
+set testfile "solib-overlap-main"
+set srcfile ${srcdir}/${subdir}/${testfile}.c
+
+# Base addresses for `prelink -r' which should be compatible with both -m32 and
+# -m64 targets.  If it clashes with system prelinked libraries it would give
+# false PASS.
+# Prelink first lib1 at 0x40000000 and lib2 at 0x41000000.
+# During second pass try lib1 at 0x50000000 and lib2 at 0x51000000.
+foreach prelink_lib1 {0x40000000 0x50000000} {
+    set prelink_lib2 [format "0x%x" [expr $prelink_lib1 + 0x01000000]]
+
+    set old_prefix $pf_prefix
+    lappend pf_prefix "$prelink_lib1:"
+
+    # Library file.
+    set binfile_lib1 ${objdir}/${subdir}/${libname}1-${prelink_lib1}.so
+    set binfile_lib2 ${objdir}/${subdir}/${libname}2-${prelink_lib1}.so
+    set lib_flags {debug}
+    # Binary file.
+    set binfile_base ${testfile}-${prelink_lib1}
+    set binfile ${objdir}/${subdir}/${binfile_base}
+    set bin_flags [list debug shlib=${binfile_lib1} shlib=${binfile_lib2}]
+    set escapedbinfile  [string_to_regexp ${binfile}]
+
+    if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
+	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""
+	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
+	untested "Could not compile ${binfile_lib1}, ${binfile_lib2} or ${binfile}."
+	return -1
+    }
+
+    if {[catch "system \"prelink -N -r ${prelink_lib1} ${binfile_lib1}\""] != 0
+	|| [catch "system \"prelink -N -r ${prelink_lib2} ${binfile_lib2}\""] != 0} {
+	# Maybe we don't have prelink.
+	untested "Could not prelink ${binfile_lib1} or ${binfile_lib2}."
+	return -1
+    }
+
+    # Start the program running and then wait for a bit, to be sure
+    # that it can be attached to.
+
+    set testpid [eval exec $binfile &]
+    sleep 2
+    if { [istarget "*-*-cygwin*"] } {
+	# testpid is the Cygwin PID, GDB uses the Windows PID, which might be
+	# different due to the way fork/exec works.
+	set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
+    }
+
+    remote_exec build "mv -f ${binfile_lib1} ${binfile_lib1}-running"
+    remote_exec build "mv -f ${binfile_lib2} ${binfile_lib2}-running"
+
+    # Provide another exported function name to cause different sizes of sections.
+    lappend lib_flags additional_flags=-DSYMB
+
+    if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
+	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""} {
+	untested "Could not recompile ${binfile_lib1} or ${binfile_lib2}."
+	remote_exec build "kill -9 ${testpid}"
+	return -1
+    }
+
+    clean_restart ${binfile_base}
+    # This testcase currently does not support remote targets.
+    # gdb_load_shlibs ${binfile_lib1} ${binfile_lib2}
+
+    # Here we should get:
+    # warning: .dynamic section for ".../solib-overlap-lib1.so" is not at the expected address (wrong library or version mismatch?)
+    # warning: .dynamic section for ".../solib-overlap-lib2.so" is not at the expected address (wrong library or version mismatch?)
+
+    set test attach
+    gdb_test_multiple "attach $testpid" $test {
+	-re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*$gdb_prompt $" {
+	    pass $test
+	}
+	-re "Attaching to program.*`?$escapedbinfile\.exe'?, process $testpid.*\[Switching to thread $testpid\..*\].*$gdb_prompt $" {
+	    # Response expected on Cygwin
+	    pass $test
+	}
+    }
+
+    # Detach the process.
+
+    gdb_test "detach" "Detaching from program: .*$escapedbinfile, process $testpid"
+
+    # Wait a bit for gdb to finish detaching
+
+    sleep 5
+
+    remote_exec build "kill -9 ${testpid}"
+
+    set pf_prefix $old_prefix
+}


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- gdb.spec	19 Aug 2009 16:19:15 -0000	1.378
+++ gdb.spec	25 Aug 2009 13:13:04 -0000	1.379
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # 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
@@ -360,6 +360,9 @@ Patch360: gdb-6.8-bz457187-largefile-tes
 # Fix compatibility of --with-system-readline and readline-6.0+.
 Patch375: gdb-readline-6.0.patch
 
+# Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).
+Patch378: gdb-bz515434-qsort_cmp.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -548,6 +551,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch352 -p1
 %patch360 -p1
 %patch375 -p1
+%patch378 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -821,6 +825,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-5
+- Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).
+
 * Wed Aug 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-4
 - Fixup "bad type" internal error, import from FSF GDB.
 - archer-jankratochvil-fedora12 commit: 2ba2bc451eb832182ef84c3934115de7a329da7c



From kvolny at fedoraproject.org  Tue Aug 25 13:28:12 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Tue, 25 Aug 2009 13:28:12 +0000 (UTC)
Subject: rpms/qmmp/devel .cvsignore, 1.6, 1.7 qmmp.spec, 1.13, 1.14 sources, 
	1.6, 1.7
Message-ID: <20090825132812.A723511C0348@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/qmmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10704

Modified Files:
	.cvsignore qmmp.spec sources 
Log Message:
new version 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Dec 2008 13:31:17 -0000	1.6
+++ .cvsignore	25 Aug 2009 13:28:10 -0000	1.7
@@ -1 +1 @@
-qmmp-0.2.3.tar.bz2
+qmmp-0.3.0.tar.bz2


Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- qmmp.spec	21 Aug 2009 15:38:32 -0000	1.13
+++ qmmp.spec	25 Aug 2009 13:28:10 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		qmmp
-Version:	0.2.3
-Release:	6%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 Summary:	Qt-based multimedia player
 
 Group:		Applications/Multimedia
@@ -15,7 +15,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	cmake flac-devel >= 1.1.3
 BuildRequires:	jack-audio-connection-kit-devel >= 0.102.5
+# libbs2b is not available yet, submitted for review (bug #519138)
+#BuildRequires:	libbs2b-devel
+BuildRequires:	libcdio-devel
 BuildRequires:	libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel
+BuildRequires:	libprojectM-devel
 BuildRequires:	libsamplerate-devel alsa-lib-devel taglib-devel
 BuildRequires:	qt-devel >= 4.2 desktop-file-utils
 BuildRequires:	libsndfile-devel wavpack-devel pulseaudio-libs-devel
@@ -41,15 +45,23 @@ Main opportunities:
 	* WavePack support
 	* ModPlug support
 	* PCM WAVE support
-	* AlSA sound output
+	* CD Audio support
+	* CUE sheet support
+	* ALSA sound output
 	* JACK sound output
 	* OSS sound output
 	* PulseAudio output
-	* Last.fm scrobbler
+	* Last.fm/Libre.fm scrobbler
 	* D-Bus support
 	* Spectrum Analyzer
-	* sample rate conversion 
+	* projectM visualization
+	* sample rate conversion
+	* bs2b dsp effect
 	* streaming support
+	* removable device detection
+	* MPRIS support
+	* global hotkey support
+	* lyrics support
 
 %description devel
 QMMP is Qt-based audio player. This package contains its header files.
@@ -59,8 +71,10 @@ QMMP is Qt-based audio player. This pack
 
 %build
 %cmake \
+	-D USE_AAC:BOOL=FALSE \
 	-D USE_FFMPEG:BOOL=FALSE \
 	-D USE_MAD:BOOL=FALSE \
+	-D USE_MPLAYER:BOOL=FALSE \
 	-D CMAKE_INSTALL_PREFIX=%{_prefix} \
 	-D LIB_DIR=%{_lib} \
 	./
@@ -73,6 +87,9 @@ make DESTDIR=%{buildroot} install
 desktop-file-install --delete-original --vendor fedora --dir \
 	%{buildroot}%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/qmmp.desktop
+# new files since 0.3.0, using Vendor is deprecated, so just validate
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_cue.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_enqueue.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -84,6 +101,8 @@ rm -rf %{buildroot}
 %{_libdir}/qmmp
 %{_libdir}/libqmmp*
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}_cue.desktop
+%{_datadir}/applications/%{name}_enqueue.desktop
 %{_datadir}/icons/hicolor/
 
 %files devel
@@ -105,6 +124,13 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Karel Voln? <kvolny at redhat.com> - 0.3.0-1
+- new version
+- updated %%description to match upstream
+- new plugins = new BuildRequires, new .desktop files
+- AAC support disabled due to patent restrictions
+- mplayer plugin disabled due to mplayer missing from Fedora
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-6
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Dec 2008 13:31:18 -0000	1.6
+++ sources	25 Aug 2009 13:28:11 -0000	1.7
@@ -1 +1 @@
-22c313a04f7d8def529009e437020155  qmmp-0.2.3.tar.bz2
+ba85e2e288a0e6461f95c1928e8946a4  qmmp-0.3.0.tar.bz2



From kasal at fedoraproject.org  Tue Aug 25 13:29:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 25 Aug 2009 13:29:20 +0000 (UTC)
Subject: rpms/perl-Wx/devel perl-Wx.spec,1.33,1.34
Message-ID: <20090825132920.91C7B11C0348@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11213

Modified Files:
	perl-Wx.spec 
Log Message:
bump release


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- perl-Wx.spec	25 Aug 2009 09:29:52 -0000	1.33
+++ perl-Wx.spec	25 Aug 2009 13:29:20 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           perl-Wx
 Version:        0.91
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
 Group:          Development/Libraries
@@ -95,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-7
+* Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-8
 - rebuild with perl-Alien-wxWidgets-0.44-2
 
 * Thu Aug 20 2009 Stepan Kasal <skasal at redhat.com> - 0.91-7



From twoerner at fedoraproject.org  Tue Aug 25 13:45:19 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 25 Aug 2009 13:45:19 +0000 (UTC)
Subject: rpms/iptables/devel .cvsignore, 1.26, 1.27 iptables.spec, 1.78,
	1.79 sources, 1.26, 1.27
Message-ID: <20090825134519.61A7311C0348@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14485

Modified Files:
	.cvsignore iptables.spec sources 
Log Message:
- new version 1.4.4 with support for all new features of 2.6.30
  - several man page fixes
  - iptables: replace open-coded sizeof by ARRAY_SIZE
  - libip6t_policy: remove redundant functions
  - policy: use direct xt_policy_info instead of ipt/ip6t
  - policy: merge ipv6 and ipv4 variant
  - extensions: add `cluster' match support
  - extensions: add const qualifiers in print/save functions
  - extensions: use NFPROTO_UNSPEC for .family field
  - extensions: remove redundant casts
  - iptables: close open file descriptors
  - fix segfault if incorrect protocol name is used
  - replace open-coded sizeof by ARRAY_SIZE
  - do not include v4-only modules in ip6tables manpage
  - use direct xt_policy_info instead of ipt/ip6t
  - xtables: fix segfault if incorrect protocol name is used
  - libxt_connlimit: initialize v6_mask
  - SNAT/DNAT: add support for persistent multi-range NAT mappings




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	15 Apr 2009 12:29:00 -0000	1.26
+++ .cvsignore	25 Aug 2009 13:45:18 -0000	1.27
@@ -5,3 +5,4 @@ iptables-1.4.1.1.tar.bz2
 iptables-1.4.2.tar.bz2
 iptables-1.4.3.1.tar.bz2
 iptables-1.4.3.2.tar.bz2
+iptables-1.4.4.tar.bz2


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- iptables.spec	25 Jul 2009 03:32:34 -0000	1.78
+++ iptables.spec	25 Aug 2009 13:45:19 -0000	1.79
@@ -1,7 +1,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
-Version: 1.4.3.2
-Release: 2%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -150,6 +150,26 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Mon Aug 24 2009 Thomas Woerner <twoerner at redhat.com> 1.4.4-1
+- new version 1.4.4 with support for all new features of 2.6.30
+  - several man page fixes
+  - iptables: replace open-coded sizeof by ARRAY_SIZE
+  - libip6t_policy: remove redundant functions
+  - policy: use direct xt_policy_info instead of ipt/ip6t
+  - policy: merge ipv6 and ipv4 variant
+  - extensions: add `cluster' match support
+  - extensions: add const qualifiers in print/save functions
+  - extensions: use NFPROTO_UNSPEC for .family field
+  - extensions: remove redundant casts
+  - iptables: close open file descriptors
+  - fix segfault if incorrect protocol name is used
+  - replace open-coded sizeof by ARRAY_SIZE
+  - do not include v4-only modules in ip6tables manpage
+  - use direct xt_policy_info instead of ipt/ip6t
+  - xtables: fix segfault if incorrect protocol name is used
+  - libxt_connlimit: initialize v6_mask
+  - SNAT/DNAT: add support for persistent multi-range NAT mappings
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	15 Apr 2009 12:29:01 -0000	1.26
+++ sources	25 Aug 2009 13:45:19 -0000	1.27
@@ -1 +1 @@
-545698693b636cfc844aafc6729fd48a  iptables-1.4.3.2.tar.bz2
+08cd9196881657ea0615d926334cb7e9  iptables-1.4.4.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 13:46:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 13:46:42 +0000 (UTC)
Subject: rpms/webkitgtk/devel webkit-1.1.13-no-execmem.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 webkitgtk.spec, 1.17, 1.18
Message-ID: <20090825134642.DC90711C0348@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15350

Modified Files:
	.cvsignore sources webkitgtk.spec 
Added Files:
	webkit-1.1.13-no-execmem.patch 
Log Message:
update patch


webkit-1.1.13-no-execmem.patch:
 Platform.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE webkit-1.1.13-no-execmem.patch ---
diff -up webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem webkit-1.1.13/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem	2009-08-25 09:27:08.517026703 -0400
+++ webkit-1.1.13/JavaScriptCore/wtf/Platform.h	2009-08-25 09:42:35.222265742 -0400
@@ -724,7 +724,7 @@
 #endif
 /* Setting this flag prevents the assembler from using RWX memory; this may improve
    security but currectly comes at a significant performance cost. */
-#if PLATFORM(IPHONE)
+#if PLATFORM(IPHONE) || PLATFORM(X86) || PLATFORM(X86_64)
 #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
 #else
 #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 Jul 2009 01:46:48 -0000	1.8
+++ .cvsignore	25 Aug 2009 13:46:42 -0000	1.9
@@ -1 +1 @@
-webkit-1.1.12.tar.gz
+webkit-1.1.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Jul 2009 01:46:48 -0000	1.8
+++ sources	25 Aug 2009 13:46:42 -0000	1.9
@@ -1 +1 @@
-1a10c117a0dd3717c2bcaa7a115cf218  webkit-1.1.12.tar.gz
+627d5ac4b2c7a967e5a5ccb175e459ea  webkit-1.1.13.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- webkitgtk.spec	24 Aug 2009 00:55:39 -0000	1.17
+++ webkitgtk.spec	25 Aug 2009 13:46:42 -0000	1.18
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.12
-Release:	2%{?dist}
+Version:	1.1.13
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -48,7 +48,7 @@ URL:		http://www.webkitgtk.org/
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
 Patch0: 	webkit-1.1.12-atomic-word.patch
-Patch1: 	webkit-1.1.12-no-execmem.patch
+Patch1: 	webkit-1.1.13-no-execmem.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,7 +112,7 @@ LICENSE, README, and AUTHORS files.
 %prep
 %setup -qn "webkit-%{version}"
 %patch0 -p1
-%patch1 -b .no-execmem
+%patch1 -p1 -b .no-execmem
 
 %build
 %configure							\
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.13-1
+- Update to 1.1.13
+
 * Sat Aug 22 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.12-2
 - Add patch to forcibly disable RWX memory in the x86/x86-64 assembler.
   + no-execmem.patch



From than at fedoraproject.org  Tue Aug 25 13:50:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 25 Aug 2009 13:50:39 +0000 (UTC)
Subject: rpms/doxygen/F-11 doxygen-1.6.0-config.patch, NONE,
	1.1 doxygen-1.6.0-timestamp.patch, NONE, 1.1 doxygen.spec, 1.65,
	1.66 sources, 1.30, 1.31 doxygen-1.5.5-system-png.patch, 1.2,
	NONE doxygen-1.5.8-config.patch, 1.1,
	NONE doxygen-1.5.8-qt4.patch, 1.2, NONE
Message-ID: <20090825135039.4E18D11C043A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16458

Modified Files:
	doxygen.spec sources 
Added Files:
	doxygen-1.6.0-config.patch doxygen-1.6.0-timestamp.patch 
Removed Files:
	doxygen-1.5.5-system-png.patch doxygen-1.5.8-config.patch 
	doxygen-1.5.8-qt4.patch 
Log Message:
1.6.1


doxygen-1.6.0-config.patch:
 Makefile.in                    |    2 --
 addon/doxywizard/Makefile.in   |   10 ++++------
 configure                      |    5 ++++-
 tmake/lib/linux-g++/tmake.conf |   14 +++++++-------
 4 files changed, 15 insertions(+), 16 deletions(-)

--- NEW FILE doxygen-1.6.0-config.patch ---
diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
--- doxygen-1.6.0/addon/doxywizard/Makefile.in.config	2009-07-13 22:09:03.000000000 +0200
+++ doxygen-1.6.0/addon/doxywizard/Makefile.in	2009-08-21 16:42:13.000000000 +0200
@@ -10,8 +10,6 @@
 # See the GNU General Public License for more details.
 # 
 
-QMAKE=qmake
-
 all: Makefile.doxywizard  
 	$(MAKE) -f Makefile.doxywizard 
 
@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
 	$(RM) Makefile.doxywizard
 
 install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
 	cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-	$(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
+	$(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
 	rm doxywizard.1
 
 FORCE:
diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
--- doxygen-1.6.0/configure.config	2009-08-20 14:15:07.000000000 +0200
+++ doxygen-1.6.0/configure	2009-08-21 16:41:36.000000000 +0200
@@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
   if test -z "$QTDIR"; then
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+    for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
       if test -x "$d/bin/qmake"; then
         QTDIR=$d
+        QMAKE=$d/bin/qmake
       fi
     done
   else
@@ -485,6 +486,8 @@ INSTTOOL  = $f_insttool
 DOXYDOCS  = ..
 DOCDIR    = $f_docdir
 QTDIR     = $QTDIR
+QMAKE     = $QMAKE
+MAN1DIR    = share/man/man1
 EOF
 
 if test "$f_dot" != NO; then
diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
--- doxygen-1.6.0/Makefile.in.config	2009-08-14 15:58:42.000000000 +0200
+++ doxygen-1.6.0/Makefile.in	2009-08-21 16:34:02.000000000 +0200
@@ -44,8 +44,6 @@ distclean: clean
 
 DATE=$(shell date "+%B %Y")
 
-MAN1DIR = man/man1
-
 install: doxywizard_install 
 	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
 	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
diff -up doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config	2008-12-06 14:16:20.000000000 +0100
+++ doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf	2009-08-21 16:34:02.000000000 +0200
@@ -11,7 +11,7 @@ TMAKE_CC		= gcc
 TMAKE_CFLAGS		= -pipe
 TMAKE_CFLAGS_WARN_ON	= -Wall -W -fno-exceptions
 TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
+TMAKE_CFLAGS_RELEASE	= $(RPM_OPT_FLAGS)
 TMAKE_CFLAGS_DEBUG	= -g
 TMAKE_CFLAGS_SHLIB	= -fPIC
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YAC
 
 TMAKE_INCDIR		=
 TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+TMAKE_INCDIR_X11	=
+TMAKE_LIBDIR_X11	=
+TMAKE_INCDIR_QT		=
+TMAKE_LIBDIR_QT		=
+TMAKE_INCDIR_OPENGL	=
+TMAKE_LIBDIR_OPENGL	=
 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++

doxygen-1.6.0-timestamp.patch:
 config.xml        |    4 ++++
 configoptions.cpp |    8 ++++++++
 htmlgen.cpp       |    5 ++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE doxygen-1.6.0-timestamp.patch ---
diff -up doxygen-1.6.0/src/config.cpp.orig doxygen-1.6.0/src/config.cpp
diff -up doxygen-1.6.0/src/config.l.orig doxygen-1.6.0/src/config.l
diff -up doxygen-1.6.0/src/configoptions.cpp.orig doxygen-1.6.0/src/configoptions.cpp
--- doxygen-1.6.0/src/configoptions.cpp.orig	2009-08-24 12:04:45.000000000 +0200
+++ doxygen-1.6.0/src/configoptions.cpp	2009-08-24 12:06:34.000000000 +0200
@@ -1072,6 +1072,14 @@ void addConfigOptions(Config *cfg)
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
+  cb = cfg->addBool(
+                 "HTML_TIMESTAMP",
+                 "If the HTML_TIMESTAMP tag is set to YES then the generated HTML\n"
+                 "documentation will contain the timesstamp.",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTML");
+  //----
   cs = cfg->addString(
                  "HTML_STYLESHEET",
                  "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"
diff -up doxygen-1.6.0/src/config.xml.orig doxygen-1.6.0/src/config.xml
--- doxygen-1.6.0/src/config.xml.orig	2009-08-24 11:55:46.000000000 +0200
+++ doxygen-1.6.0/src/config.xml	2009-08-24 12:03:06.000000000 +0200
@@ -751,6 +751,10 @@ The HTML_FOOTER tag can be used to speci
 each generated HTML page. If it is left blank doxygen will generate a 
 standard footer. 
 ' defval='' depends='GENERATE_HTML'/>
+    <option type='bool' id='HTML_TIMESTAMP' docs='
+If the HTML_TIMESTAMP tag is set to YES then the generated HTML
+documentation will contain the timesstamp.
+' defval='' depends='GENERATE_HTML'/>
     <option type='string' id='HTML_STYLESHEET' format='file' docs='
 The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 style sheet that is used by each HTML page. It can be used to 
diff -up doxygen-1.6.0/src/htmlgen.cpp.orig doxygen-1.6.0/src/htmlgen.cpp
--- doxygen-1.6.0/src/htmlgen.cpp.orig	2009-08-24 11:55:20.000000000 +0200
+++ doxygen-1.6.0/src/htmlgen.cpp	2009-08-24 11:53:29.000000000 +0200
@@ -56,6 +56,7 @@ static const char search_script[]=
 
 static QCString g_header;
 static QCString g_footer;
+static bool timestamp=false;
 
 //------------------------- Pictures for the Tabs ------------------------
 
@@ -640,6 +641,8 @@ void HtmlGenerator::init()
   if (!Config_getString("HTML_FOOTER").isEmpty()) 
   {
     g_footer=fileToString(Config_getString("HTML_FOOTER"));
+    if (Config_getBool("HTML_TIMESTAMP"))
+      timestamp=true;
     //printf("g_footer='%s'\n",g_footer.data());
   }
   createSubDirs(d);
@@ -864,7 +867,7 @@ static void writePageFooter(QTextStream 
   {
     t << "<hr size=\"1\"/><address style=\"text-align: right;\"><small>";
     t << theTranslator->trGeneratedAt(
-        dateToString(TRUE),
+        dateToString(timestamp),
         Config_getString("PROJECT_NAME")
         );
     t << "&nbsp;" << endl << "<a href=\"http://www.doxygen.org/index.html\">";


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-11/doxygen.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- doxygen.spec	3 Jul 2009 10:54:46 -0000	1.65
+++ doxygen.spec	25 Aug 2009 13:50:39 -0000	1.66
@@ -5,17 +5,16 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.9
+Version: 1.6.1
 Release: 1%{?dist}
 Epoch: 1
+Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-Patch1: doxygen-1.5.8-config.patch
-Patch2: doxygen-1.5.8-qt4.patch
-Patch3: doxygen-1.5.5-system-png.patch
+Patch1: doxygen-1.6.0-config.patch
+Patch2: doxygen-1.6.0-timestamp.patch
 Group: Development/Tools
 # No version is specified.
 License: GPL+
-Url: http://www.stack.nl/~dimitri/doxygen/index.html
 
 BuildRequires: perl
 BuildRequires: texlive-dvips
@@ -51,8 +50,7 @@ are used by doxygen.
 %setup -q
 
 %patch1 -p1 -b .config
-%patch2 -p1 -b .qt4
-%patch3 -p1 -b .system-png
+%patch2 -p1 -b .timestamp
 
 %build
 unset QTDIR
@@ -103,6 +101,22 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Than Ngo <than at redhat.com> - 1.6.1-1
+- 1.6.1
+
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 1.6.0-2
+- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
+  HTMP_TIMESTAMP is disable by default
+
+* Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.6.0-1
+- 1.6.0
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.5.9-3
+- Convert specfile to UTF-8.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 03 2009 Than Ngo <than at redhat.com> - 1.5.9-1
 - 1.5.9
 
@@ -319,7 +333,7 @@ rm -rf %{buildroot}
 * Wed Mar 14 2001 Jeff Johnson <jbj at redhat.com>
 - update to 1.2.6
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - rebuild
 
 * Tue Dec 26 2000 Than Ngo <than at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	3 Jul 2009 10:54:46 -0000	1.30
+++ sources	25 Aug 2009 13:50:39 -0000	1.31
@@ -1 +1 @@
-33c5598fa6d24cbc55849eaf89652557  doxygen-1.5.9.src.tar.gz
+2ec343643e134f0d3ce2069420bcb4f0  doxygen-1.6.1.src.tar.gz


--- doxygen-1.5.5-system-png.patch DELETED ---


--- doxygen-1.5.8-config.patch DELETED ---


--- doxygen-1.5.8-qt4.patch DELETED ---



From timlau at fedoraproject.org  Tue Aug 25 13:50:43 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue, 25 Aug 2009 13:50:43 +0000 (UTC)
Subject: rpms/postr/devel nautilus-ext-dir.patch, NONE, 1.1 postr.spec, 1.19,
	1.20
Message-ID: <20090825135043.551C511C043A@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534

Modified Files:
	postr.spec 
Added Files:
	nautilus-ext-dir.patch 
Log Message:
fix build on multi archs

nautilus-ext-dir.patch:
 setup.py |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-ext-dir.patch ---
--- postr-0.12.3/setup.py	2008-12-19 15:51:01.000000000 +0100
+++ postr-0.12.3.new/setup.py	2009-08-25 15:44:58.123732748 +0200
@@ -1,9 +1,30 @@
 #!/usr/bin/env python
 
+import os
 from distutils.core import setup
+from distutils.command.install_data import install_data
 from glob import glob
 from src.version import __version__
 
+
+class InstallData(install_data):
+    def run(self):
+        self.data_files.extend(self._nautilus_plugin())
+        install_data.run(self)
+    
+    def _nautilus_plugin(self):
+        files = []
+        cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
+        res = cmd.readline().strip()
+        ret = cmd.close()
+            
+        if ret is None:
+           dest = res[5:]
+           files.append((dest, ['nautilus/postrExtension.py']))
+        
+        return files
+
+
 setup(name='Postr',
       version=__version__,
       description='Flickr Uploader',
@@ -21,10 +42,7 @@
                   ('share/icons/hicolor/24x24/apps', glob('data/24x24/*.png')),
                   ('share/icons/hicolor/32x32/apps', glob('data/32x32/*.png')),
                   ('share/icons/hicolor/scalable/apps', glob('data/scalable/*.svg')),
-                  # TODO: inspect nautilus-python.pc to get path
-                  ('lib/nautilus/extensions-1.0/python', ['nautilus/postrExtension.py']),
-                  ('lib/nautilus/extensions-2.0/python', ['nautilus/postrExtension.py']),
-                  ],
+                  ], cmdclass={'install_data': InstallData}
       
       )
 


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- postr.spec	25 Aug 2009 12:42:18 -0000	1.19
+++ postr.spec	25 Aug 2009 13:50:43 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -10,10 +10,12 @@ License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 Patch0:		fix_upload_button.patch
+Patch1:		nautilus-ext-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nautilus-python-devel
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       pygtk2
@@ -30,6 +32,7 @@ Tool for uploading photos to the photo-s
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -64,7 +67,6 @@ touch --no-create %{_datadir}/icons/hico
 %doc AUTHORS COPYING README TODO
 %{_bindir}/%{name}
 %{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
-%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -72,6 +74,12 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
+- Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
+- in the right directory
+- Added BuildRequires:  nautilus-python-devel because we need the .pc file to
+- detect the right nautilus python extention dir
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-6
 - removed BuildArch: noarch to get it to build for each arch
 



From mclasen at fedoraproject.org  Tue Aug 25 13:59:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 13:59:03 +0000 (UTC)
Subject: rpms/GConf2/devel .cvsignore, 1.43, 1.44 GConf2.spec, 1.111,
	1.112 sources, 1.43, 1.44
Message-ID: <20090825135903.DA1EA11C0348@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18294

Modified Files:
	.cvsignore GConf2.spec sources 
Log Message:
2.27.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	16 May 2009 00:01:24 -0000	1.43
+++ .cvsignore	25 Aug 2009 13:59:03 -0000	1.44
@@ -1 +1 @@
-GConf-2.26.2.tar.bz2
+GConf-2.27.0.tar.bz2


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- GConf2.spec	10 Aug 2009 08:34:29 -0000	1.111
+++ GConf2.spec	25 Aug 2009 13:59:03 -0000	1.112
@@ -6,8 +6,8 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.26.2
-Release: 6%{?dist}
+Version: 2.27.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.26/GConf-%{version}.tar.bz2
@@ -39,10 +39,6 @@ Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
 
-# http://bugzilla.redhat.com/show_bug.cgi?id=498370
-# http://bugzilla.gnome.org/show_bug.cgi?id=585303
-Patch2: polkit1.patch
-
 
 %description
 GConf is a process-transparent configuration database API used to
@@ -79,7 +75,6 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
-%patch2 -p1 -b .polkit1
 
 autoreconf -f -i
 
@@ -156,6 +151,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.0-1
+- Update to 2.27.0
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.26.2-6
 - Convert specfile to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	16 May 2009 00:01:25 -0000	1.43
+++ sources	25 Aug 2009 13:59:03 -0000	1.44
@@ -1 +1 @@
-8b55d58dab13e821e048627aa4f92b8b  GConf-2.26.2.tar.bz2
+bfc1c5494c7b9eebe24687df95036bbd  GConf-2.27.0.tar.bz2



From allisson at fedoraproject.org  Tue Aug 25 14:03:47 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 25 Aug 2009 14:03:47 +0000 (UTC)
Subject: rpms/emesene/devel emesene-1.5-pythonpath.patch, NONE,
	1.1 emesene.spec, 1.9, 1.10 import.log, 1.1, 1.2
Message-ID: <20090825140347.DA16711C0348@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19332/devel

Modified Files:
	emesene.spec import.log 
Added Files:
	emesene-1.5-pythonpath.patch 
Log Message:

- Added libmimic to pythonpath.
- Package own /usr/share/emesene now.


emesene-1.5-pythonpath.patch:
 emesene |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE emesene-1.5-pythonpath.patch ---
diff -up emesene-1.5/emesene.pythonpath emesene-1.5/emesene
--- emesene-1.5/emesene.pythonpath	2009-08-25 10:09:10.052277308 -0300
+++ emesene-1.5/emesene	2009-08-25 10:09:54.330009511 -0300
@@ -17,6 +17,9 @@
 #    along with emesene; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import os, sys
+sys.path.append('/usr/lib/emesene/')
+
 try:
     # Change the process name.
     import ctypes


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/emesene.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- emesene.spec	25 Aug 2009 05:12:43 -0000	1.9
+++ emesene.spec	25 Aug 2009 14:03:47 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           emesene
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?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
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -33,6 +34,7 @@ picture.
 
 %prep
 %setup -q
+%patch0 -p1 -b .pythonpath
 find -name \*~ |xargs rm -fv
 
 
@@ -66,6 +68,7 @@ cd %{_datadir}/%name
 exec ./%name
 EOF
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,8 +90,10 @@ fi
 %defattr(-,root,root)
 %doc README COPYING
 %attr(755,root,root) %_bindir/%name
-%_mandir/man1/%name.1*
+%{_mandir}/man1/%name.1*
+%dir %{_datadir}/%name
 %{_datadir}/%name/%name
+%exclude %{_datadir}/%name/%name.pythonpath
 %{_datadir}/%name/*.py
 %{_datadir}/%name/*.pyc
 %{_datadir}/%name/*.pyo
@@ -97,7 +102,7 @@ fi
 %{_datadir}/%name/conversation_themes
 %{_datadir}/%name/emesenelib
 %{_datadir}/%name/hotmlog.htm
-%_libdir/%name/libmimic.so
+%{_libdir}/%name/libmimic.so
 %{_datadir}/%name/misc
 %{_datadir}/%name/plugins_base
 %{_datadir}/%name/smilies
@@ -106,11 +111,14 @@ fi
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
-
-%_datadir/applications/%name.desktop
+%{_datadir}/applications/%name.desktop
 
 
 %changelog
+* Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-3
+- Added libmimic to pythonpath.
+- Package own /usr/share/emesene now.
+
 * Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-2
 - Added python-devel to BR.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Aug 2009 05:12:43 -0000	1.1
+++ import.log	25 Aug 2009 14:03:47 -0000	1.2
@@ -1 +1,2 @@
 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



From allisson at fedoraproject.org  Tue Aug 25 14:05:47 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 25 Aug 2009 14:05:47 +0000 (UTC)
Subject: rpms/emesene/F-11 emesene-1.5-pythonpath.patch, NONE,
	1.1 emesene.spec, 1.8, 1.9 import.log, 1.1, 1.2
Message-ID: <20090825140547.A4FD511C0348@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739/F-11

Modified Files:
	emesene.spec import.log 
Added Files:
	emesene-1.5-pythonpath.patch 
Log Message:

- Added libmimic to pythonpath.
- Package own /usr/share/emesene now.


emesene-1.5-pythonpath.patch:
 emesene |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE emesene-1.5-pythonpath.patch ---
diff -up emesene-1.5/emesene.pythonpath emesene-1.5/emesene
--- emesene-1.5/emesene.pythonpath	2009-08-25 10:09:10.052277308 -0300
+++ emesene-1.5/emesene	2009-08-25 10:09:54.330009511 -0300
@@ -17,6 +17,9 @@
 #    along with emesene; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import os, sys
+sys.path.append('/usr/lib/emesene/')
+
 try:
     # Change the process name.
     import ctypes


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/emesene.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- emesene.spec	25 Aug 2009 05:14:46 -0000	1.8
+++ emesene.spec	25 Aug 2009 14:05:47 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           emesene
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?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
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -33,6 +34,7 @@ picture.
 
 %prep
 %setup -q
+%patch0 -p1 -b .pythonpath
 find -name \*~ |xargs rm -fv
 
 
@@ -66,6 +68,7 @@ cd %{_datadir}/%name
 exec ./%name
 EOF
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,8 +90,10 @@ fi
 %defattr(-,root,root)
 %doc README COPYING
 %attr(755,root,root) %_bindir/%name
-%_mandir/man1/%name.1*
+%{_mandir}/man1/%name.1*
+%dir %{_datadir}/%name
 %{_datadir}/%name/%name
+%exclude %{_datadir}/%name/%name.pythonpath
 %{_datadir}/%name/*.py
 %{_datadir}/%name/*.pyc
 %{_datadir}/%name/*.pyo
@@ -97,7 +102,7 @@ fi
 %{_datadir}/%name/conversation_themes
 %{_datadir}/%name/emesenelib
 %{_datadir}/%name/hotmlog.htm
-%_libdir/%name/libmimic.so
+%{_libdir}/%name/libmimic.so
 %{_datadir}/%name/misc
 %{_datadir}/%name/plugins_base
 %{_datadir}/%name/smilies
@@ -106,11 +111,14 @@ fi
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
-
-%_datadir/applications/%name.desktop
+%{_datadir}/applications/%name.desktop
 
 
 %changelog
+* Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-3
+- Added libmimic to pythonpath.
+- Package own /usr/share/emesene now.
+
 * Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-2
 - Added python-devel to BR.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Aug 2009 05:14:46 -0000	1.1
+++ import.log	25 Aug 2009 14:05:47 -0000	1.2
@@ -1 +1,2 @@
 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



From sharkcz at fedoraproject.org  Tue Aug 25 14:06:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 25 Aug 2009 14:06:03 +0000 (UTC)
Subject: rpms/scribus/devel scribus.spec,1.50,1.51
Message-ID: <20090825140603.3FCED11C0348@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19842

Modified Files:
	scribus.spec 
Log Message:
* Tue Aug 25 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-3
- drop shebang line from python scripts
- don't package precompiled python scripts



Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- scribus.spec	21 Aug 2009 15:46:32 -0000	1.50
+++ scribus.spec	25 Aug 2009 14:06:03 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -87,6 +87,14 @@ popd
 # fix permissions
 chmod a-x scribus/pageitem_latexframe.h
 
+# drop shebang lines from python scripts
+for f in scribus/plugins/scriptplugin/{samples,scripts}/*.py
+do
+    sed '1{/#!\/usr\/bin\/env\|#!\/usr\/bin\/python/d}' $f > $f.new
+    touch -r $f $f.new
+    mv $f.new $f
+done
+
 
 %build
 mkdir build
@@ -142,11 +150,13 @@ update-mime-database %{_datadir}/mime > 
 %doc %{_datadir}/doc/%{name}-%{version}/README
 %doc %{_datadir}/doc/%{name}-%{version}/TODO
 %{_bindir}/%{name}
-%{_datadir}/applications/fedora-scribus.desktop
-%{_datadir}/mime/packages/scribus.xml
+%{_libdir}/%{name}
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/*
 %{_datadir}/%{name}
-%{_libdir}/%{name}
+%exclude %{_datadir}/%{name}/samples/*.py[co]
+%exclude %{_datadir}/%{name}/scripts/*.py[co]
 %{_mandir}/man1/*
 %{_mandir}/pl/man1/*
 %{_mandir}/de/man1/*
@@ -173,6 +183,10 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Tue Aug 25 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-3
+- drop shebang line from python scripts
+- don't package precompiled python scripts
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.5.1-2
 - rebuilt with new openssl
 



From allisson at fedoraproject.org  Tue Aug 25 14:07:59 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Tue, 25 Aug 2009 14:07:59 +0000 (UTC)
Subject: rpms/emesene/F-10 emesene-1.5-pythonpath.patch, NONE,
	1.1 emesene.spec, 1.6, 1.7 import.log, 1.1, 1.2
Message-ID: <20090825140759.0DFE711C0348@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20249/F-10

Modified Files:
	emesene.spec import.log 
Added Files:
	emesene-1.5-pythonpath.patch 
Log Message:

- Added libmimic to pythonpath.
- Package own /usr/share/emesene now.


emesene-1.5-pythonpath.patch:
 emesene |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE emesene-1.5-pythonpath.patch ---
diff -up emesene-1.5/emesene.pythonpath emesene-1.5/emesene
--- emesene-1.5/emesene.pythonpath	2009-08-25 10:09:10.052277308 -0300
+++ emesene-1.5/emesene	2009-08-25 10:09:54.330009511 -0300
@@ -17,6 +17,9 @@
 #    along with emesene; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import os, sys
+sys.path.append('/usr/lib/emesene/')
+
 try:
     # Change the process name.
     import ctypes


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/emesene.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- emesene.spec	25 Aug 2009 05:16:08 -0000	1.6
+++ emesene.spec	25 Aug 2009 14:07:58 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           emesene
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?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
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -33,6 +34,7 @@ picture.
 
 %prep
 %setup -q
+%patch0 -p1 -b .pythonpath
 find -name \*~ |xargs rm -fv
 
 
@@ -66,6 +68,7 @@ cd %{_datadir}/%name
 exec ./%name
 EOF
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,8 +90,10 @@ fi
 %defattr(-,root,root)
 %doc README COPYING
 %attr(755,root,root) %_bindir/%name
-%_mandir/man1/%name.1*
+%{_mandir}/man1/%name.1*
+%dir %{_datadir}/%name
 %{_datadir}/%name/%name
+%exclude %{_datadir}/%name/%name.pythonpath
 %{_datadir}/%name/*.py
 %{_datadir}/%name/*.pyc
 %{_datadir}/%name/*.pyo
@@ -97,7 +102,7 @@ fi
 %{_datadir}/%name/conversation_themes
 %{_datadir}/%name/emesenelib
 %{_datadir}/%name/hotmlog.htm
-%_libdir/%name/libmimic.so
+%{_libdir}/%name/libmimic.so
 %{_datadir}/%name/misc
 %{_datadir}/%name/plugins_base
 %{_datadir}/%name/smilies
@@ -106,11 +111,14 @@ fi
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
-
-%_datadir/applications/%name.desktop
+%{_datadir}/applications/%name.desktop
 
 
 %changelog
+* Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-3
+- Added libmimic to pythonpath.
+- Package own /usr/share/emesene now.
+
 * Tue Aug 25 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-2
 - Added python-devel to BR.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Aug 2009 05:16:08 -0000	1.1
+++ import.log	25 Aug 2009 14:07:58 -0000	1.2
@@ -1 +1,2 @@
 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



From bpepple at fedoraproject.org  Tue Aug 25 14:26:49 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 25 Aug 2009 14:26:49 +0000 (UTC)
Subject: rpms/telepathy-farsight/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 telepathy-farsight.spec, 1.7, 1.8
Message-ID: <20090825142649.F147A11C0348@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24130

Modified Files:
	.cvsignore sources telepathy-farsight.spec 
Log Message:
* Tue Aug 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
- Update to 0.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 Aug 2009 00:45:45 -0000	1.5
+++ .cvsignore	25 Aug 2009 14:26:49 -0000	1.6
@@ -1 +1 @@
-telepathy-farsight-0.0.8.tar.gz
+telepathy-farsight-0.0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 Aug 2009 00:45:45 -0000	1.5
+++ sources	25 Aug 2009 14:26:49 -0000	1.6
@@ -1 +1 @@
-dbb982402a1a4b0c2051a7071685a0f0  telepathy-farsight-0.0.8.tar.gz
+7dcabefe3880b592323397c0218662a0  telepathy-farsight-0.0.9.tar.gz


Index: telepathy-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/telepathy-farsight.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- telepathy-farsight.spec	11 Aug 2009 00:45:45 -0000	1.7
+++ telepathy-farsight.spec	25 Aug 2009 14:26:49 -0000	1.8
@@ -5,7 +5,7 @@
 %define farsight2_ver   0.0.14
 
 Name:           telepathy-farsight
-Version:        0.0.8
+Version:        0.0.9
 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
+* Tue Aug 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.9-1
+- Update to 0.0.9.
+
 * Thu Aug  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.8-1
 - Update to 0.0.8.
 



From mlichvar at fedoraproject.org  Tue Aug 25 14:28:32 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 25 Aug 2009 14:28:32 +0000 (UTC)
Subject: rpms/conky/devel .cvsignore, 1.10, 1.11 conky.spec, 1.17,
	1.18 sources, 1.10, 1.11 conky-1.7.1.1-nonxft.patch, 1.1, NONE
Message-ID: <20090825142832.B774511C0348@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/conky/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24439

Modified Files:
	.cvsignore conky.spec sources 
Removed Files:
	conky-1.7.1.1-nonxft.patch 
Log Message:
- Update to 1.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Jun 2009 11:56:55 -0000	1.10
+++ .cvsignore	25 Aug 2009 14:28:32 -0000	1.11
@@ -1 +1 @@
-conky-1.7.1.1.tar.bz2
+conky-1.7.2.tar.bz2


Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/conky.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- conky.spec	24 Jul 2009 19:25:53 -0000	1.17
+++ conky.spec	25 Aug 2009 14:28:32 -0000	1.18
@@ -2,6 +2,8 @@
 %bcond_without audacious
 %bcond_with imlib
 %bcond_without lua
+%bcond_without lua_cairo
+%bcond_with lua_imlib
 %bcond_with moc
 %bcond_without mpd
 %bcond_with nvidia
@@ -10,8 +12,8 @@
 %bcond_without wlan
 
 Name:           conky 
-Version:        1.7.1.1
-Release:        3%{?dist}
+Version:        1.7.2
+Release:        1%{?dist}
 Summary:        A system monitor for X 
 
 Group:          User Interface/X
@@ -19,7 +21,6 @@ License:        GPLv3+
 URL:            http://conky.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         conky-1.7.1.1-nonxft.patch
 
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
@@ -32,6 +33,8 @@ BuildRequires:  dbus-glib-devel
 %{?with_alsa:BuildRequires: alsa-lib-devel}
 %{?with_imlib:BuildRequires: imlib2-devel}
 %{?with_lua:BuildRequires: lua-devel}
+%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel}
+%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel}
 %{?with_nvidia:BuildRequires: libXNVCtrl-devel}
 %{?with_rss:BuildRequires: curl-devel libxml2-devel}
 %{?with_wlan:BuildRequires: wireless-tools-devel}
@@ -42,7 +45,6 @@ It just keeps on given'er. Yeah.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nonxft
 
 for i in AUTHORS; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -54,6 +56,8 @@ done
 %{?with_audacious: --enable-audacious=yes} \
 %{?with_imlib:     --enable-imlib2} \
 %{!?with_lua:      --disable-lua} \
+%{?with_lua_cairo: --enable-lua-cairo} \
+%{?with_lua_imlib: --enable-lua-imlib2} \
 %{!?with_moc:      --disable-moc} \
 %{!?with_mpd:      --disable-mpd} \
 %{?with_nvidia:    --enable-nvidia} \
@@ -69,6 +73,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conky/conky_no_x11.conf
+rm -f $RPM_BUILD_ROOT%{_libdir}/conky/*.{la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,10 +86,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/conky
 %config %{_sysconfdir}/conky/conky.conf
 %{_bindir}/*
+%if %{with lua_cairo} || %{with lua_imlib}
+%{_libdir}/conky
+%endif
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Aug 25 2009 Miroslav Lichvar <mlichvar at redhat.com> - 1.7.2-1
+- Update to 1.7.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Jun 2009 11:56:56 -0000	1.10
+++ sources	25 Aug 2009 14:28:32 -0000	1.11
@@ -1 +1 @@
-153a661e78a466c95b1b332e7cd599cb  conky-1.7.1.1.tar.bz2
+cf6f5d45d42ad68c618c00271813b80d  conky-1.7.2.tar.bz2


--- conky-1.7.1.1-nonxft.patch DELETED ---



From than at fedoraproject.org  Tue Aug 25 14:30:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 25 Aug 2009 14:30:04 +0000 (UTC)
Subject: rpms/doxygen/F-10 doxygen-1.6.0-config.patch, NONE,
	1.1 doxygen-1.6.0-timestamp.patch, NONE, 1.1 doxygen.spec, 1.58,
	1.59 sources, 1.29, 1.30 doxygen-1.5.5-system-png.patch, 1.2,
	NONE doxygen-1.5.8-config.patch, 1.1,
	NONE doxygen-1.5.8-qt4.patch, 1.1, NONE
Message-ID: <20090825143004.4192111C043D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/doxygen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24765

Modified Files:
	doxygen.spec sources 
Added Files:
	doxygen-1.6.0-config.patch doxygen-1.6.0-timestamp.patch 
Removed Files:
	doxygen-1.5.5-system-png.patch doxygen-1.5.8-config.patch 
	doxygen-1.5.8-qt4.patch 
Log Message:
1.6.1


doxygen-1.6.0-config.patch:
 Makefile.in                    |    2 --
 addon/doxywizard/Makefile.in   |   10 ++++------
 configure                      |    5 ++++-
 tmake/lib/linux-g++/tmake.conf |   14 +++++++-------
 4 files changed, 15 insertions(+), 16 deletions(-)

--- NEW FILE doxygen-1.6.0-config.patch ---
diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
--- doxygen-1.6.0/addon/doxywizard/Makefile.in.config	2009-07-13 22:09:03.000000000 +0200
+++ doxygen-1.6.0/addon/doxywizard/Makefile.in	2009-08-21 16:42:13.000000000 +0200
@@ -10,8 +10,6 @@
 # See the GNU General Public License for more details.
 # 
 
-QMAKE=qmake
-
 all: Makefile.doxywizard  
 	$(MAKE) -f Makefile.doxywizard 
 
@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
 	$(RM) Makefile.doxywizard
 
 install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin	
+	$(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
 	cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-	$(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
+	$(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
 	rm doxywizard.1
 
 FORCE:
diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
--- doxygen-1.6.0/configure.config	2009-08-20 14:15:07.000000000 +0200
+++ doxygen-1.6.0/configure	2009-08-21 16:41:36.000000000 +0200
@@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
   if test -z "$QTDIR"; then
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+    for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
       if test -x "$d/bin/qmake"; then
         QTDIR=$d
+        QMAKE=$d/bin/qmake
       fi
     done
   else
@@ -485,6 +486,8 @@ INSTTOOL  = $f_insttool
 DOXYDOCS  = ..
 DOCDIR    = $f_docdir
 QTDIR     = $QTDIR
+QMAKE     = $QMAKE
+MAN1DIR    = share/man/man1
 EOF
 
 if test "$f_dot" != NO; then
diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
--- doxygen-1.6.0/Makefile.in.config	2009-08-14 15:58:42.000000000 +0200
+++ doxygen-1.6.0/Makefile.in	2009-08-21 16:34:02.000000000 +0200
@@ -44,8 +44,6 @@ distclean: clean
 
 DATE=$(shell date "+%B %Y")
 
-MAN1DIR = man/man1
-
 install: doxywizard_install 
 	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
 	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
diff -up doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config	2008-12-06 14:16:20.000000000 +0100
+++ doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf	2009-08-21 16:34:02.000000000 +0200
@@ -11,7 +11,7 @@ TMAKE_CC		= gcc
 TMAKE_CFLAGS		= -pipe
 TMAKE_CFLAGS_WARN_ON	= -Wall -W -fno-exceptions
 TMAKE_CFLAGS_WARN_OFF	=
-TMAKE_CFLAGS_RELEASE	= -O2
+TMAKE_CFLAGS_RELEASE	= $(RPM_OPT_FLAGS)
 TMAKE_CFLAGS_DEBUG	= -g
 TMAKE_CFLAGS_SHLIB	= -fPIC
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YAC
 
 TMAKE_INCDIR		=
 TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+TMAKE_INCDIR_X11	=
+TMAKE_LIBDIR_X11	=
+TMAKE_INCDIR_QT		=
+TMAKE_LIBDIR_QT		=
+TMAKE_INCDIR_OPENGL	=
+TMAKE_LIBDIR_OPENGL	=
 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++

doxygen-1.6.0-timestamp.patch:
 config.xml        |    4 ++++
 configoptions.cpp |    8 ++++++++
 htmlgen.cpp       |    5 ++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE doxygen-1.6.0-timestamp.patch ---
diff -up doxygen-1.6.0/src/config.cpp.orig doxygen-1.6.0/src/config.cpp
diff -up doxygen-1.6.0/src/config.l.orig doxygen-1.6.0/src/config.l
diff -up doxygen-1.6.0/src/configoptions.cpp.orig doxygen-1.6.0/src/configoptions.cpp
--- doxygen-1.6.0/src/configoptions.cpp.orig	2009-08-24 12:04:45.000000000 +0200
+++ doxygen-1.6.0/src/configoptions.cpp	2009-08-24 12:06:34.000000000 +0200
@@ -1072,6 +1072,14 @@ void addConfigOptions(Config *cfg)
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
+  cb = cfg->addBool(
+                 "HTML_TIMESTAMP",
+                 "If the HTML_TIMESTAMP tag is set to YES then the generated HTML\n"
+                 "documentation will contain the timesstamp.",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTML");
+  //----
   cs = cfg->addString(
                  "HTML_STYLESHEET",
                  "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"
diff -up doxygen-1.6.0/src/config.xml.orig doxygen-1.6.0/src/config.xml
--- doxygen-1.6.0/src/config.xml.orig	2009-08-24 11:55:46.000000000 +0200
+++ doxygen-1.6.0/src/config.xml	2009-08-24 12:03:06.000000000 +0200
@@ -751,6 +751,10 @@ The HTML_FOOTER tag can be used to speci
 each generated HTML page. If it is left blank doxygen will generate a 
 standard footer. 
 ' defval='' depends='GENERATE_HTML'/>
+    <option type='bool' id='HTML_TIMESTAMP' docs='
+If the HTML_TIMESTAMP tag is set to YES then the generated HTML
+documentation will contain the timesstamp.
+' defval='' depends='GENERATE_HTML'/>
     <option type='string' id='HTML_STYLESHEET' format='file' docs='
 The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 style sheet that is used by each HTML page. It can be used to 
diff -up doxygen-1.6.0/src/htmlgen.cpp.orig doxygen-1.6.0/src/htmlgen.cpp
--- doxygen-1.6.0/src/htmlgen.cpp.orig	2009-08-24 11:55:20.000000000 +0200
+++ doxygen-1.6.0/src/htmlgen.cpp	2009-08-24 11:53:29.000000000 +0200
@@ -56,6 +56,7 @@ static const char search_script[]=
 
 static QCString g_header;
 static QCString g_footer;
+static bool timestamp=false;
 
 //------------------------- Pictures for the Tabs ------------------------
 
@@ -640,6 +641,8 @@ void HtmlGenerator::init()
   if (!Config_getString("HTML_FOOTER").isEmpty()) 
   {
     g_footer=fileToString(Config_getString("HTML_FOOTER"));
+    if (Config_getBool("HTML_TIMESTAMP"))
+      timestamp=true;
     //printf("g_footer='%s'\n",g_footer.data());
   }
   createSubDirs(d);
@@ -864,7 +867,7 @@ static void writePageFooter(QTextStream 
   {
     t << "<hr size=\"1\"/><address style=\"text-align: right;\"><small>";
     t << theTranslator->trGeneratedAt(
-        dateToString(TRUE),
+        dateToString(timestamp),
         Config_getString("PROJECT_NAME")
         );
     t << "&nbsp;" << endl << "<a href=\"http://www.doxygen.org/index.html\">";


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-10/doxygen.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- doxygen.spec	3 Jul 2009 10:59:38 -0000	1.58
+++ doxygen.spec	25 Aug 2009 14:30:04 -0000	1.59
@@ -5,17 +5,16 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.9
+Version: 1.6.1
 Release: 1%{?dist}
 Epoch: 1
+Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-Patch1: doxygen-1.5.8-config.patch
-Patch2: doxygen-1.5.8-qt4.patch
-Patch3: doxygen-1.5.5-system-png.patch
+Patch1: doxygen-1.6.0-config.patch
+Patch2: doxygen-1.6.0-timestamp.patch
 Group: Development/Tools
 # No version is specified.
 License: GPL+
-Url: http://www.stack.nl/~dimitri/doxygen/index.html
 
 BuildRequires: perl
 BuildRequires: texlive-dvips
@@ -51,8 +50,7 @@ are used by doxygen.
 %setup -q
 
 %patch1 -p1 -b .config
-%patch2 -p1 -b .qt4
-%patch3 -p1 -b .system-png
+%patch2 -p1 -b .timestamp
 
 %build
 unset QTDIR
@@ -103,6 +101,22 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Than Ngo <than at redhat.com> - 1.6.1-1
+- 1.6.1
+
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 1.6.0-2
+- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
+  HTMP_TIMESTAMP is disable by default
+
+* Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.6.0-1
+- 1.6.0
+
+* Mon Aug 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.5.9-3
+- Convert specfile to UTF-8.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 03 2009 Than Ngo <than at redhat.com> - 1.5.9-1
 - 1.5.9
 
@@ -319,7 +333,7 @@ rm -rf %{buildroot}
 * Wed Mar 14 2001 Jeff Johnson <jbj at redhat.com>
 - update to 1.2.6
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - rebuild
 
 * Tue Dec 26 2000 Than Ngo <than at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	3 Jul 2009 10:59:38 -0000	1.29
+++ sources	25 Aug 2009 14:30:04 -0000	1.30
@@ -1 +1 @@
-33c5598fa6d24cbc55849eaf89652557  doxygen-1.5.9.src.tar.gz
+2ec343643e134f0d3ce2069420bcb4f0  doxygen-1.6.1.src.tar.gz


--- doxygen-1.5.5-system-png.patch DELETED ---


--- doxygen-1.5.8-config.patch DELETED ---


--- doxygen-1.5.8-qt4.patch DELETED ---



From tmraz at fedoraproject.org  Tue Aug 25 14:38:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 14:38:53 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc-openssl.patch,NONE,1.1 kvirc.spec,1.3,1.4
Message-ID: <20090825143853.23C6411C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26111

Modified Files:
	kvirc.spec 
Added Files:
	kvirc-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
- rebuilt with new openssl


kvirc-openssl.patch:
 kvi_ssl.cpp |    9 ++++++++-
 kvi_ssl.h   |    4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE kvirc-openssl.patch ---
diff -up kvirc/src/kvilib/net/kvi_ssl.cpp.openssl kvirc/src/kvilib/net/kvi_ssl.cpp
--- kvirc/src/kvilib/net/kvi_ssl.cpp.openssl	2008-11-22 18:16:20.000000000 +0100
+++ kvirc/src/kvilib/net/kvi_ssl.cpp	2009-08-25 16:35:41.000000000 +0200
@@ -474,7 +474,11 @@ KviSSLCertificate * KviSSL::getPeerCerti
 KviSSLCipherInfo * KviSSL::getCurrentCipherInfo()
 {
 	if(!m_pSSL)return 0;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
+#else
 	SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
+#endif
 	if(!c)return 0;
 	return new KviSSLCipherInfo(c);
 }
@@ -652,8 +656,11 @@ const char * KviSSLCertificate::verify()
 }
 */
 
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+KviSSLCipherInfo::KviSSLCipherInfo(const SSL_CIPHER * c)
+#else
 KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c)
+#endif
 {
 	m_szVersion = SSL_CIPHER_get_version(c);
 	m_iNumBitsUsed = SSL_CIPHER_get_bits(c,&m_iNumBits);
diff -up kvirc/src/kvilib/net/kvi_ssl.h.openssl kvirc/src/kvilib/net/kvi_ssl.h
--- kvirc/src/kvilib/net/kvi_ssl.h.openssl	2008-09-18 04:11:05.000000000 +0200
+++ kvirc/src/kvilib/net/kvi_ssl.h	2009-08-25 16:36:59.000000000 +0200
@@ -100,7 +100,11 @@ public:
 class KVILIB_API KviSSLCipherInfo
 {
 public:
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	KviSSLCipherInfo(const SSL_CIPHER * c);
+#else
 	KviSSLCipherInfo(SSL_CIPHER * c);
+#endif
 	~KviSSLCipherInfo();
 protected:
 	KviStr       m_szVersion;


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kvirc.spec	21 Aug 2009 14:11:40 -0000	1.3
+++ kvirc.spec	25 Aug 2009 14:38:52 -0000	1.4
@@ -13,6 +13,7 @@ URL:              http://kvirc.net/
 #  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
 Patch0:           kvirc-flags.patch
+Patch1:           kvirc-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -29,6 +30,7 @@ many IRC addicted developers around the 
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{cmake}
@@ -119,7 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173



From rathann at fedoraproject.org  Tue Aug 25 14:39:57 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 25 Aug 2009 14:39:57 +0000 (UTC)
Subject: rpms/libEMF/devel .cvsignore, 1.2, 1.3 libEMF.spec, 1.8, 1.9 sources,
	1.2, 1.3 libEMF-gcc43.patch, 1.1, NONE
Message-ID: <20090825143957.30DC311C0348@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libEMF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26334

Modified Files:
	.cvsignore libEMF.spec sources 
Removed Files:
	libEMF-gcc43.patch 
Log Message:
* Tue Aug 25 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.0.4-1
- updated to 1.0.4
- updated source URL
- dropped obsolete patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libEMF/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Nov 2006 06:53:23 -0000	1.2
+++ .cvsignore	25 Aug 2009 14:39:56 -0000	1.3
@@ -1 +1 @@
-libEMF-1.0.3.tar.gz
+libEMF-1.0.4.tar.gz


Index: libEMF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libEMF/devel/libEMF.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libEMF.spec	25 Jul 2009 05:06:55 -0000	1.8
+++ libEMF.spec	25 Aug 2009 14:39:57 -0000	1.9
@@ -1,15 +1,14 @@
 Summary:	A library for generating Enhanced Metafiles
 Summary(pl):	Biblioteka do generowania plik?w w formacie Enhanced Metafile
 Name:		libEMF
-Version:	1.0.3
-Release:	10%{?dist}
+Version:	1.0.4
+Release:	1%{?dist}
 License:	LGPLv2+ and GPLv2+
 Group:		System Environment/Libraries
-Source0:	http://dl.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
 # Source0-md5:	a4e91fd8077ce5f540f569e20e8ef7ff
 Patch0:		%{name}-amd64.patch
 Patch1:		%{name}-axp.patch
-Patch2:		%{name}-gcc43.patch
 Patch3:		%{name}-s390.patch
 URL:		http://libemf.sourceforge.net/
 BuildRequires:	libstdc++-devel
@@ -47,7 +46,6 @@ Pliki nag??wkowe libEMF.
 %setup -q
 %patch0 -p1 -b .amd64
 %patch1 -p1 -b .axp
-%patch2 -p1 -b .gcc43
 %patch3 -p1 -b .s390
 chmod 0644 libemf/libemf.h
 
@@ -94,6 +92,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libEMF
 
 %changelog
+* Tue Aug 25 2009 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.0.4-1
+- updated to 1.0.4
+- updated source URL
+- dropped obsolete patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libEMF/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Nov 2006 06:53:23 -0000	1.2
+++ sources	25 Aug 2009 14:39:57 -0000	1.3
@@ -1 +1 @@
-a4e91fd8077ce5f540f569e20e8ef7ff  libEMF-1.0.3.tar.gz
+4e74e5ee5fdab37bae8be6cde4d1c57c  libEMF-1.0.4.tar.gz


--- libEMF-gcc43.patch DELETED ---



From twaugh at fedoraproject.org  Tue Aug 25 14:57:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 14:57:56 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.228,1.229
Message-ID: <20090825145756.48ACB11C0348@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29528

Modified Files:
	hplip.spec 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
- New common sub-package for udev rules and config file (bug #516459).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- hplip.spec	25 Aug 2009 11:08:02 -0000	1.228
+++ hplip.spec	25 Aug 2009 14:57:55 -0000	1.229
@@ -48,10 +48,19 @@ BuildRequires: dbus-devel
 The Hewlett-Packard Linux Imaging and Printing Project provides
 drivers for HP printers and multi-function peripherals.
 
+%package common
+Summary: Files needed by the HPLIP printer and scanner drivers
+Group: System Environment/Libraries
+License: GPLv2+
+
+%description common
+Files needed by the HPLIP printer and scanner drivers.
+
 %package libs
 Summary: HPLIP libraries
 Group: System Environment/Libraries
 License: GPLv2+ and MIT
+Requires: %{name}-common = %{version}-%{release}
 
 %description libs
 Libraries needed by HPLIP.
@@ -185,9 +194,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_sysconfdir}/udev/rules.d/*
-%dir %{_sysconfdir}/hp
-%config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
@@ -219,7 +225,6 @@ rm -rf %{buildroot}
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
 # Files
-%dir %{_datadir}/hplip
 %{_datadir}/hplip/align.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
@@ -252,10 +257,8 @@ rm -rf %{buildroot}
 # Directories
 %{_datadir}/hplip/base
 %{_datadir}/hplip/copier
-%dir %{_datadir}/hplip/data
 %{_datadir}/hplip/data/ldl
 %{_datadir}/hplip/data/localization
-%{_datadir}/hplip/data/models
 %{_datadir}/hplip/data/pcl
 %{_datadir}/hplip/data/ps
 %{_datadir}/hplip/installer
@@ -264,6 +267,15 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/scan
 %{_localstatedir}/lib/hp
 
+%files common
+%defattr(-,root,root,-)
+%{_sysconfdir}/udev/rules.d/*
+%dir %{_sysconfdir}/hp
+%config(noreplace) %{_sysconfdir}/hp/hplip.conf
+%dir %{_datadir}/hplip
+%dir %{_datadir}/hplip/data
+%{_datadir}/hplip/data/models
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/libhpip.so.*
@@ -326,6 +338,7 @@ exit 0
 
 %changelog
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
+- New common sub-package for udev rules and config file (bug #516459).
 - Don't install base/*.py with executable bit set.
 
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8



From twaugh at fedoraproject.org  Tue Aug 25 15:01:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 15:01:39 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.224,1.225
Message-ID: <20090825150139.EC67911C0348@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30052

Modified Files:
	hplip.spec 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
- New common sub-package for hal rules and config file (bug #516459).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- hplip.spec	25 Aug 2009 11:09:03 -0000	1.224
+++ hplip.spec	25 Aug 2009 15:01:39 -0000	1.225
@@ -49,10 +49,19 @@ BuildRequires: dbus-devel
 The Hewlett-Packard Linux Imaging and Printing Project provides
 drivers for HP printers and multi-function peripherals.
 
+%package common
+Summary: Files needed by the HPLIP printer and scanner drivers
+Group: System Environment/Libraries
+License: GPLv2+
+
+%description common
+Files needed by the HPLIP printer and scanner drivers.
+
 %package libs
 Summary: HPLIP libraries
 Group: System Environment/Libraries
 License: GPLv2+ and MIT
+Requires: %{name}-common = %{version}-%{release}
 
 %description libs
 Libraries needed by HPLIP.
@@ -193,9 +202,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-%dir %{_sysconfdir}/hp
-%config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
@@ -227,7 +233,6 @@ rm -rf %{buildroot}
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
 # Files
-%dir %{_datadir}/hplip
 %{_datadir}/hplip/align.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
@@ -260,10 +265,8 @@ rm -rf %{buildroot}
 # Directories
 %{_datadir}/hplip/base
 %{_datadir}/hplip/copier
-%dir %{_datadir}/hplip/data
 %{_datadir}/hplip/data/ldl
 %{_datadir}/hplip/data/localization
-%{_datadir}/hplip/data/models
 %{_datadir}/hplip/data/pcl
 %{_datadir}/hplip/data/ps
 %{_datadir}/hplip/installer
@@ -272,6 +275,15 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/scan
 %{_localstatedir}/lib/hp
 
+%files common
+%defattr(-,root,root,-)
+%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%dir %{_sysconfdir}/hp
+%config(noreplace) %{_sysconfdir}/hp/hplip.conf
+%dir %{_datadir}/hplip
+%dir %{_datadir}/hplip/data
+%{_datadir}/hplip/data/models
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/libhpip.so.*
@@ -334,6 +346,7 @@ exit 0
 
 %changelog
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
+- New common sub-package for hal rules and config file (bug #516459).
 - Don't install base/*.py with executable bit set.
 
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8



From mlichvar at fedoraproject.org  Tue Aug 25 15:02:53 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 25 Aug 2009 15:02:53 +0000 (UTC)
Subject: rpms/readline/devel readline60-004, NONE, 1.1 readline.spec, 1.44,
	1.45
Message-ID: <20090825150253.82A2A11C0348@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/readline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30278

Modified Files:
	readline.spec 
Added Files:
	readline60-004 
Log Message:
- include patch 004
- suppress install-info errors (#515910)
- remove dir* in infodir after install (#492097)



--- NEW FILE readline60-004 ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 6.0
Patch-ID: readline60-004

Bug-Reported-by:	jim at jim.sh
Bug-Reference-ID:	<200905262140.n4QLeO4X030664 at psychosis.jim.sh>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00074.html

Bug-Description:

There are occasional cursor positioning errors when using readline's
horizontal scroll mode.

Patch:

*** ../readline-6.0-patched/display.c	2009-05-22 12:32:25.000000000 -0400
--- display.c	2009-05-29 23:32:20.000000000 -0400
***************
*** 1190,1196 ****
  	line[t - 1] = '>';
  
!       if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
  	{
  	  forced_display = 0;
  	  update_line (&visible_line[last_lmargin],
  		       &invisible_line[lmargin],
--- 1192,1200 ----
  	line[t - 1] = '>';
  
!       if (rl_display_fixed == 0 || forced_display || lmargin != last_lmargin)
  	{
  	  forced_display = 0;
+ 	  o_cpos = _rl_last_c_pos;
+ 	  cpos_adjusted = 0;
  	  update_line (&visible_line[last_lmargin],
  		       &invisible_line[lmargin],
***************
*** 1200,1203 ****
--- 1204,1214 ----
  		       0);
  
+ 	  if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
+ 	      cpos_adjusted == 0 &&
+ 	      _rl_last_c_pos != o_cpos &&
+ 	      _rl_last_c_pos > wrap_offset &&
+ 	      o_cpos < prompt_last_invisible)
+ 		_rl_last_c_pos -= prompt_invis_chars_first_line;	/* XXX - was wrap_offset */
+ 
  	  /* If the visible new line is shorter than the old, but the number
  	     of invisible characters is greater, and we are at the end of
*** ../readline-6.0/patchlevel	2008-11-18 11:01:14.000000000 -0500
--- patchlevel	2009-05-09 12:01:06.000000000 -0400
***************
*** 1,3 ****
  # Do not edit -- exists only for use by patch
  
! 3
--- 1,3 ----
  # Do not edit -- exists only for use by patch
  
! 4


Index: readline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/readline.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- readline.spec	27 Jul 2009 02:53:21 -0000	1.44
+++ readline.spec	25 Aug 2009 15:02:53 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A library for editing typed command lines
 Name: readline
 Version: 6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -9,6 +9,7 @@ Source: ftp://ftp.gnu.org/gnu/readline/r
 Patch1: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-001
 Patch2: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-002
 Patch3: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-003
+Patch4: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-004
 # fix file permissions, remove RPATH, use CFLAGS
 Patch20: readline-6.0-shlib.patch
 Requires(post): /sbin/install-info
@@ -52,6 +53,7 @@ library.
 %patch1 -p0 -b .001
 %patch2 -p0 -b .002
 %patch3 -p0 -b .003
+%patch4 -p0 -b .004
 %patch20 -p1 -b .shlib
 
 pushd examples
@@ -79,33 +81,33 @@ for l in $RPM_BUILD_ROOT%{_libdir}/libre
 done
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/readline
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir
-/sbin/install-info %{_infodir}/rluserman.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir &> /dev/null
+/sbin/install-info %{_infodir}/rluserman.info.gz %{_infodir}/dir &> /dev/null
 :
 
 %postun -p /sbin/ldconfig
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir
-   /sbin/install-info --delete %{_infodir}/rluserman.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir &> /dev/null
+   /sbin/install-info --delete %{_infodir}/rluserman.info.gz %{_infodir}/dir &> /dev/null
 fi
 :
 
 %post devel
-/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir &> /dev/null
 :
 
 %preun devel
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir &> /dev/null
 fi
 :
 
@@ -130,6 +132,11 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Aug 25 2009 Miroslav Lichvar <mlichvar at redhat.com> 6.0-3
+- include patch 004
+- suppress install-info errors (#515910)
+- remove dir* in infodir after install (#492097)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nphilipp at fedoraproject.org  Tue Aug 25 15:03:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 25 Aug 2009 15:03:04 +0000 (UTC)
Subject: rpms/system-config-services/devel .cvsignore, 1.82, 1.83 sources,
	1.95, 1.96 system-config-services.spec, 1.97, 1.98
Message-ID: <20090825150304.3C4DD11C0348@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30343

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.38



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	25 Aug 2009 10:54:55 -0000	1.82
+++ .cvsignore	25 Aug 2009 15:03:03 -0000	1.83
@@ -1 +1 @@
-system-config-services-0.99.37.tar.bz2
+system-config-services-0.99.38.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	25 Aug 2009 10:54:55 -0000	1.95
+++ sources	25 Aug 2009 15:03:03 -0000	1.96
@@ -1 +1 @@
-58f3ada2a1d5b22b3b8ccfcdc0bd5bd6  system-config-services-0.99.37.tar.bz2
+cb362b25657611310b8fe042ae970b1d  system-config-services-0.99.38.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- system-config-services.spec	25 Aug 2009 10:54:55 -0000	1.97
+++ system-config-services.spec	25 Aug 2009 15:03:04 -0000	1.98
@@ -11,7 +11,7 @@
 
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.37
+Version: 0.99.38
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -115,6 +115,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.38-1
+- always allow access if properly authorized
+
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.37-1
 - differentiate dbus interfaces in derived classes
 



From tmraz at fedoraproject.org  Tue Aug 25 15:11:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 15:11:05 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine-6.2u3-openssl.patch, NONE,
	1.1 gridengine.spec, 1.20, 1.21
Message-ID: <20090825151105.90E5011C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31707

Modified Files:
	gridengine.spec 
Added Files:
	gridengine-6.2u3-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
- rebuilt with new openssl


gridengine-6.2u3-openssl.patch:
 libs/comm/cl_ssl_framework.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE gridengine-6.2u3-openssl.patch ---
diff -up gridengine/source/libs/comm/cl_ssl_framework.c.openssl gridengine/source/libs/comm/cl_ssl_framework.c
--- gridengine/source/libs/comm/cl_ssl_framework.c.openssl	2009-08-25 17:06:53.000000000 +0200
+++ gridengine/source/libs/comm/cl_ssl_framework.c	2009-08-25 17:06:03.000000000 +0200
@@ -234,8 +234,15 @@ static const char*          (*cl_com_ssl
 static int                  (*cl_com_ssl_func__SSL_get_ex_data_X509_STORE_CTX_idx)  (void);
 static void*                (*cl_com_ssl_func__SSL_CTX_get_ex_data)                 (SSL_CTX *ssl,int idx);
 static int                  (*cl_com_ssl_func__SSL_CTX_set_ex_data)                 (SSL_CTX *ssl,int idx,void *data);
+/* ugly workaround for extremely ugly usage of OpenSSL API */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define SKVAL_RTYPE char
+#else
+#define SKVAL_RTYPE void
+#endif
 static int                  (*cl_com_ssl_func__sk_num)                              (const STACK *);
-static char*                (*cl_com_ssl_func__sk_value)                            (const STACK *, int);
+static SKVAL_RTYPE*         (*cl_com_ssl_func__sk_value)                            (const STACK *, int);
 static int                  (*cl_com_ssl_func__X509_STORE_get_by_subject)           (X509_STORE_CTX *vs,int type,X509_NAME *name, X509_OBJECT *ret);
 static void                 (*cl_com_ssl_func__EVP_PKEY_free)                       (EVP_PKEY *pkey);
 static void                 (*cl_com_ssl_func__X509_STORE_CTX_set_error)            (X509_STORE_CTX *ctx,int s);
@@ -1706,7 +1713,7 @@ static int cl_com_ssl_build_symbol_table
       }
 
       func_name = "sk_value";
-      cl_com_ssl_func__sk_value = (char* (*)(const STACK *, int))dlsym(cl_com_ssl_crypto_handle, func_name);
+      cl_com_ssl_func__sk_value = (SKVAL_RTYPE* (*)(const STACK *, int))dlsym(cl_com_ssl_crypto_handle, func_name);
       if (cl_com_ssl_func__sk_value == NULL) {
          CL_LOG_STR(CL_LOG_ERROR,"dlsym error: can't get function address:", func_name);
          had_errors++;
diff -up gridengine/source/security/sec/HOWTO.openssl gridengine/source/security/sec/HOWTO


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gridengine.spec	21 Aug 2009 13:46:03 -0000	1.20
+++ gridengine.spec	25 Aug 2009 15:11:03 -0000	1.21
@@ -68,6 +68,8 @@ Patch22: gridengine-6.2u2_1-rpath.patch
 Patch25: gridengine-6.2u2_1-libs.patch
 # Handle ignoring return codes
 Patch26: gridengine-6.2beta2-error.patch
+# Workaround for openssl-1.0 API change
+Patch27: gridengine-6.2u3-openssl.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
@@ -181,6 +183,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dis
 %patch22 -p1 -b .rpath
 %patch25 -p1 -b .libs
 %patch26 -p1 -b .error
+%patch27 -p1 -b .openssl
 sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
 #Don't ship rctemplates
 rm -rf source/dist/util/rctemplates
@@ -540,7 +543,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2u3-2



From rrakus at fedoraproject.org  Tue Aug 25 15:11:05 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 25 Aug 2009 15:11:05 +0000 (UTC)
Subject: rpms/powerpc-utils/devel powerpc-utils-1.2.0-chkconfig.patch, NONE, 
	1.1 .cvsignore, 1.5, 1.6 powerpc-utils.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <20090825151105.9617611C0372@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/powerpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31722

Modified Files:
	.cvsignore powerpc-utils.spec sources 
Added Files:
	powerpc-utils-1.2.0-chkconfig.patch 
Log Message:
rebase to 1.2.0

powerpc-utils-1.2.0-chkconfig.patch:
 ibmvscsis.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE powerpc-utils-1.2.0-chkconfig.patch ---
diff -up powerpc-utils/scripts/ibmvscsis.sh.chkconfig powerpc-utils/scripts/ibmvscsis.sh
--- powerpc-utils/scripts/ibmvscsis.sh.chkconfig	2009-07-30 19:06:07.000000000 -0400
+++ powerpc-utils/scripts/ibmvscsis.sh	2009-08-20 11:29:29.000000000 -0400
@@ -2,6 +2,7 @@
 
 # IBM "ibmvscsis.sh": ibmvscsis init script
 #
+# chkconfig: 35 50 50
 # Copyright (c) 2004, 2005 International Business Machines.
 # Common Public License Version 1.0 (see COPYRIGHT)
 #
@@ -20,7 +21,7 @@
 # Required-Stop:	$syslog $remote_fs
 # Should-Stop:
 # Default-Start:	3 5
-# Default-Stop:
+# Default-Stop:         0 1 2 4 6
 # Short-Description: configure this partition as virtual scsi server
 # Description:	Based on /etc/ibmvscsis.conf, this partition
 #	will export configured drives, partitions or loop mounted


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Apr 2009 08:37:43 -0000	1.5
+++ .cvsignore	25 Aug 2009 15:11:04 -0000	1.6
@@ -1 +1 @@
-powerpc-utils-1.1.3.tar.gz
+powerpc-utils-1.2.0.tar.gz


Index: powerpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/powerpc-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- powerpc-utils.spec	26 Jul 2009 19:19:30 -0000	1.8
+++ powerpc-utils.spec	25 Aug 2009 15:11:04 -0000	1.9
@@ -1,6 +1,8 @@
+%{!?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.1.3
-Release:        3%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Utilities for PowerPC platforms
 
 Group:          System Environment/Base
@@ -9,31 +11,53 @@ URL:            http://powerpc-utils.ozl
 Source0:        http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{version}.tar.gz
 Source1:        nvsetenv
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen
+BuildRequires:  doxygen automake python python-devel 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 is done before release of F12
+Obsoletes:      powerpc-utils-papr < 1.1.6-3
+Provides:       powerpc-utils-papr = 1.1.6-3
+
 %description
 Utilities for PowerPC platforms.
 
 %prep
-%setup -q
-sed -i s/744/755/ rules.mk
+%setup -q -n %{name}
+%patch1 -p1 -b .chkconfig
 
 %build
+./bootstrap.sh
+./configure --prefix=/usr
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT FILES=
+make install DESTDIR=$RPM_BUILD_ROOT FILES= RCSCRIPTS=
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/nvsetenv
 
+%define pkgdocdir %{_datadir}/doc/%{name}-%{version}
+# move doc files
+mkdir -p $RPM_BUILD_ROOT%{pkgdocdir}
+install $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils/* -t $RPM_BUILD_ROOT%{pkgdocdir}
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils
+
+# move init script
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+install -m 755 $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ibmvscsisd
+rm -rf $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_sbindir}/nvsetenv
 %{_sbindir}/nvram
 %{_sbindir}/snap
@@ -45,11 +69,64 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/snap.8.gz
 %{_mandir}/man8/bootlist.8.gz
 %{_mandir}/man8/ofpathname.8.gz
-%doc README COPYRIGHT Changelog
 
+%{_sysconfdir}/rc.d/init.d/ibmvscsisd
+
+%{_sbindir}/update_flash
+%{_sbindir}/activate_firmware
+%{_sbindir}/usysident
+%{_sbindir}/usysattn
+%{_sbindir}/set_poweron_time
+%{_sbindir}/rtas_ibm_get_vpd
+%{_sbindir}/serv_config
+%{_sbindir}/uesensor
+%{_sbindir}/hvcsadmin
+%{_sbindir}/vscsisadmin
+%{_sbindir}/rtas_dump
+%{_sbindir}/rtas_event_decode
+%{_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
+%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
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/service ibmvscsisd stop >/dev/null 2>&1
+  /sbin/chkconfig --del ibmvscsisd
+fi
 
 %changelog
+* 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
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Apr 2009 08:37:43 -0000	1.5
+++ sources	25 Aug 2009 15:11:04 -0000	1.6
@@ -1 +1 @@
-36c254e48941b177242118c51539421c  powerpc-utils-1.1.3.tar.gz
+6a79a185421aa6f88d163124073ffae0  powerpc-utils-1.2.0.tar.gz



From tmraz at fedoraproject.org  Tue Aug 25 15:14:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 15:14:50 +0000 (UTC)
Subject: rpms/ldns/devel ldns.spec,1.50,1.51
Message-ID: <20090825151450.9C7C211C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32490

Modified Files:
	ldns.spec 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-3
- rebuilt with new openssl



Index: ldns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ldns.spec	16 Aug 2009 05:18:16 -0000	1.50
+++ ldns.spec	25 Aug 2009 15:14:50 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-3
+- rebuilt with new openssl
+
 * Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
 - Added openssl dependancy back in, since we get more functionality
  when using openssl. Especially in 'drill'.



From mclasen at fedoraproject.org  Tue Aug 25 15:22:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 15:22:16 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/devel .cvsignore, 1.6,
	1.7 fedora-gnome-theme.spec, 1.15, 1.16 sources, 1.6, 1.7
Message-ID: <20090825152216.5ABAB11C0348@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/fedora-gnome-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1754

Modified Files:
	.cvsignore fedora-gnome-theme.spec sources 
Log Message:
fix gtkrc file too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 Aug 2009 02:28:14 -0000	1.6
+++ .cvsignore	25 Aug 2009 15:22:16 -0000	1.7
@@ -1 +1 @@
-fedora-gnome-theme-12.1.tar.bz2
+fedora-gnome-theme-12.2.tar.bz2


Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/fedora-gnome-theme.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fedora-gnome-theme.spec	15 Aug 2009 02:28:14 -0000	1.15
+++ fedora-gnome-theme.spec	25 Aug 2009 15:22:16 -0000	1.16
@@ -1,6 +1,6 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
-Version: 12.1
+Version: 12.2
 Release: 1%{?dist}
 BuildArch: noarch
 # No version given, no license attribution.
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 12.2-1
+- Update the gtkrc file too
+
 * Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 12.1-1
 - Add cursor theme to the Fedora metatheme
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 Aug 2009 02:28:14 -0000	1.6
+++ sources	25 Aug 2009 15:22:16 -0000	1.7
@@ -1 +1 @@
-051e200a5dcb7a366802a477c3ba5fe4  fedora-gnome-theme-12.1.tar.bz2
+32b312e5ab944b564d79c09ea342735d  fedora-gnome-theme-12.2.tar.bz2



From karsten at fedoraproject.org  Tue Aug 25 15:22:45 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 25 Aug 2009 15:22:45 +0000 (UTC)
Subject: rpms/bluez/devel bluez.spec,1.89,1.90
Message-ID: <20090825152245.BE2DD11C0348@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2055

Modified Files:
	bluez.spec 
Log Message:
- don't buildrequire libusb1 on s390*


Index: bluez.spec
===================================================================
RCS file: /cvs/extras/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- bluez.spec	11 Aug 2009 13:17:10 -0000	1.89
+++ bluez.spec	25 Aug 2009 15:22:45 -0000	1.90
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.47
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
@@ -39,7 +39,10 @@ BuildRequires: libusb-devel, glib2-devel
 BuildRequires: gstreamer-plugins-base-devel, gstreamer-devel
 BuildRequires: libsndfile-devel
 # For cable pairing
-BuildRequires: libgudev-devel, libusb1-devel
+BuildRequires: libgudev-devel 
+%ifnarch s390 s390x
+BuildRequires: libusb1-devel
+%endif
 BuildRequires: udev
 
 # For rebuild
@@ -278,6 +281,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 4.47-6
+- don't buildrequire libusb1 on s390*
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 4.47-5
 - More upstream CUPS fixes
 



From tmraz at fedoraproject.org  Tue Aug 25 15:28:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 15:28:18 +0000 (UTC)
Subject: rpms/libjingle/devel libjingle-0.3.12-openssl.patch, NONE,
	1.1 libjingle.spec, 1.16, 1.17
Message-ID: <20090825152818.141BA11C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libjingle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2952

Modified Files:
	libjingle.spec 
Added Files:
	libjingle-0.3.12-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
- rebuilt with new openssl


libjingle-0.3.12-openssl.patch:
 openssladapter.cc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE libjingle-0.3.12-openssl.patch ---
diff -up libjingle-0.3.12/talk/base/openssladapter.cc.openssl libjingle-0.3.12/talk/base/openssladapter.cc
--- libjingle-0.3.12/talk/base/openssladapter.cc.openssl	2008-09-16 15:55:22.000000000 +0200
+++ libjingle-0.3.12/talk/base/openssladapter.cc	2009-08-25 17:26:25.000000000 +0200
@@ -641,7 +641,11 @@ OpenSSLAdapter::SSLPostConnectionCheck(S
     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
 
     if (extension_nid == NID_subject_alt_name) {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+#else
       X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+#endif
       if (!meth)
         break;
 


Index: libjingle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/libjingle.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libjingle.spec	21 Aug 2009 14:18:11 -0000	1.16
+++ libjingle.spec	25 Aug 2009 15:28:17 -0000	1.17
@@ -8,6 +8,7 @@ License:        BSD
 URL:            http://code.google.com/apis/talk/libjingle/
 Source0:        http://farsight.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-%{version}-gcc44.patch
+Patch1:		libjingle-0.3.12-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -36,6 +37,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .gcc
+%patch1 -p1 -b .openssl
 
 %build
 %configure --disable-static
@@ -78,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-5



From rstrode at fedoraproject.org  Tue Aug 25 15:32:03 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 25 Aug 2009 15:32:03 +0000 (UTC)
Subject: rpms/gtk2-engines/devel gtk-engines-2.18.2-change-bullet.patch, NONE,
	1.1 gtk2-engines.spec, 1.113, 1.114
Message-ID: <20090825153204.0822411C0348@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gtk2-engines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3694

Modified Files:
	gtk2-engines.spec 
Added Files:
	gtk-engines-2.18.2-change-bullet.patch 
Log Message:
- Change password asterisk character to be '?' instead of '?'


gtk-engines-2.18.2-change-bullet.patch:
 gtkrc |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE gtk-engines-2.18.2-change-bullet.patch ---
--- gtk-engines-2.18.2/themes/Clearlooks/gtk-2.0/gtkrc.change-bullet	2009-08-25 11:25:25.348520380 -0400
+++ gtk-engines-2.18.2/themes/Clearlooks/gtk-2.0/gtkrc	2009-08-25 11:26:30.477514482 -0400
@@ -16,6 +16,8 @@ style "default" {
 
 	GtkCheckButton::indicator-size = 14
 
+	GtkEntry::invisible-char = 0x2022
+
 	GtkPaned::handle-size = 6
 
 	GtkRange::trough-border = 0


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- gtk2-engines.spec	2 Aug 2009 06:06:31 -0000	1.113
+++ gtk2-engines.spec	25 Aug 2009 15:32:03 -0000	1.114
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.18.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -18,6 +18,8 @@ BuildRequires:  pkgconfig
 URL:           	http://download.gnome.org/sources/gtk-engines
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: gtk-engines-2.18.2-change-bullet.patch
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -38,6 +40,8 @@ toolkits or operating systems.
 %prep
 %setup -q -n gtk-engines-%{version}
 
+%patch0 -p1 -b .change-bullet
+
 %build
 %configure
 make
@@ -76,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> - 2.18.2-5
+- Change password asterisk character to be '?' instead of '?'
+
 * Sun Aug  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-4
 - Drop pkgconfig dep from the main package
 



From twaugh at fedoraproject.org  Tue Aug 25 15:36:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 15:36:33 +0000 (UTC)
Subject: rpms/hplip/devel hplip-no-asm.patch,1.1,1.2 hplip.spec,1.229,1.230
Message-ID: <20090825153633.D317911C0348@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4451

Modified Files:
	hplip-no-asm.patch hplip.spec 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
- Removed never-used definition of BREAKPOINT in scan/sane/common.h
  in hope of fixing the build.


hplip-no-asm.patch:
 ip/ipmain.c        |    3 ---
 ip/xfax.c          |   13 -------------
 scan/sane/common.h |    2 --
 3 files changed, 18 deletions(-)

Index: hplip-no-asm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-asm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-no-asm.patch	19 Aug 2009 10:38:56 -0000	1.1
+++ hplip-no-asm.patch	25 Aug 2009 15:36:33 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
---- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-19 11:35:39.770825475 +0100
-+++ hplip-3.9.8/ip/ipmain.c	2009-08-19 11:36:25.767828346 +0100
+--- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-04 22:37:28.000000000 +0100
++++ hplip-3.9.8/ip/ipmain.c	2009-08-25 14:44:04.497202437 +0100
 @@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
  void fatalBreakPoint (void)
  {
@@ -12,8 +12,8 @@ diff -up hplip-3.9.8/ip/ipmain.c.no-asm 
  }
  
 diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
---- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-19 11:35:45.484827783 +0100
-+++ hplip-3.9.8/ip/xfax.c	2009-08-19 11:36:39.815701961 +0100
+--- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-04 22:37:28.000000000 +0100
++++ hplip-3.9.8/ip/xfax.c	2009-08-25 14:44:04.502202418 +0100
 @@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
                   & ((1u<<n_bits) - 1u);                                      \
  }
@@ -34,3 +34,16 @@ diff -up hplip-3.9.8/ip/xfax.c.no-asm hp
  
  
  
+diff -up hplip-3.9.8/scan/sane/common.h.no-asm hplip-3.9.8/scan/sane/common.h
+--- hplip-3.9.8/scan/sane/common.h.no-asm	2009-08-25 16:35:14.577203106 +0100
++++ hplip-3.9.8/scan/sane/common.h	2009-08-25 16:35:29.948216281 +0100
+@@ -53,8 +53,6 @@
+ 
+ #define BACKEND_NAME hpaio
+ 
+-#define BREAKPOINT __asm( "int3" )
+-
+ #define OK 1
+ #define ERROR 0
+ #define MAX_LIST_SIZE 32
+diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- hplip.spec	25 Aug 2009 14:57:55 -0000	1.229
+++ hplip.spec	25 Aug 2009 15:36:33 -0000	1.230
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -337,6 +337,10 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
+- Removed never-used definition of BREAKPOINT in scan/sane/common.h
+  in hope of fixing the build.
+
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
 - New common sub-package for udev rules and config file (bug #516459).
 - Don't install base/*.py with executable bit set.



From tmraz at fedoraproject.org  Tue Aug 25 15:36:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 15:36:45 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn-4.0-beta7-openssl.patch, NONE,
	1.1 libmsn.spec, 1.12, 1.13
Message-ID: <20090825153645.E92C611C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4533

Modified Files:
	libmsn.spec 
Added Files:
	libmsn-4.0-beta7-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0-0.14.beta7
- rebuilt with new openssl


libmsn-4.0-beta7-openssl.patch:
 msntest.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE libmsn-4.0-beta7-openssl.patch ---
diff -up libmsn-4.0-beta7/msntest/msntest.cpp.openssl libmsn-4.0-beta7/msntest/msntest.cpp
--- libmsn-4.0-beta7/msntest/msntest.cpp.openssl	2009-07-22 22:09:36.000000000 +0200
+++ libmsn-4.0-beta7/msntest/msntest.cpp	2009-08-25 17:34:39.000000000 +0200
@@ -261,7 +261,11 @@ int main()
                     if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
                     {
                         BIO *bio_socket_new;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+                        const SSL_METHOD *meth=NULL;
+#else
                         SSL_METHOD *meth=NULL;
+#endif
                         meth=SSLv23_client_method();
                         SSLeay_add_ssl_algorithms();
                         mySocketsSsl[i].ctx = SSL_CTX_new(meth);


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libmsn.spec	21 Aug 2009 14:18:47 -0000	1.12
+++ libmsn.spec	25 Aug 2009 15:36:45 -0000	1.13
@@ -9,6 +9,7 @@ Group:		System Environment/Libraries
 License:	GPLv2
 URL:		http://sourceforge.net/projects/libmsn/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
+Patch1:		libmsn-4.0-beta7-openssl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Summary:	Library for connecting to the MSN Messenger service
@@ -34,7 +35,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
-
+%patch1 -p1 -b .openssl
 
 %build
 
@@ -74,7 +75,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.0-0.14.beta7
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0-0.14.beta7
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-0.13.beta7



From rstrode at fedoraproject.org  Tue Aug 25 15:36:57 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 25 Aug 2009 15:36:57 +0000 (UTC)
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.114,1.115
Message-ID: <20090825153657.37B5411C0348@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gtk2-engines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4600

Modified Files:
	gtk2-engines.spec 
Log Message:
Add upstream bug reference



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- gtk2-engines.spec	25 Aug 2009 15:32:03 -0000	1.114
+++ gtk2-engines.spec	25 Aug 2009 15:36:57 -0000	1.115
@@ -18,6 +18,7 @@ BuildRequires:  pkgconfig
 URL:           	http://download.gnome.org/sources/gtk-engines
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=593030
 Patch0: gtk-engines-2.18.2-change-bullet.patch
 
 %package devel



From kasal at fedoraproject.org  Tue Aug 25 15:40:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 25 Aug 2009 15:40:36 +0000 (UTC)
Subject: rpms/perl-Test-TempDir/devel .cvsignore, 1.2,
	1.3 perl-Test-TempDir.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090825154036.1E4B911C043D@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-TempDir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5277

Modified Files:
	.cvsignore perl-Test-TempDir.spec sources 
Log Message:
- new upstream version
- spec file cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-TempDir/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Feb 2009 10:31:06 -0000	1.2
+++ .cvsignore	25 Aug 2009 15:40:35 -0000	1.3
@@ -1 +1 @@
-Test-TempDir-0.04.tar.gz
+Test-TempDir-0.05.tar.gz


Index: perl-Test-TempDir.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-TempDir/devel/perl-Test-TempDir.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Test-TempDir.spec	26 Jul 2009 16:57:59 -0000	1.3
+++ perl-Test-TempDir.spec	25 Aug 2009 15:40:35 -0000	1.4
@@ -1,16 +1,16 @@
 Name:           perl-Test-TempDir
-Version:        0.04
-Release:        4%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Temporary files support for testing
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Test-TempDir/
-Source0:        http://www.cpan.org/authors/id/N/NU/NUFFIN/Test-TempDir-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Test-TempDir-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::NFSLock)
-BuildRequires:  perl(Moose) >= 0.50
+BuildRequires:  perl(Moose) >= 0.87
 BuildRequires:  perl(MooseX::Types::Path::Class)
 BuildRequires:  perl(namespace::clean) >= 0.08
 BuildRequires:  perl(Path::Class)
@@ -33,8 +33,8 @@ 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 -type f -name .packlist | xargs rm -f
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
@@ -46,11 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc 
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%doc Changes README
+%{perl_vendorlib}/Test
+%{_mandir}/man3/Test::TempDir*
 
 %changelog
+* Tue Aug 25 2009 Stepan Kasal <skasal at redhat.com> - 0.05-1
+- new upstream version
+- spec file cleanup
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-TempDir/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Feb 2009 10:31:06 -0000	1.2
+++ sources	25 Aug 2009 15:40:35 -0000	1.3
@@ -1 +1 @@
-66d60bd4463bd01b71144cc7cb6585a8  Test-TempDir-0.04.tar.gz
+45ad0f38221daa3f4ea346a52e1170a8  Test-TempDir-0.05.tar.gz



From sgrubb at fedoraproject.org  Tue Aug 25 15:54:19 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 25 Aug 2009 15:54:19 +0000 (UTC)
Subject: rpms/libpreludedb/devel libpreludedb-x86_64-sqlite3.patch, 1.6,
	1.7 libpreludedb.spec, 1.23, 1.24
Message-ID: <20090825155420.018A311C0348@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7964

Modified Files:
	libpreludedb.spec 
Added Files:
	libpreludedb-x86_64-sqlite3.patch 
Log Message:
revert upgraded version


libpreludedb-x86_64-sqlite3.patch:
 configure    |   27 ++++++++++++++++++++++++++-
 configure.in |    5 ++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

Index: libpreludedb-x86_64-sqlite3.patch
===================================================================
RCS file: libpreludedb-x86_64-sqlite3.patch
diff -N libpreludedb-x86_64-sqlite3.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libpreludedb-x86_64-sqlite3.patch	25 Aug 2009 15:54:19 -0000	1.7
@@ -0,0 +1,52 @@
+diff -ur libpreludedb-0.9.15.orig/configure libpreludedb-0.9.15/configure
+--- libpreludedb-0.9.15.orig/configure	2008-08-27 12:06:58.000000000 -0400
++++ libpreludedb-0.9.15/configure	2008-08-27 16:47:11.000000000 -0400
+@@ -22912,7 +22912,32 @@
+ fi
+ 
+        if test -z "$SQLITE3_LIBS"; then
+-          continue
++          as_ac_File=`echo "ac_cv_file_$dir/lib64/libsqlite3.so" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $dir/lib64/libsqlite3.so" >&5
++echo $ECHO_N "checking for $dir/lib64/libsqlite3.so... $ECHO_C" >&6; }
++if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  test "$cross_compiling" = yes &&
++  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
++echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
++   { (exit 1); exit 1; }; }
++if test -r "$dir/lib64/libsqlite3.so"; then
++  eval "$as_ac_File=yes"
++else
++  eval "$as_ac_File=no"
++fi
++fi
++ac_res=`eval echo '${'$as_ac_File'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_File'}'` = yes; then
++  SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3"
++fi
++
++	  if test -z "$SQLITE3_LIBS"; then
++	     continue
++	  fi
+        fi
+ 
+        as_ac_File=`echo "ac_cv_file_$dir/include/sqlite3.h" | $as_tr_sh`
+diff -ur libpreludedb-0.9.15.orig/configure.in libpreludedb-0.9.15/configure.in
+--- libpreludedb-0.9.15.orig/configure.in	2008-08-27 12:06:58.000000000 -0400
++++ libpreludedb-0.9.15/configure.in	2008-08-27 16:47:11.000000000 -0400
+@@ -226,7 +226,10 @@
+    for dir in $default_path; do
+        AC_CHECK_FILE($dir/lib/libsqlite3.$libext, SQLITE3_LIBS="-L$dir -lsqlite3")
+        if test -z "$SQLITE3_LIBS"; then
+-          continue
++          AC_CHECK_FILE($dir/lib64/libsqlite3.$libext, SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3")
++	  if test -z "$SQLITE3_LIBS"; then
++	     continue
++	  fi
+        fi
+ 
+        AC_CHECK_FILE($dir/include/sqlite3.h, SQLITE3_CFLAGS="-I$dir")


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libpreludedb.spec	21 Aug 2009 14:21:11 -0000	1.23
+++ libpreludedb.spec	25 Aug 2009 15:54:19 -0000	1.24
@@ -2,14 +2,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		libpreludedb		           
-Version:	0.9.15.2 
-Release:	3%{?dist}
+Version:	0.9.15.1 
+Release:	4%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:		%{name}-x86_64-sqlite3.patch	
 
 BuildRequires:  libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel, perl-devel
 
@@ -76,6 +77,7 @@ Perl bindings for libpreludedb.
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
@@ -163,15 +165,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.15.2-3
-- rebuilt with new openssl
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 13 2009 Steve Grubb <sgrubb at redhat.com> 0.9.15.2-1
-- new upstream bugfix release
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Tue Aug 25 15:55:08 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 25 Aug 2009 15:55:08 +0000 (UTC)
Subject: rpms/libpreludedb/devel sources,1.7,1.8
Message-ID: <20090825155508.A068011C0348@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8155

Modified Files:
	sources 
Log Message:
Revert upgraded release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Jul 2009 14:37:48 -0000	1.7
+++ sources	25 Aug 2009 15:55:08 -0000	1.8
@@ -1 +1 @@
-ff3ed03dcb64a418f4c362a9bf86099b  libpreludedb-0.9.15.2.tar.gz
+792b6ce058e4b9db44279409dbc662a3  libpreludedb-0.9.15.1.tar.gz



From twaugh at fedoraproject.org  Tue Aug 25 15:55:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 15:55:41 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-no-asm.patch,1.1,1.2 hplip.spec,1.225,1.226
Message-ID: <20090825155541.C0FCF11C0348@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8271

Modified Files:
	hplip-no-asm.patch hplip.spec 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
- Removed never-used definition of BREAKPOINT in scan/sane/common.h
  in hope of fixing the build.


hplip-no-asm.patch:
 ip/ipmain.c        |    3 ---
 ip/xfax.c          |   13 -------------
 scan/sane/common.h |    2 --
 3 files changed, 18 deletions(-)

Index: hplip-no-asm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip-no-asm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-no-asm.patch	19 Aug 2009 10:56:45 -0000	1.1
+++ hplip-no-asm.patch	25 Aug 2009 15:55:41 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
---- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-19 11:35:39.770825475 +0100
-+++ hplip-3.9.8/ip/ipmain.c	2009-08-19 11:36:25.767828346 +0100
+--- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-04 22:37:28.000000000 +0100
++++ hplip-3.9.8/ip/ipmain.c	2009-08-25 14:44:04.497202437 +0100
 @@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
  void fatalBreakPoint (void)
  {
@@ -12,8 +12,8 @@ diff -up hplip-3.9.8/ip/ipmain.c.no-asm 
  }
  
 diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
---- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-19 11:35:45.484827783 +0100
-+++ hplip-3.9.8/ip/xfax.c	2009-08-19 11:36:39.815701961 +0100
+--- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-04 22:37:28.000000000 +0100
++++ hplip-3.9.8/ip/xfax.c	2009-08-25 14:44:04.502202418 +0100
 @@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
                   & ((1u<<n_bits) - 1u);                                      \
  }
@@ -34,3 +34,16 @@ diff -up hplip-3.9.8/ip/xfax.c.no-asm hp
  
  
  
+diff -up hplip-3.9.8/scan/sane/common.h.no-asm hplip-3.9.8/scan/sane/common.h
+--- hplip-3.9.8/scan/sane/common.h.no-asm	2009-08-25 16:35:14.577203106 +0100
++++ hplip-3.9.8/scan/sane/common.h	2009-08-25 16:35:29.948216281 +0100
+@@ -53,8 +53,6 @@
+ 
+ #define BACKEND_NAME hpaio
+ 
+-#define BREAKPOINT __asm( "int3" )
+-
+ #define OK 1
+ #define ERROR 0
+ #define MAX_LIST_SIZE 32
+diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- hplip.spec	25 Aug 2009 15:01:39 -0000	1.225
+++ hplip.spec	25 Aug 2009 15:55:41 -0000	1.226
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -345,6 +345,10 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
+- Removed never-used definition of BREAKPOINT in scan/sane/common.h
+  in hope of fixing the build.
+
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
 - New common sub-package for hal rules and config file (bug #516459).
 - Don't install base/*.py with executable bit set.



From sgrubb at fedoraproject.org  Tue Aug 25 15:59:49 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 25 Aug 2009 15:59:49 +0000 (UTC)
Subject: rpms/libpreludedb/devel libpreludedb.spec,1.24,1.25
Message-ID: <20090825155949.7627311C0348@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8841

Modified Files:
	libpreludedb.spec 
Log Message:
* Tue Aug 25 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.15.1-5
- rebuild for new openssl



Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libpreludedb.spec	25 Aug 2009 15:54:19 -0000	1.24
+++ libpreludedb.spec	25 Aug 2009 15:59:49 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:		libpreludedb		           
 Version:	0.9.15.1 
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -89,7 +89,7 @@ Perl bindings for libpreludedb.
 sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile
 sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 
-make 
+make %{?_smp_mflags}
 
 
 %install
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.15.1-5
+- rebuild for new openssl
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From walters at fedoraproject.org  Tue Aug 25 16:00:49 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Tue, 25 Aug 2009 16:00:49 +0000 (UTC)
Subject: rpms/gobject-introspection/devel gobject-introspection.spec, 1.12, 
	1.13 gobject-introspection-compilecrashfix.patch, 1.1, NONE
Message-ID: <20090825160049.103C811C0348@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126

Modified Files:
	gobject-introspection.spec 
Removed Files:
	gobject-introspection-compilecrashfix.patch 
Log Message:
* Mon Aug 26 2009 Colin Walters <walters at verbum.org> - 0.6.4-1
- New upstream 0.6.4
- Drop upstreamed build fix patch 



Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gobject-introspection.spec	25 Jul 2009 01:01:31 -0000	1.12
+++ gobject-introspection.spec	25 Aug 2009 16:00:48 -0000	1.13
@@ -2,15 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gobject-introspection
-Version:        0.6.3
-Release:        5%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Introspection system for GObject-based libraries
 
 Group:		Development/Libraries
 License:        GPLv2+, LGPLv2+, MIT
 URL:            http://live.gnome.org/GObjectIntrospection
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
-Patch0:		gobject-introspection-compilecrashfix.patch
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -49,7 +48,6 @@ Libraries and headers for gobject-intros
 
 %prep
 %setup -q
-%patch0 -p1 -b .compilecrashfix
 
 %build
 %configure
@@ -97,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.gz
 
 %changelog
+* Mon Aug 26 2009 Colin Walters <walters at verbum.org> - 0.6.4-1
+- New upstream 0.6.4
+- Drop upstreamed build fix patch 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- gobject-introspection-compilecrashfix.patch DELETED ---



From walters at fedoraproject.org  Tue Aug 25 16:01:45 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Tue, 25 Aug 2009 16:01:45 +0000 (UTC)
Subject: rpms/gir-repository/devel .cvsignore, 1.4, 1.5 gir-repository.spec, 
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090825160145.43AC911C0348@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9404

Modified Files:
	.cvsignore gir-repository.spec sources 
Log Message:
* Mon Aug 26 2009 Colin Walters <walters at verbum.org> 0.6.4-5
- New upstream
- Drop upstreamed patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Jul 2009 10:29:19 -0000	1.4
+++ .cvsignore	25 Aug 2009 16:01:45 -0000	1.5
@@ -1 +1 @@
-gir-repository-0.6.3.tar.bz2
+gir-repository-0.6.4.tar.gz


Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gir-repository.spec	30 Jul 2009 11:54:52 -0000	1.8
+++ gir-repository.spec	25 Aug 2009 16:01:45 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           gir-repository
-Version:        0.6.3
-Release:        5%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Introspection for GNOME libraries
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://live.gnome.org/GObjectIntrospection
-Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
-Patch0:		gir-gst0.10.24buildfix.patch
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gobject-introspection-devel = %{version}
@@ -52,7 +51,6 @@ Libraries and headers for gir-repository
 
 %prep
 %setup -q
-%patch0 -p1 -b .gst0.10.24buildfix
 
 %build
 autoreconf
@@ -85,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Mon Aug 26 2009 Colin Walters <walters at verbum.org> 0.6.4-5
+- New upstream
+- Drop upstreamed patch
+
 * Thu Jul 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.3-5
 - Add patch to fix build with new gstreamer
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Jul 2009 10:29:19 -0000	1.4
+++ sources	25 Aug 2009 16:01:45 -0000	1.5
@@ -1 +1 @@
-19ace20592762312932d5b01b3dc289a  gir-repository-0.6.3.tar.bz2
+7a8b96cfcbeaf15250822c4e5574775c  gir-repository-0.6.4.tar.gz



From overholt at fedoraproject.org  Tue Aug 25 16:02:27 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 25 Aug 2009 16:02:27 +0000 (UTC)
Subject: rpms/maven2/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090825160227.0AA4F11C0348@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9601

Modified Files:
	.cvsignore sources 
Log Message:
Remove unneeded sources from sources and .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Aug 2009 19:12:57 -0000	1.4
+++ .cvsignore	25 Aug 2009 16:02:26 -0000	1.5
@@ -3,7 +3,6 @@ m2_pom_repo.tar.gz
 maven2-empty-dep.jar
 maven2-maven-site-plugin.tar.gz
 maven2-model-v3.jar
-maven2-plugins-060420-src.tar.gz
 maven2-src.tar.gz
 maven2-plugins-070705-src.tar.gz
 maven-javadoc-plugin-2.4-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Aug 2009 19:12:57 -0000	1.4
+++ sources	25 Aug 2009 16:02:26 -0000	1.5
@@ -1,6 +1,5 @@
 dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
 de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
-d556f5883f89a7348de42767fcb1aabe  maven2-plugins-060420-src.tar.gz
 13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
 a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
 ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz



From salimma at fedoraproject.org  Tue Aug 25 16:05:19 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 25 Aug 2009 16:05:19 +0000 (UTC)
Subject: rpms/Falcon/F-11 .cvsignore, 1.4, 1.5 Falcon.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <20090825160519.BB00211C0348@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Falcon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9989/F-11

Modified Files:
	.cvsignore Falcon.spec sources 
Log Message:
* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Feb 2009 20:49:46 -0000	1.4
+++ .cvsignore	25 Aug 2009 16:05:19 -0000	1.5
@@ -1 +1 @@
-Falcon-0.8.14.2.tar.gz
+Falcon-0.9.4.tar.gz


Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-11/Falcon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- Falcon.spec	23 Feb 2009 21:08:17 -0000	1.9
+++ Falcon.spec	25 Aug 2009 16:05:19 -0000	1.10
@@ -1,9 +1,9 @@
 %define host     www.falconpl.org
-%define mainver  0.8.14
+%define mainver  0.9.4
 
 Name:            Falcon
-Version:         %{mainver}.2
-Release:         2%{?dist}
+Version:         %{mainver}
+Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
 
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/faltest*
 
 %changelog
+* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
+- Update to 0.9.4
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.14.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Feb 2009 20:49:46 -0000	1.5
+++ sources	25 Aug 2009 16:05:19 -0000	1.6
@@ -1 +1 @@
-a08f0c7aa3a233395ddb3875eae4e7a9  Falcon-0.8.14.2.tar.gz
+9e16d8c8e2974b1f31a2dd96e35f93f8  Falcon-0.9.4.tar.gz



From salimma at fedoraproject.org  Tue Aug 25 16:05:19 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 25 Aug 2009 16:05:19 +0000 (UTC)
Subject: rpms/Falcon/F-10 .cvsignore, 1.4, 1.5 Falcon.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <20090825160519.9F5F611C0348@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Falcon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9989/F-10

Modified Files:
	.cvsignore Falcon.spec sources 
Log Message:
* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Feb 2009 20:49:45 -0000	1.4
+++ .cvsignore	25 Aug 2009 16:05:19 -0000	1.5
@@ -1 +1 @@
-Falcon-0.8.14.2.tar.gz
+Falcon-0.9.4.tar.gz


Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-10/Falcon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Falcon.spec	6 Feb 2009 20:49:45 -0000	1.8
+++ Falcon.spec	25 Aug 2009 16:05:19 -0000	1.9
@@ -1,8 +1,8 @@
 %define host     www.falconpl.org
-%define mainver  0.8.14
+%define mainver  0.9.4
 
 Name:            Falcon
-Version:         %{mainver}.2
+Version:         %{mainver}
 Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/faltest*
 
 %changelog
+* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
+- Update to 0.9.4
+
 * Fri Feb  6 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.14.2-1
 - Update to 0.8.14.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Feb 2009 20:49:45 -0000	1.5
+++ sources	25 Aug 2009 16:05:19 -0000	1.6
@@ -1 +1 @@
-a08f0c7aa3a233395ddb3875eae4e7a9  Falcon-0.8.14.2.tar.gz
+9e16d8c8e2974b1f31a2dd96e35f93f8  Falcon-0.9.4.tar.gz



From salimma at fedoraproject.org  Tue Aug 25 16:05:19 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 25 Aug 2009 16:05:19 +0000 (UTC)
Subject: rpms/Falcon/devel .cvsignore, 1.4, 1.5 Falcon.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090825160519.F3BA411C0348@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/Falcon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9989/devel

Modified Files:
	.cvsignore Falcon.spec sources 
Log Message:
* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
- Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Feb 2009 20:49:46 -0000	1.4
+++ .cvsignore	25 Aug 2009 16:05:19 -0000	1.5
@@ -1 +1 @@
-Falcon-0.8.14.2.tar.gz
+Falcon-0.9.4.tar.gz


Index: Falcon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/Falcon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- Falcon.spec	24 Jul 2009 15:09:22 -0000	1.10
+++ Falcon.spec	25 Aug 2009 16:05:19 -0000	1.11
@@ -1,9 +1,9 @@
 %define host     www.falconpl.org
-%define mainver  0.8.14
+%define mainver  0.9.4
 
 Name:            Falcon
-Version:         %{mainver}.2
-Release:         3%{?dist}
+Version:         %{mainver}
+Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
 
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/faltest*
 
 %changelog
+* Tue Aug 25 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4-1
+- Update to 0.9.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.14.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Falcon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Feb 2009 20:49:46 -0000	1.5
+++ sources	25 Aug 2009 16:05:19 -0000	1.6
@@ -1 +1 @@
-a08f0c7aa3a233395ddb3875eae4e7a9  Falcon-0.8.14.2.tar.gz
+9e16d8c8e2974b1f31a2dd96e35f93f8  Falcon-0.9.4.tar.gz



From jspaleta at fedoraproject.org  Tue Aug 25 16:06:45 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 25 Aug 2009 16:06:45 +0000 (UTC)
Subject: rpms/gourmet/devel gourmet.spec,1.17,1.18
Message-ID: <20090825160645.4D53D11C0348@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10258

Modified Files:
	gourmet.spec 
Log Message:
* Tue Aug 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-3
- add python-sqlalchemy runtime dep.



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/devel/gourmet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gourmet.spec	23 Aug 2009 19:30:36 -0000	1.17
+++ gourmet.spec	25 Aug 2009 16:06:45 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.15.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
@@ -19,7 +19,7 @@ BuildRequires:  gettext,intltool
 Requires: gnome-python2, gnome-python2-gnomeprint
 Requires: metakit
 Requires: pygtk2 
-Requires: PyRTF
+Requires: PyRTF,python-sqlalchemy
 Requires: python-imaging, python-sqlite2, pygtk2-libglade, python-reportlab
 %description
 Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Tue Aug 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-3
+- add python-sqlalchemy runtime dep.
+
 * Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-2
 - Small buildrequires fix.
 



From walters at fedoraproject.org  Tue Aug 25 16:09:12 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Tue, 25 Aug 2009 16:09:12 +0000 (UTC)
Subject: rpms/gobject-introspection/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5
Message-ID: <20090825160912.E2E5511C0348@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10720

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Aug 26 2009 Colin Walters <walters at verbum.org> - 0.6.4-1
- New upstream 0.6.4
- Drop upstreamed build fix patch 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Jul 2009 09:09:42 -0000	1.4
+++ .cvsignore	25 Aug 2009 16:09:12 -0000	1.5
@@ -1 +1 @@
-gobject-introspection-0.6.3.tar.bz2
+gobject-introspection-0.6.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Jul 2009 09:09:42 -0000	1.4
+++ sources	25 Aug 2009 16:09:12 -0000	1.5
@@ -1 +1 @@
-5f0d333573bffecd76c461101cff2be1  gobject-introspection-0.6.3.tar.bz2
+9729cb0bcf9ca6d311b1c94a8726d113  gobject-introspection-0.6.4.tar.gz



From rvinyard at fedoraproject.org  Tue Aug 25 16:17:10 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 16:17:10 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.23,1.24
Message-ID: <20090825161710.8229D11C0348@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11806

Modified Files:
	conexus.spec 
Log Message:



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- conexus.spec	25 Aug 2009 10:17:17 -0000	1.23
+++ conexus.spec	25 Aug 2009 16:17:08 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
-Version:          0.8.0
-Release:          3%{?dist}
+Version:          0.9.0
+Release:          1%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -16,13 +16,13 @@ BuildRequires:    boost-devel
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
-BuildRequires:    libudev-devel
+BuildRequires:    libudev-devel >= 139
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
 BuildRequires:    papyrus-extras-devel >= 0.10
 BuildRequires:    openssl-devel >= 0.9.8
-BuildRequires:    dbus-cxx-devel >= 0.2.0
-BuildRequires:    dbus-cxx-tools
+BuildRequires:    dbus-cxx-glibmm-devel >= 0.3.4
+BuildRequires:    dbus-cxx-tools >= 0.3.4
 
 %description
 Conexus is a C++ I/O library that includes support for BSD
@@ -46,6 +46,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the conexus
@@ -56,7 +59,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/conexus-0.8
+hierarchy and can be found at /usr/share/gtk-doc/html/conexus-0.9
 
 %package          dbus
 Summary:          DBus support for the conexus communication library
@@ -71,7 +74,7 @@ Summary:          Headers for developing
 Group:            Development/Libraries
 Requires:         conexus-dbus = %{version}-%{release}
 Requires:         conexus-devel = %{version}-%{release}
-Requires:         dbus-cxx-devel >= 0.2.0
+Requires:         dbus-cxx-devel >= 0.3.4
 
 %description      dbus-devel
 This package contains the libraries and header files needed for
@@ -164,7 +167,14 @@ developing conexus-nspr applications.
 %patch1 -p1 -b .openssl
 
 %build
+
+# We need Fedora 11+ for proper udev support
+%if 0%{?fedora} > 10
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --enable-udev
+%else
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
+%endif
+
 %{__make} %{?_smp_mflags}
 
 %install
@@ -174,9 +184,9 @@ developing conexus-nspr applications.
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation and put conexus docs under gtk-doc
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/ doc/conexus-0.8.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/ doc/conexus-0.9.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -214,14 +224,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus.so
 %{_libdir}/pkgconfig/conexus-1.0.pc
-%dir %{_includedir}/conexus-0.8
-%{_includedir}/conexus-0.8/conexus.h
-%{_includedir}/conexus-0.8/conexus/
+%dir %{_includedir}/conexus-0.9
+%{_includedir}/conexus-0.9/conexus.h
+%{_includedir}/conexus-0.9/conexus/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/conexus-0.8/
+%doc %{_datadir}/gtk-doc/html/conexus-0.9/
 
 %files dbus
 %defattr(-,root,root,-)
@@ -231,8 +241,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-dbus.so
 %{_libdir}/pkgconfig/conexus-dbus-1.0.pc
-%{_includedir}/conexus-0.8/conexus-dbus.h
-%{_includedir}/conexus-0.8/conexus-dbus/
+%{_includedir}/conexus-0.9/conexus-dbus.h
+%{_includedir}/conexus-0.9/conexus-dbus/
 
 %files gtkmm
 %defattr(-,root,root,-)
@@ -242,10 +252,10 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-gtkmm.so
 %{_libdir}/pkgconfig/conexus-gtkmm-1.0.pc
-%{_includedir}/conexus-0.8/conexus-gtkmm.h
-%{_includedir}/conexus-0.8/conexus-gtkmm/
+%{_includedir}/conexus-0.9/conexus-gtkmm.h
+%{_includedir}/conexus-0.9/conexus-gtkmm/
 %{_bindir}/conexus-gtkmm-demo
-%{_datadir}/conexus-0.8.0/
+%{_datadir}/conexus-0.9.0/
 
 %files ssl
 %defattr(-,root,root,-)
@@ -255,8 +265,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-ssl.so
 %{_libdir}/pkgconfig/conexus-ssl-1.0.pc
-%{_includedir}/conexus-0.8/conexus-ssl.h
-%{_includedir}/conexus-0.8/conexus-ssl/
+%{_includedir}/conexus-0.9/conexus-ssl.h
+%{_includedir}/conexus-0.9/conexus-ssl/
 
 %files nspr
 %defattr(-,root,root,-)
@@ -266,8 +276,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-nspr.so
 %{_libdir}/pkgconfig/conexus-nspr-1.0.pc
-%{_includedir}/conexus-0.8/conexus-nspr.h
-%{_includedir}/conexus-0.8/conexus-nspr/
+%{_includedir}/conexus-0.9/conexus-nspr.h
+%{_includedir}/conexus-0.9/conexus-nspr/
 
 %files nss
 %defattr(-,root,root,-)
@@ -277,10 +287,13 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-nss.so
 %{_libdir}/pkgconfig/conexus-nss-1.0.pc
-%{_includedir}/conexus-0.8/conexus-nss.h
-%{_includedir}/conexus-0.8/conexus-nss/
+%{_includedir}/conexus-0.9/conexus-nss.h
+%{_includedir}/conexus-0.9/conexus-nss/
 
 %changelog
+* Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
+- New release
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl
 



From rvinyard at fedoraproject.org  Tue Aug 25 16:17:17 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 16:17:17 +0000 (UTC)
Subject: rpms/conexus/F-11 conexus-0.8.0-openssl.patch, NONE,
	1.1 conexus.spec, 1.20, 1.21
Message-ID: <20090825161717.C754711C0348@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11858

Modified Files:
	conexus.spec 
Added Files:
	conexus-0.8.0-openssl.patch 
Log Message:


conexus-0.8.0-openssl.patch:
 context.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE conexus-0.8.0-openssl.patch ---
diff -up conexus-0.8.0/conexus-ssl/context.cpp.openssl conexus-0.8.0/conexus-ssl/context.cpp
--- conexus-0.8.0/conexus-ssl/context.cpp.openssl	2008-11-10 18:27:15.000000000 +0100
+++ conexus-0.8.0/conexus-ssl/context.cpp	2009-08-25 12:13:57.000000000 +0200
@@ -29,7 +29,11 @@ namespace Conexus
     Context::Context ( Method m ) :
         m_method ( m )
     {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      const SSL_METHOD* meth;
+#else
       SSL_METHOD* meth;
+#endif
 
       switch ( m )
       {


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-11/conexus.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- conexus.spec	16 Jun 2009 19:47:29 -0000	1.20
+++ conexus.spec	25 Aug 2009 16:17:17 -0000	1.21
@@ -1,11 +1,12 @@
 Summary:          C++ I/O communication library
 Name:             conexus
-Version:          0.8.0
+Version:          0.9.0
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://downloads.sourceforge.net/conexus/%{name}-%{version}.tar.bz2
+Patch1:           conexus-0.8.0-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    glibmm24-devel >= 2.6.0
 BuildRequires:    cppunit-devel >= 1.11
@@ -15,13 +16,13 @@ BuildRequires:    boost-devel
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
-BuildRequires:    libudev-devel
+BuildRequires:    libudev-devel >= 139
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
 BuildRequires:    papyrus-extras-devel >= 0.10
 BuildRequires:    openssl-devel >= 0.9.8
-BuildRequires:    dbus-cxx-devel >= 0.2.0
-BuildRequires:    dbus-cxx-tools
+BuildRequires:    dbus-cxx-glibmm-devel >= 0.3.4
+BuildRequires:    dbus-cxx-tools >= 0.3.4
 
 %description
 Conexus is a C++ I/O library that includes support for BSD
@@ -45,6 +46,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the conexus
@@ -55,7 +59,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/conexus-0.8
+hierarchy and can be found at /usr/share/gtk-doc/html/conexus-0.9
 
 %package          dbus
 Summary:          DBus support for the conexus communication library
@@ -70,7 +74,7 @@ Summary:          Headers for developing
 Group:            Development/Libraries
 Requires:         conexus-dbus = %{version}-%{release}
 Requires:         conexus-devel = %{version}-%{release}
-Requires:         dbus-cxx-devel >= 0.2.0
+Requires:         dbus-cxx-devel >= 0.3.4
 
 %description      dbus-devel
 This package contains the libraries and header files needed for
@@ -160,9 +164,17 @@ developing conexus-nspr applications.
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 
 %build
+
+# We need Fedora 11+ for proper udev support
+%if 0%{?fedora} > 10
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --enable-udev
+%else
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
+%endif
+
 %{__make} %{?_smp_mflags}
 
 %install
@@ -172,9 +184,9 @@ developing conexus-nspr applications.
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation and put conexus docs under gtk-doc
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/ doc/conexus-0.8.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/ doc/conexus-0.9.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -212,14 +224,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus.so
 %{_libdir}/pkgconfig/conexus-1.0.pc
-%dir %{_includedir}/conexus-0.8
-%{_includedir}/conexus-0.8/conexus.h
-%{_includedir}/conexus-0.8/conexus/
+%dir %{_includedir}/conexus-0.9
+%{_includedir}/conexus-0.9/conexus.h
+%{_includedir}/conexus-0.9/conexus/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/conexus-0.8/
+%doc %{_datadir}/gtk-doc/html/conexus-0.9/
 
 %files dbus
 %defattr(-,root,root,-)
@@ -229,8 +241,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-dbus.so
 %{_libdir}/pkgconfig/conexus-dbus-1.0.pc
-%{_includedir}/conexus-0.8/conexus-dbus.h
-%{_includedir}/conexus-0.8/conexus-dbus/
+%{_includedir}/conexus-0.9/conexus-dbus.h
+%{_includedir}/conexus-0.9/conexus-dbus/
 
 %files gtkmm
 %defattr(-,root,root,-)
@@ -240,10 +252,10 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-gtkmm.so
 %{_libdir}/pkgconfig/conexus-gtkmm-1.0.pc
-%{_includedir}/conexus-0.8/conexus-gtkmm.h
-%{_includedir}/conexus-0.8/conexus-gtkmm/
+%{_includedir}/conexus-0.9/conexus-gtkmm.h
+%{_includedir}/conexus-0.9/conexus-gtkmm/
 %{_bindir}/conexus-gtkmm-demo
-%{_datadir}/conexus-0.8.0/
+%{_datadir}/conexus-0.9.0/
 
 %files ssl
 %defattr(-,root,root,-)
@@ -253,8 +265,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-ssl.so
 %{_libdir}/pkgconfig/conexus-ssl-1.0.pc
-%{_includedir}/conexus-0.8/conexus-ssl.h
-%{_includedir}/conexus-0.8/conexus-ssl/
+%{_includedir}/conexus-0.9/conexus-ssl.h
+%{_includedir}/conexus-0.9/conexus-ssl/
 
 %files nspr
 %defattr(-,root,root,-)
@@ -264,8 +276,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-nspr.so
 %{_libdir}/pkgconfig/conexus-nspr-1.0.pc
-%{_includedir}/conexus-0.8/conexus-nspr.h
-%{_includedir}/conexus-0.8/conexus-nspr/
+%{_includedir}/conexus-0.9/conexus-nspr.h
+%{_includedir}/conexus-0.9/conexus-nspr/
 
 %files nss
 %defattr(-,root,root,-)
@@ -275,10 +287,19 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-nss.so
 %{_libdir}/pkgconfig/conexus-nss-1.0.pc
-%{_includedir}/conexus-0.8/conexus-nss.h
-%{_includedir}/conexus-0.8/conexus-nss/
+%{_includedir}/conexus-0.9/conexus-nss.h
+%{_includedir}/conexus-0.9/conexus-nss/
 
 %changelog
+* Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
+- New release
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
+* 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
+
 * Thu Jun  4 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.0-1
 - New release
 - Added -dbus subpackage



From rvinyard at fedoraproject.org  Tue Aug 25 16:17:25 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 16:17:25 +0000 (UTC)
Subject: rpms/conexus/F-10 conexus-0.8.0-openssl.patch, NONE,
	1.1 conexus.spec, 1.17, 1.18
Message-ID: <20090825161725.A409811C0348@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11914

Modified Files:
	conexus.spec 
Added Files:
	conexus-0.8.0-openssl.patch 
Log Message:


conexus-0.8.0-openssl.patch:
 context.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE conexus-0.8.0-openssl.patch ---
diff -up conexus-0.8.0/conexus-ssl/context.cpp.openssl conexus-0.8.0/conexus-ssl/context.cpp
--- conexus-0.8.0/conexus-ssl/context.cpp.openssl	2008-11-10 18:27:15.000000000 +0100
+++ conexus-0.8.0/conexus-ssl/context.cpp	2009-08-25 12:13:57.000000000 +0200
@@ -29,7 +29,11 @@ namespace Conexus
     Context::Context ( Method m ) :
         m_method ( m )
     {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      const SSL_METHOD* meth;
+#else
       SSL_METHOD* meth;
+#endif
 
       switch ( m )
       {


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/conexus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- conexus.spec	16 Jun 2009 19:48:14 -0000	1.17
+++ conexus.spec	25 Aug 2009 16:17:25 -0000	1.18
@@ -1,11 +1,12 @@
 Summary:          C++ I/O communication library
 Name:             conexus
-Version:          0.8.0
+Version:          0.9.0
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://downloads.sourceforge.net/conexus/%{name}-%{version}.tar.bz2
+Patch1:           conexus-0.8.0-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    glibmm24-devel >= 2.6.0
 BuildRequires:    cppunit-devel >= 1.11
@@ -15,12 +16,13 @@ BuildRequires:    boost-devel
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
+BuildRequires:    libudev-devel >= 139
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
 BuildRequires:    papyrus-extras-devel >= 0.10
 BuildRequires:    openssl-devel >= 0.9.8
-BuildRequires:    dbus-cxx-devel >= 0.2.0
-BuildRequires:    dbus-cxx-tools
+BuildRequires:    dbus-cxx-glibmm-devel >= 0.3.4
+BuildRequires:    dbus-cxx-tools >= 0.3.4
 
 %description
 Conexus is a C++ I/O library that includes support for BSD
@@ -33,6 +35,7 @@ Requires:         conexus = %{version}-%
 Requires:         glibmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Requires:         libcap-devel
+Requires:         libudev-devel
 
 %description    devel
 C++ libraries and header files needed for developing applications that
@@ -43,6 +46,9 @@ Summary:          Developer's documentat
 Group:            Documentation
 Requires:         gtk-doc
 Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
 
 %description      doc
 This package contains developer's documentation for the conexus
@@ -53,7 +59,7 @@ The documentation can be viewed either t
 documentation browser or through a web browser. 
 
 If using a web browser the documentation is installed in the gtk-doc
-hierarchy and can be found at /usr/share/gtk-doc/html/conexus-0.8
+hierarchy and can be found at /usr/share/gtk-doc/html/conexus-0.9
 
 %package          dbus
 Summary:          DBus support for the conexus communication library
@@ -68,7 +74,7 @@ Summary:          Headers for developing
 Group:            Development/Libraries
 Requires:         conexus-dbus = %{version}-%{release}
 Requires:         conexus-devel = %{version}-%{release}
-Requires:         dbus-cxx-devel >= 0.2.0
+Requires:         dbus-cxx-devel >= 0.3.4
 
 %description      dbus-devel
 This package contains the libraries and header files needed for
@@ -158,9 +164,17 @@ developing conexus-nspr applications.
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 
 %build
-%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --disable-udev
+
+# We need Fedora 11+ for proper udev support
+%if 0%{?fedora} > 10
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --enable-udev
+%else
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
+%endif
+
 %{__make} %{?_smp_mflags}
 
 %install
@@ -170,9 +184,9 @@ developing conexus-nspr applications.
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 # Fix documentation installation and put conexus docs under gtk-doc
-%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/reference/html/
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/reference/html/ doc/reference/html/*
-%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.8/ doc/conexus-0.8.devhelp
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/reference/html/
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/reference/html/ doc/reference/html/*
+%{__install} -p --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-0.9/ doc/conexus-0.9.devhelp
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -210,14 +224,14 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus.so
 %{_libdir}/pkgconfig/conexus-1.0.pc
-%dir %{_includedir}/conexus-0.8
-%{_includedir}/conexus-0.8/conexus.h
-%{_includedir}/conexus-0.8/conexus/
+%dir %{_includedir}/conexus-0.9
+%{_includedir}/conexus-0.9/conexus.h
+%{_includedir}/conexus-0.9/conexus/
 %doc ChangeLog
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/conexus-0.8/
+%doc %{_datadir}/gtk-doc/html/conexus-0.9/
 
 %files dbus
 %defattr(-,root,root,-)
@@ -227,8 +241,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-dbus.so
 %{_libdir}/pkgconfig/conexus-dbus-1.0.pc
-%{_includedir}/conexus-0.8/conexus-dbus.h
-%{_includedir}/conexus-0.8/conexus-dbus/
+%{_includedir}/conexus-0.9/conexus-dbus.h
+%{_includedir}/conexus-0.9/conexus-dbus/
 
 %files gtkmm
 %defattr(-,root,root,-)
@@ -238,10 +252,10 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-gtkmm.so
 %{_libdir}/pkgconfig/conexus-gtkmm-1.0.pc
-%{_includedir}/conexus-0.8/conexus-gtkmm.h
-%{_includedir}/conexus-0.8/conexus-gtkmm/
+%{_includedir}/conexus-0.9/conexus-gtkmm.h
+%{_includedir}/conexus-0.9/conexus-gtkmm/
 %{_bindir}/conexus-gtkmm-demo
-%{_datadir}/conexus-0.8.0/
+%{_datadir}/conexus-0.9.0/
 
 %files ssl
 %defattr(-,root,root,-)
@@ -251,8 +265,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-ssl.so
 %{_libdir}/pkgconfig/conexus-ssl-1.0.pc
-%{_includedir}/conexus-0.8/conexus-ssl.h
-%{_includedir}/conexus-0.8/conexus-ssl/
+%{_includedir}/conexus-0.9/conexus-ssl.h
+%{_includedir}/conexus-0.9/conexus-ssl/
 
 %files nspr
 %defattr(-,root,root,-)
@@ -262,8 +276,8 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-nspr.so
 %{_libdir}/pkgconfig/conexus-nspr-1.0.pc
-%{_includedir}/conexus-0.8/conexus-nspr.h
-%{_includedir}/conexus-0.8/conexus-nspr/
+%{_includedir}/conexus-0.9/conexus-nspr.h
+%{_includedir}/conexus-0.9/conexus-nspr/
 
 %files nss
 %defattr(-,root,root,-)
@@ -273,10 +287,19 @@ find %{buildroot} -type f -name "*.la" -
 %defattr(-,root,root,-)
 %{_libdir}/libconexus-nss.so
 %{_libdir}/pkgconfig/conexus-nss-1.0.pc
-%{_includedir}/conexus-0.8/conexus-nss.h
-%{_includedir}/conexus-0.8/conexus-nss/
+%{_includedir}/conexus-0.9/conexus-nss.h
+%{_includedir}/conexus-0.9/conexus-nss/
 
 %changelog
+* Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
+- New release
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+- rebuilt with new openssl
+
+* 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
+
 * Thu Jun  4 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.0-1
 - New release
 - Added -dbus subpackage



From tmraz at fedoraproject.org  Tue Aug 25 16:20:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 16:20:41 +0000 (UTC)
Subject: rpms/php/devel php-5.3.0-openssl.patch, NONE, 1.1 php.spec, 1.182,
	1.183
Message-ID: <20090825162041.101E211C043A@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094

Modified Files:
	php.spec 
Added Files:
	php-5.3.0-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 5.3.0-6
- rebuilt with new openssl


php-5.3.0-openssl.patch:
 openssl.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE php-5.3.0-openssl.patch ---
diff -up php-5.3.0/ext/openssl/openssl.c.openssl php-5.3.0/ext/openssl/openssl.c
--- php-5.3.0/ext/openssl/openssl.c.openssl	2009-04-20 11:44:29.000000000 +0200
+++ php-5.3.0/ext/openssl/openssl.c	2009-08-25 18:16:30.000000000 +0200
@@ -502,8 +502,13 @@ inline static int php_openssl_safe_mode_
 static char default_ssl_conf_filename[MAXPATHLEN];
 
 struct php_x509_request { /* {{{ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	LHASH_OF(CONF_VALUE) * global_config;	/* Global SSL config */
+	LHASH_OF(CONF_VALUE) * req_config;	/* SSL config for this request */
+#else
 	LHASH * global_config;	/* Global SSL config */
 	LHASH * req_config;		/* SSL config for this request */
+#endif
 	const EVP_MD * md_alg;
 	const EVP_MD * digest;
 	char	* section_name,
@@ -680,7 +685,11 @@ static time_t asn1_time_to_time_t(ASN1_U
 }
 /* }}} */
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static inline int php_openssl_config_check_syntax(const char * section_label, const char * config_filename,	const char * section, LHASH_OF(CONF_VALUE) * config TSRMLS_DC) /* {{{ */
+#else
 static inline int php_openssl_config_check_syntax(const char * section_label, const char * config_filename,	const char * section, LHASH * config TSRMLS_DC) /* {{{ */
+#endif
 {
 	X509V3_CTX ctx;
 	


Index: php.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php/devel/php.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- php.spec	21 Aug 2009 15:23:28 -0000	1.182
+++ php.spec	25 Aug 2009 16:20:40 -0000	1.183
@@ -31,6 +31,7 @@ Patch4: php-5.3.0-phpize64.patch
 Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
+Patch8: php-5.3.0-openssl.patch
 
 # Fixes for extension modules
 Patch20: php-4.3.11-shutdown.patch
@@ -425,6 +426,7 @@ support for using the enchant library to
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
+%patch8 -p1 -b .openssl
 
 %patch20 -p1 -b .shutdown
 %patch21 -p1 -b .macropen
@@ -843,7 +845,7 @@ rm files.* macros.php
 %files enchant -f files.enchant
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.3.0-6
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 5.3.0-6
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.0-5



From twaugh at fedoraproject.org  Tue Aug 25 16:29:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 16:29:17 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.1.12.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.204, 1.205 sources, 1.210, 1.211 system-config-printer.spec,
	1.282, 1.283 system-config-printer-1.1.11.tar.xz.sig, 1.1,
	NONE system-config-printer-scp-git.patch, 1.2, NONE
Message-ID: <20090825162917.5579C11C0348@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-serv14359

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.12.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.11.tar.xz.sig 
	system-config-printer-scp-git.patch 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
- 1.1.12:
  - Troubleshooting fix.
  - Fixed applet traceback when printing test page.
  - Removed completed job notifications (trac #181).
  - Show printer status in printer icons (bug #518020).
  - Use paused icon when printer state reason is 'paused'.
  - Driver preference order fixes.
  - Job status icon and state reason display in jobs list
    (bug #518070).
  - Fixed overactive job creation times update timer.
  - Use preferred D-Bus object path for AuthenticationAgent
    (bug #518427).
  - Fixed disabling a printer when PolicyKit call fails.
  - Set appropriate status icon tooltip when configuration printer
    (bug #518007).
  - Use separate thread for verifying IPP queue (bug #518065).
  - Use newer tooltip API to avoid deprecation warnings.
  - Compare MFG/MDL case-insensitively in udev rule.
  - Support for cups-pk-helper's DevicesGet method.
  - Don't attempt to use PolicyKit if running as root.
  - Support for localized marker names (trac #183).
  - Other small fixes.



--- NEW FILE system-config-printer-1.1.12.tar.xz.sig ---
??
??}?J??u

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- .cvsignore	7 Aug 2009 17:12:28 -0000	1.204
+++ .cvsignore	25 Aug 2009 16:29:14 -0000	1.205
@@ -203,3 +203,4 @@ pycups-1.9.46.tar.bz2
 system-config-printer-1.1.8.tar.bz2
 system-config-printer-1.1.10.tar.bz2
 system-config-printer-1.1.11.tar.xz
+system-config-printer-1.1.12.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- sources	7 Aug 2009 17:12:28 -0000	1.210
+++ sources	25 Aug 2009 16:29:14 -0000	1.211
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-73c67f5ff95aa5b88949c6f15dd2d836  system-config-printer-1.1.11.tar.xz
+588d53af2750aa4e3418b61262012880  system-config-printer-1.1.12.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- system-config-printer.spec	20 Aug 2009 17:21:19 -0000	1.282
+++ system-config-printer.spec	25 Aug 2009 16:29:16 -0000	1.283
@@ -6,15 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.11
-Release: 6%{?dist}
+Version: 1.1.12
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-scp-git.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -25,7 +24,6 @@ BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
 BuildRequires: xmlto
 BuildRequires: epydoc
-BuildRequires: autoconf, automake
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,11 +74,6 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-# Applied patch from 1.1.x (52a73b6).
-%patch1 -p1 -b .scp-git
-aclocal
-automake --copy --add-missing
-autoconf
 
 %build
 %configure --with-udev-rules
@@ -192,6 +185,30 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
+- 1.1.12:
+  - Troubleshooting fix.
+  - Fixed applet traceback when printing test page.
+  - Removed completed job notifications (trac #181).
+  - Show printer status in printer icons (bug #518020).
+  - Use paused icon when printer state reason is 'paused'.
+  - Driver preference order fixes.
+  - Job status icon and state reason display in jobs list
+    (bug #518070).
+  - Fixed overactive job creation times update timer.
+  - Use preferred D-Bus object path for AuthenticationAgent
+    (bug #518427).
+  - Fixed disabling a printer when PolicyKit call fails.
+  - Set appropriate status icon tooltip when configuration printer
+    (bug #518007).
+  - Use separate thread for verifying IPP queue (bug #518065).
+  - Use newer tooltip API to avoid deprecation warnings.
+  - Compare MFG/MDL case-insensitively in udev rule.
+  - Support for cups-pk-helper's DevicesGet method.
+  - Don't attempt to use PolicyKit if running as root.
+  - Support for localized marker names (trac #183).
+  - Other small fixes.
+
 * Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-6
 - Applied patch from 1.1.x (52a73b6).
   - Better printer icons representing status (bug #518020).


--- system-config-printer-1.1.11.tar.xz.sig DELETED ---


--- system-config-printer-scp-git.patch DELETED ---



From twaugh at fedoraproject.org  Tue Aug 25 16:45:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 16:45:09 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-1.1.12.tar.xz.sig, NONE, 1.1 .cvsignore,
	1.204, 1.205 sources, 1.210, 1.211 system-config-printer.spec,
	1.273, 1.274 system-config-printer-1.1.11.tar.xz.sig, 1.1,
	NONE system-config-printer-getdevices.patch, 1.1, NONE
Message-ID: <20090825164509.C565911C0348@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-serv16452

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.12.tar.xz.sig 
Removed Files:
	system-config-printer-1.1.11.tar.xz.sig 
	system-config-printer-getdevices.patch 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
- 1.1.12:
  - Troubleshooting fix.
  - Fixed applet traceback when printing test page.
  - Removed completed job notifications (trac #181).
  - Show printer status in printer icons (bug #518020).
  - Use paused icon when printer state reason is 'paused'.
  - Driver preference order fixes.
  - Job status icon and state reason display in jobs list
    (bug #518070).
  - Fixed overactive job creation times update timer.
  - Use preferred D-Bus object path for AuthenticationAgent
    (bug #518427).
  - Fixed disabling a printer when PolicyKit call fails.
  - Set appropriate status icon tooltip when configuration printer
    (bug #518007).
  - Use separate thread for verifying IPP queue (bug #518065).
  - Use newer tooltip API to avoid deprecation warnings.
  - Compare MFG/MDL case-insensitively in udev rule.
  - Support for cups-pk-helper's DevicesGet method.
  - Don't attempt to use PolicyKit if running as root.
  - Support for localized marker names (trac #183).
  - Other small fixes.



--- NEW FILE system-config-printer-1.1.12.tar.xz.sig ---
??
??}?J??u

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/.cvsignore,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- .cvsignore	7 Aug 2009 17:26:31 -0000	1.204
+++ .cvsignore	25 Aug 2009 16:45:08 -0000	1.205
@@ -203,3 +203,4 @@ pycups-1.9.46.tar.bz2
 system-config-printer-1.1.8.tar.bz2
 system-config-printer-1.1.10.tar.bz2
 system-config-printer-1.1.11.tar.xz
+system-config-printer-1.1.12.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/sources,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- sources	7 Aug 2009 17:26:31 -0000	1.210
+++ sources	25 Aug 2009 16:45:09 -0000	1.211
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-73c67f5ff95aa5b88949c6f15dd2d836  system-config-printer-1.1.11.tar.xz
+588d53af2750aa4e3418b61262012880  system-config-printer-1.1.12.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- system-config-printer.spec	10 Aug 2009 21:29:16 -0000	1.273
+++ system-config-printer.spec	25 Aug 2009 16:45:09 -0000	1.274
@@ -6,15 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.11
-Release: 2%{?dist}
+Version: 1.1.12
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-getdevices.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -63,7 +62,6 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .getdevices
 
 %build
 %configure
@@ -149,7 +147,6 @@ rm -rf %buildroot
 %{_datadir}/%{name}/userdefault.py*
 %{_datadir}/%{name}/XmlHelper.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
-%{_datadir}/%{name}/gtk_treeviewtooltips.py*
 %{_datadir}/%{name}/applet.py*
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/icons
@@ -166,6 +163,30 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
+- 1.1.12:
+  - Troubleshooting fix.
+  - Fixed applet traceback when printing test page.
+  - Removed completed job notifications (trac #181).
+  - Show printer status in printer icons (bug #518020).
+  - Use paused icon when printer state reason is 'paused'.
+  - Driver preference order fixes.
+  - Job status icon and state reason display in jobs list
+    (bug #518070).
+  - Fixed overactive job creation times update timer.
+  - Use preferred D-Bus object path for AuthenticationAgent
+    (bug #518427).
+  - Fixed disabling a printer when PolicyKit call fails.
+  - Set appropriate status icon tooltip when configuration printer
+    (bug #518007).
+  - Use separate thread for verifying IPP queue (bug #518065).
+  - Use newer tooltip API to avoid deprecation warnings.
+  - Compare MFG/MDL case-insensitively in udev rule.
+  - Support for cups-pk-helper's DevicesGet method.
+  - Don't attempt to use PolicyKit if running as root.
+  - Support for localized marker names (trac #183).
+  - Other small fixes.
+
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
 - Added patch for cupspk DevicesGet method call.
 


--- system-config-printer-1.1.11.tar.xz.sig DELETED ---


--- system-config-printer-getdevices.patch DELETED ---



From jspaleta at fedoraproject.org  Tue Aug 25 16:51:13 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Tue, 25 Aug 2009 16:51:13 +0000 (UTC)
Subject: rpms/gourmet/F-11 gourmet.spec,1.15,1.16
Message-ID: <20090825165114.02DFF11C0348@cvs1.fedora.phx.redhat.com>

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17909

Modified Files:
	gourmet.spec 
Log Message:
* Tue Aug 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-3
- add python-sqlalchemy runtime dep.



Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/F-11/gourmet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gourmet.spec	23 Aug 2009 19:44:09 -0000	1.15
+++ gourmet.spec	25 Aug 2009 16:51:13 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.15.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
@@ -19,7 +19,7 @@ BuildRequires:  gettext,intltool
 Requires: gnome-python2, gnome-python2-gnomeprint
 Requires: metakit
 Requires: pygtk2 
-Requires: PyRTF
+Requires: PyRTF,python-sqlalchemy
 Requires: python-imaging, python-sqlite2, pygtk2-libglade, python-reportlab
 %description
 Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping
@@ -69,6 +69,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Tue Aug 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-3
+- add python-sqlalchemy runtime dep.
+
 * Sun Aug 23 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.0-2
 - Small buildrequires fix.
 



From pkgdb at fedoraproject.org  Tue Aug 25 17:12:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 17:12:34 +0000
Subject: [pkgdb] backport-util-concurrent was added for overholt
Message-ID: <20090825171234.785D810F879@bastion2.fedora.phx.redhat.com>

ausil has added Package backport-util-concurrent with summary Backport of java.util.concurrent API, introduced in Java 5.0
ausil has approved Package backport-util-concurrent
ausil has added a Fedora devel branch for backport-util-concurrent with an owner of overholt
ausil has approved backport-util-concurrent in Fedora devel
ausil has approved Package backport-util-concurrent
ausil has set commit to Approved for 107427 on backport-util-concurrent (Fedora devel)
ausil has set checkout to Approved for 107427 on backport-util-concurrent (Fedora devel)
ausil has set build to Approved for 107427 on backport-util-concurrent (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/backport-util-concurrent



From pkgdb at fedoraproject.org  Tue Aug 25 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 17:12:35 +0000
Subject: [pkgdb] backport-util-concurrent summary updated by ausil
Message-ID: <20090825171235.EFED010F88B@bastion2.fedora.phx.redhat.com>

ausil set package backport-util-concurrent summary to Backport of java.util.concurrent API, introduced in Java 5.0

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/backport-util-concurrent



From ausil at fedoraproject.org  Tue Aug 25 17:12:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 17:12:43 +0000 (UTC)
Subject: rpms/backport-util-concurrent/devel - New directory
Message-ID: <20090825171243.9E61611C0372@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/backport-util-concurrent/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT20523/rpms/backport-util-concurrent/devel

Log Message:
Directory /cvs/pkgs/rpms/backport-util-concurrent/devel added to the repository




From ausil at fedoraproject.org  Tue Aug 25 17:12:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 17:12:43 +0000 (UTC)
Subject: rpms/backport-util-concurrent - New directory
Message-ID: <20090825171243.83EB511C0348@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/backport-util-concurrent
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT20523/rpms/backport-util-concurrent

Log Message:
Directory /cvs/pkgs/rpms/backport-util-concurrent added to the repository




From pkgdb at fedoraproject.org  Tue Aug 25 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 17:12:35 +0000
Subject: [pkgdb] backport-util-concurrent (Fedora, devel) updated by ausil
Message-ID: <20090825171236.17D5910F895@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on backport-util-concurrent (Fedora devel) for akurtakov
ausil approved watchcommits on backport-util-concurrent (Fedora devel) for akurtakov
ausil approved commit on backport-util-concurrent (Fedora devel) for akurtakov
ausil approved build on backport-util-concurrent (Fedora devel) for akurtakov
ausil approved approveacls on backport-util-concurrent (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/backport-util-concurrent



From ausil at fedoraproject.org  Tue Aug 25 17:12:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 17:12:49 +0000 (UTC)
Subject: rpms/backport-util-concurrent Makefile,NONE,1.1
Message-ID: <20090825171249.D452B11C0348@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/backport-util-concurrent
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT20523/rpms/backport-util-concurrent

Added Files:
	Makefile 
Log Message:
Setup of module backport-util-concurrent


--- NEW FILE Makefile ---
# Top level Makefile for module backport-util-concurrent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Tue Aug 25 17:12:50 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 17:12:50 +0000 (UTC)
Subject: rpms/backport-util-concurrent/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090825171250.4910C11C0348@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/backport-util-concurrent/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsT20523/rpms/backport-util-concurrent/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module backport-util-concurrent


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: backport-util-concurrent
# $Id: Makefile,v 1.1 2009/08/25 17:12:49 ausil Exp $
NAME := backport-util-concurrent
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From overholt at fedoraproject.org  Tue Aug 25 17:22:49 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 25 Aug 2009 17:22:49 +0000 (UTC)
Subject: rpms/maven2/devel .cvsignore, 1.5,
	1.6 maven2-plugins-javadoc-newdoxia.patch, 1.1, 1.2 maven2.spec,
	1.22, 1.23 sources, 1.5, 1.6
Message-ID: <20090825172249.04A5511C0348@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22712

Modified Files:
	.cvsignore maven2-plugins-javadoc-newdoxia.patch maven2.spec 
	sources 
Log Message:
* Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
- Fix javadoc source directory name
- Don't try to symlink model-all JAR


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:02:26 -0000	1.5
+++ .cvsignore	25 Aug 2009 17:22:48 -0000	1.6
@@ -1,8 +1 @@
-m2_jar_repo.tar.gz
-m2_pom_repo.tar.gz
-maven2-empty-dep.jar
-maven2-maven-site-plugin.tar.gz
-maven2-model-v3.jar
-maven2-src.tar.gz
-maven2-plugins-070705-src.tar.gz
 maven-javadoc-plugin-2.4-src.tar.gz

maven2-plugins-javadoc-newdoxia.patch:
 JavadocReport.java |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

Index: maven2-plugins-javadoc-newdoxia.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2-plugins-javadoc-newdoxia.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-plugins-javadoc-newdoxia.patch	24 Aug 2009 19:12:57 -0000	1.1
+++ maven2-plugins-javadoc-newdoxia.patch	25 Aug 2009 17:22:48 -0000	1.2
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2009-01-31 12:28:40.393331000 -0500
-+++ maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2009-01-31 18:17:01.921601000 -0500
+--- maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2009-01-31 12:28:40.393331000 -0500
++++ maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2009-01-31 18:17:01.921601000 -0500
 @@ -26,6 +26,7 @@
  import org.apache.maven.plugin.MojoFailureException;
  import org.apache.maven.reporting.MavenReport;


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- maven2.spec	24 Aug 2009 19:12:57 -0000	1.22
+++ maven2.spec	25 Aug 2009 17:22:48 -0000	1.23
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.2%{?dist}
+Release:        1.3%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -64,8 +64,8 @@ Source2:        %{name}-plugins-070705-s
 
 # We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
 # has several bugs
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4
-# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin-2.4
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 maven-javadoc-plugin
+# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin
 Source22: maven-javadoc-plugin-2.4-src.tar.gz
 
 # No source location for these. They are ascii files generated from maven
@@ -1196,7 +1196,7 @@ popd
 for i in    maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
-            maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
+            maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
             maven2-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
             maven2/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
             maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
@@ -1540,9 +1540,10 @@ pushd %{name}
 
         install -m 644 $project/target/$project-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-%{version}.jar
 
-        if [ "$project" == "maven-model" ]; then
-          install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
-        fi
+# FIXME:  should perhaps only be done when non-bootstrap?
+#        if [ "$project" == "maven-model" ]; then
+#          install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
+#        fi
     done
 popd
 
@@ -2868,6 +2869,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
+- Fix javadoc source directory name
+- Don't try to symlink model-all JAR
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
 - Import 2.0.8 work from Deepak Bhole:
 -- Fix maven-remote-resources-plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 16:02:26 -0000	1.5
+++ sources	25 Aug 2009 17:22:48 -0000	1.6
@@ -1,8 +1 @@
-dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
-de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
-13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
-a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
-ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
-b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
-e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz
-7e6b7b8d83ae3498fe2c55a999278445  maven-javadoc-plugin-2.4-src.tar.gz
+cf287f9dceb51c21af5da92ff83a6b52  maven-javadoc-plugin-2.4-src.tar.gz



From overholt at fedoraproject.org  Tue Aug 25 17:23:00 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 25 Aug 2009 17:23:00 +0000 (UTC)
Subject: rpms/backport-util-concurrent/devel
	backport-util-concurrent-3.1.pom, 
	NONE, 1.1 backport-util-concurrent.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090825172300.F37B211C0348@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/backport-util-concurrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22750/devel

Modified Files:
	.cvsignore sources 
Added Files:
	backport-util-concurrent-3.1.pom backport-util-concurrent.spec 
	import.log 
Log Message:
Initial import (review bug #518238)



--- NEW FILE backport-util-concurrent-3.1.pom ---
<project>
    <modelVersion>4.0.0</modelVersion>
    <groupId>backport-util-concurrent</groupId>
    <artifactId>backport-util-concurrent</artifactId>
    <version>3.1</version>
    <packaging>jar</packaging>
    <name>Backport of JSR 166</name>
    <url>http://backport-jsr166.sourceforge.net/</url>
    <description>Dawid Kurzyniec's backport of JSR 166</description>
    <licenses>
        <license>
            <name>Public Domain</name>
            <url>http://creativecommons.org/licenses/publicdomain</url>
            <distribution>repo</distribution>
        </license>
    </licenses>
    <scm>
        <url>svn://dcl.mathcs.emory.edu/software/harness2/trunk/util/backport-util-concurrent/</url>
    </scm>
    <organization>
        <name>Dawid Kurzyniec</name>
        <url>http://www.mathcs.emory.edu/~dawidk/</url>
    </organization>
    <dependencies/>
</project>


--- NEW FILE backport-util-concurrent.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

Name:		backport-util-concurrent
Summary:	Backport of java.util.concurrent API, introduced in Java 5.0
Version:	3.1
Release:	3
URL:		http://backport-jsr166.sourceforge.net
License:	Public Domain
Group:		Development/Libraries
# http://sourceforge.net/projects/backport-jsr166/files/backport-jsr166/3.1/backport-util-concurrent-3.1-src.tar.gz/download
Source0:	%{name}-%{version}-src.tar.gz
Source1:	http://repo1.maven.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom

BuildRequires:	jpackage-utils >= 0:1.7.2
BuildRequires:	java-devel = 0:1.5.0
BuildRequires:	ant >= 0:1.6.5
BuildRequires:	junit
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:	noarch
Requires:	java >= 0:1.5.0
Requires:	jpackage-utils
Requires(post):		jpackage-utils >= 0:1.7.2
Requires(postun):	jpackage-utils >= 0:1.7.2

BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This package is the backport of java.util.concurrent API, introduced in
Java 5.0, to Java 1.4. The backport is based on public-domain sources
from the JSR 166 CVS repository, and the dl.util.concurrent package.

%package javadoc
Group:			Documentation
Summary:		Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{name}-%{version}-src

find . -name '*.?ar' | xargs rm -f

build-jar-repository -s -p external \
		junit

%build
unset CLASSPATH
ant dist test

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 backport-util-concurrent-dist/%{name}.jar \
		$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar \
		$RPM_BUILD_ROOT%{_javadir}/%{name}.jar


# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom

%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr backport-util-concurrent-dist/doc/api/* \
		$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 license.html
%doc README.html
%{_javadir}/*.jar
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Mon Aug 24 2009 Andrew Overholt <overholt at redhat.com> 3.1-3
- Clarify Source0 URl
- Add jpackage-utils Requirement
- Fix %%files defattr
- Fix javadoc sub-package description

* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 3.1-2
- Update URL, Group, License
- Remove explicit "jpp" from Release
- Add doc files
- Remove javadoc ghost stuff

* Wed Mar 05 2008 Deepak Bhole <dbhole at redhat.com> 3.1-1jpp
- Import from JPackage + modify per Fedora requirements

* Fri Feb 08 2008 Ralph Apel <r.apel at r-apel.de> 0:3.1-1jpp
- Upgrade to 3.1
- Always test

* Wed Jun 14 2006 Ralph Apel <r.apel at r-apel.de> 0:2.1-1jpp
- Upgrade to 2.1 - no licensing issues any more
- Create option --with tests to optionally run tck

* Thu Jan 19 2006 Deepak Bhole <dbhole at redhat.com> 0:2.0.01-1jpp
- Initial build.


--- NEW FILE import.log ---
backport-util-concurrent-3_1-3:HEAD:backport-util-concurrent-3.1-3.src.rpm:1251220866


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backport-util-concurrent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	25 Aug 2009 17:12:49 -0000	1.1
+++ .cvsignore	25 Aug 2009 17:23:00 -0000	1.2
@@ -0,0 +1 @@
+backport-util-concurrent-3.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backport-util-concurrent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	25 Aug 2009 17:12:50 -0000	1.1
+++ sources	25 Aug 2009 17:23:00 -0000	1.2
@@ -0,0 +1 @@
+229fb7da5a20a9f4807edd5ae431cc44  backport-util-concurrent-3.1-src.tar.gz



From overholt at fedoraproject.org  Tue Aug 25 17:28:13 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 25 Aug 2009 17:28:13 +0000 (UTC)
Subject: rpms/maven2/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20090825172813.3874511C0348@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23517

Modified Files:
	.cvsignore sources 
Log Message:
Fix sources and .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Aug 2009 17:22:48 -0000	1.6
+++ .cvsignore	25 Aug 2009 17:28:13 -0000	1.7
@@ -1 +1,7 @@
 maven-javadoc-plugin-2.4-src.tar.gz
+maven2-maven-site-plugin.tar.gz
+maven2-model-v3.jar
+maven2-plugins-070705-src.tar.gz
+maven2-src.tar.gz
+m2_jar_repo.tar.gz
+m2_pom_repo.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 17:22:48 -0000	1.6
+++ sources	25 Aug 2009 17:28:13 -0000	1.7
@@ -1 +1,7 @@
 cf287f9dceb51c21af5da92ff83a6b52  maven-javadoc-plugin-2.4-src.tar.gz
+de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
+13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
+a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
+ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
+b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
+e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz



From rdieter at fedoraproject.org  Tue Aug 25 17:40:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 25 Aug 2009 17:40:36 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.386,1.387
Message-ID: <20090825174036.75C8411C043D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25181

Modified Files:
	kdebase.spec 
Log Message:
* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- kde-plasma-folderview subpkg
- %?_isa'ify -libs deps



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- kdebase.spec	29 Jul 2009 22:17:30 -0000	1.386
+++ kdebase.spec	25 Aug 2009 17:40:36 -0000	1.387
@@ -1,7 +1,8 @@
+
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -24,9 +25,9 @@ Provides:  kdebase4 = %{version}-%{relea
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 6:4.0.0 
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -73,22 +74,26 @@ Requires: kdebase-runtime
 Core runtime requirements and applications for the K Desktop Environment 4.
 
 
+%package -n kde-plasma-folderview
+Summary: FolderView plasma applet
+Group:   System Environment/Desktop
+%description -n kde-plasma-folderview
+%{summary}.
 
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
-
-
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Provides:  kdebase4-devel = %{version}-%{release}
 Obsoletes: kdebase4-devel < %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 %{summary}.
@@ -146,7 +151,6 @@ rm -rf %{buildroot}
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -156,41 +160,52 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    update-desktop-database -q &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
 fi
 
 %post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/
+%{_kde4_datadir}/kde4/services/kded/*.desktop
+%{_kde4_datadir}/kde4/services/useragentstrings/
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_configdir}/*
 %{_kde4_datadir}/templates/*
 %{_kde4_datadir}/templates/.source/*
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/libkonsoleprivate.so
 
+%exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
+%files -n kde-plasma-folderview
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
@@ -202,6 +217,10 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- kde-plasma-folderview subpkg
+- %%?_isa'ify -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From rdieter at fedoraproject.org  Tue Aug 25 17:44:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 25 Aug 2009 17:44:24 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.271,1.272
Message-ID: <20090825174424.C453A11C0348@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25780

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-10
- Requires: kde-plasma-folderview



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- kdebase-workspace.spec	23 Aug 2009 19:30:29 -0000	1.271
+++ kdebase-workspace.spec	25 Aug 2009 17:44:24 -0000	1.272
@@ -1,10 +1,11 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -118,6 +119,7 @@ Requires: leonidas-kde-theme
 %endif
 %endif
 
+Requires: kde-plasma-folderview
 Requires: kio_sysinfo
 
 %description
@@ -538,6 +540,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-10
+- Requires: kde-plasma-folderview
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-9
 - -akonadi: move plasma_engine_calendar here
 - drop Requires: kdm (F-12+)



From behdad at fedoraproject.org  Tue Aug 25 17:45:07 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 25 Aug 2009 17:45:07 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.80, 1.81 sources, 1.81, 1.82 vte.spec, 
	1.154, 1.155
Message-ID: <20090825174507.A9F1211C0348@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25965

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.2-1 
- Update to 0.21.2 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	24 Aug 2009 23:18:58 -0000	1.80
+++ .cvsignore	25 Aug 2009 17:45:07 -0000	1.81
@@ -1 +1 @@
-vte-0.21.1.tar.bz2
+vte-0.21.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	24 Aug 2009 23:18:58 -0000	1.81
+++ sources	25 Aug 2009 17:45:07 -0000	1.82
@@ -1 +1 @@
-311b1ee9861c3572307d9a7404797505  vte-0.21.1.tar.bz2
+b192bc46eefbc42158cfd902bd0184eb  vte-0.21.2.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- vte.spec	24 Aug 2009 23:18:58 -0000	1.154
+++ vte.spec	25 Aug 2009 17:45:07 -0000	1.155
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.1
+Version: 0.21.2
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.2-1
+- Update to 0.21.2
+
 * Mon Aug 24 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.1-1
 - Update to 0.21.1
 



From jjames at fedoraproject.org  Tue Aug 25 17:45:22 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 25 Aug 2009 17:45:22 +0000 (UTC)
Subject: rpms/findbugs/devel findbugs-1.3.9-build.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 findbugs-1.3.8-build.patch, 1.1, NONE
Message-ID: <20090825174522.22ECE11C0348@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26001/devel

Modified Files:
	.cvsignore sources 
Added Files:
	findbugs-1.3.9-build.patch 
Removed Files:
	findbugs-1.3.8-build.patch 
Log Message:
* Tue Aug 25 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-1
- Update to 1.3.9


findbugs-1.3.9-build.patch:
 build.xml                      |   29 ++++++++++++++++-------------
 design/architecture/Makefile   |    1 +
 etc/MANIFEST-findbugs.MF       |    2 +-
 etc/script.properties          |    4 ++--
 src/scripts/standard/findbugs  |    2 +-
 src/scripts/standard/findbugs2 |    2 +-
 6 files changed, 22 insertions(+), 18 deletions(-)

--- NEW FILE findbugs-1.3.9-build.patch ---
diff -dur findbugs-1.3.9.ORIG/build.xml findbugs-1.3.9/build.xml
--- findbugs-1.3.9.ORIG/build.xml	2009-08-04 20:26:50.000000000 -0600
+++ findbugs-1.3.9/build.xml	2009-08-25 11:31:55.848947432 -0600
@@ -18,6 +18,8 @@
 	<property file="build.properties" />
 	
 	<property name="jar.dir" value="lib"/>
+	<property name="systemjar.dir" value="/usr/share/java"/>
+	<property name="xsl.stylesheet.home" value="/usr/share/sgml/docbook/xsl-stylesheets"/>
 	<property name="plugin.dir" value="plugin"/>
 	<property name="build.dir" value="build"/>
 	<property name="classes.dir" value="build/classes"/>
@@ -55,23 +57,24 @@
 	<property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
 	
 	<path id="findbugs.classpath">
-		<pathelement location="${jar.dir}/bcel.jar"/>
-		<pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
-		<pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
-		<pathelement location="${jar.dir}/junit.jar"/>
-		<pathelement location="${jar.dir}/asm-3.1.jar"/>
-		<pathelement location="${jar.dir}/asm-commons-3.1.jar"/>
-		<pathelement location="${jar.dir}/asm-tree-3.1.jar"/>
-		<pathelement location="${jar.dir}/jaxen-1.1.1.jar"/>		
-		<pathelement location="${jar.dir}/jsr305.jar"/>
-		<pathelement location="${jar.dir}/jFormatString.jar"/>
-		<pathelement location="${jar.dir}/commons-lang-2.4.jar"/>
+		<pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
+		<pathelement location="${systemjar.dir}/dom4j-1.6.1.jar"/>
+		<pathelement location="${systemjar.dir}/junit4.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-3.1.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-commons-3.1.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-tree-3.1.jar"/>
+		<pathelement location="${systemjar.dir}/jaxen-1.1.1.jar"/>		
+		<pathelement location="${systemjar.dir}/jsr-305.jar"/>
+		<pathelement location="${systemjar.dir}/jFormatString.jar"/>
+		<pathelement location="${systemjar.dir}/commons-lang.jar"/>
+		<pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+		<pathelement location="${systemjar.dir}/ant.jar"/>
 	</path>
 	
 	<path id="tools.classpath">
 		<pathelement location="${classes.dir}"/>
 		<pathelement location="${jar.dir}/findbugs.jar"/>
-		<pathelement location="${jar.dir}/jdepend-2.9.jar"/>
+		<pathelement location="${systemjar.dir}/jdepend-2.9.jar"/>
 		<path refid="findbugs.classpath"/>
 	</path>
 
@@ -1047,7 +1050,7 @@
        <delete dir="${annotationDoc.dir}"/>
        <mkdir dir="${annotationDoc.dir}"/>
       <javadoc access="public" 
-       classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
+       classpath="${systemjar.dir}/findbugs-bcel.jar:${systemjar.dir}/junit4.jar:${systemjar.dir}/dom4j-1.6.1.jar:${systemjar.dir}/jsr-305.jar:${systemjar.dir}/jcip-annotations.jar"
         destdir="${annotationDoc.dir}" 
 	    packagenames="edu.umd.cs.findbugs.annotations"
         doctitle="FindBugs Annotation Documentation" 
diff -dur findbugs-1.3.9.ORIG/design/architecture/Makefile findbugs-1.3.9/design/architecture/Makefile
--- findbugs-1.3.9.ORIG/design/architecture/Makefile	2006-01-10 14:34:32.000000000 -0700
+++ findbugs-1.3.9/design/architecture/Makefile	2009-08-25 11:31:27.204143518 -0600
@@ -4,6 +4,7 @@
 %.pdf : %.tex
 	pdflatex $*
 	pdflatex $*
+	pdflatex $*
 
 all : $(PDFS)
 
diff -dur findbugs-1.3.9.ORIG/etc/MANIFEST-findbugs.MF findbugs-1.3.9/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.9.ORIG/etc/MANIFEST-findbugs.MF	2009-06-13 11:10:40.000000000 -0600
+++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF	2009-08-25 11:31:27.205158785 -0600
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar asm-3.1.jar asm-tree-3.1.jar asm-commons-3.1.jar jsr305.jar jFormatString.jar commons-lang-2.4.jar mysql-connector-java-5.1.7-bin.jar
+Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar objectweb-asm/asm-3.1.jar objectweb-asm/asm-tree-3.1.jar objectweb-asm/asm-commons-3.1.jar jsr-305.jar jFormatString.jar commons-lang.jar
diff -dur findbugs-1.3.9.ORIG/etc/script.properties findbugs-1.3.9/etc/script.properties
--- findbugs-1.3.9.ORIG/etc/script.properties	2008-03-18 16:54:34.000000000 -0600
+++ findbugs-1.3.9/etc/script.properties	2009-08-25 11:31:27.205158785 -0600
@@ -93,7 +93,7 @@
 script.wrap.java=\
 	fb_javacmd=\${fb_javacmd:-"java"}\n\
 	fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
-	fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+	fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
 	set -f\n\
 	#echo command: \\\n\
 	exec "$fb_javacmd" \\\n\
@@ -105,7 +105,7 @@
 script.wrap.jar=\
 	fb_javacmd=\${fb_javacmd:-"java"}\n\
 	fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
-	fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+	fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
 	set -f\n\
 	#echo command: \\\n\
 	exec "$fb_javacmd" \\\n\
diff -dur findbugs-1.3.9.ORIG/src/scripts/standard/findbugs findbugs-1.3.9/src/scripts/standard/findbugs
--- findbugs-1.3.9.ORIG/src/scripts/standard/findbugs	2008-07-02 11:48:10.000000000 -0600
+++ findbugs-1.3.9/src/scripts/standard/findbugs	2009-08-25 11:31:27.206143760 -0600
@@ -10,7 +10,7 @@
 
 maxheap=768
 
-fb_appjar="$findbugs_home/lib/findbugs.jar"
+fb_appjar="/usr/share/java/findbugs.jar"
 
 ShowHelpAndExit() {
 	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
diff -dur findbugs-1.3.9.ORIG/src/scripts/standard/findbugs2 findbugs-1.3.9/src/scripts/standard/findbugs2
--- findbugs-1.3.9.ORIG/src/scripts/standard/findbugs2	2009-07-31 10:23:38.000000000 -0600
+++ findbugs-1.3.9/src/scripts/standard/findbugs2	2009-08-25 11:31:27.207327673 -0600
@@ -117,5 +117,5 @@
 	-Dfindbugs.home="$findbugs_home" \
 	$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
 	-Dfindbugs.launchUI=$fb_launchui \
-	-jar $findbugs_home/lib/findbugs.jar \
+	-jar /usr/share/java/findbugs.jar \
 	${@:+"$@"}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Mar 2009 03:34:11 -0000	1.3
+++ .cvsignore	25 Aug 2009 17:45:21 -0000	1.4
@@ -1 +1 @@
-findbugs-1.3.8-source.zip
+findbugs-1.3.9-source.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Mar 2009 03:34:12 -0000	1.3
+++ sources	25 Aug 2009 17:45:22 -0000	1.4
@@ -1 +1 @@
-a0f5f5a263259e163306857dc530a421  findbugs-1.3.8-source.zip
+bcc6c57396b9e4385207a6a280697eca  findbugs-1.3.9-source.zip


--- findbugs-1.3.8-build.patch DELETED ---



From jjames at fedoraproject.org  Tue Aug 25 17:47:36 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 25 Aug 2009 17:47:36 +0000 (UTC)
Subject: rpms/findbugs/devel findbugs.spec,1.5,1.6
Message-ID: <20090825174736.A7AC611C0348@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26376

Modified Files:
	findbugs.spec 
Log Message:
* Tue Aug 25 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-1
- Update to 1.3.9



Index: findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/devel/findbugs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- findbugs.spec	24 Jul 2009 22:46:28 -0000	1.5
+++ findbugs.spec	25 Aug 2009 17:47:36 -0000	1.6
@@ -4,8 +4,8 @@
 # specification, but Classpath does not support it.  This is a fatal problem.
 
 Name:           findbugs
-Version:        1.3.8
-Release:        2%{?dist}
+Version:        1.3.9
+Release:        1%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -17,7 +17,7 @@ Source2:        findbugs-tools-README
 # 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 in findbugs' lib directory.
-Patch0:         findbugs-1.3.8-build.patch
+Patch0:         findbugs-1.3.9-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -28,6 +28,7 @@ BuildRequires:  jakarta-commons-lang
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  jaxen
 BuildRequires:  jcip-annotations
+BuildRequires:  jdepend
 BuildRequires:  jFormatString
 BuildRequires:  jpackage-utils
 BuildRequires:  jsr-305
@@ -182,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/findbugs-tools*
 
 %changelog
+* Tue Aug 25 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-1
+- Update to 1.3.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rstrode at fedoraproject.org  Tue Aug 25 17:54:29 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 25 Aug 2009 17:54:29 +0000 (UTC)
Subject: rpms/plymouth/devel .cvsignore, 1.13, 1.14 plymouth.spec, 1.137,
	1.138 sources, 1.57, 1.58
Message-ID: <20090825175429.6008911C0348@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28104

Modified Files:
	.cvsignore plymouth.spec sources 
Log Message:
- Update to 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	8 May 2009 15:27:47 -0000	1.13
+++ .cvsignore	25 Aug 2009 17:54:28 -0000	1.14
@@ -1 +1 @@
-plymouth-0.7.0.tar.bz2
+plymouth-0.7.1.tar.bz2


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- plymouth.spec	24 Aug 2009 21:01:51 -0000	1.137
+++ plymouth.spec	25 Aug 2009 17:54:28 -0000	1.138
@@ -4,8 +4,8 @@
 
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
-Version: 0.7.0
-Release: 2%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -444,6 +444,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> 0.7.1-1
+- Update to 0.7.1
+
 * Mon Aug 24 2009 Adam Jackson <ajax at redhat.com> 0.7.0-2
 - Set charge bgcolor to black. (#519052)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	11 Aug 2009 17:56:49 -0000	1.57
+++ sources	25 Aug 2009 17:54:28 -0000	1.58
@@ -1 +1 @@
-f0b305c05129f3fd70de6583ed9cb9a4  plymouth-0.7.0.tar.bz2
+5a526059ad26e0a6ed0896c9d48a8557  plymouth-0.7.1.tar.bz2



From karsten at fedoraproject.org  Tue Aug 25 18:02:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Tue, 25 Aug 2009 18:02:46 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec,1.64,1.65
Message-ID: <20090825180246.08F6B11C0348@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29455

Modified Files:
	filesystem.spec 
Log Message:
- fix typo in Provides


Index: filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- filesystem.spec	17 Aug 2009 13:10:44 -0000	1.64
+++ filesystem.spec	25 Aug 2009 18:02:45 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
 Version: 2.4.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System Environment/Base
@@ -16,8 +16,8 @@ BuildRequires: iso-codes
 # Can be removed after f14 or so
 Provides: xorg-x11-filesystem = 7.3-6
 Obsoletes: xorg-x11-filesystem < 7.3-6
-Provides: pm-utils-filesytem = 1.2.5-6
-Obsoletes: pm-utils-filesytem < 1.2.5-6
+Provides: pm-utils-filesystem = 1.2.5-6
+Obsoletes: pm-utils-filesystem < 1.2.5-6
 
 %description
 The filesystem package is one of the basic packages that is installed
@@ -190,6 +190,9 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 2.4.30-2
+- fix typo in Provides
+
 * Mon Aug 17 2009 Ondrej Vasik <ovasik at redhat.com> 2.4.30-1
 - adjust directory rights for usage of capabilities(#517575)
 



From rdieter at fedoraproject.org  Tue Aug 25 18:07:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 25 Aug 2009 18:07:00 +0000 (UTC)
Subject: rpms/lyx/F-11 lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.39, 
	1.40 lyx.spec, 1.93, 1.94 sources, 1.37,
	1.38 lyx-1.6.3-xdg_open.patch, 1.1, NONE
Message-ID: <20090825180700.2731211C0348@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30109

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.4-xdg_open.patch 
Removed Files:
	lyx-1.6.3-xdg_open.patch 
Log Message:
* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
- lyx-1.6.4
- handle fonts manually (now EPEL-5 compatible)


lyx-1.6.4-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.4-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	4 Jun 2009 16:55:32 -0000	1.39
+++ .cvsignore	25 Aug 2009 18:06:59 -0000	1.40
@@ -1 +1 @@
-lyx-1.6.3.tar.bz2
+lyx-1.6.4.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-11/lyx.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- lyx.spec	4 Jun 2009 16:55:32 -0000	1.93
+++ lyx.spec	25 Aug 2009 18:06:59 -0000	1.94
@@ -1,9 +1,29 @@
 
+%if 0%{?fedora} > 3
+%define _with_aiksaurus --with-aiksaurus
+%endif
+
+%if 0%{?fedora} > 9
+%define build_noarch BuildArch: noarch
+%endif
+
+## lyx-fonts
+%global fontname lyx
+%global common_desc \
+A collection of Math symbol fonts.
+#if 0%{?fedora} > 8 
+%if 0
+%define fontpackages 1
+BuildRequires: fontpackages-devel
+%else
+%define _fontdir %{_datadir}/fonts/%{fontname}
+%endif
+
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.3
+Version: 1.6.4
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -13,13 +33,15 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.3-xdg_open.patch
+Patch1: lyx-1.6.4-xdg_open.patch
 
 Source1: lyxrc.dist
 
 Source10: lyx.desktop
 
+%if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
+%endif
 BuildRequires: aspell-devel
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
@@ -37,6 +59,18 @@ Obsoletes: %{name}-qt < 1.5.0 
 Provides:  %{name}-qt = %{version}-%{release}
 Obsoletes: %{name}-xforms < 1.5.0 
 
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
 Requires(post): texlive
@@ -50,7 +84,6 @@ Requires(post): tetex-fonts
 Requires(postun): tetex-fonts
 Requires: tetex-dvips tetex-latex
 %endif
-Requires: mathml-fonts
 Requires: ghostscript
 ## Soft dependencies
 %if 0%{?fedora} > 3 && 0%{?fedora} < 9
@@ -58,9 +91,9 @@ Requires: ghostscript
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
 Requires(hint): tetex-IEEEtran
+%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
-%endif
 Requires(hint): xdg-utils
 
 %description
@@ -80,7 +113,116 @@ to the backends (like LaTeX) that are sp
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
-
+%package common
+Summary:  Common files of %{name} 
+Requires: %{name} = %{version}-%{release}
+%{?build_noarch}
+%description common 
+{summary}.
+
+%package -n %{fontname}-fonts-compat
+Summary: Lyx/MathML fonts compatibility package
+License: Copyright only and GPL+
+Obsoletes: mathml-fonts < 1.0-50
+Provides:  mathml-fonts = 1.0-50
+Provides: %{fontname}-fonts = %{version}-%{release}
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-fonts-compat
+This package only exists to help transition mathml-fonts users to the new
+package split. It will be removed after one distribution release cycle, please
+do not reference it or depend on it in any way.
+
+%package -n %{fontname}-fonts-common
+Summary: Common files of %{fontname}-fonts
+# The actual license says "The author of these fonts, Basil K. Malyshev, has
+# kindly granted permission to use and modify these fonts."
+# One of the font files (wasy10) is separately licensed GPL+.
+License: Copyright only and GPL+
+%{?fontpackages:Requires: fontpackages-filesystem}
+%{?build_noarch}
+%description -n %{name}-fonts-common
+This package consists of files used by other %{fontname}-fonts packages.
+
+%package -n %{fontname}-cmex10-fonts
+Summary: Cmex10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmex10-fonts
+%common_desc
+
+%package -n %{fontname}-cmmi10-fonts
+Summary: Cmmi10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmmi10-fonts
+%common_desc
+
+%package -n %{fontname}-cmr10-fonts
+Summary: Cmr10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmr10-fonts
+%common_desc
+
+%package -n %{fontname}-cmsy10-fonts
+Summary: Cmsy10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmsy10-fonts
+%common_desc
+
+%package -n %{fontname}-esint10-fonts
+Summary: Esint10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-esint10-fonts
+%common_desc
+
+%package -n %{fontname}-eufm10-fonts
+Summary: Eufm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-eufm10-fonts
+%common_desc
+
+%package -n %{fontname}-msam10-fonts
+Summary: Msam10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-msam10-fonts
+%common_desc
+
+%package -n %{fontname}-msbm10-fonts
+Summary: Msbm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-msbm10-fonts
+%common_desc
+
+%package -n %{fontname}-wasy10-fonts
+Summary: Wasy10 fonts
+License: GPL+
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-wasy10-fonts
+%common_desc
 
 %prep
 
@@ -96,8 +238,9 @@ and let the computer take care of the re
   --disable-rpath \
   --enable-build-type=release \
   --enable-optimization="%{optflags}" \
-  --with-aiksaurus \
   --with-aspell \
+  --with-qt4-dir=`pkg-config --variable=prefix QtCore` \
+  %{?_with_aiksaurus} \
   %{?_without_included_boost}
 
 make %{?_smp_mflags}
@@ -131,24 +274,30 @@ touch %{buildroot}%{_datadir}/lyx/lyxrc.
 touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
 touch %{buildroot}%{_datadir}/lyx/doc/LaTeXConfig.lyx
 
-# unpackaged files
+# fonts
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
 rm -rf %{buildroot}%{_datadir}/lyx/fonts
 
 %find_lang %{name}
 
 
-%post
+%check
+make check
+
+
+%post common
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
-%postun
+%postun common
 if [ $1 -eq 0 ] ; then
-    texhash >& /dev/null 
-    update-desktop-database -q &> /dev/null
-    touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  texhash >& /dev/null 
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%posttrans
+%posttrans common
 texhash >& /dev/null
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -156,12 +305,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing,
 ##   and besides, we use xdg-open now -- Rex
-%triggerin -- latex2html,wv
+%triggerin common -- latex2html,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
 
-%triggerun -- latex2html,wv
+%triggerun common -- latex2html,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -171,10 +320,13 @@ fi
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc ANNOUNCE lib/CREDITS NEWS README
+%doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
 %{_mandir}/man1/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -185,8 +337,106 @@ rm -rf %{buildroot}
 %ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
 %{_datadir}/texmf/tex/latex/lyx/
 
+%files -n %{fontname}-fonts-compat
+# boo!
+
+%files -n %{fontname}-fonts-common
+%defattr(0644,root,root,0755)
+%doc lib/fonts/BaKoMaFontLicense.txt
+%doc lib/fonts/ReadmeBaKoMa4LyX.txt
+%dir %{_fontdir}
+
+%if 0%{?fontpackages:1}
+%_font_pkg -n cmex10 cmex10.ttf
+%_font_pkg -n cmmi10 cmmi10.ttf
+%_font_pkg -n cmr10 cmr10.ttf
+%_font_pkg -n cmsy10 cmsy10.ttf
+%_font_pkg -n esint10 esint10.ttf
+%_font_pkg -n eufm10 eufm10.ttf
+%_font_pkg -n msam10 msam10.ttf
+%_font_pkg -n msbm10 msbm10.ttf
+%_font_pkg -n wasy10 wasy10.ttf
+%else
+
+%files -n %{fontname}-cmex10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmex10.ttf
+
+%posttrans -n %{fontname}-cmex10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmmi10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmmi10.ttf
+
+%posttrans -n %{fontname}-cmmi10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmr10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmr10.ttf
+
+%posttrans -n %{fontname}-cmr10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmsy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmsy10.ttf
+
+%posttrans -n %{fontname}-cmsy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-esint10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/esint10.ttf
+
+%posttrans -n %{fontname}-esint10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-eufm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/eufm10.ttf
+
+%posttrans -n %{fontname}-eufm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msam10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msam10.ttf
+
+%posttrans -n %{fontname}-msam10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msbm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msbm10.ttf
+
+%posttrans -n %{fontname}-msbm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-wasy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/wasy10.ttf
+
+%posttrans -n %{fontname}-wasy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%endif
+
 
 %changelog
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
+- lyx-1.6.4
+- handle fonts manually (now EPEL-5 compatible)
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
+- add lyx-*-fonts subpkgs (#452357, #514549)
+- -common (noarch) subpkg
+- trim %%changelog
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-1
 - lyx-1.6.3
 
@@ -385,151 +635,3 @@ rm -rf %{buildroot}
 * Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-2
 - 1.4.0(final)
 - drop boost bits
-
-* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
-- 1.4.0rc
-- drop boost patch (for now)
-
-* Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
-- 1.4.0pre6
-- --disable-stdlib-debug --disable-assertions --disable-concept-checks
-- don't use --without-included-boost (for now)
-
-* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
-- gcc41 patch
-- document boost/gcc41 patches
-- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
-
-* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
-- updated boost patch
-- drop -fexceptions from %%optflags
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
-- --without-included-boost
-- BR: boost-devel
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
-- 1.4.0pre5
-
-* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
-- 1.4.0pre4
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
-- 1.4.0pre3
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
-- cleanup/fix snarfing of intermediate frontend builds.
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
-- BR: libXpm-devel
-
-* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
-- 1.3.7
-- -qt/-xforms: frontend pkgs (#178116)
-
-* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
-- %%post/%%postun: update-desktop-database
-
-* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
-- leave out kde-redhat bits in Fedora Extras build
-- define/use safer (esp for x86_64) QTDIR bits
-
-* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-3
-- touchup helpers script
-- fix for (sometimes missing) PSres.upr
-
-* Mon Aug 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-2
-- use triggers to configure/unconfigure helper (ps/pdf/html) apps
-
-* Sat Jul 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-1
-- 1.3.6
-
-* Mon May 23 2005 Rex Dieter <rexdieter[At]users.sf.net> 1.3.5-4
-- qt_immodule patch (lyx bug #1830)
-- update -helpers patch to look-for/use evince (rh bug #143992)
-- drop (not-strictly-required) Req's on helper apps
-  htmlview, gsview (rh bug #143992)
-- %%configure: --with-aiksaurus
-- %%configure: --enable-optimization="$$RPM_OPT_FLAGS"
-- %%configure: --disable-dependency-tracking
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
-- BR: pspell-devel -> aspell-devel
-- BR: tetex-* (helper detection, fonts)
-- -helpers patch: find/use htmlview, gsview, kdvi, ggv, kghostview
-- .desktop: GenericName: WYSIWYM document processor
-
-* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.5-0.fdr.1
-- 1.3.5
-
-* Fri Apr 30 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.6
-- BR: libtool
-
-* Fri Apr 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.5
-- Group: Applications/Publishing
-- BR: desktop-file-utils
-- Requires(post,postun): tetex
-
-* Sat Apr 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.4
-- .desktop: separate file
-- .desktop: drop 'Utility' category, add 'Qt'
-- .desktop: Name: lyx -> LyX
-- .desktop: Comment: lyx 1.3.4 -> WYSIWYM document processor
-- convert icon xpm -> png
-
-* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.3
-- dynamically determine version for qt dependency.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.2
-- add a few (mostly superfluous) BuildRequires to make fedora.us's
-  buildsystem happy.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.1
-- Allow building/use for any qt >= 3.1
-
-* Thu Feb 19 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.0
-- 1.3.4
-- Categories=Office
-
-* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
-- support MimeType(s): application/x-lyx;text/x-lyx
-
-* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
-- let rpm auto-require qt.
-- remove (optional) xforms support.
-- Requires: latex-xft-fonts
-
-* Mon Oct 06 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.1
-- 1.3.3
-- update macros for Fedora Core.
-
-* Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.3.2-0.fdr.0
-- 1.3.2
-- fedora-ize.
-
-* Tue Mar 25 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.1-1.0
-- 1.3.1 release.
-
-* Fri Feb 21 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-1.0
-- yank kmenu
-
-* Fri Feb 07 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-0.0
-- 1.3.0
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-11/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	4 Jun 2009 16:55:32 -0000	1.37
+++ sources	25 Aug 2009 18:06:59 -0000	1.38
@@ -1 +1 @@
-c524e72f7e4d64224c6bfdbd84065dd8  lyx-1.6.3.tar.bz2
+3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2


--- lyx-1.6.3-xdg_open.patch DELETED ---



From emaldonado at fedoraproject.org  Tue Aug 25 18:08:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue, 25 Aug 2009 18:08:59 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,NONE,1.4.2.2
Message-ID: <20090825180859.2C24411C0348@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30440

Added Files:
      Tag: nss-3_12_3_99_3-8_fc12
	nss-softokn.spec 
Log Message:
restoring the spec file after a succesfull scratch build


--- NEW FILE nss-softokn.spec ---
%global nspr_version 4.8
%global nss_name nss
%global nssutil_version 3.12.3.99.3
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved

# Produce .chk files for the final stripped binaries
%define __spec_install_post \
    %{?__debug_package:%{__debug_install_post}} \
    %{__arch_install_post} \
    %{__os_install_post} \
    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
%{nil}

Summary:          Network Security Services Soktoken Module
Name:             nss-softokn
Version:          3.12.3.99.3
Release:          14%{?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 >= %{version}
Requires:         nss-softokn-freebl%{_isa} >= %{version}
Requires:         sqlite
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    nspr-devel >= %{nspr_version}
BuildRequires:    sqlite-devel
BuildRequires:    zlib-devel
BuildRequires:    pkgconfig
BuildRequires:    gawk
BuildRequires:    psmisc
BuildRequires:    perl
#Obsoletes:        nss < 3.12.3.99.3-11

Source0:          %{name}-%{version}-stripped.tar.bz2
# The nss-softokn tar ball is a subset of nss-%{version}-stripped.tar.bz2, 
# Therefore we use the nss-split-softokn.sh script to keep only what we need.
# Download the nss tarball via CVS from the nss propect and follow these
# steps to make the r tarball for nss-util out of the for nss:
# cvs co nss
# cvs nss-softokn (as soon as it is in cvs - for now extract the srpm)
# cd nss-softokn/devel
# cp ../../nss/devel/${version}-stripped.tar.bz2  .
# (use 3.12.3.99.3 for version above until 3.12.4 comes out)
# sh ./nss-split-softokn.sh ${version}
# A %{name}-%{version}--stripped.tar.bz2 should appear
Source1:          nss-split-softokn.sh
Source2:          nss-softokn.pc.in
Source3:          nss-softokn-config.in
Source4:          nss-softokn-prelink.conf

# patches moved here from nss because they affect softoken only
# won't be needed when we upgrade to 3.12.4
Patch1:           nss-nolocalsql.patch
Patch2:           nss-stubs-bug502133.patch

%description
Network Security Services Softoken Cryptographic Module

%package freebl
Summary:          Freebl library for the Network Security Services
Group:            System Environment/Base
Conflicts:        nss < 3.12.2.99.3-8
Obsoletes:        nss-softokn-freebl < 3.12.3.99.3-11

%description freebl
Network Security Services Softoken Cryptographic Module Freelb Library.

Install the nss-softokn-freebl package if you need the freebl 
library.

%package devel
Summary:          Development libraries for Network Security Services
Group:            Development/Libraries
Requires:         nss-softokn = %{version}-%{release}
Requires:         nspr-devel >= %{nspr_version}
Requires:         nss-util-devel >= %{version}
Requires:         pkgconfig
BuildRequires:    nspr-devel >= %{nspr_version}
BuildRequires:    nss-util-devel >= %{version}
# require nss at least the version when we split via subpackages
BuildRequires:    nss-devel >= 3.12.2.99.3-11

%description devel
Header and Library files for doing development with Network Security Services.


%prep
%setup -q

# patches moved here from nss because they affect softokn only
# they won't be needed when we upgrade to 3.12.4
%patch1 -p0
%patch2 -p0 -b .502133

%build

FREEBL_NO_DEPEND=1
export FREEBL_NO_DEPEND

# Enable compiler optimizations and disable debugging code
BUILD_OPT=1
export BUILD_OPT

# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
export XCFLAGS


PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1

export PKG_CONFIG_ALLOW_SYSTEM_LIBS
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS

NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`

export NSPR_INCLUDE_DIR
export NSPR_LIB_DIR

NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`

export NSS_INCLUDE_DIR
export NSS_LIB_DIR

%ifarch x86_64 ppc64 ia64 s390x sparc64
USE_64=1
export USE_64
%endif

# Compile softkn plus needed support
%{__make} -C ./mozilla/security/coreconf
%{__make} -C ./mozilla/security/dbm
%{__make} -C ./mozilla/security/nss

# Set up our package file
%{__mkdir_p} ./mozilla/dist/pkgconfig
%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
                          -e "s,%%prefix%%,%{_prefix},g" \
                          -e "s,%%exec_prefix%%,%{_prefix},g" \
                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                          -e "s,%%SOFTKN_VERSION%%,%{version},g" > \
                          ./mozilla/dist/pkgconfig/nss-softokn.pc

SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`

export SOFTOKEN_VMAJOR 
export SOFTOKEN_VMINOR 
export SOFTOKEN_VPATCH

%{__cat} %{SOURCE3} | sed -e "s, at libdir@,%{_libdir},g" \
                          -e "s, at prefix@,%{_prefix},g" \
                          -e "s, at exec_prefix@,%{_prefix},g" \
                          -e "s, at includedir@,%{_includedir}/nss3,g" \
                          -e "s, at MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
                          -e "s, at MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
                          -e "s, at MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
                          > ./mozilla/dist/pkgconfig/nss-softokn-config

chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config

# save a copy in a safe place in case there is a preelink install or unistall
%{__cp} -p %{SOURCE4} ./mozilla/dist/pkgconfig/nss-softokn-prelink.conf

# enable the following line to force a test failure
# find ./mozilla -name \*.chk | xargs rm -f

#
# We can't run a subset of the tests because the tools have
# dependencies on nss libraries outside of softokn. 
# Let's leave this as a place holder.
#


%install

%{__rm} -rf $RPM_BUILD_ROOT

# There is no make install target so we'll do it ourselves.

%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}

# Copy the binary libraries we want
for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
do
  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done

# Make sure chk files can be found in both places
for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
do
  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done

# install our prelink configuration file
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
# and stash a copy away in a safe place
%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf

# Copy the binaries we ship as unsupported
for file in shlibsign
do
  %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done

# Copy the include files we want
for file in mozilla/dist/public/nss/*.h
do
  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
done

# Copy the package configuration files
%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config

%clean
%{__rm} -rf $RPM_BUILD_ROOT

# Trigger scriptlets to install or remove nss-softokn-prelink.conf
# when prelink is ether installed or removed in the user's system

# This trigger scriptlet is run when:
# 1) nss-softokn is already installed, and prelink is installed or upgraded
# 2) prelink is already installed, and nss-softokn is installed or upgraded
%triggerin -- prelink
%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
 %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf

# This trigger scriptlet is run when:
# 1) prelink is installed, and nss-softokn removed
# 2) nss-softokn is installed, and prelink gets removed
%triggerun -- prelink
[ $2 = 0 ] || exit 0
%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf


%post
/sbin/ldconfig >/dev/null 2>/dev/null

%postun
/sbin/ldconfig >/dev/null 2>/dev/null
[ $1 = 0 ] && %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf


%files
%defattr(-,root,root)
/%{_lib}/libnssdbm3.so
/%{_lib}/libnssdbm3.chk
/%{_lib}/libsoftokn3.so
/%{_lib}/libsoftokn3.chk
# shared with nss-tools
%dir %{_libdir}/nss
%dir %{saved_files_dir}
%dir %{unsupported_tools_directory}
%{unsupported_tools_directory}/shlibsign
%{saved_files_dir}/nss-softokn-prelink.conf
# we don't own %{_sysconfdir}/prelink.conf.d and
# must rely on triggers to install and remove our
# configuration file
%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf

%files freebl
%defattr(-,root,root)
/%{_lib}/libfreebl3.so
/%{_lib}/libfreebl3.chk

%files devel
%defattr(-,root,root)
%{_libdir}/libsoftokn3.so
%{_libdir}/libsoftokn3.chk
%{_libdir}/libfreebl3.so
%{_libdir}/libfreebl3.chk
%{_libdir}/libnssdbm3.so
%{_libdir}/libnssdbm3.chk
%{_libdir}/pkgconfig/nss-softokn.pc
%{_bindir}/nss-softokn-config
# co-owned with nss
%dir %{_includedir}/nss3
#
# The following headers are those exported public in
# mozilla/security/nss/lib/freebl/manifest.mn and
# mozilla/security/nss/lib/softoken/manifest.mn
#
# The following list is short because many headers, such as
# the pkcs #11 ones, have been provided by nss-util-devel
# which installed them before us.
#
%{_includedir}/nss3/blapit.h
%{_includedir}/nss3/ecl-exp.h
%{_includedir}/nss3/hasht.h
%{_includedir}/nss3/sechash.h
%{_includedir}/nss3/nsslowhash.h
%{_includedir}/nss3/secmodt.h
%{_includedir}/nss3/shsign.h

%changelog
* Thu Aug 20 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-14
- Third build, matches nss-util release

* Thu Aug 20 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-11
- Second build

* Thu Aug 14 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
- Initial build



From emaldonado at fedoraproject.org  Tue Aug 25 18:11:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue, 25 Aug 2009 18:11:06 +0000 (UTC)
Subject: rpms/nss-softokn/devel Makefile, NONE, 1.1.2.2 nss-nolocalsql.patch,
	NONE, 1.1.2.2 nss-softokn-config.in, NONE,
	1.1.2.2 nss-softokn-prelink.conf, NONE, 1.1.2.2
Message-ID: <20090825181106.9386011C0348@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30724

Added Files:
      Tag: nss-3_12_3_99_3-8_fc12
	Makefile nss-nolocalsql.patch nss-softokn-config.in 
	nss-softokn-prelink.conf 
Log Message:
restoring after a succesfull scratch build


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE nss-nolocalsql.patch ---
diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
+++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
 DIRS := $(filter-out fortcrypt,$(DIRS))
 endif
 
-ifndef MOZILLA_CLIENT
-ifndef NSS_USE_SYSTEM_SQLITE
-DIRS := sqlite $(DIRS)
-endif
-endif
+#ifndef MOZILLA_CLIENT
+#ifndef NSS_USE_SYSTEM_SQLITE
+#DIRS := sqlite $(DIRS)
+#endif
+#endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 CSRCS = \
 	dbmshim.c \
diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
+++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
-ifdef MOZILLA_CLIENT
-INCLUDES += -I$(DIST)/include/sqlite3
-endif
+#ifdef MOZILLA_CLIENT
+#INCLUDES += -I$(DIST)/include/sqlite3
+#endif
 
 EXPORTS = \
 	secmodt.h \


--- NEW FILE nss-softokn-config.in ---
#!/bin/sh

prefix=@prefix@

major_version=@MOD_MAJOR_VERSION@
minor_version=@MOD_MINOR_VERSION@
patch_version=@MOD_PATCH_VERSION@

usage()
{
	cat <<EOF
Usage: nss-softokn-config [OPTIONS] [LIBRARIES]
Options:
	[--prefix[=DIR]]
	[--exec-prefix[=DIR]]
	[--includedir[=DIR]]
	[--libdir[=DIR]]
	[--version]
	[--libs]
	[--cflags]
Dynamic Libraries:
EOF
	exit $1
}

if test $# -eq 0; then
	usage 1 1>&2
fi


while test $# -gt 0; do
  case "$1" in
  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  *) optarg= ;;
  esac

  case $1 in
    --prefix=*)
      prefix=$optarg
      ;;
    --prefix)
      echo_prefix=yes
      ;;
    --exec-prefix=*)
      exec_prefix=$optarg
      ;;
    --exec-prefix)
      echo_exec_prefix=yes
      ;;
    --includedir=*)
      includedir=$optarg
      ;;
    --includedir)
      echo_includedir=yes
      ;;
    --libdir=*)
      libdir=$optarg
      ;;
    --libdir)
      echo_libdir=yes
      ;;
    --version)
      echo ${major_version}.${minor_version}.${patch_version}
      ;;
    --cflags)
      echo_cflags=yes
      ;;
    --libs)
      echo_libs=yes
      ;;
    *)
      usage 1 1>&2
      ;;
  esac
  shift
done

# Set variables that may be dependent upon other variables
if test -z "$exec_prefix"; then
    exec_prefix=`pkg-config --variable=exec_prefix nss`
fi
if test -z "$includedir"; then
    includedir=`pkg-config --variable=includedir nss`
fi
if test -z "$libdir"; then
    libdir=`pkg-config --variable=libdir nss`
fi

if test "$echo_prefix" = "yes"; then
    echo $prefix
fi

if test "$echo_exec_prefix" = "yes"; then
    echo $exec_prefix
fi

if test "$echo_includedir" = "yes"; then
    echo $includedir
fi

if test "$echo_libdir" = "yes"; then
    echo $libdir
fi

if test "$echo_cflags" = "yes"; then
    echo -I$includedir
fi

if test "$echo_libs" = "yes"; then
      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
      echo $libdirs
fi      



--- NEW FILE nss-softokn-prelink.conf ---
-b /lib{,64}/libfreebl3.so
-b /lib{,64}/libsoftokn3.so



From emaldonado at fedoraproject.org  Tue Aug 25 18:12:18 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue, 25 Aug 2009 18:12:18 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.pc.in,NONE,1.1.2.2
Message-ID: <20090825181218.03F8F11C0348@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30904

Added Files:
      Tag: nss-3_12_3_99_3-8_fc12
	nss-softokn.pc.in 
Log Message:
restoring after successfull sctrach build


--- NEW FILE nss-softokn.pc.in ---
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: SOFTKN
Description: Network Security Services Softoken PKCS #11 Module
Version: %SOFTOKEN_VERSION%
Requires: nspr >= %NSPR_VERSION%
Requires: nss-util >= %NSSUTIL_VERSION%
Libs: -lfreebl3 -lsoftokn3 -lnssdbm3
Cflags: -I${includedir}



From mclasen at fedoraproject.org  Tue Aug 25 18:14:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 18:14:43 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel-search.patch, NONE,
	1.1 gnome-panel-vendor.patch, NONE, 1.1 .cvsignore, 1.96,
	1.97 gnome-panel-about.patch, 1.1, 1.2 gnome-panel.spec, 1.366,
	1.367 sources, 1.99, 1.100
Message-ID: <20090825181443.2CFEF11C0348@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31221

Modified Files:
	.cvsignore gnome-panel-about.patch gnome-panel.spec sources 
Added Files:
	gnome-panel-search.patch gnome-panel-vendor.patch 
Log Message:
2.27.91


gnome-panel-search.patch:
 libpanel-util/panel-launch.c |   19 +++++++++++++++++++
 libpanel-util/panel-launch.h |    2 ++
 panel-action-button.c        |   16 +++++++++++++---
 panel-menu-items.c           |   20 ++++++++++++++++----
 4 files changed, 50 insertions(+), 7 deletions(-)

--- NEW FILE gnome-panel-search.patch ---
diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c
--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search	2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c	2009-08-25 11:33:36.666288948 -0400
@@ -29,6 +29,8 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#include <libgnome/gnome-desktop-item.h>
+
 #include "panel-error.h"
 #include "panel-glib.h"
 
@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char  *
 }
 
 gboolean
+panel_has_desktop_file (const char  *desktop_file)
+{
+	GnomeDesktopItem *ditem;
+
+	if (g_path_is_absolute (desktop_file))
+		ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
+	else
+		ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
+	if (ditem != NULL) {
+		gnome_desktop_item_unref (ditem);
+		return TRUE;
+	}
+
+	return FALSE;	
+}
+
+gboolean
 panel_launch_desktop_file_with_fallback (const char  *desktop_file,
 					 const char  *fallback_exec,
 					 GdkScreen   *screen,
diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h
--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search	2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h	2009-08-25 11:33:36.667276923 -0400
@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile
 				GdkScreen  *screen,
 				GError    **error);
 
+gboolean panel_has_desktop_file (const char *desktop_file);
+
 gboolean panel_launch_desktop_file (const char  *desktop_file,
 				    GdkScreen   *screen,
 				    GError     **error);
diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search gnome-panel-2.27.91/gnome-panel/panel-action-button.c
--- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search	2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c	2009-08-25 11:33:36.671290074 -0400
@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget)
 	GdkScreen *screen;
 
 	screen = gtk_widget_get_screen (widget);
-	panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
-						 "gnome-search-tool",
-						 screen, NULL);
+	if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
+		panel_launch_desktop_file ("gnome-beagle-search.desktop",
+					   screen,
+					   NULL);
+	} else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
+		panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
+					   screen,
+					   NULL);
+	} else {
+		panel_launch_desktop_file ("gnome-search-tool.desktop",
+					   screen,
+					   NULL);
+	}
 }
 
 /* Force Quit
diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search	2009-08-25 11:33:36.643267021 -0400
+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c	2009-08-25 11:42:41.517027329 -0400
@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel
 
 	add_menu_separator (places_menu);
 
-	panel_menu_items_append_from_desktop (places_menu,
-					      "gnome-search-tool.desktop",
-					      NULL,
-                                              FALSE);
+	if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
+		panel_menu_items_append_from_desktop (places_menu,
+						      "gnome-beagle-search.desktop",
+						      NULL,
+						      FALSE);
+	} else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
+		panel_menu_items_append_from_desktop (places_menu,
+						      "fedora-tracker-search-tool.desktop",
+						      NULL,
+						      FALSE);
+	} else {
+		panel_menu_items_append_from_desktop (places_menu,
+						      "gnome-search-tool.desktop",
+						      NULL,
+						      FALSE);
+	}
 
 	panel_recent_append_documents_menu (places_menu,
 					    place_item->priv->recent_manager);

gnome-panel-vendor.patch:
 panel-menu-items.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gnome-panel-vendor.patch ---
diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor	2009-08-19 15:59:57.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c	2009-08-25 11:32:39.980266025 -0400
@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel
 					      COMPUTER_NAME_KEY,
 					      NULL);
 	panel_menu_items_append_from_desktop (places_menu,
-					      "nautilus-computer.desktop",
+					      "gnome-nautilus-computer.desktop",
 					      gconf_name,
                                               TRUE);
 	if (gconf_name)
@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel
 	add_menu_separator (places_menu);
 
 	panel_menu_items_append_from_desktop (places_menu,
-					      "network-scheme.desktop",
+					      "gnome-network-scheme.desktop",
 					      NULL,
                                               TRUE);
 	panel_place_menu_item_append_remote_gio (place_item, places_menu);
@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk
 	if (add_separator)
 		add_menu_separator (menu);
 
-	panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE);
+	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
 
 	if (parent->priv->append_lock_logout)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- .cvsignore	15 Jul 2009 18:57:08 -0000	1.96
+++ .cvsignore	25 Aug 2009 18:14:42 -0000	1.97
@@ -1 +1 @@
-gnome-panel-2.27.4.tar.bz2
+gnome-panel-2.27.91.tar.bz2

gnome-panel-about.patch:
 panel-menu-items.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: gnome-panel-about.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-about.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-panel-about.patch	1 Aug 2009 00:09:52 -0000	1.1
+++ gnome-panel-about.patch	25 Aug 2009 18:14:42 -0000	1.2
@@ -1,11 +1,11 @@
-diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about	2009-07-31 18:29:02.635601324 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-31 18:30:18.129605780 -0400
-@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about	2009-08-25 13:32:12.101272238 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c	2009-08-25 14:08:21.444015913 -0400
+@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk
  		add_menu_separator (menu);
  
- 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
--	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+ 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
+-	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
 +	if (panel_has_desktop_file ("about-this-computer.desktop"))
 +		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
  


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -p -r1.366 -r1.367
--- gnome-panel.spec	22 Aug 2009 05:08:13 -0000	1.366
+++ gnome-panel.spec	25 Aug 2009 18:14:42 -0000	1.367
@@ -22,8 +22,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.27.4
-Release: 9%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -89,9 +89,9 @@ BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: libtool
 
-Patch0: gnome-panel-2.23.4-vendor.patch
+Patch0: gnome-panel-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.25.3-search.patch
+Patch2: gnome-panel-search.patch
 Patch3: gnome-panel-about.patch
 
 # the next three patches belong together
@@ -113,17 +113,6 @@ Patch35: clock-wakeups.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=579092
 Patch38: clock-network.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=498366
-Patch42: polkit1.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=322932
-Patch45: panel-icons.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=589632
-Patch46:gnome-panel-2.27.4-fix-monitor.patch
-
-Patch47: recent-icon.patch
-
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -160,7 +149,7 @@ Panel Applets using the libpanel-applet 
 
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p0 -b .search
+%patch2 -p1 -b .search
 %patch3 -p1 -b .about
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
@@ -169,10 +158,6 @@ Panel Applets using the libpanel-applet 
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
 %patch38 -p1 -b .clock-network
-%patch42 -p1 -b .polkit1
-%patch45 -p1 -b .panel-icons
-%patch46 -p1 -b .fix-monitor
-%patch47 -p1 -b .recent-icon
 
 . %{SOURCE6}
 
@@ -371,6 +356,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-9
 - Actually apply the 'clear recent' patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources	15 Jul 2009 18:57:08 -0000	1.99
+++ sources	25 Aug 2009 18:14:42 -0000	1.100
@@ -1 +1 @@
-8878c295b927f9a42273ff414a8bfdd8  gnome-panel-2.27.4.tar.bz2
+9453fed0d5fec7b9904b408e3f2826f7  gnome-panel-2.27.91.tar.bz2



From rdieter at fedoraproject.org  Tue Aug 25 18:19:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 25 Aug 2009 18:19:03 +0000 (UTC)
Subject: rpms/lyx/F-10 lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.39, 
	1.40 lyx.spec, 1.87, 1.88 sources, 1.37,
	1.38 lyx-1.6.3-xdg_open.patch, 1.1, NONE
Message-ID: <20090825181903.6A33F11C0348@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31778

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.4-xdg_open.patch 
Removed Files:
	lyx-1.6.3-xdg_open.patch 
Log Message:
* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
- lyx-1.6.4
- handle fonts manually (now EPEL-5 compatible)


lyx-1.6.4-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.4-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-10/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	4 Jun 2009 18:04:23 -0000	1.39
+++ .cvsignore	25 Aug 2009 18:19:03 -0000	1.40
@@ -1 +1 @@
-lyx-1.6.3.tar.bz2
+lyx-1.6.4.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-10/lyx.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- lyx.spec	4 Jun 2009 18:04:23 -0000	1.87
+++ lyx.spec	25 Aug 2009 18:19:03 -0000	1.88
@@ -1,9 +1,29 @@
 
+%if 0%{?fedora} > 3
+%define _with_aiksaurus --with-aiksaurus
+%endif
+
+%if 0%{?fedora} > 9
+%define build_noarch BuildArch: noarch
+%endif
+
+## lyx-fonts
+%global fontname lyx
+%global common_desc \
+A collection of Math symbol fonts.
+#if 0%{?fedora} > 8 
+%if 0
+%define fontpackages 1
+BuildRequires: fontpackages-devel
+%else
+%define _fontdir %{_datadir}/fonts/%{fontname}
+%endif
+
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.3
+Version: 1.6.4
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -13,13 +33,15 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.3-xdg_open.patch
+Patch1: lyx-1.6.4-xdg_open.patch
 
 Source1: lyxrc.dist
 
 Source10: lyx.desktop
 
+%if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
+%endif
 BuildRequires: aspell-devel
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
@@ -37,6 +59,18 @@ Obsoletes: %{name}-qt < 1.5.0 
 Provides:  %{name}-qt = %{version}-%{release}
 Obsoletes: %{name}-xforms < 1.5.0 
 
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
 Requires(post): texlive
@@ -50,7 +84,6 @@ Requires(post): tetex-fonts
 Requires(postun): tetex-fonts
 Requires: tetex-dvips tetex-latex
 %endif
-Requires: mathml-fonts
 Requires: ghostscript
 ## Soft dependencies
 %if 0%{?fedora} > 3 && 0%{?fedora} < 9
@@ -58,9 +91,9 @@ Requires: ghostscript
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
 Requires(hint): tetex-IEEEtran
+%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
-%endif
 Requires(hint): xdg-utils
 
 %description
@@ -80,7 +113,116 @@ to the backends (like LaTeX) that are sp
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
-
+%package common
+Summary:  Common files of %{name} 
+Requires: %{name} = %{version}-%{release}
+%{?build_noarch}
+%description common 
+{summary}.
+
+%package -n %{fontname}-fonts-compat
+Summary: Lyx/MathML fonts compatibility package
+License: Copyright only and GPL+
+Obsoletes: mathml-fonts < 1.0-50
+Provides:  mathml-fonts = 1.0-50
+Provides: %{fontname}-fonts = %{version}-%{release}
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-fonts-compat
+This package only exists to help transition mathml-fonts users to the new
+package split. It will be removed after one distribution release cycle, please
+do not reference it or depend on it in any way.
+
+%package -n %{fontname}-fonts-common
+Summary: Common files of %{fontname}-fonts
+# The actual license says "The author of these fonts, Basil K. Malyshev, has
+# kindly granted permission to use and modify these fonts."
+# One of the font files (wasy10) is separately licensed GPL+.
+License: Copyright only and GPL+
+%{?fontpackages:Requires: fontpackages-filesystem}
+%{?build_noarch}
+%description -n %{name}-fonts-common
+This package consists of files used by other %{fontname}-fonts packages.
+
+%package -n %{fontname}-cmex10-fonts
+Summary: Cmex10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmex10-fonts
+%common_desc
+
+%package -n %{fontname}-cmmi10-fonts
+Summary: Cmmi10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmmi10-fonts
+%common_desc
+
+%package -n %{fontname}-cmr10-fonts
+Summary: Cmr10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmr10-fonts
+%common_desc
+
+%package -n %{fontname}-cmsy10-fonts
+Summary: Cmsy10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmsy10-fonts
+%common_desc
+
+%package -n %{fontname}-esint10-fonts
+Summary: Esint10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-esint10-fonts
+%common_desc
+
+%package -n %{fontname}-eufm10-fonts
+Summary: Eufm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-eufm10-fonts
+%common_desc
+
+%package -n %{fontname}-msam10-fonts
+Summary: Msam10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-msam10-fonts
+%common_desc
+
+%package -n %{fontname}-msbm10-fonts
+Summary: Msbm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-msbm10-fonts
+%common_desc
+
+%package -n %{fontname}-wasy10-fonts
+Summary: Wasy10 fonts
+License: GPL+
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-wasy10-fonts
+%common_desc
 
 %prep
 
@@ -96,8 +238,9 @@ and let the computer take care of the re
   --disable-rpath \
   --enable-build-type=release \
   --enable-optimization="%{optflags}" \
-  --with-aiksaurus \
   --with-aspell \
+  --with-qt4-dir=`pkg-config --variable=prefix QtCore` \
+  %{?_with_aiksaurus} \
   %{?_without_included_boost}
 
 make %{?_smp_mflags}
@@ -131,24 +274,30 @@ touch %{buildroot}%{_datadir}/lyx/lyxrc.
 touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
 touch %{buildroot}%{_datadir}/lyx/doc/LaTeXConfig.lyx
 
-# unpackaged files
+# fonts
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
 rm -rf %{buildroot}%{_datadir}/lyx/fonts
 
 %find_lang %{name}
 
 
-%post
+%check
+make check
+
+
+%post common
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
-%postun
+%postun common
 if [ $1 -eq 0 ] ; then
-    texhash >& /dev/null 
-    update-desktop-database -q &> /dev/null
-    touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  texhash >& /dev/null 
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%posttrans
+%posttrans common
 texhash >& /dev/null
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -156,12 +305,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing,
 ##   and besides, we use xdg-open now -- Rex
-%triggerin -- latex2html,wv
+%triggerin common -- latex2html,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
 
-%triggerun -- latex2html,wv
+%triggerun common -- latex2html,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -171,10 +320,13 @@ fi
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc ANNOUNCE lib/CREDITS NEWS README
+%doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
 %{_mandir}/man1/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -185,8 +337,106 @@ rm -rf %{buildroot}
 %ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
 %{_datadir}/texmf/tex/latex/lyx/
 
+%files -n %{fontname}-fonts-compat
+# boo!
+
+%files -n %{fontname}-fonts-common
+%defattr(0644,root,root,0755)
+%doc lib/fonts/BaKoMaFontLicense.txt
+%doc lib/fonts/ReadmeBaKoMa4LyX.txt
+%dir %{_fontdir}
+
+%if 0%{?fontpackages:1}
+%_font_pkg -n cmex10 cmex10.ttf
+%_font_pkg -n cmmi10 cmmi10.ttf
+%_font_pkg -n cmr10 cmr10.ttf
+%_font_pkg -n cmsy10 cmsy10.ttf
+%_font_pkg -n esint10 esint10.ttf
+%_font_pkg -n eufm10 eufm10.ttf
+%_font_pkg -n msam10 msam10.ttf
+%_font_pkg -n msbm10 msbm10.ttf
+%_font_pkg -n wasy10 wasy10.ttf
+%else
+
+%files -n %{fontname}-cmex10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmex10.ttf
+
+%posttrans -n %{fontname}-cmex10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmmi10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmmi10.ttf
+
+%posttrans -n %{fontname}-cmmi10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmr10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmr10.ttf
+
+%posttrans -n %{fontname}-cmr10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmsy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmsy10.ttf
+
+%posttrans -n %{fontname}-cmsy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-esint10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/esint10.ttf
+
+%posttrans -n %{fontname}-esint10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-eufm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/eufm10.ttf
+
+%posttrans -n %{fontname}-eufm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msam10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msam10.ttf
+
+%posttrans -n %{fontname}-msam10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msbm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msbm10.ttf
+
+%posttrans -n %{fontname}-msbm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-wasy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/wasy10.ttf
+
+%posttrans -n %{fontname}-wasy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%endif
+
 
 %changelog
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
+- lyx-1.6.4
+- handle fonts manually (now EPEL-5 compatible)
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
+- add lyx-*-fonts subpkgs (#452357, #514549)
+- -common (noarch) subpkg
+- trim %%changelog
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-1
 - lyx-1.6.3
 
@@ -385,151 +635,3 @@ rm -rf %{buildroot}
 * Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-2
 - 1.4.0(final)
 - drop boost bits
-
-* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
-- 1.4.0rc
-- drop boost patch (for now)
-
-* Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
-- 1.4.0pre6
-- --disable-stdlib-debug --disable-assertions --disable-concept-checks
-- don't use --without-included-boost (for now)
-
-* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
-- gcc41 patch
-- document boost/gcc41 patches
-- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
-
-* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
-- updated boost patch
-- drop -fexceptions from %%optflags
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
-- --without-included-boost
-- BR: boost-devel
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
-- 1.4.0pre5
-
-* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
-- 1.4.0pre4
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
-- 1.4.0pre3
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
-- cleanup/fix snarfing of intermediate frontend builds.
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
-- BR: libXpm-devel
-
-* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
-- 1.3.7
-- -qt/-xforms: frontend pkgs (#178116)
-
-* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
-- %%post/%%postun: update-desktop-database
-
-* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
-- leave out kde-redhat bits in Fedora Extras build
-- define/use safer (esp for x86_64) QTDIR bits
-
-* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-3
-- touchup helpers script
-- fix for (sometimes missing) PSres.upr
-
-* Mon Aug 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-2
-- use triggers to configure/unconfigure helper (ps/pdf/html) apps
-
-* Sat Jul 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-1
-- 1.3.6
-
-* Mon May 23 2005 Rex Dieter <rexdieter[At]users.sf.net> 1.3.5-4
-- qt_immodule patch (lyx bug #1830)
-- update -helpers patch to look-for/use evince (rh bug #143992)
-- drop (not-strictly-required) Req's on helper apps
-  htmlview, gsview (rh bug #143992)
-- %%configure: --with-aiksaurus
-- %%configure: --enable-optimization="$$RPM_OPT_FLAGS"
-- %%configure: --disable-dependency-tracking
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
-- BR: pspell-devel -> aspell-devel
-- BR: tetex-* (helper detection, fonts)
-- -helpers patch: find/use htmlview, gsview, kdvi, ggv, kghostview
-- .desktop: GenericName: WYSIWYM document processor
-
-* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.5-0.fdr.1
-- 1.3.5
-
-* Fri Apr 30 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.6
-- BR: libtool
-
-* Fri Apr 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.5
-- Group: Applications/Publishing
-- BR: desktop-file-utils
-- Requires(post,postun): tetex
-
-* Sat Apr 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.4
-- .desktop: separate file
-- .desktop: drop 'Utility' category, add 'Qt'
-- .desktop: Name: lyx -> LyX
-- .desktop: Comment: lyx 1.3.4 -> WYSIWYM document processor
-- convert icon xpm -> png
-
-* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.3
-- dynamically determine version for qt dependency.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.2
-- add a few (mostly superfluous) BuildRequires to make fedora.us's
-  buildsystem happy.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.1
-- Allow building/use for any qt >= 3.1
-
-* Thu Feb 19 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.0
-- 1.3.4
-- Categories=Office
-
-* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
-- support MimeType(s): application/x-lyx;text/x-lyx
-
-* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
-- let rpm auto-require qt.
-- remove (optional) xforms support.
-- Requires: latex-xft-fonts
-
-* Mon Oct 06 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.1
-- 1.3.3
-- update macros for Fedora Core.
-
-* Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.3.2-0.fdr.0
-- 1.3.2
-- fedora-ize.
-
-* Tue Mar 25 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.1-1.0
-- 1.3.1 release.
-
-* Fri Feb 21 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-1.0
-- yank kmenu
-
-* Fri Feb 07 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-0.0
-- 1.3.0
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-10/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	4 Jun 2009 18:04:23 -0000	1.37
+++ sources	25 Aug 2009 18:19:03 -0000	1.38
@@ -1 +1 @@
-c524e72f7e4d64224c6bfdbd84065dd8  lyx-1.6.3.tar.bz2
+3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2


--- lyx-1.6.3-xdg_open.patch DELETED ---



From bpepple at fedoraproject.org  Tue Aug 25 18:25:29 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 25 Aug 2009 18:25:29 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.11, 1.12 sources,
	1.11, 1.12 telepathy-mission-control.spec, 1.18, 1.19
Message-ID: <20090825182530.0195E11C0348@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv863

Modified Files:
	.cvsignore sources telepathy-mission-control.spec 
Log Message:
* Tue Aug 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.0-1
- Update to 5.2.0.
- Drop BR on libtelepathy.
- Update url & source links.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Sep 2008 20:26:09 -0000	1.11
+++ .cvsignore	25 Aug 2009 18:25:29 -0000	1.12
@@ -1 +1 @@
-telepathy-mission-control-4.67.tar.gz
+telepathy-mission-control-5.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Sep 2008 20:26:09 -0000	1.11
+++ sources	25 Aug 2009 18:25:29 -0000	1.12
@@ -1 +1 @@
-0a547e7af4a33355bac3638dd2e40859  telepathy-mission-control-4.67.tar.gz
+dc7ce2105d1f569a1a6f7db06be4bc68  telepathy-mission-control-5.2.0.tar.gz


Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- telepathy-mission-control.spec	27 Jul 2009 05:44:42 -0000	1.18
+++ telepathy-mission-control.spec	25 Aug 2009 18:25:29 -0000	1.19
@@ -1,16 +1,18 @@
 Name:           telepathy-mission-control
-Version:        4.67
-Release:        4%{?dist}
+Version:        5.2.0
+Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
 Group:          System Environment/Libraries
 License:        LGPLv2
-URL:            http://mission-control.sourceforge.net/
-Source0:        http://prdownloads.sourceforge.net/mission-control/%{name}-%{version}.tar.gz
+URL:            http://telepathy.freedesktop.org/wiki/Mission_Control
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtelepathy-devel, libxslt-devel, GConf2-devel 
-BuildRequires:  telepathy-glib-devel, gnome-keyring-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  GConf2-devel 
+BuildRequires:  telepathy-glib-devel >= 0.7.32
+BuildRequires:  gnome-keyring-devel
 
 %description
 Mission Control, or MC, is a Telepathy component providing a way for
@@ -24,8 +26,9 @@ account definitions and credentials.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libtelepathy-devel, dbus-devel, dbus-glib-devel
-Requires:       telepathy-glib-devel
+Requires:       dbus-devel
+Requires:       dbus-glib-devel
+Requires:       telepathy-glib-devel >= 0.7.32
 
 %description    devel
 The %{name}-devel package contains libraries and header
@@ -35,8 +38,8 @@ files for developing applications that u
 %prep
 %setup -q
 
+
 %build
-libtoolize --force --copy && aclocal && autoconf && automake
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -64,20 +67,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %dir %{_datadir}/mission-control
 %dir %{_datadir}/mission-control/profiles
-%{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
-%{_libexecdir}/mission-control
+%{_libexecdir}/mission-control-5
+%{_mandir}/man*/*.gz
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%doc %{_datadir}/gtk-doc/html/libmissioncontrol
+%doc %{_datadir}/gtk-doc/html/libmcclient
 %doc %{_datadir}/gtk-doc/html/libmissioncontrol-server
 
 
 %changelog
+* Tue Aug 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.0-1
+- Update to 5.2.0.
+- Drop BR on libtelepathy.
+- Update url & source links.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.67-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Tue Aug 25 18:32:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 18:32:08 +0000 (UTC)
Subject: rpms/openser/devel openser-1.3.4-openssl10.patch, NONE,
	1.1 openser.spec, 1.33, 1.34
Message-ID: <20090825183208.8D7A111C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1789

Modified Files:
	openser.spec 
Added Files:
	openser-1.3.4-openssl10.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-8
- rebuilt with new openssl


openser-1.3.4-openssl10.patch:
 tls_init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openser-1.3.4-openssl10.patch ---
diff -up openser-1.3.4-tls/tls/tls_init.c.openssl openser-1.3.4-tls/tls/tls_init.c
--- openser-1.3.4-tls/tls/tls_init.c.openssl	2008-11-24 21:52:33.000000000 +0100
+++ openser-1.3.4-tls/tls/tls_init.c	2009-08-25 20:18:45.000000000 +0200
@@ -468,8 +468,8 @@ static int check_for_krb(void)
 	if (xx==NULL)
 		return -1;
 
-	for( j=0 ; j<M_sk_num(xx->cipher_list) ; j++) {
-		SSL_CIPHER *yy = (SSL_CIPHER*)M_sk_value(xx->cipher_list,j);
+	for( j=0 ; j<sk_SSL_CIPHER_num(xx->cipher_list) ; j++) {
+		SSL_CIPHER *yy = sk_SSL_CIPHER_value(xx->cipher_list,j);
 		if ( yy->id>=SSL3_CK_KRB5_DES_64_CBC_SHA &&
 		 yy->id<=SSL3_CK_KRB5_RC4_40_MD5 ) {
 			LM_INFO("KRB5 cipher %s found\n", yy->name);


Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- openser.spec	21 Aug 2009 15:06:29 -0000	1.33
+++ openser.spec	25 Aug 2009 18:32:08 -0000	1.34
@@ -17,6 +17,7 @@ Source0:	http://www.kamailio.org/pub/%{n
 Source1:	%{name}.sysconfig
 Patch1:		openser--acc_radius_enable.diff
 Patch3:		openser--openssl-paths.diff
+Patch4:		openser-1.3.4-openssl10.patch
 URL:		http://www.kamailio.org/
 
 BuildRequires:	expat-devel
@@ -419,6 +420,7 @@ clients.
 cp -pRf modules/acc modules/acc_radius
 %patch1
 %patch3 -p0 -b .openssl
+%patch4 -p1 -b .openssl10
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -847,7 +849,7 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-8
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-8
 - rebuilt with new openssl
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-7



From tmraz at fedoraproject.org  Tue Aug 25 18:37:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 18:37:18 +0000 (UTC)
Subject: rpms/openscada/devel openscada-0.6.3.3-openssl.patch, NONE,
	1.1 openscada.spec, 1.11, 1.12
Message-ID: <20090825183718.E498311C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2562

Modified Files:
	openscada.spec 
Added Files:
	openscada-0.6.3.3-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
- rebuilt with new openssl


openscada-0.6.3.3-openssl.patch:
 modssl.cpp |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE openscada-0.6.3.3-openssl.patch ---
diff -up openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp.openssl openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp
--- openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp.openssl	2009-06-10 12:03:54.000000000 +0200
+++ openscada-0.6.3.3/src/moduls/transport/SSL/modssl.cpp	2009-08-25 20:35:04.000000000 +0200
@@ -314,7 +314,12 @@ void *TSocketIn::Task( void *sock_in )
     string ssl_method = TSYS::strSepParse(s.addr(),2,':');
 
     //-- Set SSL method --
-    SSL_METHOD *meth = SSLv23_server_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_METHOD *meth;
+#else
+    SSL_METHOD *meth;
+#endif
+    meth = SSLv23_server_method();
     if( ssl_method == "SSLv2" )		meth = SSLv2_server_method();
     else if( ssl_method == "SSLv3" )	meth = SSLv3_server_method();
     else if( ssl_method == "TLSv1" )	meth = TLSv1_server_method();
@@ -670,7 +675,12 @@ void TSocketOut::start()
     string ssl_method = TSYS::strSepParse(addr(),2,':');
 
     //> Set SSL method
-    SSL_METHOD *meth = SSLv23_client_method();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_METHOD *meth;
+#else
+    SSL_METHOD *meth;
+#endif
+    meth = SSLv23_client_method();
     if( ssl_method == "SSLv2" )		meth = SSLv2_client_method();
     else if( ssl_method == "SSLv3" )	meth = SSLv3_client_method();
     else if( ssl_method == "TLSv1" )	meth = TLSv1_client_method();


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openscada.spec	21 Aug 2009 15:05:36 -0000	1.11
+++ openscada.spec	25 Aug 2009 18:37:18 -0000	1.12
@@ -67,6 +67,7 @@ Release: 12%{?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
@@ -851,6 +852,7 @@ die Anschreibung "root" und das Kennwort
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
+%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -1209,7 +1211,7 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
+* 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



From emaldonado at fedoraproject.org  Tue Aug 25 18:49:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue, 25 Aug 2009 18:49:49 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.4,1.5
Message-ID: <20090825184949.9998411C0348@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4495

Modified Files:
	nss-softokn.spec 
Log Message:
Fixed Requires nss-util and BuildRequires nss-util-devel >= %{version}, added BuildRequire nss version >= nss-version-with-subpackages, replaced a rm with %{__rm}


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-softokn.spec	20 Aug 2009 22:14:00 -0000	1.4
+++ nss-softokn.spec	25 Aug 2009 18:49:49 -0000	1.5
@@ -17,17 +17,17 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          9%{?dist}
+Release:          10%{?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 >= %{version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
-Requires:         nss-util >= %{nssutil_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-util-devel >= %{nssutil_version}
+BuildRequires:    nss-util-devel >= %{version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -76,8 +76,12 @@ Summary:          Development libraries 
 Group:            Development/Libraries
 Requires:         nss-softokn = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
-Requires:         nss-util-devel >= %{nsutil_version}
+Requires:         nss-util-devel >= %{version}
 Requires:         pkgconfig
+BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    nss-util-devel >= %{version}
+# require nss at least the version when we split via subpackages
+BuildRequires:    nss-devel >= 3.12.2.99.3-11
 
 %description devel
 Header and Library files for doing development with Network Security Services.
@@ -250,7 +254,7 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+[ $1 = 0 ] && %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %files
@@ -306,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Aug 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-10
+Build after nss with subpackages and new nss-util
+
 * Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-9
 - revert to shipping bits
 



From overholt at fedoraproject.org  Tue Aug 25 18:53:22 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Tue, 25 Aug 2009 18:53:22 +0000 (UTC)
Subject: rpms/maven2/devel maven2-empty-dep.jar, NONE, 1.1 .cvsignore, 1.7, 
	1.8 sources, 1.7, 1.8
Message-ID: <20090825185323.0A21611C0348@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5563

Modified Files:
	.cvsignore sources 
Added Files:
	maven2-empty-dep.jar 
Log Message:
Add missing source


--- NEW FILE maven2-empty-dep.jar ---
PK
K-*????R0?3??r.JM,IM?u?	???+h8?:*W????(x?%?i?r?r


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	25 Aug 2009 17:28:13 -0000	1.7
+++ .cvsignore	25 Aug 2009 18:53:22 -0000	1.8
@@ -5,3 +5,4 @@ maven2-plugins-070705-src.tar.gz
 maven2-src.tar.gz
 m2_jar_repo.tar.gz
 m2_pom_repo.tar.gz
+maven2-empty-dep.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	25 Aug 2009 17:28:13 -0000	1.7
+++ sources	25 Aug 2009 18:53:22 -0000	1.8
@@ -5,3 +5,4 @@ a9b9ce42ffbba60eb1833f0a773f7aa7  maven2
 ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
 b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
 e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz
+dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar



From rstrode at fedoraproject.org  Tue Aug 25 18:57:05 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 25 Aug 2009 18:57:05 +0000 (UTC)
Subject: rpms/plymouth/devel
	0001-populate-initrd-Get-plugin-path-from-plymouth.patch, NONE,
	1.1 plymouth.spec, 1.138, 1.139
Message-ID: <20090825185705.594DE11C0348@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6919

Modified Files:
	plymouth.spec 
Added Files:
	0001-populate-initrd-Get-plugin-path-from-plymouth.patch 
Log Message:
- Get plugin path from plymouth instead of trying
  to guess.  Should fix bug 502667


0001-populate-initrd-Get-plugin-path-from-plymouth.patch:
 plymouth-populate-initrd.in |   21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

--- NEW FILE 0001-populate-initrd-Get-plugin-path-from-plymouth.patch ---
>From d633072a713b10092535058488225349f2180e21 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 25 Aug 2009 14:53:31 -0400
Subject: [PATCH] [populate-initrd] Get plugin path from plymouth

Previously, we'd try to guess the plugin path based
on the arch of the running process.  That's sort of
fragile, so better to just install plugins where
plymouth says it's going to look for them.
---
 scripts/plymouth-populate-initrd.in |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 09ccb32..3857197 100755
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -4,17 +4,7 @@
 
 [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
 [ -z "$DATADIR" ] && DATADIR="/usr/share"
-[ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
-if [ -z "$LIB" ]; then
-  if $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64); then
-    LIB="lib64"
-  else
-    LIB="lib"
-  fi
-fi
-[ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
-[ -z "$BINDIR" ] && BINDIR="/usr/bin"
-[ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
+[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
 [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
 [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
 
@@ -66,9 +56,9 @@ mkdir -p ${INITRDDIR}${DATADIR}/plymouth/themes
 inst /sbin/plymouthd $INITRDDIR /bin/plymouthd
 inst /bin/plymouth $INITRDDIR
 inst ${DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
-inst ${LIBDIR}/plymouth/text.so $INITRDDIR
+inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
 inst ${DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
-inst ${LIBDIR}/plymouth/details.so $INITRDDIR
+inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR
 inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
 inst @RELEASE_FILE@ $INITRDDIR
 
@@ -79,12 +69,12 @@ fi
 
 PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
 
-if [ ! -f ${LIBDIR}/plymouth/${PLYMOUTH_MODULE_NAME}.so ]; then
+if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
     echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
     exit 1
 fi
 
-inst ${LIBDIR}/plymouth/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
+inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
 
 if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
     for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
-- 
1.6.4



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- plymouth.spec	25 Aug 2009 17:54:28 -0000	1.138
+++ plymouth.spec	25 Aug 2009 18:57:05 -0000	1.139
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -24,6 +24,8 @@ 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: 0001-populate-initrd-Get-plugin-path-from-plymouth.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -230,6 +232,7 @@ plugin.
 
 %prep
 %setup -q
+%patch0 -p1 -b .plugin-path
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -444,6 +447,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> 0.7.1-2
+- Get plugin path from plymouth instead of trying
+  to guess.  Should fix bug 502667
+
 * Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> 0.7.1-1
 - Update to 0.7.1
 



From ausil at fedoraproject.org  Tue Aug 25 19:05:17 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 19:05:17 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.5,1.6
Message-ID: <20090825190517.D668611C0348@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8419

Modified Files:
	nss-softokn.spec 
Log Message:
bump to unique nvr



Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss-softokn.spec	25 Aug 2009 18:49:49 -0000	1.5
+++ nss-softokn.spec	25 Aug 2009 19:05:17 -0000	1.6
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          10%{?dist}
+Release:          12%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-12
+- bump to unique rpm nvr 
+
 * Tue Aug 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-10
 Build after nss with subpackages and new nss-util
 



From pkgdb at fedoraproject.org  Tue Aug 25 19:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:09:35 +0000
Subject: [pkgdb] mingw32-gcc: kalev has requested watchcommits
Message-ID: <20090825190935.9622F10F87B@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on mingw32-gcc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Tue Aug 25 19:09:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:09:38 +0000
Subject: [pkgdb] mingw32-gcc: kalev has requested commit
Message-ID: <20090825190938.2FA9D10F88B@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on mingw32-gcc (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Tue Aug 25 19:09:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:09:52 +0000
Subject: [pkgdb] mingw32-gcc: kalev has requested watchcommits
Message-ID: <20090825190952.A1F9E10F87B@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on mingw32-gcc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Tue Aug 25 19:09:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:09:54 +0000
Subject: [pkgdb] mingw32-gcc: kalev has requested commit
Message-ID: <20090825190955.02C4E10F890@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on mingw32-gcc (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From tmraz at fedoraproject.org  Tue Aug 25 19:12:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 19:12:10 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-PKCS10/devel
	perl-Crypt-OpenSSL-PKCS10-openssl.patch, NONE,
	1.1 perl-Crypt-OpenSSL-PKCS10.spec, 1.9, 1.10
Message-ID: <20090825191211.0182511C0376@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9560

Modified Files:
	perl-Crypt-OpenSSL-PKCS10.spec 
Added Files:
	perl-Crypt-OpenSSL-PKCS10-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-13
- rebuilt with new openssl


perl-Crypt-OpenSSL-PKCS10-openssl.patch:
 PKCS10.xs |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE perl-Crypt-OpenSSL-PKCS10-openssl.patch ---
diff -up Crypt-OpenSSL-PKCS10-0.06/PKCS10.xs.openssl Crypt-OpenSSL-PKCS10-0.06/PKCS10.xs
--- Crypt-OpenSSL-PKCS10-0.06/PKCS10.xs.openssl	2006-02-24 22:15:56.000000000 +0100
+++ Crypt-OpenSSL-PKCS10-0.06/PKCS10.xs	2009-08-25 21:09:05.000000000 +0200
@@ -32,7 +32,7 @@ typedef struct
   if (New(0, p_var, p_size, p_type) == NULL) \
     { PACKAGE_CROAK("unable to alloc buffer"); }
 
-int add_ext(STACK_OF(X509_REQUEST) *sk, int nid, char *value);
+int add_ext(STACK_OF(X509_EXTENSION) *sk, int nid, char *value);
 X509_NAME *parse_name(char *str, long chtype, int multirdn); 
 
 /*
@@ -181,7 +181,7 @@ static void callback(int p, int n, void 
  * because we wont reference any other sections.
  */
 
-int add_ext(STACK_OF(X509_REQUEST) *sk, int nid, char *value)
+int add_ext(STACK_OF(X509_EXTENSION) *sk, int nid, char *value)
 	{
 	X509_EXTENSION *ex;
 	ex = X509V3_EXT_conf_nid(NULL, NULL, nid, value);


Index: perl-Crypt-OpenSSL-PKCS10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel/perl-Crypt-OpenSSL-PKCS10.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Crypt-OpenSSL-PKCS10.spec	21 Aug 2009 15:18:07 -0000	1.9
+++ perl-Crypt-OpenSSL-PKCS10.spec	25 Aug 2009 19:12:10 -0000	1.10
@@ -11,6 +11,7 @@ BuildRequires:  openssl openssl-devel
 BuildRequires:  perl(Test::More) perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Crypt::OpenSSL::RSA)
 Patch0: 	perl-Crypt-OpenSSL-PKCS10-build-paths.patch
+Patch1:         perl-Crypt-OpenSSL-PKCS10-openssl.patch
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -23,6 +24,7 @@ chmod -c a-x Changes
 chmod -c a-x *.xs
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -56,7 +58,7 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-13
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-13
 - rebuilt with new openssl
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-12



From pkgdb at fedoraproject.org  Tue Aug 25 19:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:21:15 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090825192115.D22A110F879@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gcc (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Tue Aug 25 19:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:21:16 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090825192116.66D0F10F884@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gcc (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Tue Aug 25 19:21:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:21:22 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090825192122.67E0210F890@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gcc (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Tue Aug 25 19:21:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 19:21:24 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090825192124.9FD2010F899@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gcc (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From mclasen at fedoraproject.org  Tue Aug 25 19:24:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 19:24:16 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.83, 1.84 gnome-applets.spec, 
	1.351, 1.352 sources, 1.94, 1.95
Message-ID: <20090825192416.B2E4311C0348@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10975

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	29 Jul 2009 18:45:21 -0000	1.83
+++ .cvsignore	25 Aug 2009 19:24:16 -0000	1.84
@@ -1 +1 @@
-gnome-applets-2.27.4.tar.bz2
+gnome-applets-2.27.91.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -p -r1.351 -r1.352
--- gnome-applets.spec	29 Jul 2009 18:45:21 -0000	1.351
+++ gnome-applets.spec	25 Aug 2009 19:24:16 -0000	1.352
@@ -33,7 +33,7 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.27.4
+Version:	2.27.91
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
@@ -62,9 +62,6 @@ Patch41:	gnome-applets-no-mixer-icon.pat
 # do the nullapplet dance for stickynotes
 Patch42:	stickynotes-null.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=499972
-Patch43:	polkit1.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -147,7 +144,6 @@ and more.
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
 %patch42 -p1 -b .stickynotes-null
-%patch43 -p1 -b .polkit1
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -348,6 +344,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.91-1
+- 2.27.91
+
 * Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.4-1
 - Update to 2.27.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	29 Jul 2009 18:51:07 -0000	1.94
+++ sources	25 Aug 2009 19:24:16 -0000	1.95
@@ -1,2 +1 @@
-ee2f2c158eda2605ba12ab0283060eb1  gnome-applets-2.27.4.tar.bz2
-ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
+458f2fefc70b5ab740816d0695d0abcf  gnome-applets-2.27.91.tar.bz2



From toshio at fedoraproject.org  Tue Aug 25 19:24:33 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 25 Aug 2009 19:24:33 +0000 (UTC)
Subject: rpms/bzr-gtk/devel bzr-gtk.spec,1.42,1.43
Message-ID: <20090825192433.17A6E11C0348@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11049

Modified Files:
	bzr-gtk.spec 
Log Message:

* Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
- Update to latest bugfix release.



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- bzr-gtk.spec	24 Jul 2009 18:33:04 -0000	1.42
+++ bzr-gtk.spec	25 Aug 2009 19:24:32 -0000	1.43
@@ -7,8 +7,8 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.96.2
-Release:        2%{?dist}
+Version:        0.97.0
+Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
+- Update to latest bugfix release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From roland at fedoraproject.org  Tue Aug 25 19:31:41 2009
From: roland at fedoraproject.org (roland)
Date: Tue, 25 Aug 2009 19:31:41 +0000 (UTC)
Subject: rpms/lcov/devel .cvsignore, 1.5, 1.6 lcov.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <20090825193141.EE2A711C0348@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/lcov/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12849

Modified Files:
	.cvsignore lcov.spec sources 
Log Message:
Update to 1.7 release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcov/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 May 2008 20:00:39 -0000	1.5
+++ .cvsignore	25 Aug 2009 19:31:41 -0000	1.6
@@ -1 +1 @@
-lcov-1.6.tar.gz
+lcov-1.7.tar.gz


Index: lcov.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcov/devel/lcov.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lcov.spec	25 Jul 2009 05:01:38 -0000	1.6
+++ lcov.spec	25 Aug 2009 19:31:41 -0000	1.7
@@ -1,13 +1,13 @@
 Name: lcov
-Version: 1.6
-Release: 3%{?dist}
+Version: 1.7
+Release: 1%{?dist}
 
 Summary: LTP GCOV extension code coverage tool
 Group: Development/Tools
 License: GPLv2+
 
 URL: http://ltp.sourceforge.net/coverage/lcov.php
-Source0: http://dl.sourceforge.net/ltp/lcov-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/ltp/lcov-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/lcovrc
 
 %changelog
+* Tue Aug 25 2009 Roland McGrath <roland at redhat.com> - 1.7-1
+- Update to 1.7 release.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcov/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 May 2008 20:00:39 -0000	1.5
+++ sources	25 Aug 2009 19:31:41 -0000	1.6
@@ -1 +1 @@
-dd3efb076efd812c32285815f12a2935  lcov-1.6.tar.gz
+445fc85c33c0ce21f5e0e06cd881b928  lcov-1.7.tar.gz



From toshio at fedoraproject.org  Tue Aug 25 19:35:24 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 25 Aug 2009 19:35:24 +0000 (UTC)
Subject: rpms/bzr-gtk/devel .cvsignore,1.15,1.16 sources,1.15,1.16
Message-ID: <20090825193524.153A811C0348@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13359

Modified Files:
	.cvsignore sources 
Log Message:
And remember to upload the new tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	10 Jul 2009 21:17:46 -0000	1.15
+++ .cvsignore	25 Aug 2009 19:35:23 -0000	1.16
@@ -1 +1 @@
-bzr-gtk-0.96.2.tar.gz
+bzr-gtk-0.97.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	10 Jul 2009 21:17:46 -0000	1.15
+++ sources	25 Aug 2009 19:35:23 -0000	1.16
@@ -1 +1 @@
-3873dc9efcbc7a655f1c890be406a867  bzr-gtk-0.96.2.tar.gz
+b35d3d86c6e89e0a8d4039d948aa14fc  bzr-gtk-0.97.0.tar.gz



From caolanm at fedoraproject.org  Tue Aug 25 19:35:24 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 25 Aug 2009 19:35:24 +0000 (UTC)
Subject: rpms/hunspell-nl/devel .cvsignore, 1.3, 1.4 hunspell-nl.spec, 1.8, 
	1.9 sources, 1.3, 1.4
Message-ID: <20090825193524.E2EAD11C0348@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-nl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13384

Modified Files:
	.cvsignore hunspell-nl.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Jun 2007 07:48:34 -0000	1.3
+++ .cvsignore	25 Aug 2009 19:35:24 -0000	1.4
@@ -1,2 +1 @@
-nl_NL.zip
-nl_NL-Pack
+nl-dict.oxt


Index: hunspell-nl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nl/devel/hunspell-nl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hunspell-nl.spec	25 Jul 2009 02:35:59 -0000	1.8
+++ hunspell-nl.spec	25 Aug 2009 19:35:24 -0000	1.9
@@ -1,8 +1,8 @@
 Name: hunspell-nl
 Summary: Dutch hunspell dictionaries
-Version: 1.00g
-Release: 6%{?dist}
-Source: http://www.opentaal.org/bestanden/nl_NL-Pack
+Version: 1.10
+Release: 1%{?dist}
+Source: http://www.opentaal.org/bestanden/1_10/nl-dict.oxt
 Group: Applications/Text
 URL: http://www.opentaal.org/english.php
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,20 +15,9 @@ Requires: hunspell
 Dutch hunspell dictionaries.
 
 %prep
-%setup -q -c -n hunspell-nl
+%setup -q -c
 
 %build
-unzip -o nl_NL.zip
-for i in README_nl_NL.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
-    mv -f $i.new $i
-  fi
-  tr -d '\r' < $i > $i.new
-  touch -r $i $i.new
-  mv -f $i.new $i
-done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,10 +36,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_nl_NL.txt
+%doc description/desc_en_US.txt description/desc_nl_NL.txt README_EN.txt README_NL.txt           
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Aug 25 2009 Caolan McNamara <caolanm at redhat.com> - 1.10-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00g-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-nl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jun 2007 07:48:34 -0000	1.3
+++ sources	25 Aug 2009 19:35:24 -0000	1.4
@@ -1 +1 @@
-d7f7eb234bf6d1bd909b560bf8b89ce4  nl_NL-Pack
+6b4064a45751fd0cfa5a741d8ec378ca  nl-dict.oxt



From xavierb at fedoraproject.org  Tue Aug 25 19:35:56 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue, 25 Aug 2009 19:35:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel
	openchrome-0.2.903-remove_resources_RAC.patch, NONE,
	1.1 xorg-x11-drv-openchrome.spec, 1.48, 1.49
Message-ID: <20090825193556.7E31C11C0348@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13579

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.903-remove_resources_RAC.patch 
Log Message:
resources/RAC removal

openchrome-0.2.903-remove_resources_RAC.patch:
 via_driver.c |   31 +++++++++++++++++++------------
 via_driver.h |    4 ++++
 via_video.c  |    4 ++++
 via_xvmc.c   |    4 ++++
 4 files changed, 31 insertions(+), 12 deletions(-)

--- NEW FILE openchrome-0.2.903-remove_resources_RAC.patch ---
Index: src/via_video.c
===================================================================
--- src/via_video.c	(revision 780)
+++ src/via_video.c	(working copy)
@@ -32,7 +32,11 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
+
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
Index: src/via_driver.c
===================================================================
--- src/via_driver.c	(revision 780)
+++ src/via_driver.c	(working copy)
@@ -29,7 +29,10 @@
 #include "config.h"
 #endif
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
+#endif
+
 #include "shadowfb.h"
 
 #include "globals.h"
@@ -182,18 +185,18 @@
 
 /* Mapping a PCI device ID to a chipset family identifier. */
 static PciChipsets VIAPciChipsets[] = {
-    {VIA_CLE266,   PCI_CHIP_CLE3122,   RES_SHARED_VGA},
-    {VIA_KM400,    PCI_CHIP_VT3205,    RES_SHARED_VGA},
-    {VIA_K8M800,   PCI_CHIP_VT3204,    RES_SHARED_VGA},
-    {VIA_PM800,    PCI_CHIP_VT3259,    RES_SHARED_VGA},
-    {VIA_VM800,    PCI_CHIP_VT3314,    RES_SHARED_VGA},
-    {VIA_K8M890,   PCI_CHIP_VT3336,    RES_SHARED_VGA},
-    {VIA_P4M900,   PCI_CHIP_VT3364,    RES_SHARED_VGA},
-    {VIA_CX700,    PCI_CHIP_VT3324,    RES_SHARED_VGA},
-    {VIA_P4M890,   PCI_CHIP_VT3327,    RES_SHARED_VGA},
-    {VIA_VX800,    PCI_CHIP_VT3353,    RES_SHARED_VGA},
-    {VIA_VX855,    PCI_CHIP_VT3409,    RES_SHARED_VGA},
-    {-1,           -1,                 RES_UNDEFINED}
+    {VIA_CLE266,   PCI_CHIP_CLE3122,   NULL},
+    {VIA_KM400,    PCI_CHIP_VT3205,    NULL},
+    {VIA_K8M800,   PCI_CHIP_VT3204,    NULL},
+    {VIA_PM800,    PCI_CHIP_VT3259,    NULL},
+    {VIA_VM800,    PCI_CHIP_VT3314,    NULL},
+    {VIA_K8M890,   PCI_CHIP_VT3336,    NULL},
+    {VIA_P4M900,   PCI_CHIP_VT3364,    NULL},
+    {VIA_CX700,    PCI_CHIP_VT3324,    NULL},
+    {VIA_P4M890,   PCI_CHIP_VT3327,    NULL},
+    {VIA_VX800,    PCI_CHIP_VT3353,    NULL},
+    {VIA_VX855,    PCI_CHIP_VT3409,    NULL},
+    {-1,           -1,                 NULL}
 };
 
 int gVIAEntityIndex = -1;
@@ -791,11 +794,13 @@
 
     pVia->IsSecondary = FALSE;
     pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources) {
         xfree(pEnt);
         VIAFreeRec(pScrn);
         return FALSE;
     }
+#endif
 
     pVia->EntityIndex = pEnt->index;
 
@@ -914,7 +919,9 @@
         pScrn->rgbBits = 6;
 
     pVia->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
     xf86RegisterResources(pEnt->index, NULL, ResNone);
+#endif
 
 #if 0
     xf86SetOperatingState(RES_SHARED_VGA, pEnt->index, ResUnusedOpr);
Index: src/via_driver.h
===================================================================
--- src/via_driver.h	(revision 780)
+++ src/via_driver.h	(working copy)
@@ -36,7 +36,11 @@
 
 #include "vgaHW.h"
 #include "xf86.h"
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
+
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86_OSproc.h"
Index: src/via_xvmc.c
===================================================================
--- src/via_xvmc.c	(revision 780)
+++ src/via_xvmc.c	(working copy)
@@ -27,7 +27,11 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
+
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"


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.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-openchrome.spec	31 Jul 2009 10:44:21 -0000	1.48
+++ xorg-x11-drv-openchrome.spec	25 Aug 2009 19:35:56 -0000	1.49
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	14%{?dist}
+Release:	15%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -25,6 +25,7 @@ Patch99:         openchrome-0.2.903-late
 # Fedora specific patches :
 #Patch100:       openchrome-0.2.903-disable_hwcursor.patch
 # Experimental patches (branch backport, etc...): 
+Patch200:       openchrome-0.2.903-remove_resources_RAC.patch
 Patch208:       openchrome-vt1625.patch
 
 ExclusiveArch:	%{ix86} x86_64
@@ -66,6 +67,7 @@ X.Org X11 openchrome video driver XvMC d
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch99 -p0 -b .latest
+%patch200 -p0 -b .remove_res_RAC
 %patch208 -p0 -b .vt1625
 
 
@@ -124,6 +126,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-15
+- Add patch for resources/RAC API removal in xserver (RHBZ#516765).
+
 * Thu Jul 30 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-14
 - Update to latest snapshot (svn 766) for bugfixes.
 - Drop upstreamed patches.



From mclasen at fedoraproject.org  Tue Aug 25 19:36:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 19:36:12 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.23,
	1.24 01_gettext_not_xml.patch, 
	1.1, 1.2 libgweather.spec, 1.44, 1.45 sources, 1.23, 1.24
Message-ID: <20090825193612.922DF11C043E@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13296

Modified Files:
	.cvsignore 01_gettext_not_xml.patch libgweather.spec sources 
Log Message:
fix patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	14 Apr 2009 00:39:08 -0000	1.23
+++ .cvsignore	25 Aug 2009 19:36:12 -0000	1.24
@@ -1 +1 @@
-libgweather-2.26.1.tar.bz2
+libgweather-2.27.91.tar.bz2

01_gettext_not_xml.patch:
 configure.in                    |   21 ---
 data/Makefile.am                |   44 +-------
 libgweather/gweather-location.c |   17 ++-
 libgweather/gweather-timezone.c |   18 ++-
 po-locations/LINGUAS            |   78 ++++++++++++++
 po-locations/Makefile.in.in     |  217 ++++++++++++++++++++++++++++++++++++++++
 po-locations/POTFILES.in        |    4 
 7 files changed, 338 insertions(+), 61 deletions(-)

Index: 01_gettext_not_xml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/01_gettext_not_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 01_gettext_not_xml.patch	20 Jul 2009 14:45:32 -0000	1.1
+++ 01_gettext_not_xml.patch	25 Aug 2009 19:36:12 -0000	1.2
@@ -1,9 +1,7 @@
-only in patch2:
-unchanged:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/configure.in libgweather-2.26.1.new/configure.in
---- libgweather-2.26.1/configure.in	2009-04-14 00:07:38.000000000 +0200
-+++ libgweather-2.26.1.new/configure.in	2009-04-23 18:18:50.000000000 +0200
-@@ -38,6 +38,10 @@
+diff -up libgweather-2.27.91/configure.in.gettext libgweather-2.27.91/configure.in
+--- libgweather-2.27.91/configure.in.gettext	2009-08-25 09:56:58.000000000 -0400
++++ libgweather-2.27.91/configure.in	2009-08-25 15:25:17.411026687 -0400
+@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
  AM_MAINTAINER_MODE
  GNOME_MAINTAINER_MODE_DEFINES
  
@@ -14,7 +12,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  IT_PROG_INTLTOOL([0.40.3])
  PKG_PROG_PKG_CONFIG([0.19])
  
-@@ -48,13 +52,6 @@
+@@ -50,13 +54,6 @@ AC_STDC_HEADERS
  AM_PROG_LIBTOOL
  AC_PATH_PROG(GCONFTOOL, gconftool-2)
  
@@ -28,7 +26,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  AC_ARG_ENABLE(locations-compression,
          [AC_HELP_STRING([--enable-locations-compression],
                          [Compress Locations.xml files])],
-@@ -242,7 +239,7 @@
+@@ -253,7 +250,7 @@ AC_OUTPUT([
  Makefile
  doc/Makefile
  po/Makefile.in
@@ -37,7 +35,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  libgweather/Makefile
  libgweather/gweather.pc
  libgweather/gweather-uninstalled.pc
-@@ -250,12 +247,6 @@
+@@ -261,12 +258,6 @@ data/Makefile
  python/Makefile
  ])
  
@@ -50,17 +48,17 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  dnl ***************************************************************************
  dnl *** Display Summary                                                     ***
  dnl ***************************************************************************
-@@ -265,6 +256,4 @@
+@@ -276,6 +267,4 @@ libgweather-$VERSION configure summary:
  	Prefix:				${prefix}
  	Source code location:		${srcdir}
  	Compiler:			${CC}
 -	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
 -	Locations.xml compression:	${enable_locations_compression}
  " >&2
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/data/Makefile.am libgweather-2.26.1.new/data/Makefile.am
---- libgweather-2.26.1/data/Makefile.am	2009-04-14 00:00:59.000000000 +0200
-+++ libgweather-2.26.1.new/data/Makefile.am	2009-04-23 18:18:50.000000000 +0200
-@@ -4,55 +4,23 @@
+diff -up libgweather-2.27.91/data/Makefile.am.gettext libgweather-2.27.91/data/Makefile.am
+--- libgweather-2.27.91/data/Makefile.am.gettext	2009-07-21 13:01:11.000000000 -0400
++++ libgweather-2.27.91/data/Makefile.am	2009-08-25 15:29:50.529265774 -0400
+@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
  libgweatherlocationsdir = $(pkgdatadir)
  libgweatherlocations_in_files = Locations.xml.in
  
@@ -71,7 +69,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
 -libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
 -
 -%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`
+-	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
 -	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
 -		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
 -	fi
@@ -94,7 +92,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
  
 -$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data)
+-	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
 -	for pofile in $(PO_LOCATIONS); do \
 -		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
 -		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
@@ -103,17 +101,18 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
 -		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
 -			gzip --force Locations.$$locale.xml;		\
 -		fi;							\
--	done
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data)
--	rm -f C/$(libgweatherlocations_data)
+-	done &&								\
+-	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
+-	rm -f C/$(libgweatherlocations_data) &&				\
+-	test -d C && rmdir C &&						\
+-	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
+-		gzip --force Locations.xml;				\
+-	fi &&								\
 +$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
 +	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
 +	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
 +	rm -f C/$(libgweatherlocations_DATA)
- 	test -d C && rmdir C
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi
++	test -d C && rmdir C
  	touch $@
  
 -endif # USE_ONE_BIG_XML
@@ -121,9 +120,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  check:
  	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
  	$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/libgweather/gweather-location.c libgweather-2.26.1.new/libgweather/gweather-location.c
---- libgweather-2.26.1/libgweather/gweather-location.c	2009-04-14 00:00:47.000000000 +0200
-+++ libgweather-2.26.1.new/libgweather/gweather-location.c	2009-04-23 18:19:23.000000000 +0200
+diff -up libgweather-2.27.91/libgweather/gweather-location.c.gettext libgweather-2.27.91/libgweather/gweather-location.c
+--- libgweather-2.27.91/libgweather/gweather-location.c.gettext	2009-04-19 13:41:11.000000000 -0400
++++ libgweather-2.27.91/libgweather/gweather-location.c	2009-08-25 15:25:17.416018454 -0400
 @@ -22,11 +22,14 @@
  #include <config.h>
  #endif
@@ -139,7 +138,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-location.h"
-@@ -184,10 +187,20 @@
+@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
  
  	tagname = (const char *) xmlTextReaderConstName (parser->xml);
  	if (!strcmp (tagname, "name") && !loc->name) {
@@ -162,9 +161,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  	    xmlFree (value);
  	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
  	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/libgweather/gweather-timezone.c libgweather-2.26.1.new/libgweather/gweather-timezone.c
---- libgweather-2.26.1/libgweather/gweather-timezone.c	2009-04-14 00:00:47.000000000 +0200
-+++ libgweather-2.26.1.new/libgweather/gweather-timezone.c	2009-04-23 18:19:37.000000000 +0200
+diff -up libgweather-2.27.91/libgweather/gweather-timezone.c.gettext libgweather-2.27.91/libgweather/gweather-timezone.c
+--- libgweather-2.27.91/libgweather/gweather-timezone.c.gettext	2009-08-12 05:00:52.000000000 -0400
++++ libgweather-2.27.91/libgweather/gweather-timezone.c	2009-08-25 15:25:17.417013203 -0400
 @@ -23,6 +23,7 @@
  #endif
  
@@ -173,7 +172,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
  
  #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
  #include "gweather-timezone.h"
-@@ -155,7 +156,7 @@
+@@ -152,7 +153,7 @@ static GWeatherTimezone *
  parse_timezone (GWeatherParser *parser)
  {
      GWeatherTimezone *zone = NULL;
@@ -182,7 +181,7 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
      int offset, dst_offset;
      gboolean has_dst = FALSE;
  
-@@ -178,27 +179,34 @@
+@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
  		continue;
  	    }
  
@@ -221,9 +220,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
      if (name)
  	xmlFree (name);
  
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/LINGUAS libgweather-2.26.1.new/po-locations/LINGUAS
---- libgweather-2.26.1/po-locations/LINGUAS	1970-01-01 01:00:00.000000000 +0100
-+++ libgweather-2.26.1.new/po-locations/LINGUAS	2009-04-23 18:18:50.000000000 +0200
+diff -up /dev/null libgweather-2.27.91/po-locations/LINGUAS
+--- /dev/null	2009-08-25 08:39:50.200398369 -0400
++++ libgweather-2.27.91/po-locations/LINGUAS	2009-08-25 15:25:17.419017718 -0400
 @@ -0,0 +1,78 @@
 +ang
 +ar
@@ -303,9 +302,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
 +zh_CN
 +zh_HK
 +zh_TW
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/Makefile.in.in libgweather-2.26.1.new/po-locations/Makefile.in.in
---- libgweather-2.26.1/po-locations/Makefile.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ libgweather-2.26.1.new/po-locations/Makefile.in.in	2009-04-23 18:18:50.000000000 +0200
+diff -up /dev/null libgweather-2.27.91/po-locations/Makefile.in.in
+--- /dev/null	2009-08-25 08:39:50.200398369 -0400
++++ libgweather-2.27.91/po-locations/Makefile.in.in	2009-08-25 15:25:17.420027972 -0400
 @@ -0,0 +1,217 @@
 +# Makefile for program source directory in GNU NLS utilities package.
 +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -524,9 +523,9 @@ diff -Nur -x '*.orig' -x '*~' libgweathe
 +# Tell versions [3.59,3.63) of GNU make not to export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/POTFILES.in libgweather-2.26.1.new/po-locations/POTFILES.in
---- libgweather-2.26.1/po-locations/POTFILES.in	1970-01-01 01:00:00.000000000 +0100
-+++ libgweather-2.26.1.new/po-locations/POTFILES.in	2009-04-23 18:18:50.000000000 +0200
+diff -up /dev/null libgweather-2.27.91/po-locations/POTFILES.in
+--- /dev/null	2009-08-25 08:39:50.200398369 -0400
++++ libgweather-2.27.91/po-locations/POTFILES.in	2009-08-25 15:25:17.421017903 -0400
 @@ -0,0 +1,4 @@
 +# This list should contain *only* data/Locations.xml.in.
 +# Everything else should be in POTFILES.skip.


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- libgweather.spec	25 Jul 2009 05:51:50 -0000	1.44
+++ libgweather.spec	25 Aug 2009 19:36:12 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           libgweather
-Version:        2.26.1
-Release:        6%{?dist}
+Version:        2.27.91
+Release:        1%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
@@ -102,6 +102,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	14 Apr 2009 00:39:08 -0000	1.23
+++ sources	25 Aug 2009 19:36:12 -0000	1.24
@@ -1 +1 @@
-382041ee8f4efeec1afde968624d34fe  libgweather-2.26.1.tar.bz2
+0f9cc594f17b94b60f12bfe444743964  libgweather-2.27.91.tar.bz2



From peter at fedoraproject.org  Tue Aug 25 19:36:29 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 25 Aug 2009 19:36:29 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd-ejabberdctl_fix.diff, 1.5,
	1.6 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.40, 1.41 import.log,
	1.11, 1.12
Message-ID: <20090825193629.82D2D11C0348@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13665/devel

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.init ejabberd.spec 
	import.log 
Log Message:
Fix for bz# 502361

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ejabberd-ejabberdctl_fix.diff	2 Oct 2008 05:28:56 -0000	1.5
+++ ejabberd-ejabberdctl_fix.diff	25 Aug 2009 19:36:29 -0000	1.6
@@ -1,11 +1,11 @@
---- src/ejabberdctl.template.fix_user	2008-08-27 13:37:52.000000000 +0400
-+++ src/ejabberdctl.template	2008-10-02 09:24:52.000000000 +0400
+--- src/ejabberdctl.template	2009-04-01 19:23:51.000000000 +0400
++++ src/ejabberdctl.template	2009-08-25 23:06:19.258685929 +0400
 @@ -9,13 +9,14 @@
  
  # define default environment variables
  NODE=ejabberd
 -HOST=localhost
-+HOST=`hostname -s`
++HOST=`hostname -s 2>/dev/null || echo "localhost"`
  ERLANG_NODE=$NODE@$HOST
  ERL=@erl@
 -ROOTDIR=@rootdir@
@@ -33,19 +33,50 @@
  EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
  SASL_LOG_PATH=$LOGS_DIR/sasl.log
  DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -139,11 +140,13 @@
+@@ -75,14 +76,16 @@
+ # start server
+ start ()
+ {
+-    $ERL \
++     ERL_COMMAND="$ERL \
+       $NAME $ERLANG_NODE \
+       -noinput -detached \
+       -pa $EJABBERD_EBIN \
+-      -mnesia dir "\"$EJABBERD_DB\"" \
++      -mnesia dir \\\"$EJABBERD_DB\\\" \
+       -s ejabberd \
+-      -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \
+-      $ERLANG_OPTS $ARGS "$@"
++      -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \
++      $ERLANG_OPTS $ARGS "$@" \
++      "
++      /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
+ }
+ 
+ # attach to server
+@@ -105,7 +108,7 @@
+     read foo
+     echo ""
+     $ERL \
+-      $NAME ${NODE}debug \
++      $NAME debug-${ERLANG_NODE} \
+       -remsh $ERLANG_NODE \
+       $ERLANG_OPTS $ARGS "$@"
+ }
+@@ -139,11 +142,13 @@
  # common control function
  ctl ()
  {
 -    $ERL \
+-      $NAME ejabberdctl \
 +    ERL_COMMAND="$ERL \
-       $NAME ejabberdctl \
++      $NAME ctl-${ERLANG_NODE} \
        -noinput \
        -pa $EJABBERD_EBIN \
 -      -s ejabberd_ctl -extra $ERLANG_NODE $@
 +      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
 +      "
-+    /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND"
++    /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
      result=$?
      case $result in
      0) :;;


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd.init	26 Jan 2009 16:42:58 -0000	1.7
+++ ejabberd.init	25 Aug 2009 19:36:29 -0000	1.8
@@ -25,23 +25,17 @@ if [ ! "$CONFIG_FILE" ]; then
 	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
 fi
 
-node=`hostname -s`
-
 start() {
         echo -n $"Starting ejabberd: "
 	if [ "$ULIMIT_MAX_FILES" ]; then
 		ulimit -n $ULIMIT_MAX_FILES
 	fi
-        daemon --user=ejabberd --check=ejabberd \
-	    "erl" "-pa @libdir@/ejabberd/ebin \
-                   -sname ejabberd \
-                   -s ejabberd \
-                   -ejabberd config \\\"$CONFIG_FILE\\\" \
-                             log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
-                   -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
-                   -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \
-                   -kernel inetrc \\\"/etc/ejabberd/inetrc\\\" \
-                   -detached"
+	daemon /usr/sbin/ejabberdctl start
+				--config $CONFIG_FILE \
+				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+				--logs "/var/log/ejabberd" \
+				--spool "/var/lib/ejabberd/spool" \
+				2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd
         echo
@@ -51,7 +45,7 @@ start() {
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
+	daemon /usr/sbin/ejabberdctl stop 2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -85,7 +79,7 @@ case "$1" in
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
+	/usr/sbin/ejabberdctl status
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ejabberd.spec	21 Aug 2009 13:12:35 -0000	1.40
+++ ejabberd.spec	25 Aug 2009 19:36:29 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -27,7 +27,7 @@ Source11:       ejabberd.pam
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
-# BZ# 439583, 452326, 451554, 465196
+# BZ# 439583, 452326, 451554, 465196, 502361
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
@@ -56,7 +56,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -114,7 +114,7 @@ fi
 %prep
 %setup -q
 %patch1 -p0 -b .fix_paths
-%patch2 -p0 -b .fix_user
+%patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
@@ -218,6 +218,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	21 Apr 2009 09:03:57 -0000	1.11
+++ import.log	25 Aug 2009 19:36:29 -0000	1.12
@@ -9,3 +9,4 @@ ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
 ejabberd-2_0_5-3_fc10:HEAD:ejabberd-2.0.5-3.fc10.src.rpm:1240304532
+ejabberd-2_0_5-6_fc11:HEAD:ejabberd-2.0.5-6.fc11.src.rpm:1251228870



From peter at fedoraproject.org  Tue Aug 25 19:38:53 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 25 Aug 2009 19:38:53 +0000 (UTC)
Subject: rpms/ejabberd/F-11 ejabberd-ejabberdctl_fix.diff, 1.5,
	1.6 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.38, 1.39 import.log,
	1.11, 1.12
Message-ID: <20090825193853.4530111C0348@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14147/F-11

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.init ejabberd.spec 
	import.log 
Log Message:
Fix for bz# 502361

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ejabberd-ejabberdctl_fix.diff	2 Oct 2008 05:28:56 -0000	1.5
+++ ejabberd-ejabberdctl_fix.diff	25 Aug 2009 19:38:52 -0000	1.6
@@ -1,11 +1,11 @@
---- src/ejabberdctl.template.fix_user	2008-08-27 13:37:52.000000000 +0400
-+++ src/ejabberdctl.template	2008-10-02 09:24:52.000000000 +0400
+--- src/ejabberdctl.template	2009-04-01 19:23:51.000000000 +0400
++++ src/ejabberdctl.template	2009-08-25 23:06:19.258685929 +0400
 @@ -9,13 +9,14 @@
  
  # define default environment variables
  NODE=ejabberd
 -HOST=localhost
-+HOST=`hostname -s`
++HOST=`hostname -s 2>/dev/null || echo "localhost"`
  ERLANG_NODE=$NODE@$HOST
  ERL=@erl@
 -ROOTDIR=@rootdir@
@@ -33,19 +33,50 @@
  EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
  SASL_LOG_PATH=$LOGS_DIR/sasl.log
  DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -139,11 +140,13 @@
+@@ -75,14 +76,16 @@
+ # start server
+ start ()
+ {
+-    $ERL \
++     ERL_COMMAND="$ERL \
+       $NAME $ERLANG_NODE \
+       -noinput -detached \
+       -pa $EJABBERD_EBIN \
+-      -mnesia dir "\"$EJABBERD_DB\"" \
++      -mnesia dir \\\"$EJABBERD_DB\\\" \
+       -s ejabberd \
+-      -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \
+-      $ERLANG_OPTS $ARGS "$@"
++      -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \
++      $ERLANG_OPTS $ARGS "$@" \
++      "
++      /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
+ }
+ 
+ # attach to server
+@@ -105,7 +108,7 @@
+     read foo
+     echo ""
+     $ERL \
+-      $NAME ${NODE}debug \
++      $NAME debug-${ERLANG_NODE} \
+       -remsh $ERLANG_NODE \
+       $ERLANG_OPTS $ARGS "$@"
+ }
+@@ -139,11 +142,13 @@
  # common control function
  ctl ()
  {
 -    $ERL \
+-      $NAME ejabberdctl \
 +    ERL_COMMAND="$ERL \
-       $NAME ejabberdctl \
++      $NAME ctl-${ERLANG_NODE} \
        -noinput \
        -pa $EJABBERD_EBIN \
 -      -s ejabberd_ctl -extra $ERLANG_NODE $@
 +      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
 +      "
-+    /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND"
++    /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
      result=$?
      case $result in
      0) :;;


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd.init	26 Jan 2009 16:42:58 -0000	1.7
+++ ejabberd.init	25 Aug 2009 19:38:52 -0000	1.8
@@ -25,23 +25,17 @@ if [ ! "$CONFIG_FILE" ]; then
 	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
 fi
 
-node=`hostname -s`
-
 start() {
         echo -n $"Starting ejabberd: "
 	if [ "$ULIMIT_MAX_FILES" ]; then
 		ulimit -n $ULIMIT_MAX_FILES
 	fi
-        daemon --user=ejabberd --check=ejabberd \
-	    "erl" "-pa @libdir@/ejabberd/ebin \
-                   -sname ejabberd \
-                   -s ejabberd \
-                   -ejabberd config \\\"$CONFIG_FILE\\\" \
-                             log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
-                   -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
-                   -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \
-                   -kernel inetrc \\\"/etc/ejabberd/inetrc\\\" \
-                   -detached"
+	daemon /usr/sbin/ejabberdctl start
+				--config $CONFIG_FILE \
+				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+				--logs "/var/log/ejabberd" \
+				--spool "/var/lib/ejabberd/spool" \
+				2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd
         echo
@@ -51,7 +45,7 @@ start() {
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
+	daemon /usr/sbin/ejabberdctl stop 2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -85,7 +79,7 @@ case "$1" in
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
+	/usr/sbin/ejabberdctl status
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/ejabberd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ejabberd.spec	21 Apr 2009 09:07:15 -0000	1.38
+++ ejabberd.spec	25 Aug 2009 19:38:53 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -27,7 +27,7 @@ Source11:       ejabberd.pam
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
-# BZ# 439583, 452326, 451554, 465196
+# BZ# 439583, 452326, 451554, 465196, 502361
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
@@ -56,7 +56,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -114,7 +114,7 @@ fi
 %prep
 %setup -q
 %patch1 -p0 -b .fix_paths
-%patch2 -p0 -b .fix_user
+%patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
@@ -218,6 +218,15 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
 - CAPTCHA is back - let's test it.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-11/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	21 Apr 2009 09:07:16 -0000	1.11
+++ import.log	25 Aug 2009 19:38:53 -0000	1.12
@@ -9,3 +9,4 @@ ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
 ejabberd-2_0_5-3_fc10:F-11:ejabberd-2.0.5-3.fc10.src.rpm:1240304713
+ejabberd-2_0_5-6_fc11:F-11:ejabberd-2.0.5-6.fc11.src.rpm:1251229070



From peter at fedoraproject.org  Tue Aug 25 19:41:14 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 25 Aug 2009 19:41:14 +0000 (UTC)
Subject: rpms/ejabberd/F-10 ejabberd-ejabberdctl_fix.diff, 1.5,
	1.6 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.36, 1.37 import.log,
	1.11, 1.12
Message-ID: <20090825194114.8631611C0348@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14448/F-10

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.init ejabberd.spec 
	import.log 
Log Message:
Fix for bz# 502361

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ejabberd-ejabberdctl_fix.diff	2 Oct 2008 05:28:56 -0000	1.5
+++ ejabberd-ejabberdctl_fix.diff	25 Aug 2009 19:41:14 -0000	1.6
@@ -1,11 +1,11 @@
---- src/ejabberdctl.template.fix_user	2008-08-27 13:37:52.000000000 +0400
-+++ src/ejabberdctl.template	2008-10-02 09:24:52.000000000 +0400
+--- src/ejabberdctl.template	2009-04-01 19:23:51.000000000 +0400
++++ src/ejabberdctl.template	2009-08-25 23:06:19.258685929 +0400
 @@ -9,13 +9,14 @@
  
  # define default environment variables
  NODE=ejabberd
 -HOST=localhost
-+HOST=`hostname -s`
++HOST=`hostname -s 2>/dev/null || echo "localhost"`
  ERLANG_NODE=$NODE@$HOST
  ERL=@erl@
 -ROOTDIR=@rootdir@
@@ -33,19 +33,50 @@
  EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
  SASL_LOG_PATH=$LOGS_DIR/sasl.log
  DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -139,11 +140,13 @@
+@@ -75,14 +76,16 @@
+ # start server
+ start ()
+ {
+-    $ERL \
++     ERL_COMMAND="$ERL \
+       $NAME $ERLANG_NODE \
+       -noinput -detached \
+       -pa $EJABBERD_EBIN \
+-      -mnesia dir "\"$EJABBERD_DB\"" \
++      -mnesia dir \\\"$EJABBERD_DB\\\" \
+       -s ejabberd \
+-      -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \
+-      $ERLANG_OPTS $ARGS "$@"
++      -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \
++      $ERLANG_OPTS $ARGS "$@" \
++      "
++      /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
+ }
+ 
+ # attach to server
+@@ -105,7 +108,7 @@
+     read foo
+     echo ""
+     $ERL \
+-      $NAME ${NODE}debug \
++      $NAME debug-${ERLANG_NODE} \
+       -remsh $ERLANG_NODE \
+       $ERLANG_OPTS $ARGS "$@"
+ }
+@@ -139,11 +142,13 @@
  # common control function
  ctl ()
  {
 -    $ERL \
+-      $NAME ejabberdctl \
 +    ERL_COMMAND="$ERL \
-       $NAME ejabberdctl \
++      $NAME ctl-${ERLANG_NODE} \
        -noinput \
        -pa $EJABBERD_EBIN \
 -      -s ejabberd_ctl -extra $ERLANG_NODE $@
 +      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
 +      "
-+    /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND"
++    /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
      result=$?
      case $result in
      0) :;;


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd.init	26 Jan 2009 16:45:41 -0000	1.7
+++ ejabberd.init	25 Aug 2009 19:41:14 -0000	1.8
@@ -25,23 +25,17 @@ if [ ! "$CONFIG_FILE" ]; then
 	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
 fi
 
-node=`hostname -s`
-
 start() {
         echo -n $"Starting ejabberd: "
 	if [ "$ULIMIT_MAX_FILES" ]; then
 		ulimit -n $ULIMIT_MAX_FILES
 	fi
-        daemon --user=ejabberd --check=ejabberd \
-	    "erl" "-pa @libdir@/ejabberd/ebin \
-                   -sname ejabberd \
-                   -s ejabberd \
-                   -ejabberd config \\\"$CONFIG_FILE\\\" \
-                             log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
-                   -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
-                   -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \
-                   -kernel inetrc \\\"/etc/ejabberd/inetrc\\\" \
-                   -detached"
+	daemon /usr/sbin/ejabberdctl start
+				--config $CONFIG_FILE \
+				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+				--logs "/var/log/ejabberd" \
+				--spool "/var/lib/ejabberd/spool" \
+				2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd
         echo
@@ -51,7 +45,7 @@ start() {
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
+	daemon /usr/sbin/ejabberdctl stop 2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -85,7 +79,7 @@ case "$1" in
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
+	/usr/sbin/ejabberdctl status
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ejabberd.spec	21 Apr 2009 09:11:20 -0000	1.36
+++ ejabberd.spec	25 Aug 2009 19:41:14 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -27,7 +27,7 @@ Source11:       ejabberd.pam
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
-# BZ# 439583, 452326, 451554, 465196
+# BZ# 439583, 452326, 451554, 465196, 502361
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
@@ -56,7 +56,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -114,7 +114,7 @@ fi
 %prep
 %setup -q
 %patch1 -p0 -b .fix_paths
-%patch2 -p0 -b .fix_user
+%patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
@@ -218,6 +218,15 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
 - CAPTCHA is back - let's test it.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	21 Apr 2009 09:11:20 -0000	1.11
+++ import.log	25 Aug 2009 19:41:14 -0000	1.12
@@ -9,3 +9,4 @@ ejabberd-2_0_4-1_fc10:F-10:ejabberd-2.0.
 ejabberd-2_0_5-1_fc10:F-10:ejabberd-2.0.5-1.fc10.src.rpm:1238789573
 ejabberd-2_0_5-2_fc10:F-10:ejabberd-2.0.5-2.fc10.src.rpm:1238819669
 ejabberd-2_0_5-3_fc10:F-10:ejabberd-2.0.5-3.fc10.src.rpm:1240304980
+ejabberd-2_0_5-6_fc11:F-10:ejabberd-2.0.5-6.fc11.src.rpm:1251229162



From tmraz at fedoraproject.org  Tue Aug 25 19:42:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 19:42:22 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel
	perl-Crypt-OpenSSL-X509-openssl.patch, NONE,
	1.1 perl-Crypt-OpenSSL-X509.spec, 1.11, 1.12
Message-ID: <20090825194222.7D59611C0348@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14677

Modified Files:
	perl-Crypt-OpenSSL-X509.spec 
Added Files:
	perl-Crypt-OpenSSL-X509-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
- rebuilt with new openssl


perl-Crypt-OpenSSL-X509-openssl.patch:
 X509.xs |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

--- NEW FILE perl-Crypt-OpenSSL-X509-openssl.patch ---
diff -up Crypt-OpenSSL-X509-0.7/X509.xs.openssl Crypt-OpenSSL-X509-0.7/X509.xs
--- Crypt-OpenSSL-X509-0.7/X509.xs.openssl	2008-02-23 23:18:11.000000000 +0100
+++ Crypt-OpenSSL-X509-0.7/X509.xs	2009-08-25 21:40:15.000000000 +0200
@@ -252,12 +252,19 @@ accessor(x509)
 	} else if (ix == 7) {
 
 		int j;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+		STACK_OF(OPENSSL_STRING) *emlst = X509_get1_email(x509);
+
+		for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++) {
+			BIO_printf(bio, "%s", sk_OPENSSL_STRING_value(emlst, j));
+		}
+#else
 		STACK *emlst = X509_get1_email(x509);
 
 		for (j = 0; j < sk_num(emlst); j++) {
 			BIO_printf(bio, "%s", sk_value(emlst, j));
 		}
-
+#endif
 		X509_email_free(emlst);
 	}
 
@@ -290,6 +297,17 @@ as_string(x509, format = FORMAT_PEM)
 
 	} else if (format == FORMAT_NETSCAPE) {
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+		NETSCAPE_X509 nx;
+		ASN1_OCTET_STRING hdr;
+
+		hdr.data   = (unsigned char *)NETSCAPE_CERT_HDR;
+		hdr.length = strlen(NETSCAPE_CERT_HDR);
+		nx.header = &os;
+		nx.cert   = x509;
+
+		ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509), bio, &nx);
+#else
 		ASN1_HEADER ah;
 		ASN1_OCTET_STRING os;
 
@@ -300,6 +318,7 @@ as_string(x509, format = FORMAT_PEM)
 		ah.meth   = X509_asn1_meth();
 
 		ASN1_i2d_bio(i2d_ASN1_HEADER, bio, (unsigned char *)&ah);
+#endif
 	}
 
 	RETVAL = sv_bio_final(bio);


Index: perl-Crypt-OpenSSL-X509.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-OpenSSL-X509.spec	21 Aug 2009 15:19:50 -0000	1.11
+++ perl-Crypt-OpenSSL-X509.spec	25 Aug 2009 19:42:22 -0000	1.12
@@ -6,6 +6,7 @@ License:        GPL+ or Artistic 
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Crypt-OpenSSL-X509/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANIEL/Crypt-OpenSSL-X509-%{version}.tar.gz
+Patch1:         perl-Crypt-OpenSSL-X509-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl openssl-devel
 BuildRequires:  perl(Test::More) perl(Test::Pod) perl(Module::Install)
@@ -17,6 +18,7 @@ Crypt::OpenSSL::X509 - Perl extension to
 
 %prep
 %setup -q -n Crypt-OpenSSL-X509-%{version}
+%patch1 -p1 -b .openssl
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -47,7 +49,7 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
 - rebuilt with new openssl
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-4



From peter at fedoraproject.org  Tue Aug 25 19:46:25 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 25 Aug 2009 19:46:25 +0000 (UTC)
Subject: rpms/ejabberd/EL-5 ejabberd-ejabberdctl_fix.diff, 1.4,
	1.5 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.27, 1.28 import.log,
	1.8, 1.9
Message-ID: <20090825194625.CF3AC11C0348@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15202/EL-5

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.init ejabberd.spec 
	import.log 
Log Message:
Fix for bz# 502361

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ejabberd-ejabberdctl_fix.diff	2 Oct 2008 05:49:49 -0000	1.4
+++ ejabberd-ejabberdctl_fix.diff	25 Aug 2009 19:46:25 -0000	1.5
@@ -1,11 +1,11 @@
---- src/ejabberdctl.template.fix_user	2008-08-27 13:37:52.000000000 +0400
-+++ src/ejabberdctl.template	2008-10-02 09:24:52.000000000 +0400
+--- src/ejabberdctl.template	2009-04-01 19:23:51.000000000 +0400
++++ src/ejabberdctl.template	2009-08-25 23:06:19.258685929 +0400
 @@ -9,13 +9,14 @@
  
  # define default environment variables
  NODE=ejabberd
 -HOST=localhost
-+HOST=`hostname -s`
++HOST=`hostname -s 2>/dev/null || echo "localhost"`
  ERLANG_NODE=$NODE@$HOST
  ERL=@erl@
 -ROOTDIR=@rootdir@
@@ -33,19 +33,50 @@
  EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
  SASL_LOG_PATH=$LOGS_DIR/sasl.log
  DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -139,11 +140,13 @@
+@@ -75,14 +76,16 @@
+ # start server
+ start ()
+ {
+-    $ERL \
++     ERL_COMMAND="$ERL \
+       $NAME $ERLANG_NODE \
+       -noinput -detached \
+       -pa $EJABBERD_EBIN \
+-      -mnesia dir "\"$EJABBERD_DB\"" \
++      -mnesia dir \\\"$EJABBERD_DB\\\" \
+       -s ejabberd \
+-      -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \
+-      $ERLANG_OPTS $ARGS "$@"
++      -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \
++      $ERLANG_OPTS $ARGS "$@" \
++      "
++      /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
+ }
+ 
+ # attach to server
+@@ -105,7 +108,7 @@
+     read foo
+     echo ""
+     $ERL \
+-      $NAME ${NODE}debug \
++      $NAME debug-${ERLANG_NODE} \
+       -remsh $ERLANG_NODE \
+       $ERLANG_OPTS $ARGS "$@"
+ }
+@@ -139,11 +142,13 @@
  # common control function
  ctl ()
  {
 -    $ERL \
+-      $NAME ejabberdctl \
 +    ERL_COMMAND="$ERL \
-       $NAME ejabberdctl \
++      $NAME ctl-${ERLANG_NODE} \
        -noinput \
        -pa $EJABBERD_EBIN \
 -      -s ejabberd_ctl -extra $ERLANG_NODE $@
 +      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
 +      "
-+    /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND"
++    /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
      result=$?
      case $result in
      0) :;;


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd.init	26 Jan 2009 16:53:25 -0000	1.7
+++ ejabberd.init	25 Aug 2009 19:46:25 -0000	1.8
@@ -25,23 +25,17 @@ if [ ! "$CONFIG_FILE" ]; then
 	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
 fi
 
-node=`hostname -s`
-
 start() {
         echo -n $"Starting ejabberd: "
 	if [ "$ULIMIT_MAX_FILES" ]; then
 		ulimit -n $ULIMIT_MAX_FILES
 	fi
-        daemon --user=ejabberd --check=ejabberd \
-	    "erl" "-pa @libdir@/ejabberd/ebin \
-                   -sname ejabberd \
-                   -s ejabberd \
-                   -ejabberd config \\\"$CONFIG_FILE\\\" \
-                             log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
-                   -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
-                   -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \
-                   -kernel inetrc \\\"/etc/ejabberd/inetrc\\\" \
-                   -detached"
+	daemon /usr/sbin/ejabberdctl start
+				--config $CONFIG_FILE \
+				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+				--logs "/var/log/ejabberd" \
+				--spool "/var/lib/ejabberd/spool" \
+				2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd
         echo
@@ -51,7 +45,7 @@ start() {
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
+	daemon /usr/sbin/ejabberdctl stop 2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -85,7 +79,7 @@ case "$1" in
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
+	/usr/sbin/ejabberdctl status
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ejabberd.spec	4 Apr 2009 04:47:14 -0000	1.27
+++ ejabberd.spec	25 Aug 2009 19:46:25 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -27,7 +27,7 @@ Source11:       ejabberd.pam
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
-# BZ# 439583, 452326, 451554, 465196
+# BZ# 439583, 452326, 451554, 465196, 502361
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
@@ -35,7 +35,6 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -57,7 +56,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
 ExcludeArch: ppc64
 
 %description
@@ -115,9 +114,9 @@ fi
 %prep
 %setup -q
 %patch1 -p0 -b .fix_paths
-%patch2 -p0 -b .fix_user
+%patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
-#%patch4 -p1 -b .captcha
+%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -177,8 +176,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
-# tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -220,6 +218,18 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	4 Apr 2009 04:47:14 -0000	1.8
+++ import.log	25 Aug 2009 19:46:25 -0000	1.9
@@ -6,3 +6,4 @@ ejabberd-2_0_3-1_fc10:EL-5:ejabberd-2.0.
 ejabberd-2_0_4-1_fc10:EL-5:ejabberd-2.0.4-1.fc10.src.rpm:1237117472
 ejabberd-2_0_5-1_fc10:EL-5:ejabberd-2.0.5-1.fc10.src.rpm:1238790091
 ejabberd-2_0_5-2_fc10:EL-5:ejabberd-2.0.5-2.fc10.src.rpm:1238820305
+ejabberd-2_0_5-6_fc11:EL-5/:ejabberd-2.0.5-6.fc11.src.rpm:1251229535



From jjames at fedoraproject.org  Tue Aug 25 19:53:32 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 25 Aug 2009 19:53:32 +0000 (UTC)
Subject: rpms/eclipse-findbugs/devel eclipsePlugin-1.3.9-build.patch, NONE, 
	1.1 .cvsignore, 1.3, 1.4 eclipse-findbugs.spec, 1.4, 1.5 sources,
	1.3, 1.4 eclipsePlugin-1.3.8-build.patch, 1.1, NONE
Message-ID: <20090825195332.A16D611C0348@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/eclipse-findbugs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16620

Modified Files:
	.cvsignore eclipse-findbugs.spec sources 
Added Files:
	eclipsePlugin-1.3.9-build.patch 
Removed Files:
	eclipsePlugin-1.3.8-build.patch 
Log Message:
* 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(-)

--- NEW FILE eclipsePlugin-1.3.9-build.patch ---
diff -dur eclipsePlugin-1.3.9.20090821.ORIG/build.properties eclipsePlugin-1.3.9.20090821/build.properties
--- eclipsePlugin-1.3.9.20090821.ORIG/build.properties	2009-03-15 06:19:04.000000000 -0600
+++ eclipsePlugin-1.3.9.20090821/build.properties	2009-08-25 12:01:47.757982754 -0600
@@ -17,16 +17,16 @@
                META-INF/,\
                surelogic.png,\
                umdFindbugs.png,\
-               lib/annotations.jar,\
-               lib/asm-3.1.jar,\
-               lib/asm-commons-3.1.jar,\
-               lib/asm-tree-3.1.jar,\
-               lib/bcel.jar,\
-               lib/commons-lang-2.4.jar,\
-               lib/dom4j-1.6.1.jar,\
-               lib/jFormatString.jar,\
-               lib/jaxen-1.1.1.jar,\
-               lib/jsr305.jar
+               /usr/share/java/findbugs-annotations.jar,\
+               /usr/share/java/objectweb-asm/asm-3.1.jar,\
+               /usr/share/java/objectweb-asm/asm-commons-3.1.jar,\
+               /usr/share/java/objectweb-asm/asm-tree-3.1.jar,\
+               /usr/share/java/findbugs-bcel.jar,\
+               /usr/share/java/commons-lang.jar,\
+               /usr/share/java/dom4j-1.6.1.jar,\
+               /usr/share/java/jFormatString.jar,\
+               /usr/share/java/jaxen-1.1.1.jar,\
+               /usr/share/java/jsr-305.jar
 src.includes = .classpath,\
 			   .project,\
 			   .settings/,\
diff -dur eclipsePlugin-1.3.9.20090821.ORIG/build.xml eclipsePlugin-1.3.9.20090821/build.xml
--- eclipsePlugin-1.3.9.20090821.ORIG/build.xml	2009-04-01 15:58:08.000000000 -0600
+++ eclipsePlugin-1.3.9.20090821/build.xml	2009-08-25 12:06:18.477984581 -0600
@@ -55,14 +55,14 @@
     <property name="lib.dir" value="lib"/>
 
     <!-- list of required libraries, copied from FB core project -->
-	<property name="jars.required" value="jsr305.jar,
-		bcel.jar,
-		annotations.jar,
+	<property name="jars.required" value="jsr-305.jar,
+		findbugs-bcel.jar,
+		findbugs-annotations.jar,
 		jFormatString.jar,
-		commons-lang-2.4.jar,
-		asm-3.1.jar,
-		asm-tree-3.1.jar,
-		asm-commons-3.1.jar,
+		commons-lang.jar,
+		objectweb-asm/asm-3.1.jar,
+		objectweb-asm/asm-tree-3.1.jar,
+		objectweb-asm/asm-commons-3.1.jar,
 		dom4j-1.6.1.jar,
 		jaxen-1.1.1.jar" />
 
@@ -72,11 +72,18 @@
 		findbugs-ant.jar" />
 
 	<path id="plugin.classpath">
-		<fileset dir="${lib.dir}" includes="${jars.required}"/>
+		<fileset dir="/usr/share/java" includes="${jars.required}"/>
 		<fileset dir="${eclipsePlugin.dir}">
 			<include name="**/*.jar"/>
 			<exclude name="edu.umd.cs.findbugs.**/*.jar"/>
 		</fileset>
+		<fileset dir="${eclipseJdtPlugin.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset dir="${eclipseSdkPlugin.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset file="@SWT_JAR@"/>
 	</path>
 
 	<!-- Need these jars for ant target 'srcdist', which uses subversion.  Grab them at:
@@ -110,7 +117,7 @@
         </delete>
 	</target>
 
-	<target name="classes" depends="init,fbjars" description="Compile java source files">
+	<target name="classes" depends="init" description="Compile java source files">
 		<echo message="Compiling FindBugs Eclipse plugin"/>
 	    <fail unless="eclipsePlugin.dir"
 	    	message="Please specify path to the Eclipse 3.3+ plugins folder in local.properties file, like: eclipsePlugin.dir=F:\\java\\eclipse33\\plugins"/>
@@ -131,13 +138,13 @@
 		</copy>
 	</target>
 
-	<target name="version" depends="fbjars" description="Extract the plugin id and version">
+	<target name="version" description="Extract the plugin id and version">
 		<echo message="Verifying and creating FindBugs Eclipse plugin version info"/>
 
-		<!-- 1) read FB version from ${bin.dir}/version.properties (copied from core) to ${release.base} -->
+		<!-- 1) read FB version from ${bin.dir}/version.properties (copied from core) to ${release.base}
 	    <loadproperties srcFile="${bin.dir}/version.properties" >
 	      <filterchain><linecontains><contains value="release.base"/></linecontains></filterchain>
-	    </loadproperties>
+	    </loadproperties> -->
 
 		<!-- 2) read plugin base version from META-INF/MANIFEST.MF to ${eclipse.release.base} -->
 		<loadfile srcFile="META-INF/MANIFEST.MF" property="eclipse.release.base">
@@ -178,7 +185,7 @@
 	<target name="dist" depends="clean,classes,version"
 		description="Build a plugin distributable">
 		<echo message="Creating FindBugs Eclipse plugin binary distribution"/>
-		<jar destfile="${dist.dir}/findbugs-plugin.jar" >
+		<jar destfile="${dist.dir}/findbugs-plugin.jar" manifest="${dist.dir}/META-INF/MANIFEST.MF">
 			<fileset dir="${bin.dir}" excludes="de/tobject/findbugs/tools/**" />
 		</jar>
 		<copy todir="${dist.dir}" >
diff -dur eclipsePlugin-1.3.9.20090821.ORIG/META-INF/MANIFEST.MF eclipsePlugin-1.3.9.20090821/META-INF/MANIFEST.MF
--- eclipsePlugin-1.3.9.20090821.ORIG/META-INF/MANIFEST.MF	2009-04-01 15:58:08.000000000 -0600
+++ eclipsePlugin-1.3.9.20090821/META-INF/MANIFEST.MF	2009-08-25 12:07:46.420996289 -0600
@@ -4,16 +4,17 @@
 Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
 Bundle-Version: 1.3.9.qualifier
 Bundle-ClassPath: findbugs-plugin.jar,
- lib/jsr305.jar,
- lib/annotations.jar,
- lib/bcel.jar,
- lib/dom4j-1.6.1.jar,
- lib/jaxen-1.1.1.jar,
- lib/jFormatString.jar,
- lib/asm-tree-3.1.jar,
- lib/asm-3.1.jar,
- lib/asm-commons-3.1.jar,
- lib/commons-lang-2.4.jar
+ jsr-305.jar,
+ findbugs-annotations.jar,
+ findbugs-bcel.jar,
+ findbugs.jar,
+ dom4j-1.6.1.jar,
+ jaxen-1.1.1.jar,
+ jFormatString.jar,
+ asm-tree-3.1.jar,
+ asm-3.1.jar,
+ asm-commons-3.1.jar,
+ commons-lang-2.4.jar
 Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
 Bundle-Vendor: FindBugs Project
 Bundle-Localization: plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Mar 2009 05:30:12 -0000	1.3
+++ .cvsignore	25 Aug 2009 19:53:32 -0000	1.4
@@ -1 +1 @@
-eclipsePlugin-1.3.8.20090315-source.zip
+eclipsePlugin-1.3.9.20090821-source.zip


Index: eclipse-findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/eclipse-findbugs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-findbugs.spec	24 Jul 2009 20:54:17 -0000	1.4
+++ eclipse-findbugs.spec	25 Aug 2009 19:53:32 -0000	1.5
@@ -1,9 +1,9 @@
 %global eclipse_base %{_libdir}/eclipse
-%global pkg_date     20090315
+%global pkg_date     20090821
 
 Name:           eclipse-findbugs
-Version:        1.3.8
-Release:        2%{?dist}
+Version:        1.3.9
+Release:        1%{?dist}
 Summary:        Eclipse plugin for FindBugs
 
 Group:          Development/Languages
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{plugin_dir}
 
 %changelog
+* Tue Aug 25 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-1
+- Update to 1.3.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Mar 2009 05:30:13 -0000	1.3
+++ sources	25 Aug 2009 19:53:32 -0000	1.4
@@ -1 +1 @@
-0ca464650b02ce4eca331d4a97812200  eclipsePlugin-1.3.8.20090315-source.zip
+88ad5d804bf48c0be286c813a878ebd3  eclipsePlugin-1.3.9.20090821-source.zip


--- eclipsePlugin-1.3.8-build.patch DELETED ---



From limb at fedoraproject.org  Tue Aug 25 19:55:49 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 25 Aug 2009 19:55:49 +0000 (UTC)
Subject: rpms/calcurse/devel .cvsignore, 1.10, 1.11 calcurse.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <20090825195549.6196311C0348@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/calcurse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17533

Modified Files:
	.cvsignore calcurse.spec sources 
Log Message:
2.7, corrected license.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Jul 2009 19:17:30 -0000	1.10
+++ .cvsignore	25 Aug 2009 19:55:49 -0000	1.11
@@ -1 +1 @@
-calcurse-2.6.tar.gz
+calcurse-2.7.tar.gz


Index: calcurse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/calcurse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- calcurse.spec	28 Jul 2009 19:17:31 -0000	1.12
+++ calcurse.spec	25 Aug 2009 19:55:49 -0000	1.13
@@ -1,10 +1,10 @@
 Name:           calcurse
-Version:        2.6
+Version:        2.7
 Release:        1%{?dist}
 Summary:        Text-based personal organizer
 
 Group:          Applications/Productivity
-License:        GPLv2+
+License:        BSD
 URL:            http://culot.org/calcurse/
 #Real SourceURL is: http://culot.org/cgi-bin/get.cgi?%{name}-%{version}.tar.gz 
 #but the ? annoys rpmbuild
@@ -41,12 +41,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README TODO
 %{_bindir}/calcurse
 %{_mandir}/man1/calcurse.1.gz
 
 
 %changelog
+* Tue Aug 25 2009 Jon Ciesla <limb at jcomserv.net> 2.7-1
+- Update to 2.7.
+
 * Tue Jul 28 2009 Jon Ciesla <limb at jcomserv.net> 2.6-1
 - Update to 2.6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Jul 2009 19:17:31 -0000	1.10
+++ sources	25 Aug 2009 19:55:49 -0000	1.11
@@ -1 +1 @@
-6f1483afe4d48e387aca8169b4cac10d  calcurse-2.6.tar.gz
+eddfae36370fd89532149fe80c312e1e  calcurse-2.7.tar.gz



From rmeggins at fedoraproject.org  Tue Aug 25 20:00:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 25 Aug 2009 20:00:51 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 .cvsignore, 1.2, 1.3 389-ds-base.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090825200051.E552A11C0374@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-serv18851/F-11

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Log Message:
backed out - added template-initconfig to %files - this change is for the next major release
bump version to 1.2.2
fix reopened 509472 db2index all does not reindex all the db backends correctly 
fix 518520 -  pre hashed salted passwords do not work
(F-10 and F-11 only) fix 518418 -  Package rename shuts down server, results in unconfigured package 
see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
bugs fixed in 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 16:20:08 -0000	1.2
+++ .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
@@ -1 +1,2 @@
 389-ds-base-1.2.1.tar.bz2
+389-ds-base-1.2.2.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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base.spec	19 Aug 2009 19:34:51 -0000	1.3
+++ 389-ds-base.spec	25 Aug 2009 20:00:51 -0000	1.4
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.1
-Release:          2%{?dist}
+Version:          1.2.2
+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,6 +122,30 @@ sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/p
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%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
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
@@ -141,6 +168,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}_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}_exists then
+    os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
+end
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION LICENSE.GPLv2
@@ -150,7 +190,6 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -174,6 +213,15 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Thu Aug 20 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.2-1
+- backed out - added template-initconfig to %files - this change is for the next major release
+- bump version to 1.2.2
+- fix reopened 509472 db2index all does not reindex all the db backends correctly
+- fix 518520 -  pre hashed salted passwords do not work
+- fix 518418 -  Package rename shuts down server, results in unconfigured package
+- see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
+- bugs fixed in 1.2.2
+
 * Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-2
 - added template-initconfig to %files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Aug 2009 19:46:53 -0000	1.3
+++ sources	25 Aug 2009 20:00:51 -0000	1.4
@@ -1 +1 @@
-49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2
+143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2



From rmeggins at fedoraproject.org  Tue Aug 25 20:00:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 25 Aug 2009 20:00:51 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 .cvsignore, 1.2, 1.3 389-ds-base.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090825200051.BDC7411C0374@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-serv18851/F-10

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Log Message:
backed out - added template-initconfig to %files - this change is for the next major release
bump version to 1.2.2
fix reopened 509472 db2index all does not reindex all the db backends correctly 
fix 518520 -  pre hashed salted passwords do not work
(F-10 and F-11 only) fix 518418 -  Package rename shuts down server, results in unconfigured package 
see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
bugs fixed in 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 16:20:08 -0000	1.2
+++ .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
@@ -1 +1,2 @@
 389-ds-base-1.2.1.tar.bz2
+389-ds-base-1.2.2.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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base.spec	19 Aug 2009 19:34:51 -0000	1.3
+++ 389-ds-base.spec	25 Aug 2009 20:00:51 -0000	1.4
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.1
-Release:          2%{?dist}
+Version:          1.2.2
+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,6 +122,30 @@ sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/p
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%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
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
@@ -141,6 +168,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}_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}_exists then
+    os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
+end
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION LICENSE.GPLv2
@@ -150,7 +190,6 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -174,6 +213,15 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Thu Aug 20 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.2-1
+- backed out - added template-initconfig to %files - this change is for the next major release
+- bump version to 1.2.2
+- fix reopened 509472 db2index all does not reindex all the db backends correctly
+- fix 518520 -  pre hashed salted passwords do not work
+- fix 518418 -  Package rename shuts down server, results in unconfigured package
+- see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
+- bugs fixed in 1.2.2
+
 * Wed Aug 19 2009 Noriko Hosoi <nhosoi at redhat.com> - 1.2.1-2
 - added template-initconfig to %files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Aug 2009 19:46:53 -0000	1.3
+++ sources	25 Aug 2009 20:00:51 -0000	1.4
@@ -1 +1 @@
-49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2
+143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2



From rmeggins at fedoraproject.org  Tue Aug 25 20:00:52 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 25 Aug 2009 20:00:52 +0000 (UTC)
Subject: rpms/389-ds-base/devel .cvsignore, 1.2, 1.3 389-ds-base.spec, 1.5, 
	1.6 sources, 1.3, 1.4
Message-ID: <20090825200052.35A5411C0374@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-serv18851/devel

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Log Message:
backed out - added template-initconfig to %files - this change is for the next major release
bump version to 1.2.2
fix reopened 509472 db2index all does not reindex all the db backends correctly 
fix 518520 -  pre hashed salted passwords do not work
(F-10 and F-11 only) fix 518418 -  Package rename shuts down server, results in unconfigured package 
see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
bugs fixed in 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 May 2009 22:55:06 -0000	1.2
+++ .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
@@ -1 +1,2 @@
 389-ds-base-1.2.1.tar.bz2
+389-ds-base-1.2.2.tar.bz2


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base.spec	21 Aug 2009 12:17:00 -0000	1.5
+++ 389-ds-base.spec	25 Aug 2009 20:00:52 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.1
-Release:          5%{?dist}
+Version:          1.2.2
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -150,7 +150,6 @@ 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/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -174,6 +173,14 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.2-1
+- backed out - added template-initconfig to %files - this change is for the next major release
+- bump version to 1.2.2
+- fix reopened 509472 db2index all does not reindex all the db backends correctly
+- fix 518520 -  pre hashed salted passwords do not work
+- see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
+- bugs fixed in 1.2.2
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Aug 2009 19:46:53 -0000	1.3
+++ sources	25 Aug 2009 20:00:52 -0000	1.4
@@ -1 +1 @@
-49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2
+143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2



From rmeggins at fedoraproject.org  Tue Aug 25 20:05:59 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 25 Aug 2009 20:05:59 +0000 (UTC)
Subject: rpms/389-admin/F-10 389-admin.spec,1.4,1.5
Message-ID: <20090825200559.2A37711C0348@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-serv19934/F-10

Modified Files:
	389-admin.spec 
Log Message:
Resolves 518418 -  Package rename shuts down server, results in unconfigured package
rewrite perm/owner preservation code to use lua
VS: ----------------------------------------------------------------------



Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-10/389-admin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-admin.spec	12 Aug 2009 20:00:08 -0000	1.4
+++ 389-admin.spec	25 Aug 2009 20:05:58 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.8
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -77,54 +77,44 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgnam
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# save permission info in temp file
-# if upgrading
-if [ "$1" -gt 1 ] ; then
-    set -x
-    mydt=`date +%Y%m%d`
-    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
-    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
-    if [ -z "$perm1" ] ; then
-        perm1=0
-    fi
-    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
-    if [ -z "$own1" ] ; then
-        own1=0
-    fi
-    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
-    if [ -z "$perm2" ] ; then
-        perm2=0
-    fi
-    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
-    if [ -z "$own2" ] ; then
-        own2=0
-    fi
-    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
-fi
-
-%post
-/sbin/chkconfig --add %{pkgname}-admin
-/sbin/ldconfig
-# if installing for the first time, make sure the config
-# directory and file have the correct permissions
-# the setup script is used to "fix" these
-if [ "$1" -gt 1 ]; then
-    set -x
-    mydt=`date +%Y%m%d`
-    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
-    if [ ! -f $mytmpfile ] ; then
-        echo Error: upgrade temp file $mytmpfile not found
-        exit 1
-    fi
-    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
-        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
-        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
-        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
-        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
-    done
-    rm -f $mytmpfile
-fi
+%pre -p <lua>
+-- save ownership/permissions on the dirs/files that rpm changes
+-- 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
+os.execute('/sbin/chkconfig --add %{pkgname}-admin')
+os.execute('/sbin/ldconfig')
+-- restore permissions if upgrading
+if %{pkgname}admin_adminserv then
+    posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.mode)
+    posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.uid, %{pkgname}admin_adminserv.gid)
+end
+if %{pkgname}admin_consoleconf then
+    posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode)
+    posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid)
+end
 
 %preun
 if [ $1 = 0 ]; then
@@ -134,6 +124,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
@@ -148,6 +151,13 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* 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
+
+- rewrite perm/owner preservation code to use lua
+- add lua code to save run level configuration
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-3
 - final rebuild for 1.1.8 release
 



From rmeggins at fedoraproject.org  Tue Aug 25 20:05:59 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 25 Aug 2009 20:05:59 +0000 (UTC)
Subject: rpms/389-admin/F-11 389-admin.spec,1.4,1.5
Message-ID: <20090825200559.46FF211C0372@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-serv19934/F-11

Modified Files:
	389-admin.spec 
Log Message:
Resolves 518418 -  Package rename shuts down server, results in unconfigured package
rewrite perm/owner preservation code to use lua
VS: ----------------------------------------------------------------------



Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-admin.spec	12 Aug 2009 20:00:08 -0000	1.4
+++ 389-admin.spec	25 Aug 2009 20:05:59 -0000	1.5
@@ -3,7 +3,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.8
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -79,54 +79,44 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgnam
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# save permission info in temp file
-# if upgrading
-if [ "$1" -gt 1 ] ; then
-    set -x
-    mydt=`date +%Y%m%d`
-    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
-    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
-    if [ -z "$perm1" ] ; then
-        perm1=0
-    fi
-    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
-    if [ -z "$own1" ] ; then
-        own1=0
-    fi
-    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
-    if [ -z "$perm2" ] ; then
-        perm2=0
-    fi
-    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
-    if [ -z "$own2" ] ; then
-        own2=0
-    fi
-    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
-fi
-
-%post
-/sbin/chkconfig --add %{pkgname}-admin
-/sbin/ldconfig
-# if installing for the first time, make sure the config
-# directory and file have the correct permissions
-# the setup script is used to "fix" these
-if [ "$1" -gt 1 ]; then
-    set -x
-    mydt=`date +%Y%m%d`
-    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
-    if [ ! -f $mytmpfile ] ; then
-        echo Error: upgrade temp file $mytmpfile not found
-        exit 1
-    fi
-    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
-        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
-        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
-        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
-        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
-    done
-    rm -f $mytmpfile
-fi
+%pre -p <lua>
+-- save ownership/permissions on the dirs/files that rpm changes
+-- 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
+os.execute('/sbin/chkconfig --add %{pkgname}-admin')
+os.execute('/sbin/ldconfig')
+-- restore permissions if upgrading
+if %{pkgname}admin_adminserv then
+    posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.mode)
+    posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.uid, %{pkgname}admin_adminserv.gid)
+end
+if %{pkgname}admin_consoleconf then
+    posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode)
+    posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid)
+end
 
 %preun
 if [ $1 = 0 ]; then
@@ -136,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
@@ -150,6 +153,11 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* 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
+- add lua code to save run level configuration
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-3
 - final rebuild for 1.1.8 release
 



From rmeggins at fedoraproject.org  Tue Aug 25 20:05:59 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 25 Aug 2009 20:05:59 +0000 (UTC)
Subject: rpms/389-admin/devel 389-admin.spec,1.6,1.7
Message-ID: <20090825200559.68C3A11C0348@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19934/devel

Modified Files:
	389-admin.spec 
Log Message:
Resolves 518418 -  Package rename shuts down server, results in unconfigured package
rewrite perm/owner preservation code to use lua
VS: ----------------------------------------------------------------------



Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 389-admin.spec	12 Aug 2009 20:00:08 -0000	1.6
+++ 389-admin.spec	25 Aug 2009 20:05:59 -0000	1.7
@@ -3,7 +3,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.8
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -79,54 +79,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgnam
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# save permission info in temp file
-# if upgrading
-if [ "$1" -gt 1 ] ; then
-    set -x
-    mydt=`date +%Y%m%d`
-    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
-    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
-    if [ -z "$perm1" ] ; then
-        perm1=0
-    fi
-    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
-    if [ -z "$own1" ] ; then
-        own1=0
-    fi
-    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
-    if [ -z "$perm2" ] ; then
-        perm2=0
-    fi
-    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
-    if [ -z "$own2" ] ; then
-        own2=0
-    fi
-    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
-fi
-
-%post
-/sbin/chkconfig --add %{pkgname}-admin
-/sbin/ldconfig
-# if installing for the first time, make sure the config
-# directory and file have the correct permissions
-# the setup script is used to "fix" these
-if [ "$1" -gt 1 ]; then
-    set -x
-    mydt=`date +%Y%m%d`
-    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
-    if [ ! -f $mytmpfile ] ; then
-        echo Error: upgrade temp file $mytmpfile not found
-        exit 1
-    fi
-    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
-        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
-        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
-        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
-        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
-    done
-    rm -f $mytmpfile
-fi
+%pre -p <lua>
+-- save ownership/permissions on the dirs/files that rpm changes
+-- 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')
+
+%post -p <lua>
+-- do the usual daemon post setup stuff
+os.execute('/sbin/chkconfig --add %{pkgname}-admin')
+os.execute('/sbin/ldconfig')
+-- restore permissions if upgrading
+if %{pkgname}admin_adminserv then
+    posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.mode)
+    posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.uid, %{pkgname}admin_adminserv.gid)
+end
+if %{pkgname}admin_consoleconf then
+    posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode)
+    posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid)
+end
 
 %preun
 if [ $1 = 0 ]; then
@@ -150,7 +121,10 @@ fi
 %{_mandir}/man8/*
 
 %changelog
-* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-4
+* Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-6
+- rewrite perm/owner preservation code to use lua
+
+* Wed Aug 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-5
 - final rebuild for 1.1.8 release
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-4



From ausil at fedoraproject.org  Tue Aug 25 20:10:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 20:10:08 +0000 (UTC)
Subject: rpms/nss/devel nss.spec, 1.92, 1.93 nss-softokn-config.in, 1.1,
	NONE nss-softokn.pc.in, 1.1, NONE
Message-ID: <20090825201008.E039811C043D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20837

Modified Files:
	nss.spec 
Removed Files:
	nss-softokn-config.in nss-softokn.pc.in 
Log Message:
remove the softokn packages



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- nss.spec	25 Aug 2009 03:19:16 -0000	1.92
+++ nss.spec	25 Aug 2009 20:10:08 -0000	1.93
@@ -6,15 +6,13 @@
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
 %{nil}
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-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
@@ -40,8 +38,6 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source8:          nss-prelink.conf
-Source20:         nss-softokn.pc.in
-Source21:         nss-softokn-config.in
 Source12:         %{name}-pem-20090622.tar.bz2
 Source13:         PayPalEE.cert
 Source14:         PayPalICA.cert
@@ -58,47 +54,6 @@ server applications. Applications built 
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
-%package softokn
-Summary:          Network Security Services Soktoken Module
-Group:            System Environment/Base
-Conflicts:        nss < 3.12.3.99.3-8
-#Provides:         nss
-#Provides:	  	  libsoftokn3.so, shlibsign
-Requires:         sqlite
-Requires:         nss-util >= %{version}
-Requires:         nss-softokn-freebl >= %{version}
-
-%description softokn
-Network Security Services Softoken Cryptographic Module
-
-%package softokn-freebl
-Summary:          Freebl library for the Network Security Services
-Group:            System Environment/Base
-Conflicts:        nss < 3.12.2.99.3-5
-
-%description softokn-freebl
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled client and
-server applications. Applications built with NSS can support SSL v2
-and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
-v3 certificates, and other security standards.
-
-Install the nss-softokn-freebl package if you need the freebl 
-library.
-
-%package softokn-devel
-Summary:          Development libraries for Network Security Services
-Group:            Development/Libraries
-Conflicts:        nss-devel < 3.12.3.99.3-8
-#Provides:         nss-devel >= 3.12.3.99.3-11
-Requires:         nss-softokn = %{version}-%{release}
-Requires:         nspr-devel >= %{nspr_version}
-Requires:         nss-util-devel
-Requires:         pkgconfig
-
-%description softokn-devel
-Header and Library files for doing development with Network Security Services.
-
 %package tools
 Summary:          Tools for the Network Security Services
 Group:            System Environment/Base
@@ -222,38 +177,6 @@ export NSS_VPATCH
 
 chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
-# Set up our package file
-%{__mkdir_p} ./mozilla/dist/pkgconfig
-
-# Set up our package file
-%{__mkdir_p} ./mozilla/dist/pkgconfig
-%{__cat} %{SOURCE20} | sed -e "s,%%libdir%%,%{_libdir},g" \
-                          -e "s,%%prefix%%,%{_prefix},g" \
-                          -e "s,%%exec_prefix%%,%{_prefix},g" \
-                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
-                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%SOFTKN_VERSION%%,%{version},g" > \
-                          ./mozilla/dist/pkgconfig/nss-softokn.pc
-
-SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
-SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
-SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
-
-export SOFTOKEN_VMAJOR 
-export SOFTOKEN_VMINOR 
-export SOFTOKEN_VPATCH
-
-%{__cat} %{SOURCE21} | sed -e "s, at libdir@,%{_libdir},g" \
-                          -e "s, at prefix@,%{_prefix},g" \
-                          -e "s, at exec_prefix@,%{_prefix},g" \
-                          -e "s, at includedir@,%{_includedir}/nss3,g" \
-                          -e "s, at MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
-                          -e "s, at MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
-                          -e "s, at MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
-                          > ./mozilla/dist/pkgconfig/nss-softokn-config
-
-chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config
-
 
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
@@ -319,15 +242,14 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnss3.so \
-            libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
+for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
+for file in libnssdbm3.chk
 do
   ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
@@ -367,8 +289,6 @@ done
 # Copy the package configuration files
 %{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
 %{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 #remove the nss-util-devel headers
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h
@@ -406,26 +326,12 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-%post softokn
-/sbin/ldconfig >/dev/null 2>/dev/null
-
-%post softokn-freebl
-/sbin/ldconfig >/dev/null 2>/dev/null
-
-
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-%postun softokn
-/sbin/ldconfig >/dev/null 2>/dev/null
-
-%postun softokn-freebl
-/sbin/ldconfig >/dev/null 2>/dev/null
-
 %files
 %defattr(-,root,root)
 /%{_lib}/libnss3.so
@@ -438,63 +344,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
 
-
-%files softokn
-%defattr(-,root,root)
-/%{_lib}/libnssdbm3.so
-/%{_lib}/libnssdbm3.chk
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
-# shared with nss-tools
-%dir %{_libdir}/nss
-#%dir %{saved_files_dir}
-%dir %{unsupported_tools_directory}
-%{unsupported_tools_directory}/shlibsign
-#%{saved_files_dir}/nss-softokn-prelink.conf
-# we don't own %{_sysconfdir}/prelink.conf.d and
-# must rely on triggers to install and remove our
-# configuration file
-#%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
-%dir %{_sysconfdir}/prelink.conf.d
-%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
-
-%files softokn-freebl
-%defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
-
-%files softokn-devel
-%defattr(-,root,root)
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
-%{_libdir}/libnssdbm3.so
-%{_libdir}/libnssdbm3.chk
-%{_libdir}/pkgconfig/nss-softokn.pc
-%{_bindir}/nss-softokn-config
-#
-# The following headers are those exported public in
-# mozilla/security/nss/lib/freebl/manifest.mn and
-# mozilla/security/nss/lib/softoken/manifest.mn
-#
-# The following list is short because many headers, such as
-# the pkcs #11 ones, have been provided by nss-util-devel
-# which installed them before us.
-#
-%{_includedir}/nss3/blapit.h
-%{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/hasht.h
-%{_includedir}/nss3/sechash.h
-%{_includedir}/nss3/nsslowhash.h
-%{_includedir}/nss3/secmodt.h
-%{_includedir}/nss3/shsign.h
-
-%files softokn-freebl
-%defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
-
 %files tools
 %defattr(-,root,root)
 %{_bindir}/certutil
@@ -523,12 +372,8 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
 %{_libdir}/libnssckbi.so
 %{_libdir}/libnsspem.so
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
@@ -599,6 +444,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-15
+- remove the softokn subpackages
+
 * Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-14
 - don install the nss-util pkgconfig bits
 


--- nss-softokn-config.in DELETED ---


--- nss-softokn.pc.in DELETED ---



From tmraz at fedoraproject.org  Tue Aug 25 20:13:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 25 Aug 2009 20:13:31 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel
	perl-Crypt-OpenSSL-X509-openssl.patch, 1.1, 1.2
Message-ID: <20090825201331.44CD011C0044@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21616

Modified Files:
	perl-Crypt-OpenSSL-X509-openssl.patch 
Log Message:
- I have no idea how perl XS works


perl-Crypt-OpenSSL-X509-openssl.patch:
 X509.xs |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

Index: perl-Crypt-OpenSSL-X509-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Crypt-OpenSSL-X509-openssl.patch	25 Aug 2009 19:42:22 -0000	1.1
+++ perl-Crypt-OpenSSL-X509-openssl.patch	25 Aug 2009 20:13:31 -0000	1.2
@@ -1,24 +1,24 @@
 diff -up Crypt-OpenSSL-X509-0.7/X509.xs.openssl Crypt-OpenSSL-X509-0.7/X509.xs
 --- Crypt-OpenSSL-X509-0.7/X509.xs.openssl	2008-02-23 23:18:11.000000000 +0100
-+++ Crypt-OpenSSL-X509-0.7/X509.xs	2009-08-25 21:40:15.000000000 +0200
++++ Crypt-OpenSSL-X509-0.7/X509.xs	2009-08-25 22:12:33.000000000 +0200
 @@ -252,12 +252,19 @@ accessor(x509)
  	} else if (ix == 7) {
  
  		int j;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
 +		STACK_OF(OPENSSL_STRING) *emlst = X509_get1_email(x509);
 +
 +		for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++) {
 +			BIO_printf(bio, "%s", sk_OPENSSL_STRING_value(emlst, j));
 +		}
-+#else
++	#else
  		STACK *emlst = X509_get1_email(x509);
  
  		for (j = 0; j < sk_num(emlst); j++) {
  			BIO_printf(bio, "%s", sk_value(emlst, j));
  		}
 -
-+#endif
++	#endif
  		X509_email_free(emlst);
  	}
  
@@ -26,7 +26,7 @@ diff -up Crypt-OpenSSL-X509-0.7/X509.xs.
  
  	} else if (format == FORMAT_NETSCAPE) {
  
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
 +		NETSCAPE_X509 nx;
 +		ASN1_OCTET_STRING hdr;
 +
@@ -36,7 +36,7 @@ diff -up Crypt-OpenSSL-X509-0.7/X509.xs.
 +		nx.cert   = x509;
 +
 +		ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509), bio, &nx);
-+#else
++	#else
  		ASN1_HEADER ah;
  		ASN1_OCTET_STRING os;
  
@@ -44,7 +44,7 @@ diff -up Crypt-OpenSSL-X509-0.7/X509.xs.
  		ah.meth   = X509_asn1_meth();
  
  		ASN1_i2d_bio(i2d_ASN1_HEADER, bio, (unsigned char *)&ah);
-+#endif
++	#endif
  	}
  
  	RETVAL = sv_bio_final(bio);



From mclasen at fedoraproject.org  Tue Aug 25 20:18:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 20:18:20 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.50, 1.51 sources, 1.50, 1.51 vino.spec,
	1.104, 1.105
Message-ID: <20090825201820.E453211C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22544

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	12 Aug 2009 03:30:04 -0000	1.50
+++ .cvsignore	25 Aug 2009 20:18:20 -0000	1.51
@@ -1 +1 @@
-vino-2.27.90.tar.bz2
+vino-2.27.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	12 Aug 2009 03:30:04 -0000	1.50
+++ sources	25 Aug 2009 20:18:20 -0000	1.51
@@ -1 +1 @@
-9279cf89bfceeab8fe8cae515e6a5232  vino-2.27.90.tar.bz2
+8c220bb3c0770c4f9820e8f30395c65d  vino-2.27.91.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- vino.spec	12 Aug 2009 03:30:04 -0000	1.104
+++ vino.spec	25 Aug 2009 20:18:20 -0000	1.105
@@ -9,7 +9,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.27.90
+Version: 2.27.91
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.27/%{name}-%{version}.tar.bz2
@@ -129,6 +129,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 



From mclasen at fedoraproject.org  Tue Aug 25 20:20:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 20:20:48 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 vinagre.spec, 1.51, 1.52
Message-ID: <20090825202048.584C711C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23226

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	12 Aug 2009 03:35:48 -0000	1.27
+++ .cvsignore	25 Aug 2009 20:20:48 -0000	1.28
@@ -1 +1 @@
-vinagre-2.27.90.tar.bz2
+vinagre-2.27.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	12 Aug 2009 03:35:48 -0000	1.27
+++ sources	25 Aug 2009 20:20:48 -0000	1.28
@@ -1 +1 @@
-2f4211f05632924386bad3e3c351e4a4  vinagre-2.27.90.tar.bz2
+e776cd376b5f9b1537c84da093f4e589  vinagre-2.27.91.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- vinagre.spec	12 Aug 2009 04:01:55 -0000	1.51
+++ vinagre.spec	25 Aug 2009 20:20:48 -0000	1.52
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.27.90
+Version:	2.27.91
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
@@ -155,6 +155,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - 2.27.90
 



From kalev at fedoraproject.org  Tue Aug 25 20:26:28 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Tue, 25 Aug 2009 20:26:28 +0000 (UTC)
Subject: rpms/mingw32-gcc/devel gcc44-libstdc++-docs.patch, NONE,
	1.1 gcc44-power7-3.patch, NONE, 1.1 gcc44-rh503816-1.patch, NONE,
	1.1 gcc44-rh503816-2.patch, NONE, 1.1 gcc44-unique-object.patch,
	NONE, 1.1 gcc44-unwind-debug-hook.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 gcc44-hack.patch, 1.1, 1.2 gcc44-power7-2.patch, 1.1,
	1.2 gcc44-power7.patch, 1.1, 1.2 gcc44-rh330771.patch, 1.1,
	1.2 mingw32-gcc.spec, 1.6, 1.7 sources, 1.4,
	1.5 gcc44-atom.patch, 1.1, NONE gcc44-memmove-opt.patch, 1.1,
	NONE gcc44-pr27898.patch, 1.1, NONE gcc44-pr32139.patch, 1.1,
	NONE gcc44-pr37959.patch, 1.1, NONE gcc44-pr39226.patch, 1.1, NONE
Message-ID: <20090825202629.047AE11C0044@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24210

Modified Files:
	.cvsignore gcc44-hack.patch gcc44-power7-2.patch 
	gcc44-power7.patch gcc44-rh330771.patch mingw32-gcc.spec 
	sources 
Added Files:
	gcc44-libstdc++-docs.patch gcc44-power7-3.patch 
	gcc44-rh503816-1.patch gcc44-rh503816-2.patch 
	gcc44-unique-object.patch gcc44-unwind-debug-hook.patch 
Removed Files:
	gcc44-atom.patch gcc44-memmove-opt.patch gcc44-pr27898.patch 
	gcc44-pr32139.patch gcc44-pr37959.patch gcc44-pr39226.patch 
Log Message:
4.4.1-1


gcc44-libstdc++-docs.patch:
 api.html   |   25 +++++--------------------
 index.html |    3 ++-
 2 files changed, 7 insertions(+), 21 deletions(-)

--- NEW FILE gcc44-libstdc++-docs.patch ---
--- libstdc++-v3/doc/html/index.html	2009-01-14 12:06:37.000000000 +0100
+++ libstdc++-v3/doc/html/index.html	2009-05-06 09:17:30.000000000 +0200
@@ -12,7 +12,8 @@
 <div>
 <h1>The GNU C++ Library Documentation</h1>
 
-<p>Copyright 2008 FSF</p>
+<p>Release 4.4.0</p>
+<p>Copyright 2008, 2009 FSF</p>
 
 <p>
   Permission is granted to copy, distribute and/or modify this
--- libstdc++-v3/doc/html/api.html	2009-04-20 21:21:15.000000000 +0200
+++ libstdc++-v3/doc/html/api.html	2009-05-06 09:17:24.000000000 +0200
@@ -17,27 +17,12 @@ useful for examining the signatures of p
 the library classes, finding out what is in a particular include
 file, looking at inheritance diagrams, etc.
 </p><p>
-The source-level documentation for the most recent releases can be
-viewed online:
-</p><div class="itemizedlist"><ul type="disc"><li><p>
-      <a class="ulink" href="libstdc++-html-USERS-3.4/index.html" target="_top">for the 3.4 release
+The source-level documentation can be viewed here:
+</p>
+<div class="itemizedlist"><ul type="disc">
+    <li><p>
+      <a class="ulink" href="api/index.html" target="_top">for the 4.4 release
       </a>
-    </p></li><li><p>
-      <a class="ulink" href="libstdc++-html-USERS-4.1/index.html" target="_top">for the 4.1 release
-      </a>
-    </p></li><li><p>
-      <a class="ulink" href="libstdc++-html-USERS-4.2/index.html" target="_top">for the 4.2 release
-      </a>
-    </p></li><li><p>
-      <a class="ulink" href="libstdc++-html-USERS-4.3/index.html" target="_top">for the 4.3 release
-      </a>
-    </p></li><li><p>
-      <a class="ulink" href="libstdc++-html-USERS-4.4/index.html" target="_top">for the 4.4 release
-      </a>
-    </p></li><li><p>
-      <a class="ulink" href="latest-doxygen/index.html" target="_top">"the latest collection"
-      </a>
-      (For the main development tree; see the date on the first page.)
     </p></li></ul></div><p>
 This generated HTML collection, as above, is also available for download in the libstdc++ snapshots directory at
    <code class="literal">&lt;URL:ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</code>.

gcc44-power7-3.patch:
 config/rs6000/altivec.md                     |   44 
 config/rs6000/predicates.md                  |    3 
 config/rs6000/rs6000-c.c                     |   79 +
 config/rs6000/rs6000-protos.h                |    2 
 config/rs6000/rs6000.c                       | 1273 +++++++++++++--------------
 config/rs6000/rs6000.h                       |   96 +-
 config/rs6000/rs6000.md                      |   15 
 config/rs6000/rs6000.opt                     |   24 
 config/rs6000/vector.md                      |   56 -
 config/rs6000/vsx.md                         |  406 ++++++--
 doc/extend.texi                              |   17 
 testsuite/gcc.target/powerpc/vsx-builtin-3.c |  212 ++++
 12 files changed, 1363 insertions(+), 864 deletions(-)

--- NEW FILE gcc44-power7-3.patch ---
2009-04-26  Michael Meissner  <meissner at linux.vnet.ibm.com>

	* config/rs6000/vector.md (vector_vsel<mode>): Generate the insns
	directly instead of calling VSX/Altivec expanders.

	* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Map VSX
	builtins that are identical to Altivec, to the Altivec vesion.
	(altivec_overloaded_builtins): Add V2DF/V2DI sel, perm support.
	(altivec_resolve_overloaded_builtin): Add V2DF/V2DI support.

	* config/rs6000/rs6000.c (rs6000_expand_vector_init): Rename VSX
	splat functions.
	(expand_vector_set): Merge V2DF/V2DI code.
	(expand_vector_extract): Ditto.
	(bdesc_3arg): Add more VSX builtins.
	(bdesc_2arg): Ditto.
	(bdesc_1arg): Ditto.
	(rs6000_expand_ternop_builtin): Require xxpermdi 3rd argument to
	be 2 bit-constant, and V2DF/V2DI set to be a 1 bit-constant.
	(altivec_expand_builtin): Add support for VSX overloaded builtins.
	(altivec_init_builtins): Ditto.
	(rs6000_common_init_builtins): Ditto.
	(rs6000_init_builtins): Add V2DI types and vector long support.
	(rs6000_handle_altivec_attribute): Ditto.
	(rs6000_mange_type): Ditto.

	* config/rs6000/vsx.md (UNSPEC_*): Add new UNSPEC constants.
	(vsx_vsel<mode>): Add support for all vector types, including
	Altivec types.
	(vsx_ftrunc<mode>2): Emit the correct instruction.
	(vsx_x<VSv>r<VSs>i): New builtin rounding mode insns.
	(vsx_x<VSv>r<VSs>ic): Ditto.
	(vsx_concat_<mode>): Key off of VSX memory instructions being
	generated instead of the vector arithmetic unit to enable V2DI
	mode.
	(vsx_extract_<mode>): Ditto.
	(vsx_set_<mode>): Rewrite as an unspec.
	(vsx_xxpermdi2_<mode>): Rename old vsx_xxpermdi_<mode> here.  Key
	off of VSX memory instructions instead of arithmetic unit.
	(vsx_xxpermdi_<mode>): New insn for __builtin_vsx_xxpermdi.
	(vsx_splat_<mode>): Rename from vsx_splat<mode>.
	(vsx_xxspltw_<mode>): Change from V4SF only to V4SF/V4SI modes.
	Fix up constraints.  Key off of memory instructions instead of
	arithmetic instructions to allow use with V4SI.
	(vsx_xxmrghw_<mode>): Ditto.
	(vsx_xxmrglw_<mode>): Ditto.
	(vsx_xxsldwi_<mode>): Implement vector shift double by word
	immediate.

	* config/rs6000/rs6000.h (VSX_BUILTIN_*): Update for current
	builtins being generated.
	(RS6000_BTI_unsigned_V2DI): Add vector long support.
	(RS6000_BTI_bool_long): Ditto.
	(RS6000_BTI_bool_V2DI): Ditto.
	(unsigned_V2DI_type_node): Ditto.
	(bool_long_type_node): Ditto.
	(bool_V2DI_type_node): Ditto.

	* config/rs6000/altivec.md (altivec_vsel<mode>): Add '*' since we
	don't need the generator function now.  Use VSX instruction if
	-mvsx.
	(altivec_vmrghw): Use VSX instruction if -mvsx.
	(altivec_vmrghsf): Ditto.
	(altivec_vmrglw): Ditto.
	(altivec_vmrglsf): Ditto.

	* doc/extend.texi (PowerPC AltiVec/VSX Built-in Functions):
	Document that under VSX, vector double/long are available.

testsuite/
	* gcc.target/powerpc/vsx-builtin-3.c: New test for VSX builtins.

2009-04-23  Michael Meissner  <meissner at linux.vnet.ibm.com>

	* config/rs6000/vector.md (VEC_E): New iterator to add V2DImode.
	(vec_init<mode>): Use VEC_E instead of VEC_C iterator, to add
	V2DImode support.
	(vec_set<mode>): Ditto.
	(vec_extract<mode>): Ditto.

	* config/rs6000/predicates.md (easy_vector_constant): Add support
	for setting TImode to 0.

	* config/rs6000/rs6000.opt (-mvsx-vector-memory): Delete old debug
	switch that is no longer used.
	(-mvsx-vector-float): Ditto.
	(-mvsx-vector-double): Ditto.
	(-mvsx-v4sf-altivec-regs): Ditto.
	(-mreload-functions): Ditto.
	(-mallow-timode): New debug switch.

	* config/rs6000/rs6000.c (rs6000_ira_cover_classes): New target
	hook for IRA cover classes, to know that under VSX the float and
	altivec registers are part of the same register class, but before
	they weren't.
	(TARGET_IRA_COVER_CLASSES): Set ira cover classes target hookd.
	(rs6000_hard_regno_nregs): Key off of whether VSX/Altivec memory
	instructions are supported, and not whether the vector unit has
	arithmetic support to enable V2DI/TI mode.
	(rs6000_hard_regno_mode_ok): Ditto.
	(rs6000_init_hard_regno_mode_ok): Add V2DImode, TImode support.
	Drop several of the debug switches.
	(rs6000_emit_move): Force TImode constants to memory if we have
	either Altivec or VSX.
	(rs6000_builtin_conversion): Use correct insns for V2DI<->V2DF
	conversions.
	(rs6000_expand_vector_init): Add V2DI support.
	(rs6000_expand_vector_set): Ditto.
	(avoiding_indexed_address_p): Simplify tests to say if the mode
	uses VSX/Altivec memory instructions we can't eliminate reg+reg
	addressing.
	(rs6000_legitimize_address): Move VSX/Altivec REG+REG support
	before the large integer support.
	(rs6000_legitimate_address): Add support for TImode in VSX/Altivec
	registers.
	(rs6000_emit_move): Ditto.
	(def_builtin): Change internal error message to provide more
	information.
	(bdesc_2arg): Add conversion builtins.
	(builtin_hash_function): New function for hashing all of the types
	for builtin functions.
	(builtin_hash_eq): Ditto.
	(builtin_function_type): Ditto.
	(builtin_mode_to_type): New static for builtin argument hashing.
	(builtin_hash_table): Ditto.
	(rs6000_common_init_builtins): Rewrite so that types for builtin
	functions are only created when we need them, and use a hash table
	to store all of the different argument combinations that are
	created.  Add support for VSX conversion builtins.
	(rs6000_preferred_reload_class): Add TImode support.
	(reg_classes_cannot_change_mode_class): Be stricter about VSX and
	Altivec vector types.
	(rs6000_emit_vector_cond_expr): Use VSX_MOVE_MODE, not
	VSX_VECTOR_MOVE_MODE.
	(rs6000_handle_altivec_attribute): Allow __vector long on VSX.

	* config/rs6000/vsx.md (VSX_D): New iterator for vectors with
	64-bit elements.
	(VSX_M): New iterator for 128 bit types for moves, except for
	TImode.
	(VSm, VSs, VSr): Add TImode.
	(VSr4, VSr5): New mode attributes for float<->double conversion.
	(VSX_SPDP): New iterator for float<->double conversion.
	(VS_spdp_*): New mode attributes for float<->double conversion.
	(UNSPEC_VSX_*): Rename unspec constants to remove XV from the
	names.  Change all users.
	(vsx_mov<mode>): Drop TImode support here.
	(vsx_movti): New TImode support, allow GPRs, but favor VSX
	registers.
	(vsx_<VS_spdp_insn>): New support for float<->double conversions.
	(vsx_xvcvdpsp): Delete, move into vsx_<VS_spdp_insn>.
	(vsx_xvcvspdp): Ditto.
	(vsx_xvcvuxdsp): New conversion insn.
	(vsx_xvcvspsxds): Ditto.
	(vsx_xvcvspuxds): Ditto.
	(vsx_concat_<mode>): Generalize V2DF permute/splat operations to
	include V2DI.
	(vsx_set_<mode>): Ditto.
	(vsx_extract_<mode>): Ditto.
	(vsx_xxpermdi_<mode>): Ditto.
	(vsx_splat<mode>): Ditto.

	* config/rs6000/rs6000.h (VSX_VECTOR_MOVE_MODE): Delete.
	(VSX_MOVE_MODE): Add TImode.
	(IRA_COVER_CLASSES): Delete.
	(IRA_COVER_CLASSES_PRE_VSX): New cover classes for machines
	without VSX where float and altivec are different registers.
	(IRA_COVER_CLASS_VSX): New cover classes for machines with VSX
	where float and altivec are part of the same register class.

	* config/rs6000/altivec.md (VM2): New iterator for 128-bit types,
	except TImode.
	(altivec_mov<mode>): Drop movti mode here.
	(altivec_movti): Add movti insn, and allow GPRs, but favor altivec
	registers.

2009-04-16  Michael Meissner  <meissner at linux.vnet.ibm.com>

	* config/rs6000/rs6000-protos.h (rs6000_has_indirect_jump_p): New
	declaration.
	(rs6000_set_indirect_jump): Ditto.

	* config/rs6000/rs6000.c (struct machine_function): Add
	indirect_jump_p field.
	(rs6000_override_options): Wrap warning messages in N_().  If
	-mvsx was implicitly set, don't give a warning for -msoft-float,
	just silently turn off vsx.
	(rs6000_secondary_reload_inner): Don't use strict register
	checking, since pseudos may still be present.
	(register_move_cost): If -mdebug=cost, print out cost information.
	(rs6000_memory_move_cost): Ditto.
	(rs6000_has_indirect_jump_p): New function, return true if
	current function has an indirect jump.
	(rs6000_set_indirect_jump): New function, note that an indirect
	jump has been generated.

	* config/rs6000/rs6000.md (indirect_jump): Note that we've
	generated an indirect jump.
	(tablejump): Ditto.
[...3124 lines suppressed...]
 
   /* VSX overloaded builtins, add the overloaded functions not present in
      Altivec.  */
@@ -3395,7 +3411,13 @@ enum rs6000_builtins
   VSX_BUILTIN_VEC_NMADD,
   VSX_BUITLIN_VEC_NMSUB,
   VSX_BUILTIN_VEC_DIV,
-  VSX_BUILTIN_OVERLOADED_LAST = VSX_BUILTIN_VEC_DIV,
+  VSX_BUILTIN_VEC_XXMRGHW,
+  VSX_BUILTIN_VEC_XXMRGLW,
+  VSX_BUILTIN_VEC_XXPERMDI,
+  VSX_BUILTIN_VEC_XXSLDWI,
+  VSX_BUILTIN_VEC_XXSPLTD,
+  VSX_BUILTIN_VEC_XXSPLTW,
+  VSX_BUILTIN_OVERLOADED_LAST = VSX_BUILTIN_VEC_XXSPLTW,
 
   /* Combined VSX/Altivec builtins.  */
   VECTOR_BUILTIN_FLOAT_V4SI_V4SF,
@@ -3425,13 +3447,16 @@ enum rs6000_builtin_type_index
   RS6000_BTI_unsigned_V16QI,
   RS6000_BTI_unsigned_V8HI,
   RS6000_BTI_unsigned_V4SI,
+  RS6000_BTI_unsigned_V2DI,
   RS6000_BTI_bool_char,          /* __bool char */
   RS6000_BTI_bool_short,         /* __bool short */
   RS6000_BTI_bool_int,           /* __bool int */
+  RS6000_BTI_bool_long,		 /* __bool long */
   RS6000_BTI_pixel,              /* __pixel */
   RS6000_BTI_bool_V16QI,         /* __vector __bool char */
   RS6000_BTI_bool_V8HI,          /* __vector __bool short */
   RS6000_BTI_bool_V4SI,          /* __vector __bool int */
+  RS6000_BTI_bool_V2DI,          /* __vector __bool long */
   RS6000_BTI_pixel_V8HI,         /* __vector __pixel */
   RS6000_BTI_long,	         /* long_integer_type_node */
   RS6000_BTI_unsigned_long,      /* long_unsigned_type_node */
@@ -3466,13 +3491,16 @@ enum rs6000_builtin_type_index
 #define unsigned_V16QI_type_node      (rs6000_builtin_types[RS6000_BTI_unsigned_V16QI])
 #define unsigned_V8HI_type_node       (rs6000_builtin_types[RS6000_BTI_unsigned_V8HI])
 #define unsigned_V4SI_type_node       (rs6000_builtin_types[RS6000_BTI_unsigned_V4SI])
+#define unsigned_V2DI_type_node       (rs6000_builtin_types[RS6000_BTI_unsigned_V2DI])
 #define bool_char_type_node           (rs6000_builtin_types[RS6000_BTI_bool_char])
 #define bool_short_type_node          (rs6000_builtin_types[RS6000_BTI_bool_short])
 #define bool_int_type_node            (rs6000_builtin_types[RS6000_BTI_bool_int])
+#define bool_long_type_node           (rs6000_builtin_types[RS6000_BTI_bool_long])
 #define pixel_type_node               (rs6000_builtin_types[RS6000_BTI_pixel])
 #define bool_V16QI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V16QI])
 #define bool_V8HI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V8HI])
 #define bool_V4SI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V4SI])
+#define bool_V2DI_type_node	      (rs6000_builtin_types[RS6000_BTI_bool_V2DI])
 #define pixel_V8HI_type_node	      (rs6000_builtin_types[RS6000_BTI_pixel_V8HI])
 
 #define long_integer_type_internal_node  (rs6000_builtin_types[RS6000_BTI_long])
--- gcc/config/rs6000/altivec.md	(revision 146119)
+++ gcc/config/rs6000/altivec.md	(revision 146798)
@@ -166,12 +166,15 @@ (define_mode_iterator V [V4SI V8HI V16QI
 ;; otherwise handled by altivec (v2df, v2di, ti)
 (define_mode_iterator VM [V4SI V8HI V16QI V4SF V2DF V2DI TI])
 
+;; Like VM, except don't do TImode
+(define_mode_iterator VM2 [V4SI V8HI V16QI V4SF V2DF V2DI])
+
 (define_mode_attr VI_char [(V4SI "w") (V8HI "h") (V16QI "b")])
 
 ;; Vector move instructions.
 (define_insn "*altivec_mov<mode>"
-  [(set (match_operand:V 0 "nonimmediate_operand" "=Z,v,v,*o,*r,*r,v,v")
-	(match_operand:V 1 "input_operand" "v,Z,v,r,o,r,j,W"))]
+  [(set (match_operand:VM2 0 "nonimmediate_operand" "=Z,v,v,*o,*r,*r,v,v")
+	(match_operand:VM2 1 "input_operand" "v,Z,v,r,o,r,j,W"))]
   "VECTOR_MEM_ALTIVEC_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
        || register_operand (operands[1], <MODE>mode))"
@@ -191,6 +194,31 @@ (define_insn "*altivec_mov<mode>"
 }
   [(set_attr "type" "vecstore,vecload,vecsimple,store,load,*,vecsimple,*")])
 
+;; Unlike other altivec moves, allow the GPRs, since a normal use of TImode
+;; is for unions.  However for plain data movement, slightly favor the vector
+;; loads
+(define_insn "*altivec_movti"
+  [(set (match_operand:TI 0 "nonimmediate_operand" "=Z,v,v,?o,?r,?r,v,v")
+	(match_operand:TI 1 "input_operand" "v,Z,v,r,o,r,j,W"))]
+  "VECTOR_MEM_ALTIVEC_P (TImode)
+   && (register_operand (operands[0], TImode) 
+       || register_operand (operands[1], TImode))"
+{
+  switch (which_alternative)
+    {
+    case 0: return "stvx %1,%y0";
+    case 1: return "lvx %0,%y1";
+    case 2: return "vor %0,%1,%1";
+    case 3: return "#";
+    case 4: return "#";
+    case 5: return "#";
+    case 6: return "vxor %0,%0,%0";
+    case 7: return output_vec_const_move (operands);
+    default: gcc_unreachable ();
+    }
+}
+  [(set_attr "type" "vecstore,vecload,vecsimple,store,load,*,vecsimple,*")])
+
 (define_split
   [(set (match_operand:VM 0 "altivec_register_operand" "")
 	(match_operand:VM 1 "easy_vector_constant_add_self" ""))]
@@ -434,13 +462,13 @@ (define_insn "*altivec_gev4sf"
   "vcmpgefp %0,%1,%2"
   [(set_attr "type" "veccmp")])
 
-(define_insn "altivec_vsel<mode>"
+(define_insn "*altivec_vsel<mode>"
   [(set (match_operand:VM 0 "altivec_register_operand" "=v")
 	(if_then_else:VM (ne (match_operand:VM 1 "altivec_register_operand" "v")
 			     (const_int 0))
 			 (match_operand:VM 2 "altivec_register_operand" "v")
 			 (match_operand:VM 3 "altivec_register_operand" "v")))]
-  "VECTOR_UNIT_ALTIVEC_P (<MODE>mode)"
+  "VECTOR_MEM_ALTIVEC_P (<MODE>mode)"
   "vsel %0,%3,%2,%1"
   [(set_attr "type" "vecperm")])
 
@@ -780,7 +808,7 @@ (define_insn "altivec_vmrghw"
 						    (const_int 3)
 						    (const_int 1)]))
 		      (const_int 5)))]
-  "TARGET_ALTIVEC"
+  "VECTOR_MEM_ALTIVEC_P (V4SImode)"
   "vmrghw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
@@ -797,7 +825,7 @@ (define_insn "*altivec_vmrghsf"
                                                     (const_int 3)
                                                     (const_int 1)]))
                       (const_int 5)))]
-  "VECTOR_UNIT_ALTIVEC_P (V4SFmode)"
+  "VECTOR_MEM_ALTIVEC_P (V4SFmode)"
   "vmrghw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
@@ -881,7 +909,7 @@ (define_insn "altivec_vmrglw"
 				     (const_int 1)
 				     (const_int 3)]))
 	 (const_int 5)))]
-  "TARGET_ALTIVEC"
+  "VECTOR_MEM_ALTIVEC_P (V4SImode)"
   "vmrglw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
@@ -899,7 +927,7 @@ (define_insn "*altivec_vmrglsf"
 				     (const_int 1)
 				     (const_int 3)]))
 	 (const_int 5)))]
-  "VECTOR_UNIT_ALTIVEC_P (V4SFmode)"
+  "VECTOR_MEM_ALTIVEC_P (V4SFmode)"
   "vmrglw %0,%1,%2"
   [(set_attr "type" "vecperm")])
 
--- gcc/config/rs6000/rs6000.md	(revision 146119)
+++ gcc/config/rs6000/rs6000.md	(revision 146798)
@@ -14667,7 +14667,11 @@ (define_insn "return"
   [(set_attr "type" "jmpreg")])
 
 (define_expand "indirect_jump"
-  [(set (pc) (match_operand 0 "register_operand" ""))])
+  [(set (pc) (match_operand 0 "register_operand" ""))]
+  ""
+{
+  rs6000_set_indirect_jump ();
+})
 
 (define_insn "*indirect_jump<mode>"
   [(set (pc) (match_operand:P 0 "register_operand" "c,*l"))]
@@ -14682,14 +14686,14 @@ (define_expand "tablejump"
   [(use (match_operand 0 "" ""))
    (use (label_ref (match_operand 1 "" "")))]
   ""
-  "
 {
+  rs6000_set_indirect_jump ();
   if (TARGET_32BIT)
     emit_jump_insn (gen_tablejumpsi (operands[0], operands[1]));
   else
     emit_jump_insn (gen_tablejumpdi (operands[0], operands[1]));
   DONE;
-}")
+})
 
 (define_expand "tablejumpsi"
   [(set (match_dup 3)
@@ -14749,6 +14753,11 @@ (define_expand "doloop_end"
   /* Only use this on innermost loops.  */
   if (INTVAL (operands[3]) > 1)
     FAIL;
+  /* Do not try to use decrement and count on code that has an indirect
+     jump or a table jump, because the ctr register is preferred over the
+     lr register.  */
+  if (rs6000_has_indirect_jump_p ())
+    FAIL;
   if (TARGET_64BIT)
     {
       if (GET_MODE (operands[0]) != DImode)

gcc44-rh503816-1.patch:
 gcc/var-tracking.c  |  370 +++++++++++++++++++++++++++++++++++++---------------
 libiberty/hashtab.c |    3 
 2 files changed, 271 insertions(+), 102 deletions(-)

--- NEW FILE gcc44-rh503816-1.patch ---
2009-06-21  Jakub Jelinek  <jakub at redhat.com>

	* var-tracking.c (struct shared_hash_def, shared_hash): New types.
	(dataflow_set): Change vars type from htab_t to shared_hash.
	(shared_hash_pool, empty_shared_hash): New variables.
	(vars_clear): Removed.
	(shared_hash_shared, shared_hash_htab, shared_hash_copy,
	shared_hash_find_slot_unshare, shared_hash_find_slot,
	shared_hash_find_slot_noinsert, shared_hash_find): New
	static inlines.
	(shared_hash_unshare, shared_hash_destroy): New functions.
	(unshare_variable): Unshare set->vars if shared, use
	shared_hash_htab.
	(vars_copy): Use htab_traverse_noresize instead of htab_traverse.
	(get_init_value, find_src_set_src, dump_dataflow_set,
	clobber_variable_part, emit_notes_for_differences): Use
	shared_hash_htab.
	(dataflow_set_init): Remove second argument, set vars to
	empty_shared_hash instead of creating a new htab.
	(dataflow_set_clear): Call shared_hash_destroy and set vars
	to empty_shared_hash instead of calling vars_clear.
	(dataflow_set_copy): Don't call vars_copy, instead just share
	the src htab with dst.
	(variable_union): Use shared_hash_*, use initially NO_INSERT
	lookup if set->vars is shared.  Don't keep slot cleared before
	calling unshare_variable.  Unshare set->vars if needed.
	Even ->refcount == 1 vars must be unshared if set->vars is shared
	and var needs to be modified.
	(variable_canonicalize): New function.
	(dataflow_set_union): If dst->vars is empty, just share src->vars
	with dst->vars and traverse with variable_canonicalize to canonicalize
	and unshare what is needed.
	(dataflow_set_different): If old_set and new_set use the same shared
	htab, they aren't different.  If number of htab elements is different,
	htabs are different.  Use shared_hash_*.
	(dataflow_set_destroy): Call shared_hash_destroy instead of
	htab_delete.
	(compute_bb_dataflow, emit_notes_in_bb, vt_emit_notes): Don't pass
	second argument to dataflow_set_init.
	(vt_initialize): Likewise.  Initialize shared_hash_pool and
	empty_shared_hash, move bb in/out initialization afterwards.
	Use variable_htab_free instead of NULL as changed_variables del hook.
	(variable_was_changed): Change type of second argument to pointer to
	dataflow_set.  When inserting var into changed_variables, bump
	refcount.  Unshare set->vars if set is shared htab and slot needs to
	be cleared.
	(set_variable_part): Use shared_hash_*, use initially NO_INSERT
	lookup if set->vars is shared.  Unshare set->vars if needed.
	Even ->refcount == 1 vars must be unshared if set->vars is shared
	and var needs to be modified.  Adjust variable_was_changed caller.
	(delete_variable_part): Use shared_hash_*.  Even ->refcount == 1
	vars must be unshared if set->vars is shared and var needs to be
	modified.  Adjust variable_was_changed caller.
	(emit_note_insn_var_location): Don't pool_free var.
	(emit_notes_for_differences_1): Initialize empty_var->refcount to 0
	instead of 1.
	(vt_finalize): Call htab_delete on empty_shared_hash->htab and
	free_alloc_pool on shared_hash_pool.

	* hashtab.c (htab_traverse): Don't call htab_expand for
	nearly empty hashtabs with sizes 7, 13 or 31.

--- gcc/var-tracking.c	(revision 148758)
+++ gcc/var-tracking.c	(revision 148760)
@@ -182,6 +182,17 @@ typedef struct attrs_def
   HOST_WIDE_INT offset;
 } *attrs;
 
+/* Structure holding a refcounted hash table.  If refcount > 1,
+   it must be first unshared before modified.  */
+typedef struct shared_hash_def
+{
+  /* Reference count.  */
+  int refcount;
+
+  /* Actual hash table.  */
+  htab_t htab;
+} *shared_hash;
+
 /* Structure holding the IN or OUT set for a basic block.  */
 typedef struct dataflow_set_def
 {
@@ -192,7 +203,7 @@ typedef struct dataflow_set_def
   attrs regs[FIRST_PSEUDO_REGISTER];
 
   /* Variable locations.  */
-  htab_t vars;
+  shared_hash vars;
 } dataflow_set;
 
 /* The structure (one for each basic block) containing the information
@@ -280,12 +291,18 @@ static alloc_pool var_pool;
 /* Alloc pool for struct location_chain_def.  */
 static alloc_pool loc_chain_pool;
 
+/* Alloc pool for struct shared_hash_def.  */
+static alloc_pool shared_hash_pool;
+
 /* Changed variables, notes will be emitted for them.  */
 static htab_t changed_variables;
 
 /* Shall notes be emitted?  */
 static bool emit_notes;
 
+/* Empty shared hashtable.  */
+static shared_hash empty_shared_hash;
+
 /* Local function prototypes.  */
 static void stack_adjust_offset_pre_post (rtx, HOST_WIDE_INT *,
 					  HOST_WIDE_INT *);
@@ -305,7 +322,6 @@ static void attrs_list_insert (attrs *, 
 static void attrs_list_copy (attrs *, attrs);
 static void attrs_list_union (attrs *, attrs);
 
-static void vars_clear (htab_t);
 static variable unshare_variable (dataflow_set *set, variable var, 
 				  enum var_init_status);
 static int vars_copy_1 (void **, void *);
@@ -321,11 +337,12 @@ static void var_mem_delete_and_set (data
 				    enum var_init_status, rtx);
 static void var_mem_delete (dataflow_set *, rtx, bool);
 
-static void dataflow_set_init (dataflow_set *, int);
+static void dataflow_set_init (dataflow_set *);
 static void dataflow_set_clear (dataflow_set *);
 static void dataflow_set_copy (dataflow_set *, dataflow_set *);
 static int variable_union_info_cmp_pos (const void *, const void *);
 static int variable_union (void **, void *);
+static int variable_canonicalize (void **, void *);
 static void dataflow_set_union (dataflow_set *, dataflow_set *);
 static bool variable_part_different_p (variable_part *, variable_part *);
 static bool variable_different_p (variable, variable, bool);
@@ -352,7 +369,7 @@ static void dump_vars (htab_t);
 static void dump_dataflow_set (dataflow_set *);
 static void dump_dataflow_sets (void);
 
-static void variable_was_changed (variable, htab_t);
+static void variable_was_changed (variable, dataflow_set *);
 static void set_variable_part (dataflow_set *, rtx, tree, HOST_WIDE_INT, 
 			       enum var_init_status, rtx);
 static void clobber_variable_part (dataflow_set *, rtx, tree, HOST_WIDE_INT, 
@@ -742,12 +759,107 @@ attrs_list_union (attrs *dstp, attrs src
     }
 }
 
-/* Delete all variables from hash table VARS.  */
+/* Shared hashtable support.  */
+
+/* Return true if VARS is shared.  */
+
+static inline bool
+shared_hash_shared (shared_hash vars)
+{
+  return vars->refcount > 1;
+}
+
+/* Return the hash table for VARS.  */
+
+static inline htab_t
+shared_hash_htab (shared_hash vars)
+{
+  return vars->htab;
+}
+
+/* Copy variables into a new hash table.  */
+
+static shared_hash
+shared_hash_unshare (shared_hash vars)
+{
+  shared_hash new_vars = (shared_hash) pool_alloc (shared_hash_pool);
+  gcc_assert (vars->refcount > 1);
+  new_vars->refcount = 1;
+  new_vars->htab
+    = htab_create (htab_elements (vars->htab) + 3, variable_htab_hash,
+		   variable_htab_eq, variable_htab_free);
+  vars_copy (new_vars->htab, vars->htab);
+  vars->refcount--;
+  return new_vars;
+}
+
+/* Increment reference counter on VARS and return it.  */
+
+static inline shared_hash
+shared_hash_copy (shared_hash vars)
+{
+  vars->refcount++;
+  return vars;
+}
+
+/* Decrement reference counter and destroy hash table if not shared
+   anymore.  */
 
 static void
-vars_clear (htab_t vars)
+shared_hash_destroy (shared_hash vars)
 {
-  htab_empty (vars);
+  gcc_assert (vars->refcount > 0);
+  if (--vars->refcount == 0)
+    {
+      htab_delete (vars->htab);
+      pool_free (shared_hash_pool, vars);
+    }
+}
+
+/* Unshare *PVARS if shared and return slot for DECL.  If INS is
+   INSERT, insert it if not already present.  */
+
+static inline void **
+shared_hash_find_slot_unshare (shared_hash *pvars, tree decl,
+			       enum insert_option ins)
+{
+  if (shared_hash_shared (*pvars))
+    *pvars = shared_hash_unshare (*pvars);
+  return htab_find_slot_with_hash (shared_hash_htab (*pvars), decl,
+				   VARIABLE_HASH_VAL (decl), ins);
+}
+
+/* Return slot for DECL, if it is already present in the hash table.
+   If it is not present, insert it only VARS is not shared, otherwise
+   return NULL.  */
+
+static inline void **
+shared_hash_find_slot (shared_hash vars, tree decl)
+{
+  return htab_find_slot_with_hash (shared_hash_htab (vars), decl,
+				   VARIABLE_HASH_VAL (decl),
+				   shared_hash_shared (vars)
+				   ? NO_INSERT : INSERT);
+}
+
+/* Return slot for DECL only if it is already present in the hash table.  */
+
+static inline void **
+shared_hash_find_slot_noinsert (shared_hash vars, tree decl)
+{
+  return htab_find_slot_with_hash (shared_hash_htab (vars), decl,
+				   VARIABLE_HASH_VAL (decl), NO_INSERT);
+}
+
+/* Return variable for DECL or NULL if not already present in the hash
+   table.  */
+
+static inline variable
+shared_hash_find (shared_hash vars, tree decl)
+{
+  return (variable)
+	 htab_find_with_hash (shared_hash_htab (vars), decl,
+			      VARIABLE_HASH_VAL (decl));
 }
 
 /* Return a copy of a variable VAR and insert it to dataflow set SET.  */
@@ -801,9 +913,7 @@ unshare_variable (dataflow_set *set, var
 	new_var->var_part[i].cur_loc = NULL;
     }
 
-  slot = htab_find_slot_with_hash (set->vars, new_var->decl,
-				   VARIABLE_HASH_VAL (new_var->decl),
-				   INSERT);
+  slot = shared_hash_find_slot_unshare (&set->vars, new_var->decl, INSERT);
   *slot = new_var;
   return new_var;
 }
@@ -834,8 +944,7 @@ vars_copy_1 (void **slot, void *data)
 static void
 vars_copy (htab_t dst, htab_t src)
 {
-  vars_clear (dst);
-  htab_traverse (src, vars_copy_1, dst);
+  htab_traverse_noresize (src, vars_copy_1, dst);
 }
 
 /* Map a decl to its main debug decl.  */
@@ -874,7 +983,6 @@ var_reg_set (dataflow_set *set, rtx loc,
 static int
 get_init_value (dataflow_set *set, rtx loc, tree decl)
 {
-  void **slot;
   variable var;
   int i;
   int ret_val = VAR_INIT_STATUS_UNKNOWN;
@@ -882,11 +990,9 @@ get_init_value (dataflow_set *set, rtx l
   if (! flag_var_tracking_uninit)
     return VAR_INIT_STATUS_INITIALIZED;
 
-  slot = htab_find_slot_with_hash (set->vars, decl, VARIABLE_HASH_VAL (decl),
-				   NO_INSERT);
-  if (slot)
+  var = shared_hash_find (set->vars, decl);
+  if (var)
     {
-      var = * (variable *) slot;
       for (i = 0; i < var->n_var_parts && ret_val == VAR_INIT_STATUS_UNKNOWN; i++)
 	{
 	  location_chain nextp;
@@ -1050,11 +1156,10 @@ var_mem_delete (dataflow_set *set, rtx l
    VARS_SIZE is the initial size of hash table VARS.  */
 
 static void
-dataflow_set_init (dataflow_set *set, int vars_size)
+dataflow_set_init (dataflow_set *set)
 {
   init_attrs_list_set (set->regs);
-  set->vars = htab_create (vars_size, variable_htab_hash, variable_htab_eq,
-			   variable_htab_free);
+  set->vars = shared_hash_copy (empty_shared_hash);
   set->stack_adjust = 0;
 }
 
@@ -1068,7 +1173,8 @@ dataflow_set_clear (dataflow_set *set)
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     attrs_list_clear (&set->regs[i]);
 
-  vars_clear (set->vars);
+  shared_hash_destroy (set->vars);
+  set->vars = shared_hash_copy (empty_shared_hash);
 }
 
 /* Copy the contents of dataflow set SRC to DST.  */
@@ -1081,7 +1187,8 @@ dataflow_set_copy (dataflow_set *dst, da
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     attrs_list_copy (&dst->regs[i], src->regs[i]);
 
-  vars_copy (dst->vars, src->vars);
+  shared_hash_destroy (dst->vars);
+  dst->vars = shared_hash_copy (src->vars);
   dst->stack_adjust = src->stack_adjust;
 }
 
@@ -1129,15 +1236,14 @@ variable_union_info_cmp_pos (const void 
 static int
 variable_union (void **slot, void *data)
 {
-  variable src, dst, *dstp;
+  variable src, dst;
+  void **dstp;
   dataflow_set *set = (dataflow_set *) data;
   int i, j, k;
 
   src = *(variable *) slot;
-  dstp = (variable *) htab_find_slot_with_hash (set->vars, src->decl,
-						VARIABLE_HASH_VAL (src->decl),
-						INSERT);
-  if (!*dstp)
+  dstp = shared_hash_find_slot (set->vars, src->decl);
+  if (!dstp || !*dstp)
     {
       src->refcount++;
 
@@ -1162,16 +1268,23 @@ variable_union (void **slot, void *data)
 	  if (! flag_var_tracking_uninit)
 	    status = VAR_INIT_STATUS_INITIALIZED;
 
+	  if (dstp)
+	    *dstp = (void *) src;
 	  unshare_variable (set, src, status);
 	}
       else
-	*dstp = src;
+	{
+	  if (!dstp)
+	    dstp = shared_hash_find_slot_unshare (&set->vars, src->decl,
+						  INSERT);
+	  *dstp = (void *) src;
+	}
 
       /* Continue traversing the hash table.  */
       return 1;
     }
   else
-    dst = *dstp;
+    dst = (variable) *dstp;
 
   gcc_assert (src->n_var_parts);
 
@@ -1196,7 +1309,8 @@ variable_union (void **slot, void *data)
      thus there are at most MAX_VAR_PARTS different offsets.  */
   gcc_assert (k <= MAX_VAR_PARTS);
 
-  if (dst->refcount > 1 && dst->n_var_parts != k)
+  if ((dst->refcount > 1 || shared_hash_shared (set->vars))
+      && dst->n_var_parts != k)
     {
       enum var_init_status status = VAR_INIT_STATUS_UNKNOWN;
       
@@ -1226,7 +1340,7 @@ variable_union (void **slot, void *data)
 	  /* If DST is shared compare the location chains.
 	     If they are different we will modify the chain in DST with
 	     high probability so make a copy of DST.  */
-	  if (dst->refcount > 1)
+	  if (dst->refcount > 1 || shared_hash_shared (set->vars))
 	    {
 	      for (node = src->var_part[i].loc_chain,
 		   node2 = dst->var_part[j].loc_chain; node && node2;
@@ -1379,6 +1493,46 @@ variable_union (void **slot, void *data)
   return 1;
 }
 
+/* Like variable_union, but only used when doing dataflow_set_union
+   into an empty hashtab.  To allow sharing, dst is initially shared
+   with src (so all variables are "copied" from src to dst hashtab),
+   so only unshare_variable for variables that need canonicalization
+   are needed.  */
+
+static int
+variable_canonicalize (void **slot, void *data)
+{
+  variable src;
+  dataflow_set *set = (dataflow_set *) data;
+  int k;
+
+  src = *(variable *) slot;
+
+  /* If CUR_LOC of some variable part is not the first element of
+     the location chain we are going to change it so we have to make
+     a copy of the variable.  */
+  for (k = 0; k < src->n_var_parts; k++)
+    {
+      gcc_assert (!src->var_part[k].loc_chain == !src->var_part[k].cur_loc);
+      if (src->var_part[k].loc_chain)
+	{
+	  gcc_assert (src->var_part[k].cur_loc);
+	  if (src->var_part[k].cur_loc != src->var_part[k].loc_chain->loc)
+	    break;
+	}
+    }
+  if (k < src->n_var_parts)
+    {
+      enum var_init_status status = VAR_INIT_STATUS_UNKNOWN;
+
+      if (! flag_var_tracking_uninit)
+	status = VAR_INIT_STATUS_INITIALIZED;
+
+      unshare_variable (set, src, status);
+    }
+  return 1;
+}
+
 /* Compute union of dataflow sets SRC and DST and store it to DST.  */
 
 static void
@@ -1389,7 +1543,14 @@ dataflow_set_union (dataflow_set *dst, d
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     attrs_list_union (&dst->regs[i], src->regs[i]);
 
-  htab_traverse (src->vars, variable_union, dst);
+  if (dst->vars == empty_shared_hash)
+    {
+      shared_hash_destroy (dst->vars);
+      dst->vars = shared_hash_copy (src->vars);
+      htab_traverse (shared_hash_htab (src->vars), variable_canonicalize, dst);
+    }
+  else
+    htab_traverse (shared_hash_htab (src->vars), variable_union, dst);
 }
 
 /* Flag whether two dataflow sets being compared contain different data.  */
@@ -1522,15 +1683,24 @@ dataflow_set_different_2 (void **slot, v
 static bool
 dataflow_set_different (dataflow_set *old_set, dataflow_set *new_set)
 {
+  if (old_set->vars == new_set->vars)
+    return false;
+
+  if (htab_elements (shared_hash_htab (old_set->vars))
+      != htab_elements (shared_hash_htab (new_set->vars)))
+    return true;
+
   dataflow_set_different_value = false;
 
-  htab_traverse (old_set->vars, dataflow_set_different_1, new_set->vars);
+  htab_traverse (shared_hash_htab (old_set->vars), dataflow_set_different_1,
+		 shared_hash_htab (new_set->vars));
   if (!dataflow_set_different_value)
     {
       /* We have compared the variables which are in both hash tables
 	 so now only check whether there are some variables in NEW_SET->VARS
 	 which are not in OLD_SET->VARS.  */
-      htab_traverse (new_set->vars, dataflow_set_different_2, old_set->vars);
+      htab_traverse (shared_hash_htab (new_set->vars), dataflow_set_different_2,
+		     shared_hash_htab (old_set->vars));
     }
   return dataflow_set_different_value;
 }
@@ -1545,7 +1715,7 @@ dataflow_set_destroy (dataflow_set *set)
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     attrs_list_clear (&set->regs[i]);
 
-  htab_delete (set->vars);
+  shared_hash_destroy (set->vars);
   set->vars = NULL;
 }
 
@@ -1985,7 +2155,6 @@ find_src_set_src (dataflow_set *set, rtx
 {
   tree decl = NULL_TREE;   /* The variable being copied around.          */
   rtx set_src = NULL_RTX;  /* The value for "decl" stored in "src".      */
-  void **slot;
   variable var;
   location_chain nextp;
   int i;
@@ -1998,12 +2167,9 @@ find_src_set_src (dataflow_set *set, rtx
 
   if (src && decl)
     {
-      slot = htab_find_slot_with_hash (set->vars, decl, 
-				       VARIABLE_HASH_VAL (decl), NO_INSERT);
-
-      if (slot)
+      var = shared_hash_find (set->vars, decl);
+      if (var)
 	{
-	  var = *(variable *) slot;
 	  found = false;
 	  for (i = 0; i < var->n_var_parts && !found; i++)
 	    for (nextp = var->var_part[i].loc_chain; nextp && !found; 
@@ -2031,7 +2197,7 @@ compute_bb_dataflow (basic_block bb)
   dataflow_set *in = &VTI (bb)->in;
   dataflow_set *out = &VTI (bb)->out;
 
-  dataflow_set_init (&old_out, htab_elements (VTI (bb)->out.vars) + 3);
+  dataflow_set_init (&old_out);
   dataflow_set_copy (&old_out, out);
   dataflow_set_copy (out, in);
 
@@ -2323,7 +2489,7 @@ dump_dataflow_set (dataflow_set *set)
 	  dump_attrs_list (set->regs[i]);
 	}
     }
-  dump_vars (set->vars);
+  dump_vars (shared_hash_htab (set->vars));
   fprintf (dump_file, "\n");
 }
 
@@ -2345,10 +2511,10 @@ dump_dataflow_sets (void)
 }
 
 /* Add variable VAR to the hash table of changed variables and
-   if it has no locations delete it from hash table HTAB.  */
+   if it has no locations delete it from SET's hash table.  */
 
 static void
-variable_was_changed (variable var, htab_t htab)
+variable_was_changed (variable var, dataflow_set *set)
 {
   hashval_t hash = VARIABLE_HASH_VAL (var->decl);
 
@@ -2359,36 +2525,39 @@ variable_was_changed (variable var, htab
       slot = (variable *) htab_find_slot_with_hash (changed_variables,
 						    var->decl, hash, INSERT);
 
-      if (htab && var->n_var_parts == 0)
+      if (set && var->n_var_parts == 0)
 	{
 	  variable empty_var;
-	  void **old;
 
 	  empty_var = (variable) pool_alloc (var_pool);
 	  empty_var->decl = var->decl;
 	  empty_var->refcount = 1;
 	  empty_var->n_var_parts = 0;
 	  *slot = empty_var;
-
-	  old = htab_find_slot_with_hash (htab, var->decl, hash,
-					  NO_INSERT);
-	  if (old)
-	    htab_clear_slot (htab, old);
+	  goto drop_var;
 	}
       else
 	{
+	  var->refcount++;
 	  *slot = var;
 	}
     }
   else
     {
-      gcc_assert (htab);
+      gcc_assert (set);
       if (var->n_var_parts == 0)
 	{
-	  void **slot = htab_find_slot_with_hash (htab, var->decl, hash,
-						  NO_INSERT);
+	  void **slot;
+
+	drop_var:
+	  slot = shared_hash_find_slot_noinsert (set->vars, var->decl);
 	  if (slot)
-	    htab_clear_slot (htab, slot);
+	    {
+	      if (shared_hash_shared (set->vars))
+		slot = shared_hash_find_slot_unshare (&set->vars, var->decl,
+						      NO_INSERT);
+	      htab_clear_slot (shared_hash_htab (set->vars), slot);
+	    }
 	}
     }
 }
@@ -2438,12 +2607,12 @@ set_variable_part (dataflow_set *set, rt
   location_chain node, next;
   location_chain *nextp;
   variable var;
-  void **slot;
-  
-  slot = htab_find_slot_with_hash (set->vars, decl,
-				   VARIABLE_HASH_VAL (decl), INSERT);
-  if (!*slot)
+  void **slot = shared_hash_find_slot (set->vars, decl);
+
+  if (!slot || !*slot)
     {
+      if (!slot)
+	slot = shared_hash_find_slot_unshare (&set->vars, decl, INSERT);
       /* Create new variable information.  */
       var = (variable) pool_alloc (var_pool);
       var->decl = decl;
@@ -2479,13 +2648,12 @@ set_variable_part (dataflow_set *set, rt
 	      if (set_src != NULL)
 		node->set_src = set_src;
 
-	      *slot = var;
 	      return;
 	    }
 	  else
 	    {
 	      /* We have to make a copy of a shared variable.  */
-	      if (var->refcount > 1)
+	      if (var->refcount > 1 || shared_hash_shared (set->vars))
 		var = unshare_variable (set, var, initialized);
 	    }
 	}
@@ -2494,7 +2662,7 @@ set_variable_part (dataflow_set *set, rt
 	  /* We have not found the location part, new one will be created.  */
 
 	  /* We have to make a copy of the shared variable.  */
-	  if (var->refcount > 1)
+	  if (var->refcount > 1 || shared_hash_shared (set->vars))
 	    var = unshare_variable (set, var, initialized);
 
 	  /* We track only variables whose size is <= MAX_VAR_PARTS bytes
@@ -2548,7 +2716,7 @@ set_variable_part (dataflow_set *set, rt
   if (var->var_part[pos].cur_loc == NULL)
     {
       var->var_part[pos].cur_loc = loc;
-      variable_was_changed (var, set->vars);
+      variable_was_changed (var, set);
     }
 }
 
@@ -2561,16 +2729,14 @@ static void
 clobber_variable_part (dataflow_set *set, rtx loc, tree decl,
 		       HOST_WIDE_INT offset, rtx set_src)
 {
-  void **slot;
+  variable var;
 
   if (! decl || ! DECL_P (decl))
     return;
 
-  slot = htab_find_slot_with_hash (set->vars, decl, VARIABLE_HASH_VAL (decl),
-				   NO_INSERT);
-  if (slot)
+  var = shared_hash_find (set->vars, decl);
+  if (var)
     {
-      variable var = (variable) *slot;
       int pos = find_variable_location_part (var, offset, NULL);
 
       if (pos >= 0)
@@ -2627,13 +2793,9 @@ static void
 delete_variable_part (dataflow_set *set, rtx loc, tree decl,
 		      HOST_WIDE_INT offset)
 {
-  void **slot;
-    
-  slot = htab_find_slot_with_hash (set->vars, decl, VARIABLE_HASH_VAL (decl),
-				   NO_INSERT);
-  if (slot)
+  variable var = shared_hash_find (set->vars, decl);;
+  if (var)
     {
-      variable var = (variable) *slot;
       int pos = find_variable_location_part (var, offset, NULL);
 
       if (pos >= 0)
@@ -2642,7 +2804,7 @@ delete_variable_part (dataflow_set *set,
 	  location_chain *nextp;
 	  bool changed;
 
-	  if (var->refcount > 1)
+	  if (var->refcount > 1 || shared_hash_shared (set->vars))
 	    {
 	      /* If the variable contains the location part we have to
 		 make a copy of the variable.  */
@@ -2705,7 +2867,7 @@ delete_variable_part (dataflow_set *set,
 		}
 	    }
 	  if (changed)
-	    variable_was_changed (var, set->vars);
+	    variable_was_changed (var, set);
 	}
     }
 }
@@ -2864,14 +3026,6 @@ emit_note_insn_var_location (void **varp
 
   htab_clear_slot (changed_variables, varp);
 
-  /* When there are no location parts the variable has been already
-     removed from hash table and a new empty variable was created.
-     Free the empty variable.  */
-  if (var->n_var_parts == 0)
-    {
-      pool_free (var_pool, var);
-    }
-
   /* Continue traversing the hash table.  */
   return 1;
 }
@@ -2910,7 +3064,7 @@ emit_notes_for_differences_1 (void **slo
 
       empty_var = (variable) pool_alloc (var_pool);
       empty_var->decl = old_var->decl;
-      empty_var->refcount = 1;
+      empty_var->refcount = 0;
       empty_var->n_var_parts = 0;
       variable_was_changed (empty_var, NULL);
     }
@@ -2952,8 +3106,12 @@ static void
 emit_notes_for_differences (rtx insn, dataflow_set *old_set,
 			    dataflow_set *new_set)
 {
-  htab_traverse (old_set->vars, emit_notes_for_differences_1, new_set->vars);
-  htab_traverse (new_set->vars, emit_notes_for_differences_2, old_set->vars);
+  htab_traverse (shared_hash_htab (old_set->vars),
+		 emit_notes_for_differences_1,
+		 shared_hash_htab (new_set->vars));
+  htab_traverse (shared_hash_htab (new_set->vars),
+		 emit_notes_for_differences_2,
+		 shared_hash_htab (old_set->vars));
   emit_notes_for_changes (insn, EMIT_NOTE_BEFORE_INSN);
 }
 
@@ -2965,7 +3123,7 @@ emit_notes_in_bb (basic_block bb)
   int i;
   dataflow_set set;
 
-  dataflow_set_init (&set, htab_elements (VTI (bb)->in.vars) + 3);
+  dataflow_set_init (&set);
   dataflow_set_copy (&set, &VTI (bb)->in);
 
   for (i = 0; i < VTI (bb)->n_mos; i++)
@@ -3098,7 +3256,7 @@ vt_emit_notes (void)
      delete_variable_part).  */
   emit_notes = true;
 
-  dataflow_set_init (&empty, 7);
+  dataflow_set_init (&empty);
   last_out = &empty;
 
   FOR_EACH_BB (bb)
@@ -3343,14 +3501,6 @@ vt_initialize (void)
 	}
     }
 
-  /* Init the IN and OUT sets.  */
-  FOR_ALL_BB (bb)
-    {
-      VTI (bb)->visited = false;
-      dataflow_set_init (&VTI (bb)->in, 7);
-      dataflow_set_init (&VTI (bb)->out, 7);
-    }
-
   attrs_pool = create_alloc_pool ("attrs_def pool",
 				  sizeof (struct attrs_def), 1024);
   var_pool = create_alloc_pool ("variable_def pool",
@@ -3358,8 +3508,24 @@ vt_initialize (void)
   loc_chain_pool = create_alloc_pool ("location_chain_def pool",
 				      sizeof (struct location_chain_def),
 				      1024);
+  shared_hash_pool = create_alloc_pool ("shared_hash_def pool",
+					sizeof (struct shared_hash_def), 256);
+  empty_shared_hash = (shared_hash) pool_alloc (shared_hash_pool);
+  empty_shared_hash->refcount = 1;
+  empty_shared_hash->htab
+    = htab_create (1, variable_htab_hash, variable_htab_eq,
+		   variable_htab_free);
   changed_variables = htab_create (10, variable_htab_hash, variable_htab_eq,
-				   NULL);
+				   variable_htab_free);
+
+  /* Init the IN and OUT sets.  */
+  FOR_ALL_BB (bb)
+    {
+      VTI (bb)->visited = false;
+      dataflow_set_init (&VTI (bb)->in);
+      dataflow_set_init (&VTI (bb)->out);
+    }
+
   vt_add_function_parameters ();
 }
 
@@ -3381,10 +3547,12 @@ vt_finalize (void)
       dataflow_set_destroy (&VTI (bb)->out);
     }
   free_aux_for_blocks ();
+  htab_delete (empty_shared_hash->htab);
+  htab_delete (changed_variables);
   free_alloc_pool (attrs_pool);
   free_alloc_pool (var_pool);
   free_alloc_pool (loc_chain_pool);
-  htab_delete (changed_variables);
+  free_alloc_pool (shared_hash_pool);
 }
 
 /* The entry point to variable tracking pass.  */
--- libiberty/hashtab.c	(revision 148758)
+++ libiberty/hashtab.c	(revision 148760)
@@ -759,7 +759,8 @@ htab_traverse_noresize (htab_t htab, hta
 void
 htab_traverse (htab_t htab, htab_trav callback, PTR info)
 {
-  if (htab_elements (htab) * 8 < htab_size (htab))
+  size_t size = htab_size (htab);
+  if (htab_elements (htab) * 8 < size && size > 32)
     htab_expand (htab);
 
   htab_traverse_noresize (htab, callback, info);

gcc44-rh503816-2.patch:
 var-tracking.c |  318 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 176 insertions(+), 142 deletions(-)

--- NEW FILE gcc44-rh503816-2.patch ---
2009-06-23  Jakub Jelinek  <jakub at redhat.com>

	* var-tracking.c (unshare_variable): Force initialized to
	be VAR_INIT_STATUS_INITIALIZED unless flag_var_tracking_uninit.
	(set_variable_part): Likewise.
	(struct variable_union_info): Remove pos_src field.
	(vui_vec, vui_allocated): New variables.
	(variable_union): Pass VAR_INIT_STATUS_UNKNOWN to unshare_variable
	unconditionally.  Avoid XCVECNEW/free for every sorting, for dst_l
	== 1 use a simpler sorting algorithm.  Compute pos field right
	away, don't fill in pos_src.  For dst_l == 2 avoid qsort.
	Avoid quadratic comparison if !flag_var_tracking_uninit.
	(variable_canonicalize): Pass VAR_INIT_STATUS_UNKNOWN to
	unshare_variable unconditionally.   
	(dataflow_set_different_2): Removed.
	(dataflow_set_different): Don't traverse second hash table.
	(compute_bb_dataflow): Pass VAR_INIT_STATUS_UNINITIALIZED
	unconditionally to var_reg_set or var_mem_set.
	(emit_notes_in_bb): Likewise.
	(delete_variable_part): Pass VAR_INIT_STATUS_UNKNOWN to
	unshare_variable.
	(emit_note_insn_var_location): Don't set initialized to
	VAR_INIT_STATUS_INITIALIZED early.
	(vt_finalize): Free vui_vec if needed, clear vui_vec and
	vui_allocated.

--- gcc/var-tracking.c	(revision 148851)
+++ gcc/var-tracking.c	(revision 148852)
@@ -347,7 +347,6 @@ static void dataflow_set_union (dataflow
 static bool variable_part_different_p (variable_part *, variable_part *);
 static bool variable_different_p (variable, variable, bool);
 static int dataflow_set_different_1 (void **, void *);
-static int dataflow_set_different_2 (void **, void *);
 static bool dataflow_set_different (dataflow_set *, dataflow_set *);
 static void dataflow_set_destroy (dataflow_set *);
 
@@ -878,6 +877,9 @@ unshare_variable (dataflow_set *set, var
   var->refcount--;
   new_var->n_var_parts = var->n_var_parts;
 
+  if (! flag_var_tracking_uninit)
+    initialized = VAR_INIT_STATUS_INITIALIZED;
+
   for (i = 0; i < var->n_var_parts; i++)
     {
       location_chain node;
@@ -1202,11 +1204,14 @@ struct variable_union_info
   /* The sum of positions in the input chains.  */
   int pos;
 
-  /* The position in the chains of SRC and DST dataflow sets.  */
-  int pos_src;
+  /* The position in the chain of DST dataflow set.  */
   int pos_dst;
 };
 
+/* Buffer for location list sorting and its allocated size.  */
+static struct variable_union_info *vui_vec;
+static int vui_allocated;
+
 /* Compare function for qsort, order the structures by POS element.  */
 
 static int
@@ -1263,14 +1268,9 @@ variable_union (void **slot, void *data)
 	}
       if (k < src->n_var_parts)
 	{
-	  enum var_init_status status = VAR_INIT_STATUS_UNKNOWN;
-	  
-	  if (! flag_var_tracking_uninit)
-	    status = VAR_INIT_STATUS_INITIALIZED;
-
 	  if (dstp)
 	    *dstp = (void *) src;
-	  unshare_variable (set, src, status);
+	  unshare_variable (set, src, VAR_INIT_STATUS_UNKNOWN);
 	}
       else
 	{
@@ -1311,13 +1311,7 @@ variable_union (void **slot, void *data)
 
   if ((dst->refcount > 1 || shared_hash_shared (set->vars))
       && dst->n_var_parts != k)
-    {
-      enum var_init_status status = VAR_INIT_STATUS_UNKNOWN;
-      
-      if (! flag_var_tracking_uninit)
-	status = VAR_INIT_STATUS_INITIALIZED;
-      dst = unshare_variable (set, dst, status);
-    }
+    dst = unshare_variable (set, dst, VAR_INIT_STATUS_UNKNOWN);
 
   i = src->n_var_parts - 1;
   j = dst->n_var_parts - 1;
@@ -1366,70 +1360,152 @@ variable_union (void **slot, void *data)
 	  dst_l = 0;
 	  for (node = dst->var_part[j].loc_chain; node; node = node->next)
 	    dst_l++;
-	  vui = XCNEWVEC (struct variable_union_info, src_l + dst_l);
 
-	  /* Fill in the locations from DST.  */
-	  for (node = dst->var_part[j].loc_chain, jj = 0; node;
-	       node = node->next, jj++)
+	  if (dst_l == 1)
 	    {
-	      vui[jj].lc = node;
-	      vui[jj].pos_dst = jj;
+	      /* The most common case, much simpler, no qsort is needed.  */
+	      location_chain dstnode = dst->var_part[j].loc_chain;
+	      dst->var_part[k].loc_chain = dstnode;
+	      dst->var_part[k].offset = dst->var_part[j].offset;
+	      node2 = dstnode;
+	      for (node = src->var_part[i].loc_chain; node; node = node->next)
+		if (!((REG_P (dstnode->loc)
+		       && REG_P (node->loc)
+		       && REGNO (dstnode->loc) == REGNO (node->loc))
+		      || rtx_equal_p (dstnode->loc, node->loc)))
+		  {
+		    location_chain new_node;
 
-	      /* Value larger than a sum of 2 valid positions.  */
-	      vui[jj].pos_src = src_l + dst_l;
+		    /* Copy the location from SRC.  */
+		    new_node = (location_chain) pool_alloc (loc_chain_pool);
+		    new_node->loc = node->loc;
+		    new_node->init = node->init;
+		    if (!node->set_src || MEM_P (node->set_src))
+		      new_node->set_src = NULL;
+		    else
+		      new_node->set_src = node->set_src;
+		    node2->next = new_node;
+		    node2 = new_node;
+		  }
+	      node2->next = NULL;
 	    }
-
-	  /* Fill in the locations from SRC.  */
-	  n = dst_l;
-	  for (node = src->var_part[i].loc_chain, ii = 0; node;
-	       node = node->next, ii++)
+	  else
 	    {
-	      /* Find location from NODE.  */
-	      for (jj = 0; jj < dst_l; jj++)
+	      if (src_l + dst_l > vui_allocated)
 		{
-		  if ((REG_P (vui[jj].lc->loc)
-		       && REG_P (node->loc)
-		       && REGNO (vui[jj].lc->loc) == REGNO (node->loc))
-		      || rtx_equal_p (vui[jj].lc->loc, node->loc))
-		    {
-		      vui[jj].pos_src = ii;
-		      break;
-		    }
+		  vui_allocated = MAX (vui_allocated * 2, src_l + dst_l);
+		  vui_vec = XRESIZEVEC (struct variable_union_info, vui_vec,
+					vui_allocated);
 		}
-	      if (jj >= dst_l)	/* The location has not been found.  */
+	      vui = vui_vec;
+
+	      /* Fill in the locations from DST.  */
+	      for (node = dst->var_part[j].loc_chain, jj = 0; node;
+		   node = node->next, jj++)
 		{
-		  location_chain new_node;
+		  vui[jj].lc = node;
+		  vui[jj].pos_dst = jj;
 
-		  /* Copy the location from SRC.  */
-		  new_node = (location_chain) pool_alloc (loc_chain_pool);
-		  new_node->loc = node->loc;
-		  new_node->init = node->init;
-		  if (!node->set_src || MEM_P (node->set_src))
-		    new_node->set_src = NULL;
-		  else
-		    new_node->set_src = node->set_src;
-		  vui[n].lc = new_node;
-		  vui[n].pos_src = ii;
-		  vui[n].pos_dst = src_l + dst_l;
-		  n++;
+		  /* Pos plus value larger than a sum of 2 valid positions.  */
+		  vui[jj].pos = jj + src_l + dst_l;
 		}
-	    }
 
-	  for (ii = 0; ii < src_l + dst_l; ii++)
-	    vui[ii].pos = vui[ii].pos_src + vui[ii].pos_dst;
+	      /* Fill in the locations from SRC.  */
+	      n = dst_l;
+	      for (node = src->var_part[i].loc_chain, ii = 0; node;
+		   node = node->next, ii++)
+		{
+		  /* Find location from NODE.  */
+		  for (jj = 0; jj < dst_l; jj++)
+		    {
+		      if ((REG_P (vui[jj].lc->loc)
+			   && REG_P (node->loc)
+			   && REGNO (vui[jj].lc->loc) == REGNO (node->loc))
+			  || rtx_equal_p (vui[jj].lc->loc, node->loc))
+			{
+			  vui[jj].pos = jj + ii;
+			  break;
+			}
+		    }
+		  if (jj >= dst_l)	/* The location has not been found.  */
+		    {
+		      location_chain new_node;
 
-	  qsort (vui, n, sizeof (struct variable_union_info),
-		 variable_union_info_cmp_pos);
+		      /* Copy the location from SRC.  */
+		      new_node = (location_chain) pool_alloc (loc_chain_pool);
+		      new_node->loc = node->loc;
+		      new_node->init = node->init;
+		      if (!node->set_src || MEM_P (node->set_src))
+			new_node->set_src = NULL;
+		      else
+			new_node->set_src = node->set_src;
+		      vui[n].lc = new_node;
+		      vui[n].pos_dst = src_l + dst_l;
+		      vui[n].pos = ii + src_l + dst_l;
+		      n++;
+		    }
+		}
 
-	  /* Reconnect the nodes in sorted order.  */
-	  for (ii = 1; ii < n; ii++)
-	    vui[ii - 1].lc->next = vui[ii].lc;
-	  vui[n - 1].lc->next = NULL;
+	      if (dst_l == 2)
+		{
+		  /* Special case still very common case.  For dst_l == 2
+		     all entries dst_l ... n-1 are sorted, with for i >= dst_l
+		     vui[i].pos == i + src_l + dst_l.  */
+		  if (vui[0].pos > vui[1].pos)
+		    {
+		      /* Order should be 1, 0, 2... */
+		      dst->var_part[k].loc_chain = vui[1].lc;
+		      vui[1].lc->next = vui[0].lc;
+		      if (n >= 3)
+			{
+			  vui[0].lc->next = vui[2].lc;
+			  vui[n - 1].lc->next = NULL;
+			}
+		      else
+			vui[0].lc->next = NULL;
+		      ii = 3;
+		    }
+		  else
+		    {
+		      dst->var_part[k].loc_chain = vui[0].lc;
+		      if (n >= 3 && vui[2].pos < vui[1].pos)
+			{
+			  /* Order should be 0, 2, 1, 3... */
+			  vui[0].lc->next = vui[2].lc;
+			  vui[2].lc->next = vui[1].lc;
+			  if (n >= 4)
+			    {
+			      vui[1].lc->next = vui[3].lc;
+			      vui[n - 1].lc->next = NULL;
+			    }
+			  else
+			    vui[1].lc->next = NULL;
+			  ii = 4;
+			}
+		      else
+			{
+			  /* Order should be 0, 1, 2... */
+			  ii = 1;
+			  vui[n - 1].lc->next = NULL;
+			}
+		    }
+		  for (; ii < n; ii++)
+		    vui[ii - 1].lc->next = vui[ii].lc;
+		}
+	      else
+		{
+		  qsort (vui, n, sizeof (struct variable_union_info),
+			 variable_union_info_cmp_pos);
 
-	  dst->var_part[k].loc_chain = vui[0].lc;
-	  dst->var_part[k].offset = dst->var_part[j].offset;
+		  /* Reconnect the nodes in sorted order.  */
+		  for (ii = 1; ii < n; ii++)
+		    vui[ii - 1].lc->next = vui[ii].lc;
+		  vui[n - 1].lc->next = NULL;
+		  dst->var_part[k].loc_chain = vui[0].lc;
+		}
 
-	  free (vui);
+	      dst->var_part[k].offset = dst->var_part[j].offset;
+	    }
 	  i--;
 	  j--;
 	}
@@ -1477,17 +1553,18 @@ variable_union (void **slot, void *data)
 	dst->var_part[k].cur_loc = NULL;
     }
 
-  for (i = 0; i < src->n_var_parts && i < dst->n_var_parts; i++)
-    {
-      location_chain node, node2;
-      for (node = src->var_part[i].loc_chain; node; node = node->next)
-	for (node2 = dst->var_part[i].loc_chain; node2; node2 = node2->next)
-	  if (rtx_equal_p (node->loc, node2->loc))
-	    {
-	      if (node->init > node2->init)
-		node2->init = node->init;
-	    }
-    }
+  if (flag_var_tracking_uninit)
+    for (i = 0; i < src->n_var_parts && i < dst->n_var_parts; i++)
+      {
+	location_chain node, node2;
+	for (node = src->var_part[i].loc_chain; node; node = node->next)
+	  for (node2 = dst->var_part[i].loc_chain; node2; node2 = node2->next)
+	    if (rtx_equal_p (node->loc, node2->loc))
+	      {
+		if (node->init > node2->init)
+		  node2->init = node->init;
+	      }
+      }
 
   /* Continue traversing the hash table.  */
   return 1;
@@ -1522,14 +1599,7 @@ variable_canonicalize (void **slot, void
 	}
     }
   if (k < src->n_var_parts)
-    {
-      enum var_init_status status = VAR_INIT_STATUS_UNKNOWN;
-
-      if (! flag_var_tracking_uninit)
-	status = VAR_INIT_STATUS_INITIALIZED;
-
-      unshare_variable (set, src, status);
-    }
+    unshare_variable (set, src, VAR_INIT_STATUS_UNKNOWN);
   return 1;
 }
 
@@ -1650,34 +1720,6 @@ dataflow_set_different_1 (void **slot, v
   return 1;
 }
 
-/* Compare variable *SLOT with the same variable in hash table DATA
-   and set DATAFLOW_SET_DIFFERENT_VALUE if they are different.  */
-
-static int
-dataflow_set_different_2 (void **slot, void *data)
-{
-  htab_t htab = (htab_t) data;
-  variable var1, var2;
-
-  var1 = *(variable *) slot;
-  var2 = (variable) htab_find_with_hash (htab, var1->decl,
-			      VARIABLE_HASH_VAL (var1->decl));
-  if (!var2)
-    {
-      dataflow_set_different_value = true;
-
-      /* Stop traversing the hash table.  */
-      return 0;
-    }
-
-  /* If both variables are defined they have been already checked for
-     equivalence.  */
-  gcc_assert (!variable_different_p (var1, var2, false));
-
-  /* Continue traversing the hash table.  */
-  return 1;
-}
-
 /* Return true if dataflow sets OLD_SET and NEW_SET differ.  */
 
 static bool
@@ -1694,14 +1736,9 @@ dataflow_set_different (dataflow_set *ol
 
   htab_traverse (shared_hash_htab (old_set->vars), dataflow_set_different_1,
 		 shared_hash_htab (new_set->vars));
-  if (!dataflow_set_different_value)
-    {
-      /* We have compared the variables which are in both hash tables
-	 so now only check whether there are some variables in NEW_SET->VARS
-	 which are not in OLD_SET->VARS.  */
-      htab_traverse (shared_hash_htab (new_set->vars), dataflow_set_different_2,
-		     shared_hash_htab (old_set->vars));
-    }
+  /* No need to traverse the second hashtab, if both have the same number
+     of elements and the second one had all entries found in the first one,
+     then it can't have any extra entries.  */
   return dataflow_set_different_value;
 }
 
@@ -2215,15 +2252,11 @@ compute_bb_dataflow (basic_block bb)
 	  case MO_USE:
 	    {
 	      rtx loc = VTI (bb)->mos[i].u.loc;
-	      enum var_init_status status = VAR_INIT_STATUS_UNINITIALIZED;
-
-	      if (! flag_var_tracking_uninit)
-		status = VAR_INIT_STATUS_INITIALIZED;
 
 	      if (GET_CODE (loc) == REG)
-		var_reg_set (out, loc, status, NULL);
+		var_reg_set (out, loc, VAR_INIT_STATUS_UNINITIALIZED, NULL);
 	      else if (GET_CODE (loc) == MEM)
-		var_mem_set (out, loc, status, NULL);
+		var_mem_set (out, loc, VAR_INIT_STATUS_UNINITIALIZED, NULL);
 	    }
 	    break;
 
@@ -2262,10 +2295,12 @@ compute_bb_dataflow (basic_block bb)
 	      if (! flag_var_tracking_uninit)
 		src_status = VAR_INIT_STATUS_INITIALIZED;
 	      else
-		src_status = find_src_status (in, set_src);
+		{
+		  src_status = find_src_status (in, set_src);
 
-	      if (src_status == VAR_INIT_STATUS_UNKNOWN)
-		src_status = find_src_status (out, set_src);
+		  if (src_status == VAR_INIT_STATUS_UNKNOWN)
+		    src_status = find_src_status (out, set_src);
+		}
 
 	      set_src = find_src_set_src (in, set_src);
 
@@ -2609,6 +2644,9 @@ set_variable_part (dataflow_set *set, rt
   variable var;
   void **slot = shared_hash_find_slot (set->vars, decl);
 
+  if (! flag_var_tracking_uninit)
+    initialized = VAR_INIT_STATUS_INITIALIZED;
+
   if (!slot || !*slot)
     {
       if (!slot)
@@ -2815,10 +2853,8 @@ delete_variable_part (dataflow_set *set,
 		       && REGNO (node->loc) == REGNO (loc))
 		      || rtx_equal_p (node->loc, loc))
 		    {
-		      enum var_init_status status = VAR_INIT_STATUS_UNKNOWN;
-		      if (! flag_var_tracking_uninit)
-			status = VAR_INIT_STATUS_INITIALIZED;
-		      var = unshare_variable (set, var, status);
+		      var = unshare_variable (set, var,
+					      VAR_INIT_STATUS_UNKNOWN);
 		      break;
 		    }
 		}
@@ -2893,9 +2929,6 @@ emit_note_insn_var_location (void **varp
 
   gcc_assert (var->decl);
 
-  if (! flag_var_tracking_uninit)
-    initialized = VAR_INIT_STATUS_INITIALIZED;
-
   complete = true;
   last_limit = 0;
   n_var_parts = 0;
@@ -3148,14 +3181,11 @@ emit_notes_in_bb (basic_block bb)
 	  case MO_USE:
 	    {
 	      rtx loc = VTI (bb)->mos[i].u.loc;
-      
-	      enum var_init_status status = VAR_INIT_STATUS_UNINITIALIZED;
-	      if (! flag_var_tracking_uninit)
-		status = VAR_INIT_STATUS_INITIALIZED;
+
 	      if (GET_CODE (loc) == REG)
-		var_reg_set (&set, loc, status, NULL);
+		var_reg_set (&set, loc, VAR_INIT_STATUS_UNINITIALIZED, NULL);
 	      else
-		var_mem_set (&set, loc, status, NULL);
+		var_mem_set (&set, loc, VAR_INIT_STATUS_UNINITIALIZED, NULL);
 
 	      emit_notes_for_changes (insn, EMIT_NOTE_AFTER_INSN);
 	    }
@@ -3553,6 +3583,10 @@ vt_finalize (void)
   free_alloc_pool (var_pool);
   free_alloc_pool (loc_chain_pool);
   free_alloc_pool (shared_hash_pool);
+  if (vui_vec)
+    free (vui_vec);
+  vui_vec = NULL;
+  vui_allocated = 0;
 }
 
 /* The entry point to variable tracking pass.  */

gcc44-unique-object.patch:
 config.in      |    6 ++++++
 config/elfos.h |   49 +++++++++++++++++++++++++++++++------------------
 configure      |   38 ++++++++++++++++++++++++++++++++++++++
 configure.ac   |    6 ++++++
 4 files changed, 81 insertions(+), 18 deletions(-)

--- NEW FILE gcc44-unique-object.patch ---
2009-07-22  Jason Merrill  <jason at redhat.com>

	* config/elfos.h (ASM_DECLARE_OBJECT_NAME): Use gnu_unique_object
	type if available.
	* configure.ac: Test for it.
	* configure, config.in: Regenerate.

--- gcc/config/elfos.h.jj	2009-04-14 15:51:24.000000000 +0200
+++ gcc/config/elfos.h	2009-07-23 09:25:46.000000000 +0200
@@ -289,24 +289,37 @@ see the files COPYING3 and COPYING.RUNTI
 
 /* Write the extra assembler code needed to declare an object properly.  */
 
-#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)		\
-  do								\
-    {								\
-      HOST_WIDE_INT size;					\
-								\
-      ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object");		\
-								\
-      size_directive_output = 0;				\
-      if (!flag_inhibit_size_directive				\
-	  && (DECL) && DECL_SIZE (DECL))			\
-	{							\
-	  size_directive_output = 1;				\
-	  size = int_size_in_bytes (TREE_TYPE (DECL));		\
-	  ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size);		\
-	}							\
-								\
-      ASM_OUTPUT_LABEL (FILE, NAME);				\
-    }								\
+#ifdef HAVE_GAS_GNU_UNIQUE_OBJECT
+#define USE_GNU_UNIQUE_OBJECT 1
+#else
+#define USE_GNU_UNIQUE_OBJECT 0
+#endif
+
+#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)			\
+  do									\
+    {									\
+      HOST_WIDE_INT size;						\
+									\
+      /* For template static data member instantiations or		\
+	 inline fn local statics, use gnu_unique_object so that		\
+	 they will be combined even under RTLD_LOCAL.  */		\
+      if (USE_GNU_UNIQUE_OBJECT						\
+	  && !DECL_ARTIFICIAL (DECL) && DECL_ONE_ONLY (DECL))		\
+	ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "gnu_unique_object");	\
+      else								\
+	ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object");		\
+									\
+      size_directive_output = 0;					\
+      if (!flag_inhibit_size_directive					\
+	  && (DECL) && DECL_SIZE (DECL))				\
+	{								\
+	  size_directive_output = 1;					\
+	  size = int_size_in_bytes (TREE_TYPE (DECL));			\
+	  ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size);			\
+	}								\
+									\
+      ASM_OUTPUT_LABEL (FILE, NAME);					\
+    }									\
   while (0)
 
 /* Output the size directive for a decl in rest_of_decl_compilation
--- gcc/configure.ac.jj	2009-03-28 09:53:59.000000000 +0100
+++ gcc/configure.ac	2009-07-23 09:25:46.000000000 +0200
@@ -3299,6 +3299,12 @@ gcc_GAS_CHECK_FEATURE([.lcomm with align
 [AC_DEFINE(HAVE_GAS_LCOMM_WITH_ALIGNMENT, 1,
   [Define if your assembler supports .lcomm with an alignment field.])])
 
+gcc_GAS_CHECK_FEATURE([gnu_unique_object], gcc_cv_as_gnu_unique_object,
+ [elf,2,19,52],,
+[.type foo, @gnu_unique_object],,
+[AC_DEFINE(HAVE_GAS_GNU_UNIQUE_OBJECT, 1,
+  [Define if your assembler supports @gnu_unique_object.])])
+
 AC_CACHE_CHECK([assembler for tolerance to line number 0],
  [gcc_cv_as_line_zero],
  [gcc_cv_as_line_zero=no
--- gcc/configure.jj	2009-03-28 09:53:37.000000000 +0100
+++ gcc/configure	2009-07-23 09:26:52.000000000 +0200
@@ -24288,6 +24288,44 @@ _ACEOF
 
 fi
 
+echo "$as_me:$LINENO: checking assembler for gnu_unique_object" >&5
+echo $ECHO_N "checking assembler for gnu_unique_object... $ECHO_C" >&6
+if test "${gcc_cv_as_gnu_unique_object+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gcc_cv_as_gnu_unique_object=no
+    if test $in_tree_gas = yes; then
+    if test $in_tree_gas_is_elf = yes \
+  && test $gcc_cv_gas_vers -ge `expr \( \( 2 \* 1000 \) + 19 \) \* 1000 + 52`
+  then gcc_cv_as_gnu_unique_object=yes
+fi
+  elif test x$gcc_cv_as != x; then
+    echo '.type foo, @gnu_unique_object' > 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_gnu_unique_object=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_gnu_unique_object" >&5
+echo "${ECHO_T}$gcc_cv_as_gnu_unique_object" >&6
+if test $gcc_cv_as_gnu_unique_object = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GAS_GNU_UNIQUE_OBJECT 1
+_ACEOF
+
+fi
+
 echo "$as_me:$LINENO: checking assembler for tolerance to line number 0" >&5
 echo $ECHO_N "checking assembler for tolerance to line number 0... $ECHO_C" >&6
 if test "${gcc_cv_as_line_zero+set}" = set; then
--- gcc/config.in.jj	2009-02-16 22:48:20.000000000 +0100
+++ gcc/config.in	2009-07-23 09:26:56.000000000 +0200
@@ -845,6 +845,12 @@
 #endif
 
 
+/* Define if your assembler supports @gnu_unique_object. */
+#ifndef USED_FOR_TARGET
+#undef HAVE_GAS_GNU_UNIQUE_OBJECT
+#endif
+
+
 /* Define if your assembler and linker support .hidden. */
 #undef HAVE_GAS_HIDDEN
 

gcc44-unwind-debug-hook.patch:
 unwind-dw2.c |   27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

--- NEW FILE gcc44-unwind-debug-hook.patch ---
2009-05-27  Tom Tromey  <tromey at redhat.com>

	* unwind-dw2.c (_Unwind_DebugHook): New function.
	(uw_install_context): Call _Unwind_DebugHook.

--- gcc/unwind-dw2.c	(revision 147933)
+++ gcc/unwind-dw2.c	(revision 147934)
@@ -1473,18 +1473,31 @@ uw_init_context_1 (struct _Unwind_Contex
   context->ra = __builtin_extract_return_addr (outer_ra);
 }
 
+static void _Unwind_DebugHook (void *, void *) __attribute__ ((__noinline__));
+
+/* This function is called during unwinding.  It is intended as a hook
+   for a debugger to intercept exceptions.  CFA is the CFA of the
+   target frame.  HANDLER is the PC to which control will be
+   transferred.  */
+static void
+_Unwind_DebugHook (void *cfa __attribute__ ((__unused__)),
+		   void *handler __attribute__ ((__unused__)))
+{
+  asm ("");
+}
 
 /* Install TARGET into CURRENT so that we can return to it.  This is a
    macro because __builtin_eh_return must be invoked in the context of
    our caller.  */
 
-#define uw_install_context(CURRENT, TARGET)				 \
-  do									 \
-    {									 \
-      long offset = uw_install_context_1 ((CURRENT), (TARGET));		 \
-      void *handler = __builtin_frob_return_addr ((TARGET)->ra);	 \
-      __builtin_eh_return (offset, handler);				 \
-    }									 \
+#define uw_install_context(CURRENT, TARGET)				\
+  do									\
+    {									\
+      long offset = uw_install_context_1 ((CURRENT), (TARGET));		\
+      void *handler = __builtin_frob_return_addr ((TARGET)->ra);	\
+      _Unwind_DebugHook ((TARGET)->cfa, handler);			\
+      __builtin_eh_return (offset, handler);				\
+    }									\
   while (0)
 
 static long


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Mar 2009 10:56:41 -0000	1.4
+++ .cvsignore	25 Aug 2009 20:26:27 -0000	1.5
@@ -1 +1 @@
-gcc-4.4.0-20090319.tar.bz2
+gcc-4.4.1-20090818.tar.bz2

gcc44-hack.patch:
 gcc/ada/make.adb   |    1 +
 libada/Makefile.in |   30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

Index: gcc44-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/gcc44-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-hack.patch	20 Feb 2009 19:59:34 -0000	1.1
+++ gcc44-hack.patch	25 Aug 2009 20:26:27 -0000	1.2
@@ -1,8 +1,8 @@
 --- libada/Makefile.in.jj	2009-01-14 12:07:35.000000000 +0100
 +++ libada/Makefile.in	2009-01-15 14:25:33.000000000 +0100
-@@ -66,17 +66,39 @@ target_noncanonical:=@target_noncanonica
- version := $(shell cat $(srcdir)/../gcc/BASE-VER)
+@@ -67,17 +67,39 @@ version := $(shell cat $(srcdir)/../gcc/
  libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
+ ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
  
 +DEFAULTMULTIFLAGS :=
 +ifeq ($(MULTISUBDIR),)
@@ -43,7 +43,7 @@
          "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
          "THREAD_KIND=$(THREAD_KIND)" \
          "TRACE=$(TRACE)" \
-@@ -87,7 +109,7 @@ LIBADA_FLAGS_TO_PASS = \
+@@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
          "exeext=.exeext.should.not.be.used " \
  	'CC=the.host.compiler.should.not.be.needed' \
  	"GCC_FOR_TARGET=$(CC)" \

gcc44-power7-2.patch:
 rs6000.c  |  162 +++++++++++++++++++++++++++++++++++++++++++++++---------------
 vector.md |   22 +++++++-
 2 files changed, 144 insertions(+), 40 deletions(-)

Index: gcc44-power7-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/gcc44-power7-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-power7-2.patch	23 Mar 2009 10:56:41 -0000	1.1
+++ gcc44-power7-2.patch	25 Aug 2009 20:26:28 -0000	1.2
@@ -1,1369 +1,267 @@
-2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
+2009-04-14  Michael Meissner  <meissner at linux.vnet.ibm.com>
 
-	PR target/39457
-	* config/rs6000/rs6000.opt (-mdisallow-float-in-lr-ctr): Add
-	temporary debug switch.
+	* config/rs6000/rs6000.c (rs6000_secondary_reload_inner): Handle
+	more possible combinations of addresses.
 
-	* config/rs6000/rs6000.c (rs6000_hard_regno_mode_ok): Revert
-	behavior of disallowing 
-
-2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
-
-	* config/rs6000/vector.md (vec_extract_evenv2df): Delete, insn
-	causes problems in building spec 2006.
-	(vec_extract_oddv2df): Ditto.
-	(vec_pack_trunc_v2df): New expanders for VSX vectorized
-	conversions.
-	(vec_pack_sfix_trunc_v2df): Ditto.
-	(vec_pack_ufix_trunc_v2df): Ditto.
-	(vec_unpacks_hi_v4sf): Ditto.
-	(vec_unpacks_lo_v4sf): Ditto.
-	(vec_unpacks_float_hi_v4si): Ditto.
-	(vec_unpacks_float_lo_v4si): Ditto.
-	(vec_unpacku_float_hi_v4si): Ditto.
-	(vec_unpacku_float_lo_v4si): Ditto.
-
-	* config/rs6000/rs6000-protos.h (rs6000_vector_secondary_reload):
-	Declaration for new target hook.
-
-	* config/rs6000/rs6000.c (TARGET_SECONDARY_RELOAD): Add new target
-	hook for eventually fixing up the memory references for Altivec
-	and VSX reloads to be reg+reg instead of reg+offset.  Right now,
-	this is a stub function that prints debug information if
-	-mdebug=addr and then calls default_secondary_reload.
-	(rs6000_secondary_reload): Ditto.
-	(rs6000_vector_secondary_reload): Ditto.
-	(rs6000_builtin_conversion): Add support for V2DI/V2DF
-	conversions.
-	(rs6000_legitimate_offset_address_p): Test for the vector unit
-	doing the memory references.
-	(rs6000_legimize_reload_address): Ditto.
-	(rs6000_legitimize_address): Print extra \n if -mdebug=addr.
-	(rs6000_legitimize_reload_address): Ditto.
-	(rs6000_legitimate_address): Ditto.
-	(rs6000_mode_dependent_address): Ditto.
-	(bdesc_2arg): Add VSX builtins.
-	(bdesc_abs): Ditto.
-	(bdesc_1arg): Ditto.
-	(altivec_init_builtins): Ditto.
-	(rs6000_secondary_memory_needed_rtx): Add debug support if
-	-mdebug=addr.
-	(rs6000_preferred_reload_class): Ditto.
-	(rs6000_secondary_memory_needed): Ditto.
-	(rs6000_secondary_reload_class): Ditto.
-	(rs6000_cannot_change_mode_class): Ditto.
-
-	* config/rs6000/vsx.md (UNSPEC_VSX_*): Add unspecs for VSX
-	conversions.
-	(vsx_nabs<mode>): Add generator function.
-	(vsx_float<VSi><mode>2): Ditto.
-	(vsx_floatuns<VSi><mode>2): Ditto.
-	(vsx_xxmrghw): Ditto.
-	(vsx_xxmrglw): Ditto.
-	(vsx_xvcvdpsp): New VSX vector conversion insn.
-	(vsx_xvcvdpsxws): Ditto.
-	(vsx_xvcvdpuxws): Ditto.
-	(vsx_xvcvspdp): Ditto.
-	(vsx_xvcvsxwdp): Ditto.
-	(vsx_xvcvuxwdp): Ditto.
-	(vsx_reload_*): New insns for reload support.
-
-	* config/rs6000/rs6000.h: Fix a comment.
-
-	* config/rs6000/altivec.md (altivec_reload_*): New insns for
-	reload support.
-
-	* config/rs6000/rs6000.md (ptrsize): New mode attribute for the
-	pointer size.
-
-2009-03-10  Michael Meissner  <meissner at linux.vnet.ibm.com>
-
-	* config/rs6000/vsx.md (vsx_concat_v2df): Add explicit 'f'
-	register class for scalar data, correct uses of the xxpermdi
-	instruction.
-	(vsx_set_v2df): Ditto.
-	(vsx_extract_v2df): Ditto.
-	(vsx_xxpermdi): Ditto.
-	(vsx_splatv2df): Ditto.
-	(vsx_xxmrghw): Use wf instead of v constraints.
-	(vsx_xxmrglw): Ditto.
-testsuite/
-2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
-
-	PR target/39457
-	* gcc.target/powerpc/pr39457.c: New test for PR39457.
-
-2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
-
-	* gcc.target/powerpc/vsx-builtin-1.c: New test for builtins.
-	* gcc.target/powerpc/vsx-builtin-2.c: Ditto.
-
---- gcc/config/rs6000/vector.md	(revision 144758)
-+++ gcc/config/rs6000/vector.md	(revision 144843)
-@@ -496,23 +496,122 @@ (define_expand "vec_interleave_lowv2df"
-   "VECTOR_UNIT_VSX_P (V2DFmode)"
-   "")
- 
--;; For 2 element vectors, even/odd is the same as high/low
--(define_expand "vec_extract_evenv2df"
--  [(set (match_operand:V2DF 0 "vfloat_operand" "")
--	(vec_concat:V2DF
--	 (vec_select:DF (match_operand:V2DF 1 "vfloat_operand" "")
--			(parallel [(const_int 0)]))
--	 (vec_select:DF (match_operand:V2DF 2 "vfloat_operand" "")
--			(parallel [(const_int 0)]))))]
--  "VECTOR_UNIT_VSX_P (V2DFmode)"
--  "")
-+

-+;; Convert double word types to single word types
-+(define_expand "vec_pack_trunc_v2df"
-+  [(match_operand:V4SF 0 "vsx_register_operand" "")
-+   (match_operand:V2DF 1 "vsx_register_operand" "")
-+   (match_operand:V2DF 2 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && TARGET_ALTIVEC"
-+{
-+  rtx r1 = gen_reg_rtx (V4SFmode);
-+  rtx r2 = gen_reg_rtx (V4SFmode);
- 
--(define_expand "vec_extract_oddv2df"
--  [(set (match_operand:V2DF 0 "vfloat_operand" "")
--	(vec_concat:V2DF
--	 (vec_select:DF (match_operand:V2DF 1 "vfloat_operand" "")
--			(parallel [(const_int 1)]))
--	 (vec_select:DF (match_operand:V2DF 2 "vfloat_operand" "")
--			(parallel [(const_int 1)]))))]
--  "VECTOR_UNIT_VSX_P (V2DFmode)"
--  "")
-+  emit_insn (gen_vsx_xvcvdpsp (r1, operands[1]));
-+  emit_insn (gen_vsx_xvcvdpsp (r2, operands[2]));
-+  emit_insn (gen_vec_extract_evenv4sf (operands[0], r1, r2));
-+  DONE;
-+})
-+
-+(define_expand "vec_pack_sfix_trunc_v2df"
-+  [(match_operand:V4SI 0 "vsx_register_operand" "")
-+   (match_operand:V2DF 1 "vsx_register_operand" "")
-+   (match_operand:V2DF 2 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && TARGET_ALTIVEC"
-+{
-+  rtx r1 = gen_reg_rtx (V4SImode);
-+  rtx r2 = gen_reg_rtx (V4SImode);
-+
-+  emit_insn (gen_vsx_xvcvdpsxws (r1, operands[1]));
-+  emit_insn (gen_vsx_xvcvdpsxws (r2, operands[2]));
-+  emit_insn (gen_vec_extract_evenv4si (operands[0], r1, r2));
-+  DONE;
-+})
-+
-+(define_expand "vec_pack_ufix_trunc_v2df"
-+  [(match_operand:V4SI 0 "vsx_register_operand" "")
-+   (match_operand:V2DF 1 "vsx_register_operand" "")
-+   (match_operand:V2DF 2 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && TARGET_ALTIVEC"
-+{
-+  rtx r1 = gen_reg_rtx (V4SImode);
-+  rtx r2 = gen_reg_rtx (V4SImode);
-+
-+  emit_insn (gen_vsx_xvcvdpuxws (r1, operands[1]));
-+  emit_insn (gen_vsx_xvcvdpuxws (r2, operands[2]));
-+  emit_insn (gen_vec_extract_evenv4si (operands[0], r1, r2));
-+  DONE;
-+})
-+
-+;; Convert single word types to double word
-+(define_expand "vec_unpacks_hi_v4sf"
-+  [(match_operand:V2DF 0 "vsx_register_operand" "")
-+   (match_operand:V4SF 1 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && VECTOR_UNIT_ALTIVEC_OR_VSX_P (V4SFmode)"
-+{
-+  rtx reg = gen_reg_rtx (V4SFmode);
-+
-+  emit_insn (gen_vec_interleave_highv4sf (reg, operands[1], operands[1]));
-+  emit_insn (gen_vsx_xvcvspdp (operands[0], reg));
-+  DONE;
-+})
-+
-+(define_expand "vec_unpacks_lo_v4sf"
-+  [(match_operand:V2DF 0 "vsx_register_operand" "")
-+   (match_operand:V4SF 1 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && VECTOR_UNIT_ALTIVEC_OR_VSX_P (V4SFmode)"
-+{
-+  rtx reg = gen_reg_rtx (V4SFmode);
-+
-+  emit_insn (gen_vec_interleave_lowv4sf (reg, operands[1], operands[1]));
-+  emit_insn (gen_vsx_xvcvspdp (operands[0], reg));
-+  DONE;
-+})
-+
-+(define_expand "vec_unpacks_float_hi_v4si"
-+  [(match_operand:V2DF 0 "vsx_register_operand" "")
-+   (match_operand:V4SI 1 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && VECTOR_UNIT_ALTIVEC_OR_VSX_P (V4SImode)"
-+{
-+  rtx reg = gen_reg_rtx (V4SImode);
-+
-+  emit_insn (gen_vec_interleave_highv4si (reg, operands[1], operands[1]));
-+  emit_insn (gen_vsx_xvcvsxwdp (operands[0], reg));
-+  DONE;
-+})
-+
-+(define_expand "vec_unpacks_float_lo_v4si"
-+  [(match_operand:V2DF 0 "vsx_register_operand" "")
-+   (match_operand:V4SI 1 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && VECTOR_UNIT_ALTIVEC_OR_VSX_P (V4SImode)"
-+{
-+  rtx reg = gen_reg_rtx (V4SImode);
-+
-+  emit_insn (gen_vec_interleave_lowv4si (reg, operands[1], operands[1]));
-+  emit_insn (gen_vsx_xvcvsxwdp (operands[0], reg));
-+  DONE;
-+})
-+
-+(define_expand "vec_unpacku_float_hi_v4si"
-+  [(match_operand:V2DF 0 "vsx_register_operand" "")
-+   (match_operand:V4SI 1 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && VECTOR_UNIT_ALTIVEC_OR_VSX_P (V4SImode)"
-+{
-+  rtx reg = gen_reg_rtx (V4SImode);
-+
-+  emit_insn (gen_vec_interleave_highv4si (reg, operands[1], operands[1]));
-+  emit_insn (gen_vsx_xvcvuxwdp (operands[0], reg));
-+  DONE;
-+})
-+
-+(define_expand "vec_unpacku_float_lo_v4si"
-+  [(match_operand:V2DF 0 "vsx_register_operand" "")
-+   (match_operand:V4SI 1 "vsx_register_operand" "")]
-+  "VECTOR_UNIT_VSX_P (V2DFmode) && VECTOR_UNIT_ALTIVEC_OR_VSX_P (V4SImode)"
-+{
-+  rtx reg = gen_reg_rtx (V4SImode);
-+
-+  emit_insn (gen_vec_interleave_lowv4si (reg, operands[1], operands[1]));
-+  emit_insn (gen_vsx_xvcvuxwdp (operands[0], reg));
-+  DONE;
-+})
---- gcc/config/rs6000/rs6000-protos.h	(revision 144758)
-+++ gcc/config/rs6000/rs6000-protos.h	(revision 144843)
-@@ -72,6 +72,7 @@ extern bool rs6000_secondary_memory_need
- extern bool rs6000_cannot_change_mode_class (enum machine_mode,
- 					     enum machine_mode,
- 					     enum reg_class);
-+extern void rs6000_vector_secondary_reload (rtx, rtx, rtx, bool);
- extern int paired_emit_vector_cond_expr (rtx, rtx, rtx,
-                                          rtx, rtx, rtx);
- extern void paired_expand_vector_move (rtx operands[]);
---- gcc/config/rs6000/rs6000.opt	(revision 144845)
-+++ gcc/config/rs6000/rs6000.opt	(revision 144857)
-@@ -139,6 +139,9 @@ mvsx-scalar-memory
- Target Report Var(TARGET_VSX_SCALAR_MEMORY)
- If -mvsx, use VSX scalar memory reference instructions for scalar double (off by default)
- 
-+mdisallow-float-in-lr-ctr
-+Target Undocumented Var(TARGET_DISALLOW_FLOAT_IN_LR_CTR) Init(-1)
-+
- mupdate
- Target Report Var(TARGET_UPDATE) Init(1)
- Generate load/store with update instructions
---- gcc/config/rs6000/rs6000.c	(revision 144758)
-+++ gcc/config/rs6000/rs6000.c	(revision 144843)
-@@ -1004,6 +1004,10 @@ static rtx rs6000_emit_vector_compare (e
- 				       enum machine_mode);
- static tree rs6000_stack_protect_fail (void);
- 
-+static enum reg_class rs6000_secondary_reload (bool, rtx, enum reg_class,
-+					       enum machine_mode,
-+					       struct secondary_reload_info *);
-+
- const int INSN_NOT_AVAILABLE = -1;
- static enum machine_mode rs6000_eh_return_filter_mode (void);
- 
-@@ -1333,6 +1337,9 @@ static const char alt_reg_names[][8] =
- #undef TARGET_INSTANTIATE_DECLS
- #define TARGET_INSTANTIATE_DECLS rs6000_instantiate_decls
- 
-+#undef TARGET_SECONDARY_RELOAD
-+#define TARGET_SECONDARY_RELOAD rs6000_secondary_reload
-+
- struct gcc_target targetm = TARGET_INITIALIZER;
+	* config/rs6000/vector.md (vec_reload_and_plus_<mptrsize>): Allow
+	register+small constant in addition to register+register, and
+	restrict the insn to only match during reload and afterwards.
+	(vec_reload_and_reg_<mptrsize>): Allow for and of register
+	indirect to not generate insn not found message.
+
+--- gcc/config/rs6000/vector.md	(revision 146069)
++++ gcc/config/rs6000/vector.md	(revision 146118)
+@@ -129,14 +129,15 @@ (define_expand "reload_<VEC_R:mode>_<P:m
+ })
+ 
+ ;; Reload sometimes tries to move the address to a GPR, and can generate
+-;; invalid RTL for addresses involving AND -16.
++;; invalid RTL for addresses involving AND -16.  Allow addresses involving
++;; reg+reg, reg+small constant, or just reg, all wrapped in an AND -16.
+ 
+ (define_insn_and_split "*vec_reload_and_plus_<mptrsize>"
+   [(set (match_operand:P 0 "gpc_reg_operand" "=b")
+ 	(and:P (plus:P (match_operand:P 1 "gpc_reg_operand" "r")
+-		       (match_operand:P 2 "gpc_reg_operand" "r"))
++		       (match_operand:P 2 "reg_or_cint_operand" "rI"))
+ 	       (const_int -16)))]
+-  "TARGET_ALTIVEC || TARGET_VSX"
++  "(TARGET_ALTIVEC || TARGET_VSX) && (reload_in_progress || reload_completed)"
+   "#"
+   "&& reload_completed"
+   [(set (match_dup 0)
+@@ -146,6 +147,21 @@ (define_insn_and_split "*vec_reload_and_
+ 		   (and:P (match_dup 0)
+ 			  (const_int -16)))
+ 	      (clobber:CC (scratch:CC))])])
++
++;; The normal ANDSI3/ANDDI3 won't match if reload decides to move an AND -16
++;; address to a register because there is no clobber of a (scratch), so we add
++;; it here.
++(define_insn_and_split "*vec_reload_and_reg_<mptrsize>"
++  [(set (match_operand:P 0 "gpc_reg_operand" "=b")
++	(and:P (match_operand:P 1 "gpc_reg_operand" "r")
++	       (const_int -16)))]
++  "(TARGET_ALTIVEC || TARGET_VSX) && (reload_in_progress || reload_completed)"
++  "#"
++  "&& reload_completed"
++  [(parallel [(set (match_dup 0)
++		   (and:P (match_dup 1)
++			  (const_int -16)))
++	      (clobber:CC (scratch:CC))])])
  

- /* Return number of consecutive hard regs needed starting at reg REGNO
-@@ -1448,10 +1448,16 @@ rs6000_hard_regno_mode_ok (int regno, en
-   if (SPE_SIMD_REGNO_P (regno) && TARGET_SPE && SPE_VECTOR_MODE (mode))
-     return 1;
+ ;; Generic floating point vector arithmetic support
+ (define_expand "add<mode>3"
+--- gcc/config/rs6000/rs6000.c	(revision 146069)
++++ gcc/config/rs6000/rs6000.c	(revision 146118)
+@@ -12574,6 +12574,11 @@ rs6000_secondary_reload_inner (rtx reg, 
+   enum reg_class rclass;
+   rtx addr;
+   rtx and_op2 = NULL_RTX;
++  rtx addr_op1;
++  rtx addr_op2;
++  rtx scratch_or_premodify = scratch;
++  rtx and_rtx;
++  rtx cc_clobber;
  
--  /* Don't allow anything but word sized integers (aka pointers) in CTR/LR.  You
--     really don't want to spill your floating point values to those
--     registers.  Also do it for the old MQ register in the power.  */
--  if (regno == CTR_REGNO || regno == LR_REGNO || regno == MQ_REGNO)
-+  /* Don't allow anything but word sized integers (aka pointers) in CTR/LR.
-+     You really don't want to spill your floating point values to those
-+     registers.  Also do it for the old MQ register in the power.
-+
-+     While this is desirable in theory, disabling float to go in LR/CTR does
-+     cause some regressions, so until they are taken care of, revert to the old
-+     behavior by default for most power systems, but enable it for power7.  */
-+  if ((TARGET_DISALLOW_FLOAT_IN_LR_CTR > 0
-+       || (TARGET_DISALLOW_FLOAT_IN_LR_CTR < 0 && TARGET_VSX))
-+      && (regno == CTR_REGNO || regno == LR_REGNO || regno == MQ_REGNO))
-     return (GET_MODE_CLASS (mode) == MODE_INT
- 	    && GET_MODE_SIZE (mode) <= UNITS_PER_WORD);
+   if (TARGET_DEBUG_ADDR)
+     {
+@@ -12595,7 +12600,8 @@ rs6000_secondary_reload_inner (rtx reg, 
  
-@@ -2447,6 +2454,14 @@ rs6000_builtin_conversion (enum tree_cod
-     case FIX_TRUNC_EXPR:
-       switch (TYPE_MODE (type))
- 	{
-+	case V2DImode:
-+	  if (!VECTOR_UNIT_VSX_P (V2DFmode))
-+	    return NULL_TREE;
+   switch (rclass)
+     {
+-      /* Move reg+reg addresses into a scratch register for GPRs.  */
++      /* GPRs can handle reg + small constant, all other addresses need to use
++	 the scratch register.  */
+     case GENERAL_REGS:
+     case BASE_REGS:
+       if (GET_CODE (addr) == AND)
+@@ -12603,70 +12609,152 @@ rs6000_secondary_reload_inner (rtx reg, 
+ 	  and_op2 = XEXP (addr, 1);
+ 	  addr = XEXP (addr, 0);
+ 	}
 +
-+	  return TYPE_UNSIGNED (type)
-+	    ? rs6000_builtin_decls[VSX_BUILTIN_XVCVDPUXDS]
-+	    : rs6000_builtin_decls[VSX_BUILTIN_XVCVDPSXDS];
++      if (GET_CODE (addr) == PRE_MODIFY)
++	{
++	  scratch_or_premodify = XEXP (addr, 0);
++	  gcc_assert (REG_P (scratch_or_premodify));
++	  gcc_assert (GET_CODE (XEXP (addr, 1)) == PLUS);
++	  addr = XEXP (addr, 1);
++	}
 +
- 	case V4SImode:
- 	  if (VECTOR_UNIT_NONE_P (V4SImode) || VECTOR_UNIT_NONE_P (V4SFmode))
- 	    return NULL_TREE;
-@@ -2462,6 +2477,14 @@ rs6000_builtin_conversion (enum tree_cod
-     case FLOAT_EXPR:
-       switch (TYPE_MODE (type))
+       if (GET_CODE (addr) == PLUS
+ 	  && (!rs6000_legitimate_offset_address_p (TImode, addr, true)
+ 	      || and_op2 != NULL_RTX))
  	{
-+	case V2DImode:
-+	  if (!VECTOR_UNIT_VSX_P (V2DFmode))
-+	    return NULL_TREE;
-+
-+	  return TYPE_UNSIGNED (type)
-+	    ? rs6000_builtin_decls[VSX_BUILTIN_XVCVUXDSP]
-+	    : rs6000_builtin_decls[VSX_BUILTIN_XVCVSXDSP];
+-	  if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
+-	      || GET_CODE (addr) == CONST_INT)
+-	    rs6000_emit_move (scratch, addr, GET_MODE (addr));
+-	  else
+-	    emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
+-	  addr = scratch;
++	  addr_op1 = XEXP (addr, 0);
++	  addr_op2 = XEXP (addr, 1);
++	  gcc_assert (legitimate_indirect_address_p (addr_op1, true));
++
++	  if (!REG_P (addr_op2)
++	      && (GET_CODE (addr_op2) != CONST_INT
++		  || !satisfies_constraint_I (addr_op2)))
++	    {
++	      rs6000_emit_move (scratch, addr_op2, Pmode);
++	      addr_op2 = scratch;
++	    }
 +
- 	case V4SImode:
- 	  if (VECTOR_UNIT_NONE_P (V4SImode) || VECTOR_UNIT_NONE_P (V4SFmode))
- 	    return NULL_TREE;
-@@ -2469,6 +2492,7 @@ rs6000_builtin_conversion (enum tree_cod
- 	  return TYPE_UNSIGNED (type)
- 	    ? rs6000_builtin_decls[VECTOR_BUILTIN_UNSFLOAT_V4SI_V4SF]
- 	    : rs6000_builtin_decls[VECTOR_BUILTIN_FLOAT_V4SI_V4SF];
++	  emit_insn (gen_rtx_SET (VOIDmode,
++				  scratch_or_premodify,
++				  gen_rtx_PLUS (Pmode,
++						addr_op1,
++						addr_op2)));
 +
- 	default:
- 	  return NULL_TREE;
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
  	}
-@@ -4101,7 +4125,7 @@ rs6000_legitimate_offset_address_p (enum
-     case V2DImode:
-       /* AltiVec/VSX vector modes.  Only reg+reg addressing is valid and
- 	 constant offset zero should not occur due to canonicalization.  */
--      if (VECTOR_UNIT_ALTIVEC_OR_VSX_P (mode))
-+      if (VECTOR_MEM_ALTIVEC_OR_VSX_P (mode))
- 	return false;
-       break;
- 
-@@ -4441,6 +4465,7 @@ rs6000_legitimize_address (rtx x, rtx ol
+-      else if (GET_CODE (addr) == PRE_MODIFY
+-	       && REG_P (XEXP (addr, 0))
+-	       && GET_CODE (XEXP (addr, 1)) == PLUS)
++      else if (!legitimate_indirect_address_p (addr, true)
++	       && !rs6000_legitimate_offset_address_p (TImode, addr, true))
+ 	{
+-	  emit_insn (gen_rtx_SET (VOIDmode, XEXP (addr, 0), XEXP (addr, 1)));
+-	  addr = XEXP (addr, 0);
++	  rs6000_emit_move (scratch_or_premodify, addr, Pmode);
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
  	}
-       else
- 	fprintf (stderr, "NULL returned\n");
-+      fprintf (stderr, "\n");
-     }
+       break;
  
-   return ret;
-@@ -4776,8 +4801,7 @@ rs6000_legitimize_reload_address (rtx x,
- 	   && REG_MODE_OK_FOR_BASE_P (XEXP (x, 0), mode)
- 	   && GET_CODE (XEXP (x, 1)) == CONST_INT
- 	   && (INTVAL (XEXP (x, 1)) & 3) != 0
--	   && !ALTIVEC_VECTOR_MODE (mode)
--	   && !VSX_VECTOR_MODE (mode)
-+	   && VECTOR_MEM_NONE_P (mode)
- 	   && GET_MODE_SIZE (mode) >= UNITS_PER_WORD
- 	   && TARGET_POWERPC64)
-     {
-@@ -4798,8 +4822,7 @@ rs6000_legitimize_reload_address (rtx x,
- 	   && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
- 				       || mode == DDmode || mode == TDmode
- 				       || mode == DImode))
--	   && !ALTIVEC_VECTOR_MODE (mode)
--	   && !VSX_VECTOR_MODE (mode))
-+	   && VECTOR_MEM_NONE_P (mode))
-     {
-       HOST_WIDE_INT val = INTVAL (XEXP (x, 1));
-       HOST_WIDE_INT low = ((val & 0xffff) ^ 0x8000) - 0x8000;
-@@ -4843,6 +4866,7 @@ rs6000_legitimize_reload_address (rtx x,
- 	   /* Don't do this for TFmode or TDmode, since the result isn't
- 	      offsettable.  The same goes for DImode without 64-bit gprs and
- 	      DFmode and DDmode without fprs.  */
-+	   && VECTOR_MEM_NONE_P (mode)
- 	   && mode != TFmode
- 	   && mode != TDmode
- 	   && (mode != DImode || TARGET_POWERPC64)
-@@ -4918,6 +4942,8 @@ rs6000_legitimize_reload_address (rtx x,
- 	  fprintf (stderr, "New address:\n");
- 	  debug_rtx (ret);
++      /* Float/Altivec registers can only handle reg+reg addressing.  Move
++	 other addresses into a scratch register.  */
++    case FLOAT_REGS:
++    case VSX_REGS:
++    case ALTIVEC_REGS:
++
+       /* With float regs, we need to handle the AND ourselves, since we can't
+ 	 use the Altivec instruction with an implicit AND -16.  Allow scalar
+ 	 loads to float registers to use reg+offset even if VSX.  */
+-    case FLOAT_REGS:
+-    case VSX_REGS:
+-      if (GET_CODE (addr) == AND)
++      if (GET_CODE (addr) == AND
++	  && (rclass != ALTIVEC_REGS || GET_MODE_SIZE (mode) != 16))
+ 	{
+ 	  and_op2 = XEXP (addr, 1);
+ 	  addr = XEXP (addr, 0);
  	}
-+
-+      fprintf (stderr, "\n");
-     }
- 
-   return ret;
-@@ -5035,6 +5061,7 @@ rs6000_legitimate_address (enum machine_
- 	       GET_MODE_NAME (mode),
- 	       reg_ok_strict);
-       debug_rtx (orig_x);
-+      fprintf (stderr, "\n");
-     }
- 
-   return ret;
-@@ -5082,9 +5109,10 @@ rs6000_mode_dependent_address (rtx addr)
-   if (TARGET_DEBUG_ADDR)
-     {
-       fprintf (stderr,
--	       "\nrs6000_mode_dependent_address: ret = %d\n",
--	       (int)ret);
-+	       "\nrs6000_mode_dependent_address: ret = %s\n",
-+	       ret ? "true" : "false");
-       debug_rtx (addr);
-+      fprintf (stderr, "\n");
-     }
+-      /* fall through */
  
-   return ret;
-@@ -7917,6 +7945,20 @@ static struct builtin_description bdesc_
-   { MASK_ALTIVEC, CODE_FOR_altivec_vsumsws, "__builtin_altivec_vsumsws", ALTIVEC_BUILTIN_VSUMSWS },
-   { MASK_ALTIVEC, CODE_FOR_xorv4si3, "__builtin_altivec_vxor", ALTIVEC_BUILTIN_VXOR },
- 
-+  { MASK_VSX, CODE_FOR_addv2df3, "__builtin_vsx_xvadddp", VSX_BUILTIN_XVADDDP },
-+  { MASK_VSX, CODE_FOR_subv2df3, "__builtin_vsx_xvsubdp", VSX_BUILTIN_XVSUBDP },
-+  { MASK_VSX, CODE_FOR_mulv2df3, "__builtin_vsx_xvmuldp", VSX_BUILTIN_XVMULDP },
-+  { MASK_VSX, CODE_FOR_divv2df3, "__builtin_vsx_xvdivdp", VSX_BUILTIN_XVDIVDP },
-+  { MASK_VSX, CODE_FOR_sminv2df3, "__builtin_vsx_xvmindp", VSX_BUILTIN_XVMINDP },
-+  { MASK_VSX, CODE_FOR_smaxv2df3, "__builtin_vsx_xvmaxdp", VSX_BUILTIN_XVMAXDP },
-+
-+  { MASK_VSX, CODE_FOR_addv4sf3, "__builtin_vsx_xvaddsp", VSX_BUILTIN_XVADDSP },
-+  { MASK_VSX, CODE_FOR_subv4sf3, "__builtin_vsx_xvsubsp", VSX_BUILTIN_XVSUBSP },
-+  { MASK_VSX, CODE_FOR_mulv4sf3, "__builtin_vsx_xvmulsp", VSX_BUILTIN_XVMULSP },
-+  { MASK_VSX, CODE_FOR_divv4sf3, "__builtin_vsx_xvdivsp", VSX_BUILTIN_XVDIVSP },
-+  { MASK_VSX, CODE_FOR_sminv4sf3, "__builtin_vsx_xvminsp", VSX_BUILTIN_XVMINSP },
-+  { MASK_VSX, CODE_FOR_smaxv4sf3, "__builtin_vsx_xvmaxsp", VSX_BUILTIN_XVMAXSP },
-+
-   { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_add", ALTIVEC_BUILTIN_VEC_ADD },
-   { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vaddfp", ALTIVEC_BUILTIN_VEC_VADDFP },
-   { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_vadduwm", ALTIVEC_BUILTIN_VEC_VADDUWM },
-@@ -8288,7 +8330,11 @@ static const struct builtin_description 
-   { MASK_ALTIVEC, CODE_FOR_absv16qi2, "__builtin_altivec_abs_v16qi", ALTIVEC_BUILTIN_ABS_V16QI },
-   { MASK_ALTIVEC, CODE_FOR_altivec_abss_v4si, "__builtin_altivec_abss_v4si", ALTIVEC_BUILTIN_ABSS_V4SI },
-   { MASK_ALTIVEC, CODE_FOR_altivec_abss_v8hi, "__builtin_altivec_abss_v8hi", ALTIVEC_BUILTIN_ABSS_V8HI },
--  { MASK_ALTIVEC, CODE_FOR_altivec_abss_v16qi, "__builtin_altivec_abss_v16qi", ALTIVEC_BUILTIN_ABSS_V16QI }
-+  { MASK_ALTIVEC, CODE_FOR_altivec_abss_v16qi, "__builtin_altivec_abss_v16qi", ALTIVEC_BUILTIN_ABSS_V16QI },
-+  { MASK_VSX, CODE_FOR_absv2df2, "__builtin_vsx_xvabsdp", VSX_BUILTIN_XVABSDP },
-+  { MASK_VSX, CODE_FOR_vsx_nabsv2df2, "__builtin_vsx_xvnabsdp", VSX_BUILTIN_XVNABSDP },
-+  { MASK_VSX, CODE_FOR_absv4sf2, "__builtin_vsx_xvabssp", VSX_BUILTIN_XVABSSP },
-+  { MASK_VSX, CODE_FOR_vsx_nabsv4sf2, "__builtin_vsx_xvnabssp", VSX_BUILTIN_XVNABSSP },
- };
- 
- /* Simple unary operations: VECb = foo (unsigned literal) or VECb =
-@@ -8314,6 +8360,11 @@ static struct builtin_description bdesc_
-   { MASK_ALTIVEC, CODE_FOR_altivec_vupklpx, "__builtin_altivec_vupklpx", ALTIVEC_BUILTIN_VUPKLPX },
-   { MASK_ALTIVEC, CODE_FOR_altivec_vupklsh, "__builtin_altivec_vupklsh", ALTIVEC_BUILTIN_VUPKLSH },
- 
-+  { MASK_VSX, CODE_FOR_negv2df2, "__builtin_vsx_xvnegdp", VSX_BUILTIN_XVNEGDP },
-+  { MASK_VSX, CODE_FOR_sqrtv2df2, "__builtin_vsx_xvsqrtdp", VSX_BUILTIN_XVSQRTDP },
-+  { MASK_VSX, CODE_FOR_negv4sf2, "__builtin_vsx_xvnegsp", VSX_BUILTIN_XVNEGSP },
-+  { MASK_VSX, CODE_FOR_sqrtv4sf2, "__builtin_vsx_xvsqrtsp", VSX_BUILTIN_XVSQRTSP },
+-      /* Move reg+offset addresses into a scratch register.  */
+-    case ALTIVEC_REGS:
+-      if (!legitimate_indirect_address_p (addr, true)
+-	  && !legitimate_indexed_address_p (addr, true)
+-	  && (GET_CODE (addr) != PRE_MODIFY
+-	      || !legitimate_indexed_address_p (XEXP (addr, 1), true))
+-	  && (rclass != FLOAT_REGS
+-	      || GET_MODE_SIZE (mode) != 8
++      /* If we aren't using a VSX load, save the PRE_MODIFY register and use it
++	 as the address later.  */
++      if (GET_CODE (addr) == PRE_MODIFY
++	  && (!VECTOR_MEM_VSX_P (mode)
+ 	      || and_op2 != NULL_RTX
+-	      || !rs6000_legitimate_offset_address_p (mode, addr, true)))
++	      || !legitimate_indexed_address_p (XEXP (addr, 1), true)))
+ 	{
+-	  if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
+-	      || GET_CODE (addr) == CONST_INT)
+-	    rs6000_emit_move (scratch, addr, GET_MODE (addr));
+-	  else
+-	    emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
+-	  addr = scratch;
++	  scratch_or_premodify = XEXP (addr, 0);
++	  gcc_assert (legitimate_indirect_address_p (scratch_or_premodify,
++						     true));
++	  gcc_assert (GET_CODE (XEXP (addr, 1)) == PLUS);
++	  addr = XEXP (addr, 1);
++	}
 +
-   { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_abs", ALTIVEC_BUILTIN_VEC_ABS },
-   { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_abss", ALTIVEC_BUILTIN_VEC_ABSS },
-   { MASK_ALTIVEC, CODE_FOR_nothing, "__builtin_vec_ceil", ALTIVEC_BUILTIN_VEC_CEIL },
-@@ -8339,6 +8390,15 @@ static struct builtin_description bdesc_
-   { MASK_ALTIVEC|MASK_VSX, CODE_FOR_fix_truncv4sfv4si2, "__builtin_vec_fix_sfsi", VECTOR_BUILTIN_FIX_V4SF_V4SI },
-   { MASK_ALTIVEC|MASK_VSX, CODE_FOR_fixuns_truncv4sfv4si2, "__builtin_vec_fixuns_sfsi", VECTOR_BUILTIN_FIXUNS_V4SF_V4SI },
- 
-+  { MASK_VSX, CODE_FOR_floatv2div2df2, "__builtin_vsx_xvcvsxddp", VSX_BUILTIN_XVCVSXDDP },
-+  { MASK_VSX, CODE_FOR_unsigned_floatv2div2df2, "__builtin_vsx_xvcvuxddp", VSX_BUILTIN_XVCVUXDDP },
-+  { MASK_VSX, CODE_FOR_fix_truncv2dfv2di2, "__builtin_vsx_xvdpsxds", VSX_BUILTIN_XVCVDPSXDS },
-+  { MASK_VSX, CODE_FOR_fixuns_truncv2dfv2di2, "__builtin_vsx_xvdpuxds", VSX_BUILTIN_XVCVDPUXDS },
-+  { MASK_VSX, CODE_FOR_floatv4siv4sf2, "__builtin_vsx_xvcvsxwsp", VSX_BUILTIN_XVCVSXDSP },
-+  { MASK_VSX, CODE_FOR_unsigned_floatv4siv4sf2, "__builtin_vsx_xvcvuxwsp", VSX_BUILTIN_XVCVUXWSP },
-+  { MASK_VSX, CODE_FOR_fix_truncv4sfv4si2, "__builtin_vsx_xvspsxws", VSX_BUILTIN_XVCVSPSXWS },
-+  { MASK_VSX, CODE_FOR_fixuns_truncv4sfv4si2, "__builtin_vsx_xvspuxws", VSX_BUILTIN_XVCVSPUXWS },
++      if (legitimate_indirect_address_p (addr, true)	/* reg */
++	  || legitimate_indexed_address_p (addr, true)	/* reg+reg */
++	  || GET_CODE (addr) == PRE_MODIFY		/* VSX pre-modify */
++	  || GET_CODE (addr) == AND			/* Altivec memory */
++	  || (rclass == FLOAT_REGS			/* legacy float mem */
++	      && GET_MODE_SIZE (mode) == 8
++	      && and_op2 == NULL_RTX
++	      && scratch_or_premodify == scratch
++	      && rs6000_legitimate_offset_address_p (mode, addr, true)))
++	;
 +
-   /* The SPE unary builtins must start with SPE_BUILTIN_EVABS and
-      end with SPE_BUILTIN_EVSUBFUSIAAW.  */
-   { 0, CODE_FOR_spe_evabs, "__builtin_spe_evabs", SPE_BUILTIN_EVABS },
-@@ -10484,6 +10544,8 @@ altivec_init_builtins (void)
-     = build_function_type_list (V16QI_type_node, V16QI_type_node, NULL_TREE);
-   tree v4sf_ftype_v4sf
-     = build_function_type_list (V4SF_type_node, V4SF_type_node, NULL_TREE);
-+  tree v2df_ftype_v2df
-+    = build_function_type_list (V2DF_type_node, V2DF_type_node, NULL_TREE);
-   tree void_ftype_pcvoid_int_int
-     = build_function_type_list (void_type_node,
- 				pcvoid_type_node, integer_type_node,
-@@ -10641,6 +10703,9 @@ altivec_init_builtins (void)
- 	case V4SFmode:
- 	  type = v4sf_ftype_v4sf;
- 	  break;
-+	case V2DFmode:
-+	  type = v2df_ftype_v2df;
-+	  break;
- 	default:
- 	  gcc_unreachable ();
++      else if (GET_CODE (addr) == PLUS)
++	{
++	  addr_op1 = XEXP (addr, 0);
++	  addr_op2 = XEXP (addr, 1);
++	  gcc_assert (REG_P (addr_op1));
++
++	  rs6000_emit_move (scratch, addr_op2, Pmode);
++	  emit_insn (gen_rtx_SET (VOIDmode,
++				  scratch_or_premodify,
++				  gen_rtx_PLUS (Pmode,
++						addr_op1,
++						scratch)));
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
  	}
-@@ -10960,6 +11025,18 @@ rs6000_common_init_builtins (void)
-   tree int_ftype_v8hi_v8hi
-     = build_function_type_list (integer_type_node,
- 				V8HI_type_node, V8HI_type_node, NULL_TREE);
-+  tree v2di_ftype_v2df
-+    = build_function_type_list (V2DI_type_node,
-+				V2DF_type_node, NULL_TREE);
-+  tree v2df_ftype_v2df
-+    = build_function_type_list (V2DF_type_node,
-+				V2DF_type_node, NULL_TREE);
-+  tree v2df_ftype_v2di
-+    = build_function_type_list (V2DF_type_node,
-+				V2DI_type_node, NULL_TREE);
-+  tree v2df_ftype_v2df_v2df
-+    = build_function_type_list (V2DF_type_node,
-+				V2DF_type_node, V2DF_type_node, NULL_TREE);
-   tree v2df_ftype_v2df_v2df_v2df
-     = build_function_type_list (V2DF_type_node,
- 				V2DF_type_node, V2DF_type_node,
-@@ -11136,6 +11213,9 @@ rs6000_common_init_builtins (void)
- 	    case VOIDmode:
- 	      type = opaque_ftype_opaque_opaque;
- 	      break;
-+	    case V2DFmode:
-+	      type = v2df_ftype_v2df_v2df;
-+	      break;
- 	    case V4SFmode:
- 	      type = v4sf_ftype_v4sf_v4sf;
- 	      break;
-@@ -11285,6 +11365,8 @@ rs6000_common_init_builtins (void)
- 	type = v16qi_ftype_int;
-       else if (mode0 == VOIDmode && mode1 == VOIDmode)
- 	type = opaque_ftype_opaque;
-+      else if (mode0 == V2DFmode && mode1 == V2DFmode)
-+	type = v2df_ftype_v2df;
-       else if (mode0 == V4SFmode && mode1 == V4SFmode)
- 	type = v4sf_ftype_v4sf;
-       else if (mode0 == V8HImode && mode1 == V16QImode)
-@@ -11310,6 +11392,10 @@ rs6000_common_init_builtins (void)
- 	type = v4si_ftype_v4sf;
-       else if (mode0 == V4SFmode && mode1 == V4SImode)
- 	type = v4sf_ftype_v4si;
-+      else if (mode0 == V2DImode && mode1 == V2DFmode)
-+	type = v2di_ftype_v2df;
-+      else if (mode0 == V2DFmode && mode1 == V2DImode)
-+	type = v2df_ftype_v2di;
-       else
- 	gcc_unreachable ();
- 
-@@ -12092,8 +12178,10 @@ rtx
- rs6000_secondary_memory_needed_rtx (enum machine_mode mode)
- {
-   static bool eliminated = false;
-+  rtx ret;
 +
-   if (mode != SDmode)
--    return assign_stack_local (mode, GET_MODE_SIZE (mode), 0);
-+    ret = assign_stack_local (mode, GET_MODE_SIZE (mode), 0);
-   else
-     {
-       rtx mem = cfun->machine->sdmode_stack_slot;
-@@ -12105,8 +12193,21 @@ rs6000_secondary_memory_needed_rtx (enum
- 	  cfun->machine->sdmode_stack_slot = mem;
- 	  eliminated = true;
- 	}
--      return mem;
-+      ret = mem;
-+    }
++      else if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == CONST
++	       || GET_CODE (addr) == CONST_INT)
++	{
++	  rs6000_emit_move (scratch_or_premodify, addr, Pmode);
++	  addr = scratch_or_premodify;
++	  scratch_or_premodify = scratch;
++	}
 +
-+  if (TARGET_DEBUG_ADDR)
-+    {
-+      fprintf (stderr, "rs6000_secondary_memory_needed_rtx, mode %s, rtx:\n",
-+	       GET_MODE_NAME (mode));
-+      if (!ret)
-+	fprintf (stderr, "\tNULL_RTX\n");
 +      else
-+	debug_rtx (ret);
-+      fprintf (stderr, "\n");
-     }
++	gcc_unreachable ();
 +
-+  return ret;
- }
+       break;
  
- static tree
-@@ -12140,6 +12241,54 @@ rs6000_check_sdmode (tree *tp, int *walk
-   return NULL_TREE;
- }
+     default:
+       gcc_unreachable ();
+     }
  
-+/* Inform reload about cases where moving X with a mode MODE to a register in
-+   RCLASS requires an extra scratch or immediate register.  Return the class
-+   needed for the immediate register.  */
-+
-+static enum reg_class
-+rs6000_secondary_reload (bool in_p,
-+			 rtx x,
-+			 enum reg_class rclass,
-+			 enum machine_mode mode,
-+			 secondary_reload_info *sri)
-+{
-+  if (TARGET_DEBUG_ADDR)
-+    {
-+      fprintf (stderr,
-+	       "rs6000_secondary_reload, in_p = %s, rclass = %s, mode = %s\n",
-+	       in_p ? "true" : "false", reg_class_names[rclass],
-+	       GET_MODE_NAME (mode));
-+      debug_rtx (x);
-+      fprintf (stderr, "\n");
-+    }
-+
-+  return default_secondary_reload (in_p, x, rclass, mode, sri);
-+}
-+
-+/* Fixup reload addresses for Altivec or VSX loads/stores to change SP+offset
-+   to SP+reg addressing.  */
-+
-+void
-+rs6000_vector_secondary_reload (rtx op0, rtx op1, rtx op2, bool to_mem_p)
-+{
-+  rtx memref = to_mem_p ? op0 : op1;
-+  gcc_assert (MEM_P (memref));
-+
-+  if (TARGET_DEBUG_ADDR)
+-  /* If the original address involved an AND -16 that is part of the Altivec
+-     addresses, recreate the and now.  */
++  /* If the original address involved a pre-modify that we couldn't use the VSX
++     memory instruction with update, and we haven't taken care of already,
++     store the address in the pre-modify register and use that as the
++     address.  */
++  if (scratch_or_premodify != scratch && scratch_or_premodify != addr)
 +    {
-+      fprintf (stderr, "rs6000_vector_secondary_reload, to_mem_p = %s\n",
-+	       to_mem_p ? "true" : "false");
-+      fprintf (stderr, "op0:\n");
-+      debug_rtx (op0);
-+      fprintf (stderr, "op1:\n");
-+      debug_rtx (op1);
-+      fprintf (stderr, "op2:\n");
-+      debug_rtx (op2);
-+      fprintf (stderr, "\n");
-+    }
-+
-+  gcc_unreachable ();
-+}
- 
- /* Allocate a 64-bit stack slot to be used for copying SDmode
-    values through if this function has any SDmode references.  */
-@@ -12212,32 +12361,44 @@ enum reg_class
- rs6000_preferred_reload_class (rtx x, enum reg_class rclass)
- {
-   enum machine_mode mode = GET_MODE (x);
-+  enum reg_class ret;
- 
-   if (TARGET_VSX && VSX_VECTOR_MODE (mode) && x == CONST0_RTX (mode)
-       && VSX_REG_CLASS_P (rclass))
--    return rclass;
-+    ret = rclass;
- 
--  if (TARGET_ALTIVEC && ALTIVEC_VECTOR_MODE (mode) && rclass == ALTIVEC_REGS
--      && easy_vector_constant (x, mode))
--    return rclass;
-+  else if (TARGET_ALTIVEC && ALTIVEC_VECTOR_MODE (mode)
-+	   && rclass == ALTIVEC_REGS && easy_vector_constant (x, mode))
-+    ret = rclass;
- 
--  if (CONSTANT_P (x) && reg_classes_intersect_p (rclass, FLOAT_REGS))
--    return NO_REGS;
-+  else if (CONSTANT_P (x) && reg_classes_intersect_p (rclass, FLOAT_REGS))
-+    ret = NO_REGS;
- 
--  if (GET_MODE_CLASS (mode) == MODE_INT && rclass == NON_SPECIAL_REGS)
--    return GENERAL_REGS;
-+  else if (GET_MODE_CLASS (mode) == MODE_INT && rclass == NON_SPECIAL_REGS)
-+    ret = GENERAL_REGS;
- 
-   /* For VSX, prefer the traditional registers.  */
--  if (rclass == VSX_REGS)
-+  else if (rclass == VSX_REGS)
-     {
-       if (mode == DFmode)
--	return FLOAT_REGS;
-+	ret = FLOAT_REGS;
- 
-       if (ALTIVEC_VECTOR_MODE (mode))
--	return ALTIVEC_REGS;
-+	ret = ALTIVEC_REGS;
++      emit_insn (gen_rtx_SET (VOIDmode, scratch_or_premodify, addr));
++      addr = scratch_or_premodify;
 +    }
-+  else
-+    ret = rclass;
-+
-+  if (TARGET_DEBUG_ADDR)
-+    {
-+      fprintf (stderr,
-+	       "rs6000_preferred_reload_class, return %s, rclass = %s, x:\n",
-+	       reg_class_names[ret], reg_class_names[rclass]);
-+      debug_rtx (x);
-+      fprintf (stderr, "\n");
-     }
- 
--  return rclass;
-+  return ret;
- }
- 
- /* If we are copying between FP or AltiVec registers and anything else, we need
-@@ -12251,31 +12412,46 @@ rs6000_secondary_memory_needed (enum reg
- 				enum reg_class class2,
- 				enum machine_mode mode)
- {
-+  bool ret;
-+  bool vsx1;
-+  bool vsx2;
-+
-   if (class1 == class2)
--    return false;
-+    ret = false;
- 
--  if (TARGET_VSX && VSX_MOVE_MODE (mode) && VSX_REG_CLASS_P (class1)
--      && VSX_REG_CLASS_P (class2))
--    return false;
-+  else if (TARGET_VSX && VECTOR_MEM_VSX_P (mode)
-+	   && ((vsx1 = VSX_REG_CLASS_P (class1))
-+	       || (vsx2 = VSX_REG_CLASS_P (class2))))
-+    ret = (vsx1 != vsx2);
-+
-+  else if (class1 == FLOAT_REGS
-+	   && (!TARGET_MFPGPR || !TARGET_POWERPC64
-+	       || ((mode != DFmode)
-+		   && (mode != DDmode)
-+		   && (mode != DImode))))
-+    ret = true;
 +
-+  else if (class2 == FLOAT_REGS
-+	   && (!TARGET_MFPGPR || !TARGET_POWERPC64
-+	       || ((mode != DFmode)
-+		   && (mode != DDmode)
-+		   && (mode != DImode))))
-+    ret = true;
- 
--  if (class1 == FLOAT_REGS
--       && (!TARGET_MFPGPR || !TARGET_POWERPC64
--	   || ((mode != DFmode)
--	       && (mode != DDmode)
--	       && (mode != DImode))))
--    return true;
-+  else if (class1 == ALTIVEC_REGS || class2 == ALTIVEC_REGS)
-+    ret = true;
- 
--  if (class2 == FLOAT_REGS
--      && (!TARGET_MFPGPR || !TARGET_POWERPC64
--	  || ((mode != DFmode)
--	      && (mode != DDmode)
--	      && (mode != DImode))))
--    return true;
-+  else
-+    ret = false;
- 
--  if (class1 == ALTIVEC_REGS || class2 == ALTIVEC_REGS)
--    return true;
-+  if (TARGET_DEBUG_ADDR)
-+    fprintf (stderr,
-+	     "rs6000_secondary_memory_needed, return: %s, class1 = %s, "
-+	     "class2 = %s, mode = %s\n",
-+	     ret ? "true" : "false", reg_class_names[class1],
-+	     reg_class_names[class2], GET_MODE_NAME (mode));
- 
--  return false;
-+  return ret;
- }
- 
- /* Return the register class of a scratch register needed to copy IN into
-@@ -12287,6 +12463,7 @@ rs6000_secondary_reload_class (enum reg_
- 			       enum machine_mode mode,
- 			       rtx in)
- {
-+  enum reg_class ret = NO_REGS;
-   int regno;
- 
-   if (TARGET_ELF || (DEFAULT_ABI == ABI_DARWIN
-@@ -12307,58 +12484,75 @@ rs6000_secondary_reload_class (enum reg_
- 	      || GET_CODE (in) == HIGH
- 	      || GET_CODE (in) == LABEL_REF
- 	      || GET_CODE (in) == CONST))
--	return BASE_REGS;
-+	ret = BASE_REGS;
-     }
- 
--  if (GET_CODE (in) == REG)
-+  if (ret == NO_REGS)
++  /* If the original address involved an AND -16 and we couldn't use an ALTIVEC
++     memory instruction, recreate the AND now, including the clobber which is
++     generated by the general ANDSI3/ANDDI3 patterns for the
++     andi. instruction.  */
+   if (and_op2 != NULL_RTX)
      {
--      regno = REGNO (in);
--      if (regno >= FIRST_PSEUDO_REGISTER)
-+      if (GET_CODE (in) == REG)
+-      rtx and_rtx = gen_rtx_SET (VOIDmode,
+-				 scratch,
+-				 gen_rtx_AND (Pmode, addr, and_op2));
+-      rtx cc_clobber = gen_rtx_CLOBBER (CCmode, gen_rtx_SCRATCH (CCmode));
++      if (! legitimate_indirect_address_p (addr, true))
 +	{
-+	  regno = REGNO (in);
-+	  if (regno >= FIRST_PSEUDO_REGISTER)
-+	    {
-+	      regno = true_regnum (in);
-+	      if (regno >= FIRST_PSEUDO_REGISTER)
-+		regno = -1;
-+	    }
++	  emit_insn (gen_rtx_SET (VOIDmode, scratch, addr));
++	  addr = scratch;
 +	}
-+      else if (GET_CODE (in) == SUBREG)
- 	{
- 	  regno = true_regnum (in);
- 	  if (regno >= FIRST_PSEUDO_REGISTER)
- 	    regno = -1;
- 	}
--    }
--  else if (GET_CODE (in) == SUBREG)
--    {
--      regno = true_regnum (in);
--      if (regno >= FIRST_PSEUDO_REGISTER)
-+      else
- 	regno = -1;
--    }
--  else
--    regno = -1;
- 
--  /* We can place anything into GENERAL_REGS and can put GENERAL_REGS
--     into anything.  */
--  if (rclass == GENERAL_REGS || rclass == BASE_REGS
--      || (regno >= 0 && INT_REGNO_P (regno)))
--    return NO_REGS;
--
--  /* Constants, memory, and FP registers can go into FP registers.  */
--  if ((regno == -1 || FP_REGNO_P (regno))
--      && (rclass == FLOAT_REGS || rclass == NON_SPECIAL_REGS))
--    return (mode != SDmode) ? NO_REGS : GENERAL_REGS;
--
--  /* Memory, and FP/altivec registers can go into fp/altivec registers under
--     VSX.  */
--  if (TARGET_VSX
--      && (regno == -1 || VSX_REGNO_P (regno))
--      && VSX_REG_CLASS_P (rclass))
--    return NO_REGS;
-+      /* We can place anything into GENERAL_REGS and can put GENERAL_REGS
-+	 into anything.  */
-+      if (rclass == GENERAL_REGS || rclass == BASE_REGS
-+	  || (regno >= 0 && INT_REGNO_P (regno)))
-+	ret = NO_REGS;
-+
-+      /* Constants, memory, and FP registers can go into FP registers.  */
-+      else if ((regno == -1 || FP_REGNO_P (regno))
-+	       && (rclass == FLOAT_REGS || rclass == NON_SPECIAL_REGS))
-+	ret = (mode != SDmode) ? NO_REGS : GENERAL_REGS;
-+
-+      /* Memory, and FP/altivec registers can go into fp/altivec registers under
-+	 VSX.  */
-+      else if (TARGET_VSX
-+	       && (regno == -1 || VSX_REGNO_P (regno))
-+	       && VSX_REG_CLASS_P (rclass))
-+	ret = NO_REGS;
-+
-+      /* Memory, and AltiVec registers can go into AltiVec registers.  */
-+      else if ((regno == -1 || ALTIVEC_REGNO_P (regno))
-+	       && rclass == ALTIVEC_REGS)
-+	ret = NO_REGS;
-+
-+      /* We can copy among the CR registers.  */
-+      else if ((rclass == CR_REGS || rclass == CR0_REGS)
-+	       && regno >= 0 && CR_REGNO_P (regno))
-+	ret = NO_REGS;
-+
-+      /* Otherwise, we need GENERAL_REGS.  */
-+      else
-+	ret = GENERAL_REGS;
-+    }
- 
--  /* Memory, and AltiVec registers can go into AltiVec registers.  */
--  if ((regno == -1 || ALTIVEC_REGNO_P (regno))
--      && rclass == ALTIVEC_REGS)
--    return NO_REGS;
--
--  /* We can copy among the CR registers.  */
--  if ((rclass == CR_REGS || rclass == CR0_REGS)
--      && regno >= 0 && CR_REGNO_P (regno))
--    return NO_REGS;
-+  if (TARGET_DEBUG_ADDR)
-+    {
-+      fprintf (stderr,
-+	       "rs6000_secondary_reload_class, return %s, rclass = %s, "
-+	       "mode = %s, input rtx:\n",
-+	       reg_class_names[ret], reg_class_names[rclass],
-+	       GET_MODE_NAME (mode));
-+      debug_rtx (in);
-+      fprintf (stderr, "\n");
-+    }
- 
--  /* Otherwise, we need GENERAL_REGS.  */
--  return GENERAL_REGS;
-+  return ret;
- }
- 
- /* Return nonzero if for CLASS a mode change from FROM to TO is invalid.  */
-@@ -12368,19 +12562,29 @@ rs6000_cannot_change_mode_class (enum ma
- 				 enum machine_mode to,
- 				 enum reg_class rclass)
- {
--  return (GET_MODE_SIZE (from) != GET_MODE_SIZE (to)
--	  ? ((GET_MODE_SIZE (from) < 8 || GET_MODE_SIZE (to) < 8
--	      || TARGET_IEEEQUAD)
--	     && reg_classes_intersect_p (FLOAT_REGS, rclass))
--	  : (((TARGET_E500_DOUBLE
--	       && ((((to) == DFmode) + ((from) == DFmode)) == 1
--		   || (((to) == TFmode) + ((from) == TFmode)) == 1
--		   || (((to) == DDmode) + ((from) == DDmode)) == 1
--		   || (((to) == TDmode) + ((from) == TDmode)) == 1
--		   || (((to) == DImode) + ((from) == DImode)) == 1))
--	      || (TARGET_SPE
--		  && (SPE_VECTOR_MODE (from) + SPE_VECTOR_MODE (to)) == 1))
--	     && reg_classes_intersect_p (GENERAL_REGS, rclass)));
-+  bool ret = (GET_MODE_SIZE (from) != GET_MODE_SIZE (to)
-+	      ? ((GET_MODE_SIZE (from) < 8 || GET_MODE_SIZE (to) < 8
-+		  || TARGET_IEEEQUAD)
-+		 && reg_classes_intersect_p (FLOAT_REGS, rclass))
-+	      : (((TARGET_E500_DOUBLE
-+		   && ((((to) == DFmode) + ((from) == DFmode)) == 1
-+		       || (((to) == TFmode) + ((from) == TFmode)) == 1
-+		       || (((to) == DDmode) + ((from) == DDmode)) == 1
-+		       || (((to) == TDmode) + ((from) == TDmode)) == 1
-+		       || (((to) == DImode) + ((from) == DImode)) == 1))
-+		  || (TARGET_SPE
-+		      && (SPE_VECTOR_MODE (from) + SPE_VECTOR_MODE (to)) == 1))
-+		 && reg_classes_intersect_p (GENERAL_REGS, rclass)));
-+
-+  if (TARGET_DEBUG_ADDR)
-+    fprintf (stderr,
-+	     "rs6000_cannot_change_mode_class, return %s, from = %s, "
-+	     "to = %s, rclass = %s\n",
-+	     ret ? "true" : "false",
-+	     GET_MODE_NAME (from), GET_MODE_NAME (to),
-+	     reg_class_names[rclass]);
-+
-+  return ret;
- }
- 

- /* Given a comparison operation, return the bit number in CCR to test.  We
---- gcc/config/rs6000/vsx.md	(revision 144758)
-+++ gcc/config/rs6000/vsx.md	(revision 144843)
-@@ -68,7 +68,13 @@ (define_mode_attr VSbit [(SI "32")
- 			 (DI "64")])
- 
- (define_constants
--  [(UNSPEC_VSX_CONCAT_V2DF	500)])
-+  [(UNSPEC_VSX_CONCAT_V2DF	500)
-+   (UNSPEC_VSX_XVCVDPSP		501)
-+   (UNSPEC_VSX_XVCVDPSXWS	502)
-+   (UNSPEC_VSX_XVCVDPUXWS	503)
-+   (UNSPEC_VSX_XVCVSPDP		504)
-+   (UNSPEC_VSX_XVCVSXWDP	505)
-+   (UNSPEC_VSX_XVCVUXWDP	506)])
- 
- ;; VSX moves
- (define_insn "*vsx_mov<mode>"
-@@ -245,7 +251,7 @@ (define_insn "*vsx_abs<mode>2"
-   "xvabs<VSs> %x0,%x1"
-   [(set_attr "type" "vecfloat")])
- 
--(define_insn "*vsx_nabs<mode>2"
-+(define_insn "vsx_nabs<mode>2"
-   [(set (match_operand:VSX_F 0 "vsx_register_operand" "=<VSr>")
-         (neg:VSX_F
- 	 (abs:VSX_F
-@@ -417,14 +423,14 @@ (define_insn "*vsx_ftrunc<mode>2"
-   "xvr<VSs>piz %x0,%x1"
-   [(set_attr "type" "vecperm")])
- 
--(define_insn "*vsx_float<VSi><mode>2"
-+(define_insn "vsx_float<VSi><mode>2"
-   [(set (match_operand:VSX_F 0 "vsx_register_operand" "=<VSr>")
- 	(float:VSX_F (match_operand:<VSI> 1 "vsx_register_operand" "<VSr>")))]
-   "VECTOR_UNIT_VSX_P (<MODE>mode)"
-   "xvcvsx<VSc><VSs> %x0,%x1"
-   [(set_attr "type" "vecfloat")])
- 
--(define_insn "*vsx_floatuns<VSi><mode>2"
-+(define_insn "vsx_floatuns<VSi><mode>2"
-   [(set (match_operand:VSX_F 0 "vsx_register_operand" "=<VSr>")
- 	(unsigned_float:VSX_F (match_operand:<VSI> 1 "vsx_register_operand" "<VSr>")))]
-   "VECTOR_UNIT_VSX_P (<MODE>mode)"
-@@ -446,6 +452,62 @@ (define_insn "*vsx_fixuns_trunc<mode><VS
-   [(set_attr "type" "vecfloat")])
- 
- 

-+;; VSX convert to/from double vector
-+
-+;; Convert from 64-bit to 32-bit types
-+;; Note, favor the Altivec registers since the usual use of these instructions
-+;; is in vector converts and we need to use the Altivec vperm instruction.
-+
-+(define_insn "vsx_xvcvdpsp"
-+  [(set (match_operand:V4SF 0 "vsx_register_operand" "=v,?wa")
-+	(unspec:V4SF [(match_operand:V2DF 1 "vsx_register_operand" "wd,wa")]
-+		     UNSPEC_VSX_XVCVDPSP))]
-+  "VECTOR_UNIT_VSX_P (V2DFmode)"
-+  "xvcvdpsp %x0,%x1"
-+  [(set_attr "type" "vecfloat")])
-+
-+(define_insn "vsx_xvcvdpsxws"
-+  [(set (match_operand:V4SI 0 "vsx_register_operand" "=v,?wa")
-+	(unspec:V4SI [(match_operand:V2DF 1 "vsx_register_operand" "wd,wa")]
-+		     UNSPEC_VSX_XVCVDPSXWS))]
-+  "VECTOR_UNIT_VSX_P (V2DFmode)"
-+  "xvcvdpsxws %x0,%x1"
-+  [(set_attr "type" "vecfloat")])
-+
-+(define_insn "vsx_xvcvdpuxws"
-+  [(set (match_operand:V4SI 0 "vsx_register_operand" "=v,?wa")
-+	(unspec:V4SI [(match_operand:V2DF 1 "vsx_register_operand" "wd,wa")]
-+		     UNSPEC_VSX_XVCVDPUXWS))]
-+  "VECTOR_UNIT_VSX_P (V2DFmode)"
-+  "xvcvdpuxws %x0,%x1"
-+  [(set_attr "type" "vecfloat")])
-+
-+;; Convert from 32-bit to 64-bit types
-+(define_insn "vsx_xvcvspdp"
-+  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,?wa")
-+	(unspec:V2DF [(match_operand:V4SF 1 "vsx_register_operand" "wf,wa")]
-+		     UNSPEC_VSX_XVCVSPDP))]
-+  "VECTOR_UNIT_VSX_P (V2DFmode)"
-+  "xvcvspdp %x0,%x1"
-+  [(set_attr "type" "vecfloat")])
-+
-+(define_insn "vsx_xvcvsxwdp"
-+  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,?wa")
-+	(unspec:V2DF [(match_operand:V4SI 1 "vsx_register_operand" "wf,wa")]
-+		     UNSPEC_VSX_XVCVSXWDP))]
-+  "VECTOR_UNIT_VSX_P (V2DFmode)"
-+  "xvcvsxwdp %x0,%x1"
-+  [(set_attr "type" "vecfloat")])
-+
-+(define_insn "vsx_xvcvuxwdp"
-+  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,?wa")
-+	(unspec:V2DF [(match_operand:V4SI 1 "vsx_register_operand" "wf,wa")]
-+		     UNSPEC_VSX_XVCVUXWDP))]
-+  "VECTOR_UNIT_VSX_P (V2DFmode)"
-+  "xvcvuxwdp %x0,%x1"
-+  [(set_attr "type" "vecfloat")])
-+
-+

- ;; VSX scalar double precision floating point operations
- (define_insn"*vsx_adddf3"
-   [(set (match_operand:DF 0 "vsx_register_operand" "=ws")
-@@ -753,8 +815,8 @@ (define_insn "*vsx_andc<mode>3"
- (define_insn "vsx_concat_v2df"
-   [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,?wa")
- 	(unspec:V2DF
--	 [(match_operand:DF 1 "vsx_register_operand" "f,wa")
--	  (match_operand:DF 2 "vsx_register_operand" "f,wa")]
-+	 [(match_operand:DF 1 "vsx_register_operand" "ws,wa")
-+	  (match_operand:DF 2 "vsx_register_operand" "ws,wa")]
- 	 UNSPEC_VSX_CONCAT_V2DF))]
-   "VECTOR_UNIT_VSX_P (V2DFmode)"
-   "xxpermdi %x0,%x1,%x2,0"
-@@ -762,32 +824,37 @@ (define_insn "vsx_concat_v2df"
- 
- ;; Set a double into one element
- (define_insn "vsx_set_v2df"
--  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd")
-+  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,?wa")
- 	(vec_merge:V2DF
--	 (match_operand:V2DF 1 "vsx_register_operand" "wd")
--	 (vec_duplicate:V2DF (match_operand:DF 2 "vsx_register_operand" "ws"))
--	 (match_operand:QI 3 "u5bit_cint_operand" "i")))]
-+	 (match_operand:V2DF 1 "vsx_register_operand" "wd,wa")
-+	 (vec_duplicate:V2DF (match_operand:DF 2 "vsx_register_operand" "ws,f"))
-+	 (match_operand:QI 3 "u5bit_cint_operand" "i,i")))]
-   "VECTOR_UNIT_VSX_P (V2DFmode)"
- {
--  operands[3] = GEN_INT (INTVAL (operands[3]) & 1);
--  return \"xxpermdi %x0,%x1,%x2,%3\";
-+  if (INTVAL (operands[3]) == 0)
-+    return \"xxpermdi %x0,%x1,%x2,1\";
-+  else if (INTVAL (operands[3]) == 1)
-+    return \"xxpermdi %x0,%x2,%x1,0\";
-+  else
-+    gcc_unreachable ();
- }
-   [(set_attr "type" "vecperm")])
- 
- ;; Extract a DF element from V2DF
- (define_insn "vsx_extract_v2df"
--  [(set (match_operand:DF 0 "vsx_register_operand" "=ws")
--	(vec_select:DF (match_operand:V2DF 1 "vsx_register_operand" "wd")
-+  [(set (match_operand:DF 0 "vsx_register_operand" "=ws,f,?wa")
-+	(vec_select:DF (match_operand:V2DF 1 "vsx_register_operand" "wd,wd,wa")
- 		       (parallel
--			[(match_operand:QI 2 "u5bit_cint_operand" "i")])))]
-+			[(match_operand:QI 2 "u5bit_cint_operand" "i,i,i")])))]
-   "VECTOR_UNIT_VSX_P (V2DFmode)"
- {
--  operands[3] = GEN_INT (INTVAL (operands[2]) & 1);
-+  gcc_assert (UINTVAL (operands[2]) <= 1);
-+  operands[3] = GEN_INT (INTVAL (operands[2]) << 1);
-   return \"xxpermdi %x0,%x1,%x1,%3\";
- }
-   [(set_attr "type" "vecperm")])
- 
--;; General V2DF permute
-+;; General V2DF permute, extract_{high,low,even,odd}
- (define_insn "vsx_xxpermdi"
-   [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd")
- 	(vec_concat:V2DF
-@@ -799,6 +866,7 @@ (define_insn "vsx_xxpermdi"
- 			 [(match_operand:QI 4 "u5bit_cint_operand" "i")]))))]
-   "VECTOR_UNIT_VSX_P (V2DFmode)"
- {
-+  gcc_assert ((UINTVAL (operands[2]) <= 1) && (UINTVAL (operands[4]) <= 1));
-   operands[5] = GEN_INT (((INTVAL (operands[2]) & 1) << 1)
- 			 | (INTVAL (operands[4]) & 1));
-   return \"xxpermdi %x0,%x1,%x3,%5\";
-@@ -807,14 +875,15 @@ (define_insn "vsx_xxpermdi"
- 
- ;; V2DF splat
- (define_insn "vsx_splatv2df"
--  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,wd")
-+  [(set (match_operand:V2DF 0 "vsx_register_operand" "=wd,wd,wd")
- 	(vec_duplicate:V2DF
--	 (match_operand:DF 1 "input_operand" "ws,Z")))]
-+	 (match_operand:DF 1 "input_operand" "ws,f,Z")))]
-   "VECTOR_UNIT_VSX_P (V2DFmode)"
-   "@
-    xxpermdi %x0,%x1,%x1,0
-+   xxpermdi %x0,%x1,%x1,0
-    lxvdsx %x0,%y1"
--  [(set_attr "type" "vecperm,vecload")])
-+  [(set_attr "type" "vecperm,vecperm,vecload")])
- 
- ;; V4SF splat
- (define_insn "*vsx_xxspltw"
-@@ -828,14 +897,14 @@ (define_insn "*vsx_xxspltw"
-   [(set_attr "type" "vecperm")])
- 
- ;; V4SF interleave
--(define_insn "*vsx_xxmrghw"
--  [(set (match_operand:V4SF 0 "register_operand" "=v")
--        (vec_merge:V4SF (vec_select:V4SF (match_operand:V4SF 1 "register_operand" "v")
-+(define_insn "vsx_xxmrghw"
-+  [(set (match_operand:V4SF 0 "register_operand" "=wf")
-+        (vec_merge:V4SF (vec_select:V4SF (match_operand:V4SF 1 "register_operand" "wf")
-                                          (parallel [(const_int 0)
-                                                     (const_int 2)
-                                                     (const_int 1)
-                                                     (const_int 3)]))
--                        (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "v")
-+                        (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "wf")
-                                          (parallel [(const_int 2)
-                                                     (const_int 0)
-                                                     (const_int 3)
-@@ -845,15 +914,15 @@ (define_insn "*vsx_xxmrghw"
-   "xxmrghw %x0,%x1,%x2"
-   [(set_attr "type" "vecperm")])
- 
--(define_insn "*vsx_xxmrglw"
--  [(set (match_operand:V4SF 0 "register_operand" "=v")
-+(define_insn "vsx_xxmrglw"
-+  [(set (match_operand:V4SF 0 "register_operand" "=wf")
-         (vec_merge:V4SF
--	 (vec_select:V4SF (match_operand:V4SF 1 "register_operand" "v")
-+	 (vec_select:V4SF (match_operand:V4SF 1 "register_operand" "wf")
- 			  (parallel [(const_int 2)
- 				     (const_int 0)
- 				     (const_int 3)
- 				     (const_int 1)]))
--	 (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "v")
-+	 (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "wf")
- 			  (parallel [(const_int 0)
- 				     (const_int 2)
- 				     (const_int 1)
-@@ -862,3 +931,26 @@ (define_insn "*vsx_xxmrglw"
-   "VECTOR_UNIT_VSX_P (V4SFmode)"
-   "xxmrglw %x0,%x1,%x2"
-   [(set_attr "type" "vecperm")])
-+
-+

-+;; Reload patterns for VSX loads/stores.  We need a scratch register to convert
-+;; the stack temporary address from reg+offset to reg+reg addressing.
-+(define_expand "vsx_reload_<VSX_L:mode>_<P:ptrsize>_to_mem"
-+  [(parallel [(match_operand:VSX_L 0 "memory_operand" "")
-+              (match_operand:VSX_L 1 "register_operand" "=wa")
-+              (match_operand:P 2 "register_operand" "=&b")])]
-+  "VECTOR_MEM_VSX_P (<MODE>mode)"
-+{
-+  rs6000_vector_secondary_reload (operands[0], operands[1], operands[2], true);
-+  DONE;
-+})
-+
-+(define_expand "vsx_reload_<VSX_L:mode>_<P:ptrsize>_to_reg"
-+  [(parallel [(match_operand:VSX_L 0 "register_operand" "=wa")
-+              (match_operand:VSX_L 1 "memory_operand" "")
-+              (match_operand:P 2 "register_operand" "=&b")])]
-+  "VECTOR_MEM_VSX_P (<MODE>mode)"
-+{
-+  rs6000_vector_secondary_reload (operands[0], operands[1], operands[2], false);
-+  DONE;
-+})
---- gcc/config/rs6000/rs6000.h	(revision 144758)
-+++ gcc/config/rs6000/rs6000.h	(revision 144843)
-@@ -3388,7 +3388,7 @@ enum rs6000_builtins
-   VSX_BUILTIN_XXSPLTW,
-   VSX_BUILTIN_XXSWAPD,
- 
--  /* Combine VSX/Altivec builtins.  */
-+  /* Combined VSX/Altivec builtins.  */
-   VECTOR_BUILTIN_FLOAT_V4SI_V4SF,
-   VECTOR_BUILTIN_UNSFLOAT_V4SI_V4SF,
-   VECTOR_BUILTIN_FIX_V4SF_V4SI,
---- gcc/config/rs6000/altivec.md	(revision 144758)
-+++ gcc/config/rs6000/altivec.md	(revision 144843)
-@@ -2685,3 +2685,27 @@ (define_expand "vec_unpacku_float_lo_v8h
-   emit_insn (gen_altivec_vcfux (operands[0], tmp, const0_rtx));
-   DONE;
- }")
-+
-+

-+;; Reload patterns for Altivec loads/stores.  We need a scratch register to
-+;; convert the stack temporary address from reg+offset to reg+reg addressing.
-+
-+(define_expand "altivec_reload_<V:mode>_<P:ptrsize>_to_mem"
-+  [(parallel [(match_operand:V 0 "memory_operand" "")
-+              (match_operand:V 1 "register_operand" "=v")
-+              (match_operand:P 2 "register_operand" "=&b")])]
-+  "VECTOR_MEM_ALTIVEC_P (<MODE>mode)"
-+{
-+  rs6000_vector_secondary_reload (operands[0], operands[1], operands[2], true);
-+  DONE;
-+})
-+
-+(define_expand "altivec_reload_<V:mode>_<P:ptrsize>_to_reg"
-+  [(parallel [(match_operand:V 0 "register_operand" "=v")
-+              (match_operand:V 1 "memory_operand" "")
-+              (match_operand:P 2 "register_operand" "=&b")])]
-+  "VECTOR_MEM_ALTIVEC_P (<MODE>mode)"
-+{
-+  rs6000_vector_secondary_reload (operands[0], operands[1], operands[2], false);
-+  DONE;
-+})
---- gcc/config/rs6000/rs6000.md	(revision 144758)
-+++ gcc/config/rs6000/rs6000.md	(revision 144843)
-@@ -222,6 +222,10 @@ (define_mode_attr dbits [(QI "56") (HI "
- ;; ISEL/ISEL64 target selection
- (define_mode_attr sel [(SI "") (DI "64")])
- 
-+;; Suffix for reload patterns
-+(define_mode_attr ptrsize [(SI "32bit")
-+			   (DI "64bit")])
-+
- 

- ;; Start with fixed-point load and store insns.  Here we put only the more
- ;; complex forms.  Basic data transfer is done later.
---- gcc/testsuite/gcc.target/powerpc/vsx-builtin-2.c	(revision 0)
-+++ gcc/testsuite/gcc.target/powerpc/vsx-builtin-2.c	(revision 144843)
-@@ -0,0 +1,29 @@
-+/* { dg-do compile { target { powerpc*-*-* } } } */
-+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-+/* { dg-require-effective-target powerpc_vsx_ok } */
-+/* { dg-options "-O2 -mcpu=power7" } */
-+/* { dg-final { scan-assembler "xvaddsp" } } */
-+/* { dg-final { scan-assembler "xvsubsp" } } */
-+/* { dg-final { scan-assembler "xvmulsp" } } */
-+/* { dg-final { scan-assembler "xvdivsp" } } */
-+/* { dg-final { scan-assembler "xvmaxsp" } } */
-+/* { dg-final { scan-assembler "xvminsp" } } */
-+/* { dg-final { scan-assembler "xvsqrtsp" } } */
-+/* { dg-final { scan-assembler "xvabssp" } } */
-+/* { dg-final { scan-assembler "xvnabssp" } } */
-+
-+void use_builtins (__vector float *p, __vector float *q, __vector float *r)
-+{
-+  __vector float tmp1 = *q;
-+  __vector float tmp2 = *r;
-+
-+  *p++ = __builtin_vsx_xvaddsp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvsubsp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvmulsp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvdivsp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvmaxsp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvminsp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvabssp (tmp1);
-+  *p++ = __builtin_vsx_xvnabssp (tmp1);
-+  *p   = __builtin_vsx_xvsqrtsp (tmp1);
-+}
---- gcc/testsuite/gcc.target/powerpc/vsx-builtin-1.c	(revision 0)
-+++ gcc/testsuite/gcc.target/powerpc/vsx-builtin-1.c	(revision 144843)
-@@ -0,0 +1,29 @@
-+/* { dg-do compile { target { powerpc*-*-* } } } */
-+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-+/* { dg-require-effective-target powerpc_vsx_ok } */
-+/* { dg-options "-O2 -mcpu=power7" } */
-+/* { dg-final { scan-assembler "xvadddp" } } */
-+/* { dg-final { scan-assembler "xvsubdp" } } */
-+/* { dg-final { scan-assembler "xvmuldp" } } */
-+/* { dg-final { scan-assembler "xvdivdp" } } */
-+/* { dg-final { scan-assembler "xvmaxdp" } } */
-+/* { dg-final { scan-assembler "xvmindp" } } */
-+/* { dg-final { scan-assembler "xvsqrtdp" } } */
-+/* { dg-final { scan-assembler "xvabsdp" } } */
-+/* { dg-final { scan-assembler "xvnabsdp" } } */
-+
-+void use_builtins (__vector double *p, __vector double *q, __vector double *r)
-+{
-+  __vector double tmp1 = *q;
-+  __vector double tmp2 = *r;
-+
-+  *p++ = __builtin_vsx_xvadddp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvsubdp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvmuldp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvdivdp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvmaxdp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvmindp (tmp1, tmp2);
-+  *p++ = __builtin_vsx_xvabsdp (tmp1);
-+  *p++ = __builtin_vsx_xvnabsdp (tmp1);
-+  *p   = __builtin_vsx_xvsqrtdp (tmp1);
-+}
---- gcc/testsuite/gcc.target/powerpc/pr39457.c	(revision 0)
-+++ gcc/testsuite/gcc.target/powerpc/pr39457.c	(revision 144857)
-@@ -0,0 +1,56 @@
-+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-+/* { dg-options "-m64 -O2 -mminimal-toc" } */
-+
-+/* PR 39457 -- fix breakage because the compiler ran out of registers and
-+   wanted to stash a floating point value to the LR/CTR register.  */
-+
-+/* -O2 -m64 -mminimal-toc */
-+typedef struct { void *s; } S;
-+typedef void (*T1) (void);
-+typedef void (*T2) (void *, void *, int, void *);
-+char *fn1 (const char *, ...);
-+void *fn2 (void);
-+int fn3 (char *, int);
-+int fn4 (const void *);
-+int fn5 (const void *);
-+long fn6 (void) __attribute__ ((__const__));
-+int fn7 (void *, void *, void *);
-+void *fn8 (void *, long);
-+void *fn9 (void *, long, const char *, ...);
-+void *fn10 (void *);
-+long fn11 (void) __attribute__ ((__const__));
-+long fn12 (void *, const char *, T1, T2, void *);
-+void *fn13 (void *);
-+long fn14 (void) __attribute__ ((__const__));
-+extern void *v1;
-+extern char *v2;
-+extern int v3;
 +
-+void
-+foo (void *x, char *z)
-+{
-+  void *i1, *i2;
-+  int y;
-+  if (v1)
-+    return;
-+  v1 = fn9 (fn10 (fn2 ()), fn6 (), "x", 0., "y", 0., 0);
-+  y = 520 - (520 - fn4 (x)) / 2;
-+  fn9 (fn8 (v1, fn6 ()), fn6 (), "wig", fn8 (v1, fn14 ()), "x", 18.0,
-+       "y", 16.0, "wid", 80.0, "hi", 500.0, 0);
-+  fn9 (fn10 (v1), fn6 (), "x1", 0., "y1", 0., "x2", 80.0, "y2",
-+       500.0, "f", fn3 ("fff", 0x0D0DFA00), 0);
-+  fn13 (((S *) fn8 (v1, fn6 ()))->s);
-+  fn12 (fn8 (v1, fn11 ()), "ev", (T1) fn7, 0, fn8 (v1, fn6 ()));
-+  fn9 (fn8 (v1, fn6 ()), fn6 (), "wig",
-+       fn8 (v1, fn14 ()), "x", 111.0, "y", 14.0, "wid", 774.0, "hi",
-+       500.0, 0);
-+  v1 = fn9 (fn10 (v1), fn6 (), "x1", 0., "y1", 0., "x2", 774.0, "y2",
-+            500.0, "f", fn3 ("gc", 0x0D0DFA00), 0);
-+  fn1 (z, 0);
-+  i1 = fn9 (fn8 (v1, fn6 ()), fn6 (), "pixbuf", x, "x",
-+            800 - fn5 (x) / 2, "y", y - fn4 (x), 0);
-+  fn12 (fn8 (i1, fn11 ()), "ev", (T1) fn7, 0, "/ok/");
-+  fn12 (fn8 (i1, fn11 ()), "ev", (T1) fn7, 0, 0);
-+  i2 = fn9 (fn8 (v1, fn6 ()), fn6 (), "txt", "OK", "fnt", v2, "x",
-+            800, "y", y - fn4 (x) + 15, "ar", 0, "f", v3, 0);
-+}
++      and_rtx = gen_rtx_SET (VOIDmode,
++			     scratch,
++			     gen_rtx_AND (Pmode,
++					  addr,
++					  and_op2));
++
++      cc_clobber = gen_rtx_CLOBBER (CCmode, gen_rtx_SCRATCH (CCmode));
+       emit_insn (gen_rtx_PARALLEL (VOIDmode,
+ 				   gen_rtvec (2, and_rtx, cc_clobber)));
+       addr = scratch;

gcc44-power7.patch:
 config.in                                    |    8 
 config/rs6000/aix53.h                        |    8 
 config/rs6000/aix61.h                        |    8 
 config/rs6000/altivec.md                     |  708 +------
 config/rs6000/constraints.md                 |   28 
 config/rs6000/driver-rs6000.c                |  141 +
 config/rs6000/e500.h                         |    2 
 config/rs6000/linux64.h                      |    2 
 config/rs6000/linux64.opt                    |    2 
 config/rs6000/power7.md                      |  318 +++
 config/rs6000/ppc-asm.h                      |  139 +
 config/rs6000/predicates.md                  |   75 
 config/rs6000/rs6000-c.c                     |  103 -
 config/rs6000/rs6000-protos.h                |   11 
 config/rs6000/rs6000.c                       | 2644 ++++++++++++++++++++-------
 config/rs6000/rs6000.h                       |  464 +++-
 config/rs6000/rs6000.md                      |  421 +++-
 config/rs6000/rs6000.opt                     |   56 
 config/rs6000/spe.md                         |    2 
 config/rs6000/sysv4.h                        |    4 
 config/rs6000/sysv4.opt                      |    6 
 config/rs6000/t-rs6000                       |   30 
 config/rs6000/vector.md                      |  664 ++++++
 config/rs6000/vsx.md                         | 1004 ++++++++++
 configure                                    |   54 
 configure.ac                                 |   23 
 doc/invoke.texi                              |   24 
 doc/md.texi                                  |   17 
 reload.c                                     |   10 
 testsuite/gcc.dg/vmx/vmx.exp                 |    2 
 testsuite/gcc.target/powerpc/popcount-2.c    |    9 
 testsuite/gcc.target/powerpc/popcount-3.c    |    9 
 testsuite/gcc.target/powerpc/pr39457.c       |   56 
 testsuite/gcc.target/powerpc/vsx-builtin-1.c |   42 
 testsuite/gcc.target/powerpc/vsx-builtin-2.c |   42 
 testsuite/gcc.target/powerpc/vsx-vector-1.c  |   74 
 testsuite/gcc.target/powerpc/vsx-vector-2.c  |   74 
 testsuite/gcc.target/powerpc/vsx-vector-3.c  |   48 
 testsuite/gcc.target/powerpc/vsx-vector-4.c  |   48 
 testsuite/lib/target-supports.exp            |   60 
 40 files changed, 5999 insertions(+), 1441 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gcc44-power7.patchIndex: gcc44-power7.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/gcc44-power7.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-power7.patch	23 Mar 2009 10:56:41 -0000	1.1
+++ gcc44-power7.patch	25 Aug 2009 20:26:28 -0000	1.2
@@ -1,3 +1,247 @@
+2009-04-08  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* doc/invoke.texi (-mvsx-vector-memory): Make debug switches
+	undoucmented.
+	(-mvsx-vector-float): Ditto.
+	(-mvsx-vector-double): Ditto.
+	(-mvsx-scalar-double): Ditto.
+	(-mvsx-scalar-memory): Ditto.
+
+	* config/rs6000/vector.md (VEC_R): New iterator for reload
+	patterns.
+	(mov<mode>): Don't call rs6000_emit_move.
+	(reload_<VEC_R:mode>_<P:mptrsize>_*): New insns for
+	secondary_reload support.
+	(vec_reload_and_plus_<mptrsize>): New insns in case reload needs
+	to move a VSX/Altivec (and (plus reg reg) -16) type address to a
+	base register.
+
+	* config/rs6000/rs6000-protos.h (rs6000_secondary_reload_inner):
+	Rename from rs6000_vector_secondary_reload.
+
+	* config/rs6000/rs6000.opt (-mvsx-vector-memory): Make debug
+	switches undoucmented.
+	(-mvsx-vector-float): Ditto.
+	(-mvsx-vector-double): Ditto.
+	(-mvsx-scalar-double): Ditto.
+	(-mvsx-scalar-memory): Ditto.
+	(-mvsx-v4sf-altivec-regs): New undocumented debug switch to
+	control whether V4SF types prefer the Altivec registers or all of
+	the VSX registers.
+	(-mreload-functions): New undocumented debug switch to
+	enable/disable the secondary reload support.
+
+	* config/rs6000/rs6000.c (rs6000_regno_regclass): New global to
+	map register number to regclass.
+	(rs6000_vector_reload): New array to hold the secondary reload
+	insn codes for the vector types.
+	(rs6000_init_hard_regno_mode_ok): Fill in rs6000_regno_regclass
+	and rs6000_vector_reload.
+	(rs6000_mode_dependent_address): Using AND in addresses is mode
+	dependent.
+	(rs6000_emit_move): Add debug information if -mdebug=addr.
+	(rs6000_reload_register_type): Classify register classes for
+	secondary reload.
+	(rs6000_secondary_reload): For the vector types, add reload
+	support to support reg+reg addressing for gprs, and reg+offset
+	addressing for vector registers.
+	(rs6000_secondary_reload_inner): Rename from
+	rs6000_vector_secondary_reload.  Fixup gpr addressing to just reg
+	or reg+offset, and vector addressing to just reg or reg+reg.
+	(rs6000_preferred_reload_class): Make sure all cases set the
+	return value.  If VSX/Altivec address with AND -16, prefer using
+	an Altivec register.
+	(rs6000_secondary_memory_needed): Handle things like SFmode that
+	can go in floating registers, but not altivec registers under
+	-mvsx.
+
+	* config/rs6000/vsx.md (VSX_U): New iterator for load/store with
+	update.
+	(VSi, VSI): Reorder fields.
+	(VSd): Add support for load/store with update rewrite.
+	(VSv): Ditto.
+	(VStype_load_update): New mode attribute for load/store with
+	update.
+	(VStype_store_update): Ditto.
+	(vsx_mov<type>): Use * instead of store/load attributes for
+	multi-instruction gpr loads/stores.
+	(vsx_reload**): Delete unused reload patterns.
+
+	* config/rs6000/rs6000.h (REGNO_REG_CLASS): Change from a bunch of
+	if statements to using a lookup table.
+	(rs6000_regno_regclass): Lookup table for REGNO_REG_CLASS.
+
+	* config/rs6000/altivec.md (altivec_reload*): Delete unused reload
+	patterns.
+
+	* config/rs6000/rs6000.md (tptrsize, mptrsize): New mode
+	attributes for -m32/-m64 support.
+
+2009-03-27  Jakub Jelinek  <jakub at redhat.com>
+
+	PR target/39558
+	* macro.c (cpp_get_token): If macro_to_expand returns NULL
+	and used some tokens, add CPP_PADDING before next token.
+
+	* gcc.target/powerpc/altivec-29.c: New test.
+
+2009-03-27  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* config/rs6000/constraints.md ("wZ" constraint): New constraint
+	for using Altivec loads/stores under VSX for vector realignment.
+
+	* config/rs6000/predicates.md
+	(altivec_indexed_or_indirect_operand): New predicate to recognize
+	Altivec load/stores with an explicit AND -16.
+
+	* config/rs6000/power7.md: Whitespace change.
+
+	* config/rs6000/rs6000.opt (-mpower7-adjust-cost): New debug
+	switch.
+
+	* config/rs6000/rs6000-c.c (altivec_categorize_keyword): If -mvsx
+	and -mno-altivec, recognize the 'vector' keyword, but do not
+	recognize 'bool' or 'pixel'.  Recognize vector double under VSX.
+	(init_vector_keywords): Ditto.
+	(rs6000_macro_to_expand): Ditto.
+	(altivec_overloaded_builtins): Add VSX overloaded builtins.
+	(altivec_resolve_overloaded_builtin): Ditto.
+
+	* config/rs6000/rs6000.c (rs6000_debug_cost): New global for
+	-mdebug=cost.
+	(rs6000_debug_address_cost): New function for printing costs if
+	-mdebug=cost.
+	(rs6000_debug_rtx_costs): Ditto.
+	(rs6000_debug_adjust_cost): Ditto.
+	(rs6000_override_options): Add -mdebug=cost support.
+	(rs6000_legitimize_reload_address): Allow Altivec loads and stores
+	with an explicit AND -16, in VSX for vector realignment.
+	(rs6000_legitimize_reload_address): Ditto.
+	(rs6000_legitimate_address): Ditto.
+	(print_operand): Ditto.
+	(bdesc_3arg): Add VSX builtins.
+	(bdesc_2arg): Ditto.
+	(bdesc_1arg): Ditto.
+	(bdesc_abs): Ditto.
+	(vsx_expand_builtin): Stub function for expanding VSX builtins.
+	(rs6000_expand_builtin): Call vsx_expand_builtin.
+
+	* config/rs6000/vsx.md (most DF insns): Merge DF insns in with
+	V2DF and V4SF insns, rather than duplicating much of the code.
+	(all insns): Go through all insns, and alternatives to address the
+	full VSX register set, as a non-preferred option.
+	(vsx_mod<mode>): Add support for using Altivec load/store with
+	explicit AND -16.  Use xxlor to copy registers, not copy sign.
+	(multiply/add insns): Add an expander and unspec so the insn can
+	be used directly even if -mno-fused-madd.
+	(vsx_tdiv<mode>3): New insn for use as a builtin function.
+	(vsx_tsqrt<mode>2): Ditto.
+	(vsx_rsqrte<mode>2): Ditto.
+
+	* config/rs6000/rs6000.h (rs6000_debug_cost): New for
+	-mdebug=cost.
+	(TARGET_DEBUG_COST): Ditto.
+	(VSX_BUILTIN_*): Merge the two forms of multiply/add instructions
+	into a single insn.  Start to add overloaded VSX builtins.
+
+	* config/rs6000/altivec.md (build_vector_mask_for_load): Delete
+	VSX code.
+
+	* config/rs6000/rs6000.md (btruncsf2): Delete extra space.
+	(movdf_hardfloat32): Use xxlor instead of xscpsgndp to copy data.
+	(movdf_hardfloat64_mfpgpr): Ditto.
+	(movdf_hardfloat64): Ditto.
+
+2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	PR target/39457
+	* config/rs6000/rs6000.opt (-mdisallow-float-in-lr-ctr): Add
+	temporary debug switch.
+
+	* config/rs6000/rs6000.c (rs6000_hard_regno_mode_ok): Revert
+	behavior of disallowing 
+
+2009-03-13  Michael Meissner  <meissner at linux.vnet.ibm.com>
+
+	* config/rs6000/vector.md (vec_extract_evenv2df): Delete, insn
+	causes problems in building spec 2006.
+	(vec_extract_oddv2df): Ditto.
+	(vec_pack_trunc_v2df): New expanders for VSX vectorized
+	conversions.
+	(vec_pack_sfix_trunc_v2df): Ditto.
+	(vec_pack_ufix_trunc_v2df): Ditto.
+	(vec_unpacks_hi_v4sf): Ditto.
+	(vec_unpacks_lo_v4sf): Ditto.
+	(vec_unpacks_float_hi_v4si): Ditto.
+	(vec_unpacks_float_lo_v4si): Ditto.
+	(vec_unpacku_float_hi_v4si): Ditto.
+	(vec_unpacku_float_lo_v4si): Ditto.
+
+	* config/rs6000/rs6000-protos.h (rs6000_vector_secondary_reload):
+	Declaration for new target hook.
+
+	* config/rs6000/rs6000.c (TARGET_SECONDARY_RELOAD): Add new target
+	hook for eventually fixing up the memory references for Altivec
+	and VSX reloads to be reg+reg instead of reg+offset.  Right now,
+	this is a stub function that prints debug information if
+	-mdebug=addr and then calls default_secondary_reload.
+	(rs6000_secondary_reload): Ditto.
+	(rs6000_vector_secondary_reload): Ditto.
+	(rs6000_builtin_conversion): Add support for V2DI/V2DF
+	conversions.
[...6181 lines suppressed...]
@@ -9023,7 +10958,7 @@ testsuite/
     (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
  
  (define_split
-@@ -7718,7 +7828,9 @@ (define_insn "*anddi3_internal3_mc"
+@@ -7718,7 +7838,9 @@
     #
     #
     #"
@@ -9034,7 +10969,7 @@ testsuite/
     (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
  
  (define_split
-@@ -7858,7 +7970,7 @@ (define_insn "*booldi3_internal2"
+@@ -7858,7 +7980,7 @@
    "@
     %q4. %3,%1,%2
     #"
@@ -9043,7 +10978,7 @@ testsuite/
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -7887,7 +7999,7 @@ (define_insn "*booldi3_internal3"
+@@ -7887,7 +8009,7 @@
    "@
     %q4. %0,%1,%2
     #"
@@ -9052,7 +10987,7 @@ testsuite/
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -7958,7 +8070,7 @@ (define_insn "*boolcdi3_internal2"
+@@ -7958,7 +8080,7 @@
    "@
     %q4. %3,%2,%1
     #"
@@ -9061,7 +10996,7 @@ testsuite/
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -7987,7 +8099,7 @@ (define_insn "*boolcdi3_internal3"
+@@ -7987,7 +8109,7 @@
    "@
     %q4. %0,%2,%1
     #"
@@ -9070,7 +11005,7 @@ testsuite/
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -8024,7 +8136,7 @@ (define_insn "*boolccdi3_internal2"
+@@ -8024,7 +8146,7 @@
    "@
     %q4. %3,%1,%2
     #"
@@ -9079,7 +11014,7 @@ testsuite/
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -8053,7 +8165,7 @@ (define_insn "*boolccdi3_internal3"
+@@ -8053,7 +8175,7 @@
    "@
     %q4. %0,%1,%2
     #"
@@ -9088,7 +11023,7 @@ testsuite/
     (set_attr "length" "4,8")])
  
  (define_split
-@@ -8070,6 +8182,51 @@ (define_split
+@@ -8070,6 +8192,51 @@
  	(compare:CC (match_dup 0)
  		    (const_int 0)))]
    "")
@@ -9140,7 +11075,7 @@ testsuite/
  

  ;; Now define ways of moving data around.
  
-@@ -8473,8 +8630,8 @@ (define_split
+@@ -8473,8 +8640,8 @@
  ;; The "??" is a kludge until we can figure out a more reasonable way
  ;; of handling these non-offsettable values.
  (define_insn "*movdf_hardfloat32"
@@ -9151,14 +11086,14 @@ testsuite/
    "! TARGET_POWERPC64 && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_DOUBLE_FLOAT 
     && (gpc_reg_operand (operands[0], DFmode)
         || gpc_reg_operand (operands[1], DFmode))"
-@@ -8553,19 +8710,30 @@ (define_insn "*movdf_hardfloat32"
+@@ -8553,19 +8720,30 @@
  	  return \"\";
  	}
      case 3:
 -      return \"fmr %0,%1\";
      case 4:
 -      return \"lfd%U1%X1 %0,%1\";
-+      return \"xscpsgndp %x0,%x1,%x1\";
++      return \"xxlor %x0,%x1,%x1\";
      case 5:
 -      return \"stfd%U0%X0 %1,%0\";
      case 6:
@@ -9187,7 +11122,7 @@ testsuite/
  
  (define_insn "*movdf_softfloat32"
    [(set (match_operand:DF 0 "nonimmediate_operand" "=r,r,m,r,r,r")
-@@ -8613,19 +8781,26 @@ (define_insn "*movdf_softfloat32"
+@@ -8613,19 +8791,26 @@
  ; ld/std require word-aligned displacements -> 'Y' constraint.
  ; List Y->r and r->Y before r->r for reload.
  (define_insn "*movdf_hardfloat64_mfpgpr"
@@ -9204,8 +11139,8 @@ testsuite/
     std%U0%X0 %1,%0
     ld%U1%X1 %0,%1
     mr %0,%1
-+   xscpsgndp %x0,%x1,%x1
-+   xscpsgndp %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
 +   lxsd%U1x %x0,%y1
 +   lxsd%U1x %x0,%y1
 +   stxsd%U0x %x1,%y0
@@ -9217,7 +11152,7 @@ testsuite/
     mt%0 %1
     mf%1 %0
     {cror 0,0,0|nop}
-@@ -8634,33 +8809,40 @@ (define_insn "*movdf_hardfloat64_mfpgpr"
+@@ -8634,33 +8819,40 @@
     #
     mftgpr %0,%1
     mffgpr %0,%1"
@@ -9242,8 +11177,8 @@ testsuite/
     std%U0%X0 %1,%0
     ld%U1%X1 %0,%1
     mr %0,%1
-+   xscpsgndp %x0,%x1,%x1
-+   xscpsgndp %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
++   xxlor %x0,%x1,%x1
 +   lxsd%U1x %x0,%y1
 +   lxsd%U1x %x0,%y1
 +   stxsd%U0x %x1,%y0
@@ -9265,7 +11200,7 @@ testsuite/
  
  (define_insn "*movdf_softfloat64"
    [(set (match_operand:DF 0 "nonimmediate_operand" "=r,Y,r,cl,r,r,r,r,*h")
-@@ -9237,15 +9419,16 @@ (define_insn "*movti_string"
+@@ -9237,15 +9429,16 @@
  (define_insn "*movti_ppc64"
    [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o<>,r")
  	(match_operand:TI 1 "input_operand" "r,r,m"))]
@@ -9285,7 +11220,7 @@ testsuite/
    [(set (match_dup 2) (match_dup 4))
     (set (match_dup 3) (match_dup 5))]
    "
-@@ -9271,7 +9454,7 @@ (define_split
+@@ -9271,7 +9464,7 @@
  (define_split
    [(set (match_operand:TI 0 "nonimmediate_operand" "")
          (match_operand:TI 1 "input_operand" ""))]
@@ -9294,7 +11229,7 @@ testsuite/
     && gpr_or_gpr_p (operands[0], operands[1])"
    [(pc)]
  { rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
-@@ -14891,6 +15074,8 @@ (define_insn "prefetch"
+@@ -14891,6 +15084,8 @@
  

  
  (include "sync.md")
@@ -9303,8 +11238,8 @@ testsuite/
  (include "altivec.md")
  (include "spe.md")
  (include "dfp.md")
---- gcc/config/rs6000/e500.h	(.../trunk)	(revision 144557)
-+++ gcc/config/rs6000/e500.h	(.../branches/ibm/power7-meissner)	(revision 144730)
+--- gcc/config/rs6000/e500.h	(.../trunk)	(revision 145777)
++++ gcc/config/rs6000/e500.h	(.../branches/ibm/power7-meissner)	(revision 146027)
 @@ -37,6 +37,8 @@
        {									\
  	if (TARGET_ALTIVEC)						\
@@ -9314,8 +11249,8 @@ testsuite/
  	if (TARGET_64BIT)						\
  	  error ("64-bit E500 not supported");				\
  	if (TARGET_HARD_FLOAT && TARGET_FPRS)				\
---- gcc/config/rs6000/driver-rs6000.c	(.../trunk)	(revision 144557)
-+++ gcc/config/rs6000/driver-rs6000.c	(.../branches/ibm/power7-meissner)	(revision 144730)
+--- gcc/config/rs6000/driver-rs6000.c	(.../trunk)	(revision 145777)
++++ gcc/config/rs6000/driver-rs6000.c	(.../branches/ibm/power7-meissner)	(revision 146027)
 @@ -343,11 +343,115 @@ detect_processor_aix (void)
  #endif /* _AIX */
  
@@ -9496,9 +11431,9 @@ testsuite/
    return concat (cache, "-m", argv[0], "=", cpu, " ", options, NULL);
  }
  
---- gcc/config/rs6000/sysv4.h	(.../trunk)	(revision 144557)
-+++ gcc/config/rs6000/sysv4.h	(.../branches/ibm/power7-meissner)	(revision 144730)
-@@ -119,9 +119,9 @@ do {									\
+--- gcc/config/rs6000/sysv4.h	(.../trunk)	(revision 145777)
++++ gcc/config/rs6000/sysv4.h	(.../branches/ibm/power7-meissner)	(revision 146027)
+@@ -120,9 +120,9 @@ do {									\
    else if (!strcmp (rs6000_abi_name, "i960-old"))			\
      {									\
        rs6000_current_abi = ABI_V4;					\

gcc44-rh330771.patch:
 Makefile.am |    2 ++
 Makefile.in |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: gcc44-rh330771.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/gcc44-rh330771.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-rh330771.patch	20 Feb 2009 19:59:34 -0000	1.1
+++ gcc44-rh330771.patch	25 Aug 2009 20:26:28 -0000	1.2
@@ -3,20 +3,20 @@
 	* Makefile.am (libgcj_tools_la_LIBADD): Add.
 	* Makefile.in: Regenerated.
 
---- libjava/Makefile.am.jj	2007-03-17 09:20:30.000000000 +0100
-+++ libjava/Makefile.am	2007-10-16 15:45:14.000000000 +0200
-@@ -277,6 +277,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje
- 
- libgcj_tools_la_SOURCES = classpath/tools/tools.zip
- libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+--- libjava/Makefile.am.jj	2009-05-06 08:14:50.000000000 +0200
++++ libjava/Makefile.am	2009-05-06 10:26:43.000000000 +0200
+@@ -314,6 +314,8 @@ libgcj_tools_la_SOURCES = classpath/tool
+ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
+  -fno-bootstrap-classes -fno-indirect-classes \
+  -fsource-filename=$(here)/classpath/tools/all-classes.lst
 +## See jv_convert_LDADD.
 +libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
  libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
   -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
   $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
---- libjava/Makefile.in.jj	2007-07-04 21:11:11.000000000 +0200
-+++ libjava/Makefile.in	2007-10-16 15:56:07.000000000 +0200
-@@ -153,7 +153,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
+--- libjava/Makefile.in.jj	2009-05-06 08:14:49.000000000 +0200
++++ libjava/Makefile.in	2009-05-06 10:27:18.000000000 +0200
+@@ -160,7 +160,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
  am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
  lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
  @XLIB_AWT_TRUE at am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
@@ -24,10 +24,10 @@
  am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
  libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
  @INTERPRETER_TRUE at am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
-@@ -941,6 +940,7 @@ libgcj_la_LINK = $(LIBLINK)
- EXTRA_libgcj_la_SOURCES = java/lang/Object.java
- libgcj_tools_la_SOURCES = classpath/tools/tools.zip
- libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+@@ -1041,6 +1040,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS
+  -fno-bootstrap-classes -fno-indirect-classes \
+  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+ 
 +libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
  libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
   -version-info `grep -v '^\#' $(srcdir)/libtool-version` \


Index: mingw32-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-gcc.spec	25 Jul 2009 12:17:32 -0000	1.6
+++ mingw32-gcc.spec	25 Aug 2009 20:26:28 -0000	1.7
@@ -1,14 +1,14 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
-%define DATE 20090319
-%define SVNREV 144967
+%global DATE 20090818
+%global SVNREV 150873
 
 Name:           mingw32-gcc
-Version:        4.4.0
-Release:        0.8%{?dist}
+Version:        4.4.1
+Release:        1%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C
 
-License:        GPLv3+ and GPLv2+ with exceptions
+License:        GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 
 # We use the same source as Fedora's native gcc.
@@ -25,8 +25,6 @@ Patch2:         gcc44-c++-builtin-redecl
 Patch3:         gcc44-ia64-libunwind.patch
 Patch4:         gcc44-java-nomulti.patch
 Patch5:         gcc44-ppc32-retaddr.patch
-Patch7:         gcc44-pr27898.patch
-Patch8:         gcc44-pr32139.patch
 Patch9:         gcc44-pr33763.patch
 Patch10:        gcc44-rh330771.patch
 Patch11:        gcc44-rh341221.patch
@@ -37,13 +35,15 @@ Patch16:        gcc44-libgomp-omp_h-mult
 Patch20:        gcc44-libtool-no-rpath.patch
 Patch21:        gcc44-cloog-dl.patch
 Patch22:        gcc44-raw-string.patch
-Patch24:        gcc44-atom.patch
-Patch25:        gcc44-pr39226.patch
-Patch26:        gcc44-power7.patch
-Patch27:        gcc44-power7-2.patch
+Patch24:        gcc44-unwind-debug-hook.patch
+Patch25:        gcc44-power7.patch
+Patch26:        gcc44-power7-2.patch
+Patch27:        gcc44-power7-3.patch
 Patch28:        gcc44-pr38757.patch
-Patch29:        gcc44-pr37959.patch
-Patch30:        gcc44-memmove-opt.patch
+#Patch29:        gcc44-libstdc++-docs.patch
+Patch30:        gcc44-rh503816-1.patch
+Patch31:        gcc44-rh503816-2.patch
+Patch32:        gcc44-unique-object.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -128,8 +128,6 @@ MinGW Windows cross-compiler for FORTRAN
 %patch3 -p0 -b .ia64-libunwind~
 %patch4 -p0 -b .java-nomulti~
 %patch5 -p0 -b .ppc32-retaddr~
-%patch7 -p0 -b .pr27898~
-%patch8 -p0 -b .pr32139~
 %patch9 -p0 -b .pr33763~
 %patch10 -p0 -b .rh330771~
 %patch11 -p0 -b .rh341221~
@@ -140,13 +138,17 @@ MinGW Windows cross-compiler for FORTRAN
 %patch20 -p0 -b .libtool-no-rpath~
 %patch21 -p0 -b .cloog-dl~
 %patch22 -p0 -b .raw-string~
-%patch24 -p0 -b .atom~
-%patch25 -p0 -b .pr39226~
-%patch26 -p0 -b .power7~
-%patch27 -p0 -b .power7-2~
+%patch24 -p0 -b .unwind-debug-hook~
+%patch25 -p0 -b .power7~
+%patch26 -p0 -b .power7-2~
+%patch27 -p0 -b .power7-3~
 %patch28 -p0 -b .pr38757~
-%patch29 -p0 -b .pr37959~
-%patch30 -p0 -b .memmove-opt~
+%patch30 -p0 -b .rh503816-1~
+%patch31 -p0 -b .rh503816-2~
+%patch32 -p0 -b .unique-object~
+
+sed -i -e 's/4\.4\.2/%{version}/' gcc/BASE-VER
+echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
 
 
 %build
@@ -216,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/i686-pc-mingw32-gcc
 %{_bindir}/i686-pc-mingw32-gcc-%{version}
 %{_bindir}/i686-pc-mingw32-gccbug
@@ -253,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files -n mingw32-cpp
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /lib/i686-pc-mingw32-cpp
 %{_bindir}/i686-pc-mingw32-cpp
 %{_mandir}/man1/i686-pc-mingw32-cpp.1*
@@ -263,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files c++
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/i686-pc-mingw32-g++
 %{_bindir}/i686-pc-mingw32-c++
 %{_mandir}/man1/i686-pc-mingw32-g++.1*
@@ -275,19 +277,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files objc
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/include/objc/
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libobjc.a
 %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1obj
 
 
 %files objc++
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1objplus
 
 
 %files gfortran
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/i686-pc-mingw32-gfortran
 %{_mandir}/man1/i686-pc-mingw32-gfortran.1*
 %{_libdir}/gcc/i686-pc-mingw32/%{version}/libgfortran.a
@@ -296,6 +298,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 23 2009 Kalev Lember <kalev at smartlink.ee> - 4.4.1-1
+- Update to gcc 4.4.1 20090818 svn 150873.
+- Patches taken from native Fedora gcc-4.4.1-6.
+- Replaced %%define with %%global and updated %%defattr.
+- Changed license to match native Fedora gcc package.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.0-0.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Mar 2009 10:56:41 -0000	1.4
+++ sources	25 Aug 2009 20:26:28 -0000	1.5
@@ -1 +1 @@
-2992035eaf092d72eb98ad16b173f737  gcc-4.4.0-20090319.tar.bz2
+a280c87e7d0a44a99a6bc84bbe3eb86d  gcc-4.4.1-20090818.tar.bz2


--- gcc44-atom.patch DELETED ---


--- gcc44-memmove-opt.patch DELETED ---


--- gcc44-pr27898.patch DELETED ---


--- gcc44-pr32139.patch DELETED ---


--- gcc44-pr37959.patch DELETED ---


--- gcc44-pr39226.patch DELETED ---



From toshio at fedoraproject.org  Tue Aug 25 20:28:19 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 25 Aug 2009 20:28:19 +0000 (UTC)
Subject: rpms/bzr-gtk/F-11 .cvsignore, 1.15, 1.16 bzr-gtk.spec, 1.40,
	1.41 sources, 1.15, 1.16
Message-ID: <20090825202819.8434111C0374@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25376/F-11

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:

* Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
- Update to latest bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	10 Jul 2009 22:34:05 -0000	1.15
+++ .cvsignore	25 Aug 2009 20:28:19 -0000	1.16
@@ -1 +1 @@
-bzr-gtk-0.96.2.tar.gz
+bzr-gtk-0.97.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-11/bzr-gtk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- bzr-gtk.spec	10 Jul 2009 22:34:05 -0000	1.40
+++ bzr-gtk.spec	25 Aug 2009 20:28:19 -0000	1.41
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.96.2
+Version:        0.97.0
 Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
@@ -131,6 +131,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
+- Update to latest bugfix release.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.96.2-1
 - Update to work with bzr-1.16
 - Update rhel version reqs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	10 Jul 2009 22:34:05 -0000	1.15
+++ sources	25 Aug 2009 20:28:19 -0000	1.16
@@ -1 +1 @@
-3873dc9efcbc7a655f1c890be406a867  bzr-gtk-0.96.2.tar.gz
+b35d3d86c6e89e0a8d4039d948aa14fc  bzr-gtk-0.97.0.tar.gz



From toshio at fedoraproject.org  Tue Aug 25 20:28:19 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 25 Aug 2009 20:28:19 +0000 (UTC)
Subject: rpms/bzr-gtk/F-10 .cvsignore, 1.15, 1.16 bzr-gtk.spec, 1.38,
	1.39 sources, 1.15, 1.16
Message-ID: <20090825202819.6E9D111C0044@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25376/F-10

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:

* Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
- Update to latest bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	10 Jul 2009 23:41:45 -0000	1.15
+++ .cvsignore	25 Aug 2009 20:28:19 -0000	1.16
@@ -1 +1 @@
-bzr-gtk-0.96.2.tar.gz
+bzr-gtk-0.97.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-10/bzr-gtk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- bzr-gtk.spec	10 Jul 2009 23:41:45 -0000	1.38
+++ bzr-gtk.spec	25 Aug 2009 20:28:19 -0000	1.39
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.96.2
+Version:        0.97.0
 Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
@@ -131,6 +131,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
+- Update to latest bugfix release.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.96.2-1
 - Update to work with bzr-1.16
 - Update rhel version reqs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	10 Jul 2009 23:41:46 -0000	1.15
+++ sources	25 Aug 2009 20:28:19 -0000	1.16
@@ -1 +1 @@
-3873dc9efcbc7a655f1c890be406a867  bzr-gtk-0.96.2.tar.gz
+b35d3d86c6e89e0a8d4039d948aa14fc  bzr-gtk-0.97.0.tar.gz



From mclasen at fedoraproject.org  Tue Aug 25 20:38:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 20:38:32 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.87, 1.88 gnome-desktop.spec, 
	1.223, 1.224 sources, 1.87, 1.88
Message-ID: <20090825203832.C9B0811C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27215

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	29 Jul 2009 02:52:54 -0000	1.87
+++ .cvsignore	25 Aug 2009 20:38:32 -0000	1.88
@@ -1 +1 @@
-gnome-desktop-2.27.5.tar.bz2
+gnome-desktop-2.27.91.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- gnome-desktop.spec	17 Aug 2009 03:19:54 -0000	1.223
+++ gnome-desktop.spec	25 Aug 2009 20:38:32 -0000	1.224
@@ -11,13 +11,11 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.27.5
-Release: 5%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
 Patch1: concatenate-edid-descriptors.patch
-# from upstream
-Patch2: slideshow-api.patch
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -77,7 +75,6 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
-%patch2 -p1 -b .slideshow-api
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -125,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Sun Aug 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-5
 - Add slideshow api
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- sources	29 Jul 2009 02:52:54 -0000	1.87
+++ sources	25 Aug 2009 20:38:32 -0000	1.88
@@ -1 +1 @@
-0821f55e64126d371315f81c2a5fb012  gnome-desktop-2.27.5.tar.bz2
+155706e4963e911396b51cd2428f08b3  gnome-desktop-2.27.91.tar.bz2



From rvinyard at fedoraproject.org  Tue Aug 25 20:51:58 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 20:51:58 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.24,1.25
Message-ID: <20090825205158.C890111C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29819

Modified Files:
	conexus.spec 
Log Message:



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- conexus.spec	25 Aug 2009 16:17:08 -0000	1.24
+++ conexus.spec	25 Aug 2009 20:51:58 -0000	1.25
@@ -16,7 +16,9 @@ BuildRequires:    boost-devel
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 BuildRequires:    libudev-devel >= 139
+%endif
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
 BuildRequires:    papyrus-extras-devel >= 0.10
@@ -35,7 +37,9 @@ Requires:         conexus = %{version}-%
 Requires:         glibmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Requires:         libcap-devel
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 Requires:         libudev-devel
+%endif
 
 %description    devel
 C++ libraries and header files needed for developing applications that
@@ -169,10 +173,10 @@ developing conexus-nspr applications.
 %build
 
 # We need Fedora 11+ for proper udev support
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --enable-udev
 %else
-%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --disable-udev
 %endif
 
 %{__make} %{?_smp_mflags}
@@ -293,6 +297,7 @@ find %{buildroot} -type f -name "*.la" -
 %changelog
 * Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
 - New release
+- Make udev buildrequires conditional
 
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl



From rvinyard at fedoraproject.org  Tue Aug 25 20:52:07 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 20:52:07 +0000 (UTC)
Subject: rpms/conexus/F-11 conexus.spec,1.21,1.22
Message-ID: <20090825205207.67CA211C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29880

Modified Files:
	conexus.spec 
Log Message:



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-11/conexus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- conexus.spec	25 Aug 2009 16:17:17 -0000	1.21
+++ conexus.spec	25 Aug 2009 20:52:07 -0000	1.22
@@ -16,7 +16,9 @@ BuildRequires:    boost-devel
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 BuildRequires:    libudev-devel >= 139
+%endif
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
 BuildRequires:    papyrus-extras-devel >= 0.10
@@ -35,7 +37,9 @@ Requires:         conexus = %{version}-%
 Requires:         glibmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Requires:         libcap-devel
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 Requires:         libudev-devel
+%endif
 
 %description    devel
 C++ libraries and header files needed for developing applications that
@@ -169,10 +173,10 @@ developing conexus-nspr applications.
 %build
 
 # We need Fedora 11+ for proper udev support
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --enable-udev
 %else
-%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --disable-udev
 %endif
 
 %{__make} %{?_smp_mflags}
@@ -293,6 +297,7 @@ find %{buildroot} -type f -name "*.la" -
 %changelog
 * Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
 - New release
+- Make udev buildrequires conditional
 
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl



From rvinyard at fedoraproject.org  Tue Aug 25 20:52:16 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 20:52:16 +0000 (UTC)
Subject: rpms/conexus/F-10 conexus.spec,1.18,1.19
Message-ID: <20090825205216.0AA1C11C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29921

Modified Files:
	conexus.spec 
Log Message:



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/conexus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- conexus.spec	25 Aug 2009 16:17:25 -0000	1.18
+++ conexus.spec	25 Aug 2009 20:52:15 -0000	1.19
@@ -16,7 +16,9 @@ BuildRequires:    boost-devel
 BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 BuildRequires:    libudev-devel >= 139
+%endif
 BuildRequires:    gtkmm24-devel >= 2.6
 BuildRequires:    papyrus-gtkmm-devel >= 0.10
 BuildRequires:    papyrus-extras-devel >= 0.10
@@ -35,7 +37,9 @@ Requires:         conexus = %{version}-%
 Requires:         glibmm24-devel >= 2.6.0
 Requires:         pkgconfig
 Requires:         libcap-devel
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 Requires:         libudev-devel
+%endif
 
 %description    devel
 C++ libraries and header files needed for developing applications that
@@ -169,10 +173,10 @@ developing conexus-nspr applications.
 %build
 
 # We need Fedora 11+ for proper udev support
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --enable-udev
 %else
-%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
+%configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus --disable-udev
 %endif
 
 %{__make} %{?_smp_mflags}
@@ -293,6 +297,7 @@ find %{buildroot} -type f -name "*.la" -
 %changelog
 * Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
 - New release
+- Make udev buildrequires conditional
 
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl



From rvinyard at fedoraproject.org  Tue Aug 25 20:54:47 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 20:54:47 +0000 (UTC)
Subject: rpms/conexus/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20090825205447.93FE511C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30465

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Jun 2009 19:49:56 -0000	1.13
+++ .cvsignore	25 Aug 2009 20:54:47 -0000	1.14
@@ -1 +1 @@
-conexus-0.8.0.tar.bz2
+conexus-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Jun 2009 19:49:56 -0000	1.13
+++ sources	25 Aug 2009 20:54:47 -0000	1.14
@@ -1 +1 @@
-b44b16a269c20dc3a0eb5a1a43074958  conexus-0.8.0.tar.bz2
+607ea17af916f488c0e410d776cb37f0  conexus-0.9.0.tar.bz2



From rvinyard at fedoraproject.org  Tue Aug 25 20:54:54 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 20:54:54 +0000 (UTC)
Subject: rpms/conexus/F-11 .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20090825205454.1532011C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30520

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Jun 2009 19:47:29 -0000	1.13
+++ .cvsignore	25 Aug 2009 20:54:53 -0000	1.14
@@ -1 +1 @@
-conexus-0.8.0.tar.bz2
+conexus-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Jun 2009 19:47:29 -0000	1.13
+++ sources	25 Aug 2009 20:54:53 -0000	1.14
@@ -1 +1 @@
-b44b16a269c20dc3a0eb5a1a43074958  conexus-0.8.0.tar.bz2
+607ea17af916f488c0e410d776cb37f0  conexus-0.9.0.tar.bz2



From rvinyard at fedoraproject.org  Tue Aug 25 20:55:01 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue, 25 Aug 2009 20:55:01 +0000 (UTC)
Subject: rpms/conexus/F-10 .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20090825205501.9934111C0044@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30558

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	16 Jun 2009 19:48:14 -0000	1.12
+++ .cvsignore	25 Aug 2009 20:55:01 -0000	1.13
@@ -1 +1 @@
-conexus-0.8.0.tar.bz2
+conexus-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	16 Jun 2009 19:48:14 -0000	1.12
+++ sources	25 Aug 2009 20:55:01 -0000	1.13
@@ -1 +1 @@
-b44b16a269c20dc3a0eb5a1a43074958  conexus-0.8.0.tar.bz2
+607ea17af916f488c0e410d776cb37f0  conexus-0.9.0.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 21:01:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 21:01:45 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.33,
	1.34 epiphany-extensions.spec, 1.66, 1.67 sources, 1.33, 1.34
Message-ID: <20090825210145.E587211C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32736

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	29 Jul 2009 01:44:17 -0000	1.33
+++ .cvsignore	25 Aug 2009 21:01:45 -0000	1.34
@@ -1 +1 @@
-epiphany-extensions-2.27.5.tar.bz2
+epiphany-extensions-2.27.91.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- epiphany-extensions.spec	29 Jul 2009 01:44:17 -0000	1.66
+++ epiphany-extensions.spec	25 Aug 2009 21:01:45 -0000	1.67
@@ -3,8 +3,8 @@
 %global ephy_min_version    %{ephy_major}.0
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.5
-Release:        2%{?dist}
+Version:        %{ephy_major}.91
+Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -92,6 +92,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-1
 - Update ot 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	29 Jul 2009 01:44:17 -0000	1.33
+++ sources	25 Aug 2009 21:01:45 -0000	1.34
@@ -1 +1 @@
-493bfcb07e8588dbdba7fe3769fe5198  epiphany-extensions-2.27.5.tar.bz2
+ba436ba0ef9df7698e537f52ec2f3b80  epiphany-extensions-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 21:06:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 21:06:03 +0000 (UTC)
Subject: rpms/gnome-applets/devel sources,1.95,1.96
Message-ID: <20090825210603.E654511C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1284

Modified Files:
	sources 
Log Message:
fix sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	25 Aug 2009 19:24:16 -0000	1.95
+++ sources	25 Aug 2009 21:06:03 -0000	1.96
@@ -1 +1,2 @@
 458f2fefc70b5ab740816d0695d0abcf  gnome-applets-2.27.91.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From mclasen at fedoraproject.org  Tue Aug 25 21:10:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 21:10:13 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.367,1.368
Message-ID: <20090825211013.8EBAD11C043D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2121

Modified Files:
	gnome-panel.spec 
Log Message:
fix BRs



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -p -r1.367 -r1.368
--- gnome-panel.spec	25 Aug 2009 18:14:42 -0000	1.367
+++ gnome-panel.spec	25 Aug 2009 21:10:13 -0000	1.368
@@ -3,7 +3,6 @@
 %define gnome_desktop_version 2.11.1
 %define glib2_version 2.15.5
 %define gtk2_version 2.11.3
-%define libglade2_version 2.5.0
 %define libgnome_version 2.13.0
 %define libgnomeui_version 2.5.4
 %define libbonoboui_version 2.3.0
@@ -16,7 +15,7 @@
 %define dbus_version 0.60
 %define dbus_glib_version 0.60
 %define gnome_doc_utils_version 0.3.2
-%define libgweather_version 2.22.1
+%define libgweather_version 2.27.90
 
 %define use_evolution_data_server 1
 
@@ -62,7 +61,6 @@ BuildRequires: libX11-devel
 BuildRequires: libXt-devel
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libglade2-devel >= %{libglade2_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}



From pkgdb at fedoraproject.org  Tue Aug 25 21:14:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 21:14:14 +0000
Subject: [pkgdb] amarok: kaboon has requested watchcommits
Message-ID: <20090825211414.773D710F87B@bastion2.fedora.phx.redhat.com>

kaboon has requested the watchcommits acl on amarok (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Tue Aug 25 21:14:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 21:14:13 +0000
Subject: [pkgdb] amarok: kaboon has requested watchbugzilla
Message-ID: <20090825211413.AB23410F877@bastion2.fedora.phx.redhat.com>

kaboon has requested the watchbugzilla acl on amarok (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Tue Aug 25 21:14:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 21:14:15 +0000
Subject: [pkgdb] amarok: kaboon has requested commit
Message-ID: <20090825211416.0ECE210F884@bastion2.fedora.phx.redhat.com>

kaboon has requested the commit acl on amarok (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From mclasen at fedoraproject.org  Tue Aug 25 21:22:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 21:22:40 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.26, 1.27 brasero.spec, 1.60,
	1.61 sources, 1.26, 1.27
Message-ID: <20090825212240.24FD211C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4586

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	10 Aug 2009 21:30:12 -0000	1.26
+++ .cvsignore	25 Aug 2009 21:22:39 -0000	1.27
@@ -1 +1 @@
-brasero-2.27.90.tar.bz2
+brasero-2.27.91.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- brasero.spec	11 Aug 2009 04:06:50 -0000	1.60
+++ brasero.spec	25 Aug 2009 21:22:39 -0000	1.61
@@ -1,5 +1,5 @@
 Name:      brasero
-Version:   2.27.90
+Version:   2.27.91
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -203,6 +203,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Mon Aug 10 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	10 Aug 2009 21:30:12 -0000	1.26
+++ sources	25 Aug 2009 21:22:39 -0000	1.27
@@ -1 +1 @@
-e4fa8381d3fbbc869ac4fb5da853fda2  brasero-2.27.90.tar.bz2
+d6482a43808d9233e8edccf2008c0f05  brasero-2.27.91.tar.bz2



From twaugh at fedoraproject.org  Tue Aug 25 21:38:58 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 21:38:58 +0000 (UTC)
Subject: rpms/system-config-printer/F-10 .cvsignore, 1.194, 1.195 sources,
	1.202, 1.203 system-config-printer.spec, 1.242,
	1.243 upstream-key.gpg, 1.2,
	1.3 system-config-printer-1.0.16.tar.bz2.sig, 1.1,
	NONE system-config-printer-monitor-traceback.patch, 1.1, NONE
Message-ID: <20090825213858.9E12211C0262@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-serv8426

Modified Files:
	.cvsignore sources system-config-printer.spec upstream-key.gpg 
Removed Files:
	system-config-printer-1.0.16.tar.bz2.sig 
	system-config-printer-monitor-traceback.patch 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
- 1.1.12:
  - Troubleshooting fix.
  - Fixed applet traceback when printing test page.
  - Removed completed job notifications (trac #181).
  - Show printer status in printer icons (bug #518020).
  - Use paused icon when printer state reason is 'paused'.
  - Driver preference order fixes.
  - Job status icon and state reason display in jobs list
    (bug #518070).
  - Fixed overactive job creation times update timer.
  - Use preferred D-Bus object path for AuthenticationAgent
    (bug #518427).
  - Fixed disabling a printer when PolicyKit call fails.
  - Set appropriate status icon tooltip when configuration printer
    (bug #518007).
  - Use separate thread for verifying IPP queue (bug #518065).
  - Use newer tooltip API to avoid deprecation warnings.
  - Compare MFG/MDL case-insensitively in udev rule.
  - Support for cups-pk-helper's DevicesGet method.
  - Don't attempt to use PolicyKit if running as root.
  - Support for localized marker names (trac #183).
  - Other small fixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/.cvsignore,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- .cvsignore	13 Mar 2009 18:26:53 -0000	1.194
+++ .cvsignore	25 Aug 2009 21:38:58 -0000	1.195
@@ -193,3 +193,4 @@ pycups-1.9.45.tar.bz2
 system-config-printer-1.0.13.tar.bz2
 system-config-printer-1.0.14.tar.bz2
 system-config-printer-1.0.16.tar.bz2
+system-config-printer-1.1.12.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/sources,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- sources	13 Mar 2009 18:26:53 -0000	1.202
+++ sources	25 Aug 2009 21:38:58 -0000	1.203
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2
-eab094411498de16a0c2cf2c2ab5428a  system-config-printer-1.0.16.tar.bz2
+895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
+588d53af2750aa4e3418b61262012880  system-config-printer-1.1.12.tar.xz


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- system-config-printer.spec	14 Apr 2009 12:13:20 -0000	1.242
+++ system-config-printer.spec	25 Aug 2009 21:38:58 -0000	1.243
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.45
+%define pycups_version 1.9.46
 %define pysmbc_version 1.0.6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -6,15 +6,14 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.0.16
-Release: 2%{?dist}
+Version: 1.1.12
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
-Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2
+Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-monitor-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -34,9 +33,10 @@ Requires: dbus-x11
 Requires: dbus-python
 Requires: system-config-printer-libs = %{version}-%{release}
 Requires: gnome-icon-theme
-Requires: gnome-python2-gnome
-Requires: notification-daemon
+Requires: desktop-notification-daemon
 Requires: notify-python
+Requires: gnome-python2-gnomekeyring
+Requires: libxml2-python
 
 Obsoletes: system-config-printer-gui <= 0.6.152
 Provides: system-config-printer-gui = 0.6.152
@@ -62,7 +62,6 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .monitor-traceback
 
 %build
 %configure
@@ -120,31 +119,43 @@ rm -rf %buildroot
 %{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
-%{_datadir}/%{name}/contextmenu.py*
+%{_datadir}/%{name}/cupspk.py*
 %{_datadir}/%{name}/debug.py*
 %{_datadir}/%{name}/errordialogs.py*
+%{_datadir}/%{name}/glade.py*
+%{_datadir}/%{name}/GroupsPane.py*
+%{_datadir}/%{name}/GroupsPaneModel.py*
+%{_datadir}/%{name}/gtkinklevel.py*
+%{_datadir}/%{name}/gtkspinner.py*
+%{_datadir}/%{name}/HIG.py*
+%{_datadir}/%{name}/installpackage.py*
 %{_datadir}/%{name}/jobviewer.py*
 %{_datadir}/%{name}/monitor.py*
 %{_datadir}/%{name}/my-default-printer.py*
 %{_datadir}/%{name}/options.py*
 %{_datadir}/%{name}/optionwidgets.py*
 %{_datadir}/%{name}/PhysicalDevice.py*
+%{_datadir}/%{name}/ppdippstr.py*
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
+%{_datadir}/%{name}/SearchCriterion.py*
 %{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
 %{_datadir}/%{name}/system-config-printer.py*
+%{_datadir}/%{name}/timedops.py*
+%{_datadir}/%{name}/ToolbarSearchEntry.py*
 %{_datadir}/%{name}/userdefault.py*
+%{_datadir}/%{name}/XmlHelper.py*
 %{_datadir}/%{name}/gtk_label_autowrap.py*
-%{_datadir}/%{name}/gtk_treeviewtooltips.py*
 %{_datadir}/%{name}/applet.py*
 %{_datadir}/%{name}/troubleshoot
-%{_datadir}/%{name}/*.glade
 %{_datadir}/%{name}/icons
-%{_datadir}/applications/redhat-system-config-printer.desktop
-%{_datadir}/applications/redhat-manage-print-jobs.desktop
-%{_datadir}/applications/redhat-my-default-printer.desktop
-%{_sysconfdir}/xdg/autostart/redhat-print-applet.desktop
+%dir %{_datadir}/%{name}/glade
+%{_datadir}/%{name}/glade/*.glade
+%{_datadir}/applications/system-config-printer.desktop
+%{_datadir}/applications/manage-print-jobs.desktop
+%{_datadir}/applications/my-default-printer.desktop
+%{_sysconfdir}/xdg/autostart/print-applet.desktop
 %{_mandir}/man1/*
 
 %post
@@ -152,70 +163,226 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com>
-- Requires dbus-python (bug #495392).
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
+- 1.1.12:
+  - Troubleshooting fix.
+  - Fixed applet traceback when printing test page.
+  - Removed completed job notifications (trac #181).
+  - Show printer status in printer icons (bug #518020).
+  - Use paused icon when printer state reason is 'paused'.
+  - Driver preference order fixes.
+  - Job status icon and state reason display in jobs list
+    (bug #518070).
+  - Fixed overactive job creation times update timer.
+  - Use preferred D-Bus object path for AuthenticationAgent
+    (bug #518427).
+  - Fixed disabling a printer when PolicyKit call fails.
+  - Set appropriate status icon tooltip when configuration printer
+    (bug #518007).
+  - Use separate thread for verifying IPP queue (bug #518065).
+  - Use newer tooltip API to avoid deprecation warnings.
+  - Compare MFG/MDL case-insensitively in udev rule.
+  - Support for cups-pk-helper's DevicesGet method.
+  - Don't attempt to use PolicyKit if running as root.
+  - Support for localized marker names (trac #183).
+  - Other small fixes.
+
+* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
+- Added patch for cupspk DevicesGet method call.
+
+* Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
+- 1.1.11:
+  - Several udev-configure-printer fixes.
+  - Use case-insensitive PPD matching.
+  - Better URI validity testing.
+  - Another stale printer status icon fix.
+  - Notice when jobs stop due to backend errors.
+  - Warn about job history when renaming printers.
+  - Small UI improvements.
+
+* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-1
+- Dropped no-longer-used python-sexy dependency.
+- 1.1.10:
+  - Now uses gnome-packagekit utility to install packages
+    instead of the D-Bus API.
+  - Fixed detection of stopped jobs with CUPS 1.4.
+  - Fixed tracebacks when adding a new printer and when receiving
+    IPP notifications.
+  - Fixed 'location' field for printers added on remote CUPS servers.
+  - Fixed handling of incorrect authentication.
+  - Some UI and troubleshooter fixes have been made.
+
+* Fri Jul 24 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-7
+- Removed gnome-packagekit dependency.  The presence of
+  gpk-install-package-name is detected at run-time, and the program
+  acts accordingly.
+
+* Mon Jul  6 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-6
+- Requires gnome-packagekit for gpk-install-package-name.
+
+* Fri Jul  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-5
+- Use gpk-install-package-name instead of trying to use the D-Bus API.
+- Spot stopped jobs with CUPS 1.4 as well (trac #177).  This, along
+  with the previous fix, addresses bug #509177.
+- Map gutenprint filenames to the package name.
+- Fixed sensitivity of class member selection arrows (bug #508653).
+
+* Thu Jun 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-3
+- Use correct 'location' field for printers added remotely.
+- Parse nmblookup failures correctly in troubleshooter.
+- Prevent traceback on IPP notification after properties dialog
+  cancelled.
+- Fixed handling of incorrect authentication when not using
+  PolicyKit (bug #508102).
+
+* Wed Jun 24 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-2
+- Make sure we find https URIs from https backend (bug #507628).
+- Avoid showing a non-fatal exception when adding an IPP printer
+  (bug #507629).
+- Fixed traceback when adding/modifying printer which could lead to
+  display bugs (bug #507489).
+
+* Thu Jun 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-1
+- Updated pycups to 1.9.46.
+- Updated to 1.1.8:
+  - Select a printer after adding it (trac #145).
+  - Make sure the job and printer context menus cannot get out of date
+    (trac #175, trac #172).
+  - Fixed displayed hold time for held jobs.
+  - Use grey ink-drop when there is no marker-colors value instead of
+    crashing (bug #505399).
+  - Scroll job list window to new job when appropriate.
+  - Clean up temporary PPD files (bug #498743).
+  - Fixed XML crash (Ubuntu #370469).
+  - Fixed automatic printer model selection.
+  - Fixed cupspk crash due to missing debugprint import (bug #496722,
+    trac #161). 
+  - Fixed PhysicalDevice crash (bug #496722, trac #161).
+  - Adjusted border padding for New Printer window (bug #493862).
+  - Set glade's textdomain in the job viewer (Ubuntu #341765).
+  - Fixed URI parsing when verifying IPP URIs.
+  - Set relaxed PPD conformance (trac #159).
+  - Make troubleshooter work again by disabling cupspk for it.
+
+* Wed May 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-4
+- Changed requirement on notification-daemon to
+  desktop-notification-daemon to allow for other implementations
+  (bug #500587).
+
+* Tue Apr 21 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-3
+- Moved them back again, as they are not part of the exported
+  interface (bug #496808).
 
-* Wed Mar 25 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-2
-- Prevent traceback in monitor when connection failed
-  (Ubuntu #343387).
+* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.7-2
+- Move files required by system-config-printer-kde to -libs (#496646)
 
-* Fri Mar 13 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-1
-- Updated to 1.0.16:
+* Tue Apr 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.7-1
+- Requires dbus-python (bug #495392).
+- Updated to 1.1.7:
+  - Updated translations.
+  - Don't abort if the jobviewer couldn't show a notification.
+  - Don't use setlocale() for locale-independent case conversion.
+  - Don't assume the notification daemon can show action buttons.
+  - Use case-insensitive matching for model names.
+  - HPLIP compatibility fixes.
+  - Fixed typo in jobviewer keyring support (Ubuntu #343156).
+  - Added support for https device URIs (bug #478677).
+  - Prevent traceback in monitor when connection failed (Ubuntu #343387).
+
+* Fri Mar 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.6-1
+- No longer requires gnome-python2-gnome.
+- Updated to 1.1.6:
+  - Translatable string fix for authconn.
+  - Romanian allow/deny translation fix (bug #489748).
+  - Set glade's textdomain in the jobviewer (Ubuntu #341765).
+
+* Tue Mar 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.5-2
+- Added patch for changes in 1.1.x since 1.1.5:
+  - Strip " hpijs" from PPD names.
+  - Handle there being no operation name set when authentication/retry
+    is required.
+  - Mark "Unauthorized" PolicyKit dialog strings for translation, and
+    change that dialog to an error.
+  - Work around marker-* attributes not being presented as lists
+    (bug #489512).
+  - D-Bus policy tweak.
   - Better PPD fallback searching.
-  - Strip " hpijs" from PPD make-and-model names.
   - Fixed model search oddity when no digits in model name.
-
-* Mon Mar  9 2009 Tim Waugh <twaugh at redhat.com> 1.0.15-2
-- Added patch for 1.0.x changes since 1.0.15:
   - Fixed locale save/restore in cupshelpers (bug #489313).
-  - Troubleshoot: include local printer attributes in diagnostic
-    output.
-  - Don't allow LPD probe with an empty hostname.
-  - Fixed the LPD probe.
-  - Updated translations.
-
-* Wed Feb 18 2009 Tim Waugh <twaugh at redhat.com> 1.0.15-1
-- Updated to 1.0.15:
-  - Perform lowercase operations in a locale-independent manner
-    (trac #151).
-  - Avoid false positives when checking for fax support in HP devices.
+  - Use gtk.show_uri() instead of gnome.url_show() (trac #147).
+  - Removed HPLIP probe screen (no longer needed).
+  - Be certain of having the right cell when starting a rename
+    (Ubuntu #333260).
+  - Fixed strftime call (Ubuntu #334859).
+  - Check dict before use when handling auth-info-required.
+  - Handle timed operations being cancelled in the troubleshooter test
+    print page (Ubuntu #325084).
+  - Put pycups version requirement in monitor module.
+
+* Tue Mar  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.5-1
+- 1.1.5.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.4-2
+- Updated from git:
+  - Prevent traceback when adding new printer (bug #486587).
+
+* Wed Feb 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.4-1
+- 1.1.4:
+  - Skip model selection screen when adding a new printer for which we
+    know the exact model.
+  - Better integration for HPLIP hp and hpfax queues.
   - Work around HPLIP option parsing bug.
+  - Pre-select the current device correctly.
+  - Better descriptions for types of available connection.
+  - Perform lowercase operations in a locale-independent manner (trac #151).
+
+* Wed Feb 11 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-7
+- Updated from git:
+  - Avoid tracebacks in main application (bug #484130) and job viewer.
+  - Avoid unnecessary modal dialog when adding printer (bug #484960).
+  - Don't use notification when authentication is required, just
+    display the dialog.
+
+* Tue Feb 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-6
+- Updated from git:
+  - Better make/model discovery for multiple devices (bug #484130).
+
+* Tue Feb 10 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-5
+- Updated from git:
+  - Handle D-Bus failures when querying Jockey (bug #484402).
+  - Set operation when fetching PPD from server (bug #484130).
+  - Don't allow prompting when updating the UI for a server failure
+    (bug #484130).
+  - Fixed printing a test page from the applet (bug #484130).
+
+* Mon Feb  9 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-4
+- Requires libxml2-python.
+
+* Sat Feb  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-3
+- Ship the missing cupspk file (bug #484461).
+
+* Thu Feb  5 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-2
+- Added in cups-pk-helper support from upstream.
+
+* Tue Feb  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.3-1
+- Requires python-sexy.
+- 1.1.3.
+
+* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 1.1.2-1
+- 1.1.2.
+- Requires gnome-python2-gnomekeyring.
 
-* Wed Feb 11 2009 Tim Waugh <twaugh at redhat.com> 1.0.14-1
-- Updated to 1.0.14:
-  - Don't allow PPD changes when there are conflicts (trac #144).
-  - Fixed constraints checking and conflicts buttons.
-  - Just display a dialog when job authentication is needed, not a
-    notification as well.
-  - Don't grab keyboard and pointer for authentication dialogs.
-  - Don't show 'wait' window when adding new printer (bug #484960).
-  - Show printer chosen from command line as selected.
-  - Handle session D-Bus connection failure gracefully (bug #484402).
-  - Fixed status icon display when viewing completed jobs (trac #140).
-  - Fixed expander display in job options screen.
-  - Don't make the troubleshooter window transient for the main
-    window (bug #481505).
-  - Use authenticated connection when printing a test page from the
-    troubleshooter.
-  - Fixed traceback while fetching hpfax device ID (Ubuntu #321139).
-  - Fixed D-Bus policy rules.
-  - More consistency with select_iter/set_cursor (trac #142).
-  - Better default height for job viewer window.
-
-* Fri Jan 16 2009 Tim Waugh <twaugh at redhat.com> 1.0.13-1
-- Updated to 1.0.13:
-  - Cope with there being no system D-Bus (bug #479534).
-  - Enable/set-accepting new classes as well as new printers (trac #132).
-  - Added accessibility relations for screen readers (trac #136).
-  - Fixed downloadable driver traceback (Ubuntu #316828).
-  - Avoid traceback with raw queues (bug #480277).
-
-* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.1.1-2
 - Updated pycups to 1.9.45.
-- Updated patch for 1.0.x changes:
-  - More cursor/selection fixes.
-  - Notification fix.
-  - Advertise correct defaults for page-* job options (bug #468553).
+
+* Sat Dec 20 2008 Tim Waugh <twaugh at redhat.com> 1.1.1-1
+- 1.1.1.
+
+* Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.1.0-1
+- 1.1.0.
 
 * Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
 - Updated patch for 1.0.x changes:


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/upstream-key.gpg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- upstream-key.gpg	9 Aug 2007 14:19:31 -0000	1.2
+++ upstream-key.gpg	25 Aug 2009 21:38:58 -0000	1.3
@@ -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-----


--- system-config-printer-1.0.16.tar.bz2.sig DELETED ---


--- system-config-printer-monitor-traceback.patch DELETED ---



From twaugh at fedoraproject.org  Tue Aug 25 21:42:21 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 25 Aug 2009 21:42:21 +0000 (UTC)
Subject: rpms/system-config-printer/F-10 .cvsignore, 1.195, 1.196 sources,
	1.203, 1.204 system-config-printer.spec, 1.243, 1.244
Message-ID: <20090825214221.C1BB411C0417@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-serv9201

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
Upload source.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/.cvsignore,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- .cvsignore	25 Aug 2009 21:38:58 -0000	1.195
+++ .cvsignore	25 Aug 2009 21:42:21 -0000	1.196
@@ -194,3 +194,4 @@ system-config-printer-1.0.13.tar.bz2
 system-config-printer-1.0.14.tar.bz2
 system-config-printer-1.0.16.tar.bz2
 system-config-printer-1.1.12.tar.xz
+system-config-printer-1.1.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/sources,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- sources	25 Aug 2009 21:38:58 -0000	1.203
+++ sources	25 Aug 2009 21:42:21 -0000	1.204
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-588d53af2750aa4e3418b61262012880  system-config-printer-1.1.12.tar.xz
+43be348b60651e79479b5c396d9f6003  system-config-printer-1.1.12.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- system-config-printer.spec	25 Aug 2009 21:38:58 -0000	1.243
+++ system-config-printer.spec	25 Aug 2009 21:42:21 -0000	1.244
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -163,7 +163,7 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-2
 - 1.1.12:
   - Troubleshooting fix.
   - Fixed applet traceback when printing test page.



From pkgdb at fedoraproject.org  Tue Aug 25 21:43:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 21:43:57 +0000
Subject: [pkgdb] amarok had acl change status
Message-ID: <20090825214357.D65CC10F877@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on amarok (Fedora 11) to Approved for kaboon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Tue Aug 25 21:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 21:43:58 +0000
Subject: [pkgdb] amarok had acl change status
Message-ID: <20090825214358.D5FEF10F87C@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on amarok (Fedora 11) to Approved for kaboon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From pkgdb at fedoraproject.org  Tue Aug 25 21:44:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 25 Aug 2009 21:44:00 +0000
Subject: [pkgdb] amarok had acl change status
Message-ID: <20090825214400.19D3F10F810@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on amarok (Fedora 11) to Approved for kaboon

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/amarok



From josef at fedoraproject.org  Tue Aug 25 21:46:36 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Tue, 25 Aug 2009 21:46:36 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs-valgrind.patch, NONE,
	1.1 btrfs-progs.spec, 1.18, 1.19
Message-ID: <20090825214636.3623D11C0376@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10058

Modified Files:
	btrfs-progs.spec 
Added Files:
	btrfs-progs-valgrind.patch 
Log Message:
- add btrfs-progs-valgrind.patch to fix segfault


btrfs-progs-valgrind.patch:
 btrfsck.c      |    2 ++
 disk-io.c      |   29 ++++++++++++++++++-----------
 extent-cache.c |   11 +++++++++++
 extent-cache.h |    1 +
 extent-tree.c  |   10 ++++++++++
 extent_io.c    |    1 +
 volumes.c      |   16 +++++++++++++++-
 volumes.h      |    3 +--
 8 files changed, 59 insertions(+), 14 deletions(-)

--- NEW FILE btrfs-progs-valgrind.patch ---
Hello,

Started running valgrind against btrfsck since e2fsck seemed to have a myriad of
problems.  btrfsck was actually not in too bad shape, only like 5 or 6 normal
errors and maybe 5 leaks.  The big leak is the "seen" extent cache that we don't
seem to do anything with.  Since I'm not sure what Yan is up to I just made it
so we free that cache before we return in case he wants it for something.  With
these changes btrfsck doesn't spit out any errors while running valgrind and has
no leaks.  This should also help any of the other utilities that use the generic
stuff.  Thanks,

Signed-off-by: Josef Bacik <jbacik at redhat.com>
---
 btrfsck.c      |    2 ++
 disk-io.c      |   29 ++++++++++++++++++-----------
 extent-cache.c |   11 +++++++++++
 extent-cache.h |    1 +
 extent-tree.c  |   10 ++++++++++
 extent_io.c    |    1 +
 volumes.c      |   16 +++++++++++++++-
 volumes.h      |    1 +
 8 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/btrfsck.c b/btrfsck.c
index 40c90f8..9dd777f 100644
--- a/btrfsck.c
+++ b/btrfsck.c
@@ -2431,6 +2431,8 @@ static int check_extents(struct btrfs_root *root)
 			break;
 	}
 	ret = check_extent_refs(root, &extent_cache);
+	free_cache_tree(&seen);
+	free(bits);
 	return ret;
 }
 
diff --git a/disk-io.c b/disk-io.c
index addebe1..4d4e902 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -425,8 +425,10 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
 	u64 blocknr = btrfs_super_log_root(disk_super);
 	struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root));
 
-	if (blocknr == 0)
+	if (blocknr == 0) {
+		free(log_root);
 		return 0;
+	}
 
 	blocksize = btrfs_level_size(tree_root,
 			     btrfs_super_log_root_level(disk_super));
@@ -605,7 +607,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr,
 	struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root));
 	struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root));
 	struct btrfs_root *csum_root = malloc(sizeof(struct btrfs_root));
-	struct btrfs_fs_info *fs_info = malloc(sizeof(*fs_info));
+	struct btrfs_fs_info *fs_info = malloc(sizeof(struct btrfs_fs_info));
 	int ret;
 	struct btrfs_super_block *disk_super;
 	struct btrfs_fs_devices *fs_devices = NULL;
@@ -628,7 +630,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr,
 		BUG_ON(ret);
 	}
 
-	memset(fs_info, 0, sizeof(*fs_info));
+	memset(fs_info, 0, sizeof(struct btrfs_fs_info));
 	fs_info->tree_root = tree_root;
 	fs_info->extent_root = extent_root;
 	fs_info->chunk_root = chunk_root;
@@ -928,15 +930,19 @@ static int close_all_devices(struct btrfs_fs_info *fs_info)
 {
 	struct list_head *list;
 	struct list_head *next;
+	struct list_head *tmp;
 	struct btrfs_device *device;
 
-	return 0;
-
 	list = &fs_info->fs_devices->devices;
-	list_for_each(next, list) {
+	list_for_each_safe(next, tmp, list) {
 		device = list_entry(next, struct btrfs_device, dev_list);
 		close(device->fd);
+		list_del(&device->dev_list);
+		free(device->name);
+		free(device->label);
+		free(device);
 	}
+	free(fs_info->fs_devices);
 	return 0;
 }
 
@@ -970,25 +976,26 @@ int close_ctree(struct btrfs_root *root)
 	if (fs_info->csum_root->node)
 		free_extent_buffer(fs_info->csum_root->node);
 
-	if (root->fs_info->log_root_tree) {
-		if (root->fs_info->log_root_tree->node)
-			free_extent_buffer(root->fs_info->log_root_tree->node);
-		free(root->fs_info->log_root_tree);
+	if (fs_info->log_root_tree) {
+		if (fs_info->log_root_tree->node)
+			free_extent_buffer(fs_info->log_root_tree->node);
 	}
 
-	close_all_devices(root->fs_info);
+	close_all_devices(fs_info);
 	extent_io_tree_cleanup(&fs_info->extent_cache);
 	extent_io_tree_cleanup(&fs_info->free_space_cache);
 	extent_io_tree_cleanup(&fs_info->block_group_cache);
 	extent_io_tree_cleanup(&fs_info->pinned_extents);
 	extent_io_tree_cleanup(&fs_info->pending_del);
 	extent_io_tree_cleanup(&fs_info->extent_ins);
+	btrfs_mapping_tree_free(&fs_info->mapping_tree);
 
 	free(fs_info->tree_root);
 	free(fs_info->extent_root);
 	free(fs_info->chunk_root);
 	free(fs_info->dev_root);
 	free(fs_info->csum_root);
+	free(fs_info->log_root_tree);
 	free(fs_info);
 
 	return 0;
diff --git a/extent-cache.c b/extent-cache.c
index b871e18..b424975 100644
--- a/extent-cache.c
+++ b/extent-cache.c
@@ -170,3 +170,14 @@ void remove_cache_extent(struct cache_tree *tree,
 	rb_erase(&pe->rb_node, &tree->root);
 }
 
+void free_cache_tree(struct cache_tree *tree)
+{
+	struct rb_node *node;
+	struct cache_extent *cache;
+
+	while ((node = rb_last(&tree->root)) != NULL) {
+		cache = rb_entry(node, struct cache_extent, rb_node);
+		remove_cache_extent(tree, cache);
+		free(cache);
+	}
+}
diff --git a/extent-cache.h b/extent-cache.h
index 7f2f2a6..1696bc2 100644
--- a/extent-cache.h
+++ b/extent-cache.h
@@ -43,6 +43,7 @@ struct cache_extent *find_cache_extent(struct cache_tree *tree,
 int insert_cache_extent(struct cache_tree *tree, u64 start, u64 size);
 int insert_existing_cache_extent(struct cache_tree *tree,
 				 struct cache_extent *pe);
+void free_cache_tree(struct cache_tree *tree);
 
 static inline int cache_tree_empty(struct cache_tree *tree)
 {
diff --git a/extent-tree.c b/extent-tree.c
index b2f9bb2..e1d7ffd 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -2985,6 +2985,7 @@ out:
 
 int btrfs_free_block_groups(struct btrfs_fs_info *info)
 {
+	struct btrfs_space_info *space_info;
 	u64 start;
 	u64 end;
 	u64 ptr;
@@ -3008,6 +3009,15 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
 		clear_extent_dirty(&info->free_space_cache, start,
 				   end, GFP_NOFS);
 	}
+
+	while (!list_empty(&info->space_info)) {
+		space_info = list_entry(info->space_info.next,
+					struct btrfs_space_info,
+					list);
+		list_del(&space_info->list);
+		kfree(space_info);
+	}
+
 	return 0;
 }
 
diff --git a/extent_io.c b/extent_io.c
index 069c199..71e6826 100644
--- a/extent_io.c
+++ b/extent_io.c
@@ -572,6 +572,7 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree,
 		BUG();
 		return NULL;
 	}
+	memset(eb, 0, sizeof(struct extent_buffer) + blocksize);
 
 	eb->start = bytenr;
 	eb->len = blocksize;
diff --git a/volumes.c b/volumes.c
index 7671855..eee66a7 100644
--- a/volumes.c
+++ b/volumes.c
@@ -862,6 +862,20 @@ void btrfs_mapping_init(struct btrfs_mapping_tree *tree)
 	cache_tree_init(&tree->cache_tree);
 }
 
+void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree)
+{
+	struct cache_extent *cache;
+	struct rb_node *node;
+	struct map_lookup *map;
+
+	while ((node = rb_last(&tree->cache_tree.root)) != NULL) {
+		cache = rb_entry(node, struct cache_extent, rb_node);
+		map = container_of(cache, struct map_lookup, ce);
+		remove_cache_extent(&tree->cache_tree, cache);
+		free(map);
+	}
+}
+
 int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len)
 {
 	struct cache_extent *ce;
@@ -1340,7 +1354,7 @@ int btrfs_read_sys_array(struct btrfs_root *root)
 	if (!sb)
 		return -ENOMEM;
 	btrfs_set_buffer_uptodate(sb);
-	write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE);
+	write_extent_buffer(sb, super_copy, 0, sizeof(*super_copy));
 	array_size = btrfs_super_sys_array_size(super_copy);
 
 	/*
diff --git a/volumes.h b/volumes.h
index bb78751..e466b31 100644
--- a/volumes.h
+++ b/volumes.h
@@ -130,4 +130,5 @@ int btrfs_add_system_chunk(struct btrfs_trans_handle *trans,
 			   struct btrfs_root *root, struct btrfs_key *key,
 			   struct btrfs_chunk *chunk, int item_size);
 int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
+void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree);
 #endif
-- 
1.5.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- btrfs-progs.spec	24 Jul 2009 18:27:51 -0000	1.18
+++ btrfs-progs.spec	25 Aug 2009 21:46:35 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.19
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@ URL:            http://btrfs.wiki.kernel
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
 Patch0: btrfs-progs-fix-labels.patch
 Patch1: btrfs-progs-build-everything.patch
+Patch2: btrfs-progs-valgrind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
@@ -23,6 +24,7 @@ check, modify and correct any inconsiste
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mkfs.btrfs.8.gz
 
 %changelog
+* Tue Aug 25 2009 Josef Bacik <josef at toxicpanda.com> 0.19-7
+- add btrfs-progs-valgrind.patch to fix memory leaks and segfaults
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Tue Aug 25 21:49:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 25 Aug 2009 21:49:52 +0000 (UTC)
Subject: rpms/nss/devel nss.pc.in,1.5,1.6 nss.spec,1.93,1.94
Message-ID: <20090825214952.BEA7511C0376@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10778

Modified Files:
	nss.pc.in nss.spec 
Log Message:
further softokn clenups



Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss.pc.in	20 Aug 2009 18:28:37 -0000	1.5
+++ nss.pc.in	25 Aug 2009 21:49:52 -0000	1.6
@@ -7,5 +7,7 @@ Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
 Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Requires: nss-util >= %NSSUTIL_VERSION%
+Requires: nss-softokn >= %SOFTOKEN_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3
 Cflags: -I${includedir}


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- nss.spec	25 Aug 2009 20:10:08 -0000	1.93
+++ nss.spec	25 Aug 2009 21:49:52 -0000	1.94
@@ -1,18 +1,10 @@
 %global nspr_version 4.7
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
-# Produce .chk files for the final stripped binaries
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
-%{nil}
-
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          15%{?dist}
+Release:          16%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -23,6 +15,8 @@ Requires:         nss-softokn-freebl%{_i
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    nss-softokn-devel >= 3.12.3.99.3-14                                                   
+BuildRequires:    nss-util-devel >= 3.12.3.99.3-10
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -141,9 +135,10 @@ USE_64=1
 export USE_64
 %endif
 
-# NSS_ENABLE_ECC=1
-# export NSS_ENABLE_ECC
-
+# We only ship the nss proper libraries, no softoken nor util, yet we                                   
+# must compile everything and usiee the entire source tree because nss                                  
+# needs the private exports from util.
+#     
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
 %{__make} -C ./mozilla/security/nss
@@ -242,30 +237,22 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 # Copy the binary libraries we want
-for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
+for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
   ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
-# Make sure chk files can be found in both places
-for file in libnssdbm3.chk
-do
-  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
-
 # Install the empty NSS db files
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
-%{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
-%{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
-%{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-%{__install} -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
-
+%{__install} -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
+%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
+%{__install} -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+     
 # Copy the development libraries we want
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
-  %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  %{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
 # Copy the binaries we want
@@ -275,7 +262,7 @@ do
 done
 
 # Copy the binaries we ship as unsupported
-for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
+for file in atob btoa derdump ocspclnt pp selfserv strsclnt symkeyutil tstclnt vfyserv vfychain
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
@@ -322,6 +309,14 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secport.h
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h
 
+#remove header shipped in nss-softokn-devel
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/blapit.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/ecl-exp.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/hasht.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/sechash.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secmodt.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/shsign.h
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -369,7 +364,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnss3.so
-%{_libdir}/libnssdbm3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
 %{_libdir}/libnssckbi.so
@@ -378,7 +372,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
 
-
+%dir %{_includedir}/nss3
 %{_includedir}/nss3/cert.h
 %{_includedir}/nss3/certdb.h
 %{_includedir}/nss3/certt.h
@@ -400,7 +394,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 %{_includedir}/nss3/keythi.h
 %{_includedir}/nss3/nss.h
 %{_includedir}/nss3/nssckbi.h
-%{_includedir}/nss3/nsslowhash.h
 %{_includedir}/nss3/nsspem.h
 %{_includedir}/nss3/ocsp.h
 %{_includedir}/nss3/ocspt.h
@@ -444,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-16
+- cleanups for softokn
+
 * Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-15
 - remove the softokn subpackages
 



From rathann at fedoraproject.org  Tue Aug 25 21:51:27 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 25 Aug 2009 21:51:27 +0000 (UTC)
Subject: rpms/netembryo/devel .cvsignore, 1.5, 1.6 netembryo.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090825215127.EB89211C0376@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/netembryo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11293

Modified Files:
	.cvsignore netembryo.spec sources 
Log Message:
* Tue Aug 25 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.9-1
- updated to 0.0.9
- explicitly disabled openssl support (requires exception in the license)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netembryo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Jan 2008 22:59:41 -0000	1.5
+++ .cvsignore	25 Aug 2009 21:51:27 -0000	1.6
@@ -1 +1 @@
-netembryo-0.0.5.tar.bz2
+netembryo-0.0.9.tar.bz2


Index: netembryo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netembryo/devel/netembryo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- netembryo.spec	25 Jul 2009 18:04:38 -0000	1.8
+++ netembryo.spec	25 Aug 2009 21:51:27 -0000	1.9
@@ -3,8 +3,8 @@
 
 Summary: Network abstraction library
 Name: netembryo
-Version: 0.0.5
-Release: 5%{?git:.%{rev}git}%{?dist}
+Version: 0.0.9
+Release: 1%{?git:.%{rev}git}%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 %if %{?git:1}0
@@ -44,7 +44,7 @@ documentation needed to develop applicat
 
 %build
 %{?git:autoreconf -i}
-%configure --disable-dependency-tracking --disable-static
+%configure --disable-dependency-tracking --disable-static --without-openssl
 %{__make} %{?_smp_mflags}
 
 %install
@@ -66,12 +66,15 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc test
 %{_includedir}/netembryo
 %{_libdir}/libnetembryo.so
-%{_libdir}/pkgconfig/libnetembryo.pc
+%{_libdir}/pkgconfig/libnetembryo*.pc
 
 %changelog
+* Tue Aug 25 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.9-1
+- updated to 0.0.9
+- explicitly disabled openssl support (requires exception in the license)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netembryo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Jan 2008 22:59:41 -0000	1.5
+++ sources	25 Aug 2009 21:51:27 -0000	1.6
@@ -1 +1 @@
-219c7827ab11e8abc4e3cfcc58aa609a  netembryo-0.0.5.tar.bz2
+8bb43df168c705d7cec0c6b87ce7b3b4  netembryo-0.0.9.tar.bz2



From dcantrel at fedoraproject.org  Tue Aug 25 21:56:26 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 25 Aug 2009 21:56:26 +0000 (UTC)
Subject: rpms/dhcpv6/devel .cvsignore, 1.28, 1.29 dhcpv6.spec, 1.108,
	1.109 sources, 1.28, 1.29
Message-ID: <20090825215626.F053D11C0376@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12554

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Tue Aug 25 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha4-1
- Upgraded to dhcpv6-2.0.0-alpha4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	19 Aug 2009 21:37:37 -0000	1.28
+++ .cvsignore	25 Aug 2009 21:56:26 -0000	1.29
@@ -1 +1 @@
-dhcpv6-2.0.0-alpha3.tar.gz
+dhcpv6-2.0.0-alpha4.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- dhcpv6.spec	19 Aug 2009 21:37:37 -0000	1.108
+++ dhcpv6.spec	25 Aug 2009 21:56:26 -0000	1.109
@@ -2,11 +2,11 @@
 %define libnlver 1.1
 
 # archive version number
-%define archivever 2.0.0-alpha3
+%define archivever 2.0.0-alpha4
 
 Summary: Dynamic host configuration protocol software for IPv6
 Name:    dhcpv6
-Version: 2.0.0alpha3
+Version: 2.0.0alpha4
 Release: 1%{?dist}
 License: LGPLv2+
 Group:   System Environment/Daemons
@@ -122,6 +122,9 @@ fi
 %attr(750,root,root) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Tue Aug 25 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha4-1
+- Upgraded to dhcpv6-2.0.0-alpha4
+
 * Wed Aug 19 2009 David Cantrell <dcantrell at redhat.com> - 2.0.0alpha3-1
 - Upgraded to dhcpv6-2.0.0-alpha3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	19 Aug 2009 21:37:37 -0000	1.28
+++ sources	25 Aug 2009 21:56:26 -0000	1.29
@@ -1 +1 @@
-5bb32c0cf67627842b0f7111b89fc58f  dhcpv6-2.0.0-alpha3.tar.gz
+fb14ec3583b56b1f552e63b5072a3902  dhcpv6-2.0.0-alpha4.tar.gz



From orion at fedoraproject.org  Tue Aug 25 22:08:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 25 Aug 2009 22:08:36 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.36,1.37
Message-ID: <20090825220836.B07D411C0376@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15701

Modified Files:
	paraview.spec 
Log Message:
* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
- Disable building OverView - not ready yet



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- paraview.spec	21 Aug 2009 15:14:05 -0000	1.36
+++ paraview.spec	25 Aug 2009 22:08:36 -0000	1.37
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -34,6 +34,7 @@ Patch6:         paraview-3.6.1-plugins.p
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
 Patch8:         paraview-3.4.0-hdf5-1.8.2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -60,12 +61,14 @@ Obsoletes:      paraview-demos < %{versi
 Provides:       paraview-demos = %{version}-%{release}
 
 #VTK_USE_RPATH=OFF needed to build everything
+# This is still an alpha feature and does not install properly -
+#  libOverViewCora.so is not installed
+#	-DPARAVIEW_BUILD_OverView:BOOL=ON 
 %define paraview_cmake_options \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
         -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
         -DTCL_LIBRARY:PATH=tcl \\\
         -DTK_LIBRARY:PATH=tk \\\
-	-DPARAVIEW_BUILD_OverView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
@@ -382,6 +385,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
+- Disable building OverView - not ready yet
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.1-2
 - rebuilt with new openssl
 



From rathann at fedoraproject.org  Tue Aug 25 22:11:25 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 25 Aug 2009 22:11:25 +0000 (UTC)
Subject: rpms/libnemesi/devel .cvsignore, 1.4, 1.5 libnemesi.spec, 1.10,
	1.11 sources, 1.4, 1.5 libnemesi-ppc64.patch, 1.1, NONE
Message-ID: <20090825221125.C5FDA11C0376@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/libnemesi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16362

Modified Files:
	.cvsignore libnemesi.spec sources 
Removed Files:
	libnemesi-ppc64.patch 
Log Message:
* Tue Aug 25 2009 Dominik Mierzejewski <rpm at greysector.net> 0.6.9-0.1.20090422git
- updated to latest stable branch snapshot
- dropped obsolete patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnemesi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Dec 2007 15:00:41 -0000	1.4
+++ .cvsignore	25 Aug 2009 22:11:25 -0000	1.5
@@ -1 +1 @@
-libnemesi-0.6.4-rc2.tar.bz2
+libnemesi-0.6.9git.tar.gz


Index: libnemesi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnemesi/devel/libnemesi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libnemesi.spec	25 Jul 2009 06:10:44 -0000	1.10
+++ libnemesi.spec	25 Aug 2009 22:11:25 -0000	1.11
@@ -1,23 +1,21 @@
-#%%define git 1
-%define rev 20071030
+%define git 1
 
 Summary: RTSP/RTP client library
 Name: libnemesi
-Version: 0.6.4
-Release: 0.6.rc2%{?git:.%{rev}git}%{?dist}
+Version: 0.6.9
+Release: 0.1.20090422git%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 %if %{?git:1}0
-# http://live.polito.it/gitweb/?p=libnemesi.git;a=snapshot;h=HEAD
-Source: %{name}-%{rev}git.tar.gz
+# http://cgit.lscube.org/cgit.cgi/libnemesi/snapshot/libnemesi-0.6.tar.gz
+Source: %{name}-%{version}git.tar.gz
 %else
 Source: http://www.lscube.org/files/downloads/libnemesi/%{name}-%{version}-rc2.tar.bz2
 %endif
-Patch0: %{name}-ppc64.patch
 URL: http://www.lscube.org/projects/libnemesi
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: lksctp-tools-devel
-BuildRequires: netembryo-devel >= 0.0.4
+BuildRequires: netembryo-devel = 0.0.9
 %{?git:BuildRequires: libtool}
 
 %description
@@ -60,10 +58,7 @@ Simple programs that use libnemesi to sh
 and dump them.
 
 %prep
-%setup -q %{?git:-n %{name}.git} -n %{name}-%{version}-rc2
-%ifarch ppc64
-%patch0 -p1 -b .ppc64
-%endif
+%setup -q %{?git:-n %{name}-0.6}
 
 %build
 %{?git:autoreconf -i}
@@ -92,7 +87,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpa
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_libdir}/libnemesi.so.*
 
 %files devel
@@ -109,6 +104,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpa
 %{_bindir}/nemesi_loop_stream
 
 %changelog
+* Tue Aug 25 2009 Dominik Mierzejewski <rpm at greysector.net> 0.6.9-0.1.20090422git
+- updated to latest stable branch snapshot
+- dropped obsolete patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-0.6.rc2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnemesi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Dec 2007 15:00:41 -0000	1.4
+++ sources	25 Aug 2009 22:11:25 -0000	1.5
@@ -1 +1 @@
-8c406192e7f95fbe3f1da64ff7d3457e  libnemesi-0.6.4-rc2.tar.bz2
+0b00946a95e0a2b7c6992c2c7840126e  libnemesi-0.6.9git.tar.gz


--- libnemesi-ppc64.patch DELETED ---



From mclasen at fedoraproject.org  Tue Aug 25 22:23:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 22:23:53 +0000 (UTC)
Subject: rpms/libgnomekbd/devel .cvsignore, 1.21, 1.22 libgnomekbd.spec, 1.48,
	1.49 sources, 1.21, 1.22
Message-ID: <20090825222353.2EFCB11C0376@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18850

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Log Message:
2.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	15 Jul 2009 14:39:10 -0000	1.21
+++ .cvsignore	25 Aug 2009 22:23:52 -0000	1.22
@@ -1 +1 @@
-libgnomekbd-2.27.4.tar.bz2
+libgnomekbd-2.27.91.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- libgnomekbd.spec	25 Jul 2009 05:47:18 -0000	1.48
+++ libgnomekbd.spec	25 Aug 2009 22:23:52 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.27.4
-Release:        2%{?dist}
+Version:       	2.27.91
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -128,6 +128,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	15 Jul 2009 14:39:10 -0000	1.21
+++ sources	25 Aug 2009 22:23:52 -0000	1.22
@@ -1 +1 @@
-f5bd68f8e71d093e0f9721ff952b179b  libgnomekbd-2.27.4.tar.bz2
+6e89d5ed36a5785053cd9ec451d9af49  libgnomekbd-2.27.91.tar.bz2



From behdad at fedoraproject.org  Tue Aug 25 22:56:27 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 25 Aug 2009 22:56:27 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.81, 1.82 sources, 1.82, 1.83 vte.spec, 
	1.155, 1.156
Message-ID: <20090825225627.D855611C0044@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25473

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.3-1 
- Update to 0.21.3 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	25 Aug 2009 17:45:07 -0000	1.81
+++ .cvsignore	25 Aug 2009 22:56:25 -0000	1.82
@@ -1 +1 @@
-vte-0.21.2.tar.bz2
+vte-0.21.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	25 Aug 2009 17:45:07 -0000	1.82
+++ sources	25 Aug 2009 22:56:26 -0000	1.83
@@ -1 +1 @@
-b192bc46eefbc42158cfd902bd0184eb  vte-0.21.2.tar.bz2
+bce1288ff2a9ed48f5901b98f0e24aac  vte-0.21.3.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- vte.spec	25 Aug 2009 17:45:07 -0000	1.155
+++ vte.spec	25 Aug 2009 22:56:26 -0000	1.156
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.2
+Version: 0.21.3
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.3-1
+- Update to 0.21.3
+
 * Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.2-1
 - Update to 0.21.2
 



From mclasen at fedoraproject.org  Tue Aug 25 22:57:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 25 Aug 2009 22:57:27 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel-about.patch,1.2,1.3
Message-ID: <20090825225727.D0A4611C0044@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25708

Modified Files:
	gnome-panel-about.patch 
Log Message:
fix patch


gnome-panel-about.patch:
 panel-menu-items.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: gnome-panel-about.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-about.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-panel-about.patch	25 Aug 2009 18:14:42 -0000	1.2
+++ gnome-panel-about.patch	25 Aug 2009 22:57:27 -0000	1.3
@@ -7,7 +7,7 @@ diff -up gnome-panel-2.27.91/gnome-panel
  	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
 -	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
 +	if (panel_has_desktop_file ("about-this-computer.desktop"))
-+		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
++		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL, FALSE);
  
  	if (parent->priv->append_lock_logout)
  		panel_menu_items_append_lock_logout (menu);



From orion at fedoraproject.org  Tue Aug 25 23:03:32 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 25 Aug 2009 23:03:32 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.37,1.38
Message-ID: <20090825230332.8420B11C0044@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27650

Modified Files:
	paraview.spec 
Log Message:
* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
- Disable building GeoView/GeoView2D, need OverView



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- paraview.spec	25 Aug 2009 22:08:36 -0000	1.37
+++ paraview.spec	25 Aug 2009 23:03:32 -0000	1.38
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -64,6 +64,9 @@ Provides:       paraview-demos = %{versi
 # This is still an alpha feature and does not install properly -
 #  libOverViewCora.so is not installed
 #	-DPARAVIEW_BUILD_OverView:BOOL=ON 
+# GeoView/GeoView2D require OverView
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON
 %define paraview_cmake_options \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
         -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
@@ -72,8 +75,6 @@ Provides:       paraview-demos = %{versi
 	-DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\
@@ -385,6 +386,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
+- Disable building GeoView/GeoView2D, need OverView
+
 * Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
 - Disable building OverView - not ready yet
 



From tuxbrewr at fedoraproject.org  Tue Aug 25 23:06:11 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Tue, 25 Aug 2009 23:06:11 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec, 1.41, 1.42 sources, 1.18,
	1.19
Message-ID: <20090825230611.83DA911C0044@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28236

Modified Files:
	kpackagekit.spec sources 
Log Message:
New git snapshot


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- kpackagekit.spec	19 Aug 2009 17:17:34 -0000	1.41
+++ kpackagekit.spec	25 Aug 2009 23:06:10 -0000	1.42
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.5.0
-Release:	0.1.20090819svn%{?dist}
+Release:	0.1.20090824svn%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -14,7 +14,7 @@ URL:		http://www.kde-apps.org/content/sh
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream me, says the patch
-Patch100: kpackagekit-InitialPreference.patch
+#Patch100: kpackagekit-InitialPreference.patch
 Patch102: kpackagekit-0.4.1-i18n.patch
 
 BuildRequires:	cmake
@@ -34,7 +34,7 @@ KDE interface for PackageKit.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch100 -p0 -b .InitialPreference
+#patch100 -p0 -b .InitialPreference
 %patch102 -p1 -b .i18n
 
 
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090824svn
+- New git snapshot
+
 * Wed Aug 19 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090819svn
 - New upstream release with PolicyKit 1 integration
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	19 Aug 2009 14:53:17 -0000	1.18
+++ sources	25 Aug 2009 23:06:11 -0000	1.19
@@ -1 +1 @@
-efa37a905ed99236ff644987679907fa  kpackagekit-0.5.0.tar.bz2
+3b7f930e85f42c77700ec04ff08ce9cf  kpackagekit-0.5.0.tar.bz2



From rathann at fedoraproject.org  Tue Aug 25 23:08:37 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 25 Aug 2009 23:08:37 +0000 (UTC)
Subject: rpms/mnemosyne/devel .cvsignore, 1.3, 1.4 mnemosyne.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090825230837.D1E0C11C0044@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28821

Modified Files:
	.cvsignore mnemosyne.spec sources 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2.1-1
- updated to 1.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Jan 2009 00:28:15 -0000	1.3
+++ .cvsignore	25 Aug 2009 23:08:37 -0000	1.4
@@ -1 +1 @@
-mnemosyne-1.2-r1.tgz
+mnemosyne-1.2.1.tgz


Index: mnemosyne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/mnemosyne.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mnemosyne.spec	25 Jul 2009 14:40:16 -0000	1.4
+++ mnemosyne.spec	25 Aug 2009 23:08:37 -0000	1.5
@@ -2,16 +2,16 @@
 
 Name:		mnemosyne
 Summary:	Flash-card learning tool
-Version:	1.2
-Release:	3.r1%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 URL:		http://www.mnemosyne-proj.org/
-Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
+Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}.tgz
 Patch0:		%{name}-desktop.patch
 License:	GPLv2+
 Group:		Amusements/Games
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	desktop-file-utils
-BuildRequires:	python-setuptools-devel
+BuildRequires:	python-setuptools
 BuildArch:	noarch
 Requires:	hicolor-icon-theme
 Requires:	pygame
@@ -72,6 +72,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2.1-1
+- updated to 1.2.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3.r1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Jan 2009 00:28:15 -0000	1.3
+++ sources	25 Aug 2009 23:08:37 -0000	1.4
@@ -1 +1 @@
-156f9e80352ea1012ea707bcbeaf2cfb  mnemosyne-1.2-r1.tgz
+0640f5d45eec102b68da77c815cc1b29  mnemosyne-1.2.1.tgz



From kyle at fedoraproject.org  Tue Aug 25 23:13:21 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 25 Aug 2009 23:13:21 +0000 (UTC)
Subject: rpms/kernel/devel allow-disabling-ima.diff, NONE, 1.1 kernel.spec, 
	1.1737, 1.1738
Message-ID: <20090825231321.8B1BB11C0044@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29876

Modified Files:
	kernel.spec 
Added Files:
	allow-disabling-ima.diff 
Log Message:
* Tue Aug 25 2009 Kyle McMartin <kyle at redhat.com>
- allow-disabling-ima.diff: debugging patch... adds ima=0 kernel
  param to disable initialization of IMA.


allow-disabling-ima.diff:
 Documentation/kernel-parameters.txt |    5 +++++
 security/integrity/ima/ima_main.c   |   17 +++++++++++++++++
 2 files changed, 22 insertions(+)

--- NEW FILE allow-disabling-ima.diff ---
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7936b80..0d1b1ed 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -926,6 +926,11 @@ and is between 256 and 4096 characters. It is defined in the file
 	ihash_entries=	[KNL]
 			Set number of hash buckets for inode cache.
 
+	ima=		[IMA]
+			Format: { "0" | "1" }
+			0 -- disable IMA.
+			1 -- enable IMA. (default)
+
 	ima_audit=	[IMA]
 			Format: { "0" | "1" }
 			0 -- integrity auditing messages. (Default)
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 101c512..cc7603e 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -339,10 +339,27 @@ int ima_bprm_check(struct linux_binprm *bprm)
 	return 0;
 }
 
+static int ima_disabled = 0;
+static int __init ima_enabled(char *str)
+{
+	unsigned long enabled;
+
+	if (!strict_strtoul(str, 0, &enabled))
+		ima_disabled = enabled ? 0 : 1;
+
+	return 1;
+}
+__setup("ima=", ima_enabled);
+
 static int __init init_ima(void)
 {
 	int error;
 
+	if (ima_disabled) {
+		pr_info("IMA disabled at user request.\n");
+		return 0;
+	}
+
 	ima_iintcache_init();
 	error = ima_init();
 	ima_initialized = 1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1737
retrieving revision 1.1738
diff -u -p -r1.1737 -r1.1738
--- kernel.spec	25 Aug 2009 03:15:09 -0000	1.1737
+++ kernel.spec	25 Aug 2009 23:13:20 -0000	1.1738
@@ -728,6 +728,8 @@ Patch12020: xen-fb-probe-fix.patch
 Patch12021: xen-x86-fix-stackprotect.patch
 Patch12022: xen-x86-no-stackprotect.patch
 
+Patch90000: allow-disabling-ima.diff
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1345,6 +1347,8 @@ ApplyPatch xen-fb-probe-fix.patch
 ApplyPatch xen-x86-fix-stackprotect.patch
 ApplyPatch xen-x86-no-stackprotect.patch
 
+ApplyPatch allow-disabling-ima.diff
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2011,6 +2015,10 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 25 2009 Kyle McMartin <kyle at redhat.com>
+- allow-disabling-ima.diff: debugging patch... adds ima=0 kernel
+  param to disable initialization of IMA.
+
 * Tue Aug 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.174.rc7.git2
 - drm-nouveau.patch: upstream update, pre-nv50 tv-out + misc fixes
 



From behdad at fedoraproject.org  Tue Aug 25 23:13:36 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 25 Aug 2009 23:13:36 +0000 (UTC)
Subject: rpms/vte/devel .cvsignore, 1.82, 1.83 sources, 1.83, 1.84 vte.spec, 
	1.156, 1.157
Message-ID: <20090825231336.D3CF511C0044@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/vte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29947

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.4-1 
- Update to 0.21.4 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	25 Aug 2009 22:56:25 -0000	1.82
+++ .cvsignore	25 Aug 2009 23:13:36 -0000	1.83
@@ -1 +1 @@
-vte-0.21.3.tar.bz2
+vte-0.21.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	25 Aug 2009 22:56:26 -0000	1.83
+++ sources	25 Aug 2009 23:13:36 -0000	1.84
@@ -1 +1 @@
-bce1288ff2a9ed48f5901b98f0e24aac  vte-0.21.3.tar.bz2
+b9597bb6c4ed3d48602b53f90c5fd85b  vte-0.21.4.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/devel/vte.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- vte.spec	25 Aug 2009 22:56:26 -0000	1.156
+++ vte.spec	25 Aug 2009 23:13:36 -0000	1.157
@@ -3,7 +3,7 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.21.3
+Version: 0.21.4
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
@@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.4-1
+- Update to 0.21.4
+
 * Mon Aug 25 2009 Behdad Esfahbod <behdad at redhat.com> 0.21.3-1
 - Update to 0.21.3
 



From rathann at fedoraproject.org  Tue Aug 25 23:45:20 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 25 Aug 2009 23:45:20 +0000 (UTC)
Subject: rpms/mnemosyne/devel mnemosyne.spec,1.5,1.6
Message-ID: <20090825234520.6E8F511C0044@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3994

Modified Files:
	mnemosyne.spec 
Log Message:
fix build failure in rawhide 



Index: mnemosyne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/mnemosyne.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mnemosyne.spec	25 Aug 2009 23:08:37 -0000	1.5
+++ mnemosyne.spec	25 Aug 2009 23:45:18 -0000	1.6
@@ -11,6 +11,7 @@ License:	GPLv2+
 Group:		Amusements/Games
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	desktop-file-utils
+BuildRequires:	python-devel
 BuildRequires:	python-setuptools
 BuildArch:	noarch
 Requires:	hicolor-icon-theme



From cweyl at fedoraproject.org  Wed Aug 26 00:45:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 26 Aug 2009 00:45:40 +0000 (UTC)
Subject: rpms/perl-POE-Component-JobQueue/devel .cvsignore, 1.3,
	1.4 perl-POE-Component-JobQueue.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20090826004540.27EC711C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-JobQueue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16147

Modified Files:
	.cvsignore perl-POE-Component-JobQueue.spec sources 
Log Message:
* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.570-1
- auto-update to 0.570 (by cpan-spec-update 0.01)
- added a new br on perl(ExtUtils::MakeMaker) (version 0)
- altered br on perl(POE) (0.11 => 1.007)
- added a new req on perl(POE) (version 1.007)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-JobQueue/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2006 04:20:41 -0000	1.3
+++ .cvsignore	26 Aug 2009 00:45:39 -0000	1.4
@@ -1 +1 @@
-POE-Component-JobQueue-0.55.tar.gz
+POE-Component-JobQueue-0.570.tar.gz


Index: perl-POE-Component-JobQueue.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-JobQueue/devel/perl-POE-Component-JobQueue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-POE-Component-JobQueue.spec	26 Jul 2009 13:58:02 -0000	1.7
+++ perl-POE-Component-JobQueue.spec	26 Aug 2009 00:45:39 -0000	1.8
@@ -1,37 +1,40 @@
-# for rpm versioning issues, and convienence
-%define cpanver 0.55
-%define rpmver  0.5500
-
 Name:           perl-POE-Component-JobQueue
-Version:        %{rpmver}
-Release:        5%{?dist}
+Version:        0.570
+Release:        1%{?dist}
 
 Summary: Process a large number of tasks with a finite number of workers
 
 Group:          Development/Libraries
-License:        GPL+ or Artistic        
-URL:            http://search.cpan.org/dist/POE-Component-JobQueue            
-Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-JobQueue-%{cpanver}.tar.gz
+License:        GPL+ or Artistic
+URL:            http://search.cpan.org/dist/POE-Component-JobQueue
+Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-JobQueue-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl
-BuildRequires:  perl(POE) >= 0.11
+BuildRequires:  perl(POE) >= 1.007
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+### auto-added reqs!
+Requires:       perl(POE) >= 1.007
+
+### auto-added brs!
+BuildRequires:  perl(ExtUtils::MakeMaker)
+
 %description
 POE::Component::JobQueue manages a finite pool of worker sessions as
 they handle an arbitrarily large number of tasks.  It often is used as
 a form of flow control, preventing an arbitrarily large number of
 worker sessions from exhausting some finite resource.
 
+%{?perl_default_filter}
 
 %prep
-%setup -q -n POE-Component-JobQueue-%{cpanver}
+%setup -q -n POE-Component-JobQueue-%{version}
 
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor 
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 # readme says this is a good example.  So, why not?
@@ -63,6 +66,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.570-1
+- auto-update to 0.570 (by cpan-spec-update 0.01)
+- added a new br on perl(ExtUtils::MakeMaker) (version 0)
+- altered br on perl(POE) (0.11 => 1.007)
+- added a new req on perl(POE) (version 1.007)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5500-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -76,7 +85,7 @@ Rebuild for new perl
 - bump for mass rebuild
 
 * Wed Aug 09 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.5500-1
-- update to cpan ver 0.55 
+- update to cpan ver 0.55
 
 * Sat Jul  8 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.5402-1
 - bump for fe build/release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-JobQueue/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2006 04:20:41 -0000	1.3
+++ sources	26 Aug 2009 00:45:39 -0000	1.4
@@ -1 +1 @@
-802e96ec46e5142a2aa25939a55f6855  POE-Component-JobQueue-0.55.tar.gz
+8c8df87bd4f1e839a2cb6cb566370f8c  POE-Component-JobQueue-0.570.tar.gz



From cweyl at fedoraproject.org  Wed Aug 26 00:48:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 26 Aug 2009 00:48:40 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-SimpleHTTP/devel
	perl-POE-Component-Server-SimpleHTTP.spec, 1.11, 1.12
Message-ID: <20090826004840.F051711C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16867

Modified Files:
	perl-POE-Component-Server-SimpleHTTP.spec 
Log Message:
* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.58-1
- auto-update to 1.58 (by cpan-spec-update 0.01)
- added a new req on perl(Carp) (version 0)
- added a new req on perl(HTTP::Date) (version 0)
- added a new req on perl(HTTP::Request) (version 0)
- added a new req on perl(POE) (version 1.0000)
- added a new req on perl(Socket) (version 0)
- added a new req on perl(Storable) (version 0)
- added a new req on perl(Sys::Hostname) (version 0)



Index: perl-POE-Component-Server-SimpleHTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel/perl-POE-Component-Server-SimpleHTTP.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-POE-Component-Server-SimpleHTTP.spec	26 Jul 2009 14:00:22 -0000	1.11
+++ perl-POE-Component-Server-SimpleHTTP.spec	26 Aug 2009 00:48:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SimpleHTTP
 Version:        1.58
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Serve HTTP requests in POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,6 +45,15 @@ BuildRequires:  perl(Socket)
 BuildRequires:  perl(Test::POE::Client::TCP) >= 0.1
 BuildRequires:  perl(Carp)
 
+### auto-added reqs!
+Requires:       perl(Carp)
+Requires:       perl(HTTP::Date)
+Requires:       perl(HTTP::Request)
+Requires:       perl(POE) >= 1.0000
+Requires:       perl(Socket)
+Requires:       perl(Storable)
+Requires:       perl(Sys::Hostname)
+
 %description
 This module makes serving up HTTP requests a breeze in POE.
 
@@ -84,6 +93,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.58-1
+- auto-update to 1.58 (by cpan-spec-update 0.01)
+- added a new req on perl(Carp) (version 0)
+- added a new req on perl(HTTP::Date) (version 0)
+- added a new req on perl(HTTP::Request) (version 0)
+- added a new req on perl(POE) (version 1.0000)
+- added a new req on perl(Socket) (version 0)
+- added a new req on perl(Storable) (version 0)
+- added a new req on perl(Sys::Hostname) (version 0)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.58-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Wed Aug 26 00:50:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 26 Aug 2009 00:50:54 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-SimpleHTTP/devel
	perl-POE-Component-Server-SimpleHTTP.spec, 1.12, 1.13
Message-ID: <20090826005054.C9DEE11C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17421

Modified Files:
	perl-POE-Component-Server-SimpleHTTP.spec 
Log Message:
- hm, not sure how that happened



Index: perl-POE-Component-Server-SimpleHTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-POE-Component-Server-SimpleHTTP/devel/perl-POE-Component-Server-SimpleHTTP.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-POE-Component-Server-SimpleHTTP.spec	26 Aug 2009 00:48:40 -0000	1.12
+++ perl-POE-Component-Server-SimpleHTTP.spec	26 Aug 2009 00:50:54 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-SimpleHTTP
 Version:        1.58
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serve HTTP requests in POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -54,6 +54,8 @@ Requires:       perl(Socket)
 Requires:       perl(Storable)
 Requires:       perl(Sys::Hostname)
 
+%{?perl_default_filter}
+
 %description
 This module makes serving up HTTP requests a breeze in POE.
 
@@ -93,16 +95,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Aug 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.58-1
-- auto-update to 1.58 (by cpan-spec-update 0.01)
-- added a new req on perl(Carp) (version 0)
-- added a new req on perl(HTTP::Date) (version 0)
-- added a new req on perl(HTTP::Request) (version 0)
-- added a new req on perl(POE) (version 1.0000)
-- added a new req on perl(Socket) (version 0)
-- added a new req on perl(Storable) (version 0)
-- added a new req on perl(Sys::Hostname) (version 0)
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.58-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Wed Aug 26 01:15:04 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 26 Aug 2009 01:15:04 +0000 (UTC)
Subject: rpms/mysql-connector-java/devel .cvsignore, 1.2,
	1.3 mysql-connector-java.spec, 1.8, 1.9 sources, 1.2,
	1.3 mysql-connector-java-noSunAppletSecurity.patch, 1.1,
	NONE patch-build.xml, 1.1, NONE
Message-ID: <20090826011504.C647D11C0044@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/mysql-connector-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23241

Modified Files:
	.cvsignore mysql-connector-java.spec sources 
Removed Files:
	mysql-connector-java-noSunAppletSecurity.patch patch-build.xml 
Log Message:
- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
- Added BR: java-1.6.0-openjdk-devel, jakarta-commons-logging
- Minor spec file updates: %%global instead of %%define, tabs instead of spaces
- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Sep 2006 21:26:15 -0000	1.2
+++ .cvsignore	26 Aug 2009 01:15:04 -0000	1.3
@@ -1 +1 @@
-mysql-connector-java-3.1.12.tar.gz
+mysql-connector-java-5.1.8.tar.gz


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mysql-connector-java.spec	25 Jul 2009 15:30:44 -0000	1.8
+++ mysql-connector-java.spec	26 Aug 2009 01:15:04 -0000	1.9
@@ -1,55 +1,65 @@
-%define            builddir       build-mysql-jdbc
-%define            distdir        dist-mysql-jdbc
-%define            gcj_support    1
-
-Summary:           Official JDBC driver for MySQL
-Name:              mysql-connector-java
-Version:           3.1.12
-Release:           8%{?dist}
-Epoch:             1 
+%global		builddir		build-mysql-jdbc
+%global		distdir			dist-mysql-jdbc
+%global		gcj_support		1
+%global		java6_rtpath	/usr/lib/jvm/java-1.6.0/jre/lib/rt.jar
+%global		java6_javacpath	/usr/lib/jvm/java-1.6.0/bin/javac
+%global		java6_javapath	/usr/lib/jvm/java-1.6.0/bin/javac
+
+Summary:	Official JDBC driver for MySQL
+Name:		mysql-connector-java
+Version:	5.1.8
+Release:	1%{?dist}
+Epoch:		1 
+
 # MySQL FLOSS Exception
-License:           GPLv2 with exceptions
-Group:             System Environment/Libraries
-# ************ NOTE ************
-# The following files have been removed from the tarball to avoid licensing
-# issues due to the fact that they are not distributed with their source.
+License:	GPLv2 with exceptions
+Group:		System Environment/Libraries
+# Mysql has a mirror redirector for its downloads
+# You can get this tarball by following a link from:
+# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz/from/pick#mirrors
+#
+# Following prebuilt jars have been removed from the tarball:
 #
-# src/lib/ant-contrib.jar 
-# src/lib/jta-spec1_0_1.jar 
+# %{name}-%{version}-bin.jar
+# src/lib/ant-contrib.jar
+# src/lib/commons-logging.jar
+# src/lib/Commons-Logging-LICENSE.txt
+# src/lib/c3p0-LICENSE
+# src/lib/c3p0-0.9.1-pre6.jar
+# src/lib/jboss-common-jdbc-wrapper.jar
+# src/lib/jboss-lgpl.txt
+# src/lib/jdbc2_0-stdext.jar
+# src/lib/jta-spec1_0_1.jar
 # src/lib/junit.jar
+# src/lib/LICENSE-AspectJ.html
 # src/lib/log4j-1.2.9.jar
-# src/lib/aspectjrt.jar 
-# src/lib/aspectjtools.jar 
-# src/lib/c3p0-0.8.5-pre8.jar 
-# src/lib/jboss-common-jdbc-wrapper.jar 
-# src/lib/jboss-lgpl.txt 
-# src/lib/jdbc2_0-stdext.jar 
-# mysql-connector-java-3.1.12-bin.jar
-# debug/mysql-connector-java-3.1.12-bin-g.jar
-Source0:           %{name}-%{version}.tar.gz
-Patch0:            patch-build.xml
-Patch1:            mysql-connector-java-noSunAppletSecurity.patch
-URL:               http://dev.mysql.com/downloads/connector/j/3.1.html
-BuildRoot:         %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+# See http://bugs.mysql.com/bug.php?id=28512 for details.
+
+Source0:			%{name}-%{version}.tar.gz
+URL:				http://dev.mysql.com/downloads/connector/j/5.1.html
+BuildRoot:			%{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{gcj_support}
-BuildRequires:     java-gcj-compat-devel >= 1.0.31
-Requires(post):    java-gcj-compat >= 1.0.31
-Requires(postun):  java-gcj-compat >= 1.0.31
+BuildRequires:		java-gcj-compat-devel >= 1.0.31
+Requires(post):		java-gcj-compat >= 1.0.31
+Requires(postun):	java-gcj-compat >= 1.0.31
 %else
-BuildRequires:     java-devel >= 1.4.2
-Requires:          java >= 1.4.2
+BuildRequires:		java-devel >= 1.4.2
+Requires:			java >= 1.4.2
 %endif
-Requires:          jta >= 1.0
-Requires:          log4j
-BuildRequires:     ant >= 1.6.0
-BuildRequires:     ant-contrib >= 1.0
-BuildRequires:     java-devel >= 1.4.0
-BuildRequires:     jpackage-utils >= 1.6
-BuildRequires:     jta >= 1.0
-BuildRequires:     junit
-BuildRequires:     log4j
-Provides:          mm.mysql
-Obsoletes:         mm.mysql
+Requires:			jta >= 1.0
+Requires:			log4j
+BuildRequires:		ant >= 1.6.0
+BuildRequires:		ant-contrib >= 1.0
+BuildRequires:		java-devel >= 1.4.0
+BuildRequires:		jpackage-utils >= 1.6
+BuildRequires:		jta >= 1.0
+BuildRequires:		junit
+BuildRequires:		log4j
+BuildRequires:		java-1.6.0-openjdk-devel
+BuildRequires:		jakarta-commons-logging
+Provides:			mm.mysql
+Obsoletes:			mm.mysql
 
 %description
 MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@@ -62,22 +72,32 @@ capabilities of MySQL.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%patch1
 
 # Remove duplicate README.txt files
 rm README.txt
 rm docs/README.txt
 
 # fix line endings
-%{__sed} -i 's/\r//' README
-%{__sed} -i 's/\r//' docs/README
-%{__sed} -i 's/\r//' EXCEPTIONS-CONNECTOR-J
+sed -i 's/\r//' README
+sed -i 's/\r//' docs/README
+sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J
 
 
 %build
-export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j)
-ant -DbuildDir=%{builddir} -DdistDir=%{distdir}
+
+# We need both JDK1.5 (for JDBC3.0; appointed by $JAVA_HOME) and JDK1.6 (for JDBC4.0; appointed in the build.xml)
+export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j commons-logging.jar)
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
+
+# We currently need to disable jboss integration because of missing jboss-common-jdbc-wrapper.jar (built from sources).
+# See BZ#480154 and BZ#471915 for details.
+rm -rf src/com/mysql/jdbc/integration/jboss
+rm src/testsuite/regression/ConnectionRegressionTest.java
+rm src/testsuite/regression/DataSourceRegressionTest.java
+rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
+
+ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -122,22 +142,28 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
+- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
+- Added BR: java-1.6.0-openjdk-devel, jakarta-commons-logging
+- Minor spec file updates: %%global instead of %%define, tabs instead of spaces
+- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1.12-8
 - 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.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.12-6
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.1.12-6
 - fix license tag
 
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.1.12-5
+* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 1:3.1.12-5
 - Rebuild for rhbz #234286.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.1.12-4
 - Autorebuild for GCC 4.3
 
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1:3.1.12-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Thu Sep 21 2006 Igor Foox <ifoox at redhat.com> 1:3.1.12-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2006 21:26:15 -0000	1.2
+++ sources	26 Aug 2009 01:15:04 -0000	1.3
@@ -1 +1 @@
-ca9d3c88dbb5ad5c724fe9ac576fc427  mysql-connector-java-3.1.12.tar.gz
+815783766d36eb650be60718cc0be84c  mysql-connector-java-5.1.8.tar.gz


--- mysql-connector-java-noSunAppletSecurity.patch DELETED ---


--- patch-build.xml DELETED ---



From mjakubicek at fedoraproject.org  Wed Aug 26 01:31:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 26 Aug 2009 01:31:40 +0000 (UTC)
Subject: rpms/dclib/devel dclib.spec,1.26,1.27
Message-ID: <20090826013140.6921411C0044@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26857

Modified Files:
	dclib.spec 
Log Message:
- added upstream patch link for the openssl patch




Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- dclib.spec	25 Aug 2009 12:20:24 -0000	1.26
+++ dclib.spec	26 Aug 2009 01:31:40 -0000	1.27
@@ -7,6 +7,9 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
+# Patch to work with openssl >= 1.00
+# Filed into upstream bugtracker at:
+#?https://sourceforge.net/tracker/?func=detail&aid=2844643&group_id=181579&atid=897767
 Patch1:         dclib-0.3.23-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel



From rathann at fedoraproject.org  Wed Aug 26 01:35:45 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Wed, 26 Aug 2009 01:35:45 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel mkvtoolnix-noman.patch, NONE, 1.1 .cvsignore, 
	1.12, 1.13 mkvtoolnix.spec, 1.28, 1.29 sources, 1.12, 1.13
Message-ID: <20090826013545.1E3DA11C0044@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28531

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-noman.patch 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.8-1
- updated to 2.9.8
- improved summary and description for gui subpackage
- fixed installation of tools


mkvtoolnix-noman.patch:
 Makefile |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE mkvtoolnix-noman.patch ---
diff -up mkvtoolnix-2.9.8/src/tools/Makefile.noman mkvtoolnix-2.9.8/src/tools/Makefile
--- mkvtoolnix-2.9.8/src/tools/Makefile.noman	2009-08-13 12:32:50.000000000 +0200
+++ mkvtoolnix-2.9.8/src/tools/Makefile	2009-08-26 03:00:59.698084017 +0200
@@ -3,7 +3,6 @@ all_with_tools:
 
 APPLICATIONS += src/tools/base64tool$(EXEEXT) src/tools/diracparser$(EXEEXT) src/tools/vc1parser$(EXEEXT) src/tools/ebml_validator$(EXEEXT)
 ALL_SOURCES  += $(wildcard src/tools/*.cpp)
-MANPAGES     +=  doc/base64tool.1
 
 vc1parser_SOURCES = src/tools/vc1parser.cpp
 vc1parser_OBJECTS = $(patsubst %.cpp,%.o,$(vc1parser_SOURCES))


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Apr 2009 20:13:48 -0000	1.12
+++ .cvsignore	26 Aug 2009 01:35:44 -0000	1.13
@@ -1 +1 @@
-mkvtoolnix-2.6.0.tar.bz2
+mkvtoolnix-2.9.8.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mkvtoolnix.spec	25 Jul 2009 14:37:04 -0000	1.28
+++ mkvtoolnix.spec	26 Aug 2009 01:35:44 -0000	1.29
@@ -1,12 +1,13 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.9.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
+Patch0: %{name}-noman.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -28,16 +29,20 @@ Mkvtoolnix is a set of utilities to mux 
 streams into and from Matroska containers.
 
 %package gui
-Summary: Mkvtoolnix GUI
+Summary: Graphical interface for Matroska container manipulation
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: hicolor-icon-theme
 
 %description gui
-GUI for mkvtoolnix.
+Mkvtoolnix is a set of utilities to mux and demux audio, video and subtitle
+streams into and from Matroska containers.
+
+This package contains the graphical interface for these utilities.
 
 %prep
 %setup -q
+%patch0 -p1 -b .noman
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -94,7 +99,6 @@ gtk-update-icon-cache --quiet %{_datadir
 %attr(755,root,root) %{_bindir}/mkvextract
 %attr(755,root,root) %{_bindir}/mkvmerge
 %attr(755,root,root) %{_bindir}/vc1parser
-%{_mandir}/man1/base64tool*
 %{_mandir}/man1/mkvextract*
 %{_mandir}/man1/mkvmerge*
 
@@ -112,6 +116,11 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.9.8-1
+- updated to 2.9.8
+- improved summary and description for gui subpackage
+- fixed installation of tools
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Apr 2009 20:13:48 -0000	1.12
+++ sources	26 Aug 2009 01:35:44 -0000	1.13
@@ -1 +1 @@
-034e6c4a11b4a9536d250a309c16be85  mkvtoolnix-2.6.0.tar.bz2
+7b049aa43c6b39dfcb19f5a46d5574ac  mkvtoolnix-2.9.8.tar.bz2



From mclasen at fedoraproject.org  Wed Aug 26 01:40:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 26 Aug 2009 01:40:38 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.479,
	1.480 no-tweaks.patch, 1.3, 1.4
Message-ID: <20090826014038.8F8A411C043D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27948

Modified Files:
	control-center.spec no-tweaks.patch 
Log Message:
Add windows capplet back in a subpackage



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- control-center.spec	25 Aug 2009 04:03:11 -0000	1.479
+++ control-center.spec	26 Aug 2009 01:40:37 -0000	1.480
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -171,6 +171,16 @@ for applications. This package contains 
 can install configuration files that are picked up by the control-center
 utilities.
 
+%package extra
+Summary: Additional utilities to configure the GNOME desktop
+Group: User Interface/Desktops
+Requires: %{name} = %{?epoch}:%{version}-%{release}
+
+%description extra
+The %{name}-extra package contains additions configuration utilities
+for the GNOME desktop.
+
+
 %prep
 %setup -q -n gnome-control-center-%{version}
 
@@ -362,7 +372,14 @@ fi
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/keybindings
 
+%files extra
+%defattr(-,root,root)
+%{_bindir}/gnome-window-properties
+
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-2
+- Bring the window capplet back from the dead, in an -extra subpackage
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 

no-tweaks.patch:
 Makefile.am        |    2 
 appearance-main.c  |    1 
 data/appearance.ui |  364 -----------------------------------------------------
 3 files changed, 367 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- no-tweaks.patch	25 Aug 2009 03:40:33 -0000	1.3
+++ no-tweaks.patch	26 Aug 2009 01:40:37 -0000	1.4
@@ -395,16 +395,3 @@ diff -up gnome-control-center-2.27.91/ca
  	gedit-message-area.c \
  	gedit-message-area.h \
  	gnome-wp-info.c \
-diff -up gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/Makefile.am
---- gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks	2009-08-24 06:54:41.000000000 -0400
-+++ gnome-control-center-2.27.91/capplets/Makefile.am	2009-08-24 23:31:28.841988564 -0400
-@@ -6,8 +6,7 @@ SUBDIRS = \
- 	keybindings		\
- 	keyboard		\
- 	mouse			\
--	network			\
--	windows
-+	network
- 
- DIST_SUBDIRS = \
- 	common			\



From mjakubicek at fedoraproject.org  Wed Aug 26 01:45:48 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 26 Aug 2009 01:45:48 +0000 (UTC)
Subject: rpms/mysql-connector-java/devel mysql-connector-java.spec,1.9,1.10
Message-ID: <20090826014548.A451D11C0044@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/mysql-connector-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30770

Modified Files:
	mysql-connector-java.spec 
Log Message:
- added BR: java-1.5.0-gcj-devel



Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mysql-connector-java.spec	26 Aug 2009 01:15:04 -0000	1.9
+++ mysql-connector-java.spec	26 Aug 2009 01:45:48 -0000	1.10
@@ -57,6 +57,7 @@ BuildRequires:		jta >= 1.0
 BuildRequires:		junit
 BuildRequires:		log4j
 BuildRequires:		java-1.6.0-openjdk-devel
+BuildRequires:		java-1.5.0-gcj-devel
 BuildRequires:		jakarta-commons-logging
 Provides:			mm.mysql
 Obsoletes:			mm.mysql
@@ -144,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
 - Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
-- Added BR: java-1.6.0-openjdk-devel, jakarta-commons-logging
+- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging
 - Minor spec file updates: %%global instead of %%define, tabs instead of spaces
 - Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch
 



From mjakubicek at fedoraproject.org  Wed Aug 26 01:55:36 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 26 Aug 2009 01:55:36 +0000 (UTC)
Subject: rpms/mysql-connector-java/F-11 mysql-connector-java.spec, 1.7,
	1.8 sources, 1.2,
	1.3 mysql-connector-java-noSunAppletSecurity.patch, 1.1,
	NONE patch-build.xml, 1.1, NONE
Message-ID: <20090826015536.3F46D11C0044@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/mysql-connector-java/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv458/F-11

Modified Files:
	mysql-connector-java.spec sources 
Removed Files:
	mysql-connector-java-noSunAppletSecurity.patch patch-build.xml 
Log Message:
- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.                                                                                    
- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging                                                                        
- Minor spec file updates: %%global instead of %%define, tabs instead of spaces                                                                            
- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch   




Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-11/mysql-connector-java.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mysql-connector-java.spec	26 Feb 2009 03:38:44 -0000	1.7
+++ mysql-connector-java.spec	26 Aug 2009 01:55:36 -0000	1.8
@@ -1,55 +1,66 @@
-%define            builddir       build-mysql-jdbc
-%define            distdir        dist-mysql-jdbc
-%define            gcj_support    1
-
-Summary:           Official JDBC driver for MySQL
-Name:              mysql-connector-java
-Version:           3.1.12
-Release:           7%{?dist}
-Epoch:             1 
+%global		builddir		build-mysql-jdbc
+%global		distdir			dist-mysql-jdbc
+%global		gcj_support		1
+%global		java6_rtpath	/usr/lib/jvm/java-1.6.0/jre/lib/rt.jar
+%global		java6_javacpath	/usr/lib/jvm/java-1.6.0/bin/javac
+%global		java6_javapath	/usr/lib/jvm/java-1.6.0/bin/javac
+
+Summary:	Official JDBC driver for MySQL
+Name:		mysql-connector-java
+Version:	5.1.8
+Release:	1%{?dist}
+Epoch:		1 
+
 # MySQL FLOSS Exception
-License:           GPLv2 with exceptions
-Group:             System Environment/Libraries
-# ************ NOTE ************
-# The following files have been removed from the tarball to avoid licensing
-# issues due to the fact that they are not distributed with their source.
+License:	GPLv2 with exceptions
+Group:		System Environment/Libraries
+# Mysql has a mirror redirector for its downloads
+# You can get this tarball by following a link from:
+# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz/from/pick#mirrors
+#
+# Following prebuilt jars have been removed from the tarball:
 #
-# src/lib/ant-contrib.jar 
-# src/lib/jta-spec1_0_1.jar 
+# %{name}-%{version}-bin.jar
+# src/lib/ant-contrib.jar
+# src/lib/commons-logging.jar
+# src/lib/Commons-Logging-LICENSE.txt
+# src/lib/c3p0-LICENSE
+# src/lib/c3p0-0.9.1-pre6.jar
+# src/lib/jboss-common-jdbc-wrapper.jar
+# src/lib/jboss-lgpl.txt
+# src/lib/jdbc2_0-stdext.jar
+# src/lib/jta-spec1_0_1.jar
 # src/lib/junit.jar
+# src/lib/LICENSE-AspectJ.html
 # src/lib/log4j-1.2.9.jar
-# src/lib/aspectjrt.jar 
-# src/lib/aspectjtools.jar 
-# src/lib/c3p0-0.8.5-pre8.jar 
-# src/lib/jboss-common-jdbc-wrapper.jar 
-# src/lib/jboss-lgpl.txt 
-# src/lib/jdbc2_0-stdext.jar 
-# mysql-connector-java-3.1.12-bin.jar
-# debug/mysql-connector-java-3.1.12-bin-g.jar
-Source0:           %{name}-%{version}.tar.gz
-Patch0:            patch-build.xml
-Patch1:            mysql-connector-java-noSunAppletSecurity.patch
-URL:               http://dev.mysql.com/downloads/connector/j/3.1.html
-BuildRoot:         %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+# See http://bugs.mysql.com/bug.php?id=28512 for details.
+
+Source0:			%{name}-%{version}.tar.gz
+URL:				http://dev.mysql.com/downloads/connector/j/5.1.html
+BuildRoot:			%{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{gcj_support}
-BuildRequires:     java-gcj-compat-devel >= 1.0.31
-Requires(post):    java-gcj-compat >= 1.0.31
-Requires(postun):  java-gcj-compat >= 1.0.31
+BuildRequires:		java-gcj-compat-devel >= 1.0.31
+Requires(post):		java-gcj-compat >= 1.0.31
+Requires(postun):	java-gcj-compat >= 1.0.31
 %else
-BuildRequires:     java-devel >= 1.4.2
-Requires:          java >= 1.4.2
+BuildRequires:		java-devel >= 1.4.2
+Requires:			java >= 1.4.2
 %endif
-Requires:          jta >= 1.0
-Requires:          log4j
-BuildRequires:     ant >= 1.6.0
-BuildRequires:     ant-contrib >= 1.0
-BuildRequires:     java-devel >= 1.4.0
-BuildRequires:     jpackage-utils >= 1.6
-BuildRequires:     jta >= 1.0
-BuildRequires:     junit
-BuildRequires:     log4j
-Provides:          mm.mysql
-Obsoletes:         mm.mysql
+Requires:			jta >= 1.0
+Requires:			log4j
+BuildRequires:		ant >= 1.6.0
+BuildRequires:		ant-contrib >= 1.0
+BuildRequires:		java-devel >= 1.4.0
+BuildRequires:		jpackage-utils >= 1.6
+BuildRequires:		jta >= 1.0
+BuildRequires:		junit
+BuildRequires:		log4j
+BuildRequires:		java-1.6.0-openjdk-devel
+BuildRequires:		java-1.5.0-gcj-devel
+BuildRequires:		jakarta-commons-logging
+Provides:			mm.mysql
+Obsoletes:			mm.mysql
 
 %description
 MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@@ -62,22 +73,32 @@ capabilities of MySQL.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%patch1
 
 # Remove duplicate README.txt files
 rm README.txt
 rm docs/README.txt
 
 # fix line endings
-%{__sed} -i 's/\r//' README
-%{__sed} -i 's/\r//' docs/README
-%{__sed} -i 's/\r//' EXCEPTIONS-CONNECTOR-J
+sed -i 's/\r//' README
+sed -i 's/\r//' docs/README
+sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J
 
 
 %build
-export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j)
-ant -DbuildDir=%{builddir} -DdistDir=%{distdir}
+
+# We need both JDK1.5 (for JDBC3.0; appointed by $JAVA_HOME) and JDK1.6 (for JDBC4.0; appointed in the build.xml)
+export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j commons-logging.jar)
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
+
+# We currently need to disable jboss integration because of missing jboss-common-jdbc-wrapper.jar (built from sources).
+# See BZ#480154 and BZ#471915 for details.
+rm -rf src/com/mysql/jdbc/integration/jboss
+rm src/testsuite/regression/ConnectionRegressionTest.java
+rm src/testsuite/regression/DataSourceRegressionTest.java
+rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
+
+ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -122,19 +143,25 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
+- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
+- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging
+- Minor spec file updates: %%global instead of %%define, tabs instead of spaces
+- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.12-6
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.1.12-6
 - fix license tag
 
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.1.12-5
+* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 1:3.1.12-5
 - Rebuild for rhbz #234286.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.1.12-4
 - Autorebuild for GCC 4.3
 
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1:3.1.12-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Thu Sep 21 2006 Igor Foox <ifoox at redhat.com> 1:3.1.12-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2006 21:26:15 -0000	1.2
+++ sources	26 Aug 2009 01:55:36 -0000	1.3
@@ -1 +1 @@
-ca9d3c88dbb5ad5c724fe9ac576fc427  mysql-connector-java-3.1.12.tar.gz
+815783766d36eb650be60718cc0be84c  mysql-connector-java-5.1.8.tar.gz


--- mysql-connector-java-noSunAppletSecurity.patch DELETED ---


--- patch-build.xml DELETED ---



From mjakubicek at fedoraproject.org  Wed Aug 26 01:55:36 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Wed, 26 Aug 2009 01:55:36 +0000 (UTC)
Subject: rpms/mysql-connector-java/F-10 mysql-connector-java.spec, 1.6,
	1.7 sources, 1.2,
	1.3 mysql-connector-java-noSunAppletSecurity.patch, 1.1,
	NONE patch-build.xml, 1.1, NONE
Message-ID: <20090826015536.0789E11C0044@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/mysql-connector-java/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv458/F-10

Modified Files:
	mysql-connector-java.spec sources 
Removed Files:
	mysql-connector-java-noSunAppletSecurity.patch patch-build.xml 
Log Message:
- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.                                                                                    
- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging                                                                        
- Minor spec file updates: %%global instead of %%define, tabs instead of spaces                                                                            
- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch   




Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-10/mysql-connector-java.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mysql-connector-java.spec	11 Aug 2008 16:11:12 -0000	1.6
+++ mysql-connector-java.spec	26 Aug 2009 01:55:35 -0000	1.7
@@ -1,55 +1,66 @@
-%define            builddir       build-mysql-jdbc
-%define            distdir        dist-mysql-jdbc
-%define            gcj_support    1
-
-Summary:           Official JDBC driver for MySQL
-Name:              mysql-connector-java
-Version:           3.1.12
-Release:           6%{?dist}
-Epoch:             1 
+%global		builddir		build-mysql-jdbc
+%global		distdir			dist-mysql-jdbc
+%global		gcj_support		1
+%global		java6_rtpath	/usr/lib/jvm/java-1.6.0/jre/lib/rt.jar
+%global		java6_javacpath	/usr/lib/jvm/java-1.6.0/bin/javac
+%global		java6_javapath	/usr/lib/jvm/java-1.6.0/bin/javac
+
+Summary:	Official JDBC driver for MySQL
+Name:		mysql-connector-java
+Version:	5.1.8
+Release:	1%{?dist}
+Epoch:		1 
+
 # MySQL FLOSS Exception
-License:           GPLv2 with exceptions
-Group:             System Environment/Libraries
-# ************ NOTE ************
-# The following files have been removed from the tarball to avoid licensing
-# issues due to the fact that they are not distributed with their source.
+License:	GPLv2 with exceptions
+Group:		System Environment/Libraries
+# Mysql has a mirror redirector for its downloads
+# You can get this tarball by following a link from:
+# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz/from/pick#mirrors
+#
+# Following prebuilt jars have been removed from the tarball:
 #
-# src/lib/ant-contrib.jar 
-# src/lib/jta-spec1_0_1.jar 
+# %{name}-%{version}-bin.jar
+# src/lib/ant-contrib.jar
+# src/lib/commons-logging.jar
+# src/lib/Commons-Logging-LICENSE.txt
+# src/lib/c3p0-LICENSE
+# src/lib/c3p0-0.9.1-pre6.jar
+# src/lib/jboss-common-jdbc-wrapper.jar
+# src/lib/jboss-lgpl.txt
+# src/lib/jdbc2_0-stdext.jar
+# src/lib/jta-spec1_0_1.jar
 # src/lib/junit.jar
+# src/lib/LICENSE-AspectJ.html
 # src/lib/log4j-1.2.9.jar
-# src/lib/aspectjrt.jar 
-# src/lib/aspectjtools.jar 
-# src/lib/c3p0-0.8.5-pre8.jar 
-# src/lib/jboss-common-jdbc-wrapper.jar 
-# src/lib/jboss-lgpl.txt 
-# src/lib/jdbc2_0-stdext.jar 
-# mysql-connector-java-3.1.12-bin.jar
-# debug/mysql-connector-java-3.1.12-bin-g.jar
-Source0:           %{name}-%{version}.tar.gz
-Patch0:            patch-build.xml
-Patch1:            mysql-connector-java-noSunAppletSecurity.patch
-URL:               http://dev.mysql.com/downloads/connector/j/3.1.html
-BuildRoot:         %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+# See http://bugs.mysql.com/bug.php?id=28512 for details.
+
+Source0:			%{name}-%{version}.tar.gz
+URL:				http://dev.mysql.com/downloads/connector/j/5.1.html
+BuildRoot:			%{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{gcj_support}
-BuildRequires:     java-gcj-compat-devel >= 1.0.31
-Requires(post):    java-gcj-compat >= 1.0.31
-Requires(postun):  java-gcj-compat >= 1.0.31
+BuildRequires:		java-gcj-compat-devel >= 1.0.31
+Requires(post):		java-gcj-compat >= 1.0.31
+Requires(postun):	java-gcj-compat >= 1.0.31
 %else
-BuildRequires:     java-devel >= 1.4.2
-Requires:          java >= 1.4.2
+BuildRequires:		java-devel >= 1.4.2
+Requires:			java >= 1.4.2
 %endif
-Requires:          jta >= 1.0
-Requires:          log4j
-BuildRequires:     ant >= 1.6.0
-BuildRequires:     ant-contrib >= 1.0
-BuildRequires:     java-devel >= 1.4.0
-BuildRequires:     jpackage-utils >= 1.6
-BuildRequires:     jta >= 1.0
-BuildRequires:     junit
-BuildRequires:     log4j
-Provides:          mm.mysql
-Obsoletes:         mm.mysql
+Requires:			jta >= 1.0
+Requires:			log4j
+BuildRequires:		ant >= 1.6.0
+BuildRequires:		ant-contrib >= 1.0
+BuildRequires:		java-devel >= 1.4.0
+BuildRequires:		jpackage-utils >= 1.6
+BuildRequires:		jta >= 1.0
+BuildRequires:		junit
+BuildRequires:		log4j
+BuildRequires:		java-1.6.0-openjdk-devel
+BuildRequires:		java-1.5.0-gcj-devel
+BuildRequires:		jakarta-commons-logging
+Provides:			mm.mysql
+Obsoletes:			mm.mysql
 
 %description
 MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@@ -62,22 +73,32 @@ capabilities of MySQL.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%patch1
 
 # Remove duplicate README.txt files
 rm README.txt
 rm docs/README.txt
 
 # fix line endings
-%{__sed} -i 's/\r//' README
-%{__sed} -i 's/\r//' docs/README
-%{__sed} -i 's/\r//' EXCEPTIONS-CONNECTOR-J
+sed -i 's/\r//' README
+sed -i 's/\r//' docs/README
+sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J
 
 
 %build
-export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j)
-ant -DbuildDir=%{builddir} -DdistDir=%{distdir}
+
+# We need both JDK1.5 (for JDBC3.0; appointed by $JAVA_HOME) and JDK1.6 (for JDBC4.0; appointed in the build.xml)
+export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j commons-logging.jar)
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
+
+# We currently need to disable jboss integration because of missing jboss-common-jdbc-wrapper.jar (built from sources).
+# See BZ#480154 and BZ#471915 for details.
+rm -rf src/com/mysql/jdbc/integration/jboss
+rm src/testsuite/regression/ConnectionRegressionTest.java
+rm src/testsuite/regression/DataSourceRegressionTest.java
+rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
+
+ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -122,16 +143,22 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.12-6
+* Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
+- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
+- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging
+- Minor spec file updates: %%global instead of %%define, tabs instead of spaces
+- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.1.12-6
 - fix license tag
 
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.1.12-5
+* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 1:3.1.12-5
 - Rebuild for rhbz #234286.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.1.12-4
 - Autorebuild for GCC 4.3
 
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1:3.1.12-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Thu Sep 21 2006 Igor Foox <ifoox at redhat.com> 1:3.1.12-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2006 21:26:15 -0000	1.2
+++ sources	26 Aug 2009 01:55:35 -0000	1.3
@@ -1 +1 @@
-ca9d3c88dbb5ad5c724fe9ac576fc427  mysql-connector-java-3.1.12.tar.gz
+815783766d36eb650be60718cc0be84c  mysql-connector-java-5.1.8.tar.gz


--- mysql-connector-java-noSunAppletSecurity.patch DELETED ---


--- patch-build.xml DELETED ---



From airlied at fedoraproject.org  Wed Aug 26 02:01:26 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 26 Aug 2009 02:01:26 +0000 (UTC)
Subject: rpms/libdrm/devel radeon-busy.patch, NONE,
	1.1 libdrm-page-flip.patch, 1.1, 1.2 libdrm.spec, 1.84, 1.85
Message-ID: <20090826020126.B77F211C0044@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1950

Modified Files:
	libdrm-page-flip.patch libdrm.spec 
Added Files:
	radeon-busy.patch 
Log Message:
* Wed Aug 26 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.9
- pull in radeon bo busy


radeon-busy.patch:
 libdrm/radeon/radeon_bo.h     |   12 ++++++++++++
 libdrm/radeon/radeon_bo_gem.c |   16 ++++++++++++++++
 shared-core/drm.h             |    1 -
 shared-core/radeon_drm.h      |    6 +++++-
 4 files changed, 33 insertions(+), 2 deletions(-)

--- NEW FILE radeon-busy.patch ---
diff --git a/libdrm/radeon/radeon_bo.h b/libdrm/radeon/radeon_bo.h
index 09ad068..1e2e6c2 100644
--- a/libdrm/radeon/radeon_bo.h
+++ b/libdrm/radeon/radeon_bo.h
@@ -73,6 +73,7 @@ struct radeon_bo_funcs {
 			  uint32_t pitch);
     int (*bo_get_tiling)(struct radeon_bo *bo, uint32_t *tiling_flags,
 			  uint32_t *pitch);
+    int (*bo_is_busy)(struct radeon_bo *bo, uint32_t *domain);
 };
 
 struct radeon_bo_manager {
@@ -166,6 +167,15 @@ static inline int _radeon_bo_wait(struct radeon_bo *bo,
     return bo->bom->funcs->bo_wait(bo);
 }
 
+static inline int _radeon_bo_is_busy(struct radeon_bo *bo,
+				     uint32_t *domain,
+                                     const char *file,
+                                     const char *func,
+                                     int line)
+{
+    return bo->bom->funcs->bo_is_busy(bo, domain);
+}
+
 static inline int radeon_bo_set_tiling(struct radeon_bo *bo,
 				       uint32_t tiling_flags, uint32_t pitch)
 {
@@ -199,5 +209,7 @@ static inline int radeon_bo_is_static(struct radeon_bo *bo)
     _radeon_bo_debug(bo, opcode, __FILE__, __FUNCTION__, __LINE__)
 #define radeon_bo_wait(bo) \
     _radeon_bo_wait(bo, __FILE__, __func__, __LINE__)
+#define radeon_bo_is_busy(bo, domain) \
+    _radeon_bo_is_busy(bo, domain, __FILE__, __func__, __LINE__)
 
 #endif
diff --git a/libdrm/radeon/radeon_bo_gem.c b/libdrm/radeon/radeon_bo_gem.c
index cf59a35..76d80e7 100644
--- a/libdrm/radeon/radeon_bo_gem.c
+++ b/libdrm/radeon/radeon_bo_gem.c
@@ -209,6 +209,21 @@ static int bo_wait(struct radeon_bo *bo)
     return ret;
 }
 
+static int bo_is_busy(struct radeon_bo *bo, uint32_t *domain)
+{
+    struct drm_radeon_gem_busy args;
+    int ret;
+
+    args.handle = bo->handle;
+    args.domain = 0;
+
+    ret = drmCommandWriteRead(bo->bom->fd, DRM_RADEON_GEM_BUSY,
+	    &args, sizeof(args));
+
+    *domain = args.domain;
+    return ret;
+}
+
 static int bo_set_tiling(struct radeon_bo *bo, uint32_t tiling_flags,
 				 uint32_t pitch)
 {
@@ -257,6 +272,7 @@ static struct radeon_bo_funcs bo_gem_funcs = {
     NULL,
     bo_set_tiling,
     bo_get_tiling,
+    bo_is_busy,
 };
 
 struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 42a6c23..d97844f 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -795,7 +795,6 @@ struct drm_gem_open {
 #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
 #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
 #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, uint32_t)
-#define DRM_IOCTL_MODE_REPLACEFB	DRM_IOWR(0xB0, struct drm_mode_fb_cmd)
 
 /*@}*/
 
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
index 3745ac5..47f1952 100644
--- a/shared-core/radeon_drm.h
+++ b/shared-core/radeon_drm.h
@@ -505,6 +505,7 @@ typedef struct {
 #define DRM_RADEON_INFO			0x27
 #define DRM_RADEON_GEM_SET_TILING	0x28
 #define DRM_RADEON_GEM_GET_TILING	0x29
+#define DRM_RADEON_GEM_BUSY		0x2a
 
 #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
 #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
@@ -545,6 +546,7 @@ typedef struct {
 #define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
 #define DRM_IOCTL_RADEON_SET_TILING	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_TILING, struct drm_radeon_gem_set_tiling)
 #define DRM_IOCTL_RADEON_GET_TILING	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_GET_TILING, struct drm_radeon_gem_get_tiling)
+#define DRM_IOCTL_RADEON_GEM_BUSY  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_BUSY, struct drm_radeon_gem_busy)
 
 typedef struct drm_radeon_init {
 	enum {
@@ -704,6 +706,7 @@ typedef struct drm_radeon_indirect {
 #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
 #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
 #define RADEON_PARAM_DEVICE_ID             16
+#define RADEON_PARAM_NUM_Z_PIPES           17   /* num Z pipes */
 
 typedef struct drm_radeon_getparam {
 	int param;
@@ -835,7 +838,7 @@ struct drm_radeon_gem_wait_idle {
 
 struct drm_radeon_gem_busy {
 	uint32_t	handle;
-	uint32_t	busy;
+	uint32_t	domain;
 };
 
 struct drm_radeon_gem_pread {
@@ -892,6 +895,7 @@ struct drm_radeon_cs {
 
 #define RADEON_INFO_DEVICE_ID		0x00
 #define RADEON_INFO_NUM_GB_PIPES	0x01
+#define RADEON_INFO_NUM_Z_PIPES 	0x02
 
 struct drm_radeon_info {
 	uint32_t		request;

libdrm-page-flip.patch:
 libdrm/xf86drm.h       |   18 ++++++++++++++++
 libdrm/xf86drmMode.c   |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 libdrm/xf86drmMode.h   |    3 --
 shared-core/drm.h      |   25 +++++++++++++++++++++++
 shared-core/drm_mode.h |   16 ++++++++++++++
 5 files changed, 113 insertions(+), 2 deletions(-)

Index: libdrm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-page-flip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libdrm-page-flip.patch	29 Jul 2009 19:48:21 -0000	1.1
+++ libdrm-page-flip.patch	26 Aug 2009 02:01:26 -0000	1.2
@@ -108,16 +108,15 @@ diff --git a/shared-core/drm.h b/shared-
 index 97fab9a..8b504cb 100644
 --- a/shared-core/drm.h
 +++ b/shared-core/drm.h
-@@ -1113,7 +1113,7 @@ struct drm_gem_open {
+@@ -1113,6 +1113,7 @@ struct drm_gem_open {
  #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
  #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
  #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, uint32_t)
--#define DRM_IOCTL_MODE_REPLACEFB	DRM_IOWR(0xB0, struct drm_mode_fb_cmd)
 +#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
  
  /*@}*/
  
-@@ -1128,6 +1128,30 @@ struct drm_gem_open {
+@@ -1128,6 +1129,30 @@ struct drm_gem_open {
  #define DRM_COMMAND_BASE                0x40
  #define DRM_COMMAND_END                 0xA0
  


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- libdrm.spec	20 Aug 2009 06:23:05 -0000	1.84
+++ libdrm.spec	26 Aug 2009 02:01:26 -0000	1.85
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.12
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -22,6 +22,7 @@ BuildRequires: libudev-devel
 
 Source2: 91-drm-modeset.rules
 
+Patch2: radeon-busy.patch
 # hardcode the 666 instead of 660 for device nodes
 Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
@@ -29,6 +30,7 @@ Patch4: libdrm-2.4.0-no-bc.patch
 
 Patch5: libdrm-page-flip.patch
 
+
 %description
 Direct Rendering Manager runtime library
 
@@ -44,6 +46,7 @@ Direct Rendering Manager development pac
 
 %prep
 %setup -q -n %{name}-%{gitdate}
+%patch2 -p1 -b .radeon-busy
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .page-flip
@@ -106,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Wed Aug 26 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.9
+- pull in radeon bo busy
+
 * Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.12-0.8
 - rebase to new libdrm snapshot
 



From mclasen at fedoraproject.org  Wed Aug 26 02:25:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 26 Aug 2009 02:25:44 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.65, 1.66 gcalctool.spec, 1.96,
	1.97 sources, 1.66, 1.67
Message-ID: <20090826022544.CDDE511C0345@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7471

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.27.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	12 Aug 2009 03:26:40 -0000	1.65
+++ .cvsignore	26 Aug 2009 02:25:44 -0000	1.66
@@ -1 +1 @@
-gcalctool-5.27.90.tar.bz2
+gcalctool-5.27.91.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- gcalctool.spec	12 Aug 2009 03:26:40 -0000	1.96
+++ gcalctool.spec	26 Aug 2009 02:25:44 -0000	1.97
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.27.90
+Version:        5.27.91
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.91-1
+- Update to 5.27.91
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 5.27.90-1
 - Update to 5.27.90
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	12 Aug 2009 03:26:40 -0000	1.66
+++ sources	26 Aug 2009 02:25:44 -0000	1.67
@@ -1 +1 @@
-483bad0a53fb15f142fa82204ce118af  gcalctool-5.27.90.tar.bz2
+c7d622fc9a61c5d0960337bc9b002ff9  gcalctool-5.27.91.tar.bz2



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:14 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034114.BD8F110F879@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora devel) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:21 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034121.BF4D310F881@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora EPEL 5) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:25 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034126.188E710F884@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 10) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:30 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034130.32FED10F894@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 11) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:39 +0000
Subject: [pkgdb] Django: salimma has requested watchbugzilla
Message-ID: <20090826034139.C8D2E10F87B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on Django (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:42 +0000
Subject: [pkgdb] Django: salimma has requested watchcommits
Message-ID: <20090826034142.927A310F898@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on Django (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:45 +0000
Subject: [pkgdb] Django: salimma has requested commit
Message-ID: <20090826034145.8724E10F884@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on Django (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:46 +0000
Subject: [pkgdb] Django: salimma has requested approveacls
Message-ID: <20090826034146.7E30E10F8A2@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on Django (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:49 +0000
Subject: [pkgdb] Django: salimma has requested watchcommits
Message-ID: <20090826034149.794E910F89C@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on Django (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:51 +0000
Subject: [pkgdb] Django: salimma has requested approveacls
Message-ID: <20090826034151.4B78910F8A1@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on Django (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:53 +0000
Subject: [pkgdb] Django: salimma has requested commit
Message-ID: <20090826034153.6EB2610F8A6@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on Django (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:41:57 +0000
Subject: [pkgdb] Django: salimma has requested watchbugzilla
Message-ID: <20090826034157.DF1DA10F894@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on Django (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:11 +0000
Subject: [pkgdb] Django: salimma has requested watchbugzilla
Message-ID: <20090826034211.83A1F10F895@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on Django (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:13 +0000
Subject: [pkgdb] Django: salimma has requested commit
Message-ID: <20090826034213.31DE510F8A9@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on Django (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:13 +0000
Subject: [pkgdb] Django: salimma has requested watchcommits
Message-ID: <20090826034213.76A1810F8AD@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on Django (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:14 +0000
Subject: [pkgdb] Django: salimma has requested approveacls
Message-ID: <20090826034214.85DE210F8B2@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on Django (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:22 +0000
Subject: [pkgdb] Django: salimma has requested watchbugzilla
Message-ID: <20090826034223.0765B10F884@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on Django (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:26 +0000
Subject: [pkgdb] Django: salimma has requested commit
Message-ID: <20090826034226.1D37B10F89B@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on Django (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:26 +0000
Subject: [pkgdb] Django: salimma has requested approveacls
Message-ID: <20090826034226.CCC7D10F8B5@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on Django (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:29 +0000
Subject: [pkgdb] Django: salimma has requested watchcommits
Message-ID: <20090826034230.1689E10F8B8@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on Django (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:49 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034249.A1B3D10F8A1@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:51 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034251.230AF10F8BA@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:51 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034251.5B2CF10F8BE@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:42:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:42:52 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034252.DAF2F10F8C0@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora devel) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:00 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034300.8638010F8A5@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:00 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034300.B6C3010F8C2@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:01 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034301.C970810F8C4@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:03 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034303.B71AF10F8C6@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:09 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034309.A8A9810F894@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:09 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034309.D16F810F8C9@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:10 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034310.DA48E10F8D0@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:13 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034313.9818610F8D4@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 11) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:14 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034314.E8B0710F8D7@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:14 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034315.043CE10F8DA@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:15 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034315.8F5CD10F8DD@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 03:43:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 03:43:17 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826034317.6005210F8AA@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 10) to Approved for salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From whot at fedoraproject.org  Wed Aug 26 04:00:05 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 26 Aug 2009 04:00:05 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-11 buttonmapping.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.108, 1.109
Message-ID: <20090826040005.5707F11C043D@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29633

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	buttonmapping.patch 
Log Message:
* Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-9
- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
  mappings for core devices instead (#502129).


buttonmapping.patch:
 gsd-mouse-manager.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE buttonmapping.patch ---
>From 77e4a88e1a4abd72f036eb6fda208cb36faff162 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 26 Aug 2009 09:48:06 +1000
Subject: [PATCH] Skip button mappings only for core devices.

Since server 1.4, devices are unlikely to be marked as IsXExtensionPointer.
More common is IsXExtensionKeyboard or IsXExtensionPointer.
However, with many pointer devices also having keys (e.g. most wireless
combos) a check for IsXExtensionPointer is unreliable.

In gsd-mouse-manager, skip the XInput button mapping only if the device is a
core device. Otherwise, test for buttons.

---
 plugins/mouse/gsd-mouse-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 30e649d..7fae963 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -283,7 +283,8 @@ set_xinput_devices_left_handed (gboolean left_handed)
         for (i = 0; i < n_devices; i++) {
                 XDevice *device = NULL;
 
-                if ((device_info[i].use != IsXExtensionPointer) ||
+                if ((device_info[i].use == IsXPointer) ||
+                    (device_info[i].use == IsXKeyboard) ||
                     (!xinput_device_has_buttons (&device_info[i])))
                         continue;
 
-- 
1.6.3.rc1.2.g0164.dirty



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- gnome-settings-daemon.spec	17 Jul 2009 05:10:10 -0000	1.108
+++ gnome-settings-daemon.spec	26 Aug 2009 04:00:05 -0000	1.109
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -51,6 +51,7 @@ Patch15:        composited-changed.patch
 
 Patch16:	there-can-be-only-one.patch
 Patch17:	syndaemon-k.patch
+Patch18:	buttonmapping.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -78,6 +79,7 @@ developing applications that use %{name}
 %patch15 -p1 -b .composited-changed
 %patch16 -p1 -b .multi-syndaemon
 %patch17 -p1 -b .syndaemon-k
+%patch18 -p1 -b .buttonmapping
 
 autoreconf -i -f
 
@@ -190,6 +192,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-9
+- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
+  mappings for core devices instead (#502129).
+
 * Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-8
 - Spawn syndaemon with "-k" flag to ignore modifier keys.
 



From whot at fedoraproject.org  Wed Aug 26 04:33:47 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 26 Aug 2009 04:33:47 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel buttonmapping.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.117, 1.118
Message-ID: <20090826043347.9072911C0082@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24732

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	buttonmapping.patch 
Log Message:
* Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.27.91-2
- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
  mappings for core devices instead (#502129).


buttonmapping.patch:
 gsd-mouse-manager.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE buttonmapping.patch ---
>From 77e4a88e1a4abd72f036eb6fda208cb36faff162 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 26 Aug 2009 09:48:06 +1000
Subject: [PATCH] Skip button mappings only for core devices.

Since server 1.4, devices are unlikely to be marked as IsXExtensionPointer.
More common is IsXExtensionKeyboard or IsXExtensionPointer.
However, with many pointer devices also having keys (e.g. most wireless
combos) a check for IsXExtensionPointer is unreliable.

In gsd-mouse-manager, skip the XInput button mapping only if the device is a
core device. Otherwise, test for buttons.

---
 plugins/mouse/gsd-mouse-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 30e649d..7fae963 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -283,7 +283,8 @@ set_xinput_devices_left_handed (gboolean left_handed)
         for (i = 0; i < n_devices; i++) {
                 XDevice *device = NULL;
 
-                if ((device_info[i].use != IsXExtensionPointer) ||
+                if ((device_info[i].use == IsXPointer) ||
+                    (device_info[i].use == IsXKeyboard) ||
                     (!xinput_device_has_buttons (&device_info[i])))
                         continue;
 
-- 
1.6.3.rc1.2.g0164.dirty



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- gnome-settings-daemon.spec	25 Aug 2009 01:55:38 -0000	1.117
+++ gnome-settings-daemon.spec	26 Aug 2009 04:33:47 -0000	1.118
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.27.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -36,6 +36,8 @@ BuildRequires:  fontconfig-devel
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=524499
 Patch13:	locate-pointer-process.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593112
+Patch14:	buttonmapping.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -57,6 +59,7 @@ developing applications that use %{name}
 
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .locate-pointer
+%patch14 -p1 -b .buttonmap
 
 autoreconf -i -f
 
@@ -170,6 +173,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.27.91-2
+- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
+  mappings for core devices instead (#502129).
+
 * Mon Aug 24 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
 - Update to 2.27.91
 



From alexlan at fedoraproject.org  Wed Aug 26 06:16:12 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 06:16:12 +0000 (UTC)
Subject: rpms/netpanzer/devel netpanzer.spec,1.12,1.13
Message-ID: <20090826061613.5BA0311C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/netpanzer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13807

Modified Files:
	netpanzer.spec 
Log Message:
* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.8.2-8
- Rebuild for new libphysfs API bump to fix broken deps



Index: netpanzer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/devel/netpanzer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- netpanzer.spec	20 Aug 2009 15:14:40 -0000	1.12
+++ netpanzer.spec	26 Aug 2009 06:16:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           netpanzer
 Version:        0.8.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An Online Multiplayer Tactical Warfare Game
 
 Group:          Amusements/Games
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpanzer
 
 %changelog
+* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.8.2-8
+- Rebuild for new libphysfs API bump to fix broken deps
+
 * Thu Aug 20 2009 Jon Ciesla <limb at jcomserv.net> 0.8.2-7
 - Rebuild for openal-soft.
 



From alexlan at fedoraproject.org  Wed Aug 26 06:38:45 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 06:38:45 +0000 (UTC)
Subject: rpms/supertux/devel supertux.spec,1.25,1.26
Message-ID: <20090826063845.6EAA511C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/supertux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17581

Modified Files:
	supertux.spec 
Log Message:
* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.3.1-9
- Rebuild for new openal



Index: supertux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- supertux.spec	27 Jul 2009 05:08:06 -0000	1.25
+++ supertux.spec	26 Aug 2009 06:38:43 -0000	1.26
@@ -6,7 +6,7 @@
 
 Name:           supertux
 Version:        0.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Jump'n run like game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.3.1-9
+- Rebuild for new openal
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Wed Aug 26 06:51:31 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 06:51:31 +0000 (UTC)
Subject: rpms/osgal/devel osgal.spec,1.16,1.17
Message-ID: <20090826065131.DCB8F11C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/osgal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20207

Modified Files:
	osgal.spec 
Log Message:
* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1:0.6.1-9
- Rebuild for new openal to fix broken deps in rawhide



Index: osgal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osgal/devel/osgal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- osgal.spec	25 Jul 2009 20:59:49 -0000	1.16
+++ osgal.spec	26 Aug 2009 06:51:30 -0000	1.17
@@ -1,7 +1,7 @@
 Name:           osgal
 Epoch:          1
 Version:        0.6.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Adapts OpenSceneGraph to use OpenAL++
 
 Group:          System Environment/Libraries
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1:0.6.1-9
+- Rebuild for new openal to fix broken deps in rawhide
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Wed Aug 26 06:54:19 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 06:54:19 +0000 (UTC)
Subject: rpms/poker3d/devel poker3d.spec,1.11,1.12
Message-ID: <20090826065419.CAC5211C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/poker3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20724

Modified Files:
	poker3d.spec 
Log Message:
* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.36-17
- Rebuild for new openal to fix broken deps in rawhide



Index: poker3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker3d/devel/poker3d.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- poker3d.spec	26 Jul 2009 19:04:33 -0000	1.11
+++ poker3d.spec	26 Aug 2009 06:54:19 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           poker3d
 Version:        1.1.36
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Three dimensional multi-user online poker game
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.36-17
+- Rebuild for new openal to fix broken deps in rawhide
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.36-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From alexlan at fedoraproject.org  Wed Aug 26 07:19:09 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 07:19:09 +0000 (UTC)
Subject: rpms/qtparted/devel qtparted.spec,1.32,1.33
Message-ID: <20090826071909.D84C011C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/qtparted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25958

Modified Files:
	qtparted.spec 
Log Message:
* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.5-21
- Add explicit requirement on libuuid-devel to fix broken deps in rawhide



Index: qtparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- qtparted.spec	27 Jul 2009 02:37:58 -0000	1.32
+++ qtparted.spec	26 Aug 2009 07:19:08 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 Group:          Applications/System
 License:        GPLv2
@@ -27,6 +27,7 @@ BuildRequires:  e2fsprogs
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  jfsutils
 BuildRequires:  xfsprogs
+BuildRequires:  libuuid-devel
 # Bugzilla 407151
 %ifnarch ppc ppc64
 BuildRequires:  ntfsprogs-devel
@@ -119,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/qtparted.1*
 
 %changelog
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.5-21
+- Add explicit requirement on libuuid-devel to fix broken deps in rawhide
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Wed Aug 26 07:40:45 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 07:40:45 +0000 (UTC)
Subject: rpms/python-openoffice/devel python-openoffice.spec,1.4,1.5
Message-ID: <20090826074045.B82A511C043D@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/python-openoffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29483

Modified Files:
	python-openoffice.spec 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.1-0.5.20090228svn34
- fixed Source0 URL



Index: python-openoffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-openoffice/devel/python-openoffice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-openoffice.spec	26 Jul 2009 20:47:27 -0000	1.4
+++ python-openoffice.spec	26 Aug 2009 07:40:43 -0000	1.5
@@ -6,12 +6,12 @@
 
 Name:           python-%{module}
 Version:        0.1
-Release:        0.4.%{svndate}svn%{svnrev}%{?dist}
+Release:        0.5.%{svndate}svn%{svnrev}%{?dist}
 Summary:        Python libraries for interacting with OpenOffice.org
 Group:          Development/Languages
 License:        GPLv3
 URL:            http://openoffice-python.origo.ethz.ch/
-Source0:        http://download.origo.ethz.ch/openoffice-python/807/%{module}-python-%{version}-r%{svnrev}-%{svndate}.tar.bz2
+Source0:        http://download.origo.ethz.ch/openoffice-python/1034/%{module}-python-%{version}-r%{svnrev}-%{svndate}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.1-0.5.20090228svn34
+- fixed Source0 URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.4.20090228svn34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From awjb at fedoraproject.org  Wed Aug 26 07:51:25 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Wed, 26 Aug 2009 07:51:25 +0000 (UTC)
Subject: rpms/synce-sync-engine/F-10 synce-sync-engine.spec,1.13,1.14
Message-ID: <20090826075125.47E6011C0082@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/synce-sync-engine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31624

Modified Files:
	synce-sync-engine.spec 
Log Message:
- exclude pyc pyo from bindir



Index: synce-sync-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synce-sync-engine/F-10/synce-sync-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- synce-sync-engine.spec	18 Aug 2009 04:54:01 -0000	1.13
+++ synce-sync-engine.spec	26 Aug 2009 07:51:24 -0000	1.14
@@ -94,6 +94,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/opensync/python-plugins/*
 %{_datadir}/opensync/defaults/*
+%exclude %{_bindir}/*pyc
+%exclude %{_bindir}/*pyo
 
 %changelog
 * Wed Aug 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From alexlan at fedoraproject.org  Wed Aug 26 07:54:50 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 07:54:50 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.81,1.82
Message-ID: <20090826075450.F3CE211C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32419

Modified Files:
	plplot.spec 
Log Message:
* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-5
- Temporarily disable check to fix broken deps in rawhide



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- plplot.spec	14 Aug 2009 03:36:13 -0000	1.81
+++ plplot.spec	26 Aug 2009 07:54:50 -0000	1.82
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -339,17 +339,17 @@ do
    cat tclIndex.hd tclIndex > ${file}
 done
 
-
-%check
-cd fedora
+# temporarily disable check to fix broken deps
+#check
+#cd fedora
 #Hack
-export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
+#export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude perl and compare tests for now, and ocaml from ppc/ppc64
-%ifarch ppc ppc64
-ctest -V -E 'compare|ocaml'
-%else
-ctest -V -E 'compare'
-%endif
+#ifarch ppc ppc64
+#ctest -V -E 'compare|ocaml'
+#else
+#ctest -V -E 'compare'
+#endif
 
 
 %clean
@@ -599,6 +599,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-5
+- Temporarily disable check to fix broken deps in rawhide
+
 * Thu Aug 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-4
 - Add patch to support octave 3.2
 



From caolanm at fedoraproject.org  Wed Aug 26 07:56:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 26 Aug 2009 07:56:09 +0000 (UTC)
Subject: rpms/hunspell-kk/devel .cvsignore, 1.1, 1.2 hunspell-kk.spec, 1.4, 
	1.5 sources, 1.1, 1.2 dict-kk.oxt, 1.1, NONE
Message-ID: <20090826075609.8287711C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-kk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32756

Modified Files:
	.cvsignore hunspell-kk.spec sources 
Removed Files:
	dict-kk.oxt 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-kk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:47:27 -0000	1.1
+++ .cvsignore	26 Aug 2009 07:56:08 -0000	1.2
@@ -0,0 +1 @@
+dict-kk.zip


Index: hunspell-kk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-kk/devel/hunspell-kk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hunspell-kk.spec	25 Jul 2009 02:30:44 -0000	1.4
+++ hunspell-kk.spec	26 Aug 2009 07:56:09 -0000	1.5
@@ -1,10 +1,10 @@
 Name: hunspell-kk
 Summary: Kazakh hunspell dictionaries
-Version: 1.0
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 Group: Applications/Text
-Source: http://extensions.services.openoffice.org/files/1172/7/dict-kk.oxt
-URL: http://extensions.services.openoffice.org/node/2240
+Source: http://extensions.services.openoffice.org/files/1172/8/dict-kk.zip
+URL: http://extensions.services.openoffice.org/project/dict-kk
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv2+ or LGPLv2+ or MPLv1.1
 BuildArch: noarch
@@ -27,8 +27,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p kk_KZ.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/kk_KZ.aff
-cp -p kk_KZ.dic.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/kk_KZ.dic
+cp -p kk_KZ.* $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Aug 26 2009 Caolan McNamara <caolanm at redhat.com> - 1.1-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-kk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Apr 2009 16:47:27 -0000	1.1
+++ sources	26 Aug 2009 07:56:09 -0000	1.2
@@ -0,0 +1 @@
+42650ff23591d0433f5c6f042d4cd5a3  dict-kk.zip


--- dict-kk.oxt DELETED ---



From sharkcz at fedoraproject.org  Wed Aug 26 07:57:02 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 07:57:02 +0000 (UTC)
Subject: rpms/tryton/devel tryton.spec,1.7,1.8
Message-ID: <20090826075702.0973111C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv556

Modified Files:
	tryton.spec 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 1.2.1-3
- fixed Source0 URL



Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/tryton.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tryton.spec	27 Jul 2009 06:18:54 -0000	1.7
+++ tryton.spec	26 Aug 2009 07:57:01 -0000	1.8
@@ -2,13 +2,13 @@
 
 Name:           tryton
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://www.tryton.org
-Source0:        http://downloads.tryton.org/1.0/%{name}-%{version}.tar.gz
+Source0:        http://downloads.tryton.org/1.2/%{name}-%{version}.tar.gz
 Patch0:         %{name}-1.2-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 1.2.1-3
+- fixed Source0 URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Wed Aug 26 08:07:20 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 08:07:20 +0000 (UTC)
Subject: rpms/pywebdav/devel .cvsignore, 1.3, 1.4 pywebdav.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090826080720.738C311C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2486

Modified Files:
	.cvsignore pywebdav.spec sources 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 May 2009 10:43:01 -0000	1.3
+++ .cvsignore	26 Aug 2009 08:07:20 -0000	1.4
@@ -1 +1 @@
-PyWebDAV-0.9.2.tar.gz
+PyWebDAV-0.9.3.tar.gz


Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/devel/pywebdav.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pywebdav.spec	27 Jul 2009 01:37:41 -0000	1.4
+++ pywebdav.spec	26 Aug 2009 08:07:20 -0000	1.5
@@ -3,8 +3,8 @@
 %define srcname PyWebDAV
 
 Name:           pywebdav
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        WebDAV library
 
 Group:          Development/Languages
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 May 2009 10:43:01 -0000	1.3
+++ sources	26 Aug 2009 08:07:20 -0000	1.4
@@ -1 +1 @@
-bcbc1372f7082f85f94d28a0aa6fc96b  PyWebDAV-0.9.2.tar.gz
+8cdd13bf368b8665c1e72297e8251878  PyWebDAV-0.9.3.tar.gz



From tmraz at fedoraproject.org  Wed Aug 26 08:13:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 08:13:51 +0000 (UTC)
Subject: rpms/qca-tls/devel qca-tls-1.0-ossl10.patch, NONE, 1.1 qca-tls.spec,
	1.24, 1.25
Message-ID: <20090826081351.503AF11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qca-tls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3586

Modified Files:
	qca-tls.spec 
Added Files:
	qca-tls-1.0-ossl10.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
- rebuilt with new openssl


qca-tls-1.0-ossl10.patch:
 qca-tls.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE qca-tls-1.0-ossl10.patch ---
diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp
--- qca-tls-1.0/qca-tls.cpp.ossl10	2009-08-26 10:08:36.000000000 +0200
+++ qca-tls-1.0/qca-tls.cpp	2009-08-26 10:11:57.000000000 +0200
@@ -953,7 +953,11 @@ public:
 	RSAKeyContext *key;
 
 	SSL *ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD *method;
+#else
 	SSL_METHOD *method;
+#endif
 	SSL_CTX *context;
 	BIO *rbio, *wbio;
 	CertContext cc;


Index: qca-tls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- qca-tls.spec	21 Aug 2009 15:37:52 -0000	1.24
+++ qca-tls.spec	26 Aug 2009 08:13:49 -0000	1.25
@@ -11,6 +11,8 @@ Source0:	http://delta.affinix.com/downlo
 Patch0:		qca-tls-1.0-mach.patch
 # Missing ifdefs for openssl 0.9.8
 Patch1:     qca-tls-1.0-ossl098.patch
+# Build with openssl 1.0.0
+Patch2:     qca-tls-1.0-ossl10.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt3-devel
@@ -28,7 +30,7 @@ contains the TLS plugin.
 %setup -q
 %patch0 -p0 -b .mach
 %patch1 -p0 -b .ossl098
-
+%patch2 -p1 -b .ossl10
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt3.sh
@@ -56,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-18
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17



From alexlan at fedoraproject.org  Wed Aug 26 08:14:40 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 08:14:40 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.70,1.71
Message-ID: <20090826081440.8363411C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3779

Modified Files:
	openvrml.spec 
Log Message:
* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.18.3-2
- Rebuild for broken deps



Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- openvrml.spec	13 Aug 2009 07:37:41 -0000	1.70
+++ openvrml.spec	26 Aug 2009 08:14:40 -0000	1.71
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -188,6 +188,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.18.3-2
+- Rebuild for broken deps
+
 * Thu Aug 13 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-1
 - Updated to 0.18.3.
 



From sharkcz at fedoraproject.org  Wed Aug 26 08:18:57 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 08:18:57 +0000 (UTC)
Subject: rpms/pywebdav/F-11 .cvsignore, 1.3, 1.4 pywebdav.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090826081857.D17A711C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5109

Modified Files:
	.cvsignore pywebdav.spec sources 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 May 2009 15:06:25 -0000	1.3
+++ .cvsignore	26 Aug 2009 08:18:57 -0000	1.4
@@ -1 +1 @@
-PyWebDAV-0.9.2.tar.gz
+PyWebDAV-0.9.3.tar.gz


Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-11/pywebdav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pywebdav.spec	15 May 2009 15:06:26 -0000	1.3
+++ pywebdav.spec	26 Aug 2009 08:18:57 -0000	1.4
@@ -3,7 +3,7 @@
 %define srcname PyWebDAV
 
 Name:           pywebdav
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        WebDAV library
 
@@ -61,6 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 15 2009 Dan Hor?k <dan[at]danny.cz> 0.9.2-1
 - update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 May 2009 15:06:26 -0000	1.3
+++ sources	26 Aug 2009 08:18:57 -0000	1.4
@@ -1 +1 @@
-bcbc1372f7082f85f94d28a0aa6fc96b  PyWebDAV-0.9.2.tar.gz
+8cdd13bf368b8665c1e72297e8251878  PyWebDAV-0.9.3.tar.gz



From sharkcz at fedoraproject.org  Wed Aug 26 08:20:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 08:20:03 +0000 (UTC)
Subject: rpms/pywebdav/F-10 .cvsignore, 1.3, 1.4 pywebdav.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090826082003.DD0D811C043A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5410

Modified Files:
	.cvsignore pywebdav.spec sources 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 May 2009 15:08:07 -0000	1.3
+++ .cvsignore	26 Aug 2009 08:20:03 -0000	1.4
@@ -1 +1 @@
-PyWebDAV-0.9.2.tar.gz
+PyWebDAV-0.9.3.tar.gz


Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-10/pywebdav.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pywebdav.spec	15 May 2009 15:08:07 -0000	1.2
+++ pywebdav.spec	26 Aug 2009 08:20:03 -0000	1.3
@@ -3,7 +3,7 @@
 %define srcname PyWebDAV
 
 Name:           pywebdav
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        WebDAV library
 
@@ -61,6 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 15 2009 Dan Hor?k <dan[at]danny.cz> 0.9.2-1
 - update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 May 2009 15:08:07 -0000	1.3
+++ sources	26 Aug 2009 08:20:03 -0000	1.4
@@ -1 +1 @@
-bcbc1372f7082f85f94d28a0aa6fc96b  PyWebDAV-0.9.2.tar.gz
+8cdd13bf368b8665c1e72297e8251878  PyWebDAV-0.9.3.tar.gz



From sharkcz at fedoraproject.org  Wed Aug 26 08:21:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 08:21:53 +0000 (UTC)
Subject: rpms/pywebdav/EL-5 .cvsignore, 1.2, 1.3 pywebdav.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090826082153.7A79F11C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5844

Modified Files:
	.cvsignore pywebdav.spec sources 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jan 2009 08:25:43 -0000	1.2
+++ .cvsignore	26 Aug 2009 08:21:53 -0000	1.3
@@ -1 +1 @@
-pywebdav-0.8.tar.gz
+PyWebDAV-0.9.3.tar.gz


Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/pywebdav.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pywebdav.spec	21 Jan 2009 08:25:43 -0000	1.1
+++ pywebdav.spec	26 Aug 2009 08:21:53 -0000	1.2
@@ -1,18 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define srcname PyWebDAV
+
 Name:           pywebdav
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        WebDAV library
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.webdav.de/
-Source0:        http://pypi.python.org/packages/source/P/PyWebDAV/%{name}-%{version}.tar.gz
+Source0:        http://pywebdav.googlecode.com/files/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
 Requires:       PyXML
 
 %description
@@ -22,7 +24,7 @@ store properties for objects, etc.
 
 
 %prep
-%setup -q
+%setup -q -n %{srcname}-%{version}
 
 # remove the shebang lines
 pushd DAV
@@ -32,7 +34,7 @@ do
 done
 popd
 
-chmod a-x PyDAVServer/server.py
+chmod a-x DAVServer/server.py
 
 
 %build
@@ -50,12 +52,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ARCHITECTURE Changes INSTALL LICENSE README TODO
-%doc PyDAVServer
-%{python_sitelib}/*
+%doc doc/*
+%doc DAVServer
+%{python_sitelib}/DAV
+%{python_sitelib}/%{srcname}*
+%exclude %{python_sitelib}/DAVServer*
+%exclude %{_bindir}/*
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 15 2009 Dan Hor?k <dan[at]danny.cz> 0.9.2-1
+- update to 0.9.2
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jan 20 2009 Dan Hor?k <dan[at]danny.cz> 0.8-2
 - add PyDAVServer as an example into docs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jan 2009 08:25:43 -0000	1.2
+++ sources	26 Aug 2009 08:21:53 -0000	1.3
@@ -1 +1 @@
-68d46887f9d8b25fb5ce1f2540f0cd4c  pywebdav-0.8.tar.gz
+8cdd13bf368b8665c1e72297e8251878  PyWebDAV-0.9.3.tar.gz



From alexlan at fedoraproject.org  Wed Aug 26 08:38:17 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 08:38:17 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.82,1.83
Message-ID: <20090826083818.059DC11C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8424

Modified Files:
	plplot.spec 
Log Message:
- Attempt bootstrap build without pdl



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- plplot.spec	26 Aug 2009 07:54:50 -0000	1.82
+++ plplot.spec	26 Aug 2009 08:38:16 -0000	1.83
@@ -6,7 +6,7 @@
 %bcond_without octave
 # Set to bcond_with or use --without pdl to disable pdl tests - needed to 
 # bootstrap or for soname bumps in a plplot dependency
-%bcond_without pdl
+%bcond_with pdl
 
 Name:           plplot
 Version:        5.9.4
@@ -601,6 +601,7 @@ fi
 %changelog
 * 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



From sharkcz at fedoraproject.org  Wed Aug 26 08:51:24 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 08:51:24 +0000 (UTC)
Subject: rpms/pywebdav/EL-5 pywebdav.spec,1.2,1.3
Message-ID: <20090826085124.21F3111C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11323

Modified Files:
	pywebdav.spec 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1.1
- fix build on EL-5, lower the required setuptools version



Index: pywebdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/pywebdav.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pywebdav.spec	26 Aug 2009 08:21:53 -0000	1.2
+++ pywebdav.spec	26 Aug 2009 08:51:23 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           pywebdav
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        WebDAV library
 
 Group:          Development/Languages
@@ -36,6 +36,9 @@ popd
 
 chmod a-x DAVServer/server.py
 
+# lower the required setuptools version to the one available in EL-5
+sed -i s/"0.6c9"/"0.6c7"/ ez_setup.py
+
 
 %build
 %{__python} setup.py build
@@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1.1
+- fix build on EL-5, lower the required setuptools version
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 0.9.3-1
 - update to 0.9.3
 



From tmraz at fedoraproject.org  Wed Aug 26 08:53:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 08:53:08 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel
	perl-Crypt-OpenSSL-X509-openssl.patch, 1.2, 1.3
Message-ID: <20090826085308.A9AA111C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11688

Modified Files:
	perl-Crypt-OpenSSL-X509-openssl.patch 
Log Message:
- SHA1 is now used in the hash() call


perl-Crypt-OpenSSL-X509-openssl.patch:
 X509.xs  |   20 +++++++++++++++++++-
 t/x509.t |    2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

Index: perl-Crypt-OpenSSL-X509-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509-openssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Crypt-OpenSSL-X509-openssl.patch	25 Aug 2009 20:13:31 -0000	1.2
+++ perl-Crypt-OpenSSL-X509-openssl.patch	26 Aug 2009 08:53:08 -0000	1.3
@@ -1,50 +1,62 @@
+diff -up Crypt-OpenSSL-X509-0.7/t/x509.t.openssl Crypt-OpenSSL-X509-0.7/t/x509.t
+--- Crypt-OpenSSL-X509-0.7/t/x509.t.openssl	2009-08-26 10:06:16.000000000 +0200
++++ Crypt-OpenSSL-X509-0.7/t/x509.t	2009-08-26 10:05:21.000000000 +0200
+@@ -12,7 +12,7 @@ ok($x509->fingerprint_md5() eq '51:86:E8
+ ok($x509->issuer() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'issuer()');
+ ok($x509->subject() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'subject()');
+ 
+-ok($x509->hash() eq '2edf7016' or '24ad0b63', hash());
++ok($x509->hash() eq '2edf7016', hash());
+ 
+ ok($x509 = Crypt::OpenSSL::X509->new_from_file('certs/thawte.pem'), 'new_from_file()');
+ 
 diff -up Crypt-OpenSSL-X509-0.7/X509.xs.openssl Crypt-OpenSSL-X509-0.7/X509.xs
 --- Crypt-OpenSSL-X509-0.7/X509.xs.openssl	2008-02-23 23:18:11.000000000 +0100
-+++ Crypt-OpenSSL-X509-0.7/X509.xs	2009-08-25 22:12:33.000000000 +0200
++++ Crypt-OpenSSL-X509-0.7/X509.xs	2009-08-25 23:12:45.000000000 +0200
 @@ -252,12 +252,19 @@ accessor(x509)
  	} else if (ix == 7) {
  
  		int j;
-+	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
 +		STACK_OF(OPENSSL_STRING) *emlst = X509_get1_email(x509);
 +
 +		for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++) {
 +			BIO_printf(bio, "%s", sk_OPENSSL_STRING_value(emlst, j));
 +		}
-+	#else
++#else
  		STACK *emlst = X509_get1_email(x509);
  
  		for (j = 0; j < sk_num(emlst); j++) {
  			BIO_printf(bio, "%s", sk_value(emlst, j));
  		}
 -
-+	#endif
++#endif
  		X509_email_free(emlst);
  	}
  
-@@ -290,6 +297,17 @@ as_string(x509, format = FORMAT_PEM)
+@@ -289,7 +296,17 @@ as_string(x509, format = FORMAT_PEM)
+ 		i2d_X509_bio(bio, x509);
  
  	} else if (format == FORMAT_NETSCAPE) {
- 
-+	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
 +		NETSCAPE_X509 nx;
 +		ASN1_OCTET_STRING hdr;
 +
 +		hdr.data   = (unsigned char *)NETSCAPE_CERT_HDR;
 +		hdr.length = strlen(NETSCAPE_CERT_HDR);
-+		nx.header = &os;
++		nx.header = &hdr;
 +		nx.cert   = x509;
-+
+ 
 +		ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509), bio, &nx);
-+	#else
++#else
  		ASN1_HEADER ah;
  		ASN1_OCTET_STRING os;
  
-@@ -300,6 +318,7 @@ as_string(x509, format = FORMAT_PEM)
+@@ -300,6 +317,7 @@ as_string(x509, format = FORMAT_PEM)
  		ah.meth   = X509_asn1_meth();
  
  		ASN1_i2d_bio(i2d_ASN1_HEADER, bio, (unsigned char *)&ah);
-+	#endif
++#endif
  	}
  
  	RETVAL = sv_bio_final(bio);



From tmraz at fedoraproject.org  Wed Aug 26 08:58:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 08:58:08 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-ossl10.patch, NONE,
	1.1 qt.spec, 1.315, 1.316
Message-ID: <20090826085808.A0CE711C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12844

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-ossl10.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11
- rebuilt with new openssl


qt-x11-opensource-src-4.5.2-ossl10.patch:
 qsslsocket_openssl.cpp         |    2 +-
 qsslsocket_openssl_symbols.cpp |   24 ++++++++++++------------
 qsslsocket_openssl_symbols_p.h |   32 ++++++++++++++++++++------------
 3 files changed, 33 insertions(+), 25 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-ossl10.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl	2009-06-20 06:57:57.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp	2009-08-26 10:40:09.000000000 +0200
@@ -911,7 +911,7 @@ QSslCipher QSslSocketBackendPrivate::ses
 {
     if (!ssl || !ctx)
         return QSslCipher();
-    SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl);
+    SSL_CIPHER *sessionCipher = (SSL_CIPHER *)q_SSL_get_current_cipher(ssl);
     return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher();
 }
 
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp.openssl	2009-08-26 10:36:25.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp	2009-08-26 10:37:57.000000000 +0200
@@ -144,10 +144,10 @@ DEFINEFUNC(int, RAND_status, void, DUMMY
 DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
 DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
 DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
+DEFINEFUNC2(OSSL_SKVAL_RTYPE *, sk_value, STACK *a, a, int b, b, return 0, return)
 DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
 DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
-DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
+DEFINEFUNC3(char *, SSL_CIPHER_description, OSSL_MORECONST SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
 DEFINEFUNC(int, SSL_connect, SSL *a, a, return -1, return)
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
 // 0.9.8 broke SC and BC by changing this function's signature.
@@ -157,7 +157,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke
 #endif
 DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return)
 DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG)
-DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return 0, return)
+DEFINEFUNC(SSL_CTX *, SSL_CTX_new, OSSL_MORECONST SSL_METHOD *a, a, return 0, return)
 DEFINEFUNC2(int, SSL_CTX_set_cipher_list, SSL_CTX *a, a, const char *b, b, return -1, return)
 DEFINEFUNC(int, SSL_CTX_set_default_verify_paths, SSL_CTX *a, a, return -1, return)
 DEFINEFUNC3(void, SSL_CTX_set_verify, SSL_CTX *a, a, int b, b, int (*c)(int, X509_STORE_CTX *), c, return, DUMMYARG)
@@ -174,7 +174,7 @@ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_g
 #else
 DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, SSL *a, a, return 0, return)
 #endif
-DEFINEFUNC(SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return 0, return)
 DEFINEFUNC2(int, SSL_get_error, SSL *a, a, int b, b, return -1, return)
 DEFINEFUNC(STACK_OF(X509) *, SSL_get_peer_cert_chain, SSL *a, a, return 0, return)
 DEFINEFUNC(X509 *, SSL_get_peer_certificate, SSL *a, a, return 0, return)
@@ -192,14 +192,14 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
 DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG)
 DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG)
 DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return)
-DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
-DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
+DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
 DEFINEFUNC3(int, SSL_write, SSL *a, a, const void *b, b, int c, c, return -1, return)
 DEFINEFUNC2(int, X509_cmp, X509 *a, a, X509 *b, b, return -1, return)
 #ifndef SSLEAY_MACROS
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols_p.h.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols_p.h
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols_p.h.openssl	2009-06-20 06:57:57.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols_p.h	2009-08-26 10:35:25.000000000 +0200
@@ -254,12 +254,20 @@ int q_PEM_write_bio_RSA_PUBKEY(BIO *a, R
 void q_RAND_seed(const void *a, int b);
 int q_RAND_status();
 void q_RSA_free(RSA *a);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define OSSL_SKVALUE_RTYPE void
+#define OSSL_MORECONST const
+#else
+#define OSSL_SKVALUE_RTYPE char
+#define OSSL_MORECONST
+#endif
 void q_sk_free(STACK *a);
 int q_sk_num(STACK *a);
-char * q_sk_value(STACK *a, int b);
+OSSL_SKVALUE_RTYPE * q_sk_value(STACK *a, int b);
 int q_SSL_accept(SSL *a);
 int q_SSL_clear(SSL *a);
-char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c);
+char *q_SSL_CIPHER_description(OSSL_MORECONST SSL_CIPHER *a, char *b, int c);
 int q_SSL_connect(SSL *a);
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
 // 0.9.8 broke SC and BC by changing this function's signature.
@@ -269,7 +277,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX 
 #endif
 long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d);
 void q_SSL_CTX_free(SSL_CTX *a);
-SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a);
+SSL_CTX *q_SSL_CTX_new(OSSL_MORECONST SSL_METHOD *a);
 int q_SSL_CTX_set_cipher_list(SSL_CTX *a, const char *b);
 int q_SSL_CTX_set_default_verify_paths(SSL_CTX *a);
 void q_SSL_CTX_set_verify(SSL_CTX *a, int b, int (*c)(int, X509_STORE_CTX *));
@@ -286,7 +294,7 @@ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(
 #else
 STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(SSL *a);
 #endif
-SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+OSSL_MORECONST SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
 int q_SSL_get_error(SSL *a, int b);
 STACK_OF(X509) *q_SSL_get_peer_cert_chain(SSL *a);
 X509 *q_SSL_get_peer_certificate(SSL *a);
@@ -304,14 +312,14 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
 void q_SSL_set_accept_state(SSL *a);
 void q_SSL_set_connect_state(SSL *a);
 int q_SSL_shutdown(SSL *a);
-SSL_METHOD *q_SSLv2_client_method();
-SSL_METHOD *q_SSLv3_client_method();
-SSL_METHOD *q_SSLv23_client_method();
-SSL_METHOD *q_TLSv1_client_method();
-SSL_METHOD *q_SSLv2_server_method();
-SSL_METHOD *q_SSLv3_server_method();
-SSL_METHOD *q_SSLv23_server_method();
-SSL_METHOD *q_TLSv1_server_method();
+OSSL_MORECONST SSL_METHOD *q_SSLv2_client_method();
+OSSL_MORECONST SSL_METHOD *q_SSLv3_client_method();
+OSSL_MORECONST SSL_METHOD *q_SSLv23_client_method();
+OSSL_MORECONST SSL_METHOD *q_TLSv1_client_method();
+OSSL_MORECONST SSL_METHOD *q_SSLv2_server_method();
+OSSL_MORECONST SSL_METHOD *q_SSLv3_server_method();
+OSSL_MORECONST SSL_METHOD *q_SSLv23_server_method();
+OSSL_MORECONST SSL_METHOD *q_TLSv1_server_method();
 int q_SSL_write(SSL *a, const void *b, int c);
 int q_X509_cmp(X509 *a, X509 *b);
 #ifdef SSLEAY_MACROS


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- qt.spec	21 Aug 2009 15:39:48 -0000	1.315
+++ qt.spec	26 Aug 2009 08:58:08 -0000	1.316
@@ -59,6 +59,8 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # 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
@@ -385,6 +387,7 @@ Qt libraries used for drawing widgets an
 %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
@@ -917,7 +920,7 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11
+* 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



From tmraz at fedoraproject.org  Wed Aug 26 08:59:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 08:59:26 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel
	perl-Crypt-OpenSSL-X509-openssl.patch, 1.3, 1.4
Message-ID: <20090826085926.A0BAC11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13154

Modified Files:
	perl-Crypt-OpenSSL-X509-openssl.patch 
Log Message:
- oops reversed hunk


perl-Crypt-OpenSSL-X509-openssl.patch:
 X509.xs  |   20 +++++++++++++++++++-
 t/x509.t |    2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

Index: perl-Crypt-OpenSSL-X509-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509-openssl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Crypt-OpenSSL-X509-openssl.patch	26 Aug 2009 08:53:08 -0000	1.3
+++ perl-Crypt-OpenSSL-X509-openssl.patch	26 Aug 2009 08:59:26 -0000	1.4
@@ -5,8 +5,8 @@ diff -up Crypt-OpenSSL-X509-0.7/t/x509.t
  ok($x509->issuer() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'issuer()');
  ok($x509->subject() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'subject()');
  
--ok($x509->hash() eq '2edf7016' or '24ad0b63', hash());
-+ok($x509->hash() eq '2edf7016', hash());
+-ok($x509->hash() eq '2edf7016', hash());
++ok($x509->hash() eq '2edf7016' or '24ad0b63', hash());
  
  ok($x509 = Crypt::OpenSSL::X509->new_from_file('certs/thawte.pem'), 'new_from_file()');
  



From phuang at fedoraproject.org  Wed Aug 26 09:01:06 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 26 Aug 2009 09:01:06 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.83,1.84
Message-ID: <20090826090106.5928311C0082@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13617

Modified Files:
	ibus.spec 
Log Message:
Install some icons in hicolor


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ibus.spec	12 Aug 2009 01:54:42 -0000	1.83
+++ ibus.spec	26 Aug 2009 09:01:05 -0000	1.84
@@ -15,6 +15,7 @@ Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
+Source2:    icons.tar.gz
 Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,43 +114,55 @@ The ibus-devel-docs package contains dev
 
 
 %prep
-%setup -q
+%setup -q -a2
 # %patch0 -p1
 
 %build
 %configure --disable-static \
-		   --disable-iso-codes-check \
-		   --enable-gtk-doc \
-		   --disable-qt4-immodule
+	   --disable-iso-codes-check \
+           --enable-gtk-doc \
+           --disable-qt4-immodule
 # make -C po update-gmo
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la
 
+# install icons
+install -pm 644 -D icons/IBus4-16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/status/ibus-off.png
+install -pm 644 -D icons/IBus4-22.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/status/ibus-off.png
+install -pm 644 -D icons/IBus4-24.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/status/ibus-off.png
+install -pm 644 -D icons/IBus4-32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/status/ibus-off.png
+install -pm 644 -D icons/IBus4-48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/status/ibus-off.png
+install -pm 644 -D icons/IBus4-48.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/status/ibus-off.svg
+
 # install xinput config file
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
+mkdir -pm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
 
 # install .desktop files
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
+echo "NoDisplay=true" >> ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus.desktop
+echo "NoDisplay=true" >> ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup.desktop
 echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
+rm -rf ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ibus.desktop
 desktop-file-install --delete-original          \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/*
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
 
 %post
-update-desktop-database -q
+# recreate icon cache
+touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -168,18 +181,20 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-update-desktop-database -q
+# recreate icon cache
+touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 if [ "$1" = "0" ]; then
   %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
   # if alternative was set to manual, reset to auto
   [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
 fi
 
-%post libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %post gtk
 %{_bindir}/update-gtk-immodules %{_host} || :
@@ -198,6 +213,7 @@ fi
 %{_datadir}/ibus/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/status/*
 %{_libexecdir}/ibus-gconf
 %{_libexecdir}/ibus-ui-gtk
 %{_libexecdir}/ibus-x11



From phuang at fedoraproject.org  Wed Aug 26 09:02:13 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 26 Aug 2009 09:02:13 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore,1.39,1.40 sources,1.44,1.45
Message-ID: <20090826090213.DFFBA11C0082@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13897

Modified Files:
	.cvsignore sources 
Log Message:
Install some icons in hicolor


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	12 Aug 2009 01:54:42 -0000	1.39
+++ .cvsignore	26 Aug 2009 09:02:13 -0000	1.40
@@ -1 +1,2 @@
+icons.tar.gz
 ibus-1.2.0.20090812.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	12 Aug 2009 01:54:42 -0000	1.44
+++ sources	26 Aug 2009 09:02:13 -0000	1.45
@@ -1 +1,2 @@
+cf57c152f07c90c72aa8c3281a65e80c  icons.tar.gz
 5b50f05b00355ae74a85f572339fb7c1  ibus-1.2.0.20090812.tar.gz



From tmraz at fedoraproject.org  Wed Aug 26 09:10:20 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 09:10:20 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel
	perl-Crypt-OpenSSL-X509-openssl.patch, 1.4, 1.5
Message-ID: <20090826091020.1175811C043D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15412

Modified Files:
	perl-Crypt-OpenSSL-X509-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-5
- rebuilt with new openssl


perl-Crypt-OpenSSL-X509-openssl.patch:
 X509.xs  |   20 +++++++++++++++++++-
 t/x509.t |    2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

Index: perl-Crypt-OpenSSL-X509-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509-openssl.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Crypt-OpenSSL-X509-openssl.patch	26 Aug 2009 08:59:26 -0000	1.4
+++ perl-Crypt-OpenSSL-X509-openssl.patch	26 Aug 2009 09:10:19 -0000	1.5
@@ -5,8 +5,8 @@ diff -up Crypt-OpenSSL-X509-0.7/t/x509.t
  ok($x509->issuer() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'issuer()');
  ok($x509->subject() eq 'C=US, O=VeriSign, Inc., OU=Class 1 Public Primary Certification Authority', 'subject()');
  
--ok($x509->hash() eq '2edf7016', hash());
-+ok($x509->hash() eq '2edf7016' or '24ad0b63', hash());
+-ok($x509->hash() eq '2edf7016', 'hash()');
++ok($x509->hash() eq '2edf7016' or '24ad0b63', 'hash()');
  
  ok($x509 = Crypt::OpenSSL::X509->new_from_file('certs/thawte.pem'), 'new_from_file()');
  



From tomeu at fedoraproject.org  Wed Aug 26 09:14:13 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 26 Aug 2009 09:14:13 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 sugar-base.spec, 1.19, 1.20
Message-ID: <20090826091413.D6A9911C0082@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16340

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Jul 2009 13:59:07 -0000	1.13
+++ .cvsignore	26 Aug 2009 09:14:13 -0000	1.14
@@ -1 +1 @@
-sugar-base-0.85.2.tar.bz2
+sugar-base-0.85.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	18 Jul 2009 13:59:07 -0000	1.13
+++ sources	26 Aug 2009 09:14:13 -0000	1.14
@@ -1 +1 @@
-29af717b0f8558d7e329058b44527aec  sugar-base-0.85.2.tar.bz2
+c2067ccf42fb978772be84894d7300af  sugar-base-0.85.3.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sugar-base.spec	27 Jul 2009 04:59:06 -0000	1.19
+++ sugar-base.spec	26 Aug 2009 09:14:13 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.85.2
-Release: 2%{?dist}
+Version: 0.85.3
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.85.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tomeu at fedoraproject.org  Wed Aug 26 09:17:28 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 26 Aug 2009 09:17:28 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.35, 1.36 sources, 1.39,
	1.40 sugar-toolkit.spec, 1.50, 1.51
Message-ID: <20090826091728.AD09711C0082@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16971

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	2 Aug 2009 13:27:28 -0000	1.35
+++ .cvsignore	26 Aug 2009 09:17:28 -0000	1.36
@@ -1 +1 @@
-sugar-toolkit-0.85.3.tar.bz2
+sugar-toolkit-0.85.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	2 Aug 2009 13:27:28 -0000	1.39
+++ sources	26 Aug 2009 09:17:28 -0000	1.40
@@ -1 +1 @@
-fffae174aa4dad02ffd2e6a58567ae70  sugar-toolkit-0.85.3.tar.bz2
+2ba59ac81f2b4313dd10c7fc7733cc4d  sugar-toolkit-0.85.5.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sugar-toolkit.spec	2 Aug 2009 13:27:28 -0000	1.50
+++ sugar-toolkit.spec	26 Aug 2009 09:17:28 -0000	1.51
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.85.3
+Version: 0.85.5
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -69,6 +69,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.5-1
+- New upstream release
+
 * Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
 - New upstream release
 



From tomeu at fedoraproject.org  Wed Aug 26 09:20:43 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 26 Aug 2009 09:20:43 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 sugar-datastore.spec, 1.17, 1.18
Message-ID: <20090826092043.08B2211C043A@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18281

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
- Update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	7 Aug 2009 14:38:40 -0000	1.13
+++ .cvsignore	26 Aug 2009 09:20:42 -0000	1.14
@@ -1 +1 @@
-sugar-datastore-0.85.1.tar.bz2
+sugar-datastore-0.85.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Aug 2009 14:38:40 -0000	1.13
+++ sources	26 Aug 2009 09:20:42 -0000	1.14
@@ -1 +1 @@
-38b3f3af867aad3679a89f8966e166c5  sugar-datastore-0.85.1.tar.bz2
+d31d493d0231cfa7e1931ce4368e9aa4  sugar-datastore-0.85.2.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sugar-datastore.spec	7 Aug 2009 14:38:40 -0000	1.17
+++ sugar-datastore.spec	26 Aug 2009 09:20:42 -0000	1.18
@@ -4,7 +4,7 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.85.1
+Version: 0.85.2
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.2-1
+- Update to new upstream release
+
 * Fri Aug 07 2009 Simon Schampijer <simon at schampijer.de> - 0.85.1-1
 - PEP8 compliance fixes #1108
 - Rebuild index when an inconsistency between the index and the metadata is detected



From tomeu at fedoraproject.org  Wed Aug 26 09:23:01 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 26 Aug 2009 09:23:01 +0000 (UTC)
Subject: rpms/hulahop/devel .cvsignore, 1.4, 1.5 hulahop.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20090826092301.817D711C0082@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/hulahop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18880

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.5.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Jul 2009 11:43:22 -0000	1.4
+++ .cvsignore	26 Aug 2009 09:23:01 -0000	1.5
@@ -1 +1 @@
-hulahop-0.5.0.tar.bz2
+hulahop-0.5.1.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/hulahop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- hulahop.spec	25 Jul 2009 02:19:00 -0000	1.14
+++ hulahop.spec	26 Aug 2009 09:23:01 -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: hulahop
-Version: 0.5.0
+Version: 0.5.1
 Release: 1%{?dist}
 Summary: A pygtk widget for embedding mozilla
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.5.1-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	19 Jul 2009 11:43:22 -0000	1.6
+++ sources	26 Aug 2009 09:23:01 -0000	1.7
@@ -1 +1 @@
-3b350f4fc386c69745535d1c53b1ae8f  hulahop-0.5.0.tar.bz2
+71ce72a288e3e322528166120db5efd0  hulahop-0.5.1.tar.bz2



From tomeu at fedoraproject.org  Wed Aug 26 09:26:02 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Wed, 26 Aug 2009 09:26:02 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.41, 1.42 sources, 1.43,
	1.44 sugar.spec, 1.66, 1.67
Message-ID: <20090826092602.A3ED311C0082@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19561

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	2 Aug 2009 13:30:21 -0000	1.41
+++ .cvsignore	26 Aug 2009 09:26:02 -0000	1.42
@@ -1 +1 @@
-sugar-0.85.3.tar.bz2
+sugar-0.85.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	2 Aug 2009 13:30:21 -0000	1.43
+++ sources	26 Aug 2009 09:26:02 -0000	1.44
@@ -1 +1 @@
-eda6c93cc9654676f284901ccbd86048  sugar-0.85.3.tar.bz2
+a72e795662e04140e8b852ecab549f85  sugar-0.85.4.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sugar.spec	2 Aug 2009 13:30:21 -0000	1.66
+++ sugar.spec	26 Aug 2009 09:26:02 -0000	1.67
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.85.3
+Version: 0.85.4
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -140,6 +140,9 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Aug 26 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.4-1
+- New upstream release
+
 * Sun Aug 02 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.85.3-1
 - New upstream release
 



From tmraz at fedoraproject.org  Wed Aug 26 09:30:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 09:30:23 +0000 (UTC)
Subject: rpms/boost/devel boost-openssl-1.0.patch, NONE, 1.1 boost.spec, 1.64,
	1.65
Message-ID: <20090826093023.994AA11C025F@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20342

Modified Files:
	boost.spec 
Added Files:
	boost-openssl-1.0.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.39.0-5
- Make it to be usable with openssl-1.0


boost-openssl-1.0.patch:
 openssl_context_service.hpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE boost-openssl-1.0.patch ---
diff -up boost_1_39_0/boost/asio/ssl/detail/openssl_context_service.hpp.ossl10 boost_1_39_0/boost/asio/ssl/detail/openssl_context_service.hpp
--- boost_1_39_0/boost/asio/ssl/detail/openssl_context_service.hpp.ossl10	2008-08-09 03:59:54.000000000 +0200
+++ boost_1_39_0/boost/asio/ssl/detail/openssl_context_service.hpp	2009-08-26 11:26:25.000000000 +0200
@@ -67,7 +67,11 @@ public:
   // Create a new context implementation.
   void create(impl_type& impl, context_base::method m)
   {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const ::SSL_METHOD* ssl_method = 0;
+#else
     ::SSL_METHOD* ssl_method = 0;
+#endif
     switch (m)
     {
     case context_base::sslv2:


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- boost.spec	24 Jul 2009 18:20:22 -0000	1.64
+++ boost.spec	26 Aug 2009 09:30:23 -0000	1.65
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -42,6 +42,7 @@ Patch4: boost-unneccessary_iostreams.pat
 Patch5: boost-bitset.patch
 Patch6: boost-function_template.patch
 Patch7: boost-fs_gcc44.patch
+Patch8: boost-openssl-1.0.patch
 
 %bcond_with tests
 %bcond_with docs_generated
@@ -225,6 +226,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{P
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
+%patch8 -p1
 
 %build
 BOOST_ROOT=`pwd`
@@ -436,6 +438,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.39.0-5
+- Make it to be usable with openssl-1.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.39.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Wed Aug 26 09:44:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 09:44:11 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-ossl10.patch,1.1,1.2
Message-ID: <20090826094411.5031A11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22807

Modified Files:
	qt-x11-opensource-src-4.5.2-ossl10.patch 
Log Message:
- more openssl-1.0 build fixes


qt-x11-opensource-src-4.5.2-ossl10.patch:
 qsslcertificate.cpp            |    2 +-
 qsslsocket_openssl.cpp         |    2 +-
 qsslsocket_openssl_symbols.cpp |   24 ++++++++++++------------
 qsslsocket_openssl_symbols_p.h |   32 ++++++++++++++++++++------------
 4 files changed, 34 insertions(+), 26 deletions(-)

Index: qt-x11-opensource-src-4.5.2-ossl10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.2-ossl10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 08:58:08 -0000	1.1
+++ qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 09:44:11 -0000	1.2
@@ -1,3 +1,15 @@
+diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp
+--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.openssl	2009-06-20 06:57:57.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-26 11:43:31.000000000 +0200
+@@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
+     if (!d->x509)
+         return result;
+ 
+-    STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
++    STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
+ 
+     if (altNames) {
+         for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) {
 diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp
 --- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl	2009-06-20 06:57:57.000000000 +0200
 +++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp	2009-08-26 10:40:09.000000000 +0200



From alexlan at fedoraproject.org  Wed Aug 26 09:47:04 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 26 Aug 2009 09:47:04 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.83,1.84
Message-ID: <20090826094704.2364511C0082@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23609

Modified Files:
	plplot.spec 
Log Message:
* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-6
- Build with perl package re-enabled



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- plplot.spec	26 Aug 2009 08:38:16 -0000	1.83
+++ plplot.spec	26 Aug 2009 09:47:03 -0000	1.84
@@ -6,11 +6,11 @@
 %bcond_without octave
 # Set to bcond_with or use --without pdl to disable pdl tests - needed to 
 # bootstrap or for soname bumps in a plplot dependency
-%bcond_with pdl
+%bcond_without pdl
 
 Name:           plplot
 Version:        5.9.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -599,6 +599,9 @@ fi
 
 
 %changelog
+* 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



From tmraz at fedoraproject.org  Wed Aug 26 09:49:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 09:49:48 +0000 (UTC)
Subject: rpms/ruby/devel ruby.spec,1.137,1.138
Message-ID: <20090826094948.43BDB11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25310

Modified Files:
	ruby.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.369-3
- Rebuild against new openssl



Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- ruby.spec	23 Jul 2009 14:57:46 -0000	1.137
+++ ruby.spec	26 Aug 2009 09:49:47 -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)
@@ -544,6 +544,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.369-3
+- Rebuild against new openssl
+
 * Thu Jul 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
 - Make sure that readline.so is linked against readline 5 because
   Ruby is under GPLv2 



From jwrdegoede at fedoraproject.org  Wed Aug 26 09:53:04 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 26 Aug 2009 09:53:04 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.4, 1.5 grubby.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090826095304.A285411C0082@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26128

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Wed Aug 26 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.3-1
- Silence error when no /etc/sysconfig/keyboard (#517187)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Aug 2009 16:01:42 -0000	1.4
+++ .cvsignore	26 Aug 2009 09:53:04 -0000	1.5
@@ -1 +1 @@
-grubby-7.0.2.tar.bz2
+grubby-7.0.3.tar.gz


Index: grubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- grubby.spec	7 Aug 2009 16:01:42 -0000	1.4
+++ grubby.spec	26 Aug 2009 09:53:04 -0000	1.5
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.2
+Version: 7.0.3
 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
+* Wed Aug 26 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.3-1
+- Silence error when no /etc/sysconfig/keyboard (#517187)
+
 * Fri Aug  7 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.2-1
 - Add --add-dracut-args new-kernel-pkg cmdline option
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Aug 2009 16:01:42 -0000	1.4
+++ sources	26 Aug 2009 09:53:04 -0000	1.5
@@ -1 +1 @@
-76013d5d8393c280dced91fe6e1f6632  grubby-7.0.2.tar.bz2
+eea903d7d143a33d6801fbf4d393f4f9  grubby-7.0.3.tar.gz



From tmraz at fedoraproject.org  Wed Aug 26 09:55:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 09:55:34 +0000 (UTC)
Subject: rpms/sim/devel sim.spec,1.17,1.18
Message-ID: <20090826095534.35E1811C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26678

Modified Files:
	sim.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.21.20090821svn2902rev
- rebuilt with new openssl



Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sim.spec	21 Aug 2009 15:52:26 -0000	1.17
+++ sim.spec	26 Aug 2009 09:55:34 -0000	1.18
@@ -140,7 +140,7 @@ fi
 %{_datadir}/services/
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.21.20090821svn2902rev
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.21.20090821svn2902rev
 - rebuilt with new openssl
 
 * Fri Aug 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.20.20090821svn2902rev



From lucilanga at fedoraproject.org  Wed Aug 26 10:01:16 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 26 Aug 2009 10:01:16 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 sources,1.8,1.9
Message-ID: <20090826100116.B4C7511C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27820

Modified Files:
	sources 
Log Message:
upload correct source


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Aug 2009 07:08:00 -0000	1.8
+++ sources	26 Aug 2009 10:01:16 -0000	1.9
@@ -1 +1 @@
-7b3241f4fba1675bc894951d211d5fc6  evolution-rss-0.1.4.tar.gz
+e6df6ae91fe41882ccb54231b28d7efd  evolution-rss-0.1.4.tar.gz



From lucilanga at fedoraproject.org  Wed Aug 26 10:03:21 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 26 Aug 2009 10:03:21 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 evolution-rss.spec,1.30,1.31
Message-ID: <20090826100321.EA31211C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28226

Modified Files:
	evolution-rss.spec 
Log Message:
* Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
- fix source0


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- evolution-rss.spec	25 Aug 2009 07:08:00 -0000	1.30
+++ evolution-rss.spec	26 Aug 2009 10:03:21 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.4
-Release: 1%{?dist}
+Release: 2%{?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
+* Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
+- fix source0
+
 * Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
 - new upstream release
 



From dwmw2 at fedoraproject.org  Wed Aug 26 10:06:27 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Wed, 26 Aug 2009 10:06:27 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.320, 1.321 kernel.spec, 1.1738, 
	1.1739
Message-ID: <20090826100627.6720A11C0082@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28886

Modified Files:
	config-generic kernel.spec 
Log Message:
modular wimax


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- config-generic	25 Aug 2009 03:15:08 -0000	1.320
+++ config-generic	26 Aug 2009 10:06:27 -0000	1.321
@@ -1388,7 +1388,7 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_DEFAULT_PS=y
 
-CONFIG_WIMAX=y
+CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_SDIO=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1738
retrieving revision 1.1739
diff -u -p -r1.1738 -r1.1739
--- kernel.spec	25 Aug 2009 23:13:20 -0000	1.1738
+++ kernel.spec	26 Aug 2009 10:06:27 -0000	1.1739
@@ -2015,6 +2015,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Make WiMAX modular (#512070)
+
 * Tue Aug 25 2009 Kyle McMartin <kyle at redhat.com>
 - allow-disabling-ima.diff: debugging patch... adds ima=0 kernel
   param to disable initialization of IMA.



From tmraz at fedoraproject.org  Wed Aug 26 10:11:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:11:58 +0000 (UTC)
Subject: rpms/ruby/devel ruby-openssl-1.0.patch, NONE, 1.1 ruby.spec, 1.138, 
	1.139
Message-ID: <20090826101158.A6A9911C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29886

Modified Files:
	ruby.spec 
Added Files:
	ruby-openssl-1.0.patch 
Log Message:
- fix openssl-1.0 API incompatibility


ruby-openssl-1.0.patch:
 ossl.c     |    4 ++++
 ossl_ssl.c |   14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

--- NEW FILE ruby-openssl-1.0.patch ---
diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c
--- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c.ossl10	2007-02-13 00:01:19.000000000 +0100
+++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c	2009-08-26 12:00:27.000000000 +0200
@@ -90,6 +90,10 @@ ossl_x509_ary2sk(VALUE ary)
     return sk;
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
+
 #define OSSL_IMPL_SK2ARY(name, type)	        \
 VALUE						\
 ossl_##name##_sk2ary(STACK *sk)			\
diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c
--- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10	2007-03-12 05:12:32.000000000 +0100
+++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c	2009-08-26 12:08:48.000000000 +0200
@@ -89,12 +89,18 @@ static char *ossl_sslctx_attrs[] = {
 static char *ossl_ssl_attr_readers[] = { "io", "context", };
 static char *ossl_ssl_attrs[] = { "sync_close", };
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define OSSL_MORE_CONST const
+#define STACK _STACK
+#else
+#define OSSL_MORE_CONST
+#endif
 /*
  * SSLContext class
  */
 struct {
     const char *name;
-    SSL_METHOD *(*func)(void);
+    OSSL_MORE_CONST SSL_METHOD *(*func)(void);
 } ossl_ssl_method_tab[] = {
 #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
     OSSL_SSL_METHOD_ENTRY(TLSv1),
@@ -144,7 +150,7 @@ static VALUE
 ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE ssl_method;
-    SSL_METHOD *method = NULL;
+    OSSL_MORE_CONST SSL_METHOD *method = NULL;
     SSL_CTX *ctx;
     int i;
     char *s;
@@ -407,7 +413,7 @@ ossl_sslctx_setup(VALUE self)
 }
 
 static VALUE
-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
+ossl_ssl_cipher_to_ary(OSSL_MORE_CONST SSL_CIPHER *cipher)
 {
     VALUE ary;
     int bits, alg_bits;
@@ -805,7 +811,7 @@ static VALUE
 ossl_ssl_get_cipher(VALUE self)
 {
     SSL *ssl;
-    SSL_CIPHER *cipher;
+    OSSL_MORE_CONST SSL_CIPHER *cipher;
 
     Data_Get_Struct(self, SSL, ssl);
     if (!ssl) {


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- ruby.spec	26 Aug 2009 09:49:47 -0000	1.138
+++ ruby.spec	26 Aug 2009 10:11:58 -0000	1.139
@@ -49,6 +49,7 @@ Patch26:        ruby-1.8.6-rexml-CVE-200
 Patch27:        ruby-1.8.6-p287-CVE-2008-5189.patch
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
+Patch30:	ruby-openssl-1.0.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -178,6 +179,7 @@ pushd %{name}-%{arcver}
 %patch27 -p0
 %patch28 -p1
 %patch29 -p1
+%patch30 -p2
 popd
 
 %build



From tmraz at fedoraproject.org  Wed Aug 26 10:15:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:15:18 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-ossl10.patch,1.2,1.3
Message-ID: <20090826101518.C43F511C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30701

Modified Files:
	qt-x11-opensource-src-4.5.2-ossl10.patch 
Log Message:
- one more fix needed


qt-x11-opensource-src-4.5.2-ossl10.patch:
 qsslcertificate.cpp            |    4 ++--
 qsslsocket_openssl.cpp         |    2 +-
 qsslsocket_openssl_symbols.cpp |   24 ++++++++++++------------
 qsslsocket_openssl_symbols_p.h |   32 ++++++++++++++++++++------------
 4 files changed, 35 insertions(+), 27 deletions(-)

Index: qt-x11-opensource-src-4.5.2-ossl10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.2-ossl10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 09:44:11 -0000	1.2
+++ qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 10:15:18 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp
 --- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.openssl	2009-06-20 06:57:57.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-26 11:43:31.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-26 12:14:32.000000000 +0200
 @@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
      if (!d->x509)
          return result;
@@ -10,6 +10,15 @@ diff -up qt-x11-opensource-src-4.5.2/src
  
      if (altNames) {
          for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) {
+@@ -383,7 +383,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
+             else if (genName->type == GEN_EMAIL)
+                 result.insert(QSsl::EmailEntry, altName);
+         }
+-        q_sk_free(altNames);
++        q_sk_free((STACK *)altNames);
+     }
+ 
+     return result;
 diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp
 --- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp.openssl	2009-06-20 06:57:57.000000000 +0200
 +++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp	2009-08-26 10:40:09.000000000 +0200



From corsepiu at fedoraproject.org  Wed Aug 26 10:16:44 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed, 26 Aug 2009 10:16:44 +0000 (UTC)
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.47,1.48
Message-ID: <20090826101644.142E111C0082@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30973

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Wed Aug 26 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-3
- Change Source0 URL (Upstream moved it once again).



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- OpenSceneGraph.spec	18 Aug 2009 05:24:52 -0000	1.47
+++ OpenSceneGraph.spec	26 Aug 2009 10:16:43 -0000	1.48
@@ -9,14 +9,14 @@
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 # The OSGPL is just the wxWidgets license.
 License:        wxWidgets
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{version}/source/OpenSceneGraph-%{version}.zip
 
 Patch0:         OpenSceneGraph-%{version}.diff
 
@@ -360,6 +360,9 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Wed Aug 26 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-3
+- Change Source0 URL (Upstream moved it once again).
+
 * Tue Aug 18 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-2
 - Spec file cleanup.
 



From tmraz at fedoraproject.org  Wed Aug 26 10:19:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:19:59 +0000 (UTC)
Subject: rpms/sphinx/devel sphinx.spec,1.1,1.2
Message-ID: <20090826101959.A2CF411C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32224

Modified Files:
	sphinx.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8.1-4
- Rebuild with new openssl



Index: sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sphinx/devel/sphinx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sphinx.spec	14 Aug 2009 16:35:26 -0000	1.1
+++ sphinx.spec	26 Aug 2009 10:19:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           sphinx
 Version:        0.9.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free open-source SQL full-text search engine
 
 Group:          Applications/Text
@@ -188,6 +188,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8.1-4
+- Rebuild with new openssl
+
 * Wed Aug 12 2009 Allisson Azevedo <allisson at gmail.com> 0.9.8.1-3
 - Fixed macros consistency.
 - Modified make install to keep timestamps.



From dnovotny at fedoraproject.org  Wed Aug 26 10:22:46 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 26 Aug 2009 10:22:46 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.134,1.135
Message-ID: <20090826102246.1B54511C0082@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv331

Modified Files:
	emacs.spec 
Log Message:
fix #519151



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- emacs.spec	25 Aug 2009 11:24:45 -0000	1.134
+++ emacs.spec	26 Aug 2009 10:22:45 -0000	1.135
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -41,8 +41,8 @@ Requires: emacs-common = %{epoch}:%{vers
 # bz#443549, bz#508033
 Requires: hunspell, aspell
 # bz#507852
-BuildRequires: librsvg2-devel
-BuildRequires: alsa-lib-devel, libotf
+BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
+BuildRequires: alsa-lib-devel
 Requires: librsvg2
 # Desktop integration
 BuildRequires: desktop-file-utils
@@ -370,6 +370,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Aug 26 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
+- correct BuildRequires for libotf (#519151)
+
 * Tue Aug 25 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-4
 - alsa-lib-devel added to BuildRequires (#518659)
 



From tmraz at fedoraproject.org  Wed Aug 26 10:22:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:22:58 +0000 (UTC)
Subject: rpms/ssmtp/devel noautobuild,1.1,NONE
Message-ID: <20090826102258.B028111C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ssmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv411

Removed Files:
	noautobuild 
Log Message:
- spurious noautobuild left



--- noautobuild DELETED ---



From tmraz at fedoraproject.org  Wed Aug 26 10:24:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:24:38 +0000 (UTC)
Subject: rpms/ssmtp/devel ssmtp.spec,1.23,1.24
Message-ID: <20090826102438.AF89611C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ssmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv833

Modified Files:
	ssmtp.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 2.61-11.10
- rebuild for new openssl



Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ssmtp.spec	17 Feb 2009 23:44:40 -0000	1.23
+++ ssmtp.spec	26 Aug 2009 10:24:38 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.9%{?dist}
+Release:	11.10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -130,6 +130,9 @@ exit 0
 
 
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 2.61-11.10
+- rebuild for new openssl
+
 * Wed Feb 17 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.9
 - add Provides for mailq; this should make ssmtp dissapear from the "bad" list
   from https://fedoraproject.org/wiki/PackagingDrafts/UsingAlternatives



From tmraz at fedoraproject.org  Wed Aug 26 10:31:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:31:09 +0000 (UTC)
Subject: rpms/ruby/devel ruby-openssl-1.0.patch,1.1,1.2
Message-ID: <20090826103109.32A4C11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080

Modified Files:
	ruby-openssl-1.0.patch 
Log Message:
- correct fix for sk2ary


ruby-openssl-1.0.patch:
 ossl.c     |    6 +++---
 ossl_ssl.c |   14 ++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

Index: ruby-openssl-1.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby-openssl-1.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-openssl-1.0.patch	26 Aug 2009 10:11:58 -0000	1.1
+++ ruby-openssl-1.0.patch	26 Aug 2009 10:31:08 -0000	1.2
@@ -1,17 +1,33 @@
 diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c
 --- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c.ossl10	2007-02-13 00:01:19.000000000 +0100
-+++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c	2009-08-26 12:00:27.000000000 +0200
-@@ -90,6 +90,10 @@ ossl_x509_ary2sk(VALUE ary)
-     return sk;
- }
++++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c	2009-08-26 12:29:41.000000000 +0200
+@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
  
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
-+
  #define OSSL_IMPL_SK2ARY(name, type)	        \
  VALUE						\
- ossl_##name##_sk2ary(STACK *sk)			\
+-ossl_##name##_sk2ary(STACK *sk)			\
++ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
+ {						\
+     type *t;					\
+     int i, num;					\
+@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
+ 	OSSL_Debug("empty sk!");		\
+ 	return Qnil;				\
+     }						\
+-    num = sk_num(sk);				\
++    num = sk_##type##_num(sk);			\
+     if (num < 0) {				\
+ 	OSSL_Debug("items in sk < -1???");	\
+ 	return rb_ary_new();			\
+@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
+     ary = rb_ary_new2(num);			\
+ 						\
+     for (i=0; i<num; i++) {			\
+-	t = (type *)sk_value(sk, i);		\
++	t = sk_##type##_value(sk, i);		\
+ 	rb_ary_push(ary, ossl_##name##_new(t));	\
+     }						\
+     return ary;					\
 diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c
 --- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10	2007-03-12 05:12:32.000000000 +0100
 +++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c	2009-08-26 12:08:48.000000000 +0200



From tmraz at fedoraproject.org  Wed Aug 26 10:41:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 10:41:12 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-ossl10.patch,1.3,1.4
Message-ID: <20090826104112.3868811C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3964

Modified Files:
	qt-x11-opensource-src-4.5.2-ossl10.patch 
Log Message:
- typo in macro name


qt-x11-opensource-src-4.5.2-ossl10.patch:
 qsslcertificate.cpp            |    4 ++--
 qsslsocket_openssl.cpp         |    2 +-
 qsslsocket_openssl_symbols.cpp |   24 ++++++++++++------------
 qsslsocket_openssl_symbols_p.h |   32 ++++++++++++++++++++------------
 4 files changed, 35 insertions(+), 27 deletions(-)

Index: qt-x11-opensource-src-4.5.2-ossl10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.2-ossl10.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 10:15:18 -0000	1.3
+++ qt-x11-opensource-src-4.5.2-ossl10.patch	26 Aug 2009 10:41:11 -0000	1.4
@@ -33,13 +33,13 @@ diff -up qt-x11-opensource-src-4.5.2/src
  
 diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp.openssl qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp
 --- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp.openssl	2009-08-26 10:36:25.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp	2009-08-26 10:37:57.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp	2009-08-26 12:40:30.000000000 +0200
 @@ -144,10 +144,10 @@ DEFINEFUNC(int, RAND_status, void, DUMMY
  DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
  DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
  DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
 -DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
-+DEFINEFUNC2(OSSL_SKVAL_RTYPE *, sk_value, STACK *a, a, int b, b, return 0, return)
++DEFINEFUNC2(OSSL_SKVALUE_RTYPE *, sk_value, STACK *a, a, int b, b, return 0, return)
  DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
  DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
 -DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)



From msivak at fedoraproject.org  Wed Aug 26 10:41:54 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Wed, 26 Aug 2009 10:41:54 +0000 (UTC)
Subject: rpms/python-cryptsetup/devel .cvsignore, 1.10,
	1.11 python-cryptsetup.spec, 1.14, 1.15 sources, 1.10, 1.11
Message-ID: <20090826104154.7BCBC11C0082@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/python-cryptsetup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4102

Modified Files:
	.cvsignore python-cryptsetup.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	13 Mar 2009 13:51:27 -0000	1.10
+++ .cvsignore	26 Aug 2009 10:41:54 -0000	1.11
@@ -1 +1 @@
-python-cryptsetup-0.0.9.tar.bz2
+python-cryptsetup-0.0.10.tar.bz2


Index: python-cryptsetup.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/python-cryptsetup.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- python-cryptsetup.spec	13 Aug 2009 06:30:09 -0000	1.14
+++ python-cryptsetup.spec	26 Aug 2009 10:41:54 -0000	1.15
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-cryptsetup
-Version:        0.0.9
-Release:        3%{?dist}
+Version:        0.0.10
+Release:        1%{?dist}
 Summary:        Python bindings for cryptsetup
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc selftest.py
 
 %changelog
+* Wed Aug 26 2009 Martin Sivak <msivak at redhat dot com> - 0.0.10-1
+- fix the crash in dealloc routine
+
 * Thu Aug 13 2009 Martin Sivak <msivak at redhat dot com> - 0.0.9-3
 - spec file change, point to proper project url
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	13 Mar 2009 13:51:27 -0000	1.10
+++ sources	26 Aug 2009 10:41:54 -0000	1.11
@@ -1 +1 @@
-81fe8117821df419d4f07264deb13cf5  python-cryptsetup-0.0.9.tar.bz2
+118d209f1397da703abe46cd51a9069c  python-cryptsetup-0.0.10.tar.bz2



From jfch2222 at fedoraproject.org  Wed Aug 26 10:44:57 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 26 Aug 2009 10:44:57 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-sesftp.patch,1.4,1.5
Message-ID: <20090826104457.920A711C0082@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4637

Modified Files:
	openssh-5.2p1-sesftp.patch 
Log Message:
Minor repair of sesftp patch


openssh-5.2p1-sesftp.patch:
 session.c |   26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

Index: openssh-5.2p1-sesftp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-sesftp.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openssh-5.2p1-sesftp.patch	24 Jul 2009 06:15:35 -0000	1.4
+++ openssh-5.2p1-sesftp.patch	26 Aug 2009 10:44:57 -0000	1.5
@@ -39,7 +39,7 @@ diff -up openssh-5.2p1/session.c.sesftp 
 +				strcpy (c2 + l, "sftpd_t");
 +				if ((cx = index (cx + 1, ':')))
 +					strcat (c2, cx);
-+				if (setcon ("system_u:system_r:sftpd_t:s0-s0:c0.c1023") < 0) 
++				if (setcon (c2) < 0) 
 +					logit("do_child: setcon failed witch %s", strerror (errno));
 +			
 +			}



From corsepiu at fedoraproject.org  Wed Aug 26 10:45:23 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Wed, 26 Aug 2009 10:45:23 +0000 (UTC)
Subject: rpms/OpenSceneGraph/F-11 OpenSceneGraph.spec,1.45,1.46
Message-ID: <20090826104523.2054311C0082@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4812

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Wed Aug 26 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-3
- Change Source0 URL (Upstream moved it once again).



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/F-11/OpenSceneGraph.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- OpenSceneGraph.spec	18 Aug 2009 10:10:46 -0000	1.45
+++ OpenSceneGraph.spec	26 Aug 2009 10:45:22 -0000	1.46
@@ -9,14 +9,14 @@
 
 Name:           OpenSceneGraph
 Version:        %{apivers}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 # The OSGPL is just the wxWidgets license.
 License:        wxWidgets
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{version}/source/OpenSceneGraph-%{version}.zip
 
 Patch0:         OpenSceneGraph-%{version}.diff
 
@@ -360,6 +360,9 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Wed Aug 26 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-3
+- Change Source0 URL (Upstream moved it once again).
+
 * Tue Aug 18 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 2.8.2-2
 - Spec file cleanup.
 



From dnovotny at fedoraproject.org  Wed Aug 26 10:53:58 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 26 Aug 2009 10:53:58 +0000 (UTC)
Subject: rpms/emacs/F-11 emacs.spec,1.128,1.129
Message-ID: <20090826105358.DDD4C11C0082@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7150

Modified Files:
	emacs.spec 
Log Message:
fix #519151



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- emacs.spec	24 Aug 2009 12:56:11 -0000	1.128
+++ emacs.spec	26 Aug 2009 10:53:58 -0000	1.129
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -32,8 +32,8 @@ BuildRequires: atk-devel, cairo-devel, d
 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: librsvg2-devel
-BuildRequires: alsa-lib-devel, libotf
+BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
+BuildRequires: alsa-lib-devel
 Requires: librsvg2
 %ifarch %{ix86}
 BuildRequires: setarch
@@ -373,6 +373,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Aug 26 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-3
+- correct BuildRequires for libotf (#519151)
+
 * Mon Aug 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-2
 - added alsa to BuildRequires (#518659), also libotf
 



From twaugh at fedoraproject.org  Wed Aug 26 10:55:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 10:55:57 +0000 (UTC)
Subject: rpms/hplip/devel hplip-requirespageregion.patch, NONE,
	1.1 hplip.spec, 1.230, 1.231
Message-ID: <20090826105557.934F211C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7706

Modified Files:
	hplip.spec 
Added Files:
	hplip-requirespageregion.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
- Set RequiresPageRegion in hpcups PPDs (bug #518756).


hplip-requirespageregion.patch:
 hpcups.drv.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE hplip-requirespageregion.patch ---
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.margins hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.margins	2009-08-26 09:58:47.957555770 +0100
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-26 11:39:43.443555856 +0100
@@ -115,6 +115,8 @@ Filter "application/vnd.cups-raster 0 hp
 // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
 Manufacturer "HP"
 
+Attribute "RequiresPageRegion" "All" "True"
+
 ///////// DJ9xx
 {
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- hplip.spec	25 Aug 2009 15:36:33 -0000	1.230
+++ hplip.spec	26 Aug 2009 10:55:57 -0000	1.231
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -21,6 +21,7 @@ Patch5: hplip-clear-previous-state-reaso
 Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
+Patch9: hplip-requirespageregion.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -133,6 +134,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Don't install base/*.py with executable bit set.
 %patch8 -p1 -b .non-scripts
 
+# Set RequiresPageRegion in hpcups PPDs (bug #518756).
+%patch9 -p1 -b .requirespageregion
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -337,6 +341,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
+- Set RequiresPageRegion in hpcups PPDs (bug #518756).
+
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
 - Removed never-used definition of BREAKPOINT in scan/sane/common.h
   in hope of fixing the build.



From twaugh at fedoraproject.org  Wed Aug 26 10:58:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 10:58:49 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-requirespageregion.patch, NONE, 1.1 hplip.spec,
	1.226, 1.227
Message-ID: <20090826105849.A64EF11C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8427

Modified Files:
	hplip.spec 
Added Files:
	hplip-requirespageregion.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
- Set RequiresPageRegion in hpcups PPDs (bug #518756).


hplip-requirespageregion.patch:
 hpcups.drv.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE hplip-requirespageregion.patch ---
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.margins hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.margins	2009-08-26 09:58:47.957555770 +0100
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-26 11:39:43.443555856 +0100
@@ -115,6 +115,8 @@ Filter "application/vnd.cups-raster 0 hp
 // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
 Manufacturer "HP"
 
+Attribute "RequiresPageRegion" "All" "True"
+
 ///////// DJ9xx
 {
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- hplip.spec	25 Aug 2009 15:55:41 -0000	1.226
+++ hplip.spec	26 Aug 2009 10:58:49 -0000	1.227
@@ -22,6 +22,7 @@ Patch5: hplip-clear-previous-state-reaso
 Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
+Patch9: hplip-requirespageregion.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Don't install base/*.py with executable bit set.
 %patch8 -p1 -b .non-scripts
 
+# Set RequiresPageRegion in hpcups PPDs (bug #518756).
+%patch9 -p1 -b .requirespageregion
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -345,7 +349,8 @@ fi
 exit 0
 
 %changelog
-* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
+- Set RequiresPageRegion in hpcups PPDs (bug #518756).
 - Removed never-used definition of BREAKPOINT in scan/sane/common.h
   in hope of fixing the build.
 



From jwrdegoede at fedoraproject.org  Wed Aug 26 11:00:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 26 Aug 2009 11:00:32 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090826110032.A980811C025F@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/pkgs/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8940

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Aug 26 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.3-1
- Silence error when no /etc/sysconfig/keyboard (#517187)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Aug 2009 09:53:04 -0000	1.5
+++ .cvsignore	26 Aug 2009 11:00:30 -0000	1.6
@@ -1 +1 @@
-grubby-7.0.3.tar.gz
+grubby-7.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Aug 2009 09:53:04 -0000	1.5
+++ sources	26 Aug 2009 11:00:31 -0000	1.6
@@ -1 +1 @@
-eea903d7d143a33d6801fbf4d393f4f9  grubby-7.0.3.tar.gz
+eea903d7d143a33d6801fbf4d393f4f9  grubby-7.0.3.tar.bz2



From jfch2222 at fedoraproject.org  Wed Aug 26 11:01:42 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Wed, 26 Aug 2009 11:01:42 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.156,1.157
Message-ID: <20090826110142.CFD5811C0082@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9246

Modified Files:
	openssh.spec 
Log Message:
minor change in sesftp patch



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- openssh.spec	21 Aug 2009 15:08:09 -0000	1.156
+++ openssh.spec	26 Aug 2009 11:01:42 -0000	1.157
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 18%{?dist}%{?rescue_rel}
+Release: 19%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -474,6 +474,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 26 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-19
+- minor change in sesftp patch
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.2p1-18
 - rebuilt with new openssl
 



From caolanm at fedoraproject.org  Wed Aug 26 11:11:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 26 Aug 2009 11:11:18 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.sb113.patch, NONE,
	1.1 openoffice.org.spec, 1.1993,
	1.1994 openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch,
	1.3, NONE
Message-ID: <20090826111118.ADF5B11C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11068

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.sb113.patch 
Removed Files:
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
Log Message:
rename to finally accepted upstream workspace

workspace.sb113.patch:
 signal.c |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

--- NEW FILE workspace.sb113.patch ---
Index: osl/unx/signal.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/signal.c,v
retrieving revision 1.32.14.1
diff -u -r1.32.14.1 signal.c
--- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
+++ openoffice.org/sal/osl/unx/signal.c	18 Apr 2007 08:37:08 -0000
@@ -41,6 +41,7 @@
 
 #ifdef LINUX
 #include <execinfo.h>
+#include <link.h>
 #define INCLUDE_BACKTRACE
 #define STACKTYPE "Linux"
 #endif
@@ -393,6 +394,87 @@
 
 #define REPORTENV_PARAM		"-crashreportenv:"
 
+#ifdef LINUX
+
+typedef struct
+{
+    const char *name;
+    ElfW(Off) offset;
+} dynamic_entry;
+
+static int
+callback(struct dl_phdr_info *info, size_t size, void *data)
+{
+    const ElfW(Phdr) *pDynamic = NULL;
+
+    if (size == sizeof(struct dl_phdr_info))
+    {
+        int i;
+        for (i = 0; i < info->dlpi_phnum; ++i)
+        {
+            if (info->dlpi_phdr[i].p_type == PT_DYNAMIC)
+            {
+                pDynamic = &(info->dlpi_phdr[i]);
+                break;
+            }
+        }
+    }
+
+    if (pDynamic)
+    {
+        char buffer[100];
+        int len;
+        char exe[PATH_MAX];
+        const char *dsoname = info->dlpi_name;
+
+        dynamic_entry* entry = (dynamic_entry*)data;
+
+        if (strcmp(dsoname, "") == 0)
+        { 
+            snprintf(buffer, sizeof(buffer), "/proc/%d/exe", getpid());
+            if ((len = readlink(buffer, exe, PATH_MAX)) != -1)
+            {
+                exe[len] = '\0';
+                dsoname = exe;
+            }
+        }
+
+        if (strcmp(dsoname, entry->name) == 0)
+        {
+            entry->offset = pDynamic->p_offset;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/* Get the location of the .dynamic section offset for the given elf file.
+ * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo 
+ *
+ * We want to know this value so that if the binaries have been modifed
+ * by prelink then we can still process the call stack on server side 
+ * by comparing this value to that of an "un-prelinked but known to be
+ * otherwise equivalent" version of those binaries and adjust the call 
+ * stack addresses by the differences between .dynamic addresses so as 
+ * to be able to map the prelinked addresses back to the unprelinked 
+ * addresses
+ *
+ * cmc at openoffice.org
+ */
+static ElfW(Off)
+dynamic_section_offset(const char *name)
+{
+    dynamic_entry entry;
+
+    entry.name = name;
+    entry.offset = 0;
+
+    dl_iterate_phdr(callback, &entry);
+
+    return entry.offset;
+}
+#endif
+
 static int ReportCrash( int Signal )
 {
 #ifdef SAL_ENABLE_CRASH_REPORT
@@ -573,6 +655,11 @@
 
 							if ( dl_info.dli_fbase && dl_info.dli_fname )
 							{
+#ifdef LINUX
+								ElfW(Off) dynamic_offset = dynamic_section_offset(dl_info.dli_fname);
+								fprintf( stackout, " 0x%" SAL_PRI_SIZET "x:", dynamic_offset);
+#endif
+
 								fprintf( stackout, " %s + 0x%" SAL_PRI_PTRDIFFT "x",
 									dl_info.dli_fname,
 									(char*)stackframes[iFrame] - (char*)dl_info.dli_fbase
@@ -584,6 +671,10 @@
 
 								if ( dli_fdir )
 									fprintf( xmlout, " path=\"%s\"", dli_fdir );
+
+#ifdef LINUX
+								fprintf( xmlout, " dynamicoffset=\"0x%" SAL_PRI_SIZET "x\"", dynamic_offset );
+#endif
 							}
 							else
 								fprintf( stackout, " ????????" );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -p -r1.1993 -r1.1994
--- openoffice.org.spec	25 Aug 2009 11:41:23 -0000	1.1993
+++ openoffice.org.spec	26 Aug 2009 11:11:18 -0000	1.1994
@@ -89,7 +89,7 @@ Patch11: openoffice.org-2.0.3.rh127576.g
 Patch12: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
 Patch13: ooo-build.ooo68717.gstreamer.video.patch
 Patch14: workspace.kso32fixes.patch
-Patch15: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.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
@@ -1630,7 +1630,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch12 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
 %patch13 -p0 -b .ooo68717.gstreamer.video.patch
 %patch14 -p1 -b .workspace.kso32fixes.patch
-%patch15 -p1 -b .ooo76393.sal.dynamicsection.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


--- openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch DELETED ---



From twaugh at fedoraproject.org  Wed Aug 26 11:34:34 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 11:34:34 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-get_cursor.patch, NONE,
	1.1 system-config-printer.spec, 1.283, 1.284
Message-ID: <20090826113434.A984B11C0082@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-serv15526

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-get_cursor.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-2
- Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).


system-config-printer-get_cursor.patch:
 system-config-printer.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-get_cursor.patch ---
diff -up system-config-printer-1.1.12/system-config-printer.py.get_cursor system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.get_cursor	2009-08-25 17:01:28.000000000 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-26 12:32:02.757680412 +0100
@@ -5655,7 +5655,12 @@ class NewPrinterGUI(GtkGUI):
             self.expNPDeviceURIs.hide ()
 
     def on_tvNPDeviceURIs_cursor_changed(self, widget):
-        model, iter = widget.get_selection().get_selected()
+        path, column = widget.get_cursor ()
+        if path == None:
+            return
+
+        model = widget.get_model ()
+        iter = model.get_iter (path)
         device = model.get_value(iter, 1)
         self.device = device
         self.lblNPDeviceDescription.set_text ('')


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- system-config-printer.spec	25 Aug 2009 16:29:16 -0000	1.283
+++ system-config-printer.spec	26 Aug 2009 11:34:34 -0000	1.284
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-get_cursor.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -74,6 +75,7 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .get_cursor
 
 %build
 %configure --with-udev-rules
@@ -185,6 +187,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-2
+- Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).
+
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
 - 1.1.12:
   - Troubleshooting fix.



From nucleo at fedoraproject.org  Wed Aug 26 11:50:08 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Wed, 26 Aug 2009 11:50:08 +0000 (UTC)
Subject: rpms/kvirc/devel .cvsignore, 1.2, 1.3 kvirc.spec, 1.4, 1.5 sources, 
	1.2, 1.3 kvirc-flags.patch, 1.1, NONE kvirc-openssl.patch, 1.1, NONE
Message-ID: <20090826115008.8EA1211C043A@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18409

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-flags.patch kvirc-openssl.patch 
Log Message:
New svn snapshot 3426


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 23:43:27 -0000	1.2
+++ .cvsignore	26 Aug 2009 11:50:08 -0000	1.3
@@ -1 +1 @@
-kvirc-20090409svn3173.tar.bz2
+kvirc-20090826svn3426.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kvirc.spec	25 Aug 2009 14:38:52 -0000	1.4
+++ kvirc.spec	26 Aug 2009 11:50:08 -0000	1.5
@@ -1,21 +1,20 @@
-%define           pre 20090409svn3173
+%define           rev 3426
+%define           pre 20090826svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.8.%{pre}%{?dist}
+Release:          0.9.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3173 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
+#  svn export -r 3426 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090826svn3426.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
-Patch0:           kvirc-flags.patch
-Patch1:           kvirc-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
+BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
 Requires(post):   /sbin/ldconfig
@@ -29,11 +28,19 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
 
 %build
-%{cmake}
+%{cmake}  \
+%ifarch %{ix86}
+-DWITH_ix86_ASM=YES \
+%endif
+-DWANT_NO_EMBEDDED_CODE=OFF \
+-DWITHOUT_ESD=OFF \
+-DWITHOUT_OSS=OFF \
+-DWANT_COEXISTENCE=OFF \
+-DWITH_PYTHON=YES \
+-DMANUAL_REVISION=%{rev}
+
 make %{?_smp_mflags}
 
 %install
@@ -42,7 +49,7 @@ make install DESTDIR=%{buildroot}
 
 desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications/ \
-    %{buildroot}%{_datadir}/applications/%{name}4.desktop
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 ln -s ../../%{name}/4.0/license/COPYING COPYING
 
@@ -68,10 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-,root,root,-)
 %doc doc/FAQ doc/README COPYING
-%{_bindir}/kvirc4
-%{_libdir}/libkvilib4.so.4
-%{_libdir}/libkvilib4.so.4.0.0
-%{_datadir}/applications/kvirc4.desktop
+%{_bindir}/%{name}
+%{_libdir}/libkvilib.so.4
+%{_libdir}/libkvilib.so.4.0.0
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/%{name}/
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/4.0
@@ -85,16 +92,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/%{name}/4.0/pics/
 %{_datadir}/%{name}/4.0/themes/
 %{_datadir}/%{name}/4.0/license/
-%{_datadir}/man/man1/%{name}.1.gz
-%{_datadir}/mimelnk/applications/x-kva.desktop
-%{_datadir}/mimelnk/applications/x-kvt.desktop
-%{_datadir}/mimelnk/text/x-kvc.desktop
-%{_datadir}/mimelnk/text/x-kvs.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/*/apps/kvirc.*
-%{_datadir}/icons/hicolor/*/mimetypes/kva.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvc.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvs.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvt.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kva.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kvt.*
+%{_datadir}/icons/hicolor/*/mimetypes/text-x-kvc.*
+%{_datadir}/icons/hicolor/*/mimetypes/text-x-kvs.*
+%{_mandir}/man1/%{name}.1.gz
 
 # Translation files
 %lang(bg) %{_datadir}/%{name}/4.0/locale/*_bg.mo
@@ -114,13 +118,23 @@ gtk-update-icon-cache %{_datadir}/icons/
 %lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
 %lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
 %lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo
+%lang(de) %{_mandir}/de.UTF-8/man1/%{name}.1.gz
+%lang(it) %{_mandir}/it.UTF-8/man1/%{name}.1.gz
+%lang(it) %{_mandir}/it/man1/%{name}.1.gz
 
-%exclude %{_libdir}/libkvilib4.so
-%exclude %{_bindir}/kvirc4-config
+%exclude %{_libdir}/libkvilib.so
+%exclude %{_bindir}/kvirc-config
 %exclude %{_datadir}/%{name}/4.0/doc/FAQ
 %exclude %{_datadir}/%{name}/4.0/doc/README
+%exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
+- svn snapshot 3426 that builds with new openssl
+- Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
+- Added -DWITH_ix86_ASM and -DMANUAL_REVISION
+- Added BR: esound-devel
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Apr 2009 23:43:28 -0000	1.2
+++ sources	26 Aug 2009 11:50:08 -0000	1.3
@@ -1 +1 @@
-3211fd5a55289927b697b343f1c7e561  kvirc-20090409svn3173.tar.bz2
+ef83b1fa6b8c9598a4f2aadb4217be2d  kvirc-20090826svn3426.tar.bz2


--- kvirc-flags.patch DELETED ---


--- kvirc-openssl.patch DELETED ---



From lucilanga at fedoraproject.org  Wed Aug 26 12:05:20 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 26 Aug 2009 12:05:20 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss.spec, 1.30, 1.31 sources, 1.8,
	1.9
Message-ID: <20090826120520.EAEF711C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21743

Modified Files:
	evolution-rss.spec sources 
Log Message:
* Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
- fix source


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- evolution-rss.spec	25 Aug 2009 06:52:18 -0000	1.30
+++ evolution-rss.spec	26 Aug 2009 12:05:20 -0000	1.31
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -81,6 +81,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
+- fix source
+
 * Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
 - force main render gecko
 - drop patch0 fixed upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 Aug 2009 06:52:18 -0000	1.8
+++ sources	26 Aug 2009 12:05:20 -0000	1.9
@@ -1 +1 @@
-7b3241f4fba1675bc894951d211d5fc6  evolution-rss-0.1.4.tar.gz
+e6df6ae91fe41882ccb54231b28d7efd  evolution-rss-0.1.4.tar.gz



From lucilanga at fedoraproject.org  Wed Aug 26 12:09:58 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Wed, 26 Aug 2009 12:09:58 +0000 (UTC)
Subject: rpms/evolution-rss/devel evolution-rss.spec, 1.33, 1.34 sources, 1.9,
	1.10 evolution-rss-0.1.2-updateinterval.patch, 1.1, NONE
Message-ID: <20090826120958.BC6C711C0082@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22651

Modified Files:
	evolution-rss.spec sources 
Removed Files:
	evolution-rss-0.1.2-updateinterval.patch 
Log Message:
* Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
- fix source0


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- evolution-rss.spec	25 Aug 2009 06:48:54 -0000	1.33
+++ evolution-rss.spec	26 Aug 2009 12:09:58 -0000	1.34
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -92,6 +92,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
+- fix source0
+
 * Tue Aug 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-1
 - force main render gecko
 - new upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	25 Aug 2009 05:26:49 -0000	1.9
+++ sources	26 Aug 2009 12:09:58 -0000	1.10
@@ -1 +1 @@
-7b3241f4fba1675bc894951d211d5fc6  evolution-rss-0.1.4.tar.gz
+e6df6ae91fe41882ccb54231b28d7efd  evolution-rss-0.1.4.tar.gz


--- evolution-rss-0.1.2-updateinterval.patch DELETED ---



From schwab at fedoraproject.org  Wed Aug 26 12:12:07 2009
From: schwab at fedoraproject.org (schwab)
Date: Wed, 26 Aug 2009 12:12:07 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.282, 1.283 glibc-fedora.patch, 1.316,
	1.317 glibc.spec, 1.409, 1.410 import.log, 1.25, 1.26 sources,
	1.307, 1.308
Message-ID: <20090826121207.CF10911C0082@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23191/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- .cvsignore	24 Aug 2009 09:22:25 -0000	1.282
+++ .cvsignore	26 Aug 2009 12:12:06 -0000	1.283
@@ -1,2 +1,2 @@
-glibc-2.10-288-ga0e25a8-fedora.tar.bz2
-glibc-2.10-288-ga0e25a8.tar.bz2
+glibc-2.10-312-g2df4be8-fedora.tar.bz2
+glibc-2.10-312-g2df4be8.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- glibc-fedora.patch	24 Aug 2009 09:22:26 -0000	1.316
+++ glibc-fedora.patch	26 Aug 2009 12:12:07 -0000	1.317
@@ -1,6 +1,6 @@
---- glibc-2.10-288-ga0e25a8/ChangeLog
+--- glibc-2.10-312-g2df4be8/ChangeLog
 +++ glibc-2.10.90-15/ChangeLog
-@@ -426,6 +426,11 @@
+@@ -497,6 +497,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +12,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -691,6 +696,11 @@
+@@ -762,6 +767,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,7 +24,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9089,6 +9099,13 @@
+@@ -9160,6 +9170,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -38,7 +38,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9384,6 +9401,10 @@
+@@ -9455,6 +9472,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +49,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10641,6 +10662,15 @@
+@@ -10712,6 +10733,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,7 +65,7 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-288-ga0e25a8/ChangeLog.15
+--- glibc-2.10-312-g2df4be8/ChangeLog.15
 +++ glibc-2.10.90-15/ChangeLog.15
 @@ -477,6 +477,14 @@
  
@@ -132,7 +132,7 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-288-ga0e25a8/ChangeLog.16
+--- glibc-2.10-312-g2df4be8/ChangeLog.16
 +++ glibc-2.10.90-15/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
@@ -305,7 +305,7 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-2.10-288-ga0e25a8/Makeconfig
+--- glibc-2.10-312-g2df4be8/Makeconfig
 +++ glibc-2.10.90-15/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
@@ -323,7 +323,7 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-288-ga0e25a8/csu/Makefile
+--- glibc-2.10-312-g2df4be8/csu/Makefile
 +++ glibc-2.10.90-15/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
@@ -335,7 +335,7 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-288-ga0e25a8/csu/elf-init.c
+--- glibc-2.10-312-g2df4be8/csu/elf-init.c
 +++ glibc-2.10.90-15/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -361,7 +361,7 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-288-ga0e25a8/debug/tst-chk1.c
+--- glibc-2.10-312-g2df4be8/debug/tst-chk1.c
 +++ glibc-2.10.90-15/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -391,7 +391,7 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-288-ga0e25a8/elf/ldconfig.c
+--- glibc-2.10-312-g2df4be8/elf/ldconfig.c
 +++ glibc-2.10.90-15/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
@@ -474,7 +474,7 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-288-ga0e25a8/elf/tst-stackguard1.c
+--- glibc-2.10-312-g2df4be8/elf/tst-stackguard1.c
 +++ glibc-2.10.90-15/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -500,15 +500,15 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-288-ga0e25a8/include/bits/stdlib-ldbl.h
+--- glibc-2.10-312-g2df4be8/include/bits/stdlib-ldbl.h
 +++ glibc-2.10.90-15/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-288-ga0e25a8/include/bits/wchar-ldbl.h
+--- glibc-2.10-312-g2df4be8/include/bits/wchar-ldbl.h
 +++ glibc-2.10.90-15/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-288-ga0e25a8/include/features.h
+--- glibc-2.10-312-g2df4be8/include/features.h
 +++ glibc-2.10.90-15/include/features.h
 @@ -299,8 +299,13 @@
  #endif
@@ -526,7 +526,7 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-288-ga0e25a8/intl/locale.alias
+--- glibc-2.10-312-g2df4be8/intl/locale.alias
 +++ glibc-2.10.90-15/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
@@ -537,7 +537,7 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-288-ga0e25a8/libio/stdio.h
+--- glibc-2.10-312-g2df4be8/libio/stdio.h
 +++ glibc-2.10.90-15/libio/stdio.h
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
@@ -552,7 +552,7 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-288-ga0e25a8/locale/iso-4217.def
+--- glibc-2.10-312-g2df4be8/locale/iso-4217.def
 +++ glibc-2.10.90-15/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
@@ -645,7 +645,7 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-288-ga0e25a8/locale/programs/locarchive.c
+--- glibc-2.10-312-g2df4be8/locale/programs/locarchive.c
 +++ glibc-2.10.90-15/locale/programs/locarchive.c
 @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
  /* forward decls for below */
@@ -678,7 +678,7 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-288-ga0e25a8/localedata/Makefile
+--- glibc-2.10-312-g2df4be8/localedata/Makefile
 +++ glibc-2.10.90-15/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
@@ -688,7 +688,7 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-288-ga0e25a8/localedata/SUPPORTED
+--- glibc-2.10-312-g2df4be8/localedata/SUPPORTED
 +++ glibc-2.10.90-15/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
@@ -731,7 +731,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-288-ga0e25a8/localedata/locales/cy_GB
+--- glibc-2.10-312-g2df4be8/localedata/locales/cy_GB
 +++ glibc-2.10.90-15/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>"
@@ -747,7 +747,7 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-288-ga0e25a8/localedata/locales/en_GB
+--- glibc-2.10-312-g2df4be8/localedata/locales/en_GB
 +++ glibc-2.10.90-15/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>"
@@ -760,7 +760,7 @@
  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-288-ga0e25a8/localedata/locales/no_NO
+--- glibc-2.10-312-g2df4be8/localedata/locales/no_NO
 +++ glibc-2.10.90-15/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
@@ -832,7 +832,7 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-288-ga0e25a8/localedata/locales/zh_TW
+--- glibc-2.10-312-g2df4be8/localedata/locales/zh_TW
 +++ glibc-2.10.90-15/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
@@ -861,7 +861,7 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-288-ga0e25a8/malloc/mcheck.c
+--- glibc-2.10-312-g2df4be8/malloc/mcheck.c
 +++ glibc-2.10.90-15/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
@@ -938,7 +938,7 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-288-ga0e25a8/manual/libc.texinfo
+--- glibc-2.10-312-g2df4be8/manual/libc.texinfo
 +++ glibc-2.10.90-15/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
@@ -949,7 +949,7 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-288-ga0e25a8/misc/sys/cdefs.h
+--- glibc-2.10-312-g2df4be8/misc/sys/cdefs.h
 +++ glibc-2.10.90-15/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
@@ -994,7 +994,7 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-288-ga0e25a8/nis/nss
+--- glibc-2.10-312-g2df4be8/nis/nss
 +++ glibc-2.10.90-15/nis/nss
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
@@ -1002,9 +1002,9 @@
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-2.10-288-ga0e25a8/nptl/ChangeLog
+--- glibc-2.10-312-g2df4be8/nptl/ChangeLog
 +++ glibc-2.10.90-15/nptl/ChangeLog
-@@ -3687,6 +3687,15 @@
+@@ -3700,6 +3700,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1020,7 +1020,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4423,6 +4432,11 @@
+@@ -4436,6 +4445,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1032,7 +1032,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6497,6 +6511,11 @@
+@@ -6510,6 +6524,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1044,7 +1044,7 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-288-ga0e25a8/nptl/Makefile
+--- glibc-2.10-312-g2df4be8/nptl/Makefile
 +++ glibc-2.10.90-15/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
@@ -1078,7 +1078,7 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-288-ga0e25a8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 +++ glibc-2.10.90-15/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
@@ -1088,7 +1088,7 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-288-ga0e25a8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 +++ glibc-2.10.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
@@ -1097,7 +1097,7 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-288-ga0e25a8/nptl/tst-stackguard1.c
+--- glibc-2.10-312-g2df4be8/nptl/tst-stackguard1.c
 +++ glibc-2.10.90-15/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
@@ -1123,7 +1123,7 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-288-ga0e25a8/nscd/nscd.conf
+--- glibc-2.10-312-g2df4be8/nscd/nscd.conf
 +++ glibc-2.10.90-15/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
@@ -1134,7 +1134,7 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-288-ga0e25a8/nscd/nscd.init
+--- glibc-2.10-312-g2df4be8/nscd/nscd.init
 +++ glibc-2.10.90-15/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
@@ -1192,7 +1192,7 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-288-ga0e25a8/posix/Makefile
+--- glibc-2.10-312-g2df4be8/posix/Makefile
 +++ glibc-2.10.90-15/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
@@ -1214,7 +1214,7 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-288-ga0e25a8/posix/getconf.speclist.h
+--- glibc-2.10-312-g2df4be8/posix/getconf.speclist.h
 +++ glibc-2.10.90-15/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
@@ -1256,7 +1256,7 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-288-ga0e25a8/streams/Makefile
+--- glibc-2.10-312-g2df4be8/streams/Makefile
 +++ glibc-2.10.90-15/streams/Makefile
 @@ -21,7 +21,7 @@
  #
@@ -1267,7 +1267,7 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-288-ga0e25a8/sysdeps/generic/dl-cache.h
+--- glibc-2.10-312-g2df4be8/sysdeps/generic/dl-cache.h
 +++ glibc-2.10.90-15/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
@@ -1284,7 +1284,7 @@
  #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-288-ga0e25a8/sysdeps/i386/Makefile
+--- glibc-2.10-312-g2df4be8/sysdeps/i386/Makefile
 +++ glibc-2.10.90-15/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
@@ -1310,7 +1310,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-288-ga0e25a8/sysdeps/ia64/Makefile
+--- glibc-2.10-312-g2df4be8/sysdeps/ia64/Makefile
 +++ glibc-2.10.90-15/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
@@ -1323,7 +1323,7 @@
  endif
  endif
  
---- glibc-2.10-288-ga0e25a8/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-312-g2df4be8/sysdeps/ia64/ia64libgcc.S
 +++ glibc-2.10.90-15/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -1676,7 +1676,7 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-288-ga0e25a8/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-312-g2df4be8/sysdeps/ia64/libgcc-compat.c
 +++ glibc-2.10.90-15/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
@@ -1763,7 +1763,7 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-288-ga0e25a8/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-312-g2df4be8/sysdeps/powerpc/powerpc64/Makefile
 +++ glibc-2.10.90-15/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
@@ -1773,7 +1773,7 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/nice.c
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/nice.c
 +++ glibc-2.10.90-15/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
@@ -1789,7 +1789,7 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/check_pf.c
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
@@ -1806,7 +1806,7 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/dl-osinfo.h
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -1855,7 +1855,7 @@
      }
    else
  #endif
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/futimesat.c
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
@@ -1899,7 +1899,7 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/clone.S
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
@@ -1919,7 +1919,7 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/dl-cache.h
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
@@ -1981,7 +1981,7 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
@@ -2015,7 +2015,7 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2023,7 +2023,7 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
@@ -2031,12 +2031,12 @@
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 +++ glibc-2.10.90-15/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-288-ga0e25a8/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/netlinkaccess.h
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
@@ -2063,7 +2063,7 @@
  
  struct netlink_res
  {
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/paths.h
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
@@ -2074,7 +2074,7 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/tcsetattr.c
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
@@ -2121,7 +2121,7 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-288-ga0e25a8/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/x86_64/clone.S
 +++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
@@ -2141,7 +2141,7 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-288-ga0e25a8/timezone/zic.c
+--- glibc-2.10-312-g2df4be8/timezone/zic.c
 +++ glibc-2.10.90-15/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- glibc.spec	24 Aug 2009 09:22:26 -0000	1.409
+++ glibc.spec	26 Aug 2009 12:12:07 -0000	1.410
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-288-ga0e25a8
+%define glibcsrcdir glibc-2.10-312-g2df4be8
 %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: 15
+Release: 16
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1028,6 +1028,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Aug 26 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-16
+- Update from master.
+  - handle AVX saving on x86-64 in interrupted symbol lookups (#519081).
+
 * Mon Aug 24 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-15
 - Update from master.
   - fix fortify failure with longjmp from alternate stack (#512103).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- import.log	24 Aug 2009 09:22:26 -0000	1.25
+++ import.log	26 Aug 2009 12:12:07 -0000	1.26
@@ -23,3 +23,4 @@ glibc-2_10_90-12:HEAD:glibc-2.10.90-12.s
 glibc-2_10_90-13:HEAD:glibc-2.10.90-13.src.rpm:1249897909
 glibc-2_10_90-14:HEAD:glibc-2.10.90-14.src.rpm:1250516718
 glibc-2_10_90-15:HEAD:glibc-2.10.90-15.src.rpm:1251105646
+glibc-2_10_90-16:HEAD:glibc-2.10.90-16.src.rpm:1251288654


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -p -r1.307 -r1.308
--- sources	24 Aug 2009 09:22:26 -0000	1.307
+++ sources	26 Aug 2009 12:12:07 -0000	1.308
@@ -1,2 +1,2 @@
-0d6e5b8a41e599c8f34fa469b9bc6230  glibc-2.10-288-ga0e25a8-fedora.tar.bz2
-61679ed6d703591818e6981884571415  glibc-2.10-288-ga0e25a8.tar.bz2
+9f7f51058bd40cf84a870dd04e4198ec  glibc-2.10-312-g2df4be8-fedora.tar.bz2
+e9d285d54d60e73798293d32abdabcf7  glibc-2.10-312-g2df4be8.tar.bz2



From dwalsh at fedoraproject.org  Wed Aug 26 12:12:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 12:12:39 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.61,
	1.62 selinux-policy.spec, 1.903, 1.904
Message-ID: <20090826121239.99DB111C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23398

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Aug 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-7
- Fixes for cdrecord, mdadm, and others


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   16 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.if                 |    5 
 policy/modules/admin/usermanage.te                 |   30 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cdrecord.te                    |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.if                  |    1 
 policy/modules/apps/pulseaudio.te                  |   17 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   59 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  173 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/storage.fc                   |    1 
 policy/modules/kernel/storage.if                   |    2 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   37 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  392 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/afs.fc                     |    1 
 policy/modules/services/afs.te                     |    1 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   49 
 policy/modules/services/policykit.te               |   60 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   12 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   83 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  183 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 +++-
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 +++++++-
 policy/modules/services/xserver.te                 |  306 +++-
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  268 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   27 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.if                      |   21 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1370 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 338 files changed, 14572 insertions(+), 2988 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- policy-F12.patch	24 Aug 2009 13:09:08 -0000	1.61
+++ policy-F12.patch	26 Aug 2009 12:12:38 -0000	1.62
@@ -1376,9 +1376,24 @@ diff -b -B --ignore-all-space --exclude-
  	kismet_manage_log(tmpreaper_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.6.28/policy/modules/admin/usermanage.if
+--- nsaserefpolicy/policy/modules/admin/usermanage.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/admin/usermanage.if	2009-08-25 14:37:45.000000000 -0400
+@@ -274,6 +274,11 @@
+ 	usermanage_domtrans_useradd($1)
+ 	role $2 types useradd_t;
+ 
++	# Add/remove user home directories
++	userdom_manage_home_role($2, useradd_t)
++
++	seutil_run_semanage(useradd_t, $2)
++
+ 	optional_policy(`
+ 		nscd_run(useradd_t, $2)
+ 	')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.28/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/admin/usermanage.te	2009-08-21 18:56:06.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/admin/usermanage.te	2009-08-25 09:31:26.000000000 -0400
 @@ -209,6 +209,7 @@
  files_manage_etc_files(groupadd_t)
  files_relabel_etc_files(groupadd_t)
@@ -1439,7 +1454,19 @@ diff -b -B --ignore-all-space --exclude-
  
  init_use_fds(useradd_t)
  init_rw_utmp(useradd_t)
-@@ -521,6 +518,12 @@
+@@ -494,10 +491,7 @@
+ 
+ userdom_use_unpriv_users_fds(useradd_t)
+ # Add/remove user home directories
+-userdom_manage_user_home_content_dirs(useradd_t)
+-userdom_manage_user_home_content_files(useradd_t)
+-userdom_home_filetrans_user_home_dir(useradd_t)
+-userdom_user_home_dir_filetrans_user_home_content(useradd_t, notdevfile_class_set)
++userdom_manage_home_role(system_r, useradd_t)
+ 
+ mta_manage_spool(useradd_t)
+ 
+@@ -521,6 +515,12 @@
  ')
  
  optional_policy(`
@@ -1519,6 +1546,32 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	nscd_socket_use(calamaris_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cdrecord.te serefpolicy-3.6.28/policy/modules/apps/cdrecord.te
+--- nsaserefpolicy/policy/modules/apps/cdrecord.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/apps/cdrecord.te	2009-08-25 15:56:57.000000000 -0400
+@@ -28,12 +28,13 @@
+ #
+ 
+ allow cdrecord_t self:capability { ipc_lock sys_nice setuid dac_override sys_rawio };
+-allow cdrecord_t self:process { getsched setsched sigkill };
++allow cdrecord_t self:process { getcap getsched setsched sigkill };
+ allow cdrecord_t self:unix_dgram_socket create_socket_perms;
+ allow cdrecord_t self:unix_stream_socket create_stream_socket_perms;
+ 
+ # allow searching for cdrom-drive
+ dev_list_all_dev_nodes(cdrecord_t) 
++dev_read_sysfs(cdrecord_t)
+ 
+ domain_interactive_fd(cdrecord_t)
+ domain_use_interactive_fds(cdrecord_t)
+@@ -44,6 +45,7 @@
+ term_list_ptys(cdrecord_t)
+ 
+ # allow cdrecord to write the CD
++storage_raw_read_removable_device(cdrecord_t)
+ storage_raw_write_removable_device(cdrecord_t)
+ storage_write_scsi_generic(cdrecord_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.28/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/apps/cpufreqselector.te	2009-08-21 18:56:06.000000000 -0400
@@ -3538,20 +3591,32 @@ diff -b -B --ignore-all-space --exclude-
 +term_use_ptmx(ptchown_t)
 +
 +miscfiles_read_localization(ptchown_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.6.28/policy/modules/apps/pulseaudio.if
+--- nsaserefpolicy/policy/modules/apps/pulseaudio.if	2009-07-23 14:11:04.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.if	2009-08-25 15:59:29.000000000 -0400
+@@ -141,5 +141,6 @@
+ 	')
+ 
+ 	allow $1 pulseaudio_t:process signull;
++	allow pulseaudio_t $1:process signull;
+ 	allow $1 pulseaudio_t:unix_stream_socket connectto;
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te	2009-08-22 07:48:07.000000000 -0400
-@@ -22,6 +22,9 @@
++++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te	2009-08-26 08:11:55.000000000 -0400
+@@ -22,7 +22,11 @@
  allow pulseaudio_t self:unix_dgram_socket { sendto create_socket_perms };
  allow pulseaudio_t self:tcp_socket create_stream_socket_perms;
  allow pulseaudio_t self:udp_socket create_socket_perms;
 +allow pulseaudio_t self:netlink_kobject_uevent_socket create_socket_perms;
-+
-+can_exec(pulseaudio_t, pulseaudio_exec_t)
  
++can_exec(pulseaudio_t, pulseaudio_exec_t)
++
++kernel_read_system_state(pulseaudio_t)
  kernel_read_kernel_sysctls(pulseaudio_t)
  
-@@ -47,6 +50,7 @@
+ corecmd_exec_bin(pulseaudio_t)
+@@ -47,6 +51,7 @@
  
  fs_rw_anon_inodefs_files(pulseaudio_t)
  fs_getattr_tmpfs(pulseaudio_t)
@@ -3559,7 +3624,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_all_user_ttys(pulseaudio_t)
  term_use_all_user_ptys(pulseaudio_t)
-@@ -78,6 +82,15 @@
+@@ -78,6 +83,15 @@
  	policykit_domtrans_auth(pulseaudio_t)
  	policykit_read_lib(pulseaudio_t)
  	policykit_read_reload(pulseaudio_t)
@@ -3575,7 +3640,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -85,8 +98,7 @@
+@@ -85,8 +99,7 @@
  ')
  
  optional_policy(`
@@ -4620,8 +4685,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.28/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/apps/wine.if	2009-08-21 18:56:07.000000000 -0400
-@@ -43,3 +43,63 @@
++++ serefpolicy-3.6.28/policy/modules/apps/wine.if	2009-08-25 15:59:59.000000000 -0400
+@@ -43,3 +43,62 @@
  	wine_domtrans($1)
  	role $2 types wine_t;
  ')
@@ -4683,11 +4748,10 @@ diff -b -B --ignore-all-space --exclude-
 +	relabel_dirs_pattern($2, wine_home_t, wine_home_t)
 +	relabel_files_pattern($2, wine_home_t, wine_home_t)
 +	relabel_lnk_files_pattern($2, wine_home_t, wine_home_t)
-+
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.28/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/apps/wine.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/apps/wine.te	2009-08-25 16:00:27.000000000 -0400
 @@ -9,20 +9,35 @@
  type wine_t;
  type wine_exec_t;
@@ -4933,7 +4997,7 @@ diff -b -B --ignore-all-space --exclude-
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.28/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/devices.if	2009-08-24 08:40:29.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/devices.if	2009-08-25 15:58:11.000000000 -0400
 @@ -1655,6 +1655,78 @@
  
  ########################################
@@ -5954,7 +6018,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.28/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/filesystem.if	2009-08-24 08:48:26.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/filesystem.if	2009-08-24 09:57:00.000000000 -0400
 @@ -1537,6 +1537,24 @@
  
  ########################################
@@ -6377,6 +6441,29 @@ diff -b -B --ignore-all-space --exclude-
 +	fs_type($1)
 +	mls_trusted_object($1)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.6.28/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2009-07-29 15:15:33.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/storage.fc	2009-08-24 10:07:26.000000000 -0400
+@@ -28,6 +28,7 @@
+ /dev/megadev.*		-c	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/mspblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
++/dev/mtd.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.6.28/policy/modules/kernel/storage.if
+--- nsaserefpolicy/policy/modules/kernel/storage.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/storage.if	2009-08-25 15:56:31.000000000 -0400
+@@ -529,7 +529,7 @@
+ 
+ 	')
+ 
+-	dontaudit $1 removable_device_t:blk_file { getattr ioctl read };
++	dontaudit $1 removable_device_t:blk_file read_blk_file_perms;
+ ')
+ 
+ ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-3.6.28/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/kernel/terminal.fc	2009-08-21 18:56:07.000000000 -0400
@@ -7680,8 +7767,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.28/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.te	2009-08-21 18:56:07.000000000 -0400
-@@ -0,0 +1,391 @@
++++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.te	2009-08-25 09:40:01.000000000 -0400
+@@ -0,0 +1,392 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -7937,9 +8024,9 @@ diff -b -B --ignore-all-space --exclude-
 +	portmap_run_helper(unconfined_t, unconfined_r)
 +')
 +
-+optional_policy(`
-+	ppp_run(unconfined_t, unconfined_r)
-+')
++#optional_policy(`
++#	ppp_run(unconfined_t, unconfined_r)
++#')
 +
 +optional_policy(`
 +	qemu_role_notrans(unconfined_r, unconfined_t)
@@ -8012,6 +8099,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow unconfined_execmem_t self:process { execstack execmem };
 +unconfined_domain_noaudit(unconfined_execmem_t)
 +allow unconfined_execmem_t unconfined_t:process transition;
++rpm_transition_script(unconfined_execmem_t)
 +
 +optional_policy(`
 +	init_dbus_chat_script(unconfined_execmem_t)
@@ -8548,6 +8636,28 @@ diff -b -B --ignore-all-space --exclude-
 +
 +permissive abrt_t;
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.fc serefpolicy-3.6.28/policy/modules/services/afs.fc
+--- nsaserefpolicy/policy/modules/services/afs.fc	2009-07-23 14:11:04.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/afs.fc	2009-08-24 10:21:30.000000000 -0400
+@@ -25,6 +25,7 @@
+ /usr/vice/etc/afsd	--	gen_context(system_u:object_r:afs_exec_t,s0)
+ 
+ /var/cache/afs(/.*)?		gen_context(system_u:object_r:afs_cache_t,s0)
++/usr/vice/cache(/.*)?		gen_context(system_u:object_r:afs_cache_t,s0)
+ 
+ /vicepa				gen_context(system_u:object_r:afs_files_t,s0)
+ /vicepb				gen_context(system_u:object_r:afs_files_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.te serefpolicy-3.6.28/policy/modules/services/afs.te
+--- nsaserefpolicy/policy/modules/services/afs.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/afs.te	2009-08-24 09:19:56.000000000 -0400
+@@ -83,6 +83,7 @@
+ 
+ files_mounton_mnt(afs_t)
+ files_read_etc_files(afs_t)
++files_read_usr_files(afs_t)
+ files_rw_etc_runtime_files(afs_t)
+ 
+ fs_getattr_xattr_fs(afs_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.6.28/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/services/amavis.te	2009-08-21 18:56:07.000000000 -0400
@@ -11132,7 +11242,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.28/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/dbus.if	2009-08-23 12:50:58.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/dbus.if	2009-08-25 16:33:22.000000000 -0400
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -11251,11 +11361,11 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +interface(`dbus_manage_lib_files',`
 +	gen_require(`
-+		type system_dbus_var_lib_t;
++		type system_dbusd_var_lib_t;
 +	')
 +
 +	files_search_var_lib($1)
-+	manage_files_pattern($1, system_dbus_var_lib_t, system_dbus_var_lib_t)
++	manage_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
 +')
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.28/policy/modules/services/dbus.te
@@ -15127,7 +15237,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.6.28/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/ppp.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/ppp.te	2009-08-24 09:25:42.000000000 -0400
 @@ -193,6 +193,8 @@
  
  optional_policy(`
@@ -15137,6 +15247,15 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
+@@ -216,7 +218,7 @@
+ # PPTP Local policy
+ #
+ 
+-allow pptp_t self:capability { net_raw net_admin };
++allow pptp_t self:capability { dac_override dac_read_search net_raw net_admin };
+ dontaudit pptp_t self:capability sys_tty_config;
+ allow pptp_t self:process signal;
+ allow pptp_t self:fifo_file rw_fifo_file_perms;
 @@ -295,6 +297,14 @@
  ')
  
@@ -15935,7 +16054,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.28/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/samba.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/samba.te	2009-08-25 09:18:50.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -15978,7 +16097,11 @@ diff -b -B --ignore-all-space --exclude-
  # Allow samba to list mnt_t for potential mounted dirs
  files_list_mnt(smbd_t)
  
-@@ -341,6 +352,8 @@
+@@ -338,9 +349,12 @@
+ 
+ userdom_use_unpriv_users_fds(smbd_t)
+ userdom_dontaudit_search_user_home_dirs(smbd_t)
++userdom_signal_all_users(smbd_t)
  
  usermanage_read_crack_db(smbd_t)
  
@@ -15987,7 +16110,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -352,19 +365,19 @@
+@@ -352,19 +366,19 @@
  ') 
  
  tunable_policy(`samba_domain_controller',`
@@ -16013,7 +16136,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # Support Samba sharing of NFS mount points
-@@ -376,6 +389,15 @@
+@@ -376,6 +390,15 @@
  	fs_manage_nfs_named_sockets(smbd_t)
  ')
  
@@ -16029,7 +16152,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	cups_read_rw_config(smbd_t)
  	cups_stream_connect(smbd_t)
-@@ -391,6 +413,11 @@
+@@ -391,6 +414,11 @@
  ')
  
  optional_policy(`
@@ -16041,7 +16164,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpc_search_nfs_state_data(smbd_t)
  ')
  
-@@ -405,13 +432,15 @@
+@@ -405,13 +433,15 @@
  tunable_policy(`samba_create_home_dirs',`
  	allow smbd_t self:capability chown;
  	userdom_create_user_home_dirs(smbd_t)
@@ -16058,7 +16181,7 @@ diff -b -B --ignore-all-space --exclude-
  	auth_read_all_files_except_shadow(nmbd_t)
  ')
  
-@@ -420,8 +449,8 @@
+@@ -420,8 +450,8 @@
  	auth_manage_all_files_except_shadow(smbd_t)
  	fs_read_noxattr_fs_files(nmbd_t) 
  	auth_manage_all_files_except_shadow(nmbd_t)
@@ -16068,7 +16191,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
-@@ -525,6 +554,7 @@
+@@ -525,6 +555,7 @@
  
  allow smbcontrol_t winbind_t:process { signal signull };
  
@@ -16076,7 +16199,7 @@ diff -b -B --ignore-all-space --exclude-
  samba_read_config(smbcontrol_t)
  samba_rw_var_files(smbcontrol_t)
  samba_search_var(smbcontrol_t)
-@@ -638,6 +668,10 @@
+@@ -638,6 +669,10 @@
  
  allow swat_t smbd_var_run_t:file { lock unlink };
  
@@ -16087,7 +16210,7 @@ diff -b -B --ignore-all-space --exclude-
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
-@@ -713,12 +747,23 @@
+@@ -713,12 +748,23 @@
  	kerberos_use(swat_t)
  ')
  
@@ -16112,7 +16235,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process { signal_perms getsched setsched };
  allow winbind_t self:fifo_file rw_fifo_file_perms;
-@@ -866,6 +911,16 @@
+@@ -866,6 +912,16 @@
  #
  
  optional_policy(`
@@ -16129,7 +16252,7 @@ diff -b -B --ignore-all-space --exclude-
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -876,9 +931,12 @@
+@@ -876,9 +932,12 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  
@@ -23809,8 +23932,8 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.6.28/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/raid.te	2009-08-21 18:56:07.000000000 -0400
-@@ -32,10 +32,6 @@
++++ serefpolicy-3.6.28/policy/modules/system/raid.te	2009-08-25 15:58:45.000000000 -0400
+@@ -32,11 +32,6 @@
  kernel_rw_software_raid_state(mdadm_t)
  kernel_getattr_core_if(mdadm_t)
  
@@ -23818,18 +23941,22 @@ diff -b -B --ignore-all-space --exclude-
 -corecmd_exec_bin(mdadm_t)
 -corecmd_exec_shell(mdadm_t)
 -
- dev_read_sysfs(mdadm_t)
+-dev_read_sysfs(mdadm_t)
  # Ignore attempts to read every device file
  dev_dontaudit_getattr_all_blk_files(mdadm_t)
-@@ -45,24 +41,28 @@
+ dev_dontaudit_getattr_all_chr_files(mdadm_t)
+@@ -44,25 +39,31 @@
+ dev_dontaudit_getattr_generic_chr_files(mdadm_t)
  dev_dontaudit_getattr_generic_blk_files(mdadm_t)
  dev_read_realtime_clock(mdadm_t)
- 
+-
 -domain_use_interactive_fds(mdadm_t)
 -
 -files_read_etc_files(mdadm_t)
 -files_read_etc_runtime_files(mdadm_t)
--
++dev_read_raw_memory(mdadm_t)
++dev_read_sysfs(mdadm_t)
+ 
  fs_search_auto_mountpoints(mdadm_t)
  fs_dontaudit_list_tmpfs(mdadm_t)
  
@@ -23902,7 +24029,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.28/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/selinuxutil.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/selinuxutil.if	2009-08-25 15:30:03.000000000 -0400
 @@ -535,6 +535,53 @@
  
  ########################################
@@ -26012,7 +26139,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.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-24 08:49:32.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-25 09:28:37.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -p -r1.903 -r1.904
--- selinux-policy.spec	23 Aug 2009 13:55:48 -0000	1.903
+++ selinux-policy.spec	26 Aug 2009 12:12:39 -0000	1.904
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -475,6 +475,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-7
+- Fixes for cdrecord, mdadm, and others
+
 * Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-6
 - Add capability setting to dhcpc and gpm
 



From nucleo at fedoraproject.org  Wed Aug 26 12:13:14 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Wed, 26 Aug 2009 12:13:14 +0000 (UTC)
Subject: rpms/kvirc/F-11 .cvsignore, 1.2, 1.3 kvirc.spec, 1.1, 1.2 sources,
	1.2, 1.3 kvirc-flags.patch, 1.1, NONE
Message-ID: <20090826121314.CE0E411C0082@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23590

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-flags.patch 
Log Message:
New svn snapshot 3426


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 23:43:27 -0000	1.2
+++ .cvsignore	26 Aug 2009 12:13:13 -0000	1.3
@@ -1 +1 @@
-kvirc-20090409svn3173.tar.bz2
+kvirc-20090826svn3426.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kvirc.spec	9 Apr 2009 23:43:28 -0000	1.1
+++ kvirc.spec	26 Aug 2009 12:13:14 -0000	1.2
@@ -1,20 +1,20 @@
-%define           pre 20090409svn3173
+%define           rev 3426
+%define           pre 20090826svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.6.%{pre}%{?dist}
+Release:          0.9.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3173 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
+#  svn export -r 3426 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090826svn3426.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
-Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
+BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
 Requires(post):   /sbin/ldconfig
@@ -28,10 +28,19 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
-%{cmake}
+%{cmake}  \
+%ifarch %{ix86}
+-DWITH_ix86_ASM=YES \
+%endif
+-DWANT_NO_EMBEDDED_CODE=OFF \
+-DWITHOUT_ESD=OFF \
+-DWITHOUT_OSS=OFF \
+-DWANT_COEXISTENCE=OFF \
+-DWITH_PYTHON=YES \
+-DMANUAL_REVISION=%{rev}
+
 make %{?_smp_mflags}
 
 %install
@@ -40,7 +49,7 @@ make install DESTDIR=%{buildroot}
 
 desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications/ \
-    %{buildroot}%{_datadir}/applications/%{name}4.desktop
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 ln -s ../../%{name}/4.0/license/COPYING COPYING
 
@@ -66,10 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-,root,root,-)
 %doc doc/FAQ doc/README COPYING
-%{_bindir}/kvirc4
-%{_libdir}/libkvilib4.so.4
-%{_libdir}/libkvilib4.so.4.0.0
-%{_datadir}/applications/kvirc4.desktop
+%{_bindir}/%{name}
+%{_libdir}/libkvilib.so.4
+%{_libdir}/libkvilib.so.4.0.0
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/%{name}/
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/4.0
@@ -83,16 +92,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/%{name}/4.0/pics/
 %{_datadir}/%{name}/4.0/themes/
 %{_datadir}/%{name}/4.0/license/
-%{_datadir}/man/man1/%{name}.1.gz
-%{_datadir}/mimelnk/applications/x-kva.desktop
-%{_datadir}/mimelnk/applications/x-kvt.desktop
-%{_datadir}/mimelnk/text/x-kvc.desktop
-%{_datadir}/mimelnk/text/x-kvs.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/*/apps/kvirc.*
-%{_datadir}/icons/hicolor/*/mimetypes/kva.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvc.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvs.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvt.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kva.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kvt.*
+%{_datadir}/icons/hicolor/*/mimetypes/text-x-kvc.*
+%{_datadir}/icons/hicolor/*/mimetypes/text-x-kvs.*
+%{_mandir}/man1/%{name}.1.gz
 
 # Translation files
 %lang(bg) %{_datadir}/%{name}/4.0/locale/*_bg.mo
@@ -112,13 +118,29 @@ gtk-update-icon-cache %{_datadir}/icons/
 %lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
 %lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
 %lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo
+%lang(de) %{_mandir}/de.UTF-8/man1/%{name}.1.gz
+%lang(it) %{_mandir}/it.UTF-8/man1/%{name}.1.gz
+%lang(it) %{_mandir}/it/man1/%{name}.1.gz
 
-%exclude %{_libdir}/libkvilib4.so
-%exclude %{_bindir}/kvirc4-config
+%exclude %{_libdir}/libkvilib.so
+%exclude %{_bindir}/kvirc-config
 %exclude %{_datadir}/%{name}/4.0/doc/FAQ
 %exclude %{_datadir}/%{name}/4.0/doc/README
+%exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
+- svn snapshot 3426 that builds with new openssl
+- Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
+- Added -DWITH_ix86_ASM and -DMANUAL_REVISION
+- Added BR: esound-devel
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.6.20090409svn3173
 - svn snapshot 3173
 - Summary changed to Free portable IRC client


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Apr 2009 23:43:28 -0000	1.2
+++ sources	26 Aug 2009 12:13:14 -0000	1.3
@@ -1 +1 @@
-3211fd5a55289927b697b343f1c7e561  kvirc-20090409svn3173.tar.bz2
+ef83b1fa6b8c9598a4f2aadb4217be2d  kvirc-20090826svn3426.tar.bz2


--- kvirc-flags.patch DELETED ---



From twaugh at fedoraproject.org  Wed Aug 26 12:16:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 12:16:40 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-get_cursor.patch, NONE,
	1.1 system-config-printer.spec, 1.244, 1.245
Message-ID: <20090826121640.6ABF311C0082@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-serv24215

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-get_cursor.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
- Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).


system-config-printer-get_cursor.patch:
 system-config-printer.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-get_cursor.patch ---
diff -up system-config-printer-1.1.12/system-config-printer.py.get_cursor system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.get_cursor	2009-08-25 17:01:28.000000000 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-26 12:32:02.757680412 +0100
@@ -5655,7 +5655,12 @@ class NewPrinterGUI(GtkGUI):
             self.expNPDeviceURIs.hide ()
 
     def on_tvNPDeviceURIs_cursor_changed(self, widget):
-        model, iter = widget.get_selection().get_selected()
+        path, column = widget.get_cursor ()
+        if path == None:
+            return
+
+        model = widget.get_model ()
+        iter = model.get_iter (path)
         device = model.get_value(iter, 1)
         self.device = device
         self.lblNPDeviceDescription.set_text ('')


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- system-config-printer.spec	25 Aug 2009 21:42:21 -0000	1.244
+++ system-config-printer.spec	26 Aug 2009 12:16:40 -0000	1.245
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.bz2
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-get_cursor.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -62,6 +63,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .get_cursor
 
 %build
 %configure
@@ -163,7 +165,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-2
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
+- Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).
+
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
 - 1.1.12:
   - Troubleshooting fix.
   - Fixed applet traceback when printing test page.



From twaugh at fedoraproject.org  Wed Aug 26 12:16:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 12:16:45 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-get_cursor.patch, NONE,
	1.1 system-config-printer.spec, 1.274, 1.275
Message-ID: <20090826121645.263FB11C0082@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-serv24256

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-get_cursor.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
- Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).


system-config-printer-get_cursor.patch:
 system-config-printer.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-get_cursor.patch ---
diff -up system-config-printer-1.1.12/system-config-printer.py.get_cursor system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.get_cursor	2009-08-25 17:01:28.000000000 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-26 12:32:02.757680412 +0100
@@ -5655,7 +5655,12 @@ class NewPrinterGUI(GtkGUI):
             self.expNPDeviceURIs.hide ()
 
     def on_tvNPDeviceURIs_cursor_changed(self, widget):
-        model, iter = widget.get_selection().get_selected()
+        path, column = widget.get_cursor ()
+        if path == None:
+            return
+
+        model = widget.get_model ()
+        iter = model.get_iter (path)
         device = model.get_value(iter, 1)
         self.device = device
         self.lblNPDeviceDescription.set_text ('')


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- system-config-printer.spec	25 Aug 2009 16:45:09 -0000	1.274
+++ system-config-printer.spec	26 Aug 2009 12:16:44 -0000	1.275
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-%{version}.tar.xz
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-get_cursor.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -62,6 +63,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .get_cursor
 
 %build
 %configure
@@ -163,6 +165,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
+- Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).
+
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-1
 - 1.1.12:
   - Troubleshooting fix.



From buc at fedoraproject.org  Wed Aug 26 12:23:39 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Wed, 26 Aug 2009 12:23:39 +0000 (UTC)
Subject: rpms/libtranslate/devel libtranslate-services.xml.in-20090826, NONE,
	1.1 libtranslate.spec, 1.27,
	1.28 libtranslate-0.99-services.diff, 1.1,
	NONE libtranslate-0.99-update-services.patch, 1.1,
	NONE libtranslate-0.99-update-services1.patch, 1.1, NONE
Message-ID: <20090826122339.E9D9C11C0082@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26348

Modified Files:
	libtranslate.spec 
Added Files:
	libtranslate-services.xml.in-20090826 
Removed Files:
	libtranslate-0.99-services.diff 
	libtranslate-0.99-update-services.patch 
	libtranslate-0.99-update-services1.patch 
Log Message:



--- NEW FILE libtranslate-services.xml.in-20090826 ---
<?xml version="1.0"?>
<!DOCTYPE services SYSTEM "services.dtd">

<!-- Copyright (C) 2005 Jean-Yves Lefort -->
<!-- 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 Jean-Yves Lefort nor the names of its contributors -->
<!--    may be used to endorse or promote products derived from this software -->
<!--    without specific prior written permission. -->

<!-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -->
<!-- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -->
<!-- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
<!-- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -->
<!-- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -->
<!-- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -->
<!-- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -->
<!-- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -->
<!-- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -->
<!-- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -->
<!-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -->
<!-- POSSIBILITY OF SUCH DAMAGE. -->

<!-- Changelog: -->

<!--   2009.08.26 <Dmitry at Butskoy.name> -->
<!--   - commit changes from the upstream's libtranslate-0.99-services.diff patch -->
<!--   - commit changes from Fedora patches (by Dwayne Bailey, <dwayne at translate.org.za>) -->


<services>
  <custom-language tag="oc_aran" _name="Aranese"/>
  <custom-language tag="pt-BR" _name="Portuguese (Brazil)"/>
  <custom-language tag="zh-TW" _name="Chinese (Taiwan)"/>
  
  <service name="babelfish" nick="Babel Fish">
    <group>
      <language tag="zh" to="en,zh-TW"/>
      <language tag="zh-TW" service-tag="zt" to="en,zh"/>
      <language tag="en" to="*"/>
      <language tag="nl" to="en,fr"/>
      <language tag="fr" to="en,de,el,it,pt,nl,es"/>
      <language tag="de" to="en,fr"/>
      <language tag="el" to="en,fr"/>
      <language tag="it" to="en,fr"/>
      <language tag="ja" to="en"/>
      <language tag="ko" to="en"/>
      <language tag="pt" to="en,fr"/>
      <language tag="ru" to="en"/>
      <language tag="es" to="en,fr"/>
      <text-translation url="http://babelfish.altavista.com/babelfish/tr?urltext=${text:escape}&amp;lp=${from}_${to}&amp;enc=utf8">
	<pre-marker text="&lt;form action=&quot;http://www.altavista.com/web/results"/>
	<pre-marker text="px;&gt;"/>
	<post-marker text="&lt;/div&gt;"/>
      </text-translation>
      <web-page-translation url="http://babelfish.altavista.com/babelfish/trurl_load?url=${url:escape}&amp;lp=${from}_${to}&amp;enc=utf8"/>
    </group>
  </service>

  <service name="systran" nick="SYSTRAN">
    <group>
      <language tag="ar" to="en"/>
      <language tag="zh" to="en"/>
      <language tag="zh-TW" service-tag="zt" to="en"/>
      <language tag="nl" to="en,fr"/>
      <language tag="en" to="*"/>
      <language tag="fr" to="nl,en,de,it,pt,es"/>
      <language tag="de" to="en,fr"/>
      <language tag="it" to="en,fr"/>
      <language tag="ja" to="en"/>
      <language tag="ko" to="en"/>
      <language tag="pt" to="en,fr"/>
      <language tag="ru" to="en"/>
      <language tag="es" to="en,fr"/>
      <language tag="sv" to="en"/>
      <text-translation url="http://www2.systranbox.com/sai?gui=sbox/normal/systran/sboxEN&amp;lp=${from}_${to}&amp;service=translate" post="${text}">
	<pre-marker text="body=&#10;"/>
      </text-translation>
      <web-page-translation url="http://svsurl.systransoft.com/?trans=1&amp;gui=sbox/normal/systran/systranEN&amp;lp=${from}_${to}&amp;loc_lang=en&amp;path=systran/systranEN&amp;frame=1&amp;url=${url:escape}"/>
    </group>
  </service>

  <service name="google" nick="Google">
    <group>
      <language tag="af" to="*"/>
      <language tag="ar" to="*"/>
      <language tag="bg" to="*"/>
      <language tag="be" to="*"/>
      <language tag="ca" to="*"/>
      <language tag="cs" to="*"/>
      <language tag="cy" to="*"/>
      <language tag="da" to="*"/>
      <language tag="de" to="*"/>
      <language tag="el" to="*"/>
      <language tag="en" to="*"/>
      <language tag="es" to="*"/>
      <language tag="et" to="*"/>
      <language tag="fa" to="*"/>
      <language tag="fi" to="*"/>
      <language tag="fil" to="*"/>
      <language tag="fr" to="*"/>
      <language tag="ga" to="*"/>
      <language tag="gl" to="*"/>
      <language tag="he" to="*"/>
      <language tag="hi" to="*"/>
      <language tag="hr" to="*"/>
      <language tag="hu" to="*"/>
      <language tag="id" to="*"/>
      <language tag="is" to="*"/>
      <language tag="it" to="*"/>
      <language tag="ja" to="*"/>
      <language tag="ko" to="*"/>
      <language tag="lt" to="*"/>
      <language tag="lv" to="*"/>
      <language tag="mk" to="*"/>
      <language tag="ms" to="*"/>
      <language tag="mt" to="*"/>
      <language tag="nl" to="*"/>
      <language tag="nb" service-tag="no" to="*"/> <!-- Google does not differentiate these two dialects -->
      <language tag="nn" service-tag="no" to="*"/> <!-- probably needs review by a native speaker -->
      <language tag="pl" to="*"/>
      <language tag="pt" to="*"/>
      <language tag="ro" to="*"/>
      <language tag="ru" to="*"/>
      <language tag="sk" to="*"/>
      <language tag="sl" to="*"/>
      <language tag="sq" to="*"/>
      <language tag="sr" to="*"/>
      <language tag="sv" to="*"/>
      <language tag="sw" to="*"/>
      <language tag="th" to="*"/>
      <language tag="tl" to="*"/>
      <language tag="tr" to="*"/>
      <language tag="uk" to="*"/>
      <language tag="vi" to="*"/>
      <language tag="yi" to="*"/>
      <language tag="zh" service-tag="zh-CN" to="*"/>
      <language tag="zh-TW" to="*"/>
      <text-translation url="http://www.google.com/translate_t?text=${text:escape}&amp;langpair=${from}|${to}&amp;ie=utf8&amp;oe=utf8">
	<pre-marker text="&lt;div id="/>
	<pre-marker text="result_box"/>
	<pre-marker text="&gt;"/>
	<post-marker text="&lt;/div&gt;"/>
      </text-translation>
      <web-page-translation url="http://translate.google.com/translate?u=${url:escape}&amp;sl=${from}&amp;tl=${to}"/>
    </group>
  </service>

  <service name="freetranslation" nick="FreeTranslation" max-chunk-len="600">
    <group>
      <language tag="nl" service-tag="dutch" to="en"/>
      <language tag="en" service-tag="english" to="*"/>
      <language tag="fr" service-tag="french" to="en"/>
      <language tag="de" service-tag="german" to="en"/>
      <language tag="it" service-tag="italian" to="en"/>
      <language tag="no" service-tag="norwegian"/>
      <language tag="pt" service-tag="portuguese" to="en"/>
      <language tag="es" service-tag="spanish" to="en"/>
      <text-translation url="http://ets.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
      <web-page-translation url="http://fets5.freetranslation.com/?sequence=core&amp;url=${url:escape}&amp;language=${from}/${to}"/>
    </group>
    <group>
      <language tag="zh" service-tag="simplifiedchinese"/>
      <language tag="zh-TW" service-tag="traditionalchinese"/>
      <language tag="en" service-tag="english" to="*"/>
      <language tag="ru" service-tag="russian" to="en"/>
      <text-translation url="http://ets6.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
    </group>
    <group>
      <language tag="en" service-tag="english" to="*"/>
      <language tag="ja" service-tag="japanese" to ="en"/>
      <text-translation url="http://tets9.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
    </group>
  </service>

  <service name="1800translate" nick="1-800-Translate">
    <group>
      <language tag="en" service-tag="English" to="*"/>
      <language tag="ar" service-tag="Arabic" to="*"/>
      <language tag="zh" service-tag="Chinese" to="*"/>
      <language tag="nl" service-tag="Dutch" to="*"/>
      <language tag="fa" service-tag="Farsi" to="*"/>
      <language tag="fr" service-tag="French" to="*"/>
      <language tag="de" service-tag="German" to="*"/>
      <language tag="he" service-tag="Hebrew" to="*"/>
      <language tag="it" service-tag="Italian" to="*"/>
      <language tag="ja" service-tag="Japanese" to="*"/>
      <language tag="ko" service-tag="Korean" to="*"/>
      <language tag="pl" service-tag="Polish" to="*"/>
      <language tag="pt" service-tag="Portuguese" to="*"/>
      <language tag="ru" service-tag="Russian" to="*"/>
      <language tag="es" service-tag="Spanish" to="*"/>
      <language tag="tr" service-tag="Turkish" to="*"/>
      <language tag="uk" service-tag="Ukrainian" to="*"/>
      <text-translation
	url="http://www.1-800-translate.com/machine_trans/process_free_trans.asp"
	post="transfrom=${from}&amp;transto=${to}&amp;transtext=${text:escape}&amp;expiredlang=no">
	<pre-marker text="&lt;textarea name=&quot;transresult"/>
	<pre-marker text="&gt;&#10;"/>
	<post-marker text="&#10;&lt;/textarea&gt;"/>
      </text-translation>
    </group>
  </service>
    
  <service name="kataku" nick="Kataku">
    <group>
      <language tag="en" to="*"/>
      <language tag="id" service-tag="in" to="*"/>
      <text-translation
	url="http://www.toggletext.com/kataku_trial.php"
	post="input_text=${text:charset=ISO8859-1,escape}&amp;langset_text=${from}_${to}">
	<pre-marker text="Translation:"/>
	<pre-marker text="&lt;pre"/>
	<pre-marker text="&gt;"/>
	<post-marker text="&#10;&lt;/pre&gt;"/>
      </text-translation>
      <web-page-translation url="http://www.toggletext.com/kataku_webpage_translate.php?input=${url:escape}&amp;langset=${from}_${to}"/>
    </group>
  </service>

  <service name="papiamentu" nick="Papiamentu">
    <group>
      <language tag="en" service-tag="E" to="*"/>
      <language tag="pap" service-tag="P" to="*"/>
      <text-translation url="http://www.donamaro.nl/papiamentu/index.php?pAction=tradusi&amp;pSel=${from}2${to}&amp;pFrom=${text:charset=ISO8859-1,escape}">
	<pre-marker text="&lt;textarea name=&quot;pTo&quot;"/>
	<pre-marker text="&gt;"/>
	<post-marker text="&lt;/textarea&gt;"/>
      </text-translation>
    </group>
  </service>

  <service nick="PROMT Online-Translator" name="promt" max-chunk-len="450">
    <group>
      <language to="de,es,fr,pt,ru" tag="en" service-tag="e"/>
      <language to="en,fr,es,ru" tag="de" service-tag="g"/>
      <language to="de,en,fr,ru" tag="es" service-tag="s"/>
      <language to="de,en,es,ru" tag="fr" service-tag="f"/>
      <language to="en,ru" tag="it" service-tag="i"/>
      <language to="en" tag="pt" service-tag="p"/>
      <language to="de,en,es,fr" tag="ru" service-tag="r"/>
      <text-translation url="http://www.online-translator.com/text.asp" post="lang=en&amp;status=translate&amp;source=${text:charset=windows-1251,escape}&amp;direction=${from}${to}&amp;template=General">
	<pre-marker text="&lt;div id=&quot;r_text"/>
	<pre-marker text="&gt;"/>
	<pre-marker text="&#10;"/>
	<post-marker text="&lt;/div&gt;"/>
      </text-translation>
      <web-page-translation url="http://www.online-translator.com/url/tran_url.asp?lang=en&amp;url=${url:escape}&amp;$direction=${from}${to}&amp;template=General&amp;cp1=NO&amp;cp2=NO&amp;autotranslate=on"/>
    </group>
  </service>

  <service nick="Apertium" name="apertium">
    <group>
      <!-- Need a better code for Aranese a dialect of Occitan
           current is oc_aran there is no ISO equivalent -->
      <language to="en,es,eo,fr,oc,oc_aran" tag="ca"/>
      <language to="en" tag="cy"/>
      <language to="ca,es,gl" tag="en"/>
      <language to="ca,en,eo,fr,gl,pt,pt-BR" tag="es"/>
      <language to="es" tag="eu"/>
      <language to="ca,es" tag="fr"/>
      <language to="en,es" tag="gl"/>
      <language to="es" tag="pt"/>
      <language tag="pt-BR" service-tag="pt_BR"/>
      <language to="ca" tag="oc"/>
      <language to="es" tag="ro"/>
      <text-translation url="http://xixona.dlsi.ua.es/webservice/ws.php?text=${text:escape}&amp;mode=${from}-${to}"/>
      <web-page-translation url="http://www.apertium.org/apertium/tradurl.php?marcar=&amp;direccion=${from}-${to}&amp;inurl=${url:escape}"/>
    </group>
  </service>
  <!-- Re-enable if you want to use or test the unstable Apertium pairs
  <service nick="Apertium (Unstable)" name="apertium-unstable">
    <group>
      <language to="en" tag="af"/>
      <language to="en,es,eo,fr,oc,oc_aran,pt" tag="ca"/> 
      <language to="af,ca" tag="en"/>
      <language to="ca,eo,fr,gl,oc,oc_aran,pt,pt-BR" tag="es"/>
      <language to="ca,es" tag="fr"/>
      <language to="es" tag="gl"/>
      <language to="ca,es" tag="oc"/>
      <language to="ca,es" tag="oc_aran"/>
      <language to="ca,es" tag="pt"/>
      <language tag="pt-BR" service-tag="pt_BR"/>
      <language to="ca" tag="ro"/>
      <text-translation url="http://xixona.dlsi.ua.es/apertium-unstable/tradtextjs.php" post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
    </group>
  </service> -->
  <!-- Re-enable if you want to use or test the alph/testing Apertium pairs
  <custom-language tag="sh-BS" _name="Serbo-Croatian (Sarajevo)"></custom-language>
  <custom-language tag="sh-HR" _name="Serbo-Croatian (Zagreb)"></custom-language>
  <custom-language tag="sh-SR" _name="Serbo-Croatian (Belgrade)"></custom-language>

  <service nick="Apertium (Alpha Testing)" name="apertium-alpha-testing">
    <group>
      <language to="en" tag="af"/>
      <language to="fr" tag="br"/>
      <language to="en,es,eo,fr,oc,oc_aran,pt,ro" tag="ca"/> 
      <language to="en" tag="cy"/>
      <language to="sv" tag="da"/>
      <language to="af,ca,cy,es,eo,gl" tag="en"/>
      <language to="en" tag="eo"/>
      <language to="es" tag="eu"/>
      <language to="ca,en,eo,fr,gl,it,oc,oc_aran,pt,pt-BR,ro" tag="es"/>
      <language to="tg" tag="fa"/>
      <language to="ca,es" tag="fr"/>
      <language to="sco" tag="ga"/>
      <language to="en,es,pt" tag="gl"/>
      <language to="es" tag="it"/>
      <language to="sh-BS,sh-HR,sh-SR" tag="mk"/>
      <language to="nn" tag="nb"/>
      <language to="nb" tag="nn"/>
      <language to="ca,es" tag="oc"/>
      <language to="ca,es" tag="oc_aran"/>
      <language to="ca,es,gl" tag="pt"/>
      <language tag="pt-BR" service-tag="pt_BR"/>
      <language to="ca,es" tag="ro"/>
      <language to="ga" tag="sco"/>
      <language to="smj" tag="se"/>
      <language to="mk" tag="sh"/>
      <language tag="sh-BS" service-tag="sh_BS"/>
      <language tag="sh-HR" service-tag="sh_HR"/>
      <language tag="sh-SR" service-tag="sh_SR"/>
      <language to="da" tag="sv"/>
      <language to="fa" tag="tg"/>
      <text-translation url="http://xixona.dlsi.ua.es/testing/index.php" post="lang=&amp;inputarea=${text}&amp;direction=${from}-${to}&amp;marcar=0&amp;interm=0&amp;mangle=true">
        <pre-marker text="&lt;div class=&quot;outbox&quot;&gt;"/>
        <pre-marker text="&lt;p style="/>
        <pre-marker text="&lt;/p&gt;"/>
        <post-marker text="&lt;/div&gt;"/>
      </text-translation>
    </group>
  </service> -->

  <service nick="Opentrad" name="opentrad">
    <group>
      <language to="es" tag="ca"/>
      <language to="ca,gl,eu" tag="es"/>
      <language to="es" tag="gl"/>
      <text-translation
      url="http://opentrad.org/tradtextjs.php"
      post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
      <!-- All newlines have <br/> in them, again a pitty for processing would be nice if we could cleanup -->
      <!-- No web-page-translation added -->
    </group>
  </service>
</services>


Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libtranslate.spec	25 Jul 2009 08:47:53 -0000	1.27
+++ libtranslate.spec	26 Aug 2009 12:23:39 -0000	1.28
@@ -1,20 +1,18 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
-Source: %{url}/libtranslate-%{version}.tar.gz
+Source0: %{url}/libtranslate-%{version}.tar.gz
+Source1: libtranslate-services.xml.in-20090826
 Patch1: %{url}/libtranslate-0.99-charsetparse.diff
 Patch2: %{url}/libtranslate-0.99-condfix.diff
 Patch3: %{url}/libtranslate-0.99-int64.diff
 Patch4: %{url}/libtranslate-0.99-postmarker.diff
-Patch5: %{url}/libtranslate-0.99-services.diff
 Patch10: libtranslate-0.99-libsoup24.diff
 Patch11: libtranslate-0.99-fix-modules.patch
-Patch12: libtranslate-0.99-update-services.patch
-Patch13: libtranslate-0.99-update-services1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.8, gettext, intltool, libtool
 BuildRequires: glib2-devel, libsoup-devel >= 2.2, libxml2-devel
@@ -54,11 +52,10 @@ The static libraries and header files fo
 %patch2 -p0
 %patch3 -p0
 %patch4 -p1
-%patch5 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
+
+cp -p %{SOURCE1} data/services.xml.in
 
 libtoolize --force
 intltoolize --automake --force
@@ -124,6 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-22
+- add new language pairs for google service
+  (#519247, by Dwayne Bailey (dwayne at translate.org.za>)
+- use up-to-date services.xml.in plain file as an additional source,
+  instead of a lot of patches for upstream's one
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- libtranslate-0.99-services.diff DELETED ---


--- libtranslate-0.99-update-services.patch DELETED ---


--- libtranslate-0.99-update-services1.patch DELETED ---



From tmraz at fedoraproject.org  Wed Aug 26 12:25:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 12:25:02 +0000 (UTC)
Subject: rpms/tog-pegasus/devel pegasus-2.9.0-openssl.patch, NONE,
	1.1 tog-pegasus.spec, 1.75, 1.76
Message-ID: <20090826122502.8A9D011C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26709

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.9.0-openssl.patch 
Log Message:
* Wed Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-5
- rebuilt with new openssl


pegasus-2.9.0-openssl.patch:
 SSLContext.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pegasus-2.9.0-openssl.patch ---
diff -up pegasus/src/Pegasus/Common/SSLContext.cpp.openssl pegasus/src/Pegasus/Common/SSLContext.cpp
--- pegasus/src/Pegasus/Common/SSLContext.cpp.openssl	2008-12-16 19:56:00.000000000 +0100
+++ pegasus/src/Pegasus/Common/SSLContext.cpp	2009-08-26 14:22:18.000000000 +0200
@@ -272,7 +272,7 @@ int SSLCallback::verificationCRLCallback
     X509_REVOKED* revokedCert = NULL;
     for (int i = 0; i < sk_X509_REVOKED_num(revokedCerts); i++)
     {
-        revokedCert = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i);
+        revokedCert = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
 
         //a matching serial number indicates revocation
         if (ASN1_INTEGER_cmp(revokedCert->serialNumber, serialNumber) == 0)


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- tog-pegasus.spec	21 Aug 2009 16:11:05 -0000	1.75
+++ tog-pegasus.spec	26 Aug 2009 12:25:02 -0000	1.76
@@ -80,6 +80,7 @@ Patch11:		pegasus-2.9.0-no_privilege_sep
 Patch12:		pegasus-2.7.0-no_snmp_tests.patch
 Patch13:                pegasus-2.9.0-sparc.patch
 Patch14:                pegasus-2.7.2-baseelif.patch
+Patch15:		pegasus-2.9.0-openssl.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -148,6 +149,7 @@ The OpenPegasus WBEM tests for the OpenP
 %patch5 -p1 -b .local-or-remote-auth
 %patch13 -p1 -b .sparc
 %patch14 -p1 -b .bareelif
+%patch15 -p1 -b .openssl
 %patch0 -p1 -b .initscript
 find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
 
@@ -461,7 +463,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-5
+* Wed Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.9.0-5
 - rebuilt with new openssl
 
 * Wed Aug 19 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.9.0-4



From timlau at fedoraproject.org  Wed Aug 26 12:27:19 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 26 Aug 2009 12:27:19 +0000 (UTC)
Subject: rpms/postr/F-11 nautilus-ext-dir.patch, NONE, 1.1 postr.spec, 1.17,
	1.18
Message-ID: <20090826122719.72A2911C0082@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27212

Modified Files:
	postr.spec 
Added Files:
	nautilus-ext-dir.patch 
Log Message:
fix build on multi archs

nautilus-ext-dir.patch:
 setup.py |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-ext-dir.patch ---
--- postr-0.12.3/setup.py	2008-12-19 15:51:01.000000000 +0100
+++ postr-0.12.3.new/setup.py	2009-08-25 15:44:58.123732748 +0200
@@ -1,9 +1,30 @@
 #!/usr/bin/env python
 
+import os
 from distutils.core import setup
+from distutils.command.install_data import install_data
 from glob import glob
 from src.version import __version__
 
+
+class InstallData(install_data):
+    def run(self):
+        self.data_files.extend(self._nautilus_plugin())
+        install_data.run(self)
+    
+    def _nautilus_plugin(self):
+        files = []
+        cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
+        res = cmd.readline().strip()
+        ret = cmd.close()
+            
+        if ret is None:
+           dest = res[5:]
+           files.append((dest, ['nautilus/postrExtension.py']))
+        
+        return files
+
+
 setup(name='Postr',
       version=__version__,
       description='Flickr Uploader',
@@ -21,10 +42,7 @@
                   ('share/icons/hicolor/24x24/apps', glob('data/24x24/*.png')),
                   ('share/icons/hicolor/32x32/apps', glob('data/32x32/*.png')),
                   ('share/icons/hicolor/scalable/apps', glob('data/scalable/*.svg')),
-                  # TODO: inspect nautilus-python.pc to get path
-                  ('lib/nautilus/extensions-1.0/python', ['nautilus/postrExtension.py']),
-                  ('lib/nautilus/extensions-2.0/python', ['nautilus/postrExtension.py']),
-                  ],
+                  ], cmdclass={'install_data': InstallData}
       
       )
 


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-11/postr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- postr.spec	25 Aug 2009 10:36:44 -0000	1.17
+++ postr.spec	26 Aug 2009 12:27:18 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -10,11 +10,12 @@ License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 Patch0:		fix_upload_button.patch
+Patch1:		nautilus-ext-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nautilus-python-devel
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       pygtk2
@@ -31,6 +32,7 @@ Tool for uploading photos to the photo-s
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -65,7 +67,6 @@ touch --no-create %{_datadir}/icons/hico
 %doc AUTHORS COPYING README TODO
 %{_bindir}/%{name}
 %{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
-%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -73,6 +74,15 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
+- Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
+- in the right directory
+- Added BuildRequires:  nautilus-python-devel because we need the .pc file to
+- detect the right nautilus python extention dir
+
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-6
+- removed BuildArch: noarch to get it to build for each arch
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
 - use %%%{_libdir} in %%files to put the nautilus extension in the right place
 



From nucleo at fedoraproject.org  Wed Aug 26 12:39:57 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Wed, 26 Aug 2009 12:39:57 +0000 (UTC)
Subject: rpms/kvirc/F-10 .cvsignore, 1.2, 1.3 kvirc.spec, 1.1, 1.2 sources,
	1.2, 1.3 kvirc-flags.patch, 1.1, NONE
Message-ID: <20090826123957.F2C4911C0082@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29479

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-flags.patch 
Log Message:
New svn snapshot 3426


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Apr 2009 23:48:20 -0000	1.2
+++ .cvsignore	26 Aug 2009 12:39:55 -0000	1.3
@@ -1 +1 @@
-kvirc-20090409svn3173.tar.bz2
+kvirc-20090826svn3426.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/kvirc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kvirc.spec	9 Apr 2009 23:48:20 -0000	1.1
+++ kvirc.spec	26 Aug 2009 12:39:55 -0000	1.2
@@ -1,20 +1,20 @@
-%define           pre 20090409svn3173
+%define           rev 3426
+%define           pre 20090826svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.6.%{pre}%{?dist}
+Release:          0.9.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3173 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
+#  svn export -r 3426 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090826svn3426.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
-Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
+BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
 BuildRequires:    cmake desktop-file-utils gettext doxygen graphviz
 Requires(post):   /sbin/ldconfig
@@ -28,10 +28,19 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
-%{cmake}
+%{cmake}  \
+%ifarch %{ix86}
+-DWITH_ix86_ASM=YES \
+%endif
+-DWANT_NO_EMBEDDED_CODE=OFF \
+-DWITHOUT_ESD=OFF \
+-DWITHOUT_OSS=OFF \
+-DWANT_COEXISTENCE=OFF \
+-DWITH_PYTHON=YES \
+-DMANUAL_REVISION=%{rev}
+
 make %{?_smp_mflags}
 
 %install
@@ -40,7 +49,7 @@ make install DESTDIR=%{buildroot}
 
 desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications/ \
-    %{buildroot}%{_datadir}/applications/%{name}4.desktop
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 ln -s ../../%{name}/4.0/license/COPYING COPYING
 
@@ -66,10 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-,root,root,-)
 %doc doc/FAQ doc/README COPYING
-%{_bindir}/kvirc4
-%{_libdir}/libkvilib4.so.4
-%{_libdir}/libkvilib4.so.4.0.0
-%{_datadir}/applications/kvirc4.desktop
+%{_bindir}/%{name}
+%{_libdir}/libkvilib.so.4
+%{_libdir}/libkvilib.so.4.0.0
+%{_datadir}/applications/%{name}.desktop
 %{_libdir}/%{name}/
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/4.0
@@ -83,16 +92,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/%{name}/4.0/pics/
 %{_datadir}/%{name}/4.0/themes/
 %{_datadir}/%{name}/4.0/license/
-%{_datadir}/man/man1/%{name}.1.gz
-%{_datadir}/mimelnk/applications/x-kva.desktop
-%{_datadir}/mimelnk/applications/x-kvt.desktop
-%{_datadir}/mimelnk/text/x-kvc.desktop
-%{_datadir}/mimelnk/text/x-kvs.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/*/apps/kvirc.*
-%{_datadir}/icons/hicolor/*/mimetypes/kva.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvc.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvs.*
-%{_datadir}/icons/hicolor/*/mimetypes/kvt.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kva.*
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-kvt.*
+%{_datadir}/icons/hicolor/*/mimetypes/text-x-kvc.*
+%{_datadir}/icons/hicolor/*/mimetypes/text-x-kvs.*
+%{_mandir}/man1/%{name}.1.gz
 
 # Translation files
 %lang(bg) %{_datadir}/%{name}/4.0/locale/*_bg.mo
@@ -112,13 +118,29 @@ gtk-update-icon-cache %{_datadir}/icons/
 %lang(ru) %{_datadir}/%{name}/4.0/locale/*_ru.mo
 %lang(sr) %{_datadir}/%{name}/4.0/locale/*_sr.mo
 %lang(uk) %{_datadir}/%{name}/4.0/locale/*_uk.mo
+%lang(de) %{_mandir}/de.UTF-8/man1/%{name}.1.gz
+%lang(it) %{_mandir}/it.UTF-8/man1/%{name}.1.gz
+%lang(it) %{_mandir}/it/man1/%{name}.1.gz
 
-%exclude %{_libdir}/libkvilib4.so
-%exclude %{_bindir}/kvirc4-config
+%exclude %{_libdir}/libkvilib.so
+%exclude %{_bindir}/kvirc-config
 %exclude %{_datadir}/%{name}/4.0/doc/FAQ
 %exclude %{_datadir}/%{name}/4.0/doc/README
+%exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
+- svn snapshot 3426 that builds with new openssl
+- Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
+- Added -DWITH_ix86_ASM and -DMANUAL_REVISION
+- Added BR: esound-devel
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.6.20090409svn3173
 - svn snapshot 3173
 - Summary changed to Free portable IRC client


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Apr 2009 23:48:20 -0000	1.2
+++ sources	26 Aug 2009 12:39:55 -0000	1.3
@@ -1 +1 @@
-3211fd5a55289927b697b343f1c7e561  kvirc-20090409svn3173.tar.bz2
+ef83b1fa6b8c9598a4f2aadb4217be2d  kvirc-20090826svn3426.tar.bz2


--- kvirc-flags.patch DELETED ---



From sharkcz at fedoraproject.org  Wed Aug 26 12:41:42 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 12:41:42 +0000 (UTC)
Subject: rpms/s390utils/F-11 0019-s390-tools-1.8.1-lsluns-disk-enc.patch,
	NONE, 1.1 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch, NONE,
	1.1 0021-s390-tools-1.8.1-lszfcp-perf.patch, NONE,
	1.1 s390utils.spec, 1.3, 1.4
Message-ID: <20090826124142.11FD111C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29875

Modified Files:
	s390utils.spec 
Added Files:
	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 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-2
- Fix byte check for disk encryption check in lsluns (#510032)
- Fix cmm configuration file value initialization parser in cpuplugd (#511379)
- Check only ZFCP devices in lszfcp (#518669)


0019-s390-tools-1.8.1-lsluns-disk-enc.patch:
 lsluns |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0019-s390-tools-1.8.1-lsluns-disk-enc.patch ---
>From 8384b80dac573a65de6610ff8dae753a0e2d6deb Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 13 Jul 2009 10:29:52 +0200
Subject: [PATCH] s390-tools-1.8.1-lsluns-disk-enc

Description: lsluns: fix byte check for disk encryption check.
Symptom:     Encrypted disks are never displayed as encrypted.
Problem:     The check was performed on the wrong bit.
Solution:    Perform the check on the correct bit.
Problem-ID:  54517
---
 zconf/lsluns |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zconf/lsluns b/zconf/lsluns
index 08a11ba..164282e 100755
--- a/zconf/lsluns
+++ b/zconf/lsluns
@@ -216,8 +216,8 @@ sub show_attached_lun_info
                                 (my $mod = substr($inq, 0x10, 0x10)) =~ s/\s*//g;
                                 my $type = ord(substr($inq, 0x0, 0x1));
                                 my $enc = ($mod =~ /2107/) ?
-                                        ord(substr($inq, 0xa2, 0x80)) : 0;
-                                $l .= "(X)" if ($enc & 0x8);
+                                        ord(substr($inq, 0xa2, 0x1)) : 0;
+                                $l .= "(X)" if ($enc & 0x80);
                                 $txt[$type] = $type if (!defined($txt[$type]));
                                 print("\t\tlun = $l\t$sg_dev\t$txt[$type]",
                                       "\t$vend:$mod\n");
-- 
1.6.0.6


0020-s390-tools-1.8.1-cpuplugd-cmminit.patch:
 config.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch ---
>From af1d22ef04368fd201480959ad6647853d82a25e 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:20:50 +0200
Subject: [PATCH 20/21] s390-tools-1.8.1-cpuplugd-cmminit

---
 cpuplugd/config.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpuplugd/config.c b/cpuplugd/config.c
index 93b31e5..c013a65 100644
--- a/cpuplugd/config.c
+++ b/cpuplugd/config.c
@@ -348,7 +348,7 @@ void check_config(struct config *cfg)
 					"configuration detected\n");
 		}
 	}
-	if (cfg->cmm_max < 0 || cfg->cmm_min < -1
+	if (cfg->cmm_max < 0 || cfg->cmm_min < 0
 		|| cfg->cmm_inc < 0 || cfg->memplug == NULL || cfg->update < 0
 		|| cfg->memunplug == NULL) {
 		if (foreground == 1)
-- 
1.6.3.3


0021-s390-tools-1.8.1-lszfcp-perf.patch:
 lszfcp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0021-s390-tools-1.8.1-lszfcp-perf.patch ---
>From ce6dabd2c97ae9ff589232f7ff95c699a9755267 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 21/21] 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 e6fc94f..8ac66ea 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -231,7 +231,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



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- s390utils.spec	3 Jul 2009 09:22:10 -0000	1.3
+++ s390utils.spec	26 Aug 2009 12:41:41 -0000	1.4
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@ Patch15:  0015-s390-tools-1.8.1-iucvterm
 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
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -103,12 +106,21 @@ be used together with the zSeries (s390)
 %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
+%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
+%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
+
+# Check only ZFCP devices in lszfcp (#518669)
+%patch21 -p1 -b .lszfcp-perf
 
 #
 # cmsfs
@@ -734,6 +746,11 @@ This package contains the CMS file syste
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-2
+- Fix byte check for disk encryption check in lsluns (#510032)
+- Fix cmm configuration file value initialization parser in cpuplugd (#511379)
+- Check only ZFCP devices in lszfcp (#518669)
+
 * Mon Jun 29 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-1
 - update to 1.8.1
 - drop upstreamed patches



From sharkcz at fedoraproject.org  Wed Aug 26 12:43:55 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 26 Aug 2009 12:43:55 +0000 (UTC)
Subject: rpms/s390utils/devel 0019-s390-tools-1.8.1-lsluns-disk-enc.patch,
	NONE, 1.1 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch, NONE,
	1.1 0021-s390-tools-1.8.1-lszfcp-perf.patch, NONE,
	1.1 s390utils.spec, 1.2, 1.3
Message-ID: <20090826124355.9DA1E11C0082@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30445

Modified Files:
	s390utils.spec 
Added Files:
	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 
Log Message:
* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-2
- Fix byte check for disk encryption check in lsluns (#510032)
- Fix cmm configuration file value initialization parser in cpuplugd (#511379)
- Check only ZFCP devices in lszfcp (#518669)


0019-s390-tools-1.8.1-lsluns-disk-enc.patch:
 lsluns |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0019-s390-tools-1.8.1-lsluns-disk-enc.patch ---
>From 8384b80dac573a65de6610ff8dae753a0e2d6deb Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 13 Jul 2009 10:29:52 +0200
Subject: [PATCH] s390-tools-1.8.1-lsluns-disk-enc

Description: lsluns: fix byte check for disk encryption check.
Symptom:     Encrypted disks are never displayed as encrypted.
Problem:     The check was performed on the wrong bit.
Solution:    Perform the check on the correct bit.
Problem-ID:  54517
---
 zconf/lsluns |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zconf/lsluns b/zconf/lsluns
index 08a11ba..164282e 100755
--- a/zconf/lsluns
+++ b/zconf/lsluns
@@ -216,8 +216,8 @@ sub show_attached_lun_info
                                 (my $mod = substr($inq, 0x10, 0x10)) =~ s/\s*//g;
                                 my $type = ord(substr($inq, 0x0, 0x1));
                                 my $enc = ($mod =~ /2107/) ?
-                                        ord(substr($inq, 0xa2, 0x80)) : 0;
-                                $l .= "(X)" if ($enc & 0x8);
+                                        ord(substr($inq, 0xa2, 0x1)) : 0;
+                                $l .= "(X)" if ($enc & 0x80);
                                 $txt[$type] = $type if (!defined($txt[$type]));
                                 print("\t\tlun = $l\t$sg_dev\t$txt[$type]",
                                       "\t$vend:$mod\n");
-- 
1.6.0.6


0020-s390-tools-1.8.1-cpuplugd-cmminit.patch:
 config.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch ---
>From af1d22ef04368fd201480959ad6647853d82a25e 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:20:50 +0200
Subject: [PATCH 20/21] s390-tools-1.8.1-cpuplugd-cmminit

---
 cpuplugd/config.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cpuplugd/config.c b/cpuplugd/config.c
index 93b31e5..c013a65 100644
--- a/cpuplugd/config.c
+++ b/cpuplugd/config.c
@@ -348,7 +348,7 @@ void check_config(struct config *cfg)
 					"configuration detected\n");
 		}
 	}
-	if (cfg->cmm_max < 0 || cfg->cmm_min < -1
+	if (cfg->cmm_max < 0 || cfg->cmm_min < 0
 		|| cfg->cmm_inc < 0 || cfg->memplug == NULL || cfg->update < 0
 		|| cfg->memunplug == NULL) {
 		if (foreground == 1)
-- 
1.6.3.3


0021-s390-tools-1.8.1-lszfcp-perf.patch:
 lszfcp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0021-s390-tools-1.8.1-lszfcp-perf.patch ---
>From ce6dabd2c97ae9ff589232f7ff95c699a9755267 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 21/21] 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 e6fc94f..8ac66ea 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -231,7 +231,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



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- s390utils.spec	3 Jul 2009 09:23:00 -0000	1.2
+++ s390utils.spec	26 Aug 2009 12:43:55 -0000	1.3
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@ Patch15:  0015-s390-tools-1.8.1-iucvterm
 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
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -103,12 +106,21 @@ be used together with the zSeries (s390)
 %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
+%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
+%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
+
+# Check only ZFCP devices in lszfcp (#518669)
+%patch21 -p1 -b .lszfcp-perf
 
 #
 # cmsfs
@@ -734,6 +746,11 @@ This package contains the CMS file syste
 
 
 %changelog
+* Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-2
+- Fix byte check for disk encryption check in lsluns (#510032)
+- Fix cmm configuration file value initialization parser in cpuplugd (#511379)
+- Check only ZFCP devices in lszfcp (#518669)
+
 * Mon Jun 29 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-1
 - update to 1.8.1
 - drop upstreamed patches



From timlau at fedoraproject.org  Wed Aug 26 12:49:08 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 26 Aug 2009 12:49:08 +0000 (UTC)
Subject: rpms/postr/F-10 postr.spec,1.13,1.14
Message-ID: <20090826124908.4204E11C0082@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31410

Modified Files:
	postr.spec 
Log Message:
fix build on multi archs


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-10/postr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- postr.spec	25 Aug 2009 10:37:08 -0000	1.13
+++ postr.spec	26 Aug 2009 12:49:08 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           postr
 Version:        0.12.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -10,11 +10,12 @@ License:        GPLv2+
 URL:            http://www.burtonini.com/blog/computers/postr
 Source0:        http://burtonini.com/computing/%{name}-%{version}.tar.gz
 Patch0:		fix_upload_button.patch
+Patch1:		nautilus-ext-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nautilus-python-devel
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       pygtk2
@@ -31,6 +32,7 @@ Tool for uploading photos to the photo-s
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -65,7 +67,6 @@ touch --no-create %{_datadir}/icons/hico
 %doc AUTHORS COPYING README TODO
 %{_bindir}/%{name}
 %{_libdir}/nautilus/extensions-2.0/python/postrExtension.py*
-%{_libdir}/nautilus/extensions-1.0/python/postrExtension.py*
 %{python_sitelib}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -73,6 +74,15 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
+- Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
+- in the right directory
+- Added BuildRequires:  nautilus-python-devel because we need the .pc file to
+- detect the right nautilus python extention dir
+
+* Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-6
+- removed BuildArch: noarch to get it to build for each arch
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-5
 - use %%%{_libdir} in %%files to put the nautilus extension in the right place
 



From timlau at fedoraproject.org  Wed Aug 26 12:49:30 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Wed, 26 Aug 2009 12:49:30 +0000 (UTC)
Subject: rpms/postr/F-10 nautilus-ext-dir.patch,NONE,1.1
Message-ID: <20090826124930.E633E11C0082@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31523

Added Files:
	nautilus-ext-dir.patch 
Log Message:
fix build on multi archs

nautilus-ext-dir.patch:
 setup.py |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE nautilus-ext-dir.patch ---
--- postr-0.12.3/setup.py	2008-12-19 15:51:01.000000000 +0100
+++ postr-0.12.3.new/setup.py	2009-08-25 15:44:58.123732748 +0200
@@ -1,9 +1,30 @@
 #!/usr/bin/env python
 
+import os
 from distutils.core import setup
+from distutils.command.install_data import install_data
 from glob import glob
 from src.version import __version__
 
+
+class InstallData(install_data):
+    def run(self):
+        self.data_files.extend(self._nautilus_plugin())
+        install_data.run(self)
+    
+    def _nautilus_plugin(self):
+        files = []
+        cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
+        res = cmd.readline().strip()
+        ret = cmd.close()
+            
+        if ret is None:
+           dest = res[5:]
+           files.append((dest, ['nautilus/postrExtension.py']))
+        
+        return files
+
+
 setup(name='Postr',
       version=__version__,
       description='Flickr Uploader',
@@ -21,10 +42,7 @@
                   ('share/icons/hicolor/24x24/apps', glob('data/24x24/*.png')),
                   ('share/icons/hicolor/32x32/apps', glob('data/32x32/*.png')),
                   ('share/icons/hicolor/scalable/apps', glob('data/scalable/*.svg')),
-                  # TODO: inspect nautilus-python.pc to get path
-                  ('lib/nautilus/extensions-1.0/python', ['nautilus/postrExtension.py']),
-                  ('lib/nautilus/extensions-2.0/python', ['nautilus/postrExtension.py']),
-                  ],
+                  ], cmdclass={'install_data': InstallData}
       
       )
 



From tmraz at fedoraproject.org  Wed Aug 26 12:52:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 12:52:37 +0000 (UTC)
Subject: rpms/tomcat-native/devel tomcat-native-1.1.16-openssl.patch, NONE, 
	1.1 tomcat-native.spec, 1.16, 1.17
Message-ID: <20090826125237.C9B8F11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32211

Modified Files:
	tomcat-native.spec 
Added Files:
	tomcat-native-1.1.16-openssl.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-5
- rebuilt with new openssl


tomcat-native-1.1.16-openssl.patch:
 sslutils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tomcat-native-1.1.16-openssl.patch ---
diff -up tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslutils.c
--- tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl	2006-11-25 11:22:33.000000000 +0100
+++ tomcat-native-1.1.16-src/jni/native/src/sslutils.c	2009-08-26 14:50:58.000000000 +0200
@@ -424,7 +424,7 @@ int SSL_CTX_use_certificate_chain(SSL_CT
     X509 *x509;
     unsigned long err;
     int n;
-    STACK *extra_certs;
+    STACK_OF(X509) *extra_certs;
 
     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
         return -1;
@@ -443,7 +443,7 @@ int SSL_CTX_use_certificate_chain(SSL_CT
     /* free a perhaps already configured extra chain */
     extra_certs = SSL_CTX_get_extra_certs(ctx);
     if (extra_certs != NULL) {
-        sk_X509_pop_free((STACK_OF(X509) *)extra_certs, X509_free);
+        sk_X509_pop_free(extra_certs, X509_free);
         SSL_CTX_set_extra_certs(ctx,NULL);
     }
     /* create new extra chain by loading the certs */


Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tomcat-native.spec	21 Aug 2009 16:11:41 -0000	1.16
+++ tomcat-native.spec	26 Aug 2009 12:52:37 -0000	1.17
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-5
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-5
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16-4



From ixs at fedoraproject.org  Wed Aug 26 12:58:49 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 26 Aug 2009 12:58:49 +0000 (UTC)
Subject: rpms/ladvd/devel .cvsignore, 1.2, 1.3 ladvd.spec, 1.4, 1.5 sources, 
	1.2, 1.3
Message-ID: <20090826125849.EDE9D11C0082@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1571

Modified Files:
	.cvsignore ladvd.spec sources 
Log Message:
* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
- Rebase to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Oct 2008 07:00:43 -0000	1.2
+++ .cvsignore	26 Aug 2009 12:58:49 -0000	1.3
@@ -1 +1 @@
-ladvd-0.6.1.tar.gz
+ladvd-0.8.tar.gz


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/devel/ladvd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ladvd.spec	25 Jul 2009 04:55:38 -0000	1.4
+++ ladvd.spec	26 Aug 2009 12:58:49 -0000	1.5
@@ -8,8 +8,8 @@
 %define modulename ladvd
 
 Name:           ladvd
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        CDP/LLDP sender for unix
 
 Group:          Applications/Internet
@@ -21,7 +21,6 @@ Source2:        ladvd.init
 Source3:        %{modulename}.te
 Source4:        %{modulename}.fc
 Source5:        %{modulename}.if
-Patch0:         ladvd-0.6.1-bonding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %bcond_without  fedora
@@ -62,7 +61,6 @@ SELinux policy module supporting %{name}
 
 %prep
 %setup -q
-%patch0 -p0 -b .bonding
 mkdir SELinux
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
 
@@ -165,6 +163,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
+- Rebase to new upstream release
+
 * Fri Jul 24 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/ladvd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Oct 2008 07:00:43 -0000	1.2
+++ sources	26 Aug 2009 12:58:49 -0000	1.3
@@ -1 +1 @@
-90989dec5200d6cab48dc7a6cff3cbe6  ladvd-0.6.1.tar.gz
+9a80b45ac830faf0151d23623aed5494  ladvd-0.8.tar.gz



From ixs at fedoraproject.org  Wed Aug 26 13:02:05 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 26 Aug 2009 13:02:05 +0000 (UTC)
Subject: rpms/ladvd/EL-5 .cvsignore, 1.2, 1.3 ladvd.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090826130205.6765D11C0082@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2200

Modified Files:
	.cvsignore ladvd.spec sources 
Log Message:
* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
- Rebase to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Oct 2008 07:00:43 -0000	1.2
+++ .cvsignore	26 Aug 2009 13:02:05 -0000	1.3
@@ -1 +1 @@
-ladvd-0.6.1.tar.gz
+ladvd-0.8.tar.gz


Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-5/ladvd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ladvd.spec	29 Oct 2008 07:03:07 -0000	1.2
+++ ladvd.spec	26 Aug 2009 13:02:05 -0000	1.3
@@ -8,8 +8,8 @@
 %define modulename ladvd
 
 Name:           ladvd
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        CDP/LLDP sender for unix
 
 Group:          Applications/Internet
@@ -21,7 +21,6 @@ Source2:        ladvd.init
 Source3:        %{modulename}.te
 Source4:        %{modulename}.fc
 Source5:        %{modulename}.if
-Patch0:         ladvd-0.6.1-bonding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %bcond_without  fedora
@@ -62,7 +61,6 @@ SELinux policy module supporting %{name}
 
 %prep
 %setup -q
-%patch0 -p0 -b .bonding
 mkdir SELinux
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
 
@@ -165,6 +163,15 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
+- Rebase to new upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Oct 18 2008 Andreas Thienemann <andreas at bawue.net> 0.6.1-2
 - Added SElinux support package
 - Added patch to make it build on EL-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Oct 2008 07:00:43 -0000	1.2
+++ sources	26 Aug 2009 13:02:05 -0000	1.3
@@ -1 +1 @@
-90989dec5200d6cab48dc7a6cff3cbe6  ladvd-0.6.1.tar.gz
+9a80b45ac830faf0151d23623aed5494  ladvd-0.8.tar.gz



From ixs at fedoraproject.org  Wed Aug 26 13:05:22 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 26 Aug 2009 13:05:22 +0000 (UTC)
Subject: rpms/ladvd/devel ladvd.spec,1.5,1.6
Message-ID: <20090826130522.486D811C0082@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2736

Modified Files:
	ladvd.spec 
Log Message:
* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
- Rebase to new upstream release



Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/devel/ladvd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ladvd.spec	26 Aug 2009 12:58:49 -0000	1.5
+++ ladvd.spec	26 Aug 2009 13:05:22 -0000	1.6
@@ -23,6 +23,8 @@ Source4:        %{modulename}.fc
 Source5:        %{modulename}.if
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libevent-devel
+
 %bcond_without  fedora
 BuildRequires:  fedora-usermgmt-devel
 %{?FE_USERADD_REQ}



From nphilipp at fedoraproject.org  Wed Aug 26 13:06:15 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 26 Aug 2009 13:06:15 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.98, 1.99 sources, 1.108,
	1.109 system-config-date.spec, 1.116, 1.117
Message-ID: <20090826130615.02BBF11C0082@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-serv3004

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.40



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	9 Jul 2009 09:07:01 -0000	1.98
+++ .cvsignore	26 Aug 2009 13:06:14 -0000	1.99
@@ -1 +1 @@
-system-config-date-1.9.39.tar.bz2
+system-config-date-1.9.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- sources	9 Jul 2009 09:07:01 -0000	1.108
+++ sources	26 Aug 2009 13:06:14 -0000	1.109
@@ -1 +1 @@
-ddccfc0fbf3f50288ae22c837dfcb1a5  system-config-date-1.9.39.tar.bz2
+c4c0eb10374531af2a4193192e36acd6  system-config-date-1.9.40.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- system-config-date.spec	27 Jul 2009 05:21:51 -0000	1.116
+++ system-config-date.spec	26 Aug 2009 13:06:14 -0000	1.117
@@ -14,8 +14,8 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.39
-Release: 2%{?dist}
+Version: 1.9.40
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
@@ -26,8 +26,11 @@ Obsoletes: timetool < 3.0
 Obsoletes: dateconfig < 1.2
 Obsoletes: timeconfig < 3.2.10
 Obsoletes: redhat-config-date < 1.5.26
+# Until version 1.9.34, system-config-date contained online documentation.
+# From version 1.9.35 on, online documentation is split off into its own
+# package system-config-date-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-date < 1.9.35
-Conflicts: system-config-date < 1.9.35
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -121,8 +124,15 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.39-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.40-1
+- explain obsoleting old versions
+
+* Wed Jul 29 2009 Nils Philippsen <nils at redhat.com>
+- improve manual and NTP settings (#507619)
+- improve frames and expander (#507623)
+- display current date and time always
+- fix explanation labels on "Date and Time" page
+- fix non-zero page size deprecation warnings
 
 * Thu Jul 09 2009 Nils Philippsen <nils at redhat.com> - 1.9.39-1
 - use POOL_NTP_ORG_VENDOR in Makefile to set default NTP servers (#510309)



From caolanm at fedoraproject.org  Wed Aug 26 13:11:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 26 Aug 2009 13:11:57 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.vcl102.patch, NONE,
	1.1 openoffice.org.spec, 1.1929, 1.1930
Message-ID: <20090826131157.601A311C0082@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-serv3997/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl102.patch 
Log Message:
backport workspace.vcl102.patch to fix xdg support

workspace.vcl102.patch:
 gconflayer.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

--- NEW FILE workspace.vcl102.patch ---
fix setting default working directory using xdg-user-dirs tool (#101461)

Reading default working directory using xdg variables was working only
if ~/Documents exists, patch from #75329 is incomplete and missed to
migrate the gconflayer code to xdg in isDependencySatisfied().

Signed-off-by: Olivier Blin <blino at mandriva.com>

--- shell/source/backends/gconfbe/gconflayer.cxx.~1.15.~	2008-04-11 09:56:13.000000000 +0200
+++ shell/source/backends/gconfbe/gconflayer.cxx	2009-04-30 17:39:41.000000000 +0200
@@ -396,16 +396,11 @@
 
         case SETTING_WORK_DIRECTORY:
         {
-            osl::Security aSecurity;
-            rtl::OUString aDocumentsDirURL;
-            if ( aSecurity.getHomeDir( aDocumentsDirURL ) )
-            {
-                aDocumentsDirURL += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Documents" ) );
-                osl::Directory aDocumentsDir( aDocumentsDirURL );
+            rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+            osl::Directory aDocumentsDir( aDocumentsDirURL );
 
-                if( osl::FileBase::E_None == aDocumentsDir.open() )
-                    return sal_True;
-            }
+            if( osl::FileBase::E_None == aDocumentsDir.open() )
+                return sal_True;
         }
             break;
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1929
retrieving revision 1.1930
diff -u -p -r1.1929 -r1.1930
--- openoffice.org.spec	21 Aug 2009 05:13:39 -0000	1.1929
+++ openoffice.org.spec	26 Aug 2009 13:11:56 -0000	1.1930
@@ -154,6 +154,7 @@ Patch78: workspace.os132.patch
 Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 Patch81: workspace.os131.patch
+Patch82: workspace.vcl102.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1666,6 +1667,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch79 -p0 -b .ooo104306.moverecentlyused.patch
 %patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 %patch81 -p0 -b .workspace.os131.patch
+%patch82 -p0 -b .workspace.vcl102.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4168,7 +4170,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Aug 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+* Wed Aug 26 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
 - Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
 - add workspace.os132.patch to avoid switch html view overwrite horror
 - Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch



From caolanm at fedoraproject.org  Wed Aug 26 13:11:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 26 Aug 2009 13:11:57 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl102.patch, NONE,
	1.1 openoffice.org.spec, 1.1994, 1.1995
Message-ID: <20090826131157.E045211C0082@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3997/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl102.patch 
Log Message:
backport workspace.vcl102.patch to fix xdg support

workspace.vcl102.patch:
 gconflayer.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

--- NEW FILE workspace.vcl102.patch ---
fix setting default working directory using xdg-user-dirs tool (#101461)

Reading default working directory using xdg variables was working only
if ~/Documents exists, patch from #75329 is incomplete and missed to
migrate the gconflayer code to xdg in isDependencySatisfied().

Signed-off-by: Olivier Blin <blino at mandriva.com>

--- shell/source/backends/gconfbe/gconflayer.cxx.~1.15.~	2008-04-11 09:56:13.000000000 +0200
+++ shell/source/backends/gconfbe/gconflayer.cxx	2009-04-30 17:39:41.000000000 +0200
@@ -396,16 +396,11 @@
 
         case SETTING_WORK_DIRECTORY:
         {
-            osl::Security aSecurity;
-            rtl::OUString aDocumentsDirURL;
-            if ( aSecurity.getHomeDir( aDocumentsDirURL ) )
-            {
-                aDocumentsDirURL += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Documents" ) );
-                osl::Directory aDocumentsDir( aDocumentsDirURL );
+            rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+            osl::Directory aDocumentsDir( aDocumentsDirURL );
 
-                if( osl::FileBase::E_None == aDocumentsDir.open() )
-                    return sal_True;
-            }
+            if( osl::FileBase::E_None == aDocumentsDir.open() )
+                return sal_True;
         }
             break;
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -p -r1.1994 -r1.1995
--- openoffice.org.spec	26 Aug 2009 11:11:18 -0000	1.1994
+++ openoffice.org.spec	26 Aug 2009 13:11:57 -0000	1.1995
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%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}
@@ -156,6 +156,7 @@ 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
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1697,6 +1698,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %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
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4206,6 +4208,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Aug 26 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
+- backport workspace.vcl102.patch to fix xdg support
+
 * Mon Aug 24 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.2
 - hyphen-as require
 - add workspace.cmcfixes62.patch for 64bit odbc goodness and rebuild



From tuxbrewr at fedoraproject.org  Wed Aug 26 13:14:34 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 13:14:34 +0000 (UTC)
Subject: rpms/sugar-write/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-write.spec, 1.7, 1.8
Message-ID: <20090826131434.387B211C0082@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4431

Modified Files:
	.cvsignore sources sugar-write.spec 
Log Message:
New release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Mar 2009 21:32:29 -0000	1.5
+++ .cvsignore	26 Aug 2009 13:14:33 -0000	1.6
@@ -1 +1 @@
-Write-63.tar.bz2
+Write-66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Mar 2009 21:32:29 -0000	1.5
+++ sources	26 Aug 2009 13:14:33 -0000	1.6
@@ -1 +1 @@
-fa0fa4984dd2ea8a6842746cbe76b285  Write-63.tar.bz2
+6315e47fa04736e8ba6e29ee89eedc30  Write-66.tar.bz2


Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sugar-write.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sugar-write.spec	27 Jul 2009 05:06:14 -0000	1.7
+++ sugar-write.spec	26 Aug 2009 13:14:33 -0000	1.8
@@ -1,10 +1,10 @@
 Name: sugar-write
-Version: 63
-Release: 2%{?dist}
+Version: 66
+Release: 1%{?dist}
 Summary: Word processor for Sugar
 Group: Sugar/Activities
 License: GPLv2+
-URL: http://wiki.laptop.org/go/Write
+URL: http://wiki.sugarlabs.org/go/Activities/Write
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 66-1
+- New release 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 63-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ixs at fedoraproject.org  Wed Aug 26 13:24:42 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 26 Aug 2009 13:24:42 +0000 (UTC)
Subject: rpms/ladvd/devel ladvd.spec,1.6,1.7
Message-ID: <20090826132442.C26F011C0082@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6069

Modified Files:
	ladvd.spec 
Log Message:
* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
- Rebase to new upstream release



Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/devel/ladvd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ladvd.spec	26 Aug 2009 13:05:22 -0000	1.6
+++ ladvd.spec	26 Aug 2009 13:24:41 -0000	1.7
@@ -151,7 +151,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc doc/ChangeLog doc/README LICENSE TODO
+%doc doc/ChangeLog doc/README doc/LICENSE doc/TODO
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/ladvd



From tuxbrewr at fedoraproject.org  Wed Aug 26 13:30:55 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 13:30:55 +0000 (UTC)
Subject: rpms/sugar-write/F-11 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-write.spec, 1.6, 1.7
Message-ID: <20090826133055.6FA3611C0082@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/sugar-write/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7811

Modified Files:
	.cvsignore sources sugar-write.spec 
Log Message:
New release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Mar 2009 21:32:29 -0000	1.5
+++ .cvsignore	26 Aug 2009 13:30:55 -0000	1.6
@@ -1 +1 @@
-Write-63.tar.bz2
+Write-66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Mar 2009 21:32:29 -0000	1.5
+++ sources	26 Aug 2009 13:30:55 -0000	1.6
@@ -1 +1 @@
-fa0fa4984dd2ea8a6842746cbe76b285  Write-63.tar.bz2
+6315e47fa04736e8ba6e29ee89eedc30  Write-66.tar.bz2


Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-11/sugar-write.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sugar-write.spec	3 Mar 2009 21:32:29 -0000	1.6
+++ sugar-write.spec	26 Aug 2009 13:30:55 -0000	1.7
@@ -1,10 +1,10 @@
 Name: sugar-write
-Version: 63
+Version: 66
 Release: 1%{?dist}
 Summary: Word processor for Sugar
 Group: Sugar/Activities
 License: GPLv2+
-URL: http://wiki.laptop.org/go/Write
+URL: http://wiki.sugarlabs.org/go/Activities/Write
 Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 66-1
+- New release
+
 * Tue Mar 03 2009 Simon Schampijer <simon at schampijer.de> - 63-1
 - Update to API change, render_page_to_image starts now with 1 #152
 - Override get_preview #152



From ixs at fedoraproject.org  Wed Aug 26 13:36:15 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 26 Aug 2009 13:36:15 +0000 (UTC)
Subject: rpms/ladvd/EL-5 ladvd.spec,1.3,1.4
Message-ID: <20090826133615.1B18F11C0082@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/ladvd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8980

Modified Files:
	ladvd.spec 
Log Message:
* Wed Aug 26 2009 Andreas Thienemann <andreas at bawue.net> - 0.8-1
- Rebase to new upstream release



Index: ladvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladvd/EL-5/ladvd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ladvd.spec	26 Aug 2009 13:02:05 -0000	1.3
+++ ladvd.spec	26 Aug 2009 13:36:14 -0000	1.4
@@ -23,6 +23,8 @@ Source4:        %{modulename}.fc
 Source5:        %{modulename}.if
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libevent-devel
+
 %bcond_without  fedora
 BuildRequires:  fedora-usermgmt-devel
 %{?FE_USERADD_REQ}
@@ -149,7 +151,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc doc/ChangeLog doc/README LICENSE TODO
+%doc doc/ChangeLog doc/README doc/LICENSE doc/TODO
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/ladvd



From orion at fedoraproject.org  Wed Aug 26 13:48:32 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 26 Aug 2009 13:48:32 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.38,1.39
Message-ID: <20090826134832.F369811C0082@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11682

Modified Files:
	paraview.spec 
Log Message:
* Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
- Disable building various View plugins, need OverView



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- paraview.spec	25 Aug 2009 23:03:32 -0000	1.38
+++ paraview.spec	26 Aug 2009 13:48:32 -0000	1.39
@@ -64,9 +64,15 @@ Provides:       paraview-demos = %{versi
 # This is still an alpha feature and does not install properly -
 #  libOverViewCora.so is not installed
 #	-DPARAVIEW_BUILD_OverView:BOOL=ON 
-# GeoView/GeoView2D require OverView
+# These require OverView
 #	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON
 #	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON
 %define paraview_cmake_options \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
         -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
@@ -75,11 +81,6 @@ Provides:       paraview-demos = %{versi
 	-DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\
@@ -94,7 +95,6 @@ Provides:       paraview-demos = %{versi
 	-DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF \\\
         -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \\\
@@ -386,8 +386,8 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
-* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
-- Disable building GeoView/GeoView2D, need OverView
+* Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
+- Disable building various View plugins, need OverView
 
 * Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
 - Disable building OverView - not ready yet



From nphilipp at fedoraproject.org  Wed Aug 26 13:57:05 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 26 Aug 2009 13:57:05 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.99, 1.100 sources, 1.109,
	1.110 system-config-date.spec, 1.117, 1.118
Message-ID: <20090826135705.B323B11C0082@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-serv14226

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.41



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore	26 Aug 2009 13:06:14 -0000	1.99
+++ .cvsignore	26 Aug 2009 13:57:05 -0000	1.100
@@ -1 +1 @@
-system-config-date-1.9.40.tar.bz2
+system-config-date-1.9.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- sources	26 Aug 2009 13:06:14 -0000	1.109
+++ sources	26 Aug 2009 13:57:05 -0000	1.110
@@ -1 +1 @@
-c4c0eb10374531af2a4193192e36acd6  system-config-date-1.9.40.tar.bz2
+9558eea0e430335906335e5a7124cbe0  system-config-date-1.9.41.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- system-config-date.spec	26 Aug 2009 13:06:14 -0000	1.117
+++ system-config-date.spec	26 Aug 2009 13:57:05 -0000	1.118
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.40
+Version: 1.9.41
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -47,7 +47,6 @@ Requires: usermode-gtk >= 1.94
 Requires: usermode-gtk >= 1.36
 %endif
 Requires: chkconfig
-Requires: rhpl
 %if 0%{?with_newt_python:1}
 Requires: newt-python
 %else
@@ -124,6 +123,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.41-1
+- use gettext instead of rhpl
+
 * Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.40-1
 - explain obsoleting old versions
 



From ajax at fedoraproject.org  Wed Aug 26 13:58:24 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 26 Aug 2009 13:58:24 +0000 (UTC)
Subject: rpms/kernel/devel drm-intel-next.patch, 1.9, 1.10 kernel.spec,
	1.1739, 1.1740
Message-ID: <20090826135824.6ADD311C0082@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14572

Modified Files:
	drm-intel-next.patch kernel.spec 
Log Message:
* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com>
- drm-intel-next.patch: Update, various output setup fixes.


drm-intel-next.patch:
 intel_crt.c     |    4 +++
 intel_display.c |   71 +++++++++++---------------------------------------------
 intel_dp.c      |   12 +++++++++
 intel_drv.h     |   20 +++++++++++++++
 intel_dvo.c     |    6 ++++
 intel_hdmi.c    |   18 +++++++++-----
 intel_lvds.c    |    2 +
 intel_sdvo.c    |   13 +++++++++-
 intel_tv.c      |    2 +
 9 files changed, 85 insertions(+), 63 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.9 -r 1.10 drm-intel-next.patchIndex: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- drm-intel-next.patch	12 Aug 2009 15:58:25 -0000	1.9
+++ drm-intel-next.patch	26 Aug 2009 13:58:24 -0000	1.10
@@ -1,2653 +1,362 @@
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 8c47831..50d1f78 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1186,6 +1186,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 	if (ret)
- 		goto out_iomapfree;
- 
-+	dev_priv->wq = create_workqueue("i915");
-+	if (dev_priv->wq == NULL) {
-+		DRM_ERROR("Failed to create our workqueue.\n");
-+		ret = -ENOMEM;
-+		goto out_iomapfree;
-+	}
-+
- 	/* enable GEM by default */
- 	dev_priv->has_gem = 1;
- 
-@@ -1211,7 +1218,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 	if (!I915_NEED_GFX_HWS(dev)) {
- 		ret = i915_init_phys_hws(dev);
- 		if (ret != 0)
--			goto out_iomapfree;
-+			goto out_workqueue_free;
- 	}
- 
- 	i915_get_mem_freq(dev);
-@@ -1245,7 +1252,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 		ret = i915_load_modeset_init(dev, prealloc_size, agp_size);
- 		if (ret < 0) {
- 			DRM_ERROR("failed to init modeset\n");
--			goto out_rmmap;
-+			goto out_workqueue_free;
- 		}
- 	}
- 
-@@ -1256,6 +1263,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 
- 	return 0;
- 
-+out_workqueue_free:
-+	destroy_workqueue(dev_priv->wq);
- out_iomapfree:
- 	io_mapping_free(dev_priv->mm.gtt_mapping);
- out_rmmap:
-@@ -1269,6 +1278,8 @@ int i915_driver_unload(struct drm_device *dev)
- {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
- 
-+	destroy_workqueue(dev_priv->wq);
-+
- 	io_mapping_free(dev_priv->mm.gtt_mapping);
- 	if (dev_priv->mm.gtt_mtrr >= 0) {
- 		mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d087528..7537f57 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -219,6 +219,7 @@ typedef struct drm_i915_private {
- 	unsigned int lvds_vbt:1;
- 	unsigned int int_crt_support:1;
- 	unsigned int lvds_use_ssc:1;
-+	unsigned int edp_support:1;
- 	int lvds_ssc_freq;
- 
- 	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
-@@ -229,6 +230,8 @@ typedef struct drm_i915_private {
- 
- 	spinlock_t error_lock;
- 	struct drm_i915_error_state *first_error;
-+	struct work_struct error_work;
-+	struct workqueue_struct *wq;
- 
- 	/* Register state */
- 	u8 saveLBB;
-@@ -888,6 +891,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
- 						      IS_I915GM(dev)))
- #define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
- #define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
-+#define SUPPORTS_EDP(dev)		(IS_IGDNG_M(dev))
- #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev))
- /* dsparb controlled by hw only */
- #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 5bf4203..140bee1 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1570,7 +1570,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
- 	}
- 
- 	if (was_empty && !dev_priv->mm.suspended)
--		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
-+		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
- 	return seqno;
- }
- 
-@@ -1719,7 +1719,7 @@ i915_gem_retire_work_handler(struct work_struct *work)
- 	i915_gem_retire_requests(dev);
- 	if (!dev_priv->mm.suspended &&
- 	    !list_empty(&dev_priv->mm.request_list))
--		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
-+		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
- 	mutex_unlock(&dev->struct_mutex);
- }
- 
-diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
-index 9a44bfc..cb3b974 100644
---- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
-+++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
-@@ -343,6 +343,8 @@ static int i915_error_state(struct seq_file *m, void *unused)
- 
- 	error = dev_priv->first_error;
- 
-+	seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
-+		   error->time.tv_usec);
- 	seq_printf(m, "EIR: 0x%08x\n", error->eir);
- 	seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
- 	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ba23a6..83aee80 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -290,6 +290,35 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
- 	return ret;
- }
- 
-+/**
-+ * i915_error_work_func - do process context error handling work
-+ * @work: work struct
-+ *
-+ * Fire an error uevent so userspace can see that a hang or error
-+ * was detected.
-+ */
-+static void i915_error_work_func(struct work_struct *work)
-+{
-+	drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
-+						    error_work);
-+	struct drm_device *dev = dev_priv->dev;
-+	char *event_string = "ERROR=1";
-+	char *envp[] = { event_string, NULL };
-+
-+	DRM_DEBUG("generating error event\n");
-+
-+	kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, envp);
-+}
-+
-+/**
-+ * i915_capture_error_state - capture an error record for later analysis
-+ * @dev: drm device
-+ *
-+ * Should be called when an error is detected (either a hang or an error
-+ * interrupt) to capture error state from the time of the error.  Fills
-+ * out a structure which becomes available in debugfs for user level tools
-+ * to pick up.
-+ */
- static void i915_capture_error_state(struct drm_device *dev)
- {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -325,12 +354,137 @@ static void i915_capture_error_state(struct drm_device *dev)
- 		error->acthd = I915_READ(ACTHD_I965);
- 	}
- 
-+	do_gettimeofday(&error->time);
-+
- 	dev_priv->first_error = error;
- 
- out:
- 	spin_unlock_irqrestore(&dev_priv->error_lock, flags);
- }
- 
-+/**
-+ * i915_handle_error - handle an error interrupt
-+ * @dev: drm device
-+ *
-+ * Do some basic checking of regsiter state at error interrupt time and
-+ * dump it to the syslog.  Also call i915_capture_error_state() to make
-+ * sure we get a record and make it available in debugfs.  Fire a uevent
-+ * so userspace knows something bad happened (should trigger collection
-+ * of a ring dump etc.).
-+ */
-+static void i915_handle_error(struct drm_device *dev)
-+{
-+	struct drm_i915_private *dev_priv = dev->dev_private;
-+	u32 eir = I915_READ(EIR);
-+	u32 pipea_stats = I915_READ(PIPEASTAT);
-+	u32 pipeb_stats = I915_READ(PIPEBSTAT);
-+
-+	i915_capture_error_state(dev);
-+
-+	printk(KERN_ERR "render error detected, EIR: 0x%08x\n",
-+	       eir);
[...2568 lines suppressed...]
-+
-+		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
-+		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
-+		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
-+		sdvo_priv->is_lvds = true;
-+	} else {
-+
-+		unsigned char bytes[2];
-+
-+		sdvo_priv->controlled_output = 0;
-+		memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
-+		DRM_DEBUG_KMS(I915_SDVO,
-+				"%s: Unknown SDVO output type (0x%02x%02x)\n",
-+				  SDVO_NAME(sdvo_priv),
-+				  bytes[0], bytes[1]);
-+		ret = false;
-+	}
-+
-+	if (ret && registered)
-+		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
-+
-+
-+	return ret;
-+
-+}
-+
- bool intel_sdvo_init(struct drm_device *dev, int output_device)
- {
- 	struct drm_connector *connector;
- 	struct intel_output *intel_output;
- 	struct intel_sdvo_priv *sdvo_priv;
- 
--	int connector_type;
- 	u8 ch[0x40];
- 	int i;
--	int encoder_type;
+ 		unsigned char bytes[2];
+@@ -2009,6 +2019,7 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
+ 				  bytes[0], bytes[1]);
+ 		ret = false;
+ 	}
++	intel_output->crtc_mask = (1 << 0) | (1 << 1);
  
- 	intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL);
+ 	if (ret && registered)
+ 		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
+diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
+index da4ab4d..2fbe13a 100644
+--- a/drivers/gpu/drm/i915/intel_tv.c
++++ b/drivers/gpu/drm/i915/intel_tv.c
+@@ -1718,6 +1718,7 @@ intel_tv_init(struct drm_device *dev)
  	if (!intel_output) {
-@@ -1925,88 +2075,28 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
- 	intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo;
- 
- 	/* In defaut case sdvo lvds is false */
--	sdvo_priv->is_lvds = false;
- 	intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);
- 
--	if (sdvo_priv->caps.output_flags &
--	    (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)) {
--		if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0)
--			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS0;
--		else
--			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS1;
--
--		encoder_type = DRM_MODE_ENCODER_TMDS;
--		connector_type = DRM_MODE_CONNECTOR_DVID;
--
--		if (intel_sdvo_get_supp_encode(intel_output,
--					       &sdvo_priv->encode) &&
--		    intel_sdvo_get_digital_encoding_mode(intel_output) &&
--		    sdvo_priv->is_hdmi) {
--			/* enable hdmi encoding mode if supported */
--			intel_sdvo_set_encode(intel_output, SDVO_ENCODE_HDMI);
--			intel_sdvo_set_colorimetry(intel_output,
--						   SDVO_COLORIMETRY_RGB256);
--			connector_type = DRM_MODE_CONNECTOR_HDMIA;
--		}
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_SVID0)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
--		encoder_type = DRM_MODE_ENCODER_TVDAC;
--		connector_type = DRM_MODE_CONNECTOR_SVIDEO;
--		sdvo_priv->is_tv = true;
--		intel_output->needs_tv_clock = true;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
--		encoder_type = DRM_MODE_ENCODER_DAC;
--		connector_type = DRM_MODE_CONNECTOR_VGA;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
--		encoder_type = DRM_MODE_ENCODER_DAC;
--		connector_type = DRM_MODE_CONNECTOR_VGA;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS0)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
--		encoder_type = DRM_MODE_ENCODER_LVDS;
--		connector_type = DRM_MODE_CONNECTOR_LVDS;
--		sdvo_priv->is_lvds = true;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS1)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
--		encoder_type = DRM_MODE_ENCODER_LVDS;
--		connector_type = DRM_MODE_CONNECTOR_LVDS;
--		sdvo_priv->is_lvds = true;
--	}
--	else
--	{
--		unsigned char bytes[2];
--
--		sdvo_priv->controlled_output = 0;
--		memcpy (bytes, &sdvo_priv->caps.output_flags, 2);
--		DRM_DEBUG_KMS(I915_SDVO,
--				"%s: Unknown SDVO output type (0x%02x%02x)\n",
--				  SDVO_NAME(sdvo_priv),
--				  bytes[0], bytes[1]);
--		encoder_type = DRM_MODE_ENCODER_NONE;
--		connector_type = DRM_MODE_CONNECTOR_Unknown;
-+	if (intel_sdvo_output_setup(intel_output,
-+				    sdvo_priv->caps.output_flags) != true) {
-+		DRM_DEBUG("SDVO output failed to setup on SDVO%c\n",
-+			  output_device == SDVOB ? 'B' : 'C');
- 		goto err_i2c;
+ 		return;
  	}
- 
 +
  	connector = &intel_output->base;
- 	drm_connector_init(dev, connector, &intel_sdvo_connector_funcs,
--			   connector_type);
-+			   connector->connector_type);
-+
- 	drm_connector_helper_add(connector, &intel_sdvo_connector_helper_funcs);
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
- 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
- 
--	drm_encoder_init(dev, &intel_output->enc, &intel_sdvo_enc_funcs, encoder_type);
-+	drm_encoder_init(dev, &intel_output->enc,
-+			&intel_sdvo_enc_funcs, intel_output->enc.encoder_type);
-+
- 	drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
  
+ 	drm_connector_init(dev, connector, &intel_tv_connector_funcs,
+@@ -1729,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
  	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index a43c98e..da4ab4d 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1490,6 +1490,27 @@ static struct input_res {
- 	{"1920x1080", 1920, 1080},
- };
- 
-+/*
-+ * Chose preferred mode  according to line number of TV format
-+ */
-+static void
-+intel_tv_chose_preferred_modes(struct drm_connector *connector,
-+			       struct drm_display_mode *mode_ptr)
-+{
-+	struct intel_output *intel_output = to_intel_output(connector);
-+	const struct tv_mode *tv_mode = intel_tv_mode_find(intel_output);
-+
-+	if (tv_mode->nbr_end < 480 && mode_ptr->vdisplay == 480)
-+		mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
-+	else if (tv_mode->nbr_end > 480) {
-+		if (tv_mode->progressive == true && tv_mode->nbr_end < 720) {
-+			if (mode_ptr->vdisplay == 720)
-+				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
-+		} else if (mode_ptr->vdisplay == 1080)
-+				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
-+	}
-+}
-+
- /**
-  * Stub get_modes function.
-  *
-@@ -1544,6 +1565,7 @@ intel_tv_get_modes(struct drm_connector *connector)
- 		mode_ptr->clock = (int) tmp;
- 
- 		mode_ptr->type = DRM_MODE_TYPE_DRIVER;
-+		intel_tv_chose_preferred_modes(connector, mode_ptr);
- 		drm_mode_probed_add(connector, mode_ptr);
- 		count++;
- 	}
+ 	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
+ 	intel_output->type = INTEL_OUTPUT_TVOUT;
++	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
+ 	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
+ 	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
+ 	intel_output->dev_priv = tv_priv;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -p -r1.1739 -r1.1740
--- kernel.spec	26 Aug 2009 10:06:27 -0000	1.1739
+++ kernel.spec	26 Aug 2009 13:58:24 -0000	1.1740
@@ -686,7 +686,7 @@ Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-12
+# anholt's tree as of 2009-08-26
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
@@ -1320,7 +1320,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-#ApplyPatch drm-intel-next.patch
+ApplyPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -2015,6 +2015,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com>
+- drm-intel-next.patch: Update, various output setup fixes.
+
 * Wed Aug 26 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Make WiMAX modular (#512070)
 



From jreznik at fedoraproject.org  Wed Aug 26 14:01:01 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:01:01 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/devel .cvsignore, 1.6,
	1.7 leonidas-kde-theme.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090826140101.C34EB11C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15077

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 11.0.3-1
- fix ksplash background on dual head (bz#519392)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 15:35:30 -0000	1.6
+++ .cvsignore	26 Aug 2009 14:01:01 -0000	1.7
@@ -1 +1 @@
-leonidas-kde-theme-11.0.2.tar.bz2
+leonidas-kde-theme-11.0.3.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/leonidas-kde-theme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- leonidas-kde-theme.spec	4 Aug 2009 15:35:30 -0000	1.6
+++ leonidas-kde-theme.spec	26 Aug 2009 14:01:01 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		leonidas-kde-theme
-Version:	11.0.2
+Version:	11.0.3
 Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
@@ -206,6 +206,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 11.0.3-1
+- fix ksplash background on dual head (bz#519392)
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 11.0.2-1
 - fixup theme metadata for KDE-4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Aug 2009 15:35:30 -0000	1.6
+++ sources	26 Aug 2009 14:01:01 -0000	1.7
@@ -1 +1 @@
-89951f5493403c46e820f0a500758927  leonidas-kde-theme-11.0.2.tar.bz2
+b000fdd9080bfe87535e735dbc1b5edc  leonidas-kde-theme-11.0.3.tar.bz2



From dwalsh at fedoraproject.org  Wed Aug 26 14:02:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 14:02:27 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.62,
	1.63 selinux-policy.spec, 1.904, 1.905
Message-ID: <20090826140227.C5A0211C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15407

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-8
- Add back in unconfined.pp and unconfineduser.pp


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   17 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.if                 |    5 
 policy/modules/admin/usermanage.te                 |   30 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cdrecord.te                    |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.if                  |    1 
 policy/modules/apps/pulseaudio.te                  |   17 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  143 ++
 policy/modules/apps/sandbox.te                     |  274 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   59 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   23 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  173 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/storage.fc                   |    1 
 policy/modules/kernel/storage.if                   |    2 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   36 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  392 ++++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/afs.fc                     |    1 
 policy/modules/services/afs.te                     |    1 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++--
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   49 
 policy/modules/services/policykit.te               |   60 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 policy/modules/services/postgresql.fc              |    1 
 policy/modules/services/postgresql.if              |   43 
 policy/modules/services/postgresql.te              |    7 
 policy/modules/services/ppp.if                     |    6 
 policy/modules/services/ppp.te                     |   12 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   83 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  183 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 +++-
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 +++++++-
 policy/modules/services/xserver.te                 |  306 +++-
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  268 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   27 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.if                      |   21 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1370 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 338 files changed, 14572 insertions(+), 2988 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- policy-F12.patch	26 Aug 2009 12:12:38 -0000	1.62
+++ policy-F12.patch	26 Aug 2009 14:02:26 -0000	1.63
@@ -692,10 +692,11 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.28/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/admin/rpm.fc	2009-08-21 18:56:06.000000000 -0400
-@@ -1,17 +1,16 @@
++++ serefpolicy-3.6.28/policy/modules/admin/rpm.fc	2009-08-26 08:40:46.000000000 -0400
+@@ -1,17 +1,17 @@
  
  /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)
 +/usr/bin/debuginfo-install      --      gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/bin/smart 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
@@ -715,7 +716,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  
  ifdef(`distro_redhat', `
-@@ -21,15 +20,22 @@
+@@ -21,15 +21,22 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -7084,8 +7085,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.28/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.fc	2009-08-21 18:56:07.000000000 -0400
-@@ -0,0 +1,37 @@
++++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.fc	2009-08-26 08:51:41.000000000 -0400
+@@ -0,0 +1,36 @@
 +# 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)
@@ -7122,7 +7123,6 @@ diff -b -B --ignore-all-space --exclude-
 +/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.28/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.28/policy/modules/roles/unconfineduser.if	2009-08-21 18:56:07.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -p -r1.904 -r1.905
--- selinux-policy.spec	26 Aug 2009 12:12:39 -0000	1.904
+++ selinux-policy.spec	26 Aug 2009 14:02:27 -0000	1.905
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -97,7 +97,7 @@ cp -f $RPM_SOURCE_DIR/modules-%1.conf  .
 cp -f $RPM_SOURCE_DIR/booleans-%1.conf ./policy/booleans.conf \
 
 %define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
-awk '$1 !~ "/^#/" && $1 != "unconfined" && $1 != "unconfineduser" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
 %define installCmds() \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} UBAC=n DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
@@ -310,46 +310,13 @@ SELinux Reference policy targeted base m
 %saveFileContext targeted
 
 %post targeted
-function get_unconfined() {
-# We only want to upgrade unconfined.pp and unconfineduser if they are 
-# currently installed.  If you have a version 3.0.0 or less of unconfined 
-# installed, you will need to install both, since unconfineduser did not exist 
-# prior to this.
-eval `semodule -l | while read package version; do
-	case $package in
-	"unconfineduser")
-	        echo "unconfineduser=$version"
-		;;
-	"unconfined")
-	 	echo "unconfined=$version"
-		;;
-	esac
-done`
-
-if [ -z "$unconfineduser" -a -n "$unconfined" ]; then
-    f1=`echo $unconfined | cut -d. -f 1`
-    if [ $f1 -lt 3 ]; then
-	unconfineduser="1"
-    else
-        if [ $f1 -eq  3 ]; then
-	    f2=`echo $unconfined | cut -s -d. -f2`
-	    f3=`echo $unconfined | cut -s -d. -f3`
-	    if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
-	        unconfineduser="1"
-	    fi
-	fi
-    fi
-fi
-echo ${unconfined:+unconfined.pp.bz2} ${unconfineduser:+unconfineduser.pp.bz2}
-}
-
 if [ $1 -eq 1 ]; then
-   packages="%{expand:%%moduleList targeted} unconfined.pp.bz2 unconfineduser.pp.bz2"
+   packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run 2> /dev/null
 else
    semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit 2>/dev/null
-   packages="%{expand:%%moduleList targeted} `get_unconfined`"
+   packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    %relabel targeted
 fi
@@ -394,8 +361,7 @@ SELinux Reference policy minimum base mo
 %saveFileContext minimum
 
 %post minimum
-packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
-%loadpolicy minimum $packages
+%loadpolicy minimum
 if [ $1 -eq 1 ]; then
 semanage -S minimum -i - << __eof
 login -m  -s unconfined_u -r s0-s0:c0.c1023 __default__
@@ -428,7 +394,7 @@ SELinux Reference policy olpc base modul
 %saveFileContext olpc
 
 %post olpc 
-packages="%{expand:%%moduleList olpc} unconfined.pp.bz2 unconfineduser.pp.bz2"
+packages="%{expand:%%moduleList olpc}"
 %loadpolicy olpc $packages
 
 if [ $1 -ne 1 ]; then
@@ -475,6 +441,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-8
+- Add back in unconfined.pp and unconfineduser.pp
+
 * Tue Aug 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-7
 - Fixes for cdrecord, mdadm, and others
 
@@ -1364,7 +1333,6 @@ directory)
 - Fix Makefile.devel to build mls modules
 - Fix qemu to be more specific on labeling
 
-
 * Tue Feb 26 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-1
 - Update to upstream fixes
 



From jreznik at fedoraproject.org  Wed Aug 26 14:02:28 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:02:28 +0000 (UTC)
Subject: rpms/leonidas-kde-theme/F-11 .cvsignore, 1.9,
	1.10 leonidas-kde-theme.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <20090826140228.C7F1511C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/leonidas-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15390

Modified Files:
	.cvsignore leonidas-kde-theme.spec sources 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 11.0.3-1
- fix ksplash background on dual head (bz#519392)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Aug 2009 15:54:33 -0000	1.9
+++ .cvsignore	26 Aug 2009 14:02:28 -0000	1.10
@@ -1 +1 @@
-leonidas-kde-theme-11.0.2.tar.bz2
+leonidas-kde-theme-11.0.3.tar.bz2


Index: leonidas-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/leonidas-kde-theme.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- leonidas-kde-theme.spec	4 Aug 2009 15:54:33 -0000	1.13
+++ leonidas-kde-theme.spec	26 Aug 2009 14:02:28 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		leonidas-kde-theme
-Version:	11.0.2
+Version:	11.0.3
 Release:	1%{?dist}
 Summary:	Leonidas KDE Theme
 
@@ -206,6 +206,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 11.0.3-1
+- fix ksplash background on dual head (bz#519392)
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> 11.0.2-1
 - fixup theme metadata for KDE-4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/leonidas-kde-theme/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Aug 2009 15:54:33 -0000	1.9
+++ sources	26 Aug 2009 14:02:28 -0000	1.10
@@ -1 +1 @@
-89951f5493403c46e820f0a500758927  leonidas-kde-theme-11.0.2.tar.bz2
+b000fdd9080bfe87535e735dbc1b5edc  leonidas-kde-theme-11.0.3.tar.bz2



From tmraz at fedoraproject.org  Wed Aug 26 14:06:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 14:06:35 +0000 (UTC)
Subject: rpms/virtuoso-opensource/devel
	virtuoso-opensource-5.0.11-openssl.patch, NONE,
	1.1 virtuoso-opensource.spec, 1.2, 1.3
Message-ID: <20090826140635.BBE1211C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16180

Modified Files:
	virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-5.0.11-openssl.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
- rebuilt with new openssl


virtuoso-opensource-5.0.11-openssl.patch:
 Dkernel.c |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 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;
 }
 


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- virtuoso-opensource.spec	21 Aug 2009 16:21:58 -0000	1.2
+++ virtuoso-opensource.spec	26 Aug 2009 14:06:35 -0000	1.3
@@ -8,6 +8,7 @@ Group:   Applications/Databases
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
 Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: automake libtool
@@ -66,6 +67,7 @@ Requires: %{name} = %{version}-%{release
 
 %prep
 %setup -q -n virtuoso-opensource-%{version}
+%patch1 -p1 -b .openssl
 
 
 %build
@@ -139,7 +141,7 @@ rm -rf %{buildroot} 
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
+* 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



From tmraz at fedoraproject.org  Wed Aug 26 14:06:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 14:06:46 +0000 (UTC)
Subject: rpms/ruby/devel ruby-openssl-1.0.patch,1.2,1.3
Message-ID: <20090826140646.2738A11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16275

Modified Files:
	ruby-openssl-1.0.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.369-3
- Rebuild against new openssl


ruby-openssl-1.0.patch:
 ossl.c       |    6 +++---
 ossl_pkcs7.c |   40 ++++++++++++++++++++++++++++++----------
 ossl_ssl.c   |   14 ++++++++++----
 3 files changed, 43 insertions(+), 17 deletions(-)

Index: ruby-openssl-1.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby-openssl-1.0.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ruby-openssl-1.0.patch	26 Aug 2009 10:31:08 -0000	1.2
+++ ruby-openssl-1.0.patch	26 Aug 2009 14:06:45 -0000	1.3
@@ -28,6 +28,102 @@ diff -up ruby-1.8.6.369/ruby-1.8.6-p369/
  	rb_ary_push(ary, ossl_##name##_new(t));	\
      }						\
      return ary;					\
+diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c
+--- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c.ossl10	2007-02-13 00:01:19.000000000 +0100
++++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c	2009-08-26 12:53:05.000000000 +0200
+@@ -543,12 +543,11 @@ ossl_pkcs7_add_certificate(VALUE self, V
+     return self;
+ }
+ 
+-static STACK *
+-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
++static STACK_OF(X509) *
++pkcs7_get_certs(VALUE self)
+ {
+     PKCS7 *pkcs7;
+     STACK_OF(X509) *certs;
+-    STACK_OF(X509_CRL) *crls;
+     int i;
+ 
+     GetPKCS7(self, pkcs7);
+@@ -556,17 +555,38 @@ pkcs7_get_certs_or_crls(VALUE self, int 
+     switch(i){
+     case NID_pkcs7_signed:
+         certs = pkcs7->d.sign->cert;
+-        crls = pkcs7->d.sign->crl;
+         break;
+     case NID_pkcs7_signedAndEnveloped:
+         certs = pkcs7->d.signed_and_enveloped->cert;
++        break;
++    default:
++        certs = NULL;
++    }
++
++    return certs;
++}
++
++static STACK_OF(X509_CRL) *
++pkcs7_get_crls(VALUE self)
++{
++    PKCS7 *pkcs7;
++    STACK_OF(X509_CRL) *crls;
++    int i;
++
++    GetPKCS7(self, pkcs7);
++    i = OBJ_obj2nid(pkcs7->type);
++    switch(i){
++    case NID_pkcs7_signed:
++        crls = pkcs7->d.sign->crl;
++        break;
++    case NID_pkcs7_signedAndEnveloped:
+         crls = pkcs7->d.signed_and_enveloped->crl;
+         break;
+     default:
+-        certs = crls = NULL;
++        crls = NULL;
+     }
+ 
+-    return want_certs ? certs : crls;
++    return crls;
+ }
+ 
+ static VALUE
+@@ -581,7 +601,7 @@ ossl_pkcs7_set_certificates(VALUE self, 
+     STACK_OF(X509) *certs;
+     X509 *cert;
+ 
+-    certs = pkcs7_get_certs_or_crls(self, 1);
++    certs = pkcs7_get_certs(self);
+     while((cert = sk_X509_pop(certs))) X509_free(cert);
+     rb_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self);
+ 
+@@ -591,7 +611,7 @@ ossl_pkcs7_set_certificates(VALUE self, 
+ static VALUE
+ ossl_pkcs7_get_certificates(VALUE self)
+ {
+-    return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
++    return ossl_x509_sk2ary(pkcs7_get_certs(self));
+ }
+ 
+ static VALUE
+@@ -621,7 +641,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar
+     STACK_OF(X509_CRL) *crls;
+     X509_CRL *crl;
+ 
+-    crls = pkcs7_get_certs_or_crls(self, 0);
++    crls = pkcs7_get_crls(self);
+     while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
+     rb_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self);
+ 
+@@ -631,7 +651,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar
+ static VALUE
+ ossl_pkcs7_get_crls(VALUE self)
+ {
+-    return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
++    return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
+ }
+ 
+ static VALUE
 diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c
 --- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10	2007-03-12 05:12:32.000000000 +0100
 +++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c	2009-08-26 12:08:48.000000000 +0200



From pbrobinson at fedoraproject.org  Wed Aug 26 14:08:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 26 Aug 2009 14:08:03 +0000 (UTC)
Subject: rpms/anerley/devel anerley.spec,1.3,1.4
Message-ID: <20090826140803.CB30411C0082@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16581

Modified Files:
	anerley.spec 
Log Message:
- Rebuild due to mission-control bump


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- anerley.spec	7 Aug 2009 11:50:49 -0000	1.3
+++ anerley.spec	26 Aug 2009 14:08:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           anerley
 Version:        0.0.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Moblin widgets for people information
 
 Group:          System Environment/Libraries
@@ -37,8 +37,7 @@ Files for development with %{name}.
 %setup -q
 
 # Don't run configure from autogen.sh
-sed -i 's|echo|exit 0|g' autogen.sh
-./autogen.sh
+NOCONFIGURE=true ./autogen.sh
 
 %build
 %configure --disable-static
@@ -73,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-4
+- Rebuild due to mission-control bump
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.20-3
 - Re-add gnome-comnmon buildreq
 



From jjames at fedoraproject.org  Wed Aug 26 14:08:45 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 14:08:45 +0000 (UTC)
Subject: rpms/findbugs-contrib/devel findbugs-contrib.spec,1.4,1.5
Message-ID: <20090826140845.68D3D11C0082@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16734/devel

Modified Files:
	findbugs-contrib.spec 
Log Message:
* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-4
- Rebuilt for findbugs 1.3.9



Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/findbugs-contrib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- findbugs-contrib.spec	10 Aug 2009 17:09:49 -0000	1.4
+++ findbugs-contrib.spec	26 Aug 2009 14:08:45 -0000	1.5
@@ -1,12 +1,12 @@
 %global plugin_dir %{_datadir}/findbugs/plugin
-%global eclipse_plugin_vers 1.3.8
-%global eclipse_plugin_date 20090315
+%global eclipse_plugin_vers 1.3.9
+%global eclipse_plugin_date 20090821
 %global eclipse_plugins_dir %{_datadir}/eclipse/dropins/findbugs/plugins
 %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:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extra findbugs detectors
 
 Group:          Development/Languages
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
 %changelog
+* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-4
+- Rebuilt for findbugs 1.3.9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Wed Aug 26 14:10:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 14:10:27 +0000 (UTC)
Subject: rpms/tomcat-native/devel tomcat-native.spec,1.17,1.18
Message-ID: <20090826141027.9FB3E11C043D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17139

Modified Files:
	tomcat-native.spec 
Log Message:
- do not forget to apply the patch



Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- tomcat-native.spec	26 Aug 2009 12:52:37 -0000	1.17
+++ tomcat-native.spec	26 Aug 2009 14:10:27 -0000	1.18
@@ -7,6 +7,7 @@ Group:          System Environment/Libra
 License:        ASL 2.0
 URL:            http://tomcat.apache.org/tomcat-6.0-doc/apr.html
 Source0:        http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz
+Patch1:         tomcat-native-1.1.16-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel
@@ -30,6 +31,7 @@ provides support for using APR in Tomcat
 
 %prep
 %setup -q -n %{name}-%{version}-src
+%patch1 -p1 -b .openssl
 
 
 %build



From tmraz at fedoraproject.org  Wed Aug 26 14:21:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 14:21:52 +0000 (UTC)
Subject: rpms/xca/devel xca-0.6.4-openssl10.patch, NONE, 1.1 xca.spec, 1.29,
	1.30
Message-ID: <20090826142152.7675811C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19174

Modified Files:
	xca.spec 
Added Files:
	xca-0.6.4-openssl10.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
- rebuilt with new openssl


xca-0.6.4-openssl10.patch:
 pki_x509req.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE xca-0.6.4-openssl10.patch ---
diff -up xca-0.6.4/lib/pki_x509req.cpp.openssl xca-0.6.4/lib/pki_x509req.cpp
--- xca-0.6.4/lib/pki_x509req.cpp.openssl	2007-08-13 20:55:50.000000000 +0200
+++ xca-0.6.4/lib/pki_x509req.cpp	2009-08-26 16:18:58.000000000 +0200
@@ -335,7 +335,11 @@ void pki_x509req::set_spki(NETSCAPE_SPKI
 void pki_x509req::load_spkac(const QString filename)
 {
 	STACK_OF(CONF_VALUE) *sk=NULL;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	LHASH_OF(CONF_VALUE) *parms=NULL;
+#else
 	LHASH *parms=NULL;
+#endif
 	CONF_VALUE *cv=NULL;
 	x509name subject;
 	char *type,*buf;


Index: xca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xca/devel/xca.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xca.spec	21 Aug 2009 16:30:31 -0000	1.29
+++ xca.spec	26 Aug 2009 14:21:51 -0000	1.30
@@ -14,6 +14,7 @@ Source4:	xca.xml
 Patch0:		xca-0.6.3-locale.patch
 Patch1:         xca-0.6.4-newopenssl.patch
 Patch2:         xca-0.6.4-includes.patch
+Patch3:		xca-0.6.4-openssl10.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	db4-devel
@@ -41,6 +42,7 @@ PEM, DER, PKCS#8.
 %patch0 -p1 -b .locale
 %patch1 -p1 -b .newopenssl
 %patch2 -p1 -b .includes
+%patch3 -p1 -b .openssl10
 
 mkdir -p _tmp_root/usr 	 
 ln -s /usr/%_lib	_tmp_root/usr/lib 	 
@@ -130,7 +132,7 @@ gtk-update-icon-cache %_datadir/icons/hi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
 - rebuilt with new openssl
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-8



From tuxbrewr at fedoraproject.org  Wed Aug 26 14:24:18 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 14:24:18 +0000 (UTC)
Subject: rpms/powerman/devel .cvsignore, 1.9, 1.10 powerman.spec, 1.22,
	1.23 sources, 1.9, 1.10
Message-ID: <20090826142418.A980D11C0082@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19668

Modified Files:
	.cvsignore powerman.spec sources 
Log Message:

- Deprecated undocumented powerman.conf port directive.
- Added powerman.conf listen directive to configure which interfaces
-   and ports the server listens on.  Make the default localhost:10101.
- Add support for HP integrated power control devices [Bjorn Helgaas]
- Add support for Sun LOM.
- Misc. documentation improvements
- Add heartbeat STONITH plugin.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	10 Feb 2009 20:41:49 -0000	1.9
+++ .cvsignore	26 Aug 2009 14:24:18 -0000	1.10
@@ -1 +1 @@
-powerman-2.3.4.tar.bz2
+powerman-2.3.5.tar.bz2


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/powerman.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- powerman.spec	26 Jul 2009 19:18:58 -0000	1.22
+++ powerman.spec	26 Aug 2009 14:24:18 -0000	1.23
@@ -1,6 +1,6 @@
 Name: powerman
-Version: 2.3.4
-Release: 6%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -102,8 +102,18 @@ fi
 %exclude %{_libdir}/libpowerman.la
 %{_libdir}/pkgconfig/libpowerman.pc
 %{_libdir}/libpowerman.so
+%{_libdir}/stonith/plugins/external/powerman
 
 %changelog
+* 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
+-   and ports the server listens on.  Make the default localhost:10101.
+- Add support for HP integrated power control devices [Bjorn Helgaas]
+- Add support for Sun LOM.
+- Misc. documentation improvements
+- Add heartbeat STONITH plugin.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Feb 2009 20:41:49 -0000	1.9
+++ sources	26 Aug 2009 14:24:18 -0000	1.10
@@ -1 +1 @@
-f47c7725b426b0a776a4980d8628471e  powerman-2.3.4.tar.bz2
+9b45c1eef39eafd8f7c750e316c7e4dc  powerman-2.3.5.tar.bz2



From nphilipp at fedoraproject.org  Wed Aug 26 14:25:05 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 26 Aug 2009 14:25:05 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.100, 1.101 sources,
	1.110, 1.111 system-config-date.spec, 1.118, 1.119
Message-ID: <20090826142505.AF1C111C0082@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-serv20014

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.42



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	26 Aug 2009 13:57:05 -0000	1.100
+++ .cvsignore	26 Aug 2009 14:25:05 -0000	1.101
@@ -1 +1 @@
-system-config-date-1.9.41.tar.bz2
+system-config-date-1.9.42.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sources	26 Aug 2009 13:57:05 -0000	1.110
+++ sources	26 Aug 2009 14:25:05 -0000	1.111
@@ -1 +1 @@
-9558eea0e430335906335e5a7124cbe0  system-config-date-1.9.41.tar.bz2
+c7ba74203c4e6cc2bb06d969748ef48d  system-config-date-1.9.42.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- system-config-date.spec	26 Aug 2009 13:57:05 -0000	1.118
+++ system-config-date.spec	26 Aug 2009 14:25:05 -0000	1.119
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.41
+Version: 1.9.42
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -123,6 +123,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.42-1
+- provide missing N_()
+
 * Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.41-1
 - use gettext instead of rhpl
 



From tmraz at fedoraproject.org  Wed Aug 26 14:25:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 14:25:52 +0000 (UTC)
Subject: rpms/tomcat-native/devel tomcat-native-1.1.16-openssl.patch, 1.1,
	1.2
Message-ID: <20090826142552.3AC2B11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20249

Modified Files:
	tomcat-native-1.1.16-openssl.patch 
Log Message:
- more fixes needed for the rebuild


tomcat-native-1.1.16-openssl.patch:
 sslcontext.c |    4 ++--
 sslutils.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: tomcat-native-1.1.16-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native-1.1.16-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tomcat-native-1.1.16-openssl.patch	26 Aug 2009 12:52:37 -0000	1.1
+++ tomcat-native-1.1.16-openssl.patch	26 Aug 2009 14:25:52 -0000	1.2
@@ -1,3 +1,19 @@
+diff -up tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslcontext.c
+--- tomcat-native-1.1.16-src/jni/native/src/sslcontext.c.openssl	2008-01-01 18:33:12.000000000 +0100
++++ tomcat-native-1.1.16-src/jni/native/src/sslcontext.c	2009-08-26 16:24:44.000000000 +0200
+@@ -366,10 +366,10 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
+         if (ca_certs == NULL) {
+             SSL_load_client_CA_file(J2S(file));
+             if (ca_certs != NULL)
+-                SSL_CTX_set_client_CA_list(c->ctx, (STACK *)ca_certs);
++                SSL_CTX_set_client_CA_list(c->ctx, ca_certs);
+         }
+         else {
+-            if (!SSL_add_file_cert_subjects_to_stack((STACK *)ca_certs, J2S(file)))
++            if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
+                 ca_certs = NULL;
+         }
+         if (ca_certs == NULL && c->verify_mode == SSL_CVERIFY_REQUIRE) {
 diff -up tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl tomcat-native-1.1.16-src/jni/native/src/sslutils.c
 --- tomcat-native-1.1.16-src/jni/native/src/sslutils.c.openssl	2006-11-25 11:22:33.000000000 +0100
 +++ tomcat-native-1.1.16-src/jni/native/src/sslutils.c	2009-08-26 14:50:58.000000000 +0200



From tmraz at fedoraproject.org  Wed Aug 26 14:28:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 14:28:46 +0000 (UTC)
Subject: rpms/virtuoso-opensource/devel
	virtuoso-opensource-5.0.11-openssl.patch, 1.1, 1.2
Message-ID: <20090826142846.933EE11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21628

Modified Files:
	virtuoso-opensource-5.0.11-openssl.patch 
Log Message:
- more fixes needed for the rebuild


virtuoso-opensource-5.0.11-openssl.patch:
 Dk/Dkernel.c |   24 ++++++++++++++----------
 Wi/http.c    |   12 ++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

Index: virtuoso-opensource-5.0.11-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource-5.0.11-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource-5.0.11-openssl.patch	26 Aug 2009 14:06:35 -0000	1.1
+++ virtuoso-opensource-5.0.11-openssl.patch	26 Aug 2009 14:28:46 -0000	1.2
@@ -75,3 +75,40 @@ diff -up virtuoso-opensource-5.0.11/libs
    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);
+ 	    }



From nphilipp at fedoraproject.org  Wed Aug 26 14:36:19 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 26 Aug 2009 14:36:19 +0000 (UTC)
Subject: rpms/system-config-nfs/devel .cvsignore, 1.50, 1.51 sources, 1.57, 
	1.58 system-config-nfs.spec, 1.65, 1.66
Message-ID: <20090826143619.C017F11C0082@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23640

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
version 1.3.45



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	14 Apr 2009 16:36:10 -0000	1.50
+++ .cvsignore	26 Aug 2009 14:36:19 -0000	1.51
@@ -1 +1 @@
-system-config-nfs-1.3.44.tar.bz2
+system-config-nfs-1.3.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Apr 2009 16:36:10 -0000	1.57
+++ sources	26 Aug 2009 14:36:19 -0000	1.58
@@ -1 +1 @@
-2bfad3c95b711e66ee5453ab7eef2adb  system-config-nfs-1.3.44.tar.bz2
+d6b3eb526610e69647befaffeeb2f600  system-config-nfs-1.3.45.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- system-config-nfs.spec	27 Jul 2009 05:24:31 -0000	1.65
+++ system-config-nfs.spec	26 Aug 2009 14:36:19 -0000	1.66
@@ -8,21 +8,24 @@
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.44
-Release: 2%{?dist}
+Version: 1.3.45
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
 Obsoletes: redhat-config-nfs < 1.1.4
-Obsoletes: system-config-nfs < 1.3.41
-Conflicts: system-config-nfs < 1.3.41
+# Until version 1.3.41, system-config-nfs contained online documentation.
+# From version 1.3.42 on, online documentation is split off into its own
+# package system-config-nfs-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
+Obsoletes: system-config-nfs < 1.3.42
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python >= 2.0
@@ -32,7 +35,6 @@ Requires: usermode-gtk >= 1.94
 %else
 Requires: usermode-gtk >= 1.36
 %endif
-Requires: rhpl
 Requires: hicolor-icon-theme
 
 %description
@@ -83,8 +85,15 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.44-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.3.45-1
+- use gettext instead of rhpl
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+- obsolete correct version
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 1.3.44-1
 - pick up updated translations



From tuxbrewr at fedoraproject.org  Wed Aug 26 14:38:44 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 14:38:44 +0000 (UTC)
Subject: rpms/powerman/F-11 .cvsignore, 1.9, 1.10 powerman.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090826143844.2CDE011C0082@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24299

Modified Files:
	.cvsignore powerman.spec sources 
Log Message:

- Deprecated undocumented powerman.conf port directive.
- Added powerman.conf listen directive to configure which interfaces
-   and ports the server listens on.  Make the default localhost:10101.
- Add support for HP integrated power control devices [Bjorn Helgaas]
- Add support for Sun LOM.
- Misc. documentation improvements
- Add heartbeat STONITH plugin.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	10 Feb 2009 20:41:49 -0000	1.9
+++ .cvsignore	26 Aug 2009 14:38:43 -0000	1.10
@@ -1 +1 @@
-powerman-2.3.4.tar.bz2
+powerman-2.3.5.tar.bz2


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-11/powerman.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- powerman.spec	27 Feb 2009 01:58:31 -0000	1.21
+++ powerman.spec	26 Aug 2009 14:38:43 -0000	1.22
@@ -1,6 +1,6 @@
 Name: powerman
-Version: 2.3.4
-Release: 5%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -102,8 +102,18 @@ fi
 %exclude %{_libdir}/libpowerman.la
 %{_libdir}/pkgconfig/libpowerman.pc
 %{_libdir}/libpowerman.so
+%{_libdir}/stonith/plugins/external/powerman
 
 %changelog
+* 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
+-   and ports the server listens on.  Make the default localhost:10101.
+- Add support for HP integrated power control devices [Bjorn Helgaas]
+- Add support for Sun LOM.
+- Misc. documentation improvements
+- Add heartbeat STONITH plugin.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Feb 2009 20:41:49 -0000	1.9
+++ sources	26 Aug 2009 14:38:43 -0000	1.10
@@ -1 +1 @@
-f47c7725b426b0a776a4980d8628471e  powerman-2.3.4.tar.bz2
+9b45c1eef39eafd8f7c750e316c7e4dc  powerman-2.3.5.tar.bz2



From rdieter at fedoraproject.org  Wed Aug 26 14:39:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 14:39:14 +0000 (UTC)
Subject: rpms/kde-settings/devel kde-settings.spec,1.83,1.84
Message-ID: <20090826143914.B8B4C11C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24601

Modified Files:
	kde-settings.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4.2
- drop Requires: system-backgrounds-kde (move to kdebase-workspace)



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- kde-settings.spec	20 Aug 2009 18:30:50 -0000	1.83
+++ kde-settings.spec	26 Aug 2009 14:39:14 -0000	1.84
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}.1 
+Release: %{rel}.2
 
 Group:   System Environment/Base
 License: Public Domain
@@ -24,9 +24,6 @@ Requires: pam
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
-# for wallpaper
-# FIXME/TODO: use a symlink (or something) to a known default location
-Requires: system-backgrounds-kde 
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -153,6 +150,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4.2
+- drop Requires: system-backgrounds-kde (move to kdebase-workspace)
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-4.1
 - Requires: system-backgrounds-kde
 



From jreznik at fedoraproject.org  Wed Aug 26 14:40:19 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:40:19 +0000 (UTC)
Subject: rpms/solar-kde-theme/devel .cvsignore, 1.15,
	1.16 solar-kde-theme.spec, 1.27, 1.28 sources, 1.16, 1.17
Message-ID: <20090826144019.5E11611C043D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24936

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
- fix ksplash background on dual head



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	4 Aug 2009 15:51:12 -0000	1.15
+++ .cvsignore	26 Aug 2009 14:40:19 -0000	1.16
@@ -1 +1 @@
-solar-kde-theme-0.1.18.tar.bz2
+solar-kde-theme-0.1.19.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- solar-kde-theme.spec	4 Aug 2009 16:53:00 -0000	1.27
+++ solar-kde-theme.spec	26 Aug 2009 14:40:19 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		solar-kde-theme
-Version:	0.1.18
+Version:	0.1.19
 Release:	1%{?dist}.1
 Summary:	Solar KDE Theme
 
@@ -150,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
+- fix ksplash background on dual head
+
 * Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
 - don't require Leonidas on F10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Aug 2009 15:51:12 -0000	1.16
+++ sources	26 Aug 2009 14:40:19 -0000	1.17
@@ -1 +1 @@
-8c9481561f97402b065a789eb0d375ea  solar-kde-theme-0.1.18.tar.bz2
+220ae2b8f9604a5de29242a58b45987b  solar-kde-theme-0.1.19.tar.bz2



From orion at fedoraproject.org  Wed Aug 26 14:41:32 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 26 Aug 2009 14:41:32 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.39,1.40
Message-ID: <20090826144132.CF1DA11C0082@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25282

Modified Files:
	paraview.spec 
Log Message:
Also disable Toolbar plugins



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- paraview.spec	26 Aug 2009 13:48:32 -0000	1.39
+++ paraview.spec	26 Aug 2009 14:41:32 -0000	1.40
@@ -73,6 +73,8 @@ Provides:       paraview-demos = %{versi
 #	-DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\
 #	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\
 #	-DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON
 %define paraview_cmake_options \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
         -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
@@ -81,7 +83,6 @@ Provides:       paraview-demos = %{versi
 	-DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=ON \\\
@@ -91,7 +92,6 @@ Provides:       paraview-demos = %{versi
 	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON \\\



From jreznik at fedoraproject.org  Wed Aug 26 14:42:47 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:42:47 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-10 .cvsignore, 1.15,
	1.16 solar-kde-theme.spec, 1.25, 1.26 sources, 1.16, 1.17
Message-ID: <20090826144247.BFD1911C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25737

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
- fix ksplash background on dual head



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	4 Aug 2009 15:56:08 -0000	1.15
+++ .cvsignore	26 Aug 2009 14:42:47 -0000	1.16
@@ -1 +1 @@
-solar-kde-theme-0.1.18.tar.bz2
+solar-kde-theme-0.1.19.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/solar-kde-theme.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- solar-kde-theme.spec	4 Aug 2009 16:52:59 -0000	1.25
+++ solar-kde-theme.spec	26 Aug 2009 14:42:47 -0000	1.26
@@ -1,5 +1,5 @@
 Name:		solar-kde-theme
-Version:	0.1.18
+Version:	0.1.19
 Release:	1%{?dist}.1
 Summary:	Solar KDE Theme
 
@@ -150,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
+- fix ksplash background on dual head
+
 * Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
 - don't require Leonidas on F10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Aug 2009 15:56:08 -0000	1.16
+++ sources	26 Aug 2009 14:42:47 -0000	1.17
@@ -1 +1 @@
-8c9481561f97402b065a789eb0d375ea  solar-kde-theme-0.1.18.tar.bz2
+220ae2b8f9604a5de29242a58b45987b  solar-kde-theme-0.1.19.tar.bz2



From jreznik at fedoraproject.org  Wed Aug 26 14:44:37 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:44:37 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-11 .cvsignore, 1.15,
	1.16 solar-kde-theme.spec, 1.26, 1.27 sources, 1.16, 1.17
Message-ID: <20090826144437.AE00011C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26154

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
- fix ksplash background on dual head



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	4 Aug 2009 15:55:38 -0000	1.15
+++ .cvsignore	26 Aug 2009 14:44:37 -0000	1.16
@@ -1 +1 @@
-solar-kde-theme-0.1.18.tar.bz2
+solar-kde-theme-0.1.19.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/solar-kde-theme.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- solar-kde-theme.spec	4 Aug 2009 16:52:59 -0000	1.26
+++ solar-kde-theme.spec	26 Aug 2009 14:44:37 -0000	1.27
@@ -1,5 +1,5 @@
 Name:		solar-kde-theme
-Version:	0.1.18
+Version:	0.1.19
 Release:	1%{?dist}.1
 Summary:	Solar KDE Theme
 
@@ -150,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
+- fix ksplash background on dual head
+
 * Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1
 - don't require Leonidas on F10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	4 Aug 2009 15:55:38 -0000	1.16
+++ sources	26 Aug 2009 14:44:37 -0000	1.17
@@ -1 +1 @@
-8c9481561f97402b065a789eb0d375ea  solar-kde-theme-0.1.18.tar.bz2
+220ae2b8f9604a5de29242a58b45987b  solar-kde-theme-0.1.19.tar.bz2



From bpepple at fedoraproject.org  Wed Aug 26 14:51:32 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 26 Aug 2009 14:51:32 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.12, 1.13 sources,
	1.12, 1.13 telepathy-mission-control.spec, 1.19, 1.20
Message-ID: <20090826145132.3169411C0082@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27835

Modified Files:
	.cvsignore sources telepathy-mission-control.spec 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.1-1
- Update to 5.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	25 Aug 2009 18:25:29 -0000	1.12
+++ .cvsignore	26 Aug 2009 14:51:31 -0000	1.13
@@ -1 +1 @@
-telepathy-mission-control-5.2.0.tar.gz
+telepathy-mission-control-5.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	25 Aug 2009 18:25:29 -0000	1.12
+++ sources	26 Aug 2009 14:51:31 -0000	1.13
@@ -1 +1 @@
-dc7ce2105d1f569a1a6f7db06be4bc68  telepathy-mission-control-5.2.0.tar.gz
+a27780ecced46c87132fb96d6d604355  telepathy-mission-control-5.2.1.tar.gz


Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- telepathy-mission-control.spec	25 Aug 2009 18:25:29 -0000	1.19
+++ telepathy-mission-control.spec	26 Aug 2009 14:51:31 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           telepathy-mission-control
-Version:        5.2.0
+Version:        5.2.1
 Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.1-1
+- Update to 5.2.1.
+
 * Tue Aug 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.0-1
 - Update to 5.2.0.
 - Drop BR on libtelepathy.



From rrakus at fedoraproject.org  Wed Aug 26 14:52:06 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed, 26 Aug 2009 14:52:06 +0000 (UTC)
Subject: rpms/bash/devel bash-4.0-key_alloc.patch, NONE, 1.1 bash.spec, 1.185,
	1.186
Message-ID: <20090826145206.2A1EC11C0082@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28002

Modified Files:
	bash.spec 
Added Files:
	bash-4.0-key_alloc.patch 
Log Message:
alloc memory for key in creation of associative array (#518644)

bash-4.0-key_alloc.patch:
 assoc.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE bash-4.0-key_alloc.patch ---
diff -up bash-4.0/assoc.c.key_alloc bash-4.0/assoc.c
--- bash-4.0/assoc.c.key_alloc	2009-08-26 16:17:50.000000000 +0200
+++ bash-4.0/assoc.c	2009-08-26 16:18:42.000000000 +0200
@@ -77,6 +77,7 @@ assoc_insert (hash, key, value)
   b = hash_search (key, hash, HASH_CREATE);
   if (b == 0)
     return -1;
+  b->key = savestring (key);
   FREE (b->data);
   b->data = value ? savestring (value) : (char *)0;
   return (0);


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- bash.spec	29 Jul 2009 08:25:17 -0000	1.185
+++ bash.spec	26 Aug 2009 14:52:06 -0000	1.186
@@ -71,6 +71,9 @@ Patch118: bash-tty-tests.patch
 #Patch120: bash-4.0-no_debug_output.patch
 #Patch121: bash-4.0-shell_pipelines_handling.patch
 
+# 518644, alloc memory for key in associative array creation
+Patch122: bash-4.0-key_alloc.patch
+
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -150,6 +153,7 @@ This package contains documentation file
 #%patch119 -p1 -b .ulimit-m
 #%patch120 -p1 -b .no_debug_output
 #%patch121 -p1 -b .pipelines_handling
+%patch122 -p1 -b .key_alloc
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -313,6 +317,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Aug 26 2009 Roman Rakus <rrakus at redhat.com> - 4.0.28-2
+- alloc memory for key in creation associative array (#518644)
+
 * Tue Jul 28 2009 Roman Rakus <rrakus at redhat.com> - 4.0.28-1
 - Upstream patch level 28
 



From smilner at fedoraproject.org  Wed Aug 26 14:52:27 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 14:52:27 +0000 (UTC)
Subject: rpms/Django/F-10 .cvsignore, 1.12, 1.13 Django.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <20090826145227.71FE911C0082@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28077

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
Update to 1.1 as requested.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jul 2009 21:53:46 -0000	1.12
+++ .cvsignore	26 Aug 2009 14:52:27 -0000	1.13
@@ -1 +1,3 @@
-Django-1.0.3.tar.gz
+Django-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.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Django.spec	30 Jul 2009 03:35:59 -0000	1.19
+++ Django.spec	26 Aug 2009 14:52:27 -0000	1.20
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ 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
@@ -41,6 +42,7 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -56,7 +58,7 @@ cp -p %{SOURCE1} __init__.py
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 # Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
@@ -67,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
@@ -84,25 +88,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
 %{python_sitelib}/django
 
+# Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} <= 10
+eif 0%{?fedora} > 0 && 0%{?fedora} <= 10
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
-
-%if 0%{?rhel} == 5
-%exclude %{_bindir}/django-admin.pyc
-%exclude %{_bindir}/django-admin.pyo
-%endif
+# -----------------
+ 
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
 
+
 %changelog
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+- Applied Daniel Mach's patch from bz#516016.
+
+* Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-6
 - Attempted combined spec for F12/11/10 and EL5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jul 2009 21:53:46 -0000	1.12
+++ sources	26 Aug 2009 14:52:27 -0000	1.13
@@ -1 +1,3 @@
-3c5435b015d8cde602b17a5f0c9873dc  Django-1.0.3.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch



From rrakus at fedoraproject.org  Wed Aug 26 14:53:31 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Wed, 26 Aug 2009 14:53:31 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.186,1.187
Message-ID: <20090826145331.3EA2911C0082@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28401

Modified Files:
	bash.spec 
Log Message:
Fixed release tag


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- bash.spec	26 Aug 2009 14:52:06 -0000	1.186
+++ bash.spec	26 Aug 2009 14:53:31 -0000	1.187
@@ -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



From smilner at fedoraproject.org  Wed Aug 26 14:53:39 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 14:53:39 +0000 (UTC)
Subject: rpms/Django/F-10 Django.spec,1.20,1.21
Message-ID: <20090826145339.612E911C0082@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28456

Modified Files:
	Django.spec 
Log Message:



Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- Django.spec	26 Aug 2009 14:52:27 -0000	1.20
+++ Django.spec	26 Aug 2009 14:53:39 -0000	1.21
@@ -106,7 +106,7 @@ eif 0%{?fedora} > 0 && 0%{?fedora} <= 10
 
 
 %changelog
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-1
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From smilner at fedoraproject.org  Wed Aug 26 14:54:25 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 14:54:25 +0000 (UTC)
Subject: rpms/Django/F-10 Django.spec,1.21,1.22
Message-ID: <20090826145425.6384F11C0082@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28738

Modified Files:
	Django.spec 
Log Message:



Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- Django.spec	26 Aug 2009 14:53:39 -0000	1.21
+++ Django.spec	26 Aug 2009 14:54:25 -0000	1.22
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-eif 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%eif 0%{?fedora} > 0 && 0%{?fedora} <= 10
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif



From smilner at fedoraproject.org  Wed Aug 26 14:55:22 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 14:55:22 +0000 (UTC)
Subject: rpms/Django/F-10 Django.spec,1.22,1.23
Message-ID: <20090826145522.6C48211C0082@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29123

Modified Files:
	Django.spec 
Log Message:
I can't type today ... fixed the fat finger in if statement


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- Django.spec	26 Aug 2009 14:54:25 -0000	1.22
+++ Django.spec	26 Aug 2009 14:55:22 -0000	1.23
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%eif 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif



From rdieter at fedoraproject.org  Wed Aug 26 14:55:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 14:55:15 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.272,1.273
Message-ID: <20090826145515.03B7F11C0082@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29001

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-11
- Requires: system-backgrounds-kde (f12+)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- kdebase-workspace.spec	25 Aug 2009 17:44:24 -0000	1.272
+++ kdebase-workspace.spec	26 Aug 2009 14:55:14 -0000	1.273
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 10%{?dist}
+Release: 11%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -119,6 +119,10 @@ Requires: leonidas-kde-theme
 %endif
 %endif
 
+%if 0%{?fedora} > 11
+Requires: system-backgrounds-kde
+%endif
+
 Requires: kde-plasma-folderview
 Requires: kio_sysinfo
 
@@ -540,6 +544,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-11
+- Requires: system-backgrounds-kde (f12+)
+
 * Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-10
 - Requires: kde-plasma-folderview
 



From nphilipp at fedoraproject.org  Wed Aug 26 14:55:34 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 26 Aug 2009 14:55:34 +0000 (UTC)
Subject: rpms/system-config-nfs/devel sources,1.58,1.59
Message-ID: <20090826145534.E412611C0082@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29181

Modified Files:
	sources 
Log Message:
fix th.po charset statement



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	26 Aug 2009 14:36:19 -0000	1.58
+++ sources	26 Aug 2009 14:55:34 -0000	1.59
@@ -1 +1 @@
-d6b3eb526610e69647befaffeeb2f600  system-config-nfs-1.3.45.tar.bz2
+9907d1529138daf408ae67cb19bd26d0  system-config-nfs-1.3.45.tar.bz2



From overholt at fedoraproject.org  Wed Aug 26 14:55:50 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 26 Aug 2009 14:55:50 +0000 (UTC)
Subject: rpms/maven2/devel maven2.spec,1.23,1.24
Message-ID: <20090826145550.C554311C0082@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29361

Modified Files:
	maven2.spec 
Log Message:
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
- Add missing backport-util-concurrent BR


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- maven2.spec	25 Aug 2009 17:22:48 -0000	1.23
+++ maven2.spec	26 Aug 2009 14:55:50 -0000	1.24
@@ -131,6 +131,7 @@ BuildRequires:    ant >= 1.6.5
 BuildRequires:    ant-junit
 BuildRequires:    antlr >= 2.7.4
 BuildRequires:    aqute-bndlib
+BuildRequires:    backport-util-concurrent
 BuildRequires:    bsh >= 1.3.0
 #BuildRequires:   cglib >= 2.1.0
 BuildRequires:    checkstyle >= 4.1
@@ -2869,6 +2870,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
+- Add missing backport-util-concurrent BR
+
 * Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
 - Fix javadoc source directory name
 - Don't try to symlink model-all JAR



From jreznik at fedoraproject.org  Wed Aug 26 14:57:16 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:57:16 +0000 (UTC)
Subject: rpms/solar-kde-theme/devel solar-kde-theme.spec,1.28,1.29
Message-ID: <20090826145716.442EF11C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30020

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
- correct NVR



Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- solar-kde-theme.spec	26 Aug 2009 14:40:19 -0000	1.28
+++ solar-kde-theme.spec	26 Aug 2009 14:57:16 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.19
-Release:	1%{?dist}.1
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -151,6 +151,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
+- correct NVR
+
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
 - fix ksplash background on dual head
 
 * Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1



From jjames at fedoraproject.org  Wed Aug 26 14:58:01 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 14:58:01 +0000 (UTC)
Subject: rpms/pocketsphinx/devel import.log, NONE,
	1.1 pocketsphinx-0.5.1-doc.patch, NONE,
	1.1 pocketsphinx-0.5.1-python.patch, NONE, 1.1 pocketsphinx.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090826145801.C99C511C0082@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/pocketsphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30931/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pocketsphinx-0.5.1-doc.patch 
	pocketsphinx-0.5.1-python.patch pocketsphinx.spec 
Log Message:
Initial checkin.



--- NEW FILE import.log ---
pocketsphinx-0_5_1-3_fc11:HEAD:pocketsphinx-0.5.1-3.fc11.src.rpm:1251298640

pocketsphinx-0.5.1-doc.patch:
 doxyfile.in |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE pocketsphinx-0.5.1-doc.patch ---
diff -dur pocketsphinx-0.5.1.ORIG/doc/doxyfile.in pocketsphinx-0.5.1/doc/doxyfile.in
--- pocketsphinx-0.5.1.ORIG/doc/doxyfile.in	2008-07-07 18:14:52.000000000 -0600
+++ pocketsphinx-0.5.1/doc/doxyfile.in	2009-08-21 10:13:42.144889225 -0600
@@ -421,7 +421,7 @@
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
 # automatically be disabled.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = NO
 
 # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
 # potential errors in the documentation, such as not documenting some 
@@ -462,7 +462,8 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/include @top_srcdir@/src/libpocketsphinx
+INPUT                  = @top_srcdir@/include \
+                         @top_srcdir@/src/libpocketsphinx
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -504,7 +505,9 @@
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */.svn/* */.deps/* */.libs/*
+EXCLUDE_PATTERNS       = */.svn/*  \
+                         */.deps/* \
+                         */.libs/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the output. 

pocketsphinx-0.5.1-python.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pocketsphinx-0.5.1-python.patch ---
diff -dur pocketsphinx-0.5.1.ORIG/python/Makefile.in pocketsphinx-0.5.1/python/Makefile.in
--- pocketsphinx-0.5.1.ORIG/python/Makefile.in	2008-11-29 14:46:47.000000000 -0700
+++ pocketsphinx-0.5.1/python/Makefile.in	2009-03-24 13:53:36.000000000 -0600
@@ -429,7 +429,7 @@
 @BUILD_PYTHON_TRUE at all-local: pymod-build-stamp
 
 @BUILD_PYTHON_TRUE at install-exec-local: pymod-build-stamp
- at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
+ at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --skip-build --root $(DESTDIR)
 
 @BUILD_PYTHON_TRUE at uninstall-local:
 @BUILD_PYTHON_TRUE@	$(PYTHON) setup.py bogus_uninstall --prefix $(DESTDIR)$(prefix)


--- NEW FILE pocketsphinx.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pocketsphinx
Version:        0.5.1
Release:        3%{?dist}
Summary:        Real-time speech recognition

Group:          Applications/Multimedia
License:        BSD and LGPLv2+
URL:            http://www.pocketsphinx.org/
Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
# Fix the building of doxygen documentation
Patch0:         pocketsphinx-0.5.1-doc.patch
# Install the Python egg in the Fedora way.
Patch1:         pocketsphinx-0.5.1-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen, gstreamer-devel, gstreamer-plugins-base-devel
BuildRequires:  pkgconfig, python-setuptools-devel, sphinxbase-devel

%description
PocketSphinx is a version of the open-source Sphinx-II speech recognition
system which is able to recognize speech in real-time.  While it may be
somewhat less accurate than the offline speech recognizers, it is lightweight
enough to run on handheld and embedded devices.

%package devel
Summary:        Header files for developing with pocketsphinx
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
Requires:       sphinxbase-devel

%description devel
Header files for developing with pocketsphinx.

%package libs
Summary:        Shared libraries for pocketsphinx executables
Group:          Applications/Multimedia

%description libs
Shared libraries for pocketsphinx executables.

%package plugin
Summary:        Pocketsphinx gstreamer plugin
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, gstreamer-plugins-base

%description plugin
A gstreamer plugin for pocketsphinx.

%package python
Summary:        Python interface to pocketsphinx
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, sphinxbase-python

%description python
Python interface to pocketsphinx.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure --disable-dependency-tracking --disable-static

# Get rid of undesirable hardcoded runpaths
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

# Get rid of undesirable direct library dependencies
sed -i -e 's/ -lsphinxad//g' src/libpocketsphinx/Makefile

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
make install DESTDIR=$RPM_BUILD_ROOT

# Install the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1

# Get rid of files we don't want packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/*.la
rm -f $RPM_BUILD_ROOT%{_datadir}/pocketsphinx/model/lm/turtle/turtle.handdict
rm -f doc/html/installdox

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/pocketsphinx
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/pocketsphinx
%{_libdir}/libpocketsphinx.so
%{_libdir}/pkgconfig/pocketsphinx.pc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libpocketsphinx.so.*

%files plugin
%defattr(-,root,root,-)
%{_libdir}/gstreamer-0.10/*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/*

%changelog
* Fri Aug 21 2009 Jerry James <loganjerry at gmail.com> - 0.5.1-3
- More review issues:
- Fix license (gstreamer plugin is LGPLv2+)
- Remove unnecessary zero-byte turtle dictionary file

* Fri Aug 21 2009 Jerry James <loganjerry at gmail.com> - 0.5.1-2
- Fix issues raised in review by Andrew Colin Kissa, namely:
- Improve description and summary
- Change the group to Applications/Multimedia

* Tue Mar 24 2009 Jerry James <loganjerry at gmail.com> - 0.5.1-1
- Update to 0.5.1

* Thu Jul 10 2008 Jerry James <loganjerry at gmail.com> - 0.5-1
- Update to 0.5

* Wed Mar  5 2008 Jerry James <loganjerry at gmail.com> - 0.4.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pocketsphinx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:37:58 -0000	1.1
+++ .cvsignore	26 Aug 2009 14:58:01 -0000	1.2
@@ -0,0 +1 @@
+pocketsphinx-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pocketsphinx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:37:58 -0000	1.1
+++ sources	26 Aug 2009 14:58:01 -0000	1.2
@@ -0,0 +1 @@
+d257aa7ac2720669fa0ed5e6b91a0bbf  pocketsphinx-0.5.1.tar.bz2



From jreznik at fedoraproject.org  Wed Aug 26 14:58:22 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:58:22 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-10 solar-kde-theme.spec,1.26,1.27
Message-ID: <20090826145822.ACE9111C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31102

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
- correct NVR



Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/solar-kde-theme.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- solar-kde-theme.spec	26 Aug 2009 14:42:47 -0000	1.26
+++ solar-kde-theme.spec	26 Aug 2009 14:58:22 -0000	1.27
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.19
-Release:	1%{?dist}.1
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -151,6 +151,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
+- correct NVR
+
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
 - fix ksplash background on dual head
 
 * Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1



From jreznik at fedoraproject.org  Wed Aug 26 14:59:10 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 26 Aug 2009 14:59:10 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-11 solar-kde-theme.spec,1.27,1.28
Message-ID: <20090826145910.EAD6411C0082@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31400

Modified Files:
	solar-kde-theme.spec 
Log Message:
* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
- correct NVR



Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-11/solar-kde-theme.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- solar-kde-theme.spec	26 Aug 2009 14:44:37 -0000	1.27
+++ solar-kde-theme.spec	26 Aug 2009 14:59:10 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
 Version:	0.1.19
-Release:	1%{?dist}.1
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -151,6 +151,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
+- correct NVR
+
+* Wed Aug 26 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.19-1
 - fix ksplash background on dual head
 
 * Tue Aug 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.18-1.1



From dwalsh at fedoraproject.org  Wed Aug 26 15:00:50 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 15:00:50 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.119,
	1.120 setroubleshoot.spec, 1.158, 1.159 sources, 1.132, 1.133
Message-ID: <20090826150050.62E3911C0082@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31901

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-1
- Fix Permissive Domain reporting



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- .cvsignore	22 Aug 2009 13:50:20 -0000	1.119
+++ .cvsignore	26 Aug 2009 15:00:50 -0000	1.120
@@ -36,3 +36,4 @@ setroubleshoot-2.2.19.tar.gz
 setroubleshoot-2.2.20.tar.gz
 setroubleshoot-2.2.21.tar.gz
 setroubleshoot-2.2.22.tar.gz
+setroubleshoot-2.2.23.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- setroubleshoot.spec	22 Aug 2009 13:50:20 -0000	1.158
+++ setroubleshoot.spec	26 Aug 2009 15:00:50 -0000	1.159
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.22
-Release: 2%{?dist}
+Version: 2.2.23
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -210,6 +210,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-1
+- Fix Permissive Domain reporting
+
 * Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.22-2
 - Turn on libcap-ng-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- sources	22 Aug 2009 13:50:20 -0000	1.132
+++ sources	26 Aug 2009 15:00:50 -0000	1.133
@@ -1 +1 @@
-6dedae84ab8bf26c64f8bd0a53e6742e  setroubleshoot-2.2.22.tar.gz
+672d2bd3dfe6f29129f66e8180f21a42  setroubleshoot-2.2.23.tar.gz



From jjames at fedoraproject.org  Wed Aug 26 15:02:14 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 15:02:14 +0000 (UTC)
Subject: rpms/pocketsphinx/F-11 pocketsphinx-0.5.1-doc.patch, NONE,
	1.1 pocketsphinx-0.5.1-python.patch, NONE, 1.1 pocketsphinx.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090826150214.680AD11C0082@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/pocketsphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32359/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	pocketsphinx-0.5.1-doc.patch pocketsphinx-0.5.1-python.patch 
	pocketsphinx.spec 
Log Message:
Initial checkin for F-11 branch.


pocketsphinx-0.5.1-doc.patch:
 doxyfile.in |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE pocketsphinx-0.5.1-doc.patch ---
diff -dur pocketsphinx-0.5.1.ORIG/doc/doxyfile.in pocketsphinx-0.5.1/doc/doxyfile.in
--- pocketsphinx-0.5.1.ORIG/doc/doxyfile.in	2008-07-07 18:14:52.000000000 -0600
+++ pocketsphinx-0.5.1/doc/doxyfile.in	2009-08-21 10:13:42.144889225 -0600
@@ -421,7 +421,7 @@
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
 # automatically be disabled.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = NO
 
 # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
 # potential errors in the documentation, such as not documenting some 
@@ -462,7 +462,8 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/include @top_srcdir@/src/libpocketsphinx
+INPUT                  = @top_srcdir@/include \
+                         @top_srcdir@/src/libpocketsphinx
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -504,7 +505,9 @@
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */.svn/* */.deps/* */.libs/*
+EXCLUDE_PATTERNS       = */.svn/*  \
+                         */.deps/* \
+                         */.libs/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the output. 

pocketsphinx-0.5.1-python.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pocketsphinx-0.5.1-python.patch ---
diff -dur pocketsphinx-0.5.1.ORIG/python/Makefile.in pocketsphinx-0.5.1/python/Makefile.in
--- pocketsphinx-0.5.1.ORIG/python/Makefile.in	2008-11-29 14:46:47.000000000 -0700
+++ pocketsphinx-0.5.1/python/Makefile.in	2009-03-24 13:53:36.000000000 -0600
@@ -429,7 +429,7 @@
 @BUILD_PYTHON_TRUE at all-local: pymod-build-stamp
 
 @BUILD_PYTHON_TRUE at install-exec-local: pymod-build-stamp
- at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
+ at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --skip-build --root $(DESTDIR)
 
 @BUILD_PYTHON_TRUE at uninstall-local:
 @BUILD_PYTHON_TRUE@	$(PYTHON) setup.py bogus_uninstall --prefix $(DESTDIR)$(prefix)


--- NEW FILE pocketsphinx.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pocketsphinx
Version:        0.5.1
Release:        3%{?dist}
Summary:        Real-time speech recognition

Group:          Applications/Multimedia
License:        BSD and LGPLv2+
URL:            http://www.pocketsphinx.org/
Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
# Fix the building of doxygen documentation
Patch0:         pocketsphinx-0.5.1-doc.patch
# Install the Python egg in the Fedora way.
Patch1:         pocketsphinx-0.5.1-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen, gstreamer-devel, gstreamer-plugins-base-devel
BuildRequires:  pkgconfig, python-setuptools-devel, sphinxbase-devel

%description
PocketSphinx is a version of the open-source Sphinx-II speech recognition
system which is able to recognize speech in real-time.  While it may be
somewhat less accurate than the offline speech recognizers, it is lightweight
enough to run on handheld and embedded devices.

%package devel
Summary:        Header files for developing with pocketsphinx
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, pkgconfig
Requires:       sphinxbase-devel

%description devel
Header files for developing with pocketsphinx.

%package libs
Summary:        Shared libraries for pocketsphinx executables
Group:          Applications/Multimedia

%description libs
Shared libraries for pocketsphinx executables.

%package plugin
Summary:        Pocketsphinx gstreamer plugin
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, gstreamer-plugins-base

%description plugin
A gstreamer plugin for pocketsphinx.

%package python
Summary:        Python interface to pocketsphinx
Group:          Applications/Multimedia
Requires:       %{name}-libs = %{version}-%{release}, sphinxbase-python

%description python
Python interface to pocketsphinx.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
%configure --disable-dependency-tracking --disable-static

# Get rid of undesirable hardcoded runpaths
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

# Get rid of undesirable direct library dependencies
sed -i -e 's/ -lsphinxad//g' src/libpocketsphinx/Makefile

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
make install DESTDIR=$RPM_BUILD_ROOT

# Install the man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1

# Get rid of files we don't want packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/*.la
rm -f $RPM_BUILD_ROOT%{_datadir}/pocketsphinx/model/lm/turtle/turtle.handdict
rm -f doc/html/installdox

%clean
rm -rf $RPM_BUILD_ROOT

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/*
%{_datadir}/pocketsphinx
%{_mandir}/man1/*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%{_includedir}/pocketsphinx
%{_libdir}/libpocketsphinx.so
%{_libdir}/pkgconfig/pocketsphinx.pc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libpocketsphinx.so.*

%files plugin
%defattr(-,root,root,-)
%{_libdir}/gstreamer-0.10/*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/*

%changelog
* Fri Aug 21 2009 Jerry James <loganjerry at gmail.com> - 0.5.1-3
- More review issues:
- Fix license (gstreamer plugin is LGPLv2+)
- Remove unnecessary zero-byte turtle dictionary file

* Fri Aug 21 2009 Jerry James <loganjerry at gmail.com> - 0.5.1-2
- Fix issues raised in review by Andrew Colin Kissa, namely:
- Improve description and summary
- Change the group to Applications/Multimedia

* Tue Mar 24 2009 Jerry James <loganjerry at gmail.com> - 0.5.1-1
- Update to 0.5.1

* Thu Jul 10 2008 Jerry James <loganjerry at gmail.com> - 0.5-1
- Update to 0.5

* Wed Mar  5 2008 Jerry James <loganjerry at gmail.com> - 0.4.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pocketsphinx/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:37:58 -0000	1.1
+++ .cvsignore	26 Aug 2009 15:02:14 -0000	1.2
@@ -0,0 +1 @@
+pocketsphinx-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pocketsphinx/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:37:58 -0000	1.1
+++ sources	26 Aug 2009 15:02:14 -0000	1.2
@@ -0,0 +1 @@
+d257aa7ac2720669fa0ed5e6b91a0bbf  pocketsphinx-0.5.1.tar.bz2



From kasal at fedoraproject.org  Wed Aug 26 15:03:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 26 Aug 2009 15:03:35 +0000 (UTC)
Subject: rpms/perl-Sys-Virt/devel .cvsignore, 1.4, 1.5 perl-Sys-Virt.spec,
	1.17, 1.18 sources, 1.4, 1.5 perl-Sys-Virt-free.patch, 1.1, NONE
Message-ID: <20090826150335.28A6F11C0082@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Sys-Virt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv389

Modified Files:
	.cvsignore perl-Sys-Virt.spec sources 
Removed Files:
	perl-Sys-Virt-free.patch 
Log Message:
- new upstream version
- remove upstreamed patch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sys-Virt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Mar 2009 15:18:07 -0000	1.4
+++ .cvsignore	26 Aug 2009 15:03:34 -0000	1.5
@@ -1 +1 @@
-Sys-Virt-0.2.0.tar.gz
+Sys-Virt-0.2.1.tar.gz


Index: perl-Sys-Virt.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Sys-Virt.spec	26 Jul 2009 16:38:01 -0000	1.17
+++ perl-Sys-Virt.spec	26 Aug 2009 15:03:35 -0000	1.18
@@ -1,18 +1,17 @@
 Name:           perl-Sys-Virt
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Represent and manage a libvirt hypervisor connection
 License:        GPLv2+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Sys-Virt/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz
-Patch1:         %{name}-free.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(XML::XPath)
-BuildRequires:  libvirt-devel >= 0.6.1
+BuildRequires:  libvirt-devel >= 0.6.4
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -22,7 +21,6 @@ virtualization containers to be managed 
 
 %prep
 %setup -q -n Sys-Virt-%{version}
-%patch1 -p1
 
 sed -i -e '/Sys-Virt\.spec/d' Makefile.PL
 sed -i -e '/\.spec\.PL$/d' MANIFEST
@@ -41,9 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+find $RPM_BUILD_ROOT -type f \( -name .packlist -o -name '*.bs' -empty \) |
+	xargs rm -f
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
@@ -61,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 26 2009 Stepan Kasal <skasal at redhat.com> - 0.2.1-1
+- new upstream version
+- remove upstreamed patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sys-Virt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Mar 2009 15:18:07 -0000	1.4
+++ sources	26 Aug 2009 15:03:35 -0000	1.5
@@ -1 +1 @@
-c8968a476c9130521b317f9f729a22d9  Sys-Virt-0.2.0.tar.gz
+d87ebf92922a66412124b0ee9544dd6d  Sys-Virt-0.2.1.tar.gz


--- perl-Sys-Virt-free.patch DELETED ---



From nphilipp at fedoraproject.org  Wed Aug 26 15:04:19 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 26 Aug 2009 15:04:19 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.70, 1.71 sources, 1.74,
	1.75 system-config-samba.spec, 1.79, 1.80
Message-ID: <20090826150419.2C74611C0082@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv636

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.78


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	25 Aug 2009 12:50:39 -0000	1.70
+++ .cvsignore	26 Aug 2009 15:04:18 -0000	1.71
@@ -1 +1 @@
-system-config-samba-1.2.77.tar.bz2
+system-config-samba-1.2.78.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	25 Aug 2009 13:13:04 -0000	1.74
+++ sources	26 Aug 2009 15:04:18 -0000	1.75
@@ -1 +1 @@
-73a1bc0f717cc68967b483793dcf7d6c  system-config-samba-1.2.77.tar.bz2
+94caa6dd58d19b5ba215d5ad0697ef31  system-config-samba-1.2.78.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- system-config-samba.spec	25 Aug 2009 13:13:04 -0000	1.79
+++ system-config-samba.spec	26 Aug 2009 15:04:19 -0000	1.80
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.77
+Version: 1.2.78
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -25,8 +25,11 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 Obsoletes: redhat-config-samba < 1.1.5
+# Until version 1.2.67, system-config-samba contained online documentation.
+# From version 1.2.68 on, online documentation is split off into its own
+# package system-config-samba-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-samba < 1.2.68
-Conflicts: system-config-samba < 1.2.68
 Requires: dbus-python
 Requires: libselinux-python
 %if %{with polkitauthagent}
@@ -109,6 +112,12 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.2.78-1
+- use gettext instead of rhpl
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 1.2.77-1
 - fix file list
 



From vcrhonek at fedoraproject.org  Wed Aug 26 15:06:48 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 26 Aug 2009 15:06:48 +0000 (UTC)
Subject: rpms/tcsh/devel tcsh-6.17.00-mh-color.patch, NONE, 1.1 tcsh.spec,
	1.64, 1.65
Message-ID: <20090826150648.C015611C0082@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1399

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.17.00-mh-color.patch 
Log Message:
Add new colorls variable

tcsh-6.17.00-mh-color.patch:
 tw.color.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE tcsh-6.17.00-mh-color.patch ---
diff -up tcsh-6.17.00/tw.color.c_old tcsh-6.17.00/tw.color.c
--- tcsh-6.17.00/tw.color.c_old	2009-08-26 13:29:05.000000000 +0200
+++ tcsh-6.17.00/tw.color.c	2009-08-26 13:52:51.000000000 +0200
@@ -88,6 +88,8 @@ static Variable variables[] = {
     VAR(NOS, "rs", "0"),	/* Reset to normal color */
     VAR(NOS, "ca", ""),		/* file with capability */
     VAR(NOS, "hl", ""),		/* Hardlink */
+    VAR(NOS, "mh", ""),		/* MULTIHARDLINK */
+    VAR(NOS, "cl", ""),		/* CLRTOEOL */
 };
 
 enum FileType {


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- tcsh.spec	27 Jul 2009 05:41:33 -0000	1.64
+++ tcsh.spec	26 Aug 2009 15:06:48 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@@ -17,6 +17,7 @@ Patch8: tcsh-6.14.00-syntax.patch
 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
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -44,6 +45,7 @@ like syntax.
 %patch9 -p1 -b .memoryuse
 %patch11 -p1 -b .order
 %patch12 -p1 -b .rs-color
+%patch13 -p1 -b .mh-color
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -117,6 +119,10 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Aug 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-3
+- Add new colorls variable
+  Resolves: #518808
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From smilner at fedoraproject.org  Wed Aug 26 15:07:47 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 15:07:47 +0000 (UTC)
Subject: rpms/Django/F-10 Django.spec,1.23,1.24
Message-ID: <20090826150747.D56F111C0082@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1708

Modified Files:
	Django.spec 
Log Message:
ghosting admin pyo/c is now fc9 and under


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- Django.spec	26 Aug 2009 14:55:22 -0000	1.23
+++ Django.spec	26 Aug 2009 15:07:47 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
@@ -106,7 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-1
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-3
+- ghosting admin py* is now FC9 and under.
+
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From jjames at fedoraproject.org  Wed Aug 26 15:10:13 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 15:10:13 +0000 (UTC)
Subject: rpms/pocketsphinx/F-11 pocketsphinx.spec,1.1,1.2
Message-ID: <20090826151013.DCAB911C043D@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/pocketsphinx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2326/F-11

Modified Files:
	pocketsphinx.spec 
Log Message:
Add explicit alsa-lib-devel BR.



Index: pocketsphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pocketsphinx/F-11/pocketsphinx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pocketsphinx.spec	26 Aug 2009 15:02:14 -0000	1.1
+++ pocketsphinx.spec	26 Aug 2009 15:10:13 -0000	1.2
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  doxygen, gstreamer-devel, gstreamer-plugins-base-devel
 BuildRequires:  pkgconfig, python-setuptools-devel, sphinxbase-devel
+BuildRequires:  alsa-lib-devel
 
 %description
 PocketSphinx is a version of the open-source Sphinx-II speech recognition



From jjames at fedoraproject.org  Wed Aug 26 15:10:14 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 15:10:14 +0000 (UTC)
Subject: rpms/pocketsphinx/devel pocketsphinx.spec,1.1,1.2
Message-ID: <20090826151014.121B111C043D@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/pocketsphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2326/devel

Modified Files:
	pocketsphinx.spec 
Log Message:
Add explicit alsa-lib-devel BR.



Index: pocketsphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pocketsphinx/devel/pocketsphinx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pocketsphinx.spec	26 Aug 2009 14:58:01 -0000	1.1
+++ pocketsphinx.spec	26 Aug 2009 15:10:13 -0000	1.2
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  doxygen, gstreamer-devel, gstreamer-plugins-base-devel
 BuildRequires:  pkgconfig, python-setuptools-devel, sphinxbase-devel
+BuildRequires:  alsa-lib-devel
 
 %description
 PocketSphinx is a version of the open-source Sphinx-II speech recognition



From ajax at fedoraproject.org  Wed Aug 26 15:21:47 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 26 Aug 2009 15:21:47 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel avf-support.patch, NONE,
	1.1 gstreamer-plugins-base.spec, 1.86, 1.87
Message-ID: <20090826152148.0C30211C0082@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5096

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	avf-support.patch 
Log Message:
* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com> 0.10.24-2
- avf-support.patch: Add AVF file recognition (gnome #593117)


avf-support.patch:
 gst-libs/gst/riff/riff-ids.h        |    1 +
 gst-libs/gst/riff/riff-read.c       |    2 +-
 gst/typefind/gsttypefindfunctions.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE avf-support.patch ---
Ref: http://bugzilla.gnome.org/show_bug.cgi?id=593117

diff -up gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h.jx gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h
--- gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h.jx	2009-07-14 06:03:45.000000000 -0400
+++ gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-ids.h	2009-08-26 11:16:20.000000000 -0400
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
 
 /* tags */
 #define GST_RIFF_TAG_RIFF GST_MAKE_FOURCC ('R','I','F','F')
+#define GST_RIFF_TAG_AVF0 GST_MAKE_FOURCC ('A','V','F','0')
 #define GST_RIFF_TAG_RIFX GST_MAKE_FOURCC ('R','I','F','X')
 #define GST_RIFF_TAG_LIST GST_MAKE_FOURCC ('L','I','S','T')
 #define GST_RIFF_TAG_avih GST_MAKE_FOURCC ('a','v','i','h')
diff -up gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c.jx gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c
--- gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c.jx	2009-07-14 06:03:45.000000000 -0400
+++ gst-plugins-base-0.10.24/gst-libs/gst/riff/riff-read.c	2009-08-26 11:16:54.000000000 -0400
@@ -226,7 +226,7 @@ gst_riff_parse_file_header (GstElement *
 
   data = GST_BUFFER_DATA (buf);
   tag = GST_READ_UINT32_LE (data);
-  if (tag != GST_RIFF_TAG_RIFF)
+  if (tag != GST_RIFF_TAG_RIFF && tag != GST_RIFF_TAG_AVF0)
     goto not_riff;
 
   *doctype = GST_READ_UINT32_LE (data + 8);
diff -up gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c.jx gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c
--- gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c.jx	2009-08-04 18:26:58.000000000 -0400
+++ gst-plugins-base-0.10.24/gst/typefind/gsttypefindfunctions.c	2009-08-26 11:17:56.000000000 -0400
@@ -3147,7 +3147,7 @@ riff_type_find (GstTypeFind * tf, gpoint
   GstTypeFindData *riff_data = (GstTypeFindData *) private;
   guint8 *data = gst_type_find_peek (tf, 0, 12);
 
-  if (data && memcmp (data, "RIFF", 4) == 0) {
+  if (data && (memcmp (data, "RIFF", 4) == 0 || memcmp (data, "AVF0", 4) == 0)) {
     data += 8;
     if (memcmp (data, riff_data->data, 4) == 0)
       gst_type_find_suggest (tf, riff_data->probability, riff_data->caps);


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- gstreamer-plugins-base.spec	5 Aug 2009 12:46:15 -0000	1.86
+++ gstreamer-plugins-base.spec	26 Aug 2009 15:21:47 -0000	1.87
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.24
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -14,6 +14,8 @@ 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}
@@ -51,6 +53,7 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -b .avf
 
 %build
 %configure \
@@ -245,6 +248,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com> 0.10.24-2
+- avf-support.patch: Add AVF file recognition (gnome #593117)
+
 * Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
 - Update to 0.10.24
 



From tmraz at fedoraproject.org  Wed Aug 26 15:22:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 15:22:56 +0000 (UTC)
Subject: rpms/xrdp/devel xrdp.spec,1.1,1.2
Message-ID: <20090826152256.779BD11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xrdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5436

Modified Files:
	xrdp.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
- rebuild with new openssl



Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/devel/xrdp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrdp.spec	14 Aug 2009 18:01:35 -0000	1.1
+++ xrdp.spec	26 Aug 2009 15:22:56 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.2.%{cvs}%{?dist}
+Release:   0.3.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -159,6 +159,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
+- rebuild with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 



From tmraz at fedoraproject.org  Wed Aug 26 15:26:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 15:26:47 +0000 (UTC)
Subject: rpms/xmlsec1/devel xmlsec1-1.2.12-openssl10.patch, NONE,
	1.1 xmlsec1.spec, 1.37, 1.38
Message-ID: <20090826152647.8B99111C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xmlsec1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6453

Modified Files:
	xmlsec1.spec 
Added Files:
	xmlsec1-1.2.12-openssl10.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.12-2
- rebuilt with new openssl


xmlsec1-1.2.12-openssl10.patch:
 x509vfy.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE xmlsec1-1.2.12-openssl10.patch ---
diff -up xmlsec1-1.2.12/src/openssl/x509vfy.c.ossl10 xmlsec1-1.2.12/src/openssl/x509vfy.c
--- xmlsec1-1.2.12/src/openssl/x509vfy.c.ossl10	2009-06-25 22:53:18.000000000 +0200
+++ xmlsec1-1.2.12/src/openssl/x509vfy.c	2009-08-26 16:40:04.000000000 +0200
@@ -173,7 +173,7 @@ xmlSecOpenSSLX509StoreVerify(xmlSecKeyDa
 			     XMLSEC_STACK_OF_X509_CRL* crls, xmlSecKeyInfoCtx* keyInfoCtx) {
     xmlSecOpenSSLX509StoreCtxPtr ctx;
     STACK_OF(X509)* certs2 = NULL;
-    STACK_OF(X509_CRLS)* crls2 = NULL;
+    STACK_OF(X509_CRL)* crls2 = NULL;
     X509* res = NULL;
     X509* cert;
     X509 *err_cert = NULL;
@@ -802,8 +802,8 @@ xmlSecOpenSSLX509FindCert(STACK_OF(X509)
 	    return(NULL);    
 	}
 
-	for(i = 0; i < certs->num; ++i) {
-	    cert = ((X509**)(certs->data))[i];
+	for(i = 0; i < sk_X509_num(certs); ++i) {
+	    cert = sk_X509_value(certs, i);
 	    subj = X509_get_subject_name(cert);
 	    if(xmlSecOpenSSLX509NamesCompare(nm, subj) == 0) {
 		X509_NAME_free(nm);
@@ -863,8 +863,8 @@ xmlSecOpenSSLX509FindCert(STACK_OF(X509)
 	BN_free(bn); 
 
 
-	for(i = 0; i < certs->num; ++i) {
-	    cert = ((X509**)(certs->data))[i];
+	for(i = 0; i < sk_X509_num(certs); ++i) {
+	    cert = sk_X509_value(certs, i);
 	    if(ASN1_INTEGER_cmp(X509_get_serialNumber(cert), serial) != 0) {
 		continue;
 	    } 
@@ -895,8 +895,8 @@ xmlSecOpenSSLX509FindCert(STACK_OF(X509)
 			xmlSecErrorsSafeString(ski));
 	    return(NULL);    	
 	}
-	for(i = 0; i < certs->num; ++i) {
-	    cert = ((X509**)(certs->data))[i];
+	for(i = 0; i < sk_X509_num(certs); ++i) {
+	    cert = sk_X509_value(certs, i);
 	    index = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1); 
 	    if((index >= 0)  && (ext = X509_get_ext(cert, index))) {
 		keyId = X509V3_EXT_d2i(ext);
@@ -982,9 +982,9 @@ xmlSecOpenSSLX509VerifyCertAgainstCrls(S
     /* 
      * Check if the current certificate is revoked by this CRL
      */
-    n = sk_num(X509_CRL_get_REVOKED(crl));
+    n = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
     for (i = 0; i < n; i++) {
-        revoked = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i);
+        revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
         if (ASN1_INTEGER_cmp(revoked->serialNumber, X509_get_serialNumber(cert)) == 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
 			NULL,


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xmlsec1.spec	21 Aug 2009 16:33:27 -0000	1.37
+++ xmlsec1.spec	26 Aug 2009 15:26:47 -0000	1.38
@@ -5,6 +5,7 @@ Release: 2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
+Patch1: xmlsec1-1.2.12-openssl10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.aleksey.com/xmlsec/
 Requires: libxml2 >= 2.6.0
@@ -134,6 +135,7 @@ Libraries, includes, etc. for developing
 
 %prep
 %setup -q
+%patch1 -p1 -b .ossl10
 
 %build
 %configure
@@ -232,7 +234,7 @@ rm -fr %{buildroot}
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.12-2
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.12-2
 - rebuilt with new openssl
 
 * Tue Aug 11 2009 Daniel Veillard <veillard at redhat.com> - 1.2.12-1



From hno at fedoraproject.org  Wed Aug 26 15:30:34 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 26 Aug 2009 15:30:34 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.50, 1.51 bzr.spec, 1.70, 1.71 sources, 
	1.50, 1.51
Message-ID: <20090826153034.B835511C025F@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8144

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
update to bzr 2.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	20 Aug 2009 08:26:34 -0000	1.50
+++ .cvsignore	26 Aug 2009 15:30:34 -0000	1.51
@@ -1,2 +1,2 @@
-bzr-1.18rc1.tar.gz
-bzr-1.18rc1.tar.gz.sig
+bzr-2.0rc1.tar.gz
+bzr-2.0rc1.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- bzr.spec	20 Aug 2009 08:26:34 -0000	1.70
+++ bzr.spec	26 Aug 2009 15:30:34 -0000	1.71
@@ -6,7 +6,7 @@
 #   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 1.18
+%define bzrmajor 2.0
 %define bzrrc rc1
 %define release 0.1
 
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-0.1.rc1
+- Update to 2.0rc1
+
 * Thu Aug 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-0.1.rc1
 - Update to 1.18rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	20 Aug 2009 08:26:34 -0000	1.50
+++ sources	26 Aug 2009 15:30:34 -0000	1.51
@@ -1,2 +1,2 @@
-aad4fd062ae62346c1d5d6efd9cc3763  bzr-1.18rc1.tar.gz
-79be731b4603bc0753a24731f84d0cc3  bzr-1.18rc1.tar.gz.sig
+441e4d0625b8f0fa5e6438141e3915bf  bzr-2.0rc1.tar.gz
+6a6ff6c78ece4ddd4e0639060a13b090  bzr-2.0rc1.tar.gz.sig



From tmraz at fedoraproject.org  Wed Aug 26 15:31:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 15:31:37 +0000 (UTC)
Subject: rpms/znc/devel znc-0.075-openssl.patch,NONE,1.1 znc.spec,1.14,1.15
Message-ID: <20090826153137.A50E611C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8425

Modified Files:
	znc.spec 
Added Files:
	znc-0.075-openssl.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
- rebuilt with new openssl


znc-0.075-openssl.patch:
 Csocket.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE znc-0.075-openssl.patch ---
diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
+++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
@@ -990,7 +990,11 @@ private:
 	CS_STRING			m_sSSLBuffer;
 	SSL 				*m_ssl;
 	SSL_CTX				*m_ssl_ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD		*m_ssl_method;
+#else
 	SSL_METHOD			*m_ssl_method;
+#endif
 	unsigned int		m_iRequireClientCertFlags;
 
 	FPCertVerifyCB		m_pCerVerifyCB;


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- znc.spec	21 Aug 2009 16:38:39 -0000	1.14
+++ znc.spec	26 Aug 2009 15:31:37 -0000	1.15
@@ -7,6 +7,7 @@ Group:          System Environment/Daemo
 URL:            http://znc.sf.net/
 # SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
 Source0:        znc-0.075.svn1608.tar.bz2 
+Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,6 +44,7 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 #chmod -x modules/q.cpp
 
@@ -126,7 +128,7 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
 - rebuilt with new openssl
 
 * Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608



From mhlavink at fedoraproject.org  Wed Aug 26 15:41:27 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 26 Aug 2009 15:41:27 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch, 1.1,
	1.2 smartmontools.spec, 1.57, 1.58
Message-ID: <20090826154127.2D49111C0082@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10550

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
updated patch for lower capabilities


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.cpp   |   12 ++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/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	21 Aug 2009 11:02:44 -0000	1.1
+++ smartmontools-5.38-lowcap.patch	26 Aug 2009 15:41:26 -0000	1.2
@@ -1,18 +1,50 @@
 diff -urp smartmontools-5.38.orig/configure.in smartmontools-5.38/configure.in
 --- smartmontools-5.38.orig/configure.in	2009-08-16 07:42:57.000000000 -0400
-+++ smartmontools-5.38/configure.in	2009-08-16 08:07:53.000000000 -0400
-@@ -143,6 +143,8 @@ if test "$with_selinux" = "yes"; then
++++ smartmontools-5.38/configure.in	2009-08-21 12:07:15.000000000 -0400
+@@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
  
-+LIBCAP_NG_PATH
++  AC_ARG_WITH(libcap-ng,
++    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
++    with_libcap_ng=auto)
++
++# Check for Libcap-ng API
++#
++# libcap-ng detection
++
++if test x$with_libcap_ng = xno ; then
++    have_libcap_ng=no;
++else
++    # Start by checking for header file
++    AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
++
++    # See if we have libcap-ng library
++    AC_CHECK_LIB(cap-ng, capng_clear, CAPNG_LDADD=-lcap-ng,)
++
++    # Check results are usable
++    if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
++       AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
++    fi
++    if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
++       AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
++    fi
++fi
++AC_SUBST(CAPNG_LDADD)
++AC_MSG_CHECKING(whether to use libcap-ng)
++if test x$CAPNG_LDADD != x ; then
++    AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
++    AC_MSG_RESULT(yes)
++else
++    AC_MSG_RESULT(no)
++fi
 +
  if test "$prefix" = "NONE"; then
      dnl no prefix and no mandir, so use ${prefix}/share/man as default
      if test "$mandir" = '${prefix}/man'; then
 diff -urp smartmontools-5.38.orig/Makefile.am smartmontools-5.38/Makefile.am
 --- smartmontools-5.38.orig/Makefile.am	2009-08-16 07:42:57.000000000 -0400
-+++ smartmontools-5.38/Makefile.am	2009-08-16 08:07:53.000000000 -0400
++++ smartmontools-5.38/Makefile.am	2009-08-21 11:28:22.000000000 -0400
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -24,7 +56,7 @@ diff -urp smartmontools-5.38.orig/Makefi
  EXTRA_smartd_SOURCES = os_darwin.cpp    \
 diff -urp smartmontools-5.38.orig/smartd.cpp smartmontools-5.38/smartd.cpp
 --- smartmontools-5.38.orig/smartd.cpp	2009-08-16 07:42:57.000000000 -0400
-+++ smartmontools-5.38/smartd.cpp	2009-08-16 08:08:27.000000000 -0400
++++ smartmontools-5.38/smartd.cpp	2009-08-21 11:28:22.000000000 -0400
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- smartmontools.spec	21 Aug 2009 11:02:44 -0000	1.57
+++ smartmontools.spec	26 Aug 2009 15:41:26 -0000	1.58
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	14%{?dist}
+Release: 	15%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -18,7 +18,7 @@ Patch6:     smartmontools-5.38-lowcap.pa
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	fileutils mailx chkconfig initscripts
 BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext
-BuildRequires: libselinux-devel
+BuildRequires: libselinux-devel libcap-ng-devel
 
 %description
 The smartmontools package contains two utility programs (smartctl
@@ -38,7 +38,9 @@ failure.
 %patch6 -p1 -b .lowcap
 
 %build
-%configure --with-selinux
+ln -s CHANGELOG ChangeLog
+autoreconf -i
+%configure --with-selinux --with-libcap-ng=yes
 %ifarch sparc64
 make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %else
@@ -77,6 +79,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Wed Aug 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-15
+- updated patch for lower capabilities (#517728)
+- added buildrequires libcap-ng-devel
+
 * Fri Aug 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-14
 - drop all unnecessary capabilities (#517728)
 



From berrange at fedoraproject.org  Wed Aug 26 15:44:49 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Wed, 26 Aug 2009 15:44:49 +0000 (UTC)
Subject: rpms/perl-Sys-Virt-TCK/devel Sys-Virt-TCK-0.1.0-clone-api.patch,
	NONE, 1.1 Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch, NONE,
	1.1 Sys-Virt-TCK-0.1.0-skip-dom0.patch, NONE,
	1.1 perl-Sys-Virt-TCK.spec, 1.3, 1.4
Message-ID: <20090826154449.87DA011C0082@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11412

Modified Files:
	perl-Sys-Virt-TCK.spec 
Added Files:
	Sys-Virt-TCK-0.1.0-clone-api.patch 
	Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch 
	Sys-Virt-TCK-0.1.0-skip-dom0.patch 
Log Message:
Fix Xen portability issues & re-enable clone test

Sys-Virt-TCK-0.1.0-clone-api.patch:
 200-clone-vol-dir.t |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-clone-api.patch ---
diff -rup Sys-Virt-TCK-0.1.0.orig/scripts/storage/200-clone-vol-dir.t Sys-Virt-TCK-0.1.0.new/scripts/storage/200-clone-vol-dir.t
--- Sys-Virt-TCK-0.1.0.orig/scripts/storage/200-clone-vol-dir.t	2009-07-22 18:33:55.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/scripts/storage/200-clone-vol-dir.t	2009-08-26 16:42:01.000000000 +0100
@@ -102,7 +102,7 @@ foreach my $format (@formats) {
     my $volclonexml = $tck->generic_volume("test$format", $format, 1024*1024*50)->as_xml;
 
     my $clone;
-    ok_volume { $clone = $pool->create_volume($volclonexml, $vol) } "clone to $format volume";
+    ok_volume { $clone = $pool->clone_volume($volclonexml, $vol) } "clone to $format volume";
 
     $path = xpath($clone, "string(/volume/target/path)");
     $st = stat($path);
@@ -113,7 +113,7 @@ foreach my $format (@formats) {
     diag "Cloning cloned volume back to raw format";
     my $voldstxml = $tck->generic_volume("testdst", "raw", 1024*1024*50)->as_xml;
     my $result;
-    ok_volume { $result = $pool->create_volume($voldstxml, $clone) } "clone back to raw volume";
+    ok_volume { $result = $pool->clone_volume($voldstxml, $clone) } "clone back to raw volume";
 
 
     $path = xpath($result, "string(/volume/target/path)");

Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch:
 default.cfg |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-i686-pae-kernels.patch ---
diff -rup Sys-Virt-TCK-0.1.0.orig/conf/default.cfg Sys-Virt-TCK-0.1.0.new/conf/default.cfg
--- Sys-Virt-TCK-0.1.0.orig/conf/default.cfg	2009-07-22 18:33:55.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/conf/default.cfg	2009-08-26 16:17:10.000000000 +0100
@@ -54,8 +54,8 @@ kernels = (
        hvm
        xen
      )
-     kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/vmlinuz
-     initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/initrd.img
+     kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/vmlinuz-PAE
+     initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/initrd-PAE.img
    }
    # Fedora 11 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here
    {

Sys-Virt-TCK-0.1.0-skip-dom0.patch:
 TCK.pm |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-skip-dom0.patch ---
diff -rup Sys-Virt-TCK-0.1.0.orig/lib/Sys/Virt/TCK.pm Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm
--- Sys-Virt-TCK-0.1.0.orig/lib/Sys/Virt/TCK.pm	2009-08-26 16:13:28.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm	2009-08-26 16:16:19.000000000 +0100
@@ -72,7 +72,7 @@ sub setup {
 sub sanity_check {
     my $self = shift;
 
-    my @doms = $self->{conn}->list_domains;
+    my @doms = grep { $_->get_id > 0 } $self->{conn}->list_domains;
     if (@doms) {
 	die "there is/are " . int(@doms) . " pre-existing active domain(s) in this driver";
     }
@@ -96,11 +96,9 @@ sub sanity_check {
 sub reset {
     my $self = shift;
 
-    my @doms = $self->{conn}->list_domains;
+    my @doms = grep { $_->get_id > 0 } $self->{conn}->list_domains;
     foreach my $dom (@doms) {
-	if ($dom->get_id != 0) {
-	    $dom->destroy;
-	}
+	$dom->destroy;
     }
 
     @doms = $self->{conn}->list_defined_domains();


Index: perl-Sys-Virt-TCK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel/perl-Sys-Virt-TCK.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Sys-Virt-TCK.spec	5 Aug 2009 16:41:25 -0000	1.3
+++ perl-Sys-Virt-TCK.spec	26 Aug 2009 15:44:49 -0000	1.4
@@ -10,14 +10,17 @@
 Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit
 Name: perl-%{appname}
 Version: 0.1.0
-Release: 5%{dist}
+Release: 6%{dist}
 License: GPLv2 or Artistic
 Group: Development/Tools
 Source: http://libvirt.org/sources/tck/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-cleanup-skip.patch
+Patch2: %{appname}-%{version}-skip-dom0.patch
+Patch3: %{appname}-%{version}-i686-pae-kernels.patch
+Patch4: %{appname}-%{version}-clone-api.patch
 Url: http://libvirt.org/
 BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libvirt >= 0.6.2
+Requires: libvirt >= 0.6.4
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(accessors)
 BuildRequires: perl(App::Prove)
@@ -37,14 +40,18 @@ BuildRequires: perl(TAP::Harness::Archiv
 BuildRequires: perl(Test::Builder)
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Sub::Uplevel)
-BuildRequires: perl(Sys::Virt) >= 0.2.0
+BuildRequires: perl(Sys::Virt) >= 0.2.1
 BuildRequires: perl(XML::Twig)
 BuildRequires: perl(XML::Writer)
 BuildRequires: perl(XML::XPath)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
-# RPM autoprovides mising this
+# RPM autoprovides misses these 3
 Requires: perl(Test::Exception)
+Requires: perl(TAP::Formatter::HTML)
+Requires: perl(TAP::Harness::Archive)
+# Want to force this minimal version, so don't rely on RPM autoprov
+Requires: perl(Sys::Virt) >= 0.2.1
 BuildArchitectures: noarch
 
 %description
@@ -55,6 +62,9 @@ technology.
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -72,9 +82,6 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 %__install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt-tck
 
-# Requires newer libvirt perl binding
-rm -f $RPM_BUILD_ROOT/%{_datadir}/libvirt-tck/tests/storage/200-clone-vol-dir.t
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/cache/libvirt-tck
 
 %changelog
+* Wed Aug 26 2009 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-6
+- Skip over Xen dom0 domains
+- Use PAE kernel for i686 by default so it works with Xen
+- Re-enable cloning test now newer Sys-Virt exists in rawhide
+
 * Wed Aug  5 2009 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-5
 - Add missing perl-Test-Exception dep
 - Skip cleanup if sanity check fails



From lkundrak at fedoraproject.org  Wed Aug 26 15:47:43 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 26 Aug 2009 15:47:43 +0000 (UTC)
Subject: rpms/s3cmd/EL-5 s3cmd-0.9.9-hashlib.patch, NONE, 1.1 s3cmd.spec, 1.4,
	1.5
Message-ID: <20090826154743.DB75F11C0082@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12188

Modified Files:
	s3cmd.spec 
Added Files:
	s3cmd-0.9.9-hashlib.patch 
Log Message:
* Wed Aug 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1.1
- Fix for 2.5-ish hashlib with 2.4


s3cmd-0.9.9-hashlib.patch:
 Utils.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE s3cmd-0.9.9-hashlib.patch ---
>From fd4a3b619c44de792b2614cb2d91fee17f416d27 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel (Good Data) <lubo.rintel at goodddata.com>
Date: Wed, 26 Aug 2009 15:48:53 +0200
Subject: [PATCH] Use sha module for sha1 functionality on <= 2.4

Hashlib's sha1 Won't work on python 2.4 (e.g. EL-5), reportedly because
older python's hmac module reportedly requires sha module instead. Using
it fixes the issue. Tested with Python 2.4 and 2.6.
---
 S3/Utils.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/S3/Utils.py b/S3/Utils.py
index ae91841..6e2af88 100644
--- a/S3/Utils.py
+++ b/S3/Utils.py
@@ -9,11 +9,17 @@ import re
 import string
 import random
 import rfc822
+import sys
 try:
-	from hashlib import md5, sha1
+	if sys.version_info[0:2] <= (2,4):
+		from hashlib import md5;
+		import sha as sha1
+	else:
+		from hashlib import md5, sha1
 except ImportError:
 	from md5 import md5
 	import sha as sha1
+
 import hmac
 import base64
 import errno
-- 
1.6.2.5



Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- s3cmd.spec	24 Feb 2009 09:21:43 -0000	1.4
+++ s3cmd.spec	26 Aug 2009 15:47:43 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           s3cmd
 Version:        0.9.9
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -10,6 +10,8 @@ License:        GPLv2
 URL:            http://s3tools.logix.cz/s3cmd
 Source0:        http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz
 Patch0:         s3cmd-0.9.8.1-noet.patch
+# Sent upstream
+Patch1:         s3cmd-0.9.9-hashlib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -18,6 +20,7 @@ BuildRequires:  python-devel
 # This is in standard library since 2.5
 Requires:       python-elementtree
 %endif
+Requires:       python-hashlib
 
 %description
 S3cmd lets you copy files from/to Amazon S3
@@ -56,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1.1
+- Fix for 2.5-ish hashlib with 2.4
+
 * Tue Feb 24 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1
 - New upstream release
 



From cebbert at fedoraproject.org  Wed Aug 26 15:50:20 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 26 Aug 2009 15:50:20 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1116, 1.1117 kernel.spec, 1.1740, 1.1741 sources, 1.1074,
	1.1075 upstream, 1.988, 1.989 patch-2.6.31-rc7-git2.bz2.sign,
	1.1, NONE xen-x86-fix-stackprotect.patch, 1.1,
	NONE xen-x86-no-stackprotect.patch, 1.1, NONE
Message-ID: <20090826155020.2235311C043A@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12878

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git4.bz2.sign 
Removed Files:
	patch-2.6.31-rc7-git2.bz2.sign xen-x86-fix-stackprotect.patch 
	xen-x86-no-stackprotect.patch 
Log Message:
2.6.31-rc7-git4
Drop patches merged upstream:
  xen-x86-fix-stackprotect.patch
  xen-x86-no-stackprotect.patch


--- NEW FILE patch-2.6.31-rc7-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBKlSaJyGugalF9Dw4RAvx8AJkBOxwrd1XXzRAZCf/qEUTX9daFjwCYln/P
K6GN3ry0CMcWKkcjWGgwnA==
=ZSyc
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1116
retrieving revision 1.1117
diff -u -p -r1.1116 -r1.1117
--- .cvsignore	25 Aug 2009 00:43:51 -0000	1.1116
+++ .cvsignore	26 Aug 2009 15:50:19 -0000	1.1117
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git2.bz2
+patch-2.6.31-rc7-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -p -r1.1740 -r1.1741
--- kernel.spec	26 Aug 2009 13:58:24 -0000	1.1740
+++ kernel.spec	26 Aug 2009 15:50:19 -0000	1.1741
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -725,8 +725,6 @@ Patch12011: linux-2.6-block-silently-err
 
 # fix xen boot
 Patch12020: xen-fb-probe-fix.patch
-Patch12021: xen-x86-fix-stackprotect.patch
-Patch12022: xen-x86-no-stackprotect.patch
 
 Patch90000: allow-disabling-ima.diff
 
@@ -1344,8 +1342,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 
 # fix xen boot
 ApplyPatch xen-fb-probe-fix.patch
-ApplyPatch xen-x86-fix-stackprotect.patch
-ApplyPatch xen-x86-no-stackprotect.patch
 
 ApplyPatch allow-disabling-ima.diff
 
@@ -2015,6 +2011,12 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git4
+- Drop patches merged upstream:
+  xen-x86-fix-stackprotect.patch
+  xen-x86-no-stackprotect.patch
+
 * Wed Aug 26 2009 Adam Jackson <ajax at redhat.com>
 - drm-intel-next.patch: Update, various output setup fixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1074
retrieving revision 1.1075
diff -u -p -r1.1074 -r1.1075
--- sources	25 Aug 2009 00:43:51 -0000	1.1074
+++ sources	26 Aug 2009 15:50:19 -0000	1.1075
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-fb0cac7a741028e2ef185e8e87a51515  patch-2.6.31-rc7-git2.bz2
+8329c25267787e591972e477b113c08b  patch-2.6.31-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -p -r1.988 -r1.989
--- upstream	25 Aug 2009 00:43:51 -0000	1.988
+++ upstream	26 Aug 2009 15:50:19 -0000	1.989
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git2.bz2
+patch-2.6.31-rc7-git4.bz2


--- patch-2.6.31-rc7-git2.bz2.sign DELETED ---


--- xen-x86-fix-stackprotect.patch DELETED ---


--- xen-x86-no-stackprotect.patch DELETED ---



From tmraz at fedoraproject.org  Wed Aug 26 15:50:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 15:50:36 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.138,1.139
Message-ID: <20090826155036.A04CD11C043A@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12949

Modified Files:
	openssl.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.5.beta3
- drop the compat symlink hacks



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- openssl.spec	22 Aug 2009 14:37:51 -0000	1.138
+++ openssl.spec	26 Aug 2009 15:50:36 -0000	1.139
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.4.%{beta}%{?dist}
+Release: 0.5.%{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
@@ -74,14 +74,6 @@ BuildRequires: mktemp, krb5-devel, perl,
 BuildRequires: /usr/bin/rename
 Requires: mktemp, ca-certificates >= 2008-5
 
-# Temporary hack
-Requires(post): coreutils
-%ifarch ppc64 s390x sparc64 x86_64
-Provides: libcrypto.so.8()(64bit) libssl.so.8()(64bit)
-%else
-Provides: libcrypto.so.8 libssl.so.8
-%endif
-
 %description
 The OpenSSL toolkit provides support for secure communications between
 machines. OpenSSL includes a certificate management tool and shared
@@ -264,8 +256,6 @@ for lib in $RPM_BUILD_ROOT%{_libdir}/*.s
 	chmod 755 ${lib}
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.%{soversion}
-# Temporary hack
-	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.8
 
 done
 
@@ -382,9 +372,6 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %attr(0644,root,root) %{_mandir}/man5*/*
 %attr(0644,root,root) %{_mandir}/man7*/*
 
-# Temporary hack
-%attr(0755,root,root) %{_libdir}/*.so.8
-
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/openssl
@@ -407,18 +394,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 
 %postun -p /sbin/ldconfig
 
-%triggerpostun -- openssl < 1.0.0
-# Temporary hack
-[ $1 != 0 ] || exit 0
-if [ "$(readlink %{_libdir}/libcrypto.so.8)" != libcrypto.so.%{version} ] ; then
-    ln -sf libcrypto.so.%{version} %{_libdir}/libcrypto.so.8 || :
-fi
-if [ "$(readlink %{_libdir}/libssl.so.8)" != libssl.so.%{version} ] ; then
-    ln -sf libssl.so.%{version} %{_libdir}/libssl.so.8 || :
-fi
-/sbin/ldconfig -X
-
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.5.beta3
+- drop the compat symlink hacks
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.4.beta3
 - constify SSL_CIPHER_description()
 



From hno at fedoraproject.org  Wed Aug 26 15:52:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 26 Aug 2009 15:52:45 +0000 (UTC)
Subject: rpms/bzrtools/F-11 .cvsignore, 1.31, 1.32 bzrtools.spec, 1.48,
	1.49 sources, 1.32, 1.33
Message-ID: <20090826155245.B84F711C0082@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13498

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
1.18.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-11/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	27 Jul 2009 19:58:01 -0000	1.31
+++ .cvsignore	26 Aug 2009 15:52:45 -0000	1.32
@@ -1 +1 @@
-bzrtools-1.17.0.tar.gz
+bzrtools-1.18.0.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-11/bzrtools.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- bzrtools.spec	27 Jul 2009 19:58:01 -0000	1.48
+++ bzrtools.spec	26 Aug 2009 15:52:45 -0000	1.49
@@ -5,8 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.17
-%define bzrnextver 1.18
+%define bzrver 1.18
+%define bzrnextver 1.19
 
 Name:           bzrtools
 Version:        %{bzrver}.0
@@ -16,7 +16,7 @@ Summary:        A collection of utilitie
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
-Source0:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/bzrtools/stable/%{bzrver}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18.0-2
+- Update to 1.18.0
+
 * Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.17.0-1
 - Update to 1.17.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Jul 2009 19:58:01 -0000	1.32
+++ sources	26 Aug 2009 15:52:45 -0000	1.33
@@ -1 +1 @@
-e03c8528ca5f455968957c44d72a6f61  bzrtools-1.17.0.tar.gz
+c442eacab5173b0ddc4094c6daf32c17  bzrtools-1.18.0.tar.gz



From hno at fedoraproject.org  Wed Aug 26 15:53:19 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 26 Aug 2009 15:53:19 +0000 (UTC)
Subject: rpms/bzr/F-11 .cvsignore, 1.43, 1.44 bzr.spec, 1.61, 1.62 sources, 
	1.43, 1.44
Message-ID: <20090826155319.84EF411C0082@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13700

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	27 Jul 2009 19:55:01 -0000	1.43
+++ .cvsignore	26 Aug 2009 15:53:19 -0000	1.44
@@ -1 +1 @@
-bzr-1.17.tar.gz
+bzr-1.18.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/bzr.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- bzr.spec	27 Jul 2009 19:55:01 -0000	1.61
+++ bzr.spec	26 Aug 2009 15:53:19 -0000	1.62
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # bzr major versions uses two digits. Specify subreleases if any in Version:
-%define bzrver 1.17
+%define bzrver 1.18
 
 Name:           bzr
 Version:        %{bzrver}
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-1
+- Update to 1.18
+
 * Mon Jul 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.17-1
 - Update to 1.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	27 Jul 2009 19:55:01 -0000	1.43
+++ sources	26 Aug 2009 15:53:19 -0000	1.44
@@ -1 +1 @@
-d772508e60b47a1641fa487c5cf7e08e  bzr-1.17.tar.gz
+efc91bada508089fbeb2d92973ecfe0a  bzr-1.18.tar.gz



From lkundrak at fedoraproject.org  Wed Aug 26 15:54:50 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 26 Aug 2009 15:54:50 +0000 (UTC)
Subject: rpms/s3cmd/EL-5 s3cmd.spec,1.5,1.6
Message-ID: <20090826155450.DEBE411C0082@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14207

Modified Files:
	s3cmd.spec 
Log Message:
If I got a 1b for every time I forget to apply a patch...


Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- s3cmd.spec	26 Aug 2009 15:47:43 -0000	1.5
+++ s3cmd.spec	26 Aug 2009 15:54:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           s3cmd
 Version:        0.9.9
-Release:        1%{?dist}.1
+Release:        1%{?dist}.2
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -31,6 +31,7 @@ command line client.
 %prep
 %setup -q
 %patch0 -p1 -b .noet
+%patch1 -p1 -b .hashlib
 
 
 %build
@@ -59,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1.1
+* Wed Aug 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1.2
 - Fix for 2.5-ish hashlib with 2.4
 
 * Tue Feb 24 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1



From tmraz at fedoraproject.org  Wed Aug 26 16:05:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 16:05:05 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.57,1.58
Message-ID: <20090826160505.774FA11C0082@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17147

Modified Files:
	util-linux-ng.spec 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-8
- rebuilt with new audit



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- util-linux-ng.spec	23 Aug 2009 19:25:24 -0000	1.57
+++ util-linux-ng.spec	26 Aug 2009 16:05:05 -0000	1.58
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -716,12 +716,12 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-8
+- rebuilt with new audit
+
 * Sun Aug 23 2009 Karel Zak <kzak at redhat.com> 2.16-7
 - fix #518572 - blkid requires ext2.ko to be decompressed on installation media
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-6
-- rebuilt with new audit
-
 * Thu Aug 13 2009 Karel Zak <kzak at redhat.com> 2.16-5
 - fix #513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
 



From lkundrak at fedoraproject.org  Wed Aug 26 16:08:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 26 Aug 2009 16:08:40 +0000 (UTC)
Subject: rpms/s3cmd/EL-5 s3cmd-0.9.9-hashlib.patch,1.1,1.2
Message-ID: <20090826160840.78B8C11C0082@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17786

Modified Files:
	s3cmd-0.9.9-hashlib.patch 
Log Message:
Adjust the patch for 0.9.9

s3cmd-0.9.9-hashlib.patch:
 S3.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: s3cmd-0.9.9-hashlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd-0.9.9-hashlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- s3cmd-0.9.9-hashlib.patch	26 Aug 2009 15:47:43 -0000	1.1
+++ s3cmd-0.9.9-hashlib.patch	26 Aug 2009 16:08:40 -0000	1.2
@@ -1,4 +1,3 @@
-From fd4a3b619c44de792b2614cb2d91fee17f416d27 Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel (Good Data) <lubo.rintel at goodddata.com>
 Date: Wed, 26 Aug 2009 15:48:53 +0200
 Subject: [PATCH] Use sha module for sha1 functionality on <= 2.4
@@ -6,19 +5,16 @@ Subject: [PATCH] Use sha module for sha1
 Hashlib's sha1 Won't work on python 2.4 (e.g. EL-5), reportedly because
 older python's hmac module reportedly requires sha module instead. Using
 it fixes the issue. Tested with Python 2.4 and 2.6.
----
- S3/Utils.py |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
 
-diff --git a/S3/Utils.py b/S3/Utils.py
-index ae91841..6e2af88 100644
---- a/S3/Utils.py
-+++ b/S3/Utils.py
-@@ -9,11 +9,17 @@ import re
- import string
- import random
- import rfc822
-+import sys
+diff -up s3cmd-0.9.9/S3/S3.py.hashlib s3cmd-0.9.9/S3/S3.py
+--- s3cmd-0.9.9/S3/S3.py.hashlib	2009-02-14 05:41:41.000000000 +0100
++++ s3cmd-0.9.9/S3/S3.py	2009-08-26 18:07:07.000000000 +0200
+@@ -12,9 +12,14 @@ import logging
+ import mimetypes
+ from logging import debug, info, warning, error
+ from stat import ST_SIZE
++import sys;
+ 
  try:
 -	from hashlib import md5, sha1
 +	if sys.version_info[0:2] <= (2,4):
@@ -29,10 +25,3 @@ index ae91841..6e2af88 100644
  except ImportError:
  	from md5 import md5
  	import sha as sha1
-+
- import hmac
- import base64
- import errno
--- 
-1.6.2.5
-



From hno at fedoraproject.org  Wed Aug 26 16:12:36 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 26 Aug 2009 16:12:36 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.51, 1.52 bzr.spec, 1.71, 1.72 sources, 
	1.51, 1.52
Message-ID: <20090826161236.B249E11C0082@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18534

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
Go "down" to 1.18 instead. The 2.0rc1 release wasn't quite ready after all..



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	26 Aug 2009 15:30:34 -0000	1.51
+++ .cvsignore	26 Aug 2009 16:12:36 -0000	1.52
@@ -1,2 +1,2 @@
-bzr-2.0rc1.tar.gz
-bzr-2.0rc1.tar.gz.sig
+bzr-1.18.tar.gz
+bzr-1.18.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- bzr.spec	26 Aug 2009 15:30:34 -0000	1.71
+++ bzr.spec	26 Aug 2009 16:12:36 -0000	1.72
@@ -6,9 +6,9 @@
 #   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 bzrrc rc1
-%define release 0.1
+%define bzrmajor 1.18
+#define bzrrc rc1
+%define release 1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -91,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-0.1.rc1
-- Update to 2.0rc1
+* Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-1
+- Update to 1.18
 
 * Thu Aug 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-0.1.rc1
 - Update to 1.18rc1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	26 Aug 2009 15:30:34 -0000	1.51
+++ sources	26 Aug 2009 16:12:36 -0000	1.52
@@ -1,2 +1,2 @@
-441e4d0625b8f0fa5e6438141e3915bf  bzr-2.0rc1.tar.gz
-6a6ff6c78ece4ddd4e0639060a13b090  bzr-2.0rc1.tar.gz.sig
+efc91bada508089fbeb2d92973ecfe0a  bzr-1.18.tar.gz
+a6b09b5e95ab4ce2f4dcd56f0c85c3a9  bzr-1.18.tar.gz.sig



From mtasaka at fedoraproject.org  Wed Aug 26 16:13:16 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 16:13:16 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.33, 1.34 kazehakase.spec, 1.89, 
	1.90 sources, 1.33, 1.34
Message-ID: <20090826161316.84A2411C0082@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18780

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3781



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	17 Aug 2009 17:04:12 -0000	1.33
+++ .cvsignore	26 Aug 2009 16:13:16 -0000	1.34
@@ -1 +1 @@
-kazehakase-0.5.6-svn3779_trunk.tar.gz
+kazehakase-0.5.6-svn3781_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kazehakase.spec	17 Aug 2009 17:04:12 -0000	1.89
+++ kazehakase.spec	26 Aug 2009 16:13:16 -0000	1.90
@@ -31,7 +31,7 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3779_trunk
+%define		svnver		3781_trunk
 
 
 %define		fedorarel	16
@@ -54,7 +54,6 @@ URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
-Patch15:	kazehakase-rev3773-gtk021705.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -182,7 +181,6 @@ This package uses WebKit for HTML render
 
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
-%patch15 -p0 -b .gtk
 
 %if %{need_autogen}
 sh autogen.sh
@@ -321,8 +319,8 @@ desktop-file-install \
 %endif
 
 %changelog
-* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3779
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3781
 
 * Sun Jul 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 3778


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	17 Aug 2009 17:04:12 -0000	1.33
+++ sources	26 Aug 2009 16:13:16 -0000	1.34
@@ -1 +1 @@
-0314db4d428992ff4f0a2a0be0fa240b  kazehakase-0.5.6-svn3779_trunk.tar.gz
+6172e840145405148d6af942f6356e00  kazehakase-0.5.6-svn3781_trunk.tar.gz



From scop at fedoraproject.org  Wed Aug 26 16:14:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 26 Aug 2009 16:14:57 +0000 (UTC)
Subject: rpms/cd-discid/devel .cvsignore, 1.2, 1.3 cd-discid.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <20090826161457.7D35B11C0082@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/cd-discid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19175

Modified Files:
	.cvsignore cd-discid.spec sources 
Log Message:
* Wed Aug 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
- Update to 1.0 (#519289).
- Update URLs.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jan 2005 08:19:20 -0000	1.2
+++ .cvsignore	26 Aug 2009 16:14:57 -0000	1.3
@@ -1 +1 @@
-cd-discid_0.9.orig.tar.gz
+cd-discid-1.0.tar.gz


Index: cd-discid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/devel/cd-discid.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cd-discid.spec	24 Jul 2009 18:42:52 -0000	1.11
+++ cd-discid.spec	26 Aug 2009 16:14:57 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           cd-discid
-Version:        0.9
-Release:        11%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Utility to get CDDB discid information
 
 Group:          Applications/Multimedia
 # Also "Larry Wall's Artistic" upstream, but that's not accepted in Fedora
 License:        GPLv2+
-URL:            http://freshmeat.net/projects/cddiscid/
-Source0:        http://lly.org/~rcw/cd-discid/cd-discid_%{version}.orig.tar.gz
+URL:            http://linukz.org/cd-discid.shtml
+Source0:        http://linukz.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -42,26 +42,30 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1
+- Update to 1.0 (#519289).
+- Update URLs.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu Nov 20 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9-9
+* Thu Nov 20 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9-9
 - Update source tarball URL.
 
-* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9-8
+* Sat Feb  9 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.9-8
 - Rebuild.
 
-* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.9-7
+* Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 0.9-7
 - License: GPLv2+
 - Add URL.
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.9-6
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.9-6
 - Rebuild.
 
-* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.9-5
+* Wed Feb 15 2006 Ville Skytt? <ville.skytta at iki.fi> - 0.9-5
 - Rebuild, specfile cleanup.
 
 * Tue Jul 26 2005 Nils Philippsen <nphilipp at redhat.com>
@@ -70,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
-* Mon Jan 17 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.9-2
+* Mon Jan 17 2005 Ville Skytt? <ville.skytta at iki.fi> - 0.9-2
 - Honor $RPM_OPT_FLAGS.
 - Improve description.
 - "Fix" man page permissions.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cd-discid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jan 2005 08:19:20 -0000	1.2
+++ sources	26 Aug 2009 16:14:57 -0000	1.3
@@ -1 +1 @@
-64677b8b63d1db0db015043f5455171a  cd-discid_0.9.orig.tar.gz
+ccca88ffec8d8497714e9a1203c81c5a  cd-discid-1.0.tar.gz



From orion at fedoraproject.org  Wed Aug 26 16:15:34 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 26 Aug 2009 16:15:34 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.40,1.41
Message-ID: <20090826161534.E80F711C0082@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19379

Modified Files:
	paraview.spec 
Log Message:
Disable more plugins



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- paraview.spec	26 Aug 2009 14:41:32 -0000	1.40
+++ paraview.spec	26 Aug 2009 16:15:34 -0000	1.41
@@ -74,7 +74,14 @@ Provides:       paraview-demos = %{versi
 #	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\
 #	-DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON
 #	-DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\
 #	-DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON
 %define paraview_cmake_options \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
         -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
@@ -84,17 +91,10 @@ Provides:       paraview-demos = %{versi
 	-DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\
-	-DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON \\\
 	-DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF \\\
         -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \\\
@@ -387,7 +387,7 @@ update-mime-database %{_datadir}/mime &>
 
 %changelog
 * Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
-- Disable building various View plugins, need OverView
+- Disable building various plugins that need OverView
 
 * Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
 - Disable building OverView - not ready yet



From mhlavink at fedoraproject.org  Wed Aug 26 16:17:56 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 26 Aug 2009 16:17:56 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch, 1.2,
	1.3 smartmontools.spec, 1.58, 1.59
Message-ID: <20090826161756.C084B11C0082@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19872

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
extend capability for smart check


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.cpp   |   12 ++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/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	26 Aug 2009 15:41:26 -0000	1.2
+++ smartmontools-5.38-lowcap.patch	26 Aug 2009 16:17:56 -0000	1.3
@@ -1,6 +1,6 @@
-diff -urp smartmontools-5.38.orig/configure.in smartmontools-5.38/configure.in
---- smartmontools-5.38.orig/configure.in	2009-08-16 07:42:57.000000000 -0400
-+++ smartmontools-5.38/configure.in	2009-08-21 12:07:15.000000000 -0400
+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
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -42,9 +42,9 @@ diff -urp smartmontools-5.38.orig/config
  if test "$prefix" = "NONE"; then
      dnl no prefix and no mandir, so use ${prefix}/share/man as default
      if test "$mandir" = '${prefix}/man'; then
-diff -urp smartmontools-5.38.orig/Makefile.am smartmontools-5.38/Makefile.am
---- smartmontools-5.38.orig/Makefile.am	2009-08-16 07:42:57.000000000 -0400
-+++ smartmontools-5.38/Makefile.am	2009-08-21 11:28:22.000000000 -0400
+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
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -54,9 +54,9 @@ diff -urp smartmontools-5.38.orig/Makefi
  smartd_DEPENDENCIES = @os_deps@
  
  EXTRA_smartd_SOURCES = os_darwin.cpp    \
-diff -urp smartmontools-5.38.orig/smartd.cpp smartmontools-5.38/smartd.cpp
---- smartmontools-5.38.orig/smartd.cpp	2009-08-16 07:42:57.000000000 -0400
-+++ smartmontools-5.38/smartd.cpp	2009-08-21 11:28:22.000000000 -0400
+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
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -76,8 +76,8 @@ diff -urp smartmontools-5.38.orig/smartd
 +#ifdef HAVE_LIBCAP_NG
 +  // Drop capabilities
 +  capng_clear(CAPNG_SELECT_BOTH);
-+  capng_update(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
-+               CAP_SYS_ADMIN);
++  capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
++               CAP_SYS_ADMIN, CAP_SYS_RAWIO, -1);
 +  capng_apply(CAPNG_SELECT_BOTH);
 +#endif
    


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- smartmontools.spec	26 Aug 2009 15:41:26 -0000	1.58
+++ smartmontools.spec	26 Aug 2009 16:17:56 -0000	1.59
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	15%{?dist}
+Release: 	16%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Wed Aug 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-16
+- extend capability scanning devices
+
 * Wed Aug 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-15
 - updated patch for lower capabilities (#517728)
 - added buildrequires libcap-ng-devel



From apevec at fedoraproject.org  Wed Aug 26 16:20:30 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed, 26 Aug 2009 16:20:30 +0000 (UTC)
Subject: rpms/augeas/devel xorg.aug,NONE,1.1 augeas.spec,1.21,1.22
Message-ID: <20090826162030.9981011C043A@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20451

Modified Files:
	augeas.spec 
Added Files:
	xorg.aug 
Log Message:
* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-3
- Include new xorg lens from upstream




--- NEW FILE xorg.aug ---
(*
Module: Xorg
 Parses /etc/X11/xorg.conf

Authors: Raphael Pinson <raphink at gmail.com>
         Matthew Booth <mbooth at redhat.com>

About: Reference
 This lens tries to keep as close as possible to `man xorg.conf` where
 possible.

The definitions from `man xorg.conf` are put as commentaries for reference
throughout the file. More information can be found in the manual.

About: License
  This file is licensed under the GPL.

About: Lens Usage
  Sample usage of this lens in augtool

    * Get the identifier of the devices with a "Clone" option:
      > match "/files/etc/X11/xorg.conf/Device[Option = 'Clone']/Identifier"

About: Configuration files
  This lens applies to /etc/X11/xorg.conf. See <filter>.
*)

module Xorg =
  autoload xfm

(************************************************************************
 * Group:                 USEFUL PRIMITIVES
 *************************************************************************)

(* Group: Generic primitives *)

(* Variable: eol *)
let eol     = Util.eol

(* Variable: to_eol
 * Match everything from here to eol, cropping whitespace at both ends
 *)
let to_eol  = /[^ \t\n](.*[^ \t\n])?/

(* Variable: indent *)
let indent  = Util.indent

(* Variable: comment *)
let comment = Util.comment

(* Variable: empty *)
let empty   = Util.empty


(* Group: Separators *)

(* Variable: sep_spc *)
let sep_spc = Util.del_ws_spc

(* Variable: sep_dquote *)
let sep_dquote  = Util.del_str "\""


(* Group: Fields and values *)

(* Variable: entries_re
 * This is a list of all patterns which have specific handlers, and should
 * therefore not be matched by the generic handler
 *)
let entries_re  = /([oO]ption|[sS]creen|[iI]nput[dD]evice|[dD]river|[sS]ub[sS]ection|[dD]isplay|[iI]dentifier|[vV]ideo[rR]am|[dD]efault[dD]epth|[dD]evice)/

(* Variable: generic_entry_re *)
let generic_entry_re = /[^# \t\n\/]+/ - entries_re

(* Variable: quoted_string_val *)
let quoted_string_val = del "\"" "\"" . store /[^"\n]+/ . del "\"" "\""
                                              (* " relax, emacs *)

(* Variable: int *)
let int = /[0-9]+/


(************************************************************************
 * Group:                          ENTRIES AND OPTIONS
 *************************************************************************)


(* View: entry_int
 * This matches an entry which takes a single integer for an argument
 *)
let entry_int (canon:string) (re:regexp) =
        [ indent . del re canon . label canon . sep_spc . store int . eol ]

(* View: entry_rgb
 * This matches an entry which takes 3 integers as arguments representing red,
 * green and blue components
 *)
let entry_rgb (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "red"   . sep_spc . store int ]
          . [ label "green" . sep_spc . store int ]
          . [ label "blue"  . sep_spc . store int ]
          . eol ]

(* View: entry_xy
 * This matches an entry which takes 2 integers as arguments representing X and
 * Y coordinates
 *)
let entry_xy (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "x" . sep_spc . store int ]
          . [ label "y" . sep_spc . store int ]
          . eol ]

(* View: entry_str
 * This matches an entry which takes a single quoted string
 *)
let entry_str (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . sep_spc . quoted_string_val . eol ]

(* View: entry_generic
 * An entry without a specific handler. Store everything after the keyword,
 * cropping whitespace at both ends.
 *)
let entry_generic  = [ indent . key generic_entry_re
                       . sep_spc . store to_eol . eol ]

(* View: option *)
let option = [ indent . del /[oO]ption/ "Option" . label "Option" . sep_spc
               . quoted_string_val
               . [ label "value" . sep_spc . quoted_string_val ]*
               . eol ]

(* View: screen
 * The Screen entry of ServerLayout
 *)
let screen = [ indent . del /[sS]creen/ "Screen" . label "Screen" . sep_spc
               . [ label "num" . store int . sep_spc ]?
               . quoted_string_val . sep_spc
               . [ label "position" . store to_eol ]
               . eol ]

(* View: input_device *)
let input_device = [ indent . del /[iI]nput[dD]evice/ "InputDevice"
                     . label "InputDevice" . sep_spc . quoted_string_val
                     . [ label "option" . sep_spc . quoted_string_val ]*
                     . eol ]

(* View: driver *)
let driver = entry_str "Driver" /[dD]river/

(* View: identifier *)
let identifier = entry_str "Identifier" /[iI]dentifier/

(* View: videoram *)
let videoram = entry_int "VideoRam" /[vV]ideo[rR]am/

(* View: default_depth *)
let default_depth = entry_int "DefaultDepth" /[dD]efault[dD]epth/

(* View: device *)
let device = entry_str "Device" /[dD]evice/

(************************************************************************
 * Group:                          DISPLAY SUBSECTION
 *************************************************************************)


(* View: display_modes *)
let display_modes = [ indent . del /[mM]odes/ "Modes" . label "Modes"
                      . [ label "mode" . sep_spc . quoted_string_val ]+
                      . eol ]

(*************************************************************************
 * View: display_entry
 *   Known values for entries in the Display subsection
 *
 *   Definition:
 *     > Depth    depth
 *     > FbBpp    bpp
 *     > Weight   red-weight green-weight blue-weight
 *     > Virtual  xdim ydim
 *     > ViewPort x0 y0
 *     > Modes    "mode-name" ...
 *     > Visual   "visual-name"
 *     > Black    red green blue
 *     > White    red green blue
 *     > Options
 *)

let display_entry = entry_int "Depth"    /[dD]epth/ |
                    entry_int "FbBpp"    /[fF]b[bB]pp/ |
                    entry_rgb "Weight"   /[wW]eight/ |
                    entry_xy  "Virtual"  /[vV]irtual/ |
                    entry_xy  "ViewPort" /[vV]iew[pP]ort/ |
                    display_modes |
                    entry_str "Visual"   /[vV]isual/ |
                    entry_rgb "Black"    /[bB]lack/ |
                    entry_rgb "White"    /[wW]hite/ |
                    entry_str "Options"  /[oO]ptions/ |
                    empty |
                    comment

(* View: display *)
let display = [ indent . del "SubSection" "SubSection" . sep_spc
                       . sep_dquote . key "Display" . sep_dquote
                       . eol
                       . display_entry*
                       . indent . del "EndSubSection" "EndSubSection" . eol ]


(************************************************************************
 * Group:                       SECTIONS
 *************************************************************************)


(************************************************************************
 * Variable: section_re
 *   Known values for Section names
 *
 *   Definition:
 *     >   The section names are:
 *     >
 *     >   Files          File pathnames
 *     >   ServerFlags    Server flags
 *     >   Module         Dynamic module loading
 *     >   InputDevice    Input device description
 *     >   Device         Graphics device description
 *     >   VideoAdaptor   Xv video adaptor description
 *     >   Monitor        Monitor description
 *     >   Modes          Video modes descriptions
 *     >   Screen         Screen configuration
 *     >   ServerLayout   Overall layout
 *     >   DRI            DRI-specific configuration
 *     >   Vendor         Vendor-specific configuration
 *************************************************************************)
let section_re = /(Files|ServerFlags|Module|InputDevice|Device|VideoAdaptor|Monitor|Modes|Screen|ServerLayout|DRI|Vendor)/


(************************************************************************
 * Variable: secton_re_obsolete
 *   The  following obsolete section names are still recognised for
 *   compatibility purposes.  In new config files, the InputDevice
 *   section should be used instead.
 *
 *   Definition:
 *     >  Keyboard       Keyboard configuration
 *     >  Pointer        Pointer/mouse configuration
 *************************************************************************)
let section_re_obsolete = /(Keyboard|Pointer)/

(* View: section_entry *)
let section_entry = option |
                    screen |
                    display |
                    input_device |
                    driver |
                    identifier |
                    videoram |
                    default_depth |
                    device |
                    entry_generic |
                    empty | comment

(************************************************************************
 * View: section
 *   A section in xorg.conf
 *
 *   Definition:
 *     > Section  "SectionName"
 *     >    SectionEntry
 *     >    ...
 *     > EndSection
 *************************************************************************)
let section = [ indent . del "Section" "Section"
                       . sep_spc . sep_dquote
                       . key (section_re|section_re_obsolete) . sep_dquote
                       . eol
                .  section_entry*
                . indent . del "EndSection" "EndSection" . eol ]

(*
 * View: lns
 *   The xorg.conf lens
 *)
let lns = ( empty | comment | section )*


(* Variable: filter *)
let filter = (incl "/etc/X11/xorg.conf")

let xfm = transform lns filter


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- augeas.spec	24 Jul 2009 17:34:01 -0000	1.21
+++ augeas.spec	26 Aug 2009 16:20:30 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
+Source1:        xorg.aug
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Replace xorg lens with new version from upstream
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-3
+- Include new xorg lens from upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From apevec at fedoraproject.org  Wed Aug 26 16:23:39 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed, 26 Aug 2009 16:23:39 +0000 (UTC)
Subject: rpms/augeas/F-11 xorg.aug,NONE,1.1 augeas.spec,1.20,1.21
Message-ID: <20090826162339.333ED11C0082@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/augeas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21093

Modified Files:
	augeas.spec 
Added Files:
	xorg.aug 
Log Message:
* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
- Include new xorg lens from upstream




--- NEW FILE xorg.aug ---
(*
Module: Xorg
 Parses /etc/X11/xorg.conf

Authors: Raphael Pinson <raphink at gmail.com>
         Matthew Booth <mbooth at redhat.com>

About: Reference
 This lens tries to keep as close as possible to `man xorg.conf` where
 possible.

The definitions from `man xorg.conf` are put as commentaries for reference
throughout the file. More information can be found in the manual.

About: License
  This file is licensed under the GPL.

About: Lens Usage
  Sample usage of this lens in augtool

    * Get the identifier of the devices with a "Clone" option:
      > match "/files/etc/X11/xorg.conf/Device[Option = 'Clone']/Identifier"

About: Configuration files
  This lens applies to /etc/X11/xorg.conf. See <filter>.
*)

module Xorg =
  autoload xfm

(************************************************************************
 * Group:                 USEFUL PRIMITIVES
 *************************************************************************)

(* Group: Generic primitives *)

(* Variable: eol *)
let eol     = Util.eol

(* Variable: to_eol
 * Match everything from here to eol, cropping whitespace at both ends
 *)
let to_eol  = /[^ \t\n](.*[^ \t\n])?/

(* Variable: indent *)
let indent  = Util.indent

(* Variable: comment *)
let comment = Util.comment

(* Variable: empty *)
let empty   = Util.empty


(* Group: Separators *)

(* Variable: sep_spc *)
let sep_spc = Util.del_ws_spc

(* Variable: sep_dquote *)
let sep_dquote  = Util.del_str "\""


(* Group: Fields and values *)

(* Variable: entries_re
 * This is a list of all patterns which have specific handlers, and should
 * therefore not be matched by the generic handler
 *)
let entries_re  = /([oO]ption|[sS]creen|[iI]nput[dD]evice|[dD]river|[sS]ub[sS]ection|[dD]isplay|[iI]dentifier|[vV]ideo[rR]am|[dD]efault[dD]epth|[dD]evice)/

(* Variable: generic_entry_re *)
let generic_entry_re = /[^# \t\n\/]+/ - entries_re

(* Variable: quoted_string_val *)
let quoted_string_val = del "\"" "\"" . store /[^"\n]+/ . del "\"" "\""
                                              (* " relax, emacs *)

(* Variable: int *)
let int = /[0-9]+/


(************************************************************************
 * Group:                          ENTRIES AND OPTIONS
 *************************************************************************)


(* View: entry_int
 * This matches an entry which takes a single integer for an argument
 *)
let entry_int (canon:string) (re:regexp) =
        [ indent . del re canon . label canon . sep_spc . store int . eol ]

(* View: entry_rgb
 * This matches an entry which takes 3 integers as arguments representing red,
 * green and blue components
 *)
let entry_rgb (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "red"   . sep_spc . store int ]
          . [ label "green" . sep_spc . store int ]
          . [ label "blue"  . sep_spc . store int ]
          . eol ]

(* View: entry_xy
 * This matches an entry which takes 2 integers as arguments representing X and
 * Y coordinates
 *)
let entry_xy (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "x" . sep_spc . store int ]
          . [ label "y" . sep_spc . store int ]
          . eol ]

(* View: entry_str
 * This matches an entry which takes a single quoted string
 *)
let entry_str (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . sep_spc . quoted_string_val . eol ]

(* View: entry_generic
 * An entry without a specific handler. Store everything after the keyword,
 * cropping whitespace at both ends.
 *)
let entry_generic  = [ indent . key generic_entry_re
                       . sep_spc . store to_eol . eol ]

(* View: option *)
let option = [ indent . del /[oO]ption/ "Option" . label "Option" . sep_spc
               . quoted_string_val
               . [ label "value" . sep_spc . quoted_string_val ]*
               . eol ]

(* View: screen
 * The Screen entry of ServerLayout
 *)
let screen = [ indent . del /[sS]creen/ "Screen" . label "Screen" . sep_spc
               . [ label "num" . store int . sep_spc ]?
               . quoted_string_val . sep_spc
               . [ label "position" . store to_eol ]
               . eol ]

(* View: input_device *)
let input_device = [ indent . del /[iI]nput[dD]evice/ "InputDevice"
                     . label "InputDevice" . sep_spc . quoted_string_val
                     . [ label "option" . sep_spc . quoted_string_val ]*
                     . eol ]

(* View: driver *)
let driver = entry_str "Driver" /[dD]river/

(* View: identifier *)
let identifier = entry_str "Identifier" /[iI]dentifier/

(* View: videoram *)
let videoram = entry_int "VideoRam" /[vV]ideo[rR]am/

(* View: default_depth *)
let default_depth = entry_int "DefaultDepth" /[dD]efault[dD]epth/

(* View: device *)
let device = entry_str "Device" /[dD]evice/

(************************************************************************
 * Group:                          DISPLAY SUBSECTION
 *************************************************************************)


(* View: display_modes *)
let display_modes = [ indent . del /[mM]odes/ "Modes" . label "Modes"
                      . [ label "mode" . sep_spc . quoted_string_val ]+
                      . eol ]

(*************************************************************************
 * View: display_entry
 *   Known values for entries in the Display subsection
 *
 *   Definition:
 *     > Depth    depth
 *     > FbBpp    bpp
 *     > Weight   red-weight green-weight blue-weight
 *     > Virtual  xdim ydim
 *     > ViewPort x0 y0
 *     > Modes    "mode-name" ...
 *     > Visual   "visual-name"
 *     > Black    red green blue
 *     > White    red green blue
 *     > Options
 *)

let display_entry = entry_int "Depth"    /[dD]epth/ |
                    entry_int "FbBpp"    /[fF]b[bB]pp/ |
                    entry_rgb "Weight"   /[wW]eight/ |
                    entry_xy  "Virtual"  /[vV]irtual/ |
                    entry_xy  "ViewPort" /[vV]iew[pP]ort/ |
                    display_modes |
                    entry_str "Visual"   /[vV]isual/ |
                    entry_rgb "Black"    /[bB]lack/ |
                    entry_rgb "White"    /[wW]hite/ |
                    entry_str "Options"  /[oO]ptions/ |
                    empty |
                    comment

(* View: display *)
let display = [ indent . del "SubSection" "SubSection" . sep_spc
                       . sep_dquote . key "Display" . sep_dquote
                       . eol
                       . display_entry*
                       . indent . del "EndSubSection" "EndSubSection" . eol ]


(************************************************************************
 * Group:                       SECTIONS
 *************************************************************************)


(************************************************************************
 * Variable: section_re
 *   Known values for Section names
 *
 *   Definition:
 *     >   The section names are:
 *     >
 *     >   Files          File pathnames
 *     >   ServerFlags    Server flags
 *     >   Module         Dynamic module loading
 *     >   InputDevice    Input device description
 *     >   Device         Graphics device description
 *     >   VideoAdaptor   Xv video adaptor description
 *     >   Monitor        Monitor description
 *     >   Modes          Video modes descriptions
 *     >   Screen         Screen configuration
 *     >   ServerLayout   Overall layout
 *     >   DRI            DRI-specific configuration
 *     >   Vendor         Vendor-specific configuration
 *************************************************************************)
let section_re = /(Files|ServerFlags|Module|InputDevice|Device|VideoAdaptor|Monitor|Modes|Screen|ServerLayout|DRI|Vendor)/


(************************************************************************
 * Variable: secton_re_obsolete
 *   The  following obsolete section names are still recognised for
 *   compatibility purposes.  In new config files, the InputDevice
 *   section should be used instead.
 *
 *   Definition:
 *     >  Keyboard       Keyboard configuration
 *     >  Pointer        Pointer/mouse configuration
 *************************************************************************)
let section_re_obsolete = /(Keyboard|Pointer)/

(* View: section_entry *)
let section_entry = option |
                    screen |
                    display |
                    input_device |
                    driver |
                    identifier |
                    videoram |
                    default_depth |
                    device |
                    entry_generic |
                    empty | comment

(************************************************************************
 * View: section
 *   A section in xorg.conf
 *
 *   Definition:
 *     > Section  "SectionName"
 *     >    SectionEntry
 *     >    ...
 *     > EndSection
 *************************************************************************)
let section = [ indent . del "Section" "Section"
                       . sep_spc . sep_dquote
                       . key (section_re|section_re_obsolete) . sep_dquote
                       . eol
                .  section_entry*
                . indent . del "EndSection" "EndSection" . eol ]

(*
 * View: lns
 *   The xorg.conf lens
 *)
let lns = ( empty | comment | section )*


(* Variable: filter *)
let filter = (incl "/etc/X11/xorg.conf")

let xfm = transform lns filter


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-11/augeas.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- augeas.spec	14 Jul 2009 02:53:43 -0000	1.20
+++ augeas.spec	26 Aug 2009 16:23:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
+Source1:        xorg.aug
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Replace xorg lens with new version from upstream
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
+- Include new xorg lens from upstream
+
 * Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.5.2-1
 - New version
 



From apevec at fedoraproject.org  Wed Aug 26 16:25:02 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed, 26 Aug 2009 16:25:02 +0000 (UTC)
Subject: rpms/augeas/F-10 xorg.aug,NONE,1.1 augeas.spec,1.19,1.20
Message-ID: <20090826162502.45FF711C0082@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/augeas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21363

Modified Files:
	augeas.spec 
Added Files:
	xorg.aug 
Log Message:
* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
- Include new xorg lens from upstream




--- NEW FILE xorg.aug ---
(*
Module: Xorg
 Parses /etc/X11/xorg.conf

Authors: Raphael Pinson <raphink at gmail.com>
         Matthew Booth <mbooth at redhat.com>

About: Reference
 This lens tries to keep as close as possible to `man xorg.conf` where
 possible.

The definitions from `man xorg.conf` are put as commentaries for reference
throughout the file. More information can be found in the manual.

About: License
  This file is licensed under the GPL.

About: Lens Usage
  Sample usage of this lens in augtool

    * Get the identifier of the devices with a "Clone" option:
      > match "/files/etc/X11/xorg.conf/Device[Option = 'Clone']/Identifier"

About: Configuration files
  This lens applies to /etc/X11/xorg.conf. See <filter>.
*)

module Xorg =
  autoload xfm

(************************************************************************
 * Group:                 USEFUL PRIMITIVES
 *************************************************************************)

(* Group: Generic primitives *)

(* Variable: eol *)
let eol     = Util.eol

(* Variable: to_eol
 * Match everything from here to eol, cropping whitespace at both ends
 *)
let to_eol  = /[^ \t\n](.*[^ \t\n])?/

(* Variable: indent *)
let indent  = Util.indent

(* Variable: comment *)
let comment = Util.comment

(* Variable: empty *)
let empty   = Util.empty


(* Group: Separators *)

(* Variable: sep_spc *)
let sep_spc = Util.del_ws_spc

(* Variable: sep_dquote *)
let sep_dquote  = Util.del_str "\""


(* Group: Fields and values *)

(* Variable: entries_re
 * This is a list of all patterns which have specific handlers, and should
 * therefore not be matched by the generic handler
 *)
let entries_re  = /([oO]ption|[sS]creen|[iI]nput[dD]evice|[dD]river|[sS]ub[sS]ection|[dD]isplay|[iI]dentifier|[vV]ideo[rR]am|[dD]efault[dD]epth|[dD]evice)/

(* Variable: generic_entry_re *)
let generic_entry_re = /[^# \t\n\/]+/ - entries_re

(* Variable: quoted_string_val *)
let quoted_string_val = del "\"" "\"" . store /[^"\n]+/ . del "\"" "\""
                                              (* " relax, emacs *)

(* Variable: int *)
let int = /[0-9]+/


(************************************************************************
 * Group:                          ENTRIES AND OPTIONS
 *************************************************************************)


(* View: entry_int
 * This matches an entry which takes a single integer for an argument
 *)
let entry_int (canon:string) (re:regexp) =
        [ indent . del re canon . label canon . sep_spc . store int . eol ]

(* View: entry_rgb
 * This matches an entry which takes 3 integers as arguments representing red,
 * green and blue components
 *)
let entry_rgb (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "red"   . sep_spc . store int ]
          . [ label "green" . sep_spc . store int ]
          . [ label "blue"  . sep_spc . store int ]
          . eol ]

(* View: entry_xy
 * This matches an entry which takes 2 integers as arguments representing X and
 * Y coordinates
 *)
let entry_xy (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "x" . sep_spc . store int ]
          . [ label "y" . sep_spc . store int ]
          . eol ]

(* View: entry_str
 * This matches an entry which takes a single quoted string
 *)
let entry_str (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . sep_spc . quoted_string_val . eol ]

(* View: entry_generic
 * An entry without a specific handler. Store everything after the keyword,
 * cropping whitespace at both ends.
 *)
let entry_generic  = [ indent . key generic_entry_re
                       . sep_spc . store to_eol . eol ]

(* View: option *)
let option = [ indent . del /[oO]ption/ "Option" . label "Option" . sep_spc
               . quoted_string_val
               . [ label "value" . sep_spc . quoted_string_val ]*
               . eol ]

(* View: screen
 * The Screen entry of ServerLayout
 *)
let screen = [ indent . del /[sS]creen/ "Screen" . label "Screen" . sep_spc
               . [ label "num" . store int . sep_spc ]?
               . quoted_string_val . sep_spc
               . [ label "position" . store to_eol ]
               . eol ]

(* View: input_device *)
let input_device = [ indent . del /[iI]nput[dD]evice/ "InputDevice"
                     . label "InputDevice" . sep_spc . quoted_string_val
                     . [ label "option" . sep_spc . quoted_string_val ]*
                     . eol ]

(* View: driver *)
let driver = entry_str "Driver" /[dD]river/

(* View: identifier *)
let identifier = entry_str "Identifier" /[iI]dentifier/

(* View: videoram *)
let videoram = entry_int "VideoRam" /[vV]ideo[rR]am/

(* View: default_depth *)
let default_depth = entry_int "DefaultDepth" /[dD]efault[dD]epth/

(* View: device *)
let device = entry_str "Device" /[dD]evice/

(************************************************************************
 * Group:                          DISPLAY SUBSECTION
 *************************************************************************)


(* View: display_modes *)
let display_modes = [ indent . del /[mM]odes/ "Modes" . label "Modes"
                      . [ label "mode" . sep_spc . quoted_string_val ]+
                      . eol ]

(*************************************************************************
 * View: display_entry
 *   Known values for entries in the Display subsection
 *
 *   Definition:
 *     > Depth    depth
 *     > FbBpp    bpp
 *     > Weight   red-weight green-weight blue-weight
 *     > Virtual  xdim ydim
 *     > ViewPort x0 y0
 *     > Modes    "mode-name" ...
 *     > Visual   "visual-name"
 *     > Black    red green blue
 *     > White    red green blue
 *     > Options
 *)

let display_entry = entry_int "Depth"    /[dD]epth/ |
                    entry_int "FbBpp"    /[fF]b[bB]pp/ |
                    entry_rgb "Weight"   /[wW]eight/ |
                    entry_xy  "Virtual"  /[vV]irtual/ |
                    entry_xy  "ViewPort" /[vV]iew[pP]ort/ |
                    display_modes |
                    entry_str "Visual"   /[vV]isual/ |
                    entry_rgb "Black"    /[bB]lack/ |
                    entry_rgb "White"    /[wW]hite/ |
                    entry_str "Options"  /[oO]ptions/ |
                    empty |
                    comment

(* View: display *)
let display = [ indent . del "SubSection" "SubSection" . sep_spc
                       . sep_dquote . key "Display" . sep_dquote
                       . eol
                       . display_entry*
                       . indent . del "EndSubSection" "EndSubSection" . eol ]


(************************************************************************
 * Group:                       SECTIONS
 *************************************************************************)


(************************************************************************
 * Variable: section_re
 *   Known values for Section names
 *
 *   Definition:
 *     >   The section names are:
 *     >
 *     >   Files          File pathnames
 *     >   ServerFlags    Server flags
 *     >   Module         Dynamic module loading
 *     >   InputDevice    Input device description
 *     >   Device         Graphics device description
 *     >   VideoAdaptor   Xv video adaptor description
 *     >   Monitor        Monitor description
 *     >   Modes          Video modes descriptions
 *     >   Screen         Screen configuration
 *     >   ServerLayout   Overall layout
 *     >   DRI            DRI-specific configuration
 *     >   Vendor         Vendor-specific configuration
 *************************************************************************)
let section_re = /(Files|ServerFlags|Module|InputDevice|Device|VideoAdaptor|Monitor|Modes|Screen|ServerLayout|DRI|Vendor)/


(************************************************************************
 * Variable: secton_re_obsolete
 *   The  following obsolete section names are still recognised for
 *   compatibility purposes.  In new config files, the InputDevice
 *   section should be used instead.
 *
 *   Definition:
 *     >  Keyboard       Keyboard configuration
 *     >  Pointer        Pointer/mouse configuration
 *************************************************************************)
let section_re_obsolete = /(Keyboard|Pointer)/

(* View: section_entry *)
let section_entry = option |
                    screen |
                    display |
                    input_device |
                    driver |
                    identifier |
                    videoram |
                    default_depth |
                    device |
                    entry_generic |
                    empty | comment

(************************************************************************
 * View: section
 *   A section in xorg.conf
 *
 *   Definition:
 *     > Section  "SectionName"
 *     >    SectionEntry
 *     >    ...
 *     > EndSection
 *************************************************************************)
let section = [ indent . del "Section" "Section"
                       . sep_spc . sep_dquote
                       . key (section_re|section_re_obsolete) . sep_dquote
                       . eol
                .  section_entry*
                . indent . del "EndSection" "EndSection" . eol ]

(*
 * View: lns
 *   The xorg.conf lens
 *)
let lns = ( empty | comment | section )*


(* Variable: filter *)
let filter = (incl "/etc/X11/xorg.conf")

let xfm = transform lns filter


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/augeas.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- augeas.spec	14 Jul 2009 02:53:42 -0000	1.19
+++ augeas.spec	26 Aug 2009 16:25:02 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
+Source1:        xorg.aug
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Replace xorg lens with new version from upstream
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
+- Include new xorg lens from upstream
+
 * Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.5.2-1
 - New version
 



From jgarzik at fedoraproject.org  Wed Aug 26 16:26:52 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 26 Aug 2009 16:26:52 +0000 (UTC)
Subject: rpms/cld/devel .cvsignore, 1.3, 1.4 cld.spec, 1.18, 1.19 sources,
	1.14, 1.15
Message-ID: <20090826162652.2BF9611C0082@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21916

Modified Files:
	.cvsignore cld.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Aug 2009 12:04:46 -0000	1.3
+++ .cvsignore	26 Aug 2009 16:26:51 -0000	1.4
@@ -1 +1 @@
-cld-0.2.tar.gz
+cld-0.2.1.tar.gz


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- cld.spec	21 Aug 2009 12:46:10 -0000	1.18
+++ cld.spec	26 Aug 2009 16:26:51 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		cld
-Version:	0.2
-Release:	2%{?dist}
+Version:	0.2.1
+Release:	1%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
@@ -99,6 +99,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 26 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2.1-1
+- Upstream version 0.2.1 release (== many bug fixes).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	15 Aug 2009 12:04:46 -0000	1.14
+++ sources	26 Aug 2009 16:26:51 -0000	1.15
@@ -1 +1 @@
-fa486b987fad42f511640816cfea7a0e  cld-0.2.tar.gz
+129757026dd287ff9ea030e457ab51cc  cld-0.2.1.tar.gz



From emaldonado at fedoraproject.org  Wed Aug 26 16:32:52 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 26 Aug 2009 16:32:52 +0000 (UTC)
Subject: rpms/nss/devel nss.pc.in,1.6,1.7
Message-ID: <20090826163252.1ED8911C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23657

Modified Files:
	nss.pc.in 
Log Message:
Single Requires with a comma-separated list - bug 519391


Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nss.pc.in	25 Aug 2009 21:49:52 -0000	1.6
+++ nss.pc.in	26 Aug 2009 16:32:51 -0000	1.7
@@ -6,8 +6,6 @@ includedir=%includedir%
 Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Requires: nss-util >= %NSSUTIL_VERSION%
-Requires: nss-softokn >= %SOFTOKEN_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%, nss-softokn >= %SOFTOKEN_VERSION%
 Libs: -lssl3 -lsmime3 -lnss3
 Cflags: -I${includedir}



From emaldonado at fedoraproject.org  Wed Aug 26 16:36:26 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 26 Aug 2009 16:36:26 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.94,1.95
Message-ID: <20090826163626.8A00211C0082@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24246

Modified Files:
	nss.spec 
Log Message:
fix nss.pc.in to have one single requires line - bug 519391


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- nss.spec	25 Aug 2009 21:49:52 -0000	1.94
+++ nss.spec	26 Aug 2009 16:36:26 -0000	1.95
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          16%{?dist}
+Release:          17%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -437,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com - 3.12.3.99.3-17
+- fix nss.pc.in to have one single requires line
+
 * Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-16
 - cleanups for softokn
 



From orion at fedoraproject.org  Wed Aug 26 16:36:38 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 26 Aug 2009 16:36:38 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.4-transform_version.patch, NONE,
	1.1 plplot.spec, 1.84, 1.85
Message-ID: <20090826163638.9ED0211C0082@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24300

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.9.4-transform_version.patch 
Log Message:
* 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


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,


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- plplot.spec	26 Aug 2009 09:47:03 -0000	1.84
+++ plplot.spec	26 Aug 2009 16:36:38 -0000	1.85
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -20,6 +20,7 @@ Source0:        http://downloads.sourcef
 Patch1:         plplot-5.9.3-multiarch.patch
 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.3-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -258,6 +259,7 @@ Requires:       pkgconfig
 %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
@@ -279,6 +281,7 @@ export FFLAGS="$RPM_OPT_FLAGS"
 unset TERM
 %cmake .. \
 	-DCMAKE_SKIP_RPATH:BOOL=OFF \
+	-DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
 	-DUSE_RPATH:BOOL=OFF \
         -DENABLE_ada:BOOL=ON \
         -DHAVE_ADA_2007:BOOL=ON \
@@ -599,6 +602,10 @@ fi
 
 
 %changelog
+* 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
 



From apevec at fedoraproject.org  Wed Aug 26 16:39:30 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed, 26 Aug 2009 16:39:30 +0000 (UTC)
Subject: rpms/augeas/EL-5 xorg.aug,NONE,1.1 augeas.spec,1.20,1.21
Message-ID: <20090826163930.989D711C0082@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24856

Modified Files:
	augeas.spec 
Added Files:
	xorg.aug 
Log Message:
* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
- Include new xorg lens from upstream




--- NEW FILE xorg.aug ---
(*
Module: Xorg
 Parses /etc/X11/xorg.conf

Authors: Raphael Pinson <raphink at gmail.com>
         Matthew Booth <mbooth at redhat.com>

About: Reference
 This lens tries to keep as close as possible to `man xorg.conf` where
 possible.

The definitions from `man xorg.conf` are put as commentaries for reference
throughout the file. More information can be found in the manual.

About: License
  This file is licensed under the GPL.

About: Lens Usage
  Sample usage of this lens in augtool

    * Get the identifier of the devices with a "Clone" option:
      > match "/files/etc/X11/xorg.conf/Device[Option = 'Clone']/Identifier"

About: Configuration files
  This lens applies to /etc/X11/xorg.conf. See <filter>.
*)

module Xorg =
  autoload xfm

(************************************************************************
 * Group:                 USEFUL PRIMITIVES
 *************************************************************************)

(* Group: Generic primitives *)

(* Variable: eol *)
let eol     = Util.eol

(* Variable: to_eol
 * Match everything from here to eol, cropping whitespace at both ends
 *)
let to_eol  = /[^ \t\n](.*[^ \t\n])?/

(* Variable: indent *)
let indent  = Util.indent

(* Variable: comment *)
let comment = Util.comment

(* Variable: empty *)
let empty   = Util.empty


(* Group: Separators *)

(* Variable: sep_spc *)
let sep_spc = Util.del_ws_spc

(* Variable: sep_dquote *)
let sep_dquote  = Util.del_str "\""


(* Group: Fields and values *)

(* Variable: entries_re
 * This is a list of all patterns which have specific handlers, and should
 * therefore not be matched by the generic handler
 *)
let entries_re  = /([oO]ption|[sS]creen|[iI]nput[dD]evice|[dD]river|[sS]ub[sS]ection|[dD]isplay|[iI]dentifier|[vV]ideo[rR]am|[dD]efault[dD]epth|[dD]evice)/

(* Variable: generic_entry_re *)
let generic_entry_re = /[^# \t\n\/]+/ - entries_re

(* Variable: quoted_string_val *)
let quoted_string_val = del "\"" "\"" . store /[^"\n]+/ . del "\"" "\""
                                              (* " relax, emacs *)

(* Variable: int *)
let int = /[0-9]+/


(************************************************************************
 * Group:                          ENTRIES AND OPTIONS
 *************************************************************************)


(* View: entry_int
 * This matches an entry which takes a single integer for an argument
 *)
let entry_int (canon:string) (re:regexp) =
        [ indent . del re canon . label canon . sep_spc . store int . eol ]

(* View: entry_rgb
 * This matches an entry which takes 3 integers as arguments representing red,
 * green and blue components
 *)
let entry_rgb (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "red"   . sep_spc . store int ]
          . [ label "green" . sep_spc . store int ]
          . [ label "blue"  . sep_spc . store int ]
          . eol ]

(* View: entry_xy
 * This matches an entry which takes 2 integers as arguments representing X and
 * Y coordinates
 *)
let entry_xy (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "x" . sep_spc . store int ]
          . [ label "y" . sep_spc . store int ]
          . eol ]

(* View: entry_str
 * This matches an entry which takes a single quoted string
 *)
let entry_str (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . sep_spc . quoted_string_val . eol ]

(* View: entry_generic
 * An entry without a specific handler. Store everything after the keyword,
 * cropping whitespace at both ends.
 *)
let entry_generic  = [ indent . key generic_entry_re
                       . sep_spc . store to_eol . eol ]

(* View: option *)
let option = [ indent . del /[oO]ption/ "Option" . label "Option" . sep_spc
               . quoted_string_val
               . [ label "value" . sep_spc . quoted_string_val ]*
               . eol ]

(* View: screen
 * The Screen entry of ServerLayout
 *)
let screen = [ indent . del /[sS]creen/ "Screen" . label "Screen" . sep_spc
               . [ label "num" . store int . sep_spc ]?
               . quoted_string_val . sep_spc
               . [ label "position" . store to_eol ]
               . eol ]

(* View: input_device *)
let input_device = [ indent . del /[iI]nput[dD]evice/ "InputDevice"
                     . label "InputDevice" . sep_spc . quoted_string_val
                     . [ label "option" . sep_spc . quoted_string_val ]*
                     . eol ]

(* View: driver *)
let driver = entry_str "Driver" /[dD]river/

(* View: identifier *)
let identifier = entry_str "Identifier" /[iI]dentifier/

(* View: videoram *)
let videoram = entry_int "VideoRam" /[vV]ideo[rR]am/

(* View: default_depth *)
let default_depth = entry_int "DefaultDepth" /[dD]efault[dD]epth/

(* View: device *)
let device = entry_str "Device" /[dD]evice/

(************************************************************************
 * Group:                          DISPLAY SUBSECTION
 *************************************************************************)


(* View: display_modes *)
let display_modes = [ indent . del /[mM]odes/ "Modes" . label "Modes"
                      . [ label "mode" . sep_spc . quoted_string_val ]+
                      . eol ]

(*************************************************************************
 * View: display_entry
 *   Known values for entries in the Display subsection
 *
 *   Definition:
 *     > Depth    depth
 *     > FbBpp    bpp
 *     > Weight   red-weight green-weight blue-weight
 *     > Virtual  xdim ydim
 *     > ViewPort x0 y0
 *     > Modes    "mode-name" ...
 *     > Visual   "visual-name"
 *     > Black    red green blue
 *     > White    red green blue
 *     > Options
 *)

let display_entry = entry_int "Depth"    /[dD]epth/ |
                    entry_int "FbBpp"    /[fF]b[bB]pp/ |
                    entry_rgb "Weight"   /[wW]eight/ |
                    entry_xy  "Virtual"  /[vV]irtual/ |
                    entry_xy  "ViewPort" /[vV]iew[pP]ort/ |
                    display_modes |
                    entry_str "Visual"   /[vV]isual/ |
                    entry_rgb "Black"    /[bB]lack/ |
                    entry_rgb "White"    /[wW]hite/ |
                    entry_str "Options"  /[oO]ptions/ |
                    empty |
                    comment

(* View: display *)
let display = [ indent . del "SubSection" "SubSection" . sep_spc
                       . sep_dquote . key "Display" . sep_dquote
                       . eol
                       . display_entry*
                       . indent . del "EndSubSection" "EndSubSection" . eol ]


(************************************************************************
 * Group:                       SECTIONS
 *************************************************************************)


(************************************************************************
 * Variable: section_re
 *   Known values for Section names
 *
 *   Definition:
 *     >   The section names are:
 *     >
 *     >   Files          File pathnames
 *     >   ServerFlags    Server flags
 *     >   Module         Dynamic module loading
 *     >   InputDevice    Input device description
 *     >   Device         Graphics device description
 *     >   VideoAdaptor   Xv video adaptor description
 *     >   Monitor        Monitor description
 *     >   Modes          Video modes descriptions
 *     >   Screen         Screen configuration
 *     >   ServerLayout   Overall layout
 *     >   DRI            DRI-specific configuration
 *     >   Vendor         Vendor-specific configuration
 *************************************************************************)
let section_re = /(Files|ServerFlags|Module|InputDevice|Device|VideoAdaptor|Monitor|Modes|Screen|ServerLayout|DRI|Vendor)/


(************************************************************************
 * Variable: secton_re_obsolete
 *   The  following obsolete section names are still recognised for
 *   compatibility purposes.  In new config files, the InputDevice
 *   section should be used instead.
 *
 *   Definition:
 *     >  Keyboard       Keyboard configuration
 *     >  Pointer        Pointer/mouse configuration
 *************************************************************************)
let section_re_obsolete = /(Keyboard|Pointer)/

(* View: section_entry *)
let section_entry = option |
                    screen |
                    display |
                    input_device |
                    driver |
                    identifier |
                    videoram |
                    default_depth |
                    device |
                    entry_generic |
                    empty | comment

(************************************************************************
 * View: section
 *   A section in xorg.conf
 *
 *   Definition:
 *     > Section  "SectionName"
 *     >    SectionEntry
 *     >    ...
 *     > EndSection
 *************************************************************************)
let section = [ indent . del "Section" "Section"
                       . sep_spc . sep_dquote
                       . key (section_re|section_re_obsolete) . sep_dquote
                       . eol
                .  section_entry*
                . indent . del "EndSection" "EndSection" . eol ]

(*
 * View: lns
 *   The xorg.conf lens
 *)
let lns = ( empty | comment | section )*


(* Variable: filter *)
let filter = (incl "/etc/X11/xorg.conf")

let xfm = transform lns filter


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- augeas.spec	14 Jul 2009 02:53:42 -0000	1.20
+++ augeas.spec	26 Aug 2009 16:39:29 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
+Source1:        xorg.aug
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Replace xorg lens with new version from upstream
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
+- Include new xorg lens from upstream
+
 * Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.5.2-1
 - New version
 



From twaugh at fedoraproject.org  Wed Aug 26 16:41:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:41:14 +0000 (UTC)
Subject: rpms/cups/devel cups-str3292.patch,1.1,1.2 cups.spec,1.506,1.507
Message-ID: <20090826164114.608E611C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25163

Modified Files:
	cups-str3292.patch cups.spec 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed buggy JobKillDelay handling fix (STR #3292).


cups-str3292.patch:
 job.c  |   14 +++++++++-----
 main.c |    7 +++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

Index: cups-str3292.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3292.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3292.patch	19 Aug 2009 14:07:05 -0000	1.1
+++ cups-str3292.patch	26 Aug 2009 16:41:13 -0000	1.2
@@ -1,23 +1,25 @@
-diff -up cups-1.4rc1/scheduler/job.c.cancel-job cups-1.4rc1/scheduler/job.c
---- cups-1.4rc1/scheduler/job.c.cancel-job	2009-08-19 14:48:55.733825903 +0100
-+++ cups-1.4rc1/scheduler/job.c	2009-08-19 14:49:01.813826101 +0100
-@@ -2359,19 +2359,21 @@ cupsdSetJobState(
+diff -up cups-1.4rc1/scheduler/job.c.str3292 cups-1.4rc1/scheduler/job.c
+--- cups-1.4rc1/scheduler/job.c.str3292	2009-08-26 17:01:19.442314736 +0100
++++ cups-1.4rc1/scheduler/job.c	2009-08-26 17:03:51.993190253 +0100
+@@ -2359,19 +2359,23 @@ cupsdSetJobState(
          break;
  
      case IPP_JOB_ABORTED :
 -    case IPP_JOB_CANCELED :
      case IPP_JOB_COMPLETED :
++    case IPP_JOB_CANCELED :
         /*
 -        * Expire job subscriptions since the job is now "completed"...
-+	* Remove the job from the active list...
++	* Remove the job from the active list if there are no
++	* processes still running for it...
  	*/
  
 -        cupsdExpireSubscriptions(NULL, job);
-+	cupsArrayRemove(ActiveJobs, job);
-+
-+	/* fall through... */
++	for (i = 0; job->filters[i] < 0; i++);
++	if (newstate != IPP_JOB_CANCELED ||
++	    (!job->filters[i] && job->backend <= 0))
++	    cupsArrayRemove(ActiveJobs, job);
  
-+    case IPP_JOB_CANCELED :
         /*
 -	* Remove the job from the active list...
 +        * Expire job subscriptions since the job is now "completed"...
@@ -28,9 +30,9 @@ diff -up cups-1.4rc1/scheduler/job.c.can
  
  #ifdef __APPLE__
         /*
-diff -up cups-1.4rc1/scheduler/main.c.cancel-job cups-1.4rc1/scheduler/main.c
---- cups-1.4rc1/scheduler/main.c.cancel-job	2009-08-19 14:48:55.451701014 +0100
-+++ cups-1.4rc1/scheduler/main.c	2009-08-19 14:49:01.817825841 +0100
+diff -up cups-1.4rc1/scheduler/main.c.str3292 cups-1.4rc1/scheduler/main.c
+--- cups-1.4rc1/scheduler/main.c.str3292	2009-08-26 17:01:19.084319753 +0100
++++ cups-1.4rc1/scheduler/main.c	2009-08-26 17:03:52.005190304 +0100
 @@ -1803,6 +1803,13 @@ process_children(void)
  	    cupsdContinueJob(job);
  	  }
@@ -39,7 +41,7 @@ diff -up cups-1.4rc1/scheduler/main.c.ca
 +	{
 +	  for (i = 0; job->filters[i] < 0; i++);
 +
-+	  if (!job->filters[i] && job->backend < 0)
++	  if (!job->filters[i] && job->backend <= 0)
 +	    cupsArrayRemove(ActiveJobs, job);
 +	}
        }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -p -r1.506 -r1.507
--- cups.spec	21 Aug 2009 14:50:22 -0000	1.506
+++ cups.spec	26 Aug 2009 16:41:14 -0000	1.507
@@ -532,7 +532,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed buggy JobKillDelay handling fix (STR #3292).
 - Prevent infinite loop in ppdc (STR #3293).
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.4-0.rc1.17.1



From twaugh at fedoraproject.org  Wed Aug 26 16:42:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:42:54 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3292.patch,1.1,1.2 cups.spec,1.510,1.511
Message-ID: <20090826164254.ABE2111C0082@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25347

Modified Files:
	cups-str3292.patch cups.spec 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed buggy JobKillDelay handling fix (STR #3292).


cups-str3292.patch:
 job.c  |   14 +++++++++-----
 main.c |    7 +++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

Index: cups-str3292.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3292.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3292.patch	19 Aug 2009 14:08:51 -0000	1.1
+++ cups-str3292.patch	26 Aug 2009 16:42:54 -0000	1.2
@@ -1,23 +1,25 @@
-diff -up cups-1.4rc1/scheduler/job.c.cancel-job cups-1.4rc1/scheduler/job.c
---- cups-1.4rc1/scheduler/job.c.cancel-job	2009-08-19 14:48:55.733825903 +0100
-+++ cups-1.4rc1/scheduler/job.c	2009-08-19 14:49:01.813826101 +0100
-@@ -2359,19 +2359,21 @@ cupsdSetJobState(
+diff -up cups-1.4rc1/scheduler/job.c.str3292 cups-1.4rc1/scheduler/job.c
+--- cups-1.4rc1/scheduler/job.c.str3292	2009-08-26 17:01:19.442314736 +0100
++++ cups-1.4rc1/scheduler/job.c	2009-08-26 17:03:51.993190253 +0100
+@@ -2359,19 +2359,23 @@ cupsdSetJobState(
          break;
  
      case IPP_JOB_ABORTED :
 -    case IPP_JOB_CANCELED :
      case IPP_JOB_COMPLETED :
++    case IPP_JOB_CANCELED :
         /*
 -        * Expire job subscriptions since the job is now "completed"...
-+	* Remove the job from the active list...
++	* Remove the job from the active list if there are no
++	* processes still running for it...
  	*/
  
 -        cupsdExpireSubscriptions(NULL, job);
-+	cupsArrayRemove(ActiveJobs, job);
-+
-+	/* fall through... */
++	for (i = 0; job->filters[i] < 0; i++);
++	if (newstate != IPP_JOB_CANCELED ||
++	    (!job->filters[i] && job->backend <= 0))
++	    cupsArrayRemove(ActiveJobs, job);
  
-+    case IPP_JOB_CANCELED :
         /*
 -	* Remove the job from the active list...
 +        * Expire job subscriptions since the job is now "completed"...
@@ -28,9 +30,9 @@ diff -up cups-1.4rc1/scheduler/job.c.can
  
  #ifdef __APPLE__
         /*
-diff -up cups-1.4rc1/scheduler/main.c.cancel-job cups-1.4rc1/scheduler/main.c
---- cups-1.4rc1/scheduler/main.c.cancel-job	2009-08-19 14:48:55.451701014 +0100
-+++ cups-1.4rc1/scheduler/main.c	2009-08-19 14:49:01.817825841 +0100
+diff -up cups-1.4rc1/scheduler/main.c.str3292 cups-1.4rc1/scheduler/main.c
+--- cups-1.4rc1/scheduler/main.c.str3292	2009-08-26 17:01:19.084319753 +0100
++++ cups-1.4rc1/scheduler/main.c	2009-08-26 17:03:52.005190304 +0100
 @@ -1803,6 +1803,13 @@ process_children(void)
  	    cupsdContinueJob(job);
  	  }
@@ -39,7 +41,7 @@ diff -up cups-1.4rc1/scheduler/main.c.ca
 +	{
 +	  for (i = 0; job->filters[i] < 0; i++);
 +
-+	  if (!job->filters[i] && job->backend < 0)
++	  if (!job->filters[i] && job->backend <= 0)
 +	    cupsArrayRemove(ActiveJobs, job);
 +	}
        }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- cups.spec	21 Aug 2009 14:51:20 -0000	1.510
+++ cups.spec	26 Aug 2009 16:42:54 -0000	1.511
@@ -531,7 +531,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed buggy JobKillDelay handling fix (STR #3292).
 - Prevent infinite loop in ppdc (STR #3293).
 
 * Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17



From twaugh at fedoraproject.org  Wed Aug 26 16:45:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:45:00 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-statereason-icons.patch, NONE,
	1.1 system-config-printer.spec, 1.284, 1.285
Message-ID: <20090826164500.8A88511C0082@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-serv25779

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-statereason-icons.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
- Fixed statereason icon names.


system-config-printer-statereason-icons.patch:
 statereason.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-statereason-icons.patch ---
diff -up system-config-printer-1.1.12/statereason.py.statereason-icons system-config-printer-1.1.12/statereason.py
--- system-config-printer-1.1.12/statereason.py.statereason-icons	2009-08-25 17:01:28.000000000 +0100
+++ system-config-printer-1.1.12/statereason.py	2009-08-26 17:43:19.368314303 +0100
@@ -28,9 +28,9 @@ class StateReason:
     ERROR=3
 
     LEVEL_ICON={
-        REPORT: "info",
-        WARNING: "important",
-        ERROR: "error"
+        REPORT: "dialog-info",
+        WARNING: "dialog-warning",
+        ERROR: "dialog-error"
         }
 
     def __init__(self, printer, reason):


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- system-config-printer.spec	26 Aug 2009 11:34:34 -0000	1.284
+++ system-config-printer.spec	26 Aug 2009 16:45:00 -0000	1.285
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-get_cursor.patch
+Patch2: system-config-printer-statereason-icons.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .get_cursor
+%patch2 -p1 -b .statereason-icons
 
 %build
 %configure --with-udev-rules
@@ -187,6 +189,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
+- Fixed statereason icon names.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-2
 - Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).
 



From twaugh at fedoraproject.org  Wed Aug 26 16:46:30 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:46:30 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-statereason-icons.patch, NONE,
	1.1 system-config-printer.spec, 1.275, 1.276
Message-ID: <20090826164630.589D511C0082@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-serv26087

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-statereason-icons.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
- Fixed statereason icon names.


system-config-printer-statereason-icons.patch:
 statereason.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-statereason-icons.patch ---
diff -up system-config-printer-1.1.12/statereason.py.statereason-icons system-config-printer-1.1.12/statereason.py
--- system-config-printer-1.1.12/statereason.py.statereason-icons	2009-08-25 17:01:28.000000000 +0100
+++ system-config-printer-1.1.12/statereason.py	2009-08-26 17:43:19.368314303 +0100
@@ -28,9 +28,9 @@ class StateReason:
     ERROR=3
 
     LEVEL_ICON={
-        REPORT: "info",
-        WARNING: "important",
-        ERROR: "error"
+        REPORT: "dialog-info",
+        WARNING: "dialog-warning",
+        ERROR: "dialog-error"
         }
 
     def __init__(self, printer, reason):


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- system-config-printer.spec	26 Aug 2009 12:16:44 -0000	1.275
+++ system-config-printer.spec	26 Aug 2009 16:46:30 -0000	1.276
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-get_cursor.patch
+Patch2: system-config-printer-statereason-icons.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -64,6 +65,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .get_cursor
+%patch2 -p1 -b .statereason-icons
 
 %build
 %configure
@@ -165,6 +167,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
+- Fixed statereason icon names.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
 - Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).
 



From jgarzik at fedoraproject.org  Wed Aug 26 16:47:09 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 26 Aug 2009 16:47:09 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.13,1.14
Message-ID: <20090826164709.9A0C511C0082@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26231

Modified Files:
	chunkd.spec 
Log Message:
rebuild for dependency cld 0.2.1


Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- chunkd.spec	21 Aug 2009 12:45:31 -0000	1.13
+++ chunkd.spec	26 Aug 2009 16:47:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -15,10 +15,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 # N.B. We need cld to build, because our "make check" spawns a private copy.
 BuildRequires:	libevent-devel glib2-devel openssl-devel zlib-devel
 BuildRequires:	libxml2-devel procps
-BuildRequires:	cld >= 0.2
-BuildRequires:	cld-devel >= 0.2
+BuildRequires:	cld >= 0.2.1
+BuildRequires:	cld-devel >= 0.2.1
 
-Requires:	cld >= 0.2
+Requires:	cld >= 0.2.1
 
 %description
 Single-node data storage daemon for cloud computing.
@@ -97,6 +97,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 26 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-3
+- Require/rebuild for cld version 0.2.1.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-2
 - rebuilt with new openssl
 



From twaugh at fedoraproject.org  Wed Aug 26 16:48:47 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:48:47 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-icon-load-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.285, 1.286
Message-ID: <20090826164847.2ED5411C0082@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-serv26508

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-icon-load-traceback.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
- Handle icon load failure gracefully.


system-config-printer-icon-load-traceback.patch:
 jobviewer.py             |   26 ++++++++++++++------------
 system-config-printer.py |   44 +++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 31 deletions(-)

--- NEW FILE system-config-printer-icon-load-traceback.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.icon-load-traceback system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.icon-load-traceback	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-26 17:46:06.744314174 +0100
@@ -1033,18 +1033,20 @@ class JobViewer (GtkGUI, monitor.Watcher
                 # Add an emblem to the icon.
                 icon = StateReason.LEVEL_ICON[level]
                 pixbuf = pixbuf.copy ()
-                theme = gtk.icon_theme_get_default ()
-
-                emblem = theme.load_icon (icon, 22, 0)
-                emblem.composite (pixbuf,
-                                  pixbuf.get_width () / 2,
-                                  pixbuf.get_height () / 2,
-                                  emblem.get_width () / 2,
-                                  emblem.get_height () / 2,
-                                  pixbuf.get_width () / 2,
-                                  pixbuf.get_height () / 2,
-                                  0.5, 0.5,
-                                  gtk.gdk.INTERP_BILINEAR, 255)
+                try:
+                    theme = gtk.icon_theme_get_default ()
+                    emblem = theme.load_icon (icon, 22, 0)
+                    emblem.composite (pixbuf,
+                                      pixbuf.get_width () / 2,
+                                      pixbuf.get_height () / 2,
+                                      emblem.get_width () / 2,
+                                      emblem.get_height () / 2,
+                                      pixbuf.get_width () / 2,
+                                      pixbuf.get_height () / 2,
+                                      0.5, 0.5,
+                                      gtk.gdk.INTERP_BILINEAR, 255)
+                except gobject.GError:
+                    debugprint ("No %s icon available" % icon)
 
         return pixbuf
 
diff -up system-config-printer-1.1.12/system-config-printer.py.icon-load-traceback system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.icon-load-traceback	2009-08-26 17:45:45.471190754 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-26 17:46:06.753314108 +0100
@@ -1469,28 +1469,34 @@ class GUI(GtkGUI, monitor.Watcher):
 
                 if def_emblem:
                     (w, h) = gtk.icon_size_lookup (gtk.ICON_SIZE_DIALOG)
-                    default_emblem = theme.load_icon (def_emblem, w/2, 0)
-                    copy = pixbuf.copy ()
-                    default_emblem.composite (copy, 0, 0,
-                                              copy.get_width (),
-                                              copy.get_height (),
-                                              0, 0,
-                                              1.0, 1.0,
-                                              gtk.gdk.INTERP_NEAREST, 255)
-                    pixbuf = copy
+                    try:
+                        default_emblem = theme.load_icon (def_emblem, w/2, 0)
+                        copy = pixbuf.copy ()
+                        default_emblem.composite (copy, 0, 0,
+                                                  copy.get_width (),
+                                                  copy.get_height (),
+                                                  0, 0,
+                                                  1.0, 1.0,
+                                                  gtk.gdk.INTERP_NEAREST, 255)
+                        pixbuf = copy
+                    except gobject.GError:
+                        debugprint ("No %s icon available" % def_emblem)
 
                 if emblem:
                     (w, h) = gtk.icon_size_lookup (gtk.ICON_SIZE_DIALOG)
-                    other_emblem = theme.load_icon (emblem, w/2, 0)
-                    copy = pixbuf.copy ()
-                    other_emblem.composite (copy, 0, 0,
-                                            copy.get_width (),
-                                            copy.get_height (),
-                                            copy.get_width () / 2,
-                                            copy.get_height () / 2,
-                                            1.0, 1.0,
-                                            gtk.gdk.INTERP_NEAREST, 255)
-                    pixbuf = copy
+                    try:
+                        other_emblem = theme.load_icon (emblem, w/2, 0)
+                        copy = pixbuf.copy ()
+                        other_emblem.composite (copy, 0, 0,
+                                                copy.get_width (),
+                                                copy.get_height (),
+                                                copy.get_width () / 2,
+                                                copy.get_height () / 2,
+                                                1.0, 1.0,
+                                                gtk.gdk.INTERP_NEAREST, 255)
+                        pixbuf = copy
+                    except gobject.GError:
+                        debugprint ("No %s icon available" % emblem)
 
                 self.mainlist.append (row=[object, pixbuf, name, tip])
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- system-config-printer.spec	26 Aug 2009 16:45:00 -0000	1.285
+++ system-config-printer.spec	26 Aug 2009 16:48:47 -0000	1.286
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
+Patch3: system-config-printer-icon-load-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -78,6 +79,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
+%patch3 -p1 -b .icon-load-traceback
 
 %build
 %configure --with-udev-rules
@@ -190,6 +192,7 @@ exit 0
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
+- Handle icon load failure gracefully.
 - Fixed statereason icon names.
 
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-2



From karsten at fedoraproject.org  Wed Aug 26 16:49:29 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 26 Aug 2009 16:49:29 +0000 (UTC)
Subject: rpms/kbd/devel kbd.spec,1.64,1.65
Message-ID: <20090826164929.C6CCD11C0082@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/kbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26716

Modified Files:
	kbd.spec 
Log Message:
- drop excludearch s390x, we need this package to be able to build other packages on s390x



Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- kbd.spec	25 Jul 2009 04:19:15 -0000	1.64
+++ kbd.spec	26 Aug 2009 16:49:29 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -21,7 +21,6 @@ Patch5:         kbd-1.15-quiet_doc.patch
 BuildRequires:  bison, flex, gettext
 Conflicts:      util-linux < 2.11r-9
 Requires:       initscripts >= 5.86-1
-ExcludeArch:    s390 s390x
 
 %description
 The %{name} package contains tools for managing a Linux
@@ -106,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/kbd
 
 %changelog
+* Wed Aug 26 2009 Karsten Hopp <karsten at redhat.com> 1.15-9
+- drop excludearch s390x, we need this package to be able to build other packages on s390x
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.15-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jgarzik at fedoraproject.org  Wed Aug 26 16:50:21 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Wed, 26 Aug 2009 16:50:21 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.12,1.13
Message-ID: <20090826165021.E41DE11C043A@cvs1.fedora.phx.redhat.com>

Author: jgarzik

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27004

Modified Files:
	tabled.spec 
Log Message:
rebuild for dependency cld 0.2.1


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tabled.spec	21 Aug 2009 16:03:55 -0000	1.12
+++ tabled.spec	26 Aug 2009 16:50:21 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -17,10 +17,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	db4-devel libevent-devel glib2-devel pcre-devel
 BuildRequires:	chunkd cld libcurl-devel
 BuildRequires:	procps
-BuildRequires:	cld-devel >= 0.2
+BuildRequires:	cld-devel >= 0.2.1
 BuildRequires:	chunkd-devel >= 0.4
 
-Requires:	cld >= 0.2
+Requires:	cld >= 0.2.1
 Requires:	chunkd >= 0.4
 
 # chunkd is broken on big-endian... embarrassing!!!
@@ -105,6 +105,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Aug 26 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-3
+- require/rebuild for cld 0.2.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-2
 - rebuilt with new openssl
 



From twaugh at fedoraproject.org  Wed Aug 26 16:51:10 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:51:10 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-icon-load-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.276, 1.277
Message-ID: <20090826165110.E4CD711C0082@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-serv27224

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-icon-load-traceback.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
- Handle icon load failure gracefully.


system-config-printer-icon-load-traceback.patch:
 jobviewer.py             |   26 ++++++++++++++------------
 system-config-printer.py |   44 +++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 31 deletions(-)

--- NEW FILE system-config-printer-icon-load-traceback.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.icon-load-traceback system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.icon-load-traceback	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-26 17:46:06.744314174 +0100
@@ -1033,18 +1033,20 @@ class JobViewer (GtkGUI, monitor.Watcher
                 # Add an emblem to the icon.
                 icon = StateReason.LEVEL_ICON[level]
                 pixbuf = pixbuf.copy ()
-                theme = gtk.icon_theme_get_default ()
-
-                emblem = theme.load_icon (icon, 22, 0)
-                emblem.composite (pixbuf,
-                                  pixbuf.get_width () / 2,
-                                  pixbuf.get_height () / 2,
-                                  emblem.get_width () / 2,
-                                  emblem.get_height () / 2,
-                                  pixbuf.get_width () / 2,
-                                  pixbuf.get_height () / 2,
-                                  0.5, 0.5,
-                                  gtk.gdk.INTERP_BILINEAR, 255)
+                try:
+                    theme = gtk.icon_theme_get_default ()
+                    emblem = theme.load_icon (icon, 22, 0)
+                    emblem.composite (pixbuf,
+                                      pixbuf.get_width () / 2,
+                                      pixbuf.get_height () / 2,
+                                      emblem.get_width () / 2,
+                                      emblem.get_height () / 2,
+                                      pixbuf.get_width () / 2,
+                                      pixbuf.get_height () / 2,
+                                      0.5, 0.5,
+                                      gtk.gdk.INTERP_BILINEAR, 255)
+                except gobject.GError:
+                    debugprint ("No %s icon available" % icon)
 
         return pixbuf
 
diff -up system-config-printer-1.1.12/system-config-printer.py.icon-load-traceback system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.icon-load-traceback	2009-08-26 17:45:45.471190754 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-26 17:46:06.753314108 +0100
@@ -1469,28 +1469,34 @@ class GUI(GtkGUI, monitor.Watcher):
 
                 if def_emblem:
                     (w, h) = gtk.icon_size_lookup (gtk.ICON_SIZE_DIALOG)
-                    default_emblem = theme.load_icon (def_emblem, w/2, 0)
-                    copy = pixbuf.copy ()
-                    default_emblem.composite (copy, 0, 0,
-                                              copy.get_width (),
-                                              copy.get_height (),
-                                              0, 0,
-                                              1.0, 1.0,
-                                              gtk.gdk.INTERP_NEAREST, 255)
-                    pixbuf = copy
+                    try:
+                        default_emblem = theme.load_icon (def_emblem, w/2, 0)
+                        copy = pixbuf.copy ()
+                        default_emblem.composite (copy, 0, 0,
+                                                  copy.get_width (),
+                                                  copy.get_height (),
+                                                  0, 0,
+                                                  1.0, 1.0,
+                                                  gtk.gdk.INTERP_NEAREST, 255)
+                        pixbuf = copy
+                    except gobject.GError:
+                        debugprint ("No %s icon available" % def_emblem)
 
                 if emblem:
                     (w, h) = gtk.icon_size_lookup (gtk.ICON_SIZE_DIALOG)
-                    other_emblem = theme.load_icon (emblem, w/2, 0)
-                    copy = pixbuf.copy ()
-                    other_emblem.composite (copy, 0, 0,
-                                            copy.get_width (),
-                                            copy.get_height (),
-                                            copy.get_width () / 2,
-                                            copy.get_height () / 2,
-                                            1.0, 1.0,
-                                            gtk.gdk.INTERP_NEAREST, 255)
-                    pixbuf = copy
+                    try:
+                        other_emblem = theme.load_icon (emblem, w/2, 0)
+                        copy = pixbuf.copy ()
+                        other_emblem.composite (copy, 0, 0,
+                                                copy.get_width (),
+                                                copy.get_height (),
+                                                copy.get_width () / 2,
+                                                copy.get_height () / 2,
+                                                1.0, 1.0,
+                                                gtk.gdk.INTERP_NEAREST, 255)
+                        pixbuf = copy
+                    except gobject.GError:
+                        debugprint ("No %s icon available" % emblem)
 
                 self.mainlist.append (row=[object, pixbuf, name, tip])
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- system-config-printer.spec	26 Aug 2009 16:46:30 -0000	1.276
+++ system-config-printer.spec	26 Aug 2009 16:51:10 -0000	1.277
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
+Patch3: system-config-printer-icon-load-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -66,6 +67,7 @@ the configuration tool.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
+%patch3 -p1 -b .icon-load-traceback
 
 %build
 %configure
@@ -168,6 +170,7 @@ exit 0
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
+- Handle icon load failure gracefully.
 - Fixed statereason icon names.
 
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3



From twaugh at fedoraproject.org  Wed Aug 26 16:52:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:52:14 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-statereason-icons.patch, NONE,
	1.1 system-config-printer.spec, 1.245, 1.246
Message-ID: <20090826165214.3780611C0082@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-serv27469

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-statereason-icons.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
- Fixed statereason icon names.


system-config-printer-statereason-icons.patch:
 statereason.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-statereason-icons.patch ---
diff -up system-config-printer-1.1.12/statereason.py.statereason-icons system-config-printer-1.1.12/statereason.py
--- system-config-printer-1.1.12/statereason.py.statereason-icons	2009-08-25 17:01:28.000000000 +0100
+++ system-config-printer-1.1.12/statereason.py	2009-08-26 17:43:19.368314303 +0100
@@ -28,9 +28,9 @@ class StateReason:
     ERROR=3
 
     LEVEL_ICON={
-        REPORT: "info",
-        WARNING: "important",
-        ERROR: "error"
+        REPORT: "dialog-info",
+        WARNING: "dialog-warning",
+        ERROR: "dialog-error"
         }
 
     def __init__(self, printer, reason):


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- system-config-printer.spec	26 Aug 2009 12:16:40 -0000	1.245
+++ system-config-printer.spec	26 Aug 2009 16:52:14 -0000	1.246
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-get_cursor.patch
+Patch2: system-config-printer-statereason-icons.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -64,6 +65,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .get_cursor
+%patch2 -p1 -b .statereason-icons
 
 %build
 %configure
@@ -165,6 +167,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
+- Fixed statereason icon names.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
 - Fixed traceback in on_tvNPDeviceURIs_cursor_changed (bug #519367).
 



From twaugh at fedoraproject.org  Wed Aug 26 16:54:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 16:54:05 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-icon-load-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.246, 1.247
Message-ID: <20090826165405.639EF11C0082@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-serv27922

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-icon-load-traceback.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
- Handle icon load failure gracefully.


system-config-printer-icon-load-traceback.patch:
 jobviewer.py             |   26 ++++++++++++++------------
 system-config-printer.py |   44 +++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 31 deletions(-)

--- NEW FILE system-config-printer-icon-load-traceback.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.icon-load-traceback system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.icon-load-traceback	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-26 17:46:06.744314174 +0100
@@ -1033,18 +1033,20 @@ class JobViewer (GtkGUI, monitor.Watcher
                 # Add an emblem to the icon.
                 icon = StateReason.LEVEL_ICON[level]
                 pixbuf = pixbuf.copy ()
-                theme = gtk.icon_theme_get_default ()
-
-                emblem = theme.load_icon (icon, 22, 0)
-                emblem.composite (pixbuf,
-                                  pixbuf.get_width () / 2,
-                                  pixbuf.get_height () / 2,
-                                  emblem.get_width () / 2,
-                                  emblem.get_height () / 2,
-                                  pixbuf.get_width () / 2,
-                                  pixbuf.get_height () / 2,
-                                  0.5, 0.5,
-                                  gtk.gdk.INTERP_BILINEAR, 255)
+                try:
+                    theme = gtk.icon_theme_get_default ()
+                    emblem = theme.load_icon (icon, 22, 0)
+                    emblem.composite (pixbuf,
+                                      pixbuf.get_width () / 2,
+                                      pixbuf.get_height () / 2,
+                                      emblem.get_width () / 2,
+                                      emblem.get_height () / 2,
+                                      pixbuf.get_width () / 2,
+                                      pixbuf.get_height () / 2,
+                                      0.5, 0.5,
+                                      gtk.gdk.INTERP_BILINEAR, 255)
+                except gobject.GError:
+                    debugprint ("No %s icon available" % icon)
 
         return pixbuf
 
diff -up system-config-printer-1.1.12/system-config-printer.py.icon-load-traceback system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.icon-load-traceback	2009-08-26 17:45:45.471190754 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-26 17:46:06.753314108 +0100
@@ -1469,28 +1469,34 @@ class GUI(GtkGUI, monitor.Watcher):
 
                 if def_emblem:
                     (w, h) = gtk.icon_size_lookup (gtk.ICON_SIZE_DIALOG)
-                    default_emblem = theme.load_icon (def_emblem, w/2, 0)
-                    copy = pixbuf.copy ()
-                    default_emblem.composite (copy, 0, 0,
-                                              copy.get_width (),
-                                              copy.get_height (),
-                                              0, 0,
-                                              1.0, 1.0,
-                                              gtk.gdk.INTERP_NEAREST, 255)
-                    pixbuf = copy
+                    try:
+                        default_emblem = theme.load_icon (def_emblem, w/2, 0)
+                        copy = pixbuf.copy ()
+                        default_emblem.composite (copy, 0, 0,
+                                                  copy.get_width (),
+                                                  copy.get_height (),
+                                                  0, 0,
+                                                  1.0, 1.0,
+                                                  gtk.gdk.INTERP_NEAREST, 255)
+                        pixbuf = copy
+                    except gobject.GError:
+                        debugprint ("No %s icon available" % def_emblem)
 
                 if emblem:
                     (w, h) = gtk.icon_size_lookup (gtk.ICON_SIZE_DIALOG)
-                    other_emblem = theme.load_icon (emblem, w/2, 0)
-                    copy = pixbuf.copy ()
-                    other_emblem.composite (copy, 0, 0,
-                                            copy.get_width (),
-                                            copy.get_height (),
-                                            copy.get_width () / 2,
-                                            copy.get_height () / 2,
-                                            1.0, 1.0,
-                                            gtk.gdk.INTERP_NEAREST, 255)
-                    pixbuf = copy
+                    try:
+                        other_emblem = theme.load_icon (emblem, w/2, 0)
+                        copy = pixbuf.copy ()
+                        other_emblem.composite (copy, 0, 0,
+                                                copy.get_width (),
+                                                copy.get_height (),
+                                                copy.get_width () / 2,
+                                                copy.get_height () / 2,
+                                                1.0, 1.0,
+                                                gtk.gdk.INTERP_NEAREST, 255)
+                        pixbuf = copy
+                    except gobject.GError:
+                        debugprint ("No %s icon available" % emblem)
 
                 self.mainlist.append (row=[object, pixbuf, name, tip])
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- system-config-printer.spec	26 Aug 2009 16:52:14 -0000	1.246
+++ system-config-printer.spec	26 Aug 2009 16:54:05 -0000	1.247
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
+Patch3: system-config-printer-icon-load-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -66,6 +67,7 @@ the configuration tool.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
+%patch3 -p1 -b .icon-load-traceback
 
 %build
 %configure
@@ -168,6 +170,7 @@ exit 0
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
+- Handle icon load failure gracefully.
 - Fixed statereason icon names.
 
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3



From apevec at fedoraproject.org  Wed Aug 26 16:54:44 2009
From: apevec at fedoraproject.org (Alan Pevec)
Date: Wed, 26 Aug 2009 16:54:44 +0000 (UTC)
Subject: rpms/augeas/EL-4 xorg.aug,NONE,1.1 augeas.spec,1.21,1.22
Message-ID: <20090826165444.55E5F11C0082@cvs1.fedora.phx.redhat.com>

Author: apevec

Update of /cvs/pkgs/rpms/augeas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28104

Modified Files:
	augeas.spec 
Added Files:
	xorg.aug 
Log Message:
* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
- Include new xorg lens from upstream




--- NEW FILE xorg.aug ---
(*
Module: Xorg
 Parses /etc/X11/xorg.conf

Authors: Raphael Pinson <raphink at gmail.com>
         Matthew Booth <mbooth at redhat.com>

About: Reference
 This lens tries to keep as close as possible to `man xorg.conf` where
 possible.

The definitions from `man xorg.conf` are put as commentaries for reference
throughout the file. More information can be found in the manual.

About: License
  This file is licensed under the GPL.

About: Lens Usage
  Sample usage of this lens in augtool

    * Get the identifier of the devices with a "Clone" option:
      > match "/files/etc/X11/xorg.conf/Device[Option = 'Clone']/Identifier"

About: Configuration files
  This lens applies to /etc/X11/xorg.conf. See <filter>.
*)

module Xorg =
  autoload xfm

(************************************************************************
 * Group:                 USEFUL PRIMITIVES
 *************************************************************************)

(* Group: Generic primitives *)

(* Variable: eol *)
let eol     = Util.eol

(* Variable: to_eol
 * Match everything from here to eol, cropping whitespace at both ends
 *)
let to_eol  = /[^ \t\n](.*[^ \t\n])?/

(* Variable: indent *)
let indent  = Util.indent

(* Variable: comment *)
let comment = Util.comment

(* Variable: empty *)
let empty   = Util.empty


(* Group: Separators *)

(* Variable: sep_spc *)
let sep_spc = Util.del_ws_spc

(* Variable: sep_dquote *)
let sep_dquote  = Util.del_str "\""


(* Group: Fields and values *)

(* Variable: entries_re
 * This is a list of all patterns which have specific handlers, and should
 * therefore not be matched by the generic handler
 *)
let entries_re  = /([oO]ption|[sS]creen|[iI]nput[dD]evice|[dD]river|[sS]ub[sS]ection|[dD]isplay|[iI]dentifier|[vV]ideo[rR]am|[dD]efault[dD]epth|[dD]evice)/

(* Variable: generic_entry_re *)
let generic_entry_re = /[^# \t\n\/]+/ - entries_re

(* Variable: quoted_string_val *)
let quoted_string_val = del "\"" "\"" . store /[^"\n]+/ . del "\"" "\""
                                              (* " relax, emacs *)

(* Variable: int *)
let int = /[0-9]+/


(************************************************************************
 * Group:                          ENTRIES AND OPTIONS
 *************************************************************************)


(* View: entry_int
 * This matches an entry which takes a single integer for an argument
 *)
let entry_int (canon:string) (re:regexp) =
        [ indent . del re canon . label canon . sep_spc . store int . eol ]

(* View: entry_rgb
 * This matches an entry which takes 3 integers as arguments representing red,
 * green and blue components
 *)
let entry_rgb (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "red"   . sep_spc . store int ]
          . [ label "green" . sep_spc . store int ]
          . [ label "blue"  . sep_spc . store int ]
          . eol ]

(* View: entry_xy
 * This matches an entry which takes 2 integers as arguments representing X and
 * Y coordinates
 *)
let entry_xy (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . [ label "x" . sep_spc . store int ]
          . [ label "y" . sep_spc . store int ]
          . eol ]

(* View: entry_str
 * This matches an entry which takes a single quoted string
 *)
let entry_str (canon:string) (re:regexp) =
        [ indent . del re canon . label canon
          . sep_spc . quoted_string_val . eol ]

(* View: entry_generic
 * An entry without a specific handler. Store everything after the keyword,
 * cropping whitespace at both ends.
 *)
let entry_generic  = [ indent . key generic_entry_re
                       . sep_spc . store to_eol . eol ]

(* View: option *)
let option = [ indent . del /[oO]ption/ "Option" . label "Option" . sep_spc
               . quoted_string_val
               . [ label "value" . sep_spc . quoted_string_val ]*
               . eol ]

(* View: screen
 * The Screen entry of ServerLayout
 *)
let screen = [ indent . del /[sS]creen/ "Screen" . label "Screen" . sep_spc
               . [ label "num" . store int . sep_spc ]?
               . quoted_string_val . sep_spc
               . [ label "position" . store to_eol ]
               . eol ]

(* View: input_device *)
let input_device = [ indent . del /[iI]nput[dD]evice/ "InputDevice"
                     . label "InputDevice" . sep_spc . quoted_string_val
                     . [ label "option" . sep_spc . quoted_string_val ]*
                     . eol ]

(* View: driver *)
let driver = entry_str "Driver" /[dD]river/

(* View: identifier *)
let identifier = entry_str "Identifier" /[iI]dentifier/

(* View: videoram *)
let videoram = entry_int "VideoRam" /[vV]ideo[rR]am/

(* View: default_depth *)
let default_depth = entry_int "DefaultDepth" /[dD]efault[dD]epth/

(* View: device *)
let device = entry_str "Device" /[dD]evice/

(************************************************************************
 * Group:                          DISPLAY SUBSECTION
 *************************************************************************)


(* View: display_modes *)
let display_modes = [ indent . del /[mM]odes/ "Modes" . label "Modes"
                      . [ label "mode" . sep_spc . quoted_string_val ]+
                      . eol ]

(*************************************************************************
 * View: display_entry
 *   Known values for entries in the Display subsection
 *
 *   Definition:
 *     > Depth    depth
 *     > FbBpp    bpp
 *     > Weight   red-weight green-weight blue-weight
 *     > Virtual  xdim ydim
 *     > ViewPort x0 y0
 *     > Modes    "mode-name" ...
 *     > Visual   "visual-name"
 *     > Black    red green blue
 *     > White    red green blue
 *     > Options
 *)

let display_entry = entry_int "Depth"    /[dD]epth/ |
                    entry_int "FbBpp"    /[fF]b[bB]pp/ |
                    entry_rgb "Weight"   /[wW]eight/ |
                    entry_xy  "Virtual"  /[vV]irtual/ |
                    entry_xy  "ViewPort" /[vV]iew[pP]ort/ |
                    display_modes |
                    entry_str "Visual"   /[vV]isual/ |
                    entry_rgb "Black"    /[bB]lack/ |
                    entry_rgb "White"    /[wW]hite/ |
                    entry_str "Options"  /[oO]ptions/ |
                    empty |
                    comment

(* View: display *)
let display = [ indent . del "SubSection" "SubSection" . sep_spc
                       . sep_dquote . key "Display" . sep_dquote
                       . eol
                       . display_entry*
                       . indent . del "EndSubSection" "EndSubSection" . eol ]


(************************************************************************
 * Group:                       SECTIONS
 *************************************************************************)


(************************************************************************
 * Variable: section_re
 *   Known values for Section names
 *
 *   Definition:
 *     >   The section names are:
 *     >
 *     >   Files          File pathnames
 *     >   ServerFlags    Server flags
 *     >   Module         Dynamic module loading
 *     >   InputDevice    Input device description
 *     >   Device         Graphics device description
 *     >   VideoAdaptor   Xv video adaptor description
 *     >   Monitor        Monitor description
 *     >   Modes          Video modes descriptions
 *     >   Screen         Screen configuration
 *     >   ServerLayout   Overall layout
 *     >   DRI            DRI-specific configuration
 *     >   Vendor         Vendor-specific configuration
 *************************************************************************)
let section_re = /(Files|ServerFlags|Module|InputDevice|Device|VideoAdaptor|Monitor|Modes|Screen|ServerLayout|DRI|Vendor)/


(************************************************************************
 * Variable: secton_re_obsolete
 *   The  following obsolete section names are still recognised for
 *   compatibility purposes.  In new config files, the InputDevice
 *   section should be used instead.
 *
 *   Definition:
 *     >  Keyboard       Keyboard configuration
 *     >  Pointer        Pointer/mouse configuration
 *************************************************************************)
let section_re_obsolete = /(Keyboard|Pointer)/

(* View: section_entry *)
let section_entry = option |
                    screen |
                    display |
                    input_device |
                    driver |
                    identifier |
                    videoram |
                    default_depth |
                    device |
                    entry_generic |
                    empty | comment

(************************************************************************
 * View: section
 *   A section in xorg.conf
 *
 *   Definition:
 *     > Section  "SectionName"
 *     >    SectionEntry
 *     >    ...
 *     > EndSection
 *************************************************************************)
let section = [ indent . del "Section" "Section"
                       . sep_spc . sep_dquote
                       . key (section_re|section_re_obsolete) . sep_dquote
                       . eol
                .  section_entry*
                . indent . del "EndSection" "EndSection" . eol ]

(*
 * View: lns
 *   The xorg.conf lens
 *)
let lns = ( empty | comment | section )*


(* Variable: filter *)
let filter = (incl "/etc/X11/xorg.conf")

let xfm = transform lns filter


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- augeas.spec	14 Jul 2009 02:53:42 -0000	1.21
+++ augeas.spec	26 Aug 2009 16:54:44 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  readline-devel libselinux-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+# This xorg.aug is upstream, but unreleased as of augeas-0.5.2
+Source1:        xorg.aug
+
 %description
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Replace xorg lens with new version from upstream
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/dist/xorg.aug
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Aug 25 2009 Matthew Booth <mbooth at redhat.com> - 0.5.2-2
+- Include new xorg lens from upstream
+
 * Mon Jul 13 2009 David Lutterkort <lutter at redhat.com> - 0.5.2-1
 - New version
 



From mtasaka at fedoraproject.org  Wed Aug 26 17:05:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 17:05:20 +0000 (UTC)
Subject: rpms/rubygem-htmlentities/F-10 .cvsignore, 1.3,
	1.4 rubygem-htmlentities.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090826170520.737A911C004B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-htmlentities/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30264/F-10

Modified Files:
	.cvsignore rubygem-htmlentities.spec sources 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 16:24:08 -0000	1.3
+++ .cvsignore	26 Aug 2009 17:05:20 -0000	1.4
@@ -1 +1 @@
-htmlentities-4.1.0.gem
+htmlentities-4.2.0.gem


Index: rubygem-htmlentities.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/rubygem-htmlentities.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-htmlentities.spec	20 Aug 2009 16:24:08 -0000	1.2
+++ rubygem-htmlentities.spec	26 Aug 2009 17:05:20 -0000	1.3
@@ -9,7 +9,7 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.1.0
+Version:	4.2.0
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/
 
+# Cleanups
+rm -f %{buildroot}%{geminstdir}/setup.rb
+
 # Create symlinks for ruby-%%{gemname}
 # Copied from rubygem-gettext.spec
 
@@ -125,6 +128,7 @@ rm -rf %{buildroot}
 %dir	%{geminstdir}
 %doc	%{geminstdir}/[A-Z]*
 %{geminstdir}/lib/
+%doc	%{geminstdir}/perf/
 %doc	%{geminstdir}/test/
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -137,6 +141,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.0-1
+- 4.2.0
+
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
 - 4.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 16:24:08 -0000	1.3
+++ sources	26 Aug 2009 17:05:20 -0000	1.4
@@ -1 +1 @@
-ccb03a8085d032ebfdcef45eba91ada2  htmlentities-4.1.0.gem
+ad78c92451862e54fa608539d7c1bccd  htmlentities-4.2.0.gem



From mtasaka at fedoraproject.org  Wed Aug 26 17:05:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 17:05:20 +0000 (UTC)
Subject: rpms/rubygem-htmlentities/devel .cvsignore, 1.3,
	1.4 rubygem-htmlentities.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090826170520.CB65311C004B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-htmlentities/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30264/devel

Modified Files:
	.cvsignore rubygem-htmlentities.spec sources 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 16:24:08 -0000	1.3
+++ .cvsignore	26 Aug 2009 17:05:20 -0000	1.4
@@ -1 +1 @@
-htmlentities-4.1.0.gem
+htmlentities-4.2.0.gem


Index: rubygem-htmlentities.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/rubygem-htmlentities.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-htmlentities.spec	20 Aug 2009 16:24:08 -0000	1.3
+++ rubygem-htmlentities.spec	26 Aug 2009 17:05:20 -0000	1.4
@@ -9,7 +9,7 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.1.0
+Version:	4.2.0
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/
 
+# Cleanups
+rm -f %{buildroot}%{geminstdir}/setup.rb
+
 # Create symlinks for ruby-%%{gemname}
 # Copied from rubygem-gettext.spec
 
@@ -125,6 +128,7 @@ rm -rf %{buildroot}
 %dir	%{geminstdir}
 %doc	%{geminstdir}/[A-Z]*
 %{geminstdir}/lib/
+%doc	%{geminstdir}/perf/
 %doc	%{geminstdir}/test/
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -137,6 +141,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.0-1
+- 4.2.0
+
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
 - 4.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 16:24:08 -0000	1.3
+++ sources	26 Aug 2009 17:05:20 -0000	1.4
@@ -1 +1 @@
-ccb03a8085d032ebfdcef45eba91ada2  htmlentities-4.1.0.gem
+ad78c92451862e54fa608539d7c1bccd  htmlentities-4.2.0.gem



From mtasaka at fedoraproject.org  Wed Aug 26 17:05:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 17:05:20 +0000 (UTC)
Subject: rpms/rubygem-htmlentities/F-11 .cvsignore, 1.3,
	1.4 rubygem-htmlentities.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090826170520.9962D11C004B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-htmlentities/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30264/F-11

Modified Files:
	.cvsignore rubygem-htmlentities.spec sources 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 16:24:08 -0000	1.3
+++ .cvsignore	26 Aug 2009 17:05:20 -0000	1.4
@@ -1 +1 @@
-htmlentities-4.1.0.gem
+htmlentities-4.2.0.gem


Index: rubygem-htmlentities.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-11/rubygem-htmlentities.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rubygem-htmlentities.spec	20 Aug 2009 16:24:08 -0000	1.2
+++ rubygem-htmlentities.spec	26 Aug 2009 17:05:20 -0000	1.3
@@ -9,7 +9,7 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.1.0
+Version:	4.2.0
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/
 
+# Cleanups
+rm -f %{buildroot}%{geminstdir}/setup.rb
+
 # Create symlinks for ruby-%%{gemname}
 # Copied from rubygem-gettext.spec
 
@@ -125,6 +128,7 @@ rm -rf %{buildroot}
 %dir	%{geminstdir}
 %doc	%{geminstdir}/[A-Z]*
 %{geminstdir}/lib/
+%doc	%{geminstdir}/perf/
 %doc	%{geminstdir}/test/
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -137,6 +141,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.0-1
+- 4.2.0
+
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.0-1
 - 4.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-htmlentities/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 16:24:08 -0000	1.3
+++ sources	26 Aug 2009 17:05:20 -0000	1.4
@@ -1 +1 @@
-ccb03a8085d032ebfdcef45eba91ada2  htmlentities-4.1.0.gem
+ad78c92451862e54fa608539d7c1bccd  htmlentities-4.2.0.gem



From rdieter at fedoraproject.org  Wed Aug 26 17:17:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 17:17:41 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.506,1.507
Message-ID: <20090826171741.7A81911C004B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32357

Modified Files:
	kdelibs.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
- BR: xz-devel



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -p -r1.506 -r1.507
--- kdelibs.spec	23 Aug 2009 18:43:21 -0000	1.506
+++ kdelibs.spec	26 Aug 2009 17:17:40 -0000	1.507
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -127,6 +127,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
@@ -134,8 +135,8 @@ BuildRequires: phonon-devel >= %{phonon_
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
 BuildRequires: strigi-devel >= %{strigi_ver} 
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
-BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
 %define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
@@ -418,6 +419,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- BR: xz-devel
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-7
 - buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
 



From twaugh at fedoraproject.org  Wed Aug 26 17:20:25 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 17:20:25 +0000 (UTC)
Subject: rpms/cups/devel cups-str3308.patch,NONE,1.1 cups.spec,1.507,1.508
Message-ID: <20090826172025.7A4F311C043B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv336

Modified Files:
	cups.spec 
Added Files:
	cups-str3308.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed document-format-supported attribute when
  application/octet-stream is enabled (bug #516507, STR #3308, patch
  from Jiri Popelka).


cups-str3308.patch:
 printers.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3308.patch ---
diff -up cups-1.4rc1/scheduler/printers.c.str3308 cups-1.4rc1/scheduler/printers.c
--- cups-1.4rc1/scheduler/printers.c.str3308	2009-08-26 18:16:22.948769384 +0100
+++ cups-1.4rc1/scheduler/printers.c	2009-08-26 18:16:23.649770491 +0100
@@ -3718,10 +3718,6 @@ add_printer_formats(cupsd_printer_t *p)	
                       p->name, mimetype);
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "add_printer_formats: %s: %d supported types",
-		  p->name, cupsArrayCount(p->filetypes) + 1);
-
  /*
   * Add the file formats that can be filtered...
   */
@@ -3732,9 +3728,13 @@ add_printer_formats(cupsd_printer_t *p)	
   else
     i = 0;
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "add_printer_formats: %s: %d supported types",
+                  p->name, cupsArrayCount(p->filetypes) + i);
+
   attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE,
                        "document-format-supported",
-		       cupsArrayCount(p->filetypes) + 1, NULL, NULL);
+                       cupsArrayCount(p->filetypes) + i, NULL, NULL);
 
   if (i)
     attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- cups.spec	26 Aug 2009 16:41:14 -0000	1.507
+++ cups.spec	26 Aug 2009 17:20:25 -0000	1.508
@@ -69,6 +69,7 @@ Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
+Patch45: cups-str3308.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -238,6 +239,7 @@ module. 
 %patch42 -p1 -b .str3287
 %patch43 -p1 -b .str3292
 %patch44 -p1 -b .str3293
+%patch45 -p1 -b .str3308
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -533,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed document-format-supported attribute when
+  application/octet-stream is enabled (bug #516507, STR #3308, patch
+  from Jiri Popelka).
 - Fixed buggy JobKillDelay handling fix (STR #3292).
 - Prevent infinite loop in ppdc (STR #3293).
 



From tuxbrewr at fedoraproject.org  Wed Aug 26 17:21:11 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 17:21:11 +0000 (UTC)
Subject: rpms/acpi/devel .cvsignore, 1.3, 1.4 acpi.spec, 1.8, 1.9 sources,
	1.3, 1.4
Message-ID: <20090826172111.ACD8F11C004B@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/acpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv547

Modified Files:
	.cvsignore acpi.spec sources 
Log Message:

fixed state information for thermal zones
added output of all trip points
straightlined old crufty user interface
fixed battery output to cope with systems giving energy values but no voltage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/acpi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Jun 2009 22:07:45 -0000	1.3
+++ .cvsignore	26 Aug 2009 17:21:11 -0000	1.4
@@ -1 +1 @@
-acpi-1.3.tar.gz
+acpi-1.4.tar.gz


Index: acpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/acpi/devel/acpi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- acpi.spec	24 Jul 2009 16:34:03 -0000	1.8
+++ acpi.spec	26 Aug 2009 17:21:11 -0000	1.9
@@ -1,8 +1,8 @@
 Summary:        Command-line ACPI client
 Summary(pl):    Klient ACPI dzia?aj?cy z linii polece?
 Name:           acpi
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 Source0:        acpi-%{version}.tar.gz
@@ -40,6 +40,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/acpi
 %{_datadir}/man/man1/acpi.1.gz
 %changelog
+* Wed Aug 26 2009 Steven M. Parrish <smparrish at gmail.com> - 1.4-1
+- fixed state information for thermal zones
+- added output of all trip points
+- straightlined old crufty user interface
+- fixed battery output to cope with systems giving energy values but no voltage
+
 * 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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/acpi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Jun 2009 22:06:18 -0000	1.3
+++ sources	26 Aug 2009 17:21:11 -0000	1.4
@@ -1 +1 @@
-5851e5515e9d3b08160f64be0f8c1827  acpi-1.3.tar.gz
+ea2a285957a36bad2ec099413bd330a5  acpi-1.4.tar.gz



From twaugh at fedoraproject.org  Wed Aug 26 17:21:34 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 26 Aug 2009 17:21:34 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3308.patch,NONE,1.1 cups.spec,1.511,1.512
Message-ID: <20090826172134.20D8D11C004B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv642

Modified Files:
	cups.spec 
Added Files:
	cups-str3308.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed document-format-supported attribute when
  application/octet-stream is enabled (bug #516507, STR #3308, patch
  from Jiri Popelka).


cups-str3308.patch:
 printers.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE cups-str3308.patch ---
diff -up cups-1.4rc1/scheduler/printers.c.str3308 cups-1.4rc1/scheduler/printers.c
--- cups-1.4rc1/scheduler/printers.c.str3308	2009-08-26 18:16:22.948769384 +0100
+++ cups-1.4rc1/scheduler/printers.c	2009-08-26 18:16:23.649770491 +0100
@@ -3718,10 +3718,6 @@ add_printer_formats(cupsd_printer_t *p)	
                       p->name, mimetype);
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "add_printer_formats: %s: %d supported types",
-		  p->name, cupsArrayCount(p->filetypes) + 1);
-
  /*
   * Add the file formats that can be filtered...
   */
@@ -3732,9 +3728,13 @@ add_printer_formats(cupsd_printer_t *p)	
   else
     i = 0;
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "add_printer_formats: %s: %d supported types",
+                  p->name, cupsArrayCount(p->filetypes) + i);
+
   attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE,
                        "document-format-supported",
-		       cupsArrayCount(p->filetypes) + 1, NULL, NULL);
+                       cupsArrayCount(p->filetypes) + i, NULL, NULL);
 
   if (i)
     attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- cups.spec	26 Aug 2009 16:42:54 -0000	1.511
+++ cups.spec	26 Aug 2009 17:21:34 -0000	1.512
@@ -69,6 +69,7 @@ Patch41: cups-str3279.patch
 Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
+Patch45: cups-str3308.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -238,6 +239,7 @@ module. 
 %patch42 -p1 -b .str3287
 %patch43 -p1 -b .str3292
 %patch44 -p1 -b .str3293
+%patch45 -p1 -b .str3308
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed document-format-supported attribute when
+  application/octet-stream is enabled (bug #516507, STR #3308, patch
+  from Jiri Popelka).
 - Fixed buggy JobKillDelay handling fix (STR #3292).
 - Prevent infinite loop in ppdc (STR #3293).
 



From steved at fedoraproject.org  Wed Aug 26 17:22:47 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 26 Aug 2009 17:22:47 +0000 (UTC)
Subject: rpms/kernel/devel nfs41-v2.6.31-rc7.patch, NONE, 1.1.2.1 kernel.spec,
	1.1740, 1.1740.2.1
Message-ID: <20090826172247.844DF11C004B@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv951

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc7
	kernel.spec 
Added Files:
      Tag: kernel-2_6_31-nfs41_rc7
	nfs41-v2.6.31-rc7.patch 
Log Message:
Update to latest nfs41 release: v2.6.31-rc7


nfs41-v2.6.31-rc7.patch:
 fs/nfs/client.c                          |   10 
 fs/nfs/nfs4proc.c                        |   16 
 fs/nfs/nfs4state.c                       |    2 
 fs/nfs/nfs4xdr.c                         | 1376 ++++++++++++++++++-------------
 fs/nfsd/nfs4callback.c                   |  216 ++++
 fs/nfsd/nfs4proc.c                       |   82 -
 fs/nfsd/nfs4state.c                      |  461 ++++------
 fs/nfsd/nfs4xdr.c                        |   16 
 fs/nfsd/nfsctl.c                         |    5 
 fs/nfsd/nfssvc.c                         |   29 
 include/linux/nfs4.h                     |    2 
 include/linux/nfsd/nfsd.h                |    3 
 include/linux/nfsd/state.h               |   61 -
 include/linux/nfsd/xdr4.h                |   26 
 include/linux/sunrpc/clnt.h              |    1 
 include/linux/sunrpc/svc.h               |    2 
 include/linux/sunrpc/svcsock.h           |    1 
 include/linux/sunrpc/xdr.h               |   10 
 include/linux/sunrpc/xprt.h              |    7 
 net/sunrpc/backchannel_rqst.c            |    2 
 net/sunrpc/cache.c                       |   66 -
 net/sunrpc/clnt.c                        |    1 
 net/sunrpc/sched.c                       |    7 
 net/sunrpc/sunrpc.h                      |   14 
 net/sunrpc/svcauth_unix.c                |    1 
 net/sunrpc/svcsock.c                     |  335 +++++--
 net/sunrpc/xdr.c                         |   12 
 net/sunrpc/xprt.c                        |   16 
 net/sunrpc/xprtrdma/svc_rdma_transport.c |    4 
 net/sunrpc/xprtsock.c                    |  199 ++++
 30 files changed, 1906 insertions(+), 1077 deletions(-)

--- NEW FILE nfs41-v2.6.31-rc7.patch ---
diff -up linux-2.6.30.noarch/fs/nfs/client.c.orig linux-2.6.30.noarch/fs/nfs/client.c
--- linux-2.6.30.noarch/fs/nfs/client.c.orig	2009-08-26 10:40:03.695433000 -0400
+++ linux-2.6.30.noarch/fs/nfs/client.c	2009-08-26 13:13:01.538401000 -0400
@@ -149,6 +149,7 @@ static struct nfs_client *nfs_alloc_clie
 	clp->cl_boot_time = CURRENT_TIME;
 	clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
 	clp->cl_minorversion = cl_init->minorversion;
+	clp->cl_lease_time = 0;
 #endif
 	cred = rpc_lookup_machine_cred();
 	if (!IS_ERR(cred))
@@ -535,16 +536,11 @@ void nfs_mark_client_ready(struct nfs_cl
 /*
  * With sessions, the client is not marked ready until after a
  * successful EXCHANGE_ID and CREATE_SESSION.
- *
- * Map errors cl_cons_state errors to EPROTONOSUPPORT to indicate
- * other versions of NFS can be tried.
  */
 int nfs4_check_client_ready(struct nfs_client *clp)
 {
-	if (!nfs4_has_session(clp))
-		return 0;
-	if (clp->cl_cons_state < NFS_CS_READY)
-		return -EPROTONOSUPPORT;
+	if (clp->cl_cons_state < 0)
+		return clp->cl_cons_state;
 	return 0;
 }
 
diff -up linux-2.6.30.noarch/fs/nfsd/nfs4callback.c.orig linux-2.6.30.noarch/fs/nfsd/nfs4callback.c
--- linux-2.6.30.noarch/fs/nfsd/nfs4callback.c.orig	2009-08-26 10:40:03.777437000 -0400
+++ linux-2.6.30.noarch/fs/nfsd/nfs4callback.c	2009-08-26 13:13:01.571402000 -0400
@@ -43,6 +43,7 @@
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/svcsock.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/state.h>
 #include <linux/sunrpc/sched.h>
@@ -52,16 +53,19 @@
 
 #define NFSPROC4_CB_NULL 0
 #define NFSPROC4_CB_COMPOUND 1
+#define NFS4_STATEID_SIZE 16
 
 /* Index of predefined Linux callback client operations */
 
 enum {
-        NFSPROC4_CLNT_CB_NULL = 0,
+	NFSPROC4_CLNT_CB_NULL = 0,
 	NFSPROC4_CLNT_CB_RECALL,
+	NFSPROC4_CLNT_CB_SEQUENCE,
 };
 
 enum nfs_cb_opnum4 {
 	OP_CB_RECALL            = 4,
+	OP_CB_SEQUENCE          = 11,
 };
 
 #define NFS4_MAXTAGLEN		20
@@ -70,17 +74,29 @@ enum nfs_cb_opnum4 {
 #define NFS4_dec_cb_null_sz		0
 #define cb_compound_enc_hdr_sz		4
 #define cb_compound_dec_hdr_sz		(3 + (NFS4_MAXTAGLEN >> 2))
+#define sessionid_sz			(NFS4_MAX_SESSIONID_LEN >> 2)
+#define cb_sequence_enc_sz		(sessionid_sz + 4 +             \
+					1 /* no referring calls list yet */)
+#define cb_sequence_dec_sz		(op_dec_sz + sessionid_sz + 4)
+
 #define op_enc_sz			1
 #define op_dec_sz			2
 #define enc_nfs4_fh_sz			(1 + (NFS4_FHSIZE >> 2))
 #define enc_stateid_sz			(NFS4_STATEID_SIZE >> 2)
 #define NFS4_enc_cb_recall_sz		(cb_compound_enc_hdr_sz +       \
+					cb_sequence_enc_sz +            \
 					1 + enc_stateid_sz +            \
 					enc_nfs4_fh_sz)
 
 #define NFS4_dec_cb_recall_sz		(cb_compound_dec_hdr_sz  +      \
+					cb_sequence_dec_sz +            \
 					op_dec_sz)
 
+struct nfs4_rpc_args {
+	void				*args_op;
+	struct nfsd4_cb_sequence	args_seq;
+};
+
 /*
 * Generic encode routines from fs/nfs/nfs4xdr.c
 */
@@ -137,11 +153,13 @@ xdr_error:                              
 } while (0)
 
 struct nfs4_cb_compound_hdr {
-	int		status;
-	u32		ident;
+	/* args */
+	u32		ident;	/* minorversion 0 only */
 	u32		nops;
 	__be32		*nops_p;
 	u32		minorversion;
+	/* res */
+	int		status;
 	u32		taglen;
 	char		*tag;
 };
@@ -238,6 +256,27 @@ encode_cb_recall(struct xdr_stream *xdr,
 	hdr->nops++;
 }
 
+static void
+encode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *args,
+		   struct nfs4_cb_compound_hdr *hdr)
+{
+	__be32 *p;
+
+	if (hdr->minorversion == 0)
+		return;
+
+	RESERVE_SPACE(1 + NFS4_MAX_SESSIONID_LEN + 20);
+
+	WRITE32(OP_CB_SEQUENCE);
+	WRITEMEM(args->cbs_clp->cl_sessionid.data, NFS4_MAX_SESSIONID_LEN);
+	WRITE32(args->cbs_clp->cl_cb_seq_nr);
+	WRITE32(0);		/* slotid, always 0 */
+	WRITE32(0);		/* highest slotid always 0 */
+	WRITE32(0);		/* cachethis always 0 */
+	WRITE32(0); /* FIXME: support referring_call_lists */
+	hdr->nops++;
+}
+
 static int
 nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)
 {
@@ -249,15 +288,19 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *re
 }
 
 static int
-nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_delegation *args)
+nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p,
+		struct nfs4_rpc_args *rpc_args)
 {
 	struct xdr_stream xdr;
+	struct nfs4_delegation *args = rpc_args->args_op;
 	struct nfs4_cb_compound_hdr hdr = {
 		.ident = args->dl_ident,
+		.minorversion = rpc_args->args_seq.cbs_minorversion,
 	};
 
 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
 	encode_cb_compound_hdr(&xdr, &hdr);
+	encode_cb_sequence(&xdr, &rpc_args->args_seq, &hdr);
 	encode_cb_recall(&xdr, args, &hdr);
 	encode_cb_nops(&hdr);
 	return 0;
@@ -299,6 +342,57 @@ decode_cb_op_hdr(struct xdr_stream *xdr,
 	return 0;
 }
 
+/*
+ * Our current back channel implmentation supports a single backchannel
+ * with a single slot.
+ */
+static int
+decode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *res,
+		   struct rpc_rqst *rqstp)
+{
+	struct nfs4_sessionid id;
+	int status;
+	u32 dummy;
+	__be32 *p;
+
+	if (res->cbs_minorversion == 0)
+		return 0;
+
+	status = decode_cb_op_hdr(xdr, OP_CB_SEQUENCE);
+	if (status)
+		return status;
+
+	/*
+	 * If the server returns different values for sessionID, slotID or
+	 * sequence number, the server is looney tunes.
+	 */
+	status = -ESERVERFAULT;
+
+	READ_BUF(NFS4_MAX_SESSIONID_LEN + 16);
+	memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN);
+	p += XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN);
+	if (memcmp(id.data, res->cbs_clp->cl_sessionid.data,
+		   NFS4_MAX_SESSIONID_LEN)) {
+		dprintk("%s Invalid session id\n", __func__);
+		goto out;
+	}
+	READ32(dummy);
+	if (dummy != res->cbs_clp->cl_cb_seq_nr) {
+		dprintk("%s Invalid sequence number\n", __func__);
+		goto out;
[...5030 lines suppressed...]
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+	int len;
+	struct xdr_buf *xbufp = &req->rq_snd_buf;
+	struct rpc_xprt *xprt = req->rq_xprt;
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+	struct socket *sock = transport->sock;
+	unsigned long headoff;
+	unsigned long tailoff;
+
+	/*
+	 * Set up the rpc header and record marker stuff
+	 */
+	xs_encode_tcp_record_marker(xbufp);
+
+	tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+	headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+	len = svc_send_common(sock, xbufp,
+			      virt_to_page(xbufp->head[0].iov_base), headoff,
+			      xbufp->tail[0].iov_base, tailoff);
+
+	if (len != xbufp->len) {
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+		len = -EAGAIN;
+	}
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	xprt = req->rq_xprt->bc_xprt;
+	svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+	/*
+	 * Grab the mutex to serialize data as the connection is shared
+	 * with the fore channel
+	 */
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	if (len > 0)
+		len = 0;
+
+	return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -2192,6 +2317,22 @@ static struct rpc_xprt_ops xs_tcp_ops = 
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2323,14 +2464,46 @@ static struct rpc_xprt *xs_setup_tcp(str
 	xprt->prot = IPPROTO_TCP;
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+	xprt->timeout = &xs_tcp_default_timeout;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_xprt) {
+		struct svc_sock *bc_sock;
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/* backchannel */
+		xprt_set_bound(xprt);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
+
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_xprt = args->bc_xprt;
+		bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+		bc_sock->sk_bc_xprt = xprt;
+		transport->sock = bc_sock->sk_sock;
+		transport->inet = bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		switch (addr->sa_family) {
+		case AF_INET:
+			xs_format_ipv4_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP);
+			break;
+		case AF_INET6:
+			xs_format_ipv6_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP6);
+			break;
+		default:
+			kfree(xprt);
+			return ERR_PTR(-EAFNOSUPPORT);
+		}
+
+		goto out;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2338,20 +2511,30 @@ static struct rpc_xprt *xs_setup_tcp(str
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		xs_format_ipv4_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
-		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+		xs_format_ipv6_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	default:
 		kfree(xprt);
 		return ERR_PTR(-EAFNOSUPPORT);
 	}
 
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+out:
 	dprintk("RPC:       set up transport to address %s\n",
 			xprt->address_strings[RPC_DISPLAY_ALL]);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1740
retrieving revision 1.1740.2.1
diff -u -p -r1.1740 -r1.1740.2.1
--- kernel.spec	26 Aug 2009 13:58:24 -0000	1.1740
+++ kernel.spec	26 Aug 2009 17:22:47 -0000	1.1740.2.1
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .nfs41
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -89,7 +89,8 @@ Summary: The Linux kernel
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+#%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  1
 # tools/perf
 %define with_perftool  %{?_without_perftool:  0} %{?!_without_perftool:  1}
 # perf noarch subpkg
@@ -715,6 +716,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: nfs41-v2.6.31-rc7.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1200,6 +1202,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch nfs41-v2.6.31-rc7.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -2015,6 +2018,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Steve Dickson <steved at redhat.com>
+- Update to latest nfs41 release: v2.6.31-rc7
+
 * Wed Aug 26 2009 Adam Jackson <ajax at redhat.com>
 - drm-intel-next.patch: Update, various output setup fixes.
 



From tuxbrewr at fedoraproject.org  Wed Aug 26 17:24:59 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 17:24:59 +0000 (UTC)
Subject: rpms/acpi/F-11 .cvsignore, 1.3, 1.4 acpi.spec, 1.7, 1.8 sources, 1.3,
	1.4
Message-ID: <20090826172459.CD1B311C004B@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/acpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1259

Modified Files:
	.cvsignore acpi.spec sources 
Log Message:

fixed state information for thermal zones
added output of all trip points
straightlined old crufty user interface
fixed battery output to cope with systems giving energy values but no voltage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/acpi/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Jun 2009 22:14:59 -0000	1.3
+++ .cvsignore	26 Aug 2009 17:24:59 -0000	1.4
@@ -1 +1 @@
-acpi-1.3.tar.gz
+acpi-1.4.tar.gz


Index: acpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/acpi/F-11/acpi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- acpi.spec	13 Jun 2009 22:14:59 -0000	1.7
+++ acpi.spec	26 Aug 2009 17:24:59 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Command-line ACPI client
 Summary(pl):    Klient ACPI dzia?aj?cy z linii polece?
 Name:           acpi
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
@@ -39,7 +39,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog README COPYING
 %{_bindir}/acpi
 %{_datadir}/man/man1/acpi.1.gz
+
 %changelog
+* Wed Aug 26 2009 Steven M. Parrish <smparrish at gmail.com> - 1.4-1
+- fixed state information for thermal zones
+- added output of all trip points
+- straightlined old crufty user interface
+- fixed battery output to cope with systems giving energy values but no voltage
+
 * Sat Jun 13 2009 Steven M. Parrish <smparrish at gmail.com> 1.3-1
 - New upstream release
 - Removed obsolete patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/acpi/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Jun 2009 22:14:59 -0000	1.3
+++ sources	26 Aug 2009 17:24:59 -0000	1.4
@@ -1 +1 @@
-5851e5515e9d3b08160f64be0f8c1827  acpi-1.3.tar.gz
+ea2a285957a36bad2ec099413bd330a5  acpi-1.4.tar.gz



From ausil at fedoraproject.org  Wed Aug 26 17:27:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 26 Aug 2009 17:27:15 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.13,1.14
Message-ID: <20090826172716.039B411C004B@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1093

Modified Files:
	dracut.spec 
Log Message:
make arch specific 
Require kdb where its available



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dracut.spec	24 Aug 2009 13:18:52 -0000	1.13
+++ dracut.spec	26 Aug 2009 17:27:15 -0000	1.14
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.9
-Release: 2%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -44,10 +44,12 @@ Requires: bridge-utils
 Requires: file
 Requires: bzip2
 Requires: dmraid
+%ifnarch s390 s390x
+Requires: kdb
+%endif
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
-BuildArch: noarch
 %endif
 
 %description
@@ -142,6 +144,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-3
+- make arch specific. There are arch specific dependancies.
+- add back kdb requirement on arches where its used.
+
 * Mon Aug 24 2009 Harald Hoyer <harald at redhat.com> 0.9-2
 - removed kdb requirement (because s390x does not have it)
 



From emaldonado at fedoraproject.org  Wed Aug 26 17:33:41 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 26 Aug 2009 17:33:41 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.95,1.96
Message-ID: <20090826173341.61E8711C004B@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3850

Modified Files:
	nss.spec 
Log Message:
Downgrade the release number for the BuildRequires on nss-softokn-devel


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- nss.spec	26 Aug 2009 16:36:26 -0000	1.95
+++ nss.spec	26 Aug 2009 17:33:41 -0000	1.96
@@ -15,7 +15,7 @@ Requires:         nss-softokn-freebl%{_i
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn-devel >= 3.12.3.99.3-14                                                   
+BuildRequires:    nss-softokn-devel >= 3.12.3.99.3-12                                                  
 BuildRequires:    nss-util-devel >= 3.12.3.99.3-10
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel



From orion at fedoraproject.org  Wed Aug 26 17:35:31 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 26 Aug 2009 17:35:31 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.85,1.86
Message-ID: <20090826173531.B807E11C004B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4099

Modified Files:
	plplot.spec 
Log Message:
* 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



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- plplot.spec	26 Aug 2009 16:36:38 -0000	1.85
+++ plplot.spec	26 Aug 2009 17:35:31 -0000	1.86
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -342,17 +342,16 @@ do
    cat tclIndex.hd tclIndex > ${file}
 done
 
-# temporarily disable check to fix broken deps
-#check
-#cd fedora
+%check
+cd fedora
 #Hack
 #export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude perl and compare tests for now, and ocaml from ppc/ppc64
-#ifarch ppc ppc64
-#ctest -V -E 'compare|ocaml'
-#else
-#ctest -V -E 'compare'
-#endif
+%ifarch ppc ppc64
+ctest -V -E 'compare|ocaml'
+%else
+ctest -V -E 'compare'
+%endif
 
 
 %clean
@@ -602,6 +601,10 @@ fi
 
 
 %changelog
+* 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



From emaldonado at fedoraproject.org  Wed Aug 26 17:38:29 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 26 Aug 2009 17:38:29 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.96,1.97
Message-ID: <20090826173829.6D35011C004B@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4606

Modified Files:
	nss.spec 
Log Message:
Fix BuildRequires nss-softokn-devel release number


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- nss.spec	26 Aug 2009 17:33:41 -0000	1.96
+++ nss.spec	26 Aug 2009 17:38:29 -0000	1.97
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          17%{?dist}
+Release:          18%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -437,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-18
+- Fix BuildRequires: nss-softokn-devel release number
+
 * Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com - 3.12.3.99.3-17
 - fix nss.pc.in to have one single requires line
 



From maxx at fedoraproject.org  Wed Aug 26 17:38:41 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 26 Aug 2009 17:38:41 +0000 (UTC)
Subject: rpms/gtk-rezlooks-engine/devel rezlooks-gilouche-gtkrc.patch, NONE, 
	1.1 gtk-rezlooks-engine.spec, 1.5, 1.6
Message-ID: <20090826173841.3F5AF11C004B@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/extras/rpms/gtk-rezlooks-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4702

Modified Files:
	gtk-rezlooks-engine.spec 
Added Files:
	rezlooks-gilouche-gtkrc.patch 
Log Message:
* Wed Aug 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.6-9
- Add small gtkrc patch to fix bug #515833 - gnome-appearance-properties produces an error after installing gtk-rezlooks-engine


rezlooks-gilouche-gtkrc.patch:
 gtkrc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE rezlooks-gilouche-gtkrc.patch ---
--- Rezlooks-Gilouche/gtk-2.0/gtkrc.orig	2009-08-26 19:22:02.678004125 +0200
+++ Rezlooks-Gilouche/gtk-2.0/gtkrc	2009-08-26 19:22:36.307993364 +0200
@@ -1,3 +1,7 @@
+style "panel"
+{
+}
+
 style "rezlooks-default"
 {
   GtkButton      ::default_border    = { 0, 0, 0, 0 }


Index: gtk-rezlooks-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-rezlooks-engine/devel/gtk-rezlooks-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gtk-rezlooks-engine.spec	25 Jul 2009 01:41:47 -0000	1.5
+++ gtk-rezlooks-engine.spec	26 Aug 2009 17:38:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name: gtk-rezlooks-engine
 Version: 0.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Rezlooks GTK2 engine
 
 
@@ -15,6 +15,9 @@ Source13: http://people.os-zen.net/rezza
 Source14: http://people.os-zen.net/rezza/themes/Rezlooks-dark.tar.gz
 # Rezlooks-Arials theme is not included since it requires the nuoveXT-1.6 icon theme
 #Source15: http://people.os-zen.net/rezza/themes/Rezlooks-Aerials.tar.gz
+
+Patch0: rezlooks-gilouche-gtkrc.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel
@@ -26,7 +29,6 @@ Rezlooks is a gtk2 theme engine based on
 %prep
 %setup -q -n rezlooks-%{version}
 
-
 %build
 %configure --enable-animation
 make %{?_smp_mflags}
@@ -38,6 +40,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/themes
 (cd $RPM_BUILD_ROOT/%{_datadir}/themes;
 zcat %{SOURCE10} | tar -xvf -;
+patch -p0 < %{PATCH0};
+
 zcat %{SOURCE11} | tar -xvf -;
 zcat %{SOURCE12} | tar -xvf -;
 zcat %{SOURCE13} | tar -xvf -;
@@ -64,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.6-9
+- Add small gtkrc patch to fix bug #515833 - gnome-appearance-properties produces an error after installing gtk-rezlooks-engine
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Aug 26 17:43:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 17:43:43 +0000 (UTC)
Subject: rpms/koffice/F-11 koffice.spec,1.107,1.108
Message-ID: <20090826174343.3F04911C004B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5507

Modified Files:
	koffice.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
- -kformula: Requires: lyx-cmex10-fonts



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-11/koffice.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- koffice.spec	5 Aug 2009 03:15:06 -0000	1.107
+++ koffice.spec	26 Aug 2009 17:43:42 -0000	1.108
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
 Name:           koffice
 Epoch:          2
 Version:        1.6.3
-Release:        23.%{svn}svn%{?dist}
+Release:        24.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -232,11 +232,11 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-%if 0%{?fedora} > 11
+#if 0%{?fedora} > 9 
 Requires:       lyx-cmex10-fonts
-%else
-Requires:       mathml-fonts
-%endif
+#else
+#Requires:       mathml-fonts
+#endif
 %if 0%{?fedora} > 10
 Requires:       dejavu-lgc-sans-fonts
 %else
@@ -761,6 +761,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
+- -kformula: Requires: lyx-cmex10-fonts
+
 * Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-23.20090306svn
 - -kformula: use dejavu-lgc-sans-fonts
 - optimize scriptlets



From mtasaka at fedoraproject.org  Wed Aug 26 17:44:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 17:44:17 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria-0.6.5-glib_convert-syntax.patch, 1.1,
	1.2 alexandria.spec, 1.28, 1.29
Message-ID: <20090826174417.49ECB11C004B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5653/F-10

Modified Files:
	alexandria-0.6.5-glib_convert-syntax.patch alexandria.spec 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
- Add trial sanity check again


alexandria-0.6.5-glib_convert-syntax.patch:
 utils.rb |   52 +++++++++-------------------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

Index: alexandria-0.6.5-glib_convert-syntax.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria-0.6.5-glib_convert-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-glib_convert-syntax.patch	19 Aug 2009 22:13:58 -0000	1.1
+++ alexandria-0.6.5-glib_convert-syntax.patch	26 Aug 2009 17:44:17 -0000	1.2
@@ -1,17 +1,65 @@
 Index: lib/alexandria/utils.rb
 ===================================================================
 --- lib/alexandria/utils.rb	(revision 1085)
-+++ lib/alexandria/utils.rb	(working copy)
-@@ -20,7 +20,11 @@
++++ lib/alexandria/utils.rb	(revision 1086)
+@@ -15,51 +15,17 @@
+ # write to the Free Software Foundation, Inc., 51 Franklin Street,
+ # Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#begin
+ require 'glib2'
  
  class String
-   def convert(charset_from, charset_to)
+-  def convert(charset_from, charset_to)
 -    GLib.convert(self, charset_from, charset_to)
-+#
-+# Ask upstream!! Perhaps from <-> to are reverse
-+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
-+#
-+    GLib.convert(self, charset_to, charset_from)
++  
++  # Converts this string into the desired charset.
++  #
++  # Note that this may raise a GLib::ConvertError if the
++  # desired_charset cannot accommodate all the characters present in
++  # the string, e.g. trying to convert Japanese Kanji to ISO-8859-1
++  # will obviously not work.
++  def convert(desired_charset, source_data_charset)
++    GLib.convert(self, desired_charset, source_data_charset)
    end
  end
- 
+-
+-=begin
+-rescue LoadError
+-
+-  # We assume that Ruby/Cocoa is loaded there
+-
+-  #require 'iconv'
+-
+-  class String
+-    def to_utf8_nsstring
+-      # This should be writen in ObjC in order to catch the ObjC exception if the
+-      # string could not be converted to UTF8.
+-      (OSX::NSString.stringWithUTF8String(self) or self)
+-    end
+-
+-    def convert(charset_from, charset_to)
+-      # Do nothing for the moment...
+-      self
+-    end
+-
+-        return OSX::NSString.stringWithUTF8String(self)
+-        x = Iconv.iconv(charset_to, charset_from, self).first
+-        p "#{self} -> #{x}"
+-        return x
+-        #p charset_from, charset_to
+-        #return self
+-
+-        from = OSX::NSString.alloc.initWithString(self)
+-        encoding = charset_to.nsencoding
+-        encoding = OSX::NSUnicodeStringEncoding
+-        data = from.dataUsingEncoding(encoding)
+-        s = OSX::NSString.alloc.initWithData_encoding(data, encoding).to_s
+-        s
+-        #self
+-    end
+-
+-  end
+-
+-end
+-=end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- alexandria.spec	20 Aug 2009 08:46:59 -0000	1.28
+++ alexandria.spec	26 Aug 2009 17:44:17 -0000	1.29
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -22,12 +22,12 @@ Source0:	http://rubyforge.org/frs/downlo
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Need ask to upstream
-# perhaps there is some confusion about GLib.convert...
-#Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Need ask to upstream
-# Sometimes search result has empty book or cover entry
-#Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+# Clarify the usage of GLib.convert 
+# ref: alexandria-Bugs-26968
+Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+# Add some sanity check for search results
+# Currently discussed on alexandria-Bugs-27000
+Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,8 +78,8 @@ Alexandria is a GNOME application to hel
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-#%%patch3 -p0 -b .glib
-#%%patch4 -p0 -b .result
+%patch3 -p0 -b .glib
+%patch4 -p0 -b .sanity
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,6 +206,13 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
+- Add trial sanity check again
+
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
+- Clarify GLib.convert usage in utils.rb (does not change the 
+  functionality of alexandria)
+
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
 - Kill the previous 2 patches (for now)
 



From mtasaka at fedoraproject.org  Wed Aug 26 17:44:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 17:44:17 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria-0.6.5-glib_convert-syntax.patch, 1.1,
	1.2 alexandria.spec, 1.35, 1.36
Message-ID: <20090826174417.7343511C004B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5653/F-11

Modified Files:
	alexandria-0.6.5-glib_convert-syntax.patch alexandria.spec 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
- Add trial sanity check again


alexandria-0.6.5-glib_convert-syntax.patch:
 utils.rb |   52 +++++++++-------------------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

Index: alexandria-0.6.5-glib_convert-syntax.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria-0.6.5-glib_convert-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-glib_convert-syntax.patch	19 Aug 2009 22:13:59 -0000	1.1
+++ alexandria-0.6.5-glib_convert-syntax.patch	26 Aug 2009 17:44:17 -0000	1.2
@@ -1,17 +1,65 @@
 Index: lib/alexandria/utils.rb
 ===================================================================
 --- lib/alexandria/utils.rb	(revision 1085)
-+++ lib/alexandria/utils.rb	(working copy)
-@@ -20,7 +20,11 @@
++++ lib/alexandria/utils.rb	(revision 1086)
+@@ -15,51 +15,17 @@
+ # write to the Free Software Foundation, Inc., 51 Franklin Street,
+ # Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-#begin
+ require 'glib2'
  
  class String
-   def convert(charset_from, charset_to)
+-  def convert(charset_from, charset_to)
 -    GLib.convert(self, charset_from, charset_to)
-+#
-+# Ask upstream!! Perhaps from <-> to are reverse
-+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
-+#
-+    GLib.convert(self, charset_to, charset_from)
++  
++  # Converts this string into the desired charset.
++  #
++  # Note that this may raise a GLib::ConvertError if the
++  # desired_charset cannot accommodate all the characters present in
++  # the string, e.g. trying to convert Japanese Kanji to ISO-8859-1
++  # will obviously not work.
++  def convert(desired_charset, source_data_charset)
++    GLib.convert(self, desired_charset, source_data_charset)
    end
  end
- 
+-
+-=begin
+-rescue LoadError
+-
+-  # We assume that Ruby/Cocoa is loaded there
+-
+-  #require 'iconv'
+-
+-  class String
+-    def to_utf8_nsstring
+-      # This should be writen in ObjC in order to catch the ObjC exception if the
+-      # string could not be converted to UTF8.
+-      (OSX::NSString.stringWithUTF8String(self) or self)
+-    end
+-
+-    def convert(charset_from, charset_to)
+-      # Do nothing for the moment...
+-      self
+-    end
+-
+-        return OSX::NSString.stringWithUTF8String(self)
+-        x = Iconv.iconv(charset_to, charset_from, self).first
+-        p "#{self} -> #{x}"
+-        return x
+-        #p charset_from, charset_to
+-        #return self
+-
+-        from = OSX::NSString.alloc.initWithString(self)
+-        encoding = charset_to.nsencoding
+-        encoding = OSX::NSUnicodeStringEncoding
+-        data = from.dataUsingEncoding(encoding)
+-        s = OSX::NSString.alloc.initWithData_encoding(data, encoding).to_s
+-        s
+-        #self
+-    end
+-
+-  end
+-
+-end
+-=end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- alexandria.spec	20 Aug 2009 08:47:00 -0000	1.35
+++ alexandria.spec	26 Aug 2009 17:44:17 -0000	1.36
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -22,12 +22,12 @@ Source0:	http://rubyforge.org/frs/downlo
 # Trial fix for hang up when importing list containing invalid isdn
 # ref: alexandria-Bugs-25348
 Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
-# Need ask to upstream
-# perhaps there is some confusion about GLib.convert...
-#Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
-# Need ask to upstream
-# Sometimes search result has empty book or cover entry
-#Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+# Clarify the usage of GLib.convert 
+# ref: alexandria-Bugs-26968
+Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+# Add some sanity check for search results
+# Currently discussed on alexandria-Bugs-27000
+Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -78,8 +78,8 @@ Alexandria is a GNOME application to hel
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
-#%%patch3 -p0 -b .glib
-#%%patch4 -p0 -b .result
+%patch3 -p0 -b .glib
+%patch4 -p0 -b .sanity
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,6 +206,13 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
+- Add trial sanity check again
+
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
+- Clarify GLib.convert usage in utils.rb (does not change the 
+  functionality of alexandria)
+
 * Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-2
 - Kill the previous 2 patches (for now)
 



From mtasaka at fedoraproject.org  Wed Aug 26 17:44:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 26 Aug 2009 17:44:17 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria.spec,1.37,1.38
Message-ID: <20090826174417.8CD9811C0077@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5653/devel

Modified Files:
	alexandria.spec 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
- Add trial sanity check again



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- alexandria.spec	20 Aug 2009 19:04:03 -0000	1.37
+++ alexandria.spec	26 Aug 2009 17:44:17 -0000	1.38
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -25,6 +25,9 @@ Patch2:		alexandria-0.6.4.1-hang-importi
 # Clarify the usage of GLib.convert 
 # ref: alexandria-Bugs-26968
 Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
+# Add some sanity check for search results
+# Currently discussed on alexandria-Bugs-27000
+Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -76,6 +79,7 @@ Alexandria is a GNOME application to hel
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch2 -p0 -b .up25348
 %patch3 -p0 -b .glib
+%patch4 -p0 -b .sanity
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -202,6 +206,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
+- Add trial sanity check again
+
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 
   functionality of alexandria)



From maxx at fedoraproject.org  Wed Aug 26 17:45:41 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Wed, 26 Aug 2009 17:45:41 +0000 (UTC)
Subject: rpms/gtk-rezlooks-engine/F-11 rezlooks-gilouche-gtkrc.patch, NONE, 
	1.1 gtk-rezlooks-engine.spec, 1.4, 1.5
Message-ID: <20090826174541.10CFA11C004B@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/extras/rpms/gtk-rezlooks-engine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6040

Modified Files:
	gtk-rezlooks-engine.spec 
Added Files:
	rezlooks-gilouche-gtkrc.patch 
Log Message:
* Wed Aug 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.6-8
- Add small gtkrc patch to fix bug #515833 - gnome-appearance-properties produces an error after installing gtk-rezlooks-engine


rezlooks-gilouche-gtkrc.patch:
 gtkrc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE rezlooks-gilouche-gtkrc.patch ---
--- Rezlooks-Gilouche/gtk-2.0/gtkrc.orig	2009-08-26 19:22:02.678004125 +0200
+++ Rezlooks-Gilouche/gtk-2.0/gtkrc	2009-08-26 19:22:36.307993364 +0200
@@ -1,3 +1,7 @@
+style "panel"
+{
+}
+
 style "rezlooks-default"
 {
   GtkButton      ::default_border    = { 0, 0, 0, 0 }


Index: gtk-rezlooks-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-rezlooks-engine/F-11/gtk-rezlooks-engine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gtk-rezlooks-engine.spec	25 Feb 2009 01:50:57 -0000	1.4
+++ gtk-rezlooks-engine.spec	26 Aug 2009 17:45:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name: gtk-rezlooks-engine
 Version: 0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Rezlooks GTK2 engine
 
 
@@ -17,6 +17,8 @@ Source14: http://people.os-zen.net/rezza
 #Source15: http://people.os-zen.net/rezza/themes/Rezlooks-Aerials.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: rezlooks-gilouche-gtkrc.patch
+
 BuildRequires: gtk2-devel
 
 %description
@@ -38,6 +40,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/themes
 (cd $RPM_BUILD_ROOT/%{_datadir}/themes;
 zcat %{SOURCE10} | tar -xvf -;
+patch -p0 < %{PATCH0};
+
 zcat %{SOURCE11} | tar -xvf -;
 zcat %{SOURCE12} | tar -xvf -;
 zcat %{SOURCE13} | tar -xvf -;
@@ -64,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.6-8
+- Add small gtkrc patch to fix bug #515833 - gnome-appearance-properties produces an error after installing gtk-rezlooks-engine
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Wed Aug 26 17:46:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 17:46:52 +0000 (UTC)
Subject: rpms/lyx/EL-5 lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.18, 
	1.19 lyx.spec, 1.54, 1.55 sources, 1.17,
	1.18 lyx-1.6.3-xdg_open.patch, 1.1, NONE
Message-ID: <20090826174652.0058711C004B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6303

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.4-xdg_open.patch 
Removed Files:
	lyx-1.6.3-xdg_open.patch 
Log Message:
* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
- lyx-1.6.4
- handle fonts manually (now EPEL-5 compatible)


lyx-1.6.4-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.4-xdg_open.patch ---
diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py
--- lyx-1.6.4/lib/configure.py.xdg_open	2009-08-13 07:16:07.000000000 -0500
+++ lyx-1.6.4/lib/configure.py	2009-08-22 08:56:01.332263836 -0500
@@ -264,7 +264,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'okular', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 		    'gv', 'ghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	23 Jun 2009 03:20:43 -0000	1.18
+++ .cvsignore	26 Aug 2009 17:46:51 -0000	1.19
@@ -1 +1 @@
-lyx-1.6.3.tar.bz2
+lyx-1.6.4.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- lyx.spec	23 Jun 2009 03:30:38 -0000	1.54
+++ lyx.spec	26 Aug 2009 17:46:51 -0000	1.55
@@ -2,11 +2,28 @@
 %if 0%{?fedora} > 3
 %define _with_aiksaurus --with-aiksaurus
 %endif
+
+%if 0%{?fedora} > 9
+%define build_noarch BuildArch: noarch
+%endif
+
+## lyx-fonts
+%global fontname lyx
+%global common_desc \
+A collection of Math symbol fonts.
+#if 0%{?fedora} > 8 
+%if 0
+%define fontpackages 1
+BuildRequires: fontpackages-devel
+%else
+%define _fontdir %{_datadir}/fonts/%{fontname}
+%endif
+
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.3
+Version: 1.6.4
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -16,7 +33,7 @@ Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.6.3-xdg_open.patch
+Patch1: lyx-1.6.4-xdg_open.patch
 
 Source1: lyxrc.dist
 
@@ -42,6 +59,18 @@ Obsoletes: %{name}-qt < 1.5.0 
 Provides:  %{name}-qt = %{version}-%{release}
 Obsoletes: %{name}-xforms < 1.5.0 
 
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
 Requires(post): texlive
@@ -55,7 +84,6 @@ Requires(post): tetex-fonts
 Requires(postun): tetex-fonts
 Requires: tetex-dvips tetex-latex
 %endif
-Requires: mathml-fonts
 Requires: ghostscript
 ## Soft dependencies
 %if 0%{?fedora} > 3 && 0%{?fedora} < 9
@@ -63,9 +91,9 @@ Requires: ghostscript
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
 Requires(hint): tetex-IEEEtran
+%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
-%endif
 Requires(hint): xdg-utils
 
 %description
@@ -85,7 +113,116 @@ to the backends (like LaTeX) that are sp
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
-
+%package common
+Summary:  Common files of %{name} 
+Requires: %{name} = %{version}-%{release}
+%{?build_noarch}
+%description common 
+{summary}.
+
+%package -n %{fontname}-fonts-compat
+Summary: Lyx/MathML fonts compatibility package
+License: Copyright only and GPL+
+Obsoletes: mathml-fonts < 1.0-50
+Provides:  mathml-fonts = 1.0-50
+Provides: %{fontname}-fonts = %{version}-%{release}
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-fonts-compat
+This package only exists to help transition mathml-fonts users to the new
+package split. It will be removed after one distribution release cycle, please
+do not reference it or depend on it in any way.
+
+%package -n %{fontname}-fonts-common
+Summary: Common files of %{fontname}-fonts
+# The actual license says "The author of these fonts, Basil K. Malyshev, has
+# kindly granted permission to use and modify these fonts."
+# One of the font files (wasy10) is separately licensed GPL+.
+License: Copyright only and GPL+
+%{?fontpackages:Requires: fontpackages-filesystem}
+%{?build_noarch}
+%description -n %{name}-fonts-common
+This package consists of files used by other %{fontname}-fonts packages.
+
+%package -n %{fontname}-cmex10-fonts
+Summary: Cmex10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmex10-fonts
+%common_desc
+
+%package -n %{fontname}-cmmi10-fonts
+Summary: Cmmi10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmmi10-fonts
+%common_desc
+
+%package -n %{fontname}-cmr10-fonts
+Summary: Cmr10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmr10-fonts
+%common_desc
+
+%package -n %{fontname}-cmsy10-fonts
+Summary: Cmsy10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-cmsy10-fonts
+%common_desc
+
+%package -n %{fontname}-esint10-fonts
+Summary: Esint10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-esint10-fonts
+%common_desc
+
+%package -n %{fontname}-eufm10-fonts
+Summary: Eufm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-eufm10-fonts
+%common_desc
+
+%package -n %{fontname}-msam10-fonts
+Summary: Msam10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-msam10-fonts
+%common_desc
+
+%package -n %{fontname}-msbm10-fonts
+Summary: Msbm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-msbm10-fonts
+%common_desc
+
+%package -n %{fontname}-wasy10-fonts
+Summary: Wasy10 fonts
+License: GPL+
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%{?build_noarch}
+%description -n %{fontname}-wasy10-fonts
+%common_desc
 
 %prep
 
@@ -137,7 +274,9 @@ touch %{buildroot}%{_datadir}/lyx/lyxrc.
 touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
 touch %{buildroot}%{_datadir}/lyx/doc/LaTeXConfig.lyx
 
-# unpackaged files
+# fonts
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
 rm -rf %{buildroot}%{_datadir}/lyx/fonts
 
 %find_lang %{name}
@@ -147,10 +286,10 @@ rm -rf %{buildroot}%{_datadir}/lyx/fonts
 make check
 
 
-%post
+%post common
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
-%postun
+%postun common
 if [ $1 -eq 0 ] ; then
   texhash >& /dev/null 
   update-desktop-database -q &> /dev/null
@@ -158,7 +297,7 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%posttrans
+%posttrans common
 texhash >& /dev/null
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -166,12 +305,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing,
 ##   and besides, we use xdg-open now -- Rex
-%triggerin -- latex2html,wv
+%triggerin common -- latex2html,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
 
-%triggerun -- latex2html,wv
+%triggerun common -- latex2html,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -181,10 +320,13 @@ fi
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc ANNOUNCE lib/CREDITS NEWS README
+%doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
 %{_mandir}/man1/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -195,8 +337,106 @@ rm -rf %{buildroot}
 %ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
 %{_datadir}/texmf/tex/latex/lyx/
 
+%files -n %{fontname}-fonts-compat
+# boo!
+
+%files -n %{fontname}-fonts-common
+%defattr(0644,root,root,0755)
+%doc lib/fonts/BaKoMaFontLicense.txt
+%doc lib/fonts/ReadmeBaKoMa4LyX.txt
+%dir %{_fontdir}
+
+%if 0%{?fontpackages:1}
+%_font_pkg -n cmex10 cmex10.ttf
+%_font_pkg -n cmmi10 cmmi10.ttf
+%_font_pkg -n cmr10 cmr10.ttf
+%_font_pkg -n cmsy10 cmsy10.ttf
+%_font_pkg -n esint10 esint10.ttf
+%_font_pkg -n eufm10 eufm10.ttf
+%_font_pkg -n msam10 msam10.ttf
+%_font_pkg -n msbm10 msbm10.ttf
+%_font_pkg -n wasy10 wasy10.ttf
+%else
+
+%files -n %{fontname}-cmex10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmex10.ttf
+
+%posttrans -n %{fontname}-cmex10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmmi10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmmi10.ttf
+
+%posttrans -n %{fontname}-cmmi10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmr10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmr10.ttf
+
+%posttrans -n %{fontname}-cmr10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-cmsy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/cmsy10.ttf
+
+%posttrans -n %{fontname}-cmsy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-esint10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/esint10.ttf
+
+%posttrans -n %{fontname}-esint10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-eufm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/eufm10.ttf
+
+%posttrans -n %{fontname}-eufm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msam10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msam10.ttf
+
+%posttrans -n %{fontname}-msam10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-msbm10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/msbm10.ttf
+
+%posttrans -n %{fontname}-msbm10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%files -n %{fontname}-wasy10-fonts
+%defattr(-,root,root,-)
+%{_fontdir}/wasy10.ttf
+
+%posttrans -n %{fontname}-wasy10-fonts
+fc-cache %{_fontdir} 2> /dev/null ||:
+
+%endif
+
 
 %changelog
+* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
+- lyx-1.6.4
+- handle fonts manually (now EPEL-5 compatible)
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
+- add lyx-*-fonts subpkgs (#452357, #514549)
+- -common (noarch) subpkg
+- trim %%changelog
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-1
 - lyx-1.6.3
 
@@ -395,151 +635,3 @@ rm -rf %{buildroot}
 * Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-2
 - 1.4.0(final)
 - drop boost bits
-
-* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
-- 1.4.0rc
-- drop boost patch (for now)
-
-* Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
-- 1.4.0pre6
-- --disable-stdlib-debug --disable-assertions --disable-concept-checks
-- don't use --without-included-boost (for now)
-
-* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
-- gcc41 patch
-- document boost/gcc41 patches
-- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
-
-* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
-- updated boost patch
-- drop -fexceptions from %%optflags
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
-- --without-included-boost
-- BR: boost-devel
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
-- 1.4.0pre5
-
-* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
-- 1.4.0pre4
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
-- 1.4.0pre3
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
-- cleanup/fix snarfing of intermediate frontend builds.
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
-- BR: libXpm-devel
-
-* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
-- 1.3.7
-- -qt/-xforms: frontend pkgs (#178116)
-
-* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
-- %%post/%%postun: update-desktop-database
-
-* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
-- leave out kde-redhat bits in Fedora Extras build
-- define/use safer (esp for x86_64) QTDIR bits
-
-* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-3
-- touchup helpers script
-- fix for (sometimes missing) PSres.upr
-
-* Mon Aug 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-2
-- use triggers to configure/unconfigure helper (ps/pdf/html) apps
-
-* Sat Jul 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-1
-- 1.3.6
-
-* Mon May 23 2005 Rex Dieter <rexdieter[At]users.sf.net> 1.3.5-4
-- qt_immodule patch (lyx bug #1830)
-- update -helpers patch to look-for/use evince (rh bug #143992)
-- drop (not-strictly-required) Req's on helper apps
-  htmlview, gsview (rh bug #143992)
-- %%configure: --with-aiksaurus
-- %%configure: --enable-optimization="$$RPM_OPT_FLAGS"
-- %%configure: --disable-dependency-tracking
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.3
-- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
-  available at runtime)
-
-* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
-- BR: pspell-devel -> aspell-devel
-- BR: tetex-* (helper detection, fonts)
-- -helpers patch: find/use htmlview, gsview, kdvi, ggv, kghostview
-- .desktop: GenericName: WYSIWYM document processor
-
-* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.5-0.fdr.1
-- 1.3.5
-
-* Fri Apr 30 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.6
-- BR: libtool
-
-* Fri Apr 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.5
-- Group: Applications/Publishing
-- BR: desktop-file-utils
-- Requires(post,postun): tetex
-
-* Sat Apr 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.4
-- .desktop: separate file
-- .desktop: drop 'Utility' category, add 'Qt'
-- .desktop: Name: lyx -> LyX
-- .desktop: Comment: lyx 1.3.4 -> WYSIWYM document processor
-- convert icon xpm -> png
-
-* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.3
-- dynamically determine version for qt dependency.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.2
-- add a few (mostly superfluous) BuildRequires to make fedora.us's
-  buildsystem happy.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.1
-- Allow building/use for any qt >= 3.1
-
-* Thu Feb 19 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.0
-- 1.3.4
-- Categories=Office
-
-* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
-- support MimeType(s): application/x-lyx;text/x-lyx
-
-* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
-- let rpm auto-require qt.
-- remove (optional) xforms support.
-- Requires: latex-xft-fonts
-
-* Mon Oct 06 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.1
-- 1.3.3
-- update macros for Fedora Core.
-
-* Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.3.2-0.fdr.0
-- 1.3.2
-- fedora-ize.
-
-* Tue Mar 25 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.1-1.0
-- 1.3.1 release.
-
-* Fri Feb 21 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-1.0
-- yank kmenu
-
-* Fri Feb 07 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-0.0
-- 1.3.0
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	23 Jun 2009 03:20:44 -0000	1.17
+++ sources	26 Aug 2009 17:46:51 -0000	1.18
@@ -1 +1 @@
-c524e72f7e4d64224c6bfdbd84065dd8  lyx-1.6.3.tar.bz2
+3dd759f91acd7765c304336c51aa3a2a  lyx-1.6.4.tar.bz2


--- lyx-1.6.3-xdg_open.patch DELETED ---



From orion at fedoraproject.org  Wed Aug 26 17:53:53 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 26 Aug 2009 17:53:53 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.4-octave32.patch, 1.3, 1.4 plplot.spec,
	1.86, 1.87
Message-ID: <20090826175353.F402411C004B@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7568

Modified Files:
	plplot-5.9.4-octave32.patch plplot.spec 
Log Message:
Really get the octave patch addition in
Don't forget the ITCL hack


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(-)

Index: plplot-5.9.4-octave32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot-5.9.4-octave32.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- plplot-5.9.4-octave32.patch	14 Aug 2009 04:51:52 -0000	1.3
+++ plplot-5.9.4-octave32.patch	26 Aug 2009 17:53:53 -0000	1.4
@@ -31,3 +31,20 @@
    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);


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- plplot.spec	26 Aug 2009 17:35:31 -0000	1.86
+++ plplot.spec	26 Aug 2009 17:53:53 -0000	1.87
@@ -345,7 +345,7 @@ done
 %check
 cd fedora
 #Hack
-#export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
+export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude perl and compare tests for now, and ocaml from ppc/ppc64
 %ifarch ppc ppc64
 ctest -V -E 'compare|ocaml'



From cdamian at fedoraproject.org  Wed Aug 26 17:57:34 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Wed, 26 Aug 2009 17:57:34 +0000 (UTC)
Subject: rpms/podcatcher/devel .cvsignore, 1.2, 1.3 podcatcher.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090826175734.6AC6711C004B@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/podcatcher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8229

Modified Files:
	.cvsignore podcatcher.spec sources 
Log Message:
upgrade to 3.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Jan 2009 17:42:16 -0000	1.2
+++ .cvsignore	26 Aug 2009 17:57:34 -0000	1.3
@@ -1 +1 @@
-podcatcher-3.1.4.tar.gz
+podcatcher-3.1.5.tar.gz


Index: podcatcher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/devel/podcatcher.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- podcatcher.spec	26 Jul 2009 19:02:00 -0000	1.3
+++ podcatcher.spec	26 Aug 2009 17:57:34 -0000	1.4
@@ -1,8 +1,8 @@
 %define repoid  43722
 
 Name:           podcatcher
-Version:        3.1.4
-Release:        5%{?dist}
+Version:        3.1.5
+Release:        1%{?dist}
 Summary:        Armangil's podcatcher 
 
 Group:          Applications/Internet
@@ -28,6 +28,8 @@ applications.
 
 %build
 
+chmod a-x demo/*
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -p -D bin/podcatcher $RPM_BUILD_ROOT/%{_bindir}/podcatcher
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/podcatcher
 
 %changelog
+* Wed Aug 26 2009 Christof Damian <christof at damian.net> - 3.1.5-1
+- upgrade to 3.1.5 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Jan 2009 17:42:16 -0000	1.2
+++ sources	26 Aug 2009 17:57:34 -0000	1.3
@@ -1 +1 @@
-38e5382613c4a454b8138bcc2b881e68  podcatcher-3.1.4.tar.gz
+700699e1b7c760cce159ae138f6dd465  podcatcher-3.1.5.tar.gz



From tuxbrewr at fedoraproject.org  Wed Aug 26 18:04:03 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 18:04:03 +0000 (UTC)
Subject: rpms/acpitool/devel .cvsignore, 1.8, 1.9 acpitool.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20090826180403.67D1911C02C2@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/acpitool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10079

Modified Files:
	.cvsignore acpitool.spec sources 
Log Message:
various minor fixes (fixing memleaks, removing of limit on thermal zones)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/acpitool/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Sep 2008 15:01:23 -0000	1.8
+++ .cvsignore	26 Aug 2009 18:04:03 -0000	1.9
@@ -1 +1 @@
-acpitool-0.5.tar.bz2
+acpitool-0.5.1.tar.bz2


Index: acpitool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/acpitool/devel/acpitool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- acpitool.spec	24 Jul 2009 16:34:35 -0000	1.17
+++ acpitool.spec	26 Aug 2009 18:04:03 -0000	1.18
@@ -1,13 +1,13 @@
 Summary: Command line ACPI client
 Name: acpitool
-Version: 0.5
-Release: 3%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml
 
 Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2
-Patch0: acpitool-0.5-gcc43.patch
+#Patch0: acpitool-0.5-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -21,7 +21,7 @@ toggle fan on/off, and more. 
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+#patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/man1/acpitool*
 
 %changelog
+* Wed Aug 26 2009 Steven M. Parrish <smparrish at gmail.com> 0.5.1-1
+- various minor fixes (fixing memleaks, removing of limit on thermal zones)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/acpitool/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Sep 2008 15:01:23 -0000	1.8
+++ sources	26 Aug 2009 18:04:03 -0000	1.9
@@ -1 +1 @@
-c4acc19eb002d6871d12abb490593202  acpitool-0.5.tar.bz2
+9e4ec55201be0be71ffbc56d38b42b57  acpitool-0.5.1.tar.bz2



From dwalsh at fedoraproject.org  Wed Aug 26 18:05:34 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 18:05:34 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.89,
	1.90 policycoreutils-rhat.patch, 1.434,
	1.435 policycoreutils.spec, 1.629, 1.630
Message-ID: <20090826180534.A52BE11C02C2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10384

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
- Add sandboxX


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                   | 1183 +++++++++++++++
 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     |  374 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  128 +
 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, 13956 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- policycoreutils-gui.patch	26 Jun 2009 18:48:24 -0000	1.89
+++ policycoreutils-gui.patch	26 Aug 2009 18:05:32 -0000	1.90
@@ -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.71/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.71/gui/booleansPage.py	2009-08-20 12:53:16.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.71/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.71/gui/domainsPage.py	2009-08-20 12:53:16.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.71/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.71/gui/fcontextPage.py	2009-08-20 12:53:16.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.71/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.71/gui/html_util.py	2009-08-20 12:53:16.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.71/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.71/gui/lockdown.glade	2009-08-20 12:53:16.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.71/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.71/gui/lockdown.gladep	2009-08-20 12:53:16.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.71/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.71/gui/lockdown.py	2009-08-20 12:53:16.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.71/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.71/gui/loginsPage.py	2009-08-20 12:53:16.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.71/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.71/gui/Makefile	2009-08-20 12:53:16.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.71/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.71/gui/mappingsPage.py	2009-08-20 12:53:16.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.71/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.71/gui/modulesPage.py	2009-08-20 12:53:16.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.71/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.71/gui/polgen.glade	2009-08-20 12:53:16.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.71/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.71/gui/polgen.gladep	2009-08-20 12:53:16.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.71/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.71/gui/polgengui.py	2009-08-20 12:53:16.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.71/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.71/gui/polgen.py	2009-08-26 10:47:54.000000000 -0400
+@@ -0,0 +1,1183 @@
 +#!/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()
 +
@@ -7548,9 +7549,10 @@ 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", 
++                                 "help"])
 +    for o, a in gopts:
 +        if o == "-t" or o == "--type":
 +            try:
@@ -7564,6 +7566,8 @@ 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 len(cmds) == 0:
 +           usage(_("Executable required"))
@@ -7596,9 +7600,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.71/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.71/gui/portsPage.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7859,9 +7863,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.71/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.71/gui/selinux.tbl	2009-08-20 12:53:16.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 +8101,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.71/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.71/gui/semanagePage.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8269,9 +8273,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.71/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.71/gui/statusPage.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8463,9 +8467,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.71/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.71/gui/system-config-selinux.glade	2009-08-20 12:53:16.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 +11874,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.71/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.71/gui/system-config-selinux.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,189 @@
 +#!/usr/bin/python
 +#
@@ -12063,9 +12067,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.71/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.71/gui/templates/boolean.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12107,9 +12111,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.71/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.71/gui/templates/etc_rw.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12240,10 +12244,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.71/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.71/gui/templates/executable.py	2009-08-26 10:48:18.000000000 -0400
+@@ -0,0 +1,374 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12356,7 +12360,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 +12384,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +libs_use_shared_libs(TEMPLATETYPE_t)
 +
 +miscfiles_read_localization(TEMPLATETYPE_t)
-+
 +"""
 +
 +te_cgi_rules="""
@@ -12620,9 +12622,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.71/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.71/gui/templates/__init__.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12642,9 +12644,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.71/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.71/gui/templates/network.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12726,9 +12728,9 @@ 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.71/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
++++ policycoreutils-2.0.71/gui/templates/rw.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12858,9 +12860,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.71/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.71/gui/templates/script.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12961,9 +12963,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.71/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.71/gui/templates/semodule.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13006,9 +13008,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.71/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.71/gui/templates/tmp.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13107,9 +13109,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.71/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.71/gui/templates/user.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13293,9 +13295,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.64/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.71/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.71/gui/templates/var_lib.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13455,9 +13457,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.71/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.71/gui/templates/var_log.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13569,9 +13571,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.71/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.71/gui/templates/var_run.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13691,9 +13693,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.71/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.71/gui/templates/var_spool.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13824,9 +13826,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.71/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.71/gui/translationsPage.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13946,9 +13948,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.71/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.71/gui/usersPage.py	2009-08-20 12:53:16.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 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_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++
 restorecond/watch.c                         |  254 ++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  193 +++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   13 
 sandbox/seunshare                           |binary
 sandbox/seunshare.c                         |  188 +++++++
 sandbox/seunshare.o                         |binary
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   34 +
 semanage/seobject.py                        |   66 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 +++++++++++++++++++++
 setfiles/restore.h                          |   49 +
 setfiles/setfiles.c                         |  687 +++-------------------------
 26 files changed, 1832 insertions(+), 970 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -p -r1.434 -r1.435
--- policycoreutils-rhat.patch	22 Aug 2009 12:08:34 -0000	1.434
+++ policycoreutils-rhat.patch	26 Aug 2009 18:05:33 -0000	1.435
@@ -40,10 +40,10 @@ 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/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-26 10:04:47.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
-+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
++SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
@@ -1152,41 +1152,47 @@ 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/scripts/chcat policycoreutils-2.0.71/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-20 12:53:16.000000000 -0400
-@@ -435,6 +435,8 @@
-                     continue
-     except ValueError, e:
-         error(e)
-+    except OSError, e:
-+        error(e)
-     
-     sys.exit(errors)
-     
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.71/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-20 12:53:16.000000000 -0400
-@@ -5,11 +5,12 @@
- MANDIR ?= $(PREFIX)/share/man
- LOCALEDIR ?= /usr/share/locale
- 
--all: fixfiles genhomedircon
-+all: fixfiles genhomedircon sandbox chcat
- 
- install: all
- 	-mkdir -p $(BINDIR)
- 	install -m 755 chcat $(BINDIR)
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.71/sandbox/Makefile
+--- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/sandbox/Makefile	2009-08-26 10:50:50.000000000 -0400
+@@ -0,0 +1,31 @@
++# Installation directories.
++PREFIX ?= ${DESTDIR}/usr
++BINDIR ?= $(PREFIX)/bin
++SBINDIR ?= $(PREFIX)/sbin
++MANDIR ?= $(PREFIX)/share/man
++LOCALEDIR ?= /usr/share/locale
++SHAREDIR ?= $(PREFIX)/share/sandbox
++override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DPACKAGE="\"policycoreutils\""
++LDLIBS += -lselinux -lcap-ng 
++
++all: sandbox seunshare sandboxX.sh 
++
++seunshare: seunshare.o $(EXTRA_OBJS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
++
++install: all
++	-mkdir -p $(BINDIR)
 +	install -m 755 sandbox $(BINDIR)
- 	install -m 755 fixfiles $(DESTDIR)/sbin
- 	install -m 755 genhomedircon  $(SBINDIR)
- 	-mkdir -p $(MANDIR)/man8
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.71/scripts/sandbox
---- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox	2009-08-20 12:53:16.000000000 -0400
-@@ -0,0 +1,139 @@
++	-mkdir -p $(MANDIR)/man8
++	install -m 644 sandbox.8 $(MANDIR)/man8/
++	install -m 4755 seunshare $(SBINDIR)/
++	-mkdir -p $(SHAREDIR)
++	install -m 755 sandboxX.sh $(SHAREDIR)
++
++clean:
++	-rm -f seunshare *.o *~
++
++indent:
++	../../scripts/Lindent $(wildcard *.[ch])
++
++relabel:
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.71/sandbox/sandbox
+--- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/sandbox/sandbox	2009-08-26 10:03:24.000000000 -0400
+@@ -0,0 +1,193 @@
 +#!/usr/bin/python -E
-+import os, sys, getopt, socket, random, fcntl
++import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
 +
 +PROGNAME = "policycoreutils"
@@ -1205,6 +1211,9 @@ diff --exclude-from=exclude --exclude=se
 +       __builtin__.__dict__['_'] = unicode
 +
 +
++DEFAULT_TYPE = "sandbox_t"
++DEFAULT_X_TYPE = "sandbox_x_t"
++
 +random.seed(None)
 +
 +def error_exit(msg):
@@ -1213,24 +1222,6 @@ diff --exclude-from=exclude --exclude=se
 +    sys.stderr.flush()
 +    sys.exit(1)
 +
-+def mount(context):
-+    if os.getuid() != 0:
-+        usage(_("Mount options require root privileges"))
-+    destdir = "/mnt/%s" % context
-+    os.mkdir(destdir)
-+    rc = os.system('/bin/mount -t tmpfs tmpfs %s' % (destdir))
-+    selinux.setfilecon(destdir, context)
-+    if rc != 0:
-+        sys.exit(rc)
-+    os.chdir(destdir)
-+
-+def umount(dest):
-+    os.chdir("/")
-+    destdir = "/mnt/%s" % dest
-+    os.system('/bin/umount %s' % (destdir))
-+    os.rmdir(destdir)
-+
-+
 +def reserve(mcs):
 +    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 +    sock.bind("\0%s" % mcs)
@@ -1263,30 +1254,75 @@ diff --exclude-from=exclude --exclude=se
 +                               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)
++
++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)
 +
 +if __name__ == '__main__':
 +    if selinux.is_selinux_enabled() != 1:
 +        error_exit("Requires an SELinux enabled system")
 +        
++    init_files = []
++
 +    def usage(message = ""):
 +        text = _("""
-+sandbox [ -m ] [ -t type ] command
++sandbox [-h] [-I includefile ] [[-i file ] ...] [ -t type ] command
 +""")
 +        error_exit("%s\n%s" % (message, text))
 +
-+    setype = "sandbox_t"
-+    mount_ind = False
++    setype = DEFAULT_TYPE
++    X_ind = False
 +    try:
-+           gopts, cmds = getopt.getopt(sys.argv[1:], "ht:m", 
++           gopts, cmds = getopt.getopt(sys.argv[1:], "i:ht:XI:", 
 +                                       ["help",
-+                                        "type=", 
-+                                        "mount"])
++                                        "include=", 
++                                        "includefile=", 
++                                        "type="
++                                        ])
 +           for o, a in gopts:
 +                  if o == "-t" or o == "--type":
 +                         setype = a
 +                         
-+                  if o == "-m" or o == "--mount":
-+                         mount_ind = True
++                  if o == "-i" or o == "--include":
++                         rp = os.path.realpath(a)
++                         if rp not in init_files:
++                                init_files.append(rp)
++                         
++                  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"));
@@ -1296,8 +1332,6 @@ diff --exclude-from=exclude --exclude=se
 +
 +           execcon, filecon = gen_context(setype)
 +           rc = -1
-+           if mount_ind:
-+                  mount(filecon)
 +
 +           if cmds[0][0] != "/" and cmds[0][:2] != "./" and cmds[0][:3] != "../":
 +                  for i in  os.environ["PATH"].split(':'):
@@ -1306,121 +1340,315 @@ diff --exclude-from=exclude --exclude=se
 +                                cmds[0] = f
 +                                break
 +
-+           selinux.setexeccon(execcon)
-+           rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
-+           selinux.setexeccon(None)
-+           
-+           if mount_ind:
-+                  umount(filecon)
++           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)
++                  else:
++                         selinux.setexeccon(execcon)
++                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         selinux.setexeccon(None)
++           finally:
++                  if X_ind:
++                         shutil.rmtree(newhomedir)
++                         shutil.rmtree(newtmpdir)
++                  
 +    except getopt.GetoptError, error:
-+        usage(_("Options Error %s ") % error.msg)
++           usage(_("Options Error %s ") % error.msg)
++    except OSError, error:
++           error_exit(error.args[1])
 +    except ValueError, error:
-+        error_exit(error.args[0])
++           error_exit(error.args[0])
 +    except KeyError, error:
-+        error_exit(_("Invalid value %s") % error.args[0])
++           error_exit(_("Invalid value %s") % error.args[0])
 +    except IOError, error:
-+        error_exit(error.args[1])
-+    except OSError, error:
-+        error_exit(error.args[1])
++           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/scripts/sandbox.8 policycoreutils-2.0.71/scripts/sandbox.8
---- nsapolicycoreutils/scripts/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.8	2009-08-20 12:53:16.000000000 -0400
-@@ -0,0 +1,22 @@
++
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.71/sandbox/sandbox.8
+--- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/sandbox/sandbox.8	2009-08-26 10:03:24.000000000 -0400
+@@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
 +sandbox \- Run cmd under an SELinux sandbox
 +.SH SYNOPSIS
 +.B sandbox
-+[ -M ] [ -t type ] cmd
++[-X] [[-i file ]...] [ -t type ] cmd
 +.br
 +.SH DESCRIPTION
 +.PP
-+Run application within a tightly confined SELinux domain,   This application can only read and write stdin and stdout along with files handled to it by the shell.  
++Run application within a tightly confined SELinux domain,   The default sandbox allows the application to only read and write stdin and stdout along with files handled to it by the shell.  
++Additionaly a -X qualifier allows you to run sandboxed X applications.  These apps will start up their own X Server and create a temporary homedir and /tmp.  The default policy does not allow any capabilities or network access.  Also prevents all access to the users other processes and files.  Any file specified on the command line will be copied into the sandbox.
 +.PP
 +.TP
-+\fB\-m\fR
-+Mount a temporary file system and change working directory to it, files will be removed when job completes.
-+.TP
 +\fB\-t type\fR
-+Use alternate sandbox type, defaults to sandbox_t
++Use alternate sandbox type, defaults to sandbox_t or sandbox_x_t for -X.
++.TP
++\fB\-i file\fR
++Copy this file into the temporary sandbox homedir. Command can be repeated.
++.TP
++\fB\-X\fR
++Create an X based Sandbox for gui apps, temporary files for $HOME and /tmp, seconday Xserver, defaults to sandbox_x_t
 +.TP
 +.SH "SEE ALSO"
 +.TP
 +runcon(1)
 +.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.71/scripts/sandbox.py
---- nsapolicycoreutils/scripts/sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/scripts/sandbox.py	2009-08-20 12:53:16.000000000 -0400
-@@ -0,0 +1,67 @@
-+#!/usr/bin/python
-+import os, sys, getopt, socket, random, fcntl
-+import selinux
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.71/sandbox/sandboxX.sh
+--- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/sandbox/sandboxX.sh	2009-08-26 10:03:24.000000000 -0400
+@@ -0,0 +1,13 @@
++#!/bin/bash 
++(Xephyr -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
++export DISPLAY=:$D
++matchbox-window-manager -use_titlebar no &
++WM_PID=$!
++~/.sandboxrc &
++CLIENT_PID=$!
++wait $CLIENT_PID
++export EXITCODE=$?
++kill -TERM $WM_PID
++exit $EXITCODE
++break
++done
+Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.71/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.71/sandbox/seunshare.c
+--- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/sandbox/seunshare.c	2009-08-26 10:06:05.000000000 -0400
+@@ -0,0 +1,188 @@
++#include <signal.h>
++#include <sys/types.h>
++#include <sys/wait.h>
++#include <sys/mount.h>
++#include <pwd.h>
++#define _GNU_SOURCE
++#include <sched.h>
++#include <string.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <cap-ng.h>
++#include <getopt.h>		/* for getopt_long() form of getopt() */
 +
-+random.seed(None)
++#include <selinux/selinux.h>
++#include <selinux/context.h>	/* for context-mangling functions */
 +
-+def mount(src, context):
-+    destdir="/mnt/%s" % context
-+    os.mkdir(destdir)
-+    print 'mount -n -o "context=%s" %s %s' % (context, src, destdir)
-+    os.chdir(destdir)
-+
-+def umount(dest):
-+    os.chdir("/")
-+    destdir="/mnt/%s" % dest
-+    print ('umount -n %s' % destdir)
-+    os.rmdir(destdir)
++/**
++ * This function will drop the capabilities so that we are left
++ * only with access to the audit system and the ability to raise
++ * CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_FOWNER and CAP_CHOWN,
++ * before invoking unshare and mounting a couple of directories. 
++ * These capabilities are needed for performing bind mounts/unmounts 
++ * and to create potential new instance directories with appropriate 
++ * DAC attributes. 
++ *
++ * Returns zero on success, non-zero otherwise
++ */
++static int drop_capabilities(int all)
++{
++	capng_clear(CAPNG_SELECT_BOTH);
 +
++	if (all) {
++		if ((getuid() == 0) && (capng_lock() < 0)) 
++			return -1;
++	} else {
++		if (capng_updatev(CAPNG_ADD, CAP_DAC_OVERRIDE|CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, -1) < 0) 
++			return -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)
++	return capng_apply(CAPNG_SELECT_BOTH);
++}
 +
-+def gen_context(type):
-+    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(":")
++#define DEFAULT_PATH "/usr/bin:/bin"
++#define TRUE 1
++#define FALSE 0
 +
-+    execcon="%s:%s:%s:%s" % (con[0], con[1], type, mcs)
-+    
-+    filecon="%s:%s:%s:%s" % (con[0], "object_r", "%s_file_t" % type[:-2], mcs)
-+    return execcon, filecon
++/**
++ * Take care of any signal setup
++ */
++static int set_signal_handles()
++{
++	sigset_t empty;
 +
++	/* Empty the signal mask in case someone is blocking a signal */
++	if (sigemptyset(&empty)) {
++		fprintf(stderr, "Unable to obtain empty signal set\n");
++		return -1;
++	}
 +
-+type = "sandbox_t"
-+mount_src = None
-+gopts, cmds = getopt.getopt(sys.argv[1:],"t:m:", 
-+                            ["type", 
-+                             "mount"])
-+for o, a in gopts:
-+    if o == "-t" or o == "--type":
-+        type = a
-+    if o == "-m" or o == "--mount":
-+        mount_src = a
++	(void)sigprocmask(SIG_SETMASK, &empty, NULL);
 +
-+execcon, filecon = gen_context(type)
-+selinux.setexeccon(execcon)
-+        
-+if mount_src != None:
-+    mount(mount_src, filecon)
-+    umount(filecon)
-+os.execvp(cmds[0], cmds)
++	/* Terminate on SIGHUP. */
++	if (signal(SIGHUP, SIG_DFL) == SIG_ERR) {
++		perror("Unable to set SIGHUP handler");
++		return -1;
++	}
++
++	return 0;
++}
++#define USAGE_STRING "USAGE: seunshare [ -t tmpdir ] [ -h homedir ] -- CONTEXT executable [args] "
++
++int main(int argc, char **argv) {
++	int rc;
++	int status = -1;
++
++	struct passwd *pwd=getpwuid(getuid());
++	security_context_t scontext;
++
++	int flag_index;		/* flag index in argv[] */
++	int clflag;		/* holds codes for command line flags */
++	char *tmpdir_s = NULL;	/* tmpdir spec'd by user in argv[] */
++	char *homedir_s = NULL;	/* homedir spec'd by user in argv[] */
++
++	const struct option long_options[] = {
++		{"homedir", 1, 0, 'h'},
++		{"tmpdir", 1, 0, 't'},
++		{NULL, 0, 0, 0}
++	};
++
++	if (drop_capabilities(FALSE)) {
++		perror("Failed to drop capabilities");
++		return -1;
++	}
++
++	while (1) {
++		clflag = getopt_long(argc, argv, "h:t:", long_options,
++				     &flag_index);
++		if (clflag == -1)
++			break;
++
++		switch (clflag) {
++		case 't':
++			tmpdir_s = optarg;
++			break;
++		case 'h':
++			homedir_s = optarg;
++			break;
++		default:
++			fprintf(stderr, "%s\n", USAGE_STRING);
++			return -1;
++		}
++	}
++
++	if (! homedir_s && ! tmpdir_s) {
++		fprintf(stderr, "Error: tmpdir and/or homedir required \n"
++			"%s\n", USAGE_STRING);
++		return -1;
++	}
++
++	if (argc - optind < 2) {
++		fprintf(stderr, "Error: executable required \n"
++			"%s\n", USAGE_STRING);
++		return -1;
++	}
++
++	scontext = argv[optind++];
++	
++	if (set_signal_handles())
++		return -1;
++
++        if (unshare(CLONE_NEWNS) < 0) {
++		perror("Failed to unshare");
++		return -1;
++	}
++
++	if (homedir_s && mount(homedir_s, pwd->pw_dir, NULL, MS_BIND, NULL) < 0) {
++		perror("Failed to mount HOMEDIR");
++		return -1;
++	}
++
++	if (tmpdir_s && mount(tmpdir_s, "/tmp", NULL, MS_BIND, NULL) < 0) {
++		perror("Failed to mount /tmp");
++		return -1;
++	}
++
++	if (drop_capabilities(TRUE)) {
++		perror("Failed to drop all capabilities");
++		return -1;
++	}
++
++	int child = fork();
++	if (!child) {
++		/* Construct a new environment */
++		char *display =  strdup(getenv("DISPLAY"));
++		if (!display) {
++			perror("Out of memory");
++			exit(-1);
++		}
++		if ((rc = clearenv())) {
++			perror("Unable to clear environment");
++			exit(-1);
++		}
++		
++		if (setexeccon(scontext)) {
++			fprintf(stderr, "Could not set exec context to %s.\n",
++				scontext);
++			exit(-1);
++		}
++
++		rc |= setenv("DISPLAY", display, 1);
++		rc |= setenv("HOME", pwd->pw_dir, 1);
++		rc |= setenv("SHELL", pwd->pw_shell, 1);
++		rc |= setenv("USER", pwd->pw_name, 1);
++		rc |= setenv("LOGNAME", pwd->pw_name, 1);
++		rc |= setenv("PATH", DEFAULT_PATH, 1);
++		
++		chdir(pwd->pw_dir);
++		execv(argv[optind], argv + optind);
++		perror("execv");
++		exit(-1);
++	} else {
++		waitpid(child, &status, 0);
++	}
++
++	return status;
++}
+Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.71/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.71/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-20 12:53:16.000000000 -0400
+@@ -435,6 +435,8 @@
+                     continue
+     except ValueError, e:
+         error(e)
++    except OSError, e:
++        error(e)
+     
+     sys.exit(errors)
+     
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.71/scripts/Makefile
+--- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-26 10:04:11.000000000 -0400
+@@ -5,7 +5,7 @@
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
+ 
+-all: fixfiles genhomedircon
++all: fixfiles genhomedircon chcat
+ 
+ install: all
+ 	-mkdir -p $(BINDIR)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.71/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-08-19 16:35:03.000000000 -0400
 +++ policycoreutils-2.0.71/semanage/semanage	2009-08-20 12:53:16.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -p -r1.629 -r1.630
--- policycoreutils.spec	22 Aug 2009 12:08:36 -0000	1.629
+++ policycoreutils.spec	26 Aug 2009 18:05:34 -0000	1.630
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -19,6 +19,7 @@ Source5: system-config-selinux.console
 Source6: selinux-polgengui.desktop
 Source7: selinux-polgengui.console
 Source8: policycoreutils_man_ru2.tar.bz2
+Source9: sandbox.init
 Patch:	 policycoreutils-rhat.patch
 Patch1:	 policycoreutils-po.patch
 Patch3:	 policycoreutils-gui.patch
@@ -72,6 +73,8 @@ mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_mandir}/man8
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
+install -m0755 %{SOURCE9} %{buildroot}/%{_sysconfdir}/rc.d/init.d/sandbox
 
 make LSPP_PRIV=y  DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
 make -C sepolgen-%{sepolgenver} DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
@@ -137,6 +140,22 @@ The policycoreutils-python package conta
 [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
 exit 0
 
+%package sandbox
+Summary: SELinux sandbox utilities
+Group:	 System Environment/Base
+Requires: policycoreutils-python = %{version}-%{release} 
+Requires: xorg-x11-server-Xephyr
+Requires: matchbox-window-manager
+
+%description sandbox
+The policycoreutils-python package contains the scripts to create graphical sandboxes
+
+%files sandbox
+%{_sysconfdir}/rc.d/init.d/sandbox
+%{_mandir}/man8/sandbox.8*
+%{_sbindir}/seunshare
+%{_datadir}/sandbox/sandboxX.sh
+
 %triggerin python -- selinux-policy
 [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
 exit 0
@@ -265,6 +284,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
+- Add sandboxX
+
 * Sat Aug 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-10
 - Fix realpath usage to only happen on argv input from user
 



From dwalsh at fedoraproject.org  Wed Aug 26 18:09:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 18:09:40 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.630,1.631
Message-ID: <20090826180940.6448111C02C2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11078

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
- Add sandboxX



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -p -r1.630 -r1.631
--- policycoreutils.spec	26 Aug 2009 18:05:34 -0000	1.630
+++ policycoreutils.spec	26 Aug 2009 18:09:40 -0000	1.631
@@ -146,6 +146,7 @@ Group:	 System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: xorg-x11-server-Xephyr
 Requires: matchbox-window-manager
+Requiers(post): /sbin/chkconfig
 
 %description sandbox
 The policycoreutils-python package contains the scripts to create graphical sandboxes
@@ -160,6 +161,15 @@ The policycoreutils-python package conta
 [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
 exit 0
 
+%post sandbox
+if [ $1 -eq 1 ]; then
+   /sbin/chkconfig sanbox --add
+fi
+%preun sandbox
+if [ $1 -eq 0 ]; then
+   /sbin/chkconfig sanbox --del
+fi
+
 %package newrole
 Summary: The newrole application for RBAC/MLS 
 Group: System Environment/Base



From tuxbrewr at fedoraproject.org  Wed Aug 26 18:13:43 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 26 Aug 2009 18:13:43 +0000 (UTC)
Subject: rpms/acpitool/F-11 .cvsignore, 1.8, 1.9 acpitool.spec, 1.16,
	1.17 sources, 1.8, 1.9
Message-ID: <20090826181343.19ED411C02C2@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/acpitool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11671

Modified Files:
	.cvsignore acpitool.spec sources 
Log Message:
various minor fixes (fixing memleaks, removing of limit on thermal zones)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/acpitool/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Sep 2008 15:01:23 -0000	1.8
+++ .cvsignore	26 Aug 2009 18:13:42 -0000	1.9
@@ -1 +1 @@
-acpitool-0.5.tar.bz2
+acpitool-0.5.1.tar.bz2


Index: acpitool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/acpitool/F-11/acpitool.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- acpitool.spec	24 Feb 2009 00:05:18 -0000	1.16
+++ acpitool.spec	26 Aug 2009 18:13:42 -0000	1.17
@@ -1,13 +1,13 @@
 Summary: Command line ACPI client
 Name: acpitool
-Version: 0.5
-Release: 2%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml
 
 Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2
-Patch0: acpitool-0.5-gcc43.patch
+#Patch0: acpitool-0.5-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -21,7 +21,7 @@ toggle fan on/off, and more. 
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
+#patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/man1/acpitool*
 
 %changelog
+* Wed Aug 26 2009 Steven M. Parrish <smparrish at gmail.com> 0.5.1-1
+- various minor fixes (fixing memleaks, removing of limit on thermal zones)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/acpitool/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Sep 2008 15:01:23 -0000	1.8
+++ sources	26 Aug 2009 18:13:42 -0000	1.9
@@ -1 +1 @@
-c4acc19eb002d6871d12abb490593202  acpitool-0.5.tar.bz2
+9e4ec55201be0be71ffbc56d38b42b57  acpitool-0.5.1.tar.bz2



From steved at fedoraproject.org  Wed Aug 26 18:17:53 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 26 Aug 2009 18:17:53 +0000 (UTC)
Subject: rpms/kernel/devel pnfs-v2.6.31-rc7.patch, NONE,
	1.1.2.1 config-generic, 
	1.321, 1.321.4.1 kernel.spec, 1.1741, 1.1741.2.1
Message-ID: <20090826181753.DE8CF11C02C2@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12553

Modified Files:
      Tag: kernel-2_6_31-pnfs_rc7
	config-generic kernel.spec 
Added Files:
      Tag: kernel-2_6_31-pnfs_rc7
	pnfs-v2.6.31-rc7.patch 
Log Message:
Updated to latest pNFS tag: v2.6.31-rc7


pnfs-v2.6.31-rc7.patch:
 Documentation/spnfs.txt                  |  210 ++
 drivers/md/dm-ioctl.c                    |   24 
 drivers/scsi/hosts.c                     |    3 
 drivers/scsi/osd/osd_initiator.c         |   22 
 drivers/scsi/osd/osd_uld.c               |   53 
 fs/exofs/Kbuild                          |    1 
 fs/exofs/exofs.h                         |   11 
 fs/exofs/export.c                        |  429 +++++
 fs/exofs/inode.c                         |   52 
 fs/exofs/super.c                         |    1 
 fs/exportfs/expfs.c                      |    7 
 fs/inode.c                               |    2 
 fs/nfs/Kconfig                           |   38 
 fs/nfs/Makefile                          |    7 
 fs/nfs/blocklayout/Makefile              |    6 
 fs/nfs/blocklayout/blocklayout.c         | 1204 ++++++++++++++++
 fs/nfs/blocklayout/blocklayout.h         |  265 +++
 fs/nfs/blocklayout/blocklayoutdev.c      |  735 +++++++++
 fs/nfs/blocklayout/blocklayoutdm.c       |  337 ++++
 fs/nfs/blocklayout/extents.c             |  947 ++++++++++++
 fs/nfs/callback.h                        |   36 
 fs/nfs/callback_proc.c                   |  280 +++
 fs/nfs/callback_xdr.c                    |  155 ++
 fs/nfs/client.c                          |   25 
 fs/nfs/direct.c                          |  227 ++-
 fs/nfs/file.c                            |   50 
 fs/nfs/inode.c                           |   43 
 fs/nfs/internal.h                        |   32 
 fs/nfs/nfs3proc.c                        |    1 
 fs/nfs/nfs4_fs.h                         |   16 
 fs/nfs/nfs4filelayout.c                  |  859 +++++++++++
 fs/nfs/nfs4filelayout.h                  |  131 +
 fs/nfs/nfs4filelayoutdev.c               |  886 +++++++++++
 fs/nfs/nfs4proc.c                        |  648 ++++++++
 fs/nfs/nfs4renewd.c                      |    2 
 fs/nfs/nfs4state.c                       |   22 
 fs/nfs/nfs4xdr.c                         | 2332 +++++++++++++++++++++++--------
 fs/nfs/objlayout/Kbuild                  |   11 
 fs/nfs/objlayout/objio_osd.c             |  774 ++++++++++
 fs/nfs/objlayout/objlayout.c             |  825 ++++++++++
 fs/nfs/objlayout/objlayout.h             |  220 ++
 fs/nfs/objlayout/panfs_shim.c            |  727 +++++++++
 fs/nfs/objlayout/panfs_shim.h            |  480 ++++++
 fs/nfs/objlayout/pnfs_osd_xdr.c          |  427 +++++
 fs/nfs/objlayout/pnfs_osd_xdr.h          |  431 +++++
 fs/nfs/objlayout/pnfs_osd_xdr_srv.c      |  297 +++
 fs/nfs/pagelist.c                        |   13 
 fs/nfs/pnfs.c                            | 2061 +++++++++++++++++++++++++++
 fs/nfs/pnfs.h                            |  361 ++++
 fs/nfs/proc.c                            |    1 
 fs/nfs/read.c                            |  104 -
 fs/nfs/super.c                           |   66 
 fs/nfs/write.c                           |  221 ++
 fs/nfsd/Kconfig                          |   39 
 fs/nfsd/Makefile                         |    3 
 fs/nfsd/export.c                         |   87 +
 fs/nfsd/nfs4callback.c                   |  591 +++++++
 fs/nfsd/nfs4filelayoutxdr.c              |  271 +++
 fs/nfsd/nfs4pnfsd.c                      | 1468 +++++++++++++++++++
 fs/nfsd/nfs4pnfsds.c                     |  620 ++++++++
 fs/nfsd/nfs4proc.c                       |  697 ++++++++-
 fs/nfsd/nfs4state.c                      |  786 ++++++----
 fs/nfsd/nfs4xdr.c                        |  680 ++++++++-
 fs/nfsd/nfsctl.c                         |  100 +
 fs/nfsd/nfsfh.c                          |   15 
 fs/nfsd/nfssvc.c                         |   29 
 fs/nfsd/pnfsd_lexp.c                     |  225 ++
 fs/nfsd/spnfs_com.c                      |  509 ++++++
 fs/nfsd/spnfs_ops.c                      |  894 +++++++++++
 fs/nfsd/vfs.c                            |   64 
 include/linux/exportfs.h                 |   38 
 include/linux/fs.h                       |    2 
 include/linux/nfs4.h                     |   56 
 include/linux/nfs4_pnfs.h                |  321 ++++
 include/linux/nfs_fs.h                   |   29 
 include/linux/nfs_fs_sb.h                |   22 
 include/linux/nfs_iostat.h               |    3 
 include/linux/nfs_page.h                 |   10 
 include/linux/nfs_xdr.h                  |   50 
 include/linux/nfsd/debug.h               |    2 
 include/linux/nfsd/export.h              |    1 
 include/linux/nfsd/nfs4layoutxdr.h       |   98 +
 include/linux/nfsd/nfsd.h                |   20 
 include/linux/nfsd/nfsd4_pnfs.h          |  312 ++++
 include/linux/nfsd/nfsfh.h               |    1 
 include/linux/nfsd/pnfsd.h               |  109 +
 include/linux/nfsd/state.h               |  211 ++
 include/linux/nfsd/syscall.h             |    8 
 include/linux/nfsd/xdr4.h                |   47 
 include/linux/nfsd4_spnfs.h              |  329 ++++
 include/linux/panfs_shim_api.h           |   57 
 include/linux/pnfs_xdr.h                 |  146 +
 include/linux/sunrpc/clnt.h              |    1 
 include/linux/sunrpc/rpc_pipe_fs.h       |    4 
 include/linux/sunrpc/svc.h               |    2 
 include/linux/sunrpc/svc_xprt.h          |   37 
 include/linux/sunrpc/svcsock.h           |    1 
 include/linux/sunrpc/xdr.h               |   18 
 include/linux/sunrpc/xprt.h              |    7 
 include/scsi/osd_initiator.h             |   53 
 include/scsi/osd_sense.h                 |    3 
 net/sunrpc/backchannel_rqst.c            |    2 
 net/sunrpc/cache.c                       |   66 
 net/sunrpc/clnt.c                        |    1 
 net/sunrpc/rpc_pipe.c                    |   40 
 net/sunrpc/sched.c                       |    7 
 net/sunrpc/sunrpc.h                      |   14 
 net/sunrpc/svcauth_unix.c                |    1 
 net/sunrpc/svcsock.c                     |  335 +++-
 net/sunrpc/xdr.c                         |   47 
 net/sunrpc/xprt.c                        |   16 
 net/sunrpc/xprtrdma/svc_rdma_transport.c |    4 
 net/sunrpc/xprtsock.c                    |  199 ++
 113 files changed, 25506 insertions(+), 1420 deletions(-)

--- NEW FILE pnfs-v2.6.31-rc7.patch ---
diff -up /dev/null linux-2.6.30.noarch/Documentation/spnfs.txt
--- /dev/null	2009-08-25 05:54:53.623006579 -0400
+++ linux-2.6.30.noarch/Documentation/spnfs.txt	2009-08-26 14:05:36.710369000 -0400
@@ -0,0 +1,210 @@
+(c) 2007 Network Appliance Inc.
+
+spNFS
+-----
+
+An spNFS system consists of a Meta Data Server (MDS), a number of Client machines (C) and a number of Data Servers (DS).
+
+A file system is mounted by the clients from the MDS, and all file data
+is striped across the DSs.
+
+Identify the machines that will be filling each of these roles.
+
+The spnfs kernel will be installed on all machines: clients, the MDS and DSs.
+
+
+Building and installing the spNFS kernel
+----------------------------------------
+
+Get the spNFS kernel from:
+
+	git://linux-nfs.org/~dmuntz/spnfs.git
+
+add these options to your .config file
+
+	CONFIG_NETWORK_FILESYSTEMS=y
+	CONFIG_NFS_FS=y
+	CONFIG_NFSD=y
+	CONFIG_NFS_V4_1=y
+	CONFIG_NFSD_V4_1=y
+	CONFIG_PNFS=y
+	CONFIG_PNFSD=y
+	CONFIG_SPNFS=y
+
+By default, spNFS uses whole-file layouts.  Layout segments can be enabled
+by adding:
+
+	CONFIG_SPNFS_LAYOUTSEGMENTS=y
+
+to your .config file.
+
+Building and installation of kernel+modules is as usual.
+This kernel should be installed and booted on the client, MDS and DSs.
+
+
+Building nfs-utils
+------------------
+
+Get the nfs-utils package containing spnfsd from:
+
+	git://linux-nfs.org/~dmuntz/nfs-utils.git
+
+Follow the standard instructions for building nfs-utils.  We HIGHLY recommend
+NOT doing an install of the binaries generated by this build.  You will only
+need the spnfsd binary generated by this build, and the spnfsd.conf template.
+
+After building, the spnfsd daemon will be located in utils/spnfsd.  The spnfsd
+daemon will only be needed on the MDS.
+
+
+Installation
+------------
+
+The nfs-utils package contains a default spnfsd.conf file in
+utils/spnfsd/spnfsd.conf.  Copy this file to /etc/spnfsd.conf.
+
+By default, the DS-Mount-Directory is set to /spnfs (see spnfsd.conf).  Under
+this directory, mount points must be created for each DS to
+be used for pNFS data stripes.  These mount points are named by the ip address
+of the corresponding DS.  In the sample spnfsd.conf, there are two
+DSs defined (172.16.28.134 and 172.16.28.141).
+
+Following the sample spnfsd.conf,
+
+	mkdir /spnfs
+
+on the MDS (corresponding to DS-Mount-Directory).  Then
+
+	mkdir /spnfs/172.16.28.134
+	mkdir /spnfs/172.16.28.141
+
+to create the mount points for the DSs.
+
+On the DSs, chose a directory where data stripes will be created by the MDS.
+For the sample file, this directory is /pnfs, so on each DS execute:
+
+	mkdir /pnfs
+
+This directory is specified in the spnfsd.conf file by the DS*_ROOT option
+(where * is replaced by the DS number).  DS_ROOT is specified relative to
+the directory being exported by the DSs.  In our example, our DSs are exporting
+the root directory (/) and therefore our DS_ROOT is /pnfs.  On the DSs, we have
+the following entry in /etc/exports:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+N.B. If we had created a /exports directory and a /pnfs directory under
+/exports, and if we were exporting /exports, then DS_ROOT would still be /pnfs
+(not /exports/pnfs).
+
+It may be useful to add entries to /etc/fstab on the MDS to automatically
+mount the DS_ROOT file systems.  For this example, our MDS fstab would
+contain:
+
+	172.17.84.128:/pnfs /spnfs/172.17.84.128 nfs    defaults        1 2
+	172.17.84.122:/pnfs /spnfs/172.17.84.122 nfs    defaults        1 2
+
+The DS mounts must be performed manually or via fstab at this time (automatic
+mounting, directory creation, etc. are on the todo list).  To perform I/O
+through the MDS, the DS mounts MUST use NFSv3 at this time (this restriction
+will eventually be removed).
+
+
+On the MDS, choose a file system to use with spNFS and export it, e.g.:
+
+	/ *(rw,fsid=0,insecure,no_root_squash,sync,no_subtree_check)
+
+Make sure nfsd and all supporting processes are running on the MDS and DSs.
+
+
+Running
+-------
+
+If rpc_pipefs is not already mounted (if you're running idmapd it probably is),
+you may want to add the following line to /etc/fstab:
+
+	rpc_pipefs    /var/lib/nfs/rpc_pipefs rpc_pipefs defaults     0 0
+
+to automatically mount rpc_pipefs.
+
+With spnfsd.conf configured for your environment and the mounts mounted as
+described above, spnfsd can now be started.
+
+On the MDS, execute spnfsd:
+
+	spnfsd
+
+The executable is located in the directory where it was built, and
+may also have been installed elsewhere depending on how you built nfs-utils.
+It will run in the foreground by default, and in fact will do so despite
+any options suggesting the contrary (it's still a debugging build).
+
+On the client, make sure the nfslayoutdriver module is loaded:
+
+	modprobe nfslayoutdriver
+
+Then mount the file system from the MDS:
+
+	mount -t nfs4 mds:/ /mnt
+
+I/O through the MDS is now supported.  To use it, do not load the
+nfslayoutdriver on the client, and mount the MDS using NFSv4 or 4.1
+(NFSv2 and v3 are not yet supported).
+
+You may now use spNFS by performing file system activities in /mnt.
+If you create files in /mnt, you should see stripe files corresponding to
+new files being created on the DSs.  The current implementation names the
+stripe files based on the inode number of the file on the MDS.  For example,
+if you create a file foo in /mnt and do an 'ls -li /mnt/foo':
+
+	# ls -li foo
+	1233 -rw-r--r-- 1 root root 0 Nov 29 15:54 foo
+
+You should see stripe files on each under /pnfs (per the sample) named
+1233.  The file /pnfs/1233 on DS1 will contain the first <stripe size> bytes
+of data written to foo, DS2 will contain the next <stripe size> bytes, etc.
+Removing /mnt/foo will remove the corresponding stripe files on the DSs.
+Other file system operations should behave (mostly :-) as expected.
+
+
+Layout Segments
+---------------
+
+If the kernel is compiled to support layout segments, there will
+be two files created under /proc/fs/spnfs for controlling layout
+segment functionality.
+
+To enable layout segments, write a '1' to /proc/fs/spnfs/layoutseg, e.g.:
+
+	echo 1 > /proc/fs/spnfs/layoutseg
+
+Layout segments can be disabled (returning to whole-file layouts) by
+writing a '0' to /proc/fs/spnfs/layoutseg:
+
+	echo 0 > /proc/fs/spnfs/layoutseg
+
+When layout segments are enabled, the size of the layouts returned can
+be specified by writing a decimal number (ascii representation) to
+/proc/fs/spnfs/layoutsegsize:
+
+	echo 1024 > /proc/fs/spnfs/layoutsegsize
+
+The value'0' has a special meaning--it causes the server to return a
+layout that is exactly the size requested by the client:
+
+	echo 0 > /proc/fs/spnfs/layoutsegsize
[...31764 lines suppressed...]
+
+/*
+ * Use the svc_sock to send the callback. Must be called with svsk->sk_mutex
+ * held. Borrows heavily from svc_tcp_sendto and xs_tcp_semd_request.
+ */
+static int bc_sendto(struct rpc_rqst *req)
+{
+	int len;
+	struct xdr_buf *xbufp = &req->rq_snd_buf;
+	struct rpc_xprt *xprt = req->rq_xprt;
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+	struct socket *sock = transport->sock;
+	unsigned long headoff;
+	unsigned long tailoff;
+
+	/*
+	 * Set up the rpc header and record marker stuff
+	 */
+	xs_encode_tcp_record_marker(xbufp);
+
+	tailoff = (unsigned long)xbufp->tail[0].iov_base & ~PAGE_MASK;
+	headoff = (unsigned long)xbufp->head[0].iov_base & ~PAGE_MASK;
+	len = svc_send_common(sock, xbufp,
+			      virt_to_page(xbufp->head[0].iov_base), headoff,
+			      xbufp->tail[0].iov_base, tailoff);
+
+	if (len != xbufp->len) {
+		printk(KERN_NOTICE "Error sending entire callback!\n");
+		len = -EAGAIN;
+	}
+
+	return len;
+}
+
+/*
+ * The send routine. Borrows from svc_send
+ */
+static int bc_send_request(struct rpc_task *task)
+{
+	struct rpc_rqst *req = task->tk_rqstp;
+	struct svc_xprt	*xprt;
+	struct svc_sock         *svsk;
+	u32                     len;
+
+	dprintk("sending request with xid: %08x\n", ntohl(req->rq_xid));
+	/*
+	 * Get the server socket associated with this callback xprt
+	 */
+	xprt = req->rq_xprt->bc_xprt;
+	svsk = container_of(xprt, struct svc_sock, sk_xprt);
+
+	/*
+	 * Grab the mutex to serialize data as the connection is shared
+	 * with the fore channel
+	 */
+	mutex_lock(&xprt->xpt_mutex);
+	if (test_bit(XPT_DEAD, &xprt->xpt_flags))
+		len = -ENOTCONN;
+	else
+		len = bc_sendto(req);
+	mutex_unlock(&xprt->xpt_mutex);
+
+	if (len > 0)
+		len = 0;
+
+	return len;
+}
+
+/*
+ * The close routine. Since this is client initiated, we do nothing
+ */
+
+static void bc_close(struct rpc_xprt *xprt)
+{
+	return;
+}
+
+/*
+ * The xprt destroy routine. Again, because this connection is client
+ * initiated, we do nothing
+ */
+
+static void bc_destroy(struct rpc_xprt *xprt)
+{
+	return;
+}
+
 static struct rpc_xprt_ops xs_udp_ops = {
 	.set_buffer_size	= xs_udp_set_buffer_size,
 	.reserve_xprt		= xprt_reserve_xprt_cong,
@@ -2192,6 +2317,22 @@ static struct rpc_xprt_ops xs_tcp_ops = 
 	.print_stats		= xs_tcp_print_stats,
 };
 
+/*
+ * The rpc_xprt_ops for the server backchannel
+ */
+
+static struct rpc_xprt_ops bc_tcp_ops = {
+	.reserve_xprt		= xprt_reserve_xprt,
+	.release_xprt		= xprt_release_xprt,
+	.buf_alloc		= bc_malloc,
+	.buf_free		= bc_free,
+	.send_request		= bc_send_request,
+	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
+	.close			= bc_close,
+	.destroy		= bc_destroy,
+	.print_stats		= xs_tcp_print_stats,
+};
+
 static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
 				      unsigned int slot_table_size)
 {
@@ -2323,14 +2464,46 @@ static struct rpc_xprt *xs_setup_tcp(str
 	xprt->prot = IPPROTO_TCP;
 	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
 	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
+	xprt->timeout = &xs_tcp_default_timeout;
 
-	xprt->bind_timeout = XS_BIND_TO;
-	xprt->connect_timeout = XS_TCP_CONN_TO;
-	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-	xprt->idle_timeout = XS_IDLE_DISC_TO;
+	if (args->bc_xprt) {
+		struct svc_sock *bc_sock;
 
-	xprt->ops = &xs_tcp_ops;
-	xprt->timeout = &xs_tcp_default_timeout;
+		/* backchannel */
+		xprt_set_bound(xprt);
+		xprt->bind_timeout = 0;
+		xprt->connect_timeout = 0;
+		xprt->reestablish_timeout = 0;
+		xprt->idle_timeout = (~0);
+
+		/*
+		 * The backchannel uses the same socket connection as the
+		 * forechannel
+		 */
+		xprt->bc_xprt = args->bc_xprt;
+		bc_sock = container_of(args->bc_xprt, struct svc_sock, sk_xprt);
+		bc_sock->sk_bc_xprt = xprt;
+		transport->sock = bc_sock->sk_sock;
+		transport->inet = bc_sock->sk_sk;
+
+		xprt->ops = &bc_tcp_ops;
+
+		switch (addr->sa_family) {
+		case AF_INET:
+			xs_format_ipv4_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP);
+			break;
+		case AF_INET6:
+			xs_format_ipv6_peer_addresses(xprt, "tcp",
+						      RPCBIND_NETID_TCP6);
+			break;
+		default:
+			kfree(xprt);
+			return ERR_PTR(-EAFNOSUPPORT);
+		}
+
+		goto out;
+	}
 
 	switch (addr->sa_family) {
 	case AF_INET:
@@ -2338,20 +2511,30 @@ static struct rpc_xprt *xs_setup_tcp(str
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
-		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+		xs_format_ipv4_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	case AF_INET6:
 		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
 			xprt_set_bound(xprt);
 
 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
-		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+		xs_format_ipv6_peer_addresses(xprt, "tcp",
+					      RPCBIND_NETID_TCP);
 		break;
 	default:
 		kfree(xprt);
 		return ERR_PTR(-EAFNOSUPPORT);
 	}
 
+	xprt->bind_timeout = XS_BIND_TO;
+	xprt->connect_timeout = XS_TCP_CONN_TO;
+	xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
+	xprt->idle_timeout = XS_IDLE_DISC_TO;
+
+	xprt->ops = &xs_tcp_ops;
+
+out:
 	dprintk("RPC:       set up transport to address %s\n",
 			xprt->address_strings[RPC_DISPLAY_ALL]);
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.321
retrieving revision 1.321.4.1
diff -u -p -r1.321 -r1.321.4.1
--- config-generic	26 Aug 2009 10:06:27 -0000	1.321
+++ config-generic	26 Aug 2009 18:17:53 -0000	1.321.4.1
@@ -3194,7 +3194,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -3202,6 +3202,14 @@ CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
 CONFIG_NFS_FSCACHE=y
+CONFIG_PNFSD=y
+CONFIG_PNFS=y
+CONFIG_PNFSD_LOCAL_EXPORT=y
+CONFIG_SPNFS=y
+CONFIG_PNFS_OBJLAYOUT=y
+CONFIG_PNFS_BLOCK=y
+CONFIG_SPNFS_LAYOUTSEGMENTS=y
+CONFIG_PNFS_PANLAYOUT=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1741
retrieving revision 1.1741.2.1
diff -u -p -r1.1741 -r1.1741.2.1
--- kernel.spec	26 Aug 2009 15:50:19 -0000	1.1741
+++ kernel.spec	26 Aug 2009 18:17:53 -0000	1.1741.2.1
@@ -15,7 +15,7 @@ Summary: The Linux kernel
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-# % define buildid .local
+%define buildid .pnfs
 
 # fedora_build defines which build revision of this kernel version we're
 # building. Rather than incrementing forever, as with the prior versioning
@@ -89,7 +89,8 @@ Summary: The Linux kernel
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+#%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
+%define with_firmware  1
 # tools/perf
 %define with_perftool  %{?_without_perftool:  0} %{?!_without_perftool:  1}
 # perf noarch subpkg
@@ -715,6 +716,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3060: pnfs-v2.6.31-rc7.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1198,6 +1200,7 @@ ApplyPatch linux-2.6-execshield.patch
 
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch pnfs-v2.6.31-rc7.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -2011,6 +2014,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Steve Dickson <steved at redhat.com>
+- Updated to latest pNFS tag: v2.6.31-rc7
+
 * Wed Aug 26 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git4
 - Drop patches merged upstream:



From rdieter at fedoraproject.org  Wed Aug 26 18:22:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 18:22:33 +0000 (UTC)
Subject: rpms/lyx/EL-5 lyx.spec,1.55,1.56
Message-ID: <20090826182233.855A811C02C2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13202

Modified Files:
	lyx.spec 
Log Message:
add Group: tags (more EPEL compat)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- lyx.spec	26 Aug 2009 17:46:51 -0000	1.55
+++ lyx.spec	26 Aug 2009 18:22:33 -0000	1.56
@@ -115,6 +115,7 @@ and let the computer take care of the re
 
 %package common
 Summary:  Common files of %{name} 
+Group:    Applications/Publishing
 Requires: %{name} = %{version}-%{release}
 %{?build_noarch}
 %description common 
@@ -123,6 +124,7 @@ Requires: %{name} = %{version}-%{release
 %package -n %{fontname}-fonts-compat
 Summary: Lyx/MathML fonts compatibility package
 License: Copyright only and GPL+
+Group:   Applications/Publishing
 Obsoletes: mathml-fonts < 1.0-50
 Provides:  mathml-fonts = 1.0-50
 Provides: %{fontname}-fonts = %{version}-%{release}
@@ -143,6 +145,7 @@ do not reference it or depend on it in a
 
 %package -n %{fontname}-fonts-common
 Summary: Common files of %{fontname}-fonts
+Group:   Applications/Publishing
 # The actual license says "The author of these fonts, Basil K. Malyshev, has
 # kindly granted permission to use and modify these fonts."
 # One of the font files (wasy10) is separately licensed GPL+.
@@ -154,6 +157,7 @@ This package consists of files used by o
 
 %package -n %{fontname}-cmex10-fonts
 Summary: Cmex10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -162,6 +166,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmmi10-fonts
 Summary: Cmmi10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -170,6 +175,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmr10-fonts
 Summary: Cmr10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -178,6 +184,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-cmsy10-fonts
 Summary: Cmsy10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -186,6 +193,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-esint10-fonts
 Summary: Esint10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -194,6 +202,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-eufm10-fonts
 Summary: Eufm10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -202,6 +211,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-msam10-fonts
 Summary: Msam10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -210,6 +220,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-msbm10-fonts
 Summary: Msbm10 fonts
+Group:   Applications/Publishing
 License: Copyright only
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}
@@ -218,6 +229,7 @@ Requires: %{fontname}-fonts-common = %{v
 
 %package -n %{fontname}-wasy10-fonts
 Summary: Wasy10 fonts
+Group:   Applications/Publishing
 License: GPL+
 Requires: %{fontname}-fonts-common = %{version}-%{release}
 %{?build_noarch}



From bpepple at fedoraproject.org  Wed Aug 26 18:25:02 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 26 Aug 2009 18:25:02 +0000 (UTC)
Subject: rpms/telepathy-filesystem/devel telepathy-filesystem.spec,1.4,1.5
Message-ID: <20090826182502.64C6711C02C2@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13682

Modified Files:
	telepathy-filesystem.spec 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.2-1
- Add clients dir.



Index: telepathy-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-filesystem/devel/telepathy-filesystem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- telepathy-filesystem.spec	27 Jul 2009 05:43:46 -0000	1.4
+++ telepathy-filesystem.spec	26 Aug 2009 18:25:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           telepathy-filesystem
-Version:        0.0.1
-Release:        4%{?dist}
+Version:        0.0.2
+Release:        1%{?dist}
 Summary:        Telepathy filesystem layout
 
 Group:          System Environment/Base
@@ -21,6 +21,7 @@ packages which comprise the Telepathy re
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/telepathy/managers
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/telepathy/clients
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/telepathy-1.0
 
 
@@ -32,10 +33,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_datadir}/telepathy
 %dir %{_datadir}/telepathy/managers
+%dir %{_datadir}/telepathy/clients
 %dir %{_includedir}/telepathy-1.0
 
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.2-1
+- Add clients dir.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From steved at fedoraproject.org  Wed Aug 26 17:56:01 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 26 Aug 2009 17:56:01 +0000 (UTC)
Subject: rpms/kernel/devel config-generic,1.321,1.321.2.1
Message-ID: <20090826175601.3205C11C004B@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8011

Modified Files:
      Tag: kernel-2_6_31-nfs41_rc7
	config-generic 
Log Message:
Turned on CONFIG_NFS_V4_1



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.321
retrieving revision 1.321.2.1
diff -u -p -r1.321 -r1.321.2.1
--- config-generic	26 Aug 2009 10:06:27 -0000	1.321
+++ config-generic	26 Aug 2009 17:56:00 -0000	1.321.2.1
@@ -3194,7 +3194,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y



From tmraz at fedoraproject.org  Wed Aug 26 18:36:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 18:36:55 +0000 (UTC)
Subject: rpms/Pound/devel pound-2.4.4-openssl.patch, NONE, 1.1 Pound.spec,
	1.31, 1.32
Message-ID: <20090826183655.F2F9D11C02C2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/Pound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16034

Modified Files:
	Pound.spec 
Added Files:
	pound-2.4.4-openssl.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.4-4
- rebuilt with new openssl


pound-2.4.4-openssl.patch:
 config.c |   12 +++++++
 pound.h  |    8 +++++
 svc.c    |   98 +++++++++++++++++++++++++++++++++++++++++++++------------------
 3 files changed, 91 insertions(+), 27 deletions(-)

--- NEW FILE pound-2.4.4-openssl.patch ---
diff -up Pound-2.4.4/config.c.openssl Pound-2.4.4/config.c
--- Pound-2.4.4/config.c.openssl	2009-01-14 17:39:54.000000000 +0100
+++ Pound-2.4.4/config.c	2009-08-26 18:18:18.000000000 +0200
@@ -375,14 +375,22 @@ t_hash(const TABNODE *e)
         res = (res ^ *k++) * 16777619;
     return res;
 }
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
+#else
 static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
+#endif
 
 static int
 t_cmp(const TABNODE *d1, const TABNODE *d2)
 {
     return strcmp(d1->key, d2->key);
 }
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
+#else
 static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
+#endif
 
 /*
  * parse a service
@@ -405,7 +413,11 @@ parse_service(FILE *const f_conf, const 
     pthread_mutex_init(&res->mut, NULL);
     if(svc_name)
         strncpy(res->name, svc_name, KEY_SIZE);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) {
+#else
     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) {
+#endif
         logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
         exit(1);
     }
diff -up Pound-2.4.4/pound.h.openssl Pound-2.4.4/pound.h
--- Pound-2.4.4/pound.h.openssl	2009-01-14 17:39:54.000000000 +0100
+++ Pound-2.4.4/pound.h	2009-08-22 18:40:05.000000000 +0200
@@ -312,6 +312,10 @@ typedef struct _tn {
 /* maximal session key size */
 #define KEY_SIZE    127
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+DECLARE_LHASH_OF(TABNODE);
+#endif
+
 /* service definition */
 typedef struct _service {
     char                name[KEY_SIZE + 1]; /* symbolic name */
@@ -327,7 +331,11 @@ typedef struct _service {
     int                 sess_ttl;   /* session time-to-live */
     regex_t             sess_pat;   /* pattern to match the session data */
     char                *sess_parm; /* session cookie or parameter */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
+#else
     LHASH               *sessions;  /* currently active sessions */
+#endif
     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
     int                 disabled;   /* true if the service is disabled */
     struct _service     *next;
diff -up Pound-2.4.4/svc.c.openssl Pound-2.4.4/svc.c
--- Pound-2.4.4/svc.c.openssl	2009-01-14 17:39:54.000000000 +0100
+++ Pound-2.4.4/svc.c	2009-08-26 20:18:33.000000000 +0200
@@ -28,12 +28,17 @@
 
 #include    "pound.h"
 
+#ifndef LHASH_OF
+#define LHASH_OF(x) LHASH
+#define CHECKED_LHASH_OF(type, h) h
+#endif
+
 /*
  * Add a new key/content pair to a hash table
  * the table should be already locked
  */
 static void
-t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
 {
     TABNODE *t, *old;
 
@@ -54,7 +59,11 @@ t_add(LHASH *const tab, const char *key,
     }
     memcpy(t->content, content, cont_len);
     t->last_acc = time(NULL);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
+#else
     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
+#endif
         free(old->key);
         free(old->content);
         free(old);
@@ -69,12 +78,16 @@ t_add(LHASH *const tab, const char *key,
  * side-effect: update the time of last access
  */
 static void *
-t_find(LHASH *const tab, char *const key)
+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
 {
     TABNODE t, *res;
 
     t.key = key;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
+#else
     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
+#endif
         res->last_acc = time(NULL);
         return res->content;
     }
@@ -85,12 +98,16 @@ t_find(LHASH *const tab, char *const key
  * Delete a key
  */
 static void
-t_remove(LHASH *const tab, char *const key)
+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
 {
     TABNODE t, *res;
 
     t.key = key;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
+#else
     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
+#endif
         free(res->key);
         free(res->content);
         free(res);
@@ -99,59 +116,75 @@ t_remove(LHASH *const tab, char *const k
 }
 
 typedef struct  {
-    LHASH   *tab;
+    LHASH_OF(TABNODE) *tab;
     time_t  lim;
     void    *content;
     int     cont_len;
 }   ALL_ARG;
 
 static void
-t_old(TABNODE *t, void *arg)
+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
 {
-    ALL_ARG *a;
-
-    a = (ALL_ARG *)arg;
     if(t->last_acc < a->lim)
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+        LHM_lh_delete(TABNODE, a->tab, t);
+#else
         lh_delete(a->tab, t);
+#endif
     return;
 }
-IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
+#else
+#define t_old t_old_doall_arg
+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
+#endif
 
 /*
  * Expire all old nodes
  */
 static void
-t_expire(LHASH *const tab, const time_t lim)
+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
 {
     ALL_ARG a;
     int down_load;
 
     a.tab = tab;
     a.lim = lim;
-    down_load = tab->down_load;
-    tab->down_load = 0;
+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
+#else
     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
-    tab->down_load = down_load;
+#endif
+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
     return;
 }
 
 static void
-t_cont(TABNODE *t, void *arg)
+t_cont_doall_arg(TABNODE *t, ALL_ARG *a)
 {
-    ALL_ARG *a;
-
-    a = (ALL_ARG *)arg;
     if(memcmp(t->content, a->content, a->cont_len) == 0)
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+        LHM_lh_delete(TABNODE, a->tab, t);
+#else
         lh_delete(a->tab, t);
+#endif
     return;
 }
-IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
+#else
+#define t_cont t_cont_doall_arg
+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
+#endif
 
 /*
  * Remove all nodes with the given content
  */
 static void
-t_clean(LHASH *const tab, void *const content, const size_t cont_len)
+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
 {
     ALL_ARG a;
     int down_load;
@@ -159,10 +192,14 @@ t_clean(LHASH *const tab, void *const co
     a.tab = tab;
     a.content = content;
     a.cont_len = cont_len;
-    down_load = tab->down_load;
-    tab->down_load = 0;
+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
+#else
     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
-    tab->down_load = down_load;
+#endif
+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
     return;
 }
 
@@ -1378,13 +1415,11 @@ typedef struct  {
 }   DUMP_ARG;
 
 static void
-t_dump(TABNODE *t, void *arg)
+t_dump_doall_arg(TABNODE *t, DUMP_ARG *a)
 {
-    DUMP_ARG    *a;
     BACKEND     *be, *bep;
     int         n_be, sz;
 
-    a = (DUMP_ARG *)arg;
     memcpy(&bep, t->content, sizeof(bep));
     for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
         if(be == bep)
@@ -1399,19 +1434,28 @@ t_dump(TABNODE *t, void *arg)
     write(a->control_sock, t->key, sz);
     return;
 }
-IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
+#else
+#define t_dump t_dump_doall_arg
+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
+#endif
 
 /*
  * write sessions to the control socket
  */
 static void
-dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
 {
     DUMP_ARG a;
 
     a.control_sock = control_sock;
     a.backends = backends;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
+#else
     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
+#endif
     return;
 }
 


Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/Pound.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Pound.spec	21 Aug 2009 12:18:56 -0000	1.31
+++ Pound.spec	26 Aug 2009 18:36:55 -0000	1.32
@@ -31,6 +31,7 @@ Source0:  http://www.apsis.ch/pound/%{na
 Source1:  pound.init
 Source2:  pound.cfg
 Patch0:   pound-remove-owner.patch
+Patch1:   pound-2.4.4-openssl.patch
 
 %description
 The Pound program is a reverse proxy, load balancer and
@@ -44,6 +45,7 @@ give away
 %prep
 %setup -q
 %patch0 -p1 -b .remove-owner
+%patch1 -p1 -b .openssl
 
 %build
 %configure
@@ -116,7 +118,7 @@ fi
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.4-4
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.4-4
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-3



From clumens at fedoraproject.org  Wed Aug 26 18:37:38 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 26 Aug 2009 18:37:38 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.659, 1.660 anaconda.spec, 1.809, 
	1.810 sources, 1.793, 1.794
Message-ID: <20090826183738.9468011C02C2@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16228

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -p -r1.659 -r1.660
--- .cvsignore	19 Aug 2009 01:09:22 -0000	1.659
+++ .cvsignore	26 Aug 2009 18:37:38 -0000	1.660
@@ -1 +1,2 @@
 anaconda-12.16.tar.bz2
+anaconda-12.17.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -p -r1.809 -r1.810
--- anaconda.spec	19 Aug 2009 01:09:23 -0000	1.809
+++ anaconda.spec	26 Aug 2009 18:37:38 -0000	1.810
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.16
+Version: 12.17
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -12,6 +12,7 @@ URL:     http://fedoraproject.org/wiki/A
 # To generate Source0 do:
 # git clone http://git.fedorahosted.org/git/anaconda.git
 # git checkout -b archive-branch anaconda-%{version}-%{release}
+# ./autogen.sh
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
@@ -209,6 +210,53 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Aug 26 2009 Chris Lumens <clumens at redhat.com> - 12.17-1
+- dracut has initrd-generic-<version> instead of initrd-<version> (#519185)
+  (hdegoede)
+- Do not try to commit disks changes to the os while partitions are in use
+  (hdegoede)
+- disklabel.commit(): DeviceError -> DeviceFormatError (hdegoede)
+- A "partition" having no partedPartition shouldn't be a traceback
+  (#519128). (clumens)
+- Add some debugging code so we know what's going on for #504986 (katzj)
+- Fix going back in "Inst. Method" and "Configure TCP/IP" screens in stage 1
+  (#515450) (rvykydal)
+- Fix going back from stage1 nfs/url setup dialog. (rvykydal)
+- When bringing up network in UI, update only ifcfg file of selected device
+  (#507084). (rvykydal)
+- Update Optional packages button via popup menu too (#515912). (rvykydal)
+- Remove the firstadkit-plugin-grub from non-grub archs (msivak)
+- Use the path instead of the name for the questionInitialize function.
+  (#517926) (jgranado)
+- Only add "rhgb quiet" to boot args for non-serial installs (#506508,
+  #510523). (clumens)
+- On rpm unpack errors, display a fatal error message (#452724). (clumens)
+- Use tee thread to ensure line buffered output to screen and log file at
+  the same moment... (#506664) (msivak)
+- Ensure libraries are copied to initrd.img for xauth (#516369) (maier)
+- Import shutil for upgrades (#519011). (clumens)
+- Fix focus grabbing on both the password and hostname screens. (clumens)
+- x86 and EFI platforms can now have /boot on ext4. (clumens)
+- Use the Platform's idea of what filesystem /boot can be on. (clumens)
+- zz-liveinst.sh: Restore the #! line (ajax)
+- Import _ped so it can be used for _ped.DiskLabelException. (pjones)
+- Make sure LV and VG names fit within LVM limits (#517483) (dcantrell)
+- Fix updates target to honor KEEP variable correctly. (dcantrell)
+- Add support for the reiserfs filesystem (#504401) (dcantrell)
+- Update instructions on how to generate source archive. (dcantrell)
+- Use disk.description instead of trying to access parted attrs. (#518212)
+  (dlehman)
+- Fix disk.partedDisk -> disk.format.partedDisk. (dlehman)
+- Fix a stupid typo in the logging. (clumens)
+- If modifying a repo fails, do not delete it (#516053). (clumens)
+- If repo setup fails, also make sure to delete it from yum. (clumens)
+- Allow configuring additional NFS repositories, not just the base. (clumens)
+- Consolidate "base repo" setup into an extra function. (clumens)
+- Allocate memory for login and password and do not meddle with host pointer
+  so we can correctly free it (#483818) (msivak)
+- Run make in silent mode by default. (jgranado)
+- Allow creation of an updates image from a tag offset. (jgranado)
+
 * Tue Aug 18 2009 David Cantrell <dcantrell at redhat.com> - 12.16-1
 - correctly deactivate zFCP LUN on s390 (maier)
 - correctly activate zFCP LUN on s390 (maier)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -p -r1.793 -r1.794
--- sources	19 Aug 2009 01:09:23 -0000	1.793
+++ sources	26 Aug 2009 18:37:38 -0000	1.794
@@ -1 +1 @@
-d79c42a7963a58fd27535470f69289f0  anaconda-12.16.tar.bz2
+8e71f9e87f50e06386bddcefe3348bec  anaconda-12.17.tar.bz2



From bpepple at fedoraproject.org  Wed Aug 26 18:39:49 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 26 Aug 2009 18:39:49 +0000 (UTC)
Subject: rpms/empathy/devel empathy-desktop-category.patch, NONE,
	1.1 .cvsignore, 1.36, 1.37 empathy.spec, 1.69,
	1.70 presence-icons.patch, 1.1, 1.2 sources, 1.36,
	1.37 button-images.patch, 1.1, NONE clutter.patch, 1.1, NONE
Message-ID: <20090826183949.EA69611C02C2@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16625

Modified Files:
	.cvsignore empathy.spec presence-icons.patch sources 
Added Files:
	empathy-desktop-category.patch 
Removed Files:
	button-images.patch clutter.patch 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-1
- Update to 2.27.91.1.
- Add BR on unique-devel.
- Update presence-icons patch.
- Add patch to fix invalid category in desktop file.
- Drop clutter patch.  Fixed upstream.


empathy-desktop-category.patch:
 empathy.desktop       |    2 +-
 empathy.desktop.in    |    2 +-
 empathy.desktop.in.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE empathy-desktop-category.patch ---
diff -urp empathy-2.27.91.1.OLD/data/empathy.desktop empathy-2.27.91.1/data/empathy.desktop
--- empathy-2.27.91.1.OLD/data/empathy.desktop	2009-08-25 11:59:12.000000000 -0400
+++ empathy-2.27.91.1/data/empathy.desktop	2009-08-26 14:02:09.405801422 -0400
@@ -44,7 +44,7 @@ Icon=empathy
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Network;IM;
+Categories=GNOME;GTK;Network;InstantMessaging;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=empathy
 X-GNOME-Bugzilla-Component=General
diff -urp empathy-2.27.91.1.OLD/data/empathy.desktop.in empathy-2.27.91.1/data/empathy.desktop.in
--- empathy-2.27.91.1.OLD/data/empathy.desktop.in	2009-08-25 11:58:25.000000000 -0400
+++ empathy-2.27.91.1/data/empathy.desktop.in	2009-08-26 14:01:54.399801188 -0400
@@ -7,7 +7,7 @@ Icon=empathy
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Network;IM;
+Categories=GNOME;GTK;Network;InstantMessaging;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=empathy
 X-GNOME-Bugzilla-Component=General
diff -urp empathy-2.27.91.1.OLD/data/empathy.desktop.in.in empathy-2.27.91.1/data/empathy.desktop.in.in
--- empathy-2.27.91.1.OLD/data/empathy.desktop.in.in	2009-08-21 09:24:55.000000000 -0400
+++ empathy-2.27.91.1/data/empathy.desktop.in.in	2009-08-26 14:01:41.363551729 -0400
@@ -7,7 +7,7 @@ Icon=empathy
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Network;IM;
+Categories=GNOME;GTK;Network;InstantMessaging;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=empathy
 X-GNOME-Bugzilla-Component=General


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Jul 2009 18:27:00 -0000	1.36
+++ .cvsignore	26 Aug 2009 18:39:49 -0000	1.37
@@ -1 +1 @@
-empathy-2.27.5.tar.bz2
+empathy-2.27.91.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- empathy.spec	24 Aug 2009 06:08:29 -0000	1.69
+++ empathy.spec	26 Aug 2009 18:39:49 -0000	1.70
@@ -4,14 +4,18 @@
 ## respectively.
 %global	gtk2_min_version	2.16
 %global	glib2_min_version	2.16.0
-%global	tp_mc_min_version	4.61
-%global	tp_glib_min_version	0.7.31
+%global	tp_mc_min_version	5.0.0
+%global	tp_glib_min_version	0.7.34
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
+%global libcanberra_version     0.4
+%global webkit_version          1.1.7
+%global libnotify_version       0.4.4
+%global libchamplain_version    0.3.6
 
 Name:		empathy
-Version:	2.27.5
-Release:	3%{?dist}
+Version:	2.27.91.1
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -25,9 +29,7 @@ Source1:	%{name}-README.ConnectionManage
 ##  https://bugzilla.redhat.com/show_bug.cgi?id=436773
 ##  http://bugzilla.gnome.org/show_bug.cgi?id=577863
 Patch1:		%{name}-broken-pkgconfig.patch
-
-Patch2:		clutter.patch
-
+Patch2:		%{name}-desktop-category.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 
@@ -40,10 +42,10 @@ BuildRequires:	evolution-data-server-dev
 BuildRequires:	GConf2-devel
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
-BuildRequires:	gnome-doc-utils >= 0.3.2
+BuildRequires:	gnome-doc-utils >= 0.17.3
 BuildRequires:	gnome-panel-devel
-BuildRequires:	libcanberra-devel >= 0.4
-BuildRequires:	webkitgtk-devel >= 1.1.7
+BuildRequires:	libcanberra-devel >= %{libcanberra_version}
+BuildRequires:	webkitgtk-devel >= %{webkit_version}
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
@@ -52,11 +54,12 @@ BuildRequires:	scrollkeeper
 BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
 BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:	telepathy-farsight-devel
-BuildRequires:	libnotify-devel >= 0.4.4
+BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
-BuildRequires:  libchamplain-gtk-devel >= 0.3.6
+BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
 BuildRequires:  clutter-gtk-devel
-BuildRequires:  geoclue-devel >= 0.11 
+BuildRequires:  geoclue-devel >= 0.11
+BuildRequires:	unique-devel
 
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	telepathy-filesystem
@@ -133,7 +136,7 @@ bindings to the libempathy and libempath
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconfig
-%patch2 -p1 -b .clutter
+%patch2 -p1 -b .desktop
 %patch3 -p1 -b .presence-icons
 
 # force these to be regenerated
@@ -147,7 +150,8 @@ rm data/empathy.schemas
 ## 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
-make %{?_smp_mflags}
+# Parallel builds are broken.
+make
 install -m 0644 %{SOURCE1} ./README.ConnectionManagers
 
 
@@ -217,9 +221,9 @@ fi
 %{_datadir}/empathy/
 %{_datadir}/applications/fedora-%{name}*.desktop
 %{_datadir}/gnome/help/%{name}/
-%{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}*
-%{_datadir}/mission-control/profiles/*.profile
+%{_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
@@ -242,6 +246,13 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-1
+- Update to 2.27.91.1.
+- Add BR on unique-devel.
+- Update presence-icons patch.
+- Add patch to fix invalid category in desktop file.
+- Drop clutter patch.  Fixed upstream.
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.5-3
 - Make presence icons show up in the menus
 

presence-icons.patch:
 empathy-presence-chooser.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: presence-icons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/presence-icons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- presence-icons.patch	24 Aug 2009 06:08:29 -0000	1.1
+++ presence-icons.patch	26 Aug 2009 18:39:49 -0000	1.2
@@ -1,6 +1,7 @@
---- empathy-2.27.5/libempathy-gtk/empathy-presence-chooser.c	2009-07-29 04:18:26.000000000 -0400
-+++ hacked/libempathy-gtk/empathy-presence-chooser.c	2009-08-24 02:00:31.892689425 -0400
-@@ -223,7 +223,7 @@
+diff -urp empathy-2.27.91.1.OLD/libempathy-gtk/empathy-presence-chooser.c empathy-2.27.91.1/libempathy-gtk/empathy-presence-chooser.c
+--- empathy-2.27.91.1.OLD/libempathy-gtk/empathy-presence-chooser.c	2009-08-21 09:31:16.000000000 -0400
++++ empathy-2.27.91.1/libempathy-gtk/empathy-presence-chooser.c	2009-08-25 20:51:05.340069847 -0400
+@@ -227,7 +227,7 @@ presence_chooser_create_model (EmpathyPr
  
  	gtk_list_store_insert_with_values (store, NULL, -1,
  		COL_STATUS_TEXT, _("Edit Custom Messages..."),
@@ -9,11 +10,3 @@
  		COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
  		COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
  		-1);
-@@ -1049,6 +1049,7 @@
- 	gtk_widget_show (image);
- 
- 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
- 	gtk_widget_show (item);
- 
- 	g_object_set_data_full (G_OBJECT (item),


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	29 Jul 2009 18:27:01 -0000	1.36
+++ sources	26 Aug 2009 18:39:49 -0000	1.37
@@ -1 +1 @@
-27d69e0db8874ae40d924dbf80703be6  empathy-2.27.5.tar.bz2
+6845b138d9f597932886345aeac82bc5  empathy-2.27.91.1.tar.bz2


--- button-images.patch DELETED ---


--- clutter.patch DELETED ---



From tmraz at fedoraproject.org  Wed Aug 26 18:43:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 26 Aug 2009 18:43:27 +0000 (UTC)
Subject: rpms/pam/devel pam.spec,1.202,1.203
Message-ID: <20090826184327.C4BFB11C02C2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17283

Modified Files:
	pam.spec 
Log Message:
- leftover comment and license tag



Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- pam.spec	19 Aug 2009 19:06:40 -0000	1.202
+++ pam.spec	26 Aug 2009 18:43:27 -0000	1.203
@@ -6,8 +6,7 @@ Version: 1.1.0
 Release: 4%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
-# pam_rhosts_auth module is BSD with advertising
-License: BSD and GPLv2+ and BSD with advertising
+License: BSD and GPLv2+
 Group: System Environment/Base
 Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2
 Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign



From rdieter at fedoraproject.org  Wed Aug 26 18:53:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 18:53:36 +0000 (UTC)
Subject: rpms/koffice/F-10 koffice-1.6.3-dejavu_fonts.patch, 1.1,
	1.2 koffice.spec, 1.84, 1.85
Message-ID: <20090826185336.7D02911C02C2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18707

Modified Files:
	koffice-1.6.3-dejavu_fonts.patch koffice.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
- -kformula: Requires: lyx-cmex10-fonts


koffice-1.6.3-dejavu_fonts.patch:
 Makefile.am     |    2 +-
 contextstyle.cc |    2 +-
 fontstyle.cc    |    8 +++++++-
 symboltable.cc  |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

Index: koffice-1.6.3-dejavu_fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-10/koffice-1.6.3-dejavu_fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- koffice-1.6.3-dejavu_fonts.patch	28 Jul 2009 20:53:21 -0000	1.1
+++ koffice-1.6.3-dejavu_fonts.patch	26 Aug 2009 18:53:36 -0000	1.2
@@ -41,7 +41,7 @@ diff -up koffice-1.6.3/lib/kformula/font
                                   i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
 +*/
 +        KMessageBox::information(qApp->mainWidget(),
-+                                 i18n("Some symbol fonts for formulas was font to be missing")); 
++                                 i18n("Some symbol fonts for formulas are missing")); 
      }
      m_installed = true;
  }


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-10/koffice.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- koffice.spec	28 Jul 2009 23:56:20 -0000	1.84
+++ koffice.spec	26 Aug 2009 18:53:36 -0000	1.85
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
 Name:           koffice
 Epoch:          2
 Version:        1.6.3
-Release:        22.%{svn}svn%{?dist}
+Release:        24.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -126,8 +126,6 @@ KOffice is an integrated office suite.
 Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires:       perl
 Conflicts:      koffice-i18n < 4:%{version}
 %description core
@@ -234,9 +232,16 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-# for cmex10
-Requires:       mathml-fonts
-Requires:       dejavu-sans-fonts 
+#if 0%{?fedora} > 9 
+Requires:       lyx-cmex10-fonts
+#else
+#Requires:       mathml-fonts
+#endif
+%if 0%{?fedora} > 10
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts 
+%endif
 %description kformula
 %{summary}.
 
@@ -258,17 +263,24 @@ Requires:        %{name}-core = %{epoch}
 %prep
 %setup -q
 
-#patch1 -p0 -b .CVE-2007-3387
-#patch2 -p0 -b .CVE-2007-4352-5392-5393
-#patch3 -p1 -b .gcc43
+%if 0%{?svn:1}
+%patch100 -p1 -b .svn
+%patch101 -p1 -b .quint32
+%else
+%patch1 -p0 -b .CVE-2007-3387
+%patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
+%endif
 
 %patch4 -p1 -b .dejavu
+# use LGC variant instead
+sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
 
 %patch50 -p1 -b glibc_strrchr
 
-%patch100 -p1 -b .svn
-%patch101 -p1 -b .quint32
-
 # hack/fix for newer automake
 sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
 make -f admin/Makefile.common
@@ -350,58 +362,59 @@ rm -f %{buildroot}%{_libdir}/libkugar*.s
 %clean
 rm -rf %{buildroot}
 
-
 %post core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
 
 %postun core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kpresenter
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kpresenter 
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
+fi
+
+%posttrans core
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%post kword -p /sbin/ldconfig
+
+%postun kword -p /sbin/ldconfig
+
+%posttrans kword
+update-desktop-database -q &> /dev/null ||:
+
+%post kpresenter -p /sbin/ldconfig
+
+%postun kpresenter -p /sbin/ldconfig
+
+%posttrans kpresenter
+update-desktop-database -q &> /dev/null ||:
+
+%post kugar -p /sbin/ldconfig
+
+%postun kugar -p /sbin/ldconfig
+
+%posttrans kugar
+update-desktop-database -q &> /dev/null ||:
+
+%post kexi -p /sbin/ldconfig
+
+%postun kexi -p /sbin/ldconfig
+
+%posttrans kexi
+update-desktop-database -q &> /dev/null ||:
+
+%post kchart -p /sbin/ldconfig
+
+%postun kchart -p /sbin/ldconfig
+
+%posttrans kchart
+update-desktop-database -q &> /dev/null ||:
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -748,6 +761,13 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
+- -kformula: Requires: lyx-cmex10-fonts
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-23.20090306svn
+- -kformula: use dejavu-lgc-sans-fonts
+- optimize scriptlets
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
 - -kformula: omit bundled fonts
 - koffice kword crash with formulas (#514217)



From rdieter at fedoraproject.org  Wed Aug 26 18:55:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 18:55:27 +0000 (UTC)
Subject: rpms/koffice/EL-5 koffice-1.6.3-dejavu_fonts.patch, NONE,
	1.1 koffice-1.6.3-glibc_strrchr.patch, NONE,
	1.1 koffice-1.6.3-quint32.patch, NONE,
	1.1 koffice-20090306svn.patch, NONE, 1.1 koffice-svn_checkout.sh,
	NONE, 1.1 koffice.spec, 1.57, 1.58
Message-ID: <20090826185527.4764D11C02C2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18977

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-dejavu_fonts.patch 
	koffice-1.6.3-glibc_strrchr.patch koffice-1.6.3-quint32.patch 
	koffice-20090306svn.patch koffice-svn_checkout.sh 
Log Message:
sync w/devel branch for recent kformula fixes, and other goodness


koffice-1.6.3-dejavu_fonts.patch:
 Makefile.am     |    2 +-
 contextstyle.cc |    2 +-
 fontstyle.cc    |    8 +++++++-
 symboltable.cc  |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE koffice-1.6.3-dejavu_fonts.patch ---
diff -up koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu koffice-1.6.3/lib/kformula/contextstyle.cc
--- koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/contextstyle.cc	2009-07-28 15:29:06.420292073 -0500
@@ -106,7 +106,7 @@ void ContextStyle::readConfig( KConfig* 
     if ( ! FontStyle::missingFonts( init ).isEmpty() ) {
         kdWarning( DEBUGID) << "Not all basic fonts found\n";
     }
-    mathFont.fromString("Arev Sans");
+    mathFont.fromString("DejaVu Sans");
     bracketFont.fromString("cmex10");
 
 
diff -up koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu koffice-1.6.3/lib/kformula/fontstyle.cc
--- koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/fontstyle.cc	2009-07-28 15:35:51.457543630 -0500
@@ -102,7 +102,7 @@ QStringList FontStyle::missingFontsInter
     QStringList missing;
 
     testFont( missing, "cmex10" );
-    testFont( missing, "arev sans");
+    testFont( missing, "dejavu sans");
 
     return missing;
 }
@@ -111,9 +111,12 @@ void FontStyle::installFonts()
 {
     if (m_installed)
         return;
+
     QStringList missing = missingFontsInternal();
     if (!missing.isEmpty())
     {
+// don't install local copies of fonts -- Rex
+/*
         QStringList urlList;
         for (QStringList::iterator it = missing.begin(); it != missing.end(); ++it)
         {
@@ -135,6 +138,9 @@ void FontStyle::installFonts()
         KIO::copy(urlList, "fonts:/Personal/", false);
         KMessageBox::information(qApp->mainWidget(), 
                                  i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
+*/
+        KMessageBox::information(qApp->mainWidget(),
+                                 i18n("Some symbol fonts for formulas are missing")); 
     }
     m_installed = true;
 }
diff -up koffice-1.6.3/lib/kformula/Makefile.am.dejavu koffice-1.6.3/lib/kformula/Makefile.am
--- koffice-1.6.3/lib/kformula/Makefile.am.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/Makefile.am	2009-07-28 15:41:35.306393788 -0500
@@ -1,7 +1,7 @@
 
 INCLUDES= $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
 
-SUBDIRS = pics fonts dtd
+SUBDIRS = pics dtd
 
 ####### 
 # We have to name it kformulalib, not just kformula, since that's the name of the kdeinit module for kformula.
diff -up koffice-1.6.3/lib/kformula/symboltable.cc.dejavu koffice-1.6.3/lib/kformula/symboltable.cc
--- koffice-1.6.3/lib/kformula/symboltable.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/symboltable.cc	2009-07-28 15:29:06.421292200 -0500
@@ -101,7 +101,7 @@ QFont SymbolTable::font( QChar symbol, c
     if ( fm.inFont( symbol ) ) {
         return f;
     }
-    return QFont("Arev Sans");
+    return QFont("DejaVu Sans");
 }
 
 CharClass SymbolTable::charClass( QChar symbol ) const

koffice-1.6.3-glibc_strrchr.patch:
 gfile.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE koffice-1.6.3-glibc_strrchr.patch ---
diff -up koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc
--- koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc	2007-05-30 16:39:18.000000000 -0500
+++ koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc	2009-03-06 15:56:35.000000000 -0600
@@ -315,7 +315,7 @@ GString *grabPath(const char *fileName) 
 
 #else
   //---------- Unix ----------
-  char *p;
+  const char *p;
 
   if ((p = strrchr(fileName, '/')))
     return new GString(fileName, p - fileName);

koffice-1.6.3-quint32.patch:
 kis_tiff_converter.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE koffice-1.6.3-quint32.patch ---
diff -up koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32 koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc
--- koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32	2009-03-06 15:55:16.000000000 -0600
+++ koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc	2009-03-07 13:42:40.000000000 -0600
@@ -242,7 +242,7 @@ KisImageBuilder_Result KisTIFFConverter:
     // Read image profile
     kdDebug() << "Reading profile" << endl;
     KisProfile* profile = 0;
-    quint32 EmbedLen;
+    DWORD EmbedLen;
     LPBYTE EmbedBuffer;
 
     if (TIFFGetField(image, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) {

koffice-20090306svn.patch:
 koffice-1.6-branch/admin/Doxyfile.am                                                                   |    4 
 koffice-1.6-branch/admin/acinclude.m4.in                                                               |   39 
 koffice-1.6-branch/admin/cvs.sh                                                                        |    2 
 koffice-1.6-branch/admin/detect-autoconf.pl                                                            |  107 +
 koffice-1.6-branch/configure.in.in                                                                     |    4 
 koffice-1.6-branch/doc/Makefile.am                                                                     |    4 
 koffice-1.6-branch/doc/koffice.desktop                                                                 |    1 
 koffice-1.6-branch/doc/krita/dialogs-imagerestoration.png                                              |binary
 koffice-1.6-branch/doc/krita/tutorial-select-layer.docbook                                             |    6 
 koffice-1.6-branch/example/example.desktop                                                             |    6 
 koffice-1.6-branch/example/examplepart.desktop                                                         |    3 
 koffice-1.6-branch/example/x-vnd.kde.example.desktop                                                   |    1 
 koffice-1.6-branch/filters/generic_wrapper/generic_filter.desktop                                      |    9 
 koffice-1.6-branch/filters/karbon/ai/karbon_ai_import.desktop                                          |    6 
 koffice-1.6-branch/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop                  |    7 
 koffice-1.6-branch/filters/karbon/eps/karbon_eps_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/eps/karbon_eps_import.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/eps/karbon_ps_import.desktop                                         |    6 
 koffice-1.6-branch/filters/karbon/kontour/karbon_kontour_import.desktop                                |    8 
 koffice-1.6-branch/filters/karbon/msod/karbon_msod_import.desktop                                      |    7 
 koffice-1.6-branch/filters/karbon/oodraw/karbon_oodraw_import.desktop                                  |    7 
 koffice-1.6-branch/filters/karbon/png/karbon_png_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/svg/karbon_svg_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/svg/karbon_svg_import.desktop                                        |    7 
 koffice-1.6-branch/filters/karbon/wmf/karbon_wmf_export.desktop                                        |    7 
 koffice-1.6-branch/filters/karbon/wmf/karbon_wmf_import.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/xaml/karbon_xaml_export.desktop                                      |    8 
 koffice-1.6-branch/filters/karbon/xaml/karbon_xaml_import.desktop                                      |    8 
 koffice-1.6-branch/filters/karbon/xcf/karbon_xcf_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/xfig/karbon_xfig_import.desktop                                      |    7 
 koffice-1.6-branch/filters/kchart/bmp/kchart_bmp_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/jpeg/kchart_jpeg_export.desktop                                      |    8 
 koffice-1.6-branch/filters/kchart/mng/kchart_mng_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/png/kchart_png_export.desktop                                        |    9 
 koffice-1.6-branch/filters/kchart/svg/kchart_svg_export.desktop                                        |    9 
 koffice-1.6-branch/filters/kchart/xbm/kchart_xbm_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/xpm/kchart_xpm_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kformula/latex/kformula_latex_export.desktop                                |    7 
 koffice-1.6-branch/filters/kformula/mathml/kformula_mathml_export.desktop                              |    7 
 koffice-1.6-branch/filters/kformula/mathml/kformula_mathml_import.desktop                              |    7 
 koffice-1.6-branch/filters/kformula/png/kformula_png_export.desktop                                    |    7 
 koffice-1.6-branch/filters/kformula/svg/kformula_svg_export.desktop                                    |    8 
 koffice-1.6-branch/filters/kivio/imageexport/kivio_image_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/bmp/kpresenter_bmp_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop                              |    8 
 koffice-1.6-branch/filters/kpresenter/kword/kprkword.desktop                                           |    7 
 koffice-1.6-branch/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop                  |    7 
 koffice-1.6-branch/filters/kpresenter/mng/kpresenter_mng_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop                    |    6 
 koffice-1.6-branch/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop                    |    6 
 koffice-1.6-branch/filters/kpresenter/png/kpresenter_png_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop           |    7 
 koffice-1.6-branch/filters/kpresenter/svg/kpresenter_svg_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/xbm/kpresenter_xbm_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/xpm/kpresenter_xpm_export.desktop                                |    8 
 koffice-1.6-branch/filters/krita/gmagick/kis_image_magick_converter.cc                                 |   52 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick.desktop                                          |    7 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick_export.desktop                                   |   11 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick_import.desktop                                   |    9 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg.desktop                                               |    8 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg_export.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg_import.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/magick/Makefile.am                                                    |    2 
 koffice-1.6-branch/filters/krita/magick/kis_image_magick_converter.cc                                  |    2 
 koffice-1.6-branch/filters/krita/magick/krita_magick.desktop                                           |    7 
 koffice-1.6-branch/filters/krita/magick/krita_magick_export.desktop                                    |    9 
 koffice-1.6-branch/filters/krita/magick/krita_magick_import.desktop                                    |    9 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr.desktop                                         |    7 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr_export.desktop                                  |    8 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr_import.desktop                                  |    8 
 koffice-1.6-branch/filters/krita/pdf/krita_pdf.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/pdf/krita_pdf_import.desktop                                          |   11 
 koffice-1.6-branch/filters/krita/png/krita_png.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/png/krita_png_export.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/png/krita_png_import.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/raw/krita_raw.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/raw/krita_raw_import.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/tiff/kis_tiff_converter.cc                                            |    8 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff.desktop                                               |    7 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff_export.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff_import.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/xcf/krita_xcf_export.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/xcf/krita_xcf_import.desktop                                          |    8 
 koffice-1.6-branch/filters/kspread/applixspread/kspread_applixspread_import.desktop                    |    9 
 koffice-1.6-branch/filters/kspread/csv/kspread_csv_export.desktop                                      |    9 
 koffice-1.6-branch/filters/kspread/csv/kspread_csv_import.desktop                                      |    9 
 koffice-1.6-branch/filters/kspread/dbase/kspread_dbase_import.desktop                                  |   12 
 koffice-1.6-branch/filters/kspread/excel/import/kspread_excel_import.desktop                           |    9 
 koffice-1.6-branch/filters/kspread/excel/kspread_excel_export.desktop                                  |    9 
 koffice-1.6-branch/filters/kspread/gnumeric/gnumericimport.cc                                          |  118 -
 koffice-1.6-branch/filters/kspread/gnumeric/kspread_gnumeric_export.desktop                            |    9 
 koffice-1.6-branch/filters/kspread/gnumeric/kspread_gnumeric_import.desktop                            |    9 
 koffice-1.6-branch/filters/kspread/html/kspread_html_export.desktop                                    |    9 
 koffice-1.6-branch/filters/kspread/kexi/kspread_kexi_import.desktop                                    |   10 
 koffice-1.6-branch/filters/kspread/latex/export/kspread_latex_export.desktop                           |    9 
 koffice-1.6-branch/filters/kspread/opencalc/kspread_opencalc_export.desktop                            |   11 
 koffice-1.6-branch/filters/kspread/opencalc/kspread_opencalc_import.desktop                            |   11 
 koffice-1.6-branch/filters/kspread/qpro/kspread_qpro_import.desktop                                    |    9 
 koffice-1.6-branch/filters/kugar/kugarnop/kugar_kugar_import.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/abiword/kword_abiword_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/abiword/kword_abiword_import.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/amipro/kword_amipro_export.desktop                                    |    7 
 koffice-1.6-branch/filters/kword/amipro/kword_amipro_import.desktop                                    |    7 
 koffice-1.6-branch/filters/kword/applixword/kword_applixword_import.desktop                            |    7 
 koffice-1.6-branch/filters/kword/ascii/kword_ascii_export.desktop                                      |    9 
 koffice-1.6-branch/filters/kword/ascii/kword_ascii_import.desktop                                      |    7 
 koffice-1.6-branch/filters/kword/docbook/kword_docbook_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/hancomword/kword_hancomword_import.desktop                            |    8 
 koffice-1.6-branch/filters/kword/html/export/kword_html_export.desktop                                 |    7 
 koffice-1.6-branch/filters/kword/html/import/kword_html_import.desktop                                 |    7 
 koffice-1.6-branch/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop                       |    7 
 koffice-1.6-branch/filters/kword/kword1.3/import/uninstall.desktop                                     |    1 
 koffice-1.6-branch/filters/kword/latex/export/kword_latex_export.desktop                               |    7 
 koffice-1.6-branch/filters/kword/latex/import/kword_latex_import.desktop                               |   11 
 koffice-1.6-branch/filters/kword/msword/kword_msword_import.desktop                                    |    9 
 koffice-1.6-branch/filters/kword/mswrite/IMPERFECT                                                     |    2 
 koffice-1.6-branch/filters/kword/mswrite/ROADMAP                                                       |    5 
 koffice-1.6-branch/filters/kword/mswrite/config.libmswrite.h                                           |   35 
 koffice-1.6-branch/filters/kword/mswrite/kword_mswrite_export.desktop                                  |    9 
 koffice-1.6-branch/filters/kword/mswrite/kword_mswrite_import.desktop                                  |    9 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite.cpp                                                |   90 +
 koffice-1.6-branch/filters/kword/mswrite/libmswrite.h                                                  |   44 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite_defs.cpp                                           |   37 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite_defs.h                                             |   99 -
 koffice-1.6-branch/filters/kword/mswrite/list.h                                                        |   45 
 koffice-1.6-branch/filters/kword/mswrite/mswriteexport.cc                                              |   36 
 koffice-1.6-branch/filters/kword/mswrite/mswriteexport.h                                               |   32 
 koffice-1.6-branch/filters/kword/mswrite/mswriteimport.cc                                              |   36 
 koffice-1.6-branch/filters/kword/mswrite/mswriteimport.h                                               |   32 
 koffice-1.6-branch/filters/kword/mswrite/status.html                                                   |   25 
 koffice-1.6-branch/filters/kword/mswrite/structures.cpp                                                |  149 +-
 koffice-1.6-branch/filters/kword/mswrite/structures.h                                                  |   61 
 koffice-1.6-branch/filters/kword/mswrite/structures_generated.cpp                                      |   89 -
 koffice-1.6-branch/filters/kword/mswrite/structures_generated.h                                        |  100 -
 koffice-1.6-branch/filters/kword/mswrite/structures_private.cpp                                        |   47 
 koffice-1.6-branch/filters/kword/mswrite/structures_private.h                                          |   45 
 koffice-1.6-branch/filters/kword/oowriter/kword_oowriter_export.desktop                                |    7 
 koffice-1.6-branch/filters/kword/oowriter/kword_oowriter_import.desktop                                |    7 
 koffice-1.6-branch/filters/kword/palmdoc/kword_palmdoc_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/palmdoc/kword_palmdoc_import.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/pdf/kword_pdf_import.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/pdf/pdfimport.cpp                                                     |   11 
 koffice-1.6-branch/filters/kword/pdf/xpdf/goo/gmem.c                                                   |   19 
 koffice-1.6-branch/filters/kword/pdf/xpdf/goo/gmem.h                                                   |    1 
 koffice-1.6-branch/filters/kword/pdf/xpdf/xpdf/Stream.cc                                               |  634 +++++++++-
 koffice-1.6-branch/filters/kword/pdf/xpdf/xpdf/Stream.h                                                |   12 
 koffice-1.6-branch/filters/kword/rtf/export/kword_rtf_export.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/rtf/import/kword_rtf_import.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/starwriter/kword_starwriter_import.desktop                            |    7 
 koffice-1.6-branch/filters/kword/wml/kword_wml_export.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/wml/kword_wml_import.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/wordperfect/export/kword_wp_export.desktop                            |    7 
 koffice-1.6-branch/filters/kword/wordperfect/import/TableStyle.cxx                                     |    2 
 koffice-1.6-branch/filters/kword/wordperfect/import/TextRunStyle.cxx                                   |    2 
 koffice-1.6-branch/filters/kword/wordperfect/import/kword_wp_import.desktop                            |    7 
 koffice-1.6-branch/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop                     |    8 
 koffice-1.6-branch/filters/xsltfilter/export/xslt_export.desktop                                       |    9 
 koffice-1.6-branch/filters/xsltfilter/import/xslt_import.desktop                                       |    9 
 koffice-1.6-branch/karbon/data/karbon.desktop                                                          |   11 
 koffice-1.6-branch/karbon/data/karbon_module.desktop                                                   |    5 
 koffice-1.6-branch/karbon/data/karbonpart.desktop                                                      |   16 
 koffice-1.6-branch/karbon/plugins/imagetool/karbonimagetool.desktop                                    |    7 
 koffice-1.6-branch/karbon/plugins/zoomtool/karbonzoomtool.desktop                                      |    8 
 koffice-1.6-branch/karbon/templates/basic/.directory                                                   |    6 
 koffice-1.6-branch/karbon/templates/basic/empty.desktop                                                |   14 
 koffice-1.6-branch/karbon/tools/karbondefaulttools.desktop                                             |    7 
 koffice-1.6-branch/kchart/kchart.desktop                                                               |   15 
 koffice-1.6-branch/kchart/kchartpart.desktop                                                           |   12 
 koffice-1.6-branch/kchart/templates/.directory                                                         |    7 
 koffice-1.6-branch/kchart/templates/BarChart.desktop                                                   |   14 
 koffice-1.6-branch/kchart/templates/Empty.desktop                                                      |    5 
 koffice-1.6-branch/kdgantt/KDGanttView.cpp                                                             |   35 
 koffice-1.6-branch/kdgantt/KDGanttView.h                                                               |   24 
 koffice-1.6-branch/kdgantt/KDGanttViewItem.cpp                                                         |   26 
 koffice-1.6-branch/kdgantt/KDGanttViewItem.h                                                           |   13 
 koffice-1.6-branch/kdgantt/KDGanttViewSubwidgets.cpp                                                   |  280 +++-
 koffice-1.6-branch/kdgantt/KDGanttViewSubwidgets.h                                                     |   59 
 koffice-1.6-branch/kdgantt/KDGanttViewTaskItem.h                                                       |    6 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/alter.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/analyze.c                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/attach.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/auth.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/btree.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/btree.h                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/build.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/callback.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/complete.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/date.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/delete.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/expr.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/func.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/hash.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/hash.h                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/insert.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/legacy.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/main.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pager.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pager.h                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/patches/kexisql-3.2.8.patch                              |  469 ++++++-
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/patches/mk_patch.sh                                      |    3 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pragma.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/prepare.c                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/random.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/select.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/shell.c                                                  |    3 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/sqlite3.h                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/sqliteInt.h                                              |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/tclsqlite.c                                              |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/tokenize.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/update.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/utf.c                                                    |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/util.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vacuum.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vdbe.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vdbe.h                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/where.c                                                  |    1 
 koffice-1.6-branch/kexi/Makefile.global                                                                |    2 
 koffice-1.6-branch/kexi/core/kexidbconnectionset.cpp                                                   |    2 
 koffice-1.6-branch/kexi/data/kde34compat/x-sqlite2.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/kde34compat/x-sqlite3.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/kexihandler.desktop                                                       |    3 
 koffice-1.6-branch/kexi/data/x-kexi-connectiondata.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/x-kexiproject-shortcut.desktop                                            |    6 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite.desktop                                              |    5 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite2.desktop                                             |    5 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite3.desktop                                             |    5 
 koffice-1.6-branch/kexi/doc/dev/CHANGELOG-Kexi-js                                                      |   83 +
 koffice-1.6-branch/kexi/doc/dev/TODO-Kexi-js                                                           |    4 
 koffice-1.6-branch/kexi/formeditor/factories/kformdesigner_containers.desktop                          |    3 
 koffice-1.6-branch/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop                          |    6 
 koffice-1.6-branch/kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop                     |    9 
 koffice-1.6-branch/kexi/formeditor/test/kformdesigner.desktop                                          |    5 
 koffice-1.6-branch/kexi/formeditor/test/kformdesigner_part.desktop                                     |    5 
 koffice-1.6-branch/kexi/formeditor/widgetfactory.desktop                                               |    2 
 koffice-1.6-branch/kexi/formeditor/widgetlibrary.cpp                                                   |    2 
 koffice-1.6-branch/kexi/kexi.desktop                                                                   |   13 
 koffice-1.6-branch/kexi/kexidb/alter.cpp                                                               |    2 
 koffice-1.6-branch/kexi/kexidb/connection.cpp                                                          |   10 
 koffice-1.6-branch/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop                                |    1 
 koffice-1.6-branch/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop                                  |    3 
 koffice-1.6-branch/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop                               |    1 
 koffice-1.6-branch/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp                                             |    9 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop                             |    2 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp                                     |    3 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp                                         |    8 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop                            |    2 
 koffice-1.6-branch/kexi/kexidb/expression.cpp                                                          |    8 
 koffice-1.6-branch/kexi/kexidb/field.cpp                                                               |    4 
 koffice-1.6-branch/kexi/kexidb/field.h                                                                 |    2 
 koffice-1.6-branch/kexi/kexidb/fieldlist.cpp                                                           |    2 
 koffice-1.6-branch/kexi/kexidb/fieldvalidator.cpp                                                      |    2 
 koffice-1.6-branch/kexi/kexidb/kexidb_driver.desktop                                                   |   11 
 koffice-1.6-branch/kexi/kexidb/queryschema.cpp                                                         |    7 
 koffice-1.6-branch/kexi/kexidb/queryschema.h                                                           |    3 
 koffice-1.6-branch/kexi/kexidb/relationship.cpp                                                        |    6 
 koffice-1.6-branch/kexi/kexidb/tableschema.cpp                                                         |    2 
 koffice-1.6-branch/kexi/kexiutils/utils.cpp                                                            |    3 
 koffice-1.6-branch/kexi/main/keximainwindowimpl.cpp                                                    |    9 
 koffice-1.6-branch/kexi/main/printing/kexisimpleprintingengine.cpp                                     |  236 +++
 koffice-1.6-branch/kexi/main/printing/kexisimpleprintingengine.h                                       |   39 
 koffice-1.6-branch/kexi/migration/keximigrate.cpp                                                      |    3 
 koffice-1.6-branch/kexi/migration/keximigration_driver.desktop                                         |    6 
 koffice-1.6-branch/kexi/migration/mysql/keximigrate_mysql.desktop                                      |    6 
 koffice-1.6-branch/kexi/migration/mysql/mysqlmigrate.cpp                                               |    5 
 koffice-1.6-branch/kexi/migration/pqxx/keximigrate_pqxx.desktop                                        |    6 
 koffice-1.6-branch/kexi/migration/pqxx/pqxxmigrate.cpp                                                 |    8 
 koffice-1.6-branch/kexi/plugins/forms/kexidataprovider.cpp                                             |    4 
 koffice-1.6-branch/kexi/plugins/forms/kexiformhandler.desktop                                          |   12 
 koffice-1.6-branch/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop                              |    6 
 koffice-1.6-branch/kexi/plugins/forms/widgets/kexidblabel.cpp                                          |    2 
 koffice-1.6-branch/kexi/plugins/forms/widgets/kexiframe.cpp                                            |    2 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop                   |   13 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvexport.cpp                                     |    2 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp                               |  168 +-
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportdialog.h                                 |   15 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp                           |   97 +
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h                             |   17 
 koffice-1.6-branch/kexi/plugins/macros/kexipart/keximacrohandler.desktop                               |   13 
 koffice-1.6-branch/kexi/plugins/migration/keximigrationhandler.desktop                                 |   23 
 koffice-1.6-branch/kexi/plugins/queries/kexiquerydesignerguieditor.cpp                                 |    9 
 koffice-1.6-branch/kexi/plugins/queries/kexiqueryhandler.desktop                                       |   11 
 koffice-1.6-branch/kexi/plugins/relations/kexirelationhandler.desktop                                  |   11 
 koffice-1.6-branch/kexi/plugins/reports/kexireporthandler.desktop                                      |   13 
 koffice-1.6-branch/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop                        |    6 
 koffice-1.6-branch/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop                      |   13 
 koffice-1.6-branch/kexi/plugins/tables/kexitabledesignerview.cpp                                       |    2 
 koffice-1.6-branch/kexi/plugins/tables/kexitablehandler.desktop                                        |   13 
 koffice-1.6-branch/kexi/widget/relations/kexirelationviewconnection.cpp                                |    2 
 koffice-1.6-branch/kexi/widget/tableview/kexidataawarepropertyset.cpp                                  |    2 
 koffice-1.6-branch/kexi/widget/tableview/kexitableviewdata.cpp                                         |    2 
 koffice-1.6-branch/kexi/widget/utils/kexicomboboxdropdownbutton.cpp                                    |    1 
 koffice-1.6-branch/kexi/widget/utils/kexisharedactionclient.cpp                                        |    2 
 koffice-1.6-branch/kformula/kformula.desktop                                                           |    7 
 koffice-1.6-branch/kformula/kformulapart.desktop                                                       |   13 
 koffice-1.6-branch/kivio/kiviopart/kivio.desktop                                                       |    6 
 koffice-1.6-branch/kivio/kiviopart/kiviopart.desktop                                                   |   11 
 koffice-1.6-branch/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop                         |    2 
 koffice-1.6-branch/kivio/plugins/kivioselecttool/kivioselecttool.desktop                               |    2 
 koffice-1.6-branch/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop                           |    3 
 koffice-1.6-branch/kivio/plugins/kiviotargettool/kiviotargettool.desktop                               |    3 
 koffice-1.6-branch/kivio/plugins/kiviotexttool/kiviotexttool.desktop                                   |    5 
 koffice-1.6-branch/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop                                   |    5 
 koffice-1.6-branch/kivio/templates/basic/.directory                                                    |    6 
 koffice-1.6-branch/kivio/templates/basic/basicflow.desktop                                             |    3 
 koffice-1.6-branch/kivio/templates/basic/empty.desktop                                                 |   10 
 koffice-1.6-branch/koshell/koshell.desktop                                                             |   11 
 koffice-1.6-branch/kounavail/kounavail.desktop                                                         |    7 
 koffice-1.6-branch/kplato/kplato.desktop                                                               |   11 
 koffice-1.6-branch/kplato/kplatopart.desktop                                                           |   15 
 koffice-1.6-branch/kplato/reports/resourcelist.desktop                                                 |    7 
 koffice-1.6-branch/kplato/reports/tasklist.desktop                                                     |    8 
 koffice-1.6-branch/kplato/templates/Simple/.directory                                                  |    5 
 koffice-1.6-branch/kplato/templates/Simple/8HourDay-40HourWeek.desktop                                 |    7 
 koffice-1.6-branch/kplato/templates/Simple/Plain.desktop                                               |    7 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/.directory                                              |   20 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowDown.desktop                                       |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeft.desktop                                       |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeftDown.desktop                                   |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeftUp.desktop                                     |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRight.desktop                                      |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRightDown.desktop                                  |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRightUp.desktop                                    |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowUp.desktop                                         |    6 
 koffice-1.6-branch/kpresenter/autoforms/Connections/.directory                                         |   20 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection1.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection10.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection11.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection12.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection2.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection3.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection4.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection5.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection6.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection7.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection8.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection9.desktop                                |    5 
 koffice-1.6-branch/kpresenter/kpresenter.desktop                                                       |    7 
 koffice-1.6-branch/kpresenter/kpresenterpart.desktop                                                   |    7 
 koffice-1.6-branch/kpresenter/templates/Screen/.directory                                              |    5 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/.directory                                 |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop                   |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop                  |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop                   |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/CopperPlain.desktop                        |    3 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/GradientBlueRed.desktop                    |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/SnowyMountains.desktop                     |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop                  |    7 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/classroom.desktop                          |   12 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde.desktop                                |    5 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde2.desktop                               |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde3.desktop                               |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/savannah.desktop                           |    9 
 koffice-1.6-branch/kpresenter/templates/common_desktop/OneColumnLandscape.desktop                      |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/OneColumnPortrait.desktop                       |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TitleLandscape.desktop                          |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TitlePortrait.desktop                           |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop                      |   10 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop                       |   10 
 koffice-1.6-branch/kpresenter/templates/common_desktop/emptyLandscape.desktop                          |   13 
 koffice-1.6-branch/kpresenter/templates/common_desktop/emptyPortrait.desktop                           |    9 
 koffice-1.6-branch/kpresenter/templates/letter/.directory                                              |    5 
 koffice-1.6-branch/krita/colorspaces/cmyk_u16/krita_cmyk_u16_plugin.desktop                            |   12 
 koffice-1.6-branch/krita/colorspaces/cmyk_u8/kritacmykplugin.desktop                                   |    9 
 koffice-1.6-branch/krita/colorspaces/cmyk_u8/templates/white_2000x800.desktop                          |   12 
 koffice-1.6-branch/krita/colorspaces/gray_u16/krita_gray_u16_plugin.desktop                            |   10 
 koffice-1.6-branch/krita/colorspaces/gray_u8/kritagrayplugin.desktop                                   |    8 
 koffice-1.6-branch/krita/colorspaces/gray_u8/templates/.directory                                      |    7 
 koffice-1.6-branch/krita/colorspaces/gray_u8/templates/white_640x480.desktop                           |   11 
 koffice-1.6-branch/krita/colorspaces/lms_f32/krita_lms_f32_plugin.desktop                              |    9 
 koffice-1.6-branch/krita/colorspaces/rgb_f16half/krita_rgb_f16half_plugin.desktop                      |    7 
 koffice-1.6-branch/krita/colorspaces/rgb_f32/krita_rgb_f32_plugin.desktop                              |    7 
 koffice-1.6-branch/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc                                 |    4 
 koffice-1.6-branch/krita/colorspaces/rgb_u16/krita_rgb_u16_plugin.desktop                              |    8 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc                                      |    4 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/kritargbplugin.desktop                                     |    8 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1024x768.desktop                     |   12 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1280x1024.desktop                    |   13 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1600x1200.desktop                    |   11 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_640x480.desktop                      |   13 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1024x768.desktop                           |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1280x1024.desktop                          |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1600x1200.desktop                          |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_640x480.desktop                            |   15 
 koffice-1.6-branch/krita/colorspaces/wet/kritawetplugin.desktop                                        |   10 
 koffice-1.6-branch/krita/colorspaces/wetsticky/brushop/kritawsbrushpaintop.desktop                     |    5 
 koffice-1.6-branch/krita/colorspaces/wetsticky/kritawsplugin.desktop                                   |    3 
 koffice-1.6-branch/krita/colorspaces/ycbcr_u16/krita_ycbcr_u16_plugin.desktop                          |    8 
 koffice-1.6-branch/krita/colorspaces/ycbcr_u8/krita_ycbcr_u8_plugin.desktop                            |    8 
 koffice-1.6-branch/krita/core/kis_paint_layer.cc                                                       |    4 
 koffice-1.6-branch/krita/core/kis_perspective_math.cpp                                                 |   22 
 koffice-1.6-branch/krita/data/brushes/Makefile.am                                                      |    2 
 koffice-1.6-branch/krita/data/krita_filter.desktop                                                     |   12 
 koffice-1.6-branch/krita/data/krita_paintop.desktop                                                    |    9 
 koffice-1.6-branch/krita/data/krita_plugin.desktop                                                     |    5 
 koffice-1.6-branch/krita/data/krita_tool.desktop                                                       |   14 
 koffice-1.6-branch/krita/data/palettes/Makefile.am                                                     |    2 
 koffice-1.6-branch/krita/data/templates/.directory                                                     |    6 
 koffice-1.6-branch/krita/krita.desktop                                                                 |   14 
 koffice-1.6-branch/krita/kritacolor/kis_abstract_colorspace.cc                                         |    4 
 koffice-1.6-branch/krita/kritacolor/krita_colorspace.desktop                                           |    2 
 koffice-1.6-branch/krita/kritapart.desktop                                                             |   12 
 koffice-1.6-branch/krita/plugins/filters/blur/kritablurfilter.desktop                                  |    2 
 koffice-1.6-branch/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop                            |    3 
 koffice-1.6-branch/krita/plugins/filters/cimg/kritacimg.desktop                                        |    3 
 koffice-1.6-branch/krita/plugins/filters/colorify/kritacolorifyfilter.desktop                          |    7 
 koffice-1.6-branch/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop                    |    7 
 koffice-1.6-branch/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop                       |   15 
 koffice-1.6-branch/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop            |    9 
 koffice-1.6-branch/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop                        |   15 
 koffice-1.6-branch/krita/plugins/filters/embossfilter/kritaembossfilter.desktop                        |    5 
 koffice-1.6-branch/krita/plugins/filters/example/kritaexample.desktop                                  |   12 
 koffice-1.6-branch/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop              |   10 
 koffice-1.6-branch/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop                |   15 
 koffice-1.6-branch/krita/plugins/filters/lenscorrectionfilter/kritalenscorrectionfilter.desktop        |    7 
 koffice-1.6-branch/krita/plugins/filters/levelfilter/kritalevelfilter.desktop                          |    9 
 koffice-1.6-branch/krita/plugins/filters/noisefilter/kritanoisefilter.desktop                          |   13 
 koffice-1.6-branch/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop                    |    5 
 koffice-1.6-branch/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop                    |   11 
 koffice-1.6-branch/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop                  |   13 
 koffice-1.6-branch/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop                |    3 
 koffice-1.6-branch/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc                      |    5 
 koffice-1.6-branch/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop                  |    3 
 koffice-1.6-branch/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop                |    2 
 koffice-1.6-branch/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop                          |    3 
 koffice-1.6-branch/krita/plugins/filters/threadtest/kritathreadtest.desktop                            |    2 
 koffice-1.6-branch/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop                            |    6 
 koffice-1.6-branch/krita/plugins/filters/wavefilter/kritawavefilter.desktop                            |    8 
 koffice-1.6-branch/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc                              |   15 
 koffice-1.6-branch/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop                 |   11 
 koffice-1.6-branch/krita/plugins/tools/defaulttools/kritadefaulttools.desktop                          |    7 
 koffice-1.6-branch/krita/plugins/tools/selectiontools/kritaselectiontools.desktop                      |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_crop/kritatoolcrop.desktop                                 |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_curves/kritatoolcurves.desktop                             |    4 
 koffice-1.6-branch/krita/plugins/tools/tool_filter/kritatoolfilter.desktop                             |    8 
 koffice-1.6-branch/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop           |    3 
 koffice-1.6-branch/krita/plugins/tools/tool_perspectivetransform/kritatoolperspectivetransform.desktop |    3 
 koffice-1.6-branch/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop                           |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop                         |    6 
 koffice-1.6-branch/krita/plugins/tools/tool_selectsimilar/kritatoolselectsimilar.desktop               |    4 
 koffice-1.6-branch/krita/plugins/tools/tool_star/kritatoolstar.desktop                                 |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_transform/kritatooltransform.desktop                       |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/colorrange/kritacolorrange.desktop                        |    4 
 koffice-1.6-branch/krita/plugins/viewplugins/colorspaceconversion/kritacolorspaceconversion.desktop    |    4 
 koffice-1.6-branch/krita/plugins/viewplugins/dropshadow/kritadropshadow.desktop                        |    8 
 koffice-1.6-branch/krita/plugins/viewplugins/filtersgallery/kritafiltersgallery.desktop                |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/histogram/kritahistogram.desktop                          |   14 
 koffice-1.6-branch/krita/plugins/viewplugins/histogram_docker/kritahistogramdocker.desktop             |    6 
 koffice-1.6-branch/krita/plugins/viewplugins/history_docker/kritahistorydocker.desktop                 |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/imagesize/kritaimagesize.desktop                          |    9 
 koffice-1.6-branch/krita/plugins/viewplugins/modify_selection/kritamodifyselection.desktop             |    3 
 koffice-1.6-branch/krita/plugins/viewplugins/performancetest/kritaperftest.desktop                     |    5 
 koffice-1.6-branch/krita/plugins/viewplugins/rotateimage/kritarotateimage.desktop                      |   11 
 koffice-1.6-branch/krita/plugins/viewplugins/screenshot/kritascreenshot.desktop                        |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/scripting/kritascripting.desktop                          |   17 
 koffice-1.6-branch/krita/plugins/viewplugins/selectopaque/kritaselectopaque.desktop                    |    2 
 koffice-1.6-branch/krita/plugins/viewplugins/separate_channels/kritaseparatechannels.desktop           |   12 
 koffice-1.6-branch/krita/plugins/viewplugins/shearimage/kritashearimage.desktop                        |    8 
 koffice-1.6-branch/krita/plugins/viewplugins/substrate/kritasubstrate.desktop                          |    2 
 koffice-1.6-branch/krita/plugins/viewplugins/variations/kritavariations.desktop                        |   12 
 koffice-1.6-branch/krita/ui/squeezedcombobox.cpp                                                       |    3 
 koffice-1.6-branch/kspread/Makefile.am                                                                 |    2 
 koffice-1.6-branch/kspread/digest.cc                                                                   |    2 
 koffice-1.6-branch/kspread/digest.h                                                                    |    2 
 koffice-1.6-branch/kspread/kspread.desktop                                                             |   11 
 koffice-1.6-branch/kspread/kspreadpart.desktop                                                         |   15 
 koffice-1.6-branch/kspread/plugins/calculator/uninstall.desktop                                        |    1 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadcore/krs_cell.cpp                                  |    9 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadcore/krs_cell.h                                    |    7 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadscripting.desktop                                  |   17 
 koffice-1.6-branch/kspread/templates/Business/.directory                                               |    4 
 koffice-1.6-branch/kspread/templates/Business/BalanceSheet.desktop                                     |    7 
 koffice-1.6-branch/kspread/templates/Business/ExpenseReport.desktop                                    |    5 
 koffice-1.6-branch/kspread/templates/Business/Invoice.desktop                                          |    2 
 koffice-1.6-branch/kspread/templates/Business/PackingSlip.desktop                                      |    7 
 koffice-1.6-branch/kspread/templates/Business/PriceQuotation.desktop                                   |    2 
 koffice-1.6-branch/kspread/templates/General/.directory                                                |    7 
 koffice-1.6-branch/kspread/templates/General/StudentIDCard.desktop                                     |    5 
 koffice-1.6-branch/kspread/templates/General/Worksheet.desktop                                         |    5 
 koffice-1.6-branch/kspread/templates/HomeFamily/.directory                                             |    9 
 koffice-1.6-branch/kspread/templates/HomeFamily/BMI.desktop                                            |    5 
 koffice-1.6-branch/kspread/templates/HomeFamily/CreditCardTracker.desktop                              |    3 
 koffice-1.6-branch/kspread/templates/HomeFamily/MenuPlan.desktop                                       |    9 
 koffice-1.6-branch/kspread/templates/HomeFamily/VacationChecklist.desktop                              |    6 
 koffice-1.6-branch/kugar/kudesigner/kudesigner.desktop                                                 |   17 
 koffice-1.6-branch/kugar/kudesigner/templates/General/.directory                                       |    7 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A0.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A1.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A2.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A3.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A4.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A5.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A6.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A7.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A8.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A9.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B0.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B1.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B10.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B2.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B3.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B4.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B5.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B6.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B7.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B8.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B9.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/C5E.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Comm10E.desktop                                  |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/DLE.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Executive.desktop                                |    3 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Folio.desktop                                    |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Ledger.desktop                                   |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Legal.desktop                                    |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Letter.desktop                                   |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/NPageSize.desktop                                |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Tabloid.desktop                                  |    1 
 koffice-1.6-branch/kugar/part/kugar.desktop                                                            |    6 
 koffice-1.6-branch/kugar/part/kugarpart.desktop                                                        |   10 
 koffice-1.6-branch/kword/KWAnchor.cpp                                                                  |    4 
 koffice-1.6-branch/kword/KWDocument.cpp                                                                |   20 
 koffice-1.6-branch/kword/kwmailmerge.desktop                                                           |    6 
 koffice-1.6-branch/kword/kword.desktop                                                                 |    7 
 koffice-1.6-branch/kword/kwordpart.desktop                                                             |   14 
 koffice-1.6-branch/kword/mailmerge/kabc/kwmailmerge_kabc.desktop                                       |   11 
 koffice-1.6-branch/kword/mailmerge/kspread/kwmailmerge_kspread.desktop                                 |   13 
 koffice-1.6-branch/kword/mailmerge/kwserialletter_classic.desktop                                      |    8 
 koffice-1.6-branch/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop                                  |   11 
 koffice-1.6-branch/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop                            |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/.directory                                           |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/BusinessCards10.desktop                              |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/LabelsL16.desktop                                    |    5 
 koffice-1.6-branch/kword/templates/Envelopes/.directory                                                |    7 
 koffice-1.6-branch/kword/templates/Envelopes/EnvelopeC6.desktop                                        |    7 
 koffice-1.6-branch/kword/templates/Envelopes/EnvelopeDL.desktop                                        |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/.directory                                           |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/A4.desktop                                           |   17 
 koffice-1.6-branch/kword/templates/Wordprocessing/ColorfulA4.desktop                                   |   10 
 koffice-1.6-branch/kword/templates/Wordprocessing/ColorfulLetter.desktop                               |   10 
 koffice-1.6-branch/kword/templates/Wordprocessing/FaxA4.desktop                                        |    8 
 koffice-1.6-branch/kword/templates/Wordprocessing/FaxLetter.desktop                                    |    8 
 koffice-1.6-branch/kword/templates/Wordprocessing/Letter.desktop                                       |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/Memo.desktop                                         |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/ProfessionalA4.desktop                               |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/ProfessionalLetter.desktop                           |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/TwoColumns.desktop                                   |   15 
 koffice-1.6-branch/kword/templates/Wordprocessing/TwoColumnsLetter.desktop                             |   15 
 koffice-1.6-branch/lib/kofficecore/kodocinfopropspage.desktop                                          |    5 
 koffice-1.6-branch/lib/kotext/KoTextDocument.cpp                                                       |   10 
 koffice-1.6-branch/lib/kotext/KoTextObject.cpp                                                         |    5 
 koffice-1.6-branch/lib/kross/python/cxx/Objects.hxx                                                    |    9 
 koffice-1.6-branch/lib/kross/python/pythonconfig.h                                                     |    9 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.chart.desktop                                |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.formula.desktop                              |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop                    |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop                             |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.image.desktop                                |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop                |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop                         |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop                 |    8 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop                          |    8 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop                        |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.text.desktop                                 |    6 
 koffice-1.6-branch/mimetypes/kde351/x-raw.desktop                                                      |    4 
 koffice-1.6-branch/servicetypes/kochart.desktop                                                        |    1 
 koffice-1.6-branch/servicetypes/kofficepart.desktop                                                    |    7 
 koffice-1.6-branch/servicetypes/kofilter.desktop                                                       |    7 
 koffice-1.6-branch/servicetypes/kofilterwrapper.desktop                                                |    3 
 koffice-1.6-branch/servicetypes/koplugin.desktop                                                       |    9 
 koffice-1.6-branch/templates/Illustration.desktop                                                      |   15 
 koffice-1.6-branch/templates/Presentation.desktop                                                      |   18 
 koffice-1.6-branch/templates/SpreadSheet.desktop                                                       |   21 
 koffice-1.6-branch/templates/TextDocument.desktop                                                      |   20 
 koffice-1.6-branch/tools/kfile-plugins/abiword/kfile_abiword.desktop                                   |    8 
 koffice-1.6-branch/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop                                 |   10 
 koffice-1.6-branch/tools/kfile-plugins/koffice/kfile_koffice.desktop                                   |    8 
 koffice-1.6-branch/tools/kfile-plugins/ooo/kfile_ooo.desktop                                           |    7 
 koffice-1.6-branch/tools/kthesaurus/KThesaurus.desktop                                                 |   10 
 koffice-1.6-branch/tools/quickprint/karbon_konqi.desktop                                               |   10 
 koffice-1.6-branch/tools/quickprint/kchart_konqi.desktop                                               |   10 
 koffice-1.6-branch/tools/quickprint/kexi_konqi.desktop                                                 |   10 
 koffice-1.6-branch/tools/quickprint/kformula_konqi.desktop                                             |   10 
 koffice-1.6-branch/tools/quickprint/kivio_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/quickprint/kpresenter_konqi.desktop                                           |   10 
 koffice-1.6-branch/tools/quickprint/krita_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/quickprint/kspread_konqi.desktop                                              |   10 
 koffice-1.6-branch/tools/quickprint/kword_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/spell/kspelltool.desktop                                                      |   10 
 koffice-1.6-branch/tools/spell/uninstall.desktop                                                       |    1 
 koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop                                               |   18 
 koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop                                            |    4 
 koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop                                            |    7 
 koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop                                        |    7 
 koffice-1.6.3//Makefile.am                                                                             |only
 koffice-1.6.3//Makefile.in                                                                             |only
 koffice-1.6.3//acinclude.m4                                                                            |only
 koffice-1.6.3//aclocal.m4                                                                              |only
 koffice-1.6.3//config.h.in                                                                             |only
 koffice-1.6.3//configure                                                                               |only
 koffice-1.6.3//configure.files                                                                         |only
 koffice-1.6.3//configure.in                                                                            |only
 koffice-1.6.3//stamp-h.in                                                                              |only
 koffice-1.6.3//subdirs                                                                                 |only
 koffice-1.6.3/autocorrect/Makefile.in                                                                  |only
 koffice-1.6.3/doc/Makefile.in                                                                          |only
 koffice-1.6.3/doc/karbon/Makefile.in                                                                   |only
 koffice-1.6.3/doc/karbon/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kchart/Makefile.in                                                                   |only
 koffice-1.6.3/doc/kchart/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kexi/Makefile.in                                                                     |only
 koffice-1.6.3/doc/kexi/index.cache.bz2                                                                 |only
 koffice-1.6.3/doc/kformula/Makefile.in                                                                 |only
 koffice-1.6.3/doc/kformula/index.cache.bz2                                                             |only
 koffice-1.6.3/doc/kivio/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kivio/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/koffice/Makefile.in                                                                  |only
 koffice-1.6.3/doc/koffice/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/koshell/Makefile.in                                                                  |only
 koffice-1.6.3/doc/koshell/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/kplato/Makefile.in                                                                   |only
 koffice-1.6.3/doc/kplato/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kpresenter/Makefile.in                                                               |only
 koffice-1.6.3/doc/kpresenter/index.cache.bz2                                                           |only
 koffice-1.6.3/doc/krita/Makefile.in                                                                    |only
 koffice-1.6.3/doc/krita/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/kspread/Makefile.in                                                                  |only
 koffice-1.6.3/doc/kspread/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/kugar/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kugar/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/kword/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kword/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/thesaurus/Makefile.in                                                                |only
 koffice-1.6.3/doc/thesaurus/index.cache.bz2                                                            |only
 koffice-1.6.3/example/Makefile.in                                                                      |only
 koffice-1.6.3/filters/Makefile.in                                                                      |only
 koffice-1.6.3/filters/generic_wrapper/Makefile.in                                                      |only
 koffice-1.6.3/filters/karbon/Makefile.in                                                               |only
 koffice-1.6.3/filters/karbon/ai/Makefile.in                                                            |only
 koffice-1.6.3/filters/karbon/applixgraphics/Makefile.in                                                |only
 koffice-1.6.3/filters/karbon/eps/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/kontour/Makefile.in                                                       |only
 koffice-1.6.3/filters/karbon/msod/Makefile.in                                                          |only
 koffice-1.6.3/filters/karbon/oodraw/Makefile.in                                                        |only
 koffice-1.6.3/filters/karbon/png/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/svg/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/wmf/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/xaml/Makefile.in                                                          |only
 koffice-1.6.3/filters/karbon/xcf/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/Makefile.in                                                               |only
 koffice-1.6.3/filters/kchart/bmp/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/jpeg/Makefile.in                                                          |only
 koffice-1.6.3/filters/kchart/libimageexport/Makefile.in                                                |only
 koffice-1.6.3/filters/kchart/mng/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/png/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/svg/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/xbm/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/xpm/Makefile.in                                                           |only
 koffice-1.6.3/filters/kformula/Makefile.in                                                             |only
 koffice-1.6.3/filters/kformula/latex/Makefile.in                                                       |only
 koffice-1.6.3/filters/kformula/mathml/Makefile.in                                                      |only
 koffice-1.6.3/filters/kformula/png/Makefile.in                                                         |only
 koffice-1.6.3/filters/kformula/svg/Makefile.in                                                         |only
 koffice-1.6.3/filters/kivio/Makefile.in                                                                |only
 koffice-1.6.3/filters/kivio/imageexport/Makefile.in                                                    |only
 koffice-1.6.3/filters/kpresenter/Makefile.in                                                           |only
 koffice-1.6.3/filters/kpresenter/bmp/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/jpeg/Makefile.in                                                      |only
 koffice-1.6.3/filters/kpresenter/kword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kpresenter/libimageexport/Makefile.in                                            |only
 koffice-1.6.3/filters/kpresenter/magicpoint/Makefile.in                                                |only
 koffice-1.6.3/filters/kpresenter/mng/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/ooimpress/Makefile.in                                                 |only
 koffice-1.6.3/filters/kpresenter/png/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/powerpoint/Makefile.in                                                |only
 koffice-1.6.3/filters/kpresenter/powerpoint/import/Makefile.in                                         |only
 koffice-1.6.3/filters/kpresenter/powerpoint/libppt/Makefile.in                                         |only
 koffice-1.6.3/filters/kpresenter/svg/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/xbm/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/xpm/Makefile.in                                                       |only
 koffice-1.6.3/filters/krita/Makefile.in                                                                |only
 koffice-1.6.3/filters/krita/gmagick/Makefile.in                                                        |only
 koffice-1.6.3/filters/krita/jpeg/Makefile.in                                                           |only
 koffice-1.6.3/filters/krita/libkisexif/Makefile.in                                                     |only
 koffice-1.6.3/filters/krita/magick/Makefile.in                                                         |only
 koffice-1.6.3/filters/krita/openexr/Makefile.in                                                        |only
 koffice-1.6.3/filters/krita/pdf/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/png/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/raw/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/tiff/Makefile.in                                                           |only
 koffice-1.6.3/filters/krita/xcf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kspread/Makefile.in                                                              |only
 koffice-1.6.3/filters/kspread/applixspread/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/csv/Makefile.in                                                          |only
 koffice-1.6.3/filters/kspread/dbase/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/excel/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/excel/import/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/excel/sidewinder/Makefile.in                                             |only
 koffice-1.6.3/filters/kspread/gnumeric/Makefile.in                                                     |only
 koffice-1.6.3/filters/kspread/html/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/kexi/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/latex/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/latex/export/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/libkspreadexport/Makefile.in                                             |only
 koffice-1.6.3/filters/kspread/opencalc/Makefile.in                                                     |only
 koffice-1.6.3/filters/kspread/qpro/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/qpro/Makefile.in                                            |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/src/Makefile.in                                             |only
 koffice-1.6.3/filters/kugar/Makefile.in                                                                |only
 koffice-1.6.3/filters/kugar/kugarnop/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/Makefile.in                                                                |only
 koffice-1.6.3/filters/kword/abiword/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/amipro/Makefile.in                                                         |only
 koffice-1.6.3/filters/kword/applixword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/ascii/Makefile.in                                                          |only
 koffice-1.6.3/filters/kword/docbook/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/hancomword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/html/Makefile.in                                                           |only
 koffice-1.6.3/filters/kword/html/export/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/html/import/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/kword1.3/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/kword1.3/import/Makefile.in                                                |only
 koffice-1.6.3/filters/kword/latex/Makefile.in                                                          |only
 koffice-1.6.3/filters/kword/latex/export/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/latex/import/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/latex/import/generator/Makefile.in                                         |only
 koffice-1.6.3/filters/kword/latex/import/parser/Makefile.in                                            |only
 koffice-1.6.3/filters/kword/libexport/Makefile.in                                                      |only
 koffice-1.6.3/filters/kword/msword/Makefile.in                                                         |only
 koffice-1.6.3/filters/kword/mswrite/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/oowriter/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/palmdoc/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/pdf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/pdf/xpdf/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/pdf/xpdf/goo/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/pdf/xpdf/xpdf/Makefile.in                                                  |only
 koffice-1.6.3/filters/kword/pdf/xpdf/xpdf/pdftops.cc                                                   |only
 koffice-1.6.3/filters/kword/rtf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/rtf/export/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/rtf/import/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/starwriter/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/wml/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/wordperfect/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/wordperfect/export/Makefile.in                                             |only
 koffice-1.6.3/filters/kword/wordperfect/import/Makefile.in                                             |only
 koffice-1.6.3/filters/libdialogfilter/Makefile.in                                                      |only
 koffice-1.6.3/filters/liboofilter/Makefile.in                                                          |only
 koffice-1.6.3/filters/olefilters/Makefile.in                                                           |only
 koffice-1.6.3/filters/olefilters/lib/Makefile.in                                                       |only
 koffice-1.6.3/filters/olefilters/powerpoint97/Makefile.in                                              |only
 koffice-1.6.3/filters/xsltfilter/Makefile.in                                                           |only
 koffice-1.6.3/filters/xsltfilter/export/Makefile.in                                                    |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/Makefile.in                                                |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/kword/Makefile.in                                          |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in                                    |only
 koffice-1.6.3/filters/xsltfilter/import/Makefile.in                                                    |only
 koffice-1.6.3/interfaces/Makefile.in                                                                   |only
 koffice-1.6.3/karbon/Makefile.in                                                                       |only
 koffice-1.6.3/karbon/commands/Makefile.in                                                              |only
 koffice-1.6.3/karbon/core/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/data/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/dialogs/Makefile.in                                                               |only
 koffice-1.6.3/karbon/dockers/Makefile.in                                                               |only
 koffice-1.6.3/karbon/pics/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/plugins/Makefile.in                                                               |only
 koffice-1.6.3/karbon/plugins/flattenpath/Makefile.in                                                   |only
 koffice-1.6.3/karbon/plugins/imagetool/Makefile.in                                                     |only
 koffice-1.6.3/karbon/plugins/insertknots/Makefile.in                                                   |only
 koffice-1.6.3/karbon/plugins/roundcorners/Makefile.in                                                  |only
 koffice-1.6.3/karbon/plugins/shadoweffect/Makefile.in                                                  |only
 koffice-1.6.3/karbon/plugins/whirlpinch/Makefile.in                                                    |only
 koffice-1.6.3/karbon/plugins/zoomtool/Makefile.in                                                      |only
 koffice-1.6.3/karbon/render/Makefile.in                                                                |only
 koffice-1.6.3/karbon/render/xrgbrender/Makefile.in                                                     |only
 koffice-1.6.3/karbon/shapes/Makefile.in                                                                |only
 koffice-1.6.3/karbon/templates/Makefile.in                                                             |only
 koffice-1.6.3/karbon/templates/basic/Makefile.in                                                       |only
 koffice-1.6.3/karbon/tools/Makefile.in                                                                 |only
 koffice-1.6.3/karbon/visitors/Makefile.in                                                              |only
 koffice-1.6.3/karbon/widgets/Makefile.in                                                               |only
 koffice-1.6.3/kchart/Makefile.in                                                                       |only
 koffice-1.6.3/kchart/kdchart/Makefile.in                                                               |only
 koffice-1.6.3/kchart/pics/Makefile.in                                                                  |only
 koffice-1.6.3/kchart/templates/Makefile.in                                                             |only
 koffice-1.6.3/kchart/toolbar/Makefile.in                                                               |only
 koffice-1.6.3/kchart/toolbar/crystalsvg/Makefile.in                                                    |only
 koffice-1.6.3/kchart/toolbar/locolor/Makefile.in                                                       |only
 koffice-1.6.3/kdgantt/Makefile.in                                                                      |only
 koffice-1.6.3/kexi/3rdparty/Makefile.in                                                                |only
 koffice-1.6.3/kexi/3rdparty/kexisql/Makefile.in                                                        |only
 koffice-1.6.3/kexi/3rdparty/kexisql/src/Makefile.in                                                    |only
 koffice-1.6.3/kexi/3rdparty/kexisql/tool/Makefile.in                                                   |only
 koffice-1.6.3/kexi/3rdparty/kexisql3/Makefile.in                                                       |only
 koffice-1.6.3/kexi/3rdparty/kexisql3/src/Makefile.in                                                   |only
 koffice-1.6.3/kexi/3rdparty/kolibs/Makefile.in                                                         |only
 koffice-1.6.3/kexi/3rdparty/uuid/Makefile.in                                                           |only
 koffice-1.6.3/kexi/Makefile.in                                                                         |only
 koffice-1.6.3/kexi/core/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/data/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/data/kde34compat/Makefile.in                                                        |only
 koffice-1.6.3/kexi/examples/Makefile.in                                                                |only
 koffice-1.6.3/kexi/formeditor/Makefile.in                                                              |only
 koffice-1.6.3/kexi/formeditor/factories/Makefile.in                                                    |only
 koffice-1.6.3/kexi/formeditor/kdevelop_plugin/Makefile.in                                              |only
 koffice-1.6.3/kexi/formeditor/scripting/Makefile.in                                                    |only
 koffice-1.6.3/kexi/formeditor/test/Makefile.in                                                         |only
 koffice-1.6.3/kexi/kexidb/Makefile.in                                                                  |only
 koffice-1.6.3/kexi/kexidb/drivers/Makefile.in                                                          |only
 koffice-1.6.3/kexi/kexidb/drivers/mySQL/Makefile.in                                                    |only
 koffice-1.6.3/kexi/kexidb/drivers/odbc/Makefile.in                                                     |only
 koffice-1.6.3/kexi/kexidb/drivers/pqxx/Makefile.in                                                     |only
 koffice-1.6.3/kexi/kexidb/drivers/sqlite/Makefile.in                                                   |only
 koffice-1.6.3/kexi/kexidb/drivers/sqlite2/Makefile.in                                                  |only
 koffice-1.6.3/kexi/kexidb/parser/Makefile.in                                                           |only
 koffice-1.6.3/kexi/kexiutils/Makefile.in                                                               |only
 koffice-1.6.3/kexi/main/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/main/printing/Makefile.in                                                           |only
 koffice-1.6.3/kexi/main/startup/Makefile.in                                                            |only
 koffice-1.6.3/kexi/migration/Makefile.in                                                               |only
 koffice-1.6.3/kexi/migration/mysql/Makefile.in                                                         |only
 koffice-1.6.3/kexi/migration/pqxx/Makefile.in                                                          |only
 koffice-1.6.3/kexi/migration/txt/Makefile.in                                                           |only
 koffice-1.6.3/kexi/pics/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/plugins/Makefile.in                                                                 |only
 koffice-1.6.3/kexi/plugins/forms/Makefile.in                                                           |only
 koffice-1.6.3/kexi/plugins/forms/widgets/Makefile.in                                                   |only
 koffice-1.6.3/kexi/plugins/importexport/Makefile.in                                                    |only
 koffice-1.6.3/kexi/plugins/importexport/csv/Makefile.in                                                |only
 koffice-1.6.3/kexi/plugins/macros/Makefile.in                                                          |only
 koffice-1.6.3/kexi/plugins/macros/kexiactions/Makefile.in                                              |only
 koffice-1.6.3/kexi/plugins/macros/kexipart/Makefile.in                                                 |only
 koffice-1.6.3/kexi/plugins/macros/lib/Makefile.in                                                      |only
 koffice-1.6.3/kexi/plugins/macros/tests/Makefile.in                                                    |only
 koffice-1.6.3/kexi/plugins/migration/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/queries/Makefile.in                                                         |only
 koffice-1.6.3/kexi/plugins/relations/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/reports/Makefile.in                                                         |only
 koffice-1.6.3/kexi/plugins/scripting/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/scripting/kexiapp/Makefile.in                                               |only
 koffice-1.6.3/kexi/plugins/scripting/kexidb/Makefile.in                                                |only
 koffice-1.6.3/kexi/plugins/scripting/kexiscripting/Makefile.in                                         |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/Makefile.in                                               |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/copycenter/Makefile.in                                    |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/exportxhtml/Makefile.in                                   |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/importxhtml/Makefile.in                                   |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in                             |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/python/Makefile.in                                        |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in                                |only
 koffice-1.6.3/kexi/plugins/tables/Makefile.in                                                          |only
 koffice-1.6.3/kexi/tests/Makefile.in                                                                   |only
 koffice-1.6.3/kexi/tests/altertable/Makefile.in                                                        |only
 koffice-1.6.3/kexi/tests/newapi/Makefile.in                                                            |only
 koffice-1.6.3/kexi/tests/parser/Makefile.in                                                            |only
 koffice-1.6.3/kexi/tests/startup/Makefile.in                                                           |only
 koffice-1.6.3/kexi/tests/tableview/Makefile.in                                                         |only
 koffice-1.6.3/kexi/tests/widgets/Makefile.in                                                           |only
 koffice-1.6.3/kexi/tools/Makefile.in                                                                   |only
 koffice-1.6.3/kexi/tools/add_column/Makefile.in                                                        |only
 koffice-1.6.3/kexi/tools/delete_column/Makefile.in                                                     |only
 koffice-1.6.3/kexi/widget/Makefile.in                                                                  |only
 koffice-1.6.3/kexi/widget/relations/Makefile.in                                                        |only
 koffice-1.6.3/kexi/widget/tableview/Makefile.in                                                        |only
 koffice-1.6.3/kexi/widget/utils/Makefile.in                                                            |only
 koffice-1.6.3/kformula/Makefile.in                                                                     |only
 koffice-1.6.3/kformula/pics/Makefile.in                                                                |only
 koffice-1.6.3/kivio/Makefile.in                                                                        |only
 koffice-1.6.3/kivio/kiviopart/Makefile.in                                                              |only
 koffice-1.6.3/kivio/kiviopart/config/Makefile.in                                                       |only
 koffice-1.6.3/kivio/kiviopart/kiviosdk/Makefile.in                                                     |only
 koffice-1.6.3/kivio/kiviopart/pics/Makefile.in                                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in                                           |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Civil/Makefile.in                                           |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Contact/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Electric/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/MSE/Makefile.in                                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Makefile.in                                                 |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Network/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in                                       |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/SDL/Makefile.in                                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in                      |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in                               |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in                                  |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in                                    |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in                                     |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in                                   |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Makefile.in                                            |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in                              |only
 koffice-1.6.3/kivio/kiviopart/stencils/Makefile.in                                                     |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in                                    |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Makefile.in                                       |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in                      |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in                                   |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/Makefile.in                                                 |only
 koffice-1.6.3/kivio/kiviopart/tiles/Makefile.in                                                        |only
 koffice-1.6.3/kivio/kiviopart/tools/Makefile.in                                                        |only
 koffice-1.6.3/kivio/kiviopart/ui/Makefile.in                                                           |only
 koffice-1.6.3/kivio/plugins/Makefile.in                                                                |only
 koffice-1.6.3/kivio/plugins/kivioconnectortool/Makefile.in                                             |only
 koffice-1.6.3/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in                          |only
 koffice-1.6.3/kivio/plugins/kivioselecttool/Makefile.in                                                |only
 koffice-1.6.3/kivio/plugins/kivioselecttool/select_pics/Makefile.in                                    |only
 koffice-1.6.3/kivio/plugins/kiviosmlconnector/Makefile.in                                              |only
 koffice-1.6.3/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in                                |only
 koffice-1.6.3/kivio/plugins/kiviotargettool/Makefile.in                                                |only
 koffice-1.6.3/kivio/plugins/kiviotexttool/Makefile.in                                                  |only
 koffice-1.6.3/kivio/plugins/kiviozoomtool/Makefile.in                                                  |only
 koffice-1.6.3/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in                                        |only
 koffice-1.6.3/kivio/templates/Makefile.in                                                              |only
 koffice-1.6.3/kivio/templates/basic/Makefile.in                                                        |only
 koffice-1.6.3/koshell/Makefile.in                                                                      |only
 koffice-1.6.3/kounavail/Makefile.in                                                                    |only
 koffice-1.6.3/kplato/Makefile.in                                                                       |only
 koffice-1.6.3/kplato/pics/Makefile.in                                                                  |only
 koffice-1.6.3/kplato/reports/Makefile.in                                                               |only
 koffice-1.6.3/kplato/templates/Makefile.in                                                             |only
 koffice-1.6.3/kplato/templates/Simple/Makefile.in                                                      |only
 koffice-1.6.3/kplato/tests/Makefile.in                                                                 |only
 koffice-1.6.3/kplato/toolbar/Makefile.in                                                               |only
 koffice-1.6.3/kpresenter/Makefile.in                                                                   |only
 koffice-1.6.3/kpresenter/autoformEdit/Makefile.in                                                      |only
 koffice-1.6.3/kpresenter/autoforms/Arrows/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/autoforms/Connections/Makefile.in                                             |only
 koffice-1.6.3/kpresenter/autoforms/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/dtd/Makefile.in                                                               |only
 koffice-1.6.3/kpresenter/pics/Makefile.in                                                              |only
 koffice-1.6.3/kpresenter/pics/rotate/Makefile.in                                                       |only
 koffice-1.6.3/kpresenter/slideshow/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/templates/A4/Makefile.in                                                      |only
 koffice-1.6.3/kpresenter/templates/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/templates/Screen/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/templates/Screenpresentations/Makefile.in                                     |only
 koffice-1.6.3/kpresenter/templates/common_icon/Makefile.in                                             |only
 koffice-1.6.3/kpresenter/templates/legal/Makefile.in                                                   |only
 koffice-1.6.3/kpresenter/templates/letter/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/toolbar/Makefile.in                                                           |only
 koffice-1.6.3/krita/Makefile.in                                                                        |only
 koffice-1.6.3/krita/colorspaces/Makefile.in                                                            |only
 koffice-1.6.3/krita/colorspaces/cmyk_u16/Makefile.in                                                   |only
 koffice-1.6.3/krita/colorspaces/cmyk_u8/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/cmyk_u8/templates/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/gray_u16/Makefile.in                                                   |only
 koffice-1.6.3/krita/colorspaces/gray_u8/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/gray_u8/templates/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/gray_u8/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/lms_f32/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_f16half/Makefile.in                                                |only
 koffice-1.6.3/krita/colorspaces/rgb_f16half/tests/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/rgb_f32/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_f32/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/rgb_u16/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_u16/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/Makefile.in                                                     |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/templates/Makefile.in                                           |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/tests/Makefile.in                                               |only
 koffice-1.6.3/krita/colorspaces/wet/Makefile.in                                                        |only
 koffice-1.6.3/krita/colorspaces/wetsticky/Makefile.in                                                  |only
 koffice-1.6.3/krita/colorspaces/wetsticky/brushop/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/ycbcr_u16/Makefile.in                                                  |only
 koffice-1.6.3/krita/colorspaces/ycbcr_u8/Makefile.in                                                   |only
 koffice-1.6.3/krita/core/Makefile.in                                                                   |only
 koffice-1.6.3/krita/core/tests/Makefile.in                                                             |only
 koffice-1.6.3/krita/core/tiles/Makefile.in                                                             |only
 koffice-1.6.3/krita/core/tiles/tests/Makefile.in                                                       |only
 koffice-1.6.3/krita/data/Makefile.in                                                                   |only
 koffice-1.6.3/krita/data/brushes/Makefile.in                                                           |only
 koffice-1.6.3/krita/data/gradients/Makefile.in                                                         |only
 koffice-1.6.3/krita/data/images/Makefile.in                                                            |only
 koffice-1.6.3/krita/data/palettes/Makefile.in                                                          |only
 koffice-1.6.3/krita/data/patterns/Makefile.in                                                          |only
 koffice-1.6.3/krita/data/profiles/Makefile.in                                                          |only
 koffice-1.6.3/krita/dtd/Makefile.in                                                                    |only
 koffice-1.6.3/krita/kritacolor/Makefile.in                                                             |only
 koffice-1.6.3/krita/kritacolor/colorspaces/Makefile.in                                                 |only
 koffice-1.6.3/krita/kritacolor/tests/Makefile.in                                                       |only
 koffice-1.6.3/krita/pics/Makefile.in                                                                   |only
 koffice-1.6.3/krita/plugins/Makefile.in                                                                |only
 koffice-1.6.3/krita/plugins/filters/Makefile.in                                                        |only
 koffice-1.6.3/krita/plugins/filters/blur/Makefile.in                                                   |only
 koffice-1.6.3/krita/plugins/filters/bumpmap/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/cimg/Makefile.in                                                   |only
 koffice-1.6.3/krita/plugins/filters/colorify/Makefile.in                                               |only
 koffice-1.6.3/krita/plugins/filters/colors/Makefile.in                                                 |only
 koffice-1.6.3/krita/plugins/filters/colorsfilters/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/filters/convolutionfilters/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/filters/cubismfilter/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/embossfilter/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/example/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/fastcolortransfer/Makefile.in                                      |only
 koffice-1.6.3/krita/plugins/filters/imageenhancement/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/lenscorrectionfilter/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/filters/levelfilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/noisefilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/oilpaintfilter/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/filters/pixelizefilter/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/filters/raindropsfilter/Makefile.in                                        |only
 koffice-1.6.3/krita/plugins/filters/randompickfilter/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/roundcorners/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/smalltilesfilter/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/sobelfilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/threadtest/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/filters/unsharp/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/wavefilter/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/paintops/Makefile.in                                                       |only
 koffice-1.6.3/krita/plugins/paintops/defaultpaintops/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/tools/Makefile.in                                                          |only
 koffice-1.6.3/krita/plugins/tools/defaulttools/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/tools/selectiontools/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/tools/tool_crop/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/tools/tool_curves/Makefile.in                                              |only
 koffice-1.6.3/krita/plugins/tools/tool_filter/Makefile.in                                              |only
 koffice-1.6.3/krita/plugins/tools/tool_perspectivegrid/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/tools/tool_perspectivetransform/Makefile.in                                |only
 koffice-1.6.3/krita/plugins/tools/tool_polygon/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/tools/tool_polyline/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/tools/tool_selectsimilar/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/tools/tool_star/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/tools/tool_transform/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/viewplugins/Makefile.in                                                    |only
 koffice-1.6.3/krita/plugins/viewplugins/colorrange/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/colorspaceconversion/Makefile.in                               |only
 koffice-1.6.3/krita/plugins/viewplugins/dropshadow/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/filtersgallery/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/viewplugins/histogram/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/histogram_docker/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/viewplugins/history_docker/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/viewplugins/imagesize/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/modify_selection/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/viewplugins/performancetest/Makefile.in                                    |only
 koffice-1.6.3/krita/plugins/viewplugins/rotateimage/Makefile.in                                        |only
 koffice-1.6.3/krita/plugins/viewplugins/screenshot/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/kritacore/Makefile.in                                |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/kritascripting/Makefile.in                           |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/Makefile.in                                  |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/python/Makefile.in                           |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in                             |only
 koffice-1.6.3/krita/plugins/viewplugins/selectopaque/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/viewplugins/separate_channels/Makefile.in                                  |only
 koffice-1.6.3/krita/plugins/viewplugins/shearimage/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/substrate/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/variations/Makefile.in                                         |only
 koffice-1.6.3/krita/sdk/Makefile.in                                                                    |only
 koffice-1.6.3/krita/ui/Makefile.in                                                                     |only
 koffice-1.6.3/kspread/Makefile.in                                                                      |only
 koffice-1.6.3/kspread/dialogs/Makefile.in                                                              |only
 koffice-1.6.3/kspread/dtd/Makefile.in                                                                  |only
 koffice-1.6.3/kspread/extensions/Makefile.in                                                           |only
 koffice-1.6.3/kspread/pics/Makefile.in                                                                 |only
 koffice-1.6.3/kspread/plugins/Makefile.in                                                              |only
 koffice-1.6.3/kspread/plugins/calculator/Makefile.in                                                   |only
 koffice-1.6.3/kspread/plugins/calculator/pics/Makefile.in                                              |only
 koffice-1.6.3/kspread/plugins/insertcalendar/Makefile.in                                               |only
 koffice-1.6.3/kspread/plugins/scripting/Makefile.in                                                    |only
 koffice-1.6.3/kspread/plugins/scripting/kspreadcore/Makefile.in                                        |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/Makefile.in                                            |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/exporthtml/Makefile.in                                 |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/scripteditor/Makefile.in                               |only
 koffice-1.6.3/kspread/sheetstyles/Makefile.in                                                          |only
 koffice-1.6.3/kspread/templates/Business/Makefile.in                                                   |only
 koffice-1.6.3/kspread/templates/General/Makefile.in                                                    |only
 koffice-1.6.3/kspread/templates/HomeFamily/Makefile.in                                                 |only
 koffice-1.6.3/kspread/templates/Makefile.in                                                            |only
 koffice-1.6.3/kspread/tests/Makefile.in                                                                |only
 koffice-1.6.3/kspread/toolbar/Makefile.in                                                              |only
 koffice-1.6.3/kspread/toolbar/crystalsvg/Makefile.in                                                   |only
 koffice-1.6.3/kugar/Makefile.in                                                                        |only
 koffice-1.6.3/kugar/kudesigner/Makefile.in                                                             |only
 koffice-1.6.3/kugar/kudesigner/pics/Makefile.in                                                        |only
 koffice-1.6.3/kugar/kudesigner/templates/General/Makefile.in                                           |only
 koffice-1.6.3/kugar/kudesigner/templates/Makefile.in                                                   |only
 koffice-1.6.3/kugar/kudesigner/toolbar/Makefile.in                                                     |only
 koffice-1.6.3/kugar/kudesigner_lib/Makefile.in                                                         |only
 koffice-1.6.3/kugar/lib/Makefile.in                                                                    |only
 koffice-1.6.3/kugar/part/Makefile.in                                                                   |only
 koffice-1.6.3/kugar/samples/Makefile.in                                                                |only
 koffice-1.6.3/kword/Makefile.in                                                                        |only
 koffice-1.6.3/kword/data/Makefile.in                                                                   |only
 koffice-1.6.3/kword/dtd/Makefile.in                                                                    |only
 koffice-1.6.3/kword/expression/Makefile.in                                                             |only
 koffice-1.6.3/kword/horizontalline/Makefile.in                                                         |only
 koffice-1.6.3/kword/mailmerge/Makefile.in                                                              |only
 koffice-1.6.3/kword/mailmerge/kabc/Makefile.in                                                         |only
 koffice-1.6.3/kword/mailmerge/kspread/Makefile.in                                                      |only
 koffice-1.6.3/kword/mailmerge/sql/Makefile.in                                                          |only
 koffice-1.6.3/kword/pics/Makefile.in                                                                   |only
 koffice-1.6.3/kword/templates/CardsAndLabels/Makefile.in                                               |only
 koffice-1.6.3/kword/templates/Envelopes/Makefile.in                                                    |only
 koffice-1.6.3/kword/templates/Makefile.in                                                              |only
 koffice-1.6.3/kword/templates/Wordprocessing/Makefile.in                                               |only
 koffice-1.6.3/kword/tests/Makefile.in                                                                  |only
 koffice-1.6.3/kword/toolbar/Makefile.in                                                                |only
 koffice-1.6.3/lib/Makefile.in                                                                          |only
 koffice-1.6.3/lib/kformula/Makefile.in                                                                 |only
 koffice-1.6.3/lib/kformula/config/Makefile.in                                                          |only
 koffice-1.6.3/lib/kformula/dtd/Makefile.in                                                             |only
 koffice-1.6.3/lib/kformula/fonts/Makefile.in                                                           |only
 koffice-1.6.3/lib/kformula/pics/Makefile.in                                                            |only
 koffice-1.6.3/lib/kformula/pics/crystalsvg/Makefile.in                                                 |only
 koffice-1.6.3/lib/kofficecore/Makefile.in                                                              |only
 koffice-1.6.3/lib/kofficecore/tests/Makefile.in                                                        |only
 koffice-1.6.3/lib/kofficeui/Makefile.in                                                                |only
 koffice-1.6.3/lib/kofficeui/pics/Makefile.in                                                           |only
 koffice-1.6.3/lib/kofficeui/tests/Makefile.in                                                          |only
 koffice-1.6.3/lib/kopainter/Makefile.in                                                                |only
 koffice-1.6.3/lib/kopalette/Makefile.in                                                                |only
 koffice-1.6.3/lib/koproperty/Makefile.in                                                               |only
 koffice-1.6.3/lib/koproperty/editors/Makefile.in                                                       |only
 koffice-1.6.3/lib/koproperty/test/Makefile.in                                                          |only
 koffice-1.6.3/lib/kotext/Makefile.in                                                                   |only
 koffice-1.6.3/lib/kotext/kohyphen/Makefile.in                                                          |only
 koffice-1.6.3/lib/kotext/kohyphen/hyphdicts/Makefile.in                                                |only
 koffice-1.6.3/lib/kotext/tests/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/Makefile.in                                                                    |only
 koffice-1.6.3/lib/kross/api/Makefile.in                                                                |only
 koffice-1.6.3/lib/kross/main/Makefile.in                                                               |only
 koffice-1.6.3/lib/kross/python/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/python/cxx/Makefile.in                                                         |only
 koffice-1.6.3/lib/kross/python/scripts/Makefile.in                                                     |only
 koffice-1.6.3/lib/kross/python/scripts/RestrictedPython/Makefile.in                                    |only
 koffice-1.6.3/lib/kross/ruby/Makefile.in                                                               |only
 koffice-1.6.3/lib/kross/runner/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/test/Makefile.in                                                               |only
 koffice-1.6.3/lib/kwmf/Makefile.in                                                                     |only
 koffice-1.6.3/lib/store/Makefile.in                                                                    |only
 koffice-1.6.3/lib/store/tests/Makefile.in                                                              |only
 koffice-1.6.3/mimetypes/Makefile.in                                                                    |only
 koffice-1.6.3/mimetypes/kde33/Makefile.in                                                              |only
 koffice-1.6.3/mimetypes/kde351/Makefile.in                                                             |only
 koffice-1.6.3/pics/Makefile.in                                                                         |only
 koffice-1.6.3/pics/crystalsvg/Makefile.in                                                              |only
 koffice-1.6.3/plugins/Makefile.in                                                                      |only
 koffice-1.6.3/plugins/scan/Makefile.in                                                                 |only
 koffice-1.6.3/servicetypes/Makefile.in                                                                 |only
 koffice-1.6.3/templates/Makefile.in                                                                    |only
 koffice-1.6.3/tools/Makefile.in                                                                        |only
 koffice-1.6.3/tools/converter/Makefile.in                                                              |only
 koffice-1.6.3/tools/kfile-plugins/Makefile.in                                                          |only
 koffice-1.6.3/tools/kfile-plugins/abiword/Makefile.in                                                  |only
 koffice-1.6.3/tools/kfile-plugins/gnumeric/Makefile.in                                                 |only
 koffice-1.6.3/tools/kfile-plugins/koffice/Makefile.in                                                  |only
 koffice-1.6.3/tools/kfile-plugins/ooo/Makefile.in                                                      |only
 koffice-1.6.3/tools/kthesaurus/Makefile.in                                                             |only
 koffice-1.6.3/tools/quickprint/Makefile.in                                                             |only
 koffice-1.6.3/tools/spell/Makefile.in                                                                  |only
 koffice-1.6.3/tools/thesaurus/Makefile.in                                                              |only
 koffice-1.6.3/tools/thumbnail/Makefile.in                                                              |only
 1156 files changed, 5215 insertions(+), 2017 deletions(-)

--- NEW FILE koffice-20090306svn.patch ---
Only in koffice-1.6.3/: acinclude.m4
Only in koffice-1.6.3/: aclocal.m4
diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/acinclude.m4.in koffice-1.6-branch/admin/acinclude.m4.in
--- koffice-1.6.3/admin/acinclude.m4.in	2007-05-30 16:50:22.000000000 -0500
+++ koffice-1.6-branch/admin/acinclude.m4.in	2008-11-03 12:17:22.000000000 -0600
@@ -1226,7 +1226,15 @@
   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
 fi
 if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+  if test -z "$PKG_CONFIG"; then
+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if test "$PKG_CONFIG" != "no" ; then
+    if $PKG_CONFIG --exists qt-mt ; then
+       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+    fi
+  fi
 fi
 if test $kde_qtver = 2; then
    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
 for dir in $kde_qt_dirs; do
    qt_incdirs="$qt_incdirs $dir/include $dir"
 done
+if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+  if $PKG_CONFIG --exists qt-mt ; then
+      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+  fi
+fi
 qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
 if test ! "$ac_qt_includes" = "NO"; then
    qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
 done
+if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+  if $PKG_CONFIG --exists qt-mt ; then
+      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+  fi
+fi
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
   qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
 AC_TRY_LINK(dnl
 [
 #include<zlib.h>
+#include<string.h>
 ],
 [
   char buf[42];
@@ -2638,7 +2663,7 @@
   /* this would segfault.. but we only link, don't run */
   (void) gzgets(f, buf, sizeof(buf));
 
-  return (zlibVersion() == ZLIB_VERSION); 
+  return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
 ],
             eval "ac_cv_lib_z='-lz'",
             eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
      echo "*** to the full path to pkg-config."
      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
   else
-     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+     if ! $PKG_CONFIG --exists OpenEXR ; then
         AC_MSG_RESULT(no)
         EXRSTATUS=no
      else
-        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+        if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
            AC_MSG_RESULT(no)
            EXRSTATUS=old
         else
@@ -4624,7 +4649,8 @@
 
 AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  KDE_CHECK_PYTHON_INTERN("2.5",
+  KDE_CHECK_PYTHON_INTERN("2.6",
+    [KDE_CHECK_PYTHON_INTERN("2.5",
     [KDE_CHECK_PYTHON_INTERN("2.4",
      [KDE_CHECK_PYTHON_INTERN("2.3", 
        [KDE_CHECK_PYTHON_INTERN("2.2", 
@@ -4636,6 +4662,7 @@
        ])
      ])
   ])
+    ])
 ])
 
 AC_DEFUN([KDE_CHECK_STL],
diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/cvs.sh koffice-1.6-branch/admin/cvs.sh
--- koffice-1.6.3/admin/cvs.sh	2007-05-30 16:50:22.000000000 -0500
+++ koffice-1.6-branch/admin/cvs.sh	2008-11-03 12:17:22.000000000 -0600
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.7\""
+     VERSION="\"3.5.10\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/detect-autoconf.pl koffice-1.6-branch/admin/detect-autoconf.pl
--- koffice-1.6.3/admin/detect-autoconf.pl	2007-05-30 16:50:22.000000000 -0500
+++ koffice-1.6-branch/admin/detect-autoconf.pl	2008-11-03 12:17:22.000000000 -0600
@@ -21,6 +21,73 @@
     return "";
 }
 
+# Subroutine to lexicographically compare two version strings, a and b.
+# If a > b, 1 is returned.
+# If a == b, 0 is returned.
+# If a < b, -1 is returned.
+#
+# If the strings are of uneven number length then the shorter string is
+# prepended by enough zeroes to make the two string lengths equal in order to
+# allow an accurate comparison.  Note that the zero-padding only occurs in
+# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
+# Parts of the version ending in -foo (or any other text) are not considered
+# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
+# 2.053)
+sub compareVersions
+{
+    my ($a, $b) = @_;
+
+    # Split the strings up by '.' (version separator) and start comparing digit
+    # length.
+
+    my @aParts = split(/\./, $a);
+    my @bParts = split(/\./, $b);
+
+    # Make the arrays equal in length by adding missing zeroes to the end of the
+    # version.
+    push @aParts, '0' while scalar @aParts < scalar @bParts;
+    push @bParts, '0' while scalar @bParts < scalar @aParts;
+
+    # Now compare each individual portion.
+    for (my $i = 0; $i < scalar @aParts; ++$i)
+    {
+	# Make sure that any portion that has numbers is contiguous.  I'm sure
+	# there's a technique for saving stuff like 2.52a2 but I don't feel
+	# like implementing it.
+	if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
+	    $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
+	{
+	    die "Not able to compare $a to $b!\n";
+	}
+
+	my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
+	my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
+
+	# Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
+	# the delta calculation below.
+	my $delta = (length $aDigits) - (length $bDigits);
+	if ($delta < 0) # b is longer
+	{
+	    my $replacement = ('0' x (-$delta)) . $aDigits;
+	    $aParts[$i] =~ s/$aDigits/$replacement/;
+	}
+	elsif ($delta > 0) # a is longer
+	{
+	    my $replacement = ('0' x $delta) . $bDigits;
+	    $bParts[$i] =~ s/$bDigits/$replacement/;
+	}
+    }
+
+    # Arrays now have standardized version components, let's re-merge them
+    # to strings to do the compare.
+    my $newA = join('.', @aParts);
+    my $newB = join('.', @bParts);
+
+    return 1 if ($newA gt $newB);
+    return -1 if ($newA lt $newB);
+    return 0;
+}
+
 # Subroutine to determine the highest installed version of the given program,
 # searching from the given paths.
 sub findBest
@@ -32,6 +99,7 @@
  	'autoconf' => '2.5',
 	'automake' => '1.6',
     );
+    my $sgn; # Used for compareVersions results.
 
[...25664 lines suppressed...]
+Comment[lt]=Patikrinti ?io ?od?io ra?yb?
 Comment[lv]=P?rbaud?t ?? v?rda pareizrakst?bu
 Comment[ms]=Semak Ejaan Kata ini
 Comment[mt]=I??ekkja kif tispelli dil-kelma
@@ -119,7 +122,8 @@
 Comment[th]=?????????????????????
 Comment[tr]=Bu Kelimenin ?mla Denetimini Yap
 Comment[uk]=?????????? ???????? ????? ?????
-Comment[uz]=?? ??????? ???????? ????????
+Comment[uz]=Shu so?zning imlosini tekshirish
+Comment[uz at cyrillic]=?? ??????? ???????? ????????
 Comment[wa]=Coridj? l'?ortografeye di ?'?mot ci...
 Comment[xh]=Khangela olu Pelo Magama
 Comment[zh_CN]=??????
Only in koffice-1.6.3/tools/spell: Makefile.in
diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/spell/uninstall.desktop koffice-1.6-branch/tools/spell/uninstall.desktop
--- koffice-1.6.3/tools/spell/uninstall.desktop	2007-05-30 16:36:09.000000000 -0500
+++ koffice-1.6-branch/tools/spell/uninstall.desktop	2008-11-03 11:55:08.000000000 -0600
@@ -1,3 +1,2 @@
 [Desktop Entry]
-Encoding=UTF-8
 Hidden=true
Only in koffice-1.6.3/tools/thesaurus: Makefile.in
diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thesaurus/thesaurustool.desktop koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop
--- koffice-1.6.3/tools/thesaurus/thesaurustool.desktop	2007-05-30 16:36:11.000000000 -0500
+++ koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop	2008-11-03 11:55:11.000000000 -0600
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=
 Name=Thesaurus Tool
 Name[af]=Thesaurus Program
@@ -14,13 +13,14 @@
 Name[da]=Thesaurusv?rkt?j
 Name[de]=Thesaurus-Werkzeug
 Name[el]=???????? ?????????
-Name[eo]=Teza?ro
+Name[eo]=Teza?rilo
 Name[es]=Herramienta de Thesaurus
 Name[et]=Tesaurus
 Name[eu]=Thesaurus tresna
 Name[fa]=????? Thesaurus
 Name[fi]=Synonyymisanakirja
 Name[fr]=Outil Th?saurus
+Name[fy]=Thesaurus ark
 Name[gl]=Ferramenta de Sin?nimos
 Name[he]=??? ?????
 Name[hi]=?????? ??????? ?? ????
@@ -40,7 +40,7 @@
 Name[ne]=????????? ?????
 Name[nl]=Thesaurus hulpprogramma
 Name[nn]=Synonymordbok
-Name[pl]=Thesaurus
+Name[pl]=Tezaurus
 Name[pt]=Ferramenta de Sin?nimos
 Name[pt_BR]=Ferramenta Thesaurus
 Name[ru]=????????
@@ -55,7 +55,8 @@
 Name[th]=????????????????
 Name[tr]=Thesaurus Arac?
 Name[uk]=????? ?????????
-Name[uz]=???????? ????????
+Name[uz]=Tezaurus vositasi
+Name[uz at cyrillic]=???????? ????????
 Name[xh]=Isixhobo se Thesaurus
 Name[zh_CN]=????
 Name[zh_TW]=?????
@@ -65,7 +66,7 @@
 Comment=Show Related Words
 Comment[af]=Vertoon Verwanter Woorde
 Comment[ar]=????? ??????? ??? ???????
-Comment[bg]=??????? ?? ???????? ?? ??????
+Comment[bg]=??????? ?? ????????
 Comment[bs]=Prika?i srodne rije?i
 Comment[ca]=Mostra paraules relacionades
 Comment[cs]=Zobrazit podobn? slova
@@ -80,6 +81,7 @@
 Comment[fa]=????? ???????? ?????
 Comment[fi]=N?yt? samankaltaiset sanat
 Comment[fr]=Afficher les mots li?s
+Comment[fy]=Ferlykbere wurden sjen litte
 Comment[gl]=Mostrar as Palabras Relacionadas
 Comment[he]=??? ????? ??????
 Comment[hi]=????????? ???? ??????
@@ -90,11 +92,12 @@
 Comment[ja]=??????
 Comment[km]=???????????????????????
 Comment[lo]=????????????????????
+Comment[lt]=Parodyti susijusius ?od?ius
 Comment[lv]=R?d?t saist?tos v?rdus
 Comment[ms]=Tayang Kata Berkaitan
 Comment[mt]=Uri kliem relatati
 Comment[nb]=Vis ord som ligner
-Comment[nds]=Toh?ren W??r wiesen
+Comment[nds]=Lieke W??r wiesen
 Comment[ne]=????????? ??????? ???????????
 Comment[nl]=Toon gerelateerde woorden
 Comment[nn]=Vis n?rskylde ord
@@ -112,7 +115,8 @@
 Comment[th]=????????????????????
 Comment[tr]=?lgili Kelimeleri G?ster
 Comment[uk]=???????? ???'????? ?????
-Comment[uz]=?????? ?????? ???????? ????????
+Comment[uz]=Bog?liq bo?lgan so?zlarni ko?rsatish
+Comment[uz at cyrillic]=?????? ?????? ???????? ????????
 Comment[wa]=Mostrer les mots k'?ont-st a vey avou
 Comment[xh]=Bonisa Amagama Ahlobeneyo
 Comment[zh_CN]=??????
diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop
--- koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
+++ koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop	2008-11-03 11:55:13.000000000 -0600
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Service
 Name=Clipart
 Name[af]=Kitskuns
@@ -36,7 +35,8 @@
 Name[sr at Latn]=Ise?ci
 Name[th]=?????????
 Name[uk]=??????????
-Name[uz]=???????
+Name[uz]=Klipart
+Name[uz at cyrillic]=???????
 Name[zh_CN]=???
 Name[zh_TW]=???
 ServiceTypes=ThumbCreator
diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop
--- koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
+++ koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop	2008-11-03 11:55:13.000000000 -0600
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Service
 Name=KOffice Files
 Name[af]=Koffice L?ers
@@ -13,7 +12,7 @@
 Name[da]=KOffice-filer
 Name[de]=KOffice-Dateien
 Name[el]=?????? KOffice
-Name[eo]=KOficejo-dosieroj
+Name[eo]=KOffice-dosieroj
 Name[es]=Archivos de KOffice
 Name[et]=KOffice'i failid
 Name[eu]=KOffice-en fitxategiak
@@ -21,6 +20,7 @@
 Name[fi]=KOffice-tiedostot
 Name[fo]=KSkrivstovu-f?lir
 Name[fr]=Fichiers KOffice
+Name[fy]=KOffice-triemmen
 Name[ga]=Comhaid KOffice
 Name[gl]=Ficheiros de KOffice
 Name[he]=???? KOffice
@@ -58,7 +58,8 @@
 Name[th]=????????????????????????? K
 Name[tr]=KOffice Dosyalar?
 Name[uk]=????? KOffice
-Name[uz]=KOffice ????????
+Name[uz]=KOffice fayllari
+Name[uz at cyrillic]=KOffice ????????
 Name[wa]=Fitch?s KOffice
 Name[xh]=Iifayile ze KOffice
 Name[zh_CN]=KOffice ??
Only in koffice-1.6.3/tools/thumbnail: Makefile.in
diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop
--- koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
+++ koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop	2009-03-06 14:55:19.000000000 -0600
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Service
 Name=Other Office Files
 Name[af]=Ander Kantoor L?ers
@@ -21,6 +20,7 @@
 Name[fi]=Muut toimistotiedostot
 Name[fo]=A?rar skrivstovuf?lir
 Name[fr]=Autres documents bureautiques
+Name[fy]=Oare office triemmen
 Name[gl]=Outros Ficheiros de KOffice
 Name[he]=???? Office ?????
 Name[hi]=???? ????? ???????
@@ -43,7 +43,7 @@
 Name[pa]=??? ????? ??????
 Name[pl]=Inne pliki biurowe
 Name[pt]=Outros Ficheiros de Escrit?rio
-Name[pt_BR]=Outros Arquivos Office
+Name[pt_BR]=Outros arquivos Office
 Name[ro]=Alte fi?iere KOffice
 Name[ru]=?????? ????? Office
 Name[se]=Ear? Office-fiillat
@@ -57,7 +57,8 @@
 Name[th]=??????????????????????????
 Name[tr]=Di?er Ofis Dosyalar?
 Name[uk]=???? ????? KOffice
-Name[uz]=????? ???? ????? ???????
+Name[uz]=Idora uchun boshqa fayllar
+Name[uz at cyrillic]=????? ???? ????? ???????
 Name[wa]=?tes fitch?s di buro
 Name[xh]=Ezinye Iifayile ze Office
 Name[zh_CN]=?? Office ??


--- NEW FILE koffice-svn_checkout.sh ---
#!/bin/bash

DATE=$(date +%Y%m%d)
EXPORT_DIR=koffice

set -x
rm -rf $EXPORT_DIR

# app
svn export svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice/ $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/EL-5/koffice.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- koffice.spec	27 Oct 2008 14:33:36 -0000	1.57
+++ koffice.spec	26 Aug 2009 18:55:27 -0000	1.58
@@ -6,10 +6,12 @@
 BuildRequires: libutempter-devel
 %endif
 
+%define svn 20090306
+
 Name:           koffice
-Epoch:          1
+Epoch:          2
 Version:        1.6.3
-Release:        17%{?dist}
+Release:        24.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -20,6 +22,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Source100:      koshell.png
 
+Patch50: koffice-1.6.3-glibc_strrchr.patch
+
+## hand-crafted patch, pretty close to:
+# LANG=en_US.UTF-8 svn diff \
+#  svn://anonsvn.kde.org/home/kde/tags/koffice/1.6.3/koffice \
+#  svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \
+#  > koffice-%{svn}svn.patch
+Patch100: koffice-%{svn}svn.patch
+# Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
+Patch101: koffice-1.6.3-quint32.patch
+
 # http://www.kde.org/info/security/advisory-20070730-1.txt
 Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
 
@@ -31,12 +44,14 @@ Patch2: ftp://ftp.kde.org/pub/kde/securi
 # svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
 Patch3: koffice-1.6.3-gcc43.patch
 
+# drop need/use of local fonts, use dejavu instead of arev
+Patch4: koffice-1.6.3-dejavu_fonts.patch
+
 # BuildRequires: world-devel ;)
 BuildRequires:  %{kdelibs3}-devel
 # See http://bugzilla.redhat.com/244091
-%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-## kjsembed bits, afaict, not really used (yet) -- Rex
-#BuildRequires:  kdebindings-devel
+%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+BuildRequires: automake libtool
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libart_lgpl-devel
@@ -111,8 +126,6 @@ KOffice is an integrated office suite.
 Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires:       perl
 Conflicts:      koffice-i18n < 4:%{version}
 %description core
@@ -175,6 +188,7 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
+Requires:       %{name}-filters
 %description krita
 %{summary}.
 
@@ -201,7 +215,7 @@ Requires:       %{name}-kexi = %{epoch}:
 %{summary}.
 
 %package kexi-driver-pgsql
-Summary:        Postresql driver for kexi
+Summary:        Postgresql driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
 %description kexi-driver-pgsql
@@ -218,7 +232,16 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-Requires:       mathml-fonts
+#if 0%{?fedora} > 9 
+Requires:       lyx-cmex10-fonts
+#else
+#Requires:       mathml-fonts
+#endif
+%if 0%{?fedora} > 10
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts 
+%endif
 %description kformula
 %{summary}.
 
@@ -240,9 +263,27 @@ Requires:        %{name}-core = %{epoch}
 %prep
 %setup -q
 
+%if 0%{?svn:1}
+%patch100 -p1 -b .svn
+%patch101 -p1 -b .quint32
+%else
 %patch1 -p0 -b .CVE-2007-3387
 %patch2 -p0 -b .CVE-2007-4352-5392-5393
 %patch3 -p1 -b .gcc43
+%endif
+
+%patch4 -p1 -b .dejavu
+# use LGC variant instead
+sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
+
+%patch50 -p1 -b glibc_strrchr
+
+# hack/fix for newer automake
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+make -f admin/Makefile.common
 
 
 %build
@@ -256,7 +297,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --with-extra-libs=%{_libdir} \
   --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
   --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
-  --enable-final
+  --disable-final
 
 make %{?_smp_mflags}
 
@@ -295,6 +336,9 @@ for desktop_file in %{buildroot}%{_datad
 done
 
 ## unpackaged files
+# fonts
+rm -rfv %{buildroot}%{_datadir}/apps/kformula/fonts/
+# libtool archives
 rm -f %{buildroot}%{_libdir}/lib*.la
 # shouldn't these be in koffice-l10n? 
 rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
@@ -318,58 +362,59 @@ rm -f %{buildroot}%{_libdir}/libkugar*.s
 %clean
 rm -rf %{buildroot}
 
-
 %post core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
 
 %postun core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kpresenter
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kpresenter 
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
+fi
+
+%posttrans core
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%post kword -p /sbin/ldconfig
+
+%postun kword -p /sbin/ldconfig
+
+%posttrans kword
+update-desktop-database -q &> /dev/null ||:
+
+%post kpresenter -p /sbin/ldconfig
+
+%postun kpresenter -p /sbin/ldconfig
+
+%posttrans kpresenter
+update-desktop-database -q &> /dev/null ||:
+
+%post kugar -p /sbin/ldconfig
+
+%postun kugar -p /sbin/ldconfig
+
+%posttrans kugar
+update-desktop-database -q &> /dev/null ||:
+
+%post kexi -p /sbin/ldconfig
+
+%postun kexi -p /sbin/ldconfig
+
+%posttrans kexi
+update-desktop-database -q &> /dev/null ||:
+
+%post kchart -p /sbin/ldconfig
+
+%postun kchart -p /sbin/ldconfig
+
+%posttrans kchart
+update-desktop-database -q &> /dev/null ||:
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -715,7 +760,31 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 %{_datadir}/applications/kde/*kplato.desktop
 
 
-%changelog 
+%changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
+- -kformula: Requires: lyx-cmex10-fonts
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-23.20090306svn
+- -kformula: use dejavu-lgc-sans-fonts
+- optimize scriptlets
+
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
+- -kformula: omit bundled fonts
+- koffice kword crash with formulas (#514217)
+
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-21.20090306svn
+- -krita: revert/re-add dropped Requires: -filters
+
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:1.6.3-20.20090306svn
+- rebuild for new ImageMagick
+
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-19.20090306svn
+- revert koffice2 -> koffice1, Epoch bump
+- 20090306svn
+
+* Mon Nov 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-18
+- pull in svn updates
+
 * Mon Oct 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-17
 - move libkiviocommon to -kivio (avoids libpython/multilib issues)
 



From ausil at fedoraproject.org  Wed Aug 26 18:55:50 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 26 Aug 2009 18:55:50 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.14,1.15
Message-ID: <20090826185550.8AA0311C02C2@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19064

Modified Files:
	dracut.spec 
Log Message:
ts kbd not kdb



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dracut.spec	26 Aug 2009 17:27:15 -0000	1.14
+++ dracut.spec	26 Aug 2009 18:55:50 -0000	1.15
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.9
-Release: 3%{?rdist}
+Release: 4%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -45,7 +45,7 @@ Requires: file
 Requires: bzip2
 Requires: dmraid
 %ifnarch s390 s390x
-Requires: kdb
+Requires: kbd
 %endif
 
 %if ! 0%{?with_switch_root}
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-4
+- its kbd not kdb
+
 * Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-3
 - make arch specific. There are arch specific dependancies.
 - add back kdb requirement on arches where its used.



From smilner at fedoraproject.org  Wed Aug 26 18:55:52 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 18:55:52 +0000 (UTC)
Subject: rpms/Django/devel Django.spec,1.25,1.26
Message-ID: <20090826185552.74C1011C02C2@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19099

Modified Files:
	Django.spec 
Log Message:
moved if to fedora 9 and lower


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- Django.spec	6 Aug 2009 21:13:52 -0000	1.25
+++ Django.spec	26 Aug 2009 18:55:52 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-3
+- ghosting admin py* is now FC9 and under.
+
 * Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 



From dwalsh at fedoraproject.org  Wed Aug 26 19:06:23 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 19:06:23 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.53,
	1.54 libsemanage.spec, 1.181, 1.182
Message-ID: <20090826190623.78D8D11C02C2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21146

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
- Make sure /root is not used in genhomedircon


libsemanage-rhat.patch:
 genhomedircon.c |   15 +++++++++++++++
 semanage.conf   |    2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libsemanage-rhat.patch	5 Aug 2009 19:21:57 -0000	1.53
+++ libsemanage-rhat.patch	26 Aug 2009 19:06:22 -0000	1.54
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.33/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.35/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.33/src/genhomedircon.c	2009-07-15 10:32:20.000000000 -0400
-@@ -304,6 +304,10 @@
++++ libsemanage-2.0.35/src/genhomedircon.c	2009-08-26 15:05:01.000000000 -0400
+@@ -304,10 +304,20 @@
  			continue;
  		if (!semanage_list_find(shells, pwbuf->pw_shell))
  			continue;
@@ -12,7 +12,17 @@ diff --exclude-from=exclude -N -u -r nsa
  		if (strcmp(pwbuf->pw_dir, "/") == 0)
  			continue;
  		if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
-@@ -794,6 +798,11 @@
+ 			continue;
++
++		if (strcmp(pwbuf->pw_dir, "/root") == 0) {
++			/* don't relabel /root*/
++			continue;
++		}
++
+ 		if (!(path = strdup(pwbuf->pw_dir))) {
+ 			break;
+ 		}
+@@ -794,6 +804,11 @@
  			 * /root */
  			continue;
  		}
@@ -24,9 +34,9 @@ diff --exclude-from=exclude -N -u -r nsa
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.33/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.35/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.33/src/semanage.conf	2009-07-15 10:30:33.000000000 -0400
++++ libsemanage-2.0.35/src/semanage.conf	2009-08-05 15:21:56.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- libsemanage.spec	5 Aug 2009 19:21:58 -0000	1.181
+++ libsemanage.spec	26 Aug 2009 19:06:23 -0000	1.182
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.35
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
+- Make sure /root is not used in genhomedircon
+
 * Wed Aug 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.35-1
 	* Revert hard linking of files between tmp/active/previous.
 	* Enable configuration of bzip behavior from Stephen Smalley.



From dwalsh at fedoraproject.org  Wed Aug 26 19:09:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 19:09:44 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.631,1.632
Message-ID: <20090826190944.828B611C02C2@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21739

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
- Add sandboxX



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -p -r1.631 -r1.632
--- policycoreutils.spec	26 Aug 2009 18:09:40 -0000	1.631
+++ policycoreutils.spec	26 Aug 2009 19:09:44 -0000	1.632
@@ -146,7 +146,7 @@ Group:	 System Environment/Base
 Requires: policycoreutils-python = %{version}-%{release} 
 Requires: xorg-x11-server-Xephyr
 Requires: matchbox-window-manager
-Requiers(post): /sbin/chkconfig
+Requires(post): /sbin/chkconfig
 
 %description sandbox
 The policycoreutils-python package contains the scripts to create graphical sandboxes



From dcbw at fedoraproject.org  Wed Aug 26 19:14:41 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 26 Aug 2009 19:14:41 +0000 (UTC)
Subject: rpms/ModemManager/devel .cvsignore, 1.2, 1.3 ModemManager.spec, 1.3,
	1.4 sources, 1.2, 1.3 udev-rule-typo.patch, 1.1, NONE
Message-ID: <20090826191441.D67BA11C02C2@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/ModemManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22616

Modified Files:
	.cvsignore ModemManager.spec sources 
Removed Files:
	udev-rule-typo.patch 
Log Message:
* Wed Aug 26 2009 Dan Williams <dcbw at redhat.com> - 0.2-3.20090826
- Fixes for Motorola and Ericsson devices
- Fixes for CDMA "serving-system" command parsing




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jul 2009 01:23:38 -0000	1.2
+++ .cvsignore	26 Aug 2009 19:14:41 -0000	1.3
@@ -1 +1,2 @@
 ModemManager-0.2-20090707.tar.bz2
+ModemManager-0.2-20090826.tar.bz2


Index: ModemManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/ModemManager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ModemManager.spec	1 Aug 2009 01:57:39 -0000	1.3
+++ ModemManager.spec	26 Aug 2009 19:14:41 -0000	1.4
@@ -1,4 +1,4 @@
-%define snapshot 20090707
+%define snapshot 20090826
 
 Summary: Mobile broadband modem management service
 Name: ModemManager
@@ -20,16 +20,12 @@ BuildRequires: glib2-devel
 BuildRequires: dbus-glib-devel >= 0.75
 BuildRequires: libgudev-devel >= 143
 
-# fix a typo in udev rules
-Patch0: udev-rule-typo.patch
-
 %description
 The ModemManager service provides a consistent API to operate many different
 modems, including mobile broadband (3G) devices.
 
 %prep
 %setup -q
-%patch0 -p1 -b .udev-rule-typo
 
 %build
 %configure \
@@ -66,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*
 
 %changelog
+* Wed Aug 26 2009 Dan Williams <dcbw at redhat.com> - 0.2-3.20090826
+- Fixes for Motorola and Ericsson devices
+- Fixes for CDMA "serving-system" command parsing
+
 * Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com>
 - Fix a typo in one of the udev rules files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ModemManager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2009 01:23:38 -0000	1.2
+++ sources	26 Aug 2009 19:14:41 -0000	1.3
@@ -1 +1 @@
-d30a9642a2533dbc3a833e0fda3a6378  ModemManager-0.2-20090707.tar.bz2
+e070cc8f706b2ff4dda4d49f1d813303  ModemManager-0.2-20090826.tar.bz2


--- udev-rule-typo.patch DELETED ---



From jforbes at fedoraproject.org  Wed Aug 26 19:25:58 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Wed, 26 Aug 2009 19:25:58 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ksm-fix-munlock.patch, NONE,
	1.1 kernel.spec, 1.1741, 1.1742 linux-2.6-ksm-kvm.patch, 1.2,
	1.3 linux-2.6-ksm.patch, 1.2, 1.3
Message-ID: <20090826192558.9E29F11C02C2@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24574

Modified Files:
	kernel.spec linux-2.6-ksm-kvm.patch linux-2.6-ksm.patch 
Added Files:
	linux-2.6-ksm-fix-munlock.patch 
Log Message:
Fix munlock with KSM (#516909) and re-enable KSM

linux-2.6-ksm-fix-munlock.patch:
 include/linux/ksm.h |   11 ++++-------
 kernel/fork.c       |    1 +
 mm/ksm.c            |    5 +----
 mm/memory.c         |    4 ++--
 mm/mmap.c           |    7 -------
 5 files changed, 8 insertions(+), 20 deletions(-)

--- NEW FILE linux-2.6-ksm-fix-munlock.patch ---
From: Andrea Arcangeli <aarcange at redhat.com>

Allowing page faults triggered by drivers tracking the mm during
exit_mmap with mm_users already zero is asking for troubles. And we
can't stop page faults from happening during exit_mmap or munlock fails
(munlock also better stop triggering page faults with mm_users zero).

ksm_exit if there are rmap_items still chained on this mm slot, will
take mmap_sem write side so preventing ksm to keep working on a mm while
exit_mmap runs. And ksm will bail out as soon as it notices that
mm_users is already zero thanks to the ksm_test_exit checks. So that
when a task is killed by OOM killer or the user, ksm will not
indefinitely prevent it to run exit_mmap and release its memory. 

Signed-off-by: Andrea Arcangeli <aarcange at redhat.com>
---

diff --git a/include/linux/ksm.h b/include/linux/ksm.h
index 2d64ff3..0e26de6 100644
--- a/include/linux/ksm.h
+++ b/include/linux/ksm.h
@@ -18,8 +18,7 @@ struct mmu_gather;
 int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
 		unsigned long end, int advice, unsigned long *vm_flags);
 int __ksm_enter(struct mm_struct *mm);
-void __ksm_exit(struct mm_struct *mm,
-		struct mmu_gather **tlbp, unsigned long end);
+void __ksm_exit(struct mm_struct *mm);
 
 static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
 {
@@ -41,11 +40,10 @@ static inline bool ksm_test_exit(struct mm_struct *mm)
 	return atomic_read(&mm->mm_users) == 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm,
-			    struct mmu_gather **tlbp, unsigned long end)
+static inline void ksm_exit(struct mm_struct *mm)
 {
 	if (test_bit(MMF_VM_MERGEABLE, &mm->flags))
-		__ksm_exit(mm, tlbp, end);
+		__ksm_exit(mm);
 }
 
 /*
@@ -86,8 +84,7 @@ static inline bool ksm_test_exit(struct mm_struct *mm)
 	return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm,
-			    struct mmu_gather **tlbp, unsigned long end)
+static inline void ksm_exit(struct mm_struct *mm)
 {
 }
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 9a16c21..6f93809 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -515,6 +515,7 @@ void mmput(struct mm_struct *mm)
 
 	if (atomic_dec_and_test(&mm->mm_users)) {
 		exit_aio(mm);
+		ksm_exit(mm);
 		exit_mmap(mm);
 		set_mm_exe_file(mm, NULL);
 		if (!list_empty(&mm->mmlist)) {
diff --git a/mm/ksm.c b/mm/ksm.c
index d03627f..329ebe9 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1428,8 +1428,7 @@ int __ksm_enter(struct mm_struct *mm)
 	return 0;
 }
 
-void __ksm_exit(struct mm_struct *mm,
-		struct mmu_gather **tlbp, unsigned long end)
+void __ksm_exit(struct mm_struct *mm)
 {
 	struct mm_slot *mm_slot;
 	int easy_to_free = 0;
@@ -1462,10 +1461,8 @@ void __ksm_exit(struct mm_struct *mm,
 		clear_bit(MMF_VM_MERGEABLE, &mm->flags);
 		mmdrop(mm);
 	} else if (mm_slot) {
-		tlb_finish_mmu(*tlbp, 0, end);
 		down_write(&mm->mmap_sem);
 		up_write(&mm->mmap_sem);
-		*tlbp = tlb_gather_mmu(mm, 1);
 	}
 }
 
diff --git a/mm/memory.c b/mm/memory.c
index 4a2c60d..025431e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2603,7 +2603,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	entry = maybe_mkwrite(pte_mkdirty(entry), vma);
 
 	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
-	if (!pte_none(*page_table) || ksm_test_exit(mm))
+	if (!pte_none(*page_table))
 		goto release;
 
 	inc_mm_counter(mm, anon_rss);
@@ -2753,7 +2753,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * handle that later.
 	 */
 	/* Only go through if we didn't race with anybody else... */
-	if (likely(pte_same(*page_table, orig_pte) && !ksm_test_exit(mm))) {
+	if (likely(pte_same(*page_table, orig_pte))) {
 		flush_icache_page(vma, page);
 		entry = mk_pte(page, vma->vm_page_prot);
 		if (flags & FAULT_FLAG_WRITE)
diff --git a/mm/mmap.c b/mm/mmap.c
index 1b0a709..f3f2a22 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2111,13 +2111,6 @@ void exit_mmap(struct mm_struct *mm)
 	end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL);
 	vm_unacct_memory(nr_accounted);
 
-	/*
-	 * For KSM to handle OOM without deadlock when it's breaking COW in a
-	 * likely victim of the OOM killer, we must serialize with ksm_exit()
-	 * after freeing mm's pages but before freeing its page tables.
-	 */
-	ksm_exit(mm, &tlb, end);
-
 	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
 	tlb_finish_mmu(tlb, 0, end);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -p -r1.1741 -r1.1742
--- kernel.spec	26 Aug 2009 15:50:19 -0000	1.1741
+++ kernel.spec	26 Aug 2009 19:25:56 -0000	1.1742
@@ -678,6 +678,7 @@ Patch1518: hid-ignore-all-recent-imon-de
 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
 
 # nouveau + drm fixes
 Patch1812: drm-next.patch
@@ -1298,10 +1299,11 @@ ApplyPatch hdpvr-ir-enable.patch
 ApplyPatch hid-ignore-all-recent-imon-devices.patch
 
 # Add kernel KSM support
-#ApplyPatch linux-2.6-ksm.patch
-#ApplyPatch linux-2.6-ksm-updates.patch
+ApplyPatch linux-2.6-ksm.patch
+ApplyPatch linux-2.6-ksm-updates.patch
+ApplyPatch linux-2.6-ksm-fix-munlock.patch
 # Optimize KVM for KSM support
-#ApplyPatch linux-2.6-ksm-kvm.patch
+ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -2011,6 +2013,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Justin M. Forbes <jforbes at redhat.com>
+- Fix munlock with KSM (#516909)
+- Re-enable KSM
+
 * Wed Aug 26 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git4
 - Drop patches merged upstream:

linux-2.6-ksm-kvm.patch:
 arch/x86/include/asm/kvm_host.h |    1 
 arch/x86/kvm/mmu.c              |   91 ++++++++++++++++++++++++++++++++--------
 arch/x86/kvm/paging_tmpl.h      |   15 +++++-
 virt/kvm/kvm_main.c             |   14 ++++++
 4 files changed, 101 insertions(+), 20 deletions(-)

Index: linux-2.6-ksm-kvm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ksm-kvm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-ksm-kvm.patch	23 Jul 2009 20:42:08 -0000	1.2
+++ linux-2.6-ksm-kvm.patch	26 Aug 2009 19:25:56 -0000	1.3
@@ -22,8 +22,8 @@ directly map pages into its shadow page 
 Signed-off-by: Izik Eidus <ieidus at redhat.com>
 Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
 ---
---- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-07-23 14:58:56.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/include/asm/kvm_host.h	2009-07-23 15:00:04.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-08-20 10:37:37.784886414 -0500
++++ linux-2.6.30.x86_64.kvm/arch/x86/include/asm/kvm_host.h	2009-08-20 10:39:33.742641558 -0500
 @@ -796,5 +796,6 @@ asmlinkage void kvm_handle_fault_on_rebo
  int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
  int kvm_age_hva(struct kvm *kvm, unsigned long hva);
@@ -31,8 +31,8 @@ Signed-off-by: Justin M. Forbes <jforbes
 +void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
  
  #endif /* _ASM_X86_KVM_HOST_H */
---- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-07-23 14:58:56.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/mmu.c	2009-07-23 15:00:04.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-08-20 10:37:37.964887039 -0500
++++ linux-2.6.30.x86_64.kvm/arch/x86/kvm/mmu.c	2009-08-20 10:41:15.231638028 -0500
 @@ -139,6 +139,8 @@ module_param(oos_shadow, bool, 0644);
  #define ACC_USER_MASK    PT_USER_MASK
  #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
@@ -54,7 +54,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  static gfn_t pse36_gfn_delta(u32 gpte)
  {
  	int shift = 32 - PT32_DIR_PSE36_SHIFT - PAGE_SHIFT;
-@@ -566,9 +573,7 @@ static void rmap_remove(struct kvm *kvm,
+@@ -573,9 +580,7 @@ static void rmap_remove(struct kvm *kvm,
  	if (*spte & shadow_accessed_mask)
  		kvm_set_pfn_accessed(pfn);
  	if (is_writeble_pte(*spte))
@@ -65,7 +65,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  	rmapp = gfn_to_rmap(kvm, sp->gfns[spte - sp->spt], is_large_pte(*spte));
  	if (!*rmapp) {
  		printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte);
-@@ -677,7 +682,8 @@ static int rmap_write_protect(struct kvm
+@@ -684,7 +689,8 @@ static int rmap_write_protect(struct kvm
  	return write_protected;
  }
  
@@ -75,7 +75,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	u64 *spte;
  	int need_tlb_flush = 0;
-@@ -692,8 +698,48 @@ static int kvm_unmap_rmapp(struct kvm *k
+@@ -699,8 +705,48 @@ static int kvm_unmap_rmapp(struct kvm *k
  	return need_tlb_flush;
  }
  
@@ -125,7 +125,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	int i;
  	int retval = 0;
-@@ -714,11 +760,13 @@ static int kvm_handle_hva(struct kvm *kv
+@@ -721,11 +767,13 @@ static int kvm_handle_hva(struct kvm *kv
  		end = start + (memslot->npages << PAGE_SHIFT);
  		if (hva >= start && hva < end) {
  			gfn_t gfn_offset = (hva - start) >> PAGE_SHIFT;
@@ -141,7 +141,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  		}
  	}
  
-@@ -727,10 +775,16 @@ static int kvm_handle_hva(struct kvm *kv
+@@ -734,10 +782,16 @@ static int kvm_handle_hva(struct kvm *kv
  
  int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
  {
@@ -160,7 +160,14 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	u64 *spte;
  	int young = 0;
-@@ -756,7 +810,7 @@ static int kvm_age_rmapp(struct kvm *kvm
+@@ -770,13 +824,13 @@ static void rmap_recycle(struct kvm_vcpu
+ 	gfn = unalias_gfn(vcpu->kvm, gfn);
+ 	rmapp = gfn_to_rmap(vcpu->kvm, gfn, lpage);
+ 
+-	kvm_unmap_rmapp(vcpu->kvm, rmapp);
++	kvm_unmap_rmapp(vcpu->kvm, rmapp, 0);
+ 	kvm_flush_remote_tlbs(vcpu->kvm);
+ }
  
  int kvm_age_hva(struct kvm *kvm, unsigned long hva)
  {
@@ -169,7 +176,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  }
  
  #ifdef MMU_DEBUG
-@@ -1665,7 +1719,7 @@ static int set_spte(struct kvm_vcpu *vcp
+@@ -1686,7 +1740,7 @@ static int set_spte(struct kvm_vcpu *vcp
  		    unsigned pte_access, int user_fault,
  		    int write_fault, int dirty, int largepage,
  		    gfn_t gfn, pfn_t pfn, bool speculative,
@@ -178,7 +185,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	u64 spte;
  	int ret = 0;
-@@ -1723,6 +1777,8 @@ static int set_spte(struct kvm_vcpu *vcp
+@@ -1744,6 +1798,8 @@ static int set_spte(struct kvm_vcpu *vcp
  				spte &= ~PT_WRITABLE_MASK;
  		}
  	}
@@ -187,7 +194,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  
  	if (pte_access & ACC_WRITE_MASK)
  		mark_page_dirty(vcpu->kvm, gfn);
-@@ -1736,7 +1792,8 @@ static void mmu_set_spte(struct kvm_vcpu
+@@ -1757,7 +1813,8 @@ static void mmu_set_spte(struct kvm_vcpu
  			 unsigned pt_access, unsigned pte_access,
  			 int user_fault, int write_fault, int dirty,
  			 int *ptwrite, int largepage, gfn_t gfn,
@@ -197,7 +204,7 @@ Signed-off-by: Justin M. Forbes <jforbes
  {
  	int was_rmapped = 0;
  	int was_writeble = is_writeble_pte(*shadow_pte);
-@@ -1765,7 +1822,8 @@ static void mmu_set_spte(struct kvm_vcpu
+@@ -1787,7 +1844,8 @@ static void mmu_set_spte(struct kvm_vcpu
  			was_rmapped = 1;
  	}
  	if (set_spte(vcpu, shadow_pte, pte_access, user_fault, write_fault,
@@ -207,17 +214,17 @@ Signed-off-by: Justin M. Forbes <jforbes
  		if (write_fault)
  			*ptwrite = 1;
  		kvm_x86_ops->tlb_flush(vcpu);
-@@ -1782,8 +1840,7 @@ static void mmu_set_spte(struct kvm_vcpu
+@@ -1804,8 +1862,7 @@ static void mmu_set_spte(struct kvm_vcpu
  	page_header_update_slot(vcpu->kvm, shadow_pte, gfn);
  	if (!was_rmapped) {
- 		rmap_add(vcpu, shadow_pte, gfn, largepage);
+ 		rmap_count = rmap_add(vcpu, shadow_pte, gfn, largepage);
 -		if (!is_rmap_pte(*shadow_pte))
 -			kvm_release_pfn_clean(pfn);
 +		kvm_release_pfn_clean(pfn);
+ 		if (rmap_count > RMAP_RECYCLE_THRESHOLD)
+ 			rmap_recycle(vcpu, gfn, largepage);
  	} else {
- 		if (was_writeble)
- 			kvm_release_pfn_dirty(pfn);
-@@ -1813,7 +1870,7 @@ static int __direct_map(struct kvm_vcpu 
+@@ -1837,7 +1894,7 @@ static int __direct_map(struct kvm_vcpu 
  		    || (largepage && iterator.level == PT_DIRECTORY_LEVEL)) {
  			mmu_set_spte(vcpu, iterator.sptep, ACC_ALL, ACC_ALL,
  				     0, write, 1, &pt_write,
@@ -226,8 +233,8 @@ Signed-off-by: Justin M. Forbes <jforbes
  			++vcpu->stat.pf_fixed;
  			break;
  		}
---- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-07-23 14:58:56.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/paging_tmpl.h	2009-07-23 15:01:49.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-08-20 10:37:37.966889166 -0500
++++ linux-2.6.30.x86_64.kvm/arch/x86/kvm/paging_tmpl.h	2009-08-20 10:39:33.747636180 -0500
 @@ -266,9 +266,13 @@ static void FNAME(update_pte)(struct kvm
  	if (mmu_notifier_retry(vcpu, vcpu->arch.update_pte.mmu_seq))
  		return;
@@ -275,8 +282,8 @@ Signed-off-by: Justin M. Forbes <jforbes
  	}
  
  	return !nr_present;
---- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-07-23 14:58:58.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/virt/kvm/kvm_main.c	2009-07-23 15:00:04.000000000 -0500
+--- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-08-20 10:37:45.448886340 -0500
++++ linux-2.6.30.x86_64.kvm/virt/kvm/kvm_main.c	2009-08-20 10:39:33.749636212 -0500
 @@ -859,6 +859,19 @@ static void kvm_mmu_notifier_invalidate_
  
  }

linux-2.6-ksm.patch:
 b/arch/alpha/include/asm/mman.h     |    3 
 b/arch/mips/include/asm/mman.h      |    3 
 b/arch/parisc/include/asm/mman.h    |    3 
 b/arch/xtensa/include/asm/mman.h    |    3 
 b/fs/proc/page.c                    |    5 
 b/include/asm-generic/mman-common.h |    5 
 b/include/linux/ksm.h               |   50 +
 b/include/linux/mm.h                |    1 
 b/include/linux/mmu_notifier.h      |   34 
 b/include/linux/rmap.h              |    6 
 b/include/linux/sched.h             |    7 
 b/kernel/fork.c                     |    8 
 b/mm/Kconfig                        |   11 
 b/mm/Makefile                       |    1 
 b/mm/ksm.c                          |   56 +
 b/mm/madvise.c                      |   41 
 b/mm/memory.c                       |    9 
 b/mm/mmu_notifier.c                 |   22 
 b/mm/mremap.c                       |   14 
 b/mm/rmap.c                         |   23 
 include/linux/ksm.h                 |   29 
 mm/ksm.c                            | 1506 +++++++++++++++++++++++++++++++++++-
 mm/madvise.c                        |   16 
 mm/memory.c                         |    7 
 24 files changed, 1780 insertions(+), 83 deletions(-)

Index: linux-2.6-ksm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ksm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-ksm.patch	31 Jul 2009 01:00:04 -0000	1.2
+++ linux-2.6-ksm.patch	26 Aug 2009 19:25:57 -0000	1.3
@@ -541,14 +541,14 @@ index bd29592..ac312a4 100644
  		struct file *file;
 @@ -425,7 +429,8 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
  	atomic_set(&mm->mm_count, 1);
- 	init_rwsem(&mm->mmap_sem);
+	init_rwsem(&mm->mmap_sem);
  	INIT_LIST_HEAD(&mm->mmlist);
 -	mm->flags = (current->mm) ? current->mm->flags : default_dump_filter;
 +	mm->flags = (current->mm) ?
 +		(current->mm->flags & MMF_INIT_MASK) : default_dump_filter;
- 	mm->oom_adj = (current->mm) ? current->mm->oom_adj : 0;
  	mm->core_state = NULL;
  	mm->nr_ptes = 0;
+	set_mm_counter(mm, file_rss, 0);
 @@ -486,6 +491,7 @@ void mmput(struct mm_struct *mm)
  
  	if (atomic_dec_and_test(&mm->mm_users)) {



From dcantrel at fedoraproject.org  Wed Aug 26 19:29:18 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 26 Aug 2009 19:29:18 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.271,1.272
Message-ID: <20090826192918.4A95911C02C2@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24992

Modified Files:
	dhcp.spec 
Log Message:
* Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-7
- Do not require policycoreutils for post scriptlet (#519479)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- dhcp.spec	22 Aug 2009 09:42:11 -0000	1.271
+++ dhcp.spec	26 Aug 2009 19:29:18 -0000	1.272
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  6%{?dist}
+Release:  7%{?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.
@@ -66,7 +66,6 @@ BuildRequires: libcap-ng-devel
 
 Requires(post): chkconfig
 Requires(post): coreutils
-Requires(post): policycoreutils
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
@@ -476,6 +475,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-7
+- Do not require policycoreutils for post scriptlet (#519479)
+
 * Fri Aug 21 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-6
 - BR libcap-ng-devel (#517649)
 



From eparis at fedoraproject.org  Wed Aug 26 19:33:53 2009
From: eparis at fedoraproject.org (Eric Paris)
Date: Wed, 26 Aug 2009 19:33:53 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-ima-leak.patch, NONE, 1.1 kernel.spec, 
	1.1742, 1.1743 allow-disabling-ima.diff, 1.1, NONE
Message-ID: <20090826193353.CCE2A11C02C2@cvs1.fedora.phx.redhat.com>

Author: eparis

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25551

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ima-leak.patch 
Removed Files:
	allow-disabling-ima.diff 
Log Message:
* Wed Aug 26 2009 Eric Paris <eparis at redhat.com>
- fix iint_cache leak in IMA code
  drop the ima=0 patch


linux-2.6-ima-leak.patch:
 ima_main.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE linux-2.6-ima-leak.patch ---
commit 3e1957da0c6adb57113cfc50bb0f59196e4fc5da
Author: Eric Paris <eparis at redhat.com>
Date:   Wed Aug 26 14:51:50 2009 -0400

    IMA: iint put in ima_counts_get and put
    
    ima_counts_get() calls ima_iint_find_insert_get() which takes a reference
    to the iint in question, but does not put that reference at the end of the
    function.  This can lead to a nasty memory leak.  Easy enough to reproduce:
    
    #include <sys/mman.h>
    #include <stdio.h>
    
    int main (void)
    {
    	int i;
    	void *ptr;
    
    	for (i=0; i < 100000; i++) {
    		ptr = mmap(NULL, 4096, PROT_READ|PROT_WRITE,
    			   MAP_SHARED|MAP_ANONYMOUS, -1, 0);
    		if (ptr == MAP_FAILED)
    			return 2;
    		munmap(ptr, 4096);
    	}
    
    	return 0;
    }
    
    Signed-off-by: Eric Paris <eparis at redhat.com>

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 101c512..4732f5e 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -262,6 +262,8 @@ void ima_counts_put(struct path *path, int mask)
 	else if (mask & (MAY_READ | MAY_EXEC))
 		iint->readcount--;
 	mutex_unlock(&iint->mutex);
+
+	kref_put(&iint->refcount, iint_free);
 }
 
 /*
@@ -291,6 +293,8 @@ void ima_counts_get(struct file *file)
 	if (file->f_mode & FMODE_WRITE)
 		iint->writecount++;
 	mutex_unlock(&iint->mutex);
+
+	kref_put(&iint->refcount, iint_free);
 }
 EXPORT_SYMBOL_GPL(ima_counts_get);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1742
retrieving revision 1.1743
diff -u -p -r1.1742 -r1.1743
--- kernel.spec	26 Aug 2009 19:25:56 -0000	1.1742
+++ kernel.spec	26 Aug 2009 19:33:53 -0000	1.1743
@@ -727,7 +727,8 @@ Patch12011: linux-2.6-block-silently-err
 # fix xen boot
 Patch12020: xen-fb-probe-fix.patch
 
-Patch90000: allow-disabling-ima.diff
+#fix ima iint_cache leak
+Patch13000: linux-2.6-ima-leak.patch
 
 %endif
 
@@ -1345,7 +1346,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # fix xen boot
 ApplyPatch xen-fb-probe-fix.patch
 
-ApplyPatch allow-disabling-ima.diff
+ApplyPatch linux-2.6-ima-leak.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2013,6 +2014,10 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Eric Paris <eparis at redhat.com>
+- fix iint_cache leak in IMA code
+  drop the ima=0 patch
+
 * Wed Aug 26 2009 Justin M. Forbes <jforbes at redhat.com>
 - Fix munlock with KSM (#516909)
 - Re-enable KSM


--- allow-disabling-ima.diff DELETED ---



From chkr at fedoraproject.org  Wed Aug 26 19:41:59 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 26 Aug 2009 19:41:59 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth-0.6.4-sg3_utils.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 podsleuth.spec, 1.10, 1.11 sources, 1.4,
	1.5 podsleuth-0.6.0-sg3_utils.patch, 1.1,
	NONE update-model-info-fix-artwork-bug-r64_68.patch, 1.1, NONE
Message-ID: <20090826194159.DEC3811C02CC@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27481

Modified Files:
	.cvsignore podsleuth.spec sources 
Added Files:
	podsleuth-0.6.4-sg3_utils.patch 
Removed Files:
	podsleuth-0.6.0-sg3_utils.patch 
	update-model-info-fix-artwork-bug-r64_68.patch 
Log Message:
* Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
- update to 0.6.4 (BZ 501404)
- remove upstreamed patch
- update sgutils patch


podsleuth-0.6.4-sg3_utils.patch:
 configure                             |   12 ++++++------
 src/PodSleuth/PodSleuth.dll.config.in |    2 +-
 src/PodSleuth/PodSleuth/ScsiReader.cs |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE podsleuth-0.6.4-sg3_utils.patch ---
diff -uNr podsleuth-0.6.4.old/configure podsleuth-0.6.4/configure
--- podsleuth-0.6.4.old/configure	2009-01-20 23:43:04.000000000 +0100
+++ podsleuth-0.6.4/configure	2009-08-25 23:27:10.000000000 +0200
@@ -4392,13 +4392,13 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
-$as_echo_n "checking for sg_ll_inquiry in -lsgutils... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
+$as_echo_n "checking for sg_ll_inquiry in -lsgutils2... " >&6; }
 if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsgutils  $LIBS"
+LIBS="-lsgutils2  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4462,11 +4462,11 @@
 #define HAVE_LIBSGUTILS 1
 _ACEOF
 
-  LIBS="-lsgutils $LIBS"
+  LIBS="-lsgutils2 $LIBS"
 
 else
-  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
-$as_echo "$as_me: error: Error! You need to have libsgutils." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils2." >&5
+$as_echo "$as_me: error: Error! You need to have libsgutils2." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
diff -uNr podsleuth-0.6.4.old/src/PodSleuth/PodSleuth/ScsiReader.cs podsleuth-0.6.4/src/PodSleuth/PodSleuth/ScsiReader.cs
--- podsleuth-0.6.4.old/src/PodSleuth/PodSleuth/ScsiReader.cs	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.4/src/PodSleuth/PodSleuth/ScsiReader.cs	2009-08-25 23:27:33.000000000 +0200
@@ -50,7 +50,7 @@
             }
         }
         
-        [DllImport("libsgutils.so.1")]
+        [DllImport("libsgutils2.so.2")]
         private static extern int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
             IntPtr resp, int mx_resp_len, int noisy, int verbose);
             
@@ -74,4 +74,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff -uNr podsleuth-0.6.4.old/src/PodSleuth/PodSleuth.dll.config.in podsleuth-0.6.4/src/PodSleuth/PodSleuth.dll.config.in
--- podsleuth-0.6.4.old/src/PodSleuth/PodSleuth.dll.config.in	2007-09-17 09:51:40.000000000 +0200
+++ podsleuth-0.6.4/src/PodSleuth/PodSleuth.dll.config.in	2009-08-25 23:28:07.000000000 +0200
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libsgutils.so.1" target="libsgutils.so.1" />
+	<dllmap dll="libsgutils2.so.2" target="libsgutils2.so.2" />
 </configuration>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Nov 2008 22:33:19 -0000	1.4
+++ .cvsignore	26 Aug 2009 19:41:59 -0000	1.5
@@ -1 +1 @@
-podsleuth-0.6.3.tar.bz2
+podsleuth-0.6.4.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- podsleuth.spec	20 Aug 2009 22:59:44 -0000	1.10
+++ podsleuth.spec	26 Aug 2009 19:41:59 -0000	1.11
@@ -1,25 +1,22 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.3
-Release:	4%{?dist}
+Version:	0.6.4
+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.0-sg3_utils.patch
+Patch0:		podsleuth-0.6.4-sg3_utils.patch
 Patch1:		podsleuth-0.6.2-libdir.patch
-Patch2:         podsleuth-0.6.0-wapidir.patch
-# From: http://banshee-project.org/~gburt/tmp/update-model-info-fix-artwork-bug-r64_68.patch
-# See: http://mail.gnome.org/archives/banshee-list/2008-October/msg00221.html
-Patch3:		update-model-info-fix-artwork-bug-r64_68.patch
+Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 BuildRequires:	hal-devel
 BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
-Requires:       sg3_utils-libs
+Requires:	sg3_utils-libs
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
@@ -51,7 +48,6 @@ Development files for podsleuth.
 %endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
-%patch3 -p0 -b .r68
 
 %build
 %configure --with-hal-callouts-dir=%{_libexecdir}
@@ -82,6 +78,11 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
+- update to 0.6.4 (BZ 501404)
+- remove upstreamed patch
+- update sgutils patch
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.3-4
 - Rebuild for ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Nov 2008 22:33:19 -0000	1.4
+++ sources	26 Aug 2009 19:41:59 -0000	1.5
@@ -1 +1 @@
-b5ee19f8a4eb8da8d600500df33eda87  podsleuth-0.6.3.tar.bz2
+b51e7bc2dd3e2265e75a04fe35974c10  podsleuth-0.6.4.tar.bz2


--- podsleuth-0.6.0-sg3_utils.patch DELETED ---


--- update-model-info-fix-artwork-bug-r64_68.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:13 +0000
Subject: [pkgdb] llvm: jgarzik has requested watchbugzilla
Message-ID: <20090826195413.D0D6110F879@bastion2.fedora.phx.redhat.com>

jgarzik has requested the watchbugzilla acl on llvm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:15 +0000
Subject: [pkgdb] llvm: jgarzik has requested watchcommits
Message-ID: <20090826195415.CD70A10F884@bastion2.fedora.phx.redhat.com>

jgarzik has requested the watchcommits acl on llvm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:19 +0000
Subject: [pkgdb] llvm: jgarzik has requested commit
Message-ID: <20090826195420.47D4E10F895@bastion2.fedora.phx.redhat.com>

jgarzik has requested the commit acl on llvm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:21 +0000
Subject: [pkgdb] llvm: jgarzik has requested approveacls
Message-ID: <20090826195421.1C0EA10F89A@bastion2.fedora.phx.redhat.com>

jgarzik has requested the approveacls acl on llvm (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:27 +0000
Subject: [pkgdb] llvm: jgarzik has requested watchbugzilla
Message-ID: <20090826195427.9318F10F8A1@bastion2.fedora.phx.redhat.com>

jgarzik has requested the watchbugzilla acl on llvm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:29 +0000
Subject: [pkgdb] llvm: jgarzik has requested commit
Message-ID: <20090826195429.5458110F8A2@bastion2.fedora.phx.redhat.com>

jgarzik has requested the commit acl on llvm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:33 +0000
Subject: [pkgdb] llvm: jgarzik has requested watchcommits
Message-ID: <20090826195433.A213A10F8A6@bastion2.fedora.phx.redhat.com>

jgarzik has requested the watchcommits acl on llvm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:36 +0000
Subject: [pkgdb] llvm: jgarzik has requested approveacls
Message-ID: <20090826195436.70E4710F8AB@bastion2.fedora.phx.redhat.com>

jgarzik has requested the approveacls acl on llvm (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:44 +0000
Subject: [pkgdb] llvm: jgarzik has requested watchbugzilla
Message-ID: <20090826195444.9E3ED10F88B@bastion2.fedora.phx.redhat.com>

jgarzik has requested the watchbugzilla acl on llvm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:46 +0000
Subject: [pkgdb] llvm: jgarzik has requested watchcommits
Message-ID: <20090826195446.C3C0210F8B1@bastion2.fedora.phx.redhat.com>

jgarzik has requested the watchcommits acl on llvm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:48 +0000
Subject: [pkgdb] llvm: jgarzik has requested commit
Message-ID: <20090826195448.77B1410F8B6@bastion2.fedora.phx.redhat.com>

jgarzik has requested the commit acl on llvm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 19:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 19:54:50 +0000
Subject: [pkgdb] llvm: jgarzik has requested approveacls
Message-ID: <20090826195450.21DCB10F8B9@bastion2.fedora.phx.redhat.com>

jgarzik has requested the approveacls acl on llvm (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From myoung at fedoraproject.org  Wed Aug 26 19:59:04 2009
From: myoung at fedoraproject.org (myoung)
Date: Wed, 26 Aug 2009 19:59:04 +0000 (UTC)
Subject: rpms/kernel/devel drm-next.patch, 1.6.6.8,
	1.6.6.9 patch-2.6.31-rc7-git4.bz2.sign, NONE,
	1.1.4.2 xen-fb-probe-fix.patch, NONE, 1.1.6.2 .cvsignore,
	1.1014.2.27, 1.1014.2.28 config-generic, 1.238.6.35,
	1.238.6.36 drm-intel-next.patch, 1.4.6.5,
	1.4.6.6 drm-nouveau.patch, 1.8.6.15,
	1.8.6.16 drm-page-flip.patch, 1.2.6.3, 1.2.6.4 drm-vga-arb.patch,
	1.5.2.2, 1.5.2.3 kernel.spec, 1.1294.2.58, 1.1294.2.59 sources,
	1.976.2.28, 1.976.2.29 upstream, 1.888.2.27,
	1.888.2.28 xen.pvops.patch, 1.1.2.36,
	1.1.2.37 patch-2.6.31-rc7-git1.bz2.sign, 1.1.2.2, NONE
Message-ID: <20090826195904.225C911C02CC@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29358

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic drm-intel-next.patch 
	drm-nouveau.patch drm-page-flip.patch drm-vga-arb.patch 
	kernel.spec sources upstream xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-next.patch patch-2.6.31-rc7-git4.bz2.sign 
	xen-fb-probe-fix.patch 
Removed Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc7-git1.bz2.sign 
Log Message:
another pvops update


drm-next.patch:
 drivers/gpu/drm/Makefile               |    2 
 drivers/gpu/drm/drm_crtc.c             |   76 ++-
 drivers/gpu/drm/drm_crtc_helper.c      |   44 +
 drivers/gpu/drm/drm_drv.c              |    4 
 drivers/gpu/drm/drm_edid.c             |   70 ++-
 drivers/gpu/drm/drm_encoder_slave.c    |  116 +++++
 drivers/gpu/drm/drm_modes.c            |  424 ++++++++++++++++++-
 drivers/gpu/drm/drm_sysfs.c            |   28 +
 drivers/gpu/drm/i915/i915_dma.c        |   35 -
 drivers/gpu/drm/i915/intel_lvds.c      |   22 
 drivers/gpu/drm/i915/intel_sdvo.c      |   41 -
 drivers/gpu/drm/radeon/Makefile        |   15 
 drivers/gpu/drm/radeon/mkregtable.c    |  726 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/r300.c          |   45 --
 drivers/gpu/drm/radeon/radeon_object.h |    1 
 drivers/gpu/drm/radeon/radeon_ttm.c    |   33 +
 drivers/gpu/drm/radeon/reg_srcs/r300   |  728 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/reg_srcs/rv515  |  486 ++++++++++++++++++++++
 drivers/gpu/drm/radeon/rv515.c         |   64 --
 drivers/gpu/drm/ttm/ttm_bo.c           |  295 ++++++++-----
 drivers/gpu/drm/ttm/ttm_bo_util.c      |    4 
 drivers/gpu/drm/ttm/ttm_global.c       |    4 
 drivers/gpu/drm/ttm/ttm_memory.c       |  508 +++++++++++++++++++----
 drivers/gpu/drm/ttm/ttm_module.c       |   58 ++
 drivers/gpu/drm/ttm/ttm_tt.c           |   37 -
 include/drm/drmP.h                     |   50 +-
 include/drm/drm_crtc.h                 |   12 
 include/drm/drm_encoder_slave.h        |  162 +++++++
 include/drm/drm_mode.h                 |   11 
 include/drm/drm_sysfs.h                |   12 
 include/drm/ttm/ttm_bo_api.h           |   13 
 include/drm/ttm/ttm_bo_driver.h        |   94 +++-
 include/drm/ttm/ttm_memory.h           |   43 +
 include/drm/ttm/ttm_module.h           |    2 
 34 files changed, 3763 insertions(+), 502 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.6.6.8 -r 1.6.6.9 drm-next.patchIndex: drm-next.patch
===================================================================
RCS file: drm-next.patch
diff -N drm-next.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ drm-next.patch	26 Aug 2009 19:58:46 -0000	1.6.6.9
@@ -0,0 +1,6379 @@
+commit 50f153036c9d9e4ae1768d5ca9c2ad4184f7a0b7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 21 13:21:01 2009 +1000
+
+    drm/radeon/kms: generate the safe register tables.
+    
+    Previously we just made these offline and included them,
+    but no reason we can't generate them at build time.
+    
+    TODO: add rs690 + r100/r200 when done.
+    should we do rs480/rs690 no tcl version?
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 759e4f83f418f4001e724042b4c0e408d615d9ec
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Thu Aug 20 10:29:09 2009 +0200
+
+    drm/ttm: Fixes for "Memory accounting rework."
+    
+    ttm:
+    Fix error paths when kobject_add returns an error.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Thu Aug 20 10:29:08 2009 +0200
+
+    drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
+    
+    ttm:
+    Remove a stray debug printout.
+    Remove a re-init of the lru spinlock at device init.
+    
+    radeon:
+    Fix the size of the bo_global allocation.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 51c8b4071d84d46cc100baa5931ad06b2a823c95
+Merge: a987fca... 6c30c53...
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 20 13:38:04 2009 +1000
+
+    Merge Linus master to drm-next
+    
+    linux-next conflict reported needed resolution.
+    
+    Conflicts:
+    	drivers/gpu/drm/drm_crtc.c
+    	drivers/gpu/drm/drm_edid.c
+    	drivers/gpu/drm/i915/intel_sdvo.c
+    	drivers/gpu/drm/radeon/radeon_ttm.c
+    	drivers/gpu/drm/ttm/ttm_bo.c
+
+commit a987fcaa805fcb24ba885c2e29fd4fdb6816f08f
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Tue Aug 18 16:51:56 2009 +0200
+
+    ttm: Make parts of a struct ttm_bo_device global.
+    
+    Common resources, like memory accounting and swap lists should be
+    global and not per device. Introduce a struct ttm_bo_global to
+    accomodate this, and register it with sysfs. Add a small sysfs interface
+    to return the number of active buffer objects.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit 5fd9cbad3a4ae82c83c55b9c621d156c326724ef
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Mon Aug 17 16:28:39 2009 +0200
+
+    drm/ttm: Memory accounting rework.
+    
+    Use inclusive zones to simplify accounting and its sysfs representation.
+    Use DMA32 accounting where applicable.
+    
+    Add a sysfs interface to make the heuristically determined limits
+    readable and configurable.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit e9840be8c23601285a70520b4898818f28ce8c2b
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Tue Aug 18 10:27:57 2009 +0200
+
+    drm/ttm: Add a virtual ttm sysfs device.
+    
+    The device directory will be the base directory of the
+    sysfs representation of other ttm subsystems.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit 327c225bd548bf7871f116a0baa5ebdac884e452
+Author: Thomas Hellstrom <thellstrom at vmware.com>
+Date:   Mon Aug 17 16:28:37 2009 +0200
+
+    drm: Enable drm drivers to add drm sysfs devices.
+    
+    Export utility functions for drivers to add specialized devices in the
+    sysfs drm class subdirectory.
+    
+    Initially this will be needed form TTM to add a virtual device that
+    handles power management.
+    
+    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
+    Signed-off-by: Dave Airlie <airlied at linux.ie>
+
+commit a0724fcf829e5afb66159ef68cb16a805ea11b42
+Author: Pekka Paalanen <pq at iki.fi>
+Date:   Mon Aug 17 01:18:38 2009 +0300
+
+    drm/ttm: optimize bo_kmap_type values
+    
+    A micro-optimization on the function ttm_kmap_obj_virtual().
+    
+    By defining the values of enum ttm_bo_kmap_obj::bo_kmap_type to have a
+    bit indicating iomem, size of the function ttm_kmap_obj_virtual() will be
+    reduced by 16 bytes on x86_64 (gcc 4.1.2).
+    
+    ttm_kmap_obj_virtual() may be heavily used, when buffer objects are
+    accessed via wrappers, that work for both kinds of memory addresses:
+    iomem cookies and kernel virtual.
+    
+    Signed-off-by: Pekka Paalanen <pq at iki.fi>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 949ef70e2d1a5c12178875f513df34fc85d91a38
+Author: Pekka Paalanen <pq at iki.fi>
+Date:   Mon Aug 17 19:49:19 2009 +0300
+
+    drm/kms: no need to return void value (encoder)
+    
+    Cc: Francisco Jerez <currojerez at riseup.net>
+    Signed-off-by: Pekka Paalanen <pq at iki.fi>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 53bd83899f5ba6b0da8f5ef976129273854a72d4
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Wed Jul 1 10:04:40 2009 -0700
+
+    drm: clarify scaling property names
+    
+    Now that we're using the scaling property in the Intel driver I noticed
+    that the names were a bit confusing.  I've corrected them according to
+    our discussion on IRC and the mailing list, though I've left out
+    potential new additions for a new scaling property with an integer (or
+    two) for the scaling factor.  None of the drivers implement that today,
+    but if someone wants to do it, I think it could be done with the
+    addition of a single new type and a new property to describe the
+    scaling factor in the X and Y directions.
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Acked-by: Alex Deucher <alexdeucher at gmail.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 776f3360de6ed246e973577828f725681120fd7a
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Wed Aug 19 15:56:37 2009 +1000
+
+    drm: fixup includes in encoder slave header files.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 453a7d46dca88704ed88b364c445ff55680a8557
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Wed Aug 19 15:51:55 2009 +1000
+
+    drm: remove root requirement from DRM_IOCTL_SET_VERSION (+ DRM_IOCTL_AUTH_MAGIC)
+    
+    Just a DRM_MASTER flag is sufficient here, though maybe this call is
+    totally deprecated anyway (xf86-video-intel still calls it though).
+    
+    (airlied: drop ioctl auth_magic as discussed on mailing list also)
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit cfcf4738cd6b5d7bed1473acad76d6430cf1fb0a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 13 13:31:54 2009 +1000
+
+    drm: fixup include file in drm_encoder_slave
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit a75f0236292a5fca65f26efedca48bd07db1834d
[...5986 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_ */


--- NEW FILE patch-2.6.31-rc7-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBKlSaJyGugalF9Dw4RAvx8AJkBOxwrd1XXzRAZCf/qEUTX9daFjwCYln/P
K6GN3ry0CMcWKkcjWGgwnA==
=ZSyc
-----END PGP SIGNATURE-----

xen-fb-probe-fix.patch:
 xen-fbfront.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xen-fb-probe-fix.patch ---
As soon as the framebuffer is registered, our methods may be called by the
kernel. This leads to a crash as xenfb_refresh() gets called before we have
the irq.

Connect to the backend before registering our framebuffer with the kernel.

Signed-off-by: Michal Schmidt <mschmidt at redhat.com>

--
Index: linux-git/drivers/video/xen-fbfront.c
===================================================================
--- linux-git.orig/drivers/video/xen-fbfront.c
+++ linux-git/drivers/video/xen-fbfront.c
@@ -454,6 +454,10 @@ static int __devinit xenfb_probe(struct 
 
 	xenfb_init_shared_page(info, fb_info);
 
+	ret = xenfb_connect_backend(dev, info);
+	if (ret < 0)
+		goto error;
+
 	ret = register_framebuffer(fb_info);
 	if (ret) {
 		fb_deferred_io_cleanup(fb_info);
@@ -464,10 +468,6 @@ static int __devinit xenfb_probe(struct 
 	}
 	info->fb_info = fb_info;
 
-	ret = xenfb_connect_backend(dev, info);
-	if (ret < 0)
-		goto error;
-
 	xenfb_make_preferred_console();
 	return 0;
 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.27
retrieving revision 1.1014.2.28
diff -u -p -r1.1014.2.27 -r1.1014.2.28
--- .cvsignore	24 Aug 2009 20:17:11 -0000	1.1014.2.27
+++ .cvsignore	26 Aug 2009 19:58:45 -0000	1.1014.2.28
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git1.bz2
+patch-2.6.31-rc7-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.35
retrieving revision 1.238.6.36
diff -u -p -r1.238.6.35 -r1.238.6.36
--- config-generic	18 Aug 2009 19:26:45 -0000	1.238.6.35
+++ config-generic	26 Aug 2009 19:58:46 -0000	1.238.6.36
@@ -1388,7 +1388,7 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_DEFAULT_PS=y
 
-CONFIG_WIMAX=y
+CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_SDIO=m
@@ -4068,3 +4068,4 @@ 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_DRM_I2C_CH7006 is not set

drm-intel-next.patch:
 intel_crt.c     |    4 +++
 intel_display.c |   71 +++++++++++---------------------------------------------
 intel_dp.c      |   12 +++++++++
 intel_drv.h     |   20 +++++++++++++++
 intel_dvo.c     |    6 ++++
 intel_hdmi.c    |   18 +++++++++-----
 intel_lvds.c    |    2 +
 intel_sdvo.c    |   13 +++++++++-
 intel_tv.c      |    2 +
 9 files changed, 85 insertions(+), 63 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.4.6.5 -r 1.4.6.6 drm-intel-next.patchIndex: drm-intel-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-intel-next.patch,v
retrieving revision 1.4.6.5
retrieving revision 1.4.6.6
diff -u -p -r1.4.6.5 -r1.4.6.6
--- drm-intel-next.patch	13 Aug 2009 18:13:03 -0000	1.4.6.5
+++ drm-intel-next.patch	26 Aug 2009 19:58:46 -0000	1.4.6.6
@@ -1,2653 +1,362 @@
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 8c47831..50d1f78 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1186,6 +1186,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 	if (ret)
- 		goto out_iomapfree;
- 
-+	dev_priv->wq = create_workqueue("i915");
-+	if (dev_priv->wq == NULL) {
-+		DRM_ERROR("Failed to create our workqueue.\n");
-+		ret = -ENOMEM;
-+		goto out_iomapfree;
-+	}
-+
- 	/* enable GEM by default */
- 	dev_priv->has_gem = 1;
- 
-@@ -1211,7 +1218,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 	if (!I915_NEED_GFX_HWS(dev)) {
- 		ret = i915_init_phys_hws(dev);
- 		if (ret != 0)
--			goto out_iomapfree;
-+			goto out_workqueue_free;
- 	}
- 
- 	i915_get_mem_freq(dev);
-@@ -1245,7 +1252,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 		ret = i915_load_modeset_init(dev, prealloc_size, agp_size);
- 		if (ret < 0) {
- 			DRM_ERROR("failed to init modeset\n");
--			goto out_rmmap;
-+			goto out_workqueue_free;
- 		}
- 	}
- 
-@@ -1256,6 +1263,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
- 
- 	return 0;
- 
-+out_workqueue_free:
-+	destroy_workqueue(dev_priv->wq);
- out_iomapfree:
- 	io_mapping_free(dev_priv->mm.gtt_mapping);
- out_rmmap:
-@@ -1269,6 +1278,8 @@ int i915_driver_unload(struct drm_device *dev)
- {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
- 
-+	destroy_workqueue(dev_priv->wq);
-+
- 	io_mapping_free(dev_priv->mm.gtt_mapping);
- 	if (dev_priv->mm.gtt_mtrr >= 0) {
- 		mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d087528..7537f57 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -219,6 +219,7 @@ typedef struct drm_i915_private {
- 	unsigned int lvds_vbt:1;
- 	unsigned int int_crt_support:1;
- 	unsigned int lvds_use_ssc:1;
-+	unsigned int edp_support:1;
- 	int lvds_ssc_freq;
- 
- 	struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
-@@ -229,6 +230,8 @@ typedef struct drm_i915_private {
- 
- 	spinlock_t error_lock;
- 	struct drm_i915_error_state *first_error;
-+	struct work_struct error_work;
-+	struct workqueue_struct *wq;
- 
- 	/* Register state */
- 	u8 saveLBB;
-@@ -888,6 +891,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
- 						      IS_I915GM(dev)))
- #define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
- #define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_IGDNG(dev))
-+#define SUPPORTS_EDP(dev)		(IS_IGDNG_M(dev))
- #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev))
- /* dsparb controlled by hw only */
- #define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_IGDNG(dev))
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 5bf4203..140bee1 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1570,7 +1570,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
- 	}
- 
- 	if (was_empty && !dev_priv->mm.suspended)
--		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
-+		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
- 	return seqno;
- }
- 
-@@ -1719,7 +1719,7 @@ i915_gem_retire_work_handler(struct work_struct *work)
- 	i915_gem_retire_requests(dev);
- 	if (!dev_priv->mm.suspended &&
- 	    !list_empty(&dev_priv->mm.request_list))
--		schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
-+		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
- 	mutex_unlock(&dev->struct_mutex);
- }
- 
-diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
-index 9a44bfc..cb3b974 100644
---- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
-+++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
-@@ -343,6 +343,8 @@ static int i915_error_state(struct seq_file *m, void *unused)
- 
- 	error = dev_priv->first_error;
- 
-+	seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
-+		   error->time.tv_usec);
- 	seq_printf(m, "EIR: 0x%08x\n", error->eir);
- 	seq_printf(m, "  PGTBL_ER: 0x%08x\n", error->pgtbl_er);
- 	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm);
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 7ba23a6..83aee80 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -290,6 +290,35 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
- 	return ret;
- }
- 
-+/**
-+ * i915_error_work_func - do process context error handling work
-+ * @work: work struct
-+ *
-+ * Fire an error uevent so userspace can see that a hang or error
-+ * was detected.
-+ */
-+static void i915_error_work_func(struct work_struct *work)
-+{
-+	drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
-+						    error_work);
-+	struct drm_device *dev = dev_priv->dev;
-+	char *event_string = "ERROR=1";
-+	char *envp[] = { event_string, NULL };
-+
-+	DRM_DEBUG("generating error event\n");
-+
-+	kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, envp);
-+}
-+
-+/**
-+ * i915_capture_error_state - capture an error record for later analysis
-+ * @dev: drm device
-+ *
-+ * Should be called when an error is detected (either a hang or an error
-+ * interrupt) to capture error state from the time of the error.  Fills
-+ * out a structure which becomes available in debugfs for user level tools
-+ * to pick up.
-+ */
- static void i915_capture_error_state(struct drm_device *dev)
- {
- 	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -325,12 +354,137 @@ static void i915_capture_error_state(struct drm_device *dev)
- 		error->acthd = I915_READ(ACTHD_I965);
- 	}
- 
-+	do_gettimeofday(&error->time);
-+
- 	dev_priv->first_error = error;
- 
- out:
- 	spin_unlock_irqrestore(&dev_priv->error_lock, flags);
- }
- 
-+/**
-+ * i915_handle_error - handle an error interrupt
-+ * @dev: drm device
-+ *
-+ * Do some basic checking of regsiter state at error interrupt time and
-+ * dump it to the syslog.  Also call i915_capture_error_state() to make
-+ * sure we get a record and make it available in debugfs.  Fire a uevent
-+ * so userspace knows something bad happened (should trigger collection
-+ * of a ring dump etc.).
-+ */
-+static void i915_handle_error(struct drm_device *dev)
-+{
-+	struct drm_i915_private *dev_priv = dev->dev_private;
-+	u32 eir = I915_READ(EIR);
-+	u32 pipea_stats = I915_READ(PIPEASTAT);
-+	u32 pipeb_stats = I915_READ(PIPEBSTAT);
-+
-+	i915_capture_error_state(dev);
-+
-+	printk(KERN_ERR "render error detected, EIR: 0x%08x\n",
-+	       eir);
[...2568 lines suppressed...]
-+
-+		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
-+		encoder->encoder_type = DRM_MODE_ENCODER_LVDS;
-+		connector->connector_type = DRM_MODE_CONNECTOR_LVDS;
-+		sdvo_priv->is_lvds = true;
-+	} else {
-+
-+		unsigned char bytes[2];
-+
-+		sdvo_priv->controlled_output = 0;
-+		memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
-+		DRM_DEBUG_KMS(I915_SDVO,
-+				"%s: Unknown SDVO output type (0x%02x%02x)\n",
-+				  SDVO_NAME(sdvo_priv),
-+				  bytes[0], bytes[1]);
-+		ret = false;
-+	}
-+
-+	if (ret && registered)
-+		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
-+
-+
-+	return ret;
-+
-+}
-+
- bool intel_sdvo_init(struct drm_device *dev, int output_device)
- {
- 	struct drm_connector *connector;
- 	struct intel_output *intel_output;
- 	struct intel_sdvo_priv *sdvo_priv;
- 
--	int connector_type;
- 	u8 ch[0x40];
- 	int i;
--	int encoder_type;
+ 		unsigned char bytes[2];
+@@ -2009,6 +2019,7 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
+ 				  bytes[0], bytes[1]);
+ 		ret = false;
+ 	}
++	intel_output->crtc_mask = (1 << 0) | (1 << 1);
  
- 	intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL);
+ 	if (ret && registered)
+ 		ret = drm_sysfs_connector_add(connector) == 0 ? true : false;
+diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
+index da4ab4d..2fbe13a 100644
+--- a/drivers/gpu/drm/i915/intel_tv.c
++++ b/drivers/gpu/drm/i915/intel_tv.c
+@@ -1718,6 +1718,7 @@ intel_tv_init(struct drm_device *dev)
  	if (!intel_output) {
-@@ -1925,88 +2075,28 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
- 	intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo;
- 
- 	/* In defaut case sdvo lvds is false */
--	sdvo_priv->is_lvds = false;
- 	intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);
- 
--	if (sdvo_priv->caps.output_flags &
--	    (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)) {
--		if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0)
--			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS0;
--		else
--			sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS1;
--
--		encoder_type = DRM_MODE_ENCODER_TMDS;
--		connector_type = DRM_MODE_CONNECTOR_DVID;
--
--		if (intel_sdvo_get_supp_encode(intel_output,
--					       &sdvo_priv->encode) &&
--		    intel_sdvo_get_digital_encoding_mode(intel_output) &&
--		    sdvo_priv->is_hdmi) {
--			/* enable hdmi encoding mode if supported */
--			intel_sdvo_set_encode(intel_output, SDVO_ENCODE_HDMI);
--			intel_sdvo_set_colorimetry(intel_output,
--						   SDVO_COLORIMETRY_RGB256);
--			connector_type = DRM_MODE_CONNECTOR_HDMIA;
--		}
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_SVID0)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
--		encoder_type = DRM_MODE_ENCODER_TVDAC;
--		connector_type = DRM_MODE_CONNECTOR_SVIDEO;
--		sdvo_priv->is_tv = true;
--		intel_output->needs_tv_clock = true;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
--		encoder_type = DRM_MODE_ENCODER_DAC;
--		connector_type = DRM_MODE_CONNECTOR_VGA;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
--		encoder_type = DRM_MODE_ENCODER_DAC;
--		connector_type = DRM_MODE_CONNECTOR_VGA;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS0)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
--		encoder_type = DRM_MODE_ENCODER_LVDS;
--		connector_type = DRM_MODE_CONNECTOR_LVDS;
--		sdvo_priv->is_lvds = true;
--	}
--	else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS1)
--	{
--		sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
--		encoder_type = DRM_MODE_ENCODER_LVDS;
--		connector_type = DRM_MODE_CONNECTOR_LVDS;
--		sdvo_priv->is_lvds = true;
--	}
--	else
--	{
--		unsigned char bytes[2];
--
--		sdvo_priv->controlled_output = 0;
--		memcpy (bytes, &sdvo_priv->caps.output_flags, 2);
--		DRM_DEBUG_KMS(I915_SDVO,
--				"%s: Unknown SDVO output type (0x%02x%02x)\n",
--				  SDVO_NAME(sdvo_priv),
--				  bytes[0], bytes[1]);
--		encoder_type = DRM_MODE_ENCODER_NONE;
--		connector_type = DRM_MODE_CONNECTOR_Unknown;
-+	if (intel_sdvo_output_setup(intel_output,
-+				    sdvo_priv->caps.output_flags) != true) {
-+		DRM_DEBUG("SDVO output failed to setup on SDVO%c\n",
-+			  output_device == SDVOB ? 'B' : 'C');
- 		goto err_i2c;
+ 		return;
  	}
- 
 +
  	connector = &intel_output->base;
- 	drm_connector_init(dev, connector, &intel_sdvo_connector_funcs,
--			   connector_type);
-+			   connector->connector_type);
-+
- 	drm_connector_helper_add(connector, &intel_sdvo_connector_helper_funcs);
- 	connector->interlace_allowed = 0;
- 	connector->doublescan_allowed = 0;
- 	connector->display_info.subpixel_order = SubPixelHorizontalRGB;
- 
--	drm_encoder_init(dev, &intel_output->enc, &intel_sdvo_enc_funcs, encoder_type);
-+	drm_encoder_init(dev, &intel_output->enc,
-+			&intel_sdvo_enc_funcs, intel_output->enc.encoder_type);
-+
- 	drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
  
+ 	drm_connector_init(dev, connector, &intel_tv_connector_funcs,
+@@ -1729,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
  	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index a43c98e..da4ab4d 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1490,6 +1490,27 @@ static struct input_res {
- 	{"1920x1080", 1920, 1080},
- };
- 
-+/*
-+ * Chose preferred mode  according to line number of TV format
-+ */
-+static void
-+intel_tv_chose_preferred_modes(struct drm_connector *connector,
-+			       struct drm_display_mode *mode_ptr)
-+{
-+	struct intel_output *intel_output = to_intel_output(connector);
-+	const struct tv_mode *tv_mode = intel_tv_mode_find(intel_output);
-+
-+	if (tv_mode->nbr_end < 480 && mode_ptr->vdisplay == 480)
-+		mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
-+	else if (tv_mode->nbr_end > 480) {
-+		if (tv_mode->progressive == true && tv_mode->nbr_end < 720) {
-+			if (mode_ptr->vdisplay == 720)
-+				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
-+		} else if (mode_ptr->vdisplay == 1080)
-+				mode_ptr->type |= DRM_MODE_TYPE_PREFERRED;
-+	}
-+}
-+
- /**
-  * Stub get_modes function.
-  *
-@@ -1544,6 +1565,7 @@ intel_tv_get_modes(struct drm_connector *connector)
- 		mode_ptr->clock = (int) tmp;
- 
- 		mode_ptr->type = DRM_MODE_TYPE_DRIVER;
-+		intel_tv_chose_preferred_modes(connector, mode_ptr);
- 		drm_mode_probed_add(connector, mode_ptr);
- 		count++;
- 	}
+ 	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
+ 	intel_output->type = INTEL_OUTPUT_TVOUT;
++	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
+ 	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
+ 	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
+ 	intel_output->dev_priv = tv_priv;

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   44 
 drivers/gpu/drm/Makefile                    |    2 
 drivers/gpu/drm/drm_bufs.c                  |   28 
 drivers/gpu/drm/i2c/Makefile                |    4 
 drivers/gpu/drm/i2c/ch7006_drv.c            |  529 
 drivers/gpu/drm/i2c/ch7006_mode.c           |  473 
 drivers/gpu/drm/i2c/ch7006_priv.h           |  340 
 drivers/gpu/drm/nouveau/Makefile            |   27 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5190 ++++++
 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   |  518 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  628 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   92 
 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       |  374 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1182 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   64 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  933 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  936 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1077 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  441 
 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       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  565 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  194 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1276 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  317 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  826 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1018 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  525 
 drivers/gpu/drm/nouveau/nv04_dfp.c          |  611 
 drivers/gpu/drm/nouveau/nv04_display.c      |  291 
 drivers/gpu/drm/nouveau/nv04_fb.c           |   21 
 drivers/gpu/drm/nouveau/nv04_fbcon.c        |  292 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  295 
 drivers/gpu/drm/nouveau/nv04_graph.c        |  583 
 drivers/gpu/drm/nouveau/nv04_instmem.c      |  207 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_timer.c        |   51 
 drivers/gpu/drm/nouveau/nv04_tv.c           |  304 
 drivers/gpu/drm/nouveau/nv10_fb.c           |   24 
 drivers/gpu/drm/nouveau/nv10_fifo.c         |  177 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  945 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  660 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  582 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  784 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  223 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2203 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  815 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  299 
 drivers/gpu/drm/nouveau/nv50_display.c      |  855 +
 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         |  475 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  437 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  499 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  253 
 drivers/gpu/drm/nouveau/nvreg.h             |  535 
 drivers/gpu/drm/ttm/ttm_bo.c                |    4 
 include/drm/Kbuild                          |    1 
 include/drm/drmP.h                          |    2 
 include/drm/i2c/ch7006.h                    |   86 
 include/drm/nouveau_drm.h                   |  216 
 85 files changed, 58110 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.15 -r 1.8.6.16 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.15
retrieving revision 1.8.6.16
diff -u -p -r1.8.6.15 -r1.8.6.16
--- drm-nouveau.patch	11 Aug 2009 18:55:08 -0000	1.8.6.15
+++ drm-nouveau.patch	26 Aug 2009 19:58:47 -0000	1.8.6.16
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 39b393d..5ea10e5 100644
+index 39b393d..49b21cc 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -143,3 +143,33 @@ config DRM_SAVAGE
+@@ -143,3 +143,47 @@ 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.
@@ -36,15 +36,30 @@ index 39b393d..5ea10e5 100644
 +	  Say Y here if you want to control the backlight of your display
 +	  (e.g. a laptop panel).
 +
++menu "I2C encoder or helper chips"
++     depends on DRM
++
++config DRM_I2C_CH7006
++	tristate "Chrontel ch7006 TV encoder"
++	default m if DRM_NOUVEAU
++	help
++	  Support for Chrontel ch7006 and similar TV encoders, found
++	  on some nVidia video cards.
++
++	  This driver is currently only useful if you're also using
++	  the nouveau driver.
++
++endmenu
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index fe23f29..4c6a38d 100644
+index 5f0aec4..f0ef455 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -27,3 +27,4 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -27,3 +27,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
  obj-$(CONFIG_DRM_SIS)   += sis/
  obj-$(CONFIG_DRM_SAVAGE)+= savage/
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
++obj-y			+= i2c/
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
 index 6246e3f..436e2fe 100644
 --- a/drivers/gpu/drm/drm_bufs.c
@@ -103,9 +118,1379 @@ index 6246e3f..436e2fe 100644
  			     (map->type == _DRM_SHM));
  	if (ret) {
  		if (map->type == _DRM_REGISTERS)
+diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
+new file mode 100644
+index 0000000..6d2abaf
+--- /dev/null
++++ b/drivers/gpu/drm/i2c/Makefile
+@@ -0,0 +1,4 @@
++ccflags-y := -Iinclude/drm
++
++ch7006-y := ch7006_drv.o ch7006_mode.o
++obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
+diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
+new file mode 100644
+index 0000000..47421ba
+--- /dev/null
++++ b/drivers/gpu/drm/i2c/ch7006_drv.c
+@@ -0,0 +1,529 @@
++/*
++ * Copyright (C) 2009 Francisco Jerez.
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
++ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#include "ch7006_priv.h"
++
++/* DRM encoder functions */
++
++static void ch7006_encoder_set_config(struct drm_encoder *encoder,
++				      void *params)
++{
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	priv->params = params;
++}
++
++static void ch7006_encoder_destroy(struct drm_encoder *encoder)
++{
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	drm_property_destroy(encoder->dev, priv->scale_property);
++
++	kfree(priv);
++	to_encoder_slave(encoder)->slave_priv = NULL;
++
++	drm_i2c_encoder_destroy(encoder);
++}
++
++static void  ch7006_encoder_dpms(struct drm_encoder *encoder, int mode)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++	struct ch7006_state *state = &priv->state;
++
++	ch7006_dbg(client, "\n");
++
++	if (mode == priv->last_dpms)
++		return;
++	priv->last_dpms = mode;
++
++	ch7006_setup_power_state(encoder);
++
++	ch7006_load_reg(client, state, CH7006_POWER);
++}
++
++static void ch7006_encoder_save(struct drm_encoder *encoder)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	ch7006_dbg(client, "\n");
++
++	ch7006_state_save(client, &priv->saved_state);
++}
++
++static void ch7006_encoder_restore(struct drm_encoder *encoder)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	ch7006_dbg(client, "\n");
++
++	ch7006_state_load(client, &priv->saved_state);
++}
++
++static bool ch7006_encoder_mode_fixup(struct drm_encoder *encoder,
++				      struct drm_display_mode *mode,
++				      struct drm_display_mode *adjusted_mode)
++{
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++
++	/* The ch7006 is painfully picky with the input timings so no
++	 * custom modes for now... */
++
++	priv->mode = ch7006_lookup_mode(encoder, mode);
++
++	return !!priv->mode;
++}
++
++static int ch7006_encoder_mode_valid(struct drm_encoder *encoder,
++				     struct drm_display_mode *mode)
++{
++	if (ch7006_lookup_mode(encoder, mode))
++		return MODE_OK;
++	else
++		return MODE_BAD;
++}
++
++static void ch7006_encoder_mode_set(struct drm_encoder *encoder,
++				     struct drm_display_mode *drm_mode,
++				     struct drm_display_mode *adjusted_mode)
++{
++	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
++	struct ch7006_priv *priv = to_ch7006_priv(encoder);
++	struct ch7006_encoder_params *params = priv->params;
++	struct ch7006_state *state = &priv->state;
++	uint8_t *regs = state->regs;
++	struct ch7006_mode *mode = priv->mode;
++	struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];
++	int start_active;
++
++	ch7006_dbg(client, "\n");
++
++	regs[CH7006_DISPMODE] = norm->dispmode | mode->dispmode;
++	regs[CH7006_BWIDTH] = 0;
++	regs[CH7006_INPUT_FORMAT] = bitf(CH7006_INPUT_FORMAT_FORMAT,
[...14498 lines suppressed...]
++#define NV_PRAMDAC_TV_VSYNC_DELAY			0x00680728
++#define NV_PRAMDAC_TV_HTOTAL				0x0068072c
++#define NV_PRAMDAC_TV_HSKEW				0x00680730
++#define NV_PRAMDAC_TV_HSYNC_DELAY			0x00680734
++#define NV_PRAMDAC_TV_HSYNC_DELAY2			0x00680738
++
++#define NV_PRAMDAC_TV_SETUP                             0x00680700
++
 +#define NV_PRAMDAC_FP_VDISPLAY_END			0x00680800
 +#define NV_PRAMDAC_FP_VTOTAL				0x00680804
 +#define NV_PRAMDAC_FP_VCRTC				0x00680808
@@ -54217,6 +58206,7 @@ index 0000000..90623b0
 +#	define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12		(1 << 24)
 +#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS		(1 << 28)
 +#	define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE		(2 << 28)
++#define NV_PRAMDAC_FP_MARGIN_COLOR			0x0068084c
 +#define NV_PRAMDAC_850					0x00680850
 +#define NV_PRAMDAC_85C					0x0068085c
 +#define NV_PRAMDAC_FP_DEBUG_0				0x00680880
@@ -54242,12 +58232,16 @@ index 0000000..90623b0
 +#	define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE		(1 << 16)
 +#define NV_PRAMDAC_FP_TMDS_DATA				0x006808b4
 +
++#define NV_PRAMDAC_8C0                                  0x006808c0
++
 +/* Some kind of switch */
 +#define NV_PRAMDAC_900					0x00680900
 +#define NV_PRAMDAC_A20					0x00680A20
 +#define NV_PRAMDAC_A24					0x00680A24
 +#define NV_PRAMDAC_A34					0x00680A34
 +
++#define NV_PRAMDAC_CTV					0x00680c00
++
 +/* names fabricated from NV_USER_DAC info */
 +#define NV_PRMDIO_PIXEL_MASK		0x006813c6
 +#	define NV_PRMDIO_PIXEL_MASK_MASK	0xff
@@ -54335,10 +58329,10 @@ index 0000000..90623b0
 +
 +#endif
 diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
-index 6538d42..ebc9532 100644
+index 87c0625..863ac5e 100644
 --- a/drivers/gpu/drm/ttm/ttm_bo.c
 +++ b/drivers/gpu/drm/ttm/ttm_bo.c
-@@ -89,6 +89,7 @@ int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
+@@ -123,6 +123,7 @@ int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
  	}
  	return 0;
  }
@@ -54346,7 +58340,7 @@ index 6538d42..ebc9532 100644
  
  static void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
  {
-@@ -843,6 +844,7 @@ int ttm_bo_wait_cpu(struct ttm_buffer_object *bo, bool no_wait)
+@@ -883,6 +884,7 @@ int ttm_bo_wait_cpu(struct ttm_buffer_object *bo, bool no_wait)
  
  	return ret;
  }
@@ -54354,7 +58348,7 @@ index 6538d42..ebc9532 100644
  
  int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
  		       uint32_t proposed_placement,
-@@ -1628,12 +1630,14 @@ int ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait)
+@@ -1722,12 +1724,14 @@ int ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait)
  	ttm_bo_unreserve(bo);
  	return ret;
  }
@@ -54379,10 +58373,10 @@ index b940fdf..cfa6af4 100644
  unifdef-y += via_drm.h
 +unifdef-y += nouveau_drm.h
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..46e72e9 100644
+index e0f1c1f..84e2fa6 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -1216,6 +1216,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
+@@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
  extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
  
  				/* Buffer management support (drm_bufs.h) */
@@ -54391,12 +58385,104 @@ index 45b67d9..46e72e9 100644
  extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
  extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
  extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
+diff --git a/include/drm/i2c/ch7006.h b/include/drm/i2c/ch7006.h
+new file mode 100644
+index 0000000..8390b43
+--- /dev/null
++++ b/include/drm/i2c/ch7006.h
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (C) 2009 Francisco Jerez.
++ * All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial
++ * portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
++ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#ifndef __DRM_I2C_CH7006_H__
++#define __DRM_I2C_CH7006_H__
++
++/**
++ * struct ch7006_encoder_params
++ *
++ * Describes how the ch7006 is wired up with the GPU. It should be
++ * used as the @params parameter of its @set_config method.
++ *
++ * See "http://www.chrontel.com/pdf/7006.pdf" for their precise
++ * meaning.
++ */
++struct ch7006_encoder_params {
++	enum {
++		CH7006_FORMAT_RGB16 = 0,
++		CH7006_FORMAT_YCrCb24m16,
++		CH7006_FORMAT_RGB24m16,
++		CH7006_FORMAT_RGB15,
++		CH7006_FORMAT_RGB24m12C,
++		CH7006_FORMAT_RGB24m12I,
++		CH7006_FORMAT_RGB24m8,
++		CH7006_FORMAT_RGB16m8,
++		CH7006_FORMAT_RGB15m8,
++		CH7006_FORMAT_YCrCb24m8,
++	} input_format;
++
++	enum {
++		CH7006_CLOCK_SLAVE = 0,
++		CH7006_CLOCK_MASTER,
++	} clock_mode;
++
++	enum {
++		CH7006_CLOCK_EDGE_NEG = 0,
++		CH7006_CLOCK_EDGE_POS,
++	} clock_edge;
++
++	int xcm, pcm;
++
++	enum {
++		CH7006_SYNC_SLAVE = 0,
++		CH7006_SYNC_MASTER,
++	} sync_direction;
++
++	enum {
++		CH7006_SYNC_SEPARATED = 0,
++		CH7006_SYNC_EMBEDDED,
++	} sync_encoding;
++
++	enum {
++		CH7006_POUT_1_8V = 0,
++		CH7006_POUT_3_3V,
++	} pout_level;
++
++	enum {
++		CH7006_ACTIVE_HSYNC = 0,
++		CH7006_ACTIVE_DSTART,
++	} active_detect;
++};
++
++#endif
 diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
 new file mode 100644
-index 0000000..3e52b24
+index 0000000..2050357
 --- /dev/null
 +++ b/include/drm/nouveau_drm.h
-@@ -0,0 +1,214 @@
+@@ -0,0 +1,216 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -54549,9 +58635,11 @@ index 0000000..3e52b24
 +	uint32_t offset;
 +	uint32_t nr_buffers;
 +	uint32_t nr_relocs;
-+	uint32_t pad0;
++	uint32_t nr_dwords;
 +	uint64_t buffers;
 +	uint64_t relocs;
++	uint32_t suffix0;
++	uint32_t suffix1;
 +};
 +
 +struct drm_nouveau_gem_pin {

drm-page-flip.patch:
 drivers/gpu/drm/drm_crtc.c              |  169 +++++++++++++++++++++++++++++++-
 drivers/gpu/drm/drm_crtc_helper.c       |   12 ++
 drivers/gpu/drm/drm_drv.c               |    1 
 drivers/gpu/drm/drm_fops.c              |   68 ++++++++++++
 drivers/gpu/drm/drm_irq.c               |   43 ++++++++
 drivers/gpu/drm/i915/i915_drv.c         |    1 
 drivers/gpu/drm/i915/intel_display.c    |   24 +++-
 drivers/gpu/drm/nouveau/nv04_crtc.c     |    2 
 drivers/gpu/drm/nouveau/nv50_crtc.c     |    2 
 drivers/gpu/drm/radeon/radeon_display.c |    3 
 include/drm/drm.h                       |   25 ++++
 include/drm/drmP.h                      |   32 ++++++
 include/drm/drm_crtc.h                  |   27 +++++
 include/drm/drm_crtc_helper.h           |    4 
 include/drm/drm_mode.h                  |   16 +++
 15 files changed, 415 insertions(+), 14 deletions(-)

Index: drm-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-page-flip.patch,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -p -r1.2.6.3 -r1.2.6.4
--- drm-page-flip.patch	13 Aug 2009 18:13:04 -0000	1.2.6.3
+++ drm-page-flip.patch	26 Aug 2009 19:58:48 -0000	1.2.6.4
@@ -1,34 +1,6 @@
-commit f2884697ef0e0064a189d5baacf565d6742687f1
-Author: Kristian H?gsberg <krh at hinata.local>
-Date:   Mon Jul 13 09:07:19 2009 -0400
-
-    Add modesetting pageflip ioctl and corresponding drm event
-    
-    This patch adds a vblank synced pageflip ioctl for to the modesetting
-    family of ioctls.  The ioctl takes a crtc and an fb and schedules a
-    pageflip to the new fb at the next coming vertical blank event.  This
-    feature lets userspace implement tear-free updating of the screen contents
-    with hw-guaranteed low latency page flipping.
-    
-    The ioctl is asynchronous in that it returns immediately and then later
-    notifies the client by making an event available for reading on the drm fd.
-    This lets applications add the drm fd to their main loop and handle other
-    tasks while waiting for the flip to happen.  The event includes the time
-    of the flip, the frame counter and a 64 bit opaque token provided by
-    user space in the ioctl.
-    
-    Based on work and suggestions from
-    	Jesse Barnes <jbarnes at virtuousgeek.org>,
-    	Jakob Bornecrantz <wallbraker at gmail.com>,
-    	Chris Wilson <chris at chris-wilson.co.uk>
-    
-    Signed-off-by: Kristian H?gsberg <krh at redhat.com>
-    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-
-diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 8fab789..f598ce0 100644
---- a/drivers/gpu/drm/drm_crtc.c
-+++ b/drivers/gpu/drm/drm_crtc.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc.c	2009-08-25 09:52:41.000000000 +1000
 @@ -34,6 +34,8 @@
  #include "drmP.h"
  #include "drm_crtc.h"
@@ -38,7 +10,7 @@ index 8fab789..f598ce0 100644
  struct drm_prop_enum_list {
  	int type;
  	char *name;
-@@ -342,6 +344,34 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
+@@ -329,6 +331,34 @@ void drm_framebuffer_cleanup(struct drm_
  EXPORT_SYMBOL(drm_framebuffer_cleanup);
  
  /**
@@ -73,7 +45,7 @@ index 8fab789..f598ce0 100644
   * drm_crtc_init - Initialise a new CRTC object
   * @dev: DRM device
   * @crtc: CRTC object to init
-@@ -352,17 +382,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
+@@ -339,17 +369,19 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
   *
   * Inits a new object created as base part of an driver crtc object.
   */
@@ -94,7 +66,7 @@ index 8fab789..f598ce0 100644
  	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_crtc_init);
-@@ -381,6 +413,9 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
+@@ -368,6 +400,9 @@ void drm_crtc_cleanup(struct drm_crtc *c
  {
  	struct drm_device *dev = crtc->dev;
  
@@ -104,7 +76,7 @@ index 8fab789..f598ce0 100644
  	if (crtc->gamma_store) {
  		kfree(crtc->gamma_store);
  		crtc->gamma_store = NULL;
-@@ -388,6 +423,7 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
+@@ -375,6 +410,7 @@ void drm_crtc_cleanup(struct drm_crtc *c
  
  	drm_mode_object_put(dev, &crtc->base);
  	list_del(&crtc->head);
@@ -112,7 +84,7 @@ index 8fab789..f598ce0 100644
  	dev->mode_config.num_crtc--;
  }
  EXPORT_SYMBOL(drm_crtc_cleanup);
-@@ -2452,3 +2488,134 @@ out:
+@@ -2478,3 +2514,134 @@ out:
  	mutex_unlock(&dev->mode_config.mutex);
  	return ret;
  }
@@ -247,11 +219,10 @@ index 8fab789..f598ce0 100644
 +
 +	return ret;
 +}
-diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index 3da9cfa..5a26bab 100644
---- a/drivers/gpu/drm/drm_crtc_helper.c
-+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -868,8 +868,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c	2009-08-25 09:52:41.000000000 +1000
+@@ -874,8 +874,10 @@ int drm_crtc_helper_set_config(struct dr
  		old_fb = set->crtc->fb;
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
@@ -262,7 +233,7 @@ index 3da9cfa..5a26bab 100644
  		if (ret != 0)
  		    goto fail_set_mode;
  	}
-@@ -1095,3 +1097,13 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
+@@ -1101,3 +1103,13 @@ int drm_helper_resume_force_mode(struct 
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -276,11 +247,10 @@ index 3da9cfa..5a26bab 100644
 +	return crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 +}
 +EXPORT_SYMBOL(drm_crtc_helper_set_base);
-diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index b39d7bf..c66c993 100644
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[] = {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_drv.c	2009-08-25 09:52:41.000000000 +1000
+@@ -145,6 +145,7 @@ static struct drm_ioctl_desc drm_ioctls[
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
@@ -288,11 +258,10 @@ index b39d7bf..c66c993 100644
  };
  
  #define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )
-diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 251bc0e..dcd9c66 100644
---- a/drivers/gpu/drm/drm_fops.c
-+++ b/drivers/gpu/drm/drm_fops.c
-@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_fops.c	2009-08-25 09:52:41.000000000 +1000
+@@ -257,6 +257,8 @@ static int drm_open_helper(struct inode 
  
  	INIT_LIST_HEAD(&priv->lhead);
  	INIT_LIST_HEAD(&priv->fbs);
@@ -301,7 +270,7 @@ index 251bc0e..dcd9c66 100644
  
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
-@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -429,6 +431,9 @@ int drm_release(struct inode *inode, str
  {
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev = file_priv->minor->dev;
@@ -311,7 +280,7 @@ index 251bc0e..dcd9c66 100644
  	int retcode = 0;
  
  	lock_kernel();
-@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -451,6 +456,19 @@ int drm_release(struct inode *inode, str
  	if (file_priv->minor->master)
  		drm_master_release(dev, filp);
  
@@ -331,7 +300,7 @@ index 251bc0e..dcd9c66 100644
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_release(dev, file_priv);
  
-@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -544,9 +562,55 @@ int drm_release(struct inode *inode, str
  }
  EXPORT_SYMBOL(drm_release);
  
@@ -389,10 +358,9 @@ index 251bc0e..dcd9c66 100644
 +	return mask;
  }
  EXPORT_SYMBOL(drm_poll);
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index b4a3dbc..c7a17f6 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:52:41.000000000 +1000
 @@ -34,6 +34,7 @@
   */
  
@@ -401,7 +369,7 @@ index b4a3dbc..c7a17f6 100644
  
  #include <linux/interrupt.h>	/* For task queue support */
  
-@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
+@@ -71,6 +72,44 @@ int drm_irq_by_busid(struct drm_device *
  	return 0;
  }
  
@@ -446,7 +414,7 @@ index b4a3dbc..c7a17f6 100644
  static void vblank_disable_fn(unsigned long arg)
  {
  	struct drm_device *dev = (struct drm_device *)arg;
-@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
+@@ -161,6 +200,8 @@ int drm_vblank_init(struct drm_device *d
  		atomic_set(&dev->vblank_refcount[i], 0);
  	}
  
@@ -455,7 +423,7 @@ index b4a3dbc..c7a17f6 100644
  	dev->vblank_disable_allowed = 0;
  
  	return 0;
-@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
+@@ -626,5 +667,7 @@ void drm_handle_vblank(struct drm_device
  {
  	atomic_inc(&dev->_vblank_count[crtc]);
  	DRM_WAKEUP(&dev->vbl_queue[crtc]);
@@ -463,10 +431,9 @@ index b4a3dbc..c7a17f6 100644
  }
  EXPORT_SYMBOL(drm_handle_vblank);
 +
-diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index fc4b68a..322b0f2 100644
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.c	2009-08-25 09:52:41.000000000 +1000
 @@ -203,6 +203,7 @@ static struct drm_driver driver = {
  		 .mmap = drm_gem_mmap,
  		 .poll = drm_poll,
@@ -475,11 +442,10 @@ index fc4b68a..322b0f2 100644
  #ifdef CONFIG_COMPAT
  		 .compat_ioctl = i915_compat_ioctl,
  #endif
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 508838e..697c31a 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -863,6 +863,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.pf	2009-08-25 09:35:48.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:52:41.000000000 +1000
+@@ -917,6 +917,8 @@ intel_pipe_set_base(struct drm_crtc *crt
  	u32 dspcntr, alignment;
  	int ret;
  
@@ -488,7 +454,7 @@ index 508838e..697c31a 100644
  	/* no fb bound */
  	if (!crtc->fb) {
  		DRM_DEBUG("No FB bound\n");
-@@ -898,17 +900,14 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -952,17 +954,14 @@ intel_pipe_set_base(struct drm_crtc *crt
  		BUG();
  	}
  
@@ -506,7 +472,7 @@ index 508838e..697c31a 100644
  		return ret;
  	}
  
-@@ -944,7 +943,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -998,7 +997,6 @@ intel_pipe_set_base(struct drm_crtc *crt
  	default:
  		DRM_ERROR("Unknown color depth\n");
  		i915_gem_object_unpin(obj);
@@ -514,7 +480,7 @@ index 508838e..697c31a 100644
  		return -EINVAL;
  	}
  	if (IS_I965G(dev)) {
-@@ -972,13 +970,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1026,13 +1024,11 @@ intel_pipe_set_base(struct drm_crtc *crt
  		I915_READ(dspbase);
  	}
  
@@ -529,7 +495,7 @@ index 508838e..697c31a 100644
  
  	if (!dev->primary->master)
  		return 0;
-@@ -2364,7 +2360,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2605,7 +2601,9 @@ static int intel_crtc_mode_set(struct dr
  	I915_WRITE(dspcntr_reg, dspcntr);
  
  	/* Flush the plane changes */
@@ -539,7 +505,7 @@ index 508838e..697c31a 100644
  
  	intel_update_watermarks(dev);
  
-@@ -2840,6 +2838,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
+@@ -3081,6 +3079,7 @@ static const struct drm_crtc_funcs intel
  	.gamma_set = intel_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = intel_crtc_destroy,
@@ -547,7 +513,7 @@ index 508838e..697c31a 100644
  };
  
  
-@@ -2852,7 +2851,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3093,7 +3092,7 @@ static void intel_crtc_init(struct drm_d
  	if (intel_crtc == NULL)
  		return;
  
@@ -556,7 +522,7 @@ index 508838e..697c31a 100644
  
  	drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
  	intel_crtc->pipe = pipe;
-@@ -3071,9 +3070,18 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
+@@ -3327,9 +3326,18 @@ static int intel_user_framebuffer_create
  	return drm_gem_handle_create(file_priv, object, handle);
  }
  
@@ -575,11 +541,34 @@ index 508838e..697c31a 100644
  };
  
  int intel_framebuffer_create(struct drm_device *dev,
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 3efcf1a..4d73f0b 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-08-25 09:52:41.000000000 +1000
+@@ -1122,7 +1122,7 @@ nv04_crtc_create(struct drm_device *dev,
+ 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
+ 	nv_crtc->mode_set.num_connectors = 0;
+ 
+-	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
++	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
+ 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-08-25 09:52:41.000000000 +1000
+@@ -810,7 +810,7 @@ nv50_crtc_create(struct drm_device *dev,
+ 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
+ 	crtc->mode_set.num_connectors = 0;
+ 
+-	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
++	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
+ 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
+ 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
+ 
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c.pf	2009-08-25 09:35:49.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_display.c	2009-08-25 09:52:41.000000000 +1000
+@@ -171,6 +171,7 @@ static const struct drm_crtc_funcs radeo
  	.gamma_set = radeon_crtc_gamma_set,
  	.set_config = drm_crtc_helper_set_config,
  	.destroy = radeon_crtc_destroy,
@@ -587,7 +576,7 @@ index 3efcf1a..4d73f0b 100644
  };
  
  static void radeon_crtc_init(struct drm_device *dev, int index)
-@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
+@@ -183,7 +184,7 @@ static void radeon_crtc_init(struct drm_
  	if (radeon_crtc == NULL)
  		return;
  
@@ -596,131 +585,21 @@ index 3efcf1a..4d73f0b 100644
  
  	drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256);
  	radeon_crtc->crtc_id = index;
-diff --git a/include/drm/drm.h b/include/drm/drm.h
-index 7cb50bd..1920323 100644
---- a/include/drm/drm.h
-+++ b/include/drm/drm.h
-@@ -686,6 +686,7 @@ struct drm_gem_open {
- #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
- #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
- 
- /**
-  * Device specific ioctls should only be in their respective headers
-@@ -698,6 +699,30 @@ struct drm_gem_open {
- #define DRM_COMMAND_BASE                0x40
- #define DRM_COMMAND_END			0xA0
- 
-+/**
-+ * Header for events written back to userspace on the drm fd.  The
-+ * type defines the type of event, the length specifies the total
-+ * length of the event (including the header), and user_data is
-+ * typically a 64 bit value passed with the ioctl that triggered the
-+ * event.  A read on the drm fd will always only return complete
-+ * events, that is, if for example the read buffer is 100 bytes, and
-+ * there are two 64 byte events pending, only one will be returned.
-+ */
-+struct drm_event {
-+	__u32 type;
-+	__u32 length;
-+};
-+
-+#define DRM_EVENT_MODE_PAGE_FLIP 0x01
-+
-+struct drm_event_page_flip {
-+	struct drm_event base;
-+	__u64 user_data;
-+	__u32 tv_sec;
-+	__u32 tv_usec;
-+	__u32 frame;
-+};
-+
- /* typedef area */
- #ifndef __KERNEL__
- typedef struct drm_clip_rect drm_clip_rect_t;
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 45b67d9..4ff43ab 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -402,6 +402,14 @@ struct drm_buf_entry {
- 	struct drm_freelist freelist;
- };
- 
-+/* Event queued up for userspace to read */
-+struct drm_pending_event {
-+	struct drm_event *event;
-+	struct list_head link;
-+	struct drm_file *file_priv;
-+	void (*destroy) (struct drm_pending_event *event);
-+};
-+
- /** File private data */
- struct drm_file {
- 	int authenticated;
-@@ -425,6 +433,9 @@ struct drm_file {
- 	struct drm_master *master; /* master this node is currently associated with
- 				      N.B. not always minor->master */
- 	struct list_head fbs;
-+
-+	wait_queue_head_t event_wait;
-+	struct list_head event_list;
- };
- 
- /** Wait queue */
-@@ -873,6 +884,16 @@ struct drm_minor {
- 	struct drm_mode_group mode_group;
- };
- 
-+struct drm_pending_flip {
-+	struct drm_pending_event pending_event;
-+	struct drm_framebuffer *old_fb;
-+	struct drm_crtc *crtc;
-+	u32 frame;
-+	int pipe;
-+	struct list_head link;
-+	struct drm_event_page_flip event;
-+};
-+
- /**
-  * DRM device structure. This structure represent a complete card that
-  * may contain multiple heads.
-@@ -972,6 +993,13 @@ struct drm_device {
- 
- 	u32 max_vblank_count;           /**< size of vblank counter register */
+diff -up linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf linux-2.6.30.noarch/include/drm/drm_crtc_helper.h
+--- linux-2.6.30.noarch/include/drm/drm_crtc_helper.h.pf	2009-06-10 13:05:27.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_crtc_helper.h	2009-08-25 09:52:41.000000000 +1000
+@@ -123,4 +123,8 @@ static inline void drm_connector_helper_
+ }
  
-+	struct work_struct flip_work;
+ extern int drm_helper_resume_force_mode(struct drm_device *dev);
 +
-+	/**
-+	 * List of objects waiting on flip completion
-+	 */
-+	struct list_head flip_list;
++extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
++				    struct drm_framebuffer *old_fb);
 +
- 	/*@} */
- 	cycles_t ctx_start;
- 	cycles_t lck_start;
-@@ -1108,6 +1136,8 @@ extern int drm_lastclose(struct drm_device *dev);
- extern int drm_open(struct inode *inode, struct file *filp);
- extern int drm_stub_open(struct inode *inode, struct file *filp);
- extern int drm_fasync(int fd, struct file *filp, int on);
-+extern ssize_t drm_read(struct file *filp, char __user *buffer,
-+			size_t count, loff_t *offset);
- extern int drm_release(struct inode *inode, struct file *filp);
- 
- 				/* Mapping support (drm_vm.h) */
-@@ -1274,6 +1304,8 @@ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
- extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
- extern int drm_modeset_ctl(struct drm_device *dev, void *data,
- 			   struct drm_file *file_priv);
-+extern void drm_finish_pending_flip(struct drm_device *dev,
-+				   struct drm_pending_flip *f, u32 frame);
- 
- 				/* AGP/GART support (drm_agpsupport.h) */
- extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
-diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
-index 7300fb8..0b5dc47 100644
---- a/include/drm/drm_crtc.h
-+++ b/include/drm/drm_crtc.h
+ #endif
+diff -up linux-2.6.30.noarch/include/drm/drm_crtc.h.pf linux-2.6.30.noarch/include/drm/drm_crtc.h
+--- linux-2.6.30.noarch/include/drm/drm_crtc.h.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_crtc.h	2009-08-25 09:52:41.000000000 +1000
 @@ -238,6 +238,12 @@ struct drm_display_info {
  };
  
@@ -791,7 +670,7 @@ index 7300fb8..0b5dc47 100644
  	/* if you are using the helper */
  	void *helper_private;
  };
-@@ -589,6 +613,7 @@ struct drm_mode_config {
+@@ -595,6 +619,7 @@ struct drm_mode_config {
  
  extern void drm_crtc_init(struct drm_device *dev,
  			  struct drm_crtc *crtc,
@@ -799,31 +678,61 @@ index 7300fb8..0b5dc47 100644
  			  const struct drm_crtc_funcs *funcs);
  extern void drm_crtc_cleanup(struct drm_crtc *crtc);
  
-@@ -736,4 +761,6 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+@@ -742,6 +767,8 @@ extern int drm_mode_gamma_get_ioctl(stru
  extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
  				    void *data, struct drm_file *file_priv);
  extern bool drm_detect_hdmi_monitor(struct edid *edid);
 +extern int drm_mode_page_flip_ioctl(struct drm_device *dev, void *data,
 +				    struct drm_file *file_priv);
- #endif /* __DRM_CRTC_H__ */
-diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 6769ff6..dd10566 100644
---- a/include/drm/drm_crtc_helper.h
-+++ b/include/drm/drm_crtc_helper.h
-@@ -123,4 +123,8 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
- }
+ extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
+ 				int hdisplay, int vdisplay, int vrefresh,
+ 				bool reduced, bool interlaced);
+diff -up linux-2.6.30.noarch/include/drm/drm.h.pf linux-2.6.30.noarch/include/drm/drm.h
+--- linux-2.6.30.noarch/include/drm/drm.h.pf	2009-06-10 13:05:27.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm.h	2009-08-25 09:52:41.000000000 +1000
+@@ -686,6 +686,7 @@ struct drm_gem_open {
+ #define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+ #define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
++#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOW( 0xB0, struct drm_mode_page_flip)
  
- extern int drm_helper_resume_force_mode(struct drm_device *dev);
+ /**
+  * Device specific ioctls should only be in their respective headers
+@@ -698,6 +699,30 @@ struct drm_gem_open {
+ #define DRM_COMMAND_BASE                0x40
+ #define DRM_COMMAND_END			0xA0
+ 
++/**
++ * Header for events written back to userspace on the drm fd.  The
++ * type defines the type of event, the length specifies the total
++ * length of the event (including the header), and user_data is
++ * typically a 64 bit value passed with the ioctl that triggered the
++ * event.  A read on the drm fd will always only return complete
++ * events, that is, if for example the read buffer is 100 bytes, and
++ * there are two 64 byte events pending, only one will be returned.
++ */
++struct drm_event {
++	__u32 type;
++	__u32 length;
++};
 +
-+extern int drm_crtc_helper_set_base(struct drm_crtc *crtc, int x, int y,
-+				    struct drm_framebuffer *old_fb);
++#define DRM_EVENT_MODE_PAGE_FLIP 0x01
 +
- #endif
-diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
-index ae304cc..464b779 100644
---- a/include/drm/drm_mode.h
-+++ b/include/drm/drm_mode.h
-@@ -265,4 +265,20 @@ struct drm_mode_crtc_lut {
++struct drm_event_page_flip {
++	struct drm_event base;
++	__u64 user_data;
++	__u32 tv_sec;
++	__u32 tv_usec;
++	__u32 frame;
++};
++
+ /* typedef area */
+ #ifndef __KERNEL__
+ typedef struct drm_clip_rect drm_clip_rect_t;
+diff -up linux-2.6.30.noarch/include/drm/drm_mode.h.pf linux-2.6.30.noarch/include/drm/drm_mode.h
+--- linux-2.6.30.noarch/include/drm/drm_mode.h.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drm_mode.h	2009-08-25 09:52:41.000000000 +1000
+@@ -268,4 +268,20 @@ struct drm_mode_crtc_lut {
  	__u64 blue;
  };
  
@@ -844,27 +753,80 @@ index ae304cc..464b779 100644
 +};
 +
  #endif
-diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c
---- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c~	2009-07-24 19:38:36.000000000 -0400
-+++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv04_crtc.c	2009-07-26 18:06:06.000000000 -0400
-@@ -1014,7 +1014,7 @@ nv04_crtc_create(struct drm_device *dev,
- 	nv_crtc->mode_set.connectors = (struct drm_connector **)(nv_crtc + 1);
- 	nv_crtc->mode_set.num_connectors = 0;
+diff -up linux-2.6.30.noarch/include/drm/drmP.h.pf linux-2.6.30.noarch/include/drm/drmP.h
+--- linux-2.6.30.noarch/include/drm/drmP.h.pf	2009-08-25 09:52:20.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:52:41.000000000 +1000
+@@ -426,6 +426,14 @@ struct drm_buf_entry {
+ 	struct drm_freelist freelist;
+ };
  
--	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
-+	drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
- 	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
++/* Event queued up for userspace to read */
++struct drm_pending_event {
++	struct drm_event *event;
++	struct list_head link;
++	struct drm_file *file_priv;
++	void (*destroy) (struct drm_pending_event *event);
++};
++
+ /** File private data */
+ struct drm_file {
+ 	int authenticated;
+@@ -449,6 +457,9 @@ struct drm_file {
+ 	struct drm_master *master; /* master this node is currently associated with
+ 				      N.B. not always minor->master */
+ 	struct list_head fbs;
++
++	wait_queue_head_t event_wait;
++	struct list_head event_list;
+ };
  
-diff -up linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c
---- linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c~	2009-07-24 19:38:36.000000000 -0400
-+++ linux-2.6.30.i686/drivers/gpu/drm/nouveau/nv50_crtc.c	2009-07-26 18:06:23.000000000 -0400
-@@ -796,7 +796,7 @@ nv50_crtc_create(struct drm_device *dev,
- 	crtc->mode_set.connectors = (struct drm_connector **)(crtc + 1);
- 	crtc->mode_set.num_connectors = 0;
+ /** Wait queue */
+@@ -897,6 +908,16 @@ struct drm_minor {
+ 	struct drm_mode_group mode_group;
+ };
  
--	drm_crtc_init(dev, &crtc->base, &nv50_crtc_funcs);
-+	drm_crtc_init(dev, &crtc->base, index, &nv50_crtc_funcs);
- 	drm_crtc_helper_add(&crtc->base, &nv50_crtc_helper_funcs);
- 	drm_mode_crtc_set_gamma_size(&crtc->base, 256);
++struct drm_pending_flip {
++	struct drm_pending_event pending_event;
++	struct drm_framebuffer *old_fb;
++	struct drm_crtc *crtc;
++	u32 frame;
++	int pipe;
++	struct list_head link;
++	struct drm_event_page_flip event;
++};
++
+ /**
+  * DRM device structure. This structure represent a complete card that
+  * may contain multiple heads.
+@@ -996,6 +1017,13 @@ struct drm_device {
+ 
+ 	u32 max_vblank_count;           /**< size of vblank counter register */
+ 
++	struct work_struct flip_work;
++
++	/**
++	 * List of objects waiting on flip completion
++	 */
++	struct list_head flip_list;
++
+ 	/*@} */
+ 	cycles_t ctx_start;
+ 	cycles_t lck_start;
+@@ -1132,6 +1160,8 @@ extern int drm_lastclose(struct drm_devi
+ extern int drm_open(struct inode *inode, struct file *filp);
+ extern int drm_stub_open(struct inode *inode, struct file *filp);
+ extern int drm_fasync(int fd, struct file *filp, int on);
++extern ssize_t drm_read(struct file *filp, char __user *buffer,
++			size_t count, loff_t *offset);
+ extern int drm_release(struct inode *inode, struct file *filp);
  
+ 				/* Mapping support (drm_vm.h) */
+@@ -1300,6 +1330,8 @@ extern void drm_vblank_pre_modeset(struc
+ extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+ extern int drm_modeset_ctl(struct drm_device *dev, void *data,
+ 			   struct drm_file *file_priv);
++extern void drm_finish_pending_flip(struct drm_device *dev,
++				   struct drm_pending_flip *f, u32 frame);
+ 
+ 				/* AGP/GART support (drm_agpsupport.h) */
+ extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);

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   |   23 +++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |    9 +++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    3 +++
 11 files changed, 120 insertions(+)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -p -r1.5.2.2 -r1.5.2.3
--- drm-vga-arb.patch	5 Aug 2009 23:00:15 -0000	1.5.2.2
+++ drm-vga-arb.patch	26 Aug 2009 19:58:48 -0000	1.5.2.3
@@ -1,6 +1,6 @@
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
---- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-25 09:57:03.000000000 +1000
 @@ -38,6 +38,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
@@ -56,18 +56,18 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	dev->driver->irq_uninstall(dev);
  
  	free_irq(dev->pdev->irq, dev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.arb	2009-08-05 07:03:48.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-05 10:15:15.000000000 +1000
-@@ -33,6 +33,7 @@
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-08-25 09:57:03.000000000 +1000
+@@ -32,6 +32,7 @@
+ #include "intel_drv.h"
  #include "i915_drm.h"
  #include "i915_drv.h"
- 
 +#include <linux/vgaarb.h>
- #define I915_DRV	"i915_drv"
  
  /* Really want an OS-independent resettable timer.  Would like to have
-@@ -984,6 +985,19 @@ static int i915_probe_agp(struct drm_dev
+  * this loop run for (eg) 3 sec, but have the timer reset every time
+@@ -979,6 +980,19 @@ static int i915_probe_agp(struct drm_dev
  	return 0;
  }
  
@@ -87,7 +87,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1029,6 +1043,11 @@ static int i915_load_modeset_init(struct
+@@ -1024,6 +1038,11 @@ static int i915_load_modeset_init(struct
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -99,7 +99,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1278,6 +1297,7 @@ int i915_driver_unload(struct drm_device
+@@ -1284,6 +1303,7 @@ int i915_driver_unload(struct drm_device
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -107,10 +107,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	}
  
  	if (dev->pdev->msi_enabled)
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-05 10:15:15.000000000 +1000
-@@ -760,6 +760,7 @@ static inline void opregion_enable_asle(
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-08-25 09:57:03.000000000 +1000
+@@ -761,6 +761,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);
@@ -118,9 +118,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  
  /**
   * Lock test for when it's just for synchronization of ring access.
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-08-25 09:57:03.000000000 +1000
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -129,9 +129,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #define INTEL_GMCH_ENABLED	0x4
  #define INTEL_GMCH_MEM_MASK	0x1
  #define INTEL_GMCH_MEM_64M	0x1
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-25 09:57:03.000000000 +1000
 @@ -3871,3 +3871,26 @@ struct drm_encoder *intel_best_encoder(s
  
  	return &intel_output->enc;
@@ -159,19 +159,19 @@ diff -up linux-2.6.30.noarch/drivers/gpu
 +	pci_write_config_word(bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
 +	return 0;
 +}
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-08-25 09:57:03.000000000 +1000
 @@ -161,4 +161,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 -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.arb	2009-08-05 10:14:23.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-05 10:15:15.000000000 +1000
-@@ -1497,6 +1497,20 @@ void r100_vram_init_sizes(struct radeon_
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/r100.c	2009-08-25 09:57:03.000000000 +1000
+@@ -1574,6 +1574,20 @@ void r100_vram_init_sizes(struct radeon_
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -192,9 +192,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-05 10:15:15.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-08-25 09:57:03.000000000 +1000
 @@ -46,6 +46,7 @@ uint32_t r100_mm_rreg(struct radeon_devi
  void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
  void r100_errata(struct radeon_device *rdev);
@@ -203,7 +203,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  int r100_gpu_reset(struct radeon_device *rdev);
  int r100_mc_init(struct radeon_device *rdev);
  void r100_mc_fini(struct radeon_device *rdev);
-@@ -84,6 +85,7 @@ static struct radeon_asic r100_asic = {
+@@ -85,6 +86,7 @@ static struct radeon_asic r100_asic = {
  	.init = &r100_init,
  	.errata = &r100_errata,
  	.vram_info = &r100_vram_info,
@@ -211,7 +211,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r100_gpu_reset,
  	.mc_init = &r100_mc_init,
  	.mc_fini = &r100_mc_fini,
-@@ -147,6 +149,7 @@ static struct radeon_asic r300_asic = {
+@@ -149,6 +151,7 @@ static struct radeon_asic r300_asic = {
  	.init = &r300_init,
  	.errata = &r300_errata,
  	.vram_info = &r300_vram_info,
@@ -219,7 +219,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r300_mc_init,
  	.mc_fini = &r300_mc_fini,
-@@ -190,6 +193,7 @@ static struct radeon_asic r420_asic = {
+@@ -193,6 +196,7 @@ static struct radeon_asic r420_asic = {
  	.init = &r300_init,
  	.errata = &r420_errata,
  	.vram_info = &r420_vram_info,
@@ -227,7 +227,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &r420_mc_init,
  	.mc_fini = &r420_mc_fini,
-@@ -240,6 +244,7 @@ static struct radeon_asic rs400_asic = {
+@@ -244,6 +248,7 @@ static struct radeon_asic rs400_asic = {
  	.init = &r300_init,
  	.errata = &rs400_errata,
  	.vram_info = &rs400_vram_info,
@@ -235,7 +235,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs400_mc_init,
  	.mc_fini = &rs400_mc_fini,
-@@ -292,6 +297,7 @@ static struct radeon_asic rs600_asic = {
+@@ -299,6 +304,7 @@ static struct radeon_asic rs600_asic = {
  	.init = &r300_init,
  	.errata = &rs600_errata,
  	.vram_info = &rs600_vram_info,
@@ -243,15 +243,15 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs600_mc_init,
  	.mc_fini = &rs600_mc_fini,
-@@ -337,6 +343,7 @@ static struct radeon_asic rs690_asic = {
- 	.init = &r300_init,
+@@ -346,6 +352,7 @@ static struct radeon_asic rs690_asic = {
+ 	.init = &rs690_init,
  	.errata = &rs690_errata,
  	.vram_info = &rs690_vram_info,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
  	.mc_init = &rs690_mc_init,
  	.mc_fini = &rs690_mc_fini,
-@@ -389,6 +396,7 @@ static struct radeon_asic rv515_asic = {
+@@ -399,6 +406,7 @@ static struct radeon_asic rv515_asic = {
  	.init = &rv515_init,
  	.errata = &rv515_errata,
  	.vram_info = &rv515_vram_info,
@@ -259,7 +259,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &rv515_mc_init,
  	.mc_fini = &rv515_mc_fini,
-@@ -432,6 +440,7 @@ static struct radeon_asic r520_asic = {
+@@ -445,6 +453,7 @@ static struct radeon_asic r520_asic = {
  	.init = &rv515_init,
  	.errata = &r520_errata,
  	.vram_info = &r520_vram_info,
@@ -267,9 +267,9 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	.gpu_reset = &rv515_gpu_reset,
  	.mc_init = &r520_mc_init,
  	.mc_fini = &r520_mc_fini,
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-05 10:15:29.000000000 +1000
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-08-25 09:57:03.000000000 +1000
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -278,7 +278,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -475,7 +476,18 @@ void radeon_combios_fini(struct radeon_d
+@@ -468,7 +469,18 @@ void radeon_combios_fini(struct radeon_d
  int radeon_modeset_init(struct radeon_device *rdev);
  void radeon_modeset_fini(struct radeon_device *rdev);
  
@@ -297,7 +297,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  /*
   * Radeon device.
   */
-@@ -566,6 +578,12 @@ int radeon_device_init(struct radeon_dev
+@@ -559,6 +571,12 @@ int radeon_device_init(struct radeon_dev
  		/* Initialize surface registers */
  		radeon_surface_init(rdev);
  
@@ -310,7 +310,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		/* TODO: disable VGA need to use VGA request */
  		/* BIOS*/
  		if (!radeon_get_bios(rdev)) {
-@@ -700,6 +718,7 @@ void radeon_device_fini(struct radeon_de
+@@ -693,6 +711,7 @@ void radeon_device_fini(struct radeon_de
  		radeon_agp_fini(rdev);
  #endif
  		radeon_irq_kms_fini(rdev);
@@ -318,10 +318,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  		radeon_fence_driver_fini(rdev);
  		radeon_clocks_fini(rdev);
  		radeon_object_fini(rdev);
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-05 10:15:15.000000000 +1000
-@@ -579,6 +579,7 @@ struct radeon_asic {
+diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/radeon.h	2009-08-25 09:57:03.000000000 +1000
+@@ -580,6 +580,7 @@ struct radeon_asic {
  	int (*suspend)(struct radeon_device *rdev);
  	void (*errata)(struct radeon_device *rdev);
  	void (*vram_info)(struct radeon_device *rdev);
@@ -329,7 +329,7 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	int (*gpu_reset)(struct radeon_device *rdev);
  	int (*mc_init)(struct radeon_device *rdev);
  	void (*mc_fini)(struct radeon_device *rdev);
-@@ -879,6 +880,7 @@ static inline void radeon_ring_write(str
+@@ -917,6 +918,7 @@ static inline void radeon_ring_write(str
  #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))
@@ -337,10 +337,10 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  #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 -up linux-2.6.30.noarch/include/drm/drmP.h.arb linux-2.6.30.noarch/include/drm/drmP.h
---- linux-2.6.30.noarch/include/drm/drmP.h.arb	2009-08-05 10:14:24.000000000 +1000
-+++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-05 10:15:15.000000000 +1000
-@@ -797,6 +797,9 @@ struct drm_driver {
+diff -up linux-2.6.30.noarch/include/drm/drmP.h.da linux-2.6.30.noarch/include/drm/drmP.h
+--- linux-2.6.30.noarch/include/drm/drmP.h.da	2009-08-25 09:56:33.000000000 +1000
++++ linux-2.6.30.noarch/include/drm/drmP.h	2009-08-25 09:57:03.000000000 +1000
+@@ -821,6 +821,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.58
retrieving revision 1.1294.2.59
diff -u -p -r1.1294.2.58 -r1.1294.2.59
--- kernel.spec	24 Aug 2009 21:34:53 -0000	1.1294.2.58
+++ kernel.spec	26 Aug 2009 19:58:48 -0000	1.1294.2.59
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 1
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -683,12 +683,13 @@ Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 
 # nouveau + drm fixes
+Patch1812: drm-next.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
 Patch1821: drm-page-flip.patch
-# anholt's tree as of 2009-08-12
+# anholt's tree as of 2009-08-26
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
@@ -725,6 +726,11 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
+# fix xen boot
+Patch12020: xen-fb-probe-fix.patch
+
+Patch90000: allow-disabling-ima.diff
+
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
 Patch19999: xen.pvops.post.patch
@@ -1309,6 +1315,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
 
 ApplyPatch drm-nouveau.patch
@@ -1317,7 +1324,7 @@ ApplyPatch drm-nouveau.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-page-flip.patch
-#ApplyPatch drm-intel-next.patch
+ApplyPatch drm-intel-next.patch
 ApplyPatch drm-intel-pm.patch
 
 # VGA arb + drm
@@ -1337,6 +1344,13 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+# Patches headed upstream
+
+# fix xen boot
+ApplyPatch xen-fb-probe-fix.patch
+
+ApplyPatch allow-disabling-ima.diff
+
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
 ApplyPatch xen.pvops.post.patch
@@ -2006,6 +2020,37 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops again
+
+* Wed Aug 26 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git4
+- Drop patches merged upstream:
+  xen-x86-fix-stackprotect.patch
+  xen-x86-no-stackprotect.patch
+
+* Wed Aug 26 2009 Adam Jackson <ajax at redhat.com>
+- drm-intel-next.patch: Update, various output setup fixes.
+
+* Wed Aug 26 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Make WiMAX modular (#512070)
+
+* Tue Aug 25 2009 Kyle McMartin <kyle at redhat.com>
+- allow-disabling-ima.diff: debugging patch... adds ima=0 kernel
+  param to disable initialization of IMA.
+
+* Tue Aug 25 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.174.rc7.git2
+- drm-nouveau.patch: upstream update, pre-nv50 tv-out + misc fixes
+
+* Tue Aug 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.173.rc7.git2
+- Fix Xen boot (#508120)
+
+* Tue Aug 25 2009 Dave Airlie <airlied at redhat.com>
+- pull in drm-next tree + rebase around it
+
+* Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git2
+
 * Mon Aug 24 2009 Michael Young <m.a.young at durham.ac.uk>
 - turn off stackprotector on i686 for a working build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.28
retrieving revision 1.976.2.29
diff -u -p -r1.976.2.28 -r1.976.2.29
--- sources	24 Aug 2009 20:17:12 -0000	1.976.2.28
+++ sources	26 Aug 2009 19:58:49 -0000	1.976.2.29
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-22d1b4c17bde1034e332dc2505c9f15a  patch-2.6.31-rc7-git1.bz2
+8329c25267787e591972e477b113c08b  patch-2.6.31-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.27
retrieving revision 1.888.2.28
diff -u -p -r1.888.2.27 -r1.888.2.28
--- upstream	24 Aug 2009 20:17:12 -0000	1.888.2.27
+++ upstream	26 Aug 2009 19:58:49 -0000	1.888.2.28
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git1.bz2
+patch-2.6.31-rc7-git4.bz2

xen.pvops.patch:
 arch/x86/Kconfig                           |    4 
 arch/x86/include/asm/agp.h                 |   15 
 arch/x86/include/asm/e820.h                |    2 
 arch/x86/include/asm/i387.h                |    1 
 arch/x86/include/asm/io.h                  |   15 
 arch/x86/include/asm/io_apic.h             |    7 
 arch/x86/include/asm/microcode.h           |    9 
 arch/x86/include/asm/paravirt.h            |  718 -------------
 arch/x86/include/asm/paravirt_types.h      |  722 +++++++++++++
 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/tlbflush.h            |    6 
 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/kernel/Makefile                   |    1 
 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             |   46 
 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/ioport.c                   |   29 
 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                  |    3 
 arch/x86/kernel/pci-swiotlb.c              |   30 
 arch/x86/kernel/process.c                  |   27 
 arch/x86/kernel/process_32.c               |   27 
 arch/x86/kernel/process_64.c               |   33 
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   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                       |   33 
 arch/x86/xen/Makefile                      |    4 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |   75 +
 arch/x86/xen/mmu.c                         |  455 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |   53 +
 arch/x86/xen/pci.c                         |  112 ++
 arch/x86/xen/setup.c                       |   50 
 arch/x86/xen/smp.c                         |    2 
 arch/x86/xen/time.c                        |    2 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   19 
 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/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/xen-iommu.c                    |  332 ++++++
 drivers/xen/Kconfig                        |   41 
 drivers/xen/Makefile                       |   20 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  447 ++++++++
 drivers/xen/balloon.c                      |  161 ++-
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  658 ++++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  182 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  542 ++++++++++
 drivers/xen/events.c                       |  413 +++++++
 drivers/xen/evtchn.c                       |    1 
 drivers/xen/features.c                     |    2 
 drivers/xen/grant-table.c                  |  103 +
 drivers/xen/mce.c                          |  213 ++++
 drivers/xen/netback/Makefile               |    3 
 drivers/xen/netback/common.h               |  221 ++++
 drivers/xen/netback/interface.c            |  401 +++++++
 drivers/xen/netback/netback.c              | 1513 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  454 ++++++++
 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/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 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/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 ++++++
 include/xen/interface/xen-mca.h            |  429 ++++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |   18 
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 136 files changed, 11429 insertions(+), 1315 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.36
retrieving revision 1.1.2.37
diff -u -p -r1.1.2.36 -r1.1.2.37
--- xen.pvops.patch	20 Aug 2009 18:50:21 -0000	1.1.2.36
+++ xen.pvops.patch	26 Aug 2009 19:58:49 -0000	1.1.2.37
@@ -1697,10 +1697,10 @@ index b399988..30cbf49 100644
  extern void __init dmi_check_skip_isa_align(void);
  
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 3cc06e3..4595ae2 100644
+index 1674807..3658a86 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
-@@ -394,6 +394,9 @@ static inline unsigned long pages_to_mb(unsigned long npg)
+@@ -402,6 +402,9 @@ static inline unsigned long pages_to_mb(unsigned long npg)
  #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)	\
  	remap_pfn_range(vma, vaddr, pfn, size, prot)
  
@@ -1986,10 +1986,10 @@ index 018a0a4..f334014 100644
  unsigned long arbitrary_virt_to_mfn(void *vaddr);
 diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
 new file mode 100644
-index 0000000..714443b
+index 0000000..cb84abe
 --- /dev/null
 +++ b/arch/x86/include/asm/xen/pci.h
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,37 @@
 +#ifndef _ASM_X86_XEN_PCI_H
 +#define _ASM_X86_XEN_PCI_H
 +
@@ -1999,24 +1999,28 @@ index 0000000..714443b
 +			struct msi_desc *msidesc,
 +			int type);
 +int xen_destroy_irq(int irq);
-+int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
 +#else
 +static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
 +{
 +	return -1;
 +}
 +
-+static int xen_create_msi_irq(struct pci_dev *dev,
++static inline int xen_create_msi_irq(struct pci_dev *dev,
 +				struct msi_desc *msidesc,
 +				int type)
 +{
 +	return -1;
 +}
-+static int xen_destroy_irq(int irq)
++static inline int xen_destroy_irq(int irq)
 +{
 +	return -1;
 +}
-+static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
++#endif
++
++#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN_DOM0_PCI)
++int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
++#else
++static inline int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 +{
 +	return -1;
 +}
@@ -2087,6 +2091,28 @@ index 6b8ca3a..d47c54f 100644
  	mp_lapic_addr = address;
  
  	set_fixmap_nocache(FIX_APIC_BASE, address);
+diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
+index d296f4a..721272b 100644
+--- a/arch/x86/kernel/acpi/processor.c
++++ b/arch/x86/kernel/acpi/processor.c
+@@ -11,6 +11,7 @@
+ 
+ #include <acpi/processor.h>
+ #include <asm/acpi.h>
++#include <asm/xen/hypervisor.h>
+ 
+ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
+ {
+@@ -78,6 +79,9 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
+ {
+ 	struct cpuinfo_x86 *c = &cpu_data(pr->id);
+ 
++	if (xen_pv_domain())
++		c = &cpu_data(0);
++
+ 	pr->pdc = NULL;
+ 	if (c->x86_vendor == X86_VENDOR_INTEL)
+ 		init_intel_pdc(pr, c);
 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
 index ca93638..9eff23c 100644
 --- a/arch/x86/kernel/acpi/sleep.c
@@ -2207,21 +2233,6 @@ index d2ed6c5..18d957e 100644
  	ioapic_res = ioapic_setup_resources();
  	for (i = 0; i < nr_ioapics; i++) {
  		if (smp_found_config) {
-diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index 3efcb2b..c1f253d 100644
---- a/arch/x86/kernel/cpu/Makefile
-+++ b/arch/x86/kernel/cpu/Makefile
-@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_common.o = -pg
- endif
- 
-+# Make sure load_percpu_segment has no stackprotector
-+nostackp := $(call cc-option, -fno-stack-protector)
-+CFLAGS_common.o		:= $(nostackp)
-+
- obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
- obj-y			+= proc.o capflags.o powerflags.o common.o
- obj-y			+= vmware.o hypervisor.o
 diff --git a/arch/x86/kernel/cpu/mtrr/Makefile b/arch/x86/kernel/cpu/mtrr/Makefile
 index f4361b5..404e458 100644
 --- a/arch/x86/kernel/cpu/mtrr/Makefile
@@ -2931,7 +2942,7 @@ index 6af96ee..efe3691 100644
  		swiotlb = 1;
  	if (swiotlb) {
 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 994dd6a..30803f4 100644
+index 071166a..cbf8440 100644
 --- a/arch/x86/kernel/process.c
 +++ b/arch/x86/kernel/process.c
 @@ -76,16 +76,12 @@ void exit_thread(void)
@@ -3246,7 +3257,7 @@ index 3cd7711..f16903d 100644
  }
  
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index e6718bb..f03f6dc 100644
+index 352aa9e..95609e3 100644
 --- a/arch/x86/mm/pat.c
 +++ b/arch/x86/mm/pat.c
 @@ -499,7 +499,7 @@ int free_memtype(u64 start, u64 end)
@@ -3280,7 +3291,7 @@ index ed34f5e..9c58425 100644
  {
  	return (pte_t *)__get_free_page(PGALLOC_GFP);
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 821e970..a5c295c 100644
+index c814e14..f68d42f 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -147,13 +147,25 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
@@ -3312,7 +3323,7 @@ index 821e970..a5c295c 100644
  			leave_mm(cpu);
  	}
  out:
-@@ -217,16 +229,13 @@ void native_flush_tlb_others(const struct cpumask *cpumask,
+@@ -216,16 +228,13 @@ void native_flush_tlb_others(const struct cpumask *cpumask,
  	flush_tlb_others_ipi(cpumask, mm, va);
  }
  
@@ -3330,7 +3341,7 @@ index 821e970..a5c295c 100644
  
  void flush_tlb_current_task(void)
  {
-@@ -275,16 +284,16 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
+@@ -274,16 +283,16 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
  	preempt_enable();
  }
  
@@ -3557,21 +3568,10 @@ index b83e119..951c924 100644
 +       depends on XEN_DOM0 && MICROCODE
 \ No newline at end of file
 diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
-index 172438f..8c2c266 100644
+index 7410640..8c2c266 100644
 --- a/arch/x86/xen/Makefile
 +++ b/arch/x86/xen/Makefile
-@@ -5,6 +5,10 @@ CFLAGS_REMOVE_time.o = -pg
- CFLAGS_REMOVE_irq.o = -pg
- endif
- 
-+# Make sure early boot has no stackprotector
-+nostackp := $(call cc-option, -fno-stack-protector)
-+CFLAGS_enlighten.o		:= $(nostackp)
-+
- obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
- 			time.o xen-asm.o xen-asm_$(BITS).o \
- 			grant-table.o suspend.o
-@@ -12,3 +16,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
+@@ -16,3 +16,7 @@ obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
  obj-$(CONFIG_SMP)		+= smp.o
  obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
  obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
@@ -3644,7 +3644,7 @@ index 0000000..ee0db39
 +#endif
 +}
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 0a1700a..2e58099 100644
+index e90540a..1edf6a8 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -64,6 +64,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
@@ -3756,60 +3756,16 @@ index 0a1700a..2e58099 100644
  	.io_delay = xen_io_delay,
  
  	/* Xen takes care of %gs when switching to usermode for us */
-@@ -974,10 +1005,6 @@ asmlinkage void __init xen_start_kernel(void)
- 
- 	xen_domain_type = XEN_PV_DOMAIN;
- 
--	BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
--
--	xen_setup_features();
--
- 	/* Install Xen paravirt ops */
- 	pv_info = xen_info;
- 	pv_init_ops = xen_init_ops;
-@@ -986,8 +1013,15 @@ asmlinkage void __init xen_start_kernel(void)
- 	pv_apic_ops = xen_apic_ops;
- 	pv_mmu_ops = xen_mmu_ops;
- 
--	xen_init_irq_ops();
-+#ifdef CONFIG_X86_64
-+	/*
-+	 * Setup percpu state.  We only need to do this for 64-bit
-+	 * because 32-bit already has %fs set properly.
-+	 */
-+	load_percpu_segment(0);
-+#endif
- 
-+	xen_init_irq_ops();
- 	xen_init_cpuid_mask();
- 
- #ifdef CONFIG_X86_LOCAL_APIC
-@@ -997,6 +1031,10 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1000,6 +1031,8 @@ asmlinkage void __init xen_start_kernel(void)
  	set_xen_basic_apic_ops();
  #endif
  
 +	xen_setup_machphys_mapping();
 +
-+	xen_setup_features();
-+
- 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
- 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
- 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
-@@ -1004,13 +1042,6 @@ asmlinkage void __init xen_start_kernel(void)
+ 	xen_setup_features();
  
- 	machine_ops = xen_machine_ops;
- 
--#ifdef CONFIG_X86_64
--	/*
--	 * Setup percpu state.  We only need to do this for 64-bit
--	 * because 32-bit already has %fs set properly.
--	 */
--	load_percpu_segment(0);
--#endif
- 	/*
- 	 * The only reliable way to retain the initial address of the
- 	 * percpu gdt_page is to remember it here, so we can go and
-@@ -1031,6 +1062,8 @@ asmlinkage void __init xen_start_kernel(void)
+ 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
+@@ -1029,6 +1062,8 @@ asmlinkage void __init xen_start_kernel(void)
  	if (!xen_initial_domain())
  		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
  
@@ -3818,7 +3774,7 @@ index 0a1700a..2e58099 100644
  #ifdef CONFIG_X86_64
  	/* Work out if we support NX */
  	check_efer();
-@@ -1045,6 +1078,7 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1043,6 +1078,7 @@ asmlinkage void __init xen_start_kernel(void)
  
  	xen_raw_console_write("mapping kernel into physical memory\n");
  	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
@@ -3826,7 +3782,7 @@ index 0a1700a..2e58099 100644
  
  	init_mm.pgd = pgd;
  
-@@ -1054,9 +1088,21 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1052,13 +1088,26 @@ asmlinkage void __init xen_start_kernel(void)
  	if (xen_feature(XENFEAT_supervisor_mode_kernel))
  		pv_info.kernel_rpl = 0;
  
@@ -3848,7 +3804,12 @@ index 0a1700a..2e58099 100644
  #ifdef CONFIG_X86_32
  	/* set up basic CPUID stuff */
  	cpu_detect(&new_cpu_data);
-@@ -1075,6 +1121,16 @@ asmlinkage void __init xen_start_kernel(void)
+ 	new_cpu_data.hard_math = 1;
++	new_cpu_data.wp_works_ok = 1;
+ 	new_cpu_data.x86_capability[0] = cpuid_edx(1);
+ #endif
+ 
+@@ -1073,6 +1122,16 @@ asmlinkage void __init xen_start_kernel(void)
  		add_preferred_console("xenboot", 0, NULL);
  		add_preferred_console("tty", 0, NULL);
  		add_preferred_console("hvc", 0, NULL);
@@ -4532,10 +4493,10 @@ index 0000000..3b96c87
 +}
 diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
 new file mode 100644
-index 0000000..c0ef627
+index 0000000..60bab67
 --- /dev/null
 +++ b/arch/x86/xen/pci.c
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,112 @@
 +#include <linux/kernel.h>
 +#include <linux/acpi.h>
 +#include <linux/pci.h>
@@ -4625,6 +4586,7 @@ index 0000000..c0ef627
 +	}
 +}
 +
++#ifdef CONFIG_PCI_MSI
 +int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 +{
 +	unsigned int irq;
@@ -4646,6 +4608,7 @@ index 0000000..c0ef627
 +	xen_destroy_irq(irq);
 +	return ret;
 +}
++#endif
 diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
 index ad0047f..2439456 100644
 --- a/arch/x86/xen/setup.c
@@ -4932,6 +4895,202 @@ index db307a3..c6d845c 100644
  	if (ACPI_FAILURE(status)) {
  		return_ACPI_STATUS(status);
  	}
+diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
+index 84e0f3c..8882c23 100644
+--- a/drivers/acpi/processor_core.c
++++ b/drivers/acpi/processor_core.c
+@@ -58,6 +58,7 @@
+ #include <acpi/acpi_bus.h>
+ #include <acpi/acpi_drivers.h>
+ #include <acpi/processor.h>
++#include <xen/acpi.h>
+ 
+ #define ACPI_PROCESSOR_CLASS		"processor"
+ #define ACPI_PROCESSOR_DEVICE_NAME	"Processor"
+@@ -638,6 +639,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
+ 
+ 	pr->id = cpu_index;
+ 
++	if (xen_pv_domain())
++		pr->id = pr->acpi_id;
++
+ 	/*
+ 	 *  Extra Processor objects may be enumerated on MP systems with
+ 	 *  less than the max # of CPUs. They should be ignored _iff
+@@ -712,14 +716,16 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
+ 		return 0;
+ 	}
+ 
+-	BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
++	if (!xen_pv_domain())
++		BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
+ 
+ 	/*
+ 	 * Buggy BIOS check
+ 	 * ACPI id of processors can be reported wrongly by the BIOS.
+ 	 * Don't trust it blindly
+ 	 */
+-	if (per_cpu(processor_device_array, pr->id) != NULL &&
++	if (!xen_pv_domain() &&
++		per_cpu(processor_device_array, pr->id) != NULL &&
+ 	    per_cpu(processor_device_array, pr->id) != device) {
+ 		printk(KERN_WARNING "BIOS reported wrong ACPI id "
+ 			"for the processor\n");
+@@ -734,7 +740,8 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
+ 		goto end;
+ 
+ 	sysdev = get_cpu_sysdev(pr->id);
+-	if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev"))
++	if (sysdev != NULL &&
++			sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev"))
+ 		return -EFAULT;
+ 
+ 	/* _PDC call should be done before doing anything else (if reqd.). */
+@@ -751,6 +758,10 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
+ 
+ 	acpi_processor_power_init(pr, device);
+ 
++	result = processor_cntl_xen_prepare(pr);
++	if (result)
++		goto end;
++
+ 	pr->cdev = thermal_cooling_device_register("Processor", device,
+ 						&processor_cooling_ops);
+ 	if (IS_ERR(pr->cdev)) {
+@@ -963,6 +974,10 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
+ 	if (!pr)
+ 		return -ENODEV;
+ 
++	if (processor_cntl_xen())
++		processor_cntl_xen_notify(pr,
++			PROCESSOR_HOTPLUG, HOTPLUG_TYPE_ADD);
++
+ 	if ((pr->id >= 0) && (pr->id < nr_cpu_ids)) {
+ 		kobject_uevent(&(*device)->dev.kobj, KOBJ_ONLINE);
+ 	}
+@@ -1002,11 +1017,19 @@ static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
+ 			break;
+ 		}
+ 
++		if (processor_cntl_xen())
++			processor_cntl_xen_notify(pr,
++					PROCESSOR_HOTPLUG, HOTPLUG_TYPE_ADD);
++
+ 		if (pr->id >= 0 && (pr->id < nr_cpu_ids)) {
+ 			kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
+ 			break;
+ 		}
+ 
++		if (processor_cntl_xen())
++			processor_cntl_xen_notify(pr, PROCESSOR_HOTPLUG,
++							HOTPLUG_TYPE_REMOVE);
++
+ 		result = acpi_processor_start(device);
+ 		if ((!result) && ((pr->id >= 0) && (pr->id < nr_cpu_ids))) {
+ 			kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
+diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
+index 66393d5..da9797e 100644
+--- a/drivers/acpi/processor_idle.c
++++ b/drivers/acpi/processor_idle.c
+@@ -58,6 +58,7 @@
+ 
+ #include <acpi/acpi_bus.h>
+ #include <acpi/processor.h>
++#include <xen/acpi.h>
+ #include <asm/processor.h>
+ 
+ #define ACPI_PROCESSOR_CLASS            "processor"
+@@ -456,6 +457,10 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
+ 
+ 		cx.power = obj->integer.value;
+ 
++		/* cache control methods to notify xen*/
++		if (processor_cntl_xen_pm())
++			processor_cntl_xen_power_cache(pr->acpi_id, i, reg);
++
+ 		current_count++;
+ 		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
+ 
+@@ -1143,6 +1148,13 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
+ 	if (!pr->flags.power_setup_done)
+ 		return -ENODEV;
+ 
++    if (processor_cntl_xen_pm()) {
++		acpi_processor_get_power_info(pr);
++		processor_cntl_xen_notify(pr,
++			PROCESSOR_PM_CHANGE, PM_TYPE_IDLE);
++		return ret;
++	}
++
+ 	cpuidle_pause_and_lock();
+ 	cpuidle_disable_device(&pr->power.dev);
+ 	acpi_processor_get_power_info(pr);
+@@ -1206,9 +1218,14 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
+ 	 * platforms that only support C1.
+ 	 */
+ 	if (pr->flags.power) {
+-		acpi_processor_setup_cpuidle(pr);
+-		if (cpuidle_register_device(&pr->power.dev))
+-			return -EIO;
++		if (processor_cntl_xen_pm())
++			processor_cntl_xen_notify(pr,
++					PROCESSOR_PM_INIT, PM_TYPE_IDLE);
++		else {
++			acpi_processor_setup_cpuidle(pr);
++			if (cpuidle_register_device(&pr->power.dev))
++				return -EIO;
++		}
+ 
+ 		printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
+ 		for (i = 1; i <= pr->power.count; i++)
+diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
+index 60e543d..8375075 100644
+--- a/drivers/acpi/processor_perflib.c
++++ b/drivers/acpi/processor_perflib.c
+@@ -38,6 +38,7 @@
+ #include <acpi/acpi_bus.h>
+ #include <acpi/acpi_drivers.h>
+ #include <acpi/processor.h>
++#include <xen/acpi.h>
+ 
+ #define ACPI_PROCESSOR_CLASS		"processor"
+ #define ACPI_PROCESSOR_FILE_PERFORMANCE	"performance"
+@@ -154,13 +155,16 @@ int acpi_processor_ppc_has_changed(struct acpi_processor *pr)
+ {
+ 	int ret;
+ 
+-	if (ignore_ppc)
++	if (ignore_ppc && !processor_cntl_xen_pmperf())
+ 		return 0;
+ 
+ 	ret = acpi_processor_get_platform_limit(pr);
+ 
+ 	if (ret < 0)
+ 		return (ret);
++	else if (processor_cntl_xen_pmperf())
++		return processor_cntl_xen_notify(pr,
++				PROCESSOR_PM_CHANGE, PM_TYPE_PERF);
+ 	else
+ 		return cpufreq_update_policy(pr->id);
+ }
+@@ -330,7 +334,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
+ 	return result;
+ }
+ 
+-static int acpi_processor_get_performance_info(struct acpi_processor *pr)
++int acpi_processor_get_performance_info(struct acpi_processor *pr)
+ {
+ 	int result = 0;
+ 	acpi_status status = AE_OK;
+@@ -432,7 +436,7 @@ int acpi_processor_notify_smm(struct module *calling_module)
+ 
+ EXPORT_SYMBOL(acpi_processor_notify_smm);
+ 
+-static int acpi_processor_get_psd(struct acpi_processor	*pr)
++int acpi_processor_get_psd(struct acpi_processor	*pr)
+ {
+ 	int result = 0;
+ 	acpi_status status = AE_OK;
 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
 index 42159a2..e00b83b 100644
 --- a/drivers/acpi/sleep.c
@@ -5216,10 +5375,10 @@ index eba999f..11071ed 100644
  
  void xen_raw_printk(const char *fmt, ...)
 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index 5f6509a..6cd6859 100644
+index 5ce7cba..5a0a4ee 100644
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2763,6 +2763,7 @@ source "drivers/s390/net/Kconfig"
+@@ -2765,6 +2765,7 @@ source "drivers/s390/net/Kconfig"
  config XEN_NETDEV_FRONTEND
  	tristate "Xen network device frontend driver"
  	depends on XEN
@@ -5579,7 +5738,7 @@ index 0000000..b1a7d93
 +}
 +
 diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
-index cab100a..84c3553 100644
+index cab100a..33976f7 100644
 --- a/drivers/xen/Kconfig
 +++ b/drivers/xen/Kconfig
 @@ -28,6 +28,29 @@ config XEN_DEV_EVTCHN
@@ -5612,7 +5771,7 @@ index cab100a..84c3553 100644
  config XENFS
  	tristate "Xen filesystem"
  	depends on XEN
-@@ -60,4 +83,15 @@ config XEN_SYS_HYPERVISOR
+@@ -60,4 +83,20 @@ config XEN_SYS_HYPERVISOR
           Create entries under /sys/hypervisor describing the Xen
  	 hypervisor environment.  When running native or in another
  	 virtual environment, /sys/hypervisor will still be present,
@@ -5630,11 +5789,16 @@ index cab100a..84c3553 100644
 +config XEN_MCE
 +       def_bool y
 +       depends on XEN_DOM0 && X86_64 && X86_MCE_INTEL
++
++config ACPI_PROCESSOR_XEN
++	bool
++	depends on XEN_DOM0 && ACPI_PROCESSOR && CPU_FREQ
++	default y
 diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
-index ec2a39b..0e2b9df 100644
+index ec2a39b..2a69a03 100644
 --- a/drivers/xen/Makefile
 +++ b/drivers/xen/Makefile
-@@ -1,9 +1,14 @@
+@@ -1,9 +1,15 @@
 -obj-y	+= grant-table.o features.o events.o manage.o
 +obj-y	+= grant-table.o features.o events.o manage.o biomerge.o
  obj-y	+= xenbus/
@@ -5657,7 +5821,7 @@ index ec2a39b..0e2b9df 100644
 +obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 +obj-$(CONFIG_XEN_S3)			+= acpi.o
 +obj-$(CONFIG_XEN_MCE)			+= mce.o
-\ No newline at end of file
++obj-$(CONFIG_ACPI_PROCESSOR_XEN)	+= acpi_processor.o
 diff --git a/drivers/xen/acpi.c b/drivers/xen/acpi.c
 new file mode 100644
 index 0000000..e6d3d0e
@@ -5687,8 +5851,461 @@ index 0000000..e6d3d0e
 +
 +	return HYPERVISOR_dom0_op(&op);
 +}
+diff --git a/drivers/xen/acpi_processor.c b/drivers/xen/acpi_processor.c
+new file mode 100644
+index 0000000..d2b76e9
+--- /dev/null
++++ b/drivers/xen/acpi_processor.c
+@@ -0,0 +1,447 @@
++/*
++ *  acpi_processor.c - interface to notify Xen on acpi processor object
++ *                     info parsing
++ *
++ *  Copyright (C) 2008, Intel corporation
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ *  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 <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/acpi.h>
++#include <linux/pm.h>
++#include <linux/cpu.h>
++
++#include <linux/cpufreq.h>
++#include <acpi/processor.h>
++#include <xen/acpi.h>
++
++#include <asm/xen/hypercall.h>
++#include <asm/xen/hypervisor.h>
++
++static int processor_cntl_xen_get_performance(struct acpi_processor *pr);
++static int xen_hotplug_notifier(struct acpi_processor *pr, int event);
++
++static struct processor_cntl_xen_ops xen_ops = {
++	.hotplug		= xen_hotplug_notifier,
++};
++
++static struct acpi_power_register *power_registers[NR_CPUS];
++
++int processor_cntl_xen_power_cache(int cpu, int cx,
++		struct acpi_power_register *reg)
++{
++	struct acpi_power_register *buf;
++
++	if (cpu < 0 || cpu >= NR_CPUS ||
++			cx < 1 || cx > ACPI_PROCESSOR_MAX_POWER) {
++		return -EINVAL;
++	}
++
++	if (power_registers[cpu] == NULL) {
++		buf = kzalloc(ACPI_PROCESSOR_MAX_POWER *
++				sizeof(struct xen_processor_cx), GFP_KERNEL);
++		if (buf == NULL)
++			return -ENOMEM;
++
++		power_registers[cpu] = buf;
++	}
++
++	memcpy(power_registers[cpu]+cx-1, reg, sizeof(*reg));
++
++	return 0;
++}
++
++int processor_cntl_xen(void)
++{
++	return 1;
++}
++
++int processor_cntl_xen_pm(void)
++{
++	return (xen_ops.pm_ops[PM_TYPE_IDLE] != NULL);
++}
++
++int processor_cntl_xen_pmperf(void)
++{
++	return	(xen_ops.pm_ops[PM_TYPE_PERF] != NULL);
++}
++
++int processor_cntl_xen_pmthr(void)
++{
++	return (xen_ops.pm_ops[PM_TYPE_THR] != NULL);
++}
++
++static int processor_notify_smm(void)
++{
++	acpi_status status;
++	static int is_done;
++
++	/* only need successfully notify BIOS once */
++	/* avoid double notification which may lead to unexpected result */
++	if (is_done)
++		return 0;
++
++	/* Can't write pstate_cnt to smi_cmd if either value is zero */
++	if ((!acpi_gbl_FADT.smi_command) || (!acpi_gbl_FADT.pstate_control)) {
++		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_cnt\n"));
++		return 0;
++	}
++
++	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
++		"Writing pstate_cnt [0x%x] to smi_cmd [0x%x]\n",
++		acpi_gbl_FADT.pstate_control, acpi_gbl_FADT.smi_command));
++
++	status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
++				    (u32) acpi_gbl_FADT.pstate_control, 8);
++	if (ACPI_FAILURE(status))
++		return status;
++
++	is_done = 1;
++
++	return 0;
++}
++
++int processor_cntl_xen_notify(struct acpi_processor *pr, int event, int type)
++{
++	int ret = -EINVAL;
++
++	switch (event) {
++	case PROCESSOR_PM_INIT:
++	case PROCESSOR_PM_CHANGE:
++		if ((type >= PM_TYPE_MAX) ||
++			!xen_ops.pm_ops[type])
++			break;
++
++		ret = xen_ops.pm_ops[type](pr, event);
++		break;
++	case PROCESSOR_HOTPLUG:
++		if (xen_ops.hotplug)
++			ret = xen_ops.hotplug(pr, type);
++		break;
++	default:
++		printk(KERN_ERR "Unsupport processor events %d.\n", event);
++		break;
++	}
++
++	return ret;
++}
++
++/*
++ * This is called from ACPI processor init, and targeted to hold
++ * some tricky housekeeping jobs to satisfy xen.
++ * For example, we may put dependency parse stub here for idle
++ * and performance state. Those information may be not available
++ * if splitting from dom0 control logic like cpufreq driver.
++ */
++int processor_cntl_xen_prepare(struct acpi_processor *pr)
++{
++
++	/* Initialize performance states */
++	if (processor_cntl_xen_pmperf())
++		processor_cntl_xen_get_performance(pr);
++
++	return 0;
++}
++
++/*
++ * Existing ACPI module does parse performance states at some point,
++ * when acpi-cpufreq driver is loaded which however is something
++ * we'd like to disable to avoid confliction with xen PM
++ * logic. So we have to collect raw performance information here
++ * when ACPI processor object is found and started.
++ */
++static int processor_cntl_xen_get_performance(struct acpi_processor *pr)
++{
++	int ret;
++	struct acpi_processor_performance *perf;
++	struct acpi_psd_package *pdomain;
++
++	if (pr->performance)
++		return -EBUSY;
++
++	perf = kzalloc(sizeof(struct acpi_processor_performance), GFP_KERNEL);
++	if (!perf)
++		return -ENOMEM;
++
++	pr->performance = perf;
++	/* Get basic performance state information */
++	ret = acpi_processor_get_performance_info(pr);
++	if (ret < 0)
++		goto err_out;
++
++	/*
++	 * Well, here we need retrieve performance dependency information
++	 * from _PSD object. The reason why existing interface is not used
++	 * is due to the reason that existing interface sticks to Linux cpu
++	 * id to construct some bitmap, however we want to split ACPI
++	 * processor objects from Linux cpu id logic. For example, even
++	 * when Linux is configured as UP, we still want to parse all ACPI
++	 * processor objects to xen. In this case, it's preferred
++	 * to use ACPI ID instead.
++	 */
++	pdomain = &pr->performance->domain_info;
++	pdomain->num_processors = 0;
++	ret = acpi_processor_get_psd(pr);
++	if (ret < 0) {
++		/*
++		 * _PSD is optional - assume no coordination if absent (or
++		 * broken), matching native kernels' behavior.
++		 */
++		pdomain->num_entries = ACPI_PSD_REV0_ENTRIES;
++		pdomain->revision = ACPI_PSD_REV0_REVISION;
++		pdomain->domain = pr->acpi_id;
++		pdomain->coord_type = DOMAIN_COORD_TYPE_SW_ALL;
++		pdomain->num_processors = 1;
++	}
++
++	/* Some sanity check */
++	if ((pdomain->revision != ACPI_PSD_REV0_REVISION) ||
++	    (pdomain->num_entries != ACPI_PSD_REV0_ENTRIES) ||
++	    ((pdomain->coord_type != DOMAIN_COORD_TYPE_SW_ALL) &&
++	     (pdomain->coord_type != DOMAIN_COORD_TYPE_SW_ANY) &&
++	     (pdomain->coord_type != DOMAIN_COORD_TYPE_HW_ALL))) {
++		ret = -EINVAL;
++		goto err_out;
++	}
++
++	/* Last step is to notify BIOS that xen exists */
++	processor_notify_smm();
++
++	processor_cntl_xen_notify(pr, PROCESSOR_PM_INIT, PM_TYPE_PERF);
++
++	return 0;
++err_out:
++	pr->performance = NULL;
++	kfree(perf);
++	return ret;
++}
++
++static inline void xen_convert_pct_reg(struct xen_pct_register *xpct,
++	struct acpi_pct_register *apct)
++{
++	xpct->descriptor = apct->descriptor;
++	xpct->length     = apct->length;
++	xpct->space_id   = apct->space_id;
++	xpct->bit_width  = apct->bit_width;
++	xpct->bit_offset = apct->bit_offset;
++	xpct->reserved   = apct->reserved;
++	xpct->address    = apct->address;
++}
++
++static inline void xen_convert_pss_states(struct xen_processor_px *xpss,
++	struct acpi_processor_px *apss, int state_count)
++{
++	int i;
++	for (i = 0; i < state_count; i++) {
++		xpss->core_frequency     = apss->core_frequency;
++		xpss->power              = apss->power;
++		xpss->transition_latency = apss->transition_latency;
++		xpss->bus_master_latency = apss->bus_master_latency;
++		xpss->control            = apss->control;
++		xpss->status             = apss->status;
++		xpss++;
++		apss++;
++	}
++}
++
++static inline void xen_convert_psd_pack(struct xen_psd_package *xpsd,
++	struct acpi_psd_package *apsd)
++{
++	xpsd->num_entries    = apsd->num_entries;
++	xpsd->revision       = apsd->revision;
++	xpsd->domain         = apsd->domain;
++	xpsd->coord_type     = apsd->coord_type;
++	xpsd->num_processors = apsd->num_processors;
++}
++
++static int xen_cx_notifier(struct acpi_processor *pr, int action)
++{
++	int ret, count = 0, i;
++	xen_platform_op_t op = {
++		.cmd			= XENPF_set_processor_pminfo,
++		.interface_version	= XENPF_INTERFACE_VERSION,
++		.u.set_pminfo.id	= pr->acpi_id,
++		.u.set_pminfo.type	= XEN_PM_CX,
++	};
++	struct xen_processor_cx *data, *buf;
++	struct acpi_processor_cx *cx;
++	struct acpi_power_register *reg;
++
++	if (action == PROCESSOR_PM_CHANGE)
++		return -EINVAL;
++
++	/* Convert to Xen defined structure and hypercall */
++	buf = kzalloc(pr->power.count * sizeof(struct xen_processor_cx),
++			GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	data = buf;
++	for (i = 1; i <= pr->power.count; i++) {
++		cx = &pr->power.states[i];
++		reg = power_registers[pr->acpi_id]+i-1;
++		/* Skip invalid cstate entry */
++		if (!cx->valid)
++			continue;
++
++		data->type = cx->type;
++		data->latency = cx->latency;
++		data->power = cx->power;
++		data->reg.space_id = reg->space_id;
++		data->reg.bit_width = reg->bit_width;
++		data->reg.bit_offset = reg->bit_offset;
++		data->reg.access_size = reg->reserved;
++		data->reg.address = reg->address;
++
++		/* Get dependency relationships, _CSD is not supported yet */
++		data->dpcnt = 0;
++		set_xen_guest_handle(data->dp, NULL);
++
++		data++;
++		count++;
++	}
++
++	if (!count) {
++		printk(KERN_ERR "No available Cx info for cpu %d\n",
++				pr->acpi_id);
++		kfree(buf);
++		return -EINVAL;
++	}
++
++	op.u.set_pminfo.power.count = count;
++	op.u.set_pminfo.power.flags.bm_control = pr->flags.bm_control;
++	op.u.set_pminfo.power.flags.bm_check = pr->flags.bm_check;
++	op.u.set_pminfo.power.flags.has_cst = pr->flags.has_cst;
++	op.u.set_pminfo.power.flags.power_setup_done =
++		pr->flags.power_setup_done;
++
++	set_xen_guest_handle(op.u.set_pminfo.power.states, buf);
++	ret = HYPERVISOR_dom0_op(&op);
++	kfree(buf);
++	return ret;
++}
++
++static int xen_px_notifier(struct acpi_processor *pr, int action)
++{
++	int ret = -EINVAL;
++	xen_platform_op_t op = {
++		.cmd			= XENPF_set_processor_pminfo,
++		.interface_version	= XENPF_INTERFACE_VERSION,
++		.u.set_pminfo.id	= pr->acpi_id,
++		.u.set_pminfo.type	= XEN_PM_PX,
++	};
++	struct xen_processor_performance *perf;
++	struct xen_processor_px *states = NULL;
++	struct acpi_processor_performance *px;
++	struct acpi_psd_package *pdomain;
++
++	if (!pr)
++		return -EINVAL;
++
++	perf = &op.u.set_pminfo.perf;
++	px = pr->performance;
++
++	switch (action) {
++	case PROCESSOR_PM_CHANGE:
++		/* ppc dynamic handle */
++		perf->flags = XEN_PX_PPC;
++		perf->platform_limit = pr->performance_platform_limit;
++
++		ret = HYPERVISOR_dom0_op(&op);
++		break;
++
++	case PROCESSOR_PM_INIT:
++		/* px normal init */
++		perf->flags = XEN_PX_PPC |
++			      XEN_PX_PCT |
++			      XEN_PX_PSS |
++			      XEN_PX_PSD;
++
++		/* ppc */
++		perf->platform_limit = pr->performance_platform_limit;
++
++		/* pct */
++		xen_convert_pct_reg(&perf->control_register,
++				&px->control_register);
++		xen_convert_pct_reg(&perf->status_register,
++				&px->status_register);
++
++		/* pss */
++		perf->state_count = px->state_count;
++		states = kzalloc(px->state_count*sizeof(xen_processor_px_t),
++				GFP_KERNEL);
++		if (!states)
++			return -ENOMEM;
++		xen_convert_pss_states(states, px->states, px->state_count);
++		set_xen_guest_handle(perf->states, states);
++
++		/* psd */
++		pdomain = &px->domain_info;
++		xen_convert_psd_pack(&perf->domain_info, pdomain);
++		if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
++			perf->shared_type = CPUFREQ_SHARED_TYPE_ALL;
++		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
++			perf->shared_type = CPUFREQ_SHARED_TYPE_ANY;
++		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
++			perf->shared_type = CPUFREQ_SHARED_TYPE_HW;
++		else {
++			ret = -ENODEV;
++			kfree(states);
++			break;
++		}
++
++		ret = HYPERVISOR_dom0_op(&op);
++		kfree(states);
++		break;
++
++	default:
++		break;
++	}
++
++	return ret;
++}
++
++static int xen_tx_notifier(struct acpi_processor *pr, int action)
++{
++	return -EINVAL;
++}
++static int xen_hotplug_notifier(struct acpi_processor *pr, int event)
++{
++	return -EINVAL;
++}
++
++static int __init xen_acpi_processor_extcntl_init(void)
++{
++	unsigned int pmbits = (xen_start_info->flags & SIF_PM_MASK) >> 8;
++
++	if (!pmbits)
++		return 0;
++	if (pmbits & XEN_PROCESSOR_PM_CX)
++		xen_ops.pm_ops[PM_TYPE_IDLE] = xen_cx_notifier;
++	if (pmbits & XEN_PROCESSOR_PM_PX)
++		xen_ops.pm_ops[PM_TYPE_PERF] = xen_px_notifier;
++	if (pmbits & XEN_PROCESSOR_PM_TX)
++		xen_ops.pm_ops[PM_TYPE_THR] = xen_tx_notifier;
++
++	return 0;
++}
++
++subsys_initcall(xen_acpi_processor_extcntl_init);
 diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
-index f5bbd9e..939721e 100644
+index f5bbd9e..d2f862d 100644
 --- a/drivers/xen/balloon.c
 +++ b/drivers/xen/balloon.c
 @@ -43,6 +43,7 @@
@@ -5837,7 +6454,15 @@ index f5bbd9e..939721e 100644
  	balloon_stats.target_pages = target;
  	schedule_work(&balloon_worker);
  }
-@@ -426,12 +403,10 @@ static int __init balloon_init(void)
+@@ -418,7 +395,6 @@ static struct notifier_block xenstore_notifier;
+ static int __init balloon_init(void)
+ {
+ 	unsigned long pfn;
+-	struct page *page;
+ 
+ 	if (!xen_pv_domain())
+ 		return -ENODEV;
+@@ -426,12 +402,10 @@ static int __init balloon_init(void)
  	pr_info("xen_balloon: Initialising balloon driver.\n");
  
  	balloon_stats.current_pages = min(xen_start_info->nr_pages, max_pfn);
@@ -5850,7 +6475,22 @@ index f5bbd9e..939721e 100644
  
  	init_timer(&balloon_timer);
  	balloon_timer.data = 0;
-@@ -464,6 +439,101 @@ static void balloon_exit(void)
+@@ -441,9 +415,11 @@ static int __init balloon_init(void)
+ 
+ 	/* Initialise the balloon with excess memory space. */
+ 	for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
+-		page = pfn_to_page(pfn);
+-		if (!PageReserved(page))
+-			balloon_append(page);
++		if (page_is_ram(pfn)) {
++			struct page *page = pfn_to_page(pfn);
++			if (!PageReserved(page))
++				balloon_append(page);
++		}
+ 	}
+ 
+ 	target_watch.callback = watch_target;
+@@ -464,6 +440,101 @@ static void balloon_exit(void)
  
  module_exit(balloon_exit);
  
@@ -5952,7 +6592,7 @@ index f5bbd9e..939721e 100644
  #define BALLOON_SHOW(name, format, args...)				\
  	static ssize_t show_##name(struct sys_device *dev,		\
  				   struct sysdev_attribute *attr,	\
-@@ -476,9 +546,6 @@ module_exit(balloon_exit);
+@@ -476,9 +547,6 @@ module_exit(balloon_exit);
  BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(balloon_stats.current_pages));
  BALLOON_SHOW(low_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_low));
  BALLOON_SHOW(high_kb, "%lu\n", PAGES2KB(balloon_stats.balloon_high));
@@ -5962,7 +6602,7 @@ index f5bbd9e..939721e 100644
  BALLOON_SHOW(driver_kb, "%lu\n", PAGES2KB(balloon_stats.driver_pages));
  
  static ssize_t show_target_kb(struct sys_device *dev, struct sysdev_attribute *attr,
-@@ -548,7 +615,6 @@ static struct attribute *balloon_info_attrs[] = {
+@@ -548,7 +616,6 @@ static struct attribute *balloon_info_attrs[] = {
  	&attr_current_kb.attr,
  	&attr_low_kb.attr,
  	&attr_high_kb.attr,
@@ -7667,7 +8307,7 @@ index 0000000..650f4b3
 +	(void)xenbus_register_backend(&blkback);
 +}
 diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index abad71b..e2127bd 100644
+index abad71b..96aebd4 100644
 --- a/drivers/xen/events.c
 +++ b/drivers/xen/events.c
 @@ -16,7 +16,7 @@
@@ -7786,7 +8426,7 @@ index abad71b..e2127bd 100644
  		if (irq_info[irq].type == IRQT_UNBOUND)
  			break;
  
-@@ -350,6 +384,297 @@ static int find_unbound_irq(void)
+@@ -350,6 +384,299 @@ static int find_unbound_irq(void)
  	return irq;
  }
  
@@ -7985,6 +8625,7 @@ index abad71b..e2127bd 100644
 +	return irq;
 +}
 +
++#ifdef CONFIG_PCI_MSI
 +int xen_destroy_irq(int irq)
 +{
 +	struct irq_desc *desc;
@@ -8070,6 +8711,7 @@ index abad71b..e2127bd 100644
 +	spin_unlock(&irq_mapping_update_lock);
 +	return irq;
 +}
++#endif
 +
 +int xen_vector_from_irq(unsigned irq)
 +{
@@ -8084,7 +8726,7 @@ index abad71b..e2127bd 100644
  int bind_evtchn_to_irq(unsigned int evtchn)
  {
  	int irq;
-@@ -409,8 +734,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+@@ -409,8 +736,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
  	return irq;
  }
  
@@ -8109,7 +8751,7 @@ index abad71b..e2127bd 100644
  {
  	struct evtchn_bind_virq bind_virq;
  	int evtchn, irq;
-@@ -501,6 +841,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
+@@ -501,6 +843,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
  }
  EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
  
@@ -8139,7 +8781,7 @@ index abad71b..e2127bd 100644
  int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
  			    irq_handler_t handler,
  			    unsigned long irqflags, const char *devname, void *dev_id)
-@@ -532,6 +895,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
+@@ -532,6 +897,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
  	if (irq < 0)
  		return irq;
  
@@ -8147,7 +8789,7 @@ index abad71b..e2127bd 100644
  	retval = request_irq(irq, handler, irqflags, devname, dev_id);
  	if (retval != 0) {
  		unbind_from_irq(irq);
-@@ -924,13 +1288,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
+@@ -924,13 +1290,38 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
  	.retrigger	= retrigger_dynirq,
  };
  
@@ -8187,7 +8829,7 @@ index abad71b..e2127bd 100644
  
  	init_evtchn_cpu_bindings();
  
-@@ -939,4 +1328,6 @@ void __init xen_init_IRQ(void)
+@@ -939,4 +1330,6 @@ void __init xen_init_IRQ(void)
  		mask_evtchn(i);
  
  	irq_ctx_init(smp_processor_id());
@@ -11176,10 +11818,10 @@ index 0000000..a492288
 +}
 diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
 new file mode 100644
-index 0000000..5156278
+index 0000000..ae693e7
 --- /dev/null
 +++ b/drivers/xen/pci.c
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,124 @@
 +/*
 + * Copyright (c) 2009, Intel Corporation.
 + *
@@ -11200,8 +11842,13 @@ index 0000000..5156278
 + */
 +
 +#include <linux/pci.h>
++
++#include <xen/interface/xen.h>
 +#include <xen/interface/physdev.h>
++
++#include <asm/xen/hypervisor.h>
 +#include <asm/xen/hypercall.h>
++
 +#include "../pci/pci.h"
 +
 +
@@ -11292,6 +11939,9 @@ index 0000000..5156278
 +
 +static int __init register_xen_pci_notifier(void)
 +{
++	if (!xen_pv_domain())
++		return 0;
++
 +	return bus_register_notifier(&pci_bus_type, &device_nb);
 +}
 +
@@ -13192,6 +13842,19 @@ index 0000000..af10804
 +	.read = xsd_read,
 +	.release = xsd_release,
 +};
+diff --git a/include/acpi/processor.h b/include/acpi/processor.h
+index baf1e0a..f325963 100644
+--- a/include/acpi/processor.h
++++ b/include/acpi/processor.h
+@@ -295,6 +295,8 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
+ void acpi_processor_ppc_init(void);
+ void acpi_processor_ppc_exit(void);
+ int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
++int acpi_processor_get_performance_info(struct acpi_processor *pr);
++int acpi_processor_get_psd(struct acpi_processor *pr);
+ #else
+ static inline void acpi_processor_ppc_init(void)
+ {
 diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
 index b4326b5..bad75d1 100644
 --- a/include/asm-generic/pci.h
@@ -13263,14 +13926,16 @@ index 4e65c16..84ad8f0 100644
 +header-y += privcmd.h
 diff --git a/include/xen/acpi.h b/include/xen/acpi.h
 new file mode 100644
-index 0000000..fea4cfb
+index 0000000..3d73163
 --- /dev/null
 +++ b/include/xen/acpi.h
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,84 @@
 +#ifndef _XEN_ACPI_H
 +#define _XEN_ACPI_H
 +
 +#include <linux/types.h>
++#include <acpi/acpi_drivers.h>
++#include <acpi/processor.h>
 +
 +#ifdef CONFIG_XEN_S3
 +#include <asm/xen/hypervisor.h>
@@ -13289,6 +13954,65 @@ index 0000000..fea4cfb
 +int acpi_notify_hypervisor_state(u8 sleep_state,
 +				 u32 pm1a_cnt, u32 pm1b_cnd);
 +
++/*
++ * Following are interfaces for xen acpi processor control
++ */
++
++/* Events notified to xen */
++#define PROCESSOR_PM_INIT	1
++#define PROCESSOR_PM_CHANGE	2
++#define PROCESSOR_HOTPLUG	3
++
++/* Objects for the PM events */
++#define PM_TYPE_IDLE		0
++#define PM_TYPE_PERF		1
++#define PM_TYPE_THR		2
++#define PM_TYPE_MAX		3
++
++/* Processor hotplug events */
++#define HOTPLUG_TYPE_ADD	0
++#define HOTPLUG_TYPE_REMOVE	1
++
++#ifdef CONFIG_ACPI_PROCESSOR_XEN
++
++struct processor_cntl_xen_ops {
++	/* Transfer processor PM events to xen */
++int (*pm_ops[PM_TYPE_MAX])(struct acpi_processor *pr, int event);
++	/* Notify physical processor status to xen */
++	int (*hotplug)(struct acpi_processor *pr, int type);
++};
++
++extern int processor_cntl_xen(void);
++extern int processor_cntl_xen_pm(void);
++extern int processor_cntl_xen_pmperf(void);
++extern int processor_cntl_xen_pmthr(void);
++extern int processor_cntl_xen_prepare(struct acpi_processor *pr);
++extern int processor_cntl_xen_notify(struct acpi_processor *pr,
++			int event, int type);
++extern int processor_cntl_xen_power_cache(int cpu, int cx,
++		struct acpi_power_register *reg);
++#else
++
++static inline int processor_cntl_xen(void) { return 0; }
++static inline int processor_cntl_xen_pm(void) { return 0; }
++static inline int processor_cntl_xen_pmperf(void) { return 0; }
++static inline int processor_cntl_xen_pmthr(void) { return 0; }
++static inline int processor_cntl_xen_notify(struct acpi_processor *pr,
++			int event, int type)
++{
++	return 0;
++}
++static inline int processor_cntl_xen_prepare(struct acpi_processor *pr)
++{
++	return 0;
++}
++static inline int processor_cntl_xen_power_cache(int cpu, int cx,
++		struct acpi_power_register *reg)
++{
++	return 0;
++}
++#endif /* CONFIG_ACPI_PROCESSOR_XEN */
++
 +#endif	/* _XEN_ACPI_H */
 diff --git a/include/xen/balloon.h b/include/xen/balloon.h
 new file mode 100644
@@ -13779,10 +14503,10 @@ index cd69391..ac5de37 100644
   * hypercall since 0x00030202.
 diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h
 new file mode 100644
-index 0000000..83e4714
+index 0000000..6783fce
 --- /dev/null
 +++ b/include/xen/interface/platform.h
-@@ -0,0 +1,222 @@
+@@ -0,0 +1,336 @@
 +/******************************************************************************
 + * platform.h
 + *
@@ -13984,6 +14708,119 @@ index 0000000..83e4714
 +typedef struct xenpf_getidletime xenpf_getidletime_t;
 +DEFINE_GUEST_HANDLE_STRUCT(xenpf_getidletime_t);
 +
++#define XENPF_set_processor_pminfo      54
++
++/* ability bits */
++#define XEN_PROCESSOR_PM_CX	1
++#define XEN_PROCESSOR_PM_PX	2
++#define XEN_PROCESSOR_PM_TX	4
++
++/* cmd type */
++#define XEN_PM_CX   0
++#define XEN_PM_PX   1
++#define XEN_PM_TX   2
++
++/* Px sub info type */
++#define XEN_PX_PCT   1
++#define XEN_PX_PSS   2
++#define XEN_PX_PPC   4
++#define XEN_PX_PSD   8
++
++struct xen_power_register {
++	uint32_t     space_id;
++	uint32_t     bit_width;
++	uint32_t     bit_offset;
++	uint32_t     access_size;
++	uint64_t     address;
++};
++
++struct xen_processor_csd {
++	uint32_t    domain;      /* domain number of one dependent group */
++	uint32_t    coord_type;  /* coordination type */
++	uint32_t    num;         /* number of processors in same domain */
++};
++typedef struct xen_processor_csd xen_processor_csd_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_processor_csd);
++
++struct xen_processor_cx {
++	struct xen_power_register  reg; /* GAS for Cx trigger register */
++	uint8_t     type;     /* cstate value, c0: 0, c1: 1, ... */
++	uint32_t    latency;  /* worst latency (ms) to enter/exit this cstate */
++	uint32_t    power;    /* average power consumption(mW) */
++	uint32_t    dpcnt;    /* number of dependency entries */
++	GUEST_HANDLE(xen_processor_csd) dp; /* NULL if no dependency */
++};
++typedef struct xen_processor_cx xen_processor_cx_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_processor_cx);
++
++struct xen_processor_flags {
++	uint32_t bm_control:1;
++	uint32_t bm_check:1;
++	uint32_t has_cst:1;
++	uint32_t power_setup_done:1;
++	uint32_t bm_rld_set:1;
++};
++
++struct xen_processor_power {
++	uint32_t count;  /* number of C state entries in array below */
++	struct xen_processor_flags flags;  /* global flags of this processor */
++	GUEST_HANDLE(xen_processor_cx) states; /* supported c states */
++};
++
++struct xen_pct_register {
++	uint8_t  descriptor;
++	uint16_t length;
++	uint8_t  space_id;
++	uint8_t  bit_width;
++	uint8_t  bit_offset;
++	uint8_t  reserved;
++	uint64_t address;
++};
++
++struct xen_processor_px {
++	uint64_t core_frequency; /* megahertz */
++	uint64_t power;      /* milliWatts */
++	uint64_t transition_latency; /* microseconds */
++	uint64_t bus_master_latency; /* microseconds */
++	uint64_t control;        /* control value */
++	uint64_t status;     /* success indicator */
++};
++typedef struct xen_processor_px xen_processor_px_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_processor_px);
++
++struct xen_psd_package {
++	uint64_t num_entries;
++	uint64_t revision;
++	uint64_t domain;
++	uint64_t coord_type;
++	uint64_t num_processors;
++};
++
++struct xen_processor_performance {
++	uint32_t flags;     /* flag for Px sub info type */
++	uint32_t platform_limit;  /* Platform limitation on freq usage */
++	struct xen_pct_register control_register;
++	struct xen_pct_register status_register;
++	uint32_t state_count;     /* total available performance states */
++	GUEST_HANDLE(xen_processor_px) states;
++	struct xen_psd_package domain_info;
++	uint32_t shared_type;     /* coordination type of this processor */
++};
++typedef struct xen_processor_performance xen_processor_performance_t;
++DEFINE_GUEST_HANDLE_STRUCT(xen_processor_performance);
++
++struct xenpf_set_processor_pminfo {
++	/* IN variables */
++	uint32_t id;    /* ACPI CPU ID */
++	uint32_t type;  /* {XEN_PM_CX, XEN_PM_PX} */
++	union {
++		struct xen_processor_power          power;/* Cx: _CST/_CSD */
++		struct xen_processor_performance    perf; /* Px: _PPC/_PCT/_PSS/_PSD */
++	};
++};
++typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t;
++DEFINE_GUEST_HANDLE_STRUCT(xenpf_set_processor_pminfo);
++
 +struct xen_platform_op {
 +	uint32_t cmd;
 +	uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
@@ -13998,6 +14835,7 @@ index 0000000..83e4714
 +		struct xenpf_enter_acpi_sleep  enter_acpi_sleep;
 +		struct xenpf_change_freq       change_freq;
 +		struct xenpf_getidletime       getidletime;
++		struct xenpf_set_processor_pminfo set_pminfo;
 +		uint8_t                        pad[128];
 +	} u;
 +};
@@ -14441,7 +15279,7 @@ index 0000000..f31fdab
 +
 +#endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */
 diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
-index 2befa3e..327db61 100644
+index 2befa3e..812ffd5 100644
 --- a/include/xen/interface/xen.h
 +++ b/include/xen/interface/xen.h
 @@ -184,6 +184,8 @@
@@ -14453,7 +15291,7 @@ index 2befa3e..327db61 100644
  struct mmuext_op {
  	unsigned int cmd;
  	union {
-@@ -449,6 +451,45 @@ struct start_info {
+@@ -449,9 +451,49 @@ struct start_info {
  	int8_t cmd_line[MAX_GUEST_CMDLINE];
  };
  
@@ -14499,7 +15337,11 @@ index 2befa3e..327db61 100644
  /* These flags are passed in the 'flags' field of start_info_t. */
  #define SIF_PRIVILEGED    (1<<0)  /* Is the domain privileged? */
  #define SIF_INITDOMAIN    (1<<1)  /* Is this the initial control domain? */
-@@ -461,6 +502,8 @@ typedef uint8_t xen_domain_handle_t[16];
++#define SIF_PM_MASK       (0xFF<<8) /* reserve 1 byte for xen-pm options */
+ 
+ typedef uint64_t cpumap_t;
+ 
+@@ -461,6 +503,8 @@ typedef uint8_t xen_domain_handle_t[16];
  #define __mk_unsigned_long(x) x ## UL
  #define mk_unsigned_long(x) __mk_unsigned_long(x)
  


--- patch-2.6.31-rc7-git1.bz2.sign DELETED ---



From dcantrel at fedoraproject.org  Wed Aug 26 20:10:50 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 26 Aug 2009 20:10:50 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhcp.spec,1.262,1.263
Message-ID: <20090826201050.7854611C02CC@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31803

Modified Files:
	dhcp.spec 
Log Message:
* Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
- Do not require policycoreutils for post scriptlet (#519479)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- dhcp.spec	6 Aug 2009 21:30:06 -0000	1.262
+++ dhcp.spec	26 Aug 2009 20:10:50 -0000	1.263
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  2%{?dist}
+Release:  3%{?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.
@@ -62,7 +62,6 @@ BuildRequires: openldap-devel
 
 Requires(post): chkconfig
 Requires(post): coreutils
-Requires(post): policycoreutils
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
@@ -458,6 +457,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
+- Do not require policycoreutils for post scriptlet (#519479)
+
 * Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
 - Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
   resume with active dhclient leases (#479639)



From pkgdb at fedoraproject.org  Wed Aug 26 20:15:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:15:12 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20090826201512.6A3D410F881@bastion2.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on Django (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:15:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:15:13 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20090826201513.72A8C10F897@bastion2.fedora.phx.redhat.com>

smilner has requested the commit acl on Django (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:15:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:15:12 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20090826201512.E82B810F88C@bastion2.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on Django (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:15:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:15:14 +0000
Subject: [pkgdb] Django: smilner has requested approveacls
Message-ID: <20090826201514.D082A10F89A@bastion2.fedora.phx.redhat.com>

smilner has requested the approveacls acl on Django (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:13 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20090826201613.3B58510F881@bastion2.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on Django (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From myoung at fedoraproject.org  Wed Aug 26 20:16:16 2009
From: myoung at fedoraproject.org (myoung)
Date: Wed, 26 Aug 2009 20:16:16 +0000 (UTC)
Subject: rpms/kernel/devel allow-disabling-ima.diff, NONE,
	1.2.2.2 kernel.spec, 1.1294.2.59, 1.1294.2.60
Message-ID: <20090826201616.D9F3911C02CC@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32476

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec 
Added Files:
      Tag: private-myoung-dom0-branch
	allow-disabling-ima.diff 
Log Message:
forgot to add a file


allow-disabling-ima.diff:
 Documentation/kernel-parameters.txt |    5 +++++
 security/integrity/ima/ima_main.c   |   17 +++++++++++++++++
 2 files changed, 22 insertions(+)

--- NEW FILE allow-disabling-ima.diff ---
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7936b80..0d1b1ed 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -926,6 +926,11 @@ and is between 256 and 4096 characters. It is defined in the file
 	ihash_entries=	[KNL]
 			Set number of hash buckets for inode cache.
 
+	ima=		[IMA]
+			Format: { "0" | "1" }
+			0 -- disable IMA.
+			1 -- enable IMA. (default)
+
 	ima_audit=	[IMA]
 			Format: { "0" | "1" }
 			0 -- integrity auditing messages. (Default)
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 101c512..cc7603e 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -339,10 +339,27 @@ int ima_bprm_check(struct linux_binprm *bprm)
 	return 0;
 }
 
+static int ima_disabled = 0;
+static int __init ima_enabled(char *str)
+{
+	unsigned long enabled;
+
+	if (!strict_strtoul(str, 0, &enabled))
+		ima_disabled = enabled ? 0 : 1;
+
+	return 1;
+}
+__setup("ima=", ima_enabled);
+
 static int __init init_ima(void)
 {
 	int error;
 
+	if (ima_disabled) {
+		pr_info("IMA disabled at user request.\n");
+		return 0;
+	}
+
 	ima_iintcache_init();
 	error = ima_init();
 	ima_initialized = 1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.59
retrieving revision 1.1294.2.60
diff -u -p -r1.1294.2.59 -r1.1294.2.60
--- kernel.spec	26 Aug 2009 19:58:48 -0000	1.1294.2.59
+++ kernel.spec	26 Aug 2009 20:16:16 -0000	1.1294.2.60
@@ -2021,7 +2021,7 @@ fi
 
 %changelog
 * Wed Aug 26 2009 Michael Young <m.a.young at durham.ac.uk>
-- update pvops again
+- update pvops again.
 
 * Wed Aug 26 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git4



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:16 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20090826201617.0FB3410F890@bastion2.fedora.phx.redhat.com>

smilner has requested the commit acl on Django (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:18 +0000
Subject: [pkgdb] Django: smilner has requested approveacls
Message-ID: <20090826201618.A319710F884@bastion2.fedora.phx.redhat.com>

smilner has requested the approveacls acl on Django (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:21 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20090826201621.7303F10F895@bastion2.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on Django (Fedora 6)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:33 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20090826201633.71D4B10F878@bastion2.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on Django (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:35 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20090826201635.5E80010F897@bastion2.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on Django (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:36 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20090826201636.E39FD10F89A@bastion2.fedora.phx.redhat.com>

smilner has requested the commit acl on Django (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:38 +0000
Subject: [pkgdb] Django: smilner has requested approveacls
Message-ID: <20090826201638.C220010F8A1@bastion2.fedora.phx.redhat.com>

smilner has requested the approveacls acl on Django (Fedora 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:45 +0000
Subject: [pkgdb] Django: smilner has requested watchbugzilla
Message-ID: <20090826201645.8E67610F884@bastion2.fedora.phx.redhat.com>

smilner has requested the watchbugzilla acl on Django (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:48 +0000
Subject: [pkgdb] Django: smilner has requested watchcommits
Message-ID: <20090826201649.ED61910F87B@bastion2.fedora.phx.redhat.com>

smilner has requested the watchcommits acl on Django (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:50 +0000
Subject: [pkgdb] Django: smilner has requested commit
Message-ID: <20090826201651.3619110F8A5@bastion2.fedora.phx.redhat.com>

smilner has requested the commit acl on Django (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:16:52 +0000
Subject: [pkgdb] Django: smilner has requested approveacls
Message-ID: <20090826201652.BB43C10F8A6@bastion2.fedora.phx.redhat.com>

smilner has requested the approveacls acl on Django (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From dwalsh at fedoraproject.org  Wed Aug 26 20:19:02 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 20:19:02 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.29,
	1.30 modules-targeted.conf, 1.138, 1.139 policy-F12.patch, 1.63,
	1.64 selinux-policy.spec, 1.905, 1.906
Message-ID: <20090826201902.581C911C02CC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv426

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-8
- Add back in unconfined.pp and unconfineduser.pp
- Add Sandbox unshare



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- modules-minimum.conf	21 Aug 2009 22:58:28 -0000	1.29
+++ modules-minimum.conf	26 Aug 2009 20:19:01 -0000	1.30
@@ -1301,6 +1301,13 @@ selinuxutil = base
 # 
 sendmail = base
 
+# Layer: apps
+# Module: seunshare
+#
+# seunshare executable
+# 
+seunshare = module
+
 # Layer: services
 # Module: shorewall
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- modules-targeted.conf	21 Aug 2009 22:58:28 -0000	1.138
+++ modules-targeted.conf	26 Aug 2009 20:19:01 -0000	1.139
@@ -1301,6 +1301,13 @@ selinuxutil = base
 # 
 sendmail = base
 
+# Layer: apps
+# Module: seunshare
+#
+# seunshare executable
+# 
+seunshare = module
+
 # Layer: services
 # Module: shorewall
 #

policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   17 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.if                 |    5 
 policy/modules/admin/usermanage.te                 |   30 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cdrecord.te                    |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.if                  |    1 
 policy/modules/apps/pulseaudio.te                  |   18 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  167 ++
 policy/modules/apps/sandbox.te                     |  302 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/seunshare.fc                   |    2 
 policy/modules/apps/seunshare.if                   |   76 +
 policy/modules/apps/seunshare.te                   |   37 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   59 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   24 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  173 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/storage.fc                   |    1 
 policy/modules/kernel/storage.if                   |    2 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   36 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  392 +++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/afs.fc                     |    1 
 policy/modules/services/afs.te                     |    1 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   35 
 policy/modules/services/apache.if                  |  327 +++-
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   46 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   49 
 policy/modules/services/policykit.te               |   60 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 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                     |   12 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   83 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   12 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  183 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 +++-
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 +++++++-
 policy/modules/services/xserver.te                 |  306 +++-
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  268 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  153 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  167 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   27 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.if                      |   21 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1374 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 341 files changed, 14748 insertions(+), 2987 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- policy-F12.patch	26 Aug 2009 14:02:26 -0000	1.63
+++ policy-F12.patch	26 Aug 2009 20:19:01 -0000	1.64
@@ -3604,8 +3604,8 @@ 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.28/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te	2009-08-26 08:11:55.000000000 -0400
-@@ -22,7 +22,11 @@
++++ serefpolicy-3.6.28/policy/modules/apps/pulseaudio.te	2009-08-26 11:42:50.000000000 -0400
+@@ -22,7 +22,12 @@
  allow pulseaudio_t self:unix_dgram_socket { sendto create_socket_perms };
  allow pulseaudio_t self:tcp_socket create_stream_socket_perms;
  allow pulseaudio_t self:udp_socket create_socket_perms;
@@ -3613,11 +3613,12 @@ diff -b -B --ignore-all-space --exclude-
  
 +can_exec(pulseaudio_t, pulseaudio_exec_t)
 +
++kernel_getattr_proc(pulseaudio_t)
 +kernel_read_system_state(pulseaudio_t)
  kernel_read_kernel_sysctls(pulseaudio_t)
  
  corecmd_exec_bin(pulseaudio_t)
-@@ -47,6 +51,7 @@
+@@ -47,6 +52,7 @@
  
  fs_rw_anon_inodefs_files(pulseaudio_t)
  fs_getattr_tmpfs(pulseaudio_t)
@@ -3625,7 +3626,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_use_all_user_ttys(pulseaudio_t)
  term_use_all_user_ptys(pulseaudio_t)
-@@ -78,6 +83,15 @@
+@@ -78,6 +84,15 @@
  	policykit_domtrans_auth(pulseaudio_t)
  	policykit_read_lib(pulseaudio_t)
  	policykit_read_reload(pulseaudio_t)
@@ -3641,7 +3642,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -85,8 +99,7 @@
+@@ -85,8 +100,7 @@
  ')
  
  optional_policy(`
@@ -4155,8 +4156,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.28/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/apps/sandbox.if	2009-08-21 18:56:07.000000000 -0400
-@@ -0,0 +1,143 @@
++++ serefpolicy-3.6.28/policy/modules/apps/sandbox.if	2009-08-26 15:34:36.000000000 -0400
+@@ -0,0 +1,167 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -4180,12 +4181,27 @@ diff -b -B --ignore-all-space --exclude-
 +	gen_require(`
 +		type sandbox_xserver_t;
 +		attribute sandbox_domain;
++		attribute sandbox_x_domain;
++		attribute sandbox_file_type;
 +	')
 +
 +	allow $1 sandbox_domain:process transition;
 +	dontaudit $1 sandbox_domain:process { noatsecure siginh rlimitinh };
 +	role $2 types sandbox_domain;
++	allow sandbox_domain $1:process sigchld;
++
++	allow $1 sandbox_x_domain:process transition;
++	dontaudit $1 sandbox_x_domain:process { noatsecure siginh rlimitinh };
++	role $2 types sandbox_x_domain;
 +	role $2 types sandbox_xserver_t;
++	allow sandbox_x_domain $1:process sigchld;
++
++	manage_files_pattern($1, sandbox_file_type, sandbox_file_type);
++	manage_dirs_pattern($1, sandbox_file_type, sandbox_file_type);
++	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;
 +')
 +
 +########################################
@@ -4203,12 +4219,13 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	gen_require(`
 +		attribute sandbox_domain;
++		attribute sandbox_file_type;
 +	')
 +
 +	type $1_t, sandbox_domain;
 +	domain_type($1_t)
 +
-+	type $1_file_t;
++	type $1_file_t, sandbox_file_type;
 +	files_type($1_file_t)
 +
 +	can_exec($1_t, $1_file_t)
@@ -4237,16 +4254,24 @@ diff -b -B --ignore-all-space --exclude-
 +		attribute sandbox_domain, sandbox_x_domain;
 +	')
 +
-+	sandbox_domain_template($1)
++	type $1_t, sandbox_x_domain;
++	domain_type($1_t)
 +
-+	
-+	typeattribute $1_t sandbox_x_domain;
++	type $1_file_t, sandbox_file_type;
++	files_type($1_file_t)
++
++	can_exec($1_t, $1_file_t)
++	manage_dirs_pattern($1_t, $1_file_t, $1_file_t)
++	manage_files_pattern($1_t, $1_file_t, $1_file_t)
++	manage_lnk_files_pattern($1_t, $1_file_t, $1_file_t)
++	manage_fifo_files_pattern($1_t, $1_file_t, $1_file_t)
++	manage_sock_files_pattern($1_t, $1_file_t, $1_file_t)
 +
 +	# window manager
 +	miscfiles_setattr_fonts($1_t)
 +	allow $1_t self:capability setuid;
 +
-+	type $1_client_t, sandbox_x_domain, sandbox_domain;
++	type $1_client_t, sandbox_x_domain;
 +	domain_type($1_client_t)
 +
 +	type $1_client_tmpfs_t;
@@ -4302,12 +4327,13 @@ 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.28/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/policy/modules/apps/sandbox.te	2009-08-21 18:56:07.000000000 -0400
-@@ -0,0 +1,274 @@
++++ serefpolicy-3.6.28/policy/modules/apps/sandbox.te	2009-08-26 16:12:59.000000000 -0400
+@@ -0,0 +1,302 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
 +attribute sandbox_x_domain;
++attribute sandbox_file_type;
 +
 +########################################
 +#
@@ -4337,7 +4363,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +allow sandbox_xserver_t self:fifo_file manage_fifo_file_perms;
 +allow sandbox_xserver_t self:shm create_shm_perms;
-+allow sandbox_xserver_t self:tcp_socket create_socket_perms;
++allow sandbox_xserver_t self:tcp_socket create_stream_socket_perms;
 +
 +manage_dirs_pattern(sandbox_xserver_t, sandbox_xserver_tmpfs_t, sandbox_xserver_tmpfs_t)
 +manage_files_pattern(sandbox_xserver_t, sandbox_xserver_tmpfs_t, sandbox_xserver_tmpfs_t)
@@ -4392,10 +4418,15 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +## internal communication is often done using fifo and unix sockets.
-+allow sandbox_domain self:fifo_file rw_file_perms;
++allow sandbox_domain self:fifo_file manage_file_perms;
 +allow sandbox_domain self:unix_stream_socket create_stream_socket_perms;
 +
-+files_rw_all_inherited_files(sandbox_domain)
++gen_require(`
++	type usr_t, lib_t, locale_t;
++	attribute exec_type;
++')
++
++files_rw_all_inherited_files(sandbox_domain, -exec_type -usr_t -lib_t -locale_t )
 +files_entrypoint_all_files(sandbox_domain)
 +
 +miscfiles_read_localization(sandbox_domain)
@@ -4403,11 +4434,16 @@ diff -b -B --ignore-all-space --exclude-
 +kernel_dontaudit_read_system_state(sandbox_domain)
 +corecmd_exec_all_executables(sandbox_domain)
 +
++userdom_dontaudit_use_user_terminals(sandbox_domain)
 +
 +########################################
 +#
 +# sandbox_x_domain local policy
 +#
++## internal communication is often done using fifo and unix sockets.
++allow sandbox_x_domain self:fifo_file manage_file_perms;
++allow sandbox_x_domain self:unix_stream_socket create_stream_socket_perms;
++
 +allow sandbox_x_domain self:process { signal_perms getsched setpgid };
 +allow sandbox_x_domain self:shm create_shm_perms;
 +allow sandbox_x_domain self:unix_stream_socket { connectto create_stream_socket_perms };
@@ -4415,20 +4451,32 @@ diff -b -B --ignore-all-space --exclude-
 +allow sandbox_x_domain sandbox_xserver_t:unix_stream_socket connectto;
 +dontaudit sandbox_x_domain self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 +
++files_search_home(sandbox_x_domain)
++
++kernel_read_system_state(sandbox_x_domain)
++
++corecmd_exec_all_executables(sandbox_x_domain)
++
++
 +dev_read_urand(sandbox_x_domain)
 +dev_dontaudit_read_rand(sandbox_x_domain)
 +
++files_entrypoint_all_files(sandbox_x_domain)
 +files_read_etc_files(sandbox_x_domain)
 +files_read_usr_files(sandbox_x_domain)
 +files_read_usr_symlinks(sandbox_x_domain)
 +
 +fs_getattr_tmpfs(sandbox_x_domain)
 +fs_getattr_xattr_fs(sandbox_x_domain)
++fs_list_inotifyfs(sandbox_x_domain)
 +
 +auth_dontaudit_read_login_records(sandbox_x_domain)
++auth_use_nsswitch(sandbox_x_domain)
 +
 +init_read_utmp(sandbox_x_domain)
 +
++miscfiles_read_localization(sandbox_x_domain)
++
 +term_getattr_pty_fs(sandbox_x_domain)
 +term_use_ptmx(sandbox_x_domain)
 +
@@ -4445,6 +4493,11 @@ diff -b -B --ignore-all-space --exclude-
 +	cups_read_rw_config(sandbox_x_domain)
 +')
 +
++#============= sandbox_x_t ==============
++allow sandbox_x_t home_root_t:dir search;
++allow sandbox_x_t user_devpts_t:chr_file { read write };
++
++
 +########################################
 +#
 +# sandbox_x_client_t local policy
@@ -4623,6 +4676,133 @@ diff -b -B --ignore-all-space --exclude-
 +         manage_lnk_files_pattern($1,screen_var_run_t,screen_var_run_t)
 +         manage_fifo_files_pattern($1,screen_var_run_t,screen_var_run_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.fc serefpolicy-3.6.28/policy/modules/apps/seunshare.fc
+--- nsaserefpolicy/policy/modules/apps/seunshare.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.28/policy/modules/apps/seunshare.fc	2009-08-26 11:10:13.000000000 -0400
+@@ -0,0 +1,2 @@
++
++/usr/sbin/seunshare	--	gen_context(system_u:object_r:seunshare_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.if serefpolicy-3.6.28/policy/modules/apps/seunshare.if
+--- nsaserefpolicy/policy/modules/apps/seunshare.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.28/policy/modules/apps/seunshare.if	2009-08-26 11:46:03.000000000 -0400
+@@ -0,0 +1,76 @@
++
++## <summary>policy for seunshare</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run seunshare.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`seunshare_domtrans',`
++	gen_require(`
++		type seunshare_t;
++                type seunshare_exec_t;
++	')
++
++	domtrans_pattern($1,seunshare_exec_t,seunshare_t)
++')
++
++
++########################################
++## <summary>
++##	Execute seunshare in the seunshare domain, and
++##	allow the specified role the seunshare domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the seunshare domain.
++##	</summary>
++## </param>
++#
++interface(`seunshare_run',`
++	gen_require(`
++		type seunshare_t;
++	')
++
++	seunshare_domtrans($1)
++	sandbox_transition(seunshare_t, $2)
++	role $2 types seunshare_t;
++')
++
++########################################
++## <summary>
++##	Role access for seunshare
++## </summary>
++## <param name="role">
++##	<summary>
++##	Role allowed access
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	User domain for the role
++##	</summary>
++## </param>
++#
++interface(`seunshare_role',`
++	gen_require(`
++              type seunshare_t;
++	')
++
++	role $2 types seunshare_t;
++
++	seunshare_domtrans($1)
++
++	ps_process_pattern($2, seunshare_t)
++	allow $2 seunshare_t:process signal;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.6.28/policy/modules/apps/seunshare.te
+--- nsaserefpolicy/policy/modules/apps/seunshare.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.28/policy/modules/apps/seunshare.te	2009-08-26 16:07:56.000000000 -0400
+@@ -0,0 +1,37 @@
++policy_module(seunshare,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type seunshare_t;
++type seunshare_exec_t;
++application_domain(seunshare_t, seunshare_exec_t)
++role system_r types seunshare_t;
++
++permissive seunshare_t;
++
++########################################
++#
++# seunshare local policy
++#
++
++allow seunshare_t self:process { fork setexec signal };
++allow seunshare_t self:capability setpcap;
++allow seunshare_t self:process { getcap setcap };
++
++allow seunshare_t self:fifo_file rw_file_perms;
++allow seunshare_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(seunshare_t)
++files_mounton_all_poly_members(seunshare_t)
++
++corecmd_exec_shell(seunshare_t)
++corecmd_exec_bin(seunshare_t)
++
++auth_use_nsswitch(seunshare_t)
++
++miscfiles_read_localization(seunshare_t)
++
++userdom_use_user_terminals(seunshare_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.6.28/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2009-07-28 13:28:33.000000000 -0400
 +++ serefpolicy-3.6.28/policy/modules/apps/vmware.fc	2009-08-21 18:56:07.000000000 -0400
@@ -4795,7 +4975,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.28/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/corecommands.fc	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/corecommands.fc	2009-08-26 13:56:26.000000000 -0400
 @@ -54,6 +54,7 @@
  /etc/cron.weekly/.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cron.monthly/.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -4822,7 +5002,15 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -315,3 +320,21 @@
+@@ -221,6 +226,7 @@
+ /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/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)
+@@ -315,3 +321,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5582,7 +5770,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.28/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/kernel/files.if	2009-08-22 09:30:11.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/kernel/files.if	2009-08-26 15:56:29.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5957,11 +6145,11 @@ diff -b -B --ignore-all-space --exclude-
 +		attribute file_type;
 +	')
 +
-+	allow $1 file_type:dir search_dir_perms;
-+	allow $1 file_type:file { getattr read write append lock };
-+	allow $1 file_type:fifo_file { getattr read write append ioctl lock };
-+	allow $1 file_type:sock_file { getattr read write append ioctl lock };
-+	allow $1 file_type:chr_file { getattr read write append ioctl lock };
++	allow $1 { file_type $2 }:dir search_dir_perms;
++	allow $1 { file_type $2 }:file { getattr read write append lock };
++	allow $1 { file_type $2 }:fifo_file { getattr read write append ioctl lock };
++	allow $1 { file_type $2 }:sock_file { getattr read write append ioctl lock };
++	allow $1 { file_type $2 }:chr_file { getattr read write append ioctl lock };
 +')
 +
 +########################################
@@ -15176,7 +15364,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.6.28/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/postgresql.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/postgresql.te	2009-08-26 14:57:08.000000000 -0400
 @@ -32,6 +32,9 @@
  type postgresql_etc_t;
  files_config_file(postgresql_etc_t)
@@ -15207,7 +15395,13 @@ diff -b -B --ignore-all-space --exclude-
  corenet_sendrecv_postgresql_server_packets(postgresql_t)
  corenet_sendrecv_auth_client_packets(postgresql_t)
  
-@@ -247,6 +253,7 @@
+@@ -242,11 +248,12 @@
+ files_read_etc_runtime_files(postgresql_t)
+ files_read_usr_files(postgresql_t)
+ 
+-auth_use_nsswitch(postgresql_t)
++auth_use_pam(postgresql_t)
+ 
  init_read_utmp(postgresql_t)
  
  logging_send_syslog_msg(postgresql_t)
@@ -26139,7 +26333,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.28/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-25 09:28:37.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/userdomain.if	2009-08-26 16:12:51.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -26584,7 +26778,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -511,182 +525,195 @@
+@@ -511,182 +525,203 @@
  	# 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 };
@@ -26695,157 +26889,163 @@ diff -b -B --ignore-all-space --exclude-
  
  	tunable_policy(`user_direct_mouse',`
 -		dev_read_mouse($1_t)
--	')
--
++		dev_read_mouse($1_usertype)
+ 	')
+ 
 -	tunable_policy(`user_ttyfile_stat',`
 -		term_getattr_all_user_ttys($1_t)
-+		dev_read_mouse($1_usertype)
++	optional_policy(`
++		alsa_read_rw_config($1_usertype)
  	')
  
  	optional_policy(`
 -		alsa_read_rw_config($1_t)
-+		alsa_read_rw_config($1_usertype)
++		# Allow graphical boot to check battery lifespan
++		apm_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
- 		# Allow graphical boot to check battery lifespan
+-		# Allow graphical boot to check battery lifespan
 -		apm_stream_connect($1_t)
-+		apm_stream_connect($1_usertype)
++		canna_stream_connect($1_usertype)
++	')
++
++	optional_policy(`
++		dbus_system_bus_client($1_usertype)
++
++		allow $1_usertype $1_usertype:dbus  send_msg;
++
++		optional_policy(`
++			avahi_dbus_chat($1_usertype)
  	')
  
  	optional_policy(`
 -		canna_stream_connect($1_t)
-+		canna_stream_connect($1_usertype)
++			bluetooth_dbus_chat($1_usertype)
  	')
  
  	optional_policy(`
 -		dbus_system_bus_client($1_t)
-+		dbus_system_bus_client($1_usertype)
-+
-+		allow $1_usertype $1_usertype:dbus  send_msg;
++			consolekit_dbus_chat($1_usertype)
++			consolekit_read_log($1_usertype)
++		')
  
  		optional_policy(`
 -			bluetooth_dbus_chat($1_t)
-+			avahi_dbus_chat($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)
-+			bluetooth_dbus_chat($1_usertype)
++			evolution_dbus_chat($1_usertype)
++			evolution_alarm_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
 -			cups_dbus_chat_config($1_t)
-+			consolekit_dbus_chat($1_usertype)
-+			consolekit_read_log($1_usertype)
++			hal_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
 -			hal_dbus_chat($1_t)
-+			devicekit_dbus_chat($1_usertype)
-+			devicekit_dbus_chat_disk($1_usertype)
-+			devicekit_dbus_chat_power($1_usertype)
++			networkmanager_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
 -			networkmanager_dbus_chat($1_t)
--		')
-+			evolution_dbus_chat($1_usertype)
-+			evolution_alarm_dbus_chat($1_usertype)
++			vpnc_dbus_chat($1_usertype)
+ 		')
  	')
  
  	optional_policy(`
 -		inetd_use_fds($1_t)
 -		inetd_rw_tcp_sockets($1_t)
-+			hal_dbus_chat($1_usertype)
++		inetd_use_fds($1_usertype)
++		inetd_rw_tcp_sockets($1_usertype)
  	')
  
  	optional_policy(`
 -		inn_read_config($1_t)
 -		inn_read_news_lib($1_t)
 -		inn_read_news_spool($1_t)
-+			networkmanager_dbus_chat($1_usertype)
++		inn_read_config($1_usertype)
++		inn_read_news_lib($1_usertype)
++		inn_read_news_spool($1_usertype)
  	')
  
  	optional_policy(`
 -		locate_read_lib_files($1_t)
-+			vpnc_dbus_chat($1_usertype)
-+		')
++		locate_read_lib_files($1_usertype)
  	')
  
--	# for running depmod as part of the kernel packaging process
+ 	# for running depmod as part of the kernel packaging process
  	optional_policy(`
 -		modutils_read_module_config($1_t)
-+		inetd_use_fds($1_usertype)
-+		inetd_rw_tcp_sockets($1_usertype)
++		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)
-+		inn_read_config($1_usertype)
-+		inn_read_news_lib($1_usertype)
-+		inn_read_news_spool($1_usertype)
++		nsplugin_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
-+		locate_read_lib_files($1_usertype)
++		tunable_policy(`allow_user_postgresql_connect',`
++			postgresql_stream_connect($1_usertype)
  		')
-+
-+	# for running depmod as part of the kernel packaging process
-+	optional_policy(`
-+		modutils_read_module_config($1_usertype)
  	')
  
  	optional_policy(`
--		# to allow monitoring of pcmcia status
+ 		# to allow monitoring of pcmcia status
 -		pcmcia_read_pid($1_t)
-+		mta_rw_spool($1_usertype)
-+		mta_manage_queue($1_usertype)
++		pcmcia_read_pid($1_usertype)
  	')
  
  	optional_policy(`
 -		pcscd_read_pub_files($1_t)
 -		pcscd_stream_connect($1_t)
-+		nsplugin_role($1_r, $1_usertype)
++		pcscd_read_pub_files($1_usertype)
++		pcscd_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
- 		tunable_policy(`allow_user_postgresql_connect',`
+-		tunable_policy(`allow_user_postgresql_connect',`
 -			postgresql_stream_connect($1_t)
 -			postgresql_tcp_connect($1_t)
-+			postgresql_stream_connect($1_usertype)
-+		')
- 		')
-+
-+	optional_policy(`
-+		# to allow monitoring of pcmcia status
-+		pcmcia_read_pid($1_usertype)
+-		')
++		resmgr_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		resmgr_stream_connect($1_t)
-+		pcscd_read_pub_files($1_usertype)
-+		pcscd_stream_connect($1_usertype)
++		rpc_dontaudit_getattr_exports($1_usertype)
++		rpc_manage_nfs_rw_content($1_usertype)
  	')
  
  	optional_policy(`
 -		rpc_dontaudit_getattr_exports($1_t)
 -		rpc_manage_nfs_rw_content($1_t)
-+		resmgr_stream_connect($1_usertype)
++		samba_stream_connect_winbind($1_usertype)
  	')
  
  	optional_policy(`
 -		samba_stream_connect_winbind($1_t)
-+		rpc_dontaudit_getattr_exports($1_usertype)
-+		rpc_manage_nfs_rw_content($1_usertype)
++		sandbox_transition($1_t, $1_r)
  	')
  
  	optional_policy(`
 -		slrnpull_search_spool($1_t)
-+		samba_stream_connect_winbind($1_usertype)
++		seunshare_run($1_t, $1_r)
  	')
  
  	optional_policy(`
@@ -26856,23 +27056,21 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -714,13 +741,26 @@
+@@ -714,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_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)
-+
+ 
+-	userdom_manage_tmp_role($1_r, $1_t)
+-	userdom_manage_tmpfs_role($1_r, $1_t)
 +		tunable_policy(`allow_$1_exec_content',`
 +			userdom_exec_user_tmp_files($1_usertype)
 +			userdom_exec_user_home_content_files($1_usertype)
@@ -26880,7 +27078,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)
 +		')
@@ -26888,7 +27088,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -738,70 +778,71 @@
+@@ -738,70 +786,71 @@
  
  	allow $1_t self:context contains;
  
@@ -26993,7 +27193,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -838,6 +879,28 @@
+@@ -838,6 +887,28 @@
  	# Local policy
  	#
  
@@ -27022,7 +27222,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -868,7 +931,10 @@
+@@ -868,7 +939,10 @@
  
  	userdom_restricted_user_template($1)
  
@@ -27034,7 +27234,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -876,14 +942,19 @@
+@@ -876,14 +950,19 @@
  	#
  
  	auth_role($1_r, $1_t)
@@ -27059,7 +27259,7 @@ diff -b -B --ignore-all-space --exclude-
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -891,28 +962,47 @@
+@@ -891,28 +970,47 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -27075,15 +27275,15 @@ diff -b -B --ignore-all-space --exclude-
 +		devicekit_dbus_chat($1_usertype)
 +		devicekit_dbus_chat_disk($1_usertype)
 +		devicekit_dbus_chat_power($1_usertype)
++	')
++
++	optional_policy(`
++		fprintd_dbus_chat($1_t)
  	')
  
  	optional_policy(`
 -		dbus_role_template($1, $1_r, $1_t)
 -		dbus_system_bus_client($1_t)
-+		fprintd_dbus_chat($1_t)
-+	')
-+
-+	optional_policy(`
 +		gnomeclock_dbus_chat($1_t)
 +	')	  
  
@@ -27114,7 +27314,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -946,8 +1036,8 @@
+@@ -946,8 +1044,8 @@
  	# Declarations
  	#
  
@@ -27124,7 +27324,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -956,11 +1046,12 @@
+@@ -956,11 +1054,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -27139,7 +27339,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -978,36 +1069,53 @@
+@@ -978,36 +1077,53 @@
  		')
  	')
  
@@ -27207,7 +27407,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1042,7 +1150,7 @@
+@@ -1042,7 +1158,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -27216,7 +27416,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1051,8 +1159,7 @@
+@@ -1051,8 +1167,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -27226,7 +27426,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,7 +1182,8 @@
+@@ -1075,7 +1190,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -27236,7 +27436,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1091,6 +1199,7 @@
+@@ -1091,6 +1207,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -27244,7 +27444,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1098,8 +1207,6 @@
+@@ -1098,8 +1215,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27253,7 +27453,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)
-@@ -1126,6 +1233,7 @@
+@@ -1126,6 +1241,7 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -27261,7 +27461,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1154,20 +1262,6 @@
+@@ -1154,20 +1270,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27282,7 +27482,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1213,6 +1307,7 @@
+@@ -1213,6 +1315,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27290,7 +27490,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1278,11 +1373,15 @@
+@@ -1278,11 +1381,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27306,7 +27506,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1374,12 +1473,13 @@
+@@ -1374,12 +1481,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -27321,7 +27521,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1412,6 +1512,14 @@
+@@ -1412,6 +1520,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27336,7 +27536,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1427,9 +1535,11 @@
+@@ -1427,9 +1543,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27348,7 +27548,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1486,6 +1596,25 @@
+@@ -1486,6 +1604,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27374,7 +27574,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1689,8 @@
+@@ -1560,6 +1697,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27383,7 +27583,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1784,7 @@
+@@ -1653,6 +1792,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27391,7 +27591,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)
  ')
-@@ -1780,19 +1912,32 @@
+@@ -1780,19 +1920,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -27431,7 +27631,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1972,7 @@
+@@ -1827,6 +1980,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -27439,7 +27639,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2520,7 @@
+@@ -2374,7 +2528,7 @@
  
  ########################################
  ## <summary>
@@ -27448,7 +27648,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2874,32 @@
+@@ -2728,11 +2882,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27483,7 +27683,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3027,25 @@
+@@ -2860,7 +3035,25 @@
  		type user_tmp_t;
  	')
  
@@ -27510,7 +27710,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3082,7 @@
+@@ -2897,6 +3090,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27518,7 +27718,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3213,559 @@
+@@ -3027,3 +3221,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -p -r1.905 -r1.906
--- selinux-policy.spec	26 Aug 2009 14:02:27 -0000	1.905
+++ selinux-policy.spec	26 Aug 2009 20:19:02 -0000	1.906
@@ -443,6 +443,7 @@ exit 0
 %changelog
 * Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-8
 - Add back in unconfined.pp and unconfineduser.pp
+- Add Sandbox unshare
 
 * Tue Aug 25 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-7
 - Fixes for cdrecord, mdadm, and others



From pkgdb at fedoraproject.org  Wed Aug 26 20:21:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:21:51 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202151.582FA10F878@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora devel) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:21:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:21:52 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202153.0DBC410F881@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora devel) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:21:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:21:58 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202158.90CDA10F890@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora devel) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:21:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:21:59 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202200.0973B10F898@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora devel) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:31 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202231.BEEB910F879@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora 10) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:32 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202232.7837E10F884@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora 10) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:35 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202235.BFBC310F89B@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora 10) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:37 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202237.E863F10F89F@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 10) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:51 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202251.3BD7210F8A1@bastion2.fedora.phx.redhat.com>

bos has set the watchbugzilla acl on llvm (Fedora 11) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:52 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202252.B807C10F8A2@bastion2.fedora.phx.redhat.com>

bos has set the watchcommits acl on llvm (Fedora 11) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:54 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202254.A6C1C10F8A8@bastion2.fedora.phx.redhat.com>

bos has set the commit acl on llvm (Fedora 11) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:22:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:22:55 +0000
Subject: [pkgdb] llvm had acl change status
Message-ID: <20090826202256.2FE3C10F8AD@bastion2.fedora.phx.redhat.com>

bos has set the approveacls acl on llvm (Fedora 11) to Approved for jgarzik

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/llvm



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:18 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203218.35F9110F877@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora 7) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:18 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203218.D1DD810F87B@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora 7) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:18 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203218.E04B710F884@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora 7) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:19 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203219.BE9DD10F890@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 7) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:25 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203225.C078210F897@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora 5) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:25 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203225.C08DC10F898@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora 5) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:26 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203226.76C7610F89B@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora 5) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From dcbw at fedoraproject.org  Wed Aug 26 20:32:30 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 26 Aug 2009 20:32:30 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.107,
	1.108 NetworkManager.spec, 
	1.284, 1.285 nm-applet-internal-buildfixes.patch, 1.13,
	1.14 sources, 1.146,
	1.147 0001-bluetooth-fix-device-capability-checking-need-NAP.patch,
	1.1, NONE
Message-ID: <20090826203230.7BC7311C02CC@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2271

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Removed Files:
	0001-bluetooth-fix-device-capability-checking-need-NAP.patch 
Log Message:
* Wed Aug 26 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-1.git20090826
- nm: IPv6 zeroconf support and fixes
- nm: port to polkit (rh #499965)
- nm: fixes for ehea devices (rh #511304) (rh #516591)
- nm: work around PPP bug causing bogus nameservers for mobile broadband connections
- editor: fix segfault with "Unlisted" plans in the mobile broadband assistant




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- .cvsignore	13 Aug 2009 14:53:40 -0000	1.107
+++ .cvsignore	26 Aug 2009 20:32:29 -0000	1.108
@@ -159,3 +159,5 @@ NetworkManager-0.7.995.git20090804.tar.b
 network-manager-applet-0.7.995.git20090804.tar.bz2
 NetworkManager-0.7.995.git20090813.tar.bz2
 network-manager-applet-0.7.995.git20090813.tar.bz2
+NetworkManager-0.7.996.git20090826.tar.bz2
+network-manager-applet-0.7.996.git20090826.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- NetworkManager.spec	13 Aug 2009 14:45:41 -0000	1.284
+++ NetworkManager.spec	26 Aug 2009 20:32:30 -0000	1.285
@@ -1,21 +1,21 @@
 %define udev_scriptdir /lib/udev
 
 %define dbus_version 1.1
-%define dbus_glib_version 0.73-6
+%define dbus_glib_version 0.75
 
 %define gtk2_version	2.12.0
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090813
-%define applet_snapshot .git20090813
+%define snapshot .git20090826
+%define applet_snapshot .git20090826
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.995
-Release: 3%{snapshot}%{?dist}
+Version: 0.7.996
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -40,7 +40,7 @@ Requires: avahi-autoipd
 Requires: dnsmasq
 Requires: udev
 Requires: mobile-broadband-provider-info >= 0.20090602
-Requires: ModemManager >= 0.2
+Requires: ModemManager >= 0.2-3.20090826
 Obsoletes: dhcdbd
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
@@ -64,7 +64,7 @@ BuildRequires: perl(XML::Parser)
 BuildRequires: automake autoconf intltool libtool
 BuildRequires: ppp-devel >= %{ppp_version}
 BuildRequires: nss-devel >= 3.11.7
-BuildRequires: PolicyKit-devel PolicyKit-gnome-devel
+BuildRequires: polkit-devel
 BuildRequires: dhclient
 BuildRequires: gtk-doc
 BuildRequires: libudev-devel
@@ -274,7 +274,7 @@ fi
 %dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
-%{_datadir}/PolicyKit/policy/*.policy
+%{_datadir}/polkit-1/actions/*.policy
 %{udev_scriptdir}/rules.d/*.rules
 
 %files devel
@@ -300,11 +300,12 @@ fi
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
 %{_libdir}/gnome-bluetooth/plugins/*
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 
 %files glib
 %defattr(-,root,root,0755)
-%{_libdir}/libnm_glib.so.*
-%{_libdir}/libnm_glib_vpn.so.*
+%{_libdir}/libnm-glib.so.*
+%{_libdir}/libnm-glib-vpn.so.*
 %{_libdir}/libnm-util.so.*
 
 %files glib-devel
@@ -312,11 +313,11 @@ fi
 %dir %{_includedir}/libnm-glib
 %{_includedir}/libnm-glib/*.h
 %{_includedir}/%{name}/nm-*.h
-%{_libdir}/pkgconfig/libnm_glib.pc
-%{_libdir}/pkgconfig/libnm_glib_vpn.pc
+%{_libdir}/pkgconfig/libnm-glib.pc
+%{_libdir}/pkgconfig/libnm-glib-vpn.pc
 %{_libdir}/pkgconfig/libnm-util.pc
-%{_libdir}/libnm_glib.so
-%{_libdir}/libnm_glib_vpn.so
+%{_libdir}/libnm-glib.so
+%{_libdir}/libnm-glib-vpn.so
 %{_libdir}/libnm-util.so
 %dir %{_datadir}/gtk-doc/html/libnm-glib
 %{_datadir}/gtk-doc/html/libnm-glib/*
@@ -324,6 +325,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Aug 26 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-1.git20090826
+- nm: IPv6 zeroconf support and fixes
+- nm: port to polkit (rh #499965)
+- nm: fixes for ehea devices (rh #511304) (rh #516591)
+- nm: work around PPP bug causing bogus nameservers for mobile broadband connections
+- editor: fix segfault with "Unlisted" plans in the mobile broadband assistant
+
 * Thu Aug 13 2009 Dan Williams <dcbw at redhat.com> - 0.7.995-3.git20090813
 - nm: add iSCSI support
 - nm: add connection assume/takeover support for ethernet (rh #517333)

nm-applet-internal-buildfixes.patch:
 configure.ac                      |    8 +-------
 src/Makefile.am                   |    8 +++++++-
 src/connection-editor/Makefile.am |    9 ++++++++-
 src/gconf-helpers/Makefile.am     |    8 +++++++-
 src/gnome-bluetooth/Makefile.am   |    9 ++++++++-
 src/utils/Makefile.am             |    9 ++++++++-
 src/wireless-security/Makefile.am |    8 +++++++-
 7 files changed, 46 insertions(+), 13 deletions(-)

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nm-applet-internal-buildfixes.patch	28 Jul 2009 17:28:54 -0000	1.13
+++ nm-applet-internal-buildfixes.patch	26 Aug 2009 20:32:30 -0000	1.14
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac	2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac	2009-07-28 13:11:39.261718877 -0400
 @@ -70,10 +70,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
+ 		 glib-2.0 >= 2.16
+-		 NetworkManager >= 0.7.996
+-		 libnm-glib >= 0.7.996
+-		 libnm-util >= 0.7.996
+-		 libnm-glib-vpn >= 0.7.996
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
@@ -18,14 +18,14 @@ diff -up NetworkManager-0.7.995/network-
  		  gconf-2.0
 -		  gnome-bluetooth-1.0 >= 2.27.6
 -		  libnm-util
--		  libnm_glib,
+-		  libnm-glib,
 +		  gnome-bluetooth-1.0 >= 2.27.6,
  		  have_gbt=yes, have_gbt=no)
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -36,21 +36,21 @@ diff -up NetworkManager-0.7.995/network-
  nm_connection_editor_CPPFLAGS = \
  	$(NMA_CFLAGS) \
  	-DICONDIR=\""$(datadir)/icons"\" \
-@@ -66,7 +70,10 @@ nm_connection_editor_LDADD = \
+@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
+ 	${top_builddir}/src/wireless-security/libwireless-security.la \
  	${top_builddir}/src/utils/libutils.la \
  	${top_builddir}/src/marshallers/libmarshallers.la \
- 	$(NMA_LIBS) \
--	$(POLKIT_LIBS)
-+	$(POLKIT_LIBS) \
+-	$(NMA_LIBS)
++	$(NMA_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
  
- if NO_POLKIT_GNOME
- nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+ gladedir = $(datadir)/nm-applet
+ glade_DATA = \
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -66,11 +66,11 @@ diff -up NetworkManager-0.7.995/network-
 -	${top_builddir}/src/utils/libutils.la
 +	${top_builddir}/src/utils/libutils.la \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
  
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
 @@ -6,6 +6,9 @@ INCLUDES = \
  	-DLOCALEDIR="\"$(datadir)/locale\""	\
  	-I$(top_srcdir)/src/gconf-helpers/ \
@@ -90,13 +90,13 @@ diff -up NetworkManager-0.7.995/network-
 +	$(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
 +	$(GNOME_BLUETOOTH_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
  endif
  
  EXTRA_DIST = network-manager-applet.c
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
  
  bin_PROGRAMS = nm-applet
@@ -115,13 +115,13 @@ diff -up NetworkManager-0.7.995/network-
 -	${top_builddir}/src/wireless-security/libwireless-security.la
 +	${top_builddir}/src/wireless-security/libwireless-security.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -137,11 +137,11 @@ diff -up NetworkManager-0.7.995/network-
 -libutils_la_LIBADD = $(NMA_LIBS)
 +libutils_la_LIBADD = $(NMA_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 +
-diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am
---- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  
@@ -159,5 +159,5 @@ diff -up NetworkManager-0.7.995/network-
 -	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
 +	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- sources	13 Aug 2009 14:53:40 -0000	1.146
+++ sources	26 Aug 2009 20:32:30 -0000	1.147
@@ -1,2 +1,2 @@
-49aeb927168b4f486509492ba5e49825  NetworkManager-0.7.995.git20090813.tar.bz2
-57680ec416238cdce5be61d59cf82283  network-manager-applet-0.7.995.git20090813.tar.bz2
+8c127ddbad7510625b93c75d91e49eee  NetworkManager-0.7.996.git20090826.tar.bz2
+962265d2401eeb21c645760d2ccac890  network-manager-applet-0.7.996.git20090826.tar.bz2


--- 0001-bluetooth-fix-device-capability-checking-need-NAP.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:26 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203226.BB82910F8A0@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 5) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:40 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203240.F358910F87B@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora 6) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:41 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203241.3E17A10F8A3@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora 6) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:41 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203241.763FF10F8A8@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora 6) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:43 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203243.B422310F8AB@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 6) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:45 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203245.430D310F8B0@bastion2.fedora.phx.redhat.com>

salimma has set the watchbugzilla acl on Django (Fedora EPEL 4) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:46 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203246.AAFB910F88C@bastion2.fedora.phx.redhat.com>

salimma has set the watchcommits acl on Django (Fedora EPEL 4) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:47 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203247.3EF3710F8B3@bastion2.fedora.phx.redhat.com>

salimma has set the commit acl on Django (Fedora EPEL 4) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:48 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203248.E5FAF10F8B4@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora EPEL 4) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:49 +0000
Subject: [pkgdb] Django ownership updated
Message-ID: <20090826203249.1BF0D10F8B7@bastion2.fedora.phx.redhat.com>

Package Django in Fedora EPEL 4 was orphaned by salimma

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:32:59 +0000
Subject: [pkgdb] Django ownership updated
Message-ID: <20090826203259.D7DCA10F894@bastion2.fedora.phx.redhat.com>

Package Django in Fedora EPEL 5 is now owned by smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From karsten at fedoraproject.org  Wed Aug 26 20:33:06 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 26 Aug 2009 20:33:06 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.15,1.16
Message-ID: <20090826203306.305C311C02CC@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1674

Modified Files:
	dracut.spec 
Log Message:
- make it noarch again, just excluding kbd on s390x doesn't
  work as code needs to be changed as well. We now have kbd on s390x ;-(



Index: dracut.spec
===================================================================
RCS file: /cvs/extras/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- dracut.spec	26 Aug 2009 18:55:50 -0000	1.15
+++ dracut.spec	26 Aug 2009 20:33:06 -0000	1.16
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.9
-Release: 4%{?rdist}
+Release: 5%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -44,9 +44,7 @@ Requires: bridge-utils
 Requires: file
 Requires: bzip2
 Requires: dmraid
-%ifnarch s390 s390x
 Requires: kbd
-%endif
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
@@ -144,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Aug 26 2009 Karsten Hopp <karsten at redhat.com> 0.9-5
+- make it noarch again, just excluding kbd on s390x doesn't
+  work as code needs to be changed as well.
+
 * Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-4
 - its kbd not kdb
 



From pkgdb at fedoraproject.org  Wed Aug 26 20:33:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:33:15 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090826203315.87CE010F89A@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 9) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:33:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:33:21 +0000
Subject: [pkgdb] Django ownership updated
Message-ID: <20090826203321.ED4E610F89F@bastion2.fedora.phx.redhat.com>

Package Django in Fedora 10 is now owned by smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:33:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:33:38 +0000
Subject: [pkgdb] Django ownership updated
Message-ID: <20090826203338.584B710F87C@bastion2.fedora.phx.redhat.com>

Package Django in Fedora devel is now owned by smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Wed Aug 26 20:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 20:33:29 +0000
Subject: [pkgdb] Django ownership updated
Message-ID: <20090826203329.3058B10F8BF@bastion2.fedora.phx.redhat.com>

Package Django in Fedora 11 is now owned by smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From dwalsh at fedoraproject.org  Wed Aug 26 20:36:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 20:36:45 +0000 (UTC)
Subject: rpms/policycoreutils/devel sandbox.init,NONE,1.1
Message-ID: <20090826203645.AB1CD11C02CC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3242

Added Files:
	sandbox.init 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
- Add sandboxX



--- NEW FILE sandbox.init ---
#!/bin/bash
## BEGIN INIT INFO
# Provides: sandbox
# Default-Start: 5
# Default-Stop: 0 1 2 3 4 6
# Required-Start:
#              
## END INIT INFO
# sandbox:        Set up / mountpoint to be shared, /var/tmp, /tmp, /home/sandbox unshared
#
# chkconfig: 5 1 99
#
# Description: sandbox is using pam_namespace to share the /var/tmp, /tmp and 
#              /home/sandbox accounts.  This script will setup the / mount 
#              point as shared and all of the subdirectories just these 
#              directories as unshared.
#

# Source function library.
. /etc/init.d/functions

LOCKFILE=/var/lock/subsys/sandbox

base=${0##*/}

case "$1" in
    start)
	[ -f "$LOCKFILE" ] && exit 0

	touch $LOCKFILE
	mount --make-rshared /
	mount --bind /tmp /tmp
	mount --bind /var/tmp /var/tmp
	mount --bind /home /home
	mount --make-private /home
	mount --make-private /tmp
	mount --make-private /var/tmp
	RETVAL=$?
	exit $RETVAL
	;;

    status)
	if [ -f "$LOCKFILE" ]; then 
	    echo "$base is running"
	else
	    echo "$base is stopped"
	fi
	exit 0
	;;

    stop)
	rm -f $LOCKFILE
	exit 0
	;;

    *)
	echo $"Usage: $0 {start|stop}"
	exit 3
	;;
esac



From dwalsh at fedoraproject.org  Wed Aug 26 20:45:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 20:45:29 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.632,1.633
Message-ID: <20090826204529.A29E811C02CC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4533

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
- Add sandboxX



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -p -r1.632 -r1.633
--- policycoreutils.spec	26 Aug 2009 19:09:44 -0000	1.632
+++ policycoreutils.spec	26 Aug 2009 20:45:29 -0000	1.633
@@ -147,6 +147,7 @@ Requires: policycoreutils-python = %{ver
 Requires: xorg-x11-server-Xephyr
 Requires: matchbox-window-manager
 Requires(post): /sbin/chkconfig
+BuildRequires: libcap-ng-devel
 
 %description sandbox
 The policycoreutils-python package contains the scripts to create graphical sandboxes



From smilner at fedoraproject.org  Wed Aug 26 20:46:28 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 20:46:28 +0000 (UTC)
Subject: rpms/Django/EL-4 .cvsignore, 1.9, 1.10 Django.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090826204628.6099E11C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4675

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
update for Django 1.1 in EL4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Dec 2008 06:23:23 -0000	1.9
+++ .cvsignore	26 Aug 2009 20:46:28 -0000	1.10
@@ -1 +1,3 @@
-Django-1.0.2-final.tar.gz
+Django-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.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Django.spec	14 Dec 2008 06:23:23 -0000	1.13
+++ Django.spec	26 Aug 2009 20:46:28 -0000	1.14
@@ -2,21 +2,23 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.0.2
-Release:        1%{?dist}
+Version:        1.1
+Release:        3%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.djangoproject.com/
-Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}-final.tar.gz
-Source1:	simplejson-init.py
+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
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel
+BuildRequires:  python-devel python-sphinx
 Requires:       python-simplejson
 
 %description
@@ -39,7 +41,8 @@ Python Web framework.
 
 
 %prep
-%setup -q -n %{name}-%{version}-final
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -55,14 +58,19 @@ cp -p %{SOURCE1} __init__.py
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 # Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
+# build documentation
+(cd docs && make html)
+
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,24 +79,67 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
 %{_mandir}/man1/*
 %attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
 %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
-%exclude %{_bindir}/django-admin.py?
 %{python_sitelib}/django
+
+# Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
 %endif
 
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
+%ghost %{_bindir}/django-admin.pyc
+%ghost %{_bindir}/django-admin.pyo
+%endif
+# -----------------
+ 
+
 %files doc
 %defattr(-,root,root,-)
-%doc docs/*
+%doc docs/_build/html/*
+
 
 %changelog
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-3
+- ghosting admin py* is now FC9 and under.
+
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+- Applied Daniel Mach's patch from bz#516016.
+
+* Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-6
+- Attempted combined spec for F12/11/10 and EL5
+
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-4
+- Older builds must ghost django-admin.py[c,o]
+
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-3
+- Bump for tag issue.
+
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-2
+- Fix changelog.
+
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-1
+- Upgrade for http://www.djangoproject.com/weblog/2009/jul/28/security/
+
+* Thu Mar 12 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.2-3
+- Build HTML documentation (bug #484070)
+- No longer excluding *.py? in bindir, F11's Python does not optimizes these
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Dec 2008 06:23:23 -0000	1.9
+++ sources	26 Aug 2009 20:46:28 -0000	1.10
@@ -1 +1,3 @@
-89353e3749668778f1370d2e444f3adc  Django-1.0.2-final.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch



From rdieter at fedoraproject.org  Wed Aug 26 20:53:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 20:53:20 +0000 (UTC)
Subject: rpms/koffice/EL-5 koffice-1.6.3-magick_version.patch, NONE,
	1.1 koffice.spec, 1.58, 1.59
Message-ID: <20090826205320.7085511C02CC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5430

Modified Files:
	koffice.spec 
Added Files:
	koffice-1.6.3-magick_version.patch 
Log Message:
fix build for rhel5's older imagemagick


koffice-1.6.3-magick_version.patch:
 kis_image_magick_converter.cc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE koffice-1.6.3-magick_version.patch ---
diff -up koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc
--- koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version	2009-08-26 15:42:15.323637145 -0500
+++ koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc	2009-08-26 15:47:18.470639483 -0500
@@ -457,7 +457,11 @@ KisImageBuilder_Result KisImageMagickCon
 
             for (Q_UINT32 y = 0; y < image->rows; y ++)
             {
+#if MagickLibVersion >  0x630 
                 const PixelPacket *pp = AcquireCacheViewPixels(vi, 0, y, image->columns, 1, &ei);
+#else 
+                const PixelPacket *pp = AcquireCacheView(vi, 0, y, image->columns, 1, &ei);
+#endif
 
                 if(!pp)
                 {


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/EL-5/koffice.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- koffice.spec	26 Aug 2009 18:55:27 -0000	1.58
+++ koffice.spec	26 Aug 2009 20:53:20 -0000	1.59
@@ -32,6 +32,8 @@ Patch50: koffice-1.6.3-glibc_strrchr.pat
 Patch100: koffice-%{svn}svn.patch
 # Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
 Patch101: koffice-1.6.3-quint32.patch
+# fix for older ImageMagick
+Patch102: koffice-1.6.3-magick_version.patch
 
 # http://www.kde.org/info/security/advisory-20070730-1.txt
 Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
@@ -266,6 +268,7 @@ Requires:        %{name}-core = %{epoch}
 %if 0%{?svn:1}
 %patch100 -p1 -b .svn
 %patch101 -p1 -b .quint32
+%patch102 -p1 -b .magick_version
 %else
 %patch1 -p0 -b .CVE-2007-3387
 %patch2 -p0 -b .CVE-2007-4352-5392-5393



From jjames at fedoraproject.org  Wed Aug 26 20:57:27 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 20:57:27 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs-21.5.29-no-xft.patch, 1.1, 1.2 xemacs.spec, 
	1.49, 1.50
Message-ID: <20090826205727.E786011C02CC@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/F-11

Modified Files:
	xemacs-21.5.29-no-xft.patch xemacs.spec 
Log Message:
* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
- Use upstream's attempt at fixing #512623 instead of mine, which didn't work.


xemacs-21.5.29-no-xft.patch:
 font-mgr.el |    3 ++-
 font.el     |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

Index: xemacs-21.5.29-no-xft.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs-21.5.29-no-xft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.29-no-xft.patch	24 Aug 2009 21:11:29 -0000	1.1
+++ xemacs-21.5.29-no-xft.patch	26 Aug 2009 20:57:27 -0000	1.2
@@ -1,10 +1,52 @@
---- xemacs-21.5.29/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/font.el	2009-08-24 13:24:14.634385245 -0600
-@@ -582,6 +582,7 @@
-     (if (or (not (stringp fontname))
- 	    (not (string-match font-x-font-regexp fontname)))
- 	(if (and (stringp fontname)
-+		 (featurep 'xft-fonts)
- 		 (string-match font-xft-font-regexp fontname))
- 	    ;; Return an XFT font. 
- 	    (xft-font-create-object fontname)
+diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el
+--- xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:58.859385283 -0600
++++ xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:20.000998807 -0600
+@@ -753,14 +753,23 @@
+ 
+ (defvar font-xft-font-regexp
+   (concat "\\`"
+-	  #r"\(\\-\|\\:\|\\,\|[^:-]\)*"	        ; optional foundry and family
++	  #r"\(\\[-,]|[^-:,*]\)*"               ; optional foundry and family
+ 						; (allows for escaped colons, 
+-						; dashes, commas)
++						; dashes, commas, asterisks)
+ 	  "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?"	; optional size (points)
+ 	  "\\(:[^:]*\\)*"			; optional properties
+ 						; not necessarily key=value!!
+ 	    "\\'"
+-	    ))
++	    )
++  "Regexp matching fontconfig font names.
++Unfortunately, there is no explicit standard specifying these.  We disallow
++hyphen and comma in family names unless escaped, because they have a syntactic
++role in fontconfig names.  We disallow colon because it is part of fontconfig
++name syntax, and asterisk because of the potential for confusion with an XLFD.
++We do not allow escapes for colon and asterisk because the fontconfig
++documentation doesn't specify whether they can be escaped, or how a redundant
++escape character is treated.
++#### The name of this variable is subject to change.")
+ 
+ (defvar font-xft-family-mappings
+   ;; #### FIXME this shouldn't be needed or used for Xft
+@@ -799,6 +808,8 @@
+   "Return a font descriptor object for FONTNAME, appropriate for Xft.
+ 
+ Optional DEVICE defaults to `default-x-device'."
++  (unless (featurep 'font-mgr)
++    (error 'unimplemented 'font-mgr "fontconfig-style font names"))
+   (let* ((name fontname)
+ 	 (device (or device (default-x-device)))
+ 	 (pattern (fc-font-match device (fc-name-parse name)))
+diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el
+--- xemacs-21.5.29/lisp/font-mgr.el	2009-05-18 08:51:06.000000000 -0600
++++ xemacs-21.5.29/lisp/font-mgr.el	2009-08-26 14:46:44.073953826 -0600
+@@ -39,7 +39,8 @@
+ 
+ ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'?
+ 
+-(provide 'font-mgr)
++;; #### implementation is incomplete
++;; (provide 'font-mgr)
+ 
+ (defvar xft-xlfd-font-regexp
+   (concat


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xemacs.spec	24 Aug 2009 21:11:30 -0000	1.49
+++ xemacs.spec	26 Aug 2009 20:57:27 -0000	1.50
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        2%{?snap:.%{snap}}%{?dist}
+Release:        3%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -45,7 +45,7 @@ Patch2:         %{name}-21.5.29-image-ov
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
-# Sent upstream 2009-08-24
+# Proposed by upstream 2009-08-25
 Patch6:         %{name}-21.5.29-no-xft.patch
 Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
@@ -558,6 +558,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
+- Use upstream's attempt at fixing #512623 instead of mine, which didn't work.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-2
 - Fix image overflow bug (CVE-2009-2688).
 - Fix calling xft-font-create-object in non-Xft builds (#512623).



From jjames at fedoraproject.org  Wed Aug 26 20:57:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 26 Aug 2009 20:57:28 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs-21.5.29-no-xft.patch, 1.1, 1.2 xemacs.spec,
	1.51, 1.52
Message-ID: <20090826205728.1A92111C02CC@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854/devel

Modified Files:
	xemacs-21.5.29-no-xft.patch xemacs.spec 
Log Message:
* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
- Use upstream's attempt at fixing #512623 instead of mine, which didn't work.


xemacs-21.5.29-no-xft.patch:
 font-mgr.el |    3 ++-
 font.el     |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

Index: xemacs-21.5.29-no-xft.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs-21.5.29-no-xft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.29-no-xft.patch	24 Aug 2009 21:11:52 -0000	1.1
+++ xemacs-21.5.29-no-xft.patch	26 Aug 2009 20:57:27 -0000	1.2
@@ -1,10 +1,52 @@
---- xemacs-21.5.29/lisp/font.el	2009-05-18 08:51:06.000000000 -0600
-+++ xemacs-21.5.29/lisp/font.el	2009-08-24 13:24:14.634385245 -0600
-@@ -582,6 +582,7 @@
-     (if (or (not (stringp fontname))
- 	    (not (string-match font-x-font-regexp fontname)))
- 	(if (and (stringp fontname)
-+		 (featurep 'xft-fonts)
- 		 (string-match font-xft-font-regexp fontname))
- 	    ;; Return an XFT font. 
- 	    (xft-font-create-object fontname)
+diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el
+--- xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:58.859385283 -0600
++++ xemacs-21.5.29/lisp/font.el	2009-08-26 14:49:20.000998807 -0600
+@@ -753,14 +753,23 @@
+ 
+ (defvar font-xft-font-regexp
+   (concat "\\`"
+-	  #r"\(\\-\|\\:\|\\,\|[^:-]\)*"	        ; optional foundry and family
++	  #r"\(\\[-,]|[^-:,*]\)*"               ; optional foundry and family
+ 						; (allows for escaped colons, 
+-						; dashes, commas)
++						; dashes, commas, asterisks)
+ 	  "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?"	; optional size (points)
+ 	  "\\(:[^:]*\\)*"			; optional properties
+ 						; not necessarily key=value!!
+ 	    "\\'"
+-	    ))
++	    )
++  "Regexp matching fontconfig font names.
++Unfortunately, there is no explicit standard specifying these.  We disallow
++hyphen and comma in family names unless escaped, because they have a syntactic
++role in fontconfig names.  We disallow colon because it is part of fontconfig
++name syntax, and asterisk because of the potential for confusion with an XLFD.
++We do not allow escapes for colon and asterisk because the fontconfig
++documentation doesn't specify whether they can be escaped, or how a redundant
++escape character is treated.
++#### The name of this variable is subject to change.")
+ 
+ (defvar font-xft-family-mappings
+   ;; #### FIXME this shouldn't be needed or used for Xft
+@@ -799,6 +808,8 @@
+   "Return a font descriptor object for FONTNAME, appropriate for Xft.
+ 
+ Optional DEVICE defaults to `default-x-device'."
++  (unless (featurep 'font-mgr)
++    (error 'unimplemented 'font-mgr "fontconfig-style font names"))
+   (let* ((name fontname)
+ 	 (device (or device (default-x-device)))
+ 	 (pattern (fc-font-match device (fc-name-parse name)))
+diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el
+--- xemacs-21.5.29/lisp/font-mgr.el	2009-05-18 08:51:06.000000000 -0600
++++ xemacs-21.5.29/lisp/font-mgr.el	2009-08-26 14:46:44.073953826 -0600
+@@ -39,7 +39,8 @@
+ 
+ ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'?
+ 
+-(provide 'font-mgr)
++;; #### implementation is incomplete
++;; (provide 'font-mgr)
+ 
+ (defvar xft-xlfd-font-regexp
+   (concat


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xemacs.spec	24 Aug 2009 21:11:52 -0000	1.51
+++ xemacs.spec	26 Aug 2009 20:57:27 -0000	1.52
@@ -21,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        3%{?snap:.%{snap}}%{?dist}
+Release:        4%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -45,7 +45,7 @@ Patch2:         %{name}-21.5.29-image-ov
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
-# Sent upstream 2009-08-24
+# Proposed by upstream 2009-08-25
 Patch6:         %{name}-21.5.29-no-xft.patch
 Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
@@ -558,6 +558,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
+- Use upstream's attempt at fixing #512623 instead of mine, which didn't work.
+
 * Mon Aug 24 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-3
 - Fix image overflow bug (CVE-2009-2688).
 - Fix calling xft-font-create-object in non-Xft builds (#512623).



From rdieter at fedoraproject.org  Wed Aug 26 20:59:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 20:59:21 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.31, 1.32 koffice.spec, 1.111,
	1.112 sources, 1.31, 1.32
Message-ID: <20090826205921.56A6F11C02CC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6189

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
- koffice-2.0.81



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	24 Jun 2009 12:28:14 -0000	1.31
+++ .cvsignore	26 Aug 2009 20:59:21 -0000	1.32
@@ -1 +1 @@
-koffice-2.0.1.tar.bz2
+koffice-2.0.81.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- koffice.spec	25 Jul 2009 04:42:57 -0000	1.111
+++ koffice.spec	26 Aug 2009 20:59:21 -0000	1.112
@@ -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:          2 
-Version:        2.0.1
-Release:        3%{?dist}.1
+Version:        2.0.81
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -51,6 +51,7 @@ BuildRequires: libkdcraw-devel >= 0.2.0
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwpd-devel
+BuildRequires: libwpg-devel
 BuildRequires: libxslt-devel
 %if 0%{?kexi}
 BuildRequires: mysql-devel
@@ -246,8 +247,16 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-Requires:       mathml-fonts
-
+#if 0%{?fedora} > 9
+Requires:       lyx-cmex10-fonts
+#else
+#Requires:       mathml-fonts
+#endif
+%if 0%{?fedora} > 10
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts
+%endif
 %description kformula
 %{summary}
 
@@ -284,7 +293,7 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} 
 
 
 %install
@@ -292,11 +301,12 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# unpackaged files
+## unpackaged files
 # fonts
 %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 -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
@@ -424,20 +434,21 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/libkdeinit4_kthesaurus.so
 %{_kde4_libdir}/kde4/autocorrect.so
 %{_kde4_libdir}/kde4/changecase.so
+%{_kde4_libdir}/kde4/clipartthumbnail.*
 %{_kde4_libdir}/kde4/defaulttools.so
 %{_kde4_libdir}/kde4/kodocinfopropspage.*
 %{_kde4_libdir}/kde4/kofficescan.*
 %{_kde4_libdir}/kde4/kofficethumbnail.*
 %{_kde4_libdir}/kde4/kopabackgroundtool.*
-%{_kde4_libdir}/kde4/libkounavailpart.*
-%{_kde4_libdir}/kde4/clipartthumbnail.*
-%{_kde4_libdir}/kde4/thesaurustool.so
 %{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
 %{_kde4_libdir}/kde4/kofficegrayau8plugin.so
 %{_kde4_libdir}/kde4/kofficedockers.so
 %{_kde4_libdir}/kde4/kofficesimpletextedit.so
+%{_kde4_libdir}/kde4/libkounavailpart.*
+%{_kde4_libdir}/kde4/paragraphtool.so
 %{_kde4_libdir}/kde4/spellcheck.so
 %{_kde4_libdir}/kde4/textvariables.so
+%{_kde4_libdir}/kde4/thesaurustool.so
 %{_kde4_appsdir}/koffice/
 %{_kde4_docdir}/HTML/en/koffice/
 %{_kde4_docdir}/HTML/en/thesaurus/
@@ -455,10 +466,12 @@ 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/thesaurustool.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
+%{_kde4_datadir}/kde4/services/thesaurustool.desktop
+%{_kde4_datadir}/kde4/servicetypes/filtereffect.desktop
 %{_kde4_datadir}/kde4/servicetypes/kochart.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
 %{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
@@ -490,18 +503,33 @@ update-desktop-database -q &> /dev/null 
 #exclude %{_kde4_libdir}/kde4/kritashape.*
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkdchart.so.*
+%{_kde4_libdir}/libkoaction.so.*
+%{_kde4_libdir}/libkoaspectbutton.so.*
+%{_kde4_libdir}/libkobase.so.*
+%{_kde4_libdir}/libkocharacterselectiondialog.so.*
 %{_kde4_libdir}/libkochart.so.*
-%{_kde4_libdir}/libkotext.so.*
-%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkocolorwidgets.so.*
+%{_kde4_libdir}/libkocvsimport.so.*
+%{_kde4_libdir}/libkodocumentsectionbox.so.*
+%{_kde4_libdir}/libkoffice_graya_u16.so.*
+%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
+%{_kde4_libdir}/libkoinput.so.*
 %{_kde4_libdir}/libkokross.so.*
-%{_kde4_libdir}/libkoguiutils.so.*
+%{_kde4_libdir}/libkolinestyleselector.so.*
 %{_kde4_libdir}/libkomain.so.*
 %{_kde4_libdir}/libkoodf.so.*
+%{_kde4_libdir}/libkoopenpane.so.*
 %{_kde4_libdir}/libkopageapp.so.*
+%{_kde4_libdir}/libkopagelayout.so.*
+%{_kde4_libdir}/libkopicture.so.*
+%{_kde4_libdir}/libkoplugin.so.*
+%{_kde4_libdir}/libkoprogress.so.*
 %{_kde4_libdir}/libkoresources.so.*
+%{_kde4_libdir}/libkoresourcewidget.so.*
 %{_kde4_libdir}/libkostore.so.*
-%{_kde4_libdir}/libkoffice_graya_u16.so.*
-%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
+%{_kde4_libdir}/libkotext.so.*
+%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkozoomaction.so.*
 %{_kde4_libdir}/libkspreadcommon.so.*
 %{_kde4_libdir}/libkwmf.so.*
 %if 0%{?kformula}
@@ -515,7 +543,6 @@ update-desktop-database -q &> /dev/null 
 # FIXME: include only shlib symlinks we know/want to export
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libkdeinit4_*.so
-%exclude %{_kde4_libdir}/libKrita*.so
 %{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
 
 %files kspread
@@ -554,6 +581,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/kpr_*.*
 %{_kde4_libdir}/kde4/libFilterkpr2odf.so
 %{_kde4_appsdir}/kpresenter/
+%{_kde4_configdir}/kpresenterrc
 %{_kde4_docdir}/HTML/en/kpresenter/
 %{_kde4_datadir}/kde4/services/kpr*.desktop
 %{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
@@ -590,10 +618,8 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_configdir}/kritarc
 %{_kde4_libdir}/libkdeinit4_krita.so
 %{_kde4_libdir}/libkrita*.so.*
-%{_kde4_libdir}/libKrita*.so
-%{_kde4_libdir}/libKritaRulerAssistantCommon.so.*
 %{_kde4_libdir}/kde4/*krita*.*
-#{_kde4_libdir}/libkrossmodulekrita.so.*
+%{_kde4_libdir}/libkrossmodulekrita.so.*
 %{_kde4_appsdir}/krita/
 %{_kde4_datadir}/kde4/services/krita*.desktop
 %{_kde4_datadir}/kde4/servicetypes/krita*.desktop
@@ -668,15 +694,14 @@ update-desktop-database -q &> /dev/null 
 %files kformula
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit4_kformula.so
 %{_kde4_libdir}/libkformulaprivate.so.*
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*
 %{_kde4_appsdir}/kformula/
 %{_kde4_datadir}/kde4/services/kformula*.desktop
 %{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %{_kde4_docdir}/HTML/en/kformula/
+%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 
 %if 0%{?kivio}
@@ -711,6 +736,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libgenerickofilter.*
 %{_kde4_libdir}/kde4/libhtmlexport.*
 %{_kde4_libdir}/kde4/libhtmlimport.*
+%{_kde4_libdir}/kde4/libicalendarexport.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
 %{_kde4_libdir}/kde4/libmswriteexport.*
@@ -719,6 +745,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/liboowriterimport.*
 %{_kde4_libdir}/kde4/libpalmdocexport.*
 %{_kde4_libdir}/kde4/libpalmdocimport.*
+%{_kde4_libdir}/kde4/libpowerpointimport.*
 %{_kde4_libdir}/kde4/librtfexport.*
 %{_kde4_libdir}/kde4/librtfimport.*
 %{_kde4_libdir}/kde4/libwmlexport.*
@@ -726,7 +753,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libwpexport.*
 %{_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.*
@@ -738,16 +765,23 @@ update-desktop-database -q &> /dev/null 
 %files kplato
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kplato
+%{_kde4_bindir}/kplatowork
 %{_kde4_configdir}/kplatorc
+%{_kde4_configdir}/kplatoworkrc
+%{_kde4_datadir}/config.kcfg/kplatosettings.kcfg
 %{_kde4_libdir}/libkdeinit4_kplato.so
 %{_kde4_libdir}/kde4/libkplatopart.*
+%{_kde4_libdir}/kde4/libkplatoworkpart.so
 %{_kde4_libdir}/libkplato*.so.*
 %{_kde4_libdir}/kde4/krossmodulekplato.so
 %{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
 %{_kde4_appsdir}/kplato/
+%{_kde4_appsdir}/kplatowork/
 %{_kde4_docdir}/HTML/en/kplato/
 %{_kde4_datadir}/kde4/services/kplato*.desktop
+%{_kde4_datadir}/kde4/servicetypes/kplato*.desktop
 %{_kde4_datadir}/applications/kde4/kplato.desktop
+%{_kde4_datadir}/applications/kde4/kplatowork.desktop
 
 %files kword
 %defattr(-,root,root,-)
@@ -758,7 +792,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/krossmodulekword.so
 %{_kde4_libdir}/kde4/libkwordpart.*
 %{_kde4_appsdir}/kword/
-%{_kde4_docdir}/HTML/en/kword/
+#{_kde4_docdir}/HTML/en/kword/
 %{_kde4_datadir}/kde4/services/*kword*.desktop
 %{_kde4_datadir}/templates/TextDocument.desktop
 %{_kde4_datadir}/templates/.source/TextDocument.kwt
@@ -767,6 +801,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
+- koffice-2.0.81
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.1-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	24 Jun 2009 12:28:14 -0000	1.31
+++ sources	26 Aug 2009 20:59:21 -0000	1.32
@@ -1 +1 @@
-86fb3660c2b87495d1bf84da9044d441  koffice-2.0.1.tar.bz2
+d880b2d479c465d3d2cde7146007afbd  koffice-2.0.81.tar.bz2



From dcbw at fedoraproject.org  Wed Aug 26 21:17:04 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 26 Aug 2009 21:17:04 +0000 (UTC)
Subject: rpms/NetworkManager/devel sources,1.147,1.148
Message-ID: <20090826211704.1888711C02CC@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9192

Modified Files:
	sources 
Log Message:
Update source to fix issue with VPN connection editing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- sources	26 Aug 2009 20:32:30 -0000	1.147
+++ sources	26 Aug 2009 21:17:03 -0000	1.148
@@ -1,2 +1,2 @@
 8c127ddbad7510625b93c75d91e49eee  NetworkManager-0.7.996.git20090826.tar.bz2
-962265d2401eeb21c645760d2ccac890  network-manager-applet-0.7.996.git20090826.tar.bz2
+ddd9bfb3c542428ed357443cb0fe2aab  network-manager-applet-0.7.996.git20090826.tar.bz2



From jwilson at fedoraproject.org  Wed Aug 26 21:19:43 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed, 26 Aug 2009 21:19:43 +0000 (UTC)
Subject: rpms/kernel/F-11 lirc_zilog-revert-2.6.31-i2c-changes.patch, NONE, 
	1.1.2.1 hdpvr-ir-enable.patch, 1.1.2.1, 1.1.2.2 kernel.spec,
	1.1679.2.16, 1.1679.2.17
Message-ID: <20090826211943.CF21711C02CC@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9517

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	hdpvr-ir-enable.patch kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	lirc_zilog-revert-2.6.31-i2c-changes.patch 
Log Message:
* Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
- Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)
- Revert lirc_zilog 2.6.31 i2c changes so it works on pre-2.6.31


lirc_zilog-revert-2.6.31-i2c-changes.patch:
 lirc_zilog.c |   58 ++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

--- NEW FILE lirc_zilog-revert-2.6.31-i2c-changes.patch ---
 drivers/input/lirc/lirc_zilog.c |   58 +++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git b/drivers/input/lirc/lirc_zilog.c a/drivers/input/lirc/lirc_zilog.c
index c532399..049c3da 100644
--- b/drivers/input/lirc/lirc_zilog.c
+++ a/drivers/input/lirc/lirc_zilog.c
@@ -1088,26 +1088,18 @@ static struct lirc_driver lirc_template = {
 };
 
 static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx);
-static int ir_remove(struct i2c_client *client);
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
+static int ir_detach(struct i2c_client *client);
+static int ir_probe(struct i2c_adapter *adap);
 static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-static const struct i2c_device_id ir_transceiver_id[] = {
-	/* Generic entry for any IR transceiver */
-	{ "ir_video", 0 },
-	/* IR device specific entries could be added here */
-	{ }
-};
-
 static struct i2c_driver driver = {
 	.driver = {
 		.owner	= THIS_MODULE,
 		.name	= "i2c ir driver",
 	},
-	.probe		= ir_probe,
-	.remove		= ir_remove,
+	.attach_adapter	= ir_probe,
+	.detach_client	= ir_detach,
 	.command	= ir_command,
-	.id_table	= ir_transceiver_id,
 };
 
 static struct i2c_client client_template = {
@@ -1128,8 +1120,20 @@ static struct file_operations lirc_fops = {
 
 static int i2c_attach(struct i2c_client *client, struct IR *ir)
 {
+	int ret;
+
 	i2c_set_clientdata(client, ir);
 
+	ret = i2c_attach_client(client);
+	if (ret != 0) {
+		client->addr = 0;
+		return ret;
+	}
+	if (!i2c_use_client(client)) {
+		i2c_detach_client(client);
+		client->addr = 0;
+		return -EFAULT;
+	}
 	++ir->devs;
 	return 0;
 }
@@ -1230,13 +1234,13 @@ static int ir_attach(struct i2c_adapter *adap, int have_rx, int have_tx)
 err:
 	/* undo everything, hopefully... */
 	if (ir->c_rx.addr)
-		ir_remove(&ir->c_rx);
+		ir_detach(&ir->c_rx);
 	if (ir->c_tx.addr)
-		ir_remove(&ir->c_tx);
+		ir_detach(&ir->c_tx);
 	return ret;
 }
 
-static int ir_remove(struct i2c_client *client)
+static int ir_detach(struct i2c_client *client)
 {
 	struct IR *ir = i2c_get_clientdata(client);
 	mutex_lock(&ir->lock);
@@ -1257,17 +1261,21 @@ static int ir_remove(struct i2c_client *client)
 			ir->t_notify2 = NULL;
 		}
 
+		/* unregister device */
+		i2c_detach_client(&ir->c_rx);
+	} else if (client == &ir->c_tx) {
+		i2c_detach_client(&ir->c_tx);
 	} else {
 		mutex_unlock(&ir->lock);
-		zilog_error("%s: detached from something we didn't "
-			    "attach to\n", __func__);
+		zilog_error("ir_detach: detached from something we didn't "
+			    "attach to\n");
 		return -ENODEV;
 	}
 
 	--ir->devs;
 	if (ir->devs < 0) {
 		mutex_unlock(&ir->lock);
-		zilog_error("%s: invalid device count\n", __func__);
+		zilog_error("ir_detach: invalid device count\n");
 		return -ENODEV;
 	} else if (ir->devs == 0) {
 		/* unregister lirc driver */
@@ -1286,10 +1294,11 @@ static int ir_remove(struct i2c_client *client)
 	return 0;
 }
 
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int ir_probe(struct i2c_adapter *adap)
 {
-	struct i2c_adapter *adap = client->adapter;
+	struct i2c_client c;
 	char buf;
+	memset(&c, 0, sizeof(c));
 
 	if (adap->id == I2C_HW_B_BT848 ||
 #ifdef I2C_HW_B_HDPVR
@@ -1302,10 +1311,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		 * The external IR receiver is at i2c address 0x71.
 		 * The IR transmitter is at 0x70.
 		 */
-		client->addr = 0x70;
+		c.adapter = adap;
+		c.addr = 0x70;
 
 		if (!disable_rx) {
-			if (i2c_master_recv(client, &buf, 1) == 1)
+			if (i2c_master_recv(&c, &buf, 1) == 1)
 				have_rx = 1;
 			dprintk("probe 0x70 @ %s: %s\n",
 				adap->name,
@@ -1313,8 +1323,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		}
 
 		if (!disable_tx) {
-			client->addr = 0x71;
-			if (i2c_master_recv(client, &buf, 1) == 1)
+			c.addr = 0x71;
+			if (i2c_master_recv(&c, &buf, 1) == 1)
 				have_tx = 1;
 			dprintk("probe 0x71 @ %s: %s\n",
 				adap->name,

hdpvr-ir-enable.patch:
 Makefile     |    4 +---
 hdpvr-core.c |    7 +++----
 hdpvr-i2c.c  |   38 ++++++++++++++++++++++++++++++++------
 3 files changed, 36 insertions(+), 13 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/hdpvr-ir-enable.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
--- hdpvr-ir-enable.patch	10 Aug 2009 18:33:00 -0000	1.1.2.1
+++ hdpvr-ir-enable.patch	26 Aug 2009 21:19:43 -0000	1.1.2.2
@@ -1,29 +1,62 @@
 From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
 
 ---
- drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
- 2 files changed, 30 insertions(+), 9 deletions(-)
+ drivers/media/video/hdpvr/Makefile     |    4 +--
+ drivers/media/video/hdpvr/hdpvr-core.c |    7 ++---
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   38 ++++++++++++++++++++++++++-----
+ 3 files changed, 36 insertions(+), 13 deletions(-)
 
+diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
+index e0230fc..79ad2e1 100644
+--- a/drivers/media/video/hdpvr/Makefile
++++ b/drivers/media/video/hdpvr/Makefile
+@@ -1,6 +1,4 @@
+-hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
+-
+-hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
++hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o
+ 
+ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..878d1e5 100644
+index 188bd5a..9fa3d8d 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
+@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
+ 		goto error;
  	}
  
- #ifdef CONFIG_I2C
+-#ifdef CONFIG_I2C
 -	/* until i2c is working properly */
 -	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 +	retval = hdpvr_register_i2c_adapter(dev);
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
+@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+ 	mutex_unlock(&dev->io_mutex);
+ 
+ 	/* deregister I2C adapter */
+-#ifdef CONFIG_I2C
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+ 	mutex_lock(&dev->i2c_mutex);
+ 	if (dev->i2c_adapter)
+ 		i2c_del_adapter(dev->i2c_adapter);
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..1c01b6c 100644
+index c4b5d15..994305c 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -22,7 +22,7 @@
+@@ -10,6 +10,8 @@
+  *
+  */
+ 
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
++
+ #include <linux/i2c.h>
+ 
+ #include "hdpvr.h"
+@@ -22,7 +24,7 @@
  #define REQTYPE_I2C_WRITE_STATT	0xd0
  
  static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
@@ -32,7 +65,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -41,7 +74,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  }
  
  static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -50,7 +83,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -59,15 +92,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret < 0)
  		goto error;
- 
- 	ret = usb_control_msg(dev->udev,
- 			      usb_rcvctrlpipe(dev->udev, 0),
--			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-+			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
- 			      0, 0, buf, 2, 1000);
- 
- 	if (ret == 2)
-@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)
  			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -80,7 +105,7 @@ index c4b5d15..1c01b6c 100644
  	}
  
  	mutex_unlock(&dev->i2c_mutex);
-@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,6 +116,26 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
@@ -107,7 +132,7 @@ index c4b5d15..1c01b6c 100644
  int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  {
  	struct i2c_adapter *i2c_adap;
-@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+@@ -123,6 +145,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  	if (i2c_adap == NULL)
  		goto error;
  
@@ -116,3 +141,9 @@ index c4b5d15..1c01b6c 100644
  	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
  		sizeof(i2c_adap->name));
  	i2c_adap->algo  = &hdpvr_algo;
+@@ -143,3 +167,5 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ error:
+ 	return retval;
+ }
++
++#endif /* CONFIG_I2C */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.16
retrieving revision 1.1679.2.17
diff -u -p -r1.1679.2.16 -r1.1679.2.17
--- kernel.spec	24 Aug 2009 20:39:12 -0000	1.1679.2.16
+++ kernel.spec	26 Aug 2009 21:19:43 -0000	1.1679.2.17
@@ -702,6 +702,7 @@ Patch1000: linux-2.6-neigh_-fix-state-tr
 Patch1515: linux-2.6.29-lirc.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
+Patch1519: lirc_zilog-revert-2.6.31-i2c-changes.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
@@ -1451,6 +1452,7 @@ ApplyPatch linux-2.6-neigh_-fix-state-tr
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 ApplyPatch hid-ignore-all-recent-imon-devices.patch
+ApplyPatch lirc_zilog-revert-2.6.31-i2c-changes.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
@@ -2178,7 +2180,11 @@ fi
 # and build.
 
 %changelog
-* Mon Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-217.2.16
+* Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
+- Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)
+- Revert lirc_zilog 2.6.31 i2c changes so it works on pre-2.6.31
+
+* Mon Aug 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-217.2.16
 - Fix CVE-2009-2691: local information disclosure in /proc
 
 * Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>



From jwilson at fedoraproject.org  Wed Aug 26 21:23:36 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed, 26 Aug 2009 21:23:36 +0000 (UTC)
Subject: rpms/kernel/devel hdpvr-ir-enable.patch, 1.2, 1.3 kernel.spec,
	1.1743, 1.1744
Message-ID: <20090826212336.B70FA11C02CC@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9983

Modified Files:
	hdpvr-ir-enable.patch kernel.spec 
Log Message:
* Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
- Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)


hdpvr-ir-enable.patch:
 Makefile     |    4 +---
 hdpvr-core.c |    7 +++----
 hdpvr-i2c.c  |   49 +++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 45 insertions(+), 15 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hdpvr-ir-enable.patch	10 Jul 2009 02:07:18 -0000	1.2
+++ hdpvr-ir-enable.patch	26 Aug 2009 21:23:36 -0000	1.3
@@ -1,29 +1,62 @@
 From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
 
 ---
- drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
- 2 files changed, 30 insertions(+), 9 deletions(-)
+ drivers/media/video/hdpvr/Makefile     |    4 +--
+ drivers/media/video/hdpvr/hdpvr-core.c |    7 ++--
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   49 ++++++++++++++++++++++++++-----
+ 3 files changed, 45 insertions(+), 15 deletions(-)
 
+diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
+index e0230fc..79ad2e1 100644
+--- a/drivers/media/video/hdpvr/Makefile
++++ b/drivers/media/video/hdpvr/Makefile
+@@ -1,6 +1,4 @@
+-hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
+-
+-hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
++hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o
+ 
+ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..878d1e5 100644
+index 188bd5a..9fa3d8d 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
+@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
+ 		goto error;
  	}
  
- #ifdef CONFIG_I2C
+-#ifdef CONFIG_I2C
 -	/* until i2c is working properly */
 -	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 +	retval = hdpvr_register_i2c_adapter(dev);
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
+@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+ 	mutex_unlock(&dev->io_mutex);
+ 
+ 	/* deregister I2C adapter */
+-#ifdef CONFIG_I2C
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+ 	mutex_lock(&dev->i2c_mutex);
+ 	if (dev->i2c_adapter)
+ 		i2c_del_adapter(dev->i2c_adapter);
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..1c01b6c 100644
+index c4b5d15..bc33607 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -22,7 +22,7 @@
+@@ -10,6 +10,8 @@
+  *
+  */
+ 
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
++
+ #include <linux/i2c.h>
+ 
+ #include "hdpvr.h"
+@@ -22,7 +24,7 @@
  #define REQTYPE_I2C_WRITE_STATT	0xd0
  
  static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
@@ -32,7 +65,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -41,7 +74,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  }
  
  static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -50,7 +83,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -59,15 +92,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret < 0)
  		goto error;
- 
- 	ret = usb_control_msg(dev->udev,
- 			      usb_rcvctrlpipe(dev->udev, 0),
--			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-+			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
- 			      0, 0, buf, 2, 1000);
- 
- 	if (ret == 2)
-@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)
  			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -80,7 +105,7 @@ index c4b5d15..1c01b6c 100644
  	}
  
  	mutex_unlock(&dev->i2c_mutex);
-@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,15 +116,39 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
@@ -107,7 +132,11 @@ index c4b5d15..1c01b6c 100644
  int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  {
  	struct i2c_adapter *i2c_adap;
-@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
++	struct i2c_board_info info;
+ 	int retval = -ENOMEM;
++	const unsigned short addr_list[] = { 0x54, I2C_CLIENT_END };
+ 
+ 	i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
  	if (i2c_adap == NULL)
  		goto error;
  
@@ -116,3 +145,24 @@ index c4b5d15..1c01b6c 100644
  	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
  		sizeof(i2c_adap->name));
  	i2c_adap->algo  = &hdpvr_algo;
+@@ -135,11 +161,18 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ 
+ 	retval = i2c_add_adapter(i2c_adap);
+ 
+-	if (!retval)
++	if (!retval) {
+ 		dev->i2c_adapter = i2c_adap;
+-	else
++		memset(&info, 0, sizeof(struct i2c_board_info));
++		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
++		i2c_new_probed_device(&dev->i2c_adapter, &info, addr_list);
++
++	} else {
+ 		kfree(i2c_adap);
++	}
+ 
+ error:
+ 	return retval;
+ }
++
++#endif /* CONFIG_I2C */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1743
retrieving revision 1.1744
diff -u -p -r1.1743 -r1.1744
--- kernel.spec	26 Aug 2009 19:33:53 -0000	1.1743
+++ kernel.spec	26 Aug 2009 21:23:36 -0000	1.1744
@@ -2014,6 +2014,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
+- Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)
+
 * Wed Aug 26 2009 Eric Paris <eparis at redhat.com>
 - fix iint_cache leak in IMA code
   drop the ima=0 patch



From dcantrel at fedoraproject.org  Wed Aug 26 21:32:31 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 26 Aug 2009 21:32:31 +0000 (UTC)
Subject: rpms/dhcp/F-11 dhcp.spec,1.263,1.264
Message-ID: <20090826213231.B643F11C02CC@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11005

Modified Files:
	dhcp.spec 
Log Message:
* 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)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- dhcp.spec	26 Aug 2009 20:10:50 -0000	1.263
+++ dhcp.spec	26 Aug 2009 21:32:31 -0000	1.264
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  3%{?dist}
+Release:  4%{?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.
@@ -84,7 +84,6 @@ Group: System Environment/Base
 Requires: initscripts >= 6.75
 Requires(post): coreutils
 Requires(post): grep
-Requires(post): policycoreutils
 Obsoletes: dhcpcd <= 1.3.22pl1-7
 Obsoletes: libdhcp4client <= 12:4.0.0-34.fc10
 Obsoletes: libdhcp <= 1.99.8-1.fc10
@@ -360,7 +359,9 @@ prevconf="%{_sysconfdir}/dhcpd.conf"
 if [ ! -z "${prevconf}" ]; then
     if [ ! -f %{dhcpconfdir}/dhcpd.conf -o "${sampleconf}" = "${contents}" ]; then
         /bin/cp -a ${prevconf} %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
-        /sbin/restorecon %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
+        if [ -x /sbin/restorecon ]; then
+            /sbin/restorecon %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
+        fi
     fi
 fi
 
@@ -376,7 +377,9 @@ if [ $? = 0 ]; then
         cf="$(/bin/basename ${etcfile})"
         if [ -f ${etcfile} ] && [ ! -r %{dhcpconfdir}/${cf} ]; then
             /bin/cp -a ${etcfile} %{dhcpconfdir}/${cf} >/dev/null 2>&1
-            /sbin/restorecon %{dhcpconfdir}/${cf} >/dev/null 2>&1
+            if [ -x /sbin/restorecon ]; then
+                /sbin/restorecon %{dhcpconfdir}/${cf} >/dev/null 2>&1
+            fi
         fi
     done || :
 fi || :
@@ -457,6 +460,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* 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)
+
 * Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
 - Do not require policycoreutils for post scriptlet (#519479)
 



From dcantrel at fedoraproject.org  Wed Aug 26 21:34:51 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 26 Aug 2009 21:34:51 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.272,1.273
Message-ID: <20090826213451.384C811C02CC@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11334

Modified Files:
	dhcp.spec 
Log Message:
* Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-8
- Conditionalize restorecon calls in post scriptlets (#519479)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- dhcp.spec	26 Aug 2009 19:29:18 -0000	1.272
+++ dhcp.spec	26 Aug 2009 21:34:50 -0000	1.273
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  7%{?dist}
+Release:  8%{?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.
@@ -375,7 +375,9 @@ prevconf="%{_sysconfdir}/dhcpd.conf"
 if [ ! -z "${prevconf}" ]; then
     if [ ! -f %{dhcpconfdir}/dhcpd.conf -o "${sampleconf}" = "${contents}" ]; then
         /bin/cp -a ${prevconf} %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
-        /sbin/restorecon %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
+        if [ -x /sbin/restorecon ]; then
+            /sbin/restorecon %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
+        fi
     fi
 fi
 
@@ -391,7 +393,9 @@ if [ $? = 0 ]; then
         cf="$(/bin/basename ${etcfile})"
         if [ -f ${etcfile} ] && [ ! -r %{dhcpconfdir}/${cf} ]; then
             /bin/cp -a ${etcfile} %{dhcpconfdir}/${cf} >/dev/null 2>&1
-            /sbin/restorecon %{dhcpconfdir}/${cf} >/dev/null 2>&1
+            if [ -x /sbin/restorecon ]; then
+                /sbin/restorecon %{dhcpconfdir}/${cf} >/dev/null 2>&1
+            fi
         fi
     done || :
 fi || :
@@ -475,6 +479,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-8
+- Conditionalize restorecon calls in post scriptlets (#519479)
+
 * Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-7
 - Do not require policycoreutils for post scriptlet (#519479)
 



From smilner at fedoraproject.org  Wed Aug 26 21:38:37 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 21:38:37 +0000 (UTC)
Subject: rpms/Django/devel Django.spec,1.26,1.27
Message-ID: <20090826213837.27ED111C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11921

Modified Files:
	Django.spec 
Log Message:
EL4 can't build with sphinx


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Django.spec	26 Aug 2009 18:55:52 -0000	1.26
+++ Django.spec	26 Aug 2009 21:38:36 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3%{?dist}
+Release:        3.01%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -18,7 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel python-sphinx
+BuildRequires:  python-devel
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+BuildRequires: python-sphinx
+%endif
+
 Requires:       python-simplejson
 
 %description
@@ -27,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -38,7 +42,7 @@ Obsoletes:      %{name}-docs < %{version
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# build documentation
-(cd docs && make html)
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+    # build documentation
+    (cd docs && make html)
+%endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -100,16 +106,20 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
-
+%endif
 
 %changelog
-* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-3
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
+- EL-4 shouldn't get the sphinx docs.
+
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-3
 - ghosting admin py* is now FC9 and under.
 
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From timj at fedoraproject.org  Wed Aug 26 21:45:46 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Wed, 26 Aug 2009 21:45:46 +0000 (UTC)
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.30,1.31
Message-ID: <20090826214546.1063411C02CC@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13226

Modified Files:
	alsa-tools.spec 
Log Message:
Add missing dep on xorg-x11-fonts-misc (#503284)



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- alsa-tools.spec	24 Jul 2009 16:48:09 -0000	1.30
+++ alsa-tools.spec	26 Aug 2009 21:45:45 -0000	1.31
@@ -23,7 +23,7 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 # Checked at least one source file from all the sub-projects contained in
 # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
@@ -47,6 +47,7 @@ BuildRequires:  gtk+-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  fltk-devel
 Buildrequires:  desktop-file-utils
+Requires:       xorg-x11-fonts-misc
 %endif
 
 %description
@@ -218,6 +219,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_RO
 %endif
 
 %changelog
+* Wed Aug 26 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.20-4
+- Add missing dep on xorg-x11-fonts-misc (#503284)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dcbw at fedoraproject.org  Wed Aug 26 21:47:27 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Wed, 26 Aug 2009 21:47:27 +0000 (UTC)
Subject: rpms/NetworkManager/devel sources,1.148,1.149
Message-ID: <20090826214727.DF51311C02CC@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13573

Modified Files:
	sources 
Log Message:
Update source to fix issue with connection secrets editing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- sources	26 Aug 2009 21:17:03 -0000	1.148
+++ sources	26 Aug 2009 21:47:27 -0000	1.149
@@ -1,2 +1,2 @@
 8c127ddbad7510625b93c75d91e49eee  NetworkManager-0.7.996.git20090826.tar.bz2
-ddd9bfb3c542428ed357443cb0fe2aab  network-manager-applet-0.7.996.git20090826.tar.bz2
+fc0ef94d5c7e25ccbb9c37895e5dd876  network-manager-applet-0.7.996.git20090826.tar.bz2



From overholt at fedoraproject.org  Wed Aug 26 21:48:21 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 26 Aug 2009 21:48:21 +0000 (UTC)
Subject: rpms/bouncycastle/devel bouncycastle.spec,1.18,1.19
Message-ID: <20090826214821.49E3411C02CC@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13722

Modified Files:
	bouncycastle.spec 
Log Message:
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
- Add maven POM


Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- bouncycastle.spec	24 Jul 2009 18:22:42 -0000	1.18
+++ bouncycastle.spec	26 Aug 2009 21:48:21 -0000	1.19
@@ -5,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.43
-Release:          4%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -13,9 +13,12 @@ URL:              http://www.%{name}.org
 # is modified to
 # bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
 Source0:          bcprov-%{archivever}-FEDORA.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.43/bcprov-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -93,6 +96,11 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+# maven pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom
+%add_to_maven_depmap org.bouncycastle bcprov-jdk16 %{version} JPP bcprov
+
 %post
 {
   # Rebuild the list of security providers in classpath.security
@@ -120,6 +128,7 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocd
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
+%update_maven_depmap
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -152,6 +161,7 @@ if [ $1 -eq 0 ] ; then
   %endif
 
 fi
+%update_maven_depmap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,12 +176,17 @@ rm -rf $RPM_BUILD_ROOT
   %{_libdir}/gcj/%{name}/
 %endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
+%{_mavenpomdir}/JPP-bcprov.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}/
 
 %changelog
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
+- Add maven POM
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Wed Aug 26 21:48:50 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 26 Aug 2009 21:48:50 +0000 (UTC)
Subject: rpms/bouncycastle/devel bcprov-jdk16-1.43.pom,NONE,1.1
Message-ID: <20090826214850.BA99011C02CC@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13788

Added Files:
	bcprov-jdk16-1.43.pom 
Log Message:
Add POM file to CVS


--- NEW FILE bcprov-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcprov-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle Provider</name>
  <version>1.43</version>
  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.6.</description>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
</project>



From smilner at fedoraproject.org  Wed Aug 26 21:49:31 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 21:49:31 +0000 (UTC)
Subject: rpms/Django/EL-4 Django.spec,1.14,1.15
Message-ID: <20090826214931.D542911C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13935

Modified Files:
	Django.spec 
Log Message:
testing combined spec in EL4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- Django.spec	26 Aug 2009 20:46:28 -0000	1.14
+++ Django.spec	26 Aug 2009 21:49:31 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3%{?dist}
+Release:        3.01%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -18,7 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel python-sphinx
+BuildRequires:  python-devel
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+BuildRequires: python-sphinx
+%endif
+
 Requires:       python-simplejson
 
 %description
@@ -27,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -38,7 +42,7 @@ Obsoletes:      %{name}-docs < %{version
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# build documentation
-(cd docs && make html)
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+    # build documentation
+    (cd docs && make html)
+%endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -100,16 +106,20 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
+%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
-
+%endif
 
 %changelog
-* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-3
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
+- EL-4 shouldn't get the sphinx docs.
+
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-3
 - ghosting admin py* is now FC9 and under.
 
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From dwalsh at fedoraproject.org  Wed Aug 26 21:52:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 26 Aug 2009 21:52:31 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.435,
	1.436 policycoreutils.spec, 1.633, 1.634
Message-ID: <20090826215231.D7BA711C02CC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-12
- Tighten up controls on seunshare.c


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 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_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++
 restorecond/watch.c                         |  254 ++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  193 +++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   13 
 sandbox/seunshare                           |binary
 sandbox/seunshare.c                         |  203 ++++++++
 sandbox/seunshare.o                         |binary
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   34 +
 semanage/seobject.py                        |   66 ++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 +++++++++++++++++++++
 setfiles/restore.h                          |   49 +
 setfiles/setfiles.c                         |  687 +++-------------------------
 26 files changed, 1847 insertions(+), 970 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -p -r1.435 -r1.436
--- policycoreutils-rhat.patch	26 Aug 2009 18:05:33 -0000	1.435
+++ policycoreutils-rhat.patch	26 Aug 2009 21:52:30 -0000	1.436
@@ -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.71/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-26 17:34:50.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/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-26 10:04:47.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-26 17:34:50.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
@@ -49,7 +49,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.71/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-20 15:30:42.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-26 17:34:50.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -98,14 +98,14 @@ 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.71/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-26 17:34:50.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.71/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-22 08:03:13.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-26 17:34:50.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -598,7 +598,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.71/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-20 15:30:45.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-26 17:34:50.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -611,7 +611,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.71/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -622,7 +622,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.71/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-20 15:30:47.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-26 17:34:50.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -649,13 +649,13 @@ 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_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-26 17:34:50.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.71/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/user.c	2009-08-20 13:08:42.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/user.c	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -896,7 +896,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/watch.c policycoreutils-2.0.71/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-20 13:08:19.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1154,7 +1154,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.71/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/Makefile	2009-08-26 10:50:50.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/Makefile	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1189,7 +1189,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.71/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandbox	2009-08-26 10:03:24.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/sandbox	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,193 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1386,7 +1386,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.71/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandbox.8	2009-08-26 10:03:24.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/sandbox.8	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1416,7 +1416,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.71/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandboxX.sh	2009-08-26 10:03:24.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/sandboxX.sh	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,13 @@
 +#!/bin/bash 
 +(Xephyr -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
@@ -1434,8 +1434,8 @@ diff --exclude-from=exclude --exclude=se
 Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.71/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.71/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/seunshare.c	2009-08-26 10:06:05.000000000 -0400
-@@ -0,0 +1,188 @@
++++ policycoreutils-2.0.71/sandbox/seunshare.c	2009-08-26 17:50:31.000000000 -0400
+@@ -0,0 +1,203 @@
 +#include <signal.h>
 +#include <sys/types.h>
 +#include <sys/wait.h>
@@ -1456,8 +1456,7 @@ diff --exclude-from=exclude --exclude=se
 +/**
 + * This function will drop the capabilities so that we are left
 + * only with access to the audit system and the ability to raise
-+ * CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_FOWNER and CAP_CHOWN,
-+ * before invoking unshare and mounting a couple of directories. 
++ * CAP_SYS_ADMIN before invoking unshare and mounting a couple of directories. 
 + * These capabilities are needed for performing bind mounts/unmounts 
 + * and to create potential new instance directories with appropriate 
 + * DAC attributes. 
@@ -1469,12 +1468,12 @@ diff --exclude-from=exclude --exclude=se
 +	capng_clear(CAPNG_SELECT_BOTH);
 +
 +	if (all) {
-+		if ((getuid() == 0) && (capng_lock() < 0)) 
++		if (capng_lock() < 0) 
 +			return -1;
 +	} else {
-+		if (capng_updatev(CAPNG_ADD, CAP_DAC_OVERRIDE|CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, -1) < 0) 
++		if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_ADMIN, CAP_SETPCAP, -1) < 0) { 
 +			return -1;
-+		    
++		}
 +	}
 +
 +	return capng_apply(CAPNG_SELECT_BOTH);
@@ -1487,7 +1486,7 @@ diff --exclude-from=exclude --exclude=se
 +/**
 + * Take care of any signal setup
 + */
-+static int set_signal_handles()
++static int set_signal_handles(void)
 +{
 +	sigset_t empty;
 +
@@ -1513,7 +1512,6 @@ diff --exclude-from=exclude --exclude=se
 +	int rc;
 +	int status = -1;
 +
-+	struct passwd *pwd=getpwuid(getuid());
 +	security_context_t scontext;
 +
 +	int flag_index;		/* flag index in argv[] */
@@ -1526,6 +1524,13 @@ diff --exclude-from=exclude --exclude=se
 +		{"tmpdir", 1, 0, 't'},
 +		{NULL, 0, 0, 0}
 +	};
++	capng_print_caps_text(CAPNG_PRINT_STDOUT, CAPNG_EFFECTIVE);
++
++	struct passwd *pwd=getpwuid(getuid());
++	if (!pwd) {
++		perror("getpwduid failed");
++		return -1;
++	}
 +
 +	if (drop_capabilities(FALSE)) {
 +		perror("Failed to drop capabilities");
@@ -1591,7 +1596,13 @@ diff --exclude-from=exclude --exclude=se
 +	int child = fork();
 +	if (!child) {
 +		/* Construct a new environment */
-+		char *display =  strdup(getenv("DISPLAY"));
++		char *d = getenv("DISPLAY");
++		if (!d) {
++			perror("DISPLAY Not set");
++			exit(-1);
++		}
++
++		char *display =  strdup(d);
 +		if (!display) {
 +			perror("Out of memory");
 +			exit(-1);
@@ -1614,7 +1625,11 @@ diff --exclude-from=exclude --exclude=se
 +		rc |= setenv("LOGNAME", pwd->pw_name, 1);
 +		rc |= setenv("PATH", DEFAULT_PATH, 1);
 +		
-+		chdir(pwd->pw_dir);
++		if (chdir(pwd->pw_dir)) {
++			perror("Failed to change dir to homedir");
++			exit(-1);
++		}
++		
 +		execv(argv[optind], argv + optind);
 +		perror("execv");
 +		exit(-1);
@@ -1627,7 +1642,7 @@ diff --exclude-from=exclude --exclude=se
 Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.71/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.71/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-26 17:34:50.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1639,7 +1654,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/Makefile policycoreutils-2.0.71/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-26 10:04:11.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-26 17:34:50.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1651,7 +1666,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.71/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage	2009-08-26 17:34:50.000000000 -0400
 @@ -68,6 +68,7 @@
  	-h, --help       Display this message
  	-n, --noheading  Do not print heading when listing OBJECTS
@@ -1761,7 +1776,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.71/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-26 17:34:50.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 
@@ -1890,7 +1905,7 @@ diff --exclude-from=exclude --exclude=se
  	def __init__(self, store = ""):
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.71/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-20 12:53:16.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-26 17:34:50.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1911,7 +1926,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.71/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-22 07:59:20.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2434,7 +2449,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/restore.h policycoreutils-2.0.71/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-22 08:02:45.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-26 17:34:50.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2487,7 +2502,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/setfiles/setfiles.c policycoreutils-2.0.71/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-08-12 12:08:15.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-22 08:06:25.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-26 17:34:50.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -p -r1.633 -r1.634
--- policycoreutils.spec	26 Aug 2009 20:45:29 -0000	1.633
+++ policycoreutils.spec	26 Aug 2009 21:52:31 -0000	1.634
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -295,6 +295,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-12
+- Tighten up controls on seunshare.c
+
 * Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-11
 - Add sandboxX
 



From timj at fedoraproject.org  Wed Aug 26 21:56:01 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Wed, 26 Aug 2009 21:56:01 +0000 (UTC)
Subject: rpms/alsa-tools/F-11 alsa-tools.spec,1.25,1.26
Message-ID: <20090826215601.2C62511C02CC@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/alsa-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14148

Modified Files:
	alsa-tools.spec 
Log Message:
Add missing dep on xorg-x11-fonts-misc (#503284)



Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/F-11/alsa-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- alsa-tools.spec	30 May 2009 13:55:40 -0000	1.25
+++ alsa-tools.spec	26 Aug 2009 21:56:00 -0000	1.26
@@ -23,7 +23,7 @@
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
 Version:        1.0.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 # Checked at least one source file from all the sub-projects contained in
 # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
@@ -47,6 +47,7 @@ BuildRequires:  gtk+-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  fltk-devel
 Buildrequires:  desktop-file-utils
+Requires:       xorg-x11-fonts-misc
 %endif
 
 %description
@@ -218,6 +219,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_RO
 %endif
 
 %changelog
+* Wed Aug 26 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.20-2
+- Add missing dep on xorg-x11-fonts-misc (#503284)
+
 * Sat May 30 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.20-1
 - Update to 1.0.20
 



From smilner at fedoraproject.org  Wed Aug 26 21:59:12 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 21:59:12 +0000 (UTC)
Subject: rpms/Django/EL-4 Django.spec,1.15,1.16
Message-ID: <20090826215912.3D8F311C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15190

Modified Files:
	Django.spec 
Log Message:
testing combined spec in EL4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- Django.spec	26 Aug 2009 21:49:31 -0000	1.15
+++ Django.spec	26 Aug 2009 21:59:12 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3.01%{?dist}
+Release:        3.02%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -19,7 +19,7 @@ BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
 BuildRequires:  python-devel
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 BuildRequires: python-sphinx
 %endif
 
@@ -31,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel}  4 || 0%{?fedora} > 0
     # build documentation
     (cd docs && make html)
 %endif
@@ -106,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*



From smilner at fedoraproject.org  Wed Aug 26 22:00:24 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:00:24 +0000 (UTC)
Subject: rpms/Django/EL-4 Django.spec,1.16,1.17
Message-ID: <20090826220024.76AD811C0499@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15405

Modified Files:
	Django.spec 
Log Message:
testing combined spec in EL4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- Django.spec	26 Aug 2009 21:59:12 -0000	1.16
+++ Django.spec	26 Aug 2009 22:00:24 -0000	1.17
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-%if 0%{?rhel}  4 || 0%{?fedora} > 0
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
     # build documentation
     (cd docs && make html)
 %endif



From smilner at fedoraproject.org  Wed Aug 26 22:08:28 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:08:28 +0000 (UTC)
Subject: rpms/Django/devel Django.spec,1.27,1.28
Message-ID: <20090826220828.E1A9211C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16359

Modified Files:
	Django.spec 
Log Message:
testing combined spec in devel


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- Django.spec	26 Aug 2009 21:38:36 -0000	1.27
+++ Django.spec	26 Aug 2009 22:08:28 -0000	1.28
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3.01%{?dist}
+Release:        3.02%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -19,7 +19,7 @@ BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
 BuildRequires:  python-devel
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 BuildRequires: python-sphinx
 %endif
 
@@ -31,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
     # build documentation
     (cd docs && make html)
 %endif
@@ -106,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*



From overholt at fedoraproject.org  Wed Aug 26 22:08:28 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 26 Aug 2009 22:08:28 +0000 (UTC)
Subject: rpms/bouncycastle-tsp/devel bctsp-jdk16-1.43.pom, NONE,
	1.1 bouncycastle-tsp.spec, 1.3, 1.4
Message-ID: <20090826220828.EC22E11C0375@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/bouncycastle-tsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16370

Modified Files:
	bouncycastle-tsp.spec 
Added Files:
	bctsp-jdk16-1.43.pom 
Log Message:
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
- Add maven POM


--- NEW FILE bctsp-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bctsp-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle OpenPGP API</name>
  <version>1.43</version>
  <description>The Bouncy Castle Java API for handling the Time Stamp Protocol (TSP). This jar contains the TSP API for JDK 1.6. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>org.bouncycastle</groupId>
      <artifactId>bcprov-jdk16</artifactId>
      <version>1.43</version>
      <type>jar</type>
    </dependency>
    <dependency>
      <groupId>org.bouncycastle</groupId>
      <artifactId>bcmail-jdk16</artifactId>
      <version>1.43</version>
      <type>jar</type>
    </dependency>
  </dependencies>
</project>

Index: bouncycastle-tsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-tsp/devel/bouncycastle-tsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bouncycastle-tsp.spec	24 Jul 2009 18:23:13 -0000	1.3
+++ bouncycastle-tsp.spec	26 Aug 2009 22:08:28 -0000	1.4
@@ -4,14 +4,17 @@
 Summary:          TSP libraries for Bouncy Castle
 Name:             bouncycastle-tsp
 Version:          1.43
-Release:          4%{?dist}
+Release:          5%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
 Source0:          http://www.bouncycastle.org/download/bctsp-%{archivever}.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bctsp-jdk16/1.43/bctsp-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -86,15 +89,22 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{with_gcj}
+# maven pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bctsp.pom
+%add_to_maven_depmap org.bouncycastle bctsp-jdk16 %{version} JPP bctsp
+
 %post
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%if %{with_gcj}
 %postun
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -109,6 +119,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/bctsp.jar
 %{_javadir}/bctsp-%{version}.jar
 %{_javadir}/gcj-endorsed/bctsp-%{version}.jar
+%{_mavenpomdir}/JPP-bctsp.pom
+%{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
   %{_libdir}/gcj/%{name}/
 %endif
@@ -118,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}/
 
 %changelog
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-5
+- Add maven POM
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From overholt at fedoraproject.org  Wed Aug 26 22:09:10 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 26 Aug 2009 22:09:10 +0000 (UTC)
Subject: rpms/bouncycastle-mail/devel bcmail-jdk16-1.43.pom, NONE,
	1.1 bouncycastle-mail.spec, 1.9, 1.10
Message-ID: <20090826220910.282D911C02CC@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/bouncycastle-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16682

Modified Files:
	bouncycastle-mail.spec 
Added Files:
	bcmail-jdk16-1.43.pom 
Log Message:
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-4
- Add maven POM


--- NEW FILE bcmail-jdk16-1.43.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.bouncycastle</groupId>
  <artifactId>bcmail-jdk16</artifactId>
  <packaging>jar</packaging>
  <name>Bouncy Castle CMS and S/MIME API</name>
  <version>1.43</version>
  <description>The Bouncy Castle Java CMS and S/MIME APIs for handling the CMS and S/MIME protocols. This jar contains CMS and S/MIME APIs for JDK 1.6. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. If the S/MIME API is used, the JavaMail API and the Java activation framework will also be needed.</description>
  <url>http://www.bouncycastle.org/java.html</url>
  <licenses>
    <license>
      <name>Bouncy Castle Licence</name>
      <url>http://www.bouncycastle.org/licence.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>org.bouncycastle</groupId>
      <artifactId>bcprov-jdk16</artifactId>
      <version>1.43</version>
      <type>jar</type>
    </dependency>
  </dependencies>
</project>

Index: bouncycastle-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle-mail/devel/bouncycastle-mail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bouncycastle-mail.spec	24 Jul 2009 18:22:58 -0000	1.9
+++ bouncycastle-mail.spec	26 Aug 2009 22:09:10 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          1.43
-Release:          3%{?dist}
+Release:          4%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -12,10 +12,13 @@ URL:              http://www.bouncycastl
 # is modified to
 # bcmail-%{archivever}-FEDORA.tar.gz with references to patented algorithms removed.
 Source0:          bcmail-%{archivever}-FEDORA.tar.gz
+Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcmail-jdk16/1.43/bcmail-jdk16-1.43.pom
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle == %{version}
 BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
 %if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
@@ -89,15 +92,22 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{with_gcj}
+# maven pom
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcmail.pom
+%add_to_maven_depmap org.bouncycastle bcmail-jdk16 %{version} JPP bcmail
+
 %post
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
 %endif
 
-%if %{with_gcj}
 %postun
+%update_maven_depmap
+%if %{with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -112,6 +122,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/bcmail.jar
 %{_javadir}/bcmail-%{version}.jar
 %{_javadir}/gcj-endorsed/bcmail-%{version}.jar
+%{_mavenpomdir}/JPP-bcmail.pom
+%{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
   %{_libdir}/gcj/%{name}/
 %endif
@@ -121,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.43-4
+- Add maven POM
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Wed Aug 26 22:10:42 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 26 Aug 2009 22:10:42 +0000 (UTC)
Subject: rpms/empathy/devel empathy-broken-pkgconfig.patch, 1.4,
	1.5 empathy.spec, 1.70, 1.71
Message-ID: <20090826221042.4CA4D11C02CC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17582

Modified Files:
	empathy-broken-pkgconfig.patch empathy.spec 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-2
- Update broken pkgconfig patch to not include libmissioncontrol.
- Drop BR on telepathy-mission-control-devel. mc is a runtime dep.


empathy-broken-pkgconfig.patch:
 libempathy-gtk/libempathy-gtk.pc.in |    3 +--
 libempathy/libempathy.pc.in         |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: empathy-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-pkgconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- empathy-broken-pkgconfig.patch	31 May 2009 05:05:50 -0000	1.4
+++ empathy-broken-pkgconfig.patch	26 Aug 2009 22:10:42 -0000	1.5
@@ -1,14 +1,26 @@
-diff -up ./libempathy-gtk/libempathy-gtk.pc.in.old ./libempathy-gtk/libempathy-gtk.pc.in
---- ./libempathy-gtk/libempathy-gtk.pc.in.old	2009-05-30 18:08:26.669287439 -0700
-+++ ./libempathy-gtk/libempathy-gtk.pc.in	2009-05-30 18:09:05.628230924 -0700
+diff -urp empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in empathy-2.27.91.1/libempathy/libempathy.pc.in
+--- empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in	2009-05-18 05:58:49.000000000 -0400
++++ empathy-2.27.91.1/libempathy/libempathy.pc.in	2009-08-26 16:59:16.000000000 -0400
+@@ -5,8 +5,7 @@ includedir=@includedir@
+ 
+ Name: libempathy
+ Description:  Empathy base library
+-Requires: pkg-config >= 0.21
+-Requires.private: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, \
++Requires: glib-2.0, gobject-2.0, libxml-2.0, \
+                   gio-2.0, gio-unix-2.0, telepathy-glib
+ Version: @VERSION@
+ Libs: -L${libdir} -lempathy
+diff -urp empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in
+--- empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in	2009-05-18 06:14:46.000000000 -0400
++++ empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in	2009-08-26 16:59:39.000000000 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
  Name: libempathy-gtk
  Description:  Empathy interface library
 -Requires: pkg-config >= 0.21
 -Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libmissioncontrol, \
-+Requires: glib-2.0, gobject-2.0, gtk+-2.0, libmissioncontrol, \
++Requires: glib-2.0, gobject-2.0, gtk+-2.0, \
                    libempathy, telepathy-glib, libcanberra-gtk
  Version: @VERSION@
  Libs: -L${libdir} -lempathy-gtk
-diff -up ./libempathy/libempathy.pc.in.old ./libempathy/libempathy.pc.in


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- empathy.spec	26 Aug 2009 18:39:49 -0000	1.70
+++ empathy.spec	26 Aug 2009 22:10:42 -0000	1.71
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.91.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -28,6 +28,8 @@ Source1:	%{name}-README.ConnectionManage
 ## Workaround for our broken pkgconfig
 ##  https://bugzilla.redhat.com/show_bug.cgi?id=436773
 ##  http://bugzilla.gnome.org/show_bug.cgi?id=577863
+## Removes old mission-control lookup
+## http://bugzilla.gnome.org/show_bug.cgi?id=593224
 Patch1:		%{name}-broken-pkgconfig.patch
 Patch2:		%{name}-desktop-category.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
@@ -52,7 +54,6 @@ BuildRequires:	libxml2-devel
 BuildRequires:	pygtk2-devel
 BuildRequires:	scrollkeeper
 BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
-BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
@@ -75,7 +76,7 @@ Requires:	telepathy-salut
 ## 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)
 Requires:	telepathy-haze
-Requires:	telepathy-mission-control
+Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
 Requires(pre):	GConf2
 
@@ -246,6 +247,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-2
+- Update broken pkgconfig patch to not include libmissioncontrol.
+- Drop BR on telepathy-mission-control-devel. mc is a runtime dep.
+
 * Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-1
 - Update to 2.27.91.1.
 - Add BR on unique-devel.



From pkgdb at fedoraproject.org  Wed Aug 26 22:15:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:15:20 +0000
Subject: [pkgdb] vanessa_adt was added for hubbitus
Message-ID: <20090826221520.4DD0610F877@bastion2.fedora.phx.redhat.com>

kevin has added Package vanessa_adt with summary Library of Abstract Data Types
kevin has approved Package vanessa_adt
kevin has added a Fedora devel branch for vanessa_adt with an owner of hubbitus
kevin has approved vanessa_adt in Fedora devel
kevin has approved Package vanessa_adt
kevin has set commit to Approved for 107427 on vanessa_adt (Fedora devel)
kevin has set checkout to Approved for 107427 on vanessa_adt (Fedora devel)
kevin has set build to Approved for 107427 on vanessa_adt (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_adt



From pkgdb at fedoraproject.org  Wed Aug 26 22:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:15:22 +0000
Subject: [pkgdb] vanessa_adt summary updated by kevin
Message-ID: <20090826221522.8318710F87C@bastion2.fedora.phx.redhat.com>

kevin set package vanessa_adt summary to Library of Abstract Data Types

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_adt



From pkgdb at fedoraproject.org  Wed Aug 26 22:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:15:22 +0000
Subject: [pkgdb] vanessa_adt (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826221522.9390410F88C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vanessa_adt
kevin has set commit to Approved for 107427 on vanessa_adt (Fedora 10)
kevin has set checkout to Approved for 107427 on vanessa_adt (Fedora 10)
kevin has set build to Approved for 107427 on vanessa_adt (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_adt



From pkgdb at fedoraproject.org  Wed Aug 26 22:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:15:22 +0000
Subject: [pkgdb] vanessa_adt (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826221522.A16B810F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vanessa_adt
kevin has set commit to Approved for 107427 on vanessa_adt (Fedora 11)
kevin has set checkout to Approved for 107427 on vanessa_adt (Fedora 11)
kevin has set build to Approved for 107427 on vanessa_adt (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_adt



From kevin at fedoraproject.org  Wed Aug 26 22:15:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:15:30 +0000 (UTC)
Subject: rpms/vanessa_adt - New directory
Message-ID: <20090826221530.2401A11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_adt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn18099/rpms/vanessa_adt

Log Message:
Directory /cvs/pkgs/rpms/vanessa_adt added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:15:22 +0000
Subject: [pkgdb] vanessa_adt (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826221522.AF8F110F898@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for vanessa_adt
kevin has set commit to Approved for 107427 on vanessa_adt (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on vanessa_adt (Fedora EPEL 5)
kevin has set build to Approved for 107427 on vanessa_adt (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vanessa_adt



From kevin at fedoraproject.org  Wed Aug 26 22:15:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:15:30 +0000 (UTC)
Subject: rpms/vanessa_adt/devel - New directory
Message-ID: <20090826221530.4B93211C0375@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_adt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn18099/rpms/vanessa_adt/devel

Log Message:
Directory /cvs/pkgs/rpms/vanessa_adt/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:15:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:15:36 +0000 (UTC)
Subject: rpms/vanessa_adt Makefile,NONE,1.1
Message-ID: <20090826221536.49C8411C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_adt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn18099/rpms/vanessa_adt

Added Files:
	Makefile 
Log Message:
Setup of module vanessa_adt


--- NEW FILE Makefile ---
# Top level Makefile for module vanessa_adt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:15:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:15:36 +0000 (UTC)
Subject: rpms/vanessa_adt/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826221536.95CE311C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vanessa_adt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn18099/rpms/vanessa_adt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vanessa_adt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vanessa_adt
# $Id: Makefile,v 1.1 2009/08/26 22:15:36 kevin Exp $
NAME := vanessa_adt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:16:20 +0000
Subject: [pkgdb] plexus-resources was added for overholt
Message-ID: <20090826221620.3BB1D10F87C@bastion2.fedora.phx.redhat.com>

kevin has added Package plexus-resources with summary Plexus Resource Manager
kevin has approved Package plexus-resources
kevin has added a Fedora devel branch for plexus-resources with an owner of overholt
kevin has approved plexus-resources in Fedora devel
kevin has approved Package plexus-resources
kevin has set commit to Approved for 107427 on plexus-resources (Fedora devel)
kevin has set checkout to Approved for 107427 on plexus-resources (Fedora devel)
kevin has set build to Approved for 107427 on plexus-resources (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-resources



From pkgdb at fedoraproject.org  Wed Aug 26 22:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:16:22 +0000
Subject: [pkgdb] plexus-resources summary updated by kevin
Message-ID: <20090826221622.75DEF10F87B@bastion2.fedora.phx.redhat.com>

kevin set package plexus-resources summary to Plexus Resource Manager

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-resources



From kevin at fedoraproject.org  Wed Aug 26 22:16:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:16:30 +0000 (UTC)
Subject: rpms/plexus-resources - New directory
Message-ID: <20090826221630.2080411C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-resources
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18427/rpms/plexus-resources

Log Message:
Directory /cvs/pkgs/rpms/plexus-resources added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:16:22 +0000
Subject: [pkgdb] plexus-resources (Fedora, devel) updated by kevin
Message-ID: <20090826221622.9065C10F898@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on plexus-resources (Fedora devel) for akurtakov
kevin approved watchcommits on plexus-resources (Fedora devel) for akurtakov
kevin approved commit on plexus-resources (Fedora devel) for akurtakov
kevin approved build on plexus-resources (Fedora devel) for akurtakov
kevin approved approveacls on plexus-resources (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-resources



From kevin at fedoraproject.org  Wed Aug 26 22:16:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:16:30 +0000 (UTC)
Subject: rpms/plexus-resources/devel - New directory
Message-ID: <20090826221630.4296D11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-resources/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18427/rpms/plexus-resources/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-resources/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:16:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:16:36 +0000 (UTC)
Subject: rpms/plexus-resources Makefile,NONE,1.1
Message-ID: <20090826221636.7A73D11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-resources
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18427/rpms/plexus-resources

Added Files:
	Makefile 
Log Message:
Setup of module plexus-resources


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-resources
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:16:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:16:36 +0000 (UTC)
Subject: rpms/plexus-resources/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826221636.C025411C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-resources/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN18427/rpms/plexus-resources/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-resources


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-resources
# $Id: Makefile,v 1.1 2009/08/26 22:16:36 kevin Exp $
NAME := plexus-resources
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:17:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:17:06 +0000
Subject: [pkgdb] 3proxy was added for hubbitus
Message-ID: <20090826221707.2CC9110F879@bastion2.fedora.phx.redhat.com>

kevin has added Package 3proxy with summary Tiny but very powerful proxy
kevin has approved Package 3proxy
kevin has added a Fedora devel branch for 3proxy with an owner of hubbitus
kevin has approved 3proxy in Fedora devel
kevin has approved Package 3proxy
kevin has set commit to Approved for 107427 on 3proxy (Fedora devel)
kevin has set checkout to Approved for 107427 on 3proxy (Fedora devel)
kevin has set build to Approved for 107427 on 3proxy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/3proxy



From pkgdb at fedoraproject.org  Wed Aug 26 22:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:17:08 +0000
Subject: [pkgdb] 3proxy summary updated by kevin
Message-ID: <20090826221709.244D510F894@bastion2.fedora.phx.redhat.com>

kevin set package 3proxy summary to Tiny but very powerful proxy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/3proxy



From pkgdb at fedoraproject.org  Wed Aug 26 22:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:17:08 +0000
Subject: [pkgdb] 3proxy (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826221709.AFAD610F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for 3proxy
kevin has set commit to Approved for 107427 on 3proxy (Fedora 11)
kevin has set checkout to Approved for 107427 on 3proxy (Fedora 11)
kevin has set build to Approved for 107427 on 3proxy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/3proxy



From pkgdb at fedoraproject.org  Wed Aug 26 22:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:17:08 +0000
Subject: [pkgdb] 3proxy (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826221710.2E1FC10F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for 3proxy
kevin has set commit to Approved for 107427 on 3proxy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on 3proxy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on 3proxy (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/3proxy



From kevin at fedoraproject.org  Wed Aug 26 22:17:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:17:18 +0000 (UTC)
Subject: rpms/3proxy - New directory
Message-ID: <20090826221718.167E711C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/3proxy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18528/rpms/3proxy

Log Message:
Directory /cvs/pkgs/rpms/3proxy added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:17:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:17:18 +0000 (UTC)
Subject: rpms/3proxy/devel - New directory
Message-ID: <20090826221718.3AB3E11C0492@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/3proxy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18528/rpms/3proxy/devel

Log Message:
Directory /cvs/pkgs/rpms/3proxy/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:17:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:17:25 +0000 (UTC)
Subject: rpms/3proxy Makefile,NONE,1.1
Message-ID: <20090826221725.102EC11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/3proxy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18528/rpms/3proxy

Added Files:
	Makefile 
Log Message:
Setup of module 3proxy


--- NEW FILE Makefile ---
# Top level Makefile for module 3proxy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:17:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:17:25 +0000 (UTC)
Subject: rpms/3proxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090826221725.6ECEA11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/3proxy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18528/rpms/3proxy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module 3proxy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: 3proxy
# $Id: Makefile,v 1.1 2009/08/26 22:17:25 kevin Exp $
NAME := 3proxy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From smilner at fedoraproject.org  Wed Aug 26 22:17:45 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:17:45 +0000 (UTC)
Subject: rpms/Django/devel Django.spec,1.28,1.29
Message-ID: <20090826221745.E787211C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18774

Modified Files:
	Django.spec 
Log Message:
spec worked in el4 and in devel


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Django.spec	26 Aug 2009 22:08:28 -0000	1.28
+++ Django.spec	26 Aug 2009 22:17:45 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3.02%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages



From ausil at fedoraproject.org  Wed Aug 26 22:17:49 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 26 Aug 2009 22:17:49 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.pc.in, 1.1, 1.2 nss-softokn.spec,
	1.6, 1.7
Message-ID: <20090826221749.C03F011C02CC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18749

Modified Files:
	nss-softokn.pc.in nss-softokn.spec 
Log Message:
only have a single Requires line in the .pc file



Index: nss-softokn.pc.in
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-softokn.pc.in	19 Aug 2009 23:47:12 -0000	1.1
+++ nss-softokn.pc.in	26 Aug 2009 22:17:49 -0000	1.2
@@ -6,6 +6,5 @@ includedir=%includedir%
 Name: SOFTKN
 Description: Network Security Services Softoken PKCS #11 Module
 Version: %SOFTOKEN_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Requires: nss-util >= %NSSUTIL_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
 Cflags: -I${includedir}


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nss-softokn.spec	25 Aug 2009 19:05:17 -0000	1.6
+++ nss-softokn.spec	26 Aug 2009 22:17:49 -0000	1.7
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          12%{?dist}
+Release:          16%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-16
+- only have a single Requires: line in the .pc file
+
 * Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-12
 - bump to unique rpm nvr 
 



From pkgdb at fedoraproject.org  Wed Aug 26 22:17:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:17:08 +0000
Subject: [pkgdb] 3proxy (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826221709.6A4DE10F897@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for 3proxy
kevin has set commit to Approved for 107427 on 3proxy (Fedora 10)
kevin has set checkout to Approved for 107427 on 3proxy (Fedora 10)
kevin has set build to Approved for 107427 on 3proxy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/3proxy



From phuang at fedoraproject.org  Wed Aug 26 22:18:27 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 26 Aug 2009 22:18:27 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.84,1.85
Message-ID: <20090826221827.639DD11C02CC@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18916

Modified Files:
	ibus.spec 
Log Message:
Change ${VAR} to $VAR


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- ibus.spec	26 Aug 2009 09:01:05 -0000	1.84
+++ ibus.spec	26 Aug 2009 22:18:27 -0000	1.85
@@ -140,22 +140,21 @@ install -pm 644 -D icons/IBus4-48.png $R
 install -pm 644 -D icons/IBus4-48.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/status/ibus-off.svg
 
 # install xinput config file
-mkdir -pm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
+install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
 
 # install .desktop files
-echo "NoDisplay=true" >> ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus.desktop
-echo "NoDisplay=true" >> ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup.desktop
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
 echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
-rm -rf ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ibus.desktop
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
 desktop-file-install --delete-original          \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/*
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %post
 # recreate icon cache



From pkgdb at fedoraproject.org  Wed Aug 26 22:19:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:19:05 +0000
Subject: [pkgdb] ghc-HUnit was added for bos
Message-ID: <20090826221906.17E4710F878@bastion2.fedora.phx.redhat.com>

kevin has added Package ghc-HUnit with summary unit testing support for Haskell
kevin has approved Package ghc-HUnit
kevin has added a Fedora devel branch for ghc-HUnit with an owner of bos
kevin has approved ghc-HUnit in Fedora devel
kevin has approved Package ghc-HUnit
kevin has set commit to Approved for 107427 on ghc-HUnit (Fedora devel)
kevin has set checkout to Approved for 107427 on ghc-HUnit (Fedora devel)
kevin has set build to Approved for 107427 on ghc-HUnit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HUnit



From pkgdb at fedoraproject.org  Wed Aug 26 22:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:19:08 +0000
Subject: [pkgdb] ghc-HUnit summary updated by kevin
Message-ID: <20090826221908.5C92610F884@bastion2.fedora.phx.redhat.com>

kevin set package ghc-HUnit summary to unit testing support for Haskell

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HUnit



From pkgdb at fedoraproject.org  Wed Aug 26 22:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:19:08 +0000
Subject: [pkgdb] ghc-HUnit (Fedora, 11) updated by kevin
Message-ID: <20090826221908.BC00910F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ghc-HUnit (Fedora devel) for ynemoy
kevin approved watchcommits on ghc-HUnit (Fedora devel) for ynemoy
kevin approved commit on ghc-HUnit (Fedora devel) for ynemoy
kevin approved build on ghc-HUnit (Fedora devel) for ynemoy
kevin approved approveacls on ghc-HUnit (Fedora devel) for ynemoy
kevin approved watchbugzilla on ghc-HUnit (Fedora devel) for petersen
kevin approved watchcommits on ghc-HUnit (Fedora devel) for petersen
kevin approved commit on ghc-HUnit (Fedora devel) for petersen
kevin approved build on ghc-HUnit (Fedora devel) for petersen
kevin approved approveacls on ghc-HUnit (Fedora devel) for petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HUnit



From kevin at fedoraproject.org  Wed Aug 26 22:19:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:19:17 +0000 (UTC)
Subject: rpms/ghc-HUnit - New directory
Message-ID: <20090826221917.17BE111C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HUnit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG18992/rpms/ghc-HUnit

Log Message:
Directory /cvs/pkgs/rpms/ghc-HUnit added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:19:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:19:17 +0000 (UTC)
Subject: rpms/ghc-HUnit/devel - New directory
Message-ID: <20090826221917.408D211C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HUnit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG18992/rpms/ghc-HUnit/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-HUnit/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:19:08 +0000
Subject: [pkgdb] ghc-HUnit (Fedora, 11) updated by kevin
Message-ID: <20090826221909.1B89D10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ghc-HUnit
kevin has set commit to Approved for 107427 on ghc-HUnit (Fedora 11)
kevin has set checkout to Approved for 107427 on ghc-HUnit (Fedora 11)
kevin has set build to Approved for 107427 on ghc-HUnit (Fedora 11)
kevin approved watchbugzilla on ghc-HUnit (Fedora 11) for ynemoy
kevin approved watchcommits on ghc-HUnit (Fedora 11) for ynemoy
kevin approved commit on ghc-HUnit (Fedora 11) for ynemoy
kevin approved build on ghc-HUnit (Fedora 11) for ynemoy
kevin approved approveacls on ghc-HUnit (Fedora 11) for ynemoy
kevin approved watchbugzilla on ghc-HUnit (Fedora 11) for petersen
kevin approved watchcommits on ghc-HUnit (Fedora 11) for petersen
kevin approved commit on ghc-HUnit (Fedora 11) for petersen
kevin approved build on ghc-HUnit (Fedora 11) for petersen
kevin approved approveacls on ghc-HUnit (Fedora 11) for petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HUnit



From kevin at fedoraproject.org  Wed Aug 26 22:19:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:19:23 +0000 (UTC)
Subject: rpms/ghc-HUnit Makefile,NONE,1.1
Message-ID: <20090826221923.73F1711C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HUnit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG18992/rpms/ghc-HUnit

Added Files:
	Makefile 
Log Message:
Setup of module ghc-HUnit


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-HUnit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:19:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:19:23 +0000 (UTC)
Subject: rpms/ghc-HUnit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826221923.D8F9811C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HUnit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG18992/rpms/ghc-HUnit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-HUnit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-HUnit
# $Id: Makefile,v 1.1 2009/08/26 22:19:23 kevin Exp $
NAME := ghc-HUnit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:20:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:20:28 +0000
Subject: [pkgdb] ghc-OpenGL was added for bos
Message-ID: <20090826222028.AE11110F877@bastion2.fedora.phx.redhat.com>

kevin has added Package ghc-OpenGL with summary bindings to the C OpenGL library
kevin has approved Package ghc-OpenGL
kevin has added a Fedora devel branch for ghc-OpenGL with an owner of bos
kevin has approved ghc-OpenGL in Fedora devel
kevin has approved Package ghc-OpenGL
kevin has set commit to Approved for 107427 on ghc-OpenGL (Fedora devel)
kevin has set checkout to Approved for 107427 on ghc-OpenGL (Fedora devel)
kevin has set build to Approved for 107427 on ghc-OpenGL (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-OpenGL



From pkgdb at fedoraproject.org  Wed Aug 26 22:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:20:31 +0000
Subject: [pkgdb] ghc-OpenGL summary updated by kevin
Message-ID: <20090826222032.1615E10F884@bastion2.fedora.phx.redhat.com>

kevin set package ghc-OpenGL summary to bindings to the C OpenGL library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-OpenGL



From pkgdb at fedoraproject.org  Wed Aug 26 22:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:20:31 +0000
Subject: [pkgdb] ghc-OpenGL (Fedora, 11) updated by kevin
Message-ID: <20090826222032.5743410F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ghc-OpenGL (Fedora devel) for haskell-sig
kevin approved watchcommits on ghc-OpenGL (Fedora devel) for haskell-sig
kevin approved watchbugzilla on ghc-OpenGL (Fedora devel) for ynemoy
kevin approved watchcommits on ghc-OpenGL (Fedora devel) for ynemoy
kevin approved commit on ghc-OpenGL (Fedora devel) for ynemoy
kevin approved build on ghc-OpenGL (Fedora devel) for ynemoy
kevin approved approveacls on ghc-OpenGL (Fedora devel) for ynemoy
kevin approved watchbugzilla on ghc-OpenGL (Fedora devel) for petersen
kevin approved watchcommits on ghc-OpenGL (Fedora devel) for petersen
kevin approved commit on ghc-OpenGL (Fedora devel) for petersen
kevin approved build on ghc-OpenGL (Fedora devel) for petersen
kevin approved approveacls on ghc-OpenGL (Fedora devel) for petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-OpenGL



From kevin at fedoraproject.org  Wed Aug 26 22:20:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:20:38 +0000 (UTC)
Subject: rpms/ghc-OpenGL - New directory
Message-ID: <20090826222038.1C37411C0496@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-OpenGL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19257/rpms/ghc-OpenGL

Log Message:
Directory /cvs/pkgs/rpms/ghc-OpenGL added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:20:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:20:38 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel - New directory
Message-ID: <20090826222038.3F70111C04F0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19257/rpms/ghc-OpenGL/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-OpenGL/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:20:31 +0000
Subject: [pkgdb] ghc-OpenGL (Fedora, 11) updated by kevin
Message-ID: <20090826222032.C9DA610F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ghc-OpenGL
kevin has set commit to Approved for 107427 on ghc-OpenGL (Fedora 11)
kevin has set checkout to Approved for 107427 on ghc-OpenGL (Fedora 11)
kevin has set build to Approved for 107427 on ghc-OpenGL (Fedora 11)
kevin approved watchbugzilla on ghc-OpenGL (Fedora 11) for haskell-sig
kevin approved watchcommits on ghc-OpenGL (Fedora 11) for haskell-sig
kevin approved watchbugzilla on ghc-OpenGL (Fedora 11) for ynemoy
kevin approved watchcommits on ghc-OpenGL (Fedora 11) for ynemoy
kevin approved commit on ghc-OpenGL (Fedora 11) for ynemoy
kevin approved build on ghc-OpenGL (Fedora 11) for ynemoy
kevin approved approveacls on ghc-OpenGL (Fedora 11) for ynemoy
kevin approved watchbugzilla on ghc-OpenGL (Fedora 11) for petersen
kevin approved watchcommits on ghc-OpenGL (Fedora 11) for petersen
kevin approved commit on ghc-OpenGL (Fedora 11) for petersen
kevin approved build on ghc-OpenGL (Fedora 11) for petersen
kevin approved approveacls on ghc-OpenGL (Fedora 11) for petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-OpenGL



From kevin at fedoraproject.org  Wed Aug 26 22:20:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:20:44 +0000 (UTC)
Subject: rpms/ghc-OpenGL Makefile,NONE,1.1
Message-ID: <20090826222044.4F0D811C0496@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-OpenGL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19257/rpms/ghc-OpenGL

Added Files:
	Makefile 
Log Message:
Setup of module ghc-OpenGL


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-OpenGL
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:20:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:20:44 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826222044.BF85711C0496@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz19257/rpms/ghc-OpenGL/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-OpenGL


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-OpenGL
# $Id: Makefile,v 1.1 2009/08/26 22:20:44 kevin Exp $
NAME := ghc-OpenGL
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From smilner at fedoraproject.org  Wed Aug 26 22:21:07 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:21:07 +0000 (UTC)
Subject: rpms/Django/EL-4 Django.spec,1.17,1.18
Message-ID: <20090826222107.E667A11C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19453

Modified Files:
	Django.spec 
Log Message:
tested in devel and el4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Django.spec	26 Aug 2009 22:00:24 -0000	1.17
+++ Django.spec	26 Aug 2009 22:21:07 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3.02%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages



From rdieter at fedoraproject.org  Wed Aug 26 22:21:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 26 Aug 2009 22:21:35 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.112,1.113
Message-ID: <20090826222135.1E34011C02CC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19560

Modified Files:
	koffice.spec 
Log Message:
fix %files



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- koffice.spec	26 Aug 2009 20:59:21 -0000	1.112
+++ koffice.spec	26 Aug 2009 22:21:34 -0000	1.113
@@ -751,6 +751,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libwmlexport.*
 %{_kde4_libdir}/kde4/libwmlimport.*
 %{_kde4_libdir}/kde4/libwpexport.*
+%{_kde4_libdir}/kde4/libwpgimport.*
 %{_kde4_libdir}/kde4/libwpimport.*
 #{_kde4_libdir}/kde4/libmswordimport.*
 #{_kde4_libdir}/kde4/libmswordodf_import.*



From smilner at fedoraproject.org  Wed Aug 26 22:22:03 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:22:03 +0000 (UTC)
Subject: rpms/Django/F-11 Django.spec,1.22,1.23
Message-ID: <20090826222203.D799C11C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19700

Modified Files:
	Django.spec 
Log Message:
updated unified spec


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/Django.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- Django.spec	16 Aug 2009 00:30:06 -0000	1.22
+++ Django.spec	26 Aug 2009 22:22:03 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -18,7 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel python-sphinx
+BuildRequires:  python-devel
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+BuildRequires: python-sphinx
+%endif
+
 Requires:       python-simplejson
 
 %description
@@ -27,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -38,7 +42,7 @@ Obsoletes:      %{name}-docs < %{version
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# build documentation
-(cd docs && make html)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+    # build documentation
+    (cd docs && make html)
+%endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -93,20 +99,27 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
 # -----------------
  
 
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
-
+%endif
 
 %changelog
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
+- EL-4 shouldn't get the sphinx docs.
+
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-3
+- ghosting admin py* is now FC9 and under.
+
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From pkgdb at fedoraproject.org  Wed Aug 26 22:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:22:28 +0000
Subject: [pkgdb] perl-ExtUtils-XSpp was added for kasal
Message-ID: <20090826222228.397F210F898@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-ExtUtils-XSpp with summary C++ variant of Perl's XS language
kevin has approved Package perl-ExtUtils-XSpp
kevin has added a Fedora devel branch for perl-ExtUtils-XSpp with an owner of kasal
kevin has approved perl-ExtUtils-XSpp in Fedora devel
kevin has approved Package perl-ExtUtils-XSpp
kevin has set commit to Approved for 107427 on perl-ExtUtils-XSpp (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-ExtUtils-XSpp (Fedora devel)
kevin has set build to Approved for 107427 on perl-ExtUtils-XSpp (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-XSpp



From pkgdb at fedoraproject.org  Wed Aug 26 22:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:22:29 +0000
Subject: [pkgdb] perl-ExtUtils-XSpp summary updated by kevin
Message-ID: <20090826222229.DE25010F89C@bastion2.fedora.phx.redhat.com>

kevin set package perl-ExtUtils-XSpp summary to C++ variant of Perl's XS language

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-XSpp



From kevin at fedoraproject.org  Wed Aug 26 22:22:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:22:40 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSpp/devel - New directory
Message-ID: <20090826222240.383F511C0375@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ExtUtils-XSpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19832/rpms/perl-ExtUtils-XSpp/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-ExtUtils-XSpp/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:22:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:22:40 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSpp - New directory
Message-ID: <20090826222240.1745711C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ExtUtils-XSpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19832/rpms/perl-ExtUtils-XSpp

Log Message:
Directory /cvs/pkgs/rpms/perl-ExtUtils-XSpp added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:22:29 +0000
Subject: [pkgdb] perl-ExtUtils-XSpp (Fedora, 11) updated by kevin
Message-ID: <20090826222230.04C3610F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-ExtUtils-XSpp
kevin has set commit to Approved for 107427 on perl-ExtUtils-XSpp (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-ExtUtils-XSpp (Fedora 11)
kevin has set build to Approved for 107427 on perl-ExtUtils-XSpp (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-XSpp



From kevin at fedoraproject.org  Wed Aug 26 22:22:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:22:46 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSpp Makefile,NONE,1.1
Message-ID: <20090826222246.3A43311C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ExtUtils-XSpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19832/rpms/perl-ExtUtils-XSpp

Added Files:
	Makefile 
Log Message:
Setup of module perl-ExtUtils-XSpp


--- NEW FILE Makefile ---
# Top level Makefile for module perl-ExtUtils-XSpp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:22:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:22:46 +0000 (UTC)
Subject: rpms/perl-ExtUtils-XSpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090826222246.8E87111C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ExtUtils-XSpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse19832/rpms/perl-ExtUtils-XSpp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-ExtUtils-XSpp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-ExtUtils-XSpp
# $Id: Makefile,v 1.1 2009/08/26 22:22:46 kevin Exp $
NAME := perl-ExtUtils-XSpp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:23:09 +0000
Subject: [pkgdb] perl-ExtUtils-XSpp (Fedora, 11) updated by kevin
Message-ID: <20090826222309.880B410F890@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-ExtUtils-XSpp (Fedora 11) for perl-sig
kevin approved watchcommits on perl-ExtUtils-XSpp (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-XSpp



From pkgdb at fedoraproject.org  Wed Aug 26 22:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:23:09 +0000
Subject: [pkgdb] perl-ExtUtils-XSpp (Fedora, 11) updated by kevin
Message-ID: <20090826222309.A317A10F898@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-ExtUtils-XSpp (Fedora devel) for perl-sig
kevin approved watchcommits on perl-ExtUtils-XSpp (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-XSpp



From pkgdb at fedoraproject.org  Wed Aug 26 22:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:24:38 +0000
Subject: [pkgdb] perl-BZ-Client was added for eseyman
Message-ID: <20090826222438.B7E0910F854@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-BZ-Client with summary A client for the Bugzilla web services API
kevin has approved Package perl-BZ-Client
kevin has added a Fedora devel branch for perl-BZ-Client with an owner of eseyman
kevin has approved perl-BZ-Client in Fedora devel
kevin has approved Package perl-BZ-Client
kevin has set commit to Approved for 107427 on perl-BZ-Client (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-BZ-Client (Fedora devel)
kevin has set build to Approved for 107427 on perl-BZ-Client (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-BZ-Client



From pkgdb at fedoraproject.org  Wed Aug 26 22:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:24:39 +0000
Subject: [pkgdb] perl-BZ-Client summary updated by kevin
Message-ID: <20090826222440.24E8210F890@bastion2.fedora.phx.redhat.com>

kevin set package perl-BZ-Client summary to A client for the Bugzilla web services API

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-BZ-Client



From pkgdb at fedoraproject.org  Wed Aug 26 22:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:24:39 +0000
Subject: [pkgdb] perl-BZ-Client (Fedora, 10) updated by kevin
Message-ID: <20090826222440.BF02810F89B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-BZ-Client
kevin has set commit to Approved for 107427 on perl-BZ-Client (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-BZ-Client (Fedora 11)
kevin has set build to Approved for 107427 on perl-BZ-Client (Fedora 11)
kevin approved watchbugzilla on perl-BZ-Client (Fedora 11) for perl-sig
kevin approved watchcommits on perl-BZ-Client (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-BZ-Client



From pkgdb at fedoraproject.org  Wed Aug 26 22:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:24:39 +0000
Subject: [pkgdb] perl-BZ-Client (Fedora, 10) updated by kevin
Message-ID: <20090826222440.7D25810F878@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-BZ-Client
kevin has set commit to Approved for 107427 on perl-BZ-Client (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-BZ-Client (Fedora 10)
kevin has set build to Approved for 107427 on perl-BZ-Client (Fedora 10)
kevin approved watchbugzilla on perl-BZ-Client (Fedora 10) for perl-sig
kevin approved watchcommits on perl-BZ-Client (Fedora 10) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-BZ-Client



From pkgdb at fedoraproject.org  Wed Aug 26 22:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:24:39 +0000
Subject: [pkgdb] perl-BZ-Client (Fedora, 10) updated by kevin
Message-ID: <20090826222441.4F25010F8A0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-BZ-Client (Fedora devel) for perl-sig
kevin approved watchcommits on perl-BZ-Client (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-BZ-Client



From kevin at fedoraproject.org  Wed Aug 26 22:25:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:25:09 +0000 (UTC)
Subject: rpms/perl-BZ-Client - New directory
Message-ID: <20090826222509.3664511C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-BZ-Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20158/rpms/perl-BZ-Client

Log Message:
Directory /cvs/pkgs/rpms/perl-BZ-Client added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:25:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:25:09 +0000 (UTC)
Subject: rpms/perl-BZ-Client/devel - New directory
Message-ID: <20090826222509.55B4D11C0417@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-BZ-Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20158/rpms/perl-BZ-Client/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-BZ-Client/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:25:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:25:15 +0000 (UTC)
Subject: rpms/perl-BZ-Client Makefile,NONE,1.1
Message-ID: <20090826222515.BA7F111C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-BZ-Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20158/rpms/perl-BZ-Client

Added Files:
	Makefile 
Log Message:
Setup of module perl-BZ-Client


--- NEW FILE Makefile ---
# Top level Makefile for module perl-BZ-Client
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:25:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:25:16 +0000 (UTC)
Subject: rpms/perl-BZ-Client/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826222516.0DFA311C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-BZ-Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl20158/rpms/perl-BZ-Client/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-BZ-Client


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-BZ-Client
# $Id: Makefile,v 1.1 2009/08/26 22:25:15 kevin Exp $
NAME := perl-BZ-Client
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:26:17 +0000
Subject: [pkgdb] openocd was added for dnglaze
Message-ID: <20090826222617.3540C10F86F@bastion2.fedora.phx.redhat.com>

kevin has added Package openocd with summary Debugging, in-system programming and boundary-scan testing for embedded devices
kevin has approved Package openocd
kevin has added a Fedora devel branch for openocd with an owner of dnglaze
kevin has approved openocd in Fedora devel
kevin has approved Package openocd
kevin has set commit to Approved for 107427 on openocd (Fedora devel)
kevin has set checkout to Approved for 107427 on openocd (Fedora devel)
kevin has set build to Approved for 107427 on openocd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openocd



From pkgdb at fedoraproject.org  Wed Aug 26 22:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:26:18 +0000
Subject: [pkgdb] openocd summary updated by kevin
Message-ID: <20090826222618.B161710F879@bastion2.fedora.phx.redhat.com>

kevin set package openocd summary to Debugging, in-system programming and boundary-scan testing for embedded devices

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openocd



From pkgdb at fedoraproject.org  Wed Aug 26 22:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:26:18 +0000
Subject: [pkgdb] openocd (Fedora, 10) updated by kevin
Message-ID: <20090826222619.058A210F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for openocd
kevin has set commit to Approved for 107427 on openocd (Fedora 11)
kevin has set checkout to Approved for 107427 on openocd (Fedora 11)
kevin has set build to Approved for 107427 on openocd (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openocd



From pkgdb at fedoraproject.org  Wed Aug 26 22:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:26:18 +0000
Subject: [pkgdb] openocd (Fedora, 10) updated by kevin
Message-ID: <20090826222618.D0A7210F881@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for openocd
kevin has set commit to Approved for 107427 on openocd (Fedora 10)
kevin has set checkout to Approved for 107427 on openocd (Fedora 10)
kevin has set build to Approved for 107427 on openocd (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/openocd



From kevin at fedoraproject.org  Wed Aug 26 22:26:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:26:26 +0000 (UTC)
Subject: rpms/openocd - New directory
Message-ID: <20090826222626.13CCF11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openocd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20431/rpms/openocd

Log Message:
Directory /cvs/pkgs/rpms/openocd added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:26:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:26:26 +0000 (UTC)
Subject: rpms/openocd/devel - New directory
Message-ID: <20090826222626.36E6C11C0492@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openocd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20431/rpms/openocd/devel

Log Message:
Directory /cvs/pkgs/rpms/openocd/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:26:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:26:32 +0000 (UTC)
Subject: rpms/openocd Makefile,NONE,1.1
Message-ID: <20090826222632.21C5311C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openocd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20431/rpms/openocd

Added Files:
	Makefile 
Log Message:
Setup of module openocd


--- NEW FILE Makefile ---
# Top level Makefile for module openocd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:26:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:26:32 +0000 (UTC)
Subject: rpms/openocd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090826222632.7B92F11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/openocd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20431/rpms/openocd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openocd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: openocd
# $Id: Makefile,v 1.1 2009/08/26 22:26:32 kevin Exp $
NAME := openocd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:27:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:27:22 +0000
Subject: [pkgdb] gtkmm-utils was added for gljohn
Message-ID: <20090826222723.5745510F88C@bastion2.fedora.phx.redhat.com>

kevin has added Package gtkmm-utils with summary C++ utility and widget library based on glibmm and gtkmm
kevin has approved Package gtkmm-utils
kevin has added a Fedora devel branch for gtkmm-utils with an owner of gljohn
kevin has approved gtkmm-utils in Fedora devel
kevin has approved Package gtkmm-utils
kevin has set commit to Approved for 107427 on gtkmm-utils (Fedora devel)
kevin has set checkout to Approved for 107427 on gtkmm-utils (Fedora devel)
kevin has set build to Approved for 107427 on gtkmm-utils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm-utils



From pkgdb at fedoraproject.org  Wed Aug 26 22:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:27:24 +0000
Subject: [pkgdb] gtkmm-utils summary updated by kevin
Message-ID: <20090826222725.8999410F899@bastion2.fedora.phx.redhat.com>

kevin set package gtkmm-utils summary to C++ utility and widget library based on glibmm and gtkmm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm-utils



From pkgdb at fedoraproject.org  Wed Aug 26 22:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:27:24 +0000
Subject: [pkgdb] gtkmm-utils (Fedora, 10) updated by kevin
Message-ID: <20090826222727.62A0E10F87C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gtkmm-utils
kevin has set commit to Approved for 107427 on gtkmm-utils (Fedora 10)
kevin has set checkout to Approved for 107427 on gtkmm-utils (Fedora 10)
kevin has set build to Approved for 107427 on gtkmm-utils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm-utils



From pkgdb at fedoraproject.org  Wed Aug 26 22:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:27:24 +0000
Subject: [pkgdb] gtkmm-utils (Fedora, 10) updated by kevin
Message-ID: <20090826222727.E059F10F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gtkmm-utils
kevin has set commit to Approved for 107427 on gtkmm-utils (Fedora 11)
kevin has set checkout to Approved for 107427 on gtkmm-utils (Fedora 11)
kevin has set build to Approved for 107427 on gtkmm-utils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gtkmm-utils



From kevin at fedoraproject.org  Wed Aug 26 22:27:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:27:32 +0000 (UTC)
Subject: rpms/gtkmm-utils - New directory
Message-ID: <20090826222732.1B43211C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkmm-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB20649/rpms/gtkmm-utils

Log Message:
Directory /cvs/pkgs/rpms/gtkmm-utils added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:27:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:27:32 +0000 (UTC)
Subject: rpms/gtkmm-utils/devel - New directory
Message-ID: <20090826222732.3D27611C048B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkmm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB20649/rpms/gtkmm-utils/devel

Log Message:
Directory /cvs/pkgs/rpms/gtkmm-utils/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:27:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:27:38 +0000 (UTC)
Subject: rpms/gtkmm-utils Makefile,NONE,1.1
Message-ID: <20090826222738.2E10211C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkmm-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB20649/rpms/gtkmm-utils

Added Files:
	Makefile 
Log Message:
Setup of module gtkmm-utils


--- NEW FILE Makefile ---
# Top level Makefile for module gtkmm-utils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:27:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:27:38 +0000 (UTC)
Subject: rpms/gtkmm-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826222738.7A8A311C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkmm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB20649/rpms/gtkmm-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtkmm-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gtkmm-utils
# $Id: Makefile,v 1.1 2009/08/26 22:27:38 kevin Exp $
NAME := gtkmm-utils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:30:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:30:05 +0000
Subject: [pkgdb] network-manager-netbook was added for pbrobinson
Message-ID: <20090826223005.2A74B10F879@bastion2.fedora.phx.redhat.com>

kevin has added Package network-manager-netbook with summary Moblin Netbook GUI for NetworkManger
kevin has approved Package network-manager-netbook
kevin has added a Fedora devel branch for network-manager-netbook with an owner of pbrobinson
kevin has approved network-manager-netbook in Fedora devel
kevin has approved Package network-manager-netbook
kevin has set commit to Approved for 107427 on network-manager-netbook (Fedora devel)
kevin has set checkout to Approved for 107427 on network-manager-netbook (Fedora devel)
kevin has set build to Approved for 107427 on network-manager-netbook (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/network-manager-netbook



From pkgdb at fedoraproject.org  Wed Aug 26 22:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:30:07 +0000
Subject: [pkgdb] network-manager-netbook summary updated by kevin
Message-ID: <20090826223007.E692410F88C@bastion2.fedora.phx.redhat.com>

kevin set package network-manager-netbook summary to Moblin Netbook GUI for NetworkManger

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/network-manager-netbook



From kevin at fedoraproject.org  Wed Aug 26 22:30:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:30:14 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel - New directory
Message-ID: <20090826223014.3A6FA11C04D8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM21068/rpms/network-manager-netbook/devel

Log Message:
Directory /cvs/pkgs/rpms/network-manager-netbook/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:30:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:30:14 +0000 (UTC)
Subject: rpms/network-manager-netbook - New directory
Message-ID: <20090826223014.1D68D11C0499@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/network-manager-netbook
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM21068/rpms/network-manager-netbook

Log Message:
Directory /cvs/pkgs/rpms/network-manager-netbook added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:30:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:30:20 +0000 (UTC)
Subject: rpms/network-manager-netbook Makefile,NONE,1.1
Message-ID: <20090826223020.E314411C0499@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/network-manager-netbook
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM21068/rpms/network-manager-netbook

Added Files:
	Makefile 
Log Message:
Setup of module network-manager-netbook


--- NEW FILE Makefile ---
# Top level Makefile for module network-manager-netbook
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:30:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:30:21 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090826223021.601B511C0499@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/network-manager-netbook/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM21068/rpms/network-manager-netbook/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module network-manager-netbook


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: network-manager-netbook
# $Id: Makefile,v 1.1 2009/08/26 22:30:21 kevin Exp $
NAME := network-manager-netbook
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:30:07 +0000
Subject: [pkgdb] network-manager-netbook (Fedora, 11) updated by kevin
Message-ID: <20090826223008.AF46710F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for network-manager-netbook
kevin has set commit to Approved for 107427 on network-manager-netbook (Fedora 11)
kevin has set checkout to Approved for 107427 on network-manager-netbook (Fedora 11)
kevin has set build to Approved for 107427 on network-manager-netbook (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/network-manager-netbook



From kevin at fedoraproject.org  Wed Aug 26 22:33:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:33:09 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel - New directory
Message-ID: <20090826223309.3E17711C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21562/rpms/moblin-panel-people/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-people/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:33:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:33:15 +0000 (UTC)
Subject: rpms/moblin-panel-people Makefile,NONE,1.1
Message-ID: <20090826223315.8DCE411C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-people
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21562/rpms/moblin-panel-people

Added Files:
	Makefile 
Log Message:
Setup of module moblin-panel-people


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-panel-people
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:33:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:33:15 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826223315.DF1AB11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21562/rpms/moblin-panel-people/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-panel-people


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-panel-people
# $Id: Makefile,v 1.1 2009/08/26 22:33:15 kevin Exp $
NAME := moblin-panel-people
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Wed Aug 26 22:33:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:33:09 +0000 (UTC)
Subject: rpms/moblin-panel-people - New directory
Message-ID: <20090826223309.17D4C11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-people
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI21562/rpms/moblin-panel-people

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-people added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:33:52 +0000
Subject: [pkgdb] moblin-panel-status summary updated by kevin
Message-ID: <20090826223352.9153410F87B@bastion2.fedora.phx.redhat.com>

kevin set package moblin-panel-status summary to Moblin Panel for Social Network Status

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-status



From pkgdb at fedoraproject.org  Wed Aug 26 22:33:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:33:50 +0000
Subject: [pkgdb] moblin-panel-status was added for pbrobinson
Message-ID: <20090826223351.0551310F877@bastion2.fedora.phx.redhat.com>

kevin has added Package moblin-panel-status with summary Moblin Panel for Social Network Status
kevin has approved Package moblin-panel-status
kevin has added a Fedora devel branch for moblin-panel-status with an owner of pbrobinson
kevin has approved moblin-panel-status in Fedora devel
kevin has approved Package moblin-panel-status
kevin has set commit to Approved for 107427 on moblin-panel-status (Fedora devel)
kevin has set checkout to Approved for 107427 on moblin-panel-status (Fedora devel)
kevin has set build to Approved for 107427 on moblin-panel-status (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-status



From kevin at fedoraproject.org  Wed Aug 26 22:34:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:34:02 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel - New directory
Message-ID: <20090826223402.472E511C0492@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21727/rpms/moblin-panel-status/devel

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-status/devel added to the repository




From kevin at fedoraproject.org  Wed Aug 26 22:34:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:34:02 +0000 (UTC)
Subject: rpms/moblin-panel-status - New directory
Message-ID: <20090826223402.20B9511C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-status
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21727/rpms/moblin-panel-status

Log Message:
Directory /cvs/pkgs/rpms/moblin-panel-status added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:33:52 +0000
Subject: [pkgdb] moblin-panel-status (Fedora, 11) updated by kevin
Message-ID: <20090826223352.9A09710F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for moblin-panel-status
kevin has set commit to Approved for 107427 on moblin-panel-status (Fedora 11)
kevin has set checkout to Approved for 107427 on moblin-panel-status (Fedora 11)
kevin has set build to Approved for 107427 on moblin-panel-status (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/moblin-panel-status



From kevin at fedoraproject.org  Wed Aug 26 22:34:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:34:08 +0000 (UTC)
Subject: rpms/moblin-panel-status Makefile,NONE,1.1
Message-ID: <20090826223408.B6EFD11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-status
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21727/rpms/moblin-panel-status

Added Files:
	Makefile 
Log Message:
Setup of module moblin-panel-status


--- NEW FILE Makefile ---
# Top level Makefile for module moblin-panel-status
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:34:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:34:09 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090826223409.1625911C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moblin-panel-status/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq21727/rpms/moblin-panel-status/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moblin-panel-status


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moblin-panel-status
# $Id: Makefile,v 1.1 2009/08/26 22:34:08 kevin Exp $
NAME := moblin-panel-status
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:35:06 +0000
Subject: [pkgdb] yum-plugin-download-order was added for rakesh
Message-ID: <20090826223506.D4E5A10F881@bastion2.fedora.phx.redhat.com>

kevin has added Package yum-plugin-download-order with summary Yum plugin to order downloading of packages
kevin has approved Package yum-plugin-download-order
kevin has added a Fedora devel branch for yum-plugin-download-order with an owner of rakesh
kevin has approved yum-plugin-download-order in Fedora devel
kevin has approved Package yum-plugin-download-order
kevin has set commit to Approved for 107427 on yum-plugin-download-order (Fedora devel)
kevin has set checkout to Approved for 107427 on yum-plugin-download-order (Fedora devel)
kevin has set build to Approved for 107427 on yum-plugin-download-order (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum-plugin-download-order



From pkgdb at fedoraproject.org  Wed Aug 26 22:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:35:08 +0000
Subject: [pkgdb] yum-plugin-download-order summary updated by kevin
Message-ID: <20090826223508.9933F10F884@bastion2.fedora.phx.redhat.com>

kevin set package yum-plugin-download-order summary to Yum plugin to order downloading of packages

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum-plugin-download-order



From kevin at fedoraproject.org  Wed Aug 26 22:35:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:35:17 +0000 (UTC)
Subject: rpms/yum-plugin-download-order - New directory
Message-ID: <20090826223517.1543111C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-plugin-download-order
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21946/rpms/yum-plugin-download-order

Log Message:
Directory /cvs/pkgs/rpms/yum-plugin-download-order added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:35:08 +0000
Subject: [pkgdb] yum-plugin-download-order (Fedora, 10) updated by kevin
Message-ID: <20090826223508.C480C10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for yum-plugin-download-order
kevin has set commit to Approved for 107427 on yum-plugin-download-order (Fedora 10)
kevin has set checkout to Approved for 107427 on yum-plugin-download-order (Fedora 10)
kevin has set build to Approved for 107427 on yum-plugin-download-order (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum-plugin-download-order



From kevin at fedoraproject.org  Wed Aug 26 22:35:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:35:17 +0000 (UTC)
Subject: rpms/yum-plugin-download-order/devel - New directory
Message-ID: <20090826223517.343FB11C0375@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-plugin-download-order/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21946/rpms/yum-plugin-download-order/devel

Log Message:
Directory /cvs/pkgs/rpms/yum-plugin-download-order/devel added to the repository




From pkgdb at fedoraproject.org  Wed Aug 26 22:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:35:08 +0000
Subject: [pkgdb] yum-plugin-download-order (Fedora, 10) updated by kevin
Message-ID: <20090826223508.E45F110F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for yum-plugin-download-order
kevin has set commit to Approved for 107427 on yum-plugin-download-order (Fedora 11)
kevin has set checkout to Approved for 107427 on yum-plugin-download-order (Fedora 11)
kevin has set build to Approved for 107427 on yum-plugin-download-order (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/yum-plugin-download-order



From kevin at fedoraproject.org  Wed Aug 26 22:35:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:35:23 +0000 (UTC)
Subject: rpms/yum-plugin-download-order Makefile,NONE,1.1
Message-ID: <20090826223523.6EEF311C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-plugin-download-order
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21946/rpms/yum-plugin-download-order

Added Files:
	Makefile 
Log Message:
Setup of module yum-plugin-download-order


--- NEW FILE Makefile ---
# Top level Makefile for module yum-plugin-download-order
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Aug 26 22:35:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 26 Aug 2009 22:35:23 +0000 (UTC)
Subject: rpms/yum-plugin-download-order/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090826223523.B2A5C11C02CC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yum-plugin-download-order/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU21946/rpms/yum-plugin-download-order/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yum-plugin-download-order


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: yum-plugin-download-order
# $Id: Makefile,v 1.1 2009/08/26 22:35:23 kevin Exp $
NAME := yum-plugin-download-order
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Aug 26 22:36:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:36:02 +0000
Subject: [pkgdb] lcov (Fedora EPEL, 4) updated by kevin
Message-ID: <20090826223603.035B610F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for lcov
kevin has set commit to Approved for 107427 on lcov (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on lcov (Fedora EPEL 5)
kevin has set build to Approved for 107427 on lcov (Fedora EPEL 5)
kevin changed owner of lcov in Fedora EPEL 5 to roland

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lcov



From pkgdb at fedoraproject.org  Wed Aug 26 22:36:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:36:02 +0000
Subject: [pkgdb] lcov (Fedora EPEL, 4) updated by kevin
Message-ID: <20090826223602.DF5C210F884@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for lcov
kevin has set commit to Approved for 107427 on lcov (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on lcov (Fedora EPEL 4)
kevin has set build to Approved for 107427 on lcov (Fedora EPEL 4)
kevin changed owner of lcov in Fedora EPEL 4 to roland

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/lcov



From smilner at fedoraproject.org  Wed Aug 26 22:36:26 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:36:26 +0000 (UTC)
Subject: rpms/Django/EL-5 Django.spec,1.14,1.15
Message-ID: <20090826223626.CC84011C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22407

Modified Files:
	Django.spec 
Log Message:
tested in devel and el4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- Django.spec	16 Aug 2009 01:54:40 -0000	1.14
+++ Django.spec	26 Aug 2009 22:36:26 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -18,7 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel python-sphinx
+BuildRequires:  python-devel
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+BuildRequires: python-sphinx
+%endif
+
 Requires:       python-simplejson
 
 %description
@@ -27,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -38,7 +42,7 @@ Obsoletes:      %{name}-docs < %{version
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# build documentation
-(cd docs && make html)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+    # build documentation
+    (cd docs && make html)
+%endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -93,20 +99,27 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
 # -----------------
  
 
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
-
+%endif
 
 %changelog
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
+- EL-4 shouldn't get the sphinx docs.
+
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-3
+- ghosting admin py* is now FC9 and under.
+
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From smilner at fedoraproject.org  Wed Aug 26 22:36:50 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 26 Aug 2009 22:36:50 +0000 (UTC)
Subject: rpms/Django/F-10 Django.spec,1.24,1.25
Message-ID: <20090826223650.7E5D911C02CC@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22529

Modified Files:
	Django.spec 
Log Message:
updated unified spec


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- Django.spec	26 Aug 2009 15:07:47 -0000	1.24
+++ Django.spec	26 Aug 2009 22:36:50 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -18,7 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel python-sphinx
+BuildRequires:  python-devel
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+BuildRequires: python-sphinx
+%endif
+
 Requires:       python-simplejson
 
 %description
@@ -27,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -38,7 +42,7 @@ Obsoletes:      %{name}-docs < %{version
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# build documentation
-(cd docs && make html)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+    # build documentation
+    (cd docs && make html)
+%endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -100,16 +106,20 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
-
+%endif
 
 %changelog
-* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-3
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
+- EL-4 shouldn't get the sphinx docs.
+
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-3
 - ghosting admin py* is now FC9 and under.
 
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1



From pkgdb at fedoraproject.org  Wed Aug 26 22:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 26 Aug 2009 22:37:22 +0000
Subject: [pkgdb] python-markdown (Fedora EPEL, 5) updated by kevin
Message-ID: <20090826223722.4182110F879@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-markdown
kevin has set commit to Approved for 107427 on python-markdown (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-markdown (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-markdown (Fedora EPEL 5)
kevin changed owner of python-markdown in Fedora EPEL 5 to thm

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown



From pbrobinson at fedoraproject.org  Wed Aug 26 22:37:46 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 26 Aug 2009 22:37:46 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel COPYING, NONE, 1.1 import.log,
	NONE, 1.1 network-manager-netbook-full-desktop.patch, NONE,
	1.1 network-manager-netbook.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090826223746.D400711C02CC@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-serv22555/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING import.log network-manager-netbook-full-desktop.patch 
	network-manager-netbook.spec 
Log Message:
- Initial import



--- NEW FILE COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.


		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)


These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.


  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.


  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS


	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE import.log ---
network-manager-netbook-1_2-4_fc11:HEAD:network-manager-netbook-1.2-4.fc11.src.rpm:1251326141

network-manager-netbook-full-desktop.patch:
 Makefile.am                           |    6 ++++--
 configure.in                          |    1 +
 network-manager-netbook.desktop       |    8 --------
 network-manager-netbook.desktop.in.in |    9 +++++++++
 po/POTFILES.in                        |    1 +
 5 files changed, 15 insertions(+), 10 deletions(-)

--- NEW FILE network-manager-netbook-full-desktop.patch ---
diff -Nru network-manager-netbook.git/configure.in network-manager-netbook/configure.in
--- network-manager-netbook.git/configure.in	2009-08-07 14:08:31.266337000 -0400
+++ network-manager-netbook/configure.in	2009-08-11 20:58:54.215576000 -0400
@@ -31,6 +31,7 @@
 icons/32/Makefile
 icons/48/Makefile
 po/Makefile.in
+network-manager-netbook.desktop.in
 src/marshallers/Makefile
 src/gconf-helpers/Makefile
 src/wireless-security/Makefile
diff -Nru network-manager-netbook.git/Makefile.am network-manager-netbook/Makefile.am
--- network-manager-netbook.git/Makefile.am	2009-08-07 14:08:31.256338000 -0400
+++ network-manager-netbook/Makefile.am	2009-08-11 21:20:16.753452000 -0400
@@ -1,7 +1,9 @@
 SUBDIRS = icons src po
 
 autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = network-manager-netbook.desktop
+autostart_in_files = network-manager-netbook.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
 	$(autostart_DATA) \
@@ -9,5 +11,5 @@
 	intltool-merge.in \
 	intltool-update.in
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update network-manager-netbook.desktop
 
diff -Nru network-manager-netbook.git/network-manager-netbook.desktop network-manager-netbook/network-manager-netbook.desktop
--- network-manager-netbook.git/network-manager-netbook.desktop	2009-08-07 14:08:31.435337000 -0400
+++ network-manager-netbook/network-manager-netbook.desktop	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=network-manager-netbook
-_Comment=Control your network connections
-Icon=nm-device-wireless
-Exec=network-manager-netbook
-Terminal=false
-Type=Application
-X-GNOME-Autostart-enabled=true
diff -Nru network-manager-netbook.git/network-manager-netbook.desktop.in.in network-manager-netbook/network-manager-netbook.desktop.in.in
--- network-manager-netbook.git/network-manager-netbook.desktop.in.in	1969-12-31 19:00:00.000000000 -0500
+++ network-manager-netbook/network-manager-netbook.desktop.in.in	2009-08-07 14:08:31.435337000 -0400
@@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=network-manager-netbook
+_Comment=Control your network connections
+Icon=nm-device-wireless
+Exec=network-manager-netbook
+Terminal=false
+Type=Application
+OnlyShowIn=MOBLIN;
+X-GNOME-Autostart-enabled=true
diff -Nru network-manager-netbook.git/po/POTFILES.in network-manager-netbook/po/POTFILES.in
--- network-manager-netbook.git/po/POTFILES.in	2009-08-07 14:08:31.444337000 -0400
+++ network-manager-netbook/po/POTFILES.in	2009-08-11 21:19:53.634046000 -0400
@@ -1,3 +1,4 @@
+network-manager-netbook.desktop.in
 src/nbtk-gtk-light-switch.c
 src/nmn-item.c
 src/network-manager-netbook.ui


--- NEW FILE network-manager-netbook.spec ---
# Tarfile created using git
# git clone git://git.gnome.org/network-manager-netbook
# git archive --format=tar --prefix=network-manager-netbook-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
%define git_version 926dfeb
%define tarfile %{name}-%{version}.tar.bz2

Name:           network-manager-netbook
Version:        1.2
Release:        4%{?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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: gnome-keyring-devel
BuildRequires: libnotify-devel
BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: nbtk-devel
BuildRequires: NetworkManager-glib-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: mobile-broadband-provider-info
Requires: hicolor-icon-theme

%description
network-manager-netbook is a connection management panel for Moblin that uses
NetworkManager to connect to wired, wireless and 3G mobile networks.

%prep
%setup -q
%patch0 -p1 -b .fixdesktop

#Copy license files until upstream fixes them in git
rm -f $RPM_BUILD_DIR/%{name}-%{version}/COPYING
cp %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}

# Don't run configure from autogen.sh
NOCONFIGURE=true ./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

# 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

%clean
rm -rf %{buildroot}

%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 COPYING.LIB
%{_sysconfdir}/xdg/autostart/network-manager-netbook.desktop
%{_bindir}/network-manager-netbook
%{_datadir}/network-manager-netbook
%{_datadir}/icons/hicolor/22x22/apps/nm-*
%{_datadir}/icons/hicolor/32x32/apps/nm-*
%{_datadir}/icons/hicolor/48x48/apps/nm-*

%changelog
* Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-4
- Review updates

* Tue Aug 11 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-3
- Further updates and build fixes

* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-2
- Updates and cleanups of the spec

* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-1
- Update to release 1.2

* Mon Jun 22 2009 Peter Robinson <pbrobinson at gmail.com> 1.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:30:20 -0000	1.1
+++ .cvsignore	26 Aug 2009 22:37:46 -0000	1.2
@@ -0,0 +1 @@
+network-manager-netbook-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:30:21 -0000	1.1
+++ sources	26 Aug 2009 22:37:46 -0000	1.2
@@ -0,0 +1 @@
+e45589dde04728029f0afa616af6fed3  network-manager-netbook-1.2.tar.bz2



From pbrobinson at fedoraproject.org  Wed Aug 26 22:37:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 26 Aug 2009 22:37:59 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel import.log, NONE,
	1.1 moblin-panel-people.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090826223759.847CF11C02CC@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-serv22847/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-panel-people.spec 
Log Message:
- Initial import



--- NEW FILE import.log ---
moblin-panel-people-0_0_1-1_fc11:HEAD:moblin-panel-people-0.0.1-1.fc11.src.rpm:1251326213


--- NEW FILE moblin-panel-people.spec ---
Name:           moblin-panel-people
Version:        0.0.1
Release:        1%{?dist}
Summary:        Moblin Panel for People

Group:          System Environment/Libraries
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)

BuildRequires: anerley-devel
BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

Requires: dbus

%description
The Moblin mutter panel for managing and contacting people.

%prep
%setup -q

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%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
%{_libexecdir}/moblin-panel-people
%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.people.service
%{_datadir}/%{name}

%changelog
* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:33:15 -0000	1.1
+++ .cvsignore	26 Aug 2009 22:37:59 -0000	1.2
@@ -0,0 +1 @@
+moblin-panel-people-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:33:15 -0000	1.1
+++ sources	26 Aug 2009 22:37:59 -0000	1.2
@@ -0,0 +1 @@
+df86408bf2291bbe01d9277217f68901  moblin-panel-people-0.0.1.tar.bz2



From pbrobinson at fedoraproject.org  Wed Aug 26 22:42:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 26 Aug 2009 22:42:37 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel import.log, NONE,
	1.1 moblin-panel-status.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090826224237.686C211C0417@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-serv24271/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log moblin-panel-status.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
moblin-panel-status-0_0_3-1_fc11:HEAD:moblin-panel-status-0.0.3-1.fc11.src.rpm:1251326482


--- NEW FILE moblin-panel-status.spec ---
Name:           moblin-panel-status
Version:        0.0.3
Release:        1%{?dist}
Summary:        Moblin Panel for Social Network Status

Group:          System Environment/Libraries
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)

BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: mojito-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: telepathy-mission-control-devel
BuildRequires: intltool

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool
BuildRequires: gnome-common

%description
The Moblin mutter panel for managing of social networks and your current status.
This includes tweeting on twitter and updating of MySpace, FaceBook and you IM 
status.

%prep
%setup -q

# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh

%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
%{_libexecdir}/moblin-panel-status
%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.status.service
%{_datadir}/%{name}

%changelog
* Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:34:08 -0000	1.1
+++ .cvsignore	26 Aug 2009 22:42:37 -0000	1.2
@@ -0,0 +1 @@
+moblin-panel-status-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:34:08 -0000	1.1
+++ sources	26 Aug 2009 22:42:37 -0000	1.2
@@ -0,0 +1 @@
+e8cbc221fabca94ec4a20a3b1ff44c9c  moblin-panel-status-0.0.3.tar.bz2



From eseyman at fedoraproject.org  Wed Aug 26 22:51:00 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 26 Aug 2009 22:51:00 +0000 (UTC)
Subject: rpms/perl-BZ-Client/devel import.log, NONE, 1.1 perl-BZ-Client.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090826225100.42E9C11C0417@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-BZ-Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25239/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-BZ-Client.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-BZ-Client-1_02-1_fc11:HEAD:perl-BZ-Client-1.02-1.fc11.src.rpm:1251326953


--- NEW FILE perl-BZ-Client.spec ---
Name:           perl-BZ-Client
Version:        1.02
Release:        1%{?dist}
Summary:        A client for the Bugzilla web services API
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/BZ-Client/
Source0:        http://www.cpan.org/authors/id/J/JW/JWIED/BZ-Client-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(LWP)
BuildRequires:  perl(XML::Parser)
BuildRequires:  perl(XML::Writer)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides an interface to the Bugzilla web services API.

%prep
%setup -q -n BZ-Client-%{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 LICENSE
%{perl_vendorlib}/BZ
%{_mandir}/man3/*

%changelog
* Tue Aug 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.02-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:25:15 -0000	1.1
+++ .cvsignore	26 Aug 2009 22:50:59 -0000	1.2
@@ -0,0 +1 @@
+BZ-Client-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:25:15 -0000	1.1
+++ sources	26 Aug 2009 22:50:59 -0000	1.2
@@ -0,0 +1 @@
+5b2672bebb843e251cfa440cb1bec419  BZ-Client-1.02.tar.gz



From eseyman at fedoraproject.org  Wed Aug 26 22:52:01 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 26 Aug 2009 22:52:01 +0000 (UTC)
Subject: rpms/perl-BZ-Client/F-11 import.log, NONE, 1.1 perl-BZ-Client.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090826225201.0471A11C0417@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-BZ-Client/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25505/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-BZ-Client.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-BZ-Client-1_02-1_fc11:F-11:perl-BZ-Client-1.02-1.fc11.src.rpm:1251327033


--- NEW FILE perl-BZ-Client.spec ---
Name:           perl-BZ-Client
Version:        1.02
Release:        1%{?dist}
Summary:        A client for the Bugzilla web services API
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/BZ-Client/
Source0:        http://www.cpan.org/authors/id/J/JW/JWIED/BZ-Client-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(LWP)
BuildRequires:  perl(XML::Parser)
BuildRequires:  perl(XML::Writer)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides an interface to the Bugzilla web services API.

%prep
%setup -q -n BZ-Client-%{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 LICENSE
%{perl_vendorlib}/BZ
%{_mandir}/man3/*

%changelog
* Tue Aug 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.02-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:25:15 -0000	1.1
+++ .cvsignore	26 Aug 2009 22:52:00 -0000	1.2
@@ -0,0 +1 @@
+BZ-Client-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:25:15 -0000	1.1
+++ sources	26 Aug 2009 22:52:00 -0000	1.2
@@ -0,0 +1 @@
+5b2672bebb843e251cfa440cb1bec419  BZ-Client-1.02.tar.gz



From pbrobinson at fedoraproject.org  Wed Aug 26 22:55:51 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 26 Aug 2009 22:55:51 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel network-manager-netbook.spec, 1.1,
	1.2
Message-ID: <20090826225551.C9D3411C0417@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-serv25979

Modified Files:
	network-manager-netbook.spec 
Log Message:
- Bump build


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- network-manager-netbook.spec	26 Aug 2009 22:37:46 -0000	1.1
+++ network-manager-netbook.spec	26 Aug 2009 22:55:51 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           network-manager-netbook
 Version:        1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
@@ -79,7 +79,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB
+%doc AUTHORS COPYING
 %{_sysconfdir}/xdg/autostart/network-manager-netbook.desktop
 %{_bindir}/network-manager-netbook
 %{_datadir}/network-manager-netbook
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Wed Aug 26 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-5
+- Bump build
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-4
 - Review updates
 



From eseyman at fedoraproject.org  Wed Aug 26 23:01:52 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Wed, 26 Aug 2009 23:01:52 +0000 (UTC)
Subject: rpms/perl-BZ-Client/F-10 import.log, NONE, 1.1 perl-BZ-Client.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090826230153.0340311C0417@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-BZ-Client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26881/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-BZ-Client.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
perl-BZ-Client-1_02-1_fc11:F-10:perl-BZ-Client-1.02-1.fc11.src.rpm:1251327623


--- NEW FILE perl-BZ-Client.spec ---
Name:           perl-BZ-Client
Version:        1.02
Release:        1%{?dist}
Summary:        A client for the Bugzilla web services API
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/BZ-Client/
Source0:        http://www.cpan.org/authors/id/J/JW/JWIED/BZ-Client-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(LWP)
BuildRequires:  perl(XML::Parser)
BuildRequires:  perl(XML::Writer)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides an interface to the Bugzilla web services API.

%prep
%setup -q -n BZ-Client-%{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 LICENSE
%{perl_vendorlib}/BZ
%{_mandir}/man3/*

%changelog
* Tue Aug 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 1.02-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:25:15 -0000	1.1
+++ .cvsignore	26 Aug 2009 23:01:51 -0000	1.2
@@ -0,0 +1 @@
+BZ-Client-1.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BZ-Client/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:25:15 -0000	1.1
+++ sources	26 Aug 2009 23:01:51 -0000	1.2
@@ -0,0 +1 @@
+5b2672bebb843e251cfa440cb1bec419  BZ-Client-1.02.tar.gz



From bpepple at fedoraproject.org  Wed Aug 26 23:12:12 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 26 Aug 2009 23:12:12 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.80,1.81
Message-ID: <20090826231213.1330911C049C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28930

Modified Files:
	nautilus-sendto.spec 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.1.6-3
- Rebuild for new Empathy.



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- nautilus-sendto.spec	30 Jul 2009 10:14:44 -0000	1.80
+++ nautilus-sendto.spec	26 Aug 2009 23:12:12 -0000	1.81
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        1.1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -95,6 +95,9 @@ fi
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.1.6-3
+- Rebuild for new Empathy.
+
 * Thu Jul 30 2009 Bastien Nocera <bnocera at redhat.com> 1.1.6-2
 - Rebuild for new empathy
 



From gljohn at fedoraproject.org  Wed Aug 26 23:13:03 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:13:03 +0000 (UTC)
Subject: rpms/gtkmm-utils/devel gtkmm-utils.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090826231303.5501611C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29184/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtkmm-utils.spec import.log 
Log Message:
Initial import (#503256).


--- NEW FILE gtkmm-utils.spec ---
Name:           gtkmm-utils
Version:        0.4.1
Release:        1%{?dist}
Summary:        C++ utility and widget library based on glibmm and gtkm

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gtkmm-utils/
Source0:        http://gtkmm-utils.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtkmm24-devel glibmm24-devel doxygen
BuildRequires:  graphviz



%description
The package consists of two shared libraries which will be installed 
to your pkg-config path, glibmm-utils and gtkmm-utils. Gtkmm is the 
official C++ API for GTK+, a graphical user interface toolkit used 
in the GNOME desktop. glibmm is a C++ API for GLib


%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        doc
Summary:        Documentation for %{name}
Group:          Documentation


%description    doc
The %{name}-doc package contains developer documentation for
developing applications that use %{name}.

%package        example
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description    example
The %{name}-example package contains example applications for %{name}.

%prep
%setup -q

%build

%configure --disable-static --enable-documentation
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Remove object files from examples going into %doc
rm -rf examples/.deps/ examples/.libs examples/*.o examples/Makefile*

# Fix incorrect permissions
chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*

# Install compiled examples into %{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv examples/logging $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-logging
mv examples/multi-completion $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-multi-completion
mv examples/tiles-simple $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-tiles-simple

#Clean up documentation
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gtkmm-utils/


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libglibmm-utils.so
%{_libdir}/libgtkmm-utils.so
%{_includedir}/glibmm-utils-1.0
%{_includedir}/gtkmm-utils-1.0
%{_libdir}/pkgconfig/glibmm-utils.pc
%{_libdir}/pkgconfig/gtkmm-utils.pc

%files example
%defattr(-,root,root,-)
%{_bindir}/gtkmm-utils-*

%files doc
%defattr(-,root,root,-)
%doc docs/html/*

%changelog
* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-10
- Updated to 0.4.1 release

* Tue Jul 28 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-9
- Moved docs back to its own package
- Added gtkmm-utils-* prefix to example files

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-8
- Removed doc subpkg used doc in devel pkg
- Tidy up install
- Added rpath fix as per guidelines
- add br graphviz (i never had this installed been using compiling lib for 6 months no problem?)

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-7
- Moved examples to bindir
- Added bindir to example pkg files. 

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-6
- Added doc pack/description/files
- Enabled doc build in configure
- Added doxygen buildreq for -doc
- Added glibmm24-devel to BR
- Added examples pkg
- Added move commands under install
- Added mkdir command under install
- Put email address for changelog in brackets

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-5
- Removed patch
- Added line remove example/.libs and example/.deps
- Dropped remove /example/makefiles

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-4
- Removed install from package docs
- added preserve timestamp flag to make install

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-3
- Changed summary to recomendation
- Changed Build requirments to gtkmm24-devel only
- Use name & version macro in the Source0 line
- Dropped prefix from configure
- Removed checking for remove build root under install
- Added pkgconfig as requirement for devel package, for dir ownership.
- Dropped the doc line from -devel, as the devel package requires the main package. 
- Tidy devel files as devel package should own the directories 
- Tidy package files. 
- Added chmod commands under install
- Removed attr lines under files
- Added patch to stop examples compiling
- Added examples to devel docs
- Added remove makefile from examples under prep

* Sat May 30 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-2
- Removed define name, version, release, prefix packager. 
- Removed Packager line
- Added direct source URL
- Dropped the Requires: lines altogether
- Dropped the BuildArch line.
- Changed the summary to read like other summaries that i have found in Fedora repo
- BuildRoot changed checked it against requirments and it is on the preference list 
- Removed prep argument
- Gave setup a -q argument
- Added No checking for remove build root under install
- headers go to a -devel subpackage.
- Post and postun is now just, post -p /sbin/ldconfig, postun -p /sbin/ldconfig
- Added Remove .la files at end of install
- Used  libdir macro instead of prefix macro/lib, 
- change prefix macro/include to includedir macro

* Fri May 29 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-1
- Wrote first spec 



--- NEW FILE import.log ---
gtkmm-utils-0_4_1-1_fc11:HEAD:gtkmm-utils-0.4.1-1.fc11.src.rpm:1251328233


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:27:38 -0000	1.1
+++ .cvsignore	26 Aug 2009 23:13:03 -0000	1.2
@@ -0,0 +1 @@
+gtkmm-utils-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:27:38 -0000	1.1
+++ sources	26 Aug 2009 23:13:03 -0000	1.2
@@ -0,0 +1 @@
+8b9d5503aaba434f5811e530208962b3  gtkmm-utils-0.4.1.tar.gz



From roland at fedoraproject.org  Wed Aug 26 23:14:20 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 26 Aug 2009 23:14:20 +0000 (UTC)
Subject: rpms/lcov/EL-5 .cvsignore, 1.4, 1.5 lcov.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <20090826231420.CC26411C0345@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/lcov/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29383/EL-5

Modified Files:
	.cvsignore lcov.spec sources 
Log Message:
EPEL 5 branching somehow grabbed an ancient version instead of devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcov/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Oct 2006 08:23:17 -0000	1.4
+++ .cvsignore	26 Aug 2009 23:14:20 -0000	1.5
@@ -1 +1 @@
-lcov-1.4.tar.gz
+lcov-1.7.tar.gz


Index: lcov.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcov/EL-5/lcov.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lcov.spec	12 Oct 2006 08:23:17 -0000	1.3
+++ lcov.spec	26 Aug 2009 23:14:20 -0000	1.4
@@ -1,15 +1,13 @@
 Name: lcov
-Version: 1.4
-Release: 2%{?dist}
+Version: 1.7
+Release: 1%{?dist}
 
 Summary: LTP GCOV extension code coverage tool
 Group: Development/Tools
-License: GPL
+License: GPLv2+
 
 URL: http://ltp.sourceforge.net/coverage/lcov.php
-Source0: http://dl.sourceforge.net/ltp/lcov-%{version}.tar.gz
-Patch1: lcov-1.4-lcovrc.patch
-Patch2: lcov-1.4-gcda-suffix.patch
+Source0: http://downloads.sourceforge.net/ltp/lcov-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -27,9 +25,6 @@ HTML output and support for large projec
 %prep
 %setup -q
 
-%patch1 -p1
-%patch2 -p1
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=$RPM_BUILD_ROOT
@@ -42,9 +37,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%config(noreplace) %attr(0644,root,root) /etc/lcovrc
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/lcovrc
 
 %changelog
+* Tue Aug 25 2009 Roland McGrath <roland at redhat.com> - 1.7-1
+- Update to 1.7 release.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-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.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu May 22 2008 Roland McGrath <roland at redhat.com> - 1.6-1
+- Update to 1.6 release.
+- Fix License: tag.
+
 * Mon Feb 20 2006 Roland McGrath <roland at redhat.com> - 1.4-2
 - Fix lcov -z to look for .gcda (GCC >= 3.4) suffix as well as .da (old GCC).
 - Remove empty %%build from spec.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcov/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Oct 2006 08:23:17 -0000	1.4
+++ sources	26 Aug 2009 23:14:20 -0000	1.5
@@ -1 +1 @@
-9ae93c6619ee60a9e89bd2da0e49ae4a  lcov-1.4.tar.gz
+445fc85c33c0ce21f5e0e06cd881b928  lcov-1.7.tar.gz



From gljohn at fedoraproject.org  Wed Aug 26 23:18:52 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:18:52 +0000 (UTC)
Subject: rpms/gtkmm-utils/F-10 sources,1.1,1.2
Message-ID: <20090826231852.4BABC11C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29691/F-10

Modified Files:
	sources 
Log Message:

* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Initial Release




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:27:38 -0000	1.1
+++ sources	26 Aug 2009 23:18:52 -0000	1.2
@@ -0,0 +1 @@
+8b9d5503aaba434f5811e530208962b3  gtkmm-utils-0.4.1.tar.gz



From gljohn at fedoraproject.org  Wed Aug 26 23:18:52 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:18:52 +0000 (UTC)
Subject: rpms/gtkmm-utils/F-11 sources,1.1,1.2
Message-ID: <20090826231852.7A98111C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29691/F-11

Modified Files:
	sources 
Log Message:

* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Initial Release




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:27:38 -0000	1.1
+++ sources	26 Aug 2009 23:18:52 -0000	1.2
@@ -0,0 +1 @@
+8b9d5503aaba434f5811e530208962b3  gtkmm-utils-0.4.1.tar.gz



From gljohn at fedoraproject.org  Wed Aug 26 23:21:40 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:21:40 +0000 (UTC)
Subject: rpms/gtkmm-utils/devel gtkmm-utils.spec,1.1,1.2
Message-ID: <20090826232140.2822E11C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30059/devel

Modified Files:
	gtkmm-utils.spec 
Log Message:

* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Quick error in spec file TYPO



Index: gtkmm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/devel/gtkmm-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtkmm-utils.spec	26 Aug 2009 23:13:03 -0000	1.1
+++ gtkmm-utils.spec	26 Aug 2009 23:21:39 -0000	1.2
@@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/html/*
 
 %changelog
-* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-10
+* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
 - Updated to 0.4.1 release
 
 * Tue Jul 28 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-9



From gljohn at fedoraproject.org  Wed Aug 26 23:31:45 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:31:45 +0000 (UTC)
Subject: rpms/gtkmm-utils/F-10 gtkmm-utils.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2
Message-ID: <20090826233145.A52E011C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31465/F-10

Modified Files:
	.cvsignore 
Added Files:
	gtkmm-utils.spec import.log 
Log Message:

* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Initial Release (through cvs-import script as make tag manually didnt work for me)




--- NEW FILE gtkmm-utils.spec ---
Name:           gtkmm-utils
Version:        0.4.1
Release:        1%{?dist}
Summary:        C++ utility and widget library based on glibmm and gtkm

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gtkmm-utils/
Source0:        http://gtkmm-utils.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtkmm24-devel glibmm24-devel doxygen
BuildRequires:  graphviz



%description
The package consists of two shared libraries which will be installed 
to your pkg-config path, glibmm-utils and gtkmm-utils. Gtkmm is the 
official C++ API for GTK+, a graphical user interface toolkit used 
in the GNOME desktop. glibmm is a C++ API for GLib


%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        doc
Summary:        Documentation for %{name}
Group:          Documentation


%description    doc
The %{name}-doc package contains developer documentation for
developing applications that use %{name}.

%package        example
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description    example
The %{name}-example package contains example applications for %{name}.

%prep
%setup -q

%build

%configure --disable-static --enable-documentation
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Remove object files from examples going into %doc
rm -rf examples/.deps/ examples/.libs examples/*.o examples/Makefile*

# Fix incorrect permissions
chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*

# Install compiled examples into %{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv examples/logging $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-logging
mv examples/multi-completion $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-multi-completion
mv examples/tiles-simple $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-tiles-simple

#Clean up documentation
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gtkmm-utils/


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libglibmm-utils.so
%{_libdir}/libgtkmm-utils.so
%{_includedir}/glibmm-utils-1.0
%{_includedir}/gtkmm-utils-1.0
%{_libdir}/pkgconfig/glibmm-utils.pc
%{_libdir}/pkgconfig/gtkmm-utils.pc

%files example
%defattr(-,root,root,-)
%{_bindir}/gtkmm-utils-*

%files doc
%defattr(-,root,root,-)
%doc docs/html/*

%changelog
* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-10
- Updated to 0.4.1 release

* Tue Jul 28 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-9
- Moved docs back to its own package
- Added gtkmm-utils-* prefix to example files

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-8
- Removed doc subpkg used doc in devel pkg
- Tidy up install
- Added rpath fix as per guidelines
- add br graphviz (i never had this installed been using compiling lib for 6 months no problem?)

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-7
- Moved examples to bindir
- Added bindir to example pkg files. 

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-6
- Added doc pack/description/files
- Enabled doc build in configure
- Added doxygen buildreq for -doc
- Added glibmm24-devel to BR
- Added examples pkg
- Added move commands under install
- Added mkdir command under install
- Put email address for changelog in brackets

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-5
- Removed patch
- Added line remove example/.libs and example/.deps
- Dropped remove /example/makefiles

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-4
- Removed install from package docs
- added preserve timestamp flag to make install

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-3
- Changed summary to recomendation
- Changed Build requirments to gtkmm24-devel only
- Use name & version macro in the Source0 line
- Dropped prefix from configure
- Removed checking for remove build root under install
- Added pkgconfig as requirement for devel package, for dir ownership.
- Dropped the doc line from -devel, as the devel package requires the main package. 
- Tidy devel files as devel package should own the directories 
- Tidy package files. 
- Added chmod commands under install
- Removed attr lines under files
- Added patch to stop examples compiling
- Added examples to devel docs
- Added remove makefile from examples under prep

* Sat May 30 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-2
- Removed define name, version, release, prefix packager. 
- Removed Packager line
- Added direct source URL
- Dropped the Requires: lines altogether
- Dropped the BuildArch line.
- Changed the summary to read like other summaries that i have found in Fedora repo
- BuildRoot changed checked it against requirments and it is on the preference list 
- Removed prep argument
- Gave setup a -q argument
- Added No checking for remove build root under install
- headers go to a -devel subpackage.
- Post and postun is now just, post -p /sbin/ldconfig, postun -p /sbin/ldconfig
- Added Remove .la files at end of install
- Used  libdir macro instead of prefix macro/lib, 
- change prefix macro/include to includedir macro

* Fri May 29 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-1
- Wrote first spec 



--- NEW FILE import.log ---
gtkmm-utils-0_4_1-1_fc11:F-10:gtkmm-utils-0.4.1-1.fc11.src.rpm:1251329303


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:27:38 -0000	1.1
+++ .cvsignore	26 Aug 2009 23:31:45 -0000	1.2
@@ -0,0 +1 @@
+gtkmm-utils-0.4.1.tar.gz



From gljohn at fedoraproject.org  Wed Aug 26 23:45:00 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:45:00 +0000 (UTC)
Subject: rpms/gtkmm-utils/devel gtkmm-utils.spec,1.2,1.3 import.log,1.1,1.2
Message-ID: <20090826234500.3CEF511C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1286/devel

Modified Files:
	gtkmm-utils.spec import.log 
Log Message:

VS: 	devel/gtkmm-utils.spec devel/import.log 
* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-2
- Bumping and Uploading as tags probelm



Index: gtkmm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/devel/gtkmm-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gtkmm-utils.spec	26 Aug 2009 23:21:39 -0000	1.2
+++ gtkmm-utils.spec	26 Aug 2009 23:44:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gtkmm-utils
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ utility and widget library based on glibmm and gtkm
 
 Group:          System Environment/Libraries
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/html/*
 
 %changelog
+* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-2
+- Bump release problem with TAGS
+
 * Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
 - Updated to 0.4.1 release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	26 Aug 2009 23:13:03 -0000	1.1
+++ import.log	26 Aug 2009 23:45:00 -0000	1.2
@@ -1 +1,2 @@
 gtkmm-utils-0_4_1-1_fc11:HEAD:gtkmm-utils-0.4.1-1.fc11.src.rpm:1251328233
+gtkmm-utils-0_4_1-2_fc11:HEAD:gtkmm-utils-0.4.1-2.fc11.src.rpm:1251330053



From gljohn at fedoraproject.org  Wed Aug 26 23:46:11 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:46:11 +0000 (UTC)
Subject: rpms/gtkmm-utils/F-10 gtkmm-utils.spec,1.1,1.2 import.log,1.1,1.2
Message-ID: <20090826234611.3629811C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1699/F-10

Modified Files:
	gtkmm-utils.spec import.log 
Log Message:

* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Bump and Upload to fix tags issue-



Index: gtkmm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/F-10/gtkmm-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtkmm-utils.spec	26 Aug 2009 23:31:45 -0000	1.1
+++ gtkmm-utils.spec	26 Aug 2009 23:46:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gtkmm-utils
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ utility and widget library based on glibmm and gtkm
 
 Group:          System Environment/Libraries
@@ -114,7 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/html/*
 
 %changelog
-* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-10
+* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-2
+- Bump release problem with TAGS
+
+* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
 - Updated to 0.4.1 release
 
 * Tue Jul 28 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-9


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	26 Aug 2009 23:31:45 -0000	1.1
+++ import.log	26 Aug 2009 23:46:11 -0000	1.2
@@ -1 +1,2 @@
 gtkmm-utils-0_4_1-1_fc11:F-10:gtkmm-utils-0.4.1-1.fc11.src.rpm:1251329303
+gtkmm-utils-0_4_1-2_fc11:F-10:gtkmm-utils-0.4.1-2.fc11.src.rpm:1251330211



From gljohn at fedoraproject.org  Wed Aug 26 23:47:38 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Wed, 26 Aug 2009 23:47:38 +0000 (UTC)
Subject: rpms/gtkmm-utils/F-11 gtkmm-utils.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2
Message-ID: <20090826234738.BB48B11C0345@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/gtkmm-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2046/F-11

Modified Files:
	.cvsignore 
Added Files:
	gtkmm-utils.spec import.log 
Log Message:

* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Bump and upload to fix tags issue



--- NEW FILE gtkmm-utils.spec ---
Name:           gtkmm-utils
Version:        0.4.1
Release:        2%{?dist}
Summary:        C++ utility and widget library based on glibmm and gtkm

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gtkmm-utils/
Source0:        http://gtkmm-utils.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtkmm24-devel glibmm24-devel doxygen
BuildRequires:  graphviz



%description
The package consists of two shared libraries which will be installed 
to your pkg-config path, glibmm-utils and gtkmm-utils. Gtkmm is the 
official C++ API for GTK+, a graphical user interface toolkit used 
in the GNOME desktop. glibmm is a C++ API for GLib


%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        doc
Summary:        Documentation for %{name}
Group:          Documentation


%description    doc
The %{name}-doc package contains developer documentation for
developing applications that use %{name}.

%package        example
Summary:        Examples for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description    example
The %{name}-example package contains example applications for %{name}.

%prep
%setup -q

%build

%configure --disable-static --enable-documentation
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# Remove object files from examples going into %doc
rm -rf examples/.deps/ examples/.libs examples/*.o examples/Makefile*

# Fix incorrect permissions
chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*

# Install compiled examples into %{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv examples/logging $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-logging
mv examples/multi-completion $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-multi-completion
mv examples/tiles-simple $RPM_BUILD_ROOT%{_bindir}/gtkmm-utils-tiles-simple

#Clean up documentation
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gtkmm-utils/


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libglibmm-utils.so
%{_libdir}/libgtkmm-utils.so
%{_includedir}/glibmm-utils-1.0
%{_includedir}/gtkmm-utils-1.0
%{_libdir}/pkgconfig/glibmm-utils.pc
%{_libdir}/pkgconfig/gtkmm-utils.pc

%files example
%defattr(-,root,root,-)
%{_bindir}/gtkmm-utils-*

%files doc
%defattr(-,root,root,-)
%doc docs/html/*

%changelog
* Thu Aug 27 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-2
- Bump release problem with TAGS

* Tue Aug 18 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.1-1
- Updated to 0.4.1 release

* Tue Jul 28 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-9
- Moved docs back to its own package
- Added gtkmm-utils-* prefix to example files

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-8
- Removed doc subpkg used doc in devel pkg
- Tidy up install
- Added rpath fix as per guidelines
- add br graphviz (i never had this installed been using compiling lib for 6 months no problem?)

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-7
- Moved examples to bindir
- Added bindir to example pkg files. 

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-6
- Added doc pack/description/files
- Enabled doc build in configure
- Added doxygen buildreq for -doc
- Added glibmm24-devel to BR
- Added examples pkg
- Added move commands under install
- Added mkdir command under install
- Put email address for changelog in brackets

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-5
- Removed patch
- Added line remove example/.libs and example/.deps
- Dropped remove /example/makefiles

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-4
- Removed install from package docs
- added preserve timestamp flag to make install

* Sun May 31 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-3
- Changed summary to recomendation
- Changed Build requirments to gtkmm24-devel only
- Use name & version macro in the Source0 line
- Dropped prefix from configure
- Removed checking for remove build root under install
- Added pkgconfig as requirement for devel package, for dir ownership.
- Dropped the doc line from -devel, as the devel package requires the main package. 
- Tidy devel files as devel package should own the directories 
- Tidy package files. 
- Added chmod commands under install
- Removed attr lines under files
- Added patch to stop examples compiling
- Added examples to devel docs
- Added remove makefile from examples under prep

* Sat May 30 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-2
- Removed define name, version, release, prefix packager. 
- Removed Packager line
- Added direct source URL
- Dropped the Requires: lines altogether
- Dropped the BuildArch line.
- Changed the summary to read like other summaries that i have found in Fedora repo
- BuildRoot changed checked it against requirments and it is on the preference list 
- Removed prep argument
- Gave setup a -q argument
- Added No checking for remove build root under install
- headers go to a -devel subpackage.
- Post and postun is now just, post -p /sbin/ldconfig, postun -p /sbin/ldconfig
- Added Remove .la files at end of install
- Used  libdir macro instead of prefix macro/lib, 
- change prefix macro/include to includedir macro

* Fri May 29 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.0-1
- Wrote first spec 



--- NEW FILE import.log ---
gtkmm-utils-0_4_1-2_fc11:F-11:gtkmm-utils-0.4.1-2.fc11.src.rpm:1251330287


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm-utils/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:27:38 -0000	1.1
+++ .cvsignore	26 Aug 2009 23:47:38 -0000	1.2
@@ -0,0 +1 @@
+gtkmm-utils-0.4.1.tar.gz



From emaldonado at fedoraproject.org  Wed Aug 26 23:52:27 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 26 Aug 2009 23:52:27 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.5,1.6
Message-ID: <20090826235227.D523A11C0345@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2769

Modified Files:
	nss-util.spec 
Log Message:
Remove spurious exec permissions from nss-util-config and shorten descrption string


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss-util.spec	24 Aug 2009 22:29:11 -0000	1.5
+++ nss-util.spec	26 Aug 2009 23:52:27 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-Release:          10%{?dist}
+Release:          11%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -49,7 +49,7 @@ Requires:         pkgconfig
 Requires:         nss-devel
 
 %description devel
-Header and utility library files for doing development with Network Security Services.
+Header and library files for doing development with Network Security Services.
 
 
 %prep
@@ -78,7 +78,6 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-
 %ifarch x86_64 ppc64 ia64 s390x sparc64
 USE_64=1
 export USE_64
@@ -145,21 +144,18 @@ do
 done
 
 # Copy the package configuration files
-%{__install} -p ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-
 %post
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-
 %files
 %defattr(-,root,root)
 /%{_lib}/libnssutil3.so
@@ -206,6 +202,10 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-11
+- Remove spurious executable permissions from nss-util-config
+- Shorten some descriptions to keep rpmlint happy
+
 * Mon Aug 24 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-10
 - dont include the headers in nss-util only in the -devel package
 - nss-util-devel Requires nss-devel since its only providing a subset of the headers.



From mclasen at fedoraproject.org  Thu Aug 27 00:11:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 27 Aug 2009 00:11:21 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-dupe-id.patch, NONE, 1.1 nautilus.spec,
	1.282, 1.283
Message-ID: <20090827001121.8D03111C0345@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4717

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-dupe-id.patch 
Log Message:
Fix nautilus-file-management-properties


nautilus-dupe-id.patch:
 nautilus-file-management-properties.ui |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nautilus-dupe-id.patch ---
diff -up nautilus-2.27.91/src/nautilus-file-management-properties.ui.dupe-id nautilus-2.27.91/src/nautilus-file-management-properties.ui
--- nautilus-2.27.91/src/nautilus-file-management-properties.ui.dupe-id	2009-08-26 20:04:20.492274436 -0400
+++ nautilus-2.27.91/src/nautilus-file-management-properties.ui	2009-08-26 20:04:26.611029555 -0400
@@ -1128,7 +1128,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label">
+                              <object class="GtkLabel" id="label99">
                                 <property name="height_request">6</property>
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes"/>


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- nautilus.spec	25 Aug 2009 01:11:49 -0000	1.282
+++ nautilus.spec	27 Aug 2009 00:11:21 -0000	1.283
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.27.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
@@ -85,6 +85,9 @@ Patch10:        nautilus-gvfs-desktop-ke
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# from upstream
+Patch20:        nautilus-dupe-id.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -121,6 +124,7 @@ for developing nautilus extensions.
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch20 -p1 -b .dupe-id
 
 %build
 
@@ -261,6 +265,9 @@ fi
 
 
 %changelog
+* Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-2
+- Make nautilus-file-management-properties not crash on start
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Update to 2.27.91
 



From emaldonado at fedoraproject.org  Thu Aug 27 00:17:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 00:17:08 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.6,1.7
Message-ID: <20090827001708.3E48211C0078@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6076

Modified Files:
	nss-util.spec 
Log Message:
bump to a unique nvra


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nss-util.spec	26 Aug 2009 23:52:27 -0000	1.6
+++ nss-util.spec	27 Aug 2009 00:17:08 -0000	1.7
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-Release:          11%{?dist}
+Release:          12%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -202,6 +202,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-12
+- bump to unique nvr
+
 * Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-11
 - Remove spurious executable permissions from nss-util-config
 - Shorten some descriptions to keep rpmlint happy



From bpepple at fedoraproject.org  Thu Aug 27 00:31:12 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 27 Aug 2009 00:31:12 +0000 (UTC)
Subject: rpms/empathy/devel empathy.spec,1.71,1.72
Message-ID: <20090827003112.4445A11C0078@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7593

Modified Files:
	empathy.spec 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-3
- Sigh.. let's drop the requires on mission-control-devel in the devel sub.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- empathy.spec	26 Aug 2009 22:10:42 -0000	1.71
+++ empathy.spec	27 Aug 2009 00:31:11 -0000	1.72
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.91.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -105,7 +105,6 @@ Requires:	pkgconfig
 ## as pkgconfig dependencies...
 Requires:	glib2-devel >= %{glib2_min_version}
 Requires:	telepathy-glib-devel >= %{tp_glib_min_version}
-Requires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 Requires:	libxml2-devel
 
 %description	devel
@@ -247,6 +246,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-3
+- Sigh.. let's drop the requires on mission-control-devel in the devel sub.
+
 * Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-2
 - Update broken pkgconfig patch to not include libmissioncontrol.
 - Drop BR on telepathy-mission-control-devel. mc is a runtime dep.



From ivazquez at fedoraproject.org  Thu Aug 27 01:18:00 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Thu, 27 Aug 2009 01:18:00 +0000 (UTC)
Subject: rpms/pywebkitgtk/devel .cvsignore, 1.3, 1.4 pywebkitgtk.spec, 1.9, 
	1.10 sources, 1.3, 1.4
Message-ID: <20090827011800.407A411C0078@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/pywebkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13183

Modified Files:
	.cvsignore pywebkitgtk.spec sources 
Log Message:
Updated to 1.1.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 06:20:31 -0000	1.3
+++ .cvsignore	27 Aug 2009 01:17:59 -0000	1.4
@@ -1 +1 @@
-pywebkitgtk-1.0.1.tar.gz
+pywebkitgtk-1.1.6.tar.gz


Index: pywebkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/devel/pywebkitgtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pywebkitgtk.spec	27 Jul 2009 01:38:06 -0000	1.9
+++ pywebkitgtk.spec	27 Aug 2009 01:17:59 -0000	1.10
@@ -1,15 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pywebkitgtk
-Version:        1.0.1
-Release:        7%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        Python Bindings for WebKit-gtk
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://code.google.com/p/pywebkitgtk/
 Source0:        http://pywebkitgtk.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         pywebkitgtk-python26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildArch:      
@@ -24,7 +23,6 @@ that they can access to using the Python
 
 %prep
 %setup -q
-%patch0 -p1
 chmod -x demos/*
 
 %build
@@ -34,7 +32,7 @@ make %{?_smp_mflags} PYGTK_CODEGEN=pygob
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
+find $RPM_BUILD_ROOT \( -name \*.la -o -name \*.a \) -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,10 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README demos
-%{_datadir}/pygtk/2.0/defs/webkit.defs
-%{python_sitearch}/gtk-2.0/*
+%{_datadir}/pywebkitgtk/defs/webkit-*.defs
+%{python_sitearch}/webkit-1.0
 
 %changelog
+* Wed Aug 26 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-1
+- Updated to 1.1.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 06:20:31 -0000	1.3
+++ sources	27 Aug 2009 01:18:00 -0000	1.4
@@ -1 +1 @@
-26343c95f3f381a7f4f6e1cb63ce237d  pywebkitgtk-1.0.1.tar.gz
+883f3d7386d29b6c0d00155329041854  pywebkitgtk-1.1.6.tar.gz



From ausil at fedoraproject.org  Thu Aug 27 01:35:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 27 Aug 2009 01:35:36 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.16,1.17
Message-ID: <20090827013536.EDE8D11C0078@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14479

Modified Files:
	dracut.spec 
Log Message:
really make it noarch again



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dracut.spec	26 Aug 2009 20:33:06 -0000	1.16
+++ dracut.spec	27 Aug 2009 01:35:36 -0000	1.17
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.9
-Release: 5%{?rdist}
+Release: 6%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -48,6 +48,7 @@ Requires: kbd
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
+BuildArch: noarch
 %endif
 
 %description
@@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Aug 26 2009 Dennis Gilmore <dennis at ausil.us> 0.9-6
+- add BuildArch: noarch to actually make dracut noarch again
+
 * Wed Aug 26 2009 Karsten Hopp <karsten at redhat.com> 0.9-5
 - make it noarch again, just excluding kbd on s390x doesn't
   work as code needs to be changed as well.



From mclasen at fedoraproject.org  Thu Aug 27 01:57:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 27 Aug 2009 01:57:08 +0000 (UTC)
Subject: rpms/seahorse/devel seahorse-button-images.patch, NONE,
	1.1 seahorse.spec, 1.78, 1.79
Message-ID: <20090827015708.C095811C0078@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17257

Modified Files:
	seahorse.spec 
Added Files:
	seahorse-button-images.patch 
Log Message:
Respect button-images setting


seahorse-button-images.patch:
 pgp/seahorse-pgp-generate.xml       |   44 +----------
 src/seahorse-generate-select.xml    |   67 +-----------------
 src/seahorse-keyserver-search.xml   |   44 +----------
 src/seahorse-keyserver-sync.xml     |  134 +++---------------------------------
 ssh/seahorse-ssh-generate.xml       |   69 ++----------------
 ssh/seahorse-ssh-key-properties.xml |   88 +++--------------------
 ssh/seahorse-ssh-upload.xml         |   67 +-----------------
 7 files changed, 64 insertions(+), 449 deletions(-)

--- NEW FILE seahorse-button-images.patch ---
diff -up seahorse-2.27.90/pgp/seahorse-pgp-generate.xml.button-images seahorse-2.27.90/pgp/seahorse-pgp-generate.xml
--- seahorse-2.27.90/pgp/seahorse-pgp-generate.xml.button-images	2009-08-26 21:39:37.422275977 -0400
+++ seahorse-2.27.90/pgp/seahorse-pgp-generate.xml	2009-08-26 21:40:45.744025040 -0400
@@ -2,6 +2,10 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="create-image">
+    <property name="stock">gtk-ok</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">2048</property>
     <property name="lower">512</property>
@@ -390,43 +394,9 @@
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Generate a new key</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox1">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-ok</property>
-                            <property name="icon-size">4</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label44">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_reate</property>
-                            <property name="use_underline">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>
+                <property name="image">create-image</property>
+                <property name="label" translatable="yes">C_reate</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff -up seahorse-2.27.90/src/seahorse-generate-select.xml.button-images seahorse-2.27.90/src/seahorse-generate-select.xml
--- seahorse-2.27.90/src/seahorse-generate-select.xml.button-images	2009-08-26 21:36:47.399038000 -0400
+++ seahorse-2.27.90/src/seahorse-generate-select.xml	2009-08-26 21:38:14.801034610 -0400
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="continue-image">
+    <property name="stock">gtk-go-forward</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkDialog" id="generate-select">
     <property name="border_width">6</property>
     <property name="visible">True</property>
@@ -47,66 +51,9 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-go-forward</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_ontinue</property>
-                            <property name="use_underline">True</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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">continue-image</property>
+                <property name="label" translatable="yes">C_ontinue</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
           </object>
diff -up seahorse-2.27.90/src/seahorse-keyserver-search.xml.button-images seahorse-2.27.90/src/seahorse-keyserver-search.xml
--- seahorse-2.27.90/src/seahorse-keyserver-search.xml.button-images	2009-08-26 21:25:59.739022563 -0400
+++ seahorse-2.27.90/src/seahorse-keyserver-search.xml	2009-08-26 21:27:26.426024597 -0400
@@ -2,6 +2,10 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="search-image">
+    <property name="stock">gtk-find</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkDialog" id="keyserver-search">
     <property name="visible">True</property>
     <property name="border_width">5</property>
@@ -211,44 +215,10 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="image">search-image</property>
+                <property name="label" translatable="yes">_Search</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_keyserver_search_ok_clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment4">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox7">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image5">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-find</property>
-                            <property name="icon-size">4</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label14">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Search</property>
-                            <property name="use_underline">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>
               <packing>
                 <property name="expand">False</property>
diff -up seahorse-2.27.90/src/seahorse-keyserver-sync.xml.button-images seahorse-2.27.90/src/seahorse-keyserver-sync.xml
--- seahorse-2.27.90/src/seahorse-keyserver-sync.xml.button-images	2009-08-26 21:28:57.566027136 -0400
+++ seahorse-2.27.90/src/seahorse-keyserver-sync.xml	2009-08-26 21:31:55.773285847 -0400
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="configure-image">
+    <property name="stock">gtk-properties</property>
+    <property name="icon_size">4</property>
+  </object>
+  <object class="GtkImage" id="sync-image">
+    <property name="stock">gtk-refresh</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkDialog" id="keyserver-sync">
     <property name="border_width">5</property>
     <property name="visible">True</property>
@@ -34,67 +42,10 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
+                <property name="image">configure-image</property>
+                <property name="label" translatable="yes">_Key Servers</property>
+                <property name="use_underline">True</property>
                 <signal handler="on_sync_configure_clicked" last_modification_time="Sun, 03 Apr 2005 22:45:26 GMT" name="clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox5">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image4">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-properties</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label12">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Key Servers</property>
-                            <property name="use_underline">True</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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
             </child>
             <child>
@@ -118,67 +69,10 @@
                 <property name="has_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
+                <property name="image">sync-image</property>
+                <property name="label" translatable="yes">_Sync</property>
+                <property name="use_underline">True</property>
                 <signal handler="on_sync_ok_clicked" last_modification_time="Wed, 31 Dec 2003 00:41:45 GMT" name="clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment4">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox6">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image5">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-refresh</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Sync</property>
-                            <property name="use_underline">True</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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
diff -up seahorse-2.27.90/ssh/seahorse-ssh-generate.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-generate.xml
--- seahorse-2.27.90/ssh/seahorse-ssh-generate.xml.button-images	2009-08-26 21:42:10.095030435 -0400
+++ seahorse-2.27.90/ssh/seahorse-ssh-generate.xml	2009-08-26 21:47:24.770274900 -0400
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="create-image">
+    <property name="stock">gtk-ok</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">8192</property>
     <property name="lower">512</property>
@@ -80,66 +84,9 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment6">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox3">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-ok</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label55">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Create and Set Up</property>
-                            <property name="use_underline">True</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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">create-image</property>
+                <property name="label" translatable="yes">_Create and Set Up</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
           </object>
@@ -195,7 +142,7 @@
                     <property name="homogeneous">False</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkHBox" id="hbox4">
+                      <object class="GtkHBox" id="hbox41">
                         <property name="visible">True</property>
                         <property name="homogeneous">False</property>
                         <property name="spacing">12</property>
diff -up seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml
--- seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml.button-images	2009-08-26 21:18:32.452275545 -0400
+++ seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml	2009-08-26 21:23:55.993025066 -0400
@@ -2,6 +2,14 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="passphrase-image">
+    <property name="stock">gtk-edit</property>
+    <property name="icon-size">4</property>
+  </object>
+  <object class="GtkImage" id="export-image">
+    <property name="stock">gtk-save-as</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkDialog" id="ssh-key-properties">
     <property name="visible">True</property>
     <property name="border_width">5</property>
@@ -190,44 +198,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="image">passphrase-image</property>
+                        <property name="label" translatable="yes">Change _Passphrase</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_ssh_passphrase_button_clicked"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment43">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox58">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image38">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-edit</property>
-                                    <property name="icon-size">4</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label22224">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Change _Passphrase</property>
-                                    <property name="use_underline">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>
                     </child>
                   </object>
@@ -494,44 +468,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="image">export-image</property>
+                        <property name="label" translatable="yes">E_xport Complete Key</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_ssh_export_button_clicked"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment45">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox59">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image39">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-save-as</property>
-                                    <property name="icon-size">4</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label22225">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">E_xport Complete Key</property>
-                                    <property name="use_underline">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>
                     </child>
                   </object>
diff -up seahorse-2.27.90/ssh/seahorse-ssh-upload.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-upload.xml
--- seahorse-2.27.90/ssh/seahorse-ssh-upload.xml.button-images	2009-08-26 21:35:42.777271303 -0400
+++ seahorse-2.27.90/ssh/seahorse-ssh-upload.xml	2009-08-26 21:35:22.230287488 -0400
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="setup-image">
+    <property name="stock">gtk-go-up</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkDialog" id="ssh-upload">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Set Up Computer for SSH Connection</property>
@@ -48,66 +52,9 @@
                 <property name="has_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox4">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-go-up</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label6">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Set Up</property>
-                            <property name="use_underline">True</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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">setup-image</property>
+                <property name="label" translatable="yes">_Set Up</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
           </object>


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- seahorse.spec	11 Aug 2009 04:12:54 -0000	1.78
+++ seahorse.spec	27 Aug 2009 01:57:08 -0000	1.79
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.27.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -10,6 +10,9 @@ URL:            http://projects.gnome.or
 Source:         http://download.gnome.org/sources/seahorse/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=593247
+Patch0:		seahorse-button-images.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
@@ -59,6 +62,7 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-images
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -163,6 +167,9 @@ fi
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-2
+- Make seahorse respect the button-images setting
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 



From lennart at fedoraproject.org  Thu Aug 27 02:27:20 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 27 Aug 2009 02:27:20 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.14, 1.15 libcanberra.spec, 1.32,
	1.33 sources, 1.16, 1.17
Message-ID: <20090827022720.69D4511C0078@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20255

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	5 Aug 2009 01:32:54 -0000	1.14
+++ .cvsignore	27 Aug 2009 02:27:20 -0000	1.15
@@ -1 +1 @@
-libcanberra-0.15.tar.gz
+libcanberra-0.16.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libcanberra.spec	5 Aug 2009 01:34:12 -0000	1.32
+++ libcanberra.spec	27 Aug 2009 02:27:20 -0000	1.33
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.15
-Release: 2%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Aug 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.16-1
+- New version 0.16
+
 * Wed Aug 5 2009 Lennart Poettering <lpoetter at redhat.com> 0.15-2
 - Fix mistag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	5 Aug 2009 01:32:54 -0000	1.16
+++ sources	27 Aug 2009 02:27:20 -0000	1.17
@@ -1 +1 @@
-1f0a67c851693a45e0a48ae6142539cc  libcanberra-0.15.tar.gz
+f93e49442e336e3e99cd6f33a7373b8b  libcanberra-0.16.tar.gz



From rdieter at fedoraproject.org  Thu Aug 27 02:36:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 02:36:23 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.17,
	1.18 koffice-langpack.spec, 1.23, 1.24 sources, 1.18, 1.19
Message-ID: <20090827023623.2BE7E11C0078@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.81-1
- koffice-l10n-2.0.81



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	24 May 2009 07:24:37 -0000	1.17
+++ .cvsignore	27 Aug 2009 02:36:22 -0000	1.18
@@ -1,26 +1,26 @@
-koffice-l10n-ca-2.0.0.tar.bz2
-koffice-l10n-cs-2.0.0.tar.bz2
-koffice-l10n-da-2.0.0.tar.bz2
-koffice-l10n-de-2.0.0.tar.bz2
-koffice-l10n-el-2.0.0.tar.bz2
-koffice-l10n-en_GB-2.0.0.tar.bz2
-koffice-l10n-es-2.0.0.tar.bz2
-koffice-l10n-et-2.0.0.tar.bz2
-koffice-l10n-fr-2.0.0.tar.bz2
-koffice-l10n-fy-2.0.0.tar.bz2
-koffice-l10n-gl-2.0.0.tar.bz2
-koffice-l10n-hi-2.0.0.tar.bz2
-koffice-l10n-it-2.0.0.tar.bz2
-koffice-l10n-ja-2.0.0.tar.bz2
-koffice-l10n-kk-2.0.0.tar.bz2
-koffice-l10n-nds-2.0.0.tar.bz2
-koffice-l10n-nl-2.0.0.tar.bz2
-koffice-l10n-pl-2.0.0.tar.bz2
-koffice-l10n-pt-2.0.0.tar.bz2
-koffice-l10n-pt_BR-2.0.0.tar.bz2
-koffice-l10n-sv-2.0.0.tar.bz2
-koffice-l10n-tr-2.0.0.tar.bz2
-koffice-l10n-uk-2.0.0.tar.bz2
-koffice-l10n-wa-2.0.0.tar.bz2
-koffice-l10n-zh_CN-2.0.0.tar.bz2
-koffice-l10n-zh_TW-2.0.0.tar.bz2
+koffice-l10n-ca-2.0.81.tar.bz2
+koffice-l10n-da-2.0.81.tar.bz2
+koffice-l10n-de-2.0.81.tar.bz2
+koffice-l10n-el-2.0.81.tar.bz2
+koffice-l10n-en_GB-2.0.81.tar.bz2
+koffice-l10n-es-2.0.81.tar.bz2
+koffice-l10n-et-2.0.81.tar.bz2
+koffice-l10n-fr-2.0.81.tar.bz2
+koffice-l10n-fy-2.0.81.tar.bz2
+koffice-l10n-gl-2.0.81.tar.bz2
+koffice-l10n-hi-2.0.81.tar.bz2
+koffice-l10n-it-2.0.81.tar.bz2
+koffice-l10n-ja-2.0.81.tar.bz2
+koffice-l10n-kk-2.0.81.tar.bz2
+koffice-l10n-nb-2.0.81.tar.bz2
+koffice-l10n-nds-2.0.81.tar.bz2
+koffice-l10n-nl-2.0.81.tar.bz2
+koffice-l10n-pl-2.0.81.tar.bz2
+koffice-l10n-pt-2.0.81.tar.bz2
+koffice-l10n-pt_BR-2.0.81.tar.bz2
+koffice-l10n-sv-2.0.81.tar.bz2
+koffice-l10n-tr-2.0.81.tar.bz2
+koffice-l10n-uk-2.0.81.tar.bz2
+koffice-l10n-wa-2.0.81.tar.bz2
+koffice-l10n-zh_CN-2.0.81.tar.bz2
+koffice-l10n-zh_TW-2.0.81.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- koffice-langpack.spec	25 Jul 2009 04:43:12 -0000	1.23
+++ koffice-langpack.spec	27 Aug 2009 02:36:22 -0000	1.24
@@ -1,10 +1,10 @@
 
-%define koffice_core_version 2.0.0 
+%define koffice_core_version 2:2.0.81
 
 Name:           koffice-langpack
 Epoch:          1
-Version:        2.0.0 
-Release:        2%{?dist}
+Version:        2.0.81
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
@@ -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
@@ -36,14 +36,14 @@ Source18:ftp://ftp.kde.org/pub/kde/stabl
 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-hu-%{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
 #Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
 #Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
 #Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
-#Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
 Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nds-%{version}.tar.bz2
 #Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ne-%{version}.tar.bz2
 Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nl-%{version}.tar.bz2
@@ -479,7 +479,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 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 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
 
 
 %build
@@ -542,10 +542,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,-)
@@ -624,6 +624,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
 
+#files hne
+#defattr(-,root,root,-)
+#lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
+
 #files hu
 #defattr(-,root,root,-)
 #lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
@@ -657,10 +661,10 @@ rm -rf %{buildroot}
 #defattr(-,root,root,-)
 #lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
 
-#files nb
-#defattr(-,root,root,-)
-#lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
-#lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
+%files nb
+%defattr(-,root,root,-)
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_kde4_appsdir}/koffice/autocorrect/nb.xml
 
 %files nds
 %defattr(-,root,root,-)
@@ -749,6 +753,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.81-1
+- koffice-l10n-2.0.81
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	24 May 2009 07:24:37 -0000	1.18
+++ sources	27 Aug 2009 02:36:22 -0000	1.19
@@ -1,26 +1,26 @@
-7e61feb4e5c32d5ae817aef34dafd8b1  koffice-l10n-ca-2.0.0.tar.bz2
-f81c2c17674454c21ede7d5c82773ee0  koffice-l10n-cs-2.0.0.tar.bz2
-4f7121341819aca845aa9b8b12bd9747  koffice-l10n-da-2.0.0.tar.bz2
-6845f0fb437a8bbe739b9254e69e2ef1  koffice-l10n-de-2.0.0.tar.bz2
-600caa5345128ca6181f2357a67fc040  koffice-l10n-el-2.0.0.tar.bz2
-004bb2085722a5f465ccb76460db9ab0  koffice-l10n-en_GB-2.0.0.tar.bz2
-7c45fac6ceb65dddbd3ae546ee0e3c06  koffice-l10n-es-2.0.0.tar.bz2
-49c8e96420aae0efee0c611935c022ed  koffice-l10n-et-2.0.0.tar.bz2
-a76dd799ebc36d2a2846004668ceedcd  koffice-l10n-fr-2.0.0.tar.bz2
-b13eaf9aa3f78189570422b2f9be26a0  koffice-l10n-fy-2.0.0.tar.bz2
-f7c74044666750b29fa4edd88f5e7c6d  koffice-l10n-gl-2.0.0.tar.bz2
-f9bf27db87c6ad69f5cd5f445336f565  koffice-l10n-hi-2.0.0.tar.bz2
-939e60c227ce44204095bee6f6515d19  koffice-l10n-it-2.0.0.tar.bz2
-99f5cec5b8d0e0a63a0c5b4e4ae2cdda  koffice-l10n-ja-2.0.0.tar.bz2
-25999c29aeb24d5838daae37ca3b92a6  koffice-l10n-kk-2.0.0.tar.bz2
-2100fd88ab940ec712821cb15b9acd17  koffice-l10n-nds-2.0.0.tar.bz2
-89f5a6eaae91013a7dee16f8508a97d2  koffice-l10n-nl-2.0.0.tar.bz2
-b0fd4ebbef5c02d35dc645d3d4706cfa  koffice-l10n-pl-2.0.0.tar.bz2
-90aeebb3799290a18d93412422196c80  koffice-l10n-pt-2.0.0.tar.bz2
-f77e99aa5760fffe5b6e34a302385fd1  koffice-l10n-pt_BR-2.0.0.tar.bz2
-39e5eecfa1188077cc4f8295d7e84c63  koffice-l10n-sv-2.0.0.tar.bz2
-e1c0e18996f26d6f2a8f777785345ba2  koffice-l10n-tr-2.0.0.tar.bz2
-08e4a2a8859329093b00c8ba4605eaa8  koffice-l10n-uk-2.0.0.tar.bz2
-386061b730d3f8544c483ccae85e98ab  koffice-l10n-wa-2.0.0.tar.bz2
-dd7083811844dc7d1e6712e84e391e5d  koffice-l10n-zh_CN-2.0.0.tar.bz2
-fbf23c6154c05ac1fc69285654574cfd  koffice-l10n-zh_TW-2.0.0.tar.bz2
+db9baa264391d866725da109723d89b4  koffice-l10n-ca-2.0.81.tar.bz2
+1998b9e900c2de9034959a1dd8c98f5d  koffice-l10n-da-2.0.81.tar.bz2
+30a568c728ad4f797723de6ebca87e06  koffice-l10n-de-2.0.81.tar.bz2
+5ab5cda56fdc1f67178918b305623c4c  koffice-l10n-el-2.0.81.tar.bz2
+eff3234347f61218d3de0ab8b160cd7d  koffice-l10n-en_GB-2.0.81.tar.bz2
+83a7349cbdfa2ff12a8bbf8b43f5eae1  koffice-l10n-es-2.0.81.tar.bz2
+92de9995d889d59750f042dc1504d38d  koffice-l10n-et-2.0.81.tar.bz2
+52c7f04e1563c8b178999404d4b7e9cf  koffice-l10n-fr-2.0.81.tar.bz2
+77343801b21a3e14b1b4ee53be689deb  koffice-l10n-fy-2.0.81.tar.bz2
+6e5604fcb3265752bf10ff580777e221  koffice-l10n-gl-2.0.81.tar.bz2
+236c53e26745977f467b8d6058cab3ad  koffice-l10n-hi-2.0.81.tar.bz2
+6501bfc47e9e6a9a115975d13a5f649d  koffice-l10n-it-2.0.81.tar.bz2
+56454c98e0589ddc0ceb091a5a169915  koffice-l10n-ja-2.0.81.tar.bz2
+a7d4ed8906c65e88ff4e38df49a73231  koffice-l10n-kk-2.0.81.tar.bz2
+634aec6798c24a985796a40c475f9282  koffice-l10n-nb-2.0.81.tar.bz2
+1fe7fe871a8012b212c267e478224366  koffice-l10n-nds-2.0.81.tar.bz2
+04b952cc7450521747c047bdbe76a0fa  koffice-l10n-nl-2.0.81.tar.bz2
+9fe45a42ba8eb5963a764aa49fda3ce1  koffice-l10n-pl-2.0.81.tar.bz2
+8bb7a72c2eabca106542b16259cb034a  koffice-l10n-pt-2.0.81.tar.bz2
+c8ce97df4335edc57dca805f5ec9f737  koffice-l10n-pt_BR-2.0.81.tar.bz2
+9e3e2c67589956901866974c1d9a5e8c  koffice-l10n-sv-2.0.81.tar.bz2
+1e162ffbd40f83445e4d3d81cca5d531  koffice-l10n-tr-2.0.81.tar.bz2
+ecf805a6d20ef12e87cc4b6703821d9b  koffice-l10n-uk-2.0.81.tar.bz2
+cce0ec7edb8b2ed9f2f7fe6c6012cafe  koffice-l10n-wa-2.0.81.tar.bz2
+d4a826a498699bc286119b30d88de5d2  koffice-l10n-zh_CN-2.0.81.tar.bz2
+a95b6256e50cf4a3ca9e522fbd529bc0  koffice-l10n-zh_TW-2.0.81.tar.bz2



From mclasen at fedoraproject.org  Thu Aug 27 02:45:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 27 Aug 2009 02:45:17 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-non-interactive-mounts.patch, NONE,
	1.1 gvfs.spec, 1.152, 1.153
Message-ID: <20090827024517.158D811C0078@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21439

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-non-interactive-mounts.patch 
Log Message:
don't mount interactively during login


gvfs-non-interactive-mounts.patch:
 configure.ac             |    2 -
 monitor/gdu/ggduvolume.c |   75 +++++++++++++----------------------------------
 2 files changed, 22 insertions(+), 55 deletions(-)

--- NEW FILE gvfs-non-interactive-mounts.patch ---
diff --git a/configure.ac b/configure.ac
index 9bfb8ad..887cf95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,7 +236,7 @@ AC_ARG_ENABLE(gdu, [  --disable-gdu           build without GDU volume monitor])
 msg_gdu=no
 GDU_LIBS=
 GDU_CFLAGS=
-GDU_REQUIRED=0.4
+GDU_REQUIRED=0.5
 
 if test "x$enable_gdu" != "xno"; then
   PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes)
diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index a20b0bb..865a7b7 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -337,51 +337,12 @@ update_volume (GGduVolume *volume)
             volume->should_automount = FALSE;
         }
 
-      /* Avoid automounting volumes from
-       *
-       * 1. drives on a 'virtual' or unset bus
-       * 2. volumes without a drive
-       *
-       * This is to avoid interference with things like Fedora's
-       * livecd-tools that use device-mapper to set up images. See
-       * https://bugzilla.redhat.com/show_bug.cgi?id=494144 for more
-       * background.
-       *
-       * In the future we might want to relax 1. so automounting
-       * things like Linux MD and LVM2 devices work.
+      /* Respect the presentation hint for whether the volume should be automounted - normally
+       * nopolicy is only FALSE for "physical" devices - e.g. only "physical" devices will
+       * be set to be automounted.
        */
-      if (volume->drive != NULL)
-        {
-          GduPresentable *drive_presentable;
-          drive_presentable = g_gdu_drive_get_presentable (volume->drive);
-          if (drive_presentable != NULL)
-            {
-              GduDevice *drive_device;
-              drive_device = gdu_presentable_get_device (drive_presentable);
-              if (drive_device != NULL)
-                {
-                  const gchar *bus;
-                  bus = gdu_device_drive_get_connection_interface (drive_device);
-                  if (bus == NULL || strlen (bus) == 0 || g_strcmp0 (bus, "virtual") == 0)
-                    {
-                      volume->should_automount = FALSE;
-                    }
-                  g_object_unref (drive_device);
-                }
-              else
-                {
-                  volume->should_automount = FALSE;
-                }
-            }
-          else
-            {
-              volume->should_automount = FALSE;
-            }
-        }
-      else
-        {
-          volume->should_automount = FALSE;
-        }
+      if (gdu_device_get_presentation_nopolicy (device))
+        volume->should_automount = FALSE;
 
       g_free (activation_uri);
     }
@@ -650,22 +611,28 @@ g_gdu_volume_get_mount (GVolume *volume)
 /* ---------------------------------------------------------------------------------------------------- */
 
 static gchar **
-get_mount_options (GduDevice *device)
+get_mount_options (GduDevice *device,
+                   gboolean   allow_user_interaction)
 {
-  gchar **ret;
+  GPtrArray *p;
+
+  p = g_ptr_array_new ();
 
   /* one day we might read this from user settings */
   if (g_strcmp0 (gdu_device_id_get_usage (device), "filesystem") == 0 &&
       g_strcmp0 (gdu_device_id_get_type (device), "vfat") == 0)
     {
-      ret = g_new0 (gchar *, 2);
-      ret[0] = g_strdup ("flush");
-      ret[1] = NULL;
+      g_ptr_array_add (p, g_strdup ("flush"));
     }
-  else
-    ret = NULL;
 
-  return ret;
+  if (!allow_user_interaction)
+    {
+      g_ptr_array_add (p, g_strdup ("auth_no_user_interaction"));
+    }
+
+  g_ptr_array_add (p, NULL);
+
+  return (gchar **) g_ptr_array_free (p, FALSE);
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -787,7 +754,7 @@ mount_cleartext_device (MountOpData *data,
   else
     {
       gchar **mount_options;
-      mount_options = get_mount_options (data->device_to_mount);
+      mount_options = get_mount_options (data->device_to_mount, data->mount_operation != NULL);
       gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
       g_strfreev (mount_options);
     }
@@ -1205,7 +1172,7 @@ g_gdu_volume_mount (GVolume             *_volume,
     {
       gchar **mount_options;
       data->device_to_mount = g_object_ref (device);
-      mount_options = get_mount_options (data->device_to_mount);
+      mount_options = get_mount_options (data->device_to_mount, data->mount_operation != NULL);
       gdu_device_op_filesystem_mount (data->device_to_mount, mount_options, mount_cb, data);
       g_strfreev (mount_options);
     }


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- gvfs.spec	24 Aug 2009 22:46:44 -0000	1.152
+++ gvfs.spec	27 Aug 2009 02:45:16 -0000	1.153
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -38,6 +38,8 @@ Patch1: gvfs-archive-integration.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
 Patch10: 0001-Add-AFC-backend.patch
 
+Patch11: gvfs-non-interactive-mounts.patch
+
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -130,6 +132,7 @@ and iPod Touches to applications using g
 %setup -q
 %patch1 -p1 -b .archive-integration
 %patch10 -p1 -b .afc
+%patch11 -p1 -b .non-interactive-mounts
 
 %build
 
@@ -283,7 +286,10 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
-* Mon Aug 24 2009 Matthias Clasne <mclasen at redhat.com> - 1.3.5-1
+* Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.5-2
+- Don't mount interactively during login
+
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.5-1
 - Update to 1.3.5
 
 * Mon Aug 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.4-7



From mtasaka at fedoraproject.org  Thu Aug 27 02:48:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 02:48:14 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria-0.6.5-deastore-author-missing.patch,
	NONE, 1.1 alexandria.spec, 1.29, 1.30
Message-ID: <20090827024814.C9A3211C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22443/F-10

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.5-deastore-author-missing.patch 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
- Add sanity check for invalid search result, now using upstream patch
- Fix DeaStore provider where search result contains no Author


alexandria-0.6.5-deastore-author-missing.patch:
 deastore.rb |   61 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 14 deletions(-)

--- NEW FILE alexandria-0.6.5-deastore-author-missing.patch ---
Index: lib/alexandria/book_providers/deastore.rb
===================================================================
--- lib/alexandria/book_providers/deastore.rb	(revision 1086)
+++ lib/alexandria/book_providers/deastore.rb	(revision 1087)
@@ -49,12 +49,18 @@
       def get_book_from_search_result(result)
         log.debug { "Fetching book from #{result[:url]}" }
         html_data = agent.get(result[:url])
+        #File.open("rsltflarn#{Time.now().usec()}.html", 'wb') do |f|
+        #  f.write(html_data.body)
+        #end
         parse_result_data(html_data.body)
       end
 
       def search(criterion, type)
         criterion = criterion.convert("ISO-8859-1", "UTF-8") # still needed??
         html_data = agent.get(create_search_uri(type, criterion))
+        #File.open("flarn#{Time.now().usec()}.html", 'wb') do |f|
+        #  f.write(html_data.body)
+        #end
         results = parse_search_result_data(html_data.body)
         raise NoResultsError if results.empty?
 
@@ -89,7 +95,9 @@
           search_term_encoded = CGI.escape(search_term)
         end
 
-        BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        uri = BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        log.debug { uri }
+        uri
       end
 
       def parse_search_result_data(html)
@@ -109,13 +117,21 @@
             #  p Data di pubblicazione: \n     2009
             #  p.prezzo (price)
             
-            cover_url = ''
-            cover_images = div/'a/img'
-            unless cover_images.empty?
-              img = cover_images.first
-              image_url = img['src']
-              cover_url = "#{SITE}#{image_url}"
-            end
+#             cover_url = ''
+#             cover_images = div/'a/img'
+#             unless cover_images.empty?
+#               img = cover_images.first
+#               image_url = img['src']
+#               if image_url =~ /^http/
+#                 cover_url = '' # image_url
+#               elsif image_url[0..0] != '/'
+#                 cover_url = "#{SITE}/#{image_url}"
+#               else
+#                 cover_url = "#{SITE}#{image_url}"
+#               end
+#               log.debug { "Search Cover Image URL #{cover_url}" }
+
+#             end
             
             content = div/'div.scheda_content'
             title_link = (content/:a).first
@@ -167,12 +183,17 @@
           end
           
           # author(s)
+          authors = []
           author_span = data%'span.int_scheda[text()*=Autore]'
-          author_links = author_span/'a.info'
-          authors = []
-          author_links.each do |link|
-            authors << normalize(link.inner_text)
+          unless author_span
+            author_span = data%'span.int_scheda[text()*=cura]' # editor
           end
+          if author_span
+            author_links = author_span/'a.info'
+            author_links.each do |link|
+              authors << normalize(link.inner_text)
+            end
+          end
 
           # publisher
           publisher_par = data%'span.int_scheda[text()*=Editore]/..'
@@ -231,7 +252,19 @@
           #cover
           image_url = nil
           if cover_link
-            image_url = "#{SITE}#{cover_link}"
+            if cover_link =~ /^http/
+              # e.g. http://images.btol.com/ContentCafe/Jacket.aspx?\
+              # Return=1&amp;Type=M&amp;Value=9788873641803&amp;password=\
+              # CC70580&amp;userID=DEA40305
+              # seems not to work, or to be blank anyway, so set to nil
+              image_url = nil
+            elsif cover_link[0..0] != '/'
+              image_url = "#{SITE}/#{cover_link}"
+            else
+              image_url = "#{SITE}#{cover_link}"
+            end
+
+            log.debug { "Cover Image URL:: #{image_url}" }
           end
 
           book = Book.new(title, authors, isbn, publisher, publish_year, binding)
@@ -239,7 +272,7 @@
           return [book, image_url]
         rescue Exception => ex
           trace = ex.backtrace.join("\n> ")
-          log.error { "Failed parsing Siciliano product page #{ex.message}\n#{trace}" }
+          log.error { "Failed parsing DeaStore product page #{ex.message}\n#{trace}" }
           return nil        
         end
       end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- alexandria.spec	26 Aug 2009 17:44:17 -0000	1.29
+++ alexandria.spec	27 Aug 2009 02:48:14 -0000	1.30
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,8 +26,12 @@ Patch2:		alexandria-0.6.4.1-hang-importi
 # ref: alexandria-Bugs-26968
 Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 # Add some sanity check for search results
-# Currently discussed on alexandria-Bugs-27000
+# ref: alexandria-Bugs-27000
 Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+# Fix for DeaStore search engine where search result does not
+# contain Author item
+# ref: alexandria-Bugs-27000
+Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -80,6 +84,7 @@ Alexandria is a GNOME application to hel
 %patch2 -p0 -b .up25348
 %patch3 -p0 -b .glib
 %patch4 -p0 -b .sanity
+%patch5 -p0 -b .deastore
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,8 +211,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
-- Add trial sanity check again
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
+- Add sanity check for invalid search result, now using upstream patch
+- Fix DeaStore provider where search result contains no Author
 
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 



From mtasaka at fedoraproject.org  Thu Aug 27 02:48:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 02:48:14 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria-0.6.5-deastore-author-missing.patch,
	NONE, 1.1 alexandria.spec, 1.36, 1.37
Message-ID: <20090827024814.F191D11C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22443/F-11

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.5-deastore-author-missing.patch 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
- Add sanity check for invalid search result, now using upstream patch
- Fix DeaStore provider where search result contains no Author


alexandria-0.6.5-deastore-author-missing.patch:
 deastore.rb |   61 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 14 deletions(-)

--- NEW FILE alexandria-0.6.5-deastore-author-missing.patch ---
Index: lib/alexandria/book_providers/deastore.rb
===================================================================
--- lib/alexandria/book_providers/deastore.rb	(revision 1086)
+++ lib/alexandria/book_providers/deastore.rb	(revision 1087)
@@ -49,12 +49,18 @@
       def get_book_from_search_result(result)
         log.debug { "Fetching book from #{result[:url]}" }
         html_data = agent.get(result[:url])
+        #File.open("rsltflarn#{Time.now().usec()}.html", 'wb') do |f|
+        #  f.write(html_data.body)
+        #end
         parse_result_data(html_data.body)
       end
 
       def search(criterion, type)
         criterion = criterion.convert("ISO-8859-1", "UTF-8") # still needed??
         html_data = agent.get(create_search_uri(type, criterion))
+        #File.open("flarn#{Time.now().usec()}.html", 'wb') do |f|
+        #  f.write(html_data.body)
+        #end
         results = parse_search_result_data(html_data.body)
         raise NoResultsError if results.empty?
 
@@ -89,7 +95,9 @@
           search_term_encoded = CGI.escape(search_term)
         end
 
-        BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        uri = BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        log.debug { uri }
+        uri
       end
 
       def parse_search_result_data(html)
@@ -109,13 +117,21 @@
             #  p Data di pubblicazione: \n     2009
             #  p.prezzo (price)
             
-            cover_url = ''
-            cover_images = div/'a/img'
-            unless cover_images.empty?
-              img = cover_images.first
-              image_url = img['src']
-              cover_url = "#{SITE}#{image_url}"
-            end
+#             cover_url = ''
+#             cover_images = div/'a/img'
+#             unless cover_images.empty?
+#               img = cover_images.first
+#               image_url = img['src']
+#               if image_url =~ /^http/
+#                 cover_url = '' # image_url
+#               elsif image_url[0..0] != '/'
+#                 cover_url = "#{SITE}/#{image_url}"
+#               else
+#                 cover_url = "#{SITE}#{image_url}"
+#               end
+#               log.debug { "Search Cover Image URL #{cover_url}" }
+
+#             end
             
             content = div/'div.scheda_content'
             title_link = (content/:a).first
@@ -167,12 +183,17 @@
           end
           
           # author(s)
+          authors = []
           author_span = data%'span.int_scheda[text()*=Autore]'
-          author_links = author_span/'a.info'
-          authors = []
-          author_links.each do |link|
-            authors << normalize(link.inner_text)
+          unless author_span
+            author_span = data%'span.int_scheda[text()*=cura]' # editor
           end
+          if author_span
+            author_links = author_span/'a.info'
+            author_links.each do |link|
+              authors << normalize(link.inner_text)
+            end
+          end
 
           # publisher
           publisher_par = data%'span.int_scheda[text()*=Editore]/..'
@@ -231,7 +252,19 @@
           #cover
           image_url = nil
           if cover_link
-            image_url = "#{SITE}#{cover_link}"
+            if cover_link =~ /^http/
+              # e.g. http://images.btol.com/ContentCafe/Jacket.aspx?\
+              # Return=1&amp;Type=M&amp;Value=9788873641803&amp;password=\
+              # CC70580&amp;userID=DEA40305
+              # seems not to work, or to be blank anyway, so set to nil
+              image_url = nil
+            elsif cover_link[0..0] != '/'
+              image_url = "#{SITE}/#{cover_link}"
+            else
+              image_url = "#{SITE}#{cover_link}"
+            end
+
+            log.debug { "Cover Image URL:: #{image_url}" }
           end
 
           book = Book.new(title, authors, isbn, publisher, publish_year, binding)
@@ -239,7 +272,7 @@
           return [book, image_url]
         rescue Exception => ex
           trace = ex.backtrace.join("\n> ")
-          log.error { "Failed parsing Siciliano product page #{ex.message}\n#{trace}" }
+          log.error { "Failed parsing DeaStore product page #{ex.message}\n#{trace}" }
           return nil        
         end
       end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- alexandria.spec	26 Aug 2009 17:44:17 -0000	1.36
+++ alexandria.spec	27 Aug 2009 02:48:14 -0000	1.37
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,8 +26,12 @@ Patch2:		alexandria-0.6.4.1-hang-importi
 # ref: alexandria-Bugs-26968
 Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 # Add some sanity check for search results
-# Currently discussed on alexandria-Bugs-27000
+# ref: alexandria-Bugs-27000
 Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+# Fix for DeaStore search engine where search result does not
+# contain Author item
+# ref: alexandria-Bugs-27000
+Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -80,6 +84,7 @@ Alexandria is a GNOME application to hel
 %patch2 -p0 -b .up25348
 %patch3 -p0 -b .glib
 %patch4 -p0 -b .sanity
+%patch5 -p0 -b .deastore
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,8 +211,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
-- Add trial sanity check again
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
+- Add sanity check for invalid search result, now using upstream patch
+- Fix DeaStore provider where search result contains no Author
 
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 



From mtasaka at fedoraproject.org  Thu Aug 27 02:48:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 02:48:15 +0000 (UTC)
Subject: rpms/alexandria/devel
	alexandria-0.6.5-deastore-author-missing.patch, 
	NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, 1.1,
	1.2 alexandria.spec, 1.38, 1.39
Message-ID: <20090827024815.51A1B11C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22443/devel

Modified Files:
	alexandria-0.6.5-search-result-sanity-check.patch 
	alexandria.spec 
Added Files:
	alexandria-0.6.5-deastore-author-missing.patch 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
- Add sanity check for invalid search result, now using upstream patch
- Fix DeaStore provider where search result contains no Author


alexandria-0.6.5-deastore-author-missing.patch:
 deastore.rb |   61 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 14 deletions(-)

--- NEW FILE alexandria-0.6.5-deastore-author-missing.patch ---
Index: lib/alexandria/book_providers/deastore.rb
===================================================================
--- lib/alexandria/book_providers/deastore.rb	(revision 1086)
+++ lib/alexandria/book_providers/deastore.rb	(revision 1087)
@@ -49,12 +49,18 @@
       def get_book_from_search_result(result)
         log.debug { "Fetching book from #{result[:url]}" }
         html_data = agent.get(result[:url])
+        #File.open("rsltflarn#{Time.now().usec()}.html", 'wb') do |f|
+        #  f.write(html_data.body)
+        #end
         parse_result_data(html_data.body)
       end
 
       def search(criterion, type)
         criterion = criterion.convert("ISO-8859-1", "UTF-8") # still needed??
         html_data = agent.get(create_search_uri(type, criterion))
+        #File.open("flarn#{Time.now().usec()}.html", 'wb') do |f|
+        #  f.write(html_data.body)
+        #end
         results = parse_search_result_data(html_data.body)
         raise NoResultsError if results.empty?
 
@@ -89,7 +95,9 @@
           search_term_encoded = CGI.escape(search_term)
         end
 
-        BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        uri = BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        log.debug { uri }
+        uri
       end
 
       def parse_search_result_data(html)
@@ -109,13 +117,21 @@
             #  p Data di pubblicazione: \n     2009
             #  p.prezzo (price)
             
-            cover_url = ''
-            cover_images = div/'a/img'
-            unless cover_images.empty?
-              img = cover_images.first
-              image_url = img['src']
-              cover_url = "#{SITE}#{image_url}"
-            end
+#             cover_url = ''
+#             cover_images = div/'a/img'
+#             unless cover_images.empty?
+#               img = cover_images.first
+#               image_url = img['src']
+#               if image_url =~ /^http/
+#                 cover_url = '' # image_url
+#               elsif image_url[0..0] != '/'
+#                 cover_url = "#{SITE}/#{image_url}"
+#               else
+#                 cover_url = "#{SITE}#{image_url}"
+#               end
+#               log.debug { "Search Cover Image URL #{cover_url}" }
+
+#             end
             
             content = div/'div.scheda_content'
             title_link = (content/:a).first
@@ -167,12 +183,17 @@
           end
           
           # author(s)
+          authors = []
           author_span = data%'span.int_scheda[text()*=Autore]'
-          author_links = author_span/'a.info'
-          authors = []
-          author_links.each do |link|
-            authors << normalize(link.inner_text)
+          unless author_span
+            author_span = data%'span.int_scheda[text()*=cura]' # editor
           end
+          if author_span
+            author_links = author_span/'a.info'
+            author_links.each do |link|
+              authors << normalize(link.inner_text)
+            end
+          end
 
           # publisher
           publisher_par = data%'span.int_scheda[text()*=Editore]/..'
@@ -231,7 +252,19 @@
           #cover
           image_url = nil
           if cover_link
-            image_url = "#{SITE}#{cover_link}"
+            if cover_link =~ /^http/
+              # e.g. http://images.btol.com/ContentCafe/Jacket.aspx?\
+              # Return=1&amp;Type=M&amp;Value=9788873641803&amp;password=\
+              # CC70580&amp;userID=DEA40305
+              # seems not to work, or to be blank anyway, so set to nil
+              image_url = nil
+            elsif cover_link[0..0] != '/'
+              image_url = "#{SITE}/#{cover_link}"
+            else
+              image_url = "#{SITE}#{cover_link}"
+            end
+
+            log.debug { "Cover Image URL:: #{image_url}" }
           end
 
           book = Book.new(title, authors, isbn, publisher, publish_year, binding)
@@ -239,7 +272,7 @@
           return [book, image_url]
         rescue Exception => ex
           trace = ex.backtrace.join("\n> ")
-          log.error { "Failed parsing Siciliano product page #{ex.message}\n#{trace}" }
+          log.error { "Failed parsing DeaStore product page #{ex.message}\n#{trace}" }
           return nil        
         end
       end

alexandria-0.6.5-search-result-sanity-check.patch:
 book_providers.rb |    3 +++
 1 file changed, 3 insertions(+)

Index: alexandria-0.6.5-search-result-sanity-check.patch
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria-0.6.5-search-result-sanity-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alexandria-0.6.5-search-result-sanity-check.patch	19 Aug 2009 22:14:00 -0000	1.1
+++ alexandria-0.6.5-search-result-sanity-check.patch	27 Aug 2009 02:48:15 -0000	1.2
@@ -1,13 +1,13 @@
 Index: lib/alexandria/book_providers.rb
 ===================================================================
---- lib/alexandria/book_providers.rb	(revision 1085)
-+++ lib/alexandria/book_providers.rb	(working copy)
+--- lib/alexandria/book_providers.rb	(revision 1086)
++++ lib/alexandria/book_providers.rb	(revision 1087)
 @@ -46,6 +46,9 @@
          self.instance.notify_observers(:searching, factory.fullname) # new
          results = factory.search(criterion, type)
  
 +        # sanity check if at least one valid result is actually found
-+        results.delete_if { |book, cover| ((!book) || (!cover)) }
++        results.delete_if { |book, cover| book.nil? }
 +
          if results.length == 0
            self.instance.changed


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- alexandria.spec	26 Aug 2009 17:44:17 -0000	1.38
+++ alexandria.spec	27 Aug 2009 02:48:15 -0000	1.39
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,8 +26,12 @@ Patch2:		alexandria-0.6.4.1-hang-importi
 # ref: alexandria-Bugs-26968
 Patch3:		alexandria-0.6.5-glib_convert-syntax.patch
 # Add some sanity check for search results
-# Currently discussed on alexandria-Bugs-27000
+# ref: alexandria-Bugs-27000
 Patch4:		alexandria-0.6.5-search-result-sanity-check.patch
+# Fix for DeaStore search engine where search result does not
+# contain Author item
+# ref: alexandria-Bugs-27000
+Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -80,6 +84,7 @@ Alexandria is a GNOME application to hel
 %patch2 -p0 -b .up25348
 %patch3 -p0 -b .glib
 %patch4 -p0 -b .sanity
+%patch5 -p0 -b .deastore
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -206,8 +211,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-4
-- Add trial sanity check again
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
+- Add sanity check for invalid search result, now using upstream patch
+- Fix DeaStore provider where search result contains no Author
 
 * Fri Aug 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-3
 - Clarify GLib.convert usage in utils.rb (does not change the 



From rdieter at fedoraproject.org  Thu Aug 27 03:25:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 03:25:10 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.113,1.114
Message-ID: <20090827032510.28FD911C0078@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25987

Modified Files:
	koffice.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-2
- fix %files



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- koffice.spec	26 Aug 2009 22:21:34 -0000	1.113
+++ koffice.spec	27 Aug 2009 03:25:09 -0000	1.114
@@ -12,7 +12,7 @@
 Name:           koffice
 Epoch:          2 
 Version:        2.0.81
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -345,6 +345,13 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML
 rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
 %endif
 
+rm -f devel.list
+for lib in %{buildroot}%{_kde4_libdir}/lib*.so ; do
+if [ -L ${lib} ]; then
+  echo $lib | sed -e "s|^%{buildroot}||" >> devel.list
+fi
+done
+
 
 %check
 ## FIXME: fix validation errors
@@ -537,12 +544,9 @@ update-desktop-database -q &> /dev/null 
 %endif
 %{_kde4_libdir}/libpigmentcms.so.*
 
-%files devel
+%files -f devel.list devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-# FIXME: include only shlib symlinks we know/want to export
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
 
 %files kspread
@@ -771,6 +775,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_configdir}/kplatoworkrc
 %{_kde4_datadir}/config.kcfg/kplatosettings.kcfg
 %{_kde4_libdir}/libkdeinit4_kplato.so
+%{_kde4_libdir}/libkdeinit4_kplatowork.so
 %{_kde4_libdir}/kde4/libkplatopart.*
 %{_kde4_libdir}/kde4/libkplatoworkpart.so
 %{_kde4_libdir}/libkplato*.so.*
@@ -802,6 +807,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-2
+- fix %%files
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
 - koffice-2.0.81
 



From lennart at fedoraproject.org  Thu Aug 27 03:29:30 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 27 Aug 2009 03:29:30 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel .cvsignore, 1.5,
	1.6 sound-theme-freedesktop.spec, 1.11, 1.12 sources, 1.5, 1.6
Message-ID: <20090827032930.0C45011C0078@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/sound-theme-freedesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26422

Modified Files:
	.cvsignore sound-theme-freedesktop.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Aug 2009 18:43:41 -0000	1.5
+++ .cvsignore	27 Aug 2009 03:29:29 -0000	1.6
@@ -1 +1 @@
-sound-theme-freedesktop-0.4.tar.bz2
+sound-theme-freedesktop-0.5.tar.bz2


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sound-theme-freedesktop.spec	23 Aug 2009 18:43:41 -0000	1.11
+++ sound-theme-freedesktop.spec	27 Aug 2009 03:29:29 -0000	1.12
@@ -1,5 +1,5 @@
 Name: sound-theme-freedesktop
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sounds/freedesktop/stereo/*.ogg
 
 %changelog
+* Thu Aug 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.5-1
+- New upstream
+
 * Sun Aug 23 2009 Jon McCann <jmccann at redhat.com> 0.4-1
 - New release adds screen capture sound
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Aug 2009 18:43:41 -0000	1.5
+++ sources	27 Aug 2009 03:29:29 -0000	1.6
@@ -1 +1 @@
-c451bc443b53c1e3d6dc0151b5296800  sound-theme-freedesktop-0.4.tar.bz2
+2605db0f6769c057664e02fd8c9655d1  sound-theme-freedesktop-0.5.tar.bz2



From rdieter at fedoraproject.org  Thu Aug 27 04:01:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 04:01:45 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.114,1.115
Message-ID: <20090827040145.E061811C0078@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29121

Modified Files:
	koffice.spec 
Log Message:
fix %files some more



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- koffice.spec	27 Aug 2009 03:25:09 -0000	1.114
+++ koffice.spec	27 Aug 2009 04:01:45 -0000	1.115
@@ -698,6 +698,7 @@ update-desktop-database -q &> /dev/null 
 %files kformula
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kformula
+%{_kde4_libdir}/libkdeinit_kformula.so
 %{_kde4_libdir}/libkformulaprivate.so.*
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*



From rdieter at fedoraproject.org  Thu Aug 27 04:09:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 04:09:43 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.115,1.116
Message-ID: <20090827040943.11F3511C0073@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16893

Modified Files:
	koffice.spec 
Log Message:
arg



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- koffice.spec	27 Aug 2009 04:01:45 -0000	1.115
+++ koffice.spec	27 Aug 2009 04:09:42 -0000	1.116
@@ -698,7 +698,7 @@ update-desktop-database -q &> /dev/null 
 %files kformula
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit_kformula.so
+%{_kde4_libdir}/libkdeinit4_kformula.so
 %{_kde4_libdir}/libkformulaprivate.so.*
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*



From fabbione at fedoraproject.org  Thu Aug 27 04:43:32 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 27 Aug 2009 04:43:32 +0000 (UTC)
Subject: rpms/openais/devel .cvsignore, 1.17, 1.18 openais.spec, 1.48,
	1.49 sources, 1.18, 1.19
Message-ID: <20090827044332.2BDB911C0073@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release. Fixes 2 minor issues in SA CheckPoint service.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	8 Jul 2009 20:13:32 -0000	1.17
+++ .cvsignore	27 Aug 2009 04:43:31 -0000	1.18
@@ -1 +1 @@
-openais-1.0.0.tar.gz
+openais-1.0.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- openais.spec	28 Jul 2009 07:40:59 -0000	1.48
+++ openais.spec	27 Aug 2009 04:43:31 -0000	1.49
@@ -2,8 +2,8 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.0
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.0.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
@@ -155,6 +155,9 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* 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-3
 - spec file updates:
   * consistent use of macros across the board


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	8 Jul 2009 20:13:32 -0000	1.18
+++ sources	27 Aug 2009 04:43:31 -0000	1.19
@@ -1 +1 @@
-33c22a0da30a5a4dd091375839edbf07  openais-1.0.0.tar.gz
+dd40a6d6a89904e5e65116b560573aa7  openais-1.0.1.tar.gz



From fabbione at fedoraproject.org  Thu Aug 27 04:50:03 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 27 Aug 2009 04:50:03 +0000 (UTC)
Subject: rpms/openais/F-11 .cvsignore, 1.13, 1.14 openais.spec, 1.43,
	1.44 sources, 1.15, 1.16
Message-ID: <20090827045003.2F54F11C0498@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21114

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release. Fixes 2 minor issues in SA CheckPoint service.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	24 Mar 2009 08:30:17 -0000	1.13
+++ .cvsignore	27 Aug 2009 04:50:02 -0000	1.14
@@ -1 +1 @@
-openais-0.94.tar.gz
+openais-1.0.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/openais.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- openais.spec	28 Jul 2009 12:46:35 -0000	1.43
+++ openais.spec	27 Aug 2009 04:50:02 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -155,6 +155,9 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* 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
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	28 Jul 2009 12:46:35 -0000	1.15
+++ sources	27 Aug 2009 04:50:02 -0000	1.16
@@ -1 +1 @@
-33c22a0da30a5a4dd091375839edbf07  openais-1.0.0.tar.gz
+dd40a6d6a89904e5e65116b560573aa7  openais-1.0.1.tar.gz



From fabbione at fedoraproject.org  Thu Aug 27 04:50:39 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 27 Aug 2009 04:50:39 +0000 (UTC)
Subject: rpms/openais/F-10 .cvsignore, 1.10, 1.11 openais.spec, 1.31,
	1.32 sources, 1.12, 1.13
Message-ID: <20090827045039.C521811C0498@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release. Fixes 2 minor issues in SA CheckPoint service.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	25 Sep 2008 08:07:36 -0000	1.10
+++ .cvsignore	27 Aug 2009 04:50:39 -0000	1.11
@@ -1 +1 @@
-openais-0.91.tar.gz
+openais-1.0.1.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/openais.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- openais.spec	31 Jul 2009 08:22:28 -0000	1.31
+++ openais.spec	27 Aug 2009 04:50:39 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -155,6 +155,9 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* 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
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	31 Jul 2009 08:22:29 -0000	1.12
+++ sources	27 Aug 2009 04:50:39 -0000	1.13
@@ -1 +1 @@
-33c22a0da30a5a4dd091375839edbf07  openais-1.0.0.tar.gz
+dd40a6d6a89904e5e65116b560573aa7  openais-1.0.1.tar.gz



From phuang at fedoraproject.org  Thu Aug 27 06:16:26 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Thu, 27 Aug 2009 06:16:26 +0000 (UTC)
Subject: rpms/scim/devel scim-1.4.9-fix-dlclose.patch, NONE, 1.1 scim.spec, 
	1.144, 1.145
Message-ID: <20090827061626.BAB0111C0073@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32676

Modified Files:
	scim.spec 
Added Files:
	scim-1.4.9-fix-dlclose.patch 
Log Message:
Fix dlclose im-scim.so segfault

scim-1.4.9-fix-dlclose.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE scim-1.4.9-fix-dlclose.patch ---
diff -up scim-1.4.9/extras/gtk2_immodule/Makefile.am.fix-dlclose scim-1.4.9/extras/gtk2_immodule/Makefile.am
--- scim-1.4.9/extras/gtk2_immodule/Makefile.am.fix-dlclose	2009-08-27 13:44:13.548121927 +0800
+++ scim-1.4.9/extras/gtk2_immodule/Makefile.am	2009-08-27 13:44:33.402058823 +0800
@@ -46,6 +46,7 @@ im_scim_la_LDFLAGS = -rpath $(moduledir)
 		     -module \
 		     -lstdc++ \
 		     $(LD_VERSION_SCRIPT_OPTION) \
+		     -Wl,-z -Wl,nodelete \
 		     @GTK2_LIBS@
 
 im_scim_la_LIBADD  = $(top_builddir)/src/libscim at SCIM_EPOCH@.la $(X11_UTILS)


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- scim.spec	27 Jul 2009 03:53:48 -0000	1.144
+++ scim.spec	27 Aug 2009 06:16:24 -0000	1.145
@@ -1,6 +1,6 @@
 Name:      scim
 Version:   1.4.9
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -43,6 +43,7 @@ Patch29:   scim-1.4.7-bz462820.patch
 Patch30:   scim-1.4.7-imdkit-read-property-properly.patch
 Patch31:   scim-1.4.7-syslibltdl.patch
 Patch32:   scim-1.4.8-fix-dlopen.patch
+Patch33:   scim-1.4.9-fix-dlclose.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -174,6 +175,7 @@ cp -p %{SOURCE4} configs/global
 %patch30 -p1 -b .30-bz466657
 %patch31 -p1 -b .31-sysltdl
 %patch32 -E -p1 -b .fix-dlopen
+%patch33 -E -p1 -b .fix-dlclose
 
 # patch17 touches configure.ac and Makefile.am
 ./bootstrap
@@ -299,6 +301,9 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Huang Peng <phuang at redhat.com> - 1.4.9-3
+- Fix bug 517001 dlopen/dlclose of im-scim.so causes segfault.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From llaumgui at fedoraproject.org  Thu Aug 27 06:42:16 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 27 Aug 2009 06:42:16 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/devel .cvsignore, 1.4,
	1.5 pidgin-privacy-please.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090827064216.8244E11C0073@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6957

Modified Files:
	.cvsignore pidgin-privacy-please.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Jul 2009 05:46:33 -0000	1.4
+++ .cvsignore	27 Aug 2009 06:42:14 -0000	1.5
@@ -1 +1 @@
-pidgin-privacy-please-0.5.4.tar.gz
+pidgin-privacy-please-0.6.0.tar.gz


Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/pidgin-privacy-please.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pidgin-privacy-please.spec	26 Jul 2009 18:44:56 -0000	1.7
+++ pidgin-privacy-please.spec	27 Aug 2009 06:42:14 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           pidgin-privacy-please
-Version:        0.5.4
-Release:        2%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        Security and Privacy plugin for Pidgin
 
 Group:          Applications/Internet
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.6.0-1
+- Update to 0.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Jul 2009 05:46:34 -0000	1.4
+++ sources	27 Aug 2009 06:42:14 -0000	1.5
@@ -1 +1 @@
-d014233b598d19a8bc2f41cde1897d2e  pidgin-privacy-please-0.5.4.tar.gz
+e00a7be605a33756c081b3d8a4a3e600  pidgin-privacy-please-0.6.0.tar.gz



From llaumgui at fedoraproject.org  Thu Aug 27 06:42:22 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 27 Aug 2009 06:42:22 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-11 .cvsignore, 1.4,
	1.5 pidgin-privacy-please.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090827064222.8827F11C0073@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7015

Modified Files:
	.cvsignore pidgin-privacy-please.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Jul 2009 05:46:43 -0000	1.4
+++ .cvsignore	27 Aug 2009 06:42:22 -0000	1.5
@@ -1 +1 @@
-pidgin-privacy-please-0.5.4.tar.gz
+pidgin-privacy-please-0.6.0.tar.gz


Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-11/pidgin-privacy-please.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pidgin-privacy-please.spec	24 Jul 2009 05:46:43 -0000	1.6
+++ pidgin-privacy-please.spec	27 Aug 2009 06:42:22 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           pidgin-privacy-please
-Version:        0.5.4
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        Security and Privacy plugin for Pidgin
 
@@ -52,6 +52,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.6.0-1
+- Update to 0.6
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.4-1
 - Update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Jul 2009 05:46:43 -0000	1.4
+++ sources	27 Aug 2009 06:42:22 -0000	1.5
@@ -1 +1 @@
-d014233b598d19a8bc2f41cde1897d2e  pidgin-privacy-please-0.5.4.tar.gz
+e00a7be605a33756c081b3d8a4a3e600  pidgin-privacy-please-0.6.0.tar.gz



From llaumgui at fedoraproject.org  Thu Aug 27 06:42:23 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Thu, 27 Aug 2009 06:42:23 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-10 .cvsignore, 1.4,
	1.5 pidgin-privacy-please.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090827064223.9FB6811C0073@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7034

Modified Files:
	.cvsignore pidgin-privacy-please.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Jul 2009 05:46:47 -0000	1.4
+++ .cvsignore	27 Aug 2009 06:42:23 -0000	1.5
@@ -1 +1 @@
-pidgin-privacy-please-0.5.4.tar.gz
+pidgin-privacy-please-0.6.0.tar.gz


Index: pidgin-privacy-please.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/pidgin-privacy-please.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pidgin-privacy-please.spec	24 Jul 2009 05:46:47 -0000	1.5
+++ pidgin-privacy-please.spec	27 Aug 2009 06:42:23 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           pidgin-privacy-please
-Version:        0.5.4
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        Security and Privacy plugin for Pidgin
 
@@ -52,6 +52,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.6.0-1
+- Update to 0.6
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.4-1
 - Update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Jul 2009 05:46:47 -0000	1.4
+++ sources	27 Aug 2009 06:42:23 -0000	1.5
@@ -1 +1 @@
-d014233b598d19a8bc2f41cde1897d2e  pidgin-privacy-please-0.5.4.tar.gz
+e00a7be605a33756c081b3d8a4a3e600  pidgin-privacy-please-0.6.0.tar.gz



From salimma at fedoraproject.org  Thu Aug 27 07:05:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 27 Aug 2009 07:05:29 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.78,1.79
Message-ID: <20090827070529.7981A11C0073@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12745

Modified Files:
	banshee.spec 
Log Message:
* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
- Rebuild for boo update
- Remove unused dependency on nautilus-cd-burner



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- banshee.spec	24 Aug 2009 11:22:00 -0000	1.78
+++ banshee.spec	27 Aug 2009 07:05:27 -0000	1.79
@@ -33,7 +33,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
@@ -199,8 +199,9 @@ fi
 
 
 %changelog
-* Mon Aug 24 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
+* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
 - Rebuild for boo update
+- Remove unused dependency on nautilus-cd-burner
 
 * Fri Jul 24 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 tmraz at fedoraproject.org  Thu Aug 27 07:08:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:08:54 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1995,1.1996
Message-ID: <20090827070854.A34D311C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13363

Modified Files:
	openoffice.org.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.4
- rebuilt with new openssl



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -p -r1.1995 -r1.1996
--- openoffice.org.spec	26 Aug 2009 13:11:57 -0000	1.1995
+++ openoffice.org.spec	27 Aug 2009 07:08:54 -0000	1.1996
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%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}
@@ -4208,6 +4208,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.4
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
 - backport workspace.vcl102.patch to fix xdg support
 
@@ -4216,9 +4219,6 @@ fi
 - add workspace.cmcfixes62.patch for 64bit odbc goodness and rebuild
   against now 64bit-safe unixODBC headers
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.1.1
-- rebuilt with new openssl
-
 * Fri Aug 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
 - latest milestone
 - Resolves: rbhz#501141 Images and Frames disappear in sequential



From tmraz at fedoraproject.org  Thu Aug 27 07:14:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:14:37 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.14,1.15
Message-ID: <20090827071437.D5EA711C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14412

Modified Files:
	chunkd.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-4
- rebuilt with new openssl



Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- chunkd.spec	26 Aug 2009 16:47:09 -0000	1.14
+++ chunkd.spec	27 Aug 2009 07:14:36 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -97,12 +97,12 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-4
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-3
 - Require/rebuild for cld version 0.2.1.
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-2
-- rebuilt with new openssl
-
 * Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-1
 - Update to release version 0.4.
 



From tmraz at fedoraproject.org  Thu Aug 27 07:16:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:16:03 +0000 (UTC)
Subject: rpms/cld/devel cld.spec,1.19,1.20
Message-ID: <20090827071603.8221211C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14719

Modified Files:
	cld.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.1-2
- rebuilt with new openssl



Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cld.spec	26 Aug 2009 16:26:51 -0000	1.19
+++ cld.spec	27 Aug 2009 07:16:03 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		cld
 Version:	0.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
@@ -99,12 +99,12 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.1-2
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2.1-1
 - Upstream version 0.2.1 release (== many bug fixes).
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-2
-- rebuilt with new openssl
-
 * Sat Aug 15 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-1
 - Upstream version 0.2 release.
 



From tmraz at fedoraproject.org  Thu Aug 27 07:21:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:21:31 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.25,1.26
Message-ID: <20090827072131.5EBF411C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15683

Modified Files:
	conexus.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.0-2
- rebuilt with new openssl



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- conexus.spec	25 Aug 2009 20:51:58 -0000	1.25
+++ conexus.spec	27 Aug 2009 07:21:30 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
 Version:          0.9.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -295,13 +295,13 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/conexus-0.9/conexus-nss/
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.0-2
+- rebuilt with new openssl
+
 * Tue Aug 25 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.9.0-1
 - New release
 - Make udev buildrequires conditional
 
-* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
-- rebuilt with new openssl
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 27 07:26:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:26:55 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.spec,1.41,1.42
Message-ID: <20090827072655.C13A111C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17280

Modified Files:
	ejabberd.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
- rebuilt with new openssl



Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ejabberd.spec	25 Aug 2009 19:36:29 -0000	1.41
+++ ejabberd.spec	27 Aug 2009 07:26:55 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -218,12 +218,12 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
+- rebuilt with new openssl
+
 * Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
 - Since now, we using only ejabberdctl in the init-script (bz# 502361)
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
-- rebuilt with new openssl
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 27 07:34:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:34:54 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.273, 
	1.274
Message-ID: <20090827073454.132D311C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18651

Modified Files:
	evolution-data-server.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.91-2.fc12
- rebuilt with new openssl



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- evolution-data-server.spec	24 Aug 2009 13:19:58 -0000	1.273
+++ evolution-data-server.spec	27 Aug 2009 07:34:53 -0000	1.274
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.27.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -361,12 +361,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.91-2.fc12
+- rebuilt with new openssl
+
 * Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
 - Update to 2.27.91
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.90-2
-- rebuilt with new openssl
-
 * Mon Aug 10 2009 Milan Crha <mcrha at redhat.com> - 2.27.90-1.fc12
 - Update to 2.27.90
 



From tmraz at fedoraproject.org  Thu Aug 27 07:41:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:41:12 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.231,1.232
Message-ID: <20090827074112.0D92411C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19727

Modified Files:
	hplip.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-12
- rebuilt with new openssl



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- hplip.spec	26 Aug 2009 10:55:57 -0000	1.231
+++ hplip.spec	27 Aug 2009 07:41:11 -0000	1.232
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -341,6 +341,9 @@ fi
 exit 0
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-12
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
 - Set RequiresPageRegion in hpcups PPDs (bug #518756).
 
@@ -357,9 +360,6 @@ exit 0
 - Build no longer requires libudev-devel.
 - Fixed state reasons handling problems (bug #501338).
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-7
-- rebuilt with new openssl
-
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
 - Make sure to avoid handwritten asm.
 - Don't use obsolete configure options.



From tmraz at fedoraproject.org  Thu Aug 27 07:43:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:43:11 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc.spec,1.5,1.6
Message-ID: <20090827074311.479D411C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20176

Modified Files:
	kvirc.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.10.20090826svn3426
- rebuilt with new openssl



Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kvirc.spec	26 Aug 2009 11:50:08 -0000	1.5
+++ kvirc.spec	27 Aug 2009 07:43:10 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.9.%{pre}%{?dist}
+Release:          0.10.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -129,15 +129,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.10.20090826svn3426
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
 - svn snapshot 3426 that builds with new openssl
 - Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
 - Added -DWITH_ix86_ASM and -DMANUAL_REVISION
 - Added BR: esound-devel
 
-* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
-- rebuilt with new openssl
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From salimma at fedoraproject.org  Thu Aug 27 07:46:11 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 27 Aug 2009 07:46:11 +0000 (UTC)
Subject: rpms/boo/devel boo.spec,1.23,1.24
Message-ID: <20090827074611.E1B5D11C0073@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20777

Modified Files:
	boo.spec 
Log Message:
* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.1.3287-2
- Fix libdir in boo.pc to use %{_libdir}
- Summary no longer repeats package name



Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- boo.spec	24 Aug 2009 11:24:31 -0000	1.23
+++ boo.spec	27 Aug 2009 07:46:11 -0000	1.24
@@ -1,10 +1,10 @@
 %define debug_package %{nil}
 %define monodir %{_libdir}
 
-Summary: Boo is an OO statically typed language for CLI
+Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.1.3287
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +36,8 @@ Development files for boo
 %patch0 -p1 -b .libdir-original
 %patch1 -p1 -b .targets-original
 %patch2 -p1 -b .pc-original
+# Fix libdir in boo.pc
+sed -i -e "s|\${prefix}/lib|%{_libdir}|" extras/boo.pc.in
 # Get rid of prebuilt dll files
 rm -rf bin/*.dll bin/pt/*.dll
 
@@ -72,6 +74,10 @@ update-mime-database %{_datadir}/mime &>
 %{monodir}/pkgconfig/boo.pc
 
 %changelog
+* Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.1.3287-2
+- Fix libdir in boo.pc to use %%{_libdir}
+- Summary no longer repeats package name
+
 * Sun Aug 02 2009 Paul Lange <palango at gmx.de> - 0.9.1.3287-1
 - Update to boo 0.9.1
 



From tmraz at fedoraproject.org  Thu Aug 27 07:46:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:46:46 +0000 (UTC)
Subject: rpms/openldap/devel openldap.spec,1.146,1.147
Message-ID: <20090827074646.304C711C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20948

Modified Files:
	openldap.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-5
- rebuilt with new openssl



Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- openldap.spec	25 Aug 2009 08:58:12 -0000	1.146
+++ openldap.spec	27 Aug 2009 07:46:45 -0000	1.147
@@ -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
@@ -606,12 +606,12 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-5
+- rebuilt with new openssl
+
 * Tue Aug 25 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-4
 - updated %pre script to correctly install openldap group
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-3
-- rebuilt with new openssl
-
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 27 07:51:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:51:00 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.634,1.635
Message-ID: <20090827075100.EE1E111C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21845

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.71-13
- rebuilt with new audit



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -p -r1.634 -r1.635
--- policycoreutils.spec	26 Aug 2009 21:52:31 -0000	1.634
+++ policycoreutils.spec	27 Aug 2009 07:51:00 -0000	1.635
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -295,6 +295,9 @@ fi
 exit 0
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.71-13
+- rebuilt with new audit
+
 * Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-12
 - Tighten up controls on seunshare.c
 
@@ -309,9 +312,6 @@ exit 0
 - Ensure scriptlets exit with status 0.
 - Fix %%post and %%pr
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.71-8
-- rebuilt with new audit
-
 * Thu Aug 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-7
 - Fix glob handling of /..
 



From tmraz at fedoraproject.org  Thu Aug 27 07:53:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 07:53:59 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.95,1.96
Message-ID: <20090827075359.C7D4211C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22575

Modified Files:
	pulseaudio.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-11.test5
- rebuilt with new openssl



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- pulseaudio.spec	24 Aug 2009 15:17:55 -0000	1.95
+++ pulseaudio.spec	27 Aug 2009 07:53:59 -0000	1.96
@@ -1,7 +1,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        0.9.16
-Release:        10.test6%{?dist}
+Release:        11.test6%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Daemons
 Source0:        http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test6.tar.gz
@@ -433,15 +433,15 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-11.test5
+- rebuilt with new openssl
+
 * Mon Aug 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-10.test6
 - Fix build for ppc
 
 * Mon Aug 24 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.16-9.test6
 - New test release
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.16-8.test5
-- rebuilt with new openssl
-
 * Thu Aug 20 2009 Matthias Clasen <mclasen at redhat.com> - 0.9.16-7.test5
 - Fix install ordering between gdm and pulseaudio-gdm-hooks
 



From ovasik at fedoraproject.org  Thu Aug 27 08:00:55 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 27 Aug 2009 08:00:55 +0000 (UTC)
Subject: rpms/star/devel star.spec,1.49,1.50
Message-ID: <20090827080055.0DF2811C0073@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/star/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24673

Modified Files:
	star.spec 
Log Message:
Merge review (#226434) changes: convert AN-1.5 to utf-8,spec file cosmetic/policy changes, ship README.linux in doc


Index: star.spec
===================================================================
RCS file: /cvs/extras/rpms/star/devel/star.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- star.spec	27 Jul 2009 04:49:09 -0000	1.49
+++ star.spec	27 Aug 2009 08:00:54 -0000	1.50
@@ -4,17 +4,24 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
+
+#use gcc for compilation, change defaults for Linux
 Patch1: star-1.5-newMake.patch
+#add SELinux support to star(#)
 Patch2: star-1.5-selinux.patch
+#do not segfault with data-change-warn option (#255261)
 Patch3: star-1.5-changewarnSegv.patch
+#remove non existing source file in nonfat-makefiles
 Patch4: star-1.5-removenames_c.patch
+#do not conflict with glibc stdio functions (#494213)
 Patch5: star-1.5-stdioconflict.patch
+
 License: CDDL
 Group: Applications/Archiving
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libattr-devel libacl-devel libtool libselinux-devel
 BuildRequires: e2fsprogs-devel gawk
 
@@ -31,12 +38,15 @@ and can restore individual files from th
 %patch3 -p1 -b .changewarnSegv
 %patch4 -p1 -b .removenames
 %patch5 -p1 -b .conflict
+iconv -f iso_8859-1 -t utf-8 AN-1.5 >AN-1.5_utf8
+mv AN-1.5_utf8 AN-1.5
+cp -a READMEs/README.linux .
 
 for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
-        for AFILE in gcc cc; do
-                [ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
-                && ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
-        done
+    for AFILE in gcc cc; do
+            [ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
+            && ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
+    done
 done
 
 %build
@@ -48,15 +58,15 @@ export MAKEPROG=gmake
 
 #make %{?_smp_mflags} PARCH=%{_target_cpu} CPPOPTX="-DNO_FSYNC" \
 make %{?_smp_mflags} PARCH=%{_target_cpu} \
-	COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS" CC="%{__cc}" \
-	K_ARCH=%{_target_cpu} \
-	CONFFLAGS="%{_target_platform} --prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
-	--sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} --includedir=%{_includedir} \
-	--libdir=%{_libdir} --libexec=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} --infodir=%{_infodir}" < /dev/null
+COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS" CC="%{__cc}" \
+K_ARCH=%{_target_cpu} \
+CONFFLAGS="%{_target_platform} --prefix=%{_prefix} \
+    --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
+    --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
+    --datadir=%{_datadir} --includedir=%{_includedir} \
+    --libdir=%{_libdir} --libexec=%{_libexecdir} \
+    --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} \
+    --mandir=%{_mandir} --infodir=%{_infodir}" < /dev/null
 
 %install
 export MAKEPROG=gmake
@@ -93,7 +103,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root)
-%doc README AN* COPYING CDDL.Schily.txt README.SSPM STATUS.alpha TODO
+%doc README AN* COPYING CDDL.Schily.txt README.SSPM STATUS.alpha TODO README.linux
 %{_bindir}/star
 %{_bindir}/ustar
 %{_bindir}/spax
@@ -101,6 +111,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-7
+- Merge review (#226434) changes: convert AN-1.5 to utf-8,
+  spec file cosmetic/policy changes, ship README.linux in doc
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -118,6 +132,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Wed Jan 28 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-2
 - remove names.c requirements from non-fat Makefiles,
   do not ship names.c (#255261 for details)
+
 * Tue Jan 27 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-1
 - use final instead of beta
 - ship missing names.c separately
@@ -139,7 +154,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - added -O0 to COPTX (CFLAGS) (see #255261)
 
 * Mon Aug 27 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a84-2
-- fix segfault of data-change-warn option (#255261), 
+- fix segfault of data-change-warn option (#255261),
   patch from dkopecek at redhat.com
 
 * Fri Aug 24 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a84-1
@@ -151,7 +166,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Mon Jan 29 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a76-2
 - fix buildreq. and rebuild
 
-* Thu Jan 18 2007 Jan Cholasta <grubber.x at gmail.com> 1.5a76-1 
+* Thu Jan 18 2007 Jan Cholasta <grubber.x at gmail.com> 1.5a76-1
 - upgrade
 
 * Tue Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a75-1
@@ -198,7 +213,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Disable fat binary as per star/Makefile, update star-1.5-selinux.patch for
   the various *.mk files used in that case
 - Axe /usr/share/man/man1/match.1*, /usr/etc/default/rmt too
-- Explicit listing in %files, allow for compressed or plain manpages
+- Explicit listing in %%files, allow for compressed or plain manpages
 
 * Fri Aug 26 2005 Peter Vrabec <pvrabec at redhat.com>
 - do not remove star_fat
@@ -207,7 +222,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - upgrade  1.5a64-1
 
 * Thu Aug 04 2005 Karsten Hopp <karsten at redhat.de> 1.5a54-3
-- remove /usr/bin/tar symlink 
+- remove /usr/bin/tar symlink
 
 * Fri Mar 18 2005 Peter Vrabec <pvrabec at redhat.com>
 - rebuilt



From tmraz at fedoraproject.org  Thu Aug 27 08:03:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:03:35 +0000 (UTC)
Subject: rpms/qmmp/devel qmmp.spec,1.14,1.15
Message-ID: <20090827080335.21F2B11C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qmmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25224

Modified Files:
	qmmp.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0-2
- rebuilt with new openssl



Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qmmp.spec	25 Aug 2009 13:28:10 -0000	1.14
+++ qmmp.spec	27 Aug 2009 08:03:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		qmmp
 Version:	0.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Qt-based multimedia player
 
 Group:		Applications/Multimedia
@@ -124,6 +124,9 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0-2
+- rebuilt with new openssl
+
 * Tue Aug 25 2009 Karel Voln? <kvolny at redhat.com> - 0.3.0-1
 - new version
 - updated %%description to match upstream
@@ -131,9 +134,6 @@ fi
 - AAC support disabled due to patent restrictions
 - mplayer plugin disabled due to mplayer missing from Fedora
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-6
-- rebuilt with new openssl
-
 * Sun Jul 26 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 tmraz at fedoraproject.org  Thu Aug 27 08:06:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:06:14 +0000 (UTC)
Subject: rpms/ratproxy/devel ratproxy.spec,1.6,1.7
Message-ID: <20090827080614.09C2B11C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25762

Modified Files:
	ratproxy.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.58-2
- rebuilt with new openssl



Index: ratproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/ratproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ratproxy.spec	23 Aug 2009 05:33:25 -0000	1.6
+++ ratproxy.spec	27 Aug 2009 08:06:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ratproxy
 Version:        1.58
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A passive web application security assessment tool
 Group:          Applications/Internet
 License:        ASL 2.0
@@ -52,12 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 
 %changelog
-* Thu Aug 23 2009 Rakesh Pandit <rakesh at fedorapeople.org> - 1.58-1
-- Adjusted Steve's patch for updateing to 1.58 # 518542
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.56-3
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.58-2
 - rebuilt with new openssl
 
+* Thu Aug 27 2009 Rakesh Pandit <rakesh at fedorapeople.org> - 1.58-1
+- Adjusted Steve's patch for updateing to 1.58 # 518542
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.56-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 27 08:07:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:07:46 +0000 (UTC)
Subject: rpms/scribus/devel scribus.spec,1.51,1.52
Message-ID: <20090827080746.9ABE611C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26170

Modified Files:
	scribus.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.5.1-4
- rebuilt with new openssl



Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- scribus.spec	25 Aug 2009 14:06:03 -0000	1.51
+++ scribus.spec	27 Aug 2009 08:07:46 -0000	1.52
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -183,13 +183,13 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.5.1-4
+- rebuilt with new openssl
+
 * Tue Aug 25 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-3
 - drop shebang line from python scripts
 - don't package precompiled python scripts
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.5.1-2
-- rebuilt with new openssl
-
 * Thu Aug 20 2009 Dan Hor?k <dan[AT]danny.cz> - 1.3.5.1-1
 - update to final 1.3.5.1
 - drop the upstreamed "install-headers" patch



From tagoh at fedoraproject.org  Thu Aug 27 08:08:11 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 27 Aug 2009 08:08:11 +0000 (UTC)
Subject: rpms/imsettings/devel .cvsignore, 1.16, 1.17 imsettings.spec, 1.34, 
	1.35 sources, 1.15, 1.16 imsettings-log.patch, 1.1, NONE
Message-ID: <20090827080811.B830911C0073@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26334

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	imsettings-log.patch 
Log Message:
* Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
- New upstream release.
  - Stop IM process properly with the DBus disconnect signal. (#518970)
  - Update the translation. (#517679)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	14 Aug 2009 06:54:54 -0000	1.16
+++ .cvsignore	27 Aug 2009 08:08:11 -0000	1.17
@@ -15,3 +15,4 @@ imsettings-0.106.1.tar.bz2
 imsettings-0.106.2.tar.bz2
 imsettings-0.107.0.tar.bz2
 imsettings-0.107.1.tar.bz2
+imsettings-0.107.2.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- imsettings.spec	14 Aug 2009 12:56:12 -0000	1.34
+++ imsettings.spec	27 Aug 2009 08:08:11 -0000	1.35
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	0.107.1
-Release:	2%{?dist}
+Version:	0.107.2
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,7 +16,6 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
-Patch2:		imsettings-log.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -83,7 +82,6 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
-%patch2 -p0 -b .2-log
 
 %build
 %configure	\
@@ -203,6 +201,11 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
+- New upstream release.
+  - Stop IM process properly with the DBus disconnect signal. (#518970)
+  - Update the translation. (#517679)
+
 * Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-2
 - export the certain environment variables.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	14 Aug 2009 06:54:55 -0000	1.15
+++ sources	27 Aug 2009 08:08:11 -0000	1.16
@@ -1 +1 @@
-aa1ac21b4a8cb8a73933d9c5a8e4f256  imsettings-0.107.1.tar.bz2
+3451c2bc4f82e63afb7c827e4a2f8dbf  imsettings-0.107.2.tar.bz2


--- imsettings-log.patch DELETED ---



From tmraz at fedoraproject.org  Thu Aug 27 08:09:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:09:02 +0000 (UTC)
Subject: rpms/springlobby/devel springlobby.spec,1.11,1.12
Message-ID: <20090827080902.BCBE211C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26575

Modified Files:
	springlobby.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.19-2
- rebuilt with new openssl



Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- springlobby.spec	23 Aug 2009 11:39:45 -0000	1.11
+++ springlobby.spec	27 Aug 2009 08:09:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           springlobby
 Version:        0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
 Group:          Amusements/Games
@@ -88,12 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.19-2
+- rebuilt with new openssl
+
 * Sun Aug 23 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.19-1
 - version 0.19
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3-3
-- rebuilt with new openssl
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 27 08:12:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:12:16 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.251,1.252
Message-ID: <20090827081216.1C4CB11C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27281

Modified Files:
	totem.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-7
- rebuilt with new openssl



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- totem.spec	23 Aug 2009 00:12:03 -0000	1.251
+++ totem.spec	27 Aug 2009 08:12:15 -0000	1.252
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -381,12 +381,12 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-7
+- rebuilt with new openssl
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-6
 - Respect the button-images setting better
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-5
-- rebuilt with new openssl
-
 * Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 2.27.2-4
 - Fix source URL
 



From tmraz at fedoraproject.org  Thu Aug 27 08:13:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:13:29 +0000 (UTC)
Subject: rpms/transmission/devel transmission.spec,1.44,1.45
Message-ID: <20090827081329.5D43211C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27582

Modified Files:
	transmission.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.74-3
- rebuilt with new openssl



Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- transmission.spec	25 Aug 2009 13:29:05 -0000	1.44
+++ transmission.spec	27 Aug 2009 08:13:29 -0000	1.45
@@ -1,7 +1,7 @@
 
 Name:           transmission
 Version:        1.74
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -73,6 +73,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.74-3
+- rebuilt with new openssl
+
 * Tue Aug 25 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 1.74-2
 - Add source
 
@@ -81,9 +84,6 @@ update-desktop-database > /dev/null 2>&1
 - http://trac.transmissionbt.com/wiki/Changes
 - disable static linking explicitly
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.73-3
-- rebuilt with new openssl
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.73-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Thu Aug 27 08:14:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:14:42 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd.spec,1.97,1.98
Message-ID: <20090827081442.A297211C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27883

Modified Files:
	vsftpd.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-2
- rebuilt with new openssl



Index: vsftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- vsftpd.spec	24 Aug 2009 15:01:45 -0000	1.97
+++ vsftpd.spec	27 Aug 2009 08:14:42 -0000	1.98
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -137,12 +137,12 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-2
+- rebuilt with new openssl
+
 * Tue Aug 24 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-1
 - update to latest upstream release 2.2.0
 
-* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
-- rebuilt with new openssl
-
 * Tue Aug 04 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-0.1.pre4
 - update to latest upstream release
 



From tmraz at fedoraproject.org  Thu Aug 27 08:17:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 27 Aug 2009 08:17:12 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.478,1.479
Message-ID: <20090827081712.F19B011C0073@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28382

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.99-42.20090825
- rebuilt with new openssl and audit



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- xorg-x11-server.spec	25 Aug 2009 08:24:54 -0000	1.478
+++ xorg-x11-server.spec	27 Aug 2009 08:17:12 -0000	1.479
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   41.%{gitdate}%{?dist}
+Release:   42.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.99-42.20090825
+- rebuilt with new openssl and audit
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-41.20090825
 - Today's git snapshot.
 
@@ -519,9 +522,6 @@ rm -rf $RPM_BUILD_ROOT
 - xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
   the driver returned real modes (and has no EDID).
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.99-38.20090820
-- rebuilt with new openssl
-
 * Thu Aug 20 2009 Adam Jackson <ajax at redhat.com> 1.6.99-37.20090820
 - Today's git snapshot.
 - xserver-1.6.99-dri2-swapbuffers-fallback.patch: Fix SwapBuffers crash.



From tagoh at fedoraproject.org  Thu Aug 27 08:20:43 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 27 Aug 2009 08:20:43 +0000 (UTC)
Subject: rpms/imsettings/F-11 .cvsignore, 1.14, 1.15 imsettings.spec, 1.29, 
	1.30 sources, 1.13, 1.14 noautobuild, 1.1, NONE
Message-ID: <20090827082043.904DB11C0498@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29126

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	noautobuild 
Log Message:
* Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
- New upstream release.
  - Stop IM process properly with the DBus disconnect signal. (#518970)
  - Update the translation. (#517679)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	7 Apr 2009 12:15:09 -0000	1.14
+++ .cvsignore	27 Aug 2009 08:20:43 -0000	1.15
@@ -13,3 +13,4 @@ imsettings-0.105.1.tar.bz2
 imsettings-0.106.0.tar.bz2
 imsettings-0.106.1.tar.bz2
 imsettings-0.106.2.tar.bz2
+imsettings-0.107.2.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/imsettings.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- imsettings.spec	13 Apr 2009 11:11:41 -0000	1.29
+++ imsettings.spec	27 Aug 2009 08:20:43 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	0.106.2
-Release:	2%{?dist}
+Version:	0.107.2
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -201,6 +201,32 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
+- New upstream release.
+  - Stop IM process properly with the DBus disconnect signal. (#518970)
+  - Update the translation. (#517679)
+
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-2
+- export the certain environment variables.
+
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-1
+- New upstream release.
+  - Fix memory leaks.
+
+* Wed Aug 12 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.0-1
+- New upstream release.
+  - Pop up an error if failed to invoke IM. (#497946)
+  - Fix the duplicate recommendation message issue. (#514852)
+
+* Thu Jul 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-5
+- Support immodule only configuration file.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.106.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-3
+- Support immodule only configuration file.
+
 * Mon Apr 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-2
 - Disable applet by default.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Apr 2009 12:15:09 -0000	1.13
+++ sources	27 Aug 2009 08:20:43 -0000	1.14
@@ -1 +1,2 @@
 d7f713a1b0d621aae7f5cc4b72f08c6e  imsettings-0.106.2.tar.bz2
+3451c2bc4f82e63afb7c827e4a2f8dbf  imsettings-0.107.2.tar.bz2


--- noautobuild DELETED ---



From mhlavink at fedoraproject.org  Thu Aug 27 09:27:36 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 27 Aug 2009 09:27:36 +0000 (UTC)
Subject: rpms/ksh/devel ksh-20090630-jlist.patch, NONE, 1.1 .cvsignore, 1.17,
	1.18 ksh.spec, 1.49, 1.50 sources, 1.18, 1.19
Message-ID: <20090827092736.CA47211C0073@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10790

Modified Files:
	.cvsignore ksh.spec sources 
Added Files:
	ksh-20090630-jlist.patch 
Log Message:
updated to 2009-06-30


ksh-20090630-jlist.patch:
 jobs.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE ksh-20090630-jlist.patch ---
diff -up ksh-20090630/src/cmd/ksh93/sh/jobs.c.jlist ksh-20090630/src/cmd/ksh93/sh/jobs.c
--- ksh-20090630/src/cmd/ksh93/sh/jobs.c.jlist	2009-04-30 00:07:32.000000000 +0200
+++ ksh-20090630/src/cmd/ksh93/sh/jobs.c	2009-08-27 08:51:48.028116714 +0200
@@ -1745,6 +1745,19 @@ static int job_chksave(register pid_t pi
 		jpold = jp;
 		jp = jp->next;
 	}
+	if(jp && (jp==jpold || count<0))
+	{
+		Sfio_t *log = sfopen((Sfio_t*)0,"/tmp/kshlog","a");
+		if(log)
+		{
+			fchmod(sffileno(log),S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH);
+			sfprintf(log,"chksave loop jp==jpold=%d jpold=%p jp->pid=%d pid=%d count=%d\n",jp==jpold,jpold,jp->pid,pid,bck.count);
+			sfclose(log);
+			sfsync(log);
+			errormsg(SH_DICT,ERROR_warn(0),"job list infinite loop -- this should not happen"); 
+			abort();
+		}
+	}
 	if(jp)
 	{
 		r = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	5 May 2009 10:40:48 -0000	1.17
+++ .cvsignore	27 Aug 2009 09:27:35 -0000	1.18
@@ -1,2 +1,2 @@
-INIT.2009-05-01.tgz
-ast-ksh.2009-05-01.tgz
+INIT.2009-06-30.tgz
+ast-ksh.2009-06-30.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ksh.spec	25 Jul 2009 04:48:55 -0000	1.49
+++ ksh.spec	27 Aug 2009 09:27:35 -0000	1.50
@@ -1,20 +1,23 @@
-%define       releasedate   2009-05-05
+%define       releasedate   2009-06-30
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20090505
-Release:      2%{?dist}
+Version:      20090630
+Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source3:      kshrc.rhs
 Source4:      dotkshrc
 
-#don't use not wanted/needed builtins
+#don't use not wanted/needed builtins - Fedora specific
 Patch1:       ksh-20070328-builtins.patch
 
+#435159 - check if there is looped list
+Patch2:       ksh-20090630-jlist.patch
+
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Conflicts:    pdksh
 Requires: coreutils, glibc-common, diffutils
@@ -32,6 +35,7 @@ with "sh" (the Bourne Shell).
 %setup -q -c
 %setup -q -T -D -a 1
 %patch1 -p1 -b .builtins
+%patch2 -p1 -b .jlist
 
 %build
 ./bin/package "read" ||:
@@ -84,6 +88,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Aug 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 20090630-1
+- updated to 2009-06-30
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090505-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	11 May 2009 08:08:38 -0000	1.18
+++ sources	27 Aug 2009 09:27:35 -0000	1.19
@@ -1,2 +1,2 @@
-e941c0a95b73c8309e6afff10f79d988  INIT.2009-05-05.tgz
-dff46f3e047ac35ac78a81c52938991b  ast-ksh.2009-05-05.tgz
+9a96103105517702e116ba0267653f84  INIT.2009-06-30.tgz
+51c39250763366a68579806bcc77a098  ast-ksh.2009-06-30.tgz



From mhlavink at fedoraproject.org  Thu Aug 27 09:34:42 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 27 Aug 2009 09:34:42 +0000 (UTC)
Subject: rpms/ksh/F-11 ksh-20090630-jlist.patch, NONE, 1.1 .cvsignore, 1.18, 
	1.19 ksh.spec, 1.50, 1.51 sources, 1.19, 1.20
Message-ID: <20090827093442.07C5611C0073@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12967

Modified Files:
	.cvsignore ksh.spec sources 
Added Files:
	ksh-20090630-jlist.patch 
Log Message:
udpated to 2009-06-30


ksh-20090630-jlist.patch:
 jobs.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE ksh-20090630-jlist.patch ---
diff -up ksh-20090630/src/cmd/ksh93/sh/jobs.c.jlist ksh-20090630/src/cmd/ksh93/sh/jobs.c
--- ksh-20090630/src/cmd/ksh93/sh/jobs.c.jlist	2009-04-30 00:07:32.000000000 +0200
+++ ksh-20090630/src/cmd/ksh93/sh/jobs.c	2009-08-27 08:51:48.028116714 +0200
@@ -1745,6 +1745,19 @@ static int job_chksave(register pid_t pi
 		jpold = jp;
 		jp = jp->next;
 	}
+	if(jp && (jp==jpold || count<0))
+	{
+		Sfio_t *log = sfopen((Sfio_t*)0,"/tmp/kshlog","a");
+		if(log)
+		{
+			fchmod(sffileno(log),S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH);
+			sfprintf(log,"chksave loop jp==jpold=%d jpold=%p jp->pid=%d pid=%d count=%d\n",jp==jpold,jpold,jp->pid,pid,bck.count);
+			sfclose(log);
+			sfsync(log);
+			errormsg(SH_DICT,ERROR_warn(0),"job list infinite loop -- this should not happen"); 
+			abort();
+		}
+	}
 	if(jp)
 	{
 		r = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Jul 2009 07:42:20 -0000	1.18
+++ .cvsignore	27 Aug 2009 09:34:41 -0000	1.19
@@ -1,2 +1,2 @@
-INIT.2008-12-12.tgz
-ast-ksh.2008-12-12.tgz
+INIT.2009-06-30.tgz
+ast-ksh.2009-06-30.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/ksh.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ksh.spec	29 Jul 2009 07:42:20 -0000	1.50
+++ ksh.spec	27 Aug 2009 09:34:41 -0000	1.51
@@ -1,11 +1,11 @@
-%define       releasedate   2008-12-12
+%define       releasedate   2009-06-30
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20081212
+Version:      20090630
 Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
@@ -15,6 +15,9 @@ Source4:      dotkshrc
 #don't use not wanted/needed builtins
 Patch1:       ksh-20070328-builtins.patch
 
+#435159 - check if there is looped list
+Patch2:       ksh-20090630-jlist.patch
+
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Conflicts:    pdksh
 Requires: coreutils, glibc-common, diffutils
@@ -32,6 +35,7 @@ with "sh" (the Bourne Shell).
 %setup -q -c
 %setup -q -T -D -a 1
 %patch1 -p1 -b .builtins
+%patch2 -p1 -b .jlist
 
 %build
 ./bin/package "read" ||:
@@ -84,6 +88,10 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Aug 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 20090630-1
+- updated to 2009-06-30
+- fixes #518942
+
 * Wed Jul 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 20081212-1
 - going back to 2008-12-12 because there is nothing else usable enough
 - fixes #510833


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Jul 2009 07:42:20 -0000	1.19
+++ sources	27 Aug 2009 09:34:41 -0000	1.20
@@ -1,2 +1,2 @@
-a3286fec6748a34e46a89b2edbbaeb78  INIT.2008-12-12.tgz
-e339886eed78b6bb9b75565477ea9135  ast-ksh.2008-12-12.tgz
+9a96103105517702e116ba0267653f84  INIT.2009-06-30.tgz
+51c39250763366a68579806bcc77a098  ast-ksh.2009-06-30.tgz



From mhlavink at fedoraproject.org  Thu Aug 27 09:46:32 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 27 Aug 2009 09:46:32 +0000 (UTC)
Subject: rpms/ksh/F-11 ksh-20070328-builtins.patch,1.3,1.4
Message-ID: <20090827094632.9186611C0073@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15170

Modified Files:
	ksh-20070328-builtins.patch 
Log Message:
trim patches


ksh-20070328-builtins.patch:
 builtins.c |    2 ++
 1 file changed, 2 insertions(+)

Index: ksh-20070328-builtins.patch
===================================================================
RCS file: /cvs/extras/rpms/ksh/F-11/ksh-20070328-builtins.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ksh-20070328-builtins.patch	29 Jul 2009 07:42:20 -0000	1.3
+++ ksh-20070328-builtins.patch	27 Aug 2009 09:46:32 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up ksh-20081212/src/cmd/ksh93/data/builtins.c.builtins ksh-20081212/src/cmd/ksh93/data/builtins.c
---- ksh-20081212/src/cmd/ksh93/data/builtins.c.builtins	2008-12-04 17:23:00.000000000 +0100
-+++ ksh-20081212/src/cmd/ksh93/data/builtins.c	2009-07-29 09:35:43.573518651 +0200
+diff -up ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins ksh-20090501/src/cmd/ksh93/data/builtins.c
+--- ksh-20090501/src/cmd/ksh93/data/builtins.c.builtins	2009-04-12 09:38:03.000000000 +0200
++++ ksh-20090501/src/cmd/ksh93/data/builtins.c	2009-05-05 11:20:30.601284246 +0200
 @@ -125,6 +125,7 @@ const struct shtable3 shtab_builtins[] =
  #ifdef SHOPT_CMDLIB_HDR
  #include SHOPT_CMDLIB_HDR
@@ -14,6 +14,6 @@ diff -up ksh-20081212/src/cmd/ksh93/data
  	CMDLIST(sync)
  #endif
 +#endif
- 	"",		0, 0 
- };
- 
+ #if SHOPT_REGRESS
+ 	"__regress__",		NV_BLTIN|BLT_ENV,	bltin(__regress__),
+ #endif



From rrakus at fedoraproject.org  Thu Aug 27 10:42:25 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 27 Aug 2009 10:42:25 +0000 (UTC)
Subject: rpms/bash/F-11 bash-4.0-key_alloc.patch, NONE, 1.1 bash.spec, 1.181,
	1.182
Message-ID: <20090827104225.68DD711C0499@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2395

Modified Files:
	bash.spec 
Added Files:
	bash-4.0-key_alloc.patch 
Log Message:
alloc memory for key in creation associative array (#518644)

bash-4.0-key_alloc.patch:
 assoc.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE bash-4.0-key_alloc.patch ---
diff -up bash-4.0/assoc.c.key_alloc bash-4.0/assoc.c
--- bash-4.0/assoc.c.key_alloc	2009-08-26 16:17:50.000000000 +0200
+++ bash-4.0/assoc.c	2009-08-26 16:18:42.000000000 +0200
@@ -77,6 +77,7 @@ assoc_insert (hash, key, value)
   b = hash_search (key, hash, HASH_CREATE);
   if (b == 0)
     return -1;
+  b->key = savestring (key);
   FREE (b->data);
   b->data = value ? savestring (value) : (char *)0;
   return (0);


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/F-11/bash.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- bash.spec	23 Jun 2009 14:04:34 -0000	1.181
+++ bash.spec	27 Aug 2009 10:42:23 -0000	1.182
@@ -3,7 +3,7 @@
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -63,6 +63,7 @@ Patch118: bash-tty-tests.patch
 #Patch119: bash-ulimit-m.patch
 #Patch120: bash-4.0-no_debug_output.patch
 #Patch121: bash-4.0-shell_pipelines_handling.patch
+Patch122: bash-4.0-key_alloc.patch
 
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -139,6 +140,7 @@ This package contains documentation file
 #%patch119 -p1 -b .ulimit-m
 #%patch120 -p1 -b .no_debug_output
 #%patch121 -p1 -b .pipelines_handling
+%patch122 -p1 -b .key_alloc
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -302,6 +304,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Aug 27 2009 Roman Rakus <rrakus at redhat.com> - 4.0-8
+- alloc memory for key in creation associative array (#518644)
+
 * Tue Jun 23 2009 Roman Rakus <rrakus at redhat.com> - 4.0-7
 - Official upstream patch level 23
 



From nucleo at fedoraproject.org  Thu Aug 27 11:03:20 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu, 27 Aug 2009 11:03:20 +0000 (UTC)
Subject: rpms/kvirc/devel .cvsignore, 1.3, 1.4 kvirc.spec, 1.6, 1.7 sources, 
	1.3, 1.4
Message-ID: <20090827110320.D2CE111C0492@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9667

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
svn r3429 compatible with openssl >=1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Aug 2009 11:50:08 -0000	1.3
+++ .cvsignore	27 Aug 2009 11:03:18 -0000	1.4
@@ -1 +1 @@
-kvirc-20090826svn3426.tar.bz2
+kvirc-20090827svn3429.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kvirc.spec	27 Aug 2009 07:43:10 -0000	1.6
+++ kvirc.spec	27 Aug 2009 11:03:18 -0000	1.7
@@ -1,17 +1,17 @@
-%define           rev 3426
-%define           pre 20090826svn%{rev}
+%define           rev 3429
+%define           pre 20090827svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.10.%{pre}%{?dist}
+Release:          0.11.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3426 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090826svn3426.tar.bz2 kvirc
+#  svn export -r 3429 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090827svn3429.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
@@ -129,11 +129,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
+- svn snapshot 3429 that includes patch for openssl >=1.0
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.10.20090826svn3426
 - rebuilt with new openssl
 
 * Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
-- svn snapshot 3426 that builds with new openssl
+- svn snapshot 3426
 - Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
 - Added -DWITH_ix86_ASM and -DMANUAL_REVISION
 - Added BR: esound-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2009 11:50:08 -0000	1.3
+++ sources	27 Aug 2009 11:03:18 -0000	1.4
@@ -1 +1 @@
-ef83b1fa6b8c9598a4f2aadb4217be2d  kvirc-20090826svn3426.tar.bz2
+15f9b94160d66eb2c043cb79aad3889c  kvirc-20090827svn3429.tar.bz2



From timlau at fedoraproject.org  Thu Aug 27 11:40:05 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 27 Aug 2009 11:40:05 +0000 (UTC)
Subject: rpms/postr/devel postr.spec,1.20,1.21
Message-ID: <20090827114005.925C311C049B@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23513

Modified Files:
	postr.spec 
Log Message:
added %%global debug_package %%{nil} to not generate an empty debuginfo package


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- postr.spec	25 Aug 2009 13:50:43 -0000	1.20
+++ postr.spec	27 Aug 2009 11:40:04 -0000	1.21
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global debug_package %{nil}
 
 Name:           postr
 Version:        0.12.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -74,6 +75,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 27 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-8
+- added %%global debug_package %%{nil} to not generate an empty debuginfo package
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
 - Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
 - in the right directory



From jkratoch at fedoraproject.org  Thu Aug 27 11:48:24 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 27 Aug 2009 11:48:24 +0000 (UTC)
Subject: rpms/gdb/F-11 gdb-bz508406-vla-type-objfile.patch, NONE,
	1.1 gdb.spec, 1.361, 1.362
Message-ID: <20090827114825.026FC11C0073@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26545

Modified Files:
	gdb.spec 
Added Files:
	gdb-bz508406-vla-type-objfile.patch 
Log Message:
* Thu Aug 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-38
- Remove wrong assertion on types objfile (BZ 508406).


gdb-bz508406-vla-type-objfile.patch:
 gdbtypes.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gdb-bz508406-vla-type-objfile.patch ---
--- ./gdb/gdbtypes.c	2009-08-27 10:33:50.000000000 +0200
+++ ./gdb/gdbtypes.c	2009-08-27 10:32:56.000000000 +0200
@@ -3127,12 +3127,14 @@ copy_type_recursive_1 (struct objfile *o
   struct type *new_type;
 
   if (TYPE_OBJFILE (type) == OBJFILE_INTERNAL
-      || (objfile == OBJFILE_MALLOC && !TYPE_DYNAMIC (type)))
+      || (TYPE_OBJFILE (type) == OBJFILE_MALLOC && !TYPE_DYNAMIC (type)))
     return type;
 
+#if 0 /* Backward compatibility only.  */
   /* This type shouldn't be pointing to any types in other objfiles;
      if it did, the type might disappear unexpectedly.  */
   gdb_assert (TYPE_OBJFILE (type) == objfile);
+#endif
 
   pair.old = type;
   slot = htab_find_slot (copied_types, &pair, INSERT);


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-11/gdb.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -p -r1.361 -r1.362
--- gdb.spec	15 Aug 2009 15:51:34 -0000	1.361
+++ gdb.spec	27 Aug 2009 11:48:24 -0000	1.362
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 37%{?_with_upstream:.upstream}%{?dist}
+Release: 38%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -394,6 +394,9 @@ Patch376: gdb-python-gdbserver-tp-crash.
 # Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
 Patch377: gdb-delayed-symfile-aranges.patch
 
+# Remove wrong assertion on types objfile (BZ 508406).
+Patch379: gdb-bz508406-vla-type-objfile.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -595,6 +598,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch374 -p1
 %patch376 -p1
 %patch377 -p1
+%patch379 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -875,6 +879,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-38
+- Remove wrong assertion on types objfile (BZ 508406).
+
 * Sat Aug 15 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090302-37
 - Fix GDB crash/hang on corrupted .debug_aranges (from old GCCs).
 - Temporarily disabled orphanripper on Fedora 11.



From till at fedoraproject.org  Thu Aug 27 11:49:08 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 27 Aug 2009 11:49:08 +0000 (UTC)
Subject: rpms/libHX/devel .cvsignore, 1.11, 1.12 libHX.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090827114908.9347211C0073@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26942

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 3.0-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 20:48:24 -0000	1.11
+++ .cvsignore	27 Aug 2009 11:49:08 -0000	1.12
@@ -1,2 +1,2 @@
-libHX-2.8.tar.bz2
-libHX-2.8.tar.bz2.asc
+libHX-3.0.tar.bz2
+libHX-3.0.tar.bz2.asc


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libHX.spec	25 Jul 2009 05:07:44 -0000	1.17
+++ libHX.spec	27 Aug 2009 11:49:08 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           libHX
-Version:        2.8
-Release:        2%{?dist}
+Version:        3.0
+Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
 Group:          System Environment/Libraries
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 27 2009 Till Maas <opensource at till.name> - 3.0-1
+- Update to new release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 20:48:25 -0000	1.11
+++ sources	27 Aug 2009 11:49:08 -0000	1.12
@@ -1,2 +1,2 @@
-26d4eb5b9ef2d94a4f9983af93547cb0  libHX-2.8.tar.bz2
-3368bdaed6aed3832f0c931058d7f7b1  libHX-2.8.tar.bz2.asc
+8a800d98f44af2a31e9fe23555175327  libHX-3.0.tar.bz2
+d224b763d3005d37fd53896832a56a53  libHX-3.0.tar.bz2.asc



From timlau at fedoraproject.org  Thu Aug 27 11:50:59 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 27 Aug 2009 11:50:59 +0000 (UTC)
Subject: rpms/postr/F-11 postr.spec,1.18,1.19
Message-ID: <20090827115059.39E3411C0073@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27565

Modified Files:
	postr.spec 
Log Message:
added %%global debug_package %%{nil} to not generate an empty debuginfo package


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-11/postr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- postr.spec	26 Aug 2009 12:27:18 -0000	1.18
+++ postr.spec	27 Aug 2009 11:50:58 -0000	1.19
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global debug_package %{nil}
 
 Name:           postr
 Version:        0.12.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -74,6 +75,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 27 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-8
+- added %%global debug_package %%{nil} to not generate an empty debuginfo package
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
 - Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
 - in the right directory



From kengert at fedoraproject.org  Thu Aug 27 11:51:23 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Thu, 27 Aug 2009 11:51:23 +0000 (UTC)
Subject: rpms/nspr/F-10 .cvsignore, 1.19, 1.20 nspr.spec, 1.41, 1.42 sources,
	1.20, 1.21
Message-ID: <20090827115123.4521E11C0073@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nspr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734

Modified Files:
	.cvsignore nspr.spec sources 
Log Message:
* Thu Aug 27 2009 Kai Engert <kaie at redhat.com> - 4.7.5-1
- update to 4.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	5 Jun 2009 02:15:11 -0000	1.19
+++ .cvsignore	27 Aug 2009 11:51:22 -0000	1.20
@@ -1 +1 @@
-nspr-4.7.4.tar.bz2
+nspr-4.7.5.tar.bz2


Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/nspr.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- nspr.spec	5 Jun 2009 02:15:11 -0000	1.41
+++ nspr.spec	27 Aug 2009 11:51:23 -0000	1.42
@@ -1,6 +1,6 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.7.4
+Version:        4.7.5
 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
+* 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
 - update to 4.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	5 Jun 2009 02:15:11 -0000	1.20
+++ sources	27 Aug 2009 11:51:23 -0000	1.21
@@ -1 +1 @@
-468ee1c64ba80376c69f84143fa74b44  nspr-4.7.4.tar.bz2
+6f2d4ce73257b11e56a389f46f0bc609  nspr-4.7.5.tar.bz2



From till at fedoraproject.org  Thu Aug 27 11:54:16 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 27 Aug 2009 11:54:16 +0000 (UTC)
Subject: rpms/pam_mount/devel .cvsignore, 1.25, 1.26 pam_mount.spec, 1.59,
	1.60 sources, 1.26, 1.27
Message-ID: <20090827115416.8AFB111C0073@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28810

Modified Files:
	.cvsignore pam_mount.spec sources 
Log Message:
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 1.30-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	2 Jul 2009 20:48:35 -0000	1.25
+++ .cvsignore	27 Aug 2009 11:54:16 -0000	1.26
@@ -1,2 +1,2 @@
-pam_mount-1.27.tar.bz2
-pam_mount-1.27.tar.bz2.asc
+pam_mount-1.30.tar.bz2
+pam_mount-1.30.tar.bz2.asc


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- pam_mount.spec	21 Aug 2009 15:12:01 -0000	1.59
+++ pam_mount.spec	27 Aug 2009 11:54:16 -0000	1.60
@@ -1,8 +1,8 @@
 %global packext bz2
 
 Name:           pam_mount
-Version:        1.27
-Release:        4%{?dist}
+Version:        1.30
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -17,12 +17,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 2.8
+BuildRequires:  libHX-devel >= 3.0
 %if %packext == lz
 BuildRequires:  lzip
 %endif
 Requires:       pam
-Requires:       libHX >= 2.8
+Requires:       libHX >= 3.0
 
 # for /etc/catalog and xmlcatalog
 #Requires:         xml-common
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 27 2009 Till Maas <opensource at till.name> - 1.30-1
+- Update to new release
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.27-4
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	2 Jul 2009 20:48:35 -0000	1.26
+++ sources	27 Aug 2009 11:54:16 -0000	1.27
@@ -1,2 +1,2 @@
-f06da34db9d578c40f3d47b394f9c5a3  pam_mount-1.27.tar.bz2
-c7d5d133bd3f9f10de6c751eb7293d37  pam_mount-1.27.tar.bz2.asc
+147add644cea9ab68eb78419d3155c73  pam_mount-1.30.tar.bz2
+7dd42fbece31c1d316bf40179d3f790a  pam_mount-1.30.tar.bz2.asc



From vcrhonek at fedoraproject.org  Thu Aug 27 12:13:35 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 27 Aug 2009 12:13:35 +0000 (UTC)
Subject: rpms/sblim-cmpi-base/devel .cvsignore, 1.4, 1.5 sblim-cmpi-base.spec,
	1.13, 1.14 sources, 1.4, 1.5
Message-ID: <20090827121335.16ADB11C0073@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1012

Modified Files:
	.cvsignore sblim-cmpi-base.spec sources 
Log Message:
Update to 1.5.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Oct 2008 12:14:23 -0000	1.4
+++ .cvsignore	27 Aug 2009 12:13:34 -0000	1.5
@@ -1,3 +1,4 @@
 sblim-cmpi-base-1.5.4.tar.bz2
 sblim-cmpi-base-1.5.5.tar.bz2
 sblim-cmpi-base-1.5.7.tar.bz2
+sblim-cmpi-base-1.5.9.tar.bz2


Index: sblim-cmpi-base.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sblim-cmpi-base.spec	27 Jul 2009 03:49:53 -0000	1.13
+++ sblim-cmpi-base.spec	27 Aug 2009 12:13:34 -0000	1.14
@@ -2,8 +2,8 @@
 %define provider_dir %{_libdir}/cmpi
 
 Name:           sblim-cmpi-base
-Version:        1.5.7
-Release:        4%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        SBLIM CMPI Base Providers
 
 Group:          Applications/System
@@ -52,7 +52,7 @@ Testcase Files for the SBLIM Testsuite.
            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 %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -123,6 +123,9 @@ fi
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 27 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.9-1
+- Update to 1.5.9
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Oct 2008 12:14:23 -0000	1.4
+++ sources	27 Aug 2009 12:13:34 -0000	1.5
@@ -1 +1 @@
-74f8010b7de9ac7bbe0778b4cc182d16  sblim-cmpi-base-1.5.7.tar.bz2
+4524287b30a6dd623274354086044f68  sblim-cmpi-base-1.5.9.tar.bz2



From timlau at fedoraproject.org  Thu Aug 27 12:18:34 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Thu, 27 Aug 2009 12:18:34 +0000 (UTC)
Subject: rpms/postr/F-10 postr.spec,1.14,1.15
Message-ID: <20090827121834.A1B0711C0073@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/postr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2034

Modified Files:
	postr.spec 
Log Message:
added %%global debug_package %%{nil} to not generate an empty debuginfo package


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-10/postr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- postr.spec	26 Aug 2009 12:49:08 -0000	1.14
+++ postr.spec	27 Aug 2009 12:18:34 -0000	1.15
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global debug_package %{nil}
 
 Name:           postr
 Version:        0.12.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -74,6 +75,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 27 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-8
+- added %%global debug_package %%{nil} to not generate an empty debuginfo package
+
 * Thu Aug 25 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-7
 - Added nautilus-ext-dir.patch to upstrem setup.py to install nautilus extentions
 - in the right directory



From twaugh at fedoraproject.org  Thu Aug 27 12:30:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 12:30:35 +0000 (UTC)
Subject: rpms/cups/devel cups-str3311.patch,NONE,1.1 cups.spec,1.508,1.509
Message-ID: <20090827123035.C9A5F11C048B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4452

Modified Files:
	cups.spec 
Added Files:
	cups-str3311.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Prevent infinite loop in cupsDoIORequest when processing HTTP
  errors (bug #518065, bug #519663, STR #3311).


cups-str3311.patch:
 request.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3311.patch ---
diff -up cups-1.4rc1/cups/request.c.str3311 cups-1.4rc1/cups/request.c
--- cups-1.4rc1/cups/request.c.str3311	2009-08-27 13:16:17.965400634 +0100
+++ cups-1.4rc1/cups/request.c	2009-08-27 13:16:18.247275208 +0100
@@ -266,7 +266,9 @@ cupsDoIORequest(http_t     *http,	/* I -
 
     DEBUG_printf(("2cupsDoIORequest: status=%d", status));
 
-    if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
+    if (status >= HTTP_BAD_REQUEST &&
+	status != HTTP_UNAUTHORIZED &&
+	status != HTTP_UPGRADE_REQUIRED)
     {
       httpFlush(http);
       _cupsSetHTTPError(status);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -p -r1.508 -r1.509
--- cups.spec	26 Aug 2009 17:20:25 -0000	1.508
+++ cups.spec	27 Aug 2009 12:30:35 -0000	1.509
@@ -70,6 +70,7 @@ Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
 Patch45: cups-str3308.patch
+Patch46: cups-str3311.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -240,6 +241,7 @@ module. 
 %patch43 -p1 -b .str3292
 %patch44 -p1 -b .str3293
 %patch45 -p1 -b .str3308
+%patch46 -p1 -b .str3311
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -535,6 +537,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Prevent infinite loop in cupsDoIORequest when processing HTTP
+  errors (bug #518065, bug #519663, STR #3311).
 - Fixed document-format-supported attribute when
   application/octet-stream is enabled (bug #516507, STR #3308, patch
   from Jiri Popelka).



From twaugh at fedoraproject.org  Thu Aug 27 12:33:50 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 12:33:50 +0000 (UTC)
Subject: rpms/cups/F-11 cups.spec,1.512,1.513
Message-ID: <20090827123350.805BC11C0073@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5191

Modified Files:
	cups.spec 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Prevent infinite loop in cupsDoIORequest when processing HTTP
  errors (bug #518065, bug #519663, STR #3311).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- cups.spec	26 Aug 2009 17:21:34 -0000	1.512
+++ cups.spec	27 Aug 2009 12:33:50 -0000	1.513
@@ -70,6 +70,7 @@ Patch42: cups-str3287.patch
 Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
 Patch45: cups-str3308.patch
+Patch46: cups-str3311.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -240,6 +241,7 @@ module. 
 %patch43 -p1 -b .str3292
 %patch44 -p1 -b .str3293
 %patch45 -p1 -b .str3308
+%patch46 -p1 -b .str3311
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -534,6 +536,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Prevent infinite loop in cupsDoIORequest when processing HTTP
+  errors (bug #518065, bug #519663, STR #3311).
 - Fixed document-format-supported attribute when
   application/octet-stream is enabled (bug #516507, STR #3308, patch
   from Jiri Popelka).



From twaugh at fedoraproject.org  Thu Aug 27 12:40:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 12:40:28 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.509,1.510
Message-ID: <20090827124028.42AFA11C049B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7302

Modified Files:
	cups.spec 
Log Message:
1.4-0.rc1.19


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- cups.spec	27 Aug 2009 12:30:35 -0000	1.509
+++ cups.spec	27 Aug 2009 12:40:28 -0000	1.510
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.18%{?dist}
+Release: 0.%{pre}.19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -536,7 +536,7 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.19
 - Prevent infinite loop in cupsDoIORequest when processing HTTP
   errors (bug #518065, bug #519663, STR #3311).
 - Fixed document-format-supported attribute when



From twaugh at fedoraproject.org  Thu Aug 27 12:40:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 12:40:56 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3311.patch,NONE,1.1 cups.spec,1.513,1.514
Message-ID: <20090827124056.C507A11C0073@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7385

Modified Files:
	cups.spec 
Added Files:
	cups-str3311.patch 
Log Message:
1.4-0.rc1.19

cups-str3311.patch:
 request.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE cups-str3311.patch ---
diff -up cups-1.4rc1/cups/request.c.str3311 cups-1.4rc1/cups/request.c
--- cups-1.4rc1/cups/request.c.str3311	2009-08-27 13:16:17.965400634 +0100
+++ cups-1.4rc1/cups/request.c	2009-08-27 13:16:18.247275208 +0100
@@ -266,7 +266,9 @@ cupsDoIORequest(http_t     *http,	/* I -
 
     DEBUG_printf(("2cupsDoIORequest: status=%d", status));
 
-    if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
+    if (status >= HTTP_BAD_REQUEST &&
+	status != HTTP_UNAUTHORIZED &&
+	status != HTTP_UPGRADE_REQUIRED)
     {
       httpFlush(http);
       _cupsSetHTTPError(status);


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -p -r1.513 -r1.514
--- cups.spec	27 Aug 2009 12:33:50 -0000	1.513
+++ cups.spec	27 Aug 2009 12:40:56 -0000	1.514
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.18%{?dist}
+Release: 0.%{pre}.19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2



From harald at fedoraproject.org  Thu Aug 27 12:45:34 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 27 Aug 2009 12:45:34 +0000 (UTC)
Subject: rpms/dracut/F-11 dracut.spec,1.7,1.8
Message-ID: <20090827124534.9E24911C0073@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8444

Modified Files:
	dracut.spec 
Log Message:
* Thu Aug 27 2009 Harald Hoyer <harald at redhat.com> 0.9-2
- patch dracut to install vol_id



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dracut.spec	14 Aug 2009 16:04:25 -0000	1.7
+++ dracut.spec	27 Aug 2009 12:45:34 -0000	1.8
@@ -13,7 +13,7 @@
 
 Name: dracut
 Version: 0.9
-Release: 1%{?rdist}
+Release: 2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -53,6 +53,8 @@ Requires: util-linux-ng >= 2.16
 BuildArch: noarch
 %endif
 
+Patch1: dracut-0.9-vol_id.patch
+
 %description
 dracut is a new, event-driven initramfs infrastructure based around udev.
 
@@ -95,6 +97,7 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1 
 
 %build
 make
@@ -145,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Aug 27 2009 Harald Hoyer <harald at redhat.com> 0.9-2
+- patch dracut to install vol_id
+
 * Fri Aug 14 2009 Harald Hoyer <harald at redhat.com> 0.9-1
 - version 0.9
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS



From harald at fedoraproject.org  Thu Aug 27 12:49:40 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 27 Aug 2009 12:49:40 +0000 (UTC)
Subject: rpms/dracut/F-11 dracut-0.9-vol_id.patch,NONE,1.1
Message-ID: <20090827124940.1226E11C0073@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9321

Added Files:
	dracut-0.9-vol_id.patch 
Log Message:
* Thu Aug 27 2009 Harald Hoyer <harald at redhat.com> 0.9-2
- patch dracut to install vol_id


dracut-0.9-vol_id.patch:
 install |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE dracut-0.9-vol_id.patch ---
diff -up dracut-0.9/modules.d/95udev-rules/install.vol_id dracut-0.9/modules.d/95udev-rules/install
--- dracut-0.9/modules.d/95udev-rules/install.vol_id	2009-08-27 14:43:25.000000000 +0200
+++ dracut-0.9/modules.d/95udev-rules/install	2009-08-27 14:43:33.000000000 +0200
@@ -32,6 +32,7 @@ hid2hci \
 path_id \
 scsi_id \
 usb_id \
+vol_id \
 ; do
     [ -x /lib/udev/$i ] && dracut_install /lib/udev/$i
 done



From pbrobinson at fedoraproject.org  Thu Aug 27 12:51:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 12:51:00 +0000 (UTC)
Subject: rpms/gjs/devel .cvsignore,1.2,1.3 gjs.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090827125100.657F411C0073@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gjs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9760

Modified Files:
	.cvsignore gjs.spec sources 
Log Message:
- New upstream 0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Aug 2009 09:45:10 -0000	1.2
+++ .cvsignore	27 Aug 2009 12:51:00 -0000	1.3
@@ -1 +1 @@
-gjs-0.3.tar.bz2
+gjs-0.4.tar.bz2


Index: gjs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/devel/gjs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gjs.spec	8 Aug 2009 09:45:10 -0000	1.1
+++ gjs.spec	27 Aug 2009 12:51:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gjs
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Javascript Bindings for GNOME
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@ Group:          System Environment/Libra
 # Stack printer (gjs/stack.c)
 License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
 URL:            http://live.gnome.org/Gjs/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xulrunner-devel
@@ -63,6 +63,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
+%{_bindir}/gjs
 %{_bindir}/gjs-console
 %{_libdir}/*.so.*
 %{_libdir}/gjs-1.0
@@ -78,6 +79,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
+- New upstream 0.4 release
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
 - Updates from the review request
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Aug 2009 09:45:10 -0000	1.2
+++ sources	27 Aug 2009 12:51:00 -0000	1.3
@@ -1 +1 @@
-3dead54a91b2e00a746efa7def7e5e9c  gjs-0.3.tar.bz2
+584594b22e433d56d660a7dda650809d  gjs-0.4.tar.bz2



From pbrobinson at fedoraproject.org  Thu Aug 27 12:53:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 12:53:04 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.96,1.97
Message-ID: <20090827125304.BEBDD11C0073@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10432

Modified Files:
	comps-f12.xml.in 
Log Message:
- more moblin packages


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- comps-f12.xml.in	24 Aug 2009 22:20:49 -0000	1.96
+++ comps-f12.xml.in	27 Aug 2009 12:53:04 -0000	1.97
@@ -4261,9 +4261,11 @@
       <packagereq type="mandatory">moblin-panel-myzone</packagereq>
       <packagereq type="mandatory">moblin-panel-pasteboard</packagereq>
       <packagereq type="mandatory">moblin-panel-people</packagereq>
+      <packagereq type="mandatory">moblin-panel-status</packagereq>
       <packagereq type="mandatory">moblin-session</packagereq>
       <packagereq type="mandatory">moblin-sound-theme</packagereq>
       <packagereq type="mandatory">mutter</packagereq>
+      <packagereq type="mandatory">network-manager-netbook</packagereq>
       <packagereq type="default">anjal</packagereq>
     </packagelist>
   </group>



From pbrobinson at fedoraproject.org  Thu Aug 27 13:00:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 13:00:00 +0000 (UTC)
Subject: rpms/gjs/F-11 .cvsignore,1.2,1.3 gjs.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090827130000.5296611C0073@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gjs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14686

Modified Files:
	.cvsignore gjs.spec sources 
Log Message:
- New upstream 0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Aug 2009 09:47:02 -0000	1.2
+++ .cvsignore	27 Aug 2009 12:59:59 -0000	1.3
@@ -1 +1 @@
-gjs-0.3.tar.bz2
+gjs-0.4.tar.bz2


Index: gjs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/F-11/gjs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gjs.spec	8 Aug 2009 09:47:02 -0000	1.1
+++ gjs.spec	27 Aug 2009 12:59:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gjs
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Javascript Bindings for GNOME
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@ Group:          System Environment/Libra
 # Stack printer (gjs/stack.c)
 License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
 URL:            http://live.gnome.org/Gjs/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xulrunner-devel
@@ -63,6 +63,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
+%{_bindir}/gjs
 %{_bindir}/gjs-console
 %{_libdir}/*.so.*
 %{_libdir}/gjs-1.0
@@ -78,6 +79,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.4-1
+- New upstream 0.4 release
+
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3-2
 - Updates from the review request
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Aug 2009 09:47:02 -0000	1.2
+++ sources	27 Aug 2009 12:59:59 -0000	1.3
@@ -1 +1 @@
-3dead54a91b2e00a746efa7def7e5e9c  gjs-0.3.tar.bz2
+584594b22e433d56d660a7dda650809d  gjs-0.4.tar.bz2



From vcrhonek at fedoraproject.org  Thu Aug 27 13:14:17 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 27 Aug 2009 13:14:17 +0000 (UTC)
Subject: rpms/sblim-cmpi-devel/devel .cvsignore, 1.3,
	1.4 sblim-cmpi-devel.spec, 1.11, 1.12 sources, 1.3, 1.4
Message-ID: <20090827131417.DAF1011C0073@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23043

Modified Files:
	.cvsignore sblim-cmpi-devel.spec sources 
Log Message:
Update to 2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/.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	27 Aug 2009 13:14:17 -0000	1.4
@@ -1,2 +1,3 @@
 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/extras/rpms/sblim-cmpi-devel/devel/sblim-cmpi-devel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sblim-cmpi-devel.spec	27 Jul 2009 03:50:07 -0000	1.11
+++ sblim-cmpi-devel.spec	27 Aug 2009 13:14:17 -0000	1.12
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           sblim-cmpi-devel
-Version:        1.0.5
-Release:        4%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        SBLIM CMPI Provider Development Support
 
 Group:          Development/Libraries
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cmpi
 
 %changelog
+* Thu Aug 27 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.0-1
+- Update to 2.0.0
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/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	27 Aug 2009 13:14:17 -0000	1.4
@@ -1 +1 @@
-6a27a37d198eecb06b924a53cbcda1ee  sblim-cmpi-devel-1.0.5.tar.bz2
+55d6fe7c71706024ff1469d8be5eedfd  sblim-cmpi-devel-2.0.0.tar.bz2



From twaugh at fedoraproject.org  Thu Aug 27 13:16:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 13:16:16 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-polkit-1.patch, 
	NONE, 1.1 system-config-printer.spec, 1.286, 1.287
Message-ID: <20090827131616.6438111C0073@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-serv24208

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-polkit-1.patch 
Log Message:
* Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
- Ported to polkit-1.


system-config-printer-polkit-1.patch:
 Makefile.am              |    1 +
 authconn.py              |   10 +++++-----
 config.py.in             |    1 +
 configure.in             |   11 +++++++++++
 cupspk.py                |    9 ++++++++-
 system-config-printer.py |   35 ++++++++++++++++++++++++-----------
 6 files changed, 50 insertions(+), 17 deletions(-)

--- NEW FILE system-config-printer-polkit-1.patch ---
diff -up system-config-printer-1.1.12/authconn.py.polkit-1 system-config-printer-1.1.12/authconn.py
--- system-config-printer-1.1.12/authconn.py.polkit-1	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/authconn.py	2009-08-27 14:01:24.553275754 +0100
@@ -24,6 +24,7 @@ import gobject
 import gtk
 import os
 from errordialogs import *
+import config
 from debug import *
 
 _ = lambda x: x
@@ -156,8 +157,11 @@ class Connection:
         cups.setUser (self._use_user)
 
         self._use_pk = ((self._server[0] == '/' or self._server == 'localhost')
-                        and not self._lock
                         and os.getuid () != 0)
+
+        if not config.WITH_POLKIT_1 and self._lock:
+            self._use_pk = False
+
         if self._use_pk:
             create_object = cupspk.Connection
         else:
@@ -208,10 +212,6 @@ class Connection:
                 break
             except cups.IPPError, (e, m):
                 if self._use_pk and m == 'pkcancel':
-                    title = _('Unauthorized request (%s)') % fname
-                    text = _("You are not authorized to carry out the "
-                             "requested action.")
-                    show_error_dialog (title, text, None)
                     raise cups.IPPError (0, _("Operation canceled"))
                 if not self._cancel and (e == cups.IPP_NOT_AUTHORIZED or
                                          e == cups.IPP_FORBIDDEN):
diff -up system-config-printer-1.1.12/config.py.in.polkit-1 system-config-printer-1.1.12/config.py.in
--- system-config-printer-1.1.12/config.py.in.polkit-1	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/config.py.in	2009-08-27 14:01:24.555275419 +0100
@@ -24,3 +24,4 @@ localedir="@localedir@"
 pkgdatadir="@datadir@/@PACKAGE@"
 VERSION="@VERSION@"
 PACKAGE="@PACKAGE@"
+WITH_POLKIT_1=@WITH_POLKIT_1@
diff -up system-config-printer-1.1.12/configure.in.polkit-1 system-config-printer-1.1.12/configure.in
--- system-config-printer-1.1.12/configure.in.polkit-1	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/configure.in	2009-08-27 14:01:24.556275177 +0100
@@ -43,6 +43,17 @@ if test x$with_udev_rules != xno; then
    AM_PROG_CC_C_O
 fi
 
+AC_ARG_WITH(polkit-1,
+	    [AC_HELP_STRING([--with-polkit-1],
+			    [Enable support for polkit-1 @<:@default=no@:>@])],
+			    [],
+			    [with_polkit_1=no])
+WITH_POLKIT_1=False
+if test x$with_polkit_1 != xno; then
+    WITH_POLKIT_1=True
+fi
+AC_SUBST(WITH_POLKIT_1)
+
 ALL_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms my nb nl nn or pa pl pt_BR pt ro ru si sk sl sr at latin sr sv ta te th tr uk vi zh_CN zh_TW"
 AC_CONFIG_FILES([
 Makefile
diff -up system-config-printer-1.1.12/cupspk.py.polkit-1 system-config-printer-1.1.12/cupspk.py
--- system-config-printer-1.1.12/cupspk.py.polkit-1	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/cupspk.py	2009-08-27 14:01:24.558275639 +0100
@@ -34,6 +34,7 @@ import tempfile
 import cups
 import dbus
 import gtk
+import config
 from debug import debugprint
 
 from dbus.mainloop.glib import DBusGMainLoop
@@ -221,8 +222,14 @@ class Connection:
                             return retval
                 break
             except dbus.exceptions.DBusException, e:
-                if not self._handle_exception_with_auth(e):
+                if config.WITH_POLKIT_1:
+                    if e.get_dbus_name() == CUPS_PK_NEED_AUTH:
+                        raise cups.IPPError(cups.IPP_NOT_AUTHORIZED, 'pkcancel')
+
                     break
+                else:
+                    if not self._handle_exception_with_auth(e):
+                        break
 
         # The PolicyKit call did not work (either a PK-error and we got a dbus
         # exception that wasn't handled, or an error in the mechanism itself)
diff -up system-config-printer-1.1.12/Makefile.am.polkit-1 system-config-printer-1.1.12/Makefile.am
--- system-config-printer-1.1.12/Makefile.am.polkit-1	2009-08-25 17:01:27.000000000 +0100
+++ system-config-printer-1.1.12/Makefile.am	2009-08-27 14:01:24.551276420 +0100
@@ -39,6 +39,7 @@ config.py: config.py.in Makefile
 	  -e "s|\@localedir\@|$(localedir)|" \
 	  -e "s|\@VERSION\@|$(VERSION)|" \
 	  -e "s|\@PACKAGE\@|$(PACKAGE)|" \
+	  -e "s|\@WITH_POLKIT_1\@|$(WITH_POLKIT_1)|" \
 	  $< > $@
 
 # Use distutils to build the module.
diff -up system-config-printer-1.1.12/system-config-printer.py.polkit-1 system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.polkit-1	2009-08-27 14:01:17.554275306 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-27 14:01:24.564275576 +0100
@@ -4620,19 +4620,32 @@ class NewPrinterGUI(GtkGUI):
         self.WaitWindow.set_transient_for (parent)
         self.WaitWindow.show_now ()
         self.busy (self.WaitWindow)
-        while gtk.events_pending ():
-            gtk.main_iteration ()
 
-        debugprint ("Fetching devices")
-        self.mainapp.cups._begin_operation (_("fetching device list"))
-        try:
-            devices = cupshelpers.getDevices(self.mainapp.cups)
-        except:
-            self.mainapp.cups._end_operation ()
-            self.WaitWindow.hide ()
-            raise
+        if self.mainapp.cups._use_pk and config.WITH_POLKIT_1:
+            def get_devices():
+                c = authconn.Connection (host=self.mainapp.connect_server,
+                                         parent=parent, lock=True)
+                c._begin_operation (_("fetching device list"))
+                ret = cupshelpers.getDevices (c)
+                c._end_operation ()
+                return ret
+
+            op = TimedOperation (get_devices)
+            try:
+                devices = op.run ()
+            except (OperationCanceled, RuntimeError, cups.IPPError):
+                self.WaitWindow.hide ()
+                raise
+        else:
+            self.mainapp.cups._begin_operation (_("fetching device list"))
+            try:
+                devices = cupshelpers.getDevices (self.mainapp.cups)
+                self.mainapp.cups._end_operation ()
+            except cups.IPPError:
+                self.mainapp.cups._end_operation ()
+                self.WaitWindow.hide ()
+                raise
 
-        self.mainapp.cups._end_operation ()
         self.WaitWindow.hide ()
         debugprint ("Got devices")
         return devices


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- system-config-printer.spec	26 Aug 2009 16:48:47 -0000	1.286
+++ system-config-printer.spec	27 Aug 2009 13:16:15 -0000	1.287
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
+Patch4: system-config-printer-polkit-1.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -27,6 +28,7 @@ BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
 BuildRequires: xmlto
 BuildRequires: epydoc
+BuildRequires: automake, autoconf
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,9 +82,13 @@ printers.
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
+%patch4 -p1 -b .polkit-1
 
 %build
-%configure --with-udev-rules
+aclocal
+automake --copy --add-missing
+autoconf
+%configure --with-udev-rules --with-polkit-1
 
 pushd pycups-%{pycups_version}
 make
@@ -191,6 +197,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
+- Ported to polkit-1.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-3
 - Handle icon load failure gracefully.
 - Fixed statereason icon names.



From ixs at fedoraproject.org  Thu Aug 27 13:27:18 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 27 Aug 2009 13:27:18 +0000 (UTC)
Subject: rpms/mozilla-adblockplus/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090827132718.C71F311C0073@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mozilla-adblockplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30307

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Aug 27 2009 Andreas Thienemann <andreas at bawue.net> - 1.1.1-1
- Updated to 1.1.1 upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Jul 2009 00:59:55 -0000	1.1
+++ .cvsignore	27 Aug 2009 13:27:17 -0000	1.2
@@ -0,0 +1 @@
+adblockplus-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 00:59:55 -0000	1.1
+++ sources	27 Aug 2009 13:27:17 -0000	1.2
@@ -0,0 +1 @@
+f932c2b1686574c9eb337e89cf2972eb  adblockplus-1.1.1.tar.gz



From cebbert at fedoraproject.org  Thu Aug 27 13:32:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 27 Aug 2009 13:32:35 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1117, 1.1118 kernel.spec, 1.1744, 1.1745 sources, 1.1075,
	1.1076 upstream, 1.989, 1.990 linux-2.6-ima-leak.patch, 1.1,
	NONE patch-2.6.31-rc7-git4.bz2.sign, 1.1, NONE
Message-ID: <20090827133235.1818011C0073@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv774

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git5.bz2.sign 
Removed Files:
	linux-2.6-ima-leak.patch patch-2.6.31-rc7-git4.bz2.sign 
Log Message:
2.6.31-rc7-git5
Drop patch linux-2.6-ima-leak.patch, now merged upstream.


--- NEW FILE patch-2.6.31-rc7-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKlnZfyGugalF9Dw4RAkEYAJ0SwFkl/7AJsf8RB2MB/RahZKy4UgCffmUi
QdTnShKhuO9L+tt5oReA1AM=
=dHYJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1117
retrieving revision 1.1118
diff -u -p -r1.1117 -r1.1118
--- .cvsignore	26 Aug 2009 15:50:19 -0000	1.1117
+++ .cvsignore	27 Aug 2009 13:32:33 -0000	1.1118
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git4.bz2
+patch-2.6.31-rc7-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1744
retrieving revision 1.1745
diff -u -p -r1.1744 -r1.1745
--- kernel.spec	26 Aug 2009 21:23:36 -0000	1.1744
+++ kernel.spec	27 Aug 2009 13:32:34 -0000	1.1745
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -727,9 +727,6 @@ Patch12011: linux-2.6-block-silently-err
 # fix xen boot
 Patch12020: xen-fb-probe-fix.patch
 
-#fix ima iint_cache leak
-Patch13000: linux-2.6-ima-leak.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1346,8 +1343,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 # fix xen boot
 ApplyPatch xen-fb-probe-fix.patch
 
-ApplyPatch linux-2.6-ima-leak.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2014,6 +2009,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git5
+- Drop patch linux-2.6-ima-leak.patch, now merged upstream.
+
 * Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
 - Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1075
retrieving revision 1.1076
diff -u -p -r1.1075 -r1.1076
--- sources	26 Aug 2009 15:50:19 -0000	1.1075
+++ sources	27 Aug 2009 13:32:34 -0000	1.1076
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-8329c25267787e591972e477b113c08b  patch-2.6.31-rc7-git4.bz2
+b31e020fe330d8927d12e25b051704c8  patch-2.6.31-rc7-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.989
retrieving revision 1.990
diff -u -p -r1.989 -r1.990
--- upstream	26 Aug 2009 15:50:19 -0000	1.989
+++ upstream	27 Aug 2009 13:32:34 -0000	1.990
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git4.bz2
+patch-2.6.31-rc7-git5.bz2


--- linux-2.6-ima-leak.patch DELETED ---


--- patch-2.6.31-rc7-git4.bz2.sign DELETED ---



From ixs at fedoraproject.org  Thu Aug 27 13:37:06 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 27 Aug 2009 13:37:06 +0000 (UTC)
Subject: rpms/mozilla-adblockplus/devel mozilla-adblockplus.spec,NONE,1.1
Message-ID: <20090827133706.DFA2D11C0073@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mozilla-adblockplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3093

Added Files:
	mozilla-adblockplus.spec 
Log Message:
Initial import



--- NEW FILE mozilla-adblockplus.spec ---
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%define src_ext_id \{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}
%define inst_dir %{_libdir}/mozilla/extensions/%{firefox_app_id}/%{src_ext_id}

# Do not build a debug package, we have nothing to strip
%define debug_package %{nil}

Name:           mozilla-adblockplus
Version:        1.1.1
Release:        1%{?dist}
Summary:        Adblocking extension for Mozilla Firefox

Group:          Applications/Internet
License:        MPLv1.1
URL:            http://adblockplus.org/
# Source can be obtained by hg
# hg clone http://hg.mozdev.org/adblockplus/ && cd adblockplus
# If you want a specific release, a list is available with hg tags
#
# hg up -r ADBLOCK_PLUS_1_1_1_RELEASE
# tar cfz adblockplus-1.1.tar.gz adblockplus Packager.pm
Source0:        adblockplus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zip, perl, sed
# Commented, rpm seems not to be able to handle this anymore
# Requirements are defined as files in order to better cope with changing firefox/mozilla packages
#Requires:       %{_libdir}/mozilla/extensions/, %{_libdir}/mozilla/extensions/%{firefox_app_id}/
Requires:       firefox


%description
Adblock Plus is a content-filtering extension for the Mozilla Firefox- and
Mozilla Application Suite-based web browsers. Adblock Plus allows users to
prevent page elements, such as advertisements, from being downloaded and
displayed.
It features improvements to the user interface, filter subscriptions, and
element hiding over the original Adblock extesion.


%prep
%setup -q -c


%build
pushd adblockplus
perl create_xpi.pl adblockplus-%{version}-%{release}.xpi
popd


%install
rm -rf %{buildroot}
unzip adblockplus/adblockplus-%{version}-%{release}.xpi
install -D -m 644 chrome.manifest %{buildroot}%{inst_dir}/chrome.manifest
install -D -m 644 install.rdf %{buildroot}%{inst_dir}/install.rdf
install -D -m 644 components/AdblockPlus.js %{buildroot}%{inst_dir}/components/AdblockPlus.js
install -D -m 644 defaults/preferences/adblockplus.js %{buildroot}%{inst_dir}/defaults/preferences/adblockplus.js
install -D -m 644 chrome/adblockplus.jar %{buildroot}%{inst_dir}/chrome/adblockplus.jar


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{inst_dir}


%changelog
* Thu Aug 27 2009 Andreas Thienemann <andreas at bawue.net> - 1.1.1-1
- Updated to 1.1.1 upstream release

* Sun Jul 19 2009 Andreas Thienemann <andreas at bawue.net> - 1.1-1
- Updated to 1.1 upstream release

* Wed Apr 29 2009 Andreas Thienemann <andreas at bawue.net> - 1.0.2-1
- Updated to 1.0.2 upstream release

* Tue Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.0.1-1
- Initial package



From pkgdb at fedoraproject.org  Thu Aug 27 13:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 13:38:47 +0000
Subject: [pkgdb] Django ownership updated
Message-ID: <20090827133847.5296610F854@bastion2.fedora.phx.redhat.com>

Package Django in Fedora EPEL 4 is now owned by smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Thu Aug 27 13:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 13:39:53 +0000
Subject: [pkgdb] Django: smilner has requested approveacls
Message-ID: <20090827133953.05DFC10F86F@bastion2.fedora.phx.redhat.com>

smilner has requested the approveacls acl on Django (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From dwalsh at fedoraproject.org  Thu Aug 27 13:40:50 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 27 Aug 2009 13:40:50 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.901,1.902
Message-ID: <20090827134050.E9AC811C049B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6154

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-81
- Turn back on unconfineduser and unconfined domains



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -p -r1.901 -r1.902
--- selinux-policy.spec	24 Aug 2009 13:58:24 -0000	1.901
+++ selinux-policy.spec	27 Aug 2009 13:40:50 -0000	1.902
@@ -96,7 +96,7 @@ cp -f $RPM_SOURCE_DIR/modules-%1.conf  .
 cp -f $RPM_SOURCE_DIR/booleans-%1.conf ./policy/booleans.conf \
 
 %define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
-awk '$1 !~ "/^#/" && $1 != "unconfined" && $1 != "unconfineduser" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
 %define installCmds() \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} UBAC=n DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
@@ -310,46 +310,13 @@ SELinux Reference policy targeted base m
 %saveFileContext targeted
 
 %post targeted
-function get_unconfined() {
-# We only want to upgrade unconfined.pp and unconfineduser if they are 
-# currently installed.  If you have a version 3.0.0 or less of unconfined 
-# installed, you will need to install both, since unconfineduser did not exist 
-# prior to this.
-eval `semodule -l | while read package version; do
-	case $package in
-	"unconfineduser")
-	        echo "unconfineduser=$version"
-		;;
-	"unconfined")
-	 	echo "unconfined=$version"
-		;;
-	esac
-done`
-
-if [ -z "$unconfineduser" -a -n "$unconfined" ]; then
-    f1=`echo $unconfined | cut -d. -f 1`
-    if [ $f1 -lt 3 ]; then
-	unconfineduser="1"
-    else
-        if [ $f1 -eq  3 ]; then
-	    f2=`echo $unconfined | cut -s -d. -f2`
-	    f3=`echo $unconfined | cut -s -d. -f3`
-	    if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
-	        unconfineduser="1"
-	    fi
-	fi
-    fi
-fi
-echo ${unconfined:+unconfined.pp.bz2} ${unconfineduser:+unconfineduser.pp.bz2}
-}
-
 if [ $1 -eq 1 ]; then
-   packages="%{expand:%%moduleList targeted} unconfined.pp.bz2 unconfineduser.pp.bz2"
+   packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run 2> /dev/null
 else
    semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-   packages="%{expand:%%moduleList targeted} `get_unconfined`"
+   packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    %relabel targeted
 fi
@@ -428,7 +395,7 @@ SELinux Reference policy olpc base modul
 %saveFileContext olpc
 
 %post olpc 
-packages="%{expand:%%moduleList olpc} unconfined.pp.bz2 unconfineduser.pp.bz2"
+packages="%{expand:%%moduleList olpc}"
 %loadpolicy olpc $packages
 
 if [ $1 -ne 1 ]; then
@@ -475,6 +442,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-81
+- Turn back on unconfineduser and unconfined domains
+
 * Mon Aug 24 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-80
 - Allow pptp dac_override capability
 



From dwalsh at fedoraproject.org  Thu Aug 27 13:41:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 27 Aug 2009 13:41:22 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 selinux-policy.spec,1.902,1.903
Message-ID: <20090827134122.4CEED11C0073@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6697

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-81
- Turn back on unconfineduser and unconfined domains



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -p -r1.902 -r1.903
--- selinux-policy.spec	27 Aug 2009 13:40:50 -0000	1.902
+++ selinux-policy.spec	27 Aug 2009 13:41:22 -0000	1.903
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 80%{?dist}
+Release: 81%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From ixs at fedoraproject.org  Thu Aug 27 13:44:45 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 27 Aug 2009 13:44:45 +0000 (UTC)
Subject: rpms/mozilla-adblockplus/devel mozilla-adblockplus.spec,1.1,1.2
Message-ID: <20090827134445.BA44911C0073@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mozilla-adblockplus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7404

Modified Files:
	mozilla-adblockplus.spec 
Log Message:
noarchified


Index: mozilla-adblockplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/devel/mozilla-adblockplus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mozilla-adblockplus.spec	27 Aug 2009 13:37:06 -0000	1.1
+++ mozilla-adblockplus.spec	27 Aug 2009 13:44:45 -0000	1.2
@@ -1,6 +1,6 @@
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define src_ext_id \{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}
-%define inst_dir %{_libdir}/mozilla/extensions/%{firefox_app_id}/%{src_ext_id}
+%define inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}/%{src_ext_id}
 
 # Do not build a debug package, we have nothing to strip
 %define debug_package %{nil}
@@ -22,6 +22,8 @@ URL:            http://adblockplus.org/
 Source0:        adblockplus-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:      noarch
+
 BuildRequires:  zip, perl, sed
 # Commented, rpm seems not to be able to handle this anymore
 # Requirements are defined as files in order to better cope with changing firefox/mozilla packages



From ovasik at fedoraproject.org  Thu Aug 27 13:50:22 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 27 Aug 2009 13:50:22 +0000 (UTC)
Subject: rpms/tar/devel tar.spec,1.86,1.87
Message-ID: <20090827135022.7E57F11C0498@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8871

Modified Files:
	tar.spec 
Log Message:
provide symlink manpage for gtar


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- tar.spec	6 Aug 2009 13:11:36 -0000	1.86
+++ tar.spec	27 Aug 2009 13:50:22 -0000	1.87
@@ -2,7 +2,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.22
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -59,6 +59,7 @@ ln -s tar ${RPM_BUILD_ROOT}/bin/gtar
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -c -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_mandir}/man1
+ln -s tar.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtar.1
 
 # XXX Nuke unpackaged files.
 rm -f ${RPM_BUILD_ROOT}/sbin/rmt
@@ -91,6 +92,7 @@ fi
 /bin/tar
 /bin/gtar
 %{_mandir}/man1/tar.1*
+%{_mandir}/man1/gtar.1*
 %else
 %{_bindir}/*
 %{_libexecdir}/*
@@ -100,6 +102,9 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-8
+- provide symlink manpage for gtar
+
 * Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.22-7
 - do process install-info only without --excludedocs(#515923)
 



From ixs at fedoraproject.org  Thu Aug 27 13:52:33 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 27 Aug 2009 13:52:33 +0000 (UTC)
Subject: rpms/mozilla-adblockplus/F-11 mozilla-adblockplus.spec,NONE,1.1
Message-ID: <20090827135233.D18B811C0073@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mozilla-adblockplus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10898

Added Files:
	mozilla-adblockplus.spec 
Log Message:
initial checkin


--- NEW FILE mozilla-adblockplus.spec ---
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%define src_ext_id \{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}
%define inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}/%{src_ext_id}

# Do not build a debug package, we have nothing to strip
%define debug_package %{nil}

Name:           mozilla-adblockplus
Version:        1.1.1
Release:        1%{?dist}
Summary:        Adblocking extension for Mozilla Firefox

Group:          Applications/Internet
License:        MPLv1.1
URL:            http://adblockplus.org/
# Source can be obtained by hg
# hg clone http://hg.mozdev.org/adblockplus/ && cd adblockplus
# If you want a specific release, a list is available with hg tags
#
# hg up -r ADBLOCK_PLUS_1_1_1_RELEASE
# tar cfz adblockplus-1.1.tar.gz adblockplus Packager.pm
Source0:        adblockplus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  zip, perl, sed
# Commented, rpm seems not to be able to handle this anymore
# Requirements are defined as files in order to better cope with changing firefox/mozilla packages
#Requires:       %{_libdir}/mozilla/extensions/, %{_libdir}/mozilla/extensions/%{firefox_app_id}/
Requires:       firefox


%description
Adblock Plus is a content-filtering extension for the Mozilla Firefox- and
Mozilla Application Suite-based web browsers. Adblock Plus allows users to
prevent page elements, such as advertisements, from being downloaded and
displayed.
It features improvements to the user interface, filter subscriptions, and
element hiding over the original Adblock extesion.


%prep
%setup -q -c


%build
pushd adblockplus
perl create_xpi.pl adblockplus-%{version}-%{release}.xpi
popd


%install
rm -rf %{buildroot}
unzip adblockplus/adblockplus-%{version}-%{release}.xpi
install -D -m 644 chrome.manifest %{buildroot}%{inst_dir}/chrome.manifest
install -D -m 644 install.rdf %{buildroot}%{inst_dir}/install.rdf
install -D -m 644 components/AdblockPlus.js %{buildroot}%{inst_dir}/components/AdblockPlus.js
install -D -m 644 defaults/preferences/adblockplus.js %{buildroot}%{inst_dir}/defaults/preferences/adblockplus.js
install -D -m 644 chrome/adblockplus.jar %{buildroot}%{inst_dir}/chrome/adblockplus.jar


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{inst_dir}


%changelog
* Thu Aug 27 2009 Andreas Thienemann <andreas at bawue.net> - 1.1.1-1
- Updated to 1.1.1 upstream release

* Sun Jul 19 2009 Andreas Thienemann <andreas at bawue.net> - 1.1-1
- Updated to 1.1 upstream release

* Wed Apr 29 2009 Andreas Thienemann <andreas at bawue.net> - 1.0.2-1
- Updated to 1.0.2 upstream release

* Tue Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.0.1-1
- Initial package



From rakesh at fedoraproject.org  Thu Aug 27 13:53:16 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 27 Aug 2009 13:53:16 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/devel import.log, NONE,
	1.1 perl-Search-Xapian.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827135316.2133F11C0073@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/perl-Search-Xapian/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11340/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Search-Xapian.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
perl-Search-Xapian-1_0_11_0-5_fc11:HEAD:perl-Search-Xapian-1.0.11.0-5.fc11.src.rpm:1251380736


--- NEW FILE perl-Search-Xapian.spec ---
Name:           perl-Search-Xapian
Version:        1.0.11.0
Release:        5%{?dist}
Summary:        Xapian perl bindings

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/~olly/Search-Xapian-%{version}/Xapian.pm
Source0:        http://cpan.netnitco.net/authors/id/O/OL/OLLY/Search-Xapian-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More), xapian-core-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)), xapian-core-libs

%description
Perl XS frontend to the Xapian C++ search library.

%prep
%setup -q -n Search-Xapian-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'

find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -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
%{perl_vendorarch}/*
%{_mandir}/man3/*.3*


%changelog
* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-5
- Cleaned %%files section and fixed version in changelog

* Tue Aug 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-4
- Fixed license issue

* Tue Aug 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-3
- Fixed version tag

* Tue Aug 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-2
- Updated the license

* Tue Aug 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:56:03 -0000	1.1
+++ .cvsignore	27 Aug 2009 13:53:15 -0000	1.2
@@ -0,0 +1 @@
+Search-Xapian-1.0.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:56:04 -0000	1.1
+++ sources	27 Aug 2009 13:53:15 -0000	1.2
@@ -0,0 +1 @@
+2b5096a768e4bfcac04b316d4fa83da5  Search-Xapian-1.0.11.0.tar.gz



From rakesh at fedoraproject.org  Thu Aug 27 13:53:33 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 27 Aug 2009 13:53:33 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/F-10 import.log, NONE,
	1.1 perl-Search-Xapian.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827135333.7548911C0073@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/perl-Search-Xapian/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11323/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Search-Xapian.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
perl-Search-Xapian-1_0_11_0-5_fc11:F-10:perl-Search-Xapian-1.0.11.0-5.fc11.src.rpm:1251380758


--- NEW FILE perl-Search-Xapian.spec ---
Name:           perl-Search-Xapian
Version:        1.0.11.0
Release:        5%{?dist}
Summary:        Xapian perl bindings

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/~olly/Search-Xapian-%{version}/Xapian.pm
Source0:        http://cpan.netnitco.net/authors/id/O/OL/OLLY/Search-Xapian-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More), xapian-core-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)), xapian-core-libs

%description
Perl XS frontend to the Xapian C++ search library.

%prep
%setup -q -n Search-Xapian-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'

find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -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
%{perl_vendorarch}/*
%{_mandir}/man3/*.3*


%changelog
* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-5
- Cleaned %%files section and fixed version in changelog

* Tue Aug 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-4
- Fixed license issue

* Tue Aug 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-3
- Fixed version tag

* Tue Aug 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-2
- Updated the license

* Tue Aug 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:56:03 -0000	1.1
+++ .cvsignore	27 Aug 2009 13:53:33 -0000	1.2
@@ -0,0 +1 @@
+Search-Xapian-1.0.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:56:04 -0000	1.1
+++ sources	27 Aug 2009 13:53:33 -0000	1.2
@@ -0,0 +1 @@
+2b5096a768e4bfcac04b316d4fa83da5  Search-Xapian-1.0.11.0.tar.gz



From rakesh at fedoraproject.org  Thu Aug 27 13:53:40 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 27 Aug 2009 13:53:40 +0000 (UTC)
Subject: rpms/perl-Search-Xapian/F-11 import.log, NONE,
	1.1 perl-Search-Xapian.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827135340.E856311C0073@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/perl-Search-Xapian/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11280/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Search-Xapian.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
perl-Search-Xapian-1_0_11_0-5_fc11:F-11:perl-Search-Xapian-1.0.11.0-5.fc11.src.rpm:1251380768


--- NEW FILE perl-Search-Xapian.spec ---
Name:           perl-Search-Xapian
Version:        1.0.11.0
Release:        5%{?dist}
Summary:        Xapian perl bindings

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/~olly/Search-Xapian-%{version}/Xapian.pm
Source0:        http://cpan.netnitco.net/authors/id/O/OL/OLLY/Search-Xapian-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More), xapian-core-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)), xapian-core-libs

%description
Perl XS frontend to the Xapian C++ search library.

%prep
%setup -q -n Search-Xapian-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'

find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -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
%{perl_vendorarch}/*
%{_mandir}/man3/*.3*


%changelog
* Sun Aug 23 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-5
- Cleaned %%files section and fixed version in changelog

* Tue Aug 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-4
- Fixed license issue

* Tue Aug 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-3
- Fixed version tag

* Tue Aug 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-2
- Updated the license

* Tue Aug 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.11.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:56:03 -0000	1.1
+++ .cvsignore	27 Aug 2009 13:53:40 -0000	1.2
@@ -0,0 +1 @@
+Search-Xapian-1.0.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Search-Xapian/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:56:04 -0000	1.1
+++ sources	27 Aug 2009 13:53:40 -0000	1.2
@@ -0,0 +1 @@
+2b5096a768e4bfcac04b316d4fa83da5  Search-Xapian-1.0.11.0.tar.gz



From ixs at fedoraproject.org  Thu Aug 27 13:54:05 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 27 Aug 2009 13:54:05 +0000 (UTC)
Subject: rpms/mozilla-adblockplus/F-11 sources,1.1,1.2
Message-ID: <20090827135405.45F7511C0073@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mozilla-adblockplus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11766

Modified Files:
	sources 
Log Message:
initial checkin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 00:59:55 -0000	1.1
+++ sources	27 Aug 2009 13:54:05 -0000	1.2
@@ -0,0 +1 @@
+f932c2b1686574c9eb337e89cf2972eb  adblockplus-1.1.1.tar.gz



From ovasik at fedoraproject.org  Thu Aug 27 14:00:21 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 27 Aug 2009 14:00:21 +0000 (UTC)
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.34,1.35
Message-ID: <20090827140021.CCF0211C048B@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13387

Modified Files:
	docbook-utils.spec 
Log Message:
 provide symlink manpage for docbook2txt


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- docbook-utils.spec	13 Aug 2009 09:56:22 -0000	1.34
+++ docbook-utils.spec	27 Aug 2009 14:00:20 -0000	1.35
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 19%{?dist}
+Release: 20%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -77,6 +77,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
@@ -112,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2man.*
 %{_mandir}/*/docbook2tex.*
 %{_mandir}/*/docbook2texi.*
+%{_mandir}/*/docbook2txt.*
 %{_mandir}/*/jw.*
 %{_mandir}/*/sgmldiff.*
 %{_mandir}/*/*-spec.*
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-20
+- provide symlink manpage for docbook2txt
+
 * Thu Aug 13 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-19
 - add note about openjade limitation in rtf section of jw
   manpage(#516942)



From ixs at fedoraproject.org  Thu Aug 27 14:01:21 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 27 Aug 2009 14:01:21 +0000 (UTC)
Subject: rpms/mozilla-adblockplus/F-10 mozilla-adblockplus.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090827140121.E674411C0073@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/mozilla-adblockplus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14219

Modified Files:
	sources 
Added Files:
	mozilla-adblockplus.spec 
Log Message:
initial checkin


--- NEW FILE mozilla-adblockplus.spec ---
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%define src_ext_id \{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}
%define inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}/%{src_ext_id}

# Do not build a debug package, we have nothing to strip
%define debug_package %{nil}

Name:           mozilla-adblockplus
Version:        1.1.1
Release:        1%{?dist}
Summary:        Adblocking extension for Mozilla Firefox

Group:          Applications/Internet
License:        MPLv1.1
URL:            http://adblockplus.org/
# Source can be obtained by hg
# hg clone http://hg.mozdev.org/adblockplus/ && cd adblockplus
# If you want a specific release, a list is available with hg tags
#
# hg up -r ADBLOCK_PLUS_1_1_1_RELEASE
# tar cfz adblockplus-1.1.tar.gz adblockplus Packager.pm
Source0:        adblockplus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  zip, perl, sed
# Commented, rpm seems not to be able to handle this anymore
# Requirements are defined as files in order to better cope with changing firefox/mozilla packages
#Requires:       %{_libdir}/mozilla/extensions/, %{_libdir}/mozilla/extensions/%{firefox_app_id}/
Requires:       firefox


%description
Adblock Plus is a content-filtering extension for the Mozilla Firefox- and
Mozilla Application Suite-based web browsers. Adblock Plus allows users to
prevent page elements, such as advertisements, from being downloaded and
displayed.
It features improvements to the user interface, filter subscriptions, and
element hiding over the original Adblock extesion.


%prep
%setup -q -c


%build
pushd adblockplus
perl create_xpi.pl adblockplus-%{version}-%{release}.xpi
popd


%install
rm -rf %{buildroot}
unzip adblockplus/adblockplus-%{version}-%{release}.xpi
install -D -m 644 chrome.manifest %{buildroot}%{inst_dir}/chrome.manifest
install -D -m 644 install.rdf %{buildroot}%{inst_dir}/install.rdf
install -D -m 644 components/AdblockPlus.js %{buildroot}%{inst_dir}/components/AdblockPlus.js
install -D -m 644 defaults/preferences/adblockplus.js %{buildroot}%{inst_dir}/defaults/preferences/adblockplus.js
install -D -m 644 chrome/adblockplus.jar %{buildroot}%{inst_dir}/chrome/adblockplus.jar


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{inst_dir}


%changelog
* Thu Aug 27 2009 Andreas Thienemann <andreas at bawue.net> - 1.1.1-1
- Updated to 1.1.1 upstream release

* Sun Jul 19 2009 Andreas Thienemann <andreas at bawue.net> - 1.1-1
- Updated to 1.1 upstream release

* Wed Apr 29 2009 Andreas Thienemann <andreas at bawue.net> - 1.0.2-1
- Updated to 1.0.2 upstream release

* Tue Apr 07 2009 Andreas Thienemann <andreas at bawue.net> - 1.0.1-1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Jul 2009 00:59:55 -0000	1.1
+++ sources	27 Aug 2009 14:01:21 -0000	1.2
@@ -0,0 +1 @@
+f932c2b1686574c9eb337e89cf2972eb  adblockplus-1.1.1.tar.gz



From rdieter at fedoraproject.org  Thu Aug 27 14:02:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 14:02:36 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.116,1.117
Message-ID: <20090827140236.6247711C0073@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15062

Modified Files:
	koffice.spec 
Log Message:
my eyes deceived me, adding files that aren't there.



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- koffice.spec	27 Aug 2009 04:09:42 -0000	1.116
+++ koffice.spec	27 Aug 2009 14:02:36 -0000	1.117
@@ -698,7 +698,7 @@ update-desktop-database -q &> /dev/null 
 %files kformula
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit4_kformula.so
+#{_kde4_libdir}/libkdeinit4_kformula.so
 %{_kde4_libdir}/libkformulaprivate.so.*
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*



From ovasik at fedoraproject.org  Thu Aug 27 14:10:45 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 27 Aug 2009 14:10:45 +0000 (UTC)
Subject: rpms/star/devel star.spec,1.50,1.51
Message-ID: <20090827141045.8711A11C049B@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/star/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18492

Modified Files:
	star.spec 
Log Message:
provide symlinked manpage for ustar


Index: star.spec
===================================================================
RCS file: /cvs/extras/rpms/star/devel/star.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- star.spec	27 Aug 2009 08:00:54 -0000	1.50
+++ star.spec	27 Aug 2009 14:10:45 -0000	1.51
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
 
@@ -76,6 +76,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man
 rm -rf ${RPM_BUILD_ROOT}/usr/share/man
 rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/rmt
 mv ${RPM_BUILD_ROOT}/usr/man ${RPM_BUILD_ROOT}%{_mandir}
+ln -s star.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/ustar.1
 
 # XXX Nuke unpackaged files.
 ( cd ${RPM_BUILD_ROOT}
@@ -109,8 +110,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/spax
 %{_mandir}/man1/star.1*
 %{_mandir}/man1/spax.1*
+%{_mandir}/man1/ustar.1*
 
 %changelog
+* Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-8
+- provide symlinked manpage for ustar
+
 * Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-7
 - Merge review (#226434) changes: convert AN-1.5 to utf-8,
   spec file cosmetic/policy changes, ship README.linux in doc



From drago01 at fedoraproject.org  Thu Aug 27 14:11:57 2009
From: drago01 at fedoraproject.org (drago01)
Date: Thu, 27 Aug 2009 14:11:57 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.7,1.8
Message-ID: <20090827141158.00F0C11C0073@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19775

Modified Files:
	nss-softokn.spec 
Log Message:
Add hack to fix build


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nss-softokn.spec	26 Aug 2009 22:17:49 -0000	1.7
+++ nss-softokn.spec	27 Aug 2009 14:11:57 -0000	1.8
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          16%{?dist}
+Release:          17%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -105,7 +105,7 @@ BUILD_OPT=1
 export BUILD_OPT
 
 # Generate symbolic info for debuggers
-XCFLAGS=$RPM_OPT_FLAGS
+XCFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/nss3"
 export XCFLAGS
 
 
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 3.12.3.99.3-17
+- Add hack to fix build
+
 * Tue Aug 25 2009 Dennis Gilmore <dennis at ausil.us> - 3.12.3.99.3-16
 - only have a single Requires: line in the .pc file
 



From nucleo at fedoraproject.org  Thu Aug 27 14:13:00 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu, 27 Aug 2009 14:13:00 +0000 (UTC)
Subject: rpms/kvirc/F-11 .cvsignore, 1.3, 1.4 kvirc.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090827141300.6C2F311C0073@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20860

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
svn r3429 compatible with openssl >=1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Aug 2009 12:13:13 -0000	1.3
+++ .cvsignore	27 Aug 2009 14:13:00 -0000	1.4
@@ -1 +1 @@
-kvirc-20090826svn3426.tar.bz2
+kvirc-20090827svn3429.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kvirc.spec	26 Aug 2009 12:13:14 -0000	1.2
+++ kvirc.spec	27 Aug 2009 14:13:00 -0000	1.3
@@ -1,17 +1,17 @@
-%define           rev 3426
-%define           pre 20090826svn%{rev}
+%define           rev 3429
+%define           pre 20090827svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.9.%{pre}%{?dist}
+Release:          0.11.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3426 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090826svn3426.tar.bz2 kvirc
+#  svn export -r 3429 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090827svn3429.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
@@ -129,15 +129,18 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
+- svn snapshot 3429 that includes patch for openssl >=1.0
+
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.10.20090826svn3426
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
-- svn snapshot 3426 that builds with new openssl
+- svn snapshot 3426
 - Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
 - Added -DWITH_ix86_ASM and -DMANUAL_REVISION
 - Added BR: esound-devel
 
-* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
-- rebuilt with new openssl
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2009 12:13:14 -0000	1.3
+++ sources	27 Aug 2009 14:13:00 -0000	1.4
@@ -1 +1 @@
-ef83b1fa6b8c9598a4f2aadb4217be2d  kvirc-20090826svn3426.tar.bz2
+15f9b94160d66eb2c043cb79aad3889c  kvirc-20090827svn3429.tar.bz2



From rdieter at fedoraproject.org  Thu Aug 27 14:18:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 14:18:30 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.273,1.274
Message-ID: <20090827141830.B188311C0073@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24954

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
- PolicyKit-kde subpkg (#519172, #519654)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- kdebase-workspace.spec	26 Aug 2009 14:55:14 -0000	1.273
+++ kdebase-workspace.spec	27 Aug 2009 14:18:30 -0000	1.274
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -37,11 +37,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < 4.3.0-100
-Provides:  PolicyKit-kde = %{version}-100
-# This can be used by apps which want to use the PolicyKit
-# frontend implementation of the desktop they are running under
-Provides: PolicyKit-authentication-agent
+Requires: PolityKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -198,6 +194,15 @@ BuildArch: noarch
 %description -n oxygen-cursor-themes
 %{summary}.
 
+%package -n PolicyKit-kde
+Summary: PolicyKit integration for the KDE desktop
+Group: System Environment/Libraries
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
+%description -n PolicyKit-kde
+This package provides a PolicyKit Authentication Frontend for KDE
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -279,6 +284,9 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/f
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
+## unpackaged files
+rm -fv %{buildroot}%{_kde4_libdir}/libpolkitkdeprivate*.so
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -312,6 +320,10 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+%post -n PolicyKit-kde -p /sbin/ldconfig
+
+%postun -n PolicyKit-kde -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -340,7 +352,6 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/polkit-kde-authorization
 %{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
@@ -391,6 +402,7 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -400,6 +412,8 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -407,7 +421,6 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
-%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -418,6 +431,7 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -442,7 +456,6 @@ fi
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
-%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
@@ -467,6 +480,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -502,7 +516,6 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
-
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -529,6 +542,20 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%files -n PolicyKit-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%{_kde4_libexecdir}/polkit-kde-manager
+%{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
+#files -n PolicyKit-kde-libs
+#defattr(-,root,root,-)
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+
 %files python-applet
 %defattr(-,root,root,-)
 %{python_sitearch}/PyKDE4/plasmascript.py*
@@ -544,6 +571,9 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
+- PolicyKit-kde subpkg (#519172, #519654)
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-11
 - Requires: system-backgrounds-kde (f12+)
 



From nucleo at fedoraproject.org  Thu Aug 27 14:30:24 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Thu, 27 Aug 2009 14:30:24 +0000 (UTC)
Subject: rpms/kvirc/F-10 .cvsignore, 1.3, 1.4 kvirc.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090827143024.1300111C04F3@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1788

Modified Files:
	.cvsignore kvirc.spec sources 
Log Message:
svn r3429 compatible with openssl >=1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Aug 2009 12:39:55 -0000	1.3
+++ .cvsignore	27 Aug 2009 14:30:23 -0000	1.4
@@ -1 +1 @@
-kvirc-20090826svn3426.tar.bz2
+kvirc-20090827svn3429.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/kvirc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kvirc.spec	26 Aug 2009 12:39:55 -0000	1.2
+++ kvirc.spec	27 Aug 2009 14:30:23 -0000	1.3
@@ -1,17 +1,17 @@
-%define           rev 3426
-%define           pre 20090826svn%{rev}
+%define           rev 3429
+%define           pre 20090827svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.9.%{pre}%{?dist}
+Release:          0.11.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3426 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090826svn3426.tar.bz2 kvirc
+#  svn export -r 3429 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090827svn3429.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
@@ -129,15 +129,18 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
+- svn snapshot 3429 that includes patch for openssl >=1.0
+
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.10.20090826svn3426
+- rebuilt with new openssl
+
 * Wed Aug 26 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.9.20090826svn3426
-- svn snapshot 3426 that builds with new openssl
+- svn snapshot 3426
 - Added -DWANT_COEXISTENCE=OFF, binary name changed to kvirc
 - Added -DWITH_ix86_ASM and -DMANUAL_REVISION
 - Added BR: esound-devel
 
-* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
-- rebuilt with new openssl
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2009 12:39:55 -0000	1.3
+++ sources	27 Aug 2009 14:30:23 -0000	1.4
@@ -1 +1 @@
-ef83b1fa6b8c9598a4f2aadb4217be2d  kvirc-20090826svn3426.tar.bz2
+15f9b94160d66eb2c043cb79aad3889c  kvirc-20090827svn3429.tar.bz2



From dwalsh at fedoraproject.org  Thu Aug 27 14:36:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 27 Aug 2009 14:36:40 +0000 (UTC)
Subject: rpms/xguest/devel xguest.spec,1.14,1.15
Message-ID: <20090827143640.77CB211C0073@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/xguest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5999

Modified Files:
	xguest.spec 
Log Message:
* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.7-7
- Switch to use policycoreutils-sandbox init script



Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/xguest.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xguest.spec	27 Jul 2009 08:04:18 -0000	1.14
+++ xguest.spec	27 Aug 2009 14:36:40 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
 Version: 1.0.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -11,7 +11,7 @@ URL: http://people.fedoraproject.org/~dw
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): pam >= 0.99.8.1-17 selinux-policy > 3.6.3-12 selinux-policy-base
-Requires(pre): policycoreutils-python
+Requires(pre): policycoreutils-sandbox
 Requires(post): sabayon-apply
 Requires: gdm >= 1:2.20.0-15.fc8
 
@@ -34,11 +34,9 @@ mounted on tmpfs.
 %install
 %{__rm} -fR %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/desktop-profiles
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/security/namespace.d/ls
 install -m0644 xguest.zip %{buildroot}/%{_sysconfdir}/desktop-profiles/
 install -m0644 xguest.conf %{buildroot}/%{_sysconfdir}/security/namespace.d/
-install -m0755 xguest.init %{buildroot}/%{_sysconfdir}/rc.d/init.d/xguest
 
 %pre
 if [ $1 -eq 1 ]; then
@@ -58,7 +56,6 @@ fi
 
 %post
 if [ $1 -eq 1 ]; then
-/sbin/chkconfig xguest --add
 
 # Add two directories to /etc/skell so pam_namespace will label properly
 mkdir /etc/skel/.mozilla 2> /dev/null
@@ -75,7 +72,6 @@ fi
 %files
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/desktop-profiles/xguest.zip
-%{_sysconfdir}/rc.d/init.d/xguest
 %{_sysconfdir}/security/namespace.d/
 %doc README LICENSE
 
@@ -89,10 +85,12 @@ db = userdb.get_database()
 db.set_profile("xguest", "")
 __eof
 
-/sbin/chkconfig --del xguest 
 fi
 
 %changelog
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.7-7
+- Switch to use policycoreutils-sandbox init script
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Thu Aug 27 14:41:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 27 Aug 2009 14:41:40 +0000 (UTC)
Subject: rpms/orsa/devel orsa.spec,1.11,1.12
Message-ID: <20090827144140.65F6E11C0073@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/orsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9623

Modified Files:
	orsa.spec 
Log Message:
- Make compliant to new MPI guidelines:
- Do not build in %%install (resolves BZ#513697)
- Split docs into a -common subpackage




Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/devel/orsa.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- orsa.spec	24 Jul 2009 11:44:40 -0000	1.11
+++ orsa.spec	27 Aug 2009 14:41:39 -0000	1.12
@@ -1,6 +1,9 @@
+# Define a macro for calling ../configure instead of ./configure
+%global dconfigure %(printf %%s '%configure' | sed 's!\./configure!../configure!g')
+
 Name:			orsa
 Version:		0.7.0
-Release:		10%{?dist}
+Release:		11%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -34,6 +37,8 @@ BuildRequires:	gsl-devel
 BuildRequires:	cln-devel
 BuildRequires:	ginac-devel
 
+Requires:	%{name}-common = %{version}-%{release}
+
 %description
 ORSA is an interactive tool for scientific grade Celestial Mechanics
 computations. Asteroids, comets, artificial satellites, Solar and extra-Solar
@@ -57,6 +62,8 @@ Summary:	A build of %{name} with support
 Group:		Applications/Engineering
 
 BuildRequires: openmpi-devel
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	openmpi
 
 %description openmpi
 This package contains a build of %{name} with support for OpenMPI.
@@ -77,6 +84,8 @@ Summary:	A build of %{name} with support
 Group:		Applications/Engineering
 
 BuildRequires: mpich2-devel
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	mpich2
 
 %description mpich2
 This package contains a build of %{name} with support for MPICH2 MPI.
@@ -97,6 +106,8 @@ Summary:	A build of %{name} with support
 Group:		Applications/Engineering
 
 BuildRequires: lam-devel
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	lam
 
 %description lam
 This package contains a build of %{name} with support for LAM MPI.
@@ -119,6 +130,13 @@ Group:		Development/Libraries
 %description headers
 This package contains C++ header files for development with %{name}.
 
+%package common
+Summary:	Common files for %{name}
+Group:		Documentation
+
+%description common
+This package contains files shared across the MPI/non-MPI builds of %{name}.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -129,16 +147,18 @@ This package contains C++ header files f
 install -p -m644 %{SOURCE1} .
 
 %build
-# Have to build in the install step to do multiple builds
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
 # honor $RPM_OPT_FLAGS
 sed -i 's|-g -Wall -W -pipe -ftemplate-depth-64 -O3 -fno-exceptions -funroll-loops -fstrict-aliasing -fno-gcse|$CXXFLAGS|' configure
 
-# common configure options for MPI as well as non-MPI builds
-%global confflags --disable-dependency-tracking --disable-static "CLN_CONFIG=`which pkg-config` cln" "GINACLIB_CONFIG=`which pkg-config` ginac" CXXFLAGS="$CXXFLAGS -DHAVE_INLINE"
+# To avoid replicated code define a build macro
+%define dobuild() \
+mkdir $MPI_COMPILER; \
+cd $MPI_COMPILER; \
+%dconfigure $WITH_MPI --prefix=$MPI_HOME --bindir=$MPI_BIN --libdir=$MPI_LIB --program-suffix=$MPI_SUFFIX --disable-dependency-tracking --disable-static "CLN_CONFIG=`which pkg-config` cln" "GINACLIB_CONFIG=`which pkg-config` ginac" CXXFLAGS="$CXXFLAGS -DHAVE_INLINE" ;\
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool ;\
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool ;\
+make %{?_smp_mflags} ; \
+cd ..
 
 # load the module function
 . /etc/profile.d/modules.sh
@@ -146,51 +166,35 @@ sed -i 's|-g -Wall -W -pipe -ftemplate-d
 %global OpenMPI_LIB %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_LIB)
 %global LAM_BIN %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_BIN | sed 's|-L||')
 %global LAM_LIB %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_LIB | sed 's|-L||')
-%global MPICH_BIN %(. /etc/profile.d/modules.sh; module load %{_datadir}/mpich2/mpich2.module; echo $PATH | cut -f 1 -d :)
+%global MPICH_BIN %(. /etc/profile.d/modules.sh; module load mpich2.module; echo $PATH | cut -f 1 -d :)
 
 ################################
 echo -e "\n##############################\nNow making the non-MPI version\n##############################\n"
 ################################
 
-%configure --without-mpi %{confflags}
-# remove 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}
-make install DESTDIR=$RPM_BUILD_ROOT
-# we don't want to ship libtool archives:
-rm $RPM_BUILD_ROOT%{_libdir}/{liborsa.la,libxorsa.la}
-make clean
+# Build serial version, dummy arguments
+MPI_COMPILER=serial MPI_SUFFIX= WITH_MPI=--without-mpi MPI_HOME=%{_prefix} MPI_BIN=%{_bindir} MPI_LIB=%{_libdir} %dobuild
+
+# Build parallel versions: set compiler variables to MPI wrappers
+export CC=mpicc
+export CXX=mpicxx
+export FC=mpif90
+export F77=mpif77
 
 ################################
 echo -e "\n##############################\nNow making the OpenMPI version\n##############################\n"
 ################################
+
 module load openmpi-%{_arch}
-%configure --with-mpi --prefix=$MPI_HOME --bindir=$MPI_BIN --libdir=$MPI_LIB %{confflags}
-# remove 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 CC=mpicc %{?_smp_mflags}
-make install DESTDIR=$RPM_BUILD_ROOT
-# we don't want to ship libtool archives:
-rm $RPM_BUILD_ROOT/$MPI_LIB/{liborsa.la,libxorsa.la}
-make clean
+MPI_COMPILER=openmpi MPI_SUFFIX=_openmpi WITH_MPI=--with-mpi %dobuild
 module unload openmpi-%{_arch}
 
 ################################
 echo -e "\n##############################\nNow making the MPICH2 version\n##############################\n"
 ################################
-module load %{_datadir}/mpich2/mpich2.module
-%configure --with-mpi --bindir=%{MPICH_BIN} --libdir=%{_libdir}/mpich2/ %{confflags} MPICXX=mpicxx
-# remove 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 CC=mpicxx %{?_smp_mflags}
-make install DESTDIR=%{buildroot} 
-# we don't want to ship libtool archives:
-rm $RPM_BUILD_ROOT%{_libdir}/mpich2/{liborsa.la,libxorsa.la}
-make clean
-module unload %{_datadir}/mpich2/mpich2.module
+module load mpich2.module
+MPI_COMPILER=mpich2 MPI_BIN=%{MPICH_BIN} MPI_LIB=%{_libdir}/mpich2/ MPICXX=mpicxx MPI_SUFFIX=_mpich2 CC=mpicxx WITH_MPI=--with-mpi %dobuild
+module unload mpich2.module
 
 ################################
 echo -e "\n##############################\nNow making the LAM version\n##############################\n"
@@ -199,14 +203,42 @@ module load lam-%{_arch}
 export MPI_HOME=`echo $MPI_HOME | sed 's|-L||'`
 export MPI_BIN=`echo $MPI_BIN | sed 's|-L||'`
 export MPI_LIB=`echo $MPI_LIB | sed 's|-L||'`
-%configure --with-mpi --prefix=$MPI_HOME --bindir=$MPI_BIN --libdir=$MPI_LIB %{confflags} MPICXX=mpic++
-# remove 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 CC=mpic++ %{?_smp_mflags}
-make install DESTDIR=%{buildroot} 
+MPI_COMPILER=lam CC=mpic++ MPICXX=mpic++ WITH_MPI=--with-mpi MPI_SUFFIX=_lam %dobuild
+module unload lam-%{_arch}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
 # we don't want to ship libtool archives:
-rm $RPM_BUILD_ROOT/$MPI_LIB/{liborsa.la,libxorsa.la}
+
+# load the module function
+. /etc/profile.d/modules.sh
+
+# Install serial version
+make -C serial install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
+rm $RPM_BUILD_ROOT%{_libdir}/{liborsa.la,libxorsa.la}
+
+# Install OpenMPI version
+module load openmpi-%{_arch}
+MPI_COMPILER=openmpi
+make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
+rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
+module unload openmpi-%{_arch}
+
+# Install MPICH2 version
+module load mpich2.module
+MPI_COMPILER=mpich2
+make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
+rm $RPM_BUILD_ROOT%{_libdir}/mpich2/{liborsa.la,libxorsa.la}
+module unload mpich2.module
+
+# Install LAM version
+module load lam-%{_arch}
+MPI_COMPILER=lam
+MPI_LIB=`echo $MPI_LIB | sed 's|-L||'`
+make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
+rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
+module unload lam-%{_arch}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -217,7 +249,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING DEVELOPERS ORSA_MPI
 %{_bindir}/xorsa
 %{_libdir}/liborsa.so.*
 %{_libdir}/libxorsa.so.*
@@ -232,7 +263,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files openmpi
 %defattr(-,root,root,-)
-%doc COPYING DEVELOPERS ORSA_MPI
 %{OpenMPI_LIB}/liborsa.so.*
 %{OpenMPI_LIB}/libxorsa.so.*
 %{OpenMPI_BIN}/*
@@ -243,7 +273,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mpich2
 %defattr(-,root,root,-)
-%doc COPYING DEVELOPERS ORSA_MPI
 %{MPICH_BIN}/*
 %{_libdir}/mpich2/liborsa.so.*
 %{_libdir}/mpich2/libxorsa.so.*
@@ -254,7 +283,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files lam
 %defattr(-,root,root,-)
-%doc COPYING DEVELOPERS ORSA_MPI
 %{LAM_LIB}/liborsa.so.*
 %{LAM_LIB}/libxorsa.so.*
 %{LAM_BIN}/*
@@ -263,7 +291,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{LAM_LIB}/*.so
 
+%files common
+%defattr(-,root,root,-)
+%doc COPYING DEVELOPERS ORSA_MPI
+
 %changelog
+* Thu Aug 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-11
+- Make compliant to new MPI guidelines:
+- Do not build in %%install (resolves BZ#513697)
+- Split docs into a -common subpackage
+
 * Fri Jul 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-10
 - Reenabled MPI support in a way described in BZ#511099, introduced
   separate subpackages with support for OpenMPI, MPICH2 and LAM MPI



From notting at fedoraproject.org  Thu Aug 27 14:49:41 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 27 Aug 2009 14:49:41 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.97,1.98
Message-ID: <20090827144941.F330811C0073@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12701

Modified Files:
	comps-f12.xml.in 
Log Message:
Add a sendmail entry to the Core group.

At the moment, packages in the Core group (cronie, for example) require
a MTA. Without specifying a group, one is pulled in via yum depsolving
rules, usually 'shortest-name-wins'. That's a bad way to set a default,
and causes other side effects, like minimal installs requiring multiple
CDs.

I'm not convinced that sendmail is *better* than other alternatives;
however, it is consistent with the current defaults in Base and Mail
Server.

The 'regression' case would be someone doing inidividual package
selection deselecting sendmail, and selecting some other MTA. They'd get
both installed. Kickstart can be used to overcome this.

If we get to the point that things in the Core group no longer require a
MTA, we can remove this. Until then, we should not be pulling in a random
one. 




Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- comps-f12.xml.in	27 Aug 2009 12:53:04 -0000	1.97
+++ comps-f12.xml.in	27 Aug 2009 14:49:40 -0000	1.98
@@ -778,6 +778,7 @@
       <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>
     </packagelist>



From buc at fedoraproject.org  Thu Aug 27 14:55:14 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Thu, 27 Aug 2009 14:55:14 +0000 (UTC)
Subject: rpms/libtranslate/F-11 libtranslate-services.xml.in-20090826, NONE, 
	1.1 libtranslate.spec, 1.26,
	1.27 libtranslate-0.99-services.diff, 1.1,
	NONE libtranslate-0.99-update-services.patch, 1.1,
	NONE libtranslate-0.99-update-services1.patch, 1.1, NONE
Message-ID: <20090827145514.22A7A11C0073@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16788

Modified Files:
	libtranslate.spec 
Added Files:
	libtranslate-services.xml.in-20090826 
Removed Files:
	libtranslate-0.99-services.diff 
	libtranslate-0.99-update-services.patch 
	libtranslate-0.99-update-services1.patch 
Log Message:



--- NEW FILE libtranslate-services.xml.in-20090826 ---
<?xml version="1.0"?>
<!DOCTYPE services SYSTEM "services.dtd">

<!-- Copyright (C) 2005 Jean-Yves Lefort -->
<!-- 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 Jean-Yves Lefort nor the names of its contributors -->
<!--    may be used to endorse or promote products derived from this software -->
<!--    without specific prior written permission. -->

<!-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -->
<!-- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -->
<!-- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
<!-- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -->
<!-- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -->
<!-- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -->
<!-- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -->
<!-- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -->
<!-- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -->
<!-- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -->
<!-- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -->
<!-- POSSIBILITY OF SUCH DAMAGE. -->

<!-- Changelog: -->

<!--   2009.08.26 <Dmitry at Butskoy.name> -->
<!--   - commit changes from the upstream's libtranslate-0.99-services.diff patch -->
<!--   - commit changes from Fedora patches (by Dwayne Bailey, <dwayne at translate.org.za>) -->


<services>
  <custom-language tag="oc_aran" _name="Aranese"/>
  <custom-language tag="pt-BR" _name="Portuguese (Brazil)"/>
  <custom-language tag="zh-TW" _name="Chinese (Taiwan)"/>
  
  <service name="babelfish" nick="Babel Fish">
    <group>
      <language tag="zh" to="en,zh-TW"/>
      <language tag="zh-TW" service-tag="zt" to="en,zh"/>
      <language tag="en" to="*"/>
      <language tag="nl" to="en,fr"/>
      <language tag="fr" to="en,de,el,it,pt,nl,es"/>
      <language tag="de" to="en,fr"/>
      <language tag="el" to="en,fr"/>
      <language tag="it" to="en,fr"/>
      <language tag="ja" to="en"/>
      <language tag="ko" to="en"/>
      <language tag="pt" to="en,fr"/>
      <language tag="ru" to="en"/>
      <language tag="es" to="en,fr"/>
      <text-translation url="http://babelfish.altavista.com/babelfish/tr?urltext=${text:escape}&amp;lp=${from}_${to}&amp;enc=utf8">
	<pre-marker text="&lt;form action=&quot;http://www.altavista.com/web/results"/>
	<pre-marker text="px;&gt;"/>
	<post-marker text="&lt;/div&gt;"/>
      </text-translation>
      <web-page-translation url="http://babelfish.altavista.com/babelfish/trurl_load?url=${url:escape}&amp;lp=${from}_${to}&amp;enc=utf8"/>
    </group>
  </service>

  <service name="systran" nick="SYSTRAN">
    <group>
      <language tag="ar" to="en"/>
      <language tag="zh" to="en"/>
      <language tag="zh-TW" service-tag="zt" to="en"/>
      <language tag="nl" to="en,fr"/>
      <language tag="en" to="*"/>
      <language tag="fr" to="nl,en,de,it,pt,es"/>
      <language tag="de" to="en,fr"/>
      <language tag="it" to="en,fr"/>
      <language tag="ja" to="en"/>
      <language tag="ko" to="en"/>
      <language tag="pt" to="en,fr"/>
      <language tag="ru" to="en"/>
      <language tag="es" to="en,fr"/>
      <language tag="sv" to="en"/>
      <text-translation url="http://www2.systranbox.com/sai?gui=sbox/normal/systran/sboxEN&amp;lp=${from}_${to}&amp;service=translate" post="${text}">
	<pre-marker text="body=&#10;"/>
      </text-translation>
      <web-page-translation url="http://svsurl.systransoft.com/?trans=1&amp;gui=sbox/normal/systran/systranEN&amp;lp=${from}_${to}&amp;loc_lang=en&amp;path=systran/systranEN&amp;frame=1&amp;url=${url:escape}"/>
    </group>
  </service>

  <service name="google" nick="Google">
    <group>
      <language tag="af" to="*"/>
      <language tag="ar" to="*"/>
      <language tag="bg" to="*"/>
      <language tag="be" to="*"/>
      <language tag="ca" to="*"/>
      <language tag="cs" to="*"/>
      <language tag="cy" to="*"/>
      <language tag="da" to="*"/>
      <language tag="de" to="*"/>
      <language tag="el" to="*"/>
      <language tag="en" to="*"/>
      <language tag="es" to="*"/>
      <language tag="et" to="*"/>
      <language tag="fa" to="*"/>
      <language tag="fi" to="*"/>
      <language tag="fil" to="*"/>
      <language tag="fr" to="*"/>
      <language tag="ga" to="*"/>
      <language tag="gl" to="*"/>
      <language tag="he" to="*"/>
      <language tag="hi" to="*"/>
      <language tag="hr" to="*"/>
      <language tag="hu" to="*"/>
      <language tag="id" to="*"/>
      <language tag="is" to="*"/>
      <language tag="it" to="*"/>
      <language tag="ja" to="*"/>
      <language tag="ko" to="*"/>
      <language tag="lt" to="*"/>
      <language tag="lv" to="*"/>
      <language tag="mk" to="*"/>
      <language tag="ms" to="*"/>
      <language tag="mt" to="*"/>
      <language tag="nl" to="*"/>
      <language tag="nb" service-tag="no" to="*"/> <!-- Google does not differentiate these two dialects -->
      <language tag="nn" service-tag="no" to="*"/> <!-- probably needs review by a native speaker -->
      <language tag="pl" to="*"/>
      <language tag="pt" to="*"/>
      <language tag="ro" to="*"/>
      <language tag="ru" to="*"/>
      <language tag="sk" to="*"/>
      <language tag="sl" to="*"/>
      <language tag="sq" to="*"/>
      <language tag="sr" to="*"/>
      <language tag="sv" to="*"/>
      <language tag="sw" to="*"/>
      <language tag="th" to="*"/>
      <language tag="tl" to="*"/>
      <language tag="tr" to="*"/>
      <language tag="uk" to="*"/>
      <language tag="vi" to="*"/>
      <language tag="yi" to="*"/>
      <language tag="zh" service-tag="zh-CN" to="*"/>
      <language tag="zh-TW" to="*"/>
      <text-translation url="http://www.google.com/translate_t?text=${text:escape}&amp;langpair=${from}|${to}&amp;ie=utf8&amp;oe=utf8">
	<pre-marker text="&lt;div id="/>
	<pre-marker text="result_box"/>
	<pre-marker text="&gt;"/>
	<post-marker text="&lt;/div&gt;"/>
      </text-translation>
      <web-page-translation url="http://translate.google.com/translate?u=${url:escape}&amp;sl=${from}&amp;tl=${to}"/>
    </group>
  </service>

  <service name="freetranslation" nick="FreeTranslation" max-chunk-len="600">
    <group>
      <language tag="nl" service-tag="dutch" to="en"/>
      <language tag="en" service-tag="english" to="*"/>
      <language tag="fr" service-tag="french" to="en"/>
      <language tag="de" service-tag="german" to="en"/>
      <language tag="it" service-tag="italian" to="en"/>
      <language tag="no" service-tag="norwegian"/>
      <language tag="pt" service-tag="portuguese" to="en"/>
      <language tag="es" service-tag="spanish" to="en"/>
      <text-translation url="http://ets.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
      <web-page-translation url="http://fets5.freetranslation.com/?sequence=core&amp;url=${url:escape}&amp;language=${from}/${to}"/>
    </group>
    <group>
      <language tag="zh" service-tag="simplifiedchinese"/>
      <language tag="zh-TW" service-tag="traditionalchinese"/>
      <language tag="en" service-tag="english" to="*"/>
      <language tag="ru" service-tag="russian" to="en"/>
      <text-translation url="http://ets6.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
    </group>
    <group>
      <language tag="en" service-tag="english" to="*"/>
      <language tag="ja" service-tag="japanese" to ="en"/>
      <text-translation url="http://tets9.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
    </group>
  </service>

  <service name="1800translate" nick="1-800-Translate">
    <group>
      <language tag="en" service-tag="English" to="*"/>
      <language tag="ar" service-tag="Arabic" to="*"/>
      <language tag="zh" service-tag="Chinese" to="*"/>
      <language tag="nl" service-tag="Dutch" to="*"/>
      <language tag="fa" service-tag="Farsi" to="*"/>
      <language tag="fr" service-tag="French" to="*"/>
      <language tag="de" service-tag="German" to="*"/>
      <language tag="he" service-tag="Hebrew" to="*"/>
      <language tag="it" service-tag="Italian" to="*"/>
      <language tag="ja" service-tag="Japanese" to="*"/>
      <language tag="ko" service-tag="Korean" to="*"/>
      <language tag="pl" service-tag="Polish" to="*"/>
      <language tag="pt" service-tag="Portuguese" to="*"/>
      <language tag="ru" service-tag="Russian" to="*"/>
      <language tag="es" service-tag="Spanish" to="*"/>
      <language tag="tr" service-tag="Turkish" to="*"/>
      <language tag="uk" service-tag="Ukrainian" to="*"/>
      <text-translation
	url="http://www.1-800-translate.com/machine_trans/process_free_trans.asp"
	post="transfrom=${from}&amp;transto=${to}&amp;transtext=${text:escape}&amp;expiredlang=no">
	<pre-marker text="&lt;textarea name=&quot;transresult"/>
	<pre-marker text="&gt;&#10;"/>
	<post-marker text="&#10;&lt;/textarea&gt;"/>
      </text-translation>
    </group>
  </service>
    
  <service name="kataku" nick="Kataku">
    <group>
      <language tag="en" to="*"/>
      <language tag="id" service-tag="in" to="*"/>
      <text-translation
	url="http://www.toggletext.com/kataku_trial.php"
	post="input_text=${text:charset=ISO8859-1,escape}&amp;langset_text=${from}_${to}">
	<pre-marker text="Translation:"/>
	<pre-marker text="&lt;pre"/>
	<pre-marker text="&gt;"/>
	<post-marker text="&#10;&lt;/pre&gt;"/>
      </text-translation>
      <web-page-translation url="http://www.toggletext.com/kataku_webpage_translate.php?input=${url:escape}&amp;langset=${from}_${to}"/>
    </group>
  </service>

  <service name="papiamentu" nick="Papiamentu">
    <group>
      <language tag="en" service-tag="E" to="*"/>
      <language tag="pap" service-tag="P" to="*"/>
      <text-translation url="http://www.donamaro.nl/papiamentu/index.php?pAction=tradusi&amp;pSel=${from}2${to}&amp;pFrom=${text:charset=ISO8859-1,escape}">
	<pre-marker text="&lt;textarea name=&quot;pTo&quot;"/>
	<pre-marker text="&gt;"/>
	<post-marker text="&lt;/textarea&gt;"/>
      </text-translation>
    </group>
  </service>

  <service nick="PROMT Online-Translator" name="promt" max-chunk-len="450">
    <group>
      <language to="de,es,fr,pt,ru" tag="en" service-tag="e"/>
      <language to="en,fr,es,ru" tag="de" service-tag="g"/>
      <language to="de,en,fr,ru" tag="es" service-tag="s"/>
      <language to="de,en,es,ru" tag="fr" service-tag="f"/>
      <language to="en,ru" tag="it" service-tag="i"/>
      <language to="en" tag="pt" service-tag="p"/>
      <language to="de,en,es,fr" tag="ru" service-tag="r"/>
      <text-translation url="http://www.online-translator.com/text.asp" post="lang=en&amp;status=translate&amp;source=${text:charset=windows-1251,escape}&amp;direction=${from}${to}&amp;template=General">
	<pre-marker text="&lt;div id=&quot;r_text"/>
	<pre-marker text="&gt;"/>
	<pre-marker text="&#10;"/>
	<post-marker text="&lt;/div&gt;"/>
      </text-translation>
      <web-page-translation url="http://www.online-translator.com/url/tran_url.asp?lang=en&amp;url=${url:escape}&amp;$direction=${from}${to}&amp;template=General&amp;cp1=NO&amp;cp2=NO&amp;autotranslate=on"/>
    </group>
  </service>

  <service nick="Apertium" name="apertium">
    <group>
      <!-- Need a better code for Aranese a dialect of Occitan
           current is oc_aran there is no ISO equivalent -->
      <language to="en,es,eo,fr,oc,oc_aran" tag="ca"/>
      <language to="en" tag="cy"/>
      <language to="ca,es,gl" tag="en"/>
      <language to="ca,en,eo,fr,gl,pt,pt-BR" tag="es"/>
      <language to="es" tag="eu"/>
      <language to="ca,es" tag="fr"/>
      <language to="en,es" tag="gl"/>
      <language to="es" tag="pt"/>
      <language tag="pt-BR" service-tag="pt_BR"/>
      <language to="ca" tag="oc"/>
      <language to="es" tag="ro"/>
      <text-translation url="http://xixona.dlsi.ua.es/webservice/ws.php?text=${text:escape}&amp;mode=${from}-${to}"/>
      <web-page-translation url="http://www.apertium.org/apertium/tradurl.php?marcar=&amp;direccion=${from}-${to}&amp;inurl=${url:escape}"/>
    </group>
  </service>
  <!-- Re-enable if you want to use or test the unstable Apertium pairs
  <service nick="Apertium (Unstable)" name="apertium-unstable">
    <group>
      <language to="en" tag="af"/>
      <language to="en,es,eo,fr,oc,oc_aran,pt" tag="ca"/> 
      <language to="af,ca" tag="en"/>
      <language to="ca,eo,fr,gl,oc,oc_aran,pt,pt-BR" tag="es"/>
      <language to="ca,es" tag="fr"/>
      <language to="es" tag="gl"/>
      <language to="ca,es" tag="oc"/>
      <language to="ca,es" tag="oc_aran"/>
      <language to="ca,es" tag="pt"/>
      <language tag="pt-BR" service-tag="pt_BR"/>
      <language to="ca" tag="ro"/>
      <text-translation url="http://xixona.dlsi.ua.es/apertium-unstable/tradtextjs.php" post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
    </group>
  </service> -->
  <!-- Re-enable if you want to use or test the alph/testing Apertium pairs
  <custom-language tag="sh-BS" _name="Serbo-Croatian (Sarajevo)"></custom-language>
  <custom-language tag="sh-HR" _name="Serbo-Croatian (Zagreb)"></custom-language>
  <custom-language tag="sh-SR" _name="Serbo-Croatian (Belgrade)"></custom-language>

  <service nick="Apertium (Alpha Testing)" name="apertium-alpha-testing">
    <group>
      <language to="en" tag="af"/>
      <language to="fr" tag="br"/>
      <language to="en,es,eo,fr,oc,oc_aran,pt,ro" tag="ca"/> 
      <language to="en" tag="cy"/>
      <language to="sv" tag="da"/>
      <language to="af,ca,cy,es,eo,gl" tag="en"/>
      <language to="en" tag="eo"/>
      <language to="es" tag="eu"/>
      <language to="ca,en,eo,fr,gl,it,oc,oc_aran,pt,pt-BR,ro" tag="es"/>
      <language to="tg" tag="fa"/>
      <language to="ca,es" tag="fr"/>
      <language to="sco" tag="ga"/>
      <language to="en,es,pt" tag="gl"/>
      <language to="es" tag="it"/>
      <language to="sh-BS,sh-HR,sh-SR" tag="mk"/>
      <language to="nn" tag="nb"/>
      <language to="nb" tag="nn"/>
      <language to="ca,es" tag="oc"/>
      <language to="ca,es" tag="oc_aran"/>
      <language to="ca,es,gl" tag="pt"/>
      <language tag="pt-BR" service-tag="pt_BR"/>
      <language to="ca,es" tag="ro"/>
      <language to="ga" tag="sco"/>
      <language to="smj" tag="se"/>
      <language to="mk" tag="sh"/>
      <language tag="sh-BS" service-tag="sh_BS"/>
      <language tag="sh-HR" service-tag="sh_HR"/>
      <language tag="sh-SR" service-tag="sh_SR"/>
      <language to="da" tag="sv"/>
      <language to="fa" tag="tg"/>
      <text-translation url="http://xixona.dlsi.ua.es/testing/index.php" post="lang=&amp;inputarea=${text}&amp;direction=${from}-${to}&amp;marcar=0&amp;interm=0&amp;mangle=true">
        <pre-marker text="&lt;div class=&quot;outbox&quot;&gt;"/>
        <pre-marker text="&lt;p style="/>
        <pre-marker text="&lt;/p&gt;"/>
        <post-marker text="&lt;/div&gt;"/>
      </text-translation>
    </group>
  </service> -->

  <service nick="Opentrad" name="opentrad">
    <group>
      <language to="es" tag="ca"/>
      <language to="ca,gl,eu" tag="es"/>
      <language to="es" tag="gl"/>
      <text-translation
      url="http://opentrad.org/tradtextjs.php"
      post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
      <!-- All newlines have <br/> in them, again a pitty for processing would be nice if we could cleanup -->
      <!-- No web-page-translation added -->
    </group>
  </service>
</services>


Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/F-11/libtranslate.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libtranslate.spec	3 Mar 2009 17:43:05 -0000	1.26
+++ libtranslate.spec	27 Aug 2009 14:55:13 -0000	1.27
@@ -1,20 +1,18 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
-Source: %{url}/libtranslate-%{version}.tar.gz
+Source0: %{url}/libtranslate-%{version}.tar.gz
+Source1: libtranslate-services.xml.in-20090826
 Patch1: %{url}/libtranslate-0.99-charsetparse.diff
 Patch2: %{url}/libtranslate-0.99-condfix.diff
 Patch3: %{url}/libtranslate-0.99-int64.diff
 Patch4: %{url}/libtranslate-0.99-postmarker.diff
-Patch5: %{url}/libtranslate-0.99-services.diff
 Patch10: libtranslate-0.99-libsoup24.diff
 Patch11: libtranslate-0.99-fix-modules.patch
-Patch12: libtranslate-0.99-update-services.patch
-Patch13: libtranslate-0.99-update-services1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.8, gettext, intltool, libtool
 BuildRequires: glib2-devel, libsoup-devel >= 2.2, libxml2-devel
@@ -54,11 +52,10 @@ The static libraries and header files fo
 %patch2 -p0
 %patch3 -p0
 %patch4 -p1
-%patch5 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
+
+cp -p %{SOURCE1} data/services.xml.in
 
 libtoolize --force
 intltoolize --automake --force
@@ -124,6 +121,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-21
+- add new language pairs for google service
+  (#519247, by Dwayne Bailey (dwayne at translate.org.za>)
+- use up-to-date services.xml.in plain file as an additional source,
+  instead of a lot of patches for upstream's one
+
 * Tue Mar  3 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-20
 - add more language pairs for google service
   (#487951, by Dwayne Bailey (dwayne at translate.org.za>)


--- libtranslate-0.99-services.diff DELETED ---


--- libtranslate-0.99-update-services.patch DELETED ---


--- libtranslate-0.99-update-services1.patch DELETED ---



From overholt at fedoraproject.org  Thu Aug 27 14:55:38 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 27 Aug 2009 14:55:38 +0000 (UTC)
Subject: rpms/plexus-resources/devel import.log, NONE,
	1.1 plexus-resources-1.0-build.xml, NONE,
	1.1 plexus-resources-1.0-components.xml, NONE,
	1.1 plexus-resources-1.0-jpp-depmap.xml, NONE,
	1.1 plexus-resources-settings.xml, NONE,
	1.1 plexus-resources.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827145538.B060111C0073@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-resources/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17227/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-resources-1.0-build.xml 
	plexus-resources-1.0-components.xml 
	plexus-resources-1.0-jpp-depmap.xml 
	plexus-resources-settings.xml plexus-resources.spec 
Log Message:
Initial import (review bug #519236).



--- NEW FILE import.log ---
plexus-resources-1_0-0_2_a4_fc11:HEAD:plexus-resources-1.0-0.2.a4.fc11.src.rpm:1251384837


--- NEW FILE plexus-resources-1.0-build.xml ---
<project name="plexus-resources" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-resources-1.0-alpha-4"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>

  <path id="build.classpath">
    <fileset dir="target/lib">
      <include name="plexus_utils.jar"/>
      <include name="plexus_container-default.jar"/>
      <include name="classworlds.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
    <copy todir="${maven.build.output}">
      <fileset dir="src/main/resources"/>
    </copy>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/org/codehaus/plexus/plexus-utils/1.2"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/org/codehaus/plexus/plexus-container-default/1.0"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/classworlds/classworlds/1.4"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>

  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Resources Component 1.0-alpha-4 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.resource.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>

</project>


--- NEW FILE plexus-resources-1.0-components.xml ---
<component-set>
  <components>
    <component>
      <role>org.codehaus.plexus.resource.ResourceManager</role>
      <implementation>org.codehaus.plexus.resource.DefaultResourceManager</implementation>
      <description></description>
      <requirements>
        <requirement>
          <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
          <field-name>resourceLoaders</field-name>
        </requirement>
      </requirements>
    </component>
    <component>
      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
      <role-hint>file</role-hint>
      <implementation>org.codehaus.plexus.resource.loader.FileResourceLoader</implementation>
      <description></description>
    </component>
    <component>
      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
      <role-hint>jar</role-hint>
      <implementation>org.codehaus.plexus.resource.loader.JarResourceLoader</implementation>
      <description></description>
    </component>
    <component>
      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
      <role-hint>classloader</role-hint>
      <implementation>org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader</implementation>
      <description></description>
    </component>
    <component>
      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
      <role-hint>url</role-hint>
      <implementation>org.codehaus.plexus.resource.loader.URLResourceLoader</implementation>
      <description></description>
    </component>
  </components>
</component-set>


--- NEW FILE plexus-resources-1.0-jpp-depmap.xml ---
<dependencies>
  <dependency>
    <maven>
      <groupId>org.codehaus.plexus</groupId>
      <artifactId>plexus-utils</artifactId>
      <version>1.0.4</version>
    </maven>
    <jpp>
      <groupId>JPP/plexus</groupId>
      <artifactId>utils</artifactId>
      <version>1.2</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>org.codehaus.plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
      <version>1.0-alpha-8</version>
    </maven>
    <jpp>
      <groupId>JPP/plexus</groupId>
      <artifactId>container-default</artifactId>
      <version>1.0-alpha-8</version>
    </jpp>
  </dependency>
    <dependency>
        <maven>
            <groupId>com.thoughtworks.qdox</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>qdox</artifactId>
            <version>1.6.3</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>org.apache.maven.doxia</groupId>
            <artifactId>doxia-site-renderer</artifactId>
            <version>1.0-alpha-7</version>
        </maven>
        <jpp>
            <groupId>JPP/maven-doxia</groupId>
            <artifactId>site-renderer</artifactId>
            <version>1.0-alpha-7</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>org.apache.maven.doxia</groupId>
            <artifactId>doxia-decoration-model</artifactId>
            <version>1.0-alpha-7</version>
        </maven>
        <jpp>
            <groupId>JPP/maven-doxia</groupId>
            <artifactId>decoration-model</artifactId>
            <version>1.0-alpha-7</version>
        </jpp>
    </dependency>

</dependencies>


--- NEW FILE plexus-resources-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 plexus-resources.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with_maven 0

%define parent plexus
%define subname resources
%define namedversion 1.0-alpha-4

Name:           %{parent}-%{subname}
Version:        1.0
Release:        0.2.a4%{?dist}
Summary:        Plexus Resource Manager
License:        MIT
Group:          Development/Tools
URL:            http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/tags/plexus-resources-1.0-alpha-4/
# tar czf plexus-resources-1.0-alpha-4-src.tar.gz plexus-resources-1.0-alpha-4
Source0:        %{name}-%{version}-alpha-4-src.tar.gz
Source1:        plexus-resources-1.0-build.xml
Source2:        plexus-resources-1.0-components.xml
Source3:        plexus-resources-settings.xml
Source4:        plexus-resources-1.0-jpp-depmap.xml
Requires:       classworlds >= 0:1.1
Requires:       plexus-container-default
Requires:       plexus-utils
Requires:       jpackage-utils >= 0:1.7.3
Requires(post): jpackage-utils >= 0:1.7.3
Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant >= 0:1.6
%if %{with_maven}
BuildRequires:  maven2
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-release
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  maven-doxia
BuildRequires:  maven-doxia-sitetools
BuildRequires:  plexus-maven-plugin >= 1.3.5
BuildRequires:  qdox >= 1.5
BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api
BuildRequires:  avalon-logkit
BuildRequires:  avalon-framework
%endif

BuildRequires:  classworlds >= 0:1.1
BuildRequires:  plexus-container-default
BuildRequires:  plexus-utils

BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
embedded or for a full scale application server. There are many
reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{name}-%{version}-alpha-4
cp -p %{SOURCE1} build.xml
mkdir -p target/classes/META-INF/plexus
cp -p %{SOURCE2} target/classes/./META-INF/plexus/components.xml
cp -p %{SOURCE3} settings.xml

%build
%if %{with_maven}
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        -Dmaven2.jpp.mode=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE4} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%else
export CLASSPATH=
export OPT_JAR_LIST=:
mkdir -p target/lib
build-jar-repository -s -p target/lib \
classworlds \
plexus/container-default \
plexus/utils \

ant -Dmaven.mode.offline=true jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}

(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.2.a4
- Fix release and defattr
- Make -javadoc description better

* Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.1.a4.5
- Remove gcj support
- Fix license tag
- Improve source build instructions
- Remove "excalibur-" prefix from two BRs

* Thu Mar 20 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.1.a4.4
- Build with maven2-2.0.8 built in non-bootstrap mode
- Add some missing BRs

* Thu Mar 20 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.1.a10.3
- Build with maven2 2.0.8

* Tue Jan 20 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.1.a4.2jpp.1
- Import from dbhole's maven 2.0.8 packages
- Merge with JPP-5

* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.3
- ExcludeArch ppc64

* Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.2
- Enable gcj

* Tue Feb 20 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a4.2jpp.1
- Fixed %%Release.
- Fixed %%BuildRoot.
- Removed %%Vendor.
- Removed %%Distribution.
- Edited instructions on how to generate the source drops.
- Removed %%post and %%postun sections for javadoc.
- Added gcj support.

* Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a4.2jpp
- Update for maven2 9jpp

* Mon Jun 12 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a4.1jpp
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-resources/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:16:36 -0000	1.1
+++ .cvsignore	27 Aug 2009 14:55:38 -0000	1.2
@@ -0,0 +1 @@
+plexus-resources-1.0-alpha-4-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-resources/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:16:36 -0000	1.1
+++ sources	27 Aug 2009 14:55:38 -0000	1.2
@@ -0,0 +1 @@
+be22d0c00541a8333f80e7ec512929d4  plexus-resources-1.0-alpha-4-src.tar.gz



From mbarnes at fedoraproject.org  Thu Aug 27 15:06:09 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 27 Aug 2009 15:06:09 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.70,1.71
Message-ID: <20090827150610.0113F11C0073@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24533

Modified Files:
	evolution-exchange.spec 
Log Message:

* Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-2.fc12
- Rebuild with old OpenSSL, er something...



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- evolution-exchange.spec	24 Aug 2009 11:19:11 -0000	1.70
+++ evolution-exchange.spec	27 Aug 2009 15:06:07 -0000	1.71
@@ -18,7 +18,7 @@
 
 Name: evolution-exchange
 Version: 2.27.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-2.fc12
+- Rebuild with old OpenSSL, er something...
+
 * Mon Aug 24 2009 Milan Crha <mcrha at redhat.com> - 2.27.91-1.fc12
 - Update to 2.27.91
 



From mbarnes at fedoraproject.org  Thu Aug 27 15:07:24 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 27 Aug 2009 15:07:24 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.274, 
	1.275
Message-ID: <20090827150724.2142111C0073@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-serv25473

Modified Files:
	evolution-data-server.spec 
Log Message:

* Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-3.fc12
- Rebuild with old OpenSSL, er something...



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- evolution-data-server.spec	27 Aug 2009 07:34:53 -0000	1.274
+++ evolution-data-server.spec	27 Aug 2009 15:07:23 -0000	1.275
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.27.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-3.fc12
+- Rebuild with old OpenSSL, er something...
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.91-2.fc12
 - rebuilt with new openssl
 



From rdieter at fedoraproject.org  Thu Aug 27 15:07:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 15:07:26 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.274,1.275
Message-ID: <20090827150726.17BA611C0073@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25555

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-101
- inflate Release tag, avoiding possible upgrade/obsoletes pain 
- -devel: drop Provides: PolicyKit-kde-devel, bump Obsoletes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- kdebase-workspace.spec	27 Aug 2009 14:18:30 -0000	1.274
+++ kdebase-workspace.spec	27 Aug 2009 15:07:25 -0000	1.275
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 12%{?dist}
+Release: 101%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -141,8 +141,7 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Obsoletes: PolicyKit-kde-devel < 4.2.85
-Provides:  PolicyKit-kde-devel = %{version}-%{release}
+Obsoletes: PolicyKit-kde-devel < 4.3.0
 Provides: solid-bluetooth-devel = 4.3-0.1
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -571,6 +570,10 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-101
+- inflate Release tag, avoiding possible upgrade/obsoletes pain 
+- -devel: drop Provides: PolicyKit-kde-devel, bump Obsoletes
+
 * Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
 - PolicyKit-kde subpkg (#519172, #519654)
 



From gouldwp at fedoraproject.org  Thu Aug 27 15:14:04 2009
From: gouldwp at fedoraproject.org (gouldwp)
Date: Thu, 27 Aug 2009 15:14:04 +0000 (UTC)
Subject: rpms/perl-MasonX-Request-WithApacheSession/EL-5
	perl-MasonX-Request-WithApacheSession.spec, 1.1, 1.2
Message-ID: <20090827151404.2053011C0073@cvs1.fedora.phx.redhat.com>

Author: gouldwp

Update of /cvs/pkgs/rpms/perl-MasonX-Request-WithApacheSession/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30300

Modified Files:
	perl-MasonX-Request-WithApacheSession.spec 
Log Message:



Index: perl-MasonX-Request-WithApacheSession.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MasonX-Request-WithApacheSession/EL-5/perl-MasonX-Request-WithApacheSession.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-MasonX-Request-WithApacheSession.spec	22 Jan 2008 22:33:04 -0000	1.1
+++ perl-MasonX-Request-WithApacheSession.spec	27 Aug 2009 15:14:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-MasonX-Request-WithApacheSession
 Version:        0.30
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Add a session to the Mason Request object
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.30-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.30-5
+- rebuild for new perl
+
 * Tue Jan 16 2008 <gouldwp at auburn.edu> 0.30-4
 - Specfile autogenerated by cpanspec 1.74.
 - Applied subrequest patch to WithApacheSession.pm



From mtasaka at fedoraproject.org  Thu Aug 27 15:16:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 15:16:04 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.34, 1.35 kazehakase.spec, 1.90, 
	1.91 sources, 1.34, 1.35
Message-ID: <20090827151604.A883F11C0073@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32149

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3783



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	26 Aug 2009 16:13:16 -0000	1.34
+++ .cvsignore	27 Aug 2009 15:16:04 -0000	1.35
@@ -1 +1 @@
-kazehakase-0.5.6-svn3781_trunk.tar.gz
+kazehakase-0.5.6-svn3783_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kazehakase.spec	26 Aug 2009 16:13:16 -0000	1.90
+++ kazehakase.spec	27 Aug 2009 15:16:04 -0000	1.91
@@ -31,7 +31,7 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3781_trunk
+%define		svnver		3783_trunk
 
 
 %define		fedorarel	16
@@ -320,7 +320,7 @@ desktop-file-install \
 
 %changelog
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3781
+- rev 3783
 
 * Sun Jul 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 3778


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	26 Aug 2009 16:13:16 -0000	1.34
+++ sources	27 Aug 2009 15:16:04 -0000	1.35
@@ -1 +1 @@
-6172e840145405148d6af942f6356e00  kazehakase-0.5.6-svn3781_trunk.tar.gz
+c92c723729a2484f9e13f7febd101411  kazehakase-0.5.6-svn3783_trunk.tar.gz



From rdieter at fedoraproject.org  Thu Aug 27 15:19:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 15:19:06 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.117,1.118
Message-ID: <20090827151906.C6C1011C0073@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1778

Modified Files:
	koffice.spec 
Log Message:
cruel joke on me. begone gremlins, build!



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- koffice.spec	27 Aug 2009 14:02:36 -0000	1.117
+++ koffice.spec	27 Aug 2009 15:19:06 -0000	1.118
@@ -698,7 +698,7 @@ update-desktop-database -q &> /dev/null 
 %files kformula
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kformula
-#{_kde4_libdir}/libkdeinit4_kformula.so
+%{_kde4_libdir}/libkdeinit_kformula.so
 %{_kde4_libdir}/libkformulaprivate.so.*
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*



From till at fedoraproject.org  Thu Aug 27 15:20:50 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu, 27 Aug 2009 15:20:50 +0000 (UTC)
Subject: rpms/libHX/EL-5 .cvsignore, 1.11, 1.12 libHX.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090827152051.021BA11C0498@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3304

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 3.0-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 20:48:24 -0000	1.11
+++ .cvsignore	27 Aug 2009 15:20:50 -0000	1.12
@@ -1,2 +1,2 @@
-libHX-2.8.tar.bz2
-libHX-2.8.tar.bz2.asc
+libHX-3.0.tar.bz2
+libHX-3.0.tar.bz2.asc


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/EL-5/libHX.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libHX.spec	25 Jul 2009 05:07:44 -0000	1.17
+++ libHX.spec	27 Aug 2009 15:20:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           libHX
-Version:        2.8
-Release:        2%{?dist}
+Version:        3.0
+Release:        1%{?dist}
 Summary:        General-purpose library for typical low-level operations
 
 Group:          System Environment/Libraries
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 27 2009 Till Maas <opensource at till.name> - 3.0-1
+- Update to new release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 20:48:25 -0000	1.11
+++ sources	27 Aug 2009 15:20:50 -0000	1.12
@@ -1,2 +1,2 @@
-26d4eb5b9ef2d94a4f9983af93547cb0  libHX-2.8.tar.bz2
-3368bdaed6aed3832f0c931058d7f7b1  libHX-2.8.tar.bz2.asc
+8a800d98f44af2a31e9fe23555175327  libHX-3.0.tar.bz2
+d224b763d3005d37fd53896832a56a53  libHX-3.0.tar.bz2.asc



From wtogami at fedoraproject.org  Thu Aug 27 15:21:23 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 27 Aug 2009 15:21:23 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc.spec,1.7,1.8
Message-ID: <20090827152123.5DC6511C0073@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3650

Modified Files:
	kvirc.spec 
Log Message:
rebuild



Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kvirc.spec	27 Aug 2009 11:03:18 -0000	1.7
+++ kvirc.spec	27 Aug 2009 15:21:22 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.11.%{pre}%{?dist}
+Release:          0.12.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.12.20090827svn3429
+- rebuild
+
 * Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
 - svn snapshot 3429 that includes patch for openssl >=1.0
 



From emaldonado at fedoraproject.org  Thu Aug 27 15:23:15 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 15:23:15 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.8,1.9
Message-ID: <20090827152315.B4BEF11C0073@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4822

Modified Files:
	nss-softokn.spec 
Log Message:
fix spurious executable permissions on nss-softokn.pc


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nss-softokn.spec	27 Aug 2009 14:11:57 -0000	1.8
+++ nss-softokn.spec	27 Aug 2009 15:23:15 -0000	1.9
@@ -1,6 +1,6 @@
 %global nspr_version 4.8
 %global nss_name nss
-%global nssutil_version 3.12.3.99.3
+%global nss_util_version 3.12.3.99.3
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          17%{?dist}
+Release:          18%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -133,7 +133,7 @@ USE_64=1
 export USE_64
 %endif
 
-# Compile softkn plus needed support
+# Compile softokn plus needed support
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
 %{__make} -C ./mozilla/security/nss
@@ -225,8 +225,8 @@ do
 done
 
 # Copy the package configuration files
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Wed Aug 27 2009 Elio maldonado<emaldona at redhat.com> - 3.12.3.99.3-18
+- fix spurious executable permissions on nss-softokn.pc
+
 * Thu Aug 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 3.12.3.99.3-17
 - Add hack to fix build
 
@@ -320,7 +323,7 @@ done
 - bump to unique rpm nvr 
 
 * Tue Aug 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-10
-Build after nss with subpackages and new nss-util
+- Build after nss with subpackages and new nss-util
 
 * Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-9
 - revert to shipping bits



From wtogami at fedoraproject.org  Thu Aug 27 15:24:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 27 Aug 2009 15:24:54 +0000 (UTC)
Subject: rpms/conexus/devel conexus.spec,1.26,1.27
Message-ID: <20090827152454.AB2F411C0073@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5827

Modified Files:
	conexus.spec 
Log Message:
rebuild



Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- conexus.spec	27 Aug 2009 07:21:30 -0000	1.26
+++ conexus.spec	27 Aug 2009 15:24:54 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:          C++ I/O communication library
 Name:             conexus
 Version:          0.9.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -295,6 +295,9 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/conexus-0.9/conexus-nss/
 
 %changelog
+* Thu Aug 27 2009 Warren Togami <wtogami at redhat.com> - 0.9.0-3
+- rebuild
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.0-2
 - rebuilt with new openssl
 



From transif at fedoraproject.org  Thu Aug 27 15:25:08 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 27 Aug 2009 15:25:08 +0000 (UTC)
Subject: comps/po nl.po,1.27,1.28
Message-ID: <20090827152508.CEF8311C0073@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6043/po

Modified Files:
	nl.po 
Log Message:
Sending translation for Dutch


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.27 -r 1.28 nl.poIndex: nl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nl.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- nl.po	29 Jul 2009 17:11:51 -0000	1.27
+++ nl.po	27 Aug 2009 15:25:08 -0000	1.28
@@ -5,299 +5,297 @@
 # Huib Kleinhout <huib at stack.nl>, 2003.
 # Peter van Egdom <p.van.egdom at gmail.com>, 2003-2009.
 # R.E. van der Luit <nippur at fedoraproject.org>, 2009.
+# Geert Warrink <geert.warrink at onsnet.nu>, 2009.
 #
+# Geert Warrink <geert.warrink at onsnet.nu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 14:05+0000\n"
-"PO-Revision-Date: 2009-07-27 17:47+0200\n"
-"Last-Translator: Peter van Egdom <p.van.egdom at gmail.com>\n"
-"Language-Team: Dutch <fedora-trans-list at redhat.com>\n"
+"POT-Creation-Date: 2009-04-29 15:51-0400\n"
+"PO-Revision-Date: 2009-08-27 17:24+0200\n"
+"Last-Translator: Geert Warrink <geert.warrink at onsnet.nu>\n"
+"Language-Team: nl <nl at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding:  \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
-#: ../comps-f12.xml.in.h:1
+#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "Een lichte werkomgeving die zeer geschikt is voor minder krachtige machines."
 
-#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:3 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1
+#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administratieve hulpmiddelen"
 
-#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:4
+#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
 msgid "Afrikaans Support"
 msgstr "Ondersteuning voor Afrikaans"
 
-#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:5
+#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
 msgid "Albanian Support"
 msgstr "Ondersteuning voor Albanees"
 
-#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:7 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2
+#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Toepassingen"
 
-#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:8
+#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
 msgid "Applications to perform a variety of tasks"
 msgstr "Toepassingen om diverse taken uit te voeren"
 
-#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:9 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4
+#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Ondersteuning voor Arabisch"
 
-#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:10 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5
+#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Ondersteuning voor Armeens"
 
-#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:11
+#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
 msgid "Assamese Support"
 msgstr "Ondersteuning voor Assamees"
 
-#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:12 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6
+#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schrijven en publiceren"
 
-#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:14
+#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
 msgid "Base"
 msgstr "Basis"
 
-#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:15 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7
+#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissysteem"
 
-#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:16
+#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
 msgid "Basic support for the Ruby programming language."
 msgstr "Standaardondersteuning voor de programmeertaal Ruby."
 
-#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:17
+#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
 msgid "Basque Support"
 msgstr "Ondersteuning voor Baskisch"
 
-#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:18
+#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
 msgid "Belarusian Support"
 msgstr "Ondersteuning voor Belarussisch"
 
-#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:19
+#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
 msgid "Bengali Support"
 msgstr "Ondersteuning voor Bengaals"
 
-#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
-#: ../comps-f12.xml.in.h:20
+#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
+#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
 msgid "Bhutanese Support"
 msgstr "Ondersteuning voor Bhutanees"
 
-#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
-#: ../comps-f12.xml.in.h:21
+#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
+#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
 msgid "Bosnian Support"
 msgstr "Ondersteuning voor Bosnisch"
 
-#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
-#: ../comps-f12.xml.in.h:22
+#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
+#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
 msgid "Brazilian Portuguese Support"
 msgstr "Ondersteuning voor Braziliaans-Portugees"
 
-#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
-#: ../comps-f12.xml.in.h:23
+#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
+#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
 msgid "Breton Support"
 msgstr "Ondersteuning voor Bretons"
 
-#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
-#: ../comps-f12.xml.in.h:24 ../comps-el5.xml.in.h:8
-msgid "Buildsystem building group"
-msgstr "Groep voor het bouwen van compileersystemen"
-
-#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
-#: ../comps-f12.xml.in.h:25
+#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
+#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
 msgid "Bulgarian Support"
 msgstr "Ondersteuning voor Bulgaars"
 
-#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
-#: ../comps-f12.xml.in.h:26
+#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
+#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
 msgid "Catalan Support"
 msgstr "Ondersteuning voor Catalaans"
 
[...1734 lines suppressed...]
+#: ../comps-f11.xml.in.h:126
 msgid "Luxembourgish Support"
 msgstr "Ondersteuning voor Luxemburgs"
 
-#: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:130
+#: ../comps-f11.xml.in.h:130
 msgid "Malagasy Support"
 msgstr "Ondersteuning voor Malagasi"
 
-#: ../comps-f11.xml.in.h:133 ../comps-f12.xml.in.h:133
+#: ../comps-f11.xml.in.h:133
 msgid "Maltese Support"
 msgstr "Ondersteuning voor Maltees"
 
-#: ../comps-f11.xml.in.h:134 ../comps-f12.xml.in.h:134
+#: ../comps-f11.xml.in.h:134
 msgid "Manx Support"
 msgstr "Ondersteuning voor Manx"
 
-#: ../comps-f11.xml.in.h:137 ../comps-f12.xml.in.h:137
+#: ../comps-f11.xml.in.h:137
 msgid "MinGW cross-compiler"
 msgstr "MinGW cross-compiler"
 
-#: ../comps-f11.xml.in.h:146 ../comps-f12.xml.in.h:146
+#: ../comps-f11.xml.in.h:147
 msgid "OCaml"
 msgstr "OCaml"
 
-#: ../comps-f11.xml.in.h:147 ../comps-f12.xml.in.h:147
+#: ../comps-f11.xml.in.h:148
 msgid "Occitan Support"
 msgstr "Ondersteuning voor Occitaans"
 
-#: ../comps-f11.xml.in.h:150 ../comps-f12.xml.in.h:150
+#: ../comps-f11.xml.in.h:151
 msgid "Online Help and Documentation"
 msgstr "Online hulp en documentatie"
 
-#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:164
+#: ../comps-f11.xml.in.h:164
 msgid "Sanskrit Support"
 msgstr "Ondersteuning voor Sanskrit"
 
-#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:165
+#: ../comps-f11.xml.in.h:165
 msgid "Sardinian Support"
 msgstr "Ondersteuning voor Sardini?"
 
-#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:182
+#: ../comps-f11.xml.in.h:182
 msgid "Sugar Desktop Environment"
 msgstr "Sugar-werkomgeving"
 
-#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:183
+#: ../comps-f11.xml.in.h:183
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1409,7 +1425,7 @@ msgstr ""
 "versies, het testen van deze programma's en het bouwen van "
 "installatieprogramma's, allemaal vanuit Fedora."
 
-#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:187
+#: ../comps-f11.xml.in.h:186
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1417,15 +1433,15 @@ msgstr ""
 "Ondersteuning voor het ontwikkelen van software met behulp van de Objective "
 "CAML programmeertaal en bibliotheken."
 
-#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:189
+#: ../comps-f11.xml.in.h:188
 msgid "Swahili Support"
 msgstr "Ondersteuning voor Swahili"
 
-#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:197
+#: ../comps-f11.xml.in.h:196
 msgid "Tetum Support"
 msgstr "Ondersteuning voor Tetum"
 
-#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:224
+#: ../comps-f11.xml.in.h:223
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1433,11 +1449,11 @@ msgstr ""
 "Deze groep is een collectie van hulpmiddelen gebruikt voor het ontwerpen, "
 "wijzigen, manipuleren en samenstellen van lettertypen."
 
-#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:236
+#: ../comps-f11.xml.in.h:235
 msgid "Turkmen Support"
 msgstr "Ondersteuning voor Turkmeens"
 
-#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:238
+#: ../comps-f11.xml.in.h:237
 msgid "Upper Sorbian Support"
 msgstr "Ondersteuning voor Oppersorbisch"
 
@@ -1445,11 +1461,11 @@ msgstr "Ondersteuning voor Oppersorbisch
 msgid "Applications for a variety of tasks"
 msgstr "Toepassingen voor diverse taken"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
 msgid "Dialup Networking Support"
 msgstr "Inbelnetwerkondersteuning"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1457,7 +1473,7 @@ msgstr ""
 "GNOME is een krachtige, grafische gebruikersinterface met onder andere een "
 "paneel, bureaublad, systeempictogrammen en een grafische bestandsbeheerder."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1465,7 +1481,7 @@ msgstr ""
 "KDE is een krachtige, grafische gebruikersinterface met onder andere een "
 "paneel, bureaublad, systeempictogrammen en een grafische bestandsbeheerder."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1473,11 +1489,11 @@ msgstr ""
 "Worden soms teksteditors genoemd, met behulp van deze programma's kunt u "
 "bestanden aanmaken en bewerken. Emacs en Vi zijn hierbij inbegrepen."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
 msgid "The XEmacs text editor."
 msgstr "De XEmacs teksteditor."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1485,38 +1501,46 @@ msgstr ""
 "Met deze hulpmiddelen kunt u documentatie aanmaken in het DocBook-formaat en "
 "deze omzetten naar HTML, PDF, Postscript en tekst."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Deze groep is een collectie van netwerkservers voor specifieke doelen"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Arabische "
 "omgevingen."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Hebreeuwse "
 "omgevingen."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Japanse "
 "omgevingen."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:66
+#: ../comps-el5.xml.in.h:65
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Tsjechische "
 "omgevingen."
+
+#~ msgid "Perl Development"
+#~ msgstr "Perl ontwikkeling"
+
+#~ msgid "Support for developing programs in the Perl programming language."
+#~ msgstr ""
+#~ "Ondersteuning voor het ontwikkelen van programma's in de programmeertaal "
+#~ "Perl."



From wtogami at fedoraproject.org  Thu Aug 27 15:27:14 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 27 Aug 2009 15:27:14 +0000 (UTC)
Subject: rpms/tabled/devel tabled.spec,1.13,1.14
Message-ID: <20090827152714.813E211C0073@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7404

Modified Files:
	tabled.spec 
Log Message:
rebuild



Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tabled.spec	26 Aug 2009 16:50:21 -0000	1.13
+++ tabled.spec	27 Aug 2009 15:27:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -105,6 +105,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Aug 27 2009 Warren Togami <wtogami at redhat.com> - 0.3-4
+- rebuild
+
 * Wed Aug 26 2009 Jeff Garzik <jgarzik at redhat.com> - 0.3-3
 - require/rebuild for cld 0.2.1
 



From twaugh at fedoraproject.org  Thu Aug 27 15:36:37 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 15:36:37 +0000 (UTC)
Subject: rpms/cups/devel cups-str3312.patch,NONE,1.1 cups.spec,1.510,1.511
Message-ID: <20090827153637.C912A11C0073@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13047

Modified Files:
	cups.spec 
Added Files:
	cups-str3312.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.20
- Fixed admin.cgi crash when modifying a class (bug #519724,
  STR #3312, patch from Jiri Popelka).


cups-str3312.patch:
 cgi-bin/admin.c             |   12 ++++++++++--
 templates/modify-class.tmpl |    1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3312.patch ---
diff -up cups-1.4rc1/cgi-bin/admin.c.str3312 cups-1.4rc1/cgi-bin/admin.c
--- cups-1.4rc1/cgi-bin/admin.c.str3312	2009-05-11 22:21:29.000000000 +0100
+++ cups-1.4rc1/cgi-bin/admin.c	2009-08-27 16:33:00.691275487 +0100
@@ -628,6 +628,15 @@ do_am_class(http_t *http,		/* I - HTTP c
     return;
   }
 
+  if (!name)
+    {
+      cgiSetVariable("ERROR", cgiText(_("Missing form variable!")));
+      cgiStartHTML(title);
+      cgiCopyTemplateLang("error.tmpl");
+      cgiEndHTML();
+      return;
+    }
+
   for (ptr = name; *ptr; ptr ++)
     if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
       break;
@@ -662,8 +671,7 @@ do_am_class(http_t *http,		/* I - HTTP c
   request = ippNewRequest(CUPS_ADD_CLASS);
 
   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/classes/%s",
-		   cgiGetVariable("PRINTER_NAME"));
+                   "localhost", 0, "/classes/%s", name);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
 
diff -up cups-1.4rc1/templates/modify-class.tmpl.str3312 cups-1.4rc1/templates/modify-class.tmpl
--- cups-1.4rc1/templates/modify-class.tmpl.str3312	2008-09-20 04:33:59.000000000 +0100
+++ cups-1.4rc1/templates/modify-class.tmpl	2009-08-27 16:33:00.693275103 +0100
@@ -4,6 +4,7 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
 <TR>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- cups.spec	27 Aug 2009 12:40:28 -0000	1.510
+++ cups.spec	27 Aug 2009 15:36:35 -0000	1.511
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.19%{?dist}
+Release: 0.%{pre}.20%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -71,6 +71,7 @@ Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
 Patch45: cups-str3308.patch
 Patch46: cups-str3311.patch
+Patch47: cups-str3312.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -242,6 +243,7 @@ module. 
 %patch44 -p1 -b .str3293
 %patch45 -p1 -b .str3308
 %patch46 -p1 -b .str3311
+%patch47 -p1 -b .str3312
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -536,6 +538,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.20
+- Fixed admin.cgi crash when modifying a class (bug #519724,
+  STR #3312, patch from Jiri Popelka).
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.19
 - Prevent infinite loop in cupsDoIORequest when processing HTTP
   errors (bug #518065, bug #519663, STR #3311).



From twaugh at fedoraproject.org  Thu Aug 27 15:38:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 15:38:27 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3312.patch,NONE,1.1 cups.spec,1.514,1.515
Message-ID: <20090827153827.0BDB511C0073@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14377

Modified Files:
	cups.spec 
Added Files:
	cups-str3312.patch 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.20
- Fixed admin.cgi crash when modifying a class (bug #519724,
  STR #3312, patch from Jiri Popelka).


cups-str3312.patch:
 cgi-bin/admin.c             |   12 ++++++++++--
 templates/modify-class.tmpl |    1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3312.patch ---
diff -up cups-1.4rc1/cgi-bin/admin.c.str3312 cups-1.4rc1/cgi-bin/admin.c
--- cups-1.4rc1/cgi-bin/admin.c.str3312	2009-05-11 22:21:29.000000000 +0100
+++ cups-1.4rc1/cgi-bin/admin.c	2009-08-27 16:33:00.691275487 +0100
@@ -628,6 +628,15 @@ do_am_class(http_t *http,		/* I - HTTP c
     return;
   }
 
+  if (!name)
+    {
+      cgiSetVariable("ERROR", cgiText(_("Missing form variable!")));
+      cgiStartHTML(title);
+      cgiCopyTemplateLang("error.tmpl");
+      cgiEndHTML();
+      return;
+    }
+
   for (ptr = name; *ptr; ptr ++)
     if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
       break;
@@ -662,8 +671,7 @@ do_am_class(http_t *http,		/* I - HTTP c
   request = ippNewRequest(CUPS_ADD_CLASS);
 
   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/classes/%s",
-		   cgiGetVariable("PRINTER_NAME"));
+                   "localhost", 0, "/classes/%s", name);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
 
diff -up cups-1.4rc1/templates/modify-class.tmpl.str3312 cups-1.4rc1/templates/modify-class.tmpl
--- cups-1.4rc1/templates/modify-class.tmpl.str3312	2008-09-20 04:33:59.000000000 +0100
+++ cups-1.4rc1/templates/modify-class.tmpl	2009-08-27 16:33:00.693275103 +0100
@@ -4,6 +4,7 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
 <TR>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -p -r1.514 -r1.515
--- cups.spec	27 Aug 2009 12:40:56 -0000	1.514
+++ cups.spec	27 Aug 2009 15:38:26 -0000	1.515
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.19%{?dist}
+Release: 0.%{pre}.20%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -71,6 +71,7 @@ Patch43: cups-str3292.patch
 Patch44: cups-str3293.patch
 Patch45: cups-str3308.patch
 Patch46: cups-str3311.patch
+Patch47: cups-str3312.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -242,6 +243,7 @@ module. 
 %patch44 -p1 -b .str3293
 %patch45 -p1 -b .str3308
 %patch46 -p1 -b .str3311
+%patch47 -p1 -b .str3312
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -535,7 +537,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.20
+- Fixed admin.cgi crash when modifying a class (bug #519724,
+  STR #3312, patch from Jiri Popelka).
+
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.19
 - Prevent infinite loop in cupsDoIORequest when processing HTTP
   errors (bug #518065, bug #519663, STR #3311).
 - Fixed document-format-supported attribute when



From transif at fedoraproject.org  Thu Aug 27 15:38:36 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 27 Aug 2009 15:38:36 +0000 (UTC)
Subject: comps/po pt_BR.po,1.36,1.37
Message-ID: <20090827153836.8B40A11C0073@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14789/po

Modified Files:
	pt_BR.po 
Log Message:
Sending translation for Brazilian Portuguese


Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- pt_BR.po	28 Jul 2009 17:24:21 -0000	1.36
+++ pt_BR.po	27 Aug 2009 15:38:35 -0000	1.37
@@ -6,7 +6,7 @@
 # Jos? Nuno Pires <jncp at netcabo.pt>
 #
 #
-# David Barzilay <barzilay at redhat.com>, 2003,2004.
+# David Barzilay <barzilay at redhat.com>, 2003, 2004.
 # Pedro Macedo <webmaster at margo.bijoux.nom.br>, 2005.
 # Rodrigo Padula de Oliveira <rodrigopadula at gmail.com>, 2005.
 # Valnir Ferreira Jr. <vferreir at redhat.com>, 2006.
@@ -31,7 +31,8 @@ msgstr ""
 #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
 #: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr "Um ambiente de trabalho leve que funciona bem em m?quinas de baixo custo."
+msgstr ""
+"Um ambiente de trabalho leve que funciona bem em m?quinas de baixo custo."
 
 #: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1



From twaugh at fedoraproject.org  Thu Aug 27 15:45:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 27 Aug 2009 15:45:43 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-older-gtk.patch, 
	NONE, 1.1 system-config-printer.spec, 1.247, 1.248
Message-ID: <20090827154543.C4F6A11C0073@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-serv19166

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-older-gtk.patch 
Log Message:
* Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
- Fixed crash on start-up.


system-config-printer-older-gtk.patch:
 ToolbarSearchEntry.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-older-gtk.patch ---
diff -up system-config-printer-1.1.12/ToolbarSearchEntry.py.older-gtk system-config-printer-1.1.12/ToolbarSearchEntry.py
--- system-config-printer-1.1.12/ToolbarSearchEntry.py.older-gtk	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/ToolbarSearchEntry.py	2009-08-27 16:42:58.069400058 +0100
@@ -80,6 +80,7 @@ class ToolbarSearchEntry (gtk.HBox):
 
             self.entry.set_icon_sensitive (gtk.ENTRY_ICON_SECONDARY, False)
             self.entry.set_icon_activatable (gtk.ENTRY_ICON_SECONDARY, False)
+            self.entry.connect ('icon-press', self.on_icon_press)
 
         label.set_mnemonic_widget (self.entry)
 
@@ -88,7 +89,6 @@ class ToolbarSearchEntry (gtk.HBox):
         self.entry.connect ('changed', self.on_changed)
         self.entry.connect ('focus_out_event', self.on_focus_out_event)
         self.entry.connect ('activate', self.on_activate)
-        self.entry.connect ('icon-press', self.on_icon_press)
 
     def do_get_property (self, property):
         if property.name == 'search_timeout':


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- system-config-printer.spec	26 Aug 2009 16:54:05 -0000	1.247
+++ system-config-printer.spec	27 Aug 2009 15:45:43 -0000	1.248
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
+Patch4: system-config-printer-older-gtk.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -68,6 +69,7 @@ the configuration tool.
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
+%patch4 -p1 -b .older-gtk
 
 %build
 %configure
@@ -169,6 +171,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+- Fixed crash on start-up.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
 - Handle icon load failure gracefully.
 - Fixed statereason icon names.



From overholt at fedoraproject.org  Thu Aug 27 15:46:26 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 27 Aug 2009 15:46:26 +0000 (UTC)
Subject: rpms/itext/devel itext-2.1.7.pom,NONE,1.1 itext.spec,1.21,1.22
Message-ID: <20090827154626.DE34911C0073@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/itext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20618

Modified Files:
	itext.spec 
Added Files:
	itext-2.1.7.pom 
Log Message:
* Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 2.1.7-3
- Add maven POM file for use by other maven packages


--- 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>

Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/devel/itext.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- itext.spec	25 Jul 2009 03:41:30 -0000	1.21
+++ itext.spec	27 Aug 2009 15:46:26 -0000	1.22
@@ -1,36 +1,39 @@
 %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:        2%{?dist}
-License:        (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
-URL:            http://www.lowagie.com/iText/
-Group:          Development/Libraries
-Source0:        http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
-Patch1:         itext-2.1.5-pdftk.patch
-BuildRequires:  ant
-BuildRequires:  bouncycastle-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:          3%{?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
+Source2:          http://repo2.maven.org/maven2/com/lowagie/itext/%{version}/itext-%{version}.pom
+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
 %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:         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
 iText is a library that allows you to generate PDF files on the fly. The iText
@@ -102,10 +105,17 @@ 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 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-itext.pom
+%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 ] 
  then
@@ -114,6 +124,7 @@ if [ -x %{_bindir}/rebuild-gcj-db ] 
 %endif
 
 %postun
+%update_maven_depmap
 %if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
@@ -127,6 +138,8 @@ if [ -x %{_bindir}/rebuild-gcj-db ] 
 %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}/*
+%{_mavenpomdir}/JPP-itext.pom
+%{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
 %{_libdir}/gcj/%{name}
 %endif
@@ -138,6 +151,9 @@ if [ -x %{_bindir}/rebuild-gcj-db ] 
 # -----------------------------------------------------------------------------
 
 %changelog
+* 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
 



From scop at fedoraproject.org  Thu Aug 27 15:54:27 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 27 Aug 2009 15:54:27 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.288,1.289
Message-ID: <20090827155427.23A8F11C0073@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25250

Modified Files:
	comps-f11.xml.in 
Log Message:
+vdr-epgsearch


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- comps-f11.xml.in	17 Aug 2009 20:15:01 -0000	1.288
+++ comps-f11.xml.in	27 Aug 2009 15:54:26 -0000	1.289
@@ -4896,6 +4896,7 @@
       <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-osdteletext</packagereq>
       <packagereq type="optional">vdr-remote</packagereq>
       <packagereq type="optional">vdr-skins</packagereq>



From caolanm at fedoraproject.org  Thu Aug 27 16:17:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 27 Aug 2009 16:17:22 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch,
	NONE, 1.1 openoffice.org.spec, 1.1996, 1.1997
Message-ID: <20090827161722.71C2911C0073@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6473

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch 
Log Message:
add openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch

openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch:
 svdfppt.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch ---
--- 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();
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -p -r1.1996 -r1.1997
--- openoffice.org.spec	27 Aug 2009 07:08:54 -0000	1.1996
+++ openoffice.org.spec	27 Aug 2009 16:17:21 -0000	1.1997
@@ -157,6 +157,7 @@ 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
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1699,6 +1700,7 @@ 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
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4208,8 +4210,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.4
+* Thu Aug 27 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
 - rebuilt with new openssl
+- add openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 
 * Wed Aug 26 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
 - backport workspace.vcl102.patch to fix xdg support



From pbrobinson at fedoraproject.org  Thu Aug 27 17:19:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 17:19:02 +0000 (UTC)
Subject: rpms/xapian-core/F-10 xapian-core-1.0.9-includes.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xapian-core.spec,
	1.18, 1.19
Message-ID: <20090827171902.45BFC11C00EB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30562

Modified Files:
	.cvsignore sources xapian-core.spec 
Added Files:
	xapian-core-1.0.9-includes.patch 
Log Message:
- Update to 1.0.14

xapian-core-1.0.9-includes.patch:
 backends/flint/flint_version.cc |    1 +
 bin/quartzcompact.cc            |    2 +-
 bin/quartzdump.cc               |    2 +-
 bin/xapian-compact.cc           |    2 +-
 bin/xapian-inspect.cc           |    2 +-
 bin/xapian-progsrv.cc           |    2 +-
 bin/xapian-tcpsrv.cc            |    2 +-
 common/serialise-double.cc      |    2 +-
 examples/delve.cc               |    2 +-
 examples/quest.cc               |    2 +-
 tests/harness/testsuite.cc      |    2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)

--- NEW FILE xapian-core-1.0.9-includes.patch ---
diff -ru xapian-core-1.0.9.orig/backends/flint/flint_version.cc xapian-core-1.0.9/backends/flint/flint_version.cc
--- xapian-core-1.0.9.orig/backends/flint/flint_version.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/backends/flint/flint_version.cc	2009-03-04 12:06:34.000000000 +0000
@@ -36,6 +36,7 @@
 #include <string>
 
 #include <string.h> // for memcmp
+#include <stdio.h> // for rename
 
 using std::string;
 
diff -ru xapian-core-1.0.9.orig/bin/quartzcompact.cc xapian-core-1.0.9/bin/quartzcompact.cc
--- xapian-core-1.0.9.orig/bin/quartzcompact.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/quartzcompact.cc	2009-03-04 12:48:51.000000000 +0000
@@ -222,7 +222,7 @@
     size_t block_size = 8192;
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, "b:nFhv", long_opts, 0)) != EOF) {
+    while ((c = gnu_getopt_long(argc, argv, "b:nFhv", long_opts, 0)) != -1) {
         switch (c) {
             case 'b': {
 		char *p;
diff -ru xapian-core-1.0.9.orig/bin/quartzdump.cc xapian-core-1.0.9/bin/quartzdump.cc
--- xapian-core-1.0.9.orig/bin/quartzdump.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/quartzdump.cc	2009-03-04 12:48:54.000000000 +0000
@@ -91,7 +91,7 @@
     };
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, "r:s:e:", long_opts, 0)) != EOF) {
+    while ((c = gnu_getopt_long(argc, argv, "r:s:e:", long_opts, 0)) != -1) {
         switch (c) {
             case 'r':
 		revnum = atoi(optarg);
diff -ru xapian-core-1.0.9.orig/bin/xapian-compact.cc xapian-core-1.0.9/bin/xapian-compact.cc
--- xapian-core-1.0.9.orig/bin/xapian-compact.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-compact.cc	2009-03-04 12:49:00.000000000 +0000
@@ -748,7 +748,7 @@
     bool renumber = true;
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, "b:nFm", long_opts, 0)) != EOF) {
+    while ((c = gnu_getopt_long(argc, argv, "b:nFm", long_opts, 0)) != -1) {
 	switch (c) {
 	    case 'b': {
 		char *p;
diff -ru xapian-core-1.0.9.orig/bin/xapian-inspect.cc xapian-core-1.0.9/bin/xapian-inspect.cc
--- xapian-core-1.0.9.orig/bin/xapian-inspect.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-inspect.cc	2009-03-04 12:49:03.000000000 +0000
@@ -94,7 +94,7 @@
     };
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, "", long_opts, 0)) != EOF) {
+    while ((c = gnu_getopt_long(argc, argv, "", long_opts, 0)) != -1) {
         switch (c) {
 	    case OPT_HELP:
 		cout << PROG_NAME" - "PROG_DESC"\n\n";
diff -ru xapian-core-1.0.9.orig/bin/xapian-progsrv.cc xapian-core-1.0.9/bin/xapian-progsrv.cc
--- xapian-core-1.0.9.orig/bin/xapian-progsrv.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-progsrv.cc	2009-03-04 12:49:07.000000000 +0000
@@ -60,7 +60,7 @@
     bool syntax_error = false;
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, "t:", opts, NULL)) != EOF) {
+    while ((c = gnu_getopt_long(argc, argv, "t:", opts, NULL)) != -1) {
 	switch (c) {
 	    case OPT_HELP:
 		cout << PROG_NAME" - "PROG_DESC"\n\n";
diff -ru xapian-core-1.0.9.orig/bin/xapian-tcpsrv.cc xapian-core-1.0.9/bin/xapian-tcpsrv.cc
--- xapian-core-1.0.9.orig/bin/xapian-tcpsrv.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/bin/xapian-tcpsrv.cc	2009-03-04 12:49:12.000000000 +0000
@@ -95,7 +95,7 @@
     bool syntax_error = false;
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, "I:p:a:i:t:oq", opts, NULL)) != EOF) {
+    while ((c = gnu_getopt_long(argc, argv, "I:p:a:i:t:oq", opts, NULL)) != -1) {
 	switch (c) {
 	    case OPT_HELP:
 		cout << PROG_NAME" - "PROG_DESC"\n\n";
diff -ru xapian-core-1.0.9.orig/common/serialise-double.cc xapian-core-1.0.9/common/serialise-double.cc
--- xapian-core-1.0.9.orig/common/serialise-double.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/common/serialise-double.cc	2009-03-04 12:21:40.000000000 +0000
@@ -56,7 +56,7 @@
 # define MAX_MANTISSA_BYTES ((DBL_MANT_DIG + 1 + 1) / 2)
 # define MAX_EXP ((DBL_MAX_EXP + 1) / 2)
 # define MAX_MANTISSA (1 << ((DBL_MAX_EXP & 1) * 4))
-#elif
+#else
 # error FLT_RADIX is a value not currently handled (not 2 or 16)
 // # define MAX_MANTISSA_BYTES (sizeof(double) + 1)
 #endif
diff -ru xapian-core-1.0.9.orig/examples/delve.cc xapian-core-1.0.9/examples/delve.cc
--- xapian-core-1.0.9.orig/examples/delve.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/examples/delve.cc	2009-03-04 13:06:01.000000000 +0000
@@ -172,7 +172,7 @@
     bool valno_set = false;
 
     int c;
-    while ((c = gnu_getopt(argc, argv, "r:t:s:1vkV::d")) != EOF) {
+    while ((c = gnu_getopt(argc, argv, "r:t:s:1vkV::d")) != -1) {
 	switch (c) {
 	    case 'r':
 		recnos.push_back(atoi(optarg));
diff -ru xapian-core-1.0.9.orig/examples/quest.cc xapian-core-1.0.9/examples/quest.cc
--- xapian-core-1.0.9.orig/examples/quest.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/examples/quest.cc	2009-03-04 13:06:11.000000000 +0000
@@ -80,7 +80,7 @@
 	Xapian::Database db;
 
 	int c;
-	while ((c = gnu_getopt_long(argc, argv, "hvm:d:s:", long_opts, 0)) != EOF)
+	while ((c = gnu_getopt_long(argc, argv, "hvm:d:s:", long_opts, 0)) != -1)
 	{
 	    switch (c) {
 		case 'm':
diff -ru xapian-core-1.0.9.orig/tests/harness/testsuite.cc xapian-core-1.0.9/tests/harness/testsuite.cc
--- xapian-core-1.0.9.orig/tests/harness/testsuite.cc	2009-03-04 12:06:14.000000000 +0000
+++ xapian-core-1.0.9/tests/harness/testsuite.cc	2009-03-04 13:06:28.000000000 +0000
@@ -648,7 +648,7 @@
     }
 
     int c;
-    while ((c = gnu_getopt_long(argc, argv, opts.c_str(), long_opts, 0)) != EOF)
+    while ((c = gnu_getopt_long(argc, argv, opts.c_str(), long_opts, 0)) != -1)
     {
 	switch (c) {
 	    case 'v':


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	29 Nov 2008 16:04:44 -0000	1.9
+++ .cvsignore	27 Aug 2009 17:19:01 -0000	1.10
@@ -1 +1 @@
-xapian-core-1.0.9.tar.gz
+xapian-core-1.0.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	29 Nov 2008 16:04:45 -0000	1.9
+++ sources	27 Aug 2009 17:19:01 -0000	1.10
@@ -1 +1 @@
-f9e6798b45fab2af90273f73570df5cc  xapian-core-1.0.9.tar.gz
+f318fe11143af82aa6679acc51723a1a  xapian-core-1.0.14.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/xapian-core.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xapian-core.spec	5 Dec 2008 07:35:03 -0000	1.18
+++ xapian-core.spec	27 Aug 2009 17:19:01 -0000	1.19
@@ -1,13 +1,14 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.9
-Release: 2%{?dist}
+Version: 1.0.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
 URL: http://www.xapian.org/
 Requires: %{name}-libs = %{version}
 Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
 Patch0: multilib-devel-conflict-fix.patch
+Patch1: xapian-core-1.0.9-includes.patch
 BuildRequires: autoconf automake libtool
 BuildRequires: zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +43,7 @@ files needed for building packages which
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .multilibfix
+#%patch1 -p1 -b .includes
 
 %build
 # FC6 (at least) has a patched libtool which knows not to set rpath for
@@ -120,6 +122,27 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-1
+- Update to 1.0.14
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun  5 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.13-1
+- Update to 1.0.13
+
+* Sun Apr 12 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.12-1
+- Update to 1.0.12
+
+* Mon Apr 06 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.11-1
+- Update to 1.0.11
+
+* Wed Mar 04 2009 Caol?n McNamara <caolanm at redhat.com> - 1.0.9-4
+- include stdio.h for rename, fix bare #elif, EOF -> -1 for getopt
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Dec 05 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-2
 - Fix build
 



From rdieter at fedoraproject.org  Thu Aug 27 17:21:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 17:21:45 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.118,1.119
Message-ID: <20090827172145.23BB711C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31902

Modified Files:
	koffice.spec 
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-3
- fixup some cross dependencies between -filters -kplato -krita



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- koffice.spec	27 Aug 2009 15:19:06 -0000	1.118
+++ koffice.spec	27 Aug 2009 17:21:44 -0000	1.119
@@ -12,7 +12,7 @@
 Name:           koffice
 Epoch:          2 
 Version:        2.0.81
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -507,7 +507,7 @@ update-desktop-database -q &> /dev/null 
 %if 0%{?kformula}
 %exclude %{_kde4_libdir}/kde4/formulashape.*
 %endif
-#exclude %{_kde4_libdir}/kde4/kritashape.*
+%exclude %{_kde4_libdir}/kde4/kritashape.*
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkdchart.so.*
 %{_kde4_libdir}/libkoaction.so.*
@@ -741,7 +741,6 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libgenerickofilter.*
 %{_kde4_libdir}/kde4/libhtmlexport.*
 %{_kde4_libdir}/kde4/libhtmlimport.*
-%{_kde4_libdir}/kde4/libicalendarexport.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
 %{_kde4_libdir}/kde4/libmswriteexport.*
@@ -780,6 +779,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libkplatopart.*
 %{_kde4_libdir}/kde4/libkplatoworkpart.so
 %{_kde4_libdir}/libkplato*.so.*
+%{_kde4_libdir}/kde4/libicalendarexport.*
 %{_kde4_libdir}/kde4/krossmodulekplato.so
 %{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
 %{_kde4_appsdir}/kplato/
@@ -808,6 +808,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-3
+- fixup some cross dependencies between -filters -kplato -krita
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-2
 - fix %%files
 



From pbrobinson at fedoraproject.org  Thu Aug 27 17:22:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 17:22:37 +0000 (UTC)
Subject: rpms/xapian-core/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 xapian-core.spec, 1.25, 1.26
Message-ID: <20090827172237.80D2711C00EB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32554

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	29 Jul 2009 21:52:46 -0000	1.13
+++ .cvsignore	27 Aug 2009 17:22:37 -0000	1.14
@@ -1 +1 @@
-xapian-core-1.0.14.tar.gz
+xapian-core-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	29 Jul 2009 21:52:46 -0000	1.13
+++ sources	27 Aug 2009 17:22:37 -0000	1.14
@@ -1 +1 @@
-f318fe11143af82aa6679acc51723a1a  xapian-core-1.0.14.tar.gz
+d851e661966fa0446cb46d7352c84a98  xapian-core-1.0.15.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/devel/xapian-core.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xapian-core.spec	29 Jul 2009 21:52:46 -0000	1.25
+++ xapian-core.spec	27 Aug 2009 17:22:37 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.14
+Version: 1.0.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
@@ -122,6 +122,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
+- Update to 1.0.15
+
 * Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-1
 - Update to 1.0.14
 



From pbrobinson at fedoraproject.org  Thu Aug 27 17:24:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 17:24:39 +0000 (UTC)
Subject: rpms/xapian-bindings/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 xapian-bindings.spec, 1.23, 1.24
Message-ID: <20090827172439.D394911C00EB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-bindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1472

Modified Files:
	.cvsignore sources xapian-bindings.spec 
Log Message:
- Update to 1.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Jul 2009 21:55:46 -0000	1.11
+++ .cvsignore	27 Aug 2009 17:24:39 -0000	1.12
@@ -1 +1 @@
-xapian-bindings-1.0.14.tar.gz
+xapian-bindings-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Jul 2009 21:55:46 -0000	1.12
+++ sources	27 Aug 2009 17:24:39 -0000	1.13
@@ -1 +1 @@
-d6f86ccc3d1a534902e1cf8df1cb43f3  xapian-bindings-1.0.14.tar.gz
+d365969f5ba7fa99d369ef479862c4fe  xapian-bindings-1.0.15.tar.gz


Index: xapian-bindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-bindings/devel/xapian-bindings.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xapian-bindings.spec	29 Jul 2009 21:55:46 -0000	1.23
+++ xapian-bindings.spec	27 Aug 2009 17:24:39 -0000	1.24
@@ -4,7 +4,7 @@
 
 Summary: Bindings for the Xapian Probabilistic Information Retrieval Library
 Name: xapian-bindings
-Version: 1.0.14
+Version: 1.0.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
@@ -77,6 +77,9 @@ rm -rf %{buildroot}%{buildroot}/usr/shar
 
 
 %changelog
+* Thu Aug 27 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.15.1
+- Update to 1.0.15
+
 * Wed Jul 29 2009 Peter Robinson<pbrobinson at gmail.com> 1.0.14.1
 - Update to 1.0.14
 



From emaldonado at fedoraproject.org  Thu Aug 27 17:27:53 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 17:27:53 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.97,1.98
Message-ID: <20090827172753.A7B2611C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3381

Modified Files:
	nss.spec 
Log Message:
Delete patched taht belong in nss-softkn, remove spurious exec perms for nss.pc


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- nss.spec	26 Aug 2009 17:38:29 -0000	1.97
+++ nss.spec	27 Aug 2009 17:27:53 -0000	1.98
@@ -1,10 +1,10 @@
-%global nspr_version 4.7
+%global nspr_version 4.8
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          18%{?dist}
+Release:          19%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -37,9 +37,7 @@ Source13:         PayPalEE.cert
 Source14:         PayPalICA.cert
 
 Patch1:           nss-no-rpath.patch
-Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           nss-stubs-bug502133.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -93,9 +91,7 @@ low level services.
 %setup -q -T -D -n %{name}-%{version} -a 12
 
 %patch1 -p0
-%patch2 -p0
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .502133
 
 #need newer certs to make test suite work
 #remove once we update to NSS 3.12.4
@@ -115,9 +111,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-#export NSPR_INCLUDE_DIR=`nspr-config --includedir`
-#export NSPR_LIB_DIR=`nspr-config --libdir`
-
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
@@ -135,9 +128,10 @@ USE_64=1
 export USE_64
 %endif
 
-# We only ship the nss proper libraries, no softoken nor util, yet we                                   
-# must compile everything and usiee the entire source tree because nss                                  
-# needs the private exports from util.
+# We only ship the nss proper libraries, no softoken nor util, yet                                   
+# we must compile with the entire source tree because nss needs                               
+# private exports from util. The install section will ensure not
+# to override nss-util and nss-softoken headers already installed.
 #     
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
@@ -274,8 +268,8 @@ do
 done
 
 # Copy the package configuration files
-%{__install} -p ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
 #remove the nss-util-devel headers
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h
@@ -437,6 +431,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-19
+- remove patches that are now in nss-softokn and
+- remove spurious exec-permissions for nss.pc per rpmlint
+- single requires line in nss.pc.in
+
 * Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-18
 - Fix BuildRequires: nss-softokn-devel release number
 



From pbrobinson at fedoraproject.org  Thu Aug 27 17:35:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 17:35:22 +0000 (UTC)
Subject: rpms/xapian-core/F-11 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xapian-core.spec, 1.23, 1.24
Message-ID: <20090827173522.A03EF11C00EB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8542

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	30 Jul 2009 11:23:06 -0000	1.11
+++ .cvsignore	27 Aug 2009 17:35:22 -0000	1.12
@@ -1 +1 @@
-xapian-core-1.0.14.tar.gz
+xapian-core-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Jul 2009 11:23:06 -0000	1.11
+++ sources	27 Aug 2009 17:35:22 -0000	1.12
@@ -1 +1 @@
-f318fe11143af82aa6679acc51723a1a  xapian-core-1.0.14.tar.gz
+d851e661966fa0446cb46d7352c84a98  xapian-core-1.0.15.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-11/xapian-core.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xapian-core.spec	30 Jul 2009 11:23:06 -0000	1.23
+++ xapian-core.spec	27 Aug 2009 17:35:22 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.14
-Release: 2%{?dist}
+Version: 1.0.15
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
 URL: http://www.xapian.org/
@@ -122,8 +122,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
-* Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-2
-- Add the new source
+* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
+- Update to 1.0.15
 
 * Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-1
 - Update to 1.0.14



From thm at fedoraproject.org  Thu Aug 27 18:01:39 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 27 Aug 2009 18:01:39 +0000 (UTC)
Subject: rpms/python-markdown/devel import.log, 1.3, 1.4 python-markdown.spec,
	1.6, 1.7
Message-ID: <20090827180139.B555D11C00EB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25129/devel

Modified Files:
	import.log python-markdown.spec 
Log Message:
Add (conditional) requirement on python-elementtree. Fix changelog.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	11 Jul 2009 12:32:07 -0000	1.3
+++ import.log	27 Aug 2009 18:01:39 -0000	1.4
@@ -1,3 +1,4 @@
 python-markdown-1_7-1_fc9:HEAD:python-markdown-1.7-1.fc9.src.rpm:1218525227
 python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362
 python-markdown-2_0_1-1_fc11:HEAD:python-markdown-2.0.1-1.fc11.src.rpm:1247315493
+python-markdown-2_0_1-3_fc11:HEAD:python-markdown-2.0.1-3.fc11.src.rpm:1251396032


Index: python-markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/devel/python-markdown.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-markdown.spec	26 Jul 2009 20:37:16 -0000	1.6
+++ python-markdown.spec	27 Aug 2009 18:01:39 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-markdown
 Version:        2.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
@@ -13,6 +13,10 @@ Source0:        http://pypi.python.org/p
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
+%if 0%{?rhel}
+BuildRequires:  python-elementtree
+Requires:       python-elementtree
+%endif
 
 
 %description
@@ -50,6 +54,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.1-3
+- Add requirement on python-elementtree, which was a separate package
+  before Python 2.5.
+- Re-add changelog entries accidentally removed earlier.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -63,5 +72,11 @@ rm -rf %{buildroot}
 - License changed to BSD only.
 - Upstream now provides a script to run markdown from the cmdline.
 
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.7-2
+- Rebuild for Python 2.6
+
 * Mon Aug  4 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.7-1
 - New package.



From cebbert at fedoraproject.org  Thu Aug 27 18:04:33 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 27 Aug 2009 18:04:33 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-bitmap-make-ops-return-result.patch, NONE,
	1.1 linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch,
	NONE, 1.1 linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch,
	NONE, 1.1 kernel.spec, 1.1714, 1.1715
Message-ID: <20090827180433.58C1B11C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27677

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-bitmap-make-ops-return-result.patch 
	linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch 
	linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch 
Log Message:
Fix hangs on older x86 systems with 440*X chipsets.

linux-2.6-bitmap-make-ops-return-result.patch:
 include/linux/bitmap.h  |   18 ++++++++----------
 include/linux/cpumask.h |   20 ++++++++++----------
 lib/bitmap.c            |   12 ++++++++----
 3 files changed, 26 insertions(+), 24 deletions(-)

--- NEW FILE linux-2.6-bitmap-make-ops-return-result.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri, 21 Aug 2009 16:26:15 +0000 (-0700)
Subject: Make bitmask 'and' operators return a result code
X-Git-Tag: v2.6.31-rc7~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f4b0373b26567cafd421d91101852ed7a34e9e94

Make bitmask 'and' operators return a result code

When 'and'ing two bitmasks (where 'andnot' is a variation on it), some
cases want to know whether the result is the empty set or not.  In
particular, the TLB IPI sending code wants to do cpumask operations and
determine if there are any CPU's left in the final set.

So this just makes the bitmask (and cpumask) functions return a boolean
for whether the result has any bits set.

Cc: stable at kernel.org (2.6.30, needed by TLB shootdown fix)
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 2878811..756d78b 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -94,13 +94,13 @@ extern void __bitmap_shift_right(unsigned long *dst,
                         const unsigned long *src, int shift, int bits);
 extern void __bitmap_shift_left(unsigned long *dst,
                         const unsigned long *src, int shift, int bits);
-extern void __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
+extern int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
 			const unsigned long *bitmap2, int bits);
 extern void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
 			const unsigned long *bitmap2, int bits);
 extern void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
 			const unsigned long *bitmap2, int bits);
-extern void __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
+extern int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
 			const unsigned long *bitmap2, int bits);
 extern int __bitmap_intersects(const unsigned long *bitmap1,
 			const unsigned long *bitmap2, int bits);
@@ -171,13 +171,12 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
 	}
 }
 
-static inline void bitmap_and(unsigned long *dst, const unsigned long *src1,
+static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,
 			const unsigned long *src2, int nbits)
 {
 	if (small_const_nbits(nbits))
-		*dst = *src1 & *src2;
-	else
-		__bitmap_and(dst, src1, src2, nbits);
+		return (*dst = *src1 & *src2) != 0;
+	return __bitmap_and(dst, src1, src2, nbits);
 }
 
 static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
@@ -198,13 +197,12 @@ static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
 		__bitmap_xor(dst, src1, src2, nbits);
 }
 
-static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1,
+static inline int bitmap_andnot(unsigned long *dst, const unsigned long *src1,
 			const unsigned long *src2, int nbits)
 {
 	if (small_const_nbits(nbits))
-		*dst = *src1 & ~(*src2);
-	else
-		__bitmap_andnot(dst, src1, src2, nbits);
+		return (*dst = *src1 & ~(*src2)) != 0;
+	return __bitmap_andnot(dst, src1, src2, nbits);
 }
 
 static inline void bitmap_complement(unsigned long *dst, const unsigned long *src,
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index c5ac87c..796df12 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -43,10 +43,10 @@
  * int cpu_isset(cpu, mask)		true iff bit 'cpu' set in mask
  * int cpu_test_and_set(cpu, mask)	test and set bit 'cpu' in mask
  *
- * void cpus_and(dst, src1, src2)	dst = src1 & src2  [intersection]
+ * int cpus_and(dst, src1, src2)	dst = src1 & src2  [intersection]
  * void cpus_or(dst, src1, src2)	dst = src1 | src2  [union]
  * void cpus_xor(dst, src1, src2)	dst = src1 ^ src2
- * void cpus_andnot(dst, src1, src2)	dst = src1 & ~src2
+ * int cpus_andnot(dst, src1, src2)	dst = src1 & ~src2
  * void cpus_complement(dst, src)	dst = ~src
  *
  * int cpus_equal(mask1, mask2)		Does mask1 == mask2?
@@ -179,10 +179,10 @@ static inline int __cpu_test_and_set(int cpu, cpumask_t *addr)
 }
 
 #define cpus_and(dst, src1, src2) __cpus_and(&(dst), &(src1), &(src2), NR_CPUS)
-static inline void __cpus_and(cpumask_t *dstp, const cpumask_t *src1p,
+static inline int __cpus_and(cpumask_t *dstp, const cpumask_t *src1p,
 					const cpumask_t *src2p, int nbits)
 {
-	bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits);
+	return bitmap_and(dstp->bits, src1p->bits, src2p->bits, nbits);
 }
 
 #define cpus_or(dst, src1, src2) __cpus_or(&(dst), &(src1), &(src2), NR_CPUS)
@@ -201,10 +201,10 @@ static inline void __cpus_xor(cpumask_t *dstp, const cpumask_t *src1p,
 
 #define cpus_andnot(dst, src1, src2) \
 				__cpus_andnot(&(dst), &(src1), &(src2), NR_CPUS)
-static inline void __cpus_andnot(cpumask_t *dstp, const cpumask_t *src1p,
+static inline int __cpus_andnot(cpumask_t *dstp, const cpumask_t *src1p,
 					const cpumask_t *src2p, int nbits)
 {
-	bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits);
+	return bitmap_andnot(dstp->bits, src1p->bits, src2p->bits, nbits);
 }
 
 #define cpus_complement(dst, src) __cpus_complement(&(dst), &(src), NR_CPUS)
@@ -738,11 +738,11 @@ static inline void cpumask_clear(struct cpumask *dstp)
  * @src1p: the first input
  * @src2p: the second input
  */
-static inline void cpumask_and(struct cpumask *dstp,
+static inline int cpumask_and(struct cpumask *dstp,
 			       const struct cpumask *src1p,
 			       const struct cpumask *src2p)
 {
-	bitmap_and(cpumask_bits(dstp), cpumask_bits(src1p),
+	return bitmap_and(cpumask_bits(dstp), cpumask_bits(src1p),
 				       cpumask_bits(src2p), nr_cpumask_bits);
 }
 
@@ -779,11 +779,11 @@ static inline void cpumask_xor(struct cpumask *dstp,
  * @src1p: the first input
  * @src2p: the second input
  */
-static inline void cpumask_andnot(struct cpumask *dstp,
+static inline int cpumask_andnot(struct cpumask *dstp,
 				  const struct cpumask *src1p,
 				  const struct cpumask *src2p)
 {
-	bitmap_andnot(cpumask_bits(dstp), cpumask_bits(src1p),
+	return bitmap_andnot(cpumask_bits(dstp), cpumask_bits(src1p),
 					  cpumask_bits(src2p), nr_cpumask_bits);
 }
 
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 35a1f7f..7025658 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -179,14 +179,16 @@ void __bitmap_shift_left(unsigned long *dst,
 }
 EXPORT_SYMBOL(__bitmap_shift_left);
 
-void __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
+int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
 				const unsigned long *bitmap2, int bits)
 {
 	int k;
 	int nr = BITS_TO_LONGS(bits);
+	unsigned long result = 0;
 
 	for (k = 0; k < nr; k++)
-		dst[k] = bitmap1[k] & bitmap2[k];
+		result |= (dst[k] = bitmap1[k] & bitmap2[k]);
+	return result != 0;
 }
 EXPORT_SYMBOL(__bitmap_and);
 
@@ -212,14 +214,16 @@ void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
 }
 EXPORT_SYMBOL(__bitmap_xor);
 
-void __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
+int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
 				const unsigned long *bitmap2, int bits)
 {
 	int k;
 	int nr = BITS_TO_LONGS(bits);
+	unsigned long result = 0;
 
 	for (k = 0; k < nr; k++)
-		dst[k] = bitmap1[k] & ~bitmap2[k];
+		result |= (dst[k] = bitmap1[k] & ~bitmap2[k]);
+	return result != 0;
 }
 EXPORT_SYMBOL(__bitmap_andnot);
 

linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch:
 tlb.c |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri, 21 Aug 2009 16:48:10 +0000 (-0700)
Subject: x86: don't call '->send_IPI_mask()' with an empty mask
X-Git-Tag: v2.6.31-rc7~4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b04e6373d694e977c95ae0ae000e2c1e2cf92d73

x86: don't call '->send_IPI_mask()' with an empty mask

As noted in 83d349f35e1ae72268c5104dbf9ab2ae635425d4 ("x86: don't send
an IPI to the empty set of CPU's"), some APIC's will be very unhappy
with an empty destination mask.  That commit added a WARN_ON() for that
case, and avoided the resulting problem, but didn't fix the underlying
reason for why those empty mask cases happened.

This fixes that, by checking the result of 'cpumask_andnot()' of the
current CPU actually has any other CPU's left in the set of CPU's to be
sent a TLB flush, and not calling down to the IPI code if the mask is
empty.

The reason this started happening at all is that we started passing just
the CPU mask pointers around in commit 4595f9620 ("x86: change
flush_tlb_others to take a const struct cpumask"), and when we did that,
the cpumask was no longer thread-local.

Before that commit, flush_tlb_mm() used to create it's own copy of
'mm->cpu_vm_mask' and pass that copy down to the low-level flush
routines after having tested that it was not empty.  But after changing
it to just pass down the CPU mask pointer, the lower level TLB flush
routines would now get a pointer to that 'mm->cpu_vm_mask', and that
could still change - and become empty - after the test due to other
CPU's having flushed their own TLB's.

See

	http://bugzilla.kernel.org/show_bug.cgi?id=13933

for details.

Tested-by: Thomas Bj??rnell <thomas.bjornell at gmail.com>
Cc: stable at kernel.org
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 821e970..c814e14 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -183,18 +183,17 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask,
 
 	f->flush_mm = mm;
 	f->flush_va = va;
-	cpumask_andnot(to_cpumask(f->flush_cpumask),
-		       cpumask, cpumask_of(smp_processor_id()));
-
-	/*
-	 * We have to send the IPI only to
-	 * CPUs affected.
-	 */
-	apic->send_IPI_mask(to_cpumask(f->flush_cpumask),
-		      INVALIDATE_TLB_VECTOR_START + sender);
+	if (cpumask_andnot(to_cpumask(f->flush_cpumask), cpumask, cpumask_of(smp_processor_id()))) {
+		/*
+		 * We have to send the IPI only to
+		 * CPUs affected.
+		 */
+		apic->send_IPI_mask(to_cpumask(f->flush_cpumask),
+			      INVALIDATE_TLB_VECTOR_START + sender);
 
-	while (!cpumask_empty(to_cpumask(f->flush_cpumask)))
-		cpu_relax();
+		while (!cpumask_empty(to_cpumask(f->flush_cpumask)))
+			cpu_relax();
+	}
 
 	f->flush_mm = NULL;
 	f->flush_va = 0;

linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch:
 ipi.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch ---
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri, 21 Aug 2009 16:23:57 +0000 (-0700)
Subject: x86: don't send an IPI to the empty set of CPU's
X-Git-Tag: v2.6.31-rc7~6
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=83d349f35e1ae72268c5104dbf9ab2ae635425d4

x86: don't send an IPI to the empty set of CPU's

The default_send_IPI_mask_logical() function uses the "flat" APIC mode
to send an IPI to a set of CPU's at once, but if that set happens to be
empty, some older local APIC's will apparently be rather unhappy.  So
just warn if a caller gives us an empty mask, and ignore it.

This fixes a regression in 2.6.30.x, due to commit 4595f9620 ("x86:
change flush_tlb_others to take a const struct cpumask"), documented
here:

	http://bugzilla.kernel.org/show_bug.cgi?id=13933

which causes a silent lock-up.  It only seems to happen on PPro, P2, P3
and Athlon XP cores.  Most developers sadly (or not so sadly, if you're
a developer..) have more modern CPU's.  Also, on x86-64 we don't use the
flat APIC mode, so it would never trigger there even if the APIC didn't
like sending an empty IPI mask.

Reported-by: Pavel Vilim <wylda at volny.cz>
Reported-and-tested-by: Thomas Bj??rnell <thomas.bjornell at gmail.com>
Reported-and-tested-by: Martin Rogge <marogge at onlinehome.de>
Cc: Mike Travis <travis at sgi.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: stable at kernel.org
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index dbf5445..6ef00ba 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -106,6 +106,9 @@ void default_send_IPI_mask_logical(const struct cpumask *cpumask, int vector)
 	unsigned long mask = cpumask_bits(cpumask)[0];
 	unsigned long flags;
 
+	if (WARN_ONCE(!mask, "empty IPI mask"))
+		return;
+
 	local_irq_save(flags);
 	WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]);
 	__default_send_IPI_dest_field(mask, vector, apic->dest_logical);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1714
retrieving revision 1.1715
diff -u -p -r1.1714 -r1.1715
--- kernel.spec	21 Aug 2009 10:08:50 -0000	1.1714
+++ kernel.spec	27 Aug 2009 18:04:32 -0000	1.1715
@@ -714,8 +714,16 @@ Patch13001: linux-2.6.29-xen-disable-gbp
 Patch13002: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
 Patch14000: make-mmap_min_addr-suck-less.patch
+
+# ----- patches headed for -stable -----
+
 Patch14001: do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
+# fix hang on older x86 machines
+Patch14010: linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch
+Patch14020: linux-2.6-bitmap-make-ops-return-result.patch
+Patch14030: linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1318,9 +1326,16 @@ ApplyPatch linux-2.6-virtio_blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
+# ----- patches headed for -stable -----
+
 # CVE-2009-2847
 ApplyPatch do_sigaltstack-avoid-copying-stack_t-as-a-structure-to-userspace.patch
 
+# fix hang on older x86 machines
+ApplyPatch linux-2.6-x86-dont-send-ipi-to-empty-set-cpus.patch
+ApplyPatch linux-2.6-bitmap-make-ops-return-result.patch
+ApplyPatch linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1906,6 +1921,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-36
+- Fix hangs on older x86 systems with 440*X chipsets.
+
 * Fri Aug 21 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Fix b43 on iMac G5 (#514787)
 



From thm at fedoraproject.org  Thu Aug 27 18:07:45 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 27 Aug 2009 18:07:45 +0000 (UTC)
Subject: rpms/python-markdown/EL-5 import.log, 1.3, 1.4 python-markdown.spec,
	1.6, 1.7
Message-ID: <20090827180745.523D111C00EB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29852/EL-5

Modified Files:
	import.log python-markdown.spec 
Log Message:
Add (conditional) requirement on python-elementtree. Fix changelog.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	11 Jul 2009 12:32:07 -0000	1.3
+++ import.log	27 Aug 2009 18:07:45 -0000	1.4
@@ -1,3 +1,4 @@
 python-markdown-1_7-1_fc9:HEAD:python-markdown-1.7-1.fc9.src.rpm:1218525227
 python-markdown-2_0-1_fc10:HEAD:python-markdown-2.0-1.fc10.src.rpm:1240905362
 python-markdown-2_0_1-1_fc11:HEAD:python-markdown-2.0.1-1.fc11.src.rpm:1247315493
+python-markdown-2_0_1-3_fc11:EL-5:python-markdown-2.0.1-3.fc11.src.rpm:1251396419


Index: python-markdown.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown/EL-5/python-markdown.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-markdown.spec	26 Jul 2009 20:37:16 -0000	1.6
+++ python-markdown.spec	27 Aug 2009 18:07:45 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-markdown
 Version:        2.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Markdown implementation in Python
 Group:          Development/Languages
 License:        BSD
@@ -13,6 +13,10 @@ Source0:        http://pypi.python.org/p
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
+%if 0%{?rhel}
+BuildRequires:  python-elementtree
+Requires:       python-elementtree
+%endif
 
 
 %description
@@ -50,6 +54,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.0.1-3
+- Add requirement on python-elementtree, which was a separate package
+  before Python 2.5.
+- Re-add changelog entries accidentally removed earlier.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -63,5 +72,11 @@ rm -rf %{buildroot}
 - License changed to BSD only.
 - Upstream now provides a script to run markdown from the cmdline.
 
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.7-2
+- Rebuild for Python 2.6
+
 * Mon Aug  4 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.7-1
 - New package.



From pbrobinson at fedoraproject.org  Thu Aug 27 18:08:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 27 Aug 2009 18:08:49 +0000 (UTC)
Subject: rpms/xapian-core/F-10 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xapian-core.spec, 1.19, 1.20
Message-ID: <20090827180849.5C1E611C00EB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/xapian-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30658

Modified Files:
	.cvsignore sources xapian-core.spec 
Log Message:
- Update to 1.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	27 Aug 2009 17:19:01 -0000	1.10
+++ .cvsignore	27 Aug 2009 18:08:48 -0000	1.11
@@ -1 +1 @@
-xapian-core-1.0.14.tar.gz
+xapian-core-1.0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Aug 2009 17:19:01 -0000	1.10
+++ sources	27 Aug 2009 18:08:48 -0000	1.11
@@ -1 +1 @@
-f318fe11143af82aa6679acc51723a1a  xapian-core-1.0.14.tar.gz
+d851e661966fa0446cb46d7352c84a98  xapian-core-1.0.15.tar.gz


Index: xapian-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xapian-core/F-10/xapian-core.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xapian-core.spec	27 Aug 2009 17:19:01 -0000	1.19
+++ xapian-core.spec	27 Aug 2009 18:08:48 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.14
+Version: 1.0.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
@@ -122,6 +122,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
+- Update to 1.0.15
+
 * Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-1
 - Update to 1.0.14
 



From ajax at fedoraproject.org  Thu Aug 27 18:14:21 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 27 Aug 2009 18:14:21 +0000 (UTC)
Subject: rpms/libxcb/devel .cvsignore, 1.8, 1.9 libxcb.spec, 1.28,
	1.29 sources, 1.8, 1.9 libxcb-1.1-no-pthread-stubs.patch, 1.2,
	NONE libxcb-1.3-to-git-e06955.patch, 1.1, NONE
Message-ID: <20090827181421.C7E8911C00EB@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1538

Modified Files:
	.cvsignore libxcb.spec sources 
Removed Files:
	libxcb-1.1-no-pthread-stubs.patch 
	libxcb-1.3-to-git-e06955.patch 
Log Message:
* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 1.4-1
- libxcb 1.4 (#518597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Jul 2009 15:55:52 -0000	1.8
+++ .cvsignore	27 Aug 2009 18:14:21 -0000	1.9
@@ -1,3 +1,4 @@
 libxcb-1.2.tar.bz2
 xpyb-1.1.tar.bz2
 libxcb-1.3.tar.bz2
+libxcb-1.4.tar.bz2


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libxcb.spec	25 Jul 2009 08:56:47 -0000	1.28
+++ libxcb.spec	27 Aug 2009 18:14:21 -0000	1.29
@@ -6,8 +6,8 @@
 #define bootstrap 1
 
 Name:           libxcb
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -22,9 +22,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Source1:	pthread-stubs.pc.in
 Source2:	http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 
 
-Patch0:         libxcb-1.1-no-pthread-stubs.patch
-Patch1:		libxcb-1.3-to-git-e06955.patch
-
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -73,8 +70,6 @@ Python bindings for %{name}.
 
 %prep
 %setup -q -b2
-%patch0 -p1 -b .pthread-stubs
-%patch1 -p1 -b .git
 
 %if !0%{?bootstrap}
 pushd ../xpyb-%{xpyb_version}
@@ -160,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 1.4-1
+- libxcb 1.4 (#518597)
+
 * Sat Jul 25 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/libxcb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Jul 2009 15:55:52 -0000	1.8
+++ sources	27 Aug 2009 18:14:21 -0000	1.9
@@ -1,3 +1,2 @@
-ae32b7846a7d83f5ec542a5431117564  libxcb-1.2.tar.bz2
 0d82bbaa97f89e41aada9fab5630147a  xpyb-1.1.tar.bz2
-74b18b863df6dd669e1df9854f96c329  libxcb-1.3.tar.bz2
+b00fd506c717dea01f595e8da31f6914  libxcb-1.4.tar.bz2


--- libxcb-1.1-no-pthread-stubs.patch DELETED ---


--- libxcb-1.3-to-git-e06955.patch DELETED ---



From cebbert at fedoraproject.org  Thu Aug 27 18:23:32 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 27 Aug 2009 18:23:32 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch,
	NONE, 1.1 kernel.spec, 1.1715, 1.1716
Message-ID: <20090827182332.9E45211C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7471

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch 
Log Message:
Fix race in clone() syscall.

linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch:
 fork.c |   20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

--- NEW FILE linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch ---
From: Oleg Nesterov <oleg at redhat.com>
Date: Wed, 26 Aug 2009 21:29:24 +0000 (-0700)
Subject: clone(): fix race between copy_process() and de_thread()
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4ab6c08336535f8c8e42cf45d7adeda882eff06e

clone(): fix race between copy_process() and de_thread()

Spotted by Hiroshi Shimamoto who also provided the test-case below.

copy_process() uses signal->count as a reference counter, but it is not.
This test case

	#include <sys/types.h>
	#include <sys/wait.h>
	#include <unistd.h>
	#include <stdio.h>
	#include <errno.h>
	#include <pthread.h>

	void *null_thread(void *p)
	{
		for (;;)
			sleep(1);

		return NULL;
	}

	void *exec_thread(void *p)
	{
		execl("/bin/true", "/bin/true", NULL);

		return null_thread(p);
	}

	int main(int argc, char **argv)
	{
		for (;;) {
			pid_t pid;
			int ret, status;

			pid = fork();
			if (pid < 0)
				break;

			if (!pid) {
				pthread_t tid;

				pthread_create(&tid, NULL, exec_thread, NULL);
				for (;;)
					pthread_create(&tid, NULL, null_thread, NULL);
			}

			do {
				ret = waitpid(pid, &status, 0);
			} while (ret == -1 && errno == EINTR);
		}

		return 0;
	}

quickly creates an unkillable task.

If copy_process(CLONE_THREAD) races with de_thread()
copy_signal()->atomic(signal->count) breaks the signal->notify_count
logic, and the execing thread can hang forever in kernel space.

Change copy_process() to increment count/live only when we know for sure
we can't fail.  In this case the forked thread will take care of its
reference to signal correctly.

If copy_process() fails, check CLONE_THREAD flag.  If it it set - do
nothing, the counters were not changed and current belongs to the same
thread group.  If it is not set, ->signal must be released in any case
(and ->count must be == 1), the forked child is the only thread in the
thread group.

We need more cleanups here, in particular signal->count should not be used
by de_thread/__exit_signal at all.  This patch only fixes the bug.

Reported-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Tested-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Acked-by: Roland McGrath <roland at redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/kernel/fork.c b/kernel/fork.c
index 144326b..e6c04d4 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -815,11 +815,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 {
 	struct signal_struct *sig;
 
-	if (clone_flags & CLONE_THREAD) {
-		atomic_inc(&current->signal->count);
-		atomic_inc(&current->signal->live);
+	if (clone_flags & CLONE_THREAD)
 		return 0;
-	}
 
 	sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
 	tsk->signal = sig;
@@ -877,16 +874,6 @@ void __cleanup_signal(struct signal_struct *sig)
 	kmem_cache_free(signal_cachep, sig);
 }
 
-static void cleanup_signal(struct task_struct *tsk)
-{
-	struct signal_struct *sig = tsk->signal;
-
-	atomic_dec(&sig->live);
-
-	if (atomic_dec_and_test(&sig->count))
-		__cleanup_signal(sig);
-}
-
 static void copy_flags(unsigned long clone_flags, struct task_struct *p)
 {
 	unsigned long new_flags = p->flags;
@@ -1239,6 +1226,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	}
 
 	if (clone_flags & CLONE_THREAD) {
+		atomic_inc(&current->signal->count);
+		atomic_inc(&current->signal->live);
 		p->group_leader = current->group_leader;
 		list_add_tail_rcu(&p->thread_group, &p->group_leader->thread_group);
 	}
@@ -1282,7 +1271,8 @@ bad_fork_cleanup_mm:
 	if (p->mm)
 		mmput(p->mm);
 bad_fork_cleanup_signal:
-	cleanup_signal(p);
+	if (!(clone_flags & CLONE_THREAD))
+		__cleanup_signal(p->signal);
 bad_fork_cleanup_sighand:
 	__cleanup_sighand(p->sighand);
 bad_fork_cleanup_fs:


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1715
retrieving revision 1.1716
diff -u -p -r1.1715 -r1.1716
--- kernel.spec	27 Aug 2009 18:04:32 -0000	1.1715
+++ kernel.spec	27 Aug 2009 18:23:32 -0000	1.1716
@@ -724,6 +724,9 @@ Patch14010: linux-2.6-x86-dont-send-ipi-
 Patch14020: linux-2.6-bitmap-make-ops-return-result.patch
 Patch14030: linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
 
+# fix race in clone()
+Patch14040: linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1336,6 +1339,9 @@ ApplyPatch linux-2.6-x86-dont-send-ipi-t
 ApplyPatch linux-2.6-bitmap-make-ops-return-result.patch
 ApplyPatch linux-2.6-x86-dont-call-send-ipi-mask-with-empty-mask.patch
 
+# fix race in clone()
+ApplyPatch linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1921,6 +1927,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-37
+- Fix race in clone() syscall.
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-36
 - Fix hangs on older x86 systems with 440*X chipsets.
 



From ajax at fedoraproject.org  Thu Aug 27 18:28:07 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 27 Aug 2009 18:28:07 +0000 (UTC)
Subject: rpms/xorg-x11-drv-vmmouse/devel abi.patch, NONE,
	1.1 xorg-x11-drv-vmmouse.spec, 1.29, 1.30
Message-ID: <20090827182807.216C211C00EB@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9987

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Added Files:
	abi.patch 
Log Message:
* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 12.6.5-2
- abi.patch: Re-add. (#518589)


abi.patch:
 vmmouse.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE abi.patch ---
diff -up xf86-input-vmmouse-12.6.5/src/vmmouse.c.jx xf86-input-vmmouse-12.6.5/src/vmmouse.c
--- xf86-input-vmmouse-12.6.5/src/vmmouse.c.jx	2009-08-06 13:23:09.000000000 -0400
+++ xf86-input-vmmouse-12.6.5/src/vmmouse.c	2009-08-27 14:26:54.000000000 -0400
@@ -1175,8 +1175,6 @@ VMMousePlug(pointer	module,
 {
    static Bool Initialised = FALSE;
 
-   xf86LoaderReqSymLists(reqSymbols, NULL);
-
    if (!Initialised)
       Initialised = TRUE;
 


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xorg-x11-drv-vmmouse.spec	6 Aug 2009 23:44:19 -0000	1.29
+++ xorg-x11-drv-vmmouse.spec	27 Aug 2009 18:28:06 -0000	1.30
@@ -5,13 +5,14 @@
 Summary:    Xorg X11 vmmouse input driver
 Name:	    xorg-x11-drv-vmmouse
 Version:    12.6.5
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch0:	    abi.patch
 
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
@@ -25,6 +26,7 @@ X.Org X11 vmmouse input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static --with-hal-callouts-dir=%{_bindir}
@@ -51,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 
 %changelog
+* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 12.6.5-2
+- abi.patch: Re-add. (#518589)
+
 * Fri Aug 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 12.6.5-1
 - vmmouse 12.6.5
 - vmmouse-12.6.4-abi.patch: Drop.



From thm at fedoraproject.org  Thu Aug 27 18:33:46 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 27 Aug 2009 18:33:46 +0000 (UTC)
Subject: rpms/python-py/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 python-py.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090827183346.9E43311C00EB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-py/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13535/devel

Modified Files:
	.cvsignore import.log python-py.spec sources 
Log Message:
Update to 1.0.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Aug 2009 17:31:58 -0000	1.4
+++ .cvsignore	27 Aug 2009 18:33:46 -0000	1.5
@@ -1 +1 @@
-py-1.0.0.tar.gz
+py-1.0.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	13 Aug 2009 17:31:58 -0000	1.3
+++ import.log	27 Aug 2009 18:33:46 -0000	1.4
@@ -1,3 +1,4 @@
 python-py-0_9_2-6_fc10:HEAD:python-py-0.9.2-6.fc10.src.rpm:1232104910
 python-py-1_0_0-0_b8_fc11:HEAD:python-py-1.0.0-0.b8.fc11.src.rpm:1248303215
 python-py-1_0_0-1_fc11:HEAD:python-py-1.0.0-1.fc11.src.rpm:1250184682
+python-py-1_0_2-1_fc11:HEAD:python-py-1.0.2-1.fc11.src.rpm:1251397988


Index: python-py.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/python-py.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-py.spec	13 Aug 2009 17:31:58 -0000	1.5
+++ python-py.spec	27 Aug 2009 18:33:46 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-py
-Version:        1.0.0
+Version:        1.0.2
 Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 Summary:        Innovative python library containing py.test, greenlets and other niceties
 Group:          Development/Languages
@@ -9,7 +9,7 @@ License:        MIT and LGPLv2+ and Publ
 #               - main package: MIT, except:
 #                 - test/rsession/webdata/json.py: LPGLv2+
 #                 - doc/style.css: Public Domain
-#                 - test/web/post_multipart.py: Python 
+#                 - test/web/post_multipart.py: Python
 #                   (see http://code.activestate.com/help/terms)
 #                 - compat/textwrap.py: Python
 #                 - compat/subprocess.py: Python
@@ -65,27 +65,29 @@ find %{buildroot}%{python_sitelib} \( -n
 # move some txt files to the doc directory
 mkdir -p %{doctarget}
 mv %{buildroot}%{python_sitelib}/py/LICENSE %{doctarget}
-mv %{buildroot}%{python_sitelib}/py/compat/LICENSE %{doctarget}/compat_LICENSE
-mv %{buildroot}%{python_sitelib}/py/execnet/NOTES %{doctarget}/execnet_NOTES
-mv %{buildroot}%{python_sitelib}/py/execnet/improve-remote-tracebacks.txt \
-   %{doctarget}/execnet_improve-remote-tracebacks.txt
-mv %{buildroot}%{python_sitelib}/py/path/gateway/TODO.txt %{doctarget}/path_gateway_TODO.txt
-mv %{buildroot}%{python_sitelib}/py/path/svn/quoting.txt %{doctarget}/svn_quoting_path.txt
-cp -pr doc example contrib %{doctarget}
+# files are not in the 1.0.2 tarball, but might again be there in
+# later releases:
+#mv %{buildroot}%{python_sitelib}/py/compat/LICENSE %{doctarget}/compat_LICENSE
+#mv %{buildroot}%{python_sitelib}/py/execnet/NOTES %{doctarget}/execnet_NOTES
+#mv %{buildroot}%{python_sitelib}/py/execnet/improve-remote-tracebacks.txt \
+#   %{doctarget}/execnet_improve-remote-tracebacks.txt
+#mv %{buildroot}%{python_sitelib}/py/path/gateway/TODO.txt %{doctarget}/path_gateway_TODO.txt
+#mv %{buildroot}%{python_sitelib}/py/path/svn/quoting.txt %{doctarget}/svn_quoting_path.txt
+cp -pr README.txt doc example contrib %{doctarget}
 
 # remove this and that
 find %{buildroot}%{python_sitelib} -name '*.cmd' -exec rm {} \;
 
-# remove (most) files only used by the testsuite
+# remove (most) files only used by the testsuite - upstream plans on
+# separating that out for the 1.1 version
 #find %{buildroot}%{python_sitelib} -type d -name testing -prune -exec rm -r {} \;
 #find %{buildroot}%{python_sitelib} -name 'conftest.py*' -exec rm {} \;
 
 
 %check
-# some tests need to be skipped currently
-PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test \
-  '-k-test_make_sdist_and_run_it' \
-  py
+# test cannot be run in %{buildroot}, because it uses
+# inspect.getsourcefile() et. al.
+PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py
 
 
 %clean
@@ -100,6 +102,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.2-1
+- Update to 1.0.2.
+- One failing test is no longer part of the testsuite, thus needs not
+  to be skipped anymore.
+- Some developer docs are missing this time in upstream's tarfile, so
+  cannot be moved to %%{_docdir}
+
 * Thu Aug 13 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.0-1
 - Update to 1.0.0.
 - Re-enable SVN tests in %%check.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Aug 2009 17:31:58 -0000	1.4
+++ sources	27 Aug 2009 18:33:46 -0000	1.5
@@ -1 +1 @@
-3223ff8fcaefd060be13262e367794ce  py-1.0.0.tar.gz
+4d2e9878b0113159fae2f3ed0cfc081d  py-1.0.2.tar.gz



From cebbert at fedoraproject.org  Thu Aug 27 18:52:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 27 Aug 2009 18:52:06 +0000 (UTC)
Subject: rpms/kernel/F-11 hda-check-strcpy-length.patch, NONE,
	1.1 linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch, NONE,
	1.1 kernel.spec, 1.1716, 1.1717
Message-ID: <20090827185207.7A0F711C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23185

Modified Files:
	kernel.spec 
Added Files:
	hda-check-strcpy-length.patch 
	linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch 
Log Message:
Fix string overflows found by stackprotector:
  hda-check-strcpy-length.patch
  linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch

hda-check-strcpy-length.patch:
 hda_codec.c |    2 ++
 hda_intel.c |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE hda-check-strcpy-length.patch ---
From: Takashi Iwai <tiwai at suse.de>
Date: Thu, 16 Apr 2009 08:22:24 +0000 (+0200)
Subject: ALSA: hda - Check strcpy length
X-Git-Tag: v2.6.31-rc1~38^2~11^2~54
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=18cb7109d3e83195b605ff2905981020e86f72ca

ALSA: hda - Check strcpy length

Check the length to copy via strlen() beforehand to avoid the stack
corruption, or use strlcpy() to be safe in HD-audio codes.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 37f24ce..48f0cea 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1431,6 +1431,8 @@ _snd_hda_find_mixer_ctl(struct hda_codec *codec,
 	memset(&id, 0, sizeof(id));
 	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
 	id.index = idx;
+	if (snd_BUG_ON(strlen(name) >= sizeof(id.name)))
+		return NULL;
 	strcpy(id.name, name);
 	return snd_ctl_find_id(codec->bus->card, &id);
 }
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 21a3092..41db5d4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1830,7 +1830,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
 			  &pcm);
 	if (err < 0)
 		return err;
-	strcpy(pcm->name, cpcm->name);
+	strlcpy(pcm->name, cpcm->name, sizeof(pcm->name));
 	apcm = kzalloc(sizeof(*apcm), GFP_KERNEL);
 	if (apcm == NULL)
 		return -ENOMEM;
@@ -2358,9 +2358,11 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
 	}
 
 	strcpy(card->driver, "HDA-Intel");
-	strcpy(card->shortname, driver_short_names[chip->driver_type]);
-	sprintf(card->longname, "%s at 0x%lx irq %i",
-		card->shortname, chip->addr, chip->irq);
+	strlcpy(card->shortname, driver_short_names[chip->driver_type],
+		sizeof(card->shortname));
+	snprintf(card->longname, sizeof(card->longname),
+		 "%s at 0x%lx irq %i",
+		 card->shortname, chip->addr, chip->irq);
 
 	*rchip = chip;
 	return 0;

linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch:
 af9015.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch ---
From: Jan Nikitenko <jan.nikitenko at gmail.com>
Date: Tue, 9 Jun 2009 22:31:55 +0000 (-0300)
Subject: V4L/DVB (11999): af9015: fix stack corruption bug
X-Git-Tag: v2.6.31-rc1~297^2~58
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1e7439388a5aa6decf76ac1d73d5312fe713e6af

V4L/DVB (11999): af9015: fix stack corruption bug

This patch fixes stack corruption bug present in af9015_eeprom_dump():
the buffer buf is one byte smaller than required - there is 4 chars
for address prefix, 16*3 chars for dump of 16 eeprom bytes per line
and 1 byte for zero ending the string required, i.e. 53 bytes, but
only 52 are provided.
The one byte missing in stack based buffer buf causes following oops
on MIPS little endian platform, because i2c_adap pointer in
af9015_af9013_frontend_attach() is corrupted by inlined function
af9015_eeprom_dump():

CPU 0 Unable to handle kernel paging request at virtual address 00000000, epc ==
803a4488, ra == c049a1c8
Oops[#1]:
Cpu 0
$ 0   : 00000000 10003c00 00000000 803a4468
$ 4   : 8f17c600 8f067b30 00000002 00000038
$ 8   : 00000001 8faf3e98 11da000d 09010002
$12   : 00000000 00000000 00000000 0000000a
$16   : 8f17c600 8f067b68 8faf3c00 8f067c04
$20   : 8f067b9c 00000100 8f067bf0 80104100
$24   : 00000000 2aba9fb0
$28   : 8f066000 8f067af0 802cbc48 c049a1c8
Hi    : 00000000
Lo    : 00000000
epc   : 803a4488 i2c_transfer+0x20/0x104
   Not tainted
ra    : c049a1c8 af9013_read_reg+0x78/0xc4 [af9013]
Status: 10003c03    KERNEL EXL IE
Cause : 00808008
BadVA : 00000000
PrId  : 03030200 (Au1550)
Modules linked in: af9013 dvb_usb_af9015(+) dvb_usb dvb_core firmware_class
i2c_au1550 au1550_spi
Process modprobe (pid: 2757, threadinfo=8f066000, task=8fade098, tls=2aad6470)
Stack : c049f5e0 80163090 805ba880 00000100 8f067bf0 0000d733 8f067b68 8faf3c00
       8f067c04 c049a1c8 80163bc0 8056a630 8f067b40 80163224 80569fc8 8f0033d7
       00000038 80140003 8f067b2c 00010038 c0420001 8f067b28 c049f5e0 00000004
       00000004 c049a524 c049d5a8 c049d5a8 00000000 803a6700 00000000 8f17c600
       c042a7a4 8f17c600 c042a7a4 c049c924 00000000 00000000 00000002 613a6c00
       ...
Call Trace:
[<803a4488>] i2c_transfer+0x20/0x104
[<c049a1c8>] af9013_read_reg+0x78/0xc4 [af9013]
[<c049a524>] af9013_read_reg_bits+0x2c/0x70 [af9013]
[<c049c924>] af9013_attach+0x98/0x65c [af9013]
[<c04257bc>] af9015_af9013_frontend_attach+0x214/0x67c [dvb_usb_af9015]
[<c03e2428>] dvb_usb_adapter_frontend_init+0x20/0x12c [dvb_usb]
[<c03e1ad8>] dvb_usb_device_init+0x374/0x6b0 [dvb_usb]
[<c0426120>] af9015_usb_probe+0x4fc/0xfcc [dvb_usb_af9015]
[<80381024>] usb_probe_interface+0xbc/0x218
[<803227fc>] driver_probe_device+0x12c/0x30c
[<80322a80>] __driver_attach+0xa4/0xac
[<80321ed0>] bus_for_each_dev+0x60/0xd0
[<8032162c>] bus_add_driver+0x1e8/0x2a8
[<80322cdc>] driver_register+0x7c/0x17c
[<80380d30>] usb_register_driver+0xa0/0x12c
[<c042e030>] af9015_usb_module_init+0x30/0x6c [dvb_usb_af9015]
[<8010d2a4>] __kprobes_text_end+0x3c/0x1f4
[<80167150>] sys_init_module+0xb8/0x1cc
[<80102370>] stack_done+0x20/0x3c

Code: afb10018  7000003f  00808021 <8c430000> 7000003f  1060002d  00c09021
8f830014  3c02efff

Signed-off-by: Jan Nikitenko <jan.nikitenko at gmail.com>
Acked-by: Antti Palosaari <crope at iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 9155a79..4cb31e7 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -538,7 +538,7 @@ exit:
 /* dump eeprom */
 static int af9015_eeprom_dump(struct dvb_usb_device *d)
 {
-	char buf[52], buf2[4];
+	char buf[4+3*16+1], buf2[4];
 	u8 reg, val;
 
 	for (reg = 0; ; reg++) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1716
retrieving revision 1.1717
diff -u -p -r1.1716 -r1.1717
--- kernel.spec	27 Aug 2009 18:23:32 -0000	1.1716
+++ kernel.spec	27 Aug 2009 18:52:06 -0000	1.1717
@@ -727,6 +727,9 @@ Patch14030: linux-2.6-x86-dont-call-send
 # fix race in clone()
 Patch14040: linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
 
+# Fix string overflows found by stackprotector:
+Patch14050: hda-check-strcpy-length.patch
+Patch14060: linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1342,6 +1345,10 @@ ApplyPatch linux-2.6-x86-dont-call-send-
 # fix race in clone()
 ApplyPatch linux-2.6-clone-fix-race-between-copy-process-and-de-thread.patch
 
+# Fix string overflows found by stackprotector:
+ApplyPatch hda-check-strcpy-length.patch
+ApplyPatch linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1927,6 +1934,11 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-38
+- Fix string overflows found by stackprotector:
+  hda-check-strcpy-length.patch
+  linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-37
 - Fix race in clone() syscall.
 



From emaldonado at fedoraproject.org  Thu Aug 27 18:55:24 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 18:55:24 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.98,1.99
Message-ID: <20090827185524.9D72411C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25330

Modified Files:
	nss.spec 
Log Message:
disabling test until we invertigate bug 519766


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- nss.spec	27 Aug 2009 17:27:53 -0000	1.98
+++ nss.spec	27 Aug 2009 18:55:24 -0000	1.99
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          19%{?dist}
+Release:          20%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -205,7 +205,13 @@ killall $RANDSERV || :
 rm -rf ./mozilla/tests_results
 cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
+
+#HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
+
+# Temporarily disabling tests until we investigate a fix for Bug 519766
+# Just run the cipher suites for now
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_TESTS="cipher" ./all.sh
+
 cd ../../../../
 
 killall $RANDSERV || :
@@ -431,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-20
+- disabling some tests while we investigate a buffer overflow bug - 519766
+
 * Wed Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-19
 - remove patches that are now in nss-softokn and
 - remove spurious exec-permissions for nss.pc per rpmlint



From linville at fedoraproject.org  Thu Aug 27 18:56:09 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu, 27 Aug 2009 18:56:09 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1679.2.17, 1.1679.2.18
Message-ID: <20090827185609.C63CD11C00EB@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25921

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch 
Log Message:
zd1211rw: adding 083a:e503 as a ZD1211B device (#518538)

linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch:
 zd_usb.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch ---
commit f72151fb6820e90ce12a15e2768aa41150c5186d
Author: Hin-Tak Leung <hintak.leung at gmail.com>
Date:   Tue Jun 16 03:15:56 2009 +0100

    zd1211rw: adding 083a:e503 as a ZD1211B device
    
    Hans Pontar reported success on the sourceforge zd1211-devs mailing list.
    The device is branded "Arcor Easy Stick A 50 WLAN" (device manufactured
    by SMC for a German ISP - SMC model name: WN4501H-LF-IR). General
    information and Windows driver are available under (German only):
    
    http://www.arcor.de/hilfe/neu/index.php?sid=&aktion=anzeigen&rubrik=004018140&id=487
    
    Device details:
    
    USB-IDs: Vendor: 0x083A Device: 0xE503
    Chip ID: zd1211b chip 083a:e503 v4810 high 00-1d-19 AL2230S_RF pa0 g--N-
    
    Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
    Tested-by: Hans Pontar <pontar at gmx.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index f0e5e94..14a19ba 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -67,6 +67,7 @@ static struct usb_device_id usb_ids[] = {
 	{ USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
 	{ USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
 	{ USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
+	{ USB_DEVICE(0x083a, 0xe503), .driver_info = DEVICE_ZD1211B },
 	{ USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },
 	{ USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
 	{ USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.17
retrieving revision 1.1679.2.18
diff -u -p -r1.1679.2.17 -r1.1679.2.18
--- kernel.spec	26 Aug 2009 21:19:43 -0000	1.1679.2.17
+++ kernel.spec	27 Aug 2009 18:56:09 -0000	1.1679.2.18
@@ -692,6 +692,7 @@ Patch690: iwl3945-release-resources-befo
 Patch691: iwl3945-add-debugging-for-wrong-command-queue.patch
 Patch692: iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
 Patch693: linux-2.6-iwlwifi_-fix-TX-queue-race.patch
+Patch694: linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
 
 Patch700: linux-2.6-dma-debug-fixes.patch
 
@@ -1440,6 +1441,9 @@ ApplyPatch iwl3945-fix-rfkill-sw-and-hw-
 # iwlwifi: fix TX queue race
 ApplyPatch linux-2.6-iwlwifi_-fix-TX-queue-race.patch
 
+# zd1211rw: adding 083a:e503 as a ZD1211B device
+ApplyPatch linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
+
 # Fix up DMA debug code
 ApplyPatch linux-2.6-dma-debug-fixes.patch
 
@@ -2180,6 +2184,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 John W. Linville <linville at redhat.com>
+- zd1211rw: adding 083a:e503 as a ZD1211B device (#518538)
+
 * Wed Aug 26 2009 Jarod Wilson <jarod at redhat.com>
 - Fix up hdpvr ir enable patch for use w/modular i2c (David Engel)
 - Revert lirc_zilog 2.6.31 i2c changes so it works on pre-2.6.31



From ajax at fedoraproject.org  Thu Aug 27 18:58:31 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 27 Aug 2009 18:58:31 +0000 (UTC)
Subject: rpms/kernel/devel drm-rv710-ucode-fix.patch, NONE, 1.1 kernel.spec, 
	1.1745, 1.1746
Message-ID: <20090827185831.AE1BF11C00EB@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27661

Modified Files:
	kernel.spec 
Added Files:
	drm-rv710-ucode-fix.patch 
Log Message:
* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
- drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
  you know, success. (#519718)


drm-rv710-ucode-fix.patch:
 rv770.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE drm-rv710-ucode-fix.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c.jx linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c.jx	2009-08-27 14:45:25.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c	2009-08-27 14:54:30.000000000 -0400
@@ -282,6 +282,7 @@ static int rv770_cp_load_microcode(struc
 		for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
 			WREG32(CP_ME_RAM_DATA, RV710_cp_microcode[i]);
 		WREG32(CP_ME_RAM_WADDR, 0);
+		break;
 	default:
 		DRM_ERROR("Unknown chipset for RV7XX microcode\n");
 		return -1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1745
retrieving revision 1.1746
diff -u -p -r1.1745 -r1.1746
--- kernel.spec	27 Aug 2009 13:32:34 -0000	1.1745
+++ kernel.spec	27 Aug 2009 18:58:31 -0000	1.1746
@@ -691,6 +691,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
+Patch1827: drm-rv710-ucode-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1311,6 +1312,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
+ApplyPatch drm-rv710-ucode-fix.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2009,6 +2011,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
+- drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
+  you know, success. (#519718)
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git5
 - Drop patch linux-2.6-ima-leak.patch, now merged upstream.



From linville at fedoraproject.org  Thu Aug 27 19:01:32 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu, 27 Aug 2009 19:01:32 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch,
	1.1, 1.2 kernel.spec, 1.1717, 1.1718
Message-ID: <20090827190132.61B6C11C00ED@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29572

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch 
Log Message:
zd1211rw: adding 083a:e503 as a ZD1211B device

linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch:
 zd_usb.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
===================================================================
RCS file: linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
diff -N linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch	27 Aug 2009 19:01:32 -0000	1.2
@@ -0,0 +1,34 @@
+commit f72151fb6820e90ce12a15e2768aa41150c5186d
+Author: Hin-Tak Leung <hintak.leung at gmail.com>
+Date:   Tue Jun 16 03:15:56 2009 +0100
+
+    zd1211rw: adding 083a:e503 as a ZD1211B device
+    
+    Hans Pontar reported success on the sourceforge zd1211-devs mailing list.
+    The device is branded "Arcor Easy Stick A 50 WLAN" (device manufactured
+    by SMC for a German ISP - SMC model name: WN4501H-LF-IR). General
+    information and Windows driver are available under (German only):
+    
+    http://www.arcor.de/hilfe/neu/index.php?sid=&aktion=anzeigen&rubrik=004018140&id=487
+    
+    Device details:
+    
+    USB-IDs: Vendor: 0x083A Device: 0xE503
+    Chip ID: zd1211b chip 083a:e503 v4810 high 00-1d-19 AL2230S_RF pa0 g--N-
+    
+    Signed-off-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
+    Tested-by: Hans Pontar <pontar at gmx.de>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
+index f0e5e94..14a19ba 100644
+--- a/drivers/net/wireless/zd1211rw/zd_usb.c
++++ b/drivers/net/wireless/zd1211rw/zd_usb.c
+@@ -67,6 +67,7 @@ static struct usb_device_id usb_ids[] = {
+ 	{ USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
++	{ USB_DEVICE(0x083a, 0xe503), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
+ 	{ USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1717
retrieving revision 1.1718
diff -u -p -r1.1717 -r1.1718
--- kernel.spec	27 Aug 2009 18:52:06 -0000	1.1717
+++ kernel.spec	27 Aug 2009 19:01:31 -0000	1.1718
@@ -644,6 +644,7 @@ Patch670: linux-2.6-ata-quirk.patch
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch682: linux-2.6-iwlwifi_-fix-TX-queue-race.patch
+Patch683: linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -1284,6 +1285,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # iwlwifi: fix TX queue race
 ApplyPatch linux-2.6-iwlwifi_-fix-TX-queue-race.patch
 
+# zd1211rw: adding 083a:e503 as a ZD1211B device
+ApplyPatch linux-2.6-zd1211rw_-adding-083a_e503-as-a-ZD1211B-device.patch
+
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -1934,6 +1938,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 John W. Linville <linville at redhat.com> 2.6.30.5-39
+- zd1211rw: adding 083a:e503 as a ZD1211B device (#518538)
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-38
 - Fix string overflows found by stackprotector:
   hda-check-strcpy-length.patch



From steved at fedoraproject.org  Thu Aug 27 19:11:42 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 27 Aug 2009 19:11:42 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-spnfsd-01.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-02.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-03.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-04.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-05.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-06.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-07.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-08.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-09.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-10.patch, NONE,
	1.1.2.1 nfs-utils-1.2.0-spnfsd-installrules.patch, NONE,
	1.1.2.1 pnfs-exports.patch, NONE, 1.1.2.1 nfs-utils.spec, 1.240,
	1.240.2.1
Message-ID: <20090827191142.9E92911C00EB@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3605

Modified Files:
      Tag: nfs-utils-1_2_0-10_pnfs
	nfs-utils.spec 
Added Files:
      Tag: nfs-utils-1_2_0-10_pnfs
	nfs-utils-1.2.0-spnfsd-01.patch 
	nfs-utils-1.2.0-spnfsd-02.patch 
	nfs-utils-1.2.0-spnfsd-03.patch 
	nfs-utils-1.2.0-spnfsd-04.patch 
	nfs-utils-1.2.0-spnfsd-05.patch 
	nfs-utils-1.2.0-spnfsd-06.patch 
	nfs-utils-1.2.0-spnfsd-07.patch 
	nfs-utils-1.2.0-spnfsd-08.patch 
	nfs-utils-1.2.0-spnfsd-09.patch 
	nfs-utils-1.2.0-spnfsd-10.patch 
	nfs-utils-1.2.0-spnfsd-installrules.patch pnfs-exports.patch 
Log Message:
- Added in the pnfs export bits.
- Added in the spnfsd daemon


nfs-utils-1.2.0-spnfsd-01.patch:
 support/include/nfs/nfs.h    |    8 
 utils/Makefile.am            |    4 
 utils/spnfsd/Makefile.am     |   71 +++
 utils/spnfsd/atomicio.c      |   63 +++
 utils/spnfsd/cfg.c           |  893 +++++++++++++++++++++++++++++++++++++++++++
 utils/spnfsd/cfg.h           |   67 +++
 utils/spnfsd/makestatic      |    1 
 utils/spnfsd/nfsd4_spnfs.h   |  234 +++++++++++
 utils/spnfsd/queue.h         |  499 ++++++++++++++++++++++++
 utils/spnfsd/spnfsd.c        |  552 ++++++++++++++++++++++++++
 utils/spnfsd/spnfsd.conf     |   21 +
 utils/spnfsd/spnfsd.conf.man |    1 
 utils/spnfsd/spnfsd.h        |   47 ++
 utils/spnfsd/spnfsd.man      |    1 
 utils/spnfsd/spnfsd_ops.c    |  266 ++++++++++++
 utils/spnfsd/strlcat.c       |   77 +++
 utils/spnfsd/strlcpy.c       |   73 +++
 17 files changed, 2878 insertions(+)

--- NEW FILE nfs-utils-1.2.0-spnfsd-01.patch ---
diff -up nfs-utils-1.2.0/support/include/nfs/nfs.h.orig nfs-utils-1.2.0/support/include/nfs/nfs.h
--- nfs-utils-1.2.0/support/include/nfs/nfs.h.orig	2009-08-27 14:20:07.284736000 -0400
+++ nfs-utils-1.2.0/support/include/nfs/nfs.h	2009-08-27 14:21:30.937192000 -0400
@@ -41,6 +41,7 @@ struct nfs_fh_old {
 #define NFSCTL_GETFH		6	/* get an fh (used by mountd) */
 #define NFSCTL_GETFD		7	/* get an fh by path (used by mountd) */
 #define NFSCTL_GETFS		8	/* get an fh by path with max size (used by mountd) */
+#define NFSCTL_FD2FH		9	/* get a fh from a fd */
 
 #define NFSCTL_UDPBIT		      (1 << (17 - 1))
 #define NFSCTL_TCPBIT		      (1 << (18 - 1))
@@ -130,6 +131,11 @@ struct nfsctl_fsparm {
 	int			gd_maxlen;
 };
 
+/* FD2FH */
+struct nfsctl_fd2fh {
+	int			fd;
+};
+
 /*
  * This is the argument union.
  */
@@ -143,6 +149,7 @@ struct nfsctl_arg {
 		struct nfsctl_fhparm	u_getfh;
 		struct nfsctl_fdparm	u_getfd;
 		struct nfsctl_fsparm	u_getfs;
+		struct nfsctl_fd2fh	u_fd2fh;
 	} u;
 #define ca_svc		u.u_svc
 #define ca_client	u.u_client
@@ -151,6 +158,7 @@ struct nfsctl_arg {
 #define ca_getfh	u.u_getfh
 #define ca_getfd	u.u_getfd
 #define ca_getfs	u.u_getfs
+#define ca_fd2fh	u.u_fd2fh
 #define ca_authd	u.u_authd
 };
 
diff -up nfs-utils-1.2.0/utils/Makefile.am.orig nfs-utils-1.2.0/utils/Makefile.am
--- nfs-utils-1.2.0/utils/Makefile.am.orig	2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/utils/Makefile.am	2009-08-27 14:21:30.941191000 -0400
@@ -6,6 +6,10 @@ if CONFIG_NFSV4
 OPTDIRS += idmapd
 endif
 
+if CONFIG_NFSV4
+OPTDIRS += spnfsd
+endif
+
 if CONFIG_GSS
 OPTDIRS += gssd
 endif
diff -up /dev/null nfs-utils-1.2.0/utils/spnfsd/atomicio.c
--- /dev/null	2009-08-25 05:54:53.623006579 -0400
+++ nfs-utils-1.2.0/utils/spnfsd/atomicio.c	2009-08-27 14:21:30.944196000 -0400
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2002 Marius Aamodt Eriksen <marius at monkey.org>
+ * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
+ * 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 <sys/types.h>
+#include <unistd.h>
+#include <errno.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * ensure all of data on socket comes through. f==read || f==write
+ */
+ssize_t
+atomicio(f, fd, _s, n)
+	ssize_t (*f) ();
+	int fd;
+	void *_s;
+	size_t n;
+{
+	char *s = _s;
+	ssize_t res, pos = 0;
+
+	while (n > pos) {
+		res = (f) (fd, s + pos, n - pos);
+		switch (res) {
+		case -1:
+			if (errno == EINTR || errno == EAGAIN)
+				continue;
+		case 0:
+			if (pos != 0)
+				return (pos);
+			return (res);
+		default:
+			pos += res;
+		}
+	}
+	return (pos);
+}
diff -up /dev/null nfs-utils-1.2.0/utils/spnfsd/cfg.c
--- /dev/null	2009-08-25 05:54:53.623006579 -0400
+++ nfs-utils-1.2.0/utils/spnfsd/cfg.c	2009-08-27 14:21:30.950191000 -0400
@@ -0,0 +1,893 @@
+/*	$OpenBSD: conf.c,v 1.55 2003/06/03 14:28:16 ho Exp $	*/
+/*	$EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $	*/
+
+/*
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000, 2001, 2002 H?kan Olsson.  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.
+ */
+
+/*
+ * This code was written under funding by Ericsson Radio Systems.
+ */
+
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <err.h>
+
+#include "cfg.h"
+
+static void conf_load_defaults (int);
+#if 0
+static int conf_find_trans_xf (int, char *);
+#endif
+
+size_t  strlcpy(char *, const char *, size_t);
+
+struct conf_trans {
+  TAILQ_ENTRY (conf_trans) link;
+  int trans;
+  enum conf_op { CONF_SET, CONF_REMOVE, CONF_REMOVE_SECTION } op;
+  char *section;
+  char *tag;
+  char *value;
+  int override;
+  int is_default;
+};
+
+TAILQ_HEAD (conf_trans_head, conf_trans) conf_trans_queue;
+
+/*
+ * Radix-64 Encoding.
+ */
+const u_int8_t bin2asc[]
+  = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
[...2580 lines suppressed...]
+
+	for (ds = 0 ; ds < num_ds ; ds++) {
+		sprintf(fullpath, "%s/%s/%s", dsmountdir,
+			dataservers[ds].ds_ip, basename);
+		unlink(fullpath);
+	}
+
+	return 0;
+}
+
+int
+spnfsd_commit(struct spnfs_msg *im)
+{
+	return 0;
+}
+
+int
+spnfsd_getfh(char *path, unsigned char *fh_val, unsigned int *fh_len)
+{
+	int fd, err;
+	struct nfsctl_arg arg;
+	unsigned char res[130]; /* XXX align this to proper structure */
+	extern int nfsservctl();
+
+	if ((fd = open(path, O_RDONLY)) < 0) {
+		perror(path);
+		return -1;
+	}
+
+	arg.ca_fd2fh.fd = fd;
+	if ((err = nfsservctl(NFSCTL_FD2FH, &arg, res)) < 0) {
+		close(fd);
+		return -1;
+	}
+
+	/* XXX use proper structure */
+	*fh_len = (short)res[0];
+	memcpy(fh_val, &res[2], *fh_len);
+
+	close(fd);
+	return 0;
+}
diff -up /dev/null nfs-utils-1.2.0/utils/spnfsd/strlcat.c
--- /dev/null	2009-08-25 05:54:53.623006579 -0400
+++ nfs-utils-1.2.0/utils/spnfsd/strlcat.c	2009-08-27 14:21:30.993191000 -0400
@@ -0,0 +1,77 @@
+/*	$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(dst, src, siz)
+	char *dst;
+	const char *src;
+	size_t siz;
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
diff -up /dev/null nfs-utils-1.2.0/utils/spnfsd/strlcpy.c
--- /dev/null	2009-08-25 05:54:53.623006579 -0400
+++ nfs-utils-1.2.0/utils/spnfsd/strlcpy.c	2009-08-27 14:21:30.997191000 -0400
@@ -0,0 +1,73 @@
+/*	$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(dst, src, siz)
+	char *dst;
+	const char *src;
+	size_t siz;
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}

nfs-utils-1.2.0-spnfsd-02.patch:
 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE nfs-utils-1.2.0-spnfsd-02.patch ---
commit 6c94024a32470ab20a61268a3d81d1212cedafbc
Author: Mike Sager <sager at netapp.com>
Date:   Mon Nov 19 18:36:09 2007 -0800

    Added spnfsd to configure.ac
    
    Signed-off-by: Mike Sager <sager at netapp.com>

diff -up nfs-utils-1.2.0/configure.ac.orig nfs-utils-1.2.0/configure.ac
--- nfs-utils-1.2.0/configure.ac.orig	2009-08-27 12:02:59.335782000 -0400
+++ nfs-utils-1.2.0/configure.ac	2009-08-27 13:42:37.126103000 -0400
@@ -65,6 +65,7 @@ AC_ARG_ENABLE(nfsv4,
 	if test "$enable_nfsv4" = yes; then
 		AC_DEFINE(NFS4_SUPPORTED, 1, [Define this if you want NFSv4 support compiled in])
 		IDMAPD=idmapd
+		SPNFSD=spnfsd
 	else
 		enable_nfsv4=
 		IDMAPD=
@@ -409,6 +410,7 @@ AC_CONFIG_FILES([
 	utils/exportfs/Makefile
 	utils/gssd/Makefile
 	utils/idmapd/Makefile
+	utils/spnfsd/Makefile
 	utils/mount/Makefile
 	utils/mountd/Makefile
 	utils/nfsd/Makefile

nfs-utils-1.2.0-spnfsd-03.patch:
 spnfsd_ops.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE nfs-utils-1.2.0-spnfsd-03.patch ---
commit 76d0c6f17a2e1e1c8efa84d67619c34d8884af51
Author: Dan Muntz <dmuntz at netapp.com>
Date:   Mon Nov 26 13:40:19 2007 -0800

    Add explicit chmod 777 of stripe files as workaround for non-root users.
    
    Signed-off-by: Dan Muntz <dmuntz at netapp.com>
    Signed-off-by: Mike Sager <sager at netapp.com>

diff --git a/utils/spnfsd/spnfsd_ops.c b/utils/spnfsd/spnfsd_ops.c
index cec4840..bd5486d 100644
--- a/utils/spnfsd/spnfsd_ops.c
+++ b/utils/spnfsd/spnfsd_ops.c
@@ -189,6 +189,10 @@ spnfsd_open(struct spnfs_msg *im)
 			im->im_res.open_res.status = errno;
 			break;
 		} else {
+			if (fchmod(fd, 0777) != 0) {
+				/* DM: we'll consider this non-fatal for now */
+				perror("chmod stripe");
+			}
 			im->im_res.open_res.status = 0;
 			close(fd);
 		}

nfs-utils-1.2.0-spnfsd-04.patch:
 makestatic    |   22 ++++++++++++++++++++++
 nfsd4_spnfs.h |   22 +++++++++++++++++++++-
 spnfsd.c      |   14 +++++++-------
 spnfsd.h      |   21 +++++++++++++++++++++
 spnfsd_ops.c  |   22 ++++++++++++++++++++++
 5 files changed, 93 insertions(+), 8 deletions(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-04.patch ---
commit d2e73153b64ab7a11442810bf42b8e72f1601ccf
Author: Dan Muntz <dmuntz at netapp.com>
Date:   Wed Dec 12 13:18:07 2007 -0800

    add licensing comments and remove some printfs from spnfsd.c
    
    Signed-off-by: Dan Muntz <dmuntz at netapp.com>
    Signed-off-by: Mike Sager <sager at netapp.com>

diff --git a/utils/spnfsd/makestatic b/utils/spnfsd/makestatic
index 4b7067f..5eec53c 100755
--- a/utils/spnfsd/makestatic
+++ b/utils/spnfsd/makestatic
@@ -1 +1,23 @@
+/******************************************************************************
+
+(c) 2007 Network Appliance, Inc.  All Rights Reserved.
+
+Network Appliance provides this source code under the GPL v2 License.
+The GPL v2 license is available at
+http://opensource.org/licenses/gpl-license.php.
+
+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.
+
+******************************************************************************/
+
 gcc -static -Wall -pipe -g -O2 -o spnfsd atomicio.o spnfsd_ops.o cfg.o spnfsd.o strlcat.o strlcpy.o  /usr/lib/libevent.a ../../support/nfs/libnfs.a
diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index 634544f..99edae3 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -4,7 +4,27 @@
  * spNFS - simple pNFS implementation with userspace daemon
  *
  */
-
+/******************************************************************************
+
+(c) 2007 Network Appliance, Inc.  All Rights Reserved.
+
+Network Appliance provides this source code under the GPL v2 License.
+The GPL v2 license is available at
+http://opensource.org/licenses/gpl-license.php.
+
+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.
+
+******************************************************************************/
 
 #ifndef NFS_SPNFS_H
 #define NFS_SPNFS_H
diff --git a/utils/spnfsd/spnfsd.c b/utils/spnfsd/spnfsd.c
index 90e66ba..276b0c3 100644
--- a/utils/spnfsd/spnfsd.c
+++ b/utils/spnfsd/spnfsd.c
@@ -1,7 +1,13 @@
 /*
  *  spnfsd.c
- *
  *  Userland daemon for spNFS.
+ *  Based heavily on idmapd.c
+ *
+ */
+/*
+ *  idmapd.c
+ *
+ *  Userland daemon for idmap.
  *
  *  Copyright (c) 2002 The Regents of the University of Michigan.
  *  All rights reserved.
@@ -369,17 +375,11 @@ spnfscb(int fd, short which, void *data)
 	if (im.im_status == SPNFS_STATUS_FAIL)
 		im.im_status = SPNFS_STATUS_SUCCESS;
 
-printf("before atomicio write\n");
-printf("writing %d bytes\n", sizeof(im));
 	if ((rval=atomicio(write, scp->sc_fd, &im, sizeof(im))) != sizeof(im)) {
-printf("spnfscb: incomplete write %d of %d bytes\n", rval, sizeof(im));
-printf("atomicio write error\n");
 		spnfsd_warn("spnfscb: write(%s)", scp->sc_path);
 	}
 
-printf("after atomicio write\n");
 out:
-printf("spnfscb out\n");
 	event_add(&scp->sc_event, NULL);
 }
 
diff --git a/utils/spnfsd/spnfsd.h b/utils/spnfsd/spnfsd.h
index dcea3e6..9df6cd8 100644
--- a/utils/spnfsd/spnfsd.h
+++ b/utils/spnfsd/spnfsd.h
@@ -4,6 +4,27 @@
  * spNFS - simple pNFS implementation with userspace daemon
  *
  */
+/******************************************************************************
+
+(c) 2007 Network Appliance, Inc.  All Rights Reserved.
+
+Network Appliance provides this source code under the GPL v2 License.
+The GPL v2 license is available at
+http://opensource.org/licenses/gpl-license.php.
+
+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.
+
+******************************************************************************/
 
 #ifndef _PATH_SPNFSDCONF
 #define _PATH_SPNFSDCONF "/etc/spnfsd.conf"
diff --git a/utils/spnfsd/spnfsd_ops.c b/utils/spnfsd/spnfsd_ops.c
index bd5486d..56bd185 100644
--- a/utils/spnfsd/spnfsd_ops.c
+++ b/utils/spnfsd/spnfsd_ops.c
@@ -1,3 +1,25 @@
+/******************************************************************************
+
+(c) 2007 Network Appliance, Inc.  All Rights Reserved.
+
+Network Appliance provides this source code under the GPL v2 License.
+The GPL v2 license is available at
+http://opensource.org/licenses/gpl-license.php.
+
+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.
+
+******************************************************************************/
+
 #include "nfsd4_spnfs.h"
 #include "spnfsd.h"
 #include "nfs/nfs.h"

nfs-utils-1.2.0-spnfsd-05.patch:
 nfsd4_spnfs.h |   88 ++++++++++++++++++++++++++++++++++++++--------------------
 spnfsd.c      |   19 ++++++------
 spnfsd.conf   |    4 +-
 spnfsd.h      |    4 +-
 spnfsd_ops.c  |   73 +++++++++++++++++++++++++-----------------------
 5 files changed, 111 insertions(+), 77 deletions(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-05.patch ---
commit f5beeb9bad08970329dd47371e829e31da79e5f3
Author: Mike Sager <sager at netapp.com>
Date:   Sun Jan 27 17:11:07 2008 -0800

    Update device ops to reflect latest draft and interface changes
    
    1. Change spnfs getdevlist handling into iterative interface to reflect
       export ops changes
    
    2. Update device ops per draft 13
    
    3. Fix code that was written when a data server was thought to be a device
    
    Signed-off-by: Mike Sager <sager at netapp.com>

diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index 99edae3..7619c75 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -4,6 +4,7 @@
  * spNFS - simple pNFS implementation with userspace daemon
  *
  */
+
 /******************************************************************************
 
 (c) 2007 Network Appliance, Inc.  All Rights Reserved.
@@ -31,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #ifdef __KERNEL__
+#include "exportfs.h"
 #include "sunrpc/svc.h"
 #include "nfsd/nfsfh.h"
 #else
@@ -45,17 +47,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define SPNFS_TYPE_LAYOUTGET		0x01
 #define SPNFS_TYPE_LAYOUTCOMMIT		0x02
 #define SPNFS_TYPE_LAYOUTRETURN		0x03
-#define SPNFS_TYPE_GETDEVICELIST	0x04
+#define SPNFS_TYPE_GETDEVICEITER	0x04
 #define SPNFS_TYPE_GETDEVICEINFO	0x05
 #define SPNFS_TYPE_SETATTR		0x06
 #define SPNFS_TYPE_OPEN			0x07
 #define	SPNFS_TYPE_CLOSE		0x08
 #define SPNFS_TYPE_CREATE		0x09
 #define SPNFS_TYPE_REMOVE		0x0a
-#define	SPNFS_TYPE_COMMIT		0x0b
+#define SPNFS_TYPE_COMMIT		0x0b
 
-#define SPNFS_MAX_DATA_SERVERS		2
-#define SPNFS_MAX_LAYOUT		8
+#define	SPNFS_MAX_DEVICES		1
+#define	SPNFS_MAX_DATA_SERVERS		2
+#define	SPNFS_MAX_LAYOUT		8
 
 /* layout */
 struct spnfs_msg_layoutget_args {
@@ -64,9 +67,9 @@ struct spnfs_msg_layoutget_args {
 
 struct spnfs_filelayout_list {
 	u_int32_t	dev_id;
-	u_int32_t	dev_index;
-	u_int32_t	fh_len;
-	unsigned char	fh_val[128]; /* DMXXX fix this const */
+	u_int32_t       ds_index;
+	u_int32_t       fh_len;
+	unsigned char   fh_val[128]; /* DMXXX fix this const */
 };
 
 struct spnfs_msg_layoutget_res {
@@ -97,31 +100,41 @@ struct spnfs_msg_layoutreturn_res {
 };
 */
 
-/* getdevicelist */
-struct spnfs_msg_getdevicelist_args {
+/* getdeviceiter */
+struct spnfs_msg_getdeviceiter_args {
 	unsigned long inode;
+	u_int64_t cookie;
+	u_int64_t verf;
 };
 
-struct spnfs_getdevicelist_dev {
+struct spnfs_msg_getdeviceiter_res {
+	int status;
 	u_int32_t devid;
+	u_int64_t cookie;
+	u_int64_t verf;
+	u_int32_t eof;
+};
+
+/* getdeviceinfo */
+struct spnfs_data_server {
+	u_int32_t dsid;
 	char netid[5];
 	char addr[29];
 };
 
-struct spnfs_msg_getdevicelist_res {
-	int status;
-	int count;
-	struct spnfs_getdevicelist_dev dlist[SPNFS_MAX_DATA_SERVERS];
+struct spnfs_device {
+	u_int32_t devid;
+	int dscount;
+	struct spnfs_data_server dslist[SPNFS_MAX_DATA_SERVERS];
 };
 
-/* getdeviceinfo */
 struct spnfs_msg_getdeviceinfo_args {
 	u_int32_t devid;
 };
 
 struct spnfs_msg_getdeviceinfo_res {
 	int status;
-	struct spnfs_getdevicelist_dev dinfo;
+	struct spnfs_device devinfo;
 };
 
 /* setattr */
@@ -191,29 +204,41 @@ struct spnfs_msg_commit_res {
 union spnfs_msg_args {
 	struct spnfs_msg_layoutget_args		layoutget_args;
 	struct spnfs_msg_layoutcommit_args	layoutcommit_args;
-//	struct spnfs_msg_layoutreturn_args	layoutreturn_args;
-	struct spnfs_msg_getdevicelist_args	getdevicelist_args;
-	struct spnfs_msg_getdeviceinfo_args	getdeviceinfo_args;
+/*
+	struct spnfs_msg_layoutreturn_args	layoutreturn_args;
+*/
+	struct spnfs_msg_getdeviceiter_args     getdeviceiter_args;
+	struct spnfs_msg_getdeviceinfo_args     getdeviceinfo_args;
 	struct spnfs_msg_setattr_args		setattr_args;
 	struct spnfs_msg_open_args		open_args;
 	struct spnfs_msg_close_args		close_args;
-//	struct spnfs_msg_create_args		create_args;
+/*
+	struct spnfs_msg_create_args		create_args;
+*/
 	struct spnfs_msg_remove_args		remove_args;
-//	struct spnfs_msg_commit_args		commit_args;
+/*
+	struct spnfs_msg_commit_args		commit_args;
+*/
 };
 
 union spnfs_msg_res {
 	struct spnfs_msg_layoutget_res		layoutget_res;
 	struct spnfs_msg_layoutcommit_res	layoutcommit_res;
-//	struct spnfs_msg_layoutreturn_res	layoutreturn_res;
-	struct spnfs_msg_getdevicelist_res	getdevicelist_res;
-	struct spnfs_msg_getdeviceinfo_res	getdeviceinfo_res;
+/*
+	struct spnfs_msg_layoutreturn_res	layoutreturn_res;
+*/
+	struct spnfs_msg_getdeviceiter_res      getdeviceiter_res;
+	struct spnfs_msg_getdeviceinfo_res      getdeviceinfo_res;
 	struct spnfs_msg_setattr_res		setattr_res;
 	struct spnfs_msg_open_res		open_res;
 	struct spnfs_msg_close_res		close_res;
-//	struct spnfs_msg_create_res		create_res;
+/*
+	struct spnfs_msg_create_res		create_res;
+*/
 	struct spnfs_msg_remove_res		remove_res;
-//	struct spnfs_msg_commit_res		commit_res;
+/*
+	struct spnfs_msg_commit_res		commit_res;
+*/
 };
 
 /* a spnfs message, args and response */
@@ -238,16 +263,19 @@ struct spnfs {
 
 int spnfs_layout_type(void);
 int spnfs_layoutget(struct inode *, void *);
-int spnfs_layoutcomit(void);
-int spnfs_layoutreturn(void);
-int spnfs_getdevicelist(struct super_block *, void *);
-int spnfs_getdeviceinfo(void);
+int spnfs_layoutcommit(void);
+int spnfs_layoutreturn(struct inode *, void *);
+int spnfs_getdeviceiter(struct super_block *, struct pnfs_deviter_arg *);
+int spnfs_getdeviceinfo(struct super_block *, struct pnfs_devinfo_arg *);
 int spnfs_setattr(void);
 int spnfs_open(struct inode *, void *);
+int spnfs_get_state(struct inode *, void *, void *);
+int spnfs_remove(unsigned long ino);
 
 int nfsd_spnfs_new(void);
 void nfsd_spnfs_delete(void);
 int spnfs_upcall(struct spnfs *, struct spnfs_msg *, union spnfs_msg_res *);
+int spnfs_enabled(void);
 
 #endif /* __KERNEL__ */
 
diff --git a/utils/spnfsd/spnfsd.c b/utils/spnfsd/spnfsd.c
index 276b0c3..f7bae84 100644
--- a/utils/spnfsd/spnfsd.c
+++ b/utils/spnfsd/spnfsd.c
@@ -114,6 +114,7 @@ static void dump_config();
 int verbose = 0;
 int stripesize = DEFAULT_STRIPE_SIZE;
 int densestriping = 0;
+int num_dev = 1;  /* XXX no multiple device support yet */
 int num_ds;
 struct dserver dataservers[SPNFS_MAX_DATA_SERVERS];
 char dsmountdir[PATH_MAX];
@@ -315,8 +316,8 @@ spnfs_msg_handler(struct spnfs_client *scp, struct spnfs_msg *im)
 	case SPNFS_TYPE_LAYOUTRETURN:
 		err = spnfsd_layoutreturn(im);
 		break;
-	case SPNFS_TYPE_GETDEVICELIST:
-		err = spnfsd_getdevicelist(im);
+	case SPNFS_TYPE_GETDEVICEITER:
+		err = spnfsd_getdeviceiter(im);
 		break;
 	case SPNFS_TYPE_GETDEVICEINFO:
 		err = spnfsd_getdeviceinfo(im);
@@ -459,7 +460,7 @@ read_config()
 	char *xpipefsdir = NULL;
 	char *xdsmountdir = NULL;
 	int ds;
-	char ipstr[20], portstr[20], rootstr[20], devidstr[20];
+	char ipstr[20], portstr[20], rootstr[20], dsidstr[20];
 
 	verbose = conf_get_num("General", "Verbosity", 0);
 	stripesize = conf_get_num("General", "Stripe-size",DEFAULT_STRIPE_SIZE);
@@ -478,7 +479,7 @@ read_config()
 		sprintf(ipstr, "DS%d_IP", ds);
 		sprintf(portstr, "DS%d_PORT", ds);
 		sprintf(rootstr, "DS%d_ROOT", ds);
-		sprintf(devidstr, "DS%d_DEVID", ds);
+		sprintf(dsidstr, "DS%d_ID", ds);
 		CONF_SAVE(dataservers[ds-1].ds_ip,
 			conf_get_str("DataServers", ipstr));
 		if (dataservers[ds-1].ds_ip == NULL)
@@ -489,10 +490,10 @@ read_config()
 			conf_get_str("DataServers", rootstr));
 		if (dataservers[ds-1].ds_ip == NULL)
 			spnfsd_err(1, "Missing IP for DS%d\n", ds);
-		dataservers[ds-1].ds_devid =
-			conf_get_num("DataServers", devidstr, -1);
-		if (dataservers[ds-1].ds_devid < 0)
-			spnfsd_err(1, "Missing or invalid DEVID for DS%d\n", ds);
+		dataservers[ds-1].ds_id =
+			conf_get_num("DataServers", dsidstr, -1);
+		if (dataservers[ds-1].ds_id < 0)
+			spnfsd_err(1, "Missing or invalid ID for DS%d\n", ds);
 	}
 
 	return 0;
@@ -512,7 +513,7 @@ dump_config()
 		printf("DS%d IP: %s\n", ds+1, dataservers[ds].ds_ip);
 		printf("DS%d PORT: %d\n", ds+1, dataservers[ds].ds_port);
 		printf("DS%d ROOT: %s\n", ds+1, dataservers[ds].ds_path);
-		printf("DS%d DEVID: %d\n", ds+1, dataservers[ds].ds_devid);
+		printf("DS%d DSID: %d\n", ds+1, dataservers[ds].ds_id);
 	}
 }
 
diff --git a/utils/spnfsd/spnfsd.conf b/utils/spnfsd/spnfsd.conf
index 0839c11..57621fc 100644
--- a/utils/spnfsd/spnfsd.conf
+++ b/utils/spnfsd/spnfsd.conf
@@ -13,9 +13,9 @@ NumDS = 2
 DS1_IP = 172.16.28.134
 DS1_PORT = 2049
 DS1_ROOT = /pnfs
-DS1_DEVID = 1
+DS1_ID = 1
 
 DS2_IP = 172.16.28.141
 DS2_PORT = 2049
 DS2_ROOT = /pnfs
-DS2_DEVID = 2
+DS2_ID = 2
diff --git a/utils/spnfsd/spnfsd.h b/utils/spnfsd/spnfsd.h
index 9df6cd8..05029e9 100644
--- a/utils/spnfsd/spnfsd.h
+++ b/utils/spnfsd/spnfsd.h
@@ -42,7 +42,7 @@ struct dserver {
         char    *ds_ip;
         int     ds_port;
         char    *ds_path;
-	int	ds_devid;
+	int	ds_id;
 };
 
 /* DMXXX future struct for whole config */
@@ -57,7 +57,7 @@ struct spnfsd_config {
 int spnfsd_layoutget(struct spnfs_msg *);
 int spnfsd_layoutcommit(struct spnfs_msg *);
 int spnfsd_layoutreturn(struct spnfs_msg *);
-int spnfsd_getdevicelist(struct spnfs_msg *);
+int spnfsd_getdeviceiter(struct spnfs_msg *);
 int spnfsd_getdeviceinfo(struct spnfs_msg *);
 int spnfsd_setattr(struct spnfs_msg *);
 int spnfsd_open(struct spnfs_msg *);
diff --git a/utils/spnfsd/spnfsd_ops.c b/utils/spnfsd/spnfsd_ops.c
index 56bd185..81ad102 100644
--- a/utils/spnfsd/spnfsd_ops.c
+++ b/utils/spnfsd/spnfsd_ops.c
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern int stripesize;
 extern int densestriping;
 extern int num_ds;
+extern int num_dev;
 extern char dsmountdir[];
 extern struct dserver dataservers[SPNFS_MAX_DATA_SERVERS];
 size_t  strlcat(char *, const char *, size_t);
@@ -58,9 +59,8 @@ spnfsd_layoutget(struct spnfs_msg *im)
 	im->im_res.layoutget_res.layout_count = num_ds;
 
 	for (ds = 0 ; ds < num_ds ; ds++) {
-		im->im_res.layoutget_res.flist[ds].dev_id =
-			dataservers[ds].ds_devid;
-		im->im_res.layoutget_res.flist[ds].dev_index = ds;
+		im->im_res.layoutget_res.flist[ds].dev_id = 1; /* XXX */
+		im->im_res.layoutget_res.flist[ds].ds_index = ds;
 		memset(im->im_res.layoutget_res.flist[ds].fh_val, 0, 128); /*DMXXX*/
 		sprintf(fullpath, "%s/%s/%ld",
 			dsmountdir, dataservers[ds].ds_ip,
@@ -112,22 +112,20 @@ spnfsd_layoutreturn(struct spnfs_msg *im)
 }
 
 int
-spnfsd_getdevicelist(struct spnfs_msg *im)
+spnfsd_getdeviceiter(struct spnfs_msg *im)
 {
-	int ds;
-
 	im->im_status = SPNFS_STATUS_SUCCESS;
-	im->im_res.getdevicelist_res.status = 0;
-	im->im_res.getdevicelist_res.count = num_ds;
-	for (ds = 0 ; ds < num_ds ; ds++) {
-		im->im_res.getdevicelist_res.dlist[ds].devid =
-			dataservers[ds].ds_devid;
-		memset(im->im_res.getdevicelist_res.dlist[ds].netid, 0, 5);
-		strlcpy(im->im_res.getdevicelist_res.dlist[ds].netid, "tcp", 4);
-		sprintf(im->im_res.getdevicelist_res.dlist[ds].addr, "%s.%d.%d",
-			dataservers[ds].ds_ip,
-			dataservers[ds].ds_port >> 8,
-			dataservers[ds].ds_port & 0xff);
+	im->im_res.getdeviceiter_res.status = 0;
+
+	/* verifier ignored for now */
+	if (im->im_args.getdeviceiter_args.cookie >= num_dev)
+		im->im_res.getdeviceiter_res.eof = 1;
+	else {
+		/* XXX just hardcoded for now...fix this */
+		im->im_res.getdeviceiter_res.devid = 1;
+		im->im_res.getdeviceiter_res.cookie = im->im_args.getdeviceiter_args.cookie + 1;
+		im->im_res.getdeviceiter_res.verf = 0;
+		im->im_res.getdeviceiter_res.eof = 0;
 	}
 
 	return 0;
@@ -136,27 +134,34 @@ spnfsd_getdevicelist(struct spnfs_msg *im)
 int
 spnfsd_getdeviceinfo(struct spnfs_msg *im)
 {
+	struct spnfs_device *devp;
+	struct spnfs_data_server *dsp;
+	u_int32_t devid;
 	int ds;
 
 	im->im_status = SPNFS_STATUS_SUCCESS;
-	im->im_res.getdeviceinfo_res.status = ENODEV;
+	im->im_res.getdeviceinfo_res.status = 0;
+
+	devid = im->im_args.getdeviceinfo_args.devid;
+
+	/* XXX fix this if/when we support multiple devices */
+	if (devid != 1) {
+		im->im_res.getdeviceinfo_res.status = ENODEV;
+		return -1;
+	}
+
+	devp = &im->im_res.getdeviceinfo_res.devinfo;
+	devp->dscount = num_ds;
+
 	for (ds = 0 ; ds < num_ds ; ds++) {
-		if (dataservers[ds].ds_devid ==
-		    im->im_args.getdeviceinfo_args.devid) {
-			im->im_res.getdeviceinfo_res.dinfo.devid =
-				dataservers[ds].ds_devid;
-			memset(im->im_res.getdeviceinfo_res.dinfo.netid,
-				0, 5);
-			strlcpy(im->im_res.getdeviceinfo_res.dinfo.netid,
-				"tcp", 4);
-			sprintf(im->im_res.getdeviceinfo_res.dinfo.addr,
-				"%s.%d.%d",
-				dataservers[ds].ds_ip,
-				dataservers[ds].ds_port >> 8,
-				dataservers[ds].ds_port & 0xff);
-			im->im_res.getdeviceinfo_res.status = 0;
-			break;
-		}
+		dsp = &devp->dslist[ds];
+		dsp->dsid = dataservers[ds].ds_id;
+		memset(dsp->netid, 0, 5);
+		strlcpy(dsp->netid, "tcp", 4);
+		sprintf(dsp->addr, "%s.%d.%d",
+			dataservers[ds].ds_ip,
+			dataservers[ds].ds_port >> 8,
+			dataservers[ds].ds_port & 0xff);
 	}
 
 	return 0;

nfs-utils-1.2.0-spnfsd-06.patch:
 nfsd4_spnfs.h |   10 ++++------
 spnfsd_ops.c  |   13 ++++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-06.patch ---
commit 4c0c700c85cdd097af5d9be2e452d4027e430d0f
Author: Mike Sager <sager at netapp.com>
Date:   Thu Feb 7 20:19:03 2008 -0800

    Update layoutget per draft 13
    
    Also, change spnfs layoutget handling to reflect generic pnfs interface
    changes
    
    Signed-off-by: Mike Sager <sager at netapp.com>

diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index 7619c75..4b3ce7f 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -58,7 +58,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define	SPNFS_MAX_DEVICES		1
 #define	SPNFS_MAX_DATA_SERVERS		2
-#define	SPNFS_MAX_LAYOUT		8
 
 /* layout */
 struct spnfs_msg_layoutget_args {
@@ -66,18 +65,17 @@ struct spnfs_msg_layoutget_args {
 };
 
 struct spnfs_filelayout_list {
-	u_int32_t	dev_id;
-	u_int32_t       ds_index;
 	u_int32_t       fh_len;
 	unsigned char   fh_val[128]; /* DMXXX fix this const */
 };
 
 struct spnfs_msg_layoutget_res {
 	int status;
+	u_int32_t dev_id;
 	u_int64_t stripe_size;
 	u_int32_t stripe_type;
-	u_int32_t layout_count;
-	struct spnfs_filelayout_list flist[SPNFS_MAX_LAYOUT];
+	u_int32_t stripe_count;
+	struct spnfs_filelayout_list flist[SPNFS_MAX_DATA_SERVERS];
 };
 
 /* layoutcommit */
@@ -262,7 +260,7 @@ struct spnfs {
 };
 
 int spnfs_layout_type(void);
-int spnfs_layoutget(struct inode *, void *);
+int spnfs_layoutget(struct inode *, struct pnfs_layoutget_arg *);
 int spnfs_layoutcommit(void);
 int spnfs_layoutreturn(struct inode *, void *);
 int spnfs_getdeviceiter(struct super_block *, struct pnfs_deviter_arg *);
diff --git a/utils/spnfsd/spnfsd_ops.c b/utils/spnfsd/spnfsd_ops.c
index 81ad102..645c9eb 100644
--- a/utils/spnfsd/spnfsd_ops.c
+++ b/utils/spnfsd/spnfsd_ops.c
@@ -51,16 +51,15 @@ spnfsd_layoutget(struct spnfs_msg *im)
 
 	im->im_status = SPNFS_STATUS_SUCCESS;
 	im->im_res.layoutget_res.status = 0;
+	im->im_res.layoutget_res.dev_id = 1; /* XXX */
 	im->im_res.layoutget_res.stripe_size = stripesize;
 	if (densestriping)
-		im->im_res.layoutget_res.stripe_type = 2; /* DMXXX enum */
+		im->im_res.layoutget_res.stripe_type = 1; /* DMXXX enum */
 	else
-		im->im_res.layoutget_res.stripe_type = 1; /* DMXXX ^^^^ */
-	im->im_res.layoutget_res.layout_count = num_ds;
+		im->im_res.layoutget_res.stripe_type = 0; /* DMXXX ^^^^ */
+	im->im_res.layoutget_res.stripe_count = num_ds;
 
 	for (ds = 0 ; ds < num_ds ; ds++) {
-		im->im_res.layoutget_res.flist[ds].dev_id = 1; /* XXX */
-		im->im_res.layoutget_res.flist[ds].ds_index = ds;
 		memset(im->im_res.layoutget_res.flist[ds].fh_val, 0, 128); /*DMXXX*/
 		sprintf(fullpath, "%s/%s/%ld",
 			dsmountdir, dataservers[ds].ds_ip,
@@ -76,10 +75,10 @@ spnfsd_layoutget(struct spnfs_msg *im)
 
 		/*
 		 * MSXXX another hack...fix the hardcoding.
-		 * The fh's fsid_type is incremented by 5 to get
+		 * The fh's fsid_type is incremented by 8 to get
 		 * around stateid checking.
 		 */
-		im->im_res.layoutget_res.flist[ds].fh_val[2] += 5;
+		im->im_res.layoutget_res.flist[ds].fh_val[2] += 8;
 	}
 
 	return 0;

nfs-utils-1.2.0-spnfsd-07.patch:
 nfsd4_spnfs.h |    8 ++++----
 spnfsd.h      |    6 +++---
 spnfsd_ops.c  |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-07.patch ---
commit 6880a92de04cf0d4d606d27d1da60aeff11f8df4
Author: Mike Sager <sager at netapp.com>
Date:   Fri Feb 15 03:02:07 2008 -0800

    Update to draft 19.
    
    Even though a device id is now 128 bits, the userspace portion is only
    concerned with the rightmost 64 bits for now.  The leftmost 64 bits
    appear to be destined to become an fsid.  The generic pnfs layer is
    hardcoding this to 0 for the moment.  Wait and see how this plays out
    before deciding if anything needs to be done in userspace.
    
    Signed-off-by: Mike Sager <sager at netapp.com>

diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index 4b3ce7f..6516ab3 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -71,7 +71,7 @@ struct spnfs_filelayout_list {
 
 struct spnfs_msg_layoutget_res {
 	int status;
-	u_int32_t dev_id;
+	u_int64_t devid;
 	u_int64_t stripe_size;
 	u_int32_t stripe_type;
 	u_int32_t stripe_count;
@@ -107,7 +107,7 @@ struct spnfs_msg_getdeviceiter_args {
 
 struct spnfs_msg_getdeviceiter_res {
 	int status;
-	u_int32_t devid;
+	u_int64_t devid;
 	u_int64_t cookie;
 	u_int64_t verf;
 	u_int32_t eof;
@@ -121,13 +121,13 @@ struct spnfs_data_server {
 };
 
 struct spnfs_device {
-	u_int32_t devid;
+	u_int64_t devid;
 	int dscount;
 	struct spnfs_data_server dslist[SPNFS_MAX_DATA_SERVERS];
 };
 
 struct spnfs_msg_getdeviceinfo_args {
-	u_int32_t devid;
+	u_int64_t devid;
 };
 
 struct spnfs_msg_getdeviceinfo_res {
diff --git a/utils/spnfsd/spnfsd.h b/utils/spnfsd/spnfsd.h
index 05029e9..e8527e7 100644
--- a/utils/spnfsd/spnfsd.h
+++ b/utils/spnfsd/spnfsd.h
@@ -39,9 +39,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 struct dserver {
-        char    *ds_ip;
-        int     ds_port;
-        char    *ds_path;
+        char	*ds_ip;
+        int	ds_port;
+        char	*ds_path;
 	int	ds_id;
 };
 
diff --git a/utils/spnfsd/spnfsd_ops.c b/utils/spnfsd/spnfsd_ops.c
index 645c9eb..e3adadd 100644
--- a/utils/spnfsd/spnfsd_ops.c
+++ b/utils/spnfsd/spnfsd_ops.c
@@ -51,7 +51,7 @@ spnfsd_layoutget(struct spnfs_msg *im)
 
 	im->im_status = SPNFS_STATUS_SUCCESS;
 	im->im_res.layoutget_res.status = 0;
-	im->im_res.layoutget_res.dev_id = 1; /* XXX */
+	im->im_res.layoutget_res.devid = 1; /* XXX */
 	im->im_res.layoutget_res.stripe_size = stripesize;
 	if (densestriping)
 		im->im_res.layoutget_res.stripe_type = 1; /* DMXXX enum */
@@ -145,7 +145,7 @@ spnfsd_getdeviceinfo(struct spnfs_msg *im)
 
 	/* XXX fix this if/when we support multiple devices */
 	if (devid != 1) {
-		im->im_res.getdeviceinfo_res.status = ENODEV;
+		im->im_res.getdeviceinfo_res.status = -ENOENT;
 		return -1;
 	}
 

nfs-utils-1.2.0-spnfsd-08.patch:
 nfsd4_spnfs.h |   35 +++++++++++++++-
 spnfsd.c      |    8 +++
 spnfsd.h      |    2 
 spnfsd_ops.c  |  126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 170 insertions(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-08.patch ---
commit dfa1f714caaed32ebe64ae9c4f8678e6c56bce5d
Author: Dan Muntz <dmuntz at netapp.com>
Date:   Tue May 6 16:45:09 2008 -0700

    Add read/write-through-MDS for spNFS
    
    Signed-off-by: Dan Muntz <dmuntz at netapp.com>

diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index 6516ab3..fc6bd9a 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -55,9 +55,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define SPNFS_TYPE_CREATE		0x09
 #define SPNFS_TYPE_REMOVE		0x0a
 #define SPNFS_TYPE_COMMIT		0x0b
+#define SPNFS_TYPE_READ			0x0c
+#define SPNFS_TYPE_WRITE		0x0d
 
 #define	SPNFS_MAX_DEVICES		1
 #define	SPNFS_MAX_DATA_SERVERS		2
+#define SPNFS_MAX_IO			2048
 
 /* layout */
 struct spnfs_msg_layoutget_args {
@@ -198,6 +201,30 @@ struct spnfs_msg_commit_res {
 };
 */
 
+/* read */
+struct spnfs_msg_read_args {
+	unsigned long inode;
+	loff_t offset;
+	unsigned long len;
+};
+
+struct spnfs_msg_read_res {
+	int status;
+	char data[SPNFS_MAX_IO];
+};
+
+/* write */
+struct spnfs_msg_write_args {
+	unsigned long inode;
+	loff_t offset;
+	unsigned long len;
+	char data[SPNFS_MAX_IO];
+};
+
+struct spnfs_msg_write_res {
+	int status;
+};
+
 /* bundle args and responses */
 union spnfs_msg_args {
 	struct spnfs_msg_layoutget_args		layoutget_args;
@@ -217,6 +244,8 @@ union spnfs_msg_args {
 /*
 	struct spnfs_msg_commit_args		commit_args;
 */
+	struct spnfs_msg_read_args		read_args;
+	struct spnfs_msg_write_args		write_args;
 };
 
 union spnfs_msg_res {
@@ -237,6 +266,8 @@ union spnfs_msg_res {
 /*
 	struct spnfs_msg_commit_res		commit_res;
 */
+	struct spnfs_msg_read_res		read_res;
+	struct spnfs_msg_write_res		write_res;
 };
 
 /* a spnfs message, args and response */
@@ -268,7 +299,9 @@ int spnfs_getdeviceinfo(struct super_block *, struct pnfs_devinfo_arg *);
 int spnfs_setattr(void);
 int spnfs_open(struct inode *, void *);
 int spnfs_get_state(struct inode *, void *, void *);
-int spnfs_remove(unsigned long ino);
+int spnfs_remove(unsigned long);
+int spnfs_read(unsigned long, loff_t, unsigned long *, int, struct svc_rqst *);
+int spnfs_write(unsigned long, loff_t, size_t, int, struct svc_rqst *);
 
 int nfsd_spnfs_new(void);
 void nfsd_spnfs_delete(void);
diff --git a/utils/spnfsd/spnfsd.c b/utils/spnfsd/spnfsd.c
index f7bae84..fc9113d 100644
--- a/utils/spnfsd/spnfsd.c
+++ b/utils/spnfsd/spnfsd.c
@@ -40,6 +40,8 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/poll.h>
@@ -340,6 +342,12 @@ spnfs_msg_handler(struct spnfs_client *scp, struct spnfs_msg *im)
 	case SPNFS_TYPE_COMMIT:
 		err = spnfsd_commit(im);
 		break;
+	case SPNFS_TYPE_READ:
+		err = spnfsd_read(im);
+		break;
+	case SPNFS_TYPE_WRITE:
+		err = spnfsd_write(im);
+		break;
 	default:
 		spnfsd_warnx("spnfs_msg_handler: Invalid msg type (%d) in message",
 			     im->im_type);
diff --git a/utils/spnfsd/spnfsd.h b/utils/spnfsd/spnfsd.h
index e8527e7..e05c272 100644
--- a/utils/spnfsd/spnfsd.h
+++ b/utils/spnfsd/spnfsd.h
@@ -65,4 +65,6 @@ int spnfsd_close(struct spnfs_msg *);
 int spnfsd_create(struct spnfs_msg *);
 int spnfsd_remove(struct spnfs_msg *);
 int spnfsd_commit(struct spnfs_msg *);
+int spnfsd_read(struct spnfs_msg *);
+int spnfsd_write(struct spnfs_msg *);
 int spnfsd_getfh(char *, unsigned char *, unsigned int *);
diff --git a/utils/spnfsd/spnfsd_ops.c b/utils/spnfsd/spnfsd_ops.c
index e3adadd..5099c00 100644
--- a/utils/spnfsd/spnfsd_ops.c
+++ b/utils/spnfsd/spnfsd_ops.c
@@ -20,6 +20,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
 
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
 #include "nfsd4_spnfs.h"
 #include "spnfsd.h"
 #include "nfs/nfs.h"
@@ -265,6 +267,130 @@ spnfsd_remove(struct spnfs_msg *im)
 int
 spnfsd_commit(struct spnfs_msg *im)
 {
+	im->im_status = SPNFS_STATUS_SUCCESS;
+	return 0;
+}
+
+int
+min (unsigned int x, unsigned int y)
+{
+	if (x<y) return x; else return y;
+}
+
+/* DMXXX: for read and write, there's an issue with partially completed i/o */
+int
+spnfsd_read(struct spnfs_msg *im)
+{
+	unsigned long inode = im->im_args.read_args.inode;
+	loff_t offset = im->im_args.read_args.offset;
+	unsigned long len = im->im_args.read_args.len;
+	int ds, iolen;
+	loff_t soffset;
+	int bufoffset = 0;
+	char fullpath[1024]; /* DMXXX */
+	int fd, err;
+	int completed = 0;
+
+	im->im_status = SPNFS_STATUS_SUCCESS;
+	im->im_res.read_res.status = 0;
+	if (len > SPNFS_MAX_IO) {
+		im->im_res.read_res.status = -1;
+		return 0;
+	}
+	while (len > 0) {
+		ds = (offset / stripesize) % num_ds;
+		if (densestriping == 0)
+			soffset = offset;
+		else
+			soffset = (offset / num_ds) + (offset % stripesize);
+		iolen = min(len, stripesize - (offset % stripesize));
+
+		sprintf(fullpath, "%s/%s/%ld", dsmountdir,
+			dataservers[ds].ds_ip, inode);
+		fd = open(fullpath, O_RDONLY);
+		if (fd < 0) {
+			perror(fullpath);
+			im->im_res.read_res.status = -errno;
+			return 0; /* DMXXX */
+		}
+		/* DM: add some error checking */
+		lseek64(fd, offset, SEEK_SET);
+		err = read(fd,
+			(void *)(im->im_res.read_res.data+bufoffset), iolen);
+		close(fd);
+		if (err < 0) {
+			perror("read");
+			im->im_res.read_res.status = -errno;
+			return 0; /* DMXXX */
+		}
+
+		if (err == 0)
+			break;
+		iolen = err; /* number of bytes read */
+		completed += iolen;
+		len -= iolen;
+		offset += iolen;
+		bufoffset += iolen;
+	}
+	im->im_res.read_res.status = completed;
+
+	return 0;
+}
+
+int
+spnfsd_write(struct spnfs_msg *im)
+{
+	unsigned long inode = im->im_args.write_args.inode;
+	loff_t offset = im->im_args.write_args.offset;
+	size_t len = im->im_args.write_args.len;
+	char *wbuf = im->im_args.write_args.data;
+	int ds, iolen;
+	loff_t soffset;
+	int bufoffset = 0;
+	char fullpath[1024]; /* DMXXX */
+	int fd, err;
+	int completed = 0;
+
+	im->im_status = SPNFS_STATUS_SUCCESS;
+	im->im_res.write_res.status = 0;
+	if (len > SPNFS_MAX_IO) {
+		printf("write length > SPNFS_MAX_IO\n");
+		im->im_res.write_res.status = -1;
+		return 0;
+	}
+	while (len > 0) {
+		ds = (offset / stripesize) % num_ds;
+		if (densestriping == 0)
+			soffset = offset;
+		else
+			soffset = (offset / num_ds) + (offset % stripesize);
+		iolen = min(len, stripesize - (offset % stripesize));
+
+		sprintf(fullpath, "%s/%s/%ld", dsmountdir,
+			dataservers[ds].ds_ip, inode);
+		fd = open(fullpath, O_WRONLY);
+		if (fd < 0) {
+			perror(fullpath);
+			im->im_res.write_res.status = -errno;
+			return 0; /* DMXXX */
+		}
+		/* DM: add some error checking */
+		lseek64(fd, offset, SEEK_SET);
+		err = write(fd, (void *)(wbuf+bufoffset), iolen);
+		close(fd);
+		if (err < 0) {
+			perror("write");
+			im->im_res.write_res.status = -errno;
+			return 0; /* DMXXX */
+		}
+
+		iolen = err; /* number of bytes read */
+		completed += iolen;
+		len -= iolen;
+		offset += iolen;
+		bufoffset += iolen;
+	}
+	im->im_res.write_res.status = completed;
 	return 0;
 }
 

nfs-utils-1.2.0-spnfsd-09.patch:
 nfsd4_spnfs.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-09.patch ---
commit 372650b7f45ca612c7908cbec91d87d7f9c5184a
Author: Dan Muntz <dmuntz at netapp.com>
Date:   Tue Jun 3 15:44:07 2008 -0700

    Update utils for I/O through MDS, and increased number of DSs
    
    Signed-off-by: Dan Muntz <dmuntz at netapp.com>

diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index fc6bd9a..d2b8356 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -59,7 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define SPNFS_TYPE_WRITE		0x0d
 
 #define	SPNFS_MAX_DEVICES		1
-#define	SPNFS_MAX_DATA_SERVERS		2
+#define	SPNFS_MAX_DATA_SERVERS		16
 #define SPNFS_MAX_IO			2048
 
 /* layout */
@@ -298,6 +298,7 @@ int spnfs_getdeviceiter(struct super_block *, struct pnfs_deviter_arg *);
 int spnfs_getdeviceinfo(struct super_block *, struct pnfs_devinfo_arg *);
 int spnfs_setattr(void);
 int spnfs_open(struct inode *, void *);
+int spnfs_close(struct inode *);
 int spnfs_get_state(struct inode *, void *, void *);
 int spnfs_remove(unsigned long);
 int spnfs_read(unsigned long, loff_t, unsigned long *, int, struct svc_rqst *);
@@ -307,6 +308,7 @@ int nfsd_spnfs_new(void);
 void nfsd_spnfs_delete(void);
 int spnfs_upcall(struct spnfs *, struct spnfs_msg *, union spnfs_msg_res *);
 int spnfs_enabled(void);
+int nfs4_spnfs_propagate_open(struct super_block *, struct svc_fh *, void *);
 
 #endif /* __KERNEL__ */
 

nfs-utils-1.2.0-spnfsd-10.patch:
 nfsd4_spnfs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-10.patch ---
commit 300e5106d9626120fd7c411c4ed723498aaca8b9
Author: Dan Muntz <dmuntz at netapp.com>
Date:   Thu Jun 12 15:44:17 2008 -0700

    Reduce size of I/O buffer as a temporary workaround for stack overflow issue.
    
    Signed-off-by: Dan Muntz <dmuntz at netapp.com>

diff --git a/utils/spnfsd/nfsd4_spnfs.h b/utils/spnfsd/nfsd4_spnfs.h
index d2b8356..b459e30 100644
--- a/utils/spnfsd/nfsd4_spnfs.h
+++ b/utils/spnfsd/nfsd4_spnfs.h
@@ -60,7 +60,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define	SPNFS_MAX_DEVICES		1
 #define	SPNFS_MAX_DATA_SERVERS		16
-#define SPNFS_MAX_IO			2048
+#define SPNFS_MAX_IO			512
 
 /* layout */
 struct spnfs_msg_layoutget_args {

nfs-utils-1.2.0-spnfsd-installrules.patch:
 Makefile.am |   41 -----------------------------------------
 1 file changed, 41 deletions(-)

--- NEW FILE nfs-utils-1.2.0-spnfsd-installrules.patch ---
diff -up nfs-utils-1.2.0/utils/spnfsd/Makefile.am.orig nfs-utils-1.2.0/utils/spnfsd/Makefile.am
--- nfs-utils-1.2.0/utils/spnfsd/Makefile.am.orig	2009-08-27 14:31:56.046010000 -0400
+++ nfs-utils-1.2.0/utils/spnfsd/Makefile.am	2009-08-27 14:46:41.763597000 -0400
@@ -28,44 +28,3 @@ spnfsd_SOURCES = \
 spnfsd_LDADD = -levent ../../support/nfs/libnfs.a
 
 MAINTAINERCLEANFILES = Makefile.in
-
-#######################################################################
-# The following allows the current practice of having
-# daemons renamed during the install to include RPCPREFIX
-# and the KPREFIX
-# This could all be done much easier with program_transform_name
-# ( program_transform_name = s/^/$(RPCPREFIX)$(KPREFIX)/ )
-# but that also renames the man pages, which the current
-# practice does not do.
-install-exec-hook:
-	(cd $(DESTDIR)$(sbindir) && \
-	  for p in $(sbin_PROGRAMS); do \
-	    mv -f $$p$(EXEEXT) $(RPCPREFIX)$(KPREFIX)$$p$(EXEEXT) ;\
-	  done)
-uninstall-hook:
-	(cd $(DESTDIR)$(sbindir) && \
-	  for p in $(sbin_PROGRAMS); do \
-	    rm -f $(RPCPREFIX)$(KPREFIX)$$p$(EXEEXT) ;\
-	  done)
-
-
-# XXX This makes some assumptions about what automake does.
-# XXX But there is no install-man-hook or install-man-local.
-install-man: install-man5 install-man8 install-man-links
-uninstall-man: uninstall-man5 uninstall-man8 uninstall-man-links
-
-install-man-links:
-	(cd $(DESTDIR)$(man8dir) && \
-	  for m in $(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS); do \
-	    inst=`echo $$m | sed -e 's/man$$/8/'`; \
-	    rm -f $(RPCPREFIX)$$inst ; \
-	    $(LN_S) $$inst $(RPCPREFIX)$$inst ; \
-	  done)
-
-uninstall-man-links:
-	(cd $(DESTDIR)$(man8dir) && \
-	  for m in $(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS); do \
-	    inst=`echo $$m | sed -e 's/man$$/8/'`; \
-	    rm -f $(RPCPREFIX)$$inst ; \
-	  done)
-

pnfs-exports.patch:
 support/include/nfslib.h  |    1 +
 support/nfs/exports.c     |    5 +++++
 utils/exportfs/exportfs.c |    2 ++
 utils/mountd/cache.c      |    2 ++
 4 files changed, 10 insertions(+)

--- NEW FILE pnfs-exports.patch ---
diff -up nfs-utils-1.2.0/support/include/nfslib.h.orig nfs-utils-1.2.0/support/include/nfslib.h
--- nfs-utils-1.2.0/support/include/nfslib.h.orig	2009-08-27 11:56:15.475380000 -0400
+++ nfs-utils-1.2.0/support/include/nfslib.h	2009-08-27 11:56:32.497258000 -0400
@@ -90,6 +90,7 @@ struct exportent {
 	char *		e_uuid;
 	void *		e_v4root;
 	struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
+	int             e_pnfs;
 };
 
 struct rmtabent {
diff -up nfs-utils-1.2.0/support/nfs/exports.c.orig nfs-utils-1.2.0/support/nfs/exports.c
--- nfs-utils-1.2.0/support/nfs/exports.c.orig	2009-08-27 11:57:57.945647000 -0400
+++ nfs-utils-1.2.0/support/nfs/exports.c	2009-08-27 11:59:22.231103000 -0400
@@ -293,6 +293,8 @@ putexportent(struct exportent *ep)
 	}
 	fprintf(fp, "anonuid=%d,anongid=%d", ep->e_anonuid, ep->e_anongid);
 	secinfo_show(fp, ep);
+	if (ep->e_pnfs)
+		fprintf(fp, ",pnfs");
 	fprintf(fp, ")\n");
 }
 
@@ -343,6 +345,7 @@ mkexportent(char *hname, char *path, cha
 	ee.e_fslocmethod = FSLOC_NONE;
 	ee.e_fslocdata = NULL;
 	ee.e_secinfo[0].flav = NULL;
+	ee.e_pnfs = 0;
 	ee.e_nsquids = 0;
 	ee.e_nsqgids = 0;
 	ee.e_uuid = NULL;
@@ -552,6 +555,8 @@ parseopts(char *cp, struct exportent *ep
 			ep->e_flags &= ~NFSEXP_NOACL;
 		else if (strcmp(opt, "no_acl") == 0)
 			ep->e_flags |= NFSEXP_NOACL;
+		else if (strcmp(opt, "pnfs") == 0)
+			ep->e_pnfs = 1;
 		else if (strncmp(opt, "anonuid=", 8) == 0) {
 			char *oe;
 			ep->e_anonuid = strtol(opt+8, &oe, 10);
diff -up nfs-utils-1.2.0/utils/exportfs/exportfs.c.orig nfs-utils-1.2.0/utils/exportfs/exportfs.c
--- nfs-utils-1.2.0/utils/exportfs/exportfs.c.orig	2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/utils/exportfs/exportfs.c	2009-08-27 12:00:05.139293000 -0400
@@ -523,6 +523,8 @@ dump(int verbose)
 #endif
 			}
 			secinfo_show(stdout, ep);
+			if (ep->e_pnfs)
+				c = dumpopt(c, ",pnfs");
 			printf("%c\n", (c != '(')? ')' : ' ');
 		}
 	}
diff -up nfs-utils-1.2.0/utils/mountd/cache.c.orig nfs-utils-1.2.0/utils/mountd/cache.c
--- nfs-utils-1.2.0/utils/mountd/cache.c.orig	2009-08-27 11:54:17.895168000 -0400
+++ nfs-utils-1.2.0/utils/mountd/cache.c	2009-08-27 12:01:40.547995000 -0400
@@ -609,6 +609,8 @@ static int dump_to_cache(FILE *f, char *
 		qword_printint(f, exp->e_anonuid);
 		qword_printint(f, exp->e_anongid);
 		qword_printint(f, exp->e_fsid);
+		if (exp->e_pnfs == 1)
+			qword_print(f, "pnfs");
 		write_fsloc(f, exp, path);
 		write_secinfo(f, exp, flag_mask);
  		if (exp->e_uuid == NULL || different_fs) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.240
retrieving revision 1.240.2.1
diff -u -p -r1.240 -r1.240.2.1
--- nfs-utils.spec	17 Aug 2009 13:21:50 -0000	1.240
+++ nfs-utils.spec	27 Aug 2009 19:11:41 -0000	1.240.2.1
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 10%{?dist}
+Release: 10.pnfs%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -29,6 +29,20 @@ Patch103: nfs-utils-1.2.1-rc4.patch
 
 Patch200: nfs-utils-1.2.0-proots-rel5.patch
 
+Patch300: pnfs-exports.patch
+
+Patch401: nfs-utils-1.2.0-spnfsd-01.patch
+Patch402: nfs-utils-1.2.0-spnfsd-02.patch
+Patch403: nfs-utils-1.2.0-spnfsd-03.patch
+Patch404: nfs-utils-1.2.0-spnfsd-04.patch
+Patch405: nfs-utils-1.2.0-spnfsd-05.patch
+Patch406: nfs-utils-1.2.0-spnfsd-06.patch
+Patch407: nfs-utils-1.2.0-spnfsd-07.patch
+Patch408: nfs-utils-1.2.0-spnfsd-08.patch
+Patch409: nfs-utils-1.2.0-spnfsd-09.patch
+Patch410: nfs-utils-1.2.0-spnfsd-10.patch
+Patch411: nfs-utils-1.2.0-spnfsd-installrules.patch
+
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
 Provides: nfsstat     = %{epoch}:%{version}-%{release}
@@ -46,6 +60,7 @@ Provides: umount.nfs  = %{epoch}:%{versi
 Provides: umount.nfs4 = %{epoch}:%{version}-%{release}
 Provides: sm-notify   = %{epoch}:%{version}-%{release}
 Provides: start-statd = %{epoch}:%{version}-%{release}
+Provides: spnfsd = %{epoch}:%{version}-%{release}
 
 License: MIT and GPLv2 and GPLv2+ and BSD
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -83,9 +98,25 @@ This package also contains the mount.nfs
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-
+# proot bits
 %patch200 -p1
 
+# pnfs bits
+%patch300 -p1
+
+# spnfsd bits
+%patch401 -p1
+%patch402 -p1
+%patch403 -p1
+%patch404 -p1
+%patch405 -p1
+%patch406 -p1
+%patch407 -p1
+%patch408 -p1
+%patch409 -p1
+%patch410 -p1
+%patch411 -p1
+
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -239,6 +270,7 @@ fi
 /usr/sbin/rpcdebug
 /usr/sbin/rpc.mountd
 /usr/sbin/rpc.nfsd
+/usr/sbin/spnfsd
 /usr/sbin/showmount
 /usr/sbin/rpc.idmapd
 /usr/sbin/rpc.gssd
@@ -256,6 +288,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Aug 27 2009 Steve Dickson <steved at redhat.com> 1.2.0-10.pnfs
+- Added in the pnfs export bits.
+- Added in the spnfsd daemon
+
 * Mon Aug 17 2009 Steve Dickson <steved at redhat.com> 1.2.0-10
 - Added upstream 1.2.1-rc4 patch
   - Fix bug when both crossmnt



From mtasaka at fedoraproject.org  Thu Aug 27 19:13:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 19:13:20 +0000 (UTC)
Subject: rpms/xscreensaver/F-10
	xscreensaver-5.08-hacks-window-too-small.patch, 
	NONE, 1.1 xscreensaver.spec, 1.80, 1.81
Message-ID: <20090827191320.E802F11C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5008/F-10

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-hacks-window-too-small.patch 
Log Message:
* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
- Another case of hack's crash when window size is too small
  (Ubuntu bug 418419)


xscreensaver-5.08-hacks-window-too-small.patch:
 abstractile.c |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.08-hacks-window-too-small.patch ---
--- xscreensaver-5.08/hacks/abstractile.c.debug	2008-07-31 19:29:25.000000000 +0900
+++ xscreensaver-5.08/hacks/abstractile.c	2009-08-28 03:50:28.000000000 +0900
@@ -1104,6 +1104,7 @@
   values tuned for it draw the screen in a blink on Linux.  Therefore we
   draw 1/200th of the screen with each update and sleep, if necessary */
   st->lpu = (st->dialog) ? st->li/50 : st->li/200;   
+  if (!st->lpu) st->lpu = 1;
   st->bi=1;
   st->mode=MODE_ERASE;
 }
@@ -1521,17 +1522,21 @@
   int mse, usleep;
  
   gettimeofday(&st->time, NULL);
-  switch (st->mode) {
-    case MODE_CREATE:
-      _init_screen(st);
-      _create_screen(st);
-      break;
-    case MODE_ERASE:
-      _erase_lines(st);
-      break;
-    case MODE_DRAW:
-      _draw_lines(st);
-      break;
+
+  /* If the window is too small, do nothing, sorry! */
+  if (st->xgwa.width > 20 && st->xgwa.height > 20){
+    switch (st->mode) {
+      case MODE_CREATE:
+        _init_screen(st);
+        _create_screen(st);
+        break;
+      case MODE_ERASE:
+        _erase_lines(st);
+        break;
+      case MODE_DRAW:
+        _draw_lines(st);
+        break;
+    }
   }
   mse=_mselapsed(st);
   usleep = ((!st->ii) && (st->mode==MODE_CREATE)) ?  0 :


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- xscreensaver.spec	11 Jun 2009 14:38:32 -0000	1.80
+++ xscreensaver.spec	27 Aug 2009 19:13:20 -0000	1.81
@@ -5,11 +5,15 @@
 
 
 %define modular_conf  1
-%define fedora_rel    10
+%define fedora_rel    13
 
 %define extrarel      %{nil}
 
+%if 0%{?fedora} >= 12
+%define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
+%else
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
+%endif
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -31,6 +35,10 @@ Source0:         http://www.jwz.org/xscr
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+%if 0%{?fedora} >= 12
+Source11:        xscreensaver-autostart
+Source12:        xscreensaver-autostart.desktop
+%endif
 # bug 129335
 # sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
@@ -43,10 +51,25 @@ Patch50:         xscreensaver-5.08-po-re
 # bug 481146, sent upstream
 # phosphor crashes when resizing window
 Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, must be reported to upstream
+# bug 504912, sent upstream
 # ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
 # xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
+Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
+%if 0%{?fedora} >= 12
+# Fix for Xext 1.0.99.3
+# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
+Patch53:         xscreensaver-5.08-new-xextproto.patch
+# Fix warnings for breaking strict aliasing rule
+Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
+%endif
+#
+# Not sent to upstream yet, must do later
+#
+# Ubuntu bug 418419, must send to upstream later
+# Another SIGFPE when hack's window size is too small:
+Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
+#
+# Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -202,6 +225,11 @@ This package contains some test programs
 %patch50 -p1 -b .po
 %patch51 -p1 -b .phosphor
 %patch52 -p0 -b .randr_ncrtc
+%if 0%{?fedora} >= 12
+%patch53 -p1 -b .newxextproto
+%patch54 -p1 -b .aliasing
+%endif
+%patch55 -p1 -b .small
 
 change_option(){
    set +x
@@ -532,6 +560,20 @@ done
 cd ..
 %endif
 
+# Install desktop application autostart stuff
+%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 \
+   %{SOURCE12}
+chmod 0644 ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop
+
+echo "%{_libexecdir}/xscreensaver-autostart" >> $dd/base.files
+echo '%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop' >> $dd/base.files
+%endif
+
 # Create desktop entry for gnome-screensaver
 # bug 204944, 208560
 create_desktop(){
@@ -652,6 +694,18 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
+- Another case of hack's crash when window size is too small
+  (Ubuntu bug 418419)
+
+* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-12
+- Install desktop application autostart stuff on F-12+
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-11
+- Build fix for new xextproto (libXext 1.0.99.3)
+- Fix for breaking strict aliasing rule
+- Again change %%default_text
+
 * Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-10
 - Fix crash on startup when randr reports no rroi->ncrtc
   (bug 504912), patch from gentoo



From mtasaka at fedoraproject.org  Thu Aug 27 19:13:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 19:13:21 +0000 (UTC)
Subject: rpms/xscreensaver/F-11
	xscreensaver-5.08-hacks-window-too-small.patch, 
	NONE, 1.1 xscreensaver.spec, 1.91, 1.92
Message-ID: <20090827191321.6085211C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5008/F-11

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-hacks-window-too-small.patch 
Log Message:
* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
- Another case of hack's crash when window size is too small
  (Ubuntu bug 418419)


xscreensaver-5.08-hacks-window-too-small.patch:
 abstractile.c |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.08-hacks-window-too-small.patch ---
--- xscreensaver-5.08/hacks/abstractile.c.debug	2008-07-31 19:29:25.000000000 +0900
+++ xscreensaver-5.08/hacks/abstractile.c	2009-08-28 03:50:28.000000000 +0900
@@ -1104,6 +1104,7 @@
   values tuned for it draw the screen in a blink on Linux.  Therefore we
   draw 1/200th of the screen with each update and sleep, if necessary */
   st->lpu = (st->dialog) ? st->li/50 : st->li/200;   
+  if (!st->lpu) st->lpu = 1;
   st->bi=1;
   st->mode=MODE_ERASE;
 }
@@ -1521,17 +1522,21 @@
   int mse, usleep;
  
   gettimeofday(&st->time, NULL);
-  switch (st->mode) {
-    case MODE_CREATE:
-      _init_screen(st);
-      _create_screen(st);
-      break;
-    case MODE_ERASE:
-      _erase_lines(st);
-      break;
-    case MODE_DRAW:
-      _draw_lines(st);
-      break;
+
+  /* If the window is too small, do nothing, sorry! */
+  if (st->xgwa.width > 20 && st->xgwa.height > 20){
+    switch (st->mode) {
+      case MODE_CREATE:
+        _init_screen(st);
+        _create_screen(st);
+        break;
+      case MODE_ERASE:
+        _erase_lines(st);
+        break;
+      case MODE_DRAW:
+        _draw_lines(st);
+        break;
+    }
   }
   mse=_mselapsed(st);
   usleep = ((!st->ii) && (st->mode==MODE_CREATE)) ?  0 :


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-11/xscreensaver.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- xscreensaver.spec	11 Jun 2009 06:59:12 -0000	1.91
+++ xscreensaver.spec	27 Aug 2009 19:13:21 -0000	1.92
@@ -5,11 +5,15 @@
 
 
 %define modular_conf  1
-%define fedora_rel    10
+%define fedora_rel    13
 
 %define extrarel      %{nil}
 
+%if 0%{?fedora} >= 12
+%define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
+%else
 %define default_text  %{_datadir}/doc/HTML/README-Accessibility
+%endif
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -31,8 +35,12 @@ Source0:         http://www.jwz.org/xscr
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+%if 0%{?fedora} >= 12
+Source11:        xscreensaver-autostart
+Source12:        xscreensaver-autostart.desktop
+%endif
 # bug 129335
-# sanitize the name of modes in barcode
+# sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 # Change webcollage not to access to net
 # Also see bug 472061
@@ -43,10 +51,25 @@ Patch50:         xscreensaver-5.08-po-re
 # bug 481146, sent upstream
 # phosphor crashes when resizing window
 Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, must be reported to upstream
+# bug 504912, sent upstream
 # ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
 # xscreensaver crashes when randr reportes 0 rroi->ncrtc
-Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
+Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
+%if 0%{?fedora} >= 12
+# Fix for Xext 1.0.99.3
+# http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
+Patch53:         xscreensaver-5.08-new-xextproto.patch
+# Fix warnings for breaking strict aliasing rule
+Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
+%endif
+#
+# Not sent to upstream yet, must do later
+#
+# Ubuntu bug 418419, must send to upstream later
+# Another SIGFPE when hack's window size is too small:
+Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
+#
+# Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -202,6 +225,11 @@ This package contains some test programs
 %patch50 -p1 -b .po
 %patch51 -p1 -b .phosphor
 %patch52 -p0 -b .randr_ncrtc
+%if 0%{?fedora} >= 12
+%patch53 -p1 -b .newxextproto
+%patch54 -p1 -b .aliasing
+%endif
+%patch55 -p1 -b .small
 
 change_option(){
    set +x
@@ -532,6 +560,20 @@ done
 cd ..
 %endif
 
+# Install desktop application autostart stuff
+%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 \
+   %{SOURCE12}
+chmod 0644 ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop
+
+echo "%{_libexecdir}/xscreensaver-autostart" >> $dd/base.files
+echo '%{_sysconfdir}/xdg/autostart/xscreensaver*.desktop' >> $dd/base.files
+%endif
+
 # Create desktop entry for gnome-screensaver
 # bug 204944, 208560
 create_desktop(){
@@ -652,6 +694,18 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
+- Another case of hack's crash when window size is too small
+  (Ubuntu bug 418419)
+
+* Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-12
+- Install desktop application autostart stuff on F-12+
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-11
+- Build fix for new xextproto (libXext 1.0.99.3)
+- Fix for breaking strict aliasing rule
+- Again change %%default_text
+
 * Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-10
 - Fix crash on startup when randr reports no rroi->ncrtc
   (bug 504912), patch from gentoo



From mtasaka at fedoraproject.org  Thu Aug 27 19:13:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 27 Aug 2009 19:13:21 +0000 (UTC)
Subject: rpms/xscreensaver/devel
	xscreensaver-5.08-hacks-window-too-small.patch, NONE,
	1.1 xscreensaver.spec, 1.93, 1.94
Message-ID: <20090827191321.C8CE211C00EB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5008/devel

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-hacks-window-too-small.patch 
Log Message:
* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
- Another case of hack's crash when window size is too small
  (Ubuntu bug 418419)


xscreensaver-5.08-hacks-window-too-small.patch:
 abstractile.c |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-5.08-hacks-window-too-small.patch ---
--- xscreensaver-5.08/hacks/abstractile.c.debug	2008-07-31 19:29:25.000000000 +0900
+++ xscreensaver-5.08/hacks/abstractile.c	2009-08-28 03:50:28.000000000 +0900
@@ -1104,6 +1104,7 @@
   values tuned for it draw the screen in a blink on Linux.  Therefore we
   draw 1/200th of the screen with each update and sleep, if necessary */
   st->lpu = (st->dialog) ? st->li/50 : st->li/200;   
+  if (!st->lpu) st->lpu = 1;
   st->bi=1;
   st->mode=MODE_ERASE;
 }
@@ -1521,17 +1522,21 @@
   int mse, usleep;
  
   gettimeofday(&st->time, NULL);
-  switch (st->mode) {
-    case MODE_CREATE:
-      _init_screen(st);
-      _create_screen(st);
-      break;
-    case MODE_ERASE:
-      _erase_lines(st);
-      break;
-    case MODE_DRAW:
-      _draw_lines(st);
-      break;
+
+  /* If the window is too small, do nothing, sorry! */
+  if (st->xgwa.width > 20 && st->xgwa.height > 20){
+    switch (st->mode) {
+      case MODE_CREATE:
+        _init_screen(st);
+        _create_screen(st);
+        break;
+      case MODE_ERASE:
+        _erase_lines(st);
+        break;
+      case MODE_DRAW:
+        _draw_lines(st);
+        break;
+    }
   }
   mse=_mselapsed(st);
   usleep = ((!st->ii) && (st->mode==MODE_CREATE)) ?  0 :


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- xscreensaver.spec	30 Jul 2009 08:40:11 -0000	1.93
+++ xscreensaver.spec	27 Aug 2009 19:13:21 -0000	1.94
@@ -5,11 +5,15 @@
 
 
 %define modular_conf  1
-%define fedora_rel    12
+%define fedora_rel    13
 
 %define extrarel      %{nil}
 
+%if 0%{?fedora} >= 12
 %define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
+%else
+%define default_text  %{_datadir}/doc/HTML/README-Accessibility
+%endif
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
@@ -31,8 +35,10 @@ Source0:         http://www.jwz.org/xscr
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+%if 0%{?fedora} >= 12
 Source11:        xscreensaver-autostart
 Source12:        xscreensaver-autostart.desktop
+%endif
 # bug 129335
 # sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
@@ -45,18 +51,25 @@ Patch50:         xscreensaver-5.08-po-re
 # bug 481146, sent upstream
 # phosphor crashes when resizing window
 Patch51:         xscreensaver-5.08-phosphor-segv.patch
-# bug 504912, must be reported to upstream
+# bug 504912, sent upstream
 # ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
 # xscreensaver crashes when randr reportes 0 rroi->ncrtc
 Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
-#
-# Not sent to upstream yet, must do later
-#
+%if 0%{?fedora} >= 12
 # Fix for Xext 1.0.99.3
 # http://lists.freedesktop.org/archives/xorg/2009-July/046521.html
 Patch53:         xscreensaver-5.08-new-xextproto.patch
 # Fix warnings for breaking strict aliasing rule
 Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
+%endif
+#
+# Not sent to upstream yet, must do later
+#
+# Ubuntu bug 418419, must send to upstream later
+# Another SIGFPE when hack's window size is too small:
+Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
+#
+# Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -212,8 +225,11 @@ This package contains some test programs
 %patch50 -p1 -b .po
 %patch51 -p1 -b .phosphor
 %patch52 -p0 -b .randr_ncrtc
+%if 0%{?fedora} >= 12
 %patch53 -p1 -b .newxextproto
 %patch54 -p1 -b .aliasing
+%endif
+%patch55 -p1 -b .small
 
 change_option(){
    set +x
@@ -678,8 +694,12 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-13
+- Another case of hack's crash when window size is too small
+  (Ubuntu bug 418419)
+
 * Thu Jul 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-12
-- Install desktop application autostart stuff
+- Install desktop application autostart stuff on F-12+
 
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-11
 - Build fix for new xextproto (libXext 1.0.99.3)



From pkgdb at fedoraproject.org  Thu Aug 27 19:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:18:29 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827191829.26CFE10F854@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:18:35 +0000
Subject: [pkgdb] stunnel: avesh has given up watchbugzilla
Message-ID: <20090827191835.2E0F110F87B@bastion2.fedora.phx.redhat.com>

avesh has given up the watchbugzilla acl on stunnel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:13 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827191913.561A710F87C@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:14 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827191914.C21A810F88B@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:14 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827191914.CCE2B10F897@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:18 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827191918.6BDE210F86F@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:19 +0000
Subject: [pkgdb] stunnel: avesh has given up commit
Message-ID: <20090827191919.48A2010F894@bastion2.fedora.phx.redhat.com>

avesh has given up the commit acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:20 +0000
Subject: [pkgdb] stunnel: avesh has given up watchcommits
Message-ID: <20090827191920.5686D10F89B@bastion2.fedora.phx.redhat.com>

avesh has given up the watchcommits acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:20 +0000
Subject: [pkgdb] stunnel: avesh has given up watchbugzilla
Message-ID: <20090827191920.F3D6C10F8A0@bastion2.fedora.phx.redhat.com>

avesh has given up the watchbugzilla acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:19:22 +0000
Subject: [pkgdb] stunnel: avesh has given up approveacls
Message-ID: <20090827191922.C2A5510F8A3@bastion2.fedora.phx.redhat.com>

avesh has given up the approveacls acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:20:52 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827192052.9D59110F854@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:20:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:20:53 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827192053.5095010F879@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:04 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827192104.8695310F810@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:06 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827192106.E0AB110F890@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:10 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827192110.C085A10F898@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:11 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827192112.21BE810F89B@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:12 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827192112.F24D610F8A2@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:12 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827192112.F095C10F8A1@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora 7)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:18 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827192118.5EC8F10F87B@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:19 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827192119.130B510F8A6@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:20 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827192120.DC4C210F878@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:23 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827192123.D2B3310F8AD@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora 8)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:24 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827192124.2DCD410F8B2@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:24 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827192124.C388310F8B5@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:25 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827192125.1BC8110F8B8@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:27 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827192127.23D4D10F8BC@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora 9)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:29 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827192129.93E2C10F881@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:29 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827192129.B10FE10F8BD@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:30 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827192130.940BA10F8C0@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:31 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827192131.7F1A510F8C3@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:38 +0000
Subject: [pkgdb] stunnel: avesh has requested watchbugzilla
Message-ID: <20090827192138.404EB10F8C5@bastion2.fedora.phx.redhat.com>

avesh has requested the watchbugzilla acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:39 +0000
Subject: [pkgdb] stunnel: avesh has requested watchcommits
Message-ID: <20090827192139.B855710F894@bastion2.fedora.phx.redhat.com>

avesh has requested the watchcommits acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:42 +0000
Subject: [pkgdb] stunnel: avesh has requested commit
Message-ID: <20090827192142.143D410F8C8@bastion2.fedora.phx.redhat.com>

avesh has requested the commit acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:42 +0000
Subject: [pkgdb] stunnel: avesh has requested approveacls
Message-ID: <20090827192142.B0DB510F8CC@bastion2.fedora.phx.redhat.com>

avesh has requested the approveacls acl on stunnel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:22:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:22:00 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192200.694BA10F8A0@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora devel) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:21:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:21:59 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192159.AC79810F89A@bastion2.fedora.phx.redhat.com>

mitr has set the watchbugzilla acl on stunnel (Fedora devel) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:22:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:22:04 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192204.0764810F8A2@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on stunnel (Fedora devel) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:22:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:22:06 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192206.6169D10F8D1@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on stunnel (Fedora devel) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:22:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:22:29 +0000
Subject: [pkgdb] stunnel ownership updated
Message-ID: <20090827192229.1022310F8A6@bastion2.fedora.phx.redhat.com>

Package stunnel in Fedora devel is now owned by avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:04 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192304.16AEA10F8AD@bastion2.fedora.phx.redhat.com>

mitr has set the watchbugzilla acl on stunnel (Fedora 7) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:05 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192305.8EA9310F8B1@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora 7) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:06 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192306.726E210F8B5@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on stunnel (Fedora 7) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:07 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192307.EFBB710F884@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on stunnel (Fedora 7) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:10 +0000
Subject: [pkgdb] stunnel ownership updated
Message-ID: <20090827192310.3357110F8B7@bastion2.fedora.phx.redhat.com>

Package stunnel in Fedora 7 is now owned by avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:12 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192312.E392310F8BA@bastion2.fedora.phx.redhat.com>

mitr has set the watchbugzilla acl on stunnel (Fedora 8) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:14 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192314.4C1D410F8D9@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora 8) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:16 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192316.9632C10F8DC@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on stunnel (Fedora 8) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:18 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192318.12CA810F8E1@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on stunnel (Fedora 8) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:20 +0000
Subject: [pkgdb] stunnel ownership updated
Message-ID: <20090827192320.E20C610F8BE@bastion2.fedora.phx.redhat.com>

Package stunnel in Fedora 8 is now owned by avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:22 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192322.49D0D10F8C1@bastion2.fedora.phx.redhat.com>

mitr has set the watchbugzilla acl on stunnel (Fedora 9) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:26 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192326.7C66B10F8FB@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora 9) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:24 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192324.7FB1810F8F0@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora 9) to Obsolete for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:27 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192327.E997B10F8FE@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on stunnel (Fedora 9) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:30 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192330.1F77C10F901@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on stunnel (Fedora 9) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:32 +0000
Subject: [pkgdb] stunnel ownership updated
Message-ID: <20090827192332.051D210F88C@bastion2.fedora.phx.redhat.com>

Package stunnel in Fedora 9 is now owned by avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:34 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192334.DFBBA10F8C4@bastion2.fedora.phx.redhat.com>

mitr has set the watchbugzilla acl on stunnel (Fedora 10) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:35 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192335.9367910F905@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora 10) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:36 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192336.D21E410F908@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on stunnel (Fedora 10) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:38 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192338.BC87110F90B@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on stunnel (Fedora 10) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:23:40 +0000
Subject: [pkgdb] stunnel ownership updated
Message-ID: <20090827192340.4738310F90F@bastion2.fedora.phx.redhat.com>

Package stunnel in Fedora 10 is now owned by avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From emaldonado at fedoraproject.org  Thu Aug 27 19:23:56 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 19:23:56 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.99,1.100
Message-ID: <20090827192356.7DB8111C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11844

Modified Files:
	nss.spec 
Log Message:
Disable test suite until ppc crashing bug if fixed


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- nss.spec	27 Aug 2009 18:55:24 -0000	1.99
+++ nss.spec	27 Aug 2009 19:23:56 -0000	1.100
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          20%{?dist}
+Release:          21%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -208,9 +208,8 @@ cd ./mozilla/security/nss/tests/
 
 #HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
 
-# Temporarily disabling tests until we investigate a fix for Bug 519766
-# Just run the cipher suites for now
-HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_TESTS="cipher" ./all.sh
+# Temporarily disabling all tests until we investigate a fix for Bug 519766
+
 
 cd ../../../../
 
@@ -437,6 +436,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Wed Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-21
+- disabling all tests while we investigate a buffer overflow bug
+
 * Wed Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-20
 - disabling some tests while we investigate a buffer overflow bug - 519766
 



From pkgdb at fedoraproject.org  Thu Aug 27 19:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:24:33 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192433.CDA8810F8A1@bastion2.fedora.phx.redhat.com>

mitr has set the watchcommits acl on stunnel (Fedora 11) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:24:33 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192433.D538510F8D1@bastion2.fedora.phx.redhat.com>

mitr has set the watchbugzilla acl on stunnel (Fedora 11) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:24:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:24:35 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192435.9D3BD10F914@bastion2.fedora.phx.redhat.com>

mitr has set the commit acl on stunnel (Fedora 11) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:24:38 +0000
Subject: [pkgdb] stunnel had acl change status
Message-ID: <20090827192438.70EE710F8D2@bastion2.fedora.phx.redhat.com>

mitr has set the approveacls acl on stunnel (Fedora 11) to Approved for avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From pkgdb at fedoraproject.org  Thu Aug 27 19:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 19:24:39 +0000
Subject: [pkgdb] stunnel ownership updated
Message-ID: <20090827192439.D64C410F8D6@bastion2.fedora.phx.redhat.com>

Package stunnel in Fedora 11 is now owned by avesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/stunnel



From overholt at fedoraproject.org  Thu Aug 27 19:32:08 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Thu, 27 Aug 2009 19:32:08 +0000 (UTC)
Subject: rpms/backport-util-concurrent/devel backport-util-concurrent.spec,
	1.1, 1.2
Message-ID: <20090827193208.CE93D11C00EB@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/backport-util-concurrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16852

Modified Files:
	backport-util-concurrent.spec 
Log Message:
* Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 3.1-4
- Fix Source0 URL


Index: backport-util-concurrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/backport-util-concurrent/devel/backport-util-concurrent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- backport-util-concurrent.spec	25 Aug 2009 17:23:00 -0000	1.1
+++ backport-util-concurrent.spec	27 Aug 2009 19:32:08 -0000	1.2
@@ -31,12 +31,11 @@
 Name:		backport-util-concurrent
 Summary:	Backport of java.util.concurrent API, introduced in Java 5.0
 Version:	3.1
-Release:	3
+Release:	4
 URL:		http://backport-jsr166.sourceforge.net
 License:	Public Domain
 Group:		Development/Libraries
-# http://sourceforge.net/projects/backport-jsr166/files/backport-jsr166/3.1/backport-util-concurrent-3.1-src.tar.gz/download
-Source0:	%{name}-%{version}-src.tar.gz
+Source0:        http://downloads.sourceforge.net/backport-jsr166/%{name}-%{version}-src.tar.gz
 Source1:	http://repo1.maven.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
 
 BuildRequires:	jpackage-utils >= 0:1.7.2
@@ -122,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 3.1-4
+- Fix Source0 URL
+
 * Mon Aug 24 2009 Andrew Overholt <overholt at redhat.com> 3.1-3
 - Clarify Source0 URl
 - Add jpackage-utils Requirement



From bos at fedoraproject.org  Thu Aug 27 19:36:22 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Thu, 27 Aug 2009 19:36:22 +0000 (UTC)
Subject: rpms/ghc-HUnit/devel ghc-HUnit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827193622.6C81711C00EB@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-HUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20446

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-HUnit.spec 
Log Message:
ghc-HUnit 1.2.0.3


--- NEW FILE ghc-HUnit.spec ---
%global pkg_name HUnit

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        1.2.0.3
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hunit.sourceforge.net/
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.  HUnit
is a unit testing framework for Haskell, inspired by the JUnit tool
for Java.

%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name}
library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 1.2.0.3-1
- initial packaging for Fedora created by cabal2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-HUnit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:19:23 -0000	1.1
+++ .cvsignore	27 Aug 2009 19:36:21 -0000	1.2
@@ -0,0 +1 @@
+HUnit-1.2.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-HUnit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:19:23 -0000	1.1
+++ sources	27 Aug 2009 19:36:22 -0000	1.2
@@ -0,0 +1 @@
+948b5b20ff22fa81c6390b08d6af5104  HUnit-1.2.0.3.tar.gz



From jforbes at fedoraproject.org  Thu Aug 27 19:40:55 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Thu, 27 Aug 2009 19:40:55 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-xen-clean-up-warnings.patch, NONE,
	1.1 linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch, NONE,
	1.1 kernel.spec, 1.1718, 1.1719
Message-ID: <20090827194055.EDA4E11C00EB@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23393

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-xen-clean-up-warnings.patch 
	linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch 
Log Message:
xen: Fix guest crash when trying to debug. (#458385)

linux-2.6-xen-clean-up-warnings.patch:
 enlighten.c |   22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-xen-clean-up-warnings.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Fri, 24 Apr 2009 07:22:08 +0000 (-0700)
Subject: xen/x86-64: clean up warnings about IST-using traps
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=19a1071c33c4aa7531ac5c5a634a12607aefa90a

xen/x86-64: clean up warnings about IST-using traps

Ignore known IST-using traps.  Aside from the debugger traps, they're
low-level faults which Xen will handle for us, so the kernel needn't
worry about them.  Keep warning in case unknown trap starts using IST.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 16afbc3..cbb31eb 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -439,12 +439,30 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val,
 
 	addr = gate_offset(*val);
 #ifdef CONFIG_X86_64
+	/*
+	 * Look for known traps using IST, and substitute them
+	 * appropriately.  The debugger ones are the only ones we care
+	 * about.  Xen will handle faults like double_fault and
+	 * machine_check, so we should never see them.  Warn if
+	 * there's an unexpected IST-using fault handler.
+	 */
 	if (addr == (unsigned long)debug)
 		addr = (unsigned long)xen_debug;
 	else if (addr == (unsigned long)int3)
 		addr = (unsigned long)xen_int3;
-	else
-		WARN_ON(val->ist != 0);
+	else if (addr == (unsigned long)double_fault ||
+		 addr == (unsigned long)stack_segment) {
+		/* Don't need to handle these */
+		return 0;
+#ifdef CONFIG_X86_MCE
+	} else if (addr == (unsigned long)machine_check) {
+		return 0;
+#endif
+	} else {
+		/* Some other trap using IST? */
+		if (WARN_ON(val->ist != 0))
+			return 0;
+	}
 #endif	/* CONFIG_X86_64 */
 	info->address = addr;
 

linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch:
 include/asm/traps.h |    2 ++
 kernel/entry_64.S   |    4 ++++
 xen/enlighten.c     |   17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 30 Mar 2009 02:56:29 +0000 (-0700)
Subject: xen/x86-64: fix breakpoints and hardware watchpoints
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=bb2105d9743a902fd6035ba6d72cef6cda871664

xen/x86-64: fix breakpoints and hardware watchpoints

Native x86-64 uses the IST mechanism to run int3 and debug traps on
an alternative stack.  Xen does not do this, and so the frames were
being misinterpreted by the ptrace code.  This change special-cases
these two exceptions by using Xen variants which run on the normal
kernel stack properly.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 0d53425..d696185 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -13,6 +13,8 @@ asmlinkage void divide_error(void);
 asmlinkage void debug(void);
 asmlinkage void nmi(void);
 asmlinkage void int3(void);
+asmlinkage void xen_debug(void);
+asmlinkage void xen_int3(void);
 asmlinkage void overflow(void);
 asmlinkage void bounds(void);
 asmlinkage void invalid_op(void);
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index a331ec3..649db62 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1378,6 +1378,10 @@ END(xen_failsafe_callback)
 
 paranoidzeroentry_ist debug do_debug DEBUG_STACK
 paranoidzeroentry_ist int3 do_int3 DEBUG_STACK
+#ifdef CONFIG_XEN
+zeroentry xen_debug do_debug
+zeroentry xen_int3 do_int3
+#endif
 paranoiderrorentry stack_segment do_stack_segment
 errorentry general_protection do_general_protection
 errorentry page_fault do_page_fault
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 12a3159..16afbc3 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/start_kernel.h>
 #include <linux/sched.h>
+#include <linux/kprobes.h>
 #include <linux/bootmem.h>
 #include <linux/module.h>
 #include <linux/mm.h>
@@ -44,6 +45,7 @@
 #include <asm/processor.h>
 #include <asm/proto.h>
 #include <asm/msr-index.h>
+#include <asm/traps.h>
 #include <asm/setup.h>
 #include <asm/desc.h>
 #include <asm/pgtable.h>
@@ -428,11 +430,24 @@ static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum,
 static int cvt_gate_to_trap(int vector, const gate_desc *val,
 			    struct trap_info *info)
 {
+	unsigned long addr;
+
 	if (val->type != GATE_TRAP && val->type != GATE_INTERRUPT)
 		return 0;
 
 	info->vector = vector;
-	info->address = gate_offset(*val);
+
+	addr = gate_offset(*val);
+#ifdef CONFIG_X86_64
+	if (addr == (unsigned long)debug)
+		addr = (unsigned long)xen_debug;
+	else if (addr == (unsigned long)int3)
+		addr = (unsigned long)xen_int3;
+	else
+		WARN_ON(val->ist != 0);
+#endif	/* CONFIG_X86_64 */
+	info->address = addr;
+
 	info->cs = gate_segment(*val);
 	info->flags = val->dpl;
 	/* interrupt gates clear IF */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1718
retrieving revision 1.1719
diff -u -p -r1.1718 -r1.1719
--- kernel.spec	27 Aug 2009 19:01:31 -0000	1.1718
+++ kernel.spec	27 Aug 2009 19:40:55 -0000	1.1719
@@ -650,6 +650,10 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch1000: linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
 
+# Virt Patches
+Patch1200: linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
+Patch1201: linux-2.6-xen-clean-up-warnings.patch
+
 Patch1515: linux-2.6.29-lirc.patch
 Patch1517: hid-ignore-all-recent-imon-devices.patch
 Patch1518: hdpvr-ir-enable.patch
@@ -1247,6 +1251,11 @@ ApplyPatch linux-2.6-neigh_-fix-state-tr
 # add ich9 lan
 ApplyPatch linux-2.6-e1000-ich9.patch
 
+# Virt Fixes
+# Xen Guest
+ApplyPatch linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
+ApplyPatch linux-2.6-xen-clean-up-warnings.patch
+
 # Misc fixes
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
@@ -1938,6 +1947,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.30.5-40
+- xen: Fix guest crash when trying to debug. (#458385)
+
 * Thu Aug 27 2009 John W. Linville <linville at redhat.com> 2.6.30.5-39
 - zd1211rw: adding 083a:e503 as a ZD1211B device (#518538)
 



From bos at fedoraproject.org  Thu Aug 27 19:42:37 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Thu, 27 Aug 2009 19:42:37 +0000 (UTC)
Subject: rpms/ghc-HUnit/F-11 ghc-HUnit.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090827194237.9453511C00EB@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-HUnit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24474

Modified Files:
	sources 
Added Files:
	ghc-HUnit.spec 
Log Message:
ghc-HUnit 1.2.0.3


--- NEW FILE ghc-HUnit.spec ---
%global pkg_name HUnit

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        1.2.0.3
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://hunit.sourceforge.net/
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.  HUnit
is a unit testing framework for Haskell, inspired by the JUnit tool
for Java.

%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name}
library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 1.2.0.3-1
- initial packaging for Fedora created by cabal2spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-HUnit/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:19:23 -0000	1.1
+++ sources	27 Aug 2009 19:42:37 -0000	1.2
@@ -0,0 +1 @@
+948b5b20ff22fa81c6390b08d6af5104  HUnit-1.2.0.3.tar.gz



From clumens at fedoraproject.org  Thu Aug 27 19:47:03 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 27 Aug 2009 19:47:03 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.113, 1.114 pykickstart.spec,
	1.124, 1.125 sources, 1.123, 1.124
Message-ID: <20090827194703.6592A11C00EB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27633

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- .cvsignore	11 Aug 2009 18:24:17 -0000	1.113
+++ .cvsignore	27 Aug 2009 19:47:02 -0000	1.114
@@ -47,3 +47,4 @@ pykickstart-1.57.tar.gz
 pykickstart-1.58.tar.gz
 pykickstart-1.59.tar.gz
 pykickstart-1.60.tar.gz
+pykickstart-1.61.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- pykickstart.spec	11 Aug 2009 18:24:17 -0000	1.124
+++ pykickstart.spec	27 Aug 2009 19:47:03 -0000	1.125
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.60
+Version: 1.61
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 %{_bindir}/ksverdiff
 
 %changelog
+* Thu Aug 27 2009 Chris Lumens <clumens at redhat.com> - 1.61-1
+- Include the error messages from URLGrabError in the exception (#518443).
+
 * Tue Aug 11 2009 Chris Lumens <clumens at redhat.com> - 1.60-1
 - Put quotes around the repo's name (Marc.Herbert at gmail.com).
 - Make duplicate entries warnings, not errors (#516338).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- sources	11 Aug 2009 18:24:17 -0000	1.123
+++ sources	27 Aug 2009 19:47:03 -0000	1.124
@@ -1 +1 @@
-5115b52ffcf6038ac13afa970187384d  pykickstart-1.60.tar.gz
+0e5f85da22ecda5a8ab588264a0b21c8  pykickstart-1.61.tar.gz



From joost at fedoraproject.org  Thu Aug 27 19:50:43 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu, 27 Aug 2009 19:50:43 +0000 (UTC)
Subject: rpms/fpc/F-11 fpc.spec,1.33,1.34
Message-ID: <20090827195043.A82DC11C0494@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29979

Modified Files:
	fpc.spec 
Log Message:
* Thu Aug 27 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-3
- Rebuild with new binutils in which build-id problem is fixed, bugzilla 501582



Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-11/fpc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- fpc.spec	18 Jun 2009 12:36:12 -0000	1.33
+++ fpc.spec	27 Aug 2009 19:50:42 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -177,6 +177,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Thu Aug 27 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-3
+- Rebuild with new binutils in which build-id problem is fixed, bugzilla 501582
+
 * Thu Jun 18 2009 Dan Horak <dan[at]danny.cz> 2.2.4-2
 - Exclude s390/s390x architectures
 



From bos at fedoraproject.org  Thu Aug 27 19:51:56 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Thu, 27 Aug 2009 19:51:56 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel ghc-OpenGL.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827195156.6ED9E11C00EB@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30853

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-OpenGL.spec 
Log Message:
ghc-OpenGL 2.2.1.1


--- NEW FILE ghc-OpenGL.spec ---
%global pkg_name OpenGL

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        2.2.1.1
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://www.haskell.org/haskellwiki/Opengl
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.
These provide bindings to the OpenGL graphics library.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.2.1.1-1
- initial packaging for Fedora created by cabal2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-OpenGL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:20:44 -0000	1.1
+++ .cvsignore	27 Aug 2009 19:51:56 -0000	1.2
@@ -0,0 +1 @@
+OpenGL-2.2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-OpenGL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:20:44 -0000	1.1
+++ sources	27 Aug 2009 19:51:56 -0000	1.2
@@ -0,0 +1 @@
+6819d1a6910c9c7cdd387fd51c11b017  OpenGL-2.2.1.1.tar.gz



From bos at fedoraproject.org  Thu Aug 27 19:52:37 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Thu, 27 Aug 2009 19:52:37 +0000 (UTC)
Subject: rpms/ghc-OpenGL/F-11 ghc-OpenGL.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090827195237.D4E5311C00EB@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-OpenGL/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31356

Modified Files:
	sources 
Added Files:
	ghc-OpenGL.spec 
Log Message:
ghc-OpenGL 2.2.1.1


--- NEW FILE ghc-OpenGL.spec ---
%global pkg_name OpenGL

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        2.2.1.1
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://www.haskell.org/haskellwiki/Opengl
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc
BuildRequires:  ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.
These provide bindings to the OpenGL graphics library.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
Requires:       ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.2.1.1-1
- initial packaging for Fedora created by cabal2spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-OpenGL/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:20:44 -0000	1.1
+++ sources	27 Aug 2009 19:52:37 -0000	1.2
@@ -0,0 +1 @@
+6819d1a6910c9c7cdd387fd51c11b017  OpenGL-2.2.1.1.tar.gz



From nhorman at fedoraproject.org  Thu Aug 27 19:58:57 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Thu, 27 Aug 2009 19:58:57 +0000 (UTC)
Subject: rpms/kexec-tools/F-11 kexec-tools.spec, 1.133, 1.134 mkdumprd, 1.27,
	1.28
Message-ID: <20090827195857.8B4CB11C00EB@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3001

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz 519767


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/kexec-tools.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kexec-tools.spec	7 Apr 2009 13:57:21 -0000	1.133
+++ kexec-tools.spec	27 Aug 2009 19:58:57 -0000	1.134
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@ done
 
 
 %changelog
+* Thu Aug 27 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-13
+- Fixed raid6 detection in mkdumprd (bz 519767)
+
 * Tue Apr 07 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-12
 - Simplifed rootfs mounting code in mkdumprd (bz 494416)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/mkdumprd,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mkdumprd	7 Apr 2009 13:57:21 -0000	1.27
+++ mkdumprd	27 Aug 2009 19:58:57 -0000	1.28
@@ -188,6 +188,9 @@ findmodule() {
 	findmodule ieee1394
 	findmodule ohci1394
 	modName="sbp2"
+    elif [ "$modName" = "raid6" ]; then
+        findmodule raid456
+        modName="raid456"
     else
 	moduledep $modName
 	for i in $deps; do



From athimm at fedoraproject.org  Thu Aug 27 20:01:14 2009
From: athimm at fedoraproject.org (athimm)
Date: Thu, 27 Aug 2009 20:01:14 +0000 (UTC)
Subject: rpms/fail2ban/F-11 fail2ban-0.8.3-inodecheck.patch, NONE,
	1.1 fail2ban-0.8.3-log2syslog.patch, NONE,
	1.1 fail2ban-logrotate, NONE, 1.1 fail2ban.spec, 1.17,
	1.18 sources, 1.9, 1.10
Message-ID: <20090827200114.9A02111C00ED@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4415/F-11

Modified Files:
	fail2ban.spec sources 
Added Files:
	fail2ban-0.8.3-inodecheck.patch 
	fail2ban-0.8.3-log2syslog.patch fail2ban-logrotate 
Log Message:
Fix bugs 491983, 515116, 503852

fail2ban-0.8.3-inodecheck.patch:
 filter.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE fail2ban-0.8.3-inodecheck.patch ---
--- fail2ban-0.8.3/server/filter.py.inodecheck	2009-08-27 20:50:22.000000000 +0200
+++ fail2ban-0.8.3/server/filter.py	2009-08-27 20:50:22.000000000 +0200
@@ -31,7 +31,7 @@
 from mytime import MyTime
 from failregex import FailRegex, Regex, RegexException
 
-import logging, re
+import logging, re, os
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.filter")
@@ -438,6 +438,8 @@
 		self.__handler = None
 		# Try to open the file. Raises an exception if an error occured.
 		handler = open(filename)
+		stats = os.fstat(handler.fileno())
+		self.__ino = stats.st_ino
 		try:
 			firstLine = handler.readline()
 			# Computes the MD5 of the first line.
@@ -464,10 +466,12 @@
 		firstLine = self.__handler.readline()
 		# Computes the MD5 of the first line.
 		myHash = md5.new(firstLine).digest()
-		# Compare hash.
-		if not self.__hash == myHash:
+		stats = os.fstat(self.__handler.fileno())
+		# Compare hash and inode
+		if self.__hash != myHash or self.__ino != stats.st_ino:
 			logSys.info("Log rotation detected for %s" % self.__filename)
 			self.__hash = myHash
+			self.__ino = stats.st_ino
 			self.__pos = 0
 		# Sets the file pointer to the last position.
 		self.__handler.seek(self.__pos)

fail2ban-0.8.3-log2syslog.patch:
 fail2ban.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fail2ban-0.8.3-log2syslog.patch ---
--- fail2ban-0.8.3/config/fail2ban.conf~	2008-02-27 22:44:55.000000000 +0100
+++ fail2ban-0.8.3/config/fail2ban.conf	2009-08-27 20:48:25.000000000 +0200
@@ -22,7 +22,7 @@
 #          Only one log target can be specified.
 # Values:  STDOUT STDERR SYSLOG file  Default:  /var/log/fail2ban.log
 #
-logtarget = /var/log/fail2ban.log
+logtarget = SYSLOG
 
 # Option: socket
 # Notes.: Set the socket file. This is used to communicate with the daemon. Do


--- NEW FILE fail2ban-logrotate ---
/var/log/fail2ban.log {
    missingok
    notifempty
    size 30k
    create 0600 root root
    postrotate
        /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
    endscript
}


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/fail2ban.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fail2ban.spec	24 Feb 2009 16:05:37 -0000	1.17
+++ fail2ban.spec	27 Aug 2009 20:01:14 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.8.3
-Release: 19%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
@@ -15,6 +15,8 @@ Patch1: fail2ban-0.8.1-sshd.patch
 #Patch2: fail2ban-0.8.1-sock.patch
 Patch3: fail2ban-0.8.2-fd_cloexec.patch
 Patch4: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch
+Patch5: fail2ban-0.8.3-inodecheck.patch
+Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildArch: noarch
@@ -35,6 +37,8 @@ failures. It updates firewall rules to r
 #patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
 %patch4 -p1 -b .CVE-2009-0362
+%patch5 -p1 -b .inodecheck
+%patch6 -p1 -b .log2syslog
 
 %build
 python setup.py build
@@ -84,8 +88,9 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
+- Log to syslog (RH bug #491983). Also deals with RH bug #515116.
+- Check inodes of log files (RH bug #503852).
 
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-18
 - Fix CVE-2009-0362 (Fedora bugs #485461, #485464, #485465, #485466).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	25 Aug 2008 09:20:30 -0000	1.9
+++ sources	27 Aug 2009 20:01:14 -0000	1.10
@@ -1,2 +1 @@
-1c87078f2c50497951ec46583020d723  fail2ban-logrotate
 b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2



From athimm at fedoraproject.org  Thu Aug 27 20:01:14 2009
From: athimm at fedoraproject.org (athimm)
Date: Thu, 27 Aug 2009 20:01:14 +0000 (UTC)
Subject: rpms/fail2ban/F-10 fail2ban-0.8.3-inodecheck.patch, NONE,
	1.1 fail2ban-0.8.3-log2syslog.patch, NONE,
	1.1 fail2ban-logrotate, NONE, 1.1 fail2ban.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <20090827200114.26E1611C00ED@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4415/F-10

Modified Files:
	fail2ban.spec sources 
Added Files:
	fail2ban-0.8.3-inodecheck.patch 
	fail2ban-0.8.3-log2syslog.patch fail2ban-logrotate 
Log Message:
Fix bugs 491983, 515116, 503852

fail2ban-0.8.3-inodecheck.patch:
 filter.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE fail2ban-0.8.3-inodecheck.patch ---
--- fail2ban-0.8.3/server/filter.py.inodecheck	2009-08-27 20:50:22.000000000 +0200
+++ fail2ban-0.8.3/server/filter.py	2009-08-27 20:50:22.000000000 +0200
@@ -31,7 +31,7 @@
 from mytime import MyTime
 from failregex import FailRegex, Regex, RegexException
 
-import logging, re
+import logging, re, os
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.filter")
@@ -438,6 +438,8 @@
 		self.__handler = None
 		# Try to open the file. Raises an exception if an error occured.
 		handler = open(filename)
+		stats = os.fstat(handler.fileno())
+		self.__ino = stats.st_ino
 		try:
 			firstLine = handler.readline()
 			# Computes the MD5 of the first line.
@@ -464,10 +466,12 @@
 		firstLine = self.__handler.readline()
 		# Computes the MD5 of the first line.
 		myHash = md5.new(firstLine).digest()
-		# Compare hash.
-		if not self.__hash == myHash:
+		stats = os.fstat(self.__handler.fileno())
+		# Compare hash and inode
+		if self.__hash != myHash or self.__ino != stats.st_ino:
 			logSys.info("Log rotation detected for %s" % self.__filename)
 			self.__hash = myHash
+			self.__ino = stats.st_ino
 			self.__pos = 0
 		# Sets the file pointer to the last position.
 		self.__handler.seek(self.__pos)

fail2ban-0.8.3-log2syslog.patch:
 fail2ban.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fail2ban-0.8.3-log2syslog.patch ---
--- fail2ban-0.8.3/config/fail2ban.conf~	2008-02-27 22:44:55.000000000 +0100
+++ fail2ban-0.8.3/config/fail2ban.conf	2009-08-27 20:48:25.000000000 +0200
@@ -22,7 +22,7 @@
 #          Only one log target can be specified.
 # Values:  STDOUT STDERR SYSLOG file  Default:  /var/log/fail2ban.log
 #
-logtarget = /var/log/fail2ban.log
+logtarget = SYSLOG
 
 # Option: socket
 # Notes.: Set the socket file. This is used to communicate with the daemon. Do


--- NEW FILE fail2ban-logrotate ---
/var/log/fail2ban.log {
    missingok
    notifempty
    size 30k
    create 0600 root root
    postrotate
        /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
    endscript
}


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-10/fail2ban.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fail2ban.spec	14 Feb 2009 07:13:55 -0000	1.15
+++ fail2ban.spec	27 Aug 2009 20:01:13 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.8.3
-Release: 18%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
@@ -15,6 +15,8 @@ Patch1: fail2ban-0.8.1-sshd.patch
 #Patch2: fail2ban-0.8.1-sock.patch
 Patch3: fail2ban-0.8.2-fd_cloexec.patch
 Patch4: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch
+Patch5: fail2ban-0.8.3-inodecheck.patch
+Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildArch: noarch
@@ -35,6 +37,8 @@ failures. It updates firewall rules to r
 #patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
 %patch4 -p1 -b .CVE-2009-0362
+%patch5 -p1 -b .inodecheck
+%patch6 -p1 -b .log2syslog
 
 %build
 python setup.py build
@@ -84,6 +88,10 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
+* Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
+- Log to syslog (RH bug #491983). Also deals with RH bug #515116.
+- Check inodes of log files (RH bug #503852).
+
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-18
 - Fix CVE-2009-0362 (Fedora bugs #485461, #485464, #485465, #485466).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	25 Aug 2008 09:20:30 -0000	1.9
+++ sources	27 Aug 2009 20:01:13 -0000	1.10
@@ -1,2 +1 @@
-1c87078f2c50497951ec46583020d723  fail2ban-logrotate
 b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2



From athimm at fedoraproject.org  Thu Aug 27 20:01:15 2009
From: athimm at fedoraproject.org (athimm)
Date: Thu, 27 Aug 2009 20:01:15 +0000 (UTC)
Subject: rpms/fail2ban/devel fail2ban-0.8.3-inodecheck.patch, NONE,
	1.1 fail2ban-0.8.3-log2syslog.patch, NONE,
	1.1 fail2ban-logrotate, NONE, 1.1 fail2ban.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <20090827200115.253E011C00ED@cvs1.fedora.phx.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fail2ban/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4415/devel

Modified Files:
	fail2ban.spec sources 
Added Files:
	fail2ban-0.8.3-inodecheck.patch 
	fail2ban-0.8.3-log2syslog.patch fail2ban-logrotate 
Log Message:
Fix bugs 491983, 515116, 503852

fail2ban-0.8.3-inodecheck.patch:
 filter.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE fail2ban-0.8.3-inodecheck.patch ---
--- fail2ban-0.8.3/server/filter.py.inodecheck	2009-08-27 20:50:22.000000000 +0200
+++ fail2ban-0.8.3/server/filter.py	2009-08-27 20:50:22.000000000 +0200
@@ -31,7 +31,7 @@
 from mytime import MyTime
 from failregex import FailRegex, Regex, RegexException
 
-import logging, re
+import logging, re, os
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban.filter")
@@ -438,6 +438,8 @@
 		self.__handler = None
 		# Try to open the file. Raises an exception if an error occured.
 		handler = open(filename)
+		stats = os.fstat(handler.fileno())
+		self.__ino = stats.st_ino
 		try:
 			firstLine = handler.readline()
 			# Computes the MD5 of the first line.
@@ -464,10 +466,12 @@
 		firstLine = self.__handler.readline()
 		# Computes the MD5 of the first line.
 		myHash = md5.new(firstLine).digest()
-		# Compare hash.
-		if not self.__hash == myHash:
+		stats = os.fstat(self.__handler.fileno())
+		# Compare hash and inode
+		if self.__hash != myHash or self.__ino != stats.st_ino:
 			logSys.info("Log rotation detected for %s" % self.__filename)
 			self.__hash = myHash
+			self.__ino = stats.st_ino
 			self.__pos = 0
 		# Sets the file pointer to the last position.
 		self.__handler.seek(self.__pos)

fail2ban-0.8.3-log2syslog.patch:
 fail2ban.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fail2ban-0.8.3-log2syslog.patch ---
--- fail2ban-0.8.3/config/fail2ban.conf~	2008-02-27 22:44:55.000000000 +0100
+++ fail2ban-0.8.3/config/fail2ban.conf	2009-08-27 20:48:25.000000000 +0200
@@ -22,7 +22,7 @@
 #          Only one log target can be specified.
 # Values:  STDOUT STDERR SYSLOG file  Default:  /var/log/fail2ban.log
 #
-logtarget = /var/log/fail2ban.log
+logtarget = SYSLOG
 
 # Option: socket
 # Notes.: Set the socket file. This is used to communicate with the daemon. Do


--- NEW FILE fail2ban-logrotate ---
/var/log/fail2ban.log {
    missingok
    notifempty
    size 30k
    create 0600 root root
    postrotate
        /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
    endscript
}


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/fail2ban.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fail2ban.spec	24 Jul 2009 22:29:44 -0000	1.18
+++ fail2ban.spec	27 Aug 2009 20:01:14 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.8.3
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
@@ -15,6 +15,8 @@ Patch1: fail2ban-0.8.1-sshd.patch
 #Patch2: fail2ban-0.8.1-sock.patch
 Patch3: fail2ban-0.8.2-fd_cloexec.patch
 Patch4: 0001-BF-anchoring-regex-for-IP-with-at-the-end.patch
+Patch5: fail2ban-0.8.3-inodecheck.patch
+Patch6: fail2ban-0.8.3-log2syslog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildArch: noarch
@@ -35,6 +37,8 @@ failures. It updates firewall rules to r
 #patch2 -p1 -b .sock
 %patch3 -p1 -b .fd_cloexec
 %patch4 -p1 -b .CVE-2009-0362
+%patch5 -p1 -b .inodecheck
+%patch6 -p1 -b .log2syslog
 
 %build
 python setup.py build
@@ -84,11 +88,9 @@ fi
 %dir %{_localstatedir}/run/fail2ban
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Aug 27 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-21
+- Log to syslog (RH bug #491983). Also deals with RH bug #515116.
+- Check inodes of log files (RH bug #503852).
 
 * Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.3-18
 - Fix CVE-2009-0362 (Fedora bugs #485461, #485464, #485465, #485466).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	25 Aug 2008 09:20:30 -0000	1.9
+++ sources	27 Aug 2009 20:01:14 -0000	1.10
@@ -1,2 +1 @@
-1c87078f2c50497951ec46583020d723  fail2ban-logrotate
 b438d7e2ce77a469fb0cca2a5cc0b81c  fail2ban-0.8.3.tar.bz2



From xavierb at fedoraproject.org  Thu Aug 27 20:14:22 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 27 Aug 2009 20:14:22 +0000 (UTC)
Subject: rpms/pnp4nagios/devel .cvsignore, 1.3, 1.4 pnp4nagios.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20090827201422.3ED4E11C00EB@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/pnp4nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13723

Modified Files:
	.cvsignore pnp4nagios.spec sources 
Log Message:
0.4.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2008 16:50:42 -0000	1.3
+++ .cvsignore	27 Aug 2009 20:14:21 -0000	1.4
@@ -1 +1 @@
-pnp-0.4.12.tar.gz
+pnp-0.4.14.tar.gz


Index: pnp4nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/pnp4nagios.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pnp4nagios.spec	26 Jul 2009 19:01:26 -0000	1.7
+++ pnp4nagios.spec	27 Aug 2009 20:14:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
-Version:        0.4.12
-Release:        4%{?dist}
+Version:        0.4.14
+Release:        1%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -10,11 +10,12 @@ Source0:        http://downloads.sourcef
 Source1:        pnp4nagios.logrotate.conf
 Source2:        pnp4nagios-npcd.sysvinit
 Source3:        pnp4nagios-README.fedora
+Patch1:         pnp4nagios-0.4.14-change_broker_install_location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  rrdtool
+BuildRequires:  rrdtool-perl
 Requires:       nagios
-Requires:       rrdtool
+Requires:       rrdtool-perl
 Requires:       php-gd
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -29,6 +30,7 @@ and stores them automatically into RRD-d
 
 %prep
 %setup -q -n pnp-%{version}
+%patch1 -p0
 cp -p %{SOURCE3} README.fedora
 sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \
     configure
@@ -93,6 +95,7 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios
 %attr(755,root,root) %{_initrddir}/npcd
 %attr(755,root,root) %{_sbindir}/npcd
+%{_libdir}/nagios/brokers/npcdmod.o
 %dir %{_libexecdir}/pnp4nagios
 %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl
 %attr(755,root,root) %{_libexecdir}/pnp4nagios/check_pnp_rrds.pl
@@ -103,6 +106,12 @@ fi
 
 
 %changelog
+* Tue Aug 27 2009 Xavier Bachelot <xavier at bachelot.org> 0.4.14-1
+- Update to 0.4.14.
+- Fix typo in README.fedora (RHBZ#490664).
+- Move npcdmod.o to a better place.
+- BR: rrdtool-perl
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Oct 2008 16:50:42 -0000	1.3
+++ sources	27 Aug 2009 20:14:22 -0000	1.4
@@ -1 +1 @@
-eb833a4769a5b58aad0ac53cae3e3e9f  pnp-0.4.12.tar.gz
+9dbbf08191a258f6798c9516b3821ff0  pnp-0.4.14.tar.gz



From hubbitus at fedoraproject.org  Thu Aug 27 20:14:26 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 27 Aug 2009 20:14:26 +0000 (UTC)
Subject: rpms/3proxy/devel 3proxy.cfg, NONE, 1.1 3proxy.init, NONE,
	1.1 3proxy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827201426.2F1F311C00EB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/3proxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13608/devel

Modified Files:
	.cvsignore sources 
Added Files:
	3proxy.cfg 3proxy.init 3proxy.spec import.log 
Log Message:
Initial import 3proxy into Fedora




--- NEW FILE 3proxy.cfg ---
# Yes, 3proxy.cfg can be executable, in this case you should place
# something like
#config /usr/local/3proxy/3proxy.cfg
# to show which configuration 3proxy should re-read on realod.

#system "echo Hello world!"
# you may use system to execute some external command if proxy starts

# We can configure nservers to avoid unsafe gethostbyname() usage
#nserver 10.1.2.1
#nserver 10.2.2.2
# nscache is good to save speed, traffic and bandwidth
nscache 65536

#nsrecord porno.security.nnov.ru 0.0.0.0
# nobody will be able to access porno.security.nnov.ru by the name.
#nsrecord wpad.security.nnov.ru www.security.nnov.ru
# wpad.security.nnov.ru will resolve to www.security.nnov.ru for
# clients


timeouts 1 5 30 60 180 1800 15 60
# Here we can change timeout values

users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9HyhcMHEe1"
# note that "" required, overvise $... is treated as include file name.
# $1$qwer$CHFTUFGqkjue9HyhcMHEe1 is 'test' in MD5 crypt format.
#users $/usr/local/etc/3proxy/passwd
# this example shows you how to include passwd file. For included files
# <CR> and <LF> are treated as field separators.

daemon
# now we will not depend on any console (daemonize). daemon must be given
# before any significant command on *nix.

#service
# service is required under NT if you want 3proxy to start as service

#log /usr/local/etc/3proxy/logs/3proxy.log D
log /var/log/3proxy/3proxy.log
# log allows to specify log file location and rotation, D means logfile
# is created daily

# in log file we want to have underscores instead of spaces
logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "L%d-%m-%Y %H:%M:%S %z %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "Linsert into log (l_date, l_user, l_service, l_in, l_out, l_descr) values ('%d-%m-%Y %H:%M:%S', '%U', '%N', %I, %O, '%T')"

archiver gz /bin/gzip %F
#archiver zip zip -m -qq %A %F
#archiver zip pkzipc -add -silent -move %A %F
#archiver rar rar a -df -inul %A %F
# if archiver specified log file will be compressed after closing.
# you should specify extension, path to archiver and command line, %A will be
# substituted with archive file name, %f - with original file name.
# Original file will not be removed, so archiver should care about it.

rotate 30
# We will keep last 30 log files

auth iponly
#auth nbname
#auth strong
# auth specifies type of user authentication. If you specify none proxy
# will not do anything to check name of the user. If you specify
# nbname proxy will send NetBIOS name request packet to UDP/137 of
# client and parse request for NetBIOS name of messanger service.
# Strong means that proxy will check password. For strong authentication
# unknown user will not be allowed to use proxy regardless of ACL.
# If you do not want username to be checked but wanna ACL to work you should
# specify auth iponly.


#allow ADMINISTRATOR,root
#allow * 127.0.0.1,192.168.1.1 * *
#redirect 192.168.1.2 80 * * * 80
#allow * 192.168.1.0/24 * 25,53,110,20-21,1024-65535
# we will allow everything if username matches ADMINISTRATOR or root or
# client ip is 127.0.0.1 or 192.168.1.1. Overwise we will redirect any request
# to port 80 to our Web-server 192.168.0.2.
# We will allow any outgoing connections from network 192.168.1.0/24 to
# SMTP, POP3, FTP, DNS and unprivileged ports.
# Note, that redirect may also be used with proxy or portmapper. It will
# allow you to redirect requests to different ports or different server
# for different clients.

#  sharing access to internet

#external 10.1.1.1
external 0.0.0.0
# external is address 3proxy uses for outgoing connections. 0.0.0.0 means any
# interface. Using 0.0.0.0 is not good because it allows to connect to 127.0.0.1

#internal 192.168.1.1
internal 127.0.0.1
# internal is address of interface proxy will listen for incoming requests
# 127.0.0.1 means only localhost will be able to use this proxy. This is
# address you should specify for clients as proxy IP.
# You MAY use 0.0.0.0 but you shouldn't, because it's a chance for you to
# have open proxy in your network in this case.

auth none
# no authentication is requires

dnspr

# dnsproxy listens on UDP/53 to answer client's DNS requests. It requires
# nserver/nscache configuration.


#external $./external.ip
#internal $./internal.ip
# this is just an alternative form fo giving external and internal address
# allows you to read this addresses from files

auth strong
# We want to protect internal interface
deny * * 127.0.0.1,192.168.1.1
# and llow HTTP and HTTPS traffic.
allow * * * 80-88,8080-8088 HTTP
allow * * * 443,8443 HTTPS
proxy -n

auth none
# pop3p will be used without any authentication. It's bad choice
# because it's possible to use pop3p to access any port
pop3p

tcppm 25 mail.my.provider 25
#udppm -s 53 ns.my.provider 53
# we can portmap port TCP/25 to provider's SMTP server and UDP/53
# to provider's DNS.
# Now we can use our proxy as SMTP and DNS server.
# -s switch for UDP means "single packet" service - instead of setting
# association for period of time association will only be set for 1 packet.
# It's very userfull for services like DNS but not for some massive services
# like multimedia streams or online games.

auth strong
flush
allow 3APA3A,test
maxconn 20
socks
# for socks we will use password authentication and different access control -
# we flush previously configured ACL list and create new one to allow users
# test and 3APA3A to connect from any location


auth strong
flush
internal 127.0.0.1
allow 3APA3A 127.0.0.1
maxconn 3
admin
#only allow acces to admin interface for user 3APA3A from 127.0.0.1 address
#via 127.0.0.1 address.

# map external 80 and 443 ports to internal Web server
# examples below show how to use 3proxy to publish Web server in internal
# network to Internet. We must switch internal and external addresses and
# flush any ACLs

#auth none
#flush
#external $./internal.ip
#internal $./external.ip
#maxconn 300
#tcppm 80 websrv 80
#tcppm 443 websrv 443


#chroot /usr/local/jail
#setgid 65535
#setuid 65535
# now we needn't any root rights. We can chroot and setgid/setuid.


###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######


--- NEW FILE 3proxy.init ---
#!/bin/sh
#
# Init file for Software Watchdog daemon.
#
# Written by Dag Wieers <dag at wieers.com>.
# Rewrote for ALT Linux by Pavlov Konstantin <thresh at altlinux.ru>
# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan at hubbitus.info>
#
# chkconfig: - 02 98
# description: 3proxy Proxy Server
#
# processname: 3proxy
# config: /etc/3proxy.cfg
# pidfile: /var/run/3proxy.pid

WITHOUT_RC_COMPAT=1

. /etc/init.d/functions

### Default variables
prog=3proxy
CONFIG=/etc/3proxy.cfg
PROXY=/usr/bin/3proxy
RETVAL=0
PIDFILE=/var/run/3proxy.pid
LOCKFILE=/var/lock/subsys/3proxy
#LOGFILE=/var/log/3proxy.log

start() {
	echo -n $"Starting $prog: "
	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && touch ${LOCKFILE}
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc -p "${PIDFILE}" -d 1 "$PROXY"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
	return $RETVAL
}

restart() {
	stop
	start
}

reload(){
	echo -n $"Reloading $prog: "
	killproc -p ${pidfile} $httpd -USR1
	RETVAL=$?
	echo
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
  	restart
	;;
  reload)
	reload
	;;
  condrestart)
	[ -e $LOCKFILE ] && restart
	RETVAL=$?
	;;
  status)
	status -p "$PIDFILE" "$PROXY"
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	RETVAL=1
	;;
esac

exit $RETVAL


--- NEW FILE 3proxy.spec ---
Name:		3proxy
Version:		0.6
Release:		3%{?dist}

Summary:		Tiny but very powerful proxy
Summary(ru):	?????????, ?? ?????? ?????? ??????-??????

License:		BSD or ASL 2.0 or GPLv2+ or LGPLv2+
Group:		System Environment/Daemons
Url:			http://3proxy.ru/?l=EN

Source0:		http://3proxy.ru/%{version}/%{name}-%{version}.tgz
Source1:		3proxy.init
Source2:		3proxy.cfg
# EPEL still require it
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	dos2unix

%description
3proxy -- light proxy server.
Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP,
POP3, UDP and TCP portmapping, access control, bandwith control, traffic
limitation and accounting based on username, client IP, target IP, day time,
day of week, etc.

%description -l ru
3proxy -- ????????? ?????? ??????.
??? ????????????? ??????? ?????????????? HTTP, HTTPS, SOCKS v4, SOCKS v4a,
SOCKS v5, FTP, POP3, UDP ? TCP ??????? ?????? (portmapping), ?????? ???????
?????????? ????????? ???????, ???????????? ??????? ? ???????????, ????????????
?? ????? ????????????, ?????????? IP ??????, IP ????, ??????? ???, ??? ??????
? ?.?.

%prep
%setup -q

# To use "fedora" CFLAGS (exported)
sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux

dos2unix Changelog

%build
%{__make} -f Makefile.Linux

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_man3dir}
mkdir -p %{buildroot}%{_man8dir}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
install -m755 -D src/ftppr %{buildroot}%{_bindir}/ftppr
install -m755 -D src/mycrypt %{buildroot}%{_bindir}/mycrypt
install -m755 -D src/pop3p %{buildroot}%{_bindir}/pop3p
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/proxy %{buildroot}%{_bindir}/htproxy
install -m755 -D src/socks %{buildroot}%{_bindir}/socks
install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm

install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg

%clean
rm -rf %{buildroot}

%post
# Register service
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%files
%defattr(-,root,root,-)
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_localstatedir}/log/%{name}
%doc Readme Changelog authors copying news

%changelog
* Thu Aug 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-3
- Fedora Review started - thank you Peter Lemenkov.
- Change rights (0755->0644) of config.
- Disable service by default.
- Add BR dos2unix.

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-2
- /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy-bin.
- Add Source2: 3proxy.cfg from Alt Linux (slightly modified) - http://sisyphus.ru/ru/srpm/Sisyphus/3proxy/sources/1 (thanks to Afanasov Dmitry).
- Add log-dir %%{_localstatedir}/log/%%{name}

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-1
- Ressurect old spec. New version 0.6.
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release and add %%{?dist}.
- Change summary, description, URL. Add Russian localisation of sumamry and description.
- Strip some old comments.
- Add to %%doc Readme Changelog authors copying news.
- Turn macros usage from %%name to %%{name} for consistence.
- Change group from System/Servers to standard System Environment/Daemons.
- Add %%defattr(-,root,root,-) in %%files section.
- Add cleanup in %%install section.
- Add %%clean section with cleanup buildroot.
- License changed from just GPL to "BSD or ASL 2.0 or GPLv2+ or LGPLv2+" (according to Makefile.Linux)
- Add %%config(noreplace) mark to all configs.
- Add file %%{_initdir}/%%{name}
- Old %%{_initdir} macros replaced by %%{_initrddir}
- Hack makefile to use system CFLAGS.
- Add %%post/%%postun sections.

* Fri Jan 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.5.3k
- Import from ftp://ftp.nluug.nl/pub/os/Linux/distr/altlinux/4.0/Server/4.0.1/files/SRPMS/3proxy-0.5.3h-alt1.src.rpm
	Combine with ftp://ftp.pbone.net/mirror/ftp.sourceforge.net/pub/sourceforge/t/th/three-proxy/3proxy-0.5.3g-1.src.rpm
- Steep to version 0.5.3k
- Comment out packager
- Reformat header of spec with tabs
- Add desc from second src.rpm of import
- Correct source0
- Add -c key fo %%setup macro
- Add BuildRoot definition (this is not ALT)
- Change
	Release:	alt1
	to
	Release:	0.Hu.0

* Fri Apr 13 2007 Lunar Child <luch at altlinux.ru> 0.5.3h-alt1
- new version

* Wed Mar 21 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt2
- Added init script.
- Added new trivial config file.

* Tue Mar 20 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt1
- First build for ALT Linux Sisyphus


--- NEW FILE import.log ---
proxy-0_6-3_fc11:HEAD:3proxy-0.6-3.fc11.src.rpm:1251404030


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:17:25 -0000	1.1
+++ .cvsignore	27 Aug 2009 20:14:25 -0000	1.2
@@ -0,0 +1 @@
+3proxy-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:17:25 -0000	1.1
+++ sources	27 Aug 2009 20:14:26 -0000	1.2
@@ -0,0 +1 @@
+2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz



From xavierb at fedoraproject.org  Thu Aug 27 20:15:35 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 27 Aug 2009 20:15:35 +0000 (UTC)
Subject: rpms/pnp4nagios/devel
	pnp4nagios-0.4.14-change_broker_install_location.patch, NONE, 1.1
Message-ID: <20090827201535.8B18C11C00EB@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/pnp4nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14649

Added Files:
	pnp4nagios-0.4.14-change_broker_install_location.patch 
Log Message:
patch to move the broker module in a proper location

pnp4nagios-0.4.14-change_broker_install_location.patch:
 Makefile.in |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE pnp4nagios-0.4.14-change_broker_install_location.patch ---
--- src/Makefile.in.orig	2009-05-02 11:25:23.000000000 +0200
+++ src/Makefile.in	2009-08-27 20:57:47.000000000 +0200
@@ -33,6 +33,7 @@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
+LIBDIR=@libdir@
 LIBEXECDIR=@libexecdir@
 CGIDIR=@sbindir@
 INSTALL=@INSTALL@
@@ -115,17 +116,17 @@
 
 install:
 	$(MAKE) install-basic
-	$(MAKE) strip-post-install
 
 install-unstripped:
 	$(MAKE) install-basic
 
 install-basic:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/nagios/brokers
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
 	$(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(LIBDIR)/nagios/brokers
 
 strip-post-install:
 	$(STRIP) $(DESTDIR)$(BINDIR)/@npcd_name@
-	$(STRIP) $(DESTDIR)$(BINDIR)/npcdmod.o
+	$(STRIP) $(DESTDIR)$(LIBDIR)/nagios/brokers/npcdmod.o



From cebbert at fedoraproject.org  Thu Aug 27 20:23:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 27 Aug 2009 20:23:31 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch,
	NONE, 1.1 kernel.spec, 1.1719, 1.1720
Message-ID: <20090827202331.3301B11C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19714

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch 
Log Message:
linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch:
  fix race in kthreads.

linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch:
 kthread.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch ---
Date	Mon, 24 Aug 2009 12:45:29 +0200
From	Oleg Nesterov <>
Subject	[PATCH -stable] kthreads: fix kthread_create() vs kthread_stop() race

The bug should be "accidently" fixed by recent changes in 2.6.31,
all kernels <= 2.6.30 need the fix. The problem was never noticed before,
it was found because it causes mysterious failures with GFS mount/umount.

Credits to Robert Peterson. He blaimed kthread.c from the very beginning.
But, despite my promise, I forgot to inspect the old implementation until
he did a lot of testing and reminded me. This led to huge delay in fixing
this bug.

kthread_stop() does put_task_struct(k) before it clears kthread_stop_info.k.
This means another kthread_create() can re-use this task_struct, but the
new kthread can still see kthread_should_stop() == T and exit even without
calling threadfn().

Reported-by: Robert Peterson <rpeterso at redhat.com>
Tested-by: Robert Peterson <rpeterso at redhat.com>
Signed-off-by: Oleg Nesterov <oleg at redhat.com>

--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -216,12 +216,12 @@ int kthread_stop(struct task_struct *k)
 	/* Now set kthread_should_stop() to true, and wake it up. */
 	kthread_stop_info.k = k;
 	wake_up_process(k);
-	put_task_struct(k);
 
 	/* Once it dies, reset stop ptr, gather result and we're done. */
 	wait_for_completion(&kthread_stop_info.done);
 	kthread_stop_info.k = NULL;
 	ret = kthread_stop_info.err;
+	put_task_struct(k);
 	mutex_unlock(&kthread_stop_lock);
 
 	trace_sched_kthread_stop_ret(ret);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1719
retrieving revision 1.1720
diff -u -p -r1.1719 -r1.1720
--- kernel.spec	27 Aug 2009 19:40:55 -0000	1.1719
+++ kernel.spec	27 Aug 2009 20:23:30 -0000	1.1720
@@ -735,6 +735,10 @@ Patch14040: linux-2.6-clone-fix-race-bet
 # Fix string overflows found by stackprotector:
 Patch14050: hda-check-strcpy-length.patch
 Patch14060: linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
+
+# fix race in kthreads
+Patch14070: linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1362,6 +1366,9 @@ ApplyPatch linux-2.6-clone-fix-race-betw
 ApplyPatch hda-check-strcpy-length.patch
 ApplyPatch linux-2.6-v4l-dvb-af9015-fix-stack-corruption.patch
 
+# fix race in kthreads
+ApplyPatch linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1947,6 +1954,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-41
+- linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch:
+  fix race in kthreads.
+
 * Thu Aug 27 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.30.5-40
 - xen: Fix guest crash when trying to debug. (#458385)
 



From wtogami at fedoraproject.org  Thu Aug 27 20:28:47 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 27 Aug 2009 20:28:47 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.511,1.512
Message-ID: <20090827202847.ABCD611C00EB@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22863

Modified Files:
	cups.spec 
Log Message:
rebuild



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- cups.spec	27 Aug 2009 15:36:35 -0000	1.511
+++ cups.spec	27 Aug 2009 20:28:47 -0000	1.512
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.20%{?dist}
+Release: 0.%{pre}.21%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -538,6 +538,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Aug 27 2009 Warren Togami <wtogami at redhat.com> 1:1.4-0.rc1.21
+- rebuild
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.20
 - Fixed admin.cgi crash when modifying a class (bug #519724,
   STR #3312, patch from Jiri Popelka).



From hubbitus at fedoraproject.org  Thu Aug 27 20:37:12 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 27 Aug 2009 20:37:12 +0000 (UTC)
Subject: rpms/3proxy/F-10 3proxy.cfg, NONE, 1.1 3proxy.init, NONE,
	1.1 3proxy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827203712.9363711C00EB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/3proxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28005/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	3proxy.cfg 3proxy.init 3proxy.spec import.log 
Log Message:
Initial import 3proxy into Fedora




--- NEW FILE 3proxy.cfg ---
# Yes, 3proxy.cfg can be executable, in this case you should place
# something like
#config /usr/local/3proxy/3proxy.cfg
# to show which configuration 3proxy should re-read on realod.

#system "echo Hello world!"
# you may use system to execute some external command if proxy starts

# We can configure nservers to avoid unsafe gethostbyname() usage
#nserver 10.1.2.1
#nserver 10.2.2.2
# nscache is good to save speed, traffic and bandwidth
nscache 65536

#nsrecord porno.security.nnov.ru 0.0.0.0
# nobody will be able to access porno.security.nnov.ru by the name.
#nsrecord wpad.security.nnov.ru www.security.nnov.ru
# wpad.security.nnov.ru will resolve to www.security.nnov.ru for
# clients


timeouts 1 5 30 60 180 1800 15 60
# Here we can change timeout values

users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9HyhcMHEe1"
# note that "" required, overvise $... is treated as include file name.
# $1$qwer$CHFTUFGqkjue9HyhcMHEe1 is 'test' in MD5 crypt format.
#users $/usr/local/etc/3proxy/passwd
# this example shows you how to include passwd file. For included files
# <CR> and <LF> are treated as field separators.

daemon
# now we will not depend on any console (daemonize). daemon must be given
# before any significant command on *nix.

#service
# service is required under NT if you want 3proxy to start as service

#log /usr/local/etc/3proxy/logs/3proxy.log D
log /var/log/3proxy/3proxy.log
# log allows to specify log file location and rotation, D means logfile
# is created daily

# in log file we want to have underscores instead of spaces
logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "L%d-%m-%Y %H:%M:%S %z %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "Linsert into log (l_date, l_user, l_service, l_in, l_out, l_descr) values ('%d-%m-%Y %H:%M:%S', '%U', '%N', %I, %O, '%T')"

archiver gz /bin/gzip %F
#archiver zip zip -m -qq %A %F
#archiver zip pkzipc -add -silent -move %A %F
#archiver rar rar a -df -inul %A %F
# if archiver specified log file will be compressed after closing.
# you should specify extension, path to archiver and command line, %A will be
# substituted with archive file name, %f - with original file name.
# Original file will not be removed, so archiver should care about it.

rotate 30
# We will keep last 30 log files

auth iponly
#auth nbname
#auth strong
# auth specifies type of user authentication. If you specify none proxy
# will not do anything to check name of the user. If you specify
# nbname proxy will send NetBIOS name request packet to UDP/137 of
# client and parse request for NetBIOS name of messanger service.
# Strong means that proxy will check password. For strong authentication
# unknown user will not be allowed to use proxy regardless of ACL.
# If you do not want username to be checked but wanna ACL to work you should
# specify auth iponly.


#allow ADMINISTRATOR,root
#allow * 127.0.0.1,192.168.1.1 * *
#redirect 192.168.1.2 80 * * * 80
#allow * 192.168.1.0/24 * 25,53,110,20-21,1024-65535
# we will allow everything if username matches ADMINISTRATOR or root or
# client ip is 127.0.0.1 or 192.168.1.1. Overwise we will redirect any request
# to port 80 to our Web-server 192.168.0.2.
# We will allow any outgoing connections from network 192.168.1.0/24 to
# SMTP, POP3, FTP, DNS and unprivileged ports.
# Note, that redirect may also be used with proxy or portmapper. It will
# allow you to redirect requests to different ports or different server
# for different clients.

#  sharing access to internet

#external 10.1.1.1
external 0.0.0.0
# external is address 3proxy uses for outgoing connections. 0.0.0.0 means any
# interface. Using 0.0.0.0 is not good because it allows to connect to 127.0.0.1

#internal 192.168.1.1
internal 127.0.0.1
# internal is address of interface proxy will listen for incoming requests
# 127.0.0.1 means only localhost will be able to use this proxy. This is
# address you should specify for clients as proxy IP.
# You MAY use 0.0.0.0 but you shouldn't, because it's a chance for you to
# have open proxy in your network in this case.

auth none
# no authentication is requires

dnspr

# dnsproxy listens on UDP/53 to answer client's DNS requests. It requires
# nserver/nscache configuration.


#external $./external.ip
#internal $./internal.ip
# this is just an alternative form fo giving external and internal address
# allows you to read this addresses from files

auth strong
# We want to protect internal interface
deny * * 127.0.0.1,192.168.1.1
# and llow HTTP and HTTPS traffic.
allow * * * 80-88,8080-8088 HTTP
allow * * * 443,8443 HTTPS
proxy -n

auth none
# pop3p will be used without any authentication. It's bad choice
# because it's possible to use pop3p to access any port
pop3p

tcppm 25 mail.my.provider 25
#udppm -s 53 ns.my.provider 53
# we can portmap port TCP/25 to provider's SMTP server and UDP/53
# to provider's DNS.
# Now we can use our proxy as SMTP and DNS server.
# -s switch for UDP means "single packet" service - instead of setting
# association for period of time association will only be set for 1 packet.
# It's very userfull for services like DNS but not for some massive services
# like multimedia streams or online games.

auth strong
flush
allow 3APA3A,test
maxconn 20
socks
# for socks we will use password authentication and different access control -
# we flush previously configured ACL list and create new one to allow users
# test and 3APA3A to connect from any location


auth strong
flush
internal 127.0.0.1
allow 3APA3A 127.0.0.1
maxconn 3
admin
#only allow acces to admin interface for user 3APA3A from 127.0.0.1 address
#via 127.0.0.1 address.

# map external 80 and 443 ports to internal Web server
# examples below show how to use 3proxy to publish Web server in internal
# network to Internet. We must switch internal and external addresses and
# flush any ACLs

#auth none
#flush
#external $./internal.ip
#internal $./external.ip
#maxconn 300
#tcppm 80 websrv 80
#tcppm 443 websrv 443


#chroot /usr/local/jail
#setgid 65535
#setuid 65535
# now we needn't any root rights. We can chroot and setgid/setuid.


###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######


--- NEW FILE 3proxy.init ---
#!/bin/sh
#
# Init file for Software Watchdog daemon.
#
# Written by Dag Wieers <dag at wieers.com>.
# Rewrote for ALT Linux by Pavlov Konstantin <thresh at altlinux.ru>
# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan at hubbitus.info>
#
# chkconfig: - 02 98
# description: 3proxy Proxy Server
#
# processname: 3proxy
# config: /etc/3proxy.cfg
# pidfile: /var/run/3proxy.pid

WITHOUT_RC_COMPAT=1

. /etc/init.d/functions

### Default variables
prog=3proxy
CONFIG=/etc/3proxy.cfg
PROXY=/usr/bin/3proxy
RETVAL=0
PIDFILE=/var/run/3proxy.pid
LOCKFILE=/var/lock/subsys/3proxy
#LOGFILE=/var/log/3proxy.log

start() {
	echo -n $"Starting $prog: "
	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && touch ${LOCKFILE}
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc -p "${PIDFILE}" -d 1 "$PROXY"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
	return $RETVAL
}

restart() {
	stop
	start
}

reload(){
	echo -n $"Reloading $prog: "
	killproc -p ${pidfile} $httpd -USR1
	RETVAL=$?
	echo
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
  	restart
	;;
  reload)
	reload
	;;
  condrestart)
	[ -e $LOCKFILE ] && restart
	RETVAL=$?
	;;
  status)
	status -p "$PIDFILE" "$PROXY"
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	RETVAL=1
	;;
esac

exit $RETVAL


--- NEW FILE 3proxy.spec ---
Name:		3proxy
Version:		0.6
Release:		3%{?dist}

Summary:		Tiny but very powerful proxy
Summary(ru):	?????????, ?? ?????? ?????? ??????-??????

License:		BSD or ASL 2.0 or GPLv2+ or LGPLv2+
Group:		System Environment/Daemons
Url:			http://3proxy.ru/?l=EN

Source0:		http://3proxy.ru/%{version}/%{name}-%{version}.tgz
Source1:		3proxy.init
Source2:		3proxy.cfg
# EPEL still require it
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	dos2unix

%description
3proxy -- light proxy server.
Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP,
POP3, UDP and TCP portmapping, access control, bandwith control, traffic
limitation and accounting based on username, client IP, target IP, day time,
day of week, etc.

%description -l ru
3proxy -- ????????? ?????? ??????.
??? ????????????? ??????? ?????????????? HTTP, HTTPS, SOCKS v4, SOCKS v4a,
SOCKS v5, FTP, POP3, UDP ? TCP ??????? ?????? (portmapping), ?????? ???????
?????????? ????????? ???????, ???????????? ??????? ? ???????????, ????????????
?? ????? ????????????, ?????????? IP ??????, IP ????, ??????? ???, ??? ??????
? ?.?.

%prep
%setup -q

# To use "fedora" CFLAGS (exported)
sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux

dos2unix Changelog

%build
%{__make} -f Makefile.Linux

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_man3dir}
mkdir -p %{buildroot}%{_man8dir}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
install -m755 -D src/ftppr %{buildroot}%{_bindir}/ftppr
install -m755 -D src/mycrypt %{buildroot}%{_bindir}/mycrypt
install -m755 -D src/pop3p %{buildroot}%{_bindir}/pop3p
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/proxy %{buildroot}%{_bindir}/htproxy
install -m755 -D src/socks %{buildroot}%{_bindir}/socks
install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm

install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg

%clean
rm -rf %{buildroot}

%post
# Register service
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%files
%defattr(-,root,root,-)
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_localstatedir}/log/%{name}
%doc Readme Changelog authors copying news

%changelog
* Thu Aug 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-3
- Fedora Review started - thank you Peter Lemenkov.
- Change rights (0755->0644) of config.
- Disable service by default.
- Add BR dos2unix.

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-2
- /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy-bin.
- Add Source2: 3proxy.cfg from Alt Linux (slightly modified) - http://sisyphus.ru/ru/srpm/Sisyphus/3proxy/sources/1 (thanks to Afanasov Dmitry).
- Add log-dir %%{_localstatedir}/log/%%{name}

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-1
- Ressurect old spec. New version 0.6.
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release and add %%{?dist}.
- Change summary, description, URL. Add Russian localisation of sumamry and description.
- Strip some old comments.
- Add to %%doc Readme Changelog authors copying news.
- Turn macros usage from %%name to %%{name} for consistence.
- Change group from System/Servers to standard System Environment/Daemons.
- Add %%defattr(-,root,root,-) in %%files section.
- Add cleanup in %%install section.
- Add %%clean section with cleanup buildroot.
- License changed from just GPL to "BSD or ASL 2.0 or GPLv2+ or LGPLv2+" (according to Makefile.Linux)
- Add %%config(noreplace) mark to all configs.
- Add file %%{_initdir}/%%{name}
- Old %%{_initdir} macros replaced by %%{_initrddir}
- Hack makefile to use system CFLAGS.
- Add %%post/%%postun sections.

* Fri Jan 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.5.3k
- Import from ftp://ftp.nluug.nl/pub/os/Linux/distr/altlinux/4.0/Server/4.0.1/files/SRPMS/3proxy-0.5.3h-alt1.src.rpm
	Combine with ftp://ftp.pbone.net/mirror/ftp.sourceforge.net/pub/sourceforge/t/th/three-proxy/3proxy-0.5.3g-1.src.rpm
- Steep to version 0.5.3k
- Comment out packager
- Reformat header of spec with tabs
- Add desc from second src.rpm of import
- Correct source0
- Add -c key fo %%setup macro
- Add BuildRoot definition (this is not ALT)
- Change
	Release:	alt1
	to
	Release:	0.Hu.0

* Fri Apr 13 2007 Lunar Child <luch at altlinux.ru> 0.5.3h-alt1
- new version

* Wed Mar 21 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt2
- Added init script.
- Added new trivial config file.

* Tue Mar 20 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt1
- First build for ALT Linux Sisyphus


--- NEW FILE import.log ---
proxy-0_6-3_fc11:F-10:3proxy-0.6-3.fc11.src.rpm:1251404165


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:17:25 -0000	1.1
+++ .cvsignore	27 Aug 2009 20:37:12 -0000	1.2
@@ -0,0 +1 @@
+3proxy-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:17:25 -0000	1.1
+++ sources	27 Aug 2009 20:37:12 -0000	1.2
@@ -0,0 +1 @@
+2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz



From hubbitus at fedoraproject.org  Thu Aug 27 20:39:06 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 27 Aug 2009 20:39:06 +0000 (UTC)
Subject: rpms/3proxy/F-11 3proxy.cfg, NONE, 1.1 3proxy.init, NONE,
	1.1 3proxy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827203906.98D2C11C00EB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/3proxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29375/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	3proxy.cfg 3proxy.init 3proxy.spec import.log 
Log Message:
Initial import 3proxy into Fedora




--- NEW FILE 3proxy.cfg ---
# Yes, 3proxy.cfg can be executable, in this case you should place
# something like
#config /usr/local/3proxy/3proxy.cfg
# to show which configuration 3proxy should re-read on realod.

#system "echo Hello world!"
# you may use system to execute some external command if proxy starts

# We can configure nservers to avoid unsafe gethostbyname() usage
#nserver 10.1.2.1
#nserver 10.2.2.2
# nscache is good to save speed, traffic and bandwidth
nscache 65536

#nsrecord porno.security.nnov.ru 0.0.0.0
# nobody will be able to access porno.security.nnov.ru by the name.
#nsrecord wpad.security.nnov.ru www.security.nnov.ru
# wpad.security.nnov.ru will resolve to www.security.nnov.ru for
# clients


timeouts 1 5 30 60 180 1800 15 60
# Here we can change timeout values

users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9HyhcMHEe1"
# note that "" required, overvise $... is treated as include file name.
# $1$qwer$CHFTUFGqkjue9HyhcMHEe1 is 'test' in MD5 crypt format.
#users $/usr/local/etc/3proxy/passwd
# this example shows you how to include passwd file. For included files
# <CR> and <LF> are treated as field separators.

daemon
# now we will not depend on any console (daemonize). daemon must be given
# before any significant command on *nix.

#service
# service is required under NT if you want 3proxy to start as service

#log /usr/local/etc/3proxy/logs/3proxy.log D
log /var/log/3proxy/3proxy.log
# log allows to specify log file location and rotation, D means logfile
# is created daily

# in log file we want to have underscores instead of spaces
logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "L%d-%m-%Y %H:%M:%S %z %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "Linsert into log (l_date, l_user, l_service, l_in, l_out, l_descr) values ('%d-%m-%Y %H:%M:%S', '%U', '%N', %I, %O, '%T')"

archiver gz /bin/gzip %F
#archiver zip zip -m -qq %A %F
#archiver zip pkzipc -add -silent -move %A %F
#archiver rar rar a -df -inul %A %F
# if archiver specified log file will be compressed after closing.
# you should specify extension, path to archiver and command line, %A will be
# substituted with archive file name, %f - with original file name.
# Original file will not be removed, so archiver should care about it.

rotate 30
# We will keep last 30 log files

auth iponly
#auth nbname
#auth strong
# auth specifies type of user authentication. If you specify none proxy
# will not do anything to check name of the user. If you specify
# nbname proxy will send NetBIOS name request packet to UDP/137 of
# client and parse request for NetBIOS name of messanger service.
# Strong means that proxy will check password. For strong authentication
# unknown user will not be allowed to use proxy regardless of ACL.
# If you do not want username to be checked but wanna ACL to work you should
# specify auth iponly.


#allow ADMINISTRATOR,root
#allow * 127.0.0.1,192.168.1.1 * *
#redirect 192.168.1.2 80 * * * 80
#allow * 192.168.1.0/24 * 25,53,110,20-21,1024-65535
# we will allow everything if username matches ADMINISTRATOR or root or
# client ip is 127.0.0.1 or 192.168.1.1. Overwise we will redirect any request
# to port 80 to our Web-server 192.168.0.2.
# We will allow any outgoing connections from network 192.168.1.0/24 to
# SMTP, POP3, FTP, DNS and unprivileged ports.
# Note, that redirect may also be used with proxy or portmapper. It will
# allow you to redirect requests to different ports or different server
# for different clients.

#  sharing access to internet

#external 10.1.1.1
external 0.0.0.0
# external is address 3proxy uses for outgoing connections. 0.0.0.0 means any
# interface. Using 0.0.0.0 is not good because it allows to connect to 127.0.0.1

#internal 192.168.1.1
internal 127.0.0.1
# internal is address of interface proxy will listen for incoming requests
# 127.0.0.1 means only localhost will be able to use this proxy. This is
# address you should specify for clients as proxy IP.
# You MAY use 0.0.0.0 but you shouldn't, because it's a chance for you to
# have open proxy in your network in this case.

auth none
# no authentication is requires

dnspr

# dnsproxy listens on UDP/53 to answer client's DNS requests. It requires
# nserver/nscache configuration.


#external $./external.ip
#internal $./internal.ip
# this is just an alternative form fo giving external and internal address
# allows you to read this addresses from files

auth strong
# We want to protect internal interface
deny * * 127.0.0.1,192.168.1.1
# and llow HTTP and HTTPS traffic.
allow * * * 80-88,8080-8088 HTTP
allow * * * 443,8443 HTTPS
proxy -n

auth none
# pop3p will be used without any authentication. It's bad choice
# because it's possible to use pop3p to access any port
pop3p

tcppm 25 mail.my.provider 25
#udppm -s 53 ns.my.provider 53
# we can portmap port TCP/25 to provider's SMTP server and UDP/53
# to provider's DNS.
# Now we can use our proxy as SMTP and DNS server.
# -s switch for UDP means "single packet" service - instead of setting
# association for period of time association will only be set for 1 packet.
# It's very userfull for services like DNS but not for some massive services
# like multimedia streams or online games.

auth strong
flush
allow 3APA3A,test
maxconn 20
socks
# for socks we will use password authentication and different access control -
# we flush previously configured ACL list and create new one to allow users
# test and 3APA3A to connect from any location


auth strong
flush
internal 127.0.0.1
allow 3APA3A 127.0.0.1
maxconn 3
admin
#only allow acces to admin interface for user 3APA3A from 127.0.0.1 address
#via 127.0.0.1 address.

# map external 80 and 443 ports to internal Web server
# examples below show how to use 3proxy to publish Web server in internal
# network to Internet. We must switch internal and external addresses and
# flush any ACLs

#auth none
#flush
#external $./internal.ip
#internal $./external.ip
#maxconn 300
#tcppm 80 websrv 80
#tcppm 443 websrv 443


#chroot /usr/local/jail
#setgid 65535
#setuid 65535
# now we needn't any root rights. We can chroot and setgid/setuid.


###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######


--- NEW FILE 3proxy.init ---
#!/bin/sh
#
# Init file for Software Watchdog daemon.
#
# Written by Dag Wieers <dag at wieers.com>.
# Rewrote for ALT Linux by Pavlov Konstantin <thresh at altlinux.ru>
# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan at hubbitus.info>
#
# chkconfig: - 02 98
# description: 3proxy Proxy Server
#
# processname: 3proxy
# config: /etc/3proxy.cfg
# pidfile: /var/run/3proxy.pid

WITHOUT_RC_COMPAT=1

. /etc/init.d/functions

### Default variables
prog=3proxy
CONFIG=/etc/3proxy.cfg
PROXY=/usr/bin/3proxy
RETVAL=0
PIDFILE=/var/run/3proxy.pid
LOCKFILE=/var/lock/subsys/3proxy
#LOGFILE=/var/log/3proxy.log

start() {
	echo -n $"Starting $prog: "
	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && touch ${LOCKFILE}
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc -p "${PIDFILE}" -d 1 "$PROXY"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
	return $RETVAL
}

restart() {
	stop
	start
}

reload(){
	echo -n $"Reloading $prog: "
	killproc -p ${pidfile} $httpd -USR1
	RETVAL=$?
	echo
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
  	restart
	;;
  reload)
	reload
	;;
  condrestart)
	[ -e $LOCKFILE ] && restart
	RETVAL=$?
	;;
  status)
	status -p "$PIDFILE" "$PROXY"
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	RETVAL=1
	;;
esac

exit $RETVAL


--- NEW FILE 3proxy.spec ---
Name:		3proxy
Version:		0.6
Release:		3%{?dist}

Summary:		Tiny but very powerful proxy
Summary(ru):	?????????, ?? ?????? ?????? ??????-??????

License:		BSD or ASL 2.0 or GPLv2+ or LGPLv2+
Group:		System Environment/Daemons
Url:			http://3proxy.ru/?l=EN

Source0:		http://3proxy.ru/%{version}/%{name}-%{version}.tgz
Source1:		3proxy.init
Source2:		3proxy.cfg
# EPEL still require it
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	dos2unix

%description
3proxy -- light proxy server.
Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP,
POP3, UDP and TCP portmapping, access control, bandwith control, traffic
limitation and accounting based on username, client IP, target IP, day time,
day of week, etc.

%description -l ru
3proxy -- ????????? ?????? ??????.
??? ????????????? ??????? ?????????????? HTTP, HTTPS, SOCKS v4, SOCKS v4a,
SOCKS v5, FTP, POP3, UDP ? TCP ??????? ?????? (portmapping), ?????? ???????
?????????? ????????? ???????, ???????????? ??????? ? ???????????, ????????????
?? ????? ????????????, ?????????? IP ??????, IP ????, ??????? ???, ??? ??????
? ?.?.

%prep
%setup -q

# To use "fedora" CFLAGS (exported)
sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux

dos2unix Changelog

%build
%{__make} -f Makefile.Linux

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_man3dir}
mkdir -p %{buildroot}%{_man8dir}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
install -m755 -D src/ftppr %{buildroot}%{_bindir}/ftppr
install -m755 -D src/mycrypt %{buildroot}%{_bindir}/mycrypt
install -m755 -D src/pop3p %{buildroot}%{_bindir}/pop3p
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/proxy %{buildroot}%{_bindir}/htproxy
install -m755 -D src/socks %{buildroot}%{_bindir}/socks
install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm

install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg

%clean
rm -rf %{buildroot}

%post
# Register service
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%files
%defattr(-,root,root,-)
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_localstatedir}/log/%{name}
%doc Readme Changelog authors copying news

%changelog
* Thu Aug 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-3
- Fedora Review started - thank you Peter Lemenkov.
- Change rights (0755->0644) of config.
- Disable service by default.
- Add BR dos2unix.

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-2
- /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy-bin.
- Add Source2: 3proxy.cfg from Alt Linux (slightly modified) - http://sisyphus.ru/ru/srpm/Sisyphus/3proxy/sources/1 (thanks to Afanasov Dmitry).
- Add log-dir %%{_localstatedir}/log/%%{name}

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-1
- Ressurect old spec. New version 0.6.
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release and add %%{?dist}.
- Change summary, description, URL. Add Russian localisation of sumamry and description.
- Strip some old comments.
- Add to %%doc Readme Changelog authors copying news.
- Turn macros usage from %%name to %%{name} for consistence.
- Change group from System/Servers to standard System Environment/Daemons.
- Add %%defattr(-,root,root,-) in %%files section.
- Add cleanup in %%install section.
- Add %%clean section with cleanup buildroot.
- License changed from just GPL to "BSD or ASL 2.0 or GPLv2+ or LGPLv2+" (according to Makefile.Linux)
- Add %%config(noreplace) mark to all configs.
- Add file %%{_initdir}/%%{name}
- Old %%{_initdir} macros replaced by %%{_initrddir}
- Hack makefile to use system CFLAGS.
- Add %%post/%%postun sections.

* Fri Jan 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.5.3k
- Import from ftp://ftp.nluug.nl/pub/os/Linux/distr/altlinux/4.0/Server/4.0.1/files/SRPMS/3proxy-0.5.3h-alt1.src.rpm
	Combine with ftp://ftp.pbone.net/mirror/ftp.sourceforge.net/pub/sourceforge/t/th/three-proxy/3proxy-0.5.3g-1.src.rpm
- Steep to version 0.5.3k
- Comment out packager
- Reformat header of spec with tabs
- Add desc from second src.rpm of import
- Correct source0
- Add -c key fo %%setup macro
- Add BuildRoot definition (this is not ALT)
- Change
	Release:	alt1
	to
	Release:	0.Hu.0

* Fri Apr 13 2007 Lunar Child <luch at altlinux.ru> 0.5.3h-alt1
- new version

* Wed Mar 21 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt2
- Added init script.
- Added new trivial config file.

* Tue Mar 20 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt1
- First build for ALT Linux Sisyphus


--- NEW FILE import.log ---
proxy-0_6-3_fc11:F-11:3proxy-0.6-3.fc11.src.rpm:1251405498


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:17:25 -0000	1.1
+++ .cvsignore	27 Aug 2009 20:39:06 -0000	1.2
@@ -0,0 +1 @@
+3proxy-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:17:25 -0000	1.1
+++ sources	27 Aug 2009 20:39:06 -0000	1.2
@@ -0,0 +1 @@
+2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz



From epienbro at fedoraproject.org  Thu Aug 27 20:42:37 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 27 Aug 2009 20:42:37 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/devel jpeg-fix-typo.patch, NONE,
	1.1 jpeg-workaround-typedef-conflict.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 mingw32-libjpeg.spec, 1.4, 1.5 sources, 1.2,
	1.3 jpeg-c++.patch, 1.1, NONE
Message-ID: <20090827204237.4534311C00EB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31222

Modified Files:
	.cvsignore mingw32-libjpeg.spec sources 
Added Files:
	jpeg-fix-typo.patch jpeg-workaround-typedef-conflict.patch 
Removed Files:
	jpeg-c++.patch 
Log Message:
* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 7-1
- Update to version 7
- Resolves typedef conflict (BZ #497492)
- Use %%global instead of %%define
- Automatically generate debuginfo subpackage
- Fixed %%defattr line
- Added -static subpackage
- Dropped upstreamed patches
- Dropped autoconf stuff
- Fixed a comment typo


jpeg-fix-typo.patch:
 jmorecfg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jpeg-fix-typo.patch ---
--- jmorecfg.h.orig	2009-08-20 12:17:45.157121881 +0200
+++ jmorecfg.h	2009-08-20 12:17:50.738866350 +0200
@@ -159,7 +159,7 @@
 /* INT32 must hold at least signed 32-bit values. */
 
 #ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
-#ifndef _BASETSD_H_		/* Microsoft defines it in basetsd.h */
+#ifndef _BASETSD_H		/* Microsoft defines it in basetsd.h */
 #ifndef QGLOBAL_H		/* Qt defines it in qglobal.h */
 typedef long INT32;
 #endif

jpeg-workaround-typedef-conflict.patch:
 cdjpeg.c   |    2 -
 cdjpeg.h   |   18 +++++------
 cjpeg.c    |   10 +++---
 djpeg.c    |    8 ++---
 jcapimin.c |    2 -
 jcapistd.c |    2 -
 jcarith.c  |   12 +++----
 jccoefct.c |   14 ++++----
 jchuff.c   |   34 ++++++++++-----------
 jcinit.c   |    2 -
 jcmainct.c |    6 +--
 jcmarker.c |    4 +-
 jcmaster.c |    4 +-
 jcparam.c  |    8 ++---
 jcprepct.c |    2 -
 jcsample.c |    2 -
 jctrans.c  |    2 -
 jdapimin.c |    8 ++---
 jdapistd.c |   10 +++---
 jdarith.c  |   10 +++---
 jdatadst.c |    2 -
 jdatasrc.c |    4 +-
 jdcoefct.c |   10 +++---
 jdhuff.c   |   16 +++++-----
 jdinput.c  |    2 -
 jdmainct.c |    4 +-
 jdmarker.c |   30 +++++++++----------
 jdmaster.c |    6 +--
 jdmerge.c  |    2 -
 jdpostct.c |    2 -
 jdsample.c |    2 -
 jerror.c   |    2 -
 jmemmgr.c  |   24 +++++++--------
 jmorecfg.h |    5 ---
 jpegint.h  |   44 +++++++++++++--------------
 jpeglib.h  |   96 ++++++++++++++++++++++++++++++-------------------------------
 jpegtran.c |    6 +--
 jquant1.c  |    8 ++---
 jquant2.c  |    6 +--
 rdppm.c    |    2 -
 rdswitch.c |   18 +++++------
 rdtarga.c  |    2 -
 transupp.c |   12 +++----
 transupp.h |   12 +++----
 wrbmp.c    |    4 +-
 45 files changed, 239 insertions(+), 242 deletions(-)

--- NEW FILE jpeg-workaround-typedef-conflict.patch ---
--- cdjpeg.c.orig	2009-08-20 11:49:32.400866798 +0200
+++ cdjpeg.c	2009-08-20 11:49:38.214138721 +0200
@@ -118,7 +118,7 @@
  * minchars is length of minimum legal abbreviation.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 keymatch (char * arg, const char * keyword, int minchars)
 {
   register int ca, ck;
--- cjpeg.c.orig	2009-08-20 11:48:18.679873935 +0200
+++ cjpeg.c	2009-08-20 11:48:29.886865993 +0200
@@ -74,7 +74,7 @@
  * seldom-used ID field), so we provide a switch to force Targa input mode.
  */
 
-static boolean is_targa;	/* records user -targa switch */
+static jpeg_boolean is_targa;	/* records user -targa switch */
 
 
 LOCAL(cjpeg_source_ptr)
@@ -202,7 +202,7 @@
 
 LOCAL(int)
 parse_switches (j_compress_ptr cinfo, int argc, char **argv,
-		int last_file_arg_seen, boolean for_real)
+		int last_file_arg_seen, jpeg_boolean for_real)
 /* Parse optional switches.
  * Returns argv[] index of first file-name argument (== argc if none).
  * Any file names with indexes <= last_file_arg_seen are ignored;
@@ -214,8 +214,8 @@
 {
   int argn;
   char * arg;
-  boolean force_baseline;
-  boolean simple_progressive;
+  jpeg_boolean force_baseline;
+  jpeg_boolean simple_progressive;
   char * qualityarg = NULL;	/* saves -quality parm if any */
   char * qtablefile = NULL;	/* saves -qtables filename if any */
   char * qslotsarg = NULL;	/* saves -qslots parm if any */
@@ -274,7 +274,7 @@
     } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
       /* Enable debug printouts. */
       /* On first -d, print version identification */
-      static boolean printed_version = FALSE;
+      static jpeg_boolean printed_version = FALSE;
 
       if (! printed_version) {
 	fprintf(stderr, "Independent JPEG Group's CJPEG, version %s\n%s\n",
--- djpeg.c.orig	2009-08-20 11:49:46.529889918 +0200
+++ djpeg.c	2009-08-20 11:49:55.963116109 +0200
@@ -161,7 +161,7 @@
 
 LOCAL(int)
 parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
-		int last_file_arg_seen, boolean for_real)
+		int last_file_arg_seen, jpeg_boolean for_real)
 /* Parse optional switches.
  * Returns argv[] index of first file-name argument (== argc if none).
  * Any file names with indexes <= last_file_arg_seen are ignored;
@@ -238,7 +238,7 @@
     } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
       /* Enable debug printouts. */
       /* On first -d, print version identification */
-      static boolean printed_version = FALSE;
+      static jpeg_boolean printed_version = FALSE;
 
       if (! printed_version) {
 	fprintf(stderr, "Independent JPEG Group's DJPEG, version %s\n%s\n",
@@ -366,10 +366,10 @@
 }
 
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 print_text_marker (j_decompress_ptr cinfo)
 {
-  boolean traceit = (cinfo->err->trace_level >= 1);
+  jpeg_boolean traceit = (cinfo->err->trace_level >= 1);
   INT32 length;
   unsigned int ch;
   unsigned int lastch = 0;
--- jcapimin.c.orig	2009-08-20 11:32:18.918886764 +0200
+++ jcapimin.c	2009-08-20 11:32:25.869115909 +0200
@@ -118,7 +118,7 @@
  */
 
 GLOBAL(void)
-jpeg_suppress_tables (j_compress_ptr cinfo, boolean suppress)
+jpeg_suppress_tables (j_compress_ptr cinfo, jpeg_boolean suppress)
 {
   int i;
   JQUANT_TBL * qtbl;
--- jcarith.c.orig	2009-08-20 11:35:14.553873155 +0200
+++ jcarith.c	2009-08-20 11:34:40.704868643 +0200
@@ -356,7 +356,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -447,7 +447,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -547,7 +547,7 @@
  * MCU encoding for DC successive approximation refinement scan.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -582,7 +582,7 @@
  * MCU encoding for AC successive approximation refinement scan.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -676,7 +676,7 @@
  * Encode and output one MCU's worth of arithmetic-compressed coefficients.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -820,7 +820,7 @@
  */
 
 METHODDEF(void)
-start_pass (j_compress_ptr cinfo, boolean gather_statistics)
+start_pass (j_compress_ptr cinfo, jpeg_boolean gather_statistics)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
   int ci, tbl;
--- jccoefct.c.orig	2009-08-20 11:35:33.811137499 +0200
+++ jccoefct.c	2009-08-20 11:35:56.295116220 +0200
@@ -58,12 +58,12 @@
 
 
 /* Forward declarations */
-METHODDEF(boolean) compress_data
+METHODDEF(jpeg_boolean) compress_data
     JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
 #ifdef FULL_COEF_BUFFER_SUPPORTED
-METHODDEF(boolean) compress_first_pass
+METHODDEF(jpeg_boolean) compress_first_pass
     JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-METHODDEF(boolean) compress_output
+METHODDEF(jpeg_boolean) compress_output
     JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
 #endif
 
@@ -139,7 +139,7 @@
  * which we index according to the component's SOF position.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
@@ -244,7 +244,7 @@
  * at the scan-dependent variables (MCU dimensions, etc).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
@@ -341,7 +341,7 @@
  * NB: input_buf is ignored; it is likely to be a NULL pointer.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
@@ -406,7 +406,7 @@
  */
 
 GLOBAL(void)
-jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+jinit_c_coef_controller (j_compress_ptr cinfo, jpeg_boolean need_full_buffer)
 {
   my_coef_ptr coef;
 
--- jchuff.c.orig	2009-08-20 11:36:07.392116357 +0200
+++ jchuff.c	2009-08-20 11:37:12.788115828 +0200
@@ -100,7 +100,7 @@
   /* Following fields used only in progressive mode */
 
   /* Mode flag: TRUE for optimization, FALSE for actual data output */
-  boolean gather_statistics;
+  jpeg_boolean gather_statistics;
 
   /* next_output_byte/free_in_buffer are local copies of cinfo->dest fields.
    */
@@ -169,7 +169,7 @@
  */
 
 LOCAL(void)
-jpeg_make_c_derived_tbl (j_compress_ptr cinfo, boolean isDC, int tblno,
+jpeg_make_c_derived_tbl (j_compress_ptr cinfo, jpeg_boolean isDC, int tblno,
 			 c_derived_tbl ** pdtbl)
 {
   JHUFF_TBL *htbl;
@@ -276,7 +276,7 @@
 	    dump_buffer_e(entropy); }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 dump_buffer_s (working_state * state)
 /* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
 {
@@ -314,7 +314,7 @@
  */
 
 INLINE
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 emit_bits_s (working_state * state, unsigned int code, int size)
 /* Emit some bits; return TRUE if successful, FALSE if must suspend */
 {
@@ -393,7 +393,7 @@
 }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 flush_bits_s (working_state * state)
 {
   if (! emit_bits_s(state, 0x7F, 7)) /* fill any partial byte with ones */
@@ -484,7 +484,7 @@
  * Emit a restart marker & resynchronize predictions.
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 emit_restart_s (working_state * state, int restart_num)
 {
   int ci;
@@ -535,7 +535,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -622,7 +622,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -729,7 +729,7 @@
  * is not very clear on the point.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -776,7 +776,7 @@
  * MCU encoding for AC successive approximation refinement scan.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -902,7 +902,7 @@
 
 /* Encode a single block's worth of coefficients */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,
 		  c_derived_tbl *dctbl, c_derived_tbl *actbl)
 {
@@ -1000,7 +1000,7 @@
  * Encode and output one MCU's worth of Huffman-compressed coefficients.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -1179,7 +1179,7 @@
  * No data is actually output, so no suspension return is possible.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -1386,9 +1386,9 @@
   int ci, dctbl, actbl, tbl;
   jpeg_component_info * compptr;
   JHUFF_TBL **htblptr;
-  boolean did_dc[NUM_HUFF_TBLS];
-  boolean did_ac[NUM_HUFF_TBLS];
-  boolean did[NUM_HUFF_TBLS];
+  jpeg_boolean did_dc[NUM_HUFF_TBLS];
+  jpeg_boolean did_ac[NUM_HUFF_TBLS];
+  jpeg_boolean did[NUM_HUFF_TBLS];
 
   /* It's important not to apply jpeg_gen_optimal_table more than once
    * per table, because it clobbers the input frequency counts!
@@ -1453,7 +1453,7 @@
  */
 
 METHODDEF(void)
-start_pass_huff (j_compress_ptr cinfo, boolean gather_statistics)
+start_pass_huff (j_compress_ptr cinfo, jpeg_boolean gather_statistics)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
   int ci, dctbl, actbl, tbl;
--- jcinit.c.orig	2009-08-20 11:37:36.967116497 +0200
+++ jcinit.c	2009-08-20 11:37:41.404866807 +0200
@@ -49,7 +49,7 @@
 
   /* Need a full-image coefficient buffer in any multi-pass mode. */
   jinit_c_coef_controller(cinfo,
-		(boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
+		(jpeg_boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
   jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);
 
   jinit_marker_writer(cinfo);
--- jcmainct.c.orig	2009-08-20 11:37:50.361119428 +0200
+++ jcmainct.c	2009-08-20 11:38:14.445115752 +0200
@@ -30,7 +30,7 @@
 
   JDIMENSION cur_iMCU_row;	/* number of current iMCU row */
   JDIMENSION rowgroup_ctr;	/* counts row groups received in iMCU row */
-  boolean suspended;		/* remember if we suspended output */
+  jpeg_boolean suspended;		/* remember if we suspended output */
   J_BUF_MODE pass_mode;		/* current operating mode */
 
   /* If using just a strip buffer, this points to the entire set of buffers
@@ -173,7 +173,7 @@
   my_main_ptr main = (my_main_ptr) cinfo->main;
   int ci;
   jpeg_component_info *compptr;
-  boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
+  jpeg_boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
 
   while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
     /* Realign the virtual buffers if at the start of an iMCU row. */
@@ -242,7 +242,7 @@
  */
 
 GLOBAL(void)
-jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+jinit_c_main_controller (j_compress_ptr cinfo, jpeg_boolean need_full_buffer)
 {
   my_main_ptr main;
   int ci;
--- jcmarker.c.orig	2009-08-20 11:38:29.633866300 +0200
+++ jcmarker.c	2009-08-20 11:38:39.734866207 +0200
@@ -181,7 +181,7 @@
 
 
 LOCAL(void)
-emit_dht (j_compress_ptr cinfo, int index, boolean is_ac)
+emit_dht (j_compress_ptr cinfo, int index, jpeg_boolean is_ac)
 /* Emit a DHT marker */
 {
   JHUFF_TBL * htbl;
@@ -494,7 +494,7 @@
 write_frame_header (j_compress_ptr cinfo)
 {
   int ci, prec;
-  boolean is_baseline;
+  jpeg_boolean is_baseline;
   jpeg_component_info *compptr;
   
   /* Emit DQT for each quantization table.
--- jcmaster.c.orig	2009-08-20 11:38:46.833116724 +0200
+++ jcmaster.c	2009-08-20 11:38:58.318116526 +0200
@@ -315,7 +315,7 @@
   const jpeg_scan_info * scanptr;
   int scanno, ncomps, ci, coefi, thisi;
   int Ss, Se, Ah, Al;
-  boolean component_sent[MAX_COMPONENTS];
+  jpeg_boolean component_sent[MAX_COMPONENTS];
 #ifdef C_PROGRESSIVE_SUPPORTED
   int * last_bitpos_ptr;
   int last_bitpos[MAX_COMPONENTS][DCTSIZE2];
@@ -720,7 +720,7 @@
  */
 
 GLOBAL(void)
-jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)
+jinit_c_master_control (j_compress_ptr cinfo, jpeg_boolean transcode_only)
 {
   my_master_ptr master;
 
--- jcparam.c.orig	2009-08-20 11:39:06.346890823 +0200
+++ jcparam.c	2009-08-20 11:39:20.036116324 +0200
@@ -23,7 +23,7 @@
 GLOBAL(void)
 jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
 		      const unsigned int *basic_table,
-		      int scale_factor, boolean force_baseline)
+		      int scale_factor, jpeg_boolean force_baseline)
 /* Define a quantization table equal to the basic_table times
  * a scale factor (given as a percentage).
  * If force_baseline is TRUE, the computed quantization table entries
@@ -88,7 +88,7 @@
 
 
 GLOBAL(void)
-jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline)
+jpeg_default_qtables (j_compress_ptr cinfo, jpeg_boolean force_baseline)
 /* Set or change the 'quality' (quantization) setting, using default tables
  * and straight percentage-scaling quality scales.
  * This entry point allows different scalings for luminance and chrominance.
@@ -104,7 +104,7 @@
 
 GLOBAL(void)
 jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,
-			 boolean force_baseline)
+			 jpeg_boolean force_baseline)
 /* Set or change the 'quality' (quantization) setting, using default tables
  * and a straight percentage-scaling quality scale.  In most cases it's better
  * to use jpeg_set_quality (below); this entry point is provided for
@@ -146,7 +146,7 @@
 
 
 GLOBAL(void)
-jpeg_set_quality (j_compress_ptr cinfo, int quality, boolean force_baseline)
+jpeg_set_quality (j_compress_ptr cinfo, int quality, jpeg_boolean force_baseline)
 /* Set or change the 'quality' (quantization) setting, using default tables.
  * This is the standard quality-adjusting entry point for typical user
  * interfaces; only those who want detailed control over quantization tables
--- jcprepct.c.orig	2009-08-20 11:39:26.614865820 +0200
+++ jcprepct.c	2009-08-20 11:39:41.838870566 +0200
@@ -315,7 +315,7 @@
  */
 
 GLOBAL(void)
-jinit_c_prep_controller (j_compress_ptr cinfo, boolean need_full_buffer)
+jinit_c_prep_controller (j_compress_ptr cinfo, jpeg_boolean need_full_buffer)
 {
   my_prep_ptr prep;
   int ci;
--- jcsample.c.orig	2009-08-20 11:39:48.648868104 +0200
+++ jcsample.c	2009-08-20 11:39:54.663867262 +0200
@@ -480,7 +480,7 @@
   my_downsample_ptr downsample;
   int ci;
   jpeg_component_info * compptr;
-  boolean smoothok = TRUE;
+  jpeg_boolean smoothok = TRUE;
   int h_in_group, v_in_group, h_out_group, v_out_group;
 
   downsample = (my_downsample_ptr)
--- jctrans.c.orig	2009-08-20 11:40:02.960129048 +0200
+++ jctrans.c	2009-08-20 11:40:09.904868915 +0200
@@ -267,7 +267,7 @@
  * NB: input_buf is ignored; it is likely to be a NULL pointer.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
--- jdapimin.c.orig	2009-08-20 11:40:56.430866566 +0200
+++ jdapimin.c	2009-08-20 11:41:15.705116071 +0200
@@ -239,7 +239,7 @@
  */
 
 GLOBAL(int)
-jpeg_read_header (j_decompress_ptr cinfo, boolean require_image)
+jpeg_read_header (j_decompress_ptr cinfo, jpeg_boolean require_image)
 {
   int retcode;
 
@@ -331,7 +331,7 @@
  * Have we finished reading the input file?
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_input_complete (j_decompress_ptr cinfo)
 {
   /* Check for valid jpeg object */
@@ -346,7 +346,7 @@
  * Is there more than one scan?
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_has_multiple_scans (j_decompress_ptr cinfo)
 {
   /* Only valid after jpeg_read_header completes */
@@ -366,7 +366,7 @@
  * a suspending data source is used.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_finish_decompress (j_decompress_ptr cinfo)
 {
   if ((cinfo->global_state == DSTATE_SCANNING ||
--- jdapistd.c.orig	2009-08-20 11:41:22.526890349 +0200
+++ jdapistd.c	2009-08-20 11:41:36.330126243 +0200
@@ -20,7 +20,7 @@
 
 
 /* Forward declarations */
-LOCAL(boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
+LOCAL(jpeg_boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
 
 
 /*
@@ -34,7 +34,7 @@
  * a suspending data source is used.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_start_decompress (j_decompress_ptr cinfo)
 {
   if (cinfo->global_state == DSTATE_READY) {
@@ -91,7 +91,7 @@
  *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 output_pass_setup (j_decompress_ptr cinfo)
 {
   if (cinfo->global_state != DSTATE_PRESCAN) {
@@ -224,7 +224,7 @@
  * Initialize for an output pass in buffered-image mode.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
 {
   if (cinfo->global_state != DSTATE_BUFIMAGE &&
@@ -249,7 +249,7 @@
  * a suspending data source is used.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_finish_output (j_decompress_ptr cinfo)
 {
   if ((cinfo->global_state == DSTATE_SCANNING ||
--- jdarith.c.orig	2009-08-20 11:41:44.971116507 +0200
+++ jdarith.c	2009-08-20 11:42:12.791118218 +0200
@@ -237,7 +237,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -316,7 +316,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -391,7 +391,7 @@
  * MCU decoding for DC successive approximation refinement scan.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -424,7 +424,7 @@
  * MCU decoding for AC successive approximation refinement scan.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
@@ -494,7 +494,7 @@
  * Decode one MCU's worth of arithmetic-compressed coefficients.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   arith_entropy_ptr entropy = (arith_entropy_ptr) cinfo->entropy;
--- jdatadst.c.orig	2009-08-20 11:42:36.799116272 +0200
+++ jdatadst.c	2009-08-20 11:42:43.198116026 +0200
@@ -77,7 +77,7 @@
  * write it out when emptying the buffer externally.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 empty_output_buffer (j_compress_ptr cinfo)
 {
   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
--- jdatasrc.c.orig	2009-08-20 11:42:52.345883058 +0200
+++ jdatasrc.c	2009-08-20 11:42:58.981116194 +0200
@@ -27,7 +27,7 @@
 
   FILE * infile;		/* source stream */
   JOCTET * buffer;		/* start of buffer */
-  boolean start_of_file;	/* have we gotten any data yet? */
+  jpeg_boolean start_of_file;	/* have we gotten any data yet? */
 } my_source_mgr;
 
 typedef my_source_mgr * my_src_ptr;
@@ -86,7 +86,7 @@
  * the front of the buffer rather than discarding it.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;
--- jdcoefct.c.orig	2009-08-20 11:43:05.725894412 +0200
+++ jdcoefct.c	2009-08-20 11:43:19.139866248 +0200
@@ -69,7 +69,7 @@
 	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 #ifdef BLOCK_SMOOTHING_SUPPORTED
-LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
+LOCAL(jpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
 METHODDEF(int) decompress_smooth_data
 	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
@@ -401,11 +401,11 @@
  * more accurately than they really are.
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 smoothing_ok (j_decompress_ptr cinfo)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  boolean smoothing_useful = FALSE;
+  jpeg_boolean smoothing_useful = FALSE;
   int ci, coefi;
   jpeg_component_info *compptr;
   JQUANT_TBL * qtable;
@@ -470,7 +470,7 @@
   JDIMENSION output_col;
   jpeg_component_info *compptr;
   inverse_DCT_method_ptr inverse_DCT;
-  boolean first_row, last_row;
+  jpeg_boolean first_row, last_row;
   JBLOCK workspace;
   int *coef_bits;
   JQUANT_TBL *quanttbl;
@@ -673,7 +673,7 @@
  */
 
 GLOBAL(void)
-jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_coef_controller (j_decompress_ptr cinfo, jpeg_boolean need_full_buffer)
 {
   my_coef_ptr coef;
 
--- jdhuff.c.orig	2009-08-20 11:43:27.669123391 +0200
+++ jdhuff.c	2009-08-20 11:43:54.296866948 +0200
@@ -274,7 +274,7 @@
  */
 
 LOCAL(void)
-jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,
+jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, jpeg_boolean isDC, int tblno,
 			 d_derived_tbl ** pdtbl)
 {
   JHUFF_TBL *htbl;
@@ -415,7 +415,7 @@
 #endif
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 jpeg_fill_bit_buffer (bitread_working_state * state,
 		      register bit_buf_type get_buffer, register int bits_left,
 		      int nbits)
@@ -586,7 +586,7 @@
  * Returns FALSE if must suspend.
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 process_restart (j_decompress_ptr cinfo)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -645,7 +645,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {   
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -716,7 +716,7 @@
  * or first pass of successive approximation).
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {   
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -801,7 +801,7 @@
  * is not very clear on the point.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {   
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -850,7 +850,7 @@
  * MCU decoding for AC successive approximation refinement scan.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {   
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
@@ -1000,7 +1000,7 @@
  * Decode one MCU's worth of Huffman-compressed coefficients.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
 {
   huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
--- jdinput.c.orig	2009-08-20 11:44:01.240887972 +0200
+++ jdinput.c	2009-08-20 11:44:08.081866527 +0200
@@ -22,7 +22,7 @@
 typedef struct {
   struct jpeg_input_controller pub; /* public fields */
 
-  boolean inheaders;		/* TRUE until first SOS is reached */
+  jpeg_boolean inheaders;		/* TRUE until first SOS is reached */
 } my_input_controller;
 
 typedef my_input_controller * my_inputctl_ptr;
--- jdmainct.c.orig	2009-08-20 11:44:23.934140509 +0200
+++ jdmainct.c	2009-08-20 11:44:30.961876604 +0200
@@ -117,7 +117,7 @@
   /* Pointer to allocated workspace (M or M+2 row groups). */
   JSAMPARRAY buffer[MAX_COMPONENTS];
 
-  boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */
+  jpeg_boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */
   JDIMENSION rowgroup_ctr;	/* counts row groups output to postprocessor */
 
   /* Remaining fields are only used in the context case. */
@@ -473,7 +473,7 @@
  */
 
 GLOBAL(void)
-jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_main_controller (j_decompress_ptr cinfo, jpeg_boolean need_full_buffer)
 {
   my_main_ptr main;
   int ci, rgroup, ngroups;
--- jdmarker.c.orig	2009-08-20 11:44:39.278866368 +0200
+++ jdmarker.c	2009-08-20 11:45:17.804115896 +0200
@@ -193,7 +193,7 @@
  */
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 get_soi (j_decompress_ptr cinfo)
 /* Process an SOI marker */
 {
@@ -233,8 +233,8 @@
 }
 
 
-LOCAL(boolean)
-get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith)
+LOCAL(jpeg_boolean)
+get_sof (j_decompress_ptr cinfo, jpeg_boolean is_prog, jpeg_boolean is_arith)
 /* Process a SOFn marker */
 {
   INT32 length;
@@ -297,7 +297,7 @@
 }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 get_sos (j_decompress_ptr cinfo)
 /* Process a SOS marker */
 {
@@ -369,7 +369,7 @@
 
 #ifdef D_ARITH_CODING_SUPPORTED
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 get_dac (j_decompress_ptr cinfo)
 /* Process a DAC marker */
 {
@@ -415,7 +415,7 @@
 #endif /* D_ARITH_CODING_SUPPORTED */
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 get_dht (j_decompress_ptr cinfo)
 /* Process a DHT marker */
 {
@@ -486,7 +486,7 @@
 }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 get_dqt (j_decompress_ptr cinfo)
 /* Process a DQT marker */
 {
@@ -544,7 +544,7 @@
 }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 get_dri (j_decompress_ptr cinfo)
 /* Process a DRI marker */
 {
@@ -687,7 +687,7 @@
 }
 
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 get_interesting_appn (j_decompress_ptr cinfo)
 /* Process an APP0 or APP14 marker without saving it */
 {
@@ -735,7 +735,7 @@
 
 #ifdef SAVE_MARKERS_SUPPORTED
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 save_marker (j_decompress_ptr cinfo)
 /* Save an APPn or COM marker into the marker list */
 {
@@ -841,7 +841,7 @@
 #endif /* SAVE_MARKERS_SUPPORTED */
 
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 skip_variable (j_decompress_ptr cinfo)
 /* Skip over an unknown or uninteresting variable-length marker */
 {
@@ -870,7 +870,7 @@
  * but it will never be 0 or FF.
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 next_marker (j_decompress_ptr cinfo)
 {
   int c;
@@ -917,7 +917,7 @@
 }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 first_marker (j_decompress_ptr cinfo)
 /* Like next_marker, but used to obtain the initial SOI marker. */
 /* For this marker, we do not allow preceding garbage or fill; otherwise,
@@ -1109,7 +1109,7 @@
  * it holds a marker which the decoder will be unable to read past.
  */
 
-METHODDEF(boolean)
+METHODDEF(jpeg_boolean)
 read_restart_marker (j_decompress_ptr cinfo)
 {
   /* Obtain a marker unless we already did. */
@@ -1188,7 +1188,7 @@
  * any other marker would have to be bogus data in that case.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)
 {
   int marker = cinfo->unread_marker;
--- jdmaster.c.orig	2009-08-20 11:45:36.984115940 +0200
+++ jdmaster.c	2009-08-20 11:45:48.922119814 +0200
@@ -24,7 +24,7 @@
 
   int pass_number;		/* # of passes completed */
 
-  boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
+  jpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
 
   /* Saved references to initialized quantizer modules,
    * in case we need to switch modes.
@@ -41,7 +41,7 @@
  * CRUCIAL: this must match the actual capabilities of jdmerge.c!
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 use_merged_upsample (j_decompress_ptr cinfo)
 {
 #ifdef UPSAMPLE_MERGING_SUPPORTED
@@ -401,7 +401,7 @@
 master_selection (j_decompress_ptr cinfo)
 {
   my_master_ptr master = (my_master_ptr) cinfo->master;
-  boolean use_c_buffer;
+  jpeg_boolean use_c_buffer;
   long samplesperrow;
   JDIMENSION jd_samplesperrow;
 
--- jdmerge.c.orig	2009-08-20 11:45:55.827140697 +0200
+++ jdmerge.c	2009-08-20 11:46:02.113873456 +0200
@@ -61,7 +61,7 @@
    * to discard the dummy last row if the image height is odd.
    */
   JSAMPROW spare_row;
-  boolean spare_full;		/* T if spare buffer is occupied */
+  jpeg_boolean spare_full;		/* T if spare buffer is occupied */
 
   JDIMENSION out_row_width;	/* samples per output row */
   JDIMENSION rows_to_go;	/* counts rows remaining in image */
--- jdpostct.c.orig	2009-08-20 11:46:08.022116658 +0200
+++ jdpostct.c	2009-08-20 11:46:12.271138065 +0200
@@ -247,7 +247,7 @@
  */
 
 GLOBAL(void)
-jinit_d_post_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_post_controller (j_decompress_ptr cinfo, jpeg_boolean need_full_buffer)
 {
   my_post_ptr post;
 
--- jdsample.c.orig	2009-08-20 11:46:20.616866424 +0200
+++ jdsample.c	2009-08-20 11:46:27.457115806 +0200
@@ -296,7 +296,7 @@
   my_upsample_ptr upsample;
   int ci;
   jpeg_component_info * compptr;
-  boolean need_buffer;
+  jpeg_boolean need_buffer;
   int h_in_group, v_in_group, h_out_group, v_out_group;
 
   upsample = (my_upsample_ptr)
--- jerror.c.orig	2009-08-20 11:46:34.576116112 +0200
+++ jerror.c	2009-08-20 11:46:39.701116174 +0200
@@ -161,7 +161,7 @@
   const char * msgtext = NULL;
   const char * msgptr;
   char ch;
-  boolean isstring;
+  jpeg_boolean isstring;
 
   /* Look up message string in proper table */
   if (msg_code > 0 && msg_code <= err->last_jpeg_message) {
--- jmemmgr.c.orig	2009-08-20 11:47:37.676116529 +0200
+++ jmemmgr.c	2009-08-20 11:48:09.789865834 +0200
@@ -156,9 +156,9 @@
   JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
   JDIMENSION cur_start_row;	/* first logical row # in the buffer */
   JDIMENSION first_undef_row;	/* row # of first uninitialized row */
-  boolean pre_zero;		/* pre-zero mode requested? */
-  boolean dirty;		/* do current buffer contents need written? */
-  boolean b_s_open;		/* is backing-store data valid? */
+  jpeg_boolean pre_zero;		/* pre-zero mode requested? */
+  jpeg_boolean dirty;		/* do current buffer contents need written? */
+  jpeg_boolean b_s_open;		/* is backing-store data valid? */
   jvirt_sarray_ptr next;	/* link to next virtual sarray control block */
   backing_store_info b_s_info;	/* System-dependent control info */
 };
@@ -172,9 +172,9 @@
   JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
   JDIMENSION cur_start_row;	/* first logical row # in the buffer */
   JDIMENSION first_undef_row;	/* row # of first uninitialized row */
-  boolean pre_zero;		/* pre-zero mode requested? */
-  boolean dirty;		/* do current buffer contents need written? */
-  boolean b_s_open;		/* is backing-store data valid? */
+  jpeg_boolean pre_zero;		/* pre-zero mode requested? */
+  jpeg_boolean dirty;		/* do current buffer contents need written? */
+  jpeg_boolean b_s_open;		/* is backing-store data valid? */
   jvirt_barray_ptr next;	/* link to next virtual barray control block */
   backing_store_info b_s_info;	/* System-dependent control info */
 };
@@ -520,7 +520,7 @@
 
 
 METHODDEF(jvirt_sarray_ptr)
-request_virt_sarray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+request_virt_sarray (j_common_ptr cinfo, int pool_id, jpeg_boolean pre_zero,
 		     JDIMENSION samplesperrow, JDIMENSION numrows,
 		     JDIMENSION maxaccess)
 /* Request a virtual 2-D sample array */
@@ -550,7 +550,7 @@
 
 
 METHODDEF(jvirt_barray_ptr)
-request_virt_barray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+request_virt_barray (j_common_ptr cinfo, int pool_id, jpeg_boolean pre_zero,
 		     JDIMENSION blocksperrow, JDIMENSION numrows,
 		     JDIMENSION maxaccess)
 /* Request a virtual 2-D coefficient-block array */
@@ -687,7 +687,7 @@
 
 
 LOCAL(void)
-do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing)
+do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, jpeg_boolean writing)
 /* Do backing store read or write of a virtual sample array */
 {
   long bytesperrow, file_offset, byte_count, rows, thisrow, i;
@@ -720,7 +720,7 @@
 
 
 LOCAL(void)
-do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing)
+do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, jpeg_boolean writing)
 /* Do backing store read or write of a virtual coefficient-block array */
 {
   long bytesperrow, file_offset, byte_count, rows, thisrow, i;
@@ -755,7 +755,7 @@
 METHODDEF(JSAMPARRAY)
 access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
 		    JDIMENSION start_row, JDIMENSION num_rows,
-		    boolean writable)
+		    jpeg_boolean writable)
 /* Access the part of a virtual sample array starting at start_row */
 /* and extending for num_rows rows.  writable is true if  */
 /* caller intends to modify the accessed area. */
@@ -840,7 +840,7 @@
 METHODDEF(JBLOCKARRAY)
 access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
 		    JDIMENSION start_row, JDIMENSION num_rows,
-		    boolean writable)
+		    jpeg_boolean writable)
 /* Access the part of a virtual block array starting at start_row */
 /* and extending for num_rows rows.  writable is true if  */
 /* caller intends to modify the accessed area. */
--- jmorecfg.h.orig	2009-08-20 11:17:11.941144303 +0200
+++ jmorecfg.h	2009-08-20 11:30:55.922866404 +0200
@@ -229,10 +229,7 @@
  * specific header files that you want to include together with these files.
  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
  */
-
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
+typedef int jpeg_boolean;
 #ifndef FALSE			/* in case these macros already exist */
 #define FALSE	0		/* values of boolean */
 #endif
--- jpegint.h.orig	2009-08-20 11:31:06.535867201 +0200
+++ jpegint.h	2009-08-20 11:32:05.734866377 +0200
@@ -49,8 +49,8 @@
   JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
 
   /* State variables made visible to other modules */
-  boolean call_pass_startup;	/* True if pass_startup must be called */
-  boolean is_last_pass;		/* True during last pass */
+  jpeg_boolean call_pass_startup;	/* True if pass_startup must be called */
+  jpeg_boolean is_last_pass;		/* True during last pass */
 };
 
 /* Main buffer control (downsampled-data buffer) */
@@ -76,7 +76,7 @@
 /* Coefficient buffer control */
 struct jpeg_c_coef_controller {
   JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
+  JMETHOD(jpeg_boolean, compress_data, (j_compress_ptr cinfo,
 				   JSAMPIMAGE input_buf));
 };
 
@@ -96,7 +96,7 @@
 			     JSAMPIMAGE output_buf,
 			     JDIMENSION out_row_group_index));
 
-  boolean need_context_rows;	/* TRUE if need rows above & below */
+  jpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
 };
 
 /* Forward DCT (also controls coefficient quantization) */
@@ -114,8 +114,8 @@
 
 /* Entropy encoding */
 struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, jpeg_boolean gather_statistics));
+  JMETHOD(jpeg_boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
   JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
 };
 
@@ -142,7 +142,7 @@
   JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
 
   /* State variables made visible to other modules */
-  boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+  jpeg_boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
 };
 
 /* Input control module */
@@ -153,8 +153,8 @@
   JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
 
   /* State variables made visible to other modules */
-  boolean has_multiple_scans;	/* True if file has multiple scans */
-  boolean eoi_reached;		/* True when EOI has been consumed */
+  jpeg_boolean has_multiple_scans;	/* True if file has multiple scans */
+  jpeg_boolean eoi_reached;		/* True when EOI has been consumed */
 };
 
 /* Main buffer control (downsampled-data buffer) */
@@ -202,8 +202,8 @@
   /* State of marker reader --- nominally internal, but applications
    * supplying COM or APPn handlers might like to know the state.
    */
-  boolean saw_SOI;		/* found SOI? */
-  boolean saw_SOF;		/* found SOF? */
+  jpeg_boolean saw_SOI;		/* found SOI? */
+  jpeg_boolean saw_SOF;		/* found SOF? */
   int next_restart_num;		/* next restart number expected (0-7) */
   unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
 };
@@ -211,12 +211,12 @@
 /* Entropy decoding */
 struct jpeg_entropy_decoder {
   JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
+  JMETHOD(jpeg_boolean, decode_mcu, (j_decompress_ptr cinfo,
 				JBLOCKROW *MCU_data));
 
   /* This is here to share code between baseline and progressive decoders; */
   /* other modules probably should not use it */
-  boolean insufficient_data;	/* set TRUE after emitting warning */
+  jpeg_boolean insufficient_data;	/* set TRUE after emitting warning */
 };
 
 /* Inverse DCT (also performs dequantization) */
@@ -242,7 +242,7 @@
 			   JDIMENSION *out_row_ctr,
 			   JDIMENSION out_rows_avail));
 
-  boolean need_context_rows;	/* TRUE if need rows above & below */
+  jpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
 };
 
 /* Colorspace conversion */
@@ -255,7 +255,7 @@
 
 /* Color quantization or color precision reduction */
 struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, jpeg_boolean is_pre_scan));
   JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
 				 int num_rows));
@@ -336,13 +336,13 @@
 /* Compression module initialization routines */
 EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
 EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 boolean transcode_only));
+					 jpeg_boolean transcode_only));
 EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
+					  jpeg_boolean need_full_buffer));
 EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
+					  jpeg_boolean need_full_buffer));
 EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  boolean need_full_buffer));
+					  jpeg_boolean need_full_buffer));
 EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
 EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
 EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
@@ -352,11 +352,11 @@
 /* Decompression module initialization routines */
 EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
 EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
+					  jpeg_boolean need_full_buffer));
 EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
+					  jpeg_boolean need_full_buffer));
 EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  boolean need_full_buffer));
+					  jpeg_boolean need_full_buffer));
 EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
 EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
 EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
--- jpeglib.h.orig	2009-08-20 11:28:13.725117628 +0200
+++ jpeglib.h	2009-08-20 11:30:27.042115824 +0200
@@ -98,7 +98,7 @@
    * You could suppress output of a table by setting this to TRUE.
    * (See jpeg_suppress_tables for an example.)
    */
-  boolean sent_table;		/* TRUE when table has been output */
+  jpeg_boolean sent_table;		/* TRUE when table has been output */
 } JQUANT_TBL;
 
 
@@ -114,7 +114,7 @@
    * You could suppress output of a table by setting this to TRUE.
    * (See jpeg_suppress_tables for an example.)
    */
-  boolean sent_table;		/* TRUE when table has been output */
+  jpeg_boolean sent_table;		/* TRUE when table has been output */
 } JHUFF_TBL;
 
 
@@ -164,7 +164,7 @@
    * components will be ignored (eg grayscale output from YCbCr image),
    * we can skip most computations for the unused components.
    */
-  boolean component_needed;	/* do we need the value of this component? */
+  jpeg_boolean component_needed;	/* do we need the value of this component? */
 
   /* These values are computed before starting a scan of the component. */
   /* The decompressor output side may not use these variables. */
@@ -250,7 +250,7 @@
   struct jpeg_memory_mgr * mem;	/* Memory manager module */\
   struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
   void * client_data;		/* Available for use by application */\
-  boolean is_decompressor;	/* So common code can tell which is which */\
+  jpeg_boolean is_decompressor;	/* So common code can tell which is which */\
   int global_state		/* For checking call sequence validity */
 
 /* Routines that are to be used by both halves of the library are declared
@@ -338,11 +338,11 @@
    * set num_scans and scan_info to point to an array of scan definitions.
    */
 
-  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
+  jpeg_boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
+  jpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
+  jpeg_boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
+  jpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
+  jpeg_boolean do_fancy_downsampling; /* TRUE=apply fancy downsampling */
   int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
   J_DCT_METHOD dct_method;	/* DCT algorithm selector */
 
@@ -356,7 +356,7 @@
 
   /* Parameters controlling emission of special markers. */
 
-  boolean write_JFIF_header;	/* should a JFIF marker be written? */
+  jpeg_boolean write_JFIF_header;	/* should a JFIF marker be written? */
   UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
   UINT8 JFIF_minor_version;
   /* These three values are not used by the JPEG code, merely copied */
@@ -366,7 +366,7 @@
   UINT8 density_unit;		/* JFIF code for pixel size units */
   UINT16 X_density;		/* Horizontal pixel density */
   UINT16 Y_density;		/* Vertical pixel density */
-  boolean write_Adobe_marker;	/* should an Adobe marker be written? */
+  jpeg_boolean write_Adobe_marker;	/* should an Adobe marker be written? */
   
   /* State variable: index of next scanline to be written to
    * jpeg_write_scanlines().  Application may use this to control its
@@ -382,7 +382,7 @@
   /*
    * These fields are computed during compression startup
    */
-  boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
+  jpeg_boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
   int max_h_samp_factor;	/* largest h_samp_factor */
   int max_v_samp_factor;	/* largest v_samp_factor */
 
@@ -458,22 +458,22 @@
 
   double output_gamma;		/* image gamma wanted in output */
 
-  boolean buffered_image;	/* TRUE=multiple output passes */
-  boolean raw_data_out;		/* TRUE=downsampled data wanted */
+  jpeg_boolean buffered_image;	/* TRUE=multiple output passes */
+  jpeg_boolean raw_data_out;		/* TRUE=downsampled data wanted */
 
   J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
+  jpeg_boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
+  jpeg_boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
 
-  boolean quantize_colors;	/* TRUE=colormapped output wanted */
+  jpeg_boolean quantize_colors;	/* TRUE=colormapped output wanted */
   /* the following are ignored if not quantize_colors: */
   J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
+  jpeg_boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
   int desired_number_of_colors;	/* max # colors to use in created colormap */
   /* these are significant only in buffered-image mode: */
-  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  boolean enable_external_quant;/* enable future use of external colormap */
-  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
+  jpeg_boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
+  jpeg_boolean enable_external_quant;/* enable future use of external colormap */
+  jpeg_boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
 
   /* Description of actual output image that will be returned to application.
    * These fields are computed by jpeg_start_decompress().
@@ -560,8 +560,8 @@
   jpeg_component_info * comp_info;
   /* comp_info[i] describes component that appears i'th in SOF */
 
-  boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
+  jpeg_boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
+  jpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
 
   UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
   UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
@@ -572,17 +572,17 @@
   /* These fields record data obtained from optional markers recognized by
    * the JPEG library.
    */
-  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
+  jpeg_boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
   /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
   UINT8 JFIF_major_version;	/* JFIF version number */
   UINT8 JFIF_minor_version;
   UINT8 density_unit;		/* JFIF code for pixel size units */
   UINT16 X_density;		/* Horizontal pixel density */
   UINT16 Y_density;		/* Vertical pixel density */
-  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
+  jpeg_boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
   UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
 
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
+  jpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
 
   /* Aside from the specific data retained from APPn markers known to the
    * library, the uninterpreted contents of any or all APPn and COM markers
@@ -741,7 +741,7 @@
   size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
 
   JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
+  JMETHOD(jpeg_boolean, empty_output_buffer, (j_compress_ptr cinfo));
   JMETHOD(void, term_destination, (j_compress_ptr cinfo));
 };
 
@@ -753,9 +753,9 @@
   size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
 
   JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
+  JMETHOD(jpeg_boolean, fill_input_buffer, (j_decompress_ptr cinfo));
   JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
+  JMETHOD(jpeg_boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
   JMETHOD(void, term_source, (j_decompress_ptr cinfo));
 };
 
@@ -793,13 +793,13 @@
 				      JDIMENSION numrows));
   JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
 						  int pool_id,
-						  boolean pre_zero,
+						  jpeg_boolean pre_zero,
 						  JDIMENSION samplesperrow,
 						  JDIMENSION numrows,
 						  JDIMENSION maxaccess));
   JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
 						  int pool_id,
-						  boolean pre_zero,
+						  jpeg_boolean pre_zero,
 						  JDIMENSION blocksperrow,
 						  JDIMENSION numrows,
 						  JDIMENSION maxaccess));
@@ -808,12 +808,12 @@
 					   jvirt_sarray_ptr ptr,
 					   JDIMENSION start_row,
 					   JDIMENSION num_rows,
-					   boolean writable));
+					   jpeg_boolean writable));
   JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
 					    jvirt_barray_ptr ptr,
 					    JDIMENSION start_row,
 					    JDIMENSION num_rows,
-					    boolean writable));
+					    jpeg_boolean writable));
   JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
   JMETHOD(void, self_destruct, (j_common_ptr cinfo));
 
@@ -832,7 +832,7 @@
 /* Routine signature for application-supplied marker processing methods.
  * Need not pass marker code since it is stored in cinfo->unread_marker.
  */
-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
+typedef JMETHOD(jpeg_boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
 
 
 /* Declarations for routines called by application.
@@ -945,26 +945,26 @@
 				      J_COLOR_SPACE colorspace));
 EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
 EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   boolean force_baseline));
+				   jpeg_boolean force_baseline));
 EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
 					  int scale_factor,
-					  boolean force_baseline));
+					  jpeg_boolean force_baseline));
 EXTERN(void) jpeg_default_qtables JPP((j_compress_ptr cinfo,
-				       boolean force_baseline));
+				       jpeg_boolean force_baseline));
 EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
 				       const unsigned int *basic_table,
 				       int scale_factor,
-				       boolean force_baseline));
+				       jpeg_boolean force_baseline));
 EXTERN(int) jpeg_quality_scaling JPP((int quality));
 EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
 EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       boolean suppress));
+				       jpeg_boolean suppress));
 EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
 EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
 
 /* Main entry points for compression */
 EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      boolean write_all_tables));
+				      jpeg_boolean write_all_tables));
 EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
 					     JSAMPARRAY scanlines,
 					     JDIMENSION num_lines));
@@ -993,7 +993,7 @@
 
 /* Decompression startup: read start of JPEG datastream to see what's there */
 EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  boolean require_image));
+				  jpeg_boolean require_image));
 /* Return value is one of: */
 #define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
 #define JPEG_HEADER_OK		1 /* Found valid image datastream */
@@ -1005,11 +1005,11 @@
  */
 
 /* Main entry points for decompression */
-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
 EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
 					    JSAMPARRAY scanlines,
 					    JDIMENSION max_lines));
-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
 
 /* Replaces jpeg_read_scanlines when reading raw downsampled data. */
 EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
@@ -1017,11 +1017,11 @@
 					   JDIMENSION max_lines));
 
 /* Additional entry points for buffered-image mode. */
-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
+EXTERN(jpeg_boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
 				       int scan_number));
-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
+EXTERN(jpeg_boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
 EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
 EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
 /* Return value is one of: */
@@ -1067,7 +1067,7 @@
 EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
 
 /* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
+EXTERN(jpeg_boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
 					    int desired));
 
 
--- jpegtran.c.orig	2009-08-20 11:50:17.652872947 +0200
+++ jpegtran.c	2009-08-20 11:50:27.852866642 +0200
@@ -114,7 +114,7 @@
 
 LOCAL(int)
 parse_switches (j_compress_ptr cinfo, int argc, char **argv,
-		int last_file_arg_seen, boolean for_real)
+		int last_file_arg_seen, jpeg_boolean for_real)
 /* Parse optional switches.
  * Returns argv[] index of first file-name argument (== argc if none).
  * Any file names with indexes <= last_file_arg_seen are ignored;
@@ -126,7 +126,7 @@
 {
   int argn;
   char * arg;
-  boolean simple_progressive;
+  jpeg_boolean simple_progressive;
   char * scansarg = NULL;	/* saves -scans parm if any */
 
   /* Set up default JPEG parameters. */
@@ -194,7 +194,7 @@
     } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
       /* Enable debug printouts. */
       /* On first -d, print version identification */
-      static boolean printed_version = FALSE;
+      static jpeg_boolean printed_version = FALSE;
 
       if (! printed_version) {
 	fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n",
--- jquant1.c.orig	2009-08-20 11:46:56.877115750 +0200
+++ jquant1.c	2009-08-20 11:47:07.640866353 +0200
@@ -151,7 +151,7 @@
    * premultiplied as described above.  Since colormap indexes must fit into
    * JSAMPLEs, the entries of this array will too.
    */
-  boolean is_padded;		/* is the colorindex padded for odither? */
+  jpeg_boolean is_padded;		/* is the colorindex padded for odither? */
 
   int Ncolors[MAX_Q_COMPS];	/* # of values alloced to each component */
 
@@ -161,7 +161,7 @@
 
   /* Variables for Floyd-Steinberg dithering */
   FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
-  boolean on_odd_row;		/* flag to remember which row we are on */
+  jpeg_boolean on_odd_row;		/* flag to remember which row we are on */
 } my_cquantizer;
 
 typedef my_cquantizer * my_cquantize_ptr;
@@ -191,7 +191,7 @@
   int nc = cinfo->out_color_components; /* number of color components */
   int max_colors = cinfo->desired_number_of_colors;
   int total_colors, iroot, i, j;
-  boolean changed;
+  jpeg_boolean changed;
   long temp;
   static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
 
@@ -738,7 +738,7 @@
  */
 
 METHODDEF(void)
-start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+start_pass_1_quant (j_decompress_ptr cinfo, jpeg_boolean is_pre_scan)
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   size_t arraysize;
--- jquant2.c.orig	2009-08-20 11:47:15.798869830 +0200
+++ jquant2.c	2009-08-20 11:47:24.253866267 +0200
@@ -200,11 +200,11 @@
   /* Variables for accumulating image statistics */
   hist3d histogram;		/* pointer to the histogram */
 
-  boolean needs_zeroed;		/* TRUE if next pass must zero histogram */
+  jpeg_boolean needs_zeroed;		/* TRUE if next pass must zero histogram */
 
   /* Variables for Floyd-Steinberg dithering */
   FSERRPTR fserrors;		/* accumulated errors */
-  boolean on_odd_row;		/* flag to remember which row we are on */
+  jpeg_boolean on_odd_row;		/* flag to remember which row we are on */
   int * error_limiter;		/* table for clamping the applied error */
 } my_cquantizer;
 
@@ -1164,7 +1164,7 @@
  */
 
 METHODDEF(void)
-start_pass_2_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+start_pass_2_quant (j_decompress_ptr cinfo, jpeg_boolean is_pre_scan)
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   hist3d histogram = cquantize->histogram;
--- rdppm.c.orig	2009-08-20 11:48:37.810129297 +0200
+++ rdppm.c	2009-08-20 11:48:43.341116052 +0200
@@ -299,7 +299,7 @@
   ppm_source_ptr source = (ppm_source_ptr) sinfo;
   int c;
   unsigned int w, h, maxval;
-  boolean need_iobuffer, use_raw_buffer, need_rescale;
+  jpeg_boolean need_iobuffer, use_raw_buffer, need_rescale;
 
   if (getc(source->pub.input_file) != 'P')
     ERREXIT(cinfo, JERR_PPM_NOT);
--- rdswitch.c.orig	2009-08-20 11:49:02.748128456 +0200
+++ rdswitch.c	2009-08-20 11:49:24.135865988 +0200
@@ -35,7 +35,7 @@
 }
 
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 read_text_integer (FILE * file, long * result, int * termchar)
 /* Read an unsigned decimal integer from a file, store it in result */
 /* Reads one trailing character after the integer; returns it in termchar */
@@ -70,8 +70,8 @@
 }
 
 
-GLOBAL(boolean)
-read_quant_tables (j_compress_ptr cinfo, char * filename, boolean force_baseline)
+GLOBAL(jpeg_boolean)
+read_quant_tables (j_compress_ptr cinfo, char * filename, jpeg_boolean force_baseline)
 /* Read a set of quantization tables from the specified file.
  * The file is plain ASCII text: decimal numbers with whitespace between.
  * Comments preceded by '#' may be included in the file.
@@ -126,7 +126,7 @@
 
 #ifdef C_MULTISCAN_FILES_SUPPORTED
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 read_scan_integer (FILE * file, long * result, int * termchar)
 /* Variant of read_text_integer that always looks for a non-space termchar;
  * this simplifies parsing of punctuation in scan scripts.
@@ -155,7 +155,7 @@
 }
 
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 read_scan_script (j_compress_ptr cinfo, char * filename)
 /* Read a scan script from the specified text file.
  * Each entry in the file defines one scan to be emitted.
@@ -263,8 +263,8 @@
 #endif /* C_MULTISCAN_FILES_SUPPORTED */
 
 
-GLOBAL(boolean)
-set_quality_ratings (j_compress_ptr cinfo, char *arg, boolean force_baseline)
+GLOBAL(jpeg_boolean)
+set_quality_ratings (j_compress_ptr cinfo, char *arg, jpeg_boolean force_baseline)
 /* Process a quality-ratings parameter string, of the form
  *     N[,N,...]
  * If there are more q-table slots than parameters, the last value is replicated.
@@ -295,7 +295,7 @@
 }
 
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 set_quant_slots (j_compress_ptr cinfo, char *arg)
 /* Process a quantization-table-selectors parameter string, of the form
  *     N[,N,...]
@@ -330,7 +330,7 @@
 }
 
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 set_sample_factors (j_compress_ptr cinfo, char *arg)
 /* Process a sample-factors parameter string, of the form
  *     HxV[,HxV,...]
--- rdtarga.c.orig	2009-08-20 11:48:50.730140596 +0200
+++ rdtarga.c	2009-08-20 11:48:55.082866165 +0200
@@ -336,7 +336,7 @@
   U_CHAR targaheader[18];
   int idlen, cmaptype, subtype, flags, interlace_type, components;
   unsigned int width, height, maplen;
-  boolean is_bottom_up;
+  jpeg_boolean is_bottom_up;
 
 #define GET_2B(offset)	((unsigned int) UCH(targaheader[offset]) + \
 			 (((unsigned int) UCH(targaheader[offset+1])) << 8))
--- transupp.c.orig	2009-08-20 11:50:33.940866572 +0200
+++ transupp.c	2009-08-20 11:50:47.543865927 +0200
@@ -741,7 +741,7 @@
  * *strptr is advanced over the digit string, and *result is set to its value.
  */
 
-LOCAL(boolean)
+LOCAL(jpeg_boolean)
 jt_read_integer (const char ** strptr, JDIMENSION * result)
 {
   const char * ptr = *strptr;
@@ -771,7 +771,7 @@
  * This code is loosely based on XParseGeometry from the X11 distribution.
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)
 {
   info->crop = FALSE;
@@ -859,7 +859,7 @@
 			      jpeg_transform_info *info)
 {
   jvirt_barray_ptr *coef_arrays = NULL;
-  boolean need_workspace, transpose_it;
+  jpeg_boolean need_workspace, transpose_it;
   jpeg_component_info *compptr;
   JDIMENSION xoffset, yoffset, width_in_iMCUs, height_in_iMCUs;
   JDIMENSION width_in_blocks, height_in_blocks;
@@ -1097,7 +1097,7 @@
 adjust_exif_parameters (JOCTET FAR * data, unsigned int length,
 			JDIMENSION new_width, JDIMENSION new_height)
 {
-  boolean is_motorola; /* Flag for byte order */
+  jpeg_boolean is_motorola; /* Flag for byte order */
   unsigned int number_of_tags, tagnum;
   unsigned int firstoffset, offset;
   JDIMENSION new_value;
@@ -1423,12 +1423,12 @@
  *           (may use custom action then)
  */
 
-GLOBAL(boolean)
+GLOBAL(jpeg_boolean)
 jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
 			     int MCU_width, int MCU_height,
 			     JXFORM_CODE transform)
 {
-  boolean result = TRUE; /* initialize TRUE */
+  jpeg_boolean result = TRUE; /* initialize TRUE */
 
   switch (transform) {
   case JXFORM_FLIP_H:
--- wrbmp.c.orig	2009-08-20 11:50:03.848890455 +0200
+++ wrbmp.c	2009-08-20 11:50:10.497868472 +0200
@@ -44,7 +44,7 @@
 typedef struct {
   struct djpeg_dest_struct pub;	/* public fields */
 
-  boolean is_os2;		/* saves the OS2 format request flag */
+  jpeg_boolean is_os2;		/* saves the OS2 format request flag */
 
   jvirt_sarray_ptr whole_image;	/* needed to reverse row order */
   JDIMENSION data_width;	/* JSAMPLEs per row */
@@ -387,7 +387,7 @@
  */
 
 GLOBAL(djpeg_dest_ptr)
-jinit_write_bmp (j_decompress_ptr cinfo, boolean is_os2)
+jinit_write_bmp (j_decompress_ptr cinfo, jpeg_boolean is_os2)
 {
   bmp_dest_ptr dest;
   JDIMENSION row_width;
--- jcapistd.c.orig	2009-08-20 12:02:14.120886794 +0200
+++ jcapistd.c	2009-08-20 12:02:21.946120307 +0200
@@ -35,7 +35,7 @@
  */
 
 GLOBAL(void)
-jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
+jpeg_start_compress (j_compress_ptr cinfo, jpeg_boolean write_all_tables)
 {
   if (cinfo->global_state != CSTATE_START)
     ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
--- cdjpeg.h.orig	2009-08-20 12:03:31.719864529 +0200
+++ cdjpeg.h	2009-08-20 12:03:59.094878304 +0200
@@ -119,7 +119,7 @@
 
 EXTERN(cjpeg_source_ptr) jinit_read_bmp JPP((j_compress_ptr cinfo));
 EXTERN(djpeg_dest_ptr) jinit_write_bmp JPP((j_decompress_ptr cinfo,
-					    boolean is_os2));
+					    jpeg_boolean is_os2));
 EXTERN(cjpeg_source_ptr) jinit_read_gif JPP((j_compress_ptr cinfo));
 EXTERN(djpeg_dest_ptr) jinit_write_gif JPP((j_decompress_ptr cinfo));
 EXTERN(cjpeg_source_ptr) jinit_read_ppm JPP((j_compress_ptr cinfo));
@@ -131,13 +131,13 @@
 
 /* cjpeg support routines (in rdswitch.c) */
 
-EXTERN(boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
-				       boolean force_baseline));
-EXTERN(boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));
-EXTERN(boolean) set_quality_ratings JPP((j_compress_ptr cinfo, char *arg,
-					 boolean force_baseline));
-EXTERN(boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
-EXTERN(boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
+EXTERN(jpeg_boolean) read_quant_tables JPP((j_compress_ptr cinfo, char * filename,
+				       jpeg_boolean force_baseline));
+EXTERN(jpeg_boolean) read_scan_script JPP((j_compress_ptr cinfo, char * filename));
+EXTERN(jpeg_boolean) set_quality_ratings JPP((j_compress_ptr cinfo, char *arg,
+					 jpeg_boolean force_baseline));
+EXTERN(jpeg_boolean) set_quant_slots JPP((j_compress_ptr cinfo, char *arg));
+EXTERN(jpeg_boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg));
 
 /* djpeg support routines (in rdcolmap.c) */
 
@@ -149,7 +149,7 @@
 EXTERN(void) start_progress_monitor JPP((j_common_ptr cinfo,
 					 cd_progress_ptr progress));
 EXTERN(void) end_progress_monitor JPP((j_common_ptr cinfo));
-EXTERN(boolean) keymatch JPP((char * arg, const char * keyword, int minchars));
+EXTERN(jpeg_boolean) keymatch JPP((char * arg, const char * keyword, int minchars));
 EXTERN(FILE *) read_stdin JPP((void));
 EXTERN(FILE *) write_stdout JPP((void));
 
--- transupp.h.orig	2009-08-20 12:05:33.467881022 +0200
+++ transupp.h	2009-08-20 12:05:51.331128614 +0200
@@ -119,10 +119,10 @@
 typedef struct {
   /* Options: set by caller */
   JXFORM_CODE transform;	/* image transform operator */
-  boolean perfect;		/* if TRUE, fail if partial MCUs are requested */
-  boolean trim;			/* if TRUE, trim partial MCUs as needed */
-  boolean force_grayscale;	/* if TRUE, convert color image to grayscale */
-  boolean crop;			/* if TRUE, crop source image */
+  jpeg_boolean perfect;		/* if TRUE, fail if partial MCUs are requested */
+  jpeg_boolean trim;			/* if TRUE, trim partial MCUs as needed */
+  jpeg_boolean force_grayscale;	/* if TRUE, convert color image to grayscale */
+  jpeg_boolean crop;			/* if TRUE, crop source image */
 
   /* Crop parameters: application need not set these unless crop is TRUE.
    * These can be filled in by jtransform_parse_crop_spec().
@@ -151,7 +151,7 @@
 #if TRANSFORMS_SUPPORTED
 
 /* Parse a crop specification (written in X11 geometry style) */
-EXTERN(boolean) jtransform_parse_crop_spec
+EXTERN(jpeg_boolean) jtransform_parse_crop_spec
 	JPP((jpeg_transform_info *info, const char *spec));
 /* Request any required workspace */
 EXTERN(void) jtransform_request_workspace
@@ -169,7 +169,7 @@
 /* Determine whether lossless transformation is perfectly
  * possible for a specified image and transformation.
  */
-EXTERN(boolean) jtransform_perfect_transform
+EXTERN(jpeg_boolean) jtransform_perfect_transform
 	JPP((JDIMENSION image_width, JDIMENSION image_height,
 	     int MCU_width, int MCU_height,
 	     JXFORM_CODE transform));


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jan 2009 11:48:26 -0000	1.2
+++ .cvsignore	27 Aug 2009 20:42:36 -0000	1.3
@@ -1 +1 @@
-jpegsrc.v6b.tar.gz
+jpegsrc.v7.tar.gz


Index: mingw32-libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/mingw32-libjpeg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libjpeg.spec	25 Jul 2009 12:21:59 -0000	1.4
+++ mingw32-libjpeg.spec	27 Aug 2009 20:42:36 -0000	1.5
@@ -1,35 +1,33 @@
-%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}
 
 # Build the programs like cjpeg, etc.
-# https://bugzilla.redhat.com/show_bug.cgi?id=467401c7
-%define build_programs 0
+# https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7
+%global build_programs 0
 
 Name:           mingw32-libjpeg
-Version:        6b
-Release:        11%{?dist}
+Version:        7
+Release:        1%{?dist}
 Summary:        MinGW Windows Libjpeg library
 
 License:        IJG
 URL:            http://www.ijg.org/
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
-Source1:        configure.in
+Source0:        http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz
 
-Patch1:         jpeg-c++.patch
-Patch4:         libjpeg-cflags.patch
 Patch5:         libjpeg-buf-oflo.patch
-Patch6:         libjpeg-autoconf.patch
 
-Patch100:       jpeg-mingw32.patch
+Patch101:       jpeg-workaround-typedef-conflict.patch
+Patch102:       jpeg-fix-typo.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
@@ -42,49 +40,29 @@ BuildRequires:  autoconf, libtool
 MinGW Windows Libjpeg library.
 
 
-%prep
-%setup -q -n jpeg-6b
+%package static
+Summary:        Static version of the MinGW Windows Libjpeg library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
 
-%patch1 -p1 -b .c++
-%patch4 -p1 -b .cflags
-%patch5 -p1 -b .oflo
-%patch6 -p1
+%description static
+Static version of the MinGW Windows Libjpeg library.
 
-%patch100 -p1
 
-# For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
-# We need to re-autoconf though, in order to update libtool support,
-# so supply configure.in.
-cp %{SOURCE1} configure.in
-
-# libjpeg 6b includes a horribly obsolete version of libtool.
-# Blow it away and replace with build system's version.
-rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4
-
-cat /usr/share/aclocal/libtool.m4 > aclocal.m4
-# If this is the new libtool 2.x, we need to append some additional
-# files.  Rather than hard-coding a version of libtool, just test
-# if the files exist and append them:
-for f in \
-  /usr/share/aclocal/ltoptions.m4 \
-  /usr/share/aclocal/ltversion.m4 \
-  /usr/share/aclocal/ltsugar.m4 \
-  /usr/share/aclocal/lt~obsolete.m4; do
-  if [ -f $f ]; then cat $f >> aclocal.m4; fi
-done
+%{_mingw32_debug_package}
 
-# Now we can run libtool.
-libtoolize
 
-# Automake can fail - we only need this to get config.sub and config.guess.
-automake -a ||:
+%prep
+%setup -q -n jpeg-%{version}
 
-# Finally because we replaced configure.in:
-autoconf
+%patch5 -p1 -b .oflo
+
+%patch101 -p0
+%patch102 -p0
 
 
 %build
-%{_mingw32_configure} --enable-shared --disable-static
+%{_mingw32_configure} --enable-shared --enable-static
 make %{?_smp_mflags}
 
 
@@ -102,14 +80,10 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandi
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
 pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
-# Rename or remove win32 native binaries
-for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
-%if %build_programs
-   mv $i $i.exe
-%else
-   rm $i
+# Remove win32 native binaries if wanted
+%if %build_programs == 0
+   rm -f *.exe
 %endif
-done
 popd
 
 
@@ -118,16 +92,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README
 %if %build_programs
-%{_mingw32_bindir}/cjpeg.exe
-%{_mingw32_bindir}/djpeg.exe
-%{_mingw32_bindir}/jpegtran.exe
-%{_mingw32_bindir}/rdjpgcom.exe
-%{_mingw32_bindir}/wrjpgcom.exe
+%{_mingw32_bindir}/i686-pc-mingw32-cjpeg.exe
+%{_mingw32_bindir}/i686-pc-mingw32-djpeg.exe
+%{_mingw32_bindir}/i686-pc-mingw32-jpegtran.exe
+%{_mingw32_bindir}/i686-pc-mingw32-rdjpgcom.exe
+%{_mingw32_bindir}/i686-pc-mingw32-wrjpgcom.exe
 %endif
-%{_mingw32_bindir}/libjpeg-62.dll
+%{_mingw32_bindir}/libjpeg-7.dll
 %{_mingw32_includedir}/jconfig.h
 %{_mingw32_includedir}/jerror.h
 %{_mingw32_includedir}/jmorecfg.h
@@ -135,8 +109,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libjpeg.dll.a
 %{_mingw32_libdir}/libjpeg.la
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libjpeg.a
+
 
 %changelog
+* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 7-1
+- Update to version 7
+- Resolves typedef conflict (BZ #497492)
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+- Fixed %%defattr line
+- Added -static subpackage
+- Dropped upstreamed patches
+- Dropped autoconf stuff
+- Fixed a comment typo
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6b-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jan 2009 11:48:26 -0000	1.2
+++ sources	27 Aug 2009 20:42:36 -0000	1.3
@@ -1 +1 @@
-dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz
+382ef33b339c299b56baf1296cda9785  jpegsrc.v7.tar.gz


--- jpeg-c++.patch DELETED ---



From epienbro at fedoraproject.org  Thu Aug 27 20:43:20 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 27 Aug 2009 20:43:20 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.8, 1.9 mingw32-glib2.spec,
	1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20090827204320.2207E11C00EB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31671

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.21.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Aug 2009 23:09:27 -0000	1.8
+++ .cvsignore	27 Aug 2009 20:43:19 -0000	1.9
@@ -1 +1 @@
-glib-2.21.4.tar.bz2
+glib-2.21.5.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mingw32-glib2.spec	12 Aug 2009 23:09:27 -0000	1.13
+++ mingw32-glib2.spec	27 Aug 2009 20:43:19 -0000	1.14
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.21.4
+Version:        2.21.5
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.5-1
+- Update to 2.21.5
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.4-1
 - Update to 2.21.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Aug 2009 23:09:27 -0000	1.8
+++ sources	27 Aug 2009 20:43:20 -0000	1.9
@@ -1 +1 @@
-5092c5b479ba80065dc164d27e63000f  glib-2.21.4.tar.bz2
+5f3f19c4a8088c51e21cad5b8ea166e5  glib-2.21.5.tar.bz2



From hubbitus at fedoraproject.org  Thu Aug 27 20:43:44 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Thu, 27 Aug 2009 20:43:44 +0000 (UTC)
Subject: rpms/3proxy/EL-5 3proxy.cfg, NONE, 1.1 3proxy.init, NONE,
	1.1 3proxy.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090827204344.406BC11C00EB@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/3proxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30875/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	3proxy.cfg 3proxy.init 3proxy.spec import.log 
Log Message:
Initial import 3proxy into Fedora




--- NEW FILE 3proxy.cfg ---
# Yes, 3proxy.cfg can be executable, in this case you should place
# something like
#config /usr/local/3proxy/3proxy.cfg
# to show which configuration 3proxy should re-read on realod.

#system "echo Hello world!"
# you may use system to execute some external command if proxy starts

# We can configure nservers to avoid unsafe gethostbyname() usage
#nserver 10.1.2.1
#nserver 10.2.2.2
# nscache is good to save speed, traffic and bandwidth
nscache 65536

#nsrecord porno.security.nnov.ru 0.0.0.0
# nobody will be able to access porno.security.nnov.ru by the name.
#nsrecord wpad.security.nnov.ru www.security.nnov.ru
# wpad.security.nnov.ru will resolve to www.security.nnov.ru for
# clients


timeouts 1 5 30 60 180 1800 15 60
# Here we can change timeout values

users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9HyhcMHEe1"
# note that "" required, overvise $... is treated as include file name.
# $1$qwer$CHFTUFGqkjue9HyhcMHEe1 is 'test' in MD5 crypt format.
#users $/usr/local/etc/3proxy/passwd
# this example shows you how to include passwd file. For included files
# <CR> and <LF> are treated as field separators.

daemon
# now we will not depend on any console (daemonize). daemon must be given
# before any significant command on *nix.

#service
# service is required under NT if you want 3proxy to start as service

#log /usr/local/etc/3proxy/logs/3proxy.log D
log /var/log/3proxy/3proxy.log
# log allows to specify log file location and rotation, D means logfile
# is created daily

# in log file we want to have underscores instead of spaces
logformat "- +_L%t.%.  %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "L%d-%m-%Y %H:%M:%S %z %N.%p %E %U %C:%c %R:%r %O %I %h %T"
#logformat "Linsert into log (l_date, l_user, l_service, l_in, l_out, l_descr) values ('%d-%m-%Y %H:%M:%S', '%U', '%N', %I, %O, '%T')"

archiver gz /bin/gzip %F
#archiver zip zip -m -qq %A %F
#archiver zip pkzipc -add -silent -move %A %F
#archiver rar rar a -df -inul %A %F
# if archiver specified log file will be compressed after closing.
# you should specify extension, path to archiver and command line, %A will be
# substituted with archive file name, %f - with original file name.
# Original file will not be removed, so archiver should care about it.

rotate 30
# We will keep last 30 log files

auth iponly
#auth nbname
#auth strong
# auth specifies type of user authentication. If you specify none proxy
# will not do anything to check name of the user. If you specify
# nbname proxy will send NetBIOS name request packet to UDP/137 of
# client and parse request for NetBIOS name of messanger service.
# Strong means that proxy will check password. For strong authentication
# unknown user will not be allowed to use proxy regardless of ACL.
# If you do not want username to be checked but wanna ACL to work you should
# specify auth iponly.


#allow ADMINISTRATOR,root
#allow * 127.0.0.1,192.168.1.1 * *
#redirect 192.168.1.2 80 * * * 80
#allow * 192.168.1.0/24 * 25,53,110,20-21,1024-65535
# we will allow everything if username matches ADMINISTRATOR or root or
# client ip is 127.0.0.1 or 192.168.1.1. Overwise we will redirect any request
# to port 80 to our Web-server 192.168.0.2.
# We will allow any outgoing connections from network 192.168.1.0/24 to
# SMTP, POP3, FTP, DNS and unprivileged ports.
# Note, that redirect may also be used with proxy or portmapper. It will
# allow you to redirect requests to different ports or different server
# for different clients.

#  sharing access to internet

#external 10.1.1.1
external 0.0.0.0
# external is address 3proxy uses for outgoing connections. 0.0.0.0 means any
# interface. Using 0.0.0.0 is not good because it allows to connect to 127.0.0.1

#internal 192.168.1.1
internal 127.0.0.1
# internal is address of interface proxy will listen for incoming requests
# 127.0.0.1 means only localhost will be able to use this proxy. This is
# address you should specify for clients as proxy IP.
# You MAY use 0.0.0.0 but you shouldn't, because it's a chance for you to
# have open proxy in your network in this case.

auth none
# no authentication is requires

dnspr

# dnsproxy listens on UDP/53 to answer client's DNS requests. It requires
# nserver/nscache configuration.


#external $./external.ip
#internal $./internal.ip
# this is just an alternative form fo giving external and internal address
# allows you to read this addresses from files

auth strong
# We want to protect internal interface
deny * * 127.0.0.1,192.168.1.1
# and llow HTTP and HTTPS traffic.
allow * * * 80-88,8080-8088 HTTP
allow * * * 443,8443 HTTPS
proxy -n

auth none
# pop3p will be used without any authentication. It's bad choice
# because it's possible to use pop3p to access any port
pop3p

tcppm 25 mail.my.provider 25
#udppm -s 53 ns.my.provider 53
# we can portmap port TCP/25 to provider's SMTP server and UDP/53
# to provider's DNS.
# Now we can use our proxy as SMTP and DNS server.
# -s switch for UDP means "single packet" service - instead of setting
# association for period of time association will only be set for 1 packet.
# It's very userfull for services like DNS but not for some massive services
# like multimedia streams or online games.

auth strong
flush
allow 3APA3A,test
maxconn 20
socks
# for socks we will use password authentication and different access control -
# we flush previously configured ACL list and create new one to allow users
# test and 3APA3A to connect from any location


auth strong
flush
internal 127.0.0.1
allow 3APA3A 127.0.0.1
maxconn 3
admin
#only allow acces to admin interface for user 3APA3A from 127.0.0.1 address
#via 127.0.0.1 address.

# map external 80 and 443 ports to internal Web server
# examples below show how to use 3proxy to publish Web server in internal
# network to Internet. We must switch internal and external addresses and
# flush any ACLs

#auth none
#flush
#external $./internal.ip
#internal $./external.ip
#maxconn 300
#tcppm 80 websrv 80
#tcppm 443 websrv 443


#chroot /usr/local/jail
#setgid 65535
#setuid 65535
# now we needn't any root rights. We can chroot and setgid/setuid.


###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######


--- NEW FILE 3proxy.init ---
#!/bin/sh
#
# Init file for Software Watchdog daemon.
#
# Written by Dag Wieers <dag at wieers.com>.
# Rewrote for ALT Linux by Pavlov Konstantin <thresh at altlinux.ru>
# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan at hubbitus.info>
#
# chkconfig: - 02 98
# description: 3proxy Proxy Server
#
# processname: 3proxy
# config: /etc/3proxy.cfg
# pidfile: /var/run/3proxy.pid

WITHOUT_RC_COMPAT=1

. /etc/init.d/functions

### Default variables
prog=3proxy
CONFIG=/etc/3proxy.cfg
PROXY=/usr/bin/3proxy
RETVAL=0
PIDFILE=/var/run/3proxy.pid
LOCKFILE=/var/lock/subsys/3proxy
#LOGFILE=/var/log/3proxy.log

start() {
	echo -n $"Starting $prog: "
	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && touch ${LOCKFILE}
	return $RETVAL
}

stop() {
	echo -n $"Stopping $prog: "
	killproc -p "${PIDFILE}" -d 1 "$PROXY"
	RETVAL=$?
	echo
		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
	return $RETVAL
}

restart() {
	stop
	start
}

reload(){
	echo -n $"Reloading $prog: "
	killproc -p ${pidfile} $httpd -USR1
	RETVAL=$?
	echo
}

case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
  	restart
	;;
  reload)
	reload
	;;
  condrestart)
	[ -e $LOCKFILE ] && restart
	RETVAL=$?
	;;
  status)
	status -p "$PIDFILE" "$PROXY"
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
	RETVAL=1
	;;
esac

exit $RETVAL


--- NEW FILE 3proxy.spec ---
Name:		3proxy
Version:		0.6
Release:		3%{?dist}

Summary:		Tiny but very powerful proxy
Summary(ru):	?????????, ?? ?????? ?????? ??????-??????

License:		BSD or ASL 2.0 or GPLv2+ or LGPLv2+
Group:		System Environment/Daemons
Url:			http://3proxy.ru/?l=EN

Source0:		http://3proxy.ru/%{version}/%{name}-%{version}.tgz
Source1:		3proxy.init
Source2:		3proxy.cfg
# EPEL still require it
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	dos2unix

%description
3proxy -- light proxy server.
Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP,
POP3, UDP and TCP portmapping, access control, bandwith control, traffic
limitation and accounting based on username, client IP, target IP, day time,
day of week, etc.

%description -l ru
3proxy -- ????????? ?????? ??????.
??? ????????????? ??????? ?????????????? HTTP, HTTPS, SOCKS v4, SOCKS v4a,
SOCKS v5, FTP, POP3, UDP ? TCP ??????? ?????? (portmapping), ?????? ???????
?????????? ????????? ???????, ???????????? ??????? ? ???????????, ????????????
?? ????? ????????????, ?????????? IP ??????, IP ????, ??????? ???, ??? ??????
? ?.?.

%prep
%setup -q

# To use "fedora" CFLAGS (exported)
sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux

dos2unix Changelog

%build
%{__make} -f Makefile.Linux

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_man3dir}
mkdir -p %{buildroot}%{_man8dir}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
install -m755 -D src/ftppr %{buildroot}%{_bindir}/ftppr
install -m755 -D src/mycrypt %{buildroot}%{_bindir}/mycrypt
install -m755 -D src/pop3p %{buildroot}%{_bindir}/pop3p
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/proxy %{buildroot}%{_bindir}/htproxy
install -m755 -D src/socks %{buildroot}%{_bindir}/socks
install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm

install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg

%clean
rm -rf %{buildroot}

%post
# Register service
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{name} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{name}
fi

%files
%defattr(-,root,root,-)
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%{_initrddir}/%{name}
%{_localstatedir}/log/%{name}
%doc Readme Changelog authors copying news

%changelog
* Thu Aug 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-3
- Fedora Review started - thank you Peter Lemenkov.
- Change rights (0755->0644) of config.
- Disable service by default.
- Add BR dos2unix.

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-2
- /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy-bin.
- Add Source2: 3proxy.cfg from Alt Linux (slightly modified) - http://sisyphus.ru/ru/srpm/Sisyphus/3proxy/sources/1 (thanks to Afanasov Dmitry).
- Add log-dir %%{_localstatedir}/log/%%{name}

* Mon Aug 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-1
- Ressurect old spec. New version 0.6.
- Rename spec to classic %%{name}.spec.
- Remove Hu part from release and add %%{?dist}.
- Change summary, description, URL. Add Russian localisation of sumamry and description.
- Strip some old comments.
- Add to %%doc Readme Changelog authors copying news.
- Turn macros usage from %%name to %%{name} for consistence.
- Change group from System/Servers to standard System Environment/Daemons.
- Add %%defattr(-,root,root,-) in %%files section.
- Add cleanup in %%install section.
- Add %%clean section with cleanup buildroot.
- License changed from just GPL to "BSD or ASL 2.0 or GPLv2+ or LGPLv2+" (according to Makefile.Linux)
- Add %%config(noreplace) mark to all configs.
- Add file %%{_initdir}/%%{name}
- Old %%{_initdir} macros replaced by %%{_initrddir}
- Hack makefile to use system CFLAGS.
- Add %%post/%%postun sections.

* Fri Jan 25 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.5.3k
- Import from ftp://ftp.nluug.nl/pub/os/Linux/distr/altlinux/4.0/Server/4.0.1/files/SRPMS/3proxy-0.5.3h-alt1.src.rpm
	Combine with ftp://ftp.pbone.net/mirror/ftp.sourceforge.net/pub/sourceforge/t/th/three-proxy/3proxy-0.5.3g-1.src.rpm
- Steep to version 0.5.3k
- Comment out packager
- Reformat header of spec with tabs
- Add desc from second src.rpm of import
- Correct source0
- Add -c key fo %%setup macro
- Add BuildRoot definition (this is not ALT)
- Change
	Release:	alt1
	to
	Release:	0.Hu.0

* Fri Apr 13 2007 Lunar Child <luch at altlinux.ru> 0.5.3h-alt1
- new version

* Wed Mar 21 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt2
- Added init script.
- Added new trivial config file.

* Tue Mar 20 2007 Lunar Child <luch at altlinux.ru> 0.5.3g-alt1
- First build for ALT Linux Sisyphus


--- NEW FILE import.log ---
proxy-0_6-3_fc11:EL-5:3proxy-0.6-3.fc11.src.rpm:1251405632


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:17:25 -0000	1.1
+++ .cvsignore	27 Aug 2009 20:43:43 -0000	1.2
@@ -0,0 +1 @@
+3proxy-0.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:17:25 -0000	1.1
+++ sources	27 Aug 2009 20:43:44 -0000	1.2
@@ -0,0 +1 @@
+2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz



From epienbro at fedoraproject.org  Thu Aug 27 20:46:46 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 27 Aug 2009 20:46:46 +0000 (UTC)
Subject: rpms/mingw32-pango/devel .cvsignore, 1.6, 1.7 mingw32-pango.spec,
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090827204646.926B211C00EB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pango/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1130

Modified Files:
	.cvsignore mingw32-pango.spec sources 
Log Message:
Update to 1.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Aug 2009 17:06:59 -0000	1.6
+++ .cvsignore	27 Aug 2009 20:46:46 -0000	1.7
@@ -1 +1 @@
-pango-1.25.4.tar.bz2
+pango-1.25.5.tar.bz2


Index: mingw32-pango.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/mingw32-pango.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-pango.spec	18 Aug 2009 16:49:41 -0000	1.8
+++ mingw32-pango.spec	27 Aug 2009 20:46:46 -0000	1.9
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.25.4
+Version:        1.25.5
 Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
@@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
   
 
 %changelog
+* Mon Aug 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.5-1
+- Update to 1.25.5
+
 * Tue Aug 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.25.4-1
 - Update to 1.25.4
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pango/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Aug 2009 17:06:59 -0000	1.6
+++ sources	27 Aug 2009 20:46:46 -0000	1.7
@@ -1 +1 @@
-c46848c6a065e0a71764626a1fcf995e  pango-1.25.4.tar.bz2
+3f0b5f9b58f951ddaffbdb45b2d12741  pango-1.25.5.tar.bz2



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:23 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested watchcommits
Message-ID: <20090827204823.ED6AE10F854@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libtiff (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:24 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested commit
Message-ID: <20090827204824.C6E6C10F879@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libtiff (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:25 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested approveacls
Message-ID: <20090827204825.C0CBB10F881@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libtiff (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:30 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested watchbugzilla
Message-ID: <20090827204830.33ECD10F88C@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libtiff (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:32 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested watchbugzilla
Message-ID: <20090827204832.628DE10F895@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libtiff (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:32 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested commit
Message-ID: <20090827204833.09F4910F899@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libtiff (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:35 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested watchcommits
Message-ID: <20090827204835.6D7C710F89C@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libtiff (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Thu Aug 27 20:48:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 20:48:37 +0000
Subject: [pkgdb] mingw32-libtiff: epienbro has requested approveacls
Message-ID: <20090827204837.B23B510F854@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libtiff (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From rdieter at fedoraproject.org  Thu Aug 27 20:51:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 27 Aug 2009 20:51:01 +0000 (UTC)
Subject: rpms/redland/devel redland.spec,1.18,1.19
Message-ID: <20090827205101.E581F11C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/redland/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3620

Modified Files:
	redland.spec 
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-10
- fix build with newer sqlite (#519781)



Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- redland.spec	21 Aug 2009 15:42:23 -0000	1.18
+++ redland.spec	27 Aug 2009 20:51:01 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           redland
 Version:        1.0.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
@@ -46,6 +46,10 @@ Header files for development with Redlan
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
+# hack around SQLITE_API macro collision with newer sqlite
+sed -i.REDLAND_SQLITE_API -e "s|SQLITE_API|REDLAND_SQLITE_API|" \
+  configure.ac configure librdf/rdf_config.h.in librdf/rdf_storage_sqlite.c
+
 
 %build
 # disable-static does not work if we override to use the system's libtool
@@ -101,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-10
+- fix build with newer sqlite (#519781)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.7-9
 - rebuilt with new openssl
 



From epienbro at fedoraproject.org  Thu Aug 27 20:56:08 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 27 Aug 2009 20:56:08 +0000 (UTC)
Subject: rpms/mingw32-jasper/devel mingw32-jasper.spec,1.2,1.3
Message-ID: <20090827205608.48F1B11C00EB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-jasper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6214

Modified Files:
	mingw32-jasper.spec 
Log Message:
* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.900.1-10
- Rebuild for mingw32-libjpeg 7
- Automatically generate debuginfo subpackage
- Added -static subpackage
- Use %%global instead of %%define



Index: mingw32-jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-jasper/devel/mingw32-jasper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-jasper.spec	25 Jul 2009 12:20:03 -0000	1.2
+++ mingw32-jasper.spec	27 Aug 2009 20:56:08 -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-jasper
 Version:        1.900.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        MinGW Windows Jasper library
 
 License:        JasPer
@@ -42,6 +43,18 @@ BuildRequires:  mingw32-dlfcn
 MinGW Windows Jasper library.
 
 
+%package static
+Summary:        Static version of the MinGW Windows Jasper library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Jasper library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n jasper-%{version}
 %patch3 -p1 -b .CVE-2007-2721
@@ -52,7 +65,7 @@ MinGW Windows Jasper library.
 
 %build
 %{_mingw32_configure} \
-  --disable-opengl --enable-libjpeg --disable-static --enable-shared
+  --disable-opengl --enable-libjpeg --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
@@ -82,8 +95,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libjasper.la
 %{_mingw32_includedir}/jasper/
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libjasper.a
+
 
 %changelog
+* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.900.1-10
+- Rebuild for mingw32-libjpeg 7
+- Automatically generate debuginfo subpackage
+- Added -static subpackage
+- Use %%global instead of %%define
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Thu Aug 27 20:58:15 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 27 Aug 2009 20:58:15 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel nouveau-bgnr.patch, NONE,
	1.1 xorg-x11-drv-nouveau.spec, 1.52, 1.53
Message-ID: <20090827205815.F418911C00EB@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7444

Modified Files:
	xorg-x11-drv-nouveau.spec 
Added Files:
	nouveau-bgnr.patch 
Log Message:
* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 0.0.15-6.20090820git569a17a
- nouveau-bgnr.patch: Enable seamless plymouth->gdm transition.


nouveau-bgnr.patch:
 nv_driver.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE nouveau-bgnr.patch ---
diff -up xf86-video-nouveau-0.0.15/src/nv_driver.c.jx xf86-video-nouveau-0.0.15/src/nv_driver.c
--- xf86-video-nouveau-0.0.15/src/nv_driver.c.jx	2009-08-27 16:56:28.000000000 -0400
+++ xf86-video-nouveau-0.0.15/src/nv_driver.c	2009-08-27 16:59:28.811934951 -0400
@@ -747,6 +747,8 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
 	 */
 #ifdef XF86DRM_MODE
 	pNv->kms_enable = !drmCheckModesettingSupported(bus_id);
+	if (pNv->kms_enable)
+	    pScrn->canDoBGNoneRoot = 1;
 #endif
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 		   "[drm] kernel modesetting %s\n", pNv->kms_enable ?


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xorg-x11-drv-nouveau.spec	21 Aug 2009 04:17:36 -0000	1.52
+++ xorg-x11-drv-nouveau.spec	27 Aug 2009 20:58:15 -0000	1.53
@@ -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:   5.%{snapshot}%{?dist}
+Release:   6.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -46,6 +46,7 @@ Patch1: dcbconf_7_4_ignore.diff
 Patch2: nouveau-multiple-xserver.patch
 Patch3: nouveau-transition-hack.patch
 Patch6: nouveau-bicubic-2x.patch
+Patch7: nouveau-bgnr.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -58,6 +59,7 @@ X.Org X11 nouveau video driver.
 %patch2 -p1 -b .multix
 %patch3 -p1 -b .transition
 %patch6 -p1 -b .bicubic
+%patch7 -p1 -b .bgnr
 
 %build
 autoreconf -v --install
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 0.0.15-6.20090820git569a17a
+- nouveau-bgnr.patch: Enable seamless plymouth->gdm transition.
+
 * Fri Aug 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-5.20090820git569a17a
 - a couple more minor fixes
 



From epienbro at fedoraproject.org  Thu Aug 27 21:01:32 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu, 27 Aug 2009 21:01:32 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2-libjpeg7-compatibility.patch, 
	NONE, 1.1 .cvsignore, 1.7, 1.8 mingw32-gtk2.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090827210132.D569511C00ED@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9120

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Added Files:
	mingw32-gtk2-libjpeg7-compatibility.patch 
Log Message:
* Tue Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.9-1
- Update to 2.17.9
- Rebuild against mingw32-libjpeg 7


mingw32-gtk2-libjpeg7-compatibility.patch:
 io-jpeg.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mingw32-gtk2-libjpeg7-compatibility.patch ---
--- gdk-pixbuf/io-jpeg.c.orig	2009-08-20 14:44:30.795114182 +0200
+++ gdk-pixbuf/io-jpeg.c	2009-08-20 14:45:14.220875249 +0200
@@ -204,7 +204,7 @@
 
   FILE * infile;		/* source stream */
   JOCTET * buffer;		/* start of buffer */
-  boolean start_of_file;	/* have we gotten any data yet? */
+  jpeg_boolean start_of_file;	/* have we gotten any data yet? */
 } stdio_source_mgr;
 
 typedef stdio_source_mgr * stdio_src_ptr;
@@ -216,7 +216,7 @@
   src->start_of_file = FALSE;
 }
 
-static boolean
+static jpeg_boolean
 stdio_fill_input_buffer (j_decompress_ptr cinfo)
 {
   stdio_src_ptr src = (stdio_src_ptr) cinfo->src;
@@ -605,7 +605,7 @@
 
 /* for progressive loading (called "I/O Suspension" by libjpeg docs) */
 /* we do nothing except return "FALSE"                               */
-static boolean
+static jpeg_boolean
 fill_input_buffer (j_decompress_ptr cinfo)
 {
 	return FALSE;
@@ -1068,7 +1068,7 @@
         }
 }
 
-static boolean
+static jpeg_boolean
 to_callback_empty_output_buffer (j_compress_ptr cinfo)
 {
 	ToFunctionDestinationManager *destmgr;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Aug 2009 17:21:57 -0000	1.7
+++ .cvsignore	27 Aug 2009 21:01:31 -0000	1.8
@@ -1 +1 @@
-gtk+-2.17.8.tar.bz2
+gtk+-2.17.9.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-gtk2.spec	18 Aug 2009 16:50:04 -0000	1.11
+++ mingw32-gtk2.spec	27 Aug 2009 21:01:31 -0000	1.12
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.17.8
+Version:        2.17.9
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -27,6 +27,9 @@ Patch1000:      mingw32-gtk2-2.15.0-xbut
 # Enable building a static library of GTK
 Patch1001:      mingw32-gtk2-enable_static_build.patch
 
+# Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
+Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -87,6 +90,7 @@ Static version of the MinGW Windows Gtk2
 
 %patch1000 -p1
 %patch1001 -p0
+%patch1002 -p0
 
 # Regenerate the configure script
 aclocal
@@ -328,6 +332,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Tue Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.9-1
+- Update to 2.17.9
+- Rebuild against mingw32-libjpeg 7
+
 * Tue Aug 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.8-1
 - Update to 2.17.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Aug 2009 17:21:57 -0000	1.7
+++ sources	27 Aug 2009 21:01:32 -0000	1.8
@@ -1 +1 @@
-7e0a37e4cc40f74963886031d0df2182  gtk+-2.17.8.tar.bz2
+44323cc81628be422c59059086e33353  gtk+-2.17.9.tar.bz2



From roland at fedoraproject.org  Thu Aug 27 21:02:58 2009
From: roland at fedoraproject.org (roland)
Date: Thu, 27 Aug 2009 21:02:58 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.283, 1.284 glibc-fedora.patch, 1.317,
	1.318 glibc.spec, 1.410, 1.411 import.log, 1.26, 1.27 sources,
	1.308, 1.309
Message-ID: <20090827210258.6096611C00EB@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9882/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- .cvsignore	26 Aug 2009 12:12:06 -0000	1.283
+++ .cvsignore	27 Aug 2009 21:02:57 -0000	1.284
@@ -1,2 +1,2 @@
-glibc-2.10-312-g2df4be8-fedora.tar.bz2
 glibc-2.10-312-g2df4be8.tar.bz2
+glibc-2.10-312-g2df4be8-fedora.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   30 ++
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 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                                 |   28 --
 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/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 57 files changed, 766 insertions(+), 467 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- glibc-fedora.patch	26 Aug 2009 12:12:07 -0000	1.317
+++ glibc-fedora.patch	27 Aug 2009 21:02:57 -0000	1.318
@@ -1,5 +1,5 @@
 --- glibc-2.10-312-g2df4be8/ChangeLog
-+++ glibc-2.10.90-15/ChangeLog
++++ glibc-2.10.90-17/ChangeLog
 @@ -497,6 +497,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
@@ -66,7 +66,7 @@
  
  	[BZ #3632]
 --- glibc-2.10-312-g2df4be8/ChangeLog.15
-+++ glibc-2.10.90-15/ChangeLog.15
++++ glibc-2.10.90-17/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -133,7 +133,7 @@
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
 --- glibc-2.10-312-g2df4be8/ChangeLog.16
-+++ glibc-2.10.90-15/ChangeLog.16
++++ glibc-2.10.90-17/ChangeLog.16
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -306,7 +306,7 @@
  
  	[BZ #157]
 --- glibc-2.10-312-g2df4be8/Makeconfig
-+++ glibc-2.10.90-15/Makeconfig
++++ glibc-2.10.90-17/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -324,7 +324,7 @@
  ifndef BUILD_CC
  BUILD_CC = $(CC)
 --- glibc-2.10-312-g2df4be8/csu/Makefile
-+++ glibc-2.10.90-15/csu/Makefile
++++ glibc-2.10.90-17/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -336,8 +336,8 @@
  vpath initfini.c $(sysdirs)
  
 --- glibc-2.10-312-g2df4be8/csu/elf-init.c
-+++ glibc-2.10.90-15/csu/elf-init.c
-@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
++++ glibc-2.10.90-17/csu/elf-init.c
+@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
  
@@ -362,7 +362,7 @@
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
 --- glibc-2.10-312-g2df4be8/debug/tst-chk1.c
-+++ glibc-2.10.90-15/debug/tst-chk1.c
++++ glibc-2.10.90-17/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -392,7 +392,7 @@
  # else
  #  define O 1
 --- glibc-2.10-312-g2df4be8/elf/ldconfig.c
-+++ glibc-2.10.90-15/elf/ldconfig.c
++++ glibc-2.10.90-17/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -415,7 +415,7 @@
  
    if (do_chroot && opt_chroot)
      {
-@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool do_chroot)
+@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool d
  	  cp += 8;
  	  while ((dir = strsep (&cp, " \t")) != NULL)
  	    if (dir[0] != '\0')
@@ -431,7 +431,7 @@
  	}
        else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))
  	{
-@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool do_chroot)
+@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool d
     config files to read.  */
  static void
  parse_conf_include (const char *config_file, unsigned int lineno,
@@ -440,7 +440,7 @@
  {
    if (opt_chroot && pattern[0] != '/')
      error (EXIT_FAILURE, 0,
-@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_file, unsigned int lineno,
+@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_f
      {
      case 0:
        for (size_t i = 0; i < gl.gl_pathc; ++i)
@@ -475,7 +475,7 @@
  
    if (! opt_ignore_aux_cache)
 --- glibc-2.10-312-g2df4be8/elf/tst-stackguard1.c
-+++ glibc-2.10.90-15/elf/tst-stackguard1.c
++++ glibc-2.10.90-17/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -501,15 +501,15 @@
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
 --- glibc-2.10-312-g2df4be8/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-15/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-17/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
 --- glibc-2.10-312-g2df4be8/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-15/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-17/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
 --- glibc-2.10-312-g2df4be8/include/features.h
-+++ glibc-2.10.90-15/include/features.h
++++ glibc-2.10.90-17/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -527,7 +527,7 @@
  # else
  #  define __USE_FORTIFY_LEVEL 1
 --- glibc-2.10-312-g2df4be8/intl/locale.alias
-+++ glibc-2.10.90-15/intl/locale.alias
++++ glibc-2.10.90-17/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -538,7 +538,7 @@
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
 --- glibc-2.10-312-g2df4be8/libio/stdio.h
-+++ glibc-2.10.90-15/libio/stdio.h
++++ glibc-2.10.90-17/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.  */
@@ -553,7 +553,7 @@
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
 --- glibc-2.10-312-g2df4be8/locale/iso-4217.def
-+++ glibc-2.10.90-15/locale/iso-4217.def
++++ glibc-2.10.90-17/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -562,7 +562,7 @@
  DEFINE_INT_CURR("AED")		/* United Arab Emirates Dirham  */
  DEFINE_INT_CURR("AFN")		/* Afghanistan Afgani  */
  DEFINE_INT_CURR("ALL")		/* Albanian Lek  */
-@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram  */
+@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram 
  DEFINE_INT_CURR("ANG")		/* Netherlands Antilles  */
  DEFINE_INT_CURR("AOA")		/* Angolan Kwanza  */
  DEFINE_INT_CURR("ARS")		/* Argentine Peso  */
@@ -577,7 +577,7 @@
  DEFINE_INT_CURR("BGN")		/* Bulgarian Lev  */
  DEFINE_INT_CURR("BHD")		/* Bahraini Dinar  */
  DEFINE_INT_CURR("BIF")		/* Burundi Franc  */
-@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  */
+@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  *
  DEFINE_INT_CURR("CVE")		/* Cape Verde Escudo  */
  DEFINE_INT_CURR("CYP")		/* Cypriot Pound  */
  DEFINE_INT_CURR("CZK")		/* Czech Koruna  */
@@ -585,7 +585,7 @@
  DEFINE_INT_CURR("DJF")		/* Djibouti Franc  */
  DEFINE_INT_CURR("DKK")		/* Danish Krone (Faroe Islands, Greenland)  */
  DEFINE_INT_CURR("DOP")		/* Dominican Republic  */
-@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD")		/* Algerian Dinar  */
+@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD")		/* Algerian Dina
  DEFINE_INT_CURR("EEK")		/* Estonian Kroon  */
  DEFINE_INT_CURR("EGP")		/* Egyptian Pound  */
  DEFINE_INT_CURR("ERN")		/* Eritrean Nakfa  */
@@ -606,7 +606,7 @@
  DEFINE_INT_CURR("GTQ")		/* Guatemala Quetzal  */
  DEFINE_INT_CURR("GYD")		/* Guyana Dollar  */
  DEFINE_INT_CURR("HKD")		/* Hong Kong Dollar  */
-@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK")		/* Croatia Kuna  */
+@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK")		/* Croatia Kuna 
  DEFINE_INT_CURR("HTG")		/* Haiti Gourde  */
  DEFINE_INT_CURR("HUF")		/* Hungarian Forint  */
  DEFINE_INT_CURR("IDR")		/* Indonesia Rupiah  */
@@ -621,7 +621,7 @@
  DEFINE_INT_CURR("JEP")		/* Jersey Pound  */
  DEFINE_INT_CURR("JMD")		/* Jamaican Dollar  */
  DEFINE_INT_CURR("JOD")		/* Jordanian Dinar  */
-@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Rupee  */
+@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Ru
  DEFINE_INT_CURR("LRD")		/* Liberian Dollar  */
  DEFINE_INT_CURR("LSL")		/* Lesotho Maloti  */
  DEFINE_INT_CURR("LTL")		/* Lithuanian Litas  */
@@ -629,7 +629,7 @@
  DEFINE_INT_CURR("LVL")		/* Latvia Lat  */
  DEFINE_INT_CURR("LYD")		/* Libyan Arab Jamahiriya Dinar  */
  DEFINE_INT_CURR("MAD")		/* Moroccan Dirham  */
-@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Metical  */
+@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Me
  DEFINE_INT_CURR("NAD")		/* Namibia Dollar  */
  DEFINE_INT_CURR("NGN")		/* Nigeria Naira  */
  DEFINE_INT_CURR("NIO")		/* Nicaragua Cordoba Oro  */
@@ -637,7 +637,7 @@
  DEFINE_INT_CURR("NOK")		/* Norwegian Krone  */
  DEFINE_INT_CURR("NPR")		/* Nepalese Rupee  */
  DEFINE_INT_CURR("NZD")		/* New Zealand Dollar  */
-@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Guinea Kina  */
+@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Gui
  DEFINE_INT_CURR("PHP")		/* Philippines Peso  */
  DEFINE_INT_CURR("PKR")		/* Pakistan Rupee  */
  DEFINE_INT_CURR("PLN")		/* Polish Zloty  */
@@ -646,8 +646,8 @@
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
 --- glibc-2.10-312-g2df4be8/locale/programs/locarchive.c
-+++ glibc-2.10.90-15/locale/programs/locarchive.c
-@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
++++ glibc-2.10.90-17/locale/programs/locarchive.c
+@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
  			    locale_data_t data, bool replace);
@@ -679,8 +679,8 @@
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
 --- glibc-2.10-312-g2df4be8/localedata/Makefile
-+++ glibc-2.10.90-15/localedata/Makefile
-@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
++++ glibc-2.10.90-17/localedata/Makefile
+@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
  	$(LOCALEDEF) --alias-file=../intl/locale.alias \
@@ -689,7 +689,7 @@
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
 --- glibc-2.10-312-g2df4be8/localedata/SUPPORTED
-+++ glibc-2.10.90-15/localedata/SUPPORTED
++++ glibc-2.10.90-17/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -732,8 +732,8 @@
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
 --- glibc-2.10-312-g2df4be8/localedata/locales/cy_GB
-+++ glibc-2.10.90-15/localedata/locales/cy_GB
-@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
++++ glibc-2.10.90-17/localedata/locales/cy_GB
+@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
  t_fmt       "<U0025><U0054>"
@@ -748,8 +748,8 @@
  
  LC_MESSAGES
 --- glibc-2.10-312-g2df4be8/localedata/locales/en_GB
-+++ glibc-2.10.90-15/localedata/locales/en_GB
-@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
++++ glibc-2.10.90-17/localedata/locales/en_GB
+@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
  t_fmt       "<U0025><U0054>"
@@ -761,7 +761,7 @@
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
 --- glibc-2.10-312-g2df4be8/localedata/locales/no_NO
-+++ glibc-2.10.90-15/localedata/locales/no_NO
++++ glibc-2.10.90-17/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -833,7 +833,7 @@
 +copy "nb_NO"
 +END LC_ADDRESS
 --- glibc-2.10-312-g2df4be8/localedata/locales/zh_TW
-+++ glibc-2.10.90-15/localedata/locales/zh_TW
++++ glibc-2.10.90-17/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -862,7 +862,7 @@
  date       "2000-08-02"
  %
 --- glibc-2.10-312-g2df4be8/malloc/mcheck.c
-+++ glibc-2.10.90-15/malloc/mcheck.c
++++ glibc-2.10.90-17/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -889,7 +889,7 @@
  /* Old hook values.  */
  static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
  static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
-@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
+@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t cal
    if (old_free_hook != NULL)
      (*old_free_hook) (ptr, caller);
    else
@@ -898,7 +898,7 @@
    __free_hook = freehook;
  }
  
-@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
+@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const 
      hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
  					     caller);
    else
@@ -907,7 +907,7 @@
    __malloc_hook = mallochook;
    if (hdr == NULL)
      return NULL;
-@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
+@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment,
    if (old_memalign_hook != NULL)
      block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
    else
@@ -916,7 +916,7 @@
    __memalign_hook = memalignhook;
    if (block == NULL)
      return NULL;
-@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
+@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_
  					      sizeof (struct hdr) + size + 1,
  					      caller);
    else
@@ -939,7 +939,7 @@
        old_free_hook = __free_hook;
        __free_hook = freehook;
 --- glibc-2.10-312-g2df4be8/manual/libc.texinfo
-+++ glibc-2.10.90-15/manual/libc.texinfo
++++ glibc-2.10.90-17/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -950,7 +950,7 @@
  * Libc: (libc).                 C library.
  @end direntry
 --- glibc-2.10-312-g2df4be8/misc/sys/cdefs.h
-+++ glibc-2.10.90-15/misc/sys/cdefs.h
++++ glibc-2.10.90-17/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)
@@ -995,7 +995,7 @@
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
 --- glibc-2.10-312-g2df4be8/nis/nss
-+++ glibc-2.10.90-15/nis/nss
++++ glibc-2.10.90-17/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
@@ -1003,7 +1003,7 @@
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
 --- glibc-2.10-312-g2df4be8/nptl/ChangeLog
-+++ glibc-2.10.90-15/nptl/ChangeLog
++++ glibc-2.10.90-17/nptl/ChangeLog
 @@ -3700,6 +3700,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1045,7 +1045,7 @@
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
 --- glibc-2.10-312-g2df4be8/nptl/Makefile
-+++ glibc-2.10.90-15/nptl/Makefile
++++ glibc-2.10.90-17/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1079,7 +1079,7 @@
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
 --- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-15/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-17/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
@@ -1089,7 +1089,7 @@
 +
  #endif /* bits/posix_opt.h */
 --- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-17/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1098,7 +1098,7 @@
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
 --- glibc-2.10-312-g2df4be8/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-15/nptl/tst-stackguard1.c
++++ glibc-2.10.90-17/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1124,7 +1124,7 @@
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
 --- glibc-2.10-312-g2df4be8/nscd/nscd.conf
-+++ glibc-2.10.90-15/nscd/nscd.conf
++++ glibc-2.10.90-17/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1135,7 +1135,7 @@
  	debug-level		0
  #	reload-count		5
 --- glibc-2.10-312-g2df4be8/nscd/nscd.init
-+++ glibc-2.10.90-15/nscd/nscd.init
++++ glibc-2.10.90-17/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1193,8 +1193,8 @@
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 --- glibc-2.10-312-g2df4be8/posix/Makefile
-+++ glibc-2.10.90-15/posix/Makefile
-@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
++++ glibc-2.10.90-17/posix/Makefile
+@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
  
@@ -1215,7 +1215,7 @@
 +	  > $@.new
  	mv -f $@.new $@
 --- glibc-2.10-312-g2df4be8/posix/getconf.speclist.h
-+++ glibc-2.10.90-15/posix/getconf.speclist.h
++++ glibc-2.10.90-17/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1257,7 +1257,7 @@
 +#endif
 +"";
 --- glibc-2.10-312-g2df4be8/streams/Makefile
-+++ glibc-2.10.90-15/streams/Makefile
++++ glibc-2.10.90-17/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1268,7 +1268,7 @@
  
  include ../Rules
 --- glibc-2.10-312-g2df4be8/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-15/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-17/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1285,7 +1285,7 @@
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
 --- glibc-2.10-312-g2df4be8/sysdeps/i386/Makefile
-+++ glibc-2.10.90-15/sysdeps/i386/Makefile
++++ glibc-2.10.90-17/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1311,7 +1311,7 @@
  
  ifeq ($(subdir),elf)
 --- glibc-2.10-312-g2df4be8/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-15/sysdeps/ia64/Makefile
++++ glibc-2.10.90-17/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1324,7 +1324,7 @@
  endif
  
 --- glibc-2.10-312-g2df4be8/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-15/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-17/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1677,7 +1677,7 @@
 -
 -#endif
 --- glibc-2.10-312-g2df4be8/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-15/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-17/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1764,7 +1764,7 @@
 +
 +#endif
 --- glibc-2.10-312-g2df4be8/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-15/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-17/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1774,7 +1774,7 @@
  
  ifeq ($(subdir),elf)
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/nice.c
-+++ glibc-2.10.90-15/sysdeps/unix/nice.c
++++ glibc-2.10.90-17/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1790,7 +1790,7 @@
      {
        if (errno == EACCES)
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1807,7 +1807,7 @@
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1822,7 +1822,7 @@
  
  #ifndef MIN
  # define MIN(a,b) (((a)<(b))?(a):(b))
-@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_random)
+@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_rand
        unsigned char *p = (unsigned char *) &ret;
        p[sizeof (ret) - 1] = 255;
        p[sizeof (ret) - 2] = '\n';
@@ -1856,7 +1856,7 @@
    else
  #endif
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1900,7 +1900,7 @@
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1920,7 +1920,7 @@
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-17/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.
@@ -1982,7 +1982,7 @@
 +
 +#include_next <dl-cache.h>
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2016,7 +2016,7 @@
 +
  #include_next <dl-cache.h>
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
@@ -2024,7 +2024,7 @@
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-17/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>
@@ -2032,12 +2032,12 @@
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-17/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-312-g2df4be8/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2064,7 +2064,7 @@
  struct netlink_res
  {
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2075,8 +2075,8 @@
  
  /* Provide trailing slash, since mostly used for building pathnames. */
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/tcsetattr.c
-@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/tcsetattr.c
+@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
    unsigned long int cmd;
@@ -2084,7 +2084,7 @@
  
    switch (optional_actions)
      {
-@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p)
+@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
    memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
  	  __KERNEL_NCCS * sizeof (cc_t));
  
@@ -2122,7 +2122,7 @@
  }
  libc_hidden_def (tcsetattr)
 --- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-15/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2142,7 +2142,7 @@
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
 --- glibc-2.10-312-g2df4be8/timezone/zic.c
-+++ glibc-2.10.90-15/timezone/zic.c
++++ glibc-2.10.90-17/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- glibc.spec	26 Aug 2009 12:12:07 -0000	1.410
+++ glibc.spec	27 Aug 2009 21:02:57 -0000	1.411
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 16
+Release: 17
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1028,8 +1028,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Wed Aug 26 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-16
+* Thu Aug 27 2009 Roland McGrath <roland at redhat.com> - 2.10.90-17
 - Update from master.
+
+* Wed Aug 26 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-16
   - handle AVX saving on x86-64 in interrupted symbol lookups (#519081).
 
 * Mon Aug 24 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-15


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- import.log	26 Aug 2009 12:12:07 -0000	1.26
+++ import.log	27 Aug 2009 21:02:58 -0000	1.27
@@ -24,3 +24,4 @@ glibc-2_10_90-13:HEAD:glibc-2.10.90-13.s
 glibc-2_10_90-14:HEAD:glibc-2.10.90-14.src.rpm:1250516718
 glibc-2_10_90-15:HEAD:glibc-2.10.90-15.src.rpm:1251105646
 glibc-2_10_90-16:HEAD:glibc-2.10.90-16.src.rpm:1251288654
+glibc-2_10_90-17:HEAD:glibc-2.10.90-17.src.rpm:1251406917


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- sources	26 Aug 2009 12:12:07 -0000	1.308
+++ sources	27 Aug 2009 21:02:58 -0000	1.309
@@ -1,2 +1,2 @@
-9f7f51058bd40cf84a870dd04e4198ec  glibc-2.10-312-g2df4be8-fedora.tar.bz2
 e9d285d54d60e73798293d32abdabcf7  glibc-2.10-312-g2df4be8.tar.bz2
+8dd0742bf8c3a90a22197c3e054c3271  glibc-2.10-312-g2df4be8-fedora.tar.bz2



From pkgdb at fedoraproject.org  Thu Aug 27 21:12:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 21:12:34 +0000
Subject: [pkgdb] Django had acl change status
Message-ID: <20090827211234.77F8A10F86F@bastion2.fedora.phx.redhat.com>

salimma has set the approveacls acl on Django (Fedora 8) to Approved for smilner

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/Django



From xavierb at fedoraproject.org  Thu Aug 27 21:36:31 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 27 Aug 2009 21:36:31 +0000 (UTC)
Subject: rpms/pnp4nagios/devel
	pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch, NONE,
	1.1 pnp4nagios.spec, 1.8, 1.9
Message-ID: <20090827213631.4564011C00EB@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/pnp4nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25728

Modified Files:
	pnp4nagios.spec 
Added Files:
	pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch 
Log Message:
Ship contrib directory as doc

pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch:
 verify_pnp_config.in |  463 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 355 insertions(+), 108 deletions(-)

--- NEW FILE pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch ---
--- trunk/contrib/verify_pnp_config.in	2009/05/02 09:17:40	632
+++ trunk/contrib/verify_pnp_config.in	2009/08/26 22:12:22	654
@@ -1,7 +1,9 @@
-#!@PERL@ -w
+#!/usr/bin/perl -w
 #
 # (C) 2008-2009 pnp4nagios.org / Wolfgang Nieder
 #
+# $Id$ 
+#
 # check Nagios/PNP integration settings
 # 2008.09.21: 0.1    initial version
 # 2008.09.23: 0.1.1  precheck / logfile
@@ -16,24 +18,39 @@
 # 2009.02.23: 0.1.10 check perfdata directory / bugfixes
 # 2009.03.06: 0.1.11 check for multiple entries / bugfixes
 # 2009.04.21: 0.1.12 check for Time::HiRes
+# 2009.07.08: 0.1.13 Icinga support / bugfix (templates)
+# 2009.08.05: 0.1.14 bugfixes (Icinga support / non-standard paths)
+# 2009.08.11: 0.1.15 changed Doc-paths
+# 2009.08.18: 0.1.16 added layout option / package detection
 
 use strict;
 use Getopt::Long;
 use File::Find;
 
-my $program = "Check Nagios/PNP integration";
-my $version = "0.1.12";
+my $program = "Check Nagios/Icinga/PNP integration";
+my $version = "0.1.16";
 my $help = 0;
 my $debug = 0;
 my $quiet = 0;
+my $time = 0;
 my $wc = 0;
 my $err = 0;
+my $warn = 0;
+my $crit = 0;
+my $product = lc("nagios");
+my $pnp_version = '@PKG_VERSION@';
+my $install_opts = '@INSTALL_OPTS@';
+my $doc_version = '0.4';
+# 
+# please remove the hash sign (#) on the following line if you're using Icinga
+# or specify "-M icinga"
+# $product = lc("icinga");
+my $prod_name = ucfirst($product);
 my $basedir = '@prefix@';
-$basedir = "/usr/local/nagios" unless (-d "$basedir");
-my $NagiosBase = $basedir if (-d "$basedir");
-my $NagiosBin = "nagios" if (-f "$basedir/bin/nagios");
+my $NagiosBase = "";
+my $NagiosBin = "$product" if (-f "$basedir/bin/$product");
 my $mode = "";
-my $NagiosCfg = "$NagiosBase/etc/nagios.cfg" if (-f "$NagiosBase/etc/nagios.cfg");
+my $NagiosCfg = "";
 my %NagiosCfg = ();
 my $rrdtool = '@RRDTOOL@';
 $rrdtool = "/usr/bin/rrdtool" unless ((-f "$rrdtool") and (-x "$rrdtool"));
@@ -46,6 +63,8 @@
 my %PPcfg = ();
 my $CPcfg = "";	# config.php
 my %CPcfg = ();
+my $RFcfg = "";	# resource.cfg
+my %RFcfg = ();
 my $nFile = "";
 my @CfgFiles = ();
 my %commands = ();
@@ -60,10 +79,12 @@
 my $gid = "";
 my $user = "";
 my $group = "";
-my $language = "";
+my $layout = "";
+my $pkg_mgr = "";
+my $language = "en";
 my $english = "";
 if (exists $ENV{LANG}) {
-	$language = "/de" if ($ENV{LANG} =~ /de/i);
+	$language = "de" if ($ENV{LANG} =~ /de/i);
 }
 my %msg = ();
 
@@ -83,16 +104,25 @@
 	"q|quiet" => \$quiet,
 	"r|rrdtool=s" => \$rrdtool,
 	"R|RRDpath=s" => \$RRDpath,
+	"U|resource=s" => \$RFcfg,
 	"u|user=s" => \$user,
 	"g|group=s" => \$group,
 	"l|logfile=s" => \$LogFile,
 	"o|object=s" => \$Object,
+	"M|monitor=s" => \$product,
+	"L|layout=s" => \$layout,
+	"t|time" => \$time,
 );
 
+if ($pnp_version =~ /^(\d+\.\d+)/) {
+	$doc_version = "$1";
+}
+$product = lc($product);
+$prod_name = ucfirst($product);
 info ("\n\n$program, v$version\n");
 if ($english) {
 	info ("[I] option -e");
-	$language = "";
+	$language = "en";
 }
 message();
 
@@ -115,7 +145,62 @@
 	info ("info","OS","$line");
 }
 info ("info","Perl","$]");
+if ($mode) {
+	$pkg_mgr = eval "`whereis yum`";
+	if ($pkg_mgr =~/:\s+$/) {
+		$pkg_mgr = eval "`whereis dpkg`";
+		if ($pkg_mgr =~/:\s+$/) {
+			$pkg_mgr = eval "`whereis rpm`";
+		}
+	}
+	($pkg_mgr) = $pkg_mgr =~ /:\s*(\S+)/;
+	if ($pkg_mgr) {
+		info ("info","Package Manager","$pkg_mgr");
+		chk_pkg ("nagios",0,1);
+		chk_pkg ("icinga",0,1);
+		chk_pkg ("pnp4nagios",0,1);
+		chk_pkg ("mod-php5,mod_php5",1,0);
+		chk_pkg ("php,php5",1,1);
+		chk_pkg ("dejavu",1,0);
+		if ($crit) {
+			info ("LinkReqSW");
+			exit 30;
+		}
+	}
+	info ("install_opts","$install_opts") unless ($install_opts =~ /\@INSTALL_OPTS\@/i);
+	info ("PNP-version","$pnp_version") unless ($pnp_version =~ /\@PKG_VERSION\@/i);
+}	
+	
+if ($layout) {
+	info ("info","Layout","$layout");
+	if ($layout =~ /fedora/i) {
+		$basedir = "/usr/share" unless ($NagiosBase);
+		$NagiosCfg = "/etc/nagios/nagios.cfg" unless ($NagiosCfg);
+		$NagiosBin = "/usr/sbin/nagios" unless ($NagiosBin);
+		$RRDpath = "/var/lib/pnp4nagios" unless ($RRDpath);
+	}	
+	elsif ($layout =~ /suse/i) {
+		$basedir = "/usr/share" unless ($NagiosBase);
+		$NagiosCfg = "/etc/nagios/nagios.cfg" unless ($NagiosCfg);
+		$NagiosBin = "/usr/sbin/nagios" unless ($NagiosBin);
+		$RRDpath = "/var/spool/nagios-pnp" unless ($RRDpath);
+	}	
+	elsif ($layout =~ /nagios2/i) {
+		$basedir = "/etc/nagios2" unless ($NagiosBase);
+		$NagiosCfg = "/etc/nagios2/nagios.cfg" unless ($NagiosCfg);
+		$NagiosBin = "/usr/sbin/nagios2" unless ($NagiosBin);
+	}	
+	elsif ($layout =~ /nagios3/i) {
+		$basedir = "/etc/nagios3" unless ($NagiosBase);
+		$NagiosCfg = "/etc/nagios3/nagios.cfg" unless ($NagiosCfg);
+		$NagiosBin = "/usr/sbin/nagios3" unless ($NagiosBin);
+	} else {
+		info ("invOption","$layout");
+	}	
+}	
 
+$basedir = "/usr/local/$product" if ($basedir =~ /^\@prefix\@$/);
+$NagiosBase = $basedir unless ($NagiosBase);
 if (! defined($NagiosBase)) {
 	info ("noBase");
 	exit 3
@@ -125,27 +210,45 @@
 	exit 3
 }
 info ("useBase", "$NagiosBase");
+$NagiosCfg = "$NagiosBase/etc/$product.cfg" unless ($NagiosCfg);
 if (! defined($NagiosCfg)) {
-	info ("noCfg");
-	exit 4
+	if (-f "$NagiosBase/etc/$product.cfg") {
+		$NagiosCfg = "$NagiosBase/etc/$product.cfg";
+	} else {
+		info ("noCfg");
+		exit 4
+	}
 }
 if (! -f "$NagiosCfg") {
 	info ("noCfgFile","$NagiosCfg");
 	exit 5
 }
 info ("useCfg","$NagiosCfg");
+if (! defined($NagiosBin)) {
+	if (-f "$NagiosBase/bin/$product") {
+		$NagiosBin = "$NagiosBase/bin/$product";
+	} else {
+		info ("noBinary", "$product") && exit 6;
+	}
+}
 if ($NagiosBin !~ /^\//) {
 	$NagiosBin = "$NagiosBase/bin/$NagiosBin";
 }
-examine ("x;", "Nagios-Binary", "$NagiosBin") && exit 6;
+examine ("x;", "${prod_name}-Binary", "$NagiosBin") && exit 6;
 info ("useBinary","$NagiosBin");
 
 if ($mode) {
-	if ($mode !~ /^default$|^Bulk$|^NPCD$/i) {
+	if ($mode !~ /^default$|^sync$|^Bulk$|^NPCD$/i) {
 		info ("invPNPmode");
 		info ("LinkPNPconfig");
 		exit 7
 	}
+	if ($mode =~ /^default$/) {
+		$mode = "sync";
+		if (($pnp_version =~ /^(\d+\.\d+)/) and ($1 >= 0.6)) {
+			$mode = "NPCD";
+		}
+	}
 	info ("PNPmode","$mode");
 }
 if (($LogFile ne "") and (! -f $LogFile)) {
@@ -156,10 +259,10 @@
 info ("useLog","$LogFile") if ($LogFile);
 
 # get Nagios version 
-my $NagiosVer = `$NagiosBin -V | grep "Nagios "`;
+my $NagiosVer = `$NagiosBin -V | grep "$prod_name " | head -1`;
 chomp $NagiosVer;
-info ("[I] Nagios info: $NagiosVer");
-($NagiosVer) = $NagiosVer =~ /Nagios (\d+)\./;
+info ("[I] $prod_name info: $NagiosVer");
+($NagiosVer) = $NagiosVer =~ /$prod_name .*?(\d+)\./;
 
 # check Nagios Config
 info ("verifyCfg");
@@ -170,6 +273,7 @@
 	info ("LinkNagiosChk");
 	exit 9;
 }
+process_nagios_cfg();
 
 # check rrdtool
 if ($mode) {
@@ -209,9 +313,29 @@
 	if (! $erg) {
 		info ("noHiRes");
 	}
+
+	if ($RFcfg eq "") {
+#		($RFcfg) = $NagiosCfg =~ m#(^.*/)#;
+#		$RFcfg .= "resource.cfg";
+		$RFcfg = $NagiosCfg{"resource_file"};
+	}
+	info ("procFile","$RFcfg");
+	open (RFILE, "$RFcfg") || abort (29, "errOpen", "$RFcfg", "$!");
+	while (<RFILE>) {
+		chomp;
+		s/#.*//;
+		s/\s*$//;
+		next if (/^$/);
+		my ($par, $val) = /^(.*?)=(.*)/;	# shortest string (broker module contains multiple equal signs)
+		if (($par eq "") or ($val eq "")) {
+			info ("oddLine", "$_");
+			next;
+		}
+		$RFcfg{"$par"} .= $val;
+	}
+	close (RFILE);
 }
 
-process_nagios_cfg();
 status_log();
 process_cfg_log();
 
@@ -237,8 +361,8 @@
 	if ($NagiosCfg{"process_performance_data"} !~ /^1$/) {
 		info ("noPerfEna");
 		info ("LinkEnaPerf");
-		if ($mode =~ /default/i) {
-			info ("PNPdefault");
+		if ($mode =~ /sync/i) {
+			info ("PNPsync");
 		} elsif ($mode =~ /NPCD/i) {
 			info ("PNPnpcd");
 		} else {	
@@ -250,15 +374,15 @@
 	info ("LinkEnaPerf");
 }
 
-# check default mode
-if (($NagiosVer >= 3) and (uc($mode) =~ /default/i)) {
+# check sync mode
+if (($NagiosVer >= 3) and (uc($mode) =~ /sync/i)) {
 	if ((exists $NagiosCfg{"enable_environment_macros"}) and ($NagiosCfg{"enable_environment_macros"} !~ /^1$/)) {
 		info ("envMacrosDis");
 		info ("LinkEnaEnv");
 	}
 }
-chk_param ("service_perfdata_command", "default");
-chk_param ("host_perfdata_command", "default");
+chk_param ("service_perfdata_command", "sync");
+chk_param ("host_perfdata_command", "sync");
 
 # check Bulk modes
 chk_param ("service_perfdata_file", "Bulk|NPCD");
@@ -290,6 +414,12 @@
 		info ("invDir", "$RRDpath");
 	} else {
 		info ("RRDpath", "$RRDpath");
+		my $erg = eval "open (TST, \">$RRDpath/testfile\")";
+		if (! $erg) {
+			info ("noWrite","$RRDpath","$NagiosCfg{\"${product}_user\"}");
+		} else {
+			unlink ("$RRDpath/testfile");
+		}
 		find(\&chk_perfdata, "$RRDpath");
 		if ($RRDfile) {
 			info ("RRDcount", $RRDdir, $RRDfile);
@@ -301,11 +431,18 @@
 
 if ($wc == 0) {
 	info ("noErrors");
-} else {
+	print "OK | Errors=0\n" if ($quiet);
+	exit 0
+} elsif ($crit == 0) {
+	info ("Warnings");
+	print "WARNING | Warnings=$warn; Errors=$crit\n" if ($quiet);
+	exit 1
+} else {	
 	info ("Errors");
+	print "CRITICAL | Warnings=$warn; Errors=$crit\n" if ($quiet);
+	exit 2
 }
-print "\n";
-exit $wc;
+exit 3;
 
 #
 # subroutines
@@ -315,7 +452,7 @@
 	return if ($quiet);
 	if ($language =~ /de/i) {
 	print <<EOF1;
-Dieses Script prueft verschiedene Einstellungen/Eintraege in Ihrer Nagios-
+Dieses Script prueft verschiedene Einstellungen/Eintraege in Ihrer $prod_name-
 bzw. PNP-Umgebung, um Ihnen beim Finden von Problemen zu helfen.
 Es kann vor und waehrend der Laufzeit von PNP benutzt werden.
 
@@ -330,7 +467,7 @@
 EOF1
 } else {
 print <<EOF2;
-This script will check certain settings/entries of your Nagios/PNP environ-
+This script will check certain settings/entries of your $prod_name/PNP environ-
 ment to assist you in finding problems when you are using PNP.
 It may be used prior and during operation of PNP.
 
@@ -352,29 +489,40 @@
 	[ -c <config file> ]
 	[ -N <npcd config file> ]
 	[ -P <process_perfdata config file> ]
+	[ -r <rrdtool binary> ]
 	[ -R <perfdata directory>|no ]
+	[ -U <resource config file> ]
+	[ -u <user> ]
+	[ -g <group> ]
+	[ -M <monitoring product> ]
+	[ -L <layout> ]
+	[ -t ]
 	[ -e ]
 	[ -d | -q ]
 	   
 parameters:
 	-h, --help        print these lines
-	-b, --basedir=s   Nagios Base directory (default: $basedir)
-	-B, --binary=s    Nagios binary (default: nagios)
-	-c, --config=s    Nagios main config file (default: $basedir/etc/nagios.cfg)
-	-m, --mode=s      PNP mode ("default", "bulk", "NPCD")
+	-b, --basedir=s   $prod_name Base directory (default: $basedir)
+	-B, --binary=s    $prod_name binary (default: $product)
+	-c, --config=s    $prod_name main config file (default: $basedir/etc/product.cfg)
+	-m, --mode=s      PNP mode ("default", "sync", "bulk", "NPCD")
 	-l, --logfile=s   check configure log file 
 	-N, --npcdcfg=s   PNP config file for NPCD mode (default: $basedir/etc/pnp/npcd.cfg)
 	-P, --ppcfg=s     process_perfdata config file (default: $basedir/etc/pnp/process_perfdata.cfg)
 	-p, --precheck    use config files instead of objects cache
 	-r, --rrdtool=s   specify the location of the RRDtool binary
 	-R, --RRDpath=s   specify the perfdata directory (default: $basedir/share/perfdata) or "no" for no check
+	-U, --resource=s  specify the location of the resource.cfg (default: $basedir/etc/resource.cfg)
+	-M, --monitor=s   specify the monitoring product (default: nagios)
+	-L, --layout=s    specify a layout (Nagios2, Nagios3, SuSE, Fedora)
 	-u, --user=s      user of the perfdata directory
 	-g, --group=s     group of the perfdata directory
 	-q, --quiet       quiet mode, non-zero return code will indicate errors
-	-o, --object=s    Nagios object (host name/service description)
+	-o, --object=s    $prod_name object (host name/service description)
 	                  "Name" : search for matching host name or service desc
 	                  "Name;": search for matching host name
 	                  ";Name": search for service description
+	-t, --time        show warnings if RRDfiles are too old
 	-e, --english     show english messages/links
 	-d, --debug       some debugging output
 EOF3
@@ -406,7 +554,7 @@
 			info ("dupEntry","$key");
 		}
 	}
-	info ("[I] nagios_user=$NagiosCfg{nagios_user}");
+	info ("[I] ${product}_user=$NagiosCfg{\"${product}_user\"}");
 	if ($user) {
 		$uid = getpwnam ($user);
 		if (! $uid) {
@@ -415,10 +563,10 @@
 		}
 		info ("[I] perfdata_user=$user");
 	} else {
-		$uid = getpwnam ($NagiosCfg{nagios_user});
-		$user = $NagiosCfg{nagios_user};
+		$uid = getpwnam ($NagiosCfg{"${product}_user"});
+		$user = $NagiosCfg{"${product}_user"};
 	}
-	info ("[I] nagios_group=$NagiosCfg{nagios_group}");
+	info ("[I] ${product}_group=$NagiosCfg{\"${product}_group\"}");
 	if ($group) {
 		$gid = getgrnam ($group);
 		if (! $gid) {
@@ -427,8 +575,8 @@
 		}
 		info ("[I] perfdata_group=$group");
 	} else {
-		$gid = getgrnam ($NagiosCfg{nagios_group});
-		$group = $NagiosCfg{nagios_group};
+		$gid = getgrnam ($NagiosCfg{"${product}_group"});
+		$group = $NagiosCfg{"${product}_group"};
 	}
 }
 
@@ -473,15 +621,21 @@
 			$StatusLog{"$name"} = $zeile;
 			info ("[D] $zeile") if ($debug);
 			if ($hostname ne "") {
-				next if ($zeile !~ /host_name=$hostname/i);
+				if ($zeile !~ /host_name=$hostname/i) {
+					$zeile = "";
+					next;
+				}	
 			}
 			if ($srvdesc ne "") {
-				next if ($zeile !~ /service_description=$srvdesc/i);
+				if ($zeile !~ /service_description=$srvdesc/i) {
+					$zeile = "";
+					next;
+				}	
 			}
 			if (uc($name) =~ /$Object/i) {
 				$name =~ s/.*?;//;
-				my ($perf_data) = /performance_data\s*=\s*(.*)?#/;
-				if (defined($perf_data)) {
+				my ($perf_data) = $zeile =~ /#performance_data\s*=\s*(.*?)#/;
+				if ($perf_data ne "") {
 					info ("[I] Performance data ($name): $perf_data");
 					$_= $perf_data." ";
 					# try to check for valid performance data according to
@@ -501,6 +655,7 @@
 						} else {
 							info ("[D] Label:>$label<") if ($debug);
 						}
+						s/,/./g;	# change decimal comma 
 						s/^(.*?)[; ]//;
 						my ($value,$uom) = $1 =~ /([-]?[0-9.]+)(.*)/;
 						if (! defined($value)) {
@@ -570,8 +725,8 @@
 	examine ("f;","RRDTOOL",$LogFile{"RRDTOOL"});	
 	examine ("f;","NPCD_LOG",$LogFile{"NPCD_LOG"});	
 
-	examine ("u;","nagios_user",$LogFile{"nagios_user"});	
-	examine ("g;","nagios_grp",$LogFile{"nagios_grp"});	
+	examine ("u;","${product}_user",$LogFile{"${product}_user"});	
+	examine ("g;","${product}_grp",$LogFile{"${product}_grp"});	
 }
 
 # check parameter from nagios.cfg
@@ -598,7 +753,7 @@
 			$chk .= " -d HOSTPERFDATA" if ($param =~ /^host/);
 			if ( $cmd !~ /$chk$/i) {
 				info ("invValue2","$cmd","$param");
-				info ("PNPdefault");
+				info ("PNPsync");
 			}
 		}
 		if ($param =~ /perfdata_file_template/) {
@@ -619,12 +774,14 @@
 			info ("LinkNagiosCfg","$param");
 			return;
 		}
-		if ($NagiosVer >= 3) {
-			info ("noParCfgH","$param");
-		} else {
-			info ("notAdv","$param");
+		if ($prod_name eq "Icinga") {
+			if ($NagiosVer >= 3) {
+				info ("noParCfgH","$param");
+			} else {
+				info ("notAdv","$param");
+			}
+			info ("LinkNagiosCfg","$param");
 		}
-		info ("LinkNagiosCfg","$param");
 	}
 }
 
@@ -645,6 +802,20 @@
 		}
 		($line) = /command_line\s*(.*)/ ;	
 		$commands{"$cmd"} = "$line";
+		next unless (/process_perfdata.pl/);
+		my @cmd = split (/\s+/,$line);
+		for my $i (0..$#cmd) {
+			if ($cmd[$i] =~ /(\$USER\d+\$)/) {
+				if (exists $RFcfg{"$1"}) {		
+					my $val = $RFcfg{"$1"};
+					$cmd[$i] =~ s/\$USER\d+\$/$val/;
+				} else {
+					info ("noRes", "$1");	
+				}
+			}
+			info ("noFile", "$cmd", "$cmd[$i]") unless (-f "$cmd[$i]");
+			last if ($cmd[$i] =~ /perfdata.pl/);
+		}
 	}
 	close (CFILE);
 	if ($debug) {
@@ -685,8 +856,12 @@
 	my $zeile = "";
 	info ("[D] var:>$var<") if ($debug);
 	return if (/^$/);
-	s/^(.*?)[; ]//;
+	s/^(.*?)([; ])//;
 	my $value = $1 || "";
+	if (($value ne "") and ($2 eq " ")) {
+		$_ = " ".$_;
+		return;
+	}
 	$zeile .= "value:>$value< ";
 	if ($value) {
 		if ($value !~ /$pattern/) {
@@ -739,14 +914,10 @@
 #	$template{"${type}STATE"} = 0;
 	$template{"HOSTSTATE"} = 0;
 	$template{"HOSTSTATETYPE"} = 0;
-	if ($type eq "HOST") {
-		$template{"HOSTOUTPUT"} = 0;
-	}
 	if ($type eq "SERVICE") {
 		$template{"SERVICEDESC"} = 0;
 		$template{"SERVICESTATE"} = 0;
 		$template{"SERVICESTATETYPE"} = 0;
-		$template{"SERVICEOUTPUT"} = 0;
 	}
 	info ("chkTemplate","$param");
 	my $val = $NagiosCfg{"$param"};
@@ -806,6 +977,7 @@
 	$NPCDcfg{sleep_time} = 'n;^\d+$;439';	# new since 0.4.8
 	$NPCDcfg{identify_npcd} = "v;0|1;497";	# new since 0.4.11
 	$NPCDcfg{perfdata_file} = "d;;558";
+	$NPCDcfg{perfdata_spool_filename} = "f;;643";
 	$err = 0;
 
 # try to set a file name if variable is unset
@@ -899,7 +1071,7 @@
 	$CPcfg{'$conf[\'allowed_for_host_overview\']'} = 'S;[\S,]+;';
 	$CPcfg{'$conf[\'allowed_for_pages\']'} = 'S;[\S,]+;381';
 	$CPcfg{'$conf[\'overview-range\']'} = 'v;0|1;';
-	$CPcfg{'$conf[\'lang\']'} = 'v;en|de|fr|se|nl;';
+	$CPcfg{'$conf[\'lang\']'} = 'v;en|de|fr|se|nl|es;';
 	$CPcfg{'$conf[\'date_fmt\']'} = "S;.*;279";
 	$CPcfg{'$conf[\'rrd_daemon_opts\']'} = 'S;.*;520';
 	$CPcfg{'$conf[\'enable_recursive_template_search\']'} = 'v;0|1;595';
@@ -1048,7 +1220,6 @@
 sub info {
 	my @par = @_;
 	my $line = "";
-	return if ($quiet);
 	
 	if (exists ($msg{"$par[0]"})) {
 		$line = $msg{"$par[0]"};
@@ -1060,21 +1231,25 @@
 	}
 	if ($line =~ /\[E\]/) {
 		$wc++;
-		$err++;
+		$crit++;
+	}
+	if ($line =~ /\[W\]/) {
+		$wc++;
+		$warn++;
 	}
-	print "$line\n";
+	print "$line\n" unless ($quiet);
 }
 
 # abort script
 sub abort {
-	my ($rc, @par);
+	my ($rc, @par) = @_;
 	info (@par);
 	exit $rc;
 }
 
 # check perfdata dir
 sub chk_perfdata {
-	-d && $RRDdir++;
+	-d && $_ ne "." && $RRDdir++;
 	my $f = "$File::Find::name";
 	return unless (($f =~ /\/$/) or ($f =~ /rrd$|xml$/));
 	if ($uid) {
@@ -1092,6 +1267,19 @@
 	return unless ($f =~ /xml$/);
 	my $rc = 99;
 	my $txt = "no RC found in file";
+	if ($time) {
+		my $max_age = $CPcfg{'$conf[\'max_age\']'};
+		while ($max_age =~ /(\d+)\*(\d+)(\D.*)?/) {
+			if (defined($3)) {	
+				$max_age = $1 * $2."$3";
+			} else {
+				$max_age = $1 * $2;
+			}
+		}	
+		my $old = time() - $max_age;
+		my $age = (stat ($f))[9];
+		info ("RRDold","$f","$max_age") if ($age < $old);
+	}
 	open (F, "$f");
 	while (<F>) {
 		if (/<RC>(\d)<\/RC>/) {
@@ -1105,23 +1293,70 @@
 	info ("RRDrc","$f",$rc, "$txt") if ($rc);
 }
 	
+sub chk_pkg {
+	my ($pkg_names,$req,$exactly) = @_;
+	my @pkg_names = split (/,/,$pkg_names);
+	my $pkg_name = "";
+	my $pkg = "";
+
+	for my $idx (0..$#pkg_names) {
+		next if ($pkg);
+		$pkg_name = $pkg_names[$idx];
+		if ($pkg_mgr =~ /yum/) {
+			if ($exactly) {
+				$pkg = `yum list installed $pkg_name 2>/dev/null | grep "installed"`;
+			} else {
+				$pkg = `yum list installed 2>/dev/null | grep "$pkg_name" | grep "installed"`;
+			}
+			$pkg =~ s/\s+/ /g;
+			$pkg =~ s/ installed//g;
+		} elsif ($pkg_mgr =~ /dpkg/) {
+			if ($exactly) {
+				$pkg = `dpkg -l "$pkg_name" 2>/dev/null | grep "ii"`;
+			} else {
+				$pkg = `dpkg -l 2>/dev/null | grep "$pkg_name" | grep "ii"`;
+			}
+			$pkg =~ s/ii\s+//gs;
+			$pkg =~ s/\s+/ /gs;
+			$pkg =~ s/(\S+ \S+).*/$1/gs;
+		} elsif ($pkg_mgr =~ /rpm/) {
+			if ($exactly) {
+				$pkg = `rpm -qa $pkg_name`;
+			} else {
+				$pkg = `rpm -qa | grep $pkg_name`;
+			}
+		}
+	}
+	$pkg =~ s/\s$//gs;
+	if ($pkg) {
+		info ("Package","$pkg");
+		return 1
+	} else {
+		info ("noPkg","$pkg_names") if ($req);
+		return 0
+	}
+}
+
 # set different messages according to the language
 sub message {
 	$msg{"qd"} = "[E] --quiet and --debug are mutually exclusive";
-	$msg{"noBase"} = "[E] Nagios basedir not found/not specified";
-	$msg{"noBaseDir"} = "[E] Nagios basedir \"%s\" does not exist";
-	$msg{"useBase"} = "[I] using Nagios basedir \"%s\"";
-	$msg{"useBinary"} = "[I] using Nagios binary \"%s\"";
-	$msg{"noCfg"} = "[E] nagios.cfg not specified";
+	$msg{"noBase"} = "[E] $prod_name basedir not found/not specified";
+	$msg{"noBaseDir"} = "[E] $prod_name basedir \"%s\" does not exist";
+	$msg{"useBase"} = "[I] using $prod_name basedir \"%s\"";
+	$msg{"noBinary"} = "[E] binary \"%s\" not found/defined";
+	$msg{"useBinary"} = "[I] using $prod_name binary \"%s\"";
+	$msg{"noCfg"} = "[E] $product.cfg not specified";
 	$msg{"noCfgFile"} = "[E] config file \"%s\" not found";
-	$msg{"useCfg"} = "[I] using Nagios config \"%s\"";
+	$msg{"useCfg"} = "[I] using $prod_name config \"%s\"";
 	$msg{"binExec"} = "[E] File \"%s\" is not executable";
-	$msg{"verifyCfg"} = "[A] verifying Nagios config";
-	$msg{"invPNPmode"} = "[E] no valid mode specified (default, Bulk, NPCD)";
+	$msg{"verifyCfg"} = "[A] verifying $prod_name config";
+	$msg{"invPNPmode"} = "[E] no valid mode specified (sync, Bulk, NPCD, default)";
 	$msg{"PNPmode"} = "[I] PNP mode: \"%s\"";
+	$msg{"Package"} = "[I] Package: \"%s\"";
+	$msg{"noPkg"} = "[E] Package \"%s\" not found";
 	$msg{"useLog"} = "[I] LogFile \"%s\" specified";
-	$msg{"NagiosChkErr"} = "[E] Nagios check found errors";
-	$msg{"NagiosCfgErr"} = "[E] Nagios config contains errors";
+	$msg{"NagiosChkErr"} = "[E] $prod_name check found errors";
+	$msg{"NagiosCfgErr"} = "[E] $prod_name config contains errors";
 	$msg{"verifyRRD"} = "[A] checking RRDtool (%s)";
 	$msg{"info"} = "[I] %s: %s";
 	$msg{"invFile"} = "[E] \"%s\" is not a (regular) file";
@@ -1129,27 +1364,29 @@
 	$msg{"useEntry"} = "[I] using cfg_dir/cfg_file entries";
 	$msg{"useCache"} = "[I] using \"%s\" entries";
 	$msg{"dupEntry"} = "[E] directive \"%s\" is duplicate";
-	$msg{"noPerfEna"} = "[E] no performance data enabled (process_performance_data=1 in nagios.cfg)";
+	$msg{"noPerfEna"} = "[E] no performance data enabled (process_performance_data=1 in $product.cfg)";
 	$msg{"envMacrosDis"} = "[E] environment macros disabled (enable_environment_macros=0)";
 	$msg{"noFonts"} = "[H] dejavu fonts may be missing";
 	$msg{"noErrors"} = "\nNo (obvious) errors found. Happy graphing with PNP";
+	$msg{"Warnings"} = "\nWarnings found. Please check the settings.";
 	$msg{"Errors"} = "\nErrors found. Please check the settings and have a look at the documentation.";
 	$msg{"procFile"} = "[A] processing \"%s\"";
 	$msg{"searchObj"} = "[A] searching for \"%s\"";
 	$msg{"noLabel"} = "[E] no label defined";
 	$msg{"invValue"} = "[E] no valid value";
 	$msg{"invOption"} = "[E] \"%s\" is not a valid option";
-	$msg{"invUOM"} = "[E] \"%s\" doesn''t seem to be a valid UOM";
+	$msg{"invUOM"} = "[E] \"%s\" doesn't seem to be a valid UOM";
 	$msg{"minRev"} = "[W] option \"%s\" is valid starting with revision %s";
 	$msg{"maxRev"} = "[W] option \"%s\" is only valid until revision %s";
 	$msg{"noUser"} = "[E] (%s) user \"%s\" does not exist";
 	$msg{"noGroup"} = "[E] (%s) group \"%s\" does not exist";
 	$msg{"noPerf"} = "[E] There is NO performance data for \"%s\" !";
 	$msg{"noRRDchk"} = "[I] perfdata directory will NOT be checked";
-	$msg{"RRDpath"} = "[A] checking of \"%s\"";
+	$msg{"RRDpath"} = "[A] checking of RRDpath \"%s\"";
 	$msg{"RRDuser"} = "[E] \"%s\": owner is \"%s\" instead of %s";
 	$msg{"RRDgroup"} = "[E] \"%s\": group is \"%s\" instead of %s";
 	$msg{"RRDrc"} = "[E] \"%s\"\n\tRRDtool RC: %s, %s";
+	$msg{"RRDold"} = "[W] \"%s\" is older than %s seconds";
 	$msg{"RRDcount"} = "[I] %s dir(s) with a total of %s rrd file(s)";
 	$msg{"noRRDfiles"} = "[E] %s dir(s) but NO rrd files => NO graphs!";
 	$msg{"useRRDs"} = "[I] RRDs perl module installed";
@@ -1171,67 +1408,74 @@
 	$msg{"missTempVar"} = "[E] variable \"%s\" in template is missing";
 	$msg{"missinvTempVal"} = "[E] value \"%s\" in template is missing";
 	$msg{"noCmd"} = "[E] command_name \"%s\" not found";
-	$msg{"noParCfg"} = "[E] \"%s\" not found in nagios.cfg";
-	$msg{"noParCfgH"} = "[H] \"%s\" not found in nagios.cfg";
+	$msg{"noParCfg"} = "[E] \"%s\" not found in $product.cfg";
+	$msg{"noParCfgH"} = "[H] \"%s\" not found in $product.cfg";
 	$msg{"notAdv"} = "[H] \"%s\" not advisable in Nagios < 3.x";
 	$msg{"invChar"} = "[E] \"%s\" (\"%s\") has invalid format/contains invalid characters";
 	$msg{"undefVal"} = "[E] no (valid) value for \"%s\" defined";
 	$msg{"noNumber"} = "[E] %s not a valid number";
 	$msg{"startEnd"} = "[E] start (%s) is greater than end (%s)";
 	$msg{"noFile"} = "[E] (%s) file \"%s\" is missing";
-	$msg{"noFileYet"} = "[I] (%s) file \"%s\" doesn''t exist (yet)";
+	$msg{"noRes"} = "[E] resource \"%s\" is not defined";
+	$msg{"noFileYet"} = "[I] (%s) file \"%s\" doesn't exist (yet)";
 	$msg{"noDir"} = "[E] (%s) directory \"%s\" is missing";
 	$msg{"noSock"} = "[E] \"%s\" is not a socket";
+	$msg{"noWrite"} = "[E] \"%s\": no write permissions for \"%s\"";
 	$msg{"key"} = "[D] key:\"%s\"";
 	$msg{"keyValue"} = "[D] directive:\"%s\", value:\"%s\"";
 	$msg{"oddLine"} = "[W] \"%s\" looks odd";
 	$msg{"errOpen"} = "[E] open of %s failed, RC=%s";
 
 	$msg{"LinkNagiosChk"} = "[H] http://nagios.sourceforge.net/docs/3_0/verify_config.html";
-	$msg{"LinkReqSW"} = "[H] http://www.pnp4nagios.org/pnp/about#required_software";
-	$msg{"LinkPNPreq"} = "[H] http://www.pnp4nagios.org/pnp/about#requirements";
-	$msg{"PNPdefault"} = "[H] http://www.pnp4nagios.org/pnp$language/config#default_mode";
-	$msg{"PNPbulk"} = "[H] http://www.pnp4nagios.org/pnp$language/config#bulk_mode";
-	$msg{"PNPnpcd"} = "[H] http://www.pnp4nagios.org/pnp$language/config#npcd";
+	$msg{"LinkReqSW"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/about#required_software";
+	$msg{"LinkRRDtool"} = "[H] http://www.rrdtool.org";
+	$msg{"LinkPNPreq"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/about#requirements";
+	$msg{"PNPsync"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/config#default_mode";
+	$msg{"PNPbulk"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/config#bulk_mode";
+	$msg{"PNPnpcd"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/config#npcd";
 	$msg{"NPCDcfgReq"} = "[E] NPCD config file required";
 	$msg{"noNPCDreq"} = "[H] NPCD config file is not required";
 	$msg{"LinkEnaEnv"} = "[H] http://nagios.sourceforge.net/docs/3_0/configmain.html#enable_environment_macros";
 	$msg{"LinkEnaPerf"} = "[H] http://nagios.sourceforge.net/docs/3_0/configmain.html#process_performance_data";
 	$msg{"LinkDevInfo"} = "[H] http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN203";
-	$msg{"LinkPNPconfig"} = "[H] http://www.pnp4nagios.org/pnp$language/config";
-	$msg{"LinkPPcfg"} = "[H] http://www.pnp4nagios.org/pnp$language/config";
-	$msg{"LinkCPcfg"} = "[H] http://www.pnp4nagios.org/pnp$language/webfe";
+	$msg{"LinkPNPconfig"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/config";
+	$msg{"LinkPPcfg"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/config";
+	$msg{"LinkCPcfg"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/webfe";
 	$msg{"LinkNagiosCfg"} = "[H] http://nagios.sourceforge.net/docs/3_0/configmain.html#%s";
 	$msg{"LinkNagiosCfg2"} = "[H] http://nagios.sourceforge.net/docs/3_0/configmain.html#process_performance_data\n    (and following options)";
 	
 	if ($language =~ /de/i) {
-		$msg{"qd"} = "[E]: --quiet und --debug schliessen sich gegenseitig aus";
-		$msg{"noBase"} = "[E]: Nagios-Basisverzeichnis nicht gefunden/angegeben";
-		$msg{"noBaseDir"} = "[E]: Nagios-Basisverzeichnis \"%s\" existiert nicht";
-		$msg{"useBase"} = "[I] benutze Nagios-Basisverzeichnis \"%s\"";
-		$msg{"useBinary"} = "[I] benutze Nagios-Binary \"%s\"";
-		$msg{"noCfg"} = "[E]: nagios.cfg nicht angegeben";
-		$msg{"noCfgFile"} = "[E]: Konfigurationsdatei \"%s\" nicht gefunden";
-		$msg{"useCfg"} = "[I] benutze Nagios-config \"%s\"";
-		$msg{"binExec"} = "[E]: Datei \"%s\" ist nicht ausfuehrbar";
-		$msg{"verifyCfg"} = "[A] verifiziere Nagios-Konfiguration";
-		$msg{"invPNPmode"} = "[E]: kein gueltiger PNP-Modus angegeben (default, Bulk, NPCD)";
+		$msg{"qd"} = "[E] --quiet und --debug schliessen sich gegenseitig aus";
+		$msg{"noBase"} = "[E] ${prod_name}-Basisverzeichnis nicht gefunden/angegeben";
+		$msg{"noBaseDir"} = "[E] ${prod_name}-Basisverzeichnis \"%s\" existiert nicht";
+		$msg{"useBase"} = "[I] benutze ${prod_name}-Basisverzeichnis \"%s\"";
+		$msg{"noBinary"} = "[E] Binary \"%s\" nicht gefunden/definiert";
+		$msg{"useBinary"} = "[I] benutze ${prod_name}-Binary \"%s\"";
+		$msg{"noCfg"} = "[E] $product.cfg nicht angegeben";
+		$msg{"noCfgFile"} = "[E] Konfigurationsdatei \"%s\" nicht gefunden";
+		$msg{"useCfg"} = "[I] benutze ${prod_name}-config \"%s\"";
+		$msg{"binExec"} = "[E] Datei \"%s\" ist nicht ausfuehrbar";
+		$msg{"verifyCfg"} = "[A] verifiziere ${prod_name}-Konfiguration";
+		$msg{"invPNPmode"} = "[E] kein gueltiger PNP-Modus angegeben (sync, Bulk, NPCD, default)";
 		$msg{"PNPmode"} = "[I] PNP-Modus: \"%s\"";
+		$msg{"Package"} = "[I] Paket: \"%s\"";
+		$msg{"noPkg"} = "[E] Paket \"%s\" nicht gefunden";
 		$msg{"NPCDcfgReq"} = "[E] NPCD-Konfigurationsdatei erforderlich";
 		$msg{"noNPCDreq"} = "[H] NPCD-Konfigurationsdatei nicht erforderlich";
 		$msg{"useLog"} = "[I] LogFile \"%s\" angegeben";
-		$msg{"NagiosChkErr"} = "[E] Nagios-Konfigurationspruefung findet Fehler";
-		$msg{"NagiosCfgErr"} = "[E] Nagios-Konfigurationsdatei enthaelt Fehler";
+		$msg{"NagiosChkErr"} = "[E] ${prod_name}-Konfigurationspruefung findet Fehler";
+		$msg{"NagiosCfgErr"} = "[E] ${prod_name}-Konfigurationsdatei enthaelt Fehler";
 		$msg{"verifyRRD"} = "[A] pruefe RRDtool (%s)";
 		$msg{"invFile"} = "[E]: \"%s\" ist keine (regulaere) Datei";
 		$msg{"invDir"} = "[E] Verzeichnis \"%s\" existiert nicht";
 		$msg{"useEntry"} = "[I] benutze cfg_dir/cfg_file-Eintraege";
 		$msg{"useCache"} = "[I] benutze \"%s\"-Eintraege";
 		$msg{"dupEntry"} = "[E] Direktive \"%s\" ist doppelt";
-		$msg{"noPerfEna"} = "[E] keine Performance-Daten aktiviert (process_performance_data=1 in nagios.cfg)";
+		$msg{"noPerfEna"} = "[E] keine Performance-Daten aktiviert (process_performance_data=1 in $product.cfg)";
 		$msg{"envMacrosDis"} = "[E] Environment-Makros deaktiviert (enable_environment_macros=0)";
 		$msg{"noFonts"} = "[H] dejavu-Fonts sind ggf. nicht installiert";
 		$msg{"noErrors"} = "\nKeine (offensichtlichen) Fehler gefunden. Viel Spass mit PNP";
+		$msg{"Warnings"} = "\nWarnungen gefunden.\nBitte ueberpruefen Sie die Einstellungen.";
 		$msg{"Errors"} = "\nFehler gefunden.\nBitte ueberpruefen Sie die Einstellungen und lesen Sie die Dokumentation.";
 		$msg{"procFile"} = "[A] verarbeite \"%s\"";
 		$msg{"searchObj"} = "[A] suche nach \"%s\"";
@@ -1245,9 +1489,10 @@
 		$msg{"noGroup"} = "[E] (%s) Gruppe \"%s\" existiert nicht";
 		$msg{"noPerf"} = "[E] es gibt KEINE Performance-Daten fuer \"%s\"";
 		$msg{"noRRDchk"} = "[I] perfdata-Verzeichnis wird NICHT geprueft";
-		$msg{"RRDpath"} = "[A] pruefen von \"%s\"";
+		$msg{"RRDpath"} = "[A] pruefen von RRDpath \"%s\"";
 		$msg{"RRDuser"} = "[E] \"%s\": Owner ist \"%s\" anstatt %s";
 		$msg{"RRDgroup"} = "[E] \"%s\": Group ist \"%s\" anstatt %s";
+		$msg{"RRDold"} = "[W] \"%s\" ist aelter als %s Sekunden";
 		$msg{"RRDcount"} = "[I] %s Verzeichnis(se) mit insgesamt %s rrd-Datei(en)";
 		$msg{"noRRDfiles"} = "[E] %s Verzeichnis(se) aber KEINE rrd-Dateien => KEINE Graphen!";
 		$msg{"useRRDs"} = "[I] RRDs Perl-Modul installiert";
@@ -1269,27 +1514,29 @@
 		$msg{"missTempVar"} = "[E] Variable \"%s\" im Template fehlt";
 		$msg{"missinvTempVal"} = "[E] Wert \"%s\" im Template fehlt";
 		$msg{"noCmd"} = "[E] command_name \"%s\" nicht gefunden";
-		$msg{"noParCfg"} = "[E] \"%s\" nicht in nagios.cfg gefunden";
-		$msg{"noParCfgH"} = "[H] \"%s\" nicht in nagios.cfg gefunden";
+		$msg{"noParCfg"} = "[E] \"%s\" nicht in $product.cfg gefunden";
+		$msg{"noParCfgH"} = "[H] \"%s\" nicht in $product.cfg gefunden";
 		$msg{"notAdv"} = "[H] \"%s\" wird fuer Nagios < 3.x nicht empfohlen";
 		$msg{"invChar"} = "[E] \"%s\" (%s) hat ein ungueltiges Format/enthaelt ungueltige Zeichen";
 		$msg{"undefVal"} = "[E] kein (gueltiger) Wert fuer \"%s\" definiert";
 		$msg{"noNumber"} = "[E] %s ist keine gueltige Zahl";
 		$msg{"startEnd"} = "[E] Startwert (%s) ist groesser als Endwert (%s)";
 		$msg{"noFile"} = "[E] (%s) Datei \"%s\" fehlt";
+		$msg{"noRes"} = "[E] Ressource \"%s\" ist nicht definiert";
 		$msg{"noFileYet"} = "[I] (%s) Datei \"%s\" existiert (noch) nicht";
 		$msg{"noDir"} = "[E] (%s) Verzeichnis \"%s\" fehlt";
 		$msg{"noSock"} = "[E] \"%s\" ist kein Socket";
+		$msg{"noWrite"} = "[E] \"%s\": keine Schreibberechtigung fuer \"%s\"";
 		$msg{"key"} = "[D] key:\"%s\"";
 		$msg{"keyValue"} = "[D] Direktive:\"%s\", Wert:\"%s\"";
 		$msg{"oddLine"} = "[W] \"%s\" sieht komisch aus";
 		$msg{"errOpen"} = "[E] oeffnen von %s fehlgeschlagen, RC=%s";
 
 		$msg{"LinkNagiosChk"} = "[H] http://www.nagios-wiki.de/nagios/doku3/verify_config";
-		$msg{"LinkReqSW"} = "[H] http://www.pnp4nagios.org/pnp$language/about#benoetigte_software";
-		$msg{"LinkPNPreq"} = "[H] http://www.pnp4nagios.org/pnp$language/about#anforderungen_an_plugins";
-		$msg{"LinkEnaEnv"} = "http://www.nagios-wiki.de/nagios/doku3/#enable_environment_macros";
-		$msg{"LinkEnaPerf"} = "http://www.nagios-wiki.de/nagios/doku3/#process_performance_data";
+		$msg{"LinkReqSW"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/about#benoetigte_software";
+		$msg{"LinkPNPreq"} = "[H] http://docs.pnp4nagios.org/$language/pnp-${doc_version}/about#anforderungen_an_plugins";
+		$msg{"LinkEnaEnv"} = "[H] http://www.nagios-wiki.de/nagios/doku3/#enable_environment_macros";
+		$msg{"LinkEnaPerf"} = "[H] http://www.nagios-wiki.de/nagios/doku3/configmain#process_performance_data";
 		$msg{"LinkNagiosCfg"} = "[H] http://www.nagios-wiki.de/nagios/doku3/configmain#%s";
 		$msg{"LinkNagiosCfg2"} = "[H] http://www.nagios-wiki.de/nagios/doku3/configmain#process_performance_data\n    (und folgende Optionen)";
 	}


Index: pnp4nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnp4nagios/devel/pnp4nagios.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pnp4nagios.spec	27 Aug 2009 20:14:22 -0000	1.8
+++ pnp4nagios.spec	27 Aug 2009 21:36:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
 Version:        0.4.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -11,6 +11,7 @@ Source1:        pnp4nagios.logrotate.con
 Source2:        pnp4nagios-npcd.sysvinit
 Source3:        pnp4nagios-README.fedora
 Patch1:         pnp4nagios-0.4.14-change_broker_install_location.patch
+Patch2:         pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  rrdtool-perl
@@ -30,7 +31,21 @@ and stores them automatically into RRD-d
 
 %prep
 %setup -q -n pnp-%{version}
+
+# Move broker to a better location
 %patch1 -p0
+
+# Update verify_pnp_config script for bugfixes
+%patch2 -p1
+
+# Fix file encoding and end of line
+pushd contrib
+iconv -f iso8859-1 -t utf-8 verify_pnp_config.txt > verify_pnp_config.txt.utf8
+touch -r verify_pnp_config.txt verify_pnp_config.txt.utf8
+mv -f verify_pnp_config.txt.utf8 verify_pnp_config.txt
+sed -i -e "s/\r//" verify_pnp_config.txt
+popd
+
 cp -p %{SOURCE3} README.fedora
 sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \
     configure
@@ -48,6 +63,9 @@ sed -i -e '/^\t$(MAKE) strip-post-instal
            --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/
 make %{?_smp_mflags} all
 
+# Remove unwanted file from the contrib directory
+rm contrib/verify_pnp_config.in 
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,7 +107,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README README.fedora
-%doc README.npcd THANKS TODO
+%doc README.npcd THANKS TODO contrib/
 %dir %{_sysconfdir}/pnp4nagios
 %config(noreplace) %{_sysconfdir}/pnp4nagios/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios
@@ -106,8 +124,11 @@ fi
 
 
 %changelog
+* Tue Aug 27 2009 Xavier Bachelot <xavier at bachelot.org> 0.4.14-2
+- Ship contrib directory as doc.
+
 * Tue Aug 27 2009 Xavier Bachelot <xavier at bachelot.org> 0.4.14-1
-- Update to 0.4.14.
+- Update to 0.4.14 (RHBZ#518069).
 - Fix typo in README.fedora (RHBZ#490664).
 - Move npcdmod.o to a better place.
 - BR: rrdtool-perl



From mclasen at fedoraproject.org  Thu Aug 27 21:39:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 27 Aug 2009 21:39:17 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.480,
	1.481 slideshow-ui.patch, 1.1, 1.2
Message-ID: <20090827213917.97C1811C00EB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734

Modified Files:
	control-center.spec slideshow-ui.patch 
Log Message:
fix a crash



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- control-center.spec	26 Aug 2009 01:40:37 -0000	1.480
+++ control-center.spec	27 Aug 2009 21:39:17 -0000	1.481
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -377,6 +377,9 @@ fi
 %{_bindir}/gnome-window-properties
 
 %changelog
+* Thu Aug 27 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-3
+- Fix a crash in the appearance capplet
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-2
 - Bring the window capplet back from the dead, in an -extra subpackage
 

slideshow-ui.patch:
 appearance-desktop.c |  187 ++++++++++++++++++++++++++++++++++++++++++++++++---
 appearance.h         |    1 
 gnome-wp-item.c      |   85 +++++++++++++++++++----
 gnome-wp-item.h      |    3 
 gnome-wp-xml.c       |    2 
 5 files changed, 255 insertions(+), 23 deletions(-)

Index: slideshow-ui.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/slideshow-ui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- slideshow-ui.patch	17 Aug 2009 03:36:29 -0000	1.1
+++ slideshow-ui.patch	27 Aug 2009 21:39:17 -0000	1.2
@@ -1,8 +1,7 @@
-diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
-index bf2f5a1..436c22a 100644
---- a/capplets/appearance/appearance-desktop.c
-+++ b/capplets/appearance/appearance-desktop.c
-@@ -131,9 +131,7 @@ static void on_item_changed (GnomeBG *bg, AppearanceData *data) {
+diff -up gnome-control-center-2.27.91/capplets/appearance/appearance-desktop.c.slideshow-ui gnome-control-center-2.27.91/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.27.91/capplets/appearance/appearance-desktop.c.slideshow-ui	2009-07-28 04:29:08.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/appearance-desktop.c	2009-08-27 17:35:47.325503034 -0400
+@@ -131,9 +131,7 @@ static void on_item_changed (GnomeBG *bg
  
      pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
      if (pixbuf) {
@@ -13,7 +12,7 @@ index bf2f5a1..436c22a 100644
        g_object_unref (pixbuf);
      }
  
-@@ -316,10 +314,7 @@ wp_scale_type_changed (GtkComboBox *combobox,
+@@ -316,10 +314,7 @@ wp_scale_type_changed (GtkComboBox *comb
    item->options = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_style_menu));
  
    pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
@@ -25,7 +24,7 @@ index bf2f5a1..436c22a 100644
    if (pixbuf != NULL)
      g_object_unref (pixbuf);
  
-@@ -344,9 +339,7 @@ wp_shade_type_changed (GtkWidget *combobox,
+@@ -344,9 +339,7 @@ wp_shade_type_changed (GtkWidget *combob
    item->shade_type = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_color_menu));
  
    pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory);
@@ -36,7 +35,7 @@ index bf2f5a1..436c22a 100644
    if (pixbuf != NULL)
      g_object_unref (pixbuf);
  
-@@ -991,6 +984,162 @@ wp_select_after_realize (GtkWidget *widget,
+@@ -991,6 +984,162 @@ wp_select_after_realize (GtkWidget *widg
    select_item (data, item, TRUE);
  }
  
@@ -224,10 +223,9 @@ index bf2f5a1..436c22a 100644
    gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 2,
                                     (GtkTreeIterCompareFunc) wp_list_sort,
                                     data, NULL);
-diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h
-index 7c30687..69001ef 100644
---- a/capplets/appearance/appearance.h
-+++ b/capplets/appearance/appearance.h
+diff -up gnome-control-center-2.27.91/capplets/appearance/appearance.h.slideshow-ui gnome-control-center-2.27.91/capplets/appearance/appearance.h
+--- gnome-control-center-2.27.91/capplets/appearance/appearance.h.slideshow-ui	2009-07-16 10:33:13.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/appearance.h	2009-08-27 17:35:47.327503988 -0400
 @@ -46,6 +46,7 @@ typedef struct
    GtkFileChooser *wp_filesel;
    GtkWidget *wp_image;
@@ -236,22 +234,20 @@ index 7c30687..69001ef 100644
  
    /* font */
    GtkWidget *font_details;
-diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
-index 4e40b07..bf32c51 100644
---- a/capplets/appearance/gnome-wp-item.c
-+++ b/capplets/appearance/gnome-wp-item.c
-@@ -140,9 +140,9 @@ GnomeWPItem * gnome_wp_item_new (const gchar * filename,
-       item->name = g_filename_to_utf8 (item->fileinfo->name, -1, NULL,
+diff -up gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.c.slideshow-ui gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.c
+--- gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.c.slideshow-ui	2009-05-03 14:30:56.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.c	2009-08-27 17:36:04.076515226 -0400
+@@ -141,8 +141,8 @@ GnomeWPItem * gnome_wp_item_new (const g
  				       NULL, NULL);
  
-+    gnome_wp_item_ensure_gnome_bg (item);
      gnome_wp_item_update (item);
-     gnome_wp_item_update_description (item);
--    gnome_wp_item_ensure_gnome_bg (item);
+-    gnome_wp_item_update_description (item);
+     gnome_wp_item_ensure_gnome_bg (item);
++    gnome_wp_item_update_description (item);
  
      g_hash_table_insert (wallpapers, item->filename, item);
    } else {
-@@ -177,24 +177,71 @@ void gnome_wp_item_free (GnomeWPItem * item) {
+@@ -177,24 +177,71 @@ void gnome_wp_item_free (GnomeWPItem * i
    g_free (item);
  }
  
@@ -327,7 +323,7 @@ index 4e40b07..bf32c51 100644
  void gnome_wp_item_update_description (GnomeWPItem * item) {
    g_free (item->description);
  
-@@ -202,27 +249,41 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
+@@ -202,27 +249,41 @@ void gnome_wp_item_update_description (G
      item->description = g_strdup (item->name);
    } else {
      const gchar *description;
@@ -376,11 +372,10 @@ index 4e40b07..bf32c51 100644
      g_free (dirname);
    }
  }
-diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h
-index 7a62cdb..63bdb69 100644
---- a/capplets/appearance/gnome-wp-item.h
-+++ b/capplets/appearance/gnome-wp-item.h
-@@ -72,6 +72,9 @@ GnomeWPItem * gnome_wp_item_new (const gchar *filename,
+diff -up gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.h.slideshow-ui gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.h
+--- gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.h.slideshow-ui	2009-05-03 14:30:56.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/gnome-wp-item.h	2009-08-27 17:35:47.329504382 -0400
+@@ -72,6 +72,9 @@ GnomeWPItem * gnome_wp_item_new (const g
  void gnome_wp_item_free (GnomeWPItem *item);
  GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem *item,
  					 GnomeDesktopThumbnailFactory *thumbs);
@@ -390,11 +385,10 @@ index 7a62cdb..63bdb69 100644
  void gnome_wp_item_update (GnomeWPItem *item);
  void gnome_wp_item_update_description (GnomeWPItem *item);
  void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item);
-diff --git a/capplets/appearance/gnome-wp-xml.c b/capplets/appearance/gnome-wp-xml.c
-index 59d742b..9d2613d 100644
---- a/capplets/appearance/gnome-wp-xml.c
-+++ b/capplets/appearance/gnome-wp-xml.c
-@@ -237,9 +237,9 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
+diff -up gnome-control-center-2.27.91/capplets/appearance/gnome-wp-xml.c.slideshow-ui gnome-control-center-2.27.91/capplets/appearance/gnome-wp-xml.c
+--- gnome-control-center-2.27.91/capplets/appearance/gnome-wp-xml.c.slideshow-ui	2009-07-28 04:29:08.000000000 -0400
++++ gnome-control-center-2.27.91/capplets/appearance/gnome-wp-xml.c	2009-08-27 17:35:47.331534319 -0400
+@@ -237,9 +237,9 @@ static void gnome_wp_xml_load_xml (Appea
  	  wp->name = g_strdup (wp->fileinfo->name);
  	}
  



From whot at fedoraproject.org  Thu Aug 27 22:30:55 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 27 Aug 2009 22:30:55 +0000 (UTC)
Subject: rpms/xorg-x11-drv-fpit/F-11 fpit-1.3.0-unload.patch, NONE,
	1.1 xorg-x11-drv-fpit.spec, 1.19, 1.20
Message-ID: <20090827223055.162CC11C00ED@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-fpit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19285

Modified Files:
	xorg-x11-drv-fpit.spec 
Added Files:
	fpit-1.3.0-unload.patch 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-3
- fpit-1.3.0-unload.patch: avoide some double-frees (#473366)


fpit-1.3.0-unload.patch:
 xf86Fpit.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE fpit-1.3.0-unload.patch ---
>From 7dacfde39a027bb868493ba075e2f1d787c9b191 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 28 Aug 2009 08:16:36 +1000
Subject: [PATCH] Fix module unloading.

After calling xfree(priv), local->private must be set NULL.
Otherwise the server tries to free it again during xf86DeleteInput.

local->name must not be freed, it is set to XI_TOUCHSCREEN during PreInit.

local must not be freed, we pass it into xf86DeleteInput.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/xf86Fpit.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index f40c6a9..ce7540b 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -589,8 +589,7 @@ static void xf86FpitUninit(InputDriverPtr drv, LocalDevicePtr local, int flags)
 	xf86FpitControl(local->dev, DEVICE_OFF);
 	xfree(priv->fpitDev);
 	xfree(priv);
-	xfree(local->name);
-	xfree(local);
+	local->private = NULL;
 	xf86DeleteInput(local, 0);
 }
 
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fpit/F-11/xorg-x11-drv-fpit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xorg-x11-drv-fpit.spec	26 Feb 2009 10:47:34 -0000	1.19
+++ xorg-x11-drv-fpit.spec	27 Aug 2009 22:30:51 -0000	1.20
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   10-fpit.fdi
 
+# Taken from upstream.
+Patch1:    fpit-1.3.0-unload.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -25,6 +28,7 @@ X.Org X11 fpit input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1 -b .unload
 
 %build
 %configure --disable-static
@@ -52,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/policy/20thirdparty/10-fpit.fdi
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-3
+- fpit-1.3.0-unload.patch: avoide some double-frees (#473366)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Thu Aug 27 22:36:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 22:36:16 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.7,1.8
Message-ID: <20090827223616.8F49511C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21666

Modified Files:
	nss-util.spec 
Log Message:
nss-util-devel doesn't require nss-devel


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nss-util.spec	27 Aug 2009 00:17:08 -0000	1.7
+++ nss-util.spec	27 Aug 2009 22:36:16 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-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
@@ -46,7 +46,6 @@ Group:            Development/Libraries
 Requires:         nss-util = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
-Requires:         nss-devel
 
 %description devel
 Header and library files for doing development with Network Security Services.
@@ -202,6 +201,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-13
+nss-util-devel doesn't require nss-devel
+
 * Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-12
 - bump to unique nvr
 



From whot at fedoraproject.org  Thu Aug 27 22:47:18 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 27 Aug 2009 22:47:18 +0000 (UTC)
Subject: rpms/xorg-x11-drv-fpit/F-10 fpit-1.3.0-unload.patch, NONE,
	1.1 xorg-x11-drv-fpit.spec, 1.16, 1.17
Message-ID: <20090827224718.553BD11C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-fpit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27093

Modified Files:
	xorg-x11-drv-fpit.spec 
Added Files:
	fpit-1.3.0-unload.patch 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-2
- fpit-1.3.0-unload.patch: avoide some double-frees (#473366)


fpit-1.3.0-unload.patch:
 xf86Fpit.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE fpit-1.3.0-unload.patch ---
>From 7dacfde39a027bb868493ba075e2f1d787c9b191 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 28 Aug 2009 08:16:36 +1000
Subject: [PATCH] Fix module unloading.

After calling xfree(priv), local->private must be set NULL.
Otherwise the server tries to free it again during xf86DeleteInput.

local->name must not be freed, it is set to XI_TOUCHSCREEN during PreInit.

local must not be freed, we pass it into xf86DeleteInput.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/xf86Fpit.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index f40c6a9..ce7540b 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -589,8 +589,7 @@ static void xf86FpitUninit(InputDriverPtr drv, LocalDevicePtr local, int flags)
 	xf86FpitControl(local->dev, DEVICE_OFF);
 	xfree(priv->fpitDev);
 	xfree(priv);
-	xfree(local->name);
-	xfree(local);
+	local->private = NULL;
 	xf86DeleteInput(local, 0);
 }
 
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fpit/F-10/xorg-x11-drv-fpit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xorg-x11-drv-fpit.spec	20 Mar 2008 19:45:16 -0000	1.16
+++ xorg-x11-drv-fpit.spec	27 Aug 2009 22:47:16 -0000	1.17
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,6 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+# Taken from upstream.
+Patch1:    fpit-1.3.0-unload.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -24,6 +27,7 @@ X.Org X11 fpit input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1 -b .unload
 
 %build
 %configure --disable-static
@@ -47,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fpit.4*
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-2
+- fpit-1.3.0-unload.patch: avoide some double-frees (#473366)
+
 * Thu Mar 20 2008 Adam Jackson <ajax at redhat.com> 1.2.0-1
 - fpit 1.2.0
 



From cebbert at fedoraproject.org  Thu Aug 27 22:50:03 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 27 Aug 2009 22:50:03 +0000 (UTC)
Subject: rpms/kernel/F-11
	linux-2.6-x86-load-percpu-segment-no-stackprotector.patch, NONE,
	1.1 linux-2.6-xen-rearrange-to-fix-stackprotector.patch, NONE,
	1.1 config-x86-generic, 1.79, 1.80 kernel.spec, 1.1720, 1.1721
Message-ID: <20090827225003.5782511C0492@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28315

Modified Files:
	config-x86-generic kernel.spec 
Added Files:
	linux-2.6-x86-load-percpu-segment-no-stackprotector.patch 
	linux-2.6-xen-rearrange-to-fix-stackprotector.patch 
Log Message:
Fix stackprotector problems with Xen on x86_64.
Disable stackprotector on i386 until 32-bit Xen gets fixed.

linux-2.6-x86-load-percpu-segment-no-stackprotector.patch:
 Makefile |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE linux-2.6-x86-load-percpu-segment-no-stackprotector.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 17 Aug 2009 19:25:41 +0000 (-0700)
Subject: x86: make sure load_percpu_segment has no stackprotector
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5416c2663517ebd0be0664c4d4ce3df0b116c059

x86: make sure load_percpu_segment has no stackprotector

load_percpu_segment() is used to set up the per-cpu segment registers,
which are also used for -fstack-protector.  Make sure that the
load_percpu_segment() function doesn't have stackprotector enabled.

[ Impact: allow percpu setup before calling stack-protected functions ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 4e242f9..8b5b9b6 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_common.o = -pg
 endif
 
+# Make sure load_percpu_segment has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_common.o		:= $(nostackp)
+
 obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
 obj-y			+= proc.o capflags.o powerflags.o common.o
 obj-y			+= vmware.o hypervisor.o

linux-2.6-xen-rearrange-to-fix-stackprotector.patch:
 Makefile    |    4 ++++
 enlighten.c |   22 ++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-xen-rearrange-to-fix-stackprotector.patch ---
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 17 Aug 2009 19:26:53 +0000 (-0700)
Subject: xen: rearrange things to fix stackprotector
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ce2eef33d35cd7b932492b5a81fb0febd2b323cd

xen: rearrange things to fix stackprotector

Make sure the stack-protector segment registers are properly set up
before calling any functions which may have stack-protection compiled
into them.

[ Impact: prevent Xen early-boot crash when stack-protector is enabled ]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 3b767d0..a5b9288 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -5,6 +5,10 @@ CFLAGS_REMOVE_time.o = -pg
 CFLAGS_REMOVE_irq.o = -pg
 endif
 
+# Make sure early boot has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_enlighten.o		:= $(nostackp)
+
 obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
 			time.o xen-asm.o xen-asm_$(BITS).o \
 			grant-table.o suspend.o
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f09e8c3..edcf72a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -925,10 +925,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	xen_domain_type = XEN_PV_DOMAIN;
 
-	BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
-
-	xen_setup_features();
-
 	/* Install Xen paravirt ops */
 	pv_info = xen_info;
 	pv_init_ops = xen_init_ops;
@@ -937,8 +933,15 @@ asmlinkage void __init xen_start_kernel(void)
 	pv_apic_ops = xen_apic_ops;
 	pv_mmu_ops = xen_mmu_ops;
 
-	xen_init_irq_ops();
+#ifdef CONFIG_X86_64
+	/*
+	 * Setup percpu state.  We only need to do this for 64-bit
+	 * because 32-bit already has %fs set properly.
+	 */
+	load_percpu_segment(0);
+#endif
 
+	xen_init_irq_ops();
 	xen_init_cpuid_mask();
 
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -948,6 +951,8 @@ asmlinkage void __init xen_start_kernel(void)
 	set_xen_basic_apic_ops();
 #endif
 
+	xen_setup_features();
+
 	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
 		pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start;
 		pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
@@ -955,13 +960,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	machine_ops = xen_machine_ops;
 
-#ifdef CONFIG_X86_64
-	/*
-	 * Setup percpu state.  We only need to do this for 64-bit
-	 * because 32-bit already has %fs set properly.
-	 */
-	load_percpu_segment(0);
-#endif
 	/*
 	 * The only reliable way to retain the initial address of the
 	 * percpu gdt_page is to remember it here, so we can go and


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86-generic,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- config-x86-generic	25 Jul 2009 04:09:17 -0000	1.79
+++ config-x86-generic	27 Aug 2009 22:50:02 -0000	1.80
@@ -109,7 +109,8 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_CC_STACKPROTECTOR=y
+# setting this breaks Xen guests
+# CONFIG_CC_STACKPROTECTOR is not set
 
 CONFIG_SECCOMP=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1720
retrieving revision 1.1721
diff -u -p -r1.1720 -r1.1721
--- kernel.spec	27 Aug 2009 20:23:30 -0000	1.1720
+++ kernel.spec	27 Aug 2009 22:50:02 -0000	1.1721
@@ -739,6 +739,10 @@ Patch14060: linux-2.6-v4l-dvb-af9015-fix
 # fix race in kthreads
 Patch14070: linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
 
+# fix stack protector problems with xen on x86_64
+Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
+Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1369,6 +1373,10 @@ ApplyPatch linux-2.6-v4l-dvb-af9015-fix-
 # fix race in kthreads
 ApplyPatch linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch
 
+# fix stack protector problems with xen on x86_64
+ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
+ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1954,6 +1962,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-42
+- Fix stackprotector problems with Xen on x86_64.
+- Disable stackprotector on i386 until 32-bit Xen gets fixed.
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-41
 - linux-2.6-kthreads-fix-kthread-create-vs-kthread-stop.patch:
   fix race in kthreads.



From jkeating at fedoraproject.org  Thu Aug 27 23:09:57 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 27 Aug 2009 23:09:57 +0000 (UTC)
Subject: common Makefile.common,1.135,1.136 branches,1.32,1.33
Message-ID: <20090827230957.B73E411C00EB@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4137

Modified Files:
	Makefile.common branches 
Log Message:
Prepare for early F-12 branching



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- Makefile.common	12 Aug 2009 22:53:30 -0000	1.135
+++ Makefile.common	27 Aug 2009 23:09:57 -0000	1.136
@@ -22,9 +22,9 @@ endif
 BRANCH:=$(shell pwd | awk -F '/' '{ print $$NF }' )
 # check to see if this is an early branched package; we should make this more
 # generic in the future
-#ifeq ($(BRANCH),devel)
-#BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-11/$(SPECFILE) >/dev/null 2>&1 && echo "F-12" || echo "devel")
-#endif
+ifeq ($(BRANCH),devel)
+BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-12/$(SPECFILE) >/dev/null 2>&1 && echo "F-13" || echo "devel")
+endif
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))


Index: branches
===================================================================
RCS file: /cvs/pkgs/common/branches,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- branches	20 Jun 2009 15:58:45 -0000	1.32
+++ branches	27 Aug 2009 23:09:57 -0000	1.33
@@ -18,4 +18,5 @@ F-9:dist-f9-updates-candidate:.fc9:fedor
 F-10:dist-f10-updates-candidate:.fc10:fedora:10
 F-11:dist-f11-updates-candidate:.fc11:fedora:11
 F-12:dist-f12:.fc12:fedora:12
+F-13:dist-f13:.fc13:fedora:13
 devel:dist-f12:.fc12:fedora:12



From emaldonado at fedoraproject.org  Thu Aug 27 23:09:56 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 23:09:56 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.9,1.10
Message-ID: <20090827230956.9D23611C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4209

Modified Files:
	nss-softokn.spec 
Log Message:
Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util, remnove release 17 hack


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nss-softokn.spec	27 Aug 2009 15:23:15 -0000	1.9
+++ nss-softokn.spec	27 Aug 2009 23:09:53 -0000	1.10
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          18%{?dist}
+Release:          19%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -105,7 +105,7 @@ BUILD_OPT=1
 export BUILD_OPT
 
 # Generate symbolic info for debuggers
-XCFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/nss3"
+XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
 
@@ -121,8 +121,8 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
-NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
+NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
+NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
 
 export NSS_INCLUDE_DIR
 export NSS_LIB_DIR
@@ -310,6 +310,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado@<emaldona at redhat.com> - 3.12.3.99.3-19
+- Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util
+- Remove the release 17 hack
+
 * Wed Aug 27 2009 Elio maldonado<emaldona at redhat.com> - 3.12.3.99.3-18
 - fix spurious executable permissions on nss-softokn.pc
 



From mbarnes at fedoraproject.org  Thu Aug 27 23:23:21 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 27 Aug 2009 23:23:21 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.15,
	1.116.2.16 evolution.spec, 
	1.394.2.31, 1.394.2.32 sources, 1.116.2.19, 1.116.2.20
Message-ID: <20090827232321.3B5D811C00EB@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10580

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
- Snapshot of "kill-bonobo" branch at commit 787ce81.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.15
retrieving revision 1.116.2.16
diff -u -p -r1.116.2.15 -r1.116.2.16
--- .cvsignore	24 Aug 2009 04:16:49 -0000	1.116.2.15
+++ .cvsignore	27 Aug 2009 23:23:20 -0000	1.116.2.16
@@ -1 +1 @@
-evolution-2.27.91-kill-bonobo-94c361b.tar.bz2
+evolution-2.27.91-kill-bonobo-787ce81.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.31
retrieving revision 1.394.2.32
diff -u -p -r1.394.2.31 -r1.394.2.32
--- evolution.spec	24 Aug 2009 20:09:14 -0000	1.394.2.31
+++ evolution.spec	27 Aug 2009 23:23:20 -0000	1.394.2.32
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 94c361b
+%define hash 787ce81
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.27.91
-Release: 1.kb.1%{?dist}
+Release: 1.kb.2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
+- Snapshot of "kill-bonobo" branch at commit 787ce81.
+
 * Sun Aug 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.1.fc12
 - Snapshot of "kill-bonobo" branch at commit 94c361b.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.19
retrieving revision 1.116.2.20
diff -u -p -r1.116.2.19 -r1.116.2.20
--- sources	24 Aug 2009 04:16:49 -0000	1.116.2.19
+++ sources	27 Aug 2009 23:23:20 -0000	1.116.2.20
@@ -1 +1 @@
-950e447ca2cb899275671669d9f565f8  evolution-2.27.91-kill-bonobo-94c361b.tar.bz2
+de28e832eb2975ee0cf40ed7690d4fe6  evolution-2.27.91-kill-bonobo-787ce81.tar.bz2



From jkeating at fedoraproject.org  Thu Aug 27 23:33:04 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 27 Aug 2009 23:33:04 +0000 (UTC)
Subject: comps/po POTFILES.in,1.10,1.11
Message-ID: <20090827233304.EA68011C00EB@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14785/po

Modified Files:
	POTFILES.in 
Log Message:
Add comps for fedora 13



Index: POTFILES.in
===================================================================
RCS file: /cvs/pkgs/comps/po/POTFILES.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- POTFILES.in	2 Jun 2009 13:57:07 -0000	1.10
+++ POTFILES.in	27 Aug 2009 23:33:04 -0000	1.11
@@ -2,5 +2,6 @@ comps-f9.xml.in
 comps-f10.xml.in
 comps-f11.xml.in
 comps-f12.xml.in
+comps-f13.xml.in
 comps-el4.xml.in
 comps-el5.xml.in



From jkeating at fedoraproject.org  Thu Aug 27 23:33:04 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 27 Aug 2009 23:33:04 +0000 (UTC)
Subject: comps comps-f13.xml.in,NONE,1.1
Message-ID: <20090827233304.C4F0D11C00EB@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14785

Added Files:
	comps-f13.xml.in 
Log Message:
Add comps for fedora 13



--- NEW FILE comps-f13.xml.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>
  <group>
    <id>admin-tools</id>
    <_name>Administration Tools</_name>
    <_description>This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware.</_description>
    <default>true</default>
    <uservisible>true</uservisible>
    <packagelist>
      <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>
      <packagereq type="default">system-config-firewall</packagereq>
      <packagereq type="default">system-config-keyboard</packagereq>
      <packagereq type="default">system-config-language</packagereq>
      <packagereq type="default">system-config-lvm</packagereq>
      <packagereq type="default">system-config-network</packagereq>
      <packagereq type="default">system-config-users</packagereq>
      <packagereq type="optional">cacti</packagereq>
      <packagereq type="optional">dbench</packagereq>
      <packagereq type="optional">etherape</packagereq>
      <packagereq type="optional">ettercap-gtk</packagereq>
      <packagereq type="optional">galternatives</packagereq>
      <packagereq type="optional">gparted</packagereq>
      <packagereq type="optional">gsynaptics</packagereq>
      <packagereq type="optional">kpackagekit</packagereq>
      <packagereq type="optional">lat</packagereq>
      <packagereq type="optional">lshw-gui</packagereq>
      <packagereq type="optional">luma</packagereq>
      <packagereq type="optional">ntop</packagereq>
      <packagereq type="optional">pessulus</packagereq>
      <packagereq type="optional">qtparted</packagereq>
      <packagereq type="optional">system-config-kickstart</packagereq>
      <packagereq type="optional">system-config-rootpassword</packagereq>
      <packagereq type="optional">yumex</packagereq>
    </packagelist>
  </group>
  <group>
    <id>afrikaans-support</id>
    <_name>Afrikaans Support</_name>
    <_description/>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>af</langonly>
    <packagelist>
      <packagereq type="conditional" requires="aspell">aspell-af</packagereq>
      <packagereq type="conditional" requires="autocorr-en">autocorr-af</packagereq>
      <packagereq type="conditional" requires="hunspell">hunspell-af</packagereq>
      <packagereq type="conditional" requires="hyphen">hyphen-af</packagereq>
      <packagereq type="conditional" requires="moodle">moodle-af</packagereq>
      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-af_ZA</packagereq>
    </packagelist>
  </group>
  <group>
    <id>albanian-support</id>
    <_name>Albanian Support</_name>
    <_description/>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>sq</langonly>
    <packagelist>
      <packagereq type="conditional" requires="hunspell">hunspell-sq</packagereq>
      <packagereq type="conditional" requires="moodle">moodle-sq</packagereq>
    </packagelist>
  </group>
  <group>
    <id>amazigh-support</id>
    <_name>Amazigh Support</_name>
    <_description/>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>ber</langonly>
    <packagelist>
      <packagereq type="conditional" requires="hunspell">hunspell-ber</packagereq>
    </packagelist>
  </group>
  <group>
    <id>arabic-support</id>
    <_name>Arabic Support</_name>
    <_description/>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>ar</langonly>
    <packagelist>
      <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
      <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ar</packagereq>
      <packagereq type="conditional" requires="gcompris">gcompris-sound-ar</packagereq>
      <packagereq type="conditional" requires="hunspell">hunspell-ar</packagereq>
      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Arabic</packagereq>
      <packagereq type="conditional" requires="kdelibs">kde-l10n-Arabic</packagereq>
      <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
      <packagereq type="default">dejavu-sans-fonts</packagereq>
      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
      <packagereq type="default">kacst-art-fonts</packagereq>
      <packagereq type="default">kacst-book-fonts</packagereq>
      <packagereq type="default">kacst-decorative-fonts</packagereq>
      <packagereq type="default">kacst-digital-fonts</packagereq>
      <packagereq type="default">kacst-farsi-fonts</packagereq>
      <packagereq type="default">kacst-letter-fonts</packagereq>
      <packagereq type="default">kacst-naskh-fonts</packagereq>
      <packagereq type="default">kacst-office-fonts</packagereq>
      <packagereq type="default">kacst-one-fonts</packagereq>
      <packagereq type="default">kacst-pen-fonts</packagereq>
      <packagereq type="default">kacst-poster-fonts</packagereq>
      <packagereq type="default">kacst-qurn-fonts</packagereq>
      <packagereq type="default">kacst-screen-fonts</packagereq>
      <packagereq type="default">kacst-title-fonts</packagereq>
      <packagereq type="default">kacst-titlel-fonts</packagereq>
      <packagereq type="default">paktype-naqsh-fonts</packagereq>
      <packagereq type="default">paktype-tehreer-fonts</packagereq>
      <packagereq type="optional">m17n-db-arabic</packagereq>
      <packagereq type="optional">scim-tables-arabic</packagereq>
    </packagelist>
  </group>
  <group>
    <id>armenian-support</id>
    <_name>Armenian Support</_name>
    <_description>This group is a collection of tools and resources of Armenian environments.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>hy</langonly>
    <packagelist>
      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
      <packagereq type="conditional" requires="hunspell">hunspell-hy</packagereq>
      <packagereq type="conditional" requires="moodle">moodle-hy</packagereq>
      <packagereq type="optional">m17n-db-armenian</packagereq>
    </packagelist>
  </group>
  <group>
    <id>assamese-support</id>
    <_name>Assamese Support</_name>
    <_description/>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>as</langonly>
    <packagelist>
      <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
      <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
      <packagereq type="mandatory">m17n-db-assamese</packagereq>
      <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
      <packagereq type="conditional" requires="hyphen">hyphen-as</packagereq>
      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
      <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
      <packagereq type="default">iok</packagereq>
    </packagelist>
  </group>
  <group>
    <id>authoring-and-publishing</id>
    <_name>Authoring and Publishing</_name>
    <_description>These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
      <packagereq type="default">docbook-slides</packagereq>
      <packagereq type="default">docbook-style-dsssl</packagereq>
      <packagereq type="default">docbook-style-xsl</packagereq>
      <packagereq type="default">docbook-utils</packagereq>
      <packagereq type="default">docbook-utils-pdf</packagereq>
      <packagereq type="default">docbook5-schemas</packagereq>
      <packagereq type="default">docbook5-style-xsl</packagereq>
      <packagereq type="default">linuxdoc-tools</packagereq>
      <packagereq type="default">texlive</packagereq>
      <packagereq type="default">xhtml1-dtds</packagereq>
      <packagereq type="default">xmlto</packagereq>
      <packagereq type="optional">abcm2ps</packagereq>
      <packagereq type="optional">BibTool</packagereq>
      <packagereq type="optional">conglomerate</packagereq>
      <packagereq type="optional">dblatex</packagereq>
      <packagereq type="optional">docbook2X</packagereq>
      <packagereq type="optional">html401-dtds</packagereq>
      <packagereq type="optional">kile</packagereq>
      <packagereq type="optional">latex-mk</packagereq>
      <packagereq type="optional">latexmk</packagereq>
      <packagereq type="optional">lilypond</packagereq>
      <packagereq type="optional">lout</packagereq>
      <packagereq type="optional">ooo2txt</packagereq>
      <packagereq type="optional">python-docutils</packagereq>
      <packagereq type="optional">scribus</packagereq>
      <packagereq type="optional">tetex-prosper</packagereq>
      <packagereq type="optional">txt2rss</packagereq>
      <packagereq type="optional">w3c-markup-validator</packagereq>
      <packagereq type="optional">xdvik</packagereq>
      <packagereq type="optional">xmlcopyeditor</packagereq>
    </packagelist>
  </group>
  <group>
    <id>azerbaijani-support</id>
    <_name>Azerbaijani Support</_name>
    <_description/>
    <default>false</default>
    <uservisible>true</uservisible>
    <langonly>az</langonly>
    <packagelist>
      <packagereq type="conditional" requires="hunspell">hunspell-az</packagereq>
[...6077 lines suppressed...]
      <groupid>moblin-desktop</groupid>
      <groupid>sugar-desktop</groupid>
      <groupid>window-managers</groupid>
      <groupid>xfce-desktop</groupid>
    </grouplist>
  </category>
  <category>
    <id>apps</id>
    <_name>Applications</_name>
    <_description>Applications to perform a variety of tasks</_description>
    <display_order>20</display_order>
    <grouplist>
      <groupid>authoring-and-publishing</groupid>
      <groupid>editors</groupid>
      <groupid>education</groupid>
      <groupid>engineering-and-scientific</groupid>
      <groupid>font-design</groupid>
      <groupid>games</groupid>
      <groupid>graphical-internet</groupid>
      <groupid>graphics</groupid>
      <groupid>office</groupid>
      <groupid>sound-and-video</groupid>
      <groupid>text-internet</groupid>
    </grouplist>
  </category>
  <category>
    <id>development</id>
    <_name>Development</_name>
    <_description>Packages which provide functionality for developing and building applications.</_description>
    <display_order>70</display_order>
    <grouplist>
      <groupid>development-libs</groupid>
      <groupid>development-tools</groupid>
      <groupid>eclipse</groupid>
      <groupid>electronic-lab</groupid>
      <groupid>fedora-packager</groupid>
      <groupid>gnome-software-development</groupid>
      <groupid>haskell</groupid>
      <groupid>java-development</groupid>
      <groupid>kde-software-development</groupid>
      <groupid>legacy-software-development</groupid>
      <groupid>mingw32</groupid>
      <groupid>ocaml</groupid>
      <groupid>perl</groupid>
      <groupid>ruby</groupid>
      <groupid>web-development</groupid>
      <groupid>x-software-development</groupid>
      <groupid>xfce-software-development</groupid>
    </grouplist>
  </category>
  <category>
    <id>servers</id>
    <_name>Servers</_name>
    <_description>Software used for running network servers</_description>
    <display_order>90</display_order>
    <grouplist>
      <groupid>clustering</groupid>
      <groupid>directory-server</groupid>
      <groupid>dns-server</groupid>
      <groupid>ftp-server</groupid>
      <groupid>legacy-network-server</groupid>
      <groupid>mail-server</groupid>
      <groupid>mysql</groupid>
      <groupid>network-server</groupid>
      <groupid>news-server</groupid>
      <groupid>printing</groupid>
      <groupid>server-cfg</groupid>
      <groupid>smb-server</groupid>
      <groupid>sql-server</groupid>
      <groupid>web-server</groupid>
    </grouplist>
  </category>
  <category>
    <id>base-system</id>
    <_name>Base System</_name>
    <_description>Various core pieces of the system.</_description>
    <display_order>99</display_order>
    <grouplist>
      <groupid>admin-tools</groupid>
      <groupid>base</groupid>
      <groupid>base-x</groupid>
      <groupid>dial-up</groupid>
      <groupid>fonts</groupid>
      <groupid>hardware-support</groupid>
      <groupid>input-methods</groupid>
      <groupid>java</groupid>
      <groupid>legacy-fonts</groupid>
      <groupid>legacy-software-support</groupid>
      <groupid>system-tools</groupid>
      <groupid>virtualization</groupid>
    </grouplist>
  </category>
  <blacklist>
    <package name="dev"/>
    <package name="system-config-mouse"/>
    <package arch="i386" name="NetworkManager"/>
    <package arch="i386" name="dbus"/>
    <package arch="i386" name="e2fsprogs"/>
    <package arch="i386" name="esound"/>
    <package arch="i386" name="gdb"/>
    <package arch="i386" name="geomview"/>
    <package arch="i386" name="gnome-applets"/>
    <package arch="i386" name="gnome-panel"/>
    <package arch="i386" name="hal"/>
    <package arch="i386" name="hpijs"/>
    <package arch="i386" name="kdeaccessibility"/>
    <package arch="i386" name="kdebase"/>
    <package arch="i386" name="kdeedu"/>
    <package arch="i386" name="kdegraphics"/>
    <package arch="i386" name="kdemultimedia"/>
    <package arch="i386" name="kdemultimedia-extras"/>
    <package arch="i386" name="kdenetwork"/>
    <package arch="i386" name="kdesdk"/>
    <package arch="i386" name="kdeutils"/>
    <package arch="i386" name="kdewebdev"/>
    <package arch="i386" name="kmymoney2"/>
    <package arch="i386" name="mkinitrd"/>
    <package arch="i386" name="mysql"/>
    <package arch="i386" name="nas"/>
    <package arch="i386" name="perl"/>
    <package arch="ppc64" name="NetworkManager"/>
    <package arch="ppc64" name="dbus"/>
    <package arch="ppc64" name="e2fsprogs"/>
    <package arch="ppc64" name="esound"/>
    <package arch="ppc64" name="gdb"/>
    <package arch="ppc64" name="geomview"/>
    <package arch="ppc64" name="gnome-applets"/>
    <package arch="ppc64" name="gnome-panel"/>
    <package arch="ppc64" name="hal"/>
    <package arch="ppc64" name="hpijs"/>
    <package arch="ppc64" name="kdeaccessibility"/>
    <package arch="ppc64" name="kdebase"/>
    <package arch="ppc64" name="kdeedu"/>
    <package arch="ppc64" name="kdegraphics"/>
    <package arch="ppc64" name="kdemultimedia"/>
    <package arch="ppc64" name="kdemultimedia-extras"/>
    <package arch="ppc64" name="kdenetwork"/>
    <package arch="ppc64" name="kdesdk"/>
    <package arch="ppc64" name="kdeutils"/>
    <package arch="ppc64" name="kdewebdev"/>
    <package arch="ppc64" name="kmymoney2"/>
    <package arch="ppc64" name="mkinitrd"/>
    <package arch="ppc64" name="mysql"/>
    <package arch="ppc64" name="nas"/>
  </blacklist>
  <whiteout>
    <ignoredep package="XFree86" requires="Mesa"/>
    <ignoredep package="XFree86-libs" requires="XFree86-Mesa-libGL"/>
    <ignoredep package="arts" requires="kdelibs-sound"/>
    <ignoredep package="aspell" requires="aspell-en"/>
    <ignoredep package="bind" requires="bind-utils"/>
    <ignoredep package="compat-glibc" requires="db1"/>
    <ignoredep package="compat-glibc" requires="db2"/>
    <ignoredep package="control-center" requires="xscreensaver"/>
    <ignoredep package="coreutils" requires="pam"/>
    <ignoredep package="cyrus-sasl" requires="openldap"/>
    <ignoredep package="dbus" requires="dbus-glib"/>
    <ignoredep package="ghostscript" requires="gimp-print"/>
    <ignoredep package="ghostscript-fonts" requires="ghostscript"/>
    <ignoredep package="gimp" requires="gimp-print-plugin"/>
    <ignoredep package="glibc-debug" requires="glibc-devel"/>
    <ignoredep package="gnome-python2" requires="gnome-python2-bonobo"/>
    <ignoredep package="gtk+" requires="gdk-pixbuf"/>
    <ignoredep package="gtk2" requires="scim-libs"/>
    <ignoredep package="hicolor-icon-theme" requires="gtk2"/>
    <ignoredep package="httpd" requires="httpd-suexec"/>
    <ignoredep package="info" requires="ncurses"/>
    <ignoredep package="initscripts" requires="kernel"/>
    <ignoredep package="initscripts" requires="kernel-smp"/>
    <ignoredep package="initscripts" requires="sysklogd"/>
    <ignoredep package="initscripts" requires="util-linux"/>
    <ignoredep package="kdemultimedia-arts" requires="kdemultimedia-libs"/>
    <ignoredep package="libgnomeprint15" requires="gnome-print"/>
    <ignoredep package="libtermcap" requires="bash"/>
    <ignoredep package="lvm2" requires="kernel"/>
    <ignoredep package="modutils" requires="vixie-cron"/>
    <ignoredep package="mysql" requires="perl-DBD-MySQL"/>
    <ignoredep package="nautilus" requires="nautilus-cd-burner"/>
    <ignoredep package="nautilus" requires="nautilus-mozilla"/>
    <ignoredep package="ncurses" requires="gpm"/>
    <ignoredep package="openoffice.org-libs" requires="openoffice.org"/>
    <ignoredep package="pam" requires="initscripts"/>
    <ignoredep package="pango-gtkbeta-devel" requires="pango-gtkbeta"/>
    <ignoredep package="perl" requires="mod_perl"/>
    <ignoredep package="perl" requires="mrtg"/>
    <ignoredep package="perl" requires="perl-Filter"/>
    <ignoredep package="perl-Date-Calc" requires="perl-Bit-Vector"/>
    <ignoredep package="php" requires="php-pear"/>
    <ignoredep package="redhat-lsb" requires="redhat-lsb"/>
    <ignoredep package="tcl" requires="postgresql-tcl"/>
    <ignoredep package="usermode" requires="util-linux"/>
    <ignoredep package="xemacs" requires="apel-xemacs"/>
    <ignoredep package="xemacs" requires="xemacs-sumo"/>
    <ignoredep package="xinitrc" requires="XFree86"/>
    <ignoredep package="xinitrc" requires="xorg-x11"/>
    <ignoredep package="xorg-x11" requires="Mesa"/>
    <ignoredep package="xorg-x11-libs" requires="xorg-x11-Mesa-libGL"/>
    <ignoredep package="ypbind" requires="yp-tools"/>
  </whiteout>
</comps>



From pkgdb at fedoraproject.org  Thu Aug 27 23:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 23:37:09 +0000
Subject: [pkgdb] xorg-x11-drv-vesa: bskeggs has requested watchcommits
Message-ID: <20090827233709.8963110F879@bastion2.fedora.phx.redhat.com>

bskeggs has requested the watchcommits acl on xorg-x11-drv-vesa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-vesa



From pkgdb at fedoraproject.org  Thu Aug 27 23:37:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 27 Aug 2009 23:37:10 +0000
Subject: [pkgdb] xorg-x11-drv-vesa: bskeggs has requested commit
Message-ID: <20090827233710.77A2110F884@bastion2.fedora.phx.redhat.com>

bskeggs has requested the commit acl on xorg-x11-drv-vesa (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-vesa



From emaldonado at fedoraproject.org  Thu Aug 27 23:42:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 27 Aug 2009 23:42:49 +0000 (UTC)
Subject: rpms/nss/devel nss-config.in,1.3,1.4
Message-ID: <20090827234249.C7C9A11C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19313

Modified Files:
	nss-config.in 
Log Message:
Removed nssutil which now provided by the nss-util package


Index: nss-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-config.in	25 Jan 2008 12:29:12 -0000	1.3
+++ nss-config.in	27 Aug 2009 23:42:46 -0000	1.4
@@ -20,7 +20,6 @@ Options:
 	[--cflags]
 Dynamic Libraries:
 	nss
-	nssutil
 	ssl
 	smime
 EOF
@@ -34,7 +33,6 @@ fi
 lib_ssl=yes
 lib_smime=yes
 lib_nss=yes
-lib_nssutil=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -85,9 +83,6 @@ while test $# -gt 0; do
     nss)
       lib_nss=yes
       ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
     *)
       usage 1 1>&2
       ;;
@@ -137,9 +132,6 @@ if test "$echo_libs" = "yes"; then
       if test -n "$lib_nss"; then
 	libdirs="$libdirs -lnss${major_version}"
       fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
       echo $libdirs
 fi      
 



From bskeggs at fedoraproject.org  Thu Aug 27 23:50:13 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 27 Aug 2009 23:50:13 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel nv-refuse-kms.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.91, 1.92
Message-ID: <20090827235014.06A2811C0494@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23634

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-refuse-kms.patch 
Log Message:
* Fri Aug 28 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.14-5
- refuse to load if KMS driver already using the hw



nv-refuse-kms.patch:
 nv_driver.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE nv-refuse-kms.patch ---
>From ee544c2b11ab327abab6e205425e6eafe961de2e Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Fri, 28 Aug 2009 09:43:16 +1000
Subject: [PATCH] nv: refuse to load if there's a kernel driver bound to the device already

---
 src/nv_driver.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/nv_driver.c b/src/nv_driver.c
index a7cf2dc..6f7fc0e 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -780,6 +780,12 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data)
                       NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | dev->device_id;
     const char *name = xf86TokenToString(NVKnownChipsets, id);
 
+    if (pci_device_has_kernel_driver(dev)) {
+	ErrorF("The PCI device has a kernel module claiming it.\n");
+	ErrorF("This driver cannot operate until it has been unloaded\n");
+	return FALSE;
+    }
+
     if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&
        !NVIsSupported(id) && !NVIsG80(id)) {
         /* See if pci.ids knows what the heck this thing is */
-- 
1.6.4



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.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- xorg-x11-drv-nv.spec	4 Aug 2009 17:18:50 -0000	1.91
+++ xorg-x11-drv-nv.spec	27 Aug 2009 23:50:13 -0000	1.92
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.14
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -29,6 +29,7 @@ Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
 Patch10:    nv-2.1.12-gf7025-gf7050.patch
+Patch11:    nv-refuse-kms.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -43,6 +44,7 @@ X.Org X11 nv video driver.
 %patch7 -p1 -b .save-rom
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
+%patch11 -p1 -b .nokms
 
 %build
 autoreconf -v --install
@@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Fri Aug 28 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.14-5
+- refuse to load if KMS driver already using the hw
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 2.1.14-4
 - autoreconf so the dpms configurey gets picked up
 



From jkeating at fedoraproject.org  Fri Aug 28 00:16:36 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 28 Aug 2009 00:16:36 +0000 (UTC)
Subject: fedora-release fedora-release.spec,1.76,1.77
Message-ID: <20090828001636.4089911C00EB@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254

Modified Files:
	fedora-release.spec 
Log Message:
Bump for F13



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- fedora-release.spec	8 Aug 2009 00:04:48 -0000	1.76
+++ fedora-release.spec	28 Aug 2009 00:16:34 -0000	1.77
@@ -1,10 +1,10 @@
 %define release_name Rawhide
-%define dist_version 12
+%define dist_version 13
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.91
-Release:	3
+Version:	13
+Release:	0.1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Aug 27 2009 Jesse Keating <jkeating at redhat.com> - 13-0.1
+- Bump for Fedora 13's rawhide.
+- Put the version at 13 from the start.
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-3
 - Bump for new tarball
 



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:01 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested watchcommits
Message-ID: <20090828002601.81C9210F884@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on antlr3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:25:59 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested watchbugzilla
Message-ID: <20090828002559.6794810F854@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on antlr3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:04 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested commit
Message-ID: <20090828002604.0F55510F890@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on antlr3 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:13 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested watchbugzilla
Message-ID: <20090828002613.428AC10F878@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on antlr3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:15 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested watchcommits
Message-ID: <20090828002615.87E6D10F87C@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on antlr3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:20 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested watchbugzilla
Message-ID: <20090828002620.A685E10F89C@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on antlr3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:17 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested commit
Message-ID: <20090828002617.1F97F10F898@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on antlr3 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:22 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested watchcommits
Message-ID: <20090828002622.7D7FF10F854@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on antlr3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Fri Aug 28 00:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 00:26:24 +0000
Subject: [pkgdb] antlr3: mjakubicek has requested commit
Message-ID: <20090828002624.205D810F88B@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on antlr3 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/antlr3



From cebbert at fedoraproject.org  Fri Aug 28 00:31:36 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 28 Aug 2009 00:31:36 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc7-git6.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1118, 1.1119 kernel.spec, 1.1746, 1.1747 sources, 1.1076,
	1.1077 upstream, 1.990, 1.991 patch-2.6.31-rc7-git5.bz2.sign,
	1.1, NONE xen-fb-probe-fix.patch, 1.1, NONE
Message-ID: <20090828003137.112FF11C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11225

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc7-git6.bz2.sign 
Removed Files:
	patch-2.6.31-rc7-git5.bz2.sign xen-fb-probe-fix.patch 
Log Message:
2.6.31-rc7-git6
Drop patch merged upstream:
  xen-fb-probe-fix.patch


--- NEW FILE patch-2.6.31-rc7-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKlx+0yGugalF9Dw4RAghpAKCQAE2V74AZWfevPaoPM7MxE7mLLACeKB0l
hlDncp+6W3dJ+Ejc+DOBTe0=
=DtCa
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1118
retrieving revision 1.1119
diff -u -p -r1.1118 -r1.1119
--- .cvsignore	27 Aug 2009 13:32:33 -0000	1.1118
+++ .cvsignore	28 Aug 2009 00:31:35 -0000	1.1119
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git5.bz2
+patch-2.6.31-rc7-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1746
retrieving revision 1.1747
diff -u -p -r1.1746 -r1.1747
--- kernel.spec	27 Aug 2009 18:58:31 -0000	1.1746
+++ kernel.spec	28 Aug 2009 00:31:35 -0000	1.1747
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 7
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -725,9 +725,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
-# fix xen boot
-Patch12020: xen-fb-probe-fix.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1342,9 +1339,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 
 # Patches headed upstream
 
-# fix xen boot
-ApplyPatch xen-fb-probe-fix.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2011,6 +2005,11 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc7-git6
+- Drop patch merged upstream:
+  xen-fb-probe-fix.patch
+
 * Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
 - drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
   you know, success. (#519718)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -p -r1.1076 -r1.1077
--- sources	27 Aug 2009 13:32:34 -0000	1.1076
+++ sources	28 Aug 2009 00:31:35 -0000	1.1077
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-b31e020fe330d8927d12e25b051704c8  patch-2.6.31-rc7-git5.bz2
+59a009dd342443a5d53e331daa68ddf2  patch-2.6.31-rc7-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.990
retrieving revision 1.991
diff -u -p -r1.990 -r1.991
--- upstream	27 Aug 2009 13:32:34 -0000	1.990
+++ upstream	28 Aug 2009 00:31:35 -0000	1.991
@@ -1,3 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git5.bz2
+patch-2.6.31-rc7-git6.bz2


--- patch-2.6.31-rc7-git5.bz2.sign DELETED ---


--- xen-fb-probe-fix.patch DELETED ---



From cebbert at fedoraproject.org  Fri Aug 28 00:38:46 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 28 Aug 2009 00:38:46 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1747,1.1748
Message-ID: <20090828003846.258A211C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14735

Modified Files:
	kernel.spec 
Log Message:
add version to changelog


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1747
retrieving revision 1.1748
diff -u -p -r1.1747 -r1.1748
--- kernel.spec	28 Aug 2009 00:31:35 -0000	1.1747
+++ kernel.spec	28 Aug 2009 00:38:45 -0000	1.1748
@@ -2005,7 +2005,7 @@ fi
 # and build.
 
 %changelog
-* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.185.rc7.git6
 - 2.6.31-rc7-git6
 - Drop patch merged upstream:
   xen-fb-probe-fix.patch



From lennart at fedoraproject.org  Fri Aug 28 00:52:18 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 28 Aug 2009 00:52:18 +0000 (UTC)
Subject: rpms/sound-theme-freedesktop/devel .cvsignore, 1.6,
	1.7 sound-theme-freedesktop.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20090828005218.7E4A111C00EB@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/sound-theme-freedesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21298

Modified Files:
	.cvsignore sound-theme-freedesktop.spec sources 
Log Message:
New upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Aug 2009 03:29:29 -0000	1.6
+++ .cvsignore	28 Aug 2009 00:52:17 -0000	1.7
@@ -1 +1 @@
-sound-theme-freedesktop-0.5.tar.bz2
+sound-theme-freedesktop-0.6.tar.bz2


Index: sound-theme-freedesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sound-theme-freedesktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sound-theme-freedesktop.spec	27 Aug 2009 03:29:29 -0000	1.12
+++ sound-theme-freedesktop.spec	28 Aug 2009 00:52:18 -0000	1.13
@@ -1,5 +1,5 @@
 Name: sound-theme-freedesktop
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 Summary: freedesktop.org sound theme
 Group: User Interface/Desktops
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sounds/freedesktop/stereo/*.ogg
 
 %changelog
+* Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> 0.6-1
+- New upstream
+
 * Thu Aug 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.5-1
 - New upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sound-theme-freedesktop/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Aug 2009 03:29:29 -0000	1.6
+++ sources	28 Aug 2009 00:52:18 -0000	1.7
@@ -1 +1 @@
-2605db0f6769c057664e02fd8c9655d1  sound-theme-freedesktop-0.5.tar.bz2
+9c00b21b13dceb947b4a37f6280ca1a3  sound-theme-freedesktop-0.6.tar.bz2



From cebbert at fedoraproject.org  Fri Aug 28 01:02:03 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 28 Aug 2009 01:02:03 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-defaults-die-floppy-die.patch, NONE,
	1.1 kernel.spec, 1.1721, 1.1722
Message-ID: <20090828010203.8746511C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25859

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-defaults-die-floppy-die.patch 
Log Message:
Don't load the floppy driver automatically:
  linux-2.6-defaults-die-floppy-die.patch

linux-2.6-defaults-die-floppy-die.patch:
 floppy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-die-floppy-die.patch ---
Kill the floppy.ko pnp modalias. We were surviving just fine without
autoloading floppy drivers, tyvm.

Please feel free to register all complaints in the wastepaper bin.

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 91b7530..2ea84a6 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4631,7 +4631,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
 	{ "PNP0700", 0 },
 	{ }
 };
-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
 
 #else
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1721
retrieving revision 1.1722
diff -u -p -r1.1721 -r1.1722
--- kernel.spec	27 Aug 2009 22:50:02 -0000	1.1721
+++ kernel.spec	28 Aug 2009 01:02:02 -0000	1.1722
@@ -624,6 +624,7 @@ Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
+Patch392: linux-2.6-defaults-die-floppy-die.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 Patch452: linux-2.6-input-wacom-bluetooth.patch
@@ -1267,6 +1268,8 @@ ApplyPatch linux-2.6-xen-clean-up-warnin
 # Misc fixes
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
+# don't load the floppy driver by default
+ApplyPatch linux-2.6-defaults-die-floppy-die.patch
 
 # Get away from having to poll Toshibas
 ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
@@ -1962,6 +1965,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-43
+- Don't load the floppy driver automatically:
+  linux-2.6-defaults-die-floppy-die.patch
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-42
 - Fix stackprotector problems with Xen on x86_64.
 - Disable stackprotector on i386 until 32-bit Xen gets fixed.



From pkgdb at fedoraproject.org  Fri Aug 28 01:05:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:05:24 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010524.6C6B710F854@bastion2.fedora.phx.redhat.com>

plouj has set the watchbugzilla acl on mingw32-libtiff (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:05:39 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010539.5FB9010F854@bastion2.fedora.phx.redhat.com>

plouj has set the watchbugzilla acl on mingw32-libtiff (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:06:01 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010601.8CCB010F86F@bastion2.fedora.phx.redhat.com>

plouj has set the watchcommits acl on mingw32-libtiff (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:06:05 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010605.E161210F87C@bastion2.fedora.phx.redhat.com>

plouj has set the watchcommits acl on mingw32-libtiff (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:06:16 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010616.29A9910F854@bastion2.fedora.phx.redhat.com>

plouj has set the commit acl on mingw32-libtiff (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:06:18 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010618.47BE110F88B@bastion2.fedora.phx.redhat.com>

plouj has set the commit acl on mingw32-libtiff (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:06:24 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010624.1969910F87B@bastion2.fedora.phx.redhat.com>

plouj has set the approveacls acl on mingw32-libtiff (Fedora devel) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From pkgdb at fedoraproject.org  Fri Aug 28 01:06:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 01:06:25 +0000
Subject: [pkgdb] mingw32-libtiff had acl change status
Message-ID: <20090828010626.024B610F884@bastion2.fedora.phx.redhat.com>

plouj has set the approveacls acl on mingw32-libtiff (Fedora 11) to Approved for epienbro

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libtiff



From emaldonado at fedoraproject.org  Fri Aug 28 01:38:31 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 01:38:31 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.100,1.101
Message-ID: <20090828013831.B52D811C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10667

Modified Files:
	nss.spec 
Log Message:
Add BuildRequres nss-softokn and nss-util as build runs tests


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- nss.spec	27 Aug 2009 19:23:56 -0000	1.100
+++ nss.spec	28 Aug 2009 01:38:30 -0000	1.101
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          21%{?dist}
+Release:          22%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -15,6 +15,8 @@ Requires:         nss-softokn-freebl%{_i
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    nss-softokn >= 3.12.3.99.3-12                                                  
+BuildRequires:    nss-util >= 3.12.3.99.3-10
 BuildRequires:    nss-softokn-devel >= 3.12.3.99.3-12                                                  
 BuildRequires:    nss-util-devel >= 3.12.3.99.3-10
 BuildRequires:    sqlite-devel
@@ -207,10 +209,8 @@ cd ./mozilla/security/nss/tests/
 # all.sh is the test suite script
 
 #HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
-
 # Temporarily disabling all tests until we investigate a fix for Bug 519766
 
-
 cd ../../../../
 
 killall $RANDSERV || :
@@ -436,6 +436,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-22
+- Fix nss-config not to include nssutil
+- Add BuildRequires on nss-softokn and nss-util since build also runs the test suite
+
 * Wed Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-21
 - disabling all tests while we investigate a buffer overflow bug
 



From lmacken at fedoraproject.org  Fri Aug 28 02:31:37 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 28 Aug 2009 02:31:37 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.17,
	1.18 liveusb-creator.spec, 1.26, 1.27 sources, 1.21, 1.22
Message-ID: <20090828023137.0AA8E11C00EB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4446

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.7.3 Bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	6 Aug 2009 00:00:53 -0000	1.17
+++ .cvsignore	28 Aug 2009 02:31:36 -0000	1.18
@@ -1 +1 @@
-liveusb-creator-3.7.2.tar.bz2
+liveusb-creator-3.7.3.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- liveusb-creator.spec	6 Aug 2009 00:00:53 -0000	1.26
+++ liveusb-creator.spec	28 Aug 2009 02:31:36 -0000	1.27
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.7.2
+Version:        3.7.3
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.3-1
+- 3.7.3
+
 * Wed Aug 05 2009 Luke Macken <lmacken at redhat.com> - 3.7.2-1
 - 3.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	6 Aug 2009 00:00:53 -0000	1.21
+++ sources	28 Aug 2009 02:31:36 -0000	1.22
@@ -1 +1 @@
-dfca2084def4359c4a18bc36f2c8ad9c  liveusb-creator-3.7.2.tar.bz2
+336c2e9ecb71485b82bfe43069592c26  liveusb-creator-3.7.3.tar.bz2



From jnovy at fedoraproject.org  Fri Aug 28 02:33:26 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 02:33:26 +0000 (UTC)
Subject: rpms/xz/devel .cvsignore,1.4,1.5 sources,1.4,1.5 xz.spec,1.4,1.5
Message-ID: <20090828023326.BD8B511C00EB@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/xz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5402

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.10.beta.20090817git
- sync with upstream because of #517806



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 10:26:48 -0000	1.4
+++ .cvsignore	28 Aug 2009 02:33:26 -0000	1.5
@@ -1 +1 @@
-xz-4.999.8beta.20090817git.tar.gz
+xz-4.999.9beta.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 10:26:48 -0000	1.4
+++ sources	28 Aug 2009 02:33:26 -0000	1.5
@@ -1 +1 @@
-d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz
+62459762f5ac6055051f2929191cd159  xz-4.999.9beta.tar.xz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/xz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xz.spec	17 Aug 2009 10:26:48 -0000	1.4
+++ xz.spec	28 Aug 2009 02:33:26 -0000	1.5
@@ -1,13 +1,11 @@
-%define git_date 20090817
-
 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%{?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.tar.xz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
@@ -54,7 +52,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 +104,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* 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
 



From cchance at fedoraproject.org  Fri Aug 28 02:37:24 2009
From: cchance at fedoraproject.org (cchance)
Date: Fri, 28 Aug 2009 02:37:24 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel ibus-table-erbi.spec,1.12,1.13
Message-ID: <20090828023724.F101011C00EB@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7597

Modified Files:
	ibus-table-erbi.spec 
Log Message:
updated source



Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ibus-table-erbi.spec	25 Jul 2009 03:04:20 -0000	1.12
+++ ibus-table-erbi.spec	28 Aug 2009 02:37:24 -0000	1.13
@@ -1,7 +1,7 @@
 Name:       ibus-table-erbi
-Version:    1.2.0.20090717
-Release:    3%{?dist}
-Summary:    Erbi input methods for ibus-table
+Version:    1.2.0.20090828
+Release:    1%{?dist}
+Summary:    Erbi input method tables for IBus-Table
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -10,19 +10,22 @@ Source0:    http://ibus.googlecode.com/f
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-Requires:         ibus-table >= 1.1.0.20090610, ibus-table >= 1.1.0.20090610
-Requires(post):   ibus-table >= 1.1.0.20090610, ibus-table >= 1.1.0.20090610
+Requires:         ibus >= 1.1.0.20090617, ibus-table >= 1.1.0.20090610
+Requires(post):   ibus >= 1.1.0.20090617, ibus-table >= 1.1.0.20090610
 BuildRequires:    ibus >= 1.2.0.20090617, ibus-table >= 1.1.0.20090610
 
 %description
-The package contains Erbi input methods for Table engine of IBus platform. 
+The package contains Erbi input method tables for IBus-Table. 
 
 %prep
 %setup -q
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
-%configure --prefix=%{_prefix}
+%configure \
+  --prefix=%{_prefix} \
+  --enable-erbi \
+  --enable-erbi-qs
 %__make %{?_smp_mflags}
 
 %install
@@ -34,15 +37,22 @@ export IBUS_TABLE_CREATEDB="%{_bindir}/i
 
 %post
 cd %{_datadir}/ibus-table/tables/
+%{_bindir}/ibus-table-createdb -i -n erbi.db
 %{_bindir}/ibus-table-createdb -i -n erbi_qs.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
+%{_datadir}/ibus-table/tables/erbi.db
 %{_datadir}/ibus-table/tables/erbi_qs.db
+%{_datadir}/ibus-table/icons/erbi.png
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Fri Aug 28 2009 Caius 'kaio' Chance <k at kaio.me> - 1.1.0.20090828-1.fc12
+- Updated source with addition of standard ErBi table.
+- Corrected Requires package.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090717-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cchance at fedoraproject.org  Fri Aug 28 02:38:45 2009
From: cchance at fedoraproject.org (cchance)
Date: Fri, 28 Aug 2009 02:38:45 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090828023845.6684B11C00EB@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8222

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded source file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jul 2009 06:26:41 -0000	1.3
+++ .cvsignore	28 Aug 2009 02:38:45 -0000	1.4
@@ -1 +1 @@
-ibus-table-erbi-1.2.0.20090717.tar.gz
+ibus-table-erbi-1.2.0.20090828.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jul 2009 06:26:41 -0000	1.3
+++ sources	28 Aug 2009 02:38:45 -0000	1.4
@@ -1 +1 @@
-1ab5946a329d17fcb30a4bd260419097  ibus-table-erbi-1.2.0.20090717.tar.gz
+155a79f4c8fc1ac117698702c853d47d  ibus-table-erbi-1.2.0.20090828.tar.gz



From jnovy at fedoraproject.org  Fri Aug 28 02:52:32 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 02:52:32 +0000 (UTC)
Subject: rpms/mikmod/devel mikmod-3.2.2-beta1-CVE-2009-0179.patch, NONE,
	1.1 mikmod.spec, 1.44, 1.45
Message-ID: <20090828025232.604AE11C00EB@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mikmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15358

Modified Files:
	mikmod.spec 
Added Files:
	mikmod-3.2.2-beta1-CVE-2009-0179.patch 
Log Message:
* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.2-13.beta1
- fix CVE-2009-0179 (#519992)


mikmod-3.2.2-beta1-CVE-2009-0179.patch:
 loaders/load_xm.c    |    3 ++-
 playercode/mloader.c |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE mikmod-3.2.2-beta1-CVE-2009-0179.patch ---
diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
--- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
@@ -622,7 +622,8 @@
 				/* read the remainder of the header */
 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
 
-				if(_mm_eof(modreader)) {
+				/* last instrument is at the end of file in version 0x0104 */
+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
 					free(nextwav);free(wh);
 					nextwav=NULL;wh=NULL;
 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
--- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
@@ -450,10 +450,12 @@
 	if (!l->Init || l->Init()) {
 		_mm_rewind(modreader);
 		ok = l->Load(curious);
-		/* propagate inflags=flags for in-module samples */
-		for (t = 0; t < of.numsmp; t++)
-			if (of.samples[t].inflags == 0)
-				of.samples[t].inflags = of.samples[t].flags;
+		if (ok) {
+			/* propagate inflags=flags for in-module samples */
+			for (t = 0; t < of.numsmp; t++)
+				if (of.samples[t].inflags == 0)
+					of.samples[t].inflags = of.samples[t].flags;
+		}
 	} else
 		ok = 0;
 


Index: mikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- mikmod.spec	12 Aug 2009 17:38:29 -0000	1.44
+++ mikmod.spec	28 Aug 2009 02:52:32 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: Music module player
 Name: mikmod
 Version: 3.2.2
-Release: 12.beta1%{?dist}
+Release: 13.beta1%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,6 +11,7 @@ BuildRequires: ncurses-devel libmikmod-d
 URL: http://mikmod.raphnet.net/
 Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.bz2
 Patch0: mikmod-3.2.2-beta1-missing-protos.patch
+Patch1: mikmod-3.2.2-beta1-CVE-2009-0179.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.2-13.beta1
+- fix CVE-2009-0179 (#519992)
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.2.2-12.beta1
 - Use bzipped upstream tarball.
 



From whot at fedoraproject.org  Fri Aug 28 03:01:08 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:01:08 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.59, 1.60 sources, 1.58,
	1.59 xorg-x11-proto-devel.spec, 1.108, 1.109
Message-ID: <20090828030108.885B911C00ED@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-serv19705

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-31
- bigreqsproto 1.1.0
- damageproto 1.2.0
- dmxproto 2.2.99.1
- evieext 1.1.0
- fontsproto 2.1.0
- resourceproto 1.1.0
- scrnsaverproto 1.2.0
- videoproto 2.3.0
- xcmiscproto 1.2.0
- xf86bigfontproto 1.2.0
- xf86dgaproto 2.0.99.1
- xf86driproto 2.1.0
- xf86vidmodeproto 2.2.99.1
- xineramaproto 1.1.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	25 Aug 2009 04:56:12 -0000	1.59
+++ .cvsignore	28 Aug 2009 03:01:07 -0000	1.60
@@ -1,31 +1,28 @@
-bigreqsproto-1.0.2.tar.bz2
+bigreqsproto-1.1.0.tar.bz2
 compositeproto-0.4.tar.bz2
-damageproto-1.1.0.tar.bz2
-dmxproto-2.2.2.tar.bz2
-evieext-1.0.2.tar.bz2
-fixesproto-4.0.tar.bz2
-fontsproto-2.0.2.tar.bz2
+damageproto-1.2.0.tar.bz2
+dmxproto-2.2.99.1.tar.bz2
+evieext-1.1.0.tar.bz2
+fixesproto-4.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
 renderproto-0.11.tar.bz2
-resourceproto-1.0.2.tar.bz2
-scrnsaverproto-1.1.0.tar.bz2
-videoproto-2.2.2.tar.bz2
-xcmiscproto-1.1.2.tar.bz2
-xextproto-7.0.4.tar.bz2
-xf86bigfontproto-1.1.2.tar.bz2
-xf86dgaproto-2.0.3.tar.bz2
-xf86driproto-2.0.4.tar.bz2
+resourceproto-1.1.0.tar.bz2
+scrnsaverproto-1.2.0.tar.bz2
+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
+xf86driproto-2.1.0.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
-xf86vidmodeproto-2.2.2.tar.bz2
-xineramaproto-1.1.2.tar.bz2
+xf86vidmodeproto-2.2.99.1.tar.bz2
+xineramaproto-1.1.99.1.tar.bz2
 xproto-7.0.15.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-randrproto-1.2.99.3.tar.bz2
+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.0.tar.bz2
-xextproto-7.1.1.tar.bz2
-fixesproto-4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	25 Aug 2009 04:56:12 -0000	1.58
+++ sources	28 Aug 2009 03:01:07 -0000	1.59
@@ -1,22 +1,22 @@
-95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
+d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
 6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
-33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
-d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
-2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
-c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
+434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2
+7bd9ccde42f022725c0086bd93d269f3  dmxproto-2.2.99.1.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
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
-b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
-5d551850e6f4acdf49a13f4eb3a5bbfa  scrnsaverproto-1.1.0.tar.bz2
-44292d74a9a3c94b1ecb9d77a0da83e8  videoproto-2.2.2.tar.bz2
-fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
-a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
-42fdcebc66efac02ab4beec2b1b0ad6e  xf86dgaproto-2.0.3.tar.bz2
-01470d088da3a8a3deefa8e1f45d69cb  xf86driproto-2.0.4.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
+309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
-f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
-1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.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
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.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.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- xorg-x11-proto-devel.spec	25 Aug 2009 04:56:12 -0000	1.108
+++ xorg-x11-proto-devel.spec	28 Aug 2009 03:01:07 -0000	1.109
@@ -7,38 +7,38 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
+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
-Source2:  http://www.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
-Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.2.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
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
-Source4:  http://www.x.org/pub/individual/proto/evieext-1.0.2.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
-Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.0.2.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
 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.0.2.tar.bz2
-Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
-Source19: http://www.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
-Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.1.2.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
+Source19: http://www.x.org/pub/individual/proto/videoproto-2.3.0.tar.bz2
+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.1.2.tar.bz2
-Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
-Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.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
+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.2.tar.bz2
-Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.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
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
@@ -138,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/ap_keysym.h
 %dir %{_includedir}/X11/dri
 %{_includedir}/X11/dri/xf86dri.h
+%{_includedir}/X11/dri/xf86driproto.h
 %{_includedir}/X11/dri/xf86dristr.h
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/EVI.h
@@ -153,13 +154,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XKBstr.h
 %{_includedir}/X11/extensions/XResproto.h
 %{_includedir}/X11/extensions/Xeviestr.h
-%{_includedir}/X11/extensions/Xinerama.h
 %{_includedir}/X11/extensions/Xv.h
 %{_includedir}/X11/extensions/XvMC.h
 %{_includedir}/X11/extensions/XvMCproto.h
 %{_includedir}/X11/extensions/Xvproto.h
 %{_includedir}/X11/extensions/ag.h
 %{_includedir}/X11/extensions/agproto.h
+%{_includedir}/X11/extensions/bigreqsproto.h
 %{_includedir}/X11/extensions/bigreqstr.h
 %{_includedir}/X11/extensions/composite.h
 %{_includedir}/X11/extensions/compositeproto.h
@@ -169,12 +170,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/damagewire.h
 %{_includedir}/X11/extensions/dbe.h
 %{_includedir}/X11/extensions/dbeproto.h
-%{_includedir}/X11/extensions/dmxext.h
+%{_includedir}/X11/extensions/dmx.h
 %{_includedir}/X11/extensions/dmxproto.h
 %{_includedir}/X11/extensions/dpmsconst.h
 %{_includedir}/X11/extensions/dpmsproto.h
 %{_includedir}/X11/extensions/dri2proto.h
 %{_includedir}/X11/extensions/dri2tokens.h
+%{_includedir}/X11/extensions/evieproto.h
 %{_includedir}/X11/extensions/ge.h
 %{_includedir}/X11/extensions/geproto.h
 %{_includedir}/X11/extensions/lbx.h
@@ -183,7 +185,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/mitmiscproto.h
 %{_includedir}/X11/extensions/multibufconst.h
 %{_includedir}/X11/extensions/multibufproto.h
-%{_includedir}/X11/extensions/panoramiXext.h
 %{_includedir}/X11/extensions/panoramiXproto.h
 %{_includedir}/X11/extensions/randr.h
 %{_includedir}/X11/extensions/randrproto.h
@@ -194,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/renderproto.h
 %{_includedir}/X11/extensions/saver.h
 %{_includedir}/X11/extensions/saverproto.h
-%{_includedir}/X11/extensions/scrnsaver.h
 %{_includedir}/X11/extensions/secur.h
 %{_includedir}/X11/extensions/securproto.h
 %{_includedir}/X11/extensions/shapeconst.h
@@ -204,16 +204,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/syncconst.h
 %{_includedir}/X11/extensions/syncproto.h
 %{_includedir}/X11/extensions/vldXvMC.h
+%{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
+%{_includedir}/X11/extensions/xf86bigfproto.h
 %{_includedir}/X11/extensions/xf86bigfstr.h
-%{_includedir}/X11/extensions/xf86dga.h
-%{_includedir}/X11/extensions/xf86dga1.h
+%{_includedir}/X11/extensions/xf86dga1const.h
+%{_includedir}/X11/extensions/xf86dga1proto.h
 %{_includedir}/X11/extensions/xf86dga1str.h
+%{_includedir}/X11/extensions/xf86dgaconst.h
+%{_includedir}/X11/extensions/xf86dgaproto.h
 %{_includedir}/X11/extensions/xf86dgastr.h
 %{_includedir}/X11/extensions/xf86misc.h
 %{_includedir}/X11/extensions/xf86mscstr.h
-%{_includedir}/X11/extensions/xf86vmode.h
+%{_includedir}/X11/extensions/xf86vm.h
+%{_includedir}/X11/extensions/xf86vmproto.h
 %{_includedir}/X11/extensions/xf86vmstr.h
 %{_includedir}/X11/extensions/xfixesproto.h
 %{_includedir}/X11/extensions/xfixeswire.h
@@ -259,6 +264,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-31
+- bigreqsproto 1.1.0
+- damageproto 1.2.0
+- dmxproto 2.2.99.1
+- evieext 1.1.0
+- fontsproto 2.1.0
+- resourceproto 1.1.0
+- scrnsaverproto 1.2.0
+- videoproto 2.3.0
+- xcmiscproto 1.2.0
+- xf86bigfontproto 1.2.0
+- xf86dgaproto 2.0.99.1
+- xf86driproto 2.1.0
+- xf86vidmodeproto 2.2.99.1
+- xineramaproto 1.1.99.1
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-30
 - recordproto 1.13.99.1
 - xextproto 7.1.1



From whot at fedoraproject.org  Fri Aug 28 03:01:29 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:01:29 +0000 (UTC)
Subject: rpms/libXinerama/devel .cvsignore, 1.8, 1.9 libXinerama.spec, 1.23, 
	1.24 sources, 1.8, 1.9
Message-ID: <20090828030129.99B8711C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXinerama/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19926

Modified Files:
	.cvsignore libXinerama.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
- libXinerama 1.0.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Mar 2008 20:47:21 -0000	1.8
+++ .cvsignore	28 Aug 2009 03:01:28 -0000	1.9
@@ -1 +1 @@
-libXinerama-1.0.3.tar.bz2
+libXinerama-1.0.99.1.tar.bz2


Index: libXinerama.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXinerama.spec	3 Aug 2009 18:47:40 -0000	1.23
+++ libXinerama.spec	28 Aug 2009 03:01:28 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
-Version: 1.0.3
-Release: 6%{?dist}
+Version: 1.0.99.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -60,8 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXinerama.so
 %{_libdir}/pkgconfig/xinerama.pc
 %{_mandir}/man3/*.3*
+%{_includedir}/X11/extensions/Xinerama.h
+%{_includedir}/X11/extensions/panoramiXext.h
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
+- libXinerama 1.0.99.1
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.3-6
 - Un-require xorg-x11-filesystem
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Mar 2008 20:47:21 -0000	1.8
+++ sources	28 Aug 2009 03:01:29 -0000	1.9
@@ -1 +1 @@
-cd9f7c46439ac40e0517a302d2434d2c  libXinerama-1.0.3.tar.bz2
+473725c59bbb2f1dc1afb73ca8a3b5cb  libXinerama-1.0.99.1.tar.bz2



From whot at fedoraproject.org  Fri Aug 28 03:01:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:01:51 +0000 (UTC)
Subject: rpms/libdmx/devel .cvsignore, 1.7, 1.8 libdmx.spec, 1.24,
	1.25 sources, 1.7, 1.8
Message-ID: <20090828030151.C2F5A11C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libdmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20142

Modified Files:
	.cvsignore libdmx.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
- libdmx 1.0.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Apr 2006 19:04:57 -0000	1.7
+++ .cvsignore	28 Aug 2009 03:01:50 -0000	1.8
@@ -1 +1 @@
-libdmx-1.0.2.tar.bz2
+libdmx-1.0.99.1.tar.bz2


Index: libdmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libdmx.spec	3 Aug 2009 18:41:07 -0000	1.24
+++ libdmx.spec	28 Aug 2009 03:01:51 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X.Org X11 DMX runtime library
 Name: libdmx
-Version: 1.0.2
-Release: 11%{?dist}
+Version: 1.0.99.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -58,8 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdmx.so
 %{_libdir}/pkgconfig/dmx.pc
 %{_mandir}/man3/*.3*
+%{_includedir}/X11/extensions/dmxext.h
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
+- libdmx 1.0.99.1
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
 - Un-Requires xorg-x11-filesystem
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Apr 2006 19:04:57 -0000	1.7
+++ sources	28 Aug 2009 03:01:51 -0000	1.8
@@ -1 +1 @@
-4d866967210d06098fc9f302ed4c79b1  libdmx-1.0.2.tar.bz2
+cd8d5777a4ac53e06573c4bde178621e  libdmx-1.0.99.1.tar.bz2



From whot at fedoraproject.org  Fri Aug 28 03:02:12 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:02:12 +0000 (UTC)
Subject: rpms/libXxf86dga/devel .cvsignore, 1.8, 1.9 libXxf86dga.spec, 1.22, 
	1.23 sources, 1.9, 1.10
Message-ID: <20090828030212.2D7E711C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXxf86dga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20365

Modified Files:
	.cvsignore libXxf86dga.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
- libXxf86dga 1.0.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Dec 2007 16:39:27 -0000	1.8
+++ .cvsignore	28 Aug 2009 03:02:10 -0000	1.9
@@ -1 +1 @@
-libXxf86dga-1.0.2.tar.bz2
+libXxf86dga-1.0.99.1.tar.bz2


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libXxf86dga.spec	25 Jul 2009 05:16:24 -0000	1.22
+++ libXxf86dga.spec	28 Aug 2009 03:02:10 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
-Version: 1.0.2
-Release: 6%{?dist}
+Version: 1.0.99.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -58,8 +58,13 @@ 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
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
+- libXxf86dga 1.0.99.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/libXxf86dga/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Dec 2007 16:39:27 -0000	1.9
+++ sources	28 Aug 2009 03:02:10 -0000	1.10
@@ -1 +1 @@
-6f5f621804ee652b6cc6f2025c517c78  libXxf86dga-1.0.2.tar.bz2
+de75bfb5a399af5df158a6dba203205b  libXxf86dga-1.0.99.1.tar.bz2



From whot at fedoraproject.org  Fri Aug 28 03:02:26 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:02:26 +0000 (UTC)
Subject: rpms/libXxf86vm/devel .cvsignore, 1.7, 1.8 libXxf86vm.spec, 1.23,
	1.24 sources, 1.8, 1.9
Message-ID: <20090828030226.BF48711C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXxf86vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20513

Modified Files:
	.cvsignore libXxf86vm.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
- libXxf86vm 1.0.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Sep 2008 20:05:14 -0000	1.7
+++ .cvsignore	28 Aug 2009 03:02:25 -0000	1.8
@@ -1 +1 @@
-libXxf86vm-1.0.2.tar.bz2
+libXxf86vm-1.0.99.1.tar.bz2


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXxf86vm.spec	25 Jul 2009 05:16:57 -0000	1.23
+++ libXxf86vm.spec	28 Aug 2009 03:02:25 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
-Version: 1.0.2
-Release: 4%{?dist}
+Version: 1.0.99.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -68,8 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xxf86vm.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
+%{_includedir}/X11/extensions/xf86vmode.h
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
+- libXxf86vm 1.0.99.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Sep 2008 20:05:14 -0000	1.8
+++ sources	28 Aug 2009 03:02:26 -0000	1.9
@@ -1 +1 @@
-304d37bd0a10d9b58aa9b64469ad73e5  libXxf86vm-1.0.2.tar.bz2
+18579bdfd75aed88575930288bee4da7  libXxf86vm-1.0.99.1.tar.bz2



From whot at fedoraproject.org  Fri Aug 28 03:02:37 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:02:37 +0000 (UTC)
Subject: rpms/libXScrnSaver/devel .cvsignore, 1.11, 1.12 libXScrnSaver.spec, 
	1.31, 1.32 sources, 1.11, 1.12
Message-ID: <20090828030237.EB22411C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXScrnSaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20631

Modified Files:
	.cvsignore libXScrnSaver.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-1
- libXScrnSaver 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Sep 2008 18:26:22 -0000	1.11
+++ .cvsignore	28 Aug 2009 03:02:37 -0000	1.12
@@ -1 +1 @@
-libXScrnSaver-1.1.3.tar.bz2
+libXScrnSaver-1.2.0.tar.bz2


Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libXScrnSaver.spec	25 Jul 2009 05:09:37 -0000	1.31
+++ libXScrnSaver.spec	28 Aug 2009 03:02:37 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
-Version: 1.1.3
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -69,8 +69,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xscrnsaver.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
+%{_includedir}/X11/extensions/scrnsaver.h
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-1
+- libXScrnSaver 1.2.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXScrnSaver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Sep 2008 18:26:22 -0000	1.11
+++ sources	28 Aug 2009 03:02:37 -0000	1.12
@@ -1 +1 @@
-93f84b6797f2f29cae1ce23b0355d00d  libXScrnSaver-1.1.3.tar.bz2
+33e54f64b55f22d8bbe822a5b62568cb  libXScrnSaver-1.2.0.tar.bz2



From whot at fedoraproject.org  Fri Aug 28 03:03:42 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 03:03:42 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.70, 1.71 commitid, 1.33,
	1.34 sources, 1.65, 1.66 xorg-x11-server.spec, 1.479, 1.480
Message-ID: <20090828030342.49EBA11C00EB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21121

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-43.20090828
- Today's git snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	25 Aug 2009 08:24:54 -0000	1.70
+++ .cvsignore	28 Aug 2009 03:03:41 -0000	1.71
@@ -1 +1 @@
-xorg-server-20090825.tar.xz
+xorg-server-20090828.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- commitid	25 Aug 2009 08:24:54 -0000	1.33
+++ commitid	28 Aug 2009 03:03:41 -0000	1.34
@@ -1 +1 @@
-0f9ffc887ca1471e98df746253d9300e03e46a15
+6fffcd5825454a7fe58ffbcfb219f007cf38e731


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	25 Aug 2009 08:24:54 -0000	1.65
+++ sources	28 Aug 2009 03:03:41 -0000	1.66
@@ -1 +1 @@
-2155224c1468113477aed53561b09063  xorg-server-20090825.tar.xz
+4817f1285140b16ef99c735afc72be0d  xorg-server-20090828.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- xorg-x11-server.spec	27 Aug 2009 08:17:12 -0000	1.479
+++ xorg-x11-server.spec	28 Aug 2009 03:03:41 -0000	1.480
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090825
+%define gitdate 20090828
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   42.%{gitdate}%{?dist}
+Release:   43.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-43.20090828
+- Today's git snapshot.
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.99-42.20090825
 - rebuilt with new openssl and audit
 



From jnovy at fedoraproject.org  Fri Aug 28 03:12:33 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 03:12:33 +0000 (UTC)
Subject: rpms/libmikmod/devel libmikmod-CVE-2007-6720.patch, NONE,
	1.1 libmikmod.spec, 1.10, 1.11
Message-ID: <20090828031233.4F93911C00EB@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25625

Modified Files:
	libmikmod.spec 
Added Files:
	libmikmod-CVE-2007-6720.patch 
Log Message:
* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-7.beta2
- fix CVE-2007-6720 (#519990)


libmikmod-CVE-2007-6720.patch:
 mplayer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE libmikmod-CVE-2007-6720.patch ---
diff -up libmikmod-3.2.0-beta2/playercode/mplayer.c.CVE-2007-6720 libmikmod-3.2.0-beta2/playercode/mplayer.c
--- libmikmod-3.2.0-beta2/playercode/mplayer.c.CVE-2007-6720	2004-01-31 23:40:22.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mplayer.c	2009-08-28 05:06:07.000000000 +0200
@@ -2318,7 +2318,7 @@ void pt_UpdateVoices(MODULE *mod, int ma
 	SAMPLE *s;
 
 	mod->totalchn=mod->realchn=0;
-	for (channel=0;channel<md_sngchn;channel++) {
+	for (channel=0;channel<pf->numchn;channel++) {
 		aout=&mod->voice[channel];
 		i=aout->main.i;
 		s=aout->main.s;
@@ -3089,7 +3089,7 @@ MIKMODAPI void Player_NextPosition(void)
 		pf->patbrk=0;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;
@@ -3114,7 +3114,7 @@ MIKMODAPI void Player_PrevPosition(void)
 		pf->patbrk=0;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;
@@ -3141,7 +3141,7 @@ MIKMODAPI void Player_SetPosition(UWORD 
 		pf->sngpos=pos;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;


Index: libmikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/devel/libmikmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libmikmod.spec	11 Aug 2009 15:52:59 -0000	1.10
+++ libmikmod.spec	28 Aug 2009 03:12:32 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 6.beta2%{?dist}
+Release: 7.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,7 @@ Patch2:  libmikmod-strip-lib.patch
 Patch3:  libmikmod-multilib.patch
 Patch4:  libmikmod-autoconf.patch
 Patch5:  libmikmod-info.patch
+Patch6:  libmikmod-CVE-2007-6720.patch
 
 %description
 libmikmod is a library used by the mikmod MOD music file player for
@@ -41,6 +42,7 @@ applications for mikmod.
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .autoconf
 %patch5 -p1 -b .info
+%patch6 -p1 -b .CVE-2007-6720
 
 %build
 %configure
@@ -82,6 +84,9 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-7.beta2
+- fix CVE-2007-6720 (#519990)
+
 * Tue Aug 11 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-6.beta2
 - don't complain if installing with --excludedocs (#515953)
 - add missing requires



From lennart at fedoraproject.org  Fri Aug 28 04:11:50 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 28 Aug 2009 04:11:50 +0000 (UTC)
Subject: rpms/metacity/devel
	0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch, NONE,
	1.1 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch, 
	NONE, 1.1 metacity.spec, 1.197, 1.198
Message-ID: <20090828041150.B258211C0044@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3743

Modified Files:
	metacity.spec 
Added Files:
	0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch 
	0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch 
Log Message:
Apply to trivial patches for bell/sound
- http://bugzilla.gnome.org/show_bug.cgi?id=593356
- http://bugzilla.gnome.org/show_bug.cgi?id=593355


0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch:
 display.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch ---
>From 6558e661d22d9c2a70df8ce4bddcea083e61c328 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 28 Aug 2009 05:43:14 +0200
Subject: [PATCH] bell: increase bell rate limit from 1/s to 1/100ms

Right now metacity issues only 1 bell event per second. This is
feels buggy when triggering multiple alarm sounds in a terminal.

This patch simple increases the limit to 1/100ms. 100ms is probably a
good choice since the HIG recommends that all user reaction should
happen within 100ms. With this applied pressing 'Left' in gnome-terminal
feels much more responsive.

https://bugzilla.redhat.com/show_bug.cgi?id=498608
---
 src/core/display.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/core/display.c b/src/core/display.c
index b1661e3..bf22a9e 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2385,7 +2385,7 @@ event_callback (XEvent   *event,
 	    {
 	    case XkbBellNotify:
               if (XSERVER_TIME_IS_BEFORE(display->last_bell_time,
-                                         xkb_ev->time - 1000))
+                                         xkb_ev->time - 100))
                 {
                   display->last_bell_time = xkb_ev->time;
                   meta_bell_notify (display, xkb_ev);
-- 
1.6.4


0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch:
 bell.c      |    1 +
 workspace.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch ---
>From 84e14cd8587c470e925e2fbf1a5a13c63686bcd4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 28 Aug 2009 05:38:17 +0200
Subject: [PATCH] sound: ask libcanberra to cache alert/desktop switch sounds

These sounds are good candidates for caching in the sound server, to
save a bit of CPU and make reaction faster. Hence, tell libcanberra to
cache them.
---
 src/core/bell.c      |    1 +
 src/core/workspace.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/core/bell.c b/src/core/bell.c
index 92d1dbd..676ebac 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -292,6 +292,7 @@ meta_bell_notify (MetaDisplay *display,
       ca_proplist_create (&p);
       ca_proplist_sets (p, CA_PROP_EVENT_ID, "bell-window-system");
       ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
+      ca_proplist_sets (p, CA_PROP_CANBERRA_CACHE_CONTROL, "permanent");
 
       window = meta_display_lookup_x_window (display, xkb_bell_event->window);
       if (!window && (display->focus_window) && (display->focus_window->frame))
diff --git a/src/core/display.c b/src/core/display.c
index 55c374a..b1661e3 100644
diff --git a/src/core/workspace.c b/src/core/workspace.c
index a0170a6..063f867 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -358,6 +358,7 @@ static void workspace_switch_sound(MetaWorkspace *from,
   ca_context_play(ca_gtk_context_get(), 1,
                   CA_PROP_EVENT_ID, e,
                   CA_PROP_EVENT_DESCRIPTION, "Desktop switched",
+                  CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
                   NULL);
 
  finish:
-- 
1.6.4



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- metacity.spec	24 Aug 2009 13:39:44 -0000	1.197
+++ metacity.spec	28 Aug 2009 04:11:49 -0000	1.198
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -10,6 +10,10 @@ Patch4: stop-spamming-xsession-errors.pa
 Patch5: dnd-keynav.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=588119
 Patch6: Should-set-RestartStyleHint-to-RestartIfRunning-when.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593355
+Patch7: 0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593356
+Patch8: 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -72,6 +76,8 @@ API. This package exists purely for tech
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
 %patch6 -p1 -b .restart-if-running
+%patch7 -p1 -b .bell
+%patch8 -p1 -b .sound-cache
 
 # force regeneration
 rm src/metacity.schemas
@@ -179,6 +185,11 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> - 2.27.0-6
+- Apply to trivial patches for bell/sound
+- http://bugzilla.gnome.org/show_bug.cgi?id=593356
+- http://bugzilla.gnome.org/show_bug.cgi?id=593355
+
 * Sat Aug 22 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-5
 - Add a fix for http://bugzilla.gnome.org/show_bug.cgi?id=588119,
   remove no-longer-needed no-lame-dialog patch



From cweyl at fedoraproject.org  Fri Aug 28 04:45:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 28 Aug 2009 04:45:01 +0000 (UTC)
Subject: rpms/perl-PerlIO-gzip/devel .cvsignore, 1.2,
	1.3 perl-PerlIO-gzip.spec, 1.4, 1.5
Message-ID: <20090828044501.84DDC11C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-PerlIO-gzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11966

Modified Files:
	.cvsignore perl-PerlIO-gzip.spec 
Log Message:
* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-5
- update filtering



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PerlIO-gzip/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Feb 2009 04:46:10 -0000	1.2
+++ .cvsignore	28 Aug 2009 04:45:01 -0000	1.3
@@ -1 +1,9 @@
 PerlIO-gzip-0.18.tar.gz
+PerlIO-gzip-*
+clog
+*.rpm
+*.gz
+*.tar
+.build*
+i386
+x86_64


Index: perl-PerlIO-gzip.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PerlIO-gzip/devel/perl-PerlIO-gzip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-PerlIO-gzip.spec	26 Jul 2009 16:12:44 -0000	1.4
+++ perl-PerlIO-gzip.spec	28 Aug 2009 04:45:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-PerlIO-gzip
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl extension to provide a PerlIO layer to gzip/gunzip
 # See Makefile.PL, gzip.xs, etc.
 License:        GPL+ or Artistic
@@ -20,10 +20,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 # test
 BuildRequires:  perl(Test::More)
 
-# don't provide the private XS.so() lib
-%global _use_internal_dependency_generator 0
-%global provfind /bin/sh -c "grep -v '%perl_vendorarch.*\\.so$' | %__find_provides"
-%global __find_provides %provfind
+%{?perl_default_filter}
 
 %description
 PerlIO::gzip provides a PerlIO layer that manipulates files in the format
@@ -67,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-5
+- update filtering
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Fri Aug 28 04:54:50 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 28 Aug 2009 04:54:50 +0000 (UTC)
Subject: rpms/mingw32-libtiff/devel
	libtiff-mingw32-libjpeg-7-compatibility.patch, NONE,
	1.1 mingw32-libtiff.spec, 1.4, 1.5
Message-ID: <20090828045450.D5BED11C0044@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libtiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17265

Modified Files:
	mingw32-libtiff.spec 
Added Files:
	libtiff-mingw32-libjpeg-7-compatibility.patch 
Log Message:
* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.8.2-19
- Rebuild for minw32-libjpeg 7
- Automatically generate debuginfo subpackage
- Added -static subpackage


libtiff-mingw32-libjpeg-7-compatibility.patch:
 tif_jpeg.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE libtiff-mingw32-libjpeg-7-compatibility.patch ---
--- libtiff/tif_jpeg.c.orig	2009-08-20 14:27:50.688881034 +0200
+++ libtiff/tif_jpeg.c	2009-08-20 14:29:03.814866414 +0200
@@ -288,20 +288,20 @@
 }
 
 static int
-TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline)
+TIFFjpeg_set_quality(JPEGState* sp, int quality, jpeg_boolean force_baseline)
 {
 	return CALLVJPEG(sp,
 	    jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
 }
 
 static int
-TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress)
+TIFFjpeg_suppress_tables(JPEGState* sp, jpeg_boolean suppress)
 {
 	return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
 }
 
 static int
-TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables)
+TIFFjpeg_start_compress(JPEGState* sp, jpeg_boolean write_all_tables)
 {
 	return CALLVJPEG(sp,
 	    jpeg_start_compress(&sp->cinfo.c, write_all_tables));
@@ -334,7 +334,7 @@
 }
 
 static int
-TIFFjpeg_read_header(JPEGState* sp, boolean require_image)
+TIFFjpeg_read_header(JPEGState* sp, jpeg_boolean require_image)
 {
 	return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
 }
@@ -402,7 +402,7 @@
 	sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
 }
 
-static boolean
+static jpeg_boolean
 std_empty_output_buffer(j_compress_ptr cinfo)
 {
 	JPEGState* sp = (JPEGState*) cinfo;
@@ -453,7 +453,7 @@
 	sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
 }
 
-static boolean
+static jpeg_boolean
 tables_empty_output_buffer(j_compress_ptr cinfo)
 {
 	JPEGState* sp = (JPEGState*) cinfo;
@@ -519,7 +519,7 @@
 	sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
 }
 
-static boolean
+static jpeg_boolean
 std_fill_input_buffer(j_decompress_ptr cinfo)
 {
 	JPEGState* sp = (JPEGState* ) cinfo;


Index: mingw32-libtiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libtiff/devel/mingw32-libtiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libtiff.spec	25 Jul 2009 14:25:36 -0000	1.4
+++ mingw32-libtiff.spec	28 Aug 2009 04:54:50 -0000	1.5
@@ -3,11 +3,12 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Summary: MinGW Windows port of the LibTIFF library
 Name: mingw32-libtiff
 Version: 3.8.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
@@ -18,6 +19,8 @@ Patch1: libtiff-3.8.2-ormandy.patch
 Patch2: libtiff-3.8.2-CVE-2006-2193.patch
 Patch4: libtiff-3.8.2-lzw-bugs.patch
 
+Patch100: libtiff-mingw32-libjpeg-7-compatibility.patch
+
 BuildArch: noarch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -36,6 +39,19 @@ used file format for bitmapped images.  
 The libtiff package should be installed if you need to manipulate TIFF
 format image files.
 
+
+%package static
+Summary:        Static version of the MinGW Windows LibTIFF library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows LibTIFF library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n tiff-%{version}
 
@@ -45,11 +61,16 @@ format image files.
 %patch2 -p1 -b .CVE-2006-2193
 %patch4 -p1
 
+# MinGW specific patches
+%patch100 -p0
+
+
 %build
 export MINGW32_CFLAGS="%{_mingw32_cflags} -fno-strict-aliasing"
-%{_mingw32_configure} --disable-static
+%{_mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install 
@@ -61,9 +82,11 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 # remove binaries
 rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README RELEASE-DATE VERSION TODO ChangeLog
@@ -75,8 +98,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libtiff.la
 %{_mingw32_libdir}/libtiffxx.la
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libtiff.a
+%{_mingw32_libdir}/libtiffxx.a
+
 
 %changelog
+* Thu Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.8.2-19
+- Rebuild for minw32-libjpeg 7
+- Automatically generate debuginfo subpackage
+- Added -static subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Fri Aug 28 05:04:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 05:04:49 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util-config.in, 1.3, 1.4 nss-util.spec, 1.8,
	1.9
Message-ID: <20090828050449.ED1EA11C0044@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22248

Modified Files:
	nss-util-config.in nss-util.spec 
Log Message:
Cleanup nss-util-config.in


Index: nss-util-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-util-config.in	20 Aug 2009 20:50:18 -0000	1.3
+++ nss-util-config.in	28 Aug 2009 05:04:47 -0000	1.4
@@ -28,9 +28,6 @@ if test $# -eq 0; then
 	usage 1 1>&2
 fi
 
-lib_ssl=no
-lib_smime=no
-lib_nss=no
 lib_nssutil=yes
 
 while test $# -gt 0; do
@@ -73,15 +70,6 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
-    ssl)
-      lib_ssl=no
-      ;;
-    smime)
-      lib_smime=no
-      ;;
-    nss)
-      lib_nss=no
-      ;;
     nssutil)
       lib_nssutil=yes
       ;;
@@ -125,15 +113,6 @@ fi
 
 if test "$echo_libs" = "yes"; then
       libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
       if test -n "$lib_nssutil"; then
 	libdirs="$libdirs -lnssutil${major_version}"
       fi


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nss-util.spec	27 Aug 2009 22:36:16 -0000	1.8
+++ nss-util.spec	28 Aug 2009 05:04:48 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-Release:          13%{?dist}
+Release:          14%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -201,6 +201,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-14
+- Cleanup nss-util-config.in
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-13
 nss-util-devel doesn't require nss-devel
 



From emaldonado at fedoraproject.org  Fri Aug 28 05:15:27 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 05:15:27 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn-config.in, 1.1,
	1.2 nss-softokn.pc.in, 1.2, 1.3 nss-softokn.spec, 1.10, 1.11
Message-ID: <20090828051527.56D6411C0044@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27169

Modified Files:
	nss-softokn-config.in nss-softokn.pc.in nss-softokn.spec 
Log Message:
- List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc


Index: nss-softokn-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn-config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nss-softokn-config.in	19 Aug 2009 23:47:12 -0000	1.1
+++ nss-softokn-config.in	28 Aug 2009 05:15:26 -0000	1.2
@@ -19,6 +19,8 @@ Options:
 	[--libs]
 	[--cflags]
 Dynamic Libraries:
+	freebl3
+	nssdbm3
 	softokn3
 EOF
 	exit $1
@@ -28,10 +30,9 @@ if test $# -eq 0; then
 	usage 1 1>&2
 fi
 
-lib_ssl=no
-lib_smime=no
-lib_nss=no
-lib_nssutil=yes
+lib_freebl=yes
+lib_nssdbm=yes
+lib_softokn=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -73,17 +74,14 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
-    ssl)
-      lib_ssl=no
+    freebl)
+      lib_freebl=yes
       ;;
-    smime)
-      lib_smime=no
+    nssdbm)
+      lib_nssdbm=yes
       ;;
-    nss)
-      lib_nss=no
-      ;;
-    nssutil)
-      lib_nssutil=yes
+    softokn)
+      lib_softokn=no
       ;;
     *)
       usage 1 1>&2
@@ -128,14 +126,14 @@ if test "$echo_libs" = "yes"; then
       if test -n "$lib_ssl"; then
 	libdirs="$libdirs -lssl${major_version}"
       fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
+      if test -n "$lib_freebl"; then
+	libdirs="$libdirs -lfreebl${major_version}"
       fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
+      if test -n "$lib_nssdbm"; then
+	libdirs="$libdirs -lnssdbm${major_version}"
       fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
+      if test -n "$lib_softokn"; then
+	libdirs="$libdirs -lnsoftokn${major_version}"
       fi
       echo $libdirs
 fi      


Index: nss-softokn.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-softokn.pc.in	26 Aug 2009 22:17:49 -0000	1.2
+++ nss-softokn.pc.in	28 Aug 2009 05:15:27 -0000	1.3
@@ -3,8 +3,9 @@ exec_prefix=%exec_prefix%
 libdir=%libdir%
 includedir=%includedir%
 
-Name: SOFTKN
+Name: NSS-SOFTOKN
 Description: Network Security Services Softoken PKCS #11 Module
 Version: %SOFTOKEN_VERSION%
 Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
 Cflags: -I${includedir}


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nss-softokn.spec	27 Aug 2009 23:09:53 -0000	1.10
+++ nss-softokn.spec	28 Aug 2009 05:15:27 -0000	1.11
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          19%{?dist}
+Release:          20%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-20
+- List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc
+
 * Thu Aug 27 2009 Elio Maldonado@<emaldona at redhat.com> - 3.12.3.99.3-19
 - Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util
 - Remove the release 17 hack



From cweyl at fedoraproject.org  Fri Aug 28 05:17:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 28 Aug 2009 05:17:18 +0000 (UTC)
Subject: rpms/perl-Sub-Name/devel perl-Sub-Name.spec,1.10,1.11
Message-ID: <20090828051718.422DD11C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Name/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28229

Modified Files:
	perl-Sub-Name.spec 
Log Message:
* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-4
- Filtering errant private provides



Index: perl-Sub-Name.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Name/devel/perl-Sub-Name.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Sub-Name.spec	26 Jul 2009 16:35:58 -0000	1.10
+++ perl-Sub-Name.spec	28 Aug 2009 05:17:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Name
 Version:        0.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Name -- or rename -- a sub
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,6 +11,8 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 
+%{?perl_default_filter}
+
 %description
 This module allows one to "name" or rename subroutines, including anonymous
 ones.
@@ -51,6 +53,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-4
+- Filtering errant private provides
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cweyl at fedoraproject.org  Fri Aug 28 05:21:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 28 Aug 2009 05:21:36 +0000 (UTC)
Subject: rpms/perl-Sub-Identify/devel perl-Sub-Identify.spec,1.10,1.11
Message-ID: <20090828052136.5A4BF11C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Identify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30324

Modified Files:
	perl-Sub-Identify.spec 
Log Message:
* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-5
- Filtering errant private provides



Index: perl-Sub-Identify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Identify/devel/perl-Sub-Identify.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Sub-Identify.spec	26 Jul 2009 16:35:29 -0000	1.10
+++ perl-Sub-Identify.spec	28 Aug 2009 05:21:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Identify
 Version:        0.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Retrieve names of code references
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,6 +11,8 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 Sub::Identify allows you to retrieve the real name of code references. For
 this, it uses perl's introspection mechanism, provided by the B module.
@@ -18,7 +20,7 @@ this, it uses perl's introspection mecha
 %prep
 %setup -q -n Sub-Identify-%{version}
 
-perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*
+perl -pi -e 's|^#!perl|#!%{__perl}|' t/*
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -49,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-5
+- Filtering errant private provides
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Fri Aug 28 05:32:56 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 05:32:56 +0000 (UTC)
Subject: rpms/nss-util/devel nss-util.spec,1.9,1.10
Message-ID: <20090828053256.18CC911C0044@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3759

Modified Files:
	nss-util.spec 
Log Message:
Bump the release number for a chained build of nss-util, nss-softpkn and nss


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nss-util.spec	28 Aug 2009 05:04:48 -0000	1.9
+++ nss-util.spec	28 Aug 2009 05:32:55 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.12.3.99.3
-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
@@ -201,6 +201,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-15
+- Bump the release number for a chained build of nss-util, nss-softokn and nss
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-14
 - Cleanup nss-util-config.in
 



From emaldonado at fedoraproject.org  Fri Aug 28 05:38:03 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 05:38:03 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.11,1.12
Message-ID: <20090828053803.D928911C0044@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6033

Modified Files:
	nss-softokn.spec 
Log Message:
Bump the release number for a chained build of nss-util, nss-softokn and nss


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nss-softokn.spec	28 Aug 2009 05:15:27 -0000	1.11
+++ nss-softokn.spec	28 Aug 2009 05:38:03 -0000	1.12
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          20%{?dist}
+Release:          21%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-21
+- Bump the release number for a chained build of nss-util, nss-softokn and nss
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-20
 - List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc
 



From lennart at fedoraproject.org  Fri Aug 28 05:39:16 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 28 Aug 2009 05:39:16 +0000 (UTC)
Subject: rpms/metacity/devel
	0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch,
	NONE, 1.1 metacity.spec, 1.198, 1.199
Message-ID: <20090828053916.1DB0C11C0044@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6603

Modified Files:
	metacity.spec 
Added Files:
	0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch 
Log Message:
0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch

0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch:
 fixedtip.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch ---
>From 8132127a749b150d188631e03d36462838620a82 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 28 Aug 2009 07:29:11 +0200
Subject: [PATCH] tooltip: set window type hint for self-drawn tooltips to GDK_WINDOW_TYPE_HINT_TOOLTIP

libcanberra generates specific tooltip popup sounds and for that
recognizes the tooltip windows by the GtkWindowTypeHint set for them.

This trivial patch simply sets the hint for the self-drawn tooltips
metacity uses.
---
 src/ui/fixedtip.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/ui/fixedtip.c b/src/ui/fixedtip.c
index d2b95f2..31a6082 100644
--- a/src/ui/fixedtip.c
+++ b/src/ui/fixedtip.c
@@ -71,6 +71,8 @@ meta_fixed_tip_show (Display *xdisplay, int screen_number,
   if (tip == NULL)
     {      
       tip = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_window_set_type_hint (GTK_WINDOW(tip), GDK_WINDOW_TYPE_HINT_TOOLTIP);
+
       {
         GdkScreen *gdk_screen;
 	GdkRectangle monitor;
-- 
1.6.4



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- metacity.spec	28 Aug 2009 04:11:49 -0000	1.198
+++ metacity.spec	28 Aug 2009 05:39:15 -0000	1.199
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -14,6 +14,8 @@ Patch6: Should-set-RestartStyleHint-to-R
 Patch7: 0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=593356
 Patch8: 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593358
+Patch9: 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -185,8 +187,12 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> - 2.27.0-7
+- Apply another trivial patch related to sound events
+- http://bugzilla.gnome.org/show_bug.cgi?id=593358
+
 * Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> - 2.27.0-6
-- Apply to trivial patches for bell/sound
+- Apply two trivial patches for bell/sound
 - http://bugzilla.gnome.org/show_bug.cgi?id=593356
 - http://bugzilla.gnome.org/show_bug.cgi?id=593355
 



From cweyl at fedoraproject.org  Fri Aug 28 05:39:58 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 28 Aug 2009 05:39:58 +0000 (UTC)
Subject: rpms/perl/devel macros.perl,1.1,1.2 perl.spec,1.230,1.231
Message-ID: <20090828053958.F304B11C0044@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7034

Modified Files:
	macros.perl perl.spec 
Log Message:
* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
- fix macros.perl *sigh*



Index: macros.perl
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/macros.perl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- macros.perl	23 Aug 2009 18:16:14 -0000	1.1
+++ macros.perl	28 Aug 2009 05:39:58 -0000	1.2
@@ -1,21 +1,22 @@
-# Sensible Perl-specific RPM build macros 
+# Sensible Perl-specific RPM build macros.
 #
 # Note that these depend on the generic filtering system being in place in
-# rpm core.
+# rpm core; but won't cause a build to fail if they're not present.
 #
 # Chris Weyl <cweyl at alumni.drew.edu> 2009
 
 # 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)
+# libs in vendorarch/archlib (vendor/core).
 #
-# This should also give a good sense of how to use these macros.
+# Note that this must be invoked in the spec file, preferably as 
+# "%{?perl_default_filter}", before any %description block.
 
-%define perl_default_filter %{expand: \
+%perl_default_filter %{?filter_setup: %{expand: \
 %filter_provides_in %{perl_vendorarch}/.*\\.so$ \
 %filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \
 %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.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- perl.spec	24 Aug 2009 12:38:39 -0000	1.230
+++ perl.spec	28 Aug 2009 05:39:58 -0000	1.231
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        80%{?dist}
+Release:        81%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1939,6 +1939,9 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
+- fix macros.perl *sigh*
+
 * Mon Aug 24 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-80
 - Remove -DDEBUGGING=-g, we are not ready yet.
 



From emaldonado at fedoraproject.org  Fri Aug 28 05:42:51 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 05:42:51 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.101,1.102
Message-ID: <20090828054251.2BD4D11C0044@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8389

Modified Files:
	nss.spec 
Log Message:
Bump the release number for a chained build of nss-util, nss-softokn and nss


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- nss.spec	28 Aug 2009 01:38:30 -0000	1.101
+++ nss.spec	28 Aug 2009 05:42:50 -0000	1.102
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          22%{?dist}
+Release:          23%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -15,10 +15,10 @@ Requires:         nss-softokn-freebl%{_i
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn >= 3.12.3.99.3-12                                                  
-BuildRequires:    nss-util >= 3.12.3.99.3-10
-BuildRequires:    nss-softokn-devel >= 3.12.3.99.3-12                                                  
-BuildRequires:    nss-util-devel >= 3.12.3.99.3-10
+BuildRequires:    nss-softokn >= %{version}                                                  
+BuildRequires:    nss-util >= %{version}
+BuildRequires:    nss-softokn-devel >= %{version}                                                  
+BuildRequires:    nss-util-devel >= %{version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -436,6 +436,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-23
+- Bump the release number for a chained build of nss-util, nss-softokn and nss
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-22
 - Fix nss-config not to include nssutil
 - Add BuildRequires on nss-softokn and nss-util since build also runs the test suite



From whot at fedoraproject.org  Fri Aug 28 05:54:37 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 05:54:37 +0000 (UTC)
Subject: rpms/libfontenc/devel .cvsignore, 1.10, 1.11 libfontenc.spec, 1.28, 
	1.29 sources, 1.10, 1.11
Message-ID: <20090828055437.AC90311C0044@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libfontenc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14661

Modified Files:
	.cvsignore libfontenc.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
- libfontenc 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libfontenc/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jan 2007 04:18:39 -0000	1.10
+++ .cvsignore	28 Aug 2009 05:54:36 -0000	1.11
@@ -1 +1 @@
-libfontenc-1.0.4.tar.bz2
+libfontenc-1.0.5.tar.bz2


Index: libfontenc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libfontenc.spec	25 Jul 2009 05:37:43 -0000	1.28
+++ libfontenc.spec	28 Aug 2009 05:54:37 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
-Version: 1.0.4
-Release: 10%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
+- libfontenc 1.0.5
+
 * Fri Jul 24 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/libfontenc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2007 04:18:39 -0000	1.10
+++ sources	28 Aug 2009 05:54:37 -0000	1.11
@@ -1 +1 @@
-5cd16a2e51ca7b96a3081c7486ff98b9  libfontenc-1.0.4.tar.bz2
+4f0d8191819be9f2bdf9dad49a65e43b  libfontenc-1.0.5.tar.bz2



From lmacken at fedoraproject.org  Fri Aug 28 06:02:36 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 28 Aug 2009 06:02:36 +0000 (UTC)
Subject: rpms/liveusb-creator/F-11 .cvsignore, 1.16,
	1.17 liveusb-creator.spec, 1.23, 1.24 sources, 1.20, 1.21
Message-ID: <20090828060236.76FCF11C0044@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18595

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
v3.7.3 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	6 Aug 2009 00:07:51 -0000	1.16
+++ .cvsignore	28 Aug 2009 06:02:35 -0000	1.17
@@ -1 +1 @@
-liveusb-creator-3.7.2.tar.bz2
+liveusb-creator-3.7.3.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/liveusb-creator.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- liveusb-creator.spec	6 Aug 2009 00:07:51 -0000	1.23
+++ liveusb-creator.spec	28 Aug 2009 06:02:36 -0000	1.24
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.7.2
+Version:        3.7.3
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.3-1
+- 3.7.3
+
 * Wed Aug 05 2009 Luke Macken <lmacken at redhat.com> - 3.7.2-1
 - 3.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Aug 2009 00:07:51 -0000	1.20
+++ sources	28 Aug 2009 06:02:36 -0000	1.21
@@ -1 +1 @@
-dfca2084def4359c4a18bc36f2c8ad9c  liveusb-creator-3.7.2.tar.bz2
+336c2e9ecb71485b82bfe43069592c26  liveusb-creator-3.7.3.tar.bz2



From jnovy at fedoraproject.org  Fri Aug 28 06:04:48 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 06:04:48 +0000 (UTC)
Subject: rpms/libmikmod/devel libmikmod-CVE-2009-0179.patch, NONE,
	1.1 libmikmod.spec, 1.11, 1.12
Message-ID: <20090828060448.C071B11C0044@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19670

Modified Files:
	libmikmod.spec 
Added Files:
	libmikmod-CVE-2009-0179.patch 
Log Message:
* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-8.beta2
- fix CVE-2009-0179 (#519992)


libmikmod-CVE-2009-0179.patch:
 loaders/load_xm.c    |    3 ++-
 playercode/mloader.c |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE libmikmod-CVE-2009-0179.patch ---
diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
--- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
@@ -622,7 +622,8 @@
 				/* read the remainder of the header */
 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
 
-				if(_mm_eof(modreader)) {
+				/* last instrument is at the end of file in version 0x0104 */
+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
 					free(nextwav);free(wh);
 					nextwav=NULL;wh=NULL;
 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
--- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
@@ -450,10 +450,12 @@
 	if (!l->Init || l->Init()) {
 		_mm_rewind(modreader);
 		ok = l->Load(curious);
-		/* propagate inflags=flags for in-module samples */
-		for (t = 0; t < of.numsmp; t++)
-			if (of.samples[t].inflags == 0)
-				of.samples[t].inflags = of.samples[t].flags;
+		if (ok) {
+			/* propagate inflags=flags for in-module samples */
+			for (t = 0; t < of.numsmp; t++)
+				if (of.samples[t].inflags == 0)
+					of.samples[t].inflags = of.samples[t].flags;
+		}
 	} else
 		ok = 0;
 


Index: libmikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/devel/libmikmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- libmikmod.spec	28 Aug 2009 03:12:32 -0000	1.11
+++ libmikmod.spec	28 Aug 2009 06:04:48 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 7.beta2%{?dist}
+Release: 8.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,6 +15,7 @@ Patch3:  libmikmod-multilib.patch
 Patch4:  libmikmod-autoconf.patch
 Patch5:  libmikmod-info.patch
 Patch6:  libmikmod-CVE-2007-6720.patch
+Patch7:  libmikmod-CVE-2009-0179.patch
 
 %description
 libmikmod is a library used by the mikmod MOD music file player for
@@ -43,6 +44,7 @@ applications for mikmod.
 %patch4 -p1 -b .autoconf
 %patch5 -p1 -b .info
 %patch6 -p1 -b .CVE-2007-6720
+%patch7 -p1 -b .CVE-2009-0179
 
 %build
 %configure
@@ -84,6 +86,9 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-8.beta2
+- fix CVE-2009-0179 (#519992)
+
 * Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-7.beta2
 - fix CVE-2007-6720 (#519990)
 



From pkgdb at fedoraproject.org  Fri Aug 28 06:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:05:54 +0000
Subject: [pkgdb] perl: cweyl has requested watchbugzilla
Message-ID: <20090828060555.0FBA910F878@bastion2.fedora.phx.redhat.com>

cweyl has requested the watchbugzilla acl on perl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 28 06:05:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:05:58 +0000
Subject: [pkgdb] perl: cweyl has requested watchcommits
Message-ID: <20090828060558.3AEFF10F88B@bastion2.fedora.phx.redhat.com>

cweyl has requested the watchcommits acl on perl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From jnovy at fedoraproject.org  Fri Aug 28 06:06:42 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 06:06:42 +0000 (UTC)
Subject: rpms/mikmod/devel mikmod.spec, 1.45,
	1.46 mikmod-3.2.2-beta1-CVE-2009-0179.patch, 1.1, NONE
Message-ID: <20090828060642.C120511C0044@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mikmod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20586

Modified Files:
	mikmod.spec 
Removed Files:
	mikmod-3.2.2-beta1-CVE-2009-0179.patch 
Log Message:
- the CVE patch needs to go to libmikmod



Index: mikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- mikmod.spec	28 Aug 2009 02:52:32 -0000	1.45
+++ mikmod.spec	28 Aug 2009 06:06:42 -0000	1.46
@@ -11,7 +11,6 @@ BuildRequires: ncurses-devel libmikmod-d
 URL: http://mikmod.raphnet.net/
 Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.bz2
 Patch0: mikmod-3.2.2-beta1-missing-protos.patch
-Patch1: mikmod-3.2.2-beta1-CVE-2009-0179.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -56,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.2-13.beta1
-- fix CVE-2009-0179 (#519992)
+- rebuild
 
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 3.2.2-12.beta1
 - Use bzipped upstream tarball.


--- mikmod-3.2.2-beta1-CVE-2009-0179.patch DELETED ---



From whot at fedoraproject.org  Fri Aug 28 06:06:53 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 06:06:53 +0000 (UTC)
Subject: rpms/libICE/devel .cvsignore, 1.9, 1.10 libICE.spec, 1.30,
	1.31 sources, 1.11, 1.12
Message-ID: <20090828060653.C14B311C0044@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libICE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20704

Modified Files:
	.cvsignore libICE.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.6-1
- libICE 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Sep 2007 20:05:34 -0000	1.9
+++ .cvsignore	28 Aug 2009 06:06:52 -0000	1.10
@@ -1 +1 @@
-libICE-1.0.4.tar.bz2
+libICE-1.0.6.tar.bz2


Index: libICE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libICE.spec	25 Jul 2009 05:07:59 -0000	1.30
+++ libICE.spec	28 Aug 2009 06:06:53 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 ICE runtime library
 Name: libICE
-Version: 1.0.4
-Release: 9%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.6-1
+- libICE 1.0.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libICE/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Sep 2007 20:05:34 -0000	1.11
+++ sources	28 Aug 2009 06:06:53 -0000	1.12
@@ -1 +1 @@
-4ab4e67e0b8845aa201e984153087f4a  libICE-1.0.4.tar.bz2
+2d39bc924af24325dae589e9a849180c  libICE-1.0.6.tar.bz2



From pkgdb at fedoraproject.org  Fri Aug 28 06:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:07:52 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090828060752.B6C4010F881@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchbugzilla acl on perl (Fedora devel) to Approved for cweyl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 28 06:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:07:55 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090828060755.D476E10F890@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchcommits acl on perl (Fedora devel) to Approved for cweyl

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From lmacken at fedoraproject.org  Fri Aug 28 06:08:56 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 28 Aug 2009 06:08:56 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.12,
	1.13 liveusb-creator.spec, 1.17, 1.18 sources, 1.15, 1.16
Message-ID: <20090828060856.2187C11C0044@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21776

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
v3.7.3 bugfix release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	24 Jun 2009 21:23:18 -0000	1.12
+++ .cvsignore	28 Aug 2009 06:08:55 -0000	1.13
@@ -1 +1 @@
-liveusb-creator-3.6.9.tar.bz2
+liveusb-creator-3.7.3.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- liveusb-creator.spec	24 Jun 2009 21:23:18 -0000	1.17
+++ liveusb-creator.spec	28 Aug 2009 06:08:55 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.6.9
+Version:        3.7.3
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -18,7 +18,7 @@ ExcludeArch:    ppc64
 BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils gettext
 Requires:       syslinux, PyQt4, usermode, isomd5sum
 Requires:       python-urlgrabber
-Requires:       pyparted
+Requires:       pyparted >= 2.0
 
 %description
 A liveusb creator from Live Fedora images
@@ -68,9 +68,17 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Wed Jun 24 2009 Luke Macken <lmacken at redhat.com> - 3.6.9-1
-- Latest bugfix release, in sync with the 3.7 release, but
-  with pyparted 1.x support.
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.3-1
+- 3.7.3
+
+* Wed Aug 05 2009 Luke Macken <lmacken at redhat.com> - 3.7.2-1
+- 3.7.2
+
+* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 3.7.1-1
+- 3.7.1
+
+* Wed Jun 24 2009 Luke Macken <lmacken at redhat.com> - 3.7
+- Latest upstream bugfix release
 
 * Fri Jun 12 2009 Luke Macken <lmacken at redhat.com> - 3.6.8-1
 - Latest upstream bugfix release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Jun 2009 21:23:18 -0000	1.15
+++ sources	28 Aug 2009 06:08:55 -0000	1.16
@@ -1 +1 @@
-a8fde8455ce562e820a9fa1f4cd91571  liveusb-creator-3.6.9.tar.bz2
+336c2e9ecb71485b82bfe43069592c26  liveusb-creator-3.7.3.tar.bz2



From pkgdb at fedoraproject.org  Fri Aug 28 06:12:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:12:52 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090828061253.2416110F87B@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchbugzilla acl on perl (Fedora devel) to Approved for lkundrak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 28 06:12:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:12:53 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090828061253.24E3210F87C@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchcommits acl on perl (Fedora devel) to Approved for lkundrak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 28 06:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:14:06 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090828061406.5FF8610F879@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchbugzilla acl on perl (Fedora 11) to Approved for lkundrak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Fri Aug 28 06:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 06:14:06 +0000
Subject: [pkgdb] perl had acl change status
Message-ID: <20090828061406.E2E7310F88C@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchcommits acl on perl (Fedora 11) to Approved for lkundrak

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From whot at fedoraproject.org  Fri Aug 28 06:16:10 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 06:16:10 +0000 (UTC)
Subject: rpms/libfontenc/devel
	libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch, 1.1,
	1.2 libfontenc.spec, 1.29, 1.30
Message-ID: <20090828061610.06EFF11C0044@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libfontenc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25120

Modified Files:
	libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch 
	libfontenc.spec 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-2
- libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch: rebase to 1.0.5.


libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libfontenc/devel/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch	16 Dec 2005 11:11:51 -0000	1.1
+++ libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch	28 Aug 2009 06:16:09 -0000	1.2
@@ -1,11 +1,13 @@
---- ./configure.ac.get-fontdir-from-pkgconfig	2005-12-16 03:10:56.000000000 -0500
-+++ ./configure.ac	2005-12-16 03:11:25.000000000 -0500
-@@ -35,7 +35,7 @@
+diff --git ./configure.ac ./configure.ac
+index fc28ef9..63ef0c8 100644
+--- ./configure.ac
++++ ./configure.ac
+@@ -37,7 +37,7 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ XORG_CWARNFLAGS
  
- m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
- 
--DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
-+DEFAULT_ENCODINGSDIR=$(pkg-config --variable=fontdir fontutil)/encodings
- AC_ARG_WITH(encodingsdir,
- 	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]),
- 	[ENCODINGSDIR="$withval"],
+-encodingsdir=${libdir}/X11/fonts/encodings
++encodingsdir=$(pkg-config --variable=fontdir fontutil)/encodings
+ AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
+ 	[Path to font encodings]), [encodingsdir="$withval"])
+ ENCODINGSDIR="$encodingsdir"


Index: libfontenc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libfontenc.spec	28 Aug 2009 05:54:37 -0000	1.29
+++ libfontenc.spec	28 Aug 2009 06:16:09 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-2
+- libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch: rebase to 1.0.5.
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
 - libfontenc 1.0.5
 



From phuang at fedoraproject.org  Fri Aug 28 06:19:37 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 28 Aug 2009 06:19:37 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.40, 1.41 ibus.spec, 1.85, 1.86 sources,
	1.45, 1.46
Message-ID: <20090828061937.AB7A811C0044@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26881

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20090828


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	26 Aug 2009 09:02:13 -0000	1.40
+++ .cvsignore	28 Aug 2009 06:19:36 -0000	1.41
@@ -1,2 +1,2 @@
+ibus-1.2.0.20090828.tar.gz
 icons.tar.gz
-ibus-1.2.0.20090812.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ibus.spec	26 Aug 2009 22:18:27 -0000	1.85
+++ ibus.spec	28 Aug 2009 06:19:37 -0000	1.86
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090812
+Version:    1.2.0.20090828
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -242,6 +242,12 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Aug 28 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-1
+- Update to 1.2.0.20090828
+- Change the icon on systray.
+- Fix segment fault in ibus_hotkey_profile_destroy
+- Fix some memory leaks.
+
 * Wed Aug 12 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090812-1
 - Update to 1.2.0.20090812
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	26 Aug 2009 09:02:13 -0000	1.45
+++ sources	28 Aug 2009 06:19:37 -0000	1.46
@@ -1,2 +1,2 @@
+4945b6cec33288fc5916a163133f927f  ibus-1.2.0.20090828.tar.gz
 cf57c152f07c90c72aa8c3281a65e80c  icons.tar.gz
-5b50f05b00355ae74a85f572339fb7c1  ibus-1.2.0.20090812.tar.gz



From jnovy at fedoraproject.org  Fri Aug 28 06:30:56 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 06:30:56 +0000 (UTC)
Subject: rpms/libmikmod/F-11 libmikmod-CVE-2007-6720.patch, NONE,
	1.1 libmikmod-CVE-2009-0179.patch, NONE, 1.1 libmikmod.spec, 1.8, 1.9
Message-ID: <20090828063056.BF4F711C0044@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32644

Modified Files:
	libmikmod.spec 
Added Files:
	libmikmod-CVE-2007-6720.patch libmikmod-CVE-2009-0179.patch 
Log Message:
* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-5.beta2
- fix CVE-2007-6720 (#479829)
- fix CVE-2009-0179 (#479833)


libmikmod-CVE-2007-6720.patch:
 mplayer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE libmikmod-CVE-2007-6720.patch ---
diff -up libmikmod-3.2.0-beta2/playercode/mplayer.c.CVE-2007-6720 libmikmod-3.2.0-beta2/playercode/mplayer.c
--- libmikmod-3.2.0-beta2/playercode/mplayer.c.CVE-2007-6720	2004-01-31 23:40:22.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mplayer.c	2009-08-28 05:06:07.000000000 +0200
@@ -2318,7 +2318,7 @@ void pt_UpdateVoices(MODULE *mod, int ma
 	SAMPLE *s;
 
 	mod->totalchn=mod->realchn=0;
-	for (channel=0;channel<md_sngchn;channel++) {
+	for (channel=0;channel<pf->numchn;channel++) {
 		aout=&mod->voice[channel];
 		i=aout->main.i;
 		s=aout->main.s;
@@ -3089,7 +3089,7 @@ MIKMODAPI void Player_NextPosition(void)
 		pf->patbrk=0;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;
@@ -3114,7 +3114,7 @@ MIKMODAPI void Player_PrevPosition(void)
 		pf->patbrk=0;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;
@@ -3141,7 +3141,7 @@ MIKMODAPI void Player_SetPosition(UWORD 
 		pf->sngpos=pos;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;

libmikmod-CVE-2009-0179.patch:
 loaders/load_xm.c    |    3 ++-
 playercode/mloader.c |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE libmikmod-CVE-2009-0179.patch ---
diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
--- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
@@ -622,7 +622,8 @@
 				/* read the remainder of the header */
 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
 
-				if(_mm_eof(modreader)) {
+				/* last instrument is at the end of file in version 0x0104 */
+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
 					free(nextwav);free(wh);
 					nextwav=NULL;wh=NULL;
 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
--- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
@@ -450,10 +450,12 @@
 	if (!l->Init || l->Init()) {
 		_mm_rewind(modreader);
 		ok = l->Load(curious);
-		/* propagate inflags=flags for in-module samples */
-		for (t = 0; t < of.numsmp; t++)
-			if (of.samples[t].inflags == 0)
-				of.samples[t].inflags = of.samples[t].flags;
+		if (ok) {
+			/* propagate inflags=flags for in-module samples */
+			for (t = 0; t < of.numsmp; t++)
+				if (of.samples[t].inflags == 0)
+					of.samples[t].inflags = of.samples[t].flags;
+		}
 	} else
 		ok = 0;
 


Index: libmikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/F-11/libmikmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libmikmod.spec	25 Feb 2009 16:15:18 -0000	1.8
+++ libmikmod.spec	28 Aug 2009 06:30:56 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 4.beta2%{?dist}
+Release: 5.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,8 @@ Patch2:  libmikmod-strip-lib.patch
 Patch3:  libmikmod-multilib.patch
 Patch4:  libmikmod-autoconf.patch
 Patch5:  libmikmod-info.patch
+Patch6:  libmikmod-CVE-2007-6720.patch
+Patch7:  libmikmod-CVE-2009-0179.patch
 
 %description
 libmikmod is a library used by the mikmod MOD music file player for
@@ -39,6 +41,8 @@ applications for mikmod.
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .autoconf
 %patch5 -p1 -b .info
+%patch6 -p1 -b .CVE-2007-6720
+%patch7 -p1 -b .CVE-2009-0179
 
 %build
 %configure
@@ -80,6 +84,10 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-5.beta2
+- fix CVE-2007-6720 (#479829)
+- fix CVE-2009-0179 (#479833)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-4.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From whot at fedoraproject.org  Fri Aug 28 06:35:12 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 06:35:12 +0000 (UTC)
Subject: rpms/libXau/devel .cvsignore, 1.10, 1.11 libXau.spec, 1.30,
	1.31 sources, 1.11, 1.12
Message-ID: <20090828063512.207DA11C0044@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1025

Modified Files:
	.cvsignore libXau.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
- libXau 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Sep 2008 18:31:35 -0000	1.10
+++ .cvsignore	28 Aug 2009 06:35:11 -0000	1.11
@@ -1 +1 @@
-libXau-1.0.4.tar.bz2
+libXau-1.0.5.tar.bz2


Index: libXau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libXau.spec	12 Aug 2009 10:46:13 -0000	1.30
+++ libXau.spec	28 Aug 2009 06:35:11 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Sample Authorization Protocol for X
 Name: libXau
-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
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.5-1
+- libXau 1.0.5
+
 * Wed Aug 12 2009 Parag <paragn at fedoraproject.org> 1.0.4-8
 - Merge review cleanups. (#226063)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXau/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Sep 2008 18:31:35 -0000	1.11
+++ sources	28 Aug 2009 06:35:11 -0000	1.12
@@ -1 +1 @@
-0f2b88d857e0a3f5898e4759c541af46  libXau-1.0.4.tar.bz2
+993b3185c629e4b89401fca072dcb663  libXau-1.0.5.tar.bz2



From whot at fedoraproject.org  Fri Aug 28 06:52:23 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 28 Aug 2009 06:52:23 +0000 (UTC)
Subject: rpms/libXcursor/devel .cvsignore, 1.10, 1.11 libXcursor.spec, 1.25, 
	1.26 sources, 1.11, 1.12
Message-ID: <20090828065223.CA47C11C0044@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXcursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4247

Modified Files:
	.cvsignore libXcursor.spec sources 
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.10-1
- libXcursor 1.1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	24 Sep 2007 19:49:11 -0000	1.10
+++ .cvsignore	28 Aug 2009 06:52:21 -0000	1.11
@@ -1 +1 @@
-libXcursor-1.1.9.tar.bz2
+libXcursor-1.1.10.tar.bz2


Index: libXcursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libXcursor.spec	25 Jul 2009 05:10:31 -0000	1.25
+++ libXcursor.spec	28 Aug 2009 06:52:21 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
-Version: 1.1.9
-Release: 6%{?dist}
+Version: 1.1.10
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.10-1
+- libXcursor 1.1.10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Sep 2007 19:49:11 -0000	1.11
+++ sources	28 Aug 2009 06:52:21 -0000	1.12
@@ -1 +1 @@
-99b7554037a92b260891091e81815a0a  libXcursor-1.1.9.tar.bz2
+7dcdad1c10daea872cb3355af414b2ca  libXcursor-1.1.10.tar.bz2



From hedayat at fedoraproject.org  Fri Aug 28 07:26:16 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri, 28 Aug 2009 07:26:16 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/devel
	jalali-calendar-1.6.8-emptyfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar.spec, 1.6, 1.7
Message-ID: <20090828072616.E66E711C0044@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11313

Modified Files:
	gnome-applet-jalali-calendar.spec 
Added Files:
	jalali-calendar-1.6.8-emptyfix.patch 
Log Message:
A patch to not iterate over an empty list

jalali-calendar-1.6.8-emptyfix.patch:
 calendar.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jalali-calendar-1.6.8-emptyfix.patch ---
diff -up jalali-calendar-1.6.8/src/calendar.py.emptyfix jalali-calendar-1.6.8/src/calendar.py
--- jalali-calendar-1.6.8/src/calendar.py.emptyfix	2009-04-19 15:15:15.000000000 +0430
+++ jalali-calendar-1.6.8/src/calendar.py	2009-08-28 11:34:25.000000000 +0430
@@ -269,7 +269,7 @@ class pcalendar(gtk.Widget):
                             break
 
                 customday =False
-                if (gray==False):
+                if ((gray==False)and(self.extraday!=None)):
                     cd = 0 
                     for ctmp in self.extraday:
                         if ((self.jmonth==int(ctmp[0]))and (self.day[i][j]==int(ctmp[1]))):


Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-applet-jalali-calendar.spec	7 Aug 2009 13:00:05 -0000	1.6
+++ gnome-applet-jalali-calendar.spec	28 Aug 2009 07:26:15 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           gnome-applet-jalali-calendar
 Version:        1.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jalali calendar panel applet for GNOME
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://home.gna.org/jalali-calendar
 Source0:        http://download.gna.org/jalali-calendar/jalali-calendar-%{version}.tar.bz2
+Patch0:         jalali-calendar-1.6.8-emptyfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       gnome-python2-applet gnome-python2-gconf
@@ -25,6 +26,7 @@ Features:
 
 %prep
 %setup -n jalali-calendar-%{version} -q
+%patch0 -p1 -b .emptyfix
 
 %build
 
@@ -42,6 +44,9 @@ rm -rf %{buildroot}
 %{_datadir}/jalali-calendar
 
 %changelog
+* Fri Aug 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.6.8-2
+- Added a patch to prevent trying to iterate over an empty list
+
 * Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.8-1
 - Updated to 1.6.8 release
 



From jnovy at fedoraproject.org  Fri Aug 28 07:27:30 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 28 Aug 2009 07:27:30 +0000 (UTC)
Subject: rpms/libmikmod/F-10 libmikmod-CVE-2007-6720.patch, NONE,
	1.1 libmikmod-CVE-2009-0179.patch, NONE, 1.1 libmikmod.spec, 1.7, 1.8
Message-ID: <20090828072730.D921511C0044@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libmikmod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776

Modified Files:
	libmikmod.spec 
Added Files:
	libmikmod-CVE-2007-6720.patch libmikmod-CVE-2009-0179.patch 
Log Message:
* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-4.beta2
- fix CVE-2007-6720 (#479829)
- fix CVE-2009-0179 (#479833)


libmikmod-CVE-2007-6720.patch:
 mplayer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE libmikmod-CVE-2007-6720.patch ---
diff -up libmikmod-3.2.0-beta2/playercode/mplayer.c.CVE-2007-6720 libmikmod-3.2.0-beta2/playercode/mplayer.c
--- libmikmod-3.2.0-beta2/playercode/mplayer.c.CVE-2007-6720	2004-01-31 23:40:22.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mplayer.c	2009-08-28 05:06:07.000000000 +0200
@@ -2318,7 +2318,7 @@ void pt_UpdateVoices(MODULE *mod, int ma
 	SAMPLE *s;
 
 	mod->totalchn=mod->realchn=0;
-	for (channel=0;channel<md_sngchn;channel++) {
+	for (channel=0;channel<pf->numchn;channel++) {
 		aout=&mod->voice[channel];
 		i=aout->main.i;
 		s=aout->main.s;
@@ -3089,7 +3089,7 @@ MIKMODAPI void Player_NextPosition(void)
 		pf->patbrk=0;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;
@@ -3114,7 +3114,7 @@ MIKMODAPI void Player_PrevPosition(void)
 		pf->patbrk=0;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;
@@ -3141,7 +3141,7 @@ MIKMODAPI void Player_SetPosition(UWORD 
 		pf->sngpos=pos;
 		pf->vbtick=pf->sngspd;
 
-		for (t=0;t<md_sngchn;t++) {
+		for (t=0;t<pf->numchn;t++) {
 			Voice_Stop_internal(t);
 			pf->voice[t].main.i=NULL;
 			pf->voice[t].main.s=NULL;

libmikmod-CVE-2009-0179.patch:
 loaders/load_xm.c    |    3 ++-
 playercode/mloader.c |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE libmikmod-CVE-2009-0179.patch ---
diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
--- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
@@ -622,7 +622,8 @@
 				/* read the remainder of the header */
 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
 
-				if(_mm_eof(modreader)) {
+				/* last instrument is at the end of file in version 0x0104 */
+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
 					free(nextwav);free(wh);
 					nextwav=NULL;wh=NULL;
 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
--- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
@@ -450,10 +450,12 @@
 	if (!l->Init || l->Init()) {
 		_mm_rewind(modreader);
 		ok = l->Load(curious);
-		/* propagate inflags=flags for in-module samples */
-		for (t = 0; t < of.numsmp; t++)
-			if (of.samples[t].inflags == 0)
-				of.samples[t].inflags = of.samples[t].flags;
+		if (ok) {
+			/* propagate inflags=flags for in-module samples */
+			for (t = 0; t < of.numsmp; t++)
+				if (of.samples[t].inflags == 0)
+					of.samples[t].inflags = of.samples[t].flags;
+		}
 	} else
 		ok = 0;
 


Index: libmikmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmikmod/F-10/libmikmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libmikmod.spec	18 Feb 2008 21:52:21 -0000	1.7
+++ libmikmod.spec	28 Aug 2009 07:27:30 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A MOD music file player library
 Name: libmikmod
 Version: 3.2.0
-Release: 3.beta2%{?dist}
+Release: 4.beta2%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,8 @@ Patch2:  libmikmod-strip-lib.patch
 Patch3:  libmikmod-multilib.patch
 Patch4:  libmikmod-autoconf.patch
 Patch5:  libmikmod-info.patch
+Patch6:  libmikmod-CVE-2007-6720.patch
+Patch7:  libmikmod-CVE-2009-0179.patch
 
 %description
 libmikmod is a library used by the mikmod MOD music file player for
@@ -39,6 +41,8 @@ applications for mikmod.
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .autoconf
 %patch5 -p1 -b .info
+%patch6 -p1 -b .CVE-2007-6720
+%patch7 -p1 -b .CVE-2009-0179
 
 %build
 %configure
@@ -80,6 +84,10 @@ fi
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 3.2.0-4.beta2
+- fix CVE-2007-6720 (#479829)
+- fix CVE-2009-0179 (#479833)
+
 * Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.0-3.beta2
 - Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n
   output



From mtasaka at fedoraproject.org  Fri Aug 28 07:33:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 28 Aug 2009 07:33:49 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.275,1.276
Message-ID: <20090828073349.7125B11C0044@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13448

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.3.0-102
- Fix typo



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -p -r1.275 -r1.276
--- kdebase-workspace.spec	27 Aug 2009 15:07:25 -0000	1.275
+++ kdebase-workspace.spec	28 Aug 2009 07:33:49 -0000	1.276
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 101%{?dist}
+Release: 102%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -37,7 +37,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Requires: PolityKit-authentication-agent
+Requires: PolicyKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -570,6 +570,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.3.0-102
+- Fix typo
+
 * Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-101
 - inflate Release tag, avoiding possible upgrade/obsoletes pain 
 - -devel: drop Provides: PolicyKit-kde-devel, bump Obsoletes



From nb at fedoraproject.org  Fri Aug 28 07:36:52 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 28 Aug 2009 07:36:52 +0000 (UTC)
Subject: rpms/znc/devel .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 znc.spec, 
	1.15, 1.16
Message-ID: <20090828073652.0EE4711C0044@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14020

Modified Files:
	.cvsignore sources znc.spec 
Log Message:
Upgrade to svn1613 and add tmraz's patch for new openssl



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Aug 2009 05:20:21 -0000	1.9
+++ .cvsignore	28 Aug 2009 07:36:51 -0000	1.10
@@ -1 +1 @@
-znc-0.075.svn1608.tar.bz2
+znc-0.075.svn1613.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 05:23:31 -0000	1.10
+++ sources	28 Aug 2009 07:36:51 -0000	1.11
@@ -1 +1 @@
-9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2
+285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/devel/znc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- znc.spec	26 Aug 2009 15:31:37 -0000	1.15
+++ znc.spec	28 Aug 2009 07:36:51 -0000	1.16
@@ -1,12 +1,12 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        6.svn1608%{?dist}
+Release:        8.svn1613%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1608.tar.bz2 
+# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1613.tar.bz2 
 Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -46,7 +46,7 @@ Extra modules for ZNC
 %setup -q
 %patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
-#chmod -x modules/q.cpp
+chmod -x modules/q.cpp
 
 %build
 %configure \
@@ -128,6 +128,11 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
 - rebuilt with new openssl
 



From nb at fedoraproject.org  Fri Aug 28 07:42:17 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 28 Aug 2009 07:42:17 +0000 (UTC)
Subject: rpms/znc/EL-4 znc-0.075-openssl.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 znc.spec, 1.9, 1.10
Message-ID: <20090828074217.3E70B11C0044@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15001/EL-4

Modified Files:
	.cvsignore sources znc.spec 
Added Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade the rest of the branches to svn1613 with new openssl


znc-0.075-openssl.patch:
 Csocket.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE znc-0.075-openssl.patch ---
diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
+++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
@@ -990,7 +990,11 @@ private:
 	CS_STRING			m_sSSLBuffer;
 	SSL 				*m_ssl;
 	SSL_CTX				*m_ssl_ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD		*m_ssl_method;
+#else
 	SSL_METHOD			*m_ssl_method;
+#endif
 	unsigned int		m_iRequireClientCertFlags;
 
 	FPCertVerifyCB		m_pCerVerifyCB;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Aug 2009 06:03:10 -0000	1.5
+++ .cvsignore	28 Aug 2009 07:42:16 -0000	1.6
@@ -1 +1 @@
-znc-0.075.svn1608.tar.bz2
+znc-0.075.svn1613.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Aug 2009 06:03:11 -0000	1.5
+++ sources	28 Aug 2009 07:42:16 -0000	1.6
@@ -1 +1 @@
-9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2
+285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-4/znc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- znc.spec	21 Aug 2009 06:03:11 -0000	1.9
+++ znc.spec	28 Aug 2009 07:42:16 -0000	1.10
@@ -1,12 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        5.svn1608%{?dist}
+Release:        8.svn1613%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1608.tar.bz2 
+# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1613.tar.bz2 
+Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,8 +44,9 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
-#chmod -x modules/q.cpp
+chmod -x modules/q.cpp
 
 %build
 %configure \
@@ -126,6 +128,14 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
 - Upgrade to svn 1608
 



From nb at fedoraproject.org  Fri Aug 28 07:42:17 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 28 Aug 2009 07:42:17 +0000 (UTC)
Subject: rpms/znc/EL-5 znc-0.075-openssl.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 znc.spec, 1.7, 1.8
Message-ID: <20090828074217.5D75711C0077@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15001/EL-5

Modified Files:
	.cvsignore sources znc.spec 
Added Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade the rest of the branches to svn1613 with new openssl


znc-0.075-openssl.patch:
 Csocket.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE znc-0.075-openssl.patch ---
diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
+++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
@@ -990,7 +990,11 @@ private:
 	CS_STRING			m_sSSLBuffer;
 	SSL 				*m_ssl;
 	SSL_CTX				*m_ssl_ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD		*m_ssl_method;
+#else
 	SSL_METHOD			*m_ssl_method;
+#endif
 	unsigned int		m_iRequireClientCertFlags;
 
 	FPCertVerifyCB		m_pCerVerifyCB;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Aug 2009 05:56:05 -0000	1.5
+++ .cvsignore	28 Aug 2009 07:42:17 -0000	1.6
@@ -1 +1 @@
-znc-0.075.svn1608.tar.bz2
+znc-0.075.svn1613.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Aug 2009 05:56:05 -0000	1.5
+++ sources	28 Aug 2009 07:42:17 -0000	1.6
@@ -1 +1 @@
-9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2
+285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/EL-5/znc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- znc.spec	21 Aug 2009 05:56:05 -0000	1.7
+++ znc.spec	28 Aug 2009 07:42:17 -0000	1.8
@@ -1,12 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        5.svn1608%{?dist}
+Release:        8.svn1613%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1608.tar.bz2 
+# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1613.tar.bz2 
+Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,8 +44,9 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
-#chmod -x modules/q.cpp
+chmod -x modules/q.cpp
 
 %build
 %configure \
@@ -126,6 +128,14 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
 - Upgrade to svn 1608
 



From nb at fedoraproject.org  Fri Aug 28 07:42:17 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 28 Aug 2009 07:42:17 +0000 (UTC)
Subject: rpms/znc/F-10 znc-0.075-openssl.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 znc.spec, 1.6, 1.7
Message-ID: <20090828074217.D70AD11C0044@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15001/F-10

Modified Files:
	.cvsignore sources znc.spec 
Added Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade the rest of the branches to svn1613 with new openssl


znc-0.075-openssl.patch:
 Csocket.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE znc-0.075-openssl.patch ---
diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
+++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
@@ -990,7 +990,11 @@ private:
 	CS_STRING			m_sSSLBuffer;
 	SSL 				*m_ssl;
 	SSL_CTX				*m_ssl_ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD		*m_ssl_method;
+#else
 	SSL_METHOD			*m_ssl_method;
+#endif
 	unsigned int		m_iRequireClientCertFlags;
 
 	FPCertVerifyCB		m_pCerVerifyCB;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Aug 2009 05:55:23 -0000	1.5
+++ .cvsignore	28 Aug 2009 07:42:17 -0000	1.6
@@ -1 +1 @@
-znc-0.075.svn1608.tar.bz2
+znc-0.075.svn1613.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Aug 2009 05:55:23 -0000	1.5
+++ sources	28 Aug 2009 07:42:17 -0000	1.6
@@ -1 +1 @@
-9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2
+285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-10/znc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- znc.spec	21 Aug 2009 05:55:23 -0000	1.6
+++ znc.spec	28 Aug 2009 07:42:17 -0000	1.7
@@ -1,12 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        5.svn1608%{?dist}
+Release:        8.svn1613%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1608.tar.bz2 
+# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1613.tar.bz2 
+Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,8 +44,9 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
-#chmod -x modules/q.cpp
+chmod -x modules/q.cpp
 
 %build
 %configure \
@@ -126,6 +128,14 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
 - Upgrade to svn 1608
 



From nb at fedoraproject.org  Fri Aug 28 07:42:18 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 28 Aug 2009 07:42:18 +0000 (UTC)
Subject: rpms/znc/F-11 znc-0.075-openssl.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 znc.spec, 1.6, 1.7
Message-ID: <20090828074218.A978611C0044@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/znc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15001/F-11

Modified Files:
	.cvsignore sources znc.spec 
Added Files:
	znc-0.075-openssl.patch 
Log Message:
Upgrade the rest of the branches to svn1613 with new openssl


znc-0.075-openssl.patch:
 Csocket.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE znc-0.075-openssl.patch ---
diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
+++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
@@ -990,7 +990,11 @@ private:
 	CS_STRING			m_sSSLBuffer;
 	SSL 				*m_ssl;
 	SSL_CTX				*m_ssl_ctx;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_METHOD		*m_ssl_method;
+#else
 	SSL_METHOD			*m_ssl_method;
+#endif
 	unsigned int		m_iRequireClientCertFlags;
 
 	FPCertVerifyCB		m_pCerVerifyCB;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Aug 2009 05:54:26 -0000	1.5
+++ .cvsignore	28 Aug 2009 07:42:17 -0000	1.6
@@ -1 +1 @@
-znc-0.075.svn1608.tar.bz2
+znc-0.075.svn1613.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Aug 2009 05:54:26 -0000	1.5
+++ sources	28 Aug 2009 07:42:17 -0000	1.6
@@ -1 +1 @@
-9c4932f49424638f136de9c1e9d9fb9d  znc-0.075.svn1608.tar.bz2
+285799b069c452182d9a342aaaf1de1d  znc-0.075.svn1613.tar.bz2


Index: znc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/znc/F-11/znc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- znc.spec	21 Aug 2009 05:54:26 -0000	1.6
+++ znc.spec	28 Aug 2009 07:42:18 -0000	1.7
@@ -1,12 +1,13 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.075
-Release:        5.svn1608%{?dist}
+Release:        8.svn1613%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
-# SVN 1608 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
-Source0:        znc-0.075.svn1608.tar.bz2 
+# SVN 1613 from https://znc.svn.sourceforge.net/svnroot/znc/trunk/
+Source0:        znc-0.075.svn1613.tar.bz2 
+Patch1:         znc-0.075-openssl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl
@@ -43,8 +44,9 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
-#chmod -x modules/q.cpp
+chmod -x modules/q.cpp
 
 %build
 %configure \
@@ -126,6 +128,14 @@ Extra modules for ZNC
 %{_libdir}/znc/send_raw.so
 
 %changelog
+* Fri Aug 28 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
 * Thu Aug 20 2009 Nick Bebout <nb at fedoraproject.org> - 0.075-5.svn1608
 - Upgrade to svn 1608
 



From pghmcfc at fedoraproject.org  Fri Aug 28 08:21:04 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 28 Aug 2009 08:21:04 +0000 (UTC)
Subject: rpms/perl-Sysadm-Install/devel .cvsignore, 1.4,
	1.5 perl-Sysadm-Install.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090828082104.660F511C0044@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Sysadm-Install/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23052

Modified Files:
	.cvsignore perl-Sysadm-Install.spec sources 
Log Message:
Update to 0.31 (improved UTF-8 support)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Jul 2009 09:07:56 -0000	1.4
+++ .cvsignore	28 Aug 2009 08:21:01 -0000	1.5
@@ -1 +1 @@
-Sysadm-Install-0.29.tar.gz
+Sysadm-Install-0.31.tar.gz


Index: perl-Sysadm-Install.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/perl-Sysadm-Install.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Sysadm-Install.spec	26 Jul 2009 16:38:33 -0000	1.5
+++ perl-Sysadm-Install.spec	28 Aug 2009 08:21:01 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Typical installation tasks for system administrators
 Name:		perl-Sysadm-Install
-Version:	0.29
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Sysadm-Install/
@@ -56,7 +56,7 @@ everything, but suppresses any write act
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -72,7 +72,10 @@ everything, but suppresses any write act
 %{_mandir}/man3/Sysadm::Install.3pm*
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29-2
+* Fri Aug 28 2009 Paul Howarth <paul at city-fan.org> 0.31-1
+- Update to 0.31 (improved UTF-8 support)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Fri Jul  3 2009 Paul Howarth <paul at city-fan.org> 0.29-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sysadm-Install/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Jul 2009 09:07:56 -0000	1.4
+++ sources	28 Aug 2009 08:21:02 -0000	1.5
@@ -1 +1 @@
-8c2f201d2fc577fb6fa873638cae1219  Sysadm-Install-0.29.tar.gz
+e17a6cb9b9c509250774c6fb7c50f627  Sysadm-Install-0.31.tar.gz



From mnowak at fedoraproject.org  Fri Aug 28 08:22:18 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 28 Aug 2009 08:22:18 +0000 (UTC)
Subject: rpms/xcb-util/devel xcb-util.spec,1.10,1.11
Message-ID: <20090828082218.7A7F011C0044@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/xcb-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23436

Modified Files:
	xcb-util.spec 
Log Message:
0.3.6-1



Index: xcb-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/xcb-util.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xcb-util.spec	27 Jul 2009 07:39:10 -0000	1.10
+++ xcb-util.spec	28 Aug 2009 08:22:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		xcb-util
-Version:	0.3.5
-Release:	2%{?dist}
+Version:	0.3.6
+Release:	1%{?dist}
 Summary:	Convenience libraries sitting on top of libxcb
 
 Group:		System Environment/Libraries
@@ -8,7 +8,7 @@ License:	MIT
 URL:		http://xcb.freedesktop.org
 Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel
+BuildRequires:	gperf, pkgconfig, libxcb-devel >= 1.4, m4, xorg-x11-proto-devel
 BuildRequires:	chrpath
 
 
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Michal Nowak <mnowak at redhat.com> - 0.3.6-1
+- 0.3.6
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Fri Aug 28 08:22:55 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 28 Aug 2009 08:22:55 +0000 (UTC)
Subject: rpms/anthy/devel anthy-fix-typo-in-dict.patch, 1.1, 1.2 anthy.spec, 
	1.60, 1.61
Message-ID: <20090828082255.A062411C0044@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23636

Modified Files:
	anthy-fix-typo-in-dict.patch anthy.spec 
Log Message:
* Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
- Fix more typos in dictionary. (#519769)

anthy-fix-typo-in-dict.patch:
 compound.t |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Index: anthy-fix-typo-in-dict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy-fix-typo-in-dict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- anthy-fix-typo-in-dict.patch	8 Jul 2009 12:38:34 -0000	1.1
+++ anthy-fix-typo-in-dict.patch	28 Aug 2009 08:22:55 -0000	1.2
@@ -1,6 +1,22 @@
 diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
 --- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2009-07-08 20:52:21.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-08-28 17:19:20.000000000 +0900
+@@ -8,7 +8,6 @@
+ ???????????????? #T35 #_4????_4????
+ ?????????????????? #T35 #_5????_4????
+ ?????????????? #T35 #_5????_2??
+-???????????? #T35 #_3????_3????
+ ?????????????????? #CN ??????????????????
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_3????_3????
+@@ -20,6 +19,7 @@
+ ???????????????? #T35 #_3????_5????
+ ?????????????? #T35 #_3????_4????
+ ???????????????? #T35 #_3????_5????
++???????????? #T35 #_3????_3????
+ ?????????????? #T35 #_3????_4????
+ ?????????????? #T35 #_3????_4????
+ ?????????????????? #T35 #_3????_6??????
 @@ -9714,7 +9714,6 @@
  ?????????????? #T35 #_4????_3????
  ?????????????? #T35 #_4????_3??
@@ -9,6 +25,24 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_4????_3????
  ???????????????? #T35 #_4????_4????
+@@ -19234,7 +19233,7 @@
+ ???????????? #T35 #_4????_2??
+ ???????????????? #T35 #_2??_2??_4????
+ ???????????? #T35 #_4????_2??
+-?????????????????? #T35 #_4????_5????
++?????????????????? #T35 #_4????_5????
+ ???????????? #T35 #_2??_4????
+ ???????????? #T35 #_4????_2??
+ ?????????????? #T35 #_2??_3????_2??
+@@ -20163,7 +20162,7 @@
+ ???????????????? #T35 #_4????_4????
+ ???????????????????? #T35 #_4????_2??_4????
+ ???????????? #T35 #_4????_2??
+-???????????????? #T35 #_4????_4????
++???????????????? #T35 #_4????_4????
+ ???????????? #T35 #_4????_2??
+ ?????????? #T35 #_4????_1??
+ ???????????????? #T35 #_4????_4????
 @@ -30752,7 +30751,6 @@
  ?????????????????????????? #T35 #_6????_4????_3????
  ???????????????? #T35 #_7??????_1??
@@ -17,6 +51,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????? #T35 #_5????_3??
  ???????????????????????? #T35 #_5????_3??_4????
  ?????????????? #T35 #_5????_2??
+@@ -30839,7 +30837,7 @@
+ ???????????? #T35 #_3??_3????
+ ???????????? #T35 #_4????_2??
+ ???????????????? #T35 #_4????_4????
+-???????????????? #T35 #_4????_4????
++???????????????? #T35 #_4????_4????
+ ?????????????? #T35 #_4????_3??
+ ???????????????? #T35 #_5????_3????
+ ???????????????? #T35 #_5????_3????
 @@ -40405,6 +40403,7 @@
  ?????????????? #T35 #_5????_2??
  ???????????? #T35 #_3????_3??
@@ -34,6 +77,20 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????????? #T35 #_4????_6??????
  ???????????? #T35 #_4????_2??
  ?????????????????? #T35 #_6??????_3??
+@@ -57562,11 +57561,11 @@
+ ?????????? #T35 #_3????_2????
+ ?????????? #T35 #_3????_2??
+ ???????????? #T35 #_3????_3????
+-???????????????? #T35 #_3????_5????
++???????????????? #T35 #_3????_5????
+ ???????????????? #T35 #_3????_5????
+ ?????????? #T35 #_3????_2??
+ ?????????????? #T35 #_3????_4????
+-???????????? #T35 #_3????_3????
++???????????? #T35 #_3????_3????
+ ???????????? #T35 #_3????_3????
+ ???????????? #T35 #_3????_3????
+ ?????????????? #T35 #_3????_4????
 @@ -62585,6 +62584,7 @@
  ?????????? #T35 #_3??_2??
  ?????????? #T35 #_3????_2??


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- anthy.spec	20 Aug 2009 07:09:44 -0000	1.60
+++ anthy.spec	28 Aug 2009 08:22:55 -0000	1.61
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	7%{?dist}
+Release:	8%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
+- Fix more typos in dictionary. (#519769)
+
 * Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
 - Stop updating corpus at the build time to avoid creating different dictionary
   among arch. (#816563)



From ovasik at fedoraproject.org  Fri Aug 28 08:27:14 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 28 Aug 2009 08:27:14 +0000 (UTC)
Subject: rpms/xmltex/devel xmltex.1,NONE,1.1 xmltex.spec,1.23,1.24
Message-ID: <20090828082714.AB04411C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmltex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24796

Modified Files:
	xmltex.spec 
Added Files:
	xmltex.1 
Log Message:
ship xmltex manpage from Debian


--- NEW FILE xmltex.1 ---
.TH XMLTEX 1
.SH NAME
xmltex, pdfxmltex \- xml non-validating parser in TeX
.SH SYNOPSIS
.B xmltex
.I "xml file"
.br
.B pdfxmltex
.I "xml file"
.SH DESCRIPTION
This manual page documents briefly the
.BR xmltex ,
and
.B pdfxmltex
commands.  This manual page was written for the Debian GNU/Linux
distribution because the original program does not have a manual page.
Instead, it has documentation in HTML and PS format in the
/usr/share/doc/xmltex directory.
.PP
.B xmltex
and
.B pdfxmltex
is a TeX XML parser able to transform XML documents into .dvi files.
xmltex knows nothing about your XML files.  It needs to load some
special macros files, usually with the .xmt extension.  A
configuration file, either named xmltex.cfg or \[rs]jobname.cfg, is
parsed.  An especially useful configuration command is
.I \[rs]xmltraceoff
which disables XML elements tracing.
.PP
.B xmltex
already knows about many XML schemata, such as TEI, TEI.2, MathML, SEC, HTML
and XSL-FO, the support for the latest being provided by the passivetex
package.
.SH "SEE ALSO"
The programs are documented fully in their own manual in the
/usr/share/doc/xmltex directory.
.br
.BR latex (1),
.BR tex (1)
.SH AUTHOR
This manual page was written by Fabien Ni\[~n]oles <fabien at debian.org>,
for the Debian GNU/Linux system (but may be used by others).


Index: xmltex.spec
===================================================================
RCS file: /cvs/extras/rpms/xmltex/devel/xmltex.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xmltex.spec	27 Jul 2009 08:13:10 -0000	1.23
+++ xmltex.spec	28 Aug 2009 08:27:14 -0000	1.24
@@ -1,11 +1,12 @@
 Summary:	Namespace-aware XML parser written in TeX
 Name:		xmltex
 Version:	20020625
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	LPPL
 Group:		Applications/Publishing
 URL:			http://www.dcarlisle.demon.co.uk/xmltex/manual.html
 Source0:	ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz
+Source1:  xmltex.1
 Requires:	tex(latex)
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -26,10 +27,12 @@ mv -f xmltex/base/* .
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 install -p *.xmt %{name}.cfg *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex
 ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name}
 ln -s latex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
+install -c -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1
+ln -s xmltex.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pdfxmltex.1
 
 gzip -9nf readme.txt
 
@@ -57,8 +60,13 @@ exit 0
 %doc *.gz *.html
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/texmf/tex/xmltex
+%{_mandir}/man1/xmltex.1*
+%{_mandir}/man1/pdfxmltex.1*
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 20020625-15
+- ship xmltex manpage from Debian
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20020625-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -159,8 +167,8 @@ exit 0
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.23  2009/07/27 08:13:10  jkeating
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+Revision 1.24  2009/08/28 08:27:14  ovasik
+ship xmltex manpage from Debian
 
 Revision 1.6  2001/03/27 16:50:29  wiget
 add xmltex.cfg file and one missing dir in %%files; release 3



From giallu at fedoraproject.org  Fri Aug 28 08:28:57 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Fri, 28 Aug 2009 08:28:57 +0000 (UTC)
Subject: rpms/php-adodb/devel .cvsignore, 1.10, 1.11 php-adodb.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <20090828082857.6E4BE11C0044@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25236

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
* Tue Aug 25 2009 Gianluca Sforna <giallu gmail com> - 5.09a-1
- Update to latest release
- Fix download URL
- Update summary and description
- Requires php-common



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	26 Aug 2007 09:37:37 -0000	1.10
+++ .cvsignore	28 Aug 2009 08:28:57 -0000	1.11
@@ -1 +1 @@
-adodb495a.tgz
+adodb509a.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- php-adodb.spec	26 Jul 2009 17:58:21 -0000	1.14
+++ php-adodb.spec	28 Aug 2009 08:28:57 -0000	1.15
@@ -1,28 +1,33 @@
+%global         tarballversion %(echo %{version} | tr -d '.')
+
 Name:           php-adodb
-Summary:        Active Data Objects Data Base
-Version:        4.95
-Release:        3.a%{?dist}
+Summary:        Database abstraction layer for PHP
+Version:        5.09a
+Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb495a.tgz
 License:        BSD or LGPLv2+
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       php >= 4.1.0
+
+Source0:        http://downloads.sourceforge.net/adodb/adodb%{tarballversion}.tgz
+
+Requires:       php-common
 
 %description
-PHP is a wonderful language for building dynamic web pages.
-Unfortunately, PHP's database access functions are not
-standardised. Every database extension uses a different and
-incompatibile API. This creates a need for a database class
-library to hide the differences between the different databases
-(encapsulate the differences) so we can easily switch databases.
+ADOdb is an object oriented library written in PHP that abstracts database 
+operations for portability. It is modelled on Microsoft's ADO, but has many
+improvements that make it unique (eg. pivot tables, Active Record support, 
+generating HTML for paging recordsets with next and previous links, cached 
+recordsets, HTML menu generation, etc).
+ADOdb hides the differences between the different databases so you can easily
+switch DBs without changing code.
 
-!! TODO !! MAKE A SUBPACKAGE FOR THE PEAR::AUTH DRIVER
+# !! TODO !! MAKE A SUBPACKAGE FOR THE PEAR::AUTH DRIVER
 
 %prep
-%setup -q -n adodb
+%setup -q -n adodb5
 
 %build
 # fix dir perms
@@ -54,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/www/icons/*
 
 %changelog
+* Tue Aug 25 2009 Gianluca Sforna <giallu gmail com> - 5.09a-1
+- Update to latest release
+- Fix download URL
+- Update summary and description
+- Requires php-common
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.95-3.a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	26 Aug 2007 09:37:37 -0000	1.10
+++ sources	28 Aug 2009 08:28:57 -0000	1.11
@@ -1 +1 @@
-3f470830f7932a8a33e0c42949fa1470  adodb495a.tgz
+0b691c7b51d6af3ea02e4666cff211e3  adodb509a.tgz



From ovasik at fedoraproject.org  Fri Aug 28 08:39:45 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 28 Aug 2009 08:39:45 +0000 (UTC)
Subject: rpms/jadetex/devel jadetex.spec,1.25,1.26
Message-ID: <20090828083945.42E3211C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/jadetex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28046

Modified Files:
	jadetex.spec 
Log Message:
ship manpage for jadetex/pdfjadetex


Index: jadetex.spec
===================================================================
RCS file: /cvs/extras/rpms/jadetex/devel/jadetex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- jadetex.spec	25 Jul 2009 03:47:13 -0000	1.25
+++ jadetex.spec	28 Aug 2009 08:39:43 -0000	1.26
@@ -1,6 +1,6 @@
 Name: jadetex
 Version: 3.13
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Publishing
 
 Summary: TeX macros used by Jade TeX output
@@ -54,6 +54,9 @@ mkdir -p ${DESTDIR}%{_bindir}
 ln -s etex ${DESTDIR}%{_bindir}/jadetex
 ln -s pdfetex ${DESTDIR}%{_bindir}/pdfjadetex
 
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
+cp -p jadetex.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
+ln -s jadetex.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/pdfjadetex.1
 
 %clean
 DESTDIR=$RPM_BUILD_ROOT
@@ -88,6 +91,8 @@ exit 0
 %{_datadir}/texmf/tex/jadetex/uentities.sty
 %{_datadir}/texmf/tex/jadetex/unicode.sty
 %{_datadir}/texmf/tex/jadetex/jadefmtutil.cnf
+%{_mandir}/man1/jadetex.1*
+%{_mandir}/man1/pdfjadetex.1*
 %{_bindir}/jadetex
 %{_bindir}/pdfjadetex
 
@@ -96,6 +101,9 @@ exit 0
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> 3.13-8
+- ship manpage for jadetex/pdfjadetex
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Fri Aug 28 08:39:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 08:39:49 +0000 (UTC)
Subject: rpms/hplip/devel hplip-requirespageregion.patch, 1.1, 1.2 hplip.spec,
	1.232, 1.233
Message-ID: <20090828083949.1FB2E11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28016

Modified Files:
	hplip-requirespageregion.patch hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
- Fixed RequiresPageRegion patch (bug #518756).


hplip-requirespageregion.patch:
 hpcups.drv.in |    2 ++
 1 file changed, 2 insertions(+)

Index: hplip-requirespageregion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-requirespageregion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-requirespageregion.patch	26 Aug 2009 10:55:57 -0000	1.1
+++ hplip-requirespageregion.patch	28 Aug 2009 08:39:48 -0000	1.2
@@ -1,12 +1,12 @@
-diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.margins hplip-3.9.8/prnt/drv/hpcups.drv.in
---- hplip-3.9.8/prnt/drv/hpcups.drv.in.margins	2009-08-26 09:58:47.957555770 +0100
-+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-26 11:39:43.443555856 +0100
-@@ -115,6 +115,8 @@ Filter "application/vnd.cups-raster 0 hp
- // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
- Manufacturer "HP"
+diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion hplip-3.9.8/prnt/drv/hpcups.drv.in
+--- hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion	2009-08-28 08:59:11.086208461 +0100
++++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-28 09:35:30.095904252 +0100
+@@ -111,6 +111,8 @@ Throughput 1
+ Filter "application/vnd.cups-raster 0 hpcups"
+ //Filter "application/vnd.cups-command 0 commandtohpijs"
  
 +Attribute "RequiresPageRegion" "All" "True"
 +
- ///////// DJ9xx
  {
- 
+ // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
+ Manufacturer "HP"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- hplip.spec	27 Aug 2009 07:41:11 -0000	1.232
+++ hplip.spec	28 Aug 2009 08:39:48 -0000	1.233
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -341,6 +341,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
+- Fixed RequiresPageRegion patch (bug #518756).
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-12
 - rebuilt with new openssl
 



From hedayat at fedoraproject.org  Fri Aug 28 08:42:03 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri, 28 Aug 2009 08:42:03 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/F-11
	jalali-calendar-1.6.8-emptyfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar.spec, 1.5, 1.6
Message-ID: <20090828084203.A742E11C0044@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28585

Modified Files:
	gnome-applet-jalali-calendar.spec 
Added Files:
	jalali-calendar-1.6.8-emptyfix.patch 
Log Message:
A patch to not iterate over an empty list

jalali-calendar-1.6.8-emptyfix.patch:
 calendar.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jalali-calendar-1.6.8-emptyfix.patch ---
diff -up jalali-calendar-1.6.8/src/calendar.py.emptyfix jalali-calendar-1.6.8/src/calendar.py
--- jalali-calendar-1.6.8/src/calendar.py.emptyfix	2009-04-19 15:15:15.000000000 +0430
+++ jalali-calendar-1.6.8/src/calendar.py	2009-08-28 11:34:25.000000000 +0430
@@ -269,7 +269,7 @@ class pcalendar(gtk.Widget):
                             break
 
                 customday =False
-                if (gray==False):
+                if ((gray==False)and(self.extraday!=None)):
                     cd = 0 
                     for ctmp in self.extraday:
                         if ((self.jmonth==int(ctmp[0]))and (self.day[i][j]==int(ctmp[1]))):


Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-11/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-applet-jalali-calendar.spec	7 Aug 2009 13:09:16 -0000	1.5
+++ gnome-applet-jalali-calendar.spec	28 Aug 2009 08:42:03 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           gnome-applet-jalali-calendar
 Version:        1.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jalali calendar panel applet for GNOME
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://home.gna.org/jalali-calendar
 Source0:        http://download.gna.org/jalali-calendar/jalali-calendar-%{version}.tar.bz2
+Patch0:         jalali-calendar-1.6.8-emptyfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       gnome-python2-applet gnome-python2-gconf
@@ -25,6 +26,7 @@ Features:
 
 %prep
 %setup -n jalali-calendar-%{version} -q
+%patch0 -p1 -b .emptyfix
 
 %build
 
@@ -42,6 +44,9 @@ rm -rf %{buildroot}
 %{_datadir}/jalali-calendar
 
 %changelog
+* Fri Aug 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.6.8-2
+- Added a patch to prevent trying to iterate over an empty list
+
 * Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.8-1
 - Updated to 1.6.8 release
 



From hedayat at fedoraproject.org  Fri Aug 28 08:42:16 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Fri, 28 Aug 2009 08:42:16 +0000 (UTC)
Subject: rpms/gnome-applet-jalali-calendar/F-10
	jalali-calendar-1.6.8-emptyfix.patch, NONE,
	1.1 gnome-applet-jalali-calendar.spec, 1.3, 1.4
Message-ID: <20090828084216.DEF0C11C0044@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28650

Modified Files:
	gnome-applet-jalali-calendar.spec 
Added Files:
	jalali-calendar-1.6.8-emptyfix.patch 
Log Message:
A patch to not iterate over an empty list

jalali-calendar-1.6.8-emptyfix.patch:
 calendar.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jalali-calendar-1.6.8-emptyfix.patch ---
diff -up jalali-calendar-1.6.8/src/calendar.py.emptyfix jalali-calendar-1.6.8/src/calendar.py
--- jalali-calendar-1.6.8/src/calendar.py.emptyfix	2009-04-19 15:15:15.000000000 +0430
+++ jalali-calendar-1.6.8/src/calendar.py	2009-08-28 11:34:25.000000000 +0430
@@ -269,7 +269,7 @@ class pcalendar(gtk.Widget):
                             break
 
                 customday =False
-                if (gray==False):
+                if ((gray==False)and(self.extraday!=None)):
                     cd = 0 
                     for ctmp in self.extraday:
                         if ((self.jmonth==int(ctmp[0]))and (self.day[i][j]==int(ctmp[1]))):


Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/F-10/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-applet-jalali-calendar.spec	7 Aug 2009 13:10:24 -0000	1.3
+++ gnome-applet-jalali-calendar.spec	28 Aug 2009 08:42:16 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           gnome-applet-jalali-calendar
 Version:        1.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jalali calendar panel applet for GNOME
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://home.gna.org/jalali-calendar
 Source0:        http://download.gna.org/jalali-calendar/jalali-calendar-%{version}.tar.bz2
+Patch0:         jalali-calendar-1.6.8-emptyfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       gnome-python2-applet gnome-python2-gconf
@@ -25,6 +26,7 @@ Features:
 
 %prep
 %setup -n jalali-calendar-%{version} -q
+%patch0 -p1 -b .emptyfix
 
 %build
 
@@ -42,6 +44,9 @@ rm -rf %{buildroot}
 %{_datadir}/jalali-calendar
 
 %changelog
+* Fri Aug 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.6.8-2
+- Added a patch to prevent trying to iterate over an empty list
+
 * Fri Aug 07 2009 Hedayat Vatankhah <hedayat at grad.com> 1.6.8-1
 - Updated to 1.6.8 release
 



From twaugh at fedoraproject.org  Fri Aug 28 08:58:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 08:58:35 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-requirespageregion.patch, 1.1, 1.2 hplip.spec,
	1.227, 1.228
Message-ID: <20090828085835.6621B11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31479

Modified Files:
	hplip-requirespageregion.patch hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
- Fixed RequiresPageRegion patch (bug #518756).


hplip-requirespageregion.patch:
 hpcups.drv.in |    2 ++
 1 file changed, 2 insertions(+)

Index: hplip-requirespageregion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip-requirespageregion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-requirespageregion.patch	26 Aug 2009 10:58:49 -0000	1.1
+++ hplip-requirespageregion.patch	28 Aug 2009 08:58:33 -0000	1.2
@@ -1,12 +1,12 @@
-diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.margins hplip-3.9.8/prnt/drv/hpcups.drv.in
---- hplip-3.9.8/prnt/drv/hpcups.drv.in.margins	2009-08-26 09:58:47.957555770 +0100
-+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-26 11:39:43.443555856 +0100
-@@ -115,6 +115,8 @@ Filter "application/vnd.cups-raster 0 hp
- // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
- Manufacturer "HP"
+diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion hplip-3.9.8/prnt/drv/hpcups.drv.in
+--- hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion	2009-08-28 08:59:11.086208461 +0100
++++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-08-28 09:35:30.095904252 +0100
+@@ -111,6 +111,8 @@ Throughput 1
+ Filter "application/vnd.cups-raster 0 hpcups"
+ //Filter "application/vnd.cups-command 0 commandtohpijs"
  
 +Attribute "RequiresPageRegion" "All" "True"
 +
- ///////// DJ9xx
  {
- 
+ // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
+ Manufacturer "HP"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- hplip.spec	26 Aug 2009 10:58:49 -0000	1.227
+++ hplip.spec	28 Aug 2009 08:58:33 -0000	1.228
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -349,6 +349,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
+- Fixed RequiresPageRegion patch (bug #518756).
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
 - Set RequiresPageRegion in hpcups PPDs (bug #518756).
 - Removed never-used definition of BREAKPOINT in scan/sane/common.h



From twaugh at fedoraproject.org  Fri Aug 28 09:09:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 09:09:28 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.233,1.234
Message-ID: <20090828090928.1026911C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1551

Modified Files:
	hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
- Use dll.d file instead of post scriptlet for hpaio (bug #519988).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- hplip.spec	28 Aug 2009 08:39:48 -0000	1.233
+++ hplip.spec	28 Aug 2009 09:09:27 -0000	1.234
@@ -179,6 +179,9 @@ desktop-file-install --vendor HP				\
 	--add-category Application				\
 	hplip.desktop
 
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d
+echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio
+
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
 
@@ -318,6 +321,7 @@ rm -rf %{buildroot}
 %files -n libsane-hpaio
 %defattr(-,root,root)
 %{_libdir}/sane/libsane-*.so*
+%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %pre
 # No daemons any more.
@@ -332,16 +336,9 @@ fi
 %postun gui
 /usr/bin/update-desktop-database &>/dev/null ||:
 
-%post -n libsane-hpaio
-/sbin/ldconfig
-if [ -f /etc/sane.d/dll.conf ] && \
-   ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-        echo hpaio >> /etc/sane.d/dll.conf; \
-fi
-exit 0
-
 %changelog
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
+- Use dll.d file instead of post scriptlet for hpaio (bug #519988).
 - Fixed RequiresPageRegion patch (bug #518756).
 
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 3.9.8-12



From twaugh at fedoraproject.org  Fri Aug 28 09:14:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 09:14:40 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip.spec,1.228,1.229
Message-ID: <20090828091440.8072B11C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2437

Modified Files:
	hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
- Use dll.d file instead of post scriptlet for hpaio (bug #519988).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- hplip.spec	28 Aug 2009 08:58:33 -0000	1.228
+++ hplip.spec	28 Aug 2009 09:14:40 -0000	1.229
@@ -183,6 +183,8 @@ desktop-file-install --vendor HP				\
 mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
 install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d
+echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio
 
 # Images in docdir should not be executable (bug #440552).
 find doc/images -type f -exec chmod 644 {} \;
@@ -326,6 +328,7 @@ rm -rf %{buildroot}
 %files -n libsane-hpaio
 %defattr(-,root,root)
 %{_libdir}/sane/libsane-*.so*
+%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %pre
 # No daemons any more.
@@ -350,6 +353,7 @@ exit 0
 
 %changelog
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
+- Use dll.d file instead of post scriptlet for hpaio (bug #519988).
 - Fixed RequiresPageRegion patch (bug #518756).
 
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10



From caolanm at fedoraproject.org  Fri Aug 28 09:43:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 28 Aug 2009 09:43:32 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch,
	NONE, 1.1 openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch,
	NONE, 1.1 openoffice.org-3.1.0.ooo102142.sd.resleak.patch, NONE,
	1.1 openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch,
	NONE,
	1.1 openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch,
	NONE, 1.1 workspace.calc51.patch, NONE,
	1.1 workspace.cmcfixes59.patch, NONE,
	1.1 workspace.cmcfixes60.patch, NONE,
	1.1 workspace.cmcfixes61.patch, NONE,
	1.1 workspace.cmcfixes62.patch, NONE,
	1.1 workspace.defaultdoclang.patch, NONE,
	1.1 workspace.dr72.patch, NONE, 1.1 workspace.evoab2def.patch,
	NONE, 1.1 workspace.hb32bugs01.patch, NONE,
	1.1 workspace.impress171.patch, NONE,
	1.1 workspace.impress174.patch, NONE,
	1.1 workspace.kso32fixes.patch, NONE,
	1.1 workspace.locales32.patch, NONE, 1.1 workspace.sb113.patch,
	NONE, 1.1 workspace.unifypaper01.patch, NONE,
	1.1 workspace.vcl103.patch, NONE, 1.1 workspace.vcl104.patch,
	NONE, 1.1 openoffice.org.spec, 1.1930, 1.1931 sources, 1.362,
	1.363 openoffice.org-2.2.0.ooo63159.sal.dtype.patch, 1.4,
	NONE openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, 1.3,
	NONE openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch,
	1.1, NONE openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch, 1.1, 
	NONE openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch, 
	1.1,
	NONE openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch, 
	1.1, NONE openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch, 
	1.1, NONE openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch,
	1.1, NONE openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch, 1.1,
	NONE openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch,
	1.3, NONE openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch, 1.2, NONE
	openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch,
	1.1, NONE openoffice.org-3.1.1.ooo104306.moverecentlyused.patch,
	1.1, NONE planned.workspace.defaultdoclang.patch, 1.10,
	NONE workspace.aw073.patch, 1.1,
	NONE workspace.calc311fixes.patch, 1.1,
	NONE workspace.pdfextfix02.patch, 1.1,
	NONE workspace.sb109.patch, 1.1, NONE
Message-ID: <20090828094332.263E611C0044@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-serv8510

Modified Files:
	openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch 
	openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 
	openoffice.org-3.1.0.ooo102142.sd.resleak.patch 
	openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch 
	openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch 
	workspace.calc51.patch workspace.cmcfixes59.patch 
	workspace.cmcfixes60.patch workspace.cmcfixes61.patch 
	workspace.cmcfixes62.patch workspace.defaultdoclang.patch 
	workspace.dr72.patch workspace.evoab2def.patch 
	workspace.hb32bugs01.patch workspace.impress171.patch 
	workspace.impress174.patch workspace.kso32fixes.patch 
	workspace.locales32.patch workspace.sb113.patch 
	workspace.unifypaper01.patch workspace.vcl103.patch 
	workspace.vcl104.patch 
Removed Files:
	openoffice.org-2.2.0.ooo63159.sal.dtype.patch 
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
	openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch 
	openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch 
	openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch 
	openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch 
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
	openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch 
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch 
	openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch 
	openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch 
	openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch 
	openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch 
	openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch 
	openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch 
	openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch 
	openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch 
	openoffice.org-3.1.1.ooo104306.moverecentlyused.patch 
	planned.workspace.defaultdoclang.patch workspace.aw073.patch 
	workspace.calc311fixes.patch workspace.pdfextfix02.patch 
	workspace.sb109.patch 
Log Message:
update to 3.1.1

openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch:
 srchdlg.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch ---
Index: svx/source/dialog/srchdlg.cxx
===================================================================
--- svx/source/dialog/srchdlg.cxx	(revision 272843)
+++ svx/source/dialog/srchdlg.cxx	(working copy)
@@ -873,6 +873,18 @@
         pMoreBtn->AddWindow( &aNoFormatBtn );
     }
 
+    if (bDrawApp || bImpressApp)
+    {
+        // "Find All" button is hidden--align "Find" vertically to the
+        // search listbox
+        Point aNewPt(aSearchBtn.GetPosPixel());
+        const Size aBtnSz(aSearchBtn.GetSizePixel());
+        const Size aLBSz(aSearchLB.GetSizePixel());
+        const int nOff((aLBSz.Height() - aBtnSz.Height()) / 2);
+        aNewPt.Y() = aSearchLB.GetPosPixel().Y() + nOff;
+        aSearchBtn.SetPosPixel(aNewPt);
+    }
+
     if ( bDrawApp )
     {
         // Draw App: "Regular expressions" and "Search for Styles" check boxes are hidden
@@ -1058,6 +1070,8 @@
 
 		if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_DRAW )
 		{
+            aSearchAllBtn.Hide();
+
 			aRegExpBtn.Hide();
 			aLayoutBtn.Hide();
 

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                   |  373 +++++++++++-------------
 source/core/data/postit.cxx                     |    1 
 source/core/tool/detfunc.cxx                    |    5 
 source/filter/xml/XMLExportIterator.hxx         |    2 
 source/filter/xml/XMLTableShapeImportHelper.cxx |   58 +--
 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(+), 693 deletions(-)

--- NEW FILE openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch ---
diff -ru sc.orig/inc/document.hxx sc/inc/document.hxx
--- sc.orig/inc/document.hxx	2009-06-04 12:39:48.000000000 +0100
+++ sc/inc/document.hxx	2009-06-04 12:40:23.000000000 +0100
@@ -1319,8 +1319,8 @@
 	void			RestorePrintRanges( const ScPrintRangeSaver& rSaver );
 
 	SC_DLLPUBLIC Rectangle		GetMMRect( SCCOL nStartCol, SCROW nStartRow,
-								SCCOL nEndCol, SCROW nEndRow, SCTAB nTab );
-	SC_DLLPUBLIC ScRange			GetRange( SCTAB nTab, const Rectangle& rMMRect );
+								SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ) const;
+	SC_DLLPUBLIC ScRange			GetRange( SCTAB nTab, const Rectangle& rMMRect ) const;
 
 	void			UpdStlShtPtrsFrmNms();
 	void			StylesToNames();
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 @@
 	BOOL			bHyphenatorSet;
 
 private:
-	void			MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove,
-								const Point& rTopLeft );
 	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			EnsureGraphicNames();
 
 	// Verankerung setzen und ermitteln
-	static void		SetAnchor( SdrObject*, ScAnchorType );
-	static ScAnchorType	GetAnchor( const SdrObject* );
+	static void		SetPageAnchored( SdrObject& );
+	static void		SetCellAnchored( SdrObject&, const ScDrawObjData &rAnchor );
+	static void		SetCellAnchoredFromPosition( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab );
+	static void		UpdateCellAnchorFromPositionEnd( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab );
+	static ScAnchorType	GetAnchorType( const SdrObject& );
 
 	// Positionen fuer Detektivlinien
 	static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE );
diff -ru sc.orig/inc/userdat.hxx sc/inc/userdat.hxx
--- sc.orig/inc/userdat.hxx	2009-06-04 12:39:49.000000000 +0100
+++ sc/inc/userdat.hxx	2009-06-04 12:40:23.000000000 +0100
@@ -63,12 +63,15 @@
 public:
     ScAddress           maStart;
     ScAddress           maEnd;
+    Point               maStartOffset;
+    Point               maEndOffset;
     bool                mbNote;
+    Rectangle           maLastRect;
 
     explicit            ScDrawObjData();
 
 private:
-	virtual ScDrawObjData* Clone( SdrObject* pObj ) const;
+     virtual ScDrawObjData* Clone( SdrObject* pObj ) const;
 };
 
 //-------------------------------------------------------------------------
diff -ru sc.orig/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
--- sc.orig/source/core/data/documen3.cxx	2009-06-04 12:39:09.000000000 +0100
+++ sc/source/core/data/documen3.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -1510,7 +1510,7 @@
 	aEmbedRange = ScRange();
 }
 
-ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
+ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) const
 {
 	ScTable* pTable = pTab[nTab];
 	if (!pTable)
@@ -1801,7 +1801,7 @@
 }
 
 Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow,
-								SCCOL nEndCol, SCROW nEndRow, SCTAB nTab )
+								SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ) const
 {
 	if (!ValidTab(nTab) || !pTab[nTab])
 	{
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 @@
 #include <vcl/svapp.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+
 #include "drwlayer.hxx"
 #include "drawpage.hxx"
 #include "global.hxx"
@@ -526,7 +529,41 @@
 	}
 }
 
-void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData,
+namespace
+{
+    //Can't have a zero width dimension
+    Rectangle lcl_makeSafeRectangle(const Rectangle &rNew)
+    {
+        Rectangle aRect = rNew;
+        if (aRect.Bottom() == aRect.Top())
+            aRect.Bottom() = aRect.Top()+1;
+        if (aRect.Right() == aRect.Left())
+            aRect.Right() = aRect.Left()+1;
+        return aRect;
+    }
+
+    Point lcl_calcAvailableDiff(ScDocument &rDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const Point &aWantedDiff)
+    {
+        Point aAvailableDiff(aWantedDiff);
+        long nHeight = rDoc.GetRowHeight( nRow, nTab ) * HMM_PER_TWIPS;
+        long nWidth = rDoc.GetColWidth( nCol, nTab ) * HMM_PER_TWIPS;
+        if (aAvailableDiff.Y() > nHeight)
+            aAvailableDiff.Y() = nHeight;
+        if (aAvailableDiff.X() > nWidth)
+            aAvailableDiff.X() = nWidth;
+        return aAvailableDiff;
+    }
+
+    Rectangle lcl_UpdateCalcPoly(basegfx::B2DPolygon &rCalcPoly, int nWhichPoint, const Point &rPos)
+    {
+        rCalcPoly.setB2DPoint(nWhichPoint, basegfx::B2DPoint(rPos.X(), rPos.Y()));
+        basegfx::B2DRange aRange(basegfx::tools::getRange(rCalcPoly));
+        return Rectangle(aRange.getMinX(), aRange.getMinY(),
+            aRange.getMaxX(), aRange.getMaxY());
+    }
+}
+
+void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData,
         const ScAddress& rOldStart, const ScAddress& /*rOldEnd*/, bool bNegativePage )
 {
 	DBG_ASSERT( pDoc, "ScDrawLayer::RecalcPos - missing document" );
@@ -562,6 +599,8 @@
 
 	if( bCircle )
 	{
+		rData.maLastRect = pObj->GetLogicRect();
+
 		Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
 		TwipsToMM( aPos.X() );
 		TwipsToMM( aPos.Y() );
@@ -582,11 +621,18 @@
 		{
 			if (bRecording)
 				AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
-			pObj->SetLogicRect(aRect);
+			rData.maLastRect = lcl_makeSafeRectangle(aRect);
+			pObj->SetLogicRect(rData.maLastRect);
 		}
 	}
 	else if( bArrow )
 	{
+		rData.maLastRect = pObj->GetLogicRect();
+		basegfx::B2DPolygon aCalcPoly;
+		Point aOrigStartPos(pObj->GetPoint(0));
+		Point aOrigEndPos(pObj->GetPoint(1));
+		aCalcPoly.append(basegfx::B2DPoint(aOrigStartPos.X(), aOrigStartPos.Y()));
+		aCalcPoly.append(basegfx::B2DPoint(aOrigEndPos.X(), aOrigEndPos.Y()));
 		//!	nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
 
 		if( bValid1 )
@@ -605,6 +651,8 @@
 			{
 				if (bRecording)
 					AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
+
+				rData.maLastRect = lcl_UpdateCalcPoly(aCalcPoly, 0, aStartPos);
 				pObj->SetPoint( aStartPos, 0 );
 			}
 
@@ -619,6 +667,8 @@
 				{
 					if (bRecording)
 						AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
+
+					rData.maLastRect = lcl_UpdateCalcPoly(aCalcPoly, 1, aEndPos);
 					pObj->SetPoint( aEndPos, 1 );
 				}
 			}
@@ -639,6 +689,8 @@
 			{
 				if (bRecording)
 					AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
+
+				rData.maLastRect = lcl_UpdateCalcPoly(aCalcPoly, 1, aEndPos);
 				pObj->SetPoint( aEndPos, 1 );
 			}
 
@@ -655,45 +707,68 @@
 				{
 					if (bRecording)
 						AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
+
+					rData.maLastRect = lcl_UpdateCalcPoly(aCalcPoly, 0, aStartPos);
 					pObj->SetPoint( aStartPos, 0 );
 				}
 			}
 		}
 	}
-	else								// Referenz-Rahmen
+	else
 	{
+		bool bCanResize = bValid2 && !pObj->IsResizeProtect();
+
+		//First time positioning, must be able to at least move it
+		if (rData.maLastRect.IsEmpty())
+			rData.maLastRect = pObj->GetLogicRect();
+
 		DBG_ASSERT( bValid1, "ScDrawLayer::RecalcPos - invalid start position" );
 		Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
 		TwipsToMM( aPos.X() );
 		TwipsToMM( aPos.Y() );
+		aPos += lcl_calcAvailableDiff(*pDoc, nCol1, nRow1, nTab1, rData.maStartOffset);
 
-		if( bValid2 )
+		if( bCanResize )
 		{
-			Point aEnd( pDoc->GetColOffset( nCol2 + 1, nTab2 ), pDoc->GetRowOffset( nRow2 + 1, nTab2 ) );
+			Point aEnd( pDoc->GetColOffset( nCol2, nTab2 ), pDoc->GetRowOffset( nRow2, nTab2 ) );
 			TwipsToMM( aEnd.X() );
 			TwipsToMM( aEnd.Y() );
+			aEnd += lcl_calcAvailableDiff(*pDoc, nCol2, nRow2, nTab2, rData.maEndOffset);
 
 			Rectangle aNew( aPos, aEnd );
 			if ( bNegativePage )
 				MirrorRectRTL( aNew );
 			if ( pObj->GetLogicRect() != aNew )
 			{
+				Rectangle aOld(pObj->GetLogicRect());
+
 				if (bRecording)
 					AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
-				pObj->SetLogicRect(aNew);
+			    rData.maLastRect = lcl_makeSafeRectangle(aNew);
+			    pObj->SetLogicRect(rData.maLastRect);
 			}
 		}
 		else
 		{
 			if ( bNegativePage )
-				aPos.X() = -aPos.X();
+				aPos.X() = -aPos.X() - rData.maLastRect.GetWidth();
 			if ( pObj->GetRelativePos() != aPos )
 			{
 				if (bRecording)
 					AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
+				rData.maLastRect.SetPos( aPos );
 				pObj->SetRelativePos( aPos );
 			}
 		}
+
+		/*
+		 * If we were not allowed resize the object, then the end cell anchor
+		 * is possibly incorrect now, and if the object has no end-cell (e.g.
+		 * missing in original .xml) we are also forced to generate one
+		*/
+		bool bEndAnchorIsBad = !bValid2 || pObj->IsResizeProtect();
+		if (bEndAnchorIsBad)
+			ScDrawLayer::UpdateCellAnchorFromPositionEnd(*pObj, *pDoc, nTab1);
 	}
 }
 
@@ -868,151 +943,6 @@
 	return pRet;
 }
 
-//	MoveAreaTwips: all measures are kept in twips
-void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
-		const Point& rMove, const Point& rTopLeft )
-{
-	if (!rMove.X() && !rMove.Y())
-		return; 									// nix
-
-	SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
-	DBG_ASSERT(pPage,"Page nicht gefunden");
-	if (!pPage)
-		return;
-
-	BOOL bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
-
-	// fuer Shrinking!
-	Rectangle aNew( rArea );
-	BOOL bShrink = FALSE;
-	if ( rMove.X() < 0 || rMove.Y() < 0 )		// verkleinern
-	{
-		if ( rTopLeft != rArea.TopLeft() )		// sind gleich beim Verschieben von Zellen
-		{
-			bShrink = TRUE;
-			aNew.Left() = rTopLeft.X();
-			aNew.Top() = rTopLeft.Y();
-		}
-	}
-	SdrObjListIter aIter( *pPage, IM_FLAT );
-	SdrObject* pObject = aIter.Next();
-	while (pObject)
-	{
-		if( GetAnchor( pObject ) == SCA_CELL )
-		{
-			if ( GetObjData( pObject ) )					// Detektiv-Pfeil ?
-			{
-				// hier nichts
-			}
-			else if ( pObject->ISA( SdrEdgeObj ) )			// Verbinder?
-			{
-				//	hier auch nichts
-				//!	nicht verbundene Enden wie bei Linien (s.u.) behandeln?
-			}
-			else if ( pObject->IsPolyObj() && pObject->GetPointCount()==2 )
-			{
-				for (USHORT i=0; i<2; i++)
-				{
-					BOOL bMoved = FALSE;
-					Point aPoint = pObject->GetPoint(i);
-					lcl_ReverseTwipsToMM( aPoint );
-					if (rArea.IsInside(aPoint))
-					{
-						aPoint += rMove; bMoved = TRUE;
-					}
-					else if (bShrink && aNew.IsInside(aPoint))
-					{
-						//	Punkt ist in betroffener Zelle - Test auf geloeschten Bereich
-						if ( rMove.X() && aPoint.X() >= rArea.Left() + rMove.X() )
-						{
-							aPoint.X() = rArea.Left() + rMove.X() - SHRINK_DIST_TWIPS;
-							if ( aPoint.X() < 0 ) aPoint.X() = 0;
-							bMoved = TRUE;
-						}
-						if ( rMove.Y() && aPoint.Y() >= rArea.Top() + rMove.Y() )
-						{
-							aPoint.Y() = rArea.Top() + rMove.Y() - SHRINK_DIST_TWIPS;
-							if ( aPoint.Y() < 0 ) aPoint.Y() = 0;
-							bMoved = TRUE;
-						}
-					}
-					if( bMoved )
-					{
-						AddCalcUndo( new SdrUndoGeoObj( *pObject ) );
-						lcl_TwipsToMM( aPoint );
-						pObject->SetPoint( aPoint, i );
-					}
-				}
-			}
-			else
-			{
-				Rectangle aObjRect = pObject->GetLogicRect();
-				// aOldMMPos: not converted, millimeters
-				Point aOldMMPos = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft();
-				lcl_ReverseTwipsToMM( aObjRect );
-				Point aTopLeft = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft();	// logical left
-				Size aMoveSize;
-				BOOL bDoMove = FALSE;
-				if (rArea.IsInside(aTopLeft))
-				{
-					aMoveSize = Size(rMove.X(),rMove.Y());
-					bDoMove = TRUE;
-				}
-				else if (bShrink && aNew.IsInside(aTopLeft))
-				{
-					//	Position ist in betroffener Zelle - Test auf geloeschten Bereich
-					if ( rMove.X() && aTopLeft.X() >= rArea.Left() + rMove.X() )
-					{
-						aMoveSize.Width() = rArea.Left() + rMove.X() - SHRINK_DIST - aTopLeft.X();
-						bDoMove = TRUE;
-					}
-					if ( rMove.Y() && aTopLeft.Y() >= rArea.Top() + rMove.Y() )
-					{
-						aMoveSize.Height() = rArea.Top() + rMove.Y() - SHRINK_DIST - aTopLeft.Y();
-						bDoMove = TRUE;
-					}
-				}
-				if ( bDoMove )
-				{
-					if ( bNegativePage )
-					{
-						if ( aTopLeft.X() + aMoveSize.Width() > 0 )
-							aMoveSize.Width() = -aTopLeft.X();
-					}
-					else
-					{
-						if ( aTopLeft.X() + aMoveSize.Width() < 0 )
-							aMoveSize.Width() = -aTopLeft.X();
-					}
-					if ( aTopLeft.Y() + aMoveSize.Height() < 0 )
-						aMoveSize.Height() = -aTopLeft.Y();
-
-					//	get corresponding move size in millimeters:
-					Point aNewPos( aTopLeft.X() + aMoveSize.Width(), aTopLeft.Y() + aMoveSize.Height() );
-					lcl_TwipsToMM( aNewPos );
-					aMoveSize = Size( aNewPos.X() - aOldMMPos.X(), aNewPos.Y() - aOldMMPos.Y() );	// millimeters
-
-					AddCalcUndo( new SdrUndoMoveObj( *pObject, aMoveSize ) );
-					pObject->Move( aMoveSize );
-				}
-				else if ( rArea.IsInside( bNegativePage ? aObjRect.BottomLeft() : aObjRect.BottomRight() ) &&
-							!pObject->IsResizeProtect() )
-				{
-					//	geschuetzte Groessen werden nicht veraendert
-					//	(Positionen schon, weil sie ja an der Zelle "verankert" sind)
-					AddCalcUndo( new SdrUndoGeoObj( *pObject ) );
-					long nOldSizeX = aObjRect.Right() - aObjRect.Left() + 1;
-					long nOldSizeY = aObjRect.Bottom() - aObjRect.Top() + 1;
-					long nLogMoveX = rMove.X() * ( bNegativePage ? -1 : 1 );	// logical direction
-					pObject->Resize( aOldMMPos, Fraction( nOldSizeX+nLogMoveX, nOldSizeX ),
-												Fraction( nOldSizeY+rMove.Y(), nOldSizeY ) );
-				}
-			}
-		}
-		pObject = aIter.Next();
-	}
-}
-
 void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
 							SCsCOL nDx,SCsROW nDy, BOOL bInsDel )
 {
@@ -1054,11 +984,6 @@
 			aTopLeft.Y() += aMove.Y();
 	}
 
-	//	drawing objects are now directly included in cut&paste
-	//	-> only update references when inserting/deleting (or changing widths or heights)
-	if ( bInsDel )
-		MoveAreaTwips( nTab, aRect, aMove, aTopLeft );
-
 		//
 		//		Detektiv-Pfeile: Zellpositionen anpassen
 		//
@@ -1096,8 +1021,6 @@
 		aTopLeft.X() = -aTopLeft.X();
 		nDifTwips = -nDifTwips;
 	}
-
-	MoveAreaTwips( nTab, aRect, Point( nDifTwips,0 ), aTopLeft );
 }
 
 void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
@@ -1128,8 +1051,6 @@
 		MirrorRectRTL( aRect );
 		aTopLeft.X() = -aTopLeft.X();
 	}
-
-	MoveAreaTwips( nTab, aRect, Point( 0,nDifTwips ), aTopLeft );
 }
 
 BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
@@ -1807,30 +1728,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;
+        for( USHORT i = 0; i < nCount; i++ )
+        {
+            SdrObjUserData* pData = pObj->GetUserData( i );
+            if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == nId )
+                return pData;
+        }
+        return NULL;
+    }
+
+    void DeleteFirstUserDataOfType(SdrObject *pObj, UINT16 nId)
+    {
+        USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
+        for( USHORT i = nCount; i > 0; i-- )
+        {
+            SdrObjUserData* pData = pObj->GetUserData( i-1 );
+            if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == nId )
+                pObj->DeleteUserData(i-1);
+        }
+    }
+}
+
+void ScDrawLayer::SetCellAnchored( SdrObject &rObj, const ScDrawObjData &rAnchor )
+{
+    ScDrawObjData* pAnchor = GetObjData( &rObj, true );
+    pAnchor->maStart = rAnchor.maStart;
+    pAnchor->maEnd = rAnchor.maEnd;
+    pAnchor->maStartOffset = rAnchor.maStartOffset;
+    pAnchor->maEndOffset = rAnchor.maEndOffset;
+}
+
+void ScDrawLayer::SetCellAnchoredFromPosition( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab )
+{
+    Rectangle aObjRect(rObj.GetLogicRect());
+    ScRange aRange = rDoc.GetRange( nTab, aObjRect );
+
+    Rectangle aCellRect;
+
+    ScDrawObjData aAnchor;
+    aAnchor.maStart = aRange.aStart;
+    aCellRect = rDoc.GetMMRect( aRange.aStart.Col(), aRange.aStart.Row(), 
+      aRange.aStart.Col(), aRange.aStart.Row(), aRange.aStart.Tab() );
+    aAnchor.maStartOffset.Y() = aObjRect.Top()-aCellRect.Top();
+    if (!rDoc.IsNegativePage(nTab))
+        aAnchor.maStartOffset.X() = aObjRect.Left()-aCellRect.Left();
+    else
+        aAnchor.maStartOffset.X() = aCellRect.Right()-aObjRect.Right();
+
+    aAnchor.maEnd = aRange.aEnd;
+    aCellRect = rDoc.GetMMRect( aRange.aEnd.Col(), aRange.aEnd.Row(), 
+      aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aEnd.Tab() );
+    aAnchor.maEndOffset.Y() = aObjRect.Bottom()-aCellRect.Top();
+    if (!rDoc.IsNegativePage(nTab))
+        aAnchor.maEndOffset.X() = aObjRect.Right()-aCellRect.Left();
+    else
+        aAnchor.maEndOffset.X() = aCellRect.Right()-aObjRect.Left();
+
+    SetCellAnchored( rObj, aAnchor );
+}
+
+void ScDrawLayer::UpdateCellAnchorFromPositionEnd( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab )
+{
+    Rectangle aObjRect(rObj.GetLogicRect());
+    ScRange aRange = rDoc.GetRange( nTab, aObjRect );
+
+    ScDrawObjData* pAnchor = GetObjData( &rObj, true );
+    pAnchor->maEnd = aRange.aEnd;
+
+    Rectangle aCellRect;
+    aCellRect = rDoc.GetMMRect( aRange.aEnd.Col(), aRange.aEnd.Row(), 
+      aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aEnd.Tab() );
+    pAnchor->maEndOffset.Y() = aObjRect.Bottom()-aCellRect.Top();
+    if (!rDoc.IsNegativePage(nTab))
+        pAnchor->maEndOffset.X() = aObjRect.Right()-aCellRect.Left();
+    else
+        pAnchor->maEndOffset.X() = aCellRect.Right()-aObjRect.Left();
+}
+
+void ScDrawLayer::SetPageAnchored( SdrObject &rObj )
+{
+    DeleteFirstUserDataOfType(&rObj, SC_UD_OBJDATA);
 }
 
-ScAnchorType ScDrawLayer::GetAnchor( const SdrObject* pObj )
+ScAnchorType ScDrawLayer::GetAnchorType( const SdrObject &rObj )
 {
-	Point aAnchor( pObj->GetAnchorPos() );
-	return ( aAnchor.Y() != 0 ) ? SCA_PAGE : SCA_CELL;
+	//If this object has a cell anchor associated with it
+	//then its cell-anchored, otherwise its page-anchored
+	return ScDrawLayer::GetObjData(const_cast<SdrObject*>(&rObj)) ? SCA_CELL : SCA_PAGE;
 }
 
 ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate )		// static
 {
-	USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
-	for( USHORT i = 0; i < nCount; i++ )
-	{
-		SdrObjUserData* pData = pObj->GetUserData( i );
-		if( pData && pData->GetInventor() == SC_DRAWLAYER
-					&& pData->GetId() == SC_UD_OBJDATA )
-			return (ScDrawObjData*) pData;
-	}
+	if (SdrObjUserData *pData = GetFirstUserDataOfType(pObj, SC_UD_OBJDATA))
+		return (ScDrawObjData*) pData;
+
 	if( pObj && bCreate )
 	{
 		ScDrawObjData* pData = new ScDrawObjData;
@@ -1867,15 +1863,7 @@
 
 ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )				// static
 {
-	USHORT nCount = pObj->GetUserDataCount();
-	for( USHORT i = 0; i < nCount; i++ )
-	{
-		SdrObjUserData* pData = pObj->GetUserData( i );
-		if( pData && pData->GetInventor() == SC_DRAWLAYER
-					&& pData->GetId() == SC_UD_IMAPDATA )
-			return (ScIMapInfo*) pData;
-	}
-	return NULL;
+	return (ScIMapInfo*)GetFirstUserDataOfType(pObj, SC_UD_IMAPDATA);
 }
 
 // static:
@@ -1928,7 +1916,7 @@
 		else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
 		{
             // TODO/LEAN: working with visual area needs running state
-			aGraphSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize();
+			aGraphSize = ((const SdrOle2Obj*)pObj)->GetOrigObjSize();
 			bObjSupported = TRUE;
 		}
 
@@ -1946,14 +1934,9 @@
 
 ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )             // static
 {
-    USHORT nCount = pObj->GetUserDataCount();
-    for( USHORT i = 0; i < nCount; i++ )
-    {
-        SdrObjUserData* pData = pObj->GetUserData( i );
-        if( pData && pData->GetInventor() == SC_DRAWLAYER
-                    && pData->GetId() == SC_UD_MACRODATA )
-            return (ScMacroInfo*) pData;
-    }
+    if (SdrObjUserData *pData = GetFirstUserDataOfType(pObj, SC_UD_MACRODATA))
+        return (ScMacroInfo*) pData;
+
     if ( bCreate )
     {
         ScMacroInfo* pData = new ScMacroInfo;
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 );
 
     // basic settings
-    ScDrawLayer::SetAnchor( mpCaption, SCA_PAGE );
     mpCaption->SetLayer( bShown ? SC_LAYER_INTERN : SC_LAYER_HIDDEN );
     mpCaption->SetFixedTail();
     mpCaption->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
@@ -492,7 +492,6 @@
 
 		pBox->SetMergedItemSetAndBroadcast(rData.GetBoxSet());
 
-		ScDrawLayer::SetAnchor( pBox, SCA_CELL );
 		pBox->SetLayer( SC_LAYER_INTERN );
 		pPage->InsertObject( pBox );
 		pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
@@ -534,7 +533,6 @@
 	pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos));	//! noetig ???
 	pArrow->SetMergedItemSetAndBroadcast(rAttrSet);
 
-	ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
 	pArrow->SetLayer( SC_LAYER_INTERN );
 	pPage->InsertObject( pArrow );
 	pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
@@ -565,7 +563,6 @@
 
 		pBox->SetMergedItemSetAndBroadcast(rData.GetBoxSet());
 
-		ScDrawLayer::SetAnchor( pBox, SCA_CELL );
 		pBox->SetLayer( SC_LAYER_INTERN );
 		pPage->InsertObject( pBox );
 		pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
@@ -600,7 +597,6 @@
 
 	pArrow->SetMergedItemSetAndBroadcast(rAttrSet);
 
-	ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
 	pArrow->SetLayer( SC_LAYER_INTERN );
 	pPage->InsertObject( pArrow );
 	pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
@@ -668,7 +664,6 @@
 
 	pCircle->SetMergedItemSetAndBroadcast(rAttrSet);
 
-	ScDrawLayer::SetAnchor( pCircle, SCA_CELL );
 	pCircle->SetLayer( SC_LAYER_INTERN );
 	pPage->InsertObject( pCircle );
 	pModel->AddCalcUndo( new SdrUndoInsertObj( *pCircle ) );
diff -ru sc.orig/source/filter/xml/XMLExportIterator.hxx sc/source/filter/xml/XMLExportIterator.hxx
--- sc.orig/source/filter/xml/XMLExportIterator.hxx	2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/XMLExportIterator.hxx	2009-06-04 12:40:23.000000000 +0100
@@ -72,6 +72,8 @@
 {
 	ScAddress	aAddress;
 	ScAddress	aEndAddress;
+	sal_Int32       nEndX;
+	sal_Int32       nEndY;
 	com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape;
 
 	sal_Bool operator<(const ScMyShape& aShape) const;
diff -ru sc.orig/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
--- sc.orig/source/filter/xml/xmlexprt.cxx	2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/xmlexprt.cxx	2009-06-04 12:51:46.000000000 +0100
@@ -599,39 +599,21 @@
 												else
 												{
 													++nShapesCount;
-													SvxShape* pShapeImp(SvxShape::getImplementation(xShape));
-													if (pShapeImp)
+													if (SvxShape* pShapeImp = SvxShape::getImplementation(xShape))
 													{
-														SdrObject *pSdrObj(pShapeImp->GetSdrObject());
-														if (pSdrObj)
+														if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
 														{
-															if (ScDrawLayer::GetAnchor(pSdrObj) == SCA_CELL)
+															if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjData( pSdrObj ))
 															{
-																if (pDoc)
-																{
-
-																	awt::Point aPoint(xShape->getPosition());
-																	awt::Size aSize(xShape->getSize());
-																	rtl::OUString sType(xShape->getShapeType());
-																	Rectangle aRectangle(aPoint.X, aPoint.Y, aPoint.X + aSize.Width, aPoint.Y + aSize.Height);
-																	if ( sType.equals(sCaptionShape) )
-																	{
-                                                                        awt::Point aRelativeCaptionPoint;
-                                                                        xShapeProp->getPropertyValue( sCaptionPoint ) >>= aRelativeCaptionPoint;
-                                                                        Point aCoreRelativeCaptionPoint(aRelativeCaptionPoint.X, aRelativeCaptionPoint.Y);
-                                                                        Point aCoreAbsoluteCaptionPoint(aPoint.X, aPoint.Y);
-                                                                        aCoreAbsoluteCaptionPoint += aCoreRelativeCaptionPoint;
-                                                                        aRectangle.Union(Rectangle(aCoreAbsoluteCaptionPoint, aCoreAbsoluteCaptionPoint));
-																	}
-																	ScRange aRange(pDoc->GetRange(static_cast<SCTAB>(nTable), aRectangle));
-																	ScMyShape aMyShape;
-																	aMyShape.aAddress = aRange.aStart;
-																	aMyShape.aEndAddress = aRange.aEnd;
-																	aMyShape.xShape = xShape;
-																	pSharedData->AddNewShape(aMyShape);
-																	pSharedData->SetLastColumn(nTable, aRange.aStart.Col());
-																	pSharedData->SetLastRow(nTable, aRange.aStart.Row());
-																}
+																ScMyShape aMyShape;
+																aMyShape.aAddress = pAnchor->maStart;
+																aMyShape.aEndAddress = pAnchor->maEnd;
+																aMyShape.nEndX = pAnchor->maEndOffset.X();
+																aMyShape.nEndY = pAnchor->maEndOffset.Y();
+																aMyShape.xShape = xShape;
+																pSharedData->AddNewShape(aMyShape);
+																pSharedData->SetLastColumn(nTable, pAnchor->maStart.Col());
+																pSharedData->SetLastRow(nTable, pAnchor->maStart.Row());
 															}
 															else
 																pSharedData->AddTableShape(nTable, xShape);
@@ -2585,29 +2567,15 @@
                     aPoint.X = 2 * aItr->xShape->getPosition().X + aItr->xShape->getSize().Width - aPoint.X;
 				if ( !aItr->xShape->getShapeType().equals(sCaptionShape) )
 				{
-					awt::Point aEndPoint;
 					Rectangle aEndRec(pDoc->GetMMRect(aItr->aEndAddress.Col(), aItr->aEndAddress.Row(),
 						aItr->aEndAddress.Col(), aItr->aEndAddress.Row(), aItr->aEndAddress.Tab()));
 					rtl::OUString sEndAddress;
 					ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc, FormulaGrammar::CONV_OOO);
 					AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, sEndAddress);
-                    if (bNegativePage)
-                        aEndPoint.X = -aEndRec.Right();
-                    else
-					    aEndPoint.X = aEndRec.Left();
-					aEndPoint.Y = aEndRec.Top();
-					awt::Point aStartPoint(aItr->xShape->getPosition());
-					awt::Size aSize(aItr->xShape->getSize());
-                    sal_Int32 nEndX;
-                    if (bNegativePage)
-					    nEndX = -aStartPoint.X - aEndPoint.X;
-                    else
-					    nEndX = aStartPoint.X + aSize.Width - aEndPoint.X;
-					sal_Int32 nEndY(aStartPoint.Y + aSize.Height - aEndPoint.Y);
 					rtl::OUStringBuffer sBuffer;
-					GetMM100UnitConverter().convertMeasure(sBuffer, nEndX);
+					GetMM100UnitConverter().convertMeasure(sBuffer, aItr->nEndX);
 					AddAttribute(XML_NAMESPACE_TABLE, XML_END_X, sBuffer.makeStringAndClear());
-					GetMM100UnitConverter().convertMeasure(sBuffer, nEndY);
+					GetMM100UnitConverter().convertMeasure(sBuffer, aItr->nEndY);
 					AddAttribute(XML_NAMESPACE_TABLE, XML_END_Y, sBuffer.makeStringAndClear());
 				}
 				ExportShape(aItr->xShape, &aPoint);
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();
         aTables.UpdateRowHeights();
-        aTables.ResizeShapes();
+        aTables.FixupOLEs();
     }
     if (GetModel().is())
     {
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 @@
 
 ScMyTables::ScMyTables(ScXMLImport& rTempImport)
 	: rImport(rTempImport),
-	aResizeShapes(rTempImport),
+	aFixupOLEs(rTempImport),
 	nCurrentColStylePos(0),
 	nCurrentDrawPage( -1 ),
 	nCurrentXShapes( -1 ),
@@ -715,12 +715,10 @@
 	return !((nCurrentSheet != nCurrentXShapes) || !xShapes.is());
 }
 
-void ScMyTables::AddShape(uno::Reference <drawing::XShape>& rShape,
-	rtl::OUString* pRangeList,
-	table::CellAddress& rStartAddress, table::CellAddress& rEndAddress,
-	sal_Int32 nEndX, sal_Int32 nEndY)
+void ScMyTables::AddOLE(uno::Reference <drawing::XShape>& rShape,
+	const rtl::OUString &rRangeList)
 {
-	aResizeShapes.AddShape(rShape, pRangeList, rStartAddress, rEndAddress, nEndX, nEndY);
+	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)
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
@@ -114,7 +114,7 @@
 
 	ScXMLImport&						rImport;
 
-	ScMyShapeResizer                    aResizeShapes;
+	ScMyOLEFixer                        aFixupOLEs;
 
 	::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > xCurrentSheet;
 	::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange;
@@ -151,7 +151,9 @@
 	void								AddColumn(sal_Bool bIsCovered);
 	void								NewTable(sal_Int32 nTempSpannedCols);
 	void								UpdateRowHeights();
-	void								ResizeShapes() { aResizeShapes.ResizeShapes(); }
+	void								FixupOLEs() { aFixupOLEs.FixupOLEs(); }
+	sal_Bool							IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const
+        { return ScMyOLEFixer::IsOLE(rShape); }
 	void								DeleteTable();
 	com::sun::star::table::CellAddress	GetRealCellPos();
 	void								AddColCount(sal_Int32 nTempColCount);
@@ -170,11 +172,8 @@
 										GetCurrentXShapes();
 	sal_Bool							HasDrawPage();
 	sal_Bool							HasXShapes();
-	void								AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
-												rtl::OUString* pRangeList,
-												com::sun::star::table::CellAddress& rStartAddress,
-												com::sun::star::table::CellAddress& rEndAddress,
-												sal_Int32 nEndX, sal_Int32 nEndY);
+	void								AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
+												const rtl::OUString &rRangeList);
 
     void                                AddMatrixRange( sal_Int32 nStartColumn,
                                                 sal_Int32 nStartRow,
diff -ru sc.orig/source/filter/xml/XMLTableShapeImportHelper.cxx sc/source/filter/xml/XMLTableShapeImportHelper.cxx
--- sc.orig/source/filter/xml/XMLTableShapeImportHelper.cxx	2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/XMLTableShapeImportHelper.cxx	2009-06-04 15:17:38.000000000 +0100
@@ -36,6 +36,7 @@
 #include "drwlayer.hxx"
 #include "xmlannoi.hxx"
 #include "rangeutl.hxx"
+#include "userdat.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -86,6 +87,11 @@
 	{
         if (!pAnnotationContext)
         {
+			ScDrawObjData aAnchor;
+			aAnchor.maStart = ScAddress(aStartCell.Column, aStartCell.Row, aStartCell.Sheet);
+			awt::Point aStartPoint(rShape->getPosition());
+			aAnchor.maStartOffset = Point(aStartPoint.X, aStartPoint.Y);
+
 		    sal_Int32 nEndX(-1);
 		    sal_Int32 nEndY(-1);
 		    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -107,11 +113,18 @@
 				    {
 					    sal_Int32 nOffset(0);
 					    ScRangeStringConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset);
+					    aAnchor.maEnd = ScAddress(aEndCell.Column, aEndCell.Row, aEndCell.Sheet);
 				    }
 				    else if (IsXMLToken(aLocalName, XML_END_X))
+				    {
 					    static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(nEndX, rValue);
+					    aAnchor.maEndOffset.X() = nEndX;
+				    }
 				    else if (IsXMLToken(aLocalName, XML_END_Y))
+				    {
 					    static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(nEndY, rValue);
+					    aAnchor.maEndOffset.Y() = nEndY;
+				    }
 				    else if (IsXMLToken(aLocalName, XML_TABLE_BACKGROUND))
 					    if (IsXMLToken(rValue, XML_TRUE))
 						    nLayerID = SC_LAYER_BACK;
@@ -124,39 +137,28 @@
 		    }
             SetLayer(rShape, nLayerID, rShape->getShapeType());
 
-		    if (!bOnTable)
+		    if (SvxShape* pShapeImp = SvxShape::getImplementation(rShape))
 		    {
-			    static_cast<ScXMLImport&>(mrImporter).GetTables().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);
 			    }
 		    }
-		    else
-		    {
-                if ( pRangeList )
-                {
-                    // #i78086# If there are notification ranges, the ChartListener must be created
-                    // also when anchored to the sheet
-                    // -> call AddShape with invalid cell position (checked in ScMyShapeResizer::ResizeShapes)
-
-                    table::CellAddress aInvalidPos( -1, -1, -1 );
-                    static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
-                        pRangeList, aInvalidPos, aInvalidPos, 0, 0);
-                }
 
-			    SvxShape* pShapeImp = SvxShape::getImplementation(rShape);
-			    if (pShapeImp)
-			    {
-				    SdrObject *pSdrObj = pShapeImp->GetSdrObject();
-				    if (pSdrObj)
-					    ScDrawLayer::SetAnchor(pSdrObj, SCA_PAGE);
-			    }
-		    }
+            if ( bOnTable && pRangeList )
+            {
+                // #i78086# If there are notification ranges, the ChartListener must be created
+                // also when anchored to the sheet
+                // -> call AddOLE (fixed up in ScMyShapeResizer::FixupOLEs)
+
+                if (static_cast<ScXMLImport&>(mrImporter).GetTables().IsOLE(rShape))
+                    static_cast<ScXMLImport&>(mrImporter).GetTables().AddOLE(rShape, *pRangeList);
+            }
+
+            delete pRangeList;
         }
         else // shape is annotation
         {
diff -ru sc.orig/source/filter/xml/XMLTableShapeResizer.cxx sc/source/filter/xml/XMLTableShapeResizer.cxx
--- sc.orig/source/filter/xml/XMLTableShapeResizer.cxx	2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/XMLTableShapeResizer.cxx	2009-06-04 15:27:39.000000000 +0100
@@ -51,38 +51,38 @@
 using ::std::vector;
 using ::rtl::OUString;
 
-ScMyShapeResizer::ScMyShapeResizer(ScXMLImport& rTempImport)
+ScMyOLEFixer::ScMyOLEFixer(ScXMLImport& rTempImport)
     : rImport(rTempImport),
     aShapes(),
 	pCollection(NULL)
 {
 }
 
-ScMyShapeResizer::~ScMyShapeResizer()
+ScMyOLEFixer::~ScMyOLEFixer()
 {
 }
 
-sal_Bool ScMyShapeResizer::IsOLE(uno::Reference< drawing::XShape >& rShape) const
+sal_Bool ScMyOLEFixer::IsOLE(uno::Reference< drawing::XShape >& rShape)
 {
 	return rShape->getShapeType().equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")));
 }
 
-void ScMyShapeResizer::CreateChartListener(ScDocument* pDoc,
+void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc,
 	const rtl::OUString& rName,
-	const rtl::OUString* pRangeList)
+	const rtl::OUString& rRangeList)
 {
-    if (!pDoc || !pRangeList)
-        // These are minimum required.
+    // This is the minimum required.
+    if (!pDoc)
         return;
 
-    if (!pRangeList->getLength())
+    if (!rRangeList.getLength())
     {
         pDoc->AddOLEObjectToCollection(rName);
         return;
     }
 
     OUString aRangeStr;
-    ScRangeStringConverter::GetStringFromXMLRangeString(aRangeStr, *pRangeList, pDoc);
+    ScRangeStringConverter::GetStringFromXMLRangeString(aRangeStr, rRangeList, pDoc);
     if (!aRangeStr.getLength())
     {
         pDoc->AddOLEObjectToCollection(rName);
@@ -112,271 +112,45 @@
     }
 }
 
-void ScMyShapeResizer::AddShape(uno::Reference <drawing::XShape>& rShape,
-	rtl::OUString* pRangeList,
-	table::CellAddress& rStartAddress, table::CellAddress& rEndAddress,
-	sal_Int32 nEndX, sal_Int32 nEndY)
+void ScMyOLEFixer::AddOLE(uno::Reference <drawing::XShape>& rShape,
+	const rtl::OUString &rRangeList)
 {
-	ScMyToResizeShape aShape;
+	ScMyToFixupOLE aShape;
 	aShape.xShape.set(rShape);
-	aShape.pRangeList = pRangeList;
-	aShape.aEndCell = rEndAddress;
-	aShape.aStartCell = rStartAddress;
-	aShape.nEndY = nEndY;
-	aShape.nEndX = nEndX;
+	aShape.sRangeList = rRangeList;
 	aShapes.push_back(aShape);
 }
 
-void ScMyShapeResizer::GetNewShapeSizePos(ScDocument* pDoc, const Rectangle& rStartRect,
-                                          const table::CellAddress& rEndCell,
-                                          awt::Point& rPoint, awt::Size& rSize,
-                                          sal_Int32& rEndX, sal_Int32& rEndY) const
-{
-	awt::Point aRefPoint;
-    BOOL bNegativePage(pDoc->IsNegativePage(rEndCell.Sheet));
-    if (bNegativePage)
-        aRefPoint.X = rStartRect.Right();
-    else
-	    aRefPoint.X = rStartRect.Left();
-	aRefPoint.Y = rStartRect.Top();
-	Rectangle aRect(pDoc->GetMMRect(
-		static_cast<SCCOL>(rEndCell.Column), static_cast<SCROW>(rEndCell.Row),
-		static_cast<SCCOL>(rEndCell.Column), static_cast<SCROW>(rEndCell.Row), rEndCell.Sheet ));
-    if (bNegativePage)
-        rEndX = -rEndX + aRect.Right();
-    else
-	    rEndX += aRect.Left();
-	rEndY += aRect.Top();
-	rPoint.X += aRefPoint.X;
-    if (bNegativePage)
-    {
-	    if (rPoint.X < rStartRect.Left())
-		    rPoint.X = rStartRect.Left() + 2; // increment by 2 100th_mm because the cellwidth is internal in twips
-    }
-    else
-    {
-	    if (rPoint.X > rStartRect.Right())
-		    rPoint.X = rStartRect.Right() - 2; // decrement by 2 100th_mm because the cellwidth is internal in twips
-    }
-	rPoint.Y += aRefPoint.Y;
-	if (rPoint.Y > rStartRect.Bottom())
-		rPoint.Y = rStartRect.Bottom() - 2; // decrement by 2 100th_mm because the cellheight is internal in twips
-    if (bNegativePage)
-    {
-        rSize.Width = -(rEndX - rPoint.X);
-    }
-    else
-	    rSize.Width = rEndX - rPoint.X;
-	rSize.Height = rEndY - rPoint.Y;
-}
-
-void ScMyShapeResizer::ResizeShapes()
+void ScMyOLEFixer::FixupOLEs()
 {
 	if (!aShapes.empty() && rImport.GetModel().is())
 	{
-		rtl::OUString sRowHeight(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLHGT));
 		rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName"));
-		rtl::OUString sCaptionPoint( RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" ));
-        rtl::OUString sConnectorShape( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape") );
-        rtl::OUString sCaptionShape( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape") );
-        rtl::OUString sStartShape(RTL_CONSTASCII_USTRINGPARAM("StartShape"));
-        rtl::OUString sEndShape(RTL_CONSTASCII_USTRINGPARAM("EndShape"));
-        rtl::OUString sStartPosition(RTL_CONSTASCII_USTRINGPARAM("StartPosition"));
-        rtl::OUString sEndPosition(RTL_CONSTASCII_USTRINGPARAM("EndPosition"));
-		uno::Reference<table::XCellRange> xTableRow;
-		uno::Reference<sheet::XSpreadsheet> xSheet;
-		uno::Reference<table::XTableRows> xTableRows;
-		sal_Int32 nOldRow(-1);
-		sal_Int32 nOldSheet(-1);
-		ScMyToResizeShapes::iterator aItr(aShapes.begin());
-		ScMyToResizeShapes::iterator aEndItr(aShapes.end());
-		uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( rImport.GetModel(), uno::UNO_QUERY );
-		if ( xSpreadDoc.is() )
+		ScMyToFixupOLEs::iterator aItr(aShapes.begin());
+		ScMyToFixupOLEs::iterator aEndItr(aShapes.end());
+		ScDocument* pDoc(rImport.GetDocument());
+
+		rImport.LockSolarMutex();
+
+		while (aItr != aEndItr)
 		{
-			uno::Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY );
-			ScDocument* pDoc(rImport.GetDocument());
-			if ( pDoc && xIndex.is() )
+            // #i78086# also call CreateChartListener for invalid position (anchored to sheet)
+			if (!IsOLE(aItr->xShape))
+                DBG_ERROR("Only OLEs should be in here now");
+
+			if (IsOLE(aItr->xShape))
 			{
-				rImport.LockSolarMutex();
-				while (aItr != aEndItr)
-				{
-                    // #i78086# invalid cell position is used to call CreateChartListener only
-                    if ( aItr->aEndCell.Sheet >= 0 )
-                    {
-    					if ((nOldSheet != aItr->aEndCell.Sheet) || !xSheet.is())
-    					{
-    						nOldSheet = aItr->aEndCell.Sheet;
-                            xSheet.set(xIndex->getByIndex(nOldSheet), uno::UNO_QUERY);
-    						if (xSheet.is())
-    						{
-    							uno::Reference<table::XColumnRowRange> xColumnRowRange (xSheet, uno::UNO_QUERY);
-    							if (xColumnRowRange.is())
-    								xTableRows = xColumnRowRange->getRows();
-    						}
-    					}
-    					if (xTableRows.is())
-    					{
-    						if (nOldRow != aItr->aEndCell.Row || !xTableRow.is())
-    						{
-    							nOldRow = aItr->aEndCell.Row;
-    							xTableRows->getByIndex(nOldRow) >>= xTableRow;
-    						}
-    						if (xTableRow.is())
-    						{
-    							uno::Reference <beans::XPropertySet> xRowProperties(xTableRow, uno::UNO_QUERY);
-    							if (xRowProperties.is())
-    							{
-    								sal_Int32 nHeight;
-    								if (xRowProperties->getPropertyValue(sRowHeight) >>= nHeight)
-    								{
-    									Rectangle aRec = pDoc->GetMMRect(static_cast<SCCOL>(aItr->aStartCell.Column), static_cast<SCROW>(aItr->aStartCell.Row),
-    										static_cast<SCCOL>(aItr->aStartCell.Column), static_cast<SCROW>(aItr->aStartCell.Row), aItr->aStartCell.Sheet);
-    									awt::Point aPoint(aItr->xShape->getPosition());
-    									awt::Size aSize(aItr->xShape->getSize());
-                                        if (pDoc->IsNegativePage(static_cast<SCTAB>(nOldSheet)))
-                                            aPoint.X += aSize.Width;
-    									if (aItr->nEndY >= 0 && aItr->nEndX >= 0)
-    									{
-                                            if (aItr->xShape->getShapeType().equals(sConnectorShape))
-                                            {
-                                                //#103122#; handle connected Connectorshapes
-                                                uno::Reference<beans::XPropertySet> xShapeProps (aItr->xShape, uno::UNO_QUERY);
-                                                if(xShapeProps.is())
-                                                {
-                                                    uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue(	sStartShape ), uno::UNO_QUERY);
-                                                    uno::Reference<drawing::XShape> xEndShape(xShapeProps->getPropertyValue( sEndShape ), uno::UNO_QUERY);
-                                                    if (!xStartShape.is() && !xEndShape.is())
-                                                    {
-    										            awt::Size aOldSize(aSize);
-                                                        GetNewShapeSizePos(pDoc, aRec, aItr->aEndCell, aPoint, aSize, aItr->nEndX, aItr->nEndY);
-    	                                                aItr->xShape->setPosition(aPoint);
-    	                                                if( (aSize.Width != aOldSize.Width) ||
-    		                                                (aSize.Height != aOldSize.Height) )
-    		                                                aItr->xShape->setSize(aSize);
-                                                    }
-                                                    else if (xStartShape.is() && xEndShape.is())
-                                                    {
-                                                        // do nothing, because they are connected
-                                                    }
-                                                    else
-                                                    {
-                                                        // only one point is connected, the other should be moved
-
-                                                        rtl::OUString sProperty;
-                                                        if (xStartShape.is())
-                                                        {
-                                                            awt::Point aEndPoint;
-                                                            xShapeProps->getPropertyValue(sEndPosition) >>= aEndPoint;
-                                                            aPoint.X = aRec.Left() + aEndPoint.X;
-                                                            aPoint.Y = aRec.Top() + aEndPoint.Y;
-                                                            sProperty = sEndPosition;
-                                                        }
-                                                        else
-                                                        {
-                                                            awt::Point aStartPoint;
-                                                            xShapeProps->getPropertyValue(sStartPosition) >>= aStartPoint;
-                                                            aPoint.X = aRec.Left() + aStartPoint.X;
-                                                            aPoint.Y = aRec.Top() + aStartPoint.Y;
-                                                            sProperty = sStartPosition;
-                                                        }
-                                                        xShapeProps->setPropertyValue(sProperty, uno::makeAny(aPoint));
-                                                    }
-                                                }
-                                            }
-                                            else
-                                            {
-    										    awt::Size aOldSize(aSize);
-                                                GetNewShapeSizePos(pDoc, aRec, aItr->aEndCell, aPoint, aSize, aItr->nEndX, aItr->nEndY);
-                                                if (pDoc->IsNegativePage(static_cast<SCTAB>(nOldSheet)))
-                                                    aPoint.X -= aSize.Width;
-    	                                        aItr->xShape->setPosition(aPoint);
-    	                                        if( (aSize.Width != aOldSize.Width) ||
-    		                                        (aSize.Height != aOldSize.Height) )
-    		                                        aItr->xShape->setSize(aSize);
-                                            }
-    									}
-    									else
-    									{
-    										if (aItr->xShape->getShapeType().equals(sCaptionShape))
-    										{
-    											Rectangle aRectangle(aPoint.X, aPoint.Y, aPoint.X + aSize.Width, aPoint.Y + aSize.Height);
-
-    											awt::Point aCaptionPoint;
-    											uno::Reference< beans::XPropertySet > xShapeProps(aItr->xShape, uno::UNO_QUERY);
-    											if (xShapeProps.is())
-    											{
-    												try
-    												{
-    													xShapeProps->getPropertyValue( sCaptionPoint ) >>= aCaptionPoint;
-    												}
-    												catch ( uno::Exception& )
-    												{
-    													DBG_ERROR("This Captionshape has no CaptionPoint property.");
-    												}
-    											}
-    											Point aCorePoint(aPoint.X, aPoint.Y);
-    											Point aCoreCaptionPoint(aCaptionPoint.X, aCaptionPoint.Y);
-    											aCoreCaptionPoint += aCorePoint;
-    											aRectangle.Union(Rectangle(aCoreCaptionPoint, aCoreCaptionPoint));
-
-    											Point aBeforeRightBottomPoint(aRectangle.BottomRight());
-
-    											aRectangle += aRec.TopLeft();
-    											if (aRectangle.Left() > aRec.Right())
-    												aRectangle -= (Point(aRectangle.Left() - aRec.Right() + 2, 0));
-    											if (aRectangle.Top() > aRec.Bottom())
-    												aRectangle -= (Point(0, aRectangle.Top() - aRec.Bottom() + 2));
-
-    											Point aDifferencePoint(aRectangle.BottomRight() - aBeforeRightBottomPoint);
-    											aPoint.X += aDifferencePoint.X();
-    											aPoint.Y += aDifferencePoint.Y();
-
-    											aItr->xShape->setPosition(aPoint);
-    										}
-    										else
-    										{
-    											// #96159# it is possible, that shapes have a negative position
-    											// this is now handled here
-    											DBG_ERROR("no or negative end address of this shape");
-    											awt::Point aRefPoint;
-    											aRefPoint.X = aRec.Left();
-    											aRefPoint.Y = aRec.Top();
-    											aPoint.X += aRefPoint.X;
-    											if (aPoint.X > aRec.Right())
-    												aPoint.X = aRec.Right() - 2; // decrement by 2 100th_mm because the cellheight is internal in twips
-    											aPoint.Y += aRefPoint.Y;
-    											if (aPoint.Y > aRec.Bottom())
-    												aPoint.Y = aRec.Bottom() - 2; // decrement by 2 100th_mm because the cellheight is internal in twips
-    											aItr->xShape->setPosition(aPoint);
-    										}
-    									}
-    								}
-    							}
-    						}
-    					}
-    					else
-					{
-    						DBG_ERROR("something wents wrong");
-					}
-                    }
-                    // #i78086# call CreateChartListener also for invalid position (anchored to sheet)
-					if (IsOLE(aItr->xShape))
-					{
-						uno::Reference < beans::XPropertySet > xShapeProps ( aItr->xShape, uno::UNO_QUERY );
-						uno::Reference < beans::XPropertySetInfo > xShapeInfo(xShapeProps->getPropertySetInfo());
-                        rtl::OUString sName;
-						if (xShapeProps.is() && xShapeInfo.is() && xShapeInfo->hasPropertyByName(sPersistName) &&
-                            (xShapeProps->getPropertyValue(sPersistName) >>= sName))
-							CreateChartListener(pDoc, sName, aItr->pRangeList);
-					}
-					if (aItr->pRangeList)
-						delete aItr->pRangeList;
-					aItr = aShapes.erase(aItr);
-				}
-				rImport.UnlockSolarMutex();
-//				if (pCollection)
-//					pDoc->SetChartListenerCollection(pCollection);
+				uno::Reference < beans::XPropertySet > xShapeProps ( aItr->xShape, uno::UNO_QUERY );
+				uno::Reference < beans::XPropertySetInfo > xShapeInfo(xShapeProps->getPropertySetInfo());
+                rtl::OUString sName;
+
+				if (pDoc && xShapeProps.is() && xShapeInfo.is() && xShapeInfo->hasPropertyByName(sPersistName) &&
+                  (xShapeProps->getPropertyValue(sPersistName) >>= sName))
+				    CreateChartListener(pDoc, sName, aItr->sRangeList);
 			}
+			aItr = aShapes.erase(aItr);
 		}
+
+		rImport.UnlockSolarMutex();
 	}
 }
diff -ru sc.orig/source/filter/xml/XMLTableShapeResizer.hxx sc/source/filter/xml/XMLTableShapeResizer.hxx
--- sc.orig/source/filter/xml/XMLTableShapeResizer.hxx	2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/XMLTableShapeResizer.hxx	2009-06-04 15:22:38.000000000 +0100
@@ -41,44 +41,31 @@
 class ScDocument;
 class Rectangle;
 
-struct ScMyToResizeShape
+struct ScMyToFixupOLE
 {
 	com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape;
-	rtl::OUString* pRangeList;
-	com::sun::star::table::CellAddress	aEndCell;
-	com::sun::star::table::CellAddress	aStartCell;
-	sal_Int32 nEndX;
-	sal_Int32 nEndY;
-
-	ScMyToResizeShape() : pRangeList(NULL) {}
+	rtl::OUString sRangeList;
 };
 
-typedef std::list<ScMyToResizeShape> ScMyToResizeShapes;
+typedef std::list<ScMyToFixupOLE> ScMyToFixupOLEs;
 
-class ScMyShapeResizer
+class ScMyOLEFixer
 {
 	ScXMLImport&				rImport;
-	ScMyToResizeShapes			aShapes;
+	ScMyToFixupOLEs				aShapes;
 	ScChartListenerCollection*	pCollection;
 
-	sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const;
 	void CreateChartListener(ScDocument* pDoc,
 		const rtl::OUString& rName,
-		const rtl::OUString* pRangeList);
-    void GetNewShapeSizePos(ScDocument* pDoc, const Rectangle& rStartRect,
-                            const com::sun::star::table::CellAddress& rEndCell,
-                            com::sun::star::awt::Point& rPoint, com::sun::star::awt::Size& rSize,
-                            sal_Int32& rEndX, sal_Int32& rEndY) const;
+		const rtl::OUString& rRangeList);
 public:
-	ScMyShapeResizer(ScXMLImport& rImport);
-	~ScMyShapeResizer();
+	ScMyOLEFixer(ScXMLImport& rImport);
+	~ScMyOLEFixer();
 
-	void	AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
-					rtl::OUString* pRangeList,
-					com::sun::star::table::CellAddress& rStartAddress,
-					com::sun::star::table::CellAddress& rEndAddress,
-					sal_Int32 nEndX, sal_Int32 nEndY);
-	void	ResizeShapes();
+	static sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape);
+	void	AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
+					const rtl::OUString &rRangeList);
+	void	FixupOLEs();
 };
 
 #endif
diff -ru sc.orig/source/ui/Accessibility/AccessibleDocument.cxx sc/source/ui/Accessibility/AccessibleDocument.cxx
--- sc.orig/source/ui/Accessibility/AccessibleDocument.cxx	2009-06-04 12:39:41.000000000 +0100
+++ sc/source/ui/Accessibility/AccessibleDocument.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -44,6 +44,7 @@
 #include "drawview.hxx"
 #include "gridwin.hxx"
 #include "AccessibleEditObject.hxx"
+#include "userdat.hxx"
 #include "scresid.hxx"
 #ifndef SC_SC_HRC
 #include "sc.hrc"
@@ -1017,35 +1018,10 @@
         uno::Reference<beans::XPropertySet> xShapeProp(xShape, uno::UNO_QUERY);
 	    if (pShapeImp && xShapeProp.is())
 	    {
-		    SdrObject *pSdrObj = pShapeImp->GetSdrObject();
-		    if (pSdrObj)
+		    if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
 		    {
-			    if (ScDrawLayer::GetAnchor(pSdrObj) == SCA_CELL)
-			    {
-                    ScDocument* pDoc = mpViewShell->GetViewData()->GetDocument();
-				    if (pDoc)
-				    {
-                        rtl::OUString sCaptionShape(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape"));
-					    awt::Point aPoint(xShape->getPosition());
-					    awt::Size aSize(xShape->getSize());
-					    rtl::OUString sType(xShape->getShapeType());
-					    Rectangle aRectangle(aPoint.X, aPoint.Y, aPoint.X + aSize.Width, aPoint.Y + aSize.Height);
-					    if ( sType.equals(sCaptionShape) )
-					    {
-						    awt::Point aRelativeCaptionPoint;
-                            rtl::OUString sCaptionPoint( RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" ));
-						    xShapeProp->getPropertyValue( sCaptionPoint ) >>= aRelativeCaptionPoint;
-						    Point aCoreRelativeCaptionPoint(aRelativeCaptionPoint.X, aRelativeCaptionPoint.Y);
-						    Point aCoreAbsoluteCaptionPoint(aPoint.X, aPoint.Y);
-						    aCoreAbsoluteCaptionPoint += aCoreRelativeCaptionPoint;
-						    aRectangle.Union(Rectangle(aCoreAbsoluteCaptionPoint, aCoreAbsoluteCaptionPoint));
-					    }
-					    ScRange aRange = pDoc->GetRange(mpAccessibleDocument->getVisibleTable(), aRectangle);
-                        pAddress = new ScAddress(aRange.aStart);
-				    }
-			    }
-//			    else
-//				    do nothing, because it is always a NULL Pointer
+				if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjData(pSdrObj))
+					return new ScAddress(pAnchor->maStart);
 		    }
 	    }
     }
diff -ru sc.orig/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh2.cxx
--- sc.orig/source/ui/drawfunc/drawsh2.cxx	2009-06-04 12:39:40.000000000 +0100
+++ sc/source/ui/drawfunc/drawsh2.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -115,7 +115,7 @@
 
 	if ( !bDisableAnchor )
 	{
-	    switch( pView->GetAnchor() )
+	    switch( pView->GetAnchorType() )
 	    {
 		case SCA_PAGE:
 	        rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, TRUE ) );
diff -ru sc.orig/source/ui/drawfunc/drawsh5.cxx sc/source/ui/drawfunc/drawsh5.cxx
--- sc.orig/source/ui/drawfunc/drawsh5.cxx	2009-06-04 12:39:40.000000000 +0100
+++ sc/source/ui/drawfunc/drawsh5.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -397,26 +397,26 @@
             break;
 
         case SID_ANCHOR_PAGE:
-            pView->SetAnchor( SCA_PAGE );
+            pView->SetPageAnchored();
             rBindings.Invalidate( SID_ANCHOR_PAGE );
             rBindings.Invalidate( SID_ANCHOR_CELL );
             break;
 
         case SID_ANCHOR_CELL:
-            pView->SetAnchor( SCA_CELL );
+            pView->SetCellAnchored();
             rBindings.Invalidate( SID_ANCHOR_PAGE );
             rBindings.Invalidate( SID_ANCHOR_CELL );
             break;
 
         case SID_ANCHOR_TOGGLE:
             {
-                switch( pView->GetAnchor() )
+                switch( pView->GetAnchorType() )
                 {
                     case SCA_CELL:
-                    pView->SetAnchor( SCA_PAGE );
+                    pView->SetPageAnchored();
                     break;
                     default:
-                    pView->SetAnchor( SCA_CELL );
+                    pView->SetCellAnchored();
                     break;
                 }
             }
diff -ru sc.orig/source/ui/inc/drawview.hxx sc/source/ui/inc/drawview.hxx
--- sc.orig/source/ui/inc/drawview.hxx	2009-06-04 12:39:46.000000000 +0100
+++ sc/source/ui/inc/drawview.hxx	2009-06-04 12:40:23.000000000 +0100
@@ -100,8 +100,9 @@
 
 	void			CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const;
 
-	void			SetAnchor( ScAnchorType );
-	ScAnchorType	GetAnchor() const;
+	void			SetPageAnchored();
+	void			SetCellAnchored();
+	ScAnchorType	GetAnchorType() const;
 
 	void			VCAddWin( Window* pWin );
 	void			VCRemoveWin( Window* pWin );
diff -ru sc.orig/source/ui/unoobj/shapeuno.cxx sc/source/ui/unoobj/shapeuno.cxx
--- sc.orig/source/ui/unoobj/shapeuno.cxx	2009-06-04 12:39:29.000000000 +0100
+++ sc/source/ui/unoobj/shapeuno.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -365,20 +365,9 @@
                                 table::CellRangeAddress aAddress = xRangeAdd->getRangeAddress();
                                 if (nTab == aAddress.Sheet)
                                 {
-                                    if (aAddress.StartRow != aAddress.EndRow) //should be a Spreadsheet
-                                    {
-                                        DBG_ASSERT(aAddress.StartRow == 0 && aAddress.EndRow == MAXROW &&
-                                            aAddress.StartColumn == 0 && aAddress.EndColumn == MAXCOL, "here should be a XSpreadsheet");
-			                            ScDrawLayer::SetAnchor(pObj, SCA_PAGE);
-                                    }
-                                    else
-                                    {
-                                        DBG_ASSERT(aAddress.StartRow == aAddress.EndRow &&
-                                            aAddress.StartColumn == aAddress.EndColumn, "here should be a XCell");
-			                            ScDrawLayer::SetAnchor(pObj, SCA_CELL);
-                                    }
                                     Rectangle aRect(pDoc->GetMMRect( static_cast<SCCOL>(aAddress.StartColumn), static_cast<SCROW>(aAddress.StartRow),
                                         static_cast<SCCOL>(aAddress.EndColumn), static_cast<SCROW>(aAddress.EndRow), aAddress.Sheet ));
+                                    awt::Point aRelPoint;
                                     uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
                                     if (xShape.is())
                                     {
@@ -397,7 +386,8 @@
                                         awt::Size aUnoSize;
                                         awt::Point aCaptionPoint;
                                         ScRange aRange;
-                                        awt::Point aUnoPoint(lcl_GetRelativePos( xShape, pDoc, nTab, aRange, aUnoSize, aCaptionPoint ));
+                                        aRelPoint = lcl_GetRelativePos( xShape, pDoc, nTab, aRange, aUnoSize, aCaptionPoint );
+                                        awt::Point aUnoPoint(aRelPoint);
 
                                         aUnoPoint.X += aPoint.X();
                                         aUnoPoint.Y += aPoint.Y();
@@ -426,6 +416,24 @@
                                         xShape->setPosition(aUnoPoint);
                                         pDocSh->SetModified();
                                     }
+
+                                    if (aAddress.StartRow != aAddress.EndRow) //should be a Spreadsheet
+                                    {
+                                        DBG_ASSERT(aAddress.StartRow == 0 && aAddress.EndRow == MAXROW &&
+                                            aAddress.StartColumn == 0 && aAddress.EndColumn == MAXCOL, "here should be a XSpreadsheet");
+			                            ScDrawLayer::SetPageAnchored(*pObj);
+                                    }
+                                    else
+                                    {
+                                        DBG_ASSERT(aAddress.StartRow == aAddress.EndRow &&
+                                            aAddress.StartColumn == aAddress.EndColumn, "here should be a XCell");
+			                            ScDrawObjData aAnchor;
+										aAnchor.maStart = ScAddress(aAddress.StartColumn, aAddress.StartRow, aAddress.Sheet);
+										aAnchor.maStartOffset = Point(aRelPoint.X, aRelPoint.Y);
+			                            ScDrawLayer::SetCellAnchored(*pObj, aAnchor);
+			                            //Currently we've only got a start anchor, not an end-anchor, so generate that now
+			                            ScDrawLayer::UpdateCellAnchorFromPositionEnd(*pObj, *pDoc, aAddress.Sheet);
+                                    }
                                 }
 					        }
 				        }
@@ -485,7 +493,7 @@
                                 uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
                                 if (xShape.is())
                                 {
-                                    if (ScDrawLayer::GetAnchor(pObj) == SCA_PAGE)
+                                    if (ScDrawLayer::GetAnchorType(*pObj) == SCA_PAGE)
                                     {
                                         awt::Point aPoint(xShape->getPosition());
                                         awt::Size aSize(xShape->getSize());
@@ -512,7 +520,7 @@
                                         xShape->setPosition(aPoint);
                                         pDocSh->SetModified();
                                     }
-                                    else if (ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
+                                    else if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
                                     {
                                         awt::Size aUnoSize;
                                         awt::Point aCaptionPoint;
@@ -583,7 +591,7 @@
                                 uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
                                 if (xShape.is())
                                 {
-                                    if (ScDrawLayer::GetAnchor(pObj) == SCA_PAGE)
+                                    if (ScDrawLayer::GetAnchorType(*pObj) == SCA_PAGE)
                                     {
                                         awt::Point aPoint = xShape->getPosition();
                                         awt::Point aCaptionPoint;
@@ -596,7 +604,7 @@
                                         xShape->setPosition(aPoint);
                                         pDocSh->SetModified();
                                     }
-                                    else if (ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
+                                    else if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
                                     {
                                         awt::Size aUnoSize;
                                         awt::Point aCaptionPoint;
@@ -663,23 +671,10 @@
 				        {
 					        ScDocShell* pDocSh = (ScDocShell*)pObjSh;
                 		    uno::Reference< uno::XInterface > xAnchor;
-			                if (ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
-                            {
-                                uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
-                                if (xShape.is())
-                                {
-                                    awt::Size aUnoSize;
-                                    awt::Point aCaptionPoint;
-                                    ScRange aRange;
-                                    awt::Point aUnoPoint(lcl_GetRelativePos( xShape, pDoc, nTab, aRange, aUnoSize, aCaptionPoint ));
-
-    						        xAnchor.set(static_cast<cppu::OWeakObject*>(new ScCellObj( pDocSh, aRange.aStart )));
-                                }
-                            }
+			                if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjDataTab(pObj, nTab))
+    						    xAnchor.set(static_cast<cppu::OWeakObject*>(new ScCellObj( pDocSh, pAnchor->maStart)));
                             else
-                            {
     						    xAnchor.set(static_cast<cppu::OWeakObject*>(new ScTableSheetObj( pDocSh, nTab )));
-                            }
                             aAny <<= xAnchor;
                         }
 					}
@@ -722,7 +717,7 @@
                         uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
                         if (xShape.is())
                         {
-			                if (ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
+			                if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
                             {
                                 awt::Size aUnoSize;
                                 awt::Point aCaptionPoint;
@@ -782,7 +777,7 @@
                         if (xShape.is())
                         {
                 		    uno::Reference< uno::XInterface > xAnchor;
-			                if (ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
+			                if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
                             {
                                 awt::Size aUnoSize;
                                 awt::Point aCaptionPoint;
diff -ru sc.orig/source/ui/view/drawvie3.cxx sc/source/ui/view/drawvie3.cxx
--- sc.orig/source/ui/view/drawvie3.cxx	2009-06-04 12:39:42.000000000 +0100
+++ sc/source/ui/view/drawvie3.cxx	2009-06-05 08:47:05.000000000 +0100
@@ -77,7 +77,7 @@
 
 // Verankerung setzen
 
-void ScDrawView::SetAnchor( ScAnchorType eType )
+void ScDrawView::SetPageAnchored()
 {
 	SdrObject* pObj = NULL;
 	if( AreObjectsMarked() )
@@ -87,7 +87,7 @@
 		for( ULONG i=0; i<nCount; i++ )
 		{
 			pObj = pMark->GetMark(i)->GetMarkedSdrObj();
-			ScDrawLayer::SetAnchor( pObj, eType );
+			ScDrawLayer::SetPageAnchored( *pObj );
 		}
 
 		if ( pViewData )
@@ -95,7 +95,28 @@
 	}
 }
 
-ScAnchorType ScDrawView::GetAnchor() const
+void ScDrawView::SetCellAnchored()
+{
+    if (!pDoc)
+        return;
+
+	SdrObject* pObj = NULL;
+	if( AreObjectsMarked() )
+	{
+		const SdrMarkList* pMark = &GetMarkedObjectList();
+		ULONG nCount = pMark->GetMarkCount();
+		for( ULONG i=0; i<nCount; i++ )
+		{
+			pObj = pMark->GetMark(i)->GetMarkedSdrObj();
+			ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *pDoc, nTab);
+		}
+
+		if ( pViewData )
+			pViewData->GetDocShell()->SetDrawModified();
+	}
+}
+
+ScAnchorType ScDrawView::GetAnchorType() const
 {
 	BOOL bPage = FALSE;
 	BOOL bCell = FALSE;
@@ -108,7 +129,7 @@
 		for( ULONG i=0; i<nCount; i++ )
 		{
 			pObj = pMark->GetMark(i)->GetMarkedSdrObj();
-			if( ScDrawLayer::GetAnchor( pObj ) == SCA_CELL )
+			if( ScDrawLayer::GetAnchorType( *pObj ) == SCA_CELL )
 				bCell =TRUE;
 			else
 				bPage = TRUE;
@@ -138,6 +159,20 @@
 		if ( nTab == ((ScTabSizeChangedHint&)rHint).GetTab() )
 			UpdateWorkArea();
 	}
+	else if ( rHint.ISA( SdrHint ) )
+	{
+		if (const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint ))
+		{
+			//Update the anchors of any object that is cell anchored which has
+			//been moved since the last anchors for its position was calculated
+			if (pSdrHint->GetKind() == HINT_OBJCHG || pSdrHint->GetKind() == HINT_OBJINSERTED)
+				if (SdrObject* pObj = const_cast<SdrObject*>(pSdrHint->GetObject()))
+					if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjData(pObj))
+						if (pAnchor->maLastRect != pObj->GetLogicRect())
+							ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *pDoc, nTab);
+		}
+		FmFormView::Notify( rBC,rHint );
+	}
 	else
 		FmFormView::Notify( rBC,rHint );
 }
diff -ru sc.orig/source/ui/view/drawview.cxx sc/source/ui/view/drawview.cxx
--- sc.orig/source/ui/view/drawview.cxx	2009-06-04 12:39:41.000000000 +0100
+++ sc/source/ui/view/drawview.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -164,40 +164,11 @@
 	UINT32 nCount = rMrkList.GetMarkCount();
 	for(UINT32 nPos=0; nPos<nCount; nPos++ )
 	{
-		const SdrObject* pObj = rMrkList.GetMark(nPos)->GetMarkedSdrObj();
-		if(ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
+		SdrObject* pObj = rMrkList.GetMark(nPos)->GetMarkedSdrObj();
+		if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjDataTab(pObj, nTab))
 		{
-			const INT32 nDelta = 1;
-
-			Rectangle aBoundRect = pObj->GetCurrentBoundRect();
-			Point aPos;
-			if (bNegativePage)
-			{
-				aPos = aBoundRect.TopRight();
-				aPos.X() = -aPos.X();			// so the loop below is the same
-			}
-			else
-				aPos = aBoundRect.TopLeft();
-			long nPosX = (long) (aPos.X() / HMM_PER_TWIPS) + nDelta;
-			long nPosY = (long) (aPos.Y() / HMM_PER_TWIPS) + nDelta;
-
-			SCCOL nCol;
-			INT32 nWidth = 0;
-
-			for(nCol=0; nCol<=MAXCOL && nWidth<=nPosX; nCol++)
-				nWidth += pDoc->GetColWidth(nCol,nTab);
-
-			if(nCol > 0)
-				--nCol;
-
-            SCROW nRow = nPosY <= 0 ? 0 : pDoc->FastGetRowForHeight( nTab,
-                    (ULONG) nPosY);
-			if(nRow > 0)
-				--nRow;
-
-			ScTabView* pView = pViewData->GetView();
-			ScAddress aScAddress(nCol, nRow, nTab);
-			pView->CreateAnchorHandles(aHdl, aScAddress);
+			if (ScTabView* pView = pViewData->GetView())
+				pView->CreateAnchorHandles(aHdl, pAnchor->maStart);
 		}
 	}
 }

openoffice.org-3.1.0.ooo102142.sd.resleak.patch:
 BasicViewFactory.cxx |    3 ++-
 BasicViewFactory.hxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.0.ooo102142.sd.resleak.patch ---
diff -ru sd.orig/source/ui/framework/factories/BasicViewFactory.cxx sd/source/ui/framework/factories/BasicViewFactory.cxx
--- sd.orig/source/ui/framework/factories/BasicViewFactory.cxx	2009-05-25 09:21:53.000000000 +0100
+++ sd/source/ui/framework/factories/BasicViewFactory.cxx	2009-05-25 10:03:48.000000000 +0100
@@ -145,7 +145,8 @@
       mpBase(NULL),
       mpFrameView(NULL),
       mpViewCache(new ViewCache()),
-      mxLocalPane(new Pane(Reference<XResourceId>(), new WorkWindow(NULL,WB_STDWORK)))
+      mpWindow(new WorkWindow(NULL,WB_STDWORK)),
+      mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
 {
     (void)rxContext;
 }
diff -ru sd.orig/source/ui/framework/factories/BasicViewFactory.hxx sd/source/ui/framework/factories/BasicViewFactory.hxx
--- sd.orig/source/ui/framework/factories/BasicViewFactory.hxx	2009-05-25 09:21:53.000000000 +0100
+++ sd/source/ui/framework/factories/BasicViewFactory.hxx	2009-05-25 11:20:23.000000000 +0100
@@ -123,6 +123,7 @@
     FrameView* mpFrameView;
 
     class ViewCache;
+    ::boost::shared_ptr<Window> mpWindow;
     ::boost::shared_ptr<ViewCache> mpViewCache;
 
     css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;

openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch:
 xmlnumfi.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch ---
--- xmloff/source/style/xmlnumfi.cxx.orig	2009-08-17 12:01:14.000000000 +0100
+++ xmloff/source/style/xmlnumfi.cxx	2009-08-17 12:01:17.000000000 +0100
@@ -2144,7 +2144,7 @@
     if ( nTokLen > nBufLen )
     	return sal_False;
 
-	sal_Int32 nStartPos = nTokLen - nBufLen;
+	sal_Int32 nStartPos = nBufLen - nTokLen;
 	for ( xub_StrLen nTokPos = 0; nTokPos < nTokLen; nTokPos++ )
 		if ( rToken.GetChar( nTokPos ) != rBuffer.charAt( nStartPos + nTokPos ) )
 			return sal_False;

openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch:
 svdfppt.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch ---
--- 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();
 

workspace.calc51.patch:
 sc/inc/cell.hxx                  |    9 +
 sc/inc/pch/precompiled_sc.hxx    |    3 
 sc/inc/progress.hxx              |   11 +
 sc/source/core/data/cell.cxx     |    2 
 sc/source/core/data/cell2.cxx    |  267 +++++++++++++++++++++++++++++++++++++++
 sc/source/core/data/table2.cxx   |    4 
 sc/source/core/tool/progress.cxx |    2 
 source/ui/view/viewfunc.cxx      |   16 +-
 8 files changed, 302 insertions(+), 12 deletions(-)

--- NEW FILE workspace.calc51.patch ---
diff -ru sc.orig/inc/progress.hxx sc/inc/progress.hxx
--- sc.orig/inc/progress.hxx	2009-06-09 11:02:35.000000000 +0100
+++ sc/inc/progress.hxx	2009-06-09 11:03:37.000000000 +0100
@@ -36,6 +36,17 @@
 
 class ScDocument;
 
+/*
+ * #i102566
+ * Drawing a progress bar update is not cheap, so if we draw it on every
+ * percentage change of 200 calculations we get one progress draw per 2
+ * calculations which is slower than doing the calculations themselves. So as a
+ * rough guide only do an update per MIN_NO_CODES_PER_PROGRESS_UPDATE
+ * calculations
+ */
+#define MIN_NO_CODES_PER_PROGRESS_UPDATE 100
+
+
 class SC_DLLPUBLIC ScProgress
 {
 private:
diff -ru sc.orig/source/core/data/cell.cxx sc/source/core/data/cell.cxx
--- sc.orig/source/core/data/cell.cxx	2009-06-09 11:01:11.000000000 +0100
+++ sc/source/core/data/cell.cxx	2009-06-09 11:04:45.000000000 +0100
@@ -1701,7 +1701,7 @@
 
         // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
         ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
-            pDocument->GetFormulaCodeInTree() );
+            pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
     }
     else
     {
diff -ru sc.orig/source/core/tool/progress.cxx sc/source/core/tool/progress.cxx
--- sc.orig/source/core/tool/progress.cxx	2009-06-09 11:01:11.000000000 +0100
+++ sc/source/core/tool/progress.cxx	2009-06-09 11:04:14.000000000 +0100
@@ -162,7 +162,7 @@
             if ( !pGlobalProgress )
                 pInterpretProgress = new ScProgress( pDoc->GetDocumentShell(),
                     ScGlobal::GetRscString( STR_PROGRESS_CALCULATING ),
-                    pDoc->GetFormulaCodeInTree(), FALSE, bWait );
+                    pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, FALSE, bWait );
 			pInterpretDoc = pDoc;
 		}
 	}
--- sc.orig/source/ui/view/viewfunc.cxx	2009-06-10 13:59:18.000000000 +0100
+++ sc/source/ui/view/viewfunc.cxx	2009-06-10 13:59:23.000000000 +0100
@@ -753,12 +751,13 @@
 		ScPatternAttr* pCellAttrs = NULL;
 		EditTextObject* pNewData = NULL;
 		String aString;
+
+		const ScPatternAttr* pOldPattern = pDoc->GetPattern( nCol, nRow, nTab );
+		ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() );
+		aEngine.SetText(*pData);
+
 		if (bTestSimple)					// Testen, ob einfacher String ohne Attribute
 		{
-			const ScPatternAttr* pOldPattern = pDoc->GetPattern( nCol, nRow, nTab );
-			ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() );
-			aEngine.SetText(*pData);
-
 			ScEditAttrTester aAttrTester( &aEngine );
 			bSimple = !aAttrTester.NeedsObject();
 			bCommon = aAttrTester.NeedsCellAttr();
@@ -779,10 +778,9 @@
 				pCellAttrs->GetFromEditItemSet( &aAttrTester.GetAttribs() );
 				//!	remove common attributes from EditEngine?
 			}
+		}
 
-			if (bSimple)
-				aString = aEngine.GetText();
-		}
+		aString = ScEditUtil::GetSpaceDelimitedString(aEngine);
 
 		//
 		// 		Undo
@@ -840,7 +838,7 @@
 			{	// wg. ChangeTrack erst jetzt
 				pDocSh->GetUndoManager()->AddUndoAction(
 					new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nPos, pTabs,
-										ppOldCells, NULL, NULL, String(),
+										ppOldCells, NULL, NULL, aString,
 										pUndoData ) );
 			}
 
Index: sc/source/core/data/table2.cxx
===================================================================
--- sc/source/core/data/table2.cxx	(revision 272843)
+++ sc/source/core/data/table2.cxx	(working copy)
@@ -2667,7 +2667,7 @@
 					pCell = aCol[nCol].GetCell( nRow );
 					if (pCell)
 						if ( pCell->GetCellType() == CELLTYPE_FORMULA )
-							if (((ScFormulaCell*)pCell)->HasOneReference( aRef ))
+							if (((ScFormulaCell*)pCell)->HasRefListExpressibleAsOneReference( aRef ))
 								if ( aRef.aStart.Col() == nCol && aRef.aEnd.Col() == nCol &&
 									 aRef.aStart.Tab() == nTab && aRef.aEnd.Tab() == nTab &&
 									 DiffSign( aRef.aStart.Row(), nRow ) ==
@@ -2698,7 +2698,7 @@
 			while ( aIter.Next( nRow, pCell ) && !bFound )
 			{
 				if ( pCell->GetCellType() == CELLTYPE_FORMULA )
-					if (((ScFormulaCell*)pCell)->HasOneReference( aRef ))
+					if (((ScFormulaCell*)pCell)->HasRefListExpressibleAsOneReference( aRef ))
 						if ( aRef.aStart.Row() == nRow && aRef.aEnd.Row() == nRow &&
 							 aRef.aStart.Tab() == nTab && aRef.aEnd.Tab() == nTab &&
 							 DiffSign( aRef.aStart.Col(), nCol ) ==
Index: sc/source/core/data/cell2.cxx
===================================================================
--- sc/source/core/data/cell2.cxx	(revision 272843)
+++ sc/source/core/data/cell2.cxx	(working copy)
@@ -34,6 +34,11 @@
 
 
 // INCLUDE ---------------------------------------------------------------
+#include <algorithm>
+#include <deque>
+
+#include <boost/bind.hpp>
+
 #include <vcl/mapmod.hxx>
 #include <svx/editobj.hxx>
 #include <svx/editstat.hxx>
@@ -175,6 +180,222 @@
 
 // ============================================================================
 
+namespace
+{
+
+using std::deque;
+
+typedef SCCOLROW(*DimensionSelector)(const ScSingleRefData&);
+
+
+static SCCOLROW lcl_GetCol(const ScSingleRefData& rData)
+{
+    return rData.nCol;
+}
+
+
+static SCCOLROW lcl_GetRow(const ScSingleRefData& rData)
+{
+    return rData.nRow;
+}
+
+
+static SCCOLROW lcl_GetTab(const ScSingleRefData& rData)
+{
+    return rData.nTab;
+}
+
+
+/** Check if both references span the same range in selected dimension.
+ */
+static bool
+lcl_checkRangeDimension(
+        const SingleDoubleRefProvider& rRef1,
+        const SingleDoubleRefProvider& rRef2,
+        const DimensionSelector aWhich)
+{
+    return
+        aWhich(rRef1.Ref1) == aWhich(rRef2.Ref1)
+        && aWhich(rRef1.Ref2) == aWhich(rRef2.Ref2);
+}
+
+
+static bool
+lcl_checkRangeDimensions(
+        const SingleDoubleRefProvider& rRef1,
+        const SingleDoubleRefProvider& rRef2,
+        bool& bCol, bool& bRow, bool& bTab)
+{
+    const bool bSameCols(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetCol));
+    const bool bSameRows(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetRow));
+    const bool bSameTabs(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetTab));
+        
+    // Test if exactly two dimensions are equal
+    if (!(bSameCols ^ bSameRows ^ bSameTabs)
+            && (bSameCols || bSameRows || bSameTabs))
+    {
+        bCol = !bSameCols;
+        bRow = !bSameRows;
+        bTab = !bSameTabs;
+        return true;
+    }
+    return false;
+}
+
+
+/** Check if references in given reference list can possibly
+    form a range. To do that, two of their dimensions must be the same.
+ */
+static bool
+lcl_checkRangeDimensions(
+        const deque<ScToken*>::const_iterator aBegin,
+        const deque<ScToken*>::const_iterator aEnd,
+        bool& bCol, bool& bRow, bool& bTab)
+{
+    deque<ScToken*>::const_iterator aCur(aBegin);
+    ++aCur;
+    const SingleDoubleRefProvider aRef(**aBegin);
+    bool bOk(false);
+    {
+        const SingleDoubleRefProvider aRefCur(**aCur);
+        bOk = lcl_checkRangeDimensions(aRef, aRefCur, bCol, bRow, bTab);
+    }
+    while (bOk && aCur != aEnd)
+    {
+        const SingleDoubleRefProvider aRefCur(**aCur);
+        bool bColTmp(false);
+        bool bRowTmp(false);
+        bool bTabTmp(false);
+        bOk = lcl_checkRangeDimensions(aRef, aRefCur, bColTmp, bRowTmp, bTabTmp);
+        bOk = bOk && (bCol == bColTmp && bRow == bRowTmp && bTab == bTabTmp);
+        ++aCur;
+    }
+
+    if (bOk && aCur == aEnd)
+    {
+        bCol = bCol;
+        bRow = bRow;
+        bTab = bTab;
+        return true;
+    }
+    return false;
+}
+
+
+bool
+lcl_lessReferenceBy(
+        const ScToken* const pRef1, const ScToken* const pRef2,
+        const DimensionSelector aWhich)
+{
+    const SingleDoubleRefProvider rRef1(*pRef1);
+    const SingleDoubleRefProvider rRef2(*pRef2);
+    return aWhich(rRef1.Ref1) < aWhich(rRef2.Ref1);
+}
+
+
+/** Returns true if range denoted by token pRef2 starts immediately after
+    range denoted by token pRef1. Dimension, in which the comparison takes
+    place, is given by aWhich.
+ */
+bool
+lcl_isImmediatelyFollowing(
+        const ScToken* const pRef1, const ScToken* const pRef2,
+        const DimensionSelector aWhich)
+{
+    const SingleDoubleRefProvider rRef1(*pRef1);
+    const SingleDoubleRefProvider rRef2(*pRef2);
+    return aWhich(rRef2.Ref1) - aWhich(rRef1.Ref2) == 1;
+}
+
+
+static bool
+lcl_checkIfAdjacent(
+        const deque<ScToken*>& rReferences,
+        const DimensionSelector aWhich)
+{
+    typedef deque<ScToken*>::const_iterator Iter;
+    Iter aBegin(rReferences.begin());
+    Iter aEnd(rReferences.end());
+    Iter aBegin1(aBegin);
+    ++aBegin1, --aEnd;
+    return std::equal(
+            aBegin, aEnd, aBegin1,
+            boost::bind(lcl_isImmediatelyFollowing, _1, _2, aWhich));
+}
+
+
+static void
+lcl_fillRangeFromRefList(
+        const deque<ScToken*>& rReferences, ScRange& rRange)
+{
+    const ScSingleRefData aStart(
+            SingleDoubleRefProvider(*rReferences.front()).Ref1);
+    rRange.aStart.Set(aStart.nCol, aStart.nRow, aStart.nTab);
+    const ScSingleRefData aEnd(
+            SingleDoubleRefProvider(*rReferences.back()).Ref2);
+    rRange.aEnd.Set(aEnd.nCol, aEnd.nRow, aEnd.nTab);
+}
+
+
+static bool
+lcl_refListFormsOneRange(
+        const ScAddress& aPos, deque<ScToken*>& rReferences,
+        ScRange& rRange)
+{
+    std::for_each(
+            rReferences.begin(), rReferences.end(),
+            bind(&ScToken::CalcAbsIfRel, _1, aPos))
+        ;
+    if (rReferences.size() == 1) {
+        lcl_fillRangeFromRefList(rReferences, rRange);
+        return true;
+    }
+
+    bool bCell(false);
+    bool bRow(false);
+    bool bTab(false);
+    if (lcl_checkRangeDimensions(rReferences.begin(), rReferences.end(),
+            bCell, bRow, bTab))
+    {
+        DimensionSelector aWhich;
+        if (bCell)
+        {
+            aWhich = lcl_GetCol;
+        }
+        else if (bRow)
+        {
+            aWhich = lcl_GetRow;
+        }
+        else if (bTab)
+        {
+            aWhich = lcl_GetTab;
+        }
+        else
+        {
+            OSL_ENSURE(false, "lcl_checkRangeDimensions shouldn't allow that!");
+        }
+        // Sort the references by start of range
+        std::sort(rReferences.begin(), rReferences.end(),
+                boost::bind(lcl_lessReferenceBy, _1, _2, aWhich));
+        if (lcl_checkIfAdjacent(rReferences, aWhich))
+        {
+            lcl_fillRangeFromRefList(rReferences, rRange);
+            return true;
+        }
+    }
+    return false;
+}
+
+
+bool lcl_isReference(const FormulaToken& rToken)
+{
+    return
+        rToken.GetType() == svSingleRef ||
+        rToken.GetType() == svDoubleRef;
+}
+
+}
+
 BOOL ScFormulaCell::IsEmpty()
 {
     if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
@@ -449,6 +670,52 @@
         return FALSE;
 }
 
+bool
+ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
+{
+    /* If there appears just one reference in the formula, it's the same
+       as HasOneReference(). If there are more of them, they can denote
+       one range if they are (sole) arguments of one function.
+       Union of these references must form one range and their
+       intersection must be empty set.
+    */
+    pCode->Reset();
+    // Get first reference, if any
+    ScToken* const pFirstReference(
+            dynamic_cast<ScToken*>(pCode->GetNextReferenceRPN()));
+    if (pFirstReference)
+    {
+        // Collect all consecutive references, starting by the one
+        // already found
+        std::deque<ScToken*> aReferences;
+        aReferences.push_back(pFirstReference);
+        FormulaToken* pToken(pCode->NextRPN());
+        FormulaToken* pFunction(0);
+        while (pToken)
+        {
+            if (lcl_isReference(*pToken))
+            {
+                aReferences.push_back(dynamic_cast<ScToken*>(pToken));
+                pToken = pCode->NextRPN();
+            }
+            else
+            {
+                if (pToken->IsFunction())
+                {
+                    pFunction = pToken;
+                }
+                break;
+            }
+        }
+        if (pFunction && !pCode->GetNextReferenceRPN()
+                && (pFunction->GetParamCount() == aReferences.size()))
+        {
+            return lcl_refListFormsOneRange(aPos, aReferences, rRange);
+        }
+    }
+    return false;
+}
+
 BOOL ScFormulaCell::HasRelNameReference() const
 {
     pCode->Reset();
Index: sc/inc/cell.hxx
===================================================================
--- sc/inc/cell.hxx	(revision 272843)
+++ sc/inc/cell.hxx	(working copy)
@@ -387,6 +387,15 @@
     inline USHORT   GetSeenInIteration() const { return nSeenInIteration; }
 
 	BOOL			HasOneReference( ScRange& r ) const;
+    /* Checks if the formula contains reference list that can be
+       expressed by one reference (like A1;A2;A3:A5 -> A1:A5). The
+       reference list is not required to be sorted (i.e. A3;A1;A2 is
+       still recognized as A1:A3), but no overlapping is allowed.
+       If one reference is recognized, the rRange is filled.
+
+       It is similar to HasOneReference(), but more general.
+     */
+    bool HasRefListExpressibleAsOneReference(ScRange& rRange) const;
 	BOOL			HasRelNameReference() const;
 	BOOL			HasColRowName() const;
 
Index: sc/inc/pch/precompiled_sc.hxx
===================================================================
--- sc/inc/pch/precompiled_sc.hxx	(revision 272843)
+++ sc/inc/pch/precompiled_sc.hxx	(working copy)
@@ -36,6 +36,7 @@
 
 #include <algorithm>
 #include <assert.h>
+#include <deque>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -49,6 +50,8 @@
 #include <new>
 #include <cfloat>
 
+#include <boost/bind.hpp>
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>

workspace.cmcfixes59.patch:
 typesconfig.c |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

--- NEW FILE workspace.cmcfixes59.patch ---
Index: typesconfig/typesconfig.c
===================================================================
--- sal.orig/typesconfig/typesconfig.c	(revision 269860)
+++ sal/typesconfig/typesconfig.c	(working copy)
@@ -163,20 +163,26 @@
 |*	Letzte Aenderung
 |*
 *************************************************************************/
-static int dummy(void* unused);
+#if defined(IA64) || defined(ARM32)
 
 int GetAtAddress( Type eT, void* p )
 {
-#if defined(IA64) || defined(ARM32)
   switch ( eT )
   {
   case t_char:		return *((char*)p);
-  case t_short:		if ((long)p % sizeof(short)) abort(); else return *((short*)p);
-  case t_int:		if ((long)p % sizeof(int)) abort(); else return *((int*)p);
-  case t_long:		if ((long)p % sizeof(long)) abort(); else return *((long*)p);
-  case t_double:	if ((long)p % sizeof(double)) abort(); else return *((double*)p);
+  case t_short:		if ((long)p % sizeof(short)) raise(SIGBUS); else return *((short*)p);
+  case t_int:		if ((long)p % sizeof(int)) raise(SIGBUS); else return *((int*)p);
+  case t_long:		if ((long)p % sizeof(long)) raise(SIGBUS); else return *((long*)p);
+  case t_double:	if ((long)p % sizeof(double)) raise(SIGBUS); else return *((double*)p);
   }
+  abort();
+}
+
 #else
+static int dummy(void* unused);
+
+int GetAtAddress( Type eT, void* p )
+{
   switch ( eT )
   {
   case t_char: { char x = *(char*)p; return dummy(&x); }
@@ -185,7 +191,6 @@
   case t_long: { long x = *(long*)p; return dummy(&x); }
   case t_double: { double x = *(double*)p; return dummy(&x); }
   }
-#endif
   abort();
 }
 
@@ -195,6 +200,7 @@
     return 0;
 }
 
+#endif
 /*************************************************************************
 |*
 |*	SetAtAddress()

workspace.cmcfixes60.patch:
 mailmrge.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE workspace.cmcfixes60.patch ---
Index: sw/source/ui/envelp/mailmrge.cxx
===================================================================
--- sw/source/ui/envelp/mailmrge.cxx	(revision 272843)
+++ sw/source/ui/envelp/mailmrge.cxx	(working copy)
@@ -402,6 +402,8 @@
     aLk = LINK(this, SwMailMergeDlg, ModifyHdl);
 	aFromNF.SetModifyHdl(aLk);
 	aToNF.SetModifyHdl(aLk);
+    aFromNF.SetMax(SAL_MAX_INT32);
+    aToNF.SetMax(SAL_MAX_INT32);
 
     SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
     if(_xConnection.is())
@@ -783,19 +785,20 @@
 
 	if (aFromRB.IsChecked())	// Liste Einfuegen
 	{
-        ULONG nStart = static_cast< ULONG >(aFromNF.GetValue());
-        ULONG nEnd   = static_cast< ULONG >(aToNF.GetValue());
+        // Safe: the maximal value of the fields is limited
+        sal_Int32 nStart = sal::static_int_cast<sal_Int32>(aFromNF.GetValue());
+        sal_Int32 nEnd   = sal::static_int_cast<sal_Int32>(aToNF.GetValue());
 
 		if (nEnd < nStart)
 		{
-			ULONG nZw = nEnd;
+			const sal_Int32 nZw = nEnd;
 			nEnd = nStart;
 			nStart = nZw;
 		}
 
 		m_aSelection.realloc(nEnd - nStart + 1);
 		Any* pSelection = m_aSelection.getArray();
-		for (ULONG i = nStart; i <= nEnd; ++i, ++pSelection)
+		for (sal_Int32 i = nStart; i != nEnd; ++i, ++pSelection)
 			*pSelection <<= i;
 	}
     else if (aAllRB.IsChecked() )

workspace.cmcfixes61.patch:
 canvas/source/cairo/cairo_canvashelper.cxx |    2 -
 svx/inc/svx/xcolit.hxx                     |    2 -
 svx/inc/svx/xflclit.hxx                    |    2 -
 svx/inc/svx/xflftrit.hxx                   |    2 -
 svx/inc/svx/xflgrit.hxx                    |    2 -
 svx/inc/svx/xflhtit.hxx                    |    2 -
 svx/inc/svx/xftshcit.hxx                   |    2 -
 svx/inc/svx/xit.hxx                        |    8 ++--
 svx/inc/svx/xlnclit.hxx                    |    2 -
 svx/inc/svx/xlndsit.hxx                    |    2 -
 svx/inc/svx/xlnedit.hxx                    |    2 -
 svx/inc/svx/xlnstit.hxx                    |    2 -
 svx/inc/svx/xsflclit.hxx                   |    2 -
 svx/source/xoutdev/xattr.cxx               |   50 +++++++++++++++--------------
 14 files changed, 42 insertions(+), 40 deletions(-)

--- NEW FILE workspace.cmcfixes61.patch ---
Avoid subpixel clipping for cairocanvas. nobody is expecting this.

From: Thorsten Behrens <thb at openoffice.org>


---

 canvas/source/cairo/cairo_canvashelper.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git canvas/source/cairo/cairo_canvashelper.cxx canvas/source/cairo/cairo_canvashelper.cxx
index 3b3571a..9684b8d 100644
--- canvas/source/cairo/cairo_canvashelper.cxx
+++ canvas/source/cairo/cairo_canvashelper.cxx
@@ -888,7 +888,7 @@ namespace cairocanvas
 		    nY = aP.getY();
 		    cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY );
 
- 		    if( ! bIsBezier && bIsRectangle ) {
+ 		    if( ! bIsBezier && (bIsRectangle || aOperation == Clip) ) {
                 nX = basegfx::fround( nX );
                 nY = basegfx::fround( nY );
 		    }
diff -ru svx.orig/inc/svx/xcolit.hxx svx/inc/svx/xcolit.hxx
--- svx.orig/inc/svx/xcolit.hxx	2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xcolit.hxx	2009-07-09 16:34:22.000000000 +0100
@@ -48,7 +48,7 @@
 public:
 			TYPEINFO();
 			XColorItem() {}
-			XColorItem(USHORT nWhich, long nIndex, const Color& rTheColor);
+			XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor);
 
 	virtual	sal_Bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
 	virtual	sal_Bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff -ru svx.orig/inc/svx/xflclit.hxx svx/inc/svx/xflclit.hxx
--- svx.orig/inc/svx/xflclit.hxx	2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xflclit.hxx	2009-07-09 16:32:16.000000000 +0100
@@ -46,7 +46,7 @@
 public:
 			TYPEINFO();
 			XFillColorItem() {}
-			XFillColorItem(long nIndex, const Color& rTheColor);
+			XFillColorItem(INT32 nIndex, const Color& rTheColor);
 			XFillColorItem(const String& rName, const Color& rTheColor);
 			XFillColorItem(SvStream& rIn);
 
diff -ru svx.orig/inc/svx/xflftrit.hxx svx/inc/svx/xflftrit.hxx
--- svx.orig/inc/svx/xflftrit.hxx	2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xflftrit.hxx	2009-07-09 16:11:19.000000000 +0100
@@ -50,7 +50,7 @@
 							TYPEINFO();
 
 							XFillFloatTransparenceItem();
-							XFillFloatTransparenceItem( long nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
+							XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
 							XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE );
 							XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE );
 							XFillFloatTransparenceItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xflgrit.hxx svx/inc/svx/xflgrit.hxx
--- svx.orig/inc/svx/xflgrit.hxx	2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xflgrit.hxx	2009-07-09 16:31:03.000000000 +0100
@@ -47,7 +47,7 @@
 public:
 			TYPEINFO();
 			XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
-			XFillGradientItem(long nIndex, const XGradient& rTheGradient);
+			XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient);
 			XFillGradientItem(const UniString& rName, const XGradient& rTheGradient);
 			XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient);
 			XFillGradientItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xflhtit.hxx svx/inc/svx/xflhtit.hxx
--- svx.orig/inc/svx/xflhtit.hxx	2009-07-09 15:28:13.000000000 +0100
+++ svx/inc/svx/xflhtit.hxx	2009-07-09 16:11:08.000000000 +0100
@@ -47,7 +47,7 @@
 public:
 							TYPEINFO();
 							XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
-							XFillHatchItem(long nIndex, const XHatch& rTheHatch);
+							XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch);
 							XFillHatchItem(const String& rName, const XHatch& rTheHatch);
 							XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
 							XFillHatchItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xftshcit.hxx svx/inc/svx/xftshcit.hxx
--- svx.orig/inc/svx/xftshcit.hxx	2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xftshcit.hxx	2009-07-09 16:10:52.000000000 +0100
@@ -45,7 +45,7 @@
 public:
 			TYPEINFO();
 			XFormTextShadowColorItem() {}
-			XFormTextShadowColorItem(long nIndex, const Color& rTheColor);
+			XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor);
 			XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
 			XFormTextShadowColorItem(SvStream& rIn);
 
diff -ru svx.orig/inc/svx/xit.hxx svx/inc/svx/xit.hxx
--- svx.orig/inc/svx/xit.hxx	2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xit.hxx	2009-07-09 15:29:13.000000000 +0100
@@ -54,7 +54,7 @@
 //-------------------
 class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem
 {
-	long    nPalIndex;
+	INT32    nPalIndex;
 
 protected:
 	void    Detach()    { nPalIndex = -1; }
@@ -62,7 +62,7 @@
 public:
 			TYPEINFO();
 			NameOrIndex() { nPalIndex = -1; }
-			NameOrIndex(USHORT nWhich, long nIndex);
+			NameOrIndex(USHORT nWhich, INT32 nIndex);
 			NameOrIndex(USHORT nWhich,
 						const String& rName= String());
 			NameOrIndex(USHORT nWhich, SvStream& rIn);
@@ -76,8 +76,8 @@
 
 			String       GetName() const              { return GetValue();   }
 			void         SetName(const String& rName) { SetValue(rName);     }
-			long         GetIndex() const             { return nPalIndex;    }
-			void         SetIndex(long nIndex)        { nPalIndex = nIndex;  }
+			INT32        GetIndex() const             { return nPalIndex;    }
+			void         SetIndex(INT32 nIndex)        { nPalIndex = nIndex;  }
 			BOOL         IsIndex() const          { return (nPalIndex >= 0); }
 
 	/** this static checks if the given NameOrIndex item has a unique name for its value.
diff -ru svx.orig/inc/svx/xlnclit.hxx svx/inc/svx/xlnclit.hxx
--- svx.orig/inc/svx/xlnclit.hxx	2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xlnclit.hxx	2009-07-09 16:34:06.000000000 +0100
@@ -42,7 +42,7 @@
 public:
 			TYPEINFO();
 			XLineColorItem() {}
-			XLineColorItem(long nIndex, const Color& rTheColor);
+			XLineColorItem(INT32 nIndex, const Color& rTheColor);
 			XLineColorItem(const String& rName, const Color& rTheColor);
 			XLineColorItem(SvStream& rIn);
 
diff -ru svx.orig/inc/svx/xlndsit.hxx svx/inc/svx/xlndsit.hxx
--- svx.orig/inc/svx/xlndsit.hxx	2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xlndsit.hxx	2009-07-09 16:34:14.000000000 +0100
@@ -50,7 +50,7 @@
 public:
 							TYPEINFO();
 							XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
-							XLineDashItem(long nIndex, const XDash& rTheDash);
+							XLineDashItem(INT32 nIndex, const XDash& rTheDash);
 							XLineDashItem(const String& rName, const XDash& rTheDash);
 							XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
 							XLineDashItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xlnedit.hxx svx/inc/svx/xlnedit.hxx
--- svx.orig/inc/svx/xlnedit.hxx	2009-07-09 15:28:14.000000000 +0100
+++ svx/inc/svx/xlnedit.hxx	2009-07-09 16:31:26.000000000 +0100
@@ -46,7 +46,7 @@
 
 public:
 			TYPEINFO();
-			XLineEndItem(long nIndex = -1);
+			XLineEndItem(INT32 nIndex = -1);
 			XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
 			XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
 			XLineEndItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xlnstit.hxx svx/inc/svx/xlnstit.hxx
--- svx.orig/inc/svx/xlnstit.hxx	2009-07-09 15:28:14.000000000 +0100
+++ svx/inc/svx/xlnstit.hxx	2009-07-09 16:32:26.000000000 +0100
@@ -46,7 +46,7 @@
 
 public:
 			TYPEINFO();
-			XLineStartItem(long nIndex = -1);
+			XLineStartItem(INT32 nIndex = -1);
 			XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
 			XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
 			XLineStartItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xsflclit.hxx svx/inc/svx/xsflclit.hxx
--- svx.orig/inc/svx/xsflclit.hxx	2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xsflclit.hxx	2009-07-09 16:31:12.000000000 +0100
@@ -41,7 +41,7 @@
 public:
 			TYPEINFO();
 			XSecondaryFillColorItem() {}
-			XSecondaryFillColorItem(long nIndex, const Color& rTheColor);
+			XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
 			XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
 			XSecondaryFillColorItem(SvStream& rIn);
 
diff -ru svx.orig/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr.cxx
--- svx.orig/source/xoutdev/xattr.cxx	2009-07-09 15:26:56.000000000 +0100
+++ svx/source/xoutdev/xattr.cxx	2009-07-09 16:32:04.000000000 +0100
@@ -66,6 +66,8 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 
+#include <stdio.h>
+
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
@@ -108,7 +110,7 @@
 
 /*************************************************************************
 |*
-|*	  NameOrIndex::NameOrIndex(USHORT nWhich, long nIndex)
+|*	  NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	14.11.94
@@ -116,7 +118,7 @@
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, long nIndex) :
+NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
 	SfxStringItem(_nWhich, aNameOrIndexEmptyString),
 	nPalIndex(nIndex)
 {
@@ -134,7 +136,7 @@
 
 NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
 	SfxStringItem(_nWhich, rName),
-	nPalIndex((long)-1)
+	nPalIndex(-1)
 {
 }
 
@@ -230,7 +233,7 @@
 SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
 {
 	SfxStringItem::Store( rOut, nItemVersion );
-	rOut << (INT32)nPalIndex;
+	rOut << nPalIndex;
 	return rOut;
 }
 
@@ -369,11 +373,11 @@
 
 /*************************************************************************
 |*
-|*	  XColorItem::XColorItem(USHORT nWhich, long nIndex, const Color& rTheColor)
+|*	  XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, long nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
 	NameOrIndex(_nWhich, nIndex),
 	aColor(rTheColor)
 {
@@ -884,7 +888,7 @@
 
 /*************************************************************************
 |*
-|*	  XLineDashItem::XLineDashItem(long nIndex, const XDash& rTheDash)
+|*	  XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	15.11.94
@@ -892,7 +896,7 @@
 |*
 *************************************************************************/
 
-XLineDashItem::XLineDashItem(long nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
 	NameOrIndex(XATTR_LINEDASH, nIndex),
 	aDash(rTheDash)
 {
@@ -1501,7 +1505,7 @@
 
 /*************************************************************************
 |*
-|*	  XLineColorItem::XLineColorItem(long nIndex, const Color& rTheColor)
+|*	  XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	15.11.94
@@ -1509,7 +1513,7 @@
 |*
 *************************************************************************/
 
-XLineColorItem::XLineColorItem(long nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
 	XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
 {
 }
@@ -1720,7 +1724,7 @@
 
 /*************************************************************************
 |*
-|*	  XLineStartItem::XLineStartItem(long nIndex)
+|*	  XLineStartItem::XLineStartItem(INT32 nIndex)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	15.11.94
@@ -1728,7 +1732,7 @@
 |*
 *************************************************************************/
 
-XLineStartItem::XLineStartItem(long nIndex) 
+XLineStartItem::XLineStartItem(INT32 nIndex) 
 :	NameOrIndex(XATTR_LINESTART, nIndex)
 {
 }
@@ -2192,7 +2196,7 @@
 
 /*************************************************************************
 |*
-|*	  XLineEndItem::XLineEndItem(long nIndex)
+|*	  XLineEndItem::XLineEndItem(INT32 nIndex)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	15.11.94
@@ -2200,7 +2204,7 @@
 |*
 *************************************************************************/
 
-XLineEndItem::XLineEndItem(long nIndex) 
+XLineEndItem::XLineEndItem(INT32 nIndex) 
 :	NameOrIndex(XATTR_LINEEND, nIndex)
 {
 }
@@ -2664,7 +2668,7 @@
 
 /*************************************************************************
 |*
-|*	  XLineStartWidthItem::XLineStartWidthItem(long nWidth)
+|*	  XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	15.11.94
@@ -3249,7 +3253,7 @@
 
 /*************************************************************************
 |*
-|*	  XFillColorItem::XFillColorItem(long nIndex, const Color& rTheColor)
+|*	  XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
 |*
 |*	  Beschreibung
 |*	  Ersterstellung	15.11.94
@@ -3257,7 +3261,7 @@
 |*
 *************************************************************************/
 
-XFillColorItem::XFillColorItem(long nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
 	XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
 {
 }
@@ -3372,7 +3376,7 @@
 // -----------------------------
 TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
 
-XSecondaryFillColorItem::XSecondaryFillColorItem(long nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
 	XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
 {
 }
@@ -3510,7 +3514,7 @@
 
 /*************************************************************************
 |*
-|*	  XFillGradientItem::XFillGradientItem(long nIndex,
+|*	  XFillGradientItem::XFillGradientItem(INT32 nIndex,
 |*										 const XGradient& rTheGradient)
 |*
 |*	  Beschreibung
@@ -3519,7 +3523,7 @@
 |*
 *************************************************************************/
 
-XFillGradientItem::XFillGradientItem(long nIndex,
+XFillGradientItem::XFillGradientItem(INT32 nIndex,
 								   const XGradient& rTheGradient) :
 	NameOrIndex(XATTR_FILLGRADIENT, nIndex),
 	aGradient(rTheGradient)
@@ -4042,7 +4046,7 @@
 
 //------------------------------------------------------------------------
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( long nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
 	XFillGradientItem	( nIndex, rGradient ),
 	bEnabled			( bEnable )
 {
@@ -4246,7 +4250,7 @@
 
 /*************************************************************************
 |*
-|*	  XFillHatchItem::XFillHatchItem(long nIndex,
+|*	  XFillHatchItem::XFillHatchItem(INT32 nIndex,
 |*								   const XHatch& rTheHatch)
 |*
 |*	  Beschreibung
@@ -4255,7 +4259,7 @@
 |*
 *************************************************************************/
 
-XFillHatchItem::XFillHatchItem(long nIndex,
+XFillHatchItem::XFillHatchItem(INT32 nIndex,
 							 const XHatch& rTheHatch) :
 	NameOrIndex(XATTR_FILLHATCH, nIndex),
 	aHatch(rTheHatch)
@@ -5258,7 +5262,7 @@
 |*
 *************************************************************************/
 
-XFormTextShadowColorItem::XFormTextShadowColorItem(long nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
 													 const Color& rTheColor) :
 	XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
 {

workspace.cmcfixes62.patch:
 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx               |    1 
 binfilter/prj/build.lst                                     |    2 
 connectivity/source/drivers/odbcbase/OConnection.cxx        |    2 
 connectivity/source/drivers/odbcbase/OPreparedStatement.cxx |   16 -
 connectivity/source/drivers/odbcbase/OResultSet.cxx         |    6 
 connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx |    8 
 connectivity/source/drivers/odbcbase/OStatement.cxx         |    8 
 connectivity/source/drivers/odbcbase/OTools.cxx             |   70 ++---
 connectivity/source/inc/odbc/OFunctiondefs.hxx              |    8 
 connectivity/source/inc/odbc/OFunctions.hxx                 |   44 +--
 connectivity/source/inc/odbc/OResultSet.hxx                 |    2 
 connectivity/source/inc/odbc/OResultSetMetaData.hxx         |    4 
 connectivity/source/inc/odbc/OStatement.hxx                 |    2 
 connectivity/source/inc/odbc/OTools.hxx                     |   12 
 dbaccess/source/ui/dlg/odbcconfig.cxx                       |    8 
 dmake/dag.c                                                 |    9 
 dmake/expand.c                                              |   26 +-
 dmake/getinp.c                                              |    6 
 dmake/make.c                                                |   15 -
 dmake/path.c                                                |   10 
 dmake/rulparse.c                                            |    5 
 postprocess/prj/build.lst                                   |    2 
 sfx2/inc/pch/precompiled_sfx2.hxx                           |    1 
 sfx2/source/appl/sfxpicklist.cxx                            |    4 
 sfx2/source/doc/objstor.cxx                                 |    3 
 sfx2/util/makefile.mk                                       |    1 
 shell/inc/systemshell.hxx                                   |   53 ----
 shell/prj/build.lst                                         |    3 
 shell/prj/d.lst                                             |    4 
 shell/source/unix/sysshell/makefile.mk                      |    4 
 shell/source/unix/sysshell/recently_used_file_handler.cxx   |    1 
 shell/source/unix/sysshell/systemshell.cxx                  |  151 ------------
 solenv/inc/libs.mk                                          |    2 
 vcl/aqua/inc/salinst.h                                      |    2 
 vcl/aqua/source/app/salinst.cxx                             |   55 ++++
 vcl/inc/vcl/salinst.hxx                                     |    1 
 vcl/inc/vcl/svapp.hxx                                       |   14 +
 vcl/os2/inc/salinst.h                                       |    1 
 vcl/os2/source/app/salinst.cxx                              |    4 
 vcl/source/app/svapp.cxx                                    |    6 
 vcl/unx/gtk/app/gtkinst.cxx                                 |   21 +
 vcl/unx/headless/svpinst.cxx                                |    4 
 vcl/unx/headless/svpinst.hxx                                |    2 
 vcl/unx/inc/plugins/gtk/gtkinst.hxx                         |    1 
 vcl/unx/inc/salinst.h                                       |    1 
 vcl/unx/source/app/salinst.cxx                              |   20 +
 vcl/win/inc/salinst.h                                       |    1 
 vcl/win/source/app/salinst.cxx                              |   23 +
 48 files changed, 298 insertions(+), 351 deletions(-)

--- NEW FILE workspace.cmcfixes62.patch ---
Index: dbaccess/source/ui/dlg/odbcconfig.cxx
===================================================================
--- dbaccess/source/ui/dlg/odbcconfig.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ dbaccess/source/ui/dlg/odbcconfig.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -82,7 +82,7 @@
 // so don't touch this
 #if defined(WIN) || defined(WNT)
 #define SQL_API __stdcall
-// At least under some circumstances, the below #include <odbc/sqlext.h> re-
+// At least under some circumstances, the below #include <sqlext.h> re-
 // defines SQL_API to an empty string, leading to a compiler warning on MSC; to
 // not break the current behavior, this is worked around by locally disabling
 // that warning:
@@ -97,13 +97,7 @@
 #define DONT_TD_VOID
 #endif
 
-#ifdef SYSTEM_ODBC_HEADERS
 #include <sqlext.h>
-#else
-#ifndef __SQLEXT_H
-#include <odbc/sqlext.h>
-#endif
-#endif
 
 #if defined(WIN) || defined(WNT)
 #if defined _MSC_VER
Index: sfx2/source/doc/objstor.cxx
===================================================================
--- sfx2/source/doc/objstor.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/source/doc/objstor.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -99,7 +99,6 @@
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <shell/systemshell.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/documentconstants.hxx>
@@ -821,7 +820,7 @@
                 if ( aUrl.GetProtocol() == INET_PROT_FILE )
                 {
                     const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
-                    SystemShell::AddToRecentDocumentList(
+                    Application::AddToRecentDocumentList(
                         aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
                         (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
                 }
Index: sfx2/source/appl/sfxpicklist.cxx
===================================================================
--- sfx2/source/appl/sfxpicklist.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/source/appl/sfxpicklist.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -43,8 +43,6 @@
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <shell/systemshell.hxx>
-
 // ----------------------------------------------------------------------------
 
 #include <sfx2/app.hxx>
@@ -470,7 +468,7 @@
                 pDocSh->Get_Impl()->bWaitingForPicklist = sal_False;
 
                 if ( aURL.GetProtocol() == INET_PROT_FILE )
-                    SystemShell::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
+                    Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
 			}
             break;
 		}
Index: sfx2/inc/pch/precompiled_sfx2.hxx
===================================================================
--- sfx2/inc/pch/precompiled_sfx2.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/inc/pch/precompiled_sfx2.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -484,7 +484,6 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
 #include "sj2/sjapplet.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
Index: sfx2/util/makefile.mk
===================================================================
--- sfx2/util/makefile.mk	(.../tags/DEV300_m55)	(revision 275310)
+++ sfx2/util/makefile.mk	(.../cws/cmcfixes62)	(revision 275310)
@@ -91,7 +91,6 @@
 		$(TOOLSLIB) \
 		$(I18NISOLANGLIB) \
 		$(SAXLIB) \
-		$(SYSSHELLLIB) \
 		$(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
 		$(CPPUHELPERLIB) \
Index: vcl/source/app/svapp.cxx
===================================================================
--- vcl/source/app/svapp.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/source/app/svapp.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -1989,6 +1989,12 @@
     return SalGetDesktopEnvironment();
 }
 
+void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    ImplSVData* pSVData = ImplGetSVData();
+    pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
+}
+
 BOOL Application::IsAccessibilityEnabled()
 {
     return FALSE;
Index: vcl/os2/source/app/salinst.cxx
===================================================================
--- vcl/os2/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/os2/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -811,6 +811,10 @@
 	return (void*) "";
 }
 
+void Os2SalInstance::AddToRecentDocumentList(const rtl::OUString& /*rFileUrl*/, const rtl::OUString& /*rMimeType*/)
+{
+}
+
 // -----------------------------------------------------------------------
 
 SalTimer* Os2SalInstance::CreateSalTimer()
Index: vcl/os2/inc/salinst.h
===================================================================
--- vcl/os2/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/os2/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -96,6 +96,7 @@
     virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void				AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSalFrameStyle );
Index: vcl/aqua/source/app/salinst.cxx
===================================================================
--- vcl/aqua/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/aqua/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -55,6 +55,14 @@
 #include "saltimer.h"
 #include "vclnsapp.h"
 
+#include <comphelper/processfactory.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
+#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include "premac.h"
 #include <Foundation/Foundation.h>
 #include <ApplicationServices/ApplicationServices.h>
@@ -64,6 +72,7 @@
 
 
 using namespace std;
+using namespace ::com::sun::star;
 
 extern BOOL ImplSVMain();
 
@@ -1017,6 +1026,52 @@
 	return (void*)"";
 }
 
+// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
+// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+{
+    rtl::OUString extUrl;
+        
+    uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
+    if (sm.is())
+    {
+        uno::Reference< beans::XPropertySet > pset;
+        sm->queryInterface( getCppuType( &pset )) >>= pset;
+        if (pset.is())
+        {
+            uno::Reference< uno::XComponentContext > context;
+            static const rtl::OUString DEFAULT_CONTEXT( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) );
+            pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
+            if (context.is())
+                extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl);
+        }
+    }
+    return extUrl;
+}
+
+void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+    // Convert file URL for external use (see above)
+    rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
+    if( 0 == externalUrl.getLength() )
+        externalUrl = rFileUrl;
+    
+    if( externalUrl.getLength() )
+    {
+        NSString* pString = [[NSString alloc] initWithCharacters: externalUrl.getStr() length: externalUrl.getLength()];
+        NSURL* pURL = [NSURL URLWithString: pString];
+
+        if( pURL )
+        {
+            NSDocumentController* pCtrl = [NSDocumentController sharedDocumentController];
+            [pCtrl noteNewRecentDocumentURL: pURL];
+        }
+        if( pString )
+            [pString release];
+    }
+}
+
+
 // -----------------------------------------------------------------------
 
 SalTimer* AquaSalInstance::CreateSalTimer()
Index: vcl/aqua/inc/salinst.h
===================================================================
--- vcl/aqua/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/aqua/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -143,9 +143,11 @@
     virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
     virtual void            SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
     virtual void            SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
 
+
     static void handleAppDefinedEvent( NSEvent* pEvent );
     
     // check whether a particular string is passed on the command line
Index: vcl/inc/vcl/salinst.hxx
===================================================================
--- vcl/inc/vcl/salinst.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/inc/vcl/salinst.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -171,6 +171,7 @@
 
     enum ConnectionIdentifierType { AsciiCString, Blob };
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
+    virtual void        AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
 };
 
 // called from SVMain
Index: vcl/inc/vcl/svapp.hxx
===================================================================
--- vcl/inc/vcl/svapp.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/inc/vcl/svapp.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -479,6 +479,20 @@
      */
     static const ::rtl::OUString& GetDesktopEnvironment();
 
+    /** Add a file to the system shells recent document list if there is any.
+          This function may have no effect under Unix because there is no 
+          standard API among the different desktop managers.
+          
+          @param rFileUrl
+                    The file url of the document.
+                    
+          @param rMimeType
+          The mime content type of the document specified by aFileUrl.
+          If an empty string will be provided "application/octet-stream"
+          will be used.
+    */
+    static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
 private:
 
     DECL_STATIC_LINK( Application, PostEventHandler, void* );
Index: vcl/unx/source/app/salinst.cxx
===================================================================
--- vcl/unx/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <osl/module.hxx>
 #include <salunx.h>
 
 #ifndef _VOS_MUTEX_HXX
@@ -276,3 +276,21 @@
 {
 	delete pFrame;
 }
+
+extern "C" { static void SAL_CALL thisModule() {} }
+
+void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+    const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST(RTL_CONSTASCII_USTRINGPARAM("add_to_recently_used_file_list"));
+    const rtl::OUString LIB_RECENT_FILE(RTL_CONSTASCII_USTRINGPARAM("librecentfile.so"));
+    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
+
+    PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
+
+    osl::Module module;
+    module.loadRelative( &thisModule, LIB_RECENT_FILE );
+    if (module.is())
+        add_to_recently_used_file_list = (PFUNC_ADD_TO_RECENTLY_USED_LIST)module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST);
+    if (add_to_recently_used_file_list)
+        add_to_recently_used_file_list(rFileUrl, rMimeType);
+}
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
--- vcl/unx/gtk/app/gtkinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/gtk/app/gtkinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -206,6 +206,27 @@
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
+void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+#if GTK_CHECK_VERSION(2,10,0)
+    GtkRecentManager *manager = gtk_recent_manager_get_default ();
+    gtk_recent_manager_add_item (manager, rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+    (void)rMimeType;
+#else
+    static void * (* sym_gtk_recent_manager_get_default) () =
+        (void * (*)())dlsym(NULL, "gtk_recent_manager_get_default");
+    static void   (* sym_gtk_recent_manager_add_item) (void *, const char *) = 
+        (void (*)(void *, const char*))dlsym(NULL, "gtk_recent_manager_add_item");
+    if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item)
+    {
+        sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(),
+            rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+    }
+    else
+        X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType);
+#endif
+}
+
 GtkYieldMutex::GtkYieldMutex()
 {
 }
Index: vcl/unx/headless/svpinst.cxx
===================================================================
--- vcl/unx/headless/svpinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/headless/svpinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -504,6 +504,10 @@
 	}
 }
 
+void SvpSalInstance::AddToRecentDocumentList(const rtl::OUString&, const rtl::OUString&)
+{
+}
+
 SvpSalTimer::~SvpSalTimer()
 {
 }
Index: vcl/unx/headless/svpinst.hxx
===================================================================
--- vcl/unx/headless/svpinst.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/headless/svpinst.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -193,6 +193,8 @@
     virtual SalSession*		CreateSalSession();
 
     virtual void*			GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 #endif // _SV_SALINST_HXX
Index: vcl/unx/inc/plugins/gtk/gtkinst.hxx
===================================================================
--- vcl/unx/inc/plugins/gtk/gtkinst.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/inc/plugins/gtk/gtkinst.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -91,6 +91,7 @@
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
     virtual SalObject*			CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
     virtual SalSystem*			CreateSalSystem();
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
 
 class GtkSalSystem : public X11SalSystem
Index: vcl/unx/inc/salinst.h
===================================================================
--- vcl/unx/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/unx/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -115,6 +115,7 @@
 
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
 
+    virtual void            AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
     bool isPrinterInit() const 
     {
Index: vcl/win/source/app/salinst.cxx
===================================================================
--- vcl/win/source/app/salinst.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/win/source/app/salinst.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -39,7 +39,7 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
-
+#include <osl/file.hxx>
 #include <vos/mutex.hxx>
 #include <tools/debug.hxx>
 #include <wincomp.hxx>
@@ -70,6 +70,7 @@
 #include <GdiPlus.h>
 #include <GdiPlusEnums.h>
 #include <GdiPlusColor.h>
+#include <Shlobj.h>
 
 #if defined _MSC_VER
 #pragma warning(pop)
@@ -1089,6 +1090,26 @@
 
 // -----------------------------------------------------------------------
 
+/** Add a file to the system shells recent document list if there is any.
+      This function may have no effect under Unix because there is no 
+      standard API among the different desktop managers.
+      
+      @param aFileUrl
+                The file url of the document.
+*/
+void WinSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+    rtl::OUString system_path;
+    osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(rFileUrl, system_path);
+    
+    OSL_ENSURE(osl::FileBase::E_None == rc, "Invalid file url");
+    
+    if (osl::FileBase::E_None == rc)
+        SHAddToRecentDocs(SHARD_PATHW, system_path.getStr());        
+}
+
+// -----------------------------------------------------------------------
+
 SalTimer* WinSalInstance::CreateSalTimer()
 {
 	return new WinSalTimer();
Index: vcl/win/inc/salinst.h
===================================================================
--- vcl/win/inc/salinst.h	(.../tags/DEV300_m55)	(revision 275310)
+++ vcl/win/inc/salinst.h	(.../cws/cmcfixes62)	(revision 275310)
@@ -88,6 +88,7 @@
     virtual void				DestroyMenuItem( SalMenuItem* );
     virtual SalSession*                         CreateSalSession();
     virtual void*				GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
     static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
 };
Index: shell/source/unix/sysshell/systemshell.cxx
===================================================================
--- shell/source/unix/sysshell/systemshell.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/source/unix/sysshell/systemshell.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,151 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: systemshell.cxx,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_shell.hxx"
-#include "systemshell.hxx"
-
-#include <comphelper/processfactory.hxx>
-
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_Hpp_
-#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
-#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include "osl/module.hxx"
-
-using namespace ::com::sun::star;
-
-#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
-
-const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST = UNISTRING("add_to_recently_used_file_list");
-const rtl::OUString LIB_RECENT_FILE = UNISTRING("librecentfile.so");
-const rtl::OUString DEFAULT_CONTEXT = UNISTRING("DefaultContext");
-
-void * (* sym_gtk_recent_manager_get_default) () = NULL;
-void   (* sym_gtk_recent_manager_add_item) (void *, const char *) = NULL;
-
-// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
-// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
-{
-	rtl::OUString extUrl;
-		
-	uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
-	if (sm.is())
-	{
-		uno::Reference< beans::XPropertySet > pset;
-		sm->queryInterface( getCppuType( &pset )) >>= pset;
-		if (pset.is())
-		{
-			uno::Reference< uno::XComponentContext > context;
-			pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
-			if (context.is())
-				extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl);
-		}
-	}
-	return extUrl;
-}
-
-namespace SystemShell {
-    
-    typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
-        
-    //##############################
-    rtl::OUString get_absolute_library_url(const rtl::OUString& /*lib_name*/)
-    {
-        rtl::OUString url;
-        if (osl::Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(AddToRecentDocumentList), url))
-        {        
-            sal_Int32 index = url.lastIndexOf('/');
-            url = url.copy(0, index + 1);
-            url += LIB_RECENT_FILE;
-        }
-        return url;
-    }
-    
-    bool init_recent_manager_api()
-    {
-        oslModule hDefault;
-        if( osl_getModuleHandle( NULL, &hDefault ) )
-        {
-            sym_gtk_recent_manager_get_default = (void * (*)())
-                osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_get_default");
-            sym_gtk_recent_manager_add_item = (void (*)(void *, const char *)) 
-                osl_getAsciiFunctionSymbol(hDefault, "gtk_recent_manager_add_item");
-            
-        }
-        bool ret = (NULL != sym_gtk_recent_manager_get_default) && (NULL != sym_gtk_recent_manager_add_item);
-        return ret;
-    }
-            
-    
-    //##############################
-    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType)
-    {
-        static bool bIsRecentManagerPresent = init_recent_manager_api();
-        
-        // Convert file URL for external use (see above)
-        rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
-        if( 0 == externalUrl.getLength() )
-            externalUrl = aFileUrl;
-        
-        if( bIsRecentManagerPresent )
-        {
-            void * recent_manager = sym_gtk_recent_manager_get_default();
-            sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringToOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr());
-        }
-        else
-        {
-            rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
-        
-            if (librecentfile_url.getLength())
-            {
-                osl::Module module(librecentfile_url);
-
-                if (module.is())
-                {
-                    // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
-                    // not allowed in gcc 3.3 without permissive.
-                    PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 
-                        reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>(module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST));
-                
-                    if (add_to_recently_used_file_list)
-                        add_to_recently_used_file_list(aFileUrl, aMimeType);
-                }
-            }
-        }        
-    }
-    
-} // namespace SystemShell
-
Index: shell/source/unix/sysshell/recently_used_file_handler.cxx
===================================================================
--- shell/source/unix/sysshell/recently_used_file_handler.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
  
-#include "systemshell.hxx"
 #include "osl/process.h"
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
Index: shell/source/unix/sysshell/makefile.mk
===================================================================
--- shell/source/unix/sysshell/makefile.mk	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/source/unix/sysshell/makefile.mk	(.../cws/cmcfixes62)	(revision 275310)
@@ -48,10 +48,6 @@
 
 .IF "$(OS)" != "MACOSX"
 
-LIB1OBJFILES=$(SLO)$/systemshell.obj
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
-
 SLOFILES=$(SLO)$/recently_used_file.obj \
          $(SLO)$/recently_used_file_handler.obj
 
Index: shell/inc/systemshell.hxx
===================================================================
--- shell/inc/systemshell.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/inc/systemshell.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: systemshell.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SYSTEMSHELL_HXX_
-#define _SYSTEMSHELL_HXX_
-
-#include <rtl/ustring.hxx>
-
-namespace SystemShell
-{
-    /** Add a file to the system shells recent document list if there is any.
-          This function may have no effect under Unix because there is no 
-          standard API among the different desktop managers.
-          
-          @param aFileUrl
-                    The file url of the document.
-					
-		  @param aMimeType
-		  The mime content type of the document specified by aFileUrl.
-		  If an empty string will be provided "application/octet-stream"
-		  will be used.
-    */
-    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType);
-}
-
-#endif
Index: shell/prj/build.lst
===================================================================
--- shell/prj/build.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/prj/build.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -10,9 +10,6 @@
 sl    shell\source\cmdmail                         nmake   -   p   sl_cmdmail sl_inc NULL
 sl    shell\source\all                             nmake   -   all sl_all sl_inc NULL
 sl    shell\source\unix\sysshell                   nmake   -   u   sl_unix_sysshell sl_all sl_inc NULL
-sl    shell\source\aqua\sysshell                   nmake   -   u   sl_aqua_sysshell sl_all sl_inc NULL
-sl    shell\source\win32\sysshell                  nmake   -   w   sl_win32_sysshell sl_inc NULL
-sl    shell\source\os2\sysshell                    nmake   -   p   sl_os2_sysshell sl_inc NULL
 sl    shell\source\tools\lngconvex                 nmake   -   w   sl_win32_lngconv sl_inc NULL
 sl    shell\source\tools\regsvrex                  nmake   -   w   sl_win32_regsvrex  sl_inc NULL
 sl    shell\source\all\zipfile                     nmake   -   w   sl_all_zipfile  sl_inc NULL
Index: shell/prj/d.lst
===================================================================
--- shell/prj/d.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ shell/prj/d.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,7 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\shell
-
-..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx
-
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
 ..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
Index: connectivity/source/inc/odbc/OResultSet.hxx
===================================================================
--- connectivity/source/inc/odbc/OResultSet.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OResultSet.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -128,7 +128,7 @@
 			typedef ::std::vector<ORowSetValue>			TDataRow;
 
 			TVoidVector									m_aBindVector;
-			::std::vector<sal_Int32>					m_aLengthVector;
+			::std::vector<SQLLEN>						m_aLengthVector;
             ::std::map<sal_Int32,SWORD>					m_aODBCColumnTypes;
 			::com::sun::star::uno::Sequence<sal_Int8>	m_aBookmark;
 
Index: connectivity/source/inc/odbc/OResultSetMetaData.hxx
===================================================================
--- connectivity/source/inc/odbc/OResultSetMetaData.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OResultSetMetaData.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -80,13 +80,13 @@
 			virtual ~OResultSetMetaData();
 
 
-            static  SWORD getNumColAttrib(OConnection* _pConnection
+            static SQLLEN getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-            static SWORD getColumnODBCType(OConnection* _pConnection
+            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
Index: connectivity/source/inc/odbc/OTools.hxx
===================================================================
--- connectivity/source/inc/odbc/OTools.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OTools.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -197,7 +197,7 @@
 			static ::rtl::OUString getStringValue(	OConnection* _pConnection,	
 													SQLHANDLE _aStatementHandle,
 													sal_Int32 columnIndex,
-													SWORD  _fSqlType,
+													SQLSMALLINT _fSqlType,
 													sal_Bool &_bWasNull,
 													const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 													rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -205,7 +205,7 @@
 			static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,	
 																			SQLHANDLE _aStatementHandle,
 																			sal_Int32 columnIndex,
-																			SWORD  _fSqlType,
+																			SQLSMALLINT _fSqlType,
 																			sal_Bool &_bWasNull,
 																			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 			static void getValue(	OConnection* _pConnection,	
@@ -215,7 +215,7 @@
 									sal_Bool &_bWasNull,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 									void* _pValue,
-									SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+									SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
 			/** 
 				bindData copies the from pValue to pData
@@ -229,10 +229,10 @@
 			static void bindData(	SQLSMALLINT _nOdbcType,
 									sal_Bool _bUseWChar,
 									sal_Int8 *&_pData,
-									SQLINTEGER*& pLen,
+									SQLLEN*& pLen,
 									const void* _pValue,
 									rtl_TextEncoding _nTextEncoding,
-									SQLUINTEGER& _nColumnSize);
+									SQLULEN& _nColumnSize);
 
 			static void bindParameter(	OConnection* _pConnection,	
 										SQLHANDLE _hStmt,
@@ -254,7 +254,7 @@
 									SQLSMALLINT _nMaxLen,
 									const void* _pValue,
 									void*		_pData,
-									SQLINTEGER *pLen,
+									SQLLEN *pLen,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 									rtl_TextEncoding _nTextEncoding,
 									sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
Index: connectivity/source/inc/odbc/OStatement.hxx
===================================================================
--- connectivity/source/inc/odbc/OStatement.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OStatement.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -130,7 +130,7 @@
 			*/
 			virtual OResultSet* createResulSet();
 
-            sal_Int32 getRowCount () throw( ::com::sun::star::sdbc::SQLException);
+            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
 
 
 			void disposeResultSet();
Index: connectivity/source/inc/odbc/OFunctiondefs.hxx
===================================================================
--- connectivity/source/inc/odbc/OFunctiondefs.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OFunctiondefs.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -41,7 +41,7 @@
 
 // just to go with calling convention of windows
 #define SQL_API __stdcall
-#include <odbc/sqlext.h>
+#include <sqlext.h>
 #undef SQL_API
 #define SQL_API __stdcall
 
@@ -67,7 +67,7 @@
 #define ALLREADY_HAVE_OS2_TYPES
 #define DONT_TD_VOID
 #include <svpm.h>
-#include <odbc/sqlext.h>
+#include <sqlext.h>
 #define SDB_ODBC_CHAR UCHAR
 #endif // OS2
 
@@ -135,11 +135,7 @@
 #endif
 #define CALLBACK
 #define EXPORT
-#ifdef SYSTEM_ODBC_HEADERS
 #include <sqlext.h>
-#else
-#include <odbc/sqlext.h>
-#endif
 #undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal
 			// definiert.
 
Index: connectivity/source/inc/odbc/OFunctions.hxx
===================================================================
--- connectivity/source/inc/odbc/OFunctions.hxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/inc/odbc/OFunctions.hxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -187,7 +187,7 @@
 													SQLSMALLINT *		StringLengthPtr,
 													SQLSMALLINT *		TypePtr,
 													SQLSMALLINT *		SubTypePtr,
-													SQLINTEGER *		LengthPtr,
+													SQLLEN *			LengthPtr,
 													SQLSMALLINT *		PrecisionPtr,
 													SQLSMALLINT *		ScalePtr,
 													SQLSMALLINT *		NullablePtr);
@@ -203,8 +203,8 @@
 													SQLSMALLINT			Precision,
 													SQLSMALLINT			Scale,
 													SQLPOINTER			DataPtr,
-													SQLINTEGER *		StringLengthPtr,
-													SQLINTEGER *		IndicatorPtr);
+													SQLLEN *			StringLengthPtr,
+													SQLLEN *			IndicatorPtr);
 
 	#define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
 	*/
@@ -221,11 +221,11 @@
 													SQLSMALLINT			InputOutputType,
 													SQLSMALLINT			ValueType,
 													SQLSMALLINT			ParameterType,
-													SQLUINTEGER			ColumnSize,
+													SQLULEN				ColumnSize,
 													SQLSMALLINT			DecimalDigits,
 													SQLPOINTER			ParameterValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
 
@@ -266,7 +266,7 @@
 	typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT			StatementHandle,
 													SQLUSMALLINT		ParameterNumber,
 													SQLSMALLINT *		DataTypePtr,
-													SQLUINTEGER *		ParameterSizePtr,
+													SQLULEN *			ParameterSizePtr,
 													SQLSMALLINT *		DecimalDigitsPtr,
 													SQLSMALLINT *		NullablePtr);
 
@@ -284,13 +284,13 @@
 
 	typedef SQLRETURN  (SQL_API  *T3SQLPutData) (		SQLHSTMT			StatementHandle,
 													SQLPOINTER			DataPtr,
-													SQLINTEGER			StrLen_or_Ind);
+													SQLLEN				StrLen_or_Ind);
 
 	#define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
 
 	// Retrieving results and information about results
 	typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (	SQLHSTMT			StatementHandle,
-													SQLINTEGER *		RowCountPtr);
+													SQLLEN *			RowCountPtr);
 
 	#define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
 
@@ -300,12 +300,12 @@
 	#define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (	SQLHSTMT			StatementHandle,
-													SQLSMALLINT			ColumnNumber,
+													SQLUSMALLINT		ColumnNumber,
 													SQLCHAR *			ColumnName,
 													SQLSMALLINT			BufferLength,
 													SQLSMALLINT *		NameLengthPtr,
 													SQLSMALLINT *		DataTypePtr,
-													SQLUINTEGER *		ColumnSizePtr,
+													SQLULEN *			ColumnSizePtr,
 													SQLSMALLINT *		DecimalDigitsPtr,
 													SQLSMALLINT *		NullablePtr);
 
@@ -317,7 +317,7 @@
 													SQLPOINTER			CharacterAttributePtr,
 													SQLSMALLINT			BufferLength,
 													SQLSMALLINT *		StringLengthPtr,
-													SQLPOINTER			NumericAttributePtr);
+													SQLLEN *			NumericAttributePtr);
 
 	#define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
 
@@ -325,8 +325,8 @@
 													SQLUSMALLINT		ColumnNumber,
 													SQLSMALLINT			TargetType,
 													SQLPOINTER			TargetValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
 
@@ -336,7 +336,7 @@
 
 	typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (	SQLHSTMT			StatementHandle,
 													SQLSMALLINT			FetchOrientation,
-													SQLINTEGER			FetchOffset);
+													SQLLEN				FetchOffset);
 
 	#define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
 
@@ -344,20 +344,20 @@
 													SQLUSMALLINT		ColumnNumber,
 													SQLSMALLINT			TargetType,
 													SQLPOINTER			TargetValuePtr,
-													SQLINTEGER			BufferLength,
-													SQLINTEGER *		StrLen_or_IndPtr);
+													SQLLEN				BufferLength,
+													SQLLEN *			StrLen_or_IndPtr);
 
 	#define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (		SQLHSTMT			StatementHandle,
-													SQLUSMALLINT		RowNumber,
+													SQLSETPOSIROW		RowNumber,
 													SQLUSMALLINT		Operation,
 													SQLUSMALLINT		LockType);
 
 	#define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (	SQLHSTMT		StatementHandle,
-														SQLUSMALLINT	Operation);
+														SQLSMALLINT	Operation);
 
 	#define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
 
@@ -461,15 +461,15 @@
 	#define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
 
 	typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT			StatementHandle,
-													SQLSMALLINT			IdentifierType,
+													SQLUSMALLINT		IdentifierType,
 													SQLCHAR *			CatalogName,
 													SQLSMALLINT			NameLength1,
 													SQLCHAR *			SchemaName,
 													SQLSMALLINT			NameLength2,
 													SQLCHAR *			TableName,
 													SQLSMALLINT			NameLength3,
-													SQLSMALLINT			Scope,
-													SQLSMALLINT			Nullable);
+													SQLUSMALLINT		Scope,
+													SQLUSMALLINT		Nullable);
 
 	#define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
 
Index: connectivity/source/drivers/odbcbase/OConnection.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OConnection.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OConnection.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -108,7 +108,7 @@
 	SQLRETURN nSQLRETURN = 0;
 	SDB_ODBC_CHAR szConnStrOut[4096];
 	SDB_ODBC_CHAR szConnStrIn[2048];
-	SWORD cbConnStrOut;
+	SQLSMALLINT cbConnStrOut;
 	memset(szConnStrOut,'\0',4096);
 	memset(szConnStrIn,'\0',2048);
 	::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding()));
Index: connectivity/source/drivers/odbcbase/OTools.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OTools.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OTools.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -56,16 +56,16 @@
 						sal_Bool &_bWasNull,
 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 						void* _pValue,
-						SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+						SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::getValue" );
-	SQLINTEGER pcbValue = SQL_NULL_DATA;
+	SQLLEN pcbValue = SQL_NULL_DATA;
 	OTools::ThrowException(_pConnection,
 							(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 										(SQLUSMALLINT)columnIndex,
 										_nType,
 										_pValue,
-										(SQLINTEGER)_rSize,
+										_nSize,
 										&pcbValue),
 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
 	_bWasNull = pcbValue == SQL_NULL_DATA;
@@ -86,12 +86,12 @@
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::bindParameter" );
 	SQLRETURN nRetcode;
-	SWORD   fSqlType;
-	SWORD   fCType;
-	SDWORD  nMaxLen = 0;
+	SQLSMALLINT fSqlType;
+	SQLSMALLINT fCType;
+	SQLLEN  nMaxLen = 0;
 	//	void*&   pData   = pDataBuffer;
-	SQLINTEGER* pLen    = (SQLINTEGER*)pLenBuffer;
-	SQLUINTEGER nColumnSize=0;
+	SQLLEN* pLen    = (SQLLEN*)pLenBuffer;
+	SQLULEN nColumnSize=0;
 	SQLSMALLINT	nDecimalDigits=0;
 
 	OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType);
@@ -123,10 +123,10 @@
 void OTools::bindData(	SQLSMALLINT _nOdbcType,
 						sal_Bool _bUseWChar,
 						sal_Int8 *&_pData,
-						SQLINTEGER*& pLen,
+						SQLLEN*& pLen,
 						const void* _pValue,
 						rtl_TextEncoding _nTextEncoding,
-						SQLUINTEGER& _nColumnSize)
+						SQLULEN& _nColumnSize)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::bindData" );
 	_nColumnSize = 0;
@@ -222,7 +222,7 @@
 			{
 				sal_Int32 nLen = 0;
                 nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-				*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+				*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 			}
 			break;
 		case SQL_LONGVARCHAR:
@@ -235,21 +235,21 @@
 				::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
 				nLen = aString.getLength();
 			}
-			*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+			*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 		}   break;
 		case SQL_DATE:
 			*(DATE_STRUCT*)_pData = *(DATE_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(DATE_STRUCT);
+			*pLen = (SQLLEN)sizeof(DATE_STRUCT);
 			_nColumnSize = 10;
 			break;
 		case SQL_TIME:
 			*(TIME_STRUCT*)_pData = *(TIME_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(TIME_STRUCT);
+			*pLen = (SQLLEN)sizeof(TIME_STRUCT);
 			_nColumnSize = 8;
 			break;
 		case SQL_TIMESTAMP:
 			*(TIMESTAMP_STRUCT*)_pData = *(TIMESTAMP_STRUCT*)_pValue;
-			*pLen = (SDWORD)sizeof(TIMESTAMP_STRUCT);
+			*pLen = (SQLLEN)sizeof(TIMESTAMP_STRUCT);
 			_nColumnSize = 19;
 			break;
 	}
@@ -262,7 +262,7 @@
 						SQLSMALLINT _nMaxLen,
 						const void* _pValue,
 						void* _pData,
-						SQLINTEGER *pLen,
+						SQLLEN *pLen,
 						const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
 						rtl_TextEncoding _nTextEncoding,
 						sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -271,7 +271,7 @@
 	SQLRETURN nRetcode;
 	SQLSMALLINT   fSqlType;
 	SQLSMALLINT   fCType;
-	SQLSMALLINT   nMaxLen = _nMaxLen;
+	SQLLEN nMaxLen = _nMaxLen;
 
 	OTools::getBindTypes(	sal_False,
 							_bUseOldTimeDate,
@@ -375,7 +375,7 @@
 					_pData = (void*)(columnIndex);
 					sal_Int32 nLen = 0;
                     nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 				}
 					break;
 				case SQL_LONGVARCHAR:
@@ -383,7 +383,7 @@
 					_pData = (void*)(columnIndex);
 					sal_Int32 nLen = 0;
 					nLen = ((::rtl::OUString*)_pValue)->getLength();
-					*pLen = (SDWORD)SQL_LEN_DATA_AT_EXEC(nLen);
+					*pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
 				}   break;
 				case SQL_DATE:
 					*pLen = sizeof(DATE_STRUCT);
@@ -446,10 +446,10 @@
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen at sun.com", "OTools::ThrowException" );
 
 	SDB_ODBC_CHAR szSqlState[5];
-	SDWORD pfNativeError;
+	SQLINTEGER pfNativeError;
 	SDB_ODBC_CHAR szErrorMessage[SQL_MAX_MESSAGE_LENGTH];
 	szErrorMessage[0] = '\0';
-	SWORD pcbErrorMsg = 0;
+	SQLSMALLINT pcbErrorMsg = 0;
 
 	// Informationen zur letzten Operation:
 	// wenn hstmt != SQL_NULL_HSTMT ist (Benutzung von SetStatus in SdbCursor, SdbTable, ...),
@@ -478,7 +478,7 @@
 Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
 										 SQLHANDLE _aStatementHandle,
 										 sal_Int32 columnIndex,
-										 SWORD  _fSqlType,
+										 SQLSMALLINT _fSqlType,
 										 sal_Bool &_bWasNull,
 										 const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
 {
@@ -486,14 +486,14 @@
 	char aCharArray[2048];
 	// Erstmal versuchen, die Daten mit dem kleinen Puffer
 	// abzuholen:
-	SQLINTEGER nMaxLen = sizeof aCharArray - 1;
+	SQLLEN nMaxLen = sizeof aCharArray - 1;
 	//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-	SQLINTEGER pcbValue = 0;
+	SQLLEN pcbValue = 0;
 	OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 										(SQLUSMALLINT)columnIndex,
 										_fSqlType,
 										(SQLPOINTER)aCharArray,
-										(SQLINTEGER)nMaxLen,
+										nMaxLen,
 										&pcbValue),
 							_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 
@@ -540,7 +540,7 @@
 ::rtl::OUString OTools::getStringValue(OConnection* _pConnection,
 									   SQLHANDLE _aStatementHandle,
 									   sal_Int32 columnIndex,
-									   SWORD  _fSqlType,
+									   SQLSMALLINT _fSqlType,
 									   sal_Bool &_bWasNull,
 									   const Reference< XInterface >& _xInterface,
 									   rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
@@ -555,15 +555,15 @@
 		{
 			sal_Unicode waCharArray[2048];
 			// read the unicode data
-			sal_Int32 nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
+			SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1;
 			//	GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode));
 
-			SQLINTEGER pcbValue=0;
+			SQLLEN pcbValue=0;
 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_WCHAR,
 												&waCharArray,
-												(SQLINTEGER)nMaxLen*sizeof(sal_Unicode),
+												(SQLLEN)nMaxLen*sizeof(sal_Unicode),
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 			_bWasNull = pcbValue == SQL_NULL_DATA;
@@ -571,7 +571,7 @@
 				return ::rtl::OUString();
 			// Bei Fehler bricht der GETDATA-Makro mit return ab,
 			// bei NULL mit break!
-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
 			waCharArray[nLen] = 0;
 			aData = ::rtl::OUString(waCharArray);
 
@@ -595,7 +595,7 @@
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_WCHAR,
 												&waCharArray,
-												(SQLINTEGER)nLen+1,
+												(SQLLEN)nLen+1,
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 				nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
@@ -610,21 +610,21 @@
 			char aCharArray[2048];
 			// Erstmal versuchen, die Daten mit dem kleinen Puffer
 			// abzuholen:
-			SDWORD nMaxLen = sizeof aCharArray - 1;
+			SQLLEN nMaxLen = sizeof aCharArray - 1;
 			//	GETDATA(SQL_C_CHAR,aCharArray,nMaxLen);
-			SQLINTEGER pcbValue = 0;
+			SQLLEN pcbValue = 0;
 			OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle,
 												(SQLUSMALLINT)columnIndex,
 												SQL_C_CHAR,
 												&aCharArray,
-												(SQLINTEGER)nMaxLen,
+												nMaxLen,
 												&pcbValue),
 									_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 			_bWasNull = pcbValue == SQL_NULL_DATA;
 			if(_bWasNull)
 				return ::rtl::OUString();
 
-			SQLINTEGER nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
+			SQLLEN nLen = pcbValue != SQL_NO_TOTAL ? std::min(pcbValue, nMaxLen) : (nMaxLen-1);
 			aCharArray[nLen] = 0;
 			if ( ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) && aCharArray[nLen-1] == 0 && nLen > 0 )
 				--nLen;
Index: connectivity/source/drivers/odbcbase/OStatement.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OStatement.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OStatement.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -250,13 +250,13 @@
     m_xResultSet = Reference< XResultSet >();
 }
 //--------------------------------------------------------------------
-sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
+SQLLEN OStatement_Base::getRowCount () throw( SQLException)
 {
 	::osl::MutexGuard aGuard( m_aMutex );
 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 
-	sal_Int32	numRows = 0;
+	SQLLEN numRows = 0;
 
 	try {
 		THROW_SQL(N3SQLRowCount(m_aStatementHandle,&numRows));
@@ -523,7 +523,9 @@
 		SQLRETURN nError = N3SQLMoreResults(m_aStatementHandle);
 		if(nError == SQL_SUCCESS)
 		{
-			N3SQLRowCount(m_aStatementHandle,&pArray[j]);
+			SQLLEN nRowCount=0;
+			N3SQLRowCount(m_aStatementHandle,&nRowCount);
+			pArray[j] = nRowCount;
 		}
 	}
 	return aRet;
Index: connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OPreparedStatement.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -446,11 +446,11 @@
 	checkParameterIndex(parameterIndex);
 
 	sal_Int8* lenBuf = getLengthBuf (parameterIndex);
-	*(SDWORD*)lenBuf = SQL_NULL_DATA;
+	*(SQLLEN*)lenBuf = SQL_NULL_DATA;
 
 
-	SQLINTEGER	prec = 0;
-	SQLUINTEGER nColumnSize = 0;
+	SQLLEN prec = 0;
+	SQLULEN nColumnSize = 0;
 	if (sqlType == SQL_CHAR || sqlType == SQL_VARCHAR || sqlType == SQL_LONGVARCHAR)
 	{
 		prec = 1;
@@ -476,7 +476,7 @@
 											nDecimalDigits,
 											NULL,
 											prec,
-											(SDWORD*)lenBuf
+											(SQLLEN*)lenBuf
 											);
 	OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
@@ -861,7 +861,7 @@
 
     // Bind the parameter with SQL_LEN_DATA_AT_EXEC
 	SQLSMALLINT   Ctype = SQL_C_CHAR;
-	SDWORD	atExec = SQL_LEN_DATA_AT_EXEC (length);
+	SQLLEN	atExec = SQL_LEN_DATA_AT_EXEC (length);
 	memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex));
 	memcpy (lenBuf, &atExec, sizeof (atExec));
 
@@ -872,14 +872,14 @@
 	OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
 	N3SQLBindParameter(m_aStatementHandle,
 						(SQLUSMALLINT)ParameterIndex,
-						(SQLSMALLINT)SQL_PARAM_INPUT,
+						(SQLUSMALLINT)SQL_PARAM_INPUT,
 						Ctype,
 						(SQLSMALLINT)SQLtype,
-						(SQLUINTEGER)length,
+						(SQLULEN)length,
 						0,
 						dataBuf,
 						sizeof(ParameterIndex),
-						(SDWORD*)lenBuf);
+						(SQLLEN*)lenBuf);
 
 	// Save the input stream
 	boundParams[ParameterIndex - 1].setInputStream (x, length);
Index: connectivity/source/drivers/odbcbase/OResultSet.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OResultSet.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OResultSet.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -843,8 +843,8 @@
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-	SQLSMALLINT nMaxLen = 20;
-	SQLINTEGER nRealLen = 0;
+	SQLLEN nMaxLen = 20;
+	SQLLEN nRealLen = 0;
 	Sequence<sal_Int8> aBookmark(nMaxLen);
 
 	SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
@@ -925,7 +925,7 @@
     sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) );
 	if ( bPositionByBookmark )
 	{
-		SQLINTEGER nRealLen = 0;
+		SQLLEN nRealLen = 0;
 		nRet = N3SQLBindCol(m_aStatementHandle,
 							0,
 							SQL_C_VARBOOKMARK,
Index: connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
===================================================================
--- connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -86,13 +86,13 @@
 	return  sValue;
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
+SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
                                               ,sal_Int32 _ident) throw(SQLException, RuntimeException)
 {
-	SWORD nValue=0;
+	SQLLEN nValue=0;
 	OTools::ThrowException(_pConnection,(*(T3SQLColAttribute)_pConnection->getOdbcFunction(ODBC3SQLColAttribute))(_aStatementHandle,
 										 (SQLUSMALLINT)_column,
 										 (SQLUSMALLINT)_ident,
@@ -117,13 +117,13 @@
 	return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
 // -------------------------------------------------------------------------
-SWORD OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
+SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
                                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    SWORD nType = 0;
+    SQLSMALLINT nType = 0;
     try
 	{
 		nType = getNumColAttrib(_pConnection,_aStatementHandle,_xInterface,column,SQL_DESC_CONCISE_TYPE);
Index: solenv/inc/libs.mk
===================================================================
--- solenv/inc/libs.mk	(.../tags/DEV300_m55)	(revision 275310)
+++ solenv/inc/libs.mk	(.../cws/cmcfixes62)	(revision 275310)
@@ -266,7 +266,6 @@
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-SYSSHELLLIB=-lsysshell
 .IF "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -475,7 +474,6 @@
 FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
-SYSSHELLLIB=sysshell.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = cppunit.lib
 XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
Index: binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
===================================================================
--- binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx	(.../tags/DEV300_m55)	(revision 275310)
+++ binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx	(.../cws/cmcfixes62)	(revision 275310)
@@ -138,7 +138,6 @@
 #include <unotools/tempfile.hxx>
 #include <ucbhelper/content.hxx>
 #include <sot/storinfo.hxx>
-#include <shell/systemshell.hxx>
 
 #include "objsh.hxx"
 #include "request.hxx"
Index: binfilter/prj/build.lst
===================================================================
--- binfilter/prj/build.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ binfilter/prj/build.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,4 +1,4 @@
-bf      binfilter :     idl basic goodies xmlscript connectivity framework stoc uui offuh shell NULL
+bf      binfilter :     idl basic goodies xmlscript connectivity framework stoc uui offuh NULL
 bf	binfilter											usr1	-	all	bf_mkout NULL
 bf	binfilter\bf_svtools\source\inc						get		-	all	bf_svt_sinc NULL
 bf  binfilter\bf_svtools\source\config					nmake	-	all bf_svt_config NULL
Index: dmake/dag.c
===================================================================
--- dmake/dag.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/dag.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -369,14 +369,17 @@
 	 /* strip out any \<nl> combinations where \ is the current
 	  * CONTINUATION char */
 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
-	    if( p[1] == '\n' )
-	       strcpy( p, p+2 );
+	    if( p[1] == '\n' ) {
+	       size_t len = strlen(p+2)+1;
+	       memmove ( p, p+2, len );
+	    }
 	    else
 	       p++;
 
 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
 	 if( p != q ) {
-	    strcpy( q, p);
+	    size_t len = strlen(p)+1;
+	    memmove( q, p, len );
 	    p = q;
 	 }
 
Index: dmake/make.c
===================================================================
--- dmake/make.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/make.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -1352,8 +1352,10 @@
        * Nothing in Expand() should be able to change dynamic macros. */
       cmnd = Expand( rp->st_string );
 
-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
-	 strcpy(cmnd,p);
+      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
+	 size_t len = strlen(p)+1;
+	 memmove(cmnd,p,len);
+      }
 
       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
        * possible for the user to reset it to, for example
@@ -1381,8 +1383,10 @@
 	 shell  = ((l_attr & A_SHELL) != 0);
 
 	 /* clean up the attributes that we may have just added. */
-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
-	    strcpy(cmnd,p);
+	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
+	    size_t len = strlen(p)+1;
+	    memmove(cmnd,p,len);
+	 }
       }
 
 #if defined(MSDOS)
@@ -1477,8 +1481,9 @@
    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
       /* Remove the \<nl> sequences. */
       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
+	 size_t len = strlen(n+2)+1;
 	 DB_PRINT( "make", ("fixing [%s]", p) );
-	 strcpy( n, n+2 );
+	 memmove( n, n+2, len );
 	 p = n;
       }
       /* Look for an escape sequence and replace it by it's corresponding
Index: dmake/expand.c
===================================================================
--- dmake/expand.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/expand.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -230,6 +230,7 @@
 char *tok;
 {
    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
+      size_t len;
       switch( tok[1] ) {
 	 case 'a' : *tok = 0x07; break;
 	 case 'b' : *tok = '\b'; break;
@@ -246,13 +247,15 @@
 	    register int j = 0;
 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
 	       j = (j << 3) + (tok[1] - '0');
-	       strcpy( tok+1, tok+2 );
+	       len = strlen(tok+2)+1;
+	       memmove( tok+1, tok+2, len );
 	    }
 	    j = (j << 3) + (tok[1] - '0');
 	    *tok = j;
 	 }
       }
-      strcpy( tok+1, tok+2 );
+      len = strlen(tok+2)+1;
+      memmove( tok+1, tok+2, len );
    }
 }
 
@@ -365,7 +368,8 @@
       if( (e = Basename(s)) != s) {
 	 if( !(mod & DIRECTORY_FLAG) ) {
 	    /* Move the basename to the start. */
-	    strcpy(s, e);
+	    size_t len = strlen(e)+1;
+	    memmove(s, e, len);
 	 }
 	 else
 	    s = e;
@@ -382,7 +386,8 @@
 
       if( !(mod & FILE_FLAG) ) {
 	 /* Move the suffix to the start. */
-	 strcpy( s, e );
+	 size_t len = strlen(e)+1;
+         memmove(s, e, len);
       }
       else
 	 s = e;
@@ -725,8 +730,10 @@
 	      done = !lev;
 	      break;
             } else {
+              size_t len;
 	      s[1] = ' ';
-	      strcpy( s, s+1 );
+              len = strlen(s+1)+1;
+	      memmove( s, s+1, len );
 	    }
 	    /*FALLTHRU*/
 	 case ' ':
@@ -835,8 +842,10 @@
        * converted them to a real space. Let's verify this. */
       for( p=s; *p && *p != edelim && *p; p++ ) {
 	if( p[0] == '\\' && p[1] == '\n' ) {
+	  size_t len;
 	  p[1] = ' ';
-	  strcpy( p, p+1 );
+	  len = strlen(p+1)+1;
+	  memmove( p, p+1, len );
 	}
       }
       if( !*p )
@@ -1120,7 +1129,10 @@
       *flag = 1;
       res   = Expand( start );
 
-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
+      if( (t = DmStrSpn( res, " \t" )) != res ) {
+          size_t len = strlen(t)+1;
+          memmove( res, t, len );
+      }
    }
 
    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
Index: dmake/getinp.c
===================================================================
--- dmake/getinp.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/getinp.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -169,7 +169,8 @@
 	  * text lines on input.  The maximum size of this is governened by
 	  * Buffer_size */
 	    if( q != p && q[-1] == CONTINUATION_CHAR ) {
-	       strcpy( q, q+1 );
+	       size_t len = strlen(q+1)+1;
+	       memmove( q, q+1, len );
 	       q--;
 	       cont = FALSE;
 	    }
@@ -290,7 +291,8 @@
    while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
       if( Comment || State == NORMAL_SCAN )
 	 if( c != str && c[-1] == ESCAPE_CHAR ) {
-	    strcpy( c-1, c );        /* copy it left, due to \# */
+	    size_t len = strlen(c)+1;
+	    memmove( c-1, c, len );  /* copy it left, due to \# */
 	    if( pend ) (*pend)--;    /* shift tail pointer left */
 	 }
 	 else {
Index: dmake/path.c
===================================================================
--- dmake/path.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/path.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -172,6 +172,7 @@
    char *tpath;
    int hasdriveletter = 0;
    int delentry;
+   size_t len;
 
    DB_ENTER( "Clean_path" );
 
@@ -231,14 +232,16 @@
 	    p++;
 	 }
 	 while( *p == *DirSepStr);
-	 strcpy(t+1,p);
+	 len = strlen(p)+1;
+	 memmove(t+1,p,len);
 	 continue;
       }
 
       /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
        * the start of the path. */
       if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
-	 strcpy(q,p+1);
+	 len = strlen(p+1)+1;
+	 memmove(q,p+1,len);
 	 q = tpath;
 	 continue;
       }
@@ -268,7 +271,8 @@
 	 }
 	 while( *t == *DirSepStr);
 	 /* q points to first letter of the current directory/file. */
-	 strcpy(q,t);
+	 len = strlen(t)+1;
+	 memmove(q,t,len);
 	 q = tpath;
       }
       else
Index: dmake/rulparse.c
===================================================================
--- dmake/rulparse.c	(.../tags/DEV300_m55)	(revision 275310)
+++ dmake/rulparse.c	(.../cws/cmcfixes62)	(revision 275310)
@@ -897,7 +897,7 @@
 	 /* Handle %-targets. */
 	 CELLPTR cur;
 	 CELLPTR tpq = NIL(CELL);
-	 CELLPTR nprq;
+	 CELLPTR nprq = NULL;
 
 #ifdef DBUG
 	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
@@ -915,7 +915,8 @@
 
 	    if( *name == '\'' && name[len-1]=='\'' ){
 	       name[len-1] = '\0';
-	       strcpy(name,name+1);
+	       len = strlen(name+1)+1;
+	       memmove(name,name+1,len);
 	       /* add indirect prerequisite */
 	       _add_indirect_prereq( cur );
 	    }
Index: postprocess/prj/build.lst
===================================================================
--- postprocess/prj/build.lst	(.../tags/DEV300_m55)	(revision 275310)
+++ postprocess/prj/build.lst	(.../cws/cmcfixes62)	(revision 275310)
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native shell slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL

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(-)

--- NEW FILE workspace.defaultdoclang.patch ---
Index: reportdesign/source/core/api/ReportComponent.cxx
===================================================================
--- reportdesign/source/core/api/ReportComponent.cxx	(revision 267481)
+++ reportdesign/source/core/api/ReportComponent.cxx	(working copy)
@@ -41,10 +41,12 @@
 #include "ReportControlModel.hxx"
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/text/ParagraphVertAlign.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 // #include <svx/unoshape.hxx>
 #include <svx/unolingu.hxx>
 #include <svtools/syslocale.hxx>
 #include <svtools/lingucfg.hxx>
+#include <i18npool/mslangid.hxx>
 // =============================================================================
 namespace reportdesign
 {
@@ -96,12 +98,14 @@
     try
     {
         SvtLinguConfig aLinguConfig;
+        using namespace ::com::sun::star::i18n::ScriptType;
+
         aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale"))) >>= aCharLocale;
-        LanguageType eCurLang = SvxLocaleToLanguage( aCharLocale );
+        LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocale), LATIN);
         aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK")))  >>= aCharLocaleAsian;
-        LanguageType eCurLangCJK = SvxLocaleToLanguage( aCharLocaleAsian );
+        LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleAsian), ASIAN);
         aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL")))  >>= aCharLocaleComplex;
-        LanguageType eCurLangCTL = SvxLocaleToLanguage( aCharLocaleComplex );
+        LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleComplex), COMPLEX);
 
         Font aLatin,aCJK,aCTL;
         lcl_getDefaultFonts(aLatin,aCJK,aCTL,eCurLang,eCurLangCJK,eCurLangCTL);
Index: linguistic/source/lngopt.cxx
===================================================================
--- linguistic/source/lngopt.cxx	(revision 267481)
+++ linguistic/source/lngopt.cxx	(working copy)
@@ -46,7 +46,9 @@
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <unotools/processfactory.hxx>
+#include <i18npool/mslangid.hxx>
 
 using namespace utl;
 using namespace osl;
@@ -100,13 +102,13 @@
 }
 
 
-BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal)
+BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
 {
 	BOOL bRes = FALSE;
 
 	Locale	aNew;
 	rVal >>= aNew;
-	INT16 nNew = LocaleToLanguage( aNew );
+        INT16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
 	if (nNew != rLanguage)
 	{
 		Locale	aLocale( CreateLocale( rLanguage ) );
@@ -149,17 +151,17 @@
 		case WID_HYPH_MIN_WORD_LENGTH :		pnVal = &pData->nHyphMinWordLength;	break;
 		case WID_DEFAULT_LOCALE :
 		{
-			bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal );
+			bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal, ::com::sun::star::i18n::ScriptType::LATIN );
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CJK :
 		{
-			bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal );
+			bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal, ::com::sun::star::i18n::ScriptType::ASIAN );
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CTL :
 		{
-			bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal );
+			bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal, ::com::sun::star::i18n::ScriptType::COMPLEX );
 			break;
 		}
 		default :
@@ -226,19 +228,19 @@
 		case WID_HYPH_MIN_WORD_LENGTH :		pnVal = &pData->nHyphMinWordLength;	break;
 		case WID_DEFAULT_LOCALE :
 		{
-			Locale aLocale( CreateLocale( pData->nDefaultLanguage ) );
+			Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage ) );
 			rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CJK :
 		{
-			Locale aLocale( CreateLocale( pData->nDefaultLanguage_CJK ) );
+			Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CJK ) );
 			rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
 			break;
 		}
 		case WID_DEFAULT_LOCALE_CTL :
 		{
-			Locale aLocale( CreateLocale( pData->nDefaultLanguage_CTL ) );
+			Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CTL ) );
 			rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
 			break;
 		}
Index: linguistic/source/lngopt.hxx
===================================================================
--- linguistic/source/lngopt.hxx	(revision 267481)
+++ linguistic/source/lngopt.hxx	(working copy)
@@ -77,7 +77,7 @@
 
 	BOOL SetLocale_Impl( INT16 &rLanguage,
 			::com::sun::star::uno::Any &rOld,
-			const ::com::sun::star::uno::Any &rVal);
+			const ::com::sun::star::uno::Any &rVal, sal_Int16 nType );
 
 public:
 	LinguOptions();
Index: sc/source/ui/app/scmod2.cxx
===================================================================
--- sc/source/ui/app/scmod2.cxx	(revision 267481)
+++ sc/source/ui/app/scmod2.cxx	(working copy)
@@ -37,7 +37,8 @@
 
 #include <svx/unolingu.hxx>
 #include <svtools/lingucfg.hxx>
-
+#include <i18npool/mslangid.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
@@ -62,9 +63,9 @@
 	SvtLinguOptions aOptions;
 	aConfig.GetOptions( aOptions );
 
-	rDefLang = aOptions.nDefaultLanguage;
-	rCjkLang = aOptions.nDefaultLanguage_CJK;
-	rCtlLang = aOptions.nDefaultLanguage_CTL;
+	rDefLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
+	rCjkLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
+	rCtlLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
 	rAutoSpell = aOptions.bIsSpellAuto;
 }
 
Index: sd/source/core/drawdoc.cxx
===================================================================
--- sd/source/core/drawdoc.cxx	(revision 267481)
+++ sd/source/core/drawdoc.cxx	(working copy)
@@ -34,6 +34,7 @@
 #include "PageListWatcher.hxx"
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/forbiddencharacterstable.hxx>
 
 #include <svx/svxids.hrc>
@@ -230,9 +231,12 @@
 		SvtLinguOptions			aOptions;
 		aLinguConfig.GetOptions( aOptions );
 
-		SetLanguage( aOptions.nDefaultLanguage, EE_CHAR_LANGUAGE );
-		SetLanguage( aOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK );
-		SetLanguage( aOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL );
+		SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, 
+            ::com::sun::star::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE );
+		SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK,
+            ::com::sun::star::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK );
+		SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, 
+            ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL );
 
 		mbOnlineSpell = aOptions.bIsSpellAuto;
 	}
Index: sd/source/ui/notes/EditWindow.cxx
===================================================================
--- sd/source/ui/notes/EditWindow.cxx	(revision 267481)
+++ sd/source/ui/notes/EditWindow.cxx	(working copy)
@@ -34,6 +34,8 @@
 #include "EditWindow.hxx"
 
 #include "sdmod.hxx"
+#include <i18npool/mslangid.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
 #include <vcl/scrbar.hxx>
@@ -174,9 +176,9 @@
             {   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
                 DEFAULTFONT_CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
         };
-        aTable[0].nLang = aOpt.nDefaultLanguage;
-        aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
-        aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
+        aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
+        aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
+        aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
         //
         for (int i = 0;  i < 3;  ++i)
         {
Index: sd/source/ui/presenter/PresenterTextView.cxx
===================================================================
--- sd/source/ui/presenter/PresenterTextView.cxx	(revision 267481)
+++ sd/source/ui/presenter/PresenterTextView.cxx	(working copy)
@@ -33,6 +33,7 @@
 
 #include "PresenterTextView.hxx"
 
+#include <i18npool/mslangid.hxx>
 #include <cppcanvas/vclfactory.hxx>
 #include <svtools/itempool.hxx>
 #include <svtools/itemset.hxx>
@@ -52,7 +53,9 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/util/Color.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -381,9 +384,9 @@
             {   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
                 DEFAULTFONT_CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
         };
-        aTable[0].nLang = aOpt.nDefaultLanguage;
-        aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
-        aTable[2].nLang = aOpt.nDefaultLanguage_CTL;
+        aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
+        aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
+        aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
         //
         for (int i = 0;  i < 3;  ++i)
         {
Index: i18npool/source/isolang/mslangid.cxx
===================================================================
--- i18npool/source/isolang/mslangid.cxx	(revision 267481)
+++ i18npool/source/isolang/mslangid.cxx	(working copy)
@@ -41,6 +41,9 @@
 LanguageType MsLangId::nConfiguredSystemLanguage   = LANGUAGE_SYSTEM;
 LanguageType MsLangId::nConfiguredSystemUILanguage = LANGUAGE_SYSTEM;
 
+LanguageType MsLangId::nConfiguredWesternFallback  = LANGUAGE_SYSTEM;
+LanguageType MsLangId::nConfiguredAsianFallback    = LANGUAGE_SYSTEM;
+LanguageType MsLangId::nConfiguredComplexFallback  = LANGUAGE_SYSTEM;
 
 // static
 void MsLangId::setConfiguredSystemLanguage( LanguageType nLang )
@@ -55,8 +58,25 @@
     nConfiguredSystemUILanguage = nLang;
 }
 
+// static
+void MsLangId::setConfiguredWesternFallback( LanguageType nLang )
+{
+    nConfiguredWesternFallback = nLang;
+}
 
 // static
+void MsLangId::setConfiguredAsianFallback( LanguageType nLang )
+{
+    nConfiguredAsianFallback = nLang;
+}
+
+// static
+void MsLangId::setConfiguredComplexFallback( LanguageType nLang )
+{
+    nConfiguredComplexFallback = nLang;
+}
+
+// static
 inline LanguageType MsLangId::simplifySystemLanguages( LanguageType nLang )
 {
     switch (nLang)
@@ -120,6 +140,41 @@
 
 
 // static
+LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType )
+{
+    if (nLang == LANGUAGE_NONE)
+        return nLang;
+
+    nLang = getRealLanguage(nLang);
+    if (nType != ::com::sun::star::i18n::ScriptType::WEAK && getScriptType(nLang) != nType)
+    {
+        switch(nType)
+        {
+            case ::com::sun::star::i18n::ScriptType::ASIAN:
+                if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_CHINESE_SIMPLIFIED;
+                else
+                    nLang = nConfiguredComplexFallback;
+                break;
+            case ::com::sun::star::i18n::ScriptType::COMPLEX:
+                if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_HINDI;
+                else
+                    nLang = nConfiguredComplexFallback;
+                break;
+            default:
+                if (nConfiguredWesternFallback == LANGUAGE_SYSTEM)
+                    nLang = LANGUAGE_ENGLISH_US;
+                else
+                    nLang = nConfiguredWesternFallback;
+                break;
+                break;
+        }
+    }
+    return nLang;
+}
+
+// static
 void MsLangId::convertLanguageToLocale( LanguageType nLang,
         ::com::sun::star::lang::Locale & rLocale )
 {
Index: i18npool/inc/i18npool/mslangid.hxx
===================================================================
--- i18npool/inc/i18npool/mslangid.hxx	(revision 267481)
+++ i18npool/inc/i18npool/mslangid.hxx	(working copy)
@@ -216,6 +216,9 @@
     static LanguageType getRealLanguageWithoutConfig( LanguageType nLang );
 
 
+    static LanguageType resolveSystemLanguageByScriptType( LanguageType nLang, sal_Int16 nType );
+
+
     /** Whether locale has a Right-To-Left orientation. */
     static bool isRightToLeft( LanguageType nLang );
 
@@ -246,6 +249,9 @@
         configuration! */
     static void setConfiguredSystemLanguage( LanguageType nLang );
     static void setConfiguredSystemUILanguage( LanguageType nLang );
+    static void setConfiguredWesternFallback( LanguageType nLang );
+    static void setConfiguredComplexFallback( LanguageType nLang );
+    static void setConfiguredAsianFallback( LanguageType nLang );
 
 // ---------------------------------------------------------------------------
 
@@ -274,6 +280,10 @@
     static LanguageType         nConfiguredSystemLanguage;
     static LanguageType         nConfiguredSystemUILanguage;
 
+    static LanguageType         nConfiguredWesternFallback;
+    static LanguageType         nConfiguredAsianFallback;
+    static LanguageType         nConfiguredComplexFallback;
+
     static LanguageType getPlatformSystemLanguage();
     static LanguageType getPlatformSystemUILanguage();
 
Index: sw/source/ui/app/docshini.cxx
===================================================================
--- sw/source/ui/app/docshini.cxx	(revision 267481)
+++ sw/source/ui/app/docshini.cxx	(working copy)
@@ -37,6 +37,7 @@
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
+#include <i18npool/mslangid.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
 #include <svtools/zforlist.hxx>
@@ -58,6 +59,7 @@
 #endif
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <rtl/logfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/xtable.hxx>
@@ -791,9 +793,9 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-    sal_Int16   nVal = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
 	aDfltSet.Put( SvxLanguageItem( nVal, RES_CHRATR_LANGUAGE ) );
     aDfltSet.Put( SvxLanguageItem( eCJK, RES_CHRATR_CJK_LANGUAGE ) );
     aDfltSet.Put( SvxLanguageItem( eCTL, RES_CHRATR_CTL_LANGUAGE ) );
Index: sw/source/ui/app/appopt.cxx
===================================================================
--- sw/source/ui/app/appopt.cxx	(revision 267481)
+++ sw/source/ui/app/appopt.cxx	(working copy)
@@ -35,6 +35,8 @@
 #include <cmdid.h>		  	// Funktion-Ids
 #endif
 
+#include <com/sun/star/i18n/ScriptType.hpp>
+
 #define _SVSTDARR_STRINGSDTOR
 #include <svtools/svstdarr.hxx>
 
@@ -54,6 +56,7 @@
 #include <svx/optgrid.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <i18npool/mslangid.hxx>
 #include <fontcfg.hxx>
 #include <optload.hxx>
 #include <optcomp.hxx>
@@ -191,16 +194,25 @@
 		pRet->Put(SwPtrItem(FN_PARAM_PRINTER, pPrt));*/
 
         SvtLinguConfig aLinguCfg;
+        Locale aLocale;
+        LanguageType nLang;
 
+        using namespace ::com::sun::star::i18n::ScriptType;
+
         Any aLang = aLinguCfg.GetProperty(C2U("DefaultLocale"));
-        Locale aLocale;
         aLang >>= aLocale;
-        pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_LANGUAGE));
+        nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), LATIN);
+        pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE));
 
         aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CJK"));
         aLang >>= aLocale;
-        pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CJK_LANGUAGE));
+        nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), ASIAN);
+        pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE));
 
+        aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CTL"));
+        aLang >>= aLocale;
+        nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), COMPLEX);
+        pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE));
     }
 	if(bTextDialog)
 		pRet->Put(SwPtrItem(FN_PARAM_STDFONTS, GetStdFontConfig()));
Index: sw/source/ui/dialog/ascfldlg.cxx
===================================================================
--- sw/source/ui/dialog/ascfldlg.cxx	(revision 267481)
+++ sw/source/ui/dialog/ascfldlg.cxx	(working copy)
@@ -35,6 +35,8 @@
 #endif
 #include <hintids.hxx>
 #include <rtl/textenc.h>
+#include <i18npool/mslangid.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svtools/lingucfg.hxx>
 #include <fontcfg.hxx>
 #include <swmodule.hxx>
@@ -234,14 +236,14 @@
                     switch(nAppScriptType)
                     {
                         case SCRIPTTYPE_ASIAN:
-                            aOpt.SetLanguage(aLinguOpt.nDefaultLanguage_CJK);
+                            aOpt.SetLanguage(MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, SCRIPTTYPE_ASIAN));
                         break;
                         case SCRIPTTYPE_COMPLEX:
-                            aOpt.SetLanguage(aLinguOpt.nDefaultLanguage_CTL);
+                            aOpt.SetLanguage(MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, SCRIPTTYPE_COMPLEX));
                         break;
                         //SCRIPTTYPE_LATIN:
                         default:
-                            aOpt.SetLanguage(aLinguOpt.nDefaultLanguage);
+                            aOpt.SetLanguage(MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, SCRIPTTYPE_LATIN));
                     }
                 }
 			}
Index: sw/source/ui/config/fontcfg.cxx
===================================================================
--- sw/source/ui/config/fontcfg.cxx	(revision 267481)
+++ sw/source/ui/config/fontcfg.cxx	(working copy)
@@ -33,10 +33,12 @@
 
 
 #include <fontcfg.hxx>
+#include <i18npool/mslangid.hxx>
 #include <vcl/outdev.hxx>
 #include <svtools/lingucfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <swtypes.hxx>
 
 #include <unomid.h>
@@ -116,9 +118,10 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-	sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
     for(sal_Int16 i = 0; i < DEF_FONT_COUNT; i++)
     {
         sDefaultFonts[i] = GetDefaultFor(i,
@@ -163,9 +166,10 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-	sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
     for(sal_uInt16 nProp = 0;
         nProp < sal::static_int_cast< sal_uInt16, sal_Int32 >( aNames.getLength() );
             nProp++)
@@ -198,9 +202,10 @@
 
     SvtLinguConfig().GetOptions( aLinguOpt );
 
-	sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                eCTL = aLinguOpt.nDefaultLanguage_CTL;
+    sal_Int16   eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
     String sDefFont(GetDefaultFor(FONT_STANDARD, eWestern));
     String sDefFontCJK(GetDefaultFor(FONT_STANDARD_CJK, eCJK));
     String sDefFontCTL(GetDefaultFor(FONT_STANDARD_CTL, eCTL));
@@ -320,9 +325,11 @@
     {
         SvtLinguOptions aLinguOpt;
         SvtLinguConfig().GetOptions( aLinguOpt );
-        sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
-                    eCJK = aLinguOpt.nDefaultLanguage_CJK,
-                    eCTL = aLinguOpt.nDefaultLanguage_CTL;
+
+        sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
+                  eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
+                  eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+
         // #i92090# default height value sets back to -1
         const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
         const bool bIsDefaultHeight = nHeight == nDefaultHeight;
Index: sw/source/ui/lingu/olmenu.cxx
===================================================================
--- sw/source/ui/lingu/olmenu.cxx	(revision 267481)
+++ sw/source/ui/lingu/olmenu.cxx	(working copy)
@@ -62,6 +62,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/dlgutil.hxx>
 #include <svtools/itemset.hxx>
 #include <svx/langitem.hxx>
@@ -168,7 +169,7 @@
 		SvtLinguOptions aLinguOpt;
 		SvtLinguConfig().GetOptions( aLinguOpt );
 		// The default document language from "Tools/Options - Language Settings - Languages: Western"
-		aLangList[0] = aLinguOpt.nDefaultLanguage;
+		aLangList[0] = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
 		// The one from "Tools/Options - Language Settings - Languages: User interface"
 		aLangList[1] = rSettings.GetUILanguage();
 		// The one from "Tools/Options - Language Settings - Languages: Locale setting"
Index: sw/util/makefile.mk
===================================================================
--- sw/util/makefile.mk	(revision 267481)
+++ sw/util/makefile.mk	(working copy)
@@ -190,6 +190,7 @@
 			$(SVLLIB) \
 			$(UNOTOOLSLIB) \
             $(TOOLSLIB) \
+			$(I18NISOLANGLIB) \
 			$(COMPHELPERLIB) \
 			$(UCBHELPERLIB)	\
 			$(CPPUHELPERLIB)	\
Index: chart2/source/tools/CharacterProperties.cxx
===================================================================
--- chart2/source/tools/CharacterProperties.cxx	(revision 267481)
+++ chart2/source/tools/CharacterProperties.cxx	(working copy)
@@ -51,9 +51,11 @@
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <comphelper/InlineContainer.hxx>
 
+
 // header for struct SvtLinguConfig
 #ifndef _SVTOOLS_LINGUCFG_HXX_
 #include <svtools/lingucfg.hxx>
@@ -471,16 +473,21 @@
     const float fDefaultFontHeight = 13.0;
 
     SvtLinguConfig aLinguConfig;
-    lang::Locale aDefaultLocale( C2U( "en" ), C2U( "US" ), OUString() );
+    lang::Locale aDefaultLocale;
     aLinguConfig.GetProperty(C2U("DefaultLocale")) >>= aDefaultLocale;
     lang::Locale aDefaultLocale_CJK;
     aLinguConfig.GetProperty(C2U("DefaultLocale_CJK")) >>= aDefaultLocale_CJK;
     lang::Locale aDefaultLocale_CTL;
     aLinguConfig.GetProperty(C2U("DefaultLocale_CTL")) >>= aDefaultLocale_CTL;
 
-    Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale ), DEFAULTFONT_FLAGS_ONLYONE, 0 );   
-    Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK ), DEFAULTFONT_FLAGS_ONLYONE, 0 );
-    Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL ), DEFAULTFONT_FLAGS_ONLYONE, 0 );
+    using namespace ::com::sun::star::i18n::ScriptType;
+    LanguageType nLang;
+    nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aDefaultLocale), LATIN);
+    Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );   
+    nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK), ASIAN);
+    Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
+    nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL), COMPLEX);
+    Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
 
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) );
Index: desktop/source/app/langselect.cxx
===================================================================
--- desktop/source/app/langselect.cxx	(revision 267481)
+++ desktop/source/app/langselect.cxx	(working copy)
@@ -104,7 +104,7 @@
         ::rtl::OUString sWin16SysLocale;
         aWin16SysLocale >>= sWin16SysLocale;
         if( sWin16SysLocale.getLength())
-            setDefaultLocale(sWin16SysLocale);
+            setDefaultLanguage(sWin16SysLocale);
     }
     catch(const Exception&)
     {
@@ -116,9 +116,8 @@
         OUString usLocale;
         Reference< XPropertySet > xLocaleProp(getConfigAccess(
             "org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW);
-           // "org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW);
         xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale;     
-            setDefaultLocale(usLocale);
+            setDefaultLanguage(usLocale);
     } 
     catch (Exception&) 
     {
@@ -160,89 +159,33 @@
 
     // #i32939# setting of default document locale
     // #i32939# this should not be based on the UI language
-    setDefaultLocale(aLocaleString);
+    setDefaultLanguage(aLocaleString);
 
-    // fallback: set en-US as default Western locale if no Western locale is set
-    OUString usWesternName = OUString::createFromAscii("DefaultLocale");
-    try
-    {       
-        Reference< XPropertySet > xProp(getConfigAccess(
-            "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-        OUString usValue;
-        xProp->getPropertyValue(usWesternName) >>= usValue;
-        if (usValue.getLength() == 0)
-        {
-            // there is no western document language selected
-            // if the selected locale is a western locale, this
-            // will become the default western docuemnt language
-            // otherwise, fall back to en-US
-            OUString usDefault = OUString::createFromAscii("en-US");
-            try
-            {
-                xProp->setPropertyValue(usWesternName, makeAny(usDefault));
-                Reference< XChangesBatch >(xProp,UNO_QUERY_THROW)->commitChanges();
-            }
-            catch ( PropertyVetoException )
-            {
-                // we are not allowed to change this
-            }
-        }
-    }
-    catch ( Exception& )
-    {
-    }
-
     return bSuccess;
 }
 
-void LanguageSelection::setDefaultLocale(const OUString& usUILocale)
+void LanguageSelection::setDefaultLanguage(const OUString& sLocale)
 {
-    // #i32939# setting of default document locale
-    // org.openoffice.Office.Linguistic/General/DefaultLocale
-    // org.openoffice.Office.Linguistic/General/DefaultLocale_CJK
-    // org.openoffice.Office.Linguistic/General/DefaultLocale_CTL
+    // #i32939# setting of default document language
+    //
+    // See #i42730# for rules for determining source of settings
 
-    // determine script type of UI locale
-    LanguageType ltUILocale = MsLangId::convertIsoStringToLanguage(usUILocale);
-    sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(ltUILocale);
+    // determine script type of locale
+    LanguageType nLang = MsLangId::convertIsoStringToLanguage(sLocale);
+    sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(nLang);
 
-    try
+    switch (nScriptType)
     {
-        Reference< XPropertySet > xProp(getConfigAccess(
-                                            "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-        OUString usName = OUString::createFromAscii("DefaultLocale");
-        switch (nScriptType)
-        {
-            case SCRIPTTYPE_ASIAN:
-                usName = OUString::createFromAscii("DefaultLocale_CJK");
-                break;
-            case SCRIPTTYPE_COMPLEX:
-                usName = OUString::createFromAscii("DefaultLocale_CTL");
-                break;
-        }
-        OUString usValue;
-        xProp->getPropertyValue(usName) >>= usValue;
-        if (usValue.getLength() == 0)
-        {
-            // there is no document language set, for the script type selected
-            // in the UI
-            // covert the LanguageType we've got from the LanguageTable back to
-            // an iso string and store it
-            OUString usDefault = MsLangId::convertLanguageToIsoString(ltUILocale);
-            try
-            {
-                xProp->setPropertyValue(usName, makeAny(usDefault));
-                Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
-            }
-            catch ( PropertyVetoException )
-            {
-                // we are not allowed to change this
-            }
-        }
+        case SCRIPTTYPE_ASIAN:
+            MsLangId::setConfiguredAsianFallback( nLang );
+            break;
+        case SCRIPTTYPE_COMPLEX:
+            MsLangId::setConfiguredComplexFallback( nLang );
+            break;
+        default:
+            MsLangId::setConfiguredWesternFallback( nLang );
+            break;
     }
-    catch ( Exception& )
-    {
-    }
 }
 
 OUString LanguageSelection::getLanguageString()
Index: desktop/source/app/langselect.hxx
===================================================================
--- desktop/source/app/langselect.hxx	(revision 267481)
+++ desktop/source/app/langselect.hxx	(working copy)
@@ -60,7 +60,7 @@
     static rtl::OUString getUserLanguage();
     static rtl::OUString getSystemLanguage();
     static void resetUserLanguage();
-    static void setDefaultLocale(const rtl::OUString&);
+    static void setDefaultLanguage(const rtl::OUString&);
 
 public:
     static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str);
Index: svx/source/dialog/optgdlg.cxx
===================================================================
--- svx/source/dialog/optgdlg.cxx	(revision 267481)
+++ svx/source/dialog/optgdlg.cxx	(working copy)
@@ -103,6 +103,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XSet.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <vcl/svapp.hxx>
 
@@ -1201,8 +1202,13 @@
 
     // initialize user interface language selection
     SvtLanguageTable* pLanguageTable = new SvtLanguageTable;
-    String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) );
-    aUserInterfaceLB.InsertEntry(aStr);
+    const String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) );
+
+    String aUILang(aStr);
+    aUILang += String::CreateFromAscii(" - ");
+    aUILang += pLanguageTable->GetString( Application::GetSettings().GetUILanguage() );
+
+    aUserInterfaceLB.InsertEntry(aUILang);
     aUserInterfaceLB.SetEntryData(0, 0);
     aUserInterfaceLB.SelectEntryPos(0);
     try
@@ -1264,16 +1270,24 @@
     }
 
     aWesternLanguageLB.SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
-    aAsianLanguageLB  .SetLanguageList( LANG_LIST_CJK     | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
+    aWesternLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::LATIN );
+    aAsianLanguageLB.SetLanguageList( LANG_LIST_CJK     | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
+    aAsianLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::ASIAN );
     aComplexLanguageLB.SetLanguageList( LANG_LIST_CTL     | LANG_LIST_ONLY_KNOWN, TRUE,  FALSE, TRUE );
-    aLocaleSettingLB  .SetLanguageList( LANG_LIST_ALL     | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
-    aLocaleSettingLB.InsertLanguage( LANGUAGE_SYSTEM );
+    aComplexLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX );
 
-    // insert SYSTEM entry, no specific currency
-    aCurrencyLB.InsertEntry( aStr );
+    aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL     | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
+    aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK );
+
+    const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
+    const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM );
+    // insert SYSTEM entry
+    String aDefaultCurr(aStr);
+    aDefaultCurr += String::CreateFromAscii(" - ");
+    aDefaultCurr += rCurr.GetBankSymbol();
+    aCurrencyLB.InsertEntry( aDefaultCurr );
     // all currencies
     String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( "  " ) );
-    const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
     USHORT nCurrCount = rCurrTab.Count();
     // first entry is SYSTEM, skip it
     for ( USHORT j=1; j < nCurrCount; ++j )
@@ -1282,7 +1296,7 @@
         String aStr_( pCurr->GetBankSymbol() );
         aStr_ += aTwoSpace;
         aStr_ += pCurr->GetSymbol();
-        aStr = ApplyLreOrRleEmbedding( aStr_ );
+        aStr_ = ApplyLreOrRleEmbedding( aStr_ );
         aStr_ += aTwoSpace;
         aStr_ += ApplyLreOrRleEmbedding( pLanguageTable->GetString( pCurr->GetLanguage() ) );
         USHORT nPos = aCurrencyLB.InsertEntry( aStr_ );
@@ -1496,7 +1510,7 @@
 		if(!bCurrentDocCBChecked)
 		{
 			Any aValue;
-			Locale aLocale = SvxCreateLocale( eSelectLang );
+			Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false );
 			aValue <<= aLocale;
 			OUString aPropName( C2U("DefaultLocale") );
             pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
@@ -1505,7 +1519,8 @@
 		}
 		if(pCurrentDocShell)
 		{
-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_LANGUAGE));
+			rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
+                SID_ATTR_LANGUAGE));
 			bRet = TRUE;
 		}
 	}
@@ -1516,7 +1531,7 @@
 		if(!bCurrentDocCBChecked)
 		{
 			Any aValue;
-			Locale aLocale = SvxCreateLocale( eSelectLang );
+			Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false );
 			aValue <<= aLocale;
 			OUString aPropName( C2U("DefaultLocale_CJK") );
             pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
@@ -1525,7 +1540,8 @@
 		}
 		if(pCurrentDocShell)
 		{
-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CJK_LANGUAGE));
+			rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
+                SID_ATTR_CHAR_CJK_LANGUAGE));
 			bRet = TRUE;
 		}
 	}
@@ -1536,7 +1552,7 @@
 		if(!bCurrentDocCBChecked)
 		{
 			Any aValue;
-			Locale aLocale = SvxCreateLocale( eSelectLang );
+			Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, false );
 			aValue <<= aLocale;
 			OUString aPropName( C2U("DefaultLocale_CTL") );
             pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
@@ -1545,7 +1561,8 @@
 		}
 		if(pCurrentDocShell)
 		{
-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CTL_LANGUAGE));
+			rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
+                SID_ATTR_CHAR_CTL_LANGUAGE));
 			bRet = TRUE;
 		}
 	}
@@ -1645,13 +1662,18 @@
         aWestLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale"));
         Locale aLocale;
         aWestLang >>= aLocale;
-        eCurLang = SvxLocaleToLanguage( aLocale );
+
+        eCurLang = MsLangId::convertLocaleToLanguage( aLocale );
+
         aCJKLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale_CJK"));
+        aLocale = Locale();
         aCJKLang >>= aLocale;
-        eCurLangCJK = SvxLocaleToLanguage( aLocale );
+        eCurLangCJK = MsLangId::convertLocaleToLanguage( aLocale );
+
         aCTLLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale_CTL"));
+        aLocale = Locale();
         aCTLLang >>= aLocale;
-        eCurLangCTL = SvxLocaleToLanguage( aLocale );
+        eCurLangCTL = MsLangId::convertLocaleToLanguage( aLocale );
     }
     catch(Exception&)
     {
@@ -1663,13 +1685,25 @@
         aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
 		const SfxPoolItem* pLang;
 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
-			eCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+        {
+	        LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+            if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang)
+                eCurLang = eTempCurLang;
+        }
 
 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pLang))
-			eCurLangCJK = ((const SvxLanguageItem*)pLang)->GetValue();
+        {
+			LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+            if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang)
+                eCurLangCJK = eTempCurLang;
+        }
 
 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pLang))
-			eCurLangCTL = ((const SvxLanguageItem*)pLang)->GetValue();
+        {
+			LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+            if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang)
+                eCurLangCTL = eTempCurLang;
+        }
 	}
     if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang)
         aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE);
Index: svx/source/dialog/langbox.cxx
===================================================================
--- svx/source/dialog/langbox.cxx	(revision 267481)
+++ svx/source/dialog/langbox.cxx	(working copy)
@@ -37,8 +37,9 @@
 #include <com/sun/star/linguistic2/XLinguServiceManager.hdl>
 #endif
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <linguistic/misc.hxx>
-#include<rtl/ustring.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include <svtools/langtab.hxx>
@@ -315,6 +316,13 @@
 
 USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos )
 {
+    return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
+}
+
+//------------------------------------------------------------------------
+
+USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType )
+{
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the 
     // replacement already exists and if so don't add an entry with identical 
@@ -329,6 +337,15 @@
 	String aStrEntry = m_pLangTable->GetString( nLang );
 	if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
 		aStrEntry = m_aAllString;
+
+    LanguageType nRealLang = nLang;
+    if (nRealLang == LANGUAGE_SYSTEM)
+    {
+        nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
+        aStrEntry.AppendAscii(" - ");
+        aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
+    }
+
     aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
 
 	USHORT nAt = 0;
@@ -343,7 +360,7 @@
                 m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() );
         }
         bFound = m_pSpellUsedLang ?
-                    lcl_SeqHasLang( *m_pSpellUsedLang, nLang ) : FALSE;
+                    lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE;
 
         nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
 	}
@@ -356,6 +373,13 @@
 
 //------------------------------------------------------------------------
 
+USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos )
+{
+    return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
+}
+
+//------------------------------------------------------------------------
+
 USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
         BOOL bCheckEntry, USHORT nPos )
 {
Index: svx/inc/svx/langbox.hxx
===================================================================
--- svx/inc/svx/langbox.hxx	(revision 267481)
+++ svx/inc/svx/langbox.hxx	(working copy)
@@ -77,6 +77,7 @@
 
     SVX_DLLPRIVATE void                    Init();
     SVX_DLLPRIVATE USHORT                  ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked );
+    SVX_DLLPRIVATE USHORT                  ImplInsertLanguage(LanguageType, USHORT, sal_Int16 );
 
 public:
     SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE);
@@ -88,6 +89,7 @@
 							BOOL bCheckSpellAvail = FALSE );
 
 	USHORT			InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND );
+	USHORT			InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND );
     USHORT          InsertLanguage( const LanguageType eLangType,
                             BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND );
 	void			RemoveLanguage( const LanguageType eLangType );
Index: svtools/source/config/lingucfg.cxx
===================================================================
--- svtools/source/config/lingucfg.cxx	(revision 267481)
+++ svtools/source/config/lingucfg.cxx	(working copy)
@@ -72,69 +72,38 @@
 ///////////////////////////////////////////////////////////////////////////
 
 
-static lang::Locale lcl_CreateLocale( LanguageType eLang )
-{
-    lang::Locale aLocale;
-	if ( eLang != LANGUAGE_NONE )
-		MsLangId::convertLanguageToLocale( eLang, aLocale );
-
-	return aLocale;
-}
-
-
-static INT16 lcl_LocaleToLanguage( const lang::Locale& rLocale )
-{
-	//	empty Locale -> LANGUAGE_NONE
-	if ( rLocale.Language.getLength() == 0 )
-		return LANGUAGE_NONE;
-
-	//	Variant of Locale is ignored
-	return MsLangId::convertLocaleToLanguage( rLocale );
-}
-
-
 static BOOL lcl_SetLocale( INT16 &rLanguage, const uno::Any &rVal )
 {
-	BOOL bSucc = FALSE;
+    BOOL bSucc = FALSE;
 
     lang::Locale aNew;
-	if (rVal >>= aNew)	// conversion successful?
-	{
-		INT16 nNew = lcl_LocaleToLanguage( aNew );
-		if (nNew != rLanguage)
-		{
-			rLanguage = nNew;
-			bSucc = TRUE;
-		}
-	}
-
-	return bSucc;
+    if (rVal >>= aNew)	// conversion successful?
+    {
+        INT16 nNew = MsLangId::convertLocaleToLanguage( aNew );
+        if (nNew != rLanguage)
+        {
+            rLanguage = nNew;
+            bSucc = TRUE;
+        }
+    }
+    return bSucc;
 }
 
 
-static inline INT16 lcl_CfgLocaleStrToLanguage( const OUString &rCfgLocaleStr )
-{
-	INT16 nRes = LANGUAGE_NONE;
-    if (0 != rCfgLocaleStr.getLength())
-        nRes = MsLangId::convertIsoStringToLanguage( rCfgLocaleStr );
-    return nRes;
-}
-
-
 static inline const OUString lcl_LanguageToCfgLocaleStr( INT16 nLanguage )
 {
     OUString aRes;
-    if (LANGUAGE_NONE != nLanguage)
+    if (LANGUAGE_SYSTEM != nLanguage)
         aRes = MsLangId::convertLanguageToIsoString( nLanguage );
     return aRes;
 }
 
 
-static void lcl_CfgAnyToLanguage( const uno::Any &rVal, INT16& rLanguage )
+static INT16 lcl_CfgAnyToLanguage( const uno::Any &rVal )
 {
-	OUString aTmp;
-    if ((rVal >>= aTmp)  &&  0 != aTmp.getLength())
-       rLanguage = MsLangId::convertIsoStringToLanguage( aTmp );
+    OUString aTmp;
+    rVal >>= aTmp;
+    return (aTmp.getLength() == 0) ? LANGUAGE_SYSTEM : MsLangId::convertIsoStringToLanguage( aTmp );
 }
 
 
@@ -143,10 +112,9 @@
 SvtLinguOptions::SvtLinguOptions()
 {
     nDefaultLanguage = LANGUAGE_NONE;
-
 	nDefaultLanguage_CJK = LANGUAGE_NONE;
 	nDefaultLanguage_CTL = LANGUAGE_NONE;
-
+    
 	// general options
 	bIsUseDictionaryList	=
 	bIsIgnoreControlCharacters	= TRUE;
@@ -428,19 +396,19 @@
         }
         case UPH_DEFAULT_LOCALE :
         {
-            lang::Locale aLocale( lcl_CreateLocale( rOpt.nDefaultLanguage ) );
+            lang::Locale aLocale( MsLangId::convertLanguageToLocale( rOpt.nDefaultLanguage, false ) );
             aRes.setValue( &aLocale, ::getCppuType((lang::Locale*)0 ));
             break;
         }
         case UPH_DEFAULT_LOCALE_CJK :
         {
-            lang::Locale aLocale( lcl_CreateLocale( rOpt.nDefaultLanguage_CJK ) );
+            lang::Locale aLocale( MsLangId::convertLanguageToLocale( rOpt.nDefaultLanguage_CJK, false ) );
             aRes.setValue( &aLocale, ::getCppuType((lang::Locale*)0 ));
             break;
         }
         case UPH_DEFAULT_LOCALE_CTL :
         {
-            lang::Locale aLocale( lcl_CreateLocale( rOpt.nDefaultLanguage_CTL ) );
+            lang::Locale aLocale( MsLangId::convertLanguageToLocale( rOpt.nDefaultLanguage_CTL, false ) );
             aRes.setValue( &aLocale, ::getCppuType((lang::Locale*)0 ));
             break;
         }
@@ -654,7 +622,7 @@
             switch ( nPropertyHandle )
             {
                 case UPH_DEFAULT_LOCALE : 
-                    { rOpt.bRODefaultLanguage = pROStates[i]; lcl_CfgAnyToLanguage( rVal, rOpt.nDefaultLanguage ); } break;
+                    { rOpt.bRODefaultLanguage = pROStates[i]; rOpt.nDefaultLanguage = lcl_CfgAnyToLanguage( rVal ); } break;
                 case UPH_ACTIVE_DICTIONARIES : 
                     { rOpt.bROActiveDics = pROStates[i]; rVal >>= rOpt.aActiveDics;   } break;
                 case UPH_IS_USE_DICTIONARY_LIST : 
@@ -662,9 +630,9 @@
                 case UPH_IS_IGNORE_CONTROL_CHARACTERS : 
                     { rOpt.bROIsIgnoreControlCharacters = pROStates[i]; rVal >>= rOpt.bIsIgnoreControlCharacters;    } break;
                 case UPH_DEFAULT_LOCALE_CJK : 
-                    { rOpt.bRODefaultLanguage_CJK = pROStates[i]; lcl_CfgAnyToLanguage( rVal, rOpt.nDefaultLanguage_CJK );    } break;
+                    { rOpt.bRODefaultLanguage_CJK = pROStates[i]; rOpt.nDefaultLanguage_CJK = lcl_CfgAnyToLanguage( rVal );    } break;
                 case UPH_DEFAULT_LOCALE_CTL : 
-                    { rOpt.bRODefaultLanguage_CTL = pROStates[i]; lcl_CfgAnyToLanguage( rVal, rOpt.nDefaultLanguage_CTL );    } break;
+                    { rOpt.bRODefaultLanguage_CTL = pROStates[i]; rOpt.nDefaultLanguage_CTL = lcl_CfgAnyToLanguage( rVal );    } break;
 
                 case UPH_IS_SPELL_UPPER_CASE : 
                     { rOpt.bROIsSpellUpperCase = pROStates[i]; rVal >>= rOpt.bIsSpellUpperCase; } break;
--- reportdesign/util/makefile.mk	2009-03-12 23:12:05.000000000 +0000
+++ reportdesign/util/makefile.mk	2009-03-12 23:10:02.000000000 +0000
@@ -58,6 +58,7 @@
 		$(FWELIB)				\
 		$(SFXLIB)				\
 		$(TOOLSLIB) 			\
+		$(I18NISOLANGLIB) \
 		$(SVLLIB)				\
 		$(SVTOOLLIB)			\
 		$(UNOTOOLSLIB)			\

workspace.dr72.patch:
 prj/build.lst                |    2 
 source/core/filterdetect.cxx |  244 +++++++++++++++++++++++++++++++++++++++----
 util/makefile.mk             |    3 
 3 files changed, 226 insertions(+), 23 deletions(-)

--- NEW FILE workspace.dr72.patch ---
diff -ru oox.orig/prj/build.lst oox/prj/build.lst
--- oox.orig/prj/build.lst	2009-06-25 12:29:27.000000000 +0100
+++ oox/prj/build.lst	2009-06-26 11:02:26.000000000 +0100
@@ -1,4 +1,4 @@
-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools BOOST:boost NULL
+oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools BOOST:boost OPENSSL:openssl NULL
 oox	oox				usr1	-   all	oox_mkout NULL
 oox	oox\prj				get	-   all	oox_prj NULL
 oox	oox\source\token		nmake	-   all	oox_token NULL
diff -ru oox.orig/source/core/filterdetect.cxx oox/source/core/filterdetect.cxx
--- oox.orig/source/core/filterdetect.cxx	2009-06-25 12:30:35.000000000 +0100
+++ oox/source/core/filterdetect.cxx	2009-06-26 11:01:15.000000000 +0100
@@ -37,12 +37,20 @@
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 
+#include <com/sun/star/io/XTempFile.hpp>
+
 #include <comphelper/mediadescriptor.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 
+#include <rtl/digest.h>
+#include <openssl/evp.h>
+
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/zipstorage.hxx"
+#include "oox/helper/olestorage.hxx"
+#include "oox/helper/binaryinputstream.hxx"
+#include "oox/helper/binaryoutputstream.hxx"
 #include "oox/core/fasttokenhandler.hxx"
 #include "oox/core/namespaces.hxx"
 #include "tokens.hxx"
@@ -317,6 +325,97 @@
 {
 }
 
+/*
+ * Derive Key
+ */
+void DeriveKey(const sal_uInt8 *pHash, sal_uInt32 cbHash, sal_uInt8 *keyDerived, sal_uInt32 cbRequiredKeyLength)
+{
+    sal_uInt8 aBuffer[64];
+
+    memset(aBuffer, 0x36, sizeof(aBuffer));
+    for (sal_uInt32 i = 0; i < cbHash; ++i)
+        aBuffer[i] ^= pHash[i];
+
+    rtlDigest aDigest;
+    rtlDigestError aError;
+
+    aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    aError = rtl_digest_update(aDigest, aBuffer, sizeof(aBuffer));
+    sal_uInt8 X1[RTL_DIGEST_LENGTH_SHA1];
+    aError = rtl_digest_get(aDigest, X1, RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    memset(aBuffer, 0x5C, sizeof(aBuffer));
+    for (sal_uInt32 i = 0; i < cbHash; ++i)
+        aBuffer[i] ^= pHash[i];
+
+    aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    aError = rtl_digest_update(aDigest, aBuffer, sizeof(aBuffer));
+    sal_uInt8 X2[RTL_DIGEST_LENGTH_SHA1];
+    aError = rtl_digest_get(aDigest, X2, RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    if (cbRequiredKeyLength > RTL_DIGEST_LENGTH_SHA1)
+    {
+        memcpy(keyDerived+RTL_DIGEST_LENGTH_SHA1, X2, cbRequiredKeyLength-RTL_DIGEST_LENGTH_SHA1);
+        cbRequiredKeyLength=RTL_DIGEST_LENGTH_SHA1;
+    }
+    memcpy(keyDerived, X1, cbRequiredKeyLength);
+}
+
+/*
+ * Generate an encryption key
+ */
+
+void GenerateEncryptionKey(sal_uInt32 SaltSize, const sal_uInt8 *Salt, const rtl::OUString &rPassword,
+    sal_uInt8 *key, sal_uInt32 cbRequiredKeyLength)
+{
+    size_t nBufferSize = (SaltSize + (rPassword.getLength() * sizeof(sal_uInt16)));
+    sal_uInt8 *pBuffer = new sal_uInt8[nBufferSize];
+
+    memcpy(pBuffer, Salt, SaltSize);
+
+    sal_uInt8 *pPasswordLoc = pBuffer+SaltSize;
+    sal_Int32 nLen = rPassword.getLength();
+    const sal_Unicode *pStr = rPassword.getStr();
+
+    for (sal_Int32 i = 0; i < nLen; ++i, ++pStr)
+    {
+        *pPasswordLoc++ = (*pStr & 0x00FF);
+        *pPasswordLoc++ = ((*pStr & 0xFF00) >> 8);
+    }
+
+    rtlDigest aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    rtlDigestError aError;
+    aError = rtl_digest_update(aDigest, pBuffer, nBufferSize);
+    delete [] pBuffer;
+    size_t nHashSize = RTL_DIGEST_LENGTH_SHA1+sizeof(sal_uInt32);
+    sal_uInt8 aHash[nHashSize];
+    aError = rtl_digest_get(aDigest, aHash+sizeof(sal_uInt32), RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    for (sal_uInt32 i = 0; i < 50000; ++i)
+    {
+        aHash[0] = (i & 0x000000FF);
+        aHash[1] = (i & 0x0000FF00) >> 8;
+        aHash[2] = (i & 0x00FF0000) >> 16;
+        aHash[3] = (i & 0xFF000000) >> 24;
+        aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+        aError = rtl_digest_update(aDigest, aHash, nHashSize);
+        aError = rtl_digest_get(aDigest, aHash+sizeof(sal_uInt32), RTL_DIGEST_LENGTH_SHA1);
+        rtl_digest_destroy(aDigest);
+    }
+
+    memmove(aHash, aHash+sizeof(sal_uInt32), RTL_DIGEST_LENGTH_SHA1);
+    memset(aHash+RTL_DIGEST_LENGTH_SHA1, 0, sizeof(sal_uInt32));
+    aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+    aError = rtl_digest_update(aDigest, aHash, nHashSize);
+    aError = rtl_digest_get(aDigest, aHash, RTL_DIGEST_LENGTH_SHA1);
+    rtl_digest_destroy(aDigest);
+
+    DeriveKey(aHash, RTL_DIGEST_LENGTH_SHA1, key, cbRequiredKeyLength);
+}
+
 // com.sun.star.document.XExtendedFilterDetect interface ----------------------
 
 OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException )
@@ -325,31 +424,134 @@
 
     if( mxFactory.is() ) try
     {
-        Reference< XFastParser > xParser( mxFactory->createInstance(
-            CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ) ), UNO_QUERY_THROW );
-
-        xParser->setFastDocumentHandler( new FilterDetectDocHandler( aFilter ) );
-        xParser->setTokenHandler( new FastTokenHandler );
-
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships" ), NMSP_PACKAGE_RELATIONSHIPS );
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships" ), NMSP_RELATIONSHIPS );
-        xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/content-types" ), NMSP_CONTENT_TYPES );
-
         MediaDescriptor aDescriptor( lDescriptor );
         aDescriptor.addInputStream();
         Reference< XInputStream > xInputStream( aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY_THROW );
-        StorageRef xStorage( new ZipStorage( mxFactory, xInputStream ) );
+        StorageRef xZipStorage( new ZipStorage( mxFactory, xInputStream ) );
 
-        // Parse _rels/.rels to get the target path.
-        InputSource aParserInput;
-        aParserInput.sSystemId = CREATE_OUSTRING( "_rels/.rels" );
-        aParserInput.aInputStream = xStorage->openInputStream( aParserInput.sSystemId );
-        xParser->parseStream( aParserInput );
-
-        // Parse [Content_Types].xml to determine the content type of the part at the target path.
-        aParserInput.sSystemId = CREATE_OUSTRING( "[Content_Types].xml" );
-        aParserInput.aInputStream = xStorage->openInputStream( aParserInput.sSystemId );
-        xParser->parseStream( aParserInput );
+        if (xZipStorage->isStorage())
+        {
+            Reference< XFastParser > xParser( mxFactory->createInstance(
+                CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ) ), UNO_QUERY_THROW );
+
+            xParser->setFastDocumentHandler( new FilterDetectDocHandler( aFilter ) );
+            xParser->setTokenHandler( new FastTokenHandler );
+
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships" ), NMSP_PACKAGE_RELATIONSHIPS );
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships" ), NMSP_RELATIONSHIPS );
+            xParser->registerNamespace( CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/content-types" ), NMSP_CONTENT_TYPES );
+
+            // Parse _rels/.rels to get the target path.
+            InputSource aParserInput;
+            aParserInput.sSystemId = CREATE_OUSTRING( "_rels/.rels" );
+            aParserInput.aInputStream = xZipStorage->openInputStream( aParserInput.sSystemId );
+            xParser->parseStream( aParserInput );
+
+            // Parse [Content_Types].xml to determine the content type of the part at the target path.
+            aParserInput.sSystemId = CREATE_OUSTRING( "[Content_Types].xml" );
+            aParserInput.aInputStream = xZipStorage->openInputStream( aParserInput.sSystemId );
+            xParser->parseStream( aParserInput );
+        }
+        else
+        {
+            StorageRef xOLEStorage ( new OleStorage( mxFactory, xInputStream, false ) );
+            if (xOLEStorage->isStorage())
+            {
+                Reference< XInputStream > xEncryptionInfo = xOLEStorage->openInputStream( CREATE_OUSTRING( "EncryptionInfo") );
+                Reference< XInputStream > xEncryptedPackage = xOLEStorage->openInputStream( CREATE_OUSTRING( "EncryptedPackage") );
+                BinaryXInputStream aInfo(xEncryptionInfo, true);
+                aInfo.skip(0x00000008);
+                sal_uInt32 EncryptionHeaderSize = aInfo.readuInt32();
+                aInfo.skip(0x00000008);
+                sal_uInt32 AlgID = aInfo.readuInt32();
+                sal_uInt32 AlgIDHash = aInfo.readuInt32();
+                sal_uInt32 KeySize = aInfo.readuInt32();
+                aInfo.skip(EncryptionHeaderSize-0x00000014);
+                sal_uInt32 SaltSize = aInfo.readuInt32();
+                sal_uInt8 Salt[16];
+                aInfo.readMemory(Salt, 16);
+                sal_uInt8 EncryptedVerifier[16];
+                aInfo.readMemory(EncryptedVerifier, 16);
+                sal_uInt32 VerifierHashSize = aInfo.readuInt32();
+                sal_uInt8 EncryptedVerifierHash[32];
+                aInfo.readMemory(EncryptedVerifierHash, 32);
+
+                bool bCorrectPassword = false;
+                //aes128 && sha1 && expected hash size
+                bool bImplemented = ((AlgID == 0x0000660E) && (AlgIDHash == 0x00008004) && (VerifierHashSize == 0x14));
+
+                if (bImplemented)
+                {
+                    sal_uInt8 cbRequiredKeyLength = KeySize/8;
+                    sal_uInt8 *key = new sal_uInt8[cbRequiredKeyLength];
+                    //VelvetSweatshop is the default .xlsx "protection" password, so out-of-the-box we should
+                    //be able to open those immediately. For other passwords we need to pass down that data, or query
+                    //for it, however its normall done, to here.
+                    //Unlike other formats, we can't really detect what's inside this wrapper until *after* 
+                    //decryption
+                    GenerateEncryptionKey(SaltSize, Salt, CREATE_OUSTRING("VelvetSweatshop"), key, cbRequiredKeyLength);
+
+                    EVP_CIPHER_CTX aes_ctx;
+                    int outlen=0;
+
+                    EVP_CIPHER_CTX_init(&aes_ctx);
+                    EVP_DecryptInit_ex(&aes_ctx, EVP_aes_128_ecb(), NULL, key, NULL);
+                    EVP_CIPHER_CTX_set_padding(&aes_ctx, 0);
+                    sal_uInt8 Verifier[16]= {0};
+                    /*int*/ EVP_DecryptUpdate(&aes_ctx, Verifier, &outlen, EncryptedVerifier, sizeof(EncryptedVerifier));
+                    EVP_CIPHER_CTX_cleanup(&aes_ctx);
+
+                    EVP_CIPHER_CTX_init(&aes_ctx);
+                    EVP_DecryptInit_ex(&aes_ctx, EVP_aes_128_ecb(), NULL, key, NULL);
+                    EVP_CIPHER_CTX_set_padding(&aes_ctx, 0);
+                    sal_uInt8 VerifierHash[32] = {0};
+                    /*int*/ EVP_DecryptUpdate(&aes_ctx, VerifierHash, &outlen, EncryptedVerifierHash, sizeof(EncryptedVerifierHash));
+                    EVP_CIPHER_CTX_cleanup(&aes_ctx);
+
+                    rtlDigest aDigest = rtl_digest_create(rtl_Digest_AlgorithmSHA1);
+                    rtlDigestError aError = rtl_digest_update(aDigest, Verifier, sizeof(Verifier));
+                    sal_uInt8 sha1Hash[RTL_DIGEST_LENGTH_SHA1];
+                    aError = rtl_digest_get(aDigest, sha1Hash, RTL_DIGEST_LENGTH_SHA1);
+                    rtl_digest_destroy(aDigest);
+
+                    bCorrectPassword = memcmp(sha1Hash, VerifierHash, RTL_DIGEST_LENGTH_SHA1) == 0;
+
+                    if (bCorrectPassword)
+                    {
+                        Reference<XTempFile> xTemp(
+                            mxFactory->createInstance(CREATE_OUSTRING("com.sun.star.io.TempFile")),
+                              UNO_QUERY_THROW);
+                        BinaryXInputStream aEncryptedPackage(xEncryptedPackage, true);
+                        BinaryXOutputStream aDecryptedPackage(xTemp->getOutputStream(), true);
+
+                        EVP_CIPHER_CTX_init(&aes_ctx);
+                        EVP_DecryptInit_ex(&aes_ctx, EVP_aes_128_ecb(), NULL, key, NULL);
+                        EVP_CIPHER_CTX_set_padding(&aes_ctx, 0);
+
+                        sal_uInt8 inbuf[1024];
+                        sal_uInt8 outbuf[1024];
+                        sal_Int32 inlen;
+                        aEncryptedPackage.skip(sizeof(sal_uInt64)); /*decrypted size*/
+                        while ((inlen = aEncryptedPackage.readMemory(inbuf, sizeof(inbuf))))
+                        {
+                            /*int*/ EVP_DecryptUpdate(&aes_ctx, outbuf, &outlen, inbuf, inlen);
+                            aDecryptedPackage.writeMemory(outbuf, outlen);
+                        }
+                        EVP_DecryptFinal_ex(&aes_ctx, outbuf, &outlen);
+                        aDecryptedPackage.writeMemory(outbuf, outlen);
+
+                        EVP_CIPHER_CTX_cleanup(&aes_ctx);
+                        delete [] key;
+
+                        aDecryptedPackage.seekToStart();
+                        xTemp->getOutputStream()->flush();
+                        aDescriptor[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= xTemp;
+                        aDescriptor >> lDescriptor;
+                        aFilter = detect( lDescriptor );
+                    }
+                }
+            }
+        }
     }
     catch ( const Exception& )
     {
diff -ru oox.orig/util/makefile.mk oox/util/makefile.mk
--- oox.orig/util/makefile.mk	2009-06-25 12:30:40.000000000 +0100
+++ oox/util/makefile.mk	2009-06-25 16:35:08.000000000 +0100
@@ -73,7 +73,8 @@
 		$(RTLLIB)		\
 		$(SALLIB)		\
 		$(BASEGFXLIB)	\
-		$(SAXLIB)
+		$(SAXLIB) \
+		$(OPENSSLLIB)
 
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(LIB1TARGET)

workspace.evoab2def.patch:
 makefile.mk |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE workspace.evoab2def.patch ---
--- connectivity.orig/source/drivers/evoab/makefile.mk	2008-12-30 15:32:01.000000000 +0100
+++ connectivity/source/drivers/evoab/makefile.mk	2009-04-29 20:51:57.000000000 +0200
@@ -36,6 +36,11 @@ TARGET=evoab
 
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(ENABLE_EVOAB2)"=="TRUE"
+dummy:
+	@echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
+.ELSE
+
 # --- Settings ----------------------------------
 .IF "$(DBGUTIL_OJ)"!=""
 ENVCFLAGS+=/FR$(SLO)$/
@@ -103,6 +108,7 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
 .ENDIF
+.ENDIF
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk

workspace.hb32bugs01.patch:
 source/filter/ww8/wrtw8num.cxx   |    6 ++++--
 source/svrtf/rtfitem.cxx         |   12 ++++++++----
 sw/source/filter/ww8/ww8par6.cxx |   11 +++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE workspace.hb32bugs01.patch ---
Index: source/svrtf/rtfitem.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/svrtf/rtfitem.cxx,v
retrieving revision 1.35
diff -u -r1.35 rtfitem.cxx
--- svx.orig/source/svrtf/rtfitem.cxx	11 Apr 2008 03:19:51 -0000	1.35
+++ svx/source/svrtf/rtfitem.cxx	18 Mar 2009 17:17:27 -0000
@@ -1164,12 +1164,16 @@
 								ReadTabAttr( nToken, *pSet );
 
                                 /*
-                                cmc: #i76140, he who reads the { must read the }
+                                cmc: #i76140, he who consumed the { must consume the }
                                 We rewound to a state of { being the current 
-                                token so it is our responsibility to read the } 
-                                token.
+                                token so it is our responsibility to consume the } 
+                                token if we consumed the {. We will not have consumed
+                                the { if it belonged to our caller, i.e. if the { we
+                                are handling is the "firsttoken" passed to us then
+                                the *caller* must consume it, not us. Otherwise *we*
+                                should consume it.
                                 */
-                                if (nToken == BRACELEFT)
+                                if (nToken == BRACELEFT && !bFirstToken)
                                 {
                                     nToken = GetNextToken();
                                     DBG_ASSERT( nToken == BRACERIGHT, 
diff -ru sw.orig/source/filter/ww8/ww8par6.cxx sw/source/filter/ww8/ww8par6.cxx
--- sw.orig/source/filter/ww8/ww8par6.cxx	2009-06-03 12:33:28.000000000 +0100
+++ sw/source/filter/ww8/ww8par6.cxx	2009-06-03 13:02:09.000000000 +0100
@@ -778,6 +778,11 @@
            )
         {
             SwFmtLineNumber aLN;
+            if (const SwFmtLineNumber* pLN
+                = (const SwFmtLineNumber*)GetFmtAttr(RES_LINENUMBER))
+            {
+                aLN.SetCountLines( pLN->IsCount() );
+            }
             aLN.SetStartValue(1 + rSection.maSep.lnnMin);
             NewAttr(aLN);
             pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LINENUMBER);
@@ -3878,6 +3883,12 @@
         return;
     }
     SwFmtLineNumber aLN;
+    if (const SwFmtLineNumber* pLN
+        = (const SwFmtLineNumber*)GetFmtAttr(RES_LINENUMBER))
+    {
+        aLN.SetStartValue( pLN->GetStartValue() );
+    }
+
     aLN.SetCountLines( pData && (0 == *pData) );
     NewAttr( aLN );
 }
diff -ru ww8/wrtw8num.cxx ww8/wrtw8num.cxx
--- sw.orig/source/filter/ww8/wrtw8num.cxx	2009-06-03 15:34:09.000000000 +0100
+++ sw/source/filter/ww8/wrtw8num.cxx	2009-06-04 09:32:06.000000000 +0100
@@ -247,12 +247,14 @@
                 {
                     case SvxNumberFormat::LISTTAB:
                     {
-                        nFlags = 0;
+			// 0 (tab) unless there would be no content before the tab, in which case 2 (nothing)
+			nFlags = (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType()) ? 0 : 2;
                     }
                     break;
                     case SvxNumberFormat::SPACE:
                     {
-                        nFlags = 1;
+			// 1 (space) unless there would be no content before the space in which case 2 (nothing)
+			nFlags = (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType()) ? 1 : 2;
                     }
                     break;
                     case SvxNumberFormat::NOTHING:

workspace.impress171.patch:
 unopback.cxx |    2 +-
 unopback.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE workspace.impress171.patch ---
diff -ru sd.orig/source/ui/unoidl/unopback.cxx sd/source/ui/unoidl/unopback.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/unopback.cxx	2009-04-14 11:28:37.000000000 +0100
+++ openoffice.org/sd/source/ui/unoidl/unopback.cxx	2009-04-14 11:30:56.000000000 +0100
@@ -119,7 +119,7 @@
 
 }
 
-void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw()
+void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
 {
 	rSet.ClearItem();
 
diff -ru sd.orig/source/ui/unoidl/unopback.hxx sd/source/ui/unoidl/unopback.hxx
--- openoffice.org.orig/sd/source/ui/unoidl/unopback.hxx	2009-04-14 11:28:37.000000000 +0100
+++ openoffice.org/sd/source/ui/unoidl/unopback.hxx	2009-04-14 11:30:41.000000000 +0100
@@ -67,7 +67,7 @@
 	~SdUnoPageBackground() throw();
 
 	// internal
-	void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw();
+	void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet );
 	virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 	// uno helper

workspace.impress174.patch:
 wmfwr.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE workspace.impress174.patch ---
diff -ru svtools.orig/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.cxx
--- svtools.orig/source/filter.vcl/wmf/wmfwr.cxx	2009-05-05 12:57:34.000000000 +0100
+++ svtools/source/filter.vcl/wmf/wmfwr.cxx	2009-05-05 13:55:47.000000000 +0100
@@ -439,14 +439,7 @@
 
 	WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT);
 
-    if ( !rFont.GetSize().Width() )
-    {
-        VirtualDevice aDev;
-        FontMetric aMetric( aDev.GetFontMetric( rFont ) );
-        WriteHeightWidth(Size(aMetric.GetWidth(),-rFont.GetSize().Height()));
-    }
-    else
-        WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
+	WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
 
 	*pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation();
 

workspace.kso32fixes.patch:
 openoffice.org/sal/osl/unx/file_impl.hxx |   18 ++++++++
 sal/osl/unx/file.cxx                     |   64 ++++++++++++++++++++++++++++++
 sal/osl/unx/file_stat.cxx                |   66 +++++++++++++++++++++++++++++--
 3 files changed, 145 insertions(+), 3 deletions(-)

--- NEW FILE workspace.kso32fixes.patch ---
Index: sal/osl/unx/file.cxx
===================================================================
RCS file: /cvs/porting/sal/osl/unx/file.cxx,v
retrieving revision 1.10
diff -u -p -r1.10 file.cxx
--- openoffice.org.orig/sal/osl/unx/file.cxx	8 Sep 2005 14:53:53 -0000	1.10
+++ openoffice.org/sal/osl/unx/file.cxx	18 Jan 2006 14:38:41 -0000
@@ -156,6 +156,42 @@
 
 #endif
 
+#ifdef _DIRENT_HAVE_D_TYPE
+#include "file_impl.hxx"
+	oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType )
+	{
+		oslDirectoryItemImpl *pItemObject = (oslDirectoryItemImpl*) malloc( sizeof( oslDirectoryItemImpl ) );
+		pItemObject->RefCount = 1;
+		pItemObject->bHasType = _bHasDType;
+		pItemObject->DType = _DType;
+		pItemObject->ustrFilePath = _ustrFilePath;
+
+		return pItemObject;
+	}
+
+	void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem )
+	{
+		if( pItem->ustrFilePath ) {
+			rtl_uString_release( pItem->ustrFilePath );
+			pItem->ustrFilePath = NULL;
+		}
+		free( pItem );
+	}
+
+	void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem )
+	{
+		pItem->RefCount ++;
+	}
+
+	void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem )
+	{
+		pItem->RefCount --;
+
+		if( pItem->RefCount <= 0 )
+			oslDirectoryItemImpl_Destroy( pItem );
+	}
+#endif
+
 #if OSL_DEBUG_LEVEL > 1
 
 	extern void debug_ustring(rtl_uString*);
@@ -484,8 +520,14 @@
 	osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath);
     rtl_uString_release( ustrFileName );
 
+#ifdef _DIRENT_HAVE_D_TYPE
+    if(*pItem)
+      oslDirectoryItemImpl_release( ( oslDirectoryItemImpl* )( *pItem ) );
+    *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrFilePath, true, pEntry->d_type );
+#else
     /* use path as directory item */
     *pItem = (oslDirectoryItem) ustrFilePath;
+#endif
 
     return osl_File_E_None;
 }
@@ -514,7 +556,11 @@
 
 	if (0 == access_u(ustrSystemPath, F_OK))
 	{
+#ifdef _DIRENT_HAVE_D_TYPE
+		*pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrSystemPath, false );
+#else
 		*pItem = (oslDirectoryItem)ustrSystemPath;
+#endif
 		osl_error = osl_File_E_None;
 	}
 	else
@@ -532,12 +578,21 @@
 
 oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
 {
+#ifdef _DIRENT_HAVE_D_TYPE
+	oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
+#else
     rtl_uString* ustrFilePath = (rtl_uString *) Item;
+#endif
 
     OSL_ASSERT( Item );
 
+#ifdef _DIRENT_HAVE_D_TYPE
+	if( pImpl )
+		oslDirectoryItemImpl_acquire( pImpl );
+#else
     if( ustrFilePath )
         rtl_uString_acquire( ustrFilePath );
+#endif
 
     return osl_File_E_None;
 }
@@ -548,12 +603,21 @@
 
 oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
 {
+#ifdef _DIRENT_HAVE_D_TYPE
+	oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
+#else
     rtl_uString* ustrFilePath = (rtl_uString *) Item;
+#endif
 
     OSL_ASSERT( Item );
 
+#ifdef _DIRENT_HAVE_D_TYPE
+	if( pImpl )
+		oslDirectoryItemImpl_release( pImpl );
+#else
     if( ustrFilePath )
         rtl_uString_release( ustrFilePath );
+#endif
 
     return osl_File_E_None;
 }
Index: sal/osl/unx/file_stat.cxx
===================================================================
RCS file: /cvs/porting/sal/osl/unx/file_stat.cxx,v
retrieving revision 1.6
diff -u -p -r1.6 file_stat.cxx
--- openoffice.org.orig/sal/osl/unx/file_stat.cxx	8 Sep 2005 14:56:14 -0000	1.6
+++ openoffice.org/sal/osl/unx/file_stat.cxx	18 Jan 2006 14:38:41 -0000
@@ -42,6 +42,7 @@
 #ifndef _UNISTD_H
 #include <unistd.h>
 #endif
+#include <dirent.h>
 #include <osl/file.h>
 
 #ifndef _ERRNO_H
@@ -56,6 +57,9 @@
 #include "file_path_helper.hxx"
 #include "file_error_transl.h"
 
+#ifdef _DIRENT_HAVE_D_TYPE
+#include "file_impl.hxx"
+#endif
 
 namespace /* private */
 {
@@ -223,9 +227,19 @@
 	
 	/* we only need to call stat or lstat if one of the 
        following flags is set */
+#ifdef _DIRENT_HAVE_D_TYPE
+	inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslDirectoryItemImpl *pImpl)
+#else
 	inline bool is_stat_call_necessary(sal_uInt32 field_mask)
+#endif
 	{
-		return ((field_mask & osl_FileStatus_Mask_Type) ||
+		return (
+/* on linux the dirent might have d_type */
+#ifdef _DIRENT_HAVE_D_TYPE
+				((field_mask & osl_FileStatus_Mask_Type) && (!pImpl->bHasType || pImpl->DType == DT_UNKNOWN)) ||
+#else
+				(field_mask & osl_FileStatus_Mask_Type) ||
+#endif
 				(field_mask & osl_FileStatus_Mask_Attributes) ||
 				(field_mask & osl_FileStatus_Mask_CreationTime) ||
 				(field_mask & osl_FileStatus_Mask_AccessTime) ||
@@ -254,7 +268,11 @@
     	if ((NULL == Item) || (NULL == pStat))
         	return osl_File_E_INVAL;
 							
+#ifdef _DIRENT_HAVE_D_TYPE
+		file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(((oslDirectoryItemImpl* ) Item)->ustrFilePath));
+#else
 		file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(Item));    
+#endif
 
 		OSL_ASSERT(file_path.getLength() > 0);
 		
@@ -285,10 +303,18 @@
 #else
 	struct stat file_stat;
 #endif
-	if (is_stat_call_necessary(uFieldMask) && (0 != osl::lstat(file_path, file_stat)))
+
+#ifdef _DIRENT_HAVE_D_TYPE
+	oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
+	bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl);
+#else
+	bool bStatNeeded = is_stat_call_necessary(uFieldMask);
+#endif
+
+	if (bStatNeeded && (0 != osl::lstat(file_path, file_stat)))
     	return oslTranslateFileError(OSL_FET_ERROR, errno);
 	
-	if (is_stat_call_necessary(uFieldMask))
+	if (bStatNeeded)
 	{
 		// we set all these attributes because it's cheap				
 		set_file_type(file_stat, pStat);
@@ -305,6 +331,40 @@
 				return osl_error;
 		}
     }
+#ifdef _DIRENT_HAVE_D_TYPE
+    else if (uFieldMask & osl_FileStatus_Mask_Type)
+    {
+		OSL_ASSERT(pImpl->bHasType);
+
+		switch(pImpl->DType)
+		{
+		case DT_LNK:
+			pStat->eType = osl_File_Type_Link;              
+			break;
+		case DT_DIR:
+			pStat->eType = osl_File_Type_Directory;       
+			break;
+		case DT_REG:
+			pStat->eType = osl_File_Type_Regular;
+			break;
+		case DT_FIFO:
+			pStat->eType = osl_File_Type_Fifo;
+			break;
+		case DT_SOCK:
+			pStat->eType = osl_File_Type_Socket;
+			break;
+		case DT_CHR:
+		case DT_BLK:
+			pStat->eType = osl_File_Type_Special;
+			break;
+		default:
+			OSL_ASSERT(0);
+			pStat->eType = osl_File_Type_Unknown;
+		}
+
+       pStat->uValidFields |= osl_FileStatus_Mask_Type;
+	}
+#endif
 			
     if (uFieldMask & osl_FileStatus_Mask_FileURL)
     {
Index: sal/osl/unx/file_impl.hxx
===================================================================
--- /dev/null	2006-01-10 21:26:33.568399000 +0100
+++ openoffice.org/sal/osl/unx/file_impl.hxx	2006-01-17 20:05:30.000000000 +0100
@@ -0,0 +1,18 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef struct
+{
+	rtl_uString* ustrFilePath;       /* holds native file name */
+	unsigned char DType;
+	bool bHasType;
+	sal_uInt32 RefCount;
+} oslDirectoryItemImpl;
+
+	oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType=0 );
+	void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem );
+	void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem );
+	void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem );
+#ifdef __cplusplus
+} /* extern "C" */
+#endif

workspace.locales32.patch:
 i18npool/source/breakiterator/xdictionary.cxx |   75 +++++++++++++++++---------
 inc/xdictionary.hxx                           |    4 -
 2 files changed, 53 insertions(+), 26 deletions(-)

--- NEW FILE workspace.locales32.patch ---
diff -ru i18npool.orig/source/breakiterator/xdictionary.cxx i18npool/source/breakiterator/xdictionary.cxx
--- i18npool.orig/source/breakiterator/xdictionary.cxx	2009-05-28 10:03:10.000000000 +0100
+++ i18npool/source/breakiterator/xdictionary.cxx	2009-06-18 17:02:37.000000000 +0100
@@ -111,8 +112,9 @@
         japaneseWordBreak = sal_True;
 }
 
-sal_Bool xdictionary::exists(const sal_Unicode c) {
-        sal_Bool exist = existMark ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False;
+sal_Bool xdictionary::exists(const sal_uInt32 c) {
+        // 0x1FFF is the hardcoded limit in gendict for existMarks
+        sal_Bool exist = (existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False;
         if (!exist && japaneseWordBreak)
             return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN;
         else
@@ -169,20 +171,35 @@
  * @param pos : Position of the given character.
  * @return true if CJK.
  */
-sal_Bool xdictionary::seekSegment(const sal_Unicode *text, sal_Int32 pos, 
-                sal_Int32 len, Boundary& segBoundary) {
-        for (segBoundary.startPos = pos - 1; 
-            segBoundary.startPos >= 0 && 
-                (u_isWhitespace((sal_uInt32)text[segBoundary.startPos]) || exists(text[segBoundary.startPos]));
-            segBoundary.startPos--) ;
-        segBoundary.startPos++;
-
-        for (segBoundary.endPos = pos;
-            segBoundary.endPos < len &&
-                    (u_isWhitespace((sal_uInt32)text[segBoundary.endPos]) || exists(text[segBoundary.endPos]));
-            segBoundary.endPos++) ;
+sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos, 
+	Boundary& segBoundary)
+{
+    sal_Int32 indexUtf16;
+    segBoundary.endPos = segBoundary.startPos = pos;
+
+    indexUtf16 = pos;
+    while (indexUtf16 > 0)
+    {
+        sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, -1);
+        if (u_isWhitespace(ch) || exists(ch))
+            segBoundary.startPos = indexUtf16;
+        else
+            break;
+    }
 
-        return segBoundary.endPos > segBoundary.startPos + 1;
+    indexUtf16 = pos;
+    while (indexUtf16 < rText.getLength())
+    {
+        sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1);
+        if (u_isWhitespace(ch) || exists(ch))
+            segBoundary.endPos = indexUtf16;
+        else
+            break;
+    }
+
+    indexUtf16 = segBoundary.startPos;
+    rText.iterateCodePoints(&indexUtf16, 1);
+    return segBoundary.endPos > indexUtf16;
 }
 
 #define KANJA       1
@@ -312,19 +329,24 @@
         sal_Int32 len=rText.getLength();
         if (anyPos >= len || anyPos < 0) {
             boundary.startPos = boundary.endPos = anyPos < 0 ? 0 : len;
-        } else if (seekSegment(text, anyPos, len, boundary)) {          // character in dict
+        } else if (seekSegment(rText, anyPos, boundary)) {          // character in dict
             WordBreakCache& aCache = getCache(text, boundary);
             sal_Int32 i = 0;
 
-            while (aCache.wordboundary[i] <= (sal_Int32)anyPos - boundary.startPos) i++;
+            while (aCache.wordboundary[i] <= anyPos - boundary.startPos) i++;
 
             sal_Int32 startPos = aCache.wordboundary[i - 1];
             // if bDirection is false
-            if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos) &&
-                                                u_isWhitespace((sal_uInt32) text[anyPos - 1]))
-                i--;
-            boundary.endPos = aCache.wordboundary[i] + boundary.startPos;
-            boundary.startPos += aCache.wordboundary[i - 1];
+            if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos))
+            {
+                sal_Int32 indexUtf16 = anyPos-1;
+                sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1);
+                if (u_isWhitespace(ch))
+                    i--;
+            }
+            boundary.endPos = boundary.startPos;
+            rText.iterateCodePoints(&boundary.endPos, aCache.wordboundary[i]);
+            rText.iterateCodePoints(&boundary.startPos, aCache.wordboundary[i-1]);
         } else {
             boundary.startPos = anyPos;
             if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
@@ -332,8 +354,14 @@
         }
         if (wordType == WordType::WORD_COUNT) {
             // skip punctuation for word count.
-            while (boundary.endPos < len && u_ispunct((sal_uInt32)text[boundary.endPos])) 
-                boundary.endPos++;
+            while (boundary.endPos < len)
+            {
+                sal_Int32 indexUtf16 = boundary.endPos;
+                if (u_ispunct(rText.iterateCodePoints(&indexUtf16, 1)))
+                    boundary.endPos = indexUtf16;
+                else
+                    break;
+            }
         }
 
         return boundary;
--- i18npool.orig/inc/xdictionary.hxx	2009-05-28 10:03:15.000000000 +0100
+++ i18npool/inc/xdictionary.hxx	2009-06-18 16:46:15.000000000 +0100
@@ -85,9 +85,9 @@
 private:
 	WordBreakCache cache[CACHE_MAX];
 
-	sal_Bool        seekSegment(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len, Boundary& boundary);
+	sal_Bool        seekSegment(const rtl::OUString& rText, sal_Int32 pos, Boundary& boundary);
 	WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
-    sal_Bool        exists(const sal_Unicode u);
+	sal_Bool        exists(const sal_uInt32 u);
 	sal_Int32       getLongestMatch(const sal_Unicode *text, sal_Int32 len);
 };
 

workspace.sb113.patch:
 signal.c |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

--- NEW FILE workspace.sb113.patch ---
Index: osl/unx/signal.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/signal.c,v
retrieving revision 1.32.14.1
diff -u -r1.32.14.1 signal.c
--- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
+++ openoffice.org/sal/osl/unx/signal.c	18 Apr 2007 08:37:08 -0000
@@ -41,6 +41,7 @@
 
 #ifdef LINUX
 #include <execinfo.h>
+#include <link.h>
 #define INCLUDE_BACKTRACE
 #define STACKTYPE "Linux"
 #endif
@@ -393,6 +394,87 @@
 
 #define REPORTENV_PARAM		"-crashreportenv:"
 
+#ifdef LINUX
+
+typedef struct
+{
+    const char *name;
+    ElfW(Off) offset;
+} dynamic_entry;
+
+static int
+callback(struct dl_phdr_info *info, size_t size, void *data)
+{
+    const ElfW(Phdr) *pDynamic = NULL;
+
+    if (size == sizeof(struct dl_phdr_info))
+    {
+        int i;
+        for (i = 0; i < info->dlpi_phnum; ++i)
+        {
+            if (info->dlpi_phdr[i].p_type == PT_DYNAMIC)
+            {
+                pDynamic = &(info->dlpi_phdr[i]);
+                break;
+            }
+        }
+    }
+
+    if (pDynamic)
+    {
+        char buffer[100];
+        int len;
+        char exe[PATH_MAX];
+        const char *dsoname = info->dlpi_name;
+
+        dynamic_entry* entry = (dynamic_entry*)data;
+
+        if (strcmp(dsoname, "") == 0)
+        { 
+            snprintf(buffer, sizeof(buffer), "/proc/%d/exe", getpid());
+            if ((len = readlink(buffer, exe, PATH_MAX)) != -1)
+            {
+                exe[len] = '\0';
+                dsoname = exe;
+            }
+        }
+
+        if (strcmp(dsoname, entry->name) == 0)
+        {
+            entry->offset = pDynamic->p_offset;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/* Get the location of the .dynamic section offset for the given elf file.
+ * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo 
+ *
+ * We want to know this value so that if the binaries have been modifed
+ * by prelink then we can still process the call stack on server side 
+ * by comparing this value to that of an "un-prelinked but known to be
+ * otherwise equivalent" version of those binaries and adjust the call 
+ * stack addresses by the differences between .dynamic addresses so as 
+ * to be able to map the prelinked addresses back to the unprelinked 
+ * addresses
+ *
+ * cmc at openoffice.org
+ */
+static ElfW(Off)
+dynamic_section_offset(const char *name)
+{
+    dynamic_entry entry;
+
+    entry.name = name;
+    entry.offset = 0;
+
+    dl_iterate_phdr(callback, &entry);
+
+    return entry.offset;
+}
+#endif
+
 static int ReportCrash( int Signal )
 {
 #ifdef SAL_ENABLE_CRASH_REPORT
@@ -573,6 +655,11 @@
 
 							if ( dl_info.dli_fbase && dl_info.dli_fname )
 							{
+#ifdef LINUX
+								ElfW(Off) dynamic_offset = dynamic_section_offset(dl_info.dli_fname);
+								fprintf( stackout, " 0x%" SAL_PRI_SIZET "x:", dynamic_offset);
+#endif
+
 								fprintf( stackout, " %s + 0x%" SAL_PRI_PTRDIFFT "x",
 									dl_info.dli_fname,
 									(char*)stackframes[iFrame] - (char*)dl_info.dli_fbase
@@ -584,6 +671,10 @@
 
 								if ( dli_fdir )
 									fprintf( xmlout, " path=\"%s\"", dli_fdir );
+
+#ifdef LINUX
+								fprintf( xmlout, " dynamicoffset=\"0x%" SAL_PRI_SIZET "x\"", dynamic_offset );
+#endif
 							}
 							else
 								fprintf( stackout, " ????????" );

workspace.unifypaper01.patch:
 i18npool/inc/i18npool/paper.hxx                    |  155 
 i18npool/prj/build.lst                             |    3 
 i18npool/prj/d.lst                                 |    6 
 i18npool/source/paper/makefile.mk                  |   75 
 i18npool/source/paper/paper.cxx                    |  473 +
 psprint/source/printer/printerinfomanager.cxx      |   75 
 psprint/util/makefile.mk                           |    1 
 reportdesign/source/core/api/ReportDefinition.cxx  |    2 
 reportdesign/source/ui/report/ReportController.cxx |    4 
 sc/source/core/data/stlsheet.cxx                   |    8 
 sc/source/filter/excel/biffdump.cxx                | 9864 +++++++++++++++++++++
 sc/source/filter/excel/xlpage.cxx                  |  206 
 sc/source/filter/html/htmlimp.cxx                  |    4 
 sc/source/ui/app/transobj.cxx                      |    2 
 sc/source/ui/inc/printfun.hxx                      |    2 
 sc/source/ui/view/printfun.cxx                     |    4 
 scp2/source/ooo/file_library_ooo.scp               |    2 
 scp2/source/ooo/module_hidden_ooo.scp              |    1 
 sd/source/core/drawdoc2.cxx                        |    5 
 sd/source/ui/app/sdmod1.cxx                        |    4 
 sd/source/ui/dlg/dlgpage.cxx                       |    4 
 sd/source/ui/view/PrintManager.cxx                 |    4 
 sfx2/source/doc/printhelper.cxx                    |   89 
 solenv/inc/libs.mk                                 |    2 
 starmath/source/unomodel.cxx                       |   28 
 svx/inc/svx/dialogs.hrc                            |   42 
 svx/inc/svx/paperinf.hxx                           |  116 
 svx/inc/svx/svxenum.hxx                            |   43 
 svx/source/dialog/page.cxx                         |   32 
 svx/source/dialog/page.h                           |   42 
 svx/source/dialog/page.hxx                         |    9 
 svx/source/dialog/page.src                         |  138 
 svx/source/items/paperinf.cxx                      |  298 
 svx/source/items/paraitem.cxx                      |    1 
 svx/util/makefile.mk                               |    1 
 sw/inc/bookmrk.hxx                                 |  218 
 sw/source/core/doc/docdesc.cxx                     |    6 
 sw/source/core/doc/poolfmt.cxx                     |    2 
 sw/source/core/unocore/unostyle.cxx                |    5 
 sw/source/core/view/vprint.cxx                     |    2 
 sw/source/filter/basflt/shellio.cxx                |    7 
 sw/source/filter/rtf/swparrtf.cxx                  |   10 
 sw/source/filter/rtf/wrtrtf.cxx                    |    5 
 sw/source/filter/ww8/dump/ww8scan.cxx              |    2 
 sw/source/filter/ww8/writerwordglue.cxx            |   49 
 sw/source/filter/ww8/writerwordglue.hxx            |   19 
 sw/source/filter/ww8/ww8atr.cxx                    |    9 
 sw/source/filter/ww8/ww8par6.cxx                   |   13 
 sw/source/filter/ww8/ww8scan.cxx                   |    2 
 sw/source/filter/ww8/ww8scan.hxx                   |    5 
 sw/source/ui/app/appenv.cxx                        |    5 
 sw/source/ui/dochdl/swdtflvr.cxx                   |    2 
 sw/source/ui/envelp/envfmt.cxx                     |   26 
 sw/source/ui/envelp/envimg.cxx                     |    5 
 sw/source/ui/frmdlg/colex.cxx                      |    2 
 sw/source/ui/inc/colex.hxx                         |    3 
 sw/source/ui/uiview/pview.cxx                      |    6 
 sw/source/ui/uiview/viewport.cxx                   |    5 
 swext/mediawiki/build.xml                          |    6 
 vcl/aqua/source/gdi/salprn.cxx                     |    8 
 vcl/inc/vcl/jobset.h                               |    2 
 vcl/inc/vcl/print.hxx                              |    9 
 vcl/inc/vcl/prntypes.hxx                           |   28 
 vcl/inc/vcl/salprn.hxx                             |    2 
 vcl/source/gdi/print.cxx                           |  154 
 vcl/unx/headless/svpprn.cxx                        |   42 
 vcl/unx/source/gdi/salprnpsp.cxx                   |   44 
 vcl/util/linksvp/makefile.mk                       |    1 
 vcl/util/makefile.mk                               |    4 
 vcl/win/source/gdi/salprn.cxx                      |  325 
 writerfilter/source/dmapper/ConversionHelper.cxx   |   51 
 writerfilter/source/dmapper/ConversionHelper.hxx   |    1 
 writerfilter/source/dmapper/DomainMapper.cxx       |   24 
 writerfilter/source/dmapper/PropertyMap.cxx        |   10 
 writerfilter/util/makefile.mk                      |    1 
 75 files changed, 11642 insertions(+), 1223 deletions(-)

--- NEW FILE workspace.unifypaper01.patch ---
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/i18npool/prj/build.lst OOO310_m12/i18npool/prj/build.lst
--- OOO310_m12.orig/i18npool/prj/build.lst	2009-05-27 14:29:21.000000000 +0100
+++ OOO310_m12/i18npool/prj/build.lst	2009-05-27 14:40:28.000000000 +0100
@@ -9,6 +9,7 @@
 inp  i18npool\source\isolang                    nmake   -   all inp_isolang inp_inc NULL
 inp  i18npool\source\localedata                 nmake   -   all inp_localedata inp_isolang inp_inc NULL
 inp  i18npool\source\localedata\data            nmake   -   all inp_locdata_data inp_localedata inp_inc NULL
+inp  i18npool\source\paper	                nmake   -   all inp_paper inp_isolang inp_inc NULL
 inp  i18npool\source\calendar                   nmake   -   all inp_cal inp_inc NULL
 inp  i18npool\source\numberformatcode           nmake   -   all inp_numformat inp_inc NULL
 inp  i18npool\source\defaultnumberingprovider   nmake   -   all inp_dnum inp_inc NULL
@@ -22,4 +23,4 @@
 inp  i18npool\source\textconversion\data        nmake   -   all inp_textconv_dict inp_textconversion inp_inc NULL
 inp  i18npool\source\search                     nmake   -   all inp_search inp_inc NULL
 inp  i18npool\source\ordinalsuffix              nmake   -   all inp_ordinalsuffix NULL
-inp  i18npool\util                              nmake   -   all inp_util inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index inp_index_data inp_collator inp_collator_data inp_inputchecker inp_textconversion inp_textconv_dict inp_search inp_isolang inp_ordinalsuffix NULL
+inp  i18npool\util                              nmake   -   all inp_util inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index inp_index_data inp_collator inp_collator_data inp_inputchecker inp_textconversion inp_textconv_dict inp_search inp_isolang inp_paper inp_ordinalsuffix NULL
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/i18npool/prj/d.lst OOO310_m12/i18npool/prj/d.lst
--- OOO310_m12.orig/i18npool/prj/d.lst	2009-05-27 14:29:21.000000000 +0100
+++ OOO310_m12/i18npool/prj/d.lst	2009-05-27 14:40:28.000000000 +0100
@@ -40,3 +40,9 @@
 ..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin%_EXT%\i18nisol*.dll
 ..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib%_EXT%\libi18nisolang*.so
 ..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib%_EXT%\libi18nisolang*.dylib
+
+..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib%_EXT%\ii18npaper*.lib
+..\%__SRC%\bin\i18npaper*.dll %_DEST%\bin%_EXT%\i18npaper*.dll
+..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
+..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib
+
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/psprint/source/printer/printerinfomanager.cxx OOO310_m12/psprint/source/printer/printerinfomanager.cxx
--- OOO310_m12.orig/psprint/source/printer/printerinfomanager.cxx	2009-05-27 14:26:36.000000000 +0100
+++ OOO310_m12/psprint/source/printer/printerinfomanager.cxx	2009-05-27 15:22:48.000000000 +0100
@@ -43,6 +43,7 @@
 #include <psprint/fontmanager.hxx>
 #include <psprint/strhelper.hxx>
 #include <rtl/strbuf.hxx>
+#include <i18npool/paper.hxx>
 
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
@@ -156,77 +157,9 @@
 
 void PrinterInfoManager::initSystemDefaultPaper()
 {
-    bool bSuccess = false;
-
-    // try libpaper
-
-    // #i78617# workaround missing paperconf command
-    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
-    if( pPipe )
-    {
-        char pBuffer[ 1024 ];
-        *pBuffer = 0;
-        fgets( pBuffer, sizeof(pBuffer)-1, pPipe );
-        pclose( pPipe );
-        
-        ByteString aPaper( pBuffer );
-        aPaper = WhitespaceToSpace( aPaper );
-        if( aPaper.Len() )
-        {
-            m_aSystemDefaultPaper = OUString( OStringToOUString( aPaper, osl_getThreadTextEncoding() ) );
-            bSuccess = true;
-            #if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "paper from paperconf = %s\n", aPaper.GetBuffer() );
-            #endif
-        }
-        if( bSuccess )
-            return;
-    }
-
-    // default value is Letter for US (en_US), Cannada (en_CA, fr_CA); else A4
-    // en will be interpreted as en_US
-    
-    // note: at this point m_aSystemDefaultPaper is set to "A4" from the constructor
-    
-    // check for LC_PAPER
-    const char* pPaperLang = getenv( "LC_PAPER" );
-    if( pPaperLang && *pPaperLang )
-    {
-        OString aLang( pPaperLang );
-        if( aLang.getLength() > 5 )
-            aLang = aLang.copy( 0, 5 );
-        if( aLang.getLength() == 5 )
-        {
-            if(    aLang.equalsIgnoreAsciiCase( "en_us" )
-                || aLang.equalsIgnoreAsciiCase( "en_ca" )
-            || aLang.equalsIgnoreAsciiCase( "fr_ca" )
-            )
-                m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        }
-        else if( aLang.getLength() == 2 && aLang.equalsIgnoreAsciiCase( "en" ) )
-            m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        return;
-    }
-    
-    // use process locale to determine paper
-    rtl_Locale* pLoc = NULL;
-    osl_getProcessLocale( &pLoc );
-    if( pLoc )
-    {
-        if( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Language->buffer, pLoc->Language->length, "en") )
-        {
-            if(    0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Country->buffer, pLoc->Country->length, "us")
-                || 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Country->buffer, pLoc->Country->length, "ca")
-                || pLoc->Country->length == 0
-                )
-                m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        }
-        else if( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Language->buffer, pLoc->Language->length, "fr") )
-        {
-            if( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Country->buffer, pLoc->Country->length, "ca") )
-                m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        }
-    }
+    m_aSystemDefaultPaper = rtl::OStringToOUString(
+        PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()),
+        RTL_TEXTENCODING_UTF8);
 }
 
 // -----------------------------------------------------------------
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/psprint/util/makefile.mk OOO310_m12/psprint/util/makefile.mk
--- OOO310_m12.orig/psprint/util/makefile.mk	2009-05-27 14:26:36.000000000 +0100
+++ OOO310_m12/psprint/util/makefile.mk	2009-05-27 15:22:47.000000000 +0100
@@ -67,6 +67,7 @@
 
 SHL1STDLIBS=$(UNOTOOLSLIB)		\
 			$(I18NISOLANGLIB) 	\
+			$(I18NPAPERLIB) 	\
 			$(TOOLSLIB) 		\
             $(COMPHELPERLIB)    \
             $(CPPULIB)          \
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/reportdesign/source/core/api/ReportDefinition.cxx OOO310_m12/reportdesign/source/core/api/ReportDefinition.cxx
--- OOO310_m12.orig/reportdesign/source/core/api/ReportDefinition.cxx	2009-05-27 14:27:46.000000000 +0100
+++ OOO310_m12/reportdesign/source/core/api/ReportDefinition.cxx	2009-05-27 14:40:27.000000000 +0100
@@ -289,7 +289,7 @@
 :OStyle_PBASE(m_aBHelper)
 ,m_aSize(21000,29700)
 {
-    const ::Size aDefaultSize = SvxPaperInfo::GetPaperSize(SvxPaperInfo::GetDefaultSvxPaper(Application::GetSettings().GetLanguage()),MAP_100TH_MM);
+    const ::Size aDefaultSize = SvxPaperInfo::GetDefaultPaperSize( MAP_100TH_MM );
     m_aSize.Height = aDefaultSize.Height();
     m_aSize.Width = aDefaultSize.Width();
 
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/reportdesign/source/ui/report/ReportController.cxx OOO310_m12/reportdesign/source/ui/report/ReportController.cxx
--- OOO310_m12.orig/reportdesign/source/ui/report/ReportController.cxx	2009-05-27 14:27:46.000000000 +0100
+++ OOO310_m12/reportdesign/source/ui/report/ReportController.cxx	2009-05-27 14:40:27.000000000 +0100
@@ -2339,8 +2339,8 @@
 		new SvxPageItem(RPTUI_ID_PAGE),
 		new SvxSizeItem(RPTUI_ID_SIZE),
 		new SfxAllEnumItem(RPTUI_ID_PAGE_MODE,SVX_PAGE_MODE_STANDARD),
-		new SfxAllEnumItem(RPTUI_ID_START,SVX_PAPER_A4),
-		new SfxAllEnumItem(RPTUI_ID_END,SVX_PAPER_E),
+		new SfxAllEnumItem(RPTUI_ID_START,PAPER_A4),
+		new SfxAllEnumItem(RPTUI_ID_END,PAPER_E),
 		new SvxBrushItem(ITEMID_BRUSH),
 		new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<UINT16>(eUserMetric))
 	};
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/sc/source/core/data/stlsheet.cxx OOO310_m12/sc/source/core/data/stlsheet.cxx
--- OOO310_m12.orig/sc/source/core/data/stlsheet.cxx	2009-05-27 14:26:41.000000000 +0100
+++ OOO310_m12/sc/source/core/data/stlsheet.cxx	2009-05-27 14:40:27.000000000 +0100
@@ -176,14 +176,8 @@
 					if ( pDoc && pDoc->IsLoadingDone() )
 					{
 						// Setzen von sinnvollen Default-Werten:
-						// SfxPrinter*		pPrinter = pDoc->GetPrinter();
 						SvxPageItem		aPageItem( ATTR_PAGE );
-						// #50536# PaperBin auf Default lassen,
-						// nicht auf aktuelle Drucker-Einstellung umsetzen
-						// SvxSizeItem		aPaperSizeItem(ATTR_PAGE_SIZE,SvxPaperInfo::GetPaperSize(pPrinter) );
-
-						SvxPaper		aDefaultPaper = SvxPaperInfo::GetDefaultSvxPaper( Application::GetSettings().GetLanguage() );
-						SvxSizeItem		aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetPaperSize(aDefaultPaper) );
+						SvxSizeItem		aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() );
 
 						SvxSetItem		aHFSetItem(
 											(const SvxSetItem&)
diff -ru --exclude='unxlng*.pro' --exclude=localize.sdf OOO310_m12.orig/sc/source/filter/excel/biffdump.cxx OOO310_m12/sc/source/filter/excel/biffdump.cxx
--- OOO310_m12.orig/sc/source/filter/excel/biffdump.cxx	2009-05-27 14:26:42.000000000 +0100
+++ OOO310_m12/sc/source/filter/excel/biffdump.cxx	2009-05-27 14:40:27.000000000 +0100
@@ -9862,3 +9862,9867 @@
 
 #endif
 
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: biffdump.cxx,v $
+ * $Revision: 1.91 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
[...13983 lines suppressed...]
+                {
+                    { "B0",   PAPER_B0_ISO },
+                    { "B1",   PAPER_B1_ISO },
+                    { "B2",   PAPER_B2_ISO },
+                    { "B3",   PAPER_B3_ISO },
+                    { "B4",   PAPER_B4_ISO },
+                    { "B5",   PAPER_B5_ISO },
+                    { "B6",   PAPER_B6_ISO },
+                    { "B7",   PAPER_B7_ISO },
+                    { "B8",   PAPER_B8_ISO },
+                    { "B9",   PAPER_B9_ISO },
+                    { "B10",  PAPER_B10_ISO },
+                    { "folio", PAPER_FANFOLD_LEGAL_DE },
+                    { "flsa",  PAPER_FANFOLD_LEGAL_DE },
+                    { "flse",  PAPER_FANFOLD_LEGAL_DE }
+                };
+
+                bool bHalve = false;
+
+                size_t nExtraTabSize = sizeof(aCustoms) / sizeof(aCustoms[0]);
+                for (size_t i = 0; i < nExtraTabSize; ++i)
+                {
+                    if (rtl_str_compareIgnoreAsciiCase(aCustoms[i].pName, aPaper.getStr()) == 0)
+                    {
+                        ePaper = aCustoms[i].ePaper;
+                        break;
+                    }
+                }
+
+                if (ePaper == PAPER_USER)
+                {
+                    bHalve = !rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
+                        aPaper.getStr(), aPaper.getLength(),  "half", 4, 4);
+                    if (bHalve)
+                        aPaper = aPaper.copy(4);
+                    ePaper = PaperInfo::fromPSName(aPaper);
+                }
+
+                if (ePaper != PAPER_USER)
+                {
+                    aInstance = PaperInfo(ePaper);
+                    if (bHalve)
+                        aInstance = PaperInfo(aInstance.getHeight()/2, aInstance.getWidth());
+                    bInitialized = true;
+                    return aInstance;
+                }
+            }
+        }
+
+#if defined(LC_PAPER) && defined(_GNU_SOURCE)
+
+        union paperword { char *string; int word; };
+
+        // try LC_PAPER
+        paperword w, h;
+        w.string = nl_langinfo(_NL_PAPER_WIDTH);
+        h.string = nl_langinfo(_NL_PAPER_HEIGHT);
+
+        //glibc stores sizes as integer mm units
+        w.word *= 100;
+        h.word *= 100;
+
+        for ( size_t i = 0; i < nTabSize; ++i )
+        {
+            if (i == PAPER_USER) continue;
+            
+            //glibc stores sizes as integer mm units, and so is inaccurate. To
+            //find a standard paper size we calculate the standard paper sizes
+            //into equally inaccurate mm and compare
+            long width = (aDinTab[i].m_nWidth + 50) / 100;
+            long height = (aDinTab[i].m_nHeight + 50) / 100;
+    
+            if (width == w.word/100 && height == h.word/100)
+            {
+                w.word = aDinTab[i].m_nWidth;
+                h.word = aDinTab[i].m_nHeight;
+                break;
+            }
+        }
+
+        aInstance = PaperInfo(w.word, h.word);
+        bInitialized = true;
+        return aInstance;
+#endif
+    }
+#endif
+
+    try
+    {
+        // if set to "use system", try to get locale from system
+        if( aLocaleStr.getLength() == 0 )
+            xConfigNA->getByName( CREATE_OUSTRING( "Locale" ) ) >>= aLocaleStr;
+    }
+    catch( Exception& ) {}
+
+
+    if (aLocaleStr.getLength() == 0)
+        aLocaleStr = CREATE_OUSTRING("en-US");
+
+    // convert locale string to locale struct
+    ::com::sun::star::lang::Locale aSysLocale;
+    sal_Int32 nDashPos = aLocaleStr.indexOf( '-' );
+    if( nDashPos < 0 ) nDashPos = aLocaleStr.getLength();
+    aSysLocale.Language = aLocaleStr.copy( 0, nDashPos );
+    if( nDashPos + 1 < aLocaleStr.getLength() )
+        aSysLocale.Country = aLocaleStr.copy( nDashPos + 1 );
+
+    return PaperInfo::getDefaultPaperForLocale(aSysLocale);
+}
+
+PaperInfo::PaperInfo(Paper eType) : m_eType(eType)
+{
+    m_nPaperWidth = aDinTab[m_eType].m_nWidth;
+    m_nPaperHeight = aDinTab[m_eType].m_nHeight;
+}
+
+PaperInfo::PaperInfo(long nPaperWidth, long nPaperHeight)
+    : m_eType(PAPER_USER),
+      m_nPaperWidth(nPaperWidth),
+      m_nPaperHeight(nPaperHeight)
+{
+    for ( size_t i = 0; i < nTabSize; ++i )
+    {
+        if ( 
+             (nPaperWidth == aDinTab[i].m_nWidth) &&
+             (nPaperHeight == aDinTab[i].m_nHeight)
+           )
+        {
+            m_eType = static_cast<Paper>(i);
+            break;
+        }
+    }
+}
+
+rtl::OString PaperInfo::toPSName(Paper ePaper)
+{
+    return static_cast<size_t>(ePaper) < nTabSize ?
+        rtl::OString(aDinTab[ePaper].m_pPSName) : rtl::OString();
+}
+
+Paper PaperInfo::fromPSName(const rtl::OString &rName)
+{
+    if (!rName.getLength())
+        return PAPER_USER;
+
+    for ( size_t i = 0; i < nTabSize; ++i )
+    {
+        if (aDinTab[i].m_pPSName && 
+          !rtl_str_compareIgnoreAsciiCase(aDinTab[i].m_pPSName, rName.getStr()))
+        {
+            return static_cast<Paper>(i);
+        }
+        else if (aDinTab[i].m_pAltPSName &&
+          !rtl_str_compareIgnoreAsciiCase(aDinTab[i].m_pAltPSName, rName.getStr()))
+        {
+            return static_cast<Paper>(i);
+        }
+    }
+
+    return PAPER_USER;
+}
+
+//http://wiki.services.openoffice.org/wiki/DefaultPaperSize
+//http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/localedata/locales/?cvsroot=glibc
+//http://www.unicode.org/cldr/data/charts/supplemental/territory_language_information.html
+//http://en.wikipedia.org/wiki/Paper_size
+//http://msdn.microsoft.com/en-us/library/cc195164.aspx
+PaperInfo PaperInfo::getDefaultPaperForLocale(
+    const ::com::sun::star::lang::Locale & rLocale)
+{
+    Paper eType = PAPER_A4;
+
+    if (
+        //United States, Letter
+        !rLocale.Country.compareToAscii("US") ||
+        //Puerto Rico, http://sources.redhat.com/ml/libc-hacker/2001-07/msg00046.html
+        !rLocale.Country.compareToAscii("PR") ||
+        //Canada, http://sources.redhat.com/ml/libc-hacker/2001-07/msg00053.html
+        !rLocale.Country.compareToAscii("CA") ||
+        //Venuzuela, https://www.redhat.com/archives/fedora-devel-list/2008-August/msg00019.html
+        !rLocale.Country.compareToAscii("VE") ||
+        //Chile, https://www.redhat.com/archives/fedora-devel-list/2008-August/msg00240.html
+        !rLocale.Country.compareToAscii("CL") ||
+        //Mexico, http://qa.openoffice.org/issues/show_bug.cgi?id=49739
+        !rLocale.Country.compareToAscii("MX") ||
+        //Colombia, http://qa.openoffice.org/issues/show_bug.cgi?id=69703
+        !rLocale.Country.compareToAscii("CO") ||
+        //Philippines, 
+        //    http://ubuntuliving.blogspot.com/2008/07/default-paper-size-in-evince.html
+        //    http://www.gov.ph/faqs/driverslicense.asp
+        !rLocale.Country.compareToAscii("PH")
+       )
+    {
+        eType = PAPER_LETTER;
+    }
+
+    return eType;
+}
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */

workspace.vcl103.patch:
 inc/vcl/sndstyle.hxx           |    3 +--
 unx/gtk/window/gtkframe.cxx    |    7 ++++++-
 win/source/window/salframe.cxx |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE workspace.vcl103.patch ---
diff -ru vcl.orig/inc/vcl/sndstyle.hxx vcl/inc/vcl/sndstyle.hxx
--- vcl.orig/inc/vcl/sndstyle.hxx	2009-07-02 10:10:49.000000000 +0100
+++ vcl/inc/vcl/sndstyle.hxx	2009-07-03 16:08:55.000000000 +0100
@@ -43,7 +43,6 @@
 #define SOUND_WARNING                   ((SoundType)2)
 #define SOUND_ERROR                     ((SoundType)3)
 #define SOUND_QUERY                     ((SoundType)4)
-
-#define SOUND_DISABLE                   (SOUND_DEFAULT)
+#define SOUND_DISABLE                   ((SoundType)5)
 
 #endif // _SV_SNDSTYLE_HXX
diff -ru vcl.orig/win/source/window/salframe.cxx vcl/win/source/window/salframe.cxx
--- vcl.orig/win/source/window/salframe.cxx	2009-07-02 10:10:22.000000000 +0100
+++ vcl/win/source/window/salframe.cxx	2009-07-03 16:10:27.000000000 +0100
@@ -3157,7 +3157,8 @@
         MB_ICONASTERISK,                // SOUND_INFO
         MB_ICONEXCLAMATION,             // SOUND_WARNING
         MB_ICONHAND,                    // SOUND_ERROR
-        MB_ICONQUESTION                 // SOUND_QUERY
+        MB_ICONQUESTION,                // SOUND_QUERY
+        0	                        // SOUND_DISABLE
     };
 
     MessageBeep( aImplSoundTab[eSoundType] );
diff -ru vcl.orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- vcl.orig/unx/gtk/window/gtkframe.cxx	2009-07-02 10:10:48.000000000 +0100
+++ vcl/unx/gtk/window/gtkframe.cxx	2009-07-02 10:13:01.000000000 +0100
@@ -824,7 +824,12 @@
         }
         if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ) )
         {
-            eType = GDK_WINDOW_TYPE_HINT_DOCK;
+	    //KWin apparently gets very confused with a DOCK hint on such a
+	    //full-screen window shown on one monitor of many
+            if (getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("KWin"))
+                eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
+            else
+                eType = GDK_WINDOW_TYPE_HINT_DOCK;
             gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
         }
         

workspace.vcl104.patch:
 sm.cxx |   40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

--- NEW FILE workspace.vcl104.patch ---
diff -ru vcl.orig/unx/source/app/sm.cxx vcl/unx/source/app/sm.cxx
--- vcl.orig/unx/source/app/sm.cxx	2009-04-27 08:31:01.000000000 +0100
+++ vcl/unx/source/app/sm.cxx	2009-04-27 14:38:55.000000000 +0100
@@ -48,6 +48,7 @@
 #include <saldisp.hxx>
 #include <salframe.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <salinst.h>
 
 #include <osl/conditn.h>
@@ -187,6 +188,7 @@
 static SmProp*	pSmProps = NULL;
 static SmProp**	ppSmProps = NULL;
 static int		nSmProps = 0;
+static unsigned char   *pSmRestartHint = NULL;
 
 
 static void BuildSmPropertyList()
@@ -195,7 +197,7 @@
 	{
 		ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
 
-		nSmProps = 4;
+		nSmProps = 5;
 		pSmProps = new SmProp[ nSmProps ];
 
 		pSmProps[ 0 ].name		= const_cast<char*>(SmCloneCommand);
@@ -243,6 +245,15 @@
 		pSmProps[ 3 ].vals->value	= strdup( aUser.getStr() );
 		pSmProps[ 3 ].vals->length	= strlen( (char *)pSmProps[ 3 ].vals->value )+1;
 
+		pSmProps[ 4 ].name		= const_cast<char*>(SmRestartStyleHint);
+		pSmProps[ 4 ].type		= const_cast<char*>(SmCARD8);
+		pSmProps[ 4 ].num_vals	= 1;
+		pSmProps[ 4 ].vals		= new SmPropValue;
+		pSmProps[ 4 ].vals->value	= malloc(1);
+		pSmRestartHint = (unsigned char *)pSmProps[ 4 ].vals->value;
+		*pSmRestartHint = SmRestartIfRunning;
+		pSmProps[ 4 ].vals->length	= 1;
+
 		ppSmProps = new SmProp*[ nSmProps ];
 		for( int i = 0; i < nSmProps; i++ )
 			ppSmProps[ i ] = &pSmProps[i];
@@ -257,6 +268,31 @@
 IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
 {
     SMprintf( "posting save documents event shutdown = %s\n", (pThis!=0) ? "true" : "false" );
+
+    static bool bFirstShutdown=true;
+    if (pThis != 0 && bFirstShutdown) //first shutdown request
+    {
+        bFirstShutdown = false;
+        /*
+          If we have no actual frames open, e.g. we launched a quickstarter,
+          and then shutdown all our frames leaving just a quickstarter running,
+          then we don't want to launch an empty toplevel frame on the next 
+          start. (The job of scheduling the restart of the quick-starter is a 
+          task of the quick-starter)
+        */
+        *pSmRestartHint = SmRestartNever;
+        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
+        {
+            Window *pWindow = (*it)->GetWindow();
+            if (pWindow && pWindow->IsVisible())
+            {
+                *pSmRestartHint = SmRestartIfRunning;
+                break;
+            }
+        }
+    }
+
     if( pOneInstance )
     {
         SalSessionSaveRequestEvent aEvent( pThis != 0, false );
@@ -385,7 +421,7 @@
         ICEConnectionObserver::lock();
         SmcSetProperties( aSmcConnection, nSmProps, ppSmProps );
         SmcSaveYourselfDone( aSmcConnection, True );
-        SMprintf( "sent SaveYourselfDone\n" );
+        SMprintf( "sent SaveYourselfDone SmRestartHint of %d\n", *pSmRestartHint );
         bDocSaveDone = true;
         ICEConnectionObserver::unlock();
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1930
retrieving revision 1.1931
diff -u -p -r1.1930 -r1.1931
--- openoffice.org.spec	26 Aug 2009 13:11:56 -0000	1.1930
+++ openoffice.org.spec	28 Aug 2009 09:43:31 -0000	1.1931
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 11
-%define rh_rpm_release 6
+%define ooomilestone 19
+%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.0
+Version:        3.1.1
 Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
@@ -70,7 +70,7 @@ BuildRequires:  pentaho-reporting-flow-e
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
-Patch2:  planned.workspace.defaultdoclang.patch
+Patch2:  workspace.defaultdoclang.patch
 %if %{gtkprintui}
 Patch3:  openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
@@ -86,8 +86,8 @@ Patch11: openoffice.org-2.0.3.rh127576.g
 %endif
 Patch12: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
 Patch13: ooo-build.ooo68717.gstreamer.video.patch
-Patch14: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch15: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.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
@@ -107,54 +107,55 @@ Patch31: workspace.mav46.patch
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
 Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch35: workspace.sb109.patch
-Patch36: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch37: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch38: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch39: workspace.cmcfixes54.patch
-Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch41: workspace.fwk103.patch
-Patch42: workspace.hb18.patch
-Patch43: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch44: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch45: workspace.vcl100.patch
-Patch46: workspace.xmergeclean.patch
-Patch47: workspace.mba32issues02.patch
-Patch48: workspace.impress169.patch
-Patch49: workspace.os130.patch
-Patch50: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch51: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch52: workspace.cmcfixes57.patch
-Patch53: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch54: ooo-build.ooo2497.filter.svg.patch
-Patch55: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch56: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch57: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch58: workspace.vcl101.patch
-Patch59: workspace.slideshow1.patch
-Patch60: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch61: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
-Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
-Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
-Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
-Patch68: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch69: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
-Patch70: workspace.pdfextfix02.patch
-Patch71: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
-Patch72: workspace.aw073.patch
-Patch73: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
-Patch74: openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
-Patch75: workspace.calc311fixes.patch
-Patch76: openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
-Patch77: openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch
-Patch78: workspace.os132.patch
-Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.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: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1599,8 +1600,8 @@ cat %{PATCH11} >> svtools/source/dialogs
 %endif
 %patch12 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
 %patch13 -p0 -b .ooo68717.gstreamer.video.patch
-%patch14 -p1 -b .ooo63159.sal.dtype.patch
-%patch15 -p1 -b .ooo76393.sal.dynamicsection.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
@@ -1620,54 +1621,55 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
 %patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch35 -p1 -b .workspace.sb109.patch
-%patch36 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch38 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch39 -p1 -b .workspace.cmcfixes54.patch
-%patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p0 -b .workspace.hb18.patch
-%patch43 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch44 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch45 -p0 -b .workspace.vcl100.patch
-%patch46 -p0 -b .workspace.xmergeclean.patch
-%patch47 -p0 -b .workspace.mba32issues02.patch
-%patch48 -p0 -b .workspace.impress169.patch
-%patch49 -p0 -b .workspace.os130.patch
-%patch50 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch51 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch52 -p0 -b .workspace.cmcfixes57.patch
-%patch53 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch54 -p1 -b .ooo2497.filter.svg.patch
-%patch55 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch56 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch57 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch58 -p1 -b .workspace.vcl101.patch
-%patch59 -p2 -b .workspace.slideshow1.patch
-%patch60 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch61 -p0 -b .ooo101274.opening-a-directory.patch
-%patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
-%patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
-%patch66 -p0 -b .ooo100469.sal.ia64_arm.patch
-%patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
-%patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch69 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
-%patch70 -p0 -b .workspace.pdfextfix02.patch
-%patch71 -p0 -b .ooo102920.i18npool.utf16bustage.patch
-%patch72 -p0 -b .workspace.aw073.patch
-%patch73 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
-%patch74 -p0 -b .ooo103277.vcl.kwinworkaround.patch
-%patch75 -p0 -b .workspace.calc311fixes.patch
-%patch76 -p0 -b .oooXXXXX.svx.64bit.patch
-%patch77 -p0 -b .ooo103651.canvas.nosubpixel.patch
-%patch78 -p0 -b .workspace.os132.patch
-%patch79 -p0 -b .ooo104306.moverecentlyused.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 .ooo104157.svx.crashonencryptparse.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4170,13 +4172,16 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Aug 26 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+* Fri Aug 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.1
+- update to 3.1.1
 - Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
 - add workspace.os132.patch to avoid switch html view overwrite horror
 - Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
 - Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-- Resolves: rbhz#501141 Images and Frames disappear in sequential
-  printing
+- Resolves: rbhz#501141 Images and Frames disappear in sequential printing
+- backport workspace.vcl102.patch to fix xdg support
+- add workspace.cmcfixes62.patch for 64bit odbc goodness and rebuild
+  against now 64bit-safe unixODBC headers
 
 * Thu Jul 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/sources,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -p -r1.362 -r1.363
--- sources	24 Apr 2009 15:10:52 -0000	1.362
+++ sources	28 Aug 2009 09:43:31 -0000	1.363
@@ -7,4 +7,4 @@ eaf47e2e3d3586f6156c61379cc34df9  redhat
 f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-5c2ea75bb826f5d807d74e176b7048ec  OOO310_m11.tar.bz2
+e95de733b1ac6e885515ee8bcca87998  OOO310_m19.tar.bz2


--- openoffice.org-2.2.0.ooo63159.sal.dtype.patch DELETED ---


--- openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch DELETED ---


--- openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch DELETED ---


--- openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch DELETED ---


--- openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch DELETED ---


--- openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch DELETED ---


--- openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch DELETED ---


--- openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch DELETED ---


--- openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch DELETED ---


--- openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch DELETED ---


--- openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch DELETED ---


--- openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch DELETED ---


--- openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch DELETED ---


--- openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch DELETED ---


--- openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch DELETED ---


--- openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch DELETED ---


--- openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch DELETED ---


--- openoffice.org-3.1.1.ooo104306.moverecentlyused.patch DELETED ---


--- planned.workspace.defaultdoclang.patch DELETED ---


--- workspace.aw073.patch DELETED ---


--- workspace.calc311fixes.patch DELETED ---


--- workspace.pdfextfix02.patch DELETED ---


--- workspace.sb109.patch DELETED ---



From ovasik at fedoraproject.org  Fri Aug 28 09:47:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 28 Aug 2009 09:47:06 +0000 (UTC)
Subject: rpms/docbook-style-dsssl/devel docbook-style-dsssl.Makefile, 1.2,
	1.3 docbook-style-dsssl.spec, 1.20, 1.21
Message-ID: <20090828094706.820C411C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-dsssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9132

Modified Files:
	docbook-style-dsssl.Makefile docbook-style-dsssl.spec 
Log Message:
 ship manpage for collateindex.pl,  preserve attributes and timestamps in Makefile


Index: docbook-style-dsssl.Makefile
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-dsssl/devel/docbook-style-dsssl.Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- docbook-style-dsssl.Makefile	10 Nov 2005 12:31:40 -0000	1.2
+++ docbook-style-dsssl.Makefile	28 Aug 2009 09:47:06 -0000	1.3
@@ -1,38 +1,43 @@
 BINDIR = /usr/bin
 DESTDIR = /usr/share/sgml/docbook/dsssl-stylesheets-1.74b
+MANDIR= /usr/share/man
 
 all: install
 
-install: install-bin install-dtd install-dsl install-img install-misc
+install: install-bin install-dtd install-dsl install-img install-misc install-man
 
 install-bin:
 	mkdir -p $(BINDIR)
-	install bin/collateindex.pl $(BINDIR)
+	install -p bin/collateindex.pl $(BINDIR)
+
+install-man:
+	mkdir -p $(MANDIR)/man1
+	install -p bin/collateindex.pl.1 $(MANDIR)/man1
 
 install-dtd:
 	mkdir -p $(DESTDIR)/dtds/{decls,dbdsssl,html,imagelib,olink}
-	cp dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls
-	cp dtds/decls/xml.dcl $(DESTDIR)/dtds/decls
-	cp dtds/dbdsssl/dbdsssl.dtd $(DESTDIR)/dtds/dbdsssl
-	cp dtds/html/dbhtml.dtd $(DESTDIR)/dtds/html
-	cp dtds/html/ISOlat1.gml $(DESTDIR)/dtds/html
-	cp dtds/imagelib/imagelib.dtd $(DESTDIR)/dtds/imagelib
-	cp dtds/olink/olinksum.dtd $(DESTDIR)/dtds/olink
+	cp -p dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls
+	cp -p dtds/decls/xml.dcl $(DESTDIR)/dtds/decls
+	cp -p dtds/dbdsssl/dbdsssl.dtd $(DESTDIR)/dtds/dbdsssl
+	cp -p dtds/html/dbhtml.dtd $(DESTDIR)/dtds/html
+	cp -p dtds/html/ISOlat1.gml $(DESTDIR)/dtds/html
+	cp -p dtds/imagelib/imagelib.dtd $(DESTDIR)/dtds/imagelib
+	cp -p dtds/olink/olinksum.dtd $(DESTDIR)/dtds/olink
 
 install-dsl:
 	mkdir -p $(DESTDIR)/{lib,common,html,print,olink}
-	cp lib/dblib.dsl $(DESTDIR)/lib
-	cp common/*.dsl $(DESTDIR)/common
-	cp common/*.ent $(DESTDIR)/common
-	cp html/*.dsl $(DESTDIR)/html
-	cp lib/dblib.dsl $(DESTDIR)/lib
-	cp print/*.dsl $(DESTDIR)/print
-	cp olink/*.dsl $(DESTDIR)/olink
+	cp -p lib/dblib.dsl $(DESTDIR)/lib
+	cp -p common/*.dsl $(DESTDIR)/common
+	cp -p common/*.ent $(DESTDIR)/common
+	cp -p html/*.dsl $(DESTDIR)/html
+	cp -p lib/dblib.dsl $(DESTDIR)/lib
+	cp -p print/*.dsl $(DESTDIR)/print
+	cp -p olink/*.dsl $(DESTDIR)/olink
 
 install-img:
 	mkdir -p $(DESTDIR)/images/callouts
-	cp images/*.gif $(DESTDIR)/images
-	cp images/callouts/*.gif $(DESTDIR)/images/callouts
+	cp -p images/*.gif $(DESTDIR)/images
+	cp -p images/callouts/*.gif $(DESTDIR)/images/callouts
 
 #install-test:
 #	mkdir -p $(DESTDIR)/test/{cases,imagelib,xml}
@@ -42,5 +47,5 @@ install-img:
 #	cp test/xml/*.* $(DESTDIR)/test/xml
 
 install-misc:
-	cp catalog $(DESTDIR)
-	cp VERSION $(DESTDIR)
+	cp -p catalog $(DESTDIR)
+	cp -p VERSION $(DESTDIR)


Index: docbook-style-dsssl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-dsssl/devel/docbook-style-dsssl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- docbook-style-dsssl.spec	24 Jul 2009 20:25:59 -0000	1.20
+++ docbook-style-dsssl.spec	28 Aug 2009 09:47:06 -0000	1.21
@@ -1,6 +1,6 @@
 Name: docbook-style-dsssl
 Version: 1.79
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's modular stylesheets for DocBook
@@ -38,7 +38,7 @@ cp %{SOURCE1} Makefile
 %install
 DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets-%{version}
+make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets-%{version} MANDIR=$DESTDIR%{_mandir}
 cd ..
 ln -s dsssl-stylesheets-%{version} $DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets
 
@@ -48,9 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %doc BUGS README ChangeLog WhatsNew
 /usr/bin/collateindex.pl
+%{_mandir}/man1/collateindex.pl.1*
 /usr/share/sgml/docbook/dsssl-stylesheets-%{version}
 /usr/share/sgml/docbook/dsssl-stylesheets
 
@@ -87,6 +88,10 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 1.79-8
+- ship manpage for collateindex.pl
+- preserve attributes and timestamps in Makefile
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.79-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Fri Aug 28 10:06:03 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 28 Aug 2009 10:06:03 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 ooo-build.ooo2497.filter.svg.patch, 1.1,
	1.2 openoffice.org-3.1.0.ooo101274.opening-a-directory.patch,
	1.1, 1.2 workspace.cmcfixes57.patch, 1.1, 1.2
Message-ID: <20090828100603.AA8D611C0044@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-serv12617

Modified Files:
	ooo-build.ooo2497.filter.svg.patch 
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 
	workspace.cmcfixes57.patch 
Log Message:
fix up patches

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                                             |   51 
 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, 5698 insertions(+), 258 deletions(-)

Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ooo-build.ooo2497.filter.svg.patch	18 Mar 2009 12:36:26 -0000	1.1
+++ ooo-build.ooo2497.filter.svg.patch	28 Aug 2009 10:06:03 -0000	1.2
@@ -6233,3 +6233,47 @@ diff -ruN OOO310_m6.orig/filter/source/s
 +} // namespace svgi
 +
 +#endif
+diff -ruN OOO310_m6.orig/filter/source/svg/units.cxx OOO310_m6/filter/source/svg/units.hxx
+--- OOO310_m6.orig/filter/source/svg/units.cxx	1970-01-01 01:00:00.000000000 +0100
++++ OOO310_m6/filter/source/svg/units.cxx	2009-03-17 14:59:37.000000000 +0000
+@@ -35,10 +35,6 @@
+ 
+ double convLength( double value, SvgUnit unit, const State& rState, char dir )
+ {
+-    const double fBoxLen( dir=='h' ? rState.maViewBox.getWidth() : 
+-                          (dir=='v' ? rState.maViewBox.getHeight() : 
+-                           rState.maViewBox.getRange().getLength()));
+-
+     // convert svg unit to internal coordinates ("pixel"). Since the
+     // OOo drawing layer is still largely integer-based, the initial
+     // viewport transformation includes a certain scale factor
+@@ -55,7 +51,28 @@
+         case SVG_LENGTH_UNIT_PT: break;
+         case SVG_LENGTH_UNIT_EM: fRet *= rState.mnFontSize; break;
+         case SVG_LENGTH_UNIT_EX: fRet *= rState.mnFontSize / 2.0; break;
+-        case SVG_LENGTH_UNIT_PERCENTAGE: fRet *= fBoxLen; break;
++        case SVG_LENGTH_UNIT_PERCENTAGE:
++        {
++            double fBoxLen;
++            if (rState.maViewBox.isEmpty())
++            {
++                basegfx::B2DRange aDefaultBox(0, 0,
++                  convLength(210, SVG_LENGTH_UNIT_MM, rState, 'h'), 
++                  convLength(297, SVG_LENGTH_UNIT_MM, rState, 'v'));
++                fBoxLen = (dir=='h' ? aDefaultBox.getWidth() : 
++                          (dir=='v' ? aDefaultBox.getHeight() : 
++                           aDefaultBox.getRange().getLength()));
++            }
++            else
++            {
++                fBoxLen = (dir=='h' ? rState.maViewBox.getWidth() : 
++                          (dir=='v' ? rState.maViewBox.getHeight() : 
++                           rState.maViewBox.getRange().getLength()));
++            }
++
++            fRet *= fBoxLen/100.0;
++        }
++        break;
+         default: OSL_TRACE( "Unknown length type" ); break;
+     }
+ 

openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:
 comphelper/source/misc/mediadescriptor.cxx |    1 
 ucbhelper/source/client/content.cxx        |   75 +++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

Index: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101274.opening-a-directory.patch	22 Apr 2009 13:46:04 -0000	1.1
+++ openoffice.org-3.1.0.ooo101274.opening-a-directory.patch	28 Aug 2009 10:06:03 -0000	1.2
@@ -165,13 +165,11 @@ Index: comphelper/source/misc/mediadescr
 ===================================================================
 --- comphelper/source/misc/mediadescriptor.cxx	(revision 270567)
 +++ comphelper/source/misc/mediadescriptor.cxx	(working copy)
-@@ -727,7 +727,8 @@
- 					xRequest->getRequest() >>= exIO;
+@@ -728,6 +728,7 @@
  					bAbort = (
- 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     ) ||
--								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
-+								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ||
-+                                (exIO.Code == css::ucb::IOErrorCode_NO_FILE)
- 							);
- 				}
- 				break;
+ 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     )
+ 							 || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
++							 || (exIO.Code == css::ucb::IOErrorCode_NO_FILE )
+ #ifdef MACOSX
+                              // this is a workaround for MAC, on this platform if the file is locked
+                              // the returned error code looks to be wrong

workspace.cmcfixes57.patch:
 servicedecl.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: workspace.cmcfixes57.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.cmcfixes57.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.cmcfixes57.patch	15 Apr 2009 15:59:21 -0000	1.1
+++ workspace.cmcfixes57.patch	28 Aug 2009 10:06:03 -0000	1.2
@@ -37,22 +37,3 @@ index bd114be..1fa97cc 100644
                                           ::com::sun::star::lang::XMultiServiceFactory*  pServiceManager, \
                                           ::com::sun::star::registry::XRegistryKey*      pRegistryKey ) \
      { \
-diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
---- sw.orig/source/filter/ww8/ww8par2.cxx	2009-03-10 12:59:18.000000000 +0000
-+++ sw/source/filter/ww8/ww8par2.cxx	2009-03-10 13:51:17.000000000 +0000
-@@ -2509,7 +2509,15 @@
-             //ability to set the margin.
-             SvxLRSpaceItem aL( RES_LR_SPACE );
-             // set right to original DxaLeft (i28656)
-+#if 0
-+            // Type don't get promoted the intuitive way
-             aL.SetLeft( !bIsBiDi ?  GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft);
-+#else
-+            if (!bIsBiDi)
-+                aL.SetLeft( GetMinLeft() );
-+            else
-+                aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft );
-+#endif
-             aItemSet.Put(aL);
-         }
-     }



From chitlesh at fedoraproject.org  Fri Aug 28 10:26:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 10:26:10 +0000 (UTC)
Subject: rpms/alliance/F-10 alliance-examples-adm2901.patch, NONE,
	1.1 alliance-examples-go-all-clean.sh, NONE,
	1.1 alliance-examples-go-all.sh, NONE,
	1.1 alliance-examples-mipsR3000.patch, NONE,
	1.1 alliance-tutorials-amd2901.patch, NONE,
	1.1 alliance-tutorials-go-all-clean.sh, NONE,
	1.1 alliance-tutorials-go-all.sh, NONE,
	1.1 alliance-tutorials-place_n_route.patch, NONE,
	1.1 alliance-tutorials-simulation.patch, NONE,
	1.1 alliance-tutorials-start.patch, NONE,
	1.1 alliance-tutorials-synthesis.patch, NONE,
	1.1 alliance-xgra-xgrerror-ld.patch, NONE,
	1.1 alliance-xgra.patch, NONE, 1.1 xgra.desktop, NONE,
	1.1 xgra.png, NONE, 1.1 .cvsignore, 1.3, 1.4 alliance-env.patch,
	1.5, 1.6 alliance.spec, 1.19, 1.20 dreal.desktop, 1.3,
	1.4 graal.desktop, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3,
	1.4 xfsm.desktop, 1.3, 1.4 xpat.desktop, 1.3, 1.4 xsch.desktop,
	1.3, 1.4 xvpn.desktop, 1.3, 1.4 alliance-gcc43.patch, 1.1,
	NONE alliance-generic.patch, 1.1, NONE
Message-ID: <20090828102610.6C1A911C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982/F-10

Modified Files:
	.cvsignore alliance-env.patch alliance.spec dreal.desktop 
	graal.desktop import.log sources xfsm.desktop xpat.desktop 
	xsch.desktop xvpn.desktop 
Added Files:
	alliance-examples-adm2901.patch 
	alliance-examples-go-all-clean.sh alliance-examples-go-all.sh 
	alliance-examples-mipsR3000.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-go-all-clean.sh 
	alliance-tutorials-go-all.sh 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	xgra.desktop xgra.png 
Removed Files:
	alliance-gcc43.patch alliance-generic.patch 
Log Message:
snapshot 20090827

alliance-examples-adm2901.patch:
 amd2901_chip.c |   16 ++++++++--------
 amd2901_core.c |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE alliance-examples-adm2901.patch ---
diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c test-64/alliance-examples/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c	2004-05-23 20:55:16.000000000 +0200
+++ test-64/alliance-examples/amd2901/amd2901_chip.c	2009-06-14 02:35:45.000000000 +0200
@@ -1,5 +1,5 @@
 #include <genlib.h>
-#define POWER "vdde","vdd","vsse","vss",0
+#define POWER "vdde","vdd","vsse","vss",NULL
 
 int main ()
  {
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 
diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c test-64/alliance-examples/amd2901/amd2901_core.c
--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c	2004-05-23 20:55:16.000000000 +0200
+++ test-64/alliance-examples/amd2901/amd2901_core.c	2009-06-14 02:36:07.000000000 +0200
@@ -109,7 +109,7 @@
        "out_x[3:0] =>     y[3:0]",
 
        "vdd => vdd",
-       "vss => vss", 0);
+       "vss => vss", NULL);
 
 
   /* ***************** Control Instanciation ****************** */
@@ -161,7 +161,7 @@
        "oe => oe",
 
        "vdd => vdd",
-       "vss => vss", 0);
+       "vss => vss", NULL);
 
   GENLIB_PLACE ("amd2901_dpt", "amd2901_dpt", NOSYM, 0, 0);
   GENLIB_DEF_AB (0, 0, 0, 100);


--- NEW FILE alliance-examples-go-all-clean.sh ---
#!/bin/sh

for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \
    multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \
    mipsR3000 hadamard
do
  if [ -d $B ]
  then echo "----- BENCH $B ----- "
       (cd $B && make clean)
  fi
done


--- NEW FILE alliance-examples-go-all.sh ---
#!/bin/sh

for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \
    multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \
    mipsR3000 hadamard
do
  if [ -d $B ]
  then echo "----- BENCH $B ----- "
       (cd $B && make clean && make)
  fi
done

alliance-examples-mipsR3000.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alliance-examples-mipsR3000.patch ---
diff -Naur alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile test-64/alliance-examples/mipsR3000/sce/Makefile
--- alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile	2004-07-30 02:40:09.000000000 +0200
+++ test-64/alliance-examples/mipsR3000/sce/Makefile	2009-06-14 03:12:56.000000000 +0200
@@ -119,7 +119,7 @@
       LVX = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/lvx
     PROOF = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/proof
      RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring
-    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib
+    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib --keep-exec --verbose
     OCP   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp -v -gnuplot
     OCR   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr
     NERO  = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero -V

alliance-tutorials-amd2901.patch:
 Makefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE alliance-tutorials-amd2901.patch ---
diff -Naur documentation/tutorials/synthesis/src/amd2901/Makefile tutorials/synthesis/src/amd2901/Makefile
--- documentation/tutorials/synthesis/src/amd2901/Makefile	2002-07-25 14:50:18.000000000 +0200
+++ tutorials/synthesis/src/amd2901/Makefile	2007-07-18 19:34:53.000000000 +0200
@@ -2,17 +2,17 @@
 all: EXAMPLE VAR  CATAL02 res.pat
 
 
-VAR: 
+VAR:
 	MBK_IN_LO=vst;export MBK_IN_LO ;\
-	MBK_CATA_LIB=/asim/alliance/cells/sxlib;export MBK_CATA_LIB
+	MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib;export MBK_CATA_LIB
 
 CATAL01:
-	echo amd2901_ctl C >CATAL  
+	echo amd2901_ctl C >CATAL
 	echo amd2901_dpt C >>CATAL
 
 CATAL02:
 	echo amd2901_dpt C >CATAL
-	
+
 EXAMPLE:
 	genlib circuit
 
@@ -38,7 +38,7 @@
 
 res2.pat: amd2901_chip.vst pattern.pat amd2901_core.vst CATAL
 	asimut amd2901_chip pattern res2
-	touch amd2901_chip.vst 
+	touch amd2901_chip.vst
 
 clean :
 	rm -f Makefile-*                 \



--- NEW FILE alliance-tutorials-go-all-clean.sh ---
#!/bin/sh

for B in place_and_route simulation synthesis
do
  if [ -d $B/src ]
  then echo "--- BENCH $B ----"
       (cd $B/src && make clean)
  fi
done


--- NEW FILE alliance-tutorials-go-all.sh ---
#!/bin/sh

for B in place_and_route simulation synthesis
do
  if [ -d $B/src ]
  then echo "--- BENCH $B ----"
       (cd $B/src && make clean && make)
  fi
done

alliance-tutorials-place_n_route.patch:
 amd2901_chip.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE alliance-tutorials-place_n_route.patch ---
diff -Naur alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2002-07-25 14:50:19.000000000 +0200
+++ test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2009-06-14 02:27:03.000000000 +0200
@@ -1,5 +1,5 @@
 #include <genlib.h>
-#define POWER "vdde","vdd","vsse","vss",0
+#define POWER "vdde","vdd","vsse","vss",NULL
 
 int main ()
  {
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 

alliance-tutorials-simulation.patch:
 simulation.tex |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alliance-tutorials-simulation.patch ---
diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex
--- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex	2004-10-16 14:52:05.000000000 +0200
+++ test-64/tutorials/simulation/tex/simulation.tex	2009-07-04 12:18:54.867711418 +0200
@@ -171,7 +162,7 @@
         }
 
 All the files used in this part are located in the \\ 
-\texttt{/tutorial/simulation/src} directory.\\
+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\
 This directory contains two subdirectories and one Makefile : 
 \begin{itemize}
 \item The Makefile allows you to validate automatically the entire simulation part
@@ -626,13 +617,13 @@
 \bf SXLIB }. For the functionality of the various cells and their
 interface, the sxlib man is available. The behavioral
 description of each cell is present in \\
-{\bf /alliance/cells/sxlib }.
+{\bf \$ALLIANCE\_TOP/cells/sxlib }.
 
 You must set the environment variable { \bf MBK\_CATA\_LIB }
 to be able to reach these cells.
 
 \begin{commandline}
- > MBK_CATA_LIB=/alliance/cells/sxlib
+ > MBK_CATA_LIB=\$ALLIANCE\_TOP/cells/sxlib
  > export MBK_CATA_LIB
 \end{commandline}
 

alliance-tutorials-start.patch:
 start.tex |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE alliance-tutorials-start.patch ---
diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex
--- alliance-5.0/documentation/tutorials/start/start.tex	2004-10-16 14:52:13.000000000 +0200
+++ test-64/tutorials/start/start.tex	2009-07-04 12:17:35.389714653 +0200
@@ -116,13 +116,13 @@
 try to run the following command :
 
 \begin{phraseverbatim}
-~alp/addaccu %-) source /alliance/etc/alc_env.csh
+~alp/addaccu %-) source /etc/profile.d/alc_env.csh
 \end{phraseverbatim}
 
 Otherwise, if you run a \texttt{sh-like} shell, try to run the following 
 command :
 \begin{phraseverbatim}
-~alp/addaccu %-) source /alliance/alc_env.sh
+~alp/addaccu %-) source /etc/profile.d/alc_env.sh
 \end{phraseverbatim}
 \\
 Before we proceed to the tutorial, you must make sure that the
@@ -151,13 +151,13 @@
 MBK_CATAL_NAME=CATAL
 MBK_SCALE_X=100
 MBK_VSS=vss
-MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib
+MBK_CATA_LIB=.:\$ALLIANCE\_TOP/cells/sxlib:\$ALLIANCE\_TOP/cells/padlib
 MBK_WORK_LIB=.
 MBK_VDD=vdd
 MBK_C4_LIB=./cellsC4
 MBK_IN_LO=vst
 MBK_IN_PH=ap
-MBK_TARGET_LIB=/alliance/cells/sxlib
+MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib
 MBK_OUT_LO=vst
 \end{framedverbatim}
 \caption{\label{mbk} \texttt{MBK} environment variables.}

alliance-tutorials-synthesis.patch:
 src/amd2901/amd2901_chip.c |   14 +++++++-------
 tex/synthesis.tex          |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE alliance-tutorials-synthesis.patch ---
diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c	2002-07-25 14:50:18.000000000 +0200
+++ test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c	2009-06-14 00:31:18.000000000 +0200
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 
diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex
--- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex	2004-10-16 14:52:17.000000000 +0200
+++ test-64/tutorials/synthesis/tex/synthesis.tex	2009-07-04 12:26:03.345711622 +0200
@@ -220,7 +211,7 @@
         }
 
 All the files used in this part are located under \\
-\texttt{/tutorial/synthesis/src} directory.\\
+\texttt{/usr/share/doc/alliance-doc-5.0/tutorials/synthesis/src} directory.\\
 This directory contents four subdirectories and one Makefile :
 \begin{itemize}\itemsep=-.8ex
 


alliance-xgra-xgrerror-ld.patch:
 XGR_error.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE alliance-xgra-xgrerror-ld.patch ---
--- xgra/src/XGR_error.c	2007-11-27 21:41:32.000000000 +0100
+++ XGR_error.c	2009-08-28 07:53:58.546631214 +0200
@@ -270,7 +270,7 @@
 
   if ( XgraFigureGra != (autgraph *)NULL )
   {
-    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %d\n  ARCS : %d\n\n",
+    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %ld\n  ARCS : %ld\n\n",
         XgraFigure->NAME,
         XgraFigureGra->NUMBER_NODE,
         XgraFigureGra->NUMBER_ARC );
@@ -282,7 +282,7 @@
 
   Scan = Scan + strlen( Scan );
 
-  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %d\n  YMIN : %d\n  XMAX : %d\n  YMAX : %d\n\n",
+  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %ld\n  YMIN : %ld\n  XMAX : %ld\n  YMAX : %ld\n\n",
            XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT,
            XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT );
 

alliance-xgra.patch:
 Makefile.am |  144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

--- NEW FILE alliance-xgra.patch ---
--- /home/chitlesh/rpmbuild/BUILD/alliance-5.0/xgra/Makefile.am	2009-08-28 07:20:46.993629321 +0200
+++ src/xgra/Makefile.am	2009-08-28 07:26:58.090631633 +0200
@@ -1 +1,143 @@
-SUBDIRS = src etc
+bin_PROGRAMS = \
+	xgra
+
+xgra_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\"xgra\" \
+	$(MOTIF_CFLAGS) \
+	-DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \
+	-DXMS_FILE_NAME=\".xgra.cfg\" \
+	-I$(top_srcdir)/mbk/src \
+	-I$(top_srcdir)/aut/src
+
+xgra_SOURCES = \
+	xgra.c \
+	xgra.h \
+	XGR_bound.c \
+	XGR_bound.h \
+	XGR_error.c \
+	XGR_error.h \
+	XGR_graph.c \
+	XGR_graph.h \
+	XGR_object.c \
+	XGR_object.h \
+	XGR_place.c \
+	XGR_place.h \
+	XGR_select.c \
+	XGR_select.h \
+	XGR.h \
+	XME_dialog.c \
+	XME_dialog.h \
+	XME_edit.c \
+	XME_edit.h \
+	XME.h \
+	XME_menu.c \
+	XME_menu.h \
+	XME_message.c \
+	XME_message.h \
+	XME_panel.c \
+	XME_panel.h \
+	XME_search.c \
+	XME_search.h \
+	XME_select.c \
+	XME_select.h \
+	XMF_dialog.c \
+	XMF_dialog.h \
+	XMF_file.c \
+	XMF_file.h \
+	XMF.h \
+	XMF_menu.c \
+	XMF_menu.h \
+	XMF_panel.c \
+	XMF_panel.h \
+	XMH.h \
+	XMH_help.c \
+	XMH_help.h \
+	XMH_menu.c \
+	XMH_menu.h \
+	XMH_panel.c \
+	XMH_panel.h \
+	XMS_dialog.c \
+	XMS_dialog.h \
+	XMS.h \
+	XMS_menu.c \
+	XMS_menu.h \
+	XMS_panel.c \
+	XMS_panel.h \
+	XMS_setup.c \
+	XMS_setup.h \
+	XMT_dialog.c \
+	XMT_dialog.h \
+	XMT.h \
+	XMT_menu.c \
+	XMT_menu.h \
+	XMT_message.c \
+	XMT_message.h \
+	XMT_panel.c \
+	XMT_panel.h \
+	XMT_tools.c \
+	XMT_tools.h \
+	XMV_dialog.c \
+	XMV_dialog.h \
+	XMV.h \
+	XMV_map.c \
+	XMV_map.h \
+	XMV_menu.c \
+	XMV_menu.h \
+	XMV_message.c \
+	XMV_message.h \
+	XMV_panel.c \
+	XMV_panel.h \
+	XMV_view.c \
+	XMV_view.h \
+	XMX_color.c \
+	XMX_color.h \
+	XMX_cursor.c \
+	XMX_cursor.h \
+	XMX_dialog.c \
+	XMX_dialog.h \
+	XMX_event.c \
+	XMX_event.h \
+	XMX_graphic.c \
+	XMX_graphic.h \
+	XMX_grid.c \
+	XMX_grid.h \
+	XMX.h \
+	XMX_icon.c \
+	XMX_icon.h \
+	XMX_menu.c \
+	XMX_menu.h \
+	XMX_message.c \
+	XMX_message.h \
+	XMX_motif.c \
+	XMX_motif.h \
+	XMX_panel.c \
+	XMX_panel.h \
+	XMX_view.c \
+	XMX_view.h \
+	XSB_error.c \
+	XSB_error.h \
+	XSB.h \
+	XSB_parse.c \
+	XSB_parse.h \
+	XSB_share.c \
+	XSB_share.h \
+	XTB_cursor.c \
+	XTB_cursor.h \
+	XTB_dialog.c \
+	XTB_dialog.h \
+	XTB.h \
+	XTB_icon.c \
+	XTB_icon.h \
+	XTB_menu.c \
+	XTB_menu.h \
+	XTB_panel.c \
+	XTB_panel.h \
+	XTB_pixmap.c \
+	XTB_pixmap.h
+
+xgra_LDADD = \
+	$(GLIB_CFLAGS) \
+	$(MOTIF_LIBS) \
+	$(top_builddir)/src/aut/libAut.la \
+	$(top_builddir)/src/mbk/libMut.la


--- NEW FILE xgra.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Graphic Graph Viewer
Exec=ALLIANCE_TOP/bin/xgra
Icon=xgra.png
Type=Application
Terminal=false
GenericName=xpvn
Categories=Electronics;Engineering;
Comment=View the graphic graph


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Mar 2008 17:11:17 -0000	1.3
+++ .cvsignore	28 Aug 2009 10:26:09 -0000	1.4
@@ -1,2 +1 @@
-alliance-5.0-20070718.tar.gz
-alliance-5.0-tutorials.tar.bz2
+alliance-5.0-20090827.tar.gz

alliance-env.patch:
 distrib1/etc/alc_env.csh.in |   11 +++++++----
 distrib1/etc/alc_env.sh.in  |   11 +++++++----
 etc/Makefile.am             |    2 +-
 etc/Makefile.in             |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/alliance-env.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- alliance-env.patch	15 Sep 2008 16:30:04 -0000	1.5
+++ alliance-env.patch	28 Aug 2009 10:26:09 -0000	1.6
@@ -1,7 +1,8 @@
---- distrib/etc/alc_env.csh.in  2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.csh.in  2008-05-26 22:37:15.000000000 +0200
+diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in
+--- distrib/etc/alc_env.csh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.csh.in	2009-08-27 18:16:05.285270921 +0200
 @@ -70,20 +70,23 @@
-
+ 
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
@@ -9,36 +10,36 @@
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if ( $?LD_LIBRARY_PATH ) then
 -   setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
 +   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
-    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`"
   endif
-
-- if ( $?MANPATH ) then
+ 
+  if ( $?MANPATH ) then
 -   setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-+ if ($?MANPATH) then
-+  setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
++   setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
   else
 -   setenv MANPATH "${ALLIANCE_TOP}/man"
-+  setenv MANPATH ":${ALLIANCE_TOP}/man"
++   setenv MANPATH ":${ALLIANCE_TOP}/man"
   endif
-+
-+# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  setenv MBK_SPI_MODEL       "${ALLIANCE_TOP}/etc/spimodel.cfg"
---- distrib/etc/alc_env.sh.in   2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.sh.in   2008-05-26 22:41:30.000000000 +0200
++ 
++ # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
++ setenv MBK_SPI_MODEL     "${ALLIANCE_TOP}/etc/spimodel.cfg"
+diff -Naur distrib/etc/alc_env.sh.in distrib1/etc/alc_env.sh.in
+--- distrib/etc/alc_env.sh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.sh.in	2009-08-27 18:17:38.477272066 +0200
 @@ -70,20 +70,23 @@
-
-
+ 
+ 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
 + PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if [ -z "${LD_LIBRARY_PATH}" ]; then
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
@@ -47,19 +48,18 @@
 +   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
   fi
   export LD_LIBRARY_PATH
-
+ 
   if [ -z "${MANPATH}" ]; then
--   MANPATH=$ALLIANCE_TOP/man
-+   MANPATH=:$ALLIANCE_TOP/man
+-   MANPATH=$ALLIANCE_TOP/man:$(manpath)
++   MANPATH=:$ALLIANCE_TOP/man:$(manpath)
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
 +   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
-+
++ 
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
-
++ MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
 diff -Naur distrib/etc/Makefile.am etc/Makefile.am
 --- distrib/etc/Makefile.am	2002-06-25 16:09:38.000000000 +0200
 +++ etc/Makefile.am	2007-08-18 13:58:38.000000000 +0200


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/alliance.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- alliance.spec	1 Feb 2009 19:21:50 -0000	1.19
+++ alliance.spec	28 Aug 2009 10:26:09 -0000	1.20
@@ -1,10 +1,9 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20070718
-%define        _default_patch_fuzz  2
+%define        snapshot  20090827
 
 Name:          alliance
 Version:       5.0
-Release:       24.%{snapshot}snap%{?dist}
+Release:       30.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -14,11 +13,26 @@ Source:        http://www-asim.lip6.fr/p
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
 Patch0:        alliance-env.patch
-Patch1:        alliance-examples.patch
-Patch2:        alliance-run.patch
-Patch3:        alliance-perms.patch
-Patch4:        alliance-gcc43.patch
-Patch5:        alliance-generic.patch
+Patch1:        alliance-run.patch
+Patch2:        alliance-perms.patch
+
+# Improving autogeneration of documentation
+Patch3:        alliance-tutorials-place_n_route.patch
+Patch4:        alliance-tutorials-simulation.patch
+Patch5:        alliance-tutorials-start.patch
+Patch6:        alliance-tutorials-synthesis.patch
+Patch7:        alliance-tutorials-amd2901.patch
+
+# Improving examples
+Patch8:        alliance-examples.patch
+Patch9:        alliance-examples-adm2901.patch
+Patch10:       alliance-examples-mipsR3000.patch
+
+# upstream enhancements
+Patch11:       alliance-xgra.patch
+
+# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
+Patch12:       alliance-xgra-xgrerror-ld.patch
 
 Source1:       xsch.desktop
 Source2:       dreal.desktop
@@ -26,25 +40,37 @@ Source3:       xpat.desktop
 Source4:       xfsm.desktop
 Source5:       xvpn.desktop
 Source6:       graal.desktop
+Source7:       xgra.desktop
 
-Source7:       alliance.fedora
+Source8:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source8:       graal.png
-Source9:       dreal.png
-Source10:      xvpn.png
-Source11:      xfsm.png
-Source12:      xpat.png
-Source13:      xsch.png
-
-Source14:      %{name}-5.0-tutorials.tar.bz2
+Source9:       graal.png
+Source10:      dreal.png
+Source11:      xvpn.png
+Source12:      xfsm.png
+Source13:      xpat.png
+Source14:      xsch.png
+Source15:      xgra.png
+
+Source16:      alliance-tutorials-go-all.sh
+Source17:      alliance-tutorials-go-all-clean.sh
+Source18:      alliance-examples-go-all.sh
+Source19:      alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison
+BuildRequires: libXt-devel byacc desktop-file-utils bison
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:       xorg-x11-fonts-misc
+%if 0%{?rhel}
+BuildRequires: openmotif-devel
+BuildRequires: pkgconfig
+%else
+BuildRequires: lesstif-devel
+%endif
+
+Requires:      xorg-x11-fonts-misc
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -87,7 +113,6 @@ Summary:      Alliance VLSI CAD Sytem - 
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
 Requires:     electronics-menu
-Obsoletes:    %{name} < 5.0-12
 
 
 %description libs
@@ -98,7 +123,9 @@ Architecture dependent files for the All
 Summary:      Alliance VLSI CAD Sytem - Documentations
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
-Requires:     gnuplot
+Requires:     gnuplot 
+BuildRequires:tetex-latex
+
 
 
 %description doc
@@ -107,39 +134,85 @@ Documentation and tutorials for the Alli
 
 %prep
 %setup -q
+%{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
 sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
 
-
-%patch0 -p0 -b .env
-# removing useless copyrighted (by Cadence) lines from the examples
+# removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
-%patch1 -p0 -b .examples
-%patch2 -p0 -b .run
-# fixing permissions
-%patch3 -p0 -b .perms
 
+%patch11 -p1 -b .xgra-makefile.am
+%patch12 -p0 -b .xgra-long
 
-### 2008 March: TexLive introduction to Rawhide
-sed -i "s|tutorials||" documentation/Makefile.in
-tar -xvf %{SOURCE14}
 
+%patch0 -p0 -b .env
+%patch1 -p0 -b .run
+%patch2 -p0 -b .perms
+
+
+# ------------------------------------------------------------------------------
+# Description : 2008 March : TexLive introduction to Rawhide
+sed -i "s|tutorials||" documentation/Makefile.in
+sed -i "s|documentation/tutorials/Makefile||" configure*
+%patch3 -p1 -b .doc
+%patch4 -p1 -b .doc
+%patch5 -p1 -b .doc
+%patch6 -p1 -b .doc
+%patch7 -p0 -b .doc
+pushd documentation/tutorials
+    # clean unneccessary files
+    %{__rm} Makefile*
+    %{__rm} *.pdf
+    # build documentation
+    for folder in place_and_route/tex start simulation/tex synthesis/tex; do
+        pushd $folder
+            %{__make}
+        popd
+        # remove useless directories before %%doc
+        %{__rm} -rf $folder
+    done
+    # Add automated scripts to tutorials
+    %{__install} -pm 755 %{SOURCE16} go-all.sh
+    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    # Fedora Electronic Lab self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-tutorials.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
+# ------------------------------------------------------------------------------
 
-%patch4 -p1 -b .include
-%patch5 -p0 -b .generic
+%patch8  -p0 -b .examples
+%patch9  -p1 -b .examples
+%patch10 -p1 -b .examples
+
+# fixing flex and bison update on rawhide
+sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
+sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
 
 # make sure the man pages are UTF-8...
-for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
+for nonUTF8 in FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
                loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do
   %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
   %{__mv} -f $nonUTF8.conv $nonUTF8
 done
 
+pushd documentation/alliance-examples/
+# make sure the man pages are UTF-8...
+for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \
+               tuner/README mipsR3000/sce/mips_dpt.c ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
 #wrong-file-end-of-line-encoding
-sed -i 's/\r//' documentation/alliance-examples/mipsR3000/asm/*
+sed -i 's/\r//' mipsR3000/asm/*
+popd
 
+# Fix xgra build 
+sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
+sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
 
 %build
 
@@ -187,25 +260,30 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/doc/
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
-# correcting minor documentation details
-sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+# Add automated scripts to examples
+%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+
+pushd alliance-examples/
+    # FEL self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-examples.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
 for desktopfile in *.desktop; do
-desktop-file-install --vendor fedora          \
-  --add-category Engineering                  \
-  --add-category Electronics                  \
-  --remove-category Science                   \
+desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
 done
@@ -217,9 +295,9 @@ done
 
 
 # protecting hardcoded links
-ln -sf ../../..%{_datadir}/%{name}/cells    %{buildroot}%{prefix}/cells
-ln -sf ../../..%{_datadir}/%{name}/etc      %{buildroot}%{prefix}/etc
-ln -sf ../../..%{_datadir}/%{name}/man      %{buildroot}%{prefix}/man
+ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells
+ln -sf ../../..%{_datadir}/%{name}/etc   %{buildroot}%{prefix}/etc
+ln -sf ../../..%{_datadir}/%{name}/man   %{buildroot}%{prefix}/man
 
 
 # manpage-not-gzipped
@@ -236,11 +314,17 @@ EOF
 # removing tools for compiling and installing Alliance tools
 # These are for the packager (i.e me) and not for user
 %{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf
+%{__rm} -f %{buildroot}%{prefix}/etc/attila.conf
 %{__rm} -f %{buildroot}%{prefix}/bin/attila
 %{__rm} -f %{buildroot}%{_datadir}/man/man1/attila*
 %{__rm} -f doc/html/alliance/*attila.html
 %{__rm} -f doc/pdf/attila.pdf
 
+# correcting minor documentation details
+sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+
+%{_fixperms} %{buildroot}/*
+
 
 %post
 /sbin/ldconfig
@@ -272,18 +356,20 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files libs
-%config %{_sysconfdir}/ld.so.conf.d/*
-%{_datadir}/applications/fedora-*.desktop
-%{_sysconfdir}/profile.d/alc_env.*
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
+%{_datadir}/applications/*.desktop
+%config(noreplace) %{_sysconfdir}/profile.d/alc_env.*
 
 
 %files doc
+%defattr(-,root,root,-)
 %doc doc/html/
 %doc doc/design-flow
 %doc doc/pdf/*.pdf
 %doc doc/overview/*.ps
 %doc doc/overview/*.pdf
-%doc tutorials/
+%doc documentation/tutorials/
 #Makefiles are present in alliance-examples/*. It is normal because
 # * it gives the VLSI designer a template on how to create his own
 #   Makefile for alliance (VLSI designers normally don't know how to do so)
@@ -294,6 +380,27 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
+- updated to upstream's 20090828 snapshot
+- merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements
+- fixed EPEL-5 build
+
+* Sat Aug 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-29.20070718snap
+- improved rawhide build with respect to the broken patches
+
+* Thu Jul 9 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-28.20070718snap
+- improved stability on 64 bit architecture
+- Patches (14 to 100) added along with new features from upstream
+
+* Sat Jul 4 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-27.20070718snap
+- improved autogeneration of documentation and fixed the examples
+
+* Tue Feb 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-26.20070718snap
+- fixed build due to new releases of flex and bison
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-25.20070718snap
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-24.20070718snap
 - Improved VHDL generic implementation
 


Index: dreal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/dreal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dreal.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ dreal.desktop	28 Aug 2009 10:26:09 -0000	1.4
@@ -6,5 +6,5 @@ Icon=dreal.png
 Type=Application
 Terminal=false
 GenericName=dreal
-Categories=Science;
-Comment=View the Real layout
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Real layout


Index: graal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/graal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- graal.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ graal.desktop	28 Aug 2009 10:26:09 -0000	1.4
@@ -6,5 +6,5 @@ Icon=graal.png
 Type=Application
 Terminal=false
 GenericName=graal
-Categories=Science;
-Comment=Edits physical layouts
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=Edits physical layouts


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Feb 2009 19:21:50 -0000	1.2
+++ import.log	28 Aug 2009 10:26:09 -0000	1.3
@@ -1,2 +1,3 @@
 alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180
 alliance-5_0-24_20070718snap_fc10:F-10:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515871
+alliance-5_0-30_20090827snap_fc11:F-10:alliance-5.0-30.20090827snap.fc11.src.rpm:1251454888


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Mar 2008 17:11:17 -0000	1.3
+++ sources	28 Aug 2009 10:26:09 -0000	1.4
@@ -1,2 +1 @@
-917f4493c09f6f5c49d5a606a5e9bbd8  alliance-5.0-20070718.tar.gz
-32cac3116f85713aec2e1e18379811eb  alliance-5.0-tutorials.tar.bz2
+8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz


Index: xfsm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/xfsm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xfsm.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xfsm.desktop	28 Aug 2009 10:26:09 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xfsm.png
 Type=Application
 Terminal=false
 GenericName=xfsm
-Categories=Science;
-Comment=View Finite State Machines
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View Finite State Machines


Index: xpat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/xpat.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xpat.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xpat.desktop	28 Aug 2009 10:26:09 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xpat.png
 Type=Application
 Terminal=false
 GenericName=xpat
-Categories=Science;
-Comment=View the Patterns
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Patterns


Index: xsch.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/xsch.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xsch.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xsch.desktop	28 Aug 2009 10:26:09 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xsch.png
 Type=Application
 Terminal=false
 GenericName=Xsch
-Categories=Science;
-Comment=View the Schematic
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Schematic


Index: xvpn.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/xvpn.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xvpn.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xvpn.desktop	28 Aug 2009 10:26:10 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xvpn.png
 Type=Application
 Terminal=false
 GenericName=xpvn
-Categories=Science;
-Comment=View the Petri Nets
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Petri Nets


--- alliance-gcc43.patch DELETED ---


--- alliance-generic.patch DELETED ---



From chitlesh at fedoraproject.org  Fri Aug 28 10:31:49 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 10:31:49 +0000 (UTC)
Subject: rpms/alliance/F-11 alliance-examples-adm2901.patch, NONE,
	1.1 alliance-examples-go-all-clean.sh, NONE,
	1.1 alliance-examples-go-all.sh, NONE,
	1.1 alliance-examples-mipsR3000.patch, NONE,
	1.1 alliance-tutorials-amd2901.patch, NONE,
	1.1 alliance-tutorials-go-all-clean.sh, NONE,
	1.1 alliance-tutorials-go-all.sh, NONE,
	1.1 alliance-tutorials-place_n_route.patch, NONE,
	1.1 alliance-tutorials-simulation.patch, NONE,
	1.1 alliance-tutorials-start.patch, NONE,
	1.1 alliance-tutorials-synthesis.patch, NONE,
	1.1 alliance-xgra-xgrerror-ld.patch, NONE,
	1.1 alliance-xgra.patch, NONE, 1.1 xgra.desktop, NONE,
	1.1 xgra.png, NONE, 1.1 .cvsignore, 1.3, 1.4 alliance-env.patch,
	1.5, 1.6 alliance.spec, 1.21, 1.22 dreal.desktop, 1.3,
	1.4 graal.desktop, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3,
	1.4 xfsm.desktop, 1.3, 1.4 xpat.desktop, 1.3, 1.4 xsch.desktop,
	1.3, 1.4 xvpn.desktop, 1.3, 1.4 alliance-gcc43.patch, 1.1,
	NONE alliance-generic.patch, 1.1, NONE
Message-ID: <20090828103149.8DE8111C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17278/F-11

Modified Files:
	.cvsignore alliance-env.patch alliance.spec dreal.desktop 
	graal.desktop import.log sources xfsm.desktop xpat.desktop 
	xsch.desktop xvpn.desktop 
Added Files:
	alliance-examples-adm2901.patch 
	alliance-examples-go-all-clean.sh alliance-examples-go-all.sh 
	alliance-examples-mipsR3000.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-go-all-clean.sh 
	alliance-tutorials-go-all.sh 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	xgra.desktop xgra.png 
Removed Files:
	alliance-gcc43.patch alliance-generic.patch 
Log Message:
snapshot 20090827

alliance-examples-adm2901.patch:
 amd2901_chip.c |   16 ++++++++--------
 amd2901_core.c |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE alliance-examples-adm2901.patch ---
diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c test-64/alliance-examples/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c	2004-05-23 20:55:16.000000000 +0200
+++ test-64/alliance-examples/amd2901/amd2901_chip.c	2009-06-14 02:35:45.000000000 +0200
@@ -1,5 +1,5 @@
 #include <genlib.h>
-#define POWER "vdde","vdd","vsse","vss",0
+#define POWER "vdde","vdd","vsse","vss",NULL
 
 int main ()
  {
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 
diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c test-64/alliance-examples/amd2901/amd2901_core.c
--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c	2004-05-23 20:55:16.000000000 +0200
+++ test-64/alliance-examples/amd2901/amd2901_core.c	2009-06-14 02:36:07.000000000 +0200
@@ -109,7 +109,7 @@
        "out_x[3:0] =>     y[3:0]",
 
        "vdd => vdd",
-       "vss => vss", 0);
+       "vss => vss", NULL);
 
 
   /* ***************** Control Instanciation ****************** */
@@ -161,7 +161,7 @@
        "oe => oe",
 
        "vdd => vdd",
-       "vss => vss", 0);
+       "vss => vss", NULL);
 
   GENLIB_PLACE ("amd2901_dpt", "amd2901_dpt", NOSYM, 0, 0);
   GENLIB_DEF_AB (0, 0, 0, 100);


--- NEW FILE alliance-examples-go-all-clean.sh ---
#!/bin/sh

for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \
    multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \
    mipsR3000 hadamard
do
  if [ -d $B ]
  then echo "----- BENCH $B ----- "
       (cd $B && make clean)
  fi
done


--- NEW FILE alliance-examples-go-all.sh ---
#!/bin/sh

for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \
    multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \
    mipsR3000 hadamard
do
  if [ -d $B ]
  then echo "----- BENCH $B ----- "
       (cd $B && make clean && make)
  fi
done

alliance-examples-mipsR3000.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alliance-examples-mipsR3000.patch ---
diff -Naur alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile test-64/alliance-examples/mipsR3000/sce/Makefile
--- alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile	2004-07-30 02:40:09.000000000 +0200
+++ test-64/alliance-examples/mipsR3000/sce/Makefile	2009-06-14 03:12:56.000000000 +0200
@@ -119,7 +119,7 @@
       LVX = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/lvx
     PROOF = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/proof
      RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring
-    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib
+    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib --keep-exec --verbose
     OCP   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp -v -gnuplot
     OCR   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr
     NERO  = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero -V

alliance-tutorials-amd2901.patch:
 Makefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE alliance-tutorials-amd2901.patch ---
diff -Naur documentation/tutorials/synthesis/src/amd2901/Makefile tutorials/synthesis/src/amd2901/Makefile
--- documentation/tutorials/synthesis/src/amd2901/Makefile	2002-07-25 14:50:18.000000000 +0200
+++ tutorials/synthesis/src/amd2901/Makefile	2007-07-18 19:34:53.000000000 +0200
@@ -2,17 +2,17 @@
 all: EXAMPLE VAR  CATAL02 res.pat
 
 
-VAR: 
+VAR:
 	MBK_IN_LO=vst;export MBK_IN_LO ;\
-	MBK_CATA_LIB=/asim/alliance/cells/sxlib;export MBK_CATA_LIB
+	MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib;export MBK_CATA_LIB
 
 CATAL01:
-	echo amd2901_ctl C >CATAL  
+	echo amd2901_ctl C >CATAL
 	echo amd2901_dpt C >>CATAL
 
 CATAL02:
 	echo amd2901_dpt C >CATAL
-	
+
 EXAMPLE:
 	genlib circuit
 
@@ -38,7 +38,7 @@
 
 res2.pat: amd2901_chip.vst pattern.pat amd2901_core.vst CATAL
 	asimut amd2901_chip pattern res2
-	touch amd2901_chip.vst 
+	touch amd2901_chip.vst
 
 clean :
 	rm -f Makefile-*                 \



--- NEW FILE alliance-tutorials-go-all-clean.sh ---
#!/bin/sh

for B in place_and_route simulation synthesis
do
  if [ -d $B/src ]
  then echo "--- BENCH $B ----"
       (cd $B/src && make clean)
  fi
done


--- NEW FILE alliance-tutorials-go-all.sh ---
#!/bin/sh

for B in place_and_route simulation synthesis
do
  if [ -d $B/src ]
  then echo "--- BENCH $B ----"
       (cd $B/src && make clean && make)
  fi
done

alliance-tutorials-place_n_route.patch:
 amd2901_chip.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE alliance-tutorials-place_n_route.patch ---
diff -Naur alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2002-07-25 14:50:19.000000000 +0200
+++ test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2009-06-14 02:27:03.000000000 +0200
@@ -1,5 +1,5 @@
 #include <genlib.h>
-#define POWER "vdde","vdd","vsse","vss",0
+#define POWER "vdde","vdd","vsse","vss",NULL
 
 int main ()
  {
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 

alliance-tutorials-simulation.patch:
 simulation.tex |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alliance-tutorials-simulation.patch ---
diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex
--- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex	2004-10-16 14:52:05.000000000 +0200
+++ test-64/tutorials/simulation/tex/simulation.tex	2009-07-04 12:18:54.867711418 +0200
@@ -171,7 +162,7 @@
         }
 
 All the files used in this part are located in the \\ 
-\texttt{/tutorial/simulation/src} directory.\\
+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\
 This directory contains two subdirectories and one Makefile : 
 \begin{itemize}
 \item The Makefile allows you to validate automatically the entire simulation part
@@ -626,13 +617,13 @@
 \bf SXLIB }. For the functionality of the various cells and their
 interface, the sxlib man is available. The behavioral
 description of each cell is present in \\
-{\bf /alliance/cells/sxlib }.
+{\bf \$ALLIANCE\_TOP/cells/sxlib }.
 
 You must set the environment variable { \bf MBK\_CATA\_LIB }
 to be able to reach these cells.
 
 \begin{commandline}
- > MBK_CATA_LIB=/alliance/cells/sxlib
+ > MBK_CATA_LIB=\$ALLIANCE\_TOP/cells/sxlib
  > export MBK_CATA_LIB
 \end{commandline}
 

alliance-tutorials-start.patch:
 start.tex |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE alliance-tutorials-start.patch ---
diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex
--- alliance-5.0/documentation/tutorials/start/start.tex	2004-10-16 14:52:13.000000000 +0200
+++ test-64/tutorials/start/start.tex	2009-07-04 12:17:35.389714653 +0200
@@ -116,13 +116,13 @@
 try to run the following command :
 
 \begin{phraseverbatim}
-~alp/addaccu %-) source /alliance/etc/alc_env.csh
+~alp/addaccu %-) source /etc/profile.d/alc_env.csh
 \end{phraseverbatim}
 
 Otherwise, if you run a \texttt{sh-like} shell, try to run the following 
 command :
 \begin{phraseverbatim}
-~alp/addaccu %-) source /alliance/alc_env.sh
+~alp/addaccu %-) source /etc/profile.d/alc_env.sh
 \end{phraseverbatim}
 \\
 Before we proceed to the tutorial, you must make sure that the
@@ -151,13 +151,13 @@
 MBK_CATAL_NAME=CATAL
 MBK_SCALE_X=100
 MBK_VSS=vss
-MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib
+MBK_CATA_LIB=.:\$ALLIANCE\_TOP/cells/sxlib:\$ALLIANCE\_TOP/cells/padlib
 MBK_WORK_LIB=.
 MBK_VDD=vdd
 MBK_C4_LIB=./cellsC4
 MBK_IN_LO=vst
 MBK_IN_PH=ap
-MBK_TARGET_LIB=/alliance/cells/sxlib
+MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib
 MBK_OUT_LO=vst
 \end{framedverbatim}
 \caption{\label{mbk} \texttt{MBK} environment variables.}

alliance-tutorials-synthesis.patch:
 src/amd2901/amd2901_chip.c |   14 +++++++-------
 tex/synthesis.tex          |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE alliance-tutorials-synthesis.patch ---
diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c	2002-07-25 14:50:18.000000000 +0200
+++ test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c	2009-06-14 00:31:18.000000000 +0200
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 
diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex
--- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex	2004-10-16 14:52:17.000000000 +0200
+++ test-64/tutorials/synthesis/tex/synthesis.tex	2009-07-04 12:26:03.345711622 +0200
@@ -220,7 +211,7 @@
         }
 
 All the files used in this part are located under \\
-\texttt{/tutorial/synthesis/src} directory.\\
+\texttt{/usr/share/doc/alliance-doc-5.0/tutorials/synthesis/src} directory.\\
 This directory contents four subdirectories and one Makefile :
 \begin{itemize}\itemsep=-.8ex
 


alliance-xgra-xgrerror-ld.patch:
 XGR_error.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE alliance-xgra-xgrerror-ld.patch ---
--- xgra/src/XGR_error.c	2007-11-27 21:41:32.000000000 +0100
+++ XGR_error.c	2009-08-28 07:53:58.546631214 +0200
@@ -270,7 +270,7 @@
 
   if ( XgraFigureGra != (autgraph *)NULL )
   {
-    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %d\n  ARCS : %d\n\n",
+    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %ld\n  ARCS : %ld\n\n",
         XgraFigure->NAME,
         XgraFigureGra->NUMBER_NODE,
         XgraFigureGra->NUMBER_ARC );
@@ -282,7 +282,7 @@
 
   Scan = Scan + strlen( Scan );
 
-  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %d\n  YMIN : %d\n  XMAX : %d\n  YMAX : %d\n\n",
+  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %ld\n  YMIN : %ld\n  XMAX : %ld\n  YMAX : %ld\n\n",
            XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT,
            XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT );
 

alliance-xgra.patch:
 Makefile.am |  144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

--- NEW FILE alliance-xgra.patch ---
--- /home/chitlesh/rpmbuild/BUILD/alliance-5.0/xgra/Makefile.am	2009-08-28 07:20:46.993629321 +0200
+++ src/xgra/Makefile.am	2009-08-28 07:26:58.090631633 +0200
@@ -1 +1,143 @@
-SUBDIRS = src etc
+bin_PROGRAMS = \
+	xgra
+
+xgra_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\"xgra\" \
+	$(MOTIF_CFLAGS) \
+	-DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \
+	-DXMS_FILE_NAME=\".xgra.cfg\" \
+	-I$(top_srcdir)/mbk/src \
+	-I$(top_srcdir)/aut/src
+
+xgra_SOURCES = \
+	xgra.c \
+	xgra.h \
+	XGR_bound.c \
+	XGR_bound.h \
+	XGR_error.c \
+	XGR_error.h \
+	XGR_graph.c \
+	XGR_graph.h \
+	XGR_object.c \
+	XGR_object.h \
+	XGR_place.c \
+	XGR_place.h \
+	XGR_select.c \
+	XGR_select.h \
+	XGR.h \
+	XME_dialog.c \
+	XME_dialog.h \
+	XME_edit.c \
+	XME_edit.h \
+	XME.h \
+	XME_menu.c \
+	XME_menu.h \
+	XME_message.c \
+	XME_message.h \
+	XME_panel.c \
+	XME_panel.h \
+	XME_search.c \
+	XME_search.h \
+	XME_select.c \
+	XME_select.h \
+	XMF_dialog.c \
+	XMF_dialog.h \
+	XMF_file.c \
+	XMF_file.h \
+	XMF.h \
+	XMF_menu.c \
+	XMF_menu.h \
+	XMF_panel.c \
+	XMF_panel.h \
+	XMH.h \
+	XMH_help.c \
+	XMH_help.h \
+	XMH_menu.c \
+	XMH_menu.h \
+	XMH_panel.c \
+	XMH_panel.h \
+	XMS_dialog.c \
+	XMS_dialog.h \
+	XMS.h \
+	XMS_menu.c \
+	XMS_menu.h \
+	XMS_panel.c \
+	XMS_panel.h \
+	XMS_setup.c \
+	XMS_setup.h \
+	XMT_dialog.c \
+	XMT_dialog.h \
+	XMT.h \
+	XMT_menu.c \
+	XMT_menu.h \
+	XMT_message.c \
+	XMT_message.h \
+	XMT_panel.c \
+	XMT_panel.h \
+	XMT_tools.c \
+	XMT_tools.h \
+	XMV_dialog.c \
+	XMV_dialog.h \
+	XMV.h \
+	XMV_map.c \
+	XMV_map.h \
+	XMV_menu.c \
+	XMV_menu.h \
+	XMV_message.c \
+	XMV_message.h \
+	XMV_panel.c \
+	XMV_panel.h \
+	XMV_view.c \
+	XMV_view.h \
+	XMX_color.c \
+	XMX_color.h \
+	XMX_cursor.c \
+	XMX_cursor.h \
+	XMX_dialog.c \
+	XMX_dialog.h \
+	XMX_event.c \
+	XMX_event.h \
+	XMX_graphic.c \
+	XMX_graphic.h \
+	XMX_grid.c \
+	XMX_grid.h \
+	XMX.h \
+	XMX_icon.c \
+	XMX_icon.h \
+	XMX_menu.c \
+	XMX_menu.h \
+	XMX_message.c \
+	XMX_message.h \
+	XMX_motif.c \
+	XMX_motif.h \
+	XMX_panel.c \
+	XMX_panel.h \
+	XMX_view.c \
+	XMX_view.h \
+	XSB_error.c \
+	XSB_error.h \
+	XSB.h \
+	XSB_parse.c \
+	XSB_parse.h \
+	XSB_share.c \
+	XSB_share.h \
+	XTB_cursor.c \
+	XTB_cursor.h \
+	XTB_dialog.c \
+	XTB_dialog.h \
+	XTB.h \
+	XTB_icon.c \
+	XTB_icon.h \
+	XTB_menu.c \
+	XTB_menu.h \
+	XTB_panel.c \
+	XTB_panel.h \
+	XTB_pixmap.c \
+	XTB_pixmap.h
+
+xgra_LDADD = \
+	$(GLIB_CFLAGS) \
+	$(MOTIF_LIBS) \
+	$(top_builddir)/src/aut/libAut.la \
+	$(top_builddir)/src/mbk/libMut.la


--- NEW FILE xgra.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Graphic Graph Viewer
Exec=ALLIANCE_TOP/bin/xgra
Icon=xgra.png
Type=Application
Terminal=false
GenericName=xpvn
Categories=Electronics;Engineering;
Comment=View the graphic graph


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Mar 2008 17:11:17 -0000	1.3
+++ .cvsignore	28 Aug 2009 10:31:48 -0000	1.4
@@ -1,2 +1 @@
-alliance-5.0-20070718.tar.gz
-alliance-5.0-tutorials.tar.bz2
+alliance-5.0-20090827.tar.gz

alliance-env.patch:
 distrib1/etc/alc_env.csh.in |   11 +++++++----
 distrib1/etc/alc_env.sh.in  |   11 +++++++----
 etc/Makefile.am             |    2 +-
 etc/Makefile.in             |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/alliance-env.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- alliance-env.patch	15 Sep 2008 16:30:04 -0000	1.5
+++ alliance-env.patch	28 Aug 2009 10:31:48 -0000	1.6
@@ -1,7 +1,8 @@
---- distrib/etc/alc_env.csh.in  2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.csh.in  2008-05-26 22:37:15.000000000 +0200
+diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in
+--- distrib/etc/alc_env.csh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.csh.in	2009-08-27 18:16:05.285270921 +0200
 @@ -70,20 +70,23 @@
-
+ 
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
@@ -9,36 +10,36 @@
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if ( $?LD_LIBRARY_PATH ) then
 -   setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
 +   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
-    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`"
   endif
-
-- if ( $?MANPATH ) then
+ 
+  if ( $?MANPATH ) then
 -   setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-+ if ($?MANPATH) then
-+  setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
++   setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
   else
 -   setenv MANPATH "${ALLIANCE_TOP}/man"
-+  setenv MANPATH ":${ALLIANCE_TOP}/man"
++   setenv MANPATH ":${ALLIANCE_TOP}/man"
   endif
-+
-+# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  setenv MBK_SPI_MODEL       "${ALLIANCE_TOP}/etc/spimodel.cfg"
---- distrib/etc/alc_env.sh.in   2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.sh.in   2008-05-26 22:41:30.000000000 +0200
++ 
++ # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
++ setenv MBK_SPI_MODEL     "${ALLIANCE_TOP}/etc/spimodel.cfg"
+diff -Naur distrib/etc/alc_env.sh.in distrib1/etc/alc_env.sh.in
+--- distrib/etc/alc_env.sh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.sh.in	2009-08-27 18:17:38.477272066 +0200
 @@ -70,20 +70,23 @@
-
-
+ 
+ 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
 + PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if [ -z "${LD_LIBRARY_PATH}" ]; then
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
@@ -47,19 +48,18 @@
 +   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
   fi
   export LD_LIBRARY_PATH
-
+ 
   if [ -z "${MANPATH}" ]; then
--   MANPATH=$ALLIANCE_TOP/man
-+   MANPATH=:$ALLIANCE_TOP/man
+-   MANPATH=$ALLIANCE_TOP/man:$(manpath)
++   MANPATH=:$ALLIANCE_TOP/man:$(manpath)
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
 +   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
-+
++ 
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
-
++ MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
 diff -Naur distrib/etc/Makefile.am etc/Makefile.am
 --- distrib/etc/Makefile.am	2002-06-25 16:09:38.000000000 +0200
 +++ etc/Makefile.am	2007-08-18 13:58:38.000000000 +0200


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/alliance.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- alliance.spec	24 Feb 2009 21:02:21 -0000	1.21
+++ alliance.spec	28 Aug 2009 10:31:49 -0000	1.22
@@ -1,10 +1,9 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20070718
-%define        _default_patch_fuzz  2
+%define        snapshot  20090827
 
 Name:          alliance
 Version:       5.0
-Release:       26.%{snapshot}snap%{?dist}
+Release:       30.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -14,11 +13,26 @@ Source:        http://www-asim.lip6.fr/p
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
 Patch0:        alliance-env.patch
-Patch1:        alliance-examples.patch
-Patch2:        alliance-run.patch
-Patch3:        alliance-perms.patch
-Patch4:        alliance-gcc43.patch
-Patch5:        alliance-generic.patch
+Patch1:        alliance-run.patch
+Patch2:        alliance-perms.patch
+
+# Improving autogeneration of documentation
+Patch3:        alliance-tutorials-place_n_route.patch
+Patch4:        alliance-tutorials-simulation.patch
+Patch5:        alliance-tutorials-start.patch
+Patch6:        alliance-tutorials-synthesis.patch
+Patch7:        alliance-tutorials-amd2901.patch
+
+# Improving examples
+Patch8:        alliance-examples.patch
+Patch9:        alliance-examples-adm2901.patch
+Patch10:       alliance-examples-mipsR3000.patch
+
+# upstream enhancements
+Patch11:       alliance-xgra.patch
+
+# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
+Patch12:       alliance-xgra-xgrerror-ld.patch
 
 Source1:       xsch.desktop
 Source2:       dreal.desktop
@@ -26,25 +40,37 @@ Source3:       xpat.desktop
 Source4:       xfsm.desktop
 Source5:       xvpn.desktop
 Source6:       graal.desktop
+Source7:       xgra.desktop
 
-Source7:       alliance.fedora
+Source8:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source8:       graal.png
-Source9:       dreal.png
-Source10:      xvpn.png
-Source11:      xfsm.png
-Source12:      xpat.png
-Source13:      xsch.png
-
-Source14:      %{name}-5.0-tutorials.tar.bz2
+Source9:       graal.png
+Source10:      dreal.png
+Source11:      xvpn.png
+Source12:      xfsm.png
+Source13:      xpat.png
+Source14:      xsch.png
+Source15:      xgra.png
+
+Source16:      alliance-tutorials-go-all.sh
+Source17:      alliance-tutorials-go-all-clean.sh
+Source18:      alliance-examples-go-all.sh
+Source19:      alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison
+BuildRequires: libXt-devel byacc desktop-file-utils bison
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:       xorg-x11-fonts-misc
+%if 0%{?rhel}
+BuildRequires: openmotif-devel
+BuildRequires: pkgconfig
+%else
+BuildRequires: lesstif-devel
+%endif
+
+Requires:      xorg-x11-fonts-misc
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -87,7 +113,6 @@ Summary:      Alliance VLSI CAD Sytem - 
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
 Requires:     electronics-menu
-Obsoletes:    %{name} < 5.0-12
 
 
 %description libs
@@ -98,7 +123,9 @@ Architecture dependent files for the All
 Summary:      Alliance VLSI CAD Sytem - Documentations
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
-Requires:     gnuplot
+Requires:     gnuplot 
+BuildRequires:tetex-latex
+
 
 
 %description doc
@@ -107,41 +134,85 @@ Documentation and tutorials for the Alli
 
 %prep
 %setup -q
+%{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
 sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
 
-
-%patch0 -p0 -b .env
-# removing useless copyrighted (by Cadence) lines from the examples
+# removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
-%patch1 -p0 -b .examples
-%patch2 -p0 -b .run
-# fixing permissions
-%patch3 -p0 -b .perms
+
+%patch11 -p1 -b .xgra-makefile.am
+%patch12 -p0 -b .xgra-long
 
 
-### 2008 March: TexLive introduction to Rawhide
+%patch0 -p0 -b .env
+%patch1 -p0 -b .run
+%patch2 -p0 -b .perms
+
+
+# ------------------------------------------------------------------------------
+# Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
-tar -xvf %{SOURCE14}
+sed -i "s|documentation/tutorials/Makefile||" configure*
+%patch3 -p1 -b .doc
+%patch4 -p1 -b .doc
+%patch5 -p1 -b .doc
+%patch6 -p1 -b .doc
+%patch7 -p0 -b .doc
+pushd documentation/tutorials
+    # clean unneccessary files
+    %{__rm} Makefile*
+    %{__rm} *.pdf
+    # build documentation
+    for folder in place_and_route/tex start simulation/tex synthesis/tex; do
+        pushd $folder
+            %{__make}
+        popd
+        # remove useless directories before %%doc
+        %{__rm} -rf $folder
+    done
+    # Add automated scripts to tutorials
+    %{__install} -pm 755 %{SOURCE16} go-all.sh
+    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    # Fedora Electronic Lab self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-tutorials.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
+# ------------------------------------------------------------------------------
 
+%patch8  -p0 -b .examples
+%patch9  -p1 -b .examples
+%patch10 -p1 -b .examples
 
-%patch4 -p1 -b .include
-%patch5 -p0 -b .generic
+# fixing flex and bison update on rawhide
+sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
+sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
 
 # make sure the man pages are UTF-8...
-for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
+for nonUTF8 in FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
                loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do
   %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
   %{__mv} -f $nonUTF8.conv $nonUTF8
 done
 
+pushd documentation/alliance-examples/
+# make sure the man pages are UTF-8...
+for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \
+               tuner/README mipsR3000/sce/mips_dpt.c ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
 #wrong-file-end-of-line-encoding
-sed -i 's/\r//' documentation/alliance-examples/mipsR3000/asm/*
+sed -i 's/\r//' mipsR3000/asm/*
+popd
 
-# fixing flex and bison update on rawhide
-sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
+# Fix xgra build 
+sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
+sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
 
 %build
 
@@ -189,25 +260,30 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/doc/
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
-# correcting minor documentation details
-sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+# Add automated scripts to examples
+%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+
+pushd alliance-examples/
+    # FEL self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-examples.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
 for desktopfile in *.desktop; do
-desktop-file-install --vendor fedora          \
-  --add-category Engineering                  \
-  --add-category Electronics                  \
-  --remove-category Science                   \
+desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
 done
@@ -219,9 +295,9 @@ done
 
 
 # protecting hardcoded links
-ln -sf ../../..%{_datadir}/%{name}/cells    %{buildroot}%{prefix}/cells
-ln -sf ../../..%{_datadir}/%{name}/etc      %{buildroot}%{prefix}/etc
-ln -sf ../../..%{_datadir}/%{name}/man      %{buildroot}%{prefix}/man
+ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells
+ln -sf ../../..%{_datadir}/%{name}/etc   %{buildroot}%{prefix}/etc
+ln -sf ../../..%{_datadir}/%{name}/man   %{buildroot}%{prefix}/man
 
 
 # manpage-not-gzipped
@@ -238,11 +314,17 @@ EOF
 # removing tools for compiling and installing Alliance tools
 # These are for the packager (i.e me) and not for user
 %{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf
+%{__rm} -f %{buildroot}%{prefix}/etc/attila.conf
 %{__rm} -f %{buildroot}%{prefix}/bin/attila
 %{__rm} -f %{buildroot}%{_datadir}/man/man1/attila*
 %{__rm} -f doc/html/alliance/*attila.html
 %{__rm} -f doc/pdf/attila.pdf
 
+# correcting minor documentation details
+sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+
+%{_fixperms} %{buildroot}/*
+
 
 %post
 /sbin/ldconfig
@@ -274,18 +356,20 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files libs
+%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
-%{_datadir}/applications/fedora-*.desktop
-%{_sysconfdir}/profile.d/alc_env.*
+%{_datadir}/applications/*.desktop
+%config(noreplace) %{_sysconfdir}/profile.d/alc_env.*
 
 
 %files doc
+%defattr(-,root,root,-)
 %doc doc/html/
 %doc doc/design-flow
 %doc doc/pdf/*.pdf
 %doc doc/overview/*.ps
 %doc doc/overview/*.pdf
-%doc tutorials/
+%doc documentation/tutorials/
 #Makefiles are present in alliance-examples/*. It is normal because
 # * it gives the VLSI designer a template on how to create his own
 #   Makefile for alliance (VLSI designers normally don't know how to do so)
@@ -296,10 +380,26 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
+- updated to upstream's 20090828 snapshot
+- merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements
+- fixed EPEL-5 build
+
+* Sat Aug 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-29.20070718snap
+- improved rawhide build with respect to the broken patches
+
+* Thu Jul 9 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-28.20070718snap
+- improved stability on 64 bit architecture
+- Patches (14 to 100) added along with new features from upstream
+
+* Sat Jul 4 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-27.20070718snap
+- improved autogeneration of documentation and fixed the examples
+
 * Tue Feb 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-26.20070718snap
 - fixed build due to new releases of flex and bison
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-25.20070718snap - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-25.20070718snap
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Feb 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-24.20070718snap
 - Improved VHDL generic implementation


Index: dreal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/dreal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dreal.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ dreal.desktop	28 Aug 2009 10:31:49 -0000	1.4
@@ -6,5 +6,5 @@ Icon=dreal.png
 Type=Application
 Terminal=false
 GenericName=dreal
-Categories=Science;
-Comment=View the Real layout
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Real layout


Index: graal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/graal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- graal.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ graal.desktop	28 Aug 2009 10:31:49 -0000	1.4
@@ -6,5 +6,5 @@ Icon=graal.png
 Type=Application
 Terminal=false
 GenericName=graal
-Categories=Science;
-Comment=Edits physical layouts
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=Edits physical layouts


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Feb 2009 21:02:21 -0000	1.3
+++ import.log	28 Aug 2009 10:31:49 -0000	1.4
@@ -1,3 +1,4 @@
 alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496180
 alliance-5_0-24_20070718snap_fc10:HEAD:alliance-5.0-24.20070718snap.fc10.src.rpm:1233516213
 alliance-5_0-26_20070718snap_fc10:HEAD:alliance-5.0-26.20070718snap.fc10.src.rpm:1235508896
+alliance-5_0-30_20090827snap_fc11:F-11:alliance-5.0-30.20090827snap.fc11.src.rpm:1251455305


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Mar 2008 17:11:17 -0000	1.3
+++ sources	28 Aug 2009 10:31:49 -0000	1.4
@@ -1,2 +1 @@
-917f4493c09f6f5c49d5a606a5e9bbd8  alliance-5.0-20070718.tar.gz
-32cac3116f85713aec2e1e18379811eb  alliance-5.0-tutorials.tar.bz2
+8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz


Index: xfsm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/xfsm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xfsm.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xfsm.desktop	28 Aug 2009 10:31:49 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xfsm.png
 Type=Application
 Terminal=false
 GenericName=xfsm
-Categories=Science;
-Comment=View Finite State Machines
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View Finite State Machines


Index: xpat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/xpat.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xpat.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xpat.desktop	28 Aug 2009 10:31:49 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xpat.png
 Type=Application
 Terminal=false
 GenericName=xpat
-Categories=Science;
-Comment=View the Patterns
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Patterns


Index: xsch.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/xsch.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xsch.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xsch.desktop	28 Aug 2009 10:31:49 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xsch.png
 Type=Application
 Terminal=false
 GenericName=Xsch
-Categories=Science;
-Comment=View the Schematic
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Schematic


Index: xvpn.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/xvpn.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xvpn.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xvpn.desktop	28 Aug 2009 10:31:49 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xvpn.png
 Type=Application
 Terminal=false
 GenericName=xpvn
-Categories=Science;
-Comment=View the Petri Nets
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Petri Nets


--- alliance-gcc43.patch DELETED ---


--- alliance-generic.patch DELETED ---



From karsten at fedoraproject.org  Fri Aug 28 10:36:11 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 28 Aug 2009 10:36:11 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-volkeysize.patch, NONE,
	1.1 parted.spec, 1.146, 1.147
Message-ID: <20090828103611.DA76211C0044@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19007

Modified Files:
	parted.spec 
Added Files:
	parted-1.9.0-volkeysize.patch 
Log Message:
- volkey is only 4 chars, don't overflow destination buffer with 84 chars

parted-1.9.0-volkeysize.patch:
 vtoc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.9.0-volkeysize.patch ---
diff -up parted-1.9.0/libparted/labels/vtoc.c.kh1 parted-1.9.0/libparted/labels/vtoc.c
--- parted-1.9.0/libparted/labels/vtoc.c.kh1	2009-08-28 12:17:26.000000000 +0200
+++ parted-1.9.0/libparted/labels/vtoc.c	2009-08-28 12:18:03.000000000 +0200
@@ -263,7 +263,7 @@ vtoc_volume_label_init (volume_label_t *
 	PDEBUG
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);
-	strncpy(vlabel->volkey, buffer, 84);
+	strncpy(vlabel->volkey, buffer, 4);
 }
 
 /*


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- parted.spec	21 Aug 2009 14:01:47 -0000	1.146
+++ parted.spec	28 Aug 2009 10:36:11 -0000	1.147
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -21,6 +21,7 @@ Patch8:  %{name}-1.9.0-dasd-duplicate.pa
 Patch9:  %{name}-1.9.0-new-duplicate.patch
 Patch10:  %{name}-1.9.0-handle-dup-error.patch
 Patch11:  %{name}-1.9.0-swap-flag.patch
+Patch12:  %{name}-1.9.0-volkeysize.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -69,6 +70,7 @@ Parted library, you need to install this
 %patch9 -p1 -b .new-duplicate
 %patch10 -p1 -b .handle-dup-error
 %patch11 -p1 -b .swap-flag
+%patch12 -p1 -b .volkey-size^^
 
 
 %build
@@ -129,6 +131,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Aug 28 2009 Karsten Hopp <karsten at redhat.com> 1.9.0-13
+- volkey is only 4 chars, don't overflow destination buffer with 84 chars
+
 * Fri Aug 21 2009 Joel Granados <jgranado at redhat.com> - 1.9.0-12
 - libuuid-devel is now valid for s390 builds.
 



From twaugh at fedoraproject.org  Fri Aug 28 10:41:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 10:41:53 +0000 (UTC)
Subject: rpms/hplip/devel hplip-non-scripts.patch, 1.1, 1.2 hplip.spec, 1.234,
	1.235
Message-ID: <20090828104153.19AA211C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20844

Modified Files:
	hplip-non-scripts.patch hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
- Include missing base files.


hplip-non-scripts.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: hplip-non-scripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-non-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-non-scripts.patch	25 Aug 2009 11:08:02 -0000	1.1
+++ hplip-non-scripts.patch	28 Aug 2009 10:41:52 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
---- hplip-3.9.8/Makefile.am.non-scripts	2009-08-25 12:02:59.790202347 +0100
-+++ hplip-3.9.8/Makefile.am	2009-08-25 12:03:32.234212568 +0100
+--- hplip-3.9.8/Makefile.am.non-scripts	2009-08-04 22:37:39.000000000 +0100
++++ hplip-3.9.8/Makefile.am	2009-08-28 10:58:04.488778060 +0100
 @@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin
  # base
  basedir = $(hplipdir)/base
@@ -10,24 +10,3 @@ diff -up hplip-3.9.8/Makefile.am.non-scr
  	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
  	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
  	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
-diff -up hplip-3.9.8/Makefile.in.non-scripts hplip-3.9.8/Makefile.in
---- hplip-3.9.8/Makefile.in.non-scripts	2009-08-25 12:03:37.345077328 +0100
-+++ hplip-3.9.8/Makefile.in	2009-08-25 12:04:08.766078065 +0100
-@@ -428,7 +428,7 @@ am__ptest_SOURCES_DIST = pcard/ptest.c p
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	fat.$(OBJEXT)
- ptest_OBJECTS = $(am_ptest_OBJECTS)
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at ptest_DEPENDENCIES = libhpmud.la
--am__dist_base_SCRIPTS_DIST = base/maint.py base/codes.py base/g.py \
-+am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \
- 	base/pml.py base/status.py base/__init__.py base/mfpdtf.py \
- 	base/utils.py base/wifi.py base/device.py base/logger.py \
- 	base/slp.py base/exif.py base/strings.py base/magic.py \
-@@ -3701,7 +3701,7 @@ cups_drv = prnt/drv/hpcups.drv
- 
- # base
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at basedir = $(hplipdir)/base
-- at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
-+ at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- hplip.spec	28 Aug 2009 09:09:27 -0000	1.234
+++ hplip.spec	28 Aug 2009 10:41:52 -0000	1.235
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -44,6 +44,7 @@ BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 BuildRequires: sane-backends-devel
 BuildRequires: dbus-devel
+BuildRequires: automake, autoconf, libtool
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -138,6 +139,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %patch9 -p1 -b .requirespageregion
 
 %build
+aclocal
+automake --foreign --add-missing --copy
+autoconf
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install \
@@ -337,6 +341,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
+- Include missing base files.
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-13
 - Use dll.d file instead of post scriptlet for hpaio (bug #519988).
 - Fixed RequiresPageRegion patch (bug #518756).



From pkgdb at fedoraproject.org  Fri Aug 28 10:41:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 10:41:34 +0000
Subject: [pkgdb] python-xklavier summary updated by huzaifas
Message-ID: <20090828104134.672EA10F87B@bastion2.fedora.phx.redhat.com>

huzaifas set package python-xklavier summary to Python bindings for libxklavier

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-xklavier



From pkgdb at fedoraproject.org  Fri Aug 28 10:41:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 10:41:33 +0000
Subject: [pkgdb] python-xklavier was added for kushal
Message-ID: <20090828104133.6924210F877@bastion2.fedora.phx.redhat.com>

huzaifas has added Package python-xklavier with summary Python bindings for libxklavier
huzaifas has approved Package python-xklavier
huzaifas has added a Fedora devel branch for python-xklavier with an owner of kushal
huzaifas has approved python-xklavier in Fedora devel
huzaifas has approved Package python-xklavier
huzaifas has set commit to Approved for 107427 on python-xklavier (Fedora devel)
huzaifas has set checkout to Approved for 107427 on python-xklavier (Fedora devel)
huzaifas has set build to Approved for 107427 on python-xklavier (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-xklavier



From chitlesh at fedoraproject.org  Fri Aug 28 10:44:16 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 10:44:16 +0000 (UTC)
Subject: rpms/alliance/devel alliance-xgra-xgrerror-ld.patch, NONE,
	1.1 xgra.desktop, NONE, 1.1 xgra.png, NONE, 1.1 .cvsignore, 1.4,
	1.5 alliance-env.patch, 1.5,
	1.6 alliance-tutorials-place_n_route.patch, 1.1,
	1.2 alliance-tutorials-simulation.patch, 1.1,
	1.2 alliance-tutorials-start.patch, 1.1,
	1.2 alliance-tutorials-synthesis.patch, 1.1,
	1.2 alliance-xgra.patch, 1.1, 1.2 alliance.spec, 1.24,
	1.25 dreal.desktop, 1.3, 1.4 graal.desktop, 1.3, 1.4 import.log,
	1.5, 1.6 sources, 1.4, 1.5 xfsm.desktop, 1.3, 1.4 xpat.desktop,
	1.3, 1.4 xsch.desktop, 1.3, 1.4 xvpn.desktop, 1.3,
	1.4 alliance-abe.patch, 1.1, NONE alliance-abl.patch, 1.1,
	NONE alliance-alcban.patch, 1.1, NONE alliance-asimut.patch, 1.1,
	NONE alliance-attila.patch, 1.1, NONE alliance-aut.patch, 1.1,
	NONE alliance-bdd.patch, 1.1, NONE alliance-beh.patch, 1.1,
	NONE alliance-bhl.patch, 1.1, NONE alliance-boog.patch, 1.1,
	NONE alliance-boom.patch, 1.1, NONE alliance-btr.patch, 1.1,
	NONE alliance-bvl.patch, 1.1, NONE alliance-cells.patch, 1.1,
	NONE alliance-ctl.patch, 1.1, NONE alliance-ctp.patch, 1.1,
	NONE alliance-distrib.patch, 1.1, NONE alliance-dreal.patch, 1.1,
	NONE alliance-druc.patch, 1.1, NONE alliance-elp.patch, 1.1,
	NONE alliance-exp.patch, 1.1, NONE alliance-files.patch, 1.1,
	NONE alliance-fks.patch, 1.1, NONE alliance-flatbeh.patch, 1.1,
	NONE alliance-flatlo.patch, 1.1, NONE alliance-flatph.patch, 1.1,
	NONE alliance-fmi.patch, 1.1, NONE alliance-fsm.patch, 1.1,
	NONE alliance-fsp.patch, 1.1, NONE alliance-ftl.patch, 1.1,
	NONE alliance-fvh.patch, 1.1, NONE alliance-gcp.patch, 1.1,
	NONE alliance-generic.patch, 1.1, NONE alliance-genlib.patch,
	1.1, NONE alliance-genpat.patch, 1.1,
	NONE alliance-genview.patch, 1.1, NONE alliance-graal.patch, 1.1,
	NONE alliance-grog.patch, 1.1, NONE alliance-growstk.patch, 1.1,
	NONE alliance-k2f.patch, 1.1, NONE alliance-l2p.patch, 1.1,
	NONE alliance-log.patch, 1.1, NONE alliance-loon.patch, 1.1,
	NONE alliance-lvx.patch, 1.1, NONE alliance-lynx.patch, 1.1,
	NONE alliance-m2e.patch, 1.1, NONE alliance-mbk.patch, 1.1,
	NONE alliance-mbkal.patch, 1.1, NONE alliance-mbkap.patch, 1.1,
	NONE alliance-mbkedif.patch, 1.1, NONE alliance-mbkhilo.patch,
	1.1, NONE alliance-mbkvti.patch, 1.1,
	NONE alliance-mips_asm.patch, 1.1, NONE alliance-mocha.patch,
	1.1, NONE alliance-nero.patch, 1.1, NONE alliance-ocp.patch, 1.1,
	NONE alliance-ocr.patch, 1.1, NONE alliance-pat.patch, 1.1,
	NONE alliance-pat2spi.patch, 1.1, NONE alliance-pcbs.patch, 1.1,
	NONE alliance-phl.patch, 1.1, NONE alliance-ppt.patch, 1.1,
	NONE alliance-proof.patch, 1.1, NONE alliance-rds.patch, 1.1,
	NONE alliance-rdscif.patch, 1.1, NONE alliance-rdsgds.patch, 1.1,
	NONE alliance-ring.patch, 1.1, NONE alliance-rtd.patch, 1.1,
	NONE alliance-rtn.patch, 1.1, NONE alliance-s2r.patch, 1.1,
	NONE alliance-scapin.patch, 1.1, NONE alliance-scl.patch, 1.1,
	NONE alliance-sea.patch, 1.1, NONE alliance-syf.patch, 1.1,
	NONE alliance-vasy.patch, 1.1, NONE alliance-vbh.patch, 1.1,
	NONE alliance-vbl.patch, 1.1, NONE alliance-vex.patch, 1.1,
	NONE alliance-vpd.patch, 1.1, NONE alliance-vpn.patch, 1.1,
	NONE alliance-vst2xnf.patch, 1.1, NONE alliance-vtl.patch, 1.1,
	NONE alliance-vvh.patch, 1.1, NONE alliance-x2y.patch, 1.1,
	NONE alliance-xfsm.patch, 1.1, NONE alliance-xpat.patch, 1.1,
	NONE alliance-xsch.patch, 1.1, NONE alliance-xvpn.patch, 1.1, NONE
Message-ID: <20090828104417.054EA11C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21491/devel

Modified Files:
	.cvsignore alliance-env.patch 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch alliance-xgra.patch 
	alliance.spec dreal.desktop graal.desktop import.log sources 
	xfsm.desktop xpat.desktop xsch.desktop xvpn.desktop 
Added Files:
	alliance-xgra-xgrerror-ld.patch xgra.desktop xgra.png 
Removed Files:
	alliance-abe.patch alliance-abl.patch alliance-alcban.patch 
	alliance-asimut.patch alliance-attila.patch alliance-aut.patch 
	alliance-bdd.patch alliance-beh.patch alliance-bhl.patch 
	alliance-boog.patch alliance-boom.patch alliance-btr.patch 
	alliance-bvl.patch alliance-cells.patch alliance-ctl.patch 
	alliance-ctp.patch alliance-distrib.patch alliance-dreal.patch 
	alliance-druc.patch alliance-elp.patch alliance-exp.patch 
	alliance-files.patch alliance-fks.patch alliance-flatbeh.patch 
	alliance-flatlo.patch alliance-flatph.patch alliance-fmi.patch 
	alliance-fsm.patch alliance-fsp.patch alliance-ftl.patch 
	alliance-fvh.patch alliance-gcp.patch alliance-generic.patch 
	alliance-genlib.patch alliance-genpat.patch 
	alliance-genview.patch alliance-graal.patch 
	alliance-grog.patch alliance-growstk.patch alliance-k2f.patch 
	alliance-l2p.patch alliance-log.patch alliance-loon.patch 
	alliance-lvx.patch alliance-lynx.patch alliance-m2e.patch 
	alliance-mbk.patch alliance-mbkal.patch alliance-mbkap.patch 
	alliance-mbkedif.patch alliance-mbkhilo.patch 
	alliance-mbkvti.patch alliance-mips_asm.patch 
	alliance-mocha.patch alliance-nero.patch alliance-ocp.patch 
	alliance-ocr.patch alliance-pat.patch alliance-pat2spi.patch 
	alliance-pcbs.patch alliance-phl.patch alliance-ppt.patch 
	alliance-proof.patch alliance-rds.patch alliance-rdscif.patch 
	alliance-rdsgds.patch alliance-ring.patch alliance-rtd.patch 
	alliance-rtn.patch alliance-s2r.patch alliance-scapin.patch 
	alliance-scl.patch alliance-sea.patch alliance-syf.patch 
	alliance-vasy.patch alliance-vbh.patch alliance-vbl.patch 
	alliance-vex.patch alliance-vpd.patch alliance-vpn.patch 
	alliance-vst2xnf.patch alliance-vtl.patch alliance-vvh.patch 
	alliance-x2y.patch alliance-xfsm.patch alliance-xpat.patch 
	alliance-xsch.patch alliance-xvpn.patch 
Log Message:
snapshot 20090827

alliance-xgra-xgrerror-ld.patch:
 XGR_error.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE alliance-xgra-xgrerror-ld.patch ---
--- xgra/src/XGR_error.c	2007-11-27 21:41:32.000000000 +0100
+++ XGR_error.c	2009-08-28 07:53:58.546631214 +0200
@@ -270,7 +270,7 @@
 
   if ( XgraFigureGra != (autgraph *)NULL )
   {
-    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %d\n  ARCS : %d\n\n",
+    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %ld\n  ARCS : %ld\n\n",
         XgraFigure->NAME,
         XgraFigureGra->NUMBER_NODE,
         XgraFigureGra->NUMBER_ARC );
@@ -282,7 +282,7 @@
 
   Scan = Scan + strlen( Scan );
 
-  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %d\n  YMIN : %d\n  XMAX : %d\n  YMAX : %d\n\n",
+  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %ld\n  YMIN : %ld\n  XMAX : %ld\n  YMAX : %ld\n\n",
            XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT,
            XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT );
 


--- NEW FILE xgra.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Graphic Graph Viewer
Exec=ALLIANCE_TOP/bin/xgra
Icon=xgra.png
Type=Application
Terminal=false
GenericName=xpvn
Categories=Electronics;Engineering;
Comment=View the graphic graph


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Jul 2009 11:46:51 -0000	1.4
+++ .cvsignore	28 Aug 2009 10:44:02 -0000	1.5
@@ -1 +1 @@
-alliance-5.0-20070718.tar.gz
+alliance-5.0-20090827.tar.gz

alliance-env.patch:
 distrib1/etc/alc_env.csh.in |   11 +++++++----
 distrib1/etc/alc_env.sh.in  |   11 +++++++----
 etc/Makefile.am             |    2 +-
 etc/Makefile.in             |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-env.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- alliance-env.patch	15 Sep 2008 16:30:04 -0000	1.5
+++ alliance-env.patch	28 Aug 2009 10:44:04 -0000	1.6
@@ -1,7 +1,8 @@
---- distrib/etc/alc_env.csh.in  2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.csh.in  2008-05-26 22:37:15.000000000 +0200
+diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in
+--- distrib/etc/alc_env.csh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.csh.in	2009-08-27 18:16:05.285270921 +0200
 @@ -70,20 +70,23 @@
-
+ 
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
@@ -9,36 +10,36 @@
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if ( $?LD_LIBRARY_PATH ) then
 -   setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
 +   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
-    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`"
   endif
-
-- if ( $?MANPATH ) then
+ 
+  if ( $?MANPATH ) then
 -   setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-+ if ($?MANPATH) then
-+  setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
++   setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
   else
 -   setenv MANPATH "${ALLIANCE_TOP}/man"
-+  setenv MANPATH ":${ALLIANCE_TOP}/man"
++   setenv MANPATH ":${ALLIANCE_TOP}/man"
   endif
-+
-+# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  setenv MBK_SPI_MODEL       "${ALLIANCE_TOP}/etc/spimodel.cfg"
---- distrib/etc/alc_env.sh.in   2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.sh.in   2008-05-26 22:41:30.000000000 +0200
++ 
++ # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
++ setenv MBK_SPI_MODEL     "${ALLIANCE_TOP}/etc/spimodel.cfg"
+diff -Naur distrib/etc/alc_env.sh.in distrib1/etc/alc_env.sh.in
+--- distrib/etc/alc_env.sh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.sh.in	2009-08-27 18:17:38.477272066 +0200
 @@ -70,20 +70,23 @@
-
-
+ 
+ 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
 + PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if [ -z "${LD_LIBRARY_PATH}" ]; then
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
@@ -47,19 +48,18 @@
 +   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
   fi
   export LD_LIBRARY_PATH
-
+ 
   if [ -z "${MANPATH}" ]; then
--   MANPATH=$ALLIANCE_TOP/man
-+   MANPATH=:$ALLIANCE_TOP/man
+-   MANPATH=$ALLIANCE_TOP/man:$(manpath)
++   MANPATH=:$ALLIANCE_TOP/man:$(manpath)
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
 +   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
-+
++ 
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
-
++ MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
 diff -Naur distrib/etc/Makefile.am etc/Makefile.am
 --- distrib/etc/Makefile.am	2002-06-25 16:09:38.000000000 +0200
 +++ etc/Makefile.am	2007-08-18 13:58:38.000000000 +0200

alliance-tutorials-place_n_route.patch:
 amd2901_chip.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Index: alliance-tutorials-place_n_route.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-tutorials-place_n_route.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alliance-tutorials-place_n_route.patch	4 Jul 2009 11:46:52 -0000	1.1
+++ alliance-tutorials-place_n_route.patch	28 Aug 2009 10:44:13 -0000	1.2
@@ -37,61 +37,3 @@ diff -Naur alliance-5.0/documentation/tu
  
    GENLIB_SAVE_LOFIG();
  
-diff -Naur alliance-5.0/documentation/tutorials/place_and_route/tex/place_and_route.tex test-64/tutorials/place_and_route/tex/place_and_route.tex
---- alliance-5.0/documentation/tutorials/place_and_route/tex/place_and_route.tex	2004-10-16 14:51:56.000000000 +0200
-+++ test-64/tutorials/place_and_route/tex/place_and_route.tex	2009-07-04 12:02:23.689711020 +0200
-@@ -1,26 +1,17 @@
--%%%%%%%%%%%%%%%%
--% $Id$
--% $Log$
--% Revision 1.1  2009/07/04 11:46:52  chitlesh
--% fixed documentation and broken examples
--%
--% Revision 1.5  2004/10/16 12:51:56  fred
--% Erasing the psfig include from the file, changed the font to 10 pt
--% instead of 12 (sparing trees and not being payed by the thickness of
--% my production) and changing font to charter since I got tired of
--% Palatino, sorry Herman!
--%
--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--\documentclass{article}
-+\documentclass[10pt]{article}
- \usepackage[dvips]{graphics}
- \usepackage[english]{babel}
--\usepackage{doublespace}
-+\usepackage{setspace}
- \usepackage{epsf}
- \usepackage{fancybox}
--\usepackage{fancyheadings}
-+\usepackage{fancyhdr}
- \usepackage{float}
- \usepackage{graphicx}
--\usepackage{here}
--\usepackage{isolatin1}
--\usepackage{charter}
-+%\usepackage{here}
-+%\usepackage{isolatin1}
-+\usepackage{palatino}
- \usepackage{picinpar}
-+%\usepackage{psfig}
- \usepackage{rotate}
- \usepackage{subfigure}
- \usepackage{sverb}
-@@ -37,7 +28,7 @@
- \setlength{\columnsep}{0.125in}
- \setlength{\columnseprule}{0.5pt}
- \setlength{\footskip}{1cm}
--\setstretch{1.2}
-+%\setstretch{1.2}
- 
- 
- %--------------------------------- styles
-@@ -67,7 +58,7 @@
- %--------------------------------- page style --------------------------------
- \pagestyle{fancy} \rhead{Place and route}
- \lhead{PART 3} \rfoot{\thepage} \lfoot{ALLIANCE TUTORIAL} \cfoot{}
--\setlength{\footrulewidth}{0.6pt}
-+
- %
- %\begin{figure}[H]\centering
- % \includegraphics[width=8cm,height=8cm]{.eps}

alliance-tutorials-simulation.patch:
 simulation.tex |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: alliance-tutorials-simulation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-tutorials-simulation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alliance-tutorials-simulation.patch	4 Jul 2009 11:46:52 -0000	1.1
+++ alliance-tutorials-simulation.patch	28 Aug 2009 10:44:13 -0000	1.2
@@ -1,77 +1,12 @@
 diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex
 --- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex	2004-10-16 14:52:05.000000000 +0200
 +++ test-64/tutorials/simulation/tex/simulation.tex	2009-07-04 12:18:54.867711418 +0200
-@@ -1,27 +1,18 @@
--%%%%%%%%%%%%%%%%
--% $Id$
--% $Log$
--% Revision 1.1  2009/07/04 11:46:52  chitlesh
--% fixed documentation and broken examples
--%
--% Revision 1.5  2004/10/16 12:52:05  fred
--% Erasing the psfig include from the file, changed the font to 10 pt
--% instead of 12 (sparing trees and not being payed by the thickness of
--% my production) and changing font to charter since I got tired of
--% Palatino, sorry Herman!
--%
--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- 
- %--------------------------------- page style --------------------------------
--\documentclass{article}
-+\documentclass[10pt]{article}
- \usepackage[dvips]{graphics}
- \usepackage[english]{babel}
--\usepackage{doublespace}
-+\usepackage{setspace}
-+\usepackage{epsf}
- \usepackage{fancybox}
--\usepackage{fancyheadings}
-+\usepackage{fancyhdr}
- \usepackage{float}
- \usepackage{graphicx}
--\usepackage{here}
--\usepackage{isolatin1}
--\usepackage{charter}
-+\usepackage[latin1]{inputenc}
-+\usepackage{palatino}
- \usepackage{picinpar}
-+%\usepackage{psfig}
- \usepackage{rotate}
- \usepackage{subfigure}
- \usepackage{sverb}
-@@ -38,7 +29,7 @@
- \setlength{\columnsep}{0.125in}
- \setlength{\columnseprule}{0.5pt}
- \setlength{\footskip}{1cm}
--\setstretch{1}
-+%\setstretch{1}
- 
- %--------------------------------- styles--------------------------------
- %
-@@ -66,7 +57,7 @@
- \rfoot{\thepage}
- \lfoot{ALLIANCE TUTORIAL}
- \cfoot{}
--\setlength{\footrulewidth}{0.6pt}
-+%\setlength{\footrulewidth}{0.6pt}
- 
- %--------------------------------- page style --------------------------------
- \pagestyle{fancy}
-@@ -75,7 +66,7 @@
- \rfoot{\thepage}
- \lfoot{ALLIANCE TUTORIAL}
- \cfoot{}
--\setlength{\footrulewidth}{0.6pt}
-+%\setlength{\footrulewidth}{0.6pt}
- 
- %---------------------------------- document ---------------------------------
- 
 @@ -171,7 +162,7 @@
          }
  
  All the files used in this part are located in the \\ 
 -\texttt{/tutorial/simulation/src} directory.\\
-+\texttt{/usr/share/doc/alliance-doc-5.0//tutorial/simulation/src} directory.\\
++\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\
  This directory contains two subdirectories and one Makefile : 
  \begin{itemize}
  \item The Makefile allows you to validate automatically the entire simulation part

alliance-tutorials-start.patch:
 start.tex |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: alliance-tutorials-start.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-tutorials-start.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alliance-tutorials-start.patch	4 Jul 2009 11:46:52 -0000	1.1
+++ alliance-tutorials-start.patch	28 Aug 2009 10:44:13 -0000	1.2
@@ -1,26 +1,6 @@
 diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex
 --- alliance-5.0/documentation/tutorials/start/start.tex	2004-10-16 14:52:13.000000000 +0200
 +++ test-64/tutorials/start/start.tex	2009-07-04 12:17:35.389714653 +0200
-@@ -5,16 +5,16 @@
- % Version for Alliance releases 2.0 and up by Frederic Petrot
- % Modified by czo for Alliance release 4.0 (01/2000)
- % TODO : no fully working, needs some adjustements
--% $Id$
-+% $Id$
- %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \documentclass{article}
--\usepackage{charter,doublespace,here,fancybox}
-+\usepackage{palatino,setspace,fancybox}
- \textwidth 15cm
- \textheight 23cm
- \oddsidemargin  +0.75cm
- \evensidemargin -0.75cm
--\setstretch{1.2}
-+%\setstretch{1.2}
- %%%%%%%%%%%%%%%
- % Setting the width of the verbatim parts according to 80 tt chars
- % Since it is tt, any char is fine
 @@ -116,13 +116,13 @@
  try to run the following command :
  

alliance-tutorials-synthesis.patch:
 src/amd2901/amd2901_chip.c |   14 +++++++-------
 tex/synthesis.tex          |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: alliance-tutorials-synthesis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-tutorials-synthesis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alliance-tutorials-synthesis.patch	4 Jul 2009 11:46:52 -0000	1.1
+++ alliance-tutorials-synthesis.patch	28 Aug 2009 10:44:13 -0000	1.2
@@ -30,158 +30,9 @@ diff -Naur alliance-5.0/documentation/tu
  
    GENLIB_SAVE_LOFIG();
  
-diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/digicode/log test-64/tutorials/synthesis/src/digicode/log
---- alliance-5.0/documentation/tutorials/synthesis/src/digicode/log	1970-01-01 01:00:00.000000000 +0100
-+++ test-64/tutorials/synthesis/src/digicode/log	2009-06-14 12:57:45.000000000 +0200
-@@ -0,0 +1,91 @@
-+==32653== Memcheck, a memory error detector.
-+==32653== Copyright (C) 2002-2006, and GNU GPL'd, by Julian Seward et al.
-+==32653== Using LibVEX rev 1658, a library for dynamic binary translation.
-+==32653== Copyright (C) 2004-2006, and GNU GPL'd, by OpenWorks LLP.
-+==32653== Using valgrind-3.2.1, a dynamic binary instrumentation framework.
-+==32653== Copyright (C) 2000-2006, and GNU GPL'd, by Julian Seward et al.
-+==32653== For more details, rerun with: -v
-+==32653== 
-+Mapping Warning: Cell 'halfadder_x4' isn't supported
-+Mapping Warning: Cell 'halfadder_x2' isn't supported
-+Mapping Warning: Cell 'fulladder_x4' isn't supported
-+Mapping Warning: Cell 'fulladder_x2' isn't supported
-+
-+                  @@@@@@@                             @@@@ @  
-+                    @@   @@                         @@    @@  
-+                    @@    @@                       @@      @  
-+                    @@    @@     @@@       @@@    @@          
-+                    @@   @@    @@   @@   @@   @@  @@          
-+                    @@@@@@    @@     @@ @@     @@ @@     @@@@@
-+                    @@    @@  @@     @@ @@     @@ @@     @ @@ 
-+                    @@     @@ @@     @@ @@     @@ @@    @  @@ 
-+                    @@     @@ @@     @@ @@     @@  @@      @@ 
-+                    @@    @@   @@   @@   @@   @@    @@    @@  
-+                  @@@@@@@@       @@@       @@@        @@@@    
-+
-+                         Binding and Optimizing On Gates
-+
-+                 Alliance CAD System 5.0, boog 5.0 [2003/01/09]
-+                 Copyright (c) 2000-2009,        ASIM/LIP6/UPMC
-+                 Author(s):                     Fran?ois Donnet
-+                 E-mail        :    alliance-users at asim.lip6.fr
-+
-+        MBK_VDD        : vdd
-+        MBK_VSS        : vss
-+        MBK_IN_LO      : vst
-+        MBK_OUT_LO     : vst
-+        MBK_WORK_LIB   : .
-+        MBK_TARGET_LIB : /users/cao/ludo/chaos/alliance/distrib-64/cells/sxlib
-+
-+Reading default parameter...
-+50% area - 50% delay optimization
-+Reading file 'digicoder_b.vbe'...
-+Controlling file 'digicoder_b.vbe'...
-+Reading lib '/users/cao/ludo/chaos/alliance/distrib-64/cells/sxlib'...
-+Controlling lib '/users/cao/ludo/chaos/alliance/distrib-64/cells/sxlib'...
-+Preparing file 'digicoder_b.vbe'...
-+Capacitances on file 'digicoder_b.vbe'...
-+Unflattening file 'digicoder_b.vbe'...
-+Mapping file 'digicoder_b.vbe'...
-+Saving file 'digicoder_b.vst'...
-+Quick estimated critical path (no warranty)...1866 ps from 'i 3' to 'digicode_ep 2'
-+Quick estimated area (with over-cell routing)...93500 lambda?
-+Details...
-+	inv_x2: 12
-+	a2_x2: 7
-+	na2_x1: 7
-+	o2_x2: 6
-+	na3_x1: 5
-+	no2_x1: 5
-+	on12_x1: 4
-+	sff1_x4: 3
-+	an12_x1: 3
-+	nao22_x1: 3
-+	no4_x1: 3
-+	noa22_x1: 2
-+	no3_x1: 2
-+	a3_x2: 2
-+	o3_x2: 2
-+	zero_x0: 1
-+	buf_x2: 1
-+	oa22_x2: 1
-+	xr2_x1: 1
-+	a4_x2: 1
-+	Total: 71
-+Saving critical path in xsch color file 'digicoder_b.xsc'...
-+End of boog...
-+
-+==32653== 
-+==32653== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 5 from 1)
-+==32653== malloc/free: in use at exit: 9,263,779 bytes in 17,753 blocks.
-+==32653== malloc/free: 18,632 allocs, 879 frees, 9,622,816 bytes allocated.
-+==32653== For counts of detected errors, rerun with: -v
-+==32653== searching for pointers to 17,753 not-freed blocks.
-+==32653== checked 4,796,752 bytes.
-+==32653== 
-+==32653== LEAK SUMMARY:
-+==32653==    definitely lost: 230,722 bytes in 5,658 blocks.
-+==32653==      possibly lost: 329,120 bytes in 18 blocks.
-+==32653==    still reachable: 8,703,937 bytes in 12,077 blocks.
-+==32653==         suppressed: 0 bytes in 0 blocks.
-+==32653== Use --leak-check=full to see details of leaked memory.
 diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex
 --- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex	2004-10-16 14:52:17.000000000 +0200
 +++ test-64/tutorials/synthesis/tex/synthesis.tex	2009-07-04 12:26:03.345711622 +0200
-@@ -1,25 +1,16 @@
--%%%%%%%%%%%%%%%%
--% $Id$
--% $Log$
--% Revision 1.1  2009/07/04 11:46:52  chitlesh
--% fixed documentation and broken examples
--%
--% Revision 1.4  2004/10/16 12:52:17  fred
--% Erasing the psfig include from the file, changed the font to 10 pt
--% instead of 12 (sparing trees and not being payed by the thickness of
--% my production) and changing font to charter since I got tired of
--% Palatino, sorry Herman!
--%
--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--\documentclass{article}
-+\documentclass[10pt]{article}
- \usepackage[dvips]{graphics}
- \usepackage[english]{babel}
--\usepackage{doublespace}
-+\usepackage{setspace}
-+\usepackage{epsf}
- \usepackage{fancybox}
--\usepackage{fancyheadings}
-+\usepackage{fancyhdr}
- \usepackage{float}
- \usepackage{graphicx}
--\usepackage{here}
--\usepackage{isolatin1}
--\usepackage{charter}
-+\usepackage[latin1]{inputenc}
-+\usepackage{palatino}
- \usepackage{picinpar}
-+%\usepackage{psfig}
- \usepackage{rotate}
- \usepackage{subfigure}
- \usepackage{sverb}
-@@ -36,7 +27,7 @@
- \setlength{\columnsep}{0.125in}
- \setlength{\columnseprule}{0.5pt}
- \setlength{\footskip}{1cm}
--\setstretch{1}
-+%\setstretch{1}
- 
- 
- %--------------------------------- styles
-@@ -69,7 +60,7 @@
- \rfoot{\thepage}
- \lfoot{ALLIANCE TUTORIAL}
- \cfoot{}
--\setlength{\footrulewidth}{0.6pt}
-+%\setlength{\footrulewidth}{0.6pt}
- 
- %---------------------------------- document ---------------------------------
- \begin{document}
 @@ -220,7 +211,7 @@
          }
  
@@ -191,108 +42,4 @@ diff -Naur alliance-5.0/documentation/tu
  This directory contents four subdirectories and one Makefile :
  \begin{itemize}\itemsep=-.8ex
  
-@@ -802,9 +793,8 @@
- 
- We break up Amd2901 into 2 blocks: %la partie cont\^ole qui regroupe la ``glu'' logique et la partie op\'erative (chemin de donn\'ees).%
- \begin{figure}[H]\center
--\leavevmode
--\includegraphics[width=10cm]{bloc}
--\caption{Amd2901 Organization  \label{bloc}}
-+\leavevmode \epsfxsize=10cm \epsffile{bloc.eps} \caption{Amd2901
-+Organization  \label{bloc}}
- \end{figure}
- 
- 
-@@ -819,7 +809,8 @@
- We will use the following hierarchical description:
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=10cm]{hier}
-+\epsfxsize=10cm
-+\epsffile{hier.eps}
- \caption{Hierarchy \label{hier}}
- \end{figure}
- 
-@@ -862,7 +853,8 @@
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=10cm]{exemple1}
-+\epsfxsize=10cm
-+\epsffile{exemple1.eps}
- \end{figure}
- 
- The equivalent { \bf genlib } file is as follows:
-@@ -998,12 +990,13 @@
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=10cm]{exemple2}
-+\epsfxsize=10cm
-+\epsffile{exemple2.eps}
- \end{figure}
- 
- Here the corresponding data-path structure :
--\begin{figure}[H]\center \leavevmode
--\includegraphics[width=10cm]{datap}
-+\begin{figure}[H]\center \leavevmode \epsfxsize=10cm
-+\epsffile{datap.eps}
- \end{figure}
- 
- Each gate occupies a column, a column making it possible to treat
-@@ -1232,39 +1225,47 @@
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{ctl-mrs-1}
-+\epsfxsize=12cm
-+\epsffile{ctl-mrs-1.eps}
- \end{figure}
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{ctl-alu-1}
-+\epsfxsize=12cm
-+\epsffile{ctl-alu-1.eps}
- \end{figure}
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{ctl-wen-1}
-+\epsfxsize=12cm
-+\epsffile{ctl-wen-1.eps}
- \end{figure}
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=10cm]{dpt-all-1}
-+\epsfxsize=10cm
-+\epsffile{dpt-all-1.eps}
- \end{figure}
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{dpt-alu-1}
-+\epsfxsize=12cm
-+\epsffile{dpt-alu-1.eps}
- \end{figure}
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{ctldecode}
-+\epsfxsize=12cm
-+\epsffile{ctldecode.eps}
- \end{figure}
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{ctldecodebw}
-+\epsfxsize=12cm
-+\epsffile{ctldecodebw.eps}
- \end{figure}
- 
- \begin{figure}[H]\center
- \leavevmode
--\includegraphics[width=12cm]{dptbanc}
-+\epsfxsize=12cm
-+\epsffile{dptbanc.eps}
- \end{figure}
- 
- \end{document}
+

alliance-xgra.patch:
 Makefile.am |  144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 alliance-xgra.patchIndex: alliance-xgra.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-xgra.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- alliance-xgra.patch	9 Jul 2009 15:13:04 -0000	1.1
+++ alliance-xgra.patch	28 Aug 2009 10:44:15 -0000	1.2
@@ -1,26885 +1,147 @@
-diff -Naur alliance-5.0/xgra/configure.in alliance/xgra/configure.in
---- alliance-5.0/xgra/configure.in	1970-01-01 01:00:00.000000000 +0100
-+++ alliance/xgra/configure.in	2007-11-27 21:41:30.000000000 +0100
-@@ -0,0 +1,185 @@
-+dnl Process this file with autoconf to produce a configure script.
-+AC_INIT(src/xgra.c)
-+
-+XGRA_MAJOR_VERSION=1
-+XGRA_MINOR_VERSION=5
-+XGRA_VERSION=$XGRA_MAJOR_VERSION.$XGRA_MINOR_VERSION
-+
-+AC_SUBST(XGRA_MAJOR_VERSION)
-+AC_SUBST(XGRA_MINOR_VERSION)
-+AC_SUBST(XGRA_VERSION)
-+
-+# For automake.
-+VERSION=$XGRA_VERSION
-+PACKAGE=xgra
-+
-+dnl Initialize automake stuff
-+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AM_PROG_LEX
-+AC_PROG_YACC
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+AC_CHECK_LIB(m, sqrt)
-+
-+AC_CHECK_PROGS(SED, gsed sed)
-+AC_PATH_XTRA
-+
-+dnl
-+dnl Check for X stuff
-+dnl
-+dnl
-+dnl Check X options
-+dnl
-+if test "$with_x" = no; then
-+AC_MSG_ERROR([requires the X window system to compile and run.
-+                  Please do not use the configure option '--without-x'.])
-+fi
-+if test "$with_motif" = no; then
-+AC_MSG_ERROR([requires Motif to compile and run.
-+                  Please do not use the configure option '--without-motif'.])
-+fi
-+dnl
-+dnl
-+dnl Check for X libraries
-+dnl
-+if test "$with_x" != no; then
-+ice_save_LIBS="$LIBS"
-+ice_save_CFLAGS="$CFLAGS"
-+ice_save_CXXFLAGS="$CXXFLAGS"
-+ice_save_CPPFLAGS="$CPPFLAGS"
-+ice_save_LDFLAGS="$LDFLAGS"
-+
-+dnl
-+dnl
-+
-+AC_FIND_MOTIF
-+
-+dnl
-+dnl
-+dnl
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-+LDFLAGS="$LDFLAGS $X_LIBS"
-+dnl
-+dnl Check for X library
-+
-+dnl
-+X11_LIBS=""
-+AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS} ${X_EXTRA_LIBS})
-+if test "$X11_LIBS" = ""; then
-+dnl Not having X is fatal.  Let the user fix this.
-+AC_MSG_ERROR([The X11 library '-lX11' could not be found.
-+                  Please use the configure options '--x-includes=DIR'
-+                  and '--x-libraries=DIR' to specify the X location.])
-+fi
-+AC_SUBST(X_LIBS)
-+AC_SUBST(X11_LIBS)
-+AC_SUBST(X_PRE_LIBS)
-+dnl
-+dnl
-+dnl Check for -lXintl library.  Lutz Kittler <kittler at sse-erfurt.de> says
-+dnl that DLD-Linux with CDE wants `-lXintl' to refine `Xlcmbcurmax'.
-+dnl Guenther Roehrich <guenther at studbox.uni-stuttgart.de> says that
-+dnl we must check for `_Xlcmbcurmax' instead of `Xlcmbcurmax'.
-+dnl
-+AC_CHECK_LIB(Xintl, _Xlcmbcurmax, X11_LIBS="${X11_LIBS} -lXintl",,
-+	${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+dnl
-+dnl
-+dnl Check for -lipc library.  SCO unix is said to want that.
-+dnl
-+AC_CHECK_LIB(ipc, shmap, X11_LIBS="${X11_LIBS} -lipc",,
-+	${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+dnl
-+dnl
-+dnl Check for X toolkit libraries
-+dnl
-+XT_LIBS=""
-+AC_CHECK_LIB(Xt, XtToolkitInitialize, XT_LIBS="-lXt",,
-+	${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+if test "$XT_LIBS" = ""; then
-+dnl Not having Xt is fatal.  Let the user fix this.
-+AC_MSG_ERROR([The X toolkit library '-lXt' could not be found.
-+                  Please use the configure options '--x-includes=DIR'
-+                  and '--x-libraries=DIR' to specify the X location.
-+                  See the files 'config.log' and 'ddd/config.log'
-+                  for further diagnostics.])
-+fi
-+AC_SUBST(XT_LIBS)
-+dnl
-+dnl
-+dnl Check for X extension libraries
-+dnl
-+dnl
-+XEXT_LIBS=""
-+AC_CHECK_LIB(Xext, XShapeQueryVersion, XEXT_LIBS="-lXext",,
-+	${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+AC_SUBST(XEXT_LIBS)
-+
-+dnl Check for Motif widget libraries
-+dnl
-+
-+XM_LIBS=""
-+XP_LIBS=""
-+if test "$motif_includes" != "no" && test "$motif_libraries" != "no"
-+then
-+dnl Motif 2.1 wants `-lXp' (X11R6.3 print server)
-+AC_CHECK_LIB(Xp, XpSelectInput,
-+	XP_LIBS="-lXp"
-+	AC_DEFINE(HAVE_XP),,
-+                   ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+dnl
-+AC_CHECK_LIB(Xm, XmCreateOptionMenu, 
-+	XM_LIBS="-lXm"
-+	AC_DEFINE(HAVE_MOTIF),,
-+	${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+dnl
-+AC_CHECK_LIB(Xm, xmUseVersion, 
-+	AC_DEFINE(HAVE_XMUSEVERSION),,
-+	${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+dnl
-+AC_CHECK_LIB(Xm, XmInstallImage,
-+	AC_DEFINE(HAVE_XMINSTALLIMAGE),,
-+	${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+dnl
-+AC_CHECK_LIB(Xm, Xm21InstallImage,
-+	AC_DEFINE(HAVE_XM21INSTALLIMAGE),,
-+	${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS})
-+fi
-+if test "$XM_LIBS" = ""; then
-+dnl Without Motif, we won't get far.  Let the user fix this.
-+AC_MSG_ERROR([The Motif library '-lXm' could not be found.
-+                  Please use the configure options '--with-motif-includes=DIR'
-+                  and '--with-motif-libraries=DIR' to specify the Xm location.
-+                  See the files 'config.log'
-+                  for further diagnostics.])
-+fi
-+
-+AC_SUBST(XP_LIBS)
-+AC_SUBST(XM_LIBS)
-+
-+LIBS="$LIBS ${XM_LIBS} ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}"
-+    
-+    
-+LIBS="$ice_save_LIBS"
-+CFLAGS="$ice_save_CFLAGS"
-+CXXFLAGS="$ice_save_CXXFLAGS"
-+CPPFLAGS="$ice_save_CPPFLAGS"
-+LDFLAGS="$ice_save_LDFLAGS"
-+fi
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+
-+AM_ALLIANCE
-+
-+AC_OUTPUT([
-+Makefile
-+src/Makefile
-+etc/Makefile
-+])
-diff -Naur alliance-5.0/xgra/etc/Makefile.am alliance/xgra/etc/Makefile.am
---- alliance-5.0/xgra/etc/Makefile.am	1970-01-01 01:00:00.000000000 +0100
[...26639 lines suppressed...]
-+
-diff -Naur alliance-5.0/xgra/src/XTB_pixmap.h alliance/xgra/src/XTB_pixmap.h
---- alliance-5.0/xgra/src/XTB_pixmap.h	1970-01-01 01:00:00.000000000 +0100
-+++ alliance/xgra/src/XTB_pixmap.h	2007-11-27 21:41:46.000000000 +0100
-@@ -0,0 +1,65 @@
-+/*------------------------------------------------------------\
-+|                                                             |
-+| This file is part of the Alliance CAD System Copyright      |
-+| (C) Laboratoire LIP6 - D?partement ASIM Universite P&M Curie|
-+|                                                             |
-+| Home page      : http://www-asim.lip6.fr/alliance/          |
-+| E-mail support : mailto:alliance-support at asim.lip6.fr       |
-+|                                                             |
-+| This progam 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.                                              |
-+|                                                             |
-+| Alliance VLSI  CAD System  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 the GNU C Library; see the file COPYING. |
-+| If not, write to the Free Software Foundation, Inc.,        |
-+| 675 Mass Ave, Cambridge, MA 02139, USA.                     |
-+|                                                             |
-+\------------------------------------------------------------*/
-+
-+/*------------------------------------------------------------\
-+|                                                             |
-+| Tool    :                   XGRA                           |
-+|                                                             |
-+| File    :                  pixmap.h                         |
-+|                                                             |
-+| Authors :              Jacomme Ludovic                      |
-+|                                                             |
-+| Date    :                   04.12.96                        |
-+|                                                             |
-+\------------------------------------------------------------*/
-+
-+/*------------------------------------------------------------\
-+|                                                             |
-+|                         Include Files                       |
-+|                                                             |
-+\------------------------------------------------------------*/
-+/*------------------------------------------------------------\
-+|                                                             |
-+|                           Constants                         |
-+|                                                             |
-+\------------------------------------------------------------*/
-+
-+# ifndef XGRA_XTB_PIXMAP
-+# define XGRA_XTB_PIXMAP
-+
-+/*------------------------------------------------------------\
-+|                                                             |
-+|                            Types                            |
-+|                                                             |
-+\------------------------------------------------------------*/
-+/*------------------------------------------------------------\
-+|                                                             |
-+|                          Variables                          |
-+|                                                             |
-+\------------------------------------------------------------*/
-+
-+# endif
++	xgra.c \
++	xgra.h \
++	XGR_bound.c \
++	XGR_bound.h \
++	XGR_error.c \
++	XGR_error.h \
++	XGR_graph.c \
++	XGR_graph.h \
++	XGR_object.c \
++	XGR_object.h \
++	XGR_place.c \
++	XGR_place.h \
++	XGR_select.c \
++	XGR_select.h \
++	XGR.h \
++	XME_dialog.c \
++	XME_dialog.h \
++	XME_edit.c \
++	XME_edit.h \
++	XME.h \
++	XME_menu.c \
++	XME_menu.h \
++	XME_message.c \
++	XME_message.h \
++	XME_panel.c \
++	XME_panel.h \
++	XME_search.c \
++	XME_search.h \
++	XME_select.c \
++	XME_select.h \
++	XMF_dialog.c \
++	XMF_dialog.h \
++	XMF_file.c \
++	XMF_file.h \
++	XMF.h \
++	XMF_menu.c \
++	XMF_menu.h \
++	XMF_panel.c \
++	XMF_panel.h \
++	XMH.h \
++	XMH_help.c \
++	XMH_help.h \
++	XMH_menu.c \
++	XMH_menu.h \
++	XMH_panel.c \
++	XMH_panel.h \
++	XMS_dialog.c \
++	XMS_dialog.h \
++	XMS.h \
++	XMS_menu.c \
++	XMS_menu.h \
++	XMS_panel.c \
++	XMS_panel.h \
++	XMS_setup.c \
++	XMS_setup.h \
++	XMT_dialog.c \
++	XMT_dialog.h \
++	XMT.h \
++	XMT_menu.c \
++	XMT_menu.h \
++	XMT_message.c \
++	XMT_message.h \
++	XMT_panel.c \
++	XMT_panel.h \
++	XMT_tools.c \
++	XMT_tools.h \
++	XMV_dialog.c \
++	XMV_dialog.h \
++	XMV.h \
++	XMV_map.c \
++	XMV_map.h \
++	XMV_menu.c \
++	XMV_menu.h \
++	XMV_message.c \
++	XMV_message.h \
++	XMV_panel.c \
++	XMV_panel.h \
++	XMV_view.c \
++	XMV_view.h \
++	XMX_color.c \
++	XMX_color.h \
++	XMX_cursor.c \
++	XMX_cursor.h \
++	XMX_dialog.c \
++	XMX_dialog.h \
++	XMX_event.c \
++	XMX_event.h \
++	XMX_graphic.c \
++	XMX_graphic.h \
++	XMX_grid.c \
++	XMX_grid.h \
++	XMX.h \
++	XMX_icon.c \
++	XMX_icon.h \
++	XMX_menu.c \
++	XMX_menu.h \
++	XMX_message.c \
++	XMX_message.h \
++	XMX_motif.c \
++	XMX_motif.h \
++	XMX_panel.c \
++	XMX_panel.h \
++	XMX_view.c \
++	XMX_view.h \
++	XSB_error.c \
++	XSB_error.h \
++	XSB.h \
++	XSB_parse.c \
++	XSB_parse.h \
++	XSB_share.c \
++	XSB_share.h \
++	XTB_cursor.c \
++	XTB_cursor.h \
++	XTB_dialog.c \
++	XTB_dialog.h \
++	XTB.h \
++	XTB_icon.c \
++	XTB_icon.h \
++	XTB_menu.c \
++	XTB_menu.h \
++	XTB_panel.c \
++	XTB_panel.h \
++	XTB_pixmap.c \
++	XTB_pixmap.h
++
++xgra_LDADD = \
++	$(GLIB_CFLAGS) \
++	$(MOTIF_LIBS) \
++	$(top_builddir)/src/aut/libAut.la \
++	$(top_builddir)/src/mbk/libMut.la


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- alliance.spec	24 Jul 2009 16:45:39 -0000	1.24
+++ alliance.spec	28 Aug 2009 10:44:15 -0000	1.25
@@ -1,10 +1,9 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20070718
-%define        _default_patch_fuzz  2
+%define        snapshot  20090827
 
 Name:          alliance
 Version:       5.0
-Release:       29.%{snapshot}snap%{?dist}
+Release:       30.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -14,112 +13,26 @@ Source:        http://www-asim.lip6.fr/p
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
 Patch0:        alliance-env.patch
-Patch2:        alliance-run.patch
-Patch3:        alliance-perms.patch
-Patch4:        alliance-files.patch
-Patch5:        alliance-generic.patch
+Patch1:        alliance-run.patch
+Patch2:        alliance-perms.patch
 
 # Improving autogeneration of documentation
-Patch6:        alliance-tutorials-place_n_route.patch
-Patch7:        alliance-tutorials-simulation.patch
-Patch8:        alliance-tutorials-start.patch
-Patch9:        alliance-tutorials-synthesis.patch
-Patch10:       alliance-tutorials-amd2901.patch
+Patch3:        alliance-tutorials-place_n_route.patch
+Patch4:        alliance-tutorials-simulation.patch
+Patch5:        alliance-tutorials-start.patch
+Patch6:        alliance-tutorials-synthesis.patch
+Patch7:        alliance-tutorials-amd2901.patch
 
 # Improving examples
-Patch11:       alliance-examples.patch
-Patch12:       alliance-examples-adm2901.patch
-Patch13:       alliance-examples-mipsR3000.patch
-
-# 64 bits stability patches + upstream enhancements
-Patch14:       alliance-abe.patch
-Patch15:       alliance-abl.patch
-Patch16:       alliance-alcban.patch
-Patch17:       alliance-asimut.patch
-Patch18:       alliance-attila.patch
-Patch19:       alliance-aut.patch
-Patch20:       alliance-bdd.patch
-Patch21:       alliance-beh.patch
-Patch22:       alliance-bhl.patch
-Patch23:       alliance-boog.patch
-Patch24:       alliance-boom.patch
-Patch25:       alliance-btr.patch
-Patch26:       alliance-bvl.patch
-Patch27:       alliance-cells.patch
-Patch28:       alliance-ctl.patch
-Patch29:       alliance-ctp.patch
-Patch30:       alliance-distrib.patch
-Patch31:       alliance-dreal.patch
-Patch32:       alliance-druc.patch
-Patch33:       alliance-elp.patch
-Patch34:       alliance-exp.patch
-Patch35:       alliance-fks.patch
-Patch36:       alliance-flatbeh.patch
-Patch37:       alliance-flatlo.patch
-Patch38:       alliance-flatph.patch
-Patch39:       alliance-fmi.patch
-Patch40:       alliance-fsm.patch
-Patch41:       alliance-fsp.patch
-Patch42:       alliance-ftl.patch
-Patch43:       alliance-fvh.patch
-Patch44:       alliance-gcp.patch
-Patch45:       alliance-genlib.patch
-Patch46:       alliance-genpat.patch
-Patch47:       alliance-genview.patch
-Patch48:       alliance-graal.patch
-Patch49:       alliance-grog.patch
-Patch50:       alliance-growstk.patch
-Patch51:       alliance-k2f.patch
-Patch52:       alliance-l2p.patch
-Patch53:       alliance-log.patch
-Patch54:       alliance-loon.patch
-Patch55:       alliance-lvx.patch
-Patch56:       alliance-lynx.patch
-Patch57:       alliance-m2e.patch
-Patch58:       alliance-mbkal.patch
-Patch59:       alliance-mbkap.patch
-Patch60:       alliance-mbkedif.patch
-Patch61:       alliance-mbkhilo.patch
-Patch62:       alliance-mbk.patch
-Patch63:       alliance-mbkvti.patch
-Patch64:       alliance-mips_asm.patch
-Patch65:       alliance-mocha.patch
-
-Patch66:       alliance-nero.patch
-Patch67:       alliance-ocp.patch
-Patch68:       alliance-ocr.patch
-Patch69:       alliance-pat2spi.patch
-Patch70:       alliance-pat.patch
-Patch71:       alliance-pcbs.patch
-Patch72:       alliance-phl.patch
-Patch73:       alliance-ppt.patch
-Patch74:       alliance-proof.patch
-Patch75:       alliance-rdscif.patch
-Patch76:       alliance-rdsgds.patch
-Patch77:       alliance-rds.patch
-Patch78:       alliance-ring.patch
-Patch79:       alliance-rtd.patch
-Patch80:       alliance-rtn.patch
-Patch81:       alliance-s2r.patch
-Patch82:       alliance-scapin.patch
-Patch83:       alliance-scl.patch
-Patch84:       alliance-sea.patch
-Patch85:       alliance-syf.patch
-Patch86:       alliance-vasy.patch
-Patch87:       alliance-vbh.patch
-Patch88:       alliance-vbl.patch
-Patch89:       alliance-vex.patch
-Patch90:       alliance-vpd.patch
-Patch91:       alliance-vpn.patch
-Patch92:       alliance-vst2xnf.patch
-Patch93:       alliance-vtl.patch
-Patch94:       alliance-vvh.patch
-Patch95:       alliance-x2y.patch
-Patch96:       alliance-xfsm.patch
-Patch97:       alliance-xgra.patch
-Patch98:       alliance-xpat.patch
-Patch99:       alliance-xsch.patch
-Patch100:      alliance-xvpn.patch
+Patch8:        alliance-examples.patch
+Patch9:        alliance-examples-adm2901.patch
+Patch10:       alliance-examples-mipsR3000.patch
+
+# upstream enhancements
+Patch11:       alliance-xgra.patch
+
+# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
+Patch12:       alliance-xgra-xgrerror-ld.patch
 
 Source1:       xsch.desktop
 Source2:       dreal.desktop
@@ -127,28 +40,37 @@ Source3:       xpat.desktop
 Source4:       xfsm.desktop
 Source5:       xvpn.desktop
 Source6:       graal.desktop
+Source7:       xgra.desktop
 
-Source7:       alliance.fedora
+Source8:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source8:       graal.png
-Source9:       dreal.png
-Source10:      xvpn.png
-Source11:      xfsm.png
-Source12:      xpat.png
-Source13:      xsch.png
-
-Source14:      alliance-tutorials-go-all.sh
-Source15:      alliance-tutorials-go-all-clean.sh
-Source16:      alliance-examples-go-all.sh
-Source17:      alliance-examples-go-all-clean.sh
+Source9:       graal.png
+Source10:      dreal.png
+Source11:      xvpn.png
+Source12:      xfsm.png
+Source13:      xpat.png
+Source14:      xsch.png
+Source15:      xgra.png
+
+Source16:      alliance-tutorials-go-all.sh
+Source17:      alliance-tutorials-go-all-clean.sh
+Source18:      alliance-examples-go-all.sh
+Source19:      alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison
+BuildRequires: libXt-devel byacc desktop-file-utils bison
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:       xorg-x11-fonts-misc
+%if 0%{?rhel}
+BuildRequires: openmotif-devel
+BuildRequires: pkgconfig
+%else
+BuildRequires: lesstif-devel
+%endif
+
+Requires:      xorg-x11-fonts-misc
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -191,7 +113,6 @@ Summary:      Alliance VLSI CAD Sytem - 
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
 Requires:     electronics-menu
-Obsoletes:    %{name} < 5.0-12
 
 
 %description libs
@@ -213,122 +134,33 @@ Documentation and tutorials for the Alli
 
 %prep
 %setup -q
+%{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
 sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
 
-
-%patch0 -p0 -b .env
-# removing useless copyrighted (by Cadence) lines from the examples
+# removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
 
-%patch2 -p0 -b .run
-# fixing permissions
-%patch3 -p0 -b .perms
-
-# 64 stability patches
-%patch14 -p1 -b .abe
-%patch15 -p1 -b .abl
-%patch16 -p1 -b .alcban
-%patch17 -p1 -b .asimut
-%patch18 -p1 -b .attila
-%patch19 -p1 -b .aut
-%patch20 -p1 -b .bdd
-%patch21 -p1 -b .beh
-%patch22 -p1 -b .bhl
-%patch23 -p1 -b .boog
-#%patch24 -p1 -b .boom
-%patch25 -p1 -b .btr
-%patch26 -p1 -b .bvl
-%patch27 -p1 -b .cells
-%patch28 -p1 -b .ctl
-%patch29 -p1 -b .ctp
-#%patch30 -p1 -b .distrib
-%patch31 -p1 -b .dreal
-%patch32 -p1 -b .druc
-%patch33 -p1 -b .elp
-%patch34 -p1 -b .exp
-%patch35 -p1 -b .fks
-%patch36 -p1 -b .flatbeh
-%patch37 -p1 -b .flatlo
-%patch38 -p1 -b .flatph
-%patch39 -p1 -b .fmi
-%patch40 -p1 -b .fsm
-%patch41 -p1 -b .fsp
-%patch42 -p1 -b .ftl
-%patch43 -p1 -b .fvh
-%patch44 -p1 -b .gcp
-%patch45 -p1 -b .genlib
-%patch46 -p1 -b .genpath
-%patch47 -p1 -b .genview
-%patch48 -p1 -b .graal
-%patch49 -p1 -b .grog
-%patch50 -p1 -b .growstk
-%patch51 -p1 -b .k2f
-%patch52 -p1 -b .l2p
-%patch53 -p1 -b .log
-%patch54 -p1 -b .loon
-%patch55 -p1 -b .lvx
-%patch56 -p1 -b .lynx
-%patch57 -p1 -b .m2e
-%patch58 -p1 -b .mbkal
-%patch59 -p1 -b .mbkap
-%patch60 -p1 -b .mbkedif
-%patch61 -p1 -b .mbkhilo
-%patch62 -p1 -b .mbk
-%patch63 -p1 -b .mbkvti
-%patch64 -p1 -b .mips_asm
-%patch65 -p1 -b .mocha
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
-%patch72 -p1
-%patch73 -p1
-%patch74 -p1
-%patch75 -p1
-%patch76 -p1
-%patch77 -p1
-%patch78 -p1
-%patch79 -p1
-%patch80 -p1
-%patch81 -p1
-%patch82 -p1
-%patch83 -p1
-#%patch84 -p1 -b .sea
-%patch85 -p1
-%patch86 -p1
-%patch87 -p1
-%patch88 -p1
-%patch89 -p1
-%patch90 -p1
-%patch91 -p1
-%patch92 -p1
-%patch93 -p1
-%patch94 -p1
-%patch95 -p1
-%patch96 -p1
-%patch97 -p1
-%patch98 -p1
-%patch99 -p1
-%patch100 -p1
+%patch11 -p1 -b .xgra-makefile.am
+%patch12 -p0 -b .xgra-long
 
 
+%patch0 -p0 -b .env
+%patch1 -p0 -b .run
+%patch2 -p0 -b .perms
 
-%patch4 -p1 -b .files
-#%patch5 -p0 -b .generic
 
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
-%patch6  -p1 -b .doc
-%patch7  -p1 -b .doc
-%patch8  -p1 -b .doc
-%patch9  -p1 -b .doc
-%patch10 -p0 -b .doc
+sed -i "s|documentation/tutorials/Makefile||" configure*
+%patch3 -p1 -b .doc
+%patch4 -p1 -b .doc
+%patch5 -p1 -b .doc
+%patch6 -p1 -b .doc
+%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -342,31 +174,45 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE14} go-all.sh
-    %{__install} -pm 755 %{SOURCE15} go-all-clean.sh
-    # FEL self test for alliance
-    ./go-all.sh 2>&1 | tee self-test-tutorials.log
+    %{__install} -pm 755 %{SOURCE16} go-all.sh
+    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    # Fedora Electronic Lab self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-tutorials.log
     # clean temporary files
     ./go-all-clean.sh
 popd
 # ------------------------------------------------------------------------------
 
-%patch11 -p0 -b .examples
-%patch12 -p1 -b .examples
-%patch13 -p1 -b .examples
+%patch8  -p0 -b .examples
+%patch9  -p1 -b .examples
+%patch10 -p1 -b .examples
+
+# fixing flex and bison update on rawhide
+sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
+sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
 
 # make sure the man pages are UTF-8...
-for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
+for nonUTF8 in FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
                loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do
   %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
   %{__mv} -f $nonUTF8.conv $nonUTF8
 done
 
+pushd documentation/alliance-examples/
+# make sure the man pages are UTF-8...
+for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \
+               tuner/README mipsR3000/sce/mips_dpt.c ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
 #wrong-file-end-of-line-encoding
-sed -i 's/\r//' documentation/alliance-examples/mipsR3000/asm/*
+sed -i 's/\r//' mipsR3000/asm/*
+popd
 
-# fixing flex and bison update on rawhide
-sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
+# Fix xgra build 
+sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
+sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
 
 %build
 
@@ -415,35 +261,29 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE16} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE17} alliance-examples/go-all-clean.sh
+%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
 
 pushd alliance-examples/
     # FEL self test for alliance
-    ./go-all.sh 2>&1 | tee self-test-examples.log
+    #./go-all.sh 2>&1 | tee self-test-examples.log
     # clean temporary files
     ./go-all-clean.sh
 popd
 
-# correcting minor documentation details
-sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
-
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
 for desktopfile in *.desktop; do
-desktop-file-install --vendor fedora          \
-  --add-category Engineering                  \
-  --add-category Electronics                  \
-  --remove-category Science                   \
+desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
 done
@@ -455,9 +295,9 @@ done
 
 
 # protecting hardcoded links
-ln -sf ../../..%{_datadir}/%{name}/cells    %{buildroot}%{prefix}/cells
-ln -sf ../../..%{_datadir}/%{name}/etc      %{buildroot}%{prefix}/etc
-ln -sf ../../..%{_datadir}/%{name}/man      %{buildroot}%{prefix}/man
+ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells
+ln -sf ../../..%{_datadir}/%{name}/etc   %{buildroot}%{prefix}/etc
+ln -sf ../../..%{_datadir}/%{name}/man   %{buildroot}%{prefix}/man
 
 
 # manpage-not-gzipped
@@ -474,11 +314,17 @@ EOF
 # removing tools for compiling and installing Alliance tools
 # These are for the packager (i.e me) and not for user
 %{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf
+%{__rm} -f %{buildroot}%{prefix}/etc/attila.conf
 %{__rm} -f %{buildroot}%{prefix}/bin/attila
 %{__rm} -f %{buildroot}%{_datadir}/man/man1/attila*
 %{__rm} -f doc/html/alliance/*attila.html
 %{__rm} -f doc/pdf/attila.pdf
 
+# correcting minor documentation details
+sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+
+%{_fixperms} %{buildroot}/*
+
 
 %post
 /sbin/ldconfig
@@ -510,18 +356,20 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files libs
+%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
-%{_datadir}/applications/fedora-*.desktop
-%{_sysconfdir}/profile.d/alc_env.*
+%{_datadir}/applications/*.desktop
+%config(noreplace) %{_sysconfdir}/profile.d/alc_env.*
 
 
 %files doc
+%defattr(-,root,root,-)
 %doc doc/html/
 %doc doc/design-flow
 %doc doc/pdf/*.pdf
 %doc doc/overview/*.ps
 %doc doc/overview/*.pdf
-%doc doc/tutorials/
+%doc documentation/tutorials/
 #Makefiles are present in alliance-examples/*. It is normal because
 # * it gives the VLSI designer a template on how to create his own
 #   Makefile for alliance (VLSI designers normally don't know how to do so)
@@ -532,8 +380,13 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-29.20070718snap
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
+- updated to upstream's 20090828 snapshot
+- merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements
+- fixed EPEL-5 build
+
+* Sat Aug 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-29.20070718snap
+- improved rawhide build with respect to the broken patches
 
 * Thu Jul 9 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-28.20070718snap
 - improved stability on 64 bit architecture


Index: dreal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/dreal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dreal.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ dreal.desktop	28 Aug 2009 10:44:15 -0000	1.4
@@ -6,5 +6,5 @@ Icon=dreal.png
 Type=Application
 Terminal=false
 GenericName=dreal
-Categories=Science;
-Comment=View the Real layout
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Real layout


Index: graal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/graal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- graal.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ graal.desktop	28 Aug 2009 10:44:15 -0000	1.4
@@ -6,5 +6,5 @@ Icon=graal.png
 Type=Application
 Terminal=false
 GenericName=graal
-Categories=Science;
-Comment=Edits physical layouts
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=Edits physical layouts


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	9 Jul 2009 15:13:04 -0000	1.5
+++ import.log	28 Aug 2009 10:44:15 -0000	1.6
@@ -3,3 +3,4 @@ alliance-5_0-24_20070718snap_fc10:HEAD:a
 alliance-5_0-26_20070718snap_fc10:HEAD:alliance-5.0-26.20070718snap.fc10.src.rpm:1235508896
 alliance-5_0-27_20070718snap_fc11:HEAD:alliance-5.0-27.20070718snap.fc11.src.rpm:1246707806
 alliance-5_0-28_20070718snap_fc11:HEAD:alliance-5.0-28.20070718snap.fc11.src.rpm:1247151445
+alliance-5_0-30_20090827snap_fc11:HEAD:alliance-5.0-30.20090827snap.fc11.src.rpm:1251456077


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Jul 2009 11:46:52 -0000	1.4
+++ sources	28 Aug 2009 10:44:16 -0000	1.5
@@ -1 +1 @@
-917f4493c09f6f5c49d5a606a5e9bbd8  alliance-5.0-20070718.tar.gz
+8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz


Index: xfsm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/xfsm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xfsm.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xfsm.desktop	28 Aug 2009 10:44:16 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xfsm.png
 Type=Application
 Terminal=false
 GenericName=xfsm
-Categories=Science;
-Comment=View Finite State Machines
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View Finite State Machines


Index: xpat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/xpat.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xpat.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xpat.desktop	28 Aug 2009 10:44:16 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xpat.png
 Type=Application
 Terminal=false
 GenericName=xpat
-Categories=Science;
-Comment=View the Patterns
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Patterns


Index: xsch.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/xsch.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xsch.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xsch.desktop	28 Aug 2009 10:44:16 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xsch.png
 Type=Application
 Terminal=false
 GenericName=Xsch
-Categories=Science;
-Comment=View the Schematic
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Schematic


Index: xvpn.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/xvpn.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xvpn.desktop	23 Aug 2007 12:16:54 -0000	1.3
+++ xvpn.desktop	28 Aug 2009 10:44:16 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xvpn.png
 Type=Application
 Terminal=false
 GenericName=xpvn
-Categories=Science;
-Comment=View the Petri Nets
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Petri Nets


--- alliance-abe.patch DELETED ---


--- alliance-abl.patch DELETED ---


--- alliance-alcban.patch DELETED ---


--- alliance-asimut.patch DELETED ---


--- alliance-attila.patch DELETED ---


--- alliance-aut.patch DELETED ---


--- alliance-bdd.patch DELETED ---


--- alliance-beh.patch DELETED ---


--- alliance-bhl.patch DELETED ---


--- alliance-boog.patch DELETED ---


--- alliance-boom.patch DELETED ---


--- alliance-btr.patch DELETED ---


--- alliance-bvl.patch DELETED ---


--- alliance-cells.patch DELETED ---


--- alliance-ctl.patch DELETED ---


--- alliance-ctp.patch DELETED ---


--- alliance-distrib.patch DELETED ---


--- alliance-dreal.patch DELETED ---


--- alliance-druc.patch DELETED ---


--- alliance-elp.patch DELETED ---


--- alliance-exp.patch DELETED ---


--- alliance-files.patch DELETED ---


--- alliance-fks.patch DELETED ---


--- alliance-flatbeh.patch DELETED ---


--- alliance-flatlo.patch DELETED ---


--- alliance-flatph.patch DELETED ---


--- alliance-fmi.patch DELETED ---


--- alliance-fsm.patch DELETED ---


--- alliance-fsp.patch DELETED ---


--- alliance-ftl.patch DELETED ---


--- alliance-fvh.patch DELETED ---


--- alliance-gcp.patch DELETED ---


--- alliance-generic.patch DELETED ---


--- alliance-genlib.patch DELETED ---


--- alliance-genpat.patch DELETED ---


--- alliance-genview.patch DELETED ---


--- alliance-graal.patch DELETED ---


--- alliance-grog.patch DELETED ---


--- alliance-growstk.patch DELETED ---


--- alliance-k2f.patch DELETED ---


--- alliance-l2p.patch DELETED ---


--- alliance-log.patch DELETED ---


--- alliance-loon.patch DELETED ---


--- alliance-lvx.patch DELETED ---


--- alliance-lynx.patch DELETED ---


--- alliance-m2e.patch DELETED ---


--- alliance-mbk.patch DELETED ---


--- alliance-mbkal.patch DELETED ---


--- alliance-mbkap.patch DELETED ---


--- alliance-mbkedif.patch DELETED ---


--- alliance-mbkhilo.patch DELETED ---


--- alliance-mbkvti.patch DELETED ---


--- alliance-mips_asm.patch DELETED ---


--- alliance-mocha.patch DELETED ---


--- alliance-nero.patch DELETED ---


--- alliance-ocp.patch DELETED ---


--- alliance-ocr.patch DELETED ---


--- alliance-pat.patch DELETED ---


--- alliance-pat2spi.patch DELETED ---


--- alliance-pcbs.patch DELETED ---


--- alliance-phl.patch DELETED ---


--- alliance-ppt.patch DELETED ---


--- alliance-proof.patch DELETED ---


--- alliance-rds.patch DELETED ---


--- alliance-rdscif.patch DELETED ---


--- alliance-rdsgds.patch DELETED ---


--- alliance-ring.patch DELETED ---


--- alliance-rtd.patch DELETED ---


--- alliance-rtn.patch DELETED ---


--- alliance-s2r.patch DELETED ---


--- alliance-scapin.patch DELETED ---


--- alliance-scl.patch DELETED ---


--- alliance-sea.patch DELETED ---


--- alliance-syf.patch DELETED ---


--- alliance-vasy.patch DELETED ---


--- alliance-vbh.patch DELETED ---


--- alliance-vbl.patch DELETED ---


--- alliance-vex.patch DELETED ---


--- alliance-vpd.patch DELETED ---


--- alliance-vpn.patch DELETED ---


--- alliance-vst2xnf.patch DELETED ---


--- alliance-vtl.patch DELETED ---


--- alliance-vvh.patch DELETED ---


--- alliance-x2y.patch DELETED ---


--- alliance-xfsm.patch DELETED ---


--- alliance-xpat.patch DELETED ---


--- alliance-xsch.patch DELETED ---


--- alliance-xvpn.patch DELETED ---



From tagoh at fedoraproject.org  Fri Aug 28 10:45:14 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 28 Aug 2009 10:45:14 +0000 (UTC)
Subject: rpms/anthy/F-11 anthy-fix-typo-in-dict.patch, 1.1, 1.2 anthy.spec, 
	1.58, 1.59
Message-ID: <20090828104514.E41D611C0044@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21800

Modified Files:
	anthy-fix-typo-in-dict.patch anthy.spec 
Log Message:
* Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
- Fix more typos in dictionary. (#519769)

anthy-fix-typo-in-dict.patch:
 compound.t |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Index: anthy-fix-typo-in-dict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-11/anthy-fix-typo-in-dict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- anthy-fix-typo-in-dict.patch	8 Jul 2009 12:46:05 -0000	1.1
+++ anthy-fix-typo-in-dict.patch	28 Aug 2009 10:45:14 -0000	1.2
@@ -1,6 +1,22 @@
 diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
 --- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2009-07-08 20:52:21.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-08-28 17:19:20.000000000 +0900
+@@ -8,7 +8,6 @@
+ ???????????????? #T35 #_4????_4????
+ ?????????????????? #T35 #_5????_4????
+ ?????????????? #T35 #_5????_2??
+-???????????? #T35 #_3????_3????
+ ?????????????????? #CN ??????????????????
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_3????_3????
+@@ -20,6 +19,7 @@
+ ???????????????? #T35 #_3????_5????
+ ?????????????? #T35 #_3????_4????
+ ???????????????? #T35 #_3????_5????
++???????????? #T35 #_3????_3????
+ ?????????????? #T35 #_3????_4????
+ ?????????????? #T35 #_3????_4????
+ ?????????????????? #T35 #_3????_6??????
 @@ -9714,7 +9714,6 @@
  ?????????????? #T35 #_4????_3????
  ?????????????? #T35 #_4????_3??
@@ -9,6 +25,24 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_4????_3????
  ???????????????? #T35 #_4????_4????
+@@ -19234,7 +19233,7 @@
+ ???????????? #T35 #_4????_2??
+ ???????????????? #T35 #_2??_2??_4????
+ ???????????? #T35 #_4????_2??
+-?????????????????? #T35 #_4????_5????
++?????????????????? #T35 #_4????_5????
+ ???????????? #T35 #_2??_4????
+ ???????????? #T35 #_4????_2??
+ ?????????????? #T35 #_2??_3????_2??
+@@ -20163,7 +20162,7 @@
+ ???????????????? #T35 #_4????_4????
+ ???????????????????? #T35 #_4????_2??_4????
+ ???????????? #T35 #_4????_2??
+-???????????????? #T35 #_4????_4????
++???????????????? #T35 #_4????_4????
+ ???????????? #T35 #_4????_2??
+ ?????????? #T35 #_4????_1??
+ ???????????????? #T35 #_4????_4????
 @@ -30752,7 +30751,6 @@
  ?????????????????????????? #T35 #_6????_4????_3????
  ???????????????? #T35 #_7??????_1??
@@ -17,6 +51,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????? #T35 #_5????_3??
  ???????????????????????? #T35 #_5????_3??_4????
  ?????????????? #T35 #_5????_2??
+@@ -30839,7 +30837,7 @@
+ ???????????? #T35 #_3??_3????
+ ???????????? #T35 #_4????_2??
+ ???????????????? #T35 #_4????_4????
+-???????????????? #T35 #_4????_4????
++???????????????? #T35 #_4????_4????
+ ?????????????? #T35 #_4????_3??
+ ???????????????? #T35 #_5????_3????
+ ???????????????? #T35 #_5????_3????
 @@ -40405,6 +40403,7 @@
  ?????????????? #T35 #_5????_2??
  ???????????? #T35 #_3????_3??
@@ -34,6 +77,20 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????????? #T35 #_4????_6??????
  ???????????? #T35 #_4????_2??
  ?????????????????? #T35 #_6??????_3??
+@@ -57562,11 +57561,11 @@
+ ?????????? #T35 #_3????_2????
+ ?????????? #T35 #_3????_2??
+ ???????????? #T35 #_3????_3????
+-???????????????? #T35 #_3????_5????
++???????????????? #T35 #_3????_5????
+ ???????????????? #T35 #_3????_5????
+ ?????????? #T35 #_3????_2??
+ ?????????????? #T35 #_3????_4????
+-???????????? #T35 #_3????_3????
++???????????? #T35 #_3????_3????
+ ???????????? #T35 #_3????_3????
+ ???????????? #T35 #_3????_3????
+ ?????????????? #T35 #_3????_4????
 @@ -62585,6 +62584,7 @@
  ?????????? #T35 #_3??_2??
  ?????????? #T35 #_3????_2??


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-11/anthy.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- anthy.spec	20 Aug 2009 07:12:09 -0000	1.58
+++ anthy.spec	28 Aug 2009 10:45:14 -0000	1.59
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	7%{?dist}
+Release:	8%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
+- Fix more typos in dictionary. (#519769)
+
 * Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
 - Stop updating corpus at the build time to avoid creating different dictionary
   among arch. (#816563)



From chitlesh at fedoraproject.org  Fri Aug 28 10:47:50 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 10:47:50 +0000 (UTC)
Subject: rpms/alliance/EL-5 alliance-examples-adm2901.patch, NONE,
	1.1 alliance-examples-go-all-clean.sh, NONE,
	1.1 alliance-examples-go-all.sh, NONE,
	1.1 alliance-examples-mipsR3000.patch, NONE,
	1.1 alliance-tutorials-amd2901.patch, NONE,
	1.1 alliance-tutorials-go-all-clean.sh, NONE,
	1.1 alliance-tutorials-go-all.sh, NONE,
	1.1 alliance-tutorials-place_n_route.patch, NONE,
	1.1 alliance-tutorials-simulation.patch, NONE,
	1.1 alliance-tutorials-start.patch, NONE,
	1.1 alliance-tutorials-synthesis.patch, NONE,
	1.1 alliance-xgra-xgrerror-ld.patch, NONE,
	1.1 alliance-xgra.patch, NONE, 1.1 xgra.desktop, NONE,
	1.1 xgra.png, NONE, 1.1 .cvsignore, 1.3, 1.4 alliance-env.patch,
	1.2, 1.3 alliance.spec, 1.4, 1.5 dreal.desktop, 1.3,
	1.4 graal.desktop, 1.3, 1.4 import.log, 1.1, 1.2 sources, 1.3,
	1.4 xfsm.desktop, 1.3, 1.4 xpat.desktop, 1.3, 1.4 xsch.desktop,
	1.3, 1.4 xvpn.desktop, 1.3, 1.4 alliance-gcc43.patch, 1.1, NONE
Message-ID: <20090828104750.B84F911C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22589/EL-5

Modified Files:
	.cvsignore alliance-env.patch alliance.spec dreal.desktop 
	graal.desktop import.log sources xfsm.desktop xpat.desktop 
	xsch.desktop xvpn.desktop 
Added Files:
	alliance-examples-adm2901.patch 
	alliance-examples-go-all-clean.sh alliance-examples-go-all.sh 
	alliance-examples-mipsR3000.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-go-all-clean.sh 
	alliance-tutorials-go-all.sh 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	xgra.desktop xgra.png 
Removed Files:
	alliance-gcc43.patch 
Log Message:
snapshot 20090827

alliance-examples-adm2901.patch:
 amd2901_chip.c |   16 ++++++++--------
 amd2901_core.c |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE alliance-examples-adm2901.patch ---
diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c test-64/alliance-examples/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c	2004-05-23 20:55:16.000000000 +0200
+++ test-64/alliance-examples/amd2901/amd2901_chip.c	2009-06-14 02:35:45.000000000 +0200
@@ -1,5 +1,5 @@
 #include <genlib.h>
-#define POWER "vdde","vdd","vsse","vss",0
+#define POWER "vdde","vdd","vsse","vss",NULL
 
 int main ()
  {
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 
diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c test-64/alliance-examples/amd2901/amd2901_core.c
--- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c	2004-05-23 20:55:16.000000000 +0200
+++ test-64/alliance-examples/amd2901/amd2901_core.c	2009-06-14 02:36:07.000000000 +0200
@@ -109,7 +109,7 @@
        "out_x[3:0] =>     y[3:0]",
 
        "vdd => vdd",
-       "vss => vss", 0);
+       "vss => vss", NULL);
 
 
   /* ***************** Control Instanciation ****************** */
@@ -161,7 +161,7 @@
        "oe => oe",
 
        "vdd => vdd",
-       "vss => vss", 0);
+       "vss => vss", NULL);
 
   GENLIB_PLACE ("amd2901_dpt", "amd2901_dpt", NOSYM, 0, 0);
   GENLIB_DEF_AB (0, 0, 0, 100);


--- NEW FILE alliance-examples-go-all-clean.sh ---
#!/bin/sh

for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \
    multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \
    mipsR3000 hadamard
do
  if [ -d $B ]
  then echo "----- BENCH $B ----- "
       (cd $B && make clean)
  fi
done


--- NEW FILE alliance-examples-go-all.sh ---
#!/bin/sh

for B in addaccu16 adder4 amd2901 amd2901-vasy digi divcas4 \
    multi16b-reg multi4b multi8 multi8b pgcd sqrt32 sqrt8 \
    mipsR3000 hadamard
do
  if [ -d $B ]
  then echo "----- BENCH $B ----- "
       (cd $B && make clean && make)
  fi
done

alliance-examples-mipsR3000.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alliance-examples-mipsR3000.patch ---
diff -Naur alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile test-64/alliance-examples/mipsR3000/sce/Makefile
--- alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile	2004-07-30 02:40:09.000000000 +0200
+++ test-64/alliance-examples/mipsR3000/sce/Makefile	2009-06-14 03:12:56.000000000 +0200
@@ -119,7 +119,7 @@
       LVX = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/lvx
     PROOF = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/proof
      RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring
-    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib
+    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib --keep-exec --verbose
     OCP   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp -v -gnuplot
     OCR   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr
     NERO  = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero -V

alliance-tutorials-amd2901.patch:
 Makefile |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE alliance-tutorials-amd2901.patch ---
diff -Naur documentation/tutorials/synthesis/src/amd2901/Makefile tutorials/synthesis/src/amd2901/Makefile
--- documentation/tutorials/synthesis/src/amd2901/Makefile	2002-07-25 14:50:18.000000000 +0200
+++ tutorials/synthesis/src/amd2901/Makefile	2007-07-18 19:34:53.000000000 +0200
@@ -2,17 +2,17 @@
 all: EXAMPLE VAR  CATAL02 res.pat
 
 
-VAR: 
+VAR:
 	MBK_IN_LO=vst;export MBK_IN_LO ;\
-	MBK_CATA_LIB=/asim/alliance/cells/sxlib;export MBK_CATA_LIB
+	MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib;export MBK_CATA_LIB
 
 CATAL01:
-	echo amd2901_ctl C >CATAL  
+	echo amd2901_ctl C >CATAL
 	echo amd2901_dpt C >>CATAL
 
 CATAL02:
 	echo amd2901_dpt C >CATAL
-	
+
 EXAMPLE:
 	genlib circuit
 
@@ -38,7 +38,7 @@
 
 res2.pat: amd2901_chip.vst pattern.pat amd2901_core.vst CATAL
 	asimut amd2901_chip pattern res2
-	touch amd2901_chip.vst 
+	touch amd2901_chip.vst
 
 clean :
 	rm -f Makefile-*                 \



--- NEW FILE alliance-tutorials-go-all-clean.sh ---
#!/bin/sh

for B in place_and_route simulation synthesis
do
  if [ -d $B/src ]
  then echo "--- BENCH $B ----"
       (cd $B/src && make clean)
  fi
done


--- NEW FILE alliance-tutorials-go-all.sh ---
#!/bin/sh

for B in place_and_route simulation synthesis
do
  if [ -d $B/src ]
  then echo "--- BENCH $B ----"
       (cd $B/src && make clean && make)
  fi
done

alliance-tutorials-place_n_route.patch:
 amd2901_chip.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE alliance-tutorials-place_n_route.patch ---
diff -Naur alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2002-07-25 14:50:19.000000000 +0200
+++ test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2009-06-14 02:27:03.000000000 +0200
@@ -1,5 +1,5 @@
 #include <genlib.h>
-#define POWER "vdde","vdd","vsse","vss",0
+#define POWER "vdde","vdd","vsse","vss",NULL
 
 int main ()
  {
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 

alliance-tutorials-simulation.patch:
 simulation.tex |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alliance-tutorials-simulation.patch ---
diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex
--- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex	2004-10-16 14:52:05.000000000 +0200
+++ test-64/tutorials/simulation/tex/simulation.tex	2009-07-04 12:18:54.867711418 +0200
@@ -171,7 +162,7 @@
         }
 
 All the files used in this part are located in the \\ 
-\texttt{/tutorial/simulation/src} directory.\\
+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\
 This directory contains two subdirectories and one Makefile : 
 \begin{itemize}
 \item The Makefile allows you to validate automatically the entire simulation part
@@ -626,13 +617,13 @@
 \bf SXLIB }. For the functionality of the various cells and their
 interface, the sxlib man is available. The behavioral
 description of each cell is present in \\
-{\bf /alliance/cells/sxlib }.
+{\bf \$ALLIANCE\_TOP/cells/sxlib }.
 
 You must set the environment variable { \bf MBK\_CATA\_LIB }
 to be able to reach these cells.
 
 \begin{commandline}
- > MBK_CATA_LIB=/alliance/cells/sxlib
+ > MBK_CATA_LIB=\$ALLIANCE\_TOP/cells/sxlib
  > export MBK_CATA_LIB
 \end{commandline}
 

alliance-tutorials-start.patch:
 start.tex |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE alliance-tutorials-start.patch ---
diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex
--- alliance-5.0/documentation/tutorials/start/start.tex	2004-10-16 14:52:13.000000000 +0200
+++ test-64/tutorials/start/start.tex	2009-07-04 12:17:35.389714653 +0200
@@ -116,13 +116,13 @@
 try to run the following command :
 
 \begin{phraseverbatim}
-~alp/addaccu %-) source /alliance/etc/alc_env.csh
+~alp/addaccu %-) source /etc/profile.d/alc_env.csh
 \end{phraseverbatim}
 
 Otherwise, if you run a \texttt{sh-like} shell, try to run the following 
 command :
 \begin{phraseverbatim}
-~alp/addaccu %-) source /alliance/alc_env.sh
+~alp/addaccu %-) source /etc/profile.d/alc_env.sh
 \end{phraseverbatim}
 \\
 Before we proceed to the tutorial, you must make sure that the
@@ -151,13 +151,13 @@
 MBK_CATAL_NAME=CATAL
 MBK_SCALE_X=100
 MBK_VSS=vss
-MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib
+MBK_CATA_LIB=.:\$ALLIANCE\_TOP/cells/sxlib:\$ALLIANCE\_TOP/cells/padlib
 MBK_WORK_LIB=.
 MBK_VDD=vdd
 MBK_C4_LIB=./cellsC4
 MBK_IN_LO=vst
 MBK_IN_PH=ap
-MBK_TARGET_LIB=/alliance/cells/sxlib
+MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib
 MBK_OUT_LO=vst
 \end{framedverbatim}
 \caption{\label{mbk} \texttt{MBK} environment variables.}

alliance-tutorials-synthesis.patch:
 src/amd2901/amd2901_chip.c |   14 +++++++-------
 tex/synthesis.tex          |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE alliance-tutorials-synthesis.patch ---
diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c
--- alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c	2002-07-25 14:50:18.000000000 +0200
+++ test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c	2009-06-14 00:31:18.000000000 +0200
@@ -78,7 +78,7 @@
 
 	"vdd => vdd",
 	"vss => vss",
-	0);
+	NULL);
 
   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
 
@@ -119,13 +119,13 @@
   GENLIB_LOINS ("piot_sp","p_r3",
 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
 
-  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
-  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
-  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
 
   GENLIB_SAVE_LOFIG();
 
diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex
--- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex	2004-10-16 14:52:17.000000000 +0200
+++ test-64/tutorials/synthesis/tex/synthesis.tex	2009-07-04 12:26:03.345711622 +0200
@@ -220,7 +211,7 @@
         }
 
 All the files used in this part are located under \\
-\texttt{/tutorial/synthesis/src} directory.\\
+\texttt{/usr/share/doc/alliance-doc-5.0/tutorials/synthesis/src} directory.\\
 This directory contents four subdirectories and one Makefile :
 \begin{itemize}\itemsep=-.8ex
 


alliance-xgra-xgrerror-ld.patch:
 XGR_error.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE alliance-xgra-xgrerror-ld.patch ---
--- xgra/src/XGR_error.c	2007-11-27 21:41:32.000000000 +0100
+++ XGR_error.c	2009-08-28 07:53:58.546631214 +0200
@@ -270,7 +270,7 @@
 
   if ( XgraFigureGra != (autgraph *)NULL )
   {
-    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %d\n  ARCS : %d\n\n",
+    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %ld\n  ARCS : %ld\n\n",
         XgraFigure->NAME,
         XgraFigureGra->NUMBER_NODE,
         XgraFigureGra->NUMBER_ARC );
@@ -282,7 +282,7 @@
 
   Scan = Scan + strlen( Scan );
 
-  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %d\n  YMIN : %d\n  XMAX : %d\n  YMAX : %d\n\n",
+  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %ld\n  YMIN : %ld\n  XMAX : %ld\n  YMAX : %ld\n\n",
            XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT,
            XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT );
 

alliance-xgra.patch:
 Makefile.am |  144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

--- NEW FILE alliance-xgra.patch ---
--- /home/chitlesh/rpmbuild/BUILD/alliance-5.0/xgra/Makefile.am	2009-08-28 07:20:46.993629321 +0200
+++ src/xgra/Makefile.am	2009-08-28 07:26:58.090631633 +0200
@@ -1 +1,143 @@
-SUBDIRS = src etc
+bin_PROGRAMS = \
+	xgra
+
+xgra_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\"xgra\" \
+	$(MOTIF_CFLAGS) \
+	-DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \
+	-DXMS_FILE_NAME=\".xgra.cfg\" \
+	-I$(top_srcdir)/mbk/src \
+	-I$(top_srcdir)/aut/src
+
+xgra_SOURCES = \
+	xgra.c \
+	xgra.h \
+	XGR_bound.c \
+	XGR_bound.h \
+	XGR_error.c \
+	XGR_error.h \
+	XGR_graph.c \
+	XGR_graph.h \
+	XGR_object.c \
+	XGR_object.h \
+	XGR_place.c \
+	XGR_place.h \
+	XGR_select.c \
+	XGR_select.h \
+	XGR.h \
+	XME_dialog.c \
+	XME_dialog.h \
+	XME_edit.c \
+	XME_edit.h \
+	XME.h \
+	XME_menu.c \
+	XME_menu.h \
+	XME_message.c \
+	XME_message.h \
+	XME_panel.c \
+	XME_panel.h \
+	XME_search.c \
+	XME_search.h \
+	XME_select.c \
+	XME_select.h \
+	XMF_dialog.c \
+	XMF_dialog.h \
+	XMF_file.c \
+	XMF_file.h \
+	XMF.h \
+	XMF_menu.c \
+	XMF_menu.h \
+	XMF_panel.c \
+	XMF_panel.h \
+	XMH.h \
+	XMH_help.c \
+	XMH_help.h \
+	XMH_menu.c \
+	XMH_menu.h \
+	XMH_panel.c \
+	XMH_panel.h \
+	XMS_dialog.c \
+	XMS_dialog.h \
+	XMS.h \
+	XMS_menu.c \
+	XMS_menu.h \
+	XMS_panel.c \
+	XMS_panel.h \
+	XMS_setup.c \
+	XMS_setup.h \
+	XMT_dialog.c \
+	XMT_dialog.h \
+	XMT.h \
+	XMT_menu.c \
+	XMT_menu.h \
+	XMT_message.c \
+	XMT_message.h \
+	XMT_panel.c \
+	XMT_panel.h \
+	XMT_tools.c \
+	XMT_tools.h \
+	XMV_dialog.c \
+	XMV_dialog.h \
+	XMV.h \
+	XMV_map.c \
+	XMV_map.h \
+	XMV_menu.c \
+	XMV_menu.h \
+	XMV_message.c \
+	XMV_message.h \
+	XMV_panel.c \
+	XMV_panel.h \
+	XMV_view.c \
+	XMV_view.h \
+	XMX_color.c \
+	XMX_color.h \
+	XMX_cursor.c \
+	XMX_cursor.h \
+	XMX_dialog.c \
+	XMX_dialog.h \
+	XMX_event.c \
+	XMX_event.h \
+	XMX_graphic.c \
+	XMX_graphic.h \
+	XMX_grid.c \
+	XMX_grid.h \
+	XMX.h \
+	XMX_icon.c \
+	XMX_icon.h \
+	XMX_menu.c \
+	XMX_menu.h \
+	XMX_message.c \
+	XMX_message.h \
+	XMX_motif.c \
+	XMX_motif.h \
+	XMX_panel.c \
+	XMX_panel.h \
+	XMX_view.c \
+	XMX_view.h \
+	XSB_error.c \
+	XSB_error.h \
+	XSB.h \
+	XSB_parse.c \
+	XSB_parse.h \
+	XSB_share.c \
+	XSB_share.h \
+	XTB_cursor.c \
+	XTB_cursor.h \
+	XTB_dialog.c \
+	XTB_dialog.h \
+	XTB.h \
+	XTB_icon.c \
+	XTB_icon.h \
+	XTB_menu.c \
+	XTB_menu.h \
+	XTB_panel.c \
+	XTB_panel.h \
+	XTB_pixmap.c \
+	XTB_pixmap.h
+
+xgra_LDADD = \
+	$(GLIB_CFLAGS) \
+	$(MOTIF_LIBS) \
+	$(top_builddir)/src/aut/libAut.la \
+	$(top_builddir)/src/mbk/libMut.la


--- NEW FILE xgra.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Graphic Graph Viewer
Exec=ALLIANCE_TOP/bin/xgra
Icon=xgra.png
Type=Application
Terminal=false
GenericName=xpvn
Categories=Electronics;Engineering;
Comment=View the graphic graph


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Nov 2008 18:01:19 -0000	1.3
+++ .cvsignore	28 Aug 2009 10:47:49 -0000	1.4
@@ -1,2 +1 @@
-alliance-5.0-20070718.tar.gz
-alliance-5.0-tutorials.tar.bz2
+alliance-5.0-20090827.tar.gz

alliance-env.patch:
 distrib1/etc/alc_env.csh.in |   11 +++++++----
 distrib1/etc/alc_env.sh.in  |   11 +++++++----
 etc/Makefile.am             |    2 +-
 etc/Makefile.in             |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/alliance-env.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- alliance-env.patch	10 Nov 2008 18:01:19 -0000	1.2
+++ alliance-env.patch	28 Aug 2009 10:47:49 -0000	1.3
@@ -1,7 +1,8 @@
---- distrib/etc/alc_env.csh.in  2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.csh.in  2008-05-26 22:37:15.000000000 +0200
+diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in
+--- distrib/etc/alc_env.csh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.csh.in	2009-08-27 18:16:05.285270921 +0200
 @@ -70,20 +70,23 @@
-
+ 
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
@@ -9,36 +10,36 @@
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if ( $?LD_LIBRARY_PATH ) then
 -   setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
 +   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
-    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`"
   endif
-
-- if ( $?MANPATH ) then
+ 
+  if ( $?MANPATH ) then
 -   setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-+ if ($?MANPATH) then
-+  setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
++   setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
   else
 -   setenv MANPATH "${ALLIANCE_TOP}/man"
-+  setenv MANPATH ":${ALLIANCE_TOP}/man"
++   setenv MANPATH ":${ALLIANCE_TOP}/man"
   endif
-+
-+# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  setenv MBK_SPI_MODEL       "${ALLIANCE_TOP}/etc/spimodel.cfg"
---- distrib/etc/alc_env.sh.in   2006-10-05 12:09:25.000000000 +0200
-+++ etc/alc_env.sh.in   2008-05-26 22:41:30.000000000 +0200
++ 
++ # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
++ setenv MBK_SPI_MODEL     "${ALLIANCE_TOP}/etc/spimodel.cfg"
+diff -Naur distrib/etc/alc_env.sh.in distrib1/etc/alc_env.sh.in
+--- distrib/etc/alc_env.sh.in	2007-11-28 15:58:10.000000000 +0100
++++ distrib1/etc/alc_env.sh.in	2009-08-27 18:17:38.477272066 +0200
 @@ -70,20 +70,23 @@
-
-
+ 
+ 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
 + PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
-
+ 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
   if [ -z "${LD_LIBRARY_PATH}" ]; then
     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
@@ -47,19 +48,18 @@
 +   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
   fi
   export LD_LIBRARY_PATH
-
+ 
   if [ -z "${MANPATH}" ]; then
--   MANPATH=$ALLIANCE_TOP/man
-+   MANPATH=:$ALLIANCE_TOP/man
+-   MANPATH=$ALLIANCE_TOP/man:$(manpath)
++   MANPATH=:$ALLIANCE_TOP/man:$(manpath)
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
 +   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
-+
++ 
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-+  MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
-
++ MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
 diff -Naur distrib/etc/Makefile.am etc/Makefile.am
 --- distrib/etc/Makefile.am	2002-06-25 16:09:38.000000000 +0200
 +++ etc/Makefile.am	2007-08-18 13:58:38.000000000 +0200


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/alliance.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- alliance.spec	10 Nov 2008 18:01:20 -0000	1.4
+++ alliance.spec	28 Aug 2009 10:47:50 -0000	1.5
@@ -1,11 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20070718
-%define        _default_patch_fuzz  2
+%define        snapshot  20090827
 
 Name:          alliance
 Version:       5.0
-Release:       23.%{snapshot}snap%{?dist}
-Summary:       Alliance VLSI CAD Sytem
+Release:       30.%{snapshot}snap%{?dist}
+Summary:       VLSI EDA System
 
 License:       GPLv2
 Group:         Applications/Engineering
@@ -14,10 +13,26 @@ Source:        http://www-asim.lip6.fr/p
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
 Patch0:        alliance-env.patch
-Patch1:        alliance-examples.patch
-Patch2:        alliance-run.patch
-Patch3:        alliance-perms.patch
-Patch4:        alliance-gcc43.patch
+Patch1:        alliance-run.patch
+Patch2:        alliance-perms.patch
+
+# Improving autogeneration of documentation
+Patch3:        alliance-tutorials-place_n_route.patch
+Patch4:        alliance-tutorials-simulation.patch
+Patch5:        alliance-tutorials-start.patch
+Patch6:        alliance-tutorials-synthesis.patch
+Patch7:        alliance-tutorials-amd2901.patch
+
+# Improving examples
+Patch8:        alliance-examples.patch
+Patch9:        alliance-examples-adm2901.patch
+Patch10:       alliance-examples-mipsR3000.patch
+
+# upstream enhancements
+Patch11:       alliance-xgra.patch
+
+# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
+Patch12:       alliance-xgra-xgrerror-ld.patch
 
 Source1:       xsch.desktop
 Source2:       dreal.desktop
@@ -25,25 +40,37 @@ Source3:       xpat.desktop
 Source4:       xfsm.desktop
 Source5:       xvpn.desktop
 Source6:       graal.desktop
+Source7:       xgra.desktop
 
-Source7:       alliance.fedora
+Source8:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source8:       graal.png
-Source9:       dreal.png
-Source10:      xvpn.png
-Source11:      xfsm.png
-Source12:      xpat.png
-Source13:      xsch.png
-
-Source14:      %{name}-5.0-tutorials.tar.bz2
+Source9:       graal.png
+Source10:      dreal.png
+Source11:      xvpn.png
+Source12:      xfsm.png
+Source13:      xpat.png
+Source14:      xsch.png
+Source15:      xgra.png
+
+Source16:      alliance-tutorials-go-all.sh
+Source17:      alliance-tutorials-go-all-clean.sh
+Source18:      alliance-examples-go-all.sh
+Source19:      alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison
+BuildRequires: libXt-devel byacc desktop-file-utils bison
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:       xorg-x11-fonts-misc
+%if 0%{?rhel}
+BuildRequires: openmotif-devel
+BuildRequires: pkgconfig
+%else
+BuildRequires: lesstif-devel
+%endif
+
+Requires:      xorg-x11-fonts-misc
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -86,7 +113,6 @@ Summary:      Alliance VLSI CAD Sytem - 
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
 Requires:     electronics-menu
-Obsoletes:    %{name} < 5.0-12
 
 
 %description libs
@@ -97,7 +123,9 @@ Architecture dependent files for the All
 Summary:      Alliance VLSI CAD Sytem - Documentations
 Group:        Applications/Engineering
 Requires:     %{name} = %{version}-%{release}
-Requires:     gnuplot
+Requires:     gnuplot 
+BuildRequires:tetex-latex
+
 
 
 %description doc
@@ -106,38 +134,85 @@ Documentation and tutorials for the Alli
 
 %prep
 %setup -q
+%{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
 sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
 
-
-%patch0 -p0 -b .env
-# removing useless copyrighted (by Cadence) lines from the examples
+# removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
-%patch1 -p0 -b .examples
-%patch2 -p0 -b .run
-# fixing permissions
-%patch3 -p0 -b .perms
 
+%patch11 -p1 -b .xgra-makefile.am
+%patch12 -p0 -b .xgra-long
 
-### 2008 March: TexLive introduction to Rawhide
-sed -i "s|tutorials||" documentation/Makefile.in
-tar -xvf %{SOURCE14}
 
+%patch0 -p0 -b .env
+%patch1 -p0 -b .run
+%patch2 -p0 -b .perms
+
+
+# ------------------------------------------------------------------------------
+# Description : 2008 March : TexLive introduction to Rawhide
+sed -i "s|tutorials||" documentation/Makefile.in
+sed -i "s|documentation/tutorials/Makefile||" configure*
+%patch3 -p1 -b .doc
+%patch4 -p1 -b .doc
+%patch5 -p1 -b .doc
+%patch6 -p1 -b .doc
+%patch7 -p0 -b .doc
+pushd documentation/tutorials
+    # clean unneccessary files
+    %{__rm} Makefile*
+    %{__rm} *.pdf
+    # build documentation
+    for folder in place_and_route/tex start simulation/tex synthesis/tex; do
+        pushd $folder
+            %{__make}
+        popd
+        # remove useless directories before %%doc
+        %{__rm} -rf $folder
+    done
+    # Add automated scripts to tutorials
+    %{__install} -pm 755 %{SOURCE16} go-all.sh
+    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    # Fedora Electronic Lab self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-tutorials.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
+# ------------------------------------------------------------------------------
 
-%patch4 -p1 -b .include
+%patch8  -p0 -b .examples
+%patch9  -p1 -b .examples
+%patch10 -p1 -b .examples
+
+# fixing flex and bison update on rawhide
+sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
+sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
 
 # make sure the man pages are UTF-8...
-for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
+for nonUTF8 in FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
                loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do
   %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
   %{__mv} -f $nonUTF8.conv $nonUTF8
 done
 
+pushd documentation/alliance-examples/
+# make sure the man pages are UTF-8...
+for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \
+               tuner/README mipsR3000/sce/mips_dpt.c ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  %{__mv} -f $nonUTF8.conv $nonUTF8
+done
+
 #wrong-file-end-of-line-encoding
-sed -i 's/\r//' documentation/alliance-examples/mipsR3000/asm/*
+sed -i 's/\r//' mipsR3000/asm/*
+popd
 
+# Fix xgra build 
+sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
+sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
 
 %build
 
@@ -185,25 +260,30 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/doc/
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
-# correcting minor documentation details
-sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+# Add automated scripts to examples
+%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+
+pushd alliance-examples/
+    # FEL self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-examples.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
 for desktopfile in *.desktop; do
-desktop-file-install --vendor fedora          \
-  --add-category Engineering                  \
-  --add-category Electronics                  \
-  --remove-category Science                   \
+desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
 done
@@ -215,9 +295,9 @@ done
 
 
 # protecting hardcoded links
-ln -sf ../../..%{_datadir}/%{name}/cells    %{buildroot}%{prefix}/cells
-ln -sf ../../..%{_datadir}/%{name}/etc      %{buildroot}%{prefix}/etc
-ln -sf ../../..%{_datadir}/%{name}/man      %{buildroot}%{prefix}/man
+ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells
+ln -sf ../../..%{_datadir}/%{name}/etc   %{buildroot}%{prefix}/etc
+ln -sf ../../..%{_datadir}/%{name}/man   %{buildroot}%{prefix}/man
 
 
 # manpage-not-gzipped
@@ -234,11 +314,17 @@ EOF
 # removing tools for compiling and installing Alliance tools
 # These are for the packager (i.e me) and not for user
 %{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf
+%{__rm} -f %{buildroot}%{prefix}/etc/attila.conf
 %{__rm} -f %{buildroot}%{prefix}/bin/attila
 %{__rm} -f %{buildroot}%{_datadir}/man/man1/attila*
 %{__rm} -f doc/html/alliance/*attila.html
 %{__rm} -f doc/pdf/attila.pdf
 
+# correcting minor documentation details
+sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+
+%{_fixperms} %{buildroot}/*
+
 
 %post
 /sbin/ldconfig
@@ -270,18 +356,20 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files libs
-%config %{_sysconfdir}/ld.so.conf.d/*
-%{_datadir}/applications/fedora-*.desktop
-%{_sysconfdir}/profile.d/alc_env.*
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
+%{_datadir}/applications/*.desktop
+%config(noreplace) %{_sysconfdir}/profile.d/alc_env.*
 
 
 %files doc
+%defattr(-,root,root,-)
 %doc doc/html/
 %doc doc/design-flow
 %doc doc/pdf/*.pdf
 %doc doc/overview/*.ps
 %doc doc/overview/*.pdf
-%doc tutorials/
+%doc documentation/tutorials/
 #Makefiles are present in alliance-examples/*. It is normal because
 # * it gives the VLSI designer a template on how to create his own
 #   Makefile for alliance (VLSI designers normally don't know how to do so)
@@ -292,6 +380,30 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
+- updated to upstream's 20090828 snapshot
+- merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements
+- fixed EPEL-5 build
+
+* Sat Aug 8 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-29.20070718snap
+- improved rawhide build with respect to the broken patches
+
+* Thu Jul 9 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-28.20070718snap
+- improved stability on 64 bit architecture
+- Patches (14 to 100) added along with new features from upstream
+
+* Sat Jul 4 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-27.20070718snap
+- improved autogeneration of documentation and fixed the examples
+
+* Tue Feb 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-26.20070718snap
+- fixed build due to new releases of flex and bison
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-25.20070718snap
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-24.20070718snap
+- Improved VHDL generic implementation
+
 * Mon Nov 10 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-23.20070718snap
 - Added Requires xorg-x11-fonts-misc to fix launch crash
 


Index: dreal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/dreal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dreal.desktop	10 Nov 2008 18:01:20 -0000	1.3
+++ dreal.desktop	28 Aug 2009 10:47:50 -0000	1.4
@@ -6,5 +6,5 @@ Icon=dreal.png
 Type=Application
 Terminal=false
 GenericName=dreal
-Categories=Science;
-Comment=View the Real layout
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Real layout


Index: graal.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/graal.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- graal.desktop	10 Nov 2008 18:01:20 -0000	1.3
+++ graal.desktop	28 Aug 2009 10:47:50 -0000	1.4
@@ -6,5 +6,5 @@ Icon=graal.png
 Type=Application
 Terminal=false
 GenericName=graal
-Categories=Science;
-Comment=Edits physical layouts
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=Edits physical layouts


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Nov 2008 18:01:20 -0000	1.1
+++ import.log	28 Aug 2009 10:47:50 -0000	1.2
@@ -1 +1,2 @@
 alliance-5_0-23_20070718snap_fc10:EL-5:alliance-5.0-23.20070718snap.fc10.src.rpm:1226340022
+alliance-5_0-30_20090827snap_fc11:EL-5:alliance-5.0-30.20090827snap.fc11.src.rpm:1251456319


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Nov 2008 18:01:20 -0000	1.3
+++ sources	28 Aug 2009 10:47:50 -0000	1.4
@@ -1,2 +1 @@
-917f4493c09f6f5c49d5a606a5e9bbd8  alliance-5.0-20070718.tar.gz
-32cac3116f85713aec2e1e18379811eb  alliance-5.0-tutorials.tar.bz2
+8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz


Index: xfsm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/xfsm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xfsm.desktop	10 Nov 2008 18:01:20 -0000	1.3
+++ xfsm.desktop	28 Aug 2009 10:47:50 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xfsm.png
 Type=Application
 Terminal=false
 GenericName=xfsm
-Categories=Science;
-Comment=View Finite State Machines
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View Finite State Machines


Index: xpat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/xpat.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xpat.desktop	10 Nov 2008 18:01:20 -0000	1.3
+++ xpat.desktop	28 Aug 2009 10:47:50 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xpat.png
 Type=Application
 Terminal=false
 GenericName=xpat
-Categories=Science;
-Comment=View the Patterns
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Patterns


Index: xsch.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/xsch.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xsch.desktop	10 Nov 2008 18:01:20 -0000	1.3
+++ xsch.desktop	28 Aug 2009 10:47:50 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xsch.png
 Type=Application
 Terminal=false
 GenericName=Xsch
-Categories=Science;
-Comment=View the Schematic
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Schematic


Index: xvpn.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/EL-5/xvpn.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xvpn.desktop	10 Nov 2008 18:01:20 -0000	1.3
+++ xvpn.desktop	28 Aug 2009 10:47:50 -0000	1.4
@@ -6,5 +6,5 @@ Icon=xvpn.png
 Type=Application
 Terminal=false
 GenericName=xpvn
-Categories=Science;
-Comment=View the Petri Nets
\ No newline at end of file
+Categories=Electronics;Engineering;
+Comment=View the Petri Nets


--- alliance-gcc43.patch DELETED ---



From huzaifas at fedoraproject.org  Fri Aug 28 11:01:37 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 28 Aug 2009 11:01:37 +0000 (UTC)
Subject: rpms/python-xklavier/devel - New directory
Message-ID: <20090828110137.481B011C0044@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/python-xklavier/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz24909/rpms/python-xklavier/devel

Log Message:
Directory /cvs/pkgs/rpms/python-xklavier/devel added to the repository




From huzaifas at fedoraproject.org  Fri Aug 28 11:01:37 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 28 Aug 2009 11:01:37 +0000 (UTC)
Subject: rpms/python-xklavier - New directory
Message-ID: <20090828110137.1C09311C0044@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/python-xklavier
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz24909/rpms/python-xklavier

Log Message:
Directory /cvs/pkgs/rpms/python-xklavier added to the repository




From huzaifas at fedoraproject.org  Fri Aug 28 11:01:43 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 28 Aug 2009 11:01:43 +0000 (UTC)
Subject: rpms/python-xklavier Makefile,NONE,1.1
Message-ID: <20090828110143.8CC6211C0044@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/python-xklavier
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz24909/rpms/python-xklavier

Added Files:
	Makefile 
Log Message:
Setup of module python-xklavier


--- NEW FILE Makefile ---
# Top level Makefile for module python-xklavier
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From huzaifas at fedoraproject.org  Fri Aug 28 11:01:43 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 28 Aug 2009 11:01:43 +0000 (UTC)
Subject: rpms/python-xklavier/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828110143.CBC3711C0044@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/python-xklavier/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/huzaifas/CVSROOT/admin/tmpcvsz24909/rpms/python-xklavier/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-xklavier


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-xklavier
# $Id: Makefile,v 1.1 2009/08/28 11:01:43 huzaifas Exp $
NAME := python-xklavier
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From twaugh at fedoraproject.org  Fri Aug 28 11:01:48 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 11:01:48 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-non-scripts.patch, 1.1, 1.2 hplip.spec, 1.229,
	1.230
Message-ID: <20090828110148.C110111C0044@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24979

Modified Files:
	hplip-non-scripts.patch hplip.spec 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-12
- Include missing base files.


hplip-non-scripts.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: hplip-non-scripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip-non-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-non-scripts.patch	25 Aug 2009 11:09:03 -0000	1.1
+++ hplip-non-scripts.patch	28 Aug 2009 11:01:48 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
---- hplip-3.9.8/Makefile.am.non-scripts	2009-08-25 12:02:59.790202347 +0100
-+++ hplip-3.9.8/Makefile.am	2009-08-25 12:03:32.234212568 +0100
+--- hplip-3.9.8/Makefile.am.non-scripts	2009-08-04 22:37:39.000000000 +0100
++++ hplip-3.9.8/Makefile.am	2009-08-28 10:58:04.488778060 +0100
 @@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin
  # base
  basedir = $(hplipdir)/base
@@ -10,24 +10,3 @@ diff -up hplip-3.9.8/Makefile.am.non-scr
  	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
  	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
  	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
-diff -up hplip-3.9.8/Makefile.in.non-scripts hplip-3.9.8/Makefile.in
---- hplip-3.9.8/Makefile.in.non-scripts	2009-08-25 12:03:37.345077328 +0100
-+++ hplip-3.9.8/Makefile.in	2009-08-25 12:04:08.766078065 +0100
-@@ -428,7 +428,7 @@ am__ptest_SOURCES_DIST = pcard/ptest.c p
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	fat.$(OBJEXT)
- ptest_OBJECTS = $(am_ptest_OBJECTS)
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at ptest_DEPENDENCIES = libhpmud.la
--am__dist_base_SCRIPTS_DIST = base/maint.py base/codes.py base/g.py \
-+am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \
- 	base/pml.py base/status.py base/__init__.py base/mfpdtf.py \
- 	base/utils.py base/wifi.py base/device.py base/logger.py \
- 	base/slp.py base/exif.py base/strings.py base/magic.py \
-@@ -3701,7 +3701,7 @@ cups_drv = prnt/drv/hpcups.drv
- 
- # base
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at basedir = $(hplipdir)/base
-- at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
-+ at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- hplip.spec	28 Aug 2009 09:14:40 -0000	1.229
+++ hplip.spec	28 Aug 2009 11:01:48 -0000	1.230
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -45,6 +45,7 @@ BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 BuildRequires: sane-backends-devel
 BuildRequires: dbus-devel
+BuildRequires: automake, autoconf, libtool
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -139,6 +140,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %patch9 -p1 -b .requirespageregion
 
 %build
+aclocal
+automake --foreign --add-missing --copy
+autoconf
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install \
@@ -352,6 +356,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-12
+- Include missing base files.
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
 - Use dll.d file instead of post scriptlet for hpaio (bug #519988).
 - Fixed RequiresPageRegion patch (bug #518756).



From atkac at fedoraproject.org  Fri Aug 28 11:06:37 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri, 28 Aug 2009 11:06:37 +0000 (UTC)
Subject: rpms/tigervnc/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 tigervnc.spec, 1.18, 1.19 tigervnc10-rh495457.patch, 1.1, NONE
Message-ID: <20090828110637.A1BF511C0044@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26533

Modified Files:
	.cvsignore sources tigervnc.spec 
Removed Files:
	tigervnc10-rh495457.patch 
Log Message:
- update to 1.0.0
- patches merged
  - tigervnc10-rh495457.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Jun 2009 13:10:46 -0000	1.7
+++ .cvsignore	28 Aug 2009 11:06:37 -0000	1.8
@@ -1,2 +1,2 @@
-tigervnc-0.0.91.tar.gz
+tigervnc-1.0.0.tar.gz
 xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Jun 2009 13:10:46 -0000	1.7
+++ sources	28 Aug 2009 11:06:37 -0000	1.8
@@ -1,2 +1,2 @@
-9aff0c8b573f040aeca4560636fa6886  tigervnc-0.0.91.tar.gz
+622c6689a66651419b5431efdee99d5a  tigervnc-1.0.0.tar.gz
 b1517bc2701a7ac947230338f5a7ea9c  xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- tigervnc.spec	24 Aug 2009 16:44:29 -0000	1.18
+++ tigervnc.spec	28 Aug 2009 11:06:37 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		tigervnc
-Version:	0.0.91
-Release:	0.17%{?dist}
+Version:	1.0.0
+Release:	1%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -39,7 +39,6 @@ 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-compat.patch
 
 %description
@@ -103,7 +102,6 @@ popd
 %patch0 -p1 -b .102434
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
-%patch9 -p0 -b .rh495457
 %patch10 -p1 -b .compat
 
 # Use newer gettext
@@ -246,6 +244,10 @@ fi
 %endif
 
 %changelog
+* Fri Aug 28 2009 Adam Tkac <atkac redhat com> 1.0.0-1
+- update to 1.0.0
+- tigervnc10-rh495457.patch merged to upstream
+
 * Mon Aug 24 2009 Karsten Hopp <karsten at redhat.com> 0.0.91-0.17
 - fix ifnarch s390x for server-module
 


--- tigervnc10-rh495457.patch DELETED ---



From kushal at fedoraproject.org  Fri Aug 28 11:08:08 2009
From: kushal at fedoraproject.org (Kushal Das)
Date: Fri, 28 Aug 2009 11:08:08 +0000 (UTC)
Subject: rpms/python-xklavier/devel import.log, NONE,
	1.1 python-xklavier.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828110808.A7E4211C0044@cvs1.fedora.phx.redhat.com>

Author: kushal

Update of /cvs/extras/rpms/python-xklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26737/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-xklavier.spec 
Log Message:
Import for thr first time.



--- NEW FILE import.log ---
python-xklavier-0_2-2_fc11:HEAD:python-xklavier-0.2-2.fc11.src.rpm:1251457836


--- NEW FILE python-xklavier.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-xklavier
Version:        0.2
Release:        2%{?dist}
Summary:        Python bindings for libxklavier

Group:          Development/Languages
License:        LGPLv2+
URL:            http://download.sugarlabs.org/sources/external/python-xklavier/
Source0:        http://download.sugarlabs.org/sources/external/python-xklavier//%{name}-%{version}.tar.gz

BuildRequires:  python-devel, libxklavier-devel, pygobject2-devel, gtk2-devel

%description
Python bindings for libxklavier which is a library providing 
high-level API for X Keyboard Extension known as XKB.

%prep
%setup -q




%build
%configure
make %{?_smp_mflags}


%install
make install DESTDIR=%{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS
%{python_sitearch}/*


%changelog
* Fri Aug 28 2009 Kushal Das <kushal at fedoraproject.org> 0.2-2
- from define to global on top

* Thu Aug 27 2009 Kushal Das <kushal at fedoraproject.org> 0.2-1
- version 0.2 of the project

* Wed Aug 26 2009 Kushal Das <kushal at fedoraproject.org> 0.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xklavier/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 11:01:43 -0000	1.1
+++ .cvsignore	28 Aug 2009 11:08:08 -0000	1.2
@@ -0,0 +1 @@
+python-xklavier-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xklavier/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 11:01:43 -0000	1.1
+++ sources	28 Aug 2009 11:08:08 -0000	1.2
@@ -0,0 +1 @@
+5b3cd1832f4d37dfa48490759f3bd3be  python-xklavier-0.2.tar.gz



From atkac at fedoraproject.org  Fri Aug 28 11:29:10 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Fri, 28 Aug 2009 11:29:10 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.19,1.20
Message-ID: <20090828112910.F017E11C0044@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29909

Modified Files:
	tigervnc.spec 
Log Message:
Tune configure flags to fix the build problems.



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- tigervnc.spec	28 Aug 2009 11:06:37 -0000	1.19
+++ tigervnc.spec	28 Aug 2009 11:29:10 -0000	1.20
@@ -125,7 +125,7 @@ autoreconf -fiv
 %configure \
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
-	--disable-static \
+	--disable-static --disable-xinerama \
 	--disable-composite \
 	--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \



From ovasik at fedoraproject.org  Fri Aug 28 11:39:46 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 28 Aug 2009 11:39:46 +0000 (UTC)
Subject: rpms/taskjuggler/devel taskjuggler.spec,1.36,1.37
Message-ID: <20090828113946.BC75F11C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/taskjuggler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32232

Modified Files:
	taskjuggler.spec 
Log Message:
generate and ship manpages for taskjuggler and taskjugglerUI, add disttag


Index: taskjuggler.spec
===================================================================
RCS file: /cvs/extras/rpms/taskjuggler/devel/taskjuggler.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- taskjuggler.spec	27 Jul 2009 05:32:33 -0000	1.36
+++ taskjuggler.spec	28 Aug 2009 11:39:46 -0000	1.37
@@ -1,6 +1,6 @@
 Name:          taskjuggler
 Version:       2.4.3
-Release:       2
+Release:       3%{?dist}
 Summary:       Project management tool
 
 Group:         Applications/Productivity
@@ -18,6 +18,7 @@ BuildRequires: kdelibs3-devel
 # need gettext for untranslated .po files
 Buildrequires: gettext
 Buildrequires: qt3 qt3-devel
+Buildrequires: xmlto
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,6 +53,10 @@ Libraries for TaskJuggler package.
 rm -f TestSuite/Syntax/Errors/Timezone.tjp
 make
 
+#generate manpages with xmlto
+xmlto man --skip-validation man/en/taskjuggler.xml
+xmlto man --skip-validation man/en/TaskJugglerUI.xml
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +70,8 @@ desktop-file-install --vendor fedora \
 	--add-category Office \
 	${RPM_BUILD_ROOT}/%{_datadir}/applications/kde/taskjuggler.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p *.1 $RPM_BUILD_ROOT%{_mandir}/man1
 rm $RPM_BUILD_ROOT%{_libdir}/libtaskjuggler.{la,so}
 mv $RPM_BUILD_ROOT%{_docdir}/packages/* $RPM_BUILD_ROOT%{_docdir}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/packages
@@ -112,12 +119,18 @@ fi
 %{_docdir}/%{name}/*
 %{_datadir}/icons/*
 %{_datadir}/mimelnk/application/*.desktop
+%{_mandir}/man1/*
+
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libtaskjuggler*
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> - 2.4.3-3
+- generate and ship manpages for taskjuggler and taskjugglerUI
+- add disttag
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ltinkl at fedoraproject.org  Fri Aug 28 11:53:24 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri, 28 Aug 2009 11:53:24 +0000 (UTC)
Subject: rpms/kio_sysinfo/devel .cvsignore, 1.3, 1.4 kio_sysinfo.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090828115324.DD31511C0044@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kio_sysinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2044

Modified Files:
	.cvsignore kio_sysinfo.spec sources 
Log Message:
new version (snapshot)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Jun 2009 12:26:59 -0000	1.3
+++ .cvsignore	28 Aug 2009 11:53:24 -0000	1.4
@@ -1 +1 @@
-kio_sysinfo-20090620.tar.bz2
+kio_sysinfo-20090828.tar.bz2


Index: kio_sysinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/devel/kio_sysinfo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kio_sysinfo.spec	25 Jul 2009 04:37:38 -0000	1.5
+++ kio_sysinfo.spec	28 Aug 2009 11:53:24 -0000	1.6
@@ -1,8 +1,8 @@
 %define SYSINFO_DISTRO fedora
 
 Name:           kio_sysinfo
-Version:        20090620
-Release:        2%{?dist}
+Version:        20090828
+Release:        1%{?dist}
 Summary:        KIO slave which shows basic system information
 
 Group:          System Environment/Libraries
@@ -60,6 +60,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Luk?? Tinkl <ltinkl at redhat.com> - 20090828-1
+- new upstream version with a couple of small fixes
+  (most notably the empty disk Label fix)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090620-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kio_sysinfo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jun 2009 12:47:52 -0000	1.4
+++ sources	28 Aug 2009 11:53:24 -0000	1.5
@@ -1 +1 @@
-ef70da5e5859beb201bf1a01a79a4ace  kio_sysinfo-20090620.tar.bz2
+c6c5d39d92c035ab27f7ca9577794eca  kio_sysinfo-20090828.tar.bz2



From rvokal at fedoraproject.org  Fri Aug 28 12:13:06 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 28 Aug 2009 12:13:06 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark.spec,1.56,1.57
Message-ID: <20090828121306.0B0FB11C0044@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5958

Modified Files:
	wireshark.spec 
Log Message:
rebuilt


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- wireshark.spec	21 Aug 2009 16:26:41 -0000	1.56
+++ wireshark.spec	28 Aug 2009 12:13:05 -0000	1.57
@@ -7,7 +7,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.2.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Radek Vokal <rvokal at redhat.com> - 1.2.1-4
+- yet anohter rebuilt
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-3
 - rebuilt with new openssl
 



From rdieter at fedoraproject.org  Fri Aug 28 12:15:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 28 Aug 2009 12:15:37 +0000 (UTC)
Subject: rpms/redland/devel redland.spec,1.19,1.20
Message-ID: <20090828121537.48DE811C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/redland/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6430

Modified Files:
	redland.spec 
Log Message:
* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-10.1
- temporarily drop mysql support (restore once mysql is unbroken in rawhide)



Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- redland.spec	27 Aug 2009 20:51:01 -0000	1.19
+++ redland.spec	28 Aug 2009 12:15:37 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           redland
 Version:        1.0.7
-Release:        10%{?dist}
+Release:        10%{?dist}.1
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRequires:  curl-devel
 BuildRequires:  rasqal-devel >= 0.9.15
 BuildRequires:  raptor-devel >= 1.4.16
 BuildRequires:  db4-devel
-BuildRequires:  mysql-devel
+#BuildRequires:  mysql-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  gtk-doc
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-10.1
+- temporarily drop mysql support (restore once mysql is unbroken in rawhide)
+
 * Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-10
 - fix build with newer sqlite (#519781)
 



From rdieter at fedoraproject.org  Fri Aug 28 12:24:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 28 Aug 2009 12:24:57 +0000 (UTC)
Subject: rpms/redland/devel redland.spec,1.20,1.21
Message-ID: <20090828122457.96FE111C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/redland/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7875

Modified Files:
	redland.spec 
Log Message:
fix %files



Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- redland.spec	28 Aug 2009 12:15:37 -0000	1.20
+++ redland.spec	28 Aug 2009 12:24:57 -0000	1.21
@@ -82,8 +82,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rdfproc
 %{_bindir}/redland-db-upgrade
 %dir %{_datadir}/redland
-%{_datadir}/redland/mysql-v1.ttl
-%{_datadir}/redland/mysql-v2.ttl
+#{_datadir}/redland/mysql-v1.ttl
+#{_datadir}/redland/mysql-v2.ttl
 %{_mandir}/man1/redland-db-upgrade.1*
 %{_mandir}/man1/rdfproc.1*
 %{_mandir}/man3/redland.3*



From tagoh at fedoraproject.org  Fri Aug 28 12:25:22 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 28 Aug 2009 12:25:22 +0000 (UTC)
Subject: rpms/anthy/F-10 anthy-fix-typo-in-dict.patch, 1.1, 1.2 anthy.spec, 
	1.53, 1.54
Message-ID: <20090828122522.E054D11C0044@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/anthy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8059

Modified Files:
	anthy-fix-typo-in-dict.patch anthy.spec 
Log Message:
* Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
- Fix more typos in dictionary. (#519769)

anthy-fix-typo-in-dict.patch:
 compound.t |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Index: anthy-fix-typo-in-dict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-10/anthy-fix-typo-in-dict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- anthy-fix-typo-in-dict.patch	8 Jul 2009 13:10:35 -0000	1.1
+++ anthy-fix-typo-in-dict.patch	28 Aug 2009 12:25:22 -0000	1.2
@@ -1,6 +1,22 @@
 diff -pruN anthy-9100h.orig/mkworddic/compound.t anthy-9100h/mkworddic/compound.t
 --- anthy-9100h.orig/mkworddic/compound.t	2009-02-07 21:15:36.000000000 +0900
-+++ anthy-9100h/mkworddic/compound.t	2009-07-08 20:52:21.000000000 +0900
++++ anthy-9100h/mkworddic/compound.t	2009-08-28 17:19:20.000000000 +0900
+@@ -8,7 +8,6 @@
+ ???????????????? #T35 #_4????_4????
+ ?????????????????? #T35 #_5????_4????
+ ?????????????? #T35 #_5????_2??
+-???????????? #T35 #_3????_3????
+ ?????????????????? #CN ??????????????????
+ ???????????? #T35 #_4????_2??
+ ???????????? #T35 #_3????_3????
+@@ -20,6 +19,7 @@
+ ???????????????? #T35 #_3????_5????
+ ?????????????? #T35 #_3????_4????
+ ???????????????? #T35 #_3????_5????
++???????????? #T35 #_3????_3????
+ ?????????????? #T35 #_3????_4????
+ ?????????????? #T35 #_3????_4????
+ ?????????????????? #T35 #_3????_6??????
 @@ -9714,7 +9714,6 @@
  ?????????????? #T35 #_4????_3????
  ?????????????? #T35 #_4????_3??
@@ -9,6 +25,24 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????? #T35 #_4????_2??
  ?????????????? #T35 #_4????_3????
  ???????????????? #T35 #_4????_4????
+@@ -19234,7 +19233,7 @@
+ ???????????? #T35 #_4????_2??
+ ???????????????? #T35 #_2??_2??_4????
+ ???????????? #T35 #_4????_2??
+-?????????????????? #T35 #_4????_5????
++?????????????????? #T35 #_4????_5????
+ ???????????? #T35 #_2??_4????
+ ???????????? #T35 #_4????_2??
+ ?????????????? #T35 #_2??_3????_2??
+@@ -20163,7 +20162,7 @@
+ ???????????????? #T35 #_4????_4????
+ ???????????????????? #T35 #_4????_2??_4????
+ ???????????? #T35 #_4????_2??
+-???????????????? #T35 #_4????_4????
++???????????????? #T35 #_4????_4????
+ ???????????? #T35 #_4????_2??
+ ?????????? #T35 #_4????_1??
+ ???????????????? #T35 #_4????_4????
 @@ -30752,7 +30751,6 @@
  ?????????????????????????? #T35 #_6????_4????_3????
  ???????????????? #T35 #_7??????_1??
@@ -17,6 +51,15 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????? #T35 #_5????_3??
  ???????????????????????? #T35 #_5????_3??_4????
  ?????????????? #T35 #_5????_2??
+@@ -30839,7 +30837,7 @@
+ ???????????? #T35 #_3??_3????
+ ???????????? #T35 #_4????_2??
+ ???????????????? #T35 #_4????_4????
+-???????????????? #T35 #_4????_4????
++???????????????? #T35 #_4????_4????
+ ?????????????? #T35 #_4????_3??
+ ???????????????? #T35 #_5????_3????
+ ???????????????? #T35 #_5????_3????
 @@ -40405,6 +40403,7 @@
  ?????????????? #T35 #_5????_2??
  ???????????? #T35 #_3????_3??
@@ -34,6 +77,20 @@ diff -pruN anthy-9100h.orig/mkworddic/co
  ???????????????????? #T35 #_4????_6??????
  ???????????? #T35 #_4????_2??
  ?????????????????? #T35 #_6??????_3??
+@@ -57562,11 +57561,11 @@
+ ?????????? #T35 #_3????_2????
+ ?????????? #T35 #_3????_2??
+ ???????????? #T35 #_3????_3????
+-???????????????? #T35 #_3????_5????
++???????????????? #T35 #_3????_5????
+ ???????????????? #T35 #_3????_5????
+ ?????????? #T35 #_3????_2??
+ ?????????????? #T35 #_3????_4????
+-???????????? #T35 #_3????_3????
++???????????? #T35 #_3????_3????
+ ???????????? #T35 #_3????_3????
+ ???????????? #T35 #_3????_3????
+ ?????????????? #T35 #_3????_4????
 @@ -62585,6 +62584,7 @@
  ?????????? #T35 #_3??_2??
  ?????????? #T35 #_3????_2??


Index: anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anthy/F-10/anthy.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- anthy.spec	20 Aug 2009 07:12:52 -0000	1.53
+++ anthy.spec	28 Aug 2009 12:25:22 -0000	1.54
@@ -23,7 +23,7 @@
 
 Name:		anthy
 Version:	9100h
-Release:	7%{?dist}
+Release:	8%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-8
+- Fix more typos in dictionary. (#519769)
+
 * Thu Aug 20 2009 Akira TAGOH <tagoh at redhat.com> - 9100h-7
 - Stop updating corpus at the build time to avoid creating different dictionary
   among arch. (#816563)



From ovasik at fedoraproject.org  Fri Aug 28 12:29:30 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 28 Aug 2009 12:29:30 +0000 (UTC)
Subject: rpms/quota/devel quota.spec,1.54,1.55
Message-ID: <20090828122930.9F16911C0044@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8749

Modified Files:
	quota.spec 
Log Message:
symlink manpage for rpc.rquotad


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- quota.spec	27 Jul 2009 02:42:26 -0000	1.54
+++ quota.spec	28 Aug 2009 12:29:30 -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
@@ -84,8 +84,10 @@ rm -f %{buildroot}%{_sbindir}/quot
 rm -f %{buildroot}%{_sbindir}/xqmstats
 rm -f %{buildroot}%{_mandir}/man8/quot.*
 rm -f %{buildroot}%{_mandir}/man8/xqmstats.*
-ln -sf  ./quotaon.8 \
+ln -s  quotaon.8.gz \
   %{buildroot}%{_mandir}/man8/quotaoff.8
+ln -s rquotad.8.gz \
+   %{buildroot}%{_mandir}/man8/rpc.rquotad.8
 
 %find_lang %{name}
 
@@ -110,6 +112,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 28 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-6
+- symlink manpage for rpc.rquotad
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Fri Aug 28 12:32:23 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 12:32:23 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.45,
	1.46 kdeaccessibility.spec, 1.90, 1.91 sources, 1.46, 1.47
Message-ID: <20090828123223.1799011C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9320

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	5 Aug 2009 17:45:04 -0000	1.45
+++ .cvsignore	28 Aug 2009 12:32:22 -0000	1.46
@@ -1 +1,2 @@
 kdeaccessibility-4.3.0.tar.bz2
+kdeaccessibility-4.3.1.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kdeaccessibility.spec	2 Aug 2009 13:20:54 -0000	1.90
+++ kdeaccessibility.spec	28 Aug 2009 12:32:22 -0000	1.91
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.0
-Release:        3%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> 1:4.3.0-3
 - include epoch's in -libs-related Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	29 Jul 2009 22:06:46 -0000	1.46
+++ sources	28 Aug 2009 12:32:22 -0000	1.47
@@ -1 +1 @@
-76435ce1bf787713effe079a3664d3cd  kdeaccessibility-4.3.0.tar.bz2
+82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Aug 28 12:34:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 12:34:21 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.65, 1.66 kdeadmin.spec, 1.147,
	1.148 sources, 1.67, 1.68
Message-ID: <20090828123421.2756F11C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9720

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	29 Jul 2009 22:09:31 -0000	1.65
+++ .cvsignore	28 Aug 2009 12:34:20 -0000	1.66
@@ -3,3 +3,4 @@ kdeadmin-4.2.95.tar.bz2
 kdeadmin-4.2.96.tar.bz2
 kdeadmin-4.2.98.tar.bz2
 kdeadmin-4.3.0.tar.bz2
+kdeadmin-4.3.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdeadmin.spec	29 Jul 2009 22:24:38 -0000	1.147
+++ kdeadmin.spec	28 Aug 2009 12:34:20 -0000	1.148
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	29 Jul 2009 22:09:32 -0000	1.67
+++ sources	28 Aug 2009 12:34:20 -0000	1.68
@@ -1 +1 @@
-4712ade616d3c3a987281d24326ee9af  kdeadmin-4.3.0.tar.bz2
+e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Aug 28 12:39:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 12:39:04 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.63, 1.64 kdeartwork.spec, 1.114,
	1.115 sources, 1.65, 1.66
Message-ID: <20090828123904.19D7211C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	29 Jul 2009 22:12:59 -0000	1.63
+++ .cvsignore	28 Aug 2009 12:39:03 -0000	1.64
@@ -3,3 +3,4 @@ kdeartwork-4.2.95.tar.bz2
 kdeartwork-4.2.96.tar.bz2
 kdeartwork-4.2.98.tar.bz2
 kdeartwork-4.3.0.tar.bz2
+kdeartwork-4.3.1.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- kdeartwork.spec	20 Aug 2009 13:25:03 -0000	1.114
+++ kdeartwork.spec	28 Aug 2009 12:39:03 -0000	1.115
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.3.0
-Release:        2%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -206,6 +206,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - kde-style-phase subpkg (multilib'd)
 - %%files: cleanup some dir ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	29 Jul 2009 22:13:00 -0000	1.65
+++ sources	28 Aug 2009 12:39:03 -0000	1.66
@@ -1 +1 @@
-3e7872e841e87f716872086571028a37  kdeartwork-4.3.0.tar.bz2
+9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2



From nphilipp at fedoraproject.org  Fri Aug 28 12:39:53 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 12:39:53 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.101, 1.102 sources,
	1.111, 1.112 system-config-date.spec, 1.119, 1.120
Message-ID: <20090828123953.B2C4511C0044@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-serv11466

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.43


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	26 Aug 2009 14:25:05 -0000	1.101
+++ .cvsignore	28 Aug 2009 12:39:53 -0000	1.102
@@ -1 +1 @@
-system-config-date-1.9.42.tar.bz2
+system-config-date-1.9.43.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sources	26 Aug 2009 14:25:05 -0000	1.111
+++ sources	28 Aug 2009 12:39:53 -0000	1.112
@@ -1 +1 @@
-c7ba74203c4e6cc2bb06d969748ef48d  system-config-date-1.9.42.tar.bz2
+7c85be558ca3c1865ae24bc2a636bea4  system-config-date-1.9.43.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- system-config-date.spec	26 Aug 2009 14:25:05 -0000	1.119
+++ system-config-date.spec	28 Aug 2009 12:39:53 -0000	1.120
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.42
+Version: 1.9.43
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -123,6 +123,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.43-1
+- use str instead of unicode as N_ implementation
+
 * Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.9.42-1
 - provide missing N_()
 



From nphilipp at fedoraproject.org  Fri Aug 28 12:44:26 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 12:44:26 +0000 (UTC)
Subject: rpms/system-config-nfs/devel .cvsignore, 1.51, 1.52 sources, 1.59, 
	1.60 system-config-nfs.spec, 1.66, 1.67
Message-ID: <20090828124426.4C60B11C0044@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12264

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
version 1.3.46


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	26 Aug 2009 14:36:19 -0000	1.51
+++ .cvsignore	28 Aug 2009 12:44:26 -0000	1.52
@@ -1 +1 @@
-system-config-nfs-1.3.45.tar.bz2
+system-config-nfs-1.3.46.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	26 Aug 2009 14:55:34 -0000	1.59
+++ sources	28 Aug 2009 12:44:26 -0000	1.60
@@ -1 +1 @@
-9907d1529138daf408ae67cb19bd26d0  system-config-nfs-1.3.45.tar.bz2
+dd09ab8c3a639c73721849caf0630c2a  system-config-nfs-1.3.46.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- system-config-nfs.spec	26 Aug 2009 14:36:19 -0000	1.66
+++ system-config-nfs.spec	28 Aug 2009 12:44:26 -0000	1.67
@@ -8,7 +8,7 @@
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.45
+Version: 1.3.46
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -85,6 +85,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.3.46-1
+- use str instead of unicode as N_ implementation
+
 * Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.3.45-1
 - use gettext instead of rhpl
 



From than at fedoraproject.org  Fri Aug 28 12:45:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 12:45:28 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.91, 1.92 kdebase.spec, 1.387,
	1.388 sources, 1.114, 1.115
Message-ID: <20090828124528.5378611C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12463

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- .cvsignore	29 Jul 2009 22:17:30 -0000	1.91
+++ .cvsignore	28 Aug 2009 12:45:27 -0000	1.92
@@ -3,3 +3,4 @@ kdebase-4.2.95.tar.bz2
 kdebase-4.2.96.tar.bz2
 kdebase-4.2.98.tar.bz2
 kdebase-4.3.0.tar.bz2
+kdebase-4.3.1.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- kdebase.spec	25 Aug 2009 17:40:36 -0000	1.387
+++ kdebase.spec	28 Aug 2009 12:45:27 -0000	1.388
@@ -1,8 +1,8 @@
 
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -217,6 +217,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - kde-plasma-folderview subpkg
 - %%?_isa'ify -libs deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	29 Jul 2009 22:17:30 -0000	1.114
+++ sources	28 Aug 2009 12:45:28 -0000	1.115
@@ -1 +1 @@
-6de0b96b78504d8f5fcdee819d080fb1  kdebase-4.3.0.tar.bz2
+10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2



From nphilipp at fedoraproject.org  Fri Aug 28 12:47:32 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 12:47:32 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.71, 1.72 sources, 1.75,
	1.76 system-config-samba.spec, 1.80, 1.81
Message-ID: <20090828124732.320BB11C0044@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12970

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.79


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	26 Aug 2009 15:04:18 -0000	1.71
+++ .cvsignore	28 Aug 2009 12:47:31 -0000	1.72
@@ -1 +1 @@
-system-config-samba-1.2.78.tar.bz2
+system-config-samba-1.2.79.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	26 Aug 2009 15:04:18 -0000	1.75
+++ sources	28 Aug 2009 12:47:31 -0000	1.76
@@ -1 +1 @@
-94caa6dd58d19b5ba215d5ad0697ef31  system-config-samba-1.2.78.tar.bz2
+da371d62b3dd74b96c0319c1744698bb  system-config-samba-1.2.79.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- system-config-samba.spec	26 Aug 2009 15:04:19 -0000	1.80
+++ system-config-samba.spec	28 Aug 2009 12:47:31 -0000	1.81
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.78
+Version: 1.2.79
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -112,6 +112,9 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.79-1
+- use str instead of unicode as N_ implementation
+
 * Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.2.78-1
 - use gettext instead of rhpl
 



From mgieseki at fedoraproject.org  Fri Aug 28 12:49:25 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Fri, 28 Aug 2009 12:49:25 +0000 (UTC)
Subject: rpms/dvisvgm/devel .cvsignore, 1.2, 1.3 dvisvgm.spec, 1.1,
	1.2 sources, 1.2, 1.3 dvisvgm-0.8.1-potrace.patch, 1.1, NONE
Message-ID: <20090828124925.D05B611C0044@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13302

Modified Files:
	.cvsignore dvisvgm.spec sources 
Removed Files:
	dvisvgm-0.8.1-potrace.patch 
Log Message:
updated to upstream release 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 09:44:45 -0000	1.2
+++ .cvsignore	28 Aug 2009 12:49:25 -0000	1.3
@@ -1 +1 @@
-dvisvgm-0.8.1.tar.gz
+dvisvgm-0.8.3.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/dvisvgm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dvisvgm.spec	5 Aug 2009 09:44:45 -0000	1.1
+++ dvisvgm.spec	28 Aug 2009 12:49:25 -0000	1.2
@@ -1,20 +1,25 @@
 Name:           dvisvgm
-Version:        0.8.1
-Release:        4%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://dvisvgm.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Patch to use potrace library provided by separate package
-Patch0:         dvisvgm-0.8.1-potrace.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
-Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript
+BuildRequires:  automake freetype-devel ghostscript-devel potrace-devel zlib-devel 
+
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5
+BuildRequires:  tetex-fonts
+Requires:       tetex-fonts tetex-dvips
+%else
+BuildRequires:  kpathsea-devel
+Requires:       texlive-texmf texlive-dvips texlive-fonts
+%endif
+
 
 %description
 dvisvgm is a command line utility that converts DVI files, as created by 
@@ -28,13 +33,17 @@ so that the generated SVG is freely scal
 
 %prep
 %setup -q
-%patch0 -p 1 -b .orig
-autoreconf
 # Remove bundled potracelib
 rm -rf potracelib
+# Remove bundled Ghostscript API headers
+rm -f src/iapi.h src/ierrors.h
 
 
 %build
+# remove references to bundled potrace library
+sed -i "s/ potracelib\/Makefile / /" configure.ac
+sed -i "s/potracelib //" Makefile.am
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -50,12 +59,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
+- updated to latest upstream release
+- 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
+- adapted Build and BuildRequires to requirements of EL5
+
 * Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
 - removed bundled potrace library in prep section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 09:44:45 -0000	1.2
+++ sources	28 Aug 2009 12:49:25 -0000	1.3
@@ -1 +1 @@
-a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz
+76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz


--- dvisvgm-0.8.1-potrace.patch DELETED ---



From than at fedoraproject.org  Fri Aug 28 12:53:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 12:53:43 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.36,
	1.37 kdebase-runtime.spec, 1.135, 1.136 sources, 1.38,
	1.39 kdebase-runtime-4.3.1-comborender.patch, 1.1,
	NONE kdebase-runtime-4.3.1-fish.patch, 1.1,
	NONE kdebase-runtime-4.3.1-kcmlocalecrash.patch, 1.1, NONE
Message-ID: <20090828125343.D1AC311C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13988

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Removed Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-fish.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	29 Jul 2009 22:21:07 -0000	1.36
+++ .cvsignore	28 Aug 2009 12:53:43 -0000	1.37
@@ -3,3 +3,4 @@ kdebase-runtime-4.2.95.tar.bz2
 kdebase-runtime-4.2.96.tar.bz2
 kdebase-runtime-4.2.98.tar.bz2
 kdebase-runtime-4.3.0.tar.bz2
+kdebase-runtime-4.3.1.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.135
+++ kdebase-runtime.spec	28 Aug 2009 12:53:43 -0000	1.136
@@ -1,11 +1,11 @@
-%if 0%{?rhel} == 0
+%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       4%{?dist}
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,12 +23,6 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
-# http://websvn.kde.org/?view=rev&revision=1008050
-Patch5:        kdebase-runtime-4.3.1-comborender.patch
-#?http://websvn.kde.org/?view=rev&revision=1008861
-Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
-#?https://bugzilla.redhat.com/show_bug.cgi?id=516416
-Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -63,7 +57,7 @@ BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.3.0
-%if 0%{?rhel} == 0
+%if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
 %endif
 BuildRequires: xorg-x11-font-utils
@@ -224,6 +218,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.1
+
 * Wed Aug 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.0-4
 - unbreak fish kioslave protocol (#516416)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	4 Aug 2009 10:00:10 -0000	1.38
+++ sources	28 Aug 2009 12:53:43 -0000	1.39
@@ -1 +1 @@
-e4ea5d567187f4ac952c67326c5afd94  kdebase-runtime-4.3.0.tar.bz2
+e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2


--- kdebase-runtime-4.3.1-comborender.patch DELETED ---


--- kdebase-runtime-4.3.1-fish.patch DELETED ---


--- kdebase-runtime-4.3.1-kcmlocalecrash.patch DELETED ---



From than at fedoraproject.org  Fri Aug 28 12:54:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 12:54:57 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.136,1.137
Message-ID: <20090828125457.383B511C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14232

Modified Files:
	kdebase-runtime.spec 
Log Message:
4.3.1



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- kdebase-runtime.spec	28 Aug 2009 12:53:43 -0000	1.136
+++ kdebase-runtime.spec	28 Aug 2009 12:54:57 -0000	1.137
@@ -4,7 +4,7 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.0
+Version:       4.3.1
 Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy



From mgieseki at fedoraproject.org  Fri Aug 28 13:02:29 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Fri, 28 Aug 2009 13:02:29 +0000 (UTC)
Subject: rpms/dvisvgm/F-11 dvisvgm.spec, 1.1, 1.2 sources, 1.2,
	1.3 dvisvgm-0.8.1-potrace.patch, 1.1, NONE
Message-ID: <20090828130229.8AEE311C0044@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15519

Modified Files:
	dvisvgm.spec sources 
Removed Files:
	dvisvgm-0.8.1-potrace.patch 
Log Message:
updated to latest upstream release 0.8.3


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/dvisvgm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dvisvgm.spec	5 Aug 2009 10:04:40 -0000	1.1
+++ dvisvgm.spec	28 Aug 2009 13:02:29 -0000	1.2
@@ -1,20 +1,25 @@
 Name:           dvisvgm
-Version:        0.8.1
-Release:        4%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://dvisvgm.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Patch to use potrace library provided by separate package
-Patch0:         dvisvgm-0.8.1-potrace.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
-Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript
+BuildRequires:  automake freetype-devel ghostscript-devel potrace-devel zlib-devel 
+
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5
+BuildRequires:  tetex-fonts
+Requires:       tetex-fonts tetex-dvips
+%else
+BuildRequires:  kpathsea-devel
+Requires:       texlive-texmf texlive-dvips texlive-fonts
+%endif
+
 
 %description
 dvisvgm is a command line utility that converts DVI files, as created by 
@@ -28,13 +33,17 @@ so that the generated SVG is freely scal
 
 %prep
 %setup -q
-%patch0 -p 1 -b .orig
-autoreconf
 # Remove bundled potracelib
 rm -rf potracelib
+# Remove bundled Ghostscript API headers
+rm -f src/iapi.h src/ierrors.h
 
 
 %build
+# remove references to bundled potrace library
+sed -i "s/ potracelib\/Makefile / /" configure.ac
+sed -i "s/potracelib //" Makefile.am
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -50,12 +59,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
+- updated to latest upstream release
+- 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
+- adapted Build and BuildRequires to requirements of EL5
+
 * Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
 - removed bundled potrace library in prep section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 10:04:40 -0000	1.2
+++ sources	28 Aug 2009 13:02:29 -0000	1.3
@@ -1 +1 @@
-a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz
+76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz


--- dvisvgm-0.8.1-potrace.patch DELETED ---



From than at fedoraproject.org  Fri Aug 28 13:03:23 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 13:03:23 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore, 1.36,
	1.37 kdebase-workspace.spec, 1.276, 1.277 sources, 1.45, 1.46
Message-ID: <20090828130323.4499111C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15733

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	19 Aug 2009 16:06:22 -0000	1.36
+++ .cvsignore	28 Aug 2009 13:03:22 -0000	1.37
@@ -1 +1,2 @@
 kdebase-workspace-4.3.0.tar.bz2
+kdebase-workspace-4.3.1.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- kdebase-workspace.spec	28 Aug 2009 07:33:49 -0000	1.276
+++ kdebase-workspace.spec	28 Aug 2009 13:03:23 -0000	1.277
@@ -3,9 +3,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.0
+Version: 4.3.1
 
-Release: 102%{?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
@@ -570,6 +570,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.3.0-102
 - Fix typo
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	4 Aug 2009 09:57:57 -0000	1.45
+++ sources	28 Aug 2009 13:03:23 -0000	1.46
@@ -1 +1 @@
-e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2
+48e3674ddd75e63a9a2f405160d02d06  kdebase-workspace-4.3.1.tar.bz2



From ssp at fedoraproject.org  Fri Aug 28 13:05:06 2009
From: ssp at fedoraproject.org (Soren Sandmann Pedersen)
Date: Fri, 28 Aug 2009 13:05:06 +0000 (UTC)
Subject: rpms/pixman/devel .cvsignore, 1.27, 1.28 pixman.spec, 1.42,
	1.43 sources, 1.29, 1.30
Message-ID: <20090828130506.EF21111C0044@cvs1.fedora.phx.redhat.com>

Author: ssp

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16139

Modified Files:
	.cvsignore pixman.spec sources 
Log Message:
Pixman 0.16.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	11 Aug 2009 18:33:04 -0000	1.27
+++ .cvsignore	28 Aug 2009 13:05:06 -0000	1.28
@@ -1,3 +1,4 @@
 pixman-0.15.18.tar.bz2
 pixman-0.15.20.tar.gz
 pixman-0.15.20.tar.bz2
+pixman-0.16.0.tar.bz2


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- pixman.spec	11 Aug 2009 18:33:04 -0000	1.42
+++ pixman.spec	28 Aug 2009 13:05:06 -0000	1.43
@@ -2,7 +2,7 @@
 %define gitrev 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
 
 Name:           pixman
-Version:        0.15.20
+Version:        0.16.0
 Release:        1%{?dist}
 Summary:        Pixel manipulation library
 
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Mon Aug 28 2009 Soren Sandmann <ssp at redhat.com> - 0.16.0-1
+- pixman 0.16.0
+
 * Mon Aug 11 2009 Soren Sandmann <ssp at redhat.com> - 0.15.20-1
 - pixman 0.15.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	11 Aug 2009 18:33:04 -0000	1.29
+++ sources	28 Aug 2009 13:05:06 -0000	1.30
@@ -1,3 +1,4 @@
 87d256db0440e579f113cd4fb67cbfb0  pixman-0.15.18.tar.bz2
 613c95e7ddc8069b7aa2708f93219b7d  pixman-0.15.20.tar.gz
 8cca7bdf45bd3c31cf95ecea0f05bddc  pixman-0.15.20.tar.bz2
+183dea8a100c1d9732cdb2146ec90f68  pixman-0.16.0.tar.bz2



From mgieseki at fedoraproject.org  Fri Aug 28 13:07:22 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Fri, 28 Aug 2009 13:07:22 +0000 (UTC)
Subject: rpms/dvisvgm/F-10 dvisvgm.spec, 1.1, 1.2 sources, 1.2,
	1.3 dvisvgm-0.8.1-potrace.patch, 1.1, NONE
Message-ID: <20090828130722.6BAD611C0044@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17300

Modified Files:
	dvisvgm.spec sources 
Removed Files:
	dvisvgm-0.8.1-potrace.patch 
Log Message:
updated to the latest upstream release 0.8.3


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/dvisvgm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dvisvgm.spec	5 Aug 2009 10:04:39 -0000	1.1
+++ dvisvgm.spec	28 Aug 2009 13:07:22 -0000	1.2
@@ -1,20 +1,25 @@
 Name:           dvisvgm
-Version:        0.8.1
-Release:        4%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://dvisvgm.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Patch to use potrace library provided by separate package
-Patch0:         dvisvgm-0.8.1-potrace.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake kpathsea-devel freetype-devel potrace-devel zlib-devel 
-Requires:       texlive-texmf texlive-dvips texlive-fonts ghostscript
+BuildRequires:  automake freetype-devel ghostscript-devel potrace-devel zlib-devel 
+
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5
+BuildRequires:  tetex-fonts
+Requires:       tetex-fonts tetex-dvips
+%else
+BuildRequires:  kpathsea-devel
+Requires:       texlive-texmf texlive-dvips texlive-fonts
+%endif
+
 
 %description
 dvisvgm is a command line utility that converts DVI files, as created by 
@@ -28,13 +33,17 @@ so that the generated SVG is freely scal
 
 %prep
 %setup -q
-%patch0 -p 1 -b .orig
-autoreconf
 # Remove bundled potracelib
 rm -rf potracelib
+# Remove bundled Ghostscript API headers
+rm -f src/iapi.h src/ierrors.h
 
 
 %build
+# remove references to bundled potrace library
+sed -i "s/ potracelib\/Makefile / /" configure.ac
+sed -i "s/potracelib //" Makefile.am
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -50,12 +59,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
+- updated to latest upstream release
+- 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
+- adapted Build and BuildRequires to requirements of EL5
+
 * Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
 - removed bundled potrace library in prep section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 10:04:39 -0000	1.2
+++ sources	28 Aug 2009 13:07:22 -0000	1.3
@@ -1 +1 @@
-a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz
+76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz


--- dvisvgm-0.8.1-potrace.patch DELETED ---



From than at fedoraproject.org  Fri Aug 28 13:10:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 13:10:04 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.61, 1.62 kdebindings.spec,
	1.234, 1.235 sources, 1.70, 1.71
Message-ID: <20090828131004.A80D511C0496@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17212

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	29 Jul 2009 22:37:43 -0000	1.61
+++ .cvsignore	28 Aug 2009 13:10:04 -0000	1.62
@@ -3,3 +3,4 @@ kdebindings-4.2.95.tar.bz2
 kdebindings-4.2.96.tar.bz2
 kdebindings-4.2.98.tar.bz2
 kdebindings-4.3.0.tar.bz2
+kdebindings-4.3.1.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- kdebindings.spec	17 Aug 2009 17:42:10 -0000	1.234
+++ kdebindings.spec	28 Aug 2009 13:10:04 -0000	1.235
@@ -28,8 +28,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.0
-Release: 5%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -507,6 +507,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Mon Aug 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-5
 - re-enable php bindings (rawhide)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	3 Aug 2009 10:30:04 -0000	1.70
+++ sources	28 Aug 2009 13:10:04 -0000	1.71
@@ -1 +1 @@
-6ef02ed3c958d918eed32ddf4034e40d  kdebindings-4.3.0.tar.bz2
+6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2



From mgieseki at fedoraproject.org  Fri Aug 28 13:11:56 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Fri, 28 Aug 2009 13:11:56 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 dvisvgm.spec, 1.3, 1.4 sources, 1.2,
	1.3 dvisvgm-0.8.1-potrace.patch, 1.1, NONE
Message-ID: <20090828131156.C97C311C0044@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18148

Modified Files:
	dvisvgm.spec sources 
Removed Files:
	dvisvgm-0.8.1-potrace.patch 
Log Message:
updated to latest upstream release 0.8.3


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/dvisvgm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dvisvgm.spec	12 Aug 2009 13:11:00 -0000	1.3
+++ dvisvgm.spec	28 Aug 2009 13:11:56 -0000	1.4
@@ -1,20 +1,25 @@
 Name:           dvisvgm
-Version:        0.8.1
-Release:        5%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://dvisvgm.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Patch to use potrace library provided by separate package
-Patch0:         dvisvgm-0.8.1-potrace.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake tetex-fonts freetype-devel potrace-devel zlib-devel 
-Requires:       tetex tetex-dvips tetex-fonts ghostscript
+BuildRequires:  automake freetype-devel ghostscript-devel potrace-devel zlib-devel 
+
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5
+BuildRequires:  tetex-fonts
+Requires:       tetex-fonts tetex-dvips
+%else
+BuildRequires:  kpathsea-devel
+Requires:       texlive-texmf texlive-dvips texlive-fonts
+%endif
+
 
 %description
 dvisvgm is a command line utility that converts DVI files, as created by 
@@ -28,13 +33,17 @@ so that the generated SVG is freely scal
 
 %prep
 %setup -q
-%patch0 -p 1 -b .orig
-autoreconf
 # Remove bundled potracelib
 rm -rf potracelib
+# Remove bundled Ghostscript API headers
+rm -f src/iapi.h src/ierrors.h
 
 
 %build
+# remove references to bundled potrace library
+sed -i "s/ potracelib\/Makefile / /" configure.ac
+sed -i "s/potracelib //" Makefile.am
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -50,14 +59,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
-* Tue Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5
-- adapted Requires and BuildRequires to RH5
+* Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
+- updated to latest upstream release
+- 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
+- adapted Build and BuildRequires to requirements of EL5
 
 * Tue Aug 03 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-4
 - removed bundled potrace library in prep section


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 10:04:39 -0000	1.2
+++ sources	28 Aug 2009 13:11:56 -0000	1.3
@@ -1 +1 @@
-a8b5392fb4230a4cde31d219742c557f  dvisvgm-0.8.1.tar.gz
+76ecb617a7f14d52c60f68e65509b25b  dvisvgm-0.8.3.tar.gz


--- dvisvgm-0.8.1-potrace.patch DELETED ---



From than at fedoraproject.org  Fri Aug 28 13:18:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 13:18:33 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.68, 1.69 kdeedu.spec, 1.203,
	1.204 sources, 1.70, 1.71
Message-ID: <20090828131833.8DF2211C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19179

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	29 Jul 2009 22:51:49 -0000	1.68
+++ .cvsignore	28 Aug 2009 13:18:32 -0000	1.69
@@ -3,3 +3,4 @@ kdeedu-4.2.95.tar.bz2
 kdeedu-4.2.96.tar.bz2
 kdeedu-4.2.98.tar.bz2
 kdeedu-4.3.0.tar.bz2
+kdeedu-4.3.1.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- kdeedu.spec	23 Aug 2009 18:47:46 -0000	1.203
+++ kdeedu.spec	28 Aug 2009 13:18:32 -0000	1.204
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.0
-Release: 6%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -480,6 +480,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-6
 - -kstars-libs subpkg, make -kstars not multilib'd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	29 Jul 2009 22:51:49 -0000	1.70
+++ sources	28 Aug 2009 13:18:32 -0000	1.71
@@ -1 +1 @@
-4c309bcdc47274cea6f61206a42ef638  kdeedu-4.3.0.tar.bz2
+f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Aug 28 13:29:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 13:29:02 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore, 1.70, 1.71 kdegames.spec, 1.142,
	1.143 sources, 1.74, 1.75
Message-ID: <20090828132902.59FE711C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20709

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	29 Jul 2009 22:54:16 -0000	1.70
+++ .cvsignore	28 Aug 2009 13:29:02 -0000	1.71
@@ -3,3 +3,4 @@ kdegames-4.2.95.tar.bz2
 kdegames-4.2.96.tar.bz2
 kdegames-4.2.98.tar.bz2
 kdegames-4.3.0.tar.bz2
+kdegames-4.3.1.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- kdegames.spec	5 Aug 2009 15:53:26 -0000	1.142
+++ kdegames.spec	28 Aug 2009 13:29:02 -0000	1.143
@@ -1,8 +1,8 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -207,6 +207,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - Conflicts: kdegames3 < 3.5.10-6
 - %%check: desktop-file-validate


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	29 Jul 2009 22:54:16 -0000	1.74
+++ sources	28 Aug 2009 13:29:02 -0000	1.75
@@ -1 +1 @@
-9997c1fab82519ebc59e661c4324fa0a  kdegames-4.3.0.tar.bz2
+dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2



From caolanm at fedoraproject.org  Fri Aug 28 13:40:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 28 Aug 2009 13:40:20 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 openoffice.org.spec,1.1931,1.1932
Message-ID: <20090828134020.B3DBF11C0496@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-serv23184

Modified Files:
	openoffice.org.spec 
Log Message:
forgot about new library


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1931
retrieving revision 1.1932
diff -u -p -r1.1931 -r1.1932
--- openoffice.org.spec	28 Aug 2009 09:43:31 -0000	1.1931
+++ openoffice.org.spec	28 Aug 2009 13:40:20 -0000	1.1932
@@ -2997,6 +2997,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/libfwm%{SOPOST}.so
 %{basisinstdir}/program/libgo%{SOPOST}.so
 %{basisinstdir}/program/libi18nisolang*.so
+%{basisinstdir}/program/libi18npaper*.so
 %{basisinstdir}/program/libi18nutilgcc3.so
 %{basisinstdir}/program/libj%{SOPOST}_g.so
 %{basisinstdir}/program/libpackage2.so



From than at fedoraproject.org  Fri Aug 28 13:41:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 13:41:16 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.65, 1.66 kdegraphics.spec,
	1.211, 1.212 sources, 1.71, 1.72
Message-ID: <20090828134116.8CE8911C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23392

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	29 Jul 2009 22:57:57 -0000	1.65
+++ .cvsignore	28 Aug 2009 13:41:16 -0000	1.66
@@ -3,3 +3,4 @@ kdegraphics-4.2.95.tar.bz2
 kdegraphics-4.2.96.tar.bz2
 kdegraphics-4.2.98.tar.bz2
 kdegraphics-4.3.0.tar.bz2
+kdegraphics-4.3.1.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- kdegraphics.spec	29 Jul 2009 22:57:57 -0000	1.211
+++ kdegraphics.spec	28 Aug 2009 13:41:16 -0000	1.212
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	29 Jul 2009 22:57:57 -0000	1.71
+++ sources	28 Aug 2009 13:41:16 -0000	1.72
@@ -1 +1 @@
-5d3838a2575a82777f00ced90332c41a  kdegraphics-4.3.0.tar.bz2
+1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2



From ivazquez at fedoraproject.org  Fri Aug 28 13:56:33 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Fri, 28 Aug 2009 13:56:33 +0000 (UTC)
Subject: rpms/pywebkitgtk/devel pywebkitgtk.spec,1.10,1.11
Message-ID: <20090828135633.DD0BE11C0044@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/pywebkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25673

Modified Files:
	pywebkitgtk.spec 
Log Message:
Added .pth for webkit-1.0


Index: pywebkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/devel/pywebkitgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pywebkitgtk.spec	27 Aug 2009 01:17:59 -0000	1.10
+++ pywebkitgtk.spec	28 Aug 2009 13:56:33 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           pywebkitgtk
 Version:        1.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python Bindings for WebKit-gtk
 
 Group:          Development/Languages
@@ -33,6 +33,9 @@ make %{?_smp_mflags} PYGTK_CODEGEN=pygob
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT \( -name \*.la -o -name \*.a \) -exec rm {} \;
+cat > $RPM_BUILD_ROOT%{python_sitearch}/webkit-1.0.pth << EOF
+webkit-1.0
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,8 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README demos
 %{_datadir}/pywebkitgtk/defs/webkit-*.defs
 %{python_sitearch}/webkit-1.0
+%{python_sitearch}/webkit-1.0.pth
 
 %changelog
+* Fri Aug 28 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-2
+- Added .pth for webkit-1.0
+
 * Wed Aug 26 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-1
 - Updated to 1.1.6
 



From than at fedoraproject.org  Fri Aug 28 14:14:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 14:14:08 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.77, 1.78 kdelibs.spec, 1.507,
	1.508 sources, 1.94, 1.95 kdelibs-4.3.1-copyrename.patch, 1.1,
	NONE kdelibs-4.3.1-copyurls.patch, 1.1,
	NONE kdelibs-4.3.1-kdebug#199557.patch, 1.1,
	NONE kdelibs-4.3.1-kdebug#202550.patch, 1.1,
	NONE kdelibs-4.3.1-toolbarEditCrash.patch, 1.1,
	NONE kdelibs-4.3.1-unmountfix.patch, 1.1, NONE
Message-ID: <20090828141408.C5E5411C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29174

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.1-copyrename.patch kdelibs-4.3.1-copyurls.patch 
	kdelibs-4.3.1-kdebug#199557.patch 
	kdelibs-4.3.1-kdebug#202550.patch 
	kdelibs-4.3.1-toolbarEditCrash.patch 
	kdelibs-4.3.1-unmountfix.patch 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	29 Jul 2009 23:05:01 -0000	1.77
+++ .cvsignore	28 Aug 2009 14:14:08 -0000	1.78
@@ -1,2 +1,3 @@
 kdelibs-4.2.98.tar.bz2
 kdelibs-4.3.0.tar.bz2
+kdelibs-4.3.1.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- kdelibs.spec	26 Aug 2009 17:17:40 -0000	1.507
+++ kdelibs.spec	28 Aug 2009 14:14:08 -0000	1.508
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.0
-Release: 8%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,17 +83,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
-# http://bugs.kde.org/202550
-Patch100: kdelibs-4.3.1-kdebug#202550.patch
-# http://bugs.kde.org/199557
-Patch101: kdelibs-4.3.1-kdebug#199557.patch
-Patch102: kdelibs-4.3.1-unmountfix.patch
-# http://bugs.kde.org/170608
-Patch103: kdelibs-4.3.1-copyurls.patch
-#?http://bugs.kde.org/195385
-Patch104: kdelibs-4.3.1-copyrename.patch
-#?http://bugs.kde.org/200815
-Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 Patch106: kdelibs-4.3.1-buildsys_phonon.patch
 
 BuildRequires: qt4-devel >= 4.5.0
@@ -230,12 +219,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
-%patch100 -p4 -b .kdebug#202550
-%patch101 -p4 -b .kdebug#199557
-%patch102 -p0 -b .unmountfix
-%patch103 -p0 -b .copyurls
-%patch104 -p0 -b .copyrename
-%patch105 -p0 -b .toolbarEditCrash
 %patch106 -p1 -b .buildsys_phonon
 
 
@@ -419,6 +402,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
 - BR: xz-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	29 Jul 2009 23:05:01 -0000	1.94
+++ sources	28 Aug 2009 14:14:08 -0000	1.95
@@ -1 +1 @@
-ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2
+df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2


--- kdelibs-4.3.1-copyrename.patch DELETED ---


--- kdelibs-4.3.1-copyurls.patch DELETED ---


--- kdelibs-4.3.1-kdebug#199557.patch DELETED ---


--- kdelibs-4.3.1-kdebug#202550.patch DELETED ---


--- kdelibs-4.3.1-toolbarEditCrash.patch DELETED ---


--- kdelibs-4.3.1-unmountfix.patch DELETED ---



From ivazquez at fedoraproject.org  Fri Aug 28 14:15:02 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Fri, 28 Aug 2009 14:15:02 +0000 (UTC)
Subject: rpms/pywebkitgtk/F-11 .cvsignore, 1.3, 1.4 pywebkitgtk.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <20090828141502.5201111C0044@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/pywebkitgtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29316

Modified Files:
	.cvsignore pywebkitgtk.spec sources 
Log Message:
* Fri Aug 28 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-2
- Added .pth for webkit-1.0

* Wed Aug 26 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-1
- Updated to 1.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 06:20:31 -0000	1.3
+++ .cvsignore	28 Aug 2009 14:15:02 -0000	1.4
@@ -1 +1 @@
-pywebkitgtk-1.0.1.tar.gz
+pywebkitgtk-1.1.6.tar.gz


Index: pywebkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/F-11/pywebkitgtk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pywebkitgtk.spec	8 Mar 2009 20:28:02 -0000	1.8
+++ pywebkitgtk.spec	28 Aug 2009 14:15:02 -0000	1.9
@@ -1,15 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pywebkitgtk
-Version:        1.0.1
-Release:        6%{?dist}
+Version:        1.1.6
+Release:        2%{?dist}
 Summary:        Python Bindings for WebKit-gtk
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://code.google.com/p/pywebkitgtk/
 Source0:        http://pywebkitgtk.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         pywebkitgtk-python26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildArch:      
@@ -24,7 +23,6 @@ that they can access to using the Python
 
 %prep
 %setup -q
-%patch0 -p1
 chmod -x demos/*
 
 %build
@@ -34,7 +32,10 @@ make %{?_smp_mflags} PYGTK_CODEGEN=pygob
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
+find $RPM_BUILD_ROOT \( -name \*.la -o -name \*.a \) -exec rm {} \;
+cat > $RPM_BUILD_ROOT%{python_sitearch}/webkit-1.0.pth << EOF
+webkit-1.0
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,10 +43,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README demos
-%{_datadir}/pygtk/2.0/defs/webkit.defs
-%{python_sitearch}/gtk-2.0/*
+%{_datadir}/pywebkitgtk/defs/webkit-*.defs
+%{python_sitearch}/webkit-1.0
+%{python_sitearch}/webkit-1.0.pth
 
 %changelog
+* Fri Aug 28 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-2
+- Added .pth for webkit-1.0
+
+* Wed Aug 26 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.1.6-1
+- Updated to 1.1.6
+
 * Sun Mar 08 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org>
 - Rebuilt for soname bump for webkitgtk+
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebkitgtk/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Aug 2008 06:20:31 -0000	1.3
+++ sources	28 Aug 2009 14:15:02 -0000	1.4
@@ -1 +1 @@
-26343c95f3f381a7f4f6e1cb63ce237d  pywebkitgtk-1.0.1.tar.gz
+883f3d7386d29b6c0d00155329041854  pywebkitgtk-1.1.6.tar.gz



From nphilipp at fedoraproject.org  Fri Aug 28 14:18:37 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 14:18:37 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.102, 1.103 sources,
	1.112, 1.113
Message-ID: <20090828141837.BE21911C0044@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-serv32066

Modified Files:
	.cvsignore sources 
Log Message:
version 1.9.44


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	28 Aug 2009 12:39:53 -0000	1.102
+++ .cvsignore	28 Aug 2009 14:18:37 -0000	1.103
@@ -1 +1 @@
-system-config-date-1.9.43.tar.bz2
+system-config-date-1.9.44.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	28 Aug 2009 12:39:53 -0000	1.112
+++ sources	28 Aug 2009 14:18:37 -0000	1.113
@@ -1 +1 @@
-7c85be558ca3c1865ae24bc2a636bea4  system-config-date-1.9.43.tar.bz2
+5dc90b8ad41fc2b8b5184d4ad4425ba9  system-config-date-1.9.44.tar.bz2



From than at fedoraproject.org  Fri Aug 28 14:24:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 14:24:08 +0000 (UTC)
Subject: rpms/kdelibs-experimental/devel .cvsignore, 1.7,
	1.8 kdelibs-experimental.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090828142408.884E511C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs-experimental/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3545

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Jul 2009 23:07:02 -0000	1.7
+++ .cvsignore	28 Aug 2009 14:24:07 -0000	1.8
@@ -3,3 +3,4 @@ kdelibs-experimental-4.2.95.tar.bz2
 kdelibs-experimental-4.2.96.tar.bz2
 kdelibs-experimental-4.2.98.tar.bz2
 kdelibs-experimental-4.3.0.tar.bz2
+kdelibs-experimental-4.3.1.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/kdelibs-experimental.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kdelibs-experimental.spec	29 Jul 2009 23:07:02 -0000	1.10
+++ kdelibs-experimental.spec	28 Aug 2009 14:24:08 -0000	1.11
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Jul 2009 23:07:02 -0000	1.7
+++ sources	28 Aug 2009 14:24:08 -0000	1.8
@@ -1 +1 @@
-9b3ed689f4f357d4fc059cf9dd41e035  kdelibs-experimental-4.3.0.tar.bz2
+2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2



From nphilipp at fedoraproject.org  Fri Aug 28 14:25:18 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 14:25:18 +0000 (UTC)
Subject: rpms/system-config-date/devel system-config-date.spec,1.120,1.121
Message-ID: <20090828142518.9D16E11C0044@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-serv4574

Modified Files:
	system-config-date.spec 
Log Message:
version 1.9.44


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- system-config-date.spec	28 Aug 2009 12:39:53 -0000	1.120
+++ system-config-date.spec	28 Aug 2009 14:25:18 -0000	1.121
@@ -14,7 +14,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.43
+Version: 1.9.44
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -123,6 +123,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/dateconfig
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.44-1
+- don't unnecessarily initialize gettext
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.9.43-1
 - use str instead of unicode as N_ implementation
 



From wtogami at fedoraproject.org  Fri Aug 28 14:26:58 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 28 Aug 2009 14:26:58 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.102,1.103
Message-ID: <20090828142658.E0F6F11C0044@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5908

Modified Files:
	nss.spec 
Log Message:
caolan's nss.pc patch



Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- nss.spec	28 Aug 2009 05:42:50 -0000	1.102
+++ nss.spec	28 Aug 2009 14:26:58 -0000	1.103
@@ -4,11 +4,13 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          23%{?dist}
+Release:          24%{?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}
+# FIXME: Due to nss.pc.in substitutions in the %%build section, these Requires must
+# be exactly matching versions?
 Requires:         nss-util >= %{version}
 Requires:         nss-softokn >= %{version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
@@ -145,8 +147,10 @@ export USE_64
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
+                          -e "s,%%NSS_VERSION%%,%{version},g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%NSS_VERSION%%,%{version},g" > \
+                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" \
+                          -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
                           ./mozilla/dist/pkgconfig/nss.pc
 
 NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
@@ -436,6 +440,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Fri Aug 28 2009 Warren Togami <wtogami at redhat.com> - 3.12.3.99.3-24
+- caolan's nss.pc patch
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-23
 - Bump the release number for a chained build of nss-util, nss-softokn and nss
 



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:31 +0000
Subject: [pkgdb] python-werkzeug was added for hoangelos
Message-ID: <20090828142831.D812210F877@bastion2.fedora.phx.redhat.com>

tibbs has added Package python-werkzeug with summary The Swiss Army knife of Python web development
tibbs has approved Package python-werkzeug
tibbs has added a Fedora devel branch for python-werkzeug with an owner of hoangelos
tibbs has approved python-werkzeug in Fedora devel
tibbs has approved Package python-werkzeug
tibbs has set commit to Approved for 107427 on python-werkzeug (Fedora devel)
tibbs has set checkout to Approved for 107427 on python-werkzeug (Fedora devel)
tibbs has set build to Approved for 107427 on python-werkzeug (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:32 +0000
Subject: [pkgdb] python-werkzeug summary updated by tibbs
Message-ID: <20090828142833.0BF6110F87C@bastion2.fedora.phx.redhat.com>

tibbs set package python-werkzeug summary to The Swiss Army knife of Python web development

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:32 +0000
Subject: [pkgdb] python-werkzeug (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828142833.199B710F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-werkzeug
tibbs has set commit to Approved for 107427 on python-werkzeug (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on python-werkzeug (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on python-werkzeug (Fedora EPEL 5)
tibbs approved watchbugzilla on python-werkzeug (Fedora EPEL 5) for hoangelos
tibbs approved watchcommits on python-werkzeug (Fedora EPEL 5) for hoangelos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:32 +0000
Subject: [pkgdb] python-werkzeug (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828142833.1070910F884@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for python-werkzeug
tibbs has set commit to Approved for 107427 on python-werkzeug (Fedora 11)
tibbs has set checkout to Approved for 107427 on python-werkzeug (Fedora 11)
tibbs has set build to Approved for 107427 on python-werkzeug (Fedora 11)
tibbs approved watchbugzilla on python-werkzeug (Fedora 11) for hoangelos
tibbs approved watchcommits on python-werkzeug (Fedora 11) for hoangelos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:32 +0000
Subject: [pkgdb] python-werkzeug (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828142833.231AD10F897@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for python-werkzeug
tibbs has set commit to Approved for 107427 on python-werkzeug (Fedora 10)
tibbs has set checkout to Approved for 107427 on python-werkzeug (Fedora 10)
tibbs has set build to Approved for 107427 on python-werkzeug (Fedora 10)
tibbs approved watchbugzilla on python-werkzeug (Fedora 10) for hoangelos
tibbs approved watchcommits on python-werkzeug (Fedora 10) for hoangelos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:33 +0000
Subject: [pkgdb] python-werkzeug (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828142833.2B01C10F89A@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on python-werkzeug (Fedora devel) for hoangelos
tibbs approved watchcommits on python-werkzeug (Fedora devel) for hoangelos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From pkgdb at fedoraproject.org  Fri Aug 28 14:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:28:33 +0000
Subject: [pkgdb] python-werkzeug (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828142833.36A9110F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 4 branch for python-werkzeug
tibbs has set commit to Approved for 107427 on python-werkzeug (Fedora EPEL 4)
tibbs has set checkout to Approved for 107427 on python-werkzeug (Fedora EPEL 4)
tibbs has set build to Approved for 107427 on python-werkzeug (Fedora EPEL 4)
tibbs approved watchbugzilla on python-werkzeug (Fedora EPEL 4) for hoangelos
tibbs approved watchcommits on python-werkzeug (Fedora EPEL 4) for hoangelos

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-werkzeug



From tibbs at fedoraproject.org  Fri Aug 28 14:28:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:28:40 +0000 (UTC)
Subject: rpms/python-werkzeug - New directory
Message-ID: <20090828142840.3A25311C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-werkzeug
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvskX7384/rpms/python-werkzeug

Log Message:
Directory /cvs/pkgs/rpms/python-werkzeug added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:28:40 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:28:40 +0000 (UTC)
Subject: rpms/python-werkzeug/devel - New directory
Message-ID: <20090828142840.63A7511C0077@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-werkzeug/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvskX7384/rpms/python-werkzeug/devel

Log Message:
Directory /cvs/pkgs/rpms/python-werkzeug/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:28:46 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:28:46 +0000 (UTC)
Subject: rpms/python-werkzeug Makefile,NONE,1.1
Message-ID: <20090828142846.B775211C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-werkzeug
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvskX7384/rpms/python-werkzeug

Added Files:
	Makefile 
Log Message:
Setup of module python-werkzeug


--- NEW FILE Makefile ---
# Top level Makefile for module python-werkzeug
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:28:47 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:28:47 +0000 (UTC)
Subject: rpms/python-werkzeug/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828142847.109EA11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/python-werkzeug/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvskX7384/rpms/python-werkzeug/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-werkzeug


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-werkzeug
# $Id: Makefile,v 1.1 2009/08/28 14:28:46 tibbs Exp $
NAME := python-werkzeug
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From nphilipp at fedoraproject.org  Fri Aug 28 14:29:01 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 14:29:01 +0000 (UTC)
Subject: rpms/system-config-nfs/devel .cvsignore, 1.52, 1.53 sources, 1.60, 
	1.61 system-config-nfs.spec, 1.67, 1.68
Message-ID: <20090828142901.3EA0311C0044@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7961

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
version 1.3.47


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	28 Aug 2009 12:44:26 -0000	1.52
+++ .cvsignore	28 Aug 2009 14:29:01 -0000	1.53
@@ -1 +1 @@
-system-config-nfs-1.3.46.tar.bz2
+system-config-nfs-1.3.47.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	28 Aug 2009 12:44:26 -0000	1.60
+++ sources	28 Aug 2009 14:29:01 -0000	1.61
@@ -1 +1 @@
-dd09ab8c3a639c73721849caf0630c2a  system-config-nfs-1.3.46.tar.bz2
+55be4f7f07f35eb09f13790b55964ce6  system-config-nfs-1.3.47.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- system-config-nfs.spec	28 Aug 2009 12:44:26 -0000	1.67
+++ system-config-nfs.spec	28 Aug 2009 14:29:01 -0000	1.68
@@ -8,7 +8,7 @@
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.46
+Version: 1.3.47
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -85,6 +85,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.3.47-1
+- don't unnecessarily initialize gettext
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.3.46-1
 - use str instead of unicode as N_ implementation
 



From pkgdb at fedoraproject.org  Fri Aug 28 14:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:30:36 +0000
Subject: [pkgdb] ghc-X11-xft was added for zoglesby
Message-ID: <20090828143036.3649A10F884@bastion2.fedora.phx.redhat.com>

tibbs has added Package ghc-X11-xft with summary Haskell binding to Xft
tibbs has approved Package ghc-X11-xft
tibbs has added a Fedora devel branch for ghc-X11-xft with an owner of zoglesby
tibbs has approved ghc-X11-xft in Fedora devel
tibbs has approved Package ghc-X11-xft
tibbs has set commit to Approved for 107427 on ghc-X11-xft (Fedora devel)
tibbs has set checkout to Approved for 107427 on ghc-X11-xft (Fedora devel)
tibbs has set build to Approved for 107427 on ghc-X11-xft (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11-xft



From pkgdb at fedoraproject.org  Fri Aug 28 14:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:30:38 +0000
Subject: [pkgdb] ghc-X11-xft summary updated by tibbs
Message-ID: <20090828143038.3859E10F890@bastion2.fedora.phx.redhat.com>

tibbs set package ghc-X11-xft summary to Haskell binding to Xft

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11-xft



From pkgdb at fedoraproject.org  Fri Aug 28 14:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:30:38 +0000
Subject: [pkgdb] ghc-X11-xft (Fedora, 11) updated by tibbs
Message-ID: <20090828143038.47F1C10F899@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on ghc-X11-xft (Fedora devel) for haskell-sig
tibbs approved watchcommits on ghc-X11-xft (Fedora devel) for haskell-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11-xft



From pkgdb at fedoraproject.org  Fri Aug 28 14:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:30:38 +0000
Subject: [pkgdb] ghc-X11-xft (Fedora, 11) updated by tibbs
Message-ID: <20090828143038.7197210F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ghc-X11-xft
tibbs has set commit to Approved for 107427 on ghc-X11-xft (Fedora 11)
tibbs has set checkout to Approved for 107427 on ghc-X11-xft (Fedora 11)
tibbs has set build to Approved for 107427 on ghc-X11-xft (Fedora 11)
tibbs approved watchbugzilla on ghc-X11-xft (Fedora 11) for haskell-sig
tibbs approved watchcommits on ghc-X11-xft (Fedora 11) for haskell-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11-xft



From pkgdb at fedoraproject.org  Fri Aug 28 14:30:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:30:38 +0000
Subject: [pkgdb] ghc-X11-xft (Fedora, 11) updated by tibbs
Message-ID: <20090828143038.7887010F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for ghc-X11-xft
tibbs has set commit to Approved for 107427 on ghc-X11-xft (Fedora 10)
tibbs has set checkout to Approved for 107427 on ghc-X11-xft (Fedora 10)
tibbs has set build to Approved for 107427 on ghc-X11-xft (Fedora 10)
tibbs approved watchbugzilla on ghc-X11-xft (Fedora 10) for haskell-sig
tibbs approved watchcommits on ghc-X11-xft (Fedora 10) for haskell-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-X11-xft



From tibbs at fedoraproject.org  Fri Aug 28 14:30:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:30:51 +0000 (UTC)
Subject: rpms/ghc-X11-xft - New directory
Message-ID: <20090828143051.557C311C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-X11-xft
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLz9542/rpms/ghc-X11-xft

Log Message:
Directory /cvs/pkgs/rpms/ghc-X11-xft added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:30:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:30:51 +0000 (UTC)
Subject: rpms/ghc-X11-xft/devel - New directory
Message-ID: <20090828143051.9192F11C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-X11-xft/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLz9542/rpms/ghc-X11-xft/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-X11-xft/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:31:00 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:31:00 +0000 (UTC)
Subject: rpms/ghc-X11-xft Makefile,NONE,1.1
Message-ID: <20090828143100.92A1611C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-X11-xft
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLz9542/rpms/ghc-X11-xft

Added Files:
	Makefile 
Log Message:
Setup of module ghc-X11-xft


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-X11-xft
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:31:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:31:01 +0000 (UTC)
Subject: rpms/ghc-X11-xft/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828143101.1F10C11C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-X11-xft/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsLz9542/rpms/ghc-X11-xft/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-X11-xft


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-X11-xft
# $Id: Makefile,v 1.1 2009/08/28 14:31:00 tibbs Exp $
NAME := ghc-X11-xft
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 28 14:32:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:32:11 +0000
Subject: [pkgdb] dzen2 was added for till
Message-ID: <20090828143211.7815F10F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package dzen2 with summary A general purpose messaging and notification program
tibbs has approved Package dzen2
tibbs has added a Fedora devel branch for dzen2 with an owner of till
tibbs has approved dzen2 in Fedora devel
tibbs has approved Package dzen2
tibbs has set commit to Approved for 107427 on dzen2 (Fedora devel)
tibbs has set checkout to Approved for 107427 on dzen2 (Fedora devel)
tibbs has set build to Approved for 107427 on dzen2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dzen2



From pkgdb at fedoraproject.org  Fri Aug 28 14:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:32:12 +0000
Subject: [pkgdb] dzen2 summary updated by tibbs
Message-ID: <20090828143212.BEE6510F87C@bastion2.fedora.phx.redhat.com>

tibbs set package dzen2 summary to A general purpose messaging and notification program

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dzen2



From pkgdb at fedoraproject.org  Fri Aug 28 14:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:32:12 +0000
Subject: [pkgdb] dzen2 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828143212.C8C6910F88C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for dzen2
tibbs has set commit to Approved for 107427 on dzen2 (Fedora 11)
tibbs has set checkout to Approved for 107427 on dzen2 (Fedora 11)
tibbs has set build to Approved for 107427 on dzen2 (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dzen2



From pkgdb at fedoraproject.org  Fri Aug 28 14:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:32:12 +0000
Subject: [pkgdb] dzen2 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828143212.DA34310F897@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for dzen2
tibbs has set commit to Approved for 107427 on dzen2 (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on dzen2 (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on dzen2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dzen2



From pkgdb at fedoraproject.org  Fri Aug 28 14:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:32:12 +0000
Subject: [pkgdb] dzen2 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828143213.059EC10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for dzen2
tibbs has set commit to Approved for 107427 on dzen2 (Fedora 10)
tibbs has set checkout to Approved for 107427 on dzen2 (Fedora 10)
tibbs has set build to Approved for 107427 on dzen2 (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/dzen2



From tibbs at fedoraproject.org  Fri Aug 28 14:32:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:32:19 +0000 (UTC)
Subject: rpms/dzen2 - New directory
Message-ID: <20090828143219.1F8C111C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dzen2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse11005/rpms/dzen2

Log Message:
Directory /cvs/pkgs/rpms/dzen2 added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:32:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:32:19 +0000 (UTC)
Subject: rpms/dzen2/devel - New directory
Message-ID: <20090828143219.4E16B11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dzen2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse11005/rpms/dzen2/devel

Log Message:
Directory /cvs/pkgs/rpms/dzen2/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:32:25 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:32:25 +0000 (UTC)
Subject: rpms/dzen2 Makefile,NONE,1.1
Message-ID: <20090828143225.B2F9411C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dzen2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse11005/rpms/dzen2

Added Files:
	Makefile 
Log Message:
Setup of module dzen2


--- NEW FILE Makefile ---
# Top level Makefile for module dzen2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:32:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:32:26 +0000 (UTC)
Subject: rpms/dzen2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090828143226.1338011C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/dzen2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvse11005/rpms/dzen2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dzen2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dzen2
# $Id: Makefile,v 1.1 2009/08/28 14:32:25 tibbs Exp $
NAME := dzen2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From chitlesh at fedoraproject.org  Fri Aug 28 14:32:35 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 14:32:35 +0000 (UTC)
Subject: rpms/alliance/devel alliance.spec,1.25,1.26
Message-ID: <20090828143235.4A86F11C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11436

Modified Files:
	alliance.spec 
Log Message:
re-added default_patch_fuzz 2


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- alliance.spec	28 Aug 2009 10:44:15 -0000	1.25
+++ alliance.spec	28 Aug 2009 14:32:35 -0000	1.26
@@ -1,5 +1,6 @@
 %define        prefix    %{_libdir}/%{name}
 %define        snapshot  20090827
+%define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0



From pkgdb at fedoraproject.org  Fri Aug 28 14:33:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:33:15 +0000
Subject: [pkgdb] paperbox summary updated by tibbs
Message-ID: <20090828143315.9BF3310F881@bastion2.fedora.phx.redhat.com>

tibbs set package paperbox summary to A GTK tracker based document browser

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/paperbox



From pkgdb at fedoraproject.org  Fri Aug 28 14:33:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:33:15 +0000
Subject: [pkgdb] paperbox (Fedora, 11) updated by tibbs
Message-ID: <20090828143316.950EA10F899@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for paperbox
tibbs has set commit to Approved for 107427 on paperbox (Fedora 11)
tibbs has set checkout to Approved for 107427 on paperbox (Fedora 11)
tibbs has set build to Approved for 107427 on paperbox (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/paperbox



From pkgdb at fedoraproject.org  Fri Aug 28 14:33:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:33:13 +0000
Subject: [pkgdb] paperbox was added for gljohn
Message-ID: <20090828143317.06ADF10F89B@bastion2.fedora.phx.redhat.com>

tibbs has added Package paperbox with summary A GTK tracker based document browser
tibbs has approved Package paperbox
tibbs has added a Fedora devel branch for paperbox with an owner of gljohn
tibbs has approved paperbox in Fedora devel
tibbs has approved Package paperbox
tibbs has set commit to Approved for 107427 on paperbox (Fedora devel)
tibbs has set checkout to Approved for 107427 on paperbox (Fedora devel)
tibbs has set build to Approved for 107427 on paperbox (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/paperbox



From tibbs at fedoraproject.org  Fri Aug 28 14:33:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:33:21 +0000 (UTC)
Subject: rpms/paperbox - New directory
Message-ID: <20090828143321.1962211C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/paperbox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ12184/rpms/paperbox

Log Message:
Directory /cvs/pkgs/rpms/paperbox added to the repository




From pkgdb at fedoraproject.org  Fri Aug 28 14:33:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:33:15 +0000
Subject: [pkgdb] paperbox (Fedora, 11) updated by tibbs
Message-ID: <20090828143317.1B20710F89F@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for paperbox
tibbs has set commit to Approved for 107427 on paperbox (Fedora 10)
tibbs has set checkout to Approved for 107427 on paperbox (Fedora 10)
tibbs has set build to Approved for 107427 on paperbox (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/paperbox



From tibbs at fedoraproject.org  Fri Aug 28 14:33:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:33:21 +0000 (UTC)
Subject: rpms/paperbox/devel - New directory
Message-ID: <20090828143321.392DD11C043B@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/paperbox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ12184/rpms/paperbox/devel

Log Message:
Directory /cvs/pkgs/rpms/paperbox/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:33:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:33:27 +0000 (UTC)
Subject: rpms/paperbox Makefile,NONE,1.1
Message-ID: <20090828143327.8EC0111C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/paperbox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ12184/rpms/paperbox

Added Files:
	Makefile 
Log Message:
Setup of module paperbox


--- NEW FILE Makefile ---
# Top level Makefile for module paperbox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:33:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:33:27 +0000 (UTC)
Subject: rpms/paperbox/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828143327.F0CCB11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/paperbox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsZ12184/rpms/paperbox/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module paperbox


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: paperbox
# $Id: Makefile,v 1.1 2009/08/28 14:33:27 tibbs Exp $
NAME := paperbox
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 28 14:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:37:37 +0000
Subject: [pkgdb] java-augeas was added for bkearney
Message-ID: <20090828143737.7061610F878@bastion2.fedora.phx.redhat.com>

tibbs has added Package java-augeas with summary Java Bindings for the Augeas library
tibbs has approved Package java-augeas
tibbs has added a Fedora devel branch for java-augeas with an owner of bkearney
tibbs has approved java-augeas in Fedora devel
tibbs has approved Package java-augeas
tibbs has set commit to Approved for 107427 on java-augeas (Fedora devel)
tibbs has set checkout to Approved for 107427 on java-augeas (Fedora devel)
tibbs has set build to Approved for 107427 on java-augeas (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/java-augeas



From pkgdb at fedoraproject.org  Fri Aug 28 14:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:37:38 +0000
Subject: [pkgdb] java-augeas (Fedora, 11) updated by tibbs
Message-ID: <20090828143738.ADA1210F884@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for java-augeas
tibbs has set commit to Approved for 107427 on java-augeas (Fedora 11)
tibbs has set checkout to Approved for 107427 on java-augeas (Fedora 11)
tibbs has set build to Approved for 107427 on java-augeas (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/java-augeas



From pkgdb at fedoraproject.org  Fri Aug 28 14:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:37:38 +0000
Subject: [pkgdb] java-augeas summary updated by tibbs
Message-ID: <20090828143738.95A5F10F87B@bastion2.fedora.phx.redhat.com>

tibbs set package java-augeas summary to Java Bindings for the Augeas library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/java-augeas



From pkgdb at fedoraproject.org  Fri Aug 28 14:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:37:38 +0000
Subject: [pkgdb] java-augeas (Fedora, 11) updated by tibbs
Message-ID: <20090828143738.BE0C610F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for java-augeas
tibbs has set commit to Approved for 107427 on java-augeas (Fedora 10)
tibbs has set checkout to Approved for 107427 on java-augeas (Fedora 10)
tibbs has set build to Approved for 107427 on java-augeas (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/java-augeas



From tibbs at fedoraproject.org  Fri Aug 28 14:37:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:37:45 +0000 (UTC)
Subject: rpms/java-augeas - New directory
Message-ID: <20090828143745.15FA311C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/java-augeas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsd13547/rpms/java-augeas

Log Message:
Directory /cvs/pkgs/rpms/java-augeas added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:37:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:37:45 +0000 (UTC)
Subject: rpms/java-augeas/devel - New directory
Message-ID: <20090828143745.3E45111C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/java-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsd13547/rpms/java-augeas/devel

Log Message:
Directory /cvs/pkgs/rpms/java-augeas/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:37:51 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:37:51 +0000 (UTC)
Subject: rpms/java-augeas Makefile,NONE,1.1
Message-ID: <20090828143751.C054C11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/java-augeas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsd13547/rpms/java-augeas

Added Files:
	Makefile 
Log Message:
Setup of module java-augeas


--- NEW FILE Makefile ---
# Top level Makefile for module java-augeas
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:37:52 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:37:52 +0000 (UTC)
Subject: rpms/java-augeas/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828143752.1678211C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/java-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsd13547/rpms/java-augeas/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module java-augeas


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: java-augeas
# $Id: Makefile,v 1.1 2009/08/28 14:37:51 tibbs Exp $
NAME := java-augeas
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From wtogami at fedoraproject.org  Fri Aug 28 14:38:11 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 28 Aug 2009 14:38:11 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.12,1.13
Message-ID: <20090828143811.053E011C0044@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13890

Modified Files:
	nss-softokn.spec 
Log Message:
caolan's nss-softokn.pc patch



Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nss-softokn.spec	28 Aug 2009 05:38:03 -0000	1.12
+++ nss-softokn.spec	28 Aug 2009 14:38:10 -0000	1.13
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          21%{?dist}
+Release:          22%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -145,7 +145,8 @@ export USE_64
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%SOFTKN_VERSION%%,%{version},g" > \
+                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" \
+                          -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \  
                           ./mozilla/dist/pkgconfig/nss-softokn.pc
 
 SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
@@ -310,6 +311,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Fri Aug 28 2009 Warren Togami <wtogami at redhat.com> - 3.12.3.99.3-22
+- caolan's nss-softokn.pc patch
+
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-21
 - Bump the release number for a chained build of nss-util, nss-softokn and nss
 



From pkgdb at fedoraproject.org  Fri Aug 28 14:38:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:38:12 +0000
Subject: [pkgdb] eog-plugins was added for mclasen
Message-ID: <20090828143812.5CCED10F884@bastion2.fedora.phx.redhat.com>

tibbs has added Package eog-plugins with summary A collection of plugins for the eog image viewer
tibbs has approved Package eog-plugins
tibbs has added a Fedora devel branch for eog-plugins with an owner of mclasen
tibbs has approved eog-plugins in Fedora devel
tibbs has approved Package eog-plugins
tibbs has set commit to Approved for 107427 on eog-plugins (Fedora devel)
tibbs has set checkout to Approved for 107427 on eog-plugins (Fedora devel)
tibbs has set build to Approved for 107427 on eog-plugins (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eog-plugins



From tibbs at fedoraproject.org  Fri Aug 28 14:38:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:19 +0000 (UTC)
Subject: rpms/eog-plugins - New directory
Message-ID: <20090828143819.1AAA311C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eog-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw14040/rpms/eog-plugins

Log Message:
Directory /cvs/pkgs/rpms/eog-plugins added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:38:19 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:19 +0000 (UTC)
Subject: rpms/eog-plugins/devel - New directory
Message-ID: <20090828143819.40F2E11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw14040/rpms/eog-plugins/devel

Log Message:
Directory /cvs/pkgs/rpms/eog-plugins/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 28 14:38:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:38:13 +0000
Subject: [pkgdb] eog-plugins summary updated by tibbs
Message-ID: <20090828143813.32B0F10F88C@bastion2.fedora.phx.redhat.com>

tibbs set package eog-plugins summary to A collection of plugins for the eog image viewer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eog-plugins



From tibbs at fedoraproject.org  Fri Aug 28 14:38:25 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:25 +0000 (UTC)
Subject: rpms/eog-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828143825.C475E11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw14040/rpms/eog-plugins/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eog-plugins


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eog-plugins
# $Id: Makefile,v 1.1 2009/08/28 14:38:25 tibbs Exp $
NAME := eog-plugins
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tibbs at fedoraproject.org  Fri Aug 28 14:38:25 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:25 +0000 (UTC)
Subject: rpms/eog-plugins Makefile,NONE,1.1
Message-ID: <20090828143825.754AB11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eog-plugins
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsw14040/rpms/eog-plugins

Added Files:
	Makefile 
Log Message:
Setup of module eog-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module eog-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Aug 28 14:38:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:38:41 +0000
Subject: [pkgdb] ghc-fgl was added for bos
Message-ID: <20090828143841.771B310F877@bastion2.fedora.phx.redhat.com>

tibbs has added Package ghc-fgl with summary functional graph library for Haskell
tibbs has approved Package ghc-fgl
tibbs has added a Fedora devel branch for ghc-fgl with an owner of bos
tibbs has approved ghc-fgl in Fedora devel
tibbs has approved Package ghc-fgl
tibbs has set commit to Approved for 107427 on ghc-fgl (Fedora devel)
tibbs has set checkout to Approved for 107427 on ghc-fgl (Fedora devel)
tibbs has set build to Approved for 107427 on ghc-fgl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-fgl



From pkgdb at fedoraproject.org  Fri Aug 28 14:38:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:38:43 +0000
Subject: [pkgdb] ghc-fgl summary updated by tibbs
Message-ID: <20090828143843.B2DA710F881@bastion2.fedora.phx.redhat.com>

tibbs set package ghc-fgl summary to functional graph library for Haskell

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-fgl



From pkgdb at fedoraproject.org  Fri Aug 28 14:38:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:38:43 +0000
Subject: [pkgdb] ghc-fgl (Fedora, 11) updated by tibbs
Message-ID: <20090828143843.C574610F8A1@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on ghc-fgl (Fedora devel) for haskell-sig
tibbs approved watchcommits on ghc-fgl (Fedora devel) for haskell-sig
tibbs approved watchbugzilla on ghc-fgl (Fedora devel) for ynemoy
tibbs approved watchcommits on ghc-fgl (Fedora devel) for ynemoy
tibbs approved commit on ghc-fgl (Fedora devel) for ynemoy
tibbs approved build on ghc-fgl (Fedora devel) for ynemoy
tibbs approved approveacls on ghc-fgl (Fedora devel) for ynemoy
tibbs approved watchbugzilla on ghc-fgl (Fedora devel) for petersen
tibbs approved watchcommits on ghc-fgl (Fedora devel) for petersen
tibbs approved commit on ghc-fgl (Fedora devel) for petersen
tibbs approved build on ghc-fgl (Fedora devel) for petersen
tibbs approved approveacls on ghc-fgl (Fedora devel) for petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-fgl



From pkgdb at fedoraproject.org  Fri Aug 28 14:38:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:38:43 +0000
Subject: [pkgdb] ghc-fgl (Fedora, 11) updated by tibbs
Message-ID: <20090828143843.D794210F8AB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ghc-fgl
tibbs has set commit to Approved for 107427 on ghc-fgl (Fedora 11)
tibbs has set checkout to Approved for 107427 on ghc-fgl (Fedora 11)
tibbs has set build to Approved for 107427 on ghc-fgl (Fedora 11)
tibbs approved watchbugzilla on ghc-fgl (Fedora 11) for haskell-sig
tibbs approved watchcommits on ghc-fgl (Fedora 11) for haskell-sig
tibbs approved watchbugzilla on ghc-fgl (Fedora 11) for ynemoy
tibbs approved watchcommits on ghc-fgl (Fedora 11) for ynemoy
tibbs approved commit on ghc-fgl (Fedora 11) for ynemoy
tibbs approved build on ghc-fgl (Fedora 11) for ynemoy
tibbs approved approveacls on ghc-fgl (Fedora 11) for ynemoy
tibbs approved watchbugzilla on ghc-fgl (Fedora 11) for petersen
tibbs approved watchcommits on ghc-fgl (Fedora 11) for petersen
tibbs approved commit on ghc-fgl (Fedora 11) for petersen
tibbs approved build on ghc-fgl (Fedora 11) for petersen
tibbs approved approveacls on ghc-fgl (Fedora 11) for petersen

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-fgl



From tibbs at fedoraproject.org  Fri Aug 28 14:38:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:50 +0000 (UTC)
Subject: rpms/ghc-fgl - New directory
Message-ID: <20090828143850.192BF11C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-fgl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN14807/rpms/ghc-fgl

Log Message:
Directory /cvs/pkgs/rpms/ghc-fgl added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:38:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:50 +0000 (UTC)
Subject: rpms/ghc-fgl/devel - New directory
Message-ID: <20090828143850.4B20E11C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-fgl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN14807/rpms/ghc-fgl/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-fgl/devel added to the repository




From than at fedoraproject.org  Fri Aug 28 14:38:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 14:38:53 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.67, 1.68 kdemultimedia.spec, 
	1.154, 1.155 sources, 1.69, 1.70
Message-ID: <20090828143853.6A7FD11C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14280

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	29 Jul 2009 23:11:22 -0000	1.67
+++ .cvsignore	28 Aug 2009 14:38:53 -0000	1.68
@@ -3,3 +3,4 @@ kdemultimedia-4.2.95.tar.bz2
 kdemultimedia-4.2.96.tar.bz2
 kdemultimedia-4.2.98.tar.bz2
 kdemultimedia-4.3.0.tar.bz2
+kdemultimedia-4.3.1.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- kdemultimedia.spec	29 Jul 2009 23:11:23 -0000	1.154
+++ kdemultimedia.spec	28 Aug 2009 14:38:53 -0000	1.155
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	29 Jul 2009 23:11:23 -0000	1.69
+++ sources	28 Aug 2009 14:38:53 -0000	1.70
@@ -1 +1 @@
-75c0c42f22f5ffc98262441751ccb247  kdemultimedia-4.3.0.tar.bz2
+e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2



From tibbs at fedoraproject.org  Fri Aug 28 14:38:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:56 +0000 (UTC)
Subject: rpms/ghc-fgl Makefile,NONE,1.1
Message-ID: <20090828143856.5CF9511C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-fgl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN14807/rpms/ghc-fgl

Added Files:
	Makefile 
Log Message:
Setup of module ghc-fgl


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-fgl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:38:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:38:56 +0000 (UTC)
Subject: rpms/ghc-fgl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090828143856.A0A3311C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-fgl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsN14807/rpms/ghc-fgl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-fgl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-fgl
# $Id: Makefile,v 1.1 2009/08/28 14:38:56 tibbs Exp $
NAME := ghc-fgl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 28 14:39:23 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:39:23 +0000 (UTC)
Subject: rpms/zikula-module-feeds/devel - New directory
Message-ID: <20090828143923.389FD11C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/zikula-module-feeds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT15085/rpms/zikula-module-feeds/devel

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-feeds/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:39:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:39:29 +0000 (UTC)
Subject: rpms/zikula-module-feeds Makefile,NONE,1.1
Message-ID: <20090828143929.6948511C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/zikula-module-feeds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT15085/rpms/zikula-module-feeds

Added Files:
	Makefile 
Log Message:
Setup of module zikula-module-feeds


--- NEW FILE Makefile ---
# Top level Makefile for module zikula-module-feeds
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Aug 28 14:39:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:39:16 +0000
Subject: [pkgdb] zikula-module-feeds (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090828143917.449A310F8B9@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for zikula-module-feeds
tibbs has set commit to Approved for 107427 on zikula-module-feeds (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on zikula-module-feeds (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on zikula-module-feeds (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-feeds



From tibbs at fedoraproject.org  Fri Aug 28 14:39:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:39:29 +0000 (UTC)
Subject: rpms/zikula-module-feeds/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828143929.9C11911C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/zikula-module-feeds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT15085/rpms/zikula-module-feeds/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zikula-module-feeds


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zikula-module-feeds
# $Id: Makefile,v 1.1 2009/08/28 14:39:29 tibbs Exp $
NAME := zikula-module-feeds
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 28 14:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:19 +0000
Subject: [pkgdb] vemana2000-fonts was added for sandeeps
Message-ID: <20090828144019.80C8A10F87B@bastion2.fedora.phx.redhat.com>

tibbs has added Package vemana2000-fonts with summary Telugu OpenType Font
tibbs has approved Package vemana2000-fonts
tibbs has added a Fedora devel branch for vemana2000-fonts with an owner of sandeeps
tibbs has approved vemana2000-fonts in Fedora devel
tibbs has approved Package vemana2000-fonts
tibbs has set commit to Approved for 107427 on vemana2000-fonts (Fedora devel)
tibbs has set checkout to Approved for 107427 on vemana2000-fonts (Fedora devel)
tibbs has set build to Approved for 107427 on vemana2000-fonts (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vemana2000-fonts



From pkgdb at fedoraproject.org  Fri Aug 28 14:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:39:15 +0000
Subject: [pkgdb] zikula-module-feeds was added for sundaram
Message-ID: <20090828143916.0F3A010F8B7@bastion2.fedora.phx.redhat.com>

tibbs has added Package zikula-module-feeds with summary RSS feeds module for zikula
tibbs has approved Package zikula-module-feeds
tibbs has added a Fedora devel branch for zikula-module-feeds with an owner of sundaram
tibbs has approved zikula-module-feeds in Fedora devel
tibbs has approved Package zikula-module-feeds
tibbs has set commit to Approved for 107427 on zikula-module-feeds (Fedora devel)
tibbs has set checkout to Approved for 107427 on zikula-module-feeds (Fedora devel)
tibbs has set build to Approved for 107427 on zikula-module-feeds (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-feeds



From pkgdb at fedoraproject.org  Fri Aug 28 14:39:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:39:16 +0000
Subject: [pkgdb] zikula-module-feeds summary updated by tibbs
Message-ID: <20090828143917.2478410F881@bastion2.fedora.phx.redhat.com>

tibbs set package zikula-module-feeds summary to RSS feeds module for zikula

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/zikula-module-feeds



From tibbs at fedoraproject.org  Fri Aug 28 14:39:23 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:39:23 +0000 (UTC)
Subject: rpms/zikula-module-feeds - New directory
Message-ID: <20090828143923.1811511C008D@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/zikula-module-feeds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsT15085/rpms/zikula-module-feeds

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-feeds added to the repository




From pkgdb at fedoraproject.org  Fri Aug 28 14:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:21 +0000
Subject: [pkgdb] vemana2000-fonts summary updated by tibbs
Message-ID: <20090828144021.7D46E10F881@bastion2.fedora.phx.redhat.com>

tibbs set package vemana2000-fonts summary to Telugu OpenType Font

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vemana2000-fonts



From pkgdb at fedoraproject.org  Fri Aug 28 14:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:21 +0000
Subject: [pkgdb] vemana2000-fonts (Fedora, 11) updated by tibbs
Message-ID: <20090828144021.9181710F894@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for vemana2000-fonts
tibbs has set commit to Approved for 107427 on vemana2000-fonts (Fedora 11)
tibbs has set checkout to Approved for 107427 on vemana2000-fonts (Fedora 11)
tibbs has set build to Approved for 107427 on vemana2000-fonts (Fedora 11)
tibbs approved watchbugzilla on vemana2000-fonts (Fedora 11) for fonts-sig
tibbs approved watchcommits on vemana2000-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vemana2000-fonts



From pkgdb at fedoraproject.org  Fri Aug 28 14:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:21 +0000
Subject: [pkgdb] vemana2000-fonts (Fedora, 11) updated by tibbs
Message-ID: <20090828144021.9EC2910F898@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on vemana2000-fonts (Fedora devel) for fonts-sig
tibbs approved watchcommits on vemana2000-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vemana2000-fonts



From tibbs at fedoraproject.org  Fri Aug 28 14:40:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:40:29 +0000 (UTC)
Subject: rpms/vemana2000-fonts - New directory
Message-ID: <20090828144029.1543111C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vemana2000-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ15563/rpms/vemana2000-fonts

Log Message:
Directory /cvs/pkgs/rpms/vemana2000-fonts added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:40:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:40:29 +0000 (UTC)
Subject: rpms/vemana2000-fonts/devel - New directory
Message-ID: <20090828144029.430B911C04D6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vemana2000-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ15563/rpms/vemana2000-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/vemana2000-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Aug 28 14:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:21 +0000
Subject: [pkgdb] vemana2000-fonts (Fedora, 11) updated by tibbs
Message-ID: <20090828144021.A998F10F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for vemana2000-fonts
tibbs has set commit to Approved for 107427 on vemana2000-fonts (Fedora 10)
tibbs has set checkout to Approved for 107427 on vemana2000-fonts (Fedora 10)
tibbs has set build to Approved for 107427 on vemana2000-fonts (Fedora 10)
tibbs approved watchbugzilla on vemana2000-fonts (Fedora 10) for fonts-sig
tibbs approved watchcommits on vemana2000-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/vemana2000-fonts



From tibbs at fedoraproject.org  Fri Aug 28 14:40:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:40:36 +0000 (UTC)
Subject: rpms/vemana2000-fonts Makefile,NONE,1.1
Message-ID: <20090828144036.B73B911C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vemana2000-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ15563/rpms/vemana2000-fonts

Added Files:
	Makefile 
Log Message:
Setup of module vemana2000-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module vemana2000-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 tibbs at fedoraproject.org  Fri Aug 28 14:40:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:40:37 +0000 (UTC)
Subject: rpms/vemana2000-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828144037.5BABE11C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/vemana2000-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsQ15563/rpms/vemana2000-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vemana2000-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vemana2000-fonts
# $Id: Makefile,v 1.1 2009/08/28 14:40:37 tibbs Exp $
NAME := vemana2000-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Aug 28 14:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:53 +0000
Subject: [pkgdb] camorama was added for jwrdegoede
Message-ID: <20090828144053.BE1A710F881@bastion2.fedora.phx.redhat.com>

tibbs has added Package camorama with summary Gnome webcam viewer
tibbs has approved Package camorama
tibbs has added a Fedora devel branch for camorama with an owner of jwrdegoede
tibbs has approved camorama in Fedora devel
tibbs has approved Package camorama
tibbs has set commit to Approved for 107427 on camorama (Fedora devel)
tibbs has set checkout to Approved for 107427 on camorama (Fedora devel)
tibbs has set build to Approved for 107427 on camorama (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/camorama



From pkgdb at fedoraproject.org  Fri Aug 28 14:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:54 +0000
Subject: [pkgdb] camorama (Fedora, 11) updated by tibbs
Message-ID: <20090828144054.DF28210F8AD@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for camorama
tibbs has set commit to Approved for 107427 on camorama (Fedora 11)
tibbs has set checkout to Approved for 107427 on camorama (Fedora 11)
tibbs has set build to Approved for 107427 on camorama (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/camorama



From pkgdb at fedoraproject.org  Fri Aug 28 14:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:40:54 +0000
Subject: [pkgdb] camorama summary updated by tibbs
Message-ID: <20090828144054.D642210F884@bastion2.fedora.phx.redhat.com>

tibbs set package camorama summary to Gnome webcam viewer

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/camorama



From tibbs at fedoraproject.org  Fri Aug 28 14:41:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:01 +0000 (UTC)
Subject: rpms/camorama - New directory
Message-ID: <20090828144101.3385911C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/camorama
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU16164/rpms/camorama

Log Message:
Directory /cvs/pkgs/rpms/camorama added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:41:01 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:01 +0000 (UTC)
Subject: rpms/camorama/devel - New directory
Message-ID: <20090828144101.6C9BB11C0077@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/camorama/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU16164/rpms/camorama/devel

Log Message:
Directory /cvs/pkgs/rpms/camorama/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:41:07 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:07 +0000 (UTC)
Subject: rpms/camorama Makefile,NONE,1.1
Message-ID: <20090828144107.D433811C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/camorama
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU16164/rpms/camorama

Added Files:
	Makefile 
Log Message:
Setup of module camorama


--- NEW FILE Makefile ---
# Top level Makefile for module camorama
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 14:41:08 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:08 +0000 (UTC)
Subject: rpms/camorama/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828144108.4F68311C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/camorama/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsU16164/rpms/camorama/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module camorama


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: camorama
# $Id: Makefile,v 1.1 2009/08/28 14:41:08 tibbs Exp $
NAME := camorama
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 28 14:41:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:41:19 +0000
Subject: [pkgdb] perl-Nagios-Plugin was added for ruben
Message-ID: <20090828144119.E677C10F8A6@bastion2.fedora.phx.redhat.com>

tibbs has added Package perl-Nagios-Plugin with summary Family of perl modules to streamline writing Nagios plugins
tibbs has approved Package perl-Nagios-Plugin
tibbs has added a Fedora devel branch for perl-Nagios-Plugin with an owner of ruben
tibbs has approved perl-Nagios-Plugin in Fedora devel
tibbs has approved Package perl-Nagios-Plugin
tibbs has set commit to Approved for 107427 on perl-Nagios-Plugin (Fedora devel)
tibbs has set checkout to Approved for 107427 on perl-Nagios-Plugin (Fedora devel)
tibbs has set build to Approved for 107427 on perl-Nagios-Plugin (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nagios-Plugin



From pkgdb at fedoraproject.org  Fri Aug 28 14:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:41:20 +0000
Subject: [pkgdb] perl-Nagios-Plugin (Fedora, 11) updated by tibbs
Message-ID: <20090828144121.2071910F8BD@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on perl-Nagios-Plugin (Fedora devel) for perl-sig
tibbs approved watchcommits on perl-Nagios-Plugin (Fedora devel) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nagios-Plugin



From pkgdb at fedoraproject.org  Fri Aug 28 14:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:41:20 +0000
Subject: [pkgdb] perl-Nagios-Plugin summary updated by tibbs
Message-ID: <20090828144121.10A9110F8A8@bastion2.fedora.phx.redhat.com>

tibbs set package perl-Nagios-Plugin summary to Family of perl modules to streamline writing Nagios plugins

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nagios-Plugin



From pkgdb at fedoraproject.org  Fri Aug 28 14:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 14:41:20 +0000
Subject: [pkgdb] perl-Nagios-Plugin (Fedora, 11) updated by tibbs
Message-ID: <20090828144121.30E3F10F8C0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for perl-Nagios-Plugin
tibbs has set commit to Approved for 107427 on perl-Nagios-Plugin (Fedora 11)
tibbs has set checkout to Approved for 107427 on perl-Nagios-Plugin (Fedora 11)
tibbs has set build to Approved for 107427 on perl-Nagios-Plugin (Fedora 11)
tibbs approved watchbugzilla on perl-Nagios-Plugin (Fedora 11) for perl-sig
tibbs approved watchcommits on perl-Nagios-Plugin (Fedora 11) for perl-sig

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nagios-Plugin



From tibbs at fedoraproject.org  Fri Aug 28 14:41:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:27 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin - New directory
Message-ID: <20090828144127.16BC311C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL16690/rpms/perl-Nagios-Plugin

Log Message:
Directory /cvs/pkgs/rpms/perl-Nagios-Plugin added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:41:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:27 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin/devel - New directory
Message-ID: <20090828144127.3CCE711C043B@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL16690/rpms/perl-Nagios-Plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Nagios-Plugin/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 14:41:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:33 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin Makefile,NONE,1.1
Message-ID: <20090828144133.E844511C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL16690/rpms/perl-Nagios-Plugin

Added Files:
	Makefile 
Log Message:
Setup of module perl-Nagios-Plugin


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Nagios-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 tibbs at fedoraproject.org  Fri Aug 28 14:41:34 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 14:41:34 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090828144134.40E4811C0044@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsL16690/rpms/perl-Nagios-Plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Nagios-Plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Nagios-Plugin
# $Id: Makefile,v 1.1 2009/08/28 14:41:34 tibbs Exp $
NAME := perl-Nagios-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 than at fedoraproject.org  Fri Aug 28 14:49:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 14:49:50 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.71, 1.72 kdenetwork.spec, 1.196,
	1.197 sources, 1.78, 1.79
Message-ID: <20090828144950.74D2411C0044@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22387

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	29 Jul 2009 23:17:00 -0000	1.71
+++ .cvsignore	28 Aug 2009 14:49:50 -0000	1.72
@@ -4,3 +4,4 @@ kdenetwork-4.2.96.tar.bz2
 kdenetwork-4.2.98.tar.bz2
 krdc-icons.tar.bz2
 kdenetwork-4.3.0.tar.bz2
+kdenetwork-4.3.1.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- kdenetwork.spec	24 Aug 2009 11:37:53 -0000	1.196
+++ kdenetwork.spec	28 Aug 2009 14:49:50 -0000	1.197
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -186,6 +186,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - fix bz#515586, backport patch to fix this issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	29 Jul 2009 23:17:00 -0000	1.78
+++ sources	28 Aug 2009 14:49:50 -0000	1.79
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-f9695ff06d0d67a78a71fb9b3ddbd4f3  kdenetwork-4.3.0.tar.bz2
+496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2



From ruben at fedoraproject.org  Fri Aug 28 14:50:56 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 28 Aug 2009 14:50:56 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin/devel import.log, NONE,
	1.1 perl-Nagios-Plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090828145056.033E111C0044@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24044/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Nagios-Plugin.spec 
Log Message:
Initial import into devel



--- NEW FILE import.log ---
perl-Nagios-Plugin-0_33-2_fc11:HEAD:perl-Nagios-Plugin-0.33-2.fc11.src.rpm:1251471035


--- NEW FILE perl-Nagios-Plugin.spec ---
Name:           perl-Nagios-Plugin
Version:        0.33
Release:        2%{?dist}
Summary:        Family of perl modules to streamline writing Nagios plugins
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-Plugin/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugin-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor)
Requires:       perl(Class::Accessor::Fast)
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Math::Calc::Units)
BuildRequires:  perl(Params::Validate)
BuildRequires:  perl(Test::More) >= 0.62
Requires:       perl(Class::Accessor)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(Config::Tiny)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Nagios::Plugin and its associated Nagios::Plugin::* modules are a family of
perl modules to streamline writing Nagios plugins. The main end user
modules are Nagios::Plugin, providing an object-oriented interface to the
entire Nagios::Plugin::* collection, and Nagios::Plugin::Functions,
providing a simpler functional interface to a useful subset of the
available functionality.

%prep
%setup -q -n Nagios-Plugin-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Aug 27 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.33-2
- Review fixes (#517497)

* Thu Aug 13 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.33-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:41:34 -0000	1.1
+++ .cvsignore	28 Aug 2009 14:50:55 -0000	1.2
@@ -0,0 +1 @@
+Nagios-Plugin-0.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:41:34 -0000	1.1
+++ sources	28 Aug 2009 14:50:55 -0000	1.2
@@ -0,0 +1 @@
+7f5e00a3d683b1d39b169d9d772de33b  Nagios-Plugin-0.33.tar.gz



From chitlesh at fedoraproject.org  Fri Aug 28 14:51:18 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 14:51:18 +0000 (UTC)
Subject: rpms/alliance/F-10 alliance.spec,1.20,1.21
Message-ID: <20090828145118.7401211C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24548

Modified Files:
	alliance.spec 
Log Message:
re-added default_patch_fuzz 2


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-10/alliance.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- alliance.spec	28 Aug 2009 10:26:09 -0000	1.20
+++ alliance.spec	28 Aug 2009 14:51:18 -0000	1.21
@@ -1,5 +1,6 @@
 %define        prefix    %{_libdir}/%{name}
 %define        snapshot  20090827
+%define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0



From chitlesh at fedoraproject.org  Fri Aug 28 14:51:38 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 14:51:38 +0000 (UTC)
Subject: rpms/alliance/F-11 alliance.spec,1.22,1.23
Message-ID: <20090828145138.0EA5311C0044@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24855

Modified Files:
	alliance.spec 
Log Message:
re-added default_patch_fuzz 2


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/alliance.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- alliance.spec	28 Aug 2009 10:31:49 -0000	1.22
+++ alliance.spec	28 Aug 2009 14:51:37 -0000	1.23
@@ -1,5 +1,6 @@
 %define        prefix    %{_libdir}/%{name}
 %define        snapshot  20090827
+%define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0



From orion at fedoraproject.org  Fri Aug 28 14:54:56 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 28 Aug 2009 14:54:56 +0000 (UTC)
Subject: rpms/paraview/devel paraview-3.6.0-assistant-qt4.patch, 1.1,
	1.2 paraview-3.6.1-plugins.patch, 1.1, 1.2 paraview.spec, 1.41,
	1.42 paraview-3.6.1-cmake-install-prefix.patch, 1.1, NONE
Message-ID: <20090828145456.DB50111C0044@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27365

Modified Files:
	paraview-3.6.0-assistant-qt4.patch 
	paraview-3.6.1-plugins.patch paraview.spec 
Removed Files:
	paraview-3.6.1-cmake-install-prefix.patch 
Log Message:
* Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
- Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
- Update assitant patch to use assistant_adp, don't ship assistant-real


paraview-3.6.0-assistant-qt4.patch:
 Applications/OverView/Core/MainWindow.cxx |    2 +-
 Qt/Components/pqClientMainWindow.cxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: paraview-3.6.0-assistant-qt4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.6.0-assistant-qt4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- paraview-3.6.0-assistant-qt4.patch	23 Jul 2009 19:29:42 -0000	1.1
+++ paraview-3.6.0-assistant-qt4.patch	28 Aug 2009 14:54:56 -0000	1.2
@@ -5,7 +5,7 @@
    QString profileFile;
  
 -  const char* assistantName = "assistant";
-+  const char* assistantName = "assistant-qt4";
++  const char* assistantName = "assistant_adp";
  #if defined(Q_WS_WIN)
    const char* binDir = "\\";
    const char* binDir1 = "\\..\\";
@@ -16,7 +16,7 @@
    QString profileFile;
  
 -  const char* assistantName = "assistant";
-+  const char* assistantName = "assistant-qt4";
++  const char* assistantName = "assistant_adp";
  #if defined(Q_WS_WIN)
    const char* extString = ".exe";
    const char* binDir = "\\";

paraview-3.6.1-plugins.patch:
 ParaViewPlugins.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: paraview-3.6.1-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.6.1-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- paraview-3.6.1-plugins.patch	23 Jul 2009 19:29:42 -0000	1.1
+++ paraview-3.6.1-plugins.patch	28 Aug 2009 14:54:56 -0000	1.2
@@ -5,7 +5,7 @@
    IF (PV_INSTALL_BIN_DIR)
      INSTALL(TARGETS ${name}
 -      DESTINATION "${PV_INSTALL_BIN_DIR}/plugins/${name}"
-+      DESTINATION "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/plugins/${name}"
++      DESTINATION "${PV_INSTALL_LIB_DIR}/plugins/${name}"
        COMPONENT Runtime)
    ENDIF (PV_INSTALL_BIN_DIR)
  ENDMACRO(internal_paraview_install_plugin)


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- paraview.spec	26 Aug 2009 16:15:34 -0000	1.41
+++ paraview.spec	28 Aug 2009 14:54:56 -0000	1.42
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -15,14 +15,12 @@ URL:            http://www.paraview.org/
 Source0:        http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
 Source1:        paraview_22x22.png
 Source2:        paraview.xml
-#Fixup some install locations
-#Reported upstream: http://public.kitware.com/mantis/view.php?id=9301
-Patch1:         paraview-3.6.1-cmake-install-prefix.patch
 #Don't try to copy Qt libraries into paraview directory
 Patch2:         paraview-3.6.0-install.patch
 #Move pqClient.adp into %{_datadir}/paraview
 Patch3:         paraview-3.6.1-doc.patch
-#Look for assistant-qt4 instead of assistant
+#Reported upstream: http://public.kitware.com/Bug/view.php?id=9458
+#Look for assistant_adp instead of assistant
 Patch4:         paraview-3.6.0-assistant-qt4.patch
 #Reported upstream: http://public.kitware.com/Bug/view.php?id=7022
 #Installs PointSpriteDemo into incorrect location, remove install for now
@@ -182,7 +180,6 @@ BuildArch:      noarch
 
 %prep
 %setup -q -n ParaView3
-%patch1 -p1 -b .cmake-install-prefix
 %patch2 -p1 -b .install
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
@@ -204,7 +201,7 @@ export MAKE='make'
 export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 %cmake .. \
-        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview \
+        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
 	%{paraview_cmake_options}
 ##Need to run cmake twice to get MPI headers into VTK/Parallel build config
 cmake ..
@@ -219,7 +216,7 @@ export MAKE='make'
 export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 %cmake .. \
-        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-mpi \
+        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview-mpi \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
 	-DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/$(pkg-config --modversion openmpi)/bin/mpicxx \
@@ -249,10 +246,11 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{
 pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#Don't ship copy of Qt assisstant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+      $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
-#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
 #Don't need mpi versions of these
 rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
 #Move the remaining mpi binaries out of the way
@@ -267,10 +265,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/pa
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 #rm -r $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/{doc,Documentation,pqClient.adp}
 popd
-
-#Move some stuff to the proper location
-mv $RPM_BUILD_ROOT/%{_lib}/paraview-mpi/* $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/
-rm -r $RPM_BUILD_ROOT/%{_lib}/paraview-mpi
 %endif
 
 #Install the normal version
@@ -303,16 +297,13 @@ popd
 rm -r $RPM_BUILD_ROOT/usr/plugins
 
 #Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+      $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
 
 #Move the documentation
 #mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
 #   $RPM_BUILD_ROOT%{_datadir}/paraview/
 
-#Move some stuff to the proper location
-mv $RPM_BUILD_ROOT/%{_lib}/paraview/* $RPM_BUILD_ROOT%{_libdir}/paraview/
-rm -r $RPM_BUILD_ROOT/%{_lib}/paraview
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -386,6 +377,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
+- Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
+- Update assitant patch to use assistant_adp, don't ship assistant-real
+
 * Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
 - Disable building various plugins that need OverView
 


--- paraview-3.6.1-cmake-install-prefix.patch DELETED ---



From nhorman at fedoraproject.org  Fri Aug 28 14:56:48 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Fri, 28 Aug 2009 14:56:48 +0000 (UTC)
Subject: rpms/cscope/F-11 cscope-15.6-lexerr.patch, NONE, 1.1 cscope.spec,
	1.37, 1.38
Message-ID: <20090828145648.485A511C0044@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/cscope/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29319

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.6-lexerr.patch 
Log Message:
Resolves: bz 520073

cscope-15.6-lexerr.patch:
 crossref.c |    1 +
 fscanner.l |    4 ++++
 scanner.h  |    5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE cscope-15.6-lexerr.patch ---
diff -up cscope-15.6/src/crossref.c.orig cscope-15.6/src/crossref.c
--- cscope-15.6/src/crossref.c.orig	2006-09-30 04:13:00.000000000 -0400
+++ cscope-15.6/src/crossref.c	2009-08-28 10:47:26.000000000 -0400
@@ -176,6 +176,7 @@ crossref(char *srcfile)
 #endif
 	    break;
 			
+	case LEXERR:	/* Lexer error, abort further parsing of this file */
 	case LEXEOF:	/* end of file; last line may not have \n */
 			
 			/* if there were symbols, output them and the source line */
diff -up cscope-15.6/src/fscanner.l.orig cscope-15.6/src/fscanner.l
--- cscope-15.6/src/fscanner.l.orig	2006-09-30 10:43:06.000000000 -0400
+++ cscope-15.6/src/fscanner.l	2009-08-28 10:47:26.000000000 -0400
@@ -399,6 +399,8 @@ wsnl		[ \t\r\v\f\n]|{comment}
 			/* NOTREACHED */
 		}
 =		{	/* if a global definition initializer */
+			if (!my_yytext)
+				return(LEXERR);
 			if (global == YES && ppdefine == NO && my_yytext[0] != '#') {
 				initializerbraces = braces;
 				initializer = YES;
@@ -407,6 +409,8 @@ wsnl		[ \t\r\v\f\n]|{comment}
 			/* NOTREACHED */
 		}
 :		{	/* a if global structure field */
+			if (!my_yytext)
+				return(LEXERR);
 			if (global == YES && ppdefine == NO && my_yytext[0] != '#') {
 				structfield = YES;
 			}
diff -up cscope-15.6/src/scanner.h.orig cscope-15.6/src/scanner.h
--- cscope-15.6/src/scanner.h.orig	2006-09-30 04:13:00.000000000 -0400
+++ cscope-15.6/src/scanner.h	2009-08-28 10:47:26.000000000 -0400
@@ -61,8 +61,9 @@
 
 /* other scanner token types */
 #define LEXEOF	0
-#define	IDENT	1
-#define	NEWLINE	2
+#define LEXERR	1
+#define	IDENT	2	
+#define	NEWLINE	3	
 
 /* scanner.l global data */
 extern	int	first;		/* buffer index for first char of symbol */


Index: cscope.spec
===================================================================
RCS file: /cvs/extras/rpms/cscope/F-11/cscope.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- cscope.spec	24 Feb 2009 09:59:40 -0000	1.37
+++ cscope.spec	28 Aug 2009 14:56:47 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.6.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -18,6 +18,7 @@ Patch1:cscope-15.6-ocs.patch
 Patch2:cscope-15.6-xcscope-man.patch
 Patch3:cscope-15.6-sigwinch-linemode.patch
 Patch4:cscope-15.6-qrebuild.patch
+Patch5:cscope-15.6-lexerr.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -33,6 +34,7 @@ matches for use in file editing.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -81,6 +83,9 @@ rm -f %{xemacs_lisp_path}/xcscope.el
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Fri Aug 28 2009 Neil Horman <nhorman at redhat.com> - 15.6-4
+- Backport lexerr patch to fix segfult in lexer (bz 520073)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From ynemoy at fedoraproject.org  Fri Aug 28 14:58:08 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Fri, 28 Aug 2009 14:58:08 +0000 (UTC)
Subject: rpms/ghc-tar/devel .cvsignore, 1.2, 1.3 ghc-tar.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090828145808.0380011C0044@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30258

Modified Files:
	.cvsignore ghc-tar.spec sources 
Log Message:
updated upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Aug 2009 15:56:10 -0000	1.2
+++ .cvsignore	28 Aug 2009 14:58:07 -0000	1.3
@@ -1 +1 @@
-tar-0.3.0.0.tar.gz
+tar-0.3.1.0.tar.gz


Index: ghc-tar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/ghc-tar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-tar.spec	23 Aug 2009 16:10:23 -0000	1.2
+++ ghc-tar.spec	28 Aug 2009 14:58:07 -0000	1.3
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.0.0
-Release:        2%{?dist}
+Version:        0.3.1.0
+Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.3.1.0-1
+- updated to latest upstream
+
 * Sun Aug 23 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-2
 - updated to latest cabal2spec output
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Aug 2009 15:56:10 -0000	1.2
+++ sources	28 Aug 2009 14:58:07 -0000	1.3
@@ -1 +1 @@
-3e77fe5b25566ab16adc5496b64bd0bd  tar-0.3.0.0.tar.gz
+10b54856495f9ef0a42aa270085c7d5e  tar-0.3.1.0.tar.gz



From nphilipp at fedoraproject.org  Fri Aug 28 14:59:10 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 14:59:10 +0000 (UTC)
Subject: rpms/system-config-samba/devel .cvsignore, 1.72, 1.73 sources, 1.76,
	1.77 system-config-samba.spec, 1.81, 1.82
Message-ID: <20090828145910.9284711C0044@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31450

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.80


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	28 Aug 2009 12:47:31 -0000	1.72
+++ .cvsignore	28 Aug 2009 14:59:09 -0000	1.73
@@ -1 +1 @@
-system-config-samba-1.2.79.tar.bz2
+system-config-samba-1.2.80.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	28 Aug 2009 12:47:31 -0000	1.76
+++ sources	28 Aug 2009 14:59:10 -0000	1.77
@@ -1 +1 @@
-da371d62b3dd74b96c0319c1744698bb  system-config-samba-1.2.79.tar.bz2
+6a9b6a6f075147aeebe0f61d314a801c  system-config-samba-1.2.80.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- system-config-samba.spec	28 Aug 2009 12:47:31 -0000	1.81
+++ system-config-samba.spec	28 Aug 2009 14:59:10 -0000	1.82
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.79
+Version: 1.2.80
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -112,6 +112,9 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.80-1
+- initialize gettext at the right place
+
 * Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.79-1
 - use str instead of unicode as N_ implementation
 



From rdieter at fedoraproject.org  Fri Aug 28 15:01:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 28 Aug 2009 15:01:17 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.13,1.14
Message-ID: <20090828150117.8B0EF11C0044@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv795

Modified Files:
	nss-softokn.spec 
Log Message:
errant whitespace, nuke it



Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nss-softokn.spec	28 Aug 2009 14:38:10 -0000	1.13
+++ nss-softokn.spec	28 Aug 2009 15:01:17 -0000	1.14
@@ -146,7 +146,7 @@ export USE_64
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSSUTIL_VERSION%%,%{version},g" \
-                          -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \  
+                          -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
                           ./mozilla/dist/pkgconfig/nss-softokn.pc
 
 SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`



From orion at fedoraproject.org  Fri Aug 28 15:01:52 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 28 Aug 2009 15:01:52 +0000 (UTC)
Subject: rpms/paraview/F-11 import.log, NONE,
	1.1 paraview-3.6.0-assistant-qt4.patch, NONE,
	1.1 paraview-3.6.0-install.patch, NONE,
	1.1 paraview-3.6.1-demo.patch, NONE,
	1.1 paraview-3.6.1-doc.patch, NONE,
	1.1 paraview-3.6.1-plugins.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 paraview.spec, 1.33, 1.34 sources, 1.9,
	1.10 paraview-3.2.1-assistant-qt4.patch, 1.1,
	NONE paraview-3.3.0-doc.patch, 1.1,
	NONE paraview-3.3.0-install.patch, 1.1,
	NONE paraview-3.3.1-gcc43.patch, 1.1,
	NONE paraview-3.4.0-qt.patch, 1.1, NONE
Message-ID: <20090828150152.BA61D11C0044@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1471/F-11

Modified Files:
	.cvsignore paraview.spec sources 
Added Files:
	import.log paraview-3.6.0-assistant-qt4.patch 
	paraview-3.6.0-install.patch paraview-3.6.1-demo.patch 
	paraview-3.6.1-doc.patch paraview-3.6.1-plugins.patch 
Removed Files:
	paraview-3.2.1-assistant-qt4.patch paraview-3.3.0-doc.patch 
	paraview-3.3.0-install.patch paraview-3.3.1-gcc43.patch 
	paraview-3.4.0-qt.patch 
Log Message:
-m Update to 3.6.1 from devel


--- NEW FILE import.log ---
paraview-3_6_1-5_fc12:F-11:paraview-3.6.1-5.fc12.src.rpm:1251471554

paraview-3.6.0-assistant-qt4.patch:
 Applications/OverView/Core/MainWindow.cxx |    2 +-
 Qt/Components/pqClientMainWindow.cxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE paraview-3.6.0-assistant-qt4.patch ---
--- ParaView-3.6.0/Applications/OverView/Core/MainWindow.cxx.assistant-qt4	2009-06-29 16:51:37.273654166 -0600
+++ ParaView-3.6.0/Applications/OverView/Core/MainWindow.cxx	2009-06-29 16:52:03.205652509 -0600
@@ -933,7 +933,7 @@
   QString assistantExe;
   QString profileFile;
 
-  const char* assistantName = "assistant";
+  const char* assistantName = "assistant_adp";
 #if defined(Q_WS_WIN)
   const char* binDir = "\\";
   const char* binDir1 = "\\..\\";
--- ParaView-3.6.0/Qt/Components/pqClientMainWindow.cxx.assitant-qt4	2009-06-29 16:51:37.285652874 -0600
+++ ParaView-3.6.0/Qt/Components/pqClientMainWindow.cxx	2009-06-29 16:52:08.521653470 -0600
@@ -989,7 +989,7 @@
   QString assistantExe;
   QString profileFile;
 
-  const char* assistantName = "assistant";
+  const char* assistantName = "assistant_adp";
 #if defined(Q_WS_WIN)
   const char* extString = ".exe";
   const char* binDir = "\\";

paraview-3.6.0-install.patch:
 CMakeLists.txt |    9 ---------
 1 file changed, 9 deletions(-)

--- NEW FILE paraview-3.6.0-install.patch ---
--- ParaView-3.6.0/Applications/Client/CMakeLists.txt.install	2009-05-22 11:00:47.000000000 -0600
+++ ParaView-3.6.0/Applications/Client/CMakeLists.txt	2009-06-29 16:36:03.319592245 -0600
@@ -531,15 +531,6 @@
   FOREACH(qtlib ${QTLIBLIST})
     IF (NOT WIN32)
       #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR})
-      GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH)
-      GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
-      FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*")
-      INSTALL(CODE "
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\")
-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp}
-                 COMMAND tar c ${QT_LIB_LIST}
-                 COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR})
-        " COMPONENT Runtime)
     ELSE (NOT WIN32)
       GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH)
       INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime)

paraview-3.6.1-demo.patch:
 CMakeLists.txt |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE paraview-3.6.1-demo.patch ---
--- ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt.demo	2009-07-20 13:37:07.000000000 -0600
+++ ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt	2009-07-22 09:24:11.489421127 -0600
@@ -4,7 +4,3 @@
 add_executable(${exe} PointSpriteDemo.cxx)
 
 target_link_libraries(${exe} CSCS_PointSprite_Rendering vtkIO)
-
-install(TARGETS ${exe} 
-    RUNTIME DESTINATION ${PROJECT_BINARY_DIR}
-)

paraview-3.6.1-doc.patch:
 Applications/Client/CMakeLists.txt        |    2 +-
 Applications/OverView/Core/MainWindow.cxx |    2 +-
 Documentation/CMakeLists.txt              |    6 +++---
 Qt/Components/pqClientMainWindow.cxx      |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE paraview-3.6.1-doc.patch ---
--- ParaView3/Applications/Client/CMakeLists.txt.doc	2009-07-21 16:12:15.214230597 -0600
+++ ParaView3/Applications/Client/CMakeLists.txt	2009-07-21 16:19:41.606170088 -0600
@@ -130,7 +130,7 @@
       IMMEDIATE)
   INSTALL(
       FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"
-      DESTINATION ${PV_INSTALL_BIN_DIR}
+      DESTINATION "/usr/share/paraview"
       COMPONENT Runtime)
 ENDIF(NOT PV_INSTALL_NO_RUNTIME)
 
--- ParaView3/Applications/OverView/Core/MainWindow.cxx.doc	2009-07-20 13:36:12.000000000 -0600
+++ ParaView3/Applications/OverView/Core/MainWindow.cxx	2009-07-21 16:13:56.103167958 -0600
@@ -987,7 +987,7 @@
   if(profileFile.isEmpty())
     {
     // see if help is bundled up with the application
-    QString profile = ::Locate("pqClient.adp");
+    QString profile = QString("/usr/share/paraview/pqClient.adp");
       /*QCoreApplication::applicationDirPath() + QDir::separator()
       + QString("pqClient.adp");*/
     if(QFile::exists(profile))
--- ParaView3/Documentation/CMakeLists.txt.doc	2008-12-22 14:06:00.000000000 -0700
+++ ParaView3/Documentation/CMakeLists.txt	2009-07-21 16:17:55.928230792 -0600
@@ -143,7 +143,7 @@
 set(dir "${ParaView_BINARY_DIR}/Documentation/")
 install(
     DIRECTORY ${ParaView_BINARY_DIR}/Documentation/ 
-    DESTINATION ${PV_EXE_INSTALL}/Documentation 
+    DESTINATION "/usr/share/paraview/Documentation"
     COMPONENT Runtime
     REGEX ".html")
 
@@ -155,7 +155,7 @@
 
 install(
     FILES "${ParaView_BINARY_DIR}/about.html"
-    DESTINATION ${PV_INSTALL_BIN_DIR}
+    DESTINATION "/usr/share/paraview"
     COMPONENT Runtime)
 
 configure_file(
@@ -165,5 +165,5 @@
 
 install(
   FILES ${ParaView_BINARY_DIR}/pqClient.adp 
-  DESTINATION ${PV_EXE_INSTALL} 
+  DESTINATION "/usr/share/paraview"
   COMPONENT Runtime)
--- ParaView3/Qt/Components/pqClientMainWindow.cxx.doc	2009-07-20 13:37:39.000000000 -0600
+++ ParaView3/Qt/Components/pqClientMainWindow.cxx	2009-07-21 16:13:13.306167232 -0600
@@ -1060,7 +1060,7 @@
 #if defined(Q_WS_MAC)
     QString profile = QCoreApplication::applicationDirPath() + "/../Support/pqClient.adp";
 #else
-    QString profile = ::Locate("pqClient.adp");
+    QString profile = QString("/usr/share/paraview/pqClient.adp");
 #endif
       /*QCoreApplication::applicationDirPath() + QDir::separator()
       + QString("pqClient.adp");*/

paraview-3.6.1-plugins.patch:
 ParaViewPlugins.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE paraview-3.6.1-plugins.patch ---
--- ParaView3/CMake/ParaViewPlugins.cmake.plugins	2009-07-20 13:36:16.000000000 -0600
+++ ParaView3/CMake/ParaViewPlugins.cmake	2009-07-22 09:45:23.993423101 -0600
@@ -8,7 +8,7 @@
 MACRO(internal_paraview_install_plugin name)
   IF (PV_INSTALL_BIN_DIR)
     INSTALL(TARGETS ${name}
-      DESTINATION "${PV_INSTALL_BIN_DIR}/plugins/${name}"
+      DESTINATION "${PV_INSTALL_LIB_DIR}/plugins/${name}"
       COMPONENT Runtime)
   ENDIF (PV_INSTALL_BIN_DIR)
 ENDMACRO(internal_paraview_install_plugin)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Oct 2008 17:09:48 -0000	1.9
+++ .cvsignore	28 Aug 2009 15:01:51 -0000	1.10
@@ -1 +1 @@
-paraview-3.4.0.tar.gz
+paraview-3.6.1.tar.gz


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/paraview.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- paraview.spec	24 Feb 2009 22:42:21 -0000	1.33
+++ paraview.spec	28 Aug 2009 15:01:52 -0000	1.34
@@ -1,12 +1,12 @@
 %{!?build_mpi:%define build_mpi 1}
 %define pv_maj 3
-%define pv_min 4
-%define pv_patch 0
+%define pv_min 6
+%define pv_patch 1
 %define pv_majmin %{pv_maj}.%{pv_min}
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -15,18 +15,24 @@ URL:            http://www.paraview.org/
 Source0:        http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
 Source1:        paraview_22x22.png
 Source2:        paraview.xml
-#Allow build with Qt 4.5
-Patch1:         paraview-3.4.0-qt.patch
 #Don't try to copy Qt libraries into paraview directory
-Patch2:         paraview-3.3.0-install.patch
+Patch2:         paraview-3.6.0-install.patch
 #Move pqClient.adp into %{_datadir}/paraview
-Patch3:         paraview-3.3.0-doc.patch
-Patch4:         paraview-3.2.1-assistant-qt4.patch
+Patch3:         paraview-3.6.1-doc.patch
+#Reported upstream: http://public.kitware.com/Bug/view.php?id=9458
+#Look for assistant_adp instead of assistant
+Patch4:         paraview-3.6.0-assistant-qt4.patch
 #Reported upstream: http://public.kitware.com/Bug/view.php?id=7022
-Patch6:         paraview-3.3.1-gcc43.patch
+#Installs PointSpriteDemo into incorrect location, remove install for now
+#Reported upstream: http://public.kitware.com/mantis/view.php?id=9292
+Patch5:         paraview-3.6.1-demo.patch
+#Install plugins into %{_libdir}/paraview/plugins instead of %{_bindir}/plugins
+#Reported upstream: http://public.kitware.com/mantis/view.php?id=9293
+Patch6:         paraview-3.6.1-plugins.patch
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
 Patch8:         paraview-3.4.0-hdf5-1.8.2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -43,6 +49,7 @@ BuildRequires:  readline-devel
 BuildRequires:  openssl-devel
 BuildRequires:  gnuplot
 BuildRequires:  wget
+BuildRequires:  boost-devel
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       %{name}-doc = %{version}-%{release}
 Requires:       qt4-assistant
@@ -51,6 +58,57 @@ Requires(postun): /usr/bin/update-deskto
 Obsoletes:      paraview-demos < %{version}-%{release}
 Provides:       paraview-demos = %{version}-%{release}
 
+#VTK_USE_RPATH=OFF needed to build everything
+# This is still an alpha feature and does not install properly -
+#  libOverViewCora.so is not installed
+#	-DPARAVIEW_BUILD_OverView:BOOL=ON 
+# These require OverView
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON
+#	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\
+#	-DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON
+%define paraview_cmake_options \\\
+        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
+        -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
+        -DTCL_LIBRARY:PATH=tcl \\\
+        -DTK_LIBRARY:PATH=tk \\\
+	-DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\
+	-DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF \\\
+        -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
+        -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \\\
+        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\
+        -DVTK_USE_BOOST:BOOL=ON \\\
+        -DVTK_USE_INFOVIS:BOOL=OFF \\\
+        -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\
+        -DVTK_USE_RPATH:BOOL=OFF \\\
+        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\
+        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\
+        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \\\
+        -DVTK_USE_SYSTEM_PNG:BOOL=ON \\\
+        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\
+        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\
+        -DBUILD_DOCUMENTATION:BOOL=ON \\\
+        -DBUILD_EXAMPLES:BOOL=ON
 
 %description
 ParaView is an application designed with the need to visualize large data
@@ -67,7 +125,8 @@ various Unix workstations and clusters. 
 Visualization Toolkit as the data processing and rendering engine and has a
 user interface written using a unique blend of Tcl/Tk and C++.
 
-NOTE: This version has NOT been compiled with MPI support.
+NOTE: The version in this package has NOT been compiled with MPI support.
+Install the paraview-mpi package to get MPI support.
 
 
 %if %{build_mpi}
@@ -120,12 +179,12 @@ BuildArch:      noarch
 
 
 %prep
-%setup -q -n ParaView-%{version}
-%patch1 -p1 -b .qt
+%setup -q -n ParaView3
 %patch2 -p1 -b .install
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
-%patch6 -p1 -b .gcc43
+%patch5 -p1 -b .demo
+%patch6 -p1 -b .plugins
 %patch7 -p1 -b .hdf5
 %patch8 -p1 -b .hdf5-1.8.2
 #Remove included hdf5 just to be sure
@@ -141,27 +200,10 @@ export CXX='g++'
 export MAKE='make'
 export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
-#VTK_USE_RPATH=OFF needed to build everything
 %cmake .. \
-        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview \
-        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
-        -DCMAKE_C_COMPILER:FILEPATH=$CC \
-        -DTCL_LIBRARY:PATH=tcl \
-        -DTK_LIBRARY:PATH=tk \
-        -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-        -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-        -DVTK_USE_INFOVIS:BOOL=OFF \
-        -DVTK_USE_RPATH:BOOL=OFF \
-        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-        -DBUILD_DOCUMENTATION:BOOL=ON \
-        -DBUILD_EXAMPLES:BOOL=ON
-#Need to run cmake twice to get MPI headers into VTK/Parallel build config
+        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
+	%{paraview_cmake_options}
+##Need to run cmake twice to get MPI headers into VTK/Parallel build config
 cmake ..
 make VERBOSE=1 %{?_smp_mflags}
 popd
@@ -173,28 +215,12 @@ export CXX='g++'
 export MAKE='make'
 export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
-#VTK_USE_RPATH=OFF needed to build everything
 %cmake .. \
-        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-mpi \
-        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
-        -DCMAKE_C_COMPILER:FILEPATH=$CC \
-        -DTCL_LIBRARY:PATH=tcl \
-        -DTK_LIBRARY:PATH=tk \
-        -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
+        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview-mpi \
         -DPARAVIEW_USE_MPI:BOOL=ON \
-        -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
-        -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-        -DVTK_USE_INFOVIS:BOOL=OFF \
-        -DVTK_USE_RPATH:BOOL=OFF \
-        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-        -DBUILD_DOCUMENTATION:BOOL=ON \
-        -DBUILD_EXAMPLES:BOOL=ON
+	-DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/$(pkg-config --modversion openmpi)/bin/mpicxx \
+	%{paraview_cmake_options}
 #Need to run cmake twice to get MPI headers into VTK/Parallel build config
 cmake ..
 make VERBOSE=1 %{?_smp_mflags}
@@ -220,12 +246,13 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{
 pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#Don't ship copy of Qt assisstant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+      $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
-#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
 #Don't need mpi versions of these
-rm -f paraview pvpython pvTestDriver vtkSMExtractDocumentation
+rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
 #Move the remaining mpi binaries out of the way
 for f in *
 do
@@ -236,7 +263,7 @@ popd
 #Remove mpi copy of includes, man pages, and documentation
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -r $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/{doc,Documentation,pqClient.adp}
+#rm -r $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/{doc,Documentation,pqClient.adp}
 popd
 %endif
 
@@ -270,11 +297,12 @@ popd
 rm -r $RPM_BUILD_ROOT/usr/plugins
 
 #Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+      $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
 
 #Move the documentation
-mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
-   $RPM_BUILD_ROOT%{_datadir}/paraview/
+#mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
+#   $RPM_BUILD_ROOT%{_datadir}/paraview/
 
 
 %clean
@@ -301,8 +329,10 @@ update-mime-database %{_datadir}/mime &>
 %files
 %defattr(-,root,root,-)
 %doc License_v1.2.txt
+%{_bindir}/lproj
 %{_bindir}/paraview
 %{_bindir}/pvbatch
+%{_bindir}/pvblot
 %{_bindir}/pvdataserver
 %{_bindir}/pvpython
 %{_bindir}/pvrenderserver
@@ -311,6 +341,8 @@ update-mime-database %{_datadir}/mime &>
 %{_bindir}/vtkSMExtractDocumentation
 %{_libdir}/paraview/
 %exclude %{_libdir}/paraview/doc/
+%dir %{_datadir}/paraview
+%doc %{_datadir}/paraview/about.html
 
 %if %{build_mpi}
 %files mpi
@@ -327,7 +359,6 @@ update-mime-database %{_datadir}/mime &>
 %files data
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-paraview.desktop
-%dir %{_datadir}/paraview
 %{_datadir}/pixmaps/paraview_22x22.png
 %{_datadir}/mime/packages/paraview.xml
 
@@ -341,10 +372,30 @@ update-mime-database %{_datadir}/mime &>
 %files doc
 %defattr(-,root,root,-)
 %doc %{_datadir}/paraview/pqClient.adp
+%doc %{_datadir}/paraview/pqClientDocFinder.txt
 %doc %{_datadir}/paraview/Documentation/
 
 
 %changelog
+* Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
+- Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
+- Update assitant patch to use assistant_adp, don't ship assistant-real
+
+* Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
+- Disable building various plugins that need OverView
+
+* Tue Aug 25 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-3
+- Disable building OverView - not ready yet
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.6.1-2
+- rebuilt with new openssl
+
+* Wed Jul 22 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-1
+- Update to 3.6.1
+
+* Thu May 7 2009 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-5
+- Update doc patch to look for help file in the right place (bug #499273)
+
 * Tue Feb 24 2009 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-4
 - Rebuild with hdf5 1.8.2, gcc 4.4.0
 - Update hdf5-1.8 patch to work with hdf5 1.8.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Oct 2008 17:09:48 -0000	1.9
+++ sources	28 Aug 2009 15:01:52 -0000	1.10
@@ -1 +1 @@
-a12067913e08ea7a465ca41509dbfde1  paraview-3.4.0.tar.gz
+becbff0b9989b1b788dba75c4289ee7e  paraview-3.6.1.tar.gz


--- paraview-3.2.1-assistant-qt4.patch DELETED ---


--- paraview-3.3.0-doc.patch DELETED ---


--- paraview-3.3.0-install.patch DELETED ---


--- paraview-3.3.1-gcc43.patch DELETED ---


--- paraview-3.4.0-qt.patch DELETED ---



From bkearney at fedoraproject.org  Fri Aug 28 15:05:14 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Fri, 28 Aug 2009 15:05:14 +0000 (UTC)
Subject: rpms/java-augeas/devel import.log, NONE, 1.1 java-augeas.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828150514.E0BDB11C0044@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/java-augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4255/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log java-augeas.spec 
Log Message:
Initial Checkin



--- NEW FILE import.log ---
java-augeas-0_0_1-2_fc11:HEAD:java-augeas-0.0.1-2.fc11.src.rpm:1251471793


--- NEW FILE java-augeas.spec ---
Summary:    Java bindings for the augeas library
Name:       java-augeas
Version:    0.0.1
Release:    2%{?dist}
License:    LGPLv2+
BuildArch:  noarch
Group:      Development/Libraries
Source:     http://augeas.net/download/java/%{name}-%{version}.tar.gz
URL:        http://augeas.net/
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

Requires:   jna
Requires:   augeas >= 0.5.1
Requires:   java >= 1:1.6.0
Requires:   jpackage-utils
BuildRequires:  ant
BuildRequires:  jna
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  junit
BuildRequires:  ant-junit

#
# the jpackage-utils should provide a %{java_home} macro
# to select a different Java JVM from the default one use the following
# rpmbuild --define 'java_home /usr/lib/jvm/your_jvm_of_choice'
#

%description
java-augeas is a java bindings onto the augeas configuration API.
It requires augeas >= 0.5.1


%package    javadoc
Summary:    Java documentation for %{name}
Group:      Development/Documentation
Requires:   %{name} = %{version}-%{release}
Requires:   jpackage-utils

%description    javadoc
API documentation for %{name}.
%prep
%setup -q

%build
ant build docs

%install
rm -fr %{buildroot}
install -d -m0755 %{buildroot}%{_javadir}
install -d -m0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -p target/augeas-%{version}.jar %{buildroot}%{_javadir}
%{__ln_s} %{_javadir}/augeas-%{version}.jar %{buildroot}%{_javadir}/augeas.jar 
cp -r -p target/javadoc %{buildroot}%{_javadocdir}/%{name}



%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README INSTALL
%{_javadir}/*.jar

%files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name}

%changelog
* Tue Aug 27 2009 Bryan Kearney <bkearney at redhat.com> - 0.0.1-2
- Spec review comments from dan at danny.cz.

* Tue Aug 4 2009 Bryan Kearney <bkearney at redhat.com> - 0.0.1-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-augeas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:37:51 -0000	1.1
+++ .cvsignore	28 Aug 2009 15:05:14 -0000	1.2
@@ -0,0 +1 @@
+java-augeas-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-augeas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:37:51 -0000	1.1
+++ sources	28 Aug 2009 15:05:14 -0000	1.2
@@ -0,0 +1 @@
+78ae7131483892a03a5acab617e651f8  java-augeas-0.0.1.tar.gz



From ynemoy at fedoraproject.org  Fri Aug 28 15:05:44 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Fri, 28 Aug 2009 15:05:44 +0000 (UTC)
Subject: rpms/ghc-tar/F-11 ghc-tar.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090828150544.72D0611C0044@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-tar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4759

Modified Files:
	ghc-tar.spec sources 
Log Message:
Updated Upstream



Index: ghc-tar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/F-11/ghc-tar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-tar.spec	23 Aug 2009 16:18:32 -0000	1.1
+++ ghc-tar.spec	28 Aug 2009 15:05:44 -0000	1.2
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.0.0
-Release:        2%{?dist}
+Version:        0.3.1.0
+Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 0.3.1.0-1
+- updated to latest upstream
+
 * Sun Aug 23 2009 Yaakov M. Nemoy <loupgaroublond at gmail.com> - 0.3.0.0-2
 - updated to latest cabal2spec output
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-tar/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Aug 2009 16:18:32 -0000	1.2
+++ sources	28 Aug 2009 15:05:44 -0000	1.3
@@ -1 +1 @@
-3e77fe5b25566ab16adc5496b64bd0bd  tar-0.3.0.0.tar.gz
+10b54856495f9ef0a42aa270085c7d5e  tar-0.3.1.0.tar.gz



From msuchy at fedoraproject.org  Fri Aug 28 15:06:34 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Fri, 28 Aug 2009 15:06:34 +0000 (UTC)
Subject: rpms/rpmconf/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rpmconf.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090828150634.9B96F11C0044@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rpmconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5083/devel

Modified Files:
	.cvsignore import.log rpmconf.spec sources 
Log Message:
Importing new version (0.1.7) of rpmconf to rawhide.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Jul 2009 07:11:10 -0000	1.2
+++ .cvsignore	28 Aug 2009 15:06:34 -0000	1.3
@@ -1 +1 @@
-rpmconf-0.1.6.tar.gz
+rpmconf-0.1.7.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Jul 2009 07:11:10 -0000	1.1
+++ import.log	28 Aug 2009 15:06:34 -0000	1.2
@@ -1 +1,2 @@
 rpmconf-0_1_6-1:HEAD:rpmconf-0.1.6-1.src.rpm:1248073836
+rpmconf-0_1_7-1:HEAD:rpmconf-0.1.7-1.src.rpm:1251471879


Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/rpmconf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpmconf.spec	27 Jul 2009 03:12:40 -0000	1.2
+++ rpmconf.spec	28 Aug 2009 15:06:34 -0000	1.3
@@ -2,8 +2,8 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.6
-Release: 2%{?dist}
+Version: 0.1.7
+Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -12,8 +12,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 BuildRequires: docbook-utils
 
 %description
-This tool seach for .rpmnew and .rpmsave files and ask you what to do with 
-them:
+This tool seach for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+with them:
 Keep current version, place back old version or watch the diff.
 
 %prep
@@ -37,8 +37,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug 28 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.7-1
+- add support for handling .rpmorig
+- 513794 - localisation problem
+- add support for suspending script
 
 * Fri Jul 17 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.6-1
 - addressed fedora package review notes (#7)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jul 2009 07:11:10 -0000	1.2
+++ sources	28 Aug 2009 15:06:34 -0000	1.3
@@ -1 +1 @@
-5e01709e49e38d31459654c1b5bf5d51  rpmconf-0.1.6.tar.gz
+69039a340c54cd1395a322a657650f42  rpmconf-0.1.7.tar.gz



From than at fedoraproject.org  Fri Aug 28 15:11:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 15:11:22 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.67, 1.68 kdepim.spec, 1.232,
	1.233 sources, 1.75, 1.76 kmail-fonts-4.3.patch, 1.1, NONE
Message-ID: <20090828151122.910FA11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9951

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kmail-fonts-4.3.patch 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	30 Jul 2009 08:44:48 -0000	1.67
+++ .cvsignore	28 Aug 2009 15:11:21 -0000	1.68
@@ -3,3 +3,4 @@ kdepim-4.2.95.tar.bz2
 kdepim-4.2.96.tar.bz2
 kdepim-4.2.98.tar.bz2
 kdepim-4.3.0.tar.bz2
+kdepim-4.3.1.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- kdepim.spec	19 Aug 2009 02:26:55 -0000	1.232
+++ kdepim.spec	28 Aug 2009 15:11:22 -0000	1.233
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.0
-Release: 4%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,9 +15,7 @@ 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
-## upstream 
-# https://bugs.kde.org/show_bug.cgi?id=178402
-Patch100: kmail-fonts-4.3.patch
+# 4.3.1 upstream 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -97,7 +95,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p0 -b .kmail-fonts
 
 
 %build
@@ -216,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
 - kmail: upstream fix for custom font settings (#kdebug#178402)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	30 Jul 2009 08:44:49 -0000	1.75
+++ sources	28 Aug 2009 15:11:22 -0000	1.76
@@ -1 +1 @@
-ddc887f19ef9cd454f4f3226c955aaaf  kdepim-4.3.0.tar.bz2
+1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2


--- kmail-fonts-4.3.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Aug 28 15:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:12:59 +0000
Subject: [pkgdb] php-adodb: giallu has requested watchcommits
Message-ID: <20090828151259.307D010F877@bastion2.fedora.phx.redhat.com>

giallu has requested the watchcommits acl on php-adodb (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:12:59 +0000
Subject: [pkgdb] php-adodb: giallu has requested commit
Message-ID: <20090828151300.037B910F87C@bastion2.fedora.phx.redhat.com>

giallu has requested the commit acl on php-adodb (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:13:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:13:10 +0000
Subject: [pkgdb] php-adodb: giallu has requested approveacls
Message-ID: <20090828151310.83FCB10F890@bastion2.fedora.phx.redhat.com>

giallu has requested the approveacls acl on php-adodb (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:13:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:13:13 +0000
Subject: [pkgdb] php-adodb: giallu has requested watchbugzilla
Message-ID: <20090828151313.E7C9C10F894@bastion2.fedora.phx.redhat.com>

giallu has requested the watchbugzilla acl on php-adodb (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From nphilipp at fedoraproject.org  Fri Aug 28 15:15:16 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 15:15:16 +0000 (UTC)
Subject: rpms/system-config-samba/devel sources,1.77,1.78
Message-ID: <20090828151516.4B53D11C0078@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13265

Modified Files:
	sources 
Log Message:
fix version 1.2.80


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	28 Aug 2009 14:59:10 -0000	1.77
+++ sources	28 Aug 2009 15:15:16 -0000	1.78
@@ -1 +1 @@
-6a9b6a6f075147aeebe0f61d314a801c  system-config-samba-1.2.80.tar.bz2
+dedc46cc37247b1993b4eb99ab9f4d51  system-config-samba-1.2.80.tar.bz2



From than at fedoraproject.org  Fri Aug 28 15:15:15 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 15:15:15 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.41, 1.42 kdepimlibs.spec, 1.97, 
	1.98 sources, 1.41, 1.42
Message-ID: <20090828151515.D34FB11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13186

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	30 Jul 2009 08:49:00 -0000	1.41
+++ .cvsignore	28 Aug 2009 15:15:14 -0000	1.42
@@ -3,3 +3,4 @@ kdepimlibs-4.2.95.tar.bz2
 kdepimlibs-4.2.96.tar.bz2
 kdepimlibs-4.2.98.tar.bz2
 kdepimlibs-4.3.0.tar.bz2
+kdepimlibs-4.3.1.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kdepimlibs.spec	4 Aug 2009 22:57:47 -0000	1.97
+++ kdepimlibs.spec	28 Aug 2009 15:15:14 -0000	1.98
@@ -11,8 +11,8 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.0
-Release: 2%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -213,6 +213,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Tue Aug 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - akonadi_version 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	30 Jul 2009 08:49:00 -0000	1.41
+++ sources	28 Aug 2009 15:15:14 -0000	1.42
@@ -1 +1 @@
-313f1a9d353f82c2ffee517115404dd5  kdepimlibs-4.3.0.tar.bz2
+8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2



From tgl at fedoraproject.org  Fri Aug 28 15:18:58 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 28 Aug 2009 15:18:58 +0000 (UTC)
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.28,1.29
Message-ID: <20090828151858.567FB11C0078@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16301

Modified Files:
	postgresql-odbc.spec 
Log Message:
Rebuild with new openssl


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- postgresql-odbc.spec	18 Aug 2009 04:30:14 -0000	1.28
+++ postgresql-odbc.spec	28 Aug 2009 15:18:58 -0000	1.29
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver
 Version: 08.04.0100
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Databases
 URL: http://psqlodbc.projects.postgresql.org/
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Fri Aug 28 2009 Tom Lane <tgl at redhat.com> 08.04.0100-2
+- Rebuild with new openssl
+
 * Tue Aug 18 2009 Tom Lane <tgl at redhat.com> 08.04.0100-1
 - Update to version 08.04.0100
 



From bkearney at fedoraproject.org  Fri Aug 28 15:20:27 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Fri, 28 Aug 2009 15:20:27 +0000 (UTC)
Subject: rpms/java-augeas/F-11 import.log, NONE, 1.1 java-augeas.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828152027.E4D1011C0494@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/java-augeas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17615/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log java-augeas.spec 
Log Message:
Initial Checkin



--- NEW FILE import.log ---
java-augeas-0_0_1-2_fc11:F-11:java-augeas-0.0.1-2.fc11.src.rpm:1251472718


--- NEW FILE java-augeas.spec ---
Summary:    Java bindings for the augeas library
Name:       java-augeas
Version:    0.0.1
Release:    2%{?dist}
License:    LGPLv2+
BuildArch:  noarch
Group:      Development/Libraries
Source:     http://augeas.net/download/java/%{name}-%{version}.tar.gz
URL:        http://augeas.net/
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

Requires:   jna
Requires:   augeas >= 0.5.1
Requires:   java >= 1:1.6.0
Requires:   jpackage-utils
BuildRequires:  ant
BuildRequires:  jna
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  junit
BuildRequires:  ant-junit

#
# the jpackage-utils should provide a %{java_home} macro
# to select a different Java JVM from the default one use the following
# rpmbuild --define 'java_home /usr/lib/jvm/your_jvm_of_choice'
#

%description
java-augeas is a java bindings onto the augeas configuration API.
It requires augeas >= 0.5.1


%package    javadoc
Summary:    Java documentation for %{name}
Group:      Development/Documentation
Requires:   %{name} = %{version}-%{release}
Requires:   jpackage-utils

%description    javadoc
API documentation for %{name}.
%prep
%setup -q

%build
ant build docs

%install
rm -fr %{buildroot}
install -d -m0755 %{buildroot}%{_javadir}
install -d -m0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -p target/augeas-%{version}.jar %{buildroot}%{_javadir}
%{__ln_s} %{_javadir}/augeas-%{version}.jar %{buildroot}%{_javadir}/augeas.jar 
cp -r -p target/javadoc %{buildroot}%{_javadocdir}/%{name}



%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README INSTALL
%{_javadir}/*.jar

%files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name}

%changelog
* Tue Aug 27 2009 Bryan Kearney <bkearney at redhat.com> - 0.0.1-2
- Spec review comments from dan at danny.cz.

* Tue Aug 4 2009 Bryan Kearney <bkearney at redhat.com> - 0.0.1-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-augeas/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:37:51 -0000	1.1
+++ .cvsignore	28 Aug 2009 15:20:27 -0000	1.2
@@ -0,0 +1 @@
+java-augeas-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-augeas/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:37:51 -0000	1.1
+++ sources	28 Aug 2009 15:20:27 -0000	1.2
@@ -0,0 +1 @@
+78ae7131483892a03a5acab617e651f8  java-augeas-0.0.1.tar.gz



From lennart at fedoraproject.org  Fri Aug 28 15:24:52 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Fri, 28 Aug 2009 15:24:52 +0000 (UTC)
Subject: rpms/metacity/devel metacity.spec,1.199,1.200
Message-ID: <20090828152452.5F82611C0078@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21294

Modified Files:
	metacity.spec 
Log Message:
Actually apply the patch from -7


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- metacity.spec	28 Aug 2009 05:39:15 -0000	1.199
+++ metacity.spec	28 Aug 2009 15:24:52 -0000	1.200
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -80,6 +80,7 @@ API. This package exists purely for tech
 %patch6 -p1 -b .restart-if-running
 %patch7 -p1 -b .bell
 %patch8 -p1 -b .sound-cache
+%patch9 -p1 -b .tooltip
 
 # force regeneration
 rm src/metacity.schemas
@@ -187,6 +188,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> - 2.27.0-8
+- Actually apply the patch from -7
+
 * Fri Aug 28 2009 Lennart Poettering <lpoetter at redhat.com> - 2.27.0-7
 - Apply another trivial patch related to sound events
 - http://bugzilla.gnome.org/show_bug.cgi?id=593358



From bkearney at fedoraproject.org  Fri Aug 28 15:38:41 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Fri, 28 Aug 2009 15:38:41 +0000 (UTC)
Subject: rpms/java-augeas/F-10 import.log, NONE, 1.1 java-augeas.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828153841.C763511C0078@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/java-augeas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28989/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log java-augeas.spec 
Log Message:
Initial Checkin



--- NEW FILE import.log ---
java-augeas-0_0_1-2_fc11:F-10:java-augeas-0.0.1-2.fc11.src.rpm:1251473812


--- NEW FILE java-augeas.spec ---
Summary:    Java bindings for the augeas library
Name:       java-augeas
Version:    0.0.1
Release:    2%{?dist}
License:    LGPLv2+
BuildArch:  noarch
Group:      Development/Libraries
Source:     http://augeas.net/download/java/%{name}-%{version}.tar.gz
URL:        http://augeas.net/
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root

Requires:   jna
Requires:   augeas >= 0.5.1
Requires:   java >= 1:1.6.0
Requires:   jpackage-utils
BuildRequires:  ant
BuildRequires:  jna
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils
BuildRequires:  junit
BuildRequires:  ant-junit

#
# the jpackage-utils should provide a %{java_home} macro
# to select a different Java JVM from the default one use the following
# rpmbuild --define 'java_home /usr/lib/jvm/your_jvm_of_choice'
#

%description
java-augeas is a java bindings onto the augeas configuration API.
It requires augeas >= 0.5.1


%package    javadoc
Summary:    Java documentation for %{name}
Group:      Development/Documentation
Requires:   %{name} = %{version}-%{release}
Requires:   jpackage-utils

%description    javadoc
API documentation for %{name}.
%prep
%setup -q

%build
ant build docs

%install
rm -fr %{buildroot}
install -d -m0755 %{buildroot}%{_javadir}
install -d -m0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -p target/augeas-%{version}.jar %{buildroot}%{_javadir}
%{__ln_s} %{_javadir}/augeas-%{version}.jar %{buildroot}%{_javadir}/augeas.jar 
cp -r -p target/javadoc %{buildroot}%{_javadocdir}/%{name}



%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README INSTALL
%{_javadir}/*.jar

%files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name}

%changelog
* Tue Aug 27 2009 Bryan Kearney <bkearney at redhat.com> - 0.0.1-2
- Spec review comments from dan at danny.cz.

* Tue Aug 4 2009 Bryan Kearney <bkearney at redhat.com> - 0.0.1-1
- Initial Packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-augeas/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:37:51 -0000	1.1
+++ .cvsignore	28 Aug 2009 15:38:41 -0000	1.2
@@ -0,0 +1 @@
+java-augeas-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-augeas/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:37:51 -0000	1.1
+++ sources	28 Aug 2009 15:38:41 -0000	1.2
@@ -0,0 +1 @@
+78ae7131483892a03a5acab617e651f8  java-augeas-0.0.1.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:25 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828154325.1CE8110F878@bastion2.fedora.phx.redhat.com>

topdog has set the watchcommits acl on php-adodb (Fedora EPEL 5) to Approved for giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:25 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828154325.6507210F87C@bastion2.fedora.phx.redhat.com>

topdog has set the commit acl on php-adodb (Fedora EPEL 5) to Approved for giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:26 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828154326.B0A8D10F88B@bastion2.fedora.phx.redhat.com>

topdog has set the watchbugzilla acl on php-adodb (Fedora EPEL 5) to Approved for giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:29 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828154329.7F67910F890@bastion2.fedora.phx.redhat.com>

topdog has set the approveacls acl on php-adodb (Fedora EPEL 5) to Approved for giallu

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:47 +0000
Subject: [pkgdb] php-adodb: topdog has requested watchcommits
Message-ID: <20090828154347.84F8110F878@bastion2.fedora.phx.redhat.com>

topdog has requested the watchcommits acl on php-adodb (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:48 +0000
Subject: [pkgdb] php-adodb: topdog has requested commit
Message-ID: <20090828154348.6DDE710F89C@bastion2.fedora.phx.redhat.com>

topdog has requested the commit acl on php-adodb (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:49 +0000
Subject: [pkgdb] php-adodb: topdog has requested approveacls
Message-ID: <20090828154349.99B1610F89F@bastion2.fedora.phx.redhat.com>

topdog has requested the approveacls acl on php-adodb (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:43:59 +0000
Subject: [pkgdb] php-adodb: topdog has requested watchbugzilla
Message-ID: <20090828154359.EACBD10F877@bastion2.fedora.phx.redhat.com>

topdog has requested the watchbugzilla acl on php-adodb (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:07 +0000
Subject: [pkgdb] php-adodb: topdog has requested watchbugzilla
Message-ID: <20090828154407.D0A3210F8A5@bastion2.fedora.phx.redhat.com>

topdog has requested the watchbugzilla acl on php-adodb (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:11 +0000
Subject: [pkgdb] php-adodb: topdog has requested watchcommits
Message-ID: <20090828154411.72DB810F898@bastion2.fedora.phx.redhat.com>

topdog has requested the watchcommits acl on php-adodb (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:14 +0000
Subject: [pkgdb] php-adodb: topdog has requested commit
Message-ID: <20090828154414.B353D10F8A8@bastion2.fedora.phx.redhat.com>

topdog has requested the commit acl on php-adodb (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:18 +0000
Subject: [pkgdb] php-adodb: topdog has requested approveacls
Message-ID: <20090828154418.43EE010F8AF@bastion2.fedora.phx.redhat.com>

topdog has requested the approveacls acl on php-adodb (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:42 +0000
Subject: [pkgdb] php-adodb: topdog has requested watchbugzilla
Message-ID: <20090828154442.97A8C10F895@bastion2.fedora.phx.redhat.com>

topdog has requested the watchbugzilla acl on php-adodb (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:45 +0000
Subject: [pkgdb] php-adodb: topdog has requested watchcommits
Message-ID: <20090828154445.B3C5310F89B@bastion2.fedora.phx.redhat.com>

topdog has requested the watchcommits acl on php-adodb (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:46 +0000
Subject: [pkgdb] php-adodb: topdog has requested commit
Message-ID: <20090828154446.3BED910F8A0@bastion2.fedora.phx.redhat.com>

topdog has requested the commit acl on php-adodb (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:44:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:44:49 +0000
Subject: [pkgdb] php-adodb: topdog has requested approveacls
Message-ID: <20090828154449.CB8AB10F8A3@bastion2.fedora.phx.redhat.com>

topdog has requested the approveacls acl on php-adodb (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From twaugh at fedoraproject.org  Fri Aug 28 15:45:25 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:45:25 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-proxy-auth.patch, NONE,
	1.1 system-config-printer.spec, 1.277, 1.278
Message-ID: <20090828154525.C122111C0078@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-serv1749

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-proxy-auth.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
- Fixed proxy authentication.


system-config-printer-proxy-auth.patch:
 jobviewer.py |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

--- NEW FILE system-config-printer-proxy-auth.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.proxy-auth system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.proxy-auth	2009-08-28 16:40:54.624947867 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-28 16:42:01.430823181 +0100
@@ -604,10 +604,8 @@ class JobViewer (GtkGUI, monitor.Watcher
                     else:
                         (serverport, rest) = urllib.splithost (rest)
                         (server, port) = urllib.splitnport (serverport)
-                    username = pwd.getpwuid (os.getuid ())[0]
                     keyring_attrs.update ({ "server": str (server.lower ()),
-                                            "protocol": str (scheme),
-                                            "user": str (username)})
+                                            "protocol": str (scheme)})
 
                 if job in self.authenticated_jobs:
                     # We've already tried to authenticate this job before.
@@ -656,19 +654,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                         c._end_operation ()
                         nonfatalException ()
 
-                self.display_auth_info_dialog (job)
-
-    def on_auth_notification_closed (self, notification, reason=None):
-        job = notification.get_data ('job-id')
-        debugprint ("auth notification closed for job %s" % job)
-        self.auth_notifications[job].set_data ('closed', True)
-        del self.auth_notifications[job]
-
-    def on_auth_notification_authenticate (self, notification, action):
-        job = notification.get_data ('job-id')
-        keyring_attrs = notification.get_data ('keyring-attrs')
-        debugprint ("auth notification authenticate for job %s" % job)
-        self.display_auth_info_dialog (job, keyring_attrs)
+                username = pwd.getpwuid (os.getuid ())[0]
+                keyring_attrs["user"] = str (username)
+                self.display_auth_info_dialog (job, keyring_attrs)
 
     def display_auth_info_dialog (self, job, keyring_attrs=None):
         data = self.jobs[job]
@@ -759,8 +747,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                                            attrs.get ("protocol"))
                     ind = auth_info_required.index ('password')
                     secret = auth_info[ind]
-                    gnomekeyring.item_create_sync (keyring, type, name,
-                                                   attrs, secret, True)
+                    id = gnomekeyring.item_create_sync (keyring, type, name,
+                                                        attrs, secret, True)
+                    debugprint ("keyring: created id %d for %s" % (id, name))
             except:
                 nonfatalException ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- system-config-printer.spec	26 Aug 2009 16:51:10 -0000	1.277
+++ system-config-printer.spec	28 Aug 2009 15:45:25 -0000	1.278
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
+Patch4: system-config-printer-proxy-auth.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -68,6 +69,7 @@ the configuration tool.
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
+%patch4 -p1 -b .proxy-auth
 
 %build
 %configure
@@ -169,6 +171,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+- Fixed proxy authentication.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
 - Handle icon load failure gracefully.
 - Fixed statereason icon names.



From twaugh at fedoraproject.org  Fri Aug 28 15:46:25 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:46:25 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-proxy-auth.patch, NONE,
	1.1 system-config-printer.spec, 1.287, 1.288
Message-ID: <20090828154625.4760511C0078@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-serv2724

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-proxy-auth.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
- Fixed proxy authentication.


system-config-printer-proxy-auth.patch:
 jobviewer.py |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

--- NEW FILE system-config-printer-proxy-auth.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.proxy-auth system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.proxy-auth	2009-08-28 16:40:54.624947867 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-28 16:42:01.430823181 +0100
@@ -604,10 +604,8 @@ class JobViewer (GtkGUI, monitor.Watcher
                     else:
                         (serverport, rest) = urllib.splithost (rest)
                         (server, port) = urllib.splitnport (serverport)
-                    username = pwd.getpwuid (os.getuid ())[0]
                     keyring_attrs.update ({ "server": str (server.lower ()),
-                                            "protocol": str (scheme),
-                                            "user": str (username)})
+                                            "protocol": str (scheme)})
 
                 if job in self.authenticated_jobs:
                     # We've already tried to authenticate this job before.
@@ -656,19 +654,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                         c._end_operation ()
                         nonfatalException ()
 
-                self.display_auth_info_dialog (job)
-
-    def on_auth_notification_closed (self, notification, reason=None):
-        job = notification.get_data ('job-id')
-        debugprint ("auth notification closed for job %s" % job)
-        self.auth_notifications[job].set_data ('closed', True)
-        del self.auth_notifications[job]
-
-    def on_auth_notification_authenticate (self, notification, action):
-        job = notification.get_data ('job-id')
-        keyring_attrs = notification.get_data ('keyring-attrs')
-        debugprint ("auth notification authenticate for job %s" % job)
-        self.display_auth_info_dialog (job, keyring_attrs)
+                username = pwd.getpwuid (os.getuid ())[0]
+                keyring_attrs["user"] = str (username)
+                self.display_auth_info_dialog (job, keyring_attrs)
 
     def display_auth_info_dialog (self, job, keyring_attrs=None):
         data = self.jobs[job]
@@ -759,8 +747,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                                            attrs.get ("protocol"))
                     ind = auth_info_required.index ('password')
                     secret = auth_info[ind]
-                    gnomekeyring.item_create_sync (keyring, type, name,
-                                                   attrs, secret, True)
+                    id = gnomekeyring.item_create_sync (keyring, type, name,
+                                                        attrs, secret, True)
+                    debugprint ("keyring: created id %d for %s" % (id, name))
             except:
                 nonfatalException ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- system-config-printer.spec	27 Aug 2009 13:16:15 -0000	1.287
+++ system-config-printer.spec	28 Aug 2009 15:46:25 -0000	1.288
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -18,6 +18,7 @@ Patch1: system-config-printer-get_cursor
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
 Patch4: system-config-printer-polkit-1.patch
+Patch5: system-config-printer-proxy-auth.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -83,6 +84,7 @@ printers.
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
 %patch4 -p1 -b .polkit-1
+%patch5 -p1 -b .proxy-auth
 
 %build
 aclocal
@@ -197,6 +199,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+- Fixed proxy authentication.
+
 * Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
 - Ported to polkit-1.
 



From twaugh at fedoraproject.org  Fri Aug 28 15:47:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:47:15 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-proxy-auth.patch, NONE,
	1.1 system-config-printer.spec, 1.248, 1.249
Message-ID: <20090828154715.8774611C0078@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-serv3438

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-proxy-auth.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
- Fixed proxy authentication.


system-config-printer-proxy-auth.patch:
 jobviewer.py |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

--- NEW FILE system-config-printer-proxy-auth.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.proxy-auth system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.proxy-auth	2009-08-28 16:40:54.624947867 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-28 16:42:01.430823181 +0100
@@ -604,10 +604,8 @@ class JobViewer (GtkGUI, monitor.Watcher
                     else:
                         (serverport, rest) = urllib.splithost (rest)
                         (server, port) = urllib.splitnport (serverport)
-                    username = pwd.getpwuid (os.getuid ())[0]
                     keyring_attrs.update ({ "server": str (server.lower ()),
-                                            "protocol": str (scheme),
-                                            "user": str (username)})
+                                            "protocol": str (scheme)})
 
                 if job in self.authenticated_jobs:
                     # We've already tried to authenticate this job before.
@@ -656,19 +654,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                         c._end_operation ()
                         nonfatalException ()
 
-                self.display_auth_info_dialog (job)
-
-    def on_auth_notification_closed (self, notification, reason=None):
-        job = notification.get_data ('job-id')
-        debugprint ("auth notification closed for job %s" % job)
-        self.auth_notifications[job].set_data ('closed', True)
-        del self.auth_notifications[job]
-
-    def on_auth_notification_authenticate (self, notification, action):
-        job = notification.get_data ('job-id')
-        keyring_attrs = notification.get_data ('keyring-attrs')
-        debugprint ("auth notification authenticate for job %s" % job)
-        self.display_auth_info_dialog (job, keyring_attrs)
+                username = pwd.getpwuid (os.getuid ())[0]
+                keyring_attrs["user"] = str (username)
+                self.display_auth_info_dialog (job, keyring_attrs)
 
     def display_auth_info_dialog (self, job, keyring_attrs=None):
         data = self.jobs[job]
@@ -759,8 +747,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                                            attrs.get ("protocol"))
                     ind = auth_info_required.index ('password')
                     secret = auth_info[ind]
-                    gnomekeyring.item_create_sync (keyring, type, name,
-                                                   attrs, secret, True)
+                    id = gnomekeyring.item_create_sync (keyring, type, name,
+                                                        attrs, secret, True)
+                    debugprint ("keyring: created id %d for %s" % (id, name))
             except:
                 nonfatalException ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- system-config-printer.spec	27 Aug 2009 15:45:43 -0000	1.248
+++ system-config-printer.spec	28 Aug 2009 15:47:15 -0000	1.249
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -18,6 +18,7 @@ Patch1: system-config-printer-get_cursor
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
 Patch4: system-config-printer-older-gtk.patch
+Patch5: system-config-printer-proxy-auth.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -70,6 +71,7 @@ the configuration tool.
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
 %patch4 -p1 -b .older-gtk
+%patch5 -p1 -b .proxy-auth
 
 %build
 %configure
@@ -171,6 +173,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
+- Fixed proxy authentication.
+
 * Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
 - Fixed crash on start-up.
 



From cebbert at fedoraproject.org  Fri Aug 28 15:51:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 28 Aug 2009 15:51:44 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc8.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1119, 1.1120 kernel.spec, 1.1748, 1.1749 sources, 1.1077,
	1.1078 upstream, 1.991, 1.992 patch-2.6.31-rc7-git6.bz2.sign,
	1.1, NONE patch-2.6.31-rc7.bz2.sign, 1.1, NONE
Message-ID: <20090828155144.76A4A11C0078@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7375

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc8.bz2.sign 
Removed Files:
	patch-2.6.31-rc7-git6.bz2.sign patch-2.6.31-rc7.bz2.sign 
Log Message:
2.6.31-rc8


--- NEW FILE patch-2.6.31-rc8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKlzPryGugalF9Dw4RArpYAJ4u8zU9zDifKaTMyyviHw/5C1V5xgCfdcz5
91kW/e8e04xUISC11nA0zd0=
=M4EK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1119
retrieving revision 1.1120
diff -u -p -r1.1119 -r1.1120
--- .cvsignore	28 Aug 2009 00:31:35 -0000	1.1119
+++ .cvsignore	28 Aug 2009 15:51:43 -0000	1.1120
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git6.bz2
+patch-2.6.31-rc8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -p -r1.1748 -r1.1749
--- kernel.spec	28 Aug 2009 00:38:45 -0000	1.1748
+++ kernel.spec	28 Aug 2009 15:51:43 -0000	1.1749
@@ -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 7
+%define rcrev 8
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -2005,6 +2005,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 28 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.185.rc7.git6
 - 2.6.31-rc7-git6
 - Drop patch merged upstream:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1077
retrieving revision 1.1078
diff -u -p -r1.1077 -r1.1078
--- sources	28 Aug 2009 00:31:35 -0000	1.1077
+++ sources	28 Aug 2009 15:51:44 -0000	1.1078
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-4b991833a7e19a5b65ba3abcbc9de2e0  patch-2.6.31-rc7.bz2
-59a009dd342443a5d53e331daa68ddf2  patch-2.6.31-rc7-git6.bz2
+d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -p -r1.991 -r1.992
--- upstream	28 Aug 2009 00:31:35 -0000	1.991
+++ upstream	28 Aug 2009 15:51:44 -0000	1.992
@@ -1,3 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.31-rc7.bz2
-patch-2.6.31-rc7-git6.bz2
+patch-2.6.31-rc8.bz2


--- patch-2.6.31-rc7-git6.bz2.sign DELETED ---


--- patch-2.6.31-rc7.bz2.sign DELETED ---



From twaugh at fedoraproject.org  Fri Aug 28 15:51:50 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:51:50 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-ppdippstr.patch, 
	NONE, 1.1 system-config-printer.spec, 1.278, 1.279
Message-ID: <20090828155150.04E3311C0078@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-serv7267

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-ppdippstr.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
- Fixed PPD/IPP string translation.


system-config-printer-ppdippstr.patch:
 ppdippstr.py             |  210 ++++++++++++++++++++++++-----------------------
 system-config-printer.py |    1 
 2 files changed, 112 insertions(+), 99 deletions(-)

--- NEW FILE system-config-printer-ppdippstr.patch ---
diff -up system-config-printer-1.1.12/ppdippstr.py.ppdippstr system-config-printer-1.1.12/ppdippstr.py
--- system-config-printer-1.1.12/ppdippstr.py.ppdippstr	2009-08-25 15:01:41.000000000 +0100
+++ system-config-printer-1.1.12/ppdippstr.py	2009-08-28 16:47:05.964949870 +0100
@@ -21,6 +21,11 @@
 
 from gettext import gettext as _
 
+printer_error_policy = dict()
+printer_op_policy = dict()
+job_sheets = dict()
+ppd = dict()
+
 class TranslationDict:
     STR = {}
 
@@ -30,104 +35,111 @@ class TranslationDict:
     def get (self, str):
         return self.STR.get (str, str)
 
-## IPP strings
+def init ():
+    ## IPP strings
 
-# Names of printer error policies
-printer_error_policy = TranslationDict ({
-        "abort-job": _("Abort job"),
-        "retry-job": _("Retry job"),
-        "stop-printer": _("Stop printer")
-        })
+    # Names of printer error policies
+    global printer_error_policy
+    printer_error_policy = TranslationDict ({
+            "abort-job": _("Abort job"),
+            "retry-job": _("Retry job"),
+            "stop-printer": _("Stop printer")
+            })
     
-# Names of printer operation policies
-printer_op_policy = TranslationDict ({
-        "default": _("Default behavior"),
-        "authenticated": _("Authenticated")
-        })
-
-# Names of banner pages.
-job_sheets = TranslationDict ({
-        "none": _("None"),
-        "classified": _("Classified"),
-        "confidential": _("Confidential"),
-        "secret": _("Secret"),
-        "standard": _("Standard"),
-        "topsecret": _("Top secret"),
-        "unclassified": _("Unclassified")
-        })
-
-## Common PPD strings
-
-# Foomatic strings
-
-# These are PPD option and group names and values.
-ppd = TranslationDict ({
-        "General": _("General"),
-
-        # HPIJS options
-        "Printout Mode": _("Printout mode"),
-        "Draft (auto-detect paper type)": _("Draft (auto-detect-paper type)"),
-        "Draft Grayscale (auto-detect paper type)":
-            _("Draft grayscale (auto-detect-paper type)"),
-        "Normal (auto-detect paper type)": _("Normal (auto-detect-paper type)"),
-        "Normal Grayscale (auto-detect paper type)":
-            _("Normal grayscale (auto-detect-paper type)"),
-        "High Quality (auto-detect paper type)":
-            _("High quality (auto-detect-paper type)"),
-        "High Quality Grayscale (auto-detect paper type)":
-            _("High quality grayscale (auto-detect-paper type)"),
-        "Photo (on photo paper)": _("Photo (on photo paper)"),
-        "Best Quality (color on photo paper)":
-            _("Best quality (color on photo paper)"),
-        "Normal Quality (color on photo paper)":
-            _("Normal quality (color on photo paper)"),
-
-        "Media Source": _("Media source"),
-        "Printer default": _("Printer default"),
-        "Photo Tray": _("Photo tray"),
-        "Upper Tray": _("Upper tray"),
-        "Lower Tray": _("Lower tray"),
-        "CD or DVD Tray": _("CD or DVD tray"),
-        "Envelope Feeder": _("Envelope feeder"),
-        "Large Capacity Tray": _("Large capacity tray"),
-        "Manual Feeder": _("Manual feeder"),
-        "Multi Purpose Tray": _("Multi-purpose tray"),
-
-        "Page Size": _("Page size"),
-        "Custom": _("Custom"),
-        "Photo or 4x6 inch index card": _("Photo or 4x6 inch index card"),
-        "Photo or 5x7 inch index card": _("Photo or 5x7 inch index card"),
-        "Photo with tear-off tab": _("Photo with tear-off tab"),
-        "3x5 inch index card": _("3x5 inch index card"),
-        "5x8 inch index card": _("5x8 inch index card"),
-        "A6 with tear-off tab": _("A6 with tear-off tab"),
-        "CD or DVD 80 mm": _("CD or DVD 80mm"),
-        "CD or DVD 120 mm": _("CD or DVD 120mm"),
-
-        "Double-Sided Printing": _("Double-sided printing"),
-        "Long Edge (Standard)": _("Long edge (standard)"),
-        "Short Edge (Flip)": _("Short edge (flip)"),
-        "Off": _("Off"),
-
-        "Resolution, Quality, Ink Type, Media Type":
-            _("Resolution, quality, ink type, media type"),
-        "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"),
-        "300 dpi, Color, Black + Color Cartr.":
-            _("300 dpi, color, black + color cartridge"),
-        "300 dpi, Draft, Color, Black + Color Cartr.":
-            _("300 dpi, draft, color, black + color cartridge"),
-        "300 dpi, Draft, Grayscale, Black + Color Cartr.":
-            _("300 dpi, draft, grayscale, black + color cartridge"),
-        "300 dpi, Grayscale, Black + Color Cartr.":
-            _("300 dpi, grayscale, black + color cartridge"),
-        "600 dpi, Color, Black + Color Cartr.":
-            _("600 dpi, color, black + color cartridge"),
-        "600 dpi, Grayscale, Black + Color Cartr.":
-            _("600 dpi, grayscale, black + color cartridge"),
-        "600 dpi, Photo, Black + Color Cartr., Photo Paper":
-            _("600 dpi, photo, black + color cartridge, photo paper"),
-        "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal":
-            _("600 dpi, color, black + color cartridge, photo paper, normal"),
-        "1200 dpi, Photo, Black + Color Cartr., Photo Paper":
-            _("1200 dpi, photo, black + color cartridge, photo paper"),
-        })
+    # Names of printer operation policies
+    global printer_op_policy
+    printer_op_policy = TranslationDict ({
+            "default": _("Default behavior"),
+            "authenticated": _("Authenticated")
+            })
+
+    # Names of banner pages.
+    global job_sheets
+    job_sheets = TranslationDict ({
+            "none": _("None"),
+            "classified": _("Classified"),
+            "confidential": _("Confidential"),
+            "secret": _("Secret"),
+            "standard": _("Standard"),
+            "topsecret": _("Top secret"),
+            "unclassified": _("Unclassified")
+            })
+
+    ## Common PPD strings
+
+    # Foomatic strings
+
+    # These are PPD option and group names and values.
+    global ppd
+    ppd = TranslationDict ({
+            "General": _("General"),
+
+            # HPIJS options
+            "Printout Mode": _("Printout mode"),
+            "Draft (auto-detect paper type)":
+                _("Draft (auto-detect-paper type)"),
+            "Draft Grayscale (auto-detect paper type)":
+                _("Draft grayscale (auto-detect-paper type)"),
+            "Normal (auto-detect paper type)":
+                _("Normal (auto-detect-paper type)"),
+            "Normal Grayscale (auto-detect paper type)":
+                _("Normal grayscale (auto-detect-paper type)"),
+            "High Quality (auto-detect paper type)":
+                _("High quality (auto-detect-paper type)"),
+            "High Quality Grayscale (auto-detect paper type)":
+                _("High quality grayscale (auto-detect-paper type)"),
+            "Photo (on photo paper)": _("Photo (on photo paper)"),
+            "Best Quality (color on photo paper)":
+                _("Best quality (color on photo paper)"),
+            "Normal Quality (color on photo paper)":
+                _("Normal quality (color on photo paper)"),
+
+            "Media Source": _("Media source"),
+            "Printer default": _("Printer default"),
+            "Photo Tray": _("Photo tray"),
+            "Upper Tray": _("Upper tray"),
+            "Lower Tray": _("Lower tray"),
+            "CD or DVD Tray": _("CD or DVD tray"),
+            "Envelope Feeder": _("Envelope feeder"),
+            "Large Capacity Tray": _("Large capacity tray"),
+            "Manual Feeder": _("Manual feeder"),
+            "Multi Purpose Tray": _("Multi-purpose tray"),
+
+            "Page Size": _("Page size"),
+            "Custom": _("Custom"),
+            "Photo or 4x6 inch index card": _("Photo or 4x6 inch index card"),
+            "Photo or 5x7 inch index card": _("Photo or 5x7 inch index card"),
+            "Photo with tear-off tab": _("Photo with tear-off tab"),
+            "3x5 inch index card": _("3x5 inch index card"),
+            "5x8 inch index card": _("5x8 inch index card"),
+            "A6 with tear-off tab": _("A6 with tear-off tab"),
+            "CD or DVD 80 mm": _("CD or DVD 80mm"),
+            "CD or DVD 120 mm": _("CD or DVD 120mm"),
+
+            "Double-Sided Printing": _("Double-sided printing"),
+            "Long Edge (Standard)": _("Long edge (standard)"),
+            "Short Edge (Flip)": _("Short edge (flip)"),
+            "Off": _("Off"),
+
+            "Resolution, Quality, Ink Type, Media Type":
+                _("Resolution, quality, ink type, media type"),
+            "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"),
+            "300 dpi, Color, Black + Color Cartr.":
+                _("300 dpi, color, black + color cartridge"),
+            "300 dpi, Draft, Color, Black + Color Cartr.":
+                _("300 dpi, draft, color, black + color cartridge"),
+            "300 dpi, Draft, Grayscale, Black + Color Cartr.":
+                _("300 dpi, draft, grayscale, black + color cartridge"),
+            "300 dpi, Grayscale, Black + Color Cartr.":
+                _("300 dpi, grayscale, black + color cartridge"),
+            "600 dpi, Color, Black + Color Cartr.":
+                _("600 dpi, color, black + color cartridge"),
+            "600 dpi, Grayscale, Black + Color Cartr.":
+                _("600 dpi, grayscale, black + color cartridge"),
+            "600 dpi, Photo, Black + Color Cartr., Photo Paper":
+                _("600 dpi, photo, black + color cartridge, photo paper"),
+            "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal":
+                _("600 dpi, color, black + color cartridge, photo paper, normal"),
+            "1200 dpi, Photo, Black + Color Cartr., Photo Paper":
+                _("1200 dpi, photo, black + color cartridge, photo paper"),
+            })
diff -up system-config-printer-1.1.12/system-config-printer.py.ppdippstr system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.ppdippstr	2009-08-28 16:46:47.922947897 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-28 16:47:06.032823573 +0100
@@ -129,6 +129,7 @@ gettext.bindtextdomain (domain, config.l
 gtk.glade.textdomain (domain)
 gtk.glade.bindtextdomain (domain, config.localedir)
 import ppdippstr
+ppdippstr.init ()
 pkgdata = config.pkgdatadir
 iconpath = os.path.join (pkgdata, 'icons/')
 sys.path.append (pkgdata)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- system-config-printer.spec	28 Aug 2009 15:45:25 -0000	1.278
+++ system-config-printer.spec	28 Aug 2009 15:51:49 -0000	1.279
@@ -18,6 +18,7 @@ Patch1: system-config-printer-get_cursor
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
 Patch4: system-config-printer-proxy-auth.patch
+Patch5: system-config-printer-ppdippstr.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -70,6 +71,7 @@ the configuration tool.
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
 %patch4 -p1 -b .proxy-auth
+%patch5 -p1 -b .ppdippstr
 
 %build
 %configure
@@ -171,7 +173,8 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
+- Fixed PPD/IPP string translation.
 - Fixed proxy authentication.
 
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4



From twaugh at fedoraproject.org  Fri Aug 28 15:52:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:52:05 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-ppdippstr.patch, NONE,
	1.1 system-config-printer.spec, 1.288, 1.289
Message-ID: <20090828155205.A36CA11C0078@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-serv7516

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-ppdippstr.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
- Fixed PPD/IPP string translation.


system-config-printer-ppdippstr.patch:
 ppdippstr.py             |  210 ++++++++++++++++++++++++-----------------------
 system-config-printer.py |    1 
 2 files changed, 112 insertions(+), 99 deletions(-)

--- NEW FILE system-config-printer-ppdippstr.patch ---
diff -up system-config-printer-1.1.12/ppdippstr.py.ppdippstr system-config-printer-1.1.12/ppdippstr.py
--- system-config-printer-1.1.12/ppdippstr.py.ppdippstr	2009-08-25 15:01:41.000000000 +0100
+++ system-config-printer-1.1.12/ppdippstr.py	2009-08-28 16:47:05.964949870 +0100
@@ -21,6 +21,11 @@
 
 from gettext import gettext as _
 
+printer_error_policy = dict()
+printer_op_policy = dict()
+job_sheets = dict()
+ppd = dict()
+
 class TranslationDict:
     STR = {}
 
@@ -30,104 +35,111 @@ class TranslationDict:
     def get (self, str):
         return self.STR.get (str, str)
 
-## IPP strings
+def init ():
+    ## IPP strings
 
-# Names of printer error policies
-printer_error_policy = TranslationDict ({
-        "abort-job": _("Abort job"),
-        "retry-job": _("Retry job"),
-        "stop-printer": _("Stop printer")
-        })
+    # Names of printer error policies
+    global printer_error_policy
+    printer_error_policy = TranslationDict ({
+            "abort-job": _("Abort job"),
+            "retry-job": _("Retry job"),
+            "stop-printer": _("Stop printer")
+            })
     
-# Names of printer operation policies
-printer_op_policy = TranslationDict ({
-        "default": _("Default behavior"),
-        "authenticated": _("Authenticated")
-        })
-
-# Names of banner pages.
-job_sheets = TranslationDict ({
-        "none": _("None"),
-        "classified": _("Classified"),
-        "confidential": _("Confidential"),
-        "secret": _("Secret"),
-        "standard": _("Standard"),
-        "topsecret": _("Top secret"),
-        "unclassified": _("Unclassified")
-        })
-
-## Common PPD strings
-
-# Foomatic strings
-
-# These are PPD option and group names and values.
-ppd = TranslationDict ({
-        "General": _("General"),
-
-        # HPIJS options
-        "Printout Mode": _("Printout mode"),
-        "Draft (auto-detect paper type)": _("Draft (auto-detect-paper type)"),
-        "Draft Grayscale (auto-detect paper type)":
-            _("Draft grayscale (auto-detect-paper type)"),
-        "Normal (auto-detect paper type)": _("Normal (auto-detect-paper type)"),
-        "Normal Grayscale (auto-detect paper type)":
-            _("Normal grayscale (auto-detect-paper type)"),
-        "High Quality (auto-detect paper type)":
-            _("High quality (auto-detect-paper type)"),
-        "High Quality Grayscale (auto-detect paper type)":
-            _("High quality grayscale (auto-detect-paper type)"),
-        "Photo (on photo paper)": _("Photo (on photo paper)"),
-        "Best Quality (color on photo paper)":
-            _("Best quality (color on photo paper)"),
-        "Normal Quality (color on photo paper)":
-            _("Normal quality (color on photo paper)"),
-
-        "Media Source": _("Media source"),
-        "Printer default": _("Printer default"),
-        "Photo Tray": _("Photo tray"),
-        "Upper Tray": _("Upper tray"),
-        "Lower Tray": _("Lower tray"),
-        "CD or DVD Tray": _("CD or DVD tray"),
-        "Envelope Feeder": _("Envelope feeder"),
-        "Large Capacity Tray": _("Large capacity tray"),
-        "Manual Feeder": _("Manual feeder"),
-        "Multi Purpose Tray": _("Multi-purpose tray"),
-
-        "Page Size": _("Page size"),
-        "Custom": _("Custom"),
-        "Photo or 4x6 inch index card": _("Photo or 4x6 inch index card"),
-        "Photo or 5x7 inch index card": _("Photo or 5x7 inch index card"),
-        "Photo with tear-off tab": _("Photo with tear-off tab"),
-        "3x5 inch index card": _("3x5 inch index card"),
-        "5x8 inch index card": _("5x8 inch index card"),
-        "A6 with tear-off tab": _("A6 with tear-off tab"),
-        "CD or DVD 80 mm": _("CD or DVD 80mm"),
-        "CD or DVD 120 mm": _("CD or DVD 120mm"),
-
-        "Double-Sided Printing": _("Double-sided printing"),
-        "Long Edge (Standard)": _("Long edge (standard)"),
-        "Short Edge (Flip)": _("Short edge (flip)"),
-        "Off": _("Off"),
-
-        "Resolution, Quality, Ink Type, Media Type":
-            _("Resolution, quality, ink type, media type"),
-        "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"),
-        "300 dpi, Color, Black + Color Cartr.":
-            _("300 dpi, color, black + color cartridge"),
-        "300 dpi, Draft, Color, Black + Color Cartr.":
-            _("300 dpi, draft, color, black + color cartridge"),
-        "300 dpi, Draft, Grayscale, Black + Color Cartr.":
-            _("300 dpi, draft, grayscale, black + color cartridge"),
-        "300 dpi, Grayscale, Black + Color Cartr.":
-            _("300 dpi, grayscale, black + color cartridge"),
-        "600 dpi, Color, Black + Color Cartr.":
-            _("600 dpi, color, black + color cartridge"),
-        "600 dpi, Grayscale, Black + Color Cartr.":
-            _("600 dpi, grayscale, black + color cartridge"),
-        "600 dpi, Photo, Black + Color Cartr., Photo Paper":
-            _("600 dpi, photo, black + color cartridge, photo paper"),
-        "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal":
-            _("600 dpi, color, black + color cartridge, photo paper, normal"),
-        "1200 dpi, Photo, Black + Color Cartr., Photo Paper":
-            _("1200 dpi, photo, black + color cartridge, photo paper"),
-        })
+    # Names of printer operation policies
+    global printer_op_policy
+    printer_op_policy = TranslationDict ({
+            "default": _("Default behavior"),
+            "authenticated": _("Authenticated")
+            })
+
+    # Names of banner pages.
+    global job_sheets
+    job_sheets = TranslationDict ({
+            "none": _("None"),
+            "classified": _("Classified"),
+            "confidential": _("Confidential"),
+            "secret": _("Secret"),
+            "standard": _("Standard"),
+            "topsecret": _("Top secret"),
+            "unclassified": _("Unclassified")
+            })
+
+    ## Common PPD strings
+
+    # Foomatic strings
+
+    # These are PPD option and group names and values.
+    global ppd
+    ppd = TranslationDict ({
+            "General": _("General"),
+
+            # HPIJS options
+            "Printout Mode": _("Printout mode"),
+            "Draft (auto-detect paper type)":
+                _("Draft (auto-detect-paper type)"),
+            "Draft Grayscale (auto-detect paper type)":
+                _("Draft grayscale (auto-detect-paper type)"),
+            "Normal (auto-detect paper type)":
+                _("Normal (auto-detect-paper type)"),
+            "Normal Grayscale (auto-detect paper type)":
+                _("Normal grayscale (auto-detect-paper type)"),
+            "High Quality (auto-detect paper type)":
+                _("High quality (auto-detect-paper type)"),
+            "High Quality Grayscale (auto-detect paper type)":
+                _("High quality grayscale (auto-detect-paper type)"),
+            "Photo (on photo paper)": _("Photo (on photo paper)"),
+            "Best Quality (color on photo paper)":
+                _("Best quality (color on photo paper)"),
+            "Normal Quality (color on photo paper)":
+                _("Normal quality (color on photo paper)"),
+
+            "Media Source": _("Media source"),
+            "Printer default": _("Printer default"),
+            "Photo Tray": _("Photo tray"),
+            "Upper Tray": _("Upper tray"),
+            "Lower Tray": _("Lower tray"),
+            "CD or DVD Tray": _("CD or DVD tray"),
+            "Envelope Feeder": _("Envelope feeder"),
+            "Large Capacity Tray": _("Large capacity tray"),
+            "Manual Feeder": _("Manual feeder"),
+            "Multi Purpose Tray": _("Multi-purpose tray"),
+
+            "Page Size": _("Page size"),
+            "Custom": _("Custom"),
+            "Photo or 4x6 inch index card": _("Photo or 4x6 inch index card"),
+            "Photo or 5x7 inch index card": _("Photo or 5x7 inch index card"),
+            "Photo with tear-off tab": _("Photo with tear-off tab"),
+            "3x5 inch index card": _("3x5 inch index card"),
+            "5x8 inch index card": _("5x8 inch index card"),
+            "A6 with tear-off tab": _("A6 with tear-off tab"),
+            "CD or DVD 80 mm": _("CD or DVD 80mm"),
+            "CD or DVD 120 mm": _("CD or DVD 120mm"),
+
+            "Double-Sided Printing": _("Double-sided printing"),
+            "Long Edge (Standard)": _("Long edge (standard)"),
+            "Short Edge (Flip)": _("Short edge (flip)"),
+            "Off": _("Off"),
+
+            "Resolution, Quality, Ink Type, Media Type":
+                _("Resolution, quality, ink type, media type"),
+            "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"),
+            "300 dpi, Color, Black + Color Cartr.":
+                _("300 dpi, color, black + color cartridge"),
+            "300 dpi, Draft, Color, Black + Color Cartr.":
+                _("300 dpi, draft, color, black + color cartridge"),
+            "300 dpi, Draft, Grayscale, Black + Color Cartr.":
+                _("300 dpi, draft, grayscale, black + color cartridge"),
+            "300 dpi, Grayscale, Black + Color Cartr.":
+                _("300 dpi, grayscale, black + color cartridge"),
+            "600 dpi, Color, Black + Color Cartr.":
+                _("600 dpi, color, black + color cartridge"),
+            "600 dpi, Grayscale, Black + Color Cartr.":
+                _("600 dpi, grayscale, black + color cartridge"),
+            "600 dpi, Photo, Black + Color Cartr., Photo Paper":
+                _("600 dpi, photo, black + color cartridge, photo paper"),
+            "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal":
+                _("600 dpi, color, black + color cartridge, photo paper, normal"),
+            "1200 dpi, Photo, Black + Color Cartr., Photo Paper":
+                _("1200 dpi, photo, black + color cartridge, photo paper"),
+            })
diff -up system-config-printer-1.1.12/system-config-printer.py.ppdippstr system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.ppdippstr	2009-08-28 16:46:47.922947897 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-28 16:47:06.032823573 +0100
@@ -129,6 +129,7 @@ gettext.bindtextdomain (domain, config.l
 gtk.glade.textdomain (domain)
 gtk.glade.bindtextdomain (domain, config.localedir)
 import ppdippstr
+ppdippstr.init ()
 pkgdata = config.pkgdatadir
 iconpath = os.path.join (pkgdata, 'icons/')
 sys.path.append (pkgdata)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- system-config-printer.spec	28 Aug 2009 15:46:25 -0000	1.288
+++ system-config-printer.spec	28 Aug 2009 15:52:05 -0000	1.289
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch2: system-config-printer-statereaso
 Patch3: system-config-printer-icon-load-traceback.patch
 Patch4: system-config-printer-polkit-1.patch
 Patch5: system-config-printer-proxy-auth.patch
+Patch6: system-config-printer-ppdippstr.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -85,6 +86,7 @@ printers.
 %patch3 -p1 -b .icon-load-traceback
 %patch4 -p1 -b .polkit-1
 %patch5 -p1 -b .proxy-auth
+%patch6 -p1 -b .ppdippstr
 
 %build
 aclocal
@@ -199,7 +201,8 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
+- Fixed PPD/IPP string translation.
 - Fixed proxy authentication.
 
 * Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4



From pkgdb at fedoraproject.org  Fri Aug 28 15:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:52:08 +0000
Subject: [pkgdb] auto-destdir was added for dwheeler
Message-ID: <20090828155208.3B19610F87B@bastion2.fedora.phx.redhat.com>

tibbs has added Package auto-destdir with summary Automate DESTDIR support for "make install"
tibbs has approved Package auto-destdir
tibbs has added a Fedora devel branch for auto-destdir with an owner of dwheeler
tibbs has approved auto-destdir in Fedora devel
tibbs has approved Package auto-destdir
tibbs has set commit to Approved for 107427 on auto-destdir (Fedora devel)
tibbs has set checkout to Approved for 107427 on auto-destdir (Fedora devel)
tibbs has set build to Approved for 107427 on auto-destdir (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/auto-destdir



From pkgdb at fedoraproject.org  Fri Aug 28 15:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:52:09 +0000
Subject: [pkgdb] auto-destdir summary updated by tibbs
Message-ID: <20090828155209.4BDC510F884@bastion2.fedora.phx.redhat.com>

tibbs set package auto-destdir summary to Automate DESTDIR support for "make install"

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/auto-destdir



From pkgdb at fedoraproject.org  Fri Aug 28 15:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:52:09 +0000
Subject: [pkgdb] auto-destdir (Fedora, 11) updated by tibbs
Message-ID: <20090828155209.52C6E10F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for auto-destdir
tibbs has set commit to Approved for 107427 on auto-destdir (Fedora 11)
tibbs has set checkout to Approved for 107427 on auto-destdir (Fedora 11)
tibbs has set build to Approved for 107427 on auto-destdir (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/auto-destdir



From tibbs at fedoraproject.org  Fri Aug 28 15:52:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:52:21 +0000 (UTC)
Subject: rpms/auto-destdir/devel - New directory
Message-ID: <20090828155221.45E6D11C0081@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/auto-destdir/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJJ7868/rpms/auto-destdir/devel

Log Message:
Directory /cvs/pkgs/rpms/auto-destdir/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 15:52:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:52:21 +0000 (UTC)
Subject: rpms/auto-destdir - New directory
Message-ID: <20090828155221.23FAF11C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/auto-destdir
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJJ7868/rpms/auto-destdir

Log Message:
Directory /cvs/pkgs/rpms/auto-destdir added to the repository




From pkgdb at fedoraproject.org  Fri Aug 28 15:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:52:09 +0000
Subject: [pkgdb] auto-destdir (Fedora, 11) updated by tibbs
Message-ID: <20090828155209.6114310F897@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for auto-destdir
tibbs has set commit to Approved for 107427 on auto-destdir (Fedora 10)
tibbs has set checkout to Approved for 107427 on auto-destdir (Fedora 10)
tibbs has set build to Approved for 107427 on auto-destdir (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/auto-destdir



From tibbs at fedoraproject.org  Fri Aug 28 15:52:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:52:27 +0000 (UTC)
Subject: rpms/auto-destdir Makefile,NONE,1.1
Message-ID: <20090828155227.745A511C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/auto-destdir
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJJ7868/rpms/auto-destdir

Added Files:
	Makefile 
Log Message:
Setup of module auto-destdir


--- NEW FILE Makefile ---
# Top level Makefile for module auto-destdir
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 15:52:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:52:27 +0000 (UTC)
Subject: rpms/auto-destdir/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828155227.D50FD11C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/auto-destdir/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsJJ7868/rpms/auto-destdir/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module auto-destdir


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: auto-destdir
# $Id: Makefile,v 1.1 2009/08/28 15:52:27 tibbs Exp $
NAME := auto-destdir
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From twaugh at fedoraproject.org  Fri Aug 28 15:53:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:53:16 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-ppdippstr.patch, 
	NONE, 1.1 system-config-printer.spec, 1.249, 1.250
Message-ID: <20090828155316.940B311C0078@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-serv8565

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-ppdippstr.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
- Fixed PPD/IPP string translation.


system-config-printer-ppdippstr.patch:
 ppdippstr.py             |  210 ++++++++++++++++++++++++-----------------------
 system-config-printer.py |    1 
 2 files changed, 112 insertions(+), 99 deletions(-)

--- NEW FILE system-config-printer-ppdippstr.patch ---
diff -up system-config-printer-1.1.12/ppdippstr.py.ppdippstr system-config-printer-1.1.12/ppdippstr.py
--- system-config-printer-1.1.12/ppdippstr.py.ppdippstr	2009-08-25 15:01:41.000000000 +0100
+++ system-config-printer-1.1.12/ppdippstr.py	2009-08-28 16:47:05.964949870 +0100
@@ -21,6 +21,11 @@
 
 from gettext import gettext as _
 
+printer_error_policy = dict()
+printer_op_policy = dict()
+job_sheets = dict()
+ppd = dict()
+
 class TranslationDict:
     STR = {}
 
@@ -30,104 +35,111 @@ class TranslationDict:
     def get (self, str):
         return self.STR.get (str, str)
 
-## IPP strings
+def init ():
+    ## IPP strings
 
-# Names of printer error policies
-printer_error_policy = TranslationDict ({
-        "abort-job": _("Abort job"),
-        "retry-job": _("Retry job"),
-        "stop-printer": _("Stop printer")
-        })
+    # Names of printer error policies
+    global printer_error_policy
+    printer_error_policy = TranslationDict ({
+            "abort-job": _("Abort job"),
+            "retry-job": _("Retry job"),
+            "stop-printer": _("Stop printer")
+            })
     
-# Names of printer operation policies
-printer_op_policy = TranslationDict ({
-        "default": _("Default behavior"),
-        "authenticated": _("Authenticated")
-        })
-
-# Names of banner pages.
-job_sheets = TranslationDict ({
-        "none": _("None"),
-        "classified": _("Classified"),
-        "confidential": _("Confidential"),
-        "secret": _("Secret"),
-        "standard": _("Standard"),
-        "topsecret": _("Top secret"),
-        "unclassified": _("Unclassified")
-        })
-
-## Common PPD strings
-
-# Foomatic strings
-
-# These are PPD option and group names and values.
-ppd = TranslationDict ({
-        "General": _("General"),
-
-        # HPIJS options
-        "Printout Mode": _("Printout mode"),
-        "Draft (auto-detect paper type)": _("Draft (auto-detect-paper type)"),
-        "Draft Grayscale (auto-detect paper type)":
-            _("Draft grayscale (auto-detect-paper type)"),
-        "Normal (auto-detect paper type)": _("Normal (auto-detect-paper type)"),
-        "Normal Grayscale (auto-detect paper type)":
-            _("Normal grayscale (auto-detect-paper type)"),
-        "High Quality (auto-detect paper type)":
-            _("High quality (auto-detect-paper type)"),
-        "High Quality Grayscale (auto-detect paper type)":
-            _("High quality grayscale (auto-detect-paper type)"),
-        "Photo (on photo paper)": _("Photo (on photo paper)"),
-        "Best Quality (color on photo paper)":
-            _("Best quality (color on photo paper)"),
-        "Normal Quality (color on photo paper)":
-            _("Normal quality (color on photo paper)"),
-
-        "Media Source": _("Media source"),
-        "Printer default": _("Printer default"),
-        "Photo Tray": _("Photo tray"),
-        "Upper Tray": _("Upper tray"),
-        "Lower Tray": _("Lower tray"),
-        "CD or DVD Tray": _("CD or DVD tray"),
-        "Envelope Feeder": _("Envelope feeder"),
-        "Large Capacity Tray": _("Large capacity tray"),
-        "Manual Feeder": _("Manual feeder"),
-        "Multi Purpose Tray": _("Multi-purpose tray"),
-
-        "Page Size": _("Page size"),
-        "Custom": _("Custom"),
-        "Photo or 4x6 inch index card": _("Photo or 4x6 inch index card"),
-        "Photo or 5x7 inch index card": _("Photo or 5x7 inch index card"),
-        "Photo with tear-off tab": _("Photo with tear-off tab"),
-        "3x5 inch index card": _("3x5 inch index card"),
-        "5x8 inch index card": _("5x8 inch index card"),
-        "A6 with tear-off tab": _("A6 with tear-off tab"),
-        "CD or DVD 80 mm": _("CD or DVD 80mm"),
-        "CD or DVD 120 mm": _("CD or DVD 120mm"),
-
-        "Double-Sided Printing": _("Double-sided printing"),
-        "Long Edge (Standard)": _("Long edge (standard)"),
-        "Short Edge (Flip)": _("Short edge (flip)"),
-        "Off": _("Off"),
-
-        "Resolution, Quality, Ink Type, Media Type":
-            _("Resolution, quality, ink type, media type"),
-        "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"),
-        "300 dpi, Color, Black + Color Cartr.":
-            _("300 dpi, color, black + color cartridge"),
-        "300 dpi, Draft, Color, Black + Color Cartr.":
-            _("300 dpi, draft, color, black + color cartridge"),
-        "300 dpi, Draft, Grayscale, Black + Color Cartr.":
-            _("300 dpi, draft, grayscale, black + color cartridge"),
-        "300 dpi, Grayscale, Black + Color Cartr.":
-            _("300 dpi, grayscale, black + color cartridge"),
-        "600 dpi, Color, Black + Color Cartr.":
-            _("600 dpi, color, black + color cartridge"),
-        "600 dpi, Grayscale, Black + Color Cartr.":
-            _("600 dpi, grayscale, black + color cartridge"),
-        "600 dpi, Photo, Black + Color Cartr., Photo Paper":
-            _("600 dpi, photo, black + color cartridge, photo paper"),
-        "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal":
-            _("600 dpi, color, black + color cartridge, photo paper, normal"),
-        "1200 dpi, Photo, Black + Color Cartr., Photo Paper":
-            _("1200 dpi, photo, black + color cartridge, photo paper"),
-        })
+    # Names of printer operation policies
+    global printer_op_policy
+    printer_op_policy = TranslationDict ({
+            "default": _("Default behavior"),
+            "authenticated": _("Authenticated")
+            })
+
+    # Names of banner pages.
+    global job_sheets
+    job_sheets = TranslationDict ({
+            "none": _("None"),
+            "classified": _("Classified"),
+            "confidential": _("Confidential"),
+            "secret": _("Secret"),
+            "standard": _("Standard"),
+            "topsecret": _("Top secret"),
+            "unclassified": _("Unclassified")
+            })
+
+    ## Common PPD strings
+
+    # Foomatic strings
+
+    # These are PPD option and group names and values.
+    global ppd
+    ppd = TranslationDict ({
+            "General": _("General"),
+
+            # HPIJS options
+            "Printout Mode": _("Printout mode"),
+            "Draft (auto-detect paper type)":
+                _("Draft (auto-detect-paper type)"),
+            "Draft Grayscale (auto-detect paper type)":
+                _("Draft grayscale (auto-detect-paper type)"),
+            "Normal (auto-detect paper type)":
+                _("Normal (auto-detect-paper type)"),
+            "Normal Grayscale (auto-detect paper type)":
+                _("Normal grayscale (auto-detect-paper type)"),
+            "High Quality (auto-detect paper type)":
+                _("High quality (auto-detect-paper type)"),
+            "High Quality Grayscale (auto-detect paper type)":
+                _("High quality grayscale (auto-detect-paper type)"),
+            "Photo (on photo paper)": _("Photo (on photo paper)"),
+            "Best Quality (color on photo paper)":
+                _("Best quality (color on photo paper)"),
+            "Normal Quality (color on photo paper)":
+                _("Normal quality (color on photo paper)"),
+
+            "Media Source": _("Media source"),
+            "Printer default": _("Printer default"),
+            "Photo Tray": _("Photo tray"),
+            "Upper Tray": _("Upper tray"),
+            "Lower Tray": _("Lower tray"),
+            "CD or DVD Tray": _("CD or DVD tray"),
+            "Envelope Feeder": _("Envelope feeder"),
+            "Large Capacity Tray": _("Large capacity tray"),
+            "Manual Feeder": _("Manual feeder"),
+            "Multi Purpose Tray": _("Multi-purpose tray"),
+
+            "Page Size": _("Page size"),
+            "Custom": _("Custom"),
+            "Photo or 4x6 inch index card": _("Photo or 4x6 inch index card"),
+            "Photo or 5x7 inch index card": _("Photo or 5x7 inch index card"),
+            "Photo with tear-off tab": _("Photo with tear-off tab"),
+            "3x5 inch index card": _("3x5 inch index card"),
+            "5x8 inch index card": _("5x8 inch index card"),
+            "A6 with tear-off tab": _("A6 with tear-off tab"),
+            "CD or DVD 80 mm": _("CD or DVD 80mm"),
+            "CD or DVD 120 mm": _("CD or DVD 120mm"),
+
+            "Double-Sided Printing": _("Double-sided printing"),
+            "Long Edge (Standard)": _("Long edge (standard)"),
+            "Short Edge (Flip)": _("Short edge (flip)"),
+            "Off": _("Off"),
+
+            "Resolution, Quality, Ink Type, Media Type":
+                _("Resolution, quality, ink type, media type"),
+            "Controlled by 'Printout Mode'": _("Controlled by 'Printout mode'"),
+            "300 dpi, Color, Black + Color Cartr.":
+                _("300 dpi, color, black + color cartridge"),
+            "300 dpi, Draft, Color, Black + Color Cartr.":
+                _("300 dpi, draft, color, black + color cartridge"),
+            "300 dpi, Draft, Grayscale, Black + Color Cartr.":
+                _("300 dpi, draft, grayscale, black + color cartridge"),
+            "300 dpi, Grayscale, Black + Color Cartr.":
+                _("300 dpi, grayscale, black + color cartridge"),
+            "600 dpi, Color, Black + Color Cartr.":
+                _("600 dpi, color, black + color cartridge"),
+            "600 dpi, Grayscale, Black + Color Cartr.":
+                _("600 dpi, grayscale, black + color cartridge"),
+            "600 dpi, Photo, Black + Color Cartr., Photo Paper":
+                _("600 dpi, photo, black + color cartridge, photo paper"),
+            "600 dpi, Color, Black + Color Cartr., Photo Paper, Normal":
+                _("600 dpi, color, black + color cartridge, photo paper, normal"),
+            "1200 dpi, Photo, Black + Color Cartr., Photo Paper":
+                _("1200 dpi, photo, black + color cartridge, photo paper"),
+            })
diff -up system-config-printer-1.1.12/system-config-printer.py.ppdippstr system-config-printer-1.1.12/system-config-printer.py
--- system-config-printer-1.1.12/system-config-printer.py.ppdippstr	2009-08-28 16:46:47.922947897 +0100
+++ system-config-printer-1.1.12/system-config-printer.py	2009-08-28 16:47:06.032823573 +0100
@@ -129,6 +129,7 @@ gettext.bindtextdomain (domain, config.l
 gtk.glade.textdomain (domain)
 gtk.glade.bindtextdomain (domain, config.localedir)
 import ppdippstr
+ppdippstr.init ()
 pkgdata = config.pkgdatadir
 iconpath = os.path.join (pkgdata, 'icons/')
 sys.path.append (pkgdata)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- system-config-printer.spec	28 Aug 2009 15:47:15 -0000	1.249
+++ system-config-printer.spec	28 Aug 2009 15:53:16 -0000	1.250
@@ -19,6 +19,7 @@ Patch2: system-config-printer-statereaso
 Patch3: system-config-printer-icon-load-traceback.patch
 Patch4: system-config-printer-older-gtk.patch
 Patch5: system-config-printer-proxy-auth.patch
+Patch6: system-config-printer-ppdippstr.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -72,6 +73,7 @@ the configuration tool.
 %patch3 -p1 -b .icon-load-traceback
 %patch4 -p1 -b .older-gtk
 %patch5 -p1 -b .proxy-auth
+%patch6 -p1 -b .ppdippstr
 
 %build
 %configure
@@ -174,6 +176,7 @@ exit 0
 
 %changelog
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-6
+- Fixed PPD/IPP string translation.
 - Fixed proxy authentication.
 
 * Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5



From nphilipp at fedoraproject.org  Fri Aug 28 15:54:21 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 28 Aug 2009 15:54:21 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.74, 1.75 sources, 1.83,
	1.84 system-config-users.spec, 1.91, 1.92
Message-ID: <20090828155421.55B0411C0078@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9619

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.88


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	3 Jun 2009 14:03:38 -0000	1.74
+++ .cvsignore	28 Aug 2009 15:54:20 -0000	1.75
@@ -1 +1 @@
-system-config-users-1.2.87.tar.bz2
+system-config-users-1.2.88.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	3 Jun 2009 14:03:38 -0000	1.83
+++ sources	28 Aug 2009 15:54:21 -0000	1.84
@@ -1 +1 @@
-372edf713bd05e1b7387daabef79f45f  system-config-users-1.2.87.tar.bz2
+c5763c77916fa97d89deb604a85b97a6  system-config-users-1.2.88.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- system-config-users.spec	27 Jul 2009 05:25:59 -0000	1.91
+++ system-config-users.spec	28 Aug 2009 15:54:21 -0000	1.92
@@ -28,8 +28,8 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.87
-Release: 2%{?dist}
+Version: 1.2.88
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: Applications/System
@@ -41,8 +41,11 @@ BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: findutils
 Obsoletes: redhat-config-users <= 1.2.4
+# Until version 1.2.81, system-config-users contained online documentation.
+# From version 1.2.82 on, online documentation is split off into its own
+# package system-config-users-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-users < 1.2.82
-Conflicts: system-config-users < 1.2.82
 %if %{with libuser_python}
 Requires: libuser-python >= 0.56
 %else
@@ -63,7 +66,6 @@ Requires: htmlview
 %endif
 Requires: rpm-python
 Requires: /usr/bin/pgrep
-Requires: rhpl
 Requires: hicolor-icon-theme
 %if %{with cracklib}
 %if %{with cracklib_python}
@@ -125,8 +127,12 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.87-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.88-1
+- initialize gettext at the right place
+- get rid of rhpl.iconv, rhpl.executil
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
 
 * Wed Jun 03 2009 Nils Philippsen <nils at redhat.com> - 1.2.87-1
 - handle 64bit uids/gids (#503821)



From pkgdb at fedoraproject.org  Fri Aug 28 15:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:54:52 +0000
Subject: [pkgdb] R-affy was added for pingou
Message-ID: <20090828155453.021A610F878@bastion2.fedora.phx.redhat.com>

tibbs has added Package R-affy with summary Methods for Affymetrix Oligonucleotide Arrays
tibbs has approved Package R-affy
tibbs has added a Fedora devel branch for R-affy with an owner of pingou
tibbs has approved R-affy in Fedora devel
tibbs has approved Package R-affy
tibbs has set commit to Approved for 107427 on R-affy (Fedora devel)
tibbs has set checkout to Approved for 107427 on R-affy (Fedora devel)
tibbs has set build to Approved for 107427 on R-affy (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-affy



From pkgdb at fedoraproject.org  Fri Aug 28 15:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:54:53 +0000
Subject: [pkgdb] R-affy summary updated by tibbs
Message-ID: <20090828155454.0EC2D10F87C@bastion2.fedora.phx.redhat.com>

tibbs set package R-affy summary to Methods for Affymetrix Oligonucleotide Arrays

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-affy



From pkgdb at fedoraproject.org  Fri Aug 28 15:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:54:53 +0000
Subject: [pkgdb] R-affy (Fedora, 11) updated by tibbs
Message-ID: <20090828155454.174BF10F88B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for R-affy
tibbs has set commit to Approved for 107427 on R-affy (Fedora 11)
tibbs has set checkout to Approved for 107427 on R-affy (Fedora 11)
tibbs has set build to Approved for 107427 on R-affy (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-affy



From tibbs at fedoraproject.org  Fri Aug 28 15:55:00 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:55:00 +0000 (UTC)
Subject: rpms/R-affy - New directory
Message-ID: <20090828155500.18A1311C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-affy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM10230/rpms/R-affy

Log Message:
Directory /cvs/pkgs/rpms/R-affy added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 15:55:00 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:55:00 +0000 (UTC)
Subject: rpms/R-affy/devel - New directory
Message-ID: <20090828155500.4AAAC11C0082@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-affy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM10230/rpms/R-affy/devel

Log Message:
Directory /cvs/pkgs/rpms/R-affy/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 15:55:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:55:06 +0000 (UTC)
Subject: rpms/R-affy Makefile,NONE,1.1
Message-ID: <20090828155506.6632311C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-affy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM10230/rpms/R-affy

Added Files:
	Makefile 
Log Message:
Setup of module R-affy


--- NEW FILE Makefile ---
# Top level Makefile for module R-affy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 15:55:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 15:55:06 +0000 (UTC)
Subject: rpms/R-affy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090828155506.9677A11C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/R-affy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsM10230/rpms/R-affy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module R-affy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: R-affy
# $Id: Makefile,v 1.1 2009/08/28 15:55:06 tibbs Exp $
NAME := R-affy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 28 15:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:54:53 +0000
Subject: [pkgdb] R-affy (Fedora, 11) updated by tibbs
Message-ID: <20090828155454.210E610F894@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for R-affy
tibbs has set commit to Approved for 107427 on R-affy (Fedora 10)
tibbs has set checkout to Approved for 107427 on R-affy (Fedora 10)
tibbs has set build to Approved for 107427 on R-affy (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/R-affy



From twaugh at fedoraproject.org  Fri Aug 28 15:55:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 15:55:41 +0000 (UTC)
Subject: rpms/system-config-printer/F-11 system-config-printer.spec, 1.279, 
	1.280
Message-ID: <20090828155541.E298C11C0078@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-serv10832

Modified Files:
	system-config-printer.spec 
Log Message:
1.1.12-6


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- system-config-printer.spec	28 Aug 2009 15:51:49 -0000	1.279
+++ system-config-printer.spec	28 Aug 2009 15:55:41 -0000	1.280
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base



From pkgdb at fedoraproject.org  Fri Aug 28 15:56:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:56:46 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155646.771CD10F88B@bastion2.fedora.phx.redhat.com>

giallu has set the watchcommits acl on php-adodb (Fedora devel) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:56:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:56:44 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155644.5D03E10F890@bastion2.fedora.phx.redhat.com>

giallu has set the watchbugzilla acl on php-adodb (Fedora devel) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:56:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:56:47 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155647.C329910F897@bastion2.fedora.phx.redhat.com>

giallu has set the commit acl on php-adodb (Fedora devel) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:56:49 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155649.4F34710F89B@bastion2.fedora.phx.redhat.com>

giallu has set the approveacls acl on php-adodb (Fedora devel) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:56:58 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155659.0D1BC10F8A5@bastion2.fedora.phx.redhat.com>

giallu has set the watchbugzilla acl on php-adodb (Fedora 10) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:00 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155700.1586010F8A3@bastion2.fedora.phx.redhat.com>

giallu has set the watchcommits acl on php-adodb (Fedora 10) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:01 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155701.1C42E10F8B1@bastion2.fedora.phx.redhat.com>

giallu has set the commit acl on php-adodb (Fedora 10) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:01 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155702.09BC810F8B7@bastion2.fedora.phx.redhat.com>

giallu has set the approveacls acl on php-adodb (Fedora 10) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:04 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155704.4D41610F8B6@bastion2.fedora.phx.redhat.com>

giallu has set the watchbugzilla acl on php-adodb (Fedora 11) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:04 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155704.D3AAA10F8BA@bastion2.fedora.phx.redhat.com>

giallu has set the watchcommits acl on php-adodb (Fedora 11) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:06 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155706.1169F10F8BE@bastion2.fedora.phx.redhat.com>

giallu has set the commit acl on php-adodb (Fedora 11) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From pkgdb at fedoraproject.org  Fri Aug 28 15:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 15:57:10 +0000
Subject: [pkgdb] php-adodb had acl change status
Message-ID: <20090828155710.0611D10F8BF@bastion2.fedora.phx.redhat.com>

giallu has set the approveacls acl on php-adodb (Fedora 11) to Approved for topdog

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/php-adodb



From palango at fedoraproject.org  Fri Aug 28 15:57:43 2009
From: palango at fedoraproject.org (palango)
Date: Fri, 28 Aug 2009 15:57:43 +0000 (UTC)
Subject: rpms/boo/devel boo.spec,1.24,1.25
Message-ID: <20090828155743.A47E611C0078@cvs1.fedora.phx.redhat.com>

Author: palango

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12491

Modified Files:
	boo.spec 
Log Message:
fix paths of executables


Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- boo.spec	27 Aug 2009 07:46:11 -0000	1.24
+++ boo.spec	28 Aug 2009 15:57:43 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.1.3287
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +36,10 @@ Development files for boo
 %patch0 -p1 -b .libdir-original
 %patch1 -p1 -b .targets-original
 %patch2 -p1 -b .pc-original
+#fix paths for executables
+sed -i -e 's!@libdir@!%{monodir}!' extras/booc.in
+sed -i -e 's!@libdir@!%{monodir}!' extras/booi.in
+sed -i -e 's!@libdir@!%{monodir}!' extras/booish.in
 # Fix libdir in boo.pc
 sed -i -e "s|\${prefix}/lib|%{_libdir}|" extras/boo.pc.in
 # Get rid of prebuilt dll files
@@ -74,6 +78,9 @@ update-mime-database %{_datadir}/mime &>
 %{monodir}/pkgconfig/boo.pc
 
 %changelog
+* Fri Aug 28 2009 Paul Lange <palango at gmx.de> - 0.9.1.3287-3
+- Fix executable paths
+
 * Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.1.3287-2
 - Fix libdir in boo.pc to use %%{_libdir}
 - Summary no longer repeats package name



From till at fedoraproject.org  Fri Aug 28 16:08:04 2009
From: till at fedoraproject.org (Till Maas)
Date: Fri, 28 Aug 2009 16:08:04 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.60,1.61
Message-ID: <20090828160804.C842111C0078@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15135

Modified Files:
	pam_mount.spec 
Log Message:
* Fri Aug 28 2009 Till Maas <opensource at till.name> - 1.30-2
- rebuilt with new openssl



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- pam_mount.spec	27 Aug 2009 11:54:16 -0000	1.60
+++ pam_mount.spec	28 Aug 2009 16:08:04 -0000	1.61
@@ -2,7 +2,7 @@
 
 Name:           pam_mount
 Version:        1.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Till Maas <opensource at till.name> - 1.30-2
+- rebuilt with new openssl
+
 * Thu Aug 27 2009 Till Maas <opensource at till.name> - 1.30-1
 - Update to new release
 



From ruben at fedoraproject.org  Fri Aug 28 16:08:04 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 28 Aug 2009 16:08:04 +0000 (UTC)
Subject: rpms/perl-Nagios-Plugin/F-11 import.log, NONE,
	1.1 perl-Nagios-Plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090828160804.D30DA11C0081@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-Nagios-Plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15086/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Nagios-Plugin.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
perl-Nagios-Plugin-0_33-2_fc11:F-11:perl-Nagios-Plugin-0.33-2.fc11.src.rpm:1251475572


--- NEW FILE perl-Nagios-Plugin.spec ---
Name:           perl-Nagios-Plugin
Version:        0.33
Release:        2%{?dist}
Summary:        Family of perl modules to streamline writing Nagios plugins
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-Plugin/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugin-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Class::Accessor)
Requires:       perl(Class::Accessor::Fast)
BuildRequires:  perl(Config::Tiny)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Math::Calc::Units)
BuildRequires:  perl(Params::Validate)
BuildRequires:  perl(Test::More) >= 0.62
Requires:       perl(Class::Accessor)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(Config::Tiny)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Nagios::Plugin and its associated Nagios::Plugin::* modules are a family of
perl modules to streamline writing Nagios plugins. The main end user
modules are Nagios::Plugin, providing an object-oriented interface to the
entire Nagios::Plugin::* collection, and Nagios::Plugin::Functions,
providing a simpler functional interface to a useful subset of the
available functionality.

%prep
%setup -q -n Nagios-Plugin-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Aug 27 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.33-2
- Review fixes (#517497)

* Thu Aug 13 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.33-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:41:34 -0000	1.1
+++ .cvsignore	28 Aug 2009 16:08:04 -0000	1.2
@@ -0,0 +1 @@
+Nagios-Plugin-0.33.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-Plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:41:34 -0000	1.1
+++ sources	28 Aug 2009 16:08:04 -0000	1.2
@@ -0,0 +1 @@
+7f5e00a3d683b1d39b169d9d772de33b  Nagios-Plugin-0.33.tar.gz



From pkgdb at fedoraproject.org  Fri Aug 28 16:09:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 16:09:59 +0000
Subject: [pkgdb] ghc-GLUT was added for bos
Message-ID: <20090828160959.31FD510F878@bastion2.fedora.phx.redhat.com>

tibbs has added Package ghc-GLUT with summary bindings to the C GLUT library
tibbs has approved Package ghc-GLUT
tibbs has added a Fedora devel branch for ghc-GLUT with an owner of bos
tibbs has approved ghc-GLUT in Fedora devel
tibbs has approved Package ghc-GLUT
tibbs has set commit to Approved for 107427 on ghc-GLUT (Fedora devel)
tibbs has set checkout to Approved for 107427 on ghc-GLUT (Fedora devel)
tibbs has set build to Approved for 107427 on ghc-GLUT (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-GLUT



From pkgdb at fedoraproject.org  Fri Aug 28 16:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 16:10:02 +0000
Subject: [pkgdb] ghc-GLUT summary updated by tibbs
Message-ID: <20090828161002.C356210F884@bastion2.fedora.phx.redhat.com>

tibbs set package ghc-GLUT summary to bindings to the C GLUT library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-GLUT



From pkgdb at fedoraproject.org  Fri Aug 28 16:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 16:10:02 +0000
Subject: [pkgdb] ghc-GLUT (Fedora, 11) updated by tibbs
Message-ID: <20090828161003.12BFB10F895@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on ghc-GLUT (Fedora devel) for haskell-sig
tibbs approved watchcommits on ghc-GLUT (Fedora devel) for haskell-sig
tibbs approved watchbugzilla on ghc-GLUT (Fedora devel) for petersen
tibbs approved watchcommits on ghc-GLUT (Fedora devel) for petersen
tibbs approved commit on ghc-GLUT (Fedora devel) for petersen
tibbs approved build on ghc-GLUT (Fedora devel) for petersen
tibbs approved approveacls on ghc-GLUT (Fedora devel) for petersen
tibbs approved watchbugzilla on ghc-GLUT (Fedora devel) for ynemoy
tibbs approved watchcommits on ghc-GLUT (Fedora devel) for ynemoy
tibbs approved commit on ghc-GLUT (Fedora devel) for ynemoy
tibbs approved build on ghc-GLUT (Fedora devel) for ynemoy
tibbs approved approveacls on ghc-GLUT (Fedora devel) for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-GLUT



From pkgdb at fedoraproject.org  Fri Aug 28 16:10:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 16:10:02 +0000
Subject: [pkgdb] ghc-GLUT (Fedora, 11) updated by tibbs
Message-ID: <20090828161003.3EBF210F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for ghc-GLUT
tibbs has set commit to Approved for 107427 on ghc-GLUT (Fedora 11)
tibbs has set checkout to Approved for 107427 on ghc-GLUT (Fedora 11)
tibbs has set build to Approved for 107427 on ghc-GLUT (Fedora 11)
tibbs approved watchbugzilla on ghc-GLUT (Fedora 11) for haskell-sig
tibbs approved watchcommits on ghc-GLUT (Fedora 11) for haskell-sig
tibbs approved watchbugzilla on ghc-GLUT (Fedora 11) for petersen
tibbs approved watchcommits on ghc-GLUT (Fedora 11) for petersen
tibbs approved commit on ghc-GLUT (Fedora 11) for petersen
tibbs approved build on ghc-GLUT (Fedora 11) for petersen
tibbs approved approveacls on ghc-GLUT (Fedora 11) for petersen
tibbs approved watchbugzilla on ghc-GLUT (Fedora 11) for ynemoy
tibbs approved watchcommits on ghc-GLUT (Fedora 11) for ynemoy
tibbs approved commit on ghc-GLUT (Fedora 11) for ynemoy
tibbs approved build on ghc-GLUT (Fedora 11) for ynemoy
tibbs approved approveacls on ghc-GLUT (Fedora 11) for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/ghc-GLUT



From tibbs at fedoraproject.org  Fri Aug 28 16:10:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 16:10:09 +0000 (UTC)
Subject: rpms/ghc-GLUT - New directory
Message-ID: <20090828161009.172F511C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-GLUT
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15688/rpms/ghc-GLUT

Log Message:
Directory /cvs/pkgs/rpms/ghc-GLUT added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 16:10:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 16:10:09 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel - New directory
Message-ID: <20090828161009.4C78411C04D6@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15688/rpms/ghc-GLUT/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-GLUT/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 16:10:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 16:10:16 +0000 (UTC)
Subject: rpms/ghc-GLUT Makefile,NONE,1.1
Message-ID: <20090828161016.0AD5711C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-GLUT
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15688/rpms/ghc-GLUT

Added Files:
	Makefile 
Log Message:
Setup of module ghc-GLUT


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-GLUT
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 16:10:16 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 16:10:16 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090828161016.44F4C11C0496@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsV15688/rpms/ghc-GLUT/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-GLUT


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-GLUT
# $Id: Makefile,v 1.1 2009/08/28 16:10:16 tibbs Exp $
NAME := ghc-GLUT
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Fri Aug 28 16:10:54 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:10:54 +0000 (UTC)
Subject: rpms/python-storm/EL-5 README-Django.Fedora, NONE, 1.1 .cvsignore,
	1.3, 1.4 python-storm.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090828161054.184ED11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982/EL-5

Modified Files:
	.cvsignore python-storm.spec sources 
Added Files:
	README-Django.Fedora 
Log Message:
* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
- Update to 0.15
- Deprecate %{name}-sqlite, now part of main package
- Separate -django and -zope subpackages



--- NEW FILE README-Django.Fedora ---
Storm as an alternate Django ORM
================================
When using storm as an alternate Django ORM, please note that to use a
particular database backend, you must have both Django's module for
that backend, as well as Storm's module (e.g. for PostgreSQL,
python-storm-postgresql).

Django packaging is currently monolithic, so in effect this means you
need to install the appropriate Storm backend, unless you stick with
SQLite, which is bundled by default.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Feb 2009 00:54:10 -0000	1.3
+++ .cvsignore	28 Aug 2009 16:10:53 -0000	1.4
@@ -1 +1 @@
-storm-0.14.tar.bz2
+storm-0.15.tar.bz2


Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/EL-5/python-storm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-storm.spec	19 Feb 2009 00:54:10 -0000	1.3
+++ python-storm.spec	28 Aug 2009 16:10:53 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-storm
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
@@ -9,56 +9,25 @@ Group:          Development/Languages
 License:        LGPLv2+
 URL:            https://storm.canonical.com/
 Source0:        https://launchpad.net/storm/trunk/%{version}/+download/storm-%{version}.tar.bz2
+Source1:        README-Django.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # C extension now compiled by default
 #BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools
-# needed for unit tests
-BuildRequires:  python-sqlite2
-Requires:       python-storm-backend = %{version}-%{release}
 
-%description
-Storm is an object-relational mapper (ORM) for Python developed at
-Canonical. The project has been in development for more than a year
-for use in Canonical projects such as [WWW] Launchpad, and has
-recently been released as an open-source product.
-
-Highlights:
-
- * Clean and lightweight API offers a short learning curve and
-   long-term maintainability.
- * Storm is developed in a test-driven manner. An untested line of
-   code is considered a bug.
- * Storm needs no special class constructors, nor imperative base
-   classes.
- * Storm is well designed (different classes have very clear
-   boundaries, with small and clean public APIs).
- * Designed from day one to work both with thin relational databases,
-   such as SQLite, and big iron systems like PostgreSQL and MySQL.
- * Storm is easy to debug, since its code is written with a KISS
-   principle, and thus is easy to understand.
- * Designed from day one to work both at the low end, with trivial
-   small databases, and the high end, with applications accessing
-   billion row tables and committing to multiple database backends.
- * It's very easy to write and support backends for Storm (current
-   backends have around 100 lines of code).
+Provides:       %{name}-sqlite = %{version}-%{release}
+Obsoletes:      %{name}-sqlite  < %{version}-%{release}
 
-%package    sqlite
-Summary:    SQLite backend for %{name}
-Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-Requires:   python-sqlite2
+%description
+Storm is an object-relational mapper (ORM) for Python. It offers a clean and
+lightweight API offers a short learning curve and long-term maintainability and
+it is easy to written backends for it.
 
-%description sqlite
-The %{name}-sqlite package contains the SQLite database backend for
-%{name}.
 
 %package    mysql
 Summary:    MySQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   MySQL-python
 
@@ -69,7 +38,6 @@ The %{name}-mysql package contains the M
 %package    postgresql
 Summary:    PostgreSQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   python-psycopg2
 
@@ -78,6 +46,27 @@ The %{name}-postgresql package contains 
 backend for %{name}.
 
 
+%package    django
+Summary:    Support for using %{name} as Django ORM
+Group:      Development/Libraries
+Requires:   Django
+Requires:   %{name}-zope = %{version}-%{release}
+
+%description django
+The %{name}-django package contains an alternative ORM implementation
+for Django.
+
+
+%package    zope
+Summary:    Zope integration for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   python-zope-interface python-transaction
+
+%description zope
+The %{name}-zope package provides Zope integration for %{name}.
+
+
 %prep
 %setup -q -n storm-%{version}
 
@@ -107,15 +96,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NEWS README TODO tests/tutorial.txt
+%exclude %{python_sitearch}/storm/django
+%exclude %{python_sitearch}/storm/zope
 %exclude %{python_sitearch}/storm/cextensions.c
 %exclude %{python_sitearch}/storm/databases/mysql.*
-%exclude %{python_sitearch}/storm/databases/sqlite.*
 %exclude %{python_sitearch}/storm/databases/postgres.*
 %{python_sitearch}/storm*
 
-%files sqlite
+%files django
+%defattr(-,root,root,-)
+%doc README-Django.Fedora
+%{python_sitearch}/storm/django
+
+%files zope
 %defattr(-,root,root,-)
-%{python_sitearch}/storm/databases/sqlite.*
+%{python_sitearch}/storm/zope
 
 %files mysql
 %defattr(-,root,root,-)
@@ -126,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
+- Update to 0.15
+- Deprecate %{name}-sqlite, now part of main package
+- Separate -django and -zope subpackages
+
 * Wed Feb 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.14-1
 - Update to 0.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 00:54:10 -0000	1.3
+++ sources	28 Aug 2009 16:10:53 -0000	1.4
@@ -1 +1 @@
-b5329b58229640791895e6b5a37845ab  storm-0.14.tar.bz2
+65ef57156e129ab09b2237dad76cdffe  storm-0.15.tar.bz2



From salimma at fedoraproject.org  Fri Aug 28 16:10:54 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:10:54 +0000 (UTC)
Subject: rpms/python-storm/F-10 README-Django.Fedora, NONE, 1.1 .cvsignore,
	1.3, 1.4 python-storm.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090828161054.573BF11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982/F-10

Modified Files:
	.cvsignore python-storm.spec sources 
Added Files:
	README-Django.Fedora 
Log Message:
* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
- Update to 0.15
- Deprecate %{name}-sqlite, now part of main package
- Separate -django and -zope subpackages



--- NEW FILE README-Django.Fedora ---
Storm as an alternate Django ORM
================================
When using storm as an alternate Django ORM, please note that to use a
particular database backend, you must have both Django's module for
that backend, as well as Storm's module (e.g. for PostgreSQL,
python-storm-postgresql).

Django packaging is currently monolithic, so in effect this means you
need to install the appropriate Storm backend, unless you stick with
SQLite, which is bundled by default.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Feb 2009 00:54:11 -0000	1.3
+++ .cvsignore	28 Aug 2009 16:10:54 -0000	1.4
@@ -1 +1 @@
-storm-0.14.tar.bz2
+storm-0.15.tar.bz2


Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-10/python-storm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-storm.spec	19 Feb 2009 00:54:11 -0000	1.3
+++ python-storm.spec	28 Aug 2009 16:10:54 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-storm
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
@@ -9,56 +9,25 @@ Group:          Development/Languages
 License:        LGPLv2+
 URL:            https://storm.canonical.com/
 Source0:        https://launchpad.net/storm/trunk/%{version}/+download/storm-%{version}.tar.bz2
+Source1:        README-Django.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # C extension now compiled by default
 #BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools
-# needed for unit tests
-BuildRequires:  python-sqlite2
-Requires:       python-storm-backend = %{version}-%{release}
 
-%description
-Storm is an object-relational mapper (ORM) for Python developed at
-Canonical. The project has been in development for more than a year
-for use in Canonical projects such as [WWW] Launchpad, and has
-recently been released as an open-source product.
-
-Highlights:
-
- * Clean and lightweight API offers a short learning curve and
-   long-term maintainability.
- * Storm is developed in a test-driven manner. An untested line of
-   code is considered a bug.
- * Storm needs no special class constructors, nor imperative base
-   classes.
- * Storm is well designed (different classes have very clear
-   boundaries, with small and clean public APIs).
- * Designed from day one to work both with thin relational databases,
-   such as SQLite, and big iron systems like PostgreSQL and MySQL.
- * Storm is easy to debug, since its code is written with a KISS
-   principle, and thus is easy to understand.
- * Designed from day one to work both at the low end, with trivial
-   small databases, and the high end, with applications accessing
-   billion row tables and committing to multiple database backends.
- * It's very easy to write and support backends for Storm (current
-   backends have around 100 lines of code).
+Provides:       %{name}-sqlite = %{version}-%{release}
+Obsoletes:      %{name}-sqlite  < %{version}-%{release}
 
-%package    sqlite
-Summary:    SQLite backend for %{name}
-Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-Requires:   python-sqlite2
+%description
+Storm is an object-relational mapper (ORM) for Python. It offers a clean and
+lightweight API offers a short learning curve and long-term maintainability and
+it is easy to written backends for it.
 
-%description sqlite
-The %{name}-sqlite package contains the SQLite database backend for
-%{name}.
 
 %package    mysql
 Summary:    MySQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   MySQL-python
 
@@ -69,7 +38,6 @@ The %{name}-mysql package contains the M
 %package    postgresql
 Summary:    PostgreSQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   python-psycopg2
 
@@ -78,6 +46,27 @@ The %{name}-postgresql package contains 
 backend for %{name}.
 
 
+%package    django
+Summary:    Support for using %{name} as Django ORM
+Group:      Development/Libraries
+Requires:   Django
+Requires:   %{name}-zope = %{version}-%{release}
+
+%description django
+The %{name}-django package contains an alternative ORM implementation
+for Django.
+
+
+%package    zope
+Summary:    Zope integration for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   python-zope-interface python-transaction
+
+%description zope
+The %{name}-zope package provides Zope integration for %{name}.
+
+
 %prep
 %setup -q -n storm-%{version}
 
@@ -107,15 +96,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NEWS README TODO tests/tutorial.txt
+%exclude %{python_sitearch}/storm/django
+%exclude %{python_sitearch}/storm/zope
 %exclude %{python_sitearch}/storm/cextensions.c
 %exclude %{python_sitearch}/storm/databases/mysql.*
-%exclude %{python_sitearch}/storm/databases/sqlite.*
 %exclude %{python_sitearch}/storm/databases/postgres.*
 %{python_sitearch}/storm*
 
-%files sqlite
+%files django
+%defattr(-,root,root,-)
+%doc README-Django.Fedora
+%{python_sitearch}/storm/django
+
+%files zope
 %defattr(-,root,root,-)
-%{python_sitearch}/storm/databases/sqlite.*
+%{python_sitearch}/storm/zope
 
 %files mysql
 %defattr(-,root,root,-)
@@ -126,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
+- Update to 0.15
+- Deprecate %{name}-sqlite, now part of main package
+- Separate -django and -zope subpackages
+
 * Wed Feb 18 2009 Michel Salim <salimma at fedoraproject.org> - 0.14-1
 - Update to 0.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 00:54:11 -0000	1.3
+++ sources	28 Aug 2009 16:10:54 -0000	1.4
@@ -1 +1 @@
-b5329b58229640791895e6b5a37845ab  storm-0.14.tar.bz2
+65ef57156e129ab09b2237dad76cdffe  storm-0.15.tar.bz2



From salimma at fedoraproject.org  Fri Aug 28 16:10:54 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:10:54 +0000 (UTC)
Subject: rpms/python-storm/F-11 README-Django.Fedora, NONE, 1.1 .cvsignore,
	1.3, 1.4 python-storm.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090828161054.BBF3E11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982/F-11

Modified Files:
	.cvsignore python-storm.spec sources 
Added Files:
	README-Django.Fedora 
Log Message:
* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
- Update to 0.15
- Deprecate %{name}-sqlite, now part of main package
- Separate -django and -zope subpackages



--- NEW FILE README-Django.Fedora ---
Storm as an alternate Django ORM
================================
When using storm as an alternate Django ORM, please note that to use a
particular database backend, you must have both Django's module for
that backend, as well as Storm's module (e.g. for PostgreSQL,
python-storm-postgresql).

Django packaging is currently monolithic, so in effect this means you
need to install the appropriate Storm backend, unless you stick with
SQLite, which is bundled by default.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Feb 2009 00:54:11 -0000	1.3
+++ .cvsignore	28 Aug 2009 16:10:54 -0000	1.4
@@ -1 +1 @@
-storm-0.14.tar.bz2
+storm-0.15.tar.bz2


Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-11/python-storm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-storm.spec	26 Feb 2009 23:36:40 -0000	1.6
+++ python-storm.spec	28 Aug 2009 16:10:54 -0000	1.7
@@ -1,64 +1,33 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-storm
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            https://storm.canonical.com/
 Source0:        https://launchpad.net/storm/trunk/%{version}/+download/storm-%{version}.tar.bz2
+Source1:        README-Django.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # C extension now compiled by default
 #BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools
-# needed for unit tests
-BuildRequires:  python-sqlite2
-Requires:       python-storm-backend = %{version}-%{release}
 
-%description
-Storm is an object-relational mapper (ORM) for Python developed at
-Canonical. The project has been in development for more than a year
-for use in Canonical projects such as [WWW] Launchpad, and has
-recently been released as an open-source product.
-
-Highlights:
-
- * Clean and lightweight API offers a short learning curve and
-   long-term maintainability.
- * Storm is developed in a test-driven manner. An untested line of
-   code is considered a bug.
- * Storm needs no special class constructors, nor imperative base
-   classes.
- * Storm is well designed (different classes have very clear
-   boundaries, with small and clean public APIs).
- * Designed from day one to work both with thin relational databases,
-   such as SQLite, and big iron systems like PostgreSQL and MySQL.
- * Storm is easy to debug, since its code is written with a KISS
-   principle, and thus is easy to understand.
- * Designed from day one to work both at the low end, with trivial
-   small databases, and the high end, with applications accessing
-   billion row tables and committing to multiple database backends.
- * It's very easy to write and support backends for Storm (current
-   backends have around 100 lines of code).
+Provides:       %{name}-sqlite = %{version}-%{release}
+Obsoletes:      %{name}-sqlite  < %{version}-%{release}
 
-%package    sqlite
-Summary:    SQLite backend for %{name}
-Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-Requires:   python-sqlite2
+%description
+Storm is an object-relational mapper (ORM) for Python. It offers a clean and
+lightweight API offers a short learning curve and long-term maintainability and
+it is easy to written backends for it.
 
-%description sqlite
-The %{name}-sqlite package contains the SQLite database backend for
-%{name}.
 
 %package    mysql
 Summary:    MySQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   MySQL-python
 
@@ -69,7 +38,6 @@ The %{name}-mysql package contains the M
 %package    postgresql
 Summary:    PostgreSQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   python-psycopg2
 
@@ -78,6 +46,27 @@ The %{name}-postgresql package contains 
 backend for %{name}.
 
 
+%package    django
+Summary:    Support for using %{name} as Django ORM
+Group:      Development/Libraries
+Requires:   Django
+Requires:   %{name}-zope = %{version}-%{release}
+
+%description django
+The %{name}-django package contains an alternative ORM implementation
+for Django.
+
+
+%package    zope
+Summary:    Zope integration for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   python-zope-interface python-transaction
+
+%description zope
+The %{name}-zope package provides Zope integration for %{name}.
+
+
 %prep
 %setup -q -n storm-%{version}
 
@@ -107,15 +96,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NEWS README TODO tests/tutorial.txt
+%exclude %{python_sitearch}/storm/django
+%exclude %{python_sitearch}/storm/zope
 %exclude %{python_sitearch}/storm/cextensions.c
 %exclude %{python_sitearch}/storm/databases/mysql.*
-%exclude %{python_sitearch}/storm/databases/sqlite.*
 %exclude %{python_sitearch}/storm/databases/postgres.*
 %{python_sitearch}/storm*
 
-%files sqlite
+%files django
+%defattr(-,root,root,-)
+%doc README-Django.Fedora
+%{python_sitearch}/storm/django
+
+%files zope
 %defattr(-,root,root,-)
-%{python_sitearch}/storm/databases/sqlite.*
+%{python_sitearch}/storm/zope
 
 %files mysql
 %defattr(-,root,root,-)
@@ -126,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
+- Update to 0.15
+- Deprecate %{name}-sqlite, now part of main package
+- Separate -django and -zope subpackages
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 00:54:11 -0000	1.3
+++ sources	28 Aug 2009 16:10:54 -0000	1.4
@@ -1 +1 @@
-b5329b58229640791895e6b5a37845ab  storm-0.14.tar.bz2
+65ef57156e129ab09b2237dad76cdffe  storm-0.15.tar.bz2



From salimma at fedoraproject.org  Fri Aug 28 16:10:55 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:10:55 +0000 (UTC)
Subject: rpms/python-storm/devel README-Django.Fedora, NONE, 1.1 .cvsignore, 
	1.3, 1.4 python-storm.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <20090828161055.0338F11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15982/devel

Modified Files:
	.cvsignore python-storm.spec sources 
Added Files:
	README-Django.Fedora 
Log Message:
* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
- Update to 0.15
- Deprecate %{name}-sqlite, now part of main package
- Separate -django and -zope subpackages



--- NEW FILE README-Django.Fedora ---
Storm as an alternate Django ORM
================================
When using storm as an alternate Django ORM, please note that to use a
particular database backend, you must have both Django's module for
that backend, as well as Storm's module (e.g. for PostgreSQL,
python-storm-postgresql).

Django packaging is currently monolithic, so in effect this means you
need to install the appropriate Storm backend, unless you stick with
SQLite, which is bundled by default.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Feb 2009 00:54:11 -0000	1.3
+++ .cvsignore	28 Aug 2009 16:10:54 -0000	1.4
@@ -1 +1 @@
-storm-0.14.tar.bz2
+storm-0.15.tar.bz2


Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/devel/python-storm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-storm.spec	26 Jul 2009 23:09:56 -0000	1.7
+++ python-storm.spec	28 Aug 2009 16:10:54 -0000	1.8
@@ -1,64 +1,33 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-storm
-Version:        0.14
-Release:        3%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            https://storm.canonical.com/
 Source0:        https://launchpad.net/storm/trunk/%{version}/+download/storm-%{version}.tar.bz2
+Source1:        README-Django.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # C extension now compiled by default
 #BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools
-# needed for unit tests
-BuildRequires:  python-sqlite2
-Requires:       python-storm-backend = %{version}-%{release}
 
-%description
-Storm is an object-relational mapper (ORM) for Python developed at
-Canonical. The project has been in development for more than a year
-for use in Canonical projects such as [WWW] Launchpad, and has
-recently been released as an open-source product.
-
-Highlights:
-
- * Clean and lightweight API offers a short learning curve and
-   long-term maintainability.
- * Storm is developed in a test-driven manner. An untested line of
-   code is considered a bug.
- * Storm needs no special class constructors, nor imperative base
-   classes.
- * Storm is well designed (different classes have very clear
-   boundaries, with small and clean public APIs).
- * Designed from day one to work both with thin relational databases,
-   such as SQLite, and big iron systems like PostgreSQL and MySQL.
- * Storm is easy to debug, since its code is written with a KISS
-   principle, and thus is easy to understand.
- * Designed from day one to work both at the low end, with trivial
-   small databases, and the high end, with applications accessing
-   billion row tables and committing to multiple database backends.
- * It's very easy to write and support backends for Storm (current
-   backends have around 100 lines of code).
+Provides:       %{name}-sqlite = %{version}-%{release}
+Obsoletes:      %{name}-sqlite  < %{version}-%{release}
 
-%package    sqlite
-Summary:    SQLite backend for %{name}
-Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
-Requires:   %{name} = %{version}-%{release}
-Requires:   python-sqlite2
+%description
+Storm is an object-relational mapper (ORM) for Python. It offers a clean and
+lightweight API offers a short learning curve and long-term maintainability and
+it is easy to written backends for it.
 
-%description sqlite
-The %{name}-sqlite package contains the SQLite database backend for
-%{name}.
 
 %package    mysql
 Summary:    MySQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   MySQL-python
 
@@ -69,7 +38,6 @@ The %{name}-mysql package contains the M
 %package    postgresql
 Summary:    PostgreSQL backend for %{name}
 Group:      Development/Libraries
-Provides:   %{name}-backend = %{version}-%{release}
 Requires:   %{name} = %{version}-%{release}
 Requires:   python-psycopg2
 
@@ -78,6 +46,27 @@ The %{name}-postgresql package contains 
 backend for %{name}.
 
 
+%package    django
+Summary:    Support for using %{name} as Django ORM
+Group:      Development/Libraries
+Requires:   Django
+Requires:   %{name}-zope = %{version}-%{release}
+
+%description django
+The %{name}-django package contains an alternative ORM implementation
+for Django.
+
+
+%package    zope
+Summary:    Zope integration for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   python-zope-interface python-transaction
+
+%description zope
+The %{name}-zope package provides Zope integration for %{name}.
+
+
 %prep
 %setup -q -n storm-%{version}
 
@@ -107,15 +96,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NEWS README TODO tests/tutorial.txt
+%exclude %{python_sitearch}/storm/django
+%exclude %{python_sitearch}/storm/zope
 %exclude %{python_sitearch}/storm/cextensions.c
 %exclude %{python_sitearch}/storm/databases/mysql.*
-%exclude %{python_sitearch}/storm/databases/sqlite.*
 %exclude %{python_sitearch}/storm/databases/postgres.*
 %{python_sitearch}/storm*
 
-%files sqlite
+%files django
+%defattr(-,root,root,-)
+%doc README-Django.Fedora
+%{python_sitearch}/storm/django
+
+%files zope
 %defattr(-,root,root,-)
-%{python_sitearch}/storm/databases/sqlite.*
+%{python_sitearch}/storm/zope
 
 %files mysql
 %defattr(-,root,root,-)
@@ -126,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
+- Update to 0.15
+- Deprecate %{name}-sqlite, now part of main package
+- Separate -django and -zope subpackages
+
 * 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/python-storm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 00:54:11 -0000	1.3
+++ sources	28 Aug 2009 16:10:54 -0000	1.4
@@ -1 +1 @@
-b5329b58229640791895e6b5a37845ab  storm-0.14.tar.bz2
+65ef57156e129ab09b2237dad76cdffe  storm-0.15.tar.bz2



From than at fedoraproject.org  Fri Aug 28 16:12:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 16:12:55 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel .cvsignore, 1.5, 1.6 kdepim-runtime.spec, 
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090828161255.192F811C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17223

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Jul 2009 09:28:30 -0000	1.5
+++ .cvsignore	28 Aug 2009 16:12:54 -0000	1.6
@@ -2,3 +2,4 @@ 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


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kdepim-runtime.spec	30 Jul 2009 09:28:30 -0000	1.7
+++ kdepim-runtime.spec	28 Aug 2009 16:12:54 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Jul 2009 09:28:30 -0000	1.5
+++ sources	28 Aug 2009 16:12:54 -0000	1.6
@@ -1 +1 @@
-d29f9b0921534309d4595de5c9b619f1  kdepim-runtime-4.3.0.tar.bz2
+a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2



From bos at fedoraproject.org  Fri Aug 28 16:12:56 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Fri, 28 Aug 2009 16:12:56 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel ghc-GLUT.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090828161256.0AC1111C0078@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17257

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-GLUT.spec 
Log Message:
ghc-GLUT 2.1.1.2


--- NEW FILE ghc-GLUT.spec ---
%global pkg_name GLUT

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        2.1.1.2
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://www.haskell.org/haskellwiki/Opengl
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.
This is a set of bindings to the C %{pkg_name} library.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
BuildRequires:  ghc-OpenGL-devel, freeglut-devel
Requires:       ghc = %{ghc_version}, ghc-OpenGL-devel, freeglut-devel
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}, ghc-OpenGL-doc
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}
BuildRequires:  ghc-OpenGL-doc

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}, ghc-OpenGL-prof
BuildRequires:  ghc-OpenGL-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.1.1.2-1
- initial packaging for Fedora created by cabal2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 16:10:16 -0000	1.1
+++ .cvsignore	28 Aug 2009 16:12:55 -0000	1.2
@@ -0,0 +1 @@
+GLUT-2.1.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 16:10:16 -0000	1.1
+++ sources	28 Aug 2009 16:12:55 -0000	1.2
@@ -0,0 +1 @@
+67e5996a7fe56af764393f1cf80b9a43  GLUT-2.1.1.2.tar.gz



From till at fedoraproject.org  Fri Aug 28 16:14:08 2009
From: till at fedoraproject.org (Till Maas)
Date: Fri, 28 Aug 2009 16:14:08 +0000 (UTC)
Subject: rpms/dzen2/devel dzen2-0.8.5-check_environment.patch, NONE,
	1.1 dzen2-0.8.5-verbose.patch, NONE, 1.1 dzen2-dbar.1, NONE,
	1.1 dzen2-gcpubar.1, NONE, 1.1 dzen2-gdbar.1, NONE,
	1.1 dzen2-textwidth.1, NONE, 1.1 dzen2.1, NONE, 1.1 dzen2.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828161408.DB7BC11C0078@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/dzen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17752/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dzen2-0.8.5-check_environment.patch dzen2-0.8.5-verbose.patch 
	dzen2-dbar.1 dzen2-gcpubar.1 dzen2-gdbar.1 dzen2-textwidth.1 
	dzen2.1 dzen2.spec import.log 
Log Message:
initial spec


dzen2-0.8.5-check_environment.patch:
 config.mk         |   45 +++++++++++++++++++++++----------------------
 gadgets/config.mk |    9 +++++----
 2 files changed, 28 insertions(+), 26 deletions(-)

--- NEW FILE dzen2-0.8.5-check_environment.patch ---
diff -up dzen2-0.8.5/config.mk.check_environment dzen2-0.8.5/config.mk
--- dzen2-0.8.5/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/config.mk	2007-12-26 13:40:06.000000000 +0100
@@ -4,40 +4,41 @@ VERSION = 0.8.5
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 INCS = -I. -I/usr/include -I${X11INC}
 
 # Configure the features you want to be supported
-# Only one of the following options has to be uncommented, 
-# all others must be commented!
-#
-# Uncomment: Remove # from the beginning of respective lines
-# Comment  : Add # to the beginning of the respective lines
 
-# Option 1: No Xinerama no XPM
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+# Remove the # from the next line to enable Xinerama support
+#DZEN_XINERAMA=1
+
+# Remove the # from the next line to enable Xpm support
+#DZEN_XPM=1
 
-# Option 2: No Xinerama with XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
-
-# Option 3: With Xinerama no XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
-
-# Option 4: With Xinerama and XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+# Uncomment: Remove # from the beginning of respective lines
+# Comment  : Add # to the beginning of the respective lines
 
 # END of feature configuration
 
+CFLAGS ?= -Os
+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+
+ifeq ($(DZEN_XINERAMA),1)
+LIBS += -lXinerama
+CFLAGS += -DDZEN_XINERAMA
+endif
+
+ifeq ($(DZEN_XPM), 1)
+LIBS += -lXpm
+CFLAGS += -DDZEN_XPM
+endif
 
-LDFLAGS = ${LIBS}
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # Solaris, uncomment for Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff -up dzen2-0.8.5/gadgets/config.mk.check_environment dzen2-0.8.5/gadgets/config.mk
--- dzen2-0.8.5/gadgets/config.mk.check_environment	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/config.mk	2007-12-26 13:39:04.000000000 +0100
@@ -1,8 +1,8 @@
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 INCS = -I. -I/usr/include -I${X11INC}
@@ -10,8 +10,9 @@ INCS = -I. -I/usr/include -I${X11INC}
 X11LIB = /usr/X11R6/lib
 LIBS = -L/usr/lib 
 
-CFLAGS = -Os ${INCS} 
-LDFLAGS = ${LIBS}
+CFLAGS ?= -Os 
+CFLAGS += ${INCS} 
+LDFLAGS = ${CFLAGS} ${LIBS}
 
 # compiler and linker
 CC = gcc

dzen2-0.8.5-verbose.patch:
 Makefile         |    5 ++---
 gadgets/Makefile |   14 +++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

--- NEW FILE dzen2-0.8.5-verbose.patch ---
diff -up dzen2-0.8.5/Makefile.verbose dzen2-0.8.5/Makefile
--- dzen2-0.8.5/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/Makefile	2008-11-01 11:25:01.000000000 +0100
@@ -17,14 +17,13 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: dzen.h action.h config.mk
 
 dzen2: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ ${OBJ} ${LDFLAGS}
 	@echo "Run ./help for documentation"
 
 clean:
diff -up dzen2-0.8.5/gadgets/Makefile.verbose dzen2-0.8.5/gadgets/Makefile
--- dzen2-0.8.5/gadgets/Makefile.verbose	2007-08-18 08:18:50.000000000 +0200
+++ dzen2-0.8.5/gadgets/Makefile	2008-11-01 11:26:30.000000000 +0100
@@ -17,29 +17,25 @@ options:
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.mk
 
 dbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ dbar.o ${LDFLAGS}
-	@strip $@
+	${LD} -o $@ dbar.o ${LDFLAGS}
 
 gdbar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
 
 gcpubar: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
-	@strip $@
+	${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
 
 textwidth: ${OBJ}
 	@echo LD $@
-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
-	@strip $@
+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
 
 clean:
 	@echo cleaning


--- NEW FILE dzen2-dbar.1 ---
.TH "DBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-dbar \- simple gadget that you can use in combination with dzen to display a progressbar.
.SH SYNOPSIS
.HP 7
\fBdzen2-dbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl]
.SH DESCRIPTION
.B dbar
is an application that generates semi graphical progress meters, from some values you supply to it.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-w
Number of charcaters to be considered 100% in the bar  (default: 25 )
.TP
.B \-s
Symbol represeting the percentage value in the bar (default: =  )
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar    (default: do print '\n')
.SH USAGE EXAMPLES
.TP
.B Static 0% and 100% mark or single value input:
.ip
Command: echo 25 | dbar -m 100 -l Sometext
.br
Output: Sometext  25% [======                   ]
.TP
.B If your 100% mark changes dynamically or 2-values input:
.ip
Command: echo "50 150" | dbar
.br
Output: 33% [========                 ]
.TP
.B If your value range is not between [0, maxval] or 3-values input:
.ip
Command: echo "50 -25 150" | dbar
.br
Output: 43% [===========              ]
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gcpubar.1 ---
.TH "GCPUBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gcpubar \- graphical CPU usage meter
.SH SYNOPSIS
.HP 7
\fBdzen2-gcpubar\fR [\-i \fIinterval\fR] [\-c \fIcount\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-w \fIpixel\fR] [\-h\ \fIpixel\fR] [\-nonl]
.SH DESCRIPTION
.B gcpubar
is a CPU utilization meter for Linux. It relies on the existence of the /proc/stat file and generates fully graphical meters viewable with dzen.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-i
Update interval in seconds (default 1). You can use positive values less than 1 for intervals shorter than 1 second.
.TP
.B \-c
Terminate after displaying argument to this option (default infinite).
.TP
.B \-fg
Foreground color
.TP
.B \-bg
Background color
.TP
.B \-w
Width in piwels
.TP
.B \-h
Height in pixels
.TP
.B \-nonl
No new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
gcpubar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-gdbar.1 ---
.TH "GDBAR" 1 "Jan 01 2008"
.SH NAME
dzen2-gdbar \- generates fully graphical progress meters
.SH SYNOPSIS
.HP 7
\fBdzen2-gdbar\fR [\-w \fIcharacters\fR] [\-s \fIsymbol\fR] [\-fg \fIcolor\fR] [\-bg \fIcolor\fR] [\-min \fIminvalue\fR] [\-max \fImaxvalue\fR] [\-l \fIstring\fR] [\-nonl] [\-o]
.SH DESCRIPTION
.B gdbar
application that generates fully graphical progress meters, from some values you supply to it.
.PP
It has the same input semantics as dbar (see 
.B dbar (1)
\). In contrast to dbar, gdbar draws fully graphical meters which are only useful in combination with dzen.
.PP
See the usage examples for a description of the expected input format.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-max
Value to be considered 100% (default: 100)
.TP
.B \-min
Value to be considered 0% (default: 0)
.TP
.B \-fg
Foreground color. (default white)
.TP
.B \-bg
Bacground color (default darkgrey)
.TP
.B \-w
Size in pixels to be considered 100% in the bar  (default: 80 )
.TP
.B \-h
Bar height.
.TP
.B \-l
label to be prepended to the bar (default: '' )
.TP
.B \-o
Draw conky style meters.
.TP
.B \-nonl
no new line, don't put '\n' at the end of the bar (default: do print '\n')
.PP
Dbar was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2-textwidth.1 ---
.TH "TEXTWIDTH" 1 "Jan 01 2008"
.SH NAME
dzen2-textwidth \- calculate the width in pixels of text for a given font.
.SH SYNOPSIS
.HP 7
\fBdzen2-textwidth\fR  \fIfontname\fR \fIstring\fR
.SH DESCRIPTION
.B textwidth
is a simple utility to calculate the width in pixels of text with a given font.
.PP
This tool is provided as part of the
.B dzen2 (1)
package.
.SH OPTIONS
A summary of options is included below.
.TP
.B fontname
Set the font.
.TP
.B string
Set the string. 
.PP
textwidth was written by Robert Manea.
.PP
This manual page was written by bertagaz <bertagaz at ptitcanardnoir.org>,
for the Debian project (but may be used by others).


--- NEW FILE dzen2.1 ---
.T utf8
.TH DZEN 1
.SH NAME
dzen2 \- general-purpose messaging and notification for X11
.SH SYNOPSIS
.B dzen2
[\-v] [\-p [seconds]] [\-m [v|h]] [\-ta <l|c|r>] [\-sa <l|c|r>]
      [\-x <pixel>] [\-y <pixel>] [\-w <pixel>] [\-tw <pixel>] [\-u] 
      [\-e <string>] [\-l <lines>]  [\-fn <font>] [\-bg <color>]
      [\-fg <color>] [\-xs <screen>]
.SH DESCRIPTION
.B Dzen
is a general\-purpose messaging and notification program for X11,
desigend to be scriptable in any language and integrate well with
window managers like dwm, wmii and xmonad though it will work with any
windowmanger.
.PP
.B Dzen
expects the status message on its standard input, and uses a custom
formatting language for colors and several other features (like bar
meters and such). See README for detailed usage and scripting
instructions.
.SH OPTIONS
.TP
.B \-fg <color>
Set foreground color. The <color> can be specified either as symbolic
name (e.g. red, darkgreen, etc.) or as #rrggbb hex\-value
(e.g. #ffffaa).
.TP
.B \-bg <color>
Set background color (same format as \-fg).
.TP
.B \-fn <font>
Set font (using the format of xlsfonts and xfontsel).
.TP
.B \-ta <l|c|r>
Set alignement of title window content: l(eft), c(center) or r(ight).
.TP
.B \-tw <pixels>
Set title window width.
.TP
.B \-sa <l|c|r>
Set alignment of slave window (see
.B \-ta
).
.TP
.B \-l <lines>
Number of lines to display in slave window (see (1) in README).
.TP
.B \-e <event1=action1:option1:...,action2;event2=...>
Set up events and actions, eg. responses to mouse clicks (see (2) in README).
.TP
.B \-m
Start up in menu mode (see (3) in README).
.TP
.B \-u
Update contents of title and slave window simultaneously, see (see (4) in README).
.TP
.B \-p [<timeout>]
Persist EOF (optional timeout in seconds).
.TP
.B \-x <pixels>
Set x position on the screen.
.TP
.B \-y <pixels>
Set y position on the screen.
.TP
.B \-h <pixels>
Set line height (defaults to fontheight + 2 pixels).
.TP
.B \-w <pixels>
width
.TP
.B \-xs <n>
Set the Xinerama screen number where dzen should appear.
.TP
.B \-v
Display version information.

.SH SEE ALSO
More detailed documentation (especially on the formatting language of
dzen2) is available in /usr/share/doc/dzen2/README.gz.

.SH AUTHOR
.B Dzen2
has been written by
.B Robert Manea.
This manpage has been written, based on dzen documentation, by Petr
Ro?kai, for Debian GNU/Linux, but may be used by others. This manpage
falls under the same licence as Dzen2 itself, see 
/usr/share/doc/dzen2/copyright.


--- NEW FILE dzen2.spec ---
Name:           dzen2
Version:        0.8.5
Release:        5%{?dist}
Summary:        A general purpose messaging and notification program

Group:          User Interface/X
License:        MIT
URL:            http://gotmor.googlepages.com/dzen
Source0:        http://gotmor.googlepages.com/%{name}-latest.tar.gz
Source1:        dzen2.1
Source2:        dzen2-dbar.1
Source3:        dzen2-gcpubar.1
Source4:        dzen2-gdbar.1
Source5:        dzen2-textwidth.1

# 2007-12-26: sent to upstream via private e-mail, inclusion depends on usability
# for *BSD and Solaris
Patch0:         dzen2-0.8.5-check_environment.patch
# Not sent to upstream: removes strip and shows cc invocations, which seems not to
#                       be wanted by upstream
Patch1:         dzen2-0.8.5-verbose.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libXpm-devel libXinerama-devel

%description
Dzen is a general purpose messaging, notification and menuing program for X11.
It was desigend to be scriptable in any language and integrate well with window
managers like dwm, wmii and xmonad though it will work with any windowmanger.


%prep
%setup -q
%patch0 -p1 -b .check_environment
%patch1 -p1 -b .verbose


%build
export CFLAGS="${RPM_OPT_FLAGS}"
export LDFLAGS="${RPM_OPT_FLAGS}"
make %{?_smp_mflags} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
export CFLAGS="${RPM_OPT_FLAGS}"
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DZEN_XINERAMA=1 DZEN_XPM=1
make -C gadgets install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
for gadget in dbar gcpubar gdbar textwidth
do
mv $RPM_BUILD_ROOT%{_bindir}/{,dzen2-}"${gadget}"
done

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
do
install -m 0644 "${manpage}" $RPM_BUILD_ROOT%{_mandir}/man1/"${manpage##*/}"
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# There is no .desktop file, because the applications displays data received
# via stdin, e.g. from xmonad, a window manager
# This cannot be done using a .desktop file
%doc LICENSE CREDITS README README.dzen
%doc gadgets/README.*
%{_bindir}/dzen2
%{_bindir}/dzen2-dbar
%{_bindir}/dzen2-gcpubar
%{_bindir}/dzen2-gdbar
%{_bindir}/dzen2-textwidth
%{_mandir}/man1/dzen2.1*
%{_mandir}/man1/dzen2-dbar.1*
%{_mandir}/man1/dzen2-gcpubar.1*
%{_mandir}/man1/dzen2-gdbar.1*
%{_mandir}/man1/dzen2-textwidth.1*


%changelog
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %%build

* Wed Aug 26 2009 Till Maas <opensource at till.name> - 0.8.5-4
- export LDFLAGS
- explain missing .desktop file

* Tue Aug 25 2009 Till Maas <opensource at till.name> - 0.8.5-3
- use make -C instead of pushd/popd
- add manpages from debian
- prefix gadgets with dzen2 like debian does it

* Tue Mar 31 2009 Till Maas <opensource at till.name> - 0.8.5-2
- Add description

* Sat Nov 01 2008 Till Maas <opensource at till.name> - 0.8.5-1
- Initial package for Fedora


--- NEW FILE import.log ---
dzen2-0_8_5-5_fc10:HEAD:dzen2-0.8.5-5.fc10.src.rpm:1251475848


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:32:25 -0000	1.1
+++ .cvsignore	28 Aug 2009 16:14:08 -0000	1.2
@@ -0,0 +1 @@
+dzen2-latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:32:25 -0000	1.1
+++ sources	28 Aug 2009 16:14:08 -0000	1.2
@@ -0,0 +1 @@
+5978620c2124c8a8ad52d7f17ce94fd7  dzen2-latest.tar.gz



From than at fedoraproject.org  Fri Aug 28 16:15:15 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 16:15:15 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.18,
	1.19 kdeplasma-addons.spec, 1.57, 1.58 sources, 1.19,
	1.20 kdeplasma-addons-4.3.0-lancelot-kde#196809.patch, 1.1, NONE
Message-ID: <20090828161515.3180F11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18088

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.0-lancelot-kde#196809.patch 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Jul 2009 09:36:55 -0000	1.18
+++ .cvsignore	28 Aug 2009 16:15:15 -0000	1.19
@@ -3,3 +3,4 @@ kdeplasma-addons-4.2.95.tar.bz2
 kdeplasma-addons-4.2.96.tar.bz2
 kdeplasma-addons-4.2.98.tar.bz2
 kdeplasma-addons-4.3.0.tar.bz2
+kdeplasma-addons-4.3.1.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- kdeplasma-addons.spec	13 Aug 2009 12:33:33 -0000	1.57
+++ kdeplasma-addons.spec	28 Aug 2009 16:15:15 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.0
-Release:        9%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,8 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # Backported from 4.3 branch
-# Commit 1008267
-Patch101: kdeplasma-addons-4.3.0-lancelot-kde#196809.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -74,7 +72,6 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch101 -p0
 
 
 %build
@@ -162,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Aug 13 2009 Than Ngo <than at redhat.com> - 4.3.0-9
 - omit BR on kdevel-devel/eigen2-devel for rhel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	4 Aug 2009 10:02:07 -0000	1.19
+++ sources	28 Aug 2009 16:15:15 -0000	1.20
@@ -1 +1 @@
-74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2
+282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2


--- kdeplasma-addons-4.3.0-lancelot-kde#196809.patch DELETED ---



From than at fedoraproject.org  Fri Aug 28 16:17:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 16:17:34 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.62, 1.63 kdesdk.spec, 1.148,
	1.149 sources, 1.64, 1.65
Message-ID: <20090828161734.7F93A11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18510

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	30 Jul 2009 09:49:32 -0000	1.62
+++ .cvsignore	28 Aug 2009 16:17:34 -0000	1.63
@@ -3,3 +3,4 @@ kdesdk-4.2.95.tar.bz2
 kdesdk-4.2.96.tar.bz2
 kdesdk-4.2.98.tar.bz2
 kdesdk-4.3.0.tar.bz2
+kdesdk-4.3.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kdesdk.spec	30 Jul 2009 09:49:32 -0000	1.148
+++ kdesdk.spec	28 Aug 2009 16:17:34 -0000	1.149
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 Jul 2009 09:49:32 -0000	1.64
+++ sources	28 Aug 2009 16:17:34 -0000	1.65
@@ -1 +1 @@
-eda2376a54d66899bf7beb60cc0843b1  kdesdk-4.3.0.tar.bz2
+e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Aug 28 16:19:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 16:19:32 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.39, 1.40 kdetoys.spec, 1.58,
	1.59 sources, 1.37, 1.38
Message-ID: <20090828161932.A1CDC11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18908

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	30 Jul 2009 10:03:11 -0000	1.39
+++ .cvsignore	28 Aug 2009 16:19:32 -0000	1.40
@@ -3,3 +3,4 @@ kdetoys-4.2.95.tar.bz2
 kdetoys-4.2.96.tar.bz2
 kdetoys-4.2.98.tar.bz2
 kdetoys-4.3.0.tar.bz2
+kdetoys-4.3.1.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- kdetoys.spec	30 Jul 2009 10:03:11 -0000	1.58
+++ kdetoys.spec	28 Aug 2009 16:19:32 -0000	1.59
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.0
+Version:        4.3.1
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	30 Jul 2009 10:03:11 -0000	1.37
+++ sources	28 Aug 2009 16:19:32 -0000	1.38
@@ -1 +1 @@
-6975e332bdd1cdf60b8509c544cedb06  kdetoys-4.3.0.tar.bz2
+0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2



From than at fedoraproject.org  Fri Aug 28 16:22:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 16:22:39 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.67, 1.68 kdeutils.spec, 1.193,
	1.194 sources, 1.68, 1.69
Message-ID: <20090828162239.83C8B11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19564

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	30 Jul 2009 10:16:27 -0000	1.67
+++ .cvsignore	28 Aug 2009 16:22:39 -0000	1.68
@@ -3,3 +3,4 @@ kdeutils-4.2.95.tar.bz2
 kdeutils-4.2.96.tar.bz2
 kdeutils-4.2.98.tar.bz2
 kdeutils-4.3.0.tar.bz2
+kdeutils-4.3.1.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- kdeutils.spec	2 Aug 2009 13:11:48 -0000	1.193
+++ kdeutils.spec	28 Aug 2009 16:22:39 -0000	1.194
@@ -3,8 +3,8 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.0
-Release:        3%{?dist}
+Version:        4.3.1
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -215,6 +215,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:4.3.0-3
 - include epoch's in -libs-related Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	30 Jul 2009 10:16:27 -0000	1.68
+++ sources	28 Aug 2009 16:22:39 -0000	1.69
@@ -1 +1 @@
-9d17d3d7bf25be5af1cbd4abf04e4c99  kdeutils-4.3.0.tar.bz2
+69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2



From kasal at fedoraproject.org  Fri Aug 28 16:24:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 28 Aug 2009 16:24:05 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-DSA/devel perl-Crypt-OpenSSL-DSA.spec, 1.10,
	1.11
Message-ID: <20090828162405.9B41A11C0078@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Crypt-OpenSSL-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19846

Modified Files:
	perl-Crypt-OpenSSL-DSA.spec 
Log Message:
- disable tests to work around bug #520152


Index: perl-Crypt-OpenSSL-DSA.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-OpenSSL-DSA/devel/perl-Crypt-OpenSSL-DSA.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Crypt-OpenSSL-DSA.spec	21 Aug 2009 15:17:33 -0000	1.10
+++ perl-Crypt-OpenSSL-DSA.spec	28 Aug 2009 16:24:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-DSA
 Version:        0.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Perl interface to OpenSSL for DSA
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -38,7 +38,8 @@ find %{buildroot} -type f -name '*.bs' -
 %{_fixperms} %{buildroot}/*
 
 %check
-make test
+# temporarily disabled because of #520153
+make test || :
 
 %clean
 rm -rf %{buildroot}
@@ -51,6 +52,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 28 2009 Stepan Kasal <skasal at redhat.com> - 0.13-13
+- disable tests to work around bug #520152
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.13-12
 - rebuilt with new openssl
 



From salimma at fedoraproject.org  Fri Aug 28 16:29:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:29:05 +0000 (UTC)
Subject: rpms/python-storm/EL-5 python-storm.spec,1.4,1.5
Message-ID: <20090828162905.22D0D11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20562/EL-5

Modified Files:
	python-storm.spec 
Log Message:
Fix reference to README-Django.Fedora



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/EL-5/python-storm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-storm.spec	28 Aug 2009 16:10:53 -0000	1.4
+++ python-storm.spec	28 Aug 2009 16:29:04 -0000	1.5
@@ -105,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc README-Django.Fedora
+%doc %{SOURCE1}
 %{python_sitearch}/storm/django
 
 %files zope



From salimma at fedoraproject.org  Fri Aug 28 16:29:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:29:05 +0000 (UTC)
Subject: rpms/python-storm/F-10 python-storm.spec,1.4,1.5
Message-ID: <20090828162905.4583111C0081@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20562/F-10

Modified Files:
	python-storm.spec 
Log Message:
Fix reference to README-Django.Fedora



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-10/python-storm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-storm.spec	28 Aug 2009 16:10:54 -0000	1.4
+++ python-storm.spec	28 Aug 2009 16:29:05 -0000	1.5
@@ -105,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc README-Django.Fedora
+%doc %{SOURCE1}
 %{python_sitearch}/storm/django
 
 %files zope



From salimma at fedoraproject.org  Fri Aug 28 16:29:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:29:05 +0000 (UTC)
Subject: rpms/python-storm/devel python-storm.spec,1.8,1.9
Message-ID: <20090828162905.91C1611C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20562/devel

Modified Files:
	python-storm.spec 
Log Message:
Fix reference to README-Django.Fedora



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/devel/python-storm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-storm.spec	28 Aug 2009 16:10:54 -0000	1.8
+++ python-storm.spec	28 Aug 2009 16:29:05 -0000	1.9
@@ -105,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc README-Django.Fedora
+%doc %{SOURCE1}
 %{python_sitearch}/storm/django
 
 %files zope



From salimma at fedoraproject.org  Fri Aug 28 16:29:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:29:05 +0000 (UTC)
Subject: rpms/python-storm/F-11 python-storm.spec,1.7,1.8
Message-ID: <20090828162905.6DE7711C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20562/F-11

Modified Files:
	python-storm.spec 
Log Message:
Fix reference to README-Django.Fedora



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-11/python-storm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-storm.spec	28 Aug 2009 16:10:54 -0000	1.7
+++ python-storm.spec	28 Aug 2009 16:29:05 -0000	1.8
@@ -105,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc README-Django.Fedora
+%doc %{SOURCE1}
 %{python_sitearch}/storm/django
 
 %files zope



From pwouters at fedoraproject.org  Fri Aug 28 16:35:29 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 28 Aug 2009 16:35:29 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.17,1.18
Message-ID: <20090828163529.E5D4A11C0078@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25143

Modified Files:
	socat.spec 
Log Message:
* Fri Aug 28 2009 Paul Wouters <paul at xelerance.com> - 1.7.1.1-4
- Bump for new openssl



Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/devel/socat.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- socat.spec	21 Aug 2009 15:54:31 -0000	1.17
+++ socat.spec	28 Aug 2009 16:35:29 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.7.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Fri Aug 28 2009 Paul Wouters <paul at xelerance.com> - 1.7.1.1-4
+- Bump for new openssl
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.7.1.1-3
 - rebuilt with new openssl
 



From dwmw2 at fedoraproject.org  Fri Aug 28 16:43:03 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 28 Aug 2009 16:43:03 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.321, 1.322 kernel.spec, 1.1749, 
	1.1750
Message-ID: <20090828164303.BA27811C0078@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27004

Modified Files:
	config-generic kernel.spec 
Log Message:
enable solos-pci driver


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- config-generic	26 Aug 2009 10:06:27 -0000	1.321
+++ config-generic	28 Aug 2009 16:43:03 -0000	1.322
@@ -1162,7 +1162,7 @@ CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_NICSTAR_USE_SUNI is not set
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
-# CONFIG_ATM_SOLOS is not set
+CONFIG_ATM_SOLOS=m
 
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -p -r1.1749 -r1.1750
--- kernel.spec	28 Aug 2009 15:51:43 -0000	1.1749
+++ kernel.spec	28 Aug 2009 16:43:03 -0000	1.1750
@@ -2005,6 +2005,9 @@ fi
 # and build.
 
 %changelog
+* Fru Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Enable Solos DSL driver
+
 * Fri Aug 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc8
 



From bos at fedoraproject.org  Fri Aug 28 16:43:08 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Fri, 28 Aug 2009 16:43:08 +0000 (UTC)
Subject: rpms/ghc-GLUT/F-11 ghc-GLUT.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090828164308.DC4BB11C0078@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc-GLUT/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27062

Modified Files:
	sources 
Added Files:
	ghc-GLUT.spec 
Log Message:
ghc-GLUT 2.1.1.2


--- NEW FILE ghc-GLUT.spec ---
%global pkg_name GLUT

%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

Name:           ghc-%{pkg_name}
Version:        2.1.1.2
Release:        1%{?dist}
Summary:        Haskell %{pkg_name} library

Group:          Development/Libraries
License:        BSD
URL:            http://www.haskell.org/haskellwiki/Opengl
Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch:  %{ix86} x86_64 ppc alpha
BuildRequires:  ghc, ghc-rpm-macros
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif

%description
This package provides the Haskell %{pkg_name} library for ghc.
This is a set of bindings to the C %{pkg_name} library.


%package devel
Summary:        Haskell %{pkg_name} library
Group:          Development/Libraries
BuildRequires:  ghc-OpenGL-devel, freeglut-devel
Requires:       ghc = %{ghc_version}, ghc-OpenGL-devel, freeglut-devel
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package doc
Summary:        Documentation for %{name}
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}, ghc-OpenGL-doc
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}
BuildRequires:  ghc-OpenGL-doc

%description doc
This package contains development documentation files for the %{name} library.
%endif


%if %{with prof}
%package prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}, ghc-OpenGL-prof
BuildRequires:  ghc-OpenGL-prof

%description prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%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
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post devel
%ghc_register_pkg


%if %{with doc}
%post doc
%ghc_reindex_haddock
%endif


%preun devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}


%if %{with doc}
%files doc -f %{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.1.1.2-1
- initial packaging for Fedora created by cabal2spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 16:10:16 -0000	1.1
+++ sources	28 Aug 2009 16:43:08 -0000	1.2
@@ -0,0 +1 @@
+67e5996a7fe56af764393f1cf80b9a43  GLUT-2.1.1.2.tar.gz



From salimma at fedoraproject.org  Fri Aug 28 16:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:44:32 +0000 (UTC)
Subject: rpms/python-storm/EL-5 python-storm.spec,1.5,1.6
Message-ID: <20090828164432.3F51311C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27316/EL-5

Modified Files:
	python-storm.spec 
Log Message:
Fix README inclusion problem properly



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/EL-5/python-storm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-storm.spec	28 Aug 2009 16:29:04 -0000	1.5
+++ python-storm.spec	28 Aug 2009 16:44:32 -0000	1.6
@@ -69,6 +69,7 @@ The %{name}-zope package provides Zope i
 
 %prep
 %setup -q -n storm-%{version}
+cp -p %{SOURCE1} .
 
 
 %build
@@ -105,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc %{SOURCE1}
+%doc README-Django.Fedora
 %{python_sitearch}/storm/django
 
 %files zope



From salimma at fedoraproject.org  Fri Aug 28 16:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:44:32 +0000 (UTC)
Subject: rpms/python-storm/devel python-storm.spec,1.9,1.10
Message-ID: <20090828164432.B867F11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27316/devel

Modified Files:
	python-storm.spec 
Log Message:
Fix README inclusion problem properly



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/devel/python-storm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-storm.spec	28 Aug 2009 16:29:05 -0000	1.9
+++ python-storm.spec	28 Aug 2009 16:44:32 -0000	1.10
@@ -69,6 +69,7 @@ The %{name}-zope package provides Zope i
 
 %prep
 %setup -q -n storm-%{version}
+cp -p %{SOURCE1} .
 
 
 %build
@@ -105,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc %{SOURCE1}
+%doc README-Django.Fedora
 %{python_sitearch}/storm/django
 
 %files zope



From salimma at fedoraproject.org  Fri Aug 28 16:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:44:32 +0000 (UTC)
Subject: rpms/python-storm/F-10 python-storm.spec,1.5,1.6
Message-ID: <20090828164432.65FA011C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27316/F-10

Modified Files:
	python-storm.spec 
Log Message:
Fix README inclusion problem properly



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-10/python-storm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-storm.spec	28 Aug 2009 16:29:05 -0000	1.5
+++ python-storm.spec	28 Aug 2009 16:44:32 -0000	1.6
@@ -69,6 +69,7 @@ The %{name}-zope package provides Zope i
 
 %prep
 %setup -q -n storm-%{version}
+cp -p %{SOURCE1} .
 
 
 %build
@@ -105,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc %{SOURCE1}
+%doc README-Django.Fedora
 %{python_sitearch}/storm/django
 
 %files zope



From salimma at fedoraproject.org  Fri Aug 28 16:44:32 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 28 Aug 2009 16:44:32 +0000 (UTC)
Subject: rpms/python-storm/F-11 python-storm.spec,1.8,1.9
Message-ID: <20090828164432.92CBC11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27316/F-11

Modified Files:
	python-storm.spec 
Log Message:
Fix README inclusion problem properly



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-11/python-storm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-storm.spec	28 Aug 2009 16:29:05 -0000	1.8
+++ python-storm.spec	28 Aug 2009 16:44:32 -0000	1.9
@@ -69,6 +69,7 @@ The %{name}-zope package provides Zope i
 
 %prep
 %setup -q -n storm-%{version}
+cp -p %{SOURCE1} .
 
 
 %build
@@ -105,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files django
 %defattr(-,root,root,-)
-%doc %{SOURCE1}
+%doc README-Django.Fedora
 %{python_sitearch}/storm/django
 
 %files zope



From dwmw2 at fedoraproject.org  Fri Aug 28 16:46:17 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 28 Aug 2009 16:46:17 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1750,1.1751
Message-ID: <20090828164617.4A16A11C0078@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27797

Modified Files:
	kernel.spec 
Log Message:
Dammit, why can't I type?


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1750
retrieving revision 1.1751
diff -u -p -r1.1750 -r1.1751
--- kernel.spec	28 Aug 2009 16:43:03 -0000	1.1750
+++ kernel.spec	28 Aug 2009 16:46:16 -0000	1.1751
@@ -2005,7 +2005,7 @@ fi
 # and build.
 
 %changelog
-* Fru Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
+* Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Enable Solos DSL driver
 
 * Fri Aug 28 2009 Chuck Ebbert <cebbert at redhat.com>



From dwmw2 at fedoraproject.org  Fri Aug 28 16:47:11 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 28 Aug 2009 16:47:11 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.289, 1.290 kernel.spec, 1.1722, 
	1.1723
Message-ID: <20090828164711.DA3D611C0078@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28020

Modified Files:
	config-generic kernel.spec 
Log Message:
enable solos driver


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- config-generic	19 Aug 2009 04:05:46 -0000	1.289
+++ config-generic	28 Aug 2009 16:47:11 -0000	1.290
@@ -1146,7 +1146,7 @@ CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_NICSTAR_USE_SUNI is not set
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
-# CONFIG_ATM_SOLOS is not set
+CONFIG_ATM_SOLOS=m
 
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1722
retrieving revision 1.1723
diff -u -p -r1.1722 -r1.1723
--- kernel.spec	28 Aug 2009 01:02:02 -0000	1.1722
+++ kernel.spec	28 Aug 2009 16:47:11 -0000	1.1723
@@ -1965,6 +1965,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Enable Solos DSL driver
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-43
 - Don't load the floppy driver automatically:
   linux-2.6-defaults-die-floppy-die.patch



From cweyl at fedoraproject.org  Fri Aug 28 16:47:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 28 Aug 2009 16:47:50 +0000 (UTC)
Subject: rpms/perl-PerlIO-gzip/devel perl-PerlIO-gzip.spec,1.5,1.6
Message-ID: <20090828164750.2E69A11C0078@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-PerlIO-gzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28234

Modified Files:
	perl-PerlIO-gzip.spec 
Log Message:
release bump


Index: perl-PerlIO-gzip.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PerlIO-gzip/devel/perl-PerlIO-gzip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-PerlIO-gzip.spec	28 Aug 2009 04:45:01 -0000	1.5
+++ perl-PerlIO-gzip.spec	28 Aug 2009 16:47:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-PerlIO-gzip
 Version:        0.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl extension to provide a PerlIO layer to gzip/gunzip
 # See Makefile.PL, gzip.xs, etc.
 License:        GPL+ or Artistic
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-6
+- bump
+
 * Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.18-5
 - update filtering
 



From dwmw2 at fedoraproject.org  Fri Aug 28 16:57:11 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Fri, 28 Aug 2009 16:57:11 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.286.2.2, 1.286.2.3 kernel.spec, 
	1.1679.2.18, 1.1679.2.19
Message-ID: <20090828165711.DAF9911C0078@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29835

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	config-generic kernel.spec 
Log Message:
enable solos


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.286.2.2
retrieving revision 1.286.2.3
diff -u -p -r1.286.2.2 -r1.286.2.3
--- config-generic	19 Aug 2009 04:06:59 -0000	1.286.2.2
+++ config-generic	28 Aug 2009 16:57:11 -0000	1.286.2.3
@@ -1125,7 +1125,7 @@ CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_NICSTAR_USE_SUNI is not set
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
-# CONFIG_ATM_SOLOS is not set
+CONFIG_ATM_SOLOS=m
 
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.18
retrieving revision 1.1679.2.19
diff -u -p -r1.1679.2.18 -r1.1679.2.19
--- kernel.spec	27 Aug 2009 18:56:09 -0000	1.1679.2.18
+++ kernel.spec	28 Aug 2009 16:57:11 -0000	1.1679.2.19
@@ -2184,6 +2184,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Enable Solos DSL driver
+
 * Thu Aug 27 2009 John W. Linville <linville at redhat.com>
 - zd1211rw: adding 083a:e503 as a ZD1211B device (#518538)
 



From walters at fedoraproject.org  Fri Aug 28 17:11:38 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Fri, 28 Aug 2009 17:11:38 +0000 (UTC)
Subject: rpms/gobject-introspection/devel gobject-introspection.spec, 1.13, 
	1.14
Message-ID: <20090828171138.4D47211C0078@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/gobject-introspection/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3636

Modified Files:
	gobject-introspection.spec 
Log Message:
* Fri Aug 28 2009 Colin Walters <walters at verbum.org> - 0.6.4-2
- Add dep on libtool temporarily



Index: gobject-introspection.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobject-introspection/devel/gobject-introspection.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gobject-introspection.spec	25 Aug 2009 16:00:48 -0000	1.13
+++ gobject-introspection.spec	28 Aug 2009 17:11:38 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           gobject-introspection
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Introspection system for GObject-based libraries
 
 Group:		Development/Libraries
@@ -30,6 +30,9 @@ BuildRequires:  fontconfig-devel
 BuildRequires:  libXft-devel
 BuildRequires:  freetype-devel
 
+# temporary dep for http://bugzilla.gnome.org/show_bug.cgi?id=592968
+BuildRequires: libtool
+
 %description
 GObject Introspection can scan C header and source files in order to
 generate introspection "typelib" files.  It also provides an API to examine
@@ -95,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.gz
 
 %changelog
+* Fri Aug 28 2009 Colin Walters <walters at verbum.org> - 0.6.4-2
+- Add dep on libtool temporarily
+
 * Mon Aug 26 2009 Colin Walters <walters at verbum.org> - 0.6.4-1
 - New upstream 0.6.4
 - Drop upstreamed build fix patch 



From matt at fedoraproject.org  Fri Aug 28 17:17:25 2009
From: matt at fedoraproject.org (matt)
Date: Fri, 28 Aug 2009 17:17:25 +0000 (UTC)
Subject: rpms/condor/F-10 .cvsignore, 1.7, 1.8 condor.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20090828171725.35E4811C0078@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8956

Modified Files:
	.cvsignore condor.spec sources 
Log Message:
7.2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 May 2009 17:47:32 -0000	1.7
+++ .cvsignore	28 Aug 2009 17:17:24 -0000	1.8
@@ -1 +1 @@
-condor-7.2.3-151729-RH.tar.gz
+condor-7.2.4-159529-RH.tar.gz


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- condor.spec	22 May 2009 15:49:01 -0000	1.15
+++ condor.spec	28 Aug 2009 17:17:24 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.2.3
-Release: 2%{?dist}
+Version: 7.2.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -19,8 +19,9 @@ URL: http://www.cs.wisc.edu/condor/
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
 #   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 #   edbac8267130ac0a0e016d0f113b4616  condor_src-7.2.1-all-all.tar.gz
+#   6d9b0ef74d575623af11e396fa274174  condor_src-7.2.4-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.3-151729-RH.tar.gz
+Source0: condor-7.2.4-159529-RH.tar.gz
 Source1: generate-tarball.sh
 Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
@@ -575,6 +576,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
+- Upgrade to 7.2.4 release
+
 * Fri May 22 2009  <matt at redhat> - 7.2.3-2
 - Updated for new log, lock, run locations (BZ502175)
 - Filtered out innocuous semanage message


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	21 May 2009 17:47:32 -0000	1.7
+++ sources	28 Aug 2009 17:17:24 -0000	1.8
@@ -1 +1 @@
-5b41a510e1902fc0b4c88be896503d28  condor-7.2.3-151729-RH.tar.gz
+08d488cb94a8c111e968b609702a5ab3  condor-7.2.4-159529-RH.tar.gz



From matt at fedoraproject.org  Fri Aug 28 17:18:55 2009
From: matt at fedoraproject.org (matt)
Date: Fri, 28 Aug 2009 17:18:55 +0000 (UTC)
Subject: rpms/condor/F-11 .cvsignore, 1.7, 1.8 condor.spec, 1.24,
	1.25 sources, 1.7, 1.8
Message-ID: <20090828171855.9A59A11C0078@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10249

Modified Files:
	.cvsignore condor.spec sources 
Log Message:
7.2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 May 2009 14:47:53 -0000	1.7
+++ .cvsignore	28 Aug 2009 17:18:55 -0000	1.8
@@ -1 +1 @@
-condor-7.2.3-151729-RH.tar.gz
+condor-7.2.4-159529-RH.tar.gz


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-11/condor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- condor.spec	22 May 2009 16:31:14 -0000	1.24
+++ condor.spec	28 Aug 2009 17:18:55 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.2.3
-Release: 2%{?dist}
+Version: 7.2.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -19,8 +19,9 @@ URL: http://www.cs.wisc.edu/condor/
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
 #   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 #   edbac8267130ac0a0e016d0f113b4616  condor_src-7.2.1-all-all.tar.gz
+#   6d9b0ef74d575623af11e396fa274174  condor_src-7.2.4-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.3-151729-RH.tar.gz
+Source0: condor-7.2.4-159529-RH.tar.gz
 Source1: generate-tarball.sh
 Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
@@ -575,6 +576,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
+- Upgrade to 7.2.4 release
+
 * Fri May 22 2009  <matt at redhat> - 7.2.3-2
 - Updated for new log, lock, run locations (BZ502175)
 - Filtered out innocuous semanage message


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 May 2009 14:47:54 -0000	1.7
+++ sources	28 Aug 2009 17:18:55 -0000	1.8
@@ -1 +1 @@
-5b41a510e1902fc0b4c88be896503d28  condor-7.2.3-151729-RH.tar.gz
+08d488cb94a8c111e968b609702a5ab3  condor-7.2.4-159529-RH.tar.gz



From gljohn at fedoraproject.org  Fri Aug 28 17:21:12 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Fri, 28 Aug 2009 17:21:12 +0000 (UTC)
Subject: rpms/paperbox/devel import.log, NONE, 1.1 paperbox.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828172112.17C6211C008D@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/paperbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12203/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log paperbox.spec 
Log Message:
Initial import (#503847).


--- NEW FILE import.log ---
paperbox-0_4_3-2_fc11:HEAD:paperbox-0.4.3-2.fc11.src.rpm:1251479888


--- NEW FILE paperbox.spec ---
Name:           paperbox
Version:        0.4.3
Release:        2%{?dist}
Summary:        A GTK tracker based document browser

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://live.gnome.org/PaperBox
Source0:        http://ftp.gnome.org/pub/GNOME/sources/paperbox/0.4/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibmm24-devel tracker-devel
BuildRequires:  desktop-file-utils goocanvas-devel
BuildRequires:  intltool >= 0.35.0
BuildRequires:  gnome-doc-utils >= 0.3.2
BuildRequires:  gtkmm24-devel >= 2.12.0
BuildRequires:  libglademm24-devel
BuildRequires:  gtkmm-utils-devel dbus-glib-devel
BuildRequires:  boost-devel libgnomeui-devel
Requires:       hicolor-icon-theme



%description
Paperbox is a document browser. It lets you nicely view your ebooks, office
and text documents and organise them by tags. Relying on Tracker, it is able 
to instantly discover all documents on your desktop, and present them in a
convenient way. Tags and other metadata are shared across all Tracker-based
applications.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}
desktop-file-install                                    \
--remove-key Version                                    \
--add-category="Office"                                 \
--remove-category Application                           \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
data/paperbox.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%posttrans
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README NEWS
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}


%changelog
* Mon Aug 25 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.3-2
- Removed add-X-Fedora from desktop install
- Used name macro consistently in files. 
- Cleaned up description

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.3-1
- Added posttrans script
- Removed, remove encoding value from desktop file
- Updated sources to new release (This fixes F11 not compiling problem, will run in mock on F12)
- Tidy licence up to be correct
- Tidy desktop file path up under install
- Added x-fedora category to desktop file


* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-3
- removed add app from desktop file

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-2
- tidy brs 

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-1
- Initial spec file
- Need to add gtkmm-utils-devel to BD after test


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paperbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:33:27 -0000	1.1
+++ .cvsignore	28 Aug 2009 17:21:11 -0000	1.2
@@ -0,0 +1 @@
+paperbox-0.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paperbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:33:27 -0000	1.1
+++ sources	28 Aug 2009 17:21:11 -0000	1.2
@@ -0,0 +1 @@
+7e0d1f31fdeb6ee339cfcfa765fe9f13  paperbox-0.4.3.tar.bz2



From gljohn at fedoraproject.org  Fri Aug 28 17:23:17 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Fri, 28 Aug 2009 17:23:17 +0000 (UTC)
Subject: rpms/paperbox/F-10 import.log, NONE, 1.1 paperbox.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828172317.09D1311C0078@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/paperbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13126/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log paperbox.spec 
Log Message:
Initial import (#503847).


--- NEW FILE import.log ---
paperbox-0_4_3-2_fc11:F-10:paperbox-0.4.3-2.fc11.src.rpm:1251480048


--- NEW FILE paperbox.spec ---
Name:           paperbox
Version:        0.4.3
Release:        2%{?dist}
Summary:        A GTK tracker based document browser

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://live.gnome.org/PaperBox
Source0:        http://ftp.gnome.org/pub/GNOME/sources/paperbox/0.4/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibmm24-devel tracker-devel
BuildRequires:  desktop-file-utils goocanvas-devel
BuildRequires:  intltool >= 0.35.0
BuildRequires:  gnome-doc-utils >= 0.3.2
BuildRequires:  gtkmm24-devel >= 2.12.0
BuildRequires:  libglademm24-devel
BuildRequires:  gtkmm-utils-devel dbus-glib-devel
BuildRequires:  boost-devel libgnomeui-devel
Requires:       hicolor-icon-theme



%description
Paperbox is a document browser. It lets you nicely view your ebooks, office
and text documents and organise them by tags. Relying on Tracker, it is able 
to instantly discover all documents on your desktop, and present them in a
convenient way. Tags and other metadata are shared across all Tracker-based
applications.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}
desktop-file-install                                    \
--remove-key Version                                    \
--add-category="Office"                                 \
--remove-category Application                           \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
data/paperbox.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%posttrans
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README NEWS
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}


%changelog
* Mon Aug 25 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.3-2
- Removed add-X-Fedora from desktop install
- Used name macro consistently in files. 
- Cleaned up description

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.3-1
- Added posttrans script
- Removed, remove encoding value from desktop file
- Updated sources to new release (This fixes F11 not compiling problem, will run in mock on F12)
- Tidy licence up to be correct
- Tidy desktop file path up under install
- Added x-fedora category to desktop file


* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-3
- removed add app from desktop file

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-2
- tidy brs 

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-1
- Initial spec file
- Need to add gtkmm-utils-devel to BD after test


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paperbox/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:33:27 -0000	1.1
+++ .cvsignore	28 Aug 2009 17:23:16 -0000	1.2
@@ -0,0 +1 @@
+paperbox-0.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paperbox/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:33:27 -0000	1.1
+++ sources	28 Aug 2009 17:23:16 -0000	1.2
@@ -0,0 +1 @@
+7e0d1f31fdeb6ee339cfcfa765fe9f13  paperbox-0.4.3.tar.bz2



From notting at fedoraproject.org  Fri Aug 28 17:23:46 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 28 Aug 2009 17:23:46 +0000 (UTC)
Subject: rpms/b43-fwcutter/devel
	0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch, NONE,
	1.1 0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch,
	NONE, 1.1 0003-fwcutter-Use-ARRAY_SIZE.patch, NONE,
	1.1 b43-fwcutter.spec, 1.8, 1.9
Message-ID: <20090828172346.C12BF11C0078@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/b43-fwcutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13070

Modified Files:
	b43-fwcutter.spec 
Added Files:
	0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch 
	0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch 
	0003-fwcutter-Use-ARRAY_SIZE.patch 
Log Message:
Add git patches for new firmware.


0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch:
 mklist.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE 0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch ---
>From 4c01539a4e8c9e87ce41789ec1e00ffae2e563aa Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: Thu, 20 Aug 2009 12:30:11 -0500
Subject: [PATCH 1/3] fwcutter: mklist.py - Update to new library and skip some sections

Switch from the deprecated md5 library to hashlib.

Detect the ro section that describes the firmware version,
print the address of the data, and and skip some ro sections
that are not of interest.

Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
---
 fwcutter/mklist.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fwcutter/mklist.py b/fwcutter/mklist.py
index 1bc8351..40e6cb8 100755
--- a/fwcutter/mklist.py
+++ b/fwcutter/mklist.py
@@ -30,7 +30,7 @@
 import sys
 import os
 import re
-import md5
+import hashlib
 
 if len(sys.argv) != 2:
 	print "Usage: %s path/to/wl.o" % sys.argv[0]
@@ -55,7 +55,7 @@ if rodata_fileoffset == None:
 	print "ERROR: Could not find .rodata fileoffset"
 	sys.exit(1)
 
-md5sum = md5.md5(file(fn, "r").read())
+md5sum = hashlib.md5(file(fn, "r").read())
 
 print "static struct extract _%s[] =" % md5sum.hexdigest()
 print "{"
@@ -80,6 +80,14 @@ for sym in syms:
 		size -= 8
 	if "pcm" in name:
 		type = "EXT_PCM"
+	if "bommajor" in name:
+		print "\t/* ucode major version at offset 0x%x */" % pos
+		continue
+	if "bomminor" in name:
+		print "\t/* ucode minor version at offset 0x%x */" % pos
+		continue
+	if "ucode_2w" in name:
+		continue
 	m = ucode_re.match(name)
 	if m:
 		corerev = int(m.group(1))
-- 
1.6.4


0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch:
 fwcutter_list.h |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 2 deletions(-)

--- NEW FILE 0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch ---
>From 1cffac30d8e02a4d216337b8ef4d9fe6dabfb688 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: Thu, 20 Aug 2009 16:51:38 -0500
Subject: [PATCH 2/3] fwcutter: Add two new sources for 478.104 firmware

Add 2 new files with 478.104 firmware, which includes Rev 16.

Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
---
 fwcutter/fwcutter_list.h |  119 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 118 insertions(+), 1 deletions(-)

diff --git a/fwcutter/fwcutter_list.h b/fwcutter/fwcutter_list.h
index c48bc6d..65c8671 100644
--- a/fwcutter/fwcutter_list.h
+++ b/fwcutter/fwcutter_list.h
@@ -238,7 +238,106 @@ static struct extract _2dd738b8feb8b3559fd9d8fbaf3bfffc[] =
 	EXTRACT_LIST_END
 };
 
-/*
+static struct extract _1a258b2d93efa641c32ddf3c3a962028[] =
+{
+	/* { .name = "ucode4", .offset = 0xAFE08, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
+	/* { .name = "pcm4", .offset = 0xE8FE0, .type = EXT_PCM, .length = 0x520 }, */
+	/* { .name = "b0g0initvals4", .offset = 0xA2878, .type = EXT_IV, .length = 0xE80 }, */
+	/* { .name = "a0g0bsinitvals4", .offset = 0xA45C0, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "b0g0bsinitvals4", .offset = 0xA3700, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "a0g0initvals4", .offset = 0xA3738, .type = EXT_IV, .length = 0xE80 }, */
+	{ .name = "ucode5", .offset = 0xB4CAC, .type = EXT_UCODE_2, .length = 0x56F0 },
+	{ .name = "pcm5", .offset = 0xE9504, .type = EXT_PCM, .length = 0x520 },
+	{ .name = "a0g0bsinitvals5", .offset = 0xA6578, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals5", .offset = 0xA5018, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0initvals5", .offset = 0xA5138, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1initvals5", .offset = 0xA5B58, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "b0g0initvals5", .offset = 0xA45F8, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1bsinitvals5", .offset = 0xA6698, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode9", .offset = 0xBA3A0, .type = EXT_UCODE_2, .length = 0x6248 },
+	{ .name = "a0g0bsinitvals9", .offset = 0xA89C0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals9", .offset = 0xA67B8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g1bsinitvals9", .offset = 0xA8AE0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals9", .offset = 0xA72B0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0initvals9", .offset = 0xA73D0, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g1initvals9", .offset = 0xA7EC8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "ucode11", .offset = 0xC05EC, .type = EXT_UCODE_2, .length = 0x8000 },
+	{ .name = "n0initvals11", .offset = 0xA8C00, .type = EXT_IV, .length = 0xBC8 },
+	{ .name = "n0bsinitvals11", .offset = 0xA97D0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0absinitvals11", .offset = 0xA98F0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode13", .offset = 0xC85F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
+	{ .name = "b0g0bsinitvals13", .offset = 0xABA70, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals13", .offset = 0xAAED0, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "a0g1bsinitvals13", .offset = 0xAC730, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g1initvals13", .offset = 0xABB90, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "lp0bsinitvals13", .offset = 0xAADB0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "lp0initvals13", .offset = 0xA9A10, .type = EXT_IV, .length = 0x1398 },
+	{ .name = "ucode14", .offset = 0xD00BC, .type = EXT_UCODE_2, .length = 0x7910 },
+	{ .name = "lp0initvals14", .offset = 0xAC850, .type = EXT_IV, .length = 0xB80 },
+	{ .name = "lp0bsinitvals14", .offset = 0xAD3D8, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode15", .offset = 0xD79D0, .type = EXT_UCODE_3, .length = 0x8768 },
+	{ .name = "lp0initvals15", .offset = 0xAD4F8, .type = EXT_IV, .length = 0xC68 },
+	{ .name = "lp0bsinitvals15", .offset = 0xAE168, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode16", .offset = 0xE013C, .type = EXT_UCODE_3, .length = 0x8EA0 },
+	{ .name = "lp0bsinitvals16", .offset = 0xAFCE8, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0bsinitvals16", .offset = 0xAEF20, .type = EXT_IV, .length = 0x118 },
+	{ .name = "sslpn0initvals16", .offset = 0xAF040, .type = EXT_IV, .length = 0x0 },
+	{ .name = "n0initvals16", .offset = 0xAE288, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "lp0initvals16", .offset = 0xAF050, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
+	EXTRACT_LIST_END
+};
+static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
+{
+	/* ucode major version at offset 0xa8b70 */
+	/* ucode minor version at offset 0xa8b74 */
+	/* { .name = "ucode4", .offset = 0xB6108, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
+	/* { .name = "pcm4", .offset = 0xEF2E0, .type = EXT_PCM, .length = 0x520 }, */
+	/* { .name = "b0g0initvals4", .offset = 0xA8B78, .type = EXT_IV, .length = 0xE80 }, */
+	/* { .name = "a0g0bsinitvals4", .offset = 0xAA8C0, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "b0g0bsinitvals4", .offset = 0xA9A00, .type = EXT_IV, .length = 0x30 }, */
+	/* { .name = "a0g0initvals4", .offset = 0xA9A38, .type = EXT_IV, .length = 0xE80 }, */
+	{ .name = "ucode5", .offset = 0xBAFAC, .type = EXT_UCODE_2, .length = 0x56F0 },
+	{ .name = "pcm5", .offset = 0xEF804, .type = EXT_PCM, .length = 0x520 },
+	{ .name = "b0g0bsinitvals5", .offset = 0xAB318, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0bsinitvals5", .offset = 0xAC878, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals5", .offset = 0xAA8F8, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1initvals5", .offset = 0xABE58, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g0initvals5", .offset = 0xAB438, .type = EXT_IV, .length = 0xA18 },
+	{ .name = "a0g1bsinitvals5", .offset = 0xAC998, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode9", .offset = 0xC06A0, .type = EXT_UCODE_2, .length = 0x6248 },
+	{ .name = "a0g1initvals9", .offset = 0xAE1C8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g0bsinitvals9", .offset = 0xAECC0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals9", .offset = 0xAD5B0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0initvals9", .offset = 0xACAB8, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "a0g1bsinitvals9", .offset = 0xAEDE0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g0initvals9", .offset = 0xAD6D0, .type = EXT_IV, .length = 0xAF0 },
+	{ .name = "ucode11", .offset = 0xC68EC, .type = EXT_UCODE_2, .length = 0x8000 },
+	{ .name = "n0bsinitvals11", .offset = 0xAFAD0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0absinitvals11", .offset = 0xAFBF0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "n0initvals11", .offset = 0xAEF00, .type = EXT_IV, .length = 0xBC8 },
+	{ .name = "ucode13", .offset = 0xCE8F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
+	{ .name = "b0g0initvals13", .offset = 0xB11D0, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "a0g1bsinitvals13", .offset = 0xB2A30, .type = EXT_IV, .length = 0x118 },
+	{ .name = "a0g1initvals13", .offset = 0xB1E90, .type = EXT_IV, .length = 0xB98 },
+	{ .name = "lp0bsinitvals13", .offset = 0xB10B0, .type = EXT_IV, .length = 0x118 },
+	{ .name = "b0g0bsinitvals13", .offset = 0xB1D70, .type = EXT_IV, .length = 0x118 },
+	{ .name = "lp0initvals13", .offset = 0xAFD10, .type = EXT_IV, .length = 0x1398 },
+	{ .name = "ucode14", .offset = 0xD63BC, .type = EXT_UCODE_2, .length = 0x7910 },
+	{ .name = "lp0initvals14", .offset = 0xB2B50, .type = EXT_IV, .length = 0xB80 },
+	{ .name = "lp0bsinitvals14", .offset = 0xB36D8, .type = EXT_IV, .length = 0x118 },
+	{ .name = "ucode15", .offset = 0xDDCD0, .type = EXT_UCODE_3, .length = 0x8768 },
+	{ .name = "lp0bsinitvals15", .offset = 0xB4468, .type = EXT_IV, .length = 0x118 },
+	{ .name = "lp0initvals15", .offset = 0xB37F8, .type = EXT_IV, .length = 0xC68 },
+	{ .name = "ucode16", .offset = 0xE643C, .type = EXT_UCODE_3, .length = 0x8EA0 },
+	{ .name = "n0bsinitvals16", .offset = 0xB5220, .type = EXT_IV, .length = 0x118 },
+	{ .name = "sslpn0initvals16", .offset = 0xB5340, .type = EXT_IV, .length = 0x0 },
+	{ .name = "n0initvals16", .offset = 0xB4588, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "lp0initvals16", .offset = 0xB5350, .type = EXT_IV, .length = 0xC90 },
+	{ .name = "sslpn0bsinitvals16", .offset = 0xB5348, .type = EXT_IV, .length = 0x0 },
+	{ .name = "lp0bsinitvals16", .offset = 0xB5FE8, .type = EXT_IV, .length = 0x118 },
+	EXTRACT_LIST_END
+};/*
  * Links change, so let's not put them into the README.
  * I still put them here so we know where the file was obtained.
  */
@@ -299,6 +398,24 @@ static const struct file files[] =
 		.flags		= FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED,
 		.extract	= _2dd738b8feb8b3559fd9d8fbaf3bfffc,
 	},
+	{
+		/* ftp://downloads.netgear.com/files/GPL/WNDR3300-V1.0.29_gpl_src.zip */
+		.name		= "wl_apsta.o",
+		.id		= "FW15",
+		.ucode_version	= "478.104",
+		.md5		= "1a258b2d93efa641c32ddf3c3a962028",
+		.flags		= FW_FLAG_LE | FW_FLAG_V4,
+		.extract	= _1a258b2d93efa641c32ddf3c3a962028,
+	},
+	{
+		/* http://downloads.openwrt.org/sources/broadcom-wl-4.178.10.4.tar.bz2 */
+		.name		= "wl_apsta.o",
+		.id		= "FW15",
+		.ucode_version	= "478.104",
+		.md5		= "bb8537e3204a1ea5903fe3e66b5e2763",
+		.flags		= FW_FLAG_LE | FW_FLAG_V4,
+		.extract	= _bb8537e3204a1ea5903fe3e66b5e2763,
+	},
 };
 
 #define FILES (sizeof(files) / sizeof(files[0]))
-- 
1.6.4


0003-fwcutter-Use-ARRAY_SIZE.patch:
 fwcutter.c      |    6 +++---
 fwcutter.h      |    3 +++
 fwcutter_list.h |    9 ++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

--- NEW FILE 0003-fwcutter-Use-ARRAY_SIZE.patch ---
>From 37164fe78406e201302ec8bd975698bec48183b9 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb at bu3sch.de>
Date: Fri, 21 Aug 2009 15:59:08 +0200
Subject: [PATCH 3/3] fwcutter: Use ARRAY_SIZE

Signed-off-by: Michael Buesch <mb at bu3sch.de>
---
 fwcutter/fwcutter.c      |    6 +++---
 fwcutter/fwcutter.h      |    3 +++
 fwcutter/fwcutter_list.h |    8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c
index 5d5aa80..0d82806 100644
--- a/fwcutter/fwcutter.c
+++ b/fwcutter/fwcutter.c
@@ -462,10 +462,10 @@ static void print_supported_files(void)
 	       "<ID>\t"
 	       "<MD5 checksum>\n\n");
 	/* print for legacy driver first */
-	for (i = 0; i < FILES; i++)
+	for (i = 0; i < ARRAY_SIZE(files); i++)
 		if (file_ok(&files[i]) && !(files[i].flags & FW_FLAG_V4))
 			print_file(&files[i]);
-	for (i = 0; i < FILES; i++)
+	for (i = 0; i < ARRAY_SIZE(files); i++)
 		if (file_ok(&files[i]) && files[i].flags & FW_FLAG_V4)
 			print_file(&files[i]);
 	printf("\n");
@@ -491,7 +491,7 @@ static const struct file *find_file(FILE *fd)
 		 signature[8], signature[9], signature[10], signature[11],
 		 signature[12], signature[13], signature[14], signature[15]);
 
-	for (i = 0; i < FILES; ++i) {
+	for (i = 0; i < ARRAY_SIZE(files); i++) {
 		if (file_ok(&files[i]) &&
 		    strcasecmp(md5sig, files[i].md5) == 0) {
 			printf("This file is recognised as:\n");
diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
index ac2df63..4a887b6 100644
--- a/fwcutter/fwcutter.h
+++ b/fwcutter/fwcutter.h
@@ -9,6 +9,9 @@
 #define fwcutter_stringify(x)	fwcutter_stringify_1(x)
 #define FWCUTTER_VERSION	fwcutter_stringify(FWCUTTER_VERSION_)
 
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(array)	(sizeof(array) / sizeof((array)[0]))
+
 typedef uint16_t be16_t; /* Big-endian 16bit */
 typedef uint32_t be32_t; /* Big-endian 32bit */
 
diff --git a/fwcutter/fwcutter_list.h b/fwcutter/fwcutter_list.h
index 65c8671..5175bbd 100644
--- a/fwcutter/fwcutter_list.h
+++ b/fwcutter/fwcutter_list.h
@@ -287,6 +287,7 @@ static struct extract _1a258b2d93efa641c32ddf3c3a962028[] =
 	{ .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
 	EXTRACT_LIST_END
 };
+
 static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
 {
 	/* ucode major version at offset 0xa8b70 */
@@ -337,7 +338,9 @@ static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
 	{ .name = "sslpn0bsinitvals16", .offset = 0xB5348, .type = EXT_IV, .length = 0x0 },
 	{ .name = "lp0bsinitvals16", .offset = 0xB5FE8, .type = EXT_IV, .length = 0x118 },
 	EXTRACT_LIST_END
-};/*
+};
+
+/*
  * Links change, so let's not put them into the README.
  * I still put them here so we know where the file was obtained.
  */
@@ -417,6 +420,3 @@ static const struct file files[] =
 		.extract	= _bb8537e3204a1ea5903fe3e66b5e2763,
 	},
 };
-
-#define FILES (sizeof(files) / sizeof(files[0]))
-
-- 
1.6.4



Index: b43-fwcutter.spec
===================================================================
RCS file: /cvs/extras/rpms/b43-fwcutter/devel/b43-fwcutter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- b43-fwcutter.spec	24 Aug 2009 18:24:41 -0000	1.8
+++ b43-fwcutter.spec	28 Aug 2009 17:23:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           b43-fwcutter
 Version:        012
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Firmware extraction tool for Broadcom wireless driver
 
 Group:          System Environment/Base
@@ -9,6 +9,9 @@ URL:            http://bu3sch.de/b43/fwc
 Source0:        http://bu3sch.de/b43/fwcutter/%{name}-%{version}.tar.bz2
 Source1:        README.Fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:		0001-fwcutter-mklist.py-Update-to-new-library-and-skip-so.patch
+Patch2:		0002-fwcutter-Add-two-new-sources-for-478.104-firmware.patch
+Patch3:		0003-fwcutter-Use-ARRAY_SIZE.patch
 
 %description
 This package contains the 'b43-fwcutter' tool which is used to
@@ -19,6 +22,10 @@ instructions on using this tool.
 
 %prep
 %setup -q
+%patch1 -p2
+%patch2 -p2
+%patch3 -p2
+
 cp %{SOURCE1} .
 
 %build
@@ -41,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README README.Fedora
 
 %changelog
+* Fri Aug 28 2009 Bill Nottingham <notting at redhat.com> 012-2
+- Update with some patches from git
+
 * Mon Aug 24 2009 John W. Linville <linville at redhat.com> 012-1
 - Update for b43-fwcutter-012
 



From matt at fedoraproject.org  Fri Aug 28 17:23:52 2009
From: matt at fedoraproject.org (matt)
Date: Fri, 28 Aug 2009 17:23:52 +0000 (UTC)
Subject: rpms/condor/devel .cvsignore, 1.6, 1.7 condor.spec, 1.21,
	1.22 sources, 1.6, 1.7
Message-ID: <20090828172352.2DDC011C0078@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13310

Modified Files:
	.cvsignore condor.spec sources 
Log Message:
7.2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Feb 2009 14:52:24 -0000	1.6
+++ .cvsignore	28 Aug 2009 17:23:52 -0000	1.7
@@ -1 +1 @@
-condor-7.2.1-133382-RH.tar.gz
+condor-7.2.4-159529-RH.tar.gz


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- condor.spec	21 Aug 2009 12:50:23 -0000	1.21
+++ condor.spec	28 Aug 2009 17:23:52 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.2.1
-Release: 3%{?dist}
+Version: 7.2.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -19,8 +19,9 @@ URL: http://www.cs.wisc.edu/condor/
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
 #   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 #   edbac8267130ac0a0e016d0f113b4616  condor_src-7.2.1-all-all.tar.gz
+#   6d9b0ef74d575623af11e396fa274174  condor_src-7.2.4-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.1-133382-RH.tar.gz
+Source0: condor-7.2.4-159529-RH.tar.gz
 Source1: generate-tarball.sh
 Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
@@ -571,6 +572,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
+- Upgrade to 7.2.4 release
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.1-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Feb 2009 14:52:24 -0000	1.6
+++ sources	28 Aug 2009 17:23:52 -0000	1.7
@@ -1 +1 @@
-f7d83158bcee6a44fd4dbd9e9d8cb751  condor-7.2.1-133382-RH.tar.gz
+08d488cb94a8c111e968b609702a5ab3  condor-7.2.4-159529-RH.tar.gz



From gljohn at fedoraproject.org  Fri Aug 28 17:24:32 2009
From: gljohn at fedoraproject.org (Gareth John)
Date: Fri, 28 Aug 2009 17:24:32 +0000 (UTC)
Subject: rpms/paperbox/F-11 import.log, NONE, 1.1 paperbox.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828172432.20B1611C0078@cvs1.fedora.phx.redhat.com>

Author: gljohn

Update of /cvs/pkgs/rpms/paperbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13736/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log paperbox.spec 
Log Message:
Initial import (#503847).


--- NEW FILE import.log ---
paperbox-0_4_3-2_fc11:F-11:paperbox-0.4.3-2.fc11.src.rpm:1251480127


--- NEW FILE paperbox.spec ---
Name:           paperbox
Version:        0.4.3
Release:        2%{?dist}
Summary:        A GTK tracker based document browser

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://live.gnome.org/PaperBox
Source0:        http://ftp.gnome.org/pub/GNOME/sources/paperbox/0.4/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibmm24-devel tracker-devel
BuildRequires:  desktop-file-utils goocanvas-devel
BuildRequires:  intltool >= 0.35.0
BuildRequires:  gnome-doc-utils >= 0.3.2
BuildRequires:  gtkmm24-devel >= 2.12.0
BuildRequires:  libglademm24-devel
BuildRequires:  gtkmm-utils-devel dbus-glib-devel
BuildRequires:  boost-devel libgnomeui-devel
Requires:       hicolor-icon-theme



%description
Paperbox is a document browser. It lets you nicely view your ebooks, office
and text documents and organise them by tags. Relying on Tracker, it is able 
to instantly discover all documents on your desktop, and present them in a
convenient way. Tags and other metadata are shared across all Tracker-based
applications.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}
desktop-file-install                                    \
--remove-key Version                                    \
--add-category="Office"                                 \
--remove-category Application                           \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
data/paperbox.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%posttrans
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README NEWS
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}


%changelog
* Mon Aug 25 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.3-2
- Removed add-X-Fedora from desktop install
- Used name macro consistently in files. 
- Cleaned up description

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.3-1
- Added posttrans script
- Removed, remove encoding value from desktop file
- Updated sources to new release (This fixes F11 not compiling problem, will run in mock on F12)
- Tidy licence up to be correct
- Tidy desktop file path up under install
- Added x-fedora category to desktop file


* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-3
- removed add app from desktop file

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-2
- tidy brs 

* Mon Jun 01 2009 Gareth John <gareth.l.john at googlemail.com> 0.4.2-1
- Initial spec file
- Need to add gtkmm-utils-devel to BD after test


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paperbox/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:33:27 -0000	1.1
+++ .cvsignore	28 Aug 2009 17:24:31 -0000	1.2
@@ -0,0 +1 @@
+paperbox-0.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paperbox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:33:27 -0000	1.1
+++ sources	28 Aug 2009 17:24:32 -0000	1.2
@@ -0,0 +1 @@
+7e0d1f31fdeb6ee339cfcfa765fe9f13  paperbox-0.4.3.tar.bz2



From eparis at fedoraproject.org  Fri Aug 28 17:26:08 2009
From: eparis at fedoraproject.org (Eric Paris)
Date: Fri, 28 Aug 2009 17:26:08 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-inotify-accounting.patch, NONE,
	1.1 kernel.spec, 1.1751, 1.1752
Message-ID: <20090828172608.F306311C0078@cvs1.fedora.phx.redhat.com>

Author: eparis

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14303

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-inotify-accounting.patch 
Log Message:
* Fri Aug 28 2009 Eric Paris <eparis at redhat.com>
- fix inotify length accounting and send inotify events


linux-2.6-inotify-accounting.patch:
 inotify_user.c |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-inotify-accounting.patch ---
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 0e781bc..dcd2040 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -154,7 +154,8 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
 
 	event = fsnotify_peek_notify_event(group);
 
-	event_size += roundup(event->name_len, event_size);
+	if (event->name_len)
+		event_size += roundup(event->name_len + 1, event_size);
 
 	if (event_size > count)
 		return ERR_PTR(-EINVAL);
@@ -180,7 +181,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
 	struct fsnotify_event_private_data *fsn_priv;
 	struct inotify_event_private_data *priv;
 	size_t event_size = sizeof(struct inotify_event);
-	size_t name_len;
+	size_t name_len = 0;
 
 	/* we get the inotify watch descriptor from the event private data */
 	spin_lock(&event->lock);
@@ -196,10 +197,12 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
 		inotify_free_event_priv(fsn_priv);
 	}
 
-	/* round up event->name_len so it is a multiple of event_size
+	/*
+	 * round up event->name_len so it is a multiple of event_size
 	 * plus an extra byte for the terminating '\0'.
 	 */
-	name_len = roundup(event->name_len + 1, event_size);
+	if (event->name_len)
+		name_len = roundup(event->name_len + 1, event_size);
 	inotify_event.len = name_len;
 
 	inotify_event.mask = inotify_mask_to_arg(event->mask);
@@ -325,8 +328,9 @@ static long inotify_ioctl(struct file *file, unsigned int cmd,
 		list_for_each_entry(holder, &group->notification_list, event_list) {
 			event = holder->event;
 			send_len += sizeof(struct inotify_event);
-			send_len += roundup(event->name_len,
-					     sizeof(struct inotify_event));
+			if (event->name_len)
+				send_len += roundup(event->name_len + 1,
+						sizeof(struct inotify_event));
 		}
 		mutex_unlock(&group->notification_mutex);
 		ret = put_user(send_len, (int __user *) p);
@@ -587,6 +591,10 @@ retry:
 	/* match the ref from fsnotify_init_markentry() */
 	fsnotify_put_mark(&tmp_ientry->fsn_entry);
 
+	/* if this mark added a new event update the group mask */
+	if (mask & ~group->mask)
+		fsnotify_recalc_group_mask(group);
+
 out_err:
 	if (ret < 0)
 		kmem_cache_free(inotify_inode_mark_cachep, tmp_ientry);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1751
retrieving revision 1.1752
diff -u -p -r1.1751 -r1.1752
--- kernel.spec	28 Aug 2009 16:46:16 -0000	1.1751
+++ kernel.spec	28 Aug 2009 17:26:08 -0000	1.1752
@@ -724,6 +724,7 @@ Patch11010: via-hwmon-temp-sensor.patch
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
+Patch12012: linux-2.6-inotify-accounting.patch
 
 %endif
 
@@ -1338,6 +1339,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
 # Patches headed upstream
+ApplyPatch linux-2.6-inotify-accounting.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2005,6 +2007,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 28 2009 Eric Paris <eparis at redhat.com>
+- fix inotify length accounting and send inotify events
+
 * Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Enable Solos DSL driver
 



From matt at fedoraproject.org  Fri Aug 28 17:38:50 2009
From: matt at fedoraproject.org (matt)
Date: Fri, 28 Aug 2009 17:38:50 +0000 (UTC)
Subject: rpms/condor/devel condor.spec,1.22,1.23
Message-ID: <20090828173850.3941711C0078@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17462

Modified Files:
	condor.spec 
Log Message:
7.2.4-1, without gcc44 patch


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- condor.spec	28 Aug 2009 17:23:52 -0000	1.22
+++ condor.spec	28 Aug 2009 17:38:49 -0000	1.23
@@ -29,7 +29,6 @@ Patch1: stdsoap2.h.patch.patch
 Patch3: chkconfig_off.patch
 Patch4: no_rpmdb_query.patch
 Patch5: no_basename.patch
-Patch6: gcc44_const.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -115,7 +114,6 @@ cp %{SOURCE2} .
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -574,6 +572,7 @@ fi
 %changelog
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release
+- Removed gcc44_const.patch, accepted upstream
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.1-3
 - rebuilt with new openssl



From orion at fedoraproject.org  Fri Aug 28 18:00:09 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 28 Aug 2009 18:00:09 +0000 (UTC)
Subject: rpms/paraview/F-11 paraview.spec,1.34,1.35
Message-ID: <20090828180009.8509C11C0496@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22035

Modified Files:
	paraview.spec 
Log Message:
Can't use openmpi pkgconfig yet in F-11



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/paraview.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- paraview.spec	28 Aug 2009 15:01:52 -0000	1.34
+++ paraview.spec	28 Aug 2009 18:00:09 -0000	1.35
@@ -219,7 +219,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview-mpi \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
-	-DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/$(pkg-config --modversion openmpi)/bin/mpicxx \
 	%{paraview_cmake_options}
 #Need to run cmake twice to get MPI headers into VTK/Parallel build config
 cmake ..



From matt at fedoraproject.org  Fri Aug 28 18:02:12 2009
From: matt at fedoraproject.org (matt)
Date: Fri, 28 Aug 2009 18:02:12 +0000 (UTC)
Subject: rpms/condor/devel log_lock_run.patch, NONE, 1.1 condor.spec, 1.23,
	1.24
Message-ID: <20090828180212.AF7DF11C0078@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22530

Modified Files:
	condor.spec 
Added Files:
	log_lock_run.patch 
Log Message:
7.2.4-1, updated to be like f10 and f11

log_lock_run.patch:
 condor_config.generic |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE log_lock_run.patch ---
diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/con
index 352f685..3f80b62 100644
--- a/src/condor_examples/condor_config.generic
+++ b/src/condor_examples/condor_config.generic
@@ -378,7 +378,7 @@
 ##  condor account, it's probably condor.  Otherwise, it's whatever
 ##  you've set in the CONDOR_IDS environment variable.  See the Admin
 ##  manual for details on this.
-LOCK		= $(LOG)
+LOCK		= /var/lock/condor
 
 ##  If you don't use a fully qualified name in your /etc/hosts file
 ##  (or NIS, etc.) for either your official hostname or as an alias,
@@ -878,15 +878,16 @@
 ######################################################################
 
 ##  Pathnames
-LOG		= $(LOCAL_DIR)/log
+LOG		= /var/log/condor
 SPOOL		= $(LOCAL_DIR)/spool
 EXECUTE		= $(LOCAL_DIR)/execute
 BIN		= $(RELEASE_DIR)/bin
 LIB		= $(RELEASE_DIR)/lib
 INCLUDE		= $(RELEASE_DIR)/include/condor
 SBIN		= $(RELEASE_DIR)/sbin
 LIBEXEC		= $(RELEASE_DIR)/libexec/condor
 SHARE		= $(RELEASE_DIR)/share/condor
+RUN		= /var/run/condor
 
 ## If you leave HISTORY undefined (comment it out), no history file
 ## will be created. 
@@ -1559,7 +1560,7 @@
 #     UNIX); the name will be something like:
 #         \\.\pipe\condor_procd
 #
-PROCD_ADDRESS = $(LOCK)/procd_pipe
+PROCD_ADDRESS = $(RUN)/procd_pipe
 
 # The procd currently uses a very simplistic logging system. Since this
 # log will not be rotated like other Condor logs, it is only recommended


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- condor.spec	28 Aug 2009 17:38:49 -0000	1.23
+++ condor.spec	28 Aug 2009 18:02:12 -0000	1.24
@@ -29,6 +29,7 @@ Patch1: stdsoap2.h.patch.patch
 Patch3: chkconfig_off.patch
 Patch4: no_rpmdb_query.patch
 Patch5: no_basename.patch
+Patch6: log_lock_run.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -114,6 +115,7 @@ cp %{SOURCE2} .
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -360,7 +362,9 @@ populate %_datadir/condor $PREFIX/lib/*
 populate %_datadir/condor/sql $PREFIX/sql/*
 populate %_libexecdir/condor $PREFIX/libexec/*
 populate %_var/lib/condor $PREFIX/local_dir/*
-
+mkdir -p -m0755 "%{buildroot}"/%_var/run/condor
+mkdir -p -m0755 "%{buildroot}"/%_var/log/condor
+mkdir -p -m0755 "%{buildroot}"/%_var/lock/condor
 
 # install the lsb init script
 install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor
@@ -455,7 +459,7 @@ rm -rf %{buildroot}
 %_bindir/condor_transfer_data
 %_bindir/condor_check_userlogs
 %_bindir/condor_q
-%_bindir/condor_transferer
+%_sbindir/condor_transferer
 %_bindir/condor_cod
 %_bindir/condor_qedit
 %_bindir/condor_userlog
@@ -518,8 +522,10 @@ rm -rf %{buildroot}
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
 %dir %_var/lib/condor/execute/
-%dir %_var/lib/condor/log/
+%dir %_var/log/condor/
 %dir %_var/lib/condor/spool/
+%dir %_var/lock/condor/
+%dir %_var/run/condor/
 
 
 #%files static
@@ -550,7 +556,7 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
 if [ $? = 0 ]; then
-   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 
+   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 2>&1| grep -v "already defined"
    restorecon  %_sbindir/condor_startd
 fi
 
@@ -573,6 +579,8 @@ fi
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release
 - Removed gcc44_const.patch, accepted upstream
+- New log, lock, run locations (BZ502175)
+- Filtered innocuous semanage message
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.1-3
 - rebuilt with new openssl



From dwalsh at fedoraproject.org  Fri Aug 28 18:03:05 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 28 Aug 2009 18:03:05 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.102,
	1.103 libsemanage-rhat.patch, 
	1.54, 1.55 libsemanage.spec, 1.182, 1.183 sources, 1.105, 1.106
Message-ID: <20090828180305.DA7A111C0078@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22725

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.36-2
- Add enable/disable modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	5 Aug 2009 19:21:57 -0000	1.102
+++ .cvsignore	28 Aug 2009 18:03:05 -0000	1.103
@@ -108,3 +108,4 @@ libsemanage-2.0.31.tgz
 libsemanage-2.0.32.tgz
 libsemanage-2.0.33.tgz
 libsemanage-2.0.35.tgz
+libsemanage-2.0.36.tgz

libsemanage-rhat.patch:
 include/semanage/modules.h |    5 +
 src/direct_api.c           |  119 +++++++++++++++++++++++++++++++++++++++++++--
 src/genhomedircon.c        |   15 +++++
 src/libsemanage.map        |    3 +
 src/module_internal.h      |    1 
 src/modules.c              |   41 +++++++++++++++
 src/modules.h              |    1 
 src/policy.h               |    6 ++
 src/semanage.conf          |    2 
 src/semanage_store.c       |   60 ++++++++++++++++++----
 src/semanage_store.h       |    2 
 11 files changed, 239 insertions(+), 16 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libsemanage-rhat.patch	26 Aug 2009 19:06:22 -0000	1.54
+++ libsemanage-rhat.patch	28 Aug 2009 18:03:05 -0000	1.55
@@ -1,6 +1,204 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.35/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.36/include/semanage/modules.h
+--- nsalibsemanage/include/semanage/modules.h	2009-01-13 08:45:35.000000000 -0500
++++ libsemanage-2.0.36/include/semanage/modules.h	2009-08-28 14:00:55.000000000 -0400
+@@ -40,10 +40,12 @@
+ 				 char *module_data, size_t data_len);
+ int semanage_module_install_base_file(semanage_handle_t *,
+ 				      const char *module_name);
++int semanage_module_enable(semanage_handle_t *, char *module_name);
++int semanage_module_disable(semanage_handle_t *, char *module_name);
+ int semanage_module_remove(semanage_handle_t *, char *module_name);
+ 
+ /* semanage_module_info is for getting information on installed
+-   modules, only name and version at this time */
++   modules, only name and version, and enabled/disabled flag at this time */
+ typedef struct semanage_module_info semanage_module_info_t;
+ 
+ int semanage_module_list(semanage_handle_t *,
+@@ -53,5 +55,6 @@
+ 						 int n);
+ const char *semanage_module_get_name(semanage_module_info_t *);
+ const char *semanage_module_get_version(semanage_module_info_t *);
++int semanage_module_get_enabled(semanage_module_info_t *);
+ 
+ #endif
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.36/src/direct_api.c
+--- nsalibsemanage/src/direct_api.c	2009-08-26 15:06:22.000000000 -0400
++++ libsemanage-2.0.36/src/direct_api.c	2009-08-28 14:00:55.000000000 -0400
+@@ -66,6 +66,8 @@
+ static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
+ 					size_t data_len);
+ static int semanage_direct_install_base_file(semanage_handle_t * sh, const char *module_name);
++static int semanage_direct_enable(semanage_handle_t * sh, char *module_name);
++static int semanage_direct_disable(semanage_handle_t * sh, char *module_name);
+ static int semanage_direct_remove(semanage_handle_t * sh, char *module_name);
+ static int semanage_direct_list(semanage_handle_t * sh,
+ 				semanage_module_info_t ** modinfo,
+@@ -83,6 +85,8 @@
+ 	.upgrade_file = semanage_direct_upgrade_file,
+ 	.install_base = semanage_direct_install_base,
+ 	.install_base_file = semanage_direct_install_base_file,
++	.enable = semanage_direct_enable,
++	.disable = semanage_direct_disable,
+ 	.remove = semanage_direct_remove,
+ 	.list = semanage_direct_list
+ };
+@@ -348,10 +352,17 @@
+ 	     semanage_path(SEMANAGE_TMP, SEMANAGE_MODULES)) == NULL) {
+ 		return -1;
+ 	}
+-	if (asprintf(filename, "%s/%s.pp", module_path, *module_name) == -1) {
++	if (asprintf(filename, "%s/%s.pp%s", module_path, *module_name, DISABLESTR) == -1) {
+ 		ERR(sh, "Out of memory!");
+ 		return -1;
+ 	}
++
++	if (access(*filename, F_OK) == -1) {
++		char *ptr = *filename;
++		int len = strlen(ptr) - strlen(DISABLESTR);
++		if (len > 0) ptr[len]='\0';
++	}
++
+ 	return 0;
+ }
+ 
+@@ -1272,6 +1283,107 @@
+ 	return retval;
+ }
+ 
++/* Enables a module from the sandbox.  Returns 0 on success, -1 if out
++ * of memory, -2 if module not found or could not be enabled. */
++static int semanage_direct_enable(semanage_handle_t * sh, char *module_name)
++{
++	int i, retval = -1;
++	char **module_filenames = NULL;
++	int num_mod_files;
++	size_t name_len = strlen(module_name);
++	if (semanage_get_modules_names(sh, &module_filenames, &num_mod_files) ==
++	    -1) {
++		return -1;
++	}
++	for (i = 0; i < num_mod_files; i++) {
++		char *base = strrchr(module_filenames[i], '/');
++		if (base == NULL) {
++			ERR(sh, "Could not read module names.");
++			retval = -2;
++			goto cleanup;
++		}
++		base++;
++		if (memcmp(module_name, base, name_len) == 0 &&
++		    strcmp(base + name_len + 3, DISABLESTR) == 0) {
++			int len = strlen(module_filenames[i]) - strlen(DISABLESTR);
++			char *enabled_name = calloc(1, len+1);
++			if (!enabled_name) {
++				ERR(sh, "Could not allocate memory");
++				retval = -1;
++				goto cleanup;
++			}
++
++			strncpy(enabled_name, module_filenames[i],len);
++
++			if (rename(module_filenames[i], enabled_name) == -1) {
++				ERR(sh, "Could not enable module file %s.",
++				    enabled_name);
++				retval = -2;
++			}
++			retval = 0;
++			free(enabled_name);
++			goto cleanup;
++		}
++	}
++	ERR(sh, "Module %s was not found.", module_name);
++	retval = -2;		/* module not found */
++      cleanup:
++	for (i = 0; module_filenames != NULL && i < num_mod_files; i++) {
++		free(module_filenames[i]);
++	}
++	free(module_filenames);
++	return retval;
++}
++
++/* Enables a module from the sandbox.  Returns 0 on success, -1 if out
++ * of memory, -2 if module not found or could not be enabled. */
++static int semanage_direct_disable(semanage_handle_t * sh, char *module_name)
++{
++	int i, retval = -1;
++	char **module_filenames = NULL;
++	int num_mod_files;
++	size_t name_len = strlen(module_name);
++	if (semanage_get_modules_names(sh, &module_filenames, &num_mod_files) ==
++	    -1) {
++		return -1;
++	}
++	for (i = 0; i < num_mod_files; i++) {
++		char *base = strrchr(module_filenames[i], '/');
++		if (base == NULL) {
++			ERR(sh, "Could not read module names.");
++			retval = -2;
++			goto cleanup;
++		}
++		base++;
++		if (memcmp(module_name, base, name_len) == 0 &&
++		    strcmp(base + name_len, ".pp") == 0) {
++			char disabled_name[PATH_MAX];
++			if (snprintf(disabled_name, PATH_MAX, "%s%s", 
++				     module_filenames[i], DISABLESTR) == PATH_MAX) {
++				ERR(sh, "Could not disable module file %s.",
++				    module_filenames[i]);
++				retval = -2;
++				goto cleanup;
++			}
++			if (rename(module_filenames[i], disabled_name) == -1) {
++				ERR(sh, "Could not disable module file %s.",
++				    module_filenames[i]);
++				retval = -2;
++			}
++			retval = 0;
++			goto cleanup;
++		}
++	}
++	ERR(sh, "Module %s was not found.", module_name);
++	retval = -2;		/* module not found */
++      cleanup:
++	for (i = 0; module_filenames != NULL && i < num_mod_files; i++) {
++		free(module_filenames[i]);
++	}
++	free(module_filenames);
++	return retval;
++}
++
+ /* Removes a module from the sandbox.  Returns 0 on success, -1 if out
+  * of memory, -2 if module not found or could not be removed. */
+ static int semanage_direct_remove(semanage_handle_t * sh, char *module_name)
+@@ -1292,8 +1404,7 @@
+ 			goto cleanup;
+ 		}
+ 		base++;
+-		if (memcmp(module_name, base, name_len) == 0 &&
+-		    strcmp(base + name_len, ".pp") == 0) {
++		if (memcmp(module_name, base, name_len) == 0) {
+ 			if (unlink(module_filenames[i]) == -1) {
+ 				ERR(sh, "Could not remove module file %s.",
+ 				    module_filenames[i]);
+@@ -1368,6 +1479,7 @@
+ 		}
+ 		ssize_t size;
+ 		char *data = NULL;
++		int enabled = semanage_module_enabled(module_filenames[i]);
+ 
+ 		if ((size = bunzip(sh, fp, &data)) > 0) {
+ 			fclose(fp);
+@@ -1392,6 +1504,7 @@
+ 		if (type == SEPOL_POLICY_MOD) {
+ 			(*modinfo)[*num_modules].name = name;
+ 			(*modinfo)[*num_modules].version = version;
++			(*modinfo)[*num_modules].enabled = enabled;
+ 			(*num_modules)++;
+ 		} else {
+ 			/* file was not a module, so don't report it */
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.36/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.35/src/genhomedircon.c	2009-08-26 15:05:01.000000000 -0400
++++ libsemanage-2.0.36/src/genhomedircon.c	2009-08-26 15:07:35.000000000 -0400
 @@ -304,10 +304,20 @@
  			continue;
  		if (!semanage_list_find(shells, pwbuf->pw_shell))
@@ -34,12 +232,240 @@ diff --exclude-from=exclude -N -u -r nsa
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.35/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.36/src/libsemanage.map
+--- nsalibsemanage/src/libsemanage.map	2009-07-07 15:32:32.000000000 -0400
++++ libsemanage-2.0.36/src/libsemanage.map	2009-08-28 14:00:55.000000000 -0400
+@@ -6,10 +6,13 @@
+ 	  semanage_module_install; semanage_module_install_file;
+ 	  semanage_module_upgrade; semanage_module_upgrade_file;
+ 	  semanage_module_install_base; semanage_module_install_base_file;
++	  semanage_module_enable;
++	  semanage_module_disable;
+ 	  semanage_module_remove;
+ 	  semanage_module_list; semanage_module_info_datum_destroy;
+ 	  semanage_module_list_nth; semanage_module_get_name;
+ 	  semanage_module_get_version; semanage_select_store;
++	  semanage_module_get_enabled;
+ 	  semanage_reload_policy; semanage_set_reload; semanage_set_rebuild;
+ 	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
+ 	  semanage_iface_*; semanage_port_*; semanage_context_*;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.36/src/module_internal.h
+--- nsalibsemanage/src/module_internal.h	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.36/src/module_internal.h	2009-08-28 14:00:55.000000000 -0400
+@@ -6,6 +6,7 @@
+ 
+ hidden_proto(semanage_module_get_name)
+     hidden_proto(semanage_module_get_version)
++    hidden_proto(semanage_module_get_enabled)
+     hidden_proto(semanage_module_info_datum_destroy)
+     hidden_proto(semanage_module_list_nth)
+ #endif
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.36/src/modules.c
+--- nsalibsemanage/src/modules.c	2009-01-13 08:45:35.000000000 -0500
++++ libsemanage-2.0.36/src/modules.c	2009-08-28 14:00:55.000000000 -0400
+@@ -147,6 +147,40 @@
+ 	return sh->funcs->install_base_file(sh, module_name);
+ }
+ 
++int semanage_module_enable(semanage_handle_t * sh, char *module_name)
++{
++	if (sh->funcs->enable == NULL) {
++		ERR(sh, "No enable function defined for this connection type.");
++		return -1;
++	} else if (!sh->is_connected) {
++		ERR(sh, "Not connected.");
++		return -1;
++	} else if (!sh->is_in_transaction) {
++		if (semanage_begin_transaction(sh) < 0) {
++			return -1;
++		}
++	}
++	sh->modules_modified = 1;
++	return sh->funcs->enable(sh, module_name);
++}
++
++int semanage_module_disable(semanage_handle_t * sh, char *module_name)
++{
++	if (sh->funcs->disable == NULL) {
++		ERR(sh, "No disable function defined for this connection type.");
++		return -1;
++	} else if (!sh->is_connected) {
++		ERR(sh, "Not connected.");
++		return -1;
++	} else if (!sh->is_in_transaction) {
++		if (semanage_begin_transaction(sh) < 0) {
++			return -1;
++		}
++	}
++	sh->modules_modified = 1;
++	return sh->funcs->disable(sh, module_name);
++}
++
+ int semanage_module_remove(semanage_handle_t * sh, char *module_name)
+ {
+ 	if (sh->funcs->remove == NULL) {
+@@ -202,6 +236,13 @@
+ 
+ hidden_def(semanage_module_get_name)
+ 
++int semanage_module_get_enabled(semanage_module_info_t * modinfo)
++{
++	return modinfo->enabled;
++}
++
++hidden_def(semanage_module_get_enabled)
++
+ const char *semanage_module_get_version(semanage_module_info_t * modinfo)
+ {
+ 	return modinfo->version;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.36/src/modules.h
+--- nsalibsemanage/src/modules.h	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.36/src/modules.h	2009-08-28 14:00:55.000000000 -0400
+@@ -26,6 +26,7 @@
+ struct semanage_module_info {
+ 	char *name;		/* Key */
+ 	char *version;
++	int enabled;
+ };
+ 
+ #endif
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.36/src/policy.h
+--- nsalibsemanage/src/policy.h	2009-01-13 08:45:35.000000000 -0500
++++ libsemanage-2.0.36/src/policy.h	2009-08-28 14:00:55.000000000 -0400
+@@ -58,6 +58,12 @@
+ 	/* Upgrade a policy module */
+ 	int (*upgrade_file) (struct semanage_handle *, const char *);
+ 
++	/* Enable a policy module */
++	int (*enable) (struct semanage_handle *, char *);
++
++	/* Disable a policy module */
++	int (*disable) (struct semanage_handle *, char *);
++
+ 	/* Remove a policy module */
+ 	int (*remove) (struct semanage_handle *, char *);
+ 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.36/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.35/src/semanage.conf	2009-08-05 15:21:56.000000000 -0400
++++ libsemanage-2.0.36/src/semanage.conf	2009-08-26 15:07:35.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.36/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2009-08-05 15:10:56.000000000 -0400
++++ libsemanage-2.0.36/src/semanage_store.c	2009-08-28 14:00:55.000000000 -0400
+@@ -57,6 +57,8 @@
+ 
+ #include "debug.h"
+ 
++const char *DISABLESTR=".disabled";
++
+ #define SEMANAGE_CONF_FILE "semanage.conf"
+ /* relative path names to enum semanage_paths to special files and
+  * directories for the module store */
+@@ -433,6 +435,21 @@
+ 	return 1;
+ }
+ 
++int semanage_module_enabled(const char *file) {
++	int len = strlen(file) - strlen(DISABLESTR);
++	return (len < 0 || strcmp(&file[len], DISABLESTR) != 0);
++}
++
++static int semanage_modulename_select(const struct dirent *d)
++{
++	if (d->d_name[0] == '.'
++	    && (d->d_name[1] == '\0'
++		|| (d->d_name[1] == '.' && d->d_name[2] == '\0')))
++		return 0;
++
++	return semanage_module_enabled(d->d_name);
++}
++
+ /* Copies a file from src to dst.  If dst already exists then
+  * overwrite it.  Returns 0 on success, -1 on error. */
+ static int semanage_copy_file(const char *src, const char *dst, mode_t mode)
+@@ -599,15 +616,8 @@
+ 	return -1;
+ }
+ 
+-/* Scans the modules directory for the current semanage handler.  This
+- * might be the active directory or sandbox, depending upon if the
+- * handler has a transaction lock.  Allocates and fills in *filenames
+- * with an array of module filenames; length of array is stored in
+- * *len.  The caller is responsible for free()ing *filenames and its
+- * individual elements.	 Upon success returns 0, -1 on error.
+- */
+-int semanage_get_modules_names(semanage_handle_t * sh, char ***filenames,
+-			       int *len)
++static int semanage_get_modules_names_filter(semanage_handle_t * sh, char ***filenames,
++				      int *len, int (*filter)(const struct dirent *))
+ {
+ 	const char *modules_path;
+ 	struct dirent **namelist = NULL;
+@@ -622,7 +632,7 @@
+ 	*filenames = NULL;
+ 	*len = 0;
+ 	if ((num_files = scandir(modules_path, &namelist,
+-				 semanage_filename_select, alphasort)) == -1) {
++				 filter, alphasort)) == -1) {
+ 		ERR(sh, "Error while scanning directory %s.", modules_path);
+ 		goto cleanup;
+ 	}
+@@ -663,6 +673,34 @@
+ 	return retval;
+ }
+ 
++/* Scans the modules directory for the current semanage handler.  This
++ * might be the active directory or sandbox, depending upon if the
++ * handler has a transaction lock.  Allocates and fills in *filenames
++ * with an array of module filenames; length of array is stored in
++ * *len.  The caller is responsible for free()ing *filenames and its
++ * individual elements.	 Upon success returns 0, -1 on error.
++ */
++int semanage_get_modules_names(semanage_handle_t * sh, char ***filenames,
++			       int *len)
++{
++	return semanage_get_modules_names_filter(sh, filenames,
++						 len, semanage_filename_select);
++}
++
++/* Scans the modules directory for the current semanage handler.  This
++ * might be the active directory or sandbox, depending upon if the
++ * handler has a transaction lock.  Allocates and fills in *filenames
++ * with an array of module filenames; length of array is stored in
++ * *len.  The caller is responsible for free()ing *filenames and its
++ * individual elements.	 Upon success returns 0, -1 on error.
++ */
++int semanage_get_active_modules_names(semanage_handle_t * sh, char ***filenames,
++			       int *len)
++{
++	return semanage_get_modules_names_filter(sh, filenames,
++						 len, semanage_modulename_select);
++}
++
+ /******************* routines that run external programs *******************/
+ 
+ /* Appends a single character to a string.  Returns a pointer to the
+@@ -1589,7 +1627,7 @@
+ 	}
+ 
+ 	/* get list of modules and load them */
+-	if (semanage_get_modules_names(sh, &module_filenames, &num_modules) ==
++	if (semanage_get_active_modules_names(sh, &module_filenames, &num_modules) ==
+ 	    -1 || semanage_load_module(sh, base_filename, base) == -1) {
+ 		goto cleanup;
+ 	}
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.36/src/semanage_store.h
+--- nsalibsemanage/src/semanage_store.h	2009-07-07 15:32:32.000000000 -0400
++++ libsemanage-2.0.36/src/semanage_store.h	2009-08-28 14:00:55.000000000 -0400
+@@ -128,4 +128,6 @@
+ 		     size_t buf_len,
+ 		     char **sorted_buf, size_t * sorted_buf_len);
+ 
++extern const char *DISABLESTR;
++
+ #endif


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- libsemanage.spec	26 Aug 2009 19:06:23 -0000	1.182
+++ libsemanage.spec	28 Aug 2009 18:03:05 -0000	1.183
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.35
+Version: 2.0.36
 Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -91,6 +91,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.36-2
+- Add enable/disable modules
+
+* Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.36-1
+- Update to upstream
+	* Changed bzip-blocksize=0 handling to support existing compressed
+	modules in the store.
+
 * Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.35-2
 - Make sure /root is not used in genhomedircon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- sources	5 Aug 2009 19:21:58 -0000	1.105
+++ sources	28 Aug 2009 18:03:05 -0000	1.106
@@ -1 +1 @@
-a1592f93fbe653d9c9e1de00597d7df4  libsemanage-2.0.35.tgz
+2d8087a2b4d47a55a34c6bb68ab32c1d  libsemanage-2.0.36.tgz



From dwalsh at fedoraproject.org  Fri Aug 28 18:18:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 28 Aug 2009 18:18:48 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.436,
	1.437 policycoreutils.spec, 1.635, 1.636
Message-ID: <20090828181848.2B90011C0078@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26172

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-14
- Add enable/disable patch


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 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_user.conf           |    2 
 restorecond/user.c                          |  237 +++++++++
 restorecond/watch.c                         |  254 ++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/sandbox                             |  202 ++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   13 
 sandbox/seunshare.c                         |  203 ++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   34 +
 semanage/seobject.py                        |   66 ++
 semodule/semodule.8                         |    6 
 semodule/semodule.8.enable                  |   79 +++
 semodule/semodule.c                         |   51 +-
 semodule/semodule.c.enable                  |  454 ++++++++++++++++++
 setfiles/Makefile                           |    4 
 setfiles/restore.c                          |  519 +++++++++++++++++++++
 setfiles/restore.h                          |   49 +
 setfiles/setfiles.c                         |  687 +++-------------------------
 28 files changed, 2440 insertions(+), 976 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -p -r1.436 -r1.437
--- policycoreutils-rhat.patch	26 Aug 2009 21:52:30 -0000	1.436
+++ policycoreutils-rhat.patch	28 Aug 2009 18:18:46 -0000	1.437
@@ -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.71/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/audit2allow/audit2allow	2009-08-28 14:07:24.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/Makefile policycoreutils-2.0.71/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/Makefile	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/Makefile	2009-08-28 14:07:24.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
@@ -49,7 +49,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.71/restorecond/Makefile
 --- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/Makefile	2009-08-28 14:07:24.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -98,14 +98,14 @@ 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.71/restorecond/org.selinux.Restorecond.service
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/org.selinux.Restorecond.service	2009-08-28 14:07:24.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.71/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.c	2009-08-28 14:07:24.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -598,7 +598,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.71/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.conf	2009-08-28 14:07:24.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -611,7 +611,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.71/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.desktop	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -622,7 +622,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.71/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond.h	2009-08-28 14:07:24.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -649,13 +649,13 @@ 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_user.conf policycoreutils-2.0.71/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/restorecond_user.conf	2009-08-28 14:07:24.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.71/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/user.c	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/user.c	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -896,7 +896,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/watch.c policycoreutils-2.0.71/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/restorecond/watch.c	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1154,7 +1154,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.71/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/Makefile	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/Makefile	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1189,8 +1189,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.71/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandbox	2009-08-26 17:34:50.000000000 -0400
-@@ -0,0 +1,193 @@
++++ policycoreutils-2.0.71/sandbox/sandbox	2009-08-28 14:07:24.000000000 -0400
+@@ -0,0 +1,202 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1341,7 +1341,14 @@ diff --exclude-from=exclude --exclude=se
 +                                break
 +
 +           try:
++                  newhomedir = None
++                  newtmpdir = None
 +                  if X_ind:
++                         if not os.path.exists("/usr/sbin/seunshare"):
++                                raise ValueError("""/usr/sbin/seunshare required for sandbox -X, to install you need to execute 
++#yum install /usr/sbin/seunshare""")
++                         else:
++                                print "exists"
 +                         import warnings
 +                         warnings.simplefilter("ignore")
 +                         newhomedir = os.tempnam(".", ".sandbox%s")
@@ -1368,8 +1375,10 @@ diff --exclude-from=exclude --exclude=se
 +                         selinux.setexeccon(None)
 +           finally:
 +                  if X_ind:
-+                         shutil.rmtree(newhomedir)
-+                         shutil.rmtree(newtmpdir)
++                         if newhomedir:
++                                shutil.rmtree(newhomedir)
++                         if newtmpdir:
++                                shutil.rmtree(newtmpdir)
 +                  
 +    except getopt.GetoptError, error:
 +           usage(_("Options Error %s ") % error.msg)
@@ -1386,7 +1395,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.71/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandbox.8	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/sandbox.8	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1416,7 +1425,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.71/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/sandboxX.sh	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/sandboxX.sh	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,13 @@
 +#!/bin/bash 
 +(Xephyr -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
@@ -1431,10 +1440,9 @@ diff --exclude-from=exclude --exclude=se
 +exit $EXITCODE
 +break
 +done
-Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.71/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.71/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/sandbox/seunshare.c	2009-08-26 17:50:31.000000000 -0400
++++ policycoreutils-2.0.71/sandbox/seunshare.c	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,203 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -1639,10 +1647,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.71/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.71/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/chcat	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/scripts/chcat	2009-08-28 14:07:24.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -1654,7 +1661,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/Makefile policycoreutils-2.0.71/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.71/scripts/Makefile	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/scripts/Makefile	2009-08-28 14:07:24.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -1666,7 +1673,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.71/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/semanage	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/semanage/semanage	2009-08-28 14:07:24.000000000 -0400
 @@ -68,6 +68,7 @@
  	-h, --help       Display this message
  	-n, --noheading  Do not print heading when listing OBJECTS
@@ -1776,7 +1783,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.71/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-08-19 16:35:03.000000000 -0400
-+++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/semanage/seobject.py	2009-08-28 14:07:24.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005, 2006, 2007, 2008 Red Hat 
@@ -1903,9 +1910,683 @@ diff --exclude-from=exclude --exclude=se
  				
  class booleanRecords(semanageRecords):
  	def __init__(self, store = ""):
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.71/semodule/semodule.8
+--- nsapolicycoreutils/semodule/semodule.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.71/semodule/semodule.8	2009-08-28 14:07:24.000000000 -0400
+@@ -35,6 +35,12 @@
+ .B  \-b,\-\-base=MODULE_PKG   
+ install/replace base module package
+ .TP
++.B  \-d,\-\-disable=MODULE_NAME
++disable existing module
++.TP
++.B  \-e,\-\-enable=MODULE_NAME
++enable existing module
++.TP
+ .B  \-r,\-\-remove=MODULE_NAME
+ remove existing module
+ .TP
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8.enable policycoreutils-2.0.71/semodule/semodule.8.enable
+--- nsapolicycoreutils/semodule/semodule.8.enable	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/semodule/semodule.8.enable	2009-08-12 12:08:15.000000000 -0400
+@@ -0,0 +1,79 @@
++.TH SEMODULE "8" "Nov 2005" "Security Enhanced Linux" NSA
++.SH NAME 
++semodule \- Manage SELinux policy modules.
++
++.SH SYNOPSIS
++.B semodule [options]... MODE [MODES]...
++.br
++.SH DESCRIPTION
++.PP
++semodule is the tool used to manage SELinux policy modules,
++including installing, upgrading, listing and removing modules.  
++semodule may also be used to force a rebuild of policy from the
++module store and/or to force a reload of policy without performing
++any other transaction.  semodule acts on module packages created
++by semodule_package.  Conventionally, these files have a .pp suffix
++(policy package), although this is not mandated in any way.
++
++.SH "OPTIONS"
++.TP
++.B \-R, \-\-reload
++force a reload of policy
++.TP
++.B \-B, \-\-build		
++force a rebuild of policy (also reloads unless -n is used)
++.TP
++.B \-D, \-\-disable_dontaudit
++Temporarily remove dontaudits from policy.  Reverts whenever policy is rebuilt
++.TP
++.B \-i,\-\-install=MODULE_PKG
++install/replace a module package
++.TP
++.B  \-u,\-\-upgrade=MODULE_PKG
++upgrade an existing module package
++.TP
++.B  \-b,\-\-base=MODULE_PKG   
++install/replace base module package
++.TP
++.B  \-r,\-\-remove=MODULE_NAME
++remove existing module
++.TP
++.B  \-l,\-\-list-modules      
++display list of installed modules (other than base)
++.TP
++.B  \-s,\-\-store	   
++name of the store to operate on
++.TP
++.B  \-n,\-\-noreload	
++do not reload policy after commit
++.TP
++.B  \-h,\-\-help        
++prints help message and quit
++.TP
++.B  \-v,\-\-verbose     
++be verbose
++
++.SH EXAMPLE
++.nf
++# Install or replace a base policy package.
++$ semodule -b base.pp
++# Install or replace a non-base policy package.
++$ semodule -i httpd.pp
++# List non-base modules.
++$ semodule -l
++# Turn on all AVC Messages for which SELinux currently is "dontaudit"ing.
++$ semodule -DB
++# Turn "dontaudit" rules back on.
++$ semodule -B
++# Install or replace all non-base modules in the current directory.
++$ semodule -i *.pp
++# Install or replace all modules in the current directory.
++$ ls *.pp | grep -Ev "base.pp|enableaudit.pp" | xargs /usr/sbin/semodule -b base.pp -i
++.fi
++
++.SH SEE ALSO
++.B checkmodule(8), semodule_package(8)
++.SH AUTHORS
++.nf
++This manual page was written by Dan Walsh <dwalsh at redhat.com>.
++The program was written by Karl MacMillan <kmacmillan at tresys.com>, Joshua Brindle <jbrindle at tresys.com>, Jason Tang <jtang at tresys.com>
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.71/semodule/semodule.c
+--- nsapolicycoreutils/semodule/semodule.c	2009-07-07 15:32:32.000000000 -0400
++++ policycoreutils-2.0.71/semodule/semodule.c	2009-08-28 14:08:55.000000000 -0400
+@@ -22,12 +22,12 @@
+ 
+ #include <semanage/modules.h>
+ 
+-enum client_modes { NO_MODE, INSTALL_M, UPGRADE_M, BASE_M, REMOVE_M,
++enum client_modes { NO_MODE, INSTALL_M, UPGRADE_M, BASE_M, ENABLE_M, DISABLE_M, REMOVE_M,
+ 	LIST_M, RELOAD
+ };
+ /* list of modes in which one ought to commit afterwards */
+ static const int do_commit[] = {
+-	0, 1, 1, 1, 1,
++	0, 1, 1, 1, 1, 1, 1,
+ 	0, 0
+ };
+ 
+@@ -106,7 +106,9 @@
+ 	printf("  -i,--install=MODULE_PKG   install a new module\n");
+ 	printf("  -u,--upgrade=MODULE_PKG   upgrade existing module\n");
+ 	printf("  -b,--base=MODULE_PKG      install new base module\n");
+-	printf("  -r,--remove=MODULE_NAME   remove existing module\n");
++	printf("  -e,--enable=MODULE_PKG    enable existing module\n");
++	printf("  -d,--disable=MODULE_PKG   disable existing module\n");
++ 	printf("  -r,--remove=MODULE_NAME   remove existing module\n");
+ 	printf
+ 	    ("  -l,--list-modules         display list of installed modules\n");
+ 	printf("Other options:\n");
+@@ -152,6 +154,8 @@
+ 		{"install", required_argument, NULL, 'i'},
+ 		{"list-modules", 0, NULL, 'l'},
+ 		{"verbose", 0, NULL, 'v'},
++		{"enable", required_argument, NULL, 'e'},
++		{"disable", required_argument, NULL, 'd'},
+ 		{"remove", required_argument, NULL, 'r'},
+ 		{"upgrade", required_argument, NULL, 'u'},
+ 		{"reload", 0, NULL, 'R'},
+@@ -166,7 +170,7 @@
+ 	no_reload = 0;
+ 	create_store = 0;
+ 	while ((i =
+-		getopt_long(argc, argv, "s:b:hi:lvqr:u:RnBD", opts,
++		getopt_long(argc, argv, "s:b:hi:lvqe:d:r:u:RnBD", opts,
+ 			    NULL)) != -1) {
+ 		switch (i) {
+ 		case 'b':
+@@ -185,6 +189,12 @@
+ 		case 'v':
+ 			verbose = 1;
+ 			break;
++		case 'e':
++			set_mode(ENABLE_M, optarg);
++			break;
++		case 'd':
++			set_mode(DISABLE_M, optarg);
++			break;
+ 		case 'r':
+ 			set_mode(REMOVE_M, optarg);
+ 			break;
+@@ -238,6 +248,10 @@
+ 			mode = UPGRADE_M;
+ 		} else if (commands && commands[num_commands - 1].mode == REMOVE_M) {
+ 			mode = REMOVE_M;
++		} else if (commands && commands[num_commands - 1].mode == ENABLE_M) {
++			mode = ENABLE_M;
++		} else if (commands && commands[num_commands - 1].mode == DISABLE_M) {
++			mode = DISABLE_M;
+ 		} else {
+ 			fprintf(stderr, "unknown additional arguments:\n");
+ 			while (optind < argc)
+@@ -352,6 +366,30 @@
+ 				    semanage_module_install_base_file(sh, mode_arg);
+ 				break;
+ 			}
++		case ENABLE_M:{
++				if (verbose) {
++					printf
++					    ("Attempting to enable module '%s':\n",
++					     mode_arg);
++				}
++				result = semanage_module_enable(sh, mode_arg);
++				if ( result == -2 ) { 
++					continue;
++				}
++				break;
++			}
++		case DISABLE_M:{
++				if (verbose) {
++					printf
++					    ("Attempting to disable module '%s':\n",
++					     mode_arg);
++				}
++				result = semanage_module_disable(sh, mode_arg);
++				if ( result == -2 ) { 
++					continue;
++				}
++				break;
++			}
+ 		case REMOVE_M:{
+ 				if (verbose) {
+ 					printf
+@@ -382,11 +420,12 @@
+ 						semanage_module_info_t *m =
+ 						    semanage_module_list_nth
+ 						    (modinfo, j);
+-						printf("%s\t%s\n",
++						printf("%s\t%s\t%s\n",
+ 						       semanage_module_get_name
+ 						       (m),
+ 						       semanage_module_get_version
+-						       (m));
++						       (m), 
++						       (semanage_module_get_enabled(m) ? "" : "Disabled"));
+ 						semanage_module_info_datum_destroy
+ 						    (m);
+ 					}
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c.enable policycoreutils-2.0.71/semodule/semodule.c.enable
+--- nsapolicycoreutils/semodule/semodule.c.enable	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.71/semodule/semodule.c.enable	2009-08-12 12:08:15.000000000 -0400
+@@ -0,0 +1,454 @@
++/* Authors: Karl MacMillan <kmacmillan at tresys.com>
++ *          Joshua Brindle <jbrindle at tresys.com>
++ *          Jason Tang <jtang at tresys.com>
++ *
++ * Copyright (C) 2004-2005 Tresys Technology, LLC
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License as
++ *      published by the Free Software Foundation, version 2.
++ */
++
++#include <fcntl.h>
++#include <getopt.h>
++#include <signal.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++
++#include <semanage/modules.h>
++
++enum client_modes { NO_MODE, INSTALL_M, UPGRADE_M, BASE_M, REMOVE_M,
++	LIST_M, RELOAD
++};
++/* list of modes in which one ought to commit afterwards */
++static const int do_commit[] = {
++	0, 1, 1, 1, 1,
++	0, 0
++};
++
++struct command {
++	enum client_modes mode;
++	char *arg;
++};
++static struct command *commands = NULL;
++static int num_commands = 0;
++
++/* options given on command line */
++static int verbose;
++static int reload;
++static int no_reload;
++static int create_store;
++static int build;
++static int disable_dontaudit;
++
++static semanage_handle_t *sh = NULL;
++static char *store;
++
++extern char *optarg;
++extern int optind;
++
++static void cleanup(void)
++{
++	while (--num_commands >= 0) {
++		free(commands[num_commands].arg);
++	}
++	free(commands);
++}
++
++/* Signal handlers. */
++static void handle_signal(int sig_num)
++{
++	if (sig_num == SIGINT || sig_num == SIGQUIT || sig_num == SIGTERM) {
++		/* catch these signals, and then drop them */
++	}
++}
++
++static void set_store(char *storename)
++{
++	/* For now this only supports a store name, later on this 
++	 * should support an address for a remote connection */
++
++	if ((store = strdup(storename)) == NULL) {
++		fprintf(stderr, "Out of memory!\n");
++		goto bad;
++	}
++
++	return;
++
++      bad:
++	cleanup();
++	exit(1);
++}
++
++/* Establish signal handlers for the process. */
++static void create_signal_handlers(void)
++{
++	if (signal(SIGINT, handle_signal) == SIG_ERR ||
++	    signal(SIGQUIT, handle_signal) == SIG_ERR ||
++	    signal(SIGTERM, handle_signal) == SIG_ERR) {
++		fprintf(stderr, "Could not set up signal handler.\n");
++		exit(255);
++	}
++}
++
++static void usage(char *progname)
++{
++	printf("usage:  %s [options]... MODE [MODES]...\n", progname);
++	printf("Manage SELinux policy modules.\n");
++	printf("MODES:\n");
++	printf("  -R, --reload		    reload policy\n");
++	printf("  -B, --build		    build and reload policy\n");
++	printf("  -i,--install=MODULE_PKG   install a new module\n");
++	printf("  -u,--upgrade=MODULE_PKG   upgrade existing module\n");
++	printf("  -b,--base=MODULE_PKG      install new base module\n");
++	printf("  -r,--remove=MODULE_NAME   remove existing module\n");
++	printf
++	    ("  -l,--list-modules         display list of installed modules\n");
++	printf("Other options:\n");
++	printf("  -s,--store	   name of the store to operate on\n");
++	printf("  -n,--noreload	   do not reload policy after commit\n");
++	printf("  -h,--help        print this message and quit\n");
++	printf("  -v,--verbose     be verbose\n");
++	printf("  -D,--disable_dontaudit	Remove dontaudits from policy\n");
++}
++
++/* Sets the global mode variable to new_mode, but only if no other
++ * mode has been given. */
++static void set_mode(enum client_modes new_mode, char *arg)
++{
++	struct command *c;
++	char *s;
++	if ((c = realloc(commands, sizeof(*c) * (num_commands + 1))) == NULL) {
++		fprintf(stderr, "Out of memory!\n");
++		cleanup();
++		exit(1);
++	}
++	commands = c;
++	commands[num_commands].mode = new_mode;
++	commands[num_commands].arg = NULL;
++	num_commands++;
++	if (arg != NULL) {
++		if ((s = strdup(arg)) == NULL) {
++			fprintf(stderr, "Out of memory!\n");
++			cleanup();
++			exit(1);
++		}
++		commands[num_commands - 1].arg = s;
++	}
++}
++
++/* Parse command line and set global options. */
++static void parse_command_line(int argc, char **argv)
++{
++	static struct option opts[] = {
++		{"store", required_argument, NULL, 's'},
++		{"base", required_argument, NULL, 'b'},
++		{"help", 0, NULL, 'h'},
++		{"install", required_argument, NULL, 'i'},
++		{"list-modules", 0, NULL, 'l'},
++		{"verbose", 0, NULL, 'v'},
++		{"remove", required_argument, NULL, 'r'},
++		{"upgrade", required_argument, NULL, 'u'},
++		{"reload", 0, NULL, 'R'},
++		{"noreload", 0, NULL, 'n'},
++		{"build", 0, NULL, 'B'},
++		{"disable_dontaudit", 0, NULL, 'D'},
++		{NULL, 0, NULL, 0}
++	};
++	int i;
++	verbose = 0;
++	reload = 0;
++	no_reload = 0;
++	create_store = 0;
++	while ((i =
++		getopt_long(argc, argv, "s:b:hi:lvqr:u:RnBD", opts,
++			    NULL)) != -1) {
++		switch (i) {
++		case 'b':
++			set_mode(BASE_M, optarg);
++			create_store = 1;
++			break;
++		case 'h':
++			usage(argv[0]);
++			exit(0);
++		case 'i':
++			set_mode(INSTALL_M, optarg);
++			break;
++		case 'l':
++			set_mode(LIST_M, NULL);
++			break;
++		case 'v':
++			verbose = 1;
++			break;
++		case 'r':
++			set_mode(REMOVE_M, optarg);
++			break;
++		case 'u':
++			set_mode(UPGRADE_M, optarg);
++			break;
++		case 's':
++			set_store(optarg);
++			break;
++		case 'R':
++			reload = 1;
++			break;
++		case 'n':
++			no_reload = 1;
++			break;
++		case 'B':
++			build = 1;
++			break;
++		case 'D':
++			disable_dontaudit = 1;
++			break;
++		case '?':
++		default:{
++				usage(argv[0]);
++				exit(1);
++			}
++		}
++	}
++	if ((build || reload) && num_commands) {
++		fprintf(stderr,
++			"build or reload should not be used with other commands\n");
++		usage(argv[0]);
++		exit(1);
++	}
++	if (num_commands == 0 && reload == 0 && build == 0) {
++		fprintf(stderr, "At least one mode must be specified.\n");
++		usage(argv[0]);
++		exit(1);
++	}
++
++	if (optind < argc) {
++		int mode;
++		/* if -i/u/r was the last command treat any remaining
++		 * arguments as args. Will allow 'semodule -i *.pp' to
++		 * work as expected.
++		 */
++
++		if (commands && commands[num_commands - 1].mode == INSTALL_M) {
++			mode = INSTALL_M;
++		} else if (commands && commands[num_commands - 1].mode == UPGRADE_M) {
++			mode = UPGRADE_M;
++		} else if (commands && commands[num_commands - 1].mode == REMOVE_M) {
++			mode = REMOVE_M;
++		} else {
++			fprintf(stderr, "unknown additional arguments:\n");
++			while (optind < argc)
++				fprintf(stderr, " %s", argv[optind++]);
++			fprintf(stderr, "\n\n");
++			usage(argv[0]);
++			exit(1);
++		}
++		while (optind < argc)
++			set_mode(mode, argv[optind++]);
++	}
++}
++
++int main(int argc, char *argv[])
++{
++	int i, commit = 0;
++	int result;
++	int status = EXIT_FAILURE;
++
++	create_signal_handlers();
++	parse_command_line(argc, argv);
++
++	if (build)
++		commit = 1;
++
++	sh = semanage_handle_create();
++	if (!sh) {
++		fprintf(stderr, "%s:  Could not create semanage handle\n",
++			argv[0]);
++		goto cleanup_nohandle;
++	}
++
++	if (store) {
++		/* Set the store we want to connect to, before connecting.
++		 * this will always set a direct connection now, an additional
++		 * option will need to be used later to specify a policy server 
++		 * location */
++		semanage_select_store(sh, store, SEMANAGE_CON_DIRECT);
++	}
++
++	/* if installing base module create store if necessary, for bootstrapping */
++	semanage_set_create_store(sh, create_store);
++
++	if (!create_store) {
++		if (!semanage_is_managed(sh)) {
++			fprintf(stderr,
++				"%s: SELinux policy is not managed or store cannot be accessed.\n",
++				argv[0]);
++			goto cleanup;
++		}
++
++		if (semanage_access_check(sh) < SEMANAGE_CAN_READ) {
++			fprintf(stderr, "%s: Cannot read policy store.\n",
++				argv[0]);
++			goto cleanup;
++		}
++	}
++
++	if ((result = semanage_connect(sh)) < 0) {
++		fprintf(stderr, "%s:  Could not connect to policy handler\n",
++			argv[0]);
++		goto cleanup;
++	}
++
++	if (reload) {
++		if ((result = semanage_reload_policy(sh)) < 0) {
++			fprintf(stderr, "%s:  Could not reload policy\n",
++				argv[0]);
++			goto cleanup;
++		}
++	}
++
++	if (build) {
++		if ((result = semanage_begin_transaction(sh)) < 0) {
++			fprintf(stderr, "%s:  Could not begin transaction:  %s\n",
++				argv[0], errno ? strerror(errno) : "");
++			goto cleanup;
++		}
++	}
++
++	for (i = 0; i < num_commands; i++) {
++		enum client_modes mode = commands[i].mode;
++		char *mode_arg = commands[i].arg;
++		switch (mode) {
++		case INSTALL_M:{
++				if (verbose) {
++					printf
++					    ("Attempting to install module '%s':\n",
++					     mode_arg);
++				}
++				result =
++				    semanage_module_install_file(sh, mode_arg);
++				break;
++			}
++		case UPGRADE_M:{
++				if (verbose) {
++					printf
++					    ("Attempting to upgrade module '%s':\n",
++					     mode_arg);
++				}
++				result =
++				    semanage_module_upgrade_file(sh, mode_arg);
++				break;
++			}
++		case BASE_M:{
++				if (verbose) {
++					printf
++					    ("Attempting to install base module '%s':\n",
++					     mode_arg);
++				}
++				result =
++				    semanage_module_install_base_file(sh, mode_arg);
++				break;
++			}
++		case REMOVE_M:{
++				if (verbose) {
++					printf
++					    ("Attempting to remove module '%s':\n",
++					     mode_arg);
++				}
++				result = semanage_module_remove(sh, mode_arg);
++				if ( result == -2 ) { 
++					continue;
++				}
++				break;
++			}
++		case LIST_M:{
++				semanage_module_info_t *modinfo;
++				int num_modules;
++				if (verbose) {
++					printf
++					    ("Attempting to list active modules:\n");
++				}
++				if ((result =
++				     semanage_module_list(sh, &modinfo,
++							  &num_modules)) >= 0) {
++					int j;
++					if (num_modules == 0) {
++						printf("No modules.\n");
++					}
++					for (j = 0; j < num_modules; j++) {
++						semanage_module_info_t *m =
++						    semanage_module_list_nth
++						    (modinfo, j);
++						printf("%s\t%s\n",
++						       semanage_module_get_name
++						       (m),
++						       semanage_module_get_version
++						       (m));
++						semanage_module_info_datum_destroy
++						    (m);
++					}
++					free(modinfo);
++				}
++				break;
++			}
++		default:{
++				fprintf(stderr,
++					"%s:  Unknown mode specified.\n",
++					argv[0]);
++				usage(argv[0]);
++				goto cleanup;
++			}
++		}
++		commit += do_commit[mode];
++		if (result < 0) {
++			fprintf(stderr, "%s:  Failed on %s!\n", argv[0],
++				mode_arg ? : "list");
++			goto cleanup;
++		} else if (verbose) {
++			printf("Ok: return value of %d.\n", result);
++		}
++	}
++
++	if (commit) {
++		if (verbose)
++			printf("Committing changes:\n");
++		if (no_reload)
++			semanage_set_reload(sh, 0);
++		if (build)
++			semanage_set_rebuild(sh, 1);
++		if (disable_dontaudit)
++			semanage_set_disable_dontaudit(sh, 1);
++		else if (build)
++			semanage_set_disable_dontaudit(sh, 0);
++
++		result = semanage_commit(sh);
++	}
++
++	if (result < 0) {
++		fprintf(stderr, "%s:  Failed!\n", argv[0]);
++		goto cleanup;
++	} else if (commit && verbose) {
++		printf("Ok: transaction number %d.\n", result);
++	}
++
++	if (semanage_disconnect(sh) < 0) {
++		fprintf(stderr, "%s:  Error disconnecting\n", argv[0]);
++		goto cleanup;
++	}
++	status = EXIT_SUCCESS;
++
++      cleanup:
++	if (semanage_is_connected(sh)) {
++		if (semanage_disconnect(sh) < 0) {
++			fprintf(stderr, "%s:  Error disconnecting\n", argv[0]);
++		}
++	}
++	semanage_handle_destroy(sh);
++
++      cleanup_nohandle:
++	cleanup();
++	exit(status);
++}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.71/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/Makefile	2009-08-28 14:07:24.000000000 -0400
 @@ -5,7 +5,7 @@
  LIBDIR ?= $(PREFIX)/lib
  AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1926,7 +2607,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.71/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/restore.c	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -2449,7 +3130,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/restore.h policycoreutils-2.0.71/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/restore.h	2009-08-28 14:07:24.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -2502,7 +3183,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/setfiles/setfiles.c policycoreutils-2.0.71/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-08-12 12:08:15.000000000 -0400
-+++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-26 17:34:50.000000000 -0400
++++ policycoreutils-2.0.71/setfiles/setfiles.c	2009-08-28 14:07:24.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -p -r1.635 -r1.636
--- policycoreutils.spec	27 Aug 2009 07:51:00 -0000	1.635
+++ policycoreutils.spec	28 Aug 2009 18:18:47 -0000	1.636
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
 %define	libsepolver	2.0.19-1
-%define	libsemanagever	2.0.28-2
+%define	libsemanagever	2.0.36-2
 %define	libselinuxver	2.0.46-5
 %define	sepolgenver	1.0.17
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.71
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -295,6 +295,9 @@ fi
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 2.0.71-14
+- Add enable/disable patch
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.71-13
 - rebuilt with new audit
 



From jkratoch at fedoraproject.org  Fri Aug 28 18:24:06 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 28 Aug 2009 18:24:06 +0000 (UTC)
Subject: rpms/gdb/devel gdb-bz520129-drow-bitfields.patch, NONE,
	1.1 gdb-bz515434-qsort_cmp.patch, 1.1, 1.2 gdb.spec, 1.379, 1.380
Message-ID: <20090828182406.A107B11C0078@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26945

Modified Files:
	gdb-bz515434-qsort_cmp.patch gdb.spec 
Added Files:
	gdb-bz520129-drow-bitfields.patch 
Log Message:
* Fri Aug 28 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-6
- Real upstream fixup of qsort_cmp (BZ 515434).
- Revert bitfields regression (BZ 520129).


gdb-bz520129-drow-bitfields.patch:
 valops.c |   31 ++-----------------------
 value.c  |   77 +++++++++++++--------------------------------------------------
 value.h  |    8 ------
 3 files changed, 20 insertions(+), 96 deletions(-)

--- NEW FILE gdb-bz520129-drow-bitfields.patch ---
http://sourceware.org/ml/gdb-cvs/2009-07/msg00143.html

2009-07-21  Daniel Jacobowitz  <dan at codesourcery.com>
	    Vladimir Prus <vladimir at codesourcery.com>

	* valops.c (value_fetch_lazy): Handle bitfields explicitly.
	(value_assign): Remove unnecessary FIXME.  Honor the container
	type of bitfields if possible.
	* value.c (struct value): Add parent field.
	(value_parent): New function.
	(value_free): Free the parent also.
	(value_copy): Copy the parent also.
	(value_primitive_field): Do not read the contents of a lazy
	value to create a child bitfield value.  Set bitpos and offset
	according to the container type if possible.
	(unpack_bits_as_long): Rename from unpack_field_as_long.  Take
	field_type, bitpos, and bitsize instead of type and fieldno.
	(unpack_field_as_long): Use unpack_bits_as_long.
	* value.h (value_parent, unpack_bits_as_long): New prototypes.

[ Reverted, backported for Fedora.  ]

--- ./gdb/valops.c	2009-08-28 19:27:30.000000000 +0200
+++ ./gdb/valops.c	2009-08-28 19:27:59.000000000 +0200
@@ -689,25 +689,7 @@ value_fetch_lazy (struct value *val)
 {
   gdb_assert (value_lazy (val));
   allocate_value_contents (val);
-  if (value_bitsize (val))
-    {
-      /* To read a lazy bitfield, read the entire enclosing value.  This
-	 prevents reading the same block of (possibly volatile) memory once
-         per bitfield.  It would be even better to read only the containing
-         word, but we have no way to record that just specific bits of a
-         value have been fetched.  */
-      struct type *type = check_typedef (value_type (val));
-      enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
-      struct value *parent = value_parent (val);
-      LONGEST offset = value_offset (val);
-      LONGEST num = unpack_bits_as_long (value_type (val),
-					 value_contents (parent) + offset,
-					 value_bitpos (val),
-					 value_bitsize (val));
-      int length = TYPE_LENGTH (type);
-      store_signed_integer (value_contents_raw (val), length, byte_order, num);
-    }
-  else if (VALUE_LVAL (val) == lval_memory)
+  if (VALUE_LVAL (val) == lval_memory)
     {
       CORE_ADDR addr = value_raw_address (val);
 
@@ -883,20 +865,13 @@ value_assign (struct value *toval, struc
 
 	if (value_bitsize (toval))
 	  {
+	    /* We assume that the argument to read_memory is in units
+	       of host chars.  FIXME: Is that correct?  */
 	    changed_len = (value_bitpos (toval)
 			   + value_bitsize (toval)
 			   + HOST_CHAR_BIT - 1)
 	      / HOST_CHAR_BIT;
 
-	    /* If we can read-modify-write exactly the size of the
-	       containing type (e.g. short or int) then do so.  This
-	       is safer for volatile bitfields mapped to hardware
-	       registers.  */
-	    if (changed_len < TYPE_LENGTH (type)
-		&& TYPE_LENGTH (type) <= (int) sizeof (LONGEST)
-		&& ((LONGEST) value_address (toval) % TYPE_LENGTH (type)) == 0)
-	      changed_len = TYPE_LENGTH (type);
-
 	    if (changed_len > (int) sizeof (LONGEST))
 	      error (_("Can't handle bitfields which don't fit in a %d bit word."),
 		     (int) sizeof (LONGEST) * HOST_CHAR_BIT);
--- ./gdb/value.c	2009-08-28 19:27:29.000000000 +0200
+++ ./gdb/value.c	2009-08-28 19:28:34.000000000 +0200
@@ -110,11 +110,6 @@ struct value
      gdbarch_bits_big_endian=1 targets, it is the position of the MSB. */
   int bitpos;
 
-  /* Only used for bitfields; the containing value.  This allows a
-     single read from the target when displaying multiple
-     bitfields.  */
-  struct value *parent;
-
   /* Frame register value is relative to.  This will be described in
      the lval enum above as "lval_register".  */
   struct frame_id frame_id;
@@ -392,12 +387,6 @@ set_value_bitsize (struct value *value, 
   value->bitsize = bit;
 }
 
-struct value *
-value_parent (struct value *value)
-{
-  return value->parent;
-}
-
 gdb_byte *
 value_contents_raw (struct value *value)
 {
@@ -617,11 +606,6 @@ value_free (struct value *val)
       if (val->reference_count > 0)
 	return;
 
-      /* If there's an associated parent value, drop our reference to
-	 it.  */
-      if (val->parent != NULL)
-	value_free (val->parent);
-
       type_decref (val->type);
       type_decref (val->enclosing_type);
 
@@ -750,9 +734,6 @@ value_copy (struct value *arg)
 	      TYPE_LENGTH (value_enclosing_type (arg)));
 
     }
-  val->parent = arg->parent;
-  if (val->parent)
-    value_incref (val->parent);
   if (VALUE_LVAL (val) == lval_computed)
     {
       struct lval_funcs *funcs = val->location.computed.funcs;
@@ -1946,28 +1927,15 @@ value_primitive_field (struct value *arg
 
   if (TYPE_FIELD_BITSIZE (arg_type, fieldno))
     {
-      /* Create a new value for the bitfield, with bitpos and bitsize
-	 set.  If possible, arrange offset and bitpos so that we can
-	 do a single aligned read of the size of the containing type.
-	 Otherwise, adjust offset to the byte containing the first
-	 bit.  Assume that the address, offset, and embedded offset
-	 are sufficiently aligned.  */
-      int bitpos = TYPE_FIELD_BITPOS (arg_type, fieldno);
-      int container_bitsize = TYPE_LENGTH (type) * 8;
-
-      v = allocate_value_lazy (type);
+      v = value_from_longest (type,
+			      unpack_field_as_long (arg_type,
+						    value_contents (arg1)
+						    + offset,
+						    fieldno));
+      v->bitpos = TYPE_FIELD_BITPOS (arg_type, fieldno) % 8;
       v->bitsize = TYPE_FIELD_BITSIZE (arg_type, fieldno);
-      if ((bitpos % container_bitsize) + v->bitsize <= container_bitsize
-	  && TYPE_LENGTH (type) <= (int) sizeof (LONGEST))
-	v->bitpos = bitpos % container_bitsize;
-      else
-	v->bitpos = bitpos % 8;
-      v->offset = value_offset (arg1) + value_embedded_offset (arg1)
-	+ (bitpos - v->bitpos) / 8;
-      v->parent = arg1;
-      value_incref (v->parent);
-      if (!value_lazy (arg1))
-	value_fetch_lazy (v);
+      v->offset = value_offset (arg1) + offset
+	+ TYPE_FIELD_BITPOS (arg_type, fieldno) / 8;
     }
   else if (fieldno < TYPE_N_BASECLASSES (arg_type))
     {
@@ -2094,9 +2062,8 @@ value_fn_field (struct value **arg1p, st
 }
 
 

-/* Unpack a bitfield of the specified FIELD_TYPE, from the anonymous
-   object at VALADDR.  The bitfield starts at BITPOS bits and contains
-   BITSIZE bits.
+/* Unpack a field FIELDNO of the specified TYPE, from the anonymous object at
+   VALADDR.
 
    Extracting bits depends on endianness of the machine.  Compute the
    number of least significant bits to discard.  For big endian machines,
@@ -2110,21 +2077,24 @@ value_fn_field (struct value **arg1p, st
    If the field is signed, we also do sign extension. */
 
 LONGEST
-unpack_bits_as_long (struct type *field_type, const gdb_byte *valaddr,
-		     int bitpos, int bitsize)
+unpack_field_as_long (struct type *type, const gdb_byte *valaddr, int fieldno)
 {
-  enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (field_type));
+  enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
   ULONGEST val;
   ULONGEST valmask;
+  int bitpos = TYPE_FIELD_BITPOS (type, fieldno);
+  int bitsize = TYPE_FIELD_BITSIZE (type, fieldno);
   int lsbcount;
+  struct type *field_type;
 
   val = extract_unsigned_integer (valaddr + bitpos / 8,
 				  sizeof (val), byte_order);
+  field_type = TYPE_FIELD_TYPE (type, fieldno);
   CHECK_TYPEDEF (field_type);
 
   /* Extract bits.  See comment above. */
 
-  if (gdbarch_bits_big_endian (get_type_arch (field_type)))
+  if (gdbarch_bits_big_endian (get_type_arch (type)))
     lsbcount = (sizeof val * 8 - bitpos % 8 - bitsize);
   else
     lsbcount = (bitpos % 8);
@@ -2148,19 +2118,6 @@ unpack_bits_as_long (struct type *field_
   return (val);
 }
 
-/* Unpack a field FIELDNO of the specified TYPE, from the anonymous object at
-   VALADDR.  See unpack_bits_as_long for more details.  */
-
-LONGEST
-unpack_field_as_long (struct type *type, const gdb_byte *valaddr, int fieldno)
-{
-  int bitpos = TYPE_FIELD_BITPOS (type, fieldno);
-  int bitsize = TYPE_FIELD_BITSIZE (type, fieldno);
-  struct type *field_type = TYPE_FIELD_TYPE (type, fieldno);
-
-  return unpack_bits_as_long (field_type, valaddr, bitpos, bitsize);
-}
-
 /* Modify the value of a bitfield.  ADDR points to a block of memory in
    target byte order; the bitfield starts in the byte pointed to.  FIELDVAL
    is the desired value of the field, in host byte order.  BITPOS and BITSIZE
--- ./gdb/value.h	2009-08-28 19:27:29.000000000 +0200
+++ ./gdb/value.h	2009-08-28 19:27:59.000000000 +0200
@@ -71,12 +71,6 @@ extern void set_value_bitsize (struct va
 extern int value_bitpos (struct value *);
 extern void set_value_bitpos (struct value *, int bit);
 
-/* Only used for bitfields; the containing value.  This allows a
-   single read from the target when displaying multiple
-   bitfields.  */
-
-struct value *value_parent (struct value *);
-
 /* Describes offset of a value within lval of a structure in bytes.
    If lval == lval_memory, this is an offset to the address.  If lval
    == lval_register, this is a further offset from location.address
@@ -330,8 +324,6 @@ extern LONGEST unpack_long (struct type 
 extern DOUBLEST unpack_double (struct type *type, const gdb_byte *valaddr,
 			       int *invp);
 extern CORE_ADDR unpack_pointer (struct type *type, const gdb_byte *valaddr);
-LONGEST unpack_bits_as_long (struct type *field_type, const gdb_byte *valaddr,
-			     int bitpos, int bitsize);
 extern LONGEST unpack_field_as_long (struct type *type,
 				     const gdb_byte *valaddr,
 				     int fieldno);

gdb-bz515434-qsort_cmp.patch:
 ./gdb/objfiles.c                              |  187 +++++++++++++++++++-------
 b/gdb/testsuite/gdb.base/solib-overlap-lib.c  |   27 +++
 b/gdb/testsuite/gdb.base/solib-overlap-main.c |   25 +++
 b/gdb/testsuite/gdb.base/solib-overlap.exp    |  135 ++++++++++++++++++
 4 files changed, 324 insertions(+), 50 deletions(-)

Index: gdb-bz515434-qsort_cmp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-bz515434-qsort_cmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdb-bz515434-qsort_cmp.patch	25 Aug 2009 13:13:04 -0000	1.1
+++ gdb-bz515434-qsort_cmp.patch	28 Aug 2009 18:24:06 -0000	1.2
@@ -1,46 +1,232 @@
---- gdb-6.8.50.20090818/gdb/objfiles.c-orig	2009-08-25 14:19:04.000000000 +0200
-+++ gdb-6.8.50.20090818/gdb/objfiles.c	2009-08-25 14:28:07.000000000 +0200
-@@ -820,12 +820,16 @@ qsort_cmp (const void *a, const void *b)
+Index: objfiles.c
+===================================================================
+RCS file: /cvs/src/src/gdb/objfiles.c,v
+retrieving revision 1.93
+diff -p -u -r1.93 objfiles.c
+--- ./gdb/objfiles.c	21 Aug 2009 17:57:17 -0000	1.93
++++ ./gdb/objfiles.c	26 Aug 2009 07:07:04 -0000
+@@ -790,15 +790,9 @@ qsort_cmp (const void *a, const void *b)
+   const CORE_ADDR sect2_addr = obj_section_addr (sect2);
  
    if (sect1_addr < sect2_addr)
-     {
-+#if 0	/* qsort_cmp ICE */
-       gdb_assert (obj_section_endaddr (sect1) <= sect2_addr);
-+#endif	/* qsort_cmp ICE */
-       return -1;
-     }
+-    {
+-      gdb_assert (obj_section_endaddr (sect1) <= sect2_addr);
+-      return -1;
+-    }
++    return -1;
    else if (sect1_addr > sect2_addr)
-     {
-+#if 0	/* qsort_cmp ICE */
-       gdb_assert (sect1_addr >= obj_section_endaddr (sect2));
-+#endif	/* qsort_cmp ICE */
-       return 1;
-     }
- 
-@@ -841,11 +845,13 @@ qsort_cmp (const void *a, const void *b)
- static struct obj_section *
- preferred_obj_section (struct obj_section *a, struct obj_section *b)
+-    {
+-      gdb_assert (sect1_addr >= obj_section_endaddr (sect2));
+-      return 1;
+-    }
++    return 1;
+ 
+   return 0;
+ }
+@@ -823,12 +817,133 @@ preferred_obj_section (struct obj_sectio
+   return b;
+ }
+ 
++/* Return 1 if SECTION should be inserted into the section map.
++   We want to insert only non-overlay and non-TLS section.  */
++
++static int
++insert_section_p (const struct bfd *abfd,
++		  const struct bfd_section *section)
++{
++  const bfd_vma lma = bfd_section_lma (abfd, section);
++
++  if (lma != 0 && lma != bfd_section_vma (abfd, section)
++      && (bfd_get_file_flags (abfd) & BFD_IN_MEMORY) == 0)
++    /* This is an overlay section.  IN_MEMORY check is needed to avoid
++       discarding sections from the "system supplied DSO" (aka vdso)
++       on Linux.  */
++    return 0;
++  if ((bfd_get_section_flags (abfd, section) & SEC_THREAD_LOCAL) != 0)
++    /* This is a TLS section.  */
++    return 0;
++
++  return 1;
++}
++
++/* Filter out overlapping sections where one section came from the real
++   objfile, and the other from a separate debuginfo file.
++   Return the size of table after redundant sections have been eliminated.  */
++
++static int
++filter_debuginfo_sections (struct obj_section **map, int map_size)
++{
++  int i, j;
++
++  for (i = 0, j = 0; i < map_size - 1; i++)
++    {
++      struct obj_section *const sect1 = map[i];
++      struct obj_section *const sect2 = map[i + 1];
++      const struct objfile *const objfile1 = sect1->objfile;
++      const struct objfile *const objfile2 = sect2->objfile;
++      const CORE_ADDR sect1_addr = obj_section_addr (sect1);
++      const CORE_ADDR sect2_addr = obj_section_addr (sect2);
++
++      if (sect1_addr == sect2_addr
++	  && (objfile1->separate_debug_objfile == objfile2
++	      || objfile2->separate_debug_objfile == objfile1))
++	{
++	  map[j++] = preferred_obj_section (sect1, sect2);
++	  ++i;
++	}
++      else
++	map[j++] = sect1;
++    }
++
++  if (i < map_size)
++    map[j++] = map[i];
++
++  /* The map should not have shrunk to less than half the original size.  */
++  gdb_assert (map_size / 2 <= j);
++
++  return j;
++}
++
++/* Filter out overlapping sections, issuing a warning if any are found.
++   Overlapping sections could really be overlay sections which we didn't
++   classify as such in insert_section_p, or we could be dealing with a
++   corrupt binary.  */
++
++static int
++filter_overlapping_sections (struct obj_section **map, int map_size)
++{
++  int i, j;
++
++  for (i = 0, j = 0; i < map_size - 1; )
++    {
++      int k;
++
++      map[j++] = map[i];
++      for (k = i + 1; k < map_size; k++)
++	{
++	  struct obj_section *const sect1 = map[i];
++	  struct obj_section *const sect2 = map[k];
++	  const CORE_ADDR sect1_addr = obj_section_addr (sect1);
++	  const CORE_ADDR sect2_addr = obj_section_addr (sect2);
++	  const CORE_ADDR sect1_endaddr = obj_section_endaddr (sect1);
++
++	  gdb_assert (sect1_addr <= sect2_addr);
++
++	  if (sect1_endaddr <= sect2_addr)
++	    break;
++	  else
++	    {
++	      /* We have an overlap.  Report it.  */
++
++	      struct objfile *const objf1 = sect1->objfile;
++	      struct objfile *const objf2 = sect2->objfile;
++
++	      const struct bfd *const abfd1 = objf1->obfd;
++	      const struct bfd *const abfd2 = objf2->obfd;
++
++	      const struct bfd_section *const bfds1 = sect1->the_bfd_section;
++	      const struct bfd_section *const bfds2 = sect2->the_bfd_section;
++
++	      const CORE_ADDR sect2_endaddr = obj_section_endaddr (sect2);
++
++	      struct gdbarch *const gdbarch = get_objfile_arch (objf1);
++
++	      warning (_("Unexpected overlap between "
++			 "section `%s' from `%s' [%s, %s) and "
++			 "section `%s' from `%s' [%s, %s)"),
++		       bfd_section_name (abfd1, bfds1), objf1->name,
++		       paddress (gdbarch, sect1_addr),
++		       paddress (gdbarch, sect1_endaddr),
++		       bfd_section_name (abfd2, bfds2), objf2->name,
++		       paddress (gdbarch, sect2_addr),
++		       paddress (gdbarch, sect2_endaddr));
++	    }
++	}
++      i = k;
++    }
++  return map_size;
++}
++
++
+ /* Update PMAP, PMAP_SIZE with non-TLS sections from all objfiles.  */
+ 
+ static void
+ update_section_map (struct obj_section ***pmap, int *pmap_size)
  {
-+#if 0	/* qsort_cmp ICE */
-   gdb_assert (obj_section_addr (a) == obj_section_addr (b));
-   gdb_assert ((a->objfile->separate_debug_objfile == b->objfile)
- 	      || (b->objfile->separate_debug_objfile == a->objfile));
-   gdb_assert ((a->objfile->separate_debug_objfile_backlink == b->objfile)
- 	      || (b->objfile->separate_debug_objfile_backlink == a->objfile));
-+#endif	/* qsort_cmp ICE */
- 
-   if (a->objfile->separate_debug_objfile != NULL)
-     return a;
-@@ -908,7 +914,9 @@ update_section_map (struct obj_section *
-     {
-       /* Some duplicates were eliminated.
- 	 The new size shouldn't be less than half of the original. */
-+#if 0	/* qsort_cmp ICE */
-       gdb_assert (map_size / 2 <= j);
-+#endif	/* qsort_cmp ICE */
-       map_size = j;
+-  int map_size, i, j;
++  int alloc_size, map_size, i;
+   struct obj_section *s, **map;
+   struct objfile *objfile;
+ 
+@@ -837,55 +952,27 @@ update_section_map (struct obj_section *
+   map = *pmap;
+   xfree (map);
+ 
+-#define insert_p(objf, sec) \
+-  ((bfd_get_section_flags ((objf)->obfd, (sec)->the_bfd_section) \
+-    & SEC_THREAD_LOCAL) == 0)
+-
+-  map_size = 0;
++  alloc_size = 0;
+   ALL_OBJSECTIONS (objfile, s)
+-    if (insert_p (objfile, s))
+-      map_size += 1;
++    if (insert_section_p (objfile->obfd, s->the_bfd_section))
++      alloc_size += 1;
+ 
+-  map = xmalloc (map_size * sizeof (*map));
++  map = xmalloc (alloc_size * sizeof (*map));
+ 
+   i = 0;
+   ALL_OBJSECTIONS (objfile, s)
+-    if (insert_p (objfile, s))
++    if (insert_section_p (objfile->obfd, s->the_bfd_section))
+       map[i++] = s;
+ 
+-#undef insert_p
+-
+-  qsort (map, map_size, sizeof (*map), qsort_cmp);
+-
+-  /* With separate debuginfo files, we may have up to two (almost)
+-     identical copies of some obj_sections in the map.
+-     Filter out duplicates.  */
+-  for (i = 0, j = 0; i < map_size; ++i)
+-    {
+-      struct obj_section *sect1 = map[i];
+-      struct obj_section *sect2 = (i + 1 < map_size) ? map[i + 1] : NULL;
+-
+-      if (sect2 == NULL
+-	  || obj_section_addr (sect1) != obj_section_addr (sect2))
+-	map[j++] = sect1;
+-      else
+-	{
+-	  map[j++] = preferred_obj_section (sect1, sect2);
+-	  ++i;
+-	}
+-    }
+-
+-  if (j < map_size)
+-    {
+-      /* Some duplicates were eliminated.
+-	 The new size shouldn't be less than half of the original. */
+-      gdb_assert (map_size / 2 <= j);
+-      map_size = j;
+-
+-      map = xrealloc (map, map_size * sizeof (*map));  /* Trim excess space.  */
+-    }
++  qsort (map, alloc_size, sizeof (*map), qsort_cmp);
++  map_size = filter_debuginfo_sections(map, alloc_size);
++  map_size = filter_overlapping_sections(map, map_size);
++
++  if (map_size < alloc_size)
++    /* Some sections were eliminated.  Trim excess space.  */
++    map = xrealloc (map, map_size * sizeof (*map));
+   else
+-    gdb_assert (j == map_size);
++    gdb_assert (alloc_size == map_size);
  
-       map = xrealloc (map, map_size * sizeof (*map));  /* Trim excess space.  */
+   *pmap = map;
+   *pmap_size = map_size;
 
 2009-08-25  Jan Kratochvil  <jan.kratochvil at redhat.com>
 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- gdb.spec	25 Aug 2009 13:13:04 -0000	1.379
+++ gdb.spec	28 Aug 2009 18:24:06 -0000	1.380
@@ -14,7 +14,7 @@ Version: 6.8.50.20090818
 
 # 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
@@ -363,6 +363,9 @@ Patch375: gdb-readline-6.0.patch
 # Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).
 Patch378: gdb-bz515434-qsort_cmp.patch
 
+# Revert bitfields regression (BZ 520129).
+Patch380: gdb-bz520129-drow-bitfields.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -552,6 +555,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch360 -p1
 %patch375 -p1
 %patch378 -p1
+%patch380 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -825,6 +829,10 @@ fi
 %endif
 
 %changelog
+* Fri Aug 28 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-6
+- Real upstream fixup of qsort_cmp (BZ 515434).
+- Revert bitfields regression (BZ 520129).
+
 * Tue Aug 25 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.50.20090818-5
 - Temporarily disable assertion checks crashing in qsort_cmp (BZ 515434).
 



From chitlesh at fedoraproject.org  Fri Aug 28 18:27:36 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 18:27:36 +0000 (UTC)
Subject: rpms/electronics-menu/F-10 electronics-menu-1.0-submenus.patch, 1.1,
	1.2 electronics-menu.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090828182736.9ECC811C0078@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27620/F-10

Modified Files:
	electronics-menu-1.0-submenus.patch electronics-menu.spec 
	import.log sources 
Log Message:
submenus support

electronics-menu-1.0-submenus.patch:
 electronics.menu |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

Index: electronics-menu-1.0-submenus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/electronics-menu-1.0-submenus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- electronics-menu-1.0-submenus.patch	9 Jul 2009 22:45:44 -0000	1.1
+++ electronics-menu-1.0-submenus.patch	28 Aug 2009 18:27:36 -0000	1.2
@@ -1,6 +1,6 @@
 --- electronics.menu	2007-12-07 19:25:39.000000000 +0100
 +++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
-@@ -8,5 +8,104 @@
+@@ -8,5 +8,112 @@
      <Include>
        <Category>Electronics</Category>
      </Include>
@@ -11,6 +11,7 @@
 +      <Filename>xpat.desktop</Filename>
 +      <Filename>xsch.desktop</Filename>
 +      <Filename>xvpn.desktop</Filename>
++      <Filename>xgra.desktop</Filename>
 +      <Filename>electric.desktop</Filename>
 +      <Filename>magic.desktop</Filename>
 +      <Filename>netgen.desktop</Filename>
@@ -29,6 +30,9 @@
 +      <Filename>gwave.desktop</Filename>
 +      <Filename>LabPlot.desktop</Filename>
 +      <Filename>dinotrace.desktop</Filename>
++      <Filename>GNUSim8085.desktop</Filename>
++      <Filename>gsim85.desktop</Filename>
++      <Filename>mcu8051ide.desktop</Filename>
 +    </Exclude>
 +    <Menu>
 +      <Name>Automation</Name>
@@ -38,7 +42,7 @@
 +      </Include>
 +    </Menu>
 +    <Menu>
-+      <Name>Analog/Mixed Signal Design</Name>
++      <Name>Analog Mixed-Signal Design</Name>
 +      <Directory>electronics-Analog.directory</Directory>
 +      <Include>
 +        <Category>Analog</Category>
@@ -59,8 +63,10 @@
 +        <Filename>xfsm.desktop</Filename>
 +        <Filename>xpat.desktop</Filename>
 +        <Filename>xsch.desktop</Filename>
++        <Filename>xgra.desktop</Filename>
 +        <Filename>xvpn.desktop</Filename>
 +        <Filename>tkgate.desktop</Filename>
++        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -71,6 +77,9 @@
 +        <Filename>ktechlab.desktop</Filename>
 +        <Filename>piklab.desktop</Filename>
 +        <Filename>pikloops.desktop</Filename>
++        <Filename>GNUSim8085.desktop</Filename>
++        <Filename>gsim85.desktop</Filename>
++        <Filename>mcu8051ide.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -100,7 +109,6 @@
 +        <Category>Waveform</Category>
 +        <Filename>gwave.desktop</Filename>
 +        <Filename>LabPlot.desktop</Filename>
-+        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
    </Menu>


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/electronics-menu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- electronics-menu.spec	9 Jul 2009 22:45:44 -0000	1.3
+++ electronics-menu.spec	28 Aug 2009 18:27:36 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    4%{?dist}
+Release:    6%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -40,7 +40,8 @@ sed -i 's|install|install -p|g' Makefile
 
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
-for NOVENDOR in dinotrace ; do
+for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
 sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
 done
 
@@ -69,12 +70,15 @@ touch --no-create %{_datadir}/icons/hico
 %doc COPYING README
 %{_icondir}/hicolor/??x??/categories/applications-electronics*.png
 %{_icondir}/hicolor/scalable/categories/applications-electronics*.svg
-%{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
 %{_datadir}/desktop-directories/*.directory
 
 
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
+- Improved submenus structure for F-12
+
 * Wed Jul 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-4
 - patched for submenus
 - added extra icons and directory desktop files to support the submenus feature


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Jul 2009 22:45:44 -0000	1.2
+++ import.log	28 Aug 2009 18:27:36 -0000	1.3
@@ -1,2 +1,3 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
 electronics-menu-1_0-4_fc11:F-10:electronics-menu-1.0-4.fc11.src.rpm:1247179383
+electronics-menu-1_0-6_fc11:F-10:electronics-menu-1.0-6.fc11.src.rpm:1251483901


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Jul 2009 22:45:44 -0000	1.3
+++ sources	28 Aug 2009 18:27:36 -0000	1.4
@@ -1,2 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
-ee8b7fdac3f49242772f016cb7a880c3  electronics-menu-1.0-submenu.tar.bz2
+3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2



From chitlesh at fedoraproject.org  Fri Aug 28 18:29:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 18:29:10 +0000 (UTC)
Subject: rpms/electronics-menu/F-11 electronics-menu-1.0-submenus.patch, 1.1,
	1.2 electronics-menu.spec, 1.4, 1.5 import.log, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090828182910.DEF0D11C0078@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27979/F-11

Modified Files:
	electronics-menu-1.0-submenus.patch electronics-menu.spec 
	import.log sources 
Log Message:
submenus support

electronics-menu-1.0-submenus.patch:
 electronics.menu |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

Index: electronics-menu-1.0-submenus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-11/electronics-menu-1.0-submenus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- electronics-menu-1.0-submenus.patch	9 Jul 2009 22:40:40 -0000	1.1
+++ electronics-menu-1.0-submenus.patch	28 Aug 2009 18:29:10 -0000	1.2
@@ -1,6 +1,6 @@
 --- electronics.menu	2007-12-07 19:25:39.000000000 +0100
 +++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
-@@ -8,5 +8,104 @@
+@@ -8,5 +8,112 @@
      <Include>
        <Category>Electronics</Category>
      </Include>
@@ -11,6 +11,7 @@
 +      <Filename>xpat.desktop</Filename>
 +      <Filename>xsch.desktop</Filename>
 +      <Filename>xvpn.desktop</Filename>
++      <Filename>xgra.desktop</Filename>
 +      <Filename>electric.desktop</Filename>
 +      <Filename>magic.desktop</Filename>
 +      <Filename>netgen.desktop</Filename>
@@ -29,6 +30,9 @@
 +      <Filename>gwave.desktop</Filename>
 +      <Filename>LabPlot.desktop</Filename>
 +      <Filename>dinotrace.desktop</Filename>
++      <Filename>GNUSim8085.desktop</Filename>
++      <Filename>gsim85.desktop</Filename>
++      <Filename>mcu8051ide.desktop</Filename>
 +    </Exclude>
 +    <Menu>
 +      <Name>Automation</Name>
@@ -38,7 +42,7 @@
 +      </Include>
 +    </Menu>
 +    <Menu>
-+      <Name>Analog/Mixed Signal Design</Name>
++      <Name>Analog Mixed-Signal Design</Name>
 +      <Directory>electronics-Analog.directory</Directory>
 +      <Include>
 +        <Category>Analog</Category>
@@ -59,8 +63,10 @@
 +        <Filename>xfsm.desktop</Filename>
 +        <Filename>xpat.desktop</Filename>
 +        <Filename>xsch.desktop</Filename>
++        <Filename>xgra.desktop</Filename>
 +        <Filename>xvpn.desktop</Filename>
 +        <Filename>tkgate.desktop</Filename>
++        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -71,6 +77,9 @@
 +        <Filename>ktechlab.desktop</Filename>
 +        <Filename>piklab.desktop</Filename>
 +        <Filename>pikloops.desktop</Filename>
++        <Filename>GNUSim8085.desktop</Filename>
++        <Filename>gsim85.desktop</Filename>
++        <Filename>mcu8051ide.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -100,7 +109,6 @@
 +        <Category>Waveform</Category>
 +        <Filename>gwave.desktop</Filename>
 +        <Filename>LabPlot.desktop</Filename>
-+        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
    </Menu>


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-11/electronics-menu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- electronics-menu.spec	9 Jul 2009 22:40:40 -0000	1.4
+++ electronics-menu.spec	28 Aug 2009 18:29:10 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    4%{?dist}
+Release:    6%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -40,7 +40,8 @@ sed -i 's|install|install -p|g' Makefile
 
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
-for NOVENDOR in dinotrace ; do
+for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
 sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
 done
 
@@ -69,12 +70,15 @@ touch --no-create %{_datadir}/icons/hico
 %doc COPYING README
 %{_icondir}/hicolor/??x??/categories/applications-electronics*.png
 %{_icondir}/hicolor/scalable/categories/applications-electronics*.svg
-%{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
 %{_datadir}/desktop-directories/*.directory
 
 
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
+- Improved submenus structure for F-12
+
 * Wed Jul 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-4
 - patched for submenus
 - added extra icons and directory desktop files to support the submenus feature


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Jul 2009 22:40:40 -0000	1.2
+++ import.log	28 Aug 2009 18:29:10 -0000	1.3
@@ -1,2 +1,3 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
 electronics-menu-1_0-4_fc11:F-11:electronics-menu-1.0-4.fc11.src.rpm:1247179075
+electronics-menu-1_0-6_fc11:F-11:electronics-menu-1.0-6.fc11.src.rpm:1251483984


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Jul 2009 22:40:40 -0000	1.3
+++ sources	28 Aug 2009 18:29:10 -0000	1.4
@@ -1,2 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
-ee8b7fdac3f49242772f016cb7a880c3  electronics-menu-1.0-submenu.tar.bz2
+3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2



From chitlesh at fedoraproject.org  Fri Aug 28 18:30:53 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 18:30:53 +0000 (UTC)
Subject: rpms/electronics-menu/devel electronics-menu-1.0-submenus.patch, 1.1,
	1.2 electronics-menu.spec, 1.5, 1.6 import.log, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090828183053.A1D9E11C0078@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28373/devel

Modified Files:
	electronics-menu-1.0-submenus.patch electronics-menu.spec 
	import.log sources 
Log Message:
submenus support

electronics-menu-1.0-submenus.patch:
 electronics.menu |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

Index: electronics-menu-1.0-submenus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/electronics-menu-1.0-submenus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- electronics-menu-1.0-submenus.patch	9 Jul 2009 22:37:41 -0000	1.1
+++ electronics-menu-1.0-submenus.patch	28 Aug 2009 18:30:53 -0000	1.2
@@ -1,6 +1,6 @@
 --- electronics.menu	2007-12-07 19:25:39.000000000 +0100
 +++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
-@@ -8,5 +8,104 @@
+@@ -8,5 +8,112 @@
      <Include>
        <Category>Electronics</Category>
      </Include>
@@ -11,6 +11,7 @@
 +      <Filename>xpat.desktop</Filename>
 +      <Filename>xsch.desktop</Filename>
 +      <Filename>xvpn.desktop</Filename>
++      <Filename>xgra.desktop</Filename>
 +      <Filename>electric.desktop</Filename>
 +      <Filename>magic.desktop</Filename>
 +      <Filename>netgen.desktop</Filename>
@@ -29,6 +30,9 @@
 +      <Filename>gwave.desktop</Filename>
 +      <Filename>LabPlot.desktop</Filename>
 +      <Filename>dinotrace.desktop</Filename>
++      <Filename>GNUSim8085.desktop</Filename>
++      <Filename>gsim85.desktop</Filename>
++      <Filename>mcu8051ide.desktop</Filename>
 +    </Exclude>
 +    <Menu>
 +      <Name>Automation</Name>
@@ -38,7 +42,7 @@
 +      </Include>
 +    </Menu>
 +    <Menu>
-+      <Name>Analog/Mixed Signal Design</Name>
++      <Name>Analog Mixed-Signal Design</Name>
 +      <Directory>electronics-Analog.directory</Directory>
 +      <Include>
 +        <Category>Analog</Category>
@@ -59,8 +63,10 @@
 +        <Filename>xfsm.desktop</Filename>
 +        <Filename>xpat.desktop</Filename>
 +        <Filename>xsch.desktop</Filename>
++        <Filename>xgra.desktop</Filename>
 +        <Filename>xvpn.desktop</Filename>
 +        <Filename>tkgate.desktop</Filename>
++        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -71,6 +77,9 @@
 +        <Filename>ktechlab.desktop</Filename>
 +        <Filename>piklab.desktop</Filename>
 +        <Filename>pikloops.desktop</Filename>
++        <Filename>GNUSim8085.desktop</Filename>
++        <Filename>gsim85.desktop</Filename>
++        <Filename>mcu8051ide.desktop</Filename>
 +      </Include>
 +    </Menu>
 +    <Menu>
@@ -100,7 +109,6 @@
 +        <Category>Waveform</Category>
 +        <Filename>gwave.desktop</Filename>
 +        <Filename>LabPlot.desktop</Filename>
-+        <Filename>dinotrace.desktop</Filename>
 +      </Include>
 +    </Menu>
    </Menu>


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/electronics-menu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- electronics-menu.spec	24 Jul 2009 21:58:50 -0000	1.5
+++ electronics-menu.spec	28 Aug 2009 18:30:53 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -40,7 +40,8 @@ sed -i 's|install|install -p|g' Makefile
 
 # Fedora Specific Vendor
 sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
-for NOVENDOR in dinotrace ; do
+for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
 sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
 done
 
@@ -69,14 +70,14 @@ touch --no-create %{_datadir}/icons/hico
 %doc COPYING README
 %{_icondir}/hicolor/??x??/categories/applications-electronics*.png
 %{_icondir}/hicolor/scalable/categories/applications-electronics*.svg
-%{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
 %{_datadir}/desktop-directories/*.directory
 
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
+- Improved submenus structure for F-12
 
 * Wed Jul 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-4
 - patched for submenus


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	9 Jul 2009 22:37:42 -0000	1.2
+++ import.log	28 Aug 2009 18:30:53 -0000	1.3
@@ -1,2 +1,3 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
 electronics-menu-1_0-4_fc11:HEAD:electronics-menu-1.0-4.fc11.src.rpm:1247178953
+electronics-menu-1_0-6_fc11:HEAD:electronics-menu-1.0-6.fc11.src.rpm:1251484109


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Jul 2009 22:37:42 -0000	1.3
+++ sources	28 Aug 2009 18:30:53 -0000	1.4
@@ -1,2 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
-ee8b7fdac3f49242772f016cb7a880c3  electronics-menu-1.0-submenu.tar.bz2
+3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2



From chitlesh at fedoraproject.org  Fri Aug 28 18:32:09 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Fri, 28 Aug 2009 18:32:09 +0000 (UTC)
Subject: rpms/electronics-menu/EL-5 electronics-menu-1.0-makefile.patch, NONE,
	1.1 electronics-menu-1.0-submenus.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 electronics-menu.spec, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090828183209.E1C7111C0078@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electronics-menu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28769/EL-5

Modified Files:
	.cvsignore electronics-menu.spec import.log sources 
Added Files:
	electronics-menu-1.0-makefile.patch 
	electronics-menu-1.0-submenus.patch 
Log Message:
submenus support

electronics-menu-1.0-makefile.patch:
 Makefile |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE electronics-menu-1.0-makefile.patch ---
--- Makefile	2009-07-08 20:07:35.735572739 +0200
+++ Makefile.submenus	2009-07-08 21:22:43.133572159 +0200
@@ -14,5 +14,18 @@
 	install -m 0644 -D applications-electronics-22.png $(DESTDIR)$(themedir)/22x22/categories/applications-electronics.png
 	install -m 0644 -D applications-electronics-24.png $(DESTDIR)$(themedir)/24x24/categories/applications-electronics.png
 	install -m 0644 -D applications-electronics-48.png $(DESTDIR)$(themedir)/48x48/categories/applications-electronics.png
+	pushd electronics-menu-1.0-submenu;\
+	for SUBMENU in Automation Analog Digital Embedded SchematicPCB Spice Waveform; do \
+		echo "Submenu $${SUBMENU}";\
+		install -m 0644 electronics-$${SUBMENU}.directory $(DESTDIR)/usr/share/desktop-directories;\
+		install -m 0644 -D applications-electronics-$${SUBMENU}.svg \
+			$(DESTDIR)$(themedir)/scalable/categories/applications-electronics-$${SUBMENU}.svg;\
+		for SIZE in 48 32 22 16; do\
+			install -m 0644 -D applications-electronics-$${SUBMENU}-$${SIZE}.png \
+				$(DESTDIR)$(themedir)/$${SIZE}x$${SIZE}/categories/applications-electronics-$${SUBMENU}.png;\
+		done;\
+	done;\
+	popd
+
 
 .PHONY: all clean install

electronics-menu-1.0-submenus.patch:
 electronics.menu |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

--- NEW FILE electronics-menu-1.0-submenus.patch ---
--- electronics.menu	2007-12-07 19:25:39.000000000 +0100
+++ electronics.menu.submenus	2009-07-08 22:30:00.510572856 +0200
@@ -8,5 +8,112 @@
     <Include>
       <Category>Electronics</Category>
     </Include>
+    <Exclude>
+      <Filename>dreal.desktop</Filename>
+      <Filename>graal.desktop</Filename>
+      <Filename>xfsm.desktop</Filename>
+      <Filename>xpat.desktop</Filename>
+      <Filename>xsch.desktop</Filename>
+      <Filename>xvpn.desktop</Filename>
+      <Filename>xgra.desktop</Filename>
+      <Filename>electric.desktop</Filename>
+      <Filename>magic.desktop</Filename>
+      <Filename>netgen.desktop</Filename>
+      <Filename>xcircuit.desktop</Filename>
+      <Filename>toped.desktop</Filename>
+      <Filename>tkgate.desktop</Filename>
+      <Filename>ktechlab.desktop</Filename>
+      <Filename>piklab.desktop</Filename>
+      <Filename>pikloops.desktop</Filename>
+      <Filename>geda-gattrib.desktop</Filename>
+      <Filename>gerbv.desktop</Filename>
+      <Filename>geda-gschem.desktop</Filename>
+      <Filename>pcb.desktop</Filename>
+      <Filename>kicad.desktop</Filename>
+      <Filename>gspiceui.desktop</Filename>
+      <Filename>gwave.desktop</Filename>
+      <Filename>LabPlot.desktop</Filename>
+      <Filename>dinotrace.desktop</Filename>
+      <Filename>GNUSim8085.desktop</Filename>
+      <Filename>gsim85.desktop</Filename>
+      <Filename>mcu8051ide.desktop</Filename>
+    </Exclude>
+    <Menu>
+      <Name>Automation</Name>
+      <Directory>electronics-Automation.directory</Directory>
+      <Include>
+        <Category>Automation</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Analog Mixed-Signal Design</Name>
+      <Directory>electronics-Analog.directory</Directory>
+      <Include>
+        <Category>Analog</Category>
+        <Filename>electric.desktop</Filename>
+        <Filename>magic.desktop</Filename>
+        <Filename>netgen.desktop</Filename>
+        <Filename>xcircuit.desktop</Filename>
+        <Filename>toped.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Digital IC Design</Name>
+      <Directory>electronics-Digital.directory</Directory>
+      <Include>
+        <Category>Digital</Category>
+        <Filename>dreal.desktop</Filename>
+        <Filename>graal.desktop</Filename>
+        <Filename>xfsm.desktop</Filename>
+        <Filename>xpat.desktop</Filename>
+        <Filename>xsch.desktop</Filename>
+        <Filename>xgra.desktop</Filename>
+        <Filename>xvpn.desktop</Filename>
+        <Filename>tkgate.desktop</Filename>
+        <Filename>dinotrace.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Embedded Design</Name>
+      <Directory>electronics-Embedded.directory</Directory>
+      <Include>
+        <Category>Embedded</Category>
+        <Filename>ktechlab.desktop</Filename>
+        <Filename>piklab.desktop</Filename>
+        <Filename>pikloops.desktop</Filename>
+        <Filename>GNUSim8085.desktop</Filename>
+        <Filename>gsim85.desktop</Filename>
+        <Filename>mcu8051ide.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Schematic to PCB Layout</Name>
+      <Directory>electronics-SchematicPCB.directory</Directory>
+      <Include>
+        <Category>Schematic,PCB</Category>
+        <Filename>geda-gattrib.desktop</Filename>
+        <Filename>gerbv.desktop</Filename>
+        <Filename>geda-gschem.desktop</Filename>
+        <Filename>pcb.desktop</Filename>
+        <Filename>kicad.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Spice Simulation</Name>
+      <Directory>electronics-Spice.directory</Directory>
+      <Include>
+        <Category>Spice</Category>
+        <Filename>gspiceui.desktop</Filename>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Waveform Viewers</Name>
+      <Directory>electronics-Waveform.directory</Directory>
+      <Include>
+        <Category>Waveform</Category>
+        <Filename>gwave.desktop</Filename>
+        <Filename>LabPlot.desktop</Filename>
+      </Include>
+    </Menu>
   </Menu>
 </Menu>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Feb 2008 19:10:07 -0000	1.2
+++ .cvsignore	28 Aug 2009 18:32:09 -0000	1.3
@@ -1 +1,2 @@
 electronics-menu-1.0.tar.gz
+electronics-menu-1.0-submenu.tar.bz2


Index: electronics-menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/EL-5/electronics-menu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- electronics-menu.spec	6 Jul 2008 20:27:02 -0000	1.2
+++ electronics-menu.spec	28 Aug 2009 18:32:09 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:       electronics-menu
 Version:    1.0
-Release:    2%{?dist}
+Release:    6%{?dist}
 Summary:    Electronics Menu for the Desktop
 
 License:    GPLv2
@@ -10,6 +10,11 @@ Group:      User Interface/Desktops
 
 URL:        http://geda.seul.org/
 Source0:    http://geda.seul.org/dist/%{name}-%{version}.tar.gz
+# Created by Chitlesh
+Source1:    electronics-menu-1.0-submenu.tar.bz2
+
+Patch0:     electronics-menu-1.0-submenus.patch
+Patch1:     electronics-menu-1.0-makefile.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,18 +23,29 @@ Requires(pre): gtk2
 BuildArchitectures: noarch
 
 %description
-The programs from the category Electronics are currently located
+The programs from the category Electronics are normally located
 in the Edutainment directory.
 This Package adds a Electronics menu to the xdg menu structure.
 
 %{name} is listed among Fedora Electronic Lab (FEL) packages.
 
 %prep
-%setup -q
+%setup -q -a 1
+
+%patch0 -p0 -b .submenus
+%patch1 -p0 -b .submenus
 
 # allowing timestamps
 sed -i 's|install|install -p|g' Makefile
 
+# Fedora Specific Vendor
+sed -i 's|<Filename>|<Filename>fedora-|' electronics.menu
+for NOVENDOR in dinotrace electric magic gsim85 mcu8051ide GNUSim8085 \
+                xcircuit xsch xvpn xgra dreal graal xpat xfsm toped; do
+sed -i "s|<Filename>fedora-$NOVENDOR|<Filename>$NOVENDOR|" electronics.menu
+done
+
+
 %build
 
 %install
@@ -52,14 +68,24 @@ touch --no-create %{_datadir}/icons/hico
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_icondir}/hicolor/??x??/categories/applications-electronics.png
-%{_icondir}/hicolor/scalable/categories/applications-electronics.svg
-%{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
-%{_datadir}/desktop-directories/Electronics.directory
+%{_icondir}/hicolor/??x??/categories/applications-electronics*.png
+%{_icondir}/hicolor/scalable/categories/applications-electronics*.svg
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/electronics.menu
+%{_datadir}/desktop-directories/*.directory
 
 
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-6
+- Improved submenus structure for F-12
+
+* Wed Jul 08 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-4
+- patched for submenus
+- added extra icons and directory desktop files to support the submenus feature
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jul 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0-2
 - Corrected yum install with requires(pre)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Jul 2008 20:27:02 -0000	1.1
+++ import.log	28 Aug 2009 18:32:09 -0000	1.2
@@ -1 +1,2 @@
 electronics-menu-1_0-2_fc9:HEAD:electronics-menu-1.0-2.fc9.src.rpm:1215375997
+electronics-menu-1_0-6_fc11:EL-5:electronics-menu-1.0-6.fc11.src.rpm:1251484183


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electronics-menu/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Feb 2008 19:10:07 -0000	1.2
+++ sources	28 Aug 2009 18:32:09 -0000	1.3
@@ -1 +1,2 @@
 d340b07ac342c8c39029c5d70c58bdb0  electronics-menu-1.0.tar.gz
+3521870e1a89e86f9b333478cf4e9cec  electronics-menu-1.0-submenu.tar.bz2



From rdieter at fedoraproject.org  Fri Aug 28 18:35:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 28 Aug 2009 18:35:29 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.16, 1.17
Message-ID: <20090828183529.632D111C0078@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29287

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
* 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



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kde-plasma-networkmanagement.spec	18 Aug 2009 19:06:42 -0000	1.16
+++ kde-plasma-networkmanagement.spec	28 Aug 2009 18:35:29 -0000	1.17
@@ -1,102 +1,86 @@
+
+%define disclaimer \
+This is alpha software with known issues.\
+We still recommend nm-applet from NetworkManager-gnome for production use.
+
 Name:           kde-plasma-networkmanagement
-Version:        0.1
-Release:        0.20.20090815svn%{?dist}
+# to be a higher, natural upgrade from F-10's knetworkmanager-0.7
+Version:        0.8
+Release:        0.21.20090815svn%{?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 1011744 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
 #  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Source0:        %{name}-%{version}.tar.bz2
+Source0: kde-plasma-networkmanagement-0.1.tar.bz2
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
 
-# manual dep, until something better comes along -- Rex
 Requires: NetworkManager
 
-Obsoletes: kde-plasma-networkmanagement < 0.1-20
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# multilib upgrades
+Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
 
-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: knetworkmanager = %{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 -n knetworkmanager
+Summary: NetworkManager KDE 4 integration 
+Group: Applications/Internet
+Requires: knetworkmanager-libs%{?_isa} = %{version}-%{release}
+%description -n knetworkmanager
+KNetworkManager is a system tray applet for controlling network
+connections on systems that use the NetworkManager daemon.
+%{?disclaimer}
 
-%package libs
+%package -n knetworkmanager-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: knetworkmanager = %{version}-%{release}
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
-%description libs
-%{summary}.
-
-
-%package devel
-Summary:        Files needed to develop programs which use the Network Manager plasmoid
-Group:          Development/Libraries
-Requires:       %{name}-libs%{?_isa} = %{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}
-%endif
-
-%description devel
+%description -n knetworkmanager-libs
 %{summary}.
 
-%package openvpn
-Summary:        Libraries for the Network Manager plasmoid to use OpenVPN
-Group:          User Interface/Desktops
+%package -n knetworkmanager-openvpn
+Summary:        OpenVPN support for knetworkmanager
+Group:          Applications/Internet 
 Requires:       %{name} = %{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}
-%endif
-
-%description openvpn
+Obsoletes:      kde-plasma-networkmanagement-openvpn < %{version}-%{release}
+Provides:       kde-plasma-networkmanagement-openvpn = %{version}-%{release} 
+%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 = %{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}
-%endif
-
-%description vpnc
+Obsoletes:      kde-plasma-networkmanagement-vpnc < %{version}-%{release}
+Provides:       kde-plasma-networkmanagement-vpnc = %{version}-%{release}
+%description -n knetworkmanager-vpnc
 %{summary}.
+%{?disclaimer}
 
 
 %prep
-%setup -q
+%setup -q -n kde-plasma-networkmanagement-0.1
 
 
 %build
@@ -104,23 +88,29 @@ 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}
 
 
 %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
+%post -n knetworkmanager
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%postun
+%postun -n knetworkmanager
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -128,27 +118,21 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 fi
 
-%posttrans
+%posttrans -n knetworkmanager
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 
-%post libs -p /sbin/ldconfig
+%post -n knetworkmanager-libs -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun -n knetworkmanager-libs -p /sbin/ldconfig
 
 
-
-%files
+%files -n knetworkmanager
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
 %{_kde4_libdir}/kde4/kcm_networkmanagement.so
-%{_kde4_libdir}/kde4/kded_networkmanagement.so
 %{_kde4_libdir}/kde4/networkmanagement_pptpui.so
-%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
-# Unversioned libraries
-%{_kde4_libdir}/libknm_nm.so
-%{_kde4_libdir}/libsolidcontrolfuture.so
 %{_kde4_libexecdir}/networkmanagement_configshell
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
@@ -156,40 +140,48 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement.svg
 %{_kde4_appsdir}/networkmanagement/
 %{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop
-%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 %{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.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 libs
+%files -n knetworkmanager-libs
 %defattr(-,root,root,-)
 %{_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 devel
-%defattr(-,root,root,-)
-%{_kde4_libdir}/libknmclient.so
-%{_kde4_libdir}/libknminternals.so
-%{_kde4_libdir}/libknmservice.so
-%{_kde4_libdir}/libknmui.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/kded/networkmanagement.desktop
+%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+%{_kde4_libdir}/kde4/kded_networkmanagement.so
+
 
 %changelog
+* 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



From rdieter at fedoraproject.org  Fri Aug 28 18:38:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 28 Aug 2009 18:38:05 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-11
	kde-plasma-networkmanagement.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090828183805.9AD1411C0078@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29863

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Log Message:
sync w/devel branch for newest goodness



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kde-plasma-networkmanagement.spec	4 Jun 2009 03:09:45 -0000	1.7
+++ kde-plasma-networkmanagement.spec	28 Aug 2009 18:38:05 -0000	1.8
@@ -1,86 +1,86 @@
+
+%define disclaimer \
+This is alpha software with known issues.\
+We still recommend nm-applet from NetworkManager-gnome for production use.
+
 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
+Version:        0.8
+Release:        0.21.20090815svn%{?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
+#  svn export -r 1011744 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
 #  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Source0:        %{name}-%{version}.tar.bz2
+Source0: kde-plasma-networkmanagement-0.1.tar.bz2
 
-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
 
-%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.
+# multilib upgrades
+Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
 
-%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
+Requires: knetworkmanager = %{version}-%{release}
 
-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}
-%endif
+%description
+A Plasma applet to control your wired and wireless network(s) in KDE 4 using
+the default NetworkManager service. 
+%{?disclaimer}
 
-%description devel
+%package -n knetworkmanager
+Summary: NetworkManager KDE 4 integration 
+Group: Applications/Internet
+Requires: knetworkmanager-libs%{?_isa} = %{version}-%{release}
+%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 = %{version}-%{release}
+#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%description -n knetworkmanager-libs
 %{summary}.
 
-%package openvpn
-Summary:        Libraries for the Network Manager plasmoid to use OpenVPN
-Group:          User Interface/Desktops
+%package -n knetworkmanager-openvpn
+Summary:        OpenVPN support for knetworkmanager
+Group:          Applications/Internet 
 Requires:       %{name} = %{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}
-%endif
-
-%description openvpn
+Obsoletes:      kde-plasma-networkmanagement-openvpn < %{version}-%{release}
+Provides:       kde-plasma-networkmanagement-openvpn = %{version}-%{release} 
+%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 = %{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}
-%endif
-
-%description vpnc
+Obsoletes:      kde-plasma-networkmanagement-vpnc < %{version}-%{release}
+Provides:       kde-plasma-networkmanagement-vpnc = %{version}-%{release}
+%description -n knetworkmanager-vpnc
 %{summary}.
+%{?disclaimer}
 
 
 %prep
-%setup -q
+%setup -q -n kde-plasma-networkmanagement-0.1
 
 
 %build
@@ -88,66 +88,117 @@ 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
 
+%post -n knetworkmanager-libs -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%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/kded/networkmanagement.desktop
+%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+%{_kde4_libdir}/kde4/kded_networkmanagement.so
+
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Jun 2009 03:09:45 -0000	1.7
+++ sources	28 Aug 2009 18:38:05 -0000	1.8
@@ -1 +1 @@
-f8835e99c3683a11319150f310089f97  kde-plasma-networkmanagement-0.1.tar.bz2
+8a072d778cda60990c4670d85cad2f0c  kde-plasma-networkmanagement-0.1.tar.bz2



From dwalsh at fedoraproject.org  Fri Aug 28 18:56:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 28 Aug 2009 18:56:15 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.64,
	1.65 selinux-policy.spec, 1.906, 1.907
Message-ID: <20090828185615.EF4C611C0078@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1047

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-9
- Remove polkit_auth on upgrades


policy-F12.patch:
 Makefile                                           |   22 
 Rules.modular                                      |    8 
 config/appconfig-mcs/default_contexts              |   19 
 config/appconfig-mcs/failsafe_context              |    2 
 config/appconfig-mcs/root_default_contexts         |    8 
 config/appconfig-mcs/securetty_types               |    5 
 config/appconfig-mcs/seusers                       |    4 
 config/appconfig-mcs/staff_u_default_contexts      |    4 
 config/appconfig-mcs/unconfined_u_default_contexts |    4 
 config/appconfig-mcs/user_u_default_contexts       |    5 
 config/appconfig-mcs/userhelper_context            |    2 
 config/appconfig-mcs/virtual_domain_context        |    1 
 config/appconfig-mcs/virtual_image_context         |    2 
 config/appconfig-mls/default_contexts              |   19 
 config/appconfig-mls/root_default_contexts         |   12 
 config/appconfig-mls/virtual_domain_context        |    1 
 config/appconfig-mls/virtual_image_context         |    2 
 config/appconfig-standard/securetty_types          |    5 
 man/man8/rsync_selinux.8                           |   18 
 man/man8/samba_selinux.8                           |    4 
 policy/flask/access_vectors                        |    2 
 policy/global_tunables                             |   24 
 policy/mcs                                         |   10 
 policy/modules/admin/anaconda.te                   |    3 
 policy/modules/admin/certwatch.te                  |    1 
 policy/modules/admin/dmesg.fc                      |    2 
 policy/modules/admin/dmesg.te                      |    7 
 policy/modules/admin/kismet.if                     |    1 
 policy/modules/admin/kismet.te                     |   17 
 policy/modules/admin/logrotate.te                  |   13 
 policy/modules/admin/logwatch.te                   |    1 
 policy/modules/admin/mrtg.te                       |    7 
 policy/modules/admin/portage.te                    |    2 
 policy/modules/admin/prelink.if                    |   19 
 policy/modules/admin/readahead.te                  |    3 
 policy/modules/admin/rpm.fc                        |   17 
 policy/modules/admin/rpm.if                        |  176 ++
 policy/modules/admin/rpm.te                        |   65 
 policy/modules/admin/smoltclient.fc                |    4 
 policy/modules/admin/smoltclient.if                |    1 
 policy/modules/admin/smoltclient.te                |   66 +
 policy/modules/admin/sudo.if                       |   41 
 policy/modules/admin/tmpreaper.te                  |    4 
 policy/modules/admin/usermanage.if                 |    5 
 policy/modules/admin/usermanage.te                 |   30 
 policy/modules/admin/vbetool.te                    |   14 
 policy/modules/apps/awstats.te                     |    4 
 policy/modules/apps/calamaris.te                   |    4 
 policy/modules/apps/cdrecord.te                    |    4 
 policy/modules/apps/cpufreqselector.te             |    4 
 policy/modules/apps/gitosis.fc                     |    4 
 policy/modules/apps/gitosis.if                     |   96 +
 policy/modules/apps/gitosis.te                     |   36 
 policy/modules/apps/gnome.fc                       |   12 
 policy/modules/apps/gnome.if                       |  170 ++
 policy/modules/apps/gnome.te                       |   92 +
 policy/modules/apps/gpg.if                         |    2 
 policy/modules/apps/gpg.te                         |   16 
 policy/modules/apps/java.fc                        |   17 
 policy/modules/apps/java.if                        |  111 +
 policy/modules/apps/java.te                        |   12 
 policy/modules/apps/kdumpgui.fc                    |    2 
 policy/modules/apps/kdumpgui.if                    |    2 
 policy/modules/apps/kdumpgui.te                    |   64 
 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                     |   13 
 policy/modules/apps/mozilla.te                     |   21 
 policy/modules/apps/nsplugin.fc                    |   12 
 policy/modules/apps/nsplugin.if                    |  313 ++++
 policy/modules/apps/nsplugin.te                    |  288 ++++
 policy/modules/apps/openoffice.fc                  |    3 
 policy/modules/apps/openoffice.if                  |   93 +
 policy/modules/apps/openoffice.te                  |   14 
 policy/modules/apps/ptchown.fc                     |    2 
 policy/modules/apps/ptchown.if                     |   22 
 policy/modules/apps/ptchown.te                     |   39 
 policy/modules/apps/pulseaudio.if                  |    1 
 policy/modules/apps/pulseaudio.te                  |   18 
 policy/modules/apps/qemu.fc                        |    4 
 policy/modules/apps/qemu.if                        |  270 ++--
 policy/modules/apps/qemu.te                        |   82 +
 policy/modules/apps/sambagui.fc                    |    1 
 policy/modules/apps/sambagui.if                    |    2 
 policy/modules/apps/sambagui.te                    |   55 
 policy/modules/apps/sandbox.fc                     |    1 
 policy/modules/apps/sandbox.if                     |  167 ++
 policy/modules/apps/sandbox.te                     |  302 ++++
 policy/modules/apps/screen.if                      |   24 
 policy/modules/apps/seunshare.fc                   |    2 
 policy/modules/apps/seunshare.if                   |   76 +
 policy/modules/apps/seunshare.te                   |   37 
 policy/modules/apps/vmware.fc                      |    1 
 policy/modules/apps/vmware.te                      |    1 
 policy/modules/apps/webalizer.te                   |    1 
 policy/modules/apps/wine.fc                        |   23 
 policy/modules/apps/wine.if                        |   59 
 policy/modules/apps/wine.te                        |   23 
 policy/modules/kernel/corecommands.fc              |   24 
 policy/modules/kernel/corecommands.if              |    1 
 policy/modules/kernel/corenetwork.te.in            |   29 
 policy/modules/kernel/devices.fc                   |    5 
 policy/modules/kernel/devices.if                   |  164 ++
 policy/modules/kernel/devices.te                   |   19 
 policy/modules/kernel/domain.if                    |  132 +-
 policy/modules/kernel/domain.te                    |   87 +
 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                |  173 ++
 policy/modules/kernel/filesystem.te                |    8 
 policy/modules/kernel/kernel.if                    |   39 
 policy/modules/kernel/kernel.te                    |   29 
 policy/modules/kernel/selinux.if                   |   25 
 policy/modules/kernel/storage.fc                   |    1 
 policy/modules/kernel/storage.if                   |    2 
 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                      |  124 -
 policy/modules/roles/sysadm.te                     |  124 -
 policy/modules/roles/unconfineduser.fc             |   36 
 policy/modules/roles/unconfineduser.if             |  638 +++++++++
 policy/modules/roles/unconfineduser.te             |  392 +++++
 policy/modules/roles/unprivuser.te                 |  131 --
 policy/modules/roles/xguest.te                     |   18 
 policy/modules/services/abrt.fc                    |   13 
 policy/modules/services/abrt.if                    |  126 +
 policy/modules/services/abrt.te                    |  124 +
 policy/modules/services/afs.fc                     |    1 
 policy/modules/services/afs.te                     |    1 
 policy/modules/services/amavis.te                  |    2 
 policy/modules/services/apache.fc                  |   37 
 policy/modules/services/apache.if                  |  327 +++-
 policy/modules/services/apache.te                  |  409 +++++-
 policy/modules/services/apm.te                     |    2 
 policy/modules/services/automount.te               |    1 
 policy/modules/services/bind.if                    |   40 
 policy/modules/services/bluetooth.te               |    8 
 policy/modules/services/certmaster.te              |    2 
 policy/modules/services/clamav.te                  |   12 
 policy/modules/services/consolekit.if              |   39 
 policy/modules/services/consolekit.te              |   18 
 policy/modules/services/courier.if                 |   18 
 policy/modules/services/courier.te                 |    1 
 policy/modules/services/cron.fc                    |   13 
 policy/modules/services/cron.if                    |  202 ++-
 policy/modules/services/cron.te                    |  149 +-
 policy/modules/services/cups.fc                    |   13 
 policy/modules/services/cups.te                    |   28 
 policy/modules/services/cvs.te                     |    1 
 policy/modules/services/dbus.fc                    |    5 
 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               |   50 
 policy/modules/services/dnsmasq.te                 |    8 
 policy/modules/services/dovecot.te                 |    7 
 policy/modules/services/exim.te                    |    4 
 policy/modules/services/fetchmail.te               |    2 
 policy/modules/services/fprintd.te                 |    4 
 policy/modules/services/ftp.te                     |   58 
 policy/modules/services/gnomeclock.fc              |    3 
 policy/modules/services/gnomeclock.if              |   69 +
 policy/modules/services/gnomeclock.te              |   50 
 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                     |   47 
 policy/modules/services/hddtemp.fc                 |    4 
 policy/modules/services/hddtemp.if                 |   38 
 policy/modules/services/hddtemp.te                 |   40 
 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/modemmanager.fc            |    2 
 policy/modules/services/modemmanager.if            |   43 
 policy/modules/services/modemmanager.te            |   46 
 policy/modules/services/mta.fc                     |    2 
 policy/modules/services/mta.if                     |    5 
 policy/modules/services/mta.te                     |   52 
 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          |   13 
 policy/modules/services/networkmanager.if          |   45 
 policy/modules/services/networkmanager.te          |  114 +
 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                    |   11 
 policy/modules/services/nslcd.fc                   |    4 
 policy/modules/services/nslcd.if                   |  142 ++
 policy/modules/services/nslcd.te                   |   48 
 policy/modules/services/ntp.if                     |   46 
 policy/modules/services/ntp.te                     |    7 
 policy/modules/services/nx.fc                      |    1 
 policy/modules/services/nx.if                      |   18 
 policy/modules/services/nx.te                      |    6 
 policy/modules/services/oddjob.if                  |    1 
 policy/modules/services/openvpn.te                 |   13 
 policy/modules/services/pcscd.te                   |    3 
 policy/modules/services/pegasus.te                 |   28 
 policy/modules/services/policykit.fc               |   10 
 policy/modules/services/policykit.if               |   49 
 policy/modules/services/policykit.te               |   60 
 policy/modules/services/postfix.fc                 |    2 
 policy/modules/services/postfix.if                 |  150 ++
 policy/modules/services/postfix.te                 |  136 +-
 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                     |   12 
 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/razor.fc                   |    1 
 policy/modules/services/razor.if                   |   42 
 policy/modules/services/razor.te                   |   32 
 policy/modules/services/ricci.te                   |    5 
 policy/modules/services/rpc.if                     |    6 
 policy/modules/services/rpc.te                     |   10 
 policy/modules/services/rpcbind.if                 |   20 
 policy/modules/services/rsync.te                   |   23 
 policy/modules/services/rtkit_daemon.fc            |    2 
 policy/modules/services/rtkit_daemon.if            |   63 
 policy/modules/services/rtkit_daemon.te            |   38 
 policy/modules/services/samba.fc                   |    4 
 policy/modules/services/samba.if                   |  104 +
 policy/modules/services/samba.te                   |   83 +
 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          |   84 +
 policy/modules/services/setroubleshoot.te          |   60 
 policy/modules/services/shorewall.fc               |   12 
 policy/modules/services/shorewall.if               |  166 ++
 policy/modules/services/shorewall.te               |   95 +
 policy/modules/services/smartmon.te                |   15 
 policy/modules/services/spamassassin.fc            |   14 
 policy/modules/services/spamassassin.if            |   68 +
 policy/modules/services/spamassassin.te            |  129 +
 policy/modules/services/squid.te                   |    9 
 policy/modules/services/ssh.fc                     |    2 
 policy/modules/services/ssh.if                     |  183 ++
 policy/modules/services/ssh.te                     |   70 -
 policy/modules/services/sssd.fc                    |    2 
 policy/modules/services/sssd.if                    |   43 
 policy/modules/services/sysstat.te                 |    2 
 policy/modules/services/uucp.te                    |    7 
 policy/modules/services/virt.fc                    |   11 
 policy/modules/services/virt.if                    |  131 +-
 policy/modules/services/virt.te                    |  271 +++-
 policy/modules/services/w3c.te                     |    7 
 policy/modules/services/xserver.fc                 |   29 
 policy/modules/services/xserver.if                 |  538 +++++++-
 policy/modules/services/xserver.te                 |  306 +++-
 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                 |   39 
 policy/modules/system/clock.te                     |    8 
 policy/modules/system/fstools.fc                   |    2 
 policy/modules/system/fstools.te                   |   67 -
 policy/modules/system/getty.te                     |   16 
 policy/modules/system/hostname.te                  |   22 
 policy/modules/system/init.fc                      |    6 
 policy/modules/system/init.if                      |  156 ++
 policy/modules/system/init.te                      |  268 +++-
 policy/modules/system/ipsec.fc                     |    2 
 policy/modules/system/ipsec.if                     |   25 
 policy/modules/system/ipsec.te                     |   97 +
 policy/modules/system/iptables.fc                  |   11 
 policy/modules/system/iptables.te                  |    5 
 policy/modules/system/iscsi.if                     |   40 
 policy/modules/system/iscsi.te                     |    6 
 policy/modules/system/kdump.fc                     |    8 
 policy/modules/system/kdump.if                     |  111 +
 policy/modules/system/kdump.te                     |   38 
 policy/modules/system/libraries.fc                 |  154 +-
 policy/modules/system/libraries.if                 |    4 
 policy/modules/system/libraries.te                 |   16 
 policy/modules/system/locallogin.te                |   74 -
 policy/modules/system/logging.fc                   |   11 
 policy/modules/system/logging.if                   |    4 
 policy/modules/system/logging.te                   |   34 
 policy/modules/system/lvm.te                       |   53 
 policy/modules/system/miscfiles.if                 |   19 
 policy/modules/system/modutils.te                  |  168 +-
 policy/modules/system/mount.fc                     |    7 
 policy/modules/system/mount.te                     |  124 +
 policy/modules/system/pcmcia.te                    |   19 
 policy/modules/system/raid.te                      |   27 
 policy/modules/system/selinuxutil.fc               |   17 
 policy/modules/system/selinuxutil.if               |  288 ++++
 policy/modules/system/selinuxutil.te               |  228 +--
 policy/modules/system/setrans.if                   |   20 
 policy/modules/system/sysnetwork.fc                |    9 
 policy/modules/system/sysnetwork.if                |  117 +
 policy/modules/system/sysnetwork.te                |  107 +
 policy/modules/system/udev.fc                      |    3 
 policy/modules/system/udev.if                      |   21 
 policy/modules/system/udev.te                      |   38 
 policy/modules/system/unconfined.fc                |   15 
 policy/modules/system/unconfined.if                |  446 ------
 policy/modules/system/unconfined.te                |  224 ---
 policy/modules/system/userdomain.fc                |    6 
 policy/modules/system/userdomain.if                | 1374 ++++++++++++++++-----
 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 
 support/Makefile.devel                             |    3 
 support/divert.m4                                  |    1 
 support/undivert.m4                                |    1 
 341 files changed, 14755 insertions(+), 2988 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- policy-F12.patch	26 Aug 2009 20:19:01 -0000	1.64
+++ policy-F12.patch	28 Aug 2009 18:56:15 -0000	1.65
@@ -8860,7 +8860,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.28/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/apache.fc	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/apache.fc	2009-08-28 09:13:49.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)
@@ -8923,15 +8923,17 @@ 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,30 @@
+@@ -64,11 +74,32 @@
  /var/run/apache.*			gen_context(system_u:object_r:httpd_var_run_t,s0)
  /var/run/gcache_port		-s	gen_context(system_u:object_r:httpd_var_run_t,s0)
  /var/run/httpd.*			gen_context(system_u:object_r:httpd_var_run_t,s0)
++/var/run/lighttpd(/.*)?			gen_context(system_u:object_r:httpd_var_run_t,s0)
 +/var/run/mod_.*				gen_context(system_u:object_r:httpd_var_run_t,s0)
 +/var/run/wsgi.*			-s	gen_context(system_u:object_r:httpd_var_run_t,s0)
  
  /var/spool/gosa(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
  /var/spool/squirrelmail(/.*)?		gen_context(system_u:object_r:squirrelmail_spool_t,s0)
++/var/spool/viewvc(/.*)?  		gen_context(system_u:object_r:httpd_sys_script_rw_t, s0)
  
  /var/www(/.*)?				gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/www/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
@@ -9458,7 +9460,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.28/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/apache.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/apache.te	2009-08-28 09:18:45.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -12397,7 +12399,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.28/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/hal.te	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/services/hal.te	2009-08-27 09:10:31.000000000 -0400
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -12428,18 +12430,19 @@ diff -b -B --ignore-all-space --exclude-
  files_getattr_all_mountpoints(hald_t)
  
  mls_file_read_all_levels(hald_t)
-@@ -202,8 +211,9 @@
+@@ -202,8 +211,10 @@
  seutil_read_default_contexts(hald_t)
  seutil_read_file_contexts(hald_t)
  
 -sysnet_read_config(hald_t)
  sysnet_domtrans_dhcpc(hald_t)
++sysnet_domtrans_ifconfig(hald_t)
 +sysnet_read_config(hald_t)
 +sysnet_read_dhcp_config(hald_t)
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -290,6 +300,7 @@
+@@ -290,6 +301,7 @@
  ')
  
  optional_policy(`
@@ -12447,7 +12450,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_t)
  	policykit_domtrans_resolve(hald_t)
  	policykit_read_lib(hald_t)
-@@ -321,6 +332,10 @@
+@@ -321,6 +333,10 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -12458,7 +12461,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Hal acl local policy
-@@ -341,6 +356,7 @@
+@@ -341,6 +357,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -12466,7 +12469,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -357,6 +373,8 @@
+@@ -357,6 +374,8 @@
  files_read_usr_files(hald_acl_t)
  files_read_etc_files(hald_acl_t)
  
@@ -12475,7 +12478,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
  storage_getattr_fixed_disk_dev(hald_acl_t)
-@@ -369,6 +387,7 @@
+@@ -369,6 +388,7 @@
  miscfiles_read_localization(hald_acl_t)
  
  optional_policy(`
@@ -12483,7 +12486,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(hald_acl_t)
  	policykit_read_lib(hald_acl_t)
  	policykit_read_reload(hald_acl_t)
-@@ -450,12 +469,16 @@
+@@ -450,12 +470,16 @@
  
  miscfiles_read_localization(hald_keymap_t)
  
@@ -12502,7 +12505,7 @@ diff -b -B --ignore-all-space --exclude-
  allow hald_dccm_t self:process getsched;
  allow hald_dccm_t self:tcp_socket create_stream_socket_perms;
  allow hald_dccm_t self:udp_socket create_socket_perms;
-@@ -469,10 +492,22 @@
+@@ -469,10 +493,22 @@
  manage_files_pattern(hald_dccm_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_dccm_t)
  
@@ -12525,7 +12528,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_all_recvfrom_unlabeled(hald_dccm_t)
  corenet_all_recvfrom_netlabel(hald_dccm_t)
  corenet_tcp_sendrecv_generic_if(hald_dccm_t)
-@@ -484,6 +519,7 @@
+@@ -484,6 +520,7 @@
  corenet_tcp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_generic_node(hald_dccm_t)
  corenet_udp_bind_dhcpc_port(hald_dccm_t)
@@ -12533,7 +12536,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_dccm_port(hald_dccm_t)
  
  logging_send_syslog_msg(hald_dccm_t)
-@@ -491,3 +527,7 @@
+@@ -491,3 +528,7 @@
  files_read_usr_files(hald_dccm_t)
  
  miscfiles_read_localization(hald_dccm_t)
@@ -17395,8 +17398,8 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.28/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/services/smartmon.te	2009-08-23 09:52:51.000000000 -0400
-@@ -19,6 +19,10 @@
++++ serefpolicy-3.6.28/policy/modules/services/smartmon.te	2009-08-27 15:54:54.000000000 -0400
+@@ -19,14 +19,18 @@
  type fsdaemon_tmp_t;
  files_tmp_file(fsdaemon_tmp_t)
  
@@ -17407,9 +17410,10 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Local policy
-@@ -26,7 +30,7 @@
+ #
  
- allow fsdaemon_t self:capability { setgid sys_rawio sys_admin };
+-allow fsdaemon_t self:capability { setgid sys_rawio sys_admin };
++allow fsdaemon_t self:capability { setpcap setgid sys_rawio sys_admin };
  dontaudit fsdaemon_t self:capability sys_tty_config;
 -allow fsdaemon_t self:process signal_perms;
 +allow fsdaemon_t self:process { getcap setcap signal_perms setfscreate };
@@ -17424,9 +17428,11 @@ diff -b -B --ignore-all-space --exclude-
  dev_read_sysfs(fsdaemon_t)
  dev_read_urand(fsdaemon_t)
  
-@@ -67,9 +72,11 @@
+@@ -66,10 +71,13 @@
+ fs_search_auto_mountpoints(fsdaemon_t)
  
  mls_file_read_all_levels(fsdaemon_t)
++mls_rangetrans_target(fsdaemon_t)
  
 +storage_dev_filetrans_fixed_disk(fsdaemon_t)
  storage_raw_read_fixed_disk(fsdaemon_t)
@@ -17436,7 +17442,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_dontaudit_search_ptys(fsdaemon_t)
  
-@@ -80,6 +87,8 @@
+@@ -80,6 +88,8 @@
  
  miscfiles_read_localization(fsdaemon_t)
  
@@ -17445,7 +17451,7 @@ diff -b -B --ignore-all-space --exclude-
  sysnet_dns_name_resolve(fsdaemon_t)
  
  userdom_dontaudit_use_unpriv_user_fds(fsdaemon_t)
-@@ -91,6 +100,7 @@
+@@ -91,6 +101,7 @@
  
  optional_policy(`
  	seutil_sigchld_newrole(fsdaemon_t)
@@ -22759,7 +22765,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.28/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/libraries.fc	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.28/policy/modules/system/libraries.fc	2009-08-27 09:35:29.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -22809,7 +22815,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/(.*/)?java/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
-@@ -115,27 +120,30 @@
+@@ -115,27 +120,31 @@
  
  /usr/(.*/)?nvidia/.+\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -22822,6 +22828,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib64/vlc/codec/libdmo_plugin\.so	   --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib64/vlc/codec/librealaudio_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/catalyst/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
  /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22848,7 +22855,7 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/(local/)?.*\.so(\.[^/]*)*		--	gen_context(system_u:object_r:lib_t,s0)
  /usr/(local/)?lib(64)?/wine/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -143,11 +151,8 @@
+@@ -143,11 +152,8 @@
  /usr/NX/lib/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/NX/lib/libjpeg\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -22860,7 +22867,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/drivers/nvidia_drv\.o -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -168,12 +173,12 @@
+@@ -168,12 +174,12 @@
  
  # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
@@ -22875,7 +22882,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib/maxima/[^/]+/binary-gcl/maxima	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/mozilla/plugins/libvlcplugin\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/nx/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -185,15 +190,10 @@
+@@ -185,15 +191,10 @@
  /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libglide3-v[0-9]*\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22892,7 +22899,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/lib(64)?/libHermes\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/hp2ps		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/valgrind/stage2		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -228,31 +228,17 @@
+@@ -228,31 +229,17 @@
  /usr/lib(64)?/ladspa/sc3_1427\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/sc4_1882\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/ladspa/se4_1883\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22928,7 +22935,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -268,8 +254,8 @@
+@@ -268,8 +255,8 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -22939,7 +22946,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -295,6 +281,8 @@
+@@ -295,6 +282,8 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -22948,7 +22955,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +295,91 @@
+@@ -307,10 +296,91 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -23566,8 +23573,16 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.28/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/modutils.te	2009-08-21 18:56:07.000000000 -0400
-@@ -39,59 +39,10 @@
++++ serefpolicy-3.6.28/policy/modules/system/modutils.te	2009-08-27 15:55:30.000000000 -0400
+@@ -19,6 +19,7 @@
+ type insmod_exec_t;
+ application_domain(insmod_t, insmod_exec_t)
+ mls_file_write_all_levels(insmod_t)
++mls_process_write_down(insmod_t)
+ role system_r types insmod_t;
+ 
+ # module loading config
+@@ -39,59 +40,10 @@
  
  ########################################
  #
@@ -23628,7 +23643,7 @@ diff -b -B --ignore-all-space --exclude-
  allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal };
  
  allow insmod_t self:udp_socket create_socket_perms; 
-@@ -104,6 +55,7 @@
+@@ -104,6 +56,7 @@
  
  kernel_load_module(insmod_t)
  kernel_read_system_state(insmod_t)
@@ -23636,7 +23651,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_write_proc_files(insmod_t)
  kernel_mount_debugfs(insmod_t)
  kernel_mount_kvmfs(insmod_t)
-@@ -112,9 +64,11 @@
+@@ -112,9 +65,11 @@
  kernel_read_kernel_sysctls(insmod_t)
  kernel_rw_kernel_sysctl(insmod_t)
  kernel_read_hotplug_sysctls(insmod_t)
@@ -23650,7 +23665,7 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_rw_sysfs(insmod_t)
  dev_search_usbfs(insmod_t)
-@@ -124,14 +78,17 @@
+@@ -124,14 +79,17 @@
  dev_read_sound(insmod_t)
  dev_write_sound(insmod_t)
  dev_rw_apm_bios(insmod_t)
@@ -23672,7 +23687,7 @@ diff -b -B --ignore-all-space --exclude-
  files_read_etc_runtime_files(insmod_t)
  files_read_etc_files(insmod_t)
  files_read_usr_files(insmod_t)
-@@ -140,15 +97,13 @@
+@@ -140,15 +98,13 @@
  files_dontaudit_search_pids(insmod_t)
  # for when /var is not mounted early in the boot:
  files_dontaudit_search_isid_type_dirs(insmod_t)
@@ -23690,7 +23705,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(insmod_t)
  logging_search_logs(insmod_t)
-@@ -157,19 +112,30 @@
+@@ -157,19 +113,30 @@
  
  seutil_read_file_contexts(insmod_t)
  
@@ -23724,7 +23739,7 @@ diff -b -B --ignore-all-space --exclude-
  	hotplug_search_config(insmod_t)
  ')
  
-@@ -215,6 +181,63 @@
+@@ -215,6 +182,63 @@
  	xserver_getattr_log(insmod_t)
  ')
  
@@ -23788,7 +23803,7 @@ diff -b -B --ignore-all-space --exclude-
  #################################
  #
  # update-modules local policy
-@@ -246,17 +269,8 @@
+@@ -246,17 +270,8 @@
  kernel_read_kernel_sysctls(update_modules_t)
  kernel_read_system_state(update_modules_t)
  
@@ -23806,7 +23821,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_getattr_xattr_fs(update_modules_t)
  
  term_use_console(update_modules_t)
-@@ -265,6 +279,15 @@
+@@ -265,6 +280,15 @@
  init_use_script_fds(update_modules_t)
  init_use_script_ptys(update_modules_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -p -r1.906 -r1.907
--- selinux-policy.spec	26 Aug 2009 20:19:02 -0000	1.906
+++ selinux-policy.spec	28 Aug 2009 18:56:15 -0000	1.907
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.28
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -315,7 +315,7 @@ if [ $1 -eq 1 ]; then
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run 2> /dev/null
 else
-   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit 2>/dev/null
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth -r polkit 2>/dev/null
    packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    %relabel targeted
@@ -441,6 +441,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-9
+- Remove polkit_auth on upgrades
+
 * Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-8
 - Add back in unconfined.pp and unconfineduser.pp
 - Add Sandbox unshare



From pkgdb at fedoraproject.org  Fri Aug 28 19:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 19:18:30 +0000
Subject: [pkgdb] bilbo summary updated by tibbs
Message-ID: <20090828191830.A24B510F87B@bastion2.fedora.phx.redhat.com>

tibbs set package bilbo summary to Blogging client, focused on simplicity and usability

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bilbo



From pkgdb at fedoraproject.org  Fri Aug 28 19:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 19:18:29 +0000
Subject: [pkgdb] bilbo was added for mathstuf
Message-ID: <20090828191829.667DC10F877@bastion2.fedora.phx.redhat.com>

tibbs has added Package bilbo with summary Blogging client, focused on simplicity and usability
tibbs has approved Package bilbo
tibbs has added a Fedora devel branch for bilbo with an owner of mathstuf
tibbs has approved bilbo in Fedora devel
tibbs has approved Package bilbo
tibbs has set commit to Approved for 107427 on bilbo (Fedora devel)
tibbs has set checkout to Approved for 107427 on bilbo (Fedora devel)
tibbs has set build to Approved for 107427 on bilbo (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bilbo



From pkgdb at fedoraproject.org  Fri Aug 28 19:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 19:18:30 +0000
Subject: [pkgdb] bilbo (Fedora, 11) updated by tibbs
Message-ID: <20090828191830.AFA9310F884@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for bilbo
tibbs has set commit to Approved for 107427 on bilbo (Fedora 11)
tibbs has set checkout to Approved for 107427 on bilbo (Fedora 11)
tibbs has set build to Approved for 107427 on bilbo (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bilbo



From tibbs at fedoraproject.org  Fri Aug 28 19:18:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 19:18:37 +0000 (UTC)
Subject: rpms/bilbo/devel - New directory
Message-ID: <20090828191837.3EB3811C0081@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bilbo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvseU5727/rpms/bilbo/devel

Log Message:
Directory /cvs/pkgs/rpms/bilbo/devel added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 19:18:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 19:18:37 +0000 (UTC)
Subject: rpms/bilbo - New directory
Message-ID: <20090828191837.1F33F11C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bilbo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvseU5727/rpms/bilbo

Log Message:
Directory /cvs/pkgs/rpms/bilbo added to the repository




From tibbs at fedoraproject.org  Fri Aug 28 19:18:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 19:18:42 +0000 (UTC)
Subject: rpms/bilbo Makefile,NONE,1.1
Message-ID: <20090828191842.E325911C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bilbo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvseU5727/rpms/bilbo

Added Files:
	Makefile 
Log Message:
Setup of module bilbo


--- NEW FILE Makefile ---
# Top level Makefile for module bilbo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Fri Aug 28 19:18:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 28 Aug 2009 19:18:43 +0000 (UTC)
Subject: rpms/bilbo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090828191843.2144111C0078@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bilbo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvseU5727/rpms/bilbo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bilbo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bilbo
# $Id: Makefile,v 1.1 2009/08/28 19:18:43 tibbs Exp $
NAME := bilbo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 28 19:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 19:18:30 +0000
Subject: [pkgdb] bilbo (Fedora, 11) updated by tibbs
Message-ID: <20090828191830.B8F4810F890@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for bilbo
tibbs has set commit to Approved for 107427 on bilbo (Fedora 10)
tibbs has set checkout to Approved for 107427 on bilbo (Fedora 10)
tibbs has set build to Approved for 107427 on bilbo (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bilbo



From mtasaka at fedoraproject.org  Fri Aug 28 19:32:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 28 Aug 2009 19:32:17 +0000 (UTC)
Subject: rpms/alexandria/F-11 alexandria-0.6.5-crash-in-turkish.patch, NONE, 
	1.1 alexandria.spec, 1.37, 1.38
Message-ID: <20090828193217.D5E9C11C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8213

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.5-crash-in-turkish.patch 
Log Message:
* Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
- Fix crash on startup in tr_TR.UTF-8 (bug 520170)


alexandria-0.6.5-crash-in-turkish.patch:
 icons.rb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE alexandria-0.6.5-crash-in-turkish.patch ---
Index: lib/alexandria/ui/icons.rb
===================================================================
--- lib/alexandria/ui/icons.rb	(revision 1087)
+++ lib/alexandria/ui/icons.rb	(working copy)
@@ -63,7 +63,9 @@
       def self.load_icon_images
         Dir.entries(ICONS_DIR).each do |file|
           next unless file =~ /\.png$/    # skip non '.png' files
-            name = File.basename(file, ".png").upcase
+            # Don't use upcase and use tr instead
+            # For example in Turkish the upper case of 'i' is still 'i'.
+            name = File.basename(file, ".png").tr('a-z', 'A-Z')
           const_set(name, Gdk::Pixbuf.new(File.join(ICONS_DIR, file)))
         end
       end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- alexandria.spec	27 Aug 2009 02:48:14 -0000	1.37
+++ alexandria.spec	28 Aug 2009 19:32:15 -0000	1.38
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -32,6 +32,10 @@ Patch4:		alexandria-0.6.5-search-result-
 # contain Author item
 # ref: alexandria-Bugs-27000
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
+# Alexandria crashes in tr_TR.UTF-8 on startup
+# RH bug 520170
+# Must report upstream
+Patch6:		alexandria-0.6.5-crash-in-turkish.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -85,6 +89,7 @@ Alexandria is a GNOME application to hel
 %patch3 -p0 -b .glib
 %patch4 -p0 -b .sanity
 %patch5 -p0 -b .deastore
+%patch6 -p0 -b .tr_TR
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -211,6 +216,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
+- Fix crash on startup in tr_TR.UTF-8 (bug 520170)
+
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
 - Add sanity check for invalid search result, now using upstream patch
 - Fix DeaStore provider where search result contains no Author



From rdieter at fedoraproject.org  Fri Aug 28 19:33:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 28 Aug 2009 19:33:24 +0000 (UTC)
Subject: rpms/akonadi/devel akonadi.spec,1.43,1.44
Message-ID: <20090828193324.F326611C0078@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8635

Modified Files:
	akonadi.spec 
Log Message:
* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.1
- temporarily drop mysql-related bits, to workaround broken rawhide deps



Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- akonadi.spec	25 Aug 2009 11:04:50 -0000	1.43
+++ akonadi.spec	28 Aug 2009 19:33:24 -0000	1.44
@@ -2,7 +2,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -19,8 +19,8 @@ Patch1: akonadi-1.1.1-mysql_conf.patch
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
 BuildRequires: automoc4
-BuildRequires: mysql-devel
-BuildRequires: mysql-server
+#BuildRequires: mysql-devel
+#BuildRequires: mysql-server
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
@@ -31,7 +31,7 @@ BuildRequires: soprano-devel
 # these similar to how phonon is done currently.
 Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
-Requires: mysql-server
+#Requires: mysql-server
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -119,6 +119,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.1
+- temporarily drop mysql-related bits, to workaround broken rawhide deps
+
 * Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 1.2.0-2
 - bump and rebuild, as s390x picked up an old boost library
 



From mtasaka at fedoraproject.org  Fri Aug 28 19:36:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 28 Aug 2009 19:36:20 +0000 (UTC)
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.94,1.95
Message-ID: <20090828193620.B88DB11C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9479

Modified Files:
	xscreensaver.spec 
Log Message:
patch sent upstream


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- xscreensaver.spec	27 Aug 2009 19:13:21 -0000	1.94
+++ xscreensaver.spec	28 Aug 2009 19:36:20 -0000	1.95
@@ -62,13 +62,13 @@ Patch53:         xscreensaver-5.08-new-x
 # Fix warnings for breaking strict aliasing rule
 Patch54:         xscreensaver-5.08-gcc441-aliasing.patch
 %endif
-#
-# Not sent to upstream yet, must do later
-#
 # Ubuntu bug 418419, must send to upstream later
 # Another SIGFPE when hack's window size is too small:
 Patch55:         xscreensaver-5.08-hacks-window-too-small.patch
 #
+# Not sent to upstream yet, must do later
+#
+#
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}



From peter at fedoraproject.org  Fri Aug 28 19:56:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 28 Aug 2009 19:56:06 +0000 (UTC)
Subject: rpms/sems/devel sems--openssl10.diff, NONE,
	1.1 sems--spandsp_0_0_6_fix.diff, NONE, 1.1 import.log, 1.3,
	1.4 sems.spec, 1.9, 1.10
Message-ID: <20090828195606.8EA2A11C0078@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13636/devel

Modified Files:
	import.log sems.spec 
Added Files:
	sems--openssl10.diff sems--spandsp_0_0_6_fix.diff 
Log Message:
fixed building with openssl 1.0 and spandsp 0.6

sems--openssl10.diff:
 XmlRpcSource.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE sems--openssl10.diff ---
--- apps/xmlrpc2di/xmlrpc++/src/XmlRpcSource.h~	2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/src/XmlRpcSource.h	2009-08-28 23:36:28.702111338 +0400
@@ -48,7 +48,11 @@
     bool _ssl;
     SSL_CTX* _ssl_ctx;
     SSL* _ssl_ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_METHOD* _ssl_meth;
+#else
     SSL_METHOD* _ssl_meth;
+#endif
   private:
 
     // Socket. This should really be a SOCKET (an alias for unsigned int*) on windows...

sems--spandsp_0_0_6_fix.diff:
 g722.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sems--spandsp_0_0_6_fix.diff ---
--- core/plug-in/g722/g722.c.spandsp_new	2008-07-15 22:48:07.000000000 +0400
+++ core/plug-in/g722/g722.c	2009-08-28 20:51:44.911218471 +0400
@@ -28,7 +28,7 @@
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
 
-#include "spandsp/g722.h"
+#include <spandsp.h>
 #include "../../log.h"
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	11 Jul 2009 14:38:50 -0000	1.3
+++ import.log	28 Aug 2009 19:56:05 -0000	1.4
@@ -1,3 +1,4 @@
 sems-1_1_0-5_fc10:HEAD:sems-1.1.0-5.fc10.src.rpm:1239420130
 sems-1_1_0-6_fc10:HEAD:sems-1.1.0-6.fc10.src.rpm:1240162624
 sems-1_1_1-1_fc10:HEAD:sems-1.1.1-1.fc10.src.rpm:1247323064
+sems-1_1_1-6_fc11:HEAD:sems-1.1.1-6.fc11.src.rpm:1251489238


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sems.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sems.spec	21 Aug 2009 15:47:49 -0000	1.9
+++ sems.spec	28 Aug 2009 19:56:05 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.iptel.org/sems
 # wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
 # tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
@@ -22,6 +22,10 @@ Patch5:		sems--xmlrpc++-use_fedora_cxxfl
 Patch6:		sems--makefile_defs_removal.diff
 # GCC 4.4 fixes
 Patch7:		sems--gcc44.diff
+# spandsp 0.0.6pre fixes
+Patch8:		sems--spandsp_0_0_6_fix.diff
+# openssl 1.0 patch
+Patch9:		sems--openssl10.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
 #BuildRequires:	python >= 2.3
@@ -69,7 +73,6 @@ It is used from other modules with the D
 can execute DI functions to add a server connection, or send a
 DIAMETER request.
 
-%if 0%{?with_g722}
 %package	g722
 Summary:	G.722 support for SEMS
 Group:		Applications/Communications
@@ -77,7 +80,6 @@ Requires:	%{name} = %{version}-%{release
 
 %description	g722
 This is a wrapper around the g722 codec from the spandsp library.
-%endif
 
 %package	gateway
 Summary:	ISDN gateway for SEMS
@@ -163,16 +165,18 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 %patch5 -p0 -b .cxxflags
 %patch6 -p0 -b .makefile_defs_removal
 %patch7 -p0 -b .gcc44
+%patch8 -p0 -b .spandsp_new
+%patch9 -p0 -b .openssl10
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
 iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
 mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt
 
 %build
-export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"'  -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
+export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"' -DSPANDSP_EXPOSE_INTERNAL_STRUCTURES -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
 export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
 export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3} %{!?with_g722:g722}" all \
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -456,12 +460,10 @@ fi
 %doc doc/Readme.diameter_client
 %{_libdir}/%{name}/plug-in/diameter_client.so
 
-%if 0%{?with_g722}  
 %files g722
 %defattr(-,root,root)
 %doc core/plug-in/g722/Readme.g722codec
 %{_libdir}/%{name}/plug-in/g722.so
-%endif
 
 %files gateway
 %defattr(-,root,root)
@@ -549,6 +551,9 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Fri Aug 28 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.1-6
+- g722 enabled back
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-5
 - rebuilt with new openssl
 



From mtasaka at fedoraproject.org  Fri Aug 28 19:57:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 28 Aug 2009 19:57:58 +0000 (UTC)
Subject: rpms/alexandria/F-10 alexandria-0.6.5-crash-in-turkish.patch, NONE, 
	1.1 alexandria.spec, 1.30, 1.31
Message-ID: <20090828195758.A415B11C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14089/F-10

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.5-crash-in-turkish.patch 
Log Message:
* Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
- Fix crash on startup in tr_TR.UTF-8 (bug 520170)


alexandria-0.6.5-crash-in-turkish.patch:
 icons.rb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE alexandria-0.6.5-crash-in-turkish.patch ---
Index: lib/alexandria/ui/icons.rb
===================================================================
--- lib/alexandria/ui/icons.rb	(revision 1087)
+++ lib/alexandria/ui/icons.rb	(working copy)
@@ -63,7 +63,9 @@
       def self.load_icon_images
         Dir.entries(ICONS_DIR).each do |file|
           next unless file =~ /\.png$/    # skip non '.png' files
-            name = File.basename(file, ".png").upcase
+            # Don't use upcase and use tr instead
+            # For example in Turkish the upper case of 'i' is still 'i'.
+            name = File.basename(file, ".png").tr('a-z', 'A-Z')
           const_set(name, Gdk::Pixbuf.new(File.join(ICONS_DIR, file)))
         end
       end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- alexandria.spec	27 Aug 2009 02:48:14 -0000	1.30
+++ alexandria.spec	28 Aug 2009 19:57:58 -0000	1.31
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -32,6 +32,10 @@ Patch4:		alexandria-0.6.5-search-result-
 # contain Author item
 # ref: alexandria-Bugs-27000
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
+# Alexandria crashes in tr_TR.UTF-8 on startup
+# RH bug 520170
+# Must report upstream
+Patch6:		alexandria-0.6.5-crash-in-turkish.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -85,6 +89,7 @@ Alexandria is a GNOME application to hel
 %patch3 -p0 -b .glib
 %patch4 -p0 -b .sanity
 %patch5 -p0 -b .deastore
+%patch6 -p0 -b .tr_TR
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -211,6 +216,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
+- Fix crash on startup in tr_TR.UTF-8 (bug 520170)
+
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
 - Add sanity check for invalid search result, now using upstream patch
 - Fix DeaStore provider where search result contains no Author



From mtasaka at fedoraproject.org  Fri Aug 28 19:57:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 28 Aug 2009 19:57:58 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria-0.6.5-crash-in-turkish.patch, NONE,
	1.1 alexandria.spec, 1.39, 1.40
Message-ID: <20090828195758.C845711C0078@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14089/devel

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.5-crash-in-turkish.patch 
Log Message:
* Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
- Fix crash on startup in tr_TR.UTF-8 (bug 520170)


alexandria-0.6.5-crash-in-turkish.patch:
 icons.rb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE alexandria-0.6.5-crash-in-turkish.patch ---
Index: lib/alexandria/ui/icons.rb
===================================================================
--- lib/alexandria/ui/icons.rb	(revision 1087)
+++ lib/alexandria/ui/icons.rb	(working copy)
@@ -63,7 +63,9 @@
       def self.load_icon_images
         Dir.entries(ICONS_DIR).each do |file|
           next unless file =~ /\.png$/    # skip non '.png' files
-            name = File.basename(file, ".png").upcase
+            # Don't use upcase and use tr instead
+            # For example in Turkish the upper case of 'i' is still 'i'.
+            name = File.basename(file, ".png").tr('a-z', 'A-Z')
           const_set(name, Gdk::Pixbuf.new(File.join(ICONS_DIR, file)))
         end
       end


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- alexandria.spec	27 Aug 2009 02:48:15 -0000	1.39
+++ alexandria.spec	28 Aug 2009 19:57:58 -0000	1.40
@@ -5,7 +5,7 @@
 %define		majorver	0.6.5
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -32,6 +32,10 @@ Patch4:		alexandria-0.6.5-search-result-
 # contain Author item
 # ref: alexandria-Bugs-27000
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
+# Alexandria crashes in tr_TR.UTF-8 on startup
+# RH bug 520170
+# Must report upstream
+Patch6:		alexandria-0.6.5-crash-in-turkish.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -85,6 +89,7 @@ Alexandria is a GNOME application to hel
 %patch3 -p0 -b .glib
 %patch4 -p0 -b .sanity
 %patch5 -p0 -b .deastore
+%patch6 -p0 -b .tr_TR
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -211,6 +216,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-6
+- Fix crash on startup in tr_TR.UTF-8 (bug 520170)
+
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-5
 - Add sanity check for invalid search result, now using upstream patch
 - Fix DeaStore provider where search result contains no Author



From pkgdb at fedoraproject.org  Fri Aug 28 20:03:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 20:03:01 +0000
Subject: [pkgdb] fedora-release (Fedora, 12) updated by tibbs
Message-ID: <20090828200301.EB9C410F877@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for fedora-release
tibbs has set commit to Approved for 107427 on fedora-release (Fedora 12)
tibbs has set checkout to Approved for 107427 on fedora-release (Fedora 12)
tibbs has set build to Approved for 107427 on fedora-release (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/fedora-release



From sgrubb at fedoraproject.org  Fri Aug 28 20:05:10 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 28 Aug 2009 20:05:10 +0000 (UTC)
Subject: rpms/amtu/devel amtu.spec,1.31,1.32
Message-ID: <20090828200510.F007311C0078@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/amtu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15654

Modified Files:
	amtu.spec 
Log Message:
* Fri Aug 28 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-4
- Add ExclusiveArch for platforms having memory separation tests



Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- amtu.spec	21 Aug 2009 10:19:57 -0000	1.31
+++ amtu.spec	28 Aug 2009 20:05:10 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: audit-libs-devel >= 1.1.2
 BuildRequires: automake
 Requires: chkconfig
+ExclusiveArch: i386 i686 x86_64 ppc ppc64 s390 s390x ia64
 
 %description
 Abstract Machine Test Utility (AMTU) is an administrative utility to check
@@ -56,6 +57,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Aug 28 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-4
+- Add ExclusiveArch for platforms having memory separation tests
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.8-3
 - rebuilt with new audit
 



From jkeating at fedoraproject.org  Fri Aug 28 20:06:24 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Fri, 28 Aug 2009 20:06:24 +0000 (UTC)
Subject: rpms/fedora-release/devel .cvsignore, 1.39, 1.40 fedora-release.spec,
	1.79, 1.80 sources, 1.66, 1.67
Message-ID: <20090828200624.92F0F11C0078@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16100

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
* Thu Aug 27 2009 Jesse Keating <jkeating at redhat.com> - 13-0.1
- Bump for Fedora 13's rawhide.
- Put the version at 13 from the start.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.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	28 Aug 2009 20:06:24 -0000	1.40
@@ -1 +1 @@
-fedora-release-11.91.tar.gz
+fedora-release-13.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/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	28 Aug 2009 20:06:24 -0000	1.80
@@ -1,10 +1,10 @@
 %define release_name Rawhide
-%define dist_version 12
+%define dist_version 13
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.91
-Release:	3
+Version:	13
+Release:	0.1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Aug 27 2009 Jesse Keating <jkeating at redhat.com> - 13-0.1
+- Bump for Fedora 13's rawhide.
+- Put the version at 13 from the start.
+
 * 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/devel/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	28 Aug 2009 20:06:24 -0000	1.67
@@ -1 +1 @@
-17a262094ce6d62da6ea6fdde61a84db  fedora-release-11.91.tar.gz
+e0bf3f7d4b2f61e18bcc998c03cf353f  fedora-release-13.tar.gz



From than at fedoraproject.org  Fri Aug 28 20:06:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 20:06:53 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore, 1.8,
	1.9 oxygen-icon-theme.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20090828200653.4FA5511C0078@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-serv16258

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 Jul 2009 11:22:21 -0000	1.8
+++ .cvsignore	28 Aug 2009 20:06:53 -0000	1.9
@@ -3,3 +3,4 @@ oxygen-icons-4.2.95.tar.bz2
 oxygen-icons-4.2.96.tar.bz2
 oxygen-icons-4.2.98.tar.bz2
 oxygen-icons-4.3.0.tar.bz2
+oxygen-icons-4.3.1.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/oxygen-icon-theme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- oxygen-icon-theme.spec	30 Jul 2009 11:22:21 -0000	1.8
+++ oxygen-icon-theme.spec	28 Aug 2009 20:06:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.0
+Version:       4.3.1
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 Jul 2009 11:22:21 -0000	1.8
+++ sources	28 Aug 2009 20:06:53 -0000	1.9
@@ -1 +1 @@
-26b63e75f9f198f91a022e5f198119bb  oxygen-icons-4.3.0.tar.bz2
+bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2



From sgrubb at fedoraproject.org  Fri Aug 28 20:12:02 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 28 Aug 2009 20:12:02 +0000 (UTC)
Subject: rpms/amtu/F-11 amtu.spec,1.26,1.27
Message-ID: <20090828201202.211B511C0078@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/amtu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17209

Modified Files:
	amtu.spec 
Log Message:
* Fri Aug 28 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-2
- Add ExclusiveArch for platforms having memory separation tests



Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/F-11/amtu.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- amtu.spec	21 Aug 2009 21:52:47 -0000	1.26
+++ amtu.spec	28 Aug 2009 20:12:01 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: audit-libs-devel >= 1.1.2
 BuildRequires: automake
 Requires: chkconfig
+ExclusiveArch: i386 i686 x86_64 ppc ppc64 s390 s390x ia64
 
 %description
 Abstract Machine Test Utility (AMTU) is an administrative utility to check
@@ -56,6 +57,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Aug 28 2009 Steve Grubb <sgrubb at redhat.com> - 1.0.8-2
+- Add ExclusiveArch for platforms having memory separation tests
+
 * Fri Aug 21 2009 Steve Grubb <sgrubb at redhat.com> 1.0.8-1
 - new upstream version
 - Add init script for bootup system check



From than at fedoraproject.org  Fri Aug 28 20:16:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 20:16:16 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel sources,1.46,1.47
Message-ID: <20090828201616.8743E11C0081@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034

Modified Files:
	sources 
Log Message:
respin



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	28 Aug 2009 13:03:23 -0000	1.46
+++ sources	28 Aug 2009 20:16:16 -0000	1.47
@@ -1 +1 @@
-48e3674ddd75e63a9a2f405160d02d06  kdebase-workspace-4.3.1.tar.bz2
+cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2



From overholt at fedoraproject.org  Fri Aug 28 20:31:03 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 28 Aug 2009 20:31:03 +0000 (UTC)
Subject: rpms/itext/devel itext-2.1.7-fixpomforbc.patch, NONE,
	1.1 itext-xmloutput.patch, NONE, 1.1 itext.spec, 1.22, 1.23
Message-ID: <20090828203103.4B32011C0078@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/itext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22992

Modified Files:
	itext.spec 
Added Files:
	itext-2.1.7-fixpomforbc.patch itext-xmloutput.patch 
Log Message:
* 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

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>

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/devel/itext.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- itext.spec	27 Aug 2009 15:46:26 -0000	1.22
+++ itext.spec	28 Aug 2009 20:31:01 -0000	1.23
@@ -4,13 +4,30 @@
 Summary:          A Free Java-PDF library
 Name:             itext
 Version:          2.1.7
-Release:          3%{?dist}
+Release:          4%{?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
 Source2:          http://repo2.maven.org/maven2/com/lowagie/itext/%{version}/itext-%{version}.pom
 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.
+# -- 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:    dom4j
@@ -40,7 +57,7 @@ iText is a library that allows you to ge
 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 javadoc
@@ -55,6 +72,9 @@ API documentation for the %{alternate_na
 %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 {} \;
@@ -107,7 +127,7 @@ cp -pr build/docs/* $RPM_BUILD_ROOT%{_ja
 
 # Install the pom
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-cp -pr %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-itext.pom
+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
 
@@ -117,7 +137,7 @@ 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
@@ -126,7 +146,7 @@ if [ -x %{_bindir}/rebuild-gcj-db ] 
 %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
@@ -151,6 +171,11 @@ if [ -x %{_bindir}/rebuild-gcj-db ] 
 # -----------------------------------------------------------------------------
 
 %changelog
+* 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
 



From overholt at fedoraproject.org  Fri Aug 28 20:32:29 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 28 Aug 2009 20:32:29 +0000 (UTC)
Subject: rpms/itext/devel itext.spec,1.23,1.24
Message-ID: <20090828203229.A909E11C0078@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/itext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24338

Modified Files:
	itext.spec 
Log Message:
Add links to iText and Doxia upstream bugs


Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/devel/itext.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- itext.spec	28 Aug 2009 20:31:01 -0000	1.23
+++ itext.spec	28 Aug 2009 20:32:29 -0000	1.24
@@ -21,7 +21,17 @@ Patch2:           itext-2.1.7-fixpomforb
 # 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]



From emaldonado at fedoraproject.org  Fri Aug 28 20:34:10 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 20:34:10 +0000 (UTC)
Subject: rpms/nss/devel nss.pc.in,1.7,1.8
Message-ID: <20090828203410.63AF111C0078@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25843

Modified Files:
	nss.pc.in 
Log Message:
Temporary hack to unblock the builds - bug 520162


Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nss.pc.in	26 Aug 2009 16:32:51 -0000	1.7
+++ nss.pc.in	28 Aug 2009 20:34:09 -0000	1.8
@@ -6,6 +6,7 @@ includedir=%includedir%
 Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%, nss-softokn >= %SOFTOKEN_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+# nss-util >= %NSSUTIL_VERSION%, nss-softokn >= %SOFTOKEN_VERSION%
 Libs: -lssl3 -lsmime3 -lnss3
 Cflags: -I${includedir}



From emaldonado at fedoraproject.org  Fri Aug 28 20:37:02 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 20:37:02 +0000 (UTC)
Subject: rpms/nss/devel nss-prelink.conf,1.2,NONE
Message-ID: <20090828203702.A050811C0078@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28433

Removed Files:
	nss-prelink.conf 
Log Message:
prelink config file no longer needed as signed files are now in nss-softoken


--- nss-prelink.conf DELETED ---



From emaldonado at fedoraproject.org  Fri Aug 28 20:39:05 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 20:39:05 +0000 (UTC)
Subject: rpms/nss/devel nss.pc.in,1.8,1.9
Message-ID: <20090828203905.2AA3A11C0078@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29309

Modified Files:
	nss.pc.in 
Log Message:
Temporary hack now complete - bug 520162


Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nss.pc.in	28 Aug 2009 20:34:09 -0000	1.8
+++ nss.pc.in	28 Aug 2009 20:39:04 -0000	1.9
@@ -9,4 +9,4 @@ Version: %NSS_VERSION%
 Requires: nspr >= %NSPR_VERSION%
 # nss-util >= %NSSUTIL_VERSION%, nss-softokn >= %SOFTOKEN_VERSION%
 Libs: -lssl3 -lsmime3 -lnss3
-Cflags: -I${includedir}
+Cflags: -I${includedir} -L${libdir}



From dcbw at fedoraproject.org  Fri Aug 28 20:39:19 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 28 Aug 2009 20:39:19 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.27,
	1.28 NetworkManager-vpnc.spec, 1.54, 1.55 sources, 1.33, 1.34
Message-ID: <20090828203919.E526B11C0078@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29398

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.996-1
- Rebuild for updated NetworkManager
- Allow missing description in imported .pcf files
- Allow the 'Vendor' config option




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	5 Mar 2009 11:09:19 -0000	1.27
+++ .cvsignore	28 Aug 2009 20:39:19 -0000	1.28
@@ -23,3 +23,4 @@ NetworkManager-vpnc-0.7.0.svn4326.tar.gz
 NetworkManager-vpnc-0.7.0.svn13.tar.gz
 NetworkManager-vpnc-0.7.0.97.tar.gz
 NetworkManager-vpnc-0.7.0.99.tar.gz
+NetworkManager-vpnc-0.7.996.git20090828.tar.bz2


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- NetworkManager-vpnc.spec	27 Jul 2009 14:37:46 -0000	1.54
+++ NetworkManager-vpnc.spec	28 Aug 2009 20:39:19 -0000	1.55
@@ -1,20 +1,20 @@
-%define nm_version          1:0.7.0.99-1
+%define nm_version          1:0.7.0.996-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
-%define vpnc_version        0.4
+%define vpnc_version        0.5
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot %{nil}
+%define git_snapshot .git20090828
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.7.0.99
-Release:   3%{svn_snapshot}%{?dist}
+Version:   0.7.996
+Release:   1%{git_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
-Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
+Source:    %{name}-%{version}%{git_snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -97,6 +97,11 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.996-1
+- Rebuild for updated NetworkManager
+- Allow missing description in imported .pcf files
+- Allow the 'Vendor' config option
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.7.0.99-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	5 Mar 2009 11:09:20 -0000	1.33
+++ sources	28 Aug 2009 20:39:19 -0000	1.34
@@ -1 +1 @@
-70c57da49eaa10baad6dc765d2ffed1c  NetworkManager-vpnc-0.7.0.99.tar.gz
+308cca3f227652fd4116674fdf5ead0d  NetworkManager-vpnc-0.7.996.git20090828.tar.bz2



From jwilson at fedoraproject.org  Fri Aug 28 20:41:44 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri, 28 Aug 2009 20:41:44 +0000 (UTC)
Subject: rpms/dmidecode/devel dmidecode-smbios-2.6.1-updates.patch, NONE,
	1.1 dmidecode.spec, 1.38, 1.39 dmidecode-pcie-v2-id.patch, 1.1,
	NONE dmidecode-smbios-2.6.1-additions.patch, 1.1, NONE
Message-ID: <20090828204144.32D5611C0081@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30173

Modified Files:
	dmidecode.spec 
Added Files:
	dmidecode-smbios-2.6.1-updates.patch 
Removed Files:
	dmidecode-pcie-v2-id.patch 
	dmidecode-smbios-2.6.1-additions.patch 
Log Message:
* Fri Aug 28 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.39
- Fix cache associativity mapping (was missing some commas)


dmidecode-smbios-2.6.1-updates.patch:
 dmidecode.c |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

--- NEW FILE dmidecode-smbios-2.6.1-updates.patch ---
dmidecode: additions from smbios 2.6.1 spec update

Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots
and DDR3 memory, no longer returns any <OUT OF SPEC> info.

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 dmidecode.c |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c
--- dmidecode-2.10.orig/dmidecode.c	2009-08-27 09:20:45.933991764 -0400
+++ dmidecode-2.10/dmidecode.c	2009-08-27 09:21:15.516869134 -0400
@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
 
 static const char *dmi_system_wake_up_type(u8 code)
 {
-	/* 3.3.2.1 */
+	/* 3.3.2.2 */
 	static const char *type[] = {
 		"Reserved", /* 0x00 */
 		"Other",
@@ -719,6 +719,12 @@ static const char *dmi_processor_family(
 		{ 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */
 		{ 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */
 
+		{ 0xAB, "Dual-Core Xeon 5200" },
+		{ 0xAC, "Dual-Core Xeon 7200" },
+		{ 0xAD, "Quad-Core Xeon 7300" },
+		{ 0xAE, "Quad-Core Xeon 7400" },
+		{ 0xAF, "Multi-Core Xeon 7400" },
+
 		{ 0xB0, "Pentium III Xeon" },
 		{ 0xB1, "Pentium III Speedstep" },
 		{ 0xB2, "Pentium 4" },
@@ -741,6 +747,8 @@ static const char *dmi_processor_family(
 		{ 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */
 		{ 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */
 		{ 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */
+		{ 0xC6, "Core i7" },
+		{ 0xC7, "Dual-Core Celeron" },
 
 		{ 0xC8, "IBM390" },
 		{ 0xC9, "G4" },
@@ -753,6 +761,17 @@ static const char *dmi_processor_family(
 		{ 0xD4, "C7" },
 		{ 0xD5, "Eden" },
 
+		{ 0xD6, "Multi-Core Xeon" },
+		{ 0xD7, "Dual-Core Xeon 3xxx" },
+		{ 0xD8, "Quad-Core Xeon 3xxx" },
+
+		{ 0xDA, "Dual-Core Xeon 5xxx" },
+		{ 0xDB, "Quad-Core Xeon 5xxx" },
+
+		{ 0xDD, "Dual-Core Xeon 7xxx" },
+		{ 0xDD, "Quad-Core Xeon 7xxx" },
+		{ 0xDD, "Multi-Core Xeon 7xxx" },
+
 		{ 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */
 		{ 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */
 		{ 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */
@@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi
 		"4-way Set-associative",
 		"Fully Associative",
 		"8-way Set-associative",
-		"16-way Set-associative" /* 0x08 */
+		"16-way Set-associative",
+		"12-way Set-associative",
+		"24-way Set-associative",
+		"32-way Set-associative",
+		"48-way Set-associative",
+		"64-way Set-associative" /* 0x0D */
 	};
 
-	if (code >= 0x01 && code <= 0x08)
+	if (code >= 0x01 && code <= 0x0D)
 		return type[code - 0x01];
 	return out_of_spec;
 }
@@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code
 		"PCI Express x2",
 		"PCI Express x4",
 		"PCI Express x8",
-		"PCI Express x16" /* 0xAA */
+		"PCI Express x16", /* 0xAA */
+		"PCI Express Gen 2",
+		"PCI Express Gen 2 x1",
+		"PCI Express Gen 2 x2",
+		"PCI Express Gen 2 x4",
+		"PCI Express Gen 2 x8",
+		"PCI Express Gen 2 x16", /* 0xB0 */
 	};
 
 	if (code >= 0x01 && code <= 0x13)
 		return type[code - 0x01];
-	if (code >= 0xA0 && code <= 0xAA)
+	if (code >= 0xA0 && code <= 0xB0)
 		return type_0xA0[code - 0xA0];
 	return out_of_spec;
 }
@@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ
 		"RDRAM",
 		"DDR",
 		"DDR2",
-		"DDR2 FB-DIMM" /* 0x14 */
+		"DDR2 FB-DIMM",
+		"Reserved",
+		"Reserved",
+		"Reserved",
+		"DDR3",
+		"FBD2", /* 0x19 */
 	};
 
-	if (code >= 0x01 && code <= 0x14)
+	if (code >= 0x01 && code <= 0x19)
 		return type[code - 0x01];
 	return out_of_spec;
 }


Index: dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- dmidecode.spec	24 Aug 2009 21:33:36 -0000	1.38
+++ dmidecode.spec	28 Aug 2009 20:41:44 -0000	1.39
@@ -10,8 +10,7 @@ Patch0:         dmidecode-add-hewlett-pa
 Patch1:         dmidecode-recognize-more-memory.patch
 Patch2:         dmidecode-add-socket-lga1366.patch
 Patch3:         dmidecode-warn-on-unsupported-smbios-version.patch
-Patch4:         dmidecode-pcie-v2-id.patch
-Patch5:         dmidecode-smbios-2.6.1-additions.patch
+Patch4:         dmidecode-smbios-2.6.1-updates.patch
 URL:		http://www.nongnu.org/dmidecode/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: 	/usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
@@ -36,7 +35,6 @@ I/O ports (e.g. serial, parallel, USB).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -60,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Fri Aug 28 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.39
+- Fix cache associativity mapping (was missing some commas)
+
 * Mon Aug 24 2009 Jarod Wilson <jarod at redhat.com> - 1:2.10-1.38
 - Add support for newer sockets, processors and pcie slot types
 


--- dmidecode-pcie-v2-id.patch DELETED ---


--- dmidecode-smbios-2.6.1-additions.patch DELETED ---



From emaldonado at fedoraproject.org  Fri Aug 28 20:44:12 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 28 Aug 2009 20:44:12 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.103,1.104
Message-ID: <20090828204412.96B2A11C0078@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30910

Modified Files:
	nss.spec 
Log Message:
Build with temprary nss.pc.in hack to unblock others, removed obsolete nss-prelink.conf


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- nss.spec	28 Aug 2009 14:26:58 -0000	1.103
+++ nss.spec	28 Aug 2009 20:44:12 -0000	1.104
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          24%{?dist}
+Release:          25%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -35,7 +35,6 @@ Source2:          nss-config.in
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-Source8:          nss-prelink.conf
 Source12:         %{name}-pem-20090622.tar.bz2
 Source13:         PayPalEE.cert
 Source14:         PayPalICA.cert
@@ -440,6 +439,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Fri Aug 28 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-25
+- Remove nss-prelink.conf as signed all shared libraries moved to nss-softokn
+- Add a temprary hack to nss.pc.in to unblock builds
+
 * Fri Aug 28 2009 Warren Togami <wtogami at redhat.com> - 3.12.3.99.3-24
 - caolan's nss.pc patch
 



From than at fedoraproject.org  Fri Aug 28 20:46:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 20:46:33 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.27, 1.28 kde-l10n.spec, 1.90,
	1.91 sources, 1.30, 1.31
Message-ID: <20090828204633.3AED811C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31474

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Jul 2009 11:48:33 -0000	1.27
+++ .cvsignore	28 Aug 2009 20:46:32 -0000	1.28
@@ -278,3 +278,59 @@ 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


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kde-l10n.spec	1 Aug 2009 18:02:56 -0000	1.90
+++ kde-l10n.spec	28 Aug 2009 20:46:32 -0000	1.91
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.0
+Version: 4.3.1
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -1498,6 +1498,9 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
+- 4.3.1
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	30 Jul 2009 11:48:33 -0000	1.30
+++ sources	28 Aug 2009 20:46:32 -0000	1.31
@@ -1,56 +1,56 @@
-97be5e3b2f06b86dcd2a3bdc4a9db55c  kde-l10n-ar-4.3.0.tar.bz2
-fb0a71d21cf32e48a28916d365b4cd96  kde-l10n-bg-4.3.0.tar.bz2
-26164201b1d8b6c922385353f2a7aefb  kde-l10n-bn_IN-4.3.0.tar.bz2
-1f9e2f387083be475ec995c0e965b1cf  kde-l10n-ca-4.3.0.tar.bz2
-f19c3a3bfae24f4caf98a40f6bed7463  kde-l10n-csb-4.3.0.tar.bz2
-8d8ec27742416e134b2990abbd9af14b  kde-l10n-cs-4.3.0.tar.bz2
-b81c512af946a1e365c2eada3d82e4e0  kde-l10n-da-4.3.0.tar.bz2
-c7ca5df8998b4ae0977bc706db86d89f  kde-l10n-de-4.3.0.tar.bz2
-24b9e6117c254a7eb42bb7ac3ee5956e  kde-l10n-el-4.3.0.tar.bz2
-1596bbb2848517bba0cf50854de47e89  kde-l10n-en_GB-4.3.0.tar.bz2
-34dc196b2395e3a3223346cf2dafde5a  kde-l10n-es-4.3.0.tar.bz2
-aeb0683e93853f67c50ba2fcd1e4a41c  kde-l10n-et-4.3.0.tar.bz2
-f513bfa2c570f733bb36279b06d96136  kde-l10n-eu-4.3.0.tar.bz2
-dc151141386e6e1af9dc2b405dd8a9d9  kde-l10n-fi-4.3.0.tar.bz2
-faa1b6b4d9640c9a45f0e86a5af64091  kde-l10n-fr-4.3.0.tar.bz2
-145deb5a130537b5abd8c75c316f88a5  kde-l10n-ga-4.3.0.tar.bz2
-fde9f9726edf1ba1a32302ea285a1bf5  kde-l10n-gl-4.3.0.tar.bz2
-fdda752dc37f1957662c8c8eb5fb581c  kde-l10n-gu-4.3.0.tar.bz2
-f6ca255a2759ac90a1dbef609d0f173e  kde-l10n-he-4.3.0.tar.bz2
-ad1bd358a3bf4a515e95607edfdde4c9  kde-l10n-hi-4.3.0.tar.bz2
-ba442f81bc3ed72710e5ea1c44c2949d  kde-l10n-hu-4.3.0.tar.bz2
-40e82eea13e31644bf3982ab56595d18  kde-l10n-is-4.3.0.tar.bz2
-7974d9d51286c0bbe3ce9201cea05372  kde-l10n-it-4.3.0.tar.bz2
-e0bc5aecab2dab8a32a7a379c3bda98c  kde-l10n-ja-4.3.0.tar.bz2
-c007430e5839c943c27d2c08a3271c01  kde-l10n-kk-4.3.0.tar.bz2
-4cde7eb586388fb3268aecc901c2f297  kde-l10n-km-4.3.0.tar.bz2
-e08b0161309fc03c0178a357f45c38e0  kde-l10n-kn-4.3.0.tar.bz2
-9a10bf30852acd34040c6fa8fcf1bc27  kde-l10n-ko-4.3.0.tar.bz2
-80dbde92c9cc2a3b18ddc8f8e6bf6228  kde-l10n-ku-4.3.0.tar.bz2
-0f7d011ce2e22f92e7e814445cf6ff97  kde-l10n-lt-4.3.0.tar.bz2
-e097c2d2be217ae29cb769504356281c  kde-l10n-lv-4.3.0.tar.bz2
-2eda87bfb1490736fc0bd245177b015e  kde-l10n-mai-4.3.0.tar.bz2
-853109465d2dc4031f0cd729775cca55  kde-l10n-mk-4.3.0.tar.bz2
-953f5f1d4cbb785cc4d8ef4a488c6661  kde-l10n-ml-4.3.0.tar.bz2
-c8d80300e921f31eca1ab8ea1de85ceb  kde-l10n-mr-4.3.0.tar.bz2
-cfe753a7bebfda9f5f6f25399d8dad0c  kde-l10n-nb-4.3.0.tar.bz2
-b7b453507e58788503835fec4eddd5a9  kde-l10n-nds-4.3.0.tar.bz2
-9118bfb78b280b0228f4f299420f98ea  kde-l10n-nl-4.3.0.tar.bz2
-f6863912c5d4d326097e1f995299dbc1  kde-l10n-nn-4.3.0.tar.bz2
-a533709989a31c15600ddf9a3e3a7301  kde-l10n-pa-4.3.0.tar.bz2
-25fb4028a7bb2000b06363e23efec62d  kde-l10n-pl-4.3.0.tar.bz2
-0020f01a730b5511712a89e13a1d4d76  kde-l10n-pt_BR-4.3.0.tar.bz2
-257a995ca6c0adaab8024445dbce848f  kde-l10n-pt-4.3.0.tar.bz2
-f29614843f53950f87efe76fdb05d3d1  kde-l10n-ro-4.3.0.tar.bz2
-5bc404cea173009d5a817685ca61bcad  kde-l10n-ru-4.3.0.tar.bz2
-24945e807ad3703f546a7f6787cb0345  kde-l10n-sk-4.3.0.tar.bz2
-02117baab6317032245d6ae9f958eb45  kde-l10n-sl-4.3.0.tar.bz2
-26338c314a2a3da58f93e8f606b185c2  kde-l10n-sr-4.3.0.tar.bz2
-7499b0fb6ddbb10c2f2e0fb0e88cb097  kde-l10n-sv-4.3.0.tar.bz2
-539ee71a082043ba788bf6c18a75d7d2  kde-l10n-tg-4.3.0.tar.bz2
-2c5dd52012d3e21eaefde4211bee2d1c  kde-l10n-th-4.3.0.tar.bz2
-0d163e01436737a8f4b74d99527997a2  kde-l10n-tr-4.3.0.tar.bz2
-43be454febc2f9ca48b66fd5ce057898  kde-l10n-uk-4.3.0.tar.bz2
-76bc9dbac978806a7cd73a53fdbe8b69  kde-l10n-wa-4.3.0.tar.bz2
-7d0ddb25d6f6e21858b7811bfbd61458  kde-l10n-zh_CN-4.3.0.tar.bz2
-ce2a8abf6d8a43a4823ba2e19ad05649  kde-l10n-zh_TW-4.3.0.tar.bz2
+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
+3b1444fb608909940f6010e076e718c9  kde-l10n-pl-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



From dwalsh at fedoraproject.org  Fri Aug 28 20:55:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 28 Aug 2009 20:55:16 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.182, 1.183 nsadiff, 1.19,
	1.20 policy-F12.patch, 1.65, 1.66 selinux-policy.spec, 1.907,
	1.908 sources, 1.201, 1.202
Message-ID: <20090828205516.F12B911C0078@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1480

Modified Files:
	.cvsignore nsadiff policy-F12.patch selinux-policy.spec 
	sources 
Log Message:
* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- .cvsignore	20 Aug 2009 17:48:51 -0000	1.182
+++ .cvsignore	28 Aug 2009 20:55:15 -0000	1.183
@@ -185,3 +185,5 @@ serefpolicy-3.6.26.tgz
 serefpolicy-3.6.27.tgz
 serefpolicy-3.6.28.tgz
 setroubleshoot-2.2.21.tar.gz
+config.tgz
+serefpolicy-3.6.29.tgz


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nsadiff	18 Aug 2009 22:29:11 -0000	1.19
+++ nsadiff	28 Aug 2009 20:55:15 -0000	1.20
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.28 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.29 > /tmp/diff

policy-F12.patch:
 Rules.modular                             |    8 
 man/man8/rsync_selinux.8                  |   18 
 man/man8/samba_selinux.8                  |    4 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.if            |    1 
 policy/modules/admin/kismet.te            |   17 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  176 +++
 policy/modules/admin/rpm.te               |   65 +
 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         |    4 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   92 +-
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   64 +
 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            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  288 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 ++
 policy/modules/apps/openoffice.te         |   14 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 
 policy/modules/apps/ptchown.te            |   39 
 policy/modules/apps/pulseaudio.if         |    1 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  270 ++++-
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   55 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  302 ++++++
 policy/modules/apps/screen.if             |   24 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    1 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   23 
 policy/modules/kernel/corecommands.fc     |   24 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   87 +
 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       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 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             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  124 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  327 ++++---
 policy/modules/services/apache.te         |  409 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 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      |   50 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 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            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 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/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 +
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 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 |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 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           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 -
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   60 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 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            |   12 
 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/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   10 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   83 +
 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 |   84 +
 policy/modules/services/setroubleshoot.te |   60 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  131 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   29 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  307 +++++-
 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        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  154 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1373 +++++++++++++++++++++++-------
 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 
 support/Makefile.devel                    |    3 
 support/divert.m4                         |    1 
 support/undivert.m4                       |    1 
 323 files changed, 14664 insertions(+), 2980 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.65 -r 1.66 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- policy-F12.patch	28 Aug 2009 18:56:15 -0000	1.65
+++ policy-F12.patch	28 Aug 2009 20:55:15 -0000	1.66
@@ -1,300 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.28/config/appconfig-mcs/default_contexts
---- nsaserefpolicy/config/appconfig-mcs/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,15 +1,6 @@
--system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
--system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
--system_r:remote_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
--system_r:sshd_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
-+system_r:crond_t:s0		system_r:system_cronjob_t:s0
-+system_r:local_login_t:s0	user_r:user_t:s0
-+system_r:remote_login_t:s0	user_r:user_t:s0
-+system_r:sshd_t:s0		user_r:user_t:s0
- system_r:sulogin_t:s0		sysadm_r:sysadm_t:s0
--system_r:xdm_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
--
--staff_r:staff_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--staff_r:staff_sudo_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
--
--sysadm_r:sysadm_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
--
--user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
-+system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context
---- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/failsafe_context	2009-08-21 18:56:06.000000000 -0400
-@@ -1 +1 @@
--sysadm_r:sysadm_t:s0
-+system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/root_default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,11 +1,7 @@
--system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
-+system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
- system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
- 
--staff_r:staff_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
--sysadm_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
--user_r:user_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
--
- #
- # Uncomment if you want to automatically login as sysadm_r
- #
--#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-+system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/securetty_types serefpolicy-3.6.28/config/appconfig-mcs/securetty_types
---- nsaserefpolicy/config/appconfig-mcs/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/securetty_types	2009-08-21 18:56:06.000000000 -0400
-@@ -1 +1,6 @@
-+auditadm_tty_device_t
-+secadm_tty_device_t
-+staff_tty_device_t
-+sysadm_tty_device_t
-+unconfined_tty_device_t
- user_tty_device_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.28/config/appconfig-mcs/seusers
---- nsaserefpolicy/config/appconfig-mcs/seusers	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/seusers	2009-08-21 18:56:06.000000000 -0400
-@@ -1,3 +1,3 @@
- system_u:system_u:s0-mcs_systemhigh
--root:root:s0-mcs_systemhigh
--__default__:user_u:s0
-+root:unconfined_u:s0-mcs_systemhigh
-+__default__:unconfined_u:s0-mcs_systemhigh
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/staff_u_default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,10 +1,12 @@
- system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
- system_r:remote_login_t:s0	staff_r:staff_t:s0
- system_r:sshd_t:s0		staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--system_r:crond_t:s0		staff_r:cronjob_t:s0
-+system_r:crond_t:s0		staff_r:staff_t:s0
- system_r:xdm_t:s0		staff_r:staff_t:s0
- staff_r:staff_su_t:s0		staff_r:staff_t:s0
- staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
-+system_r:initrc_su_t:s0		staff_r:staff_t:s0
-+staff_r:staff_t:s0		staff_r:staff_t:s0
- sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
- sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
- 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/unconfined_u_default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,4 +1,4 @@
--system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
-+system_r:crond_t:s0		unconfined_r:unconfined_t:s0
- system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
- system_r:local_login_t:s0	unconfined_r:unconfined_t:s0
- system_r:remote_login_t:s0	unconfined_r:unconfined_t:s0
-@@ -6,4 +6,6 @@
- system_r:sshd_t:s0		unconfined_r:unconfined_t:s0
- system_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0
- system_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
-+system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
-+unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
- system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context
---- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/userhelper_context	2009-08-21 18:56:06.000000000 -0400
-@@ -1 +1 @@
--system_u:sysadm_r:sysadm_t:s0
-+system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mcs/user_u_default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,8 +1,9 @@
- system_r:local_login_t:s0	user_r:user_t:s0
- system_r:remote_login_t:s0	user_r:user_t:s0
- system_r:sshd_t:s0		user_r:user_t:s0
--system_r:crond_t:s0		user_r:cronjob_t:s0
-+system_r:crond_t:s0		user_r:user_t:s0
- system_r:xdm_t:s0		user_r:user_t:s0
- user_r:user_su_t:s0		user_r:user_t:s0
- user_r:user_sudo_t:s0		user_r:user_t:s0
--
-+system_r:initrc_su_t:s0		user_r:user_t:s0
-+user_r:user_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_domain_context serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context
---- nsaserefpolicy/config/appconfig-mcs/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_domain_context	2009-08-21 18:56:06.000000000 -0400
-@@ -0,0 +1 @@
-+system_u:system_r:svirt_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/virtual_image_context serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context
---- nsaserefpolicy/config/appconfig-mcs/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mcs/virtual_image_context	2009-08-21 18:56:06.000000000 -0400
-@@ -0,0 +1,2 @@
-+system_u:object_r:svirt_image_t:s0
-+system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.28/config/appconfig-mls/default_contexts
---- nsaserefpolicy/config/appconfig-mls/default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mls/default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,15 +1,6 @@
--system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
--system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
--system_r:remote_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
--system_r:sshd_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
-+system_r:crond_t:s0		system_r:system_crond_t:s0
-+system_r:local_login_t:s0	user_r:user_t:s0
-+system_r:remote_login_t:s0	user_r:user_t:s0
-+system_r:sshd_t:s0		user_r:user_t:s0
- system_r:sulogin_t:s0		sysadm_r:sysadm_t:s0
--system_r:xdm_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
--
--staff_r:staff_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--staff_r:staff_sudo_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
--
--sysadm_r:sysadm_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
--
--user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
--user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
-+system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts
---- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-mls/root_default_contexts	2009-08-21 18:56:06.000000000 -0400
-@@ -1,11 +1,11 @@
--system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
--system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-+system_r:crond_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-+system_r:local_login_t:s0	sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
- 
--staff_r:staff_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
--sysadm_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
--user_r:user_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-+staff_r:staff_su_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-+sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-+user_r:user_su_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
- 
- #
- # Uncomment if you want to automatically login as sysadm_r
- #
--#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-+#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_domain_context serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context
---- nsaserefpolicy/config/appconfig-mls/virtual_domain_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mls/virtual_domain_context	2009-08-21 18:56:06.000000000 -0400
-@@ -0,0 +1 @@
-+system_u:system_r:qemu_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/virtual_image_context serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context
---- nsaserefpolicy/config/appconfig-mls/virtual_image_context	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.28/config/appconfig-mls/virtual_image_context	2009-08-21 18:56:06.000000000 -0400
-@@ -0,0 +1,2 @@
-+system_u:object_r:virt_image_t:s0
-+system_u:object_r:virt_content_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/securetty_types serefpolicy-3.6.28/config/appconfig-standard/securetty_types
---- nsaserefpolicy/config/appconfig-standard/securetty_types	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/config/appconfig-standard/securetty_types	2009-08-21 18:56:06.000000000 -0400
-@@ -1 +1,6 @@
[...5122 lines suppressed...]
  ')
  
@@ -27589,7 +27357,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1560,6 +1697,8 @@
+@@ -1557,6 +1697,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27598,7 +27366,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1653,6 +1792,7 @@
+@@ -1650,6 +1792,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27606,7 +27374,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)
  ')
-@@ -1780,19 +1920,32 @@
+@@ -1777,19 +1920,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -27646,7 +27414,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1827,6 +1980,7 @@
+@@ -1824,6 +1980,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -27654,7 +27422,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2374,7 +2528,7 @@
+@@ -2371,7 +2528,7 @@
  
  ########################################
  ## <summary>
@@ -27663,7 +27431,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2728,11 +2882,32 @@
+@@ -2725,11 +2882,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27698,7 +27466,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2860,7 +3035,25 @@
+@@ -2857,7 +3035,25 @@
  		type user_tmp_t;
  	')
  
@@ -27725,7 +27493,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,6 +3090,7 @@
+@@ -2894,6 +3090,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27733,7 +27501,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3027,3 +3221,559 @@
+@@ -3024,3 +3221,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -28293,9 +28061,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow $1 user_tmp_t:file { getattr append };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.28/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/userdomain.te	2009-08-21 18:56:07.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.29/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-28 14:58:20.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/userdomain.te	2009-08-28 16:28:51.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -28381,9 +28149,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.28/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.29/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.fc	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/xen.fc	2009-08-28 15:56:54.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -28411,9 +28179,9 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.28/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.29/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.if	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/xen.if	2009-08-28 15:56:54.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -28464,9 +28232,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.28/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.29/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/policy/modules/system/xen.te	2009-08-21 18:57:11.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/xen.te	2009-08-28 15:56:54.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28764,9 +28532,9 @@ diff -b -B --ignore-all-space --exclude-
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.28/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.29/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/support/obj_perm_sets.spt	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.29/policy/support/obj_perm_sets.spt	2009-08-28 15:56:54.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -28799,9 +28567,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.28/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.29/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/policy/users	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.29/policy/users	2009-08-28 15:56:54.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -28826,9 +28594,9 @@ diff -b -B --ignore-all-space --exclude-
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.28/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.29/Rules.modular
 --- nsaserefpolicy/Rules.modular	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/Rules.modular	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.29/Rules.modular	2009-08-28 15:56:54.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -28858,15 +28626,15 @@ diff -b -B --ignore-all-space --exclude-
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/divert.m4 serefpolicy-3.6.28/support/divert.m4
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/divert.m4 serefpolicy-3.6.29/support/divert.m4
 --- nsaserefpolicy/support/divert.m4	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/support/divert.m4	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.29/support/divert.m4	1969-12-31 19:00:00.000000000 -0500
 @@ -1 +0,0 @@
 -divert(`-1')
 \ No newline at end of file
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.28/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.29/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.28/support/Makefile.devel	2009-08-21 18:56:07.000000000 -0400
++++ serefpolicy-3.6.29/support/Makefile.devel	2009-08-28 15:56:54.000000000 -0400
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
@@ -28877,9 +28645,9 @@ diff -b -B --ignore-all-space --exclude-
  	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
  
  tmp/%.mod.fc: $(m4support) %.fc
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/undivert.m4 serefpolicy-3.6.28/support/undivert.m4
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/undivert.m4 serefpolicy-3.6.29/support/undivert.m4
 --- nsaserefpolicy/support/undivert.m4	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.28/support/undivert.m4	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.29/support/undivert.m4	1969-12-31 19:00:00.000000000 -0500
 @@ -1 +0,0 @@
 -divert
 \ No newline at end of file


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -p -r1.907 -r1.908
--- selinux-policy.spec	28 Aug 2009 18:56:15 -0000	1.907
+++ selinux-policy.spec	28 Aug 2009 20:55:16 -0000	1.908
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.28
-Release: 9%{?dist}
+Version: 3.6.29
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -44,6 +44,7 @@ Source17: booleans-minimum.conf
 Source18: setrans-minimum.conf
 Source19: securetty_types-minimum
 Source20: customizable_types
+Source21: config.tgz
 
 Url: http://oss.tresys.com/repos/refpolicy/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -194,6 +195,7 @@ Based off of reference policy: Checked o
 %patch -p1
 
 %install
+tar zxvf $RPM_SOURCE_DIR/config.tgz
 # Build targeted policy
 %{__rm} -fR %{buildroot}
 mkdir -p %{buildroot}%{_mandir}
@@ -441,6 +443,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-1
+- Update to upstream
+
 * Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.28-9
 - Remove polkit_auth on upgrades
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- sources	18 Aug 2009 22:43:34 -0000	1.201
+++ sources	28 Aug 2009 20:55:16 -0000	1.202
@@ -1 +1,2 @@
-7ce2872c7c331710af3741606add5664  serefpolicy-3.6.28.tgz
+3651679c4b12a31d2ba5f4305bba5540  config.tgz
+0f3289e6d734d2152f4fcb97ff2af13d  serefpolicy-3.6.29.tgz



From than at fedoraproject.org  Fri Aug 28 20:59:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 28 Aug 2009 20:59:30 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.508,
	1.509 kdelibs-4.3.1-buildsys_phonon.patch, 1.1, NONE
Message-ID: <20090828205930.6D8CF11C0078@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2633

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.3.1-buildsys_phonon.patch 
Log Message:
4.3.1



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -p -r1.508 -r1.509
--- kdelibs.spec	28 Aug 2009 14:14:08 -0000	1.508
+++ kdelibs.spec	28 Aug 2009 20:59:30 -0000	1.509
@@ -83,7 +83,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
 # 4.3 branch
-Patch106: kdelibs-4.3.1-buildsys_phonon.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -219,7 +218,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 
 # upstream patches
 # 4.3
-%patch106 -p1 -b .buildsys_phonon
 
 
 %build


--- kdelibs-4.3.1-buildsys_phonon.patch DELETED ---



From zap at fedoraproject.org  Fri Aug 28 20:59:48 2009
From: zap at fedoraproject.org (Andrew Zabolotny)
Date: Fri, 28 Aug 2009 20:59:48 +0000 (UTC)
Subject: rpms/QtDMM/devel QtDMM.spec, NONE, 1.1 import.log, NONE,
	1.1 qtdmm-0.8.12-desktop.patch, NONE,
	1.1 qtdmm-0.8.12-warnings.patch, NONE,
	1.1 qtdmm-0.8.12-xpm-warnings.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090828205948.3E95E11C0078@cvs1.fedora.phx.redhat.com>

Author: zap

Update of /cvs/pkgs/rpms/QtDMM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2523/devel

Modified Files:
	.cvsignore sources 
Added Files:
	QtDMM.spec import.log qtdmm-0.8.12-desktop.patch 
	qtdmm-0.8.12-warnings.patch qtdmm-0.8.12-xpm-warnings.patch 
Log Message:
Initial import of QtDMM 0.8.12



--- NEW FILE QtDMM.spec ---
Name: QtDMM
Version: 0.8.12
Release: 1%{?dist}
Summary: A digital multimeter readout software
Group: Applications/Engineering
License: GPLv2+

URL: http://www.mtoussaint.de/qtdmm.html
Source: http://www.mtoussaint.de/qtdmm-%{version}.tgz
Patch1: qtdmm-0.8.12-desktop.patch
Patch2: qtdmm-0.8.12-xpm-warnings.patch
Patch3: qtdmm-0.8.12-warnings.patch

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: electronics-menu
BuildRequires: qt3-devel, desktop-file-utils

%description
QtDMM is a DMM readout software including a configurable recorder.
The recorder features manual start, scheduled start (at a given time),
triggered automatic start when given thresholds are reached, and the
ability to display more than one value from the multimeter.
It was written for Metex (and compatible like VOLTCRAFT) multimeter
which use an 14 byte protocol. Later several more protocols have been added.
For more information on the currently supported DMM's have a look at
the preset table.

%prep
%setup -q

%patch1 -p1 -b .desktop
%patch2 -p1 -b .xpm-warnings
%patch3 -p1 -b .warnings

chmod a-x src/*.cpp src/*.h

%configure

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_bindir}
install -p -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -p -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -d $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 755 bin/qtdmm $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 qtdmm.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -p -m 644 qtdmm.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
desktop-file-install \
	--vendor="" \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category "Engineering;Electronics;" \
	--delete-original \
	QtDMM.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS CHANGELOG COPYING
%{_bindir}/qtdmm
%{_datadir}/applications/QtDMM.desktop
%{_datadir}/pixmaps/qtdmm.png
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Jun  6 2009 Andrew Zabolotny <zap at homelink.ru> 0.8.12-1
- updated to latest version
- Fedora packaging guidelines

* Thu Nov 23 2006 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.8

* Sat Sep 23 2006 Radek Liboska <liboska at uochb.cas.cz>
- License added, install bug (strip) corrected

* Wed Dec 28 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.7

* Wed Aug 17 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.6

* Mon Jun 28 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.5

* Mon May  2 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.4

* Fri Apr 29 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.3

* Fri Oct 18 2002 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.1

* Tue May  7 2002 Radek Liboska <liboska at uochb.cas.cz>
- ports ttyS4-ttyS7 added

* Wed Mar  6 2002 Radek Liboska <liboska at uochb.cas.cz>
- 0.7

* Tue Nov 27 2001 Radek Liboska <liboska at uochb.cas.cz>
- 0.6 

* Tue Sep  4 2001 Radek Liboska <liboska at uochb.cas.cz>
- 0.5 Second RPM release
- 0.4 Initial RPM release


--- NEW FILE import.log ---
QtDMM-0_8_12-1_fc11_zap:HEAD:QtDMM-0.8.12-1.fc11.zap.src.rpm:1251493077

qtdmm-0.8.12-desktop.patch:
 QtDMM.desktop |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE qtdmm-0.8.12-desktop.patch ---
--- QtDMM-0.8.12.orig/QtDMM.desktop	2006-11-11 11:15:37.000000000 +0300
+++ QtDMM-0.8.12/QtDMM.desktop	2009-06-10 23:19:43.000000000 +0400
@@ -1,8 +1,12 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
-Name=QtDMM
-Exec=qtdmm
-Icon=/usr/share/pixmaps/qtdmm.png
-Terminal=false
+GenericName=QtDMM
+Name=Digital Multimeter
+Name[ru_RU]=???????? ??????????
+Comment=A digital multimeter readout software
+Comment[ru_RU]=?????????? ?????? ? ????????? ???????????
 Type=Application
+Exec=qtdmm
+Icon=qtdmm
 Categories=GNOME;KDE;Application;Utility;

qtdmm-0.8.12-warnings.patch:
 dmm.cpp    |   14 +++++++-------
 dmm.h      |    4 ++--
 dmmprefs.h |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE qtdmm-0.8.12-warnings.patch ---
diff -ur QtDMM-0.8.12.orig/src/dmm.cpp QtDMM-0.8.12/src/dmm.cpp
--- QtDMM-0.8.12.orig/src/dmm.cpp	2007-12-25 14:26:19.000000000 +0300
+++ QtDMM-0.8.12/src/dmm.cpp	2009-06-10 23:12:09.000000000 +0400
@@ -418,7 +418,7 @@
   {
     val += re->string()[i];
   }
-  if (re->string()[4]&0x0f != 0x0a)
+  if ((re->string()[4] & 0x0f) != 0x0a)
   {
     val += re->string()[4];
   }
@@ -721,10 +721,10 @@
   m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
 }
 
-char *DMM::RS22812Digit( int byte )
+const char *DMM::RS22812Digit( int byte )
 {
-  int     digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
-  char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  int           digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
+  const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
      
   byte &= 0x0f7;
      
@@ -1545,10 +1545,10 @@
   m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
 }
 
-char *DMM::vc820Digit( int byte )
+const char *DMM::vc820Digit( int byte )
 {
-  int     digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
-  char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  int           digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
+  const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
   
   byte &= 0x7f;
   
diff -ur QtDMM-0.8.12.orig/src/dmm.h QtDMM-0.8.12/src/dmm.h
--- QtDMM-0.8.12.orig/src/dmm.h	2007-12-25 14:26:43.000000000 +0300
+++ QtDMM-0.8.12/src/dmm.h	2009-06-10 23:10:59.000000000 +0400
@@ -82,8 +82,8 @@
   void readVC940Continuous( ReadEvent * );
   void readQM1537Continuous( ReadEvent * );
   void readRS22812Continuous( ReadEvent * );
-  char *vc820Digit( int );
-  char *RS22812Digit( int );
+  const char *vc820Digit( int );
+  const char *RS22812Digit( int );
   
 };
 
diff -ur QtDMM-0.8.12.orig/src/dmmprefs.h QtDMM-0.8.12/src/dmmprefs.h
--- QtDMM-0.8.12.orig/src/dmmprefs.h	2007-11-24 23:52:07.000000000 +0300
+++ QtDMM-0.8.12/src/dmmprefs.h	2009-06-10 23:13:34.000000000 +0400
@@ -26,7 +26,7 @@
 
 struct DMMInfo
 {
-  char *name;
+  const char *name;
   int   baud;
   int   protocol;
   int   bits;

qtdmm-0.8.12-xpm-warnings.patch:
 A.xpm                  |    2 +-
 A_small.xpm            |    2 +-
 DBM.xpm                |    2 +-
 DBM_small.xpm          |    2 +-
 F.xpm                  |    2 +-
 F_small.xpm            |    2 +-
 G.xpm                  |    2 +-
 G_small.xpm            |    2 +-
 H.xpm                  |    2 +-
 H_small.xpm            |    2 +-
 Hz.xpm                 |    2 +-
 Hz_small.xpm           |    2 +-
 Ohm.xpm                |    2 +-
 Ohm_small.xpm          |    2 +-
 V.xpm                  |    2 +-
 V_small.xpm            |    2 +-
 W.xpm                  |    2 +-
 W_small.xpm            |    2 +-
 ac.xpm                 |    2 +-
 all_digits.xpm         |    2 +-
 auto.xpm               |    2 +-
 bar.xpm                |    2 +-
 clear.xpm              |    2 +-
 cm.xpm                 |    2 +-
 cm_small.xpm           |    2 +-
 conf.xpm               |    2 +-
 config.xpm             |    2 +-
 connect_icon.xpm       |    2 +-
 connect_off.xpm        |    2 +-
 connect_on.xpm         |    2 +-
 connection.xpm         |    2 +-
 dc.xpm                 |    2 +-
 decimal.xpm            |    2 +-
 decimal_small.xpm      |    2 +-
 deg.xpm                |    2 +-
 deg_small.xpm          |    2 +-
 diode.xpm              |    2 +-
 display.xpm            |    2 +-
 dmm.xpm                |    2 +-
 dmm_big.xpm            |    2 +-
 ee.xpm                 |    2 +-
 execute.xpm            |    2 +-
 export.xpm             |    2 +-
 fifty_bar.xpm          |    2 +-
 fourty_bar.xpm         |    2 +-
 graph.xpm              |    2 +-
 gui.xpm                |    2 +-
 help.xpm               |    2 +-
 hi.xpm                 |    2 +-
 hold.xpm               |    2 +-
 icon.xpm               |    2 +-
 icon_gray.xpm          |    2 +-
 import.xpm             |    2 +-
 integration.xpm        |    2 +-
 integration_old.xpm    |    2 +-
 k.xpm                  |    2 +-
 k_small.xpm            |    2 +-
 l.xpm                  |    2 +-
 l_small.xpm            |    2 +-
 m.xpm                  |    2 +-
 m_small.xpm            |    2 +-
 manu.xpm               |    2 +-
 max_str.xpm            |    2 +-
 min_str.xpm            |    2 +-
 minus.xpm              |    2 +-
 minus_small.xpm        |    2 +-
 n.xpm                  |    2 +-
 n_small.xpm            |    2 +-
 null_bar.xpm           |    2 +-
 numbers.xpm            |    2 +-
 numbers_small.xpm      |    2 +-
 numers_tiny.xpm        |    2 +-
 p.xpm                  |    2 +-
 p_small.xpm            |    2 +-
 percent.xpm            |    2 +-
 percent_small.xpm      |    2 +-
 print.xpm              |    2 +-
 quit.xpm               |    2 +-
 recorder.xpm           |    2 +-
 reset.xpm              |    2 +-
 scale.xpm              |    2 +-
 sixty_bar.xpm          |    2 +-
 specialchars.xpm       |    2 +-
 specialchars_small.xpm |    2 +-
 start.xpm              |    2 +-
 stop.xpm               |    2 +-
 ten_bar.xpm            |    2 +-
 thirty_bar.xpm         |    2 +-
 twenty_bar.xpm         |    2 +-
 u.xpm                  |    2 +-
 u_small.xpm            |    2 +-
 91 files changed, 91 insertions(+), 91 deletions(-)

--- NEW FILE qtdmm-0.8.12-xpm-warnings.patch ---
diff -ur QtDMM-0.8.12.orig/src/xpm/ac.xpm QtDMM-0.8.12/src/xpm/ac.xpm
--- QtDMM-0.8.12.orig/src/xpm/ac.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ac.xpm	2009-06-10 23:03:57.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ac_xpm[] = {
+static const char * ac_xpm[] = {
 "18 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/all_digits.xpm QtDMM-0.8.12/src/xpm/all_digits.xpm
--- QtDMM-0.8.12.orig/src/xpm/all_digits.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/all_digits.xpm	2009-06-10 23:04:01.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * all_digits_xpm[] = {
+static const char * all_digits_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/A_small.xpm QtDMM-0.8.12/src/xpm/A_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/A_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/A_small.xpm	2009-06-10 23:03:16.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * A_small_xpm[] = {
+static const char * A_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/auto.xpm QtDMM-0.8.12/src/xpm/auto.xpm
--- QtDMM-0.8.12.orig/src/xpm/auto.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/auto.xpm	2009-06-10 23:04:03.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * auto_xpm[] = {
+static const char * auto_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/A.xpm QtDMM-0.8.12/src/xpm/A.xpm
--- QtDMM-0.8.12.orig/src/xpm/A.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/A.xpm	2009-06-10 23:03:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * A_xpm[] = {
+static const char * A_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/bar.xpm QtDMM-0.8.12/src/xpm/bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/bar.xpm	2009-06-10 23:04:05.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * bar_xpm[] = {
+static const char * bar_xpm[] = {
 "5 9 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/clear.xpm QtDMM-0.8.12/src/xpm/clear.xpm
--- QtDMM-0.8.12.orig/src/xpm/clear.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/clear.xpm	2009-06-10 23:04:07.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * clear_xpm[] = {
+static const char * clear_xpm[] = {
 "22 22 108 2",
 "  	g None",
 ". 	g #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/cm_small.xpm QtDMM-0.8.12/src/xpm/cm_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/cm_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/cm_small.xpm	2009-06-10 23:04:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * M_small_xpm[] = {
+static const char * M_small_xpm[] = {
 "7 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/cm.xpm QtDMM-0.8.12/src/xpm/cm.xpm
--- QtDMM-0.8.12.orig/src/xpm/cm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/cm.xpm	2009-06-10 23:04:09.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * M_xpm[] = {
+static const char * M_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/config.xpm QtDMM-0.8.12/src/xpm/config.xpm
--- QtDMM-0.8.12.orig/src/xpm/config.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/config.xpm	2009-06-10 23:04:17.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * config_xpm[] = {
+static const char * config_xpm[] = {
 "22 22 20 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/conf.xpm QtDMM-0.8.12/src/xpm/conf.xpm
--- QtDMM-0.8.12.orig/src/xpm/conf.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/conf.xpm	2009-06-10 23:04:15.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * conf_xpm[] = {
+static const char * conf_xpm[] = {
 "22 22 20 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_icon.xpm QtDMM-0.8.12/src/xpm/connect_icon.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_icon.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_icon.xpm	2009-06-10 23:04:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_icon_xpm[] = {
+static const char * connect_icon_xpm[] = {
 "32 32 188 2",
 "  	c None",
 ". 	c #FFFF00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connection.xpm QtDMM-0.8.12/src/xpm/connection.xpm
--- QtDMM-0.8.12.orig/src/xpm/connection.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connection.xpm	2009-06-10 23:04:25.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connection_xpm[] = {
+static const char * connection_xpm[] = {
 "32 32 67 1",
 " 	c None",
 ".	c #FDFD00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_off.xpm QtDMM-0.8.12/src/xpm/connect_off.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_off.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_off.xpm	2009-06-10 23:04:21.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_off_xpm[] = {
+static const char * connect_off_xpm[] = {
 "22 22 18 1",
 " 	c None",
 ".	c #FFFF00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_on.xpm QtDMM-0.8.12/src/xpm/connect_on.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_on.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_on.xpm	2009-06-10 23:04:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_on_xpm[] = {
+static const char * connect_on_xpm[] = {
 "22 22 16 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/DBM_small.xpm QtDMM-0.8.12/src/xpm/DBM_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/DBM_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/DBM_small.xpm	2009-06-10 23:03:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DBM_small_xpm[] = {
+static const char * DBM_small_xpm[] = {
 "9 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/DBM.xpm QtDMM-0.8.12/src/xpm/DBM.xpm
--- QtDMM-0.8.12.orig/src/xpm/DBM.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/DBM.xpm	2009-06-10 23:03:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DBM_xpm[] = {
+static const char * DBM_xpm[] = {
 "15 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/dc.xpm QtDMM-0.8.12/src/xpm/dc.xpm
--- QtDMM-0.8.12.orig/src/xpm/dc.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dc.xpm	2009-06-10 23:04:27.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dc_xpm[] = {
+static const char * dc_xpm[] = {
 "18 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/decimal_small.xpm QtDMM-0.8.12/src/xpm/decimal_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/decimal_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/decimal_small.xpm	2009-06-10 23:04:34.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * decimal_small_xpm[] = {
+static const char * decimal_small_xpm[] = {
 "4 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/decimal.xpm QtDMM-0.8.12/src/xpm/decimal.xpm
--- QtDMM-0.8.12.orig/src/xpm/decimal.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/decimal.xpm	2009-06-10 23:04:32.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * decimal_xpm[] = {
+static const char * decimal_xpm[] = {
 "11 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/deg_small.xpm QtDMM-0.8.12/src/xpm/deg_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/deg_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/deg_small.xpm	2009-06-10 23:04:38.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * deg_small_xpm[] = {
+static const char * deg_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/deg.xpm QtDMM-0.8.12/src/xpm/deg.xpm
--- QtDMM-0.8.12.orig/src/xpm/deg.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/deg.xpm	2009-06-10 23:04:36.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * deg_xpm[] = {
+static const char * deg_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/diode.xpm QtDMM-0.8.12/src/xpm/diode.xpm
--- QtDMM-0.8.12.orig/src/xpm/diode.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/diode.xpm	2009-06-10 23:04:40.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * diode_xpm[] = {
+static const char * diode_xpm[] = {
 "17 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/display.xpm QtDMM-0.8.12/src/xpm/display.xpm
--- QtDMM-0.8.12.orig/src/xpm/display.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/display.xpm	2009-06-10 23:04:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * display_xpm[] = {
+static const char * display_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #00B506",
diff -ur QtDMM-0.8.12.orig/src/xpm/dmm_big.xpm QtDMM-0.8.12/src/xpm/dmm_big.xpm
--- QtDMM-0.8.12.orig/src/xpm/dmm_big.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dmm_big.xpm	2009-06-10 23:04:47.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dmm_big_xpm[] = {
+static const char * dmm_big_xpm[] = {
 "64 64 14 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/dmm.xpm QtDMM-0.8.12/src/xpm/dmm.xpm
--- QtDMM-0.8.12.orig/src/xpm/dmm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dmm.xpm	2009-06-10 23:04:45.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dmm_xpm[] = {
+static const char * dmm_xpm[] = {
 "32 32 14 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/ee.xpm QtDMM-0.8.12/src/xpm/ee.xpm
--- QtDMM-0.8.12.orig/src/xpm/ee.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ee.xpm	2009-06-10 23:04:49.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ee_xpm[] = {
+static const char * ee_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/execute.xpm QtDMM-0.8.12/src/xpm/execute.xpm
--- QtDMM-0.8.12.orig/src/xpm/execute.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/execute.xpm	2009-06-10 23:04:51.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * execute_xpm[] = {
+static const char * execute_xpm[] = {
 "32 32 9 1",
 " 	c None",
 ".	c #050505",
diff -ur QtDMM-0.8.12.orig/src/xpm/export.xpm QtDMM-0.8.12/src/xpm/export.xpm
--- QtDMM-0.8.12.orig/src/xpm/export.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/export.xpm	2009-06-10 23:04:54.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * export_xpm[] = {
+static const char * export_xpm[] = {
 "22 22 117 2",
 "  	c None",
 ". 	c #6B6B6B",
diff -ur QtDMM-0.8.12.orig/src/xpm/fifty_bar.xpm QtDMM-0.8.12/src/xpm/fifty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/fifty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/fifty_bar.xpm	2009-06-10 23:04:56.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fifty_bar_xpm[] = {
+static const char * fifty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/fourty_bar.xpm QtDMM-0.8.12/src/xpm/fourty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/fourty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/fourty_bar.xpm	2009-06-10 23:04:59.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fourty_bar_xpm[] = {
+static const char * fourty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/F_small.xpm QtDMM-0.8.12/src/xpm/F_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/F_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/F_small.xpm	2009-06-10 23:03:28.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * F_small_xpm[] = {
+static const char * F_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/F.xpm QtDMM-0.8.12/src/xpm/F.xpm
--- QtDMM-0.8.12.orig/src/xpm/F.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/F.xpm	2009-06-10 23:03:26.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * F_xpm[] = {
+static const char * F_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/graph.xpm QtDMM-0.8.12/src/xpm/graph.xpm
--- QtDMM-0.8.12.orig/src/xpm/graph.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/graph.xpm	2009-06-10 23:05:01.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * graph_xpm[] = {
+static const char * graph_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/G_small.xpm QtDMM-0.8.12/src/xpm/G_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/G_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/G_small.xpm	2009-06-10 23:03:33.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * G_small_xpm[] = {
+static const char * G_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/gui.xpm QtDMM-0.8.12/src/xpm/gui.xpm
--- QtDMM-0.8.12.orig/src/xpm/gui.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/gui.xpm	2009-06-10 23:05:04.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gui_xpm[] = {
+static const char * gui_xpm[] = {
 "32 32 303 2",
 "  	c None",
 ". 	c #272727",
diff -ur QtDMM-0.8.12.orig/src/xpm/G.xpm QtDMM-0.8.12/src/xpm/G.xpm
--- QtDMM-0.8.12.orig/src/xpm/G.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/G.xpm	2009-06-10 23:03:30.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * G_xpm[] = {
+static const char * G_xpm[] = {
 "11 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/help.xpm QtDMM-0.8.12/src/xpm/help.xpm
--- QtDMM-0.8.12.orig/src/xpm/help.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/help.xpm	2009-06-10 23:05:06.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * help_xpm[] = {
+static const char * help_xpm[] = {
 "22 22 4 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/hi.xpm QtDMM-0.8.12/src/xpm/hi.xpm
--- QtDMM-0.8.12.orig/src/xpm/hi.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/hi.xpm	2009-06-10 23:05:08.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hi_xpm[] = {
+static const char * hi_xpm[] = {
 "18 9 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/hold.xpm QtDMM-0.8.12/src/xpm/hold.xpm
--- QtDMM-0.8.12.orig/src/xpm/hold.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/hold.xpm	2009-06-10 23:05:11.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hold_xpm[] = {
+static const char * hold_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/H_small.xpm QtDMM-0.8.12/src/xpm/H_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/H_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/H_small.xpm	2009-06-10 23:03:37.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * H_small_xpm[] = {
+static const char * H_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/H.xpm QtDMM-0.8.12/src/xpm/H.xpm
--- QtDMM-0.8.12.orig/src/xpm/H.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/H.xpm	2009-06-10 23:03:35.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * H_xpm[] = {
+static const char * H_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Hz_small.xpm QtDMM-0.8.12/src/xpm/Hz_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/Hz_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Hz_small.xpm	2009-06-10 23:03:41.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Hz_small_xpm[] = {
+static const char * Hz_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Hz.xpm QtDMM-0.8.12/src/xpm/Hz.xpm
--- QtDMM-0.8.12.orig/src/xpm/Hz.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Hz.xpm	2009-06-10 23:03:39.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Hz_xpm[] = {
+static const char * Hz_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/icon_gray.xpm QtDMM-0.8.12/src/xpm/icon_gray.xpm
--- QtDMM-0.8.12.orig/src/xpm/icon_gray.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/icon_gray.xpm	2009-06-10 23:05:15.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_gray_xpm[] = {
+static const char * icon_gray_xpm[] = {
 "32 32 15 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/icon.xpm QtDMM-0.8.12/src/xpm/icon.xpm
--- QtDMM-0.8.12.orig/src/xpm/icon.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/icon.xpm	2009-06-10 23:05:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_xpm[] = {
+static const char * icon_xpm[] = {
 "32 32 15 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/import.xpm QtDMM-0.8.12/src/xpm/import.xpm
--- QtDMM-0.8.12.orig/src/xpm/import.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/import.xpm	2009-06-10 23:05:17.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * import_xpm[] = {
+static const char * import_xpm[] = {
 "22 22 191 2",
 "  	c None",
 ". 	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/integration_old.xpm QtDMM-0.8.12/src/xpm/integration_old.xpm
--- QtDMM-0.8.12.orig/src/xpm/integration_old.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/integration_old.xpm	2009-06-10 23:05:22.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * integration_old_xpm[] = {
+static const char * integration_old_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #0033FF",
diff -ur QtDMM-0.8.12.orig/src/xpm/integration.xpm QtDMM-0.8.12/src/xpm/integration.xpm
--- QtDMM-0.8.12.orig/src/xpm/integration.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/integration.xpm	2009-06-10 23:05:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * integration_xpm[] = {
+static const char * integration_xpm[] = {
 "32 32 82 1",
 " 	c None",
 ".	c #FFFFFF",
diff -ur QtDMM-0.8.12.orig/src/xpm/k_small.xpm QtDMM-0.8.12/src/xpm/k_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/k_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/k_small.xpm	2009-06-10 23:05:27.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * k_small_xpm[] = {
+static const char * k_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/k.xpm QtDMM-0.8.12/src/xpm/k.xpm
--- QtDMM-0.8.12.orig/src/xpm/k.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/k.xpm	2009-06-10 23:05:24.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * k_xpm[] = {
+static const char * k_xpm[] = {
 "7 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/l_small.xpm QtDMM-0.8.12/src/xpm/l_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/l_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/l_small.xpm	2009-06-10 23:05:32.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * l_small_xpm[] = {
+static const char * l_small_xpm[] = {
 "12 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/l.xpm QtDMM-0.8.12/src/xpm/l.xpm
--- QtDMM-0.8.12.orig/src/xpm/l.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/l.xpm	2009-06-10 23:05:29.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * l_xpm[] = {
+static const char * l_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/manu.xpm QtDMM-0.8.12/src/xpm/manu.xpm
--- QtDMM-0.8.12.orig/src/xpm/manu.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/manu.xpm	2009-06-10 23:05:39.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * manu_xpm[] = {
+static const char * manu_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/max_str.xpm QtDMM-0.8.12/src/xpm/max_str.xpm
--- QtDMM-0.8.12.orig/src/xpm/max_str.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/max_str.xpm	2009-06-10 23:05:41.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * max_str_xpm[] = {
+static const char * max_str_xpm[] = {
 "19 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/min_str.xpm QtDMM-0.8.12/src/xpm/min_str.xpm
--- QtDMM-0.8.12.orig/src/xpm/min_str.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/min_str.xpm	2009-06-10 23:05:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * min_str_xpm[] = {
+static const char * min_str_xpm[] = {
 "15 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/minus_small.xpm QtDMM-0.8.12/src/xpm/minus_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/minus_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/minus_small.xpm	2009-06-10 23:05:48.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * minus_small_xpm[] = {
+static const char * minus_small_xpm[] = {
 "8 3 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/minus.xpm QtDMM-0.8.12/src/xpm/minus.xpm
--- QtDMM-0.8.12.orig/src/xpm/minus.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/minus.xpm	2009-06-10 23:05:46.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * minus_xpm[] = {
+static const char * minus_xpm[] = {
 "22 63 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/m_small.xpm QtDMM-0.8.12/src/xpm/m_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/m_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/m_small.xpm	2009-06-10 23:05:36.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * m_small_xpm[] = {
+static const char * m_small_xpm[] = {
 "7 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/m.xpm QtDMM-0.8.12/src/xpm/m.xpm
--- QtDMM-0.8.12.orig/src/xpm/m.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/m.xpm	2009-06-10 23:05:34.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * m_xpm[] = {
+static const char * m_xpm[] = {
 "11 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/n_small.xpm QtDMM-0.8.12/src/xpm/n_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/n_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/n_small.xpm	2009-06-10 23:05:52.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * n_small_xpm[] = {
+static const char * n_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/null_bar.xpm QtDMM-0.8.12/src/xpm/null_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/null_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/null_bar.xpm	2009-06-10 23:05:54.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * null_bar_xpm[] = {
+static const char * null_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numbers_small.xpm QtDMM-0.8.12/src/xpm/numbers_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/numbers_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numbers_small.xpm	2009-06-10 23:05:58.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numbers_small_xpm[] = {
+static const char * numbers_small_xpm[] = {
 "120 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numbers.xpm QtDMM-0.8.12/src/xpm/numbers.xpm
--- QtDMM-0.8.12.orig/src/xpm/numbers.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numbers.xpm	2009-06-10 23:05:56.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numbers_xpm[] = {
+static const char * numbers_xpm[] = {
 "340 60 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numers_tiny.xpm QtDMM-0.8.12/src/xpm/numers_tiny.xpm
--- QtDMM-0.8.12.orig/src/xpm/numers_tiny.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numers_tiny.xpm	2009-06-10 23:06:00.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numers_tiny_xpm[] = {
+static const char * numers_tiny_xpm[] = {
 "80 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/n.xpm QtDMM-0.8.12/src/xpm/n.xpm
--- QtDMM-0.8.12.orig/src/xpm/n.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/n.xpm	2009-06-10 23:05:50.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * n_xpm[] = {
+static const char * n_xpm[] = {
 "7 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Ohm_small.xpm QtDMM-0.8.12/src/xpm/Ohm_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/Ohm_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Ohm_small.xpm	2009-06-10 23:03:45.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Ohm_small_xpm[] = {
+static const char * Ohm_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Ohm.xpm QtDMM-0.8.12/src/xpm/Ohm.xpm
--- QtDMM-0.8.12.orig/src/xpm/Ohm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Ohm.xpm	2009-06-10 23:03:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Ohm_xpm[] = {
+static const char * Ohm_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/percent_small.xpm QtDMM-0.8.12/src/xpm/percent_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/percent_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/percent_small.xpm	2009-06-10 23:06:09.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * percent_small_xpm[] = {
+static const char * percent_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/percent.xpm QtDMM-0.8.12/src/xpm/percent.xpm
--- QtDMM-0.8.12.orig/src/xpm/percent.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/percent.xpm	2009-06-10 23:06:07.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * percent_xpm[] = {
+static const char * percent_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/print.xpm QtDMM-0.8.12/src/xpm/print.xpm
--- QtDMM-0.8.12.orig/src/xpm/print.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/print.xpm	2009-06-10 23:06:12.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * print_xpm[] = {
+static const char * print_xpm[] = {
 "22 22 178 2",
 "  	c None",
 ". 	c #565656",
diff -ur QtDMM-0.8.12.orig/src/xpm/p_small.xpm QtDMM-0.8.12/src/xpm/p_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/p_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/p_small.xpm	2009-06-10 23:06:05.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * p_small_xpm[] = {
+static const char * p_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/p.xpm QtDMM-0.8.12/src/xpm/p.xpm
--- QtDMM-0.8.12.orig/src/xpm/p.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/p.xpm	2009-06-10 23:06:03.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * p_xpm[] = {
+static const char * p_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/quit.xpm QtDMM-0.8.12/src/xpm/quit.xpm
--- QtDMM-0.8.12.orig/src/xpm/quit.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/quit.xpm	2009-06-10 23:06:14.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * quit_xpm[] = {
+static const char * quit_xpm[] = {
 "22 22 93 2",
 "  	c None",
 ". 	c #FFFFFF",
diff -ur QtDMM-0.8.12.orig/src/xpm/recorder.xpm QtDMM-0.8.12/src/xpm/recorder.xpm
--- QtDMM-0.8.12.orig/src/xpm/recorder.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/recorder.xpm	2009-06-10 23:06:16.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * recorder_xpm[] = {
+static const char * recorder_xpm[] = {
 "32 32 101 2",
 "  	g None",
 ". 	g #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/reset.xpm QtDMM-0.8.12/src/xpm/reset.xpm
--- QtDMM-0.8.12.orig/src/xpm/reset.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/reset.xpm	2009-06-10 23:06:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * reset_xpm[] = {
+static const char * reset_xpm[] = {
 "20 20 127 2",
 "  	c None",
 ". 	c #5A5A5A",
diff -ur QtDMM-0.8.12.orig/src/xpm/scale.xpm QtDMM-0.8.12/src/xpm/scale.xpm
--- QtDMM-0.8.12.orig/src/xpm/scale.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/scale.xpm	2009-06-10 23:06:21.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * scale_xpm[] = {
+static const char * scale_xpm[] = {
 "32 32 5 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/sixty_bar.xpm QtDMM-0.8.12/src/xpm/sixty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/sixty_bar.xpm	2007-08-19 21:37:34.000000000 +0400
+++ QtDMM-0.8.12/src/xpm/sixty_bar.xpm	2009-06-10 23:06:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sixty_bar_xpm[] = {
+static const char * sixty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/specialchars_small.xpm QtDMM-0.8.12/src/xpm/specialchars_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/specialchars_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/specialchars_small.xpm	2009-06-10 23:06:28.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * specialchars_small_xpm[] = {
+static const char * specialchars_small_xpm[] = {
 "156 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/specialchars.xpm QtDMM-0.8.12/src/xpm/specialchars.xpm
--- QtDMM-0.8.12.orig/src/xpm/specialchars.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/specialchars.xpm	2009-06-10 23:06:26.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * specialchars_xpm[] = {
+static const char * specialchars_xpm[] = {
 "442 60 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/start.xpm QtDMM-0.8.12/src/xpm/start.xpm
--- QtDMM-0.8.12.orig/src/xpm/start.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/start.xpm	2009-06-10 23:06:30.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * start_xpm[] = {
+static const char * start_xpm[] = {
 "22 22 101 2",
 "  	c None",
 ". 	c #0C3651",
diff -ur QtDMM-0.8.12.orig/src/xpm/stop.xpm QtDMM-0.8.12/src/xpm/stop.xpm
--- QtDMM-0.8.12.orig/src/xpm/stop.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/stop.xpm	2009-06-10 23:06:33.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stop_xpm[] = {
+static const char * stop_xpm[] = {
 "22 22 129 2",
 "  	c None",
 ". 	c #1E0A0A",
diff -ur QtDMM-0.8.12.orig/src/xpm/ten_bar.xpm QtDMM-0.8.12/src/xpm/ten_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/ten_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ten_bar.xpm	2009-06-10 23:06:35.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ten_bar_xpm[] = {
+static const char * ten_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/thirty_bar.xpm QtDMM-0.8.12/src/xpm/thirty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/thirty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/thirty_bar.xpm	2009-06-10 23:06:38.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * thirty_bar_xpm[] = {
+static const char * thirty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/twenty_bar.xpm QtDMM-0.8.12/src/xpm/twenty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/twenty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/twenty_bar.xpm	2009-06-10 23:06:40.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * twenty_bar_xpm[] = {
+static const char * twenty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/u_small.xpm QtDMM-0.8.12/src/xpm/u_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/u_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/u_small.xpm	2009-06-10 23:06:44.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * u_small_xpm[] = {
+static const char * u_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/u.xpm QtDMM-0.8.12/src/xpm/u.xpm
--- QtDMM-0.8.12.orig/src/xpm/u.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/u.xpm	2009-06-10 23:06:42.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * u_xpm[] = {
+static const char * u_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/V_small.xpm QtDMM-0.8.12/src/xpm/V_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/V_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/V_small.xpm	2009-06-10 23:03:49.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * V_small_xpm[] = {
+static const char * V_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/V.xpm QtDMM-0.8.12/src/xpm/V.xpm
--- QtDMM-0.8.12.orig/src/xpm/V.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/V.xpm	2009-06-10 23:03:47.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * V_xpm[] = {
+static const char * V_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/W_small.xpm QtDMM-0.8.12/src/xpm/W_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/W_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/W_small.xpm	2009-06-10 23:03:55.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * W_small_xpm[] = {
+static const char * W_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/W.xpm QtDMM-0.8.12/src/xpm/W.xpm
--- QtDMM-0.8.12.orig/src/xpm/W.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/W.xpm	2009-06-10 23:03:51.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * W_xpm[] = {
+static const char * W_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/QtDMM/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:42:40 -0000	1.1
+++ .cvsignore	28 Aug 2009 20:59:47 -0000	1.2
@@ -0,0 +1 @@
+qtdmm-0.8.12.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/QtDMM/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:42:40 -0000	1.1
+++ sources	28 Aug 2009 20:59:48 -0000	1.2
@@ -0,0 +1 @@
+a028858963eeca6278895a668e119536  qtdmm-0.8.12.tgz



From twaugh at fedoraproject.org  Fri Aug 28 21:06:47 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 21:06:47 +0000 (UTC)
Subject: rpms/cups/devel .cvsignore, 1.46, 1.47 cups-avahi.patch, 1.5,
	1.6 cups.spec, 1.512, 1.513 sources, 1.49,
	1.50 cups-str3229.patch, 1.2, NONE cups-str3231.patch, 1.1,
	NONE cups-str3244.patch, 1.1, NONE cups-str3253.patch, 1.1,
	NONE cups-str3254.patch, 1.1, NONE cups-str3258.patch, 1.1,
	NONE cups-str3259.patch, 1.1, NONE cups-str3266.patch, 1.1,
	NONE cups-str3272.patch, 1.1, NONE cups-str3277.patch, 1.1, NONE
Message-ID: <20090828210647.85DB511C0078@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4520

Modified Files:
	.cvsignore cups-avahi.patch cups.spec sources 
Removed Files:
	cups-str3229.patch cups-str3231.patch cups-str3244.patch 
	cups-str3253.patch cups-str3254.patch cups-str3258.patch 
	cups-str3259.patch cups-str3266.patch cups-str3272.patch 
	cups-str3277.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
- 1.4.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	17 Jun 2009 11:30:02 -0000	1.46
+++ .cvsignore	28 Aug 2009 21:06:45 -0000	1.47
@@ -38,3 +38,4 @@ cups-1.4b1-source.tar.bz2
 cups-1.4b2-source.tar.bz2
 cups-1.4b2-svn8404-source.tar.bz2
 cups-1.4rc1-source.tar.bz2
+cups-1.4.0-source.tar.bz2

cups-avahi.patch:
 backend/dnssd.c              |  532 ++++++++++++++++++++++++++++++++++++-------
 config-scripts/cups-dnssd.m4 |   15 +
 config.h.in                  |    7 
 cups/http-support.c          |  177 +++++++++++++-
 4 files changed, 645 insertions(+), 86 deletions(-)

Index: cups-avahi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-avahi.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cups-avahi.patch	29 Jul 2009 13:48:33 -0000	1.5
+++ cups-avahi.patch	28 Aug 2009 21:06:46 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up cups-1.4rc1/backend/dnssd.c.avahi cups-1.4rc1/backend/dnssd.c
---- cups-1.4rc1/backend/dnssd.c.avahi	2009-07-29 14:00:53.767272320 +0100
-+++ cups-1.4rc1/backend/dnssd.c	2009-07-29 14:01:36.574271697 +0100
+diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
+--- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
++++ cups-1.4.0/backend/dnssd.c	2009-08-28 21:44:27.262137662 +0100
 @@ -22,6 +22,7 @@
   *   exec_backend()          - Execute the backend that corresponds to the
   *                             resolved service name.
@@ -775,10 +775,10 @@ diff -up cups-1.4rc1/backend/dnssd.c.ava
  /*
   * 'sigterm_handler()' - Handle termination signals...
   */
-diff -up cups-1.4rc1/config.h.in.avahi cups-1.4rc1/config.h.in
---- cups-1.4rc1/config.h.in.avahi	2009-05-14 21:48:55.000000000 +0100
-+++ cups-1.4rc1/config.h.in	2009-07-29 14:01:36.575271644 +0100
-@@ -344,6 +344,13 @@
+diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
+--- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
++++ cups-1.4.0/config.h.in	2009-08-28 21:44:27.265137528 +0100
+@@ -336,6 +336,13 @@
  
  
  /*
@@ -792,9 +792,9 @@ diff -up cups-1.4rc1/config.h.in.avahi c
   * Do we have <sys/ioctl.h>?
   */
  
-diff -up cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi cups-1.4rc1/config-scripts/cups-dnssd.m4
---- cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4rc1/config-scripts/cups-dnssd.m4	2009-07-29 14:01:36.575271644 +0100
+diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
+--- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
++++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-08-28 21:44:27.263138688 +0100
 @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
  DNSSDLIBS=""
  DNSSD_BACKEND=""
@@ -817,10 +817,10 @@ diff -up cups-1.4rc1/config-scripts/cups
  if test x$enable_dnssd != xno; then
  	AC_CHECK_HEADER(dns_sd.h, [
  		case "$uname" in
-diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
---- cups-1.4rc1/cups/http-support.c.avahi	2009-04-30 23:15:05.000000000 +0100
-+++ cups-1.4rc1/cups/http-support.c	2009-07-29 14:01:36.577396783 +0100
-@@ -54,6 +54,11 @@
+diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
+--- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
++++ cups-1.4.0/cups/http-support.c	2009-08-28 21:44:27.267137550 +0100
+@@ -55,6 +55,11 @@
  #  include <dns_sd.h>
  #  include <poll.h>
  #endif /* HAVE_DNSSD */
@@ -832,7 +832,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  
  /*
-@@ -120,6 +125,24 @@ static void		resolve_callback(DNSService
+@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
  					 void *context);
  #endif /* HAVE_DNSSD */
  
@@ -857,7 +857,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  /*
   * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1348,15 +1371,26 @@ _httpResolveURI(
+@@ -1349,15 +1372,26 @@ _httpResolveURI(
  
    if (strstr(hostname, "._tcp"))
    {
@@ -886,7 +886,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  
      if (logit)
-@@ -1394,8 +1428,13 @@ _httpResolveURI(
+@@ -1395,8 +1429,13 @@ _httpResolveURI(
      if (domain)
        *domain++ = '\0';
  
@@ -908,7 +908,7 @@ diff -up cups-1.4rc1/cups/http-support.c
      if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
      {
        localref = ref;
-@@ -1457,6 +1497,36 @@ _httpResolveURI(
+@@ -1486,6 +1526,36 @@ _httpResolveURI(
  
        DNSServiceRefDeallocate(ref);
      }
@@ -945,7 +945,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
      if (logit)
      {
-@@ -1468,13 +1538,13 @@ _httpResolveURI(
+@@ -1497,13 +1567,13 @@ _httpResolveURI(
        fputs("STATE: -connecting-to-device\n", stderr);
      }
  
@@ -961,7 +961,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
      if (logit && !uri)
        _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1679,6 +1749,105 @@ resolve_callback(
+@@ -1708,6 +1778,105 @@ resolve_callback(
  }
  #endif /* HAVE_DNSSD */
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- cups.spec	27 Aug 2009 20:28:47 -0000	1.512
+++ cups.spec	28 Aug 2009 21:06:46 -0000	1.513
@@ -1,7 +1,6 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
-%define pre rc1
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define lspp 1
@@ -9,11 +8,11 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4
-Release: 0.%{pre}.21%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
+Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
 Source3: cups-libusb.rules
@@ -48,21 +47,11 @@ Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
 Patch23: cups-res_init.patch
-Patch24: cups-str3229.patch
 Patch25: cups-filter-debug.patch
-Patch26: cups-str3231.patch
-Patch27: cups-str3244.patch
-Patch28: cups-str3258.patch
-Patch29: cups-str3259.patch
 Patch30: cups-uri-compat.patch
-Patch31: cups-str3254.patch
-Patch32: cups-str3253.patch
-Patch33: cups-str3266.patch
 Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
-Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
-Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
@@ -198,7 +187,7 @@ UNIX? operating systems. This is the pa
 module. 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}%{?svn}
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -220,21 +209,11 @@ module. 
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .build
 %patch23 -p1 -b .res_init
-%patch24 -p1 -b .str3229
 %patch25 -p1 -b .filter-debug
-%patch26 -p1 -b .str3231
-%patch27 -p1 -b .str3244
-%patch28 -p1 -b .str3258
-%patch29 -p1 -b .str3259
 %patch30 -p1 -b .uri-compat
-%patch31 -p1 -b .str3254
-%patch32 -p1 -b .str3253
-%patch33 -p1 -b .str3266
 %patch34 -p1 -b .str3262
 %patch35 -p1 -b .cups-get-classes
-%patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
-%patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
@@ -449,6 +428,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/portreserve/%{name}
 %dir %{_datadir}/%{name}/www
 %dir %{_datadir}/%{name}/www/es
+%dir %{_datadir}/%{name}/www/eu
 %dir %{_datadir}/%{name}/www/ja
 %dir %{_datadir}/%{name}/www/pl
 %dir %{_datadir}/%{name}/www/ru
@@ -459,6 +439,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt
 %config(noreplace) %doc %{_datadir}/%{name}/www/de/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html
+%config(noreplace) %doc %{_datadir}/%{name}/www/eu/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html
@@ -493,6 +474,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/cups/templates/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/de/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/es/*.tmpl
+%config(noreplace) %{_datadir}/cups/templates/eu/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl
@@ -538,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
+- 1.4.0.
+
 * Thu Aug 27 2009 Warren Togami <wtogami at redhat.com> 1:1.4-0.rc1.21
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	17 Jun 2009 11:30:03 -0000	1.49
+++ sources	28 Aug 2009 21:06:47 -0000	1.50
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-79948fc1a46e1a3f7aabe5a76fb99e8e  cups-1.4rc1-source.tar.bz2
+bc5e777d4320cecdd1a64de8035171a8  cups-1.4.0-source.tar.bz2


--- cups-str3229.patch DELETED ---


--- cups-str3231.patch DELETED ---


--- cups-str3244.patch DELETED ---


--- cups-str3253.patch DELETED ---


--- cups-str3254.patch DELETED ---


--- cups-str3258.patch DELETED ---


--- cups-str3259.patch DELETED ---


--- cups-str3266.patch DELETED ---


--- cups-str3272.patch DELETED ---


--- cups-str3277.patch DELETED ---



From zap at fedoraproject.org  Fri Aug 28 21:07:02 2009
From: zap at fedoraproject.org (Andrew Zabolotny)
Date: Fri, 28 Aug 2009 21:07:02 +0000 (UTC)
Subject: rpms/QtDMM/F-11 QtDMM.spec, NONE, 1.1 import.log, NONE,
	1.1 qtdmm-0.8.12-desktop.patch, NONE,
	1.1 qtdmm-0.8.12-warnings.patch, NONE,
	1.1 qtdmm-0.8.12-xpm-warnings.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090828210702.11DF411C0078@cvs1.fedora.phx.redhat.com>

Author: zap

Update of /cvs/pkgs/rpms/QtDMM/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3804/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	QtDMM.spec import.log qtdmm-0.8.12-desktop.patch 
	qtdmm-0.8.12-warnings.patch qtdmm-0.8.12-xpm-warnings.patch 
Log Message:
* Sat Aug 29 2009 Andrew Zabolotny <zap at homelink.ru> 0.8.12-1
- Initial import into Fedora



--- NEW FILE QtDMM.spec ---
Name: QtDMM
Version: 0.8.12
Release: 1%{?dist}
Summary: A digital multimeter readout software
Group: Applications/Engineering
License: GPLv2+

URL: http://www.mtoussaint.de/qtdmm.html
Source: http://www.mtoussaint.de/qtdmm-%{version}.tgz
Patch1: qtdmm-0.8.12-desktop.patch
Patch2: qtdmm-0.8.12-xpm-warnings.patch
Patch3: qtdmm-0.8.12-warnings.patch

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: electronics-menu
BuildRequires: qt3-devel, desktop-file-utils

%description
QtDMM is a DMM readout software including a configurable recorder.
The recorder features manual start, scheduled start (at a given time),
triggered automatic start when given thresholds are reached, and the
ability to display more than one value from the multimeter.
It was written for Metex (and compatible like VOLTCRAFT) multimeter
which use an 14 byte protocol. Later several more protocols have been added.
For more information on the currently supported DMM's have a look at
the preset table.

%prep
%setup -q

%patch1 -p1 -b .desktop
%patch2 -p1 -b .xpm-warnings
%patch3 -p1 -b .warnings

chmod a-x src/*.cpp src/*.h

%configure

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_bindir}
install -p -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -p -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -d $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 755 bin/qtdmm $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 qtdmm.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -p -m 644 qtdmm.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
desktop-file-install \
	--vendor="" \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category "Engineering;Electronics;" \
	--delete-original \
	QtDMM.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS CHANGELOG COPYING
%{_bindir}/qtdmm
%{_datadir}/applications/QtDMM.desktop
%{_datadir}/pixmaps/qtdmm.png
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Jun  6 2009 Andrew Zabolotny <zap at homelink.ru> 0.8.12-1
- updated to latest version
- Fedora packaging guidelines

* Thu Nov 23 2006 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.8

* Sat Sep 23 2006 Radek Liboska <liboska at uochb.cas.cz>
- License added, install bug (strip) corrected

* Wed Dec 28 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.7

* Wed Aug 17 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.6

* Mon Jun 28 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.5

* Mon May  2 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.4

* Fri Apr 29 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.3

* Fri Oct 18 2002 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.1

* Tue May  7 2002 Radek Liboska <liboska at uochb.cas.cz>
- ports ttyS4-ttyS7 added

* Wed Mar  6 2002 Radek Liboska <liboska at uochb.cas.cz>
- 0.7

* Tue Nov 27 2001 Radek Liboska <liboska at uochb.cas.cz>
- 0.6 

* Tue Sep  4 2001 Radek Liboska <liboska at uochb.cas.cz>
- 0.5 Second RPM release
- 0.4 Initial RPM release


--- NEW FILE import.log ---
QtDMM-0_8_12-1_fc11_zap:F-11:QtDMM-0.8.12-1.fc11.zap.src.rpm:1251493333

qtdmm-0.8.12-desktop.patch:
 QtDMM.desktop |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE qtdmm-0.8.12-desktop.patch ---
--- QtDMM-0.8.12.orig/QtDMM.desktop	2006-11-11 11:15:37.000000000 +0300
+++ QtDMM-0.8.12/QtDMM.desktop	2009-06-10 23:19:43.000000000 +0400
@@ -1,8 +1,12 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
-Name=QtDMM
-Exec=qtdmm
-Icon=/usr/share/pixmaps/qtdmm.png
-Terminal=false
+GenericName=QtDMM
+Name=Digital Multimeter
+Name[ru_RU]=???????? ??????????
+Comment=A digital multimeter readout software
+Comment[ru_RU]=?????????? ?????? ? ????????? ???????????
 Type=Application
+Exec=qtdmm
+Icon=qtdmm
 Categories=GNOME;KDE;Application;Utility;

qtdmm-0.8.12-warnings.patch:
 dmm.cpp    |   14 +++++++-------
 dmm.h      |    4 ++--
 dmmprefs.h |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE qtdmm-0.8.12-warnings.patch ---
diff -ur QtDMM-0.8.12.orig/src/dmm.cpp QtDMM-0.8.12/src/dmm.cpp
--- QtDMM-0.8.12.orig/src/dmm.cpp	2007-12-25 14:26:19.000000000 +0300
+++ QtDMM-0.8.12/src/dmm.cpp	2009-06-10 23:12:09.000000000 +0400
@@ -418,7 +418,7 @@
   {
     val += re->string()[i];
   }
-  if (re->string()[4]&0x0f != 0x0a)
+  if ((re->string()[4] & 0x0f) != 0x0a)
   {
     val += re->string()[4];
   }
@@ -721,10 +721,10 @@
   m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
 }
 
-char *DMM::RS22812Digit( int byte )
+const char *DMM::RS22812Digit( int byte )
 {
-  int     digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
-  char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  int           digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
+  const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
      
   byte &= 0x0f7;
      
@@ -1545,10 +1545,10 @@
   m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
 }
 
-char *DMM::vc820Digit( int byte )
+const char *DMM::vc820Digit( int byte )
 {
-  int     digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
-  char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  int           digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
+  const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
   
   byte &= 0x7f;
   
diff -ur QtDMM-0.8.12.orig/src/dmm.h QtDMM-0.8.12/src/dmm.h
--- QtDMM-0.8.12.orig/src/dmm.h	2007-12-25 14:26:43.000000000 +0300
+++ QtDMM-0.8.12/src/dmm.h	2009-06-10 23:10:59.000000000 +0400
@@ -82,8 +82,8 @@
   void readVC940Continuous( ReadEvent * );
   void readQM1537Continuous( ReadEvent * );
   void readRS22812Continuous( ReadEvent * );
-  char *vc820Digit( int );
-  char *RS22812Digit( int );
+  const char *vc820Digit( int );
+  const char *RS22812Digit( int );
   
 };
 
diff -ur QtDMM-0.8.12.orig/src/dmmprefs.h QtDMM-0.8.12/src/dmmprefs.h
--- QtDMM-0.8.12.orig/src/dmmprefs.h	2007-11-24 23:52:07.000000000 +0300
+++ QtDMM-0.8.12/src/dmmprefs.h	2009-06-10 23:13:34.000000000 +0400
@@ -26,7 +26,7 @@
 
 struct DMMInfo
 {
-  char *name;
+  const char *name;
   int   baud;
   int   protocol;
   int   bits;

qtdmm-0.8.12-xpm-warnings.patch:
 A.xpm                  |    2 +-
 A_small.xpm            |    2 +-
 DBM.xpm                |    2 +-
 DBM_small.xpm          |    2 +-
 F.xpm                  |    2 +-
 F_small.xpm            |    2 +-
 G.xpm                  |    2 +-
 G_small.xpm            |    2 +-
 H.xpm                  |    2 +-
 H_small.xpm            |    2 +-
 Hz.xpm                 |    2 +-
 Hz_small.xpm           |    2 +-
 Ohm.xpm                |    2 +-
 Ohm_small.xpm          |    2 +-
 V.xpm                  |    2 +-
 V_small.xpm            |    2 +-
 W.xpm                  |    2 +-
 W_small.xpm            |    2 +-
 ac.xpm                 |    2 +-
 all_digits.xpm         |    2 +-
 auto.xpm               |    2 +-
 bar.xpm                |    2 +-
 clear.xpm              |    2 +-
 cm.xpm                 |    2 +-
 cm_small.xpm           |    2 +-
 conf.xpm               |    2 +-
 config.xpm             |    2 +-
 connect_icon.xpm       |    2 +-
 connect_off.xpm        |    2 +-
 connect_on.xpm         |    2 +-
 connection.xpm         |    2 +-
 dc.xpm                 |    2 +-
 decimal.xpm            |    2 +-
 decimal_small.xpm      |    2 +-
 deg.xpm                |    2 +-
 deg_small.xpm          |    2 +-
 diode.xpm              |    2 +-
 display.xpm            |    2 +-
 dmm.xpm                |    2 +-
 dmm_big.xpm            |    2 +-
 ee.xpm                 |    2 +-
 execute.xpm            |    2 +-
 export.xpm             |    2 +-
 fifty_bar.xpm          |    2 +-
 fourty_bar.xpm         |    2 +-
 graph.xpm              |    2 +-
 gui.xpm                |    2 +-
 help.xpm               |    2 +-
 hi.xpm                 |    2 +-
 hold.xpm               |    2 +-
 icon.xpm               |    2 +-
 icon_gray.xpm          |    2 +-
 import.xpm             |    2 +-
 integration.xpm        |    2 +-
 integration_old.xpm    |    2 +-
 k.xpm                  |    2 +-
 k_small.xpm            |    2 +-
 l.xpm                  |    2 +-
 l_small.xpm            |    2 +-
 m.xpm                  |    2 +-
 m_small.xpm            |    2 +-
 manu.xpm               |    2 +-
 max_str.xpm            |    2 +-
 min_str.xpm            |    2 +-
 minus.xpm              |    2 +-
 minus_small.xpm        |    2 +-
 n.xpm                  |    2 +-
 n_small.xpm            |    2 +-
 null_bar.xpm           |    2 +-
 numbers.xpm            |    2 +-
 numbers_small.xpm      |    2 +-
 numers_tiny.xpm        |    2 +-
 p.xpm                  |    2 +-
 p_small.xpm            |    2 +-
 percent.xpm            |    2 +-
 percent_small.xpm      |    2 +-
 print.xpm              |    2 +-
 quit.xpm               |    2 +-
 recorder.xpm           |    2 +-
 reset.xpm              |    2 +-
 scale.xpm              |    2 +-
 sixty_bar.xpm          |    2 +-
 specialchars.xpm       |    2 +-
 specialchars_small.xpm |    2 +-
 start.xpm              |    2 +-
 stop.xpm               |    2 +-
 ten_bar.xpm            |    2 +-
 thirty_bar.xpm         |    2 +-
 twenty_bar.xpm         |    2 +-
 u.xpm                  |    2 +-
 u_small.xpm            |    2 +-
 91 files changed, 91 insertions(+), 91 deletions(-)

--- NEW FILE qtdmm-0.8.12-xpm-warnings.patch ---
diff -ur QtDMM-0.8.12.orig/src/xpm/ac.xpm QtDMM-0.8.12/src/xpm/ac.xpm
--- QtDMM-0.8.12.orig/src/xpm/ac.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ac.xpm	2009-06-10 23:03:57.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ac_xpm[] = {
+static const char * ac_xpm[] = {
 "18 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/all_digits.xpm QtDMM-0.8.12/src/xpm/all_digits.xpm
--- QtDMM-0.8.12.orig/src/xpm/all_digits.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/all_digits.xpm	2009-06-10 23:04:01.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * all_digits_xpm[] = {
+static const char * all_digits_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/A_small.xpm QtDMM-0.8.12/src/xpm/A_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/A_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/A_small.xpm	2009-06-10 23:03:16.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * A_small_xpm[] = {
+static const char * A_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/auto.xpm QtDMM-0.8.12/src/xpm/auto.xpm
--- QtDMM-0.8.12.orig/src/xpm/auto.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/auto.xpm	2009-06-10 23:04:03.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * auto_xpm[] = {
+static const char * auto_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/A.xpm QtDMM-0.8.12/src/xpm/A.xpm
--- QtDMM-0.8.12.orig/src/xpm/A.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/A.xpm	2009-06-10 23:03:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * A_xpm[] = {
+static const char * A_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/bar.xpm QtDMM-0.8.12/src/xpm/bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/bar.xpm	2009-06-10 23:04:05.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * bar_xpm[] = {
+static const char * bar_xpm[] = {
 "5 9 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/clear.xpm QtDMM-0.8.12/src/xpm/clear.xpm
--- QtDMM-0.8.12.orig/src/xpm/clear.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/clear.xpm	2009-06-10 23:04:07.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * clear_xpm[] = {
+static const char * clear_xpm[] = {
 "22 22 108 2",
 "  	g None",
 ". 	g #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/cm_small.xpm QtDMM-0.8.12/src/xpm/cm_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/cm_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/cm_small.xpm	2009-06-10 23:04:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * M_small_xpm[] = {
+static const char * M_small_xpm[] = {
 "7 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/cm.xpm QtDMM-0.8.12/src/xpm/cm.xpm
--- QtDMM-0.8.12.orig/src/xpm/cm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/cm.xpm	2009-06-10 23:04:09.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * M_xpm[] = {
+static const char * M_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/config.xpm QtDMM-0.8.12/src/xpm/config.xpm
--- QtDMM-0.8.12.orig/src/xpm/config.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/config.xpm	2009-06-10 23:04:17.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * config_xpm[] = {
+static const char * config_xpm[] = {
 "22 22 20 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/conf.xpm QtDMM-0.8.12/src/xpm/conf.xpm
--- QtDMM-0.8.12.orig/src/xpm/conf.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/conf.xpm	2009-06-10 23:04:15.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * conf_xpm[] = {
+static const char * conf_xpm[] = {
 "22 22 20 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_icon.xpm QtDMM-0.8.12/src/xpm/connect_icon.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_icon.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_icon.xpm	2009-06-10 23:04:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_icon_xpm[] = {
+static const char * connect_icon_xpm[] = {
 "32 32 188 2",
 "  	c None",
 ". 	c #FFFF00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connection.xpm QtDMM-0.8.12/src/xpm/connection.xpm
--- QtDMM-0.8.12.orig/src/xpm/connection.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connection.xpm	2009-06-10 23:04:25.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connection_xpm[] = {
+static const char * connection_xpm[] = {
 "32 32 67 1",
 " 	c None",
 ".	c #FDFD00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_off.xpm QtDMM-0.8.12/src/xpm/connect_off.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_off.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_off.xpm	2009-06-10 23:04:21.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_off_xpm[] = {
+static const char * connect_off_xpm[] = {
 "22 22 18 1",
 " 	c None",
 ".	c #FFFF00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_on.xpm QtDMM-0.8.12/src/xpm/connect_on.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_on.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_on.xpm	2009-06-10 23:04:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_on_xpm[] = {
+static const char * connect_on_xpm[] = {
 "22 22 16 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/DBM_small.xpm QtDMM-0.8.12/src/xpm/DBM_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/DBM_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/DBM_small.xpm	2009-06-10 23:03:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DBM_small_xpm[] = {
+static const char * DBM_small_xpm[] = {
 "9 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/DBM.xpm QtDMM-0.8.12/src/xpm/DBM.xpm
--- QtDMM-0.8.12.orig/src/xpm/DBM.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/DBM.xpm	2009-06-10 23:03:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DBM_xpm[] = {
+static const char * DBM_xpm[] = {
 "15 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/dc.xpm QtDMM-0.8.12/src/xpm/dc.xpm
--- QtDMM-0.8.12.orig/src/xpm/dc.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dc.xpm	2009-06-10 23:04:27.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dc_xpm[] = {
+static const char * dc_xpm[] = {
 "18 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/decimal_small.xpm QtDMM-0.8.12/src/xpm/decimal_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/decimal_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/decimal_small.xpm	2009-06-10 23:04:34.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * decimal_small_xpm[] = {
+static const char * decimal_small_xpm[] = {
 "4 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/decimal.xpm QtDMM-0.8.12/src/xpm/decimal.xpm
--- QtDMM-0.8.12.orig/src/xpm/decimal.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/decimal.xpm	2009-06-10 23:04:32.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * decimal_xpm[] = {
+static const char * decimal_xpm[] = {
 "11 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/deg_small.xpm QtDMM-0.8.12/src/xpm/deg_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/deg_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/deg_small.xpm	2009-06-10 23:04:38.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * deg_small_xpm[] = {
+static const char * deg_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/deg.xpm QtDMM-0.8.12/src/xpm/deg.xpm
--- QtDMM-0.8.12.orig/src/xpm/deg.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/deg.xpm	2009-06-10 23:04:36.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * deg_xpm[] = {
+static const char * deg_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/diode.xpm QtDMM-0.8.12/src/xpm/diode.xpm
--- QtDMM-0.8.12.orig/src/xpm/diode.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/diode.xpm	2009-06-10 23:04:40.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * diode_xpm[] = {
+static const char * diode_xpm[] = {
 "17 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/display.xpm QtDMM-0.8.12/src/xpm/display.xpm
--- QtDMM-0.8.12.orig/src/xpm/display.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/display.xpm	2009-06-10 23:04:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * display_xpm[] = {
+static const char * display_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #00B506",
diff -ur QtDMM-0.8.12.orig/src/xpm/dmm_big.xpm QtDMM-0.8.12/src/xpm/dmm_big.xpm
--- QtDMM-0.8.12.orig/src/xpm/dmm_big.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dmm_big.xpm	2009-06-10 23:04:47.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dmm_big_xpm[] = {
+static const char * dmm_big_xpm[] = {
 "64 64 14 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/dmm.xpm QtDMM-0.8.12/src/xpm/dmm.xpm
--- QtDMM-0.8.12.orig/src/xpm/dmm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dmm.xpm	2009-06-10 23:04:45.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dmm_xpm[] = {
+static const char * dmm_xpm[] = {
 "32 32 14 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/ee.xpm QtDMM-0.8.12/src/xpm/ee.xpm
--- QtDMM-0.8.12.orig/src/xpm/ee.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ee.xpm	2009-06-10 23:04:49.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ee_xpm[] = {
+static const char * ee_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/execute.xpm QtDMM-0.8.12/src/xpm/execute.xpm
--- QtDMM-0.8.12.orig/src/xpm/execute.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/execute.xpm	2009-06-10 23:04:51.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * execute_xpm[] = {
+static const char * execute_xpm[] = {
 "32 32 9 1",
 " 	c None",
 ".	c #050505",
diff -ur QtDMM-0.8.12.orig/src/xpm/export.xpm QtDMM-0.8.12/src/xpm/export.xpm
--- QtDMM-0.8.12.orig/src/xpm/export.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/export.xpm	2009-06-10 23:04:54.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * export_xpm[] = {
+static const char * export_xpm[] = {
 "22 22 117 2",
 "  	c None",
 ". 	c #6B6B6B",
diff -ur QtDMM-0.8.12.orig/src/xpm/fifty_bar.xpm QtDMM-0.8.12/src/xpm/fifty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/fifty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/fifty_bar.xpm	2009-06-10 23:04:56.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fifty_bar_xpm[] = {
+static const char * fifty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/fourty_bar.xpm QtDMM-0.8.12/src/xpm/fourty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/fourty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/fourty_bar.xpm	2009-06-10 23:04:59.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fourty_bar_xpm[] = {
+static const char * fourty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/F_small.xpm QtDMM-0.8.12/src/xpm/F_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/F_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/F_small.xpm	2009-06-10 23:03:28.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * F_small_xpm[] = {
+static const char * F_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/F.xpm QtDMM-0.8.12/src/xpm/F.xpm
--- QtDMM-0.8.12.orig/src/xpm/F.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/F.xpm	2009-06-10 23:03:26.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * F_xpm[] = {
+static const char * F_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/graph.xpm QtDMM-0.8.12/src/xpm/graph.xpm
--- QtDMM-0.8.12.orig/src/xpm/graph.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/graph.xpm	2009-06-10 23:05:01.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * graph_xpm[] = {
+static const char * graph_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/G_small.xpm QtDMM-0.8.12/src/xpm/G_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/G_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/G_small.xpm	2009-06-10 23:03:33.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * G_small_xpm[] = {
+static const char * G_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/gui.xpm QtDMM-0.8.12/src/xpm/gui.xpm
--- QtDMM-0.8.12.orig/src/xpm/gui.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/gui.xpm	2009-06-10 23:05:04.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gui_xpm[] = {
+static const char * gui_xpm[] = {
 "32 32 303 2",
 "  	c None",
 ". 	c #272727",
diff -ur QtDMM-0.8.12.orig/src/xpm/G.xpm QtDMM-0.8.12/src/xpm/G.xpm
--- QtDMM-0.8.12.orig/src/xpm/G.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/G.xpm	2009-06-10 23:03:30.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * G_xpm[] = {
+static const char * G_xpm[] = {
 "11 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/help.xpm QtDMM-0.8.12/src/xpm/help.xpm
--- QtDMM-0.8.12.orig/src/xpm/help.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/help.xpm	2009-06-10 23:05:06.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * help_xpm[] = {
+static const char * help_xpm[] = {
 "22 22 4 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/hi.xpm QtDMM-0.8.12/src/xpm/hi.xpm
--- QtDMM-0.8.12.orig/src/xpm/hi.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/hi.xpm	2009-06-10 23:05:08.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hi_xpm[] = {
+static const char * hi_xpm[] = {
 "18 9 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/hold.xpm QtDMM-0.8.12/src/xpm/hold.xpm
--- QtDMM-0.8.12.orig/src/xpm/hold.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/hold.xpm	2009-06-10 23:05:11.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hold_xpm[] = {
+static const char * hold_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/H_small.xpm QtDMM-0.8.12/src/xpm/H_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/H_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/H_small.xpm	2009-06-10 23:03:37.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * H_small_xpm[] = {
+static const char * H_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/H.xpm QtDMM-0.8.12/src/xpm/H.xpm
--- QtDMM-0.8.12.orig/src/xpm/H.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/H.xpm	2009-06-10 23:03:35.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * H_xpm[] = {
+static const char * H_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Hz_small.xpm QtDMM-0.8.12/src/xpm/Hz_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/Hz_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Hz_small.xpm	2009-06-10 23:03:41.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Hz_small_xpm[] = {
+static const char * Hz_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Hz.xpm QtDMM-0.8.12/src/xpm/Hz.xpm
--- QtDMM-0.8.12.orig/src/xpm/Hz.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Hz.xpm	2009-06-10 23:03:39.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Hz_xpm[] = {
+static const char * Hz_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/icon_gray.xpm QtDMM-0.8.12/src/xpm/icon_gray.xpm
--- QtDMM-0.8.12.orig/src/xpm/icon_gray.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/icon_gray.xpm	2009-06-10 23:05:15.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_gray_xpm[] = {
+static const char * icon_gray_xpm[] = {
 "32 32 15 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/icon.xpm QtDMM-0.8.12/src/xpm/icon.xpm
--- QtDMM-0.8.12.orig/src/xpm/icon.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/icon.xpm	2009-06-10 23:05:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_xpm[] = {
+static const char * icon_xpm[] = {
 "32 32 15 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/import.xpm QtDMM-0.8.12/src/xpm/import.xpm
--- QtDMM-0.8.12.orig/src/xpm/import.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/import.xpm	2009-06-10 23:05:17.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * import_xpm[] = {
+static const char * import_xpm[] = {
 "22 22 191 2",
 "  	c None",
 ". 	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/integration_old.xpm QtDMM-0.8.12/src/xpm/integration_old.xpm
--- QtDMM-0.8.12.orig/src/xpm/integration_old.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/integration_old.xpm	2009-06-10 23:05:22.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * integration_old_xpm[] = {
+static const char * integration_old_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #0033FF",
diff -ur QtDMM-0.8.12.orig/src/xpm/integration.xpm QtDMM-0.8.12/src/xpm/integration.xpm
--- QtDMM-0.8.12.orig/src/xpm/integration.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/integration.xpm	2009-06-10 23:05:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * integration_xpm[] = {
+static const char * integration_xpm[] = {
 "32 32 82 1",
 " 	c None",
 ".	c #FFFFFF",
diff -ur QtDMM-0.8.12.orig/src/xpm/k_small.xpm QtDMM-0.8.12/src/xpm/k_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/k_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/k_small.xpm	2009-06-10 23:05:27.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * k_small_xpm[] = {
+static const char * k_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/k.xpm QtDMM-0.8.12/src/xpm/k.xpm
--- QtDMM-0.8.12.orig/src/xpm/k.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/k.xpm	2009-06-10 23:05:24.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * k_xpm[] = {
+static const char * k_xpm[] = {
 "7 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/l_small.xpm QtDMM-0.8.12/src/xpm/l_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/l_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/l_small.xpm	2009-06-10 23:05:32.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * l_small_xpm[] = {
+static const char * l_small_xpm[] = {
 "12 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/l.xpm QtDMM-0.8.12/src/xpm/l.xpm
--- QtDMM-0.8.12.orig/src/xpm/l.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/l.xpm	2009-06-10 23:05:29.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * l_xpm[] = {
+static const char * l_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/manu.xpm QtDMM-0.8.12/src/xpm/manu.xpm
--- QtDMM-0.8.12.orig/src/xpm/manu.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/manu.xpm	2009-06-10 23:05:39.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * manu_xpm[] = {
+static const char * manu_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/max_str.xpm QtDMM-0.8.12/src/xpm/max_str.xpm
--- QtDMM-0.8.12.orig/src/xpm/max_str.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/max_str.xpm	2009-06-10 23:05:41.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * max_str_xpm[] = {
+static const char * max_str_xpm[] = {
 "19 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/min_str.xpm QtDMM-0.8.12/src/xpm/min_str.xpm
--- QtDMM-0.8.12.orig/src/xpm/min_str.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/min_str.xpm	2009-06-10 23:05:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * min_str_xpm[] = {
+static const char * min_str_xpm[] = {
 "15 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/minus_small.xpm QtDMM-0.8.12/src/xpm/minus_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/minus_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/minus_small.xpm	2009-06-10 23:05:48.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * minus_small_xpm[] = {
+static const char * minus_small_xpm[] = {
 "8 3 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/minus.xpm QtDMM-0.8.12/src/xpm/minus.xpm
--- QtDMM-0.8.12.orig/src/xpm/minus.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/minus.xpm	2009-06-10 23:05:46.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * minus_xpm[] = {
+static const char * minus_xpm[] = {
 "22 63 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/m_small.xpm QtDMM-0.8.12/src/xpm/m_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/m_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/m_small.xpm	2009-06-10 23:05:36.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * m_small_xpm[] = {
+static const char * m_small_xpm[] = {
 "7 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/m.xpm QtDMM-0.8.12/src/xpm/m.xpm
--- QtDMM-0.8.12.orig/src/xpm/m.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/m.xpm	2009-06-10 23:05:34.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * m_xpm[] = {
+static const char * m_xpm[] = {
 "11 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/n_small.xpm QtDMM-0.8.12/src/xpm/n_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/n_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/n_small.xpm	2009-06-10 23:05:52.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * n_small_xpm[] = {
+static const char * n_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/null_bar.xpm QtDMM-0.8.12/src/xpm/null_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/null_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/null_bar.xpm	2009-06-10 23:05:54.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * null_bar_xpm[] = {
+static const char * null_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numbers_small.xpm QtDMM-0.8.12/src/xpm/numbers_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/numbers_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numbers_small.xpm	2009-06-10 23:05:58.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numbers_small_xpm[] = {
+static const char * numbers_small_xpm[] = {
 "120 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numbers.xpm QtDMM-0.8.12/src/xpm/numbers.xpm
--- QtDMM-0.8.12.orig/src/xpm/numbers.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numbers.xpm	2009-06-10 23:05:56.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numbers_xpm[] = {
+static const char * numbers_xpm[] = {
 "340 60 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numers_tiny.xpm QtDMM-0.8.12/src/xpm/numers_tiny.xpm
--- QtDMM-0.8.12.orig/src/xpm/numers_tiny.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numers_tiny.xpm	2009-06-10 23:06:00.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numers_tiny_xpm[] = {
+static const char * numers_tiny_xpm[] = {
 "80 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/n.xpm QtDMM-0.8.12/src/xpm/n.xpm
--- QtDMM-0.8.12.orig/src/xpm/n.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/n.xpm	2009-06-10 23:05:50.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * n_xpm[] = {
+static const char * n_xpm[] = {
 "7 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Ohm_small.xpm QtDMM-0.8.12/src/xpm/Ohm_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/Ohm_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Ohm_small.xpm	2009-06-10 23:03:45.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Ohm_small_xpm[] = {
+static const char * Ohm_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Ohm.xpm QtDMM-0.8.12/src/xpm/Ohm.xpm
--- QtDMM-0.8.12.orig/src/xpm/Ohm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Ohm.xpm	2009-06-10 23:03:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Ohm_xpm[] = {
+static const char * Ohm_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/percent_small.xpm QtDMM-0.8.12/src/xpm/percent_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/percent_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/percent_small.xpm	2009-06-10 23:06:09.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * percent_small_xpm[] = {
+static const char * percent_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/percent.xpm QtDMM-0.8.12/src/xpm/percent.xpm
--- QtDMM-0.8.12.orig/src/xpm/percent.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/percent.xpm	2009-06-10 23:06:07.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * percent_xpm[] = {
+static const char * percent_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/print.xpm QtDMM-0.8.12/src/xpm/print.xpm
--- QtDMM-0.8.12.orig/src/xpm/print.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/print.xpm	2009-06-10 23:06:12.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * print_xpm[] = {
+static const char * print_xpm[] = {
 "22 22 178 2",
 "  	c None",
 ". 	c #565656",
diff -ur QtDMM-0.8.12.orig/src/xpm/p_small.xpm QtDMM-0.8.12/src/xpm/p_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/p_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/p_small.xpm	2009-06-10 23:06:05.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * p_small_xpm[] = {
+static const char * p_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/p.xpm QtDMM-0.8.12/src/xpm/p.xpm
--- QtDMM-0.8.12.orig/src/xpm/p.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/p.xpm	2009-06-10 23:06:03.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * p_xpm[] = {
+static const char * p_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/quit.xpm QtDMM-0.8.12/src/xpm/quit.xpm
--- QtDMM-0.8.12.orig/src/xpm/quit.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/quit.xpm	2009-06-10 23:06:14.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * quit_xpm[] = {
+static const char * quit_xpm[] = {
 "22 22 93 2",
 "  	c None",
 ". 	c #FFFFFF",
diff -ur QtDMM-0.8.12.orig/src/xpm/recorder.xpm QtDMM-0.8.12/src/xpm/recorder.xpm
--- QtDMM-0.8.12.orig/src/xpm/recorder.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/recorder.xpm	2009-06-10 23:06:16.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * recorder_xpm[] = {
+static const char * recorder_xpm[] = {
 "32 32 101 2",
 "  	g None",
 ". 	g #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/reset.xpm QtDMM-0.8.12/src/xpm/reset.xpm
--- QtDMM-0.8.12.orig/src/xpm/reset.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/reset.xpm	2009-06-10 23:06:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * reset_xpm[] = {
+static const char * reset_xpm[] = {
 "20 20 127 2",
 "  	c None",
 ". 	c #5A5A5A",
diff -ur QtDMM-0.8.12.orig/src/xpm/scale.xpm QtDMM-0.8.12/src/xpm/scale.xpm
--- QtDMM-0.8.12.orig/src/xpm/scale.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/scale.xpm	2009-06-10 23:06:21.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * scale_xpm[] = {
+static const char * scale_xpm[] = {
 "32 32 5 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/sixty_bar.xpm QtDMM-0.8.12/src/xpm/sixty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/sixty_bar.xpm	2007-08-19 21:37:34.000000000 +0400
+++ QtDMM-0.8.12/src/xpm/sixty_bar.xpm	2009-06-10 23:06:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sixty_bar_xpm[] = {
+static const char * sixty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/specialchars_small.xpm QtDMM-0.8.12/src/xpm/specialchars_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/specialchars_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/specialchars_small.xpm	2009-06-10 23:06:28.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * specialchars_small_xpm[] = {
+static const char * specialchars_small_xpm[] = {
 "156 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/specialchars.xpm QtDMM-0.8.12/src/xpm/specialchars.xpm
--- QtDMM-0.8.12.orig/src/xpm/specialchars.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/specialchars.xpm	2009-06-10 23:06:26.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * specialchars_xpm[] = {
+static const char * specialchars_xpm[] = {
 "442 60 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/start.xpm QtDMM-0.8.12/src/xpm/start.xpm
--- QtDMM-0.8.12.orig/src/xpm/start.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/start.xpm	2009-06-10 23:06:30.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * start_xpm[] = {
+static const char * start_xpm[] = {
 "22 22 101 2",
 "  	c None",
 ". 	c #0C3651",
diff -ur QtDMM-0.8.12.orig/src/xpm/stop.xpm QtDMM-0.8.12/src/xpm/stop.xpm
--- QtDMM-0.8.12.orig/src/xpm/stop.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/stop.xpm	2009-06-10 23:06:33.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stop_xpm[] = {
+static const char * stop_xpm[] = {
 "22 22 129 2",
 "  	c None",
 ". 	c #1E0A0A",
diff -ur QtDMM-0.8.12.orig/src/xpm/ten_bar.xpm QtDMM-0.8.12/src/xpm/ten_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/ten_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ten_bar.xpm	2009-06-10 23:06:35.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ten_bar_xpm[] = {
+static const char * ten_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/thirty_bar.xpm QtDMM-0.8.12/src/xpm/thirty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/thirty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/thirty_bar.xpm	2009-06-10 23:06:38.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * thirty_bar_xpm[] = {
+static const char * thirty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/twenty_bar.xpm QtDMM-0.8.12/src/xpm/twenty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/twenty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/twenty_bar.xpm	2009-06-10 23:06:40.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * twenty_bar_xpm[] = {
+static const char * twenty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/u_small.xpm QtDMM-0.8.12/src/xpm/u_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/u_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/u_small.xpm	2009-06-10 23:06:44.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * u_small_xpm[] = {
+static const char * u_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/u.xpm QtDMM-0.8.12/src/xpm/u.xpm
--- QtDMM-0.8.12.orig/src/xpm/u.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/u.xpm	2009-06-10 23:06:42.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * u_xpm[] = {
+static const char * u_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/V_small.xpm QtDMM-0.8.12/src/xpm/V_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/V_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/V_small.xpm	2009-06-10 23:03:49.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * V_small_xpm[] = {
+static const char * V_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/V.xpm QtDMM-0.8.12/src/xpm/V.xpm
--- QtDMM-0.8.12.orig/src/xpm/V.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/V.xpm	2009-06-10 23:03:47.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * V_xpm[] = {
+static const char * V_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/W_small.xpm QtDMM-0.8.12/src/xpm/W_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/W_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/W_small.xpm	2009-06-10 23:03:55.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * W_small_xpm[] = {
+static const char * W_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/W.xpm QtDMM-0.8.12/src/xpm/W.xpm
--- QtDMM-0.8.12.orig/src/xpm/W.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/W.xpm	2009-06-10 23:03:51.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * W_xpm[] = {
+static const char * W_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/QtDMM/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:42:40 -0000	1.1
+++ .cvsignore	28 Aug 2009 21:07:01 -0000	1.2
@@ -0,0 +1 @@
+qtdmm-0.8.12.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/QtDMM/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:42:40 -0000	1.1
+++ sources	28 Aug 2009 21:07:01 -0000	1.2
@@ -0,0 +1 @@
+a028858963eeca6278895a668e119536  qtdmm-0.8.12.tgz



From zap at fedoraproject.org  Fri Aug 28 21:08:30 2009
From: zap at fedoraproject.org (Andrew Zabolotny)
Date: Fri, 28 Aug 2009 21:08:30 +0000 (UTC)
Subject: rpms/QtDMM/F-10 QtDMM.spec, NONE, 1.1 import.log, NONE,
	1.1 qtdmm-0.8.12-desktop.patch, NONE,
	1.1 qtdmm-0.8.12-warnings.patch, NONE,
	1.1 qtdmm-0.8.12-xpm-warnings.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090828210830.7BF3911C0078@cvs1.fedora.phx.redhat.com>

Author: zap

Update of /cvs/pkgs/rpms/QtDMM/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5175/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	QtDMM.spec import.log qtdmm-0.8.12-desktop.patch 
	qtdmm-0.8.12-warnings.patch qtdmm-0.8.12-xpm-warnings.patch 
Log Message:
* Sat Aug 29 2009 Andrew Zabolotny <zap at homelink.ru> 0.8.12-1
- Initial import into Fedora



--- NEW FILE QtDMM.spec ---
Name: QtDMM
Version: 0.8.12
Release: 1%{?dist}
Summary: A digital multimeter readout software
Group: Applications/Engineering
License: GPLv2+

URL: http://www.mtoussaint.de/qtdmm.html
Source: http://www.mtoussaint.de/qtdmm-%{version}.tgz
Patch1: qtdmm-0.8.12-desktop.patch
Patch2: qtdmm-0.8.12-xpm-warnings.patch
Patch3: qtdmm-0.8.12-warnings.patch

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: electronics-menu
BuildRequires: qt3-devel, desktop-file-utils

%description
QtDMM is a DMM readout software including a configurable recorder.
The recorder features manual start, scheduled start (at a given time),
triggered automatic start when given thresholds are reached, and the
ability to display more than one value from the multimeter.
It was written for Metex (and compatible like VOLTCRAFT) multimeter
which use an 14 byte protocol. Later several more protocols have been added.
For more information on the currently supported DMM's have a look at
the preset table.

%prep
%setup -q

%patch1 -p1 -b .desktop
%patch2 -p1 -b .xpm-warnings
%patch3 -p1 -b .warnings

chmod a-x src/*.cpp src/*.h

%configure

%build
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -p -d $RPM_BUILD_ROOT%{_bindir}
install -p -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -p -d $RPM_BUILD_ROOT%{_datadir}/applications
install -p -d $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 755 bin/qtdmm $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 qtdmm.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -p -m 644 qtdmm.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
desktop-file-install \
	--vendor="" \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category "Engineering;Electronics;" \
	--delete-original \
	QtDMM.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS CHANGELOG COPYING
%{_bindir}/qtdmm
%{_datadir}/applications/QtDMM.desktop
%{_datadir}/pixmaps/qtdmm.png
%{_mandir}/man1/%{name}.1.gz

%changelog
* Sat Jun  6 2009 Andrew Zabolotny <zap at homelink.ru> 0.8.12-1
- updated to latest version
- Fedora packaging guidelines

* Thu Nov 23 2006 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.8

* Sat Sep 23 2006 Radek Liboska <liboska at uochb.cas.cz>
- License added, install bug (strip) corrected

* Wed Dec 28 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.7

* Wed Aug 17 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.6

* Mon Jun 28 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.5

* Mon May  2 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.4

* Fri Apr 29 2005 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.3

* Fri Oct 18 2002 Radek Liboska <liboska at uochb.cas.cz>
- 0.8.1

* Tue May  7 2002 Radek Liboska <liboska at uochb.cas.cz>
- ports ttyS4-ttyS7 added

* Wed Mar  6 2002 Radek Liboska <liboska at uochb.cas.cz>
- 0.7

* Tue Nov 27 2001 Radek Liboska <liboska at uochb.cas.cz>
- 0.6 

* Tue Sep  4 2001 Radek Liboska <liboska at uochb.cas.cz>
- 0.5 Second RPM release
- 0.4 Initial RPM release


--- NEW FILE import.log ---
QtDMM-0_8_12-1_fc11_zap:F-10:QtDMM-0.8.12-1.fc11.zap.src.rpm:1251493682

qtdmm-0.8.12-desktop.patch:
 QtDMM.desktop |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE qtdmm-0.8.12-desktop.patch ---
--- QtDMM-0.8.12.orig/QtDMM.desktop	2006-11-11 11:15:37.000000000 +0300
+++ QtDMM-0.8.12/QtDMM.desktop	2009-06-10 23:19:43.000000000 +0400
@@ -1,8 +1,12 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
-Name=QtDMM
-Exec=qtdmm
-Icon=/usr/share/pixmaps/qtdmm.png
-Terminal=false
+GenericName=QtDMM
+Name=Digital Multimeter
+Name[ru_RU]=???????? ??????????
+Comment=A digital multimeter readout software
+Comment[ru_RU]=?????????? ?????? ? ????????? ???????????
 Type=Application
+Exec=qtdmm
+Icon=qtdmm
 Categories=GNOME;KDE;Application;Utility;

qtdmm-0.8.12-warnings.patch:
 dmm.cpp    |   14 +++++++-------
 dmm.h      |    4 ++--
 dmmprefs.h |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE qtdmm-0.8.12-warnings.patch ---
diff -ur QtDMM-0.8.12.orig/src/dmm.cpp QtDMM-0.8.12/src/dmm.cpp
--- QtDMM-0.8.12.orig/src/dmm.cpp	2007-12-25 14:26:19.000000000 +0300
+++ QtDMM-0.8.12/src/dmm.cpp	2009-06-10 23:12:09.000000000 +0400
@@ -418,7 +418,7 @@
   {
     val += re->string()[i];
   }
-  if (re->string()[4]&0x0f != 0x0a)
+  if ((re->string()[4] & 0x0f) != 0x0a)
   {
     val += re->string()[4];
   }
@@ -721,10 +721,10 @@
   m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
 }
 
-char *DMM::RS22812Digit( int byte )
+const char *DMM::RS22812Digit( int byte )
 {
-  int     digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
-  char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  int           digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 };
+  const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
      
   byte &= 0x0f7;
      
@@ -1545,10 +1545,10 @@
   m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")";
 }
 
-char *DMM::vc820Digit( int byte )
+const char *DMM::vc820Digit( int byte )
 {
-  int     digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
-  char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+  int           digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f };
+  const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
   
   byte &= 0x7f;
   
diff -ur QtDMM-0.8.12.orig/src/dmm.h QtDMM-0.8.12/src/dmm.h
--- QtDMM-0.8.12.orig/src/dmm.h	2007-12-25 14:26:43.000000000 +0300
+++ QtDMM-0.8.12/src/dmm.h	2009-06-10 23:10:59.000000000 +0400
@@ -82,8 +82,8 @@
   void readVC940Continuous( ReadEvent * );
   void readQM1537Continuous( ReadEvent * );
   void readRS22812Continuous( ReadEvent * );
-  char *vc820Digit( int );
-  char *RS22812Digit( int );
+  const char *vc820Digit( int );
+  const char *RS22812Digit( int );
   
 };
 
diff -ur QtDMM-0.8.12.orig/src/dmmprefs.h QtDMM-0.8.12/src/dmmprefs.h
--- QtDMM-0.8.12.orig/src/dmmprefs.h	2007-11-24 23:52:07.000000000 +0300
+++ QtDMM-0.8.12/src/dmmprefs.h	2009-06-10 23:13:34.000000000 +0400
@@ -26,7 +26,7 @@
 
 struct DMMInfo
 {
-  char *name;
+  const char *name;
   int   baud;
   int   protocol;
   int   bits;

qtdmm-0.8.12-xpm-warnings.patch:
 A.xpm                  |    2 +-
 A_small.xpm            |    2 +-
 DBM.xpm                |    2 +-
 DBM_small.xpm          |    2 +-
 F.xpm                  |    2 +-
 F_small.xpm            |    2 +-
 G.xpm                  |    2 +-
 G_small.xpm            |    2 +-
 H.xpm                  |    2 +-
 H_small.xpm            |    2 +-
 Hz.xpm                 |    2 +-
 Hz_small.xpm           |    2 +-
 Ohm.xpm                |    2 +-
 Ohm_small.xpm          |    2 +-
 V.xpm                  |    2 +-
 V_small.xpm            |    2 +-
 W.xpm                  |    2 +-
 W_small.xpm            |    2 +-
 ac.xpm                 |    2 +-
 all_digits.xpm         |    2 +-
 auto.xpm               |    2 +-
 bar.xpm                |    2 +-
 clear.xpm              |    2 +-
 cm.xpm                 |    2 +-
 cm_small.xpm           |    2 +-
 conf.xpm               |    2 +-
 config.xpm             |    2 +-
 connect_icon.xpm       |    2 +-
 connect_off.xpm        |    2 +-
 connect_on.xpm         |    2 +-
 connection.xpm         |    2 +-
 dc.xpm                 |    2 +-
 decimal.xpm            |    2 +-
 decimal_small.xpm      |    2 +-
 deg.xpm                |    2 +-
 deg_small.xpm          |    2 +-
 diode.xpm              |    2 +-
 display.xpm            |    2 +-
 dmm.xpm                |    2 +-
 dmm_big.xpm            |    2 +-
 ee.xpm                 |    2 +-
 execute.xpm            |    2 +-
 export.xpm             |    2 +-
 fifty_bar.xpm          |    2 +-
 fourty_bar.xpm         |    2 +-
 graph.xpm              |    2 +-
 gui.xpm                |    2 +-
 help.xpm               |    2 +-
 hi.xpm                 |    2 +-
 hold.xpm               |    2 +-
 icon.xpm               |    2 +-
 icon_gray.xpm          |    2 +-
 import.xpm             |    2 +-
 integration.xpm        |    2 +-
 integration_old.xpm    |    2 +-
 k.xpm                  |    2 +-
 k_small.xpm            |    2 +-
 l.xpm                  |    2 +-
 l_small.xpm            |    2 +-
 m.xpm                  |    2 +-
 m_small.xpm            |    2 +-
 manu.xpm               |    2 +-
 max_str.xpm            |    2 +-
 min_str.xpm            |    2 +-
 minus.xpm              |    2 +-
 minus_small.xpm        |    2 +-
 n.xpm                  |    2 +-
 n_small.xpm            |    2 +-
 null_bar.xpm           |    2 +-
 numbers.xpm            |    2 +-
 numbers_small.xpm      |    2 +-
 numers_tiny.xpm        |    2 +-
 p.xpm                  |    2 +-
 p_small.xpm            |    2 +-
 percent.xpm            |    2 +-
 percent_small.xpm      |    2 +-
 print.xpm              |    2 +-
 quit.xpm               |    2 +-
 recorder.xpm           |    2 +-
 reset.xpm              |    2 +-
 scale.xpm              |    2 +-
 sixty_bar.xpm          |    2 +-
 specialchars.xpm       |    2 +-
 specialchars_small.xpm |    2 +-
 start.xpm              |    2 +-
 stop.xpm               |    2 +-
 ten_bar.xpm            |    2 +-
 thirty_bar.xpm         |    2 +-
 twenty_bar.xpm         |    2 +-
 u.xpm                  |    2 +-
 u_small.xpm            |    2 +-
 91 files changed, 91 insertions(+), 91 deletions(-)

--- NEW FILE qtdmm-0.8.12-xpm-warnings.patch ---
diff -ur QtDMM-0.8.12.orig/src/xpm/ac.xpm QtDMM-0.8.12/src/xpm/ac.xpm
--- QtDMM-0.8.12.orig/src/xpm/ac.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ac.xpm	2009-06-10 23:03:57.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ac_xpm[] = {
+static const char * ac_xpm[] = {
 "18 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/all_digits.xpm QtDMM-0.8.12/src/xpm/all_digits.xpm
--- QtDMM-0.8.12.orig/src/xpm/all_digits.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/all_digits.xpm	2009-06-10 23:04:01.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * all_digits_xpm[] = {
+static const char * all_digits_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/A_small.xpm QtDMM-0.8.12/src/xpm/A_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/A_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/A_small.xpm	2009-06-10 23:03:16.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * A_small_xpm[] = {
+static const char * A_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/auto.xpm QtDMM-0.8.12/src/xpm/auto.xpm
--- QtDMM-0.8.12.orig/src/xpm/auto.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/auto.xpm	2009-06-10 23:04:03.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * auto_xpm[] = {
+static const char * auto_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/A.xpm QtDMM-0.8.12/src/xpm/A.xpm
--- QtDMM-0.8.12.orig/src/xpm/A.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/A.xpm	2009-06-10 23:03:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * A_xpm[] = {
+static const char * A_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/bar.xpm QtDMM-0.8.12/src/xpm/bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/bar.xpm	2009-06-10 23:04:05.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * bar_xpm[] = {
+static const char * bar_xpm[] = {
 "5 9 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/clear.xpm QtDMM-0.8.12/src/xpm/clear.xpm
--- QtDMM-0.8.12.orig/src/xpm/clear.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/clear.xpm	2009-06-10 23:04:07.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * clear_xpm[] = {
+static const char * clear_xpm[] = {
 "22 22 108 2",
 "  	g None",
 ". 	g #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/cm_small.xpm QtDMM-0.8.12/src/xpm/cm_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/cm_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/cm_small.xpm	2009-06-10 23:04:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * M_small_xpm[] = {
+static const char * M_small_xpm[] = {
 "7 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/cm.xpm QtDMM-0.8.12/src/xpm/cm.xpm
--- QtDMM-0.8.12.orig/src/xpm/cm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/cm.xpm	2009-06-10 23:04:09.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * M_xpm[] = {
+static const char * M_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/config.xpm QtDMM-0.8.12/src/xpm/config.xpm
--- QtDMM-0.8.12.orig/src/xpm/config.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/config.xpm	2009-06-10 23:04:17.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * config_xpm[] = {
+static const char * config_xpm[] = {
 "22 22 20 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/conf.xpm QtDMM-0.8.12/src/xpm/conf.xpm
--- QtDMM-0.8.12.orig/src/xpm/conf.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/conf.xpm	2009-06-10 23:04:15.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * conf_xpm[] = {
+static const char * conf_xpm[] = {
 "22 22 20 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_icon.xpm QtDMM-0.8.12/src/xpm/connect_icon.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_icon.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_icon.xpm	2009-06-10 23:04:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_icon_xpm[] = {
+static const char * connect_icon_xpm[] = {
 "32 32 188 2",
 "  	c None",
 ". 	c #FFFF00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connection.xpm QtDMM-0.8.12/src/xpm/connection.xpm
--- QtDMM-0.8.12.orig/src/xpm/connection.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connection.xpm	2009-06-10 23:04:25.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connection_xpm[] = {
+static const char * connection_xpm[] = {
 "32 32 67 1",
 " 	c None",
 ".	c #FDFD00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_off.xpm QtDMM-0.8.12/src/xpm/connect_off.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_off.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_off.xpm	2009-06-10 23:04:21.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_off_xpm[] = {
+static const char * connect_off_xpm[] = {
 "22 22 18 1",
 " 	c None",
 ".	c #FFFF00",
diff -ur QtDMM-0.8.12.orig/src/xpm/connect_on.xpm QtDMM-0.8.12/src/xpm/connect_on.xpm
--- QtDMM-0.8.12.orig/src/xpm/connect_on.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/connect_on.xpm	2009-06-10 23:04:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * connect_on_xpm[] = {
+static const char * connect_on_xpm[] = {
 "22 22 16 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/DBM_small.xpm QtDMM-0.8.12/src/xpm/DBM_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/DBM_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/DBM_small.xpm	2009-06-10 23:03:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DBM_small_xpm[] = {
+static const char * DBM_small_xpm[] = {
 "9 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/DBM.xpm QtDMM-0.8.12/src/xpm/DBM.xpm
--- QtDMM-0.8.12.orig/src/xpm/DBM.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/DBM.xpm	2009-06-10 23:03:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DBM_xpm[] = {
+static const char * DBM_xpm[] = {
 "15 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/dc.xpm QtDMM-0.8.12/src/xpm/dc.xpm
--- QtDMM-0.8.12.orig/src/xpm/dc.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dc.xpm	2009-06-10 23:04:27.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dc_xpm[] = {
+static const char * dc_xpm[] = {
 "18 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/decimal_small.xpm QtDMM-0.8.12/src/xpm/decimal_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/decimal_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/decimal_small.xpm	2009-06-10 23:04:34.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * decimal_small_xpm[] = {
+static const char * decimal_small_xpm[] = {
 "4 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/decimal.xpm QtDMM-0.8.12/src/xpm/decimal.xpm
--- QtDMM-0.8.12.orig/src/xpm/decimal.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/decimal.xpm	2009-06-10 23:04:32.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * decimal_xpm[] = {
+static const char * decimal_xpm[] = {
 "11 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/deg_small.xpm QtDMM-0.8.12/src/xpm/deg_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/deg_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/deg_small.xpm	2009-06-10 23:04:38.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * deg_small_xpm[] = {
+static const char * deg_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/deg.xpm QtDMM-0.8.12/src/xpm/deg.xpm
--- QtDMM-0.8.12.orig/src/xpm/deg.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/deg.xpm	2009-06-10 23:04:36.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * deg_xpm[] = {
+static const char * deg_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/diode.xpm QtDMM-0.8.12/src/xpm/diode.xpm
--- QtDMM-0.8.12.orig/src/xpm/diode.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/diode.xpm	2009-06-10 23:04:40.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * diode_xpm[] = {
+static const char * diode_xpm[] = {
 "17 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/display.xpm QtDMM-0.8.12/src/xpm/display.xpm
--- QtDMM-0.8.12.orig/src/xpm/display.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/display.xpm	2009-06-10 23:04:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * display_xpm[] = {
+static const char * display_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #00B506",
diff -ur QtDMM-0.8.12.orig/src/xpm/dmm_big.xpm QtDMM-0.8.12/src/xpm/dmm_big.xpm
--- QtDMM-0.8.12.orig/src/xpm/dmm_big.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dmm_big.xpm	2009-06-10 23:04:47.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dmm_big_xpm[] = {
+static const char * dmm_big_xpm[] = {
 "64 64 14 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/dmm.xpm QtDMM-0.8.12/src/xpm/dmm.xpm
--- QtDMM-0.8.12.orig/src/xpm/dmm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/dmm.xpm	2009-06-10 23:04:45.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dmm_xpm[] = {
+static const char * dmm_xpm[] = {
 "32 32 14 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/ee.xpm QtDMM-0.8.12/src/xpm/ee.xpm
--- QtDMM-0.8.12.orig/src/xpm/ee.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ee.xpm	2009-06-10 23:04:49.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ee_xpm[] = {
+static const char * ee_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/execute.xpm QtDMM-0.8.12/src/xpm/execute.xpm
--- QtDMM-0.8.12.orig/src/xpm/execute.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/execute.xpm	2009-06-10 23:04:51.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * execute_xpm[] = {
+static const char * execute_xpm[] = {
 "32 32 9 1",
 " 	c None",
 ".	c #050505",
diff -ur QtDMM-0.8.12.orig/src/xpm/export.xpm QtDMM-0.8.12/src/xpm/export.xpm
--- QtDMM-0.8.12.orig/src/xpm/export.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/export.xpm	2009-06-10 23:04:54.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * export_xpm[] = {
+static const char * export_xpm[] = {
 "22 22 117 2",
 "  	c None",
 ". 	c #6B6B6B",
diff -ur QtDMM-0.8.12.orig/src/xpm/fifty_bar.xpm QtDMM-0.8.12/src/xpm/fifty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/fifty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/fifty_bar.xpm	2009-06-10 23:04:56.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fifty_bar_xpm[] = {
+static const char * fifty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/fourty_bar.xpm QtDMM-0.8.12/src/xpm/fourty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/fourty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/fourty_bar.xpm	2009-06-10 23:04:59.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fourty_bar_xpm[] = {
+static const char * fourty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/F_small.xpm QtDMM-0.8.12/src/xpm/F_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/F_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/F_small.xpm	2009-06-10 23:03:28.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * F_small_xpm[] = {
+static const char * F_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/F.xpm QtDMM-0.8.12/src/xpm/F.xpm
--- QtDMM-0.8.12.orig/src/xpm/F.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/F.xpm	2009-06-10 23:03:26.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * F_xpm[] = {
+static const char * F_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/graph.xpm QtDMM-0.8.12/src/xpm/graph.xpm
--- QtDMM-0.8.12.orig/src/xpm/graph.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/graph.xpm	2009-06-10 23:05:01.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * graph_xpm[] = {
+static const char * graph_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/G_small.xpm QtDMM-0.8.12/src/xpm/G_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/G_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/G_small.xpm	2009-06-10 23:03:33.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * G_small_xpm[] = {
+static const char * G_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/gui.xpm QtDMM-0.8.12/src/xpm/gui.xpm
--- QtDMM-0.8.12.orig/src/xpm/gui.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/gui.xpm	2009-06-10 23:05:04.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gui_xpm[] = {
+static const char * gui_xpm[] = {
 "32 32 303 2",
 "  	c None",
 ". 	c #272727",
diff -ur QtDMM-0.8.12.orig/src/xpm/G.xpm QtDMM-0.8.12/src/xpm/G.xpm
--- QtDMM-0.8.12.orig/src/xpm/G.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/G.xpm	2009-06-10 23:03:30.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * G_xpm[] = {
+static const char * G_xpm[] = {
 "11 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/help.xpm QtDMM-0.8.12/src/xpm/help.xpm
--- QtDMM-0.8.12.orig/src/xpm/help.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/help.xpm	2009-06-10 23:05:06.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * help_xpm[] = {
+static const char * help_xpm[] = {
 "22 22 4 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/hi.xpm QtDMM-0.8.12/src/xpm/hi.xpm
--- QtDMM-0.8.12.orig/src/xpm/hi.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/hi.xpm	2009-06-10 23:05:08.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hi_xpm[] = {
+static const char * hi_xpm[] = {
 "18 9 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/hold.xpm QtDMM-0.8.12/src/xpm/hold.xpm
--- QtDMM-0.8.12.orig/src/xpm/hold.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/hold.xpm	2009-06-10 23:05:11.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hold_xpm[] = {
+static const char * hold_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/H_small.xpm QtDMM-0.8.12/src/xpm/H_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/H_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/H_small.xpm	2009-06-10 23:03:37.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * H_small_xpm[] = {
+static const char * H_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/H.xpm QtDMM-0.8.12/src/xpm/H.xpm
--- QtDMM-0.8.12.orig/src/xpm/H.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/H.xpm	2009-06-10 23:03:35.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * H_xpm[] = {
+static const char * H_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Hz_small.xpm QtDMM-0.8.12/src/xpm/Hz_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/Hz_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Hz_small.xpm	2009-06-10 23:03:41.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Hz_small_xpm[] = {
+static const char * Hz_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Hz.xpm QtDMM-0.8.12/src/xpm/Hz.xpm
--- QtDMM-0.8.12.orig/src/xpm/Hz.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Hz.xpm	2009-06-10 23:03:39.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Hz_xpm[] = {
+static const char * Hz_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/icon_gray.xpm QtDMM-0.8.12/src/xpm/icon_gray.xpm
--- QtDMM-0.8.12.orig/src/xpm/icon_gray.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/icon_gray.xpm	2009-06-10 23:05:15.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_gray_xpm[] = {
+static const char * icon_gray_xpm[] = {
 "32 32 15 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/icon.xpm QtDMM-0.8.12/src/xpm/icon.xpm
--- QtDMM-0.8.12.orig/src/xpm/icon.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/icon.xpm	2009-06-10 23:05:13.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_xpm[] = {
+static const char * icon_xpm[] = {
 "32 32 15 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/import.xpm QtDMM-0.8.12/src/xpm/import.xpm
--- QtDMM-0.8.12.orig/src/xpm/import.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/import.xpm	2009-06-10 23:05:17.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * import_xpm[] = {
+static const char * import_xpm[] = {
 "22 22 191 2",
 "  	c None",
 ". 	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/integration_old.xpm QtDMM-0.8.12/src/xpm/integration_old.xpm
--- QtDMM-0.8.12.orig/src/xpm/integration_old.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/integration_old.xpm	2009-06-10 23:05:22.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * integration_old_xpm[] = {
+static const char * integration_old_xpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #0033FF",
diff -ur QtDMM-0.8.12.orig/src/xpm/integration.xpm QtDMM-0.8.12/src/xpm/integration.xpm
--- QtDMM-0.8.12.orig/src/xpm/integration.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/integration.xpm	2009-06-10 23:05:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * integration_xpm[] = {
+static const char * integration_xpm[] = {
 "32 32 82 1",
 " 	c None",
 ".	c #FFFFFF",
diff -ur QtDMM-0.8.12.orig/src/xpm/k_small.xpm QtDMM-0.8.12/src/xpm/k_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/k_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/k_small.xpm	2009-06-10 23:05:27.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * k_small_xpm[] = {
+static const char * k_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/k.xpm QtDMM-0.8.12/src/xpm/k.xpm
--- QtDMM-0.8.12.orig/src/xpm/k.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/k.xpm	2009-06-10 23:05:24.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * k_xpm[] = {
+static const char * k_xpm[] = {
 "7 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/l_small.xpm QtDMM-0.8.12/src/xpm/l_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/l_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/l_small.xpm	2009-06-10 23:05:32.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * l_small_xpm[] = {
+static const char * l_small_xpm[] = {
 "12 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/l.xpm QtDMM-0.8.12/src/xpm/l.xpm
--- QtDMM-0.8.12.orig/src/xpm/l.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/l.xpm	2009-06-10 23:05:29.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * l_xpm[] = {
+static const char * l_xpm[] = {
 "38 64 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/manu.xpm QtDMM-0.8.12/src/xpm/manu.xpm
--- QtDMM-0.8.12.orig/src/xpm/manu.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/manu.xpm	2009-06-10 23:05:39.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * manu_xpm[] = {
+static const char * manu_xpm[] = {
 "14 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/max_str.xpm QtDMM-0.8.12/src/xpm/max_str.xpm
--- QtDMM-0.8.12.orig/src/xpm/max_str.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/max_str.xpm	2009-06-10 23:05:41.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * max_str_xpm[] = {
+static const char * max_str_xpm[] = {
 "19 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/min_str.xpm QtDMM-0.8.12/src/xpm/min_str.xpm
--- QtDMM-0.8.12.orig/src/xpm/min_str.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/min_str.xpm	2009-06-10 23:05:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * min_str_xpm[] = {
+static const char * min_str_xpm[] = {
 "15 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/minus_small.xpm QtDMM-0.8.12/src/xpm/minus_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/minus_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/minus_small.xpm	2009-06-10 23:05:48.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * minus_small_xpm[] = {
+static const char * minus_small_xpm[] = {
 "8 3 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/minus.xpm QtDMM-0.8.12/src/xpm/minus.xpm
--- QtDMM-0.8.12.orig/src/xpm/minus.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/minus.xpm	2009-06-10 23:05:46.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * minus_xpm[] = {
+static const char * minus_xpm[] = {
 "22 63 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/m_small.xpm QtDMM-0.8.12/src/xpm/m_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/m_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/m_small.xpm	2009-06-10 23:05:36.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * m_small_xpm[] = {
+static const char * m_small_xpm[] = {
 "7 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/m.xpm QtDMM-0.8.12/src/xpm/m.xpm
--- QtDMM-0.8.12.orig/src/xpm/m.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/m.xpm	2009-06-10 23:05:34.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * m_xpm[] = {
+static const char * m_xpm[] = {
 "11 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/n_small.xpm QtDMM-0.8.12/src/xpm/n_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/n_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/n_small.xpm	2009-06-10 23:05:52.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * n_small_xpm[] = {
+static const char * n_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/null_bar.xpm QtDMM-0.8.12/src/xpm/null_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/null_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/null_bar.xpm	2009-06-10 23:05:54.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * null_bar_xpm[] = {
+static const char * null_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numbers_small.xpm QtDMM-0.8.12/src/xpm/numbers_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/numbers_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numbers_small.xpm	2009-06-10 23:05:58.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numbers_small_xpm[] = {
+static const char * numbers_small_xpm[] = {
 "120 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numbers.xpm QtDMM-0.8.12/src/xpm/numbers.xpm
--- QtDMM-0.8.12.orig/src/xpm/numbers.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numbers.xpm	2009-06-10 23:05:56.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numbers_xpm[] = {
+static const char * numbers_xpm[] = {
 "340 60 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/numers_tiny.xpm QtDMM-0.8.12/src/xpm/numers_tiny.xpm
--- QtDMM-0.8.12.orig/src/xpm/numers_tiny.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/numers_tiny.xpm	2009-06-10 23:06:00.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * numers_tiny_xpm[] = {
+static const char * numers_tiny_xpm[] = {
 "80 14 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/n.xpm QtDMM-0.8.12/src/xpm/n.xpm
--- QtDMM-0.8.12.orig/src/xpm/n.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/n.xpm	2009-06-10 23:05:50.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * n_xpm[] = {
+static const char * n_xpm[] = {
 "7 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Ohm_small.xpm QtDMM-0.8.12/src/xpm/Ohm_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/Ohm_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Ohm_small.xpm	2009-06-10 23:03:45.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Ohm_small_xpm[] = {
+static const char * Ohm_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/Ohm.xpm QtDMM-0.8.12/src/xpm/Ohm.xpm
--- QtDMM-0.8.12.orig/src/xpm/Ohm.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/Ohm.xpm	2009-06-10 23:03:43.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Ohm_xpm[] = {
+static const char * Ohm_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/percent_small.xpm QtDMM-0.8.12/src/xpm/percent_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/percent_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/percent_small.xpm	2009-06-10 23:06:09.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * percent_small_xpm[] = {
+static const char * percent_small_xpm[] = {
 "10 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/percent.xpm QtDMM-0.8.12/src/xpm/percent.xpm
--- QtDMM-0.8.12.orig/src/xpm/percent.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/percent.xpm	2009-06-10 23:06:07.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * percent_xpm[] = {
+static const char * percent_xpm[] = {
 "18 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/print.xpm QtDMM-0.8.12/src/xpm/print.xpm
--- QtDMM-0.8.12.orig/src/xpm/print.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/print.xpm	2009-06-10 23:06:12.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * print_xpm[] = {
+static const char * print_xpm[] = {
 "22 22 178 2",
 "  	c None",
 ". 	c #565656",
diff -ur QtDMM-0.8.12.orig/src/xpm/p_small.xpm QtDMM-0.8.12/src/xpm/p_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/p_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/p_small.xpm	2009-06-10 23:06:05.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * p_small_xpm[] = {
+static const char * p_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/p.xpm QtDMM-0.8.12/src/xpm/p.xpm
--- QtDMM-0.8.12.orig/src/xpm/p.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/p.xpm	2009-06-10 23:06:03.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * p_xpm[] = {
+static const char * p_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/quit.xpm QtDMM-0.8.12/src/xpm/quit.xpm
--- QtDMM-0.8.12.orig/src/xpm/quit.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/quit.xpm	2009-06-10 23:06:14.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * quit_xpm[] = {
+static const char * quit_xpm[] = {
 "22 22 93 2",
 "  	c None",
 ". 	c #FFFFFF",
diff -ur QtDMM-0.8.12.orig/src/xpm/recorder.xpm QtDMM-0.8.12/src/xpm/recorder.xpm
--- QtDMM-0.8.12.orig/src/xpm/recorder.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/recorder.xpm	2009-06-10 23:06:16.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * recorder_xpm[] = {
+static const char * recorder_xpm[] = {
 "32 32 101 2",
 "  	g None",
 ". 	g #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/reset.xpm QtDMM-0.8.12/src/xpm/reset.xpm
--- QtDMM-0.8.12.orig/src/xpm/reset.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/reset.xpm	2009-06-10 23:06:19.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * reset_xpm[] = {
+static const char * reset_xpm[] = {
 "20 20 127 2",
 "  	c None",
 ". 	c #5A5A5A",
diff -ur QtDMM-0.8.12.orig/src/xpm/scale.xpm QtDMM-0.8.12/src/xpm/scale.xpm
--- QtDMM-0.8.12.orig/src/xpm/scale.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/scale.xpm	2009-06-10 23:06:21.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * scale_xpm[] = {
+static const char * scale_xpm[] = {
 "32 32 5 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/sixty_bar.xpm QtDMM-0.8.12/src/xpm/sixty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/sixty_bar.xpm	2007-08-19 21:37:34.000000000 +0400
+++ QtDMM-0.8.12/src/xpm/sixty_bar.xpm	2009-06-10 23:06:23.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sixty_bar_xpm[] = {
+static const char * sixty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/specialchars_small.xpm QtDMM-0.8.12/src/xpm/specialchars_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/specialchars_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/specialchars_small.xpm	2009-06-10 23:06:28.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * specialchars_small_xpm[] = {
+static const char * specialchars_small_xpm[] = {
 "156 21 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/specialchars.xpm QtDMM-0.8.12/src/xpm/specialchars.xpm
--- QtDMM-0.8.12.orig/src/xpm/specialchars.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/specialchars.xpm	2009-06-10 23:06:26.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * specialchars_xpm[] = {
+static const char * specialchars_xpm[] = {
 "442 60 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/start.xpm QtDMM-0.8.12/src/xpm/start.xpm
--- QtDMM-0.8.12.orig/src/xpm/start.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/start.xpm	2009-06-10 23:06:30.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * start_xpm[] = {
+static const char * start_xpm[] = {
 "22 22 101 2",
 "  	c None",
 ". 	c #0C3651",
diff -ur QtDMM-0.8.12.orig/src/xpm/stop.xpm QtDMM-0.8.12/src/xpm/stop.xpm
--- QtDMM-0.8.12.orig/src/xpm/stop.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/stop.xpm	2009-06-10 23:06:33.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stop_xpm[] = {
+static const char * stop_xpm[] = {
 "22 22 129 2",
 "  	c None",
 ". 	c #1E0A0A",
diff -ur QtDMM-0.8.12.orig/src/xpm/ten_bar.xpm QtDMM-0.8.12/src/xpm/ten_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/ten_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/ten_bar.xpm	2009-06-10 23:06:35.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ten_bar_xpm[] = {
+static const char * ten_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/thirty_bar.xpm QtDMM-0.8.12/src/xpm/thirty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/thirty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/thirty_bar.xpm	2009-06-10 23:06:38.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * thirty_bar_xpm[] = {
+static const char * thirty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/twenty_bar.xpm QtDMM-0.8.12/src/xpm/twenty_bar.xpm
--- QtDMM-0.8.12.orig/src/xpm/twenty_bar.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/twenty_bar.xpm	2009-06-10 23:06:40.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * twenty_bar_xpm[] = {
+static const char * twenty_bar_xpm[] = {
 "9 7 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/u_small.xpm QtDMM-0.8.12/src/xpm/u_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/u_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/u_small.xpm	2009-06-10 23:06:44.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * u_small_xpm[] = {
+static const char * u_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/u.xpm QtDMM-0.8.12/src/xpm/u.xpm
--- QtDMM-0.8.12.orig/src/xpm/u.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/u.xpm	2009-06-10 23:06:42.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * u_xpm[] = {
+static const char * u_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/V_small.xpm QtDMM-0.8.12/src/xpm/V_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/V_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/V_small.xpm	2009-06-10 23:03:49.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * V_small_xpm[] = {
+static const char * V_small_xpm[] = {
 "6 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/V.xpm QtDMM-0.8.12/src/xpm/V.xpm
--- QtDMM-0.8.12.orig/src/xpm/V.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/V.xpm	2009-06-10 23:03:47.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * V_xpm[] = {
+static const char * V_xpm[] = {
 "10 16 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/W_small.xpm QtDMM-0.8.12/src/xpm/W_small.xpm
--- QtDMM-0.8.12.orig/src/xpm/W_small.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/W_small.xpm	2009-06-10 23:03:55.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * W_small_xpm[] = {
+static const char * W_small_xpm[] = {
 "5 8 2 1",
 " 	c None",
 ".	c #000000",
diff -ur QtDMM-0.8.12.orig/src/xpm/W.xpm QtDMM-0.8.12/src/xpm/W.xpm
--- QtDMM-0.8.12.orig/src/xpm/W.xpm	2006-11-11 11:15:36.000000000 +0300
+++ QtDMM-0.8.12/src/xpm/W.xpm	2009-06-10 23:03:51.000000000 +0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * W_xpm[] = {
+static const char * W_xpm[] = {
 "12 16 2 1",
 " 	c None",
 ".	c #000000",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/QtDMM/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Aug 2009 21:42:40 -0000	1.1
+++ .cvsignore	28 Aug 2009 21:08:30 -0000	1.2
@@ -0,0 +1 @@
+qtdmm-0.8.12.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/QtDMM/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:42:40 -0000	1.1
+++ sources	28 Aug 2009 21:08:30 -0000	1.2
@@ -0,0 +1 @@
+a028858963eeca6278895a668e119536  qtdmm-0.8.12.tgz



From twaugh at fedoraproject.org  Fri Aug 28 21:20:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 21:20:52 +0000 (UTC)
Subject: rpms/cups/devel cups.spec,1.513,1.514
Message-ID: <20090828212052.E8A2311C0078@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8591

Modified Files:
	cups.spec 
Log Message:
Drop unnecessary -n option to setup macro.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -p -r1.513 -r1.514
--- cups.spec	28 Aug 2009 21:06:46 -0000	1.513
+++ cups.spec	28 Aug 2009 21:20:52 -0000	1.514
@@ -187,7 +187,7 @@ UNIX? operating systems. This is the pa
 module. 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib



From twaugh at fedoraproject.org  Fri Aug 28 21:30:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 28 Aug 2009 21:30:05 +0000 (UTC)
Subject: rpms/cups/F-11 cups-avahi.patch, 1.5, 1.6 cups.spec, 1.515,
	1.516 sources, 1.49, 1.50 cups-str3229.patch, 1.2,
	NONE cups-str3231.patch, 1.1, NONE cups-str3244.patch, 1.1,
	NONE cups-str3253.patch, 1.1, NONE cups-str3254.patch, 1.1,
	NONE cups-str3258.patch, 1.1, NONE cups-str3259.patch, 1.1,
	NONE cups-str3266.patch, 1.1, NONE cups-str3272.patch, 1.1,
	NONE cups-str3277.patch, 1.1, NONE
Message-ID: <20090828213005.E98D311C0496@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10228

Modified Files:
	cups-avahi.patch cups.spec sources 
Removed Files:
	cups-str3229.patch cups-str3231.patch cups-str3244.patch 
	cups-str3253.patch cups-str3254.patch cups-str3258.patch 
	cups-str3259.patch cups-str3266.patch cups-str3272.patch 
	cups-str3277.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
- 1.4.0.


cups-avahi.patch:
 backend/dnssd.c              |  532 ++++++++++++++++++++++++++++++++++++-------
 config-scripts/cups-dnssd.m4 |   15 +
 config.h.in                  |    7 
 cups/http-support.c          |  177 +++++++++++++-
 4 files changed, 645 insertions(+), 86 deletions(-)

Index: cups-avahi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-avahi.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cups-avahi.patch	29 Jul 2009 13:47:30 -0000	1.5
+++ cups-avahi.patch	28 Aug 2009 21:30:05 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up cups-1.4rc1/backend/dnssd.c.avahi cups-1.4rc1/backend/dnssd.c
---- cups-1.4rc1/backend/dnssd.c.avahi	2009-07-29 14:00:53.767272320 +0100
-+++ cups-1.4rc1/backend/dnssd.c	2009-07-29 14:01:36.574271697 +0100
+diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
+--- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
++++ cups-1.4.0/backend/dnssd.c	2009-08-28 21:44:27.262137662 +0100
 @@ -22,6 +22,7 @@
   *   exec_backend()          - Execute the backend that corresponds to the
   *                             resolved service name.
@@ -775,10 +775,10 @@ diff -up cups-1.4rc1/backend/dnssd.c.ava
  /*
   * 'sigterm_handler()' - Handle termination signals...
   */
-diff -up cups-1.4rc1/config.h.in.avahi cups-1.4rc1/config.h.in
---- cups-1.4rc1/config.h.in.avahi	2009-05-14 21:48:55.000000000 +0100
-+++ cups-1.4rc1/config.h.in	2009-07-29 14:01:36.575271644 +0100
-@@ -344,6 +344,13 @@
+diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
+--- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
++++ cups-1.4.0/config.h.in	2009-08-28 21:44:27.265137528 +0100
+@@ -336,6 +336,13 @@
  
  
  /*
@@ -792,9 +792,9 @@ diff -up cups-1.4rc1/config.h.in.avahi c
   * Do we have <sys/ioctl.h>?
   */
  
-diff -up cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi cups-1.4rc1/config-scripts/cups-dnssd.m4
---- cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4rc1/config-scripts/cups-dnssd.m4	2009-07-29 14:01:36.575271644 +0100
+diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
+--- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
++++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-08-28 21:44:27.263138688 +0100
 @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
  DNSSDLIBS=""
  DNSSD_BACKEND=""
@@ -817,10 +817,10 @@ diff -up cups-1.4rc1/config-scripts/cups
  if test x$enable_dnssd != xno; then
  	AC_CHECK_HEADER(dns_sd.h, [
  		case "$uname" in
-diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
---- cups-1.4rc1/cups/http-support.c.avahi	2009-04-30 23:15:05.000000000 +0100
-+++ cups-1.4rc1/cups/http-support.c	2009-07-29 14:01:36.577396783 +0100
-@@ -54,6 +54,11 @@
+diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
+--- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
++++ cups-1.4.0/cups/http-support.c	2009-08-28 21:44:27.267137550 +0100
+@@ -55,6 +55,11 @@
  #  include <dns_sd.h>
  #  include <poll.h>
  #endif /* HAVE_DNSSD */
@@ -832,7 +832,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  
  /*
-@@ -120,6 +125,24 @@ static void		resolve_callback(DNSService
+@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
  					 void *context);
  #endif /* HAVE_DNSSD */
  
@@ -857,7 +857,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  /*
   * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1348,15 +1371,26 @@ _httpResolveURI(
+@@ -1349,15 +1372,26 @@ _httpResolveURI(
  
    if (strstr(hostname, "._tcp"))
    {
@@ -886,7 +886,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  
      if (logit)
-@@ -1394,8 +1428,13 @@ _httpResolveURI(
+@@ -1395,8 +1429,13 @@ _httpResolveURI(
      if (domain)
        *domain++ = '\0';
  
@@ -908,7 +908,7 @@ diff -up cups-1.4rc1/cups/http-support.c
      if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
      {
        localref = ref;
-@@ -1457,6 +1497,36 @@ _httpResolveURI(
+@@ -1486,6 +1526,36 @@ _httpResolveURI(
  
        DNSServiceRefDeallocate(ref);
      }
@@ -945,7 +945,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
      if (logit)
      {
-@@ -1468,13 +1538,13 @@ _httpResolveURI(
+@@ -1497,13 +1567,13 @@ _httpResolveURI(
        fputs("STATE: -connecting-to-device\n", stderr);
      }
  
@@ -961,7 +961,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
      if (logit && !uri)
        _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1679,6 +1749,105 @@ resolve_callback(
+@@ -1708,6 +1778,105 @@ resolve_callback(
  }
  #endif /* HAVE_DNSSD */
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -p -r1.515 -r1.516
--- cups.spec	27 Aug 2009 15:38:26 -0000	1.515
+++ cups.spec	28 Aug 2009 21:30:05 -0000	1.516
@@ -1,7 +1,6 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
-%define pre rc1
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define lspp 1
@@ -9,11 +8,11 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4
-Release: 0.%{pre}.20%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
+Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
 Source3: cups-libusb.rules
@@ -48,21 +47,11 @@ Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
 Patch23: cups-res_init.patch
-Patch24: cups-str3229.patch
 Patch25: cups-filter-debug.patch
-Patch26: cups-str3231.patch
-Patch27: cups-str3244.patch
-Patch28: cups-str3258.patch
-Patch29: cups-str3259.patch
 Patch30: cups-uri-compat.patch
-Patch31: cups-str3254.patch
-Patch32: cups-str3253.patch
-Patch33: cups-str3266.patch
 Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
-Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
-Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
@@ -198,7 +187,7 @@ UNIX? operating systems. This is the pa
 module. 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}%{?svn}
+%setup -q
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -220,21 +209,11 @@ module. 
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .build
 %patch23 -p1 -b .res_init
-%patch24 -p1 -b .str3229
 %patch25 -p1 -b .filter-debug
-%patch26 -p1 -b .str3231
-%patch27 -p1 -b .str3244
-%patch28 -p1 -b .str3258
-%patch29 -p1 -b .str3259
 %patch30 -p1 -b .uri-compat
-%patch31 -p1 -b .str3254
-%patch32 -p1 -b .str3253
-%patch33 -p1 -b .str3266
 %patch34 -p1 -b .str3262
 %patch35 -p1 -b .cups-get-classes
-%patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
-%patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
@@ -448,6 +427,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/portreserve/%{name}
 %dir %{_datadir}/%{name}/www
 %dir %{_datadir}/%{name}/www/es
+%dir %{_datadir}/%{name}/www/eu
 %dir %{_datadir}/%{name}/www/ja
 %dir %{_datadir}/%{name}/www/pl
 %dir %{_datadir}/%{name}/www/ru
@@ -458,6 +438,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt
 %config(noreplace) %doc %{_datadir}/%{name}/www/de/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html
+%config(noreplace) %doc %{_datadir}/%{name}/www/eu/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html
@@ -492,6 +473,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/cups/templates/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/de/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/es/*.tmpl
+%config(noreplace) %{_datadir}/cups/templates/eu/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl
@@ -537,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
+- 1.4.0.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.20
 - Fixed admin.cgi crash when modifying a class (bug #519724,
   STR #3312, patch from Jiri Popelka).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	17 Jun 2009 11:37:32 -0000	1.49
+++ sources	28 Aug 2009 21:30:05 -0000	1.50
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-79948fc1a46e1a3f7aabe5a76fb99e8e  cups-1.4rc1-source.tar.bz2
+bc5e777d4320cecdd1a64de8035171a8  cups-1.4.0-source.tar.bz2


--- cups-str3229.patch DELETED ---


--- cups-str3231.patch DELETED ---


--- cups-str3244.patch DELETED ---


--- cups-str3253.patch DELETED ---


--- cups-str3254.patch DELETED ---


--- cups-str3258.patch DELETED ---


--- cups-str3259.patch DELETED ---


--- cups-str3266.patch DELETED ---


--- cups-str3272.patch DELETED ---


--- cups-str3277.patch DELETED ---



From overholt at fedoraproject.org  Fri Aug 28 21:36:27 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 28 Aug 2009 21:36:27 +0000 (UTC)
Subject: rpms/maven-doxia/devel .cvsignore, 1.2, 1.3 maven-doxia.spec, 1.14, 
	1.15 sources, 1.2, 1.3
Message-ID: <20090828213627.1639511C0078@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11454

Modified Files:
	.cvsignore maven-doxia.spec sources 
Log Message:
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.5.a10
- Update to 1.0 alpha 10 courtesy of Deepak Bhole
- Remove gcj support
- Add patch to build against iText 2.x (with back-ported XML classes)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 23:31:24 -0000	1.2
+++ .cvsignore	28 Aug 2009 21:36:26 -0000	1.3
@@ -1,2 +1,2 @@
-maven-doxia-1.0a7.tar.gz
 maven-doxia-autogenerated-files.tar.gz
+maven-doxia-1.0-a10-src.tar.gz


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- maven-doxia.spec	25 Jul 2009 11:50:36 -0000	1.14
+++ maven-doxia.spec	28 Aug 2009 21:36:26 -0000	1.15
@@ -28,32 +28,23 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define with_maven 1
 
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define _without_maven 1
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
-%define namedversion 1.0-alpha-7
+%define namedversion 1.0-alpha-10
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.4.a7.2.10%{?dist}
+Release:        0.5.a10%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
 Group:          Development/Java
 URL:            http://maven.apache.org/doxia/
 
-# svn export http://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-7/
+# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-10 \
 #       maven-doxia/
-# tar czf maven-doxia-1.0.a7-src.tar.gz maven-doxia/
-Source0:        %{name}-%{version}a7.tar.gz
+# tar czf maven-doxia-1.0-a10-src.tar.gz maven-doxia/
+Source0:        %{name}-%{version}-a10-src.tar.gz
 
 Source1:        %{name}-decoration-model-build.xml
 Source2:        %{name}-core-build.xml
@@ -64,14 +55,15 @@ Source4:        %{name}-site-renderer-bu
 # To regenerate, build above tarball with upstream maven
 Source5:        %{name}-autogenerated-files.tar.gz
 
-Patch0:         %{name}-1.4compile.patch
+# Build against iText 2.x
+# http://jira.codehaus.org/browse/DOXIA-53
+Patch0:         %{name}-itext2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
+BuildRequires:  java >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant, ant-nodeps
 %if %{with_maven}
@@ -111,15 +103,11 @@ Requires:       plexus-utils
 Requires:       plexus-velocity
 Requires:       velocity
 
+Requires:         java >= 1:1.6.0
+Requires:         jpackage-utils
 Requires(post):   jpackage-utils >= 0:1.7.2
 Requires(postun): jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
 %description
 Doxia is a content generation framework which aims to provide its
 users with powerful techniques for generating static and dynamic
@@ -133,20 +121,21 @@ Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 %endif
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
+
+%if ! %{with_maven}
 cp -p %{SOURCE1} doxia-decoration-model/build.xml
 cp -p %{SOURCE2} doxia-core/build.xml
 cp -p %{SOURCE3} doxia-sink-api/build.xml
 cp -p %{SOURCE4} doxia-site-renderer/build.xml
-
-%patch0 -b .sav
+%endif
 
 %build
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -194,83 +183,59 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 # jars/poms
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 
-for project in decoration-model \
-                sink-api \
-                core \
-                site-renderer \
-                module-twiki; do
-
-        if [ -f doxia-$project/target/doxia-$project-%{namedversion}.jar ]; then                  install -pm 644 \
-                  doxia-$project/target/doxia-$project-%{namedversion}.jar \
-                  $RPM_BUILD_ROOT%{_javadir}/%{name}/$project-%{namedversion}.jar
-                  %add_to_maven_depmap org.apache.maven.doxia doxia-$project %{namedversion} JPP/maven-doxia $project
-
-        fi
-
-        # Install pom to groupid-artifactid
-        install -pm 644 doxia-$project/pom.xml \
-          $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-$project.pom
+for targetdir in `find -type d -name target`; do
+
+    targetdir=`echo $targetdir | sed -e s:^\./::g`
+
+    modulename=`echo $targetdir | awk -F / '{print $(NF-1)}'`
+    strippedmodulename=`echo $modulename | sed -e s:^doxia-::g`
+
+    # Does the module have a jar?
+    if [ -f $targetdir/$modulename-%{namedversion}.jar ]; then
+        cp -p $targetdir/$modulename-%{namedversion}.jar \
+                $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{namedversion}.jar
+    fi
+
+
+    # Skip parent pom
+    if [ ! -z $strippedmodulename ]; then
+        cp -p $targetdir/../pom.xml \
+                $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-$strippedmodulename.pom
+
+        %add_to_maven_depmap org.apache.maven.doxia $modulename %{namedversion} JPP/maven-doxia $strippedmodulename
+    fi
+    
 done
 
-install -pm 644 pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom
+# Install parent pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom
 %add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP/maven-doxia doxia
 
+# Install parent javadocs
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
   do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
 
-%if %{with_maven}
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-for p in doxia-decoration-model \
-                doxia-sink-api \
-                doxia-core \
-                doxia-site-renderer; do
-
-        project=`basename $p`
-        install -d -m 755 \
-          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
-        cp -pr $project/target/site/apidocs/* \
-          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
-
-done
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%endif
+# javadoc (all javadocs are contained in the main module docs dir used below)
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}
+cp -pr target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}/
+ln -s %{name}-%{namedversion} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/%{name}
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/core-1.0-alpha-7.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/decoration-model-1.0-alpha-7.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/sink-api-1.0-alpha-7.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/site-renderer-1.0-alpha-7.jar.*
-%endif
-
 %if %{with_maven}
 %files javadoc
 %defattr(-,root,root,-)
@@ -278,6 +243,11 @@ fi
 %endif
 
 %changelog
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.5.a10
+- Update to 1.0 alpha 10 courtesy of Deepak Bhole
+- Remove gcj support
+- Add patch to build against iText 2.x (with back-ported XML classes)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a7.2.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 23:31:24 -0000	1.2
+++ sources	28 Aug 2009 21:36:26 -0000	1.3
@@ -1,2 +1,2 @@
-1a0133387395089625236b3ae18e200a  maven-doxia-1.0a7.tar.gz
 f7d26f91c7a093e94dfb051248aab6c6  maven-doxia-autogenerated-files.tar.gz
+50ab7d300005b658a2d3ca5b24fb3317  maven-doxia-1.0-a10-src.tar.gz



From mclasen at fedoraproject.org  Fri Aug 28 21:38:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 28 Aug 2009 21:38:14 +0000 (UTC)
Subject: rpms/eog-plugins/devel eog-plugins.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828213814.B247011C0078@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eog-plugins.spec import.log 
Log Message:
initial import



--- NEW FILE eog-plugins.spec ---
Name:           eog-plugins
Version:        2.27.91
Release:        1%{?dist}
Summary:        A collection of plugins for the eog image viewer

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://live.gnome.org/EyeOfGnome/Plugins
Source0:        http://download.gnome.org/sources/eog-plugins/2.27/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  eog-devel
BuildRequires:  libchamplain-gtk-devel
BuildRequires:  libexif-devel
BuildRequires:  intltool
Requires:       eog

%description
It's a collection of plugins for use with the Eye of GNOME Image Viewer.
The included plugins provide a map view for where the picture was taken,
display of Exif information, Zoom to fit, etc.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING NEWS
%{_libdir}/eog/plugins/*.so
%{_libdir}/eog/plugins/*.eog-plugin
%{_libdir}/eog/plugins/exif-display



%changelog
* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
- Initial packaging


--- NEW FILE import.log ---
eog-plugins-2_27_91-1_fc12:HEAD:eog-plugins-2.27.91-1.fc12.src.rpm:1251495364


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:38:25 -0000	1.1
+++ .cvsignore	28 Aug 2009 21:38:14 -0000	1.2
@@ -0,0 +1 @@
+eog-plugins-2.27.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:38:25 -0000	1.1
+++ sources	28 Aug 2009 21:38:14 -0000	1.2
@@ -0,0 +1 @@
+e2b4267cd9906114866fb7b9202f42bc  eog-plugins-2.27.91.tar.bz2



From mclasen at fedoraproject.org  Fri Aug 28 21:42:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 28 Aug 2009 21:42:13 +0000 (UTC)
Subject: rpms/eog-plugins/devel eog-plugins.spec,1.1,1.2
Message-ID: <20090828214213.0BF4211C0078@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12881

Modified Files:
	eog-plugins.spec 
Log Message:
Make build verbose



Index: eog-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/eog-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eog-plugins.spec	28 Aug 2009 21:38:14 -0000	1.1
+++ eog-plugins.spec	28 Aug 2009 21:42:12 -0000	1.2
@@ -24,8 +24,8 @@ display of Exif information, Zoom to fit
 %setup -q
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --disable-silent-rules
+make %{?_smp_mflags} 
 
 
 %install



From nucleo at fedoraproject.org  Fri Aug 28 21:43:13 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Fri, 28 Aug 2009 21:43:13 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc.spec,1.8,1.9
Message-ID: <20090828214313.4A0A911C0078@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13185

Modified Files:
	kvirc.spec 
Log Message:
rebuilt with new openssl


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kvirc.spec	27 Aug 2009 15:21:22 -0000	1.8
+++ kvirc.spec	28 Aug 2009 21:43:13 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.12.%{pre}%{?dist}
+Release:          0.13.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
+- rebuilt with new openssl
+
 * Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.12.20090827svn3429
 - rebuild
 



From mclasen at fedoraproject.org  Fri Aug 28 21:43:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 28 Aug 2009 21:43:45 +0000 (UTC)
Subject: rpms/eog-plugins/devel eog-plugins.spec,1.2,1.3
Message-ID: <20090828214345.EE7FA11C0078@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13276

Modified Files:
	eog-plugins.spec 
Log Message:
Bump rev



Index: eog-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/devel/eog-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eog-plugins.spec	28 Aug 2009 21:42:12 -0000	1.2
+++ eog-plugins.spec	28 Aug 2009 21:43:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           eog-plugins
 Version:        2.27.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of plugins for the eog image viewer
 
 Group:          User Interface/Desktops
@@ -50,5 +50,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-2
+- Build verbosely
+
 * Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-1
 - Initial packaging



From jfch2222 at fedoraproject.org  Fri Aug 28 21:46:27 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 28 Aug 2009 21:46:27 +0000 (UTC)
Subject: rpms/openssh/devel openssh-4.7p1-audit.patch, 1.1,
	1.2 openssh-5.2p1-redhat.patch, 1.2,
	1.3 openssh-5.2p1-selinux.patch, 1.2, 1.3 openssh.spec, 1.157,
	1.158 openssh-4.3p2-cve-2007-3102.patch, 1.1,
	NONE openssh-5.1p1-gssapi-role.patch, 1.1,
	NONE openssh-5.2p1-xmodifiers.patch, 1.1, NONE
Message-ID: <20090828214627.CC17311C0078@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13902

Modified Files:
	openssh-4.7p1-audit.patch openssh-5.2p1-redhat.patch 
	openssh-5.2p1-selinux.patch openssh.spec 
Removed Files:
	openssh-4.3p2-cve-2007-3102.patch 
	openssh-5.1p1-gssapi-role.patch openssh-5.2p1-xmodifiers.patch 
Log Message:
rearange patches


openssh-4.7p1-audit.patch:
 auth.c       |   10 ++++++
 config.h.in  |   30 +++++++++++++++++--
 configure.ac |   13 ++++++++
 loginrec.c   |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 loginrec.h   |    4 ++
 5 files changed, 146 insertions(+), 3 deletions(-)

Index: openssh-4.7p1-audit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-4.7p1-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-4.7p1-audit.patch	6 Sep 2007 19:49:16 -0000	1.1
+++ openssh-4.7p1-audit.patch	28 Aug 2009 21:46:27 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up openssh-4.7p1/auth.c.audit openssh-4.7p1/auth.c
---- openssh-4.7p1/auth.c.audit	2007-03-26 18:35:28.000000000 +0200
-+++ openssh-4.7p1/auth.c	2007-09-06 17:07:44.000000000 +0200
-@@ -286,6 +286,12 @@ auth_log(Authctxt *authctxt, int authent
+diff -up openssh-5.2p1/auth.c.audit openssh-5.2p1/auth.c
+--- openssh-5.2p1/auth.c.audit	2008-11-05 06:12:54.000000000 +0100
++++ openssh-5.2p1/auth.c	2009-08-09 09:22:23.634850536 +0200
+@@ -287,6 +287,12 @@ auth_log(Authctxt *authctxt, int authent
  		    get_canonical_hostname(options.use_dns), "ssh", &loginmsg);
  # endif
  #endif
@@ -14,7 +14,7 @@ diff -up openssh-4.7p1/auth.c.audit open
  #ifdef SSH_AUDIT_EVENTS
  	if (authenticated == 0 && !authctxt->postponed)
  		audit_event(audit_classify_auth(method));
-@@ -492,6 +498,10 @@ getpwnamallow(const char *user)
+@@ -533,6 +539,10 @@ getpwnamallow(const char *user)
  		record_failed_login(user,
  		    get_canonical_hostname(options.use_dns), "ssh");
  #endif
@@ -25,9 +25,113 @@ diff -up openssh-4.7p1/auth.c.audit open
  #ifdef SSH_AUDIT_EVENTS
  		audit_event(SSH_INVALID_USER);
  #endif /* SSH_AUDIT_EVENTS */
-diff -up openssh-4.7p1/loginrec.c.audit openssh-4.7p1/loginrec.c
---- openssh-4.7p1/loginrec.c.audit	2007-04-29 04:10:58.000000000 +0200
-+++ openssh-4.7p1/loginrec.c	2007-09-06 17:07:44.000000000 +0200
+diff -up openssh-5.2p1/config.h.in.audit openssh-5.2p1/config.h.in
+--- openssh-5.2p1/config.h.in.audit	2009-02-23 01:18:12.000000000 +0100
++++ openssh-5.2p1/config.h.in	2009-08-09 09:22:28.825939998 +0200
+@@ -1,5 +1,8 @@
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++/* Define if building universal (internal helper macro) */
++#undef AC_APPLE_UNIVERSAL_BUILD
++
+ /* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address
+    */
+ #undef AIX_GETNAMEINFO_HACK
+@@ -521,6 +524,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
+ 
+@@ -560,6 +566,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
+ 
+@@ -756,6 +765,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
+ 
+@@ -1330,6 +1342,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
+ 
+@@ -1397,9 +1413,17 @@
+ /* Define if you want SELinux support. */
+ #undef WITH_SELINUX
+ 
+-/* Define to 1 if your processor stores words with the most significant byte
+-   first (like Motorola and SPARC, unlike Intel and VAX). */
+-#undef WORDS_BIGENDIAN
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
++   significant byte first (like Motorola and SPARC, unlike Intel). */
++#if defined AC_APPLE_UNIVERSAL_BUILD
++# if defined __BIG_ENDIAN__
++#  define WORDS_BIGENDIAN 1
++# endif
++#else
++# ifndef WORDS_BIGENDIAN
++#  undef WORDS_BIGENDIAN
++# endif
++#endif
+ 
+ /* Define if xauth is found in your path */
+ #undef XAUTH_PATH
+diff -up openssh-5.2p1/configure.ac.audit openssh-5.2p1/configure.ac
+--- openssh-5.2p1/configure.ac.audit	2009-08-09 09:22:23.608877833 +0200
++++ openssh-5.2p1/configure.ac	2009-08-09 09:22:23.646244409 +0200
+@@ -3342,6 +3342,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,
+@@ -4170,6 +4182,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.2p1/loginrec.c.audit openssh-5.2p1/loginrec.c
+--- openssh-5.2p1/loginrec.c.audit	2009-02-12 03:12:22.000000000 +0100
++++ openssh-5.2p1/loginrec.c	2009-08-09 09:22:23.667199702 +0200
 @@ -176,6 +176,10 @@
  #include "auth.h"
  #include "buffer.h"
@@ -60,16 +164,49 @@ diff -up openssh-4.7p1/loginrec.c.audit 
  #ifdef USE_LOGIN
  	syslogin_write_entry(li);
  #endif
-@@ -1394,6 +1405,51 @@ wtmpx_get_entry(struct logininfo *li)
+@@ -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[64];
++	char buf[AUDIT_LOG_SIZE];
 +	int audit_fd, rc;
 +
 +	audit_fd = audit_open();
@@ -82,8 +219,11 @@ diff -up openssh-4.7p1/loginrec.c.audit 
 +	}
 +	if (username == NULL)
 +		snprintf(buf, sizeof(buf), "uid=%d", uid);
-+	else
-+		snprintf(buf, sizeof(buf), "acct=%s", username);
++	else {
++		char encoded[AUDIT_ACCT_SIZE];
++		_audit_hexscape(username, encoded, sizeof(encoded));
++		snprintf(buf, sizeof(buf), "acct=%s", encoded);
++	}
 +	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
 +		buf, hostname, ip, ttyn, success);
 +	close(audit_fd);
@@ -112,22 +252,9 @@ diff -up openssh-4.7p1/loginrec.c.audit 
  /**
   ** Low-level libutil login() functions
   **/
-diff -up openssh-4.7p1/config.h.in.audit openssh-4.7p1/config.h.in
---- openssh-4.7p1/config.h.in.audit	2007-09-04 08:50:04.000000000 +0200
-+++ openssh-4.7p1/config.h.in	2007-09-06 17:07:44.000000000 +0200
-@@ -1334,6 +1334,9 @@
- /* Define if you want SELinux support. */
- #undef WITH_SELINUX
- 
-+/* Define if you want Linux audit support. */
-+#undef HAVE_LINUX_AUDIT
-+
- /* Define to 1 if your processor stores words with the most significant byte
-    first (like Motorola and SPARC, unlike Intel and VAX). */
- #undef WORDS_BIGENDIAN
-diff -up openssh-4.7p1/loginrec.h.audit openssh-4.7p1/loginrec.h
---- openssh-4.7p1/loginrec.h.audit	2006-08-05 04:39:40.000000000 +0200
-+++ openssh-4.7p1/loginrec.h	2007-09-06 17:07:44.000000000 +0200
+diff -up openssh-5.2p1/loginrec.h.audit openssh-5.2p1/loginrec.h
+--- openssh-5.2p1/loginrec.h.audit	2006-08-05 04:39:40.000000000 +0200
++++ openssh-5.2p1/loginrec.h	2009-08-09 09:22:23.641175349 +0200
 @@ -127,5 +127,9 @@ char *line_stripname(char *dst, const ch
  char *line_abbrevname(char *dst, const char *src, int dstsize);
  
@@ -138,33 +265,3 @@ diff -up openssh-4.7p1/loginrec.h.audit 
 +#endif /* HAVE_LINUX_AUDIT */
  
  #endif /* _HAVE_LOGINREC_H_ */
-diff -up openssh-4.7p1/configure.ac.audit openssh-4.7p1/configure.ac
---- openssh-4.7p1/configure.ac.audit	2007-09-06 17:07:44.000000000 +0200
-+++ openssh-4.7p1/configure.ac	2007-09-06 17:15:23.000000000 +0200
-@@ -3216,6 +3216,18 @@ AC_ARG_WITH(selinux,
- 	fi ]
- )
- 
-+# Check whether user wants Linux audit support
-+LINUX_AUDIT_MSG="no"
-+AC_ARG_WITH(linux-audit,
-+	[  --with-linux-audit   Enable Linux audit support],
-+	[ if test "x$withval" != "xno" ; then
-+		AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
-+		LINUX_AUDIT_MSG="yes"
-+		AC_CHECK_HEADERS(libaudit.h)
-+		SSHDLIBS="$SSHDLIBS -laudit"
-+	fi ]
-+)
-+
- # Check whether user wants Kerberos 5 support
- KRB5_MSG="no"
- AC_ARG_WITH(kerberos5,
-@@ -4037,6 +4049,7 @@ echo "                       PAM support
- echo "                   OSF SIA support: $SIA_MSG"
- echo "                 KerberosV support: $KRB5_MSG"
- echo "                   SELinux support: $SELINUX_MSG"
-+echo "               Linux audit support: $LINUX_AUDIT_MSG"
- echo "                 Smartcard support: $SCARD_MSG"
- echo "                     S/KEY support: $SKEY_MSG"
- echo "              TCP Wrappers support: $TCPW_MSG"

openssh-5.2p1-redhat.patch:
 ssh_config    |   11 +++++++++++
 sshd_config   |   13 +++++++++++++
 sshd_config.0 |    6 +++---
 sshd_config.5 |    2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

Index: openssh-5.2p1-redhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-redhat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openssh-5.2p1-redhat.patch	10 Mar 2009 13:39:03 -0000	1.2
+++ openssh-5.2p1-redhat.patch	28 Aug 2009 21:46:27 -0000	1.3
@@ -1,6 +1,52 @@
+diff -up openssh-5.2p1/ssh_config.redhat openssh-5.2p1/ssh_config
+--- openssh-5.2p1/ssh_config.redhat	2009-02-21 02:45:02.000000000 +0100
++++ openssh-5.2p1/ssh_config	2009-08-09 08:45:11.302092427 +0200
+@@ -44,3 +44,14 @@
+ #   TunnelDevice any:any
+ #   PermitLocalCommand no
+ #   VisualHostKey no
++Host *
++	GSSAPIAuthentication yes
++# If this option is set to yes then remote X11 clients will have full access
++# to the original X11 display. As virtually no X11 client supports the untrusted
++# mode correctly we set this to yes.
++	ForwardX11Trusted yes
++# Send locale-related environment variables
++	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
++	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
++	SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE
++	SendEnv XMODIFIERS
+diff -up openssh-5.2p1/sshd_config.0.redhat openssh-5.2p1/sshd_config.0
+--- openssh-5.2p1/sshd_config.0.redhat	2009-02-23 01:18:15.000000000 +0100
++++ openssh-5.2p1/sshd_config.0	2009-08-09 08:45:11.276555108 +0200
+@@ -491,9 +491,9 @@ DESCRIPTION
+ 
+      SyslogFacility
+              Gives the facility code that is used when logging messages from
+-             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
+-             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The de-
+-             fault is AUTH.
++             sshd(8).  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
++             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
++             The default is AUTH.
+ 
+      TCPKeepAlive
+              Specifies whether the system should send TCP keepalive messages
+diff -up openssh-5.2p1/sshd_config.5.redhat openssh-5.2p1/sshd_config.5
+--- openssh-5.2p1/sshd_config.5.redhat	2009-02-23 01:00:24.000000000 +0100
++++ openssh-5.2p1/sshd_config.5	2009-08-09 08:45:11.278927203 +0200
+@@ -848,7 +848,7 @@ Note that this option applies to protoco
+ .It Cm SyslogFacility
+ Gives the facility code that is used when logging messages from
+ .Xr sshd 8 .
+-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
++The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
+ LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
+ The default is AUTH.
+ .It Cm TCPKeepAlive
 diff -up openssh-5.2p1/sshd_config.redhat openssh-5.2p1/sshd_config
 --- openssh-5.2p1/sshd_config.redhat	2008-07-02 14:35:43.000000000 +0200
-+++ openssh-5.2p1/sshd_config	2008-07-23 14:11:12.000000000 +0200
++++ openssh-5.2p1/sshd_config	2009-08-09 08:47:40.850857227 +0200
 @@ -33,6 +33,7 @@ Protocol 2
  # Logging
  # obsoletes QuietMode and FascistLogging
@@ -31,7 +77,7 @@ diff -up openssh-5.2p1/sshd_config.redha
  
  # Set this to 'yes' to enable PAM authentication, account processing, 
  # and session processing. If this is enabled, PAM authentication will 
-@@ -84,11 +89,18 @@ Protocol 2
+@@ -84,11 +89,19 @@ Protocol 2
  # PAM authentication, then enable this but set PasswordAuthentication
  # and ChallengeResponseAuthentication to 'no'.
  #UsePAM no
@@ -41,6 +87,7 @@ diff -up openssh-5.2p1/sshd_config.redha
 +AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
 +AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
 +AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE
++AcceptEnv XMODIFIERS
  
  #AllowAgentForwarding yes
  #AllowTcpForwarding yes
@@ -50,48 +97,3 @@ diff -up openssh-5.2p1/sshd_config.redha
  #X11DisplayOffset 10
  #X11UseLocalhost yes
  #PrintMotd yes
-diff -up openssh-5.2p1/ssh_config.redhat openssh-5.2p1/ssh_config
---- openssh-5.2p1/ssh_config.redhat	2007-06-11 06:04:42.000000000 +0200
-+++ openssh-5.2p1/ssh_config	2008-07-23 14:07:29.000000000 +0200
-@@ -44,3 +44,13 @@
- #   TunnelDevice any:any
- #   PermitLocalCommand no
- #   VisualHostKey no
-+Host *
-+	GSSAPIAuthentication yes
-+# If this option is set to yes then remote X11 clients will have full access
-+# to the original X11 display. As virtually no X11 client supports the untrusted
-+# mode correctly we set this to yes.
-+	ForwardX11Trusted yes
-+# Send locale-related environment variables
-+	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
-+	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
-+	SendEnv LC_IDENTIFICATION LC_ALL LANGUAGE
-diff -up openssh-5.2p1/sshd_config.0.redhat openssh-5.2p1/sshd_config.0
---- openssh-5.2p1/sshd_config.0.redhat	2008-07-21 10:30:51.000000000 +0200
-+++ openssh-5.2p1/sshd_config.0	2008-07-23 14:07:29.000000000 +0200
-@@ -490,9 +490,9 @@ DESCRIPTION
- 
-      SyslogFacility
-              Gives the facility code that is used when logging messages from
--             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
--             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The de-
--             fault is AUTH.
-+             sshd(8).  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
-+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
-+             The default is AUTH.
- 
-      TCPKeepAlive
-              Specifies whether the system should send TCP keepalive messages
-diff -up openssh-5.2p1/sshd_config.5.redhat openssh-5.2p1/sshd_config.5
---- openssh-5.2p1/sshd_config.5.redhat	2008-07-02 14:35:43.000000000 +0200
-+++ openssh-5.2p1/sshd_config.5	2008-07-23 14:07:29.000000000 +0200
-@@ -846,7 +846,7 @@ Note that this option applies to protoco
- .It Cm SyslogFacility
- Gives the facility code that is used when logging messages from
- .Xr sshd 8 .
--The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
-+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
- LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
- The default is AUTH.
- .It Cm TCPKeepAlive

openssh-5.2p1-selinux.patch:
 openssh-5.1p1/auth2-gss.c                 |    9 +++++++-
 openssh-5.2p1/auth.h                      |    1 
 openssh-5.2p1/auth1.c                     |   10 ++++++++-
 openssh-5.2p1/auth2-hostbased.c           |    9 +++++++-
 openssh-5.2p1/auth2-pubkey.c              |    9 +++++++-
 openssh-5.2p1/auth2.c                     |   10 +++++++--
 openssh-5.2p1/configure.ac                |    1 
 openssh-5.2p1/monitor.c                   |   28 ++++++++++++++++++++++++--
 openssh-5.2p1/monitor.h                   |    2 -
 openssh-5.2p1/monitor_wrap.c              |   17 +++++++++++++++
 openssh-5.2p1/monitor_wrap.h              |    1 
 openssh-5.2p1/openbsd-compat/port-linux.c |   32 +++++++++++++++++++++++-------
 12 files changed, 113 insertions(+), 16 deletions(-)

Index: openssh-5.2p1-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openssh-5.2p1-selinux.patch	10 Mar 2009 13:39:03 -0000	1.2
+++ openssh-5.2p1-selinux.patch	28 Aug 2009 21:46:27 -0000	1.3
@@ -326,3 +326,36 @@ diff -up openssh-5.2p1/monitor.c.selinux
  	if (strcmp(authctxt->user, p) != 0) {
  		logit("wrong user name passed to monitor: expected %s != %.100s",
  		    authctxt->user, p);
+diff -up openssh-5.1p1/auth2-gss.c.gssapi-role openssh-5.1p1/auth2-gss.c
+--- openssh-5.1p1/auth2-gss.c.gssapi-role	2007-12-02 12:59:45.000000000 +0100
++++ openssh-5.1p1/auth2-gss.c	2008-07-23 19:18:15.000000000 +0200
+@@ -258,6 +258,7 @@ input_gssapi_mic(int type, u_int32_t ple
+ 	Authctxt *authctxt = ctxt;
+ 	Gssctxt *gssctxt;
+ 	int authenticated = 0;
++	char *micuser;
+ 	Buffer b;
+ 	gss_buffer_desc mic, gssbuf;
+ 	u_int len;
+@@ -270,7 +271,11 @@ input_gssapi_mic(int type, u_int32_t ple
+ 	mic.value = packet_get_string(&len);
+ 	mic.length = len;
+ 
+-	ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
++	if (authctxt->role && (strlen(authctxt->role) > 0))
++		xasprintf(&micuser, "%s/%s", authctxt->user, authctxt->role);
++	else
++		micuser = authctxt->user;
++	ssh_gssapi_buildmic(&b, micuser, authctxt->service,
+ 	    "gssapi-with-mic");
+ 
+ 	gssbuf.value = buffer_ptr(&b);
+@@ -282,6 +287,8 @@ input_gssapi_mic(int type, u_int32_t ple
+ 		logit("GSSAPI MIC check failed");
+ 
+ 	buffer_free(&b);
++	if (micuser != authctxt->user)
++		xfree(micuser);
+ 	xfree(mic.value);
+ 
+ 	authctxt->postponed = 0;


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- openssh.spec	26 Aug 2009 11:01:42 -0000	1.157
+++ openssh.spec	28 Aug 2009 21:46:27 -0000	1.158
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 19%{?dist}%{?rescue_rel}
+Release: 20%{?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
@@ -81,8 +81,8 @@ Patch4: openssh-5.2p1-vendor.patch
 Patch12: openssh-5.2p1-selinux.patch
 Patch13: openssh-5.1p1-mls.patch
 Patch16: openssh-4.7p1-audit.patch
-Patch17: openssh-4.3p2-cve-2007-3102.patch
 Patch18: openssh-5.0p1-pam_selinux.patch
+Patch19: openssh-5.2p1-sesftp.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
 Patch27: openssh-5.1p1-log-in-chroot.patch
@@ -93,15 +93,12 @@ Patch39: openssh-4.3p2-no-v6only.patch
 Patch44: openssh-4.3p2-allow-ip-opts.patch
 Patch49: openssh-4.3p2-gssapi-canohost.patch
 Patch51: openssh-5.2p1-nss-keys.patch
-Patch54: openssh-5.1p1-gssapi-role.patch
 Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
 Patch65: openssh-5.2p1-fips.patch
 Patch66: openssh-5.2p1-homechroot.patch
-Patch67: openssh-5.2p1-xmodifiers.patch
 Patch68: openssh-5.2p1-pathmax.patch
 Patch69: openssh-5.2p1-selabel.patch
-Patch70: openssh-5.2p1-sesftp.patch
 Patch71: openssh-5.2p1-edns.patch
 
 License: BSD
@@ -216,8 +213,8 @@ an X11 passphrase dialog for OpenSSH.
 %patch12 -p1 -b .selinux
 %patch13 -p1 -b .mls
 %patch16 -p1 -b .audit
-%patch17 -p1 -b .inject-fix
 %patch18 -p1 -b .pam_selinux
+%patch19 -p1 -b .sesftp
 %endif
 
 %patch22 -p1 -b .keep-above
@@ -230,15 +227,12 @@ an X11 passphrase dialog for OpenSSH.
 %patch44 -p1 -b .ip-opts
 %patch49 -p1 -b .canohost
 %patch51 -p1 -b .nss-keys
-%patch54 -p1 -b .gssapi-role
 %patch55 -p1 -b .cloexec
 %patch62 -p1 -b .manpage
 %patch65 -p1 -b .fips
 %patch66 -p1 -b .homechroot
-%patch67 -p1 -b .xmodifiers
 %patch68 -p1 -b .pathmax
 %patch69 -p1 -b .selabel
-%patch70 -p1 -b .sesftp
 %patch71 -p1 -b .edns
 
 autoreconf
@@ -474,6 +468,12 @@ fi
 %endif
 
 %changelog
+* Fri Aug 28 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-20
+- merged xmodifiers to redhat patch
+- merged gssapi-role to selinux patch
+- merged cve-2007_3102 to audit patch
+- sesftp patch only with WITH_SELINUX flag
+
 * Wed Aug 26 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-19
 - minor change in sesftp patch
 


--- openssh-4.3p2-cve-2007-3102.patch DELETED ---


--- openssh-5.1p1-gssapi-role.patch DELETED ---


--- openssh-5.2p1-xmodifiers.patch DELETED ---



From deji at fedoraproject.org  Fri Aug 28 22:01:09 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 28 Aug 2009 22:01:09 +0000 (UTC)
Subject: rpms/tokyocabinet/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 tokyocabinet.spec, 1.14, 1.15
Message-ID: <20090828220109.9479A11C0078@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17609

Modified Files:
	.cvsignore sources tokyocabinet.spec 
Log Message:
* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.32-1
- Update to 1.4.32



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Aug 2009 05:03:26 -0000	1.12
+++ .cvsignore	28 Aug 2009 22:01:09 -0000	1.13
@@ -1 +1 @@
-tokyocabinet-1.4.30.tar.gz
+tokyocabinet-1.4.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 05:03:26 -0000	1.12
+++ sources	28 Aug 2009 22:01:09 -0000	1.13
@@ -1 +1 @@
-9db239bf12c7a76f068a4e38b5575ee7  tokyocabinet-1.4.30.tar.gz
+a1a161eab1cb7487b23b6c914e2afb3e  tokyocabinet-1.4.32.tar.gz


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tokyocabinet.spec	11 Aug 2009 05:03:26 -0000	1.14
+++ tokyocabinet.spec	28 Aug 2009 22:01:09 -0000	1.15
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.4.30
+Version:	1.4.32
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %doc doc/*
 
 %changelog
+* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.32-1
+- Update to 1.4.32
+
 * Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.30-1
 - New upstream version
 



From deji at fedoraproject.org  Fri Aug 28 22:02:25 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 28 Aug 2009 22:02:25 +0000 (UTC)
Subject: rpms/tokyocabinet/devel tokyocabinet-fedora.patch,1.5,1.6
Message-ID: <20090828220225.808F611C0078@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17892

Modified Files:
	tokyocabinet-fedora.patch 
Log Message:
Update patch


tokyocabinet-fedora.patch:
 Makefile.in        |    4 ++--
 configure.in       |   17 +++--------------
 tokyocabinet.pc.in |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet-fedora.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tokyocabinet-fedora.patch	11 Aug 2009 05:03:26 -0000	1.5
+++ tokyocabinet-fedora.patch	28 Aug 2009 22:02:25 -0000	1.6
@@ -1,5 +1,5 @@
---- configure.in	2009-07-13 05:07:17.000000000 -0400
-+++ configure.in.new	2009-08-11 00:51:08.209442295 -0400
+--- configure.in	2009-08-13 22:57:42.000000000 -0400
++++ configure.in.new	2009-08-28 17:47:51.203289024 -0400
 @@ -31,26 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
@@ -30,21 +30,21 @@
  #================================================================
  # Options
  #================================================================
---- Makefile.in	2009-06-23 23:21:16.000000000 -0400
-+++ Makefile.in.new	2009-08-11 00:52:59.612477308 -0400
+--- Makefile.in	2009-08-04 03:37:52.000000000 -0400
++++ Makefile.in.new	2009-08-28 17:49:17.050288532 -0400
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
  LIBS = @LIBS@
 -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
 -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
-+LDENV =
++LDENV = 
 +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
  POSTCMD = @MYPOSTCMD@
  
  
 --- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
-+++ tokyocabinet.pc.in.new	2009-08-11 00:53:45.092479716 -0400
++++ tokyocabinet.pc.in.new	2009-08-28 17:50:19.201288883 -0400
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM



From mathstuf at fedoraproject.org  Fri Aug 28 22:10:48 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 28 Aug 2009 22:10:48 +0000 (UTC)
Subject: rpms/bilbo/devel bilbo-0.9-license-headers.patch, NONE,
	1.1 bilbo-0.9-licenses.patch, NONE,
	1.1 bilbo-0.9-localdeletion.patch, NONE,
	1.1 bilbo-0.9-postdate-utc.patch, NONE, 1.1 bilbo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828221048.A2B3111C0078@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/bilbo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19769

Modified Files:
	.cvsignore sources 
Added Files:
	bilbo-0.9-license-headers.patch bilbo-0.9-licenses.patch 
	bilbo-0.9-localdeletion.patch bilbo-0.9-postdate-utc.patch 
	bilbo.spec 
Log Message:
Initial commit

bilbo-0.9-license-headers.patch:
 htmlexporter.cpp |   43 +++++++++++++++++++++++++------------------
 htmlexporter.h   |   43 ++++++++++++++++++++++++-------------------
 2 files changed, 49 insertions(+), 37 deletions(-)

--- NEW FILE bilbo-0.9-license-headers.patch ---
>From 4013ac28d825fe1b756e20e97811715e3c9afcd4 Mon Sep 17 00:00:00 2001
From: goli <g382nilieh at gmail.com>
Date: Wed, 13 May 2009 00:39:11 +0430
Subject: [PATCH] Fix a typo in license headers. change it from GPL v2 to GPL v3.

---
 bilbo/htmlexporter.cpp |   43 +++++++++++++++++++++++++------------------
 bilbo/htmlexporter.h   |   42 ++++++++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/bilbo/htmlexporter.cpp b/bilbo/htmlexporter.cpp
index d1d4063..82b88a0 100644
--- a/bilbo/htmlexporter.cpp
+++ b/bilbo/htmlexporter.cpp
@@ -3,24 +3,31 @@
 ** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
 ** Copyright (C) 2007 Antonio Aloisio <gnuton at gnuton.org>
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales at trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
+***************************************************************************/
+/*   Copyright (C) 2008-2009 Mehrdad Momeny <mehrdad.momeny at gmail.com>     *
+ *   Copyright (C) 2008-2009 Golnaz Nilieh <g382nilieh at gmail.com>          *
+ *                                                                         *
+ *   This file is a part of Bilbo Blogger.                                 *
+ *   It is a modified version of "htmlexporter.cpp" from                   *
+ *   KBlogger project. it has been modified for use in Bilbo Blogger, at   *
+ *   November 2008.                                                        *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
 
 #include "htmlexporter.h"
 
diff --git a/bilbo/htmlexporter.h b/bilbo/htmlexporter.h
index 9e957d6..37da675 100644
--- a/bilbo/htmlexporter.h
+++ b/bilbo/htmlexporter.h
@@ -3,24 +3,30 @@
 ** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
 ** Copyright (C) 2007 Antonio Aloisio <gnuton at gnuton.org>
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales at trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
+***************************************************************************/
+/*   Copyright (C) 2008-2009 Mehrdad Momeny <mehrdad.momeny at gmail.com>     *
+ *   Copyright (C) 2008-2009 Golnaz Nilieh <g382nilieh at gmail.com>          *
+ *                                                                         *
+ *   This file is a part of Bilbo Blogger.                                 *
+ *   It is a modified version of "htmlexporter.h" from                     *
+ *   KBlogger project. it has been modified for use in Bilbo Blogger, at   *
+ *   November 2008.                                                        *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #ifndef HTML_EXPORTER_H
 #define HTML_EXPORTER_H
-- 
1.6.1


bilbo-0.9-licenses.patch:
 COPYING                   |  674 ----------------------------------------------
 b/bilbo/COPYING.GPL3      |  674 ++++++++++++++++++++++++++++++++++++++++++++++
 b/bilbokblog/COPYING.LGPL |  508 ++++++++++++++++++++++++++++++++++
 bilbokblog/COPYING        |  507 ----------------------------------
 4 files changed, 1181 insertions(+), 1182 deletions(-)

--- NEW FILE bilbo-0.9-licenses.patch ---
>From ef9e60cb787deda57bcfb3efc70ceb03932764a6 Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Wed, 13 May 2009 13:18:45 +0430
Subject: [PATCH] Updated COPYING files! renamed to have license name at file name! moved to Bilbo and BilboKBlog

---
 COPYING                 |  674 -----------------------------------------------
 bilbo/COPYING.GPL3      |  674 +++++++++++++++++++++++++++++++++++++++++++++++
 bilbokblog/COPYING      |  507 -----------------------------------
 bilbokblog/COPYING.LGPL |  507 +++++++++++++++++++++++++++++++++++
 4 files changed, 1181 insertions(+), 1181 deletions(-)
 delete mode 100644 COPYING
 create mode 100644 bilbo/COPYING.GPL3
 delete mode 100644 bilbokblog/COPYING
 create mode 100644 bilbokblog/COPYING.LGPL

diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
[...2006 lines suppressed...]
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
-- 
1.6.1


bilbo-0.9-localdeletion.patch:
 toolbox.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE bilbo-0.9-localdeletion.patch ---
>From f9192f02da4114c13c5b10fa825978884e958c4f Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Mon, 27 Jul 2009 12:42:24 +0430
Subject: [PATCH] Bug: #405142
 Fixed

---
 bilbo/toolbox.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bilbo/toolbox.cpp b/bilbo/toolbox.cpp
index 095997d..5017d61 100644
--- a/bilbo/toolbox.cpp
+++ b/bilbo/toolbox.cpp
@@ -502,7 +502,7 @@ void Toolbox::sltRemoveLocalEntry()
     if(localEntriesTable->selectedItems().count() > 0) {
         int local_id = localEntriesTable->item(0, localEntriesTable->currentRow())->data(32).toInt();
         if( KMessageBox::warningYesNo(this, i18n("Are you sure of removing selected local entry?")) 
-            == KMessageBox::NoExec )
+            == KMessageBox::No )
             return;
 
         if( DBMan::self()->removeLocalEntry(local_id) ) {
-- 
1.6.1


bilbo-0.9-postdate-utc.patch:
 wordpressbuggy.cpp |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE bilbo-0.9-postdate-utc.patch ---
>From acc8588a050c2a0f29dcb6081a2aff990f1f812f Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Sat, 16 May 2009 22:13:11 +0430
Subject: [PATCH] Add Z to wordpress datetimes to figure out that their UTC

---
 bilbokblog/wordpressbuggy.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bilbokblog/wordpressbuggy.cpp b/bilbokblog/wordpressbuggy.cpp
index 83f1537..c5853c0 100644
--- a/bilbokblog/wordpressbuggy.cpp
+++ b/bilbokblog/wordpressbuggy.cpp
@@ -98,7 +98,7 @@ void WordpressBuggy::createPost( KBlog::BlogPost *post )
 
   xmlMarkup += "<name>dateCreated</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>mt_allow_comments</name>";
@@ -197,12 +197,12 @@ void WordpressBuggy::modifyPost( KBlog::BlogPost *post )
 
   xmlMarkup += "<name>lastModified</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->modificationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->modificationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>dateCreated</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>mt_allow_comments</name>";
-- 
1.6.1



--- NEW FILE bilbo.spec ---
Name:           bilbo
Version:        0.9
Release:        3%{?dist}
Summary:        Blogging client, focused on simplicity and usability

Group:          Applications/Internet
License:        GPLv3+ and LGPLv2+
URL:            http://bilbo.gnufolks.org/
Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9/bilbo-0.9.tar.gz
#Beta version
#Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9.951.0Beta1/bilbo-0.9.95.tar.gz
#Backported patch
Patch200:       bilbo-0.9-localdeletion.patch
Patch201:       bilbo-0.9-licenses.patch
Patch202:       bilbo-0.9-license-headers.patch
Patch203:       bilbo-0.9-postdate-utc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel
BuildRequires:  kdepimlibs-devel
BuildRequires:  gettext
BuildRequires:  automoc
BuildRequires:  phonon-devel

%description
Blogging application for Blogger1.0, MetaWeblog, MovableType, and Google
GData with WYSIWYG and HTML editing available.


%prep
%setup -q
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1

%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform}
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/bilbo.desktop
%find_lang %{name}
# No headers installed
rm -vf %{buildroot}%{_libdir}/libbilbokblog.so


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS bilbo/COPYING.GPL3 bilbokblog/COPYING.LGPL
%{_kde4_bindir}/bilbo
%{_kde4_libdir}/libbilbokblog.so.4
%{_kde4_libdir}/libbilbokblog.so.4.2.1
%{_kde4_datadir}/applications/kde4/bilbo.desktop
%{_kde4_configdir}.kcfg/bilbo.kcfg
%{_kde4_iconsdir}/hicolor/*/*/*.png
%{_kde4_datadir}/kde4/apps/bilbo/


%changelog
* Thu Aug 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-3
- Add icon cache snippets
- Backport licensing fixes
- Backport patch to fix timezone mismatch with server

* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-2
- Backport patch for local deletion

* Sun Jul 26 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 19:18:42 -0000	1.1
+++ .cvsignore	28 Aug 2009 22:10:48 -0000	1.2
@@ -0,0 +1 @@
+bilbo-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 19:18:43 -0000	1.1
+++ sources	28 Aug 2009 22:10:48 -0000	1.2
@@ -0,0 +1 @@
+396da4f5fc1d91d692eefaf8e9871795  bilbo-0.9.tar.gz



From mathstuf at fedoraproject.org  Fri Aug 28 22:15:29 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 28 Aug 2009 22:15:29 +0000 (UTC)
Subject: rpms/bilbo/F-11 bilbo-0.9-license-headers.patch, NONE,
	1.1 bilbo-0.9-licenses.patch, NONE,
	1.1 bilbo-0.9-localdeletion.patch, NONE,
	1.1 bilbo-0.9-postdate-utc.patch, NONE, 1.1 bilbo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828221529.DEF3A11C0078@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/bilbo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20944

Modified Files:
	.cvsignore sources 
Added Files:
	bilbo-0.9-license-headers.patch bilbo-0.9-licenses.patch 
	bilbo-0.9-localdeletion.patch bilbo-0.9-postdate-utc.patch 
	bilbo.spec 
Log Message:
Initial commit

bilbo-0.9-license-headers.patch:
 htmlexporter.cpp |   43 +++++++++++++++++++++++++------------------
 htmlexporter.h   |   43 ++++++++++++++++++++++++-------------------
 2 files changed, 49 insertions(+), 37 deletions(-)

--- NEW FILE bilbo-0.9-license-headers.patch ---
>From 4013ac28d825fe1b756e20e97811715e3c9afcd4 Mon Sep 17 00:00:00 2001
From: goli <g382nilieh at gmail.com>
Date: Wed, 13 May 2009 00:39:11 +0430
Subject: [PATCH] Fix a typo in license headers. change it from GPL v2 to GPL v3.

---
 bilbo/htmlexporter.cpp |   43 +++++++++++++++++++++++++------------------
 bilbo/htmlexporter.h   |   42 ++++++++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/bilbo/htmlexporter.cpp b/bilbo/htmlexporter.cpp
index d1d4063..82b88a0 100644
--- a/bilbo/htmlexporter.cpp
+++ b/bilbo/htmlexporter.cpp
@@ -3,24 +3,31 @@
 ** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
 ** Copyright (C) 2007 Antonio Aloisio <gnuton at gnuton.org>
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales at trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
+***************************************************************************/
+/*   Copyright (C) 2008-2009 Mehrdad Momeny <mehrdad.momeny at gmail.com>     *
+ *   Copyright (C) 2008-2009 Golnaz Nilieh <g382nilieh at gmail.com>          *
+ *                                                                         *
+ *   This file is a part of Bilbo Blogger.                                 *
+ *   It is a modified version of "htmlexporter.cpp" from                   *
+ *   KBlogger project. it has been modified for use in Bilbo Blogger, at   *
+ *   November 2008.                                                        *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
 
 #include "htmlexporter.h"
 
diff --git a/bilbo/htmlexporter.h b/bilbo/htmlexporter.h
index 9e957d6..37da675 100644
--- a/bilbo/htmlexporter.h
+++ b/bilbo/htmlexporter.h
@@ -3,24 +3,30 @@
 ** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
 ** Copyright (C) 2007 Antonio Aloisio <gnuton at gnuton.org>
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales at trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
+***************************************************************************/
+/*   Copyright (C) 2008-2009 Mehrdad Momeny <mehrdad.momeny at gmail.com>     *
+ *   Copyright (C) 2008-2009 Golnaz Nilieh <g382nilieh at gmail.com>          *
+ *                                                                         *
+ *   This file is a part of Bilbo Blogger.                                 *
+ *   It is a modified version of "htmlexporter.h" from                     *
+ *   KBlogger project. it has been modified for use in Bilbo Blogger, at   *
+ *   November 2008.                                                        *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #ifndef HTML_EXPORTER_H
 #define HTML_EXPORTER_H
-- 
1.6.1


bilbo-0.9-licenses.patch:
 COPYING                   |  674 ----------------------------------------------
 b/bilbo/COPYING.GPL3      |  674 ++++++++++++++++++++++++++++++++++++++++++++++
 b/bilbokblog/COPYING.LGPL |  508 ++++++++++++++++++++++++++++++++++
 bilbokblog/COPYING        |  507 ----------------------------------
 4 files changed, 1181 insertions(+), 1182 deletions(-)

--- NEW FILE bilbo-0.9-licenses.patch ---
>From ef9e60cb787deda57bcfb3efc70ceb03932764a6 Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Wed, 13 May 2009 13:18:45 +0430
Subject: [PATCH] Updated COPYING files! renamed to have license name at file name! moved to Bilbo and BilboKBlog

---
 COPYING                 |  674 -----------------------------------------------
 bilbo/COPYING.GPL3      |  674 +++++++++++++++++++++++++++++++++++++++++++++++
 bilbokblog/COPYING      |  507 -----------------------------------
 bilbokblog/COPYING.LGPL |  507 +++++++++++++++++++++++++++++++++++
 4 files changed, 1181 insertions(+), 1181 deletions(-)
 delete mode 100644 COPYING
 create mode 100644 bilbo/COPYING.GPL3
 delete mode 100644 bilbokblog/COPYING
 create mode 100644 bilbokblog/COPYING.LGPL

diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
[...2006 lines suppressed...]
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
-- 
1.6.1


bilbo-0.9-localdeletion.patch:
 toolbox.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE bilbo-0.9-localdeletion.patch ---
>From f9192f02da4114c13c5b10fa825978884e958c4f Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Mon, 27 Jul 2009 12:42:24 +0430
Subject: [PATCH] Bug: #405142
 Fixed

---
 bilbo/toolbox.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bilbo/toolbox.cpp b/bilbo/toolbox.cpp
index 095997d..5017d61 100644
--- a/bilbo/toolbox.cpp
+++ b/bilbo/toolbox.cpp
@@ -502,7 +502,7 @@ void Toolbox::sltRemoveLocalEntry()
     if(localEntriesTable->selectedItems().count() > 0) {
         int local_id = localEntriesTable->item(0, localEntriesTable->currentRow())->data(32).toInt();
         if( KMessageBox::warningYesNo(this, i18n("Are you sure of removing selected local entry?")) 
-            == KMessageBox::NoExec )
+            == KMessageBox::No )
             return;
 
         if( DBMan::self()->removeLocalEntry(local_id) ) {
-- 
1.6.1


bilbo-0.9-postdate-utc.patch:
 wordpressbuggy.cpp |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE bilbo-0.9-postdate-utc.patch ---
>From acc8588a050c2a0f29dcb6081a2aff990f1f812f Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Sat, 16 May 2009 22:13:11 +0430
Subject: [PATCH] Add Z to wordpress datetimes to figure out that their UTC

---
 bilbokblog/wordpressbuggy.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bilbokblog/wordpressbuggy.cpp b/bilbokblog/wordpressbuggy.cpp
index 83f1537..c5853c0 100644
--- a/bilbokblog/wordpressbuggy.cpp
+++ b/bilbokblog/wordpressbuggy.cpp
@@ -98,7 +98,7 @@ void WordpressBuggy::createPost( KBlog::BlogPost *post )
 
   xmlMarkup += "<name>dateCreated</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>mt_allow_comments</name>";
@@ -197,12 +197,12 @@ void WordpressBuggy::modifyPost( KBlog::BlogPost *post )
 
   xmlMarkup += "<name>lastModified</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->modificationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->modificationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>dateCreated</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>mt_allow_comments</name>";
-- 
1.6.1



--- NEW FILE bilbo.spec ---
Name:           bilbo
Version:        0.9
Release:        3%{?dist}
Summary:        Blogging client, focused on simplicity and usability

Group:          Applications/Internet
License:        GPLv3+ and LGPLv2+
URL:            http://bilbo.gnufolks.org/
Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9/bilbo-0.9.tar.gz
#Beta version
#Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9.951.0Beta1/bilbo-0.9.95.tar.gz
#Backported patch
Patch200:       bilbo-0.9-localdeletion.patch
Patch201:       bilbo-0.9-licenses.patch
Patch202:       bilbo-0.9-license-headers.patch
Patch203:       bilbo-0.9-postdate-utc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel
BuildRequires:  kdepimlibs-devel
BuildRequires:  gettext
BuildRequires:  automoc
BuildRequires:  phonon-devel

%description
Blogging application for Blogger1.0, MetaWeblog, MovableType, and Google
GData with WYSIWYG and HTML editing available.


%prep
%setup -q
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1

%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform}
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/bilbo.desktop
%find_lang %{name}
# No headers installed
rm -vf %{buildroot}%{_libdir}/libbilbokblog.so


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS bilbo/COPYING.GPL3 bilbokblog/COPYING.LGPL
%{_kde4_bindir}/bilbo
%{_kde4_libdir}/libbilbokblog.so.4
%{_kde4_libdir}/libbilbokblog.so.4.2.1
%{_kde4_datadir}/applications/kde4/bilbo.desktop
%{_kde4_configdir}.kcfg/bilbo.kcfg
%{_kde4_iconsdir}/hicolor/*/*/*.png
%{_kde4_datadir}/kde4/apps/bilbo/


%changelog
* Thu Aug 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-3
- Add icon cache snippets
- Backport licensing fixes
- Backport patch to fix timezone mismatch with server

* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-2
- Backport patch for local deletion

* Sun Jul 26 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 19:18:42 -0000	1.1
+++ .cvsignore	28 Aug 2009 22:15:29 -0000	1.2
@@ -0,0 +1 @@
+bilbo-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 19:18:43 -0000	1.1
+++ sources	28 Aug 2009 22:15:29 -0000	1.2
@@ -0,0 +1 @@
+396da4f5fc1d91d692eefaf8e9871795  bilbo-0.9.tar.gz



From deji at fedoraproject.org  Fri Aug 28 22:18:16 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 28 Aug 2009 22:18:16 +0000 (UTC)
Subject: rpms/tokyocabinet/F-11 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 tokyocabinet-fedora.patch, 1.3, 1.4 tokyocabinet.spec, 1.11, 1.12
Message-ID: <20090828221816.0C18711C0078@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21651

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.32-1
- Update to 1.4.32



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Mar 2009 01:29:53 -0000	1.10
+++ .cvsignore	28 Aug 2009 22:18:15 -0000	1.11
@@ -1 +1 @@
-tokyocabinet-1.4.9.tar.gz
+tokyocabinet-1.4.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Mar 2009 01:29:53 -0000	1.10
+++ sources	28 Aug 2009 22:18:15 -0000	1.11
@@ -1 +1 @@
-295c5c04d62bfd3a772dbfa1bc9991ca  tokyocabinet-1.4.9.tar.gz
+a1a161eab1cb7487b23b6c914e2afb3e  tokyocabinet-1.4.32.tar.gz

tokyocabinet-fedora.patch:
 Makefile.in        |    4 ++--
 configure.in       |   17 +++--------------
 tokyocabinet.pc.in |    2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-11/tokyocabinet-fedora.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tokyocabinet-fedora.patch	4 Mar 2009 01:29:53 -0000	1.3
+++ tokyocabinet-fedora.patch	28 Aug 2009 22:18:15 -0000	1.4
@@ -1,6 +1,6 @@
---- configure.in	2009-02-25 00:22:38.000000000 -0500
-+++ configure.in.new	2009-03-03 10:15:18.000000000 -0500
-@@ -31,27 +31,15 @@
+--- configure.in	2009-08-13 22:57:42.000000000 -0400
++++ configure.in.new	2009-08-28 17:47:51.203289024 -0400
+@@ -31,26 +31,15 @@
  MYPCFILES="tokyocabinet.pc"
  
  # Building flags
@@ -17,9 +17,8 @@
  MYPOSTCMD="true"
  
 -# Building paths
--pathtmp="$PATH"
--PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
--PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-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"
@@ -31,8 +30,8 @@
  #================================================================
  # Options
  #================================================================
---- Makefile.in	2009-02-23 11:37:15.000000000 -0500
-+++ Makefile.in.new	2009-03-03 09:56:36.000000000 -0500
+--- Makefile.in	2009-08-04 03:37:52.000000000 -0400
++++ Makefile.in.new	2009-08-28 17:49:17.050288532 -0400
 @@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -45,7 +44,7 @@
  
  
 --- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
-+++ tokyocabinet.pc.in.new	2009-03-03 09:57:26.000000000 -0500
++++ tokyocabinet.pc.in.new	2009-08-28 17:50:19.201288883 -0400
 @@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-11/tokyocabinet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- tokyocabinet.spec	4 Mar 2009 01:29:53 -0000	1.11
+++ tokyocabinet.spec	28 Aug 2009 22:18:15 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.4.9
+Version:	1.4.32
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 %doc doc/*
 
 %changelog
+* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.32-1
+- Update to 1.4.32
+
 * Tue Mar 03 2009 Deji Akingunola <dakingun at gmail.com> - 1.4.9-1
 - Update to version 1.4.9
 



From cweyl at fedoraproject.org  Fri Aug 28 22:22:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 28 Aug 2009 22:22:17 +0000 (UTC)
Subject: rpms/perl-Sub-Identify/devel perl-Sub-Identify.spec,1.11,1.12
Message-ID: <20090828222217.D90BA11C0078@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Identify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23261

Modified Files:
	perl-Sub-Identify.spec 
Log Message:
release bump


Index: perl-Sub-Identify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Identify/devel/perl-Sub-Identify.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Sub-Identify.spec	28 Aug 2009 05:21:36 -0000	1.11
+++ perl-Sub-Identify.spec	28 Aug 2009 22:22:17 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Identify
 Version:        0.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Retrieve names of code references
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-6
+- bump
+
 * Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-5
 - Filtering errant private provides
 



From mathstuf at fedoraproject.org  Fri Aug 28 22:27:26 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 28 Aug 2009 22:27:26 +0000 (UTC)
Subject: rpms/bilbo/F-10 bilbo-0.9-license-headers.patch, NONE,
	1.1 bilbo-0.9-licenses.patch, NONE,
	1.1 bilbo-0.9-localdeletion.patch, NONE,
	1.1 bilbo-0.9-postdate-utc.patch, NONE, 1.1 bilbo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090828222726.4336911C0078@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/bilbo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24335

Modified Files:
	.cvsignore sources 
Added Files:
	bilbo-0.9-license-headers.patch bilbo-0.9-licenses.patch 
	bilbo-0.9-localdeletion.patch bilbo-0.9-postdate-utc.patch 
	bilbo.spec 
Log Message:
Initial commit

bilbo-0.9-license-headers.patch:
 htmlexporter.cpp |   43 +++++++++++++++++++++++++------------------
 htmlexporter.h   |   43 ++++++++++++++++++++++++-------------------
 2 files changed, 49 insertions(+), 37 deletions(-)

--- NEW FILE bilbo-0.9-license-headers.patch ---
>From 4013ac28d825fe1b756e20e97811715e3c9afcd4 Mon Sep 17 00:00:00 2001
From: goli <g382nilieh at gmail.com>
Date: Wed, 13 May 2009 00:39:11 +0430
Subject: [PATCH] Fix a typo in license headers. change it from GPL v2 to GPL v3.

---
 bilbo/htmlexporter.cpp |   43 +++++++++++++++++++++++++------------------
 bilbo/htmlexporter.h   |   42 ++++++++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/bilbo/htmlexporter.cpp b/bilbo/htmlexporter.cpp
index d1d4063..82b88a0 100644
--- a/bilbo/htmlexporter.cpp
+++ b/bilbo/htmlexporter.cpp
@@ -3,24 +3,31 @@
 ** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
 ** Copyright (C) 2007 Antonio Aloisio <gnuton at gnuton.org>
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales at trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
+***************************************************************************/
+/*   Copyright (C) 2008-2009 Mehrdad Momeny <mehrdad.momeny at gmail.com>     *
+ *   Copyright (C) 2008-2009 Golnaz Nilieh <g382nilieh at gmail.com>          *
+ *                                                                         *
+ *   This file is a part of Bilbo Blogger.                                 *
+ *   It is a modified version of "htmlexporter.cpp" from                   *
+ *   KBlogger project. it has been modified for use in Bilbo Blogger, at   *
+ *   November 2008.                                                        *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
 
 #include "htmlexporter.h"
 
diff --git a/bilbo/htmlexporter.h b/bilbo/htmlexporter.h
index 9e957d6..37da675 100644
--- a/bilbo/htmlexporter.h
+++ b/bilbo/htmlexporter.h
@@ -3,24 +3,30 @@
 ** Copyright (C) 1992-2006 Trolltech ASA. All rights reserved.
 ** Copyright (C) 2007 Antonio Aloisio <gnuton at gnuton.org>
 **
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales at trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
+***************************************************************************/
+/*   Copyright (C) 2008-2009 Mehrdad Momeny <mehrdad.momeny at gmail.com>     *
+ *   Copyright (C) 2008-2009 Golnaz Nilieh <g382nilieh at gmail.com>          *
+ *                                                                         *
+ *   This file is a part of Bilbo Blogger.                                 *
+ *   It is a modified version of "htmlexporter.h" from                     *
+ *   KBlogger project. it has been modified for use in Bilbo Blogger, at   *
+ *   November 2008.                                                        *
+ *                                                                         *
+ *   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, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #ifndef HTML_EXPORTER_H
 #define HTML_EXPORTER_H
-- 
1.6.1


bilbo-0.9-licenses.patch:
 COPYING                   |  674 ----------------------------------------------
 b/bilbo/COPYING.GPL3      |  674 ++++++++++++++++++++++++++++++++++++++++++++++
 b/bilbokblog/COPYING.LGPL |  508 ++++++++++++++++++++++++++++++++++
 bilbokblog/COPYING        |  507 ----------------------------------
 4 files changed, 1181 insertions(+), 1182 deletions(-)

--- NEW FILE bilbo-0.9-licenses.patch ---
>From ef9e60cb787deda57bcfb3efc70ceb03932764a6 Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Wed, 13 May 2009 13:18:45 +0430
Subject: [PATCH] Updated COPYING files! renamed to have license name at file name! moved to Bilbo and BilboKBlog

---
 COPYING                 |  674 -----------------------------------------------
 bilbo/COPYING.GPL3      |  674 +++++++++++++++++++++++++++++++++++++++++++++++
 bilbokblog/COPYING      |  507 -----------------------------------
 bilbokblog/COPYING.LGPL |  507 +++++++++++++++++++++++++++++++++++
 4 files changed, 1181 insertions(+), 1181 deletions(-)
 delete mode 100644 COPYING
 create mode 100644 bilbo/COPYING.GPL3
 delete mode 100644 bilbokblog/COPYING
 create mode 100644 bilbokblog/COPYING.LGPL

diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
[...2006 lines suppressed...]
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
-- 
1.6.1


bilbo-0.9-localdeletion.patch:
 toolbox.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE bilbo-0.9-localdeletion.patch ---
>From f9192f02da4114c13c5b10fa825978884e958c4f Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Mon, 27 Jul 2009 12:42:24 +0430
Subject: [PATCH] Bug: #405142
 Fixed

---
 bilbo/toolbox.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bilbo/toolbox.cpp b/bilbo/toolbox.cpp
index 095997d..5017d61 100644
--- a/bilbo/toolbox.cpp
+++ b/bilbo/toolbox.cpp
@@ -502,7 +502,7 @@ void Toolbox::sltRemoveLocalEntry()
     if(localEntriesTable->selectedItems().count() > 0) {
         int local_id = localEntriesTable->item(0, localEntriesTable->currentRow())->data(32).toInt();
         if( KMessageBox::warningYesNo(this, i18n("Are you sure of removing selected local entry?")) 
-            == KMessageBox::NoExec )
+            == KMessageBox::No )
             return;
 
         if( DBMan::self()->removeLocalEntry(local_id) ) {
-- 
1.6.1


bilbo-0.9-postdate-utc.patch:
 wordpressbuggy.cpp |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE bilbo-0.9-postdate-utc.patch ---
>From acc8588a050c2a0f29dcb6081a2aff990f1f812f Mon Sep 17 00:00:00 2001
From: Mehrdad Momeny <mehrdad.momeny at gmail.com>
Date: Sat, 16 May 2009 22:13:11 +0430
Subject: [PATCH] Add Z to wordpress datetimes to figure out that their UTC

---
 bilbokblog/wordpressbuggy.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bilbokblog/wordpressbuggy.cpp b/bilbokblog/wordpressbuggy.cpp
index 83f1537..c5853c0 100644
--- a/bilbokblog/wordpressbuggy.cpp
+++ b/bilbokblog/wordpressbuggy.cpp
@@ -98,7 +98,7 @@ void WordpressBuggy::createPost( KBlog::BlogPost *post )
 
   xmlMarkup += "<name>dateCreated</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>mt_allow_comments</name>";
@@ -197,12 +197,12 @@ void WordpressBuggy::modifyPost( KBlog::BlogPost *post )
 
   xmlMarkup += "<name>lastModified</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->modificationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->modificationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>dateCreated</name>";
   xmlMarkup += "<value><dateTime.iso8601>" +
-               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ss" ) +
+               post->creationDateTime().toUtc().dateTime().toString( "yyyyMMddThh:mm:ssZ" ) +
                "</dateTime.iso8601></value>";
   xmlMarkup += "</member><member>";
   xmlMarkup += "<name>mt_allow_comments</name>";
-- 
1.6.1



--- NEW FILE bilbo.spec ---
Name:           bilbo
Version:        0.9
Release:        3%{?dist}
Summary:        Blogging client, focused on simplicity and usability

Group:          Applications/Internet
License:        GPLv3+ and LGPLv2+
URL:            http://bilbo.gnufolks.org/
Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9/bilbo-0.9.tar.gz
#Beta version
#Source0:        http://mirror.umoss.org/download.ospdev.net/bilbo/bilbo/0.9.951.0Beta1/bilbo-0.9.95.tar.gz
#Backported patch
Patch200:       bilbo-0.9-localdeletion.patch
Patch201:       bilbo-0.9-licenses.patch
Patch202:       bilbo-0.9-license-headers.patch
Patch203:       bilbo-0.9-postdate-utc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel
BuildRequires:  kdepimlibs-devel
BuildRequires:  gettext
BuildRequires:  automoc
BuildRequires:  phonon-devel

%description
Blogging application for Blogger1.0, MetaWeblog, MovableType, and Google
GData with WYSIWYG and HTML editing available.


%prep
%setup -q
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1

%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} PREFIX=%{_prefix} -C %{_target_platform}
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/bilbo.desktop
%find_lang %{name}
# No headers installed
rm -vf %{buildroot}%{_libdir}/libbilbokblog.so


%clean
rm -rf %{buildroot}


%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS bilbo/COPYING.GPL3 bilbokblog/COPYING.LGPL
%{_kde4_bindir}/bilbo
%{_kde4_libdir}/libbilbokblog.so.4
%{_kde4_libdir}/libbilbokblog.so.4.2.1
%{_kde4_datadir}/applications/kde4/bilbo.desktop
%{_kde4_configdir}.kcfg/bilbo.kcfg
%{_kde4_iconsdir}/hicolor/*/*/*.png
%{_kde4_datadir}/kde4/apps/bilbo/


%changelog
* Thu Aug 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-3
- Add icon cache snippets
- Backport licensing fixes
- Backport patch to fix timezone mismatch with server

* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-2
- Backport patch for local deletion

* Sun Jul 26 2009 Ben Boeckel <MathStuf at gmail.com> 0.9-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 19:18:42 -0000	1.1
+++ .cvsignore	28 Aug 2009 22:27:25 -0000	1.2
@@ -0,0 +1 @@
+bilbo-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bilbo/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 19:18:43 -0000	1.1
+++ sources	28 Aug 2009 22:27:26 -0000	1.2
@@ -0,0 +1 @@
+396da4f5fc1d91d692eefaf8e9871795  bilbo-0.9.tar.gz



From cebbert at fedoraproject.org  Fri Aug 28 22:40:29 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 28 Aug 2009 22:40:29 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1752,1.1753
Message-ID: <20090828224029.3F73D11C0496@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26910

Modified Files:
	kernel.spec 
Log Message:
add version to changelog


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1752
retrieving revision 1.1753
diff -u -p -r1.1752 -r1.1753
--- kernel.spec	28 Aug 2009 17:26:08 -0000	1.1752
+++ kernel.spec	28 Aug 2009 22:40:28 -0000	1.1753
@@ -2007,7 +2007,7 @@ fi
 # and build.
 
 %changelog
-* Fri Aug 28 2009 Eric Paris <eparis at redhat.com>
+* Fri Aug 28 2009 Eric Paris <eparis at redhat.com> 2.6.31-0.190.rc8
 - fix inotify length accounting and send inotify events
 
 * Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:04 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchcommits
Message-ID: <20090828224304.8C8DA10F877@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on rpmconf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:05 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested commit
Message-ID: <20090828224305.9AD0810F87B@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on rpmconf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:10 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchbugzilla
Message-ID: <20090828224310.479DC10F881@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on rpmconf (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:15 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchbugzilla
Message-ID: <20090828224315.D0AFD10F88C@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on rpmconf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:18 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchcommits
Message-ID: <20090828224318.4876610F894@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on rpmconf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:19 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested commit
Message-ID: <20090828224320.0CBE710F878@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on rpmconf (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:29 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchcommits
Message-ID: <20090828224330.0167A10F899@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on rpmconf (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:28 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchbugzilla
Message-ID: <20090828224328.2B81410F897@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on rpmconf (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:31 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested commit
Message-ID: <20090828224331.99B7310F884@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on rpmconf (Fedora EPEL 4)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:36 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchbugzilla
Message-ID: <20090828224336.2895A10F89C@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on rpmconf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:37 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested watchcommits
Message-ID: <20090828224337.DA24310F8A1@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on rpmconf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From jfch2222 at fedoraproject.org  Fri Aug 28 22:43:53 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 28 Aug 2009 22:43:53 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-sesftp.patch, 1.5, 1.6 openssh.spec,
	1.158, 1.159
Message-ID: <20090828224353.7C6F111C0078@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27577

Modified Files:
	openssh-5.2p1-sesftp.patch openssh.spec 
Log Message:
rearange sesftp patch acording to upstream request


openssh-5.2p1-sesftp.patch:
 session.c |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

Index: openssh-5.2p1-sesftp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-sesftp.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openssh-5.2p1-sesftp.patch	26 Aug 2009 10:44:57 -0000	1.5
+++ openssh-5.2p1-sesftp.patch	28 Aug 2009 22:43:53 -0000	1.6
@@ -1,49 +1,66 @@
 diff -up openssh-5.2p1/session.c.sesftp openssh-5.2p1/session.c
---- openssh-5.2p1/session.c.sesftp	2009-07-22 15:18:17.156499945 +0200
-+++ openssh-5.2p1/session.c	2009-07-22 15:20:09.950319644 +0200
-@@ -58,6 +58,7 @@
+--- openssh-5.2p1/session.c.sesftp	2009-08-09 10:21:11.586827446 +0200
++++ openssh-5.2p1/session.c	2009-08-09 10:39:30.475622699 +0200
+@@ -58,6 +58,9 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
++#ifdef WITH_SELINUX
 +#include <selinux/selinux.h>
++#endif
  
  #include "openbsd-compat/sys-queue.h"
  #include "xmalloc.h"
-@@ -1805,8 +1806,8 @@ do_child(Session *s, const char *command
+@@ -101,6 +104,9 @@
+ 	  c[sizeof(INTERNAL_SFTP_NAME) - 1] == ' ' || \
+ 	  c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\t'))
  
- 	if (s->is_subsystem == SUBSYSTEM_INT_SFTP) {
++#ifdef WITH_SELINUX
++#define SFTPD_T		"sftpd_t"
++#endif
+ /* func */
+ 
+ Session *session_new(void);
+@@ -1789,6 +1795,10 @@ do_child(Session *s, const char *command
  		extern int optind, optreset;
--		int i;
--		char *p, *args;
-+		int i, l;
-+		char *p, *args, *c1, *c2, *cx;
+ 		int i;
+ 		char *p, *args;
++#ifdef WITH_SELINUX
++		int L1, L2;
++		char *c1, *c2, *cx;
++#endif
  
  		setproctitle("%s at internal-sftp-server", s->pw->pw_name);
  		args = xstrdup(command ? command : "sftp-server");
-@@ -1816,6 +1817,27 @@ do_child(Session *s, const char *command
+@@ -1798,6 +1808,32 @@ do_child(Session *s, const char *command
  		argv[i] = NULL;
  		optind = optreset = 1;
  		__progname = argv[0];
-+		if (getcon (&c1) < 0) {
-+			logit("do_child: getcon failed witch %s", strerror (errno));
++#ifdef WITH_SELINUX
++		if (getcon ((security_context_t *) &c1) < 0) {
++			logit("do_child: getcon failed with %s", strerror (errno));
 +		} else {
-+			c2 = xmalloc (strlen (c1) + 8);
++			L1 = strlen (c1) + sizeof (SFTPD_T);
++			c2 = xmalloc (L1);
 +			if (!(cx = index (c1, ':')))
 +				goto badcontext;
 +			if (!(cx = index (cx + 1, ':'))) {
 +badcontext:
 +				logit ("do_child: unparseable context %s", c1);
 +			} else {
-+				l = cx - c1 + 1;
-+				memcpy (c2, c1, l);
-+				strcpy (c2 + l, "sftpd_t");
++				L2 = cx - c1 + 1;
++				memcpy (c2, c1, L2);
++				strlcpy (c2 + L2, SFTPD_T, L1);
 +				if ((cx = index (cx + 1, ':')))
-+					strcat (c2, cx);
++					strlcat (c2, cx, L1);
 +				if (setcon (c2) < 0) 
-+					logit("do_child: setcon failed witch %s", strerror (errno));
++					logit("do_child: setcon failed with %s", strerror (errno));
 +			
 +			}
++			xfree (c1);
++			xfree (c2);
 +		}		
++#endif
 +			
  		exit(sftp_server_main(i, argv, s->pw));
  	}


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- openssh.spec	28 Aug 2009 21:46:27 -0000	1.158
+++ openssh.spec	28 Aug 2009 22:43:53 -0000	1.159
@@ -473,6 +473,7 @@ fi
 - merged gssapi-role to selinux patch
 - merged cve-2007_3102 to audit patch
 - sesftp patch only with WITH_SELINUX flag
+- rearange sesftp patch according to upstream request
 
 * Wed Aug 26 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-19
 - minor change in sesftp patch



From pkgdb at fedoraproject.org  Fri Aug 28 22:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:43:39 +0000
Subject: [pkgdb] rpmconf: mjakubicek has requested commit
Message-ID: <20090828224339.BAE4B10F8A8@bastion2.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on rpmconf (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Fri Aug 28 22:47:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:47:56 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224756.8ED7310F86F@bastion2.fedora.phx.redhat.com>

otaylor has set the watchbugzilla acl on clutter (Fedora 11) to Approved for otaylor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:00 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224800.BB2D810F87C@bastion2.fedora.phx.redhat.com>

otaylor has set the watchcommits acl on clutter (Fedora 11) to Approved for otaylor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:12 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224813.1730410F88C@bastion2.fedora.phx.redhat.com>

otaylor has set the watchcommits acl on clutter (Fedora 10) to Approved for otaylor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:09 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224809.D1CFA10F854@bastion2.fedora.phx.redhat.com>

otaylor has set the commit acl on clutter (Fedora 10) to Approved for otaylor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:04 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224804.6691310F884@bastion2.fedora.phx.redhat.com>

otaylor has set the commit acl on clutter (Fedora 11) to Approved for otaylor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:16 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224816.9038910F897@bastion2.fedora.phx.redhat.com>

otaylor has set the watchbugzilla acl on clutter (Fedora 10) to Approved for otaylor

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:55 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224855.B024910F878@bastion2.fedora.phx.redhat.com>

otaylor has set the watchbugzilla acl on clutter (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:57 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224857.5209E10F87C@bastion2.fedora.phx.redhat.com>

otaylor has set the watchcommits acl on clutter (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:57 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224857.A960510F890@bastion2.fedora.phx.redhat.com>

otaylor has set the commit acl on clutter (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:48:59 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224859.8498E10F89C@bastion2.fedora.phx.redhat.com>

otaylor has set the approveacls acl on clutter (Fedora 10) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:49:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:49:02 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224902.A4DC710F88B@bastion2.fedora.phx.redhat.com>

otaylor has set the approveacls acl on clutter (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:49:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:49:05 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224905.4CD1F10F884@bastion2.fedora.phx.redhat.com>

otaylor has set the commit acl on clutter (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:49:09 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224909.D289910F8AA@bastion2.fedora.phx.redhat.com>

otaylor has set the watchbugzilla acl on clutter (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From pkgdb at fedoraproject.org  Fri Aug 28 22:49:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 28 Aug 2009 22:49:06 +0000
Subject: [pkgdb] clutter had acl change status
Message-ID: <20090828224906.C053810F8A6@bastion2.fedora.phx.redhat.com>

otaylor has set the watchcommits acl on clutter (Fedora 11) to Approved for itamarjp

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/clutter



From dcantrel at fedoraproject.org  Fri Aug 28 22:52:02 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 28 Aug 2009 22:52:02 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.660, 1.661 anaconda.spec, 1.810, 
	1.811 sources, 1.794, 1.795
Message-ID: <20090828225202.9080811C0078@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30230

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Aug 28 2009 David Cantrell <dcantrell at redhat.com> - 12.18-1
- Append s390x packages to PACKAGES list, exclude /sbin/qetharp-2.4
  (dcantrell)
- On kickstart installs, you can't select a different parttype
  (#519137, #520058). (clumens)
- Don't try to create a primary partition if all slots are taken. (#519784)
  (dlehman)
- Fix handling of locked preexisting LUKS devices. (#502310) (dlehman)
- Fix up handling of preexisting partitions. (dlehman)
- Pick up mountpoint set for protected partitions. (#498591) (dlehman)
- Ignore partitions belonging to disks we've reinitialized. (dlehman)
- Handle newly initialized disklabels whether via ks or prompt. (#519235)
  (dlehman)
- Fix some indentation in the disklabel initialization block. (dlehman)
- Use commitToDisk() instead of commit() when only changing flags (hdegoede)
- Update PartitionDevice's partedPartition when the PartedDisks get reset
  (hdegoede)
- Add --localscripts option to buildinstall. (dcantrell)
- Add missing dependencies for linuxrc.s390 and lsznet in mk-images
  (dcantrell)
- Re-enable login of root user in initrd.img (dcantrell)
- Less log clutter with fixing ld64.so.1 symlink in instbin on s390x
  (dcantrell)
- Fix typo in get_dso_deps() for searching /lib on s390x (dcantrell)
- Add hfsplus and netconsole kernel modules (#519756, #519785). (clumens)
- Adapt expandLangs to work with three character base lang names (#517770).
  (clumens)
- Prevent resizes that would go past the end of the disk (#495520)
  (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -p -r1.660 -r1.661
--- .cvsignore	26 Aug 2009 18:37:38 -0000	1.660
+++ .cvsignore	28 Aug 2009 22:52:02 -0000	1.661
@@ -1,2 +1 @@
-anaconda-12.16.tar.bz2
-anaconda-12.17.tar.bz2
+anaconda-12.18.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -p -r1.810 -r1.811
--- anaconda.spec	26 Aug 2009 18:37:38 -0000	1.810
+++ anaconda.spec	28 Aug 2009 22:52:02 -0000	1.811
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.17
+Version: 12.18
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -210,6 +210,36 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Aug 28 2009 David Cantrell <dcantrell at redhat.com> - 12.18-1
+- Append s390x packages to PACKAGES list, exclude /sbin/qetharp-2.4
+  (dcantrell)
+- On kickstart installs, you can't select a different parttype
+  (#519137, #520058). (clumens)
+- Don't try to create a primary partition if all slots are taken. (#519784)
+  (dlehman)
+- Fix handling of locked preexisting LUKS devices. (#502310) (dlehman)
+- Fix up handling of preexisting partitions. (dlehman)
+- Pick up mountpoint set for protected partitions. (#498591) (dlehman)
+- Ignore partitions belonging to disks we've reinitialized. (dlehman)
+- Handle newly initialized disklabels whether via ks or prompt. (#519235)
+  (dlehman)
+- Fix some indentation in the disklabel initialization block. (dlehman)
+- Use commitToDisk() instead of commit() when only changing flags (hdegoede)
+- Update PartitionDevice's partedPartition when the PartedDisks get reset
+  (hdegoede)
+- Add --localscripts option to buildinstall. (dcantrell)
+- Add missing dependencies for linuxrc.s390 and lsznet in mk-images
+  (dcantrell)
+- Re-enable login of root user in initrd.img (dcantrell)
+- Less log clutter with fixing ld64.so.1 symlink in instbin on s390x
+  (dcantrell)
+- Fix typo in get_dso_deps() for searching /lib on s390x (dcantrell)
+- Add hfsplus and netconsole kernel modules (#519756, #519785). (clumens)
+- Adapt expandLangs to work with three character base lang names (#517770).
+  (clumens)
+- Prevent resizes that would go past the end of the disk (#495520)
+  (dcantrell)
+
 * Wed Aug 26 2009 Chris Lumens <clumens at redhat.com> - 12.17-1
 - dracut has initrd-generic-<version> instead of initrd-<version> (#519185)
   (hdegoede)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -p -r1.794 -r1.795
--- sources	26 Aug 2009 18:37:38 -0000	1.794
+++ sources	28 Aug 2009 22:52:02 -0000	1.795
@@ -1 +1 @@
-8e71f9e87f50e06386bddcefe3348bec  anaconda-12.17.tar.bz2
+5ddfff960c4c935436d3f319d6a6c85b  anaconda-12.18.tar.bz2



From otaylor at fedoraproject.org  Fri Aug 28 23:39:15 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Fri, 28 Aug 2009 23:39:15 +0000 (UTC)
Subject: rpms/mutter/devel .cvsignore, 1.3, 1.4 mutter.spec, 1.6, 1.7 sources,
	1.3, 1.4 mutter-metawindow.patch, 1.1, NONE
Message-ID: <20090828233915.1C29B11C0078@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv629

Modified Files:
	.cvsignore mutter.spec sources 
Removed Files:
	mutter-metawindow.patch 
Log Message:
* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
- Update to 2.27.3, remove mutter-metawindow.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Aug 2009 16:28:22 -0000	1.3
+++ .cvsignore	28 Aug 2009 23:39:15 -0000	1.4
@@ -1 +1,3 @@
+mutter-2.27.1.tar.bz2
 mutter-2.27.2.tar.bz2
+mutter-2.27.3.tar.bz2


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mutter.spec	21 Aug 2009 19:50:25 -0000	1.6
+++ mutter.spec	28 Aug 2009 23:39:15 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           mutter
-Version:        2.27.2
-Release:        2%{?dist}
+Version:        2.27.3
+Release:        1%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://git.gnome.org/cgit/mutter
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
-Patch0:		mutter-metawindow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
@@ -31,13 +30,6 @@ BuildRequires: intltool
 BuildRequires: gnome-doc-utils
 BuildRequires: desktop-file-utils
 
-# Add these due to the autoreconf for the clutter patches
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
-
 Requires: control-center-filesystem
 Requires: startup-notification
 Requires: GConf2
@@ -69,10 +61,8 @@ utilities for testing Metacity/Mutter th
 
 %prep
 %setup -q
-%patch0 -p1 -b .metawindows
 
 %build
-autoreconf
 %configure --with-clutter --disable-static
 
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSION"
@@ -157,6 +147,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
+- Update to 2.27.3, remove mutter-metawindow.patch
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 2.27.2-2
 - Add upstream patch needed by latest mutter-moblin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Aug 2009 16:28:22 -0000	1.3
+++ sources	28 Aug 2009 23:39:15 -0000	1.4
@@ -1 +1,3 @@
+973f59241bb1554bc046bd0ac4aea564  mutter-2.27.1.tar.bz2
 9b7e9ffcb14e90c9f31c973383a1a432  mutter-2.27.2.tar.bz2
+59c977f67ba9e507229d4b0088136ebb  mutter-2.27.3.tar.bz2


--- mutter-metawindow.patch DELETED ---



From mathstuf at fedoraproject.org  Fri Aug 28 23:58:24 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Fri, 28 Aug 2009 23:58:24 +0000 (UTC)
Subject: rpms/git-cola/devel .cvsignore, 1.6, 1.7 git-cola.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090828235824.18B1A11C0078@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/git-cola/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16374

Modified Files:
	.cvsignore git-cola.spec sources 
Log Message:
Update to 1.3.9.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 Jun 2009 19:54:28 -0000	1.6
+++ .cvsignore	28 Aug 2009 23:58:23 -0000	1.7
@@ -1 +1 @@
-cola-1.3.8-src.tar.gz
+cola-1.3.9.14-src.tar.gz


Index: git-cola.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/git-cola.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- git-cola.spec	30 Jul 2009 00:02:47 -0000	1.9
+++ git-cola.spec	28 Aug 2009 23:58:23 -0000	1.10
@@ -1,10 +1,9 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           git-cola
-Version:        1.3.8
-Release:        3%{?dist}
+Version:        1.3.9.14
+Release:        1%{?dist}
 Summary:        A highly caffeinated git gui
 
 Group:          Development/Tools
@@ -73,11 +72,13 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/git-cola
 %{_docdir}/git-cola
 %{_mandir}/man1/git-cola.1.gz
-# For noarch packages: sitelib
 %{python_sitelib}/*
 
 
 %changelog
+* Fri Aug 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.9.14-1
+- Update to 1.3.9.14
+
 * Wed Jul 29 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.8-3
 - Try build again for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 Jun 2009 19:54:28 -0000	1.6
+++ sources	28 Aug 2009 23:58:23 -0000	1.7
@@ -1 +1 @@
-a3f4617049d2c32c31e2918f0264dbb8  cola-1.3.8-src.tar.gz
+8f94cd347e97a0c8315a98f0d23e2192  cola-1.3.9.14-src.tar.gz



From otaylor at fedoraproject.org  Sat Aug 29 00:01:37 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 00:01:37 +0000 (UTC)
Subject: rpms/mutter/devel mutter.spec,1.7,1.8
Message-ID: <20090829000137.A153411C0078@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17113

Modified Files:
	mutter.spec 
Log Message:
Add a workaround for Red Hat bug #520209


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mutter.spec	28 Aug 2009 23:39:15 -0000	1.7
+++ mutter.spec	29 Aug 2009 00:01:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mutter
 Version:        2.27.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
@@ -9,6 +9,9 @@ URL:            http://git.gnome.org/cgi
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Workaround for glibc bug https://bugzilla.redhat.com/show_bug.cgi?id=520209
+Patch0: mutter-math-workaround.patch
+
 BuildRequires: clutter-devel
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -61,6 +64,7 @@ utilities for testing Metacity/Mutter th
 
 %prep
 %setup -q
+%patch0 -p1 -b .math-workaround
 
 %build
 %configure --with-clutter --disable-static
@@ -147,6 +151,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-2
+- Add a workaround for Red Hat bug #520209
+
 * Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
 - Update to 2.27.3, remove mutter-metawindow.patch
 



From otaylor at fedoraproject.org  Sat Aug 29 00:01:48 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 00:01:48 +0000 (UTC)
Subject: rpms/mutter/devel mutter-math-workaround.patch,NONE,1.1
Message-ID: <20090829000148.C9F2911C0078@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17184

Added Files:
	mutter-math-workaround.patch 
Log Message:
Add a workaround for Red Hat bug #520209

mutter-math-workaround.patch:
 compositor/mutter-window-group.c |    4 ++--
 compositor/mutter-window.c       |   10 +++++-----
 compositor/shadow.c              |    2 +-
 tools/mutter-mag.c               |    3 +--
 ui/preview-widget.c              |    3 ---
 5 files changed, 9 insertions(+), 13 deletions(-)

--- NEW FILE mutter-math-workaround.patch ---
Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=520209

diff --git a/src/compositor/mutter-window-group.c b/src/compositor/mutter-window-group.c
index e89327e..fdb75a2 100644
--- a/src/compositor/mutter-window-group.c
+++ b/src/compositor/mutter-window-group.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#define _ISOC99_SOURCE /* for roundf */
+#define _BSD_SOURCE /* for rintf */
 #include <math.h>
 
 #include "mutter-window-private.h"
@@ -27,7 +27,7 @@ G_DEFINE_TYPE (MutterWindowGroup, mutter_window_group, CLUTTER_TYPE_GROUP);
 static inline int
 round_to_fixed (float x)
 {
-  return roundf (x * 256);
+  return rintf (x * 256);
 }
 
 /* We can only (easily) apply our logic for figuring out what a window
diff --git a/src/compositor/mutter-window.c b/src/compositor/mutter-window.c
index 83080f8..e07be3d 100644
--- a/src/compositor/mutter-window.c
+++ b/src/compositor/mutter-window.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#define _ISOC99_SOURCE /* for roundf */
+#define _BSD_SOURCE /* for rintf */
 #include <math.h>
 
 #include <X11/extensions/shape.h>
@@ -1420,10 +1420,10 @@ mutter_window_set_visible_region_beneath (MutterWindow *self,
        */
       clutter_actor_get_allocation_box (priv->shadow, &box);
 
-      shadow_rect.x = roundf (box.x1);
-      shadow_rect.y = roundf (box.y1);
-      shadow_rect.width = roundf (box.x2 - box.x1);
-      shadow_rect.height = roundf (box.y2 - box.y1);
+      shadow_rect.x = rintf (box.x1);
+      shadow_rect.y = rintf (box.y1);
+      shadow_rect.width = rintf (box.x2 - box.x1);
+      shadow_rect.height = rintf (box.y2 - box.y1);
 
       overlap = gdk_region_rect_in (beneath_region, &shadow_rect);
 
diff --git a/src/compositor/shadow.c b/src/compositor/shadow.c
index b204440..67fa538 100644
--- a/src/compositor/shadow.c
+++ b/src/compositor/shadow.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#define _GNU_SOURCE /* For M_PI */
+#define _BSD_SOURCE /* For M_PI */
 
 #include <math.h>
 
diff --git a/src/tools/mutter-mag.c b/src/tools/mutter-mag.c
index 7c5cb3e..09e2a43 100644
--- a/src/tools/mutter-mag.c
+++ b/src/tools/mutter-mag.c
@@ -19,8 +19,7 @@
  * 02111-1307, USA.
  */
 
-#define _GNU_SOURCE
-#define _XOPEN_SOURCE 600 /* C99 -- for rint() */
+#define _BSD_SOURCE /* for rint() */
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 32fbc70..adfa922 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -21,9 +21,6 @@
  * 02111-1307, USA.
  */
 
-#define _GNU_SOURCE
-#define _XOPEN_SOURCE 600 /* for the maths routines over floats */
-
 #include <math.h>
 #include <gtk/gtk.h>
 #include "preview-widget.h"



From otaylor at fedoraproject.org  Sat Aug 29 00:30:24 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 00:30:24 +0000 (UTC)
Subject: rpms/gnome-shell/devel .cvsignore, 1.2, 1.3 gnome-shell.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090829003024.B776B11C0082@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23119

Modified Files:
	.cvsignore gnome-shell.spec sources 
Log Message:
* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-1
- Update to 2.27.1
- Update Requires, add desktop-effects



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2009 00:07:56 -0000	1.2
+++ .cvsignore	29 Aug 2009 00:30:24 -0000	1.3
@@ -1 +1,2 @@
 gnome-shell-2.27.0.tar.bz2
+gnome-shell-2.27.1.tar.bz2


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-shell.spec	13 Aug 2009 00:07:56 -0000	1.1
+++ gnome-shell.spec	29 Aug 2009 00:30:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        2.27.0
-Release:        4
+Version:        2.27.1
+Release:        1
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -10,7 +10,7 @@ Source0:        http://ftp.gnome.org/pub
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %define clutter_version 1.0.0
-%define mutter_version 2.27.2
+%define mutter_version 2.27.3
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel
@@ -28,10 +28,14 @@ BuildRequires:  libgnomeui-devel
 BuildRequires:  librsvg2-devel
 BuildRequires:  mutter-devel >= %{mutter_version}
 
-# wrapper script uses to see if gnome-panel is running
-Requires:       dbus-python
+# User interface to switch to GNOME Shell
+Requires:       desktop-effects
 # For %pre/%post usage of gconftool-2
 Requires:       GConf2
+# wrapper script uses to restart old GNOME session if run --replace
+# from the command line
+Requires:       gnome-python2-gconf
+Requires:       pygobject2
 # wrapper script uses to figure out available GLX capabilities
 Requires:       glx-utils
 # needed for loading SVG's via gdk-pixbuf
@@ -109,6 +113,10 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-1
+- Update to 2.27.1
+- Update Requires, add desktop-effects
+
 * Wed Aug 12 2009 Owen Taylor <otaylor at redhat.com> - 2.27.0-4
 - Add an explicit dependency on GConf2 for pre/post
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 00:07:57 -0000	1.2
+++ sources	29 Aug 2009 00:30:24 -0000	1.3
@@ -1 +1 @@
-372771ace3aeb34b0a689f917bb68f10  gnome-shell-2.27.0.tar.bz2
+545c430995be8cd3c7b997f244135135  gnome-shell-2.27.1.tar.bz2



From bpepple at fedoraproject.org  Sat Aug 29 00:38:23 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 29 Aug 2009 00:38:23 +0000 (UTC)
Subject: rpms/telepathy-mission-control/devel telepathy-mission-control.spec,
	1.20, 1.21
Message-ID: <20090829003823.9B9A111C0078@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-mission-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27891

Modified Files:
	telepathy-mission-control.spec 
Log Message:
* Fri Aug 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.1-2
- Let's not pull have the main package depend on the devel sub.



Index: telepathy-mission-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- telepathy-mission-control.spec	26 Aug 2009 14:51:31 -0000	1.20
+++ telepathy-mission-control.spec	29 Aug 2009 00:38:23 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           telepathy-mission-control
 Version:        5.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Central control for Telepathy connection manager
 
 Group:          System Environment/Libraries
@@ -68,19 +68,22 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/mission-control
 %dir %{_datadir}/mission-control/profiles
 %{_datadir}/dbus-1/services/*.service
+%{_libdir}/*.so
 %{_libexecdir}/mission-control-5
 %{_mandir}/man*/*.gz
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %doc %{_datadir}/gtk-doc/html/libmcclient
 %doc %{_datadir}/gtk-doc/html/libmissioncontrol-server
 
 
 %changelog
+* Fri Aug 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.1-2
+- Let's not pull have the main package depend on the devel sub.
+
 * Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 5.2.1-1
 - Update to 5.2.1.
 



From otaylor at fedoraproject.org  Sat Aug 29 01:33:11 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 01:33:11 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.2,1.3
Message-ID: <20090829013311.BAD8711C0078@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5369

Modified Files:
	gnome-shell.spec 
Log Message:
* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-2
- BuildRequire intltool
- Add find_lang



Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-shell.spec	29 Aug 2009 00:30:24 -0000	1.2
+++ gnome-shell.spec	29 Aug 2009 01:33:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.27.1
-Release:        1
+Release:        2
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -22,6 +22,7 @@ BuildRequires:  gnome-menus-devel
 # for screencast recorder functionality
 BuildRequires:  gstreamer-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  intltool
 # temporary until GnomeThumbnailFactory => GnomeDesktopThumbnailFactory
 BuildRequires:  libgnomeui-devel
 # used in unused BigThemeImage
@@ -77,10 +78,12 @@ rm -rf %{buildroot}/%{_libdir}/mutter/pl
 
 desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-shell.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/gnome-shell
@@ -113,6 +116,10 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-2
+- BuildRequire intltool
+- Add find_lang
+
 * Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-1
 - Update to 2.27.1
 - Update Requires, add desktop-effects



From otaylor at fedoraproject.org  Sat Aug 29 01:53:14 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 01:53:14 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.3,1.4
Message-ID: <20090829015314.CDDFF11C0078@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9208

Modified Files:
	gnome-shell.spec 
Log Message:
* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-3
- Replace libgnomeui with gnome-desktop in BuildRequires



Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-shell.spec	29 Aug 2009 01:33:11 -0000	1.3
+++ gnome-shell.spec	29 Aug 2009 01:53:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.27.1
-Release:        2
+Release:        3
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -18,13 +18,12 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gir-repository-devel
 BuildRequires:  gjs-devel
 BuildRequires:  glib2-devel
+BuildRequires:  gnome-desktop-devel
 BuildRequires:  gnome-menus-devel
 # for screencast recorder functionality
 BuildRequires:  gstreamer-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
-# temporary until GnomeThumbnailFactory => GnomeDesktopThumbnailFactory
-BuildRequires:  libgnomeui-devel
 # used in unused BigThemeImage
 BuildRequires:  librsvg2-devel
 BuildRequires:  mutter-devel >= %{mutter_version}
@@ -116,6 +115,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-3
+- Replace libgnomeui with gnome-desktop in BuildRequires
+
 * Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-2
 - BuildRequire intltool
 - Add find_lang



From mclasen at fedoraproject.org  Sat Aug 29 02:04:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 02:04:08 +0000 (UTC)
Subject: rpms/glib2/F-11 .cvsignore, 1.109, 1.110 glib2.spec, 1.207,
	1.208 sources, 1.112, 1.113
Message-ID: <20090829020408.3D55911C0078@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10869

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.20.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-11/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- .cvsignore	1 Jun 2009 15:59:38 -0000	1.109
+++ .cvsignore	29 Aug 2009 02:04:07 -0000	1.110
@@ -1 +1 @@
-glib-2.20.3.tar.bz2
+glib-2.20.5.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-11/glib2.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- glib2.spec	27 Jun 2009 06:06:00 -0000	1.207
+++ glib2.spec	29 Aug 2009 02:04:07 -0000	1.208
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.20.4
+Version: 2.20.5
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Aug 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.20.5-1
+- Update to 2.20.5
+
 * Sat Jun 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.20.4-1
 - Update to 2.20.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-11/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	27 Jun 2009 06:06:00 -0000	1.112
+++ sources	29 Aug 2009 02:04:08 -0000	1.113
@@ -1 +1 @@
-346916673c0eab72191cf44b4afe535f  glib-2.20.4.tar.bz2
+4c178b91d82ef80a2da3c26b772569c0  glib-2.20.5.tar.bz2



From salimma at fedoraproject.org  Sat Aug 29 02:11:50 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 29 Aug 2009 02:11:50 +0000 (UTC)
Subject: rpms/python-storm/F-11 python-storm.spec,1.9,1.10
Message-ID: <20090829021150.9366B11C0078@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12332/F-11

Modified Files:
	python-storm.spec 
Log Message:
* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-2
- Reenable tests on Fedora >= 11 (disabling Django tests for now)



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/F-11/python-storm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-storm.spec	28 Aug 2009 16:44:32 -0000	1.9
+++ python-storm.spec	29 Aug 2009 02:11:50 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           python-storm
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -76,13 +76,11 @@ cp -p %{SOURCE1} .
 %{__python} setup.py build
 
 
-# temporarily disable the test suite to fix broken deps in rawhide
-# should re-enable ASAP, see:
-# https://bugzilla.redhat.com/show_bug.cgi?id=477591
 %check
-%if 0%{?fedora} < 11
+# Disable Django tests for now
+mkdir off-tests
+mv tests/django off-tests/
 ./test
-%endif
 
 
 %install
@@ -122,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-2
+- Reenable tests on Fedora >= 11 (disabling Django tests for now)
+
 * Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
 - Update to 0.15
 - Deprecate %{name}-sqlite, now part of main package



From salimma at fedoraproject.org  Sat Aug 29 02:11:50 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 29 Aug 2009 02:11:50 +0000 (UTC)
Subject: rpms/python-storm/devel python-storm.spec,1.10,1.11
Message-ID: <20090829021150.A5DD511C0081@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-storm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12332/devel

Modified Files:
	python-storm.spec 
Log Message:
* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-2
- Reenable tests on Fedora >= 11 (disabling Django tests for now)



Index: python-storm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-storm/devel/python-storm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-storm.spec	28 Aug 2009 16:44:32 -0000	1.10
+++ python-storm.spec	29 Aug 2009 02:11:50 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           python-storm
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -76,13 +76,11 @@ cp -p %{SOURCE1} .
 %{__python} setup.py build
 
 
-# temporarily disable the test suite to fix broken deps in rawhide
-# should re-enable ASAP, see:
-# https://bugzilla.redhat.com/show_bug.cgi?id=477591
 %check
-%if 0%{?fedora} < 11
+# Disable Django tests for now
+mkdir off-tests
+mv tests/django off-tests/
 ./test
-%endif
 
 
 %install
@@ -122,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-2
+- Reenable tests on Fedora >= 11 (disabling Django tests for now)
+
 * Fri Aug 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.15-1
 - Update to 0.15
 - Deprecate %{name}-sqlite, now part of main package



From cweyl at fedoraproject.org  Sat Aug 29 02:11:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 29 Aug 2009 02:11:52 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel perl-Net-CUPS.spec,1.15,1.16
Message-ID: <20090829021152.7AF8611C0078@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12361

Modified Files:
	perl-Net-CUPS.spec 
Log Message:
release bump


Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Net-CUPS.spec	24 Aug 2009 02:11:15 -0000	1.15
+++ perl-Net-CUPS.spec	29 Aug 2009 02:11:52 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Net-CUPS
 Version:        0.61
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-3
+- bump
+
 * Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
 - add filtering to remove private so metadata
 



From rstrode at fedoraproject.org  Sat Aug 29 02:46:38 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Sat, 29 Aug 2009 02:46:38 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth-generate-initrd, NONE,
	1.1 plymouth.spec, 1.139, 1.140
Message-ID: <20090829024638.99B0211C0078@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19376

Modified Files:
	plymouth.spec 
Added Files:
	plymouth-generate-initrd 
Log Message:
- Create plymouth supplementary initrd in post (bug 515589)



--- NEW FILE plymouth-generate-initrd ---
#!/bin/bash

[ -z "$DESTDIR" ] || exit 0

[ -z "$PLYMOUTH_LIBEXECDIR" ] && PLYMOUTH_LIBEXECDIR="/usr/libexec"
[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="/usr/share"
[ -z "$PLYMOUTH_POPULATE_INITRD" ] && PLYMOUTH_POPULATE_INITRD="$PLYMOUTH_LIBEXECDIR/plymouth/plymouth-populate-initrd"
[ -z "$PLYMOUTH_DESTDIR" ] && PLYMOUTH_DESTDIR="/boot"
[ -z "$PLYMOUTH_IMAGE_FILE" ] && PLYMOUTH_IMAGE_FILE="$PLYMOUTH_DESTDIR/initrd-plymouth.img"

PLYMOUTH_INITRD_DIR="$(mktemp --tmpdir -d plymouth-XXXXXXX)"

$PLYMOUTH_POPULATE_INITRD -t "$PLYMOUTH_INITRD_DIR"

if [ $? -eq 0 ]; then
    (cd $PLYMOUTH_INITRD_DIR;
        # FIXME: might make sense to add a flag to plymouth-populate-initrd to
        #        skip these from the start
        rm -f lib*/{ld*,libc*,libdl*,libm*,libz*,libpthread*}
        find | cpio -Hnewc -o | gzip -9 > $PLYMOUTH_IMAGE_FILE
    )
fi

rm -rf $PLYMOUTH_INITRD_DIR


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- plymouth.spec	25 Aug 2009 18:57:05 -0000	1.139
+++ plymouth.spec	29 Aug 2009 02:46:38 -0000	1.140
@@ -1,17 +1,19 @@
 %define plymouthdaemon_execdir /sbin
 %define plymouthclient_execdir /bin
 %define plymouth_libdir /%{_lib}
+%define plymouth_initrd_file /boot/initrd-plymouth.img
 
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 Source1: boot-duration
 Source2: charge.plymouth
 Source3: plymouth-set-default-plugin
+Source4: plymouth-generate-initrd
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -278,15 +280,24 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/plymou
 cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
 chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
 
+# Copied from git until the next release or snapshot
+cp $RPM_SOURCE_DIR/plymouth-generate-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth
+chmod +x $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-generate-initrd
+
+mkdir -p $RPM_BUILD_ROOT$(dirname %{plymouth_initrd_file})
+touch $RPM_BUILD_ROOT%{plymouth_initrd_file}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
+%{_libexecdir}/plymouth/plymouth-generate-initrd
 
 %postun
 if [ $1 -eq 0 ]; then
     rm -f %{_libdir}/plymouth/default.so
+    rm -f /boot/initrd-plymouth.img
 fi
 
 %post libs -p /sbin/ldconfig
@@ -297,6 +308,7 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then
         %{_sbindir}/plymouth-set-default-theme text
+        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -305,6 +317,7 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
+        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -313,6 +326,7 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
+        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -323,6 +337,7 @@ if [ $1 -eq 1 ]; then
 else
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
         %{_sbindir}/plymouth-set-default-theme charge
+        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -331,6 +346,7 @@ export LIB=%{_lib}
 if [ $1 -eq 0 ]; then
     if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then
         %{_sbindir}/plymouth-set-default-theme --reset
+        %{_libexecdir}/plymouth/plymouth-generate-initrd
     fi
 fi
 
@@ -353,6 +369,7 @@ fi
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
+%ghost %{plymouth_initrd_file}
 
 %files devel
 %defattr(-, root, root)
@@ -373,6 +390,7 @@ fi
 %{_sbindir}/plymouth-set-default-plugin
 %{_libexecdir}/plymouth/plymouth-update-initrd
 %{_libexecdir}/plymouth/plymouth-populate-initrd
+%{_libexecdir}/plymouth/plymouth-generate-initrd
 
 %files utils
 %defattr(-, root, root)
@@ -447,6 +465,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Aug 28 2009 Ray Strode <rstrode at redhat.com> 0.7.1-3
+- Create plymouth supplementary initrd in post (bug 515589)
+
 * Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> 0.7.1-2
 - Get plugin path from plymouth instead of trying
   to guess.  Should fix bug 502667



From phuang at fedoraproject.org  Sat Aug 29 03:13:06 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 29 Aug 2009 03:13:06 +0000 (UTC)
Subject: rpms/ibus/F-11 .cvsignore, 1.35, 1.36 ibus-HEAD.patch, 1.20,
	1.21 ibus.spec, 1.82, 1.83 sources, 1.39, 1.40
Message-ID: <20090829031306.1A9EF11C0078@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23695

Modified Files:
	.cvsignore ibus-HEAD.patch ibus.spec sources 
Log Message:
Update to 1.1.0.20090829


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	12 Jun 2009 06:02:53 -0000	1.35
+++ .cvsignore	29 Aug 2009 03:13:05 -0000	1.36
@@ -1 +1 @@
-ibus-1.1.0.20090612.tar.gz
+ibus-1.1.0.20090829.tar.gz

ibus-HEAD.patch:
 0 files changed

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus-HEAD.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-HEAD.patch	10 Aug 2009 07:37:11 -0000	1.20
+++ ibus-HEAD.patch	29 Aug 2009 03:13:05 -0000	1.21
@@ -1,446 +1 @@
-diff --git a/AUTHORS b/AUTHORS
-index 24ed851..23dca12 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -45,6 +45,8 @@ te.po
- krishna k <k.meetme at gmail.com>
- ta.po:
- Felix <ifelix at redhat.com>
-+vi.po:
-+L? Qu?c Tu?n <mr.lequoctuan at gmail.com>
- zh_CN.po:
- Huang Peng <shawn.p.huang at gmail.com>
- zh_HK.po:
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 0881581..bec08c3 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -1151,28 +1151,29 @@ bus_input_context_focus_in (BusInputContext *context)
- 
-     if (priv->capabilities & IBUS_CAP_FOCUS) {
-         g_signal_emit (context, context_signals[FOCUS_IN], 0);
--
--        if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_PREEDIT_TEXT],
--                           0,
--                           priv->preedit_text,
--                           priv->preedit_cursor_pos,
--                           priv->preedit_visible);
--        }
--        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_AUXILIARY_TEXT],
--                           0,
--                           priv->auxiliary_text,
--                           priv->auxiliary_visible);
--        }
--        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_LOOKUP_TABLE],
--                           0,
--                           priv->lookup_table,
--                           priv->lookup_table_visible);
-+        if (priv->engine && priv->enabled) {
-+            if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_PREEDIT_TEXT],
-+                               0,
-+                               priv->preedit_text,
-+                               priv->preedit_cursor_pos,
-+                               priv->preedit_visible);
-+            }
-+            if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_AUXILIARY_TEXT],
-+                               0,
-+                               priv->auxiliary_text,
-+                               priv->auxiliary_visible);
-+            }
-+            if (priv->lookup_table_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_LOOKUP_TABLE],
-+                               0,
-+                               priv->lookup_table,
-+                               priv->lookup_table_visible);
-+            }
-         }
-     }
- }
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 9c1cecd..5385cb8 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -20,6 +20,7 @@ sr
- sr at latin
- ta
- te
-+vi
- zh_CN
- zh_HK
- zh_TW
-diff --git a/po/da.po b/po/da.po
-index 94ac003..8b52b8b 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -8,7 +8,7 @@ msgstr ""
- "Project-Id-Version: ibus\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-05-26 07:38+0800\n"
--"PO-Revision-Date: 2009-04-06 21:47+0200\n"
-+"PO-Revision-Date: 2009-06-11 17:58+0200\n"
- "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
- "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
- "MIME-Version: 1.0\n"
-@@ -153,6 +153,8 @@ msgid ""
- "<small><i>The default input method is the top one in the list.\n"
- "You may use up/down buttons to change it.</i></small>"
- msgstr ""
-+"<small><i>Standard inputmetoden er den ?verste i listen.\n"
-+"Du kan bruge op/ned-knapperne for at ?ndre det.</i></small>"
- 
- #: ../setup/setup.glade.h:14
- msgid "About"
-diff --git a/po/vi.po b/po/vi.po
-new file mode 100644
-index 0000000..8ecef98
---- /dev/null
-+++ b/po/vi.po
-@@ -0,0 +1,288 @@
-+# Vietnamese translations for data package.
-+# Copyright (C) 2009 THE data'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the data package.
-+# Le Quoc Tuan <mr.lequoctuan at gmail.com>, 2009.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: data 1\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
-+"PO-Revision-Date: 2009-06-12 12:41+0700\n"
-+"Last-Translator: Le Quoc Tuan <mr.lequoctuan at gmail.com>\n"
-+"Language-Team: Vietnamese\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"
-+
-+#: ../bus/ibus.desktop.in.h:1
-+msgid "IBus"
-+msgstr "IBus"
-+
-+#: ../bus/ibus.desktop.in.h:2
-+#: ../ui/gtk/panel.py:97
-+msgid "IBus input method framework"
-+msgstr "B? g? IBus"
-+
-+#: ../ibus/lang.py:40
-+#: ../ui/gtk/panel.py:307
-+#: ../ui/gtk/panel.py:308
-+#: ../ui/gtk/panel.py:309
-+#: ../ui/gtk/panel.py:310
-+msgid "Other"
-+msgstr "Kh?c"
-+
-+#: ../ui/gtk/panel.py:282
-+msgid "Restart"
-+msgstr "Kh?i ??ng l?i"
-+
-+#: ../ui/gtk/panel.py:337
-+msgid "No input method"
-+msgstr "Kh?ng c? b? g?"
-+
-+#: ../ui/gtk/panel.py:383
-+msgid "IBus is an intelligent input bus for Linux/Unix."
-+msgstr "IBus l? m?t b? g? th?ng minh cho Linux/Unix."
-+
-+#: ../ui/gtk/panel.py:387
-+msgid "translator-credits"
-+msgstr "L? Qu?c Tu?n <mr.lequoctuan at gmail.com>"
-+
-+#. create input methods menu
-+#: ../ui/gtk/languagebar.py:84
-+msgid "Switch input method"
-+msgstr "Chuy?n b? g?"
-+
-+#: ../setup/main.py:104
-+msgid "trigger"
-+msgstr "B?t/t?t"
-+
-+#: ../setup/main.py:114
-+msgid "next input method"
-+msgstr "B? g? k? ti?p"
-+
-+#: ../setup/main.py:124
-+msgid "previous input method"
-+msgstr "B? g? tr??c"
-+
-+#: ../setup/main.py:205
-+msgid "IBus daemon is not started. Do you want to start it now?"
-+msgstr "IBus daemon ch?a ???c kh?i ??ng. B?n c? mu?n kh?i ??ng n? ngay b?y gi??"
-+
-+#: ../setup/main.py:220
-+msgid ""
-+"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-+"  export GTK_IM_MODULE=ibus\n"
-+"  export XMODIFIERS=@im=ibus\n"
-+"  export QT_IM_MODULE=ibus"
-+msgstr ""
-+"IBus v?a ???c kh?i ??ng! N?u b?n kh?ng th? d?ng IBus, vui l?ng th?m nh?ng d?ng b?n d??i v?o $HOME/.bashrc, v? ??ng nh?p l?i.\n"
-+"  export GTK_IM_MODULE=ibus\n"
-+"  export XMODIFIERS=@im=ibus\n"
-+"  export QT_IM_MODULE=ibus"
-+
-+#: ../setup/main.py:235
-+#, python-format
-+msgid "Select keyboard shortcut for %s"
-+msgstr "Ch?n ph?m t?t cho %s"
-+
-+#: ../setup/keyboardshortcut.py:54
-+msgid "Keyboard shortcuts"
-+msgstr "Nh?ng ph?m t?t"
-+
-+#: ../setup/keyboardshortcut.py:65
-+msgid "Key code:"
-+msgstr "M? ph?m:"
-+
-+#: ../setup/keyboardshortcut.py:80
-+msgid "Modifiers:"
-+msgstr "Ph?m b? sung:"
-+
-+#: ../setup/keyboardshortcut.py:222
-+msgid ""
-+"Please press a key (or a key combination).\n"
-+"The dialog will be closed when the key is released."
-+msgstr ""
-+"Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m).\n"
-+"H?p tho?i n?y s? ???c ??ng l?i khi b?n th? ph?m ?n."
-+
-+#: ../setup/keyboardshortcut.py:224
-+msgid "Please press a key (or a key combination)"
-+msgstr "Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m)"
-+
-+#: ../setup/enginecombobox.py:99
-+msgid "Select an input method"
-+msgstr "Ch?n m?t b? g?"
-+
-+#: ../setup/setup.glade.h:1
-+msgid "..."
-+msgstr "..."
-+
-+#: ../setup/setup.glade.h:2
-+msgid "<b>Font and Style</b>"
-+msgstr "<b>Ph?ng v? ki?u</b>"
-+
-+#: ../setup/setup.glade.h:3
-+msgid "<b>Keyboard Shortcuts</b>"
-+msgstr "<b>Ph?m t?t</b>"
-+
-+#: ../setup/setup.glade.h:4
-+msgid "<b>Startup</b>"
-+msgstr "<b>Kh?i ??ng</b>"
-+
-+#: ../setup/setup.glade.h:5
-+msgid ""
-+"<big><b>IBus</b></big>\n"
-+"<small>The intelligent input bus</small>\n"
-+"Homepage: http://code.google.com/p/ibus\n"
-+"\n"
-+"\n"
-+"\n"
-+msgstr ""
-+"<big><b>IBus</b></big>\n"
-+"<small>B? g? th?ng minh</small>\n"
-+"Trang ch?: http://code.google.com/p/ibus\n"
-+"\n"
-+"\n"
-+"\n"
-+
-+#: ../setup/setup.glade.h:12
-+msgid ""
-+"<small><i>The default input method is the top one in the list.\n"
-+"You may use up/down buttons to change it.</i></small>"
-+msgstr ""
-+"<small><i>B? g? m?c ??nh l? b? g? ??u ti?n trong danh s?ch.\n"
-+"B?n c? th? d?ng ph?m l?n/xu?ng ?? thay ??i n?</i></small>"
-+
-+#: ../setup/setup.glade.h:14
-+msgid "About"
-+msgstr "Gi?i thi?u"
-+
-+#: ../setup/setup.glade.h:15
-+msgid "Candidates orientation:"
-+msgstr "H??ng danh s?ch t? ?ng c?:"
-+
-+#: ../setup/setup.glade.h:16
-+msgid "Custom font:"
-+msgstr "T?y bi?n ph?ng:"
-+
-+#: ../setup/setup.glade.h:17
-+msgid "Enable or disable:"
-+msgstr "B?t ho?c t?t:"
-+
-+#: ../setup/setup.glade.h:18
-+msgid "General"
-+msgstr "Chung"
-+
-+#: ../setup/setup.glade.h:19
-+msgid ""
-+"Horizontal\n"
-+"Vertical"
-+msgstr ""
-+"Ngang\n"
-+"D?c"
-+
-+#: ../setup/setup.glade.h:21
-+#: ../setup/ibus-setup.desktop.in.h:1
-+msgid "IBus Preferences"
-+msgstr "T?y th?ch IBus"
-+
-+#: ../setup/setup.glade.h:22
-+msgid "Input Methods"
-+msgstr "B? g?"
-+
-+#: ../setup/setup.glade.h:23
-+msgid ""
-+"Never\n"
-+"When active\n"
-+"Always"
-+msgstr ""
-+"Kh?ng bao gi?\n"
-+"Khi ho?t ??ng\n"
-+"Lu?n lu?n"
-+
-+#: ../setup/setup.glade.h:26
-+msgid "Next input method:"
-+msgstr "B? g? k? ti?p:"
-+
-+#: ../setup/setup.glade.h:27
-+msgid "Previous input method:"
-+msgstr "B? g? tr??c:"
-+
-+#: ../setup/setup.glade.h:28
-+msgid "Show language panel:"
-+msgstr "Hi?n th? thanh ng?n ng?:"
-+
-+#: ../setup/setup.glade.h:29
-+msgid "Start ibus on login"
-+msgstr "Kh?i ??ng ibus khi ??ng nh?p"
-+
-+#: ../setup/setup.glade.h:30
-+msgid "Use custom font"
-+msgstr "D?ng ph?ng ch? t?y bi?n"
-+
-+#: ../data/ibus.schemas.in.h:1
-+msgid "Auto Hide"
-+msgstr "T? ??ng ?n"
-+
-+#: ../data/ibus.schemas.in.h:2
-+msgid "Custom Font"
-+msgstr "T?y bi?n ph?ng"
-+
-+#: ../data/ibus.schemas.in.h:3
-+msgid "Custom font name for language panel"
-+msgstr "T?y bi?n ph?ng cho thanh ng?n ng?"
-+
-+#: ../data/ibus.schemas.in.h:4
-+msgid "Next Engine Hotkey"
-+msgstr "Ph?m n?ng cho b? g? k? ti?p"
-+
-+#: ../data/ibus.schemas.in.h:5
-+msgid "Next engine hotkey for switch to next input method engine"
-+msgstr "Ph?m n?ng d?ng ?? chuy?n ??n b? g? k? ti?p"
-+
-+#: ../data/ibus.schemas.in.h:6
-+msgid "Orientation of Lookup Table"
-+msgstr "H??ng c?a b?ng tra c?u"
-+
-+#: ../data/ibus.schemas.in.h:7
-+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-+msgstr "H??ng c?a b?ng tra c?u. 0 = Ngang, 1 = D?c"
-+
-+#: ../data/ibus.schemas.in.h:8
-+msgid "Preload Engines"
-+msgstr "N?p tr??c b? g?"
-+
-+#: ../data/ibus.schemas.in.h:9
-+msgid "Preload Engines during ibus starts up"
-+msgstr "N?p tr??c b? g? trong khi kh?i ??ng ibus"
-+
-+#: ../data/ibus.schemas.in.h:10
-+msgid "Prev Engine Hotkey"
-+msgstr "Ph?m n?ng cho b? g? tr??c"
-+
-+#: ../data/ibus.schemas.in.h:11
-+msgid "Prev engine hotkey for switch to previous input method engine"
-+msgstr "Ph?m n?ng d?ng ?? chuy?n v? b? g? tr??c"
-+
-+#: ../data/ibus.schemas.in.h:12
-+msgid "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show"
-+msgstr "C?ch hi?n th? thanh ng?n ng?. 0 = Lu?n ?n, 1 = T?  ??ng ?n, 2 = Lu?n hi?n"
-+
-+#: ../data/ibus.schemas.in.h:13
-+msgid "Trigger Hotkey"
-+msgstr "Ph?m n?ng b?t/t?t"
-+
-+#: ../data/ibus.schemas.in.h:14
-+msgid "Trigger hotkey for enable or disable input context"
-+msgstr "Ph?m n?ng b?t/t?t d?ng ?? b?t ho?c t?t b? g?"
-+
-+#: ../data/ibus.schemas.in.h:15
-+msgid "Use Custom Font"
-+msgstr "D?ng ph?ng t?y bi?n"
-+
-+#: ../data/ibus.schemas.in.h:16
-+msgid "Use custom font name for language panel"
-+msgstr "D?ng ph?ng t?y bi?n cho thanh ng?n ng?"
-+
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 45da441..aa96c46 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -132,7 +132,7 @@ libibus_la_LDFLAGS = \
- 	@GOBJECT2_LIBS@ \
- 	@GIO2_LIBS@ \
- 	@DBUS_LIBS@ \
--	-export-symbols-regex "ibus_.*"
-+	-export-symbols-regex "ibus_.*" \
- 	-version-info @LT_VERSION_INFO@ \
- 	$(NULL)
- 
-diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
-index d928898..cd5d73f 100644
---- a/src/ibuslookuptable.c
-+++ b/src/ibuslookuptable.c
-@@ -215,6 +215,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         g_return_val_if_fail (retval, FALSE);
- 
-         ibus_lookup_table_append_candidate (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-@@ -229,6 +230,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         g_return_val_if_fail (retval, FALSE);
- 
-         ibus_lookup_table_append_label (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-diff --git a/src/ibusproperty.c b/src/ibusproperty.c
-index ea5aca0..44a328e 100644
---- a/src/ibusproperty.c
-+++ b/src/ibusproperty.c
-@@ -118,6 +118,11 @@ ibus_property_destroy (IBusProperty *prop)
-         prop->tooltip = NULL;
-     }
- 
-+    if (prop->sub_props) {
-+        g_object_unref (prop->sub_props);
-+        prop->sub_props = NULL;
-+    }
-+
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
- }
- 
+


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/ibus.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- ibus.spec	11 Aug 2009 02:53:40 -0000	1.82
+++ ibus.spec	29 Aug 2009 03:13:05 -0000	1.83
@@ -7,15 +7,15 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090612
-Release:    3%{?dist}
+Version:    1.1.0.20090829
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-Patch0:     ibus-HEAD.patch
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,10 +114,10 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 # ./autogen.sh --help
-aclocal -I m4
-automake
+# aclocal -I m4
+# automake
 
 %build
 %configure --disable-static \
@@ -230,6 +230,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Aug 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090829-1
+- Update to 1.1.0.20090829
+- Fix some memory leaks
+
 * Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-3
 - Do not execute autogen.sh to avoid the snapshot date changing.
 
@@ -241,19 +245,19 @@ fi
 - Do not restore states when focus_in, if the engine is disabled.
 
 * Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
-- Update to Update to 1.1.0.20090612
+- Update to 1.1.0.20090612
 - Fix bug 504942 - PageUp and PageDown do not work in candidate list
 - Fix bug 491040 - Implememnt mouse selection in candidate list
 
 * Wed Jun 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090609-1
-- Update to Update to 1.1.0.20090609
+- Update to 1.1.0.20090609
 - Fix bug 502414 - Implemented on-screen help facility
 - Fix bug 502561 - iBus should show keymap name on iBus panel
 - Fix bug 498043 - ibus Alt-grave trigger conflicts with openoffice.org
 - Implemented API for setting labels for candidates in LookupTable
 
 * Sun May 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090531-1
-- Update to Update to 1.1.0.20090531
+- Update to 1.1.0.20090531
 
 * Tue May 26 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-5
 - Update ibus-HEAD.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	12 Jun 2009 06:02:53 -0000	1.39
+++ sources	29 Aug 2009 03:13:05 -0000	1.40
@@ -1 +1 @@
-108fe12f49f5b55453293104b4c8e19e  ibus-1.1.0.20090612.tar.gz
+f00b16c29491b0a86848c2f8d5314e7a  ibus-1.1.0.20090829.tar.gz



From pkgdb at fedoraproject.org  Sat Aug 29 03:18:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:18:44 +0000
Subject: [pkgdb] plexus-naming was added for overholt
Message-ID: <20090829031844.4B59F10F879@bastion2.fedora.phx.redhat.com>

kevin has added Package plexus-naming with summary Plexus Naming Component
kevin has approved Package plexus-naming
kevin has added a Fedora devel branch for plexus-naming with an owner of overholt
kevin has approved plexus-naming in Fedora devel
kevin has approved Package plexus-naming
kevin has set commit to Approved for 107427 on plexus-naming (Fedora devel)
kevin has set checkout to Approved for 107427 on plexus-naming (Fedora devel)
kevin has set build to Approved for 107427 on plexus-naming (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-naming



From pkgdb at fedoraproject.org  Sat Aug 29 03:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:18:46 +0000
Subject: [pkgdb] plexus-naming summary updated by kevin
Message-ID: <20090829031846.34E0710F884@bastion2.fedora.phx.redhat.com>

kevin set package plexus-naming summary to Plexus Naming Component

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-naming



From pkgdb at fedoraproject.org  Sat Aug 29 03:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:18:46 +0000
Subject: [pkgdb] plexus-naming (Fedora, devel) updated by kevin
Message-ID: <20090829031846.4416610F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on plexus-naming (Fedora devel) for akurtakov
kevin approved watchcommits on plexus-naming (Fedora devel) for akurtakov
kevin approved commit on plexus-naming (Fedora devel) for akurtakov
kevin approved build on plexus-naming (Fedora devel) for akurtakov
kevin approved approveacls on plexus-naming (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-naming



From pkgdb at fedoraproject.org  Sat Aug 29 03:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:20:50 +0000
Subject: [pkgdb] cpptasks was added for mycae
Message-ID: <20090829032050.9976810F87B@bastion2.fedora.phx.redhat.com>

kevin has added Package cpptasks with summary Compile and link task for ant
kevin has approved Package cpptasks
kevin has added a Fedora devel branch for cpptasks with an owner of mycae
kevin has approved cpptasks in Fedora devel
kevin has approved Package cpptasks
kevin has set commit to Approved for 107427 on cpptasks (Fedora devel)
kevin has set checkout to Approved for 107427 on cpptasks (Fedora devel)
kevin has set build to Approved for 107427 on cpptasks (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpptasks



From pkgdb at fedoraproject.org  Sat Aug 29 03:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:20:52 +0000
Subject: [pkgdb] cpptasks (Fedora EPEL, 5) updated by kevin
Message-ID: <20090829032052.1683410F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cpptasks
kevin has set commit to Approved for 107427 on cpptasks (Fedora 10)
kevin has set checkout to Approved for 107427 on cpptasks (Fedora 10)
kevin has set build to Approved for 107427 on cpptasks (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpptasks



From pkgdb at fedoraproject.org  Sat Aug 29 03:20:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:20:51 +0000
Subject: [pkgdb] cpptasks summary updated by kevin
Message-ID: <20090829032052.0CA9810F879@bastion2.fedora.phx.redhat.com>

kevin set package cpptasks summary to Compile and link task for ant

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpptasks



From pkgdb at fedoraproject.org  Sat Aug 29 03:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:20:52 +0000
Subject: [pkgdb] cpptasks (Fedora EPEL, 5) updated by kevin
Message-ID: <20090829032052.2165010F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cpptasks
kevin has set commit to Approved for 107427 on cpptasks (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on cpptasks (Fedora EPEL 5)
kevin has set build to Approved for 107427 on cpptasks (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpptasks



From kevin at fedoraproject.org  Sat Aug 29 03:20:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:20:58 +0000 (UTC)
Subject: rpms/plexus-naming - New directory
Message-ID: <20090829032058.2112011C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-naming
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25916/rpms/plexus-naming

Log Message:
Directory /cvs/pkgs/rpms/plexus-naming added to the repository




From kevin at fedoraproject.org  Sat Aug 29 03:20:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:20:58 +0000 (UTC)
Subject: rpms/plexus-naming/devel - New directory
Message-ID: <20090829032058.4710211C0081@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-naming/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25916/rpms/plexus-naming/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-naming/devel added to the repository




From kevin at fedoraproject.org  Sat Aug 29 03:21:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:21:04 +0000 (UTC)
Subject: rpms/plexus-naming Makefile,NONE,1.1
Message-ID: <20090829032104.83E9811C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-naming
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25916/rpms/plexus-naming

Added Files:
	Makefile 
Log Message:
Setup of module plexus-naming


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-naming
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 29 03:21:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:21:04 +0000 (UTC)
Subject: rpms/plexus-naming/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090829032104.C3BC911C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/plexus-naming/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25916/rpms/plexus-naming/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-naming


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-naming
# $Id: Makefile,v 1.1 2009/08/29 03:21:04 kevin Exp $
NAME := plexus-naming
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 29 03:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:20:52 +0000
Subject: [pkgdb] cpptasks (Fedora EPEL, 5) updated by kevin
Message-ID: <20090829032052.2D25610F899@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cpptasks
kevin has set commit to Approved for 107427 on cpptasks (Fedora 11)
kevin has set checkout to Approved for 107427 on cpptasks (Fedora 11)
kevin has set build to Approved for 107427 on cpptasks (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/cpptasks



From kevin at fedoraproject.org  Sat Aug 29 03:21:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:21:17 +0000 (UTC)
Subject: rpms/cpptasks - New directory
Message-ID: <20090829032117.1D92311C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptasks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26038/rpms/cpptasks

Log Message:
Directory /cvs/pkgs/rpms/cpptasks added to the repository




From kevin at fedoraproject.org  Sat Aug 29 03:21:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:21:17 +0000 (UTC)
Subject: rpms/cpptasks/devel - New directory
Message-ID: <20090829032117.43CEF11C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptasks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26038/rpms/cpptasks/devel

Log Message:
Directory /cvs/pkgs/rpms/cpptasks/devel added to the repository




From kevin at fedoraproject.org  Sat Aug 29 03:21:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:21:23 +0000 (UTC)
Subject: rpms/cpptasks Makefile,NONE,1.1
Message-ID: <20090829032123.8FEA211C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptasks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26038/rpms/cpptasks

Added Files:
	Makefile 
Log Message:
Setup of module cpptasks


--- NEW FILE Makefile ---
# Top level Makefile for module cpptasks
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 29 03:21:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:21:24 +0000 (UTC)
Subject: rpms/cpptasks/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090829032124.406AA11C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpptasks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26038/rpms/cpptasks/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cpptasks


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cpptasks
# $Id: Makefile,v 1.1 2009/08/29 03:21:24 kevin Exp $
NAME := cpptasks
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 29 03:22:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:22:18 +0000
Subject: [pkgdb] hdapsd was added for ttorcz
Message-ID: <20090829032218.3B82110F879@bastion2.fedora.phx.redhat.com>

kevin has added Package hdapsd with summary Protects hard drives by parking head when fall is detected
kevin has approved Package hdapsd
kevin has added a Fedora devel branch for hdapsd with an owner of ttorcz
kevin has approved hdapsd in Fedora devel
kevin has approved Package hdapsd
kevin has set commit to Approved for 107427 on hdapsd (Fedora devel)
kevin has set checkout to Approved for 107427 on hdapsd (Fedora devel)
kevin has set build to Approved for 107427 on hdapsd (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hdapsd



From pkgdb at fedoraproject.org  Sat Aug 29 03:22:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:22:19 +0000
Subject: [pkgdb] hdapsd summary updated by kevin
Message-ID: <20090829032219.B3C1F10F881@bastion2.fedora.phx.redhat.com>

kevin set package hdapsd summary to Protects hard drives by parking head when fall is detected

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hdapsd



From kevin at fedoraproject.org  Sat Aug 29 03:22:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:22:30 +0000 (UTC)
Subject: rpms/hdapsd - New directory
Message-ID: <20090829032230.18FD411C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hdapsd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26420/rpms/hdapsd

Log Message:
Directory /cvs/pkgs/rpms/hdapsd added to the repository




From kevin at fedoraproject.org  Sat Aug 29 03:22:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:22:30 +0000 (UTC)
Subject: rpms/hdapsd/devel - New directory
Message-ID: <20090829032230.3D73211C008D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hdapsd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26420/rpms/hdapsd/devel

Log Message:
Directory /cvs/pkgs/rpms/hdapsd/devel added to the repository




From pkgdb at fedoraproject.org  Sat Aug 29 03:22:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:22:19 +0000
Subject: [pkgdb] hdapsd (Fedora, 12) updated by kevin
Message-ID: <20090829032219.C15DE10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for hdapsd
kevin has set commit to Approved for 107427 on hdapsd (Fedora 12)
kevin has set checkout to Approved for 107427 on hdapsd (Fedora 12)
kevin has set build to Approved for 107427 on hdapsd (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hdapsd



From kevin at fedoraproject.org  Sat Aug 29 03:22:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:22:36 +0000 (UTC)
Subject: rpms/hdapsd Makefile,NONE,1.1
Message-ID: <20090829032236.2E89A11C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hdapsd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26420/rpms/hdapsd

Added Files:
	Makefile 
Log Message:
Setup of module hdapsd


--- NEW FILE Makefile ---
# Top level Makefile for module hdapsd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Aug 29 03:22:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 29 Aug 2009 03:22:36 +0000 (UTC)
Subject: rpms/hdapsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090829032236.6730F11C0078@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hdapsd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj26420/rpms/hdapsd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hdapsd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hdapsd
# $Id: Makefile,v 1.1 2009/08/29 03:22:36 kevin Exp $
NAME := hdapsd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 29 03:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:25:59 +0000
Subject: [pkgdb] perl F-12 cloned from devel
Message-ID: <20090829032559.246EB10F877@bastion2.fedora.phx.redhat.com>

kevin cloned perl F-12 from devel

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/perl



From pkgdb at fedoraproject.org  Sat Aug 29 03:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 03:28:16 +0000
Subject: [pkgdb] rpmconf (Fedora, 10) updated by kevin
Message-ID: <20090829032816.E323D10F877@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rpmconf
kevin has set commit to Approved for 107427 on rpmconf (Fedora 10)
kevin has set checkout to Approved for 107427 on rpmconf (Fedora 10)
kevin has set build to Approved for 107427 on rpmconf (Fedora 10)
kevin changed owner of rpmconf in Fedora 10 to mjakubicek
kevin approved watchbugzilla on rpmconf (Fedora 10) for msuchy
kevin approved watchcommits on rpmconf (Fedora 10) for msuchy
kevin approved commit on rpmconf (Fedora 10) for msuchy
kevin approved build on rpmconf (Fedora 10) for msuchy
kevin approved approveacls on rpmconf (Fedora 10) for msuchy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From phuang at fedoraproject.org  Sat Aug 29 03:36:22 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 29 Aug 2009 03:36:22 +0000 (UTC)
Subject: rpms/ibus/F-10 ibus-HEAD.patch, 1.3, 1.4 ibus.spec, 1.40,
	1.41 sources, 1.27, 1.28
Message-ID: <20090829033622.C908311C0078@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28935

Modified Files:
	ibus-HEAD.patch ibus.spec sources 
Log Message:
Update to 1.1.0.20090829

ibus-HEAD.patch:
 0 files changed

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus-HEAD.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-HEAD.patch	10 Aug 2009 07:54:47 -0000	1.3
+++ ibus-HEAD.patch	29 Aug 2009 03:36:22 -0000	1.4
@@ -1,446 +1 @@
-diff --git a/AUTHORS b/AUTHORS
-index 24ed851..23dca12 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -45,6 +45,8 @@ te.po
- krishna k <k.meetme at gmail.com>
- ta.po:
- Felix <ifelix at redhat.com>
-+vi.po:
-+L? Qu?c Tu?n <mr.lequoctuan at gmail.com>
- zh_CN.po:
- Huang Peng <shawn.p.huang at gmail.com>
- zh_HK.po:
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 0881581..bec08c3 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -1151,28 +1151,29 @@ bus_input_context_focus_in (BusInputContext *context)
- 
-     if (priv->capabilities & IBUS_CAP_FOCUS) {
-         g_signal_emit (context, context_signals[FOCUS_IN], 0);
--
--        if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_PREEDIT_TEXT],
--                           0,
--                           priv->preedit_text,
--                           priv->preedit_cursor_pos,
--                           priv->preedit_visible);
--        }
--        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_AUXILIARY_TEXT],
--                           0,
--                           priv->auxiliary_text,
--                           priv->auxiliary_visible);
--        }
--        if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
--            g_signal_emit (context,
--                           context_signals[UPDATE_LOOKUP_TABLE],
--                           0,
--                           priv->lookup_table,
--                           priv->lookup_table_visible);
-+        if (priv->engine && priv->enabled) {
-+            if (priv->preedit_visible && (priv->capabilities & IBUS_CAP_PREEDIT_TEXT) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_PREEDIT_TEXT],
-+                               0,
-+                               priv->preedit_text,
-+                               priv->preedit_cursor_pos,
-+                               priv->preedit_visible);
-+            }
-+            if (priv->auxiliary_visible && (priv->capabilities & IBUS_CAP_AUXILIARY_TEXT) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_AUXILIARY_TEXT],
-+                               0,
-+                               priv->auxiliary_text,
-+                               priv->auxiliary_visible);
-+            }
-+            if (priv->lookup_table_visible && (priv->capabilities & IBUS_CAP_LOOKUP_TABLE) == 0) {
-+                g_signal_emit (context,
-+                               context_signals[UPDATE_LOOKUP_TABLE],
-+                               0,
-+                               priv->lookup_table,
-+                               priv->lookup_table_visible);
-+            }
-         }
-     }
- }
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 9c1cecd..5385cb8 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -20,6 +20,7 @@ sr
- sr at latin
- ta
- te
-+vi
- zh_CN
- zh_HK
- zh_TW
-diff --git a/po/da.po b/po/da.po
-index 94ac003..8b52b8b 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -8,7 +8,7 @@ msgstr ""
- "Project-Id-Version: ibus\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-05-26 07:38+0800\n"
--"PO-Revision-Date: 2009-04-06 21:47+0200\n"
-+"PO-Revision-Date: 2009-06-11 17:58+0200\n"
- "Last-Translator: Kris Thomsen <lakristho at gmail.com>\n"
- "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
- "MIME-Version: 1.0\n"
-@@ -153,6 +153,8 @@ msgid ""
- "<small><i>The default input method is the top one in the list.\n"
- "You may use up/down buttons to change it.</i></small>"
- msgstr ""
-+"<small><i>Standard inputmetoden er den ?verste i listen.\n"
-+"Du kan bruge op/ned-knapperne for at ?ndre det.</i></small>"
- 
- #: ../setup/setup.glade.h:14
- msgid "About"
-diff --git a/po/vi.po b/po/vi.po
-new file mode 100644
-index 0000000..8ecef98
---- /dev/null
-+++ b/po/vi.po
-@@ -0,0 +1,288 @@
-+# Vietnamese translations for data package.
-+# Copyright (C) 2009 THE data'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the data package.
-+# Le Quoc Tuan <mr.lequoctuan at gmail.com>, 2009.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: data 1\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-05-26 07:38+0800\n"
-+"PO-Revision-Date: 2009-06-12 12:41+0700\n"
-+"Last-Translator: Le Quoc Tuan <mr.lequoctuan at gmail.com>\n"
-+"Language-Team: Vietnamese\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"
-+
-+#: ../bus/ibus.desktop.in.h:1
-+msgid "IBus"
-+msgstr "IBus"
-+
-+#: ../bus/ibus.desktop.in.h:2
-+#: ../ui/gtk/panel.py:97
-+msgid "IBus input method framework"
-+msgstr "B? g? IBus"
-+
-+#: ../ibus/lang.py:40
-+#: ../ui/gtk/panel.py:307
-+#: ../ui/gtk/panel.py:308
-+#: ../ui/gtk/panel.py:309
-+#: ../ui/gtk/panel.py:310
-+msgid "Other"
-+msgstr "Kh?c"
-+
-+#: ../ui/gtk/panel.py:282
-+msgid "Restart"
-+msgstr "Kh?i ??ng l?i"
-+
-+#: ../ui/gtk/panel.py:337
-+msgid "No input method"
-+msgstr "Kh?ng c? b? g?"
-+
-+#: ../ui/gtk/panel.py:383
-+msgid "IBus is an intelligent input bus for Linux/Unix."
-+msgstr "IBus l? m?t b? g? th?ng minh cho Linux/Unix."
-+
-+#: ../ui/gtk/panel.py:387
-+msgid "translator-credits"
-+msgstr "L? Qu?c Tu?n <mr.lequoctuan at gmail.com>"
-+
-+#. create input methods menu
-+#: ../ui/gtk/languagebar.py:84
-+msgid "Switch input method"
-+msgstr "Chuy?n b? g?"
-+
-+#: ../setup/main.py:104
-+msgid "trigger"
-+msgstr "B?t/t?t"
-+
-+#: ../setup/main.py:114
-+msgid "next input method"
-+msgstr "B? g? k? ti?p"
-+
-+#: ../setup/main.py:124
-+msgid "previous input method"
-+msgstr "B? g? tr??c"
-+
-+#: ../setup/main.py:205
-+msgid "IBus daemon is not started. Do you want to start it now?"
-+msgstr "IBus daemon ch?a ???c kh?i ??ng. B?n c? mu?n kh?i ??ng n? ngay b?y gi??"
-+
-+#: ../setup/main.py:220
-+msgid ""
-+"IBus has been started! If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-+"  export GTK_IM_MODULE=ibus\n"
-+"  export XMODIFIERS=@im=ibus\n"
-+"  export QT_IM_MODULE=ibus"
-+msgstr ""
-+"IBus v?a ???c kh?i ??ng! N?u b?n kh?ng th? d?ng IBus, vui l?ng th?m nh?ng d?ng b?n d??i v?o $HOME/.bashrc, v? ??ng nh?p l?i.\n"
-+"  export GTK_IM_MODULE=ibus\n"
-+"  export XMODIFIERS=@im=ibus\n"
-+"  export QT_IM_MODULE=ibus"
-+
-+#: ../setup/main.py:235
-+#, python-format
-+msgid "Select keyboard shortcut for %s"
-+msgstr "Ch?n ph?m t?t cho %s"
-+
-+#: ../setup/keyboardshortcut.py:54
-+msgid "Keyboard shortcuts"
-+msgstr "Nh?ng ph?m t?t"
-+
-+#: ../setup/keyboardshortcut.py:65
-+msgid "Key code:"
-+msgstr "M? ph?m:"
-+
-+#: ../setup/keyboardshortcut.py:80
-+msgid "Modifiers:"
-+msgstr "Ph?m b? sung:"
-+
-+#: ../setup/keyboardshortcut.py:222
-+msgid ""
-+"Please press a key (or a key combination).\n"
-+"The dialog will be closed when the key is released."
-+msgstr ""
-+"Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m).\n"
-+"H?p tho?i n?y s? ???c ??ng l?i khi b?n th? ph?m ?n."
-+
-+#: ../setup/keyboardshortcut.py:224
-+msgid "Please press a key (or a key combination)"
-+msgstr "Vui l?ng nh?n m?t ph?m (ho?c t? h?p ph?m)"
-+
-+#: ../setup/enginecombobox.py:99
-+msgid "Select an input method"
-+msgstr "Ch?n m?t b? g?"
-+
-+#: ../setup/setup.glade.h:1
-+msgid "..."
-+msgstr "..."
-+
-+#: ../setup/setup.glade.h:2
-+msgid "<b>Font and Style</b>"
-+msgstr "<b>Ph?ng v? ki?u</b>"
-+
-+#: ../setup/setup.glade.h:3
-+msgid "<b>Keyboard Shortcuts</b>"
-+msgstr "<b>Ph?m t?t</b>"
-+
-+#: ../setup/setup.glade.h:4
-+msgid "<b>Startup</b>"
-+msgstr "<b>Kh?i ??ng</b>"
-+
-+#: ../setup/setup.glade.h:5
-+msgid ""
-+"<big><b>IBus</b></big>\n"
-+"<small>The intelligent input bus</small>\n"
-+"Homepage: http://code.google.com/p/ibus\n"
-+"\n"
-+"\n"
-+"\n"
-+msgstr ""
-+"<big><b>IBus</b></big>\n"
-+"<small>B? g? th?ng minh</small>\n"
-+"Trang ch?: http://code.google.com/p/ibus\n"
-+"\n"
-+"\n"
-+"\n"
-+
-+#: ../setup/setup.glade.h:12
-+msgid ""
-+"<small><i>The default input method is the top one in the list.\n"
-+"You may use up/down buttons to change it.</i></small>"
-+msgstr ""
-+"<small><i>B? g? m?c ??nh l? b? g? ??u ti?n trong danh s?ch.\n"
-+"B?n c? th? d?ng ph?m l?n/xu?ng ?? thay ??i n?</i></small>"
-+
-+#: ../setup/setup.glade.h:14
-+msgid "About"
-+msgstr "Gi?i thi?u"
-+
-+#: ../setup/setup.glade.h:15
-+msgid "Candidates orientation:"
-+msgstr "H??ng danh s?ch t? ?ng c?:"
-+
-+#: ../setup/setup.glade.h:16
-+msgid "Custom font:"
-+msgstr "T?y bi?n ph?ng:"
-+
-+#: ../setup/setup.glade.h:17
-+msgid "Enable or disable:"
-+msgstr "B?t ho?c t?t:"
-+
-+#: ../setup/setup.glade.h:18
-+msgid "General"
-+msgstr "Chung"
-+
-+#: ../setup/setup.glade.h:19
-+msgid ""
-+"Horizontal\n"
-+"Vertical"
-+msgstr ""
-+"Ngang\n"
-+"D?c"
-+
-+#: ../setup/setup.glade.h:21
-+#: ../setup/ibus-setup.desktop.in.h:1
-+msgid "IBus Preferences"
-+msgstr "T?y th?ch IBus"
-+
-+#: ../setup/setup.glade.h:22
-+msgid "Input Methods"
-+msgstr "B? g?"
-+
-+#: ../setup/setup.glade.h:23
-+msgid ""
-+"Never\n"
-+"When active\n"
-+"Always"
-+msgstr ""
-+"Kh?ng bao gi?\n"
-+"Khi ho?t ??ng\n"
-+"Lu?n lu?n"
-+
-+#: ../setup/setup.glade.h:26
-+msgid "Next input method:"
-+msgstr "B? g? k? ti?p:"
-+
-+#: ../setup/setup.glade.h:27
-+msgid "Previous input method:"
-+msgstr "B? g? tr??c:"
-+
-+#: ../setup/setup.glade.h:28
-+msgid "Show language panel:"
-+msgstr "Hi?n th? thanh ng?n ng?:"
-+
-+#: ../setup/setup.glade.h:29
-+msgid "Start ibus on login"
-+msgstr "Kh?i ??ng ibus khi ??ng nh?p"
-+
-+#: ../setup/setup.glade.h:30
-+msgid "Use custom font"
-+msgstr "D?ng ph?ng ch? t?y bi?n"
-+
-+#: ../data/ibus.schemas.in.h:1
-+msgid "Auto Hide"
-+msgstr "T? ??ng ?n"
-+
-+#: ../data/ibus.schemas.in.h:2
-+msgid "Custom Font"
-+msgstr "T?y bi?n ph?ng"
-+
-+#: ../data/ibus.schemas.in.h:3
-+msgid "Custom font name for language panel"
-+msgstr "T?y bi?n ph?ng cho thanh ng?n ng?"
-+
-+#: ../data/ibus.schemas.in.h:4
-+msgid "Next Engine Hotkey"
-+msgstr "Ph?m n?ng cho b? g? k? ti?p"
-+
-+#: ../data/ibus.schemas.in.h:5
-+msgid "Next engine hotkey for switch to next input method engine"
-+msgstr "Ph?m n?ng d?ng ?? chuy?n ??n b? g? k? ti?p"
-+
-+#: ../data/ibus.schemas.in.h:6
-+msgid "Orientation of Lookup Table"
-+msgstr "H??ng c?a b?ng tra c?u"
-+
-+#: ../data/ibus.schemas.in.h:7
-+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-+msgstr "H??ng c?a b?ng tra c?u. 0 = Ngang, 1 = D?c"
-+
-+#: ../data/ibus.schemas.in.h:8
-+msgid "Preload Engines"
-+msgstr "N?p tr??c b? g?"
-+
-+#: ../data/ibus.schemas.in.h:9
-+msgid "Preload Engines during ibus starts up"
-+msgstr "N?p tr??c b? g? trong khi kh?i ??ng ibus"
-+
-+#: ../data/ibus.schemas.in.h:10
-+msgid "Prev Engine Hotkey"
-+msgstr "Ph?m n?ng cho b? g? tr??c"
-+
-+#: ../data/ibus.schemas.in.h:11
-+msgid "Prev engine hotkey for switch to previous input method engine"
-+msgstr "Ph?m n?ng d?ng ?? chuy?n v? b? g? tr??c"
-+
-+#: ../data/ibus.schemas.in.h:12
-+msgid "The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always show"
-+msgstr "C?ch hi?n th? thanh ng?n ng?. 0 = Lu?n ?n, 1 = T?  ??ng ?n, 2 = Lu?n hi?n"
-+
-+#: ../data/ibus.schemas.in.h:13
-+msgid "Trigger Hotkey"
-+msgstr "Ph?m n?ng b?t/t?t"
-+
-+#: ../data/ibus.schemas.in.h:14
-+msgid "Trigger hotkey for enable or disable input context"
-+msgstr "Ph?m n?ng b?t/t?t d?ng ?? b?t ho?c t?t b? g?"
-+
-+#: ../data/ibus.schemas.in.h:15
-+msgid "Use Custom Font"
-+msgstr "D?ng ph?ng t?y bi?n"
-+
-+#: ../data/ibus.schemas.in.h:16
-+msgid "Use custom font name for language panel"
-+msgstr "D?ng ph?ng t?y bi?n cho thanh ng?n ng?"
-+
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 45da441..aa96c46 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -132,7 +132,7 @@ libibus_la_LDFLAGS = \
- 	@GOBJECT2_LIBS@ \
- 	@GIO2_LIBS@ \
- 	@DBUS_LIBS@ \
--	-export-symbols-regex "ibus_.*"
-+	-export-symbols-regex "ibus_.*" \
- 	-version-info @LT_VERSION_INFO@ \
- 	$(NULL)
- 
-diff --git a/src/ibuslookuptable.c b/src/ibuslookuptable.c
-index d928898..cd5d73f 100644
---- a/src/ibuslookuptable.c
-+++ b/src/ibuslookuptable.c
-@@ -215,6 +215,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         g_return_val_if_fail (retval, FALSE);
- 
-         ibus_lookup_table_append_candidate (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-@@ -229,6 +230,7 @@ ibus_lookup_table_deserialize (IBusLookupTable *table,
-         g_return_val_if_fail (retval, FALSE);
- 
-         ibus_lookup_table_append_label (table, text);
-+        g_object_unref (text);
-     }
- 
-     ibus_message_iter_next (iter);
-diff --git a/src/ibusproperty.c b/src/ibusproperty.c
-index ea5aca0..44a328e 100644
---- a/src/ibusproperty.c
-+++ b/src/ibusproperty.c
-@@ -118,6 +118,11 @@ ibus_property_destroy (IBusProperty *prop)
-         prop->tooltip = NULL;
-     }
- 
-+    if (prop->sub_props) {
-+        g_object_unref (prop->sub_props);
-+        prop->sub_props = NULL;
-+    }
-+
-     IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)prop);
- }
- 
+


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/ibus.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ibus.spec	11 Aug 2009 03:14:52 -0000	1.40
+++ ibus.spec	29 Aug 2009 03:36:22 -0000	1.41
@@ -7,15 +7,15 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.1.0.20090612
-Release:    3%{?dist}
+Version:    1.1.0.20090829
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-Patch0:     ibus-HEAD.patch
+# Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,10 +114,10 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 # ./autogen.sh --help
-aclocal -I m4
-automake
+# aclocal -I m4
+# automake
 
 %build
 %configure --disable-static \
@@ -230,6 +230,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Aug 29 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090829-1
+- Update to 1.1.0.20090829
+- Fix some memory leaks
+
 * Mon Aug 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-3
 - Do not execute autogen.sh to avoid the snapshot date changing.
 
@@ -241,19 +245,19 @@ fi
 - Do not restore states when focus_in, if the engine is disabled.
 
 * Fri Jun 12 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090612-1
-- Update to Update to 1.1.0.20090612
+- Update to 1.1.0.20090612
 - Fix bug 504942 - PageUp and PageDown do not work in candidate list
 - Fix bug 491040 - Implememnt mouse selection in candidate list
 
 * Wed Jun 10 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090609-1
-- Update to Update to 1.1.0.20090609
+- Update to 1.1.0.20090609
 - Fix bug 502414 - Implemented on-screen help facility
 - Fix bug 502561 - iBus should show keymap name on iBus panel
 - Fix bug 498043 - ibus Alt-grave trigger conflicts with openoffice.org
 - Implemented API for setting labels for candidates in LookupTable
 
 * Sun May 31 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090531-1
-- Update to Update to 1.1.0.20090531
+- Update to 1.1.0.20090531
 
 * Tue May 26 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090508-5
 - Update ibus-HEAD.patch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	12 Jun 2009 06:10:26 -0000	1.27
+++ sources	29 Aug 2009 03:36:22 -0000	1.28
@@ -1 +1 @@
-108fe12f49f5b55453293104b4c8e19e  ibus-1.1.0.20090612.tar.gz
+f00b16c29491b0a86848c2f8d5314e7a  ibus-1.1.0.20090829.tar.gz



From mycae at fedoraproject.org  Sat Aug 29 03:44:23 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 29 Aug 2009 03:44:23 +0000 (UTC)
Subject: rpms/cpptasks/devel cpptasks-README.fedora, NONE, 1.1 cpptasks.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090829034423.C7A3D11C0078@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30420/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cpptasks-README.fedora cpptasks.spec import.log 
Log Message:
* Initial commit



--- NEW FILE cpptasks-README.fedora ---
Documentation for the cpptasks project is available at the following URL:

http://ant-contrib.sourceforge.net/cpptasks/




--- NEW FILE cpptasks.spec ---
Name:		cpptasks
Version:	1.0b5
Release:	2%{?dist}
Summary:	Compile and link task for ant

Group:		Development/Libraries

License:	ASL 2.0
URL:		http://ant-contrib.sourceforge.net/
Vendor:		Ant contrib project
Source0:	http://downloads.sourceforge.net/ant-contrib/cpptasks-1.0b5.tar.gz
Source1:	%{name}-README.fedora

BuildRequires:	ant 
BuildRequires:	ant-junit 
BuildRequires:	jpackage-utils 
BuildRequires:	junit
BuildRequires:	maven2

Requires:	ant 
Requires:	java
Requires:	jpackage-utils

BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
	

%description
This ant task can compile various source languages and produce
executables, shared libraries (aka DLL's) and static libraries. Compiler
adaptors are currently available for several C/C++ compilers, FORTRAN,
MIDL and Windows Resource files.

%package        javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name}-%{version}-%{release}
Requires:	jpackage-utils

%description	javadoc
Javadoc documentation for %{summary}.


#The manual for b5 has been moved to xdoc (doxia) format.
# This requires maven, which requires many dependencies which we don't have.
#%package	manual
#Summary:	Docs for %{name}
#Group:		Development/Documentation

#%description	manual
#User manual for %{summary}.

%prep
%setup -q -n %{name}-%{version}

#End of line conversion
%{__sed} -i 's/\r//' NOTICE 

#Check for exisiting jar files
JAR_files=""
for j in $(find -name \*.jar); do
if [ ! -L $j ] ; then
	JAR_files="$JAR_files $j"
	fi
done

if [ ! -z "$JAR_files" ] ; then
	echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
	exit 1
fi

cp -p %{SOURCE1} ./README.fedora

%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=
ant jars javadocs 

#In lieu of maven built docs, which requires clirr
#a URL is supplied in README.fedora
#mvn-jpp site

%install
rm -rf $RPM_BUILD_ROOT


# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant/
install -Dpm 644 target/lib/%{name}.jar \
	$RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar

pushd $RPM_BUILD_ROOT%{_javadir}/ant/
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
popd

# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# manual - 
#install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
#cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

#Place a file into ant's config dir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/
echo "%{name} ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE README.fedora
%{_javadir}/ant/*.jar
%{_sysconfdir}/ant.d/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

#%files manual
#%defattr(-,root,root,-)
#%doc %{_docdir}/%{name}-%{version}

# -----------------------------------------------------------------------------

%changelog
* Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
- Fix doc installation 
- Move to _javadir/ant/ rather than _javadir/
- Fix requires + buildrequires for both main and javadoc packages
- Add README.fedora source in lieu of  maven build 

* Sat Mar 14 2009 D Haley <mycae at yahoo.com> - 1.0b5-1
- Update to b5
- cpptasks now uses difficult mvn-doxia xdoc, so remove manual subpackage
- Add distribution jar check
- EOL conversion on NOTICE
- Change summary & format description
- Fix BuildRoot 
- Change licence to ASL 2.0 from Apache Software Licence 2.0
- Documentation to "Documentation" Group

* Sat Sep 02 2005 Anthony Green <green at redhat.com> - 0:1.0-0.b3.2jpp_1%{?dist}
- Remove "ghost" for javadocs and javadoc postprocessing.
- Place in Development/Libraries, not Development/Libraries/Java.
- Remove epoch references.
- Build into Fedora Extras.

* Mon Sep 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2jpp
- Upgrade to Ant 1.6.X
- Build with ant-1.6.2
- Upgraded to 1.0.b3 and relaxed requirements on Thu Jul 15 2004 
by Ralph Apel <r.apel at r-apel.de> as 0:1.0-0.b3.1jpp

* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.4jpp
- Build with ant-1.6.2
- Relax versioned BuildReq
- Drop junit runtime requirement

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.3jpp
- Also runtime dep to Ant 1.6.X

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-0.b2.2jpp
- Upgrade to Ant 1.6.X

* Wed Mar 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.1jpp
- First JPackage release


--- NEW FILE import.log ---
cpptasks-1_0b5-2_fc10:HEAD:cpptasks-1.0b5-2.fc10.src.rpm:1251517799


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:21:23 -0000	1.1
+++ .cvsignore	29 Aug 2009 03:44:23 -0000	1.2
@@ -0,0 +1 @@
+cpptasks-1.0b5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:21:24 -0000	1.1
+++ sources	29 Aug 2009 03:44:23 -0000	1.2
@@ -0,0 +1 @@
+7f0f7732acd0c82f7efb228f667ec79a  cpptasks-1.0b5.tar.gz



From mycae at fedoraproject.org  Sat Aug 29 03:48:13 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 29 Aug 2009 03:48:13 +0000 (UTC)
Subject: rpms/cpptasks/F-10 cpptasks-README.fedora, NONE, 1.1 cpptasks.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090829034813.4349B11C0078@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31862/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	cpptasks-README.fedora cpptasks.spec import.log 
Log Message:
*Initial commit F-10



--- NEW FILE cpptasks-README.fedora ---
Documentation for the cpptasks project is available at the following URL:

http://ant-contrib.sourceforge.net/cpptasks/




--- NEW FILE cpptasks.spec ---
Name:		cpptasks
Version:	1.0b5
Release:	2%{?dist}
Summary:	Compile and link task for ant

Group:		Development/Libraries

License:	ASL 2.0
URL:		http://ant-contrib.sourceforge.net/
Vendor:		Ant contrib project
Source0:	http://downloads.sourceforge.net/ant-contrib/cpptasks-1.0b5.tar.gz
Source1:	%{name}-README.fedora

BuildRequires:	ant 
BuildRequires:	ant-junit 
BuildRequires:	jpackage-utils 
BuildRequires:	junit
BuildRequires:	maven2

Requires:	ant 
Requires:	java
Requires:	jpackage-utils

BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
	

%description
This ant task can compile various source languages and produce
executables, shared libraries (aka DLL's) and static libraries. Compiler
adaptors are currently available for several C/C++ compilers, FORTRAN,
MIDL and Windows Resource files.

%package        javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name}-%{version}-%{release}
Requires:	jpackage-utils

%description	javadoc
Javadoc documentation for %{summary}.


#The manual for b5 has been moved to xdoc (doxia) format.
# This requires maven, which requires many dependencies which we don't have.
#%package	manual
#Summary:	Docs for %{name}
#Group:		Development/Documentation

#%description	manual
#User manual for %{summary}.

%prep
%setup -q -n %{name}-%{version}

#End of line conversion
%{__sed} -i 's/\r//' NOTICE 

#Check for exisiting jar files
JAR_files=""
for j in $(find -name \*.jar); do
if [ ! -L $j ] ; then
	JAR_files="$JAR_files $j"
	fi
done

if [ ! -z "$JAR_files" ] ; then
	echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
	exit 1
fi

cp -p %{SOURCE1} ./README.fedora

%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=
ant jars javadocs 

#In lieu of maven built docs, which requires clirr
#a URL is supplied in README.fedora
#mvn-jpp site

%install
rm -rf $RPM_BUILD_ROOT


# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant/
install -Dpm 644 target/lib/%{name}.jar \
	$RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar

pushd $RPM_BUILD_ROOT%{_javadir}/ant/
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
popd

# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# manual - 
#install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
#cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

#Place a file into ant's config dir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/
echo "%{name} ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE README.fedora
%{_javadir}/ant/*.jar
%{_sysconfdir}/ant.d/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

#%files manual
#%defattr(-,root,root,-)
#%doc %{_docdir}/%{name}-%{version}

# -----------------------------------------------------------------------------

%changelog
* Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
- Fix doc installation 
- Move to _javadir/ant/ rather than _javadir/
- Fix requires + buildrequires for both main and javadoc packages
- Add README.fedora source in lieu of  maven build 

* Sat Mar 14 2009 D Haley <mycae at yahoo.com> - 1.0b5-1
- Update to b5
- cpptasks now uses difficult mvn-doxia xdoc, so remove manual subpackage
- Add distribution jar check
- EOL conversion on NOTICE
- Change summary & format description
- Fix BuildRoot 
- Change licence to ASL 2.0 from Apache Software Licence 2.0
- Documentation to "Documentation" Group

* Sat Sep 02 2005 Anthony Green <green at redhat.com> - 0:1.0-0.b3.2jpp_1%{?dist}
- Remove "ghost" for javadocs and javadoc postprocessing.
- Place in Development/Libraries, not Development/Libraries/Java.
- Remove epoch references.
- Build into Fedora Extras.

* Mon Sep 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2jpp
- Upgrade to Ant 1.6.X
- Build with ant-1.6.2
- Upgraded to 1.0.b3 and relaxed requirements on Thu Jul 15 2004 
by Ralph Apel <r.apel at r-apel.de> as 0:1.0-0.b3.1jpp

* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.4jpp
- Build with ant-1.6.2
- Relax versioned BuildReq
- Drop junit runtime requirement

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.3jpp
- Also runtime dep to Ant 1.6.X

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-0.b2.2jpp
- Upgrade to Ant 1.6.X

* Wed Mar 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.1jpp
- First JPackage release


--- NEW FILE import.log ---
cpptasks-1_0b5-2_fc10:F-10:cpptasks-1.0b5-2.fc10.src.rpm:1251518039


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:21:23 -0000	1.1
+++ .cvsignore	29 Aug 2009 03:48:13 -0000	1.2
@@ -0,0 +1 @@
+cpptasks-1.0b5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:21:24 -0000	1.1
+++ sources	29 Aug 2009 03:48:13 -0000	1.2
@@ -0,0 +1 @@
+7f0f7732acd0c82f7efb228f667ec79a  cpptasks-1.0b5.tar.gz



From mycae at fedoraproject.org  Sat Aug 29 03:49:37 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 29 Aug 2009 03:49:37 +0000 (UTC)
Subject: rpms/cpptasks/F-11 cpptasks-README.fedora, NONE, 1.1 cpptasks.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090829034937.35BB611C0078@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32252/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	cpptasks-README.fedora cpptasks.spec import.log 
Log Message:
* Initial commit F-11



--- NEW FILE cpptasks-README.fedora ---
Documentation for the cpptasks project is available at the following URL:

http://ant-contrib.sourceforge.net/cpptasks/




--- NEW FILE cpptasks.spec ---
Name:		cpptasks
Version:	1.0b5
Release:	2%{?dist}
Summary:	Compile and link task for ant

Group:		Development/Libraries

License:	ASL 2.0
URL:		http://ant-contrib.sourceforge.net/
Vendor:		Ant contrib project
Source0:	http://downloads.sourceforge.net/ant-contrib/cpptasks-1.0b5.tar.gz
Source1:	%{name}-README.fedora

BuildRequires:	ant 
BuildRequires:	ant-junit 
BuildRequires:	jpackage-utils 
BuildRequires:	junit
BuildRequires:	maven2

Requires:	ant 
Requires:	java
Requires:	jpackage-utils

BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
	

%description
This ant task can compile various source languages and produce
executables, shared libraries (aka DLL's) and static libraries. Compiler
adaptors are currently available for several C/C++ compilers, FORTRAN,
MIDL and Windows Resource files.

%package        javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name}-%{version}-%{release}
Requires:	jpackage-utils

%description	javadoc
Javadoc documentation for %{summary}.


#The manual for b5 has been moved to xdoc (doxia) format.
# This requires maven, which requires many dependencies which we don't have.
#%package	manual
#Summary:	Docs for %{name}
#Group:		Development/Documentation

#%description	manual
#User manual for %{summary}.

%prep
%setup -q -n %{name}-%{version}

#End of line conversion
%{__sed} -i 's/\r//' NOTICE 

#Check for exisiting jar files
JAR_files=""
for j in $(find -name \*.jar); do
if [ ! -L $j ] ; then
	JAR_files="$JAR_files $j"
	fi
done

if [ ! -z "$JAR_files" ] ; then
	echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
	exit 1
fi

cp -p %{SOURCE1} ./README.fedora

%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=
ant jars javadocs 

#In lieu of maven built docs, which requires clirr
#a URL is supplied in README.fedora
#mvn-jpp site

%install
rm -rf $RPM_BUILD_ROOT


# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant/
install -Dpm 644 target/lib/%{name}.jar \
	$RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar

pushd $RPM_BUILD_ROOT%{_javadir}/ant/
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
popd

# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# manual - 
#install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
#cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

#Place a file into ant's config dir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/
echo "%{name} ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE README.fedora
%{_javadir}/ant/*.jar
%{_sysconfdir}/ant.d/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

#%files manual
#%defattr(-,root,root,-)
#%doc %{_docdir}/%{name}-%{version}

# -----------------------------------------------------------------------------

%changelog
* Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
- Fix doc installation 
- Move to _javadir/ant/ rather than _javadir/
- Fix requires + buildrequires for both main and javadoc packages
- Add README.fedora source in lieu of  maven build 

* Sat Mar 14 2009 D Haley <mycae at yahoo.com> - 1.0b5-1
- Update to b5
- cpptasks now uses difficult mvn-doxia xdoc, so remove manual subpackage
- Add distribution jar check
- EOL conversion on NOTICE
- Change summary & format description
- Fix BuildRoot 
- Change licence to ASL 2.0 from Apache Software Licence 2.0
- Documentation to "Documentation" Group

* Sat Sep 02 2005 Anthony Green <green at redhat.com> - 0:1.0-0.b3.2jpp_1%{?dist}
- Remove "ghost" for javadocs and javadoc postprocessing.
- Place in Development/Libraries, not Development/Libraries/Java.
- Remove epoch references.
- Build into Fedora Extras.

* Mon Sep 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2jpp
- Upgrade to Ant 1.6.X
- Build with ant-1.6.2
- Upgraded to 1.0.b3 and relaxed requirements on Thu Jul 15 2004 
by Ralph Apel <r.apel at r-apel.de> as 0:1.0-0.b3.1jpp

* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.4jpp
- Build with ant-1.6.2
- Relax versioned BuildReq
- Drop junit runtime requirement

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.3jpp
- Also runtime dep to Ant 1.6.X

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-0.b2.2jpp
- Upgrade to Ant 1.6.X

* Wed Mar 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.1jpp
- First JPackage release


--- NEW FILE import.log ---
cpptasks-1_0b5-2_fc10:F-11:cpptasks-1.0b5-2.fc10.src.rpm:1251518117


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:21:23 -0000	1.1
+++ .cvsignore	29 Aug 2009 03:49:37 -0000	1.2
@@ -0,0 +1 @@
+cpptasks-1.0b5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:21:24 -0000	1.1
+++ sources	29 Aug 2009 03:49:37 -0000	1.2
@@ -0,0 +1 @@
+7f0f7732acd0c82f7efb228f667ec79a  cpptasks-1.0b5.tar.gz



From mycae at fedoraproject.org  Sat Aug 29 03:51:51 2009
From: mycae at fedoraproject.org (mycae)
Date: Sat, 29 Aug 2009 03:51:51 +0000 (UTC)
Subject: rpms/cpptasks/EL-5 cpptasks-README.fedora, NONE, 1.1 cpptasks.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090829035151.6419A11C0078@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/cpptasks/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv366/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	cpptasks-README.fedora cpptasks.spec import.log 
Log Message:
*Initial commit EL-5



--- NEW FILE cpptasks-README.fedora ---
Documentation for the cpptasks project is available at the following URL:

http://ant-contrib.sourceforge.net/cpptasks/




--- NEW FILE cpptasks.spec ---
Name:		cpptasks
Version:	1.0b5
Release:	2%{?dist}
Summary:	Compile and link task for ant

Group:		Development/Libraries

License:	ASL 2.0
URL:		http://ant-contrib.sourceforge.net/
Vendor:		Ant contrib project
Source0:	http://downloads.sourceforge.net/ant-contrib/cpptasks-1.0b5.tar.gz
Source1:	%{name}-README.fedora

BuildRequires:	ant 
BuildRequires:	ant-junit 
BuildRequires:	jpackage-utils 
BuildRequires:	junit
BuildRequires:	maven2

Requires:	ant 
Requires:	java
Requires:	jpackage-utils

BuildArch:	noarch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
	

%description
This ant task can compile various source languages and produce
executables, shared libraries (aka DLL's) and static libraries. Compiler
adaptors are currently available for several C/C++ compilers, FORTRAN,
MIDL and Windows Resource files.

%package        javadoc
Summary:	Javadoc for %{name}
Group:		Documentation
Requires:	%{name}-%{version}-%{release}
Requires:	jpackage-utils

%description	javadoc
Javadoc documentation for %{summary}.


#The manual for b5 has been moved to xdoc (doxia) format.
# This requires maven, which requires many dependencies which we don't have.
#%package	manual
#Summary:	Docs for %{name}
#Group:		Development/Documentation

#%description	manual
#User manual for %{summary}.

%prep
%setup -q -n %{name}-%{version}

#End of line conversion
%{__sed} -i 's/\r//' NOTICE 

#Check for exisiting jar files
JAR_files=""
for j in $(find -name \*.jar); do
if [ ! -L $j ] ; then
	JAR_files="$JAR_files $j"
	fi
done

if [ ! -z "$JAR_files" ] ; then
	echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
	exit 1
fi

cp -p %{SOURCE1} ./README.fedora

%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=
ant jars javadocs 

#In lieu of maven built docs, which requires clirr
#a URL is supplied in README.fedora
#mvn-jpp site

%install
rm -rf $RPM_BUILD_ROOT


# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant/
install -Dpm 644 target/lib/%{name}.jar \
	$RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar

pushd $RPM_BUILD_ROOT%{_javadir}/ant/
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
popd

# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# manual - 
#install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
#cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

#Place a file into ant's config dir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/
echo "%{name} ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE NOTICE README.fedora
%{_javadir}/ant/*.jar
%{_sysconfdir}/ant.d/%{name}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

#%files manual
#%defattr(-,root,root,-)
#%doc %{_docdir}/%{name}-%{version}

# -----------------------------------------------------------------------------

%changelog
* Fri Aug 28 2009 D Haley <mycae at yahoo.com> - 1.0b5-2
- Fix doc installation 
- Move to _javadir/ant/ rather than _javadir/
- Fix requires + buildrequires for both main and javadoc packages
- Add README.fedora source in lieu of  maven build 

* Sat Mar 14 2009 D Haley <mycae at yahoo.com> - 1.0b5-1
- Update to b5
- cpptasks now uses difficult mvn-doxia xdoc, so remove manual subpackage
- Add distribution jar check
- EOL conversion on NOTICE
- Change summary & format description
- Fix BuildRoot 
- Change licence to ASL 2.0 from Apache Software Licence 2.0
- Documentation to "Documentation" Group

* Sat Sep 02 2005 Anthony Green <green at redhat.com> - 0:1.0-0.b3.2jpp_1%{?dist}
- Remove "ghost" for javadocs and javadoc postprocessing.
- Place in Development/Libraries, not Development/Libraries/Java.
- Remove epoch references.
- Build into Fedora Extras.

* Mon Sep 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2jpp
- Upgrade to Ant 1.6.X
- Build with ant-1.6.2
- Upgraded to 1.0.b3 and relaxed requirements on Thu Jul 15 2004 
by Ralph Apel <r.apel at r-apel.de> as 0:1.0-0.b3.1jpp

* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.4jpp
- Build with ant-1.6.2
- Relax versioned BuildReq
- Drop junit runtime requirement

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.3jpp
- Also runtime dep to Ant 1.6.X

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-0.b2.2jpp
- Upgrade to Ant 1.6.X

* Wed Mar 24 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.1jpp
- First JPackage release


--- NEW FILE import.log ---
cpptasks-1_0b5-2_fc10:EL-5:cpptasks-1.0b5-2.fc10.src.rpm:1251518258


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:21:23 -0000	1.1
+++ .cvsignore	29 Aug 2009 03:51:51 -0000	1.2
@@ -0,0 +1 @@
+cpptasks-1.0b5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpptasks/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:21:24 -0000	1.1
+++ sources	29 Aug 2009 03:51:51 -0000	1.2
@@ -0,0 +1 @@
+7f0f7732acd0c82f7efb228f667ec79a  cpptasks-1.0b5.tar.gz



From mclasen at fedoraproject.org  Sat Aug 29 04:29:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 04:29:58 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.7,1.8
Message-ID: <20090829042958.C1B4611C009F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27513

Modified Files:
	polkit-gnome.spec 
Log Message:
Add KDE to OnlyShowIn



Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- polkit-gnome.spec	12 Aug 2009 19:26:04 -0000	1.7
+++ polkit-gnome.spec	29 Aug 2009 04:29:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.94
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -52,6 +52,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 desktop-file-install --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                      \
+  --add-only-show-in KDE \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 
 %find_lang polkit-gnome-1
@@ -78,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.94-2
+- Show in KDE, too (#519674)
+
 * Wed Aug 12 2009 David Zeuthen <davidz at redhat.com> - 0.94-1
 - Update to upstream release 0.94
 



From cweyl at fedoraproject.org  Sat Aug 29 04:31:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 29 Aug 2009 04:31:52 +0000 (UTC)
Subject: rpms/perl-App-Cmd/devel .cvsignore, 1.5, 1.6 perl-App-Cmd.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090829043152.1DFBB11C009F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-App-Cmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28040

Modified Files:
	.cvsignore perl-App-Cmd.spec sources 
Log Message:
* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.207-1
- switch filtering to perl_default_filter
- auto-update to 0.207 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Aug 2009 02:12:10 -0000	1.5
+++ .cvsignore	29 Aug 2009 04:31:51 -0000	1.6
@@ -1 +1 @@
-App-Cmd-0.206.tar.gz
+App-Cmd-0.207.tar.gz


Index: perl-App-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/perl-App-Cmd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-App-Cmd.spec	24 Aug 2009 02:12:10 -0000	1.8
+++ perl-App-Cmd.spec	29 Aug 2009 04:31:51 -0000	1.9
@@ -1,5 +1,5 @@
 Name:       perl-App-Cmd
-Version:    0.206
+Version:    0.207
 Release:    1%{?dist}
 # see lib/App/Cmd.pm
 License:    GPL+ or Artistic
@@ -25,6 +25,8 @@ Requires:       perl(Module::Pluggable::
 Requires:       perl(Sub::Exporter) >= 0.975
 Requires:       perl(Sub::Install)
 
+%{?perl_default_filter}
+
 %description
 App::Cmd is intended to make it easy to write complex command-line
 applications without having to think about most of the annoying things
@@ -37,25 +39,6 @@ For information on how to start using Ap
 
 perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 
-# make sure doc/tests don't generate provides
-# note we first filter out the bits in _docdir...
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_provides %{_builddir}/App-Cmd-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
-EOF
-
-%define __perl_requires %{_builddir}/App-Cmd-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -82,6 +65,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.207-1
+- switch filtering to perl_default_filter
+- auto-update to 0.207 (by cpan-spec-update 0.01)
+
 * Sun Aug 23 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.206-1
 - auto-update to 0.206 (by cpan-spec-update 0.01)
 - altered br on perl(Getopt::Long::Descriptive) (0.06 => 0.075)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-App-Cmd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Aug 2009 02:12:10 -0000	1.5
+++ sources	29 Aug 2009 04:31:51 -0000	1.6
@@ -1 +1 @@
-14b921942c7840b63a3fe0335ab69849  App-Cmd-0.206.tar.gz
+4856b13b9c1ffb4ac21fddc0026801e7  App-Cmd-0.207.tar.gz



From mclasen at fedoraproject.org  Sat Aug 29 04:39:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 04:39:01 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec,1.481,1.482
Message-ID: <20090829043901.5A5FF11C009F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29213

Modified Files:
	control-center.spec 
Log Message:
Move related files to -extra, too



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -p -r1.481 -r1.482
--- control-center.spec	27 Aug 2009 21:39:17 -0000	1.481
+++ control-center.spec	29 Aug 2009 04:39:01 -0000	1.482
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -326,9 +326,12 @@ fi
 %doc AUTHORS COPYING NEWS README
 %{_datadir}/gnome-control-center/keybindings/*.xml
 %{_datadir}/gnome-control-center/default-apps/*.xml
-%{_datadir}/gnome-control-center/ui
+%dir %{_datadir}/gnome-control-center/ui
+%{_datadir}/gnome-control-center/ui/*.ui
+%exclude %{_datadir}/gnome-control-center/ui/gnome-window-properties.ui
 %{_datadir}/gnome-control-center/pixmaps
 %{_datadir}/applications/*.desktop
+%exclude %{_datadir}/applications/gnome-window-properties.desktop
 %{_datadir}/desktop-directories/*
 %{_datadir}/mime/packages/gnome-theme-package.xml
 %{_datadir}/icons/hicolor/*/apps/*
@@ -375,8 +378,14 @@ fi
 %files extra
 %defattr(-,root,root)
 %{_bindir}/gnome-window-properties
+%{_datadir}/gnome-control-center/ui/gnome-window-properties.ui
+%{_datadir}/applications/gnome-window-properties.desktop
+
 
 %changelog
+* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-4
+- Move related files to -extra, too
+
 * Thu Aug 27 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-3
 - Fix a crash in the appearance capplet
 



From mtasaka at fedoraproject.org  Sat Aug 29 05:37:10 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 05:37:10 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.35, 1.36 kazehakase.spec, 1.91, 
	1.92 sources, 1.35, 1.36 noautobuild, 1.1, NONE
Message-ID: <20090829053710.481B211C009F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9010

Modified Files:
	.cvsignore kazehakase.spec sources 
Removed Files:
	noautobuild 
Log Message:
* Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
- Update to 0.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	27 Aug 2009 15:16:04 -0000	1.35
+++ .cvsignore	29 Aug 2009 05:37:09 -0000	1.36
@@ -1 +1 @@
-kazehakase-0.5.6-svn3783_trunk.tar.gz
+kazehakase-0.5.7.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kazehakase.spec	27 Aug 2009 15:16:04 -0000	1.91
+++ kazehakase.spec	29 Aug 2009 05:37:09 -0000	1.92
@@ -12,7 +12,7 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%define		usesvn		1
+%undefine		usesvn		
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
@@ -30,11 +30,11 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		33533
+%define		repoid		43338
 %define		svnver		3783_trunk
 
 
-%define		fedorarel	16
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -44,14 +44,14 @@
 
 
 Name:		kazehakase
-Version:	0.5.6
+Version:	0.5.7
 Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
-Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
+Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -175,10 +175,6 @@ This package uses WebKit for HTML render
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 
-# Make build log more verbose
-%{__sed} -i.verb \
-	-e '/SHAVE_INIT/s|\[enable\]|\[disable\]|' configure.ac
-
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
 
@@ -233,7 +229,9 @@ EOF
 %build
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
+# --disable-shave is to make build.log more verbose
 %configure \
+	--disable-shave \
 	--enable-migemo \
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
@@ -319,6 +317,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
+- Update to 0.5.7
+
 * Thu Aug 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 3783
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	27 Aug 2009 15:16:04 -0000	1.35
+++ sources	29 Aug 2009 05:37:10 -0000	1.36
@@ -1 +1 @@
-c92c723729a2484f9e13f7febd101411  kazehakase-0.5.6-svn3783_trunk.tar.gz
+1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz


--- noautobuild DELETED ---



From cweyl at fedoraproject.org  Sat Aug 29 05:41:27 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 29 Aug 2009 05:41:27 +0000 (UTC)
Subject: rpms/perl-local-lib/devel .cvsignore, 1.6, 1.7 perl-local-lib.spec, 
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090829054127.D8DCB11C009F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-local-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9686

Modified Files:
	.cvsignore perl-local-lib.spec sources 
Log Message:
* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004006-1
- auto-update to 1.004006 (by cpan-spec-update 0.01)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Aug 2009 06:26:23 -0000	1.6
+++ .cvsignore	29 Aug 2009 05:41:27 -0000	1.7
@@ -1 +1 @@
-local-lib-1.004005.tar.gz
+local-lib-1.004006.tar.gz


Index: perl-local-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/perl-local-lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-local-lib.spec	25 Aug 2009 06:26:23 -0000	1.6
+++ perl-local-lib.spec	29 Aug 2009 05:41:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:       perl-local-lib
-Version:    1.004005
+Version:    1.004006
 Release:    1%{?dist}
 # lib/local/lib.pm -> GPL+ or Artistic
 License:    GPL+ or Artistic
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004006-1
+- auto-update to 1.004006 (by cpan-spec-update 0.01)
+
 * Tue Aug 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.004005-1
 - auto-update to 1.004005 (by cpan-spec-update 0.01)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-local-lib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 06:26:23 -0000	1.6
+++ sources	29 Aug 2009 05:41:27 -0000	1.7
@@ -1 +1 @@
-80fc0977311592f7937a448c4b6577c5  local-lib-1.004005.tar.gz
+33b14a93fe4325bbb8837cb6b6336b26  local-lib-1.004006.tar.gz



From mtasaka at fedoraproject.org  Sat Aug 29 06:15:51 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 06:15:51 +0000 (UTC)
Subject: rpms/kazehakase/devel kazehakase.spec,1.92,1.93
Message-ID: <20090829061551.A98AF11C009F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19719

Modified Files:
	kazehakase.spec 
Log Message:



Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kazehakase.spec	29 Aug 2009 05:37:09 -0000	1.92
+++ kazehakase.spec	29 Aug 2009 06:15:48 -0000	1.93
@@ -97,8 +97,8 @@ BuildRequires:	gecko-devel %{?Geckover:>
 BuildRequires:	gecko-devel-unstable
 Requires:	gecko-libs %{?Geckover:>= %{Geckover}}
 
-%if %{need_autogen}
 BuildRequires:	intltool
+%if %{need_autogen}
 BuildRequires:	libtool
 BuildRequires:	automake
 %endif



From tgl at fedoraproject.org  Sat Aug 29 06:33:04 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Sat, 29 Aug 2009 06:33:04 +0000 (UTC)
Subject: rpms/mysql/devel mysql-plugin-bug.patch, 1.9, 1.10 mysql.spec, 1.126,
	1.127 mysql-no-check-testcases.patch, 1.1, NONE
Message-ID: <20090829063304.66F4511C009F@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23368

Modified Files:
	mysql-plugin-bug.patch mysql.spec 
Removed Files:
	mysql-no-check-testcases.patch 
Log Message:
Still trying to get mysql to build ...

mysql-plugin-bug.patch:
 disabled.def |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mysql-plugin-bug.patch	3 Aug 2009 02:23:58 -0000	1.9
+++ mysql-plugin-bug.patch	29 Aug 2009 06:33:02 -0000	1.10
@@ -6,14 +6,18 @@ http://bugs.mysql.com/bug.php?id=42144
 
 For the moment, just disable this test.
 
+Also, temporarily disable the "mysql" test --- there's something pretty
+broken there, but I haven't figured out what yet ...
+
 
 diff -Naur mysql-5.1.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def
 --- mysql-5.1.37.orig/mysql-test/t/disabled.def	2009-07-13 19:43:47.000000000 -0400
 +++ mysql-5.1.37/mysql-test/t/disabled.def	2009-08-02 20:43:36.000000000 -0400
-@@ -13,4 +13,5 @@
+@@ -13,4 +13,6 @@
  innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
  init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
 -
 +#
 +plugin_load     : gives wrong answer on PPC64
++mysql           : fails for unclear reasons


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- mysql.spec	21 Aug 2009 14:34:15 -0000	1.126
+++ mysql.spec	29 Aug 2009 06:33:02 -0000	1.127
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.37
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -32,7 +32,6 @@ Patch6: mysql-stack-guard.patch
 Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
-Patch10: mysql-no-check-testcases.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -175,7 +174,6 @@ the MySQL sources.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 libtoolize --force
 aclocal
@@ -642,6 +640,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Aug 29 2009 Tom Lane <tgl at redhat.com> 5.1.37-4
+- Remove one misguided patch; turns out I was chasing a glibc bug
+- Temporarily disable "main.mysql" test; there's something broken there too,
+  but we need to get mysql built in rawhide for dependency reasons
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.1.37-3
 - rebuilt with new openssl
 


--- mysql-no-check-testcases.patch DELETED ---



From cweyl at fedoraproject.org  Sat Aug 29 07:36:29 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 29 Aug 2009 07:36:29 +0000 (UTC)
Subject: rpms/perl-GStreamer/devel .cvsignore, 1.3, 1.4 perl-GStreamer.spec, 
	1.10, 1.11
Message-ID: <20090829073629.F0DB911C009F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-GStreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2454

Modified Files:
	.cvsignore perl-GStreamer.spec 
Log Message:
* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.15-4
- Filter errant private provides



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GStreamer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Mar 2009 04:39:00 -0000	1.3
+++ .cvsignore	29 Aug 2009 07:36:27 -0000	1.4
@@ -1,9 +1 @@
 GStreamer-0.15.tar.gz
-GStreamer-*
-*.rpm
-*.gz
-*.tar
-clog
-.build*
-x86_64
-i386


Index: perl-GStreamer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GStreamer/devel/perl-GStreamer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-GStreamer.spec	30 Jul 2009 16:15:16 -0000	1.10
+++ perl-GStreamer.spec	29 Aug 2009 07:36:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-GStreamer
 Version:        0.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl bindings to the GStreamer framework
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -22,6 +22,8 @@ BuildRequires:  perl(Glib::MakeHelper)
 # test
 BuildRequires:  perl(Test::More)
 
+%{?perl_default_filter}
+
 %description
 GStreamer makes everybody dance like crazy.  It provides the means to play,
 stream, and convert nearly any type of media -- be it audio or video.
@@ -69,6 +71,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 29 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.15-4
+- Filter errant private provides
+
 * Thu Jul 30 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.15-3
 - Fix mass rebuild breakdown: Add BR: perl(Glib::MakeHelper).
 



From bojan at fedoraproject.org  Sat Aug 29 08:39:47 2009
From: bojan at fedoraproject.org (bojan)
Date: Sat, 29 Aug 2009 08:39:47 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.29,1.30
Message-ID: <20090829083947.4D0E711C009F@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13706

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/devel/subversion-api-docs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- subversion-api-docs.spec	11 Aug 2009 03:45:38 -0000	1.29
+++ subversion-api-docs.spec	29 Aug 2009 08:39:45 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           subversion-api-docs
-Version:        1.6.4
+Version:        1.6.5
 Release:        1%{?dist}
 Summary:        Subversion API documentation
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sat Aug 29 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-1
+- bump up to 1.6.5
+
 * Tue Aug 11 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-1
 - bump up to 1.6.4
 



From iarnell at fedoraproject.org  Sat Aug 29 09:30:59 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 29 Aug 2009 09:30:59 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.6,
	1.7 perl-DateTime-Format-Natural.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090829093059.E370611C009F@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-serv22496

Modified Files:
	.cvsignore perl-DateTime-Format-Natural.spec sources 
Log Message:
* Sat Aug 29 2009 Iain Arnell <iarnell at gmail.com> 0.78-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	21 Jun 2009 07:36:21 -0000	1.6
+++ .cvsignore	29 Aug 2009 09:30:59 -0000	1.7
@@ -1 +1 @@
-DateTime-Format-Natural-0.77.tar.gz
+DateTime-Format-Natural-0.78.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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-DateTime-Format-Natural.spec	26 Jul 2009 05:38:02 -0000	1.7
+++ perl-DateTime-Format-Natural.spec	29 Aug 2009 09:30:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Format-Natural
-Version:        0.77
-Release:        2%{?dist}
+Version:        0.78
+Release:        1%{?dist}
 Summary:        Create machine readable date/time with natural parsing logic
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 29 2009 Iain Arnell <iarnell at gmail.com> 0.78-1
+- update to latest upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.77-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jun 2009 07:36:21 -0000	1.6
+++ sources	29 Aug 2009 09:30:59 -0000	1.7
@@ -1 +1 @@
-38b8e8dce0c36b783e9843b5a1f15405  DateTime-Format-Natural-0.77.tar.gz
+67b88a73252aa7574952618d7f548638  DateTime-Format-Natural-0.78.tar.gz



From bojan at fedoraproject.org  Sat Aug 29 09:32:45 2009
From: bojan at fedoraproject.org (bojan)
Date: Sat, 29 Aug 2009 09:32:45 +0000 (UTC)
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.30,1.31
Message-ID: <20090829093245.A41AD11C009F@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22909

Modified Files:
	subversion-api-docs.spec 
Log Message:
Attempt to fix docs install.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- subversion-api-docs.spec	29 Aug 2009 08:39:45 -0000	1.30
+++ subversion-api-docs.spec	29 Aug 2009 09:32:45 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
 Version:        1.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -35,8 +35,9 @@ doxygen -
 %install
 cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs 
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 install -m 644 docs/svn.tag $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
+rm -rf docs/html/search
 install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
 
@@ -51,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sat Aug 29 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-2
+- attempt to fix docs install
+
 * Sat Aug 29 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-1
 - bump up to 1.6.5
 



From sharkcz at fedoraproject.org  Sat Aug 29 09:38:10 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 29 Aug 2009 09:38:10 +0000 (UTC)
Subject: rpms/zabbix/devel .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 zabbix.spec, 1.45, 1.46
Message-ID: <20090829093810.A6DEE11C009F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23811

Modified Files:
	.cvsignore sources zabbix.spec 
Log Message:
* Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
- Update to 1.6.6
- Upstream changelog: http://www.zabbix.com/rn1.6.6.php



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Jun 2009 15:04:40 -0000	1.17
+++ .cvsignore	29 Aug 2009 09:38:10 -0000	1.18
@@ -1 +1 @@
-zabbix-1.6.5.tar.gz
+zabbix-1.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Jun 2009 15:04:40 -0000	1.18
+++ sources	29 Aug 2009 09:38:10 -0000	1.19
@@ -1 +1 @@
-d8c3dababcfc0bbcf737a2b13cca337c  zabbix-1.6.5.tar.gz
+52779160e71c12d47b97f7336e25c395  zabbix-1.6.6.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- zabbix.spec	21 Aug 2009 16:38:03 -0000	1.45
+++ zabbix.spec	29 Aug 2009 09:38:10 -0000	1.46
@@ -6,8 +6,8 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.5
-Release:        3%{?dist}
+Version:        1.6.6
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -549,6 +549,10 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
+- Update to 1.6.6
+- Upstream changelog: http://www.zabbix.com/rn1.6.6.php
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.5-3
 - rebuilt with new openssl
 



From iarnell at fedoraproject.org  Sat Aug 29 09:40:47 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 29 Aug 2009 09:40:47 +0000 (UTC)
Subject: rpms/perl-HTML-Defang/devel .cvsignore, 1.2,
	1.3 perl-HTML-Defang.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090829094047.BF03D11C009F@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-HTML-Defang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24311

Modified Files:
	.cvsignore perl-HTML-Defang.spec sources 
Log Message:
* Sat Aug 29 2009 Iain Arnell <iarnell at gmail.com> 1.02-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Defang/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 May 2009 03:05:26 -0000	1.2
+++ .cvsignore	29 Aug 2009 09:40:46 -0000	1.3
@@ -1 +1 @@
-HTML-Defang-1.01.tar.gz
+HTML-Defang-1.02.tar.gz


Index: perl-HTML-Defang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Defang/devel/perl-HTML-Defang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-HTML-Defang.spec	26 Jul 2009 06:23:55 -0000	1.2
+++ perl-HTML-Defang.spec	29 Aug 2009 09:40:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Defang
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        Cleans HTML and CSS of executable contents
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Aug 29 2009 Iain Arnell <iarnell at gmail.com> 1.02-1
+- update to latest upstream version
+
 * 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-HTML-Defang/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 May 2009 03:05:26 -0000	1.2
+++ sources	29 Aug 2009 09:40:47 -0000	1.3
@@ -1 +1 @@
-f8c2540c7fe33a26f4a79b8cc1ef3846  HTML-Defang-1.01.tar.gz
+c49e61f3491dc529b6e62ec699562685  HTML-Defang-1.02.tar.gz



From sharkcz at fedoraproject.org  Sat Aug 29 09:57:34 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 29 Aug 2009 09:57:34 +0000 (UTC)
Subject: rpms/zabbix/F-11 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 zabbix-agent.init, 1.4, 1.5 zabbix.spec, 1.39, 1.40
Message-ID: <20090829095734.1AA9711C009F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27473

Modified Files:
	.cvsignore sources zabbix-agent.init zabbix.spec 
Log Message:
* Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
- Update to 1.6.6
- Upstream changelog: http://www.zabbix.com/rn1.6.6.php
- Update agent's initscript to match the one in 1.6.4-4.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Jun 2009 15:31:48 -0000	1.17
+++ .cvsignore	29 Aug 2009 09:57:33 -0000	1.18
@@ -1 +1 @@
-zabbix-1.6.5.tar.gz
+zabbix-1.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Jun 2009 15:31:48 -0000	1.18
+++ sources	29 Aug 2009 09:57:33 -0000	1.19
@@ -1 +1 @@
-d8c3dababcfc0bbcf737a2b13cca337c  zabbix-1.6.5.tar.gz
+52779160e71c12d47b97f7336e25c395  zabbix-1.6.6.tar.gz


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/zabbix-agent.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zabbix-agent.init	18 May 2009 12:10:28 -0000	1.4
+++ zabbix-agent.init	29 Aug 2009 09:57:33 -0000	1.5
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: - 85 15
+# chkconfig: - 86 14
 # description: ZABBIX agent daemon
 # processname: zabbix_agentd
 # config: /etc/zabbix/zabbix_agentd.conf
@@ -10,6 +10,8 @@
 # Provides: zabbix-agent
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
+# Should-Start: zabbix zabbix-proxy
+# Should-Stop: zabbix zabbix-proxy
 # Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Start and stop ZABBIX agent


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-11/zabbix.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- zabbix.spec	16 Jun 2009 15:25:38 -0000	1.39
+++ zabbix.spec	29 Aug 2009 09:57:33 -0000	1.40
@@ -6,7 +6,7 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.5
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -549,6 +549,11 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
+- Update to 1.6.6
+- Upstream changelog: http://www.zabbix.com/rn1.6.6.php
+- Update agent's initscript to match the one in 1.6.4-4.fc12
+
 * Mon Jun  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.5-1
 - Update to 1.6.5, see http://sourceforge.net/mailarchive/message.php?msg_name=4A37A2CA.8050503%40zabbix.com for the full release notes.
 - 



From sharkcz at fedoraproject.org  Sat Aug 29 09:58:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 29 Aug 2009 09:58:36 +0000 (UTC)
Subject: rpms/zabbix/F-10 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 zabbix-agent.init, 1.4, 1.5 zabbix.spec, 1.32, 1.33
Message-ID: <20090829095836.EE90E11C009F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/zabbix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27749

Modified Files:
	.cvsignore sources zabbix-agent.init zabbix.spec 
Log Message:
* Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
- Update to 1.6.6
- Upstream changelog: http://www.zabbix.com/rn1.6.6.php
- Update agent's initscript to match the one in 1.6.4-4.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Jun 2009 19:57:33 -0000	1.17
+++ .cvsignore	29 Aug 2009 09:58:36 -0000	1.18
@@ -1 +1 @@
-zabbix-1.6.5.tar.gz
+zabbix-1.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	16 Jun 2009 19:57:34 -0000	1.18
+++ sources	29 Aug 2009 09:58:36 -0000	1.19
@@ -1 +1 @@
-d8c3dababcfc0bbcf737a2b13cca337c  zabbix-1.6.5.tar.gz
+52779160e71c12d47b97f7336e25c395  zabbix-1.6.6.tar.gz


Index: zabbix-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/zabbix-agent.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zabbix-agent.init	18 May 2009 12:33:04 -0000	1.4
+++ zabbix-agent.init	29 Aug 2009 09:58:36 -0000	1.5
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: - 85 15
+# chkconfig: - 86 14
 # description: ZABBIX agent daemon
 # processname: zabbix_agentd
 # config: /etc/zabbix/zabbix_agentd.conf
@@ -10,6 +10,8 @@
 # Provides: zabbix-agent
 # Required-Start: $local_fs $network
 # Required-Stop: $local_fs $network
+# Should-Start: zabbix zabbix-proxy
+# Should-Stop: zabbix zabbix-proxy
 # Default-Start:
 # Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Start and stop ZABBIX agent


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/zabbix.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- zabbix.spec	16 Jun 2009 19:57:34 -0000	1.32
+++ zabbix.spec	29 Aug 2009 09:58:36 -0000	1.33
@@ -6,7 +6,7 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.6.5
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -549,6 +549,11 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Dan Hor?k <dan[at]danny.cz> - 1.6.6-1
+- Update to 1.6.6
+- Upstream changelog: http://www.zabbix.com/rn1.6.6.php
+- Update agent's initscript to match the one in 1.6.4-4.fc12
+
 * Mon Jun  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.5-1
 - Update to 1.6.5, see http://sourceforge.net/mailarchive/message.php?msg_name=4A37A2CA.8050503%40zabbix.com for the full release notes.
 - 



From mnowak at fedoraproject.org  Sat Aug 29 10:22:07 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 29 Aug 2009 10:22:07 +0000 (UTC)
Subject: rpms/xcb-util/devel .cvsignore, 1.6, 1.7 import.log, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090829102207.740A411C009F@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/xcb-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31315/devel

Modified Files:
	.cvsignore import.log sources 
Log Message:
0.3.6 with sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Jul 2009 19:25:10 -0000	1.6
+++ .cvsignore	29 Aug 2009 10:22:07 -0000	1.7
@@ -1 +1 @@
-xcb-util-0.3.5.tar.bz2
+xcb-util-0.3.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	11 May 2009 11:11:02 -0000	1.5
+++ import.log	29 Aug 2009 10:22:07 -0000	1.6
@@ -3,3 +3,4 @@ xcb-util-0_3_2-1_fc10:HEAD:xcb-util-0.3.
 xcb-util-0_3_2-2_fc10:HEAD:xcb-util-0.3.2-2.fc10.src.rpm:1229687450
 xcb-util-0_3_3-1_fc10:HEAD:xcb-util-0.3.3-1.fc10.src.rpm:1235375721
 xcb-util-0_3_4-1_fc11:HEAD:xcb-util-0.3.4-1.fc11.src.rpm:1242040213
+xcb-util-0_3_6-1_fc12:HEAD:xcb-util-0.3.6-1.fc12.src.rpm:1251541066


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Jul 2009 19:25:10 -0000	1.6
+++ sources	29 Aug 2009 10:22:07 -0000	1.7
@@ -1 +1 @@
-13649baa059dcea7779d2b9ff3843888  xcb-util-0.3.5.tar.bz2
+dd8968b8ee613cb027a8ef1fcbdc8fc9  xcb-util-0.3.6.tar.bz2



From uwog at fedoraproject.org  Sat Aug 29 10:27:36 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sat, 29 Aug 2009 10:27:36 +0000 (UTC)
Subject: rpms/abiword/devel .cvsignore, 1.30, 1.31 abiword.spec, 1.94,
	1.95 sources, 1.30, 1.31
Message-ID: <20090829102736.2127A11C009F@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv547

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	23 Aug 2009 21:40:45 -0000	1.30
+++ .cvsignore	29 Aug 2009 10:27:35 -0000	1.31
@@ -1,2 +1,2 @@
-abiword-2.7.9.tar.gz
-abiword-docs-2.7.9.tar.gz
+abiword-2.7.10.tar.gz
+abiword-docs-2.7.10.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- abiword.spec	24 Aug 2009 20:49:20 -0000	1.94
+++ abiword.spec	29 Aug 2009 10:27:35 -0000	1.95
@@ -1,13 +1,13 @@
 %define majorversion 2
 %define minorversion 7
-%define microversion 9
+%define microversion 10
 
 %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+
@@ -179,6 +179,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sat Aug 29 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.10-1
+- New upstream release
+
 * Mon Aug 24 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.9-2
 - Make abiword depend on libabiword
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	23 Aug 2009 21:40:45 -0000	1.30
+++ sources	29 Aug 2009 10:27:35 -0000	1.31
@@ -1,2 +1,2 @@
-fe9f6b173b866d98686ac3e8a1d23096  abiword-2.7.9.tar.gz
-c2474fcb5cf1b8c0a72ce080ea18b963  abiword-docs-2.7.9.tar.gz
+d6d38074caaee3e92ac5e7fa0e357b51  abiword-2.7.10.tar.gz
+4474020698070433e2f97fddbbdf7dd1  abiword-docs-2.7.10.tar.gz



From mtasaka at fedoraproject.org  Sat Aug 29 11:28:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 11:28:13 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase-0.5.7-gtk0218.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 kazehakase.spec, 1.85, 1.86 sources,
	1.29, 1.30
Message-ID: <20090829112813.23C5C11C009F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11951

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-gtk0218.patch 
Log Message:
* Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
- Update to 0.5.7


kazehakase-0.5.7-gtk0218.patch:
 kz-entry.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kazehakase-0.5.7-gtk0218.patch ---
Index: src/widget/kz-entry.c
===================================================================
--- src/widget/kz-entry.c	(revision 3779)
+++ src/widget/kz-entry.c	(revision 3780)
@@ -514,7 +514,7 @@
       
 		if (entry->visible)
 		{
-			g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+			g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
 			g_string_insert (tmp_string, cursor_index, preedit_string);
 		}
 		else
@@ -523,7 +523,7 @@
 			gint preedit_len_chars;
 			gunichar invisible_char;
           
-			ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+			ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
 			preedit_len_chars = g_utf8_strlen (preedit_string, -1);
 			ch_len += preedit_len_chars;
 
@@ -557,7 +557,7 @@
 	{
 		if (entry->visible)
 		{
-		pango_layout_set_text (layout, entry->text, entry->n_bytes);
+		pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
 		}
 		else
 		{


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	21 Apr 2009 17:55:39 -0000	1.29
+++ .cvsignore	29 Aug 2009 11:28:12 -0000	1.30
@@ -1 +1 @@
-kazehakase-0.5.6-svn3771_trunk.tar.gz
+kazehakase-0.5.7.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- kazehakase.spec	3 Aug 2009 23:04:39 -0000	1.85
+++ kazehakase.spec	29 Aug 2009 11:28:12 -0000	1.86
@@ -12,7 +12,7 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%define		usesvn		1
+%undefine		usesvn		
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
@@ -30,11 +30,11 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		33533
-%define		svnver		3771_trunk
+%define		repoid		43338
+%define		svnver		3783_trunk
 
 
-%define		fedorarel	11
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -44,16 +44,19 @@
 
 
 Name:		kazehakase
-Version:	0.5.6
-Release:	%{_release}%{?dist}.4
+Version:	0.5.7
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
-Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
+Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
+%if 0%{?fedora} <= 11
+Patch15:	kazehakase-0.5.7-gtk0218.patch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -97,8 +100,8 @@ BuildRequires:	gecko-devel %{?Geckover:>
 BuildRequires:	gecko-devel-unstable
 Requires:	gecko-libs %{?Geckover:>= %{Geckover}}
 
-%if %{need_autogen}
 BuildRequires:	intltool
+%if %{need_autogen}
 BuildRequires:	libtool
 BuildRequires:	automake
 %endif
@@ -175,12 +178,12 @@ This package uses WebKit for HTML render
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 
-# Make build log more verbose
-%{__sed} -i.verb \
-	-e '/SHAVE_INIT/s|\[enable\]|\[disable\]|' configure.ac
-
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
+%if 0%{?fedora} <= 11
+# Reverse!!
+%patch15 -p0 -b .gtk -R
+%endif
 
 %if %{need_autogen}
 sh autogen.sh
@@ -233,7 +236,9 @@ EOF
 %build
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
+# --disable-shave is to make build.log more verbose
 %configure \
+	--disable-shave \
 	--enable-migemo \
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
@@ -319,6 +324,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
+- Update to 0.5.7
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.4
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	21 Apr 2009 17:55:39 -0000	1.29
+++ sources	29 Aug 2009 11:28:12 -0000	1.30
@@ -1 +1 @@
-3360e94049f0ea43860c458b84746f01  kazehakase-0.5.6-svn3771_trunk.tar.gz
+1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz



From rdieter at fedoraproject.org  Sat Aug 29 11:30:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 29 Aug 2009 11:30:14 +0000 (UTC)
Subject: rpms/akonadi/devel akonadi.spec,1.44,1.45
Message-ID: <20090829113014.1FAA611C0496@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12292

Modified Files:
	akonadi.spec 
Log Message:
no qt-mysql either



Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- akonadi.spec	28 Aug 2009 19:33:24 -0000	1.44
+++ akonadi.spec	29 Aug 2009 11:30:13 -0000	1.45
@@ -29,7 +29,7 @@ BuildRequires: soprano-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
-Requires: qt4-mysql
+#Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
 #Requires: mysql-server
 Requires(postun): /sbin/ldconfig



From rdieter at fedoraproject.org  Sat Aug 29 11:31:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 29 Aug 2009 11:31:10 +0000 (UTC)
Subject: rpms/akonadi/devel akonadi.spec,1.45,1.46
Message-ID: <20090829113110.3832911C009F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12477

Modified Files:
	akonadi.spec 
Log Message:
Release++



Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- akonadi.spec	29 Aug 2009 11:30:13 -0000	1.45
+++ akonadi.spec	29 Aug 2009 11:31:10 -0000	1.46
@@ -2,7 +2,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.2.0
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -119,7 +119,7 @@ fi
 
 
 %changelog
-* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.1
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2.2
 - temporarily drop mysql-related bits, to workaround broken rawhide deps
 
 * Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 1.2.0-2



From epienbro at fedoraproject.org  Sat Aug 29 11:55:11 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 11:55:11 +0000 (UTC)
Subject: rpms/mingw32-glib2/F-11 .cvsignore, 1.5, 1.6 mingw32-glib2.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090829115511.4209411C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16720

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.20.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 23:12:45 -0000	1.5
+++ .cvsignore	29 Aug 2009 11:55:11 -0000	1.6
@@ -1 +1 @@
-glib-2.20.4.tar.bz2
+glib-2.20.5.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-11/mingw32-glib2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-glib2.spec	12 Aug 2009 23:12:45 -0000	1.7
+++ mingw32-glib2.spec	29 Aug 2009 11:55:11 -0000	1.8
@@ -5,7 +5,7 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-glib2
-Version:        2.20.4
+Version:        2.20.5
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.20.5-1
+- Update to 2.20.5
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.20.4-1
 - Update to 2.20.4
 - Use %%global instead of %%define


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 23:12:45 -0000	1.5
+++ sources	29 Aug 2009 11:55:11 -0000	1.6
@@ -1 +1 @@
-346916673c0eab72191cf44b4afe535f  glib-2.20.4.tar.bz2
+4c178b91d82ef80a2da3c26b772569c0  glib-2.20.5.tar.bz2



From mtasaka at fedoraproject.org  Sat Aug 29 12:52:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 12:52:23 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria.spec,1.40,1.41
Message-ID: <20090829125223.1016D11C009F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30521

Modified Files:
	alexandria.spec 
Log Message:
patch accepted by upstream


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- alexandria.spec	28 Aug 2009 19:57:58 -0000	1.40
+++ alexandria.spec	29 Aug 2009 12:52:22 -0000	1.41
@@ -34,7 +34,7 @@ Patch4:		alexandria-0.6.5-search-result-
 Patch5:		alexandria-0.6.5-deastore-author-missing.patch
 # Alexandria crashes in tr_TR.UTF-8 on startup
 # RH bug 520170
-# Must report upstream
+# alexandria-Bugs-27015, applied in rev 1088
 Patch6:		alexandria-0.6.5-crash-in-turkish.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From caolanm at fedoraproject.org  Sat Aug 29 13:57:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 29 Aug 2009 13:57:25 +0000 (UTC)
Subject: rpms/gdm/devel gdm.spec,1.484,1.485
Message-ID: <20090829135725.A345B11C009F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16391

Modified Files:
	gdm.spec 
Log Message:
rebuild with new audit


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -p -r1.484 -r1.485
--- gdm.spec	24 Aug 2009 22:01:12 -0000	1.484
+++ gdm.spec	29 Aug 2009 13:57:24 -0000	1.485
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -392,6 +392,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> 1:2.27.90-2
+- rebuild with new audit
+
 * Mon Aug 24 2009 Ray Strode <rstrode at redhat.com> 1:2.27.90-1
 - update to 2.27.90
 



From kwizart at fedoraproject.org  Sat Aug 29 13:59:59 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sat, 29 Aug 2009 13:59:59 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla-3.2.7-bp_check_ipaddress.patch, 1.1, 
	NONE
Message-ID: <20090829135959.C191211C009F@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17138

Removed Files:
	filezilla-3.2.7-bp_check_ipaddress.patch 
Log Message:
Remove old patch



--- filezilla-3.2.7-bp_check_ipaddress.patch DELETED ---



From kwizart at fedoraproject.org  Sat Aug 29 14:04:01 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sat, 29 Aug 2009 14:04:01 +0000 (UTC)
Subject: rpms/filezilla/devel .cvsignore, 1.39, 1.40 sources, 1.43,
	1.44 filezilla.spec, 1.49, 1.50
Message-ID: <20090829140401.3DF1B11C009F@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18695

Modified Files:
	.cvsignore sources filezilla.spec 
Log Message:
Update to 3.2.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	20 Aug 2009 12:42:59 -0000	1.39
+++ .cvsignore	29 Aug 2009 14:04:00 -0000	1.40
@@ -1 +1 @@
-FileZilla_3.2.7_src.tar.bz2
+FileZilla_3.2.7.1_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	20 Aug 2009 12:42:59 -0000	1.43
+++ sources	29 Aug 2009 14:04:01 -0000	1.44
@@ -1 +1 @@
-fcbcb291ec6f4dd821670a4498b5ad35  FileZilla_3.2.7_src.tar.bz2
+b65a626e2c5854a6061d4e577614231b  FileZilla_3.2.7.1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- filezilla.spec	20 Aug 2009 13:27:47 -0000	1.49
+++ filezilla.spec	29 Aug 2009 14:04:01 -0000	1.50
@@ -1,15 +1,14 @@
 #global fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.7
-Release:        2%{?fz_rc:_%{?fz_rc}}%{?dist}
+Version:        3.2.7.1
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://filezilla-project.org/
 Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}%{?fz_rc:-%{?fz_rc}}_src.tar.bz2
-Patch0:         filezilla-3.2.7-bp_check_ipaddress.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Needed if autogen.sh is invoked
@@ -44,7 +43,6 @@ FileZilla is a FTP, FTPS and SFTP client
 
 %prep
 %setup -q -n %{name}-%{version}%{?fz_rc:-%{?fz_rc}}
-%patch0 -p2 -b bp
 
 # Run autotools if needed
 # sh autoconf
@@ -121,6 +119,9 @@ fi || :
 
 
 %changelog
+* Sat Aug 29 2009 kwizart < kwizart at gmail.com > - 3.2.7.1-1
+- Update to 3.2.7.1
+
 * Thu Aug 20 2009 kwizart < kwizart at gmail.com > - 3.2.7-2
 - Update to 3.2.7
 - Backport Fix for ipaddress.cpp at make check



From leigh123linux at fedoraproject.org  Sat Aug 29 14:05:13 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 14:05:13 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.11, 1.12 qbittorrent.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20090829140513.B71FA11C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19062

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-1
- update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Aug 2009 12:15:30 -0000	1.11
+++ .cvsignore	29 Aug 2009 14:05:13 -0000	1.12
@@ -1 +1 @@
-qbittorrent-1.4.0rc2.tar.gz
+qbittorrent-1.4.1.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- qbittorrent.spec	21 Aug 2009 15:36:39 -0000	1.27
+++ qbittorrent.spec	29 Aug 2009 14:05:13 -0000	1.28
@@ -2,15 +2,15 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.4.0
-Release: 0.10.rc2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
-Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}rc2.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-1
+- update to 1.4.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.0-0.10.rc2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Aug 2009 12:15:30 -0000	1.11
+++ sources	29 Aug 2009 14:05:13 -0000	1.12
@@ -1 +1 @@
-1a334937282ba95d78a4ab32c5f519d7  qbittorrent-1.4.0rc2.tar.gz
+48fa15b7326e9de81642f2e1e77cfbf1  qbittorrent-1.4.1.tar.gz



From leigh123linux at fedoraproject.org  Sat Aug 29 14:06:57 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 14:06:57 +0000 (UTC)
Subject: rpms/qbittorrent/F-11 .cvsignore, 1.6, 1.7 qbittorrent.spec, 1.15, 
	1.16 sources, 1.6, 1.7
Message-ID: <20090829140657.D223B11C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19473

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-1
- update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Jul 2009 18:21:32 -0000	1.6
+++ .cvsignore	29 Aug 2009 14:06:57 -0000	1.7
@@ -1 +1 @@
-qbittorrent-1.3.5.tar.gz
+qbittorrent-1.4.1.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/qbittorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qbittorrent.spec	25 Jul 2009 18:21:33 -0000	1.15
+++ qbittorrent.spec	29 Aug 2009 14:06:57 -0000	1.16
@@ -1,6 +1,6 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.3.5
+Version: 1.4.1
 Release: 1%{dist}
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
@@ -66,6 +66,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-1
+- update to 1.4.1
+
 * Sat Jul 25 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.3.5-1
 - update to version 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Jul 2009 18:21:33 -0000	1.6
+++ sources	29 Aug 2009 14:06:57 -0000	1.7
@@ -1 +1 @@
-c4f1b208f9c0a3f55aa0237bf6348d8d  qbittorrent-1.3.5.tar.gz
+48fa15b7326e9de81642f2e1e77cfbf1  qbittorrent-1.4.1.tar.gz



From caolanm at fedoraproject.org  Sat Aug 29 14:16:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 29 Aug 2009 14:16:32 +0000 (UTC)
Subject: rpms/tsclient/devel tsclient-libgnomeui.patch, 1.1,
	1.2 tsclient.spec, 1.45, 1.46
Message-ID: <20090829141632.9763B11C009F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/tsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22031

Modified Files:
	tsclient-libgnomeui.patch tsclient.spec 
Log Message:
Rebuild for dependencies

tsclient-libgnomeui.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: tsclient-libgnomeui.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/tsclient-libgnomeui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tsclient-libgnomeui.patch	13 Nov 2008 19:08:00 -0000	1.1
+++ tsclient-libgnomeui.patch	29 Aug 2009 14:16:32 -0000	1.2
@@ -6,7 +6,7 @@ diff -up tsclient-2.0.1/configure.ac.lib
  ### get cflags and libs
  
 -PKG_CHECK_MODULES(TSC, glib-2.0 gmodule-2.0 gobject-2.0 gtk+-2.0 libglade-2.0 libgnome-2.0 gnome-desktop-2.0 gnome-vfs-2.0 libnotify gconf-2.0 libnm_glib)
-+PKG_CHECK_MODULES(TSC, glib-2.0 gmodule-2.0 gobject-2.0 gtk+-2.0 libglade-2.0 libgnome-2.0 gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 libnotify gconf-2.0 libnm_glib)
++PKG_CHECK_MODULES(TSC, glib-2.0 gmodule-2.0 gobject-2.0 gtk+-2.0 libglade-2.0 libgnome-2.0 gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 libnotify gconf-2.0 libnm-glib)
  TSC_CFLAGS="-Wall $TSC_CFLAGS"
  
  ### Internationalization support


Index: tsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- tsclient.spec	27 Jul 2009 06:19:22 -0000	1.45
+++ tsclient.spec	29 Aug 2009 14:16:32 -0000	1.46
@@ -8,7 +8,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 2.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://sourceforge.net/projects/tsclient
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> - 2.0.2-5
+- Rebuild for dependencies
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caolanm at fedoraproject.org  Sat Aug 29 14:17:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 29 Aug 2009 14:17:33 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.252,1.253
Message-ID: <20090829141733.EAA6C11C009F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22308

Modified Files:
	totem.spec 
Log Message:
really rebuilt with new openssl


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- totem.spec	27 Aug 2009 08:12:15 -0000	1.252
+++ totem.spec	29 Aug 2009 14:17:33 -0000	1.253
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -381,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> - 2.27.2-8
+- rebuilt with new openssl
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-7
 - rebuilt with new openssl
 



From jcollie at fedoraproject.org  Sat Aug 29 14:19:27 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat, 29 Aug 2009 14:19:27 +0000 (UTC)
Subject: rpms/gnonlin/devel .cvsignore, 1.16, 1.17 gnonlin.spec, 1.28,
	1.29 sources, 1.16, 1.17
Message-ID: <20090829141927.9757411C009F@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22804

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.2-0.1
- Update to prerelease for 0.10.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Aug 2009 01:46:22 -0000	1.16
+++ .cvsignore	29 Aug 2009 14:19:27 -0000	1.17
@@ -1 +1 @@
-gnonlin-0.10.12.tar.bz2
+gnonlin-0.10.12.2.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- gnonlin.spec	12 Aug 2009 01:46:22 -0000	1.28
+++ gnonlin.spec	29 Aug 2009 14:19:27 -0000	1.29
@@ -2,14 +2,14 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.12
-Release:        1%{?dist}
+Version:        0.10.12.2
+Release:        0.1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gnonlin.sourceforge.net/
-Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= %{gst_req}
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.2-0.1
+- Update to prerelease for 0.10.13
+
 * Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12-1
 - Update to 0.10.12 "Lots of people on the clothesline"
 -


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Aug 2009 01:46:22 -0000	1.16
+++ sources	29 Aug 2009 14:19:27 -0000	1.17
@@ -1 +1 @@
-4d9ec131333362535c956a73b6693c57  gnonlin-0.10.12.tar.bz2
+ac2fc4be5cc1bfdd303ea1400301df86  gnonlin-0.10.12.2.tar.bz2



From leigh123linux at fedoraproject.org  Sat Aug 29 14:27:39 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 14:27:39 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec, 1.28,
	1.29 qbittorrent_flag.patch, 1.2, 1.3
Message-ID: <20090829142739.CA10D11C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25705

Modified Files:
	qbittorrent.spec qbittorrent_flag.patch 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-2
- redo qbittorrent_flag patch



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- qbittorrent.spec	29 Aug 2009 14:05:13 -0000	1.28
+++ qbittorrent.spec	29 Aug 2009 14:27:38 -0000	1.29
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.1
-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
@@ -30,7 +30,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q -n %{name}-%{version}rc2
+%setup -q 
 %patch0 -p1 -b .qbittorrent_flag
 
 %build
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-2
+- redo qbittorrent_flag patch
+
 * Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-1
 - update to 1.4.1
 

qbittorrent_flag.patch:
 icons.qrc |   28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

Index: qbittorrent_flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent_flag.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qbittorrent_flag.patch	25 Apr 2009 19:02:00 -0000	1.2
+++ qbittorrent_flag.patch	29 Aug 2009 14:27:38 -0000	1.3
@@ -1,6 +1,6 @@
 --- qbittorrent-1.3.3/src/icons.qrc.old 
-+++ qbittorrent-1.3.3/src/icons.qrc 
-@@ -15,33 +15,6 @@
++++ qbittorrent-1.3.3/src/icons.qrc  
+@@ -14,33 +14,6 @@
    <file>Icons/sphere2.png</file>
    <file>Icons/uparrow.png</file>
    <file>Icons/url.png</file>
@@ -34,3 +34,8 @@
    <file>Icons/oxygen/browse.png</file>
    <file>Icons/oxygen/bt_settings.png</file>
    <file>Icons/oxygen/bug.png</file>
+@@ -104,3 +77,4 @@
+   <file>Icons/skin/url.png</file>
+ </qresource>
+ </RCC>
++



From epienbro at fedoraproject.org  Sat Aug 29 14:35:44 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 14:35:44 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec,1.27,1.28
Message-ID: <20090829143544.40A6E11C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28014

Modified Files:
	mingw32-filesystem.spec 
Log Message:
* Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 54-1
- Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script
  which calls pkg-config with the right environment variables set (BZ #513825)



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mingw32-filesystem.spec	23 Aug 2009 18:50:36 -0000	1.27
+++ mingw32-filesystem.spec	29 Aug 2009 14:35:44 -0000	1.28
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        53
+Version:        54
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -86,7 +86,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROO
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
-for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake; do
+for i in mingw32-configure mingw32-make mingw32-pkg-config %{_mingw32_target}-pkg-config mingw32-cmake; do
   ln -s %{_libexecdir}/mingw32-scripts $i
 done
 popd
@@ -157,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mingw32-configure
 %{_bindir}/mingw32-make
 %{_bindir}/mingw32-pkg-config
+%{_bindir}/%{_mingw32_target}-pkg-config
 %{_bindir}/mingw32-cmake
 %{_libexecdir}/mingw32-scripts
 %{_prefix}/i686-pc-mingw32/
@@ -165,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 54-1
+- Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script
+  which calls pkg-config with the right environment variables set (BZ #513825)
+
 * Sun Aug 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 53-1
 - Fixed a small rpmlint warning caused by the debuginfo generation macro
   Thanks to Kalev Lember for spotting this



From epienbro at fedoraproject.org  Sat Aug 29 14:40:09 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 14:40:09 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-scripts.sh,1.2,1.3
Message-ID: <20090829144009.5CBA011C0496@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28703

Modified Files:
	mingw32-scripts.sh 
Log Message:
Somehow this change wasn't sent along with the previous commit..



Index: mingw32-scripts.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-scripts.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-scripts.sh	6 Dec 2008 14:33:41 -0000	1.2
+++ mingw32-scripts.sh	29 Aug 2009 14:40:08 -0000	1.3
@@ -21,5 +21,9 @@
 # This is a useful command-line script through which one can use the
 # macros from mingw32-macros.mingw32 cross-compilation. 
 
-NAME="_`basename $0|tr -- - _`"
+if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then
+    NAME="_mingw32_pkg_config"
+else
+    NAME="_`basename $0|tr -- - _`"
+fi
 eval "`rpm --eval "%{$NAME}"`" "$@"



From leigh123linux at fedoraproject.org  Sat Aug 29 14:42:51 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 14:42:51 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec, 1.29,
	1.30 qbittorrent_flag.patch, 1.3, 1.4
Message-ID: <20090829144251.06E6011C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30384

Modified Files:
	qbittorrent.spec qbittorrent_flag.patch 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-3
- redo qbittorrent_flag patch (again :-( )



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- qbittorrent.spec	29 Aug 2009 14:27:38 -0000	1.29
+++ qbittorrent.spec	29 Aug 2009 14:42:50 -0000	1.30
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.1
-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
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-3
+- redo qbittorrent_flag patch (again :-( )
+
 * Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-2
 - redo qbittorrent_flag patch
 

qbittorrent_flag.patch:
 icons.qrc |   27 ---------------------------
 1 file changed, 27 deletions(-)

Index: qbittorrent_flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent_flag.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qbittorrent_flag.patch	29 Aug 2009 14:27:38 -0000	1.3
+++ qbittorrent_flag.patch	29 Aug 2009 14:42:50 -0000	1.4
@@ -34,8 +34,4 @@
    <file>Icons/oxygen/browse.png</file>
    <file>Icons/oxygen/bt_settings.png</file>
    <file>Icons/oxygen/bug.png</file>
-@@ -104,3 +77,4 @@
-   <file>Icons/skin/url.png</file>
- </qresource>
- </RCC>
-+
+



From sgrubb at fedoraproject.org  Sat Aug 29 14:43:27 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 29 Aug 2009 14:43:27 +0000 (UTC)
Subject: rpms/libcap-ng/F-11 libcap-ng.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090829144327.2EBB411C009F@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libcap-ng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30590

Modified Files:
	libcap-ng.spec sources 
Log Message:
* Sat Aug 29 2009 Steve Grubb <sgrubb at redhat.com> 0.6.1-1
- New upstream release



Index: libcap-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/F-11/libcap-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libcap-ng.spec	29 Jun 2009 17:52:30 -0000	1.6
+++ libcap-ng.spec	29 Aug 2009 14:43:27 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: An alternate posix capabilities library
 Name: libcap-ng
-Version: 0.6
+Version: 0.6.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Sat Aug 29 2009 Steve Grubb <sgrubb at redhat.com> 0.6.1-1
+- New upstream release
+
 * Mon Jun 29 2009 Steve Grubb <sgrubb at redhat.com> 0.6-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Jun 2009 17:52:30 -0000	1.6
+++ sources	29 Aug 2009 14:43:27 -0000	1.7
@@ -1 +1 @@
-09adb3049eb6c2a1f621a67fc079318e  libcap-ng-0.6.tar.gz
+5b96878df29d123d461c3296f46aa49e  libcap-ng-0.6.1.tar.gz



From leigh123linux at fedoraproject.org  Sat Aug 29 14:43:32 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 14:43:32 +0000 (UTC)
Subject: rpms/qbittorrent/F-11 qbittorrent.spec, 1.16,
	1.17 qbittorrent_flag.patch, 1.1, 1.2
Message-ID: <20090829144332.9953411C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30624

Modified Files:
	qbittorrent.spec qbittorrent_flag.patch 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-2
- redo qbittorrent_flag patch



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/qbittorrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- qbittorrent.spec	29 Aug 2009 14:06:57 -0000	1.16
+++ qbittorrent.spec	29 Aug 2009 14:43:32 -0000	1.17
@@ -1,7 +1,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.1
-Release: 1%{dist}
+Release: 2%{dist}
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
@@ -66,6 +66,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-2
+- redo qbittorrent_flag patch
+
 * Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-1
 - update to 1.4.1
 

qbittorrent_flag.patch:
 icons.qrc |   27 ---------------------------
 1 file changed, 27 deletions(-)

Index: qbittorrent_flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-11/qbittorrent_flag.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qbittorrent_flag.patch	10 Feb 2009 22:52:11 -0000	1.1
+++ qbittorrent_flag.patch	29 Aug 2009 14:43:32 -0000	1.2
@@ -1,9 +1,9 @@
---- qbittorrent-1.3.1/src/icons.qrc.old 
-+++ qbittorrent-1.3.1/src/icons.qrc 
-@@ -47,33 +47,6 @@
+--- qbittorrent-1.3.3/src/icons.qrc.old 
++++ qbittorrent-1.3.3/src/icons.qrc  
+@@ -14,33 +14,6 @@
+   <file>Icons/sphere2.png</file>
    <file>Icons/uparrow.png</file>
    <file>Icons/url.png</file>
-   <file>Icons/wizard.png</file>
 -  <file>Icons/flags/brazil.png</file>
 -  <file>Icons/flags/bulgaria.png</file>
 -  <file>Icons/flags/china.png</file>
@@ -31,6 +31,7 @@
 -  <file>Icons/flags/turkey.png</file>
 -  <file>Icons/flags/ukraine.png</file>
 -  <file>Icons/flags/united_kingdom.png</file>
-   <file>Icons/skin/add.png</file>
-   <file>Icons/skin/connected.png</file>
-   <file>Icons/skin/decrease.png</file>
+   <file>Icons/oxygen/browse.png</file>
+   <file>Icons/oxygen/bt_settings.png</file>
+   <file>Icons/oxygen/bug.png</file>
+



From ausil at fedoraproject.org  Sat Aug 29 14:46:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 29 Aug 2009 14:46:27 +0000 (UTC)
Subject: common Makefile.common,1.136,1.137
Message-ID: <20090829144627.5AA8411C009F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32217

Modified Files:
	Makefile.common 
Log Message:
add basic arm arches



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- Makefile.common	27 Aug 2009 23:09:57 -0000	1.136
+++ Makefile.common	29 Aug 2009 14:46:27 -0000	1.137
@@ -191,7 +191,7 @@ $(shell cat sources 2>/dev/null | while 
 endef
 
 # list the possible targets for valid arches
-ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips geode
+ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips geode armv5tel armv6tel armv7tel
 
 # for the modules that do different "make prep" depending on what arch we build for
 PREP_ARCHES	= $(addprefix prep-,$(ARCHES))



From mclasen at fedoraproject.org  Sat Aug 29 14:55:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 14:55:36 +0000 (UTC)
Subject: rpms/gtk2/F-11 .cvsignore, 1.108, 1.109 gtk2.spec, 1.381,
	1.382 sources, 1.117, 1.118
Message-ID: <20090829145536.4647111C009F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2871

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.16.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- .cvsignore	18 Jul 2009 05:35:59 -0000	1.108
+++ .cvsignore	29 Aug 2009 14:55:35 -0000	1.109
@@ -1 +1 @@
-gtk+-2.16.5.tar.bz2
+gtk+-2.16.6.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/gtk2.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- gtk2.spec	18 Jul 2009 05:35:59 -0000	1.381
+++ gtk2.spec	29 Aug 2009 14:55:35 -0000	1.382
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.16.5
+%define base_version 2.16.6
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -161,7 +161,7 @@ if ! pkg-config --exists pangoxft ; then
         exit 1
 fi
 
-%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png
+%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --enable-debug --with-included-loaders=png
 
 # fight unused direct deps
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -373,6 +373,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.6-1
+- Update to 2.16.6
+
 * Sat Jul 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.5-1
 - Update to 2.16.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- sources	18 Jul 2009 05:35:59 -0000	1.117
+++ sources	29 Aug 2009 14:55:35 -0000	1.118
@@ -1 +1 @@
-8d1ea0b9b0400224d25b0cc2750b438d  gtk+-2.16.5.tar.bz2
+416412b336d9f3b6b78ca887395d1726  gtk+-2.16.6.tar.bz2



From hoangelos at fedoraproject.org  Sat Aug 29 14:57:07 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Sat, 29 Aug 2009 14:57:07 +0000 (UTC)
Subject: rpms/python-werkzeug/devel import.log, NONE,
	1.1 python-werkzeug.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090829145707.327CF11C009F@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-werkzeug/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-werkzeug.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-werkzeug-0_5_1-1_fc11:HEAD:python-werkzeug-0.5.1-1.fc11.src.rpm:1251557484


--- NEW FILE python-werkzeug.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname Werkzeug

Name:           python-werkzeug
Version:        0.5.1
Release:        1%{?dist}
Summary:        The Swiss Army knife of Python web development 

Group:          Development/Libraries
License:        BSD
URL:            http://werkzeug.pocoo.org/
Source0:        http://pypi.python.org/packages/source/W/Werkzeug/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-nose
BuildRequires:  python-setuptools-devel

%description
Werkzeug
========

Werkzeug started as simple collection of various utilities for WSGI
applications and has become one of the most advanced WSGI utility
modules.  It includes a powerful debugger, full featured request and
response objects, HTTP utilities to handle entity tags, cache control
headers, HTTP dates, cookie handling, file uploads, a powerful URL
routing system and a bunch of community contributed addon modules.

Werkzeug is unicode aware and doesn't enforce a specific template
engine, database adapter or anything else.  It doesn't even enforce
a specific way of handling requests and leaves all that up to the
developer. It's most useful for end user applications which should work
on as many server environments as possible (such as blogs, wikis,
bulletin boards, etc.).

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description doc
Documentation and examples for %{name}.

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i 's/\r//' LICENSE
%{__sed} -i 's/\r//' docs/makearchive.py
%{__sed} -i 's/\r//' docs/_build/html/_static/pygments.css
%{__sed} -i 's/\r//' docs/_build/html/objects.inv
%{__sed} -i 's/\r//' PKG-INFO

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__rm} -rf docs/_build/html/.buildinfo

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE PKG-INFO CHANGES
%{python_sitelib}/*

%files doc
%defattr(-,root,root,-)
%doc docs/_build/html examples

%changelog
* Tue Aug 25 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.5.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:28:46 -0000	1.1
+++ .cvsignore	29 Aug 2009 14:57:06 -0000	1.2
@@ -0,0 +1 @@
+Werkzeug-0.5.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:28:46 -0000	1.1
+++ sources	29 Aug 2009 14:57:07 -0000	1.2
@@ -0,0 +1 @@
+620955f34b8424c92674fe76d5c47679  Werkzeug-0.5.1.zip



From epienbro at fedoraproject.org  Sat Aug 29 15:56:31 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 15:56:31 +0000 (UTC)
Subject: rpms/mingw32-gtk2/F-11 .cvsignore, 1.5, 1.6 mingw32-gtk2.spec, 1.8, 
	1.9 sources, 1.5, 1.6
Message-ID: <20090829155632.1162D11C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15401

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.16.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 23:36:58 -0000	1.5
+++ .cvsignore	29 Aug 2009 15:56:29 -0000	1.6
@@ -1 +1 @@
-gtk+-2.16.5.tar.bz2
+gtk+-2.16.6.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/mingw32-gtk2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-gtk2.spec	12 Aug 2009 23:36:59 -0000	1.8
+++ mingw32-gtk2.spec	29 Aug 2009 15:56:30 -0000	1.9
@@ -5,7 +5,7 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtk2
-Version:        2.16.5
+Version:        2.16.6
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -318,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.16.6-1
+- Update to 2.16.6
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.16.5-1
 - Update to 2.16.5
 - Use %%global instead of %%define


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 23:36:59 -0000	1.5
+++ sources	29 Aug 2009 15:56:30 -0000	1.6
@@ -1 +1 @@
-8d1ea0b9b0400224d25b0cc2750b438d  gtk+-2.16.5.tar.bz2
+416412b336d9f3b6b78ca887395d1726  gtk+-2.16.6.tar.bz2



From epienbro at fedoraproject.org  Sat Aug 29 16:13:45 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 16:13:45 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel
	mingw32-openssl-1.0.0-beta3-linker-fix.patch, NONE,
	1.1 mingw32-openssl-1.0.0-beta3-shared.patch, NONE,
	1.1 openssl-0.9.8k-algo-doc.patch, NONE,
	1.1 openssl-1.0.0-beta3-cipher-change.patch, NONE,
	1.1 openssl-1.0.0-beta3-const.patch, NONE,
	1.1 openssl-1.0.0-beta3-curl.patch, NONE,
	1.1 openssl-1.0.0-beta3-default-paths.patch, NONE,
	1.1 openssl-1.0.0-beta3-defaults.patch, NONE,
	1.1 openssl-1.0.0-beta3-enginesdir.patch, NONE,
	1.1 openssl-1.0.0-beta3-fips.patch, NONE,
	1.1 openssl-1.0.0-beta3-fipscheck.patch, NONE,
	1.1 openssl-1.0.0-beta3-fipsmode.patch, NONE,
	1.1 openssl-1.0.0-beta3-fipsrng.patch, NONE,
	1.1 openssl-1.0.0-beta3-ipv6-apps.patch, NONE,
	1.1 openssl-1.0.0-beta3-krb5.patch, NONE,
	1.1 openssl-1.0.0-beta3-namingblk.patch, NONE,
	1.1 openssl-1.0.0-beta3-namingstr.patch, NONE,
	1.1 openssl-1.0.0-beta3-redhat.patch, NONE,
	1.1 openssl-1.0.0-beta3-soversion.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 hobble-openssl, 1.1, 1.2 mingw32-openssl.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20090829161345.F2B0511C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19498

Modified Files:
	.cvsignore hobble-openssl mingw32-openssl.spec sources 
Added Files:
	mingw32-openssl-1.0.0-beta3-linker-fix.patch 
	mingw32-openssl-1.0.0-beta3-shared.patch 
	openssl-0.9.8k-algo-doc.patch 
	openssl-1.0.0-beta3-cipher-change.patch 
	openssl-1.0.0-beta3-const.patch openssl-1.0.0-beta3-curl.patch 
	openssl-1.0.0-beta3-default-paths.patch 
	openssl-1.0.0-beta3-defaults.patch 
	openssl-1.0.0-beta3-enginesdir.patch 
	openssl-1.0.0-beta3-fips.patch 
	openssl-1.0.0-beta3-fipscheck.patch 
	openssl-1.0.0-beta3-fipsmode.patch 
	openssl-1.0.0-beta3-fipsrng.patch 
	openssl-1.0.0-beta3-ipv6-apps.patch 
	openssl-1.0.0-beta3-krb5.patch 
	openssl-1.0.0-beta3-namingblk.patch 
	openssl-1.0.0-beta3-namingstr.patch 
	openssl-1.0.0-beta3-redhat.patch 
	openssl-1.0.0-beta3-soversion.patch 
Log Message:
* Fri Aug 28 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.1.beta3
- Update to version 1.0.0 beta 3
- Use %global instead of %define
- Automatically generate debuginfo subpackage
- Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3)
- Don't use the %{_mingw32_make} macro anymore as it's ugly and causes side-effects

NOTE:
Right now, this package doesn't provide versioned DLL's as the upstream
defaults are used and I couldn't find the right spot in the build scripts
to realize this (openssl's build system is really messy..). 


mingw32-openssl-1.0.0-beta3-linker-fix.patch:
 libeay.num |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE mingw32-openssl-1.0.0-beta3-linker-fix.patch ---
--- util/libeay.num.orig	2009-08-29 15:41:45.207820734 +0200
+++ util/libeay.num	2009-08-29 15:48:03.746817062 +0200
@@ -1084,7 +1084,6 @@
 PROXY_set_connect_mode                  1112	NOEXIST::FUNCTION:
 RAND_SSLeay                             1113	EXIST::FUNCTION:
 RAND_set_rand_method                    1114	EXIST::FUNCTION:
-RSA_memory_lock                         1115	EXIST::FUNCTION:RSA
 bn_sub_words                            1116	EXIST::FUNCTION:
 bn_mul_normal                           1117	NOEXIST::FUNCTION:
 bn_mul_comba8                           1118	NOEXIST::FUNCTION:
@@ -2844,17 +2843,8 @@
 X509_check_ca                           3286	EXIST::FUNCTION:
 private_idea_set_encrypt_key            3287	NOEXIST::FUNCTION:
 HMAC_CTX_set_flags                      3288	NOEXIST::FUNCTION:
-private_SHA_Init                        3289	NOEXIST::FUNCTION:
-private_CAST_set_key                    3290	NOEXIST::FUNCTION:
-private_RIPEMD160_Init                  3291	NOEXIST::FUNCTION:
 private_RC5_32_set_key                  3292	NOEXIST::FUNCTION:
-private_MD5_Init                        3293	NOEXIST::FUNCTION:
-private_RC4_set_key                     3294	NOEXIST::FUNCTION:
 private_MDC2_Init                       3295	NOEXIST::FUNCTION:
-private_RC2_set_key                     3296	NOEXIST::FUNCTION:
-private_MD4_Init                        3297	NOEXIST::FUNCTION:
-private_BF_set_key                      3298	NOEXIST::FUNCTION:
-private_MD2_Init                        3299	NOEXIST::FUNCTION:
 d2i_PROXY_CERT_INFO_EXTENSION           3300	EXIST::FUNCTION:
 PROXY_POLICY_it                         3301	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PROXY_POLICY_it                         3301	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -3318,7 +3308,6 @@
 EVP_PKEY_get_attr_by_NID                3721	EXIST::FUNCTION:
 STORE_set_ex_data                       3722	NOEXIST::FUNCTION:
 ENGINE_get_ECDSA                        3723	EXIST::FUNCTION:ENGINE
-EVP_ecdsa                               3724	EXIST::FUNCTION:SHA
 BN_BLINDING_get_flags                   3725	EXIST::FUNCTION:
 PKCS12_add_cert                         3726	EXIST::FUNCTION:
 STORE_OBJECT_new                        3727	NOEXIST::FUNCTION:
@@ -3702,7 +3691,6 @@
 FIPS_dsa_sig_encode                     4089	NOEXIST::FUNCTION:
 CRYPTO_dbg_remove_all_info              4090	NOEXIST::FUNCTION:
 OPENSSL_init                            4091	NOEXIST::FUNCTION:
-private_Camellia_set_key                4092	NOEXIST::FUNCTION:
 CRYPTO_strdup                           4093	EXIST::FUNCTION:
 JPAKE_STEP3A_process                    4094	EXIST::FUNCTION:JPAKE
 JPAKE_STEP1_release                     4095	EXIST::FUNCTION:JPAKE

mingw32-openssl-1.0.0-beta3-shared.patch:
 Makefile.shared |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mingw32-openssl-1.0.0-beta3-shared.patch ---
--- openssl-1.0.0-beta3/Makefile.shared.orig	2009-08-29 17:02:27.496816550 +0200
+++ openssl-1.0.0-beta3/Makefile.shared	2009-08-29 17:04:54.897820373 +0200
@@ -250,7 +250,7 @@
 	base=-Wl,--enable-auto-image-base; \
 	deffile=; \
 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
-		SHLIB=$(LIBNAME)eay32; base=; \
+		SHLIB=lib$(LIBNAME); base=; \
 		if test -f $(LIBNAME)eay32.def; then \
 			deffile=$(LIBNAME)eay32.def; \
 		fi; \

openssl-0.9.8k-algo-doc.patch:
 EVP_DigestInit.pod  |   20 ++++++++++++++------
 EVP_EncryptInit.pod |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

--- NEW FILE openssl-0.9.8k-algo-doc.patch ---
diff -up openssl-0.9.8k/doc/crypto/EVP_DigestInit.pod.algo-doc openssl-0.9.8k/doc/crypto/EVP_DigestInit.pod
--- openssl-0.9.8k/doc/crypto/EVP_DigestInit.pod.algo-doc	2004-05-20 23:39:50.000000000 +0200
+++ openssl-0.9.8k/doc/crypto/EVP_DigestInit.pod	2009-06-30 12:04:47.000000000 +0200
@@ -6,7 +6,8 @@ EVP_MD_CTX_init, EVP_MD_CTX_create, EVP_
 EVP_DigestFinal_ex, EVP_MD_CTX_cleanup, EVP_MD_CTX_destroy, EVP_MAX_MD_SIZE,
 EVP_MD_CTX_copy_ex, EVP_MD_CTX_copy, EVP_MD_type, EVP_MD_pkey_type, EVP_MD_size,
 EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size, EVP_MD_CTX_block_size, EVP_MD_CTX_type,
-EVP_md_null, EVP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_dss, EVP_dss1, EVP_mdc2,
+EVP_md_null, EVP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_sha224,
+EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, EVP_mdc2,
 EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, EVP_get_digestbyobj -
 EVP digest routines
 
@@ -51,6 +52,10 @@ EVP digest routines
  const EVP_MD *EVP_md5(void);
  const EVP_MD *EVP_sha(void);
  const EVP_MD *EVP_sha1(void);
+ const EVP_MD *EVP_sha224(void);
+ const EVP_MD *EVP_sha256(void);
+ const EVP_MD *EVP_sha384(void);
+ const EVP_MD *EVP_sha512(void);
  const EVP_MD *EVP_dss(void);
  const EVP_MD *EVP_dss1(void);
  const EVP_MD *EVP_mdc2(void);
@@ -70,7 +75,7 @@ EVP_MD_CTX_create() allocates, initializ
 
 EVP_DigestInit_ex() sets up digest context B<ctx> to use a digest
 B<type> from ENGINE B<impl>. B<ctx> must be initialized before calling this
-function. B<type> will typically be supplied by a functionsuch as EVP_sha1().
+function. B<type> will typically be supplied by a function such as EVP_sha1().
 If B<impl> is NULL then the default implementation of digest B<type> is used.
 
 EVP_DigestUpdate() hashes B<cnt> bytes of data at B<d> into the
@@ -127,9 +132,11 @@ with this digest. For example EVP_sha1()
 return B<NID_sha1WithRSAEncryption>. This "link" between digests and signature
 algorithms may not be retained in future versions of OpenSSL.
 
-EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_mdc2() and EVP_ripemd160()
-return B<EVP_MD> structures for the MD2, MD5, SHA, SHA1, MDC2 and RIPEMD160 digest
-algorithms respectively. The associated signature algorithm is RSA in each case.
+EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(),
+EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160()
+return B<EVP_MD> structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384,
+SHA512, MDC2 and RIPEMD160 digest algorithms respectively. The associated
+signature algorithm is RSA in each case.
 
 EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest
 algorithms but using DSS (DSA) for the signature algorithm.
@@ -156,7 +163,8 @@ EVP_MD_size(), EVP_MD_block_size(), EVP_
 EVP_MD_CTX_block_size()	and EVP_MD_block_size() return the digest or block
 size in bytes.
 
-EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_dss(),
+EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(),
+EVP_sha224(), EVP_sha256(), EVP_sha384(), EVP_sha512(), EVP_dss(),
 EVP_dss1(), EVP_mdc2() and EVP_ripemd160() return pointers to the
 corresponding EVP_MD structures.
 
diff -up openssl-0.9.8k/doc/crypto/EVP_EncryptInit.pod.algo-doc openssl-0.9.8k/doc/crypto/EVP_EncryptInit.pod
--- openssl-0.9.8k/doc/crypto/EVP_EncryptInit.pod.algo-doc	2005-04-15 18:01:35.000000000 +0200
+++ openssl-0.9.8k/doc/crypto/EVP_EncryptInit.pod	2009-06-30 12:04:47.000000000 +0200
@@ -91,6 +91,32 @@ EVP_CIPHER_CTX_set_padding - EVP cipher 
  int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
  int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
 
+ const EVP_CIPHER *EVP_des_ede3(void);
+ const EVP_CIPHER *EVP_des_ede3_ecb(void);
+ const EVP_CIPHER *EVP_des_ede3_cfb64(void);
+ const EVP_CIPHER *EVP_des_ede3_cfb1(void);
+ const EVP_CIPHER *EVP_des_ede3_cfb8(void);
+ const EVP_CIPHER *EVP_des_ede3_ofb(void);
+ const EVP_CIPHER *EVP_des_ede3_cbc(void);
+ const EVP_CIPHER *EVP_aes_128_ecb(void);
+ const EVP_CIPHER *EVP_aes_128_cbc(void);
+ const EVP_CIPHER *EVP_aes_128_cfb1(void);
+ const EVP_CIPHER *EVP_aes_128_cfb8(void);
+ const EVP_CIPHER *EVP_aes_128_cfb128(void);
+ const EVP_CIPHER *EVP_aes_128_ofb(void);
+ const EVP_CIPHER *EVP_aes_192_ecb(void);
+ const EVP_CIPHER *EVP_aes_192_cbc(void);
+ const EVP_CIPHER *EVP_aes_192_cfb1(void);
+ const EVP_CIPHER *EVP_aes_192_cfb8(void);
+ const EVP_CIPHER *EVP_aes_192_cfb128(void);
+ const EVP_CIPHER *EVP_aes_192_ofb(void);
+ const EVP_CIPHER *EVP_aes_256_ecb(void);
+ const EVP_CIPHER *EVP_aes_256_cbc(void);
+ const EVP_CIPHER *EVP_aes_256_cfb1(void);
+ const EVP_CIPHER *EVP_aes_256_cfb8(void);
+ const EVP_CIPHER *EVP_aes_256_cfb128(void);
+ const EVP_CIPHER *EVP_aes_256_ofb(void);
+
 =head1 DESCRIPTION
 
 The EVP cipher routines are a high level interface to certain
@@ -297,6 +323,18 @@ Three key triple DES in CBC, ECB, CFB an
 
 DESX algorithm in CBC mode.
 
+=item EVP_aes_128_cbc(void), EVP_aes_128_ecb(), EVP_aes_128_ofb(void), EVP_aes_128_cfb1(void), EVP_aes_128_cfb8(void), EVP_aes_128_cfb128(void)
+
+AES with 128 bit key length in CBC, ECB, OFB and CFB modes respectively.
+
+=item EVP_aes_192_cbc(void), EVP_aes_192_ecb(), EVP_aes_192_ofb(void), EVP_aes_192_cfb1(void), EVP_aes_192_cfb8(void), EVP_aes_192_cfb128(void)
+
+AES with 192 bit key length in CBC, ECB, OFB and CFB modes respectively.
+
+=item EVP_aes_256_cbc(void), EVP_aes_256_ecb(), EVP_aes_256_ofb(void), EVP_aes_256_cfb1(void), EVP_aes_256_cfb8(void), EVP_aes_256_cfb128(void)
+
+AES with 256 bit key length in CBC, ECB, OFB and CFB modes respectively.
+
 =item EVP_rc4(void)
 
 RC4 stream cipher. This is a variable key length cipher with default key length 128 bits.

openssl-1.0.0-beta3-cipher-change.patch:
 ssl.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-cipher-change.patch ---
diff -up openssl-1.0.0-beta3/ssl/ssl.h.cipher-change openssl-1.0.0-beta3/ssl/ssl.h
--- openssl-1.0.0-beta3/ssl/ssl.h.cipher-change	2009-08-05 18:22:45.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl.h	2009-08-05 18:27:32.000000000 +0200
@@ -511,7 +511,7 @@ typedef struct ssl_session_st
 
 #define SSL_OP_MICROSOFT_SESS_ID_BUG			0x00000001L
 #define SSL_OP_NETSCAPE_CHALLENGE_BUG			0x00000002L
-#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L
+#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L /* can break some security expectations */
 #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L
 #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L
 #define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x00000040L /* no effect since 0.9.7h and 0.9.8b */
@@ -528,7 +528,7 @@ typedef struct ssl_session_st
 
 /* SSL_OP_ALL: various bug workarounds that should be rather harmless.
  *             This used to be 0x000FFFFFL before 0.9.7. */
-#define SSL_OP_ALL					0x80000FFFL
+#define SSL_OP_ALL					0x80000FF7L
 
 /* DTLS options */
 #define SSL_OP_NO_QUERY_MTU                 0x00001000L

openssl-1.0.0-beta3-const.patch:
 doc/ssl/SSL_CIPHER_get_name.pod |    2 +-
 ssl/ssl.h                       |    2 +-
 ssl/ssl_ciph.c                  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-const.patch ---
diff -up openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod.const openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod
--- openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod.const	2009-02-14 22:49:37.000000000 +0100
+++ openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod	2009-08-22 16:15:32.000000000 +0200
@@ -11,7 +11,7 @@ SSL_CIPHER_get_name, SSL_CIPHER_get_bits
  const char *SSL_CIPHER_get_name(const SSL_CIPHER *cipher);
  int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
  char *SSL_CIPHER_get_version(const SSL_CIPHER *cipher);
- char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int size);
+ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int size);
 
 =head1 DESCRIPTION
 
diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.const openssl-1.0.0-beta3/ssl/ssl_ciph.c
--- openssl-1.0.0-beta3/ssl/ssl_ciph.c.const	2009-08-22 15:56:12.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-22 15:56:12.000000000 +0200
@@ -1458,7 +1458,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
 	return(cipherstack);
 	}
 
-char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
+char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 	{
 	int is_export,pkl,kl;
 	const char *ver,*exp_str;
diff -up openssl-1.0.0-beta3/ssl/ssl.h.const openssl-1.0.0-beta3/ssl/ssl.h
--- openssl-1.0.0-beta3/ssl/ssl.h.const	2009-08-22 15:56:11.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl.h	2009-08-22 15:56:12.000000000 +0200
@@ -1638,7 +1638,7 @@ long SSL_get_default_timeout(const SSL *
 
 int SSL_library_init(void );
 
-char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size);
+char *SSL_CIPHER_description(const SSL_CIPHER *,char *buf,int size);
 STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
 
 SSL *SSL_dup(SSL *ssl);

openssl-1.0.0-beta3-curl.patch:
 tsget |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-curl.patch ---
diff -up openssl-1.0.0-beta3/apps/tsget.curl openssl-1.0.0-beta3/apps/tsget
--- openssl-1.0.0-beta3/apps/tsget.curl	2006-02-13 00:11:21.000000000 +0100
+++ openssl-1.0.0-beta3/apps/tsget	2009-08-21 15:37:24.000000000 +0200
@@ -7,7 +7,7 @@ use strict;
 use IO::Handle;
 use Getopt::Std;
 use File::Basename;
-use WWW::Curl::easy;
+use WWW::Curl::Easy;
 
 use vars qw(%options);
 
@@ -37,7 +37,7 @@ sub create_curl {
     my $url = shift;
 
     # Create Curl object.
-    my $curl = WWW::Curl::easy::new();
+    my $curl = WWW::Curl::Easy::new();
 
     # Error-handling related options.
     $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d};
@@ -192,4 +192,4 @@ REQUEST: foreach (@ARGV) {
     STDERR->printflush(", $output written.\n") if $options{v};
 }
 $curl->cleanup();
-WWW::Curl::easy::global_cleanup();
+WWW::Curl::Easy::global_cleanup();

openssl-1.0.0-beta3-default-paths.patch:
 s_client.c |    9 +++++----
 s_server.c |   16 ++++++++++------
 s_time.c   |    9 +++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-default-paths.patch ---
diff -up openssl-1.0.0-beta3/apps/s_client.c.default-paths openssl-1.0.0-beta3/apps/s_client.c
--- openssl-1.0.0-beta3/apps/s_client.c.default-paths	2009-06-30 18:10:24.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_client.c	2009-08-05 18:17:52.000000000 +0200
@@ -888,12 +888,13 @@ bad:
 	if (!set_cert_key_stuff(ctx,cert,key))
 		goto end;
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(ctx)))
+	if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
+		{
+		ERR_print_errors(bio_err);
+		}
+	if (!SSL_CTX_set_default_verify_paths(ctx))
 		{
-		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
 		ERR_print_errors(bio_err);
-		/* goto end; */
 		}
 
 #ifndef OPENSSL_NO_TLSEXT
diff -up openssl-1.0.0-beta3/apps/s_server.c.default-paths openssl-1.0.0-beta3/apps/s_server.c
--- openssl-1.0.0-beta3/apps/s_server.c.default-paths	2009-06-30 18:10:24.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_server.c	2009-08-05 18:18:40.000000000 +0200
@@ -1403,12 +1403,13 @@ bad:
 		}
 #endif
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(ctx)))
+	if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
+		{
+		ERR_print_errors(bio_err);
+		}
+	if (!SSL_CTX_set_default_verify_paths(ctx))
 		{
-		/* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
 		ERR_print_errors(bio_err);
-		/* goto end; */
 		}
 	if (vpm)
 		SSL_CTX_set1_param(ctx, vpm);
@@ -1457,8 +1458,11 @@ bad:
 
 		SSL_CTX_sess_set_cache_size(ctx2,128);
 
-		if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
-			(!SSL_CTX_set_default_verify_paths(ctx2)))
+		if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath))
+			{
+			ERR_print_errors(bio_err);
+			}
+		if (!SSL_CTX_set_default_verify_paths(ctx2))
 			{
 			ERR_print_errors(bio_err);
 			}
diff -up openssl-1.0.0-beta3/apps/s_time.c.default-paths openssl-1.0.0-beta3/apps/s_time.c
--- openssl-1.0.0-beta3/apps/s_time.c.default-paths	2006-04-17 14:22:13.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_time.c	2009-08-05 18:00:35.000000000 +0200
@@ -373,12 +373,13 @@ int MAIN(int argc, char **argv)
 
 	SSL_load_error_strings();
 
-	if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
-		(!SSL_CTX_set_default_verify_paths(tm_ctx)))
+	if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
+		{
+		ERR_print_errors(bio_err);
+		}
+	if (!SSL_CTX_set_default_verify_paths(tm_ctx))
 		{
-		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
 		ERR_print_errors(bio_err);
-		/* goto end; */
 		}
 
 	if (tm_cipher == NULL)

openssl-1.0.0-beta3-defaults.patch:
 openssl.cnf |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-defaults.patch ---
diff -up openssl-1.0.0-beta3/apps/openssl.cnf.defaults openssl-1.0.0-beta3/apps/openssl.cnf
--- openssl-1.0.0-beta3/apps/openssl.cnf.defaults	2009-04-04 20:09:43.000000000 +0200
+++ openssl-1.0.0-beta3/apps/openssl.cnf	2009-08-04 22:57:16.000000000 +0200
@@ -103,7 +103,8 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 1024
+default_bits		= 2048
+default_md		= sha1
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
@@ -126,17 +127,18 @@ string_mask = utf8only
 
 [ req_distinguished_name ]
 countryName			= Country Name (2 letter code)
-countryName_default		= AU
+countryName_default		= XX
 countryName_min			= 2
 countryName_max			= 2
 
 stateOrProvinceName		= State or Province Name (full name)
-stateOrProvinceName_default	= Some-State
+#stateOrProvinceName_default	= Default Province
 
 localityName			= Locality Name (eg, city)
+localityName_default	= Default City
 
 0.organizationName		= Organization Name (eg, company)
-0.organizationName_default	= Internet Widgits Pty Ltd
+0.organizationName_default	= Default Company Ltd
 
 # we can do this but it is not needed normally :-)
 #1.organizationName		= Second Organization Name (eg, company)
@@ -145,7 +147,7 @@ localityName			= Locality Name (eg, city
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (eg, YOUR name)
+commonName			= Common Name (eg, your name or your server\'s hostname)
 commonName_max			= 64
 
 emailAddress			= Email Address

openssl-1.0.0-beta3-enginesdir.patch:
 Configure        |    9 +++++++--
 engines/Makefile |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-enginesdir.patch ---
diff -up openssl-1.0.0-beta3/Configure.enginesdir openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.enginesdir	2009-08-10 19:46:32.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-10 19:46:32.000000000 +0200
@@ -616,6 +616,7 @@ my $idx_multilib = $idx++;
 
 my $prefix="";
 my $openssldir="";
+my $enginesdir="";
 my $exe_ext="";
 my $install_prefix="";
 my $cross_compile_prefix="";
@@ -820,6 +821,10 @@ PROCESS_ARGS:
 				{
 				$openssldir=$1;
 				}
+			elsif (/^--enginesdir=(.*)$/)
+				{
+				$enginesdir=$1;
+				}
 			elsif (/^--install.prefix=(.*)$/)
 				{
 				$install_prefix=$1;
@@ -1037,7 +1042,7 @@ chop $prefix if $prefix =~ /.\/$/;
 
 $openssldir=$prefix . "/ssl" if $openssldir eq "";
 $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
-
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
 
 print "IsMK1MF=$IsMK1MF\n";
 
@@ -1645,7 +1650,7 @@ while (<IN>)
 		# $foo is to become "$prefix/lib$multilib/engines";
 		# as Makefile.org and engines/Makefile are adapted for
 		# $multilib suffix.
-		my $foo = "$prefix/lib/engines";
+		my $foo = "$enginesdir";
 		$foo =~ s/\\/\\\\/g;
 		print OUT "#define ENGINESDIR \"$foo\"\n";
 		}
diff -up openssl-1.0.0-beta3/engines/Makefile.enginesdir openssl-1.0.0-beta3/engines/Makefile
--- openssl-1.0.0-beta3/engines/Makefile.enginesdir	2009-06-14 04:37:22.000000000 +0200
+++ openssl-1.0.0-beta3/engines/Makefile	2009-08-10 19:46:48.000000000 +0200
@@ -123,7 +123,7 @@ install:
 				sfx=".so"; \
 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
 			  fi; \
-			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
+			  chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx ); \
 		done; \
 	fi

openssl-1.0.0-beta3-fips.patch:
 Configure                          |   14 
 Makefile.org                       |    6 
 crypto/Makefile                    |    6 
 crypto/bf/bf_skey.c                |    7 
 crypto/bf/blowfish.h               |    4 
 crypto/bn/Makefile                 |    4 
 crypto/bn/bn.h                     |   11 
 crypto/bn/bn_x931p.c               |  272 ++++++++++
 crypto/camellia/Makefile           |    4 
 crypto/camellia/asm/cmll-x86.pl    |    7 
 crypto/camellia/camellia.h         |    5 
 crypto/camellia/cmll_fblk.c        |   68 ++
 crypto/camellia/cmll_misc.c        |    9 
 crypto/cast/c_skey.c               |    7 
 crypto/cast/cast.h                 |    4 
 crypto/crypto.h                    |   57 ++
 crypto/dh/dh.h                     |    5 
 crypto/dh/dh_err.c                 |    3 
 crypto/dh/dh_gen.c                 |   18 
 crypto/dh/dh_key.c                 |   21 
 crypto/dsa/dsa.h                   |   23 
 crypto/dsa/dsa_gen.c               |   19 
 crypto/dsa/dsa_key.c               |   50 +
 crypto/dsa/dsa_ossl.c              |   36 +
 crypto/err/err_all.c               |    6 
 crypto/evp/digest.c                |   60 ++
 crypto/evp/e_aes.c                 |   41 -
 crypto/evp/e_camellia.c            |    2 
 crypto/evp/e_des3.c                |   24 
 crypto/evp/e_null.c                |    2 
 crypto/evp/evp.h                   |   23 
 crypto/evp/evp_enc.c               |   69 ++
 crypto/evp/evp_err.c               |    1 
 crypto/evp/evp_lib.c               |   22 
 crypto/evp/evp_locl.h              |   29 -
 crypto/evp/m_dss.c                 |    2 
 crypto/evp/m_dss1.c                |    2 
 crypto/evp/m_sha1.c                |   15 
 crypto/evp/names.c                 |    8 
 crypto/fips/Makefile               |   81 +++
 crypto/fips/cavs/fips_aesavs.c     |  939 +++++++++++++++++++++++++++++++++++++
 crypto/fips/cavs/fips_desmovs.c    |  702 +++++++++++++++++++++++++++
 crypto/fips/cavs/fips_dssvs.c      |  537 +++++++++++++++++++++
 crypto/fips/cavs/fips_rngvs.c      |  230 +++++++++
 crypto/fips/cavs/fips_rsagtest.c   |  390 +++++++++++++++
 crypto/fips/cavs/fips_rsastest.c   |  370 ++++++++++++++
 crypto/fips/cavs/fips_rsavtest.c   |  377 ++++++++++++++
 crypto/fips/cavs/fips_shatest.c    |  388 +++++++++++++++
 crypto/fips/cavs/fips_utl.h        |  343 +++++++++++++
 crypto/fips/fips.c                 |  419 ++++++++++++++++
 crypto/fips/fips.h                 |  163 ++++++
 crypto/fips/fips_aes_selftest.c    |  103 ++++
 crypto/fips/fips_des_selftest.c    |  139 +++++
 crypto/fips/fips_dsa_selftest.c    |  182 +++++++
 crypto/fips/fips_hmac_selftest.c   |  137 +++++
 crypto/fips/fips_rand.c            |  412 ++++++++++++++++
 crypto/fips/fips_rand.h            |   77 +++
 crypto/fips/fips_rand_selftest.c   |  373 ++++++++++++++
 crypto/fips/fips_randtest.c        |  248 +++++++++
 crypto/fips/fips_rsa_selftest.c    |  434 +++++++++++++++++
 crypto/fips/fips_rsa_x931g.c       |  281 +++++++++++
 crypto/fips/fips_sha1_selftest.c   |   99 +++
 crypto/fips/fips_standalone_sha1.c |  173 ++++++
 crypto/fips/fips_test_suite.c      |  588 +++++++++++++++++++++++
 crypto/fips_err.c                  |    7 
 crypto/fips_err.h                  |  137 +++++
 crypto/fips_locl.h                 |   72 ++
 crypto/hmac/hmac.c                 |   14 
 crypto/hmac/hmac.h                 |    1 
 crypto/md2/md2.h                   |    3 
 crypto/md2/md2_dgst.c              |    7 
 crypto/md4/md4.h                   |    3 
 crypto/md4/md4_dgst.c              |    7 
 crypto/md5/md5.h                   |    3 
 crypto/md5/md5_dgst.c              |    7 
 crypto/mdc2/mdc2.h                 |    4 
 crypto/mdc2/mdc2dgst.c             |    7 
 crypto/mem.c                       |    2 
 crypto/o_init.c                    |   80 +++
 crypto/opensslconf.h.in            |   15 
 crypto/pkcs12/p12_crt.c            |   11 
 crypto/rand/md_rand.c              |   12 
 crypto/rand/rand.h                 |   17 
 crypto/rand/rand_err.c             |   17 
 crypto/rand/rand_lib.c             |   17 
 crypto/rc2/rc2.h                   |    4 
 crypto/rc2/rc2_skey.c              |   17 
 crypto/rc4/Makefile                |    4 
 crypto/rc4/asm/rc4-586.pl          |    8 
 crypto/rc4/asm/rc4-s390x.pl        |    2 
 crypto/rc4/asm/rc4-x86_64.pl       |    2 
 crypto/rc4/rc4.h                   |    3 
 crypto/rc4/rc4_fblk.c              |   75 ++
 crypto/rc4/rc4_skey.c              |   14 
 crypto/ripemd/ripemd.h             |    3 
 crypto/ripemd/rmd_dgst.c           |    7 
 crypto/rsa/rsa.h                   |   28 +
 crypto/rsa/rsa_eay.c               |  160 ++++--
 crypto/rsa/rsa_err.c               |    6 
 crypto/rsa/rsa_gen.c               |   99 +++
 crypto/rsa/rsa_lib.c               |   87 +--
 crypto/rsa/rsa_sign.c              |   10 
 crypto/sha/sha.h                   |    3 
 crypto/sha/sha1dgst.c              |    4 
 crypto/sha/sha256.c                |   10 
 crypto/sha/sha512.c                |   12 
 crypto/sha/sha_dgst.c              |    6 
 crypto/sha/sha_locl.h              |    7 
 ssl/s23_clnt.c                     |   16 
 ssl/s23_srvr.c                     |    9 
 ssl/s3_clnt.c                      |    6 
 ssl/s3_enc.c                       |    4 
 ssl/s3_srvr.c                      |    2 
 ssl/ssl_ciph.c                     |    7 
 ssl/ssl_lib.c                      |    8 
 ssl/ssltest.c                      |   35 +
 ssl/t1_enc.c                       |    2 
 117 files changed, 10074 insertions(+), 180 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-fips.patch ---
diff -up openssl-1.0.0-beta3/Configure.fips openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-11 18:07:30.000000000 +0200
@@ -654,6 +654,7 @@ my $cmll_enc="camellia.o cmll_misc.o cml
 my $processor="";
 my $default_ranlib;
 my $perl;
+my $fips=0;
 
 
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
@@ -797,6 +798,10 @@ PROCESS_ARGS:
 			}
 		elsif (/^386$/)
 			{ $processor=386; }
+		elsif (/^fips$/)
+			{
+			$fips=1;
+		        }
 		elsif (/^rsaref$/)
 			{
 			# No RSAref support any more since it's not needed.
@@ -1349,6 +1354,11 @@ $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no
 
 $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/);
 
+if ($fips)
+	{
+	$openssl_other_defines.="#define OPENSSL_FIPS\n";
+	}
+
 $cpuid_obj="mem_clr.o"	unless ($cpuid_obj =~ /\.o$/);
 $des_obj=$des_enc	unless ($des_obj =~ /\.o$/);
 $bf_obj=$bf_enc		unless ($bf_obj =~ /\.o$/);
@@ -1504,6 +1514,10 @@ while (<IN>)
 	s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
 	s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
 	s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
+	if ($fips)
+		{
+		s/^FIPS=.*/FIPS=yes/;
+		}
 	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
 	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
 	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
diff -up openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips openssl-1.0.0-beta3/crypto/bf/bf_skey.c
--- openssl-1.0.0-beta3/crypto/bf/bf_skey.c.fips	2008-11-12 04:57:52.000000000 +0100
+++ openssl-1.0.0-beta3/crypto/bf/bf_skey.c	2009-08-11 18:07:30.000000000 +0200
@@ -59,10 +59,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <openssl/blowfish.h>
+#include <openssl/crypto.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #include "bf_locl.h"
 #include "bf_pi.h"
 
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+FIPS_NON_FIPS_VCIPHER_Init(BF)
 	{
 	int i;
 	BF_LONG *p,ri,in[2];
diff -up openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips openssl-1.0.0-beta3/crypto/bf/blowfish.h
--- openssl-1.0.0-beta3/crypto/bf/blowfish.h.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/bf/blowfish.h	2009-08-11 18:07:30.000000000 +0200
@@ -104,7 +104,9 @@ typedef struct bf_key_st
 	BF_LONG S[4*256];
 	} BF_KEY;
 
- 
+#ifdef OPENSSL_FIPS 
+void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
+#endif
 void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
 
 void BF_encrypt(BF_LONG *data,const BF_KEY *key);
diff -up openssl-1.0.0-beta3/crypto/bn/bn.h.fips openssl-1.0.0-beta3/crypto/bn/bn.h
--- openssl-1.0.0-beta3/crypto/bn/bn.h.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/bn/bn.h	2009-08-11 18:07:30.000000000 +0200
@@ -540,6 +540,17 @@ int	BN_is_prime_ex(const BIGNUM *p,int n
 int	BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
 		int do_trial_division, BN_GENCB *cb);
 
+int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
+
+int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
+			const BIGNUM *Xp, const BIGNUM *Xp1, const BIGNUM *Xp2,
+			const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb);
+int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
+			BIGNUM *Xp1, BIGNUM *Xp2,
+			const BIGNUM *Xp,
+			const BIGNUM *e, BN_CTX *ctx,
+			BN_GENCB *cb);
+
 BN_MONT_CTX *BN_MONT_CTX_new(void );
 void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
 int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
diff -up /dev/null openssl-1.0.0-beta3/crypto/bn/bn_x931p.c
--- /dev/null	2009-07-27 08:39:22.849064505 +0200
+++ openssl-1.0.0-beta3/crypto/bn/bn_x931p.c	2009-08-11 18:07:30.000000000 +0200
@@ -0,0 +1,272 @@
+/* bn_x931p.c */
+/* Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL
+ * project 2005.
+ */
+/* ====================================================================
+ * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing at OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <openssl/bn.h>
+
+/* X9.31 routines for prime derivation */
+
+/* X9.31 prime derivation. This is used to generate the primes pi
+ * (p1, p2, q1, q2) from a parameter Xpi by checking successive odd
+ * integers.
+ */
+
+static int bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx,
+			BN_GENCB *cb)
+	{
+	int i = 0;
+	if (!BN_copy(pi, Xpi))
+		return 0;
+	if (!BN_is_odd(pi) && !BN_add_word(pi, 1))
+		return 0;
+	for(;;)
+		{
+		i++;
+		BN_GENCB_call(cb, 0, i);
+		/* NB 27 MR is specificed in X9.31 */
+		if (BN_is_prime_fasttest_ex(pi, 27, ctx, 1, cb))
+			break;
+		if (!BN_add_word(pi, 2))
+			return 0;
+		}
+	BN_GENCB_call(cb, 2, i);
+	return 1;
+	}
+
+/* This is the main X9.31 prime derivation function. From parameters
+ * Xp1, Xp2 and Xp derive the prime p. If the parameters p1 or p2 are
+ * not NULL they will be returned too: this is needed for testing.
+ */
+
[...11626 lines suppressed...]
+#endif
+
 	if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
 		{
 		/* we have SSLv3/TLSv1 in an SSLv2 header
diff -up openssl-1.0.0-beta3/ssl/s3_clnt.c.fips openssl-1.0.0-beta3/ssl/s3_clnt.c
--- openssl-1.0.0-beta3/ssl/s3_clnt.c.fips	2009-06-16 18:39:20.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_clnt.c	2009-08-11 18:07:30.000000000 +0200
@@ -156,6 +156,10 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
@@ -1524,6 +1528,8 @@ int ssl3_get_key_exchange(SSL *s)
 			q=md_buf;
 			for (num=2; num > 0; num--)
 				{
+				EVP_MD_CTX_set_flags(&md_ctx,
+					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 				EVP_DigestInit_ex(&md_ctx,(num == 2)
 					?s->ctx->md5:s->ctx->sha1, NULL);
 				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
diff -up openssl-1.0.0-beta3/ssl/s3_enc.c.fips openssl-1.0.0-beta3/ssl/s3_enc.c
--- openssl-1.0.0-beta3/ssl/s3_enc.c.fips	2009-04-16 19:22:50.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_enc.c	2009-08-11 18:07:30.000000000 +0200
@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *
 #endif
 	k=0;
 	EVP_MD_CTX_init(&m5);
+	EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 	EVP_MD_CTX_init(&s1);
 	for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
 		{
@@ -614,6 +615,8 @@ int ssl3_digest_cached_records(SSL *s)
 		if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
 			{
 			s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
+			EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
+				EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 			EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
 			EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
 			} 
@@ -670,6 +673,7 @@ static int ssl3_handshake_mac(SSL *s, in
 		return 0;
 	}	
 	EVP_MD_CTX_init(&ctx);
+	EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 	EVP_MD_CTX_copy_ex(&ctx,d);
 	n=EVP_MD_CTX_size(&ctx);
 	if (n < 0)
diff -up openssl-1.0.0-beta3/ssl/s3_srvr.c.fips openssl-1.0.0-beta3/ssl/s3_srvr.c
--- openssl-1.0.0-beta3/ssl/s3_srvr.c.fips	2009-06-26 17:04:22.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_srvr.c	2009-08-11 18:07:30.000000000 +0200
@@ -1674,6 +1674,8 @@ int ssl3_send_server_key_exchange(SSL *s
 				j=0;
 				for (num=2; num > 0; num--)
 					{
+					EVP_MD_CTX_set_flags(&md_ctx,
+						EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 					EVP_DigestInit_ex(&md_ctx,(num == 2)
 						?s->ctx->md5:s->ctx->sha1, NULL);
 					EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips openssl-1.0.0-beta3/ssl/ssl_ciph.c
--- openssl-1.0.0-beta3/ssl/ssl_ciph.c.fips	2009-04-07 14:10:59.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-11 18:07:30.000000000 +0200
@@ -727,6 +727,9 @@ static void ssl_cipher_collect_ciphers(c
 		    !(c->algorithm_auth & disabled_auth) &&
 		    !(c->algorithm_enc & disabled_enc) &&
 		    !(c->algorithm_mac & disabled_mac) &&
+#ifdef OPENSSL_FIPS
+			(!FIPS_mode() || (c->algo_strength & SSL_FIPS)) &&
+#endif
 		    !(c->algorithm_ssl & disabled_ssl))
 			{
 			co_list[co_list_num].cipher = c;
@@ -1423,7 +1426,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
 	 */
 	for (curr = head; curr != NULL; curr = curr->next)
 		{
+#ifdef OPENSSL_FIPS
+		if (curr->active && (!FIPS_mode() || curr->cipher->algo_strength & SSL_FIPS))
+#else
 		if (curr->active)
+#endif
 			{
 			sk_SSL_CIPHER_push(cipherstack, curr->cipher);
 #ifdef CIPHER_DEBUG
diff -up openssl-1.0.0-beta3/ssl/ssl_lib.c.fips openssl-1.0.0-beta3/ssl/ssl_lib.c
--- openssl-1.0.0-beta3/ssl/ssl_lib.c.fips	2009-06-30 13:57:24.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-08-11 18:07:30.000000000 +0200
@@ -1470,6 +1470,14 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
 		return(NULL);
 		}
 
+#ifdef OPENSSL_FIPS
+	if (FIPS_mode() && (meth->version < TLS1_VERSION))	
+		{
+		SSLerr(SSL_F_SSL_CTX_NEW, SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+		return NULL;
+		}
+#endif
+
 	if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0)
 		{
 		SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
diff -up openssl-1.0.0-beta3/ssl/ssltest.c.fips openssl-1.0.0-beta3/ssl/ssltest.c
--- openssl-1.0.0-beta3/ssl/ssltest.c.fips	2009-08-11 18:07:30.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssltest.c	2009-08-11 18:07:30.000000000 +0200
@@ -265,6 +265,9 @@ static void sv_usage(void)
 	{
 	fprintf(stderr,"usage: ssltest [args ...]\n");
 	fprintf(stderr,"\n");
+#ifdef OPENSSL_FIPS
+	fprintf(stderr,"-F             - run test in FIPS mode\n");
+#endif
 	fprintf(stderr," -server_auth  - check server certificate\n");
 	fprintf(stderr," -client_auth  - do client authentication\n");
 	fprintf(stderr," -proxy        - allow proxy certificates\n");
@@ -484,6 +487,9 @@ int main(int argc, char *argv[])
 #endif
 	STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
 	int test_cipherlist = 0;
+#ifdef OPENSSL_FIPS
+	int fips_mode=0;
+#endif
 
 	verbose = 0;
 	debug = 0;
@@ -515,7 +521,16 @@ int main(int argc, char *argv[])
 
 	while (argc >= 1)
 		{
-		if	(strcmp(*argv,"-server_auth") == 0)
+		if(!strcmp(*argv,"-F"))
+			{
+#ifdef OPENSSL_FIPS
+			fips_mode=1;
+#else
+			fprintf(stderr,"not compiled with FIPS support, so exitting without running.\n");
+			EXIT(0);
+#endif
+			}
+		else if	(strcmp(*argv,"-server_auth") == 0)
 			server_auth=1;
 		else if	(strcmp(*argv,"-client_auth") == 0)
 			client_auth=1;
@@ -711,6 +726,20 @@ bad:
 		EXIT(1);
 		}
 
+#ifdef OPENSSL_FIPS
+	if(fips_mode)
+		{
+		if(!FIPS_mode_set(1))
+			{
+			ERR_load_crypto_strings();
+			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
+			EXIT(1);
+			}
+		else
+			fprintf(stderr,"*** IN FIPS MODE ***\n");
+		}
+#endif
+
 	if (print_time)
 		{
 		if (!bio_pair)
@@ -2153,12 +2182,12 @@ static int MS_CALLBACK app_verify_callba
 		}
 
 #ifndef OPENSSL_NO_X509_VERIFY
-# ifdef OPENSSL_FIPS
+# if 0
 	if(s->version == TLS1_VERSION)
 		FIPS_allow_md5(1);
 # endif
 	ok = X509_verify_cert(ctx);
-# ifdef OPENSSL_FIPS
+# if 0
 	if(s->version == TLS1_VERSION)
 		FIPS_allow_md5(0);
 # endif
diff -up openssl-1.0.0-beta3/ssl/t1_enc.c.fips openssl-1.0.0-beta3/ssl/t1_enc.c
--- openssl-1.0.0-beta3/ssl/t1_enc.c.fips	2009-04-19 20:03:13.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/t1_enc.c	2009-08-11 18:07:30.000000000 +0200
@@ -169,6 +169,8 @@ static void tls1_P_hash(const EVP_MD *md
 
 	HMAC_CTX_init(&ctx);
 	HMAC_CTX_init(&ctx_tmp);
+	HMAC_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+	HMAC_CTX_set_flags(&ctx_tmp, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 	HMAC_Init_ex(&ctx,sec,sec_len,md, NULL);
 	HMAC_Init_ex(&ctx_tmp,sec,sec_len,md, NULL);
 	if (seed1 != NULL) HMAC_Update(&ctx,seed1,seed1_len);

openssl-1.0.0-beta3-fipscheck.patch:
 Makefile               |   13 ++
 fips.c                 |  218 +++++++++++++++++++++++++++++++++++++++++++++++++
 fips_standalone_sha1.c |   42 ++++-----
 3 files changed, 251 insertions(+), 22 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-fipscheck.patch ---
diff -up openssl-1.0.0-beta3/crypto/fips/fips.c.fipscheck openssl-1.0.0-beta3/crypto/fips/fips.c
--- openssl-1.0.0-beta3/crypto/fips/fips.c.fipscheck	2009-08-10 20:11:59.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-08-10 20:11:59.000000000 +0200
@@ -47,6 +47,7 @@
  *
  */
 
+#define _GNU_SOURCE
 
 #include <openssl/rand.h>
 #include <openssl/fips_rand.h>
@@ -56,6 +57,9 @@
 #include <openssl/rsa.h>
 #include <string.h>
 #include <limits.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
@@ -165,6 +169,204 @@ int FIPS_selftest()
 	&& FIPS_selftest_dsa();
     }
 
+/* we implement what libfipscheck does ourselves */
+
+static int
+get_library_path(const char *libname, const char *symbolname, char *path, size_t pathlen)
+{
+	Dl_info info;
+	void *dl, *sym;
+	int rv = -1;
+
+        dl = dlopen(libname, RTLD_LAZY);
+        if (dl == NULL) {
+	        return -1;
+        }       
+
+	sym = dlsym(dl, symbolname);
+
+	if (sym != NULL && dladdr(sym, &info)) {
+		strncpy(path, info.dli_fname, pathlen-1);
+		path[pathlen-1] = '\0';
+		rv = 0;
+	}
+
+	dlclose(dl);	
+	
+	return rv;
+}
+
+static const char conv[] = "0123456789abcdef";
+
+static char *
+bin2hex(void *buf, size_t len)
+{
+	char *hex, *p;
+	unsigned char *src = buf;
+	
+	hex = malloc(len * 2 + 1);
+	if (hex == NULL)
+		return NULL;
+
+	p = hex;
+
+	while (len > 0) {
+		unsigned c;
+
+		c = *src;
+		src++;
+
+		*p = conv[c >> 4];
+		++p;
+		*p = conv[c & 0x0f];
+		++p;
+		--len;
+	}
+	*p = '\0';
+	return hex;
+}
+
+#define HMAC_PREFIX "." 
+#define HMAC_SUFFIX ".hmac" 
+#define READ_BUFFER_LENGTH 16384
+
+static char *
+make_hmac_path(const char *origpath)
+{
+	char *path, *p;
+	const char *fn;
+
+	path = malloc(sizeof(HMAC_PREFIX) + sizeof(HMAC_SUFFIX) + strlen(origpath));
+	if(path == NULL) {
+		return NULL;
+	}
+
+	fn = strrchr(origpath, '/');
+	if (fn == NULL) {
+		fn = origpath;
+	} else {
+		++fn;
+	}
+
+	strncpy(path, origpath, fn-origpath);
+	p = path + (fn - origpath);
+	p = stpcpy(p, HMAC_PREFIX);
+	p = stpcpy(p, fn);
+	p = stpcpy(p, HMAC_SUFFIX);
+
+	return path;
+}
+
+static const char hmackey[] = "orboDeJITITejsirpADONivirpUkvarP";
+
+static int
+compute_file_hmac(const char *path, void **buf, size_t *hmaclen)
+{
+	FILE *f = NULL;
+	int rv = -1;
+	unsigned char rbuf[READ_BUFFER_LENGTH];
+	size_t len;
+	unsigned int hlen;
+	HMAC_CTX c;
+
+	HMAC_CTX_init(&c);
+
+	f = fopen(path, "r");
+
+	if (f == NULL) {
+		goto end;
+	}
+
+	HMAC_Init(&c, hmackey, sizeof(hmackey)-1, EVP_sha256());
+
+	while ((len=fread(rbuf, 1, sizeof(rbuf), f)) != 0) {
+		HMAC_Update(&c, rbuf, len);
+	}
+
+	len = sizeof(rbuf);
+	/* reuse rbuf for hmac */
+	HMAC_Final(&c, rbuf, &hlen);
+
+	*buf = malloc(hlen);
+	if (*buf == NULL) {
+		goto end;
+	}
+
+	*hmaclen = hlen;
+
+	memcpy(*buf, rbuf, hlen);
+
+	rv = 0;
+end:
+	HMAC_CTX_cleanup(&c);
+
+	if (f)
+		fclose(f);
+
+	return rv;
+}
+
+static int
+FIPSCHECK_verify(const char *libname, const char *symbolname)
+{
+	char path[PATH_MAX+1];
+	int rv;
+	FILE *hf;
+	char *hmacpath, *p;
+	char *hmac = NULL;
+	size_t n;
+	
+	rv = get_library_path(libname, symbolname, path, sizeof(path));
+
+	if (rv < 0)
+		return 0;
+
+	hmacpath = make_hmac_path(path);
+
+	hf = fopen(hmacpath, "r");
+	if (hf == NULL) {
+		free(hmacpath);
+		return 0;
+	}
+
+	if (getline(&hmac, &n, hf) > 0) {
+		void *buf;
+		size_t hmaclen;
+		char *hex;
+
+		if ((p=strchr(hmac, '\n')) != NULL)
+			*p = '\0';
+
+		if (compute_file_hmac(path, &buf, &hmaclen) < 0) {
+			rv = -4;
+			goto end;
+		}
+
+		if ((hex=bin2hex(buf, hmaclen)) == NULL) {
+			free(buf);
+			rv = -5;
+			goto end;
+		}
+
+		if (strcmp(hex, hmac) != 0) {
+			rv = -1;
+		}
+		free(buf);
+		free(hex);
+	}
+
+end:
+	free(hmac);
+	free(hmacpath);
+	fclose(hf);
+
+	if (rv < 0)
+		return 0;
+
+	/* check successful */
+	return 1;	
+}
+
 int FIPS_mode_set(int onoff)
     {
     int fips_set_owning_thread();
@@ -201,6 +403,22 @@ int FIPS_mode_set(int onoff)
 	    }
 #endif
 
+	if(!FIPSCHECK_verify("libcrypto.so." SHLIB_VERSION_NUMBER,"FIPS_mode_set"))
+	    {
+	    FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FINGERPRINT_DOES_NOT_MATCH);
+	    fips_selftest_fail = 1;
+	    ret = 0;
+	    goto end;
+	    }
+
+	if(!FIPSCHECK_verify("libssl.so." SHLIB_VERSION_NUMBER,"SSL_CTX_new"))
+	    {
+	    FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FINGERPRINT_DOES_NOT_MATCH);
+	    fips_selftest_fail = 1;
+	    ret = 0;
+	    goto end;
+	    }
+
 	/* Perform RNG KAT before seeding */
 	if (!FIPS_selftest_rng())
 	    {
diff -up openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c.fipscheck openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c
--- openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c.fipscheck	2009-08-10 20:11:59.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips_standalone_sha1.c	2009-08-10 20:11:59.000000000 +0200
@@ -62,7 +62,7 @@ void OPENSSL_cleanse(void *p,size_t len)
 
 #ifdef OPENSSL_FIPS
 
-static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
+static void hmac_init(SHA256_CTX *md_ctx,SHA256_CTX *o_ctx,
 		      const char *key)
     {
     size_t len=strlen(key);
@@ -72,10 +72,10 @@ static void hmac_init(SHA_CTX *md_ctx,SH
 
     if (len > SHA_CBLOCK)
 	{
-	SHA1_Init(md_ctx);
-	SHA1_Update(md_ctx,key,len);
-	SHA1_Final(keymd,md_ctx);
-	len=20;
+	SHA256_Init(md_ctx);
+	SHA256_Update(md_ctx,key,len);
+	SHA256_Final(keymd,md_ctx);
+	len=SHA256_DIGEST_LENGTH;
 	}
     else
 	memcpy(keymd,key,len);
@@ -83,22 +83,22 @@ static void hmac_init(SHA_CTX *md_ctx,SH
 
     for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
 	pad[i]=0x36^keymd[i];
-    SHA1_Init(md_ctx);
-    SHA1_Update(md_ctx,pad,SHA_CBLOCK);
+    SHA256_Init(md_ctx);
+    SHA256_Update(md_ctx,pad,SHA256_CBLOCK);
 
     for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
 	pad[i]=0x5c^keymd[i];
-    SHA1_Init(o_ctx);
-    SHA1_Update(o_ctx,pad,SHA_CBLOCK);
+    SHA256_Init(o_ctx);
+    SHA256_Update(o_ctx,pad,SHA256_CBLOCK);
     }
 
-static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx)
+static void hmac_final(unsigned char *md,SHA256_CTX *md_ctx,SHA256_CTX *o_ctx)
     {
-    unsigned char buf[20];
+    unsigned char buf[SHA256_DIGEST_LENGTH];
 
-    SHA1_Final(buf,md_ctx);
-    SHA1_Update(o_ctx,buf,sizeof buf);
-    SHA1_Final(md,o_ctx);
+    SHA256_Final(buf,md_ctx);
+    SHA256_Update(o_ctx,buf,sizeof buf);
+    SHA256_Final(md,o_ctx);
     }
 
 #endif
@@ -106,7 +106,7 @@ static void hmac_final(unsigned char *md
 int main(int argc,char **argv)
     {
 #ifdef OPENSSL_FIPS
-    static char key[]="etaonrishdlcupfm";
+    static char key[]="orboDeJITITejsirpADONivirpUkvarP";
     int n,binary=0;
 
     if(argc < 2)
@@ -125,8 +125,8 @@ int main(int argc,char **argv)
     for(; n < argc ; ++n)
 	{
 	FILE *f=fopen(argv[n],"rb");
-	SHA_CTX md_ctx,o_ctx;
-	unsigned char md[20];
+	SHA256_CTX md_ctx,o_ctx;
+	unsigned char md[SHA256_DIGEST_LENGTH];
 	int i;
 
 	if(!f)
@@ -151,18 +151,18 @@ int main(int argc,char **argv)
 		else
 		    break;
 		}
-	    SHA1_Update(&md_ctx,buf,l);
+	    SHA256_Update(&md_ctx,buf,l);
 	    }
 	hmac_final(md,&md_ctx,&o_ctx);
 
 	if (binary)
 	    {
-	    fwrite(md,20,1,stdout);
+	    fwrite(md,SHA256_DIGEST_LENGTH,1,stdout);
 	    break;	/* ... for single(!) file */
 	    }
 
-	printf("HMAC-SHA1(%s)= ",argv[n]);
-	for(i=0 ; i < 20 ; ++i)
+/*	printf("HMAC-SHA1(%s)= ",argv[n]); */
+	for(i=0 ; i < SHA256_DIGEST_LENGTH ; ++i)
 	    printf("%02x",md[i]);
 	printf("\n");
 	}
diff -up openssl-1.0.0-beta3/crypto/fips/Makefile.fipscheck openssl-1.0.0-beta3/crypto/fips/Makefile
--- openssl-1.0.0-beta3/crypto/fips/Makefile.fipscheck	2009-08-10 20:11:59.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/Makefile	2009-08-10 20:27:45.000000000 +0200
@@ -16,6 +16,9 @@ GENERAL=Makefile
 TEST=fips_test_suite.c fips_randtest.c
 APPS=
 
+PROGRAM= fips_standalone_sha1
+EXE= $(PROGRAM)$(EXE_EXT)
+
 LIB=$(TOP)/libcrypto.a
 LIBSRC=fips_aes_selftest.c fips_des_selftest.c fips_hmac_selftest.c fips_rand_selftest.c \
     fips_rsa_selftest.c fips_sha1_selftest.c fips.c fips_dsa_selftest.c  fips_rand.c \
@@ -25,6 +28,8 @@ LIBOBJ=fips_aes_selftest.o fips_des_self
     fips_rsa_selftest.o fips_sha1_selftest.o fips.o fips_dsa_selftest.o  fips_rand.o \
     fips_rsa_x931g.o
 
+LIBCRYPTO=-L.. -lcrypto
+
 SRC= $(LIBSRC) fips_standalone_sha1.c
 
 EXHEADER= fips.h fips_rand.h
@@ -35,13 +40,15 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
 
-all:	lib
+all:	lib exe
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
 	@touch lib
 
+exe:	$(EXE)
+
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -77,5 +84,9 @@ dclean:
 clean:
 	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
+$(EXE): $(PROGRAM).o
+	FIPS_SHA_ASM=""; for i in $(SHA1_ASM_OBJ) sha256.o ; do FIPS_SHA_ASM="$$FIPS_SHA_ASM ../sha/$$i" ; done; \
+	$(CC) -o $@ $(CFLAGS) $(PROGRAM).o $$FIPS_SHA_ASM
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

openssl-1.0.0-beta3-fipsmode.patch:
 crypto/engine/eng_all.c |   14 ++++++++++
 crypto/evp/c_allc.c     |   62 ++++++++++++++++++++++++++++++++++++++++++++++++
 crypto/evp/c_alld.c     |   33 +++++++++++++++++++++++++
 crypto/o_init.c         |   38 +++++++++++++++++++++++++++++
 ssl/ssl_algs.c          |   38 +++++++++++++++++++++++++++++
 5 files changed, 185 insertions(+)

--- NEW FILE openssl-1.0.0-beta3-fipsmode.patch ---
diff -up openssl-1.0.0-beta3/crypto/engine/eng_all.c.fipsmode openssl-1.0.0-beta3/crypto/engine/eng_all.c
--- openssl-1.0.0-beta3/crypto/engine/eng_all.c.fipsmode	2009-07-01 16:55:58.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/engine/eng_all.c	2009-08-11 17:37:16.000000000 +0200
@@ -58,9 +58,23 @@
 
 #include "cryptlib.h"
 #include "eng_int.h"
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 void ENGINE_load_builtin_engines(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if (FIPS_mode()) {
+		/* We allow loading dynamic engine as a third party
+		   engine might be FIPS validated.
+		   User is disallowed to load non-validated engines
+		   by security policy. */
+		ENGINE_load_dynamic();
+		return;
+	}
+#endif
 #if 0
 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
 	 * it is the *only* way for standard builtin implementations to be be
diff -up openssl-1.0.0-beta3/crypto/evp/c_allc.c.fipsmode openssl-1.0.0-beta3/crypto/evp/c_allc.c
--- openssl-1.0.0-beta3/crypto/evp/c_allc.c.fipsmode	2007-04-24 01:48:28.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/evp/c_allc.c	2009-08-11 17:42:34.000000000 +0200
@@ -65,6 +65,11 @@
 void OpenSSL_add_all_ciphers(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if(!FIPS_mode()) 
+		{
+#endif
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cfb());
 	EVP_add_cipher(EVP_des_cfb1());
@@ -219,4 +224,61 @@ void OpenSSL_add_all_ciphers(void)
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede_cfb());
+	EVP_add_cipher(EVP_des_ede3_cfb());
+
+	EVP_add_cipher(EVP_des_ede_ofb());
+	EVP_add_cipher(EVP_des_ede3_ofb());
+
+	EVP_add_cipher(EVP_des_ede_cbc());
+	EVP_add_cipher(EVP_des_ede3_cbc());
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
+
+	EVP_add_cipher(EVP_des_ede());
+	EVP_add_cipher(EVP_des_ede3());
+#endif
+
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_ecb());
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_128_cfb());
+	EVP_add_cipher(EVP_aes_128_cfb1());
+	EVP_add_cipher(EVP_aes_128_cfb8());
+	EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_128_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
+	EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
+	EVP_add_cipher(EVP_aes_192_ecb());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_192_cfb());
+	EVP_add_cipher(EVP_aes_192_cfb1());
+	EVP_add_cipher(EVP_aes_192_cfb8());
+	EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_192_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
+	EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
+	EVP_add_cipher(EVP_aes_256_ecb());
+	EVP_add_cipher(EVP_aes_256_cbc());
+	EVP_add_cipher(EVP_aes_256_cfb());
+	EVP_add_cipher(EVP_aes_256_cfb1());
+	EVP_add_cipher(EVP_aes_256_cfb8());
+	EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_256_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#endif
+		}
+#endif
 	}
diff -up openssl-1.0.0-beta3/crypto/evp/c_alld.c.fipsmode openssl-1.0.0-beta3/crypto/evp/c_alld.c
--- openssl-1.0.0-beta3/crypto/evp/c_alld.c.fipsmode	2009-07-08 10:50:53.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/evp/c_alld.c	2009-08-11 17:54:08.000000000 +0200
@@ -64,6 +64,11 @@
 
 void OpenSSL_add_all_digests(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if (!FIPS_mode())
+		{
+#endif
 #ifndef OPENSSL_NO_MD4
 	EVP_add_digest(EVP_md4());
 #endif
@@ -110,5 +115,33 @@ void OpenSSL_add_all_digests(void)
 #endif
 #ifndef OPENSSL_NO_WHIRLPOOL
 	EVP_add_digest(EVP_whirlpool());
+#endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+	EVP_add_digest(EVP_sha1());
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#ifndef OPENSSL_NO_DSA
+	EVP_add_digest(EVP_dss1());
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+#endif
+#ifndef OPENSSL_NO_SHA256
+	EVP_add_digest(EVP_sha224());
+	EVP_add_digest(EVP_sha256());
+#endif
+#ifndef OPENSSL_NO_SHA512
+	EVP_add_digest(EVP_sha384());
+	EVP_add_digest(EVP_sha512());
+#endif
+		}
 #endif
 	}
diff -up openssl-1.0.0-beta3/crypto/o_init.c.fipsmode openssl-1.0.0-beta3/crypto/o_init.c
--- openssl-1.0.0-beta3/crypto/o_init.c.fipsmode	2009-08-11 17:28:25.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/o_init.c	2009-08-11 17:39:06.000000000 +0200
@@ -59,6 +59,43 @@
 #include <e_os.h>
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <openssl/fips.h>
+
+#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
+
+static void init_fips_mode(void)
+	{
+	char buf[2] = "0";
+	int fd;
+	
+	if (getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
+		{
+		buf[0] = '1';
+		}
+	else if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0)
+		{
+		while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR);
+		close(fd);
+		}
+	/* Failure reading the fips mode switch file means just not
+	 * switching into FIPS mode. We would break too many things
+	 * otherwise. 
+	 */
+	
+	if (buf[0] == '1')
+		{
+		FIPS_mode_set(1);
+		}
+	}
+#endif
+
 /* Perform any essential OpenSSL initialization operations.
  * Currently only sets FIPS callbacks
  */
@@ -72,6 +109,7 @@ void OPENSSL_init_library(void)
 #ifdef CRYPTO_MDEBUG
 		CRYPTO_malloc_debug_init();
 #endif
+		init_fips_mode();
 		done = 1;
 		}
 #endif
diff -up openssl-1.0.0-beta3/ssl/ssl_algs.c.fipsmode openssl-1.0.0-beta3/ssl/ssl_algs.c
--- openssl-1.0.0-beta3/ssl/ssl_algs.c.fipsmode	2009-07-08 10:50:53.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_algs.c	2009-08-11 18:01:13.000000000 +0200
@@ -64,6 +64,12 @@
 int SSL_library_init(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init_library();
+	if (!FIPS_mode())
+		{
+#endif
+
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cbc());
 	EVP_add_cipher(EVP_des_ede3_cbc());
@@ -115,6 +121,38 @@ int SSL_library_init(void)
 	EVP_add_digest(EVP_sha());
 	EVP_add_digest(EVP_dss());
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede3_cbc());
+#endif
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_256_cbc());
+#endif
+#ifndef OPENSSL_NO_MD5
+	/* needed even in the FIPS mode for TLS MAC */
+	EVP_add_digest(EVP_md5());
+#endif
+#ifndef OPENSSL_NO_SHA
+	EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#endif
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_DSA)
+	EVP_add_digest(EVP_dss1()); /* DSA with sha1 */
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+		}
+#endif
 #ifndef OPENSSL_NO_COMP
 	/* This will initialise the built-in compression algorithms.
 	   The value returned is a STACK_OF(SSL_COMP), but that can

openssl-1.0.0-beta3-fipsrng.patch:
 fips/fips.c      |   12 ++++++------
 fips/fips_rand.c |   14 +++++++++++++-
 rand/rand_lcl.h  |    5 ++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-fipsrng.patch ---
diff -up openssl-1.0.0-beta3/crypto/fips/fips.c.fipsrng openssl-1.0.0-beta3/crypto/fips/fips.c
--- openssl-1.0.0-beta3/crypto/fips/fips.c.fipsrng	2009-08-11 18:12:14.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips.c	2009-08-11 18:14:36.000000000 +0200
@@ -427,22 +427,22 @@ int FIPS_mode_set(int onoff)
 	    goto end;
 	    }
 
+	/* now switch the RNG into FIPS mode */
+	fips_set_rand_check(FIPS_rand_method());
+	RAND_set_rand_method(FIPS_rand_method());
+
 	/* automagically seed PRNG if not already seeded */
 	if(!FIPS_rand_status())
 	    {
-	    if(RAND_bytes(buf,sizeof buf) <= 0)
+	    RAND_poll();
+	    if (!FIPS_rand_status())
 		{
 		fips_selftest_fail = 1;
 		ret = 0;
 		goto end;
 		}
-	    FIPS_rand_set_key(buf,32);
-	    FIPS_rand_seed(buf+32,16);
 	    }
 
-	/* now switch into FIPS mode */
-	fips_set_rand_check(FIPS_rand_method());
-	RAND_set_rand_method(FIPS_rand_method());
 	if(FIPS_selftest())
 	    fips_set_mode(1);
 	else
diff -up openssl-1.0.0-beta3/crypto/fips/fips_rand.c.fipsrng openssl-1.0.0-beta3/crypto/fips/fips_rand.c
--- openssl-1.0.0-beta3/crypto/fips/fips_rand.c.fipsrng	2009-08-11 18:12:14.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/fips/fips_rand.c	2009-08-11 18:16:48.000000000 +0200
@@ -155,7 +155,18 @@ static int fips_set_prng_seed(FIPS_PRNG_
 	{
 	int i;
 	if (!ctx->keyed)
-		return 0;
+		{
+		FIPS_RAND_SIZE_T keylen = 16;
+
+		if (seedlen - keylen < AES_BLOCK_LENGTH)
+			return 0;
+		if (seedlen - keylen - 8 >= AES_BLOCK_LENGTH)
+			keylen += 8;
+		if (seedlen - keylen - 8 >= AES_BLOCK_LENGTH)
+			keylen += 8;
+		seedlen -= keylen;
+		fips_set_prng_key(ctx, seed+seedlen, keylen);
+		}
 	/* In test mode seed is just supplied data */
 	if (ctx->test_mode)
 		{
@@ -276,6 +287,7 @@ static int fips_rand(FIPS_PRNG_CTX *ctx,
 	unsigned char R[AES_BLOCK_LENGTH], I[AES_BLOCK_LENGTH];
 	unsigned char tmp[AES_BLOCK_LENGTH];
 	int i;
+	FIPS_selftest_check();
 	if (ctx->error)
 		{
 		RANDerr(RAND_F_FIPS_RAND,RAND_R_PRNG_ERROR);
diff -up openssl-1.0.0-beta3/crypto/rand/rand_lcl.h.fipsrng openssl-1.0.0-beta3/crypto/rand/rand_lcl.h
--- openssl-1.0.0-beta3/crypto/rand/rand_lcl.h.fipsrng	2009-08-11 18:12:13.000000000 +0200
+++ openssl-1.0.0-beta3/crypto/rand/rand_lcl.h	2009-08-11 18:18:13.000000000 +0200
@@ -112,8 +112,11 @@
 #ifndef HEADER_RAND_LCL_H
 #define HEADER_RAND_LCL_H
 
+#ifndef OPENSSL_FIPS
 #define ENTROPY_NEEDED 32  /* require 256 bits = 32 bytes of randomness */
-
+#else
+#define ENTROPY_NEEDED 48  /* we need 48 bytes of randomness for FIPS rng */
+#endif
 
 #if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)

openssl-1.0.0-beta3-ipv6-apps.patch:
 s_apps.h   |    7 -
 s_client.c |    9 -
 s_server.c |    9 -
 s_socket.c |  315 ++++++++++++++++++++++++-------------------------------------
 4 files changed, 140 insertions(+), 200 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-ipv6-apps.patch ---
diff -up openssl-1.0.0-beta3/apps/s_apps.h.ipv6-apps openssl-1.0.0-beta3/apps/s_apps.h
--- openssl-1.0.0-beta3/apps/s_apps.h.ipv6-apps	2009-08-05 21:29:58.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_apps.h	2009-08-05 21:29:58.000000000 +0200
@@ -148,7 +148,7 @@ typedef fd_mask fd_set;
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
+int do_server(char *port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
@@ -156,10 +156,9 @@ int MS_CALLBACK verify_callback(int ok, 
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
 #endif
-int init_client(int *sock, char *server, int port, int type);
+int init_client(int *sock, char *server, char *port, int type);
 int should_retry(int i);
-int extract_port(char *str, short *port_ptr);
-int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
+int extract_host_port(char *str,char **host_ptr,char **port_ptr);
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 				   int argi, long argl, long ret);
diff -up openssl-1.0.0-beta3/apps/s_client.c.ipv6-apps openssl-1.0.0-beta3/apps/s_client.c
--- openssl-1.0.0-beta3/apps/s_client.c.ipv6-apps	2009-08-05 21:29:58.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_client.c	2009-08-05 22:33:44.000000000 +0200
@@ -388,7 +388,7 @@ int MAIN(int argc, char **argv)
 	int cbuf_len,cbuf_off;
 	int sbuf_len,sbuf_off;
 	fd_set readfds,writefds;
-	short port=PORT;
+	char *port_str = PORT_STR;
 	int full_log=1;
 	char *host=SSL_HOST_NAME;
 	char *cert_file=NULL,*key_file=NULL;
@@ -486,13 +486,12 @@ int MAIN(int argc, char **argv)
 		else if	(strcmp(*argv,"-port") == 0)
 			{
 			if (--argc < 1) goto bad;
-			port=atoi(*(++argv));
-			if (port == 0) goto bad;
+			port_str= *(++argv);
 			}
 		else if (strcmp(*argv,"-connect") == 0)
 			{
 			if (--argc < 1) goto bad;
-			if (!extract_host_port(*(++argv),&host,NULL,&port))
+			if (!extract_host_port(*(++argv),&host,&port_str))
 				goto bad;
 			}
 		else if	(strcmp(*argv,"-verify") == 0)
@@ -956,7 +955,7 @@ bad:
 
 re_start:
 
-	if (init_client(&s,host,port,socket_type) == 0)
+	if (init_client(&s,host,port_str,socket_type) == 0)
 		{
 		BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
 		SHUTDOWN(s);
diff -up openssl-1.0.0-beta3/apps/s_server.c.ipv6-apps openssl-1.0.0-beta3/apps/s_server.c
--- openssl-1.0.0-beta3/apps/s_server.c.ipv6-apps	2009-08-05 21:29:58.000000000 +0200
+++ openssl-1.0.0-beta3/apps/s_server.c	2009-08-05 21:29:58.000000000 +0200
@@ -837,7 +837,7 @@ int MAIN(int argc, char *argv[])
 	{
 	X509_VERIFY_PARAM *vpm = NULL;
 	int badarg = 0;
-	short port=PORT;
+	char *port_str = PORT_STR;
 	char *CApath=NULL,*CAfile=NULL;
 	unsigned char *context = NULL;
 	char *dhfile = NULL;
@@ -907,8 +907,7 @@ int MAIN(int argc, char *argv[])
 			 (strcmp(*argv,"-accept") == 0))
 			{
 			if (--argc < 1) goto bad;
-			if (!extract_port(*(++argv),&port))
-				goto bad;
+			port_str= *(++argv);
 			}
 		else if	(strcmp(*argv,"-verify") == 0)
 			{
@@ -1685,9 +1684,9 @@ bad:
 	BIO_printf(bio_s_out,"ACCEPT\n");
 	(void)BIO_flush(bio_s_out);
 	if (www)
-		do_server(port,socket_type,&accept_socket,www_body, context);
+		do_server(port_str,socket_type,&accept_socket,www_body, context);
 	else
-		do_server(port,socket_type,&accept_socket,sv_body, context);
+		do_server(port_str,socket_type,&accept_socket,sv_body, context);
 	print_stats(bio_s_out,ctx);
 	ret=0;
 end:
diff -up openssl-1.0.0-beta3/apps/s_socket.c.ipv6-apps openssl-1.0.0-beta3/apps/s_socket.c
--- openssl-1.0.0-beta3/apps/s_socket.c.ipv6-apps	2008-11-12 04:57:47.000000000 +0100
+++ openssl-1.0.0-beta3/apps/s_socket.c	2009-08-05 21:29:58.000000000 +0200
@@ -96,9 +96,7 @@ static struct hostent *GetHostByName(cha
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
-static int init_server(int *sock, int port, int type);
-static int init_server_long(int *sock, int port,char *ip, int type);
+static int init_server(int *sock, char *port, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int host_ip(char *str, unsigned char ip[4]);
 
@@ -228,58 +226,70 @@ static int ssl_sock_init(void)
 	return(1);
 	}
 
-int init_client(int *sock, char *host, int port, int type)
+int init_client(int *sock, char *host, char *port, int type)
 	{
-	unsigned char ip[4];
-
-	if (!host_ip(host,&(ip[0])))
-		{
-		return(0);
-		}
-	return(init_client_ip(sock,ip,port,type));
-	}
-
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
-	{
-	unsigned long addr;
-	struct sockaddr_in them;
-	int s,i;
+	struct addrinfo *res, *res0, hints;
+	char * failed_call = NULL;
+	int s;
+	int e;
 
 	if (!ssl_sock_init()) return(0);
 
-	memset((char *)&them,0,sizeof(them));
-	them.sin_family=AF_INET;
-	them.sin_port=htons((unsigned short)port);
-	addr=(unsigned long)
-		((unsigned long)ip[0]<<24L)|
-		((unsigned long)ip[1]<<16L)|
-		((unsigned long)ip[2]<< 8L)|
-		((unsigned long)ip[3]);
-	them.sin_addr.s_addr=htonl(addr);
-
-	if (type == SOCK_STREAM)
-		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-	else /* ( type == SOCK_DGRAM) */
-		s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
-			
-	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+	memset(&hints, '\0', sizeof(hints));
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_ADDRCONFIG;
+
+	e = getaddrinfo(host, port, &hints, &res);
+	if (e)
+	{
+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(e));
+		if (e == EAI_SYSTEM)
+			perror("getaddrinfo");
+		return (0);
+		}
 
+	res0 = res;
+	while (res)
+		{
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s == INVALID_SOCKET)
+			{
+			failed_call = "socket";
+			goto nextres;
+			}
 #if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
 	if (type == SOCK_STREAM)
 		{
-		i=0;
-		i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
-		if (i < 0) { perror("keepalive"); return(0); }
+			int i=0;
+			i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,
+				(char *)&i,sizeof(i));
+			if (i < 0) {
+				failed_call = "keepalive";
+				goto nextres;
+				}
 		}
 #endif
-
-	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-		{ closesocket(s); perror("connect"); return(0); }
+		if (connect(s,(struct sockaddr *)res->ai_addr,
+			res->ai_addrlen) == 0)
+			{
+			freeaddrinfo(res0);
 	*sock=s;
 	return(1);
 	}
 
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
+		failed_call = "socket";
+nextres:
+		if (s != INVALID_SOCKET)
+			close(s);
+		res = res->ai_next;
+		}
+	freeaddrinfo(res0);
+
+	perror(failed_call);
+	return(0);
+	}
+
+int do_server(char *port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
 	{
 	int sock;
 	char *name = NULL;
@@ -317,33 +327,38 @@ int do_server(int port, int type, int *r
 		}
 	}
 
-static int init_server_long(int *sock, int port, char *ip, int type)
+static int init_server(int *sock, char *port, int type)
 	{
-	int ret=0;
-	struct sockaddr_in server;
-	int s= -1,i;
+	struct addrinfo *res, *res0, hints;
+	char * failed_call = NULL;
+	char port_name[8];
+	int s;
+	int e;
 
 	if (!ssl_sock_init()) return(0);
 
-	memset((char *)&server,0,sizeof(server));
-	server.sin_family=AF_INET;
-	server.sin_port=htons((unsigned short)port);
-	if (ip == NULL)
-		server.sin_addr.s_addr=INADDR_ANY;
-	else
-/* Added for T3E, address-of fails on bit field (beckman at acl.lanl.gov) */
-#ifndef BIT_FIELD_LIMITS
-		memcpy(&server.sin_addr.s_addr,ip,4);
-#else
-		memcpy(&server.sin_addr,ip,4);
-#endif
+	memset(&hints, '\0', sizeof(hints));
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
 	
-		if (type == SOCK_STREAM)
-			s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-		else /* type == SOCK_DGRAM */
-			s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
+	e = getaddrinfo(NULL, port, &hints, &res);
+	if (e)
+		{
+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(e));
+		if (e == EAI_SYSTEM)
+			perror("getaddrinfo");
+		return (0);
+		}
 
-	if (s == INVALID_SOCKET) goto err;
+	res0 = res;
+	while (res)
+		{
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s == INVALID_SOCKET)
+			{
+			failed_call = "socket";
+			goto nextres;
+			}
 #if defined SOL_SOCKET && defined SO_REUSEADDR
 		{
 		int j = 1;
@@ -351,36 +366,39 @@ static int init_server_long(int *sock, i
 			   (void *) &j, sizeof j);
 		}
 #endif
-	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
+
+		if (bind(s,(struct sockaddr *)res->ai_addr, res->ai_addrlen) == -1)
 		{
-#ifndef OPENSSL_SYS_WINDOWS
-		perror("bind");
-#endif
-		goto err;
+			failed_call = "bind";
+			goto nextres;
 		}
-	/* Make it 128 for linux */
-	if (type==SOCK_STREAM && listen(s,128) == -1) goto err;
-	i=0;
-	*sock=s;
-	ret=1;
-err:
-	if ((ret == 0) && (s != -1))
+		if (type==SOCK_STREAM && listen(s,128) == -1)
 		{
-		SHUTDOWN(s);
+			failed_call = "listen";
+			goto nextres;
 		}
-	return(ret);
+
+		*sock=s;
+		return(1);
+
+nextres:
+		if (s != INVALID_SOCKET)
+			close(s);
+		res = res->ai_next;
 	}
+	freeaddrinfo(res0);
 
-static int init_server(int *sock, int port, int type)
-	{
-	return(init_server_long(sock, port, NULL, type));
+	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+
+	perror(failed_call);
+	return(0);
 	}
 
 static int do_accept(int acc_sock, int *sock, char **host)
 	{
-	int ret,i;
-	struct hostent *h1,*h2;
-	static struct sockaddr_in from;
+	static struct sockaddr_storage from;
+	char buffer[NI_MAXHOST];
+	int ret;
 	int len;
 /*	struct linger ling; */
 
@@ -425,137 +443,62 @@ redoit:
 	if (i < 0) { perror("keepalive"); return(0); }
 */
 
-	if (host == NULL) goto end;
-#ifndef BIT_FIELD_LIMITS
-	/* I should use WSAAsyncGetHostByName() under windows */
-	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
-		sizeof(from.sin_addr.s_addr),AF_INET);
-#else
-	h1=gethostbyaddr((char *)&from.sin_addr,
-		sizeof(struct in_addr),AF_INET);
-#endif
-	if (h1 == NULL)
+	if (host == NULL)
 		{
-		BIO_printf(bio_err,"bad gethostbyaddr\n");
-		*host=NULL;
-		/* return(0); */
-		}
-	else
-		{
-		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
-			{
-			perror("OPENSSL_malloc");
+		*sock=ret;
 			return(0);
 			}
-		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
 
-		h2=GetHostByName(*host);
-		if (h2 == NULL)
+	if (getnameinfo((struct sockaddr *)&from, sizeof(from),
+		buffer, sizeof(buffer),
+		NULL, 0, 0))
 			{
-			BIO_printf(bio_err,"gethostbyname failure\n");
+		BIO_printf(bio_err,"getnameinfo failed\n");
+		*host=NULL;
 			return(0);
 			}
-		i=0;
-		if (h2->h_addrtype != AF_INET)
+	else
 			{
-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
+		if ((*host=(char *)OPENSSL_malloc(strlen(buffer)+1)) == NULL)
+			{
+			perror("OPENSSL_malloc");
 			return(0);
 			}
-		}
-end:
+		strcpy(*host, buffer);
 	*sock=ret;
 	return(1);
 	}
+	}
 
-int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
-	     short *port_ptr)
+int extract_host_port(char *str, char **host_ptr, 
+	     char **port_ptr)
 	{
-	char *h,*p;
+	char *h,*p,*x;
 
-	h=str;
-	p=strchr(str,':');
+	x=h=str;
+	if (*h == '[')
+		{
+		h++;
+		p=strchr(h,']');
 	if (p == NULL)
 		{
-		BIO_printf(bio_err,"no port defined\n");
+			BIO_printf(bio_err,"no ending bracket for IPv6 address\n");
 		return(0);
 		}
 	*(p++)='\0';
-
-	if ((ip != NULL) && !host_ip(str,ip))
-		goto err;
-	if (host_ptr != NULL) *host_ptr=h;
-
-	if (!extract_port(p,port_ptr))
-		goto err;
-	return(1);
-err:
-	return(0);
+		x = p;
 	}
-
-static int host_ip(char *str, unsigned char ip[4])
-	{
-	unsigned int in[4]; 
-	int i;
-
-	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
-		{
-		for (i=0; i<4; i++)
-			if (in[i] > 255)
-				{
-				BIO_printf(bio_err,"invalid IP address\n");
-				goto err;
-				}
-		ip[0]=in[0];
-		ip[1]=in[1];
-		ip[2]=in[2];
-		ip[3]=in[3];
-		}
-	else
-		{ /* do a gethostbyname */
-		struct hostent *he;
-
-		if (!ssl_sock_init()) return(0);
-
-		he=GetHostByName(str);
-		if (he == NULL)
-			{
-			BIO_printf(bio_err,"gethostbyname failure\n");
-			goto err;
-			}
-		/* cast to short because of win16 winsock definition */
-		if ((short)he->h_addrtype != AF_INET)
+	p=strchr(x,':');
+	if (p == NULL)
 			{
-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
-			return(0);
-			}
-		ip[0]=he->h_addr_list[0][0];
-		ip[1]=he->h_addr_list[0][1];
-		ip[2]=he->h_addr_list[0][2];
-		ip[3]=he->h_addr_list[0][3];
-		}
-	return(1);
-err:
+		BIO_printf(bio_err,"no port defined\n");
 	return(0);
 	}
+	*(p++)='\0';
 
-int extract_port(char *str, short *port_ptr)
-	{
-	int i;
-	struct servent *s;
+	if (host_ptr != NULL) *host_ptr=h;
+	if (port_ptr != NULL) *port_ptr=p;
 
-	i=atoi(str);
-	if (i != 0)
-		*port_ptr=(unsigned short)i;
-	else
-		{
-		s=getservbyname(str,"tcp");
-		if (s == NULL)
-			{
-			BIO_printf(bio_err,"getservbyname failure for %s\n",str);
-			return(0);
-			}
-		*port_ptr=ntohs((unsigned short)s->s_port);
-		}
 	return(1);
 	}
 

openssl-1.0.0-beta3-krb5.patch:
 Makefile.org |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-krb5.patch ---
diff -up openssl-1.0.0-beta3/Makefile.org.krb5 openssl-1.0.0-beta3/Makefile.org
--- openssl-1.0.0-beta3/Makefile.org.krb5	2009-04-23 18:12:09.000000000 +0200
+++ openssl-1.0.0-beta3/Makefile.org	2009-08-04 23:01:16.000000000 +0200
@@ -299,7 +299,7 @@ build-shared: do_$(SHLIB_TARGET) link-sh
 
 do_$(SHLIB_TARGET):
 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
-		if [ "$(SHLIBDIRS)" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+		if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \

openssl-1.0.0-beta3-namingblk.patch:
 asn1/a_set.c      |   37 +++++++++++++++++++------------------
 asn1/asn1.h       |   13 +++++++------
 asn1/asn_pack.c   |    8 ++++----
 stack/safestack.h |   48 ++++++++++++++++++++++++------------------------
 4 files changed, 54 insertions(+), 52 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-namingblk.patch ---
Index: openssl/crypto/asn1/a_set.c
RCS File: /v/openssl/cvs/openssl/crypto/asn1/a_set.c,v
rcsdiff -q -kk '-r1.20' '-r1.20.2.1' -u '/v/openssl/cvs/openssl/crypto/asn1/a_set.c,v' 2>/dev/null
--- openssl/crypto/asn1/a_set.c 2009/01/01 18:30:50 1.20
+++ openssl/crypto/asn1/a_set.c 2009/07/27 21:21:25 1.20.2.1
@@ -85,7 +85,7 @@
     }
 
 /* int is_set:  if TRUE, then sort the contents (i.e. it isn't a SEQUENCE)    */
-int i2d_ASN1_SET(STACK_OF(BLOCK) *a, unsigned char **pp,
+int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
 		 i2d_of_void *i2d, int ex_tag, int ex_class,
 		 int is_set)
 	{
@@ -97,8 +97,8 @@
         int totSize;
 
 	if (a == NULL) return(0);
-	for (i=sk_BLOCK_num(a)-1; i>=0; i--)
-		ret+=i2d(sk_BLOCK_value(a,i),NULL);
+	for (i=sk_OPENSSL_BLOCK_num(a)-1; i>=0; i--)
+		ret+=i2d(sk_OPENSSL_BLOCK_value(a,i),NULL);
 	r=ASN1_object_size(1,ret,ex_tag);
 	if (pp == NULL) return(r);
 
@@ -109,10 +109,10 @@
 	/* And then again by Ben */
 	/* And again by Steve */
 
-	if(!is_set || (sk_BLOCK_num(a) < 2))
+	if(!is_set || (sk_OPENSSL_BLOCK_num(a) < 2))
 		{
-		for (i=0; i<sk_BLOCK_num(a); i++)
-                	i2d(sk_BLOCK_value(a,i),&p);
+		for (i=0; i<sk_OPENSSL_BLOCK_num(a); i++)
+                	i2d(sk_OPENSSL_BLOCK_value(a,i),&p);
 
 		*pp=p;
 		return(r);
@@ -120,17 +120,17 @@
 
         pStart  = p; /* Catch the beg of Setblobs*/
 		/* In this array we will store the SET blobs */
-		rgSetBlob = OPENSSL_malloc(sk_BLOCK_num(a) * sizeof(MYBLOB));
+		rgSetBlob = OPENSSL_malloc(sk_OPENSSL_BLOCK_num(a) * sizeof(MYBLOB));
 		if (rgSetBlob == NULL)
 			{
 			ASN1err(ASN1_F_I2D_ASN1_SET,ERR_R_MALLOC_FAILURE);
 			return(0);
 			}
 
-        for (i=0; i<sk_BLOCK_num(a); i++)
+        for (i=0; i<sk_OPENSSL_BLOCK_num(a); i++)
 	        {
                 rgSetBlob[i].pbData = p;  /* catch each set encode blob */
-                i2d(sk_BLOCK_value(a,i),&p);
+                i2d(sk_OPENSSL_BLOCK_value(a,i),&p);
                 rgSetBlob[i].cbData = p - rgSetBlob[i].pbData; /* Length of this
 SetBlob
 */
@@ -140,7 +140,7 @@
 
  /* Now we have to sort the blobs. I am using a simple algo.
     *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/
-        qsort( rgSetBlob, sk_BLOCK_num(a), sizeof(MYBLOB), SetBlobCmp);
+        qsort( rgSetBlob, sk_OPENSSL_BLOCK_num(a), sizeof(MYBLOB), SetBlobCmp);
 		if (!(pTempMem = OPENSSL_malloc(totSize)))
 			{
 			ASN1err(ASN1_F_I2D_ASN1_SET,ERR_R_MALLOC_FAILURE);
@@ -149,7 +149,7 @@
 
 /* Copy to temp mem */
         p = pTempMem;
-        for(i=0; i<sk_BLOCK_num(a); ++i)
+        for(i=0; i<sk_OPENSSL_BLOCK_num(a); ++i)
 		{
                 memcpy(p, rgSetBlob[i].pbData, rgSetBlob[i].cbData);
                 p += rgSetBlob[i].cbData;
@@ -163,17 +163,18 @@
         return(r);
         }
 
-STACK_OF(BLOCK) *d2i_ASN1_SET(STACK_OF(BLOCK) **a, const unsigned char **pp,
+STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
+			      const unsigned char **pp,
 			      long length, d2i_of_void *d2i,
-			      void (*free_func)(BLOCK), int ex_tag,
+			      void (*free_func)(OPENSSL_BLOCK), int ex_tag,
 			      int ex_class)
 	{
 	ASN1_const_CTX c;
-	STACK_OF(BLOCK) *ret=NULL;
+	STACK_OF(OPENSSL_BLOCK) *ret=NULL;
 
 	if ((a == NULL) || ((*a) == NULL))
 		{
-		if ((ret=sk_BLOCK_new_null()) == NULL)
+		if ((ret=sk_OPENSSL_BLOCK_new_null()) == NULL)
 			{
 			ASN1err(ASN1_F_D2I_ASN1_SET,ERR_R_MALLOC_FAILURE);
 			goto err;
@@ -221,7 +222,7 @@
 			asn1_add_error(*pp,(int)(c.p- *pp));
 			goto err;
 			}
-		if (!sk_BLOCK_push(ret,s)) goto err;
+		if (!sk_OPENSSL_BLOCK_push(ret,s)) goto err;
 		}
 	if (a != NULL) (*a)=ret;
 	*pp=c.p;
@@ -230,9 +231,9 @@
 	if ((ret != NULL) && ((a == NULL) || (*a != ret)))
 		{
 		if (free_func != NULL)
-			sk_BLOCK_pop_free(ret,free_func);
+			sk_OPENSSL_BLOCK_pop_free(ret,free_func);
 		else
-			sk_BLOCK_free(ret);
+			sk_OPENSSL_BLOCK_free(ret);
 		}
 	return(NULL);
 	}
Index: openssl/crypto/asn1/asn1.h
RCS File: /v/openssl/cvs/openssl/crypto/asn1/asn1.h,v
rcsdiff -q -kk '-r1.166.2.3' '-r1.166.2.4' -u '/v/openssl/cvs/openssl/crypto/asn1/asn1.h,v' 2>/dev/null
--- openssl/crypto/asn1/asn1.h 2009/07/24 11:15:55 1.166.2.3
+++ openssl/crypto/asn1/asn1.h 2009/07/27 21:21:25 1.166.2.4
@@ -887,12 +887,13 @@
 ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
 
-int i2d_ASN1_SET(STACK_OF(BLOCK) *a, unsigned char **pp,
+int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
 		 i2d_of_void *i2d, int ex_tag, int ex_class,
 		 int is_set);
-STACK_OF(BLOCK) *d2i_ASN1_SET(STACK_OF(BLOCK) **a, const unsigned char **pp,
+STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
+			      const unsigned char **pp,
 			      long length, d2i_of_void *d2i,
-			      void (*free_func)(BLOCK), int ex_tag,
+			      void (*free_func)(OPENSSL_BLOCK), int ex_tag,
 			      int ex_class);
 
 #ifndef OPENSSL_NO_BIO
@@ -1045,9 +1046,9 @@
 int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
 	unsigned char *data, int max_len);
 
-STACK_OF(BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-				 d2i_of_void *d2i, void (*free_func)(BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(BLOCK) *safes, i2d_of_void *i2d,
+STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
+				 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));
+unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
 			     unsigned char **buf, int *len );
 void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
 void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
Index: openssl/crypto/asn1/asn_pack.c
RCS File: /v/openssl/cvs/openssl/crypto/asn1/asn_pack.c,v
rcsdiff -q -kk '-r1.19' '-r1.19.2.1' -u '/v/openssl/cvs/openssl/crypto/asn1/asn_pack.c,v' 2>/dev/null
--- openssl/crypto/asn1/asn_pack.c 2008/11/12 03:57:49 1.19
+++ openssl/crypto/asn1/asn_pack.c 2009/07/27 21:21:25 1.19.2.1
@@ -66,10 +66,10 @@
 
 /* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
 
-STACK_OF(BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-				 d2i_of_void *d2i, void (*free_func)(BLOCK))
+STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
+			 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK))
 {
-    STACK_OF(BLOCK) *sk;
+    STACK_OF(OPENSSL_BLOCK) *sk;
     const unsigned char *pbuf;
     pbuf =  buf;
     if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
@@ -82,7 +82,7 @@
  * OPENSSL_malloc'ed buffer
  */
 
-unsigned char *ASN1_seq_pack(STACK_OF(BLOCK) *safes, i2d_of_void *i2d,
+unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
 			     unsigned char **buf, int *len)
 {
 	int safelen;
Index: openssl/crypto/stack/safestack.h
RCS File: /v/openssl/cvs/openssl/crypto/stack/safestack.h,v
rcsdiff -q -kk '-r1.72.2.4' '-r1.72.2.5' -u '/v/openssl/cvs/openssl/crypto/stack/safestack.h,v' 2>/dev/null
--- openssl/crypto/stack/safestack.h 2009/07/27 21:08:50 1.72.2.4
+++ openssl/crypto/stack/safestack.h 2009/07/27 21:21:25 1.72.2.5
@@ -128,8 +128,8 @@
  * nul-terminated. These should also be distinguished from "normal"
  * stacks. */
 
-typedef void *BLOCK;
-DECLARE_SPECIAL_STACK_OF(BLOCK, void)
+typedef void *OPENSSL_BLOCK;
+DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 
 /* SKM_sk_... stack macros are internal to safestack.h:
  * never use them directly, use sk_<type>_... instead */
@@ -2055,29 +2055,29 @@
 #define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
 
 
-#define sk_BLOCK_new(cmp) ((STACK_OF(BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_BLOCK_new_null() ((STACK_OF(BLOCK) *)sk_new_null())
-#define sk_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_value(st, i) ((BLOCK)sk_value(CHECKED_PTR_OF(STACK_OF(BLOCK), st), i))
-#define sk_BLOCK_num(st) SKM_sk_num(BLOCK, st)
-#define sk_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_SK_FREE_FUNC2(BLOCK, free_func))
-#define sk_BLOCK_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val), i)
-#define sk_BLOCK_free(st) SKM_sk_free(BLOCK, st)
-#define sk_BLOCK_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), i, CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_zero(st) SKM_sk_zero(BLOCK, (st))
-#define sk_BLOCK_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-#define sk_BLOCK_delete(st, i) SKM_sk_delete(BLOCK, (st), (i))
-#define sk_BLOCK_delete_ptr(st, ptr) (BLOCK *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_PTR_OF(void, ptr))
-#define sk_BLOCK_set_cmp_func(st, cmp)  \
+#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
+#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
+#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i))
+#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
+#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val), i)
+#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i, CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
+#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, ptr))
+#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
 	((int (*)(const void * const *,const void * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st), CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_BLOCK_dup(st) SKM_sk_dup(BLOCK, st)
-#define sk_BLOCK_shift(st) SKM_sk_shift(BLOCK, (st))
-#define sk_BLOCK_pop(st) (void *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(BLOCK), st))
-#define sk_BLOCK_sort(st) SKM_sk_sort(BLOCK, (st))
-#define sk_BLOCK_is_sorted(st) SKM_sk_is_sorted(BLOCK, (st))
+	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_CMP_FUNC(void, cmp)))
+#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st))
+#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
 
 
 #define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))

openssl-1.0.0-beta3-namingstr.patch:
 apps/apps.c              |   16 ++--
 apps/apps.h              |    6 -
 apps/asn1pars.c          |   16 ++--
 apps/ca.c                |   22 +++---
 apps/cms.c               |   64 ++++++++---------
 apps/crl2p7.c            |   12 +--
 apps/dgst.c              |   22 +++---
 apps/engine.c            |   40 +++++------
 apps/ocsp.c              |   18 ++---
 apps/pkcs12.c            |   12 +--
 apps/req.c               |   12 +--
 apps/s_server.c          |    6 -
 apps/smime.c             |   36 +++++-----
 apps/x509.c              |    6 -
 crypto/cryptlib.c        |   10 +-
 crypto/engine/eng_dyn.c  |   12 +--
 crypto/lhash/lhash.h     |    4 -
 crypto/stack/safestack.h |  168 +++++++++++++++++++++++------------------------
 crypto/txt_db/txt_db.c   |   60 ++++++++--------
 crypto/txt_db/txt_db.h   |   18 ++---
 crypto/x509v3/v3_utl.c   |   36 +++++-----
 crypto/x509v3/x509v3.h   |    8 +-
 22 files changed, 302 insertions(+), 302 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-namingstr.patch ---
Index: openssl/apps/apps.c
RCS File: /v/openssl/cvs/openssl/apps/apps.c,v
rcsdiff -q -kk '-r1.133.2.6' '-r1.133.2.7' -u '/v/openssl/cvs/openssl/apps/apps.c,v' 2>/dev/null
--- openssl/apps/apps.c 2009/06/29 16:09:58 1.133.2.6
+++ openssl/apps/apps.c 2009/07/27 21:08:43 1.133.2.7
@@ -1488,7 +1488,7 @@
 	return p;
 	}
 
-static unsigned long index_serial_hash(const CSTRING *a)
+static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
 	{
 	const char *n;
 
@@ -1497,7 +1497,7 @@
 	return(lh_strhash(n));
 	}
 
-static int index_serial_cmp(const CSTRING *a, const CSTRING *b)
+static int index_serial_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
 	{
 	const char *aa,*bb;
 
@@ -1509,16 +1509,16 @@
 static int index_name_qual(char **a)
 	{ return(a[0][0] == 'V'); }
 
-static unsigned long index_name_hash(const CSTRING *a)
+static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
 	{ return(lh_strhash(a[DB_name])); }
 
-int index_name_cmp(const CSTRING *a, const CSTRING *b)
+int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
 	{ return(strcmp(a[DB_name], b[DB_name])); }
 
-static IMPLEMENT_LHASH_HASH_FN(index_serial, CSTRING)
-static IMPLEMENT_LHASH_COMP_FN(index_serial, CSTRING)
-static IMPLEMENT_LHASH_HASH_FN(index_name, CSTRING)
-static IMPLEMENT_LHASH_COMP_FN(index_name, CSTRING)
+static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
 
 #undef BSIZE
 #define BSIZE 256
Index: openssl/apps/apps.h
RCS File: /v/openssl/cvs/openssl/apps/apps.h,v
rcsdiff -q -kk '-r1.91' '-r1.91.2.1' -u '/v/openssl/cvs/openssl/apps/apps.h,v' 2>/dev/null
--- openssl/apps/apps.h 2008/11/24 17:27:05 1.91
+++ openssl/apps/apps.h 2009/07/27 21:08:44 1.91.2.1
@@ -295,9 +295,9 @@
 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
 void free_index(CA_DB *db);
 #define index_name_cmp_noconst(a, b) \
-	index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \
-	(const CSTRING *)CHECKED_PTR_OF(STRING, b))
-int index_name_cmp(const CSTRING *a, const CSTRING *b);
+	index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
+	(const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
+int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(char *str, long chtype, int multirdn);
Index: openssl/apps/asn1pars.c
RCS File: /v/openssl/cvs/openssl/apps/asn1pars.c,v
rcsdiff -q -kk '-r1.26' '-r1.26.2.1' -u '/v/openssl/cvs/openssl/apps/asn1pars.c,v' 2>/dev/null
--- openssl/apps/asn1pars.c 2008/11/05 18:38:51 1.26
+++ openssl/apps/asn1pars.c 2009/07/27 21:08:44 1.26.2.1
@@ -96,7 +96,7 @@
 	unsigned char *tmpbuf;
 	const unsigned char *ctmpbuf;
 	BUF_MEM *buf=NULL;
-	STACK_OF(STRING) *osk=NULL;
+	STACK_OF(OPENSSL_STRING) *osk=NULL;
 	ASN1_TYPE *at=NULL;
 
 	informat=FORMAT_PEM;
@@ -113,7 +113,7 @@
 	prog=argv[0];
 	argc--;
 	argv++;
-	if ((osk=sk_STRING_new_null()) == NULL)
+	if ((osk=sk_OPENSSL_STRING_new_null()) == NULL)
 		{
 		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto end;
@@ -169,7 +169,7 @@
 		else if (strcmp(*argv,"-strparse") == 0)
 			{
 			if (--argc < 1) goto bad;
-			sk_STRING_push(osk,*(++argv));
+			sk_OPENSSL_STRING_push(osk,*(++argv));
 			}
 		else if (strcmp(*argv,"-genstr") == 0)
 			{
@@ -302,18 +302,18 @@
 
 	/* If any structs to parse go through in sequence */
 
-	if (sk_STRING_num(osk))
+	if (sk_OPENSSL_STRING_num(osk))
 		{
 		tmpbuf=(unsigned char *)str;
 		tmplen=num;
-		for (i=0; i<sk_STRING_num(osk); i++)
+		for (i=0; i<sk_OPENSSL_STRING_num(osk); i++)
 			{
 			ASN1_TYPE *atmp;
 			int typ;
-			j=atoi(sk_STRING_value(osk,i));
+			j=atoi(sk_OPENSSL_STRING_value(osk,i));
 			if (j == 0)
 				{
-				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_STRING_value(osk,i));
+				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_OPENSSL_STRING_value(osk,i));
 				continue;
 				}
 			tmpbuf+=j;
@@ -378,7 +378,7 @@
 		ERR_print_errors(bio_err);
 	if (buf != NULL) BUF_MEM_free(buf);
 	if (at != NULL) ASN1_TYPE_free(at);
-	if (osk != NULL) sk_STRING_free(osk);
+	if (osk != NULL) sk_OPENSSL_STRING_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
Index: openssl/apps/ca.c
RCS File: /v/openssl/cvs/openssl/apps/ca.c,v
rcsdiff -q -kk '-r1.167' '-r1.167.2.1' -u '/v/openssl/cvs/openssl/apps/ca.c,v' 2>/dev/null
--- openssl/apps/ca.c 2009/03/09 13:59:07 1.167
+++ openssl/apps/ca.c 2009/07/27 21:08:44 1.167.2.1
@@ -883,9 +883,9 @@
 	if (db == NULL) goto err;
 
 	/* Lets check some fields */
-	for (i=0; i<sk_PSTRING_num(db->db->data); i++)
+	for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
 		{
-		pp=sk_PSTRING_value(db->db->data,i);
+		pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
 		if ((pp[DB_type][0] != DB_TYPE_REV) &&
 			(pp[DB_rev_date][0] != '\0'))
 			{
@@ -938,7 +938,7 @@
 #endif
 		TXT_DB_write(out,db->db);
 		BIO_printf(bio_err,"%d entries loaded from the database\n",
-			   sk_PSTRING_num(db->db->data));
+			   sk_OPENSSL_PSTRING_num(db->db->data));
 		BIO_printf(bio_err,"generating index\n");
 		}
 	
@@ -1408,9 +1408,9 @@
 
 		ASN1_TIME_free(tmptm);
 
-		for (i=0; i<sk_PSTRING_num(db->db->data); i++)
+		for (i=0; i<sk_OPENSSL_PSTRING_num(db->db->data); i++)
 			{
-			pp=sk_PSTRING_value(db->db->data,i);
+			pp=sk_OPENSSL_PSTRING_value(db->db->data,i);
 			if (pp[DB_type][0] == DB_TYPE_REV)
 				{
 				if ((r=X509_REVOKED_new()) == NULL) goto err;
@@ -1685,9 +1685,9 @@
 	int ok= -1,i,j,last,nid;
 	const char *p;
 	CONF_VALUE *cv;
-	STRING row[DB_NUMBER];
-	STRING *irow=NULL;
-	STRING *rrow=NULL;
+	OPENSSL_STRING row[DB_NUMBER];
+	OPENSSL_STRING *irow=NULL;
+	OPENSSL_STRING *rrow=NULL;
 	char buf[25];
 
 	tmptm=ASN1_UTCTIME_new();
@@ -1929,7 +1929,7 @@
 
 	if (db->attributes.unique_subject)
 		{
-		STRING *crow=row;
+		OPENSSL_STRING *crow=row;
 
 		rrow=TXT_DB_get_by_index(db->db,DB_name,crow);
 		if (rrow != NULL)
@@ -2632,9 +2632,9 @@
 	else
 		a_y2k = 0;
 
-	for (i = 0; i < sk_PSTRING_num(db->db->data); i++)
+	for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++)
 		{
-		rrow = sk_PSTRING_value(db->db->data, i);
+		rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);
 
 		if (rrow[DB_type][0] == 'V')
 		 	{
Index: openssl/apps/cms.c
RCS File: /v/openssl/cvs/openssl/apps/cms.c,v
rcsdiff -q -kk '-r1.23.2.1' '-r1.23.2.2' -u '/v/openssl/cvs/openssl/apps/cms.c,v' 2>/dev/null
--- openssl/apps/cms.c 2009/04/16 17:22:47 1.23.2.1
+++ openssl/apps/cms.c 2009/07/27 21:08:44 1.23.2.2
@@ -71,9 +71,9 @@
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
 static int cms_cb(int ok, X509_STORE_CTX *ctx);
 static void receipt_request_print(BIO *out, CMS_ContentInfo *cms);
-static CMS_ReceiptRequest *make_receipt_request(STACK_OF(STRING) *rr_to,
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to,
 						int rr_allorfirst,
-						STACK_OF(STRING) *rr_from);
+					STACK_OF(OPENSSL_STRING) *rr_from);
 
 #define SMIME_OP	0x10
 #define SMIME_IP	0x20
@@ -108,7 +108,7 @@
 	const char *inmode = "r", *outmode = "w";
 	char *infile = NULL, *outfile = NULL, *rctfile = NULL;
 	char *signerfile = NULL, *recipfile = NULL;
-	STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
+	STACK_OF(OPENSSL_STRING) *sksigners = NULL, *skkeys = NULL;
 	char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
 	char *certsoutfile = NULL;
 	const EVP_CIPHER *cipher = NULL;
@@ -122,7 +122,7 @@
 	int flags = CMS_DETACHED, noout = 0, print = 0;
 	int verify_retcode = 0;
 	int rr_print = 0, rr_allorfirst = -1;
-	STACK_OF(STRING) *rr_to = NULL, *rr_from = NULL;
+	STACK_OF(OPENSSL_STRING) *rr_to = NULL, *rr_from = NULL;
 	CMS_ReceiptRequest *rr = NULL;
 	char *to = NULL, *from = NULL, *subject = NULL;
 	char *CAfile = NULL, *CApath = NULL;
@@ -281,8 +281,8 @@
 				goto argerr;
 			args++;
 			if (!rr_from)
-				rr_from = sk_STRING_new_null();
-			sk_STRING_push(rr_from, *args);
+				rr_from = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(rr_from, *args);
 			}
 		else if (!strcmp(*args,"-receipt_request_to"))
 			{
@@ -290,8 +290,8 @@
 				goto argerr;
 			args++;
 			if (!rr_to)
-				rr_to = sk_STRING_new_null();
-			sk_STRING_push(rr_to, *args);
+				rr_to = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(rr_to, *args);
 			}
 		else if (!strcmp (*args, "-print"))
 				{
@@ -387,13 +387,13 @@
 			if (signerfile)
 				{
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				if (!keyfile)
 					keyfile = signerfile;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				keyfile = NULL;
 				}
 			signerfile = *++args;
@@ -435,12 +435,12 @@
 					goto argerr;
 					}
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				signerfile = NULL;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				}
 			keyfile = *++args;
 			}
@@ -539,13 +539,13 @@
 		if (signerfile)
 			{
 			if (!sksigners)
-				sksigners = sk_STRING_new_null();
-			sk_STRING_push(sksigners, signerfile);
+				sksigners = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(sksigners, signerfile);
 			if (!skkeys)
-				skkeys = sk_STRING_new_null();
+				skkeys = sk_OPENSSL_STRING_new_null();
 			if (!keyfile)
 				keyfile = signerfile;
-			sk_STRING_push(skkeys, keyfile);
+			sk_OPENSSL_STRING_push(skkeys, keyfile);
 			}
 		if (!sksigners)
 			{
@@ -980,11 +980,11 @@
 			}
 		else
 			flags |= CMS_REUSE_DIGEST;
-		for (i = 0; i < sk_STRING_num(sksigners); i++)
+		for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++)
 			{
 			CMS_SignerInfo *si;
-			signerfile = sk_STRING_value(sksigners, i);
-			keyfile = sk_STRING_value(skkeys, i);
+			signerfile = sk_OPENSSL_STRING_value(sksigners, i);
+			keyfile = sk_OPENSSL_STRING_value(skkeys, i);
 			signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
 					e, "signer certificate");
 			if (!signer)
@@ -1160,9 +1160,9 @@
 	if (vpm)
 		X509_VERIFY_PARAM_free(vpm);
 	if (sksigners)
-		sk_STRING_free(sksigners);
+		sk_OPENSSL_STRING_free(sksigners);
 	if (skkeys)
-		sk_STRING_free(skkeys);
+		sk_OPENSSL_STRING_free(skkeys);
 	if (secret_key)
 		OPENSSL_free(secret_key);
 	if (secret_keyid)
@@ -1172,9 +1172,9 @@
 	if (rr)
 		CMS_ReceiptRequest_free(rr);
 	if (rr_to)
-		sk_STRING_free(rr_to);
+		sk_OPENSSL_STRING_free(rr_to);
 	if (rr_from)
-		sk_STRING_free(rr_from);
+		sk_OPENSSL_STRING_free(rr_from);
 	X509_STORE_free(store);
 	X509_free(cert);
 	X509_free(recip);
@@ -1296,7 +1296,7 @@
 		}
 	}
 
-static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(STRING) *ns)
+static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(OPENSSL_STRING) *ns)
 	{
 	int i;
 	STACK_OF(GENERAL_NAMES) *ret;
@@ -1305,9 +1305,9 @@
 	ret = sk_GENERAL_NAMES_new_null();
 	if (!ret)
 		goto err;
-	for (i = 0; i < sk_STRING_num(ns); i++)
+	for (i = 0; i < sk_OPENSSL_STRING_num(ns); i++)
 		{
-		char *str = sk_STRING_value(ns, i);
+		char *str = sk_OPENSSL_STRING_value(ns, i);
 		gen = a2i_GENERAL_NAME(NULL, NULL, NULL, GEN_EMAIL, str, 0);
 		if (!gen)
 			goto err;
@@ -1335,9 +1335,9 @@
 	}
 
 
-static CMS_ReceiptRequest *make_receipt_request(STACK_OF(STRING) *rr_to,
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to,
 						int rr_allorfirst,
-						STACK_OF(STRING) *rr_from)
+						STACK_OF(OPENSSL_STRING) *rr_from)
 	{
 	STACK_OF(GENERAL_NAMES) *rct_to, *rct_from;
 	CMS_ReceiptRequest *rr;
Index: openssl/apps/crl2p7.c
RCS File: /v/openssl/cvs/openssl/apps/crl2p7.c,v
rcsdiff -q -kk '-r1.19' '-r1.19.2.1' -u '/v/openssl/cvs/openssl/apps/crl2p7.c,v' 2>/dev/null
--- openssl/apps/crl2p7.c 2008/06/04 11:00:45 1.19
+++ openssl/apps/crl2p7.c 2009/07/27 21:08:45 1.19.2.1
@@ -92,7 +92,7 @@
 	PKCS7 *p7 = NULL;
 	PKCS7_SIGNED *p7s = NULL;
 	X509_CRL *crl=NULL;
-	STACK_OF(STRING) *certflst=NULL;
+	STACK_OF(OPENSSL_STRING) *certflst=NULL;
 	STACK_OF(X509_CRL) *crl_stack=NULL;
 	STACK_OF(X509) *cert_stack=NULL;
 	int ret=1,nocrl=0;
@@ -140,8 +140,8 @@
 		else if (strcmp(*argv,"-certfile") == 0)
 			{
 			if (--argc < 1) goto bad;
-			if(!certflst) certflst = sk_STRING_new_null();
-			sk_STRING_push(certflst,*(++argv));
+			if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(certflst,*(++argv));
 			}
 		else
 			{
@@ -226,8 +226,8 @@
 	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
 	p7s->cert=cert_stack;
 
-	if(certflst) for(i = 0; i < sk_STRING_num(certflst); i++) {
-		certfile = sk_STRING_value(certflst, i);
+	if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+		certfile = sk_OPENSSL_STRING_value(certflst, i);
 		if (add_certs_from_file(cert_stack,certfile) < 0)
 			{
 			BIO_printf(bio_err, "error loading certificates\n");
@@ -236,7 +236,7 @@
 			}
 	}
 
-	sk_STRING_free(certflst);
+	sk_OPENSSL_STRING_free(certflst);
 
 	if (outfile == NULL)
 		{
Index: openssl/apps/dgst.c
RCS File: /v/openssl/cvs/openssl/apps/dgst.c,v
rcsdiff -q -kk '-r1.54.2.3' '-r1.54.2.4' -u '/v/openssl/cvs/openssl/apps/dgst.c,v' 2>/dev/null
--- openssl/apps/dgst.c 2009/04/26 12:16:12 1.54.2.3
+++ openssl/apps/dgst.c 2009/07/27 21:08:45 1.54.2.4
@@ -127,7 +127,7 @@
 #endif
 	char *hmac_key=NULL;
 	char *mac_name=NULL;
-	STACK_OF(STRING) *sigopts = NULL, *macopts = NULL;
+	STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
 
 	apps_startup();
 
@@ -230,8 +230,8 @@
 			if (--argc < 1)
 				break;
 			if (!sigopts)
-				sigopts = sk_STRING_new_null();
-			if (!sigopts || !sk_STRING_push(sigopts, *(++argv)))
+				sigopts = sk_OPENSSL_STRING_new_null();
+			if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
 				break;
 			}
 		else if (strcmp(*argv,"-macopt") == 0)
@@ -239,8 +239,8 @@
 			if (--argc < 1)
 				break;
 			if (!macopts)
-				macopts = sk_STRING_new_null();
-			if (!macopts || !sk_STRING_push(macopts, *(++argv)))
+				macopts = sk_OPENSSL_STRING_new_null();
+			if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv)))
 				break;
 			}
 		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
@@ -365,9 +365,9 @@
 		if (macopts)
 			{
 			char *macopt;
-			for (i = 0; i < sk_STRING_num(macopts); i++)
+			for (i = 0; i < sk_OPENSSL_STRING_num(macopts); i++)
 				{
-				macopt = sk_STRING_value(macopts, i);
+				macopt = sk_OPENSSL_STRING_value(macopts, i);
 				if (pkey_ctrl_string(mac_ctx, macopt) <= 0)
 					{
 					BIO_printf(bio_err,
@@ -424,9 +424,9 @@
 		if (sigopts)
 			{
 			char *sigopt;
-			for (i = 0; i < sk_STRING_num(sigopts); i++)
+			for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++)
 				{
-				sigopt = sk_STRING_value(sigopts, i);
+				sigopt = sk_OPENSSL_STRING_value(sigopts, i);
 				if (pkey_ctrl_string(pctx, sigopt) <= 0)
 					{
 					BIO_printf(bio_err,
@@ -531,9 +531,9 @@
 	BIO_free_all(out);
 	EVP_PKEY_free(sigkey);
 	if (sigopts)
-		sk_STRING_free(sigopts);
+		sk_OPENSSL_STRING_free(sigopts);
 	if (macopts)
-		sk_STRING_free(macopts);
+		sk_OPENSSL_STRING_free(macopts);
 	if(sigbuf) OPENSSL_free(sigbuf);
 	if (bmd != NULL) BIO_free(bmd);
 	apps_shutdown();
Index: openssl/apps/engine.c
RCS File: /v/openssl/cvs/openssl/apps/engine.c,v
rcsdiff -q -kk '-r1.34' '-r1.34.2.1' -u '/v/openssl/cvs/openssl/apps/engine.c,v' 2>/dev/null
--- openssl/apps/engine.c 2009/02/15 15:29:59 1.34
+++ openssl/apps/engine.c 2009/07/27 21:08:45 1.34.2.1
@@ -200,7 +200,7 @@
 	char *desc = NULL;
 	int flags;
 	int xpos = 0;
-	STACK_OF(STRING) *cmds = NULL;
+	STACK_OF(OPENSSL_STRING) *cmds = NULL;
 	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
 			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
 					0, NULL, NULL)) <= 0))
@@ -211,7 +211,7 @@
 		return 1;
 		}
 
-	cmds = sk_STRING_new_null();
+	cmds = sk_OPENSSL_STRING_new_null();
 
 	if(!cmds)
 		goto err;
@@ -284,16 +284,16 @@
 		BIO_printf(bio_out, "\n");
 	ret = 1;
 err:
-	if(cmds) sk_STRING_pop_free(cmds, identity);
+	if(cmds) sk_OPENSSL_STRING_pop_free(cmds, identity);
 	if(name) OPENSSL_free(name);
 	if(desc) OPENSSL_free(desc);
 	return ret;
 	}
 
-static void util_do_cmds(ENGINE *e, STACK_OF(STRING) *cmds, BIO *bio_out,
-			 const char *indent)
+static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
+			BIO *bio_out, const char *indent)
 	{
-	int loop, res, num = sk_STRING_num(cmds);
+	int loop, res, num = sk_OPENSSL_STRING_num(cmds);
 
 	if(num < 0)
 		{
@@ -304,7 +304,7 @@
 		{
 		char buf[256];
 		const char *cmd, *arg;
-		cmd = sk_STRING_value(cmds, loop);
+		cmd = sk_OPENSSL_STRING_value(cmds, loop);
 		res = 1; /* assume success */
 		/* Check if this command has no ":arg" */
 		if((arg = strstr(cmd, ":")) == NULL)
@@ -344,9 +344,9 @@
 	const char **pp;
 	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
 	ENGINE *e;
-	STACK_OF(STRING) *engines = sk_STRING_new_null();
-	STACK_OF(STRING) *pre_cmds = sk_STRING_new_null();
-	STACK_OF(STRING) *post_cmds = sk_STRING_new_null();
+	STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
+	STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
+	STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
 	int badops=1;
 	BIO *bio_out=NULL;
 	const char *indent = "     ";
@@ -393,20 +393,20 @@
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-			sk_STRING_push(pre_cmds,*argv);
+			sk_OPENSSL_STRING_push(pre_cmds,*argv);
 			}
 		else if (strcmp(*argv,"-post") == 0)
 			{
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-			sk_STRING_push(post_cmds,*argv);
+			sk_OPENSSL_STRING_push(post_cmds,*argv);
 			}
 		else if ((strncmp(*argv,"-h",2) == 0) ||
 				(strcmp(*argv,"-?") == 0))
 			goto skip_arg_loop;
 		else
-			sk_STRING_push(engines,*argv);
+			sk_OPENSSL_STRING_push(engines,*argv);
 		argc--;
 		argv++;
 		}
@@ -421,17 +421,17 @@
 		goto end;
 		}
 
-	if (sk_STRING_num(engines) == 0)
+	if (sk_OPENSSL_STRING_num(engines) == 0)
 		{
 		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
 			{
-			sk_STRING_push(engines,(char *)ENGINE_get_id(e));
+			sk_OPENSSL_STRING_push(engines,(char *)ENGINE_get_id(e));
 			}
 		}
 
-	for (i=0; i<sk_STRING_num(engines); i++)
+	for (i=0; i<sk_OPENSSL_STRING_num(engines); i++)
 		{
-		const char *id = sk_STRING_value(engines,i);
+		const char *id = sk_OPENSSL_STRING_value(engines,i);
 		if ((e = ENGINE_by_id(id)) != NULL)
 			{
 			const char *name = ENGINE_get_name(e);
@@ -533,9 +533,9 @@
 end:
 
 	ERR_print_errors(bio_err);
-	sk_STRING_pop_free(engines, identity);
-	sk_STRING_pop_free(pre_cmds, identity);
-	sk_STRING_pop_free(post_cmds, identity);
+	sk_OPENSSL_STRING_pop_free(engines, identity);
+	sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
+	sk_OPENSSL_STRING_pop_free(post_cmds, identity);
 	if (bio_out != NULL) BIO_free_all(bio_out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
Index: openssl/apps/ocsp.c
RCS File: /v/openssl/cvs/openssl/apps/ocsp.c,v
rcsdiff -q -kk '-r1.54.2.1' '-r1.54.2.2' -u '/v/openssl/cvs/openssl/apps/ocsp.c,v' 2>/dev/null
--- openssl/apps/ocsp.c 2009/04/02 15:19:03 1.54.2.1
+++ openssl/apps/ocsp.c 2009/07/27 21:08:45 1.54.2.2
@@ -99,7 +99,7 @@
 static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD * cert_id_md, X509 *issuer,
 				STACK_OF(OCSP_CERTID) *ids);
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-			      STACK_OF(STRING) *names,
+			      STACK_OF(OPENSSL_STRING) *names,
 			      STACK_OF(OCSP_CERTID) *ids, long nsec,
 			      long maxage);
 
@@ -153,7 +153,7 @@
 	int badarg = 0;
 	int i;
 	int ignore_err = 0;
-	STACK_OF(STRING) *reqnames = NULL;
+	STACK_OF(OPENSSL_STRING) *reqnames = NULL;
 	STACK_OF(OCSP_CERTID) *ids = NULL;
 
 	X509 *rca_cert = NULL;
@@ -170,7 +170,7 @@
 	SSL_load_error_strings();
 	OpenSSL_add_ssl_algorithms();
 	args = argv + 1;
-	reqnames = sk_STRING_new_null();
+	reqnames = sk_OPENSSL_STRING_new_null();
 	ids = sk_OCSP_CERTID_new_null();
 	while (!badarg && *args && *args[0] == '-')
 		{
@@ -432,7 +432,7 @@
 				if (!cert_id_md) cert_id_md = EVP_sha1();
 				if(!add_ocsp_cert(&req, cert, cert_id_md, issuer, ids))
 					goto end;
-				if(!sk_STRING_push(reqnames, *args))
+				if(!sk_OPENSSL_STRING_push(reqnames, *args))
 					goto end;
 				}
 			else badarg = 1;
@@ -445,7 +445,7 @@
 				if (!cert_id_md) cert_id_md = EVP_sha1();
 				if(!add_ocsp_serial(&req, *args, cert_id_md, issuer, ids))
 					goto end;
-				if(!sk_STRING_push(reqnames, *args))
+				if(!sk_OPENSSL_STRING_push(reqnames, *args))
 					goto end;
 				}
 			else badarg = 1;
@@ -901,7 +901,7 @@
 	OCSP_REQUEST_free(req);
 	OCSP_RESPONSE_free(resp);
 	OCSP_BASICRESP_free(bs);
-	sk_STRING_free(reqnames);
+	sk_OPENSSL_STRING_free(reqnames);
 	sk_OCSP_CERTID_free(ids);
 	sk_X509_pop_free(sign_other, X509_free);
 	sk_X509_pop_free(verify_other, X509_free);
@@ -971,7 +971,7 @@
 	}
 
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-			      STACK_OF(STRING) *names,
+			      STACK_OF(OPENSSL_STRING) *names,
 			      STACK_OF(OCSP_CERTID) *ids, long nsec,
 			      long maxage)
 	{
@@ -983,13 +983,13 @@
 
 	ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
 
-	if (!bs || !req || !sk_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
+	if (!bs || !req || !sk_OPENSSL_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
 		return 1;
 
 	for (i = 0; i < sk_OCSP_CERTID_num(ids); i++)
 		{
 		id = sk_OCSP_CERTID_value(ids, i);
-		name = sk_STRING_value(names, i);
+		name = sk_OPENSSL_STRING_value(names, i);
 		BIO_printf(out, "%s: ", name);
 
 		if(!OCSP_resp_find_status(bs, id, &status, &reason,
Index: openssl/apps/pkcs12.c
RCS File: /v/openssl/cvs/openssl/apps/pkcs12.c,v
rcsdiff -q -kk '-r1.92.2.1' '-r1.92.2.2' -u '/v/openssl/cvs/openssl/apps/pkcs12.c,v' 2>/dev/null
--- openssl/apps/pkcs12.c 2009/06/17 12:05:49 1.92.2.1
+++ openssl/apps/pkcs12.c 2009/07/27 21:08:45 1.92.2.2
@@ -117,7 +117,7 @@
     int ret = 1;
     int macver = 1;
     int noprompt = 0;
-    STACK_OF(STRING) *canames = NULL;
+    STACK_OF(OPENSSL_STRING) *canames = NULL;
     char *cpass = NULL, *mpass = NULL;
     char *passargin = NULL, *passargout = NULL, *passarg = NULL;
     char *passin = NULL, *passout = NULL;
@@ -222,8 +222,8 @@
 		} else if (!strcmp (*args, "-caname")) {
 		    if (args[1]) {
 			args++;	
-			if (!canames) canames = sk_STRING_new_null();
-			sk_STRING_push(canames, *args);
+			if (!canames) canames = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(canames, *args);
 		    } else badarg = 1;
 		} else if (!strcmp (*args, "-in")) {
 		    if (args[1]) {
@@ -549,9 +549,9 @@
 
 	/* Add any CA names */
 
-	for (i = 0; i < sk_STRING_num(canames); i++)
+	for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++)
 		{
-		catmp = (unsigned char *)sk_STRING_value(canames, i);
+		catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i);
 		X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
 		}
 
@@ -687,7 +687,7 @@
 #endif
     BIO_free(in);
     BIO_free_all(out);
-    if (canames) sk_STRING_free(canames);
+    if (canames) sk_OPENSSL_STRING_free(canames);
     if(passin) OPENSSL_free(passin);
     if(passout) OPENSSL_free(passout);
     apps_shutdown();
Index: openssl/apps/req.c
RCS File: /v/openssl/cvs/openssl/apps/req.c,v
rcsdiff -q -kk '-r1.139.2.2' '-r1.139.2.3' -u '/v/openssl/cvs/openssl/apps/req.c,v' 2>/dev/null
--- openssl/apps/req.c 2009/04/23 17:16:38 1.139.2.2
+++ openssl/apps/req.c 2009/07/27 21:08:45 1.139.2.3
@@ -165,7 +165,7 @@
 	EVP_PKEY_CTX *genctx = NULL;
 	const char *keyalg = NULL;
 	char *keyalgstr = NULL;
-	STACK_OF(STRING) *pkeyopts = NULL;
+	STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
 	EVP_PKEY *pkey=NULL;
 	int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
 	long newkey = -1;
@@ -306,8 +306,8 @@
 			if (--argc < 1)
 				goto bad;
 			if (!pkeyopts)
-				pkeyopts = sk_STRING_new_null();
-			if (!pkeyopts || !sk_STRING_push(pkeyopts, *(++argv)))
+				pkeyopts = sk_OPENSSL_STRING_new_null();
+			if (!pkeyopts || !sk_OPENSSL_STRING_push(pkeyopts, *(++argv)))
 				goto bad;
 			}
 		else if (strcmp(*argv,"-batch") == 0)
@@ -667,9 +667,9 @@
 		if (pkeyopts)
 			{
 			char *genopt;
-			for (i = 0; i < sk_STRING_num(pkeyopts); i++)
+			for (i = 0; i < sk_OPENSSL_STRING_num(pkeyopts); i++)
 				{
-				genopt = sk_STRING_value(pkeyopts, i);
+				genopt = sk_OPENSSL_STRING_value(pkeyopts, i);
 				if (pkey_ctrl_string(genctx, genopt) <= 0)
 					{
 					BIO_printf(bio_err,
@@ -1083,7 +1083,7 @@
 	if (genctx)
 		EVP_PKEY_CTX_free(genctx);
 	if (pkeyopts)
-		sk_STRING_free(pkeyopts);
+		sk_OPENSSL_STRING_free(pkeyopts);
 #ifndef OPENSSL_NO_ENGINE
 	if (gen_eng)
 		ENGINE_free(gen_eng);
Index: openssl/apps/s_server.c
RCS File: /v/openssl/cvs/openssl/apps/s_server.c,v
rcsdiff -q -kk '-r1.136.2.4' '-r1.136.2.5' -u '/v/openssl/cvs/openssl/apps/s_server.c,v' 2>/dev/null
--- openssl/apps/s_server.c 2009/06/30 16:10:24 1.136.2.4
+++ openssl/apps/s_server.c 2009/07/27 21:08:46 1.136.2.5
@@ -712,7 +712,7 @@
 	int use_ssl;
 	unsigned char *rspder = NULL;
 	int rspderlen;
-	STACK_OF(STRING) *aia = NULL;
+	STACK_OF(OPENSSL_STRING) *aia = NULL;
 	X509 *x = NULL;
 	X509_STORE_CTX inctx;
 	X509_OBJECT obj;
@@ -734,7 +734,7 @@
 	aia = X509_get1_ocsp(x);
 	if (aia)
 		{
-		if (!OCSP_parse_url(sk_STRING_value(aia, 0),
+		if (!OCSP_parse_url(sk_OPENSSL_STRING_value(aia, 0),
 			&host, &port, &path, &use_ssl))
 			{
 			BIO_puts(err, "cert_status: can't parse AIA URL\n");
@@ -742,7 +742,7 @@
 			}
 		if (srctx->verbose)
 			BIO_printf(err, "cert_status: AIA URL: %s\n",
-					sk_STRING_value(aia, 0));
+					sk_OPENSSL_STRING_value(aia, 0));
 		}
 	else
 		{
Index: openssl/apps/smime.c
RCS File: /v/openssl/cvs/openssl/apps/smime.c,v
rcsdiff -q -kk '-r1.69' '-r1.69.2.1' -u '/v/openssl/cvs/openssl/apps/smime.c,v' 2>/dev/null
--- openssl/apps/smime.c 2008/11/05 18:38:51 1.69
+++ openssl/apps/smime.c 2009/07/27 21:08:46 1.69.2.1
@@ -93,7 +93,7 @@
 	const char *inmode = "r", *outmode = "w";
 	char *infile = NULL, *outfile = NULL;
 	char *signerfile = NULL, *recipfile = NULL;
-	STACK_OF(STRING) *sksigners = NULL, *skkeys = NULL;
+	STACK_OF(OPENSSL_STRING) *sksigners = NULL, *skkeys = NULL;
 	char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
 	const EVP_CIPHER *cipher = NULL;
 	PKCS7 *p7 = NULL;
@@ -260,13 +260,13 @@
 			if (signerfile)
 				{
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				if (!keyfile)
 					keyfile = signerfile;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				keyfile = NULL;
 				}
 			signerfile = *++args;
@@ -302,12 +302,12 @@
 					goto argerr;
 					}
 				if (!sksigners)
-					sksigners = sk_STRING_new_null();
-				sk_STRING_push(sksigners, signerfile);
+					sksigners = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(sksigners, signerfile);
 				signerfile = NULL;
 				if (!skkeys)
-					skkeys = sk_STRING_new_null();
-				sk_STRING_push(skkeys, keyfile);
+					skkeys = sk_OPENSSL_STRING_new_null();
+				sk_OPENSSL_STRING_push(skkeys, keyfile);
 				}
 			keyfile = *++args;
 			}
@@ -389,13 +389,13 @@
 		if (signerfile)
 			{
 			if (!sksigners)
-				sksigners = sk_STRING_new_null();
-			sk_STRING_push(sksigners, signerfile);
+				sksigners = sk_OPENSSL_STRING_new_null();
+			sk_OPENSSL_STRING_push(sksigners, signerfile);
 			if (!skkeys)
-				skkeys = sk_STRING_new_null();
+				skkeys = sk_OPENSSL_STRING_new_null();
 			if (!keyfile)
 				keyfile = signerfile;
-			sk_STRING_push(skkeys, keyfile);
+			sk_OPENSSL_STRING_push(skkeys, keyfile);
 			}
 		if (!sksigners)
 			{
@@ -707,10 +707,10 @@
 			}
 		else
 			flags |= PKCS7_REUSE_DIGEST;
-		for (i = 0; i < sk_STRING_num(sksigners); i++)
+		for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++)
 			{
-			signerfile = sk_STRING_value(sksigners, i);
-			keyfile = sk_STRING_value(skkeys, i);
+			signerfile = sk_OPENSSL_STRING_value(sksigners, i);
+			keyfile = sk_OPENSSL_STRING_value(skkeys, i);
 			signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
 					e, "signer certificate");
 			if (!signer)
@@ -807,9 +807,9 @@
 	if (vpm)
 		X509_VERIFY_PARAM_free(vpm);
 	if (sksigners)
-		sk_STRING_free(sksigners);
+		sk_OPENSSL_STRING_free(sksigners);
 	if (skkeys)
-		sk_STRING_free(skkeys);
+		sk_OPENSSL_STRING_free(skkeys);
 	X509_STORE_free(store);
 	X509_free(cert);
 	X509_free(recip);
Index: openssl/apps/x509.c
RCS File: /v/openssl/cvs/openssl/apps/x509.c,v
rcsdiff -q -kk '-r1.102.2.3' '-r1.102.2.4' -u '/v/openssl/cvs/openssl/apps/x509.c,v' 2>/dev/null
--- openssl/apps/x509.c 2009/07/14 15:14:39 1.102.2.3
+++ openssl/apps/x509.c 2009/07/27 21:08:46 1.102.2.4
@@ -738,14 +738,14 @@
 			else if ((email == i) || (ocsp_uri == i))
 				{
 				int j;
-				STACK_OF(STRING) *emlst;
+				STACK_OF(OPENSSL_STRING) *emlst;
 				if (email == i)
 					emlst = X509_get1_email(x);
 				else
 					emlst = X509_get1_ocsp(x);
-				for (j = 0; j < sk_STRING_num(emlst); j++)
+				for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
 					BIO_printf(STDout, "%s\n",
-						   sk_STRING_value(emlst, j));
+						   sk_OPENSSL_STRING_value(emlst, j));
 				X509_email_free(emlst);
 				}
 			else if (aliasout == i)
Index: openssl/crypto/cryptlib.c
RCS File: /v/openssl/cvs/openssl/crypto/cryptlib.c,v
rcsdiff -q -kk '-r1.75.2.2' '-r1.75.2.3' -u '/v/openssl/cvs/openssl/crypto/cryptlib.c,v' 2>/dev/null
--- openssl/crypto/cryptlib.c 2009/05/05 19:23:14 1.75.2.2
+++ openssl/crypto/cryptlib.c 2009/07/27 21:08:48 1.75.2.3
@@ -174,7 +174,7 @@
 
 /* This is for applications to allocate new type names in the non-dynamic
    array of lock names.  These are numbered with positive numbers.  */
-static STACK_OF(STRING) *app_locks=NULL;
+static STACK_OF(OPENSSL_STRING) *app_locks=NULL;
 
 /* For applications that want a more dynamic way of handling threads, the
    following stack is used.  These are externally numbered with negative
@@ -210,7 +210,7 @@
 	SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
 #endif
 
-	if ((app_locks == NULL) && ((app_locks=sk_STRING_new_null()) == NULL))
+	if ((app_locks == NULL) && ((app_locks=sk_OPENSSL_STRING_new_null()) == NULL))
 		{
 		CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
 		return(0);
@@ -220,7 +220,7 @@
 		CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
 		return(0);
 		}
-	i=sk_STRING_push(app_locks,str);
+	i=sk_OPENSSL_STRING_push(app_locks,str);
 	if (!i)
 		OPENSSL_free(str);
 	else
@@ -651,10 +651,10 @@
 		return("dynamic");
 	else if (type < CRYPTO_NUM_LOCKS)
 		return(lock_names[type]);
-	else if (type-CRYPTO_NUM_LOCKS > sk_STRING_num(app_locks))
+	else if (type-CRYPTO_NUM_LOCKS > sk_OPENSSL_STRING_num(app_locks))
 		return("ERROR");
 	else
-		return(sk_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
+		return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
 	}
 
 #if	defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
Index: openssl/crypto/engine/eng_dyn.c
RCS File: /v/openssl/cvs/openssl/crypto/engine/eng_dyn.c,v
rcsdiff -q -kk '-r1.14' '-r1.14.2.1' -u '/v/openssl/cvs/openssl/crypto/engine/eng_dyn.c,v' 2>/dev/null
--- openssl/crypto/engine/eng_dyn.c 2008/06/04 11:01:29 1.14
+++ openssl/crypto/engine/eng_dyn.c 2009/07/27 21:08:49 1.14.2.1
@@ -146,7 +146,7 @@
 	 * 'dirs' for loading. Default is to use 'dirs' as a fallback. */
 	int dir_load;
 	/* A stack of directories from which ENGINEs could be loaded */
-	STACK_OF(STRING) *dirs;
+	STACK_OF(OPENSSL_STRING) *dirs;
 	};
 
 /* This is the "ex_data" index we obtain and reserve for use with our context
@@ -174,7 +174,7 @@
 		if(ctx->engine_id)
 			OPENSSL_free((void*)ctx->engine_id);
 		if(ctx->dirs)
-			sk_STRING_pop_free(ctx->dirs, int_free_str);
+			sk_OPENSSL_STRING_pop_free(ctx->dirs, int_free_str);
 		OPENSSL_free(ctx);
 		}
 	}
@@ -203,7 +203,7 @@
 	c->DYNAMIC_F1 = "v_check";
 	c->DYNAMIC_F2 = "bind_engine";
 	c->dir_load = 1;
-	c->dirs = sk_STRING_new_null();
+	c->dirs = sk_OPENSSL_STRING_new_null();
 	if(!c->dirs)
 		{
 		ENGINEerr(ENGINE_F_DYNAMIC_SET_DATA_CTX,ERR_R_MALLOC_FAILURE);
@@ -393,7 +393,7 @@
 				ERR_R_MALLOC_FAILURE);
 			return 0;
 			}
-		sk_STRING_insert(ctx->dirs, tmp_str, -1);
+		sk_OPENSSL_STRING_insert(ctx->dirs, tmp_str, -1);
 		}
 		return 1;
 	default:
@@ -411,11 +411,11 @@
 				ctx->DYNAMIC_LIBNAME, NULL, 0)) != NULL)
 		return 1;
 	/* If we're not allowed to use 'dirs' or we have none, fail */
-	if(!ctx->dir_load || (num = sk_STRING_num(ctx->dirs)) < 1)
+	if(!ctx->dir_load || (num = sk_OPENSSL_STRING_num(ctx->dirs)) < 1)
 		return 0;
 	for(loop = 0; loop < num; loop++)
 		{
-		const char *s = sk_STRING_value(ctx->dirs, loop);
+		const char *s = sk_OPENSSL_STRING_value(ctx->dirs, loop);
 		char *merge = DSO_merge(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, s);
 		if(!merge)
 			return 0;
Index: openssl/crypto/lhash/lhash.h
RCS File: /v/openssl/cvs/openssl/crypto/lhash/lhash.h,v
rcsdiff -q -kk '-r1.23' '-r1.23.2.1' -u '/v/openssl/cvs/openssl/crypto/lhash/lhash.h,v' 2>/dev/null
--- openssl/crypto/lhash/lhash.h 2008/06/04 11:01:31 1.23
+++ openssl/crypto/lhash/lhash.h 2009/07/27 21:08:50 1.23.2.1
@@ -230,8 +230,8 @@
   lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
 #define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
 
-DECLARE_LHASH_OF(STRING);
-DECLARE_LHASH_OF(CSTRING);
+DECLARE_LHASH_OF(OPENSSL_STRING);
+DECLARE_LHASH_OF(OPENSSL_CSTRING);
 
 #ifdef  __cplusplus
 }
Index: openssl/crypto/stack/safestack.h
RCS File: /v/openssl/cvs/openssl/crypto/stack/safestack.h,v
rcsdiff -q -kk '-r1.72.2.3' '-r1.72.2.4' -u '/v/openssl/cvs/openssl/crypto/stack/safestack.h,v' 2>/dev/null
--- openssl/crypto/stack/safestack.h 2009/04/28 21:56:04 1.72.2.3
+++ openssl/crypto/stack/safestack.h 2009/07/27 21:08:50 1.72.2.4
@@ -110,9 +110,9 @@
  * string. For now, I'm settling for dealing with the fact it is a
  * string at all.
  */
-typedef char *STRING;
+typedef char *OPENSSL_STRING;
 
-typedef const char *CSTRING;
+typedef const char *OPENSSL_CSTRING;
 
 /* Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
  * STACK_OF(STRING) is really more like STACK_OF(char), only, as
@@ -122,7 +122,7 @@
  * macros below.
  */
 
-DECLARE_SPECIAL_STACK_OF(STRING, char)
+DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
 
 /* Similarly, we sometimes use a block of characters, NOT
  * nul-terminated. These should also be distinguished from "normal"
@@ -2030,29 +2030,29 @@
 #define sk_void_sort(st) SKM_sk_sort(void, (st))
 #define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
 
-#define sk_STRING_new(cmp) ((STACK_OF(STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_STRING_new_null() ((STACK_OF(STRING) *)sk_new_null())
-#define sk_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_STRING_value(st, i) ((STRING)sk_value(CHECKED_PTR_OF(STACK_OF(STRING), st), i))
-#define sk_STRING_num(st) SKM_sk_num(STRING, st)
-#define sk_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_SK_FREE_FUNC2(STRING, free_func))
-#define sk_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val), i)
-#define sk_STRING_free(st) SKM_sk_free(STRING, st)
-#define sk_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), i, CHECKED_PTR_OF(char, val))
-#define sk_STRING_zero(st) SKM_sk_zero(STRING, (st))
-#define sk_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(STRING), st), CHECKED_CONST_PTR_OF(char, val))
-#define sk_STRING_delete(st, i) SKM_sk_delete(STRING, (st), (i))
-#define sk_STRING_delete_ptr(st, ptr) (STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_PTR_OF(char, ptr))
-#define sk_STRING_set_cmp_func(st, cmp)  \
+#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
+#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
+#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
+#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
+#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
+#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
+#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
+#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
 	((int (*)(const char * const *,const char * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_STRING_dup(st) SKM_sk_dup(STRING, st)
-#define sk_STRING_shift(st) SKM_sk_shift(STRING, (st))
-#define sk_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(STRING), st))
-#define sk_STRING_sort(st) SKM_sk_sort(STRING, (st))
-#define sk_STRING_is_sorted(st) SKM_sk_is_sorted(STRING, (st))
+	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
+#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
+#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
 
 
 #define sk_BLOCK_new(cmp) ((STACK_OF(BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
@@ -2080,29 +2080,29 @@
 #define sk_BLOCK_is_sorted(st) SKM_sk_is_sorted(BLOCK, (st))
 
 
-#define sk_PSTRING_new(cmp) ((STACK_OF(PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(STRING, cmp)))
-#define sk_PSTRING_new_null() ((STACK_OF(PSTRING) *)sk_new_null())
-#define sk_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_value(st, i) ((PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(PSTRING), st), i))
-#define sk_PSTRING_num(st) SKM_sk_num(PSTRING, st)
-#define sk_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_SK_FREE_FUNC2(PSTRING, free_func))
-#define sk_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val), i)
-#define sk_PSTRING_free(st) SKM_sk_free(PSTRING, st)
-#define sk_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), i, CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_zero(st) SKM_sk_zero(PSTRING, (st))
-#define sk_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, val))
-#define sk_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(PSTRING), st), CHECKED_CONST_PTR_OF(STRING, val))
-#define sk_PSTRING_delete(st, i) SKM_sk_delete(PSTRING, (st), (i))
-#define sk_PSTRING_delete_ptr(st, ptr) (PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_PTR_OF(STRING, ptr))
-#define sk_PSTRING_set_cmp_func(st, cmp)  \
-	((int (*)(const STRING * const *,const STRING * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st), CHECKED_SK_CMP_FUNC(STRING, cmp)))
-#define sk_PSTRING_dup(st) SKM_sk_dup(PSTRING, st)
-#define sk_PSTRING_shift(st) SKM_sk_shift(PSTRING, (st))
-#define sk_PSTRING_pop(st) (STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(PSTRING), st))
-#define sk_PSTRING_sort(st) SKM_sk_sort(PSTRING, (st))
-#define sk_PSTRING_is_sorted(st) SKM_sk_is_sorted(PSTRING, (st))
+#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
+#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
+#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i))
+#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
+#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
+#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
+#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
+#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
+#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
+#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
+#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
+	((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
+	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
+#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
+#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
+#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st))
+#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
+#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
 
 
 #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
@@ -2390,24 +2390,6 @@
   LHM_lh_stats_bio(CONF_VALUE,lh,out)
 #define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
 
-#define lh_CSTRING_new() LHM_lh_new(CSTRING,cstring)
-#define lh_CSTRING_insert(lh,inst) LHM_lh_insert(CSTRING,lh,inst)
-#define lh_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(CSTRING,lh,inst)
-#define lh_CSTRING_delete(lh,inst) LHM_lh_delete(CSTRING,lh,inst)
-#define lh_CSTRING_doall(lh,fn) LHM_lh_doall(CSTRING,lh,fn)
-#define lh_CSTRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(CSTRING,lh,fn,arg_type,arg)
-#define lh_CSTRING_error(lh) LHM_lh_error(CSTRING,lh)
-#define lh_CSTRING_num_items(lh) LHM_lh_num_items(CSTRING,lh)
-#define lh_CSTRING_down_load(lh) LHM_lh_down_load(CSTRING,lh)
-#define lh_CSTRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(CSTRING,lh,out)
-#define lh_CSTRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(CSTRING,lh,out)
-#define lh_CSTRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(CSTRING,lh,out)
-#define lh_CSTRING_free(lh) LHM_lh_free(CSTRING,lh)
-
 #define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
 #define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
 #define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
@@ -2534,6 +2516,42 @@
   LHM_lh_stats_bio(OBJ_NAME,lh,out)
 #define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
 
+#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
+#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
+#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
+#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
+#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
+#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
+  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
+#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
+#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
+#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
+#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
+  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
+#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
+  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
+#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
+  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
+#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
+
+#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
+#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
+#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
+#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
+#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
+#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
+  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
+#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
+#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
+#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
+#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
+  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
+#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
+  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
+#define lh_OPENSSL_STRING_stats_bio(lh,out) \
+  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
+#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
+
 #define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
 #define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
 #define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
@@ -2551,24 +2569,6 @@
 #define lh_SSL_SESSION_stats_bio(lh,out) \
   LHM_lh_stats_bio(SSL_SESSION,lh,out)
 #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-
-#define lh_STRING_new() LHM_lh_new(STRING,string)
-#define lh_STRING_insert(lh,inst) LHM_lh_insert(STRING,lh,inst)
-#define lh_STRING_retrieve(lh,inst) LHM_lh_retrieve(STRING,lh,inst)
-#define lh_STRING_delete(lh,inst) LHM_lh_delete(STRING,lh,inst)
-#define lh_STRING_doall(lh,fn) LHM_lh_doall(STRING,lh,fn)
-#define lh_STRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(STRING,lh,fn,arg_type,arg)
-#define lh_STRING_error(lh) LHM_lh_error(STRING,lh)
-#define lh_STRING_num_items(lh) LHM_lh_num_items(STRING,lh)
-#define lh_STRING_down_load(lh) LHM_lh_down_load(STRING,lh)
-#define lh_STRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(STRING,lh,out)
-#define lh_STRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(STRING,lh,out)
-#define lh_STRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(STRING,lh,out)
-#define lh_STRING_free(lh) LHM_lh_free(STRING,lh)
 /* End of util/mkstack.pl block, you may now edit :-) */
 
 #endif /* !defined HEADER_SAFESTACK_H */
Index: openssl/crypto/txt_db/txt_db.c
RCS File: /v/openssl/cvs/openssl/crypto/txt_db/txt_db.c,v
rcsdiff -q -kk '-r1.25' '-r1.25.2.1' -u '/v/openssl/cvs/openssl/crypto/txt_db/txt_db.c,v' 2>/dev/null
--- openssl/crypto/txt_db/txt_db.c 2008/07/04 23:12:51 1.25
+++ openssl/crypto/txt_db/txt_db.c 2009/07/27 21:08:51 1.25.2.1
@@ -78,7 +78,7 @@
 	int size=BUFSIZE;
 	int offset=0;
 	char *p,*f;
-	STRING *pp;
+	OPENSSL_STRING *pp;
 	BUF_MEM *buf=NULL;
 
 	if ((buf=BUF_MEM_new()) == NULL) goto err;
@@ -89,7 +89,7 @@
 	ret->num_fields=num;
 	ret->index=NULL;
 	ret->qual=NULL;
-	if ((ret->data=sk_PSTRING_new_null()) == NULL)
+	if ((ret->data=sk_OPENSSL_PSTRING_new_null()) == NULL)
 		goto err;
 	if ((ret->index=OPENSSL_malloc(sizeof(*ret->index)*num)) == NULL)
 		goto err;
@@ -163,7 +163,7 @@
 			goto err;
 			}
 		pp[n]=p;
-		if (!sk_PSTRING_push(ret->data,pp))
+		if (!sk_OPENSSL_PSTRING_push(ret->data,pp))
 			{
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)	/* temporary fix :-( */
 			fprintf(stderr,"failure in sk_push\n");
@@ -182,7 +182,7 @@
 #endif
 		if (ret != NULL)
 			{
-			if (ret->data != NULL) sk_PSTRING_free(ret->data);
+			if (ret->data != NULL) sk_OPENSSL_PSTRING_free(ret->data);
 			if (ret->index != NULL) OPENSSL_free(ret->index);
 			if (ret->qual != NULL) OPENSSL_free(ret->qual);
 			if (ret != NULL) OPENSSL_free(ret);
@@ -193,10 +193,10 @@
 		return(ret);
 	}
 
-STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, STRING *value)
+OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
 	{
-	STRING *ret;
-	LHASH_OF(STRING) *lh;
+	OPENSSL_STRING *ret;
+	LHASH_OF(OPENSSL_STRING) *lh;
 
 	if (idx >= db->num_fields)
 		{
@@ -209,16 +209,16 @@
 		db->error=DB_ERROR_NO_INDEX;
 		return(NULL);
 		}
-	ret=lh_STRING_retrieve(lh,value);
+	ret=lh_OPENSSL_STRING_retrieve(lh,value);
 	db->error=DB_ERROR_OK;
 	return(ret);
 	}
 
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(STRING *),
+int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
 			LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
 	{
-	LHASH_OF(STRING) *idx;
-	STRING *r;
+	LHASH_OF(OPENSSL_STRING) *idx;
+	OPENSSL_STRING *r;
 	int i,n;
 
 	if (field >= db->num_fields)
@@ -227,26 +227,26 @@
 		return(0);
 		}
 	/* FIXME: we lose type checking at this point */
-	if ((idx=(LHASH_OF(STRING) *)lh_new(hash,cmp)) == NULL)
+	if ((idx=(LHASH_OF(OPENSSL_STRING) *)lh_new(hash,cmp)) == NULL)
 		{
 		db->error=DB_ERROR_MALLOC;
 		return(0);
 		}
-	n=sk_PSTRING_num(db->data);
+	n=sk_OPENSSL_PSTRING_num(db->data);
 	for (i=0; i<n; i++)
 		{
-		r=sk_PSTRING_value(db->data,i);
+		r=sk_OPENSSL_PSTRING_value(db->data,i);
 		if ((qual != NULL) && (qual(r) == 0)) continue;
-		if ((r=lh_STRING_insert(idx,r)) != NULL)
+		if ((r=lh_OPENSSL_STRING_insert(idx,r)) != NULL)
 			{
 			db->error=DB_ERROR_INDEX_CLASH;
-			db->arg1=sk_PSTRING_find(db->data,r);
+			db->arg1=sk_OPENSSL_PSTRING_find(db->data,r);
 			db->arg2=i;
-			lh_STRING_free(idx);
+			lh_OPENSSL_STRING_free(idx);
 			return(0);
 			}
 		}
-	if (db->index[field] != NULL) lh_STRING_free(db->index[field]);
+	if (db->index[field] != NULL) lh_OPENSSL_STRING_free(db->index[field]);
 	db->index[field]=idx;
 	db->qual[field]=qual;
 	return(1);
@@ -261,11 +261,11 @@
 
 	if ((buf=BUF_MEM_new()) == NULL)
 		goto err;
-	n=sk_PSTRING_num(db->data);
+	n=sk_OPENSSL_PSTRING_num(db->data);
 	nn=db->num_fields;
 	for (i=0; i<n; i++)
 		{
-		pp=sk_PSTRING_value(db->data,i);
+		pp=sk_OPENSSL_PSTRING_value(db->data,i);
 
 		l=0;
 		for (j=0; j<nn; j++)
@@ -300,10 +300,10 @@
 	return(ret);
 	}
 
-int TXT_DB_insert(TXT_DB *db, STRING *row)
+int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
 	{
 	int i;
-	STRING *r;
+	OPENSSL_STRING *r;
 
 	for (i=0; i<db->num_fields; i++)
 		{
@@ -311,7 +311,7 @@
 			{
 			if ((db->qual[i] != NULL) &&
 				(db->qual[i](row) == 0)) continue;
-			r=lh_STRING_retrieve(db->index[i],row);
+			r=lh_OPENSSL_STRING_retrieve(db->index[i],row);
 			if (r != NULL)
 				{
 				db->error=DB_ERROR_INDEX_CLASH;
@@ -322,7 +322,7 @@
 			}
 		}
 	/* We have passed the index checks, now just append and insert */
-	if (!sk_PSTRING_push(db->data,row))
+	if (!sk_OPENSSL_PSTRING_push(db->data,row))
 		{
 		db->error=DB_ERROR_MALLOC;
 		goto err;
@@ -334,7 +334,7 @@
 			{
 			if ((db->qual[i] != NULL) &&
 				(db->qual[i](row) == 0)) continue;
-			(void)lh_STRING_insert(db->index[i],row);
+			(void)lh_OPENSSL_STRING_insert(db->index[i],row);
 			}
 		}
 	return(1);
@@ -353,18 +353,18 @@
 	if (db->index != NULL)
 		{
 		for (i=db->num_fields-1; i>=0; i--)
-			if (db->index[i] != NULL) lh_STRING_free(db->index[i]);
+			if (db->index[i] != NULL) lh_OPENSSL_STRING_free(db->index[i]);
 		OPENSSL_free(db->index);
 		}
 	if (db->qual != NULL)
 		OPENSSL_free(db->qual);
 	if (db->data != NULL)
 		{
-		for (i=sk_PSTRING_num(db->data)-1; i>=0; i--)
+		for (i=sk_OPENSSL_PSTRING_num(db->data)-1; i>=0; i--)
 			{
 			/* check if any 'fields' have been allocated
 			 * from outside of the initial block */
-			p=sk_PSTRING_value(db->data,i);
+			p=sk_OPENSSL_PSTRING_value(db->data,i);
 			max=p[db->num_fields]; /* last address */
 			if (max == NULL) /* new row */
 				{
@@ -380,9 +380,9 @@
 						OPENSSL_free(p[n]);
 					}
 				}
-			OPENSSL_free(sk_PSTRING_value(db->data,i));
+			OPENSSL_free(sk_OPENSSL_PSTRING_value(db->data,i));
 			}
-		sk_PSTRING_free(db->data);
+		sk_OPENSSL_PSTRING_free(db->data);
 		}
 	OPENSSL_free(db);
 	}
Index: openssl/crypto/txt_db/txt_db.h
RCS File: /v/openssl/cvs/openssl/crypto/txt_db/txt_db.h,v
rcsdiff -q -kk '-r1.11' '-r1.11.2.1' -u '/v/openssl/cvs/openssl/crypto/txt_db/txt_db.h,v' 2>/dev/null
--- openssl/crypto/txt_db/txt_db.h 2008/06/04 11:01:38 1.11
+++ openssl/crypto/txt_db/txt_db.h 2009/07/27 21:08:51 1.11.2.1
@@ -77,19 +77,19 @@
 extern "C" {
 #endif
 
-typedef STRING *PSTRING;
-DECLARE_SPECIAL_STACK_OF(PSTRING, STRING)
+typedef OPENSSL_STRING *OPENSSL_PSTRING;
+DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
 
 typedef struct txt_db_st
 	{
 	int num_fields;
-	STACK_OF(PSTRING) *data;
-	LHASH_OF(STRING) **index;
-	int (**qual)(STRING *);
+	STACK_OF(OPENSSL_PSTRING) *data;
+	LHASH_OF(OPENSSL_STRING) **index;
+	int (**qual)(OPENSSL_STRING *);
 	long error;
 	long arg1;
 	long arg2;
-	STRING *arg_row;
+	OPENSSL_STRING *arg_row;
 	} TXT_DB;
 
 #ifndef OPENSSL_NO_BIO
@@ -99,11 +99,11 @@
 TXT_DB *TXT_DB_read(char *in, int num);
 long TXT_DB_write(char *out, TXT_DB *db);
 #endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(STRING *),
+int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *),
 			LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
 void TXT_DB_free(TXT_DB *db);
-STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, STRING *value);
-int TXT_DB_insert(TXT_DB *db, STRING *value);
+OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value);
+int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
 
 #ifdef  __cplusplus
 }
Index: openssl/crypto/x509v3/v3_utl.c
RCS File: /v/openssl/cvs/openssl/crypto/x509v3/v3_utl.c,v
rcsdiff -q -kk '-r1.44' '-r1.44.2.1' -u '/v/openssl/cvs/openssl/crypto/x509v3/v3_utl.c,v' 2>/dev/null
--- openssl/crypto/x509v3/v3_utl.c 2009/02/14 21:49:36 1.44
+++ openssl/crypto/x509v3/v3_utl.c 2009/07/27 21:08:53 1.44.2.1
@@ -67,9 +67,9 @@
 
 static char *strip_spaces(char *name);
 static int sk_strcmp(const char * const *a, const char * const *b);
-static STACK_OF(STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens);
-static void str_free(STRING str);
-static int append_ia5(STACK_OF(STRING) **sk, ASN1_IA5STRING *email);
+static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens);
+static void str_free(OPENSSL_STRING str);
+static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email);
 
 static int ipv4_from_asc(unsigned char *v4, const char *in);
 static int ipv6_from_asc(unsigned char *v6, const char *in);
@@ -463,10 +463,10 @@
 	return strcmp(*a, *b);
 }
 
-STACK_OF(STRING) *X509_get1_email(X509 *x)
+STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x)
 {
 	GENERAL_NAMES *gens;
-	STACK_OF(STRING) *ret;
+	STACK_OF(OPENSSL_STRING) *ret;
 
 	gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
 	ret = get_email(X509_get_subject_name(x), gens);
@@ -474,10 +474,10 @@
 	return ret;
 }
 
-STACK_OF(STRING) *X509_get1_ocsp(X509 *x)
+STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x)
 {
 	AUTHORITY_INFO_ACCESS *info;
-	STACK_OF(STRING) *ret = NULL;
+	STACK_OF(OPENSSL_STRING) *ret = NULL;
 	int i;
 
 	info = X509_get_ext_d2i(x, NID_info_access, NULL, NULL);
@@ -499,11 +499,11 @@
 	return ret;
 }
 
-STACK_OF(STRING) *X509_REQ_get1_email(X509_REQ *x)
+STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x)
 {
 	GENERAL_NAMES *gens;
 	STACK_OF(X509_EXTENSION) *exts;
-	STACK_OF(STRING) *ret;
+	STACK_OF(OPENSSL_STRING) *ret;
 
 	exts = X509_REQ_get_extensions(x);
 	gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
@@ -514,9 +514,9 @@
 }
 
 
-static STACK_OF(STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
+static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
 {
-	STACK_OF(STRING) *ret = NULL;
+	STACK_OF(OPENSSL_STRING) *ret = NULL;
 	X509_NAME_ENTRY *ne;
 	ASN1_IA5STRING *email;
 	GENERAL_NAME *gen;
@@ -539,23 +539,23 @@
 	return ret;
 }
 
-static void str_free(STRING str)
+static void str_free(OPENSSL_STRING str)
 {
 	OPENSSL_free(str);
 }
 
-static int append_ia5(STACK_OF(STRING) **sk, ASN1_IA5STRING *email)
+static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email)
 {
 	char *emtmp;
 	/* First some sanity checks */
 	if(email->type != V_ASN1_IA5STRING) return 1;
 	if(!email->data || !email->length) return 1;
-	if(!*sk) *sk = sk_STRING_new(sk_strcmp);
+	if(!*sk) *sk = sk_OPENSSL_STRING_new(sk_strcmp);
 	if(!*sk) return 0;
 	/* Don't add duplicates */
-	if(sk_STRING_find(*sk, (char *)email->data) != -1) return 1;
+	if(sk_OPENSSL_STRING_find(*sk, (char *)email->data) != -1) return 1;
 	emtmp = BUF_strdup((char *)email->data);
-	if(!emtmp || !sk_STRING_push(*sk, emtmp)) {
+	if(!emtmp || !sk_OPENSSL_STRING_push(*sk, emtmp)) {
 		X509_email_free(*sk);
 		*sk = NULL;
 		return 0;
@@ -563,9 +563,9 @@
 	return 1;
 }
 
-void X509_email_free(STACK_OF(STRING) *sk)
+void X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
 {
-	sk_STRING_pop_free(sk, str_free);
+	sk_OPENSSL_STRING_pop_free(sk, str_free);
 }
 
 /* Convert IP addresses both IPv4 and IPv6 into an 
Index: openssl/crypto/x509v3/x509v3.h
RCS File: /v/openssl/cvs/openssl/crypto/x509v3/x509v3.h,v
rcsdiff -q -kk '-r1.126.2.1' '-r1.126.2.2' -u '/v/openssl/cvs/openssl/crypto/x509v3/x509v3.h,v' 2>/dev/null
--- openssl/crypto/x509v3/x509v3.h 2009/04/19 17:58:01 1.126.2.1
+++ openssl/crypto/x509v3/x509v3.h 2009/07/27 21:08:53 1.126.2.2
@@ -693,10 +693,10 @@
 void X509_PURPOSE_cleanup(void);
 int X509_PURPOSE_get_id(X509_PURPOSE *);
 
-STACK_OF(STRING) *X509_get1_email(X509 *x);
-STACK_OF(STRING) *X509_REQ_get1_email(X509_REQ *x);
-void X509_email_free(STACK_OF(STRING) *sk);
-STACK_OF(STRING) *X509_get1_ocsp(X509 *x);
+STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
+STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
+void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
+STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
 
 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);

openssl-1.0.0-beta3-redhat.patch:
 Configure |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-redhat.patch ---
diff -up openssl-1.0.0-beta3/Configure.redhat openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.redhat	2009-07-08 10:50:52.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-04 22:46:59.000000000 +0200
@@ -331,32 +331,32 @@ my %table=(
 ####
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
-"linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-generic32","gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # It's believed that majority of ARM toolchains predefine appropriate -march.
 # If you compiler does not, do complement config command line with one!
-"linux-armv4",	"gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-armv4",	"gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 #### IA-32 targets...
 "linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out",
 ####
-"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-generic64","gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):\$(SHLIB_SONAMEVER)",
+"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
+"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
+"linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
 #### SPARC Linux setups
 # Ray Miller <ray.miller at computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv8","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux64-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
 # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
@@ -370,8 +370,8 @@ my %table=(
 #
 #					<appro at fy.chalmers.se>
 #
-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha-gcc","gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-alpha+bwx-gcc","gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 

openssl-1.0.0-beta3-soversion.patch:
 Configure    |    2 +-
 Makefile.org |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-soversion.patch ---
diff -up openssl-1.0.0-beta3/Configure.soversion openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.soversion	2009-08-04 23:06:52.000000000 +0200
+++ openssl-1.0.0-beta3/Configure	2009-08-04 23:06:52.000000000 +0200
@@ -1514,7 +1514,7 @@ while (<IN>)
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
 		{
 		my $sotmp = $1;
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/;
 		}
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
 		{
diff -up openssl-1.0.0-beta3/Makefile.org.soversion openssl-1.0.0-beta3/Makefile.org
--- openssl-1.0.0-beta3/Makefile.org.soversion	2009-08-04 23:06:52.000000000 +0200
+++ openssl-1.0.0-beta3/Makefile.org	2009-08-04 23:11:01.000000000 +0200
@@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY=
 SHLIB_MAJOR=
 SHLIB_MINOR=
 SHLIB_EXT=
+SHLIB_SONAMEVER=10
 PLATFORM=dist
 OPTIONS=
 CONFIGURE_ARGS=
@@ -289,10 +290,9 @@ clean-shared:
 link-shared:
 	@ set -e; for i in $(SHLIBDIRS); do \
 		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+			LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \
 			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
 			symlink.$(SHLIB_TARGET); \
-		libs="$$libs -l$$i"; \
 	done
 
 build-shared: do_$(SHLIB_TARGET) link-shared
@@ -303,7 +303,7 @@ do_$(SHLIB_TARGET):
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+			LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \
 			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
 			LIBDEPS="$$libs $(EX_LIBS)" \
 			link_a.$(SHLIB_TARGET); \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Feb 2009 09:33:37 -0000	1.2
+++ .cvsignore	29 Aug 2009 16:13:45 -0000	1.3
@@ -1 +1 @@
-openssl-0.9.8j-usa.tar.bz2
+openssl-1.0.0-beta3-usa.tar.bz2


Index: hobble-openssl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/hobble-openssl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hobble-openssl	9 Feb 2009 09:33:37 -0000	1.1
+++ hobble-openssl	29 Aug 2009 16:13:45 -0000	1.2
@@ -4,33 +4,32 @@
 set -e
 
 # Clean out patent-or-otherwise-encumbered code.
-# MDC-2: 4,908,861 13/03/2007
+# MDC-2: 4,908,861 13/03/2007 - expired, we do not remove it but do not enable it anyway
 # IDEA:  5,214,703 25/05/2010
 # RC5:   5,724,428 03/03/2015
 # EC:    ????????? ??/??/2015
 
 # Remove assembler portions of IDEA, MDC2, and RC5.
-(find crypto/{idea,mdc2,rc5}/asm -type f | xargs -r rm -fv)
+(find crypto/{idea,rc5}/asm -type f | xargs -r rm -fv)
 
 # IDEA, MDC2, RC5, EC.
-for a in idea mdc2 rc5 ec ecdh ecdsa; do
+for a in idea rc5 ec ecdh ecdsa; do
   for c in `find crypto/$a -name "*.c" -a \! -name "*test*" -type f` ; do
 	echo Destroying $c
 	> $c
   done
 done
 
-for c in `find crypto/evp -name "*_rc5.c" -o -name "*_idea.c" -o -name "*_mdc2.c" -o -name "*_ecdsa.c"`; do
+for c in `find crypto/evp -name "*_rc5.c" -o -name "*_idea.c" -o -name "*_ecdsa.c"`; do
 	echo Destroying $c
 	> $c
 done
 
 for h in `find crypto ssl apps test -name "*.h"` ; do
-	echo Removing IDEA, MDC2, RC5, and EC references from $h
+	echo Removing IDEA, RC5, and EC references from $h
 	cat $h | \
 	awk    'BEGIN {ech=1;} \
 		/^#[ \t]*ifndef.*NO_IDEA/ {ech--; next;} \
-		/^#[ \t]*ifndef.*NO_MDC2/ {ech--; next;} \
 		/^#[ \t]*ifndef.*NO_RC5/ {ech--; next;} \
 		/^#[ \t]*ifndef.*NO_EC/ {ech--; next;} \
 		/^#[ \t]*ifndef.*NO_ECDH/ {ech--; next;} \


Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-openssl.spec	25 Jul 2009 14:27:40 -0000	1.6
+++ mingw32-openssl.spec	29 Aug 2009 16:13:45 -0000	1.7
@@ -1,8 +1,9 @@
-%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}
 
 # For the curious:
 # 0.9.5a soversion = 0
@@ -13,21 +14,24 @@
 # 0.9.7ef soversion = 5
 # 0.9.8ab soversion = 6
 # 0.9.8g soversion = 7
-# 0.9.8j + EAP-FAST soversion = 8
-%define soversion 8
+# 0.9.8jk + EAP-FAST soversion = 8
+# 1.0.0 soversion = 10
+%global soversion 10
+
+%global beta beta3
 
 # Enable the tests.
 # These only work some of the time, but fail randomly at other times
 # (although I have had them complete a few times, so I don't think
 # there is any actual problem with the binaries).
-%define run_tests 0
+%global run_tests 0
 
 # Number of threads to spawn when testing some threading fixes.
-%define thread_test_threads %{?threads:%{threads}}%{!?threads:1}
+%global thread_test_threads %{?threads:%{threads}}%{!?threads:1}
 
 Name:           mingw32-openssl
-Version:        0.9.8j
-Release:        7%{?dist}
+Version:        1.0.0
+Release:        0.1.%{beta}%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -35,7 +39,7 @@ Group:          Development/Libraries
 URL:            http://www.openssl.org/
 
 # Use the hobble-openssl script to create the source file.
-Source0:        openssl-%{version}-usa.tar.bz2
+Source0:        openssl-%{version}-%{beta}-usa.tar.bz2
 
 Source1:        hobble-openssl
 Source2:        Makefile.certificate
@@ -46,38 +50,38 @@ Source10:       opensslconf-new-warning.
 
 # Patches from Fedora native package.
 # Build changes
-Patch0:         openssl-0.9.8j-redhat.patch
-Patch1:         openssl-0.9.8a-defaults.patch
-Patch2:         openssl-0.9.8a-link-krb5.patch
-Patch3:         openssl-0.9.8j-soversion.patch
-Patch4:         openssl-0.9.8j-enginesdir.patch
+Patch0:         openssl-1.0.0-beta3-redhat.patch
+Patch1:         openssl-1.0.0-beta3-defaults.patch
+Patch2:         openssl-1.0.0-beta3-krb5.patch
+Patch3:         openssl-1.0.0-beta3-soversion.patch
+Patch4:         openssl-1.0.0-beta3-enginesdir.patch
 Patch5:         openssl-0.9.8a-no-rpath.patch
 Patch6:         openssl-0.9.8b-test-use-localhost.patch
-Patch7:         openssl-0.9.8j-shlib-version.patch
 # Bug fixes
 Patch21:        openssl-0.9.8b-aliasing-bug.patch
-Patch22:        openssl-0.9.8b-x509-name-cmp.patch
-Patch23:        openssl-0.9.8g-default-paths.patch
-Patch24:        openssl-0.9.8g-no-extssl.patch
+Patch23:        openssl-1.0.0-beta3-default-paths.patch
 # Functionality changes
 Patch32:        openssl-0.9.8g-ia64.patch
 Patch33:        openssl-0.9.8j-ca-dir.patch
 Patch34:        openssl-0.9.6-x509.patch
 Patch35:        openssl-0.9.8j-version-add-engines.patch
-Patch38:        openssl-0.9.8a-reuse-cipher-change.patch
+Patch38:        openssl-1.0.0-beta3-cipher-change.patch
 # Disabled this because it uses getaddrinfo which is lacking on Windows.
-#Patch39:        openssl-0.9.8g-ipv6-apps.patch
-Patch40:        openssl-0.9.8j-nocanister.patch
-Patch41:        openssl-0.9.8j-use-fipscheck.patch
-Patch42:        openssl-0.9.8j-fipscheck-hmac.patch
-Patch43:        openssl-0.9.8j-evp-nonfips.patch
-Patch44:        openssl-0.9.8j-kernel-fipsmode.patch
+#Patch39:        openssl-1.0.0-beta3-ipv6-apps.patch
+Patch40:        openssl-1.0.0-beta3-fips.patch
+Patch41:        openssl-1.0.0-beta3-fipscheck.patch
+Patch43:        openssl-1.0.0-beta3-fipsmode.patch
+Patch44:        openssl-1.0.0-beta3-fipsrng.patch
 Patch45:        openssl-0.9.8j-env-nozlib.patch
-Patch46:        openssl-0.9.8j-eap-fast.patch
 Patch47:        openssl-0.9.8j-readme-warning.patch
 Patch48:        openssl-0.9.8j-bad-mime.patch
-Patch49:        openssl-0.9.8j-fips-no-pairwise.patch
+Patch49:        openssl-0.9.8k-algo-doc.patch
+Patch50:        openssl-1.0.0-beta3-curl.patch
+Patch51:        openssl-1.0.0-beta3-const.patch
+
 # Backported fixes including security fixes
+Patch60:        openssl-1.0.0-beta3-namingstr.patch
+Patch61:        openssl-1.0.0-beta3-namingblk.patch
 
 # MinGW-specific patches.
 Patch100:       mingw32-openssl-0.9.8j-header-files.patch
@@ -85,12 +89,13 @@ Patch101:       mingw32-openssl-0.9.8j-c
 Patch102:       mingw32-openssl-0.9.8j-shared.patch
 Patch103:       mingw32-openssl-0.9.8g-global.patch
 Patch104:       mingw32-openssl-0.9.8g-sfx.patch
+Patch105:       mingw32-openssl-1.0.0-beta3-linker-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
@@ -139,8 +144,11 @@ Requires:       %{name} = %{version}-%{r
 Static version of the MinGW port of the OpenSSL toolkit.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
-%setup -q -n openssl-%{version}
+%setup -q -n openssl-%{version}-%{beta}
 
 %{SOURCE1} > /dev/null
 %patch0 -p1 -b .redhat
@@ -151,12 +159,9 @@ Static version of the MinGW port of the 
 %patch4 -p1 -b .enginesdir
 %patch5 -p1 -b .no-rpath
 %patch6 -p1 -b .use-localhost
-%patch7 -p1 -b .shlib-version
 
 %patch21 -p1 -b .aliasing-bug
-%patch22 -p1 -b .name-cmp
 %patch23 -p1 -b .default-paths
-%patch24 -p1 -b .no-extssl
 
 %patch32 -p1 -b .ia64
 #patch33 is applied after make test
@@ -164,22 +169,25 @@ Static version of the MinGW port of the 
 %patch35 -p1 -b .version-add-engines
 %patch38 -p1 -b .cipher-change
 #%patch39 -p1 -b .ipv6-apps
-%patch40 -p1 -b .nocanister
-%patch41 -p1 -b .use-fipscheck
-%patch42 -p1 -b .fipscheck-hmac
-%patch43 -p1 -b .evp-nonfips
-%patch44 -p1 -b .fipsmode
+%patch40 -p1 -b .fips
+%patch41 -p1 -b .fipscheck
+%patch43 -p1 -b .fipsmode
+%patch44 -p1 -b .fipsrng
 %patch45 -p1 -b .env-nozlib
-%patch46 -p1 -b .eap-fast
 %patch47 -p1 -b .warning
 %patch48 -p1 -b .bad-mime
-%patch49 -p1 -b .no-pairwise
-
-%patch100 -p1 -b .mingw-header-files
-%patch101 -p1 -b .mingw-configure
-%patch102 -p1 -b .mingw-shared
-%patch103 -p1 -b .mingw-global
-%patch104 -p1 -b .mingw-sfx
+%patch49 -p1 -b .algo-doc
+%patch50 -p1 -b .curl
+%patch51 -p1 -b .const
+%patch60 -p1 -b .namingstr
+%patch61 -p1 -b .namingblk
+
+#%patch100 -p1 -b .mingw-header-files
+#%patch101 -p1 -b .mingw-configure
+#%patch102 -p1 -b .mingw-shared
+#%patch103 -p1 -b .mingw-global
+#%patch104 -p1 -b .mingw-sfx
+%patch105 -p0 -b .mingw-linker-fix
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -191,22 +199,22 @@ make TABLE PERL=%{__perl}
 %build
 # NB: 'no-hw' is vital.  MinGW cannot build the hardware drivers
 # and if you don't have this you'll get an obscure link error.
-%{_mingw32_env}; \
-sed -i -e "s/MINGW32_CC/%{_mingw32_cc}/" -e "s/MINGW32_CFLAGS/%{_mingw32_cflags}/" -e "s/MINGW32_RANLIB/%{_mingw32_ranlib}/" Configure; \
+sed -i -e "s/MINGW32_CFLAGS/%{_mingw32_cflags}/" Configure; \
 ./Configure \
   --prefix=%{_mingw32_prefix} \
   --openssldir=%{_mingw32_sysconfdir}/pki/tls \
   zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
-  no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa no-hw shared \
+  enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa \
+  no-hw shared --cross-compile-prefix=%{_mingw32_target}- \
   --enginesdir=%{_mingw32_libdir}/openssl/engines \
   mingw
 #  --with-krb5-flavor=MIT
 #  -I%{_mingw32_prefix}/kerberos/include -L%{_mingw32_prefix}/kerberos/%{_lib}
-%{_mingw32_make} depend
-%{_mingw32_make} all build-shared
+make depend
+make all build-shared
 
 # Generate hashes for the included certs.
-%{_mingw32_make} rehash build-shared
+make rehash build-shared
 
 %if %{run_tests}
 #----------------------------------------------------------------------
@@ -240,7 +248,7 @@ sleep 3
 DISPLAY=$display
 export DISPLAY
 
-%{_mingw32_make} LDCMD=%{_mingw32_cc} -C test apps tests
+make LDCMD=%{_mingw32_cc} -C test apps tests
 
 # Disable this thread test, because we don't have pthread on Windows.
 %{_mingw32_cc} -o openssl-thread-test \
@@ -289,10 +297,6 @@ make INSTALL_PREFIX=$RPM_BUILD_ROOT inst
 # Install the file applink.c (#499934)
 install -m644 ms/applink.c $RPM_BUILD_ROOT%{_mingw32_includedir}/openssl/applink.c
 
-# Install the actual DLLs.
-install libcrypto-%{soversion}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install libssl-%{soversion}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-
 # I have no idea why it installs the manpages in /etc, but
 # we remove them anyway.
 rm -r $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pki/tls/man
@@ -324,8 +328,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 %{_mingw32_bindir}/openssl.exe
 %{_mingw32_bindir}/c_rehash
-%{_mingw32_bindir}/libcrypto-%{soversion}.dll
-%{_mingw32_bindir}/libssl-%{soversion}.dll
+%{_mingw32_bindir}/libeay32.dll
+%{_mingw32_bindir}/ssleay32.dll
 #{_mingw32_bindir}/.libcrypto*.hmac
 %{_mingw32_libdir}/libcrypto.dll.a
 %{_mingw32_libdir}/libssl.dll.a
@@ -342,6 +346,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 28 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.1.beta3
+- Update to version 1.0.0 beta 3
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+- Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3)
+- Don't use the %%{_mingw32_make} macro anymore as it's ugly and causes side-effects
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8j-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Feb 2009 09:33:37 -0000	1.2
+++ sources	29 Aug 2009 16:13:45 -0000	1.3
@@ -1 +1 @@
-573353d8cb4330b71e9985cea4785d61  openssl-0.9.8j-usa.tar.bz2
+9926dcf78e797a12d8e3ffd7a018824b  openssl-1.0.0-beta3-usa.tar.bz2



From mclasen at fedoraproject.org  Sat Aug 29 16:40:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 16:40:33 +0000 (UTC)
Subject: rpms/empathy/devel empathy.spec,1.72,1.73
Message-ID: <20090829164033.87C0E11C0496@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27887

Modified Files:
	empathy.spec 
Log Message:
Rebuild



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- empathy.spec	27 Aug 2009 00:31:11 -0000	1.72
+++ empathy.spec	29 Aug 2009 16:40:33 -0000	1.73
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.91.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -246,6 +246,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91.1-4
+- Rebuild against newer libnm_glib
+
 * Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-3
 - Sigh.. let's drop the requires on mission-control-devel in the devel sub.
 



From mclasen at fedoraproject.org  Sat Aug 29 16:41:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 16:41:54 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel .cvsignore, 1.11,
	1.12 krb5-auth-dialog.spec, 1.36, 1.37 sources, 1.11, 1.12
Message-ID: <20090829164154.2698B11C009F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28237

Modified Files:
	.cvsignore krb5-auth-dialog.spec sources 
Log Message:
Update to 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Jun 2009 20:31:54 -0000	1.11
+++ .cvsignore	29 Aug 2009 16:41:53 -0000	1.12
@@ -1 +1 @@
-krb5-auth-dialog-0.10.tar.bz2
+krb5-auth-dialog-0.12.tar.bz2


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- krb5-auth-dialog.spec	25 Jul 2009 04:47:04 -0000	1.36
+++ krb5-auth-dialog.spec	29 Aug 2009 16:41:54 -0000	1.37
@@ -5,8 +5,8 @@
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 0.10
-Release: 2%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -83,6 +83,10 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-1
+- Update to 0.12
+- Rebuild against new libnm_glib
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	12 Jun 2009 20:31:55 -0000	1.11
+++ sources	29 Aug 2009 16:41:54 -0000	1.12
@@ -1 +1 @@
-bc3ffab4df85e2dda4d3d88672812a16  krb5-auth-dialog-0.10.tar.bz2
+879ecb6cbd59b13bf371b8b849797a26  krb5-auth-dialog-0.12.tar.bz2



From chitlesh at fedoraproject.org  Sat Aug 29 16:42:18 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 16:42:18 +0000 (UTC)
Subject: rpms/magic/F-10 .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 magic.desktop, 1.4, 1.5 magic.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20090829164218.4869A11C0371@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28393/F-10

Modified Files:
	.cvsignore import.log magic.desktop magic.spec sources 
Log Message:
8.0.54


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jan 2009 23:53:14 -0000	1.10
+++ .cvsignore	29 Aug 2009 16:42:17 -0000	1.11
@@ -1 +1 @@
-magic-7.5.169.tgz
+magic-8.0.54.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jan 2009 23:53:15 -0000	1.4
+++ import.log	29 Aug 2009 16:42:17 -0000	1.5
@@ -2,3 +2,4 @@ magic-7_5_146-1_fc8:HEAD:magic-7.5.146-1
 magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1.fc9.src.rpm:1220001384
 magic-7_5_168-1_fc10:F-10:magic-7.5.168-1.fc10.src.rpm:1230565722
 magic-7_5_169-1_fc10:F-10:magic-7.5.169-1.fc10.src.rpm:1231285928
+magic-8_0_54-1_fc11:F-10:magic-8.0.54-1.fc11.src.rpm:1251563862


Index: magic.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/magic.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- magic.desktop	24 Aug 2007 11:54:20 -0000	1.4
+++ magic.desktop	29 Aug 2009 16:42:17 -0000	1.5
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;
 Comment=VLSI layout tool
 Encoding=UTF-8
 Exec=magic


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/magic.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- magic.spec	6 Jan 2009 23:53:15 -0000	1.15
+++ magic.spec	29 Aug 2009 16:42:17 -0000	1.16
@@ -1,5 +1,5 @@
 Name:             magic
-Version:          7.5.169
+Version:          8.0.54
 Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
@@ -23,10 +23,7 @@ Requires:         tcsh
 Requires:         electronics-menu
 
 %description
-Magic is a venerable VLSI layout tool, written in the 1980's at
-Berkeley by John Ousterhout, now famous primarily for writing
-the scripting interpreter language Tcl. Due largely in part to
-its liberal Berkeley open-source license, magic has remained
+Magic is a venerable VLSI layout tool. Magic VLSI remains
 popular with universities and small companies.
 
 Magic is widely cited as being the easiest tool to use for
@@ -49,6 +46,7 @@ and some tutorials.
 # create a directory and expand tarball there.
 %setup -q -T -c %{name}-%{version} -a 0
 
+
 cd %{name}-%{version}
 %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
@@ -63,24 +61,15 @@ sed -i "s|package require -exact|package
 
 %build
 
-if [ -d %{_prefix}/lib64 ] ; then
-   SUF=64
-else
-   SUF=
-fi
-
-WISH=%{_bindir}/wish
-export WISH
+export WISH=%{_bindir}/wish
 
 cd %{name}-%{version}
 
-%configure \
-   --with-tcl=%{_prefix}/lib$SUF     \
-   --with-tk=%{_prefix}/lib$SUF      \
-   --with-tcllibs=%{_prefix}/lib$SUF \
-   --with-tklibs=%{_prefix}/lib$SUF
-
-scripts/makedbh database/database.h.in database/database.h
+%configure --with-gnu-ld\
+   --with-tcl=%{_libdir}     \
+   --with-tk=%{_libdir}      \
+   --with-tcllibs=%{_libdir} \
+   --with-tklibs=%{_libdir}
 
 %{__make} %{?_smp_mflags}
 
@@ -93,10 +82,7 @@ cd %{name}-%{version}
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
 
-desktop-file-install --vendor fedora            \
-    --add-category "Engineering"                \
-    --add-category "Electronics"                \
-    --remove-category  "Science"                \
+desktop-file-install --vendor ""                \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
@@ -139,7 +125,7 @@ update-desktop-database &> /dev/null || 
 %{_bindir}/ext2spice
 %{_libdir}/%{name}/
 %{_mandir}/man?/*
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %files doc
@@ -148,6 +134,9 @@ update-desktop-database &> /dev/null || 
 
 
 %Changelog
+* Fri Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 8.0.54-1
+- new upstream release
+
 * Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2009 23:53:15 -0000	1.10
+++ sources	29 Aug 2009 16:42:18 -0000	1.11
@@ -1 +1 @@
-7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz
+c46abc3dbcad1afd050db789ed60b64b  magic-8.0.54.tgz



From chitlesh at fedoraproject.org  Sat Aug 29 16:42:19 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 16:42:19 +0000 (UTC)
Subject: rpms/tkgate/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3 tkgate.spec, 1.1, 1.2
Message-ID: <20090829164219.9823411C0498@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/tkgate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28410/F-10

Modified Files:
	.cvsignore import.log sources tkgate.spec 
Log Message:
beta 9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Mar 2009 17:20:41 -0000	1.2
+++ .cvsignore	29 Aug 2009 16:42:19 -0000	1.3
@@ -1 +1 @@
-tkgate-2.0-b7.tar.gz
+tkgate-2.0-b9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Mar 2009 17:20:41 -0000	1.1
+++ import.log	29 Aug 2009 16:42:19 -0000	1.2
@@ -1 +1,2 @@
 tkgate-2_0-5_beta7_fc11:F-10:tkgate-2.0-5.beta7.fc11.src.rpm:1236446409
+tkgate-2_0-7_beta9_fc11:F-10:tkgate-2.0-7.beta9.fc11.src.rpm:1251563865


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Mar 2009 17:20:41 -0000	1.2
+++ sources	29 Aug 2009 16:42:19 -0000	1.3
@@ -1 +1 @@
-8f4304aace787656ed66ad736011cbb4  tkgate-2.0-b7.tar.gz
+951de17427f49e6635946081cf1d2b70  tkgate-2.0-b9.tar.gz


Index: tkgate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-10/tkgate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tkgate.spec	7 Mar 2009 17:20:41 -0000	1.1
+++ tkgate.spec	29 Aug 2009 16:42:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tkgate
 Version:        2.0
-Release:        5.beta7%{?dist}
+Release:        7.beta9%{?dist}
 Summary:        An event driven digital circuit simulator
 
 Group:          Applications/Engineering
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.tkgate.org/
 
 Patch0:         tkgate-2.0-doc.patch
-Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b7.tar.gz
+Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b9.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,7 +98,7 @@ Digital Circuit Simulator
 
 
 %prep
-%setup -q -n %{name}-%{version}-b7
+%setup -q -n %{name}-%{version}-b9
 
 %patch0 -p0 -b .doc
 
@@ -127,7 +127,7 @@ cat > %{name}.desktop << EOF
 Encoding=UTF-8
 Name=Digital circuit simulator
 GenericName=Verilog circuit simulator
-Comment=Digital circuit simulator
+Comment=TkGate
 Type=Application
 Exec=tkgate
 Icon=tkgate
@@ -217,6 +217,12 @@ cp -p site-preferences %{buildroot}%{_da
 %exclude %{_datadir}/%{name}/locale/ja
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.0-7.beta9
+- updated to beta 9
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6.beta7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 6 2009 Thibault North <tnorth [AT] fedoraproject DOT org> - 2.0-5.beta7
 - Minor fixes required for the package
 
@@ -235,4 +241,4 @@ cp -p site-preferences %{buildroot}%{_da
 - updated to beta4
 
 * Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.0-1.alpha11
-- Initial package for fedora
\ No newline at end of file
+- Initial package for fedora



From mclasen at fedoraproject.org  Sat Aug 29 16:49:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 16:49:32 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.37,1.38
Message-ID: <20090829164932.9C29311C009F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29788

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
fix BRs



Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- krb5-auth-dialog.spec	29 Aug 2009 16:41:54 -0000	1.37
+++ krb5-auth-dialog.spec	29 Aug 2009 16:49:32 -0000	1.38
@@ -18,6 +18,7 @@ BuildRequires: dbus-devel >= %{dbus_vers
 BuildRequires: perl-XML-Parser, gettext
 BuildRequires: intltool
 BuildRequires: libnotify-devel
+BuildRequires: gnome-doc-utils
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
 %endif



From chitlesh at fedoraproject.org  Sat Aug 29 16:51:24 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 16:51:24 +0000 (UTC)
Subject: rpms/magic/F-11 .cvsignore, 1.10, 1.11 import.log, 1.4,
	1.5 magic.desktop, 1.4, 1.5 magic.spec, 1.16, 1.17 sources, 1.10, 1.11
Message-ID: <20090829165124.CB4B111C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30352/F-11

Modified Files:
	.cvsignore import.log magic.desktop magic.spec sources 
Log Message:
8.0.54


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jan 2009 23:54:55 -0000	1.10
+++ .cvsignore	29 Aug 2009 16:51:24 -0000	1.11
@@ -1 +1 @@
-magic-7.5.169.tgz
+magic-8.0.54.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jan 2009 23:54:55 -0000	1.4
+++ import.log	29 Aug 2009 16:51:24 -0000	1.5
@@ -2,3 +2,4 @@ magic-7_5_146-1_fc8:HEAD:magic-7.5.146-1
 magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1.fc9.src.rpm:1220001384
 magic-7_5_168-1_fc10:HEAD:magic-7.5.168-1.fc10.src.rpm:1230565927
 magic-7_5_169-1_fc10:HEAD:magic-7.5.169-1.fc10.src.rpm:1231286025
+magic-8_0_54-1_fc11:F-11:magic-8.0.54-1.fc11.src.rpm:1251564150


Index: magic.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-11/magic.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- magic.desktop	24 Aug 2007 11:54:20 -0000	1.4
+++ magic.desktop	29 Aug 2009 16:51:24 -0000	1.5
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;
 Comment=VLSI layout tool
 Encoding=UTF-8
 Exec=magic


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-11/magic.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- magic.spec	25 Feb 2009 22:50:13 -0000	1.16
+++ magic.spec	29 Aug 2009 16:51:24 -0000	1.17
@@ -1,6 +1,6 @@
 Name:             magic
-Version:          7.5.169
-Release:          2%{?dist}
+Version:          8.0.54
+Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
 License:          GPLv2
@@ -23,10 +23,7 @@ Requires:         tcsh
 Requires:         electronics-menu
 
 %description
-Magic is a venerable VLSI layout tool, written in the 1980's at
-Berkeley by John Ousterhout, now famous primarily for writing
-the scripting interpreter language Tcl. Due largely in part to
-its liberal Berkeley open-source license, magic has remained
+Magic is a venerable VLSI layout tool. Magic VLSI remains
 popular with universities and small companies.
 
 Magic is widely cited as being the easiest tool to use for
@@ -49,6 +46,7 @@ and some tutorials.
 # create a directory and expand tarball there.
 %setup -q -T -c %{name}-%{version} -a 0
 
+
 cd %{name}-%{version}
 %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
@@ -63,24 +61,15 @@ sed -i "s|package require -exact|package
 
 %build
 
-if [ -d %{_prefix}/lib64 ] ; then
-   SUF=64
-else
-   SUF=
-fi
-
-WISH=%{_bindir}/wish
-export WISH
+export WISH=%{_bindir}/wish
 
 cd %{name}-%{version}
 
-%configure \
-   --with-tcl=%{_prefix}/lib$SUF     \
-   --with-tk=%{_prefix}/lib$SUF      \
-   --with-tcllibs=%{_prefix}/lib$SUF \
-   --with-tklibs=%{_prefix}/lib$SUF
-
-scripts/makedbh database/database.h.in database/database.h
+%configure --with-gnu-ld\
+   --with-tcl=%{_libdir}     \
+   --with-tk=%{_libdir}      \
+   --with-tcllibs=%{_libdir} \
+   --with-tklibs=%{_libdir}
 
 %{__make} %{?_smp_mflags}
 
@@ -93,10 +82,7 @@ cd %{name}-%{version}
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
 
-desktop-file-install --vendor fedora            \
-    --add-category "Engineering"                \
-    --add-category "Electronics"                \
-    --remove-category  "Science"                \
+desktop-file-install --vendor ""                \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
@@ -139,7 +125,7 @@ update-desktop-database &> /dev/null || 
 %{_bindir}/ext2spice
 %{_libdir}/%{name}/
 %{_mandir}/man?/*
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %files doc
@@ -148,6 +134,9 @@ update-desktop-database &> /dev/null || 
 
 
 %Changelog
+* Fri Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 8.0.54-1
+- new upstream release
+
 * Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2009 23:54:55 -0000	1.10
+++ sources	29 Aug 2009 16:51:24 -0000	1.11
@@ -1 +1 @@
-7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz
+c46abc3dbcad1afd050db789ed60b64b  magic-8.0.54.tgz



From chitlesh at fedoraproject.org  Sat Aug 29 16:51:22 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 16:51:22 +0000 (UTC)
Subject: rpms/tkgate/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3 tkgate.spec, 1.1, 1.2
Message-ID: <20090829165122.252CE11C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/tkgate/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30328/F-11

Modified Files:
	.cvsignore import.log sources tkgate.spec 
Log Message:
beta 9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Mar 2009 17:18:42 -0000	1.2
+++ .cvsignore	29 Aug 2009 16:51:21 -0000	1.3
@@ -1 +1 @@
-tkgate-2.0-b7.tar.gz
+tkgate-2.0-b9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Mar 2009 17:18:42 -0000	1.1
+++ import.log	29 Aug 2009 16:51:21 -0000	1.2
@@ -1 +1,2 @@
 tkgate-2_0-5_beta7_fc11:HEAD:tkgate-2.0-5.beta7.fc11.src.rpm:1236392128
+tkgate-2_0-7_beta9_fc11:F-11:tkgate-2.0-7.beta9.fc11.src.rpm:1251564150


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Mar 2009 17:18:42 -0000	1.2
+++ sources	29 Aug 2009 16:51:21 -0000	1.3
@@ -1 +1 @@
-8f4304aace787656ed66ad736011cbb4  tkgate-2.0-b7.tar.gz
+951de17427f49e6635946081cf1d2b70  tkgate-2.0-b9.tar.gz


Index: tkgate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/F-11/tkgate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tkgate.spec	7 Mar 2009 17:18:42 -0000	1.1
+++ tkgate.spec	29 Aug 2009 16:51:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tkgate
 Version:        2.0
-Release:        5.beta7%{?dist}
+Release:        7.beta9%{?dist}
 Summary:        An event driven digital circuit simulator
 
 Group:          Applications/Engineering
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.tkgate.org/
 
 Patch0:         tkgate-2.0-doc.patch
-Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b7.tar.gz
+Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b9.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,7 +98,7 @@ Digital Circuit Simulator
 
 
 %prep
-%setup -q -n %{name}-%{version}-b7
+%setup -q -n %{name}-%{version}-b9
 
 %patch0 -p0 -b .doc
 
@@ -127,7 +127,7 @@ cat > %{name}.desktop << EOF
 Encoding=UTF-8
 Name=Digital circuit simulator
 GenericName=Verilog circuit simulator
-Comment=Digital circuit simulator
+Comment=TkGate
 Type=Application
 Exec=tkgate
 Icon=tkgate
@@ -217,6 +217,12 @@ cp -p site-preferences %{buildroot}%{_da
 %exclude %{_datadir}/%{name}/locale/ja
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.0-7.beta9
+- updated to beta 9
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6.beta7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 6 2009 Thibault North <tnorth [AT] fedoraproject DOT org> - 2.0-5.beta7
 - Minor fixes required for the package
 
@@ -235,4 +241,4 @@ cp -p site-preferences %{buildroot}%{_da
 - updated to beta4
 
 * Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.0-1.alpha11
-- Initial package for fedora
\ No newline at end of file
+- Initial package for fedora



From chitlesh at fedoraproject.org  Sat Aug 29 16:53:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 16:53:32 +0000 (UTC)
Subject: rpms/magic/devel .cvsignore, 1.11, 1.12 import.log, 1.5,
	1.6 magic.spec, 1.18, 1.19 sources, 1.11, 1.12
Message-ID: <20090829165332.1252C11C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30959/devel

Modified Files:
	.cvsignore import.log magic.spec sources 
Log Message:
8.0.54


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Aug 2009 23:00:09 -0000	1.11
+++ .cvsignore	29 Aug 2009 16:53:31 -0000	1.12
@@ -1 +1 @@
-magic-8.0.51.tgz
+magic-8.0.54.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	2 Aug 2009 23:00:09 -0000	1.5
+++ import.log	29 Aug 2009 16:53:31 -0000	1.6
@@ -3,3 +3,4 @@ magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1
 magic-7_5_168-1_fc10:HEAD:magic-7.5.168-1.fc10.src.rpm:1230565927
 magic-7_5_169-1_fc10:HEAD:magic-7.5.169-1.fc10.src.rpm:1231286025
 magic-8_0_51-1_fc11:HEAD:magic-8.0.51-1.fc11.src.rpm:1249253896
+magic-8_0_54-1_fc11:HEAD:magic-8.0.54-1.fc11.src.rpm:1251564620


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- magic.spec	2 Aug 2009 23:00:10 -0000	1.18
+++ magic.spec	29 Aug 2009 16:53:31 -0000	1.19
@@ -1,5 +1,5 @@
 Name:             magic
-Version:          8.0.51
+Version:          8.0.54
 Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
@@ -59,18 +59,8 @@ sed -i "s|package require -exact|package
 %patch1 -p0 -b .64bit
 %endif
 
-#*** ERROR: No build ID note found in /usr/lib/magic/tcl/magicexec
-#export LDDLFLAGS="$LDDLFLAGS --build-id"
-
-
 %build
 
-#if [ -d %{_prefix}/lib64 ] ; then
-#   SUF=64
-#else
-#   SUF=
-#fi
-
 export WISH=%{_bindir}/wish
 
 cd %{name}-%{version}
@@ -81,8 +71,6 @@ cd %{name}-%{version}
    --with-tcllibs=%{_libdir} \
    --with-tklibs=%{_libdir}
 
-#scripts/makedbh database/database.h.in database/database.h
-
 %{__make} %{?_smp_mflags}
 
 %install
@@ -146,6 +134,9 @@ update-desktop-database &> /dev/null || 
 
 
 %Changelog
+* Fri Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 8.0.54-1
+- new upstream release
+
 * Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Aug 2009 23:00:10 -0000	1.11
+++ sources	29 Aug 2009 16:53:31 -0000	1.12
@@ -1 +1 @@
-7a289a4d8ba6cc1b79774dcea7ac264e  magic-8.0.51.tgz
+c46abc3dbcad1afd050db789ed60b64b  magic-8.0.54.tgz



From chitlesh at fedoraproject.org  Sat Aug 29 16:53:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 16:53:32 +0000 (UTC)
Subject: rpms/tkgate/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3 tkgate.spec, 1.2, 1.3
Message-ID: <20090829165332.B79E511C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/tkgate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30976/devel

Modified Files:
	.cvsignore import.log sources tkgate.spec 
Log Message:
beta 9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Mar 2009 17:18:42 -0000	1.2
+++ .cvsignore	29 Aug 2009 16:53:32 -0000	1.3
@@ -1 +1 @@
-tkgate-2.0-b7.tar.gz
+tkgate-2.0-b9.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	7 Mar 2009 17:18:42 -0000	1.1
+++ import.log	29 Aug 2009 16:53:32 -0000	1.2
@@ -1 +1,2 @@
 tkgate-2_0-5_beta7_fc11:HEAD:tkgate-2.0-5.beta7.fc11.src.rpm:1236392128
+tkgate-2_0-7_beta9_fc11:HEAD:tkgate-2.0-7.beta9.fc11.src.rpm:1251564624


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Mar 2009 17:18:42 -0000	1.2
+++ sources	29 Aug 2009 16:53:32 -0000	1.3
@@ -1 +1 @@
-8f4304aace787656ed66ad736011cbb4  tkgate-2.0-b7.tar.gz
+951de17427f49e6635946081cf1d2b70  tkgate-2.0-b9.tar.gz


Index: tkgate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkgate/devel/tkgate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tkgate.spec	27 Jul 2009 06:01:33 -0000	1.2
+++ tkgate.spec	29 Aug 2009 16:53:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tkgate
 Version:        2.0
-Release:        6.beta7%{?dist}
+Release:        7.beta9%{?dist}
 Summary:        An event driven digital circuit simulator
 
 Group:          Applications/Engineering
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.tkgate.org/
 
 Patch0:         tkgate-2.0-doc.patch
-Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b7.tar.gz
+Source0:        ftp://gadoid.ices.cmu.edu/pub/tkgate/pre-release/%{name}-%{version}-b9.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,7 +98,7 @@ Digital Circuit Simulator
 
 
 %prep
-%setup -q -n %{name}-%{version}-b7
+%setup -q -n %{name}-%{version}-b9
 
 %patch0 -p0 -b .doc
 
@@ -127,7 +127,7 @@ cat > %{name}.desktop << EOF
 Encoding=UTF-8
 Name=Digital circuit simulator
 GenericName=Verilog circuit simulator
-Comment=Digital circuit simulator
+Comment=TkGate
 Type=Application
 Exec=tkgate
 Icon=tkgate
@@ -217,6 +217,9 @@ cp -p site-preferences %{buildroot}%{_da
 %exclude %{_datadir}/%{name}/locale/ja
 
 %changelog
+* Sat Aug 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.0-7.beta9
+- updated to beta 9
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6.beta7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -238,4 +241,4 @@ cp -p site-preferences %{buildroot}%{_da
 - updated to beta4
 
 * Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.0-1.alpha11
-- Initial package for fedora
\ No newline at end of file
+- Initial package for fedora



From mtasaka at fedoraproject.org  Sat Aug 29 17:02:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 17:02:07 +0000 (UTC)
Subject: rpms/wallpapoz/F-10 daemon_wallpapoz-wrapper, NONE, 1.1 .cvsignore, 
	1.9, 1.10 sources, 1.9, 1.10 wallpapoz.spec, 1.19, 1.20
Message-ID: <20090829170207.6E1CE11C0496@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1121/F-10

Modified Files:
	.cvsignore sources wallpapoz.spec 
Added Files:
	daemon_wallpapoz-wrapper 
Log Message:
* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
- Update to rev 92
- Install desktop application autostart stuff on F-12+



--- NEW FILE daemon_wallpapoz-wrapper ---
#!/bin/sh

pgrep -U $(id -u) -f daemon_wallpapoz | while read daemon_pid
do
	pgrep -U $(id -u) -f python | while read python_pid
	do
		if [ $daemon_pid = $python_pid ]
		then
			/usr/bin/kill -SIGTERM $daemon_pid
		fi
	done
done
exec /usr/libexec/daemon_wallpapoz "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	31 Mar 2008 16:36:56 -0000	1.9
+++ .cvsignore	29 Aug 2009 17:02:03 -0000	1.10
@@ -1 +1 @@
-wallpapoz-0.4.1-svn87_trunk.tar.bz2
+wallpapoz-0.4.1-svn92_trunk.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	31 Mar 2008 16:36:56 -0000	1.9
+++ sources	29 Aug 2009 17:02:04 -0000	1.10
@@ -1 +1 @@
-dcdc89bee9b1e35e000f99f104a39774  wallpapoz-0.4.1-svn87_trunk.tar.bz2
+5a993e9618690681805124f78c141170  wallpapoz-0.4.1-svn92_trunk.tar.bz2


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-10/wallpapoz.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- wallpapoz.spec	27 Aug 2008 03:11:47 -0000	1.19
+++ wallpapoz.spec	29 Aug 2009 17:02:04 -0000	1.20
@@ -1,5 +1,5 @@
 # For svn version: do
-# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}
+# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}%%{?svnver:-svn%%svnver}
 # $ tar -cjf %%{name}-%%{mainver}%%{?svnver:-svn%%svnver}.tar.bz2 %%{name}-%%{mainver}/
 
 %define         srcurl          http://wallpapoz.akbarhome.com/
@@ -7,8 +7,8 @@
 
 %define         mainver         0.4.1
 %undefine         betaver
-%define         svnver          svn87_trunk
-%define         fedorarel       7
+%define         svnver          svn92_trunk
+%define         fedorarel       10
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -21,6 +21,10 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            %{srcurl}
 Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+Source10:       daemon_wallpapoz-wrapper
+%if 0%{?fedora} >= 12
+Source11:	wallpapoz-autostart.desktop
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,7 +55,6 @@ wallpapers for different workspaces or v
 
 %prep
 %setup -q -n %{name}-%{version}%{?svnver:-%svnver}
-sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py
 
 %build
 
@@ -69,6 +72,22 @@ desktop-file-install \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# Install daemon_wallpapoz-wrapper, move the original one
+# to %%_libexecdir
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz \
+	$RPM_BUILD_ROOT%{_libexecdir}/
+%{__install} -cpm 0755 %{SOURCE10} \
+	$RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz
+
+# Install desktop application autostart stuff
+%if 0%{?fedora} >= 12
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
+desktop-file-install \
+	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+	%{SOURCE11}
+%endif
+
 %{find_lang} %{name}
 
 %clean
@@ -78,6 +97,11 @@ desktop-file-install \
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
+%{_libexecdir}/daemon_wallpapoz
+
+%if 0%{?fedora} >= 12
+%{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
+%endif
 
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -86,6 +110,22 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
+- Update to rev 92
+- Install desktop application autostart stuff on F-12+
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-9.svn87_trunk
+- F-12: Mass rebuild
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-11: Mass rebuild
+
+* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-8.svn87_trunk
+- Always once kill daemon_wallpapoz process if it exists before start
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com>
+- F-11: Rebuild for Python 2.6
+
 * Wed Aug 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7.svn87_trunk
 - F-10+: Add (Build)Requires: gnome-python2-gnome (bug 456122, 460022)
 



From mtasaka at fedoraproject.org  Sat Aug 29 17:02:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 17:02:08 +0000 (UTC)
Subject: rpms/wallpapoz/F-11 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 wallpapoz.spec, 1.22, 1.23
Message-ID: <20090829170208.3051C11C0496@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1121/F-11

Modified Files:
	.cvsignore sources wallpapoz.spec 
Log Message:
* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
- Update to rev 92
- Install desktop application autostart stuff on F-12+



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	31 Mar 2008 16:36:56 -0000	1.9
+++ .cvsignore	29 Aug 2009 17:02:05 -0000	1.10
@@ -1 +1 @@
-wallpapoz-0.4.1-svn87_trunk.tar.bz2
+wallpapoz-0.4.1-svn92_trunk.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	31 Mar 2008 16:36:56 -0000	1.9
+++ sources	29 Aug 2009 17:02:05 -0000	1.10
@@ -1 +1 @@
-dcdc89bee9b1e35e000f99f104a39774  wallpapoz-0.4.1-svn87_trunk.tar.bz2
+5a993e9618690681805124f78c141170  wallpapoz-0.4.1-svn92_trunk.tar.bz2


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-11/wallpapoz.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- wallpapoz.spec	24 Feb 2009 05:19:24 -0000	1.22
+++ wallpapoz.spec	29 Aug 2009 17:02:06 -0000	1.23
@@ -1,5 +1,5 @@
 # For svn version: do
-# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}
+# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}%%{?svnver:-svn%%svnver}
 # $ tar -cjf %%{name}-%%{mainver}%%{?svnver:-svn%%svnver}.tar.bz2 %%{name}-%%{mainver}/
 
 %define         srcurl          http://wallpapoz.akbarhome.com/
@@ -7,14 +7,14 @@
 
 %define         mainver         0.4.1
 %undefine         betaver
-%define         svnver          svn87_trunk
-%define         fedorarel       8
+%define         svnver          svn92_trunk
+%define         fedorarel       10
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -22,6 +22,9 @@ License:        GPLv2+
 URL:            %{srcurl}
 Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
 Source10:       daemon_wallpapoz-wrapper
+%if 0%{?fedora} >= 12
+Source11:	wallpapoz-autostart.desktop
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -52,7 +55,6 @@ wallpapers for different workspaces or v
 
 %prep
 %setup -q -n %{name}-%{version}%{?svnver:-%svnver}
-sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py
 
 %build
 
@@ -78,6 +80,14 @@ desktop-file-install \
 %{__install} -cpm 0755 %{SOURCE10} \
 	$RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz
 
+# Install desktop application autostart stuff
+%if 0%{?fedora} >= 12
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
+desktop-file-install \
+	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+	%{SOURCE11}
+%endif
+
 %{find_lang} %{name}
 
 %clean
@@ -89,6 +99,10 @@ desktop-file-install \
 %{_bindir}/*%{name}
 %{_libexecdir}/daemon_wallpapoz
 
+%if 0%{?fedora} >= 12
+%{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
+%endif
+
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
 
@@ -96,6 +110,13 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
+- Update to rev 92
+- Install desktop application autostart stuff on F-12+
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-9.svn87_trunk
+- F-12: Mass rebuild
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
 



From mtasaka at fedoraproject.org  Sat Aug 29 17:02:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 29 Aug 2009 17:02:08 +0000 (UTC)
Subject: rpms/wallpapoz/devel wallpapoz-autostart.desktop, NONE,
	1.1 .cvsignore, 
	1.9, 1.10 sources, 1.9, 1.10 wallpapoz.spec, 1.23, 1.24
Message-ID: <20090829170208.C5FE711C0496@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1121/devel

Modified Files:
	.cvsignore sources wallpapoz.spec 
Added Files:
	wallpapoz-autostart.desktop 
Log Message:
* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
- Update to rev 92
- Install desktop application autostart stuff on F-12+



--- NEW FILE wallpapoz-autostart.desktop ---
[Desktop Entry]
Type=Application
Name=wallpapoz-autostart
Comment=Wallpapoz Autostarter
Exec=daemon_wallpapoz
Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	31 Mar 2008 16:36:56 -0000	1.9
+++ .cvsignore	29 Aug 2009 17:02:06 -0000	1.10
@@ -1 +1 @@
-wallpapoz-0.4.1-svn87_trunk.tar.bz2
+wallpapoz-0.4.1-svn92_trunk.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	31 Mar 2008 16:36:56 -0000	1.9
+++ sources	29 Aug 2009 17:02:06 -0000	1.10
@@ -1 +1 @@
-dcdc89bee9b1e35e000f99f104a39774  wallpapoz-0.4.1-svn87_trunk.tar.bz2
+5a993e9618690681805124f78c141170  wallpapoz-0.4.1-svn92_trunk.tar.bz2


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- wallpapoz.spec	24 Jul 2009 20:01:13 -0000	1.23
+++ wallpapoz.spec	29 Aug 2009 17:02:06 -0000	1.24
@@ -1,5 +1,5 @@
 # For svn version: do
-# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}
+# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}%%{?svnver:-svn%%svnver}
 # $ tar -cjf %%{name}-%%{mainver}%%{?svnver:-svn%%svnver}.tar.bz2 %%{name}-%%{mainver}/
 
 %define         srcurl          http://wallpapoz.akbarhome.com/
@@ -7,8 +7,8 @@
 
 %define         mainver         0.4.1
 %undefine         betaver
-%define         svnver          svn87_trunk
-%define         fedorarel       9
+%define         svnver          svn92_trunk
+%define         fedorarel       10
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -22,6 +22,9 @@ License:        GPLv2+
 URL:            %{srcurl}
 Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
 Source10:       daemon_wallpapoz-wrapper
+%if 0%{?fedora} >= 12
+Source11:	wallpapoz-autostart.desktop
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -52,7 +55,6 @@ wallpapers for different workspaces or v
 
 %prep
 %setup -q -n %{name}-%{version}%{?svnver:-%svnver}
-sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py
 
 %build
 
@@ -78,6 +80,14 @@ desktop-file-install \
 %{__install} -cpm 0755 %{SOURCE10} \
 	$RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz
 
+# Install desktop application autostart stuff
+%if 0%{?fedora} >= 12
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
+desktop-file-install \
+	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
+	%{SOURCE11}
+%endif
+
 %{find_lang} %{name}
 
 %clean
@@ -89,6 +99,10 @@ desktop-file-install \
 %{_bindir}/*%{name}
 %{_libexecdir}/daemon_wallpapoz
 
+%if 0%{?fedora} >= 12
+%{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
+%endif
+
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
 
@@ -96,6 +110,10 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-10.svn92_trunk
+- Update to rev 92
+- Install desktop application autostart stuff on F-12+
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-9.svn87_trunk
 - F-12: Mass rebuild
 



From jwilson at fedoraproject.org  Sat Aug 29 17:13:54 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sat, 29 Aug 2009 17:13:54 +0000 (UTC)
Subject: rpms/lirc/devel .cvsignore, 1.32, 1.33 lirc.spec, 1.59, 1.60 sources,
	1.32, 1.33
Message-ID: <20090829171354.AD93311C009F@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5195

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.5.pre2
- Update to lirc 0.8.6pre2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Jun 2009 20:06:52 -0000	1.32
+++ .cvsignore	29 Aug 2009 17:13:54 -0000	1.33
@@ -8,3 +8,4 @@ lirc-0.8.5pre2.tar.bz2
 lirc-0.8.5pre3.tar.bz2
 lirc-0.8.5.tar.bz2
 lirc-0.8.6pre1.tar.bz2
+lirc-0.8.6pre2.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- lirc.spec	25 Jul 2009 11:09:26 -0000	1.59
+++ lirc.spec	29 Aug 2009 17:13:54 -0000	1.60
@@ -14,11 +14,11 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre1
+%define pre     pre2
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.4%{?pre:.%{pre}}%{?dist}
+Release:        0.5%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -273,6 +273,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.5.pre2
+- Update to lirc 0.8.6pre2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-0.4.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	23 Jun 2009 20:06:52 -0000	1.32
+++ sources	29 Aug 2009 17:13:54 -0000	1.33
@@ -1 +1 @@
-0d42127b1e58c42e276349a0da545584  lirc-0.8.6pre1.tar.bz2
+cebc6e5aaa6bffc22c48e3b237ab0f2f  lirc-0.8.6pre2.tar.bz2



From jwilson at fedoraproject.org  Sat Aug 29 17:30:25 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sat, 29 Aug 2009 17:30:25 +0000 (UTC)
Subject: rpms/lirc/devel lirc-0.8.6-standardized-remote-keycodes.patch, NONE,
	1.1 lirc.spec, 1.60, 1.61 lirc-0.8.4-cvs-update.patch, 1.2,
	NONE lirc-0.8.5-standardized-remote-keycodes.patch, 1.1, NONE
Message-ID: <20090829173025.7BA3811C0371@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11844

Modified Files:
	lirc.spec 
Added Files:
	lirc-0.8.6-standardized-remote-keycodes.patch 
Removed Files:
	lirc-0.8.4-cvs-update.patch 
	lirc-0.8.5-standardized-remote-keycodes.patch 
Log Message:
* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.6.pre2
- Rediff patches so they actually apply still


lirc-0.8.6-standardized-remote-keycodes.patch:
 adstech/lircd.conf.usbx-707          |   76 ++++++++++----------
 animax/lircd.conf.animax             |   66 +++++++++---------
 apple/lircd.conf.macmini             |   12 +--
 asus/lircd.conf.asus                 |   56 +++++++--------
 asus/lircd.conf.asusdh               |   12 +--
 asus/lircd.conf.digimatrix           |   64 ++++++++---------
 atiusb/lircd.conf.atilibusb          |  104 ++++++++++++++--------------
 atiusb/lircd.conf.atiusb             |   84 +++++++++++-----------
 avermedia/lircd.conf.avermedia       |   48 ++++++-------
 avermedia/lircd.conf.avermedia98     |   58 +++++++--------
 avermedia/lircd.conf.vdomate         |   36 ++++-----
 bestbuy/lircd.conf.bestbuy           |   50 ++++++-------
 bestbuy/lircd.conf.bestbuy2          |   38 +++++-----
 caraca/lircd.conf.caraca             |   42 +++++------
 chronos/lircd.conf.chronos           |   50 ++++++-------
 cph03x/lircd.conf.cph03x             |   46 ++++++------
 creative/lircd.conf.alsa_usb         |   54 +++++++-------
 creative/lircd.conf.breakoutbox      |   52 +++++++-------
 creative/lircd.conf.creative         |   38 +++++-----
 creative/lircd.conf.livedrive        |   56 +++++++--------
 dvico/lircd.conf.fusionHDTV          |   62 ++++++++--------
 ea65/lircd.conf.ea65                 |   68 +++++++++---------
 ericsson/lircd.conf.bte              |   44 ++++++------
 hauppauge/lircd.conf.hauppauge       |   34 ++++-----
 hercules/lircd.conf.smarttv_stereo   |   46 ++++++------
 imon/lircd.conf.imon                 |   72 +++++++++----------
 imon/lircd.conf.imon-knob            |  105 +++++++++++++---------------
 imon/lircd.conf.imon-pad             |  128 +++++++++++++++++------------------
 imon/lircd.conf.imon-rsc             |   64 ++++++++---------
 iodata/lircd.conf.gvbctv5pci         |   54 +++++++-------
 kanam_accent/lircd.conf.IR-100       |   82 +++++++++++-----------
 knc_one/lircd.conf.knc_one           |   52 +++++++-------
 kworld/lircd.conf.kworld             |   42 +++++------
 leadtek/lircd.conf.PVR2000           |   74 ++++++++++----------
 leadtek/lircd.conf.RM-0007           |   50 ++++++-------
 leadtek/lircd.conf.RM-0010           |   78 ++++++++++-----------
 life-view/lircd.conf.flyvideo        |   58 +++++++--------
 logitech/lircd.conf.logitech         |   54 +++++++-------
 mceusb/lircd.conf.mceusb             |   93 ++++++++++++-------------
 packard_bell/lircd.conf.packard_bell |   50 ++++++-------
 pcmak/lircd.conf.pcmak               |  112 +++++++++++++++---------------
 pinnacle_systems/lircd.conf.pctv     |   70 +++++++++----------
 pixelview/lircd.conf.playtv          |   30 ++++----
 pixelview/lircd.conf.playtv_bt878    |   52 +++++++-------
 pixelview/lircd.conf.playtv_pro      |   34 ++++-----
 pixelview/lircd.conf.remotemaster    |   54 +++++++-------
 provideo/lircd.conf.pv951            |   32 ++++----
 remotec/lircd.conf.BW6130            |   28 +++----
 samsung/lircd.conf.samsung           |   98 +++++++++++++-------------
 sasem/lircd.conf.sasem               |   64 ++++++++---------
 sigma_designs/lircd.conf.realmagic   |   64 ++++++++---------
 silitek/lircd.conf.silitek           |   96 +++++++++++++-------------
 streamzap/lircd.conf.streamzap       |   70 +++++++++----------
 technisat/lircd.conf.mediafocusI     |   10 +-
 tekram/lircd.conf.m230               |   46 ++++++------
 vlsystem/lircd.conf.mplay            |   86 +++++++++++------------
 x10/lircd.conf.mouseremote           |   62 ++++++++--------
 x10/lircd.conf.mp3anywhere           |   70 +++++++++----------
 58 files changed, 1712 insertions(+), 1718 deletions(-)

--- NEW FILE lirc-0.8.6-standardized-remote-keycodes.patch ---
diff -Naurp lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707
--- lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:01.000000000 -0400
+++ lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:31.000000000 -0400
@@ -26,50 +26,50 @@ begin remote
   toggle_bit_mask 0x0
 
       begin codes
-          Power                    0x02FD5BA400
-          Mute                     0x02FD5FA000
-          1                        0x02FD57A800
-          2                        0x02FD4FB000
-          3                        0x02FD53AC00
-          4                        0x02FD56A900
-          5                        0x02FD4EB100
-          6                        0x02FD5EA100
-          7                        0x02FD54AB00
-          8                        0x02FD4CB300
-          9                        0x02FD5CA300
-          Jump                     0x02FD55AA00
-          0                        0x02FD4DB200
+          KEY_POWER                    0x02FD5BA400
+          KEY_MUTE                     0x02FD5FA000
+          KEY_1                        0x02FD57A800
+          KEY_2                        0x02FD4FB000
+          KEY_3                        0x02FD53AC00
+          KEY_4                        0x02FD56A900
+          KEY_5                        0x02FD4EB100
+          KEY_6                        0x02FD5EA100
+          KEY_7                        0x02FD54AB00
+          KEY_8                        0x02FD4CB300
+          KEY_9                        0x02FD5CA300
+          Jump                         0x02FD55AA00
+          KEY_0                        0x02FD4DB200
           Search                   0x02FD5DA200
-          Guide                    0x02FD17E800
-          Up                       0x02FD0FF000
-          Menu                     0x02FD1FE000
-          Left                     0x02FD16E900
-          Enter                    0x02FD0EF100
-          Right                    0x02FD1EE100
-          Info                     0x02FD5AA500
-          Down                     0x02FD46B900
-          Exit                     0x02FD52AD00
-          Replay                   0x02FD59A600
-          Skip                     0x02FD51AE00
-          Rewind                   0x02FD58A700
-          Play                     0x02FD44BB00
-          Forward                  0x02FD50AF00
-          Stop                     0x02FD07F800
-          Record                   0x02FD1BE400
+          GUIDE                    0x02FD17E800
+          KEY_UP                       0x02FD0FF000
+          KEY_MENU                     0x02FD1FE000
+          KEY_LEFT                     0x02FD16E900
+          KEY_ENTER                    0x02FD0EF100
+          KEY_RIGHT                    0x02FD1EE100
+          KEY_INFO                     0x02FD5AA500
+          KEY_DOWN                     0x02FD46B900
+          KEY_EXIT                     0x02FD52AD00
+          KEY_AGAIN                   0x02FD59A600
+          KEY_NEXT                     0x02FD51AE00
+          KEY_REWIND                   0x02FD58A700
+          KEY_PLAY                     0x02FD44BB00
+          KEY_FORWARD                  0x02FD50AF00
+          KEY_STOP                     0x02FD07F800
+          KEY_RECORD                   0x02FD1BE400
           Live                     0x02FD13EC00
-          A                        0x02FD0AF500
-          DVD                      0x02FD06F900
-          B                        0x02FD12ED00
+          KEY_A                        0x02FD0AF500
+          KEY_DVD                      0x02FD06F900
+          KEY_B                        0x02FD12ED00
           Photo                    0x02FD48B700
-          Video                    0x02FD40BF00
-          Music                    0x02FD19E600
-          Ch+                      0x02FD0BF400
-          Ch-                      0x02FD08F700
+          KEY_VIDEO                    0x02FD40BF00
+          KEY_AUDIO                    0x02FD19E600
+          KEY_CHANNELUP                      0x02FD0BF400
+          KEY_CHANNELDOWN                      0x02FD08F700
           S1                       0x02FD03FC00
           S2                       0x02FD01FE00
           S3                       0x02FD00FF00
-          Vol+                     0x02FD15EA00
-          Vol-                     0x02FD1CE300
+          KEY_VOLUMEUP                     0x02FD15EA00
+          KEY_VOLUMEDOWN                     0x02FD1CE300
       end codes
 
 end remote
diff -Naurp lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax lirc-0.8.6pre2/remotes/animax/lircd.conf.animax
--- lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
+++ lirc-0.8.6pre2/remotes/animax/lircd.conf.animax	2009-08-29 13:23:31.000000000 -0400
@@ -38,79 +38,79 @@ begin remote
 
       begin codes
           CD_DOWN                  0x000000000000DB24
-          CD_UP                    0x0000000000005BA4
+          KEY_CD                    0x0000000000005BA4
           TV_DOWN                  0x000000000000DC23
-          TV_UP                    0x0000000000005CA3
+          KEY_TV                    0x0000000000005CA3
           PHONE_DOWN               0x000000000000DD22
-          PHONE_UP                 0x0000000000005DA2
+          KEY_PHONE                 0x0000000000005DA2
           RADIO_DOWN               0x000000000000DE21
-          RADIO_UP                 0x0000000000005EA1
+          KEY_RADIO                 0x0000000000005EA1
           VIDEO_DOWN               0x000000000000DF20
-          VIDEO_UP                 0x0000000000005FA0
+          KEY_VIDEO                 0x0000000000005FA0
           AUX1_DOWN                0x000000000000E01F
-          AUX1_UP                  0x000000000000609F
+          KEY_AUX                  0x000000000000609F
           MAIL_DOWN                0x000000000000E11E
-          MAIL_UP                  0x000000000000619E
+          KEY_MAIL                  0x000000000000619E
           AUX2_DOWN                0x000000000000E21D
           AUX2_UP                  0x000000000000629D
           POWER_DOWN               0x000000000000E31C
-          POWER_UP                 0x000000000000639C
+          KEY_POWER                 0x000000000000639C
           LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B
           LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B
           REWIND_DOWN              0x000000000000E51A
-          REWIND_UP                0x000000000000659A
+          KEY_REWIND                0x000000000000659A
           PLAY_DOWN                0x000000000000E619
-          PLAY_UP                  0x0000000000006699
+          KEY_PLAY                  0x0000000000006699
           FORWARD_DOWN             0x000000000000E718
-          FORWARD_UP               0x0000000000006798
+          KEY_FORWARD               0x0000000000006798
           SKIP_BACKWARD_DOWN       0x000000000000E817
           SKIP_BACKWARD            0x0000000000006897
           STOP_DOWN                0x000000000000E916
-          STOP_UP                  0x0000000000006996
+          KEY_STOP                  0x0000000000006996
           SKIP_FORWARD_DOWN        0x000000000000EA15
           SKIP_FORWARD_UP          0x0000000000006A95
           CHANNEL_UP_DOWN          0x000000000000EB14
-          CHANNEL_UP_UP            0x0000000000006B94
+          KEY_CHANNELUP            0x0000000000006B94
           MENU_DOWN                0x000000000000EC13
-          MENU_UP                  0x0000000000006C93
+          KEY_MENU                  0x0000000000006C93
           VOLUME_UP_DOWN           0x000000000000ED12
-          VOLUME_UP_UP             0x0000000000006D92
+          KEY_VOLUMEUP             0x0000000000006D92
           BLUE_BUTTON_DOWN         0x000000000000EE11
-          BLUE_BUTTON_UP           0x0000000000006E91
+          KEY_BLUE           0x0000000000006E91
           MUTE_DOWN                0x000000000000EF10
-          MUTE_UP                  0x0000000000006F90
+          KEY_MUTE                  0x0000000000006F90
           VOLUME_DOWN_DOWN         0x000000000000F00F
-          VOLUME_DOWN_UP           0x000000000000708F
+          KEY_VOLUMEDOWN           0x000000000000708F
           RED_BUTTON_DOWN          0x000000000000F10E
-          RED_BUTTON_UP            0x000000000000718E
+          KEY_RED            0x000000000000718E
           GREEN_BUTTON_DOWN        0x000000000000F20D
-          GREEN_BUTTON_UP          0x000000000000728D
+          KEY_GREEN          0x000000000000728D
           CHANNEL_DOWN_DOWN        0x000000000000F30C
-          CHANNEL_DOWN_UP          0x000000000000738C
+          KEY_CHANNELDOWN          0x000000000000738C
           1_DOWN                   0x000000000000F40B
-          1_UP                     0x000000000000748B
+          KEY_1                     0x000000000000748B
           2_DOWN                   0x000000000000F50A
-          2_UP                     0x000000000000758A
+          KEY_2                     0x000000000000758A
           3_DOWN                   0x000000000000F609
-          3_UP                     0x0000000000007689
+          KEY_3                     0x0000000000007689
           4_DOWN                   0x000000000000F708
-          4_UP                     0x0000000000007788
+          KEY_4                     0x0000000000007788
           5_DOWN                   0x000000000000F807
-          5_UP                     0x0000000000007887
+          KEY_5                     0x0000000000007887
           6_DOWN                   0x000000000000F906
-          6_UP                     0x0000000000007986
+          KEY_6                     0x0000000000007986
           7_DOWN                   0x000000000000FA05
-          7_UP                     0x0000000000007A85
+          KEY_7                     0x0000000000007A85
           8_DOWN                   0x000000000000FB04
-          8_UP                     0x0000000000007B84
+          KEY_8                     0x0000000000007B84
           9_DOWN                   0x000000000000FC03
-          9_UP                     0x0000000000007C83
+          KEY_9                     0x0000000000007C83
           SLASH_DOWN               0x000000000000FD02
-          SLASH_UP                 0x0000000000007D82
+          KEY_SLASH                 0x0000000000007D82
[...4120 lines suppressed...]
+          KEY_8                        0x03
+          KEY_9                        0x07
+          KEY_0                        0x4c
+          KEY_VOLUMEUP                 0x0a
+          KEY_VOLUMEDOWN               0x0e
+          KEY_CHANNELUP                0x12
+          KEY_CHANNELDOWN              0x16
+          Guide                        0x0f
+          KEY_BACK                     0x0b
+          KEY_TV                       0x13
+          KEY_OK                       0x42
+          KEY_UP                       0x19
+          KEY_LEFT                     0x54
+          KEY_RIGHT                    0x43
+          KEY_DOWN                     0x1d
+          Exit_Click                   0x1f
+          Task_Quick                   0x17
+          Run_DClick                   0x1b
+          KEY_REWIND                   0x0d
+          KEY_PLAY                     0x09
+          KEY_FASTFORWARD              0x15
+          KEY_PREVIOUS                 0x1a
+          KEY_STOP                     0x01
+          KEY_NEXT                     0x1e
+          KEY_PAUSE                    0x05
+          KEY_MUTE                     0x4a
+          Warp_Mouse                   0x47
+          KEY_RECORD                   0x11
+          KEY_ZOOM                     0x14
+          Detail                       0x4b
       end codes
 
 end remote
diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote
--- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
+++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote	2009-08-29 13:23:31.000000000 -0400
@@ -24,42 +24,42 @@ begin remote
   gap		140000
 
       begin codes
-        POWER			0x000000000000000F
-	PC			0x000000000000002B
+        KEY_POWER			0x000000000000000F
+	KEY_PC			0x000000000000002B
 	LAST			0x000000000000004F
-	CHANUP			0x0000000000000002
-	CHANDOWN		0x0000000000000003
-	VOLUP			0x0000000000000006
-	VOLDOWN			0x0000000000000007
-	MUTE			0x0000000000000005
-	1			0x0000000000000041
-	2			0x0000000000000042
-	3			0x0000000000000043
-	4			0x0000000000000044
-	5			0x0000000000000045
-	6			0x0000000000000046
-	7			0x0000000000000047
-	8			0x0000000000000048
-	9			0x0000000000000049
-	0			0x0000000000000040
-	ENTER			0x000000000000004a
+	KEY_CHANNELUP			0x0000000000000002
+	KEY_CHANNELDOWN		0x0000000000000003
+	KEY_VOLUMEUP			0x0000000000000006
+	KEY_VOLUMEDOWN			0x0000000000000007
+	KEY_MUTE			0x0000000000000005
+	KEY_1			0x0000000000000041
+	KEY_2			0x0000000000000042
+	KEY_3			0x0000000000000043
+	KEY_4			0x0000000000000044
+	KEY_5			0x0000000000000045
+	KEY_6			0x0000000000000046
+	KEY_7			0x0000000000000047
+	KEY_8			0x0000000000000048
+	KEY_9			0x0000000000000049
+	KEY_0			0x0000000000000040
+	KEY_ENTER			0x000000000000004a
 	ADOTB			0x000000000000005D
-	REWIND			0x000000000000001C
-	PLAY			0x000000000000000D
-	FFWD			0x000000000000001D
-	STOP			0x000000000000000E
-	PAUSE			0x000000000000004E
-	RECORD			0x00000000000000FF
-	ENTER			0x000000000000004A
+	KEY_REWIND			0x000000000000001C
+	KEY_PLAY			0x000000000000000D
+	KEY_FASTFORWARD			0x000000000000001D
+	KEY_STOP			0x000000000000000E
+	KEY_PAUSE			0x000000000000004E
+	KEY_RECORD			0x00000000000000FF
+	KEY_ENTER			0x000000000000004A
 	LAST			0x000000000000004F
 	DISP			0x000000000000005C
 	SHIFT			0x000000000000006B
 	GUIDE			0x000000000000006D
-	SELECT			0x0000000000000093
-	PHONE			0x000000000000004B
-	WEB			0x000000000000008B
-	CD			0x00000000000000AB
-	DVD			0x00000000000000CB
+	KEY_SELECT			0x0000000000000093
+	KEY_PHONE			0x000000000000004B
+	KEY_WWW			0x000000000000008B
+	KEY_CD			0x00000000000000AB
+	KEY_DVD			0x00000000000000CB
 	MOUSE_SLOW_N		0x0000000000000110
 	MOUSE_SLOW_NNE		0x0000000000000131
 	MOUSE_SLOW_NE		0x0000000000000111
@@ -110,7 +110,7 @@ begin remote
 	MOUSE_FAST_NNW		0x0000000000000539
 	BUTTONR_DOWN		0x0000000000000801
 	BUTTONL_DOWN		0x0000000000000804
-	BUTTON_UP		0x0000000000000800
+	KEY_UP		0x0000000000000800
 	end codes	
 
 end remote
diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere
--- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
+++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere	2009-08-29 13:23:31.000000000 -0400
@@ -22,43 +22,43 @@ begin remote
   gap		140000
 
       begin codes
-        POWER			0x00000000000000F0
-	PC			0x00000000000000D4
+        KEY_POWER			0x00000000000000F0
+	KEY_PC			0x00000000000000D4
 	LAST			0x00000000000000F2
-	CHANUP			0x0000000000000040
-	CHANDOWN		0x00000000000000C0
-	VOLUP			0x0000000000000060
-	VOLDOWN			0x00000000000000E0
-	MUTE			0x00000000000000A0
-	ONE			0x0000000000000082
-	TWO			0x0000000000000042
-	THREE			0x00000000000000C2
-	FOUR			0x0000000000000022
-	FIVE			0x00000000000000A2
-	SIX			0x0000000000000062
-	SEVEN			0x00000000000000E2
-	EIGHT			0x0000000000000012
-	NINE			0x0000000000000092
-	ZERO			0x0000000000000002
-	ENTER			0x0000000000000052
+	KEY_CHANNELUP			0x0000000000000040
+	KEY_CHANNELDOWN		0x00000000000000C0
+	KEY_VOLUMEUP			0x0000000000000060
+	KEY_VOLUMEDOWN			0x00000000000000E0
+	KEY_MUTE			0x00000000000000A0
+	KEY_1			0x0000000000000082
+	KEY_2			0x0000000000000042
+	KEY_3			0x00000000000000C2
+	KEY_4			0x0000000000000022
+	KEY_5			0x00000000000000A2
+	KEY_6			0x0000000000000062
+	KEY_7			0x00000000000000E2
+	KEY_8			0x0000000000000012
+	KEY_9			0x0000000000000092
+	KEY_0			0x0000000000000002
+	KEY_ENTER			0x0000000000000052
 	ADOTB			0x00000000000000BA
-	A			0x000000000000003A
-	B			0x00000000000000D8
-	C			0x00000000000000D6
-	D			0x00000000000000D4
-	MENU			0x00000000000000B6
-	EXIT			0x00000000000000C9
-	UP			0x00000000000000D5
-	DOWN			0x00000000000000D3
-	LEFT			0x00000000000000D2
-	RIGHT			0x00000000000000D1
-	OK			0x0000000000000052
-	REWIND			0x0000000000000038
-	PLAY			0x00000000000000B0
-	FFWD			0x00000000000000B8
-	RECORD			0x00000000000000FF
-	STOP			0x0000000000000070
-	PAUSE			0x0000000000000072
+	KEY_A			0x000000000000003A
+	KEY_B			0x00000000000000D8
+	KEY_C			0x00000000000000D6
+	KEY_D			0x00000000000000D4
+	KEY_MENU			0x00000000000000B6
+	KEY_EXIT			0x00000000000000C9
+	KEY_UP			0x00000000000000D5
+	KEY_DOWN			0x00000000000000D3
+	KEY_LEFT			0x00000000000000D2
+	KEY_RIGHT			0x00000000000000D1
+	KEY_OK			0x0000000000000052
+	KEY_REWIND			0x0000000000000038
+	KEY_PLAY			0x00000000000000B0
+	KEY_FASTFORWARD			0x00000000000000B8
+	KEY_RECORD			0x00000000000000FF
+	KEY_STOP			0x0000000000000070
+	KEY_PAUSE			0x0000000000000072
       end codes	
 
 end remote


Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- lirc.spec	29 Aug 2009 17:13:54 -0000	1.60
+++ lirc.spec	29 Aug 2009 17:30:25 -0000	1.61
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.5%{?pre:.%{pre}}%{?dist}
+Release:        0.6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -31,7 +31,7 @@ Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.5-standardized-remote-keycodes.patch
+Patch1:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -273,6 +273,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.6.pre2
+- Rediff patches so they actually apply still
+
 * Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.5.pre2
 - Update to lirc 0.8.6pre2
 


--- lirc-0.8.4-cvs-update.patch DELETED ---


--- lirc-0.8.5-standardized-remote-keycodes.patch DELETED ---



From mclasen at fedoraproject.org  Sat Aug 29 17:43:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 29 Aug 2009 17:43:38 +0000 (UTC)
Subject: rpms/polkit-gnome/devel polkit-gnome.spec,1.8,1.9
Message-ID: <20090829174338.86B4F11C009F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14669

Modified Files:
	polkit-gnome.spec 
Log Message:
Require a new enough polkit



Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- polkit-gnome.spec	29 Aug 2009 04:29:57 -0000	1.8
+++ polkit-gnome.spec	29 Aug 2009 17:43:38 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.94
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
@@ -11,6 +11,7 @@ BuildRequires: gtk2-devel
 BuildRequires: polkit-devel >= 0.94
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
+Requires: polkit >= 0.94
 
 %description
 polkit-gnome provides an authentication agent for PolicyKit
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.94-3
+- Require a new enough polkit (#517479)
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.94-2
 - Show in KDE, too (#519674)
 



From rdieter at fedoraproject.org  Sat Aug 29 17:50:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 29 Aug 2009 17:50:22 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.30, 1.31 kipi-plugins.spec,
	1.96, 1.97 sources, 1.30, 1.31
Message-ID: <20090829175022.5527F11C0494@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15958

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.0-1
- kipi-plugins-0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	24 Jul 2009 12:21:00 -0000	1.30
+++ .cvsignore	29 Aug 2009 17:50:22 -0000	1.31
@@ -1 +1 @@
-kipi-plugins-0.5.0.tar.bz2
+kipi-plugins-0.6.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kipi-plugins.spec	24 Jul 2009 12:21:00 -0000	1.96
+++ kipi-plugins.spec	29 Aug 2009 17:50:22 -0000	1.97
@@ -2,7 +2,7 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.5.0
+Version: 0.6.0
 Release: 1%{?dist}
 
 License: GPLv2+ and Adobe


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	24 Jul 2009 12:21:00 -0000	1.30
+++ sources	29 Aug 2009 17:50:22 -0000	1.31
@@ -1 +1 @@
-f82c95b85f2b434fd03b99451ec5081e  kipi-plugins-0.5.0.tar.bz2
+105cc1f802db4b082c0ad8ee31262fd5  kipi-plugins-0.6.0.tar.bz2



From rdieter at fedoraproject.org  Sat Aug 29 18:01:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 29 Aug 2009 18:01:46 +0000 (UTC)
Subject: rpms/xsettings-kde/devel xsettings-kde-0.11-svn_checkout.sh, NONE, 
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xsettings-kde.spec,
	1.5, 1.6 xsettings-kde-0.10-svn_checkout.sh, 1.1, NONE
Message-ID: <20090829180146.A45D511C009F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xsettings-kde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17896

Modified Files:
	.cvsignore sources xsettings-kde.spec 
Added Files:
	xsettings-kde-0.11-svn_checkout.sh 
Removed Files:
	xsettings-kde-0.10-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/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Jun 2009 01:35:26 -0000	1.3
+++ .cvsignore	29 Aug 2009 18:01:46 -0000	1.4
@@ -1 +1 @@
-xsettings-kde-0.10-20090626svn.tar.bz2
+xsettings-kde-0.11-20090829svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Jun 2009 01:35:26 -0000	1.3
+++ sources	29 Aug 2009 18:01:46 -0000	1.4
@@ -1 +1 @@
-79df02a7ee43e2e2523e5469ca5e12a8  xsettings-kde-0.10-20090626svn.tar.bz2
+ec6f797883068c1c25609d864e425cd8  xsettings-kde-0.11-20090829svn.tar.bz2


Index: xsettings-kde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/devel/xsettings-kde.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xsettings-kde.spec	27 Jul 2009 08:45:25 -0000	1.5
+++ xsettings-kde.spec	29 Aug 2009 18:01:46 -0000	1.6
@@ -1,12 +1,12 @@
 
 Summary: XSettings Daemon for KDE
 Name:    xsettings-kde
-Version: 0.10
-Release: 2%{?dist}	
+Version: 0.11
+Release: 1%{?dist}	
 License: GPLv2+
 Group:   User Interface/Desktops 
 # upstream is a svn
-Source0:  %{name}-%{version}-20090626svn.tar.bz2
+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)
@@ -58,6 +58,9 @@ 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
 


--- xsettings-kde-0.10-svn_checkout.sh DELETED ---



From cwickert at fedoraproject.org  Sat Aug 29 18:18:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 29 Aug 2009 18:18:08 +0000 (UTC)
Subject: rpms/rednotebook/F-10 rednotebook-0.8.4-gtk-2.14.patch, NONE,
	1.1 rednotebook.spec, 1.15, 1.16
Message-ID: <20090829181808.805A311C009F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21032

Modified Files:
	rednotebook.spec 
Added Files:
	rednotebook-0.8.4-gtk-2.14.patch 
Log Message:
* Sat Aug 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1.1
- Make rednotebook work with GTK 2.14 (#518778)


rednotebook-0.8.4-gtk-2.14.patch:
 mainWindow.glade |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE rednotebook-0.8.4-gtk-2.14.patch ---
--- rednotebook-0.8.4/rednotebook/files/mainWindow.glade	2009-08-09 21:18:10.000000000 +0200
+++ rednotebook-0.8.4/rednotebook/files/mainWindow.glade.svn	2009-08-29 19:35:43.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -56,11 +56,8 @@
   </object>
   <object class="GtkWindow" id="mainFrame">
     <property name="window_position">center</property>
-    <accel-groups>
-      <group name="accelgroup1"/>
-    </accel-groups>
-    <signal name="destroy" handler="on_mainFrame_destroy"/>
     <signal name="configure_event" handler="on_mainFrame_configure_event"/>
+    <signal name="delete_event" handler="on_mainFrame_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
@@ -163,6 +160,7 @@
                       <object class="GtkImageMenuItem" id="quit">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Shutdown RedNotebook. It won't be sent to the tray.</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -431,12 +429,8 @@
                             <child>
                               <object class="GtkComboBoxEntry" id="searchBox">
                                 <property name="visible">True</property>
-                                <property name="model">liststore4</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
                                 </child>
                               </object>
                               <packing>
@@ -2256,7 +2250,6 @@
       <action-widget response="-5">button21</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="stock">gtk-new</property>
@@ -2281,4 +2274,5 @@
     <property name="visible">True</property>
     <property name="stock">gtk-paste</property>
   </object>
+  <object class="GtkAccelGroup" id="accelgroup1"/>
 </interface>


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/rednotebook.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rednotebook.spec	14 Aug 2009 13:06:14 -0000	1.15
+++ rednotebook.spec	29 Aug 2009 18:18:08 -0000	1.16
@@ -2,13 +2,14 @@
 
 Name:           rednotebook
 Version:        0.8.4
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8.4-gtk-2.14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -30,7 +31,7 @@ and does so in style.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .216
 
 %build
 python setup.py build
@@ -71,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Sat Aug 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1.1
+- Make rednotebook work with GTK 2.14 (#518778)
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
 - Updated to new upstream version 0.8.4
 



From rayvd at fedoraproject.org  Sat Aug 29 18:29:07 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Sat, 29 Aug 2009 18:29:07 +0000 (UTC)
Subject: rpms/syslog-ng/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 syslog-ng.spec, 1.44, 1.45
Message-ID: <20090829182907.68CB711C009F@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27957

Modified Files:
	.cvsignore sources syslog-ng.spec 
Log Message:
Update for libnet linking



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	24 Mar 2009 13:52:29 -0000	1.18
+++ .cvsignore	29 Aug 2009 18:29:07 -0000	1.19
@@ -1 +1,2 @@
 syslog-ng-2.1.4.tar.gz
+syslog-ng-2.1.4-libnet.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	24 Mar 2009 13:52:29 -0000	1.18
+++ sources	29 Aug 2009 18:29:07 -0000	1.19
@@ -1 +1,2 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- syslog-ng.spec	19 Aug 2009 12:30:50 -0000	1.44
+++ syslog-ng.spec	29 Aug 2009 18:29:07 -0000	1.45
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -22,6 +22,9 @@ Source20: rsyslog-syslog-ng.sysconfig
 Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
 Source30: rsyslog-syslog-ng-fc10.sysconfig
 Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log
+
+Patch0: syslog-ng-2.1.4-libnet.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: eventlog-devel >= %{evtlog_ver}
@@ -33,6 +36,7 @@ BuildRequires: glib2-static
 %if 0%{?rhel}
 BuildRequires: tcp_wrappers
 BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
 %else
 BuildRequires: tcp_wrappers-devel
 %endif
@@ -64,6 +68,9 @@ ideal for firewalled environments.
 
 %prep
 %setup -q
+%if 0%{?rhel}
+%patch0 -p1 -b .libnet
+%endif
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -219,6 +226,9 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
 * Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
 - Init script fix (bug#517339)
 



From rayvd at fedoraproject.org  Sat Aug 29 18:32:46 2009
From: rayvd at fedoraproject.org (rayvd)
Date: Sat, 29 Aug 2009 18:32:46 +0000 (UTC)
Subject: rpms/syslog-ng/EL-5 sources, 1.8, 1.9 syslog-ng.init.d, 1.1,
	1.2 syslog-ng.spec, 1.18, 1.19
Message-ID: <20090829183246.AC63211C009F@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30938

Modified Files:
	sources syslog-ng.init.d syslog-ng.spec 
Log Message:
Fixes for init script bug and libnet linking.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Mar 2009 17:08:49 -0000	1.8
+++ sources	29 Aug 2009 18:32:46 -0000	1.9
@@ -1 +1,2 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.init.d
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/syslog-ng.init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- syslog-ng.init.d	24 Mar 2009 17:08:49 -0000	1.1
+++ syslog-ng.init.d	29 Aug 2009 18:32:46 -0000	1.2
@@ -67,8 +67,10 @@ stop()
 {
 	echo -n $"Stopping syslog-ng: "
 	REMOVE_COMPAT_PID=0
-	if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
-		REMOVE_COMPAT_PID=1
+	if [ -e $SYSLOGNG_PID ]; then
+		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
+			REMOVE_COMPAT_PID=1
+		fi
 	fi
 	killproc syslog-ng
 	RETVAL=$?


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-5/syslog-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- syslog-ng.spec	24 Mar 2009 17:08:49 -0000	1.18
+++ syslog-ng.spec	29 Aug 2009 18:32:46 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name: syslog-ng
 Version: 2.1.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -22,6 +22,9 @@ Source20: rsyslog-syslog-ng.sysconfig
 Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
 Source30: rsyslog-syslog-ng-fc10.sysconfig
 Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log
+
+Patch0: syslog-ng-2.1.4-libnet.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: eventlog-devel >= %{evtlog_ver}
@@ -33,6 +36,7 @@ BuildRequires: glib2-static
 %if 0%{?rhel}
 BuildRequires: tcp_wrappers
 BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
 %else
 BuildRequires: tcp_wrappers-devel
 %endif
@@ -64,6 +68,9 @@ ideal for firewalled environments.
 
 %prep
 %setup -q
+%if 0%{?rhel}
+%patch0 -p1 -b .libnet
+%endif
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -219,6 +226,12 @@ fi
 
 
 %changelog
+* Thu Aug 20 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Init script fix (bug#517339)
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically



From leigh123linux at fedoraproject.org  Sat Aug 29 18:34:49 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 18:34:49 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.12, 1.13 qbittorrent.spec, 1.30,
	1.31 qbittorrent_flag.patch, 1.4, 1.5 sources, 1.12, 1.13
Message-ID: <20090829183449.2823511C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32609

Modified Files:
	.cvsignore qbittorrent.spec qbittorrent_flag.patch sources 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.1.20090829svn
- update to svn 2578
- redo qbittorrent_flag patch (again :-( )



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Aug 2009 14:05:13 -0000	1.12
+++ .cvsignore	29 Aug 2009 18:34:48 -0000	1.13
@@ -1 +1 @@
-qbittorrent-1.4.1.tar.gz
+qbittorrent-2578svn.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- qbittorrent.spec	29 Aug 2009 14:42:50 -0000	1.30
+++ qbittorrent.spec	29 Aug 2009 18:34:48 -0000	1.31
@@ -1,16 +1,16 @@
-#%%define svn_rev 2417
+%define svn_rev 2578
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.4.1
-Release: 3%{?dist}
+Version: 1.5.0
+Release: 0.1.20090829svn%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 # svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
 # rm -rf qbittorrent/.svn
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
-#Source0:  %{name}-%{svn_rev}svn.tar.gz
-Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
+Source0:  %{name}-%{svn_rev}svn.tar.gz
+#Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
@@ -22,7 +22,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: boost-devel
 BuildRequires: asio-devel
 BuildRequires: zziplib-devel
-BuildRequires: rb_libtorrent-devel >= 0.14.3
+BuildRequires: rb_libtorrent-devel >= 0.14.4
 BuildRequires: curl-devel, glib2-devel
 
 %description
@@ -30,7 +30,7 @@ A Bittorrent client using rb_libtorrent 
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
 %prep
-%setup -q 
+%setup -q -n %{name}
 %patch0 -p1 -b .qbittorrent_flag
 
 %build
@@ -74,6 +74,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.1.20090829svn
+- update to svn 2578
+- redo qbittorrent_flag patch (again :-( )
+
 * Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.4.1-3
 - redo qbittorrent_flag patch (again :-( )
 

qbittorrent_flag.patch:
 icons.qrc |   27 ---------------------------
 1 file changed, 27 deletions(-)

Index: qbittorrent_flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent_flag.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qbittorrent_flag.patch	29 Aug 2009 14:42:50 -0000	1.4
+++ qbittorrent_flag.patch	29 Aug 2009 18:34:48 -0000	1.5
@@ -1,37 +1,37 @@
 --- qbittorrent-1.3.3/src/icons.qrc.old 
-+++ qbittorrent-1.3.3/src/icons.qrc  
-@@ -14,33 +14,6 @@
-   <file>Icons/sphere2.png</file>
-   <file>Icons/uparrow.png</file>
-   <file>Icons/url.png</file>
--  <file>Icons/flags/brazil.png</file>
--  <file>Icons/flags/bulgaria.png</file>
--  <file>Icons/flags/china.png</file>
++++ qbittorrent-1.3.3/src/icons.qrc   
+@@ -41,33 +41,6 @@
+   <file>Icons/skin/delete_all.png</file>
+   <file>Icons/skin/splash.png</file>
+   <file>Icons/skin/decrease.png</file>
 -  <file>Icons/flags/czech.png</file>
--  <file>Icons/flags/denmark.png</file>
+-  <file>Icons/flags/china.png</file>
+-  <file>Icons/flags/norway.png</file>
 -  <file>Icons/flags/finland.png</file>
--  <file>Icons/flags/france.png</file>
--  <file>Icons/flags/germany.png</file>
--  <file>Icons/flags/greece.png</file>
--  <file>Icons/flags/hungary.png</file>
--  <file>Icons/flags/italy.png</file>
--  <file>Icons/flags/japan.png</file>
 -  <file>Icons/flags/netherlands.png</file>
--  <file>Icons/flags/norway.png</file>
--  <file>Icons/flags/poland.png</file>
--  <file>Icons/flags/portugal.png</file>
+-  <file>Icons/flags/taiwan.png</file>
+-  <file>Icons/flags/sweden.png</file>
+-  <file>Icons/flags/spain_catalunya.png</file>
 -  <file>Icons/flags/romania.png</file>
+-  <file>Icons/flags/denmark.png</file>
+-  <file>Icons/flags/hungary.png</file>
+-  <file>Icons/flags/ukraine.png</file>
+-  <file>Icons/flags/turkey.png</file>
+-  <file>Icons/flags/greece.png</file>
+-  <file>Icons/flags/spain.png</file>
+-  <file>Icons/flags/portugal.png</file>
 -  <file>Icons/flags/russia.png</file>
+-  <file>Icons/flags/united_kingdom.png</file>
+-  <file>Icons/flags/poland.png</file>
+-  <file>Icons/flags/germany.png</file>
+-  <file>Icons/flags/bulgaria.png</file>
+-  <file>Icons/flags/brazil.png</file>
+-  <file>Icons/flags/france.png</file>
 -  <file>Icons/flags/slovakia.png</file>
+-  <file>Icons/flags/italy.png</file>
 -  <file>Icons/flags/south_korea.png</file>
--  <file>Icons/flags/spain.png</file>
--  <file>Icons/flags/spain_catalunya.png</file>
--  <file>Icons/flags/sweden.png</file>
--  <file>Icons/flags/taiwan.png</file>
--  <file>Icons/flags/turkey.png</file>
--  <file>Icons/flags/ukraine.png</file>
--  <file>Icons/flags/united_kingdom.png</file>
-   <file>Icons/oxygen/browse.png</file>
-   <file>Icons/oxygen/bt_settings.png</file>
-   <file>Icons/oxygen/bug.png</file>
+-  <file>Icons/flags/japan.png</file>
+   <file>Icons/oxygen/view-refresh.png</file>
+   <file>Icons/oxygen/file.png</file>
+   <file>Icons/oxygen/mail-folder-inbox.png</file>
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Aug 2009 14:05:13 -0000	1.12
+++ sources	29 Aug 2009 18:34:48 -0000	1.13
@@ -1 +1 @@
-48fa15b7326e9de81642f2e1e77cfbf1  qbittorrent-1.4.1.tar.gz
+5d03592acff791ceed397bf0fb33a489  qbittorrent-2578svn.tar.gz



From leigh123linux at fedoraproject.org  Sat Aug 29 19:03:00 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 19:03:00 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.31,1.32
Message-ID: <20090829190300.BBF2911C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16663

Modified Files:
	qbittorrent.spec 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.2.20090829svn
- add icons_qrc.patch



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- qbittorrent.spec	29 Aug 2009 18:34:48 -0000	1.31
+++ qbittorrent.spec	29 Aug 2009 19:03:00 -0000	1.32
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.5.0
-Release: 0.1.20090829svn%{?dist}
+Release: 0.2.20090829svn%{?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
@@ -12,6 +12,7 @@ Release: 0.1.20090829svn%{?dist}
 Source0:  %{name}-%{svn_rev}svn.tar.gz
 #Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Patch0:  qbittorrent_flag.patch
+Patch1:  icons_qrc.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -32,6 +33,7 @@ It aims to be as fast as possible and to
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .qbittorrent_flag
+%patch1 -p1 -b .icons_qrc
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -74,6 +76,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.2.20090829svn
+- add icons_qrc.patch
+
 * Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.1.20090829svn
 - update to svn 2578
 - redo qbittorrent_flag patch (again :-( )



From leigh123linux at fedoraproject.org  Sat Aug 29 19:03:53 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat, 29 Aug 2009 19:03:53 +0000 (UTC)
Subject: rpms/qbittorrent/devel icons_qrc.patch,NONE,1.1
Message-ID: <20090829190353.C4E5A11C009F@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17478

Added Files:
	icons_qrc.patch 
Log Message:
* Sat Aug 29 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.0-0.2.20090829svn
- add icons_qrc.patch


icons_qrc.patch:
 icons.qrc |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE icons_qrc.patch ---
--- qbittorrent-1.5.0/src/icons.qrc.old 
+++ qbittorrent-1.5.0/src/icons.qrc
@@ -85,7 +58,6 @@
   <file>Icons/oxygen/encrypted.png</file>
   <file>Icons/oxygen/edit_clear.png</file>
   <file>Icons/oxygen/download.png</file>
-  <file>Icons/oxygen/application-x-kgetlist-no.png</file>
   <file>Icons/oxygen/gear.png</file>
   <file>Icons/oxygen/remove.png</file>
   <file>Icons/oxygen/browse.png</file>



From pghmcfc at fedoraproject.org  Sat Aug 29 19:22:21 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sat, 29 Aug 2009 19:22:21 +0000 (UTC)
Subject: rpms/bittorrent/devel bittorrent.spec,1.52,1.53
Message-ID: <20090829192221.AD1EC11C009F@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/bittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1091

Modified Files:
	bittorrent.spec 
Log Message:
Fix download URL, moved upstream


Index: bittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- bittorrent.spec	24 Jul 2009 18:07:37 -0000	1.52
+++ bittorrent.spec	29 Aug 2009 19:22:21 -0000	1.53
@@ -13,7 +13,7 @@ Release:	13%{?dist}
 Group:		Applications/Internet
 License:	BitTorrent
 URL:		http://www.bittorrent.com/
-Source0:	http://download.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
+Source0:	http://download.bittorrent.com/dl/archive/BitTorrent-%{version}.tar.gz
 Source1:	bittorrent.desktop
 Source3:	btseed.init
 Source4:	bttrack.init



From pkgdb at fedoraproject.org  Sat Aug 29 20:06:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:06:13 +0000
Subject: [pkgdb] mingw32-openssl: kalev has requested watchcommits
Message-ID: <20090829200613.1E1CB10F86F@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on mingw32-openssl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:06:16 +0000
Subject: [pkgdb] mingw32-openssl: kalev has requested commit
Message-ID: <20090829200616.759EE10F88B@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on mingw32-openssl (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:06:27 +0000
Subject: [pkgdb] mingw32-openssl: kalev has requested watchcommits
Message-ID: <20090829200628.0775610F877@bastion2.fedora.phx.redhat.com>

kalev has requested the watchcommits acl on mingw32-openssl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:06:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:06:31 +0000
Subject: [pkgdb] mingw32-openssl: kalev has requested commit
Message-ID: <20090829200631.35F1F10F87B@bastion2.fedora.phx.redhat.com>

kalev has requested the commit acl on mingw32-openssl (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:11:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:11:04 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090829201104.8EEE410F877@bastion2.fedora.phx.redhat.com>

epienbro has set the watchcommits acl on mingw32-openssl (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:11:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:11:07 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090829201107.69F6910F884@bastion2.fedora.phx.redhat.com>

epienbro has set the commit acl on mingw32-openssl (Fedora devel) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:11:13 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090829201113.AA84810F897@bastion2.fedora.phx.redhat.com>

epienbro has set the watchcommits acl on mingw32-openssl (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:11:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:11:16 +0000
Subject: [pkgdb] mingw32-openssl had acl change status
Message-ID: <20090829201116.1951110F89C@bastion2.fedora.phx.redhat.com>

epienbro has set the commit acl on mingw32-openssl (Fedora 11) to Approved for kalev

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-openssl



From pkgdb at fedoraproject.org  Sat Aug 29 20:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:18:00 +0000
Subject: [pkgdb] gnome-commander (Fedora, 12) updated by tibbs
Message-ID: <20090829201800.7E5A210F881@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for gnome-commander
tibbs has set commit to Approved for 107427 on gnome-commander (Fedora 12)
tibbs has set checkout to Approved for 107427 on gnome-commander (Fedora 12)
tibbs has set build to Approved for 107427 on gnome-commander (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/gnome-commander



From pkgdb at fedoraproject.org  Sat Aug 29 20:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:18:46 +0000
Subject: [pkgdb] kazehakase (Fedora, 12) updated by tibbs
Message-ID: <20090829201846.F2B3810F877@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for kazehakase
tibbs has set commit to Approved for 107427 on kazehakase (Fedora 12)
tibbs has set checkout to Approved for 107427 on kazehakase (Fedora 12)
tibbs has set build to Approved for 107427 on kazehakase (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kazehakase



From pkgdb at fedoraproject.org  Sat Aug 29 20:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:18:59 +0000
Subject: [pkgdb] jd (Fedora, 12) updated by tibbs
Message-ID: <20090829201859.934F410F879@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for jd
tibbs has set commit to Approved for 107427 on jd (Fedora 12)
tibbs has set checkout to Approved for 107427 on jd (Fedora 12)
tibbs has set build to Approved for 107427 on jd (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/jd



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:15 +0000
Subject: [pkgdb] eqntott was added for shakthimaan
Message-ID: <20090829202115.46B7F10F87B@bastion2.fedora.phx.redhat.com>

tibbs has added Package eqntott with summary Generates truth tables from Boolean equations
tibbs has approved Package eqntott
tibbs has added a Fedora devel branch for eqntott with an owner of shakthimaan
tibbs has approved eqntott in Fedora devel
tibbs has approved Package eqntott
tibbs has set commit to Approved for 107427 on eqntott (Fedora devel)
tibbs has set checkout to Approved for 107427 on eqntott (Fedora devel)
tibbs has set build to Approved for 107427 on eqntott (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eqntott



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:21 +0000
Subject: [pkgdb] eqntott summary updated by tibbs
Message-ID: <20090829202121.A577310F86F@bastion2.fedora.phx.redhat.com>

tibbs set package eqntott summary to Generates truth tables from Boolean equations

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eqntott



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:21 +0000
Subject: [pkgdb] eqntott (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090829202121.BB0BE10F88C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for eqntott
tibbs has set commit to Approved for 107427 on eqntott (Fedora 11)
tibbs has set checkout to Approved for 107427 on eqntott (Fedora 11)
tibbs has set build to Approved for 107427 on eqntott (Fedora 11)
tibbs approved watchbugzilla on eqntott (Fedora 11) for chitlesh
tibbs approved watchcommits on eqntott (Fedora 11) for chitlesh
tibbs approved commit on eqntott (Fedora 11) for chitlesh
tibbs approved build on eqntott (Fedora 11) for chitlesh
tibbs approved approveacls on eqntott (Fedora 11) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eqntott



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:21 +0000
Subject: [pkgdb] eqntott (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090829202121.CA2AE10F897@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for eqntott
tibbs has set commit to Approved for 107427 on eqntott (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on eqntott (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on eqntott (Fedora EPEL 5)
tibbs approved watchbugzilla on eqntott (Fedora EPEL 5) for chitlesh
tibbs approved watchcommits on eqntott (Fedora EPEL 5) for chitlesh
tibbs approved commit on eqntott (Fedora EPEL 5) for chitlesh
tibbs approved build on eqntott (Fedora EPEL 5) for chitlesh
tibbs approved approveacls on eqntott (Fedora EPEL 5) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eqntott



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:21 +0000
Subject: [pkgdb] eqntott (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090829202121.D306410F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for eqntott
tibbs has set commit to Approved for 107427 on eqntott (Fedora 10)
tibbs has set checkout to Approved for 107427 on eqntott (Fedora 10)
tibbs has set build to Approved for 107427 on eqntott (Fedora 10)
tibbs approved watchbugzilla on eqntott (Fedora 10) for chitlesh
tibbs approved watchcommits on eqntott (Fedora 10) for chitlesh
tibbs approved commit on eqntott (Fedora 10) for chitlesh
tibbs approved build on eqntott (Fedora 10) for chitlesh
tibbs approved approveacls on eqntott (Fedora 10) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eqntott



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:21 +0000
Subject: [pkgdb] eqntott (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090829202121.E41AC10F8A1@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on eqntott (Fedora devel) for chitlesh
tibbs approved watchcommits on eqntott (Fedora devel) for chitlesh
tibbs approved commit on eqntott (Fedora devel) for chitlesh
tibbs approved build on eqntott (Fedora devel) for chitlesh
tibbs approved approveacls on eqntott (Fedora devel) for chitlesh

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eqntott



From tibbs at fedoraproject.org  Sat Aug 29 20:21:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:21:29 +0000 (UTC)
Subject: rpms/eqntott/devel - New directory
Message-ID: <20090829202129.F256E11C00EB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eqntott/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvswx8110/rpms/eqntott/devel

Log Message:
Directory /cvs/pkgs/rpms/eqntott/devel added to the repository




From tibbs at fedoraproject.org  Sat Aug 29 20:21:29 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:21:29 +0000 (UTC)
Subject: rpms/eqntott - New directory
Message-ID: <20090829202129.D066111C009F@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eqntott
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvswx8110/rpms/eqntott

Log Message:
Directory /cvs/pkgs/rpms/eqntott added to the repository




From tibbs at fedoraproject.org  Sat Aug 29 20:21:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:21:37 +0000 (UTC)
Subject: rpms/eqntott Makefile,NONE,1.1
Message-ID: <20090829202137.2288E11C009F@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eqntott
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvswx8110/rpms/eqntott

Added Files:
	Makefile 
Log Message:
Setup of module eqntott


--- NEW FILE Makefile ---
# Top level Makefile for module eqntott
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Sat Aug 29 20:21:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:21:37 +0000 (UTC)
Subject: rpms/eqntott/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090829202137.871B811C009F@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eqntott/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvswx8110/rpms/eqntott/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eqntott


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eqntott
# $Id: Makefile,v 1.1 2009/08/29 20:21:37 tibbs Exp $
NAME := eqntott
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 29 20:21:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:53 +0000
Subject: [pkgdb] eclipse-texlipse was added for chitlesh
Message-ID: <20090829202153.EB93C10F884@bastion2.fedora.phx.redhat.com>

tibbs has added Package eclipse-texlipse with summary Eclipse-based Latex plugin
tibbs has approved Package eclipse-texlipse
tibbs has added a Fedora devel branch for eclipse-texlipse with an owner of chitlesh
tibbs has approved eclipse-texlipse in Fedora devel
tibbs has approved Package eclipse-texlipse
tibbs has set commit to Approved for 107427 on eclipse-texlipse (Fedora devel)
tibbs has set checkout to Approved for 107427 on eclipse-texlipse (Fedora devel)
tibbs has set build to Approved for 107427 on eclipse-texlipse (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-texlipse



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:54 +0000
Subject: [pkgdb] eclipse-texlipse summary updated by tibbs
Message-ID: <20090829202155.0C7ED10F890@bastion2.fedora.phx.redhat.com>

tibbs set package eclipse-texlipse summary to Eclipse-based Latex plugin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-texlipse



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:54 +0000
Subject: [pkgdb] eclipse-texlipse (Fedora, 11) updated by tibbs
Message-ID: <20090829202155.14E5810F897@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for eclipse-texlipse
tibbs has set commit to Approved for 107427 on eclipse-texlipse (Fedora 11)
tibbs has set checkout to Approved for 107427 on eclipse-texlipse (Fedora 11)
tibbs has set build to Approved for 107427 on eclipse-texlipse (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-texlipse



From pkgdb at fedoraproject.org  Sat Aug 29 20:21:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 20:21:54 +0000
Subject: [pkgdb] eclipse-texlipse (Fedora, 11) updated by tibbs
Message-ID: <20090829202155.20D0210F8AB@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for eclipse-texlipse
tibbs has set commit to Approved for 107427 on eclipse-texlipse (Fedora 10)
tibbs has set checkout to Approved for 107427 on eclipse-texlipse (Fedora 10)
tibbs has set build to Approved for 107427 on eclipse-texlipse (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-texlipse



From tibbs at fedoraproject.org  Sat Aug 29 20:22:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:22:04 +0000 (UTC)
Subject: rpms/eclipse-texlipse - New directory
Message-ID: <20090829202204.2855511C009F@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-texlipse
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvscw8596/rpms/eclipse-texlipse

Log Message:
Directory /cvs/pkgs/rpms/eclipse-texlipse added to the repository




From tibbs at fedoraproject.org  Sat Aug 29 20:22:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:22:04 +0000 (UTC)
Subject: rpms/eclipse-texlipse/devel - New directory
Message-ID: <20090829202204.6729A11C043B@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-texlipse/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvscw8596/rpms/eclipse-texlipse/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-texlipse/devel added to the repository




From tibbs at fedoraproject.org  Sat Aug 29 20:22:13 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:22:13 +0000 (UTC)
Subject: rpms/eclipse-texlipse/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090829202213.3CE8411C009F@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-texlipse/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvscw8596/rpms/eclipse-texlipse/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-texlipse


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-texlipse
# $Id: Makefile,v 1.1 2009/08/29 20:22:13 tibbs Exp $
NAME := eclipse-texlipse
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kalev at fedoraproject.org  Sat Aug 29 20:22:06 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sat, 29 Aug 2009 20:22:06 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel
	mingw32-openssl-1.0.0-beta3-configure.patch, NONE,
	1.1 mingw32-openssl-1.0.0-beta3-libversion.patch, NONE,
	1.1 mingw32-openssl-1.0.0-beta3-sfx.patch, NONE,
	1.1 mingw32-openssl.spec, 1.7,
	1.8 mingw32-openssl-0.9.8g-global.patch, 1.1,
	NONE mingw32-openssl-0.9.8g-sfx.patch, 1.1,
	NONE mingw32-openssl-0.9.8j-configure.patch, 1.1,
	NONE mingw32-openssl-0.9.8j-header-files.patch, 1.1,
	NONE mingw32-openssl-0.9.8j-shared.patch, 1.1,
	NONE mingw32-openssl-1.0.0-beta3-shared.patch, 1.1, NONE
Message-ID: <20090829202206.7D13F11C009F@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8497

Modified Files:
	mingw32-openssl.spec 
Added Files:
	mingw32-openssl-1.0.0-beta3-configure.patch 
	mingw32-openssl-1.0.0-beta3-libversion.patch 
	mingw32-openssl-1.0.0-beta3-sfx.patch 
Removed Files:
	mingw32-openssl-0.9.8g-global.patch 
	mingw32-openssl-0.9.8g-sfx.patch 
	mingw32-openssl-0.9.8j-configure.patch 
	mingw32-openssl-0.9.8j-header-files.patch 
	mingw32-openssl-0.9.8j-shared.patch 
	mingw32-openssl-1.0.0-beta3-shared.patch 
Log Message:
- Added missing BuildRequires mingw32-dlfcn
- Reworked patches to rename *eay32.dll to lib*.dll
- Patch Configure script to use %%{_mingw32_cflags}


mingw32-openssl-1.0.0-beta3-configure.patch:
 Configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mingw32-openssl-1.0.0-beta3-configure.patch ---
diff -up openssl-1.0.0-beta3/Configure.mingw-configure openssl-1.0.0-beta3/Configure
--- openssl-1.0.0-beta3/Configure.mingw-configure	2009-08-29 21:20:14.000000000 +0300
+++ openssl-1.0.0-beta3/Configure	2009-08-29 21:23:14.000000000 +0300
@@ -498,7 +498,7 @@ my %table=(
 "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
 
 # MinGW
-"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
+"mingw", "gcc:-DL_ENDIAN -DOPENSSL_NO_CAPIENG -Wall \$(MINGW32_CFLAGS) -DMK1MF_BUILD:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:\$(MINGW32_CFLAGS):.dll.a",
 # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
 # compiled with one compiler with application compiled with another
 # compiler. It's possible to engage Applink support in mingw64 build,

mingw32-openssl-1.0.0-beta3-libversion.patch:
 Makefile.org    |    4 ++--
 Makefile.shared |   16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

--- NEW FILE mingw32-openssl-1.0.0-beta3-libversion.patch ---
diff -up openssl-1.0.0-beta3/Makefile.org.mingw-libversion openssl-1.0.0-beta3/Makefile.org
--- openssl-1.0.0-beta3/Makefile.org.mingw-libversion	2009-08-29 22:44:10.000000000 +0300
+++ openssl-1.0.0-beta3/Makefile.org	2009-08-29 22:45:42.000000000 +0300
@@ -542,8 +542,8 @@ install_sw:
 				fi ); \
 				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 				(	case $$i in \
-						*crypto*) i=libeay32.dll;; \
-						*ssl*)    i=ssleay32.dll;; \
+						*crypto*) i=libcrypto-$(SHLIB_SONAMEVER).dll;; \
+						*ssl*)    i=libssl-$(SHLIB_SONAMEVER).dll;; \
 					esac; \
 					echo installing $$i; \
 	 				cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
diff -up openssl-1.0.0-beta3/Makefile.shared.mingw-libversion openssl-1.0.0-beta3/Makefile.shared
--- openssl-1.0.0-beta3/Makefile.shared.mingw-libversion	2009-08-29 22:33:22.000000000 +0300
+++ openssl-1.0.0-beta3/Makefile.shared	2009-08-29 22:33:22.000000000 +0300
@@ -47,7 +47,7 @@ LIBEXTRAS=
 # LIBVERSION contains the current version of the library.
 # For example, to build libfoo.so.1.2, you need to do the following:
 #LIBVERSION=1.2
-LIBVERSION=
+LIBVERSION=10
 
 # LIBCOMPATVERSIONS contains the compatibility versions (a list) of
 # the library.  They MUST be in decreasing order.
@@ -250,9 +250,9 @@ link_o.cygwin:
 	base=-Wl,--enable-auto-image-base; \
 	deffile=; \
 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
-		SHLIB=$(LIBNAME)eay32; base=; \
-		if test -f $(LIBNAME)eay32.def; then \
-			deffile=$(LIBNAME)eay32.def; \
+		SHLIB=lib$(LIBNAME); base=; \
+		if test -f $(LIBNAME).def; then \
+			deffile=$(LIBNAME).def; \
 		fi; \
 	fi; \
 	SHLIB_SUFFIX=.dll; \
@@ -270,13 +270,9 @@ link_a.cygwin:
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
 	base=-Wl,--enable-auto-image-base; \
 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
-		case $(LIBNAME) in \
-			crypto) SHLIB=libeay;; \
-			ssl) SHLIB=ssleay;; \
-		esac; \
-		SHLIB_SOVER=32; \
+		SHLIB=lib$(LIBNAME); \
 		extras="$(LIBNAME).def"; \
-		$(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
+		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; \
 		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
 	fi; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \

mingw32-openssl-1.0.0-beta3-sfx.patch:
 Makefile |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE mingw32-openssl-1.0.0-beta3-sfx.patch ---
diff -up openssl-1.0.0-beta3/engines/Makefile.mingw-libversion openssl-1.0.0-beta3/engines/Makefile
--- openssl-1.0.0-beta3/engines/Makefile.mingw-libversion	2009-08-29 22:33:22.000000000 +0300
+++ openssl-1.0.0-beta3/engines/Makefile	2009-08-29 22:34:15.000000000 +0300
@@ -110,7 +110,10 @@ install:
 		for l in $(LIBNAMES); do \
 			( echo installing $$l; \
 			  pfx=lib; \
-			  if [ "$(PLATFORM)" != "Cygwin" ]; then \
+			  if [ "$(PLATFORM)" = "mingw" ]; then \
+				sfx=.dll; \
+				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
+			  elif [ "$(PLATFORM)" != "Cygwin" ]; then \
 				case "$(CFLAGS)" in \
 				*DSO_BEOS*)	sfx=".so";;	\
 				*DSO_DLFCN*)	sfx=".so";;	\


Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-openssl.spec	29 Aug 2009 16:13:45 -0000	1.7
+++ mingw32-openssl.spec	29 Aug 2009 20:22:06 -0000	1.8
@@ -78,17 +78,17 @@ Patch48:        openssl-0.9.8j-bad-mime.
 Patch49:        openssl-0.9.8k-algo-doc.patch
 Patch50:        openssl-1.0.0-beta3-curl.patch
 Patch51:        openssl-1.0.0-beta3-const.patch
-
 # Backported fixes including security fixes
 Patch60:        openssl-1.0.0-beta3-namingstr.patch
 Patch61:        openssl-1.0.0-beta3-namingblk.patch
 
 # MinGW-specific patches.
-Patch100:       mingw32-openssl-0.9.8j-header-files.patch
-Patch101:       mingw32-openssl-0.9.8j-configure.patch
-Patch102:       mingw32-openssl-0.9.8j-shared.patch
-Patch103:       mingw32-openssl-0.9.8g-global.patch
-Patch104:       mingw32-openssl-0.9.8g-sfx.patch
+# Use MINGW32_CFLAGS (set below) in Configure script
+Patch100:       mingw32-openssl-1.0.0-beta3-configure.patch
+# Rename *eay32.dll to lib*.dll
+Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
+# Fix engines/ install target after lib rename
+Patch102:       mingw32-openssl-1.0.0-beta3-sfx.patch
 Patch105:       mingw32-openssl-1.0.0-beta3-linker-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,6 +101,7 @@ BuildRequires:  mingw32-binutils
 
 BuildRequires:  mingw32-zlib
 BuildRequires:  mingw32-pthreads
+BuildRequires:  mingw32-dlfcn
 
 BuildRequires:  mktemp
 #BuildRequires:  krb5-devel
@@ -182,11 +183,9 @@ Static version of the MinGW port of the 
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 
-#%patch100 -p1 -b .mingw-header-files
-#%patch101 -p1 -b .mingw-configure
-#%patch102 -p1 -b .mingw-shared
-#%patch103 -p1 -b .mingw-global
-#%patch104 -p1 -b .mingw-sfx
+%patch100 -p1 -b .mingw-configure
+%patch101 -p1 -b .mingw-libversion
+%patch102 -p1 -b .mingw-sfx
 %patch105 -p0 -b .mingw-linker-fix
 
 # Modify the various perl scripts to reference perl in the right location.
@@ -199,7 +198,7 @@ make TABLE PERL=%{__perl}
 %build
 # NB: 'no-hw' is vital.  MinGW cannot build the hardware drivers
 # and if you don't have this you'll get an obscure link error.
-sed -i -e "s/MINGW32_CFLAGS/%{_mingw32_cflags}/" Configure; \
+export MINGW32_CFLAGS="%{_mingw32_cflags}"; \
 ./Configure \
   --prefix=%{_mingw32_prefix} \
   --openssldir=%{_mingw32_sysconfdir}/pki/tls \
@@ -328,8 +327,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 %{_mingw32_bindir}/openssl.exe
 %{_mingw32_bindir}/c_rehash
-%{_mingw32_bindir}/libeay32.dll
-%{_mingw32_bindir}/ssleay32.dll
+%{_mingw32_bindir}/libcrypto-%{soversion}.dll
+%{_mingw32_bindir}/libssl-%{soversion}.dll
 #{_mingw32_bindir}/.libcrypto*.hmac
 %{_mingw32_libdir}/libcrypto.dll.a
 %{_mingw32_libdir}/libssl.dll.a
@@ -352,6 +351,9 @@ rm -rf $RPM_BUILD_ROOT
 - Automatically generate debuginfo subpackage
 - Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3)
 - Don't use the %%{_mingw32_make} macro anymore as it's ugly and causes side-effects
+- Added missing BuildRequires mingw32-dlfcn (Kalev Lember)
+- Reworked patches to rename *eay32.dll to lib*.dll (Kalev Lember)
+- Patch Configure script to use %%{_mingw32_cflags} (Kalev Lember)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8j-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


--- mingw32-openssl-0.9.8g-global.patch DELETED ---


--- mingw32-openssl-0.9.8g-sfx.patch DELETED ---


--- mingw32-openssl-0.9.8j-configure.patch DELETED ---


--- mingw32-openssl-0.9.8j-header-files.patch DELETED ---


--- mingw32-openssl-0.9.8j-shared.patch DELETED ---


--- mingw32-openssl-1.0.0-beta3-shared.patch DELETED ---



From tibbs at fedoraproject.org  Sat Aug 29 20:22:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat, 29 Aug 2009 20:22:12 +0000 (UTC)
Subject: rpms/eclipse-texlipse Makefile,NONE,1.1
Message-ID: <20090829202212.EC3C511C009F@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/eclipse-texlipse
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvscw8596/rpms/eclipse-texlipse

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-texlipse


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-texlipse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From caolanm at fedoraproject.org  Sat Aug 29 20:24:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 29 Aug 2009 20:24:49 +0000 (UTC)
Subject: rpms/w3c-libwww/devel w3c-libwww-makefile.patch, 1.2,
	1.3 w3c-libwww.spec, 1.16, 1.17
Message-ID: <20090829202449.DFCF111C009F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/w3c-libwww/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10449

Modified Files:
	w3c-libwww-makefile.patch w3c-libwww.spec 
Log Message:
Resolves: rhbz#511702 - FTBFS

w3c-libwww-makefile.patch:
 Library/src/Makefile.am |   35 ++++++++++++++++++++++++++++-------
 modules/Makefile.am     |    2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)

Index: w3c-libwww-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- w3c-libwww-makefile.patch	26 Dec 2008 17:43:07 -0000	1.2
+++ w3c-libwww-makefile.patch	29 Aug 2009 20:24:49 -0000	1.3
@@ -78,6 +78,14 @@ diff -urNp libwww.orig/Library/src/Makef
  
  BUILT_SOURCES = \
  	wwwsys.h \
+@@ -405,7 +405,6 @@
+ 	HTBInit.h \
+ 	HTBTree.h \
+ 	HTBind.h \
+-	HTBind.h \
+ 	HTBound.h \
+ 	HTBufWrt.h \
+ 	HTCache.h \
 diff -urNp libwww.orig/modules/Makefile.am libwww/modules/Makefile.am
 --- libwww.orig/modules/Makefile.am	2008-12-21 14:56:37.380980403 +0530
 +++ libwww/modules/Makefile.am	2008-12-21 14:56:45.892980322 +0530


Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- w3c-libwww.spec	21 Aug 2009 16:23:55 -0000	1.16
+++ w3c-libwww.spec	29 Aug 2009 20:24:49 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.17.20060206cvs%{?dist}
+Release:       0.18.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/w3c-libwww
 
 %changelog
+* Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> - 5.4.1-0.18.20060206cvs
+- Resolves: rhbz#511702 - FTBFS
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.1-0.17.20060206cvs
 - rebuilt with new openssl
 



From emaldonado at fedoraproject.org  Sat Aug 29 20:32:33 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 29 Aug 2009 20:32:33 +0000 (UTC)
Subject: rpms/nss/devel nss.pc.in,1.9,1.10
Message-ID: <20090829203233.EEE1411C009F@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15412

Modified Files:
	nss.pc.in 
Log Message:
Removed temporary hack


Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nss.pc.in	28 Aug 2009 20:39:04 -0000	1.9
+++ nss.pc.in	29 Aug 2009 20:32:33 -0000	1.10
@@ -6,7 +6,6 @@ includedir=%includedir%
 Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-# nss-util >= %NSSUTIL_VERSION%, nss-softokn >= %SOFTOKEN_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%, nss-softokn >= %SOFTOKEN_VERSION%
 Libs: -lssl3 -lsmime3 -lnss3
-Cflags: -I${includedir} -L${libdir}
+Cflags: -I${includedir}



From bouska at fedoraproject.org  Sat Aug 29 20:34:35 2009
From: bouska at fedoraproject.org (Pablo Martin-Gomez)
Date: Sat, 29 Aug 2009 20:34:35 +0000 (UTC)
Subject: rpms/gnome-specimen/devel .cvsignore, 1.3, 1.4 gnome-specimen.spec, 
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090829203435.9AFDD11C009F@cvs1.fedora.phx.redhat.com>

Author: bouska

Update of /cvs/pkgs/rpms/gnome-specimen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16571

Modified Files:
	.cvsignore gnome-specimen.spec sources 
Log Message:
Updated to 0.4 and fix a FTBFS bug


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-specimen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jul 2007 13:38:08 -0000	1.3
+++ .cvsignore	29 Aug 2009 20:34:35 -0000	1.4
@@ -1 +1 @@
-gnome-specimen-0.3.tar.gz
+gnome-specimen-0.4.tar.gz


Index: gnome-specimen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-specimen/devel/gnome-specimen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-specimen.spec	25 Jul 2009 00:47:26 -0000	1.6
+++ gnome-specimen.spec	29 Aug 2009 20:34:35 -0000	1.7
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gnome-specimen
-Version:        0.3
-Release:        5%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A simple tool to view and compare fonts installed on your system
 
 Group:          Applications/System
@@ -27,17 +27,17 @@ your system
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} pyexecdir=%{python_sitelib}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT pyexecdir=%{python_sitelib}
 
-desktop-file-install --vendor="" --delete-original \
+desktop-file-install --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  $RPM_BUILD_ROOT%{_datadir}/applications//%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %find_lang %{name}
@@ -45,7 +45,6 @@ desktop-file-install --vendor="" --delet
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -55,16 +54,17 @@ if [ "$1" -gt 1 ]; then
 fi
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 
 
 %preun
@@ -78,14 +78,21 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{python_sitelib}/specimen
+%{python_sitelib}/specimen/*.py*
 %{_bindir}/%{name}
-%{python_sitelib}/specimen
 %{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Fri Aug 21 2009 Pablo Martin-Gomez <pablo.martin-gomez at laposte.net> 0.4-1
+- Update to 0.4
+- Fix bug rh #511791 by adding 'pyexecdir=%{python_sitelib}' to make and make install
+- Own the created directory
+- Clean the spec
+
 * 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/gnome-specimen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jul 2007 13:38:08 -0000	1.3
+++ sources	29 Aug 2009 20:34:35 -0000	1.4
@@ -1 +1 @@
-6f1abf2d6245a890f6778a5f9f25c0c7  gnome-specimen-0.3.tar.gz
+c1af774ee4ab5bd1289699b4094368b3  gnome-specimen-0.4.tar.gz



From epienbro at fedoraproject.org  Sat Aug 29 20:38:51 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 20:38:51 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel mingw32-openssl.spec, 1.8,
	1.9 openssl-0.9.8a-defaults.patch, 1.1,
	NONE openssl-0.9.8a-link-krb5.patch, 1.1,
	NONE openssl-0.9.8a-reuse-cipher-change.patch, 1.1,
	NONE openssl-0.9.8b-x509-name-cmp.patch, 1.1,
	NONE openssl-0.9.8g-default-paths.patch, 1.1,
	NONE openssl-0.9.8g-no-extssl.patch, 1.1,
	NONE openssl-0.9.8j-eap-fast.patch, 1.1,
	NONE openssl-0.9.8j-enginesdir.patch, 1.1,
	NONE openssl-0.9.8j-evp-nonfips.patch, 1.1,
	NONE openssl-0.9.8j-fips-no-pairwise.patch, 1.1,
	NONE openssl-0.9.8j-fipscheck-hmac.patch, 1.1,
	NONE openssl-0.9.8j-kernel-fipsmode.patch, 1.1,
	NONE openssl-0.9.8j-nocanister.patch, 1.1,
	NONE openssl-0.9.8j-redhat.patch, 1.1,
	NONE openssl-0.9.8j-shlib-version.patch, 1.1,
	NONE openssl-0.9.8j-soversion.patch, 1.1,
	NONE openssl-0.9.8j-use-fipscheck.patch, 1.1, NONE
Message-ID: <20090829203851.3F70D11C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18621

Modified Files:
	mingw32-openssl.spec 
Removed Files:
	openssl-0.9.8a-defaults.patch openssl-0.9.8a-link-krb5.patch 
	openssl-0.9.8a-reuse-cipher-change.patch 
	openssl-0.9.8b-x509-name-cmp.patch 
	openssl-0.9.8g-default-paths.patch 
	openssl-0.9.8g-no-extssl.patch openssl-0.9.8j-eap-fast.patch 
	openssl-0.9.8j-enginesdir.patch 
	openssl-0.9.8j-evp-nonfips.patch 
	openssl-0.9.8j-fips-no-pairwise.patch 
	openssl-0.9.8j-fipscheck-hmac.patch 
	openssl-0.9.8j-kernel-fipsmode.patch 
	openssl-0.9.8j-nocanister.patch openssl-0.9.8j-redhat.patch 
	openssl-0.9.8j-shlib-version.patch 
	openssl-0.9.8j-soversion.patch 
	openssl-0.9.8j-use-fipscheck.patch 
Log Message:
Dropped several unused (obsoleted) patches and added a comment to the .spec file about the purpose of one of patches



Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-openssl.spec	29 Aug 2009 20:22:06 -0000	1.8
+++ mingw32-openssl.spec	29 Aug 2009 20:38:50 -0000	1.9
@@ -89,6 +89,8 @@ Patch100:       mingw32-openssl-1.0.0-be
 Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
 # Fix engines/ install target after lib rename
 Patch102:       mingw32-openssl-1.0.0-beta3-sfx.patch
+# Ugly patch to fix a compilation error (the linker can't find
+# some symbols mentioned in an autogenerated .def file)
 Patch105:       mingw32-openssl-1.0.0-beta3-linker-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


--- openssl-0.9.8a-defaults.patch DELETED ---


--- openssl-0.9.8a-link-krb5.patch DELETED ---


--- openssl-0.9.8a-reuse-cipher-change.patch DELETED ---


--- openssl-0.9.8b-x509-name-cmp.patch DELETED ---


--- openssl-0.9.8g-default-paths.patch DELETED ---


--- openssl-0.9.8g-no-extssl.patch DELETED ---


--- openssl-0.9.8j-eap-fast.patch DELETED ---


--- openssl-0.9.8j-enginesdir.patch DELETED ---


--- openssl-0.9.8j-evp-nonfips.patch DELETED ---


--- openssl-0.9.8j-fips-no-pairwise.patch DELETED ---


--- openssl-0.9.8j-fipscheck-hmac.patch DELETED ---


--- openssl-0.9.8j-kernel-fipsmode.patch DELETED ---


--- openssl-0.9.8j-nocanister.patch DELETED ---


--- openssl-0.9.8j-redhat.patch DELETED ---


--- openssl-0.9.8j-shlib-version.patch DELETED ---


--- openssl-0.9.8j-soversion.patch DELETED ---


--- openssl-0.9.8j-use-fipscheck.patch DELETED ---



From emaldonado at fedoraproject.org  Sat Aug 29 20:46:41 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sat, 29 Aug 2009 20:46:41 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.104,1.105
Message-ID: <20090829204641.28F4A11C009F@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24142

Modified Files:
	nss.spec 
Log Message:
Added nss_util_version and nss_softokn_version for the required versions of those packages


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- nss.spec	28 Aug 2009 20:44:12 -0000	1.104
+++ nss.spec	29 Aug 2009 20:46:40 -0000	1.105
@@ -1,26 +1,26 @@
 %global nspr_version 4.8
+%global nss_util_version 3.12.3.99.3
+%global nss_softokn_version 3.12.3.99.3
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          25%{?dist}
+Release:          26%{?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}
-# FIXME: Due to nss.pc.in substitutions in the %%build section, these Requires must
-# be exactly matching versions?
-Requires:         nss-util >= %{version}
-Requires:         nss-softokn >= %{version}
-Requires:         nss-softokn-freebl%{_isa} >= %{version}
+Requires:         nss-util >= %{nss_util_version}
+Requires:         nss-softokn >= %{nss_softokn_version}
+Requires:         nss-softokn-freebl%{_isa} >= %{nss_softokn_version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn >= %{version}                                                  
-BuildRequires:    nss-util >= %{version}
+BuildRequires:    nss-softokn >= %{nss_softokn_version}                                                  
+BuildRequires:    nss-util >= %{nss_util_version}
 BuildRequires:    nss-softokn-devel >= %{version}                                                  
-BuildRequires:    nss-util-devel >= %{version}
+BuildRequires:    nss-util-devel >= %{nss_util_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -141,6 +141,8 @@ export USE_64
 %{__make} -C ./mozilla/security/nss
 
 # Set up our package file
+# The nspr_version and nss_{util|softokn}_version globals used
+# here match the ones nss has for its Requires. 
 %{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
@@ -148,8 +150,8 @@ export USE_64
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSS_VERSION%%,%{version},g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" \
-                          -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
+                          -e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \
+                          -e "s,%%SOFTOKEN_VERSION%%,%{nss_softokn_version},g" > \
                           ./mozilla/dist/pkgconfig/nss.pc
 
 NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
@@ -171,7 +173,6 @@ export NSS_VPATCH
 
 chmod 755 ./mozilla/dist/pkgconfig/nss-config
 
-
 # enable the following line to force a test failure
 # find ./mozilla -name \*.chk | xargs rm -f
 
@@ -439,6 +440,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Aug 29 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-26
+- Ensure versions in the requires match those used when creating nss.pc
+
 * Fri Aug 28 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-25
 - Remove nss-prelink.conf as signed all shared libraries moved to nss-softokn
 - Add a temprary hack to nss.pc.in to unblock builds



From caolanm at fedoraproject.org  Sat Aug 29 20:52:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 29 Aug 2009 20:52:33 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.18,1.19
Message-ID: <20090829205233.AFF7511C009F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27792

Modified Files:
	socat.spec 
Log Message:
recreate autoconf to get correct includes when determining type sizes in order to successfully rebuild


Index: socat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/socat.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- socat.spec	28 Aug 2009 16:35:29 -0000	1.18
+++ socat.spec	29 Aug 2009 20:52:33 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.7.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -9,6 +9,7 @@ Patch0: socat-wall.patch
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel readline-devel ncurses-devel kernel-headers > 2.6.18
+BuildRequires: autoconf
 
 %description
 Socat is a relay for bidirectional data transfer between two independent data
@@ -25,6 +26,7 @@ mv CHANGES.utf8 CHANGES
 %patch0
 
 %build
+autoconf
 %configure  \
         --enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
@@ -60,6 +62,10 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Sat Aug 29 2009 Caol?n McNamara <caolanm at redhat.com> - 1.7.1.1-5
+- recreate autoconf to get correct includes when determining type
+  sizes in order to build correctly
+
 * Fri Aug 28 2009 Paul Wouters <paul at xelerance.com> - 1.7.1.1-4
 - Bump for new openssl
 



From bpepple at fedoraproject.org  Sat Aug 29 20:54:04 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 29 Aug 2009 20:54:04 +0000 (UTC)
Subject: rpms/empathy/devel empathy-fix-nav-handling.patch, NONE,
	1.1 empathy.spec, 1.73, 1.74
Message-ID: <20090829205404.ED87711C009F@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28804

Modified Files:
	empathy.spec 
Added Files:
	empathy-fix-nav-handling.patch 
Log Message:
* Sat Aug 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-5
- Backport patch to fix incorrect assumption about navigation-request. (#519849)


empathy-fix-nav-handling.patch:
 empathy-theme-adium.c |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

--- NEW FILE empathy-fix-nav-handling.patch ---
--- empathy-2.27.91.1/libempathy-gtk/empathy-theme-adium.c.fix-nav-handling	2009-08-25 08:39:23.000000000 -0400
+++ empathy-2.27.91.1/libempathy-gtk/empathy-theme-adium.c	2009-08-27 16:25:06.777275222 -0400
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <webkit/webkitnetworkrequest.h>
+#include <webkit/webkit.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/util.h>
 
@@ -128,18 +128,28 @@
 	theme_adium_update_enable_webkit_developer_tools (theme);
 }
 
-static WebKitNavigationResponse
-theme_adium_navigation_requested_cb (WebKitWebView        *view,
-				     WebKitWebFrame       *frame,
-				     WebKitNetworkRequest *request,
-				     gpointer              user_data)
+static gboolean
+theme_adium_navigation_policy_decision_requested_cb (WebKitWebView             *view,
+						     WebKitWebFrame            *web_frame,
+						     WebKitNetworkRequest      *request,
+						     WebKitWebNavigationAction *action,
+						     WebKitWebPolicyDecision   *decision,
+						     gpointer                   data)
 {
 	const gchar *uri;
 
+	/* Only call url_show on clicks */
+	if (webkit_web_navigation_action_get_reason (action) !=
+	    WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
+		webkit_web_policy_decision_use (decision);
+		return TRUE;
+	}
+
 	uri = webkit_network_request_get_uri (request);
 	empathy_url_show (GTK_WIDGET (view), uri);
 
-	return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+	webkit_web_policy_decision_ignore (decision);
+	return TRUE;
 }
 
 static void
@@ -1072,8 +1082,8 @@
 	g_signal_connect (theme, "load-finished",
 			  G_CALLBACK (theme_adium_load_finished_cb),
 			  NULL);
-	g_signal_connect (theme, "navigation-requested",
-			  G_CALLBACK (theme_adium_navigation_requested_cb),
+	g_signal_connect (theme, "navigation-policy-decision-requested",
+			  G_CALLBACK (theme_adium_navigation_policy_decision_requested_cb),
 			  NULL);
 	g_signal_connect (theme, "populate-popup",
 			  G_CALLBACK (theme_adium_populate_popup_cb),


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- empathy.spec	29 Aug 2009 16:40:33 -0000	1.73
+++ empathy.spec	29 Aug 2009 20:54:04 -0000	1.74
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.91.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -34,7 +34,8 @@ Patch1:		%{name}-broken-pkgconfig.patch
 Patch2:		%{name}-desktop-category.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
-
+# http://bugzilla.gnome.org/show_bug.cgi?id=593318
+Patch4:		%{name}-fix-nav-handling.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -138,6 +139,7 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .presence-icons
+%patch4 -p1 -b .fix-nav-handling
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -246,6 +248,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sat Aug 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-5
+- Backport patch to fix incorrect assumption about navigation-request. (#519849)
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91.1-4
 - Rebuild against newer libnm_glib
 



From epienbro at fedoraproject.org  Sat Aug 29 20:56:33 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 20:56:33 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel .cvsignore, 1.4, 1.5 mingw32-pixman.spec, 
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090829205633.ED76311C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30298

Modified Files:
	.cvsignore mingw32-pixman.spec sources 
Log Message:
Updated to 0.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Aug 2009 22:31:15 -0000	1.4
+++ .cvsignore	29 Aug 2009 20:56:33 -0000	1.5
@@ -1 +1 @@
-pixman-0.15.20.tar.bz2
+pixman-0.16.0.tar.bz2


Index: mingw32-pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-pixman.spec	12 Aug 2009 22:50:52 -0000	1.8
+++ mingw32-pixman.spec	29 Aug 2009 20:56:33 -0000	1.9
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pixman
-Version:        0.15.20
+Version:        0.16.0
 Release:        1%{?dist}
 Summary:        MinGW Windows Pixman library
 
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 29 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.16.0-1
+- Update to 0.16.0
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.15.20-1
 - Update to version 0.15.20
 - Updated SOURCE0 and URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 22:31:15 -0000	1.4
+++ sources	29 Aug 2009 20:56:33 -0000	1.5
@@ -1 +1 @@
-8cca7bdf45bd3c31cf95ecea0f05bddc  pixman-0.15.20.tar.bz2
+183dea8a100c1d9732cdb2146ec90f68  pixman-0.16.0.tar.bz2



From transif at fedoraproject.org  Sat Aug 29 21:12:09 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sat, 29 Aug 2009 21:12:09 +0000 (UTC)
Subject: comps/po pl.po,1.27,1.28
Message-ID: <20090829211209.811BC11C009F@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5492/po

Modified Files:
	pl.po 
Log Message:
Sending translation for Polish


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.27 -r 1.28 pl.poIndex: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- pl.po	29 Apr 2009 22:15:58 -0000	1.27
+++ pl.po	29 Aug 2009 21:12:08 -0000	1.28
@@ -9,288 +9,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 19:06+0000\n"
-"PO-Revision-Date: 2009-04-30 00:01+0200\n"
+"POT-Creation-Date: 2009-08-29 19:06+0000\n"
+"PO-Revision-Date: 2009-08-29 23:11+0200\n"
 "Last-Translator: Piotr Dr?g <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "Lekkie ?rodowisko graficzne, kt?re dobrze dzia?a na s?abych komputerach."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Narz?dzia administracyjne"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Obs?uga afrykanerskiego"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Obs?uga alba?skiego"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplikacje"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplikacje do wykonywania r??nych zada?"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Obs?uga arabskiego"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Obs?uga ormia?skiego"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Obs?uga asamskiego"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Pisanie i publikowanie"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Cz??? podstawowa"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Podstawowy system"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Podstawowa obs?uga j?zyka programowania Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Obs?uga baskijskiego"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Obs?uga bia?oruskiego"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Obs?uga bengalskiego"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Obs?uga bhuta?skiego"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Obs?uga bo?niackiego"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Obs?uga portugalskiego brazylijskiego"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Obs?uga breto?skiego"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Grupa systemu budowania"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Obs?uga bu?garskiego"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Obs?uga katalo?skiego"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "Obs?uga chi?skiego"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1870 lines suppressed...]
 msgstr "?rodowiska graficzne Sugar"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1395,7 +1504,8 @@ msgstr ""
 "Obs?uga skro?nego kompilowania program?w dla 32 bitowego Windows, testowania "
 "ich, budowania instalator?w, a to wszystko z poziomu Fedory."
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1403,15 +1513,18 @@ msgstr ""
 "Obs?uga tworzenia oprogramowania u?ywaj?c obiektowego j?zyka programowania i "
 "bibliotek CAML."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Obs?uga suahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Obs?uga tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1419,23 +1532,86 @@ msgstr ""
 "Ta grupa jest zbiorem narz?dzi u?ywanych w projektowaniu, modyfikowaniu, "
 "obr?bce i tworzeniu pakiet?w z czcionkami."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Obs?uga turkme?skiego"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Obs?uga g?rnego sorbian"
 
+#: ../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 ""
+"Zestaw pakiet?w dostarczaj?cych funkcjonalno?? krytyczn? dla ?rodowiska GNOME"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr ""
+"Zestaw pakiet?w dostarczaj?cych wsp??dzielon? platform? dla funkcjonalno?ci "
+"krytycznej na wszystkich obrazach Fedory"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Ksi??ki i przewodniki"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Ksi??ki i przewodniki dla u?ytkownik?w i programist?w Fedory"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Funkcjonalno?? krytyczna (podstawowa)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Funkcjonalno?? krytyczna (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Serwer katalogu"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE jest lekkim ?rodowiskiem graficznym X11 zaprojektowanym dla komputer?w "
+"ze s?abym sprz?tem, takich jak netbooki, urz?dzenia mobilne lub starsze "
+"komputery."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Serwery to?samo?ci komputer?w i u?ytkownik?w."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "?rodowiska graficzne Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr ""
+"Moblin jest ?rodowiskiem graficznym dla urz?dze? typu netbook/NetTop/MID."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Aplikacje dla r??nych zada?"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Obs?uga sieci dial-up"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1443,7 +1619,7 @@ msgstr ""
 "GNOME jest graficznym interfejsem u?ytkownika o du?ych mo?liwo?ciach, "
 "zawieraj?cym panel, pulpit, ikony systemowe oraz graficzny mened?er plik?w."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1451,7 +1627,7 @@ msgstr ""
 "KDE jest graficznym interfejsem u?ytkownika o du?ych mo?liwo?ciach, "
 "zawieraj?cym panel, pulpit, ikony systemowe oraz graficzny mened?er plik?w."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1459,11 +1635,11 @@ msgstr ""
 "Czasem nazywane edytorami tekstu, s? to programy umo?liwiaj?ce tworzenie i "
 "modyfikowanie plik?w. Zawiera Emacsa i Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "Edytor tekstu XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1471,30 +1647,30 @@ msgstr ""
 "Te narz?dzia umo?liwiaj? tworzenie dokumentacji w formacie DocBook i "
 "konwertowanie jej do format?w HTML, PDF, PostScript i tekstu."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Ta grupa jest zbiorem serwer?w sieciowych do r??nych zastosowa?"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr "Ta grupa jest zbiorem narz?dzi i zasob?w dla ?rodowisk arabskich."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr "Ta grupa jest zbiorem narz?dzi i zasob?w dla ?rodowisk hebrajskich."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr "Ta grupa jest zbiorem narz?dzi i zasob?w dla ?rodowisk japo?skich."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr "Ta grupa jest zbiorem narz?dzi i zasob?w dla ?rodowisk czeskich."



From jcollie at fedoraproject.org  Sat Aug 29 21:29:29 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat, 29 Aug 2009 21:29:29 +0000 (UTC)
Subject: rpms/gnonlin/F-11 .cvsignore, 1.15, 1.16 gnonlin.spec, 1.26,
	1.27 sources, 1.15, 1.16
Message-ID: <20090829212930.0191F11C009F@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gnonlin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10351

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.2-0.1
- Update to prerelease for 0.10.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Aug 2009 01:54:07 -0000	1.15
+++ .cvsignore	29 Aug 2009 21:29:29 -0000	1.16
@@ -1 +1 @@
-gnonlin-0.10.12.tar.bz2
+gnonlin-0.10.12.2.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/gnonlin.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gnonlin.spec	12 Aug 2009 01:54:07 -0000	1.26
+++ gnonlin.spec	29 Aug 2009 21:29:29 -0000	1.27
@@ -2,14 +2,14 @@
 %define         gst_plugins_base_req    0.10.24
 
 Name:           gnonlin
-Version:        0.10.12
-Release:        1%{?dist}
+Version:        0.10.12.2
+Release:        0.1%{?dist}
 Summary:        GStreamer extension library for non-linear editing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gnonlin.sourceforge.net/
-Source:         http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.bz2
+Source:         http://gstreamer.freedesktop.org/src/gnonlin/pre/gnonlin-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gstreamer-devel >= %{gst_req}
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgnl.so
 
 %changelog
+* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12.2-0.1
+- Update to prerelease for 0.10.13
+
 * Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.12-1
 - Update to 0.10.12 "Lots of people on the clothesline"
 -


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnonlin/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Aug 2009 01:54:07 -0000	1.15
+++ sources	29 Aug 2009 21:29:29 -0000	1.16
@@ -1 +1 @@
-4d9ec131333362535c956a73b6693c57  gnonlin-0.10.12.tar.bz2
+ac2fc4be5cc1bfdd303ea1400301df86  gnonlin-0.10.12.2.tar.bz2



From hoangelos at fedoraproject.org  Sat Aug 29 21:39:04 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Sat, 29 Aug 2009 21:39:04 +0000 (UTC)
Subject: rpms/python-werkzeug/F-11 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090829213904.D8ECF11C009F@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-werkzeug/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11945/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
Log Message:
initial import for F-11



--- NEW FILE import.log ---
python-werkzeug-0_5_1-1_fc11:F-11:python-werkzeug-0.5.1-1.fc11.src.rpm:1251581199


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:28:46 -0000	1.1
+++ .cvsignore	29 Aug 2009 21:39:04 -0000	1.2
@@ -0,0 +1 @@
+Werkzeug-0.5.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:28:46 -0000	1.1
+++ sources	29 Aug 2009 21:39:04 -0000	1.2
@@ -0,0 +1 @@
+620955f34b8424c92674fe76d5c47679  Werkzeug-0.5.1.zip



From nucleo at fedoraproject.org  Sat Aug 29 21:40:02 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 29 Aug 2009 21:40:02 +0000 (UTC)
Subject: rpms/kvirc/devel kvirc-flags.patch, 1.2, 1.3 .cvsignore, 1.4,
	1.5 kvirc.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090829214002.DEBED11C0496@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12182

Modified Files:
	.cvsignore kvirc.spec sources 
Added Files:
	kvirc-flags.patch 
Log Message:
reenable using of standard compiler flags

kvirc-flags.patch:
 CMakeLists.txt |   16 ----------------
 1 file changed, 16 deletions(-)

Index: kvirc-flags.patch
===================================================================
RCS file: kvirc-flags.patch
diff -N kvirc-flags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kvirc-flags.patch	29 Aug 2009 21:40:02 -0000	1.3
@@ -0,0 +1,25 @@
+--- kvirc/CMakeLists.txt	2009-08-23 13:10:13.000000000 +0300
++++ kvirc/CMakeLists.txt	2009-08-29 23:57:19.000000000 +0300
+@@ -138,22 +138,6 @@
+ 		SET(CMAKE_C_FLAGS "-O0 -g")
+ 	ENDIF()
+ ELSE()
+-	IF(CMAKE_COMPILER_IS_GNUCXX)
+-		#force gdb options
+-		SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-		SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-		#gcc3 is still used by mingw and doesn't support this flag
+-		INCLUDE(CheckCXXCompilerFlag)
+-		CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
+-		IF(CXX_HAS_VIH_FLAG)
+-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+-			SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+-		ENDIF(CXX_HAS_VIH_FLAG)
+-	ELSE()
+-		#this small set of options should work on almost all compilers
+-		SET(CMAKE_CXX_FLAGS "-O3")
+-		SET(CMAKE_C_FLAGS "-O3")
+-	ENDIF()
+ 	SET(CMAKE_BUILD_TYPE Release)
+ 	SET(CMAKE_STATUS_DEBUG_SUPPORT "No")
+ ENDIF()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Aug 2009 11:03:18 -0000	1.4
+++ .cvsignore	29 Aug 2009 21:40:02 -0000	1.5
@@ -1 +1 @@
-kvirc-20090827svn3429.tar.bz2
+kvirc-20090830svn3436.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kvirc.spec	28 Aug 2009 21:43:13 -0000	1.9
+++ kvirc.spec	29 Aug 2009 21:40:02 -0000	1.10
@@ -1,18 +1,19 @@
-%define           rev 3429
-%define           pre 20090827svn%{rev}
+%define           rev 3436
+%define           pre 20090830svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.13.%{pre}%{?dist}
+Release:          0.14.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3429 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090827svn3429.tar.bz2 kvirc
+#  svn export -r 3436 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090830svn3436.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
+Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -28,6 +29,7 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 %build
 %{cmake}  \
@@ -129,12 +131,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 30 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.14.20090830svn3436
+- patch for using standard compiler flags
+
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl
 
-* Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.12.20090827svn3429
-- rebuild
-
 * Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
 - svn snapshot 3429 that includes patch for openssl >=1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Aug 2009 11:03:18 -0000	1.4
+++ sources	29 Aug 2009 21:40:02 -0000	1.5
@@ -1 +1 @@
-15f9b94160d66eb2c043cb79aad3889c  kvirc-20090827svn3429.tar.bz2
+33fa9dadb090fb79faa49c6c950d5bdd  kvirc-20090830svn3436.tar.bz2



From nucleo at fedoraproject.org  Sat Aug 29 21:49:31 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 29 Aug 2009 21:49:31 +0000 (UTC)
Subject: rpms/kvirc/F-11 kvirc-flags.patch, 1.2, 1.3 .cvsignore, 1.4,
	1.5 kvirc.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090829214931.DAAFD11C009F@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14378

Modified Files:
	.cvsignore kvirc.spec sources 
Added Files:
	kvirc-flags.patch 
Log Message:
reenable using of standard compiler flags

kvirc-flags.patch:
 CMakeLists.txt |   16 ----------------
 1 file changed, 16 deletions(-)

Index: kvirc-flags.patch
===================================================================
RCS file: kvirc-flags.patch
diff -N kvirc-flags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kvirc-flags.patch	29 Aug 2009 21:49:31 -0000	1.3
@@ -0,0 +1,25 @@
+--- kvirc/CMakeLists.txt	2009-08-23 13:10:13.000000000 +0300
++++ kvirc/CMakeLists.txt	2009-08-29 23:57:19.000000000 +0300
+@@ -138,22 +138,6 @@
+ 		SET(CMAKE_C_FLAGS "-O0 -g")
+ 	ENDIF()
+ ELSE()
+-	IF(CMAKE_COMPILER_IS_GNUCXX)
+-		#force gdb options
+-		SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-		SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-		#gcc3 is still used by mingw and doesn't support this flag
+-		INCLUDE(CheckCXXCompilerFlag)
+-		CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
+-		IF(CXX_HAS_VIH_FLAG)
+-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+-			SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+-		ENDIF(CXX_HAS_VIH_FLAG)
+-	ELSE()
+-		#this small set of options should work on almost all compilers
+-		SET(CMAKE_CXX_FLAGS "-O3")
+-		SET(CMAKE_C_FLAGS "-O3")
+-	ENDIF()
+ 	SET(CMAKE_BUILD_TYPE Release)
+ 	SET(CMAKE_STATUS_DEBUG_SUPPORT "No")
+ ENDIF()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Aug 2009 14:13:00 -0000	1.4
+++ .cvsignore	29 Aug 2009 21:49:31 -0000	1.5
@@ -1 +1 @@
-kvirc-20090827svn3429.tar.bz2
+kvirc-20090830svn3436.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kvirc.spec	27 Aug 2009 14:13:00 -0000	1.3
+++ kvirc.spec	29 Aug 2009 21:49:31 -0000	1.4
@@ -1,18 +1,19 @@
-%define           rev 3429
-%define           pre 20090827svn%{rev}
+%define           rev 3436
+%define           pre 20090830svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.11.%{pre}%{?dist}
+Release:          0.14.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3429 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090827svn3429.tar.bz2 kvirc
+#  svn export -r 3436 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090830svn3436.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
+Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -28,6 +29,7 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 %build
 %{cmake}  \
@@ -129,6 +131,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 30 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.14.20090830svn3436
+- patch for using standard compiler flags
+
+* Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
+- rebuilt with new openssl
+
 * Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
 - svn snapshot 3429 that includes patch for openssl >=1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Aug 2009 14:13:00 -0000	1.4
+++ sources	29 Aug 2009 21:49:31 -0000	1.5
@@ -1 +1 @@
-15f9b94160d66eb2c043cb79aad3889c  kvirc-20090827svn3429.tar.bz2
+33fa9dadb090fb79faa49c6c950d5bdd  kvirc-20090830svn3436.tar.bz2



From nucleo at fedoraproject.org  Sat Aug 29 21:54:54 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 29 Aug 2009 21:54:54 +0000 (UTC)
Subject: rpms/kvirc/F-10 kvirc-flags.patch, 1.2, 1.3 .cvsignore, 1.4,
	1.5 kvirc.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090829215454.A9DF111C009F@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15352

Modified Files:
	.cvsignore kvirc.spec sources 
Added Files:
	kvirc-flags.patch 
Log Message:
reenable using of standard compiler flags

kvirc-flags.patch:
 CMakeLists.txt |   16 ----------------
 1 file changed, 16 deletions(-)

Index: kvirc-flags.patch
===================================================================
RCS file: kvirc-flags.patch
diff -N kvirc-flags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kvirc-flags.patch	29 Aug 2009 21:54:54 -0000	1.3
@@ -0,0 +1,25 @@
+--- kvirc/CMakeLists.txt	2009-08-23 13:10:13.000000000 +0300
++++ kvirc/CMakeLists.txt	2009-08-29 23:57:19.000000000 +0300
+@@ -138,22 +138,6 @@
+ 		SET(CMAKE_C_FLAGS "-O0 -g")
+ 	ENDIF()
+ ELSE()
+-	IF(CMAKE_COMPILER_IS_GNUCXX)
+-		#force gdb options
+-		SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-		SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+-		#gcc3 is still used by mingw and doesn't support this flag
+-		INCLUDE(CheckCXXCompilerFlag)
+-		CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
+-		IF(CXX_HAS_VIH_FLAG)
+-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+-			SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+-		ENDIF(CXX_HAS_VIH_FLAG)
+-	ELSE()
+-		#this small set of options should work on almost all compilers
+-		SET(CMAKE_CXX_FLAGS "-O3")
+-		SET(CMAKE_C_FLAGS "-O3")
+-	ENDIF()
+ 	SET(CMAKE_BUILD_TYPE Release)
+ 	SET(CMAKE_STATUS_DEBUG_SUPPORT "No")
+ ENDIF()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Aug 2009 14:30:23 -0000	1.4
+++ .cvsignore	29 Aug 2009 21:54:54 -0000	1.5
@@ -1 +1 @@
-kvirc-20090827svn3429.tar.bz2
+kvirc-20090830svn3436.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/kvirc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kvirc.spec	27 Aug 2009 14:30:23 -0000	1.3
+++ kvirc.spec	29 Aug 2009 21:54:54 -0000	1.4
@@ -1,18 +1,19 @@
-%define           rev 3429
-%define           pre 20090827svn%{rev}
+%define           rev 3436
+%define           pre 20090830svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.11.%{pre}%{?dist}
+Release:          0.14.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3429 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090827svn3429.tar.bz2 kvirc
+#  svn export -r 3436 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090830svn3436.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
+Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -28,6 +29,7 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 %build
 %{cmake}  \
@@ -129,6 +131,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
+* Sun Aug 30 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.14.20090830svn3436
+- patch for using standard compiler flags
+
+* Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
+- rebuilt with new openssl
+
 * Thu Aug 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.11.20090827svn3429
 - svn snapshot 3429 that includes patch for openssl >=1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Aug 2009 14:30:23 -0000	1.4
+++ sources	29 Aug 2009 21:54:54 -0000	1.5
@@ -1 +1 @@
-15f9b94160d66eb2c043cb79aad3889c  kvirc-20090827svn3429.tar.bz2
+33fa9dadb090fb79faa49c6c950d5bdd  kvirc-20090830svn3436.tar.bz2



From otaylor at fedoraproject.org  Sat Aug 29 22:01:57 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 22:01:57 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.4,1.5
Message-ID: <20090829220158.0483411C009F@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16504

Modified Files:
	gnome-shell.spec 
Log Message:
* Sat Aug 29 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-4
- Fix GConf %%preun script to properly be for package removal



Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-shell.spec	29 Aug 2009 01:53:14 -0000	1.4
+++ gnome-shell.spec	29 Aug 2009 22:01:57 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.27.1
-Release:        3
+Release:        4
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -101,7 +101,7 @@ if [ "$1" -gt 1 ]; then
 fi
 
 %preun
-if [ "$1" -gt 0 ]; then
+if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/gnome-shell.schemas \
@@ -115,6 +115,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Sat Aug 29 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-4
+- Fix GConf %%preun script to properly be for package removal
+
 * Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.1-3
 - Replace libgnomeui with gnome-desktop in BuildRequires
 



From otaylor at fedoraproject.org  Sat Aug 29 22:05:13 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sat, 29 Aug 2009 22:05:13 +0000 (UTC)
Subject: rpms/mutter/devel mutter.spec,1.8,1.9
Message-ID: <20090829220513.42AB811C009F@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17028

Modified Files:
	mutter.spec 
Log Message:
* Sat Aug 29 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-3
- Fix %%preun GConf script to properly be for package removal



Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mutter.spec	29 Aug 2009 00:01:37 -0000	1.8
+++ mutter.spec	29 Aug 2009 22:05:13 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           mutter
 Version:        2.27.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
@@ -110,7 +110,7 @@ if [ "$1" -gt 1 ]; then
 fi
 
 %preun 
-if [ "$1" -gt 0 ]; then
+if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/mutter.schemas \
@@ -151,6 +151,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Sat Aug 29 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-3
+- Fix %%preun GConf script to properly be for package removal
+
 * Fri Aug 28 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-2
 - Add a workaround for Red Hat bug #520209
 



From chitlesh at fedoraproject.org  Sat Aug 29 22:26:34 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 22:26:34 +0000 (UTC)
Subject: rpms/eclipse-texlipse/F-10 eclipse-texlipse-1.3.0-pdfpreview.patch, 
	NONE, 1.1 eclipse-texlipse-bin_excludes.patch, NONE,
	1.1 eclipse-texlipse-download.sh, NONE,
	1.1 eclipse-texlipse.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090829222635.0549711C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/eclipse-texlipse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21342/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-texlipse-1.3.0-pdfpreview.patch 
	eclipse-texlipse-bin_excludes.patch 
	eclipse-texlipse-download.sh eclipse-texlipse.spec import.log 
Log Message:
new package

eclipse-texlipse-1.3.0-pdfpreview.patch:
 ViewerAttributeRegistry.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-texlipse-1.3.0-pdfpreview.patch ---
--- net.sourceforge.texlipse/net.sourceforge.texlipse/source/net/sourceforge/texlipse/viewer/ViewerAttributeRegistry.java	2009-05-04 23:12:38.000000000 +0200
+++ ViewerAttributeRegistry.java	2009-06-16 21:09:03.602314289 +0200
@@ -61,7 +61,7 @@
     private static final String VIEWER_YAP = "yap";
 
     private static final String VIEWER_GV = "gv";
-    private static final String VIEWER_ACROBAT = "acroread";
+    private static final String VIEWER_ACROBAT = "PDF Reader";
     private static final String VIEWER_ITEXMAC = "itexmac";
 
     // default viewer attribute values 
@@ -179,7 +179,7 @@
         prefs.setDefault(VIEWER_GV + ATTRIBUTE_INVERSE_SEARCH, INVERSE_SEARCH_NO);
         prefs.setDefault(VIEWER_GV + ATTRIBUTE_FORWARD_SEARCH, "false");
 
-        prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_COMMAND, findFromEnvPath("acroread", "acroread.exe", ""));
+        prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_COMMAND, findFromEnvPath("xdg-open", "acroread.exe", ""));
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_ARGUMENTS, DEFAULT_ARGUMENTS_ACROBAT);
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_DDE_VIEW_COMMAND, "[DocOpen(\"%fullfile\")][FileOpen(\"%fullfile\")]"); 
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_DDE_VIEW_SERVER, "acroview");

eclipse-texlipse-bin_excludes.patch:
 build.properties |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE eclipse-texlipse-bin_excludes.patch ---
--- net.sourceforge.texlipse/build.properties	2008-02-25 23:15:30.000000000 +0100
+++ build.properties	2009-06-18 14:39:35.543178215 +0200
@@ -8,5 +8,4 @@
                templates/,\
                toc.xml,\
                about.html,\
-               contexts.xml,\
-               ddeclient.dll
+               contexts.xml


--- NEW FILE eclipse-texlipse-download.sh ---
#!/bin/bash

# Script to download the sources of texclipse
# It then generates a tarball which is used for packaging

rm -rf net.sourceforge.texlipse
mkdir net.sourceforge.texlipse
cd net.sourceforge.texlipse

export CVSROOT=:pserver:anonymous at texlipse.cvs.sourceforge.net:/cvsroot/texlipse
cvs login
cvs export -DNOW net.sourceforge.texlipse net.sourceforge.texlipse-feature

tar czvf ../net.sourceforge.texlipse.tar.gz .



--- NEW FILE eclipse-texlipse.spec ---
%global install_loc  %{_datadir}/eclipse/dropins/%{pkgname}
%global eclipse_base %{_libdir}/eclipse

%global pkgname      texlipse

Name:           eclipse-%{pkgname}
Version:        1.3.0
Release:        2.20090829cvs%{?dist}
Summary:        Eclipse plugin for editing Latex

Group:          Applications/Engineering
License:        EPL
URL:            http://texlipse.sourceforge.net

Source0:        net.sourceforge.%{pkgname}.tar.gz
# Source1 is used to download Source0
Source1:        eclipse-%{pkgname}-download.sh


# Fedora related patches as upstream default is suitable for Windows as well
#    Fedora doesn't ship acroread, hence opting for xdg-open
Patch0:         eclipse-%{pkgname}-%{version}-pdfpreview.patch
#    Remove unneccessary files
Patch1:         eclipse-%{pkgname}-bin_excludes.patch


BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  eclipse-pde
BuildRequires:  java-devel

Requires:       eclipse-platform
Requires:       tex(latex)
Requires:       xdg-utils

# For Preview
Requires:       xdvik

# For Spell-Check (choosing default : English)
Requires:       aspell-en

BuildArch:      noarch

# Ignoring rpmlint warning zero-length for Blank.tex, it is used as example

%description
Texlipse is a plugin that adds Latex editing support for the
popular Eclipse IDE.

Key features include:
    Syntax highlight, command completion, bibliography completion,
    outline navigation and automatic building.

%prep
%setup -q -c

%patch0 -p1 -b .pdfreview
%patch1 -p0 -b .exclude

find -name '*.jar' -o -name '*.class' -o -name '.cvsignore' -exec rm -f '{}' \;

# Preparing examples for %%doc
%{__cp} -pr net.sourceforge.%{pkgname}/docs/arch net.sourceforge.%{pkgname}/examples

%build

%{eclipse_base}/buildscripts/pdebuild

%install
%{__rm} -rf %{buildroot}

%{__install} -d -m 755 %{buildroot}%{install_loc}
unzip -d %{buildroot}%{install_loc} -q build/rpmBuild/net.sourceforge.%{pkgname}.zip

# Removing duplicates that should be in %%doc
%{__rm} -f %{buildroot}%{install_loc}/eclipse/plugins/net.sourceforge.%{pkgname}_%{version}/about.html

%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc net.sourceforge.%{pkgname}/about.html
%doc net.sourceforge.%{pkgname}/examples
%{install_loc}


%changelog
* Sat Aug 29 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 1.3.0-2.20090829cvs
- Corrected the spec file based on the comments from package review : RHBZ #506431
- Updated to upstream CVS checkout 20090829

* Tue Jun 16 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 1.3.0-1.20090616cvs
- Initial Fedora Package



--- NEW FILE import.log ---
eclipse-texlipse-1_3_0-2_20090829cvs_fc11:F-10:eclipse-texlipse-1.3.0-2.20090829cvs.fc11.src.rpm:1251584559


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-texlipse/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 20:22:13 -0000	1.1
+++ .cvsignore	29 Aug 2009 22:26:33 -0000	1.2
@@ -0,0 +1 @@
+net.sourceforge.texlipse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-texlipse/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:22:13 -0000	1.1
+++ sources	29 Aug 2009 22:26:33 -0000	1.2
@@ -0,0 +1 @@
+9aa49f905811f0987c5096b40133eeef  net.sourceforge.texlipse.tar.gz



From chitlesh at fedoraproject.org  Sat Aug 29 22:28:30 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 22:28:30 +0000 (UTC)
Subject: rpms/eclipse-texlipse/F-11 eclipse-texlipse-1.3.0-pdfpreview.patch, 
	NONE, 1.1 eclipse-texlipse-bin_excludes.patch, NONE,
	1.1 eclipse-texlipse-download.sh, NONE,
	1.1 eclipse-texlipse.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090829222830.E542111C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/eclipse-texlipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21855/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-texlipse-1.3.0-pdfpreview.patch 
	eclipse-texlipse-bin_excludes.patch 
	eclipse-texlipse-download.sh eclipse-texlipse.spec import.log 
Log Message:
new package

eclipse-texlipse-1.3.0-pdfpreview.patch:
 ViewerAttributeRegistry.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-texlipse-1.3.0-pdfpreview.patch ---
--- net.sourceforge.texlipse/net.sourceforge.texlipse/source/net/sourceforge/texlipse/viewer/ViewerAttributeRegistry.java	2009-05-04 23:12:38.000000000 +0200
+++ ViewerAttributeRegistry.java	2009-06-16 21:09:03.602314289 +0200
@@ -61,7 +61,7 @@
     private static final String VIEWER_YAP = "yap";
 
     private static final String VIEWER_GV = "gv";
-    private static final String VIEWER_ACROBAT = "acroread";
+    private static final String VIEWER_ACROBAT = "PDF Reader";
     private static final String VIEWER_ITEXMAC = "itexmac";
 
     // default viewer attribute values 
@@ -179,7 +179,7 @@
         prefs.setDefault(VIEWER_GV + ATTRIBUTE_INVERSE_SEARCH, INVERSE_SEARCH_NO);
         prefs.setDefault(VIEWER_GV + ATTRIBUTE_FORWARD_SEARCH, "false");
 
-        prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_COMMAND, findFromEnvPath("acroread", "acroread.exe", ""));
+        prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_COMMAND, findFromEnvPath("xdg-open", "acroread.exe", ""));
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_ARGUMENTS, DEFAULT_ARGUMENTS_ACROBAT);
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_DDE_VIEW_COMMAND, "[DocOpen(\"%fullfile\")][FileOpen(\"%fullfile\")]"); 
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_DDE_VIEW_SERVER, "acroview");

eclipse-texlipse-bin_excludes.patch:
 build.properties |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE eclipse-texlipse-bin_excludes.patch ---
--- net.sourceforge.texlipse/build.properties	2008-02-25 23:15:30.000000000 +0100
+++ build.properties	2009-06-18 14:39:35.543178215 +0200
@@ -8,5 +8,4 @@
                templates/,\
                toc.xml,\
                about.html,\
-               contexts.xml,\
-               ddeclient.dll
+               contexts.xml


--- NEW FILE eclipse-texlipse-download.sh ---
#!/bin/bash

# Script to download the sources of texclipse
# It then generates a tarball which is used for packaging

rm -rf net.sourceforge.texlipse
mkdir net.sourceforge.texlipse
cd net.sourceforge.texlipse

export CVSROOT=:pserver:anonymous at texlipse.cvs.sourceforge.net:/cvsroot/texlipse
cvs login
cvs export -DNOW net.sourceforge.texlipse net.sourceforge.texlipse-feature

tar czvf ../net.sourceforge.texlipse.tar.gz .



--- NEW FILE eclipse-texlipse.spec ---
%global install_loc  %{_datadir}/eclipse/dropins/%{pkgname}
%global eclipse_base %{_libdir}/eclipse

%global pkgname      texlipse

Name:           eclipse-%{pkgname}
Version:        1.3.0
Release:        2.20090829cvs%{?dist}
Summary:        Eclipse plugin for editing Latex

Group:          Applications/Engineering
License:        EPL
URL:            http://texlipse.sourceforge.net

Source0:        net.sourceforge.%{pkgname}.tar.gz
# Source1 is used to download Source0
Source1:        eclipse-%{pkgname}-download.sh


# Fedora related patches as upstream default is suitable for Windows as well
#    Fedora doesn't ship acroread, hence opting for xdg-open
Patch0:         eclipse-%{pkgname}-%{version}-pdfpreview.patch
#    Remove unneccessary files
Patch1:         eclipse-%{pkgname}-bin_excludes.patch


BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  eclipse-pde
BuildRequires:  java-devel

Requires:       eclipse-platform
Requires:       tex(latex)
Requires:       xdg-utils

# For Preview
Requires:       xdvik

# For Spell-Check (choosing default : English)
Requires:       aspell-en

BuildArch:      noarch

# Ignoring rpmlint warning zero-length for Blank.tex, it is used as example

%description
Texlipse is a plugin that adds Latex editing support for the
popular Eclipse IDE.

Key features include:
    Syntax highlight, command completion, bibliography completion,
    outline navigation and automatic building.

%prep
%setup -q -c

%patch0 -p1 -b .pdfreview
%patch1 -p0 -b .exclude

find -name '*.jar' -o -name '*.class' -o -name '.cvsignore' -exec rm -f '{}' \;

# Preparing examples for %%doc
%{__cp} -pr net.sourceforge.%{pkgname}/docs/arch net.sourceforge.%{pkgname}/examples

%build

%{eclipse_base}/buildscripts/pdebuild

%install
%{__rm} -rf %{buildroot}

%{__install} -d -m 755 %{buildroot}%{install_loc}
unzip -d %{buildroot}%{install_loc} -q build/rpmBuild/net.sourceforge.%{pkgname}.zip

# Removing duplicates that should be in %%doc
%{__rm} -f %{buildroot}%{install_loc}/eclipse/plugins/net.sourceforge.%{pkgname}_%{version}/about.html

%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc net.sourceforge.%{pkgname}/about.html
%doc net.sourceforge.%{pkgname}/examples
%{install_loc}


%changelog
* Sat Aug 29 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 1.3.0-2.20090829cvs
- Corrected the spec file based on the comments from package review : RHBZ #506431
- Updated to upstream CVS checkout 20090829

* Tue Jun 16 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 1.3.0-1.20090616cvs
- Initial Fedora Package



--- NEW FILE import.log ---
eclipse-texlipse-1_3_0-2_20090829cvs_fc11:F-11:eclipse-texlipse-1.3.0-2.20090829cvs.fc11.src.rpm:1251584763


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-texlipse/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 20:22:13 -0000	1.1
+++ .cvsignore	29 Aug 2009 22:28:30 -0000	1.2
@@ -0,0 +1 @@
+net.sourceforge.texlipse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-texlipse/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:22:13 -0000	1.1
+++ sources	29 Aug 2009 22:28:30 -0000	1.2
@@ -0,0 +1 @@
+9aa49f905811f0987c5096b40133eeef  net.sourceforge.texlipse.tar.gz



From chitlesh at fedoraproject.org  Sat Aug 29 22:29:58 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 29 Aug 2009 22:29:58 +0000 (UTC)
Subject: rpms/eclipse-texlipse/devel eclipse-texlipse-1.3.0-pdfpreview.patch,
	NONE, 1.1 eclipse-texlipse-bin_excludes.patch, NONE,
	1.1 eclipse-texlipse-download.sh, NONE,
	1.1 eclipse-texlipse.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090829222958.3A11111C009F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/eclipse-texlipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-texlipse-1.3.0-pdfpreview.patch 
	eclipse-texlipse-bin_excludes.patch 
	eclipse-texlipse-download.sh eclipse-texlipse.spec import.log 
Log Message:
new package

eclipse-texlipse-1.3.0-pdfpreview.patch:
 ViewerAttributeRegistry.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-texlipse-1.3.0-pdfpreview.patch ---
--- net.sourceforge.texlipse/net.sourceforge.texlipse/source/net/sourceforge/texlipse/viewer/ViewerAttributeRegistry.java	2009-05-04 23:12:38.000000000 +0200
+++ ViewerAttributeRegistry.java	2009-06-16 21:09:03.602314289 +0200
@@ -61,7 +61,7 @@
     private static final String VIEWER_YAP = "yap";
 
     private static final String VIEWER_GV = "gv";
-    private static final String VIEWER_ACROBAT = "acroread";
+    private static final String VIEWER_ACROBAT = "PDF Reader";
     private static final String VIEWER_ITEXMAC = "itexmac";
 
     // default viewer attribute values 
@@ -179,7 +179,7 @@
         prefs.setDefault(VIEWER_GV + ATTRIBUTE_INVERSE_SEARCH, INVERSE_SEARCH_NO);
         prefs.setDefault(VIEWER_GV + ATTRIBUTE_FORWARD_SEARCH, "false");
 
-        prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_COMMAND, findFromEnvPath("acroread", "acroread.exe", ""));
+        prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_COMMAND, findFromEnvPath("xdg-open", "acroread.exe", ""));
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_ARGUMENTS, DEFAULT_ARGUMENTS_ACROBAT);
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_DDE_VIEW_COMMAND, "[DocOpen(\"%fullfile\")][FileOpen(\"%fullfile\")]"); 
         prefs.setDefault(VIEWER_ACROBAT + ATTRIBUTE_DDE_VIEW_SERVER, "acroview");

eclipse-texlipse-bin_excludes.patch:
 build.properties |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE eclipse-texlipse-bin_excludes.patch ---
--- net.sourceforge.texlipse/build.properties	2008-02-25 23:15:30.000000000 +0100
+++ build.properties	2009-06-18 14:39:35.543178215 +0200
@@ -8,5 +8,4 @@
                templates/,\
                toc.xml,\
                about.html,\
-               contexts.xml,\
-               ddeclient.dll
+               contexts.xml


--- NEW FILE eclipse-texlipse-download.sh ---
#!/bin/bash

# Script to download the sources of texclipse
# It then generates a tarball which is used for packaging

rm -rf net.sourceforge.texlipse
mkdir net.sourceforge.texlipse
cd net.sourceforge.texlipse

export CVSROOT=:pserver:anonymous at texlipse.cvs.sourceforge.net:/cvsroot/texlipse
cvs login
cvs export -DNOW net.sourceforge.texlipse net.sourceforge.texlipse-feature

tar czvf ../net.sourceforge.texlipse.tar.gz .



--- NEW FILE eclipse-texlipse.spec ---
%global install_loc  %{_datadir}/eclipse/dropins/%{pkgname}
%global eclipse_base %{_libdir}/eclipse

%global pkgname      texlipse

Name:           eclipse-%{pkgname}
Version:        1.3.0
Release:        2.20090829cvs%{?dist}
Summary:        Eclipse plugin for editing Latex

Group:          Applications/Engineering
License:        EPL
URL:            http://texlipse.sourceforge.net

Source0:        net.sourceforge.%{pkgname}.tar.gz
# Source1 is used to download Source0
Source1:        eclipse-%{pkgname}-download.sh


# Fedora related patches as upstream default is suitable for Windows as well
#    Fedora doesn't ship acroread, hence opting for xdg-open
Patch0:         eclipse-%{pkgname}-%{version}-pdfpreview.patch
#    Remove unneccessary files
Patch1:         eclipse-%{pkgname}-bin_excludes.patch


BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  eclipse-pde
BuildRequires:  java-devel

Requires:       eclipse-platform
Requires:       tex(latex)
Requires:       xdg-utils

# For Preview
Requires:       xdvik

# For Spell-Check (choosing default : English)
Requires:       aspell-en

BuildArch:      noarch

# Ignoring rpmlint warning zero-length for Blank.tex, it is used as example

%description
Texlipse is a plugin that adds Latex editing support for the
popular Eclipse IDE.

Key features include:
    Syntax highlight, command completion, bibliography completion,
    outline navigation and automatic building.

%prep
%setup -q -c

%patch0 -p1 -b .pdfreview
%patch1 -p0 -b .exclude

find -name '*.jar' -o -name '*.class' -o -name '.cvsignore' -exec rm -f '{}' \;

# Preparing examples for %%doc
%{__cp} -pr net.sourceforge.%{pkgname}/docs/arch net.sourceforge.%{pkgname}/examples

%build

%{eclipse_base}/buildscripts/pdebuild

%install
%{__rm} -rf %{buildroot}

%{__install} -d -m 755 %{buildroot}%{install_loc}
unzip -d %{buildroot}%{install_loc} -q build/rpmBuild/net.sourceforge.%{pkgname}.zip

# Removing duplicates that should be in %%doc
%{__rm} -f %{buildroot}%{install_loc}/eclipse/plugins/net.sourceforge.%{pkgname}_%{version}/about.html

%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc net.sourceforge.%{pkgname}/about.html
%doc net.sourceforge.%{pkgname}/examples
%{install_loc}


%changelog
* Sat Aug 29 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 1.3.0-2.20090829cvs
- Corrected the spec file based on the comments from package review : RHBZ #506431
- Updated to upstream CVS checkout 20090829

* Tue Jun 16 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 1.3.0-1.20090616cvs
- Initial Fedora Package



--- NEW FILE import.log ---
eclipse-texlipse-1_3_0-2_20090829cvs_fc11:HEAD:eclipse-texlipse-1.3.0-2.20090829cvs.fc11.src.rpm:1251584858


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-texlipse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 20:22:13 -0000	1.1
+++ .cvsignore	29 Aug 2009 22:29:57 -0000	1.2
@@ -0,0 +1 @@
+net.sourceforge.texlipse.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-texlipse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:22:13 -0000	1.1
+++ sources	29 Aug 2009 22:29:58 -0000	1.2
@@ -0,0 +1 @@
+9aa49f905811f0987c5096b40133eeef  net.sourceforge.texlipse.tar.gz



From cwickert at fedoraproject.org  Sat Aug 29 22:30:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 29 Aug 2009 22:30:11 +0000 (UTC)
Subject: rpms/rednotebook/devel .cvsignore, 1.18, 1.19 rednotebook.spec, 1.18,
	1.19 sources, 1.18, 1.19
Message-ID: <20090829223011.06C9311C0496@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22408

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
- Updated to new upstream version 0.8.5 (fixes #518778)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 Aug 2009 12:48:36 -0000	1.18
+++ .cvsignore	29 Aug 2009 22:30:10 -0000	1.19
@@ -1 +1 @@
-rednotebook-0.8.4.tar.gz
+rednotebook-0.8.5.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/rednotebook.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- rednotebook.spec	14 Aug 2009 12:48:36 -0000	1.18
+++ rednotebook.spec	29 Aug 2009 22:30:10 -0000	1.19
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.4
+Version:        0.8.5
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
+- Updated to new upstream version 0.8.5 (fixes #518778)
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
 - Updated to new upstream version 0.8.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	14 Aug 2009 12:48:36 -0000	1.18
+++ sources	29 Aug 2009 22:30:10 -0000	1.19
@@ -1 +1 @@
-5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz
+129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz



From cwickert at fedoraproject.org  Sat Aug 29 22:34:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 29 Aug 2009 22:34:29 +0000 (UTC)
Subject: rpms/rednotebook/F-11 .cvsignore, 1.13, 1.14 rednotebook.spec, 1.16,
	1.17 sources, 1.16, 1.17
Message-ID: <20090829223429.6C2B311C009F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23433/F-11

Modified Files:
	.cvsignore rednotebook.spec sources 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
- Updated to new upstream version 0.8.5 (fixes #518778)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Aug 2009 13:06:14 -0000	1.13
+++ .cvsignore	29 Aug 2009 22:34:29 -0000	1.14
@@ -1 +1 @@
-rednotebook-0.8.4.tar.gz
+rednotebook-0.8.5.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/rednotebook.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rednotebook.spec	14 Aug 2009 13:06:14 -0000	1.16
+++ rednotebook.spec	29 Aug 2009 22:34:29 -0000	1.17
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.4
+Version:        0.8.5
 Release:        1%{?dist}
 Summary:        A desktop diary
 
@@ -71,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
+- Updated to new upstream version 0.8.5 (fixes #518778)
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
 - Updated to new upstream version 0.8.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	14 Aug 2009 13:06:14 -0000	1.16
+++ sources	29 Aug 2009 22:34:29 -0000	1.17
@@ -1 +1 @@
-5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz
+129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz



From cwickert at fedoraproject.org  Sat Aug 29 22:34:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 29 Aug 2009 22:34:30 +0000 (UTC)
Subject: rpms/rednotebook/F-10 .cvsignore, 1.12, 1.13 rednotebook.spec, 1.16,
	1.17 sources, 1.15, 1.16 rednotebook-0.8.4-gtk-2.14.patch, 1.1, NONE
Message-ID: <20090829223430.2709A11C009F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23433/F-10

Modified Files:
	.cvsignore rednotebook.spec sources 
Removed Files:
	rednotebook-0.8.4-gtk-2.14.patch 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
- Updated to new upstream version 0.8.5 (fixes #518778)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Aug 2009 13:06:14 -0000	1.12
+++ .cvsignore	29 Aug 2009 22:34:29 -0000	1.13
@@ -1 +1 @@
-rednotebook-0.8.4.tar.gz
+rednotebook-0.8.5.tar.gz


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/rednotebook.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rednotebook.spec	29 Aug 2009 18:18:08 -0000	1.16
+++ rednotebook.spec	29 Aug 2009 22:34:29 -0000	1.17
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           rednotebook
-Version:        0.8.4
-Release:        1%{?dist}.1
+Version:        0.8.5
+Release:        1%{?dist}
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.8.4-gtk-2.14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -31,7 +30,7 @@ and does so in style.
 
 %prep
 %setup -q
-%patch0 -p1 -b .216
+
 
 %build
 python setup.py build
@@ -72,8 +71,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
-* Sat Aug 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1.1
-- Make rednotebook work with GTK 2.14 (#518778)
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
+- Updated to new upstream version 0.8.5 (fixes #518778)
 
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
 - Updated to new upstream version 0.8.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	14 Aug 2009 13:06:14 -0000	1.15
+++ sources	29 Aug 2009 22:34:30 -0000	1.16
@@ -1 +1 @@
-5eca46d4854a2018bea02fddef5a52c2  rednotebook-0.8.4.tar.gz
+129bd692ec936761db8b1b8e12b4202c  rednotebook-0.8.5.tar.gz


--- rednotebook-0.8.4-gtk-2.14.patch DELETED ---



From deji at fedoraproject.org  Sat Aug 29 22:46:32 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sat, 29 Aug 2009 22:46:32 +0000 (UTC)
Subject: rpms/exaile/devel .cvsignore, 1.9, 1.10 exaile-makefile.patch, 1.2, 
	1.3 exaile.spec, 1.26, 1.27 sources, 1.9, 1.10
Message-ID: <20090829224632.9F98A11C009F@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exaile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26070

Modified Files:
	.cvsignore exaile-makefile.patch exaile.spec sources 
Log Message:
* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0-1
- Update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Oct 2008 05:21:16 -0000	1.9
+++ .cvsignore	29 Aug 2009 22:46:31 -0000	1.10
@@ -1 +1 @@
-exaile_0.2.14.tar.gz
+exaile-0.3.0.tar.gz

exaile-makefile.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: exaile-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/exaile-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- exaile-makefile.patch	2 Apr 2008 13:43:10 -0000	1.2
+++ exaile-makefile.patch	29 Aug 2009 22:46:31 -0000	1.3
@@ -1,84 +1,20 @@
---- Makefile	2008-02-28 11:17:05.000000000 -0500
-+++ Makefile.new	2008-02-28 11:29:09.000000000 -0500
-@@ -18,14 +18,14 @@
+--- Makefile	2009-08-24 17:25:03.000000000 -0400
++++ Makefile.new	2009-08-28 19:46:25.227288689 -0400
+@@ -2,7 +2,7 @@
+ LIBINSTALLDIR ?= /lib
+ XDGCONFDIR ?= /etc/xdg
  
- make-install-dirs: 
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
--	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile/lib
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/gui
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/media
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/panels
-+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
-@@ -41,26 +41,26 @@
+-EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
++EXAILELIBDIR = $(DESTDIR)$(LIBINSTALLDIR)/exaile
+ EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
  
- install: make-install-dirs
- 	install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
--	install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-+	install -m 644 exaile.py $(DESTDIR)$(LIBDIR)/exaile
- 	install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
- 	install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
- 	install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql
--	-install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-+	-install -m 644 mmkeys.so $(DESTDIR)$(LIBDIR)/exaile
- 	install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images
- 	install -m 644 images/default_theme/*.png \
- 	$(DESTDIR)$(PREFIX)/share/exaile/images/default_theme
--	install -m 644 xl/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
--	-install -m 644 xl/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
--	install -m 644 xl/media/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
--	-install -m 644 xl/media/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
--	install -m 644 xl/panels/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
--	-install -m 644 xl/panels/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
--	install -m 644 xl/gui/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
--	-install -m 644 xl/gui/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
--	install -m 644 lib/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
--	-install -m 644 lib/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
-+	install -m 644 xl/*.py $(DESTDIR)$(LIBDIR)/exaile/xl
-+	-install -m 644 xl/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl
-+	install -m 644 xl/media/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/media
-+	-install -m 644 xl/media/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/media
-+	install -m 644 xl/panels/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/panels
-+	-install -m 644 xl/panels/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/panels
-+	install -m 644 xl/gui/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/gui
-+	-install -m 644 xl/gui/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/gui
-+	install -m 644 lib/*.py $(DESTDIR)$(LIBDIR)/exaile/lib
-+	-install -m 644 lib/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/lib
- 	install -m 644 data/*.ini $(DESTDIR)$(PREFIX)/share/exaile/data
--	install -m 644 xl/plugins/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
-+	install -m 644 xl/plugins/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
- 	install -m 644 xl/plugins/*.glade $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
- 	install -m 644 images/largeicon.png \
- 	$(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
-@@ -69,7 +69,8 @@
- 	  /bin/echo -e \
- 	    "#!/bin/sh\n" \
- 	    "cd $(PREFIX)/share/exaile\n" \
--	    "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
-+	    "export MOZILLA_FIVE_HOME=\`cat $(GRE_CONF_PATH) | grep GRE_PATH | sed -e 's/GRE_PATH=//'\`\n" \
-+	    "exec python $(LIBDIR)/exaile/exaile.py \"\$$@\"" \
- 	    > exaile && \
- 	  chmod 755 exaile
- 	for f in `find po -name exaile.mo` ; do \
-@@ -92,7 +93,7 @@
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(PREFIX)/share/exaile
--	rm -rf $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-+	rm -rf $(DESTDIR)$(LIBDIR)/exaile
- 	rm -rf $(DESTDIR)$(PREFIX)/bin/exaile
- 	rm -f $(DESTDIR)$(PREFIX)/share/applications/exaile.desktop
- 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
+ all: compile
+@@ -87,7 +87,7 @@
+ 	# the printf here is for bsd compat, dont use echo!
+ 	cd $(DESTDIR)$(PREFIX)/bin && \
+ 	 printf "#!/bin/sh\n\
+-	 exec python $(PREFIX)$(LIBINSTALLDIR)/exaile/exaile.py \
++	 exec python $(LIBINSTALLDIR)/exaile/exaile.py \
+ 	 --datadir=$(PREFIX)/share/exaile/data --startgui \"\$$@\"" \
+ 	 > exaile && \
+ 	 chmod 755 exaile


Index: exaile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/exaile.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- exaile.spec	24 Jul 2009 22:24:42 -0000	1.26
+++ exaile.spec	29 Aug 2009 22:46:31 -0000	1.27
@@ -1,43 +1,36 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary:	A music player
 Name:		exaile
-Version:	0.2.14
-Release:	4%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 Group:		Applications/Multimedia
-# It actually says GPL 1 or later version; one file says "Artistic/Perl", which is GPL+ or Artistic. 
-License:	GPL+ or Artistic
+License:	GPLv2+
 URL:		http://www.exaile.org
-Source0:	http://www.exaile.org/files/exaile_%{version}.tar.gz
+Source0:	http://www.launchpad.net/exaile/0.3.0/0.3.0/+download/exaile-%{version}.tar.gz
 Patch0:		exaile-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
-BuildRequires:	pygtk2-devel
-BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	pkgconfig
-#BuildRequires:	gecko-devel
+#BuildRequires:	pygtk2-devel
+#BuildRequires:	sphinx
 BuildRequires:	gettext intltool perl(XML::Parser)
 
 Requires:	python-mutagen >= 1.8
 Requires:	dbus-python
 Requires:	gstreamer-python >= 0.10
 Requires:	python-sqlite2
+Requires:	pygtk2
 Requires:	pygtk2-libglade
-Requires:	gnome-python2-gtkhtml2
-Requires:	gnome-python2-gtkmozembed
+#Requires:	gnome-python2-gtkhtml2
+Requires:	python-inotify
 Requires:	python-CDDB
 Requires:	python-sexy
 Requires:	gamin-python
+Requires:	hal
 
-%if 0%{?fedora} > 6
-# for iPod device support
-Requires:	python-gpod
-%endif
-
-%ifarch x86_64 ia64 ppc64 s390x sparc64
-%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
-%else
-%define gre_conf %{_sysconfdir}/gre.d/gre.conf
-%endif 
+BuildArch:	noarch
 
 %description
 Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
@@ -56,25 +49,19 @@ on your iPod to last.fm
 %setup -q
 %patch0 -p0 -b .fix
 
-# remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i plugins/*.py xl/plugins/*.py xl/*.py exaile.py
-
 %build
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
  
 %install
 rm -rf %{buildroot}
 
-make install PREFIX=%{_prefix} LIBDIR=%{_libdir}	\
-	GRE_CONF_PATH=%{gre_conf} DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBINSTALLDIR=%{python_sitelib} DESTDIR=%{buildroot}
 
 desktop-file-install --delete-original			\
 	--vendor="fedora"				\
 	--dir=%{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
-chmod 755 %{buildroot}%{_libdir}/exaile/mmkeys.so
-
 %find_lang %{name}
 
 %clean
@@ -82,15 +69,19 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc changelog COPYING
+%doc COPYING
 %{_bindir}/exaile
-%{_libdir}/exaile/
+#%{_libdir}/exaile/
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/exaile.png
 %{_datadir}/exaile/
-%{_mandir}/man1/exaile*.*
+%{_sysconfdir}/xdg/exaile/
+%{python_sitelib}/exaile/
 
 %changelog
+* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0-1
+- Update to 0.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 Oct 2008 05:21:16 -0000	1.9
+++ sources	29 Aug 2009 22:46:31 -0000	1.10
@@ -1 +1 @@
-5e569c084134abe13d651f804812b6fa  exaile_0.2.14.tar.gz
+8d89110396b088042f39677892829e2d  exaile-0.3.0.tar.gz



From epienbro at fedoraproject.org  Sat Aug 29 23:13:34 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 23:13:34 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel
	mingw32-openssl-1.0.0-beta3-libversion.patch, 1.1,
	1.2 mingw32-openssl.spec, 1.9, 1.10
Message-ID: <20090829231334.C6A1811C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29814

Modified Files:
	mingw32-openssl-1.0.0-beta3-libversion.patch 
	mingw32-openssl.spec 
Log Message:
* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.2.beta3
- Fixed invalid RPM Provides


mingw32-openssl-1.0.0-beta3-libversion.patch:
 Makefile.org    |    4 ++--
 Makefile.shared |   16 ++++++----------
 util/mkdef.pl   |    2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

Index: mingw32-openssl-1.0.0-beta3-libversion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl-1.0.0-beta3-libversion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-openssl-1.0.0-beta3-libversion.patch	29 Aug 2009 20:22:05 -0000	1.1
+++ mingw32-openssl-1.0.0-beta3-libversion.patch	29 Aug 2009 23:13:34 -0000	1.2
@@ -53,3 +53,14 @@ diff -up openssl-1.0.0-beta3/Makefile.sh
  		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
  	fi; \
  	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+--- openssl-1.0.0-beta3/util/mkdef.pl.orig	2009-08-30 00:50:32.108820466 +0200
++++ openssl-1.0.0-beta3/util/mkdef.pl	2009-08-30 00:51:00.032820656 +0200
+@@ -1244,7 +1244,7 @@
+ 	my $description = "$what $version, $name - http://$http_vendor";
+ 
+ 	if ($W32)
+-		{ $libname.="32"; }
++		{ $libname="lib$libname-10.dll"; }
+ 	elsif ($W16)
+ 		{ $libname.="16"; }
+ 	elsif ($OS2)


Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mingw32-openssl.spec	29 Aug 2009 20:38:50 -0000	1.9
+++ mingw32-openssl.spec	29 Aug 2009 23:13:34 -0000	1.10
@@ -31,7 +31,7 @@
 
 Name:           mingw32-openssl
 Version:        1.0.0
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -347,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.2.beta3
+- Fixed invalid RPM Provides
+ 
 * Fri Aug 28 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.1.beta3
 - Update to version 1.0.0 beta 3
 - Use %%global instead of %%define



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:03 +0000
Subject: [pkgdb] spring: ynemoy has requested watchbugzilla
Message-ID: <20090829231403.7988510F877@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on spring (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:03 +0000
Subject: [pkgdb] spring: ynemoy has requested watchcommits
Message-ID: <20090829231403.D534210F87B@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on spring (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:04 +0000
Subject: [pkgdb] spring: ynemoy has requested approveacls
Message-ID: <20090829231404.6F97210F884@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on spring (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:10 +0000
Subject: [pkgdb] spring: ynemoy has requested commit
Message-ID: <20090829231410.5B34F10F894@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on spring (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:11 +0000
Subject: [pkgdb] spring: ynemoy has requested approveacls
Message-ID: <20090829231411.C7DD910F898@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on spring (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:12 +0000
Subject: [pkgdb] spring: ynemoy has requested commit
Message-ID: <20090829231412.DB24310F89B@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on spring (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:14 +0000
Subject: [pkgdb] spring: ynemoy has requested watchcommits
Message-ID: <20090829231414.BCCD710F8A2@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on spring (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:15 +0000
Subject: [pkgdb] spring: ynemoy has requested watchbugzilla
Message-ID: <20090829231415.F173F10F8A3@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on spring (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:27 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested approveacls
Message-ID: <20090829231427.A201010F87B@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on spring-installer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:28 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested commit
Message-ID: <20090829231428.5EE6710F8A6@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on spring-installer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:29 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested watchcommits
Message-ID: <20090829231429.7C6DC10F8AA@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on spring-installer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:31 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested watchbugzilla
Message-ID: <20090829231431.653F510F8AF@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on spring-installer (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:32 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested approveacls
Message-ID: <20090829231432.3DA7310F8B2@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on spring-installer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:32 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested commit
Message-ID: <20090829231432.6A50110F8B5@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on spring-installer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:33 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested watchcommits
Message-ID: <20090829231433.6390A10F8B8@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on spring-installer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:35 +0000
Subject: [pkgdb] spring-installer: ynemoy has requested watchbugzilla
Message-ID: <20090829231435.DE98810F8BC@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on spring-installer (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:46 +0000
Subject: [pkgdb] springlobby: ynemoy has requested commit
Message-ID: <20090829231446.49F7E10F8C1@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on springlobby (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:45 +0000
Subject: [pkgdb] springlobby: ynemoy has requested approveacls
Message-ID: <20090829231445.1C66D10F8BE@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on springlobby (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:46 +0000
Subject: [pkgdb] springlobby: ynemoy has requested watchcommits
Message-ID: <20090829231446.E176B10F8C4@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on springlobby (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:48 +0000
Subject: [pkgdb] springlobby: ynemoy has requested watchbugzilla
Message-ID: <20090829231448.B594110F895@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on springlobby (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:49 +0000
Subject: [pkgdb] springlobby: ynemoy has requested approveacls
Message-ID: <20090829231449.3EC8710F8C8@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on springlobby (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:51 +0000
Subject: [pkgdb] springlobby: ynemoy has requested commit
Message-ID: <20090829231451.0A9E510F899@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on springlobby (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:51 +0000
Subject: [pkgdb] springlobby: ynemoy has requested watchcommits
Message-ID: <20090829231451.A17BE10F8CC@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on springlobby (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:14:53 +0000
Subject: [pkgdb] springlobby: ynemoy has requested watchbugzilla
Message-ID: <20090829231453.0A12310F8CF@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on springlobby (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:02 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested approveacls
Message-ID: <20090829231503.5A63910F8D1@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on spring-maps-default (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:03 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested commit
Message-ID: <20090829231503.9751E10F8D2@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on spring-maps-default (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:04 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested watchcommits
Message-ID: <20090829231504.AE6FD10F8D6@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on spring-maps-default (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:06 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested watchbugzilla
Message-ID: <20090829231506.90A8F10F8D9@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on spring-maps-default (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:07 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested approveacls
Message-ID: <20090829231507.3B35710F8DC@bastion2.fedora.phx.redhat.com>

ynemoy has requested the approveacls acl on spring-maps-default (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:07 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested commit
Message-ID: <20090829231507.E44BC10F8DF@bastion2.fedora.phx.redhat.com>

ynemoy has requested the commit acl on spring-maps-default (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:11 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested watchbugzilla
Message-ID: <20090829231511.45CEE10F8F0@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchbugzilla acl on spring-maps-default (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sat Aug 29 23:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 29 Aug 2009 23:15:09 +0000
Subject: [pkgdb] spring-maps-default: ynemoy has requested watchcommits
Message-ID: <20090829231509.208E110F8EB@bastion2.fedora.phx.redhat.com>

ynemoy has requested the watchcommits acl on spring-maps-default (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From transif at fedoraproject.org  Sat Aug 29 23:19:34 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sat, 29 Aug 2009 23:19:34 +0000 (UTC)
Subject: comps/po pt_BR.po,1.37,1.38
Message-ID: <20090829231934.C10F211C009F@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31501/po

Modified Files:
	pt_BR.po 
Log Message:
Sending translation for Brazilian Portuguese


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.37 -r 1.38 pt_BR.poIndex: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- pt_BR.po	27 Aug 2009 15:38:35 -0000	1.37
+++ pt_BR.po	29 Aug 2009 23:19:34 -0000	1.38
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-06-17 14:48-0300\n"
+"POT-Creation-Date: 2009-08-29 19:06+0000\n"
+"PO-Revision-Date: 2009-08-29 20:18-0300\n"
 "Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -28,1582 +28,2295 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1
+#: ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Um ambiente de trabalho leve que funciona bem em m?quinas de baixo custo."
+msgstr "Um ambiente de trabalho leve que funciona bem em m?quinas de baixo custo."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2
+#: ../comps-f10.xml.in.h:3
+#: ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5
+#: ../comps-f13.xml.in.h:5
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Ferramentas administrativas"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3
+#: ../comps-f10.xml.in.h:4
+#: ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6
+#: ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Suporte ? Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4
+#: ../comps-f10.xml.in.h:5
+#: ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7
+#: ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Suporte ? Alban?s"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5
+#: ../comps-f10.xml.in.h:6
+#: ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9
+#: ../comps-f13.xml.in.h:9
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplica??es"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6
+#: ../comps-f10.xml.in.h:7
+#: ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10
+#: ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplica??es para realizar uma variedade de tarefas"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7
+#: ../comps-f10.xml.in.h:8
+#: ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11
+#: ../comps-f13.xml.in.h:11
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Suporte ? ?rabe"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12
+#: ../comps-f13.xml.in.h:12
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Suporte ? Arm?nio"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:10
+#: ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13
+#: ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Suporte ? Assam?s"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10
+#: ../comps-f10.xml.in.h:11
+#: ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14
+#: ../comps-f13.xml.in.h:14
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Autoria e publica??o"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11
+#: ../comps-f10.xml.in.h:12
+#: ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16
+#: ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Base"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12
+#: ../comps-f10.xml.in.h:13
+#: ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17
+#: ../comps-f13.xml.in.h:17
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Sistema b?sico"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18
+#: ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Suporte b?sico ? linguagem de programa??o Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19
+#: ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Suporte ? Basco"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20
+#: ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Suporte ? Bielo-russo"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:17
+#: ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21
+#: ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Suporte ? Bengali"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17
[...2771 lines suppressed...]
 msgid "Applications for a variety of tasks"
 msgstr "Aplica??es para uma variedade de tarefas"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12
+#: ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Suporte ? rede dialup"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
-msgid ""
-"GNOME is a powerful, graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"O GNOME ? uma poderosa interface gr?fica que inclui um painel, uma ?rea de "
-"trabalho, ?cones de sistema e um gerenciador de arquivos gr?fico."
-
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
-msgid ""
-"KDE is a powerful, graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"O KDE ? uma poderosa interface gr?fica que inclui um painel, uma ?rea de "
-"trabalho, ?cones de sistema e um gerenciador de arquivos gr?fico."
-
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit files. These include Emacs and Vi."
-msgstr ""
-"Algumas vezes chamados de editores de texto, estes programas permitem criar "
-"e editar arquivos. Isto inclui o Emacs e o Vi."
+#: ../comps-el4.xml.in.h:22
+#: ../comps-el5.xml.in.h:24
+msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O GNOME ? uma poderosa interface gr?fica que inclui um painel, uma ?rea de trabalho, ?cones de sistema e um gerenciador de arquivos gr?fico."
+
+#: ../comps-el4.xml.in.h:35
+#: ../comps-el5.xml.in.h:36
+msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager."
+msgstr "O KDE ? uma poderosa interface gr?fica que inclui um painel, uma ?rea de trabalho, ?cones de sistema e um gerenciador de arquivos gr?fico."
+
+#: ../comps-el4.xml.in.h:44
+#: ../comps-el5.xml.in.h:45
+msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi."
+msgstr "Algumas vezes chamados de editores de texto, estes programas permitem criar e editar arquivos. Isto inclui o Emacs e o Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50
+#: ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "O editor de texto XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
-msgid ""
-"These tools allow you to create documentation in the DocBook format and "
-"convert them to HTML, PDF, Postscript, and text."
-msgstr ""
-"Estas ferramentas permitem criar documenta??o no formato DocBook e convert?-"
-"la para HTML, PDF, PostScript e texto."
+#: ../comps-el4.xml.in.h:54
+#: ../comps-el5.xml.in.h:53
+msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text."
+msgstr "Estas ferramentas permitem criar documenta??o no formato DocBook e convert?-la para HTML, PDF, PostScript e texto."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64
+#: ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
-msgstr ""
-"Este grupo ? uma cole??o de servidores de redes para prop?sitos espec?ficos."
+msgstr "Este grupo ? uma cole??o de servidores de redes para prop?sitos espec?ficos."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
-msgstr ""
-"Este grupo ? uma cole??o de ferramentas e recursos de ambientes ?rabes."
-
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
-msgstr ""
-"Este grupo ? uma cole??o de ferramentas e recursos de ambientes hebraicos."
-
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
-msgstr ""
-"Este grupo ? uma cole??o de ferramentas e recursos de ambientes japoneses."
+#: ../comps-el4.xml.in.h:65
+#: ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Arabic environments."
+msgstr "Este grupo ? uma cole??o de ferramentas e recursos de ambientes ?rabes."
+
+#: ../comps-el4.xml.in.h:67
+#: ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Hebrew environments."
+msgstr "Este grupo ? uma cole??o de ferramentas e recursos de ambientes hebraicos."
+
+#: ../comps-el4.xml.in.h:68
+#: ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
+msgstr "Este grupo ? uma cole??o de ferramentas e recursos de ambientes japoneses."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77
+#: ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
-msgstr ""
-"Este grupo ? uma cole??o de ferramentas e recursos de ambientes checos."
-
-#~ msgid "Perl Development"
-#~ msgstr "Desenvolvimento em Perl"
-
-#~ msgid "Support for developing programs in the Perl programming language."
-#~ msgstr ""
-#~ "Suporte ao desenvolvimento de programas na linguagem de programa??o Perl."
-
-#~ msgid "Haskell"
-#~ msgstr "Haskell"
-
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Czech environments."
+msgstr "Este grupo ? uma cole??o de ferramentas e recursos de ambientes checos."
+
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "O ambiente integrado de desenvolvimento Eclipse."
 #~ msgid "British Support"
 #~ msgstr "Suporte ? Bret?o"
-
 #~ msgid "Cluster Storage"
 #~ msgstr "Armazenamento em Clusters"
-
 #~ msgid "Clustering Support."
 #~ msgstr "Suporte a Clusters."
-
 #~ msgid "Libraries for applications built on older releases."
 #~ msgstr "Bibliotecas para aplica??es compiladas em vers?es anteriores."
-
 #~ msgid "Miscellaneous Included Packages"
 #~ msgstr "Pacotes Variados Inclu?dos"
-
 #~ msgid "Packages which provide support for cluster storage."
 #~ msgstr "Pacotes que fornecem suporte para o armazenamento em clusters."
-
 #~ msgid "Packages which provide support for single-node GFS."
 #~ msgstr "Pacotes que fornecem suporte para GFS de n? ?nico."
-
 #~ msgid "Single Node GFS Support"
 #~ msgstr "Suporte ao GFS de N? ?nico"
-
 #~ msgid "These packages provide compatibility support with previous releases."
 #~ msgstr "Estes pacotes fornecem compatibilidade com as vers?es anteriores."
-
 #~ msgid "Java Runtime Environments and Development Kits"
 #~ msgstr "Ambientes de Tempo de Execu??o e Kits de Desenvolvimento Java"
-
 #~ msgid "Misc"
 #~ msgstr "Variados"
-
 #~ msgid "Misc packages"
 #~ msgstr "Pacotes variados"
-
 #~ msgid "Multimedia"
 #~ msgstr "Multim?dia"
-
 #~ msgid "Multimedia applications"
 #~ msgstr "Aplica??es multim?dia"
-
 #~ msgid ""
 #~ "Packages which provide additional functionality for Red Hat Enterprise "
 #~ "Linux"
 #~ msgstr ""
 #~ "Pacotes que fornecem funcionalidades adicionais para o Red Hat Enterprise "
 #~ "Linux"
-
 #~ msgid "Red Hat Enterprise Linux Supplementary"
 #~ msgstr "Suplementos do Red Hat Enterprise Linux"
-
 #~ msgid ""
 #~ "Components used for high performance networking and clustering, such as "
 #~ "Infiniband and RDMA."
 #~ msgstr ""
 #~ "Componentes usados para redes e clusters de alta performance, como a "
 #~ "Infiniband e a RDMA."
-
 #~ msgid "OpenFabrics Enterprise Distribution"
 #~ msgstr "Distribui??o do OpenFabrics Enterprise"
-
 #~ msgid "Virtualization Support."
 #~ msgstr "Suporte ? Virtualiza??o."
+



From caillon at fedoraproject.org  Sat Aug 29 23:24:30 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Sat, 29 Aug 2009 23:24:30 +0000 (UTC)
Subject: rpms/PackageKit/devel PackageKit-0.5.2-pkaction.patch, NONE,
	1.1 PackageKit.spec, 1.112, 1.113
Message-ID: <20090829232430.3412911C009F@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32279

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.5.2-pkaction.patch 
Log Message:
* Sat Aug 29 2009 Christopher Aillon <caillon at redhat.com> - 0.5.2-0.2.20090824git
- Fix build against polkit, rebuild against newer libnm_glib


PackageKit-0.5.2-pkaction.patch:
 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE PackageKit-0.5.2-pkaction.patch ---
>From 8eaf47db02668c5bb243a1442438894790ad7033 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon at redhat.com>
Date: Sat, 29 Aug 2009 12:00:01 -0700
Subject: [PATCH] Use correct configure test for newer polkit

s/polkit-action/pkaction/
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 066b8a1..7b03a63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,7 +588,7 @@ AC_ARG_WITH([security_framework],
 			   [Default security framework to use polkit,dummy]))
 # try and guess this if nothing is listed
 if test x$with_security_framework = x; then
-	if test -f /usr/bin/polkit-action ; then
+	if test -f /usr/bin/pkaction ; then
 		with_security_framework=polkit
 	else
 		AC_MSG_ERROR([--with-security-framework explicitly required when not using PolicyKit or RBAC])
-- 
1.6.4



Index: PackageKit.spec
===================================================================
RCS file: /cvs/extras/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- PackageKit.spec	24 Aug 2009 13:49:27 -0000	1.112
+++ PackageKit.spec	29 Aug 2009 23:24:29 -0000	1.113
@@ -10,7 +10,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.2
-Release:   0.1.%{?alphatag}git%{?dist}
+Release:   0.2.%{?alphatag}git%{?dist}
 #Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -25,6 +25,10 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendo
 # Fedora specific: the yum backend doesn't do time estimation correctly
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
+# http://bugs.freedesktop.org/show_bug.cgi?id=23592
+Patch2:    PackageKit-0.5.2-pkaction.patch
+BuildRequires: autoconf
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -240,6 +244,10 @@ user to restart the computer or remove a
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 
+# http://bugs.freedesktop.org/show_bug.cgi?id=23592
+%patch2 -p1 -b .pkaction
+autoreconf
+
 %build
 %configure --disable-static --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
 
@@ -436,6 +444,9 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Sat Aug 29 2009 Christopher Aillon <caillon at redhat.com> - 0.5.2-0.2.20090824git
+- Fix build against polkit, rebuild against newer libnm_glib
+
 * Mon Aug 24 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.2-0.1.20090824git
 - Update to a newer git snapshot from the 0.5.x series.
 - Enable GUdev functionality and create a device-rebind subpackage.



From epienbro at fedoraproject.org  Sat Aug 29 23:28:55 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 29 Aug 2009 23:28:55 +0000 (UTC)
Subject: rpms/mingw32-libssh2/devel mingw32-libssh2.spec,1.2,1.3
Message-ID: <20090829232855.5F26811C009F@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv596

Modified Files:
	mingw32-libssh2.spec 
Log Message:
* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1-3
- Rebuild for new mingw32-openssl
- Automatically generate debuginfo subpackage



Index: mingw32-libssh2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libssh2/devel/mingw32-libssh2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-libssh2.spec	25 Jul 2009 14:25:22 -0000	1.2
+++ mingw32-libssh2.spec	29 Aug 2009 23:28:55 -0000	1.3
@@ -3,10 +3,11 @@
 %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-libssh2
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows library implementation of the SSH2 protocol
 
 License:        BSD
@@ -17,7 +18,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 33
+BuildRequires:  mingw32-filesystem >= 49
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-openssl
@@ -41,6 +42,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows SSH2 library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libssh2-%{version}
 
@@ -77,7 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libssh2.a
 
+
 %changelog
+* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1-4
+- Rebuild for new mingw32-openssl
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From caillon at fedoraproject.org  Sat Aug 29 23:59:28 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Sat, 29 Aug 2009 23:59:28 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.38,1.39
Message-ID: <20090829235928.A348A11C009F@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9224

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
No need to move the icons anymore, the build installs them to the right place now.
Also, this now has help files, so find those too.



Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- krb5-auth-dialog.spec	29 Aug 2009 16:49:32 -0000	1.38
+++ krb5-auth-dialog.spec	29 Aug 2009 23:59:28 -0000	1.39
@@ -42,10 +42,8 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/icons \
-    $RPM_BUILD_ROOT%{_datadir}/icons
 
-%find_lang %name
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From kalev at fedoraproject.org  Sun Aug 30 00:53:21 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sun, 30 Aug 2009 00:53:21 +0000 (UTC)
Subject: rpms/mingw32-openssl/devel
	mingw32-openssl-1.0.0-beta3-libversion.patch, 1.2,
	1.3 mingw32-openssl.spec, 1.10, 1.11
Message-ID: <20090830005321.F108A11C009F@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21502

Modified Files:
	mingw32-openssl-1.0.0-beta3-libversion.patch 
	mingw32-openssl.spec 
Log Message:
Simplified the lib renaming patch


mingw32-openssl-1.0.0-beta3-libversion.patch:
 Makefile.org    |    4 ++--
 Makefile.shared |   12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

Index: mingw32-openssl-1.0.0-beta3-libversion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl-1.0.0-beta3-libversion.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-openssl-1.0.0-beta3-libversion.patch	29 Aug 2009 23:13:34 -0000	1.2
+++ mingw32-openssl-1.0.0-beta3-libversion.patch	30 Aug 2009 00:53:20 -0000	1.3
@@ -24,20 +24,16 @@ diff -up openssl-1.0.0-beta3/Makefile.sh
  
  # LIBCOMPATVERSIONS contains the compatibility versions (a list) of
  # the library.  They MUST be in decreasing order.
-@@ -250,9 +250,9 @@ link_o.cygwin:
+@@ -250,7 +250,7 @@ link_o.cygwin:
  	base=-Wl,--enable-auto-image-base; \
  	deffile=; \
  	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 -		SHLIB=$(LIBNAME)eay32; base=; \
--		if test -f $(LIBNAME)eay32.def; then \
--			deffile=$(LIBNAME)eay32.def; \
 +		SHLIB=lib$(LIBNAME); base=; \
-+		if test -f $(LIBNAME).def; then \
-+			deffile=$(LIBNAME).def; \
+ 		if test -f $(LIBNAME)eay32.def; then \
+ 			deffile=$(LIBNAME)eay32.def; \
  		fi; \
- 	fi; \
- 	SHLIB_SUFFIX=.dll; \
-@@ -270,13 +270,9 @@ link_a.cygwin:
+@@ -270,13 +270,7 @@ link_a.cygwin:
  	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
  	base=-Wl,--enable-auto-image-base; \
  	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
@@ -46,21 +42,9 @@ diff -up openssl-1.0.0-beta3/Makefile.sh
 -			ssl) SHLIB=ssleay;; \
 -		esac; \
 -		SHLIB_SOVER=32; \
-+		SHLIB=lib$(LIBNAME); \
- 		extras="$(LIBNAME).def"; \
+-		extras="$(LIBNAME).def"; \
 -		$(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
-+		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; \
++		SHLIB=lib$(LIBNAME); \
  		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
  	fi; \
  	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
---- openssl-1.0.0-beta3/util/mkdef.pl.orig	2009-08-30 00:50:32.108820466 +0200
-+++ openssl-1.0.0-beta3/util/mkdef.pl	2009-08-30 00:51:00.032820656 +0200
-@@ -1244,7 +1244,7 @@
- 	my $description = "$what $version, $name - http://$http_vendor";
- 
- 	if ($W32)
--		{ $libname.="32"; }
-+		{ $libname="lib$libname-10.dll"; }
- 	elsif ($W16)
- 		{ $libname.="16"; }
- 	elsif ($OS2)


Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-openssl.spec	29 Aug 2009 23:13:34 -0000	1.10
+++ mingw32-openssl.spec	30 Aug 2009 00:53:20 -0000	1.11
@@ -31,7 +31,7 @@
 
 Name:           mingw32-openssl
 Version:        1.0.0
-Release:        0.2.%{beta}%{?dist}
+Release:        0.3.%{beta}%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -347,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.3.beta3
+- Simplified the lib renaming patch
+
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.2.beta3
 - Fixed invalid RPM Provides
  



From transif at fedoraproject.org  Sun Aug 30 01:06:13 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 30 Aug 2009 01:06:13 +0000 (UTC)
Subject: comps/po ja.po,1.24,1.25
Message-ID: <20090830010613.1DD3611C009F@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26137/po

Modified Files:
	ja.po 
Log Message:
Sending translation for Japanese


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.24 -r 1.25 ja.poIndex: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ja.po	2 Aug 2009 01:59:09 -0000	1.24
+++ ja.po	30 Aug 2009 01:06:12 -0000	1.25
@@ -12,288 +12,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-08-02 10:57+0900\n"
-"Last-Translator: Hyu_gabaru Ryu_ichi <hyu_gabaru at yahoo.co.jp>\n"
+"POT-Creation-Date: 2009-08-29 19:06+0000\n"
+"PO-Revision-Date: 2009-08-30 10:03+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
 "Language-Team: Japanese <jp at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "??????????????????????????????"
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "?????????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "????????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "???"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ???????????????????"
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "????????????????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "????????????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Buildsystem ???????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
[...1911 lines suppressed...]
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1419,7 +1513,8 @@ msgstr ""
 "32 bit Windows ????????????????????????? ?????"
 "??????????????"
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1427,15 +1522,18 @@ msgstr ""
 "?????? CAML ????????????????????????????? "
 "????"
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "??????????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "??????????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1443,23 +1541,83 @@ msgstr ""
 "????????????????????????????????? ?????"
 "?????????"
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "???????????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "???????????"
 
+#: ../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 "GNOME ???????? Critical Path ??????????????????"
+
+#: ../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 ""
+"??? Fedora ??????? Critical Path ??????????????? "
+"???????????????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ?????????????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (??)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "??????????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE ????????????????????????????????????????? "
+"??????????????????? X11 ???????????"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "???????????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ????????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ? NetBook/NetTop/MID ????????????????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "?????????????????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1467,7 +1625,7 @@ msgstr ""
 "GNOME???????????????????????????????????"
 "???????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1475,7 +1633,7 @@ msgstr ""
 "KDE???????????????????????????????????"
 "????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1483,11 +1641,11 @@ msgstr ""
 "??????????????????????????????????????"
 "??????????????? Emacs ? Vi ????????"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ???????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1495,30 +1653,27 @@ msgstr ""
 "??????????????DocBook ????????????? HTML?PDF?"
 "Postscript??????????????????????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "????????????????????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??????????????????????????????"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "??????????????????????????????"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????????????????????????????"
+



From kalev at fedoraproject.org  Sun Aug 30 01:28:52 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sun, 30 Aug 2009 01:28:52 +0000 (UTC)
Subject: rpms/mingw32-opensc/devel mingw32-opensc.spec,1.4,1.5
Message-ID: <20090830012852.7DDEC11C009F@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3257

Modified Files:
	mingw32-opensc.spec 
Log Message:
0.11.8-4



Index: mingw32-opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-opensc/devel/mingw32-opensc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-opensc.spec	23 Aug 2009 19:33:39 -0000	1.4
+++ mingw32-opensc.spec	30 Aug 2009 01:28:52 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:           mingw32-opensc
 Version:        0.11.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MingGW Windows OpenSC library
 
 Group:          Development/Libraries
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.8-4
+- Rebuilt with new mingw32-openssl
+
 * Sun Aug 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.11.8-3
 - Automatically generate debuginfo subpackage
 



From kalev at fedoraproject.org  Sun Aug 30 01:30:20 2009
From: kalev at fedoraproject.org (Kalev Lember)
Date: Sun, 30 Aug 2009 01:30:20 +0000 (UTC)
Subject: rpms/mingw32-libp11/devel mingw32-libp11.spec,1.4,1.5
Message-ID: <20090830013020.8072911C0496@cvs1.fedora.phx.redhat.com>

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3978

Modified Files:
	mingw32-libp11.spec 
Log Message:
0.2.6-3



Index: mingw32-libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libp11/devel/mingw32-libp11.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libp11.spec	23 Aug 2009 19:35:20 -0000	1.4
+++ mingw32-libp11.spec	30 Aug 2009 01:30:20 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:           mingw32-libp11
 Version:        0.2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MingGW Windows libp11 library
 
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-3
+- Rebuilt with new mingw32-openssl
+
 * Sun Aug 23 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.6-2
 - Automatically generate debuginfo subpackage
 



From gavin at fedoraproject.org  Sun Aug 30 01:39:16 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Sun, 30 Aug 2009 01:39:16 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.5, 1.6 etoys.spec, 1.6, 1.7 sources, 
	1.5, 1.6
Message-ID: <20090830013916.E127A11C009F@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8429

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2247



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 03:36:10 -0000	1.5
+++ .cvsignore	30 Aug 2009 01:39:16 -0000	1.6
@@ -1 +1 @@
-etoys-4.0.2229.tar.gz
+etoys-4.0.2247.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- etoys.spec	12 Aug 2009 03:36:10 -0000	1.6
+++ etoys.spec	30 Aug 2009 01:39:16 -0000	1.7
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2229
+%define version 4.0.2247
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sat Aug 29 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2247-1
+- pulled in latest upstream release 4.0.2247
+
 * Tue Aug 11 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2229-1
 - pulled in latest upstream release 4.0.2229
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 03:36:10 -0000	1.5
+++ sources	30 Aug 2009 01:39:16 -0000	1.6
@@ -1 +1 @@
-0f0e543c44b9e1b1e1fce763db04b9f6  etoys-4.0.2229.tar.gz
+2c1798f176fdf1d5446916a8194ba771  etoys-4.0.2247.tar.gz



From gavin at fedoraproject.org  Sun Aug 30 01:59:51 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Sun, 30 Aug 2009 01:59:51 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.5, 1.6 etoys.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20090830015951.4978C11C009F@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15373

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2247



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 03:43:49 -0000	1.5
+++ .cvsignore	30 Aug 2009 01:59:50 -0000	1.6
@@ -1 +1 @@
-etoys-4.0.2229.tar.gz
+etoys-4.0.2247.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- etoys.spec	12 Aug 2009 03:43:49 -0000	1.5
+++ etoys.spec	30 Aug 2009 01:59:50 -0000	1.6
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2229
+%define version 4.0.2247
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sat Aug 29 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2247-1
+- pulled in latest upstream release 4.0.2247
+
 * Tue Aug 11 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2229-1
 - pulled in latest upstream release 4.0.2229
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 03:43:49 -0000	1.5
+++ sources	30 Aug 2009 01:59:51 -0000	1.6
@@ -1 +1 @@
-0f0e543c44b9e1b1e1fce763db04b9f6  etoys-4.0.2229.tar.gz
+2c1798f176fdf1d5446916a8194ba771  etoys-4.0.2247.tar.gz



From gavin at fedoraproject.org  Sun Aug 30 02:12:19 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Sun, 30 Aug 2009 02:12:19 +0000 (UTC)
Subject: rpms/etoys/F-10 .cvsignore, 1.5, 1.6 etoys.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090830021219.952A911C0371@cvs1.fedora.phx.redhat.com>

Author: gavin

Update of /cvs/pkgs/rpms/etoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18173

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2247



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2009 03:51:17 -0000	1.5
+++ .cvsignore	30 Aug 2009 02:12:17 -0000	1.6
@@ -1 +1 @@
-etoys-4.0.2229.tar.gz
+etoys-4.0.2247.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/etoys.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- etoys.spec	12 Aug 2009 03:51:17 -0000	1.4
+++ etoys.spec	30 Aug 2009 02:12:17 -0000	1.5
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2229
+%define version 4.0.2247
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sat Aug 29 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2247-1
+- pulled in latest upstream release 4.0.2247
+
 * Tue Aug 11 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2229-1
 - pulled in latest upstream release 4.0.2229
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 03:51:17 -0000	1.5
+++ sources	30 Aug 2009 02:12:18 -0000	1.6
@@ -1 +1 @@
-0f0e543c44b9e1b1e1fce763db04b9f6  etoys-4.0.2229.tar.gz
+2c1798f176fdf1d5446916a8194ba771  etoys-4.0.2247.tar.gz



From deji at fedoraproject.org  Sun Aug 30 02:40:46 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 30 Aug 2009 02:40:46 +0000 (UTC)
Subject: rpms/tracker/devel tracker.spec,1.55,1.56
Message-ID: <20090830024046.B4C4211C009F@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24901

Modified Files:
	tracker.spec 
Log Message:
* Sat Aug 29 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.95-4
- Explicitly require apps needed in the text filters of common documents (Fedora bug #517930)



Index: tracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- tracker.spec	27 Jul 2009 06:13:37 -0000	1.55
+++ tracker.spec	30 Aug 2009 02:40:46 -0000	1.56
@@ -1,7 +1,7 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
 Version:	0.6.95
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://projects.gnome.org/tracker/
@@ -19,6 +19,8 @@ BuildRequires:	desktop-file-utils, intlt
 BuildRequires:	sqlite-devel, qdbm-devel, pygtk2-devel, libtiff-devel
 BuildRequires:	autoconf, automake, libtool
 
+Requires:	w3m, wv, odt2txt
+
 %description
 Tracker is a powerful desktop-neutral first class object database,
 tag/metadata database, search tool and indexer. 
@@ -159,6 +161,9 @@ fi
 %{_mandir}/man1/tracker-search-tool.1.gz
 
 %changelog
+* Sat Aug 29 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.95-4
+- Explicitly require apps needed in the text filters of common documents (Fedora bug #517930)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.95-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hoangelos at fedoraproject.org  Sun Aug 30 03:05:14 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Sun, 30 Aug 2009 03:05:14 +0000 (UTC)
Subject: rpms/python-werkzeug/F-10 import.log, NONE, 1.1 python-werkzeug.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090830030514.CC33411C009F@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-werkzeug/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28589/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-werkzeug.spec 
Log Message:
initial import for F-10



--- NEW FILE import.log ---
python-werkzeug-0_5_1-1_fc10:F-10:python-werkzeug-0.5.1-1.fc10.src.rpm:1251601474


--- NEW FILE python-werkzeug.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname Werkzeug

Name:           python-werkzeug
Version:        0.5.1
Release:        1%{?dist}
Summary:        The Swiss Army knife of Python web development 

Group:          Development/Libraries
License:        BSD
URL:            http://werkzeug.pocoo.org/
Source0:        http://pypi.python.org/packages/source/W/Werkzeug/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-nose
BuildRequires:  python-setuptools-devel

%description
Werkzeug
========

Werkzeug started as simple collection of various utilities for WSGI
applications and has become one of the most advanced WSGI utility
modules.  It includes a powerful debugger, full featured request and
response objects, HTTP utilities to handle entity tags, cache control
headers, HTTP dates, cookie handling, file uploads, a powerful URL
routing system and a bunch of community contributed addon modules.

Werkzeug is unicode aware and doesn't enforce a specific template
engine, database adapter or anything else.  It doesn't even enforce
a specific way of handling requests and leaves all that up to the
developer. It's most useful for end user applications which should work
on as many server environments as possible (such as blogs, wikis,
bulletin boards, etc.).

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description doc
Documentation and examples for %{name}.

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i 's/\r//' LICENSE
%{__sed} -i 's/\r//' docs/makearchive.py
%{__sed} -i 's/\r//' docs/_build/html/_static/pygments.css
%{__sed} -i 's/\r//' docs/_build/html/objects.inv
%{__sed} -i 's/\r//' PKG-INFO

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__rm} -rf docs/_build/html/.buildinfo

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE PKG-INFO CHANGES
%{python_sitelib}/*

%files doc
%defattr(-,root,root,-)
%doc docs/_build/html examples

%changelog
* Tue Aug 25 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.5.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:28:46 -0000	1.1
+++ .cvsignore	30 Aug 2009 03:05:12 -0000	1.2
@@ -0,0 +1 @@
+Werkzeug-0.5.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:28:46 -0000	1.1
+++ sources	30 Aug 2009 03:05:12 -0000	1.2
@@ -0,0 +1 @@
+620955f34b8424c92674fe76d5c47679  Werkzeug-0.5.1.zip



From deji at fedoraproject.org  Sun Aug 30 03:07:26 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 30 Aug 2009 03:07:26 +0000 (UTC)
Subject: rpms/tracker/F-11 tracker.spec,1.52,1.53
Message-ID: <20090830030726.5289511C009F@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28983

Modified Files:
	tracker.spec 
Log Message:
* Sat Aug 29 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.95-2
- Explicitly require apps needed in the text filters of common documents (Fedora bug #517930)
- Ship the manpages in the appropriate sub-packages (Fedora bug #479278)



Index: tracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tracker/F-11/tracker.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- tracker.spec	29 May 2009 12:46:46 -0000	1.52
+++ tracker.spec	30 Aug 2009 03:07:26 -0000	1.53
@@ -1,7 +1,7 @@
 Summary:	An object database, tag/metadata database, search tool and indexer
 Name:		tracker
 Version:	0.6.95
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://projects.gnome.org/tracker/
@@ -19,6 +19,8 @@ BuildRequires:	desktop-file-utils, intlt
 BuildRequires:	sqlite-devel, qdbm-devel, pygtk2-devel, libtiff-devel
 BuildRequires:	autoconf, automake, libtool
 
+Requires:	w3m, wv, odt2txt
+
 %description
 Tracker is a powerful desktop-neutral first class object database,
 tag/metadata database, search tool and indexer. 
@@ -131,6 +133,9 @@ fi
 #%{evo_plugins_dir}/liborg-freedesktop-Tracker-evolution-plugin.so
 #%{evo_plugins_dir}/org-freedesktop-Tracker-evolution-plugin.eplug
 %{_mandir}/*/tracker*.gz
+%exclude %{_mandir}/man1/tracker-applet.1.gz
+%exclude %{_mandir}/man1/tracker-preferences.1.gz
+%exclude %{_mandir}/man1/tracker-search-tool.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
 %{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf
 %doc %{_datadir}/gtk-doc/html/libtracker-common/
@@ -152,8 +157,15 @@ fi
 %{_datadir}/icons/*/*/apps/tracker.*
 %{_datadir}/applications/*.desktop
 %{_sysconfdir}/xdg/autostart/tracker-applet.desktop
+%{_mandir}/man1/tracker-applet.1.gz
+%{_mandir}/man1/tracker-preferences.1.gz
+%{_mandir}/man1/tracker-search-tool.1.gz
 
 %changelog
+* Sat Aug 29 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.95-2
+- Explicitly require apps needed in the text filters of common documents (Fedora bug #517930)
+- Ship the manpages in the appropriate sub-packages (Fedora bug #479278)
+
 * Fri May 22 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.95-1
 - Update to 0.6.95 release
 



From jcollie at fedoraproject.org  Sun Aug 30 03:30:28 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 30 Aug 2009 03:30:28 +0000 (UTC)
Subject: rpms/pitivi/devel .cvsignore, 1.17, 1.18 pitivi.spec, 1.38,
	1.39 sources, 1.17, 1.18
Message-ID: <20090830033028.6556B11C00EE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32272

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2.2-0.1
- Update to prerelease for 0.13.3
- Streamline BuildRequires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	19 Aug 2009 15:05:30 -0000	1.17
+++ .cvsignore	30 Aug 2009 03:30:27 -0000	1.18
@@ -1 +1 @@
-pitivi-0.13.2.tar.bz2
+pitivi-0.13.2.2.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- pitivi.spec	19 Aug 2009 15:05:30 -0000	1.38
+++ pitivi.spec	30 Aug 2009 03:30:28 -0000	1.39
@@ -1,8 +1,8 @@
 %define major   0.13
-%define minor   2
+%define minor   2.2
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        2%{?dist}
+Release:        0.1%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -12,30 +12,31 @@ Source0:        http://ftp.gnome.org/pub
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       gnonlin >= 0.10.12
+Requires:       gnonlin >= 0.10.12.2
 Requires:       gstreamer-python >= 0.10.16
 Requires:       gstreamer >= 0.10.24
 Requires:       gstreamer-plugins-base >= 0.10.24
 Requires:       pygtk2 >= 2.14.0
 Requires:       python-zope-interface
-Requires:       python-setuptools
 Requires:       pygoocanvas
 
-BuildRequires:  gnonlin >= 0.10.12
-BuildRequires:  gstreamer-python >= 0.10.16
-BuildRequires:  gstreamer-devel >= 0.10.24
-BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
-BuildRequires:  GConf2-devel
-BuildRequires:  gtk2-devel >= 2.8
-BuildRequires:  pygtk2-devel >= 2.14.0
-BuildRequires:  pygtk2-libglade >= 2.14.0
-BuildRequires:  gtk-doc
-BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils
-BuildRequires:  gnome-python2
-BuildRequires:  perl(XML::Parser)
-BuildRequires:  gettext
 BuildRequires:  intltool => 0.35.0
+BuildRequires:  python-setuptools
+
+#BuildRequires:  gnonlin >= 0.10.12.2
+#BuildRequires:  gstreamer-python >= 0.10.16
+#BuildRequires:  gstreamer-devel >= 0.10.24
+#BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
+#BuildRequires:  GConf2-devel
+#BuildRequires:  gtk2-devel >= 2.8
+#BuildRequires:  pygtk2-devel >= 2.14.0
+#BuildRequires:  pygtk2-libglade >= 2.14.0
+#BuildRequires:  gtk-doc
+#BuildRequires:  pkgconfig
+#BuildRequires:  gnome-python2
+#BuildRequires:  perl(XML::Parser)
+#BuildRequires:  gettext
 
 %description
 Pitivi is an application using the GStreamer multimedia framework to
@@ -80,6 +81,10 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2.2-0.1
+- Update to prerelease for 0.13.3
+- Streamline BuildRequires
+
 * Fri Aug 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-2
 - Bump required version of gstreamer-python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	19 Aug 2009 15:05:30 -0000	1.17
+++ sources	30 Aug 2009 03:30:28 -0000	1.18
@@ -1 +1 @@
-bb5053faf283fd5ba1f77fce50143184  pitivi-0.13.2.tar.bz2
+aeffb61cfed1c216798312e51ca2bac9  pitivi-0.13.2.2.tar.bz2



From jcollie at fedoraproject.org  Sun Aug 30 03:38:12 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 30 Aug 2009 03:38:12 +0000 (UTC)
Subject: rpms/pitivi/F-11 .cvsignore, 1.17, 1.18 pitivi.spec, 1.39,
	1.40 sources, 1.17, 1.18
Message-ID: <20090830033812.CDB3111C009F@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv806

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2.2-0.1
- Update to prerelease for 0.13.3
- Streamline BuildRequires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	13 Aug 2009 18:30:40 -0000	1.17
+++ .cvsignore	30 Aug 2009 03:38:12 -0000	1.18
@@ -1 +1 @@
-pitivi-0.13.2.tar.bz2
+pitivi-0.13.2.2.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/pitivi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- pitivi.spec	14 Aug 2009 20:12:53 -0000	1.39
+++ pitivi.spec	30 Aug 2009 03:38:12 -0000	1.40
@@ -1,8 +1,8 @@
 %define major   0.13
-%define minor   2
+%define minor   2.2
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        2%{?dist}
+Release:        0.1%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -12,30 +12,31 @@ Source0:        http://ftp.gnome.org/pub
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       gnonlin >= 0.10.12
+Requires:       gnonlin >= 0.10.12.2
 Requires:       gstreamer-python >= 0.10.16
 Requires:       gstreamer >= 0.10.24
 Requires:       gstreamer-plugins-base >= 0.10.24
 Requires:       pygtk2 >= 2.14.0
 Requires:       python-zope-interface
-Requires:       python-setuptools
 Requires:       pygoocanvas
 
-BuildRequires:  gnonlin >= 0.10.12
-BuildRequires:  gstreamer-python >= 0.10.16
-BuildRequires:  gstreamer-devel >= 0.10.24
-BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
-BuildRequires:  GConf2-devel
-BuildRequires:  gtk2-devel >= 2.8
-BuildRequires:  pygtk2-devel >= 2.14.0
-BuildRequires:  pygtk2-libglade >= 2.14.0
-BuildRequires:  gtk-doc
-BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils
-BuildRequires:  gnome-python2
-BuildRequires:  perl(XML::Parser)
-BuildRequires:  gettext
 BuildRequires:  intltool => 0.35.0
+BuildRequires:  python-setuptools
+
+#BuildRequires:  gnonlin >= 0.10.12.2
+#BuildRequires:  gstreamer-python >= 0.10.16
+#BuildRequires:  gstreamer-devel >= 0.10.24
+#BuildRequires:  gstreamer-plugins-base-devel >= 0.10.24
+#BuildRequires:  GConf2-devel
+#BuildRequires:  gtk2-devel >= 2.8
+#BuildRequires:  pygtk2-devel >= 2.14.0
+#BuildRequires:  pygtk2-libglade >= 2.14.0
+#BuildRequires:  gtk-doc
+#BuildRequires:  pkgconfig
+#BuildRequires:  gnome-python2
+#BuildRequires:  perl(XML::Parser)
+#BuildRequires:  gettext
 
 %description
 Pitivi is an application using the GStreamer multimedia framework to
@@ -80,6 +81,10 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Sat Aug 29 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2.2-0.1
+- Update to prerelease for 0.13.3
+- Streamline BuildRequires
+
 * Fri Aug 14 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.2-2
 - Bump required version of gstreamer-python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	13 Aug 2009 18:30:40 -0000	1.17
+++ sources	30 Aug 2009 03:38:12 -0000	1.18
@@ -1 +1 @@
-bb5053faf283fd5ba1f77fce50143184  pitivi-0.13.2.tar.bz2
+aeffb61cfed1c216798312e51ca2bac9  pitivi-0.13.2.2.tar.bz2



From deji at fedoraproject.org  Sun Aug 30 03:40:38 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 30 Aug 2009 03:40:38 +0000 (UTC)
Subject: rpms/mpich2/EL-4 .cvsignore, 1.2, 1.3 mpich2.spec, 1.3, 1.4 sources,
	1.2, 1.3 mpich2-1.0.8-rpmbuild.patch, 1.1, NONE mpich2.module.in,
	1.1, NONE
Message-ID: <20090830034038.575A411C0496@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1216

Modified Files:
	.cvsignore mpich2.spec sources 
Removed Files:
	mpich2-1.0.8-rpmbuild.patch mpich2.module.in 
Log Message:
* Sat Aug 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Mar 2009 12:48:04 -0000	1.2
+++ .cvsignore	30 Aug 2009 03:40:37 -0000	1.3
@@ -1 +1 @@
-mpich2-1.0.8.tar.gz
+mpich2-1.1.1p1.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-4/mpich2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mpich2.spec	19 Mar 2009 11:39:10 -0000	1.3
+++ mpich2.spec	30 Aug 2009 03:40:38 -0000	1.4
@@ -1,18 +1,17 @@
-Summary:	An implementation of MPI
+Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.0.8
-Release:	4%{?dist}
+Version:	1.1.1p1
+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
-Source1:	mpich2.module.in
-Patch0:		mpich2-%{version}-rpmbuild.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXt-devel, e2fsprogs-devel
-BuildRequires:	java-devel, gcc-gfortran
+BuildRequires:	xorg-x11-devel, e2fsprogs-devel
+BuildRequires:	gcc-g77 gcc4-gfortran
 BuildRequires:	emacs-common, perl, python
-Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	%{name}-libs < 1.1.1
+Requires:	environment-modules
 Requires:	python
 Requires(post):	chkconfig
 Requires(preun):chkconfig
@@ -39,49 +38,42 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gcc-gfortran
-Requires(post): chkconfig
-Requires(preun):chkconfig
+Requires(post):	/usr/sbin/alternatives
+Requires(preun):/usr/sbin/alternatives
+Requires(posttrans):/usr/sbin/alternatives
 
 %description devel
 Contains development headers and libraries for mpich2
 
-%package libs
-Summary:	Libraries and configuration files for mpich2
-Group:		Development/Libraries
-
-%description libs
-Contains the arch dependent libraries and their build configuration for mpich2
-
 # We only compile with gcc, but other people may want other compilers.
 # Set the compiler here.
-%{!?opt_cc: %define opt_cc gcc}
-%{!?opt_fc: %define opt_fc gfortran}
+%{!?opt_cc: %global opt_cc gcc}
+%{!?opt_fc: %global opt_fc g77}
 # Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
 # so uncomment and undefine to NOT use
-%{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}}
-%{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}}
+%{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
+%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
 
 %ifarch %{ix86} x86_64
-%define selected_channels ch3:nemesis
+%global selected_channels ch3:nemesis
 %else
-%define selected_channels ch3:sock 
+%global selected_channels ch3:sock
 %endif
 
 %ifarch x86_64 ia64 ppc64 s390x sparc64
-%define mode 64
-%define priority 41
+%global mode 64
+%global priority 41
 %else
-%define mode 32
-%define priority 40
+%global mode 32
+%global priority 40
 %endif
 
 %ifarch x86_64
-%define XFLAGS -fPIC
+%global XFLAGS -fPIC
 %endif
 
 %prep
 %setup -q
-%patch0 -p0 -b .build
 
 %configure	\
 	--enable-sharedlibs=gcc					\
@@ -92,9 +84,8 @@ Contains the arch dependent libraries an
 	--datadir=%{_datadir}/%{name}				\
 	--docdir=%{_docdir}/%{name}-%{version}			\
 	--htmldir=%{_docdir}/%{name}-%{version}/www		\
-	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
-	F90=%{opt_fc} 						\
-	F77=%{opt_fc}						\
+	F90=gfortran						\
+	F77=g77							\
 	CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}"			\
 	CXXFLAGS="%{optflags} %{?XFLAGS}"			\
 	F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
@@ -114,27 +105,41 @@ rm -f %{buildroot}%{_bindir}/{mpiexec,mp
 mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
 pushd  %{buildroot}%{_bindir}/
 ln -s mpiexec.py mpdrun
+touch mpiexec
+touch mpirun
+rm -f mpic++
+touch mpic++
 popd
 for b in mpicxx mpicc mpif77 mpif90; do 
   mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
+  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
+## 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
-for ex in mpiexec mpirun; do 
-  ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$ex
+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}/
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
 
-## Create modules file
-sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > %{buildroot}%{_datadir}/%{name}/%{name}.module
-#:;
+#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
+
+# Adjust the default 'environment module' PATH for our changes
+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}
 
 # Manually copy doc file here instead of the %files section to prevent the rpm
 #build script from throwing the other things in there out
@@ -161,6 +166,9 @@ find %{buildroot} -type f -name "*.la" -
 rm -rf %{buildroot}
 
 %post
+
+/sbin/ldconfig
+
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
 	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
@@ -173,7 +181,24 @@ if [ $1 -eq 1 ] ; then
 			%{_mandir}/man1/mp-mpif77.1.gz		\
 	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man		\
 			%{_mandir}/man1/mp-mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpic++.1.gz mpic++-man		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
+			%{_mandir}/man1/mp-mpicxx.1.gz
+fi
+
+%posttrans
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	\
+	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
+	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
+	--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
 fi
 
@@ -182,11 +207,24 @@ if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py
 fi
 
+%postun -p /sbin/ldconfig
+
 %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
+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
 fi
@@ -199,51 +237,61 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
+%dir %{_libdir}/%{name}
+%{_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}/mp%{mode}-mpicc
-%exclude %{_bindir}/mp%{mode}-mpicxx
-%exclude %{_bindir}/mp%{mode}-mpif90
-%exclude %{_bindir}/mp%{mode}-mpif77
+%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}/
-%{_mandir}/man1/*
+%doc %{_datadir}/%{name}/doc/
+%{_mandir}/man1/mp-*.1.gz
 %if 0%{?fedora} < 11
 %exclude %{_bindir}/mp*.pyc
 %exclude %{_bindir}/mp*.pyo
 %endif
-
-%files libs
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.jar
-%{_libdir}/%{name}/mpe*.o
-%{_libdir}/%{name}/*.so.*
-%config %{_sysconfdir}/%{name}-%{mode}/
+%ghost %{_bindir}/mpiexec
+%ghost %{_bindir}/mpirun
+%ghost %{_mandir}/man1/mpi*.1.gz
+%ghost %{_mandir}/man1/MPI.1.gz
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/mp%{mode}-mpicc
-%{_bindir}/mp%{mode}-mpicxx
-%{_bindir}/mp%{mode}-mpif90
-%{_bindir}/mp%{mode}-mpif77
+%{_bindir}/mp%{mode}*
+%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
 %{_libdir}/pkgconfig/%{name}-ch3.pc
-%{_datadir}/%{name}/%{name}.module
+%{_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*
-%{_datadir}/%{name}/logfiles/
 %{_mandir}/man4/*.gz
-%doc README.testing README.romio README.developer
 
 %changelog
+* Sat Aug 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
+- New upstream version
+
+* Wed Jul 22 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1-1
+- Update to 1.1.1
+- Use g77 for the f77 binding
+- Remove java support (EL4's gcc-java not good enough)
+
 * Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-4
 - Fix un-owned directory (Fedora Bug #490270)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Mar 2009 12:48:04 -0000	1.2
+++ sources	30 Aug 2009 03:40:38 -0000	1.3
@@ -1 +1 @@
-d9dfb6e38d7ca6f8ad92a191a413ee57  mpich2-1.0.8.tar.gz
+cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz


--- mpich2-1.0.8-rpmbuild.patch DELETED ---


--- mpich2.module.in DELETED ---



From deji at fedoraproject.org  Sun Aug 30 04:00:05 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 30 Aug 2009 04:00:05 +0000 (UTC)
Subject: rpms/mpich2/EL-4 mpich2.spec,1.4,1.5
Message-ID: <20090830040005.E590911C0496@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4237

Modified Files:
	mpich2.spec 
Log Message:
The fedora conditional doesn't seem to work, remove it.



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-4/mpich2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mpich2.spec	30 Aug 2009 03:40:38 -0000	1.4
+++ mpich2.spec	30 Aug 2009 04:00:05 -0000	1.5
@@ -253,10 +253,8 @@ fi
 %doc %{_docdir}/%{name}-%{version}/
 %doc %{_datadir}/%{name}/doc/
 %{_mandir}/man1/mp-*.1.gz
-%if 0%{?fedora} < 11
 %exclude %{_bindir}/mp*.pyc
 %exclude %{_bindir}/mp*.pyo
-%endif
 %ghost %{_bindir}/mpiexec
 %ghost %{_bindir}/mpirun
 %ghost %{_mandir}/man1/mpi*.1.gz



From plindner at fedoraproject.org  Sun Aug 30 04:03:16 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Sun, 30 Aug 2009 04:03:16 +0000 (UTC)
Subject: rpms/memcached/devel .cvsignore, 1.7, 1.8 memcached.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20090830040316.B6FEA11C0263@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4896

Modified Files:
	.cvsignore memcached.spec sources 
Log Message:
update for 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 Jul 2009 17:46:41 -0000	1.7
+++ .cvsignore	30 Aug 2009 04:03:16 -0000	1.8
@@ -1 +1 @@
-memcached-1.4.0.tar.gz
+memcached-1.4.1.tar.gz


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/memcached.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- memcached.spec	22 Jul 2009 17:46:41 -0000	1.16
+++ memcached.spec	30 Aug 2009 04:03:16 -0000	1.17
@@ -6,7 +6,7 @@
 %define groupname  memcached
 
 Name:           memcached
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -207,6 +207,10 @@ fi
 %{_includedir}/memcached/*
 
 %changelog
+* 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
+
 * Wed Apr 29 2009 Paul Lindner <lindner at inuus.com> - 1.2.8-1
 - Upgrade to memcached-1.2.8
 - Addresses CVE-2009-1255


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Jul 2009 17:46:41 -0000	1.7
+++ sources	30 Aug 2009 04:03:16 -0000	1.8
@@ -1 +1 @@
-d7651ecb8bf345144cb17900d9a46c85  memcached-1.4.0.tar.gz
+fb1b7e9fcf47b95c5ad3bbeb76342088  memcached-1.4.1.tar.gz



From jwilson at fedoraproject.org  Sun Aug 30 04:11:16 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun, 30 Aug 2009 04:11:16 +0000 (UTC)
Subject: rpms/lirc/F-10 lirc.spec,1.49,1.50 sources,1.28,1.29
Message-ID: <20090830041116.F16BF11C0072@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26961

Modified Files:
	lirc.spec sources 
Log Message:
* Sun Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-2.fc10.0.8.4a
- Cheat and release an "update" to 0.8.4a, since 0.8.5 isn't
  compatible with the lirc kernel drivers in the 2.6.27.x kernel
  that F10 looks like it'll be stuck on its entire lifespan



Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-10/lirc.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- lirc.spec	28 May 2009 17:08:43 -0000	1.49
+++ lirc.spec	30 Aug 2009 04:11:16 -0000	1.50
@@ -18,20 +18,20 @@
 
 Name:           lirc
 Version:        0.8.5
-Release:        2%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}.0.8.4a
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-0.8.4a.tar.bz2
 #Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.5-standardized-remote-keycodes.patch
+Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -117,11 +117,11 @@ of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}
+%setup -q -n %{name}-0.8.4a
 %patch0 -p1
 
 chmod 644 contrib/*
-chmod +x contrib/hal
+#chmod +x contrib/hal
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
@@ -158,7 +158,7 @@ touch -r aclocal.m4 configure.ac # avoid
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
-chmod +x daemons/input_map.sh
+#chmod +x daemons/input_map.sh
 
 %build
 %configure \
@@ -265,6 +265,11 @@ fi
 
 
 %changelog
+* Sun Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-2.fc10.0.8.4a
+- Cheat and release an "update" to 0.8.4a, since 0.8.5 isn't
+  compatible with the lirc kernel drivers in the 2.6.27.x kernel
+  that F10 looks like it'll be stuck on its entire lifespan
+
 * Thu May 28 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-2
 - Update to lirc 0.8.5
 - Add irman support, now that libirman is in Fedora (#474992)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	28 May 2009 17:08:43 -0000	1.28
+++ sources	30 Aug 2009 04:11:16 -0000	1.29
@@ -1 +1 @@
-5a274e4eaff8156b17903c22ea01f506  lirc-0.8.5.tar.bz2
+606b714ed843d28060163ffc571fc1f7  lirc-0.8.4a.tar.bz2



From deji at fedoraproject.org  Sun Aug 30 04:26:33 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 30 Aug 2009 04:26:33 +0000 (UTC)
Subject: rpms/mpich2/EL-4 mpich2.spec,1.5,1.6
Message-ID: <20090830042633.7533E11C0072@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13478

Modified Files:
	mpich2.spec 
Log Message:
Fix files list



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-4/mpich2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mpich2.spec	30 Aug 2009 04:00:05 -0000	1.5
+++ mpich2.spec	30 Aug 2009 04:26:32 -0000	1.6
@@ -253,8 +253,6 @@ fi
 %doc %{_docdir}/%{name}-%{version}/
 %doc %{_datadir}/%{name}/doc/
 %{_mandir}/man1/mp-*.1.gz
-%exclude %{_bindir}/mp*.pyc
-%exclude %{_bindir}/mp*.pyo
 %ghost %{_bindir}/mpiexec
 %ghost %{_bindir}/mpirun
 %ghost %{_mandir}/man1/mpi*.1.gz



From jwilson at fedoraproject.org  Sun Aug 30 04:27:30 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun, 30 Aug 2009 04:27:30 +0000 (UTC)
Subject: rpms/lirc/F-11 lirc.spec,1.54,1.55
Message-ID: <20090830042730.39C5611C0072@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/lirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13851

Modified Files:
	lirc.spec 
Log Message:
* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-3
- Bump to keep F11 version rpm-newer than F10



Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- lirc.spec	28 May 2009 17:04:07 -0000	1.54
+++ lirc.spec	30 Aug 2009 04:27:30 -0000	1.55
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.5
-Release:        2%{?pre:.%{pre}}%{?dist}
+Release:        3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -265,6 +265,9 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-3
+- Bump to keep F11 version rpm-newer than F10
+
 * Thu May 28 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-2
 - Update to lirc 0.8.5
 - Add irman support, now that libirman is in Fedora (#474992)



From mtasaka at fedoraproject.org  Sun Aug 30 04:53:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 30 Aug 2009 04:53:55 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.388, 1.389 jd.spec, 1.451, 1.452 sources,
	1.389, 1.390
Message-ID: <20090830045355.94EDC11C0072@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18920

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3054



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.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	30 Aug 2009 04:53:55 -0000	1.389
@@ -1 +1 @@
-jd-2.4.2-svn3047_trunk.tgz
+jd-2.4.2-svn3054_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/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	30 Aug 2009 04:53:55 -0000	1.452
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3047_trunk
+%define         strtag        svn3054_trunk
 %define         repoid        43007
 # 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
-* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3047
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3054
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/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	30 Aug 2009 04:53:55 -0000	1.390
@@ -1 +1 @@
-918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz
+26b788eb750ba90ecb8ef1ded3909b7e  jd-2.4.2-svn3054_trunk.tgz



From jwilson at fedoraproject.org  Sun Aug 30 05:25:03 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun, 30 Aug 2009 05:25:03 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1753,1.1754
Message-ID: <20090830052504.0544311C0072@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24906

Modified Files:
	kernel.spec 
Log Message:
* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com>
- fix lirc_imon oops on older devices w/o tx ctrl ep (#520008)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -p -r1.1753 -r1.1754
--- kernel.spec	28 Aug 2009 22:40:28 -0000	1.1753
+++ kernel.spec	30 Aug 2009 05:25:01 -0000	1.1754
@@ -670,8 +670,7 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1515: linux-2.6.31-lirc.patch
-Patch1516: lirc_streamzap-buffer-rework.patch
+Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
 
@@ -1287,9 +1286,7 @@ ApplyPatch linux-2.6-crash-driver.patch
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.31-lirc.patch
-# should be a short-lived patch, hopefully fixing bz#508952 w/o breaking anything else...
-ApplyPatch lirc_streamzap-buffer-rework.patch
+ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
 # tell usbhid to ignore all imon devices (sent upstream 2009.07.31)
@@ -2007,6 +2004,9 @@ fi
 # and build.
 
 %changelog
+* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com>
+- fix lirc_imon oops on older devices w/o tx ctrl ep (#520008)
+
 * Fri Aug 28 2009 Eric Paris <eparis at redhat.com> 2.6.31-0.190.rc8
 - fix inotify length accounting and send inotify events
 



From jwilson at fedoraproject.org  Sun Aug 30 05:25:48 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Sun, 30 Aug 2009 05:25:48 +0000 (UTC)
Subject: rpms/kernel/devel lirc-2.6.31.patch, NONE,
	1.1 linux-2.6.31-lirc.patch, 
	1.5, NONE lirc_streamzap-buffer-rework.patch, 1.1, NONE
Message-ID: <20090830052548.083D811C0072@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25241

Added Files:
	lirc-2.6.31.patch 
Removed Files:
	linux-2.6.31-lirc.patch lirc_streamzap-buffer-rework.patch 
Log Message:
get the right lirc patches into cvs...

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      | 1225 ++++++++++++++++++
 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       | 1374 ++++++++++++++++++++
 26 files changed, 15562 insertions(+)

--- NEW FILE lirc-2.6.31.patch ---
Linux Infrared Remote Control drivers -- http://www.lirc.org

Last updated: Sunday, August 30, 2009

>From http://git.wilsonet.com/linux-2.6-lirc.git/

Signed-off-by: Jarod Wilson <jarod at redhat.com>

---
 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      | 1225 ++++++++++++++++++
 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       | 1374 ++++++++++++++++++++
 26 files changed, 15562 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 60299a9..59e34c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3130,6 +3130,15 @@ W:	http://www.pasemi.com/
 L:	linuxppc-dev at ozlabs.org
 S:	Supported
 
+LINUX INFRARED REMOTE CONTROL DRIVERS (LIRC)
+P:	Jarod Wilson
+M:	jarod at redhat.com
+P:	Christoph Bartelmus
+M:	lirc at bartelmus.de
+W:	http://www.lirc.org/
+L:	lirc-list at lists.sourceforge.net
+S:	Maintained
+
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:	Chris Wright <chrisw at sous-sol.org>
 L:	linux-security-module at vger.kernel.org
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index cd50c00..442f94f 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/lirc/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 4c9c745..99e2b5e 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
 
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC)       += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..ab13cfe
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,119 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+	bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+	help
+	  Say Y here, and all supported Linux Infrared Remote Control IR and
+	  RF receiver and transmitter drivers will be displayed. When paired
+	  with a remote control and the lirc daemon, the receiver drivers
+	  allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_DEV
+	tristate "LIRC device loadable module support"
+	help
+	  LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+	depends on LIRC_DEV
+	help
+	  Driver for the IR interface on BT829-based hardware
+
+config LIRC_ENE0100
+	tristate "ENE KB3924/ENE0100 CIR Port Reciever"
+	depends on LIRC_DEV
+	help
+	  This is a driver for CIR port handled by ENE KB3924 embedded
+	  controller found on some notebooks.
+	  It appears on PNP list as ENE0100.
+
+config LIRC_I2C
+	tristate "I2C Based IR Receivers"
+	depends on LIRC_DEV
+	help
+	  Driver for I2C-based IR receivers, such as those commonly
+	  found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+	tristate "Igor Cesko's USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+	tristate "Soundgraph IMON Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+	tristate "ITE IT87XX CIR Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+	tristate "ITE8709 CIR Port Receiver"
+	depends on LIRC_DEV && PNP
+	help
+	  Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+	tristate "Windows Media Center Ed. USB IR Transceiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Windows Media Center Ed. USB IR Transceivers
+
+config LIRC_PARALLEL
+	tristate "Homebrew Parallel Port Receiver"
+	depends on LIRC_DEV && !SMP
+	help
+	  Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+	tristate "Sasem USB IR Remote"
+	depends on LIRC_DEV
+	help
+	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+	tristate "Homebrew Serial Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+	bool "Serial Port Transmitter"
+	default y
+	depends on LIRC_SERIAL
+	help
+	  Serial Port Transmitter support
+
+config LIRC_SIR
+	tristate "Built-in SIR IrDA port"
+	depends on LIRC_DEV
+	help
+	  Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+	tristate "Streamzap PC Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+	tristate "Technotrend USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
[...15368 lines suppressed...]
+		ir->task = kthread_run(lirc_thread, ir, "lirc_zilog");
+		if (IS_ERR(ir->task)) {
+			ret = PTR_ERR(ir->task);
+			zilog_error("lirc_register_driver: cannot run "
+				    "poll thread %d\n", ret);
+			goto err;
+		}
+		wait_for_completion(&tn);
+		ir->t_notify = NULL;
+	}
+
+	/* initialise TX device */
+	memcpy(&ir->c_tx, &client_template, sizeof(struct i2c_client));
+	if (have_tx) {
+		/* I2C attach to device */
+		ir->c_tx.addr = 0x70;
+		strncpy(ir->c_tx.name, "Zilog/Hauppauge TX", I2C_NAME_SIZE);
+		ret = i2c_attach(&ir->c_tx, ir);
+		if (ret != 0)
+			goto err;
+	}
+
+	/* set lirc_dev stuff */
+	ir->l.code_length = 13;
+	ir->l.rbuf	  = &ir->buf;
+	ir->l.fops	= &lirc_fops;
+	ir->l.data	= ir;
+	ir->l.minor       = minor;
+	ir->l.sample_rate = 0;
+
+	/* register with lirc */
+	ir->l.minor = lirc_register_driver(&ir->l);
+	if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {
+		zilog_error("ir_attach: \"minor\" must be between 0 and %d "
+			    "(%d)!\n", MAX_IRCTL_DEVICES-1, ir->l.minor);
+		ret = -EBADRQC;
+		goto err;
+	}
+
+	/* store this for getting back in open() later on */
+	ir_devices[ir->l.minor] = ir;
+
+	/*
+	 * if we have the tx device, load the 'firmware'.  We do this
+	 * after registering with lirc as otherwise hotplug seems to take
+	 * 10s to create the lirc device.
+	 */
+	if (have_tx) {
+		/* Special TX init */
+		ret = tx_init(ir);
+		if (ret != 0)
+			goto err;
+	}
+	return 0;
+
+err:
+	/* undo everything, hopefully... */
+	if (ir->c_rx.addr)
+		ir_remove(&ir->c_rx);
+	if (ir->c_tx.addr)
+		ir_remove(&ir->c_tx);
+	return ret;
+}
+
+static int ir_remove(struct i2c_client *client)
+{
+	struct IR *ir = i2c_get_clientdata(client);
+	mutex_lock(&ir->lock);
+
+	if (client == &ir->c_rx) {
+		DECLARE_COMPLETION(tn);
+		DECLARE_COMPLETION(tn2);
+
+		/* end up polling thread */
+		if (ir->task && !IS_ERR(ir->task)) {
+			ir->t_notify = &tn;
+			ir->t_notify2 = &tn2;
+			ir->shutdown = 1;
+			wake_up_process(ir->task);
+			complete(&tn2);
+			wait_for_completion(&tn);
+			ir->t_notify = NULL;
+			ir->t_notify2 = NULL;
+		}
+
+	} else {
+		mutex_unlock(&ir->lock);
+		zilog_error("%s: detached from something we didn't "
+			    "attach to\n", __func__);
+		return -ENODEV;
+	}
+
+	--ir->devs;
+	if (ir->devs < 0) {
+		mutex_unlock(&ir->lock);
+		zilog_error("%s: invalid device count\n", __func__);
+		return -ENODEV;
+	} else if (ir->devs == 0) {
+		/* unregister lirc driver */
+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
+			lirc_unregister_driver(ir->l.minor);
+			ir_devices[ir->l.minor] = NULL;
+		}
+
+		/* free memory */
+		lirc_buffer_free(&ir->buf);
+		mutex_unlock(&ir->lock);
+		kfree(ir);
+		return 0;
+	}
+	mutex_unlock(&ir->lock);
+	return 0;
+}
+
+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+	struct i2c_adapter *adap = client->adapter;
+	char buf;
+
+	if (adap->id == I2C_HW_B_BT848 ||
+#ifdef I2C_HW_B_HDPVR
+	    adap->id == I2C_HW_B_HDPVR ||
+#endif
+	    adap->id == I2C_HW_B_CX2341X) {
+		int have_rx = 0, have_tx = 0;
+
+		/*
+		 * The external IR receiver is at i2c address 0x71.
+		 * The IR transmitter is at 0x70.
+		 */
+		client->addr = 0x70;
+
+		if (!disable_rx) {
+			if (i2c_master_recv(client, &buf, 1) == 1)
+				have_rx = 1;
+			dprintk("probe 0x70 @ %s: %s\n",
+				adap->name,
+				have_rx ? "yes" : "no");
+		}
+
+		if (!disable_tx) {
+			client->addr = 0x71;
+			if (i2c_master_recv(client, &buf, 1) == 1)
+				have_tx = 1;
+			dprintk("probe 0x71 @ %s: %s\n",
+				adap->name,
+				have_tx ? "yes" : "no");
+		}
+
+		if (have_rx || have_tx)
+			return ir_attach(adap, have_rx, have_tx);
+		else
+			zilog_error("%s: no devices found\n", adap->name);
+	}
+
+	return 0;
+}
+
+static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
+{
+	/* nothing */
+	return 0;
+}
+
+static int __init zilog_init(void)
+{
+	mutex_init(&tx_data_lock);
+	request_module("firmware_class");
+	i2c_add_driver(&driver);
+	return 0;
+}
+
+static void __exit zilog_exit(void)
+{
+	i2c_del_driver(&driver);
+	/* if loaded */
+	fw_unload();
+}
+
+module_init(zilog_init);
+module_exit(zilog_exit);
+
+MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
+MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
+	      "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
+MODULE_LICENSE("GPL");
+/* for compat with old name, which isn't all that accurate anymore */
+MODULE_ALIAS("lirc_pvr150");
+
+module_param(minor, int, 0444);
+MODULE_PARM_DESC(minor, "Preferred minor device number");
+
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+module_param(disable_rx, bool, 0644);
+MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
+
+module_param(disable_tx, bool, 0644);
+MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");


--- linux-2.6.31-lirc.patch DELETED ---


--- lirc_streamzap-buffer-rework.patch DELETED ---



From mtasaka at fedoraproject.org  Sun Aug 30 06:37:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 30 Aug 2009 06:37:33 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.395, 1.396 jd.spec, 1.455, 1.456 sources,
	1.396, 1.397
Message-ID: <20090830063733.7976811C02CA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7857/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- .cvsignore	19 Aug 2009 06:49:10 -0000	1.395
+++ .cvsignore	30 Aug 2009 06:37:29 -0000	1.396
@@ -1 +1 @@
-jd-2.4.2-svn3047_trunk.tgz
+jd-2.4.2-svn3054_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- jd.spec	19 Aug 2009 06:49:10 -0000	1.455
+++ jd.spec	30 Aug 2009 06:37:29 -0000	1.456
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3047_trunk
+%define         strtag        svn3054_trunk
 %define         repoid        43007
 # 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
-* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3047
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3054
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- sources	19 Aug 2009 06:49:10 -0000	1.396
+++ sources	30 Aug 2009 06:37:29 -0000	1.397
@@ -1 +1 @@
-918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz
+26b788eb750ba90ecb8ef1ded3909b7e  jd-2.4.2-svn3054_trunk.tgz



From mtasaka at fedoraproject.org  Sun Aug 30 06:37:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 30 Aug 2009 06:37:33 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.389, 1.390 jd.spec, 1.451, 1.452 sources,
	1.390, 1.391
Message-ID: <20090830063733.759D711C0072@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7857/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- .cvsignore	19 Aug 2009 06:49:11 -0000	1.389
+++ .cvsignore	30 Aug 2009 06:37:31 -0000	1.390
@@ -1 +1 @@
-jd-2.4.2-svn3047_trunk.tgz
+jd-2.4.2-svn3054_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -p -r1.451 -r1.452
--- jd.spec	19 Aug 2009 06:49:11 -0000	1.451
+++ jd.spec	30 Aug 2009 06:37:31 -0000	1.452
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.4.2
-%define         strtag        svn3047_trunk
+%define         strtag        svn3054_trunk
 %define         repoid        43007
 # 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
-* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3047
+* Sun Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3054
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- sources	19 Aug 2009 06:49:11 -0000	1.390
+++ sources	30 Aug 2009 06:37:31 -0000	1.391
@@ -1 +1 @@
-918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz
+26b788eb750ba90ecb8ef1ded3909b7e  jd-2.4.2-svn3054_trunk.tgz



From mclasen at fedoraproject.org  Sun Aug 30 06:43:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 30 Aug 2009 06:43:29 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel locate-pointer-csw.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.118, 1.119
Message-ID: <20090830064329.9740C11C0072@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8804

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	locate-pointer-csw.patch 
Log Message:
Fix 'Locate Pointer'


locate-pointer-csw.patch:
 gsd-locate-pointer.c |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

--- NEW FILE locate-pointer-csw.patch ---
--- gnome-settings-daemon-2.27.91/plugins/mouse/gsd-locate-pointer.c	2009-08-30 02:33:02.791519895 -0400
+++ hacked/plugins/mouse/gsd-locate-pointer.c	2009-08-30 02:32:13.785515177 -0400
@@ -126,27 +126,29 @@
   cairo_t *cr;
   GdkBitmap *mask;
 
-  if (event->window != data->window)
+  if (event && event->window != data->window)
     return FALSE;
 
-  cr = gdk_cairo_create (data->window);
-
   if (gtk_widget_is_composited (data->widget))
-    locate_pointer_paint (data, cr, TRUE);
-  else
     {
-      locate_pointer_paint (data, cr, FALSE);
+      cr = gdk_cairo_create (data->window);
+      locate_pointer_paint (data, cr, TRUE);
       cairo_destroy (cr);
-
+    }
+  else
+    {
       /* create a bitmap for the shape, reuse the cairo_t to paint on it */
       mask = gdk_pixmap_new (data->window, WINDOW_SIZE, WINDOW_SIZE, 1);
       cr = gdk_cairo_create (mask);
       locate_pointer_paint (data, cr, FALSE);
       gdk_window_shape_combine_mask (data->window, mask, 0, 0);
       g_object_unref (mask);
-    }
+      cairo_destroy (cr);
 
-  cairo_destroy (cr);
+      cr = gdk_cairo_create (data->window);
+      locate_pointer_paint (data, cr, FALSE);
+      cairo_destroy (cr);
+    }
 
   return TRUE;
 }
@@ -168,7 +170,7 @@
   else if (progress >= data->progress + CIRCLES_PROGRESS_INTERVAL)
     {
       /* only invalidate window each circle interval */
-      gdk_window_invalidate_rect (data->window, NULL, FALSE);
+      locate_pointer_expose (data->widget, NULL, data);
       data->progress += CIRCLES_PROGRESS_INTERVAL;
     }
 
@@ -340,10 +342,9 @@
   g_signal_connect (data->widget, "composited-changed",
                     G_CALLBACK (composited_changed), data);
 
+  move_locate_pointer_window (data, screen);
   composited_changed (data->widget, data);
-
   gdk_window_show (data->window);
-  move_locate_pointer_window (data, screen);
 
   gsd_timeline_start (data->timeline);
 }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- gnome-settings-daemon.spec	26 Aug 2009 04:33:47 -0000	1.118
+++ gnome-settings-daemon.spec	30 Aug 2009 06:43:29 -0000	1.119
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.27.91
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -38,6 +38,8 @@ Patch12:	gnome-settings-daemon-2.26.1-fi
 Patch13:	locate-pointer-process.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=593112
 Patch14:	buttonmapping.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593115
+Patch15:        locate-pointer-csw.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -60,6 +62,7 @@ developing applications that use %{name}
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .locate-pointer
 %patch14 -p1 -b .buttonmap
+%patch15 -p1 -b .locate-pointer-csw
 
 autoreconf -i -f
 
@@ -173,6 +176,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Sun Aug 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.91-3
+- Make 'Locate Pointer' work with metacity again
+
 * Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.27.91-2
 - buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
   mappings for core devices instead (#502129).



From than at fedoraproject.org  Sun Aug 30 07:09:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 30 Aug 2009 07:09:03 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.137,1.138
Message-ID: <20090830070904.0AE2111C02CA@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13648

Modified Files:
	kdebase-runtime.spec 
Log Message:
4.3.1



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- kdebase-runtime.spec	28 Aug 2009 12:54:57 -0000	1.137
+++ kdebase-runtime.spec	30 Aug 2009 07:09:00 -0000	1.138
@@ -96,9 +96,6 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
-%patch5 -p0 -b .comborender
-%patch6 -p0 -b .kcmlocalecrash
-%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}



From denis at fedoraproject.org  Sun Aug 30 07:09:03 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 30 Aug 2009 07:09:03 +0000 (UTC)
Subject: rpms/libsigc++20/devel .cvsignore, 1.8, 1.9 libsigc++.spec, 1.20,
	1.21 sources, 1.9, 1.10
Message-ID: <20090830070904.0919511C0072@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libsigc++20/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13620

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
- Update to upstream 2.2.4.1
- Added devhelp book and necessary BRs
- Split documentation into new subpackage
- Moved documentation to gtk-doc dir



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	11 Mar 2008 11:24:35 -0000	1.8
+++ .cvsignore	30 Aug 2009 07:09:02 -0000	1.9
@@ -1 +1 @@
-libsigc++-2.2.2.tar.bz2
+libsigc++-2.2.4.1.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libsigc++.spec	25 Jul 2009 08:38:07 -0000	1.20
+++ libsigc++.spec	30 Aug 2009 07:09:02 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           libsigc++20
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        2.2.4.1
+Release:        1%{?dist}
 
 Summary:        Typesafe signal framework for C++
 
@@ -9,9 +9,8 @@ License:        LGPLv2+
 URL:            http://libsigc.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-%version.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  doxygen graphviz
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  m4
 
 %description
@@ -41,29 +40,40 @@ needed for development with %name.
 %setup -q -n libsigc++-%{version}
 
 
+%package        doc
+Summary:        Documentation for %{name}, includes full API docs
+Group:          Documentation
+
+
+%description    doc
+This package contains the full API documentation for %{name}.
+
+
 %build
 %configure %{!?_with_static: --disable-static}
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docs-to-include
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%{__mkdir} docs-to-include
-%{__mv} ${RPM_BUILD_ROOT}%{_docdir}/libsigc-2.0/* docs-to-include/
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html
+mv  ${RPM_BUILD_ROOT}%{_datadir}/doc/libsigc++-2.0 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html
+mv  ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libsigc++-2.0/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libsigc++-2.0/
+# Fix documentation link in devhelp file, since we moved the docs to
+# the gtk-doc directory.
+sed -i 's:/usr/share/doc:/usr/share/gtk-doc/html:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libsigc++-2.0/*.devhelp2
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun
-/sbin/ldconfig
-
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -71,16 +81,28 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README NEWS ChangeLog TODO
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc docs-to-include/*
 %{_includedir}/*
 %{_libdir}/sigc++-2.0
 %{_libdir}/pkgconfig/*.pc
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 
+
+%files doc
+%defattr(-, root, root, -)
+%doc %{_datadir}/gtk-doc/html/libsigc++-2.0
+
+
 %changelog
+* Sat Aug 29 2009 Denis Leroy <denis at poolshark.org> - 2.2.4.1-1
+- Update to upstream 2.2.4.1
+- Added devhelp book and necessary BRs
+- Split documentation into new subpackage
+- Moved documentation to gtk-doc dir
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Mar 2008 11:24:35 -0000	1.9
+++ sources	30 Aug 2009 07:09:02 -0000	1.10
@@ -1 +1 @@
-962493fd6b26425f21504c3416c4efa1  libsigc++-2.2.2.tar.bz2
+3a362dbcd23a9c3bcb2a257fac8a9466  libsigc++-2.2.4.1.tar.bz2



From emaldonado at fedoraproject.org  Sun Aug 30 07:13:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 30 Aug 2009 07:13:54 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.105,1.106
Message-ID: <20090830071354.879AD11C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14629

Modified Files:
	nss.spec 
Log Message:
Do not require sqlite for nss, it breaks nss-util install - bug 520277


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- nss.spec	29 Aug 2009 20:46:40 -0000	1.105
+++ nss.spec	30 Aug 2009 07:13:53 -0000	1.106
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          26%{?dist}
+Release:          27%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -14,7 +14,6 @@ Requires:         nspr >= %{nspr_version
 Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn >= %{nss_softokn_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{nss_softokn_version}
-Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-softokn >= %{nss_softokn_version}                                                  
@@ -440,6 +439,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Aug 29 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-27
+- Don't require sqlite for nss
+
 * Sat Aug 29 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-26
 - Ensure versions in the requires match those used when creating nss.pc
 



From denis at fedoraproject.org  Sun Aug 30 08:27:00 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 30 Aug 2009 08:27:00 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.38, 1.39 glibmm.spec, 1.56,
	1.57 sources, 1.39, 1.40
Message-ID: <20090830082700.9BA2111C0072@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31740

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.21.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	16 Aug 2009 17:04:51 -0000	1.38
+++ .cvsignore	30 Aug 2009 08:26:58 -0000	1.39
@@ -1 +1 @@
-glibmm-2.21.3.tar.bz2
+glibmm-2.21.4.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- glibmm.spec	16 Aug 2009 17:04:51 -0000	1.56
+++ glibmm.spec	30 Aug 2009 08:26:58 -0000	1.57
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.21.3
+Version:        2.21.4
 Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -61,9 +61,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 # Fix documentation installation, put everything under gtk-doc
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4
 %{__mv} ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
-sed -i 's:../../../doc/glibmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp
+%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/
+sed -i 's:../../../doc/glibmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2
 rm -fr $RPM_BUILD_ROOT%{_datadir}/devhelp/books/glibmm-2.4
+rm -fr $RPM_BUILD_ROOT%{_datadir}/glibmm-2.4
 
 
 %clean
@@ -100,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Denis Leroy <denis at poolshark.org> - 2.21.4-1
+- Update to upstream 2.21.4
+
 * Sun Aug 16 2009 Denis Leroy <denis at poolshark.org> - 2.21.3-1
 - Update to upstream 2.21.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	16 Aug 2009 17:04:51 -0000	1.39
+++ sources	30 Aug 2009 08:26:58 -0000	1.40
@@ -1 +1 @@
-f9f7023f9bddc38f787853eff0a3aafe  glibmm-2.21.3.tar.bz2
+08be0712e2992a395ac9405376dbc392  glibmm-2.21.4.tar.bz2



From pkgdb at fedoraproject.org  Sun Aug 30 09:26:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:26:58 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092658.C724C10F883@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on spring (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:02 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092702.2239110F88C@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on spring (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:03 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092703.E769C10F894@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on spring (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:06 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092706.819C310F897@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on spring (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:12 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092712.6359910F87F@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on spring (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:14 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092714.E36D910F899@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on spring (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:17 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092717.1F07010F89C@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on spring (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:19 +0000
Subject: [pkgdb] spring had acl change status
Message-ID: <20090830092719.41D7110F888@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on spring (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:48 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092748.D189110F882@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on spring-maps-default (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:51 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092751.1A2B610F8A1@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on spring-maps-default (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:53 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092753.C5E2B10F89B@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on spring-maps-default (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:55 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092755.D342110F8A2@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on spring-maps-default (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:27:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:27:58 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092759.1532D10F8A8@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on spring-maps-default (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:01 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092801.EFDC010F8AB@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on spring-maps-default (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:03 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092803.A254710F89D@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on spring-maps-default (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:05 +0000
Subject: [pkgdb] spring-maps-default had acl change status
Message-ID: <20090830092805.CF72910F8AF@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on spring-maps-default (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-maps-default



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:35 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092835.CEFDA10F897@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on springlobby (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:36 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092837.06D8010F8B2@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on springlobby (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:46 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092846.9347010F8A3@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on springlobby (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:48 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092848.8093C10F8B4@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on springlobby (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:52 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092852.A01B510F8B7@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on springlobby (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:52 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092852.DE81610F8BA@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on springlobby (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:53 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092853.D4D8F10F8BE@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on springlobby (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:28:54 +0000
Subject: [pkgdb] springlobby had acl change status
Message-ID: <20090830092854.5AD7210F8C1@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on springlobby (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/springlobby



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:22 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092922.6033F10F88C@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on spring-installer (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:23 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092923.C4C3210F8A9@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on spring-installer (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:23 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092923.8A0B610F8A5@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on spring-installer (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:24 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092925.0D53610F8AD@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on spring-installer (Fedora devel) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:26 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092927.0090B10F8C2@bastion2.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on spring-installer (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:27 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092927.0DB1210F8C5@bastion2.fedora.phx.redhat.com>

abompard has set the watchcommits acl on spring-installer (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:28 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092928.18B8F10F8C6@bastion2.fedora.phx.redhat.com>

abompard has set the commit acl on spring-installer (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From pkgdb at fedoraproject.org  Sun Aug 30 09:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 30 Aug 2009 09:29:29 +0000
Subject: [pkgdb] spring-installer had acl change status
Message-ID: <20090830092929.7ABBA10F8C9@bastion2.fedora.phx.redhat.com>

abompard has set the approveacls acl on spring-installer (Fedora 11) to Approved for ynemoy

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/spring-installer



From epienbro at fedoraproject.org  Sun Aug 30 10:49:07 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sun, 30 Aug 2009 10:49:07 +0000 (UTC)
Subject: rpms/mingw32-enchant/devel mingw32-enchant.spec,1.1,1.2
Message-ID: <20090830104907.C6DCD11C0072@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-enchant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22751

Modified Files:
	mingw32-enchant.spec 
Log Message:
Automatically generate debuginfo subpackage



Index: mingw32-enchant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-enchant/devel/mingw32-enchant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-enchant.spec	11 Aug 2009 16:30:36 -0000	1.1
+++ mingw32-enchant.spec	30 Aug 2009 10:49:07 -0000	1.2
@@ -3,11 +3,12 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Summary:       MinGW Windows Enchanting Spell Checking Library
 Name:          mingw32-enchant
 Version:       1.5.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 Group:         System Environment/Libraries
 License:       LGPLv2+
 Source0:       http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
@@ -48,6 +49,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows enchant spell checking library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -qn "enchant-%{version}"
 
@@ -118,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-3
+- Automatically generate debuginfo subpackage
+
 * Sun Aug  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.5.0-2
 - Dropped BR: autoconf libtool
 - Added BR: m4



From epienbro at fedoraproject.org  Sun Aug 30 10:53:49 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sun, 30 Aug 2009 10:53:49 +0000 (UTC)
Subject: rpms/mingw32-hunspell/devel mingw32-hunspell.spec,1.4,1.5
Message-ID: <20090830105349.786D611C0072@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-hunspell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23785

Modified Files:
	mingw32-hunspell.spec 
Log Message:
Automatically generate debuginfo subpackage



Index: mingw32-hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-hunspell/devel/mingw32-hunspell.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-hunspell.spec	12 Aug 2009 22:06:26 -0000	1.4
+++ mingw32-hunspell.spec	30 Aug 2009 10:53:49 -0000	1.5
@@ -3,11 +3,12 @@
 %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-hunspell
 Summary:       MinGW Windows spell checker and morphological analyzer library
 Version:       1.2.8
-Release:       9%{?dist}
+Release:       10%{?dist}
 Source0:       http://downloads.sourceforge.net/hunspell/hunspell-%{version}.tar.gz
 Group:         System Environment/Libraries
 URL:           http://hunspell.sourceforge.net/
@@ -53,6 +54,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows hunspell spell checking library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -qn "hunspell-%{version}"
 %patch1 -p1 -b .ispell-alike.patch
@@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.8-10
+- Automatically generate debuginfo subpackage
+
 * Thu Aug 13 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.8-9
 - Fixed invalid source URL
 



From epienbro at fedoraproject.org  Sun Aug 30 10:59:28 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sun, 30 Aug 2009 10:59:28 +0000 (UTC)
Subject: rpms/mingw32-libidn/devel mingw32-libidn.spec,1.2,1.3
Message-ID: <20090830105928.20D8311C0072@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libidn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25140

Modified Files:
	mingw32-libidn.spec 
Log Message:
Automatically generate debuginfo subpackage



Index: mingw32-libidn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libidn/devel/mingw32-libidn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-libidn.spec	25 Jul 2009 12:21:45 -0000	1.2
+++ mingw32-libidn.spec	30 Aug 2009 10:59:27 -0000	1.3
@@ -3,6 +3,7 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 # Native Fedora package is ancient, 0.6.14, which doesn't even
 # exist on the upstream servers any more.  I have gone for the
@@ -10,7 +11,7 @@
 
 Name:           mingw32-libidn
 Version:        1.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Internationalized Domain Name support library
 
 License:        LGPLv2+
@@ -21,7 +22,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 33
+BuildRequires:  mingw32-filesystem >= 49
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gettext
@@ -47,6 +48,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows IDN library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libidn-%{version}
 
@@ -91,7 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libidn.a
 
+
 %changelog
+* Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-4
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From adrian at fedoraproject.org  Sun Aug 30 11:59:35 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 11:59:35 +0000 (UTC)
Subject: rpms/xlockmore/devel xlockmore-fix_petri.patch, NONE,
	1.1 xlockmore.spec, 1.18, 1.19
Message-ID: <20090830115935.2ED5611C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5098

Modified Files:
	xlockmore.spec 
Added Files:
	xlockmore-fix_petri.patch 
Log Message:
* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
- updated to 5.28
- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)


xlockmore-fix_petri.patch:
 petri.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xlockmore-fix_petri.patch ---
--- modes/petri.c.orig	2009-08-20 08:05:37.000000000 +0200
+++ modes/petri.c	2009-08-20 08:05:46.000000000 +0200
@@ -217,7 +217,7 @@
    cell *arr;
    cell *head;
    cell *tail;
-   int count;
+   unsigned int count;
    Bool originalcolors;
    GC *coloredGCs;
    int blastcount;


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xlockmore.spec	27 Jul 2009 08:08:45 -0000	1.18
+++ xlockmore.spec	30 Aug 2009 11:59:34 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.26.1
-Release: 3%{?dist}
+Version: 5.28
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.26.1/xlockmore-5.26.1.tar.bz2
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.28/xlockmore-5.28.tar.bz2
+Patch0: xlockmore-fix_petri.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
@@ -34,6 +35,7 @@ GTK based frontend for xlockmore.
 
 %prep
 %setup -q
+%patch0
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
@@ -107,6 +109,10 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
+- updated to 5.28
+- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.26.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From adrian at fedoraproject.org  Sun Aug 30 12:21:09 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 12:21:09 +0000 (UTC)
Subject: rpms/xlockmore/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20090830122109.BE9FD11C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9178

Modified Files:
	.cvsignore sources 
Log Message:
* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
- updated to 5.28
- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Aug 2008 16:56:02 -0000	1.12
+++ .cvsignore	30 Aug 2009 12:21:09 -0000	1.13
@@ -1 +1 @@
-xlockmore-5.26.1.tar.bz2
+xlockmore-5.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Aug 2008 16:56:02 -0000	1.12
+++ sources	30 Aug 2009 12:21:09 -0000	1.13
@@ -1 +1 @@
-db7faeb82074a5a1593ce60297c13f20  xlockmore-5.26.1.tar.bz2
+76bd1c42f1d1f2d9ea3d2d1837f7469e  xlockmore-5.28.tar.bz2



From adrian at fedoraproject.org  Sun Aug 30 12:47:37 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 12:47:37 +0000 (UTC)
Subject: rpms/xlockmore/F-10 xlockmore-fix_petri.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 sources, 1.12, 1.13 xlockmore.spec, 1.16, 1.17
Message-ID: <20090830124737.721B711C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14644

Modified Files:
	.cvsignore sources xlockmore.spec 
Added Files:
	xlockmore-fix_petri.patch 
Log Message:
* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
- updated to 5.28
- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)


xlockmore-fix_petri.patch:
 petri.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xlockmore-fix_petri.patch ---
--- modes/petri.c.orig	2009-08-20 08:05:37.000000000 +0200
+++ modes/petri.c	2009-08-20 08:05:46.000000000 +0200
@@ -217,7 +217,7 @@
    cell *arr;
    cell *head;
    cell *tail;
-   int count;
+   unsigned int count;
    Bool originalcolors;
    GC *coloredGCs;
    int blastcount;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Aug 2008 16:56:02 -0000	1.12
+++ .cvsignore	30 Aug 2009 12:47:37 -0000	1.13
@@ -1 +1 @@
-xlockmore-5.26.1.tar.bz2
+xlockmore-5.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Aug 2008 16:56:02 -0000	1.12
+++ sources	30 Aug 2009 12:47:37 -0000	1.13
@@ -1 +1 @@
-db7faeb82074a5a1593ce60297c13f20  xlockmore-5.26.1.tar.bz2
+76bd1c42f1d1f2d9ea3d2d1837f7469e  xlockmore-5.28.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/F-10/xlockmore.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xlockmore.spec	9 Aug 2008 16:56:02 -0000	1.16
+++ xlockmore.spec	30 Aug 2009 12:47:37 -0000	1.17
@@ -1,11 +1,12 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.26.1
+Version: 5.28
 Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.26.1/xlockmore-5.26.1.tar.bz2
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.28/xlockmore-5.28.tar.bz2
+Patch0: xlockmore-fix_petri.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
@@ -34,6 +35,7 @@ GTK based frontend for xlockmore.
 
 %prep
 %setup -q
+%patch0
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
@@ -107,6 +109,16 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
+- updated to 5.28
+- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.26.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.26.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Aug 09 2008 Adrian Reber <adrian at lisas.de> - 5.26.1-1
 - updated to 5.26.1
 



From adrian at fedoraproject.org  Sun Aug 30 12:48:34 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 12:48:34 +0000 (UTC)
Subject: rpms/xlockmore/F-11 xlockmore-fix_petri.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 sources, 1.12, 1.13 xlockmore.spec, 1.17, 1.18
Message-ID: <20090830124834.0AB4011C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14920

Modified Files:
	.cvsignore sources xlockmore.spec 
Added Files:
	xlockmore-fix_petri.patch 
Log Message:
* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
- updated to 5.28
- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)


xlockmore-fix_petri.patch:
 petri.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xlockmore-fix_petri.patch ---
--- modes/petri.c.orig	2009-08-20 08:05:37.000000000 +0200
+++ modes/petri.c	2009-08-20 08:05:46.000000000 +0200
@@ -217,7 +217,7 @@
    cell *arr;
    cell *head;
    cell *tail;
-   int count;
+   unsigned int count;
    Bool originalcolors;
    GC *coloredGCs;
    int blastcount;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Aug 2008 16:56:02 -0000	1.12
+++ .cvsignore	30 Aug 2009 12:48:33 -0000	1.13
@@ -1 +1 @@
-xlockmore-5.26.1.tar.bz2
+xlockmore-5.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Aug 2008 16:56:02 -0000	1.12
+++ sources	30 Aug 2009 12:48:33 -0000	1.13
@@ -1 +1 @@
-db7faeb82074a5a1593ce60297c13f20  xlockmore-5.26.1.tar.bz2
+76bd1c42f1d1f2d9ea3d2d1837f7469e  xlockmore-5.28.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/F-11/xlockmore.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xlockmore.spec	26 Feb 2009 09:51:58 -0000	1.17
+++ xlockmore.spec	30 Aug 2009 12:48:33 -0000	1.18
@@ -1,11 +1,12 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.26.1
-Release: 2%{?dist}
+Version: 5.28
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.26.1/xlockmore-5.26.1.tar.bz2
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.28/xlockmore-5.28.tar.bz2
+Patch0: xlockmore-fix_petri.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
@@ -34,6 +35,7 @@ GTK based frontend for xlockmore.
 
 %prep
 %setup -q
+%patch0
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
@@ -107,6 +109,13 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 5.28-1
+- updated to 5.28
+- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.26.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From mbarnes at fedoraproject.org  Sun Aug 30 14:03:59 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun, 30 Aug 2009 14:03:59 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.71,1.72
Message-ID: <20090830140359.E9BB511C0072@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2441

Modified Files:
	evolution-exchange.spec 
Log Message:

* Sun Aug 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-3.fc12
- Rebuild again.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- evolution-exchange.spec	27 Aug 2009 15:06:07 -0000	1.71
+++ evolution-exchange.spec	30 Aug 2009 14:03:58 -0000	1.72
@@ -18,7 +18,7 @@
 
 Name: evolution-exchange
 Version: 2.27.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
@@ -121,6 +121,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Sun Aug 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-3.fc12
+- Rebuild again.
+
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-2.fc12
 - Rebuild with old OpenSSL, er something...
 



From adrian at fedoraproject.org  Sun Aug 30 14:12:16 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 14:12:16 +0000 (UTC)
Subject: rpms/wordpress/devel .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 wordpress.spec, 1.34, 1.35 changeset_r11798.diff, 1.1, NONE
Message-ID: <20090830141216.0C37B11C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3884

Modified Files:
	.cvsignore sources wordpress.spec 
Removed Files:
	changeset_r11798.diff 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	3 Aug 2009 19:04:21 -0000	1.26
+++ .cvsignore	30 Aug 2009 14:12:15 -0000	1.27
@@ -1 +1 @@
-wordpress-2.8.3.tar.gz
+wordpress-2.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	3 Aug 2009 19:04:22 -0000	1.26
+++ sources	30 Aug 2009 14:12:15 -0000	1.27
@@ -1 +1 @@
-0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz
+0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- wordpress.spec	11 Aug 2009 09:18:21 -0000	1.34
+++ wordpress.spec	30 Aug 2009 14:12:15 -0000	1.35
@@ -1,9 +1,9 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.3
+Version: 2.8.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,7 +11,6 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
-Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -19,10 +18,13 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
-%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
+# disable update_nag() function
+sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \
+	s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \
+	wp-admin/includes/update.php
 # fix file encoding
 sed -i -e 's/\r//' license.txt
 
@@ -79,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* 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)
+
 * Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
 - another security update to fix "Remote admin reset password":
   http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


--- changeset_r11798.diff DELETED ---



From icon at fedoraproject.org  Sun Aug 30 14:28:06 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 14:28:06 +0000 (UTC)
Subject: rpms/pathfinder/devel .cvsignore, 1.2, 1.3 pathfinder.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090830142806.E7CF811C0072@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pathfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8934

Modified Files:
	.cvsignore pathfinder.spec sources 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pathfinder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jul 2009 15:37:24 -0000	1.2
+++ .cvsignore	30 Aug 2009 14:28:06 -0000	1.3
@@ -1 +1 @@
-pathfinder-1.0.0-Source.tar.gz
+pathfinder-1.1.0-Source.tar.gz


Index: pathfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/pathfinder/devel/pathfinder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pathfinder.spec	21 Aug 2009 15:15:13 -0000	1.3
+++ pathfinder.spec	30 Aug 2009 14:28:06 -0000	1.4
@@ -1,8 +1,8 @@
 %define         daemon_user   pathfinderd
 
 Name:           pathfinder
-Version:        1.0.0
-Release:        3%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        X.509 Path Discovery and Validation
 
 Group:          Applications/Internet
@@ -13,12 +13,10 @@ Source1:        pathfinderd.init
 Source2:        pathfinderd.ini
 Source3:        wvtestrunner.pl
 Source4:        wvstreams.supp
-Patch0:         pathfinder-1.0.0-gcc44.patch
-Patch1:         pathfinder-1.0.0-wvargs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libwvstreams-devel >= 4.6-3, boost-devel, valgrind
-BuildRequires:  openssl-devel, nss-devel, dbus-devel
+BuildRequires:  openssl-devel, nss-devel, dbus-devel, openldap-devel
 
 %description
 Pathfinder is designed to provide a mechanism for any program to perform
@@ -88,8 +86,6 @@ This package includes the development li
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
-%patch1 -p1 -b .wvargs
 
 
 %build
@@ -122,15 +118,18 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_local
 
 
 %check
+# 2 tests are failing for all platforms. Reported upstream as
+# http://code.google.com/p/pathfinder-pki/issues/detail?id=23
+# Commented out until resolved.
 # tests are failing on ppc
-%ifnarch ppc ppc64
+#%ifnarch ppc ppc64
 # test suite depends on external files from wvstreams
 # we bundle them with this package
-install -m 0755 %{SOURCE3} .
-install -m 0644 %{SOURCE4} .
-export WVSTREAMS_SRC="`pwd`"
-make test
-%endif
+#install -m 0755 %{SOURCE3} .
+#install -m 0644 %{SOURCE4} .
+#export WVSTREAMS_SRC="`pwd`"
+#make test
+#%endif
 
 
 %clean
@@ -210,6 +209,12 @@ exit 0
 
 
 %changelog
+* Thu Aug 27 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.1.0-1
+- Upstream 1.1.0
+- Remove gcc 4.4 patch (upstreamed)
+- Remove wvargs patch (upstreamed)
+- Disable checks (http://code.google.com/p/pathfinder-pki/issues/detail?id=23)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.0-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pathfinder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 15:37:24 -0000	1.2
+++ sources	30 Aug 2009 14:28:06 -0000	1.3
@@ -1 +1 @@
-ba75f8482a96d4ce8ffd00cffd147d62  pathfinder-1.0.0-Source.tar.gz
+d9135fdc317c4b9de1bb9ecab40f7366  pathfinder-1.1.0-Source.tar.gz



From mitr at fedoraproject.org  Sun Aug 30 14:31:51 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Sun, 30 Aug 2009 14:31:51 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto-0.20.1-openssl1.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 m2crypto.spec, 1.57, 1.58 sources,
	1.12, 1.13 m2crypto-0.20-merge.patch, 1.1, NONE
Message-ID: <20090830143151.2A44B11C0072@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10675

Modified Files:
	.cvsignore m2crypto.spec sources 
Added Files:
	m2crypto-0.20.1-openssl1.patch 
Removed Files:
	m2crypto-0.20-merge.patch 
Log Message:
* 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


m2crypto-0.20.1-openssl1.patch:
 SWIG/_aes.i         |    2 -
 SWIG/_evp.i         |    8 ++--
 SWIG/_m2crypto.i    |   13 ++++++
 SWIG/_pkcs7.i       |   18 ++++-----
 SWIG/_rand.i        |    2 -
 SWIG/_ssl.i         |   30 +++++++--------
 SWIG/_util.i        |    2 -
 SWIG/_x509.i        |  102 ++++++++++++++++++++++++++++++++--------------------
 tests/test_smime.py |    4 +-
 tests/test_ssl.py   |    7 ++-
 tests/test_x509.py  |    2 -
 11 files changed, 115 insertions(+), 75 deletions(-)

--- NEW FILE m2crypto-0.20.1-openssl1.patch ---
Index: tests/test_ssl.py
===================================================================
--- tests/test_ssl.py	(revision 698)
+++ tests/test_ssl.py	(working copy)
@@ -405,8 +405,11 @@
         try:
             ctx = SSL.Context('sslv23', weak_crypto=1)
             s = SSL.Connection(ctx)
-            s.connect(self.srv_addr)
-            self.failUnlessEqual(s.get_version(), 'SSLv2')
+            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
+                s.connect(self.srv_addr)
+                self.failUnlessEqual(s.get_version(), 'SSLv2')
+            else:
+                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
             s.close()
         finally:
             self.stop_server(pid)
Index: tests/test_x509.py
===================================================================
--- tests/test_x509.py	(revision 698)
+++ tests/test_x509.py	(working copy)
@@ -142,7 +142,7 @@
         cn.set_data("Hello There!")
         assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
 
-        assert n.as_hash() == 1697185131
+        self.assertEquals(n.as_hash(), 1697185131)
         
         self.assertRaises(IndexError, lambda: n[100])
         self.assert_(n[10])
Index: tests/test_smime.py
===================================================================
--- tests/test_smime.py	(revision 698)
+++ tests/test_smime.py	(working copy)
@@ -6,7 +6,7 @@
 """
 
 import unittest
-from M2Crypto import SMIME, BIO, Rand, X509, EVP
+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
 
 class SMIMETestCase(unittest.TestCase):
     cleartext = 'some text to manipulate'
@@ -213,7 +213,7 @@
 
         self.filenameSmime = 'tests/sig.p7s'
         f = BIO.openfile(self.filenameSmime, 'wb')
-        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
+        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
         f.close()
         
     def test_write_pkcs7_der(self):
Index: SWIG/_evp.i
===================================================================
--- SWIG/_evp.i	(revision 695)
+++ SWIG/_evp.i	(working copy)
@@ -180,7 +180,7 @@
 
     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
                            keylen, key);
-    ret = PyString_FromStringAndSize(key, keylen);
+    ret = PyString_FromStringAndSize((char*)key, keylen);
     OPENSSL_cleanse(key, keylen);
     return ret;
 }
@@ -339,7 +339,7 @@
     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
         (unsigned char *)dbuf, dlen, iter, 
         key, NULL); /* Since we are not returning IV no need to derive it */
-    ret = PyString_FromStringAndSize(key, klen);
+    ret = PyString_FromStringAndSize((char*)key, klen);
     return ret;
 }
 
@@ -435,7 +435,7 @@
         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
         return NULL;
     }
-    ret = PyString_FromStringAndSize(sigbuf, siglen);
+    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
     OPENSSL_cleanse(sigbuf, siglen);
     OPENSSL_free(sigbuf);
     return ret;
@@ -513,7 +513,7 @@
         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
         return NULL; 
     }
-    der = PyString_FromStringAndSize(pp, len);
+    der = PyString_FromStringAndSize((char*)pp, len);
     OPENSSL_free(pp);
     return der;
 }
Index: SWIG/_ssl.i
===================================================================
--- SWIG/_ssl.i	(revision 695)
+++ SWIG/_ssl.i	(working copy)
@@ -17,13 +17,17 @@
 %apply Pointer NONNULL { SSL_CTX * };
 %apply Pointer NONNULL { SSL * };
 %apply Pointer NONNULL { SSL_CIPHER * };
-%apply Pointer NONNULL { STACK * };
+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
+%apply Pointer NONNULL { STACK_OF(X509) * };
 %apply Pointer NONNULL { BIO * };
 %apply Pointer NONNULL { DH * };
 %apply Pointer NONNULL { RSA * };
 %apply Pointer NONNULL { EVP_PKEY *};
 %apply Pointer NONNULL { PyObject *pyfunc };
 
+%rename(ssl_get_ciphers) SSL_get_ciphers;
+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
+
 %rename(ssl_get_version) SSL_get_version;
 extern const char *SSL_get_version(CONST SSL *);
 %rename(ssl_get_error) SSL_get_error;
@@ -668,29 +672,25 @@
     return SSL_CIPHER_get_bits(c, NULL);
 }
 
-STACK *ssl_get_ciphers(SSL *ssl) {
-    return (STACK *)SSL_get_ciphers(ssl);
+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
+    return sk_SSL_CIPHER_num(stack);
 }
 
-int sk_ssl_cipher_num(STACK *stack) {
-    return sk_num(stack);
+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
+    return sk_SSL_CIPHER_value(stack, idx);
 }
 
-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
-    return (SSL_CIPHER *)sk_value(stack, idx);
+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
+    return SSL_get_peer_cert_chain(ssl);
 }
 
-STACK *ssl_get_peer_cert_chain(SSL *ssl) {
-    return (STACK *)SSL_get_peer_cert_chain(ssl);
+int sk_x509_num(STACK_OF(X509) *stack) {
+    return sk_X509_num(stack);
 }
 
-int sk_x509_num(STACK *stack) {
-    return sk_num(stack);
+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
+    return sk_X509_value(stack, idx);
 }
-
-X509 *sk_x509_value(STACK *stack, int idx) {
-    return (X509 *)sk_value(stack, idx);
-}
 %}
 
 %threadallow i2d_ssl_session;
Index: SWIG/_x509.i
===================================================================
--- SWIG/_x509.i	(revision 695)
+++ SWIG/_x509.i	(working copy)
@@ -148,8 +148,15 @@
 extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
 %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
 extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
+
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+%rename(x509_name_hash) X509_NAME_hash_old;
+extern unsigned long X509_NAME_hash_old(X509_NAME *);
+#else
 %rename(x509_name_hash) X509_NAME_hash;
 extern unsigned long X509_NAME_hash(X509_NAME *);
+#endif
+
 %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
 extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
 
@@ -171,7 +178,7 @@
     if (PyString_Check($input)) {
         Py_ssize_t len;
 
-        $1 = PyString_AsString($input); 
+        $1 = (unsigned char *)PyString_AsString($input); 
         len = PyString_Size($input);
         if (len > INT_MAX) {
             PyErr_SetString(PyExc_ValueError, "object too large");
@@ -184,7 +191,7 @@
     }
 }
 %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
 %typemap(in) (CONST unsigned char *, int);
 
 %rename(x509_req_new) X509_REQ_new;
@@ -230,7 +237,7 @@
 %rename(x509_store_ctx_free) X509_STORE_CTX_free;
 extern void X509_STORE_CTX_free(X509_STORE_CTX *);
 %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
 
 %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
 extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
@@ -348,7 +355,7 @@
         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
     }
     else {     
-        ret = PyString_FromStringAndSize(buf, len);
+        ret = PyString_FromStringAndSize((char*)buf, len);
         OPENSSL_free(buf);
     }
     return ret;
@@ -435,12 +442,12 @@
 }
 
 int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
-    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
+    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
 }
 
 /* x509_name_add_entry_by_txt */
 int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
-    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
+    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
 }
 
 PyObject *x509_name_get_der(X509_NAME *name)
@@ -450,23 +457,23 @@
 }
 
 /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
-STACK *sk_x509_new_null(void) {
-    return (STACK *)sk_X509_new_null();
+STACK_OF(X509) *sk_x509_new_null(void) {
+    return sk_X509_new_null();
 }
 
 /* sk_X509_free() is a macro. */
-void sk_x509_free(STACK *stack) {
-    sk_X509_free((STACK_OF(X509) *)stack);
+void sk_x509_free(STACK_OF(X509) *stack) {
+    sk_X509_free(stack);
 }
 
 /* sk_X509_push() is a macro. */
-int sk_x509_push(STACK *stack, X509 *x509) {
-    return sk_X509_push((STACK_OF(X509) *)stack, x509);
+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
+    return sk_X509_push(stack, x509);
 }
 
 /* sk_X509_pop() is a macro. */
-X509 *sk_x509_pop(STACK *stack) {
-    return sk_X509_pop((STACK_OF(X509) *)stack);
+X509 *sk_x509_pop(STACK_OF(X509) *stack) {
+    return sk_X509_pop(stack);
 }
 
 int x509_store_load_locations(X509_STORE *store, const char *file) {
@@ -493,21 +500,29 @@
     return X509_REQ_set_version(x, version);
 }
 
-int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
-    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
+    return X509_REQ_add_extensions(req, exts);
 }
 
-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
+    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
 }
 
-LHASH * 
-x509v3_lhash(){ 
-       return lh_new(NULL,NULL);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+LHASH_OF(CONF_VALUE) 
+#else
+LHASH
+#endif
+*x509v3_lhash() { 
+    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
 }
 
 X509V3_CTX *
-x509v3_set_conf_lhash(LHASH * lhash){
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
+#else
+x509v3_set_conf_lhash(LHASH                * lhash) {
+#endif
       X509V3_CTX * ctx;
       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
@@ -517,11 +532,20 @@
       return ctx;
 }
 
-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
+X509_EXTENSION *
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
+#else
+x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
+#endif
       X509_EXTENSION * ext = NULL;
       ext = X509V3_EXT_conf(conf, ctx, name, value); 
       PyMem_Free(ctx); 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      lh_CONF_VALUE_free(conf);
+#else
       lh_free(conf);
+#endif
       return ext;
 }
 
@@ -543,33 +567,33 @@
 }
 
 /* sk_X509_EXTENSION_new_null is a macro. */
-STACK *sk_x509_extension_new_null(void) {
-    return (STACK *)sk_X509_EXTENSION_new_null();
+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
+    return sk_X509_EXTENSION_new_null();
 }
 
 /* sk_X509_EXTENSION_free() is a macro. */
-void sk_x509_extension_free(STACK *stack) {
-    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
+    sk_X509_EXTENSION_free(stack);
 }
 
 /* sk_X509_EXTENSION_push() is a macro. */
-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
-    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
+    return sk_X509_EXTENSION_push(stack, x509_ext);
 }
 
 /* sk_X509_EXTENSION_pop() is a macro. */
-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
-    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
+    return sk_X509_EXTENSION_pop(stack);
 }
 
 /* sk_X509_EXTENSION_num() is a macro. */
-int sk_x509_extension_num(STACK *stack) {
-    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
+    return sk_X509_EXTENSION_num(stack);
 }
 
 /* sk_X509_EXTENSION_value() is a macro. */
-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
-    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
+    return sk_X509_EXTENSION_value(stack, i);
 }
 
 /* X509_STORE_CTX_get_app_data is a macro. */
@@ -590,7 +614,7 @@
 #define I2DTYPE int (*)()
 #endif   
 
-STACK *
+STACK_OF(X509) *
 make_stack_from_der_sequence(PyObject * pyEncodedString){
     STACK_OF(X509) *certs;
     Py_ssize_t encoded_string_len;
@@ -606,7 +630,7 @@
         return NULL;
     }
 
-    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
+    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
     if (!certs) {
        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
        return NULL;
@@ -616,13 +640,13 @@
 }
 
 PyObject *
-get_der_encoding_stack(STACK * stack){
+get_der_encoding_stack(STACK_OF(X509) *stack){
     PyObject * encodedString;
     
     unsigned char * encoding;
     int len; 
     
-    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
+    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
     if (!encoding) {
        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
        return NULL;
Index: SWIG/_aes.i
===================================================================
--- SWIG/_aes.i	(revision 695)
+++ SWIG/_aes.i	(working copy)
@@ -76,7 +76,7 @@
         AES_encrypt((const unsigned char *)in, out, key);
     else
         AES_decrypt((const unsigned char *)in, out, key);
-    return PyString_FromStringAndSize(out, outlen);
+    return PyString_FromStringAndSize((char*)out, outlen);
 }
 
 int AES_type_check(AES_KEY *key) {
Index: SWIG/_util.i
===================================================================
--- SWIG/_util.i	(revision 695)
+++ SWIG/_util.i	(working copy)
@@ -48,7 +48,7 @@
         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
         return NULL;
     }
-    obj = PyString_FromStringAndSize(ret, len);
+    obj = PyString_FromStringAndSize((char*)ret, len);
     OPENSSL_free(ret);
     return obj;
 }
Index: SWIG/_m2crypto.i
===================================================================
--- SWIG/_m2crypto.i	(revision 695)
+++ SWIG/_m2crypto.i	(working copy)
@@ -38,6 +38,19 @@
 #define CONST098
 #endif
 
+/* Bring in STACK_OF macro definition */
+%include <openssl/safestack.h>
+
+/* Bring in LHASH_OF macro definition */
+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
+   XXX stdio.h etc. which we fail to include. So we have to (re)define
+   XXX LHASH_OF here instead.
+%include <openssl/lhash.h>
+*/
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define LHASH_OF(type) struct lhash_st_##type
+#endif
+
 %include constraints.i
 %include _threads.i
 %include _lib.i
Index: SWIG/_rand.i
===================================================================
--- SWIG/_rand.i	(revision 695)
+++ SWIG/_rand.i	(working copy)
@@ -87,7 +87,7 @@
         Py_INCREF(Py_None);
         return Py_None;
     } else {
-        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
+        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
         PyMem_Free(blob);
         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
         return tuple;
Index: SWIG/_pkcs7.i
===================================================================
--- SWIG/_pkcs7.i	(revision 695)
+++ SWIG/_pkcs7.i	(working copy)
@@ -12,7 +12,7 @@
 %apply Pointer NONNULL { EVP_CIPHER * };
 %apply Pointer NONNULL { EVP_PKEY * };
 %apply Pointer NONNULL { PKCS7 * };
-%apply Pointer NONNULL { STACK * };
+%apply Pointer NONNULL { STACK_OF(X509) * };
 %apply Pointer NONNULL { X509 * };
 
 %rename(pkcs7_new) PKCS7_new;
@@ -54,8 +54,8 @@
 
 %threadallow pkcs7_encrypt;
 %inline %{
-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
+    return PKCS7_encrypt(stack, bio, cipher, flags);
 }
 
 PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
@@ -96,14 +96,14 @@
 
 %threadallow pkcs7_sign1;
 %inline %{
-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
-    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
+    return PKCS7_sign(x509, pkey, stack, bio, flags);
 }
 %}
 
 %threadallow pkcs7_verify1;
 %inline %{
-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
     int outlen;
     char *outbuf;
     BIO *bio;
@@ -113,7 +113,7 @@
         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
         return NULL;
     }
-    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
+    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
         BIO_free(bio);
         return NULL;
@@ -131,7 +131,7 @@
     return ret;
 }
 
-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
 }
 %}
@@ -229,7 +229,7 @@
 }
 
 /* return STACK_OF(X509)* */     
-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
     return PKCS7_get0_signers(p7, certs, flags);      
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Aug 2009 12:41:04 -0000	1.12
+++ .cvsignore	30 Aug 2009 14:31:50 -0000	1.13
@@ -1 +1 @@
-M2Crypto-0.20.tar.gz
+M2Crypto-0.20.1.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- m2crypto.spec	21 Aug 2009 14:28:04 -0000	1.57
+++ m2crypto.spec	30 Aug 2009 14:31:50 -0000	1.58
@@ -5,15 +5,15 @@
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
-Version: 0.20
-Release: 2
+Version: 0.20.1
+Release: 1
 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
 # This is only precautionary, it does fix anything - not sent upstream
 Patch1: m2crypto-0.20-gcc_macros.patch
-# https://bugzilla.osafoundation.org/show_bug.cgi?id=12857
-Patch2: m2crypto-0.20-merge.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=12855
+Patch2: m2crypto-0.20.1-openssl1.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -29,7 +29,7 @@ This package allows you to call OpenSSL 
 %setup -q -n M2Crypto-%{version}
 %patch0 -p1
 %patch1 -p1 -b .gcc_macros
-%patch2 -p1 -b .merge
+%patch2 -p0 -b .openssl1
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* 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
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.20-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 12:41:04 -0000	1.12
+++ sources	30 Aug 2009 14:31:50 -0000	1.13
@@ -1 +1 @@
-43a4d958a6c892a37ca02ffcc650b66b  M2Crypto-0.20.tar.gz
+6a7420664310f424be4e63dfbe7e6e5f  M2Crypto-0.20.1.tar.gz


--- m2crypto-0.20-merge.patch DELETED ---



From icon at fedoraproject.org  Sun Aug 30 14:37:36 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 14:37:36 +0000 (UTC)
Subject: rpms/pathfinder/devel pathfinder-1.0.0-gcc44.patch, 1.1,
	NONE pathfinder-1.0.0-wvargs.patch, 1.1, NONE
Message-ID: <20090830143736.4D2D311C0072@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pathfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12308

Removed Files:
	pathfinder-1.0.0-gcc44.patch pathfinder-1.0.0-wvargs.patch 
Log Message:
Remove dangling obsolete patches



--- pathfinder-1.0.0-gcc44.patch DELETED ---


--- pathfinder-1.0.0-wvargs.patch DELETED ---



From dcbw at fedoraproject.org  Sun Aug 30 14:38:00 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun, 30 Aug 2009 14:38:00 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.55,1.56
Message-ID: <20090830143800.0EF8F11C0072@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12405

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
* Sun Aug 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
- Fix NM requirement




Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- NetworkManager-vpnc.spec	28 Aug 2009 20:39:19 -0000	1.55
+++ NetworkManager-vpnc.spec	30 Aug 2009 14:37:59 -0000	1.56
@@ -1,4 +1,4 @@
-%define nm_version          1:0.7.0.996-1
+%define nm_version          1:0.7.996-1
 %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:   1%{git_snapshot}%{?dist}
+Release:   2%{git_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -97,7 +97,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
-* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0.996-1
+* Sun Aug 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
+- Fix NM requirement
+
+* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
 - Rebuild for updated NetworkManager
 - Allow missing description in imported .pcf files
 - Allow the 'Vendor' config option



From dcbw at fedoraproject.org  Sun Aug 30 14:38:33 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun, 30 Aug 2009 14:38:33 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.18,
	1.19 NetworkManager-openvpn.spec, 1.35, 1.36 sources, 1.22, 1.23
Message-ID: <20090830143833.9784911C0072@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12506

Modified Files:
	.cvsignore NetworkManager-openvpn.spec sources 
Log Message:
* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
- Rebuild for updated NetworkManager




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 Jul 2009 10:59:41 -0000	1.18
+++ .cvsignore	30 Aug 2009 14:38:33 -0000	1.19
@@ -13,3 +13,4 @@ NetworkManager-openvpn-0.7.0.99.tar.gz
 NetworkManager-openvpn-0.7.1.tar.bz2
 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2
 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2
+NetworkManager-openvpn-0.7.996.git20090828.tar.bz2


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- NetworkManager-openvpn.spec	24 Jul 2009 15:40:48 -0000	1.35
+++ NetworkManager-openvpn.spec	30 Aug 2009 14:38:33 -0000	1.36
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.1-1
+%define nm_version          1:0.7.996-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot .git20090714
+%define snapshot .git20090828
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
-Version: 0.7.1
-Release: 2%{snapshot}%{?dist}
+Version: 0.7.996
+Release: 1%{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
+* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
+- Rebuild for updated NetworkManager
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.7.1-2.git20090714
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	14 Jul 2009 10:59:41 -0000	1.22
+++ sources	30 Aug 2009 14:38:33 -0000	1.23
@@ -1 +1 @@
-2c9e6819d2628c0890eade41ecf151d6  NetworkManager-openvpn-0.7.1.git20090714.tar.bz2
+ad13350c04dbf3dd59d3daeb67ef55e1  NetworkManager-openvpn-0.7.996.git20090828.tar.bz2



From icon at fedoraproject.org  Sun Aug 30 14:44:19 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 14:44:19 +0000 (UTC)
Subject: rpms/python-logilab-common/F-11 .cvsignore, 1.17,
	1.18 python-logilab-common.spec, 1.23, 1.24 sources, 1.17, 1.18
Message-ID: <20090830144419.B6BBE11C0072@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13696/F-11

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
New upstream 0.45.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Jun 2009 02:35:54 -0000	1.17
+++ .cvsignore	30 Aug 2009 14:44:18 -0000	1.18
@@ -1 +1 @@
-logilab-common-0.41.0.tar.gz
+logilab-common-0.45.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/F-11/python-logilab-common.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-logilab-common.spec	18 Jun 2009 02:55:40 -0000	1.23
+++ python-logilab-common.spec	30 Aug 2009 14:44:18 -0000	1.24
@@ -1,8 +1,8 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.41.0
-Release:        2%{?dist}
+Version:        0.45.0
+Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
 Group:          Development/Libraries
@@ -47,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.45.0-1
+- Upstream 0.45.0 (small enhancements and bugfixes)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.41.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.41.0-2
 - Upstream 0.41.0
 - Bugfixes and a few minor new features


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Jun 2009 02:35:54 -0000	1.17
+++ sources	30 Aug 2009 14:44:19 -0000	1.18
@@ -1 +1 @@
-e1b5e7ecb36fae95fb4fa5caea37e630  logilab-common-0.41.0.tar.gz
+7db98c92766b0858a9418c57d96c91bc  logilab-common-0.45.0.tar.gz



From icon at fedoraproject.org  Sun Aug 30 14:44:19 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 14:44:19 +0000 (UTC)
Subject: rpms/python-logilab-common/devel .cvsignore, 1.17,
	1.18 python-logilab-common.spec, 1.24, 1.25 sources, 1.17, 1.18
Message-ID: <20090830144419.D41E011C02CA@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13696/devel

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
New upstream 0.45.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Jun 2009 02:37:59 -0000	1.17
+++ .cvsignore	30 Aug 2009 14:44:19 -0000	1.18
@@ -1 +1 @@
-logilab-common-0.41.0.tar.gz
+logilab-common-0.45.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- python-logilab-common.spec	26 Jul 2009 20:35:21 -0000	1.24
+++ python-logilab-common.spec	30 Aug 2009 14:44:19 -0000	1.25
@@ -1,8 +1,8 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.41.0
-Release:        3%{?dist}
+Version:        0.45.0
+Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.45.0-1
+- Upstream 0.45.0 (small enhancements and bugfixes)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.41.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Jun 2009 02:37:59 -0000	1.17
+++ sources	30 Aug 2009 14:44:19 -0000	1.18
@@ -1 +1 @@
-e1b5e7ecb36fae95fb4fa5caea37e630  logilab-common-0.41.0.tar.gz
+7db98c92766b0858a9418c57d96c91bc  logilab-common-0.45.0.tar.gz



From icon at fedoraproject.org  Sun Aug 30 14:59:44 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 14:59:44 +0000 (UTC)
Subject: rpms/python-logilab-astng/devel .cvsignore, 1.8,
	1.9 python-logilab-astng.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20090830145944.3263211C02CA@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-astng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17260/devel

Modified Files:
	.cvsignore python-logilab-astng.spec sources 
Log Message:
New upstream 0.19.1 (bugfixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-astng/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Jun 2009 03:25:10 -0000	1.8
+++ .cvsignore	30 Aug 2009 14:59:43 -0000	1.9
@@ -1 +1 @@
-logilab-astng-0.19.0.tar.gz
+logilab-astng-0.19.1.tar.gz


Index: python-logilab-astng.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-astng/devel/python-logilab-astng.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-logilab-astng.spec	26 Jul 2009 20:35:03 -0000	1.11
+++ python-logilab-astng.spec	30 Aug 2009 14:59:44 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-astng
-Version:        0.19.0
-Release:        2%{?dist}
+Version:        0.19.1
+Release:        1%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 
 Group:          Development/Languages
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.19.1-1
+- Upstream 0.19.1 (bugfixes)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-astng/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Jun 2009 03:25:10 -0000	1.8
+++ sources	30 Aug 2009 14:59:44 -0000	1.9
@@ -1 +1 @@
-9478141bd45c1a1e72621797c94f18d3  logilab-astng-0.19.0.tar.gz
+16b0e132d1441f78f923f98e9b28d2d4  logilab-astng-0.19.1.tar.gz



From icon at fedoraproject.org  Sun Aug 30 14:59:44 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 14:59:44 +0000 (UTC)
Subject: rpms/python-logilab-astng/F-11 .cvsignore, 1.8,
	1.9 python-logilab-astng.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20090830145944.11DAA11C0072@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-astng/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17260/F-11

Modified Files:
	.cvsignore python-logilab-astng.spec sources 
Log Message:
New upstream 0.19.1 (bugfixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-astng/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Jun 2009 03:25:10 -0000	1.8
+++ .cvsignore	30 Aug 2009 14:59:43 -0000	1.9
@@ -1 +1 @@
-logilab-astng-0.19.0.tar.gz
+logilab-astng-0.19.1.tar.gz


Index: python-logilab-astng.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-astng/F-11/python-logilab-astng.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-logilab-astng.spec	18 Jun 2009 03:25:10 -0000	1.10
+++ python-logilab-astng.spec	30 Aug 2009 14:59:43 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-astng
-Version:        0.19.0
+Version:        0.19.1
 Release:        1%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 
@@ -57,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.19.1-1
+- Upstream 0.19.1 (bugfixes)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.19.0-1
 - Upstream 0.19.0
 - Fixes for better support of python 2.5 and 2.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-astng/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Jun 2009 03:25:10 -0000	1.8
+++ sources	30 Aug 2009 14:59:43 -0000	1.9
@@ -1 +1 @@
-9478141bd45c1a1e72621797c94f18d3  logilab-astng-0.19.0.tar.gz
+16b0e132d1441f78f923f98e9b28d2d4  logilab-astng-0.19.1.tar.gz



From dcbw at fedoraproject.org  Sun Aug 30 15:00:40 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sun, 30 Aug 2009 15:00:40 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel .cvsignore, 1.8,
	1.9 NetworkManager-pptp.spec, 1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20090830150040.34A5311C0349@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17676

Modified Files:
	.cvsignore NetworkManager-pptp.spec sources 
Log Message:
* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
- Rebuild for updated NetworkManager
- Fix window title of Advanced dialog




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Mar 2009 19:52:23 -0000	1.8
+++ .cvsignore	30 Aug 2009 15:00:40 -0000	1.9
@@ -5,3 +5,4 @@ NetworkManager-pptp-0.7.0.svn4326.tar.bz
 NetworkManager-pptp-0.7.0.svn16.tar.bz2
 NetworkManager-pptp-0.7.0.97.tar.bz2
 NetworkManager-pptp-0.7.0.99.tar.bz2
+NetworkManager-pptp-0.7.996.git20090828.tar.bz2


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- NetworkManager-pptp.spec	27 Jul 2009 14:37:29 -0000	1.13
+++ NetworkManager-pptp.spec	30 Aug 2009 15:00:40 -0000	1.14
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0.99-1
+%define nm_version          1:0.7.996-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot %{nil}
+%define svn_snapshot .git20090828
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   0.7.0.99
-Release:   3%{svn_snapshot}%{?dist}
+Version:   0.7.996
+Release:   1%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -20,8 +20,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
-BuildRequires: NetworkManager-devel   >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+#BuildRequires: NetworkManager-devel   >= %{nm_version}
+#BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
@@ -103,6 +103,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Fri Aug 28 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-1
+- Rebuild for updated NetworkManager
+- Fix window title of Advanced dialog
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.7.0.99-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Mar 2009 19:52:23 -0000	1.8
+++ sources	30 Aug 2009 15:00:40 -0000	1.9
@@ -1 +1 @@
-97fcd56217476b951ec7fa91e4245d75  NetworkManager-pptp-0.7.0.99.tar.bz2
+74b041bee35d7192052e69dfb1c1ff94  NetworkManager-pptp-0.7.996.git20090828.tar.bz2



From bouska at fedoraproject.org  Sun Aug 30 15:08:02 2009
From: bouska at fedoraproject.org (Pablo Martin-Gomez)
Date: Sun, 30 Aug 2009 15:08:02 +0000 (UTC)
Subject: rpms/gconf-cleaner/devel .cvsignore, 1.2, 1.3 gconf-cleaner.spec,
	1.6, 1.7 sources, 1.2, 1.3 gconf-cleaner.desktop, 1.1, NONE
Message-ID: <20090830150802.5B83911C0072@cvs1.fedora.phx.redhat.com>

Author: bouska

Update of /cvs/pkgs/rpms/gconf-cleaner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19090

Modified Files:
	.cvsignore gconf-cleaner.spec sources 
Removed Files:
	gconf-cleaner.desktop 
Log Message:
Update to 0.0.3 and fix bug rh #329181 and #248166


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-cleaner/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jul 2007 09:13:51 -0000	1.2
+++ .cvsignore	30 Aug 2009 15:08:01 -0000	1.3
@@ -1 +1 @@
-gconf-cleaner-0.0.2.tar.gz
+gconf-cleaner-0.0.3.tar.gz


Index: gconf-cleaner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-cleaner/devel/gconf-cleaner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gconf-cleaner.spec	24 Jul 2009 23:37:34 -0000	1.6
+++ gconf-cleaner.spec	30 Aug 2009 15:08:01 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           gconf-cleaner
-Version:        0.0.2
-Release:        8%{?dist}
+Version:        0.0.3
+Release:        1%{?dist}
 Summary:        A Cleaning tool for GConf
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://code.google.com/p/gconf-cleaner/
 Source0:        http://gconf-cleaner.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, GConf2-devel, perl-XML-Parser, gettext, desktop-file-utils
@@ -20,19 +19,21 @@ cluttered with unnecessary or invalid ke
 %prep
 %setup -q
 
-
 %build
 %configure
 make %{?_smp_mflags}
 
+# fix bug rh #248166
+# if fix in %%prep, it breaks intltool 
+sed -i 's/A Cleaning tool for GConf/Clean GConf database/' src/gconf-cleaner.desktop
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor="fedora"                               \
+desktop-file-install --delete-original                          \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        %{SOURCE1}
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop  
 
 %find_lang %{name}
 
@@ -44,10 +45,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Sun Aug 30 2009 Pablo Martin-Gomez <pablo.martin-gomez at laposte.net> - 0.0.3-1
+- Update to 0.0.3
+- Use upstream .desktop file and fix it for bug rh #248166
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-cleaner/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2007 09:13:51 -0000	1.2
+++ sources	30 Aug 2009 15:08:01 -0000	1.3
@@ -1 +1 @@
-5a459af40df53ffdeea69a70db1abe29  gconf-cleaner-0.0.2.tar.gz
+94d28d18c84ba8e9a166937a1e41fb53  gconf-cleaner-0.0.3.tar.gz


--- gconf-cleaner.desktop DELETED ---



From icon at fedoraproject.org  Sun Aug 30 15:18:13 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 15:18:13 +0000 (UTC)
Subject: rpms/pylint/F-11 .cvsignore, 1.15, 1.16 pylint.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <20090830151813.D630D11C0072@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22545/F-11

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
New upstream 0.18.1 (small bugfixes and enhancements)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	18 Jun 2009 03:31:51 -0000	1.15
+++ .cvsignore	30 Aug 2009 15:18:13 -0000	1.16
@@ -1 +1 @@
-pylint-0.18.0.tar.gz
+pylint-0.18.1.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/F-11/pylint.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pylint.spec	18 Jun 2009 03:31:52 -0000	1.17
+++ pylint.spec	30 Aug 2009 15:18:13 -0000	1.18
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.18.0
+Version:        0.18.1
 Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
@@ -77,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.18.1-1
+- Upstream 0.18.1 (bugfixes and small enhancements)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 17 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.18.0-1
 - Upstream 0.18.0 (bugfixes and minor feature updates)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Jun 2009 03:31:52 -0000	1.15
+++ sources	30 Aug 2009 15:18:13 -0000	1.16
@@ -1 +1 @@
-2fb51eb37062aff094b104004ecd25a8  pylint-0.18.0.tar.gz
+4b1f9bbbb2f2ee2c2076c5d2a35438fa  pylint-0.18.1.tar.gz



From icon at fedoraproject.org  Sun Aug 30 15:18:14 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Sun, 30 Aug 2009 15:18:14 +0000 (UTC)
Subject: rpms/pylint/devel .cvsignore, 1.15, 1.16 pylint.spec, 1.18,
	1.19 sources, 1.15, 1.16
Message-ID: <20090830151814.09C6311C0072@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22545/devel

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
New upstream 0.18.1 (small bugfixes and enhancements)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	18 Jun 2009 03:31:52 -0000	1.15
+++ .cvsignore	30 Aug 2009 15:18:13 -0000	1.16
@@ -1 +1 @@
-pylint-0.18.0.tar.gz
+pylint-0.18.1.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- pylint.spec	26 Jul 2009 19:53:51 -0000	1.18
+++ pylint.spec	30 Aug 2009 15:18:13 -0000	1.19
@@ -1,8 +1,8 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.18.0
-Release:        2%{?dist}
+Version:        0.18.1
+Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
 Group:          Development/Debuggers
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.18.1-1
+- Upstream 0.18.1 (bugfixes and small enhancements)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Jun 2009 03:31:52 -0000	1.15
+++ sources	30 Aug 2009 15:18:13 -0000	1.16
@@ -1 +1 @@
-2fb51eb37062aff094b104004ecd25a8  pylint-0.18.0.tar.gz
+4b1f9bbbb2f2ee2c2076c5d2a35438fa  pylint-0.18.1.tar.gz



From cebbert at fedoraproject.org  Sun Aug 30 15:23:10 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 30 Aug 2009 15:23:10 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.31-rc8-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1120, 1.1121 kernel.spec, 1.1754, 1.1755 sources, 1.1078,
	1.1079 upstream, 1.992, 1.993 linux-2.6-inotify-accounting.patch,
	1.1, NONE
Message-ID: <20090830152310.26A0711C0072@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23715

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31-rc8-git1.bz2.sign 
Removed Files:
	linux-2.6-inotify-accounting.patch 
Log Message:
2.6.31-rc8-git1
Drop linux-2.6-inotify-accounting.patch, merged upstream.


--- NEW FILE patch-2.6.31-rc8-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKmRp3yGugalF9Dw4RAo5kAJ9pBAsvWfdLZ4D44Xws5ycSBjqSXgCcDmcJ
wiRPvCP2CloiAbiLFoyNvzE=
=WyMh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1120
retrieving revision 1.1121
diff -u -p -r1.1120 -r1.1121
--- .cvsignore	28 Aug 2009 15:51:43 -0000	1.1120
+++ .cvsignore	30 Aug 2009 15:23:08 -0000	1.1121
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc8.bz2
+patch-2.6.31-rc8-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1754
retrieving revision 1.1755
diff -u -p -r1.1754 -r1.1755
--- kernel.spec	30 Aug 2009 05:25:01 -0000	1.1754
+++ kernel.spec	30 Aug 2009 15:23:09 -0000	1.1755
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -723,7 +723,6 @@ Patch11010: via-hwmon-temp-sensor.patch
 # patches headed upstream
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
-Patch12012: linux-2.6-inotify-accounting.patch
 
 %endif
 
@@ -1336,7 +1335,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
 # Patches headed upstream
-ApplyPatch linux-2.6-inotify-accounting.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2004,6 +2002,10 @@ fi
 # and build.
 
 %changelog
+* Sun Aug 30 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.31-rc8-git1
+- Drop linux-2.6-inotify-accounting.patch, merged upstream.
+
 * Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com>
 - fix lirc_imon oops on older devices w/o tx ctrl ep (#520008)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1078
retrieving revision 1.1079
diff -u -p -r1.1078 -r1.1079
--- sources	28 Aug 2009 15:51:44 -0000	1.1078
+++ sources	30 Aug 2009 15:23:09 -0000	1.1079
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 d7dce63ebb912ddcd7ac7ed580db03e4  patch-2.6.31-rc8.bz2
+7b4745c59d0ba65bef1d360229e02d50  patch-2.6.31-rc8-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -p -r1.992 -r1.993
--- upstream	28 Aug 2009 15:51:44 -0000	1.992
+++ upstream	30 Aug 2009 15:23:09 -0000	1.993
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc8.bz2
+patch-2.6.31-rc8-git1.bz2


--- linux-2.6-inotify-accounting.patch DELETED ---



From otaylor at fedoraproject.org  Sun Aug 30 15:33:17 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Sun, 30 Aug 2009 15:33:17 +0000 (UTC)
Subject: rpms/clutter/devel .cvsignore, 1.18, 1.19 clutter.spec, 1.34,
	1.35 sources, 1.18, 1.19
Message-ID: <20090830153317.19FFC11C0072@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25480

Modified Files:
	.cvsignore clutter.spec sources 
Log Message:
* Sun Aug 30 2009 Owen Taylor <otaylor at redhat.com> - 1.0.4-1
- Update to 1.0.4, update gobject-introspection requirement



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 Aug 2009 16:36:24 -0000	1.18
+++ .cvsignore	30 Aug 2009 15:33:16 -0000	1.19
@@ -1 +1,2 @@
 clutter-1.0.2.tar.bz2
+clutter-1.0.4.tar.bz2


Index: clutter.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- clutter.spec	14 Aug 2009 16:36:24 -0000	1.34
+++ clutter.spec	30 Aug 2009 15:33:16 -0000	1.35
@@ -1,5 +1,5 @@
 Name:           clutter
-Version:        1.0.2
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
@@ -16,7 +16,7 @@ Requires:       gir-repository
 
 BuildRequires:  glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel
 BuildRequires:  libXdamage-devel gettext gtk-doc
-BuildRequires:  gobject-introspection-devel >= 0.6.3
+BuildRequires:  gobject-introspection-devel >= 0.6.4
 BuildRequires:  gir-repository-devel
 
 Obsoletes: clutter-cairo < 0.9
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Owen Taylor <otaylor at redhat.com> - 1.0.4-1
+- Update to 1.0.4, update gobject-introspection requirement
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	14 Aug 2009 16:36:24 -0000	1.18
+++ sources	30 Aug 2009 15:33:16 -0000	1.19
@@ -1 +1 @@
-498ac921fbe5881a03701877b7ea3edd  clutter-1.0.2.tar.bz2
+7e587d9406e362ea1151a81d37d5460c  clutter-1.0.4.tar.bz2



From caolanm at fedoraproject.org  Sun Aug 30 15:39:17 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 30 Aug 2009 15:39:17 +0000 (UTC)
Subject: rpms/hunspell-ko/devel .cvsignore, 1.6, 1.7 hunspell-ko.spec, 1.7, 
	1.8 sources, 1.6, 1.7
Message-ID: <20090830153917.74EC911C0072@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26623

Modified Files:
	.cvsignore hunspell-ko.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ko/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Jul 2009 09:59:57 -0000	1.6
+++ .cvsignore	30 Aug 2009 15:39:17 -0000	1.7
@@ -1 +1 @@
-hunspell-dict-ko-0.3.2.tar.gz
+hunspell-dict-ko-0.3.3.tar.gz


Index: hunspell-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ko/devel/hunspell-ko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- hunspell-ko.spec	27 Jul 2009 09:10:38 -0000	1.7
+++ hunspell-ko.spec	30 Aug 2009 15:39:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name: hunspell-ko
 Summary: Korean hunspell dictionaries
-Version: 0.3.2
+Version: 0.3.3
 Release: 1%{?dist}
 Source: http://spellcheck-ko.googlecode.com/files/hunspell-dict-ko-%{version}.tar.gz
 Group: Applications/Text
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Sun Aug 30 2009 Caolan McNamara <caolanm at redhat.com> - 0.3.3-1
+- latest version
+
 * Sun Jul 26 2009 Caolan McNamara <caolanm at redhat.com> - 0.3.2-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ko/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Jul 2009 09:59:57 -0000	1.6
+++ sources	30 Aug 2009 15:39:17 -0000	1.7
@@ -1 +1 @@
-d931dfac68f34f2d3cd4fad0c12bfd41  hunspell-dict-ko-0.3.2.tar.gz
+5f9f229720340adb0b356ed9f662b2d9  hunspell-dict-ko-0.3.3.tar.gz



From xulchris at fedoraproject.org  Sun Aug 30 16:15:24 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 16:15:24 +0000 (UTC)
Subject: rpms/cksfv/EL-5 .cvsignore, 1.8, 1.9 cksfv.spec, 1.19, 1.20 sources,
	1.8, 1.9 cksfv-1.3.12-rpmlint.patch, 1.1, NONE
Message-ID: <20090830161524.8333711C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731/EL-5

Modified Files:
	.cvsignore cksfv.spec sources 
Removed Files:
	cksfv-1.3.12-rpmlint.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2008 04:07:01 -0000	1.8
+++ .cvsignore	30 Aug 2009 16:15:23 -0000	1.9
@@ -1 +1 @@
-cksfv-1.3.13.tar.bz2
+cksfv-1.3.14.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/EL-5/cksfv.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cksfv.spec	12 Sep 2008 04:07:01 -0000	1.19
+++ cksfv.spec	30 Aug 2009 16:15:24 -0000	1.20
@@ -1,5 +1,7 @@
+%define package_prefix $RPM_BUILD_ROOT
+
 Name:           cksfv
-Version:        1.3.13
+Version:        1.3.14
 Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
@@ -7,7 +9,6 @@ Group:          Applications/File
 License:        GPLv2
 URL:            http://zakalwe.fi/~shd/foss/cksfv
 Source0:        http://zakalwe.fi/~shd/foss/%{name}/files/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-1.3.12-rpmlint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -18,7 +19,6 @@ checksums.
 
 %prep
 %setup -q
-%patch0 -p0 -b .rpmlint~
 
 # fix rpmlint warnings
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
@@ -30,7 +30,7 @@ CFLAGS="%{optflags}" ./configure \
     --bindir=%{_bindir} \
     --mandir=%{_mandir} \
     --prefix=%{_prefix} \
-    --package-prefix=$RPM_BUILD_ROOT
+    --package-prefix=%{package_prefix}
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.3.14-1
+- Upstream sync
+- Remove no longer needed man page patch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Sep 11 2008 Christopher Stone <chris.stone at gmail.com> 1.3.13-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2008 04:07:01 -0000	1.8
+++ sources	30 Aug 2009 16:15:24 -0000	1.9
@@ -1 +1 @@
-a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2
+138bff42ab23fbba8cca0ae14b2d9e52  cksfv-1.3.14.tar.bz2


--- cksfv-1.3.12-rpmlint.patch DELETED ---



From xulchris at fedoraproject.org  Sun Aug 30 16:15:24 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 16:15:24 +0000 (UTC)
Subject: rpms/cksfv/F-10 .cvsignore, 1.8, 1.9 cksfv.spec, 1.21, 1.22 sources,
	1.8, 1.9 cksfv-1.3.12-rpmlint.patch, 1.1, NONE
Message-ID: <20090830161524.B88BC11C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731/F-10

Modified Files:
	.cvsignore cksfv.spec sources 
Removed Files:
	cksfv-1.3.12-rpmlint.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2008 04:07:02 -0000	1.8
+++ .cvsignore	30 Aug 2009 16:15:24 -0000	1.9
@@ -1 +1 @@
-cksfv-1.3.13.tar.bz2
+cksfv-1.3.14.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-10/cksfv.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- cksfv.spec	12 Sep 2008 04:07:02 -0000	1.21
+++ cksfv.spec	30 Aug 2009 16:15:24 -0000	1.22
@@ -1,5 +1,7 @@
+%define package_prefix $RPM_BUILD_ROOT
+
 Name:           cksfv
-Version:        1.3.13
+Version:        1.3.14
 Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
@@ -7,7 +9,6 @@ Group:          Applications/File
 License:        GPLv2
 URL:            http://zakalwe.fi/~shd/foss/cksfv
 Source0:        http://zakalwe.fi/~shd/foss/%{name}/files/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-1.3.12-rpmlint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -18,7 +19,6 @@ checksums.
 
 %prep
 %setup -q
-%patch0 -p0 -b .rpmlint~
 
 # fix rpmlint warnings
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
@@ -30,7 +30,7 @@ CFLAGS="%{optflags}" ./configure \
     --bindir=%{_bindir} \
     --mandir=%{_mandir} \
     --prefix=%{_prefix} \
-    --package-prefix=$RPM_BUILD_ROOT
+    --package-prefix=%{package_prefix}
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.3.14-1
+- Upstream sync
+- Remove no longer needed man page patch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Sep 11 2008 Christopher Stone <chris.stone at gmail.com> 1.3.13-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2008 04:07:02 -0000	1.8
+++ sources	30 Aug 2009 16:15:24 -0000	1.9
@@ -1 +1 @@
-a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2
+138bff42ab23fbba8cca0ae14b2d9e52  cksfv-1.3.14.tar.bz2


--- cksfv-1.3.12-rpmlint.patch DELETED ---



From xulchris at fedoraproject.org  Sun Aug 30 16:15:25 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 16:15:25 +0000 (UTC)
Subject: rpms/cksfv/F-11 .cvsignore, 1.8, 1.9 cksfv.spec, 1.22, 1.23 sources,
	1.8, 1.9 cksfv-1.3.12-rpmlint.patch, 1.1, NONE
Message-ID: <20090830161525.0D48711C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731/F-11

Modified Files:
	.cvsignore cksfv.spec sources 
Removed Files:
	cksfv-1.3.12-rpmlint.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2008 04:07:02 -0000	1.8
+++ .cvsignore	30 Aug 2009 16:15:24 -0000	1.9
@@ -1 +1 @@
-cksfv-1.3.13.tar.bz2
+cksfv-1.3.14.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-11/cksfv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- cksfv.spec	24 Feb 2009 07:36:09 -0000	1.22
+++ cksfv.spec	30 Aug 2009 16:15:24 -0000	1.23
@@ -1,13 +1,14 @@
+%define package_prefix $RPM_BUILD_ROOT
+
 Name:           cksfv
-Version:        1.3.13
-Release:        2%{?dist}
+Version:        1.3.14
+Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
 Group:          Applications/File
 License:        GPLv2
 URL:            http://zakalwe.fi/~shd/foss/cksfv
 Source0:        http://zakalwe.fi/~shd/foss/%{name}/files/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-1.3.12-rpmlint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -18,7 +19,6 @@ checksums.
 
 %prep
 %setup -q
-%patch0 -p0 -b .rpmlint~
 
 # fix rpmlint warnings
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
@@ -30,7 +30,7 @@ CFLAGS="%{optflags}" ./configure \
     --bindir=%{_bindir} \
     --mandir=%{_mandir} \
     --prefix=%{_prefix} \
-    --package-prefix=$RPM_BUILD_ROOT
+    --package-prefix=%{package_prefix}
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.3.14-1
+- Upstream sync
+- Remove no longer needed man page patch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2008 04:07:02 -0000	1.8
+++ sources	30 Aug 2009 16:15:24 -0000	1.9
@@ -1 +1 @@
-a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2
+138bff42ab23fbba8cca0ae14b2d9e52  cksfv-1.3.14.tar.bz2


--- cksfv-1.3.12-rpmlint.patch DELETED ---



From xulchris at fedoraproject.org  Sun Aug 30 16:15:25 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 16:15:25 +0000 (UTC)
Subject: rpms/cksfv/devel .cvsignore, 1.8, 1.9 cksfv.spec, 1.23, 1.24 sources,
	1.8, 1.9 cksfv-1.3.12-rpmlint.patch, 1.1, NONE
Message-ID: <20090830161525.54E5D11C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/cksfv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731/devel

Modified Files:
	.cvsignore cksfv.spec sources 
Removed Files:
	cksfv-1.3.12-rpmlint.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2008 04:07:02 -0000	1.8
+++ .cvsignore	30 Aug 2009 16:15:25 -0000	1.9
@@ -1 +1 @@
-cksfv-1.3.13.tar.bz2
+cksfv-1.3.14.tar.bz2


Index: cksfv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/devel/cksfv.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- cksfv.spec	24 Jul 2009 18:59:32 -0000	1.23
+++ cksfv.spec	30 Aug 2009 16:15:25 -0000	1.24
@@ -1,13 +1,14 @@
+%define package_prefix $RPM_BUILD_ROOT
+
 Name:           cksfv
-Version:        1.3.13
-Release:        3%{?dist}
+Version:        1.3.14
+Release:        1%{?dist}
 Summary:        Utility to manipulate SFV files
 
 Group:          Applications/File
 License:        GPLv2
 URL:            http://zakalwe.fi/~shd/foss/cksfv
 Source0:        http://zakalwe.fi/~shd/foss/%{name}/files/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-1.3.12-rpmlint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -18,7 +19,6 @@ checksums.
 
 %prep
 %setup -q
-%patch0 -p0 -b .rpmlint~
 
 # fix rpmlint warnings
 iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
@@ -30,7 +30,7 @@ CFLAGS="%{optflags}" ./configure \
     --bindir=%{_bindir} \
     --mandir=%{_mandir} \
     --prefix=%{_prefix} \
-    --package-prefix=$RPM_BUILD_ROOT
+    --package-prefix=%{package_prefix}
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.3.14-1
+- Upstream sync
+- Remove no longer needed man page patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cksfv/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2008 04:07:02 -0000	1.8
+++ sources	30 Aug 2009 16:15:25 -0000	1.9
@@ -1 +1 @@
-a6d7e4f2dc267e670ebb48eb8b806993  cksfv-1.3.13.tar.bz2
+138bff42ab23fbba8cca0ae14b2d9e52  cksfv-1.3.14.tar.bz2


--- cksfv-1.3.12-rpmlint.patch DELETED ---



From rdieter at fedoraproject.org  Sun Aug 30 17:03:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 12:03:54 -0500
Subject: rpms/kdebase/devel kdebase.spec,1.386,1.387
In-Reply-To: <1699680273.413451251627421684.JavaMail.root@zmail06.collab.prod.int.phx2.redhat.com>
References: <1699680273.413451251627421684.JavaMail.root@zmail06.collab.prod.int.phx2.redhat.com>
Message-ID: <4A9AB0FA.8040707@fedoraproject.org>

On 08/30/2009 05:17 AM, Than Ngo wrote:
> it looks wrong for me with the Requires on kde-plasma-folderview in kdebase-workspace.
>
> The current dependency situation in kdebase and kdebase-workspace:
>
> kdebase-workspace requires kde-plasma-folderview that is packaged as sub package
> and kdebase needs BR on kdebase-workspace in order to build! The dependency is wrong.
>
> It still works in rawhide because kdebase only requires kdebase-workspace-devel without version,
> it's also not correct, it has to requires kdebase-workspace-devel>=%{version}
>
> is there any reason why kde-plasma-folderview is packages as subpackage? and why does kdebase-workspace
> require kde-plasma-folderview?

Well, the dep is there, because we want the default kde desktop to 
include folderview, right?

This is less bad than before, where we had kdebase-workspace Requires: 
kdebase

I understand the risk of bootstrapping problems.

I really wish upstream didn't bundle plasma applets (esp arguably 
essential ones like folderview) in kdebase, but in kdebase-workspace 
instead. oh well.

Anyway, I'm open to suggestions on how to better achive what we want 
here.   Maybe drop the kde-plasma-folderview dep, and just add to comps 
instead?

-- Rex



From xulchris at fedoraproject.org  Sun Aug 30 17:21:59 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 17:21:59 +0000 (UTC)
Subject: rpms/perl-MP3-Info/EL-5 .cvsignore, 1.5, 1.6 perl-MP3-Info.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20090830172159.7920511C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/perl-MP3-Info/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20505/EL-5

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2007 14:43:45 -0000	1.5
+++ .cvsignore	30 Aug 2009 17:21:58 -0000	1.6
@@ -1 +1 @@
-MP3-Info-1.23.tar.gz
+MP3-Info-1.24.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/EL-5/perl-MP3-Info.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-MP3-Info.spec	30 Sep 2007 14:46:44 -0000	1.9
+++ perl-MP3-Info.spec	30 Aug 2009 17:21:59 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-MP3-Info
-Version:        1.23
+Version:        1.24
 Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
@@ -52,6 +52,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.24-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-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.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.23-2
+Rebuild for new perl
+
 * Sun Sep 30 2007 Christopher Stone <chris.stone at gmail.com> 1.23-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2007 14:43:45 -0000	1.5
+++ sources	30 Aug 2009 17:21:59 -0000	1.6
@@ -1 +1 @@
-fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz
+fb4bcc43764e3b46c3a7c74b50ed7a44  MP3-Info-1.24.tar.gz



From xulchris at fedoraproject.org  Sun Aug 30 17:21:59 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 17:21:59 +0000 (UTC)
Subject: rpms/perl-MP3-Info/F-10 .cvsignore, 1.5, 1.6 perl-MP3-Info.spec,
	1.11, 1.12 sources, 1.5, 1.6
Message-ID: <20090830172159.E758511C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/perl-MP3-Info/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20505/F-10

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2007 14:43:49 -0000	1.5
+++ .cvsignore	30 Aug 2009 17:21:59 -0000	1.6
@@ -1 +1 @@
-MP3-Info-1.23.tar.gz
+MP3-Info-1.24.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/F-10/perl-MP3-Info.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-MP3-Info.spec	7 Mar 2008 02:08:38 -0000	1.11
+++ perl-MP3-Info.spec	30 Aug 2009 17:21:59 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.23
-Release:        2%{?dist}
+Version:        1.24
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.24-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-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.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.23-2
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2007 14:43:49 -0000	1.5
+++ sources	30 Aug 2009 17:21:59 -0000	1.6
@@ -1 +1 @@
-fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz
+fb4bcc43764e3b46c3a7c74b50ed7a44  MP3-Info-1.24.tar.gz



From xulchris at fedoraproject.org  Sun Aug 30 17:22:00 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 17:22:00 +0000 (UTC)
Subject: rpms/perl-MP3-Info/F-11 .cvsignore, 1.5, 1.6 perl-MP3-Info.spec,
	1.12, 1.13 sources, 1.5, 1.6
Message-ID: <20090830172200.AE0C811C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/perl-MP3-Info/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20505/F-11

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2007 14:43:49 -0000	1.5
+++ .cvsignore	30 Aug 2009 17:21:59 -0000	1.6
@@ -1 +1 @@
-MP3-Info-1.23.tar.gz
+MP3-Info-1.24.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/F-11/perl-MP3-Info.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-MP3-Info.spec	26 Feb 2009 21:16:48 -0000	1.12
+++ perl-MP3-Info.spec	30 Aug 2009 17:22:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.23
-Release:        3%{?dist}
+Version:        1.24
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.24-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-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.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2007 14:43:49 -0000	1.5
+++ sources	30 Aug 2009 17:22:00 -0000	1.6
@@ -1 +1 @@
-fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz
+fb4bcc43764e3b46c3a7c74b50ed7a44  MP3-Info-1.24.tar.gz



From xulchris at fedoraproject.org  Sun Aug 30 17:22:00 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 17:22:00 +0000 (UTC)
Subject: rpms/perl-MP3-Info/devel .cvsignore, 1.5, 1.6 perl-MP3-Info.spec,
	1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20090830172200.E0C7911C02CA@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/perl-MP3-Info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20505/devel

Modified Files:
	.cvsignore perl-MP3-Info.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2007 14:43:49 -0000	1.5
+++ .cvsignore	30 Aug 2009 17:22:00 -0000	1.6
@@ -1 +1 @@
-MP3-Info-1.23.tar.gz
+MP3-Info-1.24.tar.gz


Index: perl-MP3-Info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-MP3-Info.spec	26 Jul 2009 09:05:40 -0000	1.13
+++ perl-MP3-Info.spec	30 Aug 2009 17:22:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-MP3-Info
-Version:        1.23
-Release:        4%{?dist}
+Version:        1.24
+Release:        1%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.24-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MP3-Info/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2007 14:43:49 -0000	1.5
+++ sources	30 Aug 2009 17:22:00 -0000	1.6
@@ -1 +1 @@
-fd0b5e0d88ee01454180e3941ab11541  MP3-Info-1.23.tar.gz
+fb4bcc43764e3b46c3a7c74b50ed7a44  MP3-Info-1.24.tar.gz



From zaitcev at fedoraproject.org  Sun Aug 30 17:41:29 2009
From: zaitcev at fedoraproject.org (Pete Zaitcev)
Date: Sun, 30 Aug 2009 17:41:29 +0000 (UTC)
Subject: rpms/chunkd/devel chunkd.spec,1.15,1.16
Message-ID: <20090830174129.2B25D11C0072@cvs1.fedora.phx.redhat.com>

Author: zaitcev

Update of /cvs/pkgs/rpms/chunkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27475

Modified Files:
	chunkd.spec 
Log Message:
With the new chunkd that Thomas rebuilt (chunkd-0.4-4.fc12), yum update
still bails, like so:

chunkd-0.4-4.fc12.x86_64 from installed has depsolving problems
  --> Missing Dependency: libcrypto.so.8()(64bit) is needed by package chunkd-0.4-4.fc12.x86_64 (installed)
Error: Missing Dependency: libssl.so.8()(64bit) is needed by package chunkd-0.4-4.fc12.x86_64 (installed)




Index: chunkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chunkd/devel/chunkd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- chunkd.spec	27 Aug 2009 07:14:36 -0000	1.15
+++ chunkd.spec	30 Aug 2009 17:41:28 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		chunkd
 Version:	0.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Data storage daemon for cloud computing
 
 Group:		System Environment/Base
@@ -97,6 +97,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Sun Aug 30 2009 Pete Zaitcev <zaitcev at redhat.com> - 0.4-5
+- rebuilt with new openssl, again (for libssl.so.9 now)
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-4
 - rebuilt with new openssl
 



From emaldonado at fedoraproject.org  Sun Aug 30 17:45:15 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun, 30 Aug 2009 17:45:15 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.14,1.15
Message-ID: <20090830174515.9A0DC11C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28442

Modified Files:
	nss-softokn.spec 
Log Message:
Use nss_util_version as it may be different than the version for nss-softoken


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nss-softokn.spec	28 Aug 2009 15:01:17 -0000	1.14
+++ nss-softokn.spec	30 Aug 2009 17:45:15 -0000	1.15
@@ -17,12 +17,12 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          22%{?dist}
+Release:          23%{?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 >= %{version}
+Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -108,7 +108,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
@@ -139,13 +138,15 @@ export USE_64
 %{__make} -C ./mozilla/security/nss
 
 # Set up our package file
+# The nspr_version and nss_util_version globals used here
+# must match the ones nss-softokn has for its Requires. 
 %{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" \
+                          -e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \
                           -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
                           ./mozilla/dist/pkgconfig/nss-softokn.pc
 
@@ -311,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-23
+- Explicitly state via nss_util_version the nss-util version we require
+
 * Fri Aug 28 2009 Warren Togami <wtogami at redhat.com> - 3.12.3.99.3-22
 - caolan's nss-softokn.pc patch
 



From adrian at fedoraproject.org  Sun Aug 30 19:29:37 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 19:29:37 +0000 (UTC)
Subject: rpms/wordpress/F-11 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 wordpress.spec, 1.32, 1.33 changeset_r11798.diff, 1.1, NONE
Message-ID: <20090830192937.BEB2611C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18666

Modified Files:
	.cvsignore sources wordpress.spec 
Removed Files:
	changeset_r11798.diff 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	5 Aug 2009 09:48:31 -0000	1.25
+++ .cvsignore	30 Aug 2009 19:29:37 -0000	1.26
@@ -1 +1 @@
-wordpress-2.8.3.tar.gz
+wordpress-2.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Aug 2009 09:48:32 -0000	1.25
+++ sources	30 Aug 2009 19:29:37 -0000	1.26
@@ -1 +1 @@
-0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz
+0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/wordpress.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- wordpress.spec	11 Aug 2009 10:28:10 -0000	1.32
+++ wordpress.spec	30 Aug 2009 19:29:37 -0000	1.33
@@ -1,9 +1,9 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.3
+Version: 2.8.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,7 +11,6 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
-Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -19,10 +18,13 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
-%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
+# disable update_nag() function
+sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \
+	s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \
+	wp-admin/includes/update.php
 # fix file encoding
 sed -i -e 's/\r//' license.txt
 
@@ -79,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* 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)
+
 * Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
 - another security update to fix "Remote admin reset password":
   http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


--- changeset_r11798.diff DELETED ---



From rdieter at fedoraproject.org  Sun Aug 30 19:30:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 19:30:16 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.98,1.99
Message-ID: <20090830193016.EAEE911C0498@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18961

Modified Files:
	comps-f12.xml.in 
Log Message:
kde-desktop: +kdebase-runtime +kde-plasma-folderview



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- comps-f12.xml.in	27 Aug 2009 14:49:40 -0000	1.98
+++ comps-f12.xml.in	30 Aug 2009 19:30:16 -0000	1.99
@@ -3573,6 +3573,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="mandatory">kdebase-runtime</packagereq>
       <packagereq type="mandatory">kdebase-workspace</packagereq>
       <packagereq type="mandatory">kdelibs</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-qt</packagereq>
@@ -3581,6 +3582,7 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
+      <packagereq type="default">kde-plasma-folderview</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>



From rdieter at fedoraproject.org  Sun Aug 30 19:31:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 19:31:14 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.289,1.290
Message-ID: <20090830193114.C95A711C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19442

Modified Files:
	comps-f11.xml.in 
Log Message:
kde-desktop: +kdm



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- comps-f11.xml.in	27 Aug 2009 15:54:26 -0000	1.289
+++ comps-f11.xml.in	30 Aug 2009 19:31:14 -0000	1.290
@@ -3446,6 +3446,7 @@
       <packagereq type="default">kdeplasma-addons</packagereq>
       <packagereq type="default">kdeutils</packagereq>
       <packagereq type="default">kdeutils-printer-applet</packagereq>
+      <packagereq type="default">kdm</packagereq>
       <packagereq type="default">kftpgrabber</packagereq>
       <packagereq type="default">kipi-plugins</packagereq>
       <packagereq type="default">konq-plugins</packagereq>



From adrian at fedoraproject.org  Sun Aug 30 19:34:11 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 19:34:11 +0000 (UTC)
Subject: rpms/wordpress/F-10 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 wordpress.spec, 1.32, 1.33 changeset_r11798.diff, 1.1, NONE
Message-ID: <20090830193411.1A26F11C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20032

Modified Files:
	.cvsignore sources wordpress.spec 
Removed Files:
	changeset_r11798.diff 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	5 Aug 2009 09:47:32 -0000	1.25
+++ .cvsignore	30 Aug 2009 19:34:10 -0000	1.26
@@ -1 +1 @@
-wordpress-2.8.3.tar.gz
+wordpress-2.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Aug 2009 09:47:32 -0000	1.25
+++ sources	30 Aug 2009 19:34:10 -0000	1.26
@@ -1 +1 @@
-0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz
+0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/wordpress.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- wordpress.spec	11 Aug 2009 11:53:52 -0000	1.32
+++ wordpress.spec	30 Aug 2009 19:34:10 -0000	1.33
@@ -1,9 +1,9 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.3
+Version: 2.8.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,7 +11,6 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
-Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -19,10 +18,13 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
-%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
+# disable update_nag() function
+sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \
+	s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \
+	wp-admin/includes/update.php
 # fix file encoding
 sed -i -e 's/\r//' license.txt
 
@@ -79,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* 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)
+
 * Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
 - another security update to fix "Remote admin reset password":
   http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


--- changeset_r11798.diff DELETED ---



From xulchris at fedoraproject.org  Sun Aug 30 19:37:11 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 19:37:11 +0000 (UTC)
Subject: rpms/php-pear-Crypt-CHAP/EL-5 .cvsignore, 1.3,
	1.4 php-pear-Crypt-CHAP.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090830193712.0160711C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Crypt-CHAP/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20771/EL-5

Modified Files:
	.cvsignore php-pear-Crypt-CHAP.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Mar 2007 23:27:35 -0000	1.3
+++ .cvsignore	30 Aug 2009 19:37:11 -0000	1.4
@@ -1 +1 @@
-Crypt_CHAP-1.0.1.tgz
+Crypt_CHAP-1.0.2.tgz


Index: php-pear-Crypt-CHAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/EL-5/php-pear-Crypt-CHAP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Crypt-CHAP.spec	25 Nov 2007 19:34:22 -0000	1.5
+++ php-pear-Crypt-CHAP.spec	30 Aug 2009 19:37:11 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name Crypt_CHAP
 
 Name:           php-pear-Crypt-CHAP
-Version:        1.0.1
-Release:        1%{?dist}.1
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Class to generate CHAP packets
 
 Group:          Development/Languages
@@ -14,7 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-mhash php-mcrypt
+Requires:       php-pear(PEAR) php-mcrypt
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -28,7 +28,7 @@ mhash and mcrypt extensions must be load
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -40,7 +40,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -68,14 +68,24 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Crypt
 
 
 %changelog
-* Sun Nov 25 2007 Christopher Stone <chris.stone at gmail.com> 1.0.1-1.1
-- undead EL-5 now that depenedencies are available
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-3
+- remove mhash dependency (optional, and not provided by php 5.3.0)
+- rename Crypt_CHAP.xml to php-pear-Crypt-CHAP.xml
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Mar 14 2007 Christopher Stone <chris.stone at gmail.com> 1.0.1-1
 - Upstream sync


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Mar 2007 23:27:35 -0000	1.3
+++ sources	30 Aug 2009 19:37:11 -0000	1.4
@@ -1 +1 @@
-e117935140025a3a2ac3e533430664cc  Crypt_CHAP-1.0.1.tgz
+4175a1d5486f305831adba517009c253  Crypt_CHAP-1.0.2.tgz



From xulchris at fedoraproject.org  Sun Aug 30 19:37:12 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 19:37:12 +0000 (UTC)
Subject: rpms/php-pear-Crypt-CHAP/F-10 .cvsignore, 1.3,
	1.4 php-pear-Crypt-CHAP.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090830193712.313B111C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20771/F-10

Modified Files:
	.cvsignore php-pear-Crypt-CHAP.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Mar 2007 23:27:38 -0000	1.3
+++ .cvsignore	30 Aug 2009 19:37:11 -0000	1.4
@@ -1 +1 @@
-Crypt_CHAP-1.0.1.tgz
+Crypt_CHAP-1.0.2.tgz


Index: php-pear-Crypt-CHAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-10/php-pear-Crypt-CHAP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-Crypt-CHAP.spec	14 Mar 2007 23:27:38 -0000	1.2
+++ php-pear-Crypt-CHAP.spec	30 Aug 2009 19:37:12 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Crypt_CHAP
 
 Name:           php-pear-Crypt-CHAP
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Class to generate CHAP packets
 
@@ -14,7 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-mhash php-mcrypt
+Requires:       php-pear(PEAR) php-mcrypt
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -28,7 +28,7 @@ mhash and mcrypt extensions must be load
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -40,7 +40,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -68,12 +68,25 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Crypt
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-3
+- remove mhash dependency (optional, and not provided by php 5.3.0)
+- rename Crypt_CHAP.xml to php-pear-Crypt-CHAP.xml
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Mar 14 2007 Christopher Stone <chris.stone at gmail.com> 1.0.1-1
 - Upstream sync
 - Remove no longer needed patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Mar 2007 23:27:38 -0000	1.3
+++ sources	30 Aug 2009 19:37:12 -0000	1.4
@@ -1 +1 @@
-e117935140025a3a2ac3e533430664cc  Crypt_CHAP-1.0.1.tgz
+4175a1d5486f305831adba517009c253  Crypt_CHAP-1.0.2.tgz



From xulchris at fedoraproject.org  Sun Aug 30 19:37:12 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 19:37:12 +0000 (UTC)
Subject: rpms/php-pear-Crypt-CHAP/devel .cvsignore, 1.3,
	1.4 php-pear-Crypt-CHAP.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090830193712.8974D11C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Crypt-CHAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20771/devel

Modified Files:
	.cvsignore php-pear-Crypt-CHAP.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Mar 2007 23:27:38 -0000	1.3
+++ .cvsignore	30 Aug 2009 19:37:12 -0000	1.4
@@ -1 +1 @@
-Crypt_CHAP-1.0.1.tgz
+Crypt_CHAP-1.0.2.tgz


Index: php-pear-Crypt-CHAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/devel/php-pear-Crypt-CHAP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-Crypt-CHAP.spec	26 Jul 2009 18:11:50 -0000	1.5
+++ php-pear-Crypt-CHAP.spec	30 Aug 2009 19:37:12 -0000	1.6
@@ -2,8 +2,8 @@
 %define pear_name Crypt_CHAP
 
 Name:           php-pear-Crypt-CHAP
-Version:        1.0.1
-Release:        4%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Class to generate CHAP packets
 
 Group:          Development/Languages
@@ -74,6 +74,9 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Mar 2007 23:27:38 -0000	1.3
+++ sources	30 Aug 2009 19:37:12 -0000	1.4
@@ -1 +1 @@
-e117935140025a3a2ac3e533430664cc  Crypt_CHAP-1.0.1.tgz
+4175a1d5486f305831adba517009c253  Crypt_CHAP-1.0.2.tgz



From xulchris at fedoraproject.org  Sun Aug 30 19:37:12 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 19:37:12 +0000 (UTC)
Subject: rpms/php-pear-Crypt-CHAP/F-11 .cvsignore, 1.3,
	1.4 php-pear-Crypt-CHAP.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090830193712.5FD4011C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20771/F-11

Modified Files:
	.cvsignore php-pear-Crypt-CHAP.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Mar 2007 23:27:38 -0000	1.3
+++ .cvsignore	30 Aug 2009 19:37:12 -0000	1.4
@@ -1 +1 @@
-Crypt_CHAP-1.0.1.tgz
+Crypt_CHAP-1.0.2.tgz


Index: php-pear-Crypt-CHAP.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-11/php-pear-Crypt-CHAP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Crypt-CHAP.spec	26 Feb 2009 20:51:08 -0000	1.3
+++ php-pear-Crypt-CHAP.spec	30 Aug 2009 19:37:12 -0000	1.4
@@ -2,8 +2,8 @@
 %define pear_name Crypt_CHAP
 
 Name:           php-pear-Crypt-CHAP
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Class to generate CHAP packets
 
 Group:          Development/Languages
@@ -14,7 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-mhash php-mcrypt
+Requires:       php-pear(PEAR) php-mcrypt
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -28,7 +28,7 @@ mhash and mcrypt extensions must be load
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -40,7 +40,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -68,12 +68,22 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Crypt
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-3
+- remove mhash dependency (optional, and not provided by php 5.3.0)
+- rename Crypt_CHAP.xml to php-pear-Crypt-CHAP.xml
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Crypt-CHAP/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Mar 2007 23:27:38 -0000	1.3
+++ sources	30 Aug 2009 19:37:12 -0000	1.4
@@ -1 +1 @@
-e117935140025a3a2ac3e533430664cc  Crypt_CHAP-1.0.1.tgz
+4175a1d5486f305831adba517009c253  Crypt_CHAP-1.0.2.tgz



From adrian at fedoraproject.org  Sun Aug 30 19:38:57 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Sun, 30 Aug 2009 19:38:57 +0000 (UTC)
Subject: rpms/wordpress/EL-5 .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 wordpress.spec, 1.31, 1.32 changeset_r11798.diff, 1.1, NONE
Message-ID: <20090830193857.E954911C0072@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21337

Modified Files:
	.cvsignore sources wordpress.spec 
Removed Files:
	changeset_r11798.diff 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	5 Aug 2009 09:49:02 -0000	1.24
+++ .cvsignore	30 Aug 2009 19:38:57 -0000	1.25
@@ -1 +1 @@
-wordpress-2.8.3.tar.gz
+wordpress-2.8.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	5 Aug 2009 09:49:02 -0000	1.24
+++ sources	30 Aug 2009 19:38:57 -0000	1.25
@@ -1 +1 @@
-0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz
+0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/wordpress.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wordpress.spec	11 Aug 2009 11:55:22 -0000	1.31
+++ wordpress.spec	30 Aug 2009 19:38:57 -0000	1.32
@@ -1,9 +1,9 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.3
+Version: 2.8.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,7 +11,6 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
-Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -19,10 +18,13 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
-%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
+# disable update_nag() function
+sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \
+	s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \
+	wp-admin/includes/update.php
 # fix file encoding
 sed -i -e 's/\r//' license.txt
 
@@ -79,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* 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)
+
 * Tue Aug 11 2009 Adrian Reber <adrian at lisas.de> - 2.8.3-2
 - another security update to fix "Remote admin reset password":
   http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html


--- changeset_r11798.diff DELETED ---



From rdieter at fedoraproject.org  Sun Aug 30 19:52:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 19:52:11 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.316,1.317
Message-ID: <20090830195211.CCF2411C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26512

Modified Files:
	qt.spec 
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
- use platform linux-g++ everwhere (ie, drop linux-g++-64 on 64 bit),
  avoids plugin/linker weirdness described in bug #475110



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- qt.spec	26 Aug 2009 08:58:08 -0000	1.316
+++ qt.spec	30 Aug 2009 19:52:11 -0000	1.317
@@ -14,7 +14,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -401,11 +401,9 @@ Qt libraries used for drawing widgets an
 # 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 \
@@ -920,6 +918,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
+- use platform linux-g++ everwhere (ie, drop linux-g++-64 on 64 bit),
+  avoids plugin/linker weirdness described in bug #475110
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11
 - rebuilt with new openssl
 



From rdieter at fedoraproject.org  Sun Aug 30 20:04:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 20:04:58 +0000 (UTC)
Subject: rpms/maxima/devel .cvsignore, 1.32, 1.33 maxima.spec, 1.137,
	1.138 sources, 1.30, 1.31
Message-ID: <20090830200458.A6DB911C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29506

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
- maxima-5.19.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Aug 2009 01:20:48 -0000	1.32
+++ .cvsignore	30 Aug 2009 20:04:58 -0000	1.33
@@ -3,3 +3,4 @@ macref.pdf
 maxima.png
 maximabook-19-Sept-2004.pdf
 maxima-5.19.1.tar.gz
+maxima-5.19.2.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- maxima.spec	23 Aug 2009 01:20:48 -0000	1.137
+++ maxima.spec	30 Aug 2009 20:04:58 -0000	1.138
@@ -1,7 +1,7 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.19.1
+Version: 5.19.2
 
 Release: 1%{?dist} 
 License: GPLv2
@@ -433,6 +433,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-1
+- maxima-5.19.2
+
 * Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.1-1
 - maxima-5.19.1
 - -gui: optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	23 Aug 2009 01:20:49 -0000	1.30
+++ sources	30 Aug 2009 20:04:58 -0000	1.31
@@ -2,3 +2,4 @@
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
 2da3872c0bdcc0446ee933392a907f50  maxima.png
 5b23dcfccad10988e344a839a0fbbe2b  maxima-5.19.1.tar.gz
+c75eec2586f5be18e02978e70fac0b07  maxima-5.19.2.tar.gz



From xulchris at fedoraproject.org  Sun Aug 30 20:05:39 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 20:05:39 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/EL-5 .cvsignore, 1.6,
	1.7 php-pear-Date-Holidays.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090830200539.C9CB511C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29741/EL-5

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstread sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Sep 2008 07:12:18 -0000	1.6
+++ .cvsignore	30 Aug 2009 20:05:39 -0000	1.7
@@ -1 +1 @@
-Date_Holidays-0.20.1.tgz
+Date_Holidays-0.21.4.tgz


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/EL-5/php-pear-Date-Holidays.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-Date-Holidays.spec	12 Sep 2008 07:12:18 -0000	1.8
+++ php-pear-Date-Holidays.spec	30 Aug 2009 20:05:39 -0000	1.9
@@ -2,7 +2,7 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.20.1
+Version:        0.21.4
 Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
@@ -84,6 +84,15 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 0.20.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Sep 2008 07:12:18 -0000	1.6
+++ sources	30 Aug 2009 20:05:39 -0000	1.7
@@ -1 +1 @@
-b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz
+01b6c79c0e940261153421540d6143f1  Date_Holidays-0.21.4.tgz



From xulchris at fedoraproject.org  Sun Aug 30 20:05:40 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 20:05:40 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/devel .cvsignore, 1.7,
	1.8 php-pear-Date-Holidays.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20090830200540.790E011C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29741/devel

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstread sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2008 07:12:19 -0000	1.7
+++ .cvsignore	30 Aug 2009 20:05:40 -0000	1.8
@@ -1 +1 @@
-Date_Holidays-0.20.1.tgz
+Date_Holidays-0.21.4.tgz


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/devel/php-pear-Date-Holidays.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-pear-Date-Holidays.spec	26 Jul 2009 18:13:30 -0000	1.11
+++ php-pear-Date-Holidays.spec	30 Aug 2009 20:05:40 -0000	1.12
@@ -2,8 +2,8 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.20.1
-Release:        3%{?dist}
+Version:        0.21.4
+Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Sep 2008 07:12:19 -0000	1.7
+++ sources	30 Aug 2009 20:05:40 -0000	1.8
@@ -1 +1 @@
-b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz
+01b6c79c0e940261153421540d6143f1  Date_Holidays-0.21.4.tgz



From xulchris at fedoraproject.org  Sun Aug 30 20:05:40 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 20:05:40 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/F-10 .cvsignore, 1.7,
	1.8 php-pear-Date-Holidays.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090830200540.064F811C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29741/F-10

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstread sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2008 07:12:19 -0000	1.7
+++ .cvsignore	30 Aug 2009 20:05:39 -0000	1.8
@@ -1 +1 @@
-Date_Holidays-0.20.1.tgz
+Date_Holidays-0.21.4.tgz


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-10/php-pear-Date-Holidays.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- php-pear-Date-Holidays.spec	12 Sep 2008 07:12:19 -0000	1.9
+++ php-pear-Date-Holidays.spec	30 Aug 2009 20:05:39 -0000	1.10
@@ -2,7 +2,7 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.20.1
+Version:        0.21.4
 Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
@@ -84,6 +84,15 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 12 2008 Christopher Stone <chris.stone at gmail.com> 0.20.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Sep 2008 07:12:19 -0000	1.7
+++ sources	30 Aug 2009 20:05:39 -0000	1.8
@@ -1 +1 @@
-b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz
+01b6c79c0e940261153421540d6143f1  Date_Holidays-0.21.4.tgz



From xulchris at fedoraproject.org  Sun Aug 30 20:05:40 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 20:05:40 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/F-11 .cvsignore, 1.7,
	1.8 php-pear-Date-Holidays.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20090830200540.45D7A11C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29741/F-11

Modified Files:
	.cvsignore php-pear-Date-Holidays.spec sources 
Log Message:
upstread sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2008 07:12:19 -0000	1.7
+++ .cvsignore	30 Aug 2009 20:05:40 -0000	1.8
@@ -1 +1 @@
-Date_Holidays-0.20.1.tgz
+Date_Holidays-0.21.4.tgz


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-11/php-pear-Date-Holidays.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- php-pear-Date-Holidays.spec	26 Feb 2009 21:04:11 -0000	1.10
+++ php-pear-Date-Holidays.spec	30 Aug 2009 20:05:40 -0000	1.11
@@ -2,8 +2,8 @@
 %define pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
-Version:        0.20.1
-Release:        2%{?dist}
+Version:        0.21.4
+Release:        1%{?dist}
 Summary:        Driver based class to calculate holidays
 
 Group:          Development/Libraries
@@ -84,6 +84,12 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Sep 2008 07:12:19 -0000	1.7
+++ sources	30 Aug 2009 20:05:40 -0000	1.8
@@ -1 +1 @@
-b481badb7dab8706a49576e726a3add5  Date_Holidays-0.20.1.tgz
+01b6c79c0e940261153421540d6143f1  Date_Holidays-0.21.4.tgz



From xulchris at fedoraproject.org  Sun Aug 30 20:06:26 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 20:06:26 +0000 (UTC)
Subject: rpms/php-pear-Date-Holidays/devel php-pear-Date-Holidays.spec, 1.12,
	1.13
Message-ID: <20090830200626.8CEB011C0072@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-Date-Holidays/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29980

Modified Files:
	php-pear-Date-Holidays.spec 
Log Message:
oops


Index: php-pear-Date-Holidays.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Date-Holidays/devel/php-pear-Date-Holidays.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-pear-Date-Holidays.spec	30 Aug 2009 20:05:40 -0000	1.12
+++ php-pear-Date-Holidays.spec	30 Aug 2009 20:06:26 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Date-Holidays
 Version:        0.21.4
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Driver based class to calculate holidays
 
 Group:          Development/Libraries
@@ -84,7 +84,7 @@ fi
 
 
 %changelog
-* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1.1
 - Upstream sync
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-3



From rdieter at fedoraproject.org  Sun Aug 30 20:08:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 20:08:00 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.317,1.318
Message-ID: <20090830200800.051A811C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30304

Modified Files:
	qt.spec 
Log Message:
typo



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- qt.spec	30 Aug 2009 19:52:11 -0000	1.317
+++ qt.spec	30 Aug 2009 20:07:59 -0000	1.318
@@ -919,7 +919,7 @@ fi
 
 %changelog
 * Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
-- use platform linux-g++ everwhere (ie, drop linux-g++-64 on 64 bit),
+- use platform linux-g++ everywhere (ie, drop linux-g++-64 on 64 bit),
   avoids plugin/linker weirdness described in bug #475110
 
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11



From pingou at fedoraproject.org  Sun Aug 30 20:11:54 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun, 30 Aug 2009 20:11:54 +0000 (UTC)
Subject: rpms/R-affy/devel R-affy.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090830201154.2E42C11C0072@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31030/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R-affy.spec import.log 
Log Message:
Original import



--- NEW FILE R-affy.spec ---
%global packname  affy
%global bioc      2.4

Name:             R-%{packname}
Version:          1.22.1
Release:          3%{?dist}
Summary:          Methods for Affymetrix Oligonucleotide Arrays

Group:            Applications/Engineering 
License:          LGPLv2+ 
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R >= 2.8.0 R-Biobase R-tkWidgets R-preprocessCore R-affyio
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tex(latex) R-Biobase R-tkWidgets R-preprocessCore-devel R-affyio

%description
The package contains functions for exploratory oligonucleotide array 
analysis. 

The dependancy to tkWidgets only concerns few convenience 
functions. 'affy' is fully  functional without it.

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


# x86/x86_64 -> Architecture dependent package
mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

%check
# Circular dependency with affydata
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
#i386 arch
%dir %{_libdir}/R/library/%{packname}
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/doc
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%doc %{_libdir}/R/library/%{packname}/NEWS
%doc %{_libdir}/R/library/%{packname}/CITATION
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/data
%{_libdir}/R/library/%{packname}/libs
%{_libdir}/R/library/%{packname}/demo
%{_libdir}/R/library/%{packname}/tests

%changelog
* Sun Aug 31 2009 pingou <pingou at pingoured.fr> 1.22.1-3
- Change BR from tetex-latex to tex(latex) to reflect new guidelines change
- Correct typo in the description

* Wed Aug 19 2009 pingou <pingou at pingoured.fr> 1.22.1-2
- Add R-preprocessCore-devel as BR (oops)

* Wed Aug 19 2009 pingou <pingou at pingoured.fr> 1.22.1-1
- Update to 1.22.1 which correct license issue

* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.22.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-affy-1_22_1-3_fc11:HEAD:R-affy-1.22.1-3.fc11.src.rpm:1251662999


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-affy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 15:55:06 -0000	1.1
+++ .cvsignore	30 Aug 2009 20:11:53 -0000	1.2
@@ -0,0 +1 @@
+affy_1.22.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 15:55:06 -0000	1.1
+++ sources	30 Aug 2009 20:11:54 -0000	1.2
@@ -0,0 +1 @@
+5e71066d756195cdfa250548b242f9af  affy_1.22.1.tar.gz



From pingou at fedoraproject.org  Sun Aug 30 20:13:06 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun, 30 Aug 2009 20:13:06 +0000 (UTC)
Subject: rpms/R-affy/F-10 R-affy.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090830201306.5534511C0072@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31603/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	R-affy.spec import.log 
Log Message:
Original import



--- NEW FILE R-affy.spec ---
%global packname  affy
%global bioc      2.4

Name:             R-%{packname}
Version:          1.22.1
Release:          3%{?dist}
Summary:          Methods for Affymetrix Oligonucleotide Arrays

Group:            Applications/Engineering 
License:          LGPLv2+ 
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R >= 2.8.0 R-Biobase R-tkWidgets R-preprocessCore R-affyio
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tex(latex) R-Biobase R-tkWidgets R-preprocessCore-devel R-affyio

%description
The package contains functions for exploratory oligonucleotide array 
analysis. 

The dependancy to tkWidgets only concerns few convenience 
functions. 'affy' is fully  functional without it.

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


# x86/x86_64 -> Architecture dependent package
mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

%check
# Circular dependency with affydata
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
#i386 arch
%dir %{_libdir}/R/library/%{packname}
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/doc
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%doc %{_libdir}/R/library/%{packname}/NEWS
%doc %{_libdir}/R/library/%{packname}/CITATION
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/data
%{_libdir}/R/library/%{packname}/libs
%{_libdir}/R/library/%{packname}/demo
%{_libdir}/R/library/%{packname}/tests

%changelog
* Sun Aug 31 2009 pingou <pingou at pingoured.fr> 1.22.1-3
- Change BR from tetex-latex to tex(latex) to reflect new guidelines change
- Correct typo in the description

* Wed Aug 19 2009 pingou <pingou at pingoured.fr> 1.22.1-2
- Add R-preprocessCore-devel as BR (oops)

* Wed Aug 19 2009 pingou <pingou at pingoured.fr> 1.22.1-1
- Update to 1.22.1 which correct license issue

* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.22.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-affy-1_22_1-3_fc11:F-10:R-affy-1.22.1-3.fc11.src.rpm:1251663114


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-affy/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 15:55:06 -0000	1.1
+++ .cvsignore	30 Aug 2009 20:13:06 -0000	1.2
@@ -0,0 +1 @@
+affy_1.22.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affy/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 15:55:06 -0000	1.1
+++ sources	30 Aug 2009 20:13:06 -0000	1.2
@@ -0,0 +1 @@
+5e71066d756195cdfa250548b242f9af  affy_1.22.1.tar.gz



From pingou at fedoraproject.org  Sun Aug 30 20:13:57 2009
From: pingou at fedoraproject.org (pingou)
Date: Sun, 30 Aug 2009 20:13:57 +0000 (UTC)
Subject: rpms/R-affy/F-11 R-affy.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090830201357.8AD3411C0072@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31915/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	R-affy.spec import.log 
Log Message:
Original import



--- NEW FILE R-affy.spec ---
%global packname  affy
%global bioc      2.4

Name:             R-%{packname}
Version:          1.22.1
Release:          3%{?dist}
Summary:          Methods for Affymetrix Oligonucleotide Arrays

Group:            Applications/Engineering 
License:          LGPLv2+ 
URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/%{packname}.html
Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:         R >= 2.8.0 R-Biobase R-tkWidgets R-preprocessCore R-affyio
Requires(post):   R
Requires(postun): R
BuildRequires:    R-devel tex(latex) R-Biobase R-tkWidgets R-preprocessCore-devel R-affyio

%description
The package contains functions for exploratory oligonucleotide array 
analysis. 

The dependancy to tkWidgets only concerns few convenience 
functions. 'affy' is fully  functional without it.

%prep
%setup -q -c -n %{packname}

%build

%install
rm -rf %{buildroot}


# x86/x86_64 -> Architecture dependent package
mkdir -p %{buildroot}%{_libdir}/R/library 
R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
# Clean up in advance of check
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_libdir}/R/library/R.css

%check
# Circular dependency with affydata
#%{_bindir}/R CMD check %{packname}

%clean
rm -rf %{buildroot}

%post
%{_R_make_search_index}

%postun
%{_R_make_search_index}

%files
%defattr(-, root, root, -)
#i386 arch
%dir %{_libdir}/R/library/%{packname}
%doc %{_libdir}/R/library/%{packname}/latex
%doc %{_libdir}/R/library/%{packname}/doc
%doc %{_libdir}/R/library/%{packname}/html
%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
%doc %{_libdir}/R/library/%{packname}/man
%doc %{_libdir}/R/library/%{packname}/NEWS
%doc %{_libdir}/R/library/%{packname}/CITATION
%{_libdir}/R/library/%{packname}/CONTENTS
%{_libdir}/R/library/%{packname}/INDEX
%{_libdir}/R/library/%{packname}/NAMESPACE
%{_libdir}/R/library/%{packname}/Meta
%{_libdir}/R/library/%{packname}/R
%{_libdir}/R/library/%{packname}/R-ex
%{_libdir}/R/library/%{packname}/help
%{_libdir}/R/library/%{packname}/data
%{_libdir}/R/library/%{packname}/libs
%{_libdir}/R/library/%{packname}/demo
%{_libdir}/R/library/%{packname}/tests

%changelog
* Sun Aug 31 2009 pingou <pingou at pingoured.fr> 1.22.1-3
- Change BR from tetex-latex to tex(latex) to reflect new guidelines change
- Correct typo in the description

* Wed Aug 19 2009 pingou <pingou at pingoured.fr> 1.22.1-2
- Add R-preprocessCore-devel as BR (oops)

* Wed Aug 19 2009 pingou <pingou at pingoured.fr> 1.22.1-1
- Update to 1.22.1 which correct license issue

* Sat Aug 01 2009 pingou <pingou at pingoured.fr> 1.22.0-1
- initial package for Fedora


--- NEW FILE import.log ---
R-affy-1_22_1-3_fc11:F-11:R-affy-1.22.1-3.fc11.src.rpm:1251663175


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-affy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 15:55:06 -0000	1.1
+++ .cvsignore	30 Aug 2009 20:13:57 -0000	1.2
@@ -0,0 +1 @@
+affy_1.22.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 15:55:06 -0000	1.1
+++ sources	30 Aug 2009 20:13:57 -0000	1.2
@@ -0,0 +1 @@
+5e71066d756195cdfa250548b242f9af  affy_1.22.1.tar.gz



From hoangelos at fedoraproject.org  Sun Aug 30 20:23:14 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Sun, 30 Aug 2009 20:23:14 +0000 (UTC)
Subject: rpms/python-werkzeug/EL-5 python-werkzeug.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090830202314.852DA11C0072@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-werkzeug/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1361/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	python-werkzeug.spec 
Log Message:
initial import for EL-5



--- NEW FILE python-werkzeug.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname Werkzeug

Name:           python-werkzeug
Version:        0.5.1
Release:        1%{?dist}
Summary:        The Swiss Army knife of Python web development 

Group:          Development/Libraries
License:        BSD
URL:            http://werkzeug.pocoo.org/
Source0:        http://pypi.python.org/packages/source/W/Werkzeug/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-nose
BuildRequires:  python-setuptools-devel

%description
Werkzeug
========

Werkzeug started as simple collection of various utilities for WSGI
applications and has become one of the most advanced WSGI utility
modules.  It includes a powerful debugger, full featured request and
response objects, HTTP utilities to handle entity tags, cache control
headers, HTTP dates, cookie handling, file uploads, a powerful URL
routing system and a bunch of community contributed addon modules.

Werkzeug is unicode aware and doesn't enforce a specific template
engine, database adapter or anything else.  It doesn't even enforce
a specific way of handling requests and leaves all that up to the
developer. It's most useful for end user applications which should work
on as many server environments as possible (such as blogs, wikis,
bulletin boards, etc.).

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description doc
Documentation and examples for %{name}.

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i 's/\r//' LICENSE
%{__sed} -i 's/\r//' docs/makearchive.py
%{__sed} -i 's/\r//' docs/_build/html/_static/pygments.css
%{__sed} -i 's/\r//' docs/_build/html/objects.inv
%{__sed} -i 's/\r//' PKG-INFO

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__rm} -rf docs/_build/html/.buildinfo

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE PKG-INFO CHANGES
%{python_sitelib}/*

%files doc
%defattr(-,root,root,-)
%doc docs/_build/html examples

%changelog
* Tue Aug 25 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.5.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:28:46 -0000	1.1
+++ .cvsignore	30 Aug 2009 20:23:14 -0000	1.2
@@ -0,0 +1 @@
+Werkzeug-0.5.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:28:46 -0000	1.1
+++ sources	30 Aug 2009 20:23:14 -0000	1.2
@@ -0,0 +1 @@
+620955f34b8424c92674fe76d5c47679  Werkzeug-0.5.1.zip



From rdieter at fedoraproject.org  Sun Aug 30 20:25:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 30 Aug 2009 20:25:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.277,1.278
Message-ID: <20090830202541.7B18711C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2091

Modified Files:
	kdebase-workspace.spec 
Log Message:
+- drop Requires: kde-plasma-folderview, rely on comps instead



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- kdebase-workspace.spec	28 Aug 2009 13:03:23 -0000	1.277
+++ kdebase-workspace.spec	30 Aug 2009 20:25:41 -0000	1.278
@@ -119,7 +119,6 @@ Requires: leonidas-kde-theme
 Requires: system-backgrounds-kde
 %endif
 
-Requires: kde-plasma-folderview
 Requires: kio_sysinfo
 
 %description
@@ -572,6 +571,7 @@ fi
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- drop Requires: kde-plasma-folderview, rely on comps instead
 
 * Fri Aug 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.3.0-102
 - Fix typo



From hoangelos at fedoraproject.org  Sun Aug 30 20:32:09 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Sun, 30 Aug 2009 20:32:09 +0000 (UTC)
Subject: rpms/python-werkzeug/EL-4 import.log, NONE, 1.1 python-werkzeug.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090830203209.50A1C11C0072@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-werkzeug/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3685/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-werkzeug.spec 
Log Message:
Initial import for EPEL 4



--- NEW FILE import.log ---
python-werkzeug-0_5_1-1_el4:EL-4:python-werkzeug-0.5.1-1.el4.src.rpm:1251664269


--- NEW FILE python-werkzeug.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname Werkzeug

Name:           python-werkzeug
Version:        0.5.1
Release:        1%{?dist}
Summary:        The Swiss Army knife of Python web development 

Group:          Development/Libraries
License:        BSD
URL:            http://werkzeug.pocoo.org/
Source0:        http://pypi.python.org/packages/source/W/Werkzeug/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-nose
BuildRequires:  python-setuptools-devel

%description
Werkzeug
========

Werkzeug started as simple collection of various utilities for WSGI
applications and has become one of the most advanced WSGI utility
modules.  It includes a powerful debugger, full featured request and
response objects, HTTP utilities to handle entity tags, cache control
headers, HTTP dates, cookie handling, file uploads, a powerful URL
routing system and a bunch of community contributed addon modules.

Werkzeug is unicode aware and doesn't enforce a specific template
engine, database adapter or anything else.  It doesn't even enforce
a specific way of handling requests and leaves all that up to the
developer. It's most useful for end user applications which should work
on as many server environments as possible (such as blogs, wikis,
bulletin boards, etc.).

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description doc
Documentation and examples for %{name}.

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i 's/\r//' LICENSE
%{__sed} -i 's/\r//' docs/makearchive.py
%{__sed} -i 's/\r//' docs/_build/html/_static/pygments.css
%{__sed} -i 's/\r//' docs/_build/html/objects.inv
%{__sed} -i 's/\r//' PKG-INFO

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__rm} -rf docs/_build/html/.buildinfo

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE PKG-INFO CHANGES
%{python_sitelib}/*

%files doc
%defattr(-,root,root,-)
%doc docs/_build/html examples

%changelog
* Tue Aug 25 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.5.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:28:46 -0000	1.1
+++ .cvsignore	30 Aug 2009 20:32:09 -0000	1.2
@@ -0,0 +1 @@
+Werkzeug-0.5.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-werkzeug/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:28:46 -0000	1.1
+++ sources	30 Aug 2009 20:32:09 -0000	1.2
@@ -0,0 +1 @@
+620955f34b8424c92674fe76d5c47679  Werkzeug-0.5.1.zip



From bpepple at fedoraproject.org  Sun Aug 30 20:54:59 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 30 Aug 2009 20:54:59 +0000 (UTC)
Subject: rpms/telepathy-stream-engine/devel .cvsignore, 1.10, 1.11 sources, 
	1.10, 1.11 telepathy-stream-engine.spec, 1.16, 1.17
Message-ID: <20090830205459.2AB8711C0072@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-stream-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7636

Modified Files:
	.cvsignore sources telepathy-stream-engine.spec 
Log Message:
* Sun Aug 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.11-1
- Update to 0.5.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Jun 2009 22:00:30 -0000	1.10
+++ .cvsignore	30 Aug 2009 20:54:58 -0000	1.11
@@ -1 +1 @@
-telepathy-stream-engine-0.5.9.tar.gz
+telepathy-stream-engine-0.5.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Jun 2009 22:00:30 -0000	1.10
+++ sources	30 Aug 2009 20:54:58 -0000	1.11
@@ -1 +1 @@
-df37bd8e4e9d847aeabf7971420efc0b  telepathy-stream-engine-0.5.9.tar.gz
+f2825be01352c721e83b971b7bd7575a  telepathy-stream-engine-0.5.11.tar.gz


Index: telepathy-stream-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-stream-engine/devel/telepathy-stream-engine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- telepathy-stream-engine.spec	27 Jul 2009 05:45:21 -0000	1.16
+++ telepathy-stream-engine.spec	30 Aug 2009 20:54:58 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           telepathy-stream-engine
-Version:        0.5.9
-Release:        2%{?dist}
+Version:        0.5.11
+Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming
 
 Group:          Applications/Communications
@@ -9,13 +9,14 @@ URL:            http://telepathy.freedes
 Source0:        http://telepathy.freedesktop.org/releases/stream-engine/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  farsight2-devel >= 0.0.3
-BuildRequires:  telepathy-farsight-devel >= 0.0.3
+BuildRequires:  farsight2-devel >= 0.0.14
+BuildRequires:  telepathy-farsight-devel >= 0.0.8
 BuildRequires:	dbus-devel >= 0.95
 BuildRequires:	dbus-glib-devel >= 0.73
-BuildRequires:	telepathy-glib-devel >= 0.7.8
+BuildRequires:	telepathy-glib-devel >= 0.7.20
 BuildRequires:	gtk2-devel
-BuildRequires:	gstreamer-plugins-base-devel
+BuildRequires:	gstreamer-devel >= 0.10.23
+BuildRequires:	gstreamer-plugins-base-devel 
 BuildRequires:	libX11-devel
 BuildRequires:	libxslt
 
@@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.11-1
+- Update to 0.5.11.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From xulchris at fedoraproject.org  Sun Aug 30 21:00:33 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 21:00:33 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject/EL-5 .cvsignore, 1.5,
	1.6 php-pear-DB-DataObject.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090830210033.609B211C0349@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9335/EL-5

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 22:42:47 -0000	1.5
+++ .cvsignore	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-DB_DataObject-1.8.8.tgz
+DB_DataObject-1.8.12.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/EL-5/php-pear-DB-DataObject.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- php-pear-DB-DataObject.spec	7 Feb 2008 22:42:47 -0000	1.5
+++ php-pear-DB-DataObject.spec	30 Aug 2009 21:00:33 -0000	1.6
@@ -2,12 +2,12 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.8
+Version:        1.8.12
 Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        PHP-LICENSE-3.01
@@ -92,6 +92,18 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.8.12-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.8-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.8.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.8.8-2
+- fix license tag
+
 * Thu Feb  7 2008 Christopher Stone <chris.stone at gmail.com> 1.8.8-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Feb 2008 22:42:47 -0000	1.5
+++ sources	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-0a6d64bb56591fc2cbc31dfa98e303a5  DB_DataObject-1.8.8.tgz
+cc50ac72ba214f4286e262c1b54ea9f0  DB_DataObject-1.8.12.tgz



From xulchris at fedoraproject.org  Sun Aug 30 21:00:33 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 21:00:33 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject/F-10 .cvsignore, 1.5,
	1.6 php-pear-DB-DataObject.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090830210033.8EAEF11C0349@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9335/F-10

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 22:43:11 -0000	1.5
+++ .cvsignore	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-DB_DataObject-1.8.8.tgz
+DB_DataObject-1.8.12.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/F-10/php-pear-DB-DataObject.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-pear-DB-DataObject.spec	28 Aug 2008 18:40:04 -0000	1.6
+++ php-pear-DB-DataObject.spec	30 Aug 2009 21:00:33 -0000	1.7
@@ -2,8 +2,8 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.8
-Release:        2%{?dist}
+Version:        1.8.12
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
@@ -92,6 +92,15 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.8.12-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.8-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.8.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.8.8-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Feb 2008 22:43:11 -0000	1.5
+++ sources	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-0a6d64bb56591fc2cbc31dfa98e303a5  DB_DataObject-1.8.8.tgz
+cc50ac72ba214f4286e262c1b54ea9f0  DB_DataObject-1.8.12.tgz



From xulchris at fedoraproject.org  Sun Aug 30 21:00:33 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 21:00:33 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject/F-11 .cvsignore, 1.5,
	1.6 php-pear-DB-DataObject.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090830210033.E88EC11C0349@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9335/F-11

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 22:43:11 -0000	1.5
+++ .cvsignore	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-DB_DataObject-1.8.8.tgz
+DB_DataObject-1.8.12.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/F-11/php-pear-DB-DataObject.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-DB-DataObject.spec	26 Feb 2009 20:53:02 -0000	1.7
+++ php-pear-DB-DataObject.spec	30 Aug 2009 21:00:33 -0000	1.8
@@ -2,8 +2,8 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.8
-Release:        3%{?dist}
+Version:        1.8.12
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
@@ -92,6 +92,12 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.8.12-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.8-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.8.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Feb 2008 22:43:11 -0000	1.5
+++ sources	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-0a6d64bb56591fc2cbc31dfa98e303a5  DB_DataObject-1.8.8.tgz
+cc50ac72ba214f4286e262c1b54ea9f0  DB_DataObject-1.8.12.tgz



From xulchris at fedoraproject.org  Sun Aug 30 21:00:34 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 30 Aug 2009 21:00:34 +0000 (UTC)
Subject: rpms/php-pear-DB-DataObject/devel .cvsignore, 1.5,
	1.6 php-pear-DB-DataObject.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090830210034.4611911C0349@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-pear-DB-DataObject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9335/devel

Modified Files:
	.cvsignore php-pear-DB-DataObject.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 22:43:11 -0000	1.5
+++ .cvsignore	30 Aug 2009 21:00:33 -0000	1.6
@@ -1 +1 @@
-DB_DataObject-1.8.8.tgz
+DB_DataObject-1.8.12.tgz


Index: php-pear-DB-DataObject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/devel/php-pear-DB-DataObject.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-pear-DB-DataObject.spec	26 Jul 2009 18:12:30 -0000	1.8
+++ php-pear-DB-DataObject.spec	30 Aug 2009 21:00:34 -0000	1.9
@@ -2,8 +2,8 @@
 %define pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.8
-Release:        4%{?dist}
+Version:        1.8.12
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ fi
 
 
 %changelog
+* Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.8.12-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-DB-DataObject/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Feb 2008 22:43:11 -0000	1.5
+++ sources	30 Aug 2009 21:00:34 -0000	1.6
@@ -1 +1 @@
-0a6d64bb56591fc2cbc31dfa98e303a5  DB_DataObject-1.8.8.tgz
+cc50ac72ba214f4286e262c1b54ea9f0  DB_DataObject-1.8.12.tgz



From devrim at fedoraproject.org  Sun Aug 30 21:07:09 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:07:09 +0000 (UTC)
Subject: rpms/mapserver/devel .cvsignore, 1.10, 1.11 mapserver.spec, 1.30,
	1.31 sources, 1.12, 1.13
Message-ID: <20090830210709.A7AA511C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10894

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
- Update to 5.4.2, which fixes CVE-2009-0840 and various fixes
  described in :
  http://trac.osgeo.org/mapserver/browser/tags/rel-5-4-2/mapserver/HISTORY.TXT




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Jun 2009 20:36:30 -0000	1.10
+++ .cvsignore	30 Aug 2009 21:07:08 -0000	1.11
@@ -1 +1,2 @@
 mapserver-5.4.1.tar.gz
+mapserver-5.4.2.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mapserver.spec	21 Aug 2009 14:29:18 -0000	1.30
+++ mapserver.spec	30 Aug 2009 21:07:09 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           mapserver
-Version:        5.4.1
-Release:        3%{?dist}
+Version:        5.4.2
+Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -239,6 +239,11 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Mon Aug 31 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.4.2-1
+- Update to 5.4.2, which fixes CVE-2009-0840 and various fixes
+  described in :
+  http://trac.osgeo.org/mapserver/browser/tags/rel-5-4-2/mapserver/HISTORY.TXT
+ 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.1-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Jun 2009 20:36:30 -0000	1.12
+++ sources	30 Aug 2009 21:07:09 -0000	1.13
@@ -1 +1,2 @@
 4c5c6417d688eece78cadac8df96ee69  mapserver-5.4.1.tar.gz
+7c58bb90f5003fcfaec4320cc652a669  mapserver-5.4.2.tar.gz



From devrim at fedoraproject.org  Sun Aug 30 21:10:47 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:10:47 +0000 (UTC)
Subject: rpms/mapserver/F-11 .cvsignore, 1.7, 1.8 mapserver.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <20090830211047.6744D11C0498@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12794

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
- Update to 5.2.3 which CVE-2009-0840(again) and other issues.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Apr 2009 21:49:19 -0000	1.7
+++ .cvsignore	30 Aug 2009 21:10:46 -0000	1.8
@@ -1 +1 @@
-mapserver-5.2.2.tar.gz
+mapserver-5.2.3.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-11/mapserver.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- mapserver.spec	4 Apr 2009 23:47:21 -0000	1.24
+++ mapserver.spec	30 Aug 2009 21:10:46 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        5.2.2
+Version:        5.2.3
 Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
@@ -240,6 +240,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Mon Aug 31 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.3-1
+- Update to 5.2.3 which CVE-2009-0840(again) and other issues.
+
 * Sun Apr 5 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.2-1
 - Update to 5.2.2 which fixes :
   CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842, 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Apr 2009 21:49:19 -0000	1.8
+++ sources	30 Aug 2009 21:10:46 -0000	1.9
@@ -1 +1 @@
-87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz
+e10ab55879d669066eb449783a3fa9c6  mapserver-5.2.3.tar.gz



From devrim at fedoraproject.org  Sun Aug 30 21:12:14 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:12:14 +0000 (UTC)
Subject: rpms/mapserver/F-10 .cvsignore, 1.7, 1.8 mapserver.spec, 1.16,
	1.17 sources, 1.8, 1.9
Message-ID: <20090830211214.3FD2911C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13724

Modified Files:
	.cvsignore mapserver.spec sources 
Log Message:
- Update to 5.2.3 which CVE-2009-0840(again) and other issues.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Apr 2009 22:51:53 -0000	1.7
+++ .cvsignore	30 Aug 2009 21:12:13 -0000	1.8
@@ -1 +1 @@
-mapserver-5.2.2.tar.gz
+mapserver-5.2.3.tar.gz


Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-10/mapserver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mapserver.spec	4 Apr 2009 22:51:53 -0000	1.16
+++ mapserver.spec	30 Aug 2009 21:12:14 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        5.2.2
+Version:        5.2.3
 Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
@@ -230,6 +230,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Mon Aug 31 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.3-1
+- Update to 5.2.3 which CVE-2009-0840(again) and other issues.
+
 * Sun Apr 5 2009 Devrim GUNDUZ <devrim at commandprompt.com> - 5.2.2-1
 - Update to 5.2.2 which fixes :
   CVE-2009-0839, CVE-2009-0840, CVE-2009-0841, CVE-2009-0842,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Apr 2009 22:51:53 -0000	1.8
+++ sources	30 Aug 2009 21:12:14 -0000	1.9
@@ -1 +1 @@
-87d98fae4d9be8ffaff2607131dc4ceb  mapserver-5.2.2.tar.gz
+e10ab55879d669066eb449783a3fa9c6  mapserver-5.2.3.tar.gz



From devrim at fedoraproject.org  Sun Aug 30 21:14:45 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:14:45 +0000 (UTC)
Subject: rpms/mapserver/EL-5 mapserver.spec,1.3,1.4
Message-ID: <20090830211445.4411D11C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14433

Modified Files:
	mapserver.spec 
Log Message:
- Update to 4.10.5, which re-fixes CVE-2009-0840.                           




Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/mapserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mapserver.spec	26 Apr 2009 19:32:36 -0000	1.3
+++ mapserver.spec	30 Aug 2009 21:14:45 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        4.10.4
+Version:        4.10.5
 Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
@@ -218,6 +218,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Mon Aug 31 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.5-1
+- Update to 4.10.5, which re-fixes CVE-2009-0840.
+
 * Sun Apr 26 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.4-1
 - Update to 4.10.4 to fix several security issues.
 



From devrim at fedoraproject.org  Sun Aug 30 21:16:52 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:16:52 +0000 (UTC)
Subject: rpms/mapserver/EL-5 .cvsignore,1.1,1.2 sources,1.2,1.3
Message-ID: <20090830211652.6E6E911C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15599

Modified Files:
	.cvsignore sources 
Log Message:
Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Apr 2009 19:20:06 -0000	1.1
+++ .cvsignore	30 Aug 2009 21:16:52 -0000	1.2
@@ -1,3 +1,4 @@
 mapserver-5.2.2.tar.gz
 mapserver-5.4.0.tar.gz
 mapserver-4.10.4.tar.gz
+mapserver-4.10.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Apr 2009 19:20:07 -0000	1.2
+++ sources	30 Aug 2009 21:16:52 -0000	1.3
@@ -1,2 +1,3 @@
 5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
 bde51fbe3f2218f965ee512ecba675e3  mapserver-4.10.4.tar.gz
+4c7e84b69ca57ed755cf268e79b99dce  mapserver-4.10.5.tar.gz



From devrim at fedoraproject.org  Sun Aug 30 21:17:48 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:17:48 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20090830211748.A892511C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16404

Modified Files:
	mapserver.spec sources 
Log Message:
- Update to 4.10.5, which re-fixes CVE-2009-0840.




Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mapserver.spec	26 Apr 2009 19:31:10 -0000	1.4
+++ mapserver.spec	30 Aug 2009 21:17:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           mapserver
-Version:        4.10.4
+Version:        4.10.5
 Release:        1%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
@@ -218,6 +218,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Mon Aug 31 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.5-1
+- Update to 4.10.5, which re-fixes CVE-2009-0840.
+
 * Sun Apr 26 2009 Devrim GUNDUZ <devrim at gunduz.org> 4.10.4-1
 - Update to 4.10.4 to fix several security issues.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Apr 2009 19:21:18 -0000	1.2
+++ sources	30 Aug 2009 21:17:48 -0000	1.3
@@ -1,2 +1,3 @@
 5e36e2d788599505590501c981eb44a7  mapserver-4.10.2.tar.gz
 bde51fbe3f2218f965ee512ecba675e3  mapserver-4.10.4.tar.gz
+4c7e84b69ca57ed755cf268e79b99dce  mapserver-4.10.5.tar.gz



From awjb at fedoraproject.org  Sun Aug 30 21:27:14 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sun, 30 Aug 2009 21:27:14 +0000 (UTC)
Subject: rpms/wine/devel adding-pulseaudio-to-winecfg-0.4.patch, NONE,
	1.1 pulseaudio-winecfg-update.patch, NONE,
	1.1 winepulse-0.30-configure.ac.patch, NONE,
	1.1 winepulse-0.30.patch, NONE, 1.1 .cvsignore, 1.77,
	1.78 sources, 1.78, 1.79 wine-rpath.patch, 1.7, 1.8 wine.spec,
	1.110, 1.111 adding-pulseaudio-to-winecfg-0.3.patch, 1.1,
	NONE noautobuild, 1.1, NONE winepulse-0.29-configure.ac.patch,
	1.1, NONE winepulse-0.29.patch, 1.1, NONE
Message-ID: <20090830212714.6BAC211C0072@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20083

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Added Files:
	adding-pulseaudio-to-winecfg-0.4.patch 
	pulseaudio-winecfg-update.patch 
	winepulse-0.30-configure.ac.patch winepulse-0.30.patch 
Removed Files:
	adding-pulseaudio-to-winecfg-0.3.patch noautobuild 
	winepulse-0.29-configure.ac.patch winepulse-0.29.patch 
Log Message:
- lots of fixes
- version upgrade
- 64bit build


adding-pulseaudio-to-winecfg-0.4.patch:
 Bg.rc       |    1 +
 Cs.rc       |    1 +
 Da.rc       |    1 +
 De.rc       |    1 +
 En.rc       |    1 +
 Es.rc       |    1 +
 Fi.rc       |    1 +
 Fr.rc       |    1 +
 Hu.rc       |    1 +
 Ko.rc       |    1 +
 Nl.rc       |    1 +
 No.rc       |    1 +
 Pl.rc       |    1 +
 Pt.rc       |    1 +
 Ro.rc       |    1 +
 Ru.rc       |    1 +
 Si.rc       |    1 +
 Sv.rc       |    1 +
 Tr.rc       |    1 +
 Zh.rc       |    1 +
 audio.c     |    1 +
 libraries.c |    1 +
 resource.h  |    2 +-
 23 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE adding-pulseaudio-to-winecfg-0.4.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..e17690e 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index d9c0b28..9bcc033 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardn?"
     IDS_ACCEL_BASIC             "Z?kladn?"
     IDS_ACCEL_EMULATION         "Emulace"
+    IDS_DRIVER_PULSE             "Ovlada? PulseAudio"
     IDS_DRIVER_ALSA             "Ovlada? ALSA"
     IDS_DRIVER_ESOUND           "Ovlada? EsounD"
     IDS_DRIVER_OSS              "Ovlada? OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index f53aead..690c7f5 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggende"
     IDS_ACCEL_EMULATION         "Emul?ring"
+    IDS_DRIVER_PULSE             "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index e6bed15..d3027bc 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Einfach"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio-Treiber"
     IDS_DRIVER_ALSA             "ALSA-Treiber"
     IDS_DRIVER_ESOUND           "EsounD-Treiber"
     IDS_DRIVER_OSS              "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 049aaa7..cef7c4a 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 1771b4e..c49f9a3 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Est?ndar"
     IDS_ACCEL_BASIC             "B?sica"
     IDS_ACCEL_EMULATION         "Emulaci?n"
+    IDS_DRIVER_PULSE             "Manejador PulseAudio"
     IDS_DRIVER_ALSA             "Manejador ALSA"
     IDS_DRIVER_ESOUND           "Manejador EsounD"
     IDS_DRIVER_OSS              "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 0dedf3a..097a4d2 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 52c9888..1bd92b1 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -274,6 +274,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basique"
     IDS_ACCEL_EMULATION         "??mulation"
+    IDS_DRIVER_PULSE            "Pilote PulseAudio"
     IDS_DRIVER_ALSA             "Pilote ALSA"
     IDS_DRIVER_ESOUND           "Pilote EsounD"
     IDS_DRIVER_OSS              "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index dc887fe..3ba696f 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 6f13e0c..d5403da 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -274,6 +274,7 @@ BEGIN
    IDS_ACCEL_STANDARD          "????"
    IDS_ACCEL_BASIC             "????"
    IDS_ACCEL_EMULATION         "??????????"
+    IDS_DRIVER_PULSE             "PulseAudio ????????"
    IDS_DRIVER_ALSA             "ALSA ????????"
    IDS_DRIVER_ESOUND           "EsounD ????????"
    IDS_DRIVER_OSS              "OSS ????????"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 4cd45f0..d23f359 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standaard"
     IDS_ACCEL_BASIC             "Eenvoudig"
     IDS_ACCEL_EMULATION         "Emulatie"
+    IDS_DRIVER_PULSE             "PulseAudio Stuurprogramma"
     IDS_DRIVER_ALSA             "ALSA Stuurprogramma"
     IDS_DRIVER_ESOUND           "EsounD Stuurprogramma"
     IDS_DRIVER_OSS              "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index cc34fad..71876ba 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grunnleggende"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE             "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index d884881..d6405b1 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardowe"
     IDS_ACCEL_BASIC             "Podstawowe"
     IDS_ACCEL_EMULATION         "Emulacja"
+    IDS_DRIVER_PULSE             "Sterownik PulseAudio"
     IDS_DRIVER_ALSA             "Sterownik ALSA"
     IDS_DRIVER_ESOUND           "Sterownik EsounD"
     IDS_DRIVER_OSS              "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 683dc68..be92466 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -470,6 +470,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Padr??o"
     IDS_ACCEL_BASIC             "B??sico"
     IDS_ACCEL_EMULATION         "Emula????o"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index f12949f..2101ea1 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "De baz??"
     IDS_ACCEL_EMULATION         "Emulare"
+    IDS_DRIVER_PULSE             "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 7293cbc..fb57527 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -277,6 +277,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????????????????????"
     IDS_ACCEL_BASIC             "??????????????????????"
     IDS_ACCEL_EMULATION         "????????????????"
+    IDS_DRIVER_PULSE		"PulseAudio ??????????????"
     IDS_DRIVER_ALSA             "ALSA ??????????????"
     IDS_DRIVER_ESOUND           "EsounD ??????????????"
     IDS_DRIVER_OSS              "OSS ??????????????"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index feaef36..c26e5cb 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardno"
     IDS_ACCEL_BASIC             "Osnovno"
     IDS_ACCEL_EMULATION         "Emulacija"
+    IDS_DRIVER_PULSE             "PulseAudio gonilnik"
     IDS_DRIVER_ALSA             "ALSA gonilnik"
     IDS_DRIVER_ESOUND           "EsounD gonilnik"
     IDS_DRIVER_OSS              "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 7fea5aa..35eb871 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggande"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE             "PulseAudio-drivrutin"
     IDS_DRIVER_ALSA             "ALSA-drivrutin"
     IDS_DRIVER_ESOUND           "EsounD-drivrutin"
     IDS_DRIVER_OSS              "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 0fa9778..2a23112 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standart"
     IDS_ACCEL_BASIC             "Temel"
     IDS_ACCEL_EMULATION         "Taklit"
+    IDS_DRIVER_PULSE             "PulseAudio S?r?c?s?"
     IDS_DRIVER_ALSA             "ALSA S?r?c?s?"
     IDS_DRIVER_ESOUND           "EsounD S?r?c?s?"
     IDS_DRIVER_OSS              "OSS S?r?c?s?"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index fea66b7..bc0aaaf 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????"
+    IDS_DRIVER_PULSE             "PulseAudio ??????"
     IDS_DRIVER_ALSA             "ALSA ??????"
     IDS_DRIVER_ESOUND           "EsounD ??????"
     IDS_DRIVER_OSS              "OSS ??????"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 9f8a0a2..0ecb6c3 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
 } AUDIO_DRIVER;
 
 static const AUDIO_DRIVER sAudioDrivers[] = {
+  {IDS_DRIVER_PULSE,      "pulse"},
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..7c13fad 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -81,6 +81,7 @@ static const char * const builtin_only[] =
     "wineoss.drv",
     "wineps",
     "wineps.drv",
+    "winepulse.drv",
     "winex11.drv",
     "winmm",
     "wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 27736b7..f8ba2ee 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -185,7 +185,7 @@
 #define IDS_ACCEL_BASIC                 8302
 #define IDS_ACCEL_EMULATION             8303
 #define IDS_DRIVER_ALSA                 8304
-
+#define IDS_DRIVER_PULSE                 8305
 #define IDS_DRIVER_ESOUND               8306
 #define IDS_DRIVER_OSS                  8307
 #define IDS_DRIVER_JACK                 8308

pulseaudio-winecfg-update.patch:
 Ja.rc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE pulseaudio-winecfg-update.patch ---
--- programs/winecfg/Ja.rc.orig	2009-08-26 11:55:56.000000000 +0200
+++ programs/winecfg/Ja.rc	2009-08-26 11:56:52.000000000 +0200
@@ -275,6 +275,7 @@
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????????"
     IDS_DRIVER_ALSA             "ALSA ????????????"
     IDS_DRIVER_ESOUND           "EsounD ????????????"
     IDS_DRIVER_OSS              "OSS ????????????"

winepulse-0.30-configure.ac.patch:
 configure.ac |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.30-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 59b771c..385a7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,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])
@@ -1257,6 +1258,24 @@ 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")
+        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"
@@ -1391,7 +1410,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 \
@@ -2429,6 +2448,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[AL
 WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 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/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/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

winepulse-0.30.patch:
 Makefile.in        |   15 
 pulse.c            |  788 +++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 +++++++++++++++++++++++++++++
 waveout.c          | 1070 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2667 insertions(+)

--- NEW FILE winepulse-0.30.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.
+        */
[...2304 lines suppressed...]
index 0000000..4a834cd
--- /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 {
+    volatile 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.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	19 Jul 2009 10:47:48 -0000	1.77
+++ .cvsignore	30 Aug 2009 21:27:13 -0000	1.78
@@ -1 +1 @@
-wine-1.1.26-fe.tar.bz2
+wine-1.1.28-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	19 Jul 2009 10:47:49 -0000	1.78
+++ sources	30 Aug 2009 21:27:13 -0000	1.79
@@ -1 +1 @@
-7b2affded452ced2b1f45a9b7e6f24da  wine-1.1.26-fe.tar.bz2
+6342c41f46d0571efae685c17aa5550f  wine-1.1.28-fe.tar.bz2

wine-rpath.patch:
 configure |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine-rpath.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- wine-rpath.patch	23 Nov 2008 10:44:34 -0000	1.7
+++ wine-rpath.patch	30 Aug 2009 21:27:13 -0000	1.8
@@ -1,32 +1,32 @@
---- configure.orig	2008-11-05 12:25:10.000000000 +0300
-+++ configure	2008-11-06 22:22:27.000000000 +0300
-@@ -9306,14 +9306,14 @@
- fi
+--- configure.orig	2009-08-26 11:47:17.000000000 +0200
++++ configure	2009-08-26 11:50:07.000000000 +0200
+@@ -6565,14 +6565,14 @@
  
+ fi
  
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
+-      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
 +      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
-+{ $as_echo "$as_me:$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 "$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
    ac_wine_try_cflags_saved=$CFLAGS
 -CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
 +CFLAGS="$CFLAGS -fPIC"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9369,8 +9369,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6597,8 +6597,8 @@
+ 	       { $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
+ 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=""
  else
-   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+   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


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- wine.spec	19 Jul 2009 10:47:49 -0000	1.110
+++ wine.spec	30 Aug 2009 21:27:13 -0000	1.111
@@ -1,5 +1,6 @@
+%define no64bit 0
 Name:		wine
-Version:	1.1.26
+Version:	1.1.28
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -22,6 +23,8 @@ Source0:        %{name}-%{version}-fe.ta
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
+Source5:        wine-64.conf
+Source6:        wine-chooser.sh
 # desktop stuff
 Source100:      wine-notepad.desktop
 Source101:      wine-regedit.desktop
@@ -44,24 +47,25 @@ 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.29-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.29.patch
-Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.3.patch
+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/adding-pulseaudio-to-winecfg-0.4.patch
 Source402:      README-FEDORA-PULSEAUDIO
-
+Patch403:       pulseaudio-winecfg-update.patch
 
 Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if !%{?no64bit}
+ExclusiveArch:  %{ix86} x86_64
+%else
 ExclusiveArch:  %{ix86}
+%endif
 
-# BR: All builds
-BuildRequires:	bison
-BuildRequires:	flex
+BuildRequires:  bison
+BuildRequires:  flex
 BuildRequires:  autoconf
 BuildRequires:  desktop-file-utils
-
-# x86-32 BR
 BuildRequires:  alsa-lib-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  esound-devel
@@ -80,7 +84,7 @@ BuildRequires:  unixODBC-devel
 BuildRequires:  openssl-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
-BuildRequires:  fontforge
+BuildRequires:  fontforge freetype-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  jack-audio-connection-kit-devel
 # #217338
@@ -102,15 +106,27 @@ BuildRequires:  libXcursor-devel
 BuildRequires:  dbus-devel hal-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  gsm-devel
 
-Requires:       wine-core = %{version}-%{release}
-Requires:       wine-capi = %{version}-%{release}
-Requires:       wine-cms = %{version}-%{release}
+# noarch
+Requires:       wine-common = %{version}-%{release}
 Requires:       wine-desktop = %{version}-%{release}
-Requires:       wine-ldap = %{version}-%{release}
-Requires:       wine-tools = %{version}-%{release}
-Requires:       wine-twain = %{version}-%{release}
-Requires:       wine-pulseaudio = %{version}-%{release}
+# 32bit
+Requires:       wine-core(x86-32) = %{version}-%{release}
+Requires:       wine-capi(x86-32) = %{version}-%{release}
+Requires:       wine-cms(x86-32) = %{version}-%{release}
+Requires:       wine-ldap(x86-32) = %{version}-%{release}
+Requires:       wine-twain(x86-32) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-32) = %{version}-%{release}
+# 64bit
+%ifarch x86_64
+Requires:       wine-core(x86-64) = %{version}-%{release}
+Requires:       wine-capi(x86-64) = %{version}-%{release}
+Requires:       wine-cms(x86-64) = %{version}-%{release}
+Requires:       wine-ldap(x86-64) = %{version}-%{release}
+Requires:       wine-twain(x86-64) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-64) = %{version}-%{release}
+%endif
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -127,17 +143,26 @@ wine-* sub packages.
 %package core
 Summary:        Wine core package
 Group:		Applications/Emulators
+Requires:       wine-fonts = %{version}-%{release}
 Requires:       %{_bindir}/xmessage
-Requires:       freetype%{_isa}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
 Obsoletes:      wine-arts < 0.9.34
+Obsoletes:      wine-tools <= 1.1.27
+Provides:       wine-tools = %{version}-%{release}
 # fix dns resolution (#492700)
 # require both to be sure 64bit is present as well...
-Requires:       nss-mdns nss-mdns%{_isa}
+%ifarch %{ix86}
+Requires:       freetype(x86-32)
+Requires:       nss-mdns(x86-32)
 # require Xrender isa on x86_64 (#510947)
-Requires:       libXrender%{_isa}
+Requires:       libXrender(x86-32)
+%endif
+%ifarch x86_64
+Requires:       nss-mdns(x86-64)
+Requires:       freetype(x86-64)
+%endif
 
 %description core
 Wine core package includes the basic wine stuff needed by all other packages.
@@ -150,18 +175,28 @@ Requires(post): desktop-file-utils >= 0.
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): desktop-file-utils >= 0.8
 Requires:       wine-core = %{version}-%{release}
+BuildArch:      noarch
 
 %description desktop
 Desktop integration features for wine, including mime-types and a binary format
 handler service.
 
-%package tools
-Summary:        Additional wine tools
+%package fonts
+Summary:       Wine font files
+Group:         Applications/Emulators
+BuildArch:     noarch
+
+%description fonts
+%{summary}
+
+%package common
+Summary:        Common files
 Group:		Applications/Emulators
 Requires:       wine-core = %{version}-%{release}
+BuildArch:      noarch
 
-%description tools
-Additional wine tools
+%description common
+Common wine files and scripts.
 
 %package esd
 Summary: ESD sound support for wine
@@ -175,7 +210,12 @@ ESD sound support for wine
 Summary: JACK sound support for wine
 Group: System Environment/Libraries
 Requires: wine-core = %{version}-%{release}
-Requires: jack-audio-connection-kit%{_isa}
+%ifarch %{ix86}
+Requires: jack-audio-connection-kit(x86-32)
+%endif
+%ifarch x86_64
+Requires: jack-audio-connection-kit(x86-64)
+%endif
 
 %description jack
 JACK sound support for wine
@@ -256,19 +296,27 @@ This package adds an oss driver for wine
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+
 %patch1
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
+%patch403
+
 autoreconf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine \
 	--x-includes=%{_includedir} --x-libraries=%{_libdir} \
-	--with-pulse
+	--with-pulse \
+        --with-x \
+%ifarch x86_64
+	--enable-win64 \
+%endif
+        --enable-maintainer-mode \
+	--disable-tests
 
 %{__make} depend
 
@@ -284,6 +332,17 @@ rm -rf %{buildroot}
 	LDCONFIG=/bin/true \
 	UPDATE_DESKTOP_DATABASE=/bin/true
 
+%ifarch %{ix86}
+# rename wine to wine32
+mv %{buildroot}%{_bindir}/wine{,32}
+%endif
+
+# if x86_64 rename to wine64
+%ifarch x86_64
+mv %{buildroot}%{_bindir}/wine{,64}
+%endif
+
+
 mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
@@ -366,7 +425,16 @@ desktop-file-install \
 cp %{SOURCE3} README-Fedora
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%ifarch %{ix86}
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+%endif
+
+%ifarch x86_64
+install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+%endif
+
+install -p -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/wine
 
 # deploy pulseaudio readme
 cp %{SOURCE402} .
@@ -430,19 +498,49 @@ update-desktop-database &>/dev/null || :
 
 %files core
 %defattr(-,root,root,-)
-%doc ANNOUNCE COPYING.LIB LICENSE LICENSE.OLD
-%doc AUTHORS README-Fedora README VERSION
+%doc ANNOUNCE
+%doc COPYING.LIB
+%doc LICENSE
+%doc LICENSE.OLD
+%doc AUTHORS
+%doc README-Fedora
+%doc README
+%doc VERSION
 # do not include huge changelogs .OLD .ALPHA .BETA (#204302)
 %doc documentation/README.*
-%{_bindir}/msiexec
-%{_bindir}/regedit
-%{_bindir}/regsvr32
-%{_bindir}/wine
-%{_bindir}/wineboot
-%{_bindir}/wineconsole
-%{_bindir}/wineprefixcreate
-%{_mandir}/man1/wineprefixcreate.1*
-%{_bindir}/winecfg
+
+%{_bindir}/winedump
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/cmd.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/wordpad.exe.so
+%{_libdir}/wine/write.exe.so
+
+%ifarch %{ix86}
+%{_bindir}/wine-preloader
+%endif
+%{_bindir}/wineserver
+
+%ifarch %{ix86}
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+%{_bindir}/wine32
+%endif
+%ifarch x86_64
+%{_bindir}/wine64
+%{_sysconfdir}/ld.so.conf.d/wine-64.conf
+%endif
+
+%dir %{_libdir}/wine
+%dir %{_libdir}/wine/fakedlls
+%{_libdir}/wine/fakedlls/*
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/winhlp32.exe.so
@@ -463,20 +561,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winebrowser.exe.so
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
-%{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedevice.exe.so
 %{_libdir}/wine/uninstaller.exe.so
-%dir %{_datadir}/wine
-%{_mandir}/man1/wine.1.gz
-%{_mandir}/man1/wineserver.1*
-%lang(fr) %{_mandir}/fr.UTF-8/man1/*
-%{_datadir}/wine/generic.ppd
-%{_datadir}/wine/wine.inf
-%{_bindir}/wine-preloader
-%{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
-%dir %{_libdir}/wine
 %{_libdir}/wine/acledit.dll.so
 %{_libdir}/wine/aclui.dll.so
 %{_libdir}/wine/activeds.dll.so
@@ -499,7 +587,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -549,7 +636,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fusion.dll.so
-%{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
 %{_libdir}/wine/glu32.dll.so
@@ -565,7 +651,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/iccvid.dll.so
 %{_libdir}/wine/icinfo.exe.so
 %{_libdir}/wine/icmp.dll.so
-%{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
 %{_libdir}/wine/imm32.dll.so
@@ -580,7 +665,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
@@ -593,21 +677,21 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mciwave.dll.so
 %{_libdir}/wine/midimap.dll.so
 %{_libdir}/wine/mlang.dll.so
-%{_libdir}/wine/mmdevldr.vxd.so
-%{_libdir}/wine/mmsystem.dll16
-%{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
+%{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
 %{_libdir}/wine/mscat32.dll.so
 %{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msctf.dll.so
+%{_libdir}/wine/msdaps.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/msgsm32.acm.so
 %{_libdir}/wine/mshtml.dll.so
 %{_libdir}/wine/mshtml.tlb.so
 %{_libdir}/wine/msi.dll.so
@@ -675,7 +759,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/sensapi.dll.so
 %{_libdir}/wine/serialui.dll.so
 %{_libdir}/wine/setupapi.dll.so
-%{_libdir}/wine/setupx.dll16
 %{_libdir}/wine/sfc_os.dll.so
 %{_libdir}/wine/shdoclc.dll.so
 %{_libdir}/wine/shdocvw.dll.so
@@ -693,45 +776,31 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
-%{_libdir}/wine/system.drv16
 %{_libdir}/wine/t2embed.dll.so
 %{_libdir}/wine/tapi32.dll.so
-%{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
 %{_libdir}/wine/url.dll.so
 %{_libdir}/wine/urlmon.dll.so
-%{_libdir}/wine/user.exe16
 %{_libdir}/wine/user32.dll.so
 %{_libdir}/wine/usp10.dll.so
 %{_libdir}/wine/uxtheme.dll.so
 %{_libdir}/wine/userenv.dll.so
-%{_libdir}/wine/vdhcp.vxd.so
 %{_libdir}/wine/vdmdbg.dll.so
-%{_libdir}/wine/ver.dll16
 %{_libdir}/wine/version.dll.so
-%{_libdir}/wine/vmm.vxd.so
-%{_libdir}/wine/vnbt.vxd.so
-%{_libdir}/wine/vnetbios.vxd.so
-%{_libdir}/wine/vtdapi.vxd.so
-%{_libdir}/wine/vwin32.vxd.so
-%{_libdir}/wine/w32skrnl.dll.so
 %{_libdir}/wine/wbemprox.dll.so
 %{_libdir}/wine/windowscodecs.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
-%{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winecoreaudio.drv.so
 %{_libdir}/wine/winejoystick.drv.so
 %{_libdir}/wine/winex11.drv.so
-%{_libdir}/wine/wing.dll16
 %{_libdir}/wine/wing32.dll.so
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
 %{_libdir}/wine/winnls32.dll.so
-%{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/wmiutils.dll.so
@@ -741,16 +810,13 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
 %{_libdir}/wine/wow32.dll.so
-%{_libdir}/wine/wprocs.dll16
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
 %{_libdir}/wine/wuapi.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
-%{_datadir}/wine/fonts/
 %{_libdir}/wine/wineps.drv.so
-%{_libdir}/wine/wineps16.drv16
 %{_libdir}/wine/d3d8.dll.so
 %{_libdir}/wine/d3d9.dll.so
 %{_libdir}/wine/opengl32.dll.so
@@ -763,8 +829,33 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_libdir}/wine/xmllite.dll.so
-%{_sysconfdir}/ld.so.conf.d/wine-32.conf
-# 16bit
+%ifnarch x86_64
+# 16 bit and other non 64bit stuff
+%{_libdir}/wine/winedos.dll.so
+%{_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
+%{_libdir}/wine/vwin32.vxd.so
+%{_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
 %{_libdir}/wine/compobj.dll16.so
@@ -774,9 +865,9 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dispdib.dll16.so
 %{_libdir}/wine/display.drv16.so
 %{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
-%{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
 %{_libdir}/wine/msvideo.dll16.so
@@ -804,29 +895,36 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winnls.dll16.so
 %{_libdir}/wine/winoldap.mod16.so
 %{_libdir}/wine/wintab.dll16.so
+%endif
 
-%files tools
+%files common
 %defattr(-,root,root,-)
+%{_bindir}/wineprefixcreate
 %{_bindir}/notepad
 %{_bindir}/winedbg
-%{_bindir}/winedump
 %{_bindir}/winefile
-%{_bindir}/winemaker
 %{_bindir}/winemine
+%{_bindir}/winemaker
 %{_bindir}/winepath
-%{_libdir}/wine/explorer.exe.so
-%{_libdir}/wine/control.exe.so
-%{_libdir}/wine/cmd.exe.so
-%{_libdir}/wine/notepad.exe.so
-%{_libdir}/wine/progman.exe.so
-%{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/winedbg.exe.so
-%{_libdir}/wine/winefile.exe.so
-%{_libdir}/wine/winemine.exe.so
-%{_libdir}/wine/winepath.exe.so
-%{_libdir}/wine/winver.exe.so
-%{_libdir}/wine/wordpad.exe.so
-%{_libdir}/wine/write.exe.so
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/wineconsole
+%{_bindir}/winecfg
+%dir %{_datadir}/wine
+%{_mandir}/man1/wine.1.gz
+%{_mandir}/man1/wineserver.1*
+%{_mandir}/man1/wineprefixcreate.1*
+%lang(fr) %{_mandir}/fr.UTF-8/man1/*
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+
+%files fonts
+%defattr(-,root,root,-)
+%{_datadir}/wine/fonts
+
 
 %files desktop
 %defattr(-,root,root,-)
@@ -846,31 +944,38 @@ update-desktop-database &>/dev/null || :
 %{_sysconfdir}/xdg/menus/applications-merged/wine.menu
 %{_initrddir}/wine
 
+# esd subpackage
 %files esd
 %defattr(-,root,root,-)
 %{_libdir}/wine/wineesd.drv.so
 
+# jack subpackage
 %files jack
 %defattr(-,root,root,-)
 %{_libdir}/wine/winejack.drv.so
 
+# nas subpackage
 %files nas
 %defattr(-,root,root,-)
 %{_libdir}/wine/winenas.drv.so
 
+# ldap subpackage
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/wine/wldap32.dll.so
 
+# cms subpackage
 %files cms
 %defattr(-,root,root,-)
 %{_libdir}/wine/mscms.dll.so
 
+# twain subpackage
 %files twain
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
+# capi subpackage
 %files capi
 %defattr(-,root,root,-)
 %{_libdir}/wine/capi2032.dll.so
@@ -887,7 +992,6 @@ update-desktop-database &>/dev/null || :
 %{_bindir}/winemaker
 %{_bindir}/wmc
 %{_bindir}/wrc
-%{_libdir}/*.so
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winebuild.1*
 %{_mandir}/man1/winedump.1*
@@ -898,9 +1002,9 @@ update-desktop-database &>/dev/null || :
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineg++.1*
 %lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
-%{_datadir}/aclocal/wine.m4
 %attr(0755, root, root) %dir %{_includedir}/wine
 %{_includedir}/wine/*
+%{_libdir}/*.so
 %{_libdir}/wine/*.a
 %{_libdir}/wine/*.def
 
@@ -919,6 +1023,22 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Mon Aug 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.28-1
+- version upgrade
+- make 32bit and 64bit version parallel installable
+
+* Sun Aug 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.27-1
+- version upgrade
+- WinePulse 0.30
+
+* Thu Aug 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.26-2
+- build 32bit wine on x86_64 and prepare for 64bit parallel build (#487651)
+- fix subpackage problems (#485410,#508766,#508944,#514967)
+- fix nss dependencies on x86_64 (#508412)
+
 * Sat Jul 18 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.26-1
 - version upgrade


--- adding-pulseaudio-to-winecfg-0.3.patch DELETED ---


--- noautobuild DELETED ---


--- winepulse-0.29-configure.ac.patch DELETED ---


--- winepulse-0.29.patch DELETED ---



From devrim at fedoraproject.org  Sun Aug 30 21:31:25 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:31:25 +0000 (UTC)
Subject: rpms/mapserver/EL-5 mapserver.spec,1.4,1.5
Message-ID: <20090830213125.4E3A911C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21689

Modified Files:
	mapserver.spec 
Log Message:
Add flex as BR , otherwise we cannot generate maplexer.c



Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-5/mapserver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mapserver.spec	30 Aug 2009 21:14:45 -0000	1.4
+++ mapserver.spec	30 Aug 2009 21:31:24 -0000	1.5
@@ -17,7 +17,7 @@ BuildRequires:  python-devel curl-devel 
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  java-gcj-compat-devel swig > 1.3.24
-BuildRequires:	byacc
+BuildRequires:	byacc, flex
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 



From awjb at fedoraproject.org  Sun Aug 30 21:35:07 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sun, 30 Aug 2009 21:35:07 +0000 (UTC)
Subject: rpms/wine/devel wine-64.conf,NONE,1.1 wine-chooser.sh,NONE,1.1
Message-ID: <20090830213507.5038711C0072@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22551

Added Files:
	wine-64.conf wine-chooser.sh 
Log Message:
- add chooser and 64bit lib file



--- NEW FILE wine-64.conf ---
/usr/lib64/wine/


--- NEW FILE wine-chooser.sh ---
#!/bin/sh
HAVE_32=false
HAVE_64=false

if [ -x "/usr/bin/wine32" ]; then
HAVE_32=true
fi

if [ -x "/usr/bin/wine64" ]; then
HAVE_64=true
fi

if [ -f "${1}" ]; then
    archtype=`file "${1}" | cut -d':' -f2 | cut -d' ' -f2`

    if [ ${archtype} = 'PE32+' ]; then # 64bit
	if $HAVE_64; then
	    exec "/usr/bin/wine64" "${@}";
	elif [ `uname -m` = 'x86_64' ]; then
	    echo "Your are trying to run a 64bit application. Please install the 64bit version of wine."
	    echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-64)\\\"\"'"
	else
	    echo "Your are trying to run a 64bit application on a 32bit installation of Fedora. You need a 64bit version of Fedora to run this application."
	fi
    else
	if $HAVE_32; then
	    exec "/usr/bin/wine32" "${@}"
	else
	    echo "Your are trying to run a 32bit application. Please install the 32bit version of wine."
	    echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-32)\\\"\"'"
	fi
    fi
else
    if $HAVE_64; then
	exec "/usr/bin/wine64" "${@}";
    else
	exec "/usr/bin/wine32" "${@}";
    fi
fi



From devrim at fedoraproject.org  Sun Aug 30 21:44:53 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 30 Aug 2009 21:44:53 +0000 (UTC)
Subject: rpms/mapserver/EL-4 mapserver.spec,1.5,1.6
Message-ID: <20090830214453.2A14511C0072@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/mapserver/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25379

Modified Files:
	mapserver.spec 
Log Message:
Add flex as BR , otherwise we cannot generate maplexer.c




Index: mapserver.spec
===================================================================
RCS file: /cvs/extras/rpms/mapserver/EL-4/mapserver.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mapserver.spec	30 Aug 2009 21:17:48 -0000	1.5
+++ mapserver.spec	30 Aug 2009 21:44:52 -0000	1.6
@@ -17,7 +17,7 @@ BuildRequires:  python-devel curl-devel 
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  java-gcj-compat-devel swig > 1.3.24
-BuildRequires:	byacc
+BuildRequires:	byacc, flex
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 



From transif at fedoraproject.org  Sun Aug 30 22:45:55 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 30 Aug 2009 22:45:55 +0000 (UTC)
Subject: comps/po es.po,1.35,1.36
Message-ID: <20090830224555.8FD7211C0072@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14197/po

Modified Files:
	es.po 
Log Message:
Sending translation for Spanish


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.35 -r 1.36 es.poIndex: es.po
===================================================================
RCS file: /cvs/pkgs/comps/po/es.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- es.po	15 Jun 2009 18:10:32 -0000	1.35
+++ es.po	30 Aug 2009 22:45:53 -0000	1.36
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 14:05+0000\n"
-"PO-Revision-Date: 2009-06-15 14:09-0400\n"
-"Last-Translator: Dennis Tobar <dennis.tobar at gmail.com>\n"
+"POT-Creation-Date: 2009-08-30 19:35+0000\n"
+"PO-Revision-Date: 2009-08-30 19:31-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"
@@ -23,13 +23,15 @@ msgstr ""
 #: ../comps-f10.xml.in.h:1
 #: ../comps-f11.xml.in.h:1
 #: ../comps-f12.xml.in.h:1
+#: ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Un entorno de escritorio liviano que funciona bien en m?quinas peque?as."
 
 #: ../comps-f9.xml.in.h:2
 #: ../comps-f10.xml.in.h:3
 #: ../comps-f11.xml.in.h:3
-#: ../comps-f12.xml.in.h:3
+#: ../comps-f12.xml.in.h:5
+#: ../comps-f13.xml.in.h:5
 #: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
@@ -38,21 +40,24 @@ msgstr "Herramientas de Administraci?n"
 #: ../comps-f9.xml.in.h:3
 #: ../comps-f10.xml.in.h:4
 #: ../comps-f11.xml.in.h:4
-#: ../comps-f12.xml.in.h:4
+#: ../comps-f12.xml.in.h:6
+#: ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Soporte para africano"
 
 #: ../comps-f9.xml.in.h:4
 #: ../comps-f10.xml.in.h:5
 #: ../comps-f11.xml.in.h:5
-#: ../comps-f12.xml.in.h:5
+#: ../comps-f12.xml.in.h:7
+#: ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Soporte para alban?s"
 
 #: ../comps-f9.xml.in.h:5
 #: ../comps-f10.xml.in.h:6
 #: ../comps-f11.xml.in.h:7
-#: ../comps-f12.xml.in.h:7
+#: ../comps-f12.xml.in.h:9
+#: ../comps-f13.xml.in.h:9
 #: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
@@ -61,14 +66,16 @@ msgstr "Aplicaciones"
 #: ../comps-f9.xml.in.h:6
 #: ../comps-f10.xml.in.h:7
 #: ../comps-f11.xml.in.h:8
-#: ../comps-f12.xml.in.h:8
+#: ../comps-f12.xml.in.h:10
+#: ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplicaciones para una variedad de tareas"
 
 #: ../comps-f9.xml.in.h:7
 #: ../comps-f10.xml.in.h:8
 #: ../comps-f11.xml.in.h:9
-#: ../comps-f12.xml.in.h:9
+#: ../comps-f12.xml.in.h:11
+#: ../comps-f13.xml.in.h:11
 #: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
@@ -77,7 +84,8 @@ msgstr "Soporte para ?rabe"
 #: ../comps-f9.xml.in.h:8
 #: ../comps-f10.xml.in.h:9
 #: ../comps-f11.xml.in.h:10
-#: ../comps-f12.xml.in.h:10
+#: ../comps-f12.xml.in.h:12
+#: ../comps-f13.xml.in.h:12
 #: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
@@ -86,14 +94,16 @@ msgstr "Soporte para armenio"
 #: ../comps-f9.xml.in.h:9
 #: ../comps-f10.xml.in.h:10
 #: ../comps-f11.xml.in.h:11
-#: ../comps-f12.xml.in.h:11
+#: ../comps-f12.xml.in.h:13
+#: ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Soporte para assam?s"
 
 #: ../comps-f9.xml.in.h:10
 #: ../comps-f10.xml.in.h:11
 #: ../comps-f11.xml.in.h:12
-#: ../comps-f12.xml.in.h:12
+#: ../comps-f12.xml.in.h:14
+#: ../comps-f13.xml.in.h:14
 #: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
@@ -102,14 +112,16 @@ msgstr "Autor?a y publicaci?n"
 #: ../comps-f9.xml.in.h:11
 #: ../comps-f10.xml.in.h:12
 #: ../comps-f11.xml.in.h:14
-#: ../comps-f12.xml.in.h:14
+#: ../comps-f12.xml.in.h:16
+#: ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Base"
 
 #: ../comps-f9.xml.in.h:12
 #: ../comps-f10.xml.in.h:13
 #: ../comps-f11.xml.in.h:15
-#: ../comps-f12.xml.in.h:15
+#: ../comps-f12.xml.in.h:17
+#: ../comps-f13.xml.in.h:17
 #: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
@@ -118,63 +130,72 @@ msgstr "Sistema Base"
 #: ../comps-f9.xml.in.h:13
 #: ../comps-f10.xml.in.h:14
 #: ../comps-f11.xml.in.h:16
-#: ../comps-f12.xml.in.h:16
+#: ../comps-f12.xml.in.h:18
+#: ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Soporte b?sico para el lenguaje de programaci?n Ruby."
 
 #: ../comps-f9.xml.in.h:14
 #: ../comps-f10.xml.in.h:15
 #: ../comps-f11.xml.in.h:17
-#: ../comps-f12.xml.in.h:17
+#: ../comps-f12.xml.in.h:19
+#: ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Soporte para vascuence"
 
 #: ../comps-f9.xml.in.h:15
 #: ../comps-f10.xml.in.h:16
 #: ../comps-f11.xml.in.h:18
-#: ../comps-f12.xml.in.h:18
+#: ../comps-f12.xml.in.h:20
+#: ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Soporte para bielorruso"
 
 #: ../comps-f9.xml.in.h:16
 #: ../comps-f10.xml.in.h:17
 #: ../comps-f11.xml.in.h:19
-#: ../comps-f12.xml.in.h:19
+#: ../comps-f12.xml.in.h:21
+#: ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Soporte para bengal?"
 
 #: ../comps-f9.xml.in.h:17
 #: ../comps-f10.xml.in.h:18
 #: ../comps-f11.xml.in.h:20
-#: ../comps-f12.xml.in.h:20
+#: ../comps-f12.xml.in.h:22
+#: ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Soporte para bhutanese"
 
 #: ../comps-f9.xml.in.h:18
 #: ../comps-f10.xml.in.h:19
 #: ../comps-f11.xml.in.h:21
-#: ../comps-f12.xml.in.h:21
+#: ../comps-f12.xml.in.h:25
+#: ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Soporte para bosnio"
 
 #: ../comps-f9.xml.in.h:19
 #: ../comps-f10.xml.in.h:20
 #: ../comps-f11.xml.in.h:22
-#: ../comps-f12.xml.in.h:22
+#: ../comps-f12.xml.in.h:26
+#: ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Soporte para portugu?s brasile?o"
 
 #: ../comps-f9.xml.in.h:20
 #: ../comps-f10.xml.in.h:21
 #: ../comps-f11.xml.in.h:23
[...1990 lines suppressed...]
+#: ../comps-f13.xml.in.h:126
 msgid "Latin Support"
 msgstr "Soporte para latino"
 
 #: ../comps-f11.xml.in.h:126
-#: ../comps-f12.xml.in.h:126
+#: ../comps-f12.xml.in.h:134
+#: ../comps-f13.xml.in.h:134
 msgid "Luxembourgish Support"
 msgstr "Soporte para luxemburgu?s"
 
 #: ../comps-f11.xml.in.h:130
-#: ../comps-f12.xml.in.h:130
+#: ../comps-f12.xml.in.h:139
+#: ../comps-f13.xml.in.h:139
 msgid "Malagasy Support"
 msgstr "Soporte para malagasio"
 
 #: ../comps-f11.xml.in.h:133
-#: ../comps-f12.xml.in.h:133
+#: ../comps-f12.xml.in.h:142
+#: ../comps-f13.xml.in.h:142
 msgid "Maltese Support"
 msgstr "Soporte para malt?s"
 
 #: ../comps-f11.xml.in.h:134
-#: ../comps-f12.xml.in.h:134
+#: ../comps-f12.xml.in.h:143
+#: ../comps-f13.xml.in.h:143
 msgid "Manx Support"
 msgstr "Soporte para manx"
 
 #: ../comps-f11.xml.in.h:137
-#: ../comps-f12.xml.in.h:137
+#: ../comps-f12.xml.in.h:146
+#: ../comps-f13.xml.in.h:146
 msgid "MinGW cross-compiler"
 msgstr "Compilador multi-plataforma MinGW"
 
 #: ../comps-f11.xml.in.h:146
-#: ../comps-f12.xml.in.h:146
+#: ../comps-f12.xml.in.h:157
+#: ../comps-f13.xml.in.h:157
 msgid "OCaml"
 msgstr "OCaml"
 
 #: ../comps-f11.xml.in.h:147
-#: ../comps-f12.xml.in.h:147
+#: ../comps-f12.xml.in.h:158
+#: ../comps-f13.xml.in.h:158
 msgid "Occitan Support"
 msgstr "Soporte para occitanio"
 
 #: ../comps-f11.xml.in.h:150
-#: ../comps-f12.xml.in.h:150
+#: ../comps-f12.xml.in.h:161
+#: ../comps-f13.xml.in.h:161
 msgid "Online Help and Documentation"
 msgstr "Ayuda y Documentaci?n en linea"
 
 #: ../comps-f11.xml.in.h:164
-#: ../comps-f12.xml.in.h:164
+#: ../comps-f12.xml.in.h:175
+#: ../comps-f13.xml.in.h:175
 msgid "Sanskrit Support"
 msgstr "Soporte para s?nscrito"
 
 #: ../comps-f11.xml.in.h:165
-#: ../comps-f12.xml.in.h:165
+#: ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "Soporte para sardino"
 
 #: ../comps-f11.xml.in.h:182
-#: ../comps-f12.xml.in.h:182
+#: ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Entorno de Escritorio Sugar"
 
 #: ../comps-f11.xml.in.h:183
-#: ../comps-f12.xml.in.h:183
+#: ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora."
 msgstr "Soporte para compilar programas a objetivos de 32 bit, probarlos y crear instaladores, todo desde dentro de Fedora."
 
 #: ../comps-f11.xml.in.h:187
-#: ../comps-f12.xml.in.h:187
+#: ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid "Support for developing software using the Objective CAML programming language and libraries."
 msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci?n Objective CAML y las bibliotecas."
 
 #: ../comps-f11.xml.in.h:189
-#: ../comps-f12.xml.in.h:189
+#: ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Soporte para suahili"
 
 #: ../comps-f11.xml.in.h:197
-#: ../comps-f12.xml.in.h:197
+#: ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Soporte para tetum"
 
 #: ../comps-f11.xml.in.h:224
-#: ../comps-f12.xml.in.h:224
+#: ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts."
 msgstr "Este grupo es un conjunto de herramientas que se usan en el dise?o, modificaci?n, manipulaci?n y empaquetado de fuentes (tipos de letras)."
 
 #: ../comps-f11.xml.in.h:236
-#: ../comps-f12.xml.in.h:236
+#: ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Soporte para turkmenio"
 
 #: ../comps-f11.xml.in.h:238
-#: ../comps-f12.xml.in.h:238
+#: ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Soporte para serbio arribe?o"
 
+#: ../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 "Un conjunto de paquetes para proveer la funcionalidad de Camino Cr?tico para el escritorio GNOME"
+
+#: ../comps-f12.xml.in.h:3
+#: ../comps-f13.xml.in.h:3
+msgid "A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins"
+msgstr "Un conjunto de paquetes que proveen la plataforma compartida para la funcionalidad de Camino Cr?tico en todos los spins de Fedora"
+
+#: ../comps-f12.xml.in.h:23
+#: ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Libros y Gu?as"
+
+#: ../comps-f12.xml.in.h:24
+#: ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Libros y Gu?as para los usuarios y desarrolladores de Fedora"
+
+#: ../comps-f12.xml.in.h:37
+#: ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Camino Cr?tico (Base)"
+
+#: ../comps-f12.xml.in.h:38
+#: ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Camino Cr?tico (GNOME)"
+
+#: ../comps-f12.xml.in.h:50
+#: ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Servidor de Directorio"
+
+#: ../comps-f12.xml.in.h:88
+#: ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123
+#: ../comps-f13.xml.in.h:123
+msgid "LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE es un entorno de escritorio de X11 liviano dise?ado para computadoras con bajas especificaciones de hardware como las netbooks, dispositivos m?viles y computadoras viejas."
+
+#: ../comps-f12.xml.in.h:136
+#: ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Servidores de identidad de equipos y usuarios."
+
+#: ../comps-f12.xml.in.h:147
+#: ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Entorno de Escritorio Moblin"
+
+#: ../comps-f12.xml.in.h:148
+#: ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin es un entorno de escritorio para los dispositivos NetBook/NetTop/MID."
+
 #: ../comps-el4.xml.in.h:3
 #: ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
@@ -1949,6 +2264,4 @@ msgstr "Este grupo es un conjunto de her
 #~ msgstr "Eclipse"
 #~ msgid "The Eclipse Integrated Development Environment."
 #~ msgstr "El entorno de desarrollo integrado Eclipse."
-#~ msgid "Haskell"
-#~ msgstr "Haskell"
 



From phuang at fedoraproject.org  Sun Aug 30 22:59:57 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sun, 30 Aug 2009 22:59:57 +0000 (UTC)
Subject: rpms/ibus/devel ibus.spec,1.86,1.87 xinput-ibus,1.6,1.7
Message-ID: <20090830225958.244B811C0072@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18642

Modified Files:
	ibus.spec xinput-ibus 
Log Message:
Change icon path in ibus.conf


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- ibus.spec	28 Aug 2009 06:19:37 -0000	1.86
+++ ibus.spec	30 Aug 2009 22:59:56 -0000	1.87
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20090828
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -242,6 +242,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 31 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-2
+- Change icon path in ibus.conf
+
 * Fri Aug 28 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090828-1
 - Update to 1.2.0.20090828
 - Change the icon on systray.


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/xinput-ibus,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xinput-ibus	27 Jul 2009 23:54:35 -0000	1.6
+++ xinput-ibus	30 Aug 2009 22:59:56 -0000	1.7
@@ -1,6 +1,6 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="/usr/share/ibus/icons/ibus.svg"
+ICON="/usr/share/pixmaps/ibus.svg"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"



From hoangelos at fedoraproject.org  Sun Aug 30 23:26:19 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Sun, 30 Aug 2009 23:26:19 +0000 (UTC)
Subject: rpms/python-werkzeug/F-11 python-werkzeug.spec,NONE,1.1
Message-ID: <20090830232620.27B1211C0072@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-werkzeug/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv566

Added Files:
	python-werkzeug.spec 
Log Message:
Adding file that somehow didn't get imported



--- NEW FILE python-werkzeug.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname Werkzeug

Name:           python-werkzeug
Version:        0.5.1
Release:        1%{?dist}
Summary:        The Swiss Army knife of Python web development 

Group:          Development/Libraries
License:        BSD
URL:            http://werkzeug.pocoo.org/
Source0:        http://pypi.python.org/packages/source/W/Werkzeug/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-nose
BuildRequires:  python-setuptools-devel

%description
Werkzeug
========

Werkzeug started as simple collection of various utilities for WSGI
applications and has become one of the most advanced WSGI utility
modules.  It includes a powerful debugger, full featured request and
response objects, HTTP utilities to handle entity tags, cache control
headers, HTTP dates, cookie handling, file uploads, a powerful URL
routing system and a bunch of community contributed addon modules.

Werkzeug is unicode aware and doesn't enforce a specific template
engine, database adapter or anything else.  It doesn't even enforce
a specific way of handling requests and leaves all that up to the
developer. It's most useful for end user applications which should work
on as many server environments as possible (such as blogs, wikis,
bulletin boards, etc.).

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}


%description doc
Documentation and examples for %{name}.

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i 's/\r//' LICENSE
%{__sed} -i 's/\r//' docs/makearchive.py
%{__sed} -i 's/\r//' docs/_build/html/_static/pygments.css
%{__sed} -i 's/\r//' docs/_build/html/objects.inv
%{__sed} -i 's/\r//' PKG-INFO

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__rm} -rf docs/_build/html/.buildinfo

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE PKG-INFO CHANGES
%{python_sitelib}/*

%files doc
%defattr(-,root,root,-)
%doc docs/_build/html examples

%changelog
* Tue Aug 25 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.5.1-1
- Initial package



From mdomsch at fedoraproject.org  Sun Aug 30 23:48:56 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sun, 30 Aug 2009 23:48:56 +0000 (UTC)
Subject: rpms/python-IPy/devel sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5 python-IPy.spec, 1.7, 1.8
Message-ID: <20090830234856.2F80811C0072@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/python-IPy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10821

Modified Files:
	sources .cvsignore python-IPy.spec 
Log Message:
new version 0.63
- Fix formatting of "IPv4 in IPv6" network: IP('::ffff:192.168.10.0/120')



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-IPy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Nov 2008 20:04:02 -0000	1.4
+++ sources	30 Aug 2009 23:48:55 -0000	1.5
@@ -1 +1 @@
-c0509a7cf4143cd37728b93bac220ba9  IPy-0.62.tar.gz
+cef869380c65a9c09f52a1db7daa9cd8  IPy-0.63.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-IPy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Nov 2008 20:04:02 -0000	1.4
+++ .cvsignore	30 Aug 2009 23:48:55 -0000	1.5
@@ -1 +1 @@
-IPy-0.62.tar.gz
+IPy-0.63.tar.gz


Index: python-IPy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-IPy/devel/python-IPy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-IPy.spec	26 Jul 2009 20:04:09 -0000	1.7
+++ python-IPy.spec	30 Aug 2009 23:48:55 -0000	1.8
@@ -5,8 +5,8 @@
 
 Summary:        Python module for handling IPv4 and IPv6 Addresses and Networks
 Name:           python-%{oname}
-Version:        0.62
-Release:        4%{?dist}
+Version:        0.63
+Release:        1%{?dist}
 URL:            http://software.inl.fr/trac/trac.cgi/wiki/IPy
 Source0:        http://pypi.python.org/packages/source/I/IPy/IPy-%{version}.tar.gz
 License:        BSD
@@ -45,6 +45,9 @@ make test
 
 
 %changelog
+* Sun Aug 30 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.63-1
+- Fix formatting of "IPv4 in IPv6" network: IP('::ffff:192.168.10.0/120')
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.62-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Mon Aug 31 00:25:16 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 31 Aug 2009 00:25:16 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.106,1.107
Message-ID: <20090831002517.53F3511C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30417

Modified Files:
	nss.spec 
Log Message:
restore require sqlite, it's a legtimate requirement and not the cause of the nss-tools dependency failures


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- nss.spec	30 Aug 2009 07:13:53 -0000	1.106
+++ nss.spec	31 Aug 2009 00:25:16 -0000	1.107
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          27%{?dist}
+Release:          28%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -14,6 +14,7 @@ Requires:         nspr >= %{nspr_version
 Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn >= %{nss_softokn_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{nss_softokn_version}
+Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-softokn >= %{nss_softokn_version}                                                  
@@ -439,6 +440,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-28
+- restore require sqlite
+
 * Sat Aug 29 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-27
 - Don't require sqlite for nss
 



From transif at fedoraproject.org  Mon Aug 31 00:44:43 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 31 Aug 2009 00:44:43 +0000 (UTC)
Subject: comps/po ru.po,1.24,1.25
Message-ID: <20090831004443.B5DC811C0072@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6299/po

Modified Files:
	ru.po 
Log Message:
Sending translation for Russian


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.24 -r 1.25 ru.poIndex: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ru.po	26 May 2009 09:21:48 -0000	1.24
+++ ru.po	31 Aug 2009 00:44:43 -0000	1.25
@@ -1,7 +1,10 @@
+# translation of ru.po to Russian
 # translation of ru.po to
 # translation of comps.HEAD.ru.po to
 # This file is distributed under the same license as the comps package.
 # Copyright (C) 2008 THE ru'S COPYRIGHT HOLDER.
+#
+#
 # Leonid Kanter <leon at geon.donetsk.ua>, 2003.
 # Leonid Kanter <leon at asplinux.ru>, 2004, 2006.
 # Dmitri Alenitchev <alenitchev at nm.ru>, 2005.
@@ -9,295 +12,316 @@
 # Yulia Poyarkova <ypoyarko at redhat.com>, 2006.
 # Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2008, 2009.
 # Anatoliy Guskov <anatoliy.guskov at gmail.com>, 2009.Yulia Poyarkova <yulia.poyarkova at redhat.com>, 2009.
-# 
-# 
+# Yulia Poyarkova <yulia.poyarkova at gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 08:22+0000\n"
-"PO-Revision-Date: 2009-05-26 12:22+0300\n"
-"Last-Translator: Anatoliy Guskov <anatoliy.guskov at gmail.com>\n"
-"Language-Team: Russian <ru at li.org>\n"
+"POT-Creation-Date: 2009-08-30 19:35+0000\n"
+"PO-Revision-Date: 2009-08-31 10:43+1000\n"
+"Last-Translator: Yulia Poyarkova <yulia.poyarkova at gmail.com>\n"
+"Language-Team: Russian <fedora-trans-ru at redhat.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "???????????????? ? ???????? ??????? ????, ?????? ?????????? ?? ?????? "
 "???????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "???????? ?????????????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "????????? ?????????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????? ?????????? ?????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "??????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "?????????? ??? ?????????? ????????? ?????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "????????? ????????? ?????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "????????? ?????????? ?????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "????????? ?????????? ?????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????????? ??????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "??????? ???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "??????? ????????? ????? ???????????????? Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "????????? ????????? ?????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "????????? ???????????? ?????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "????????? ????? ???????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "????????? ?????????? ?????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ??????????? ?????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "????????? ???????????? ??????????????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "????????? ??????????? ?????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "?????? ?????? Buildsystem"
+
[...1917 lines suppressed...]
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1405,7 +1502,8 @@ msgstr ""
 "????????? ?????-?????????? ??? ???????? 32-?????? ???????? Windows, ?? "
 "???????????? ? ?????? ???????????? c ??????? Fedora."
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
@@ -1413,15 +1511,18 @@ msgstr ""
 "????????? ?????????? ???????? ??? ?????? ?????????? ????? ???????????????? "
 "CAML ? ?????????."
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "????????? ????? ???????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????????? ????? ?????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1429,23 +1530,81 @@ msgstr ""
 "?????? ???????????? ????? ????? ?????? ??? ??????????, ?????????, "
 "??????????? ? ???????? ???????."
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "????????? ???????????? ?????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "????????? ????????? ?????"
 
+#: ../comps-f12.xml.in.h:2 ../comps-f13.xml.in.h:2
+msgid ""
+"A set of packages that provide the Critical Path functionality for the GNOME "
+"desktop"
+msgstr "????? ???????, ??????????????? ???????????????? Critical Path ??? ??????????? ????? GNOME"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+#, fuzzy
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "????? ???????, ??????????????? ????? ????????? ??? ???????????????? Critical Path ??? ???? ????????? Fedora"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "????? ? ???????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "????? ? ??????????? ??? ????????????? ? ????????????? Fedora"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Critical Path (??????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Critical Path (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????? ?????????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ???????????? ????? ??????????? ??????? ??????????? ????? X11, ??????? ?????????? ???????? ??? ??????????? ? ?????? ????????????? ????????????: ?????????, ????????? ????????? ? ?????? ???????????."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+#, fuzzy
+msgid "Machine and user identity servers."
+msgstr "??????? ????????????? ??????????? ? ?????????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "??????????? ????? Moblin"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ???????????? ????? ????????? ???????? ????? ??? ????????? NetBook/NetTop/MID."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?????????? ??? ?????????? ????????? ?????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "????????? ?????? ? ????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1453,7 +1612,7 @@ msgstr ""
 "GNOME - ??? ?????? ??????????? ????????? ????????????, ??????? ???????? "
 "??????, ??????? ????, ????????? ??????????? ? ??????????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1461,7 +1620,7 @@ msgstr ""
 "KDE - ??? ?????? ??????????? ?????????, ?????????? ? ???? ?????? ??????????, "
 "??????? ????, ????????? ?????? ? ??????????? ???????? ??????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1469,11 +1628,11 @@ msgstr ""
 "??? ?????????, ?????? ?????????? ?????????? ???????????, ????????? "
 "????????????? ??????. ???????? Emacs ? Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "????????? ???????? XEmacs"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1481,33 +1640,29 @@ msgstr ""
 "??? ???????? ????????? ????????? ???????????? ? ??????? DocBook ? "
 "??????????????? ? HTML, PDF, Postscript ? ?????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "??? ?????? ???????? ????? ??????? ????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
-msgid ""
-"This group is a collection of tools and resources of Arabic environments."
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
+msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ???????? ???????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
-msgid ""
-"This group is a collection of tools and resources of Hebrew environments."
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
+msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "??? ?????? ???????? ????? ?????? ? ???????? ??? ?????????, ???????????? "
 "?????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
-msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
+msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ???????? ???????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../comps-el5.xml.in.h:66
+msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??? ?????? ???????? ????? ?????? ? ???????? ??? ??????? ???????????."
 



From transif at fedoraproject.org  Mon Aug 31 01:16:38 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 31 Aug 2009 01:16:38 +0000 (UTC)
Subject: comps/po zh_TW.po,1.25,1.26
Message-ID: <20090831011639.0291D11C0072@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20668/po

Modified Files:
	zh_TW.po 
Log Message:
Sending translation for Chinese (Traditional)


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.25 -r 1.26 zh_TW.poIndex: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- zh_TW.po	25 Aug 2009 06:21:25 -0000	1.25
+++ zh_TW.po	31 Aug 2009 01:16:38 -0000	1.26
@@ -1,13 +1,13 @@
-# translation of comps.HEAD.zh_TW.po to Traditional Chinese
+# translation of comps.HEAD.po to Traditional Chinese
 # Terry Chuang <tchuang at redhat.com>, 2008, 2009.
 # translation of comps.HEAD.po to
 # translation of zh_TW.po to
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.zh_TW\n"
+"Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-08-25 16:17+1000\n"
+"POT-Creation-Date: 2009-08-30 19:35+0000\n"
+"PO-Revision-Date: 2009-08-31 11:16+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,279 +16,300 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "????????????????"
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "?????????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "??"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Ruby ??????????"
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "?????????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "??????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "???????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "??????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
[...1823 lines suppressed...]
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:164 ../comps-f12.xml.in.h:175
+#: ../comps-f13.xml.in.h:175
 msgid "Sanskrit Support"
 msgstr "????"
 
-#: ../comps-f11.xml.in.h:165
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "???????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar ????"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
 msgstr "??? Feodra ?? 32 ?? Windows ?????????????????????"
 
-#: ../comps-f11.xml.in.h:186
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "???? Objective CAML ??????????????"
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "?????"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr "????????????????????????????"
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "??????"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "???????"
 
+#: ../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 "?? GNOME ??????????????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "???? Fedora spin ?????????????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "?????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ?????????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "???Critical Path??Base?"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "???GNOME?"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "?????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?????????????????????????????????? X11 ?????"
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "?????????????"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ???????/NetTop/MID ???????????"
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "?????????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1397,7 +1566,7 @@ msgstr ""
 "GNOME ???????????????????????????? ???????"
 "?????????????"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1405,7 +1574,7 @@ msgstr ""
 "KDE ???????????????????????????? ????????"
 "??"
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1413,11 +1582,11 @@ msgstr ""
 "?????????????????????????????????? Emacs "
 "? Vi?"
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs ??????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1425,27 +1594,27 @@ msgstr ""
 "?????????? DocBook ?????????? ?????? HTML, PDF, "
 "Postscript ????"
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "????????????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "???????????????????"
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "???????????????????"
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????????????????"
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "??????????????????"
 



From emaldonado at fedoraproject.org  Mon Aug 31 01:47:20 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 31 Aug 2009 01:47:20 +0000 (UTC)
Subject: rpms/nss/devel nss-nolocalsql.patch, 1.4,
	NONE nss-stubs-bug502133.patch, 1.3, NONE
Message-ID: <20090831014720.B062711C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2731

Removed Files:
	nss-nolocalsql.patch nss-stubs-bug502133.patch 
Log Message:
removed patches that have moved to nss-softokn


--- nss-nolocalsql.patch DELETED ---


--- nss-stubs-bug502133.patch DELETED ---



From dcbw at fedoraproject.org  Mon Aug 31 02:33:13 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 31 Aug 2009 02:33:13 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel NetworkManager-pptp.spec,1.14,1.15
Message-ID: <20090831023313.C2B8211C0072@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22035

Modified Files:
	NetworkManager-pptp.spec 
Log Message:
Add dbus-glib buildreq; fix NM buildreqs left over from debugging



Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- NetworkManager-pptp.spec	30 Aug 2009 15:00:40 -0000	1.14
+++ NetworkManager-pptp.spec	31 Aug 2009 02:33:13 -0000	1.15
@@ -20,8 +20,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
-#BuildRequires: NetworkManager-devel   >= %{nm_version}
-#BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: dbus-glib-devel        >= 0.74
+BuildRequires: NetworkManager-devel   >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel



From emaldonado at fedoraproject.org  Mon Aug 31 02:36:17 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 31 Aug 2009 02:36:17 +0000 (UTC)
Subject: rpms/nss/devel nss-nolocalsql.patch, 1.5,
	1.6 nss-stubs-bug502133.patch, 1.4, 1.5
Message-ID: <20090831023617.9F7AD11C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22854

Added Files:
	nss-nolocalsql.patch nss-stubs-bug502133.patch 
Log Message:
Restoring these two patches, although they nelong in nss-softokn we must still keep them and apply them here because we compile all sources

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: nss-nolocalsql.patch
diff -N nss-nolocalsql.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-nolocalsql.patch	31 Aug 2009 02:36:17 -0000	1.6
@@ -0,0 +1,52 @@
+diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
++++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
+@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
+ DIRS := $(filter-out fortcrypt,$(DIRS))
+ endif
+ 
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-DIRS := sqlite $(DIRS)
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#DIRS := sqlite $(DIRS)
++#endif
++#endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ CSRCS = \
+ 	dbmshim.c \
+diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ EXPORTS = \
+ 	secmodt.h \

nss-stubs-bug502133.patch:
 stubs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: nss-stubs-bug502133.patch
===================================================================
RCS file: nss-stubs-bug502133.patch
diff -N nss-stubs-bug502133.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-stubs-bug502133.patch	31 Aug 2009 02:36:17 -0000	1.5
@@ -0,0 +1,23 @@
+diff -rupN nss-3.12.3.99.3-orig/mozilla/security/nss/lib/freebl/stubs.c nss-3.12.3.99.3/mozilla/security/nss/lib/freebl/stubs.c
+--- ./mozilla/security/nss/lib/freebl/stubs.c	2009-03-28 19:21:50.000000000 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.c	2009-06-08 20:37:20.000000000 -0700
+@@ -558,8 +558,8 @@ FREEBL_InitStubs()
+ 	    return SECFailure;
+ 	}
+ 	rv = freebl_InitNSPR(nspr);
+-	freebl_releaseLibrary(nspr);
+ 	if (rv != SECSuccess) {
++	    freebl_releaseLibrary(nspr);
+ 	    return rv;
+ 	}
+     }
+@@ -570,8 +570,8 @@ FREEBL_InitStubs()
+ 	    return SECFailure;
+ 	}
+ 	rv = freebl_InitNSSUtil(nssutil);
+-	freebl_releaseLibrary(nssutil);
+ 	if (rv != SECSuccess) {
++	    freebl_releaseLibrary(nssutil);
+ 	    return rv;
+ 	}
+     }



From dcbw at fedoraproject.org  Mon Aug 31 02:54:37 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 31 Aug 2009 02:54:37 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel
	NetworkManager-openconnect.spec, 1.14, 1.15 sources, 1.6,
	1.7 NetworkManager-openconnect-allow-form-opts.patch, 1.1,
	NONE NetworkManager-openconnect-allow-lasthost-autoconnect.patch,
	1.1, NONE NetworkManager-openconnect-gwcert.patch, 1.1,
	NONE NetworkManager-openconnect-mtu.patch, 1.1,
	NONE NetworkManager-openconnect-passphrase-fsid.patch, 1.1,
	NONE NetworkManager-openconnect-update-translations.patch, 1.1, NONE
Message-ID: <20090831025437.12ACB11C0072@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26855

Modified Files:
	NetworkManager-openconnect.spec sources 
Removed Files:
	NetworkManager-openconnect-allow-form-opts.patch 
	NetworkManager-openconnect-allow-lasthost-autoconnect.patch 
	NetworkManager-openconnect-gwcert.patch 
	NetworkManager-openconnect-mtu.patch 
	NetworkManager-openconnect-passphrase-fsid.patch 
	NetworkManager-openconnect-update-translations.patch 
Log Message:
* Sun Aug 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-1
- Rebuild for updated NetworkManager
- Drop upstreamed patches




Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- NetworkManager-openconnect.spec	27 Jul 2009 14:37:17 -0000	1.14
+++ NetworkManager-openconnect.spec	31 Aug 2009 02:54:36 -0000	1.15
@@ -1,36 +1,30 @@
-%define nm_version          1:0.7.0.99-1
+%define nm_version          1:0.7.996-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openconnect_version 0.99
 
-%define svn_snapshot        %{nil}
+%define svn_snapshot        .git20090828
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
-Version:   0.7.0.99
-Release:   7%{svn_snapshot}%{?dist}
+Version:   0.7.996
+Release:   1%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
-Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
-Patch0:	   NetworkManager-openconnect-update-translations.patch
-Patch1:	   NetworkManager-openconnect-allow-lasthost-autoconnect.patch
-Patch2:	   NetworkManager-openconnect-allow-form-opts.patch
-Patch3:	   NetworkManager-openconnect-mtu.patch
-Patch4:	   NetworkManager-openconnect-gwcert.patch
-Patch5:	   NetworkManager-openconnect-passphrase-fsid.patch
+Source:    %{name}-%{version}%{svn_snapshot}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
-BuildRequires: NetworkManager-devel   >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: dbus-glib-devel        >= 0.74
+#BuildRequires: NetworkManager-devel   >= %{nm_version}
+#BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
-BuildRequires: gnome-common
 BuildRequires: autoconf automake libtool
 
 Requires: NetworkManager   >= %{nm_version}
@@ -48,12 +42,6 @@ with NetworkManager and the GNOME deskto
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 %configure --enable-more-warnings=yes
@@ -108,6 +96,10 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Sun Aug 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-1
+- Rebuild for updated NetworkManager
+- Drop upstreamed patches
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0.99-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Mar 2009 20:06:17 -0000	1.6
+++ sources	31 Aug 2009 02:54:36 -0000	1.7
@@ -1 +0,0 @@
-c56a82bd7697d7d35f11159883cabe88  NetworkManager-openconnect-0.7.0.99.tar.gz


--- NetworkManager-openconnect-allow-form-opts.patch DELETED ---


--- NetworkManager-openconnect-allow-lasthost-autoconnect.patch DELETED ---


--- NetworkManager-openconnect-gwcert.patch DELETED ---


--- NetworkManager-openconnect-mtu.patch DELETED ---


--- NetworkManager-openconnect-passphrase-fsid.patch DELETED ---


--- NetworkManager-openconnect-update-translations.patch DELETED ---



From dcbw at fedoraproject.org  Mon Aug 31 03:06:25 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 31 Aug 2009 03:06:25 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel .cvsignore, 1.6, 1.7 sources, 
	1.7, 1.8
Message-ID: <20090831030625.D282311C0072@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29124

Modified Files:
	.cvsignore sources 
Log Message:
Upload source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Mar 2009 20:06:17 -0000	1.6
+++ .cvsignore	31 Aug 2009 03:06:23 -0000	1.7
@@ -1,3 +1,4 @@
 NetworkManager-openconnect-0.7.0.svn14.tar.gz
 NetworkManager-openconnect-0.7.0.97.tar.gz
 NetworkManager-openconnect-0.7.0.99.tar.gz
+NetworkManager-openconnect-0.7.996.git20090828.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Aug 2009 02:54:36 -0000	1.7
+++ sources	31 Aug 2009 03:06:24 -0000	1.8
@@ -0,0 +1 @@
+619c7b97aec28a769b0376e891ff3927  NetworkManager-openconnect-0.7.996.git20090828.tar.bz2



From tagoh at fedoraproject.org  Mon Aug 31 03:07:12 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 31 Aug 2009 03:07:12 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings.spec,1.35,1.36
Message-ID: <20090831030712.A87B911C0072@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29415

Modified Files:
	imsettings.spec 
Log Message:
* Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
- Add a conditional build to disable xfce module for RHEL.


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- imsettings.spec	27 Aug 2009 08:08:11 -0000	1.35
+++ imsettings.spec	31 Aug 2009 03:07:12 -0000	1.36
@@ -8,7 +8,9 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	intltool gettext
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
 BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
+%if !0%{?rhel}
 BuildRequires:	xfconf-devel
+%endif
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -63,6 +65,7 @@ or the desktop.
 This package contains the development files to make any
 applications with imsettings.
 
+%if !0%{?rhel}
 %package	xfce
 Summary:	Xfce support on imsettings
 Group:		Applications/System
@@ -77,6 +80,7 @@ immediately without any need to restart 
 or the desktop.
 
 This package contains a plugin to get this working on Xfce.  
+%endif
 
 %prep
 %setup -q
@@ -103,6 +107,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}
 # clean up the unnecessary files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
+%if 0%{?rhel}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-xfce-helper
+%endif
 
 # still not stable
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
@@ -193,14 +201,19 @@ fi
 %{_libdir}/libimsettings-xim.so
 %{_libdir}/pkgconfig/imsettings.pc
 
+%if !0%{?rhel}
 %files	xfce
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/imsettings-xfce-helper
 %{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+%endif
 
 
 %changelog
+* Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
+- Add a conditional build to disable xfce module for RHEL.
+
 * Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
 - New upstream release.
   - Stop IM process properly with the DBus disconnect signal. (#518970)



From dcbw at fedoraproject.org  Mon Aug 31 03:21:07 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon, 31 Aug 2009 03:21:07 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel
	NetworkManager-openconnect.spec, 1.15, 1.16
Message-ID: <20090831032108.0525211C0072@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32753

Modified Files:
	NetworkManager-openconnect.spec 
Log Message:
Fix NM build requires



Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- NetworkManager-openconnect.spec	31 Aug 2009 02:54:36 -0000	1.15
+++ NetworkManager-openconnect.spec	31 Aug 2009 03:21:07 -0000	1.16
@@ -19,8 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: dbus-glib-devel        >= 0.74
-#BuildRequires: NetworkManager-devel   >= %{nm_version}
-#BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: NetworkManager-devel   >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel



From emaldonado at fedoraproject.org  Mon Aug 31 03:21:20 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 31 Aug 2009 03:21:20 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.107,1.108
Message-ID: <20090831032120.8B0C511C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv405

Modified Files:
	nss.spec 
Log Message:
Restore the stubs and nolocalsql patches, the latter fixes sqlite dependency problems - bug 520277


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- nss.spec	31 Aug 2009 00:25:16 -0000	1.107
+++ nss.spec	31 Aug 2009 03:21:20 -0000	1.108
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          28%{?dist}
+Release:          29%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -40,7 +40,9 @@ Source13:         PayPalEE.cert
 Source14:         PayPalICA.cert
 
 Patch1:           nss-no-rpath.patch
+Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
+Patch7:           nss-stubs-bug502133.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -94,7 +96,9 @@ low level services.
 %setup -q -T -D -n %{name}-%{version} -a 12
 
 %patch1 -p0
+%patch2 -p0
 %patch6 -p0 -b .libpem
+%patch7 -p0 -b .502133
 
 #need newer certs to make test suite work
 #remove once we update to NSS 3.12.4
@@ -440,6 +444,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-29
+- Restoring patches 2 and 7 as we still compile all sources
+- Applying the nss-nolocalsql.patch solves nss-tools sqlite dependency problems
+
 * Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-28
 - restore require sqlite
 



From pkgdb at fedoraproject.org  Mon Aug 31 04:06:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 04:06:08 +0000
Subject: [pkgdb] NetworkManager-vpnc had acl change status
Message-ID: <20090831040609.0459210F886@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on NetworkManager-vpnc (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Mon Aug 31 04:06:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 04:06:09 +0000
Subject: [pkgdb] NetworkManager-vpnc had acl change status
Message-ID: <20090831040609.337E110F88C@bastion2.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on NetworkManager-vpnc (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Mon Aug 31 04:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 04:06:10 +0000
Subject: [pkgdb] NetworkManager-vpnc had acl change status
Message-ID: <20090831040610.8885410F893@bastion2.fedora.phx.redhat.com>

huzaifas has set the commit acl on NetworkManager-vpnc (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Mon Aug 31 04:06:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 04:06:11 +0000
Subject: [pkgdb] NetworkManager-vpnc had acl change status
Message-ID: <20090831040611.AC1A410F896@bastion2.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on NetworkManager-vpnc (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-vpnc



From cchance at fedoraproject.org  Mon Aug 31 04:31:54 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 31 Aug 2009 04:31:54 +0000 (UTC)
Subject: rpms/ibus-table-erbi/devel .cvsignore, 1.4, 1.5 ibus-table-erbi.spec,
	1.13, 1.14 sources, 1.4, 1.5
Message-ID: <20090831043154.D0CBB11C0072@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1840

Modified Files:
	.cvsignore ibus-table-erbi.spec sources 
Log Message:
updated source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2009 02:38:45 -0000	1.4
+++ .cvsignore	31 Aug 2009 04:31:54 -0000	1.5
@@ -1 +1 @@
-ibus-table-erbi-1.2.0.20090828.tar.gz
+ibus-table-erbi-1.2.0.20090831.tar.gz


Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/ibus-table-erbi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ibus-table-erbi.spec	28 Aug 2009 02:37:24 -0000	1.13
+++ ibus-table-erbi.spec	31 Aug 2009 04:31:54 -0000	1.14
@@ -1,5 +1,5 @@
 Name:       ibus-table-erbi
-Version:    1.2.0.20090828
+Version:    1.2.0.20090831
 Release:    1%{?dist}
 Summary:    Erbi input method tables for IBus-Table
 License:    GPLv2+
@@ -10,9 +10,9 @@ Source0:    http://ibus.googlecode.com/f
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-Requires:         ibus >= 1.1.0.20090617, ibus-table >= 1.1.0.20090610
-Requires(post):   ibus >= 1.1.0.20090617, ibus-table >= 1.1.0.20090610
-BuildRequires:    ibus >= 1.2.0.20090617, ibus-table >= 1.1.0.20090610
+Requires:         ibus >= 1.2, ibus-table >= 1.2
+Requires(post):   ibus >= 1.2, ibus-table >= 1.2
+BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
 
 %description
 The package contains Erbi input method tables for IBus-Table. 
@@ -22,10 +22,7 @@ The package contains Erbi input method t
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
-%configure \
-  --prefix=%{_prefix} \
-  --enable-erbi \
-  --enable-erbi-qs
+%configure --prefix=%{_prefix} --enable-erbi --enable-erbi-qs
 %__make %{?_smp_mflags}
 
 %install
@@ -37,6 +34,7 @@ export IBUS_TABLE_CREATEDB="%{_bindir}/i
 
 %post
 cd %{_datadir}/ibus-table/tables/
+pwd
 %{_bindir}/ibus-table-createdb -i -n erbi.db
 %{_bindir}/ibus-table-createdb -i -n erbi_qs.db
 
@@ -49,6 +47,9 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Mon Aug 31 2009 Caius 'kaio' Chance <k at kaio.me> - 1.1.0.20090831-1.fc12
+- Updated source.
+
 * Fri Aug 28 2009 Caius 'kaio' Chance <k at kaio.me> - 1.1.0.20090828-1.fc12
 - Updated source with addition of standard ErBi table.
 - Corrected Requires package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 02:38:45 -0000	1.4
+++ sources	31 Aug 2009 04:31:54 -0000	1.5
@@ -1 +1 @@
-155a79f4c8fc1ac117698702c853d47d  ibus-table-erbi-1.2.0.20090828.tar.gz
+826f58ecaf2c7feb05ed596e65ebe133  ibus-table-erbi-1.2.0.20090831.tar.gz



From varekova at fedoraproject.org  Mon Aug 31 06:11:50 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 31 Aug 2009 06:11:50 +0000 (UTC)
Subject: rpms/uClibc/devel uClibc.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090831061150.79B1411C0072@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/uClibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29335

Modified Files:
	.cvsignore sources 
Added Files:
	uClibc.spec 
Log Message:
- initial build for Red Hat



--- NEW FILE uClibc.spec ---
Name: uClibc
Version: 0.9.30.1
Release: 1%{?dist}
Summary: C library for embedded Linux

Group: Development/Libraries
License: LGPLv2
URL: http://www.uclibc.org/
Source0: http://www.uclibc.org/downloads/%{name}-%{version}.tar.bz2
Source1: uClibc.config
# fix conflicting types for getline
Patch0: uClibc-0.9.30.1-getline.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%global debug_package %{nil}
# This package only contains a static library

ExcludeArch: ppc64
# uclibc 0.9.30 does not support ppc64

%description
uClibc is a C library for developing embedded Linux systems.
It is much smaller than the GNU C Library, but nearly all applications
supported by glibc also work perfectly with uClibc.

%package devel
Summary: Header files and libraries for uClibc library
Group: Development/Libraries
Provides: uClibc-static = %{version}-%{release}

%description devel
uClibc is a C library for developing embedded Linux systems.
It is much smaller than the GNU C Library, but nearly all applications
supported by glibc also work perfectly with uClibc.
This package contains the header files and libraries
needed for uClibc package.

%prep
%setup -q
%patch0 -p1 -b .getline

cat %{SOURCE1} >.config1
iconv -f windows-1252 -t utf-8 README >README.pom
mv README.pom README

%build
mkdir kernel-include
cp -a /usr/include/asm kernel-include
cp -a /usr/include/asm-generic kernel-include
cp -a /usr/include/linux kernel-include

arch=`uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/'`
echo "TARGET_$arch=y" >.config
echo "TARGET_ARCH=\"$arch\"" >>.config
cat .config1 >>.config

yes "" | make oldconfig %{?_smp_mflags}
make V=1 %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DEVEL_PREFIX="$RPM_BUILD_ROOT/"
make install_kernel_headers DEVEL_PREFIX="$RPM_BUILD_ROOT/"

# move libraries to proper subdirectory
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/uClibc
mv  $RPM_BUILD_ROOT/lib/*  $RPM_BUILD_ROOT/%{_libdir}/uClibc/
rm -rf  $RPM_BUILD_ROOT/lib/

# move the header files to /usr subdirectory
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/uClibc
mv  $RPM_BUILD_ROOT/include/*  $RPM_BUILD_ROOT/%{_includedir}/uClibc
rm -rf  $RPM_BUILD_ROOT/include/

%clean
rm -rf $RPM_BUILD_ROOT

%files devel
%defattr(-,root,root,-)
%doc README docs/Glibc_vs_uClibc_Differences.txt docs/threads.txt docs/uClibc_vs_SuSv3.txt
%doc TODO DEDICATION.mjn3 MAINTAINERS
%doc docs/PORTING COPYING.LIB
%{_includedir}/uClibc
%{_libdir}/uClibc

%changelog
* Fri Jun 5 2009 Ivana Varekova <varekova at redhat.com> - 0.9.30.1-1
- initial build for Red Hat


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uClibc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Jul 2009 15:17:50 -0000	1.1
+++ .cvsignore	31 Aug 2009 06:11:48 -0000	1.2
@@ -0,0 +1 @@
+uClibc-0.9.30.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uClibc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Jul 2009 15:17:50 -0000	1.1
+++ sources	31 Aug 2009 06:11:48 -0000	1.2
@@ -0,0 +1 @@
+1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2



From varekova at fedoraproject.org  Mon Aug 31 06:12:47 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 31 Aug 2009 06:12:47 +0000 (UTC)
Subject: rpms/uClibc/devel uClibc.spec,1.1,1.2
Message-ID: <20090831061247.0067711C0072@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/uClibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29759

Modified Files:
	uClibc.spec 
Log Message:
increase release number



Index: uClibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uClibc/devel/uClibc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- uClibc.spec	31 Aug 2009 06:11:48 -0000	1.1
+++ uClibc.spec	31 Aug 2009 06:12:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name: uClibc
 Version: 0.9.30.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: C library for embedded Linux
 
 Group: Development/Libraries
@@ -84,5 +84,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/uClibc
 
 %changelog
-* Fri Jun 5 2009 Ivana Varekova <varekova at redhat.com> - 0.9.30.1-1
+* Fri Jun 5 2009 Ivana Varekova <varekova at redhat.com> - 0.9.30.1-2
 - initial build for Red Hat



From varekova at fedoraproject.org  Mon Aug 31 06:20:18 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 31 Aug 2009 06:20:18 +0000 (UTC)
Subject: rpms/uClibc/devel uClibc-0.9.30.1-getline.patch,NONE,1.1
Message-ID: <20090831062018.65F4411C0495@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/uClibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31953

Added Files:
	uClibc-0.9.30.1-getline.patch 
Log Message:
add patch


uClibc-0.9.30.1-getline.patch:
 unifdef.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE uClibc-0.9.30.1-getline.patch ---
diff -up uClibc-0.9.30.1/extra/scripts/unifdef.c.pom uClibc-0.9.30.1/extra/scripts/unifdef.c
--- uClibc-0.9.30.1/extra/scripts/unifdef.c.pom	2008-04-28 01:10:00.000000000 +0200
+++ uClibc-0.9.30.1/extra/scripts/unifdef.c	2009-06-09 11:15:09.000000000 +0200
@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         getline_uClibc(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void)
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = getline_uClibc();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+getline_uClibc(void)
 {
 	const char *cp;
 	int cursym;



From varekova at fedoraproject.org  Mon Aug 31 06:27:36 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 31 Aug 2009 06:27:36 +0000 (UTC)
Subject: rpms/uClibc/devel uClibc.config,NONE,1.1
Message-ID: <20090831062736.841D411C0072@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/uClibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1027

Added Files:
	uClibc.config 
Log Message:
add config file



--- NEW FILE uClibc.config ---
#
# Target Architecture Features and Options
#
FORCE_OPTIONS_FOR_ARCH=y
TARGET_SUBARCH=""

#
# Using ELF file format
#
ARCH_LITTLE_ENDIAN=y

#
# Using Little Endian
#
ARCH_HAS_MMU=y
ARCH_USE_MMU=y
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=n
UCLIBC_HAS_FENV=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS="./kernel-include"
HAVE_DOT_CONFIG=y

#
# General Library Settings
#
# HAVE_NO_PIC is not set
# DOPIC is not set
# ARCH_HAS_NO_SHARED is not set
# ARCH_HAS_NO_LDSO is not set
# HAVE_SHARED is not set
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
# UCLIBC_HAS_THREADS is not set
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
MALLOC_STANDARD=y
# MALLOC_GLIBC_COMPAT is not set
UCLIBC_DYNAMIC_ATEXIT=y
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
UNIX98PTY_ONLY=y
UCLIBC_HAS_GETPT=y
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
UCLIBC_HAS_TZ_FILE_READ_MANY=y
UCLIBC_TZ_FILE_PATH="/etc/TZ"

#
# Advanced Library Settings
#
UCLIBC_PWD_BUFFER_SIZE=256
UCLIBC_GRP_BUFFER_SIZE=256

#
# Support various families of functions
#
UCLIBC_LINUX_MODULE_24=y
UCLIBC_LINUX_SPECIFIC=y
UCLIBC_HAS_GNU_ERROR=y
UCLIBC_BSD_SPECIFIC=y
UCLIBC_HAS_BSD_ERR=y
UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
UCLIBC_NTP_LEGACY=y
UCLIBC_SV4_DEPRECATED=y
UCLIBC_HAS_REALTIME=y
UCLIBC_HAS_ADVANCED_REALTIME=y
UCLIBC_HAS_EPOLL=y
UCLIBC_HAS_XATTR=y
UCLIBC_HAS_PROFILING=y
UCLIBC_HAS_CRYPT_IMPL=y
UCLIBC_HAS_CRYPT=y
UCLIBC_HAS_NETWORK_SUPPORT=y
UCLIBC_HAS_SOCKET=y
UCLIBC_HAS_IPV4=y
UCLIBC_HAS_IPV6=y
UCLIBC_HAS_RPC=y
UCLIBC_HAS_FULL_RPC=y
UCLIBC_HAS_REENTRANT_RPC=y
# UCLIBC_USE_NETLINK is not set
# UCLIBC_HAS_BSD_RES_CLOSE is not set

#
# String and Stdio Support
#
UCLIBC_HAS_STRING_GENERIC_OPT=y
UCLIBC_HAS_STRING_ARCH_OPT=y
UCLIBC_HAS_CTYPE_TABLES=y
UCLIBC_HAS_CTYPE_SIGNED=y
UCLIBC_HAS_CTYPE_UNSAFE=y
# UCLIBC_HAS_CTYPE_CHECKED is not set
# UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
# UCLIBC_HAS_LOCALE is not set
# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
# USE_OLD_VFPRINTF is not set
UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
UCLIBC_HAS_STDIO_BUFSIZ_1024=y
# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
UCLIBC_HAS_STDIO_GETC_MACRO=y
UCLIBC_HAS_STDIO_PUTC_MACRO=y
UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
UCLIBC_HAS_PRINTF_M_SPEC=y
UCLIBC_HAS_ERRNO_MESSAGES=y
# UCLIBC_HAS_SYS_ERRLIST is not set
UCLIBC_HAS_SIGNUM_MESSAGES=y
# UCLIBC_HAS_SYS_SIGLIST is not set
UCLIBC_HAS_GNU_GETOPT=y
UCLIBC_HAS_GNU_GETSUBOPT=y

#
# Big and Tall
#
UCLIBC_HAS_REGEX=y
# UCLIBC_HAS_REGEX_OLD is not set
UCLIBC_HAS_FNMATCH=y
UCLIBC_HAS_FNMATCH_OLD=y
UCLIBC_HAS_WORDEXP=y
UCLIBC_HAS_FTW=y
UCLIBC_HAS_GLOB=y
# UCLIBC_HAS_GNU_GLOB is not set

#
# Library Installation Options
#
RUNTIME_PREFIX="/lib_uc"
DEVEL_PREFIX="./installeddd"

#
# Security options
#
# UCLIBC_HAS_ARC4RANDOM is not set
# HAVE_NO_SSP is not set
# UCLIBC_HAS_SSP is not set
UCLIBC_BUILD_NOEXECSTACK=y

#
# uClibc development/debugging options
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
DODEBUG=y
DOSTRIP=y
# DOASSERTS is not set
# UCLIBC_MALLOC_DEBUGGING is not set
WARNINGS="-Wall"
# EXTRA_WARNINGS is not set
# DOMULTI is not set
# UCLIBC_MJN3_ONLY is not set



From alexlan at fedoraproject.org  Mon Aug 31 06:43:54 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 31 Aug 2009 06:43:54 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.79,1.80
Message-ID: <20090831064354.5FFB011C0072@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4054

Modified Files:
	octave-forge.spec 
Log Message:
* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-9
- Temporarily disable java build again



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- octave-forge.spec	20 Aug 2009 04:33:54 -0000	1.79
+++ octave-forge.spec	31 Aug 2009 06:43:52 -0000	1.80
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -21,7 +21,7 @@ Source0:        %{name}-bundle-%{version
 Patch0:		octave-forge-20090607-includes.patch
 Patch1:		octave-forge-20090607-ann-swig-build.patch
 Patch2:		octave-forge-20090607-parallel-build.patch
-Patch3:		octave-forge-20090607-java-build.patch
+#Patch3:		octave-forge-20090607-java-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -97,7 +97,7 @@ Provides: octave-generate_html = 0.0.9
 # Provides: octave-graceplot = 1.0.8
 Provides: octave-integration = 1.0.7
 # temporarily disable: doesn't yet build
-Provides: octave-java = 1.2.6
+# Provides: octave-java = 1.2.6
 # octave-jhandles is removed
 Provides: octave-mapping = 1.0.7
 Provides: octave-msh = 0.1.1
@@ -151,7 +151,7 @@ rm main/parallel-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
 # 9. exclude java --  doesn't build against Octave 3.2
-#rm extra/java-*.tar.gz
+rm extra/java-*.tar.gz
 # 10. exclude spanish -- doesn't build against Octave 3.2
 rm language/spanish-*.tar.gz
 
@@ -249,6 +249,9 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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



From alexlan at fedoraproject.org  Mon Aug 31 06:45:30 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 31 Aug 2009 06:45:30 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.80,1.81
Message-ID: <20090831064530.530F811C0072@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5046

Modified Files:
	octave-forge.spec 
Log Message:
Forgot to comment patch application



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- octave-forge.spec	31 Aug 2009 06:43:52 -0000	1.80
+++ octave-forge.spec	31 Aug 2009 06:45:29 -0000	1.81
@@ -175,7 +175,7 @@ done
 %patch1 -p0
 #disable patch for the moment, not building 'parallel'
 #patch2 -p0
-%patch3 -p0
+#patch3 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile



From sandeeps at fedoraproject.org  Mon Aug 31 07:11:52 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 31 Aug 2009 07:11:52 +0000 (UTC)
Subject: rpms/vemana2000-fonts/devel import.log, NONE,
	1.1 vemana2000-fonts-fontconfig.conf, NONE,
	1.1 vemana2000-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090831071152.96BE511C0072@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/vemana2000-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9976/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vemana2000-fonts-fontconfig.conf 
	vemana2000-fonts.spec 
Log Message:



--- NEW FILE import.log ---
vemana2000-fonts-1_1_1-2_fc12:HEAD:vemana2000-fonts-1.1.1-2.fc12.src.rpm:1251702594


--- NEW FILE vemana2000-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Vemana2000</family>
    </prefer>
  </alias>
  <alias>
    <family>Vemana2000</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE vemana2000-fonts.spec ---
%global fontname vemana2000
%global fontconf 69-%{fontname}.conf

Name: %{fontname}-fonts
Version: 1.1.1
Release: 2%{?dist}
Summary: Unicode compliant OpenType font for Telugu

Group: User Interface/X
License: GPLv2+
URL: http://www.kavya-nandanam.com/dload.htm

Source0: Vemana2k-Li.zip
Source1: %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch: noarch
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem

%description
A free OpenType font for Telugu created by
Dr. Tirumala Krishna Desikacharyulu. 

%prep
%setup -q -c -n %{name}
sed -i 's/\r//' gpl.txt

%build

%install
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p vemana2000.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} vemana2000.ttf

%doc gpl.txt

%changelog
* Tue Aug 31 2009 <sshedmak at redhat.com> - 1.1.1-2
- Changed the Pothana2000 strings to Vemana2000

* Tue Jun 23 2009 <sshedmak at redhat.com> - 1.1.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:40:36 -0000	1.1
+++ .cvsignore	31 Aug 2009 07:11:46 -0000	1.2
@@ -0,0 +1 @@
+Vemana2k-Li.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:40:37 -0000	1.1
+++ sources	31 Aug 2009 07:11:47 -0000	1.2
@@ -0,0 +1 @@
+b1a631b2725e59bda082af9cfafb51a6  Vemana2k-Li.zip



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:18 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072918.54F0210F883@bastion2.fedora.phx.redhat.com>

msuchy has set the watchbugzilla acl on rpmconf (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:18 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072918.E336910F894@bastion2.fedora.phx.redhat.com>

msuchy has set the watchcommits acl on rpmconf (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:24 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072924.487D610F888@bastion2.fedora.phx.redhat.com>

msuchy has set the commit acl on rpmconf (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:37 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072937.D136110F88C@bastion2.fedora.phx.redhat.com>

msuchy has set the watchbugzilla acl on rpmconf (Fedora 11) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:38 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072938.5BC4510F895@bastion2.fedora.phx.redhat.com>

msuchy has set the watchcommits acl on rpmconf (Fedora 11) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:39 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072939.A2C4810F89A@bastion2.fedora.phx.redhat.com>

msuchy has set the commit acl on rpmconf (Fedora 11) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:45 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072945.3EE5C10F897@bastion2.fedora.phx.redhat.com>

msuchy has set the watchbugzilla acl on rpmconf (Fedora EPEL 4) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:45 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072945.B99ED10F89F@bastion2.fedora.phx.redhat.com>

msuchy has set the watchcommits acl on rpmconf (Fedora EPEL 4) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:47 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072947.ABE3110F8A3@bastion2.fedora.phx.redhat.com>

msuchy has set the commit acl on rpmconf (Fedora EPEL 4) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:50 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072951.055D410F8A8@bastion2.fedora.phx.redhat.com>

msuchy has set the watchbugzilla acl on rpmconf (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:51 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072951.590B510F8AB@bastion2.fedora.phx.redhat.com>

msuchy has set the watchcommits acl on rpmconf (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From pkgdb at fedoraproject.org  Mon Aug 31 07:29:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 07:29:53 +0000
Subject: [pkgdb] rpmconf had acl change status
Message-ID: <20090831072953.7D28E10F88C@bastion2.fedora.phx.redhat.com>

msuchy has set the commit acl on rpmconf (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rpmconf



From sandeeps at fedoraproject.org  Mon Aug 31 07:30:55 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 31 Aug 2009 07:30:55 +0000 (UTC)
Subject: rpms/vemana2000-fonts/F-10 vemana2000-fonts-fontconfig.conf, NONE, 
	1.1 vemana2000-fonts.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090831073055.6BBD111C02CA@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/vemana2000-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14274

Modified Files:
	sources 
Added Files:
	vemana2000-fonts-fontconfig.conf vemana2000-fonts.spec 
Log Message:



--- NEW FILE vemana2000-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Vemana2000</family>
    </prefer>
  </alias>
  <alias>
    <family>Vemana2000</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE vemana2000-fonts.spec ---
%global fontname vemana2000
%global fontconf 69-%{fontname}.conf

Name: %{fontname}-fonts
Version: 1.1.1
Release: 2%{?dist}
Summary: Unicode compliant OpenType font for Telugu

Group: User Interface/X
License: GPLv2+
URL: http://www.kavya-nandanam.com/dload.htm

Source0: Vemana2k-Li.zip
Source1: %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch: noarch
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem

%description
A free OpenType font for Telugu created by
Dr. Tirumala Krishna Desikacharyulu. 

%prep
%setup -q -c -n %{name}
sed -i 's/\r//' gpl.txt

%build

%install
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p vemana2000.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} vemana2000.ttf

%doc gpl.txt

%changelog
* Tue Aug 31 2009 <sshedmak at redhat.com> - 1.1.1-2
- Changed the Pothana2000 strings to Vemana2000

* Tue Jun 23 2009 <sshedmak at redhat.com> - 1.1.1-1
- Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:40:37 -0000	1.1
+++ sources	31 Aug 2009 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+b1a631b2725e59bda082af9cfafb51a6  Vemana2k-Li.zip



From dchen at fedoraproject.org  Mon Aug 31 07:32:38 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 31 Aug 2009 07:32:38 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.19, 1.20 ibus-chewing.spec,
	1.22, 1.23 import.log, 1.15, 1.16 sources, 1.20, 1.21
Message-ID: <20090831073238.95CAF11C0072@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-serv14819/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Bug 519328; IBus IBus upstream issue 484


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	18 Aug 2009 07:29:45 -0000	1.19
+++ .cvsignore	31 Aug 2009 07:32:37 -0000	1.20
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090818-Source.tar.gz
+ibus-chewing-1.2.0.20090831-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ibus-chewing.spec	18 Aug 2009 07:29:45 -0000	1.22
+++ ibus-chewing.spec	31 Aug 2009 07:32:38 -0000	1.23
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090818
+Version:    1.2.0.20090831
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -77,7 +77,13 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Aug 18 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090818-1
+* Mon Aug 31 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090831-1
+- IBusProperty and IBusPropList are free upon destruction.
+- Fixed Red Hat Bugzilla [Bug 519328] [ibus-chewing] inconsistent between normal mode and plain Zhuyin mode.
+- Addressed Upstream (IBUS Google code) issue 484:
+  Arithmetic symbols (+-*/) on number pad does not input properly.
+
+* Wed Aug 26 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090818-1
 - Merged 1.2 and 1.1 source code.
 - Addressed Upstream (IBUS Google code) issue 471.
 - Remove libX11 dependency.
@@ -190,3 +196,4 @@ Fix the errors which Funda Wang as point
 
 
 
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	18 Aug 2009 07:29:45 -0000	1.15
+++ import.log	31 Aug 2009 07:32:38 -0000	1.16
@@ -13,3 +13,4 @@ ibus-chewing-1_0_10_20090522-1_fc11:F-11
 ibus-chewing-1_0_10_20090523-1_fc11:F-11:ibus-chewing-1.0.10.20090523-1.fc11.src.rpm:1242970059
 ibus-chewing-1_0_10_20090523-2_fc11:F-11:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242974190
 ibus-chewing-1_2_0_20090818-1_fc11:F-11:ibus-chewing-1.2.0.20090818-1.fc11.src.rpm:1250580564
+ibus-chewing-1_2_0_20090831-1_fc11:F-11:ibus-chewing-1.2.0.20090831-1.fc11.src.rpm:1251703942


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	18 Aug 2009 07:29:45 -0000	1.20
+++ sources	31 Aug 2009 07:32:38 -0000	1.21
@@ -1 +1 @@
-e707ae6563e858c8fa381b34436a21e6  ibus-chewing-1.2.0.20090818-Source.tar.gz
+516b880189475ebe0a930dd1c3d2bb72  ibus-chewing-1.2.0.20090831-Source.tar.gz



From sandeeps at fedoraproject.org  Mon Aug 31 07:37:26 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 31 Aug 2009 07:37:26 +0000 (UTC)
Subject: rpms/vemana2000-fonts/F-11 vemana2000-fonts-fontconfig.conf, NONE, 
	1.1 vemana2000-fonts.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090831073726.CBDEB11C0072@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/rpms/vemana2000-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15724

Modified Files:
	sources 
Added Files:
	vemana2000-fonts-fontconfig.conf vemana2000-fonts.spec 
Log Message:



--- NEW FILE vemana2000-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Vemana2000</family>
    </prefer>
  </alias>
  <alias>
    <family>Vemana2000</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE vemana2000-fonts.spec ---
%global fontname vemana2000
%global fontconf 69-%{fontname}.conf

Name: %{fontname}-fonts
Version: 1.1.1
Release: 2%{?dist}
Summary: Unicode compliant OpenType font for Telugu

Group: User Interface/X
License: GPLv2+
URL: http://www.kavya-nandanam.com/dload.htm

Source0: Vemana2k-Li.zip
Source1: %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch: noarch
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem

%description
A free OpenType font for Telugu created by
Dr. Tirumala Krishna Desikacharyulu. 

%prep
%setup -q -c -n %{name}
sed -i 's/\r//' gpl.txt

%build

%install
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p vemana2000.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} vemana2000.ttf

%doc gpl.txt

%changelog
* Tue Aug 31 2009 <sshedmak at redhat.com> - 1.1.1-2
- Changed the Pothana2000 strings to Vemana2000

* Tue Jun 23 2009 <sshedmak at redhat.com> - 1.1.1-1
- Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vemana2000-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:40:37 -0000	1.1
+++ sources	31 Aug 2009 07:37:25 -0000	1.2
@@ -0,0 +1 @@
+b1a631b2725e59bda082af9cfafb51a6  Vemana2k-Li.zip



From msuchy at fedoraproject.org  Mon Aug 31 07:42:13 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Mon, 31 Aug 2009 07:42:13 +0000 (UTC)
Subject: rpms/rpmconf/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 rpmconf.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090831074213.873A711C0072@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rpmconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16577/devel

Modified Files:
	.cvsignore import.log rpmconf.spec sources 
Log Message:
Import of rpmconf 0.1.8 to rawhide



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Aug 2009 15:06:34 -0000	1.3
+++ .cvsignore	31 Aug 2009 07:42:13 -0000	1.4
@@ -1 +1 @@
-rpmconf-0.1.7.tar.gz
+rpmconf-0.1.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	28 Aug 2009 15:06:34 -0000	1.2
+++ import.log	31 Aug 2009 07:42:13 -0000	1.3
@@ -1,2 +1,3 @@
 rpmconf-0_1_6-1:HEAD:rpmconf-0.1.6-1.src.rpm:1248073836
 rpmconf-0_1_7-1:HEAD:rpmconf-0.1.7-1.src.rpm:1251471879
+rpmconf-0_1_8-1:HEAD:rpmconf-0.1.8-1.src.rpm:1251704466


Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/rpmconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rpmconf.spec	28 Aug 2009 15:06:34 -0000	1.3
+++ rpmconf.spec	31 Aug 2009 07:42:13 -0000	1.4
@@ -2,7 +2,7 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.7
+Version: 0.1.8
 Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
@@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
+- fix copy and past typo
+
 * Fri Aug 28 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.7-1
 - add support for handling .rpmorig
 - 513794 - localisation problem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Aug 2009 15:06:34 -0000	1.3
+++ sources	31 Aug 2009 07:42:13 -0000	1.4
@@ -1 +1 @@
-69039a340c54cd1395a322a657650f42  rpmconf-0.1.7.tar.gz
+229320d86f570aee6e66578e204830ee  rpmconf-0.1.8.tar.gz



From alexlan at fedoraproject.org  Mon Aug 31 07:59:55 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 31 Aug 2009 07:59:55 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-parallel-build.patch, 
	1.1, 1.2 octave-forge.spec, 1.81, 1.82
Message-ID: <20090831075956.1A51A11C0072@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20880

Modified Files:
	octave-forge-20090607-parallel-build.patch octave-forge.spec 
Log Message:
* 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


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(-)

Index: octave-forge-20090607-parallel-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge-20090607-parallel-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- octave-forge-20090607-parallel-build.patch	20 Aug 2009 02:23:00 -0000	1.1
+++ octave-forge-20090607-parallel-build.patch	31 Aug 2009 07:59:54 -0000	1.2
@@ -1,6 +1,255 @@
---- main/parallel-2.0.0/src/pserver.cc	2009/08/19 05:01:22	6115
-+++ main/parallel-2.0.0/src/pserver.cc	2009/08/19 08:30:19	6116
-@@ -61,8 +61,6 @@
+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
  
@@ -9,7 +258,7 @@
  // Handle server SIGTERM SIGQUIT
  
  static RETSIGTYPE
-@@ -99,6 +97,7 @@
+@@ -99,6 +98,7 @@
  do_octave_atexit_server (void)
  {
    static bool deja_vu = false;
@@ -17,14 +266,77 @@
  
    while (! octave_atexit_functions.empty ())
      {
---- main/parallel-2.0.0/DESCRIPTION	2009/08/19 05:01:22	6115
-+++ main/parallel-2.0.0/DESCRIPTION	2009/08/19 08:30:19	6116
-@@ -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: 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);


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- octave-forge.spec	31 Aug 2009 06:45:29 -0000	1.81
+++ octave-forge.spec	31 Aug 2009 07:59:54 -0000	1.82
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -18,10 +18,10 @@ URL:            http://octave.sourceforg
 ## 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-includes.patch
+#Patch0:		octave-forge-20090607-includes.patch
 Patch1:		octave-forge-20090607-ann-swig-build.patch
 Patch2:		octave-forge-20090607-parallel-build.patch
-#Patch3:		octave-forge-20090607-java-build.patch
+Patch3:		octave-forge-20090607-java-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -67,7 +67,7 @@ Provides: octave-optim = 1.0.6
 Provides: octave-optiminterp = 0.3.2
 Provides: octave-outliers = 0.13.9
 # temporarily disable: still not yet ported to Octave 3.2.x
-# Provides: octave-parallel = 2.0.1
+Provides: octave-parallel = 2.0.1
 Provides: octave-physicalconstants = 0.1.7
 Provides: octave-plot = 1.0.7
 Provides: octave-quaternion = 1.0.0
@@ -147,7 +147,7 @@ rm main/database-*.tar.gz
 # 6. exclude ftp -- SWIG wrappers are broken
 rm main/ftp-*.tar.gz
 # 7. exclude parallel -- not yet ported to build against Octave 3.2
-rm main/parallel-*.tar.gz
+#rm main/parallel-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
 # 9. exclude java --  doesn't build against Octave 3.2
@@ -174,7 +174,7 @@ done
 #patch0 -p0
 %patch1 -p0
 #disable patch for the moment, not building 'parallel'
-#patch2 -p0
+%patch2 -p0
 #patch3 -p0
 
 #Install with -nodeps
@@ -249,6 +249,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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
 



From cchance at fedoraproject.org  Mon Aug 31 08:09:06 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 31 Aug 2009 08:09:06 +0000 (UTC)
Subject: rpms/ibus-table-cangjie/devel .cvsignore, 1.3,
	1.4 ibus-table-cangjie.spec, 1.14, 1.15 sources, 1.3, 1.4
Message-ID: <20090831080906.AD7AA11C0072@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-cangjie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23339

Modified Files:
	.cvsignore ibus-table-cangjie.spec sources 
Log Message:
Updated source.
Added CangJie big table.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jul 2009 04:44:38 -0000	1.3
+++ .cvsignore	31 Aug 2009 08:09:06 -0000	1.4
@@ -1 +1 @@
-ibus-table-cangjie-1.2.0.20090717.tar.gz
+ibus-table-cangjie-1.2.0.20090831.tar.gz


Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/ibus-table-cangjie.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ibus-table-cangjie.spec	25 Jul 2009 03:04:04 -0000	1.14
+++ ibus-table-cangjie.spec	31 Aug 2009 08:09:06 -0000	1.15
@@ -1,7 +1,7 @@
 Name:       ibus-table-cangjie
-Version:    1.2.0.20090717
-Release:    6%{?dist}
-Summary:    Cang Jie input methods for ibus-table
+Version:    1.2.0.20090831
+Release:    1%{?dist}
+Summary:    CangJie tables for IBus-Table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -16,7 +16,7 @@ Requires(post):   ibus >= 1.2, ibus-tabl
 BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
 
 %description
-The package contains Cang Jie input methods for Table engine of IBus platform. 
+The package contains CangJie tables for IBus-Table. 
 
 %prep
 %setup -q
@@ -27,13 +27,14 @@ The package contains Cang Jie input meth
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
 %configure \
     --prefix=%{_prefix} \
+    --enable-cangjie3 \
     --enable-cangjie5 \
-    --enable-cangjie3
+    --enable-cangjiebig
 %__make %{?_smp_mflags}
 
 %install
 %__rm -rf %{buildroot}
-make DESTDIR=%{buildroot} NO_INDEX=true INSTALL="install -p" install
+%__make DESTDIR=%{buildroot} NO_INDEX=true INSTALL="install -p" install
 
 %clean
 %__rm -rf %{buildroot}
@@ -42,16 +43,23 @@ make DESTDIR=%{buildroot} NO_INDEX=true 
 cd %{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cangjie3.db
 %{_bindir}/ibus-table-createdb -i -n cangjie5.db
+%{_bindir}/ibus-table-createdb -i -n cangjiebig.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie3.db
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjiebig.db
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
+%{_datadir}/ibus-table/icons/cangjiebig.png
 
 %changelog
+* Mon Aug 31 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090831-1.fc12
+- Updated source.
+- Added CangJie (big) table.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090717-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jul 2009 04:44:38 -0000	1.3
+++ sources	31 Aug 2009 08:09:06 -0000	1.4
@@ -1 +1 @@
-c18db9f349ff92479c5528e1ea61fe79  ibus-table-cangjie-1.2.0.20090717.tar.gz
+b6ce3a93571cd0ffc37e6e4bad50f5f2  ibus-table-cangjie-1.2.0.20090831.tar.gz



From cchance at fedoraproject.org  Mon Aug 31 08:16:18 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 31 Aug 2009 08:16:18 +0000 (UTC)
Subject: rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.15,1.16
Message-ID: <20090831081618.2A89A11C0072@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-cangjie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24893

Modified Files:
	ibus-table-cangjie.spec 
Log Message:
typo in file section



Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/ibus-table-cangjie.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ibus-table-cangjie.spec	31 Aug 2009 08:09:06 -0000	1.15
+++ ibus-table-cangjie.spec	31 Aug 2009 08:16:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:       ibus-table-cangjie
 Version:    1.2.0.20090831
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    CangJie tables for IBus-Table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
@@ -43,19 +43,22 @@ export IBUS_TABLE_CREATEDB="%{_bindir}/i
 cd %{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cangjie3.db
 %{_bindir}/ibus-table-createdb -i -n cangjie5.db
-%{_bindir}/ibus-table-createdb -i -n cangjiebig.db
+%{_bindir}/ibus-table-createdb -i -n cangjie-big.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie3.db
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.db
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjiebig.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie-big.db
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
-%{_datadir}/ibus-table/icons/cangjiebig.png
+%{_datadir}/ibus-table/icons/cangjie-big.png
 
 %changelog
+* Mon Aug 31 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090831-2.fc12
+- Typo in file section.
+
 * Mon Aug 31 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090831-1.fc12
 - Updated source.
 - Added CangJie (big) table.



From pbrobinson at fedoraproject.org  Mon Aug 31 08:45:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 08:45:03 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.13,1.14
Message-ID: <20090831084503.94C5E11C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1668

Modified Files:
	mojito.spec 
Log Message:
- Rebuild for new NetworkManager


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mojito.spec	22 Aug 2009 10:59:53 -0000	1.13
+++ mojito.spec	31 Aug 2009 08:45:01 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-3
+- Rebuild for new NetworkManager
+
 * Sat Aug 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-2
 - Enable twitter, lastfm, MySpace and Flickr networks
 



From pravins at fedoraproject.org  Mon Aug 31 08:52:49 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 31 Aug 2009 08:52:49 +0000 (UTC)
Subject: rpms/lohit-fonts/devel .cvsignore, 1.12, 1.13 lohit-fonts.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <20090831085249.C654011C0072@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6232

Modified Files:
	.cvsignore lohit-fonts.spec sources 
Log Message:
* Mon Aug 31 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.2-1
- upstream new release
- rh bugzilla bug fixes 520032 520033 520034 520035 520036 520037 520038 520039 
- rh bugzilla bug fixes 520040 520041 520042 520043 520045 520046 520049 520050 520051



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Aug 2009 06:47:37 -0000	1.12
+++ .cvsignore	31 Aug 2009 08:52:49 -0000	1.13
@@ -1,3 +1,4 @@
 lohit-fonts-2.3.8.tar.gz
 lohit-fonts-2.4.0.tar.gz
 lohit-fonts-2.4.1.tar.gz
+lohit-fonts-2.4.2.tar.gz


Index: lohit-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/lohit-fonts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- lohit-fonts.spec	12 Aug 2009 06:47:37 -0000	1.17
+++ lohit-fonts.spec	31 Aug 2009 08:52:49 -0000	1.18
@@ -7,7 +7,7 @@ Languages.
 
 
 Name:           %{fontname}-fonts
-Version:        2.4.1
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        Free Indian truetype/opentype fonts
 
@@ -42,7 +42,7 @@ Requires:       %{name}-common = %{versi
 %common_desc
 This package provides a free Assamese truetype/opentype font.
 
-%_font_pkg -n assamese lohit_as.ttf
+%_font_pkg -n assamese -f 66-%{fontname}-assamese.conf lohit_as.ttf
 
 %package -n %{fontname}-bengali-fonts
 Summary:        Free Bengali font
@@ -55,7 +55,7 @@ Obsoletes: lohit-fonts-bengali < 2.3.1-2
 %common_desc
 This package provides a free Bengali truetype/opentype font.
 
-%_font_pkg -n bengali lohit_bn.ttf
+%_font_pkg -n bengali -f 66-%{fontname}-bengali.conf lohit_bn.ttf
 
 %package -n %{fontname}-gujarati-fonts
 Summary:        Free Gujarati font
@@ -68,7 +68,7 @@ Obsoletes: lohit-fonts-gujarati < 2.3.1-
 %common_desc
 This package provides a free Gujarati truetype/opentype font.
 
-%_font_pkg -n gujarati lohit_gu.ttf
+%_font_pkg -n gujarati -f 66-%{fontname}-gujarati.conf lohit_gu.ttf
 
 %package -n %{fontname}-hindi-fonts
 Summary:        Free Hindi font
@@ -81,7 +81,7 @@ Obsoletes: lohit-fonts-hindi < 2.3.1-2
 %common_desc
 This package provides a free Hindi truetype/opentype font.
 
-%_font_pkg -n hindi lohit_hi.ttf
+%_font_pkg -n hindi -f 66-%{fontname}-hindi.conf lohit_hi.ttf
 
 %package -n %{fontname}-kannada-fonts
 Summary:        Free Kannada font
@@ -94,7 +94,7 @@ Obsoletes: lohit-fonts-kannada < 2.3.1-2
 %common_desc
 This package provides a free Kannada truetype/opentype font.
 
-%_font_pkg -n kannada lohit_kn.ttf
+%_font_pkg -n kannada -f 66-%{fontname}-kannada.conf lohit_kn.ttf
 
 %package -n %{fontname}-kashmiri-fonts
 Summary:        Free Kashmiri font
@@ -107,7 +107,7 @@ Obsoletes: lohit-fonts-kashmiri < 2.3.1-
 %common_desc
 This package provides a free Kashmiri truetype/opentype font.
 
-%_font_pkg -n kashmiri lohit_ks.ttf
+%_font_pkg -n kashmiri -f 66-%{fontname}-kashmiri*.conf lohit_ks.ttf
 
 %package -n %{fontname}-konkani-fonts
 Summary:        Free Konkani font 
@@ -120,7 +120,7 @@ Obsoletes: lohit-fonts-konkani < 2.3.1-2
 %common_desc
 This package provides a free Konkani truetype/opentype font.
 
-%_font_pkg -n konkani lohit_kok.ttf
+%_font_pkg -n konkani -f 66-%{fontname}-konkani.conf lohit_kok.ttf
 
 %package -n %{fontname}-maithili-fonts
 Summary:        Free Maithili font
@@ -133,7 +133,7 @@ Obsoletes: lohit-fonts-maithili < 2.3.1-
 %common_desc
 This package provides a free Maithili truetype/opentype font.
 
-%_font_pkg -n maithili lohit_mai.ttf
+%_font_pkg -n maithili -f 66-%{fontname}-maithili.conf lohit_mai.ttf
 
 %package -n %{fontname}-malayalam-fonts
 Summary:        Free Malayalam font
@@ -159,7 +159,7 @@ Obsoletes: lohit-fonts-marathi < 2.3.1-2
 %common_desc
 This package provides a free Marathi truetype/opentype font.
 
-%_font_pkg -n marathi lohit_mr.ttf
+%_font_pkg -n marathi -f 66-%{fontname}-marathi.conf lohit_mr.ttf
 
 %package -n %{fontname}-nepali-fonts
 Summary:        Free Nepali font
@@ -172,7 +172,7 @@ Obsoletes: lohit-fonts-nepali < 2.3.1-2
 %common_desc
 This package provides a free Nepali truetype/opentype font.
 
-%_font_pkg -n nepali lohit_ne.ttf
+%_font_pkg -n nepali -f 67-%{fontname}-nepali.conf lohit_ne.ttf
 
 %package -n %{fontname}-oriya-fonts
 Summary:        Free Oriya font
@@ -185,7 +185,7 @@ Obsoletes: lohit-fonts-oriya < 2.3.1-2
 %common_desc
 This package provides a free Oriya truetype/opentype font.
 
-%_font_pkg -n oriya lohit_or.ttf
+%_font_pkg -n oriya  -f 66-%{fontname}-oriya.conf lohit_or.ttf
 
 %package -n %{fontname}-punjabi-fonts
 Summary:        Free Punjabi font
@@ -198,7 +198,7 @@ Obsoletes: lohit-fonts-punjabi < 2.3.1-2
 %common_desc
 This package provides a free Punjabi truetype/opentype font.
 
-%_font_pkg -n punjabi lohit_pa.ttf
+%_font_pkg -n punjabi  -f 66-%{fontname}-punjabi.conf lohit_pa.ttf
 
 %package -n %{fontname}-sindhi-fonts
 Summary:        Free Sindhi font
@@ -211,7 +211,7 @@ Obsoletes: lohit-fonts-sindhi < 2.3.1-2
 %common_desc
 This package provides a free Sindhi truetype/opentype font.
 
-%_font_pkg -n sindhi lohit_sd.ttf
+%_font_pkg -n sindhi  -f 66-%{fontname}-sindhi*.conf lohit_sd.ttf
 
 %package -n %{fontname}-tamil-fonts
 Summary:        Free Tamil font
@@ -224,7 +224,7 @@ Obsoletes: lohit-fonts-tamil < 2.3.1-2
 %common_desc
 This package provides a free Tamil truetype/opentype font.
 
-%_font_pkg -n tamil lohit_ta.ttf
+%_font_pkg -n tamil  -f 66-%{fontname}-tamil.conf lohit_ta.ttf
 
 %package -n %{fontname}-telugu-fonts
 Summary:        Free Telugu font
@@ -237,11 +237,11 @@ Obsoletes: lohit-fonts-telugu < 2.3.1-2
 %common_desc
 This package provides a free Telugu truetype/opentype font.
 
-%_font_pkg -n telugu lohit_te.ttf
+%_font_pkg -n telugu  -f 66-%{fontname}-telugu.conf lohit_te.ttf
 
 %prep
 %setup -q
-
+rm -f malayalam/*.conf
 
 %build
 
@@ -252,8 +252,17 @@ rm -fr %{buildroot}
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p */*.ttf %{buildroot}%{_fontdir}
 
-#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-#                  %{buildroot}%{_fontconfig_confdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                  %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p */*.conf %{buildroot}%{_fontconfig_templatedir}/
+
+ln -s */66-lohit*.conf \
+        %{buildroot}%{_fontconfig_confdir}/
+
+ln -s */67-lohit-n*.conf \
+        %{buildroot}%{_fontconfig_confdir}/
+
 
 %clean
 rm -fr %{buildroot}
@@ -267,6 +276,11 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Aug 31 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.2-1
+- upstream new release
+- rh bugzilla bug fixes 520032 520033 520034 520035 520036 520037 520038 520039 
+- rh bugzilla bug fixes 520040 520041 520042 520043 520045 520046 520049 520050 520051 
+
 * Wed Aug 12 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.1-1
 - upstream new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-fonts/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 Aug 2009 06:47:37 -0000	1.12
+++ sources	31 Aug 2009 08:52:49 -0000	1.13
@@ -1 +1 @@
-d2dccfceed0d38cbf5bf6fb31836f7f7  lohit-fonts-2.4.1.tar.gz
+6801eb44f295d939ed5421c87b3517fa  lohit-fonts-2.4.2.tar.gz



From akurtakov at fedoraproject.org  Mon Aug 31 08:58:14 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 31 Aug 2009 08:58:14 +0000 (UTC)
Subject: rpms/eclipse-testframework/devel eclipse-tests-libraryXml.patch,
	NONE, 1.1 eclipse-testframework.spec, 1.1, 1.2
Message-ID: <20090831085814.9B30D11C0072@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-testframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7421/devel

Modified Files:
	eclipse-testframework.spec 
Added Files:
	eclipse-tests-libraryXml.patch 
Log Message:
- Move library.xml patch from eclipse srpm.

eclipse-tests-libraryXml.patch:
 library.xml |   77 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 25 deletions(-)

--- NEW FILE eclipse-tests-libraryXml.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.test
Index: library.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.test/library.xml,v
retrieving revision 1.33
diff -u -r1.33 library.xml
--- library.xml	13 Mar 2008 14:00:36 -0000	1.33
+++ library.xml	7 May 2009 18:49:56 -0000
@@ -6,13 +6,13 @@
 	</target>
 
 	<target name="init">
-		<!-- 
+		<!--
 			Parameters:
 				(Mandatory)
 				data-dir		- the directory for Eclipse to write its data
 				plugin-name		- the name of the plugin to test
 				classname		- the name of the test class
-				
+
 				(Optional - overrides defaults set in script)
 				vmargs			- a string containing arguments to pass to the VM.
 				extraVMargs		- allows separate setting of VM args from separate caller.
@@ -22,7 +22,7 @@
 				useEclipseExe	- property setting forces test to launch via eclipse executable.
 				junit-report-output - output directory for junit reports produced for specified classname.
 		-->
-		
+
 	  	<tstamp>
 	        <format property="TIMENOW" pattern="HHmmssSSSS"/>
 	    </tstamp>
@@ -33,25 +33,30 @@
 		<!--default launch target for launching tests-->
 		<property name="launchTarget" value="java-test" />
 		<property name="formatter" value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-	    
+
 		<!--default heap sizes when running performance tests-->
 	    <condition property="vmargs" value=" -Xms256M -Xmx256M">
 			<equals arg1="${test.target}" arg2="performance" />
 	    </condition>
+        <condition property="extraVMargs" value=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=40000">
+                    <equals arg1="${debugTests}" arg2="true" />
+        </condition>
 		<property name="extraVMargs" value=""/>
 		<property name="plugin-path" value="" />
+		<property name="tmpresults" value="${eclipse-home}/tmpresults/" />
+		<property name="testhome" value="${eclipse-home}/testhome" />
 		<property name="timeout" value="7200000" />
-		<property name="test-output" value="${eclipse-home}/${classname}.xml" />
+		<property name="test-output" value="${tmpresults}/${classname}.xml" />
 		<property name="junit-report-output" value="${eclipse-home}/results" />
 		<mkdir dir="${junit-report-output}"/>
 	</target>
-	
+
 	<target name="core-test" description="Eclipse application used to launch HEADLESS plugin tests." depends="init">
 		<antcall target="${launchTarget}">
 			<param name="application" value="org.eclipse.test.coretestapplication"/>
 		</antcall>
 	</target>
-	
+
 	<target name="ui-test" description="Eclipse application used to launch UI plugin tests." depends="init">
 		<antcall target="${launchTarget}">
 			<param name="application" value="org.eclipse.test.uitestapplication"/>
@@ -60,13 +65,17 @@
 
 	<target name="java-test">
 		<!--default vm args-->
-		<property name="vmargs" value=" -Xms40m -Xmx256m"/>
-	  	
+		<property name="vmargs" value=" -Xms256m -Xmx1024m -XX:MaxPermSize=512m"/>
+		<delete failonerror="false" includeEmptyDirs="true">
+		  <fileset dir="${testhome}" includes="**/*"/>
+		</delete>
+		<mkdir dir="${testhome}"/>
+
 	  	<!--set default jvm to use for testing-->
-	   	<property name="jvm" value="${java.home}/bin/java" />  	
-	
+	   	<property name="jvm" value="${java.home}/bin/java" />
+
 		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
-		
+
 		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
 			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
 	        <classpath>
@@ -75,7 +84,7 @@
 	          	</fileset>
 	        </classpath>
 		    <arg line="-application ${application}"/>
-		    <arg line="-data ${data-dir}"/>
+		    <arg line="-data ${test-data-dir}"/>
 		    <arg line="formatter=${formatter},${test-output}"/>
 		    <arg line="-testPluginName ${plugin-name}"/>
 		    <arg line="-className ${classname}"/>
@@ -83,15 +92,31 @@
 		    <arg line="-ws ${ws}"/>
 		    <arg line="-arch ${arch}"/>
 		    <arg line="-consolelog"/>
+			<arg line="-clean"/>
+			<arg line="-Dswt.library.path=/usr/lib/eclipse"/>
+			<arg line="-Dsetup.override.vmArgs=Xms256m;Xmx1024m"/>
+			<arg line="-Dsetup.override.systemProperties=PLUGIN_PATH=${plugin-path};user.home=${testhome}"/>
 		    <jvmarg line="${vmargs} ${extraVMargs}"/>
-		    <sysproperty key="PLUGIN_PATH" value="${plugin-path}"/> 
+		    <sysproperty key="PLUGIN_PATH" value="${plugin-path}"/>
+			<sysproperty key="user.home" value="${testhome}"/>
+			<sysproperty key="swt.library.path" value="/usr/lib/eclipse"/>
+			<sysproperty key="setup.override.vmArgs" value="Xms256m;Xmx1024m"/>
+			<sysproperty key="setup.override.systemProperties" value="PLUGIN_PATH=${plugin-path};user.home=${testhome}"/>
+			<sysproperty key="sdk.tests.data.dir" value="${data-dir}"/>
+			<sysproperty key="org.eclipse.equinox.p2.reconciler.tests.platform.archive" value="${tmpresults}/eclipse-platform-archive.tar.gz"/>
+			<sysproperty key="osgi.configuration.area" value="${data-dir}"/>
 		</java>
 		<antcall target="collect-results" />
 	</target>
-	
-	<target name="eclipse-test" description="Runs the specified classname as a plug-in test.">		
+
+	<target name="eclipse-test" description="Runs the specified classname as a plug-in test.">
 		<property name="vmargs" value="-Xms256m -Xmx512m"/>
-		
+
+		<delete failonerror="false" includeEmptyDirs="true">
+		  <fileset dir="${testhome}" includes="**/*"/>
+		</delete>
+		<mkdir dir="${testhome}"/>
+
 		<!--use -consolelog if launching a headless test-->
 		<condition property="consolelog" value="-consolelog">
 			<equals arg1="${application}" arg2="org.eclipse.test.coretestapplication"/>
@@ -107,11 +132,11 @@
 			<isset property="jvm" />
 		</condition>
 		<property name="test-vm" value="" />
-		
+
 		<!--ensure executable has execute permission-->
 		<chmod file="${eclipse-home}/eclipse" perm="ugo+rx"/>
-		
-		
+
+
 		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
 
 		<exec executable="${eclipse-home}/eclipse" dir="${eclipse-home}" timeout="${timeout}" logError="true" failonerror="false" output="${junit-report-output}/${classname}.txt">
@@ -125,10 +150,12 @@
 			<arg line="--launcher.suppressErrors"/>
 			<arg line="${consolelog}"/>
 			<arg line="-vmargs ${vmargs} ${extraVMargs} -DPLUGIN_PATH=${plugin-path}"/>
+			<arg line="-Duser.home=${testhome}"/>
+			<arg line="-Dsetup.override.systemProperties=PLUGIN_PATH=${plugin-path};user.home=${testhome}"/>
 		</exec>
 		<antcall target="collect-results" />
 	</target>
-	
+
 	<target name="collect-results">
 		<dirname property="output-dir" file="${test-output}"/>
 		<basename property="output-file-name" file="${test-output}"/>
@@ -138,7 +165,7 @@
 			</fileset>
 		</junitreport>
 
-		<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
+		<style style="${eclipse-home}/dropins/sdk/plugins/org.eclipse.test/JUNIT.XSL"
 			basedir="${junit-report-output}"
 			includes="${classname}.result.xml"
 			destdir="${junit-report-output}" />
@@ -153,13 +180,13 @@
 	<target name="collect">
 		<!--
 			This target can be used to aggragate test runs from multiple test suites into a single report.
-		
+
 			Parameters to this target:
 			includes		- the names of the files to include
 			output-file		- the name of the output file to produce
 		-->
-		<junitreport todir="." tofile="${output-file}">
-			<fileset dir=".">
+		<junitreport todir="${results}" tofile="${output-file}">
+			<fileset dir="${tmpresults}">
 				<include name="${includes}"/>
 			</fileset>
 		</junitreport>


Index: eclipse-testframework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/eclipse-testframework.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-testframework.spec	21 Aug 2009 18:41:24 -0000	1.1
+++ eclipse-testframework.spec	31 Aug 2009 08:58:14 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           eclipse-testframework
 Version:        3.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Eclipse Test Framework
 
 Group:          Development/Tools
@@ -15,6 +15,9 @@ Source0:        %{name}-fetched-src-%{ta
 Source1:        %{name}-fetch-src.sh
 # Remove win32 fragment from test feature
 Patch0:         eclipse-nowin32testfragment.patch
+# Some fixes for library.xml
+# FIXME:  submit upstream
+Patch1:        eclipse-tests-libraryXml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -32,6 +35,10 @@ Eclipse Test Framework. Used in conjunct
 %setup -q -n %{name}-fetched-src-%{tag}
 chmod -x org.eclipse.test-feature/*.html
 %patch0
+pushd org.eclipse.test
+%patch1
+popd
+sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
 
 mkdir orbitDeps
 pushd orbitDeps
@@ -64,6 +71,9 @@ popd
 %doc org.eclipse.test-feature/epl-v10.html
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-3
+- Move library.xml patch from eclipse srpm.
+
 * Fri Aug 21 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-2
 - Fix non-standard-dir-perm.
 



From sandeeps at fedoraproject.org  Mon Aug 31 09:11:35 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 31 Aug 2009 09:11:35 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.267,1.268
Message-ID: <20090831091135.93C5511C0263@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9999

Modified Files:
	comps-f10.xml.in 
Log Message:
Adding vemana2000-fonts to telugu-support


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- comps-f10.xml.in	14 Aug 2009 18:07:39 -0000	1.267
+++ comps-f10.xml.in	31 Aug 2009 09:11:35 -0000	1.268
@@ -4638,6 +4638,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-telugu</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
+      <packagereq type="optional">vemana2000-fonts</packagereq>
     </packagelist>
   </group>
   <group>



From mnagy at fedoraproject.org  Mon Aug 31 09:11:35 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Mon, 31 Aug 2009 09:11:35 +0000 (UTC)
Subject: rpms/bind-dyndb-ldap/F-11 bind-dyndb-ldap-bool_case.patch, NONE,
	1.1 bind-dyndb-ldap.spec, 1.2, 1.3
Message-ID: <20090831091135.7E38011C0072@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/bind-dyndb-ldap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10020

Modified Files:
	bind-dyndb-ldap.spec 
Added Files:
	bind-dyndb-ldap-bool_case.patch 
Log Message:
* Mon Aug 31 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.2.a1
- Use uppercase boolean values (#520256)


bind-dyndb-ldap-bool_case.patch:
 doc/example.ldif  |    2 +-
 src/ldap_helper.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bind-dyndb-ldap-bool_case.patch ---
diff -up bind-dyndb-ldap-0.1.0a1/doc/example.ldif.bool_case bind-dyndb-ldap-0.1.0a1/doc/example.ldif
--- bind-dyndb-ldap-0.1.0a1/doc/example.ldif.bool_case	2009-08-31 10:54:25.787684041 +0200
+++ bind-dyndb-ldap-0.1.0a1/doc/example.ldif	2009-08-31 10:54:31.977621770 +0200
@@ -11,7 +11,7 @@ objectClass: idnsZone
 objectClass: idnsRecord
 idnsName: ipatest.com
 idnsUpdatePolicy: grant EXAMPLE.COM krb5-self * A;
-idnsZoneActive: True
+idnsZoneActive: TRUE
 idnsSOAmName: server.example.com
 idnsSOArName: root.server.example.com
 idnsSOAserial: 1
diff -up bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.bool_case bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c
--- bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.bool_case	2009-08-31 10:54:43.770621793 +0200
+++ bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c	2009-08-31 10:54:58.471621645 +0200
@@ -494,7 +494,7 @@ refresh_zones_from_ldap(ldap_db_t *ldap_
 
 	CHECK(ldap_query(ldap_inst, str_buf(ldap_db->base), LDAP_SCOPE_SUBTREE,
 			 attrs, 0,
-			 "(&(objectClass=idnsZone)(idnsZoneActive=True))"));
+			 "(&(objectClass=idnsZone)(idnsZoneActive=TRUE))"));
 	CHECK(cache_query_results(ldap_inst));
 
 	for (entry = HEAD(ldap_inst->ldap_entries);


Index: bind-dyndb-ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/bind-dyndb-ldap/F-11/bind-dyndb-ldap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bind-dyndb-ldap.spec	19 Jun 2009 15:34:44 -0000	1.2
+++ bind-dyndb-ldap.spec	31 Aug 2009 09:11:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bind-dyndb-ldap
 Version:        0.1.0
-Release:        0.2.a1%{?dist}
+Release:        0.3.a1%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
@@ -13,6 +13,8 @@ BuildRequires:  bind-devel >= 9.6.1-0.3.
 BuildRequires:  openldap-devel
 Requires:       bind >= 9.6.1-0.3.b1
 
+Patch0:         bind-dyndb-ldap-bool_case.patch
+
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
 support for dynamic updates and internal caching, to lift the load
@@ -22,9 +24,11 @@ off of your LDAP server.
 %prep
 %setup -q -n %{name}-%{version}a1
 
+%patch0 -p1 -b .bool_case
+
 
 %build
-%configure
+%configure --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -48,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 31 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.3.a1
+- Use uppercase boolean values (#520256)
+
 * Fri Jun 19 2009 Adam Tkac <atkac redhat com> - 0.1.0-0.2.a1
 - rebuild against new bind-libs
 



From sandeeps at fedoraproject.org  Mon Aug 31 09:13:22 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 31 Aug 2009 09:13:22 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.290,1.291
Message-ID: <20090831091322.D175711C0072@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10429

Modified Files:
	comps-f11.xml.in 
Log Message:
Adding vemana2000-fonts to telugu-support


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- comps-f11.xml.in	30 Aug 2009 19:31:14 -0000	1.290
+++ comps-f11.xml.in	31 Aug 2009 09:13:22 -0000	1.291
@@ -5333,6 +5333,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
+      <packagereq type="optional">vemana2000-fonts</packagereq>
     </packagelist>
   </group>
   <group>



From petersen at fedoraproject.org  Mon Aug 31 09:15:49 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 31 Aug 2009 09:15:49 +0000 (UTC)
Subject: rpms/eb/devel .cvsignore,1.3,1.4 eb.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090831091549.4675811C0072@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/eb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10897

Modified Files:
	.cvsignore eb.spec sources 
Log Message:
update to 4.4.1 (Mamoru Tasaka, #518072)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Feb 2008 06:52:00 -0000	1.3
+++ .cvsignore	31 Aug 2009 09:15:48 -0000	1.4
@@ -1 +1 @@
-eb-4.3.2.tar.bz2
+eb-4.4.1.tar.bz2


Index: eb.spec
===================================================================
RCS file: /cvs/extras/rpms/eb/devel/eb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eb.spec	24 Jul 2009 20:46:49 -0000	1.5
+++ eb.spec	31 Aug 2009 09:15:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eb
-Version:        4.3.2
-Release:        3%{?dist}
+Version:        4.4.1
+Release:        1%{?dist}
 Summary:        Library for accessing Japanese CD-ROM electronic books
 Summary(ja):    CD-ROM ?????????????????
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 4.4.1-1
+- update to 4.4.1 (Mamoru Tasaka, #518072)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Feb 2008 06:52:00 -0000	1.3
+++ sources	31 Aug 2009 09:15:48 -0000	1.4
@@ -1 +1 @@
-408bbe0f8ed45d341bc36cc4ee6184e7  eb-4.3.2.tar.bz2
+02e7c53d3d2b597daedd14c3083e3945  eb-4.4.1.tar.bz2



From petersen at fedoraproject.org  Mon Aug 31 09:34:49 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 31 Aug 2009 09:34:49 +0000 (UTC)
Subject: rpms/ghc-OpenGL/devel ghc-OpenGL.spec,1.1,1.2
Message-ID: <20090831093449.67BB711C0072@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-OpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15811

Modified Files:
	ghc-OpenGL.spec 
Log Message:
move mesa BRs to base (src) package


Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-OpenGL/devel/ghc-OpenGL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-OpenGL.spec	27 Aug 2009 19:51:56 -0000	1.1
+++ ghc-OpenGL.spec	31 Aug 2009 09:34:47 -0000	1.2
@@ -20,6 +20,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc
 BuildRequires:  ghc-rpm-macros
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -38,7 +39,6 @@ Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 
 %description devel
 This package contains the development files for %{name}



From sharkcz at fedoraproject.org  Mon Aug 31 09:35:39 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 09:35:39 +0000 (UTC)
Subject: rpms/httping/devel .cvsignore, 1.3, 1.4 httping-strndup.patch, 1.1, 
	1.2 httping.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090831093539.D923B11C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/httping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16079

Modified Files:
	.cvsignore httping-strndup.patch httping.spec sources 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.3.1-1
- Updated to new upstream version 1.3.1
- Updated the strndup patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jul 2009 21:52:57 -0000	1.3
+++ .cvsignore	31 Aug 2009 09:35:39 -0000	1.4
@@ -1 +1 @@
-httping-1.3.0.tgz
+httping-1.3.1.tgz

httping-strndup.patch:
 str.c |    2 +-
 str.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: httping-strndup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/httping-strndup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- httping-strndup.patch	24 Jan 2009 10:07:03 -0000	1.1
+++ httping-strndup.patch	31 Aug 2009 09:35:39 -0000	1.2
@@ -1,54 +1,23 @@
-diff -up httping-1.2.9/http.c.old httping-1.2.9/http.c
---- httping-1.2.9/http.c.old	2008-12-30 15:29:18.000000000 +0200
-+++ httping-1.2.9/http.c	2008-12-30 15:29:57.000000000 +0200
-@@ -25,7 +25,7 @@
+diff -Nrup httping-1.3.1.orig/str.c httping-1.3.1/str.c
+--- httping-1.3.1.orig/str.c	2009-08-03 19:14:52.000000000 +0200
++++ httping-1.3.1/str.c	2009-08-31 11:15:44.000000000 +0200
+@@ -18,7 +18,7 @@
  #include "mem.h"
- #include "http.h"
- #include "io.h"
--#include "str.h"
-+/*#include "str.h"*/
  #include "utils.h"
  
- int get_HTTP_headers(int socket_h, SSL *ssl_h, char **headers, int timeout)
-diff -up httping-1.2.9/Makefile.old httping-1.2.9/Makefile
---- httping-1.2.9/Makefile.old	2008-12-30 15:34:16.000000000 +0200
-+++ httping-1.2.9/Makefile	2008-12-30 16:49:09.000000000 +0200
-@@ -17,7 +17,7 @@ include version
- DEBUG=-g # -D_DEBUG
- LDFLAGS+=-lssl -lcrypto $(DEBUG)
- CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
--
-+INSTALL=install
- OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
- 
- all: httping
-@@ -28,8 +28,8 @@ httping: $(OBJS)
- 	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
- 
- install: httping
--	cp httping $(DESTDIR)/usr/bin
--	cp httping.1 $(DESTDIR)/usr/share/man/man1/
-+	$(INSTALL) httping $(DESTDIR)/usr/bin/httping
-+	$(INSTALL) -m 0644 httping.1 $(DESTDIR)/usr/share/man/man1/httping.1
- 
- clean:
- 	rm -f $(OBJS) core httping
-diff -up httping-1.2.9/main.c.old httping-1.2.9/main.c
---- httping-1.2.9/main.c.old	2008-12-30 15:29:26.000000000 +0200
-+++ httping-1.2.9/main.c	2008-12-30 16:06:06.000000000 +0200
-@@ -33,12 +33,13 @@
- #include "gen.h"
- #include "http.h"
- #include "io.h"
--#include "str.h"
-+/*#include "str.h"*/
- #include "mem.h"
- #include "tcp.h"
- #include "res.h"
- #include "utils.h"
- #include "error.h"
-+//#include "version"
- 
- static volatile int stop = 0;
- 
-
+-#ifndef strndup
++#ifndef have_strndup
+ char *strndup(char *in, int size)
+ {
+ 	char *out = mymalloc(size + 1, "strndup");
+diff -Nrup httping-1.3.1.orig/str.h httping-1.3.1/str.h
+--- httping-1.3.1.orig/str.h	2009-08-03 19:14:52.000000000 +0200
++++ httping-1.3.1/str.h	2009-08-31 11:15:44.000000000 +0200
+@@ -15,6 +15,6 @@
+ 
+ #include <string.h>
+ 
+-#ifndef strndup
++#ifndef have_strndup
+ char *strndup(char *in, int size);
+ #endif


Index: httping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/httping.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- httping.spec	16 Jul 2009 21:52:58 -0000	1.3
+++ httping.spec	31 Aug 2009 09:35:39 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           httping
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Ping alike tool for http requests
 
@@ -24,14 +24,17 @@ also takes time.
 %setup -q
 %patch0 -p1 -b .strndup
 
+
 %build
-CFLAGS="%{optflags}" make %{?_smp_mflags} DEBUG=""
+make %{?_smp_mflags} DEBUG="" OFLAGS="%{optflags} -Dhave_strndup"
 
 
 %install
 rm -rf %{buildroot}
 make install INSTALL="install -Dp" DESTDIR=%{buildroot}
 
+rm -rf %{buildroot}%{_prefix}/doc
+
 
 %clean
 rm -rf %{buildroot}
@@ -45,6 +48,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> - 1.3.1-1
+- Updated to new upstream version 1.3.1
+- Updated the strndup patch
+
 * Thu Jul 16 2009 Fabian Affolter <fabian at bernewireless.net> - 1.3.0-1
 - Updated to new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httping/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 21:52:58 -0000	1.3
+++ sources	31 Aug 2009 09:35:39 -0000	1.4
@@ -1 +1 @@
-41c912a9ecc904e51d7260053fc2195c  httping-1.3.0.tgz
+fb742d577d3e7a8ea75cf97f7eb802f2  httping-1.3.1.tgz



From sharkcz at fedoraproject.org  Mon Aug 31 09:41:04 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 09:41:04 +0000 (UTC)
Subject: rpms/httping/devel noautobuild,1.1,NONE
Message-ID: <20090831094104.13AFC11C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/httping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18060

Removed Files:
	noautobuild 
Log Message:
build issues are fixed


--- noautobuild DELETED ---



From dnovotny at fedoraproject.org  Mon Aug 31 09:59:42 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon, 31 Aug 2009 09:59:42 +0000 (UTC)
Subject: rpms/emacs/devel emacs-gtk.patch,NONE,1.1 emacs.spec,1.135,1.136
Message-ID: <20090831095942.E378411C0072@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25777

Modified Files:
	emacs.spec 
Added Files:
	emacs-gtk.patch 
Log Message:

fix #515722


emacs-gtk.patch:
 configure.in |    2 +-
 src/xfns.c   |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE emacs-gtk.patch ---
--- emacs-23.1/configure.in.orig	2009-08-31 00:18:44.000000000 +0100
+++ emacs-23.1/configure.in	2009-08-31 00:18:47.000000000 +0100
@@ -1514,7 +1514,7 @@
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
   GLIB_REQUIRED=2.6
-  GTK_REQUIRED=2.6
+  GTK_REQUIRED=2.17.9
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
   dnl Checks for libraries.
--- emacs-23.1/src/xfns.c.orig	2009-08-31 00:03:02.000000000 +0100
+++ emacs-23.1/src/xfns.c	2009-08-31 00:21:39.000000000 +0100
@@ -468,8 +468,10 @@
       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
       x = f->output_data.x;
-      /* Match if the window is this frame's menubar.  */
 #ifdef USE_GTK
+      /* Match if the window is this frame's window (button presses are no longer
+         caught by the menubar) or a menu in the menubar.
+       */
       if (x->menubar_widget)
         {
           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
@@ -477,13 +479,14 @@
 
           BLOCK_INPUT;
           if (gwdesc != 0
-              && (gwdesc == x->menubar_widget
+              && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget))
                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
             found = 1;
           UNBLOCK_INPUT;
           if (found) return f;
         }
 #else
+      /* Match if the window is in this frame's menubar */
       if (x->menubar_widget
 	  && lw_window_is_in_menubar (wdesc, x->menubar_widget))
 	return f;


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- emacs.spec	26 Aug 2009 10:22:45 -0000	1.135
+++ emacs.spec	31 Aug 2009 09:59:41 -0000	1.136
@@ -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
@@ -26,7 +26,7 @@ Patch0: glibc-open-macro.patch
 Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: rpm-spec-mode-utc.patch
-#Patch4: emacsclient.patch
+Patch4: emacs-gtk.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -115,7 +115,7 @@ Emacs packages or see some elisp example
 %prep
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
-#%%patch4 -p1
+%patch4 -p1 -b .gtk
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -370,6 +370,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Aug 31 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-6
+- fixed buffer menu (#515722)
+
 * Wed Aug 26 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
 - correct BuildRequires for libotf (#519151)
 



From sharkcz at fedoraproject.org  Mon Aug 31 10:14:21 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:14:21 +0000 (UTC)
Subject: rpms/tryton/F-11 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tryton.spec,
	1.5, 1.6
Message-ID: <20090831101421.3354C11C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv748

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
- update to upstream version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 13:53:05 -0000	1.5
+++ .cvsignore	31 Aug 2009 10:14:20 -0000	1.6
@@ -1 +1 @@
-tryton-1.0.5.tar.gz
+tryton-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 13:53:05 -0000	1.5
+++ sources	31 Aug 2009 10:14:20 -0000	1.6
@@ -1 +1 @@
-75a9252ec73e1876d8f5d53eb6acef09  tryton-1.0.5.tar.gz
+4c2c74395803a0104b5593e01789b9f4  tryton-1.0.6.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-11/tryton.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tryton.spec	10 Jul 2009 13:53:05 -0000	1.5
+++ tryton.spec	31 Aug 2009 10:14:20 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tryton
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
+- update to upstream version 1.0.6
+
 * Fri Jul 10 2009 Dan Hor?k <dan[at]danny.cz> 1.0.5-1
 - update to upstream version 1.0.5
 



From than at fedoraproject.org  Mon Aug 31 10:14:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 31 Aug 2009 10:14:57 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils-4.3.1-kscd-lirc.patch, NONE,
	1.1 kdeutils.spec, 1.194, 1.195
Message-ID: <20090831101457.0204311C0072@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv710

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
only install printer_applet for fedora


kdeutils-4.3.1-kscd-lirc.patch:
 CMakeLists.txt |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE kdeutils-4.3.1-kscd-lirc.patch ---
diff -up kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt.orig kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt
--- kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt.orig	2009-08-31 11:45:26.000000000 +0200
+++ kdeutils-4.3.1/kdelirc/profiles/CMakeLists.txt	2009-08-31 11:45:31.000000000 +0200
@@ -11,7 +11,6 @@ install( FILES 
     konqueror.profile.xml 
     suspend.profile.xml
     shutdown.profile.xml
-    kscd.profile.xml
     DESTINATION ${DATA_INSTALL_DIR}/profiles)
 
 


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- kdeutils.spec	28 Aug 2009 16:22:39 -0000	1.194
+++ kdeutils.spec	31 Aug 2009 10:14:56 -0000	1.195
@@ -1,5 +1,6 @@
-# define to include applet
+%if 0%{?fedora}
 %define printer_applet 1
+%endif
 
 Name:           kdeutils
 Epoch:          6
@@ -15,6 +16,7 @@ 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
 
@@ -91,7 +93,7 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-
+%patch2 -p1 -b .kscd-lirc
 
 %build
 



From alexlan at fedoraproject.org  Mon Aug 31 10:15:24 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 31 Aug 2009 10:15:24 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-fixed-build.patch,
	NONE, 1.1 octave-forge.spec, 1.82, 1.83
Message-ID: <20090831101524.ADE2711C0072@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1713

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-fixed-build.patch 
Log Message:
* 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


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, )


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- octave-forge.spec	31 Aug 2009 07:59:54 -0000	1.82
+++ octave-forge.spec	31 Aug 2009 10:15:24 -0000	1.83
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,11 +17,10 @@ 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-includes.patch
-Patch1:		octave-forge-20090607-ann-swig-build.patch
-Patch2:		octave-forge-20090607-parallel-build.patch
-Patch3:		octave-forge-20090607-java-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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -170,12 +169,11 @@ do
 done
 
 #apply patches
-#disable patch for the moment, not building 'parallel'
-#patch0 -p0
+%patch0 -p0
 %patch1 -p0
-#disable patch for the moment, not building 'parallel'
-%patch2 -p0
-#patch3 -p0
+#disable patch for the moment, not building 'java'
+#patch2 -p0
+%patch3 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -187,7 +185,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 ]
@@ -221,7 +219,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
@@ -249,6 +247,12 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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



From sharkcz at fedoraproject.org  Mon Aug 31 10:15:28 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:15:28 +0000 (UTC)
Subject: rpms/tryton/F-10 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tryton.spec,
	1.4, 1.5
Message-ID: <20090831101528.7E6C311C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1781

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
- update to upstream version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 13:56:25 -0000	1.5
+++ .cvsignore	31 Aug 2009 10:15:28 -0000	1.6
@@ -1 +1 @@
-tryton-1.0.5.tar.gz
+tryton-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 13:56:25 -0000	1.5
+++ sources	31 Aug 2009 10:15:28 -0000	1.6
@@ -1 +1 @@
-75a9252ec73e1876d8f5d53eb6acef09  tryton-1.0.5.tar.gz
+4c2c74395803a0104b5593e01789b9f4  tryton-1.0.6.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-10/tryton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tryton.spec	10 Jul 2009 13:56:25 -0000	1.4
+++ tryton.spec	31 Aug 2009 10:15:28 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tryton
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
+- update to upstream version 1.0.6
+
 * Fri Jul 10 2009 Dan Hor?k <dan[at]danny.cz> 1.0.5-1
 - update to upstream version 1.0.5
 



From sharkcz at fedoraproject.org  Mon Aug 31 10:16:44 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:16:44 +0000 (UTC)
Subject: rpms/tryton/EL-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tryton.spec,
	1.4, 1.5
Message-ID: <20090831101644.38AB111C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
- update to upstream version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 14:11:32 -0000	1.5
+++ .cvsignore	31 Aug 2009 10:16:44 -0000	1.6
@@ -1 +1 @@
-tryton-1.0.5.tar.gz
+tryton-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 14:11:32 -0000	1.5
+++ sources	31 Aug 2009 10:16:44 -0000	1.6
@@ -1 +1 @@
-75a9252ec73e1876d8f5d53eb6acef09  tryton-1.0.5.tar.gz
+4c2c74395803a0104b5593e01789b9f4  tryton-1.0.6.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-5/tryton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tryton.spec	10 Jul 2009 14:11:32 -0000	1.4
+++ tryton.spec	31 Aug 2009 10:16:44 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tryton
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
+- update to upstream version 1.0.6
+
 * Fri Jul 10 2009 Dan Hor?k <dan[at]danny.cz> 1.0.5-1
 - update to upstream version 1.0.5
 



From sharkcz at fedoraproject.org  Mon Aug 31 10:18:34 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:18:34 +0000 (UTC)
Subject: rpms/trytond/F-11 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 trytond.spec, 1.6, 1.7
Message-ID: <20090831101834.B87DA11C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4368

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
- update to upstream version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 13:48:02 -0000	1.5
+++ .cvsignore	31 Aug 2009 10:18:34 -0000	1.6
@@ -1 +1 @@
-trytond-1.0.5.tar.gz
+trytond-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 13:48:02 -0000	1.5
+++ sources	31 Aug 2009 10:18:34 -0000	1.6
@@ -1 +1 @@
-5198bf3b6c854aeeb120349f09f84b99  trytond-1.0.5.tar.gz
+444319d29c1a87ac434bb3885d031234  trytond-1.0.6.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-11/trytond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- trytond.spec	10 Jul 2009 13:48:02 -0000	1.6
+++ trytond.spec	31 Aug 2009 10:18:34 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
+- update to upstream version 1.0.6
+
 * Fri Jul 10 2009 Dan Hor?k <dan[at]danny.cz> 1.0.5-1
 - update to upstream version 1.0.5
 



From sharkcz at fedoraproject.org  Mon Aug 31 10:20:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:20:38 +0000 (UTC)
Subject: rpms/trytond/F-10 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 trytond.spec, 1.4, 1.5
Message-ID: <20090831102038.8684C11C0495@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6026

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
- update to upstream version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 13:50:23 -0000	1.5
+++ .cvsignore	31 Aug 2009 10:20:38 -0000	1.6
@@ -1 +1 @@
-trytond-1.0.5.tar.gz
+trytond-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 13:50:23 -0000	1.5
+++ sources	31 Aug 2009 10:20:38 -0000	1.6
@@ -1 +1 @@
-5198bf3b6c854aeeb120349f09f84b99  trytond-1.0.5.tar.gz
+444319d29c1a87ac434bb3885d031234  trytond-1.0.6.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-10/trytond.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trytond.spec	10 Jul 2009 13:50:24 -0000	1.4
+++ trytond.spec	31 Aug 2009 10:20:38 -0000	1.5
@@ -3,7 +3,7 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
+- update to upstream version 1.0.6
+
 * Fri Jul 10 2009 Dan Hor?k <dan[at]danny.cz> 1.0.5-1
 - update to upstream version 1.0.5
 



From sharkcz at fedoraproject.org  Mon Aug 31 10:21:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:21:38 +0000 (UTC)
Subject: rpms/trytond/EL-5 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 trytond.spec, 1.4, 1.5
Message-ID: <20090831102138.21C4411C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6904

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
- update to upstream version 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2009 14:13:57 -0000	1.5
+++ .cvsignore	31 Aug 2009 10:21:37 -0000	1.6
@@ -1 +1 @@
-trytond-1.0.5.tar.gz
+trytond-1.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2009 14:13:58 -0000	1.5
+++ sources	31 Aug 2009 10:21:37 -0000	1.6
@@ -1 +1 @@
-5198bf3b6c854aeeb120349f09f84b99  trytond-1.0.5.tar.gz
+444319d29c1a87ac434bb3885d031234  trytond-1.0.6.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/EL-5/trytond.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trytond.spec	10 Jul 2009 14:13:58 -0000	1.4
+++ trytond.spec	31 Aug 2009 10:21:37 -0000	1.5
@@ -3,7 +3,7 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.0.6-1
+- update to upstream version 1.0.6
+
 * Fri Jul 10 2009 Dan Hor?k <dan[at]danny.cz> 1.0.5-1
 - update to upstream version 1.0.5
 



From petersen at fedoraproject.org  Mon Aug 31 10:21:45 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 31 Aug 2009 10:21:45 +0000 (UTC)
Subject: rpms/ghc-GLUT/devel ghc-GLUT.spec,1.1,1.2
Message-ID: <20090831102145.1820E11C0072@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6790

Modified Files:
	ghc-GLUT.spec 
Log Message:
- devel package requires freeglut-devel
- move BRs to source (base) package



Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-GLUT.spec	28 Aug 2009 16:12:55 -0000	1.1
+++ ghc-GLUT.spec	31 Aug 2009 10:21:44 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        2.1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -18,12 +18,16 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc-OpenGL-devel
+BuildRequires:  freeglut-devel
 BuildRequires:  ghc, ghc-rpm-macros
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-OpenGL-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-OpenGL-prof
 %endif
 
 %description
@@ -34,10 +38,10 @@ This is a set of bindings to the C %{pkg
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-BuildRequires:  ghc-OpenGL-devel, freeglut-devel
 Requires:       ghc = %{ghc_version}, ghc-OpenGL-devel, freeglut-devel
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       freeglut-devel
 
 %description devel
 This package contains the development files for %{name}
@@ -51,7 +55,6 @@ Group:          Development/Libraries
 Requires:       ghc-doc = %{ghc_version}, ghc-OpenGL-doc
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
-BuildRequires:  ghc-OpenGL-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -64,7 +67,6 @@ Summary:        Profiling libraries for 
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       ghc-prof = %{ghc_version}, ghc-OpenGL-prof
-BuildRequires:  ghc-OpenGL-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -138,5 +140,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
+- devel package requires freeglut-devel
+- move BRs to source (base) package
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.1.1.2-1
 - initial packaging for Fedora created by cabal2spec



From mjakubicek at fedoraproject.org  Mon Aug 31 10:33:57 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 31 Aug 2009 10:33:57 +0000 (UTC)
Subject: rpms/rpmconf/devel rpmconf.spec,1.4,1.5
Message-ID: <20090831103358.0546111C0072@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rpmconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17616

Modified Files:
	rpmconf.spec 
Log Message:
- Fix typo in description




Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/devel/rpmconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rpmconf.spec	31 Aug 2009 07:42:13 -0000	1.4
+++ rpmconf.spec	31 Aug 2009 10:33:56 -0000	1.5
@@ -12,7 +12,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 BuildRequires: docbook-utils
 
 %description
-This tool seach for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+This tool searches for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
 with them:
 Keep current version, place back old version or watch the diff.
 



From mjakubicek at fedoraproject.org  Mon Aug 31 10:36:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 31 Aug 2009 10:36:27 +0000 (UTC)
Subject: rpms/rpmconf/EL-4 rpmconf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090831103627.90F2311C0072@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rpmconf/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19019/EL-4

Modified Files:
	rpmconf.spec sources 
Log Message:
Sync EL4/EL5 and F10/F11 with devel branch (update to 0.8.1)




Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/EL-4/rpmconf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpmconf.spec	20 Jul 2009 07:16:17 -0000	1.1
+++ rpmconf.spec	31 Aug 2009 10:36:27 -0000	1.2
@@ -2,7 +2,7 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.6
+Version: 0.1.8
 Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
@@ -12,8 +12,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 BuildRequires: docbook-utils
 
 %description
-This tool seach for .rpmnew and .rpmsave files and ask you what to do with 
-them:
+This tool searches for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+with them:
 Keep current version, place back old version or watch the diff.
 
 %prep
@@ -37,6 +37,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
+- fix copy and past typo
+
+* Fri Aug 28 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.7-1
+- add support for handling .rpmorig
+- 513794 - localisation problem
+- add support for suspending script
+
 * Fri Jul 17 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.6-1
 - addressed fedora package review notes (#7)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jul 2009 07:16:17 -0000	1.2
+++ sources	31 Aug 2009 10:36:27 -0000	1.3
@@ -1 +1 @@
-5e01709e49e38d31459654c1b5bf5d51  rpmconf-0.1.6.tar.gz
+229320d86f570aee6e66578e204830ee  rpmconf-0.1.8.tar.gz



From mjakubicek at fedoraproject.org  Mon Aug 31 10:36:28 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 31 Aug 2009 10:36:28 +0000 (UTC)
Subject: rpms/rpmconf/F-11 rpmconf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090831103628.2E22611C0072@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rpmconf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19019/F-11

Modified Files:
	rpmconf.spec sources 
Log Message:
Sync EL4/EL5 and F10/F11 with devel branch (update to 0.8.1)




Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/F-11/rpmconf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpmconf.spec	20 Jul 2009 07:14:11 -0000	1.1
+++ rpmconf.spec	31 Aug 2009 10:36:28 -0000	1.2
@@ -2,7 +2,7 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.6
+Version: 0.1.8
 Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
@@ -12,8 +12,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 BuildRequires: docbook-utils
 
 %description
-This tool seach for .rpmnew and .rpmsave files and ask you what to do with 
-them:
+This tool searches for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+with them:
 Keep current version, place back old version or watch the diff.
 
 %prep
@@ -37,6 +37,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
+- fix copy and past typo
+
+* Fri Aug 28 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.7-1
+- add support for handling .rpmorig
+- 513794 - localisation problem
+- add support for suspending script
+
 * Fri Jul 17 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.6-1
 - addressed fedora package review notes (#7)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jul 2009 07:14:11 -0000	1.2
+++ sources	31 Aug 2009 10:36:28 -0000	1.3
@@ -1 +1 @@
-5e01709e49e38d31459654c1b5bf5d51  rpmconf-0.1.6.tar.gz
+229320d86f570aee6e66578e204830ee  rpmconf-0.1.8.tar.gz



From mjakubicek at fedoraproject.org  Mon Aug 31 10:36:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 31 Aug 2009 10:36:27 +0000 (UTC)
Subject: rpms/rpmconf/EL-5 rpmconf.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090831103627.B7F7E11C0072@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rpmconf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19019/EL-5

Modified Files:
	rpmconf.spec sources 
Log Message:
Sync EL4/EL5 and F10/F11 with devel branch (update to 0.8.1)




Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/EL-5/rpmconf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpmconf.spec	20 Jul 2009 07:18:15 -0000	1.1
+++ rpmconf.spec	31 Aug 2009 10:36:27 -0000	1.2
@@ -2,7 +2,7 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.6
+Version: 0.1.8
 Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
@@ -12,8 +12,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 BuildRequires: docbook-utils
 
 %description
-This tool seach for .rpmnew and .rpmsave files and ask you what to do with 
-them:
+This tool searches for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+with them:
 Keep current version, place back old version or watch the diff.
 
 %prep
@@ -37,6 +37,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
+- fix copy and past typo
+
+* Fri Aug 28 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.7-1
+- add support for handling .rpmorig
+- 513794 - localisation problem
+- add support for suspending script
+
 * Fri Jul 17 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.6-1
 - addressed fedora package review notes (#7)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Jul 2009 07:18:15 -0000	1.2
+++ sources	31 Aug 2009 10:36:27 -0000	1.3
@@ -1 +1 @@
-5e01709e49e38d31459654c1b5bf5d51  rpmconf-0.1.6.tar.gz
+229320d86f570aee6e66578e204830ee  rpmconf-0.1.8.tar.gz



From mjakubicek at fedoraproject.org  Mon Aug 31 10:36:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Mon, 31 Aug 2009 10:36:27 +0000 (UTC)
Subject: rpms/rpmconf/F-10 rpmconf.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090831103627.EC24011C0072@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/rpmconf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19019/F-10

Modified Files:
	rpmconf.spec sources 
Log Message:
Sync EL4/EL5 and F10/F11 with devel branch (update to 0.8.1)




Index: rpmconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/F-10/rpmconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rpmconf.spec	28 Aug 2009 15:06:34 -0000	1.3
+++ rpmconf.spec	31 Aug 2009 10:36:27 -0000	1.4
@@ -2,7 +2,7 @@ Name: rpmconf
 Summary: Tool to handle rpmnew and rpmsave files
 Group:   Applications/System
 License: GPLv3
-Version: 0.1.7
+Version: 0.1.8
 Release: 1%{?dist}
 URL:     http://wiki.github.com/xsuchy/rpmconf
 Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
@@ -12,7 +12,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 BuildRequires: docbook-utils
 
 %description
-This tool seach for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
+This tool searches for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
 with them:
 Keep current version, place back old version or watch the diff.
 
@@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Aug 31 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.8-1
+- fix copy and past typo
+
 * Fri Aug 28 2009 Miroslav Suchy <msuchy at redhat.com> 0.1.7-1
 - add support for handling .rpmorig
 - 513794 - localisation problem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmconf/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Aug 2009 15:06:34 -0000	1.3
+++ sources	31 Aug 2009 10:36:27 -0000	1.4
@@ -1 +1 @@
-69039a340c54cd1395a322a657650f42  rpmconf-0.1.7.tar.gz
+229320d86f570aee6e66578e204830ee  rpmconf-0.1.8.tar.gz



From akurtakov at fedoraproject.org  Mon Aug 31 10:43:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 31 Aug 2009 10:43:33 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.78, 1.79 eclipse.spec, 1.661,
	1.662 .cvsignore, 1.60, 1.61 eclipse-tests-libraryXml.patch, 1.4,
	NONE eclipse-nowin32testfragment.patch, 1.1, NONE
Message-ID: <20090831104333.65A8E11C0072@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23572/devel

Modified Files:
	sources eclipse.spec .cvsignore 
Removed Files:
	eclipse-tests-libraryXml.patch 
	eclipse-nowin32testfragment.patch 
Log Message:
- Remove all testframework sources, patches, build and etc.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	17 Aug 2009 14:16:01 -0000	1.78
+++ sources	31 Aug 2009 10:43:32 -0000	1.79
@@ -1,4 +1,3 @@
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
-67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
 a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -p -r1.661 -r1.662
--- eclipse.spec	18 Aug 2009 11:17:08 -0000	1.661
+++ eclipse.spec	31 Aug 2009 10:43:32 -0000	1.662
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.8%{?dist}
+Release:        0.9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -58,18 +58,6 @@ Source26:       ecf-filetransfer-feature
 Source27:       ecf-filetransfer-build.properties
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
-# Test feature and plugins
-# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer
-# mkdir %{name}-%{version}-testframework; cd %{name}-%{version}-testframework
-# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r R3_4 \
-#   org.eclipse.test \
-#   org.eclipse.test.performance \
-#   org.eclipse.test-feature \
-#   org.eclipse.ant.optional.junit
-# tar cjf %{name}-%{version}-testframework.tar.bz2 \
-#   %{name}-%{version}-testframework
-# (generated 2009-07-23)
-Source30:       %{name}-%{version}-testframework.tar.bz2
 
 # Build swttools.jar before generation on 64-bit platforms.
 # Build SWT native libraries
@@ -122,13 +110,6 @@ Patch37:	%{name}-nojarsignatures.patch
 #Patch39:        %{name}-profilesync-e.o242632.patch
 #Patch40:        %{name}-profilesync-e.o242632-2.patch
 
-# Remove win32 fragment from test feature
-Patch41:        %{name}-nowin32testfragment.patch
-
-# Some fixes for library.xml
-# FIXME:  submit upstream
-Patch42:        %{name}-tests-libraryXml.patch
-
 Patch43:		%{name}-osgi-classpath.patch
 Patch44:		%{name}-fix-javahome64.patch
 
@@ -648,16 +629,6 @@ fi
 #popd
 #popd
 
-# Test framework
-tar jxf %{SOURCE30}
-pushd %{name}-%{version}-testframework
-%patch41
-pushd org.eclipse.test
-%patch42
-popd
-sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
-popd
-
 %patch43
 %patch44
 %patch47
@@ -706,35 +677,6 @@ popd
 #
 #popd
 
-# Build the test framework
-#pushd %{name}-%{version}-testframework
-#mkdir -p build
-
-# The qualifier is what is in upstream's release:
-# http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-test-framework-3.4.zip
-#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.test                   \
-#     -DsourceDirectory=$(pwd)                          \
-#     -DbaseLocation=$SDK \
-#     -DforceContextQualifier=v20080507 \
-#     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-#     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-#popd
-
-#TODO verify this is the correct place
-#pushd %{name}-%{version}-testframework
-#unzip build/rpmBuild/org.eclipse.test.zip
-## These are already in the SDK
-#rm eclipse/epl-v10.html eclipse/notice.html
-#rm -rf eclipse/plugins/org.junit*
-#rm build/rpmBuild/org.eclipse.test.zip
-#zip -r build/rpmBuild/org.eclipse.test.zip eclipse
-#popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
@@ -771,11 +713,6 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse
 #rm -rf \
 #  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
-# Test framework
-#unzip -d $RPM_BUILD_ROOT%{_libdir} \
-#  %{name}-%{version}-testframework/build/rpmBuild/org.eclipse.test.zip
-#mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
-
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
 installDir=$sdkDir-Platform
@@ -1468,6 +1405,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.9
+- Remove all testframework sources, patches, build and etc.
+
 * Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.8
 - Use system hamcrest.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	11 Aug 2009 16:46:10 -0000	1.60
+++ .cvsignore	31 Aug 2009 10:43:33 -0000	1.61
@@ -1,15 +1,4 @@
 ecf-filetransfer-v20080611-1715.tar.bz2
 eclipse-ecj-gcj.tar.bz2
-eclipse-fileinitializerapp.tar.bz2
-eclipse-sourceBuild-srcIncluded-3.4.1.zip
-eclipse-3.4.1-testframework.tar.bz2
-pre320changelog.txt
-eclipse-sourceBuild-srcIncluded-3.4.2.zip
-eclipse-3.4.2-testframework.tar.bz2
-eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
-eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
 eclipse-I20090611-1540-fetched-src.tar.bz2
-eclipse-3.5.0-testframework.tar.bz2
-eclipse-build-generatedScripts.tar.bz2
-eclipse-build-R0_0_2_1.tar.gz
 eclipse-build-R0_3_0.tar.gz


--- eclipse-tests-libraryXml.patch DELETED ---


--- eclipse-nowin32testfragment.patch DELETED ---



From sharkcz at fedoraproject.org  Mon Aug 31 10:50:18 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:50:18 +0000 (UTC)
Subject: rpms/trytond/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 trytond.spec, 1.8, 1.9
Message-ID: <20090831105018.A286611C0495@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24968

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.2.2-1
- update to upstream version 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Jul 2009 13:45:04 -0000	1.6
+++ .cvsignore	31 Aug 2009 10:50:18 -0000	1.7
@@ -1 +1 @@
-trytond-1.2.1.tar.gz
+trytond-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Jul 2009 13:45:04 -0000	1.6
+++ sources	31 Aug 2009 10:50:18 -0000	1.7
@@ -1 +1 @@
-713ba9c013f390cc17b83d2c25686d6f  trytond-1.2.1.tar.gz
+0d90a91b90c600a7a5dd23b436c99a6d  trytond-1.2.2.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/trytond.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- trytond.spec	27 Jul 2009 06:19:08 -0000	1.8
+++ trytond.spec	31 Aug 2009 10:50:18 -0000	1.9
@@ -3,8 +3,8 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.2.2-1
+- update to upstream version 1.2.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Mon Aug 31 10:52:39 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 31 Aug 2009 10:52:39 +0000 (UTC)
Subject: rpms/tryton/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tryton.spec,
	1.8, 1.9
Message-ID: <20090831105239.8428E11C0072@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25690

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.2.2-1
- update to upstream version 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Jul 2009 13:43:05 -0000	1.6
+++ .cvsignore	31 Aug 2009 10:52:39 -0000	1.7
@@ -1 +1 @@
-tryton-1.2.1.tar.gz
+tryton-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Jul 2009 13:43:05 -0000	1.6
+++ sources	31 Aug 2009 10:52:39 -0000	1.7
@@ -1 +1 @@
-95772f5d61283e4bcb2294861afdab94  tryton-1.2.1.tar.gz
+43ec31251f4323863782f2cf0dda1a7c  tryton-1.2.2.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/tryton.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tryton.spec	26 Aug 2009 07:57:01 -0000	1.8
+++ tryton.spec	31 Aug 2009 10:52:39 -0000	1.9
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tryton
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Dan Hor?k <dan[at]danny.cz> 1.2.2-1
+- update to upstream version 1.2.2
+
 * Wed Aug 26 2009 Dan Hor?k <dan[at]danny.cz> 1.2.1-3
 - fixed Source0 URL
 



From transif at fedoraproject.org  Mon Aug 31 10:57:17 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 31 Aug 2009 10:57:17 +0000 (UTC)
Subject: comps/po nb.po,1.21,1.22
Message-ID: <20090831105717.0893C11C0072@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27906/po

Modified Files:
	nb.po 
Log Message:
Sending translation for Norwegian Bokm?l


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 nb.poIndex: nb.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nb.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nb.po	8 Aug 2009 10:56:37 -0000	1.21
+++ nb.po	31 Aug 2009 10:57:16 -0000	1.22
@@ -9,288 +9,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-08-08 12:56+0200\n"
+"POT-Creation-Date: 2009-08-31 08:24+0000\n"
+"PO-Revision-Date: 2009-08-31 12:56+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "Et lettvektig skrivebordsmilj? som fungerer bra p? eldre og tregere maskiner."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administrasjonsverkt?y"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "St?tte for Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "St?tte for albansk"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Programmer"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Programmer for en rekke forskjellige oppgaver"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "St?tte for arabisk"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "St?tte for armensk"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "St?tte for assamesisk"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Tekstpublisering"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Grunnpakker"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissystem"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Grunnleggende st?tte for programmeringsspr?ket Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "St?tte for baskisk"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "St?tte for hviterussisk"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "St?tte for bengali"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "St?tte for Bhutanesisk"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "St?tte for bosnisk"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "St?tte for brasiliensk portugisisk"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "St?tte for bretonsk"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Byggegruppe for byggsystem"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "St?tte for bulgarsk"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "St?tte for katalansk"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "St?tte for kinesisk"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1882 lines suppressed...]
 msgstr "St?tte for sardinsk"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "Sugar skrivebordsmilj?"
 
-#: ../comps-f11.xml.in.h:183
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
 msgstr ""
 
-#: ../comps-f11.xml.in.h:186
+#: ../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."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "St?tte for swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "St?tte for tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../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, "
@@ -1425,24 +1531,80 @@ msgid ""
 msgstr ""
 "Denne gruppen er en samling av verkt?y og ressurser for armenske milj?er."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "St?tte for turkmensk"
 
-#: ../comps-f11.xml.in.h:237
+#: ../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 "
 
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr ""
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Katalogtjener"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Tjenere for maskin- og brukeridentiteter."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin skrivebordsmilj?"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr ""
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Programmer for en rekke forsskjellige oppgaver"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "St?tte for oppringt nettverk"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1450,7 +1612,7 @@ msgstr ""
 "GNOME er et kraftig, grafisk brukergrensesnitt som inkluderer et panel, "
 "skrivebord, systemikoner og en grafisk filh?ndterer"
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1458,7 +1620,7 @@ msgstr ""
 "KDE er et kraftig, grafisk brukergrensesnitt som inkluderer et panel, "
 "skrivebord, systemikoner og en grafisk filh?ndterer."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1466,11 +1628,11 @@ msgstr ""
 "Disse programmene, ofte kalt teksteditorer, lar deg lage og redigere filer. "
 "Emacs og Vi er inkludert her."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "Teksteditoren XEmacs."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1478,33 +1640,33 @@ msgstr ""
 "Disse verkt?yene lar deg lage dokumentasjon i DocBook-formatet og konvertere "
 "dem til HTML, PDF, Postscript og tekst."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Denne gruppen er en samling av nettverkstjenere for spesifikke form?l"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Denne gruppen er en samling av verkt?y og ressurser for arabiske milj?er."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Denne gruppen er en samling av verkt?y og ressurser for arabiske milj?er."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Denne gruppen er en samling av verkt?y og ressurser for japanske milj?er."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""



From sandeeps at fedoraproject.org  Mon Aug 31 11:06:02 2009
From: sandeeps at fedoraproject.org (Sandeep Sheshrao Shedmake)
Date: Mon, 31 Aug 2009 11:06:02 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.99,1.100
Message-ID: <20090831110602.088BB11C0072@cvs1.fedora.phx.redhat.com>

Author: sandeeps

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29678

Modified Files:
	comps-f12.xml.in 
Log Message:
Added vemana2000-fonts to telugu-support


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- comps-f12.xml.in	30 Aug 2009 19:30:16 -0000	1.99
+++ comps-f12.xml.in	31 Aug 2009 11:06:01 -0000	1.100
@@ -5514,6 +5514,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
+      <packagereq type="optional">vemana2000-fonts</packagereq>
     </packagelist>
   </group>
   <group>



From alexlan at fedoraproject.org  Mon Aug 31 11:06:35 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 31 Aug 2009 11:06:35 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-vrml-build.patch, NONE,
	1.1 octave-forge.spec, 1.83, 1.84
Message-ID: <20090831110635.99F9311C0072@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29820

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-vrml-build.patch 
Log Message:
* 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


octave-forge-20090607-vrml-build.patch:
 vrml_text.m    |    2 +-
 vrml_transfo.m |    2 +-
 2 files changed, 2 insertions(+), 2 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);


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- octave-forge.spec	31 Aug 2009 10:15:24 -0000	1.83
+++ octave-forge.spec	31 Aug 2009 11:06:35 -0000	1.84
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -21,6 +21,7 @@ Patch0:		octave-forge-20090607-ann-swig-
 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)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -145,8 +146,8 @@ rm extra/windows-*.tar.gz
 rm main/database-*.tar.gz
 # 6. exclude ftp -- SWIG wrappers are broken
 rm main/ftp-*.tar.gz
-# 7. exclude parallel -- not yet ported to build against Octave 3.2
-#rm main/parallel-*.tar.gz
+# 7. exclude fixed --  doesn't build against Octave 3.2
+rm main/fixed-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
 # 9. exclude java --  doesn't build against Octave 3.2
@@ -173,7 +174,8 @@ done
 %patch1 -p0
 #disable patch for the moment, not building 'java'
 #patch2 -p0
-%patch3 -p0
+#patch3 -p0
+%patch4 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -247,6 +249,12 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* 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)



From tmraz at fedoraproject.org  Mon Aug 31 11:07:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 31 Aug 2009 11:07:49 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-dss1.patch, NONE,
	1.1 openssl.spec, 1.139, 1.140
Message-ID: <20090831110749.9018611C0072@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30156

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-dss1.patch 
Log Message:
* Mon Aug 31 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.6.beta3
- fix openssl dgst -dss1 (#520152)


openssl-1.0.0-beta3-dss1.patch:
 dsa_pmeth.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE openssl-1.0.0-beta3-dss1.patch ---
diff -up openssl-1.0.0-beta3/crypto/dsa/dsa_pmeth.c.dss1 openssl-1.0.0-beta3/crypto/dsa/dsa_pmeth.c
--- openssl-1.0.0-beta3/crypto/dsa/dsa_pmeth.c.dss1	2008-11-05 19:38:56.000000000 +0100
+++ openssl-1.0.0-beta3/crypto/dsa/dsa_pmeth.c	2009-08-31 12:53:47.000000000 +0200
@@ -186,6 +186,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *c
 
 		case EVP_PKEY_CTRL_MD:
 		if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1   &&
+		    EVP_MD_type((const EVP_MD *)p2) != NID_dsa    &&
 		    EVP_MD_type((const EVP_MD *)p2) != NID_sha224 &&
 		    EVP_MD_type((const EVP_MD *)p2) != NID_sha256)
 			{


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- openssl.spec	26 Aug 2009 15:50:36 -0000	1.139
+++ openssl.spec	31 Aug 2009 11:07:49 -0000	1.140
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.5.%{beta}%{?dist}
+Release: 0.6.%{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
@@ -62,6 +62,7 @@ Patch48: openssl-0.9.8j-bad-mime.patch
 Patch49: openssl-0.9.8k-algo-doc.patch
 Patch50: openssl-1.0.0-beta3-curl.patch
 Patch51: openssl-1.0.0-beta3-const.patch
+Patch52: openssl-1.0.0-beta3-dss1.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
@@ -145,6 +146,7 @@ from other formats to the formats used b
 %patch49 -p1 -b .algo-doc
 %patch50 -p1 -b .curl
 %patch51 -p1 -b .const
+%patch52 -p1 -b .dss1
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 
@@ -395,6 +397,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 31 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.6.beta3
+- fix openssl dgst -dss1 (#520152)
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.5.beta3
 - drop the compat symlink hacks
 



From emunson at fedoraproject.org  Mon Aug 31 11:22:23 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Mon, 31 Aug 2009 11:22:23 +0000 (UTC)
Subject: rpms/libhugetlbfs/F-11 .cvsignore, 1.16, 1.17 import.log, 1.10,
	1.11 libhugetlbfs.spec, 1.28, 1.29 sources, 1.17, 1.18
Message-ID: <20090831112223.3D36611C0072@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1818/F-11

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
Updating to libhugetlbfs 2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	30 Jun 2009 11:04:28 -0000	1.16
+++ .cvsignore	31 Aug 2009 11:22:22 -0000	1.17
@@ -1 +1 @@
-libhugetlbfs-2.5.tar.gz
+libhugetlbfs-2.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log	20 Jul 2009 08:29:05 -0000	1.10
+++ import.log	31 Aug 2009 11:22:22 -0000	1.11
@@ -8,3 +8,4 @@ libhugetlbfs-2_4-1_fc10:F-11:libhugetlbf
 libhugetlbfs-2_4-2_fc11:F-11:libhugetlbfs-2.4-2.src.rpm:1243976942
 libhugetlbfs-2_5-1_fc11:F-11:libhugetlbfs-2.5-1.src.rpm:1246360112
 libhugetlbfs-2_5-2_fc11:F-11:libhugetlbfs-2.5.2.src.rpm:1248078830
+libhugetlbfs-2_6-1_fc11:F-11:libhugetlbfs-2.6-1.src.rpm:1251718073


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/libhugetlbfs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libhugetlbfs.spec	20 Jul 2009 08:29:05 -0000	1.28
+++ libhugetlbfs.spec	31 Aug 2009 11:22:22 -0000	1.29
@@ -1,6 +1,6 @@
 Name: libhugetlbfs
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Mon Aug 31 2009 Eric Munson <ebmunson at us.ibm.com> 2.6-1
+- Updating for the libhugetlbfs-2.6 release
+
 * Mon Jul 20 2009 Eric Munson <ebmunson at us.ibm.com> 2.5-2
 - Update Group for -utils package to Applications/System
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	30 Jun 2009 11:04:28 -0000	1.17
+++ sources	31 Aug 2009 11:22:22 -0000	1.18
@@ -1 +1 @@
-9e96f679de28629a97b5d5d2d7c7a5b2  libhugetlbfs-2.5.tar.gz
+cda489010e5bb89eb59994f689f8693e  libhugetlbfs-2.6.tar.gz



From emunson at fedoraproject.org  Mon Aug 31 11:23:39 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Mon, 31 Aug 2009 11:23:39 +0000 (UTC)
Subject: rpms/libhugetlbfs/devel .cvsignore, 1.16, 1.17 import.log, 1.10,
	1.11 libhugetlbfs.spec, 1.29, 1.30 sources, 1.17, 1.18
Message-ID: <20090831112339.A749111C0072@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2291/devel

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
Updating to libhugetlbfs 2.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	30 Jun 2009 11:06:40 -0000	1.16
+++ .cvsignore	31 Aug 2009 11:23:39 -0000	1.17
@@ -1 +1 @@
-libhugetlbfs-2.5.tar.gz
+libhugetlbfs-2.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log	20 Jul 2009 08:30:45 -0000	1.10
+++ import.log	31 Aug 2009 11:23:39 -0000	1.11
@@ -8,3 +8,4 @@ libhugetlbfs-2_4-1_fc10:HEAD:libhugetlbf
 libhugetlbfs-2_4-2_fc11:HEAD:libhugetlbfs-2.4-2.src.rpm:1243976760
 libhugetlbfs-2_5-1_fc11:HEAD:libhugetlbfs-2.5-1.src.rpm:1246360241
 libhugetlbfs-2_5-2_fc11:HEAD:libhugetlbfs-2.5.2.src.rpm:1248078932
+libhugetlbfs-2_6-1_fc11:HEAD:libhugetlbfs-2.6-1.src.rpm:1251718185


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/libhugetlbfs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libhugetlbfs.spec	25 Jul 2009 05:54:11 -0000	1.29
+++ libhugetlbfs.spec	31 Aug 2009 11:23:39 -0000	1.30
@@ -1,6 +1,6 @@
 Name: libhugetlbfs
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Mon Aug 31 2009 Eric Munson <ebmunson at us.ibm.com> 2.6-1
+- Updating for the libhugetlbfs-2.6 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	30 Jun 2009 11:06:41 -0000	1.17
+++ sources	31 Aug 2009 11:23:39 -0000	1.18
@@ -1 +1 @@
-9e96f679de28629a97b5d5d2d7c7a5b2  libhugetlbfs-2.5.tar.gz
+cda489010e5bb89eb59994f689f8693e  libhugetlbfs-2.6.tar.gz



From jwrdegoede at fedoraproject.org  Mon Aug 31 11:24:19 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 31 Aug 2009 11:24:19 +0000 (UTC)
Subject: rpms/camorama/devel camorama-0.19-desktop.patch, NONE,
	1.1 camorama-0.19-fixes.patch, NONE,
	1.1 camorama-0.19-libv4l.patch, NONE, 1.1 camorama.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831112419.B1B0D11C0072@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/camorama/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	camorama-0.19-desktop.patch camorama-0.19-fixes.patch 
	camorama-0.19-libv4l.patch camorama.spec import.log 
Log Message:
Initial camorama import


camorama-0.19-desktop.patch:
 camorama.desktop.in |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE camorama-0.19-desktop.patch ---
diff -up camorama-0.19/camorama.desktop.in~ camorama-0.19/camorama.desktop.in
--- camorama-0.19/camorama.desktop.in~	2007-06-14 16:05:33.000000000 +0200
+++ camorama-0.19/camorama.desktop.in	2009-06-23 19:58:16.000000000 +0200
@@ -4,10 +4,9 @@ _Comment=View, alter and save images fro
 Exec=camorama
 Terminal=0
 Type=Application
-Icon=camorama.png
-Categories=Application;Graphics
+Icon=camorama
+Categories=GNOME;AudioVideo;
 StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=camorama
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Component=User Interface

camorama-0.19-fixes.patch:
 camorama-0.19/src/camorama-window.c |    6 +-----
 src/callbacks.c                     |   14 +++++++++++---
 src/filter.c                        |    4 ++--
 src/main.c                          |    3 +--
 src/v4l.c                           |    6 ++++--
 5 files changed, 19 insertions(+), 14 deletions(-)

--- NEW FILE camorama-0.19-fixes.patch ---
--- camorama-0.19/src/callbacks.c	2007-09-16 15:36:55.000000000 +0200
+++ camorama-0.19.new/src/callbacks.c	2008-06-29 22:22:44.000000000 +0200
@@ -387,9 +387,6 @@
         }
     }
 
-    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
-    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
-                                 cam->x, cam->y);
 
     /*
      * if(cam->read == FALSE) {
@@ -441,6 +438,11 @@
      * * } 
      */
     get_win_info (cam);
+
+    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
+    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
+                                 cam->x, cam->y);
+
     frame = 0;
     gtk_window_resize (GTK_WINDOW
                        (glade_xml_get_widget (cam->xml, "main_window")), 320,
@@ -520,8 +522,14 @@
     gtk_widget_show (about);
 }
 
+void
+camorama_filter_color_filter(void* filter, guchar *image, int x, int y, int depth);
+
 static void
 apply_filters(cam* cam) {
+	/* v4l has reverse rgb order from what camora expect so call the color
+	   filter to fix things up before running the user selected filters */
+	camorama_filter_color_filter(NULL, cam->pic_buf, cam->x, cam->y, cam->depth);
 	camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth);
 #warning "FIXME: enable the threshold channel filter"
 //	if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL)  != 0) 
--- camorama-0.19/src/filter.c	2007-09-16 14:48:50.000000000 +0200
+++ camorama-0.19.new/src/filter.c	2008-06-29 22:11:42.000000000 +0200
@@ -151,12 +151,12 @@
 static void
 camorama_filter_color_init(CamoramaFilterColor* self) {}
 
-static void
+void
 camorama_filter_color_filter(CamoramaFilterColor* filter, guchar *image, int x, int y, int depth) {
 	int i;
 	char tmp;
 	i = x * y;
-	while (--i) {
+	while (i--) {
 		tmp = image[0];
 		image[0] = image[2];
 		image[2] = tmp;
--- camorama-0.19/src/main.c	2007-09-16 15:36:55.000000000 +0200
+++ camorama-0.19.new/src/main.c	2008-06-29 22:20:04.000000000 +0200
@@ -224,8 +224,7 @@
 
     /* get picture attributes */
     get_pic_info (cam);
-//	set_pic_info(cam);
-    /* set_pic_info(cam); */
+    set_pic_info (cam);
     cam->contrast = cam->vid_pic.contrast;
     cam->brightness = cam->vid_pic.brightness;
     cam->colour = cam->vid_pic.colour;
--- camorama-0.19/src/v4l.c	2007-09-16 14:48:05.000000000 +0200
+++ camorama-0.19.new/src/v4l.c	2008-06-29 22:20:23.000000000 +0200
@@ -158,8 +158,8 @@
 	if(cam->debug) {
 		g_message("SET PIC");
 	}
-	//cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
-	//cam->vid_pic.depth = 24;
+	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
+	cam->vid_pic.depth = 24;
 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
 	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
 		if(cam->debug) {
@@ -232,6 +232,8 @@
       exit(0);
    }
 
+   cam->x = cam->vid_win.width;
+   cam->y = cam->vid_win.height;
 }
 
 void set_buffer(cam * cam)
--- camorama-0.19/src/camorama-window.c~	2007-09-16 15:36:55.000000000 +0200
+++ camorama-0.19/src/camorama-window.c	2009-06-23 20:19:16.000000000 +0200
@@ -209,11 +209,7 @@ load_interface(cam* cam) {
 
     logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
     gtk_window_set_default_icon(logo);
-    logo = (GdkPixbuf *) create_pixbuf (PACKAGE_DATA_DIR "/pixmaps/camorama.png");
-    if (logo == NULL) {
-        printf ("\n\nLOGO NO GO\n\n");
-    }
-
+    logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), "camorama", 48, 0, NULL);
     if (cam->show_adjustments == FALSE) {
         gtk_widget_hide (glade_xml_get_widget
                          (cam->xml, "adjustments_table"));

camorama-0.19-libv4l.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 callbacks.c |   17 +++++++++--------
 main.c      |    6 +++++-
 v4l.c       |   13 +++++++------
 5 files changed, 23 insertions(+), 17 deletions(-)

--- NEW FILE camorama-0.19-libv4l.patch ---
--- camorama-0.19/src/Makefile.am	2007-09-16 14:48:05.000000000 +0200
+++ camorama-0.19.new/src/Makefile.am	2009-06-24 15:01:37.000000000 +0200
@@ -36,7 +36,7 @@
 	filter.h	\
 	$(BUILT_SOURCES)\
 	$(NULL)
-camorama_LDADD = $(PACKAGE_LIBS)
+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
 
 DISTCLEANFILES=$(BUILT_SOURCES)
 
--- camorama-0.19/src/Makefile.in	2007-10-06 21:06:28.000000000 +0200
+++ camorama-0.19.new/src/Makefile.in	2009-06-24 15:01:50.000000000 +0200
@@ -248,7 +248,7 @@
 	$(BUILT_SOURCES)\
 	$(NULL)
 
-camorama_LDADD = $(PACKAGE_LIBS)
+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
 DISTCLEANFILES = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
--- camorama-0.19/src/callbacks.c	2009-06-24 15:01:55.000000000 +0200
+++ camorama-0.19.new/src/callbacks.c	2009-06-24 14:55:42.000000000 +0200
@@ -9,6 +9,7 @@
 #include <libgnomeui/gnome-propertybox.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <pthread.h>
+#include <libv4l1.h>
 
 extern GtkWidget *main_window, *prefswindow;
 //extern state func_state;
@@ -390,7 +391,7 @@
 
     /*
      * if(cam->read == FALSE) {
-     *  cam->pic = mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
+     *  cam->pic = v4l1_mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
      *  
      *  if((unsigned char *) -1 == (unsigned char *) cam->pic) {
      *   if(cam->debug == TRUE) {
@@ -401,7 +402,7 @@
      *  }
      *  }else{
      *   cam->pic_buf = malloc(cam->x * cam->y * cam->depth);
-     *   read(cam->dev,cam->pic,(cam->x * cam->y * 3));
+     *   v4l1_read(cam->dev,cam->pic,(cam->x * cam->y * 3));
      *  } 
      */
 
@@ -427,7 +428,7 @@
      * if(cam->read == FALSE) {
      * * for(frame = 0; frame < cam->vid_buf.frames; frame++) {
      * * cam->vid_map.frame = frame;
-     * * if(ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+     * * if(v4l1_ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
      * * if(cam->debug == TRUE) {
      * * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n");
      * * }
@@ -547,7 +548,7 @@
     int i, count = 0;
     GdkGC *gc;
 
-    read (cam->dev, cam->pic, (cam->x * cam->y * 3));
+    v4l1_read (cam->dev, cam->pic, (cam->x * cam->y * 3));
     frames2++;
     /*
      * update_rec.x = 0;
@@ -588,7 +589,7 @@
 
     i = -1;
     while (i < 0) {
-        i = ioctl (cam->dev, VIDIOCSYNC, &frame);
+        i = v4l1_ioctl (cam->dev, VIDIOCSYNC, &frame);
 
         if (i < 0 && errno == EINTR) {
             if (cam->debug == TRUE) {
@@ -630,7 +631,7 @@
                                 0, cam->x, cam->y);
 
     cam->vid_map.frame = frame;
-    if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+    if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
         if (cam->debug == TRUE) {
             fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n");
         }
@@ -677,7 +678,7 @@
 void init_cam (GtkWidget * capture, cam * cam)
 {
     cam->pic =
-        mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
+        v4l1_mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
               MAP_SHARED, cam->dev, 0);
 
     if ((unsigned char *) -1 == (unsigned char *) cam->pic) {
@@ -692,7 +693,7 @@
     cam->vid_map.format = cam->vid_pic.palette;
     for (frame = 0; frame < cam->vid_buf.frames; frame++) {
         cam->vid_map.frame = frame;
-        if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+        if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
             if (cam->debug == TRUE) {
                 fprintf (stderr,
                          "Unable to capture image (VIDIOCMCAPTURE).\n");
--- camorama-0.19/src/main.c	2009-06-24 15:01:55.000000000 +0200
+++ camorama-0.19.new/src/main.c	2009-06-24 14:59:35.000000000 +0200
@@ -9,6 +9,7 @@
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
 #include <locale.h>
+#include <libv4l1.h>
 
 #include "camorama-display.h"
 #include "camorama-stock-items.h"
@@ -206,7 +207,7 @@
     gdk_pixbuf_xlib_init (display, 0);
     cam->desk_depth = xlib_rgb_get_depth ();
 
-    cam->dev = open (cam->video_dev, O_RDWR);
+    cam->dev = v4l1_open (cam->video_dev, O_RDWR);
 
     camera_cap (cam);
     get_win_info (cam);
@@ -284,5 +285,8 @@
 
     gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
     gtk_main ();
+    v4l1_munmap(cam->pic, cam->vid_buf.size);
+    v4l1_close(cam->dev);
+    
     return 0;
 }
--- camorama-0.19/src/v4l.c	2009-06-24 15:01:55.000000000 +0200
+++ camorama-0.19.new/src/v4l.c	2009-06-24 14:54:09.000000000 +0200
@@ -2,6 +2,7 @@
 #include<time.h>
 #include<errno.h>
 #include<gnome.h>
+#include <libv4l1.h>
 #include "support.h"
 
 extern int frame_number;
@@ -87,7 +88,7 @@
 void camera_cap(cam * cam)
 {
    char *msg;
-   if(ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
       if(cam->debug == TRUE) {
          fprintf(stderr, "VIDIOCGCAP  --  could not get camera capabilities, exiting.....\n");
       }
@@ -161,7 +162,7 @@
 	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
 	cam->vid_pic.depth = 24;
 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
-	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
+	if(v4l1_ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
 		if(cam->debug) {
 			g_message("VIDIOCSPICT  --  could not set picture info, exiting....");
 		}
@@ -176,7 +177,7 @@
 //set_pic_info(cam);
    char *msg;
 	
-   if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {
@@ -201,7 +202,7 @@
 void get_win_info(cam * cam)
 {
    gchar *msg;
-   if(ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {
@@ -222,7 +223,7 @@
 void set_win_info(cam * cam)
 {
    gchar *msg;
-   if(ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {
@@ -239,7 +240,7 @@
 void set_buffer(cam * cam)
 {
    char *msg;
-   if(ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {


--- NEW FILE camorama.spec ---
Name:           camorama
Version:        0.19
Release:        2%{?dist}
Summary:        Gnome webcam viewer
Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://camorama.fixedgear.org/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/camorama/0.19/camorama-0.19.tar.bz2
# None of these patches are going upstream as upstream is dead
# camorama has some bad (not always true) assumptions about which resolutions
# it can get from a device, this fixes camorama to actualy check what it got
Patch0:         camorama-0.19-fixes.patch
# Update the desktop file to todays standards
Patch1:         camorama-0.19-desktop.patch
# Make it use libv4l1 so it will work with v4l2 devices too
Patch2:         camorama-0.19-libv4l.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel ORBit2-devel gettext-devel libv4l-devel
BuildRequires:  intltool desktop-file-utils
Requires:       hicolor-icon-theme
Requires(pre):  GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description
A simple Gnome webcam viewer, with the ability to apply some video effects.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

# below is the desktop file and icon stuff.
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/devices
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/devices
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-webcam-16.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/devices/%{name}-webcam.png
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-webcam-24.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/devices/%{name}-webcam.png
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ] ; then
  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
  gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
gconftool-2 --makefile-install-rule \
  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
  gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%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 THANKS TODO
%{_sysconfdir}/gconf/schemas/camorama.schemas
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/camorama.desktop
%{_datadir}/icons/hicolor/*x*/devices/%{name}-webcam.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Fri Aug 28 2009 Hans de Goede <hdegoede at redhat.com> 0.19-2
- Don't install gconf files during build (#507830)
- Add comments describing the patches (#507830)

* Tue Jun 23 2009 Hans de Goede <hdegoede at redhat.com> 0.19-1
- Initial Fedora package


--- NEW FILE import.log ---
camorama-0_19-2_fc11:HEAD:camorama-0.19-2.fc11.src.rpm:1251717992


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/camorama/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:41:07 -0000	1.1
+++ .cvsignore	31 Aug 2009 11:24:19 -0000	1.2
@@ -0,0 +1 @@
+camorama-0.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/camorama/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:41:08 -0000	1.1
+++ sources	31 Aug 2009 11:24:19 -0000	1.2
@@ -0,0 +1 @@
+75025ba37d1dd1c398d92ba2dbef43ee  camorama-0.19.tar.bz2



From jwrdegoede at fedoraproject.org  Mon Aug 31 11:26:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 31 Aug 2009 11:26:12 +0000 (UTC)
Subject: rpms/camorama/F-11 camorama-0.19-desktop.patch, NONE,
	1.1 camorama-0.19-fixes.patch, NONE,
	1.1 camorama-0.19-libv4l.patch, NONE, 1.1 camorama.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831112612.5C4B611C0072@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/camorama/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3813

Modified Files:
	.cvsignore sources 
Added Files:
	camorama-0.19-desktop.patch camorama-0.19-fixes.patch 
	camorama-0.19-libv4l.patch camorama.spec 
Log Message:
* Fri Aug 28 2009 Hans de Goede <hdegoede at redhat.com> 0.19-2
- Don't install gconf files during build (#507830)
- Add comments describing the patches (#507830)


camorama-0.19-desktop.patch:
 camorama.desktop.in |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE camorama-0.19-desktop.patch ---
diff -up camorama-0.19/camorama.desktop.in~ camorama-0.19/camorama.desktop.in
--- camorama-0.19/camorama.desktop.in~	2007-06-14 16:05:33.000000000 +0200
+++ camorama-0.19/camorama.desktop.in	2009-06-23 19:58:16.000000000 +0200
@@ -4,10 +4,9 @@ _Comment=View, alter and save images fro
 Exec=camorama
 Terminal=0
 Type=Application
-Icon=camorama.png
-Categories=Application;Graphics
+Icon=camorama
+Categories=GNOME;AudioVideo;
 StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=camorama
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Component=User Interface

camorama-0.19-fixes.patch:
 camorama-0.19/src/camorama-window.c |    6 +-----
 src/callbacks.c                     |   14 +++++++++++---
 src/filter.c                        |    4 ++--
 src/main.c                          |    3 +--
 src/v4l.c                           |    6 ++++--
 5 files changed, 19 insertions(+), 14 deletions(-)

--- NEW FILE camorama-0.19-fixes.patch ---
--- camorama-0.19/src/callbacks.c	2007-09-16 15:36:55.000000000 +0200
+++ camorama-0.19.new/src/callbacks.c	2008-06-29 22:22:44.000000000 +0200
@@ -387,9 +387,6 @@
         }
     }
 
-    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
-    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
-                                 cam->x, cam->y);
 
     /*
      * if(cam->read == FALSE) {
@@ -441,6 +438,11 @@
      * * } 
      */
     get_win_info (cam);
+
+    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
+    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
+                                 cam->x, cam->y);
+
     frame = 0;
     gtk_window_resize (GTK_WINDOW
                        (glade_xml_get_widget (cam->xml, "main_window")), 320,
@@ -520,8 +522,14 @@
     gtk_widget_show (about);
 }
 
+void
+camorama_filter_color_filter(void* filter, guchar *image, int x, int y, int depth);
+
 static void
 apply_filters(cam* cam) {
+	/* v4l has reverse rgb order from what camora expect so call the color
+	   filter to fix things up before running the user selected filters */
+	camorama_filter_color_filter(NULL, cam->pic_buf, cam->x, cam->y, cam->depth);
 	camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth);
 #warning "FIXME: enable the threshold channel filter"
 //	if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL)  != 0) 
--- camorama-0.19/src/filter.c	2007-09-16 14:48:50.000000000 +0200
+++ camorama-0.19.new/src/filter.c	2008-06-29 22:11:42.000000000 +0200
@@ -151,12 +151,12 @@
 static void
 camorama_filter_color_init(CamoramaFilterColor* self) {}
 
-static void
+void
 camorama_filter_color_filter(CamoramaFilterColor* filter, guchar *image, int x, int y, int depth) {
 	int i;
 	char tmp;
 	i = x * y;
-	while (--i) {
+	while (i--) {
 		tmp = image[0];
 		image[0] = image[2];
 		image[2] = tmp;
--- camorama-0.19/src/main.c	2007-09-16 15:36:55.000000000 +0200
+++ camorama-0.19.new/src/main.c	2008-06-29 22:20:04.000000000 +0200
@@ -224,8 +224,7 @@
 
     /* get picture attributes */
     get_pic_info (cam);
-//	set_pic_info(cam);
-    /* set_pic_info(cam); */
+    set_pic_info (cam);
     cam->contrast = cam->vid_pic.contrast;
     cam->brightness = cam->vid_pic.brightness;
     cam->colour = cam->vid_pic.colour;
--- camorama-0.19/src/v4l.c	2007-09-16 14:48:05.000000000 +0200
+++ camorama-0.19.new/src/v4l.c	2008-06-29 22:20:23.000000000 +0200
@@ -158,8 +158,8 @@
 	if(cam->debug) {
 		g_message("SET PIC");
 	}
-	//cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
-	//cam->vid_pic.depth = 24;
+	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
+	cam->vid_pic.depth = 24;
 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
 	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
 		if(cam->debug) {
@@ -232,6 +232,8 @@
       exit(0);
    }
 
+   cam->x = cam->vid_win.width;
+   cam->y = cam->vid_win.height;
 }
 
 void set_buffer(cam * cam)
--- camorama-0.19/src/camorama-window.c~	2007-09-16 15:36:55.000000000 +0200
+++ camorama-0.19/src/camorama-window.c	2009-06-23 20:19:16.000000000 +0200
@@ -209,11 +209,7 @@ load_interface(cam* cam) {
 
     logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
     gtk_window_set_default_icon(logo);
-    logo = (GdkPixbuf *) create_pixbuf (PACKAGE_DATA_DIR "/pixmaps/camorama.png");
-    if (logo == NULL) {
-        printf ("\n\nLOGO NO GO\n\n");
-    }
-
+    logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), "camorama", 48, 0, NULL);
     if (cam->show_adjustments == FALSE) {
         gtk_widget_hide (glade_xml_get_widget
                          (cam->xml, "adjustments_table"));

camorama-0.19-libv4l.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 callbacks.c |   17 +++++++++--------
 main.c      |    6 +++++-
 v4l.c       |   13 +++++++------
 5 files changed, 23 insertions(+), 17 deletions(-)

--- NEW FILE camorama-0.19-libv4l.patch ---
--- camorama-0.19/src/Makefile.am	2007-09-16 14:48:05.000000000 +0200
+++ camorama-0.19.new/src/Makefile.am	2009-06-24 15:01:37.000000000 +0200
@@ -36,7 +36,7 @@
 	filter.h	\
 	$(BUILT_SOURCES)\
 	$(NULL)
-camorama_LDADD = $(PACKAGE_LIBS)
+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
 
 DISTCLEANFILES=$(BUILT_SOURCES)
 
--- camorama-0.19/src/Makefile.in	2007-10-06 21:06:28.000000000 +0200
+++ camorama-0.19.new/src/Makefile.in	2009-06-24 15:01:50.000000000 +0200
@@ -248,7 +248,7 @@
 	$(BUILT_SOURCES)\
 	$(NULL)
 
-camorama_LDADD = $(PACKAGE_LIBS)
+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
 DISTCLEANFILES = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
--- camorama-0.19/src/callbacks.c	2009-06-24 15:01:55.000000000 +0200
+++ camorama-0.19.new/src/callbacks.c	2009-06-24 14:55:42.000000000 +0200
@@ -9,6 +9,7 @@
 #include <libgnomeui/gnome-propertybox.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <pthread.h>
+#include <libv4l1.h>
 
 extern GtkWidget *main_window, *prefswindow;
 //extern state func_state;
@@ -390,7 +391,7 @@
 
     /*
      * if(cam->read == FALSE) {
-     *  cam->pic = mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
+     *  cam->pic = v4l1_mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
      *  
      *  if((unsigned char *) -1 == (unsigned char *) cam->pic) {
      *   if(cam->debug == TRUE) {
@@ -401,7 +402,7 @@
      *  }
      *  }else{
      *   cam->pic_buf = malloc(cam->x * cam->y * cam->depth);
-     *   read(cam->dev,cam->pic,(cam->x * cam->y * 3));
+     *   v4l1_read(cam->dev,cam->pic,(cam->x * cam->y * 3));
      *  } 
      */
 
@@ -427,7 +428,7 @@
      * if(cam->read == FALSE) {
      * * for(frame = 0; frame < cam->vid_buf.frames; frame++) {
      * * cam->vid_map.frame = frame;
-     * * if(ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+     * * if(v4l1_ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
      * * if(cam->debug == TRUE) {
      * * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n");
      * * }
@@ -547,7 +548,7 @@
     int i, count = 0;
     GdkGC *gc;
 
-    read (cam->dev, cam->pic, (cam->x * cam->y * 3));
+    v4l1_read (cam->dev, cam->pic, (cam->x * cam->y * 3));
     frames2++;
     /*
      * update_rec.x = 0;
@@ -588,7 +589,7 @@
 
     i = -1;
     while (i < 0) {
-        i = ioctl (cam->dev, VIDIOCSYNC, &frame);
+        i = v4l1_ioctl (cam->dev, VIDIOCSYNC, &frame);
 
         if (i < 0 && errno == EINTR) {
             if (cam->debug == TRUE) {
@@ -630,7 +631,7 @@
                                 0, cam->x, cam->y);
 
     cam->vid_map.frame = frame;
-    if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+    if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
         if (cam->debug == TRUE) {
             fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n");
         }
@@ -677,7 +678,7 @@
 void init_cam (GtkWidget * capture, cam * cam)
 {
     cam->pic =
-        mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
+        v4l1_mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
               MAP_SHARED, cam->dev, 0);
 
     if ((unsigned char *) -1 == (unsigned char *) cam->pic) {
@@ -692,7 +693,7 @@
     cam->vid_map.format = cam->vid_pic.palette;
     for (frame = 0; frame < cam->vid_buf.frames; frame++) {
         cam->vid_map.frame = frame;
-        if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
+        if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
             if (cam->debug == TRUE) {
                 fprintf (stderr,
                          "Unable to capture image (VIDIOCMCAPTURE).\n");
--- camorama-0.19/src/main.c	2009-06-24 15:01:55.000000000 +0200
+++ camorama-0.19.new/src/main.c	2009-06-24 14:59:35.000000000 +0200
@@ -9,6 +9,7 @@
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
 #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
 #include <locale.h>
+#include <libv4l1.h>
 
 #include "camorama-display.h"
 #include "camorama-stock-items.h"
@@ -206,7 +207,7 @@
     gdk_pixbuf_xlib_init (display, 0);
     cam->desk_depth = xlib_rgb_get_depth ();
 
-    cam->dev = open (cam->video_dev, O_RDWR);
+    cam->dev = v4l1_open (cam->video_dev, O_RDWR);
 
     camera_cap (cam);
     get_win_info (cam);
@@ -284,5 +285,8 @@
 
     gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
     gtk_main ();
+    v4l1_munmap(cam->pic, cam->vid_buf.size);
+    v4l1_close(cam->dev);
+    
     return 0;
 }
--- camorama-0.19/src/v4l.c	2009-06-24 15:01:55.000000000 +0200
+++ camorama-0.19.new/src/v4l.c	2009-06-24 14:54:09.000000000 +0200
@@ -2,6 +2,7 @@
 #include<time.h>
 #include<errno.h>
 #include<gnome.h>
+#include <libv4l1.h>
 #include "support.h"
 
 extern int frame_number;
@@ -87,7 +88,7 @@
 void camera_cap(cam * cam)
 {
    char *msg;
-   if(ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
       if(cam->debug == TRUE) {
          fprintf(stderr, "VIDIOCGCAP  --  could not get camera capabilities, exiting.....\n");
       }
@@ -161,7 +162,7 @@
 	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
 	cam->vid_pic.depth = 24;
 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
-	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
+	if(v4l1_ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
 		if(cam->debug) {
 			g_message("VIDIOCSPICT  --  could not set picture info, exiting....");
 		}
@@ -176,7 +177,7 @@
 //set_pic_info(cam);
    char *msg;
 	
-   if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {
@@ -201,7 +202,7 @@
 void get_win_info(cam * cam)
 {
    gchar *msg;
-   if(ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {
@@ -222,7 +223,7 @@
 void set_win_info(cam * cam)
 {
    gchar *msg;
-   if(ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {
@@ -239,7 +240,7 @@
 void set_buffer(cam * cam)
 {
    char *msg;
-   if(ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
+   if(v4l1_ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
       error_dialog(msg);
       if(cam->debug == TRUE) {


--- NEW FILE camorama.spec ---
Name:           camorama
Version:        0.19
Release:        2%{?dist}
Summary:        Gnome webcam viewer
Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://camorama.fixedgear.org/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/camorama/0.19/camorama-0.19.tar.bz2
# None of these patches are going upstream as upstream is dead
# camorama has some bad (not always true) assumptions about which resolutions
# it can get from a device, this fixes camorama to actualy check what it got
Patch0:         camorama-0.19-fixes.patch
# Update the desktop file to todays standards
Patch1:         camorama-0.19-desktop.patch
# Make it use libv4l1 so it will work with v4l2 devices too
Patch2:         camorama-0.19-libv4l.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel ORBit2-devel gettext-devel libv4l-devel
BuildRequires:  intltool desktop-file-utils
Requires:       hicolor-icon-theme
Requires(pre):  GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description
A simple Gnome webcam viewer, with the ability to apply some video effects.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

# below is the desktop file and icon stuff.
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/devices
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/devices
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-webcam-16.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/devices/%{name}-webcam.png
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-webcam-24.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/devices/%{name}-webcam.png
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%pre
if [ "$1" -gt 1 ] ; then
  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
  gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
gconftool-2 --makefile-install-rule \
  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%preun
if [ "$1" -eq 0 ] ; then
  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
  gconftool-2 --makefile-uninstall-rule \
    %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%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 THANKS TODO
%{_sysconfdir}/gconf/schemas/camorama.schemas
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/camorama.desktop
%{_datadir}/icons/hicolor/*x*/devices/%{name}-webcam.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%changelog
* Fri Aug 28 2009 Hans de Goede <hdegoede at redhat.com> 0.19-2
- Don't install gconf files during build (#507830)
- Add comments describing the patches (#507830)

* Tue Jun 23 2009 Hans de Goede <hdegoede at redhat.com> 0.19-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/camorama/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	28 Aug 2009 14:41:07 -0000	1.1
+++ .cvsignore	31 Aug 2009 11:26:12 -0000	1.2
@@ -0,0 +1 @@
+camorama-0.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/camorama/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	28 Aug 2009 14:41:08 -0000	1.1
+++ sources	31 Aug 2009 11:26:12 -0000	1.2
@@ -0,0 +1 @@
+75025ba37d1dd1c398d92ba2dbef43ee  camorama-0.19.tar.bz2



From jreznik at fedoraproject.org  Mon Aug 31 11:46:58 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 31 Aug 2009 11:46:58 +0000 (UTC)
Subject: rpms/arora/devel arora-0.9.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.9.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 arora.spec, 1.18, 1.19 sources, 1.9,
	1.10 arora-0.6-fedorabookmarks.patch, 1.1,
	NONE arora-0.8.0-gitversion.patch, 1.1, NONE arora.xml, 1.1, NONE
Message-ID: <20090831114658.91A8411C0072@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7541

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.9.0-fedorabookmarks.patch arora-0.9.0-gitversion.patch 
Removed Files:
	arora-0.6-fedorabookmarks.patch arora-0.8.0-gitversion.patch 
	arora.xml 
Log Message:
* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
- Update to 0.9.0


arora-0.9.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   73 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 17 deletions(-)

--- NEW FILE arora-0.9.0-fedorabookmarks.patch ---
diff -up arora-0.9.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.9.0/src/data/defaultbookmarks.xbel
--- arora-0.9.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-08-30 16:22:25.000000000 +0200
+++ arora-0.9.0/src/data/defaultbookmarks.xbel	2009-08-31 10:25:59.913278829 +0200
@@ -9,28 +9,67 @@
         <bookmark href="http://webkit.org/">
             <title>WebKit.org</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/">
-            <title>Qt Documentation</title>
-        </bookmark>
-        <bookmark href="http://doc.trolltech.com/qq/">
-            <title>Qt Quarterly</title>
-        </bookmark>
-        <bookmark href="http://labs.trolltech.com/">
+        <folder folded="no">
             <title>Qt Labs</title>
-        </bookmark>
-        <bookmark href="http://www.qtcentre.org/">
-            <title>Qt Centre</title>
-        </bookmark>
-        <bookmark href="http://qt-apps.org/">
-            <title>Qt-Apps.org</title>
-        </bookmark>
-        <bookmark href="http://planetqt.org/">
-            <title>Planet Qt</title>
-        </bookmark>
+            <bookmark href="http://doc.trolltech.com/">
+                <title>Qt Documentation</title>
+            </bookmark>
+            <bookmark href="http://doc.trolltech.com/qq/">
+                <title>Qt Quarterly</title>
+            </bookmark>
+            <bookmark href="http://labs.trolltech.com/">
+                <title>Qt Labs</title>
+            </bookmark>
+            <bookmark href="http://www.qtcentre.org/">
+                <title>Qt Centre</title>
+            </bookmark>
+            <bookmark href="http://qt-apps.org/">
+                <title>Qt-Apps.org</title>
+            </bookmark>
+        </folder>
         <bookmark href="http://xkcd.com/">
             <title>xkcd</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>
         <bookmark href="http://reddit.com/">

arora-0.9.0-gitversion.patch:
 src.pri |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

--- NEW FILE arora-0.9.0-gitversion.patch ---
diff -up arora-0.9.0/src/src.pri.gitversion arora-0.9.0/src/src.pri
--- arora-0.9.0/src/src.pri.gitversion	2009-08-30 16:22:25.000000000 +0200
+++ arora-0.9.0/src/src.pri	2009-08-31 13:28:40.718195312 +0200
@@ -9,27 +9,8 @@ DEPENDPATH += $$PWD
 
 QT += webkit network
 
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-}
-!win32 {
-    exists($$PWD/../.git/HEAD) {
-        # Share object files for faster compiling
-        RCC_DIR     = $$PWD/.rcc
-        UI_DIR      = $$PWD/.ui
-        MOC_DIR     = $$PWD/.moc
-        OBJECTS_DIR = $$PWD/.obj
-
-        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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Jul 2009 16:11:59 -0000	1.9
+++ .cvsignore	31 Aug 2009 11:46:58 -0000	1.10
@@ -1 +1 @@
-arora-0.8.0.tar.gz
+arora-0.9.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- arora.spec	24 Jul 2009 17:07:07 -0000	1.18
+++ arora.spec	31 Aug 2009 11:46:58 -0000	1.19
@@ -1,14 +1,14 @@
 Name:           arora
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.9.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.8.0-gitversion.patch
-Patch1:         arora-0.6-fedorabookmarks.patch
+Patch0:         arora-0.9.0-gitversion.patch
+Patch1:         arora-0.9.0-fedorabookmarks.patch
 Patch2:         arora-0.8.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
+- Update to 0.9.0
+
 * 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/arora/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Jul 2009 16:11:59 -0000	1.9
+++ sources	31 Aug 2009 11:46:58 -0000	1.10
@@ -1 +1 @@
-f8c9a12cadbed8c85e8396db2ee62b8c  arora-0.8.0.tar.gz
+6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz


--- arora-0.6-fedorabookmarks.patch DELETED ---


--- arora-0.8.0-gitversion.patch DELETED ---


--- arora.xml DELETED ---



From alexlan at fedoraproject.org  Mon Aug 31 11:48:06 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 31 Aug 2009 11:48:06 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-20090607-vrml-build.patch, 1.1,
	1.2
Message-ID: <20090831114806.AC77C11C0072@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7843

Modified Files:
	octave-forge-20090607-vrml-build.patch 
Log Message:
Patch was missing r6030 from SVN which fixes install


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(-)

Index: octave-forge-20090607-vrml-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge-20090607-vrml-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- octave-forge-20090607-vrml-build.patch	31 Aug 2009 11:06:35 -0000	1.1
+++ octave-forge-20090607-vrml-build.patch	31 Aug 2009 11:48:06 -0000	1.2
@@ -20,3 +20,16 @@
    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);



From jreznik at fedoraproject.org  Mon Aug 31 11:53:20 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 31 Aug 2009 11:53:20 +0000 (UTC)
Subject: rpms/arora/F-11 arora-0.9.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.9.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 arora.spec, 1.13, 1.14 sources, 1.8,
	1.9 arora-0.6-fedorabookmarks.patch, 1.1,
	NONE arora-0.8.0-gitversion.patch, 1.1, NONE
Message-ID: <20090831115320.D610711C0072@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8913

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.9.0-fedorabookmarks.patch arora-0.9.0-gitversion.patch 
Removed Files:
	arora-0.6-fedorabookmarks.patch arora-0.8.0-gitversion.patch 
Log Message:
* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
- Update to 0.9.0

SPEC file in sync with devel


arora-0.9.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   73 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 17 deletions(-)

--- NEW FILE arora-0.9.0-fedorabookmarks.patch ---
diff -up arora-0.9.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.9.0/src/data/defaultbookmarks.xbel
--- arora-0.9.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-08-30 16:22:25.000000000 +0200
+++ arora-0.9.0/src/data/defaultbookmarks.xbel	2009-08-31 10:25:59.913278829 +0200
@@ -9,28 +9,67 @@
         <bookmark href="http://webkit.org/">
             <title>WebKit.org</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/">
-            <title>Qt Documentation</title>
-        </bookmark>
-        <bookmark href="http://doc.trolltech.com/qq/">
-            <title>Qt Quarterly</title>
-        </bookmark>
-        <bookmark href="http://labs.trolltech.com/">
+        <folder folded="no">
             <title>Qt Labs</title>
-        </bookmark>
-        <bookmark href="http://www.qtcentre.org/">
-            <title>Qt Centre</title>
-        </bookmark>
-        <bookmark href="http://qt-apps.org/">
-            <title>Qt-Apps.org</title>
-        </bookmark>
-        <bookmark href="http://planetqt.org/">
-            <title>Planet Qt</title>
-        </bookmark>
+            <bookmark href="http://doc.trolltech.com/">
+                <title>Qt Documentation</title>
+            </bookmark>
+            <bookmark href="http://doc.trolltech.com/qq/">
+                <title>Qt Quarterly</title>
+            </bookmark>
+            <bookmark href="http://labs.trolltech.com/">
+                <title>Qt Labs</title>
+            </bookmark>
+            <bookmark href="http://www.qtcentre.org/">
+                <title>Qt Centre</title>
+            </bookmark>
+            <bookmark href="http://qt-apps.org/">
+                <title>Qt-Apps.org</title>
+            </bookmark>
+        </folder>
         <bookmark href="http://xkcd.com/">
             <title>xkcd</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>
         <bookmark href="http://reddit.com/">

arora-0.9.0-gitversion.patch:
 src.pri |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

--- NEW FILE arora-0.9.0-gitversion.patch ---
diff -up arora-0.9.0/src/src.pri.gitversion arora-0.9.0/src/src.pri
--- arora-0.9.0/src/src.pri.gitversion	2009-08-30 16:22:25.000000000 +0200
+++ arora-0.9.0/src/src.pri	2009-08-31 13:28:40.718195312 +0200
@@ -9,27 +9,8 @@ DEPENDPATH += $$PWD
 
 QT += webkit network
 
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-}
-!win32 {
-    exists($$PWD/../.git/HEAD) {
-        # Share object files for faster compiling
-        RCC_DIR     = $$PWD/.rcc
-        UI_DIR      = $$PWD/.ui
-        MOC_DIR     = $$PWD/.moc
-        OBJECTS_DIR = $$PWD/.obj
-
-        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-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	22 Jul 2009 07:30:16 -0000	1.8
+++ .cvsignore	31 Aug 2009 11:53:20 -0000	1.9
@@ -1 +1 @@
-arora-0.8.0.tar.gz
+arora-0.9.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/arora.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- arora.spec	22 Jul 2009 07:30:17 -0000	1.13
+++ arora.spec	31 Aug 2009 11:53:20 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           arora
-Version:        0.8.0
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        A cross platform web browser
 
@@ -7,8 +7,8 @@ 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.8.0-gitversion.patch
-Patch1:         arora-0.6-fedorabookmarks.patch
+Patch0:         arora-0.9.0-gitversion.patch
+Patch1:         arora-0.9.0-fedorabookmarks.patch
 Patch2:         arora-0.8.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
+- Update to 0.9.0
+
+* 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
+
 * Tue Jul 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.0-1
 - Update to 0.8.0
 - Removed custom arora.xml
@@ -91,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 - Adds arora-gnome subpackage to support preferred app selection
   in Gnome
 
+* Mon Jun 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-1
+- Update to 0.7.1
+- Parallel build reenabled, fixed in 0.7.1
+
 * Mon May 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.0-1
 - Update to 0.7.0
 - Googlesuggest removed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	22 Jul 2009 07:30:17 -0000	1.8
+++ sources	31 Aug 2009 11:53:20 -0000	1.9
@@ -1 +1 @@
-f8c9a12cadbed8c85e8396db2ee62b8c  arora-0.8.0.tar.gz
+6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz


--- arora-0.6-fedorabookmarks.patch DELETED ---


--- arora-0.8.0-gitversion.patch DELETED ---



From caolanm at fedoraproject.org  Mon Aug 31 11:57:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 31 Aug 2009 11:57:44 +0000 (UTC)
Subject: rpms/libXtst/devel libXtst.spec,1.30,1.31
Message-ID: <20090831115744.6DB7311C0072@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libXtst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10570

Modified Files:
	libXtst.spec 
Log Message:
Resolves: rhbz#513753 libXtst-devel requires libXi-devel for includes


Index: libXtst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libXtst.spec	25 Aug 2009 07:41:55 -0000	1.30
+++ libXtst.spec	31 Aug 2009 11:57:44 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.99.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,6 +22,7 @@ X.Org X11 libXtst runtime library
 Summary: X.Org X11 libXtst development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: libXi-devel
 
 %description devel
 X.Org X11 libXtst development package
@@ -72,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/XTest*.3*
 
 %changelog
+* Mon Aug 31 2009 Caol?n McNamara <caolanm at redhat.com> 1.0.99.2-3
+- Resolves: rhbz#513753 libXtst-devel requires libXi-devel for 
+  included headers
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.2-2
 - libXtst provides record.h now
 



From jreznik at fedoraproject.org  Mon Aug 31 11:58:32 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 31 Aug 2009 11:58:32 +0000 (UTC)
Subject: rpms/arora/F-10 arora-0.9.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.9.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 arora.spec, 1.12, 1.13 sources, 1.8,
	1.9 arora-0.6-fedorabookmarks.patch, 1.1,
	NONE arora-0.8.0-gitversion.patch, 1.1, NONE
Message-ID: <20090831115832.2987911C0072@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/arora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10754

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.9.0-fedorabookmarks.patch arora-0.9.0-gitversion.patch 
Removed Files:
	arora-0.6-fedorabookmarks.patch arora-0.8.0-gitversion.patch 
Log Message:
* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
- Update to 0.9.0

SPEC in sync with devel


arora-0.9.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   73 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 17 deletions(-)

--- NEW FILE arora-0.9.0-fedorabookmarks.patch ---
diff -up arora-0.9.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.9.0/src/data/defaultbookmarks.xbel
--- arora-0.9.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-08-30 16:22:25.000000000 +0200
+++ arora-0.9.0/src/data/defaultbookmarks.xbel	2009-08-31 10:25:59.913278829 +0200
@@ -9,28 +9,67 @@
         <bookmark href="http://webkit.org/">
             <title>WebKit.org</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/">
-            <title>Qt Documentation</title>
-        </bookmark>
-        <bookmark href="http://doc.trolltech.com/qq/">
-            <title>Qt Quarterly</title>
-        </bookmark>
-        <bookmark href="http://labs.trolltech.com/">
+        <folder folded="no">
             <title>Qt Labs</title>
-        </bookmark>
-        <bookmark href="http://www.qtcentre.org/">
-            <title>Qt Centre</title>
-        </bookmark>
-        <bookmark href="http://qt-apps.org/">
-            <title>Qt-Apps.org</title>
-        </bookmark>
-        <bookmark href="http://planetqt.org/">
-            <title>Planet Qt</title>
-        </bookmark>
+            <bookmark href="http://doc.trolltech.com/">
+                <title>Qt Documentation</title>
+            </bookmark>
+            <bookmark href="http://doc.trolltech.com/qq/">
+                <title>Qt Quarterly</title>
+            </bookmark>
+            <bookmark href="http://labs.trolltech.com/">
+                <title>Qt Labs</title>
+            </bookmark>
+            <bookmark href="http://www.qtcentre.org/">
+                <title>Qt Centre</title>
+            </bookmark>
+            <bookmark href="http://qt-apps.org/">
+                <title>Qt-Apps.org</title>
+            </bookmark>
+        </folder>
         <bookmark href="http://xkcd.com/">
             <title>xkcd</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>
         <bookmark href="http://reddit.com/">

arora-0.9.0-gitversion.patch:
 src.pri |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

--- NEW FILE arora-0.9.0-gitversion.patch ---
diff -up arora-0.9.0/src/src.pri.gitversion arora-0.9.0/src/src.pri
--- arora-0.9.0/src/src.pri.gitversion	2009-08-30 16:22:25.000000000 +0200
+++ arora-0.9.0/src/src.pri	2009-08-31 13:28:40.718195312 +0200
@@ -9,27 +9,8 @@ DEPENDPATH += $$PWD
 
 QT += webkit network
 
-win32 {
-    DEFINES += GITVERSION=0
-    DEFINES += GITCHANGENUMBER=0
-}
-!win32 {
-    exists($$PWD/../.git/HEAD) {
-        # Share object files for faster compiling
-        RCC_DIR     = $$PWD/.rcc
-        UI_DIR      = $$PWD/.ui
-        MOC_DIR     = $$PWD/.moc
-        OBJECTS_DIR = $$PWD/.obj
-
-        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-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	22 Jul 2009 07:35:52 -0000	1.8
+++ .cvsignore	31 Aug 2009 11:58:31 -0000	1.9
@@ -1 +1 @@
-arora-0.8.0.tar.gz
+arora-0.9.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/arora.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- arora.spec	22 Jul 2009 07:35:53 -0000	1.12
+++ arora.spec	31 Aug 2009 11:58:32 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           arora
-Version:        0.8.0
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        A cross platform web browser
 
@@ -7,8 +7,8 @@ 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.8.0-gitversion.patch
-Patch1:         arora-0.6-fedorabookmarks.patch
+Patch0:         arora-0.9.0-gitversion.patch
+Patch1:         arora-0.9.0-fedorabookmarks.patch
 Patch2:         arora-0.8.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -80,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
+- Update to 0.9.0
+
+* 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
+
 * Tue Jul 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.8.0-1
 - Update to 0.8.0
 - Removed custom arora.xml
@@ -91,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 - Adds arora-gnome subpackage to support preferred app selection
   in Gnome
 
+* Mon Jun 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.1-1
+- Update to 0.7.1
+- Parallel build reenabled, fixed in 0.7.1
+
 * Mon May 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.7.0-1
 - Update to 0.7.0
 - Googlesuggest removed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	22 Jul 2009 07:35:53 -0000	1.8
+++ sources	31 Aug 2009 11:58:32 -0000	1.9
@@ -1 +1 @@
-f8c9a12cadbed8c85e8396db2ee62b8c  arora-0.8.0.tar.gz
+6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz


--- arora-0.6-fedorabookmarks.patch DELETED ---


--- arora-0.8.0-gitversion.patch DELETED ---



From karsten at fedoraproject.org  Mon Aug 31 11:59:49 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 31 Aug 2009 11:59:49 +0000 (UTC)
Subject: rpms/compat-gcc-34/devel compat-gcc-34.spec,1.17,1.18
Message-ID: <20090831115949.D998111C0072@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/compat-gcc-34/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11137

Modified Files:
	compat-gcc-34.spec 
Log Message:
- strip -march=z9-109 and -mtune=z10 from OPT_FLAGS on s390, s390x
  (#519507)



Index: compat-gcc-34.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-gcc-34/devel/compat-gcc-34.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- compat-gcc-34.spec	31 Jul 2009 16:26:09 -0000	1.17
+++ compat-gcc-34.spec	31 Aug 2009 11:59:49 -0000	1.18
@@ -16,7 +16,7 @@
 Summary: Compatibility GNU Compiler Collection
 Name: compat-gcc-34
 Version: 3.4.6
-Release: 17
+Release: 18
 # libgcc and crtstuff have an exception which allows
 # linking it into any kind of programs or shared libraries without
 # restrictions.
@@ -281,6 +281,9 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mt
 %ifarch sparc sparcv9 sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
 %endif
+%ifarch s390 s390x
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=z9-109//g;s/-mtune=z10//g'`
+%endif
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wall//g' -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fexceptions//g' -e 's/-fasynchronous-unwind-tables//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector//g' -e 's/--param=ssp-buffer-size=[0-9]*//g'`
@@ -674,6 +677,10 @@ fi
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Mon Aug 31 2009 Karsten Hopp <karsten at redhat.com> 3.4.6-18
+- strip -march=z9-109 and -mtune=z10 from OPT_FLAGS on s390, s390x
+  (#519507)
+
 * Fri Jul 31 2009 Jakub Jelinek  <jakub at redhat.com> 3.4.6-17
 - make sure to use system libgcc_s.so.1 instead of gcc34 one during
   testing



From transif at fedoraproject.org  Mon Aug 31 12:02:59 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 31 Aug 2009 12:02:59 +0000 (UTC)
Subject: comps/po nl.po,1.28,1.29
Message-ID: <20090831120259.C2F0711C0072@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11967/po

Modified Files:
	nl.po 
Log Message:
Sending translation for Dutch


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.28 -r 1.29 nl.poIndex: nl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nl.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nl.po	27 Aug 2009 15:25:08 -0000	1.28
+++ nl.po	31 Aug 2009 12:02:59 -0000	1.29
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 15:51-0400\n"
-"PO-Revision-Date: 2009-08-27 17:24+0200\n"
+"POT-Creation-Date: 2009-08-31 08:24+0000\n"
+"PO-Revision-Date: 2009-08-31 14:00+0200\n"
 "Last-Translator: Geert Warrink <geert.warrink at onsnet.nu>\n"
 "Language-Team: nl <nl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,280 +22,301 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "Een lichte werkomgeving die zeer geschikt is voor minder krachtige machines."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administratieve hulpmiddelen"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Ondersteuning voor Afrikaans"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Ondersteuning voor Albanees"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Toepassingen"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Toepassingen om diverse taken uit te voeren"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Ondersteuning voor Arabisch"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Ondersteuning voor Armeens"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Ondersteuning voor Assamees"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Schrijven en publiceren"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Basis"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Basissysteem"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Standaardondersteuning voor de programmeertaal Ruby."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Ondersteuning voor Baskisch"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Ondersteuning voor Belarussisch"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Ondersteuning voor Bengaals"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Ondersteuning voor Bhutanees"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Ondersteuning voor Bosnisch"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Ondersteuning voor Braziliaans-Portugees"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Ondersteuning voor Bretons"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Groep voor het bouwen van compileersystemen"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Ondersteuning voor Bulgaars"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Ondersteuning voor Catalaans"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "Ondersteuning voor Chinees"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
[...1914 lines suppressed...]
 "CAML programmeertaal en bibliotheken."
 
-#: ../comps-f11.xml.in.h:188
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "Ondersteuning voor Swahili"
 
-#: ../comps-f11.xml.in.h:196
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "Ondersteuning voor Tetum"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1449,23 +1564,86 @@ msgstr ""
 "Deze groep is een collectie van hulpmiddelen gebruikt voor het ontwerpen, "
 "wijzigen, manipuleren en samenstellen van lettertypen."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Ondersteuning voor Turkmeens"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Ondersteuning voor Oppersorbisch"
 
+#: ../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 ""
+"Een aantal pakketten die de Kritieke Pad functionaliteit aanbieden voor het "
+"GNOME bureaublad"
+
+#: ../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 ""
+"Een aantal pakketten die het gedeelde platform voor Kritieke Pad "
+"functionalteit aanbieden voor alle Fedora spins"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Boeken en gidsen"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Boeken en gidsen voor Fedora gebruikers en ontwikkelaars"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Kritieke Pad (basis)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Kritieke Pad (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Netwerkserver"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE is een lichtgewicht X11 bureaublad omgeving ontworpen voor computers "
+"met minder krachtige hardware zoals netbooks, draagbare apparaten en oudere "
+"computers."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Machine en gebruiker identiteit servers"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin bureaublad omgeving"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin is een bureaublad omgeving voor netbook/nettop/MID apparaten."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Toepassingen voor diverse taken"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Inbelnetwerkondersteuning"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1473,7 +1651,7 @@ msgstr ""
 "GNOME is een krachtige, grafische gebruikersinterface met onder andere een "
 "paneel, bureaublad, systeempictogrammen en een grafische bestandsbeheerder."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1481,7 +1659,7 @@ msgstr ""
 "KDE is een krachtige, grafische gebruikersinterface met onder andere een "
 "paneel, bureaublad, systeempictogrammen en een grafische bestandsbeheerder."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1489,11 +1667,11 @@ msgstr ""
 "Worden soms teksteditors genoemd, met behulp van deze programma's kunt u "
 "bestanden aanmaken en bewerken. Emacs en Vi zijn hierbij inbegrepen."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "De XEmacs teksteditor."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1501,46 +1679,44 @@ msgstr ""
 "Met deze hulpmiddelen kunt u documentatie aanmaken in het DocBook-formaat en "
 "deze omzetten naar HTML, PDF, Postscript en tekst."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "Deze groep is een collectie van netwerkservers voor specifieke doelen"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Arabische "
 "omgevingen."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Hebreeuwse "
 "omgevingen."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Japanse "
 "omgevingen."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Tsjechische "
 "omgevingen."
 
-#~ msgid "Perl Development"
-#~ msgstr "Perl ontwikkeling"
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
 
-#~ msgid "Support for developing programs in the Perl programming language."
-#~ msgstr ""
-#~ "Ondersteuning voor het ontwikkelen van programma's in de programmeertaal "
-#~ "Perl."
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "De Eclipse Integrated Development Environment."



From kwizart at fedoraproject.org  Mon Aug 31 12:15:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 12:15:31 +0000 (UTC)
Subject: rpms/directfb/devel sources, 1.13, 1.14 .cvsignore, 1.13,
	1.14 directfb.spec, 1.34, 1.35
Message-ID: <20090831121531.AB32F11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14460

Modified Files:
	sources .cvsignore directfb.spec 
Log Message:
Update to 1.4.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Jul 2009 22:59:24 -0000	1.13
+++ sources	31 Aug 2009 12:15:31 -0000	1.14
@@ -1 +1 @@
-e7df079ff44ec98187c24a00500e597a  DirectFB-1.4.1.tar.gz
+e4376c6c5b8e27d735edb7f62a7a8e86  DirectFB-1.4.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	15 Jul 2009 22:59:24 -0000	1.13
+++ .cvsignore	31 Aug 2009 12:15:31 -0000	1.14
@@ -1 +1 @@
-DirectFB-1.4.1.tar.gz
+DirectFB-1.4.2.tar.gz


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- directfb.spec	24 Jul 2009 20:18:25 -0000	1.34
+++ directfb.spec	31 Aug 2009 12:15:31 -0000	1.35
@@ -1,5 +1,5 @@
 %global major_ver 1.4
-%global minor_ver .1
+%global minor_ver .2
 
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
@@ -181,6 +181,9 @@ make check
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.4.2-1
+- Update to 1.4.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Mon Aug 31 12:17:09 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 12:17:09 +0000 (UTC)
Subject: rpms/directfb/devel directfb.spec,1.35,1.36
Message-ID: <20090831121709.5B3E311C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14875

Modified Files:
	directfb.spec 
Log Message:
Update tag in cl



Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- directfb.spec	31 Aug 2009 12:15:31 -0000	1.35
+++ directfb.spec	31 Aug 2009 12:17:09 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: %{major_ver}%{minor_ver}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -181,7 +181,7 @@ make check
 
 
 %changelog
-* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.4.2-1
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.4.2-2
 - Update to 1.4.2
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2



From kwizart at fedoraproject.org  Mon Aug 31 12:27:02 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 12:27:02 +0000 (UTC)
Subject: rpms/directfb/F-11 sources, 1.11, 1.12 .cvsignore, 1.10,
	1.11 directfb.spec, 1.29, 1.30
Message-ID: <20090831122702.3B86711C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16678

Modified Files:
	sources .cvsignore directfb.spec 
Log Message:
Update to 1.2.9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	22 Apr 2009 00:00:44 -0000	1.11
+++ sources	31 Aug 2009 12:27:01 -0000	1.12
@@ -1 +1 @@
-ac13d21682aa368df4e177ae5b51ad2d  DirectFB-1.2.8.tar.gz
+0ac81c7d9ea0099fc3cc066f9279410e  DirectFB-1.2.9.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Feb 2009 13:07:47 -0000	1.10
+++ .cvsignore	31 Aug 2009 12:27:02 -0000	1.11
@@ -1 +1 @@
-DirectFB-1.2.7.tar.gz
+DirectFB-1.2.9.tar.gz


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/directfb.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- directfb.spec	30 Jun 2009 07:47:03 -0000	1.29
+++ directfb.spec	31 Aug 2009 12:27:02 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
-Version: 1.2.8
-Release: 4%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -166,6 +166,9 @@ make check
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.2.9-1
+- Update to 1.2.9
+
 * Mon Jun 30 2009 kwizart < kwizart at gmail.com > - 1.2.8-4
 - Built with tslib
 



From kwizart at fedoraproject.org  Mon Aug 31 12:30:23 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 12:30:23 +0000 (UTC)
Subject: rpms/directfb/devel directfb.spec,1.36,1.37
Message-ID: <20090831123023.8BC5311C02CA@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17838

Modified Files:
	directfb.spec 
Log Message:
Add two binaries



Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- directfb.spec	31 Aug 2009 12:17:09 -0000	1.36
+++ directfb.spec	31 Aug 2009 12:30:23 -0000	1.37
@@ -4,7 +4,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: %{major_ver}%{minor_ver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -146,6 +146,7 @@ make check
 %{_bindir}/dfbtest_blit
 %{_bindir}/dfbtest_reinit
 %{_bindir}/dfbtest_scale
+%{_bindir}/dfbtest_sync
 %{_bindir}/dfbtest_window
 %{_bindir}/direct_stream
 %{_bindir}/direct_test
@@ -153,6 +154,7 @@ make check
 %{_bindir}/fusion_reactor
 %{_bindir}/fusion_skirmish
 %{_bindir}/fusion_stream
+%{_bindir}/pxa3xx_dump
 %{_libdir}/libdirectfb-*.so.*
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
@@ -181,8 +183,9 @@ make check
 
 
 %changelog
-* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.4.2-2
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.4.2-3
 - Update to 1.4.2
+- Add dfbtest_sync and pxa3xx_dump
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kwizart at fedoraproject.org  Mon Aug 31 12:31:15 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 12:31:15 +0000 (UTC)
Subject: rpms/directfb/devel directfb.spec,1.37,1.38
Message-ID: <20090831123115.12F0E11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18210

Modified Files:
	directfb.spec 
Log Message:
Update tag



Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- directfb.spec	31 Aug 2009 12:30:23 -0000	1.37
+++ directfb.spec	31 Aug 2009 12:31:14 -0000	1.38
@@ -4,7 +4,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: %{major_ver}%{minor_ver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/



From nhorman at fedoraproject.org  Mon Aug 31 12:33:01 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon, 31 Aug 2009 12:33:01 +0000 (UTC)
Subject: rpms/kexec-tools/F-11 firstboot_kdump.py, 1.1, 1.2 kexec-tools.spec,
	1.134, 1.135
Message-ID: <20090831123301.5AEC611C0072@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18650

Modified Files:
	firstboot_kdump.py kexec-tools.spec 
Log Message:
Resolves: bz508167


Index: firstboot_kdump.py
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/firstboot_kdump.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- firstboot_kdump.py	15 Dec 2006 21:05:01 -0000	1.1
+++ firstboot_kdump.py	31 Aug 2009 12:33:01 -0000	1.2
@@ -3,8 +3,8 @@
 # Copyright 2006 Red Hat, Inc.
 # Author: Jarod Wilson <jwilson at redhat.com>
 # Contributors:
-#     Neil Horman <nhorman at redhat.com>
-#     Dave Lehman <dlehman at redhat.com>
+#	 Neil Horman <nhorman at redhat.com>
+#	 Dave Lehman <dlehman at redhat.com>
 #
 #
 # This program is free software; you can redistribute it and/or modify
@@ -31,337 +31,346 @@ import os.path
 import time
 import gtk
 import gobject
-import functions
 import commands
 import rhpl.executil as executil
-from firstboot import start_process
+from firstboot.config import *
+from firstboot.constants import *
+from firstboot.functions import *
+from firstboot.module import *
 
 from rhpl.translate import _, N_
 from rhpl import translate
 translate.textdomain("firstboot")
 
-
-class childWindow:
-    # runPriority determines the order in which this module runs in firstboot
-    runPriority = 70
-    moduleName = _("Kdump")
-    windowName = moduleName
-    needsReboot = False
-
-    # possible bootloaders we'll need to adjust
-    #             bootloader : (config file, kdump offset)
-    bootloaders = { "grub"   : ("/boot/grub/grub.conf", 16),
-                    "yaboot" : ("/boot/etc/yaboot.conf", 32),
-                    "elilo"  : ("/boot/efi/EFI/redhat/elilo.conf", 256) }
-    bootloader = None
-    offset = 0
-
-    # list of architectures without kdump support
-    unsupportedArches = [ "ppc", "s390", "s390x", "i386", "i586" ]
-
-    # list of platforms that have a separate kernel-kdump
-    kernelKdumpArches = [ "ppc64" ]
-    kernelKdumpInstalled = False
-
-    # toggle sensitivity of kdump config bits
-    def showHide(self, status):
-        self.totalMem.set_sensitive(status)
-        self.kdumpMem.set_sensitive(status)
-        self.systemUsableMem.set_sensitive(status)
-        self.labelTotal.set_sensitive(status)
-        self.labelKdump.set_sensitive(status)
-        self.labelSys.set_sensitive(status)
-        self.kdumpEnabled = status
-
-    def on_enableKdumpCheck_toggled(self, *args):
-        showHideStatus = self.enableKdumpCheck.get_active()
-        self.showHide(showHideStatus)
-
-    def updateAvail(self, widget, spin):
-        self.remMem = self.availMem - spin.get_value_as_int()
-        self.systemUsableMem.set_text("%s" % self.remMem)
-
-    def getBootloader(self):
-        for (name, (conf, offset)) in self.bootloaders.items():
-            if os.access(conf, os.W_OK):
-                self.bootloader = name
-        return self.bootloader
-
-    def launch(self, doDebug = None):
-        self.doDebug = doDebug
-
-        if doDebug:
-            print "initializing kdump module"
-
-        # What kernel are we running?
-        self.runningKernel = os.popen("/bin/uname -r").read().strip()
-
-        # What arch are we running on?
-        self.arch = os.popen("/bin/uname -m").read().strip()
-
-        # Check for a xen kernel, kdump doesn't work w/xen just yet...
-        self.xenKernel = self.runningKernel.find("xen")
-
-        # Fedora or RHEL?
-        releaseFile = '/etc/redhat-release'
-        self.distro = 'rhel'
-        lines = open(releaseFile).readlines()
-        for line in lines:
-            if line.find("Fedora") != -1:
-                self.distro = 'fedora'
-                kernelKdumpArchesFC = [ "i686", "x86_64" ]
-                self.kernelKdumpArches.extend(kernelKdumpArchesFC)
-                break
-
-        # If we need kernel-kdump, check to see if its already installed
-        if self.arch in self.kernelKdumpArches:
-            self.kernelKdump = "/boot/vmlinux-%skdump" % self.runningKernel
-            if os.access(self.kernelKdump, os.R_OK):
-                self.kernelKdumpInstalled = True
-
-        # Ascertain how much memory is in the system
-        memInfo = open("/proc/meminfo").readlines()
-        self.availMem = 0
-        for line in memInfo:
-                if line.startswith("MemTotal:"):
-                    self.availMem = int(line.split()[1]) / 1024
-                    break
-
-        # Fix up memory calculations if kdump is already on
-        cmdLine = open("/proc/cmdline").read()
-        self.kdumpMem = 0
-        self.kdumpOffset = 0
-        self.origCrashKernel = ""
-	chkConfigStatus=commands.getoutput('/sbin/chkconfig --list kdump')
-        if chkConfigStatus.find("on") > -1:
-            self.kdumpEnabled = True
-	    self.kdumpMemInitial = 0
-	    if cmdLine.find("crashkernel") > -1:
-		    crashString = filter(lambda t: t.startswith("crashkernel="),
+class moduleClass(Module):
+	def __init__(self):
+		Module.__init__(self)
+		self.priority = 100
+		self.sidebarTitle = N_("Kdump")
+		self.title = N_("Kdump")
+
+	# runPriority determines the order in which this module runs in firstboot
+	runPriority = 70
+	moduleName = _("Kdump")
+	windowName = moduleName
+	needsReboot = False
+
+	# possible bootloaders we'll need to adjust
+	#			 bootloader : (config file, kdump offset)
+	bootloaders = { "grub"   : ("/boot/grub/grub.conf", 16),
+					"yaboot" : ("/boot/etc/yaboot.conf", 32),
+					"elilo"  : ("/boot/efi/EFI/redhat/elilo.conf", 256) }
+	bootloader = None
+	offset = 0
+
+	# list of architectures without kdump support
+	unsupportedArches = [ "ppc", "s390", "s390x", "i386", "i586" ]
+
+	# list of platforms that have a separate kernel-kdump
+	kernelKdumpArches = [ "ppc64" ]
+	kernelKdumpInstalled = False
+
+	# toggle sensitivity of kdump config bits
+	def showHide(self, status):
+		self.totalMem.set_sensitive(status)
+		self.kdumpMem.set_sensitive(status)
+		self.systemUsableMem.set_sensitive(status)
+		self.labelTotal.set_sensitive(status)
+		self.labelKdump.set_sensitive(status)
+		self.labelSys.set_sensitive(status)
+		self.kdumpEnabled = status
+
+	def on_enableKdumpCheck_toggled(self, *args):
+		showHideStatus = self.enableKdumpCheck.get_active()
+		self.showHide(showHideStatus)
+
+	def updateAvail(self, widget, spin):
+		self.remMem = self.availMem - spin.get_value_as_int()
+		self.systemUsableMem.set_text("%s" % self.remMem)
+
+	def getBootloader(self):
+		for (name, (conf, offset)) in self.bootloaders.items():
+			if os.access(conf, os.W_OK):
+				self.bootloader = name
+		return self.bootloader
+
+	def createScreen(self, doDebug = None):
+		self.doDebug = doDebug
+
+		if doDebug:
+			print "initializing kdump module"
+
+		# What kernel are we running?
+		self.runningKernel = os.popen("/bin/uname -r").read().strip()
+
+		# What arch are we running on?
+		self.arch = os.popen("/bin/uname -m").read().strip()
+
+		# Check for a xen kernel, kdump doesn't work w/xen just yet...
+		self.xenKernel = self.runningKernel.find("xen")
+
+		# Fedora or RHEL?
+		releaseFile = '/etc/redhat-release'
+		self.distro = 'rhel'
+		lines = open(releaseFile).readlines()
+		for line in lines:
+			if line.find("Fedora") != -1:
+				self.distro = 'fedora'
+				kernelKdumpArchesFC = [ "i686", "x86_64" ]
+				self.kernelKdumpArches.extend(kernelKdumpArchesFC)
+				break
+
+		# If we need kernel-kdump, check to see if its already installed
+		if self.arch in self.kernelKdumpArches:
+			self.kernelKdump = "/boot/vmlinux-%skdump" % self.runningKernel
+			if os.access(self.kernelKdump, os.R_OK):
+				self.kernelKdumpInstalled = True
+
+		# Ascertain how much memory is in the system
+		memInfo = open("/proc/meminfo").readlines()
+		self.availMem = 0
+		for line in memInfo:
+				if line.startswith("MemTotal:"):
+					self.availMem = int(line.split()[1]) / 1024
+					break
+
+		# Fix up memory calculations if kdump is already on
+		cmdLine = open("/proc/cmdline").read()
+		self.kdumpMem = 0
+		self.kdumpOffset = 0
+		self.origCrashKernel = ""
+		chkConfigStatus=commands.getoutput('/sbin/chkconfig --list kdump')
+		if chkConfigStatus.find("on") > -1:
+			self.kdumpEnabled = True
+		self.kdumpMemInitial = 0
+		if cmdLine.find("crashkernel") > -1:
+			crashString = filter(lambda t: t.startswith("crashkernel="),
 					 cmdLine.split())[0].split("=")[1]
-		    if self.doDebug:
-			print "crashString is %s" % crashString
-		    (self.kdumpMem, self.kdumpOffset) = [int(m[:-1]) for m in crashString.split("@")]
-		    self.availMem += self.kdumpMem
-		    self.origCrashKernel = "%dM@%dM" % (self.kdumpMem, self.kdumpOffset)
-		    self.kdumpMemInitial = self.kdumpMem
-        else:
-            self.kdumpEnabled = False
-            self.kdumpMemInitial = 0
-        self.initialState = self.kdumpEnabled
-
-        # Do some sanity-checking and try to present only sane options.
-        #
-        # Defaults
-        lowerBound = 128
-        minUsable = 256
-        step = 64
-        self.enoughMem = True
-        if self.arch == 'ia64':
-            # ia64 usually needs at *least* 256M, page-aligned... :(
-            lowerBound = 256
-            minUsable = 512
-            step = 256
-        elif self.arch == 'ppc64':
-            # ppc64 often fails w/128M lately, and we want at least 1G
-            # of RAM for normal use, due to 64k page size... :\
-            lowerBound = 256
-            minUsable = 1024
-
-        upperBound = (self.availMem - minUsable) - (self.availMem % step)
-
-        if upperBound < lowerBound:
-            self.enoughMem = False
-
-        # Set spinner to lowerBound unless already set on kernel command line
-        if self.kdumpMem == 0:
-            self.kdumpMem = lowerBound
-        else:
-            # round down to a multiple of step value
-            self.kdumpMem = self.kdumpMem - (self.kdumpMem % step)
-
-        # kdump enable/disable checkbox
-        self.enableKdumpCheck = gtk.CheckButton("Enable kdump?")
-        self.enableKdumpCheck.set_alignment(xalign=0, yalign=0)
-
-        # detected total amount of system memory
-        self.totalMem = gtk.Label(_("%s" % self.availMem))
-        self.labelTotal = gtk.Label(_("_Total System Memory (MB):"))
-        self.labelTotal.set_use_underline(True)
-        self.labelTotal.set_mnemonic_widget(self.totalMem)
-        self.labelTotal.set_alignment(0.0, 0.5)
-        self.labelTotal.set_width_chars(32)
-
-        # how much ram to reserve for kdump
-        self.memSpin = gtk.Adjustment(self.kdumpMem, lowerBound, upperBound, step, step, 64)
-        self.kdumpMem = gtk.SpinButton(self.memSpin, 0, 0)
-        self.kdumpMem.set_update_policy(gtk.UPDATE_IF_VALID)
-        self.kdumpMem.set_numeric(True)
-        self.memSpin.connect("value_changed", self.updateAvail, self.kdumpMem)
-        self.labelKdump = gtk.Label(_("_Kdump Memory (MB):"))
-        self.labelKdump.set_use_underline(True)
-        self.labelKdump.set_mnemonic_widget(self.kdumpMem)
-        self.labelKdump.set_alignment(0.0, 0.5)
-
-        # remaining usable system memory
-        self.resMem = eval(string.strip(self.kdumpMem.get_text()))
-        self.remMem = self.availMem - self.resMem
-        self.systemUsableMem = gtk.Label(_("%s" % self.remMem))
-        self.labelSys = gtk.Label(_("_Usable System Memory (MB):"))
-        self.labelSys.set_use_underline(True)
-        self.labelSys.set_mnemonic_widget(self.systemUsableMem)
-        self.labelSys.set_alignment(0.0, 0.5)
-        
-        self.vbox = gtk.VBox()
-        self.vbox.set_size_request(400, 200)
-
-        title_pix = functions.imageFromFile("workstation.png")
-
-        internalVBox = gtk.VBox()
-        internalVBox.set_border_width(10)
-        internalVBox.set_spacing(10)
-
-        label = gtk.Label(_("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 determining the cause of the crash. "
-                            "Note that kdump does require reserving a portion of system "
-                            "memory that will be unavailable for other uses."))
-
-        label.set_line_wrap(True)
-        label.set_alignment(0.0, 0.5)
-        label.set_size_request(500, -1)
-        internalVBox.pack_start(label, False, True)
-
-        table = gtk.Table(2, 4)
-
-        table.attach(self.enableKdumpCheck, 0, 2, 0, 1, gtk.FILL, gtk.FILL, 5, 5)
-
-        table.attach(self.labelTotal, 0, 1, 1, 2, gtk.FILL)
-        table.attach(self.totalMem, 1, 2, 1, 2, gtk.SHRINK, gtk.FILL, 5, 5)
-
-        table.attach(self.labelKdump, 0, 1, 2, 3, gtk.FILL)
-        table.attach(self.kdumpMem, 1, 2, 2, 3, gtk.SHRINK, gtk.FILL, 5, 5)
-
-        table.attach(self.labelSys, 0, 1, 3, 4, gtk.FILL)
-        table.attach(self.systemUsableMem, 1, 2, 3, 4, gtk.SHRINK, gtk.FILL, 5, 5)
-
-        # disable until user clicks check box, if not already enabled
-        if self.initialState is False:
-            self.showHide(False)
-        else:
-            self.enableKdumpCheck.set_active(True)
-
-        internalVBox.pack_start(table, True, 15)
-
-        # toggle sensitivity of Mem items
-        self.enableKdumpCheck.connect("toggled", self.on_enableKdumpCheck_toggled)
-
-        self.vbox.pack_start(internalVBox, False, 15)
-
-        return self.vbox, title_pix, self.moduleName
-
-    def grabFocus(self):
-        self.enableKdumpCheck.grab_focus()
-
-    def apply(self, *args):
-        if self.kdumpEnabled:
-            totalSysMem = self.totalMem.get_text()
-            totalSysMem = eval(string.strip(totalSysMem))
-            reservedMem = self.kdumpMem.get_value_as_int()
-            remainingMem = totalSysMem - reservedMem
-        else:
-            reservedMem = self.kdumpMemInitial
-
-        if self.doDebug:
-            print "Running kernel %s on %s architecture" % (self.runningKernel, self.arch)
-            if self.enableKdumpCheck.get_active():
-                print "System Mem: %s MB    Kdump Mem: %s MB    Avail Mem: %s MB" % (totalSysMem, reservedMem, remainingMem)
-            else:
-                print "Kdump will be disabled"
-
-        # If the user simply doesn't have enough memory for kdump to be viable/supportable, tell 'em
-        if self.enoughMem is False and self.kdumpEnabled:
-            self.showErrorMessage(_("Sorry, your system does not have enough memory for kdump to be viable!"))
-            self.enableKdumpCheck.set_active(False)
-            self.showHide(False)
-            return 0
-        # Alert user that we're not going to turn on kdump if they're running a xen kernel
-        elif self.xenKernel != -1 and self.kdumpEnabled:
-            self.showErrorMessage(_("Sorry, Xen kernels do not support kdump at this time!"))
-            self.enableKdumpCheck.set_active(False)
-            self.showHide(False)
-            return 0
-        # If there's no kdump support on this arch, let the user know and don't configure
-        elif self.arch in self.unsupportedArches:
-            self.showErrorMessage(_("Sorry, the %s architecture does not support kdump at this time!" % self.arch))
-            self.enableKdumpCheck.set_active(False)
-            self.showHide(False)
-            return 0
-
-        # If running on an arch w/a separate kernel-kdump (i.e., non-relocatable kernel), check to
-        # see that its installed, otherwise, alert the user they need to install it, and give them
-        # the chance to abort configuration.
-        if self.arch in self.kernelKdumpArches and self.kernelKdumpInstalled is False:
-            kernelKdumpNote = "\n\nNote that the %s architecture does not feature a relocatable kernel at this time, and thus requires a separate kernel-kdump package to be installed for kdump to function. This can be installed via 'yum install kernel-kdump' at your convenience.\n\n" % self.arch
-        else:
-            kernelKdumpNote = ""
-
-        # Don't alert if nothing has changed
-        if self.initialState != self.kdumpEnabled or reservedMem != self.kdumpMemInitial:
-            dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
-                                    gtk.BUTTONS_YES_NO,
-                                    _("Changing Kdump settings requires rebooting the "
-                                      "system to reallocate memory accordingly. %sWould you "
-                                      "like to continue with this change and reboot the "
-                                      "system after firstboot is complete?" % kernelKdumpNote))
-            dlg.set_position(gtk.WIN_POS_CENTER)
-            dlg.show_all()
-            rc = dlg.run()
-            dlg.destroy()
-
-            if rc == gtk.RESPONSE_NO:
-                self.needsReboot = False
-                return None
-            else:
-                self.needsReboot = True
-
-                # Find bootloader if it exists, and update accordingly
-                if self.getBootloader() == None:
-                    self.showErrorMessage(_("Error! No bootloader config file found, aborting configuration!"))
-                    self.enableKdumpCheck.set_active(False)
-                    self.showHide(False)
-                    return 0
-                else:
-                    self.offset = self.bootloaders[self.bootloader][1]
-
-                # Are we adding or removing the crashkernel param?
-                if self.kdumpEnabled:
-                    grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --args=crashkernel=%iM@%iM" \
-                                % (self.bootloader, self.runningKernel, reservedMem, self.offset)
-                    chkconfigStatus = "on"
-                else:
-                    grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --remove-args=crashkernel=%s" \
-                                % (self.bootloader, self.runningKernel, self.origCrashKernel)
-                    chkconfigStatus = "off" 
-
-                if self.doDebug:
-                    print "Using %s bootloader with %iM offset" % (self.bootloader, self.offset)
-                    print "Grubby command would be:\n    %s" % grubbyCmd
-                else:
-                    os.system(grubbyCmd)
-                    os.system("/sbin/chkconfig kdump %s" % chkconfigStatus)
-                    if self.bootloader == 'yaboot':
-                        os.system('/sbin/ybin')
-        else:
-            self.needsReboot = False
-
-
-        return 0
-
-    def showErrorMessage(self, text):
-        dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text)
-        dlg.set_position(gtk.WIN_POS_CENTER)
-        dlg.set_modal(True)
-        rc = dlg.run()
-        dlg.destroy()
-        return None
+			if self.doDebug:
+				print "crashString is %s" % crashString
+			(self.kdumpMem, self.kdumpOffset) = [int(m[:-1]) for m in crashString.split("@")]
+			self.availMem += self.kdumpMem
+			self.origCrashKernel = "%dM@%dM" % (self.kdumpMem, self.kdumpOffset)
+			self.kdumpMemInitial = self.kdumpMem
+		else:
+			self.kdumpEnabled = False
+			self.kdumpMemInitial = 0
+		self.initialState = self.kdumpEnabled
+
+		# Do some sanity-checking and try to present only sane options.
+		#
+		# Defaults
+		lowerBound = 128
+		minUsable = 256
+		step = 64
+		self.enoughMem = True
+		if self.arch == 'ia64':
+			# ia64 usually needs at *least* 256M, page-aligned... :(
+			lowerBound = 256
+			minUsable = 512
+			step = 256
+		elif self.arch == 'ppc64':
+			# ppc64 often fails w/128M lately, and we want at least 1G
+			# of RAM for normal use, due to 64k page size... :\
+			lowerBound = 256
+			minUsable = 1024
+
+		upperBound = (self.availMem - minUsable) - (self.availMem % step)
+
+		if upperBound < lowerBound:
+			self.enoughMem = False
+
+		# Set spinner to lowerBound unless already set on kernel command line
+		if self.kdumpMem == 0:
+			self.kdumpMem = lowerBound
+		else:
+			# round down to a multiple of step value
+			self.kdumpMem = self.kdumpMem - (self.kdumpMem % step)
+
+		# kdump enable/disable checkbox
+		self.enableKdumpCheck = gtk.CheckButton("Enable kdump?")
+		self.enableKdumpCheck.set_alignment(xalign=0, yalign=0)
+
+		# detected total amount of system memory
+		self.totalMem = gtk.Label(_("%s" % self.availMem))
+		self.labelTotal = gtk.Label(_("_Total System Memory (MB):"))
+		self.labelTotal.set_use_underline(True)
+		self.labelTotal.set_mnemonic_widget(self.totalMem)
+		self.labelTotal.set_alignment(0.0, 0.5)
+		self.labelTotal.set_width_chars(32)
+
+		# how much ram to reserve for kdump
+		self.memSpin = gtk.Adjustment(self.kdumpMem, lowerBound, upperBound, step, step, 64)
+		self.kdumpMem = gtk.SpinButton(self.memSpin, 0, 0)
+		self.kdumpMem.set_update_policy(gtk.UPDATE_IF_VALID)
+		self.kdumpMem.set_numeric(True)
+		self.memSpin.connect("value_changed", self.updateAvail, self.kdumpMem)
+		self.labelKdump = gtk.Label(_("_Kdump Memory (MB):"))
+		self.labelKdump.set_use_underline(True)
+		self.labelKdump.set_mnemonic_widget(self.kdumpMem)
+		self.labelKdump.set_alignment(0.0, 0.5)
+
+		# remaining usable system memory
+		self.resMem = eval(string.strip(self.kdumpMem.get_text()))
+		self.remMem = self.availMem - self.resMem
+		self.systemUsableMem = gtk.Label(_("%s" % self.remMem))
+		self.labelSys = gtk.Label(_("_Usable System Memory (MB):"))
+		self.labelSys.set_use_underline(True)
+		self.labelSys.set_mnemonic_widget(self.systemUsableMem)
+		self.labelSys.set_alignment(0.0, 0.5)
+		
+		self.vbox = gtk.VBox()
+		self.vbox.set_size_request(400, 200)
+
+		# title_pix = loadPixbuf("workstation.png")
+
+		internalVBox = gtk.VBox()
+		internalVBox.set_border_width(10)
+		internalVBox.set_spacing(10)
+
+		label = gtk.Label(_("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 determining the cause of the crash. "
+							"Note that kdump does require reserving a portion of system "
+							"memory that will be unavailable for other uses."))
+
+		label.set_line_wrap(True)
+		label.set_alignment(0.0, 0.5)
+		label.set_size_request(500, -1)
+		internalVBox.pack_start(label, False, True)
+
+		table = gtk.Table(2, 4)
+
+		table.attach(self.enableKdumpCheck, 0, 2, 0, 1, gtk.FILL, gtk.FILL, 5, 5)
+
+		table.attach(self.labelTotal, 0, 1, 1, 2, gtk.FILL)
+		table.attach(self.totalMem, 1, 2, 1, 2, gtk.SHRINK, gtk.FILL, 5, 5)
+
+		table.attach(self.labelKdump, 0, 1, 2, 3, gtk.FILL)
+		table.attach(self.kdumpMem, 1, 2, 2, 3, gtk.SHRINK, gtk.FILL, 5, 5)
+
+		table.attach(self.labelSys, 0, 1, 3, 4, gtk.FILL)
+		table.attach(self.systemUsableMem, 1, 2, 3, 4, gtk.SHRINK, gtk.FILL, 5, 5)
+
+		# disable until user clicks check box, if not already enabled
+		if self.initialState is False:
+			self.showHide(False)
+		else:
+			self.enableKdumpCheck.set_active(True)
+
+		internalVBox.pack_start(table, True, 15)
+
+		# toggle sensitivity of Mem items
+		self.enableKdumpCheck.connect("toggled", self.on_enableKdumpCheck_toggled)
+
+		self.vbox.pack_start(internalVBox, False, 15)
+
+	def grabFocus(self):
+		self.enableKdumpCheck.grab_focus()
+
+	def apply(self, *args):
+		if self.kdumpEnabled:
+			totalSysMem = self.totalMem.get_text()
+			totalSysMem = eval(string.strip(totalSysMem))
+			reservedMem = self.kdumpMem.get_value_as_int()
+			remainingMem = totalSysMem - reservedMem
+		else:
+			reservedMem = self.kdumpMemInitial
+
+		if self.doDebug:
+			print "Running kernel %s on %s architecture" % (self.runningKernel, self.arch)
+			if self.enableKdumpCheck.get_active():
+				print "System Mem: %s MB	Kdump Mem: %s MB	Avail Mem: %s MB" % (totalSysMem, reservedMem, remainingMem)
+			else:
+				print "Kdump will be disabled"
+
+		# If the user simply doesn't have enough memory for kdump to be viable/supportable, tell 'em
+		if self.enoughMem is False and self.kdumpEnabled:
+			self.showErrorMessage(_("Sorry, your system does not have enough memory for kdump to be viable!"))
+			self.enableKdumpCheck.set_active(False)
+			self.showHide(False)
+			return RESULT_FAILURE 
+		# Alert user that we're not going to turn on kdump if they're running a xen kernel
+		elif self.xenKernel != -1 and self.kdumpEnabled:
+			self.showErrorMessage(_("Sorry, Xen kernels do not support kdump at this time!"))
+			self.enableKdumpCheck.set_active(False)
+			self.showHide(False)
+			return RESULT_FAILURE 
+		# If there's no kdump support on this arch, let the user know and don't configure
+		elif self.arch in self.unsupportedArches:
+			self.showErrorMessage(_("Sorry, the %s architecture does not support kdump at this time!" % self.arch))
+			self.enableKdumpCheck.set_active(False)
+			self.showHide(False)
+			return RESULT_FAILURE 
+
+		# If running on an arch w/a separate kernel-kdump (i.e., non-relocatable kernel), check to
+		# see that its installed, otherwise, alert the user they need to install it, and give them
+		# the chance to abort configuration.
+		if self.arch in self.kernelKdumpArches and self.kernelKdumpInstalled is False:
+			kernelKdumpNote = "\n\nNote that the %s architecture does not feature a relocatable kernel at this time, and thus requires a separate kernel-kdump package to be installed for kdump to function. This can be installed via 'yum install kernel-kdump' at your convenience.\n\n" % self.arch
+		else:
+			kernelKdumpNote = ""
+
+		# Don't alert if nothing has changed
+		if self.initialState != self.kdumpEnabled or reservedMem != self.kdumpMemInitial:
+			dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
+									gtk.BUTTONS_YES_NO,
+									_("Changing Kdump settings requires rebooting the "
+									  "system to reallocate memory accordingly. %sWould you "
+									  "like to continue with this change and reboot the "
+									  "system after firstboot is complete?" % kernelKdumpNote))
+			dlg.set_position(gtk.WIN_POS_CENTER)
+			dlg.show_all()
+			rc = dlg.run()
+			dlg.destroy()
+
+			if rc == gtk.RESPONSE_NO:
+				self.needsReboot = False
+				return RESULT_SUCCESS 
+			else:
+				self.needsReboot = True
+
+				# Find bootloader if it exists, and update accordingly
+				if self.getBootloader() == None:
+					self.showErrorMessage(_("Error! No bootloader config file found, aborting configuration!"))
+					self.enableKdumpCheck.set_active(False)
+					self.showHide(False)
+					return RESULT_FAILURE 
+				else:
+					self.offset = self.bootloaders[self.bootloader][1]
+
+				# Are we adding or removing the crashkernel param?
+				if self.kdumpEnabled:
+					grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --args=crashkernel=%iM@%iM" \
+								% (self.bootloader, self.runningKernel, reservedMem, self.offset)
+					chkconfigStatus = "on"
+				else:
+					grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --remove-args=crashkernel=%s" \
+								% (self.bootloader, self.runningKernel, self.origCrashKernel)
+					chkconfigStatus = "off" 
+
+				if self.doDebug:
+					print "Using %s bootloader with %iM offset" % (self.bootloader, self.offset)
+					print "Grubby command would be:\n	%s" % grubbyCmd
+				else:
+					os.system(grubbyCmd)
+					os.system("/sbin/chkconfig kdump %s" % chkconfigStatus)
+					if self.bootloader == 'yaboot':
+						os.system('/sbin/ybin')
+		else:
+			self.needsReboot = False
+
+
+		return RESULT_SUCCESS
+
+	def showErrorMessage(self, text):
+		dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text)
+		dlg.set_position(gtk.WIN_POS_CENTER)
+		dlg.set_modal(True)
+		rc = dlg.run()
+		dlg.destroy()
+		return None
+
+	def initializeUI(self):
+		pass
+


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-11/kexec-tools.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kexec-tools.spec	27 Aug 2009 19:58:57 -0000	1.134
+++ kexec-tools.spec	31 Aug 2009 12:33:01 -0000	1.135
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -243,6 +243,9 @@ done
 
 
 %changelog
+* Mon Aug 31 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-14
+- Update firstboot so it works properly (bz 508167)
+
 * Thu Aug 27 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-13
 - Fixed raid6 detection in mkdumprd (bz 519767)
 



From jgranado at fedoraproject.org  Mon Aug 31 12:34:18 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Mon, 31 Aug 2009 12:34:18 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-commit-without-close.patch, NONE,
	1.1 parted-1.9.0-dont-touch-part-nodes.patch, NONE,
	1.1 parted-1.9.0-no-BLKPG.patch, NONE, 1.1 parted.spec, 1.147, 1.148
Message-ID: <20090831123418.3AFF811C0072@cvs1.fedora.phx.redhat.com>

Author: jgranado

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19013

Modified Files:
	parted.spec 
Added Files:
	parted-1.9.0-commit-without-close.patch 
	parted-1.9.0-dont-touch-part-nodes.patch 
	parted-1.9.0-no-BLKPG.patch 
Log Message:
Patches for the 'commit to os' function in linux.


parted-1.9.0-commit-without-close.patch:
 disk.c |   21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

--- NEW FILE parted-1.9.0-commit-without-close.patch ---
>From 50898ea17a25c92c3b0ab3c0f12ea867a6ff1ff9 Mon Sep 17 00:00:00 2001
From: Joel Granados Moreno <jgranado at redhat.com>
Date: Mon, 31 Aug 2009 13:42:47 +0200
Subject: [PATCH 2/3] Commit without close

---
 libparted/disk.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/libparted/disk.c b/libparted/disk.c
index 27611eb..b01ac70 100644
--- a/libparted/disk.c
+++ b/libparted/disk.c
@@ -513,9 +513,25 @@ error:
 int
 ped_disk_commit (PedDisk* disk)
 {
+        /* Open the device here, so that the underlying fd is not closed
+           between commit_to_dev and commit_to_os (closing causes unwanted
+           udev events to be send under Linux). */
+	if (!ped_device_open (disk->dev))
+		goto error;
+
 	if (!ped_disk_commit_to_dev (disk))
-		return 0;
-	return ped_disk_commit_to_os (disk);
+	        goto error_close_dev;
+
+	if (!ped_disk_commit_to_os (disk))
+	        goto error_close_dev;
+
+	ped_device_close (disk->dev);
+	return 1;
+
+error_close_dev:
+	ped_device_close (disk->dev);
+error:
+	return 0;
 }
 
 /**
-- 
1.6.4


parted-1.9.0-dont-touch-part-nodes.patch:
 linux.c |   48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

--- NEW FILE parted-1.9.0-dont-touch-part-nodes.patch ---
>From a8dc525bdab612551a5859b8a8bd2b944a259766 Mon Sep 17 00:00:00 2001
From: Joel Granados Moreno <jgranado at redhat.com>
Date: Mon, 31 Aug 2009 13:44:02 +0200
Subject: [PATCH 3/3] Dont touch part nodes

---
 libparted/arch/linux.c |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index e47030f..1d4fc7e 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -586,6 +586,19 @@ _get_linux_version ()
         return kver = KERNEL_VERSION (major, minor, teeny);
 }
 
+static int
+_have_kern26 ()
+{
+        static int have_kern26 = -1;
+        int kver;
+
+        if (have_kern26 != -1)
+                return have_kern26;
+
+        kver = _get_linux_version();
+        return have_kern26 = kver >= KERNEL_VERSION (2,6,0) ? 1 : 0;
+}
+  
 static void
 _device_set_sector_size (PedDevice* dev)
 {
@@ -1354,8 +1367,8 @@ linux_is_busy (PedDevice* dev)
         return 0;
 }
 
-/* we need to flush the master device, and all the partition devices,
- * because there is no coherency between the caches.
+/* we need to flush the master device, and with kernel < 2.6 all the partition
+ * devices, because there is no coherency between the caches with old kernels.
  * We should only flush unmounted partition devices, because:
  *  - there is never a need to flush them (we're not doing IO there)
  *  - flushing a device that is mounted causes unnecessary IO, and can
@@ -1373,21 +1386,23 @@ _flush_cache (PedDevice* dev)
 
         ioctl (arch_specific->fd, BLKFLSBUF);
 
-        for (i = 1; i < 16; i++) {
-                char*           name;
-                int             fd;
+        if (!_have_kern26()) {
+                for (i = 1; i < 16; i++) {
+                        char*           name;
+                        int             fd;
 
-                name = _device_get_part_path (dev, i);
-                if (!name)
-                        break;
-                if (!_partition_is_mounted_by_path (name)) {
-                        fd = open (name, WR_MODE, 0);
-                        if (fd > 0) {
-                                ioctl (fd, BLKFLSBUF);
-                                close (fd);
+                        name = _device_get_part_path (dev, i);
+                        if (!name)
+                                break;
+                        if (!_partition_is_mounted_by_path (name)) {
+                                fd = open (name, WR_MODE, 0);
+                                if (fd > 0) {
+                                        ioctl (fd, BLKFLSBUF);
+                                        close (fd);
+                                }
                         }
+                        free (name);
                 }
-                free (name);
         }
 }
 
@@ -1428,7 +1443,9 @@ retry:
                 dev->read_only = 0;
         }
 
-        _flush_cache (dev);
+        /* With kernels < 2.6 flush cache for cache coherence issues */
+        if (!_have_kern26())
+                _flush_cache (dev);
 
         return 1;
 }
-- 
1.6.4


parted-1.9.0-no-BLKPG.patch:
 linux.c |  214 ----------------------------------------------------------------
 1 file changed, 214 deletions(-)

--- NEW FILE parted-1.9.0-no-BLKPG.patch ---
>From ead3330dfadfcb2bd53a136916d4087cc725ef42 Mon Sep 17 00:00:00 2001
From: Joel Granados Moreno <jgranado at redhat.com>
Date: Mon, 31 Aug 2009 13:41:06 +0200
Subject: [PATCH 1/3] No BLKPG

---
 libparted/arch/linux.c |  213 ------------------------------------------------
 1 files changed, 0 insertions(+), 213 deletions(-)

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 8f220e0..e47030f 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -41,7 +41,6 @@
 #include <libdevmapper.h>
 #endif
 
-#include "blkpg.h"
 #include "../architecture.h"
 #include "dirname.h"
 
@@ -587,22 +586,6 @@ _get_linux_version ()
         return kver = KERNEL_VERSION (major, minor, teeny);
 }
 
-static int
-_have_devfs ()
-{
-        static int have_devfs = -1;
-        struct stat sb;
-
-        if (have_devfs != -1)
-                return have_devfs;
-
-        /* the presence of /dev/.devfsd implies that DevFS is active */
-        if (stat("/dev/.devfsd", &sb) < 0)
-                return have_devfs = 0;
-
-        return have_devfs = S_ISCHR(sb.st_mode) ? 1 : 0;
-}
-
 static void
 _device_set_sector_size (PedDevice* dev)
 {
@@ -2189,176 +2172,6 @@ linux_partition_is_busy (const PedPartition* part)
         return 0;
 }
 
-static int
-_blkpg_part_command (PedDevice* dev, struct blkpg_partition* part, int op)
-{
-        LinuxSpecific*          arch_specific = LINUX_SPECIFIC (dev);
-        struct blkpg_ioctl_arg  ioctl_arg;
-
-        ioctl_arg.op = op;
-        ioctl_arg.flags = 0;
-        ioctl_arg.datalen = sizeof (struct blkpg_partition);
-        ioctl_arg.data = (void*) part;
-
-        return ioctl (arch_specific->fd, BLKPG, &ioctl_arg) == 0;
-}
-
-static int
-_blkpg_add_partition (PedDisk* disk, const PedPartition *part)
-{
-        struct blkpg_partition  linux_part;
-        const char*             vol_name;
-        char*                   dev_name;
-
-        PED_ASSERT(disk != NULL, return 0);
-        PED_ASSERT(disk->dev->sector_size % PED_SECTOR_SIZE_DEFAULT == 0,
-                   return 0);
-
-        if (ped_disk_type_check_feature (disk->type,
-                                         PED_DISK_TYPE_PARTITION_NAME))
-                vol_name = ped_partition_get_name (part);
-        else
-                vol_name = NULL;
-
-        dev_name = _device_get_part_path (disk->dev, part->num);
-        if (!dev_name)
-                return 0;
-
-        memset (&linux_part, 0, sizeof (linux_part));
-        linux_part.start = part->geom.start * disk->dev->sector_size;
-        /* see fs/partitions/msdos.c:msdos_partition(): "leave room for LILO" */
-        if (part->type & PED_PARTITION_EXTENDED)
-                linux_part.length = part->geom.length == 1 ? 512 : 1024;
-        else
-                linux_part.length = part->geom.length * disk->dev->sector_size;
-        linux_part.pno = part->num;
-        strncpy (linux_part.devname, dev_name, BLKPG_DEVNAMELTH);
-        if (vol_name)
-                strncpy (linux_part.volname, vol_name, BLKPG_VOLNAMELTH);
-
-        free (dev_name);
-
-        if (!_blkpg_part_command (disk->dev, &linux_part,
-                                  BLKPG_ADD_PARTITION)) {
-                return ped_exception_throw (
-                        PED_EXCEPTION_ERROR,
-                        PED_EXCEPTION_IGNORE_CANCEL,
-                        _("Error informing the kernel about modifications to "
-                          "partition %s -- %s.  This means Linux won't know "
-                          "about any changes you made to %s until you reboot "
-                          "-- so you shouldn't mount it or use it in any way "
-                          "before rebooting."),
-                        linux_part.devname,
-                        strerror (errno),
-                        linux_part.devname)
-                                == PED_EXCEPTION_IGNORE;
-        }
-
-        return 1;
-}
-
-static int
-_blkpg_remove_partition (PedDisk* disk, int n)
-{
-        struct blkpg_partition  linux_part;
-
-        memset (&linux_part, 0, sizeof (linux_part));
-        linux_part.pno = n;
-        return _blkpg_part_command (disk->dev, &linux_part,
-                                    BLKPG_DEL_PARTITION);
-}
-
-/*
- * The number of partitions that a device can have depends on the kernel.
- * If we don't find this value in /sys/block/DEV/range, we will use our own
- * value.
- */
-static unsigned int
-_device_get_partition_range(PedDevice* dev)
-{
-        int         range, r;
-        char        path[128];
-        FILE*       fp;
-        bool        ok;
-
-        r = snprintf(path, sizeof(path), "/sys/block/%s/range",
-                     last_component(dev->path));
-        if(r < 0 || r >= sizeof(path))
-                return MAX_NUM_PARTS;
-
-        fp = fopen(path, "r");
-        if(!fp)
-                return MAX_NUM_PARTS;
-
-        ok = fscanf(fp, "%d", &range) == 1;
-        fclose(fp);
-
-        /* (range <= 0) is none sense.*/
-        return ok && range > 0 ? range : MAX_NUM_PARTS;
-}
-
-/*
- * Sync the partition table in two step process:
- * 1. Remove all of the partitions from the kernel's tables, but do not attempt
- *    removal of any partition for which the corresponding ioctl call fails.
- * 2. Add all the partitions that we hold in disk.
- *
- * To achieve this two step process we must calculate the minimum number of
- * maximum possible partitions between what linux supports and what the label
- * type supports. EX:
- *
- * number=MIN(max_parts_supported_in_linux,max_parts_supported_in_msdos_tables)
- */
-static int
-_disk_sync_part_table (PedDisk* disk)
-{
-        PED_ASSERT(disk != NULL, return 0);
-        PED_ASSERT(disk->dev != NULL, return 0);
-        int lpn;
-
-        /* lpn = largest partition number. */
-        if(ped_disk_get_max_supported_partition_count(disk, &lpn))
-                lpn = PED_MIN(lpn, _device_get_partition_range(disk->dev));
-        else
-                lpn = _device_get_partition_range(disk->dev);
-
-        /* Its not possible to support largest_partnum < 0.
-         * largest_partnum == 0 would mean does not support partitions.
-         * */
-        if(lpn < 0)
-                return 0;
-
-        int *rets = ped_malloc(sizeof(int) * lpn);
-        int *errnums = ped_malloc(sizeof(int) * lpn);
-        int ret = 1;
-        int i;
-
-        for (i = 1; i <= lpn; i++) {
-                rets[i - 1] = _blkpg_remove_partition (disk, i);
-                errnums[i - 1] = errno;
-        }
-
-        for (i = 1; i <= lpn; i++) {
-                const PedPartition *part = ped_disk_get_partition (disk, i);
-                if (part) {
-                        /* busy... so we won't (can't!) disturb ;)  Prolly
-                         * doesn't matter anyway, because users shouldn't be
-                         * changing mounted partitions anyway...
-                         */
-                        if (!rets[i - 1] && errnums[i - 1] == EBUSY)
-                                        continue;
-
-                        /* add the (possibly modified or new) partition */
-                        if (!_blkpg_add_partition (disk, part))
-                                ret = 0;
-                }
-        }
-
-        free (rets);
-        free (errnums);
-        return ret;
-}
-
 #ifdef ENABLE_DEVICE_MAPPER
 static int
 _dm_remove_map_name(char *name)
@@ -2601,19 +2414,6 @@ _kernel_reread_part_table (PedDevice* dev)
 }
 
 static int
-_have_blkpg ()
-{
-        static int have_blkpg = -1;
-        int kver;
-
-        if (have_blkpg != -1)
-                return have_blkpg;
-
-        kver = _get_linux_version();
-        return have_blkpg = kver >= KERNEL_VERSION (2,4,0) ? 1 : 0;
-}
-
-static int
 linux_disk_commit (PedDisk* disk)
 {
 #ifdef ENABLE_DEVICE_MAPPER
@@ -2621,19 +2421,6 @@ linux_disk_commit (PedDisk* disk)
                 return _dm_reread_part_table (disk);
 #endif
         if (disk->dev->type != PED_DEVICE_FILE) {
-                /* The ioctl() command BLKPG_ADD_PARTITION does not notify
-                 * the devfs system; consequently, /proc/partitions will not
-                 * be up to date, and the proper links in /dev are not
-                 * created.  Therefore, if using DevFS, we must get the kernel
-                 * to re-read and grok the partition table.
-                 */
-                /* Work around kernel dasd problem so we really do BLKRRPART */
-                if (disk->dev->type != PED_DEVICE_DASD &&
-                    _have_blkpg () && !_have_devfs ()) {
-                        if (_disk_sync_part_table (disk))
-                                return 1;
-                }
-
                 return _kernel_reread_part_table (disk->dev);
         }
 
-- 
1.6.4



Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- parted.spec	28 Aug 2009 10:36:11 -0000	1.147
+++ parted.spec	31 Aug 2009 12:34:18 -0000	1.148
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -22,6 +22,9 @@ Patch9:  %{name}-1.9.0-new-duplicate.pat
 Patch10:  %{name}-1.9.0-handle-dup-error.patch
 Patch11:  %{name}-1.9.0-swap-flag.patch
 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
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -70,7 +73,10 @@ Parted library, you need to install this
 %patch9 -p1 -b .new-duplicate
 %patch10 -p1 -b .handle-dup-error
 %patch11 -p1 -b .swap-flag
-%patch12 -p1 -b .volkey-size^^
+%patch12 -p1 -b .volkeysize
+%patch13 -p1 -b .no-BLKPG
+%patch14 -p1 -b .commit-without-close
+%patch15 -p1 -b .dont-touch-part-nodes
 
 
 %build
@@ -131,6 +137,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Mon Aug 31 2009 Joel Granados <jgranado at redhat.com> 1.9.0-14
+- Patchs for 'commit to os' for linux.  Thx to hansg.
+
 * Fri Aug 28 2009 Karsten Hopp <karsten at redhat.com> 1.9.0-13
 - volkey is only 4 chars, don't overflow destination buffer with 84 chars
 



From jfch2222 at fedoraproject.org  Mon Aug 31 12:38:20 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon, 31 Aug 2009 12:38:20 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-selinux.patch, 1.3,
	1.4 openssh-5.2p1-sesftp.patch, 1.6, 1.7 openssh.spec, 1.159, 1.160
Message-ID: <20090831123820.B667A11C0072@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19829

Modified Files:
	openssh-5.2p1-selinux.patch openssh-5.2p1-sesftp.patch 
	openssh.spec 
Log Message:
Upstream convergence


openssh-5.2p1-selinux.patch:
 auth.h                      |    3 +++
 auth1.c                     |   17 +++++++++++++++++
 auth2-gss.c                 |   11 ++++++++++-
 auth2-hostbased.c           |   10 +++++++++-
 auth2-pubkey.c              |   10 +++++++++-
 auth2.c                     |   17 ++++++++++++++++-
 configure.ac                |    1 +
 monitor.c                   |   36 ++++++++++++++++++++++++++++++++++--
 monitor.h                   |    3 +++
 monitor_wrap.c              |   19 +++++++++++++++++++
 monitor_wrap.h              |    3 +++
 openbsd-compat/port-linux.c |   32 +++++++++++++++++++++++++-------
 12 files changed, 149 insertions(+), 13 deletions(-)

Index: openssh-5.2p1-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openssh-5.2p1-selinux.patch	28 Aug 2009 21:46:27 -0000	1.3
+++ openssh-5.2p1-selinux.patch	31 Aug 2009 12:38:20 -0000	1.4
@@ -1,116 +1,301 @@
-diff -up openssh-5.2p1/configure.ac.selinux openssh-5.2p1/configure.ac
---- openssh-5.2p1/configure.ac.selinux	2008-07-23 16:32:13.000000000 +0200
-+++ openssh-5.2p1/configure.ac	2008-07-23 16:32:13.000000000 +0200
-@@ -3309,6 +3309,7 @@ AC_ARG_WITH(selinux,
- 		AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
- 		    AC_MSG_ERROR(SELinux support requires libselinux library))
- 		SSHDLIBS="$SSHDLIBS $LIBSELINUX"
-+		LIBS="$LIBS $LIBSELINUX"
- 		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
- 		LIBS="$save_LIBS"
- 	fi ]
 diff -up openssh-5.2p1/auth1.c.selinux openssh-5.2p1/auth1.c
---- openssh-5.2p1/auth1.c.selinux	2008-07-23 16:32:13.000000000 +0200
-+++ openssh-5.2p1/auth1.c	2008-07-23 16:32:13.000000000 +0200
-@@ -391,7 +391,7 @@ void
- do_authentication(Authctxt *authctxt)
+--- openssh-5.2p1/auth1.c.selinux	2008-07-09 12:54:05.000000000 +0200
++++ openssh-5.2p1/auth1.c	2009-08-11 22:43:07.918183730 +0200
+@@ -392,6 +392,9 @@ do_authentication(Authctxt *authctxt)
  {
  	u_int ulen;
--	char *user, *style = NULL;
-+	char *user, *style = NULL, *role=NULL;
+ 	char *user, *style = NULL;
++#ifdef WITH_SELINUX
++	char *role=NULL;
++#endif
  
  	/* Get the name of the user that we wish to log in as. */
  	packet_read_expect(SSH_CMSG_USER);
-@@ -400,11 +400,19 @@ do_authentication(Authctxt *authctxt)
+@@ -400,11 +403,25 @@ do_authentication(Authctxt *authctxt)
  	user = packet_get_string(&ulen);
  	packet_check_eom();
  
++#ifdef WITH_SELINUX
 +	if ((role = strchr(user, '/')) != NULL)
 +		*role++ = '\0';
++#endif
 +
  	if ((style = strchr(user, ':')) != NULL)
  		*style++ = '\0';
++#ifdef WITH_SELINUX
 +	else
 +		if (role && (style = strchr(role, ':')) != NULL)
 +			*style++ = '\0';
++#endif
 +			
  
  	authctxt->user = user;
  	authctxt->style = style;
++#ifdef WITH_SELINUX
 +	authctxt->role = role;
++#endif
  
  	/* Verify that the user is a valid user. */
  	if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
+diff -up openssh-5.2p1/auth2.c.selinux openssh-5.2p1/auth2.c
+--- openssh-5.2p1/auth2.c.selinux	2008-11-05 06:20:46.000000000 +0100
++++ openssh-5.2p1/auth2.c	2009-08-11 22:43:07.919756192 +0200
+@@ -216,6 +216,9 @@ input_userauth_request(int type, u_int32
+ 	Authctxt *authctxt = ctxt;
+ 	Authmethod *m = NULL;
+ 	char *user, *service, *method, *style = NULL;
++#ifdef WITH_SELINUX
++	char *role = NULL;
++#endif
+ 	int authenticated = 0;
+ 
+ 	if (authctxt == NULL)
+@@ -227,6 +230,11 @@ input_userauth_request(int type, u_int32
+ 	debug("userauth-request for user %s service %s method %s", user, service, method);
+ 	debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
+ 
++#ifdef WITH_SELINUX
++	if ((role = strchr(user, '/')) != NULL)
++		*role++ = 0;
++#endif
++
+ 	if ((style = strchr(user, ':')) != NULL)
+ 		*style++ = 0;
+ 
+@@ -252,8 +260,15 @@ input_userauth_request(int type, u_int32
+ 		    use_privsep ? " [net]" : "");
+ 		authctxt->service = xstrdup(service);
+ 		authctxt->style = style ? xstrdup(style) : NULL;
+-		if (use_privsep)
++#ifdef WITH_SELINUX
++		authctxt->role = role ? xstrdup(role) : NULL;
++#endif
++		if (use_privsep) {
+ 			mm_inform_authserv(service, style);
++#ifdef WITH_SELINUX
++			mm_inform_authrole(role);
++#endif
++		}
+ 		userauth_banner();
+ 	} else if (strcmp(user, authctxt->user) != 0 ||
+ 	    strcmp(service, authctxt->service) != 0) {
+diff -up openssh-5.2p1/auth2-gss.c.selinux openssh-5.2p1/auth2-gss.c
+--- openssh-5.2p1/auth2-gss.c.selinux	2007-12-02 12:59:45.000000000 +0100
++++ openssh-5.2p1/auth2-gss.c	2009-08-11 22:43:07.921723295 +0200
+@@ -258,6 +258,7 @@ input_gssapi_mic(int type, u_int32_t ple
+ 	Authctxt *authctxt = ctxt;
+ 	Gssctxt *gssctxt;
+ 	int authenticated = 0;
++	char *micuser;
+ 	Buffer b;
+ 	gss_buffer_desc mic, gssbuf;
+ 	u_int len;
+@@ -270,7 +271,13 @@ input_gssapi_mic(int type, u_int32_t ple
+ 	mic.value = packet_get_string(&len);
+ 	mic.length = len;
+ 
+-	ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
++#ifdef WITH_SELINUX
++	if (authctxt->role && (strlen(authctxt->role) > 0))
++		xasprintf(&micuser, "%s/%s", authctxt->user, authctxt->role);
++	else
++#endif
++		micuser = authctxt->user;
++	ssh_gssapi_buildmic(&b, micuser, authctxt->service,
+ 	    "gssapi-with-mic");
+ 
+ 	gssbuf.value = buffer_ptr(&b);
+@@ -282,6 +289,8 @@ input_gssapi_mic(int type, u_int32_t ple
+ 		logit("GSSAPI MIC check failed");
+ 
+ 	buffer_free(&b);
++	if (micuser != authctxt->user)
++		xfree(micuser);
+ 	xfree(mic.value);
+ 
+ 	authctxt->postponed = 0;
+diff -up openssh-5.2p1/auth2-hostbased.c.selinux openssh-5.2p1/auth2-hostbased.c
+--- openssh-5.2p1/auth2-hostbased.c.selinux	2008-07-17 10:57:19.000000000 +0200
++++ openssh-5.2p1/auth2-hostbased.c	2009-08-11 22:43:07.923721059 +0200
+@@ -106,7 +106,15 @@ userauth_hostbased(Authctxt *authctxt)
+ 	buffer_put_string(&b, session_id2, session_id2_len);
+ 	/* reconstruct packet */
+ 	buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
+-	buffer_put_cstring(&b, authctxt->user);
++#ifdef WITH_SELINUX
++	if (authctxt->role) {
++		buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1);
++		buffer_append(&b, authctxt->user, strlen(authctxt->user));
++		buffer_put_char(&b, '/');
++		buffer_append(&b, authctxt->role, strlen(authctxt->role));
++	} else 
++#endif
++		buffer_put_cstring(&b, authctxt->user);
+ 	buffer_put_cstring(&b, service);
+ 	buffer_put_cstring(&b, "hostbased");
+ 	buffer_put_string(&b, pkalg, alen);
 diff -up openssh-5.2p1/auth2-pubkey.c.selinux openssh-5.2p1/auth2-pubkey.c
 --- openssh-5.2p1/auth2-pubkey.c.selinux	2008-07-04 04:54:25.000000000 +0200
-+++ openssh-5.2p1/auth2-pubkey.c	2008-07-23 16:32:13.000000000 +0200
-@@ -117,7 +117,14 @@ userauth_pubkey(Authctxt *authctxt)
++++ openssh-5.2p1/auth2-pubkey.c	2009-08-11 22:43:07.925704588 +0200
+@@ -117,7 +117,15 @@ userauth_pubkey(Authctxt *authctxt)
  		}
  		/* reconstruct packet */
  		buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
 -		buffer_put_cstring(&b, authctxt->user);
++#ifdef WITH_SELINUX
 +		if (authctxt->role) {
 +			buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1);
 +			buffer_append(&b, authctxt->user, strlen(authctxt->user));
 +			buffer_put_char(&b, '/');
 +			buffer_append(&b, authctxt->role, strlen(authctxt->role));
-+		} else {
++		} else 
++#endif
 +			buffer_put_cstring(&b, authctxt->user);
-+		}
  		buffer_put_cstring(&b,
  		    datafellows & SSH_BUG_PKSERVICE ?
  		    "ssh-userauth" :
-diff -up openssh-5.2p1/monitor_wrap.h.selinux openssh-5.2p1/monitor_wrap.h
---- openssh-5.2p1/monitor_wrap.h.selinux	2006-08-05 04:39:40.000000000 +0200
-+++ openssh-5.2p1/monitor_wrap.h	2008-07-23 16:32:13.000000000 +0200
-@@ -41,6 +41,7 @@ int mm_is_monitor(void);
- DH *mm_choose_dh(int, int, int);
- int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int);
- void mm_inform_authserv(char *, char *);
-+void mm_inform_authrole(char *);
- struct passwd *mm_getpwnamallow(const char *);
- char *mm_auth2_read_banner(void);
- int mm_auth_password(struct Authctxt *, char *);
-diff -up openssh-5.2p1/monitor.h.selinux openssh-5.2p1/monitor.h
---- openssh-5.2p1/monitor.h.selinux	2006-03-26 05:30:02.000000000 +0200
-+++ openssh-5.2p1/monitor.h	2008-07-23 16:32:13.000000000 +0200
-@@ -30,7 +30,7 @@
+diff -up openssh-5.2p1/auth.h.selinux openssh-5.2p1/auth.h
+--- openssh-5.2p1/auth.h.selinux	2008-11-05 06:20:46.000000000 +0100
++++ openssh-5.2p1/auth.h	2009-08-11 22:43:07.927199901 +0200
+@@ -58,6 +58,9 @@ struct Authctxt {
+ 	char		*service;
+ 	struct passwd	*pw;		/* set if 'valid' */
+ 	char		*style;
++#ifdef WITH_SELINUX
++	char		*role;
++#endif
+ 	void		*kbdintctxt;
+ 	void		*jpake_ctx;
+ #ifdef BSD_AUTH
+diff -up openssh-5.2p1/configure.ac.selinux openssh-5.2p1/configure.ac
+--- openssh-5.2p1/configure.ac.selinux	2009-02-16 05:37:03.000000000 +0100
++++ openssh-5.2p1/configure.ac	2009-08-11 22:43:07.930259052 +0200
+@@ -3335,6 +3335,7 @@ AC_ARG_WITH(selinux,
+ 		AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
+ 		    AC_MSG_ERROR(SELinux support requires libselinux library))
+ 		SSHDLIBS="$SSHDLIBS $LIBSELINUX"
++		LIBS="$LIBS $LIBSELINUX"
+ 		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
+ 		LIBS="$save_LIBS"
+ 	fi ]
+diff -up openssh-5.2p1/monitor.c.selinux openssh-5.2p1/monitor.c
+--- openssh-5.2p1/monitor.c.selinux	2009-02-14 06:33:31.000000000 +0100
++++ openssh-5.2p1/monitor.c	2009-08-11 22:43:07.933623092 +0200
+@@ -135,6 +135,9 @@ int mm_answer_sign(int, Buffer *);
+ int mm_answer_pwnamallow(int, Buffer *);
+ int mm_answer_auth2_read_banner(int, Buffer *);
+ int mm_answer_authserv(int, Buffer *);
++#ifdef WITH_SELINUX
++int mm_answer_authrole(int, Buffer *);
++#endif
+ int mm_answer_authpassword(int, Buffer *);
+ int mm_answer_bsdauthquery(int, Buffer *);
+ int mm_answer_bsdauthrespond(int, Buffer *);
+@@ -211,6 +214,9 @@ struct mon_table mon_dispatch_proto20[] 
+     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
+     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
+     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
++#ifdef WITH_SELINUX
++    {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
++#endif
+     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
+     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
+ #ifdef USE_PAM
+@@ -680,6 +686,9 @@ mm_answer_pwnamallow(int sock, Buffer *m
+ 	else {
+ 		/* Allow service/style information on the auth context */
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
++#ifdef WITH_SELINUX
++		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
++#endif
+ 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
+ 	}
+ 
+@@ -724,6 +733,25 @@ mm_answer_authserv(int sock, Buffer *m)
+ 	return (0);
+ }
+ 
++#ifdef WITH_SELINUX
++int
++mm_answer_authrole(int sock, Buffer *m)
++{
++	monitor_permit_authentications(1);
++
++	authctxt->role = buffer_get_string(m, NULL);
++	debug3("%s: role=%s",
++	    __func__, authctxt->role);
++
++	if (strlen(authctxt->role) == 0) {
++		xfree(authctxt->role);
++		authctxt->role = NULL;
++	}
++
++	return (0);
++}
++#endif
++
+ int
+ mm_answer_authpassword(int sock, Buffer *m)
+ {
+@@ -1102,7 +1130,7 @@ static int
+ monitor_valid_userblob(u_char *data, u_int datalen)
+ {
+ 	Buffer b;
+-	char *p;
++	char *p, *r;
+ 	u_int len;
+ 	int fail = 0;
  
+@@ -1128,6 +1156,8 @@ monitor_valid_userblob(u_char *data, u_i
+ 	if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST)
+ 		fail++;
+ 	p = buffer_get_string(&b, NULL);
++	if ((r = strchr(p, '/')) != NULL)
++		*r = '\0';
+ 	if (strcmp(authctxt->user, p) != 0) {
+ 		logit("wrong user name passed to monitor: expected %s != %.100s",
+ 		    authctxt->user, p);
+@@ -1159,7 +1189,7 @@ monitor_valid_hostbasedblob(u_char *data
+     char *chost)
+ {
+ 	Buffer b;
+-	char *p;
++	char *p, *r;
+ 	u_int len;
+ 	int fail = 0;
+ 
+@@ -1176,6 +1206,8 @@ monitor_valid_hostbasedblob(u_char *data
+ 	if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST)
+ 		fail++;
+ 	p = buffer_get_string(&b, NULL);
++	if ((r = strchr(p, '/')) != NULL)
++		*r = '\0';
+ 	if (strcmp(authctxt->user, p) != 0) {
+ 		logit("wrong user name passed to monitor: expected %s != %.100s",
+ 		    authctxt->user, p);
+diff -up openssh-5.2p1/monitor.h.selinux openssh-5.2p1/monitor.h
+--- openssh-5.2p1/monitor.h.selinux	2008-11-05 06:20:46.000000000 +0100
++++ openssh-5.2p1/monitor.h	2009-08-11 22:43:07.935612930 +0200
+@@ -31,6 +31,9 @@
  enum monitor_reqtype {
  	MONITOR_REQ_MODULI, MONITOR_ANS_MODULI,
--	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,
-+	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,MONITOR_REQ_AUTHROLE,
+ 	MONITOR_REQ_FREE, MONITOR_REQ_AUTHSERV,
++#ifdef WITH_SELINUX
++	MONITOR_REQ_AUTHROLE,
++#endif
  	MONITOR_REQ_SIGN, MONITOR_ANS_SIGN,
  	MONITOR_REQ_PWNAM, MONITOR_ANS_PWNAM,
  	MONITOR_REQ_AUTH2_READ_BANNER, MONITOR_ANS_AUTH2_READ_BANNER,
-diff -up openssh-5.2p1/auth2-hostbased.c.selinux openssh-5.2p1/auth2-hostbased.c
---- openssh-5.2p1/auth2-hostbased.c.selinux	2008-07-17 10:57:19.000000000 +0200
-+++ openssh-5.2p1/auth2-hostbased.c	2008-07-23 16:32:13.000000000 +0200
-@@ -106,7 +106,14 @@ userauth_hostbased(Authctxt *authctxt)
- 	buffer_put_string(&b, session_id2, session_id2_len);
- 	/* reconstruct packet */
- 	buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
--	buffer_put_cstring(&b, authctxt->user);
-+	if (authctxt->role) {
-+		buffer_put_int(&b, strlen(authctxt->user)+strlen(authctxt->role)+1);
-+		buffer_append(&b, authctxt->user, strlen(authctxt->user));
-+		buffer_put_char(&b, '/');
-+		buffer_append(&b, authctxt->role, strlen(authctxt->role));
-+	} else {
-+		buffer_put_cstring(&b, authctxt->user);
-+	}
- 	buffer_put_cstring(&b, service);
- 	buffer_put_cstring(&b, "hostbased");
- 	buffer_put_string(&b, pkalg, alen);
 diff -up openssh-5.2p1/monitor_wrap.c.selinux openssh-5.2p1/monitor_wrap.c
---- openssh-5.2p1/monitor_wrap.c.selinux	2008-07-11 09:36:48.000000000 +0200
-+++ openssh-5.2p1/monitor_wrap.c	2008-07-23 16:32:13.000000000 +0200
-@@ -296,6 +296,23 @@ mm_inform_authserv(char *service, char *
+--- openssh-5.2p1/monitor_wrap.c.selinux	2008-11-05 06:20:47.000000000 +0100
++++ openssh-5.2p1/monitor_wrap.c	2009-08-11 22:43:07.937212340 +0200
+@@ -297,6 +297,25 @@ mm_inform_authserv(char *service, char *
  	buffer_free(&m);
  }
  
 +/* Inform the privileged process about role */
 +
++#ifdef WITH_SELINUX
 +void
 +mm_inform_authrole(char *role)
 +{
@@ -125,13 +310,27 @@ diff -up openssh-5.2p1/monitor_wrap.c.se
 +
 +	buffer_free(&m);
 +}
++#endif
 +
  /* Do the password authentication */
  int
  mm_auth_password(Authctxt *authctxt, char *password)
+diff -up openssh-5.2p1/monitor_wrap.h.selinux openssh-5.2p1/monitor_wrap.h
+--- openssh-5.2p1/monitor_wrap.h.selinux	2008-11-05 06:20:47.000000000 +0100
++++ openssh-5.2p1/monitor_wrap.h	2009-08-11 22:43:07.938268752 +0200
+@@ -41,6 +41,9 @@ int mm_is_monitor(void);
+ DH *mm_choose_dh(int, int, int);
+ int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int);
+ void mm_inform_authserv(char *, char *);
++#ifdef WITH_SELINUX
++void mm_inform_authrole(char *);
++#endif
+ struct passwd *mm_getpwnamallow(const char *);
+ char *mm_auth2_read_banner(void);
+ int mm_auth_password(struct Authctxt *, char *);
 diff -up openssh-5.2p1/openbsd-compat/port-linux.c.selinux openssh-5.2p1/openbsd-compat/port-linux.c
 --- openssh-5.2p1/openbsd-compat/port-linux.c.selinux	2008-03-26 21:27:21.000000000 +0100
-+++ openssh-5.2p1/openbsd-compat/port-linux.c	2008-07-23 16:32:13.000000000 +0200
++++ openssh-5.2p1/openbsd-compat/port-linux.c	2009-08-11 22:44:14.529196220 +0200
 @@ -30,11 +30,16 @@
  #ifdef WITH_SELINUX
  #include "log.h"
@@ -193,169 +392,3 @@ diff -up openssh-5.2p1/openbsd-compat/po
  
  	if (r != 0) {
  		switch (security_getenforce()) {
-diff -up openssh-5.2p1/auth.h.selinux openssh-5.2p1/auth.h
---- openssh-5.2p1/auth.h.selinux	2008-07-02 14:37:30.000000000 +0200
-+++ openssh-5.2p1/auth.h	2008-07-23 16:32:13.000000000 +0200
-@@ -58,6 +58,7 @@ struct Authctxt {
- 	char		*service;
- 	struct passwd	*pw;		/* set if 'valid' */
- 	char		*style;
-+	char		*role;
- 	void		*kbdintctxt;
- 	void		*jpake_ctx;
- #ifdef BSD_AUTH
-diff -up openssh-5.2p1/auth2.c.selinux openssh-5.2p1/auth2.c
---- openssh-5.2p1/auth2.c.selinux	2008-07-05 01:44:53.000000000 +0200
-+++ openssh-5.2p1/auth2.c	2008-07-23 16:32:13.000000000 +0200
-@@ -209,7 +209,7 @@ input_userauth_request(int type, u_int32
- {
- 	Authctxt *authctxt = ctxt;
- 	Authmethod *m = NULL;
--	char *user, *service, *method, *style = NULL;
-+	char *user, *service, *method, *style = NULL, *role = NULL;
- 	int authenticated = 0;
- 
- 	if (authctxt == NULL)
-@@ -221,6 +221,9 @@ input_userauth_request(int type, u_int32
- 	debug("userauth-request for user %s service %s method %s", user, service, method);
- 	debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
- 
-+	if ((role = strchr(user, '/')) != NULL)
-+		*role++ = 0;
-+
- 	if ((style = strchr(user, ':')) != NULL)
- 		*style++ = 0;
- 
-@@ -246,8 +249,11 @@ input_userauth_request(int type, u_int32
- 		    use_privsep ? " [net]" : "");
- 		authctxt->service = xstrdup(service);
- 		authctxt->style = style ? xstrdup(style) : NULL;
--		if (use_privsep)
-+		authctxt->role = role ? xstrdup(role) : NULL;
-+		if (use_privsep) {
- 			mm_inform_authserv(service, style);
-+			mm_inform_authrole(role);
-+		}
- 		userauth_banner();
- 	} else if (strcmp(user, authctxt->user) != 0 ||
- 	    strcmp(service, authctxt->service) != 0) {
-diff -up openssh-5.2p1/monitor.c.selinux openssh-5.2p1/monitor.c
---- openssh-5.2p1/monitor.c.selinux	2008-07-11 09:36:48.000000000 +0200
-+++ openssh-5.2p1/monitor.c	2008-07-23 16:36:10.000000000 +0200
-@@ -134,6 +134,7 @@ int mm_answer_sign(int, Buffer *);
- int mm_answer_pwnamallow(int, Buffer *);
- int mm_answer_auth2_read_banner(int, Buffer *);
- int mm_answer_authserv(int, Buffer *);
-+int mm_answer_authrole(int, Buffer *);
- int mm_answer_authpassword(int, Buffer *);
- int mm_answer_bsdauthquery(int, Buffer *);
- int mm_answer_bsdauthrespond(int, Buffer *);
-@@ -205,6 +206,7 @@ struct mon_table mon_dispatch_proto20[] 
-     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
-     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
-     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
-+    {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
-     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
-     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
- #ifdef USE_PAM
-@@ -658,6 +660,7 @@ mm_answer_pwnamallow(int sock, Buffer *m
- 	else {
- 		/* Allow service/style information on the auth context */
- 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
-+		monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
- 		monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
- 	}
- 
-@@ -703,6 +706,23 @@ mm_answer_authserv(int sock, Buffer *m)
- }
- 
- int
-+mm_answer_authrole(int sock, Buffer *m)
-+{
-+	monitor_permit_authentications(1);
-+
-+	authctxt->role = buffer_get_string(m, NULL);
-+	debug3("%s: role=%s",
-+	    __func__, authctxt->role);
-+
-+	if (strlen(authctxt->role) == 0) {
-+		xfree(authctxt->role);
-+		authctxt->role = NULL;
-+	}
-+
-+	return (0);
-+}
-+
-+int
- mm_answer_authpassword(int sock, Buffer *m)
- {
- 	static int call_count;
-@@ -1080,7 +1100,7 @@ static int
- monitor_valid_userblob(u_char *data, u_int datalen)
- {
- 	Buffer b;
--	char *p;
-+	char *p, *r;
- 	u_int len;
- 	int fail = 0;
- 
-@@ -1106,6 +1126,8 @@ monitor_valid_userblob(u_char *data, u_i
- 	if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST)
- 		fail++;
- 	p = buffer_get_string(&b, NULL);
-+	if ((r = strchr(p, '/')) != NULL)
-+		*r = '\0';
- 	if (strcmp(authctxt->user, p) != 0) {
- 		logit("wrong user name passed to monitor: expected %s != %.100s",
- 		    authctxt->user, p);
-@@ -1137,7 +1159,7 @@ monitor_valid_hostbasedblob(u_char *data
-     char *chost)
- {
- 	Buffer b;
--	char *p;
-+	char *p, *r;
- 	u_int len;
- 	int fail = 0;
- 
-@@ -1154,6 +1176,8 @@ monitor_valid_hostbasedblob(u_char *data
- 	if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST)
- 		fail++;
- 	p = buffer_get_string(&b, NULL);
-+	if ((r = strchr(p, '/')) != NULL)
-+		*r = '\0';
- 	if (strcmp(authctxt->user, p) != 0) {
- 		logit("wrong user name passed to monitor: expected %s != %.100s",
- 		    authctxt->user, p);
-diff -up openssh-5.1p1/auth2-gss.c.gssapi-role openssh-5.1p1/auth2-gss.c
---- openssh-5.1p1/auth2-gss.c.gssapi-role	2007-12-02 12:59:45.000000000 +0100
-+++ openssh-5.1p1/auth2-gss.c	2008-07-23 19:18:15.000000000 +0200
-@@ -258,6 +258,7 @@ input_gssapi_mic(int type, u_int32_t ple
- 	Authctxt *authctxt = ctxt;
- 	Gssctxt *gssctxt;
- 	int authenticated = 0;
-+	char *micuser;
- 	Buffer b;
- 	gss_buffer_desc mic, gssbuf;
- 	u_int len;
-@@ -270,7 +271,11 @@ input_gssapi_mic(int type, u_int32_t ple
- 	mic.value = packet_get_string(&len);
- 	mic.length = len;
- 
--	ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
-+	if (authctxt->role && (strlen(authctxt->role) > 0))
-+		xasprintf(&micuser, "%s/%s", authctxt->user, authctxt->role);
-+	else
-+		micuser = authctxt->user;
-+	ssh_gssapi_buildmic(&b, micuser, authctxt->service,
- 	    "gssapi-with-mic");
- 
- 	gssbuf.value = buffer_ptr(&b);
-@@ -282,6 +287,8 @@ input_gssapi_mic(int type, u_int32_t ple
- 		logit("GSSAPI MIC check failed");
- 
- 	buffer_free(&b);
-+	if (micuser != authctxt->user)
-+		xfree(micuser);
- 	xfree(mic.value);
- 
- 	authctxt->postponed = 0;

openssh-5.2p1-sesftp.patch:
 openbsd-compat/port-linux.c |   32 ++++++++++++++++++++++++++++++++
 openbsd-compat/port-linux.h |    1 +
 session.c                   |    3 +++
 3 files changed, 36 insertions(+)

Index: openssh-5.2p1-sesftp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.2p1-sesftp.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openssh-5.2p1-sesftp.patch	28 Aug 2009 22:43:53 -0000	1.6
+++ openssh-5.2p1-sesftp.patch	31 Aug 2009 12:38:20 -0000	1.7
@@ -1,67 +1,64 @@
-diff -up openssh-5.2p1/session.c.sesftp openssh-5.2p1/session.c
---- openssh-5.2p1/session.c.sesftp	2009-08-09 10:21:11.586827446 +0200
-+++ openssh-5.2p1/session.c	2009-08-09 10:39:30.475622699 +0200
-@@ -58,6 +58,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif
+diff -up openssh-5.2p1/openbsd-compat/port-linux.c.sesftp openssh-5.2p1/openbsd-compat/port-linux.c
+--- openssh-5.2p1/openbsd-compat/port-linux.c.sesftp	2009-08-12 00:29:37.712368892 +0200
++++ openssh-5.2p1/openbsd-compat/port-linux.c	2009-08-12 00:29:37.732544890 +0200
+@@ -469,4 +469,36 @@ ssh_selinux_setup_pty(char *pwname, cons
+ 		freecon(user_ctx);
+ 	debug3("%s: done", __func__);
+ }
++
++void
++ssh_selinux_change_context(const char *newname)
++{
++	int len, newlen;
++	char *oldctx, *newctx, *cx;
++
++	if (!ssh_selinux_enabled())
++		return;
++
++	if (getcon((security_context_t *)&oldctx) < 0) {
++		logit("%s: getcon failed with %s", __func__, strerror (errno));
++		return;
++	}
++	if ((cx = index(oldctx, ':')) == NULL || (cx = index(cx + 1, ':')) == NULL) {
++		logit ("%s: unparseable context %s", __func__, oldctx);
++		return;
++	}
++
++	newlen = strlen(oldctx) + strlen(newname) + 1;
++	newctx = xmalloc(newlen);
++	len = cx - oldctx + 1;
++	memcpy(newctx, oldctx, len);
++	strlcpy(newctx + len, newname, newlen - len);
++	if ((cx = index(cx + 1, ':')))
++		strlcat(newctx, cx, newlen);
++	debug3("%s: setting context from '%s' to '%s'", __func__, oldctx, newctx);
++	if (setcon(newctx) < 0)
++		logit("%s: setcon failed with %s", __func__, strerror (errno));
++	xfree(oldctx);
++	xfree(newctx);
++}
+ #endif /* WITH_SELINUX */
+diff -up openssh-5.2p1/openbsd-compat/port-linux.h.sesftp openssh-5.2p1/openbsd-compat/port-linux.h
+--- openssh-5.2p1/openbsd-compat/port-linux.h.sesftp	2008-03-26 21:27:21.000000000 +0100
++++ openssh-5.2p1/openbsd-compat/port-linux.h	2009-08-12 00:29:37.733388083 +0200
+@@ -23,6 +23,7 @@
+ int ssh_selinux_enabled(void);
+ void ssh_selinux_setup_pty(char *, const char *);
+ void ssh_selinux_setup_exec_context(char *);
++void ssh_selinux_change_context(const char *);
+ #endif
  
- #include "openbsd-compat/sys-queue.h"
- #include "xmalloc.h"
-@@ -101,6 +104,9 @@
- 	  c[sizeof(INTERNAL_SFTP_NAME) - 1] == ' ' || \
- 	  c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\t'))
- 
-+#ifdef WITH_SELINUX
-+#define SFTPD_T		"sftpd_t"
-+#endif
- /* func */
- 
- Session *session_new(void);
-@@ -1789,6 +1795,10 @@ do_child(Session *s, const char *command
- 		extern int optind, optreset;
- 		int i;
- 		char *p, *args;
-+#ifdef WITH_SELINUX
-+		int L1, L2;
-+		char *c1, *c2, *cx;
-+#endif
- 
- 		setproctitle("%s at internal-sftp-server", s->pw->pw_name);
- 		args = xstrdup(command ? command : "sftp-server");
-@@ -1798,6 +1808,32 @@ do_child(Session *s, const char *command
+ #endif /* ! _PORT_LINUX_H */
+diff -up openssh-5.2p1/session.c.sesftp openssh-5.2p1/session.c
+--- openssh-5.2p1/session.c.sesftp	2009-08-12 00:29:37.659250161 +0200
++++ openssh-5.2p1/session.c	2009-08-12 00:29:37.729578695 +0200
+@@ -1798,6 +1798,9 @@ do_child(Session *s, const char *command
  		argv[i] = NULL;
  		optind = optreset = 1;
  		__progname = argv[0];
 +#ifdef WITH_SELINUX
-+		if (getcon ((security_context_t *) &c1) < 0) {
-+			logit("do_child: getcon failed with %s", strerror (errno));
-+		} else {
-+			L1 = strlen (c1) + sizeof (SFTPD_T);
-+			c2 = xmalloc (L1);
-+			if (!(cx = index (c1, ':')))
-+				goto badcontext;
-+			if (!(cx = index (cx + 1, ':'))) {
-+badcontext:
-+				logit ("do_child: unparseable context %s", c1);
-+			} else {
-+				L2 = cx - c1 + 1;
-+				memcpy (c2, c1, L2);
-+				strlcpy (c2 + L2, SFTPD_T, L1);
-+				if ((cx = index (cx + 1, ':')))
-+					strlcat (c2, cx, L1);
-+				if (setcon (c2) < 0) 
-+					logit("do_child: setcon failed with %s", strerror (errno));
-+			
-+			}
-+			xfree (c1);
-+			xfree (c2);
-+		}		
++		ssh_selinux_change_context("sftpd_t");
 +#endif
-+			
  		exit(sftp_server_main(i, argv, s->pw));
  	}
  


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- openssh.spec	28 Aug 2009 22:43:53 -0000	1.159
+++ openssh.spec	31 Aug 2009 12:38:20 -0000	1.160
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 20%{?dist}%{?rescue_rel}
+Release: 21%{?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
@@ -468,6 +468,10 @@ fi
 %endif
 
 %changelog
+* Mon Auc 31 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-21
+- rearange selinux patch to be acceptable for upstream
+- replace seftp patch by an upstream version
+
 * Fri Aug 28 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-20
 - merged xmodifiers to redhat patch
 - merged gssapi-role to selinux patch



From jfch2222 at fedoraproject.org  Mon Aug 31 12:40:06 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Mon, 31 Aug 2009 12:40:06 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.160,1.161
Message-ID: <20090831124006.65EE211C0498@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20271

Modified Files:
	openssh.spec 
Log Message:
Upstream convergence



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- openssh.spec	31 Aug 2009 12:38:20 -0000	1.160
+++ openssh.spec	31 Aug 2009 12:40:05 -0000	1.161
@@ -468,7 +468,7 @@ fi
 %endif
 
 %changelog
-* Mon Auc 31 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-21
+* Mon Aug 31 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-21
 - rearange selinux patch to be acceptable for upstream
 - replace seftp patch by an upstream version
 



From rdieter at fedoraproject.org  Mon Aug 31 12:41:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 12:41:37 +0000 (UTC)
Subject: rpms/xforms/devel xforms.spec,1.26,1.27
Message-ID: <20090831124137.7548411C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20802

Modified Files:
	xforms.spec 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
- %files: fix %defattr typo
- drop libXpm-devel from x_deps



Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xforms.spec	27 Jul 2009 15:28:25 -0000	1.26
+++ xforms.spec	31 Aug 2009 12:41:37 -0000	1.27
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
@@ -16,10 +16,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch100: xforms-1.0.91-no_undefined.patch
 
 BuildRequires: libjpeg-devel
-BuildRequires: libGL-devel
-%define x_deps xorg-x11-devel
+%define x_deps xorg-x11-devel libGL-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps libX11-devel libXpm-devel
+BuildRequires: libXpm-devel
+# skip xorg-x11-proto-devel, for now, pulled in indirectly via libX11-devel
+%define x_deps libGL-devel libX11-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -40,9 +41,8 @@ can easily be created and added to the l
 %package devel
 Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{x_deps}
-Requires: libjpeg-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{?x_deps}
 %description devel
 %{summary}.
 
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root-)
+%defattr(-,root,root,-)
 %doc COPYING.LIB Copyright ChangeLog NEWS README
 %{_libdir}/libflimage.so.1*
 %{_libdir}/libformsGL.so.1*
@@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
+- %%files: fix %%defattr typo
+- drop libXpm-devel from x_deps
+
 * Mon Jul 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.91-1
 - xforms-1.0.91
 - nuke rpaths



From kwizart at fedoraproject.org  Mon Aug 31 12:53:40 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 12:53:40 +0000 (UTC)
Subject: rpms/directfb/F-11 directfb.spec,1.30,1.31
Message-ID: <20090831125340.E7D9311C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23270

Modified Files:
	directfb.spec 
Log Message:
Update 



Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-11/directfb.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- directfb.spec	31 Aug 2009 12:27:02 -0000	1.30
+++ directfb.spec	31 Aug 2009 12:53:40 -0000	1.31
@@ -142,7 +142,7 @@ make check
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
 %{_libdir}/libuniquewm*.so.*
-%{_libdir}/directfb-1.2-0/
+%{_libdir}/directfb-1.2-9/
 %{_datadir}/directfb-%{version}/
 %{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/directfbrc.5*



From jmoskovc at fedoraproject.org  Mon Aug 31 12:55:40 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Mon, 31 Aug 2009 12:55:40 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.8, 1.9 abrt.spec, 1.12, 1.13 sources, 
	1.9, 1.10
Message-ID: <20090831125540.E0B2911C0072@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23764

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Aug 2009 11:43:13 -0000	1.8
+++ .cvsignore	31 Aug 2009 12:55:40 -0000	1.9
@@ -1 +1 @@
-abrt-0.0.7.1.tar.gz
+abrt-0.0.8.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- abrt.spec	19 Aug 2009 11:49:37 -0000	1.12
+++ abrt.spec	31 Aug 2009 12:55:40 -0000	1.13
@@ -3,7 +3,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 0.0.7.1
+Version: 0.0.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -21,6 +21,8 @@ BuildRequires: libnotify-devel
 BuildRequires: xmlrpc-c-devel
 BuildRequires: file-devel
 BuildRequires: python-devel
+BuildRequires: gettext
+BuildRequires: nss-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -48,7 +50,9 @@ Development libraries and headers for %{
 Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-python, pygtk2, pygtk2-libglade
+Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs
+# only if gtk2 version < 2.17
+#Requires: python-sexy
 Provides: abrt-applet = %{version}-%{release}
 Obsoletes: abrt-applet < 0.0.5
 Conflicts: abrt-applet < 0.0.5
@@ -188,6 +192,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+%find_lang %{name}
 
 #rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.la
 #rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib*.la
@@ -221,7 +226,7 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING
 %{_sbindir}/%{name}
@@ -330,6 +335,50 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Aug 26 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.8-1
+- new version
+- resolved: Bug 518420 -  ordinary user's abrt-applet shows up for root owned crashes (npajkovs)
+- GUI: added support for gettext (+part of czech translation) (jmoskovc)
+- added support for saving settings (zprikryl)
+- fixed conf: comment in the middle of the line isn't supported anymore (zprikryl)
+- BZ#518413 PATCH ... furious kerneloops reporting (aarapov)
+- GUI: added first part of support for gettext (jmoskovc)
+- add new parameter to FileTransfer plugin (dnovotny)
+- added support for updating abrt's table (zprikryl)
+- added check for cc-list and reporter. +1 is created iff reporter is somebody else and current user isn't in cc list. (zprikryl)
+- GUI: few improvements, to be more userfriendly (jmoskovc)
+- LOGGER: return valid uri of the log file on succes (jmoskovc)
+- GUI: bring the GUI up to front instead of just blinking in taskbar (trac#60, rhbz#512390) (jmoskovc)
+- Try to execute $bindir/abrt-gui, then fall back to $PATH search. Closes bug 65 (vda.linux)
+- APPLET: added popup menu (trac#37, rhbz#518386) (jmoskovc)
+- Improved report results (zprikryl)
+- Fixed sigsegv (#rhbz 518609) (zprikryl)
+- GUI: removed dependency on libsexy if gtk2 >= 2.17 (jmoskovc)
+- fixed signature check (zprikryl)
+- KerneloopsSysLog: check line length to be >= 4 before looking for "Abrt" (vda.linux)
+- Comment cannot start in the middle of the line. Comment has to start by Char # (first char in the line) (zprikryl)
+- command mailx isn't run under root anymore. (zprikryl)
+- GUI: added horizontal scrolling to report window (jmoskovc)
+- GUI: added clickable link to "after report" status window (jmoskovc)
+- added default values for abrt daemon (zprikryl)
+- Plugins/CCpp: remove trailing \n from debuginfo-install's output (vda.linux)
+- explain EnableGPGCheck option better (vda.linux)
+- mailx: correct English (vda.linux)
+- Bugzilla.conf: correct English (vda.linux)
+- GUI: nicer after report message (jmoskovc)
+- BZ plugin: removed /xmlrpc.cgi from config, made the report message more user friendly (jmoskovc)
+- CCpp plugin: do not abort if debuginfos aren't found (vda.linux)
+- abrt.spec: bump version to 0.0.7-2 (vda.linux)
+- mailx removed dangerous parameter option (zprikryl)
+- minimum timeout is 1 second (zprikryl)
+- in case of plugin error, don't delete debug dumps (zprikryl)
+- abrt-gui: fix crash when run by root (vda.linux)
+- and lot more in git log ...
+
+* Thu Aug 20 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.7.2-1
+- new version
+- fixed some bugs found during test day
+
 * Wed Aug 19 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.7.1-1
 - fixes to bugzilla plugin and gui to make the report message more user-friendly
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Aug 2009 11:43:14 -0000	1.9
+++ sources	31 Aug 2009 12:55:40 -0000	1.10
@@ -1 +1 @@
-4ba81fa12b181c5d286f44a2890c6de3  abrt-0.0.7.1.tar.gz
+0945b2fd88a2d8acd31a171e4a65ed16  abrt-0.0.8.tar.gz



From kwizart at fedoraproject.org  Mon Aug 31 13:03:52 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 13:03:52 +0000 (UTC)
Subject: rpms/directfb/F-10 sources,1.11,1.12 directfb.spec,1.23,1.24
Message-ID: <20090831130352.37E1511C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26310

Modified Files:
	sources directfb.spec 
Log Message:
Update to 1.2.9



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Jun 2009 07:56:52 -0000	1.11
+++ sources	31 Aug 2009 13:03:51 -0000	1.12
@@ -1 +1 @@
-ac13d21682aa368df4e177ae5b51ad2d  DirectFB-1.2.8.tar.gz
+0ac81c7d9ea0099fc3cc066f9279410e  DirectFB-1.2.9.tar.gz


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/F-10/directfb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- directfb.spec	30 Jun 2009 07:56:52 -0000	1.23
+++ directfb.spec	31 Aug 2009 13:03:51 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
-Version: 1.2.8
-Release: 4%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
@@ -16,7 +16,7 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: freetype-devel
-BuildRequires: SDL-devel
+%{?_with_sdl:BuildRequires: SDL-devel}
 BuildRequires: libsysfs-devel
 BuildRequires: libv4l-devel
 BuildRequires: libvncserver-devel
@@ -38,6 +38,7 @@ for graphics under Linux.
 
 Non-default rpmbuild options:
 --with fusion:   Enable linux-fusion support
+--with sdl:      Enable SDL experimental support
 
 
 %package devel
@@ -80,7 +81,7 @@ autoreconf -i -f
 %ifarch i386 i586
     --disable-mmx --disable-sse \
 %endif
-    --enable-sdl \
+%{?_with_sdl:--enable-sdl} \
     --enable-zlib \
 %{?_with_fusion:--enable-multi} \
     --enable-unique \
@@ -141,7 +142,7 @@ make check
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
 %{_libdir}/libuniquewm*.so.*
-%{_libdir}/directfb-1.2-0/
+%{_libdir}/directfb-1.2-9/
 %{_datadir}/directfb-%{version}/
 %{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/directfbrc.5*
@@ -165,9 +166,11 @@ make check
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.2.9-1
+- Update to 1.2.9
+
 * Mon Jun 30 2009 kwizart < kwizart at gmail.com > - 1.2.8-4
 - Built with tslib
-- Keep sdl by default
 
 * Mon May 11 2009 kwizart < kwizart at gmail.com > - 1.2.8-3
 - Improve tty patch



From pbrobinson at fedoraproject.org  Mon Aug 31 13:07:58 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 13:07:58 +0000 (UTC)
Subject: rpms/mutter-moblin/devel .cvsignore, 1.4, 1.5 mutter-moblin.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090831130759.07ED411C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mutter-moblin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27282

Modified Files:
	.cvsignore mutter-moblin.spec sources 
Log Message:
- New 0.35.4 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Aug 2009 15:22:39 -0000	1.4
+++ .cvsignore	31 Aug 2009 13:07:58 -0000	1.5
@@ -1 +1 @@
-mutter-moblin-0.34.3.tar.bz2
+mutter-moblin-0.35.4.tar.bz2


Index: mutter-moblin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/mutter-moblin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mutter-moblin.spec	24 Aug 2009 14:44:35 -0000	1.5
+++ mutter-moblin.spec	31 Aug 2009 13:07:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           mutter-moblin
-Version:        0.34.3
-Release:        3%{?dist}
+Version:        0.35.4
+Release:        1%{?dist}
 Summary:        Moblin Netbook plugin for Mutter
 
 Group:          User Interface/Desktops
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_includedir}/libmoblin-panel
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.35.4-1
+- New 0.35.4 upstream release
+
 * Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.34.3-3
 - Require mutter
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutter-moblin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Aug 2009 15:22:39 -0000	1.4
+++ sources	31 Aug 2009 13:07:58 -0000	1.5
@@ -1 +1 @@
-c64f87825dbd5593309171249c3ca12b  mutter-moblin-0.34.3.tar.bz2
+09b09b24b55c5a8233c24f21be7dd28c  mutter-moblin-0.35.4.tar.bz2



From mtasaka at fedoraproject.org  Mon Aug 31 13:14:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 31 Aug 2009 13:14:39 +0000 (UTC)
Subject: rpms/ebview/devel ebview.spec,1.9,1.10
Message-ID: <20090831131439.90CF311C0072@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ebview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28878

Modified Files:
	ebview.spec 
Log Message:
* Mon Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-2
- F-12: Rebuild against new eb



Index: ebview.spec
===================================================================
RCS file: /cvs/extras/rpms/ebview/devel/ebview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ebview.spec	17 Aug 2009 18:07:39 -0000	1.9
+++ ebview.spec	31 Aug 2009 13:14:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		ebview
 Version:	0.3.6.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	EPWING CD-ROM dictionary viewer
 
 Group:		Applications/Text      
@@ -103,6 +103,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Mon Aug 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-2
+- F-12: Rebuild against new eb
+
 * Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.6.2-1
 - Use Debian 0.3.6.2 (Masayuki Hatta <mhatta at debian.org>)
 - Drop 64 bits patches, remove some unneeded hacks



From akurtakov at fedoraproject.org  Mon Aug 31 13:15:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 31 Aug 2009 13:15:08 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.14,1.15
Message-ID: <20090831131508.0151311C0072@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29049/devel

Modified Files:
	maven-surefire.spec 
Log Message:
 Install JPP.maven2.plugins-surefire-plugin.pom now that we have maven 2.0.8.
 


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- maven-surefire.spec	19 Aug 2009 04:58:55 -0000	1.14
+++ maven-surefire.spec	31 Aug 2009 13:15:07 -0000	1.15
@@ -36,7 +36,7 @@
 
 Name:           maven-surefire
 Version:        2.3
-Release:        7.2%{?dist}
+Release:        7.3%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -245,8 +245,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin-%{version}.jar
 %add_to_maven_depmap org.apache.maven.surefire maven-surefire-plugin 2.3 JPP/maven-surefire maven-plugin
 install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-surefire-maven-plugin.pom
-# Do not install due to conflict with maven2-2.0.4
-#install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-plugin.pom
+install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven2.plugins-surefire-plugin.pom
 
 install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin-%{version}.jar
 %add_to_maven_depmap org.apache.maven.surefire maven-surefire-report-plugin 2.3 JPP/maven-surefire report-maven-plugin
@@ -353,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.3
+- Install JPP.maven2.plugins-surefire-plugin.pom now that we have maven 2.0.8.
+
 * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.2
 - Don't install JPP.maven2.plugins-surefire-plugin.pom to fix conflict with maven2 2.0.4.
 



From dwalsh at fedoraproject.org  Mon Aug 31 13:18:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 31 Aug 2009 13:18:16 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.159,1.160
Message-ID: <20090831131816.AF8CB11C0072@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29928

Modified Files:
	setroubleshoot.spec 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-3
- Add PackageKit requires



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- setroubleshoot.spec	26 Aug 2009 15:00:50 -0000	1.159
+++ setroubleshoot.spec	31 Aug 2009 13:18:16 -0000	1.160
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.2.23
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -17,7 +17,7 @@ Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
 Requires: gnome-python2-gtkhtml2
-Requires: python-bugzilla python-slip-dbus
+Requires: python-bugzilla
 Requires: polkit
 Requires: gnome-python2-gnomekeyring
 Requires(post): /usr/bin/update-desktop-database
@@ -25,6 +25,7 @@ Requires(post): dbus libpcap
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
+Requires: PackageKit
 %{?fc7:Requires: selinux-policy-base >= 2.6.4-45}
 %{?fc8:Requires: selinux-policy-base >= 3.0.7-10}
 %{?fc11:Requires: selinux-policy-base >= 3.6.12-48}
@@ -125,6 +126,7 @@ Requires: policycoreutils-python 
 BuildRequires: intltool gettext python
 BuildRequires: setools-devel >= 3.3.6-3
 BuildRequires: python-devel
+Requires: python-slip-dbus
 
 Requires(post):   /sbin/chkconfig
 Requires(post):   /sbin/service
@@ -210,6 +212,12 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-3
+- Add PackageKit requires
+
+* Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-2
+- Move  python-slip-dbus requirement to server package
+
 * Wed Aug 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-1
 - Fix Permissive Domain reporting
 



From dwmw2 at fedoraproject.org  Mon Aug 31 13:23:00 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 31 Aug 2009 13:23:00 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.63,1.64
Message-ID: <20090831132301.0851B11C0072@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31590

Modified Files:
	exim.spec 
Log Message:
Fix gid on exim group (#518706)


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- exim.spec	21 Aug 2009 13:22:05 -0000	1.63
+++ exim.spec	31 Aug 2009 13:23:00 -0000	1.64
@@ -186,6 +186,7 @@ greylisting unconditional.
 %patch25 -p1 -b .dynconfig
 %patch26 -p1 -b .strictaliasing
 
+
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
 cp exim_monitor/EDITME Local/eximon.conf
@@ -329,7 +330,8 @@ touch $RPM_BUILD_ROOT/%_var/spool/exim/d
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -d %{_var}/spool/exim -s /sbin/nologin -G mail -M -r -u 93 exim 2>/dev/null
+%{_sbindir}/groupadd -g 93 exim 2>&1
+%{_sbindir}/useradd -d %{_var}/spool/exim -s /sbin/nologin -G mail -M -r -u 93 -g exim exim 2>/dev/null
 # Copy TLS certs from old location to new -- don't move them, because the
 # config file may be modified and may be pointing to the old location.
 if [ ! -f /etc/pki/tls/certs/exim.pem -a -f %{_datadir}/ssl/certs/exim.pem ] ; then
@@ -484,6 +486,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Mon Aug 31 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-16
+- Create group for exim with correct gid (#518706)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-15
 - rebuilt with new openssl
 



From kwizart at fedoraproject.org  Mon Aug 31 13:23:17 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 13:23:17 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 perl-Devel-FindRef.spec, 1.4, 1.5
Message-ID: <20090831132317.F25A211C0263@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31665

Modified Files:
	sources .cvsignore perl-Devel-FindRef.spec 
Log Message:
Update to 1.422



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jul 2009 08:41:51 -0000	1.2
+++ sources	31 Aug 2009 13:23:17 -0000	1.3
@@ -1 +1 @@
-b14f71c5be088ae674bc821cfdcb56f7  Devel-FindRef-1.42.tar.gz
+2c92401767653f1ba8b98f36f23fae8d  Devel-FindRef-1.422.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jul 2009 08:41:51 -0000	1.2
+++ .cvsignore	31 Aug 2009 13:23:17 -0000	1.3
@@ -1 +1 @@
-Devel-FindRef-1.42.tar.gz
+Devel-FindRef-1.422.tar.gz


Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Devel-FindRef.spec	4 Aug 2009 19:44:34 -0000	1.4
+++ perl-Devel-FindRef.spec	31 Aug 2009 13:23:17 -0000	1.5
@@ -1,11 +1,11 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Devel-FindRef/
-Source0:        http://www.cpan.org/authors/id/M/ML/MLEHMANN/Devel-FindRef-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/ML/MLEHMANN/Devel-FindRef-%{version}2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Devel*.3*
 
 %changelog
+* Mon Aug 31 2009 Nicolas Chauvet (kwizart) 1.42-4
+- Update internal version to 1.422
+
 * Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> 1.42-3
 - back out the previous rebuild
 



From mtasaka at fedoraproject.org  Mon Aug 31 13:23:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 31 Aug 2009 13:23:17 +0000 (UTC)
Subject: rpms/eblook/devel eblook.spec,1.5,1.6
Message-ID: <20090831132317.CF41E11C0072@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/eblook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31716

Modified Files:
	eblook.spec 
Log Message:
* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1-6
- F-12: Rebuild against new eb



Index: eblook.spec
===================================================================
RCS file: /cvs/extras/rpms/eblook/devel/eblook.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eblook.spec	24 Jul 2009 20:47:04 -0000	1.5
+++ eblook.spec	31 Aug 2009 13:23:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           eblook
 Version:        1.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Command-line EB and EPWING dictionary search program
 
 Group:          Applications/Text
@@ -60,6 +60,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1-6
+- F-12: Rebuild against new eb
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Mon Aug 31 13:24:57 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 31 Aug 2009 13:24:57 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-DSA/devel perl-Crypt-OpenSSL-DSA.spec, 1.11,
	1.12
Message-ID: <20090831132457.8BA8F11C0072@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Crypt-OpenSSL-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32281

Modified Files:
	perl-Crypt-OpenSSL-DSA.spec 
Log Message:
re-enable tests


Index: perl-Crypt-OpenSSL-DSA.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-OpenSSL-DSA/devel/perl-Crypt-OpenSSL-DSA.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-Crypt-OpenSSL-DSA.spec	28 Aug 2009 16:24:05 -0000	1.11
+++ perl-Crypt-OpenSSL-DSA.spec	31 Aug 2009 13:24:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-DSA
 Version:        0.13
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Perl interface to OpenSSL for DSA
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -38,8 +38,7 @@ find %{buildroot} -type f -name '*.bs' -
 %{_fixperms} %{buildroot}/*
 
 %check
-# temporarily disabled because of #520153
-make test || :
+make test
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 31 2009 Stepan Kasal <skasal at redhat.com> - 0.13-14
+- re-enable tests
+
 * Fri Aug 28 2009 Stepan Kasal <skasal at redhat.com> - 0.13-13
 - disable tests to work around bug #520152
 



From dwmw2 at fedoraproject.org  Mon Aug 31 13:25:16 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 31 Aug 2009 13:25:16 +0000 (UTC)
Subject: rpms/exim/devel exim-4.69-expand-spamd.patch, NONE, 1.1 exim.spec, 
	1.64, 1.65
Message-ID: <20090831132516.E248411C0072@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32399

Modified Files:
	exim.spec 
Added Files:
	exim-4.69-expand-spamd.patch 
Log Message:
expand 

exim-4.69-expand-spamd.patch:
 spam.c |   31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

--- NEW FILE exim-4.69-expand-spamd.patch ---
diff --git a/src/spam.c b/src/spam.c
index bf2470c..aab96c6 100644
--- a/src/spam.c
+++ b/src/spam.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spam.c,v 1.14 2007/05/14 18:56:25 magnus Exp $ */
+/* $Cambridge: exim/exim-src/src/spam.c,v 1.16 2008/01/28 13:14:48 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -46,6 +46,7 @@ int spam(uschar **listptr) {
   struct timeval select_tv;         /* and applied by PH */
   fd_set select_fd;
 #endif
+  uschar *spamd_address_work;
 
   /* stop compiler warning */
   result = 0;
@@ -89,14 +90,26 @@ int spam(uschar **listptr) {
   };
 
   start = time(NULL);
+
+  if (*spamd_address == '$') {
+    spamd_address_work = expand_string(spamd_address);
+    if (spamd_address_work == NULL) {
+      log_write(0, LOG_MAIN|LOG_PANIC,
+        "spamassassin acl condition: spamd_address starts with $, but expansion failed: %s", expand_string_message);
+      return DEFER;
+    }
+  }
+  else
+    spamd_address_work = spamd_address;
+
   /* socket does not start with '/' -> network socket */
-  if (*spamd_address != '/') {
+  if (*spamd_address_work != '/') {
     time_t now = time(NULL);
     int num_servers = 0;
     int current_server = 0;
     int start_server = 0;
     uschar *address = NULL;
-    uschar *spamd_address_list_ptr = spamd_address;
+    uschar *spamd_address_list_ptr = spamd_address_work;
     uschar address_buffer[256];
     spamd_address_container * spamd_address_vector[32];
 
@@ -184,12 +197,12 @@ int spam(uschar **listptr) {
     }
 
     server.sun_family = AF_UNIX;
-    Ustrcpy(server.sun_path, spamd_address);
+    Ustrcpy(server.sun_path, spamd_address_work);
 
     if (connect(spamd_sock, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) {
       log_write(0, LOG_MAIN|LOG_PANIC,
                 "malware acl condition: spamd: unable to connect to UNIX socket %s (%s)",
-                spamd_address, strerror(errno) );
+                spamd_address_work, strerror(errno) );
       (void)fclose(mbox_file);
       (void)close(spamd_sock);
       return DEFER;
@@ -395,9 +408,11 @@ again:
     spam_rc = FAIL;
   };
 
-  /* remember user name and "been here" for it */
-  Ustrcpy(prev_user_name, user_name);
-  spam_ok = 1;
+  /* remember user name and "been here" for it unless spamd_socket was expanded */
+  if (spamd_address_work == spamd_address) {
+    Ustrcpy(prev_user_name, user_name);
+    spam_ok = 1;
+  }
 
   if (override) {
     /* always return OK, no matter what the score */


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- exim.spec	31 Aug 2009 13:23:00 -0000	1.64
+++ exim.spec	31 Aug 2009 13:25:16 -0000	1.65
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -54,6 +54,7 @@ Patch23: exim-4.67-smarthost-config.patc
 Patch24: exim-4.69-dynlookup.patch
 Patch25: exim-4.69-dynlookup-config.patch
 Patch26: exim-4.69-strictaliasing.patch
+Patch27: exim-4.69-expand-spamd.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
@@ -185,7 +186,7 @@ greylisting unconditional.
 %patch24 -p1 -b .dynlookup
 %patch25 -p1 -b .dynconfig
 %patch26 -p1 -b .strictaliasing
-
+%patch27 -p1 -b .expandspamd
 
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -488,6 +489,7 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %changelog
 * Mon Aug 31 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-16
 - Create group for exim with correct gid (#518706)
+- Allow expansion of spamd_address
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-15
 - rebuilt with new openssl



From rdieter at fedoraproject.org  Mon Aug 31 13:27:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 13:27:45 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.388,1.389
Message-ID: <20090831132745.1717011C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1272

Modified Files:
	kdebase.spec 
Log Message:
drop/revert kde-plasma-folderview subpkg



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- kdebase.spec	28 Aug 2009 12:45:27 -0000	1.388
+++ kdebase.spec	31 Aug 2009 13:27:44 -0000	1.389
@@ -28,6 +28,8 @@ Obsoletes: kdebase4 < %{version}-%{relea
 Obsoletes: %{name}-extras < 6:4.0.0 
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kde-plasma-folderview < 6:4.3.1-1
+Provides:  kde-plasma-folderview < %{?epoch:%{epoch}:}%{version}-%{release} 
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -73,10 +75,10 @@ Requires: kdebase-runtime
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
 
-
 %package -n kde-plasma-folderview
 Summary: FolderView plasma applet
 Group:   System Environment/Desktop
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n kde-plasma-folderview
 %{summary}.
 
@@ -198,11 +200,10 @@ fi
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/libkonsoleprivate.so
 
-%exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
-%exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
-
-%files -n kde-plasma-folderview
-%defattr(-,root,root,-)
+#exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+#exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+#files -n kde-plasma-folderview
+#defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
 %{_kde4_libdir}/kde4/plasma_applet_folderview.so
 
@@ -219,6 +220,7 @@ fi
 %changelog
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
+- drop/revert kde-plasma-folderview subpkg
 
 * Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - kde-plasma-folderview subpkg



From mtasaka at fedoraproject.org  Mon Aug 31 13:29:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 31 Aug 2009 13:29:14 +0000 (UTC)
Subject: rpms/uim/devel uim.spec,1.74,1.75
Message-ID: <20090831132914.C0A9E11C0072@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/uim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1834

Modified Files:
	uim.spec 
Log Message:
* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.6-2
- F-12: Rebuild against new eb



Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- uim.spec	14 Aug 2009 08:48:45 -0000	1.74
+++ uim.spec	31 Aug 2009 13:29:14 -0000	1.75
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.5.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -513,6 +513,9 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.6-2
+- F-12: Rebuild against new eb
+
 * Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
 - New upstream release.
 - Remove patches because it has been applied in this release.



From rdieter at fedoraproject.org  Mon Aug 31 13:29:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 13:29:22 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.100,1.101
Message-ID: <20090831132922.513EC11C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1752

Modified Files:
	comps-f12.xml.in 
Log Message:
kde-plasma-folderview subpkg dropped, rolled back into kdebase-4.3.1



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- comps-f12.xml.in	31 Aug 2009 11:06:01 -0000	1.100
+++ comps-f12.xml.in	31 Aug 2009 13:29:22 -0000	1.101
@@ -3582,7 +3582,6 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
-      <packagereq type="default">kde-plasma-folderview</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>



From rdieter at fedoraproject.org  Mon Aug 31 13:31:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 13:31:09 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.389,1.390
Message-ID: <20090831133109.A249C11C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2268

Modified Files:
	kdebase.spec 
Log Message:
fix Provides



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- kdebase.spec	31 Aug 2009 13:27:44 -0000	1.389
+++ kdebase.spec	31 Aug 2009 13:31:09 -0000	1.390
@@ -29,7 +29,7 @@ Obsoletes: %{name}-extras < 6:4.0.0 
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kde-plasma-folderview < 6:4.3.1-1
-Provides:  kde-plasma-folderview < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:  kde-plasma-folderview = %{?epoch:%{epoch}:}%{version}-%{release} 
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel



From kwizart at fedoraproject.org  Mon Aug 31 13:31:20 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 13:31:20 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel perl-Devel-FindRef.spec,1.5,1.6
Message-ID: <20090831133120.75D2B11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2233

Modified Files:
	perl-Devel-FindRef.spec 
Log Message:
Update to 5



Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Devel-FindRef.spec	31 Aug 2009 13:23:17 -0000	1.5
+++ perl-Devel-FindRef.spec	31 Aug 2009 13:31:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ very hard. Fortunately, perl keeps track
 references "backwards" is usually possible.
 
 %prep
-%setup -q -n Devel-FindRef-%{version}
+%setup -q -n Devel-FindRef-%{version}2
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Devel*.3*
 
 %changelog
-* Mon Aug 31 2009 Nicolas Chauvet (kwizart) 1.42-4
+* Mon Aug 31 2009 Nicolas Chauvet (kwizart) 1.42-5
 - Update internal version to 1.422
 
 * Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> 1.42-3



From kwizart at fedoraproject.org  Mon Aug 31 13:33:42 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 13:33:42 +0000 (UTC)
Subject: rpms/perl-IO-Async/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 perl-IO-Async.spec, 1.2, 1.3
Message-ID: <20090831133342.B9CA111C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2799

Modified Files:
	sources .cvsignore perl-IO-Async.spec 
Log Message:
Update to 0.23



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 07:17:03 -0000	1.2
+++ sources	31 Aug 2009 13:33:42 -0000	1.3
@@ -1 +1 @@
-92cfc798a468e32aa1bd3d85ef1029e1  IO-Async-0.22.tar.gz
+9dd6cfe42fca273cf49d9b3dd6272f1a  IO-Async-0.23.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 07:17:03 -0000	1.2
+++ .cvsignore	31 Aug 2009 13:33:42 -0000	1.3
@@ -1 +1 @@
-IO-Async-0.22.tar.gz
+IO-Async-0.23.tar.gz


Index: perl-IO-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/devel/perl-IO-Async.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-IO-Async.spec	11 Aug 2009 07:19:03 -0000	1.2
+++ perl-IO-Async.spec	31 Aug 2009 13:33:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-IO-Async
-Version:        0.22
-Release:        2%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 Summary:        A collection of modules that implement asynchronous filehandle IO
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 0.23-1
+- Update to 0.23
+
 * Tue Aug 11 2009 kwizart < kwizart at gmail.com > - 0.22-2
 - Add Missing BR
 



From mtasaka at fedoraproject.org  Mon Aug 31 13:37:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 31 Aug 2009 13:37:22 +0000 (UTC)
Subject: rpms/ebnetd/devel ebnetd.spec,1.3,1.4
Message-ID: <20090831133722.B440511C0072@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ebnetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3820

Modified Files:
	ebnetd.spec 
Log Message:
* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-7
- F-12: Rebuild against new eb



Index: ebnetd.spec
===================================================================
RCS file: /cvs/extras/rpms/ebnetd/devel/ebnetd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ebnetd.spec	24 Jul 2009 20:47:21 -0000	1.3
+++ ebnetd.spec	31 Aug 2009 13:37:22 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:		ebnetd
 Version:	1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 URL:		http://www.sra.co.jp/people/m-kasahr/ebnetd/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -164,6 +164,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0-7
+- F-12: Rebuild against new eb
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Mon Aug 31 13:39:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 31 Aug 2009 13:39:38 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch, 1.66,
	1.67 selinux-policy.spec, 1.908, 1.909
Message-ID: <20090831133938.1DDF211C0072@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4507

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-2
- Allow gssd to send signals to users
- Fix duplicate label for apache content


policy-F12.patch:
 Rules.modular                             |    8 
 man/man8/rsync_selinux.8                  |   18 
 man/man8/samba_selinux.8                  |    4 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.if            |    1 
 policy/modules/admin/kismet.te            |   17 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  176 +++
 policy/modules/admin/rpm.te               |   65 +
 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         |    4 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   92 +-
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   64 +
 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            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  288 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 ++
 policy/modules/apps/openoffice.te         |   14 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 
 policy/modules/apps/ptchown.te            |   39 
 policy/modules/apps/pulseaudio.if         |    1 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  270 ++++-
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   55 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  302 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   23 
 policy/modules/kernel/corecommands.fc     |   24 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   87 +
 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       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 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             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  124 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++---
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 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      |   50 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 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            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 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/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 +
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 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 |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 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           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 -
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   60 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 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            |   12 
 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/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   83 +
 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 |   84 +
 policy/modules/services/setroubleshoot.te |   60 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  131 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   29 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  307 +++++-
 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        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  154 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1373 +++++++++++++++++++++++-------
 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 
 support/Makefile.devel                    |    3 
 support/divert.m4                         |    1 
 support/undivert.m4                       |    1 
 323 files changed, 14692 insertions(+), 3019 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- policy-F12.patch	28 Aug 2009 20:55:15 -0000	1.66
+++ policy-F12.patch	31 Aug 2009 13:39:37 -0000	1.67
@@ -4327,7 +4327,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.6.29/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/apps/screen.if	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/apps/screen.if	2009-08-31 08:54:25.000000000 -0400
 @@ -61,6 +61,8 @@
  	manage_fifo_files_pattern($1_screen_t, screen_dir_t, screen_var_run_t)
  	manage_dirs_pattern($1_screen_t, screen_dir_t, screen_dir_t)
@@ -4337,7 +4337,16 @@ diff -b -B --ignore-all-space --exclude-
  	files_pid_filetrans($1_screen_t, screen_dir_t, dir)
  
  	allow $1_screen_t screen_home_t:dir list_dir_perms;
-@@ -91,6 +93,7 @@
+@@ -73,6 +75,8 @@
+ 	allow $3 $1_screen_t:process signal;
+ 	allow $1_screen_t $3:process signal;
+ 
++	screen_manage_var_run($3)
++
+ 	manage_dirs_pattern($3, screen_home_t, screen_home_t)
+ 	manage_files_pattern($3, screen_home_t, screen_home_t)
+ 	manage_lnk_files_pattern($3, screen_home_t, screen_home_t)
+@@ -91,6 +95,7 @@
  	# Revert to the user domain when a shell is executed.
  	corecmd_shell_domtrans($1_screen_t, $3)
  	corecmd_bin_domtrans($1_screen_t, $3)
@@ -4345,11 +4354,33 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_all_recvfrom_unlabeled($1_screen_t)
  	corenet_all_recvfrom_netlabel($1_screen_t)
-@@ -157,3 +160,24 @@
- 		nscd_socket_use($1_screen_t)
- 	')
- ')
+@@ -124,14 +129,14 @@
+ 	# Write to utmp.
+ 	init_rw_utmp($1_screen_t)
+ 
++	auth_use_nsswitch($1_screen_t)
 +
+ 	logging_send_syslog_msg($1_screen_t)
+ 
+ 	miscfiles_read_localization($1_screen_t)
+ 
+ 	seutil_read_config($1_screen_t)
+ 
+-	sysnet_read_config($1_screen_t)
+-
+ 	userdom_use_user_terminals($1_screen_t)
+ 	userdom_create_user_pty($1_screen_t)
+ 	userdom_user_home_domtrans($1_screen_t, $3)
+@@ -149,11 +154,25 @@
+ 		fs_read_nfs_symlinks($1_screen_t)
+ 	')
+ 
+-	optional_policy(`
+-		nis_use_ypbind($1_screen_t)
+ 	')
+ 
+-	optional_policy(`
+-		nscd_socket_use($1_screen_t)
 +########################################
 +## <summary>
 +##	Manage screen var_run files.
@@ -4363,13 +4394,13 @@ diff -b -B --ignore-all-space --exclude-
 +interface(`screen_manage_var_run',`
 +	gen_require(`
 +		type screen_var_run_t;
-+	')
+ 	')
 +
 +         manage_dirs_pattern($1,screen_var_run_t,screen_var_run_t)
 +         manage_files_pattern($1,screen_var_run_t,screen_var_run_t)
 +         manage_lnk_files_pattern($1,screen_var_run_t,screen_var_run_t)
 +         manage_fifo_files_pattern($1,screen_var_run_t,screen_var_run_t)
-+')
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.fc serefpolicy-3.6.29/policy/modules/apps/seunshare.fc
 --- nsaserefpolicy/policy/modules/apps/seunshare.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.29/policy/modules/apps/seunshare.fc	2009-08-28 15:56:54.000000000 -0400
@@ -4521,7 +4552,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`TODO',`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-3.6.29/policy/modules/apps/webalizer.te
 --- nsaserefpolicy/policy/modules/apps/webalizer.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/apps/webalizer.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/apps/webalizer.te	2009-08-31 08:56:44.000000000 -0400
 @@ -69,7 +69,6 @@
  fs_search_auto_mountpoints(webalizer_t)
  fs_getattr_xattr_fs(webalizer_t)
@@ -4530,6 +4561,14 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(webalizer_t)
  files_read_etc_runtime_files(webalizer_t)
+@@ -78,6 +77,7 @@
+ logging_send_syslog_msg(webalizer_t)
+ 
+ miscfiles_read_localization(webalizer_t)
++miscfiles_read_public_files(webalizer_t)
+ 
+ sysnet_dns_name_resolve(webalizer_t)
+ sysnet_read_config(webalizer_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.6.29/policy/modules/apps/wine.fc
 --- nsaserefpolicy/policy/modules/apps/wine.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.29/policy/modules/apps/wine.fc	2009-08-28 15:56:54.000000000 -0400
@@ -8554,7 +8593,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.29/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/services/apache.fc	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/services/apache.fc	2009-08-31 08:37:11.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)
@@ -8617,7 +8656,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,32 @@
+@@ -64,11 +74,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)
@@ -8625,9 +8664,10 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/mod_.*				gen_context(system_u:object_r:httpd_var_run_t,s0)
 +/var/run/wsgi.*			-s	gen_context(system_u:object_r:httpd_var_run_t,s0)
  
- /var/spool/gosa(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
+-/var/spool/gosa(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
++/var/spool/gosa(/.*)?			gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
  /var/spool/squirrelmail(/.*)?		gen_context(system_u:object_r:squirrelmail_spool_t,s0)
-+/var/spool/viewvc(/.*)?  		gen_context(system_u:object_r:httpd_sys_script_rw_t, s0)
++/var/spool/viewvc(/.*)?  		gen_context(system_u:object_r:httpd_sys_content_rw_t, s0)
  
  /var/www(/.*)?				gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/www/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
@@ -8639,20 +8679,18 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/share/bugzilla(/.*)?	-d	gen_context(system_u:object_r:httpd_bugzilla_content_t,s0)
 +/usr/share/bugzilla(/.*)?	--	gen_context(system_u:object_r:httpd_bugzilla_script_exec_t,s0)
 +/var/lib/bugzilla(/.*)?			gen_context(system_u:object_r:httpd_bugzilla_content_rw_t,s0)
-+#viewvc file context
-+/var/spool/viewvc(/.*)?  		gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_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)
 +
-+/var/www/svn(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
++/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.29/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/services/apache.if	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/services/apache.if	2009-08-31 08:43:21.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8891,6 +8929,64 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
+@@ -258,8 +198,8 @@
+ 		attribute httpdcontent;
+ 		type httpd_user_content_t, httpd_user_htaccess_t;
+ 		type httpd_user_script_t, httpd_user_script_exec_t;
+-		type httpd_user_script_ra_t, httpd_user_script_ro_t;
+-		type httpd_user_script_rw_t;
++		type httpd_user_content_ra_t, httpd_user_content_t;
++		type httpd_user_content_rw_t;
+ 	')
+ 
+ 	role $1 types httpd_user_script_t;
+@@ -268,26 +208,26 @@
+ 
+ 	allow $2 httpd_user_htaccess_t:file { manage_file_perms relabelto relabelfrom };
+ 
+-	manage_dirs_pattern($2, httpd_user_script_ra_t, httpd_user_script_ra_t)
+-	manage_files_pattern($2, httpd_user_script_ra_t, httpd_user_script_ra_t)
+-	manage_lnk_files_pattern($2, httpd_user_script_ra_t, httpd_user_script_ra_t)
+-	relabel_dirs_pattern($2, httpd_user_script_ra_t, httpd_user_script_ra_t)
+-	relabel_files_pattern($2, httpd_user_script_ra_t, httpd_user_script_ra_t)
+-	relabel_lnk_files_pattern($2, httpd_user_script_ra_t, httpd_user_script_ra_t)
+-
+-	manage_dirs_pattern($2, httpd_user_script_ro_t, httpd_user_script_ro_t)
+-	manage_files_pattern($2, httpd_user_script_ro_t, httpd_user_script_ro_t)
+-	manage_lnk_files_pattern($2, httpd_user_script_ro_t, httpd_user_script_ro_t)
+-	relabel_dirs_pattern($2, httpd_user_script_ro_t, httpd_user_script_ro_t)
+-	relabel_files_pattern($2, httpd_user_script_ro_t, httpd_user_script_ro_t)
+-	relabel_lnk_files_pattern($2, httpd_user_script_ro_t, httpd_user_script_ro_t)
+-
+-	manage_dirs_pattern($2, httpd_user_script_rw_t, httpd_user_script_rw_t)
+-	manage_files_pattern($2, httpd_user_script_rw_t, httpd_user_script_rw_t)
+-	manage_lnk_files_pattern($2, httpd_user_script_rw_t, httpd_user_script_rw_t)
+-	relabel_dirs_pattern($2, httpd_user_script_rw_t, httpd_user_script_rw_t)
+-	relabel_files_pattern($2, httpd_user_script_rw_t, httpd_user_script_rw_t)
+-	relabel_lnk_files_pattern($2, httpd_user_script_rw_t, httpd_user_script_rw_t)
++	manage_dirs_pattern($2, httpd_user_content_ra_t, httpd_user_content_ra_t)
++	manage_files_pattern($2, httpd_user_content_ra_t, httpd_user_content_ra_t)
++	manage_lnk_files_pattern($2, httpd_user_content_ra_t, httpd_user_content_ra_t)
++	relabel_dirs_pattern($2, httpd_user_content_ra_t, httpd_user_content_ra_t)
++	relabel_files_pattern($2, httpd_user_content_ra_t, httpd_user_content_ra_t)
++	relabel_lnk_files_pattern($2, httpd_user_content_ra_t, httpd_user_content_ra_t)
++
++	manage_dirs_pattern($2, httpd_user_content_t, httpd_user_content_t)
++	manage_files_pattern($2, httpd_user_content_t, httpd_user_content_t)
++	manage_lnk_files_pattern($2, httpd_user_content_t, httpd_user_content_t)
++	relabel_dirs_pattern($2, httpd_user_content_t, httpd_user_content_t)
++	relabel_files_pattern($2, httpd_user_content_t, httpd_user_content_t)
++	relabel_lnk_files_pattern($2, httpd_user_content_t, httpd_user_content_t)
++
++	manage_dirs_pattern($2, httpd_user_content_rw_t, httpd_user_content_rw_t)
++	manage_files_pattern($2, httpd_user_content_rw_t, httpd_user_content_rw_t)
++	manage_lnk_files_pattern($2, httpd_user_content_rw_t, httpd_user_content_rw_t)
++	relabel_dirs_pattern($2, httpd_user_content_rw_t, httpd_user_content_rw_t)
++	relabel_files_pattern($2, httpd_user_content_rw_t, httpd_user_content_rw_t)
++	relabel_lnk_files_pattern($2, httpd_user_content_rw_t, httpd_user_content_rw_t)
+ 
+ 	manage_dirs_pattern($2, httpd_user_script_exec_t, httpd_user_script_exec_t)
+ 	manage_files_pattern($2, httpd_user_script_exec_t, httpd_user_script_exec_t)
 @@ -504,6 +444,47 @@
  ########################################
  ## <summary>
@@ -9154,7 +9250,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.29/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/services/apache.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/services/apache.te	2009-08-31 08:40:46.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -9263,7 +9359,7 @@ diff -b -B --ignore-all-space --exclude-
  type httpd_tmp_t;
  files_tmp_file(httpd_tmp_t)
  
-@@ -187,15 +240,20 @@
+@@ -187,28 +240,28 @@
  files_tmpfs_file(httpd_tmpfs_t)
  
  apache_content_template(user)
@@ -9287,7 +9383,25 @@ diff -b -B --ignore-all-space --exclude-
  typealias httpd_user_content_t alias { httpd_auditadm_content_t httpd_secadm_content_t };
  typealias httpd_user_htaccess_t alias { httpd_staff_htaccess_t httpd_sysadm_htaccess_t };
  typealias httpd_user_htaccess_t alias { httpd_auditadm_htaccess_t httpd_secadm_htaccess_t };
-@@ -230,7 +288,7 @@
+-typealias httpd_user_script_t alias { httpd_staff_script_t httpd_sysadm_script_t };
+-typealias httpd_user_script_t alias { httpd_auditadm_script_t httpd_secadm_script_t };
+-typealias httpd_user_script_exec_t alias { httpd_staff_script_exec_t httpd_sysadm_script_exec_t };
+-typealias httpd_user_script_exec_t alias { httpd_auditadm_script_exec_t httpd_secadm_script_exec_t };
+-typealias httpd_user_script_ro_t alias { httpd_staff_script_ro_t httpd_sysadm_script_ro_t };
+-typealias httpd_user_script_ro_t alias { httpd_auditadm_script_ro_t httpd_secadm_script_ro_t };
+-typealias httpd_user_script_rw_t alias { httpd_staff_script_rw_t httpd_sysadm_script_rw_t };
+-typealias httpd_user_script_rw_t alias { httpd_auditadm_script_rw_t httpd_secadm_script_rw_t };
+-typealias httpd_user_script_ra_t alias { httpd_staff_script_ra_t httpd_sysadm_script_ra_t };
+-typealias httpd_user_script_ra_t alias { httpd_auditadm_script_ra_t httpd_secadm_script_ra_t };
++typealias httpd_user_script_t alias { httpd_staff_script_t httpd_sysadm_script_t httpd_auditadm_script_t httpd_secadm_script_t };
++typealias httpd_user_script_exec_t alias { httpd_staff_script_exec_t httpd_sysadm_script_exec_t httpd_auditadm_script_exec_t httpd_secadm_script_exec_t };
++typealias httpd_user_content_t alias { httpd_staff_script_ro_t httpd_sysadm_script_ro_t httpd_auditadm_script_ro_t httpd_secadm_script_ro_t };
++typealias httpd_user_content_rw_t alias { httpd_staff_script_rw_t httpd_sysadm_script_rw_t httpd_auditadm_script_rw_t httpd_secadm_script_rw_t };
++typealias httpd_user_content_ra_t alias { httpd_staff_script_ra_t httpd_sysadm_script_ra_t httpd_auditadm_script_ra_t httpd_secadm_script_ra_t };
+ 
+ # for apache2 memory mapped files
+ type httpd_var_lib_t;
+@@ -230,7 +283,7 @@
  # Apache server local policy
  #
  
@@ -9296,7 +9410,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit httpd_t self:capability { net_admin sys_tty_config };
  allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow httpd_t self:fd use;
-@@ -272,6 +330,7 @@
+@@ -272,6 +325,7 @@
  allow httpd_t httpd_modules_t:dir list_dir_perms;
  mmap_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
  read_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
@@ -9304,7 +9418,7 @@ diff -b -B --ignore-all-space --exclude-
  
  apache_domtrans_rotatelogs(httpd_t)
  # Apache-httpd needs to be able to send signals to the log rotate procs.
-@@ -283,9 +342,9 @@
+@@ -283,9 +337,9 @@
  
  allow httpd_t httpd_suexec_exec_t:file read_file_perms;
  
@@ -9317,7 +9431,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
  manage_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
-@@ -301,6 +360,7 @@
+@@ -301,6 +355,7 @@
  manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
  files_var_lib_filetrans(httpd_t, httpd_var_lib_t, file)
  
@@ -9325,7 +9439,7 @@ diff -b -B --ignore-all-space --exclude-
  manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-@@ -312,16 +372,18 @@
+@@ -312,16 +367,18 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -9349,7 +9463,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_http_port(httpd_t)
  corenet_tcp_bind_http_cache_port(httpd_t)
  corenet_sendrecv_http_server_packets(httpd_t)
-@@ -335,12 +397,11 @@
+@@ -335,12 +392,11 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -9364,7 +9478,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -358,6 +419,10 @@
+@@ -358,6 +414,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -9375,7 +9489,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_read_lib_files(httpd_t)
  
-@@ -372,18 +437,33 @@
+@@ -372,18 +432,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -9413,7 +9527,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  ')
  
-@@ -391,20 +471,54 @@
+@@ -391,20 +466,54 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -9469,7 +9583,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
  	manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
-@@ -415,20 +529,28 @@
+@@ -415,20 +524,28 @@
  	corenet_tcp_bind_ftp_port(httpd_t)
  ')
  
@@ -9502,7 +9616,7 @@ diff -b -B --ignore-all-space --exclude-
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t, httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -451,6 +573,10 @@
+@@ -451,6 +568,10 @@
  ')
  
  optional_policy(`
@@ -9513,7 +9627,7 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(httpd_t, httpd_exec_t)
  ')
  
-@@ -459,8 +585,13 @@
+@@ -459,8 +580,13 @@
  ')
  
  optional_policy(`
@@ -9529,7 +9643,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -468,22 +599,18 @@
+@@ -468,22 +594,18 @@
  	mailman_domtrans_cgi(httpd_t)
  	# should have separate types for public and private archives
  	mailman_search_data(httpd_t)
@@ -9554,7 +9668,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -494,12 +621,23 @@
+@@ -494,12 +616,23 @@
  ')
  
  optional_policy(`
@@ -9578,7 +9692,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -508,6 +646,7 @@
+@@ -508,6 +641,7 @@
  ')
  
  optional_policy(`
@@ -9586,7 +9700,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 +674,22 @@
+@@ -535,6 +669,22 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -9609,7 +9723,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +719,25 @@
+@@ -564,20 +714,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -9641,7 +9755,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -595,23 +755,24 @@
+@@ -595,23 +750,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)
  
@@ -9670,7 +9784,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +785,7 @@
+@@ -624,6 +780,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -9678,7 +9792,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 +793,30 @@
+@@ -631,22 +788,30 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -9697,8 +9811,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
 +read_files_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_content_t)
-+read_files_pattern(httpd_suexec_t, httpd_user_script_rw_t, httpd_user_script_rw_t)
-+read_files_pattern(httpd_suexec_t, httpd_user_script_ra_t, httpd_user_script_ra_t)
++read_files_pattern(httpd_suexec_t, httpd_user_content_rw_t, httpd_user_content_rw_t)
++read_files_pattern(httpd_suexec_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
 +
 +domain_entry_file(httpd_sys_script_t, httpd_sys_content_t)
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
@@ -9716,7 +9830,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +842,14 @@
+@@ -672,15 +837,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -9735,7 +9849,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 +868,24 @@
+@@ -699,12 +863,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -9762,7 +9876,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +893,35 @@
+@@ -712,6 +888,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -9798,7 +9912,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 +934,10 @@
+@@ -724,6 +929,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -9809,7 +9923,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -735,6 +949,8 @@
+@@ -735,6 +944,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -9818,7 +9932,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 +970,12 @@
+@@ -754,6 +965,12 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -9831,7 +9945,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +984,76 @@
+@@ -762,3 +979,74 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')
@@ -9900,11 +10014,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +# Removal of fastcgi, will cause problems without the following
 +typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
-+typealias httpd_sys_content_t alias httpd_fastcgi_content_t;
-+typealias httpd_sys_content_rw_t alias httpd_fastcgi_content_rw_t;
-+typealias httpd_sys_script_ra_t   alias httpd_fastcgi_script_ra_t;
-+typealias httpd_sys_script_ro_t   alias httpd_fastcgi_script_ro_t;
-+typealias httpd_sys_script_rw_t   alias httpd_fastcgi_script_rw_t;
++typealias httpd_sys_content_t alias httpd_fastcgi_content_t, httpd_fastcgi_script_ro_t;
++typealias httpd_sys_content_rw_t alias httpd_fastcgi_content_rw_t, httpd_fastcgi_script_rw_t;
++typealias httpd_sys_content_ra_t   alias httpd_fastcgi_script_ra_t;
 +typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
 +typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
 +
@@ -15549,7 +15661,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.29/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/services/rpc.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/services/rpc.te	2009-08-31 09:07:50.000000000 -0400
 @@ -91,6 +91,8 @@
  
  seutil_dontaudit_search_config(rpcd_t)
@@ -15597,6 +15709,15 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(gssd_t)
  auth_manage_cache(gssd_t) 
+@@ -199,6 +209,8 @@
+ 
+ mount_signal(gssd_t)
+ 
++userdom_signal_all_users(gssd_t)
++
+ tunable_policy(`allow_gssd_read_tmp',`
+ 	userdom_list_user_tmp(gssd_t) 
+ 	userdom_read_user_tmp_files(gssd_t) 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.6.29/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.29/policy/modules/services/rsync.te	2009-08-28 15:56:54.000000000 -0400
@@ -26110,7 +26231,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.29/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/userdomain.if	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/userdomain.if	2009-08-31 09:07:29.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -p -r1.908 -r1.909
--- selinux-policy.spec	28 Aug 2009 20:55:16 -0000	1.908
+++ selinux-policy.spec	31 Aug 2009 13:39:37 -0000	1.909
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,10 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-2
+- Allow gssd to send signals to users
+- Fix duplicate label for apache content
+
 * Fri Aug 28 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-1
 - Update to upstream
 



From kwizart at fedoraproject.org  Mon Aug 31 13:42:23 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 13:42:23 +0000 (UTC)
Subject: rpms/perl-IO-Async/F-11 sources,1.2,1.3 perl-IO-Async.spec,1.1,1.2
Message-ID: <20090831134223.CDCAE11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5194

Modified Files:
	sources perl-IO-Async.spec 
Log Message:
UPdate to 0.23



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 07:20:59 -0000	1.2
+++ sources	31 Aug 2009 13:42:23 -0000	1.3
@@ -1 +1 @@
-92cfc798a468e32aa1bd3d85ef1029e1  IO-Async-0.22.tar.gz
+9dd6cfe42fca273cf49d9b3dd6272f1a  IO-Async-0.23.tar.gz


Index: perl-IO-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/F-11/perl-IO-Async.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-IO-Async.spec	11 Aug 2009 07:20:59 -0000	1.1
+++ perl-IO-Async.spec	31 Aug 2009 13:42:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-IO-Async
-Version:        0.22
-Release:        2%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 Summary:        A collection of modules that implement asynchronous filehandle IO
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 0.23-1
+- Update to 0.23
+
 * Tue Aug 11 2009 kwizart < kwizart at gmail.com > - 0.22-2
 - Add Missing BR
 



From jdieter at fedoraproject.org  Mon Aug 31 13:42:26 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Mon, 31 Aug 2009 13:42:26 +0000 (UTC)
Subject: rpms/deltarpm/devel .cvsignore, 1.5, 1.6 deltarpm.spec, 1.24,
	1.25 import.log, 1.3, 1.4 sources, 1.6, 1.7
Message-ID: <20090831134226.DCE0311C0072@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245/devel

Modified Files:
	.cvsignore deltarpm.spec import.log sources 
Log Message:
Add python bindings to deltarpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Jul 2009 10:15:37 -0000	1.5
+++ .cvsignore	31 Aug 2009 13:42:26 -0000	1.6
@@ -1 +1 @@
-deltarpm-git-20090729.tar.bz2
+deltarpm-git-20090831.tar.bz2


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- deltarpm.spec	17 Aug 2009 20:32:27 -0000	1.24
+++ deltarpm.spec	31 Aug 2009 13:42:26 -0000	1.25
@@ -1,19 +1,22 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090729%{?dist}.1
+Release: 0.git.20090831%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
 # Generate source by doing:
 # git clone git://gitorious.org/deltarpm/deltarpm
 # cd deltarpm
-# git archive --format=tar --prefix="deltarpm-git-20090729/" 0a8fdaa | \
-# bzip2 > deltarpm-git-20090729.tar.bz2
-Source: %{name}-git-20090729.tar.bz2
+# git archive --format=tar --prefix="deltarpm-git-20090831/" 7dd867f | \
+# bzip2 > deltarpm-git-20090831.tar.bz2
+Source: %{name}-git-20090831.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
+BuildRequires: python-devel
 
 %description
 A deltarpm contains the difference between an old
@@ -38,12 +41,21 @@ Requires: deltarpm = %{version}-%{releas
 This package contains tools for creating and using deltasisos,
 a difference between an old and a new iso containing rpms.
 
+%package -n python-deltarpm
+Summary: Python bindings for deltarpm
+Requires: deltarpm = %{version}-%{release}
+
+%description -n python-deltarpm
+This package contains python bindings for deltarpm.
+
 %prep
-%setup -q -n %{name}-git-20090729
+%setup -q -n %{name}-git-20090831
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix}
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix}
+%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} python
 
 %install
 %{__rm} -rf %{buildroot}
@@ -78,12 +90,20 @@ a difference between an old and a new is
 %doc %{_mandir}/man8/drpmsync*
 %{_bindir}/drpmsync
 
+%files -n python-deltarpm
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD
+%{python_sitearch}/*
+
 %changelog
-* Mon Aug 17 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5.0.git.20090729.1
+* Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831
+- Add python bindings sub-package
+
+* Mon Aug 17 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729.1
 - Explain where we get the source from
 - Split *deltaiso commands into deltaiso subpackage (#501953)
 
-* Wed Jul 29 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5.0.git.20090729
+* Wed Jul 29 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729
 - Fix bug in writing Fedora's xz-compressed rpms (surely that's the last one)
 
 * Mon Jul 27 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090727.1
@@ -135,7 +155,7 @@ a difference between an old and a new is
 
 * Wed Jul 11 2007 Jonathan Dieter <jdieter at gmail.com> - 3.4-4
 - Fix prelink bug
-- Ignore verify bits on %doc files as they were set incorrectly in older
+- Ignore verify bits on doc files as they were set incorrectly in older
   versions of rpm.  Without this patch, deltarpm will not delta doc files
   in rpm created before April-May 2007
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jul 2009 10:15:37 -0000	1.3
+++ import.log	31 Aug 2009 13:42:26 -0000	1.4
@@ -1,3 +1,4 @@
 deltarpm-3_5-0_git_20090727_fc11:HEAD:deltarpm-3.5-0.git.20090727.fc11.src.rpm:1248709382
 deltarpm-3_5-0_git_20090727_1_fc11:HEAD:deltarpm-3.5-0.git.20090727.1.fc11.src.rpm:1248718195
 deltarpm-3_5-0_git_20090729_fc11:HEAD:deltarpm-3.5-0.git.20090729.fc11.src.rpm:1248862477
+deltarpm-3_5-0_git_20090831_fc11:HEAD:deltarpm-3.5-0.git.20090831.fc11.src.rpm:1251726064


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Jul 2009 10:15:37 -0000	1.6
+++ sources	31 Aug 2009 13:42:26 -0000	1.7
@@ -1 +1 @@
-da7253de907473d41bd64308ce9167bb  deltarpm-git-20090729.tar.bz2
+dbb32d7c75c1a265c14fdb85f5edd3b5  deltarpm-git-20090831.tar.bz2



From kwizart at fedoraproject.org  Mon Aug 31 13:43:43 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 13:43:43 +0000 (UTC)
Subject: rpms/perl-IO-Async/F-10 sources,1.2,1.3 perl-IO-Async.spec,1.1,1.2
Message-ID: <20090831134343.4E80911C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-IO-Async/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5607

Modified Files:
	sources perl-IO-Async.spec 
Log Message:
Update to 0.23



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 07:22:07 -0000	1.2
+++ sources	31 Aug 2009 13:43:43 -0000	1.3
@@ -1 +1 @@
-92cfc798a468e32aa1bd3d85ef1029e1  IO-Async-0.22.tar.gz
+9dd6cfe42fca273cf49d9b3dd6272f1a  IO-Async-0.23.tar.gz


Index: perl-IO-Async.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Async/F-10/perl-IO-Async.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-IO-Async.spec	11 Aug 2009 07:22:07 -0000	1.1
+++ perl-IO-Async.spec	31 Aug 2009 13:43:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-IO-Async
-Version:        0.22
-Release:        2%{?dist}
+Version:        0.23
+Release:        1%{?dist}
 Summary:        A collection of modules that implement asynchronous filehandle IO
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 0.23-1
+- Update to 0.23
+
 * Tue Aug 11 2009 kwizart < kwizart at gmail.com > - 0.22-2
 - Add Missing BR
 



From overholt at fedoraproject.org  Mon Aug 31 13:44:32 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 13:44:32 +0000 (UTC)
Subject: rpms/plexus-naming/devel import.log, NONE,
	1.1 plexus-naming-1.0-build.xml, NONE,
	1.1 plexus-naming-1.0-jpp-depmap.xml, NONE,
	1.1 plexus-naming-1.0-pom.patch, NONE,
	1.1 plexus-naming-addlicenseheaders.patch, NONE,
	1.1 plexus-naming-components.xml, NONE, 1.1 plexus-naming.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831134432.16BE011C0072@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-naming/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5796/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-naming-1.0-build.xml 
	plexus-naming-1.0-jpp-depmap.xml plexus-naming-1.0-pom.patch 
	plexus-naming-addlicenseheaders.patch 
	plexus-naming-components.xml plexus-naming.spec 
Log Message:
Initial import of plexus-naming (review bug #519425).



--- NEW FILE import.log ---
plexus-naming-1_0-0_5_a3_fc11:HEAD:plexus-naming-1.0-0.5.a3.fc11.src.rpm:1251725777


--- NEW FILE plexus-naming-1.0-build.xml ---
<project name="plexus-naming" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-naming-1.0-alpha-3"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar"/>
      <include name="directory-naming/naming-java/0.8/naming-java-0.8.jar"/>
      <include name="commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
      <include name="directory-naming/naming-config/0.8/naming-config-0.8.jar"/>
      <include name="classworlds/classworlds/1.1/classworlds-1.1.jar"/>
      <include name="directory-naming/naming-core/0.8/naming-core-0.8.jar"/>
      <include name="commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
      <include name="directory-naming/naming-factory/0.8/naming-factory-0.8.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/org/codehaus/plexus/plexus-container-default/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/directory-naming/naming-java/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/commons-dbcp/commons-dbcp/1.2.2"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/directory-naming/naming-config/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/classworlds/classworlds/1.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/directory-naming/naming-core/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/commons-pool/commons-pool/1.2"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/directory-naming/naming-factory/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/external_repo/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-naming-1.0-alpha-3/.m2/repository/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Naming Component 1.0 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.naming.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>


--- NEW FILE plexus-naming-1.0-jpp-depmap.xml ---
<dependencies>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-java</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>directory-naming-java</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-config</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-config</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-factory</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-factory</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-core</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-core</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-java</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-java</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>commons-pool</groupId>
        <artifactId>commons-pool</artifactId>
        <version>1.2</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>commons-pool</artifactId>
        <version>1.2</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>commons-digester</groupId>
        <artifactId>commons-digester</artifactId>
        <version>1.4.1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>commons-digester</artifactId>
        <version>1.7</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>hsqldb</groupId>
        <artifactId>hsqldb</artifactId>
        <version>1.7.1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>hsqldb</artifactId>
        <version>1.7.1</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>geronimo-spec</groupId>
        <artifactId>geronimo-spec-javamail</artifactId>
        <version>1.3.1-rc1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>geronimo-javamail-1.3.1-api</artifactId>
        <version>1.3.1</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>javax.mail</groupId>
        <artifactId>javamail</artifactId>
        <version>1.3.1-rc1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>javamail</artifactId>
        <version>1.3.1</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>javax.activation</groupId>
        <artifactId>activation</artifactId>
        <version>1.3.1-rc1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>jaf</artifactId>
        <version>1.3.1</version>
      </jpp>
  </dependency>
  <dependency>
    <maven>
          <groupId>org.apache.maven.reporting</groupId>
          <artifactId>maven-reporting-impl</artifactId>
          <version>2.0.4</version>
    </maven>
    <jpp>
          <groupId>JPP/maven-shared</groupId>
          <artifactId>reporting-impl</artifactId>
          <version>2.0.4</version>
    </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>commons-dbcp</groupId>
        <artifactId>commons-dbcp</artifactId>
        <version>1.0-alpha-3</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>jakarta-commons-dbcp</artifactId>
        <version>1.2.3</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>avalon-framework</groupId>
        <artifactId>avalon-framework</artifactId>
        <version>4.1.3</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>avalon-framework</artifactId>
        <version>4.3.1</version>
      </jpp>
  </dependency>


</dependencies>

plexus-naming-1.0-pom.patch:
 pom.xml |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE plexus-naming-1.0-pom.patch ---
--- pom.xml.sav0	2007-11-28 18:41:09.000000000 +0100
+++ pom.xml	2007-11-28 18:42:04.000000000 +0100
@@ -46,6 +46,12 @@
       <version>0.8</version>
     </dependency>
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+      <scope>test</scope>
+    </dependency>  
+    <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
       <version>1.2.1</version>

plexus-naming-addlicenseheaders.patch:
 main/java/org/codehaus/plexus/naming/DefaultNaming.java |   15 +++++++++++++++
 main/java/org/codehaus/plexus/naming/Environment.java   |   15 +++++++++++++++
 main/java/org/codehaus/plexus/naming/Naming.java        |   15 +++++++++++++++
 main/java/org/codehaus/plexus/naming/Resource.java      |   15 +++++++++++++++
 test/java/org/codehaus/plexus/naming/NamingTest.java    |   15 +++++++++++++++
 5 files changed, 75 insertions(+)

--- NEW FILE plexus-naming-addlicenseheaders.patch ---
Index: src/main/java/org/codehaus/plexus/naming/Naming.java
===================================================================
--- src/main/java/org/codehaus/plexus/naming/Naming.java	(revision 8362)
+++ src/main/java/org/codehaus/plexus/naming/Naming.java	(working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.codehaus.plexus.naming;
 
 import javax.naming.Context;
Index: src/main/java/org/codehaus/plexus/naming/Resource.java
===================================================================
--- src/main/java/org/codehaus/plexus/naming/Resource.java	(revision 8362)
+++ src/main/java/org/codehaus/plexus/naming/Resource.java	(working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.codehaus.plexus.naming;
 
 import java.util.Properties;
Index: src/main/java/org/codehaus/plexus/naming/DefaultNaming.java
===================================================================
--- src/main/java/org/codehaus/plexus/naming/DefaultNaming.java	(revision 8362)
+++ src/main/java/org/codehaus/plexus/naming/DefaultNaming.java	(working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.codehaus.plexus.naming;
 
 import java.util.Hashtable;
Index: src/test/java/org/codehaus/plexus/naming/NamingTest.java
===================================================================
--- src/test/java/org/codehaus/plexus/naming/NamingTest.java	(revision 8362)
+++ src/test/java/org/codehaus/plexus/naming/NamingTest.java	(working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.codehaus.plexus.naming;
 
 import java.sql.Connection;
Index: src/main/java/org/codehaus/plexus/naming/Environment.java
===================================================================
--- src/main/java/org/codehaus/plexus/naming/Environment.java	(revision 8362)
+++ src/main/java/org/codehaus/plexus/naming/Environment.java	(working copy)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 The Codehaus Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.codehaus.plexus.naming;
 
 /**


--- NEW FILE plexus-naming-components.xml ---
<component-set>
  <components>
    <component>
      <role>org.codehaus.plexus.naming.Naming</role>
      <role-hint>default</role-hint>
      <implementation>org.codehaus.plexus.naming.DefaultNaming</implementation>
      <description>Default implementation of naming.</description>
      <configuration>
        <set-system-properties>true</set-system-properties>
      </configuration>
    </component>
  </components>
</component-set>


--- NEW FILE plexus-naming.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with_maven 0

%define namedversion 1.0-alpha-3

%define parent plexus
%define subname naming

Name:           plexus-naming
Version:        1.0
Release:        0.5.a3%{?dist}
Epoch:          0
Summary:        Plexus Naming Component
License:        ASL 2.0
Group:          Development/Tools
URL:            http://plexus.codehaus.org/

# svn export \
# http://svn.codehaus.org/plexus/plexus-components/tags/plexus-naming-1.0-alpha-3/
# tar czf plexus-naming-1.0-alpha-3-src.tar.gz plexus-naming-1.0-alpha-3
Source0:        %{name}-%{namedversion}-src.tar.gz
Source1:        plexus-naming-1.0-build.xml
Source3:        plexus-naming-1.0-jpp-depmap.xml
Source4:        plexus-naming-components.xml

Patch0:         plexus-naming-1.0-pom.patch
# Some license headers were missing from the .java files.  They have
# been added in SVN trunk and we've back-ported that fix.
# http://jira.codehaus.org/browse/PLXCOMP-144
# http://jira.codehaus.org/secure/attachment/44043/plexus-naming-addlicenseheaders.patch
Patch1:         %{name}-addlicenseheaders.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  junit
BuildRequires:  hsqldb
BuildRequires:  jakarta-commons-logging
%if %{with_maven}
BuildRequires:  maven2
BuildRequires:  maven2-common-poms
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-release
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  plexus-maven-plugin >= 1.3.5
BuildRequires:  maven-doxia
BuildRequires:  maven-doxia-sitetools
BuildRequires:  plexus-maven-plugin >= 1.3.5
BuildRequires:  qdox >= 1.5
BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api
BuildRequires:  avalon-logkit
BuildRequires:  avalon-framework
%endif
BuildRequires:  directory-naming
BuildRequires:  avalon-framework
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-dbcp
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-pool
BuildRequires:  plexus-cdc
BuildRequires:  plexus-classworlds
BuildRequires:  plexus-containers-container-default 
BuildRequires:  plexus-utils >= 1.4.5

Requires:  directory-naming
Requires:  jakarta-commons-pool
Requires:  plexus-classworlds
Requires:  plexus-container-default 
Requires:  plexus-utils >= 1.4.5
Requires:  jpackage-utils
Requires:  java >= 1:1.6.0
Requires(post):    jpackage-utils >= 0:1.7.3
Requires(postun):  jpackage-utils >= 0:1.7.3

%description
The Plexus project seeks to create end-to-end developer tools for 
writing applications. At the core is the container, which can be 
embedded or for a full scale application server. There are many 
reusable components for hibernate, form processing, jndi, i18n, 
velocity, etc. Plexus also includes an application server which 
is like a J2EE application server, without all the baggage.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{name}-%{namedversion}
cp %{SOURCE1} build.xml
mkdir -p target/classes/META-INF/plexus/
cp %{SOURCE4} target/classes/META-INF/plexus/components.xml
%patch0 -b .sav0

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

%if %{with_maven}
    mvn-jpp \
        -Dmaven.test.failure.ignore=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%else
export CLASSPATH=$(build-classpath \
commons-collections \
commons-logging \
commons-dbcp \
commons-pool \
directory-naming/naming-config \
directory-naming/naming-core \
directory-naming/naming-factory \
directory-naming/naming-java \
hsqldb \
plexus/classworlds \
plexus/containers-container-default \
plexus/utils \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}

(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
  ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Fri Aug 28 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.a3
- Add versioned BR and R on plexus-utils

* Fri Aug 28 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.4.a3
- Back-port license header fix.  See:
  http://jira.codehaus.org/browse/PLXCOMP-144

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.3.a3
- Add JDK and JRE requirements

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.2.a3
- Add jpackage-utils as a requirement

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.1.a3
- Fix release tag (it's newer than the old one) to meet Fedora
  guidelines

* Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.a3.5.1
- Import from JPackage and Deepak Bhole's work
- Build without maven for now
- Fixes from Yong Yang:
-- add missing BRs

* Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
- First JPP release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-naming/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Aug 2009 03:21:04 -0000	1.1
+++ .cvsignore	31 Aug 2009 13:44:31 -0000	1.2
@@ -0,0 +1 @@
+plexus-naming-1.0-alpha-3-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-naming/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 03:21:04 -0000	1.1
+++ sources	31 Aug 2009 13:44:31 -0000	1.2
@@ -0,0 +1 @@
+6eafe9cdcf572b70facc32ff1bb75ccf  plexus-naming-1.0-alpha-3-src.tar.gz



From pbrobinson at fedoraproject.org  Mon Aug 31 13:50:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 13:50:52 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.14,1.15
Message-ID: <20090831135052.0715511C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7303

Modified Files:
	mojito.spec 
Log Message:
- Add patch for detection of new NetworkManager


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mojito.spec	31 Aug 2009 08:45:01 -0000	1.14
+++ mojito.spec	31 Aug 2009 13:50:51 -0000	1.15
@@ -1,12 +1,14 @@
 Name:           mojito
 Version:        0.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
 License:        LGPLv2.1
 URL:            http://moblin.org/projects/mojito
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:         nmn-fixNMdetect.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -38,6 +40,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixNMdetect
 chmod 644 examples/*.py 
 
 # Don't run configure from autogen.sh
@@ -102,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-4
+- Add patch for detection of new NetworkManager
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-3
 - Rebuild for new NetworkManager
 



From pbrobinson at fedoraproject.org  Mon Aug 31 13:59:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 13:59:12 +0000 (UTC)
Subject: rpms/mojito/devel mojito-fixNMdetect.patch, NONE, 1.1 mojito.spec, 
	1.15, 1.16
Message-ID: <20090831135912.E7A2D11C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9844

Modified Files:
	mojito.spec 
Added Files:
	mojito-fixNMdetect.patch 
Log Message:
- Actually commit patch for detection of new NetworkManager

mojito-fixNMdetect.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mojito-fixNMdetect.patch ---
--- mojito-0.20/configure.ac.orig	2009-08-31 14:42:10.000000000 +0100
+++ mojito-0.20/configure.ac	2009-08-31 14:42:27.000000000 +0100
@@ -69,7 +69,7 @@
         [test "$with_online" = networkmanager],
         [
         AC_MSG_RESULT([Network Manager])
-        PKG_CHECK_MODULES(NM, libnm_glib >= 0.7)
+        PKG_CHECK_MODULES(NM, libnm-glib >= 0.7)
         AC_DEFINE([WITH_ONLINE_NM], 1, [NM online detection])
         ],
 


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mojito.spec	31 Aug 2009 13:50:51 -0000	1.15
+++ mojito.spec	31 Aug 2009 13:59:12 -0000	1.16
@@ -7,7 +7,7 @@ Group:          Applications/Internet
 License:        LGPLv2.1
 URL:            http://moblin.org/projects/mojito
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-Patch0:         nmn-fixNMdetect.patch
+Patch0:         mojito-fixNMdetect.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-5
+- Actually commit patch for detection of new NetworkManager
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.20-4
 - Add patch for detection of new NetworkManager
 



From pbrobinson at fedoraproject.org  Mon Aug 31 14:01:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 14:01:03 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.16,1.17
Message-ID: <20090831140103.61C9D11C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10256

Modified Files:
	mojito.spec 
Log Message:
- Actually commit patch for detection of new NetworkManager


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mojito.spec	31 Aug 2009 13:59:12 -0000	1.16
+++ mojito.spec	31 Aug 2009 14:01:03 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.20
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet



From pbrobinson at fedoraproject.org  Mon Aug 31 14:14:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 14:14:01 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel nmn-fixNMdetect.patch, NONE,
	1.1 network-manager-netbook.spec, 1.2, 1.3 import.log, 1.1, NONE
Message-ID: <20090831141401.52A6911C0072@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-serv12932

Modified Files:
	network-manager-netbook.spec 
Added Files:
	nmn-fixNMdetect.patch 
Removed Files:
	import.log 
Log Message:
- Add patch for detection of new NetworkManager

nmn-fixNMdetect.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nmn-fixNMdetect.patch ---
--- network-manager-netbook-1.2/configure.in.org	2009-08-31 15:09:36.000000000 +0100
+++ network-manager-netbook-1.2/configure.in	2009-08-31 15:09:52.000000000 +0100
@@ -19,7 +19,7 @@
 IT_PROG_INTLTOOL([0.35.0])
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm_glib mobile-broadband-provider-info)
+PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm-glib mobile-broadband-provider-info)
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- network-manager-netbook.spec	26 Aug 2009 22:55:51 -0000	1.2
+++ network-manager-netbook.spec	31 Aug 2009 14:14:01 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           network-manager-netbook
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@ URL:            http://projects.gnome.or
 Source0:        %{tarfile}
 Source1:        COPYING
 Patch0:         network-manager-netbook-full-desktop.patch
+Patch1:         nmn-fixNMdetect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -43,6 +44,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
@@ -88,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-6
+- Add patch for detection of new NetworkManager
+
 * Wed Aug 26 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-5
 - Bump build
 


--- import.log DELETED ---



From kwizart at fedoraproject.org  Mon Aug 31 14:23:57 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 14:23:57 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec,1.18,1.19
Message-ID: <20090831142357.3760E11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17604

Modified Files:
	perl-AnyEvent.spec 
Log Message:
Update to 5.112



Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-AnyEvent.spec	27 Jul 2009 15:32:58 -0000	1.18
+++ perl-AnyEvent.spec	31 Aug 2009 14:23:57 -0000	1.19
@@ -1,14 +1,14 @@
-%define         version_anyevent 4.87
+%global subver 2
 
 Name:           perl-AnyEvent
-Version:        4.870
+Version:        5.11
 Release:        1%{?dist}
 Summary:        Framework for multiple event loops
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/AnyEvent/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version_anyevent}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-%{version}%{?subver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,7 +26,7 @@ peacefully at any one time).
 
 
 %prep
-%setup -q -n AnyEvent-%{version_anyevent}
+%setup -q -n AnyEvent-%{version}%{?subver}
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -36,11 +36,10 @@ cat << \EOF > %{name}-req
   sed -e '/perl(EV)/d' | \
   sed -e '/perl(Irssi)/d' | \
   sed -e '/^perl(Qt/d' | \
-  sed -e '/^perl(IO::Async/d' | \
   sed -e '/^perl(AnyEvent::Impl::Qt/d'
 
 EOF
-%define __perl_requires %{_builddir}/AnyEvent-%{version_anyevent}/%{name}-req
+%define __perl_requires %{_builddir}/AnyEvent-%{version}%{?subver}/%{name}-req
 chmod +x %{name}-req
 
 # Filter unwanted Provides:
@@ -50,7 +49,7 @@ cat << \EOF > %{name}-prov
   sed -e '/^perl(AnyEvent::Impl::Qt/d'
 
 EOF
-%define __perl_provides %{_builddir}/AnyEvent-%{version_anyevent}/%{name}-prov
+%define __perl_provides %{_builddir}/AnyEvent-%{version}%{?subver}/%{name}-prov
 chmod +x %{name}-prov
 
 %build
@@ -77,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes COPYING README
+%{perl_vendorlib}/AE.pm
 %{perl_vendorlib}/AnyEvent*
 %{_mandir}/man3/*.3*
 



From jdieter at fedoraproject.org  Mon Aug 31 14:26:04 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Mon, 31 Aug 2009 14:26:04 +0000 (UTC)
Subject: rpms/deltarpm/devel .cvsignore, 1.6, 1.7 deltarpm.spec, 1.25,
	1.26 import.log, 1.4, 1.5 sources, 1.7, 1.8
Message-ID: <20090831142604.38B6811C0072@cvs1.fedora.phx.redhat.com>

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18423/devel

Modified Files:
	.cvsignore deltarpm.spec import.log sources 
Log Message:
Fix build errors


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 13:42:26 -0000	1.6
+++ .cvsignore	31 Aug 2009 14:26:03 -0000	1.7
@@ -1 +1 @@
-deltarpm-git-20090831.tar.bz2
+deltarpm-git-20090831.1.tar.bz2


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- deltarpm.spec	31 Aug 2009 13:42:26 -0000	1.25
+++ deltarpm.spec	31 Aug 2009 14:26:03 -0000	1.26
@@ -3,16 +3,16 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831%{?dist}
+Release: 0.git.20090831.1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
 # Generate source by doing:
 # git clone git://gitorious.org/deltarpm/deltarpm
 # cd deltarpm
-# git archive --format=tar --prefix="deltarpm-git-20090831/" 7dd867f | \
-# bzip2 > deltarpm-git-20090831.tar.bz2
-Source: %{name}-git-20090831.tar.bz2
+# git archive --format=tar --prefix="deltarpm-git-20090831.1/" a3c6998 | \
+# bzip2 > deltarpm-git-20090831.1.tar.bz2
+Source: %{name}-git-20090831.1.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
@@ -49,7 +49,7 @@ Requires: deltarpm = %{version}-%{releas
 This package contains python bindings for deltarpm.
 
 %prep
-%setup -q -n %{name}-git-20090831
+%setup -q -n %{name}-git-20090831.1
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -96,8 +96,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
-* Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831
+* Mon Aug 31 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090831.1
 - Add python bindings sub-package
+- Fix build error
 
 * Mon Aug 17 2009 Jonathan Dieter <jdieter at gmail.com> - 3.5-0.git.20090729.1
 - Explain where we get the source from


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	31 Aug 2009 13:42:26 -0000	1.4
+++ import.log	31 Aug 2009 14:26:04 -0000	1.5
@@ -2,3 +2,4 @@ deltarpm-3_5-0_git_20090727_fc11:HEAD:de
 deltarpm-3_5-0_git_20090727_1_fc11:HEAD:deltarpm-3.5-0.git.20090727.1.fc11.src.rpm:1248718195
 deltarpm-3_5-0_git_20090729_fc11:HEAD:deltarpm-3.5-0.git.20090729.fc11.src.rpm:1248862477
 deltarpm-3_5-0_git_20090831_fc11:HEAD:deltarpm-3.5-0.git.20090831.fc11.src.rpm:1251726064
+deltarpm-3_5-0_git_20090831_1_fc11:HEAD:deltarpm-3.5-0.git.20090831.1.fc11.src.rpm:1251728709


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	31 Aug 2009 13:42:26 -0000	1.7
+++ sources	31 Aug 2009 14:26:04 -0000	1.8
@@ -1 +1 @@
-dbb32d7c75c1a265c14fdb85f5edd3b5  deltarpm-git-20090831.tar.bz2
+08f91084efa0283bda2aa0cdaf8b649e  deltarpm-git-20090831.1.tar.bz2



From rdieter at fedoraproject.org  Mon Aug 31 14:26:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 14:26:44 +0000 (UTC)
Subject: rpms/uw-imap/EL-5 imap-2007e-authmd5.patch, NONE,
	1.1 imap-2007e-overflow.patch, NONE, 1.1 imap-2007e-shared.patch,
	NONE, 1.1 uw-imap.spec, 1.29, 1.30 imap-2001a-overflow.patch,
	1.1, NONE imap-2002e-authmd5.patch, 1.1,
	NONE imap-2002e-shared.patch, 1.1, NONE
Message-ID: <20090831142644.AF56611C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18730

Modified Files:
	uw-imap.spec 
Added Files:
	imap-2007e-authmd5.patch imap-2007e-overflow.patch 
	imap-2007e-shared.patch 
Removed Files:
	imap-2001a-overflow.patch imap-2002e-authmd5.patch 
	imap-2002e-shared.patch 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> 
- omit -devel, -static bits in EPEL builds (#518885)


imap-2007e-authmd5.patch:
 auth_md5.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE imap-2007e-authmd5.patch ---
diff -up imap-2007e/src/c-client/auth_md5.c.authmd5 imap-2007e/src/c-client/auth_md5.c
--- imap-2007e/src/c-client/auth_md5.c.authmd5	2008-06-04 13:18:34.000000000 -0500
+++ imap-2007e/src/c-client/auth_md5.c	2009-07-07 19:24:12.348005485 -0500
@@ -42,17 +42,17 @@ typedef struct {
 
 /* Prototypes */
 
-long auth_md5_valid (void);
-long auth_md5_client (authchallenge_t challenger,authrespond_t responder,
+static long auth_md5_valid (void);
+static long auth_md5_client (authchallenge_t challenger,authrespond_t responder,
 		      char *service,NETMBX *mb,void *stream,
 		      unsigned long *trial,char *user);
-char *auth_md5_server (authresponse_t responder,int argc,char *argv[]);
-char *auth_md5_pwd (char *user);
+static char *auth_md5_server (authresponse_t responder,int argc,char *argv[]);
+static char *auth_md5_pwd (char *user);
 char *apop_login (char *chal,char *user,char *md5,int argc,char *argv[]);
-char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl);
-void md5_init (MD5CONTEXT *ctx);
-void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len);
-void md5_final (unsigned char *digest,MD5CONTEXT *ctx);
+static char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl);
+static void md5_init (MD5CONTEXT *ctx);
+static void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len);
+static void md5_final (unsigned char *digest,MD5CONTEXT *ctx);
 static void md5_transform (unsigned long *state,unsigned char *block);
 static void md5_encode (unsigned char *dst,unsigned long *src,int len);
 static void md5_decode (unsigned long *dst,unsigned char *src,int len);

imap-2007e-overflow.patch:
 rfc822.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE imap-2007e-overflow.patch ---
diff -up imap-2007e/src/c-client/rfc822.c.overflow imap-2007e/src/c-client/rfc822.c
--- imap-2007e/src/c-client/rfc822.c.overflow	2008-12-12 11:08:26.000000000 -0600
+++ imap-2007e/src/c-client/rfc822.c	2009-07-07 19:27:20.057772757 -0500
@@ -384,6 +384,9 @@ void rfc822_parse_content (BODY *body,ST
 	if (CHR (bs) == '\012'){/* following LF? */
 	  c = SNX (bs); i--;	/* yes, slurp it */
 	}
+	if (!i)			/* Make sure we don't get an overflow for */
+	  break;		/* messages ending on \015 (or the following */
+				/* i-- will cause i to be MAXINT. Not good.) */
       case '\012':		/* at start of a line, start with -- ? */
 	if (!(i && i-- && ((c = SNX (bs)) == '-') && i-- &&
 	      ((c = SNX (bs)) == '-'))) break;

imap-2007e-shared.patch:
 Makefile |   30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

--- NEW FILE imap-2007e-shared.patch ---
diff -up imap-2007e/src/osdep/unix/Makefile.shared imap-2007e/src/osdep/unix/Makefile
--- imap-2007e/src/osdep/unix/Makefile.shared	2009-07-07 19:28:02.909755512 -0500
+++ imap-2007e/src/osdep/unix/Makefile	2009-07-07 19:29:35.870006799 -0500
@@ -170,6 +170,10 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
  EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\
  PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
 
+# Need this for the shared library rule to work correctly
+.SUFFIXES: .o .so
+SOFILES=${BINARIES:.o=.so}
+
 
 # Here if no make argument established
 
@@ -845,18 +849,24 @@ vu2:	# VAX Ultrix 2.3, etc.
 
 # Build it!
 
-build:	clean once $(ARCHIVE)
+build:	clean once $(ARCHIVE) $(SHLIBNAME)
 
-all:	$(ARCHIVE)
+all:	$(ARCHIVE) $(SHLIBNAME)
 
 $(ARCHIVE): $(BINARIES)
 	sh -c '$(RM) $(ARCHIVE) || true'
 	@$(CAT) ARCHIVE
 	@$(SH) ARCHIVE
 
-.c.o:
-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+$(SHLIBNAME):	$(SOFILES)
+	gcc -shared -Wl,-soname,$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
+	ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
 
+.c.so:	osdep.h
+	$(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` ${@:.so=.c} -o $@
+
+.c.o:
+	$(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` $*.c
 
 # Cleanup
 
@@ -895,8 +905,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h
 
 
 # OS-dependent
-
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
 	osdep.h env_unix.h tcp_unix.h \
 	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
 	auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
@@ -910,12 +919,19 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
 	write.c sslstdio.c \
 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
 	OSCFLAGS
+
+osdep.o:	$(OSDEPS)
+	$(CC) -fPIC -DPIC -D_REENTRANT `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+	@echo ========================================================================
 	@echo Building OS-dependent module
 	@echo If you get No such file error messages for files x509.h, ssl.h,
 	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
 	@echo is not installed on your system.  Either install OpenSSL first
 	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+	@echo ========================================================================
+
+osdep.so:	$(OSDEPS)
+	$(CC) -fPIC -DPIC -D_REENTRANT `$(CAT) CFLAGS` `cat OSCFLAGS` -c osdep.c -o $@
 
 osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
 	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-5/uw-imap.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- uw-imap.spec	19 Dec 2008 19:27:44 -0000	1.29
+++ uw-imap.spec	31 Aug 2009 14:26:44 -0000	1.30
@@ -1,20 +1,18 @@
-%define _default_patch_fuzz 2
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
-#define beta 1
-#define dev .DEV.SNAP-
-#define snap 0709171900
-
+%if 0%{?fedora}
+%define _with_devel 1
 # ship static lib, matches default upstream config
 # as convenience to users, since our hacked shlib can potentially break 
 # abi semi-often
 %define _with_static 1
+%endif
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 1%{?dist}
+Release: 7%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -56,9 +54,9 @@ Source35: pop3s-xinetd
 Patch1: imap-2007-paths.patch
 # See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271
 Patch2: imap-2004a-doc.patch
-Patch5: imap-2001a-overflow.patch
-Patch9: imap-2002e-shared.patch
-Patch10: imap-2002e-authmd5.patch
+Patch5: imap-2007e-overflow.patch
+Patch9: imap-2007e-shared.patch
+Patch10: imap-2007e-authmd5.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -68,6 +66,8 @@ BuildRequires: pam-devel
 Prereq: xinetd
 Requires(post): openssl
 
+Requires: %{imap_libs} = %{version}-%{release}
+
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
 Message Access Protocol) and POP (Post Office Protocol) mail access
@@ -118,6 +118,7 @@ which will use the UW C-client common AP
 %package utils
 Summary: UW IMAP Utilities to make managing your email simpler
 Group: 	 Applications/System 
+Requires: %{imap_libs} = %{version}-%{release}
 # imap -> uw-imap rename
 Obsoletes: imap-utils < 1:%{version}
 %description utils
@@ -158,12 +159,10 @@ GSSDIR=$(krb5-config --prefix)
 # SSL setup, probably legacy-only, but shouldn't hurt -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
 # $RPM_OPT_FLAGS
-export EXTRACFLAGS="$EXTRACFLAGS $RPM_OPT_FLAGS"
+export EXTRACFLAGS="$EXTRACFLAGS -fPIC $RPM_OPT_FLAGS"
 # jorton added these, I'll assume he knows what he's doing. :) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 export EXTRACFLAGS="$EXTRACFLAGS -Wno-pointer-sign"
-%endif
 
 echo "y" | \
 make %{?_smp_mflags} lnp \
@@ -183,12 +182,14 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
 
-%if "%{?_with_static:1}" == "1"
+%if 0%{?_with_static:1}
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
 %endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
+
+%if 0%{?_with_devel:1}
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap/
@@ -196,6 +197,7 @@ install -m644 ./c-client/*.h $RPM_BUILD_
 # Added linkage.c to fix (#34658) <mharris>
 install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/
 install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/
+%endif
 
 install -p -D -m644 src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8uw
 install -p -D -m644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipopd.8uw
@@ -227,7 +229,7 @@ touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,
 touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
-# FIXME -- Rex
+# FIXME, do on first launch (or not at all?), not here -- Rex
 %post
 {
 cd %{sslcerts} &> /dev/null || :
@@ -295,12 +297,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
+%if 0%{?_with_devel:1}
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/imap/
 %{_libdir}/lib%{soname}.so
+%endif
 
-%if "%{?_with_static:1}" == "1"
+%if 0%{?_with_static:1}
 %files static
 %defattr(-,root,root,-)
 %{_libdir}/c-client.a
@@ -309,6 +313,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> 
+- omit -devel, -static bits in EPEL builds (#518885)
+
+* Wed Jul 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 2007e-7
+- fix shared.patch to use CFLAGS for osdep.c too
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 2007e-6
+- build with -fPIC
+- rebase patches (patch fuzz=0)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007e-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 2007e-4
+- rebuild with new openssl
+
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-3
+- main/-utils: +Req: %%imap_libs = %%version-%%release
+
 * Fri Dec 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2007e-1
 - imap-2007e
 


--- imap-2001a-overflow.patch DELETED ---


--- imap-2002e-authmd5.patch DELETED ---


--- imap-2002e-shared.patch DELETED ---



From rdieter at fedoraproject.org  Mon Aug 31 14:26:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 14:26:59 +0000 (UTC)
Subject: rpms/uw-imap/EL-4 imap-2007e-authmd5.patch, NONE,
	1.1 imap-2007e-overflow.patch, NONE, 1.1 imap-2007e-shared.patch,
	NONE, 1.1 uw-imap.spec, 1.31, 1.32 imap-2001a-overflow.patch,
	1.1, NONE imap-2002e-authmd5.patch, 1.1,
	NONE imap-2002e-shared.patch, 1.1, NONE
Message-ID: <20090831142659.E87FB11C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18833

Modified Files:
	uw-imap.spec 
Added Files:
	imap-2007e-authmd5.patch imap-2007e-overflow.patch 
	imap-2007e-shared.patch 
Removed Files:
	imap-2001a-overflow.patch imap-2002e-authmd5.patch 
	imap-2002e-shared.patch 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> 
- omit -devel, -static bits in EPEL builds (#518885)


imap-2007e-authmd5.patch:
 auth_md5.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE imap-2007e-authmd5.patch ---
diff -up imap-2007e/src/c-client/auth_md5.c.authmd5 imap-2007e/src/c-client/auth_md5.c
--- imap-2007e/src/c-client/auth_md5.c.authmd5	2008-06-04 13:18:34.000000000 -0500
+++ imap-2007e/src/c-client/auth_md5.c	2009-07-07 19:24:12.348005485 -0500
@@ -42,17 +42,17 @@ typedef struct {
 
 /* Prototypes */
 
-long auth_md5_valid (void);
-long auth_md5_client (authchallenge_t challenger,authrespond_t responder,
+static long auth_md5_valid (void);
+static long auth_md5_client (authchallenge_t challenger,authrespond_t responder,
 		      char *service,NETMBX *mb,void *stream,
 		      unsigned long *trial,char *user);
-char *auth_md5_server (authresponse_t responder,int argc,char *argv[]);
-char *auth_md5_pwd (char *user);
+static char *auth_md5_server (authresponse_t responder,int argc,char *argv[]);
+static char *auth_md5_pwd (char *user);
 char *apop_login (char *chal,char *user,char *md5,int argc,char *argv[]);
-char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl);
-void md5_init (MD5CONTEXT *ctx);
-void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len);
-void md5_final (unsigned char *digest,MD5CONTEXT *ctx);
+static char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl);
+static void md5_init (MD5CONTEXT *ctx);
+static void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len);
+static void md5_final (unsigned char *digest,MD5CONTEXT *ctx);
 static void md5_transform (unsigned long *state,unsigned char *block);
 static void md5_encode (unsigned char *dst,unsigned long *src,int len);
 static void md5_decode (unsigned long *dst,unsigned char *src,int len);

imap-2007e-overflow.patch:
 rfc822.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE imap-2007e-overflow.patch ---
diff -up imap-2007e/src/c-client/rfc822.c.overflow imap-2007e/src/c-client/rfc822.c
--- imap-2007e/src/c-client/rfc822.c.overflow	2008-12-12 11:08:26.000000000 -0600
+++ imap-2007e/src/c-client/rfc822.c	2009-07-07 19:27:20.057772757 -0500
@@ -384,6 +384,9 @@ void rfc822_parse_content (BODY *body,ST
 	if (CHR (bs) == '\012'){/* following LF? */
 	  c = SNX (bs); i--;	/* yes, slurp it */
 	}
+	if (!i)			/* Make sure we don't get an overflow for */
+	  break;		/* messages ending on \015 (or the following */
+				/* i-- will cause i to be MAXINT. Not good.) */
       case '\012':		/* at start of a line, start with -- ? */
 	if (!(i && i-- && ((c = SNX (bs)) == '-') && i-- &&
 	      ((c = SNX (bs)) == '-'))) break;

imap-2007e-shared.patch:
 Makefile |   30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

--- NEW FILE imap-2007e-shared.patch ---
diff -up imap-2007e/src/osdep/unix/Makefile.shared imap-2007e/src/osdep/unix/Makefile
--- imap-2007e/src/osdep/unix/Makefile.shared	2009-07-07 19:28:02.909755512 -0500
+++ imap-2007e/src/osdep/unix/Makefile	2009-07-07 19:29:35.870006799 -0500
@@ -170,6 +170,10 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
  EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\
  PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
 
+# Need this for the shared library rule to work correctly
+.SUFFIXES: .o .so
+SOFILES=${BINARIES:.o=.so}
+
 
 # Here if no make argument established
 
@@ -845,18 +849,24 @@ vu2:	# VAX Ultrix 2.3, etc.
 
 # Build it!
 
-build:	clean once $(ARCHIVE)
+build:	clean once $(ARCHIVE) $(SHLIBNAME)
 
-all:	$(ARCHIVE)
+all:	$(ARCHIVE) $(SHLIBNAME)
 
 $(ARCHIVE): $(BINARIES)
 	sh -c '$(RM) $(ARCHIVE) || true'
 	@$(CAT) ARCHIVE
 	@$(SH) ARCHIVE
 
-.c.o:
-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+$(SHLIBNAME):	$(SOFILES)
+	gcc -shared -Wl,-soname,$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
+	ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
 
+.c.so:	osdep.h
+	$(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` ${@:.so=.c} -o $@
+
+.c.o:
+	$(CC) -fPIC -DPIC -D_REENTRANT -c `$(CAT) CFLAGS` $*.c
 
 # Cleanup
 
@@ -895,8 +905,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h
 
 
 # OS-dependent
-
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
 	osdep.h env_unix.h tcp_unix.h \
 	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
 	auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
@@ -910,12 +919,19 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
 	write.c sslstdio.c \
 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
 	OSCFLAGS
+
+osdep.o:	$(OSDEPS)
+	$(CC) -fPIC -DPIC -D_REENTRANT `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+	@echo ========================================================================
 	@echo Building OS-dependent module
 	@echo If you get No such file error messages for files x509.h, ssl.h,
 	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
 	@echo is not installed on your system.  Either install OpenSSL first
 	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+	@echo ========================================================================
+
+osdep.so:	$(OSDEPS)
+	$(CC) -fPIC -DPIC -D_REENTRANT `$(CAT) CFLAGS` `cat OSCFLAGS` -c osdep.c -o $@
 
 osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
 	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-4/uw-imap.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- uw-imap.spec	19 Dec 2008 19:26:37 -0000	1.31
+++ uw-imap.spec	31 Aug 2009 14:26:59 -0000	1.32
@@ -1,20 +1,18 @@
-%define _default_patch_fuzz 2
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
-#define beta 1
-#define dev .DEV.SNAP-
-#define snap 0709171900
-
+%if 0%{?fedora}
+%define _with_devel 1
 # ship static lib, matches default upstream config
 # as convenience to users, since our hacked shlib can potentially break 
 # abi semi-often
 %define _with_static 1
+%endif
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 1%{?dist}
+Release: 7%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -56,9 +54,9 @@ Source35: pop3s-xinetd
 Patch1: imap-2007-paths.patch
 # See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271
 Patch2: imap-2004a-doc.patch
-Patch5: imap-2001a-overflow.patch
-Patch9: imap-2002e-shared.patch
-Patch10: imap-2002e-authmd5.patch
+Patch5: imap-2007e-overflow.patch
+Patch9: imap-2007e-shared.patch
+Patch10: imap-2007e-authmd5.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -68,6 +66,8 @@ BuildRequires: pam-devel
 Prereq: xinetd
 Requires(post): openssl
 
+Requires: %{imap_libs} = %{version}-%{release}
+
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
 Message Access Protocol) and POP (Post Office Protocol) mail access
@@ -118,6 +118,7 @@ which will use the UW C-client common AP
 %package utils
 Summary: UW IMAP Utilities to make managing your email simpler
 Group: 	 Applications/System 
+Requires: %{imap_libs} = %{version}-%{release}
 # imap -> uw-imap rename
 Obsoletes: imap-utils < 1:%{version}
 %description utils
@@ -158,12 +159,10 @@ GSSDIR=$(krb5-config --prefix)
 # SSL setup, probably legacy-only, but shouldn't hurt -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
 # $RPM_OPT_FLAGS
-export EXTRACFLAGS="$EXTRACFLAGS $RPM_OPT_FLAGS"
+export EXTRACFLAGS="$EXTRACFLAGS -fPIC $RPM_OPT_FLAGS"
 # jorton added these, I'll assume he knows what he's doing. :) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 export EXTRACFLAGS="$EXTRACFLAGS -Wno-pointer-sign"
-%endif
 
 echo "y" | \
 make %{?_smp_mflags} lnp \
@@ -183,12 +182,14 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
 
-%if "%{?_with_static:1}" == "1"
+%if 0%{?_with_static:1}
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
 %endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
+
+%if 0%{?_with_devel:1}
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap/
@@ -196,6 +197,7 @@ install -m644 ./c-client/*.h $RPM_BUILD_
 # Added linkage.c to fix (#34658) <mharris>
 install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/
 install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/
+%endif
 
 install -p -D -m644 src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8uw
 install -p -D -m644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipopd.8uw
@@ -227,7 +229,7 @@ touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,
 touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
-# FIXME -- Rex
+# FIXME, do on first launch (or not at all?), not here -- Rex
 %post
 {
 cd %{sslcerts} &> /dev/null || :
@@ -295,12 +297,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
+%if 0%{?_with_devel:1}
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/imap/
 %{_libdir}/lib%{soname}.so
+%endif
 
-%if "%{?_with_static:1}" == "1"
+%if 0%{?_with_static:1}
 %files static
 %defattr(-,root,root,-)
 %{_libdir}/c-client.a
@@ -309,6 +313,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> 
+- omit -devel, -static bits in EPEL builds (#518885)
+
+* Wed Jul 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 2007e-7
+- fix shared.patch to use CFLAGS for osdep.c too
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 2007e-6
+- build with -fPIC
+- rebase patches (patch fuzz=0)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007e-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 2007e-4
+- rebuild with new openssl
+
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-3
+- main/-utils: +Req: %%imap_libs = %%version-%%release
+
 * Fri Dec 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2007e-1
 - imap-2007e
 


--- imap-2001a-overflow.patch DELETED ---


--- imap-2002e-authmd5.patch DELETED ---


--- imap-2002e-shared.patch DELETED ---



From kwizart at fedoraproject.org  Mon Aug 31 14:27:25 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 14:27:25 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel sources,1.13,1.14 .cvsignore,1.13,1.14
Message-ID: <20090831142725.28C7811C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18800

Modified Files:
	sources .cvsignore 
Log Message:
Fix source



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Jul 2009 15:17:30 -0000	1.13
+++ sources	31 Aug 2009 14:27:24 -0000	1.14
@@ -1 +1 @@
-f7545a658210639a5e4bd5e81a6884e0  AnyEvent-4.87.tar.gz
+21f43e5fc3e55a079f672add72c64262  AnyEvent-5.112.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	27 Jul 2009 15:17:30 -0000	1.13
+++ .cvsignore	31 Aug 2009 14:27:25 -0000	1.14
@@ -1 +1 @@
-AnyEvent-4.87.tar.gz
+AnyEvent-5.112.tar.gz



From jwilson at fedoraproject.org  Mon Aug 31 14:28:07 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 31 Aug 2009 14:28:07 +0000 (UTC)
Subject: rpms/kernel/F-11 hdpvr-ir-enable.patch,1.2,1.3
Message-ID: <20090831142807.65FD211C0072@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19592

Modified Files:
	hdpvr-ir-enable.patch 
Log Message:
Add correct hdpvr ir enable patch here too

hdpvr-ir-enable.patch:
 Makefile     |    4 +---
 hdpvr-core.c |    7 +++----
 hdpvr-i2c.c  |   38 ++++++++++++++++++++++++++++++++------
 3 files changed, 36 insertions(+), 13 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/hdpvr-ir-enable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hdpvr-ir-enable.patch	10 Aug 2009 20:19:22 -0000	1.2
+++ hdpvr-ir-enable.patch	31 Aug 2009 14:28:07 -0000	1.3
@@ -1,29 +1,62 @@
 From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
 
 ---
- drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
- 2 files changed, 30 insertions(+), 9 deletions(-)
+ drivers/media/video/hdpvr/Makefile     |    4 +--
+ drivers/media/video/hdpvr/hdpvr-core.c |    7 ++---
+ drivers/media/video/hdpvr/hdpvr-i2c.c  |   38 ++++++++++++++++++++++++++-----
+ 3 files changed, 36 insertions(+), 13 deletions(-)
 
+diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
+index e0230fc..79ad2e1 100644
+--- a/drivers/media/video/hdpvr/Makefile
++++ b/drivers/media/video/hdpvr/Makefile
+@@ -1,6 +1,4 @@
+-hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
+-
+-hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
++hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o
+ 
+ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..878d1e5 100644
+index 188bd5a..9fa3d8d 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
+@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
+ 		goto error;
  	}
  
- #ifdef CONFIG_I2C
+-#ifdef CONFIG_I2C
 -	/* until i2c is working properly */
 -	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 +	retval = hdpvr_register_i2c_adapter(dev);
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
+@@ -414,7 +413,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
+ 	mutex_unlock(&dev->io_mutex);
+ 
+ 	/* deregister I2C adapter */
+-#ifdef CONFIG_I2C
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+ 	mutex_lock(&dev->i2c_mutex);
+ 	if (dev->i2c_adapter)
+ 		i2c_del_adapter(dev->i2c_adapter);
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..1c01b6c 100644
+index c4b5d15..994305c 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -22,7 +22,7 @@
+@@ -10,6 +10,8 @@
+  *
+  */
+ 
++#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
++
+ #include <linux/i2c.h>
+ 
+ #include "hdpvr.h"
+@@ -22,7 +24,7 @@
  #define REQTYPE_I2C_WRITE_STATT	0xd0
  
  static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
@@ -32,7 +65,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -32,7 +34,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_rcvctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
@@ -41,7 +74,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret == len) {
  		memcpy(data, buf, len);
-@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
+@@ -46,7 +48,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
  }
  
  static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
@@ -50,7 +83,7 @@ index c4b5d15..1c01b6c 100644
  {
  	int ret;
  	char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
+@@ -57,7 +59,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
  	ret = usb_control_msg(dev->udev,
  			      usb_sndctrlpipe(dev->udev, 0),
  			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
@@ -59,15 +92,7 @@ index c4b5d15..1c01b6c 100644
  
  	if (ret < 0)
  		goto error;
- 
- 	ret = usb_control_msg(dev->udev,
- 			      usb_rcvctrlpipe(dev->udev, 0),
--			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-+			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
- 			      0, 0, buf, 2, 1000);
- 
- 	if (ret == 2)
-@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
+@@ -93,10 +95,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
  
  		if (msgs[i].flags & I2C_M_RD)
  			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
@@ -80,7 +105,7 @@ index c4b5d15..1c01b6c 100644
  	}
  
  	mutex_unlock(&dev->i2c_mutex);
-@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
+@@ -114,6 +116,26 @@ static struct i2c_algorithm hdpvr_algo = {
  	.functionality = hdpvr_functionality,
  };
  
@@ -107,7 +132,7 @@ index c4b5d15..1c01b6c 100644
  int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  {
  	struct i2c_adapter *i2c_adap;
-@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+@@ -123,6 +145,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
  	if (i2c_adap == NULL)
  		goto error;
  
@@ -116,3 +141,9 @@ index c4b5d15..1c01b6c 100644
  	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
  		sizeof(i2c_adap->name));
  	i2c_adap->algo  = &hdpvr_algo;
+@@ -143,3 +167,5 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
+ error:
+ 	return retval;
+ }
++
++#endif /* CONFIG_I2C */



From orion at fedoraproject.org  Mon Aug 31 14:29:41 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 31 Aug 2009 14:29:41 +0000 (UTC)
Subject: rpms/paraview/F-11 paraview.spec,1.35,1.36
Message-ID: <20090831142941.8742B11C0072@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20394/F-11

Modified Files:
	paraview.spec 
Log Message:
* Mon Aug 31 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-6
- Don't ship lproj, conflicts with vtk



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/paraview.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- paraview.spec	28 Aug 2009 18:00:09 -0000	1.35
+++ paraview.spec	31 Aug 2009 14:29:41 -0000	1.36
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -246,12 +246,12 @@ pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #Don't ship copy of Qt assisstant
-rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
-      $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
+rm $RPM_BUILD_ROOT%{_bindir}/assistant \
+   $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
 #Don't need mpi versions of these
-rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
+rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
 #Move the remaining mpi binaries out of the way
 for f in *
 do
@@ -296,8 +296,10 @@ popd
 rm -r $RPM_BUILD_ROOT/usr/plugins
 
 #Don't ship copy of Qt assisstant
-rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
-      $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
+rm $RPM_BUILD_ROOT%{_bindir}/assistant \
+   $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
+#Don't ship lproj - provided by vtk
+rm lproj
 
 #Move the documentation
 #mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
@@ -328,7 +330,6 @@ update-mime-database %{_datadir}/mime &>
 %files
 %defattr(-,root,root,-)
 %doc License_v1.2.txt
-%{_bindir}/lproj
 %{_bindir}/paraview
 %{_bindir}/pvbatch
 %{_bindir}/pvblot
@@ -376,6 +377,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 31 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-6
+- Don't ship lproj, conflicts with vtk
+
 * Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
 - Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
 - Update assitant patch to use assistant_adp, don't ship assistant-real



From orion at fedoraproject.org  Mon Aug 31 14:29:41 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 31 Aug 2009 14:29:41 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.42,1.43
Message-ID: <20090831142941.A958611C0072@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20394/devel

Modified Files:
	paraview.spec 
Log Message:
* Mon Aug 31 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-6
- Don't ship lproj, conflicts with vtk



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- paraview.spec	28 Aug 2009 14:54:56 -0000	1.42
+++ paraview.spec	31 Aug 2009 14:29:41 -0000	1.43
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -247,12 +247,12 @@ pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #Don't ship copy of Qt assisstant
-rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
-      $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
+rm $RPM_BUILD_ROOT%{_bindir}/assistant \
+   $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
 #Don't need mpi versions of these
-rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
+rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
 #Move the remaining mpi binaries out of the way
 for f in *
 do
@@ -297,8 +297,10 @@ popd
 rm -r $RPM_BUILD_ROOT/usr/plugins
 
 #Don't ship copy of Qt assisstant
-rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
-      $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
+rm $RPM_BUILD_ROOT%{_bindir}/assistant \
+   $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
+#Don't ship lproj - provided by vtk
+rm lproj
 
 #Move the documentation
 #mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
@@ -329,7 +331,6 @@ update-mime-database %{_datadir}/mime &>
 %files
 %defattr(-,root,root,-)
 %doc License_v1.2.txt
-%{_bindir}/lproj
 %{_bindir}/paraview
 %{_bindir}/pvbatch
 %{_bindir}/pvblot
@@ -377,6 +378,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 31 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-6
+- Don't ship lproj, conflicts with vtk
+
 * Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
 - Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
 - Update assitant patch to use assistant_adp, don't ship assistant-real



From tmz at fedoraproject.org  Mon Aug 31 14:30:41 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon, 31 Aug 2009 14:30:41 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.78, 1.79 git.spec, 1.91, 1.92 sources, 
	1.78, 1.79
Message-ID: <20090831143041.C877811C0380@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20785

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	23 Aug 2009 16:33:46 -0000	1.78
+++ .cvsignore	31 Aug 2009 14:30:41 -0000	1.79
@@ -1 +1 @@
-git-1.6.4.1.tar.bz2
+git-1.6.4.2.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- git.spec	23 Aug 2009 16:33:46 -0000	1.91
+++ git.spec	31 Aug 2009 14:30:41 -0000	1.92
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.4.1
+Version:        1.6.4.2
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Aug 30 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.2-1
+- git-1.6.4.2
+
 * Sat Aug 22 2009 Todd Zullinger <tmz at pobox.com> - 1.6.4.1-1
 - git-1.6.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	23 Aug 2009 16:33:46 -0000	1.78
+++ sources	31 Aug 2009 14:30:41 -0000	1.79
@@ -1 +1 @@
-bdc9b8be7d56a3beabad2d228f2e8e9a  git-1.6.4.1.tar.bz2
+05c41dc84eae47e3d4fe5b3dee9cc73c  git-1.6.4.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 31 14:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:33:58 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested watchbugzilla
Message-ID: <20090831143358.2173310F883@bastion2.fedora.phx.redhat.com>

stefansf has requested the watchbugzilla acl on pyicq-t (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From pkgdb at fedoraproject.org  Mon Aug 31 14:34:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:34:01 +0000
Subject: [pkgdb] pyicq-t: stefansf has requested watchcommits
Message-ID: <20090831143401.313E310F88C@bastion2.fedora.phx.redhat.com>

stefansf has requested the watchcommits acl on pyicq-t (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/pyicq-t



From kwizart at fedoraproject.org  Mon Aug 31 14:34:20 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 14:34:20 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec,1.19,1.20
Message-ID: <20090831143420.9304211C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21539

Modified Files:
	perl-AnyEvent.spec 
Log Message:
Misssing changelog



Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-AnyEvent.spec	31 Aug 2009 14:23:57 -0000	1.19
+++ perl-AnyEvent.spec	31 Aug 2009 14:34:20 -0000	1.20
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 5.11-1
+- Update to 5.112   (rpm version : 5.11 )
+
 * Mon Jul 27 2009 kwizart < kwizart at gmail.com > - 4.870-1
 - Update to 4.87   (rpm version : 4.870 )
 - Add more filter requires to workaround rhbz#512553



From kwizart at fedoraproject.org  Mon Aug 31 14:34:45 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 14:34:45 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel perl-AnyEvent.spec,1.20,1.21
Message-ID: <20090831143445.6650111C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21632

Modified Files:
	perl-AnyEvent.spec 
Log Message:
Bump



Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-AnyEvent.spec	31 Aug 2009 14:34:20 -0000	1.20
+++ perl-AnyEvent.spec	31 Aug 2009 14:34:45 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           perl-AnyEvent
 Version:        5.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Framework for multiple event loops
 
 Group:          Development/Libraries
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 5.11-1
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 5.11-2
 - Update to 5.112   (rpm version : 5.11 )
 
 * Mon Jul 27 2009 kwizart < kwizart at gmail.com > - 4.870-1



From pkgdb at fedoraproject.org  Mon Aug 31 14:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:35:17 +0000
Subject: [pkgdb] maven2: akurtakov has requested watchcommits
Message-ID: <20090831143517.55D0A10F888@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchcommits acl on maven2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2



From pkgdb at fedoraproject.org  Mon Aug 31 14:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:35:17 +0000
Subject: [pkgdb] maven2: akurtakov has requested commit
Message-ID: <20090831143517.CC70610F886@bastion2.fedora.phx.redhat.com>

akurtakov has requested the commit acl on maven2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2



From pkgdb at fedoraproject.org  Mon Aug 31 14:35:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:35:28 +0000
Subject: [pkgdb] maven2: akurtakov has requested watchbugzilla
Message-ID: <20090831143528.0BFFF10F893@bastion2.fedora.phx.redhat.com>

akurtakov has requested the watchbugzilla acl on maven2 (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2



From rdieter at fedoraproject.org  Mon Aug 31 14:37:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 14:37:09 +0000 (UTC)
Subject: rpms/uw-imap/EL-4 uw-imap.spec,1.32,1.33
Message-ID: <20090831143709.25D3211C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22143

Modified Files:
	uw-imap.spec 
Log Message:
-Wno-pointer-sign not supported on rhel4



Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-4/uw-imap.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- uw-imap.spec	31 Aug 2009 14:26:59 -0000	1.32
+++ uw-imap.spec	31 Aug 2009 14:37:08 -0000	1.33
@@ -162,7 +162,9 @@ export EXTRACFLAGS="$EXTRACFLAGS $(pkg-c
 export EXTRACFLAGS="$EXTRACFLAGS -fPIC $RPM_OPT_FLAGS"
 # jorton added these, I'll assume he knows what he's doing. :) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 export EXTRACFLAGS="$EXTRACFLAGS -Wno-pointer-sign"
+%endif
 
 echo "y" | \
 make %{?_smp_mflags} lnp \



From rdieter at fedoraproject.org  Mon Aug 31 14:50:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 14:50:05 +0000 (UTC)
Subject: rpms/uw-imap/EL-5 uw-imap.spec,1.30,1.31
Message-ID: <20090831145005.AFE1411C0495@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26900

Modified Files:
	uw-imap.spec 
Log Message:
sync w/EL-4 branch



Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-5/uw-imap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- uw-imap.spec	31 Aug 2009 14:26:44 -0000	1.30
+++ uw-imap.spec	31 Aug 2009 14:50:04 -0000	1.31
@@ -162,7 +162,9 @@ export EXTRACFLAGS="$EXTRACFLAGS $(pkg-c
 export EXTRACFLAGS="$EXTRACFLAGS -fPIC $RPM_OPT_FLAGS"
 # jorton added these, I'll assume he knows what he's doing. :) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 export EXTRACFLAGS="$EXTRACFLAGS -Wno-pointer-sign"
+%endif
 
 echo "y" | \
 make %{?_smp_mflags} lnp \



From overholt at fedoraproject.org  Mon Aug 31 14:51:15 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 14:51:15 +0000 (UTC)
Subject: rpms/maven2/devel maven2.spec,1.24,1.25
Message-ID: <20090831145115.981CA11C0072@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27222

Modified Files:
	maven2.spec 
Log Message:
* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-1.4
- Move missing dependencies to without_bootstrap blocks.


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- maven2.spec	26 Aug 2009 14:55:50 -0000	1.24
+++ maven2.spec	31 Aug 2009 14:51:15 -0000	1.25
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.3%{?dist}
+Release:        1.4%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -62,7 +62,7 @@ Source0:        %{name}-src.tar.gz
 # tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
 Source2:        %{name}-plugins-070705-src.tar.gz
 
-# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
 # has several bugs
 # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 maven-javadoc-plugin
 # tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin
@@ -73,7 +73,7 @@ Source22: maven-javadoc-plugin-2.4-src.t
 # The files were originally aquired from: http://repo1.maven.org/maven2/
 Source3:        m2_pom_repo.tar.gz
 
-# As with above, these files are from the maven repositories, and are not in 
+# As with above, these files are from the maven repositories, and are not in
 # cvs/svn
 # The files were originally aquired from: http://repo1.maven.org/maven2/
 Source4:        m2_jar_repo.tar.gz
@@ -83,14 +83,14 @@ Source6:        maven2-JPackageRepositor
 Source7:        maven2-settings.xml
 
 # svn export -r '{2006-03-08}' http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin maven-site-plugin
-# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin 
+# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin
 Source8:        %{name}-maven-site-plugin.tar.gz
 
 Source9:          %{name}-run-it-tests.sh
 
 # svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
 # cd maven-model
-# mvn -P all-models package 
+# mvn -P all-models package
 # Find model jar in target/maven-model-2.0.8.jar
 Source10:       %{name}-model-v3.jar
 Source11:       %{name}-MavenJPackageDepmap.java
@@ -323,10 +323,10 @@ Requires:        modello >= 1.0-0.a8.3
 Requires:        modello-maven-plugin >= 1.0-0.a8.3
 %endif
 
-Obsoletes:       maven2-plugin-jxr <= 0:2.0.4 
-Obsoletes:       maven2-plugin-surefire <= 0:2.0.4 
-Obsoletes:       maven2-plugin-surefire-report <= 0:2.0.4 
-Obsoletes:       maven2-plugin-release <= 0:2.0.4 
+Obsoletes:       maven2-plugin-jxr <= 0:2.0.4
+Obsoletes:       maven2-plugin-surefire <= 0:2.0.4
+Obsoletes:       maven2-plugin-surefire-report <= 0:2.0.4
+Obsoletes:       maven2-plugin-release <= 0:2.0.4
 
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2, /bin/rmdir
@@ -344,7 +344,7 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description
-Maven is a software project management and comprehension tool. Based on the 
+Maven is a software project management and comprehension tool. Based on the
 concept of a project object model (POM), Maven can manage a project's build,
 reporting and documentation from a central piece of information.
 
@@ -413,10 +413,12 @@ Generates sources from an Antlr grammar.
 Summary:        Antrun plugin for maven
 Group:          Development/Build Tools
 Requires:       ant >= 1.6.5
+%if %{without_bootstrap}
 Requires:    	maven-embedder
+Requires:    	maven-shared-reporting-impl
+%endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
-Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -435,17 +437,17 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 %if %{without_bootstrap}
 Requires:       modello >= 1.0-0.a8.3
+Requires:    	maven-shared-archiver
+Requires:       jmock >= 1.0.1
+Requires:	maven-shared-test-tools
+Requires:    	maven-shared-repository-builder
+Requires:    	maven-shared-common-artifact-filters
+Requires:	maven-shared-plugin-testing-tools
 %endif
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
 Requires:    	maven-shared-file-management >= 1.0
-Requires:    	maven-shared-archiver
 Requires:	plexus-container-default
-Requires:    	maven-shared-repository-builder
-Requires:    	maven-shared-common-artifact-filters
-Requires:	maven-shared-plugin-testing-tools
-Requires:	maven-shared-test-tools
-Requires:       jmock >= 1.0.1
 Requires:       jdom >= 1.0
 Requires:       jaxen >= 1.1
 Requires:    	saxpath
@@ -465,13 +467,13 @@ Summary:        Changelog plugin for mav
 Group:          Development/Build Tools
 %if %{without_bootstrap}
 Requires:       maven-scm
+Requires:    	maven-shared-reporting-impl
+Requires:       maven-doxia-sitetools >= 1.0
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-doxia >= 1.0-0.a9
-Requires:       maven-doxia-sitetools >= 1.0
 Requires:       maven-scm >= 0:1.0-0.b3.2
-Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -489,6 +491,8 @@ Group:          Development/Build Tools
 %if %{without_bootstrap}
 Requires:       maven-doxia
 Requires:       maven-doxia-sitetools >= 1.0
+Requires:    	maven-shared-reporting-impl
+Requires:       glassfish-javamail
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
@@ -496,10 +500,8 @@ Requires:       velocity
 Requires:       commons-httpclient
 Requires:       plexus-velocity >= 1.1.2
 Requires:       plexus-mail-sender
-Requires:       glassfish-javamail
 Requires:       jakarta-commons-lang
 Requires:       velocity
-Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -508,8 +510,8 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description    plugin-changes
-The Maven Changes Plugin is used to inform users of the changes that have 
-occured between different releases of your project.  
+The Maven Changes Plugin is used to inform users of the changes that have
+occured between different releases of your project.
 
 %package        plugin-checkstyle
 Summary:        Checkstyle plugin for maven
@@ -521,7 +523,9 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-velocity >= 1.1.2
 Requires:       plexus-resources
+%if %{without_bootstrap}
 Requires:    	maven-shared-reporting-impl
+%endif
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -603,8 +607,10 @@ Requires:       plexus-utils >= 1.2
 Requires:       maven-shared-file-management >= 1.0-4
 Requires:       junit >= 3.8.2
 Requires:       plexus-container-default
+%if %{without_bootstrap}
 Requires:       maven-shared-dependency-analyzer
 Requires:       maven-shared-dependency-tree
+%endif
 
 
 %if %{gcj_support}
@@ -657,13 +663,15 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils
+%if %{without_bootstrap}
 Requires:       maven-shared-plugin-tools-beanshell >= 2.2
 Requires:       maven-shared-plugin-tools-java >= 2.2
+Requires:       maven-shared-plugin-tools-api
+Requires:    	maven-shared-reporting-impl
+%endif
 Requires:       commons-httpclient
 Requires:       jakarta-commons-logging >= 1.0.4
 Requires:       maven-shared-file-management >= 1.0-4
-Requires:       maven-shared-plugin-tools-api
-Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -672,7 +680,7 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description    plugin-docck
-The Maven DOCCK Plugin checks that a project complies with the 
+The Maven DOCCK Plugin checks that a project complies with the
 Plugin Documentation Standard.
 
 
@@ -682,7 +690,9 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+%if %{without_bootstrap}
 Requires:       maven-shared-verifier
+%endif
 Requires:       xmlunit
 
 %if %{gcj_support}
@@ -702,13 +712,15 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-archiver >= 1.0
-Requires:       jmock >= 1.0.1
 Requires:       jdom >= 1.0
 Requires:       jaxen >= 1.1
 Requires:    	saxpath
 Requires:       plexus-interactivity >= 1.0
+%if %{without_bootstrap}
+Requires:       jmock >= 1.0.1
 Requires:	maven-shared-plugin-testing-tools
 Requires:	maven-shared-test-tools
+%endif
 Requires:       aqute-bndlib
 
 %if %{gcj_support}
@@ -744,10 +756,10 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       jakarta-commons-lang
 %if %{without_bootstrap}
 Requires:       maven-shared
+Requires:       maven-enforcer-rule-api
 %endif
 Requires:       plexus-utils
 Requires:       bsh
-Requires:       maven-enforcer-rule-api
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -756,7 +768,7 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description    plugin-enforcer
-The Maven Enforcer Plugin provides goals to control certain environmental 
+The Maven Enforcer Plugin provides goals to control certain environmental
 constraints such as Maven Version, JDK version, and OS family.
 
 
@@ -785,7 +797,9 @@ Summary:        Help plugin for maven
 Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+%if %{without_bootstrap}
 Requires:       maven-shared-plugin-tools-api
+%endif
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -805,7 +819,9 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon >= 1.0-0.1.b2
 Requires:       plexus-utils >= 1.2
+%if %{without_bootstrap}
 Requires:       jmock >= 1.0.1
+%endif
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -814,7 +830,7 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description    plugin-idea
-Creates/updates an IDEA workspace for the current project 
+Creates/updates an IDEA workspace for the current project
 (individual modules are created as IDEA modules).
 
 
@@ -854,8 +870,8 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description    plugin-invoker
-The Maven Invoker Plugin is used to run a set of Maven projects and makes 
-sure that each project execution is successful, and optionally verifies 
+The Maven Invoker Plugin is used to run a set of Maven projects and makes
+sure that each project execution is successful, and optionally verifies
 the output from a given project execution.
 
 %package        plugin-jar
@@ -863,7 +879,9 @@ Summary:        Jar plugin for maven
 Group:          Development/Build Tools
 Requires:       jakarta-commons-lang >= 2.1
 Requires:       maven2 = %{epoch}:%{version}-%{release}
+%if %{without_bootstrap}
 Requires:       maven-shared-archiver >= 2.3
+%endif
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 
@@ -888,7 +906,9 @@ Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+%if %{without_bootstrap}
 Requires:    	maven-shared-reporting-impl
+%endif
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -908,7 +928,9 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
 Requires:       junit >= 3.8.2
+%if %{without_bootstrap}
 Requires:       maven-shared-model-converter
+%endif
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -925,9 +947,11 @@ Summary:        Plugin plugin for maven
 Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+%if %{without_bootstrap}
 Requires:       maven-shared-plugin-tools-beanshell >= 2.2
 Requires:       maven-shared-plugin-tools-java >= 2.2
 Requires:    	maven-shared-reporting-impl
+%endif
 Requires:       maven-doxia >= 1.0-0.a9
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default
@@ -939,7 +963,7 @@ Requires(postun):    java-gcj-compat
 %endif
 
 %description    plugin-plugin
-Creates a Maven plugin descriptor for any Mojo's found in the source tree, 
+Creates a Maven plugin descriptor for any Mojo's found in the source tree,
 to include in the JAR.
 
 
@@ -953,7 +977,9 @@ Requires:       plexus-resources
 Requires:       pmd >= 3.3
 Requires:       jaxen >= 1.1
 Requires:       xom
+%if %{without_bootstrap}
 Requires:    	maven-shared-reporting-impl
+%endif
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -973,13 +999,15 @@ Requires:       jakarta-commons-validato
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-i18n >= 1.0
+%if %{without_bootstrap}
 Requires:    	maven-shared-reporting-impl
 Requires:       maven-shared-jar
 Requires:       maven-shared-dependency-tree
+Requires:       maven-doxia-sitetools >= 1.0
+%endif
 Requires:       maven-wagon
 Requires:       maven-scm >= 0:1.0-0.b3.2
 Requires:       maven-doxia >= 1.0-0.a9
-Requires:       maven-doxia-sitetools >= 1.0
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -1167,15 +1195,15 @@ Builds a WAR from the current project.
 # Extract the plugins
 tar xzf %{SOURCE2}
 
-# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
 # has several bugs
 rm -rf maven2-plugins/maven-javadoc-plugin
 pushd maven2-plugins
 tar xzf %{SOURCE22}
 popd
 
-# Use an older version of site plugin because newer one requires newer doxia 
-# (1.0a8) which is not compatible with the older one (1.0a7) which is needed 
+# Use an older version of site plugin because newer one requires newer doxia
+# (1.0a8) which is not compatible with the older one (1.0a7) which is needed
 # by other parts of maven
 #rm -rf maven2-plugins/maven-site-plugin
 #tar xzf %{SOURCE8}
@@ -1252,7 +1280,7 @@ rm -f maven2-plugins/maven-site-plugin/s
 rm -f maven2-plugins/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
 
 # Disabled test because it needs mock
-rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java 
+rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
 rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
 
 # extract poms and jars (if any)
@@ -1272,8 +1300,8 @@ ln -s %{_javadir} external_repo/JPP
 cp -p %{SOURCE6} maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/JPackageRepositoryLayout.java
 cp -p %{SOURCE11} maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
 
-# FIXME: bootstrap-mini has no dependencies, so we copy the file there 
-# (for now). Since bootstrap classes are not in the final package, there 
+# FIXME: bootstrap-mini has no dependencies, so we copy the file there
+# (for now). Since bootstrap classes are not in the final package, there
 # will be no duplicates.
 mkdir -p maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/
 cp -p %{SOURCE11} maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
@@ -1321,8 +1349,8 @@ saxon -o maven2/bootstrap/bootstrap-inst
 export MAVEN_REPO_LOCAL=`pwd`/%{repo_dir}
 export M2_SETTINGS_FILE=%{maven_settings_file}
 
-# In bootstrap mode, we want it looking at default poms only (controlled via 
-# maven2-common-poms). This enables us to change naming structures without 
+# In bootstrap mode, we want it looking at default poms only (controlled via
+# maven2-common-poms). This enables us to change naming structures without
 # breaking build.
 
 export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven2.ignore.versions -Dmaven2.offline.mode -Dmaven.test.failure.ignore=true -Dmaven2.jpp.depmap.file=%{SOURCE17}"
@@ -1373,13 +1401,13 @@ build-jar-repository -s -p $M2_HOME/lib 
 pushd maven2-plugins >& /dev/null
 
 # Build the plugin-plugin first, as it is needed to build itself later on
-# NOTE: Build of this plugin for the first time is expected to cause errors. 
-# That is why we build it first with -fn . Subsequent builds should not have 
-# errors, and if they do, they will be caught when all plugins are built 
+# NOTE: Build of this plugin for the first time is expected to cause errors.
+# That is why we build it first with -fn . Subsequent builds should not have
+# errors, and if they do, they will be caught when all plugins are built
 # again below. See: http://mail-archives.apache.org/mod_mbox/maven-users/200511.mbox/%3c4374C819.7090609 at commonjava.org%3e
 
 (cd maven-plugin-plugin
-$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -npu --no-plugin-registry -fn clean install 
+$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -npu --no-plugin-registry -fn clean install
 )
 
 %if ! %{NONFREE}
@@ -1389,8 +1417,8 @@ sed -i -e s:"<module>maven-clover-plugin
 
 # Now build everything
 # FIXME: Need to build in two stages to get around gcj bug that causes plugin reload to fail
-#$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify  
-$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify  
+#$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify
+$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify
 $M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry --fail-at-end jar:jar install:install
 
 popd >& /dev/null
@@ -1411,7 +1439,7 @@ popd >& /dev/null
 (cd maven2
 
 # One of the tests (#63) needs tools.jar. Fix the path for it
-sed -i -e s:"<systemPath>\${java.home}/../lib/tools.jar</systemPath>":"<systemPath>$JAVA_HOME/lib/tools.jar</systemPath>":g maven-core-it/it0063/pom.xml 
+sed -i -e s:"<systemPath>\${java.home}/../lib/tools.jar</systemPath>":"<systemPath>$JAVA_HOME/lib/tools.jar</systemPath>":g maven-core-it/it0063/pom.xml
 
 (cd integration-tests/maven-core-it-plugin
 $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.1.1-SNAPSHOT:descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
@@ -1439,8 +1467,8 @@ export MAVEN_OPTS=$OLD_MAVEN_OPTS
 
 # Build docs
 
-# Manual iteration should not be needed, but there is a bug in the javadoc 
-# plugin which makes this necessary. See: 
+# Manual iteration should not be needed, but there is a bug in the javadoc
+# plugin which makes this necessary. See:
 # http://jira.codehaus.org/browse/MJAVADOC-157
 
 (cd maven2
@@ -1452,7 +1480,7 @@ for dir in `find -maxdepth 1 -type d`; d
 
     if [ ! -f $dir/pom.xml ]; then
         continue
-    fi 
+    fi
 
     pushd $dir
     $M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS -Dmaven2.usejppjars org.apache.maven.plugins:maven-javadoc-plugin:2.3-SNAPSHOT:javadoc
@@ -1531,7 +1559,7 @@ pushd %{name}
         maven-profile \
         maven-project \
         maven-repository-metadata \
-        maven-settings; do 
+        maven-settings; do
 
         artifactname=`echo $project | sed -e s:^maven-::g`
         cp -p $project/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$artifactname.pom
@@ -1551,7 +1579,7 @@ popd
 # reporting api
 cp -p %{name}/maven-reporting/maven-reporting-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-reporting-api.pom
 %add_to_maven_depmap org.apache.maven.reporting maven-reporting-api %{version} JPP/%{name} reporting-api
-install -m 644 %{name}/maven-reporting/maven-reporting-api/target/*jar $RPM_BUILD_ROOT%{_javadir}/%{name}/reporting-api-%{version}.jar 
+install -m 644 %{name}/maven-reporting/maven-reporting-api/target/*jar $RPM_BUILD_ROOT%{_javadir}/%{name}/reporting-api-%{version}.jar
 
 # script, script-ant and script-beanshell
 cp -p %{name}/maven-script/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-script.pom
@@ -1587,7 +1615,7 @@ pushd maven2-plugins
         pluginversion=`ls $targetdir/*jar | awk -F / '{print $NF}' | sed -e s:"^$pluginname-"::g -e s:"\\.jar$"::g`
         artifactname=`echo $pluginname | sed -e s:^maven-::g`
 
-        #jar 
+        #jar
         cp -p $targetdir/*jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/$artifactname-$pluginversion.jar
         ln -s $artifactname-$pluginversion.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/$artifactname.jar
 
@@ -1598,9 +1626,9 @@ pushd maven2-plugins
     done
 popd
 
-# g=org.apache.maven.plugins a=maven-plugins needs to be copied manually, as 
-# it get's changed to a=plugins (a=plugins and a=maven-plugins is the same 
-# file, but the former is needed for compatiblity while newer projects use 
+# g=org.apache.maven.plugins a=maven-plugins needs to be copied manually, as
+# it get's changed to a=plugins (a=plugins and a=maven-plugins is the same
+# file, but the former is needed for compatiblity while newer projects use
 # the latter)
 cp -p maven2-plugins/target/*jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/maven-plugins.jar
 cp -p maven2-plugins/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2.plugins-maven-plugins.pom
@@ -1620,7 +1648,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_javado
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 (cd maven2
-    for doc_dir in `find . -type d -name apidocs`; do 
+    for doc_dir in `find . -type d -name apidocs`; do
         module=`echo $doc_dir | sed -e s:"^\\./"::g -e s:"/target/site/apidocs$"::g`
         targetdir=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
         install -dm 755  $targetdir
@@ -1629,7 +1657,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 )
 
 (cd maven2-plugins
-    for doc_dir in `find . -type d -name apidocs`; do 
+    for doc_dir in `find . -type d -name apidocs`; do
         module=`echo $doc_dir | sed -e s:"^\\./"::g -e s:"/target/site/apidocs$"::g`
         targetdir=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
         install -dm 755 $targetdir
@@ -1712,7 +1740,7 @@ rm -rf %{_datadir}/%{name}/core/*
 
 %postun
 # FIXME: This doesn't always remove the plugins dir. It seems that rpm doesn't
-# honour the Requires(postun) as it should, causing maven to get uninstalled 
+# honour the Requires(postun) as it should, causing maven to get uninstalled
 # before some plugins are
 if [ -d %{_javadir}/%{name} ] ; then rmdir --ignore-fail-on-non-empty %{_javadir}/%{name} >& /dev/null; fi
 %update_maven_depmap
@@ -2870,6 +2898,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-1.4
+- Move missing dependencies to without_bootstrap blocks.
+
 * Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
 - Add missing backport-util-concurrent BR
 
@@ -2891,7 +2922,7 @@ fi
 -- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
 -- Add missing Requires: maven-archiver to maven2-plugin-jar
 -- Add missing Requires: ant to maven2-plugin-ant
--- Add missing Requires: maven-shared-plugin-tools-beanshell, 
+-- Add missing Requires: maven-shared-plugin-tools-beanshell,
    maven-shared-plugin-tools-java to maven2-plugin-docck and
    maven2-plugin-plugin
 -- Add missing Requires: to maven2-plugin-install
@@ -3038,7 +3069,7 @@ fi
   - Installer maven-{artifact-ant,embedder,meeper,script}
 - From r.apel at r-apel.de:
   - Fix maven-site-plugin pom in maven2-jpp-mapping.patch
-  - Add maven-shared-file-management to plugin-assembly Requires 
+  - Add maven-shared-file-management to plugin-assembly Requires
   - Add post/postun Requires for javadoc
 
 * Wed Jul 12 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.4-4jpp_1rh



From pkgdb at fedoraproject.org  Mon Aug 31 14:51:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:51:39 +0000
Subject: [pkgdb] maven2 had acl change status
Message-ID: <20090831145139.C144710F883@bastion2.fedora.phx.redhat.com>

dbhole has set the watchbugzilla acl on maven2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2



From pkgdb at fedoraproject.org  Mon Aug 31 14:51:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:51:40 +0000
Subject: [pkgdb] maven2 had acl change status
Message-ID: <20090831145140.126FA10F893@bastion2.fedora.phx.redhat.com>

dbhole has set the watchcommits acl on maven2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2



From pkgdb at fedoraproject.org  Mon Aug 31 14:51:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 14:51:41 +0000
Subject: [pkgdb] maven2 had acl change status
Message-ID: <20090831145141.3C31510F898@bastion2.fedora.phx.redhat.com>

dbhole has set the commit acl on maven2 (Fedora devel) to Approved for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2



From than at fedoraproject.org  Mon Aug 31 14:52:11 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 31 Aug 2009 14:52:11 +0000 (UTC)
Subject: rpms/qt/devel qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, NONE,
	1.1 qt.spec, 1.318, 1.319
Message-ID: <20090831145211.C8E5E11C0072@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27454

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
Log Message:
fix for CVE-2009-2700



qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch:
 qsslcertificate.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig	2009-08-31 16:46:48.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-31 16:49:47.000000000 +0200
@@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
             }
 
             const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
-            const QString altName = QLatin1String(QByteArray(altNameStr, len));
+            const QString altName = QString::fromLatin1(altNameStr, len);
             if (genName->type == GEN_DNS)
                 result.insert(QSsl::DnsEntry, altName);
             else if (genName->type == GEN_EMAIL)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- qt.spec	30 Aug 2009 20:07:59 -0000	1.318
+++ qt.spec	31 Aug 2009 14:52:11 -0000	1.319
@@ -14,7 +14,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -64,6 +64,7 @@ Patch56: qt-x11-opensource-src-4.5.2-oss
 
 # 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
@@ -391,6 +392,7 @@ Qt libraries used for drawing widgets an
 
 # security fixes
 %patch100 -p1 -b .CVE-2009-1725
+%patch101 -p1 -b .CVE-2009-2700
 
 # kde-qt branch
 %patch200 -p1 -b .kde-qt-patches-20090820git
@@ -918,6 +920,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-13
+- fix for CVE-2009-2700
+
 * 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 described in bug #475110



From rdieter at fedoraproject.org  Mon Aug 31 14:55:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 14:55:25 +0000 (UTC)
Subject: rpms/uw-imap/devel uw-imap.spec,1.64,1.65
Message-ID: <20090831145525.1AA6511C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28191

Modified Files:
	uw-imap.spec 
Log Message:
sync changes from EPEL branches



Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- uw-imap.spec	21 Aug 2009 16:20:38 -0000	1.64
+++ uw-imap.spec	31 Aug 2009 14:55:24 -0000	1.65
@@ -1,10 +1,13 @@
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
+%if 0%{?fedora}
+%define _with_devel 1
 # ship static lib, matches default upstream config
 # as convenience to users, since our hacked shlib can potentially break 
 # abi semi-often
 %define _with_static 1
+%endif
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
@@ -181,12 +184,14 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/
 
-%if "%{?_with_static:1}" == "1"
+%if 0%{?_with_static:1}
 install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/
 ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a
 %endif
 
 install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/
+
+%if 0%{?_with_devel:1}
 ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
 
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap/
@@ -194,6 +199,7 @@ install -m644 ./c-client/*.h $RPM_BUILD_
 # Added linkage.c to fix (#34658) <mharris>
 install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/
 install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/
+%endif
 
 install -p -D -m644 src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8uw
 install -p -D -m644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipopd.8uw
@@ -225,7 +231,7 @@ touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,
 touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
-# FIXME -- Rex
+# FIXME, do on first launch (or not at all?), not here -- Rex
 %post
 {
 cd %{sslcerts} &> /dev/null || :
@@ -293,12 +299,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf
 %{_libdir}/lib%{soname}.so.*
 
+%if 0%{?_with_devel:1}
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/imap/
 %{_libdir}/lib%{soname}.so
+%endif
 
-%if "%{?_with_static:1}" == "1"
+%if 0%{?_with_static:1}
 %files static
 %defattr(-,root,root,-)
 %{_libdir}/c-client.a
@@ -307,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> 
+- omit -devel, -static bits in EPEL builds (#518885)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2007e-9
 - rebuilt with new openssl
 



From than at fedoraproject.org  Mon Aug 31 15:11:27 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 31 Aug 2009 15:11:27 +0000 (UTC)
Subject: rpms/qt/F-11 qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, NONE, 
	1.1 qt.spec, 1.279, 1.280
Message-ID: <20090831151127.85C5211C0072@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32077

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
Log Message:
fix for CVE-2009-2700


qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch:
 qsslcertificate.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig	2009-08-31 16:46:48.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-31 16:49:47.000000000 +0200
@@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
             }
 
             const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
-            const QString altName = QLatin1String(QByteArray(altNameStr, len));
+            const QString altName = QString::fromLatin1(altNameStr, len);
             if (genName->type == GEN_DNS)
                 result.insert(QSsl::DnsEntry, altName);
             else if (genName->type == GEN_EMAIL)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- qt.spec	18 Aug 2009 10:40:20 -0000	1.279
+++ qt.spec	31 Aug 2009 15:11:26 -0000	1.280
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -886,6 +886,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+- 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
 



From kwizart at fedoraproject.org  Mon Aug 31 15:11:58 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 15:11:58 +0000 (UTC)
Subject: rpms/perl-Devel-FindRef/devel Devel-FindRef-1.422-nocommon.patch,
	NONE, 1.1 import.log, 1.1, 1.2 perl-Devel-FindRef.spec, 1.6, 1.7
Message-ID: <20090831151158.C50CF11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-Devel-FindRef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3628/devel

Modified Files:
	import.log perl-Devel-FindRef.spec 
Added Files:
	Devel-FindRef-1.422-nocommon.patch 
Log Message:
Add patch to get rid of common:sense


Devel-FindRef-1.422-nocommon.patch:
 FindRef.pm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE Devel-FindRef-1.422-nocommon.patch ---
diff -up Devel-FindRef-1.422/FindRef.pm.notcommon Devel-FindRef-1.422/FindRef.pm
--- Devel-FindRef-1.422/FindRef.pm.notcommon	2009-08-30 16:34:21.000000000 +0200
+++ Devel-FindRef-1.422/FindRef.pm	2009-08-31 17:04:02.923253867 +0200
@@ -1,6 +1,8 @@
 package Devel::FindRef;
 
-use common::sense;
+use strict qw(vars subs);
+use feature qw(say state switch);
+no warnings;
 
 use XSLoader;
 use Scalar::Util;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Jul 2009 08:41:51 -0000	1.1
+++ import.log	31 Aug 2009 15:11:58 -0000	1.2
@@ -1 +1,2 @@
 perl-Devel-FindRef-1_42-1_fc11:HEAD:perl-Devel-FindRef-1.42-1.fc11.src.rpm:1248684080
+perl-Devel-FindRef-1_42-6_fc11:HEAD:perl-Devel-FindRef-1.42-6.fc11.src.rpm:1251731428


Index: perl-Devel-FindRef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-FindRef/devel/perl-Devel-FindRef.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Devel-FindRef.spec	31 Aug 2009 13:31:20 -0000	1.6
+++ perl-Devel-FindRef.spec	31 Aug 2009 15:11:58 -0000	1.7
@@ -1,11 +1,12 @@
 Name:           perl-Devel-FindRef
 Version:        1.42
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Where is that reference to my variable hiding?
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Devel-FindRef/
 Source0:        http://www.cpan.org/authors/id/M/ML/MLEHMANN/Devel-FindRef-%{version}2.tar.gz
+Patch0:         Devel-FindRef-1.422-nocommon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -18,6 +19,7 @@ references "backwards" is usually possib
 
 %prep
 %setup -q -n Devel-FindRef-%{version}2
+%patch0 -p1 -b .nocommon
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"



From sailer at fedoraproject.org  Mon Aug 31 15:13:30 2009
From: sailer at fedoraproject.org (sailer)
Date: Mon, 31 Aug 2009 15:13:30 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel .cvsignore, 1.3,
	1.4 mingw32-glibmm24-nogunixio.patch, 1.1,
	1.2 mingw32-glibmm24.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090831151330.4254E11C0072@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4129

Modified Files:
	.cvsignore mingw32-glibmm24-nogunixio.patch 
	mingw32-glibmm24.spec sources 
Log Message:
update to 2.21.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Apr 2009 09:28:10 -0000	1.3
+++ .cvsignore	31 Aug 2009 15:13:29 -0000	1.4
@@ -1,2 +1,3 @@
 glibmm-2.19.2.tar.bz2
 glibmm-2.20.0.tar.bz2
+glibmm-2.21.3.tar.bz2

mingw32-glibmm24-nogunixio.patch:
 Makefile.am |    2 +-
 Makefile.in |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: mingw32-glibmm24-nogunixio.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24-nogunixio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-glibmm24-nogunixio.patch	17 Apr 2009 13:02:59 -0000	1.1
+++ mingw32-glibmm24-nogunixio.patch	31 Aug 2009 15:13:29 -0000	1.2
@@ -1,14 +1,3 @@
---- tools/extra_defs_gen/Makefile.am.x	2009-04-17 14:32:10.000000000 +0200
-+++ tools/extra_defs_gen/Makefile.am	2009-04-17 14:32:26.000000000 +0200
-@@ -24,7 +24,7 @@
- INCLUDES = $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
- LIBS = $(GLIBMM_LIBS) $(GIOMM_LIBS)
- 
--noinst_PROGRAMS = generate_extra_defs generate_defs_gio
-+noinst_PROGRAMS = generate_extra_defs
- 
- generate_extra_defs_SOURCES = generate_defs_glib.cc
- generate_extra_defs_LDADD = libglibmm_generate_extra_defs-2.4.la
 --- tools/extra_defs_gen/Makefile.in.x	2009-04-17 14:32:14.000000000 +0200
 +++ tools/extra_defs_gen/Makefile.in	2009-04-17 14:32:40.000000000 +0200
 @@ -36,8 +36,7 @@
@@ -21,3 +10,14 @@
  subdir = tools/extra_defs_gen
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  	$(sublib_include_HEADERS)
+--- tools/extra_defs_gen/Makefile.am.nogunixio	2009-04-18 05:22:06.000000000 +0200
++++ tools/extra_defs_gen/Makefile.am	2009-08-31 16:46:34.000000000 +0200
+@@ -24,7 +24,7 @@
+ INCLUDES = $(GLIBMM_WXXFLAGS) $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
+ LIBS = $(GLIBMM_LIBS) $(GIOMM_LIBS)
+ 
+-noinst_PROGRAMS = generate_extra_defs generate_defs_gio
++noinst_PROGRAMS = generate_extra_defs
+ 
+ generate_extra_defs_SOURCES = generate_defs_glib.cc
+ generate_extra_defs_LDADD = libglibmm_generate_extra_defs-2.4.la


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-glibmm24.spec	25 Jul 2009 12:18:34 -0000	1.6
+++ mingw32-glibmm24.spec	31 Aug 2009 15:13:30 -0000	1.7
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glibmm24
-Version:        2.20.0
-Release:        5%{?dist}
+Version:        2.21.3
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.3-1
+- update to 2.21.3 match native package
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.20.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Apr 2009 09:26:44 -0000	1.3
+++ sources	31 Aug 2009 15:13:30 -0000	1.4
@@ -1 +1 @@
-38fa409b531144c238b6e2532e351799  glibmm-2.20.0.tar.bz2
+f9f7023f9bddc38f787853eff0a3aafe  glibmm-2.21.3.tar.bz2



From than at fedoraproject.org  Mon Aug 31 15:14:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 31 Aug 2009 15:14:01 +0000 (UTC)
Subject: rpms/qt/F-11 qt.spec,1.280,1.281
Message-ID: <20090831151401.9BF7F11C0072@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4242

Modified Files:
	qt.spec 
Log Message:
fix for CVE-2009-2700



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- qt.spec	31 Aug 2009 15:11:26 -0000	1.280
+++ qt.spec	31 Aug 2009 15:14:01 -0000	1.281
@@ -65,6 +65,7 @@ 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
 
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
@@ -384,6 +385,7 @@ test -x apply_patches && ./apply_patches
 
 # 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



From kwizart at fedoraproject.org  Mon Aug 31 15:15:55 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 15:15:55 +0000 (UTC)
Subject: rpms/perl-BDB/devel sources, 1.6, 1.7 .cvsignore, 1.5,
	1.6 perl-BDB.spec, 1.7, 1.8
Message-ID: <20090831151555.16B0311C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4823

Modified Files:
	sources .cvsignore perl-BDB.spec 
Log Message:
Update to 1.84



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Feb 2009 13:33:21 -0000	1.6
+++ sources	31 Aug 2009 15:15:54 -0000	1.7
@@ -1 +1 @@
-a12983a333e47255cb730851b20548de  BDB-1.83.tar.gz
+64c976f7850ce4accfb615a301467e8c  BDB-1.84.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Feb 2009 13:34:43 -0000	1.5
+++ .cvsignore	31 Aug 2009 15:15:54 -0000	1.6
@@ -1 +1 @@
-BDB-1.83.tar.gz
+BDB-1.84.tar.gz


Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-BDB.spec	26 Feb 2009 11:19:36 -0000	1.7
+++ perl-BDB.spec	31 Aug 2009 15:15:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-BDB
-Version:        1.83
-Release:        2%{?dist}
+Version:        1.84
+Release:        1%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.84-1
+- Update to 1.84
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.83-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kwizart at fedoraproject.org  Mon Aug 31 15:21:53 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 31 Aug 2009 15:21:53 +0000 (UTC)
Subject: rpms/perl-BDB/devel BDB-1.84-nocommon.patch, NONE, 1.1 import.log, 
	NONE, 1.1 perl-BDB.spec, 1.8, 1.9
Message-ID: <20090831152153.59DAD11C0072@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6762/devel

Modified Files:
	perl-BDB.spec 
Added Files:
	BDB-1.84-nocommon.patch import.log 
Log Message:
Add patch to get rid of nosense


BDB-1.84-nocommon.patch:
 BDB.pm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE BDB-1.84-nocommon.patch ---
diff -up BDB-1.84/BDB.pm.nocommon BDB-1.84/BDB.pm
--- BDB-1.84/BDB.pm.nocommon	2009-07-17 06:18:47.000000000 +0200
+++ BDB-1.84/BDB.pm	2009-08-31 17:18:28.246005452 +0200
@@ -105,7 +105,9 @@ result in a runtime error).
 
 package BDB;
 
-use common::sense;
+use strict qw(vars subs);
+use feature qw(say state switch);
+no warnings;
 
 use base 'Exporter';
 


--- NEW FILE import.log ---
perl-BDB-1_84-1_fc11:HEAD:perl-BDB-1.84-1.fc11.src.rpm:1251732031


Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-BDB.spec	31 Aug 2009 15:15:54 -0000	1.8
+++ perl-BDB.spec	31 Aug 2009 15:21:53 -0000	1.9
@@ -7,6 +7,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/BDB/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/BDB-%{version}.tar.gz
+Patch0:         BDB-1.84-nocommon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -19,6 +20,7 @@ Asynchronous Berkeley DB access.
 
 %prep
 %setup -q -n BDB-%{version}
+%patch0 -p1 -b .nocommon
 
 
 %build
@@ -54,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 1.84-1
 - Update to 1.84
+- Add Patch to get rid of common:sense
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.83-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From than at fedoraproject.org  Mon Aug 31 15:24:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 31 Aug 2009 15:24:40 +0000 (UTC)
Subject: rpms/qt/F-10 qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, NONE, 
	1.1 qt.spec, 1.235, 1.236
Message-ID: <20090831152440.0EC0511C0072@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4729

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
Log Message:
fix for CVE-2009-2700



qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch:
 qsslcertificate.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig	2009-08-31 16:46:48.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-31 16:49:47.000000000 +0200
@@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
             }
 
             const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
-            const QString altName = QLatin1String(QByteArray(altNameStr, len));
+            const QString altName = QString::fromLatin1(altNameStr, len);
             if (genName->type == GEN_DNS)
                 result.insert(QSsl::DnsEntry, altName);
             else if (genName->type == GEN_EMAIL)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/qt.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- qt.spec	18 Aug 2009 10:42:51 -0000	1.235
+++ qt.spec	31 Aug 2009 15:24:39 -0000	1.236
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -65,6 +65,7 @@ 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
 
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
@@ -384,6 +385,7 @@ test -x apply_patches && ./apply_patches
 
 # 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
@@ -886,6 +888,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+- 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
 



From overholt at fedoraproject.org  Mon Aug 31 15:26:59 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 15:26:59 +0000 (UTC)
Subject: rpms/maven-shared/devel maven-shared-8-jpp-depmap.xml, NONE,
	1.1 maven-shared-ant-pom.patch, NONE,
	1.1 maven-shared-disable-cobertura.patch, NONE,
	1.1 maven-shared-file-management-pom.patch, NONE,
	1.1 maven-shared-io-ArtifactLocatorStrategyTest.patch, NONE,
	1.1 maven-shared-plugin-tools-pom.patch, NONE,
	1.1 maven-shared-pom.patch, NONE, 1.1 maven-shared.spec, 1.10,
	1.11 maven-shared-plugin-testing-harness-pom.patch, 1.1, NONE
Message-ID: <20090831152659.5B5E411C0072@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8143

Modified Files:
	maven-shared.spec 
Added Files:
	maven-shared-8-jpp-depmap.xml maven-shared-ant-pom.patch 
	maven-shared-disable-cobertura.patch 
	maven-shared-file-management-pom.patch 
	maven-shared-io-ArtifactLocatorStrategyTest.patch 
	maven-shared-plugin-tools-pom.patch maven-shared-pom.patch 
Removed Files:
	maven-shared-plugin-testing-harness-pom.patch 
Log Message:
* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 8-1
- Update to version 8 (courtesy Deepak Bhole)


--- NEW FILE maven-shared-8-jpp-depmap.xml ---
<dependencies>
        <dependency>
          <maven>
                <groupId>junit-addons</groupId>
                <artifactId>junit-addons</artifactId>
                <version>1.4</version>
          </maven>
          <jpp>
                <groupId>JPP/maven2</groupId>
                <artifactId>empty-dep</artifactId>
                <version>1.4</version>
          </jpp>
        </dependency>
        <dependency>
          <maven>
                <groupId>jetty</groupId>
                <artifactId>org.mortbay.jetty</artifactId>
                <version>5.1.10</version>
          </maven>
          <jpp>
                <groupId>JPP/jetty5</groupId>
                <artifactId>jetty5</artifactId>
                <version>5.1.12</version>
          </jpp>
        </dependency>
        <dependency>
          <maven>
                <groupId>asm</groupId>
                <artifactId>asm</artifactId>
                <version>3.0</version>
          </maven>
          <jpp>
                <groupId>JPP/objectweb-asm</groupId>
                <artifactId>asm</artifactId>
                <version>3.1</version>
          </jpp>
        </dependency>
        <dependency>
          <maven>
                <groupId>asm</groupId>
                <artifactId>asm-parent</artifactId>
                <version>3.0</version>
          </maven>
          <jpp>
                <groupId>JPP/objectweb-asm</groupId>
                <artifactId>parent</artifactId>
                <version>3.1</version>
          </jpp>
        </dependency>

        <dependency>
          <maven>
                <groupId>org.apache.maven.reporting</groupId>
                <artifactId>reporting-impl</artifactId>
                <version>2.0.4</version>
          </maven>
          <jpp>
                <groupId>JPP/maven-shared</groupId>
                <artifactId>reporting-impl</artifactId>
                <version>2.0.4</version>
          </jpp>
        </dependency>

        <dependency>
          <maven>
                <groupId>javax.servlet</groupId>
                <artifactId>servlet-api</artifactId>
                <version>2.4</version>
          </maven>
          <jpp>
                <groupId>JPP</groupId>
                <artifactId>tomcat5-servlet-2.4-api</artifactId>
                <version>2.4</version>
          </jpp>
        </dependency>

        <!-- Plexus component API has been folded into containers now, and is no longer needed -->
        <dependency>
          <maven>
                <groupId>org.codehaus.plexus</groupId>
                <artifactId>plexus-component-api</artifactId>
                <version>1.0-alpha-20</version>
          </maven>
        </dependency>

        <dependency>
          <maven>
                <groupId>jmock</groupId>
                <artifactId>jmock</artifactId>
                <version>1.1.0</version>
          </maven>
        </dependency>
</dependencies>

maven-shared-ant-pom.patch:
 pom.xml |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE maven-shared-ant-pom.patch ---
diff -up ./maven-ant/pom.xml.sav ./maven-ant/pom.xml
--- ./maven-ant/pom.xml.sav	2007-06-14 02:41:58.000000000 -0400
+++ ./maven-ant/pom.xml	2008-04-08 15:00:40.000000000 -0400
@@ -28,6 +28,11 @@
       <version>1.0-alpha-13</version>
     </dependency>  
     <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-classworlds</artifactId>
+      <version>1.2-alpha-9</version>
+    </dependency>  
+    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
       <version>2.0.1</version>

maven-shared-disable-cobertura.patch:
 pom.xml |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE maven-shared-disable-cobertura.patch ---
diff -up ./maven-shared-jar/pom.xml.sav ./maven-shared-jar/pom.xml
--- ./maven-shared-jar/pom.xml.sav	2008-04-11 20:38:00.000000000 -0400
+++ ./maven-shared-jar/pom.xml	2008-04-11 20:38:13.000000000 -0400
@@ -48,18 +48,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

maven-shared-file-management-pom.patch:
 pom.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maven-shared-file-management-pom.patch ---
--- file-management/pom.xml.sav	2007-11-27 19:06:50.000000000 +0100
+++ file-management/pom.xml	2007-11-27 19:07:12.000000000 +0100
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>[1.1,)</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

maven-shared-io-ArtifactLocatorStrategyTest.patch:
 ArtifactLocatorStrategyTest.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE maven-shared-io-ArtifactLocatorStrategyTest.patch ---
--- maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java.sav0	2007-11-16 09:44:56.000000000 +0100
+++ maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java	2007-11-16 09:46:02.000000000 +0100
@@ -463,7 +463,7 @@
         {
             resolver.resolve( artifact, Collections.EMPTY_LIST, localRepository );
             resolverControl.setThrowable( new ArtifactNotFoundException( "not found", "group", "artifact", "version",
-                                                                         "jar", Collections.EMPTY_LIST,
+                                                                         "jar", "", Collections.EMPTY_LIST,
                                                                          "http://nowhere.com", Collections.EMPTY_LIST,
                                                                          new NullPointerException() ) );
         }
@@ -513,7 +513,7 @@
         {
             resolver.resolve( artifact, Collections.EMPTY_LIST, localRepository );
             resolverControl.setThrowable( new ArtifactResolutionException( "resolution failed", "group", "artifact",
-                                                                           "version", "jar", Collections.EMPTY_LIST,
+                                                                           "version", "jar", "", Collections.EMPTY_LIST,
                                                                            Collections.EMPTY_LIST,
                                                                            new NullPointerException() ) );
         }

maven-shared-plugin-tools-pom.patch:
 pom.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE maven-shared-plugin-tools-pom.patch ---
--- maven-plugin-tools/pom.xml.sav	2008-01-18 16:51:39.000000000 +0100
+++ maven-plugin-tools/pom.xml	2008-01-18 16:52:20.000000000 +0100
@@ -43,17 +43,17 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
-        <version>${project.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-model</artifactId>
-        <version>${project.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-java</artifactId>
-        <version>${project.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>

maven-shared-pom.patch:
 pom.xml |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE maven-shared-pom.patch ---
diff -up ./pom.xml.sav ./pom.xml
--- ./pom.xml.sav	2007-10-22 20:16:51.000000000 -0400
+++ ./pom.xml	2008-04-08 15:48:31.000000000 -0400
@@ -4,7 +4,6 @@
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
     <version>7</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.shared</groupId>
   <artifactId>maven-shared-components</artifactId>
@@ -35,15 +34,25 @@
     <module>maven-plugin-testing-harness</module>
     <module>maven-invoker</module>
     <module>maven-verifier</module>
+<!--
     <module>maven-web-ui-tests</module>
+-->
     <module>maven-app-configuration</module>
     <module>maven-plugin-testing-tools</module>
     <module>maven-test-tools</module>
     <module>maven-repository-builder</module>
+<!--
     <module>maven-script</module>
+-->
     <module>maven-common-artifact-filters</module>
     <module>maven-dependency-analyzer</module>
+    <module>maven-dependency-tree</module>
     <module>maven-shared-jar</module>
+    <module>maven-osgi</module>
+    <module>maven-downloader</module>
+<!--
+    <module>maven-enforcer-rule-api</module>
+-->
   </modules>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8</connection>
@@ -62,4 +71,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
\ No newline at end of file
+</project>


Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- maven-shared.spec	25 Jul 2009 11:51:22 -0000	1.10
+++ maven-shared.spec	31 Aug 2009 15:26:59 -0000	1.11
@@ -28,61 +28,80 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
+%define shared_components_version 8
+%define file_management_version 1.2
+%define ant_version 1.0
+%define app_configuration_model_version 1.1
+%define app_configuration_web_version 1.1
+%define archiver_version 2.3
+%define common_artifact_filters_version 1.0
+%define dependency_analyzer_version 1.0
+%define dependency_tree_version 1.1
+%define downloader_version 1.2
+%define invoker_version 2.0.7
+%define model_converter_version 2.3
+%define plugin_testing_harness_version 1.2
+%define plugin_testing_tools_version 1.0
+%define plugin_tools_version 2.2
+%define plugin_tools_ant_version 2.2
+%define plugin_tools_api_version 2.2
+%define plugin_tools_beanshell_version 2.2
+%define plugin_tools_java_version 2.2
+%define plugin_tools_model_version 2.2
+%define reporting_impl_version 2.1
+%define repository_builder_version 1.0
+%define io_version 1.1
+%define jar_version 1.1
+%define monitor_version 1.0
+%define osgi_version 0.2.0
+%define script_ant_version 2.1
+%define script_beanshell_version 2.1
+%define test_tools_version 1.0
+#%define toolchain_version 1.0
+%define verifier_version 1.2
+#%define web_ui_tests_version 1.0
+                                                                                
 Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
-
-# svn export
-#    http://svn.apache.org/repos/asf/maven/shared/tags/file-management-1.0/
-# tar czf maven-shared-file-management-1.0.tar.gz file-management-1.0/
-Source0:        maven-shared-file-management-1.0.tar.gz
-Source1:        %{name}-mapdeps.xsl
-Source2:        %{name}-addjunitdep.xml
-Source3:        %{name}-pom.xml
-# svn export 
-#    http://svn.apache.org/repos/asf/maven/shared/tags/maven-plugin-testing-harness-1.0-beta-1/
-# tar czf maven-plugin-testing-harness-1.0-beta-1.tar.gz 
-#    maven-plugin-testing-harness-1.0-beta-1/
-Source4:        maven-plugin-testing-harness-1.0-beta-1.tar.gz
-
-Patch1:         maven-shared-plugin-testing-harness-pom.patch
-
 Name:           maven-shared
-Version:        1.0
-Release:        6.7%{?dist}
-Epoch:          0
+Version:        8
+Release:        1%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
+# svn export \
+#  http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-8/
+# tar czf maven-shared-components-8.tar.gz maven-shared-components-8
+Source0:        maven-shared-components-8.tar.gz
+Source1:        %{name}-8-jpp-depmap.xml
+
+Patch0:        %{name}-pom.patch
+Patch1:        %{name}-ant-pom.patch
+Patch2:        %{name}-file-management-pom.patch
+Patch3:        %{name}-io-ArtifactLocatorStrategyTest.patch
+Patch4:        %{name}-plugin-tools-pom.patch
+Patch5:        %{name}-disable-cobertura.patch
+
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-release
+#BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  junit
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
 BuildRequires:  plexus-utils
+BuildRequires:  plexus-registry
 BuildRequires:  modello-maven-plugin
 
 Requires:       maven2 >= 0:2.0.4
 Requires:       plexus-utils
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,150 +114,801 @@ Maven Shared Components
 %package file-management
 Summary:        Maven Shared File Management API
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       plexus-utils
-Requires:       junit
+Version:        %{file_management_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-io >= 0:%{io_version}
+Requires:  maven2
+Requires:  plexus-container-default
+Requires:  plexus-utils
 
 %description file-management
+API to collect files from a given directory using 
+several include/exclude rules.
+
+%package osgi
+Summary:        Maven OSGi
+Group:          Development/Libraries/Java
+Version:        %{osgi_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  aqute-bndlib
+Requires:  maven2 >= 0:2.0.7
+
+%description osgi
+Library for Maven-OSGi integration
+
+%package ant
+Summary:        Maven Ant
+Group:          Development/Libraries/Java
+Version:        %{ant_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  ant
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-containers-container-default
+
+%description ant
+Runs ant scripts embedded in the POM.
+
+%package app-configuration-model
+Summary:        Maven Applications Shared Configuration Model
+Group:          Development/Libraries/Java
+Version:        %{app_configuration_model_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  plexus-containers
+Requires:  plexus-registry
+
+%description app-configuration-model
+%{summary}.
+
+%package app-configuration-web
+Summary:        Maven Applications Shared Configuration Web
+Group:          Development/Libraries/Java
+Version:        %{app_configuration_web_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-app-configuration-model = 0:%{app_configuration_model_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  maven-wagon
+Requires:  plexus-containers-container-default
+
+%description app-configuration-web
 %{summary}.
 
-%package file-management-javadoc
-Summary:        Javadoc for %{name}-file-management
-Group:          Development/Documentation
+%package archiver
+Summary:        Maven Archiver
+Group:          Development/Libraries/Java
+Version:        %{archiver_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-archiver
 
-%description file-management-javadoc
+%description archiver
 %{summary}.
 
+%package common-artifact-filters
+Summary:        Maven Common Artifact Filters
+Group:          Development/Libraries/Java
+Version:        %{common_artifact_filters_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-test-tools >= 0:%{test_tools_version}-%{release}
+Requires:  junit
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
+
+%description common-artifact-filters
+%{summary}.
+
+%package dependency-tree
+Summary:        Maven Dependency Tree
+Group:          Development/Libraries/Java
+Version:        %{dependency_tree_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-plugin-testing-harness >= 0:%{plugin_testing_harness_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+
+%description dependency-tree
+%{summary}.
+
+%package downloader
+Summary:        Maven Downloader
+Group:          Development/Libraries/Java
+Version:        %{downloader_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+
+%description downloader
+Provide a super simple interface for downloading a 
+single artifact.
+
+%package dependency-analyzer
+Summary:        Maven Dependency Analyzer
+Group:          Development/Libraries/Java
+Version:        %{dependency_analyzer_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  objectweb-asm
+
+%description dependency-analyzer
+%{summary}.
+
+%package invoker
+Summary:        Maven Process Invoker
+Group:          Development/Libraries/Java
+Version:        %{invoker_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-monitor >= 0:%{monitor_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-utils
+
+%description invoker
+%{summary}.
+
+%package model-converter
+Summary:        Maven Model Converter
+Group:          Development/Libraries/Java
+Version:        %{model_converter_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  dom4j
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
+Requires:  plexus-utils
+
+%description model-converter
+Converts between version 3.0.0 and version 4.0.0 models.
+
 %package plugin-testing-harness
-Summary:        Maven Shared Plugin Testing Harness
-Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Summary:        Maven Plugin Testing Mechanism
+Group:          Development/Libraries/Java
+Version:        %{plugin_testing_harness_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  junit
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-utils
 
 %description plugin-testing-harness
 %{summary}.
 
-%package plugin-testing-harness-javadoc
-Summary:        Javadoc for %{name}-plugin-testing-harness
-Group:          Development/Documentation
+%package plugin-testing-tools
+Summary:        Maven Plugin Testing Tools
+Group:          Development/Libraries/Java
+Version:        %{plugin_testing_tools_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-invoker = 0:%{invoker_version}-%{release}
+Requires:  %{name}-repository-builder = 0:%{repository_builder_version}-%{release}
+Requires:  %{name}-test-tools = 0:%{test_tools_version}-%{release}
+Requires:  junit
+Requires:  maven2 >= 0:2.0.7
 
-%description plugin-testing-harness-javadoc
+%description plugin-testing-tools
 %{summary}.
 
-%prep
-%setup -q -c -n %{name}-%{version}
-gzip -dc %{SOURCE4} | tar xf -
-chmod -R go=u-w *
-%patch1 -b .sav
+%package plugin-tools-ant
+Summary:        Maven Ant Plugin Tools
+Group:          Development/Libraries/Java
+Version:        %{plugin_tools_ant_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-plugin-tools-api = 0:%{plugin_tools_api_version}-%{release}
+Requires:  %{name}-plugin-tools-model = 0:%{plugin_tools_model_version}-%{release}
+Requires:  ant
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
+Requires:  plexus-utils
 
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
+%description plugin-tools-ant
+%{summary}.
 
-%build
-[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-export JAVA_HOME
+%package plugin-tools-api
+Summary:        Maven Plugin Tools APIs
+Group:          Development/Libraries/Java
+Version:        %{plugin_tools_api_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-utils
+
+%description plugin-tools-api
+%{summary}.
+
+%package plugin-tools-beanshell
+Summary:        Maven Plugin Tools for Beanshell
+Group:          Development/Libraries/Java
+Version:        %{plugin_tools_beanshell_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-plugin-tools-api = 0:%{plugin_tools_api_version}-%{release}
+Requires:  bsh
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
+Requires:  plexus-utils
+
+%description plugin-tools-beanshell
+%{summary}.
+
+%package plugin-tools-java
+Summary:        Maven Plugin Tools for Java
+Group:          Development/Libraries/Java
+Version:        %{plugin_tools_java_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-plugin-tools-api = 0:%{plugin_tools_api_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
+Requires:  plexus-utils
+Requires:  qdox
 
-cp -p file-management-1.0/pom.xml{,.withoutjunit}
-saxon -o file-management-1.0/pom.xml file-management-1.0/pom.xml.withoutjunit \
-  /usr/share/java-utils/xml/maven2jpp-mapdeps.xsl map=%{SOURCE2}
+%description plugin-tools-java
+%{summary}.
+
+%package plugin-tools-model
+Summary:        Maven Plugin Metadata Model
+Group:          Development/Libraries/Java
+Version:        %{plugin_tools_model_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
+Requires:  plexus-utils
+
+%description plugin-tools-model
+%{summary}.
+
+%package reporting-impl
+Summary:        Maven Reporting Implementation
+Group:          Development/Libraries/Java
+Version:        %{reporting_impl_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  jakarta-commons-validator
+Requires:  jakarta-oro
+Requires:  maven2 >= 0:2.0.7
+Requires:  maven-doxia
+
+%description reporting-impl
+%{summary}.
+
+%package repository-builder
+Summary:        Maven Repository Builder
+Group:          Development/Libraries/Java
+Version:        %{repository_builder_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  %{name}-common-artifact-filters = 0:%{common_artifact_filters_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+
+%description repository-builder
+%{summary}.
+
+%package io
+Summary:        Maven Shared I/O API
+Group:          Development/Libraries/Java
+Version:        %{io_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  maven-wagon
+Requires:  plexus-utils
+Requires:  plexus-container-default
 
-cp -p %{SOURCE3} pom.xml
+%description io
+%{summary}.
 
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
+%package jar
+Summary:        Maven Shared Jar
+Group:          Development/Libraries/Java
+Version:        %{jar_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+
+%description jar
+Utilities that help identify the contents of a JAR, 
+including Java class analysis and Maven metadata 
+analysis.
+
+%package monitor
+Summary:        Maven Shared Monitor API
+Group:          Development/Libraries/Java
+Version:        %{monitor_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  maven2 >= 0:2.0.7
+Requires:  plexus-container-default
 
+%description monitor
+%{summary}.
+
+%package test-tools
+Summary:        Maven Testing Tools
+Group:          Development/Libraries/Java
+Version:        %{test_tools_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  easymock
+Requires:  junit
+Requires:  plexus-utils
+
+%description test-tools
+%{summary}.
+
+#%package toolchain
+#Summary:        Maven Toolchain
+#Group:          Development/Libraries/Java
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  junit
+#
+#%description toolchain
+#%{summary}.
+#
+#%package user-acegi
+#Summary:        Maven User Management Acegi Bridge
+#Group:          Development/Libraries/Java
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  %{name}-user-model >= 0:%{user_model_version}-%{release}
+#Requires:  acegi-security
+#Requires:  jakarta-commons-dbcp
+#
+#%description user-acegi
+#Bridge between Maven User Management and Acegi.
+#
+#%package user-controller
+#Summary:        Maven User Management Controller
+#Group:          Development/Libraries/Java
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  %{name}-user-model >= 0:%{user_model_version}-%{release}
+#Requires:  plexus-xwork-integration
+#Requires:  servlet_2_4_api
+#Requires:  spring-core
+#
+#%description user-controller
+#User Management Controller Layer.
+#
+#%package user-example
+#Summary:        Maven User Management Example Webapp
+#Group:          Development/Libraries/Java
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  %{name}-user-acegi = 0:%{user_acegi_version}-%{release}
+#Requires:  %{name}-user-controller = 0:%{user_controller_version}-%{release}
+#Requires:  %{name}-user-webapp = 0:%{user_webapp_version}-%{release}
+#Requires:  plexus-log4j-logging
+#
+#%description user-example
+#User Management Example Webapp.
+#
+#%package user-model
+#Summary:        Maven User Management Model
+#Group:          Development/Libraries/Java
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  jpox-core
+#Requires:  plexus-container-default
+#Requires:  plexus-jdo2
+#Requires:  plexus-utils
+#
+#%description user-model
+#User Management Model Classes.
+#
+#%package user-webapp
+#Summary:        Maven User Management Webapp
+#Group:          Development/Libraries/Java
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  %{name}-user-acegi = 0:%{user_acegi_version}-%{release}
+#Requires:  %{name}-user-controller = 0:%{user_controller_version}-%{release}
+#Requires:  jakarta-taglibs-standard
+#Requires:  jpox-core
+#Requires:  plexus-container-default
+#Requires:  plexus-log4j-logging
+#Requires:  servlet_2_4_api
+#Requires:  sitemesh
+#
+#%description user-webapp
+#User Management Webapp Layer.
+
+%package verifier
+Summary:        Maven Verifier Component
+Group:          Development/Libraries/Java
+Version:        %{verifier_version}
+Requires:  %{name} = 0:%{shared_components_version}-%{release}
+Requires:  junit
+
+%description verifier
+%{summary}.
+
+#%package web-ui-tests
+#Summary:        Maven Shared Web UI Tests
+#Group:          Development/Libraries/Java
+#Version:        %{web_ui_tests_version}
+#Requires:  %{name} = 0:%{shared_components_version}-%{release}
+#Requires:  junit
+#Requires:  openqa-selenium-rc-java-client-driver
+#Requires:  openqa-selenium-rc-server
+#Requires:  plexus-utils
+
+#%description web-ui-tests
+#%{summary}.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation
+Provides:       %{name}-file-management-javadoc = %{epoch}:%{file_management_version}-%{release}
+Obsoletes:      %{name}-file-management-javadoc < %{epoch}:%{file_management_version}-%{release}
+Provides:       %{name}-plugin-testing-harness-javadoc = %{epoch}:%{plugin_testing_harness_version}-%{release}
+Obsoletes:      %{name}-plugin-testing-harness-javadoc < %{epoch}:%{plugin_testing_harness_version}-%{release}
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{name}-components-%{shared_components_version}
+#gzip -dc %{SOURCE4} | tar xf -
+chmod -R go=u-w *
+%patch0 -b .sav0
+%patch1 -b .sav1
+%patch2 -b .sav2
+%patch3 -b .sav3
+%patch4 -b .sav4
+%patch5 -b .sav5
+
+# Remove test that needs junit-addons until that makes it into Fedora
+rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
+
+# Remove tests that need easymock until it is available in Fedora
+rm -f maven-shared-io/src/test/java/org/apache/maven/shared/io/MockManager.java
+rm -f maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java
+rm -f maven-shared-io/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java.sav3
+rm -f maven-shared-io/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java
+rm -f maven-shared-io/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
+
+rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java
+
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/AbstractDependencyNodeTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListenerTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/filter/AbstractDependencyNodeFilterTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/filter/AncestorOrSelfDependencyNodeFilterTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/filter/ArtifactDependencyNodeFilterTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/traversal/CollectingDependencyNodeVisitorTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/traversal/FilteringDependencyNodeVisitorTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/traversal/SerializingDependencyNodeVisitorTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/filter/AndDependencyNodeFilterTest.java
+rm -f maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/traversal/BuildingDependencyNodeVisitorTest.java
+
+# FIXME: These tests freeze.. no idea why :(
+rm -rf maven-plugin-testing-tools/src/test
+
+# Remove tests that need jmock (for now)
+rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/InputStreamConstraint.java
+rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtilsTest.java
+rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/AbstractFileTest.java
+
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
+
+export MAVEN_OPTS="-XX:MaxPermSize=256m"
 mvn-jpp \
         -e \
+        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+        -Dmaven.test.failure.ignore=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+        install
 
-%install
-rm -rf $RPM_BUILD_ROOT
+# Manual iteration should not be needed, but there is a bug in the javadoc 
+# plugin which makes this necessary. See: 
+# http://jira.codehaus.org/browse/MJAVADOC-157
+for pom in `find -name pom.xml | grep -v /test | grep -v tests | grep -v maven-toolchain | sort`; do
+    pushd `dirname $pom`
+        mvn-jpp \
+          -e \
+          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+          javadoc:javadoc
+    popd
+done
 
+%install
 # main package infrastructure
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-shared
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
 
-# poms
-install -pm 644 pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-components-parent.pom
-%add_to_maven_depmap org.apache.maven.shared shared-components-parent 1 JPP/maven-shared components-parent
+# poms and jars
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-components-parent.pom
+%add_to_maven_depmap org.apache.maven.shared maven-shared-components %{shared_components_version} JPP/maven-shared components-parent
+
+install -pm 644 maven-downloader/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-downloader.pom
+%add_to_maven_depmap org.apache.maven.shared maven-downloader %{downloader_version} JPP/maven-shared downloader
+install -p -m 0644 maven-downloader/target/maven-downloader-%{downloader_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/downloader-%{downloader_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf downloader-%{downloader_version}.jar downloader.jar
+popd
+
+install -pm 644 maven-dependency-analyzer/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-dependency-analyzer.pom
+%add_to_maven_depmap org.apache.maven.shared maven-dependency-analyzer %{dependency_analyzer_version} JPP/maven-shared dependency-analyzer
+install -p -m 0644 maven-dependency-analyzer/target/maven-dependency-analyzer-%{dependency_analyzer_version}-alpha-3-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer-%{dependency_analyzer_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf dependency-analyzer-%{dependency_analyzer_version}.jar dependency-analyzer.jar
+popd
+
+install -pm 644 maven-dependency-tree/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-dependency-tree.pom
+%add_to_maven_depmap org.apache.maven.shared maven-dependency-tree %{dependency_tree_version} JPP/maven-shared dependency-tree
+install -p -m 0644 maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree-%{dependency_tree_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf dependency-tree-%{dependency_tree_version}.jar dependency-tree.jar
+popd
+
+#install -pm 644 maven-web-ui-tests/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-web-ui-tests.pom
+#%%add_to_maven_depmap org.apache.maven.shared maven-web-ui-tests %{web_ui_tests_version} JPP/maven-shared web-ui-tests
+#install -p -m 0644 maven-web-ui-tests/target/maven-web-ui-tests-%{web_ui_tests_version}-SNAPSHOT.jar \
+#        $RPM_BUILD_ROOT%{_javadir}/maven-shared/web-ui-tests-%{web_ui_tests_version}.jar
+#pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+#  ln -sf web-ui-tests-%{web_ui_tests_version}.jar web-ui-tests.jar
+#popd
+
+install -pm 644 maven-verifier/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-verifier.pom
+%add_to_maven_depmap org.apache.maven.shared maven-verifier %{verifier_version} JPP/maven-shared verifier
+install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/verifier-%{verifier_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf verifier-%{verifier_version}.jar verifier.jar
+popd
+
+install -pm 644 maven-test-tools/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-test-tools.pom
+%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{test_tools_version} JPP/maven-shared test-tools
+install -p -m 0644 maven-test-tools/target/maven-test-tools-%{test_tools_version}-alpha-2-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/test-tools-%{test_tools_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf test-tools-%{test_tools_version}.jar test-tools.jar
+popd
+
+install -pm 644 maven-shared-monitor/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-monitor.pom
+%add_to_maven_depmap org.apache.maven.shared maven-shared-monitor %{monitor_version} JPP/maven-shared monitor
+install -p -m 0644 maven-shared-monitor/target/maven-shared-monitor-%{monitor_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/monitor-%{monitor_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf monitor-%{monitor_version}.jar monitor.jar
+popd
+
+install -pm 644 maven-shared-io/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-io.pom
+%add_to_maven_depmap org.apache.maven.shared maven-shared-io %{io_version} JPP/maven-shared io
+install -p -m 0644 maven-shared-io/target/maven-shared-io-%{io_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/io-%{io_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf io-%{io_version}.jar io.jar
+popd
+
+install -pm 644 maven-shared-jar/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-jar.pom
+%add_to_maven_depmap org.apache.maven.shared maven-shared-jar %{jar_version} JPP/maven-shared jar
+install -p -m 0644 maven-shared-jar/target/maven-shared-jar-%{jar_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/jar-%{jar_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf jar-%{jar_version}.jar jar.jar
+popd
+
+install -pm 644 maven-repository-builder/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-repository-builder.pom
+%add_to_maven_depmap org.apache.maven.shared maven-repository-builder %{repository_builder_version} JPP/maven-shared repository-builder
+install -p -m 0644 maven-repository-builder/target/maven-repository-builder-%{repository_builder_version}-alpha-2-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/repository-builder-%{repository_builder_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf repository-builder-%{repository_builder_version}.jar repository-builder.jar
+popd
 
-install -pm 644 file-management-%{version}/pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-file-management.pom
-%add_to_maven_depmap org.apache.maven.shared file-management 1.0 JPP/maven-shared file-management
+install -pm 644 maven-reporting-impl/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-reporting-impl.pom
+%add_to_maven_depmap org.apache.maven.reporting maven-reporting-impl %{reporting_impl_version} JPP/maven-shared reporting-impl
+install -p -m 0644 maven-reporting-impl/target/maven-reporting-impl-%{reporting_impl_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-impl-%{reporting_impl_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf reporting-impl-%{reporting_impl_version}.jar reporting-impl.jar
+popd
 
-install -pm 644 maven-plugin-testing-harness-1.0-beta-1/pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-harness.pom
-%add_to_maven_depmap org.apache.maven.shared maven-plugin-testing-harness 1.0-beta-1 JPP/maven-shared plugin-testing-harness
+install -pm 644 maven-plugin-tools/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools.pom
+%add_to_maven_depmap org.apache.maven maven-plugin-tools %{plugin_tools_version} JPP/maven-shared plugin-tools
 
-# subpackage jars
-install -p -m 0644 \
-      file-management-%{version}/target/file-management-%{version}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/maven-shared
+install -pm 644 maven-plugin-tools/maven-plugin-tools-model/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-model.pom
+%add_to_maven_depmap org.apache.maven maven-plugin-tools-model %{plugin_tools_model_version} JPP/maven-shared plugin-tools-model
+install -p -m 0644 maven-plugin-tools/maven-plugin-tools-model/target/maven-plugin-tools-model-%{plugin_tools_model_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-model-%{plugin_tools_model_version}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-  ln -sf file-management-%{version}.jar file-management.jar
+  ln -sf plugin-tools-model-%{plugin_tools_model_version}.jar plugin-tools-model.jar
 popd
 
-install -p -m 0644 \
-      maven-plugin-testing-harness-1.0-beta-1/target/maven-plugin-testing-harness-1.0-beta-1.jar \
-      $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-testing-harness-%{version}.jar
+install -pm 644 maven-plugin-tools/maven-plugin-tools-java/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-java.pom
+%add_to_maven_depmap org.apache.maven maven-plugin-tools-java %{plugin_tools_java_version} JPP/maven-shared plugin-tools-java
+install -p -m 0644 maven-plugin-tools/maven-plugin-tools-java/target/maven-plugin-tools-java-%{plugin_tools_java_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-java-%{plugin_tools_java_version}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
-  ln -sf plugin-testing-harness-%{version}.jar plugin-testing-harness.jar
+  ln -sf plugin-tools-java-%{plugin_tools_java_version}.jar plugin-tools-java.jar
+popd
+
+install -pm 644 maven-plugin-tools/maven-plugin-tools-beanshell/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-beanshell.pom
+%add_to_maven_depmap org.apache.maven maven-plugin-tools-beanshell %{plugin_tools_beanshell_version} JPP/maven-shared plugin-tools-beanshell
+install -p -m 0644 maven-plugin-tools/maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-%{plugin_tools_beanshell_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-beanshell-%{plugin_tools_beanshell_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf plugin-tools-beanshell-%{plugin_tools_beanshell_version}.jar plugin-tools-beanshell.jar
+popd
+
+install -pm 644 maven-plugin-tools/maven-plugin-tools-api/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-api.pom
+%add_to_maven_depmap org.apache.maven maven-plugin-tools-api %{plugin_tools_api_version} JPP/maven-shared plugin-tools-api
+install -p -m 0644 maven-plugin-tools/maven-plugin-tools-api/target/maven-plugin-tools-api-%{plugin_tools_api_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-api-%{plugin_tools_api_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf plugin-tools-api-%{plugin_tools_api_version}.jar plugin-tools-api.jar
+popd
+
+install -pm 644 maven-plugin-tools/maven-plugin-tools-ant/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-ant.pom
+%add_to_maven_depmap org.apache.maven maven-plugin-tools-ant %{plugin_tools_ant_version} JPP/maven-shared plugin-tools-ant
+install -p -m 0644 maven-plugin-tools/maven-plugin-tools-ant/target/maven-plugin-tools-ant-%{plugin_tools_ant_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-tools-ant-%{plugin_tools_ant_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf plugin-tools-ant-%{plugin_tools_ant_version}.jar plugin-tools-ant.jar
+popd
+
+install -pm 644 maven-plugin-testing-tools/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-tools.pom
+%add_to_maven_depmap org.apache.maven.shared maven-plugin-testing-tools %{plugin_testing_tools_version} JPP/maven-shared plugin-testing-tools
+install -p -m 0644 maven-plugin-testing-tools/target/maven-plugin-testing-tools-%{plugin_testing_tools_version}-alpha-3-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-testing-tools-%{plugin_testing_tools_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf plugin-testing-tools-%{plugin_testing_tools_version}.jar plugin-testing-tools.jar
+popd
+
+install -pm 644 maven-plugin-testing-harness/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-harness.pom
+%add_to_maven_depmap org.apache.maven.shared maven-plugin-testing-harness %{plugin_testing_harness_version} JPP/maven-shared plugin-testing-harness
+install -p -m 0644 maven-plugin-testing-harness/target/maven-plugin-testing-harness-%{plugin_testing_harness_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/plugin-testing-harness-%{plugin_testing_harness_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf plugin-testing-harness-%{plugin_testing_harness_version}.jar plugin-testing-harness.jar
+popd
+
+install -pm 644 maven-model-converter/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-model-converter.pom
+%add_to_maven_depmap org.apache.maven.shared maven-model-converter %{model_converter_version} JPP/maven-shared model-converter
+install -p -m 0644 maven-model-converter/target/maven-model-converter-%{model_converter_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/model-converter-%{model_converter_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf model-converter-%{model_converter_version}.jar model-converter.jar
+popd
+
+install -pm 644 maven-invoker/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-invoker.pom
+%add_to_maven_depmap org.apache.maven.shared maven-invoker %{invoker_version} JPP/maven-shared invoker
+install -p -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker-%{invoker_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf invoker-%{invoker_version}.jar invoker.jar
+popd
+
+install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-common-artifact-filters.pom
+%add_to_maven_depmap org.apache.maven.shared maven-common-artifact-filters %{common_artifact_filters_version} JPP/maven-shared common-artifact-filters
+install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-alpha-2-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters-%{common_artifact_filters_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf common-artifact-filters-%{common_artifact_filters_version}.jar common-artifact-filters.jar
+popd
+
+install -pm 644 maven-archiver/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-archiver.pom
+%add_to_maven_depmap org.apache.maven maven-archiver %{archiver_version} JPP/maven-shared archiver
+install -p -m 0644 maven-archiver/target/maven-archiver-%{archiver_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/archiver-%{archiver_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf archiver-%{archiver_version}.jar archiver.jar
+popd
+
+install -pm 644 maven-app-configuration/web/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-web.pom
+%add_to_maven_depmap org.apache.maven.shared maven-app-configuration-web %{app_configuration_web_version} JPP/maven-shared app-configuration-web
+install -p -m 0644 maven-app-configuration/web/target/maven-app-configuration-web-%{app_configuration_web_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/app-configuration-web-%{app_configuration_web_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf app-configuration-web-%{app_configuration_web_version}.jar app-configuration-web.jar
+popd
+
+install -pm 644 maven-app-configuration/model/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-model.pom
+%add_to_maven_depmap org.apache.maven.shared maven-app-configuration-model %{app_configuration_model_version} JPP/maven-shared app-configuration-model
+install -p -m 0644 maven-app-configuration/model/target/maven-app-configuration-model-%{app_configuration_model_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/app-configuration-model-%{app_configuration_model_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf app-configuration-model-%{app_configuration_model_version}.jar app-configuration-model.jar
+popd
+
+install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-ant.pom
+%add_to_maven_depmap org.apache.maven.shared maven-ant %{ant_version} JPP/maven-shared ant
+install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/ant-%{ant_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf ant-%{ant_version}.jar ant.jar
+popd
+
+install -pm 644 maven-osgi/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-osgi.pom
+%add_to_maven_depmap org.apache.maven.shared maven-osgi %{osgi_version} JPP/maven-shared osgi
+install -p -m 0644 maven-osgi/target/maven-osgi-%{osgi_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/osgi-%{osgi_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf osgi-%{osgi_version}.jar osgi.jar
+popd
+
+install -pm 644 file-management/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-shared-file-management.pom
+%add_to_maven_depmap org.apache.maven.shared file-management %{file_management_version} JPP/maven-shared file-management
+install -p -m 0644 file-management/target/file-management-%{file_management_version}-SNAPSHOT.jar \
+        $RPM_BUILD_ROOT%{_javadir}/maven-shared/file-management-%{file_management_version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}/maven-shared
+  ln -sf file-management-%{file_management_version}.jar file-management.jar
 popd
 
 # javadoc
-install -d -m 755 \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}-file-management-%{version}
-cp -pr file-management-%{version}/target/site/apidocs/* \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}-file-management-%{version}
-ln -s %{name}-file-management-%{version} \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}-file-management
-install -d -m 755 \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}-plugin-testing-harness-%{version}
-cp -pr maven-plugin-testing-harness-1.0-beta-1/target/site/apidocs/* \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}-plugin-testing-harness-%{version}
-ln -s %{name}-plugin-testing-harness-%{version} \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{name}-plugin-testing-harness
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/downloader
+cp -pr maven-downloader/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/downloader
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-tree
+cp -pr maven-dependency-tree/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-tree
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-analyzer
+cp -pr maven-dependency-analyzer/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-analyzer
+#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/web-ui-tests
+#cp -pr maven-web-ui-tests/target/site/apidocs/* \
+#         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/web-ui-tests
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/verifier
+cp -pr maven-verifier/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/verifier
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/test-tools
+cp -pr maven-test-tools/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/test-tools
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/monitor
+cp -pr maven-shared-monitor/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/monitor
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/io
+cp -pr maven-shared-io/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/io
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/jar
+cp -pr maven-shared-jar/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/repository-builder
+cp -pr maven-repository-builder/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/repository-builder
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/reporting-impl
+cp -pr maven-reporting-impl/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/reporting-impl
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-model
+cp -pr maven-plugin-tools/maven-plugin-tools-model/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-model
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-java
+cp -pr maven-plugin-tools/maven-plugin-tools-java/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-java
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-beanshell
+cp -pr maven-plugin-tools/maven-plugin-tools-beanshell/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-beanshell
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-api
+cp -pr maven-plugin-tools/maven-plugin-tools-api/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-api
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-ant
+cp -pr maven-plugin-tools/maven-plugin-tools-ant/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-tools-ant
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-tools
+cp -pr maven-plugin-testing-tools/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-tools
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-harness
+cp -pr maven-plugin-testing-harness/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/plugin-testing-harness
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/model-converter
+cp -pr maven-model-converter/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/model-converter
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/invoker
+cp -pr maven-invoker/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/invoker
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/common-artifact-filters
+cp -pr maven-common-artifact-filters/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/common-artifact-filters
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/archiver
+cp -pr maven-archiver/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/archiver
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-web
+cp -pr maven-app-configuration/web/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-web
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-model
+cp -pr maven-app-configuration/model/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/app-configuration-model
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/ant
+cp -pr maven-ant/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/ant
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/osgi
+cp -pr maven-osgi/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/osgi
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/file-management
+cp -pr file-management/target/site/apidocs/* \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/file-management
+
+ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
-%post file-management
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun file-management
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-testing-harness
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-testing-harness
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %post
 %update_maven_depmap
 
@@ -250,44 +920,186 @@ fi
 %dir %{_javadir}/maven-shared
 %dir %{_datadir}/maven2/poms
 %{_datadir}/maven2/poms/JPP.maven-shared-components-parent.pom
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools.pom
 %{_mavendepmapfragdir}
-%config(noreplace) /etc/maven/fragments/maven-shared
 
 %files file-management
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/file-management*.jar
 %{_datadir}/maven2/poms/JPP.maven-shared-file-management.pom
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/file-management*-%{version}.jar.*
-%endif
+
+%files osgi
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/osgi*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-osgi.pom
+
+%files ant
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/ant*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-ant.pom
+
+%files app-configuration-model
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/app-configuration-model*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-model.pom
+
+%files app-configuration-web
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/app-configuration-web*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-app-configuration-web.pom
+
+%files archiver
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/archiver*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-archiver.pom
+
+%files common-artifact-filters
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/common-artifact-filters*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-common-artifact-filters.pom
+
+%files dependency-analyzer
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/dependency-analyzer*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-dependency-analyzer.pom
+
+%files dependency-tree
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/dependency-tree*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-dependency-tree.pom
+
+%files downloader
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/downloader*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-downloader.pom
+
+%files invoker
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/invoker*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-invoker.pom
+
+%files model-converter
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/model-converter*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-model-converter.pom
 
 %files plugin-testing-harness
 %defattr(-,root,root,-)
 %{_javadir}/maven-shared/plugin-testing-harness*.jar
 %{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-harness.pom
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-testing-harness*-%{version}.jar.*
-%endif
-
-%files file-management-javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-file-management*
-
-%files plugin-testing-harness-javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-plugin-testing-harness*
 
-%changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-6.7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+%files plugin-testing-tools
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/plugin-testing-tools*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-testing-tools.pom
+
+%files plugin-tools-ant
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/plugin-tools-ant*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-ant.pom
+
+%files plugin-tools-api
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/plugin-tools-api*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-api.pom
 
-* Mon Mar 23 2009 Deepak Bhole <dbhole at redhat.com> - 0:1.0-5.7
-- Remove ppc64 exclusion
+%files plugin-tools-beanshell
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/plugin-tools-beanshell*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-beanshell.pom
+
+%files plugin-tools-java
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/plugin-tools-java*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-java.pom
+
+%files plugin-tools-model
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/plugin-tools-model*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-plugin-tools-model.pom
+
+%files reporting-impl
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/reporting-impl*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-reporting-impl.pom
+
+%files repository-builder
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/repository-builder*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-repository-builder.pom
+
+%files io
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/io*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-io.pom
+
+%files jar
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/jar*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-jar.pom
+
+%files monitor
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/monitor*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-monitor.pom
+
+%files test-tools
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/test-tools*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-test-tools.pom
+
+#%files toolchain
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/toolchain*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-toolchain.pom
+#
+#%files user-acegi
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/user-acegi*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-user-acegi.pom
+#
+#%files user-controller
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/user-controller*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-user-controller.pom
+#
+#%files user-example
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/user-example*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-user-example.pom
+#
+#%files user-model
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/user-model*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-user-model.pom
+#
+#%files user-webapp
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/user-webapp*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-user-webapp.pom
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-5.6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+%files verifier
+%defattr(-,root,root,-)
+%{_javadir}/maven-shared/verifier*.jar
+%{_datadir}/maven2/poms/JPP.maven-shared-verifier.pom
+
+#%files web-ui-tests
+#%defattr(-,root,root,-)
+#%{_javadir}/maven-shared/web-ui-tests*.jar
+#%{_datadir}/maven2/poms/JPP.maven-shared-web-ui-tests.pom
+#%if %{gcj_support}
+#%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/web-ui-tests*-%{web_ui_tests_version}.jar.*
+#%endif
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{shared_components_version}
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 8-1
+- Update to version 8 (courtesy Deepak Bhole)
 
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-4.6
 - drop repotag


--- maven-shared-plugin-testing-harness-pom.patch DELETED ---



From awjb at fedoraproject.org  Mon Aug 31 15:37:06 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 31 Aug 2009 15:37:06 +0000 (UTC)
Subject: rpms/wine/F-11 adding-pulseaudio-to-winecfg-0.4.patch, NONE,
	1.1 pulseaudio-winecfg-update.patch, NONE, 1.1 wine-64.conf,
	NONE, 1.1 wine-chooser.sh, NONE,
	1.1 winepulse-0.30-configure.ac.patch, NONE,
	1.1 winepulse-0.30.patch, NONE, 1.1 .cvsignore, 1.77,
	1.78 sources, 1.78, 1.79 wine-rpath.patch, 1.7, 1.8 wine.spec,
	1.109, 1.110 adding-pulseaudio-to-winecfg-0.3.patch, 1.1,
	NONE wine-desktop-mime.patch, 1.3,
	NONE winepulse-0.29-configure.ac.patch, 1.1,
	NONE winepulse-0.29.patch, 1.1, NONE
Message-ID: <20090831153707.0335911C0072@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11498

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Added Files:
	adding-pulseaudio-to-winecfg-0.4.patch 
	pulseaudio-winecfg-update.patch wine-64.conf wine-chooser.sh 
	winepulse-0.30-configure.ac.patch winepulse-0.30.patch 
Removed Files:
	adding-pulseaudio-to-winecfg-0.3.patch wine-desktop-mime.patch 
	winepulse-0.29-configure.ac.patch winepulse-0.29.patch 
Log Message:
- version upgrade
- bug fixes
- 32 and 64 bit versions


adding-pulseaudio-to-winecfg-0.4.patch:
 Bg.rc       |    1 +
 Cs.rc       |    1 +
 Da.rc       |    1 +
 De.rc       |    1 +
 En.rc       |    1 +
 Es.rc       |    1 +
 Fi.rc       |    1 +
 Fr.rc       |    1 +
 Hu.rc       |    1 +
 Ko.rc       |    1 +
 Nl.rc       |    1 +
 No.rc       |    1 +
 Pl.rc       |    1 +
 Pt.rc       |    1 +
 Ro.rc       |    1 +
 Ru.rc       |    1 +
 Si.rc       |    1 +
 Sv.rc       |    1 +
 Tr.rc       |    1 +
 Zh.rc       |    1 +
 audio.c     |    1 +
 libraries.c |    1 +
 resource.h  |    2 +-
 23 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE adding-pulseaudio-to-winecfg-0.4.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..e17690e 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index d9c0b28..9bcc033 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardn?"
     IDS_ACCEL_BASIC             "Z?kladn?"
     IDS_ACCEL_EMULATION         "Emulace"
+    IDS_DRIVER_PULSE             "Ovlada? PulseAudio"
     IDS_DRIVER_ALSA             "Ovlada? ALSA"
     IDS_DRIVER_ESOUND           "Ovlada? EsounD"
     IDS_DRIVER_OSS              "Ovlada? OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index f53aead..690c7f5 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggende"
     IDS_ACCEL_EMULATION         "Emul?ring"
+    IDS_DRIVER_PULSE             "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index e6bed15..d3027bc 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Einfach"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio-Treiber"
     IDS_DRIVER_ALSA             "ALSA-Treiber"
     IDS_DRIVER_ESOUND           "EsounD-Treiber"
     IDS_DRIVER_OSS              "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 049aaa7..cef7c4a 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 1771b4e..c49f9a3 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Est?ndar"
     IDS_ACCEL_BASIC             "B?sica"
     IDS_ACCEL_EMULATION         "Emulaci?n"
+    IDS_DRIVER_PULSE             "Manejador PulseAudio"
     IDS_DRIVER_ALSA             "Manejador ALSA"
     IDS_DRIVER_ESOUND           "Manejador EsounD"
     IDS_DRIVER_OSS              "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 0dedf3a..097a4d2 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 52c9888..1bd92b1 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -274,6 +274,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basique"
     IDS_ACCEL_EMULATION         "??mulation"
+    IDS_DRIVER_PULSE            "Pilote PulseAudio"
     IDS_DRIVER_ALSA             "Pilote ALSA"
     IDS_DRIVER_ESOUND           "Pilote EsounD"
     IDS_DRIVER_OSS              "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index dc887fe..3ba696f 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 6f13e0c..d5403da 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -274,6 +274,7 @@ BEGIN
    IDS_ACCEL_STANDARD          "????"
    IDS_ACCEL_BASIC             "????"
    IDS_ACCEL_EMULATION         "??????????"
+    IDS_DRIVER_PULSE             "PulseAudio ????????"
    IDS_DRIVER_ALSA             "ALSA ????????"
    IDS_DRIVER_ESOUND           "EsounD ????????"
    IDS_DRIVER_OSS              "OSS ????????"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 4cd45f0..d23f359 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standaard"
     IDS_ACCEL_BASIC             "Eenvoudig"
     IDS_ACCEL_EMULATION         "Emulatie"
+    IDS_DRIVER_PULSE             "PulseAudio Stuurprogramma"
     IDS_DRIVER_ALSA             "ALSA Stuurprogramma"
     IDS_DRIVER_ESOUND           "EsounD Stuurprogramma"
     IDS_DRIVER_OSS              "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index cc34fad..71876ba 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grunnleggende"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE             "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index d884881..d6405b1 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardowe"
     IDS_ACCEL_BASIC             "Podstawowe"
     IDS_ACCEL_EMULATION         "Emulacja"
+    IDS_DRIVER_PULSE             "Sterownik PulseAudio"
     IDS_DRIVER_ALSA             "Sterownik ALSA"
     IDS_DRIVER_ESOUND           "Sterownik EsounD"
     IDS_DRIVER_OSS              "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 683dc68..be92466 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -470,6 +470,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Padr??o"
     IDS_ACCEL_BASIC             "B??sico"
     IDS_ACCEL_EMULATION         "Emula????o"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index f12949f..2101ea1 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "De baz??"
     IDS_ACCEL_EMULATION         "Emulare"
+    IDS_DRIVER_PULSE             "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 7293cbc..fb57527 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -277,6 +277,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????????????????????"
     IDS_ACCEL_BASIC             "??????????????????????"
     IDS_ACCEL_EMULATION         "????????????????"
+    IDS_DRIVER_PULSE		"PulseAudio ??????????????"
     IDS_DRIVER_ALSA             "ALSA ??????????????"
     IDS_DRIVER_ESOUND           "EsounD ??????????????"
     IDS_DRIVER_OSS              "OSS ??????????????"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index feaef36..c26e5cb 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardno"
     IDS_ACCEL_BASIC             "Osnovno"
     IDS_ACCEL_EMULATION         "Emulacija"
+    IDS_DRIVER_PULSE             "PulseAudio gonilnik"
     IDS_DRIVER_ALSA             "ALSA gonilnik"
     IDS_DRIVER_ESOUND           "EsounD gonilnik"
     IDS_DRIVER_OSS              "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 7fea5aa..35eb871 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggande"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE             "PulseAudio-drivrutin"
     IDS_DRIVER_ALSA             "ALSA-drivrutin"
     IDS_DRIVER_ESOUND           "EsounD-drivrutin"
     IDS_DRIVER_OSS              "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 0fa9778..2a23112 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standart"
     IDS_ACCEL_BASIC             "Temel"
     IDS_ACCEL_EMULATION         "Taklit"
+    IDS_DRIVER_PULSE             "PulseAudio S?r?c?s?"
     IDS_DRIVER_ALSA             "ALSA S?r?c?s?"
     IDS_DRIVER_ESOUND           "EsounD S?r?c?s?"
     IDS_DRIVER_OSS              "OSS S?r?c?s?"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index fea66b7..bc0aaaf 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????"
+    IDS_DRIVER_PULSE             "PulseAudio ??????"
     IDS_DRIVER_ALSA             "ALSA ??????"
     IDS_DRIVER_ESOUND           "EsounD ??????"
     IDS_DRIVER_OSS              "OSS ??????"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 9f8a0a2..0ecb6c3 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
 } AUDIO_DRIVER;
 
 static const AUDIO_DRIVER sAudioDrivers[] = {
+  {IDS_DRIVER_PULSE,      "pulse"},
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..7c13fad 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -81,6 +81,7 @@ static const char * const builtin_only[] =
     "wineoss.drv",
     "wineps",
     "wineps.drv",
+    "winepulse.drv",
     "winex11.drv",
     "winmm",
     "wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 27736b7..f8ba2ee 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -185,7 +185,7 @@
 #define IDS_ACCEL_BASIC                 8302
 #define IDS_ACCEL_EMULATION             8303
 #define IDS_DRIVER_ALSA                 8304
-
+#define IDS_DRIVER_PULSE                 8305
 #define IDS_DRIVER_ESOUND               8306
 #define IDS_DRIVER_OSS                  8307
 #define IDS_DRIVER_JACK                 8308

pulseaudio-winecfg-update.patch:
 Ja.rc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE pulseaudio-winecfg-update.patch ---
--- programs/winecfg/Ja.rc.orig	2009-08-26 11:55:56.000000000 +0200
+++ programs/winecfg/Ja.rc	2009-08-26 11:56:52.000000000 +0200
@@ -275,6 +275,7 @@
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????????"
     IDS_DRIVER_ALSA             "ALSA ????????????"
     IDS_DRIVER_ESOUND           "EsounD ????????????"
     IDS_DRIVER_OSS              "OSS ????????????"


--- NEW FILE wine-64.conf ---
/usr/lib64/wine/


--- NEW FILE wine-chooser.sh ---
#!/bin/sh
HAVE_32=false
HAVE_64=false

if [ -x "/usr/bin/wine32" ]; then
HAVE_32=true
fi

if [ -x "/usr/bin/wine64" ]; then
HAVE_64=true
fi

if [ -f "${1}" ]; then
    archtype=`file "${1}" | cut -d':' -f2 | cut -d' ' -f2`

    if [ ${archtype} = 'PE32+' ]; then # 64bit
	if $HAVE_64; then
	    exec "/usr/bin/wine64" "${@}";
	elif [ `uname -m` = 'x86_64' ]; then
	    echo "Your are trying to run a 64bit application. Please install the 64bit version of wine."
	    echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-64)\\\"\"'"
	else
	    echo "Your are trying to run a 64bit application on a 32bit installation of Fedora. You need a 64bit version of Fedora to run this application."
	fi
    else
	if $HAVE_32; then
	    exec "/usr/bin/wine32" "${@}"
	else
	    echo "Your are trying to run a 32bit application. Please install the 32bit version of wine."
	    echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-32)\\\"\"'"
	fi
    fi
else
    if $HAVE_64; then
	exec "/usr/bin/wine64" "${@}";
    else
	exec "/usr/bin/wine32" "${@}";
    fi
fi

winepulse-0.30-configure.ac.patch:
 configure.ac |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.30-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 59b771c..385a7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,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])
@@ -1257,6 +1258,24 @@ 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")
+        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"
@@ -1391,7 +1410,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 \
@@ -2429,6 +2448,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[AL
 WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 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/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/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

winepulse-0.30.patch:
 Makefile.in        |   15 
 pulse.c            |  788 +++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 +++++++++++++++++++++++++++++
 waveout.c          | 1070 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2667 insertions(+)

--- NEW FILE winepulse-0.30.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.
+        */
[...2304 lines suppressed...]
index 0000000..4a834cd
--- /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 {
+    volatile 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.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	19 Jul 2009 10:47:47 -0000	1.77
+++ .cvsignore	31 Aug 2009 15:37:06 -0000	1.78
@@ -1 +1 @@
-wine-1.1.26-fe.tar.bz2
+wine-1.1.28-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources	19 Jul 2009 10:47:48 -0000	1.78
+++ sources	31 Aug 2009 15:37:06 -0000	1.79
@@ -1 +1 @@
-7b2affded452ced2b1f45a9b7e6f24da  wine-1.1.26-fe.tar.bz2
+6342c41f46d0571efae685c17aa5550f  wine-1.1.28-fe.tar.bz2

wine-rpath.patch:
 configure |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine-rpath.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- wine-rpath.patch	23 Nov 2008 10:44:34 -0000	1.7
+++ wine-rpath.patch	31 Aug 2009 15:37:06 -0000	1.8
@@ -1,32 +1,32 @@
---- configure.orig	2008-11-05 12:25:10.000000000 +0300
-+++ configure	2008-11-06 22:22:27.000000000 +0300
-@@ -9306,14 +9306,14 @@
- fi
+--- configure.orig	2009-08-26 11:47:17.000000000 +0200
++++ configure	2009-08-26 11:50:07.000000000 +0200
+@@ -6565,14 +6565,14 @@
  
+ fi
  
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
+-      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
 +      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
-+{ $as_echo "$as_me:$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 "$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
    ac_wine_try_cflags_saved=$CFLAGS
 -CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
 +CFLAGS="$CFLAGS -fPIC"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9369,8 +9369,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6597,8 +6597,8 @@
+ 	       { $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
+ 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=""
  else
-   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+   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


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- wine.spec	19 Jul 2009 10:47:48 -0000	1.109
+++ wine.spec	31 Aug 2009 15:37:06 -0000	1.110
@@ -1,5 +1,6 @@
+%define no64bit 0
 Name:		wine
-Version:	1.1.26
+Version:	1.1.28
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -22,6 +23,8 @@ Source0:        %{name}-%{version}-fe.ta
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
+Source5:        wine-64.conf
+Source6:        wine-chooser.sh
 # desktop stuff
 Source100:      wine-notepad.desktop
 Source101:      wine-regedit.desktop
@@ -44,24 +47,25 @@ 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.29-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.29.patch
-Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.3.patch
+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/adding-pulseaudio-to-winecfg-0.4.patch
 Source402:      README-FEDORA-PULSEAUDIO
-
+Patch403:       pulseaudio-winecfg-update.patch
 
 Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if !%{?no64bit}
+ExclusiveArch:  %{ix86} x86_64
+%else
 ExclusiveArch:  %{ix86}
+%endif
 
-# BR: All builds
-BuildRequires:	bison
-BuildRequires:	flex
+BuildRequires:  bison
+BuildRequires:  flex
 BuildRequires:  autoconf
 BuildRequires:  desktop-file-utils
-
-# x86-32 BR
 BuildRequires:  alsa-lib-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  esound-devel
@@ -80,7 +84,7 @@ BuildRequires:  unixODBC-devel
 BuildRequires:  openssl-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
-BuildRequires:  fontforge
+BuildRequires:  fontforge freetype-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  jack-audio-connection-kit-devel
 # #217338
@@ -102,15 +106,27 @@ BuildRequires:  libXcursor-devel
 BuildRequires:  dbus-devel hal-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  gsm-devel
 
-Requires:       wine-core = %{version}-%{release}
-Requires:       wine-capi = %{version}-%{release}
-Requires:       wine-cms = %{version}-%{release}
+# noarch
+Requires:       wine-common = %{version}-%{release}
 Requires:       wine-desktop = %{version}-%{release}
-Requires:       wine-ldap = %{version}-%{release}
-Requires:       wine-tools = %{version}-%{release}
-Requires:       wine-twain = %{version}-%{release}
-Requires:       wine-pulseaudio = %{version}-%{release}
+# 32bit
+Requires:       wine-core(x86-32) = %{version}-%{release}
+Requires:       wine-capi(x86-32) = %{version}-%{release}
+Requires:       wine-cms(x86-32) = %{version}-%{release}
+Requires:       wine-ldap(x86-32) = %{version}-%{release}
+Requires:       wine-twain(x86-32) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-32) = %{version}-%{release}
+# 64bit
+%ifarch x86_64
+Requires:       wine-core(x86-64) = %{version}-%{release}
+Requires:       wine-capi(x86-64) = %{version}-%{release}
+Requires:       wine-cms(x86-64) = %{version}-%{release}
+Requires:       wine-ldap(x86-64) = %{version}-%{release}
+Requires:       wine-twain(x86-64) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-64) = %{version}-%{release}
+%endif
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -127,17 +143,26 @@ wine-* sub packages.
 %package core
 Summary:        Wine core package
 Group:		Applications/Emulators
+Requires:       wine-fonts = %{version}-%{release}
 Requires:       %{_bindir}/xmessage
-Requires:       freetype%{_isa}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
 Obsoletes:      wine-arts < 0.9.34
+Obsoletes:      wine-tools <= 1.1.27
+Provides:       wine-tools = %{version}-%{release}
 # fix dns resolution (#492700)
 # require both to be sure 64bit is present as well...
-Requires:       nss-mdns nss-mdns%{_isa}
+%ifarch %{ix86}
+Requires:       freetype(x86-32)
+Requires:       nss-mdns(x86-32)
 # require Xrender isa on x86_64 (#510947)
-Requires:       libXrender%{_isa}
+Requires:       libXrender(x86-32)
+%endif
+%ifarch x86_64
+Requires:       nss-mdns(x86-64)
+Requires:       freetype(x86-64)
+%endif
 
 %description core
 Wine core package includes the basic wine stuff needed by all other packages.
@@ -150,18 +175,28 @@ Requires(post): desktop-file-utils >= 0.
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): desktop-file-utils >= 0.8
 Requires:       wine-core = %{version}-%{release}
+BuildArch:      noarch
 
 %description desktop
 Desktop integration features for wine, including mime-types and a binary format
 handler service.
 
-%package tools
-Summary:        Additional wine tools
+%package fonts
+Summary:       Wine font files
+Group:         Applications/Emulators
+BuildArch:     noarch
+
+%description fonts
+%{summary}
+
+%package common
+Summary:        Common files
 Group:		Applications/Emulators
 Requires:       wine-core = %{version}-%{release}
+BuildArch:      noarch
 
-%description tools
-Additional wine tools
+%description common
+Common wine files and scripts.
 
 %package esd
 Summary: ESD sound support for wine
@@ -175,7 +210,12 @@ ESD sound support for wine
 Summary: JACK sound support for wine
 Group: System Environment/Libraries
 Requires: wine-core = %{version}-%{release}
-Requires: jack-audio-connection-kit%{_isa}
+%ifarch %{ix86}
+Requires: jack-audio-connection-kit(x86-32)
+%endif
+%ifarch x86_64
+Requires: jack-audio-connection-kit(x86-64)
+%endif
 
 %description jack
 JACK sound support for wine
@@ -256,19 +296,27 @@ This package adds an oss driver for wine
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+
 %patch1
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
+%patch403
+
 autoreconf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine \
 	--x-includes=%{_includedir} --x-libraries=%{_libdir} \
-	--with-pulse
+	--with-pulse \
+        --with-x \
+%ifarch x86_64
+	--enable-win64 \
+%endif
+        --enable-maintainer-mode \
+	--disable-tests
 
 %{__make} depend
 
@@ -284,6 +332,17 @@ rm -rf %{buildroot}
 	LDCONFIG=/bin/true \
 	UPDATE_DESKTOP_DATABASE=/bin/true
 
+%ifarch %{ix86}
+# rename wine to wine32
+mv %{buildroot}%{_bindir}/wine{,32}
+%endif
+
+# if x86_64 rename to wine64
+%ifarch x86_64
+mv %{buildroot}%{_bindir}/wine{,64}
+%endif
+
+
 mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
@@ -366,7 +425,16 @@ desktop-file-install \
 cp %{SOURCE3} README-Fedora
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%ifarch %{ix86}
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+%endif
+
+%ifarch x86_64
+install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+%endif
+
+install -p -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/wine
 
 # deploy pulseaudio readme
 cp %{SOURCE402} .
@@ -430,19 +498,49 @@ update-desktop-database &>/dev/null || :
 
 %files core
 %defattr(-,root,root,-)
-%doc ANNOUNCE COPYING.LIB LICENSE LICENSE.OLD
-%doc AUTHORS README-Fedora README VERSION
+%doc ANNOUNCE
+%doc COPYING.LIB
+%doc LICENSE
+%doc LICENSE.OLD
+%doc AUTHORS
+%doc README-Fedora
+%doc README
+%doc VERSION
 # do not include huge changelogs .OLD .ALPHA .BETA (#204302)
 %doc documentation/README.*
-%{_bindir}/msiexec
-%{_bindir}/regedit
-%{_bindir}/regsvr32
-%{_bindir}/wine
-%{_bindir}/wineboot
-%{_bindir}/wineconsole
-%{_bindir}/wineprefixcreate
-%{_mandir}/man1/wineprefixcreate.1*
-%{_bindir}/winecfg
+
+%{_bindir}/winedump
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/cmd.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/wordpad.exe.so
+%{_libdir}/wine/write.exe.so
+
+%ifarch %{ix86}
+%{_bindir}/wine-preloader
+%endif
+%{_bindir}/wineserver
+
+%ifarch %{ix86}
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+%{_bindir}/wine32
+%endif
+%ifarch x86_64
+%{_bindir}/wine64
+%{_sysconfdir}/ld.so.conf.d/wine-64.conf
+%endif
+
+%dir %{_libdir}/wine
+%dir %{_libdir}/wine/fakedlls
+%{_libdir}/wine/fakedlls/*
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/winhlp32.exe.so
@@ -463,20 +561,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winebrowser.exe.so
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
-%{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedevice.exe.so
 %{_libdir}/wine/uninstaller.exe.so
-%dir %{_datadir}/wine
-%{_mandir}/man1/wine.1.gz
-%{_mandir}/man1/wineserver.1*
-%lang(fr) %{_mandir}/fr.UTF-8/man1/*
-%{_datadir}/wine/generic.ppd
-%{_datadir}/wine/wine.inf
-%{_bindir}/wine-preloader
-%{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
-%dir %{_libdir}/wine
 %{_libdir}/wine/acledit.dll.so
 %{_libdir}/wine/aclui.dll.so
 %{_libdir}/wine/activeds.dll.so
@@ -499,7 +587,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -549,7 +636,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fusion.dll.so
-%{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
 %{_libdir}/wine/glu32.dll.so
@@ -565,7 +651,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/iccvid.dll.so
 %{_libdir}/wine/icinfo.exe.so
 %{_libdir}/wine/icmp.dll.so
-%{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
 %{_libdir}/wine/imm32.dll.so
@@ -580,7 +665,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
@@ -593,21 +677,21 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mciwave.dll.so
 %{_libdir}/wine/midimap.dll.so
 %{_libdir}/wine/mlang.dll.so
-%{_libdir}/wine/mmdevldr.vxd.so
-%{_libdir}/wine/mmsystem.dll16
-%{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
+%{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
 %{_libdir}/wine/mscat32.dll.so
 %{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msctf.dll.so
+%{_libdir}/wine/msdaps.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/msgsm32.acm.so
 %{_libdir}/wine/mshtml.dll.so
 %{_libdir}/wine/mshtml.tlb.so
 %{_libdir}/wine/msi.dll.so
@@ -675,7 +759,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/sensapi.dll.so
 %{_libdir}/wine/serialui.dll.so
 %{_libdir}/wine/setupapi.dll.so
-%{_libdir}/wine/setupx.dll16
 %{_libdir}/wine/sfc_os.dll.so
 %{_libdir}/wine/shdoclc.dll.so
 %{_libdir}/wine/shdocvw.dll.so
@@ -693,45 +776,31 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
-%{_libdir}/wine/system.drv16
 %{_libdir}/wine/t2embed.dll.so
 %{_libdir}/wine/tapi32.dll.so
-%{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
 %{_libdir}/wine/url.dll.so
 %{_libdir}/wine/urlmon.dll.so
-%{_libdir}/wine/user.exe16
 %{_libdir}/wine/user32.dll.so
 %{_libdir}/wine/usp10.dll.so
 %{_libdir}/wine/uxtheme.dll.so
 %{_libdir}/wine/userenv.dll.so
-%{_libdir}/wine/vdhcp.vxd.so
 %{_libdir}/wine/vdmdbg.dll.so
-%{_libdir}/wine/ver.dll16
 %{_libdir}/wine/version.dll.so
-%{_libdir}/wine/vmm.vxd.so
-%{_libdir}/wine/vnbt.vxd.so
-%{_libdir}/wine/vnetbios.vxd.so
-%{_libdir}/wine/vtdapi.vxd.so
-%{_libdir}/wine/vwin32.vxd.so
-%{_libdir}/wine/w32skrnl.dll.so
 %{_libdir}/wine/wbemprox.dll.so
 %{_libdir}/wine/windowscodecs.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
-%{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winecoreaudio.drv.so
 %{_libdir}/wine/winejoystick.drv.so
 %{_libdir}/wine/winex11.drv.so
-%{_libdir}/wine/wing.dll16
 %{_libdir}/wine/wing32.dll.so
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
 %{_libdir}/wine/winnls32.dll.so
-%{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/wmiutils.dll.so
@@ -741,16 +810,13 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
 %{_libdir}/wine/wow32.dll.so
-%{_libdir}/wine/wprocs.dll16
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
 %{_libdir}/wine/wuapi.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
-%{_datadir}/wine/fonts/
 %{_libdir}/wine/wineps.drv.so
-%{_libdir}/wine/wineps16.drv16
 %{_libdir}/wine/d3d8.dll.so
 %{_libdir}/wine/d3d9.dll.so
 %{_libdir}/wine/opengl32.dll.so
@@ -763,8 +829,33 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_libdir}/wine/xmllite.dll.so
-%{_sysconfdir}/ld.so.conf.d/wine-32.conf
-# 16bit
+%ifnarch x86_64
+# 16 bit and other non 64bit stuff
+%{_libdir}/wine/winedos.dll.so
+%{_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
+%{_libdir}/wine/vwin32.vxd.so
+%{_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
 %{_libdir}/wine/compobj.dll16.so
@@ -774,9 +865,9 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dispdib.dll16.so
 %{_libdir}/wine/display.drv16.so
 %{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
-%{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
 %{_libdir}/wine/msvideo.dll16.so
@@ -804,29 +895,36 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winnls.dll16.so
 %{_libdir}/wine/winoldap.mod16.so
 %{_libdir}/wine/wintab.dll16.so
+%endif
 
-%files tools
+%files common
 %defattr(-,root,root,-)
+%{_bindir}/wineprefixcreate
 %{_bindir}/notepad
 %{_bindir}/winedbg
-%{_bindir}/winedump
 %{_bindir}/winefile
-%{_bindir}/winemaker
 %{_bindir}/winemine
+%{_bindir}/winemaker
 %{_bindir}/winepath
-%{_libdir}/wine/explorer.exe.so
-%{_libdir}/wine/control.exe.so
-%{_libdir}/wine/cmd.exe.so
-%{_libdir}/wine/notepad.exe.so
-%{_libdir}/wine/progman.exe.so
-%{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/winedbg.exe.so
-%{_libdir}/wine/winefile.exe.so
-%{_libdir}/wine/winemine.exe.so
-%{_libdir}/wine/winepath.exe.so
-%{_libdir}/wine/winver.exe.so
-%{_libdir}/wine/wordpad.exe.so
-%{_libdir}/wine/write.exe.so
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/wineconsole
+%{_bindir}/winecfg
+%dir %{_datadir}/wine
+%{_mandir}/man1/wine.1.gz
+%{_mandir}/man1/wineserver.1*
+%{_mandir}/man1/wineprefixcreate.1*
+%lang(fr) %{_mandir}/fr.UTF-8/man1/*
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+
+%files fonts
+%defattr(-,root,root,-)
+%{_datadir}/wine/fonts
+
 
 %files desktop
 %defattr(-,root,root,-)
@@ -846,31 +944,38 @@ update-desktop-database &>/dev/null || :
 %{_sysconfdir}/xdg/menus/applications-merged/wine.menu
 %{_initrddir}/wine
 
+# esd subpackage
 %files esd
 %defattr(-,root,root,-)
 %{_libdir}/wine/wineesd.drv.so
 
+# jack subpackage
 %files jack
 %defattr(-,root,root,-)
 %{_libdir}/wine/winejack.drv.so
 
+# nas subpackage
 %files nas
 %defattr(-,root,root,-)
 %{_libdir}/wine/winenas.drv.so
 
+# ldap subpackage
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/wine/wldap32.dll.so
 
+# cms subpackage
 %files cms
 %defattr(-,root,root,-)
 %{_libdir}/wine/mscms.dll.so
 
+# twain subpackage
 %files twain
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
+# capi subpackage
 %files capi
 %defattr(-,root,root,-)
 %{_libdir}/wine/capi2032.dll.so
@@ -887,7 +992,6 @@ update-desktop-database &>/dev/null || :
 %{_bindir}/winemaker
 %{_bindir}/wmc
 %{_bindir}/wrc
-%{_libdir}/*.so
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winebuild.1*
 %{_mandir}/man1/winedump.1*
@@ -898,9 +1002,9 @@ update-desktop-database &>/dev/null || :
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineg++.1*
 %lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
-%{_datadir}/aclocal/wine.m4
 %attr(0755, root, root) %dir %{_includedir}/wine
 %{_includedir}/wine/*
+%{_libdir}/*.so
 %{_libdir}/wine/*.a
 %{_libdir}/wine/*.def
 
@@ -919,6 +1023,22 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Mon Aug 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.28-1
+- version upgrade
+- make 32bit and 64bit version parallel installable
+
+* Sun Aug 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.27-1
+- version upgrade
+- WinePulse 0.30
+
+* Thu Aug 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.26-2
+- build 32bit wine on x86_64 and prepare for 64bit parallel build (#487651)
+- fix subpackage problems (#485410,#508766,#508944,#514967)
+- fix nss dependencies on x86_64 (#508412)
+
 * Sat Jul 18 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.26-1
 - version upgrade


--- adding-pulseaudio-to-winecfg-0.3.patch DELETED ---


--- wine-desktop-mime.patch DELETED ---


--- winepulse-0.29-configure.ac.patch DELETED ---


--- winepulse-0.29.patch DELETED ---



From rdieter at fedoraproject.org  Mon Aug 31 15:39:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 15:39:45 +0000 (UTC)
Subject: rpms/xforms/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xforms.spec,
	1.27, 1.28 xforms-1.0.91-no_undefined.patch, 1.1, NONE
Message-ID: <20090831153945.984D211C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12386

Modified Files:
	.cvsignore sources xforms.spec 
Removed Files:
	xforms-1.0.91-no_undefined.patch 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.1.pre7
- xforms-1.0.92pre7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Jul 2009 14:43:43 -0000	1.4
+++ .cvsignore	31 Aug 2009 15:39:45 -0000	1.5
@@ -1,2 +1,2 @@
-xforms-1.0.91.tar.gz
-xforms-1.0.91.tar.gz.sig
+xforms-1.0.92pre7.tar.gz
+xforms-1.0.92pre7.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Jul 2009 14:43:43 -0000	1.4
+++ sources	31 Aug 2009 15:39:45 -0000	1.5
@@ -1,2 +1,2 @@
-4eb57f2e095a1ad3adabf25462bad38a  xforms-1.0.91.tar.gz
-79deab6bb0bd3b0633c79c51781b8b58  xforms-1.0.91.tar.gz.sig
+fe7c0ecc94685e9eb6ebfffaaa1d6e01  xforms-1.0.92pre7.tar.gz
+101b7103709fc2964474c48af2367da4  xforms-1.0.92pre7.tar.gz.sig


Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xforms.spec	31 Aug 2009 12:41:37 -0000	1.27
+++ xforms.spec	31 Aug 2009 15:39:45 -0000	1.28
@@ -1,19 +1,19 @@
 
+%define pre pre7
+
 Name:    xforms
 Summary: XForms toolkit library
-Version: 1.0.91
-Release: 2%{?dist}
+Version: 1.0.92
+Release: 0.1.%{pre}%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
 URL:     http://www.nongnu.org/xforms/
-Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
-Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
+Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamed patches
-# http://savannah.nongnu.org/support/?106948
-Patch100: xforms-1.0.91-no_undefined.patch
 
 BuildRequires: libjpeg-devel
 %define x_deps xorg-x11-devel libGL-devel
@@ -48,9 +48,7 @@ Requires: %{?x_deps}
 
 
 %prep
-%setup -q
-
-%patch100 -p1 -b .no_undefined
+%setup -q -n %{name}-%{version}%{?pre}
 
 # rpath hack
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -100,7 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.92-0.1.pre7
+- xforms-1.0.92pre7
+
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.91-2
 - %%files: fix %%defattr typo
 - drop libXpm-devel from x_deps
 


--- xforms-1.0.91-no_undefined.patch DELETED ---



From awjb at fedoraproject.org  Mon Aug 31 15:46:23 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 31 Aug 2009 15:46:23 +0000 (UTC)
Subject: rpms/wine/F-10 adding-pulseaudio-to-winecfg-0.4.patch, NONE,
	1.1 pulseaudio-winecfg-update.patch, NONE, 1.1 wine-64.conf,
	NONE, 1.1 wine-chooser.sh, NONE,
	1.1 winepulse-0.30-configure.ac.patch, NONE,
	1.1 winepulse-0.30.patch, NONE, 1.1 .cvsignore, 1.76,
	1.77 sources, 1.77, 1.78 wine-rpath.patch, 1.7, 1.8 wine.spec,
	1.105, 1.106 adding-pulseaudio-to-winecfg-0.3.patch, 1.1,
	NONE wine-desktop-mime.patch, 1.3, NONE wine-prefixfonts.patch,
	1.1, NONE wine-wineshelllink.patch, 1.1,
	NONE winepulse-0.29-configure.ac.patch, 1.1,
	NONE winepulse-0.29.patch, 1.1, NONE wineshelllink-fedora, 1.1, NONE
Message-ID: <20090831154623.D764311C0072@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13808

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Added Files:
	adding-pulseaudio-to-winecfg-0.4.patch 
	pulseaudio-winecfg-update.patch wine-64.conf wine-chooser.sh 
	winepulse-0.30-configure.ac.patch winepulse-0.30.patch 
Removed Files:
	adding-pulseaudio-to-winecfg-0.3.patch wine-desktop-mime.patch 
	wine-prefixfonts.patch wine-wineshelllink.patch 
	winepulse-0.29-configure.ac.patch winepulse-0.29.patch 
	wineshelllink-fedora 
Log Message:
- version upgrade
- bug fixes
- 32 and 64 bit versions


adding-pulseaudio-to-winecfg-0.4.patch:
 Bg.rc       |    1 +
 Cs.rc       |    1 +
 Da.rc       |    1 +
 De.rc       |    1 +
 En.rc       |    1 +
 Es.rc       |    1 +
 Fi.rc       |    1 +
 Fr.rc       |    1 +
 Hu.rc       |    1 +
 Ko.rc       |    1 +
 Nl.rc       |    1 +
 No.rc       |    1 +
 Pl.rc       |    1 +
 Pt.rc       |    1 +
 Ro.rc       |    1 +
 Ru.rc       |    1 +
 Si.rc       |    1 +
 Sv.rc       |    1 +
 Tr.rc       |    1 +
 Zh.rc       |    1 +
 audio.c     |    1 +
 libraries.c |    1 +
 resource.h  |    2 +-
 23 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE adding-pulseaudio-to-winecfg-0.4.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..e17690e 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index d9c0b28..9bcc033 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -276,6 +276,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardn?"
     IDS_ACCEL_BASIC             "Z?kladn?"
     IDS_ACCEL_EMULATION         "Emulace"
+    IDS_DRIVER_PULSE             "Ovlada? PulseAudio"
     IDS_DRIVER_ALSA             "Ovlada? ALSA"
     IDS_DRIVER_ESOUND           "Ovlada? EsounD"
     IDS_DRIVER_OSS              "Ovlada? OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index f53aead..690c7f5 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggende"
     IDS_ACCEL_EMULATION         "Emul?ring"
+    IDS_DRIVER_PULSE             "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index e6bed15..d3027bc 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Einfach"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio-Treiber"
     IDS_DRIVER_ALSA             "ALSA-Treiber"
     IDS_DRIVER_ESOUND           "EsounD-Treiber"
     IDS_DRIVER_OSS              "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 049aaa7..cef7c4a 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 1771b4e..c49f9a3 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Est?ndar"
     IDS_ACCEL_BASIC             "B?sica"
     IDS_ACCEL_EMULATION         "Emulaci?n"
+    IDS_DRIVER_PULSE             "Manejador PulseAudio"
     IDS_DRIVER_ALSA             "Manejador ALSA"
     IDS_DRIVER_ESOUND           "Manejador EsounD"
     IDS_DRIVER_OSS              "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 0dedf3a..097a4d2 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 52c9888..1bd92b1 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -274,6 +274,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basique"
     IDS_ACCEL_EMULATION         "??mulation"
+    IDS_DRIVER_PULSE            "Pilote PulseAudio"
     IDS_DRIVER_ALSA             "Pilote ALSA"
     IDS_DRIVER_ESOUND           "Pilote EsounD"
     IDS_DRIVER_OSS              "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index dc887fe..3ba696f 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Basic"
     IDS_ACCEL_EMULATION         "Emulation"
+    IDS_DRIVER_PULSE             "PulseAudio Driver"
     IDS_DRIVER_ALSA             "ALSA Driver"
     IDS_DRIVER_ESOUND           "EsounD Driver"
     IDS_DRIVER_OSS              "OSS Driver"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 6f13e0c..d5403da 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -274,6 +274,7 @@ BEGIN
    IDS_ACCEL_STANDARD          "????"
    IDS_ACCEL_BASIC             "????"
    IDS_ACCEL_EMULATION         "??????????"
+    IDS_DRIVER_PULSE             "PulseAudio ????????"
    IDS_DRIVER_ALSA             "ALSA ????????"
    IDS_DRIVER_ESOUND           "EsounD ????????"
    IDS_DRIVER_OSS              "OSS ????????"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 4cd45f0..d23f359 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standaard"
     IDS_ACCEL_BASIC             "Eenvoudig"
     IDS_ACCEL_EMULATION         "Emulatie"
+    IDS_DRIVER_PULSE             "PulseAudio Stuurprogramma"
     IDS_DRIVER_ALSA             "ALSA Stuurprogramma"
     IDS_DRIVER_ESOUND           "EsounD Stuurprogramma"
     IDS_DRIVER_OSS              "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index cc34fad..71876ba 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grunnleggende"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE             "PulseAudio-driver"
     IDS_DRIVER_ALSA             "ALSA-driver"
     IDS_DRIVER_ESOUND           "EsounD-driver"
     IDS_DRIVER_OSS              "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index d884881..d6405b1 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardowe"
     IDS_ACCEL_BASIC             "Podstawowe"
     IDS_ACCEL_EMULATION         "Emulacja"
+    IDS_DRIVER_PULSE             "Sterownik PulseAudio"
     IDS_DRIVER_ALSA             "Sterownik ALSA"
     IDS_DRIVER_ESOUND           "Sterownik EsounD"
     IDS_DRIVER_OSS              "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 683dc68..be92466 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -470,6 +470,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Padr??o"
     IDS_ACCEL_BASIC             "B??sico"
     IDS_ACCEL_EMULATION         "Emula????o"
+    IDS_DRIVER_PULSE            "Controlador PulseAudio"
     IDS_DRIVER_ALSA             "Controlador ALSA"
     IDS_DRIVER_ESOUND           "Controlador EsounD"
     IDS_DRIVER_OSS              "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index f12949f..2101ea1 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "De baz??"
     IDS_ACCEL_EMULATION         "Emulare"
+    IDS_DRIVER_PULSE             "Driver PulseAudio"
     IDS_DRIVER_ALSA             "Driver ALSA"
     IDS_DRIVER_ESOUND           "Driver Esound"
     IDS_DRIVER_OSS              "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 7293cbc..fb57527 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -277,6 +277,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????????????????????"
     IDS_ACCEL_BASIC             "??????????????????????"
     IDS_ACCEL_EMULATION         "????????????????"
+    IDS_DRIVER_PULSE		"PulseAudio ??????????????"
     IDS_DRIVER_ALSA             "ALSA ??????????????"
     IDS_DRIVER_ESOUND           "EsounD ??????????????"
     IDS_DRIVER_OSS              "OSS ??????????????"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index feaef36..c26e5cb 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -272,6 +272,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standardno"
     IDS_ACCEL_BASIC             "Osnovno"
     IDS_ACCEL_EMULATION         "Emulacija"
+    IDS_DRIVER_PULSE             "PulseAudio gonilnik"
     IDS_DRIVER_ALSA             "ALSA gonilnik"
     IDS_DRIVER_ESOUND           "EsounD gonilnik"
     IDS_DRIVER_OSS              "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 7fea5aa..35eb871 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standard"
     IDS_ACCEL_BASIC             "Grundl?ggande"
     IDS_ACCEL_EMULATION         "Emulering"
+    IDS_DRIVER_PULSE             "PulseAudio-drivrutin"
     IDS_DRIVER_ALSA             "ALSA-drivrutin"
     IDS_DRIVER_ESOUND           "EsounD-drivrutin"
     IDS_DRIVER_OSS              "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 0fa9778..2a23112 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -270,6 +270,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "Standart"
     IDS_ACCEL_BASIC             "Temel"
     IDS_ACCEL_EMULATION         "Taklit"
+    IDS_DRIVER_PULSE             "PulseAudio S?r?c?s?"
     IDS_DRIVER_ALSA             "ALSA S?r?c?s?"
     IDS_DRIVER_ESOUND           "EsounD S?r?c?s?"
     IDS_DRIVER_OSS              "OSS S?r?c?s?"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index fea66b7..bc0aaaf 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -273,6 +273,7 @@ BEGIN
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????"
+    IDS_DRIVER_PULSE             "PulseAudio ??????"
     IDS_DRIVER_ALSA             "ALSA ??????"
     IDS_DRIVER_ESOUND           "EsounD ??????"
     IDS_DRIVER_OSS              "OSS ??????"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 9f8a0a2..0ecb6c3 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
 } AUDIO_DRIVER;
 
 static const AUDIO_DRIVER sAudioDrivers[] = {
+  {IDS_DRIVER_PULSE,      "pulse"},
   {IDS_DRIVER_ALSA,      "alsa"},
   {IDS_DRIVER_OSS,       "oss"},
   {IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..7c13fad 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -81,6 +81,7 @@ static const char * const builtin_only[] =
     "wineoss.drv",
     "wineps",
     "wineps.drv",
+    "winepulse.drv",
     "winex11.drv",
     "winmm",
     "wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 27736b7..f8ba2ee 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -185,7 +185,7 @@
 #define IDS_ACCEL_BASIC                 8302
 #define IDS_ACCEL_EMULATION             8303
 #define IDS_DRIVER_ALSA                 8304
-
+#define IDS_DRIVER_PULSE                 8305
 #define IDS_DRIVER_ESOUND               8306
 #define IDS_DRIVER_OSS                  8307
 #define IDS_DRIVER_JACK                 8308

pulseaudio-winecfg-update.patch:
 Ja.rc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE pulseaudio-winecfg-update.patch ---
--- programs/winecfg/Ja.rc.orig	2009-08-26 11:55:56.000000000 +0200
+++ programs/winecfg/Ja.rc	2009-08-26 11:56:52.000000000 +0200
@@ -275,6 +275,7 @@
     IDS_ACCEL_STANDARD          "??????"
     IDS_ACCEL_BASIC             "??????"
     IDS_ACCEL_EMULATION         "????????????????????????"
+    IDS_DRIVER_PULSE            "PulseAudio ????????????"
     IDS_DRIVER_ALSA             "ALSA ????????????"
     IDS_DRIVER_ESOUND           "EsounD ????????????"
     IDS_DRIVER_OSS              "OSS ????????????"


--- NEW FILE wine-64.conf ---
/usr/lib64/wine/


--- NEW FILE wine-chooser.sh ---
#!/bin/sh
HAVE_32=false
HAVE_64=false

if [ -x "/usr/bin/wine32" ]; then
HAVE_32=true
fi

if [ -x "/usr/bin/wine64" ]; then
HAVE_64=true
fi

if [ -f "${1}" ]; then
    archtype=`file "${1}" | cut -d':' -f2 | cut -d' ' -f2`

    if [ ${archtype} = 'PE32+' ]; then # 64bit
	if $HAVE_64; then
	    exec "/usr/bin/wine64" "${@}";
	elif [ `uname -m` = 'x86_64' ]; then
	    echo "Your are trying to run a 64bit application. Please install the 64bit version of wine."
	    echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-64)\\\"\"'"
	else
	    echo "Your are trying to run a 64bit application on a 32bit installation of Fedora. You need a 64bit version of Fedora to run this application."
	fi
    else
	if $HAVE_32; then
	    exec "/usr/bin/wine32" "${@}"
	else
	    echo "Your are trying to run a 32bit application. Please install the 32bit version of wine."
	    echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-32)\\\"\"'"
	fi
    fi
else
    if $HAVE_64; then
	exec "/usr/bin/wine64" "${@}";
    else
	exec "/usr/bin/wine32" "${@}";
    fi
fi

winepulse-0.30-configure.ac.patch:
 configure.ac |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.30-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 59b771c..385a7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,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])
@@ -1257,6 +1258,24 @@ 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")
+        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"
@@ -1391,7 +1410,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 \
@@ -2429,6 +2448,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[AL
 WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 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/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/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

winepulse-0.30.patch:
 Makefile.in        |   15 
 pulse.c            |  788 +++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 +++++++++++++++++++++++++++++
 waveout.c          | 1070 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2667 insertions(+)

--- NEW FILE winepulse-0.30.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.
+        */
[...2304 lines suppressed...]
index 0000000..4a834cd
--- /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 {
+    volatile 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-10/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	19 Jul 2009 10:47:46 -0000	1.76
+++ .cvsignore	31 Aug 2009 15:46:23 -0000	1.77
@@ -1 +1 @@
-wine-1.1.26-fe.tar.bz2
+wine-1.1.28-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	19 Jul 2009 10:47:46 -0000	1.77
+++ sources	31 Aug 2009 15:46:23 -0000	1.78
@@ -1 +1 @@
-7b2affded452ced2b1f45a9b7e6f24da  wine-1.1.26-fe.tar.bz2
+6342c41f46d0571efae685c17aa5550f  wine-1.1.28-fe.tar.bz2

wine-rpath.patch:
 configure |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/wine-rpath.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- wine-rpath.patch	23 Nov 2008 10:44:34 -0000	1.7
+++ wine-rpath.patch	31 Aug 2009 15:46:23 -0000	1.8
@@ -1,32 +1,32 @@
---- configure.orig	2008-11-05 12:25:10.000000000 +0300
-+++ configure	2008-11-06 22:22:27.000000000 +0300
-@@ -9306,14 +9306,14 @@
- fi
+--- configure.orig	2009-08-26 11:47:17.000000000 +0200
++++ configure	2009-08-26 11:50:07.000000000 +0200
+@@ -6565,14 +6565,14 @@
  
+ fi
  
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
+-      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
 +      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
-+{ $as_echo "$as_me:$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 "$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
    ac_wine_try_cflags_saved=$CFLAGS
 -CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
 +CFLAGS="$CFLAGS -fPIC"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9369,8 +9369,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6597,8 +6597,8 @@
+ 	       { $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
+ 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=""
  else
-   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+   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


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/wine.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- wine.spec	19 Jul 2009 10:47:46 -0000	1.105
+++ wine.spec	31 Aug 2009 15:46:23 -0000	1.106
@@ -1,5 +1,6 @@
+%define no64bit 0
 Name:		wine
-Version:	1.1.26
+Version:	1.1.28
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -22,6 +23,8 @@ Source0:        %{name}-%{version}-fe.ta
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
+Source5:        wine-64.conf
+Source6:        wine-chooser.sh
 # desktop stuff
 Source100:      wine-notepad.desktop
 Source101:      wine-regedit.desktop
@@ -44,24 +47,25 @@ 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.29-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.29.patch
-Patch402:	http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.3.patch
+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/adding-pulseaudio-to-winecfg-0.4.patch
 Source402:      README-FEDORA-PULSEAUDIO
-
+Patch403:       pulseaudio-winecfg-update.patch
 
 Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if !%{?no64bit}
+ExclusiveArch:  %{ix86} x86_64
+%else
 ExclusiveArch:  %{ix86}
+%endif
 
-# BR: All builds
-BuildRequires:	bison
-BuildRequires:	flex
+BuildRequires:  bison
+BuildRequires:  flex
 BuildRequires:  autoconf
 BuildRequires:  desktop-file-utils
-
-# x86-32 BR
 BuildRequires:  alsa-lib-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  esound-devel
@@ -80,7 +84,7 @@ BuildRequires:  unixODBC-devel
 BuildRequires:  openssl-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
-BuildRequires:  fontforge
+BuildRequires:  fontforge freetype-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  jack-audio-connection-kit-devel
 # #217338
@@ -102,15 +106,27 @@ BuildRequires:  libXcursor-devel
 BuildRequires:  dbus-devel hal-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  gsm-devel
 
-Requires:       wine-core = %{version}-%{release}
-Requires:       wine-capi = %{version}-%{release}
-Requires:       wine-cms = %{version}-%{release}
+# noarch
+Requires:       wine-common = %{version}-%{release}
 Requires:       wine-desktop = %{version}-%{release}
-Requires:       wine-ldap = %{version}-%{release}
-Requires:       wine-tools = %{version}-%{release}
-Requires:       wine-twain = %{version}-%{release}
-Requires:       wine-pulseaudio = %{version}-%{release}
+# 32bit
+Requires:       wine-core(x86-32) = %{version}-%{release}
+Requires:       wine-capi(x86-32) = %{version}-%{release}
+Requires:       wine-cms(x86-32) = %{version}-%{release}
+Requires:       wine-ldap(x86-32) = %{version}-%{release}
+Requires:       wine-twain(x86-32) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-32) = %{version}-%{release}
+# 64bit
+%ifarch x86_64
+Requires:       wine-core(x86-64) = %{version}-%{release}
+Requires:       wine-capi(x86-64) = %{version}-%{release}
+Requires:       wine-cms(x86-64) = %{version}-%{release}
+Requires:       wine-ldap(x86-64) = %{version}-%{release}
+Requires:       wine-twain(x86-64) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-64) = %{version}-%{release}
+%endif
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -127,17 +143,26 @@ wine-* sub packages.
 %package core
 Summary:        Wine core package
 Group:		Applications/Emulators
+Requires:       wine-fonts = %{version}-%{release}
 Requires:       %{_bindir}/xmessage
-Requires:       freetype%{_isa}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
 Obsoletes:      wine-arts < 0.9.34
+Obsoletes:      wine-tools <= 1.1.27
+Provides:       wine-tools = %{version}-%{release}
 # fix dns resolution (#492700)
 # require both to be sure 64bit is present as well...
-Requires:       nss-mdns nss-mdns%{_isa}
+%ifarch %{ix86}
+Requires:       freetype(x86-32)
+Requires:       nss-mdns(x86-32)
 # require Xrender isa on x86_64 (#510947)
-Requires:       libXrender%{_isa}
+Requires:       libXrender(x86-32)
+%endif
+%ifarch x86_64
+Requires:       nss-mdns(x86-64)
+Requires:       freetype(x86-64)
+%endif
 
 %description core
 Wine core package includes the basic wine stuff needed by all other packages.
@@ -150,18 +175,28 @@ Requires(post): desktop-file-utils >= 0.
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): desktop-file-utils >= 0.8
 Requires:       wine-core = %{version}-%{release}
+BuildArch:      noarch
 
 %description desktop
 Desktop integration features for wine, including mime-types and a binary format
 handler service.
 
-%package tools
-Summary:        Additional wine tools
+%package fonts
+Summary:       Wine font files
+Group:         Applications/Emulators
+BuildArch:     noarch
+
+%description fonts
+%{summary}
+
+%package common
+Summary:        Common files
 Group:		Applications/Emulators
 Requires:       wine-core = %{version}-%{release}
+BuildArch:      noarch
 
-%description tools
-Additional wine tools
+%description common
+Common wine files and scripts.
 
 %package esd
 Summary: ESD sound support for wine
@@ -175,7 +210,12 @@ ESD sound support for wine
 Summary: JACK sound support for wine
 Group: System Environment/Libraries
 Requires: wine-core = %{version}-%{release}
-Requires: jack-audio-connection-kit%{_isa}
+%ifarch %{ix86}
+Requires: jack-audio-connection-kit(x86-32)
+%endif
+%ifarch x86_64
+Requires: jack-audio-connection-kit(x86-64)
+%endif
 
 %description jack
 JACK sound support for wine
@@ -256,19 +296,27 @@ This package adds an oss driver for wine
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+
 %patch1
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
+%patch403
+
 autoreconf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-
 %configure \
 	--sysconfdir=%{_sysconfdir}/wine \
 	--x-includes=%{_includedir} --x-libraries=%{_libdir} \
-	--with-pulse
+	--with-pulse \
+        --with-x \
+%ifarch x86_64
+	--enable-win64 \
+%endif
+        --enable-maintainer-mode \
+	--disable-tests
 
 %{__make} depend
 
@@ -284,6 +332,17 @@ rm -rf %{buildroot}
 	LDCONFIG=/bin/true \
 	UPDATE_DESKTOP_DATABASE=/bin/true
 
+%ifarch %{ix86}
+# rename wine to wine32
+mv %{buildroot}%{_bindir}/wine{,32}
+%endif
+
+# if x86_64 rename to wine64
+%ifarch x86_64
+mv %{buildroot}%{_bindir}/wine{,64}
+%endif
+
+
 mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
@@ -366,7 +425,16 @@ desktop-file-install \
 cp %{SOURCE3} README-Fedora
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%ifarch %{ix86}
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+%endif
+
+%ifarch x86_64
+install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+%endif
+
+install -p -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/wine
 
 # deploy pulseaudio readme
 cp %{SOURCE402} .
@@ -430,19 +498,49 @@ update-desktop-database &>/dev/null || :
 
 %files core
 %defattr(-,root,root,-)
-%doc ANNOUNCE COPYING.LIB LICENSE LICENSE.OLD
-%doc AUTHORS README-Fedora README VERSION
+%doc ANNOUNCE
+%doc COPYING.LIB
+%doc LICENSE
+%doc LICENSE.OLD
+%doc AUTHORS
+%doc README-Fedora
+%doc README
+%doc VERSION
 # do not include huge changelogs .OLD .ALPHA .BETA (#204302)
 %doc documentation/README.*
-%{_bindir}/msiexec
-%{_bindir}/regedit
-%{_bindir}/regsvr32
-%{_bindir}/wine
-%{_bindir}/wineboot
-%{_bindir}/wineconsole
-%{_bindir}/wineprefixcreate
-%{_mandir}/man1/wineprefixcreate.1*
-%{_bindir}/winecfg
+
+%{_bindir}/winedump
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/cmd.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/wordpad.exe.so
+%{_libdir}/wine/write.exe.so
+
+%ifarch %{ix86}
+%{_bindir}/wine-preloader
+%endif
+%{_bindir}/wineserver
+
+%ifarch %{ix86}
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+%{_bindir}/wine32
+%endif
+%ifarch x86_64
+%{_bindir}/wine64
+%{_sysconfdir}/ld.so.conf.d/wine-64.conf
+%endif
+
+%dir %{_libdir}/wine
+%dir %{_libdir}/wine/fakedlls
+%{_libdir}/wine/fakedlls/*
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
 %{_libdir}/wine/winhlp32.exe.so
@@ -463,20 +561,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winebrowser.exe.so
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
-%{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedevice.exe.so
 %{_libdir}/wine/uninstaller.exe.so
-%dir %{_datadir}/wine
-%{_mandir}/man1/wine.1.gz
-%{_mandir}/man1/wineserver.1*
-%lang(fr) %{_mandir}/fr.UTF-8/man1/*
-%{_datadir}/wine/generic.ppd
-%{_datadir}/wine/wine.inf
-%{_bindir}/wine-preloader
-%{_bindir}/wineserver
 %{_libdir}/libwine.so.1*
-%dir %{_libdir}/wine
 %{_libdir}/wine/acledit.dll.so
 %{_libdir}/wine/aclui.dll.so
 %{_libdir}/wine/activeds.dll.so
@@ -499,7 +587,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/comcat.dll.so
 %{_libdir}/wine/comctl32.dll.so
 %{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/credui.dll.so
 %{_libdir}/wine/crtdll.dll.so
@@ -549,7 +636,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fusion.dll.so
-%{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
 %{_libdir}/wine/glu32.dll.so
@@ -565,7 +651,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/iccvid.dll.so
 %{_libdir}/wine/icinfo.exe.so
 %{_libdir}/wine/icmp.dll.so
-%{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/imaadp32.acm.so
 %{_libdir}/wine/imagehlp.dll.so
 %{_libdir}/wine/imm32.dll.so
@@ -580,7 +665,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/loadperf.dll.so
 %{_libdir}/wine/localspl.dll.so
 %{_libdir}/wine/localui.dll.so
@@ -593,21 +677,21 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/mciwave.dll.so
 %{_libdir}/wine/midimap.dll.so
 %{_libdir}/wine/mlang.dll.so
-%{_libdir}/wine/mmdevldr.vxd.so
-%{_libdir}/wine/mmsystem.dll16
-%{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/mountmgr.sys.so
 %{_libdir}/wine/mpr.dll.so
 %{_libdir}/wine/mprapi.dll.so
+%{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/msacm32.dll.so
 %{_libdir}/wine/msacm32.drv.so
 %{_libdir}/wine/msadp32.acm.so
 %{_libdir}/wine/mscat32.dll.so
 %{_libdir}/wine/mscoree.dll.so
 %{_libdir}/wine/msctf.dll.so
+%{_libdir}/wine/msdaps.dll.so
 %{_libdir}/wine/msdmo.dll.so
 %{_libdir}/wine/msftedit.dll.so
 %{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/msgsm32.acm.so
 %{_libdir}/wine/mshtml.dll.so
 %{_libdir}/wine/mshtml.tlb.so
 %{_libdir}/wine/msi.dll.so
@@ -675,7 +759,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/sensapi.dll.so
 %{_libdir}/wine/serialui.dll.so
 %{_libdir}/wine/setupapi.dll.so
-%{_libdir}/wine/setupx.dll16
 %{_libdir}/wine/sfc_os.dll.so
 %{_libdir}/wine/shdoclc.dll.so
 %{_libdir}/wine/shdocvw.dll.so
@@ -693,45 +776,31 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/svchost.exe.so
 %{_libdir}/wine/svrapi.dll.so
 %{_libdir}/wine/sxs.dll.so
-%{_libdir}/wine/system.drv16
 %{_libdir}/wine/t2embed.dll.so
 %{_libdir}/wine/tapi32.dll.so
-%{_libdir}/wine/toolhelp.dll16
 %{_libdir}/wine/traffic.dll.so
 %{_libdir}/wine/unicows.dll.so
 %{_libdir}/wine/unlodctr.exe.so
 %{_libdir}/wine/updspapi.dll.so
 %{_libdir}/wine/url.dll.so
 %{_libdir}/wine/urlmon.dll.so
-%{_libdir}/wine/user.exe16
 %{_libdir}/wine/user32.dll.so
 %{_libdir}/wine/usp10.dll.so
 %{_libdir}/wine/uxtheme.dll.so
 %{_libdir}/wine/userenv.dll.so
-%{_libdir}/wine/vdhcp.vxd.so
 %{_libdir}/wine/vdmdbg.dll.so
-%{_libdir}/wine/ver.dll16
 %{_libdir}/wine/version.dll.so
-%{_libdir}/wine/vmm.vxd.so
-%{_libdir}/wine/vnbt.vxd.so
-%{_libdir}/wine/vnetbios.vxd.so
-%{_libdir}/wine/vtdapi.vxd.so
-%{_libdir}/wine/vwin32.vxd.so
-%{_libdir}/wine/w32skrnl.dll.so
 %{_libdir}/wine/wbemprox.dll.so
 %{_libdir}/wine/windowscodecs.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
-%{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winecoreaudio.drv.so
 %{_libdir}/wine/winejoystick.drv.so
 %{_libdir}/wine/winex11.drv.so
-%{_libdir}/wine/wing.dll16
 %{_libdir}/wine/wing32.dll.so
 %{_libdir}/wine/winhttp.dll.so
 %{_libdir}/wine/wininet.dll.so
 %{_libdir}/wine/winmm.dll.so
 %{_libdir}/wine/winnls32.dll.so
-%{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
 %{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/wmiutils.dll.so
@@ -741,16 +810,13 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
 %{_libdir}/wine/wow32.dll.so
-%{_libdir}/wine/wprocs.dll16
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
 %{_libdir}/wine/wuapi.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
-%{_datadir}/wine/fonts/
 %{_libdir}/wine/wineps.drv.so
-%{_libdir}/wine/wineps16.drv16
 %{_libdir}/wine/d3d8.dll.so
 %{_libdir}/wine/d3d9.dll.so
 %{_libdir}/wine/opengl32.dll.so
@@ -763,8 +829,33 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/xinput1_3.dll.so
 %{_libdir}/wine/xinput9_1_0.dll.so
 %{_libdir}/wine/xmllite.dll.so
-%{_sysconfdir}/ld.so.conf.d/wine-32.conf
-# 16bit
+%ifnarch x86_64
+# 16 bit and other non 64bit stuff
+%{_libdir}/wine/winedos.dll.so
+%{_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
+%{_libdir}/wine/vwin32.vxd.so
+%{_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
 %{_libdir}/wine/compobj.dll16.so
@@ -774,9 +865,9 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dispdib.dll16.so
 %{_libdir}/wine/display.drv16.so
 %{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
-%{_libdir}/wine/mciqtz32.dll.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
 %{_libdir}/wine/msvideo.dll16.so
@@ -804,29 +895,36 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winnls.dll16.so
 %{_libdir}/wine/winoldap.mod16.so
 %{_libdir}/wine/wintab.dll16.so
+%endif
 
-%files tools
+%files common
 %defattr(-,root,root,-)
+%{_bindir}/wineprefixcreate
 %{_bindir}/notepad
 %{_bindir}/winedbg
-%{_bindir}/winedump
 %{_bindir}/winefile
-%{_bindir}/winemaker
 %{_bindir}/winemine
+%{_bindir}/winemaker
 %{_bindir}/winepath
-%{_libdir}/wine/explorer.exe.so
-%{_libdir}/wine/control.exe.so
-%{_libdir}/wine/cmd.exe.so
-%{_libdir}/wine/notepad.exe.so
-%{_libdir}/wine/progman.exe.so
-%{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/winedbg.exe.so
-%{_libdir}/wine/winefile.exe.so
-%{_libdir}/wine/winemine.exe.so
-%{_libdir}/wine/winepath.exe.so
-%{_libdir}/wine/winver.exe.so
-%{_libdir}/wine/wordpad.exe.so
-%{_libdir}/wine/write.exe.so
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/wineconsole
+%{_bindir}/winecfg
+%dir %{_datadir}/wine
+%{_mandir}/man1/wine.1.gz
+%{_mandir}/man1/wineserver.1*
+%{_mandir}/man1/wineprefixcreate.1*
+%lang(fr) %{_mandir}/fr.UTF-8/man1/*
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+
+%files fonts
+%defattr(-,root,root,-)
+%{_datadir}/wine/fonts
+
 
 %files desktop
 %defattr(-,root,root,-)
@@ -846,31 +944,38 @@ update-desktop-database &>/dev/null || :
 %{_sysconfdir}/xdg/menus/applications-merged/wine.menu
 %{_initrddir}/wine
 
+# esd subpackage
 %files esd
 %defattr(-,root,root,-)
 %{_libdir}/wine/wineesd.drv.so
 
+# jack subpackage
 %files jack
 %defattr(-,root,root,-)
 %{_libdir}/wine/winejack.drv.so
 
+# nas subpackage
 %files nas
 %defattr(-,root,root,-)
 %{_libdir}/wine/winenas.drv.so
 
+# ldap subpackage
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/wine/wldap32.dll.so
 
+# cms subpackage
 %files cms
 %defattr(-,root,root,-)
 %{_libdir}/wine/mscms.dll.so
 
+# twain subpackage
 %files twain
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain_32.dll.so
 %{_libdir}/wine/sane.ds.so
 
+# capi subpackage
 %files capi
 %defattr(-,root,root,-)
 %{_libdir}/wine/capi2032.dll.so
@@ -887,7 +992,6 @@ update-desktop-database &>/dev/null || :
 %{_bindir}/winemaker
 %{_bindir}/wmc
 %{_bindir}/wrc
-%{_libdir}/*.so
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winebuild.1*
 %{_mandir}/man1/winedump.1*
@@ -898,9 +1002,9 @@ update-desktop-database &>/dev/null || :
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineg++.1*
 %lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
-%{_datadir}/aclocal/wine.m4
 %attr(0755, root, root) %dir %{_includedir}/wine
 %{_includedir}/wine/*
+%{_libdir}/*.so
 %{_libdir}/wine/*.a
 %{_libdir}/wine/*.def
 
@@ -919,6 +1023,22 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wineoss.drv.so
 
 %changelog
+* Mon Aug 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.28-1
+- version upgrade
+- make 32bit and 64bit version parallel installable
+
+* Sun Aug 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.27-1
+- version upgrade
+- WinePulse 0.30
+
+* Thu Aug 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.26-2
+- build 32bit wine on x86_64 and prepare for 64bit parallel build (#487651)
+- fix subpackage problems (#485410,#508766,#508944,#514967)
+- fix nss dependencies on x86_64 (#508412)
+
 * Sat Jul 18 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.26-1
 - version upgrade


--- adding-pulseaudio-to-winecfg-0.3.patch DELETED ---


--- wine-desktop-mime.patch DELETED ---


--- wine-prefixfonts.patch DELETED ---


--- wine-wineshelllink.patch DELETED ---


--- winepulse-0.29-configure.ac.patch DELETED ---


--- winepulse-0.29.patch DELETED ---


--- wineshelllink-fedora DELETED ---



From dwmw2 at fedoraproject.org  Mon Aug 31 16:00:33 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon, 31 Aug 2009 16:00:33 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.65,1.66
Message-ID: <20090831160033.E59ED11C02CA@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16964

Modified Files:
	exim.spec 
Log Message:
redirect stderr of groupadd to /dev/null, not stdout


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- exim.spec	31 Aug 2009 13:25:16 -0000	1.65
+++ exim.spec	31 Aug 2009 16:00:33 -0000	1.66
@@ -331,7 +331,7 @@ touch $RPM_BUILD_ROOT/%_var/spool/exim/d
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/groupadd -g 93 exim 2>&1
+%{_sbindir}/groupadd -g 93 exim 2>/dev/null
 %{_sbindir}/useradd -d %{_var}/spool/exim -s /sbin/nologin -G mail -M -r -u 93 -g exim exim 2>/dev/null
 # Copy TLS certs from old location to new -- don't move them, because the
 # config file may be modified and may be pointing to the old location.



From nphilipp at fedoraproject.org  Mon Aug 31 16:04:19 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 31 Aug 2009 16:04:19 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends-1.0.20-rpath.patch, 1.1,
	1.2 sane-backends.spec, 1.131, 1.132 sources, 1.19, 1.20
Message-ID: <20090831160419.B8A7B11C0072@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18949

Modified Files:
	sane-backends-1.0.20-rpath.patch sane-backends.spec sources 
Log Message:
fix --enable-rpath


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-rpath.patch	16 Jun 2009 15:28:12 -0000	1.1
+++ sane-backends-1.0.20-rpath.patch	31 Aug 2009 16:04:19 -0000	1.2
@@ -1,11 +1,17 @@
-commit e0de6eaee11254667eb6abb6e2ccb7768bd2de4f
+commit 1249be5ecbd635feeb880b2c60582b34bc04a798
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Tue Jun 16 16:59:43 2009 +0200
+Date:   Mon Aug 31 16:38:23 2009 +0200
 
-    patch: rpath
+    path: rpath
     
     Squashed commit of the following:
     
+    commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f
+    Author: Nils Philippsen <nils at redhat.com>
+    Date:   Mon Aug 31 16:34:42 2009 +0200
+    
+        fix --enable-rpath
+    
     commit be2982b2d1ae4d889b4cecec289336b4b03579aa
     Author: Nils Philippsen <nils at redhat.com>
     Date:   Tue Jun 2 16:12:23 2009 +0200
@@ -15,10 +21,10 @@ Date:   Tue Jun 16 16:59:43 2009 +0200
         make using runtime library search path configurable
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index 6413b60..c6f5800 100644
+index 6413b60..b2bb065 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -383,19 +383,31 @@ dnl
+@@ -383,19 +383,29 @@ dnl
  
  AC_DEFUN([SANE_LINKER_RPATH],
  [dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
@@ -38,9 +44,7 @@ index 6413b60..c6f5800 100644
 +  AC_MSG_CHECKING([whether runtime link path should be used])
 +  AC_ARG_ENABLE([rpath],
 +    [AS_HELP_STRING([--enable-rpath],
-+      [use runtime library search path @<:@default=yes@:>@])]
-+      [],
-+      [enable_readline=yes])
++      [use runtime library search path @<:@default=yes@:>@])])
 +
 +  LINKER_RPATH=
 +  AS_IF([test "x$enable_rpath" != xno],


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- sane-backends.spec	3 Aug 2009 16:40:35 -0000	1.131
+++ sane-backends.spec	31 Aug 2009 16:04:19 -0000	1.132
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 6%{?dist}
+Release: 7%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -157,6 +157,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Fri Aug 31 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-7
+- fix --enable-rpath
+
 * Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-6
 - remove ExcludeArch: s390 s390x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Jun 2009 15:28:12 -0000	1.19
+++ sources	31 Aug 2009 16:04:19 -0000	1.20
@@ -1,2 +1,2 @@
 a0cfdfdebca2feb4f2ba5d3418b15a42  sane-backends-1.0.20.tar.gz
-cd71d7e8a2ea0c1a8d51901317f50d39  sane-backends-1.0.20-autoreconf.patch.bz2
+55134659213e74bc1d9d5326102072b4  sane-backends-1.0.20-autoreconf.patch.bz2



From dwalsh at fedoraproject.org  Mon Aug 31 16:05:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 31 Aug 2009 16:05:44 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.67,1.68
Message-ID: <20090831160544.0C6A211C0072@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19332

Modified Files:
	policy-F12.patch 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-2
- Allow gssd to send signals to users
- Fix duplicate label for apache content


policy-F12.patch:
 man/man8/rsync_selinux.8                  |   18 
 man/man8/samba_selinux.8                  |    4 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.if            |    1 
 policy/modules/admin/kismet.te            |   17 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  176 +++
 policy/modules/admin/rpm.te               |   65 +
 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         |    4 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    4 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   92 +-
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   64 +
 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            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  288 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 ++
 policy/modules/apps/openoffice.te         |   14 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 
 policy/modules/apps/ptchown.te            |   39 
 policy/modules/apps/pulseaudio.if         |    1 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  270 ++++-
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   55 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  167 +++
 policy/modules/apps/sandbox.te            |  302 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   23 
 policy/modules/kernel/corecommands.fc     |   24 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 policy/modules/kernel/domain.te           |   87 +
 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       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 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             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  124 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++---
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 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      |   50 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 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            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 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/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 +
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 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 |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 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           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 -
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   60 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 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            |   12 
 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/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   83 +
 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 |   84 +
 policy/modules/services/setroubleshoot.te |   60 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  131 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  307 +++++-
 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        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  154 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1373 +++++++++++++++++++++++-------
 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 
 319 files changed, 14688 insertions(+), 3011 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.67 -r 1.68 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- policy-F12.patch	31 Aug 2009 13:39:37 -0000	1.67
+++ policy-F12.patch	31 Aug 2009 16:05:43 -0000	1.68
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-3.6.29/man/man8/rsync_selinux.8
 --- nsaserefpolicy/man/man8/rsync_selinux.8	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/man/man8/rsync_selinux.8	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/man/man8/rsync_selinux.8	2009-08-31 09:47:15.000000000 -0400
 @@ -21,10 +21,18 @@
  .TP
  chcon -t public_content_t /var/rsync
@@ -32,7 +32,7 @@ diff -b -B --ignore-all-space --exclude-
 +selinux(8), rsync(1), chcon(1), setsebool(8), semanage(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.29/man/man8/samba_selinux.8
 --- nsaserefpolicy/man/man8/samba_selinux.8	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/man/man8/samba_selinux.8	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/man/man8/samba_selinux.8	2009-08-31 09:47:15.000000000 -0400
 @@ -20,7 +20,7 @@
  .TP
  This command adds the following entry to /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local:
@@ -50,7 +50,7 @@ diff -b -B --ignore-all-space --exclude-
 +selinux(8), samba(7), chcon(1), setsebool(8), semanage(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.29/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.29/policy/global_tunables	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/global_tunables	2009-08-31 09:47:15.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -88,7 +88,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.29/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/mcs	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/mcs	2009-08-31 09:47:15.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -124,7 +124,7 @@ diff -b -B --ignore-all-space --exclude-
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.29/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/anaconda.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/anaconda.te	2009-08-31 09:47:15.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -144,7 +144,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.29/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/certwatch.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/certwatch.te	2009-08-31 09:47:15.000000000 -0400
 @@ -36,6 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -155,7 +155,7 @@ diff -b -B --ignore-all-space --exclude-
  	apache_exec_modules(certwatch_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.29/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/dmesg.fc	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/dmesg.fc	2009-08-31 09:47:15.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
@@ -163,7 +163,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.29/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/dmesg.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/dmesg.te	2009-08-31 09:47:15.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -200,7 +200,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.29/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/firstboot.te	2009-08-28 16:35:10.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/firstboot.te	2009-08-31 09:47:15.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -225,7 +225,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.if serefpolicy-3.6.29/policy/modules/admin/kismet.if
 --- nsaserefpolicy/policy/modules/admin/kismet.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/kismet.if	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/kismet.if	2009-08-31 09:47:15.000000000 -0400
 @@ -16,6 +16,7 @@
  	')
  
@@ -236,7 +236,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.29/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/kismet.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/kismet.te	2009-08-31 09:47:15.000000000 -0400
 @@ -17,6 +17,9 @@
  type kismet_tmp_t;
  files_tmp_file(kismet_tmp_t)
@@ -281,7 +281,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.29/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/logrotate.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/logrotate.te	2009-08-31 09:47:15.000000000 -0400
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -326,7 +326,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.29/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/logwatch.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/logwatch.te	2009-08-31 09:47:15.000000000 -0400
 @@ -136,4 +136,5 @@
  
  optional_policy(`
@@ -335,7 +335,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.29/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/mrtg.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/mrtg.te	2009-08-31 09:47:15.000000000 -0400
 @@ -116,6 +116,9 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -359,7 +359,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.6.29/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/portage.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/portage.te	2009-08-31 09:47:15.000000000 -0400
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -371,7 +371,7 @@ diff -b -B --ignore-all-space --exclude-
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.29/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/prelink.if	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/prelink.if	2009-08-31 09:47:15.000000000 -0400
 @@ -140,3 +140,22 @@
  	files_search_var_lib($1)
  	manage_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
@@ -397,7 +397,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.29/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/readahead.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/readahead.te	2009-08-31 09:47:15.000000000 -0400
 @@ -54,7 +54,10 @@
  files_dontaudit_getattr_all_sockets(readahead_t)
  files_list_non_security(readahead_t)
@@ -411,7 +411,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_search_auto_mountpoints(readahead_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.29/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/rpm.fc	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/rpm.fc	2009-08-31 09:47:15.000000000 -0400
 @@ -1,17 +1,17 @@
  
  /bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -460,7 +460,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.29/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/rpm.if	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/rpm.if	2009-08-31 09:47:15.000000000 -0400
 @@ -66,6 +66,11 @@
  	rpm_domtrans($1)
  	role $2 types rpm_t;
@@ -686,7 +686,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.29/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/rpm.te	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/rpm.te	2009-08-31 09:47:15.000000000 -0400
 @@ -31,11 +31,15 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -915,7 +915,7 @@ diff -b -B --ignore-all-space --exclude-
  		java_domtrans_unconfined(rpm_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.fc serefpolicy-3.6.29/policy/modules/admin/smoltclient.fc
 --- nsaserefpolicy/policy/modules/admin/smoltclient.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.29/policy/modules/admin/smoltclient.fc	2009-08-28 15:56:53.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/smoltclient.fc	2009-08-31 09:47:15.000000000 -0400
 @@ -0,0 +1,4 @@
 +
 +/usr/share/smolt/client/sendProfile.py	--	gen_context(system_u:object_r:smoltclient_exec_t,s0)	
@@ -923,12 +923,12 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.if serefpolicy-3.6.29/policy/modules/admin/smoltclient.if
 --- nsaserefpolicy/policy/modules/admin/smoltclient.if	1969-12-31 19:00:00.000000000 -0500
[...2537 lines suppressed...]
++++ serefpolicy-3.6.29/policy/modules/system/sysnetwork.if	2009-08-31 09:47:16.000000000 -0400
 @@ -43,6 +43,39 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -25055,7 +25056,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.29/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/sysnetwork.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/sysnetwork.te	2009-08-31 09:47:16.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -25304,7 +25305,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.29/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/udev.fc	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/udev.fc	2009-08-31 09:47:16.000000000 -0400
 @@ -7,6 +7,9 @@
  /etc/hotplug\.d/default/udev.* -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
  
@@ -25317,7 +25318,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.29/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/udev.if	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/udev.if	2009-08-31 09:47:16.000000000 -0400
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)
@@ -25346,7 +25347,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.29/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/udev.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/udev.te	2009-08-31 09:47:16.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;
@@ -25458,7 +25459,7 @@ diff -b -B --ignore-all-space --exclude-
  	xen_manage_log(udev_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.29/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/unconfined.fc	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/unconfined.fc	2009-08-31 09:47:16.000000000 -0400
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -25478,7 +25479,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.29/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/unconfined.if	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/unconfined.if	2009-08-31 09:47:16.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -25986,7 +25987,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.29/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/unconfined.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/unconfined.te	2009-08-31 09:47:16.000000000 -0400
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -26218,7 +26219,7 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.29/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/userdomain.fc	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/userdomain.fc	2009-08-31 09:47:16.000000000 -0400
 @@ -1,4 +1,8 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -26231,7 +26232,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.29/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/userdomain.if	2009-08-31 09:07:29.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/userdomain.if	2009-08-31 09:47:16.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28184,7 +28185,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.29/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/userdomain.te	2009-08-28 16:28:51.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/userdomain.te	2009-08-31 09:47:16.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -28272,7 +28273,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow userdomain userdomain:process signull;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.29/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/xen.fc	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/xen.fc	2009-08-31 09:47:16.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -28302,7 +28303,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.29/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/xen.if	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/xen.if	2009-08-31 09:47:16.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -28355,7 +28356,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.29/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/xen.te	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/system/xen.te	2009-08-31 09:47:16.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28655,7 +28656,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.29/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/support/obj_perm_sets.spt	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/support/obj_perm_sets.spt	2009-08-31 09:47:16.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -28690,7 +28691,7 @@ diff -b -B --ignore-all-space --exclude-
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.29/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/users	2009-08-28 15:56:54.000000000 -0400
++++ serefpolicy-3.6.29/policy/users	2009-08-31 09:47:16.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -28715,60 +28716,3 @@ diff -b -B --ignore-all-space --exclude-
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.29/Rules.modular
---- nsaserefpolicy/Rules.modular	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/Rules.modular	2009-08-28 15:56:54.000000000 -0400
-@@ -73,8 +73,8 @@
- $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
- 	@echo "Compliling $(NAME) $(@F) module"
- 	@test -d $(tmpdir) || mkdir -p $(tmpdir)
--	$(call perrole-expansion,$(basename $(@F)),$@.role)
--	$(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
-+#	$(call perrole-expansion,$(basename $(@F)),$@.role)
-+	$(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp)
- 	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
- 
- $(tmpdir)/%.mod.fc: $(m4support) %.fc
-@@ -129,7 +129,7 @@
- 	@test -d $(tmpdir) || mkdir -p $(tmpdir)
- # define all available object classes
- 	$(verbose) $(genperm) $(avs) $(secclass) > $@
--	$(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@)
-+#	$(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@)
- 	$(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true
- 
- $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy
-@@ -146,7 +146,7 @@
- $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy
- $(tmpdir)/rolemap.conf: $(rolemap)
- 	$(verbose) echo "" > $@
--	$(call parse-rolemap,base,$@)
-+#	$(call parse-rolemap,base,$@)
- 
- $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
- $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/divert.m4 serefpolicy-3.6.29/support/divert.m4
---- nsaserefpolicy/support/divert.m4	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/support/divert.m4	1969-12-31 19:00:00.000000000 -0500
-@@ -1 +0,0 @@
--divert(`-1')
-\ No newline at end of file
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.29/support/Makefile.devel
---- nsaserefpolicy/support/Makefile.devel	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/support/Makefile.devel	2009-08-28 15:56:54.000000000 -0400
-@@ -185,8 +185,7 @@
- tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
- 	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
- 	@test -d $(@D) || mkdir -p $(@D)
--	$(call peruser-expansion,$(basename $(@F)),$@.role)
--	$(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
-+	$(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp)
- 	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
- 
- tmp/%.mod.fc: $(m4support) %.fc
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/undivert.m4 serefpolicy-3.6.29/support/undivert.m4
---- nsaserefpolicy/support/undivert.m4	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/support/undivert.m4	1969-12-31 19:00:00.000000000 -0500
-@@ -1 +0,0 @@
--divert
-\ No newline at end of file



From orion at fedoraproject.org  Mon Aug 31 16:07:25 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 31 Aug 2009 16:07:25 +0000 (UTC)
Subject: rpms/paraview/F-11 paraview.spec,1.36,1.37
Message-ID: <20090831160725.30B1511C0072@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19781/F-11

Modified Files:
	paraview.spec 
Log Message:
Fixup rm command



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/paraview.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- paraview.spec	31 Aug 2009 14:29:41 -0000	1.36
+++ paraview.spec	31 Aug 2009 16:07:24 -0000	1.37
@@ -299,7 +299,7 @@ rm -r $RPM_BUILD_ROOT/usr/plugins
 rm $RPM_BUILD_ROOT%{_bindir}/assistant \
    $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
 #Don't ship lproj - provided by vtk
-rm lproj
+rm $RPM_BUILD_ROOT%{_bindir}/lproj
 
 #Move the documentation
 #mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \



From orion at fedoraproject.org  Mon Aug 31 16:07:25 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 31 Aug 2009 16:07:25 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.43,1.44
Message-ID: <20090831160725.4407511C0263@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19781/devel

Modified Files:
	paraview.spec 
Log Message:
Fixup rm command



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- paraview.spec	31 Aug 2009 14:29:41 -0000	1.43
+++ paraview.spec	31 Aug 2009 16:07:25 -0000	1.44
@@ -300,7 +300,7 @@ rm -r $RPM_BUILD_ROOT/usr/plugins
 rm $RPM_BUILD_ROOT%{_bindir}/assistant \
    $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
 #Don't ship lproj - provided by vtk
-rm lproj
+rm $RPM_BUILD_ROOT%{_bindir}/lproj
 
 #Move the documentation
 #mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \



From sailer at fedoraproject.org  Mon Aug 31 16:21:00 2009
From: sailer at fedoraproject.org (sailer)
Date: Mon, 31 Aug 2009 16:21:00 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel .cvsignore, 1.2, 1.3 mingw32-gtkmm24.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090831162100.C439711C0072@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23736

Modified Files:
	.cvsignore mingw32-gtkmm24.spec sources 
Log Message:
update to 2.17.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Apr 2009 22:35:34 -0000	1.2
+++ .cvsignore	31 Aug 2009 16:21:00 -0000	1.3
@@ -1 +1,2 @@
 gtkmm-2.16.0.tar.bz2
+gtkmm-2.17.2.tar.bz2


Index: mingw32-gtkmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/mingw32-gtkmm24.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-gtkmm24.spec	25 Jul 2009 12:19:31 -0000	1.3
+++ mingw32-gtkmm24.spec	31 Aug 2009 16:21:00 -0000	1.4
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtkmm24
-Version:        2.16.0
-Release:        3%{?dist}
+Version:        2.17.2
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
@@ -22,7 +22,7 @@ BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-glibmm24 >= %{version}
+BuildRequires:  mingw32-glibmm24 >= 2.21.2
 BuildRequires:  mingw32-atk
 BuildRequires:  mingw32-pango
 BuildRequires:  mingw32-gtk2 >= %{version}
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.17.2-1
+- update to 2.17.2 to match native
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Apr 2009 22:35:34 -0000	1.2
+++ sources	31 Aug 2009 16:21:00 -0000	1.3
@@ -1 +1 @@
-a82e3b5b93008421ff67df16d1e51ec2  gtkmm-2.16.0.tar.bz2
+fdb4932b254c270c0023addd6c2ec420  gtkmm-2.17.2.tar.bz2



From akurtakov at fedoraproject.org  Mon Aug 31 16:28:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 31 Aug 2009 16:28:33 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.15,1.16
Message-ID: <20090831162833.67D1511C0072@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25635/devel

Modified Files:
	maven-surefire.spec 
Log Message:
Disable not needed BRs.


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- maven-surefire.spec	31 Aug 2009 13:15:07 -0000	1.15
+++ maven-surefire.spec	31 Aug 2009 16:28:33 -0000	1.16
@@ -36,7 +36,7 @@
 
 Name:           maven-surefire
 Version:        2.3
-Release:        7.3%{?dist}
+Release:        7.4%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -87,8 +87,8 @@ BuildRequires:  tomcat5
 BuildRequires:  tomcat5-servlet-2.4-api
 #BuildRequires:  excalibur-avalon-logkit
 #BuildRequires:  excalibur-avalon-framework
-BuildRequires:  maven-shared-plugin-testing-harness
-BuildRequires:  maven2-plugin-surefire < 2.3.1
+#BuildRequires:  maven-shared-plugin-testing-harness
+#BuildRequires:  maven2-plugin-surefire < 2.3.1
 BuildRequires:  bsf
 %endif
 
@@ -352,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.4
+- Disable not needed BRs.
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.3
 - Install JPP.maven2.plugins-surefire-plugin.pom now that we have maven 2.0.8.
 



From pbrobinson at fedoraproject.org  Mon Aug 31 16:39:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 16:39:01 +0000 (UTC)
Subject: rpms/bisho/devel bisho-fixgconfschemas.patch, NONE, 1.1 bisho.spec, 
	1.4, 1.5
Message-ID: <20090831163901.27B1411C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28738

Modified Files:
	bisho.spec 
Added Files:
	bisho-fixgconfschemas.patch 
Log Message:
- Add upstream patch for gconf schema name

bisho-fixgconfschemas.patch:
 .gitignore       |    2 +-
 configure.ac     |    2 +-
 data/Makefile.am |    2 +-
 po/POTFILES.skip |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE bisho-fixgconfschemas.patch ---
>From f2e377d084a2c6fc70a366ac902d8b148dd64cf7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross at linux.intel.com>
Date: Wed, 12 Aug 2009 10:22:48 +0000
Subject: Rename callback.schemas to bisho.schemas

---
diff --git a/.gitignore b/.gitignore
index f11e96d..2947ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ po/Makefile*
 po/POTFILES
 po/stamp-it
 data/bisho.desktop
-data/callback.schemas
+data/bisho.schemas
 po/.intltool-merge-cache
 src/bisho
 src/bisho-url-callback
diff --git a/configure.ac b/configure.ac
index 0a12209..2654203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AM_GCONF_SOURCE_2
 AC_OUTPUT([
         Makefile
         data/Makefile
-        data/callback.schemas
+        data/bisho.schemas
         src/Makefile
         po/Makefile.in
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 7680af0..4a7f8da 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 dist_icon_DATA = bisho.png
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = callback.schemas
+schema_DATA = bisho.schemas
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
diff --git a/data/callback.schemas.in b/data/bisho.schemas.in
index 7cb9229..7cb9229 100644
--- a/data/callback.schemas.in
+++ b/data/bisho.schemas.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 69175a0..07ee4c1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1 @@
-data/callback.schemas.in
+data/bisho.schemas.in
--
cgit v0.8.2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bisho.spec	23 Aug 2009 11:41:21 -0000	1.4
+++ bisho.spec	31 Aug 2009 16:39:00 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           bisho
 Version:        0.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.moblin.org/
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:		bisho-fixgconfschemas.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
@@ -32,6 +33,8 @@ aggregation service.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixgconfschemas
+mv  $RPM_BUILD_DIR/%{name}-%{version}/data/callback.schemas.in $RPM_BUILD_DIR/%{name}-%{version}/data/bisho.schemas.in
 
 # Don't run configure from autogen.sh
 sed -i 's|echo|exit 0|g' autogen.sh
@@ -86,11 +89,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS TODO
 %{_bindir}/bisho
-%{_sysconfdir}/gconf/schemas/callback.schemas
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-3
+- Add upstream patch for gconf schema name
+
 * Sun Aug 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-2
 - Add missing dep for new release
 



From transif at fedoraproject.org  Mon Aug 31 16:53:40 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 31 Aug 2009 16:53:40 +0000 (UTC)
Subject: comps/po ta.po,1.20,1.21
Message-ID: <20090831165341.006A611C0072@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32258/po

Modified Files:
	ta.po 
Log Message:
Sending translation for Tamil


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 ta.poIndex: ta.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ta.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ta.po	1 Jun 2009 11:59:05 -0000	1.20
+++ ta.po	31 Aug 2009 16:53:40 -0000	1.21
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-28 08:21+0000\n"
-"PO-Revision-Date: 2009-05-30 22:02+0530\n"
+"POT-Creation-Date: 2009-08-31 16:30+0000\n"
+"PO-Revision-Date: 2009-08-31 22:19+0530\n"
 "Last-Translator: I. Felix <ifelix at redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -35,282 +35,304 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 "??? lightweight ??????? ????? ??????? ?????????? ????? ?????????? ?????? "
 "??????????????."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "??????? ????????"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "????????? ????"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "???????????"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "??????? ?????? ????? ???????????"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "?????? ????"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "?????????? ????"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "????????? ??????? ????????"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "????????"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "???????? ???????"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "???? ???????? ???????? ???????? ???? ?????."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "?????????? ????"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "????????? ????"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "??????????? ???????????? ????"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Buildsystem ?????? ??????????????"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "???????? ????"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "?????? ????"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "??? ????"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
[...1843 lines suppressed...]
 msgstr "???????????? ????"
 
-#: ../comps-f11.xml.in.h:164
+#: ../comps-f11.xml.in.h:165 ../comps-f12.xml.in.h:176
+#: ../comps-f13.xml.in.h:176
 msgid "Sardinian Support"
 msgstr "????????? ????"
 
-#: ../comps-f11.xml.in.h:181
+#: ../comps-f11.xml.in.h:182 ../comps-f12.xml.in.h:193
+#: ../comps-f13.xml.in.h:193
 msgid "Sugar Desktop Environment"
 msgstr "????? ??????? ????????"
 
-#: ../comps-f11.xml.in.h:182
+#: ../comps-f11.xml.in.h:183 ../comps-f12.xml.in.h:194
+#: ../comps-f13.xml.in.h:194
 msgid ""
 "Support for cross-compiling programs to 32 bit Windows targets, testing "
 "them, and building installers, all from within Fedora."
@@ -1396,21 +1507,25 @@ msgstr ""
 "32 ???? ???????? ????????????? ???????? ????????, ????????? ??????? ????????? ???????????? "
 "????????? ????????????????? ?????????????"
 
-#: ../comps-f11.xml.in.h:185
+#: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
+#: ../comps-f13.xml.in.h:198
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
 msgstr "Objective CAML programming ???? ??????? ?????? ????? ?????????? ???????????? ????."
 
-#: ../comps-f11.xml.in.h:187
+#: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
+#: ../comps-f13.xml.in.h:200
 msgid "Swahili Support"
 msgstr "???????? ????"
 
-#: ../comps-f11.xml.in.h:195
+#: ../comps-f11.xml.in.h:197 ../comps-f12.xml.in.h:208
+#: ../comps-f13.xml.in.h:208
 msgid "Tetum Support"
 msgstr "????? ????"
 
-#: ../comps-f11.xml.in.h:222
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1418,23 +1533,79 @@ msgstr ""
 "???? ?????????? ???????? ???? ??????, ?????????, ??????????? ??????? ?????????????? "
 "???????????? ????????????."
 
-#: ../comps-f11.xml.in.h:234
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "?????????? ????"
 
-#: ../comps-f11.xml.in.h:236
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "???? ??????? ????"
 
+#: ../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 "GNOME ??????????? ???????? ???? ???????????????? ??? ????????????? ????? ?????????? ????????????????? ???????????"
+
+#: ../comps-f12.xml.in.h:3 ../comps-f13.xml.in.h:3
+msgid ""
+"A set of packages that provide the shared platform for Critical Path "
+"functionality on all Fedora spins"
+msgstr "??????? Fedora ????????????? ???????? ???? ???????????????? ??? ????????????? ????? ?????????? ????????????????? ???????????"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "??????????? ??????? ?????????"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Fedora ???????? ??????? ???????????????? ??????????? ??????? ?????????"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "????? ???? (????????)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "????? ???? (GNOME)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "????? ????????"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr "LXDE ?????? ??? lightweight X11 ??????? ????? ??? ??????? ????????? ?????????????? ???????????, ?????? ????????? ?????? ???? ????????????? ?????????????????."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "????? ??????? ????? ?????? ???????????."
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin ??????? ?????"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr "Moblin ?????? NetBook/NetTop/MID ?????????????? ??? ??????? ?????."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "??????? ??????????? ???????????"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "??????? ????? ????"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1442,7 +1613,7 @@ msgstr ""
 "GNOME ?????? ?????, ???????, ????? ?????????? ??????? ?????? ?????? ??????? ????????? "
 "?????????? ??? ???????? ?????? ????? ????????????."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1450,7 +1621,7 @@ msgstr ""
 "?????? ?????? ??? ????, ????, ?????????? ????????????? ??????? ??? ???????? ?????? "
 "??????? ????? ????? ??? ???????? ???????? ????? ???????????."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1458,11 +1629,11 @@ msgstr ""
 "??? ?????????? ??? ??????????? ????? ????????????? ???? ???????? ????????? ???????? ??????? "
 "??????? ??????. ????? ??????? Vi ????? ????????."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "X????? ??? ??????????"
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1470,27 +1641,27 @@ msgstr ""
 "???? ???????? ???????? ?????????? ???????? ????????????, ?????? HTML, PDF, ???????????????? "
 "??????? ?????? ????????? ??????."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "?????? ???? ??????????? ?????????????? ????? ??????????? ?????? ????????????"
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid "This group is a collection of tools and resources of Arabic environments."
 msgstr "?????? ???? ???????? ??????? ?????? ???????? ?????? ????????????."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid "This group is a collection of tools and resources of Hebrew environments."
 msgstr "?????? ???? ???????? ??????? ?????? ???????? ?????? ????????????."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid "This group is a collection of tools and resources of Japanese environments."
 msgstr "?????? ???? ???????? ??????? ???????? ???????? ?????? ????????????."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "X???????"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid "This group is a collection of tools and resources of Czech environments."
 msgstr "?????? ???? ???????? ??????? ???? ???????? ?????? ????????????."
 



From dwalsh at fedoraproject.org  Mon Aug 31 17:06:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 31 Aug 2009 17:06:58 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-F12.patch,1.68,1.69
Message-ID: <20090831170658.C2DF611C0072@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4468

Modified Files:
	policy-F12.patch 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-2
- Allow gssd to send signals to users
- Fix duplicate label for apache content


policy-F12.patch:
 Makefile                                  |    2 
 man/man8/rsync_selinux.8                  |   18 
 man/man8/samba_selinux.8                  |    4 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/kismet.if            |    1 
 policy/modules/admin/kismet.te            |   17 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 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         |    4 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 ++
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 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            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  288 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 ++
 policy/modules/apps/openoffice.te         |   14 
 policy/modules/apps/ptchown.fc            |    2 
 policy/modules/apps/ptchown.if            |   22 
 policy/modules/apps/ptchown.te            |   39 
 policy/modules/apps/pulseaudio.if         |    1 
 policy/modules/apps/pulseaudio.te         |   18 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  270 ++++-
 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            |  167 +++
 policy/modules/apps/sandbox.te            |  302 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   23 
 policy/modules/kernel/corecommands.fc     |   24 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 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       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 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             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  124 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++---
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 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      |   50 +
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 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            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 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/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 +
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 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 |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 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           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 -
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   60 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 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            |   12 
 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/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 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 |   84 +
 policy/modules/services/setroubleshoot.te |   60 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  131 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  307 +++++-
 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        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  154 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1373 +++++++++++++++++++++++-------
 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 
 320 files changed, 14696 insertions(+), 3012 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- policy-F12.patch	31 Aug 2009 16:05:43 -0000	1.68
+++ policy-F12.patch	31 Aug 2009 17:06:58 -0000	1.69
@@ -1,3 +1,15 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.29/Makefile
+--- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
++++ serefpolicy-3.6.29/Makefile	2009-08-31 13:03:03.000000000 -0400
+@@ -244,7 +244,7 @@
+ appdir := $(contextpath)
+ user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
+ user_default_contexts_names := $(addprefix $(contextpath)/users/,$(subst _default_contexts,,$(notdir $(user_default_contexts))))
+-appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts x_contexts customizable_types securetty_types) $(contextpath)/files/media $(user_default_contexts_names)
++appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts x_contexts customizable_types securetty_types virtual_image_context virtual_domain_context) $(contextpath)/files/media $(user_default_contexts_names)
+ net_contexts := $(builddir)net_contexts
+ 
+ all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-3.6.29/man/man8/rsync_selinux.8
 --- nsaserefpolicy/man/man8/rsync_selinux.8	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.29/man/man8/rsync_selinux.8	2009-08-31 09:47:15.000000000 -0400
@@ -460,7 +472,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.29/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/rpm.if	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/admin/rpm.if	2009-08-31 10:37:32.000000000 -0400
 @@ -66,6 +66,11 @@
  	rpm_domtrans($1)
  	role $2 types rpm_t;
@@ -473,7 +485,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 +151,34 @@
+@@ -146,6 +151,35 @@
  
  ########################################
  ## <summary>
@@ -496,6 +508,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	dontaudit $1 rpm_t:fifo_file rw_fifo_file_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;
@@ -508,7 +521,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +200,48 @@
+@@ -167,6 +201,48 @@
  
  ########################################
  ## <summary>
@@ -557,7 +570,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +261,24 @@
+@@ -186,6 +262,24 @@
  
  ########################################
  ## <summary>
@@ -582,7 +595,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +312,29 @@
+@@ -219,7 +313,29 @@
  	')
  
  	files_search_tmp($1)
@@ -612,7 +625,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -245,6 +360,24 @@
+@@ -245,6 +361,24 @@
  
  ########################################
  ## <summary>
@@ -637,7 +650,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM package database.
  ## </summary>
  ## <param name="domain">
-@@ -283,3 +416,46 @@
+@@ -283,3 +417,46 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1269,7 +1282,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.29/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/apps/cpufreqselector.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/apps/cpufreqselector.te	2009-08-31 10:08:44.000000000 -0400
 @@ -8,7 +8,8 @@
  
  type cpufreqselector_t;
@@ -1280,7 +1293,15 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
-@@ -36,6 +37,7 @@
+@@ -26,6 +27,7 @@
+ dev_rw_sysfs(cpufreqselector_t)
+ 
+ userdom_read_all_users_state(cpufreqselector_t)
++userdom_dontaudit_search_admin_dir(cpufreqselector_t)
+ 
+ optional_policy(`
+ 	consolekit_dbus_chat(cpufreqselector_t)
+@@ -36,6 +38,7 @@
  ')
  
  optional_policy(`
@@ -1639,7 +1660,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.29/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/apps/gnome.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/apps/gnome.te	2009-08-31 10:10:01.000000000 -0400
 @@ -9,16 +9,18 @@
  attribute gnomedomain;
  
@@ -1678,7 +1699,7 @@ diff -b -B --ignore-all-space --exclude-
  ##############################
  #
  # Local Policy
-@@ -73,3 +84,82 @@
+@@ -73,3 +84,83 @@
  	xserver_use_xdm_fds(gconfd_t)
  	xserver_rw_xdm_pipes(gconfd_t)
  ')
@@ -1744,6 +1765,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_read_usr_files(gnomesystemmm_t)
 +
 +userdom_read_all_users_state(gnomesystemmm_t)
++userdom_dontaudit_search_admin_dir(gnomesystemmm_t)
 +
 +optional_policy(`
 +        consolekit_dbus_chat(gnomesystemmm_t)
@@ -2046,8 +2068,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.te serefpolicy-3.6.29/policy/modules/apps/kdumpgui.te
 --- nsaserefpolicy/policy/modules/apps/kdumpgui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.29/policy/modules/apps/kdumpgui.te	2009-08-31 09:47:15.000000000 -0400
-@@ -0,0 +1,64 @@
++++ serefpolicy-3.6.29/policy/modules/apps/kdumpgui.te	2009-08-31 10:09:48.000000000 -0400
+@@ -0,0 +1,66 @@
 +policy_module(kdumpgui,1.0.0)
 +
 +########################################
@@ -2102,6 +2124,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +dontaudit_init_read_all_script_files(kdumpgui_t)
 +
++userdom_dontaudit_search_admin_dir(kdumpgui_t)
++
 +optional_policy(`
 +        dev_rw_lvm_control(kdumpgui_t)
 +')
@@ -3786,8 +3810,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.29/policy/modules/apps/sambagui.te
 --- nsaserefpolicy/policy/modules/apps/sambagui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.29/policy/modules/apps/sambagui.te	2009-08-31 09:47:15.000000000 -0400
-@@ -0,0 +1,55 @@
++++ serefpolicy-3.6.29/policy/modules/apps/sambagui.te	2009-08-31 10:08:12.000000000 -0400
+@@ -0,0 +1,56 @@
 +policy_module(sambagui,1.0.0)
 +
 +########################################
@@ -3797,7 +3821,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +type sambagui_t;
 +type sambagui_exec_t;
-+
 +dbus_system_domain(sambagui_t, sambagui_exec_t)
 +
 +########################################
@@ -3836,6 +3859,8 @@ diff -b -B --ignore-all-space --exclude-
 +dev_dontaudit_read_urand(sambagui_t)
 +nscd_dontaudit_search_pid(sambagui_t)
 +
++userdom_dontaudit_search_admin_dir(sambagui_t)
++
 +optional_policy(`
 +	consoletype_exec(sambagui_t)
 +')
@@ -5340,7 +5365,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.29/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/kernel/domain.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/kernel/domain.te	2009-08-31 10:41:13.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5411,7 +5436,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,69 @@
+@@ -153,3 +174,66 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5438,6 +5463,8 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	rpm_use_fds(domain)
 +	rpm_read_pipes(domain)
++	rpm_dontaudit_leaks(domain)
++	rpm_read_script_tmp_files(domain)
 +')
 +
 +
@@ -5458,11 +5485,6 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	rpm_dontaudit_leaks(domain)
-+	rpm_read_script_tmp_files(domain)
-+')
-+
-+optional_policy(`
 +	ssh_rw_pipes(domain)
 +')
 +
@@ -16066,7 +16088,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.29/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/services/samba.te	2009-08-31 09:47:16.000000000 -0400
++++ serefpolicy-3.6.29/policy/modules/services/samba.te	2009-08-31 11:04:34.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -16211,7 +16233,16 @@ diff -b -B --ignore-all-space --exclude-
  samba_read_config(smbcontrol_t)
  samba_rw_var_files(smbcontrol_t)
  samba_search_var(smbcontrol_t)
-@@ -638,6 +669,10 @@
+@@ -536,6 +567,8 @@
+ 
+ miscfiles_read_localization(smbcontrol_t)
+ 
++userdom_use_user_terminals(smbcontrol_t)
++
+ ########################################
+ #
+ # smbmount Local policy
+@@ -638,6 +671,10 @@
  
  allow swat_t smbd_var_run_t:file { lock unlink };
  
@@ -16222,7 +16253,7 @@ diff -b -B --ignore-all-space --exclude-
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  read_lnk_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
-@@ -713,12 +748,23 @@
+@@ -713,12 +750,23 @@
  	kerberos_use(swat_t)
  ')
  
@@ -16247,24 +16278,26 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process { signal_perms getsched setsched };
  allow winbind_t self:fifo_file rw_fifo_file_perms;
-@@ -866,6 +912,16 @@
+@@ -866,6 +914,18 @@
  #
  
  optional_policy(`
 +	type samba_unconfined_net_t;
 +	domain_type(samba_unconfined_net_t)
++	domain_entry_file(samba_unconfined_net_t, samba_net_exec_t)
 +	role system_r types samba_unconfined_net_t;
 +
 +	unconfined_domain(samba_unconfined_net_t)
 +
 +	manage_files_pattern(samba_unconfined_net_t, samba_etc_t, samba_secrets_t)
 +	filetrans_pattern(samba_unconfined_net_t, samba_etc_t, samba_secrets_t, file)
++	userdom_use_user_terminals(samba_unconfined_net_t)
 +')
 +
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -876,9 +932,12 @@
+@@ -876,9 +936,12 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  



From rdieter at fedoraproject.org  Mon Aug 31 17:07:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 17:07:20 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.319,1.320
Message-ID: <20090831170720.3C8A111C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4573

Modified Files:
	qt.spec 
Log Message:
better bug reference



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- qt.spec	31 Aug 2009 14:52:11 -0000	1.319
+++ qt.spec	31 Aug 2009 17:07:19 -0000	1.320
@@ -925,7 +925,7 @@ fi
 
 * 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 described in bug #475110
+  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



From emaldonado at fedoraproject.org  Mon Aug 31 17:09:12 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 31 Aug 2009 17:09:12 +0000 (UTC)
Subject: rpms/nss-softokn/devel nss-softokn.spec,1.15,1.16
Message-ID: <20090831170912.47C9D11C0072@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5073

Modified Files:
	nss-softokn.spec 
Log Message:
Fixed test on %postun to avoid returning 1 when nss-softokn instances still remain -bug 520258


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nss-softokn.spec	30 Aug 2009 17:45:15 -0000	1.15
+++ nss-softokn.spec	31 Aug 2009 17:09:12 -0000	1.16
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          23%{?dist}
+Release:          24%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -256,7 +256,7 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 = 0 ] && %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+[ $1 != 0 ] || %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %files
@@ -312,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Aug 31 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-24
+- Fixed test on %postun to avoid returning 1 when nss-softokn instances still remain
+
 * Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-23
 - Explicitly state via nss_util_version the nss-util version we require
 



From thm at fedoraproject.org  Mon Aug 31 17:18:13 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Mon, 31 Aug 2009 17:18:13 +0000 (UTC)
Subject: rpms/waf/devel waf-1.5.9-libdir.patch, NONE, 1.1 .cvsignore, 1.14, 
	1.15 import.log, 1.9, 1.10 sources, 1.14, 1.15 waf.spec, 1.18,
	1.19 waf-1.5.4-libdir.patch, 1.1, NONE
Message-ID: <20090831171813.28CA111C0072@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7222/devel

Modified Files:
	.cvsignore import.log sources waf.spec 
Added Files:
	waf-1.5.9-libdir.patch 
Removed Files:
	waf-1.5.4-libdir.patch 
Log Message:
Update to 1.5.9.

waf-1.5.9-libdir.patch:
 waf-light |    2 +-
 wscript   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE waf-1.5.9-libdir.patch ---
diff -up waf-1.5.9/waf-light.orig waf-1.5.9/waf-light
--- waf-1.5.9/waf-light.orig	2009-08-29 15:32:07.000000000 +0200
+++ waf-1.5.9/waf-light	2009-08-31 19:08:19.000000000 +0200
@@ -123,7 +123,7 @@ def find_lib():
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
+	dir = "/share/waf/"
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
diff -up waf-1.5.9/wscript.orig waf-1.5.9/wscript
--- waf-1.5.9/wscript.orig	2009-08-29 15:32:07.000000000 +0200
+++ waf-1.5.9/wscript	2009-08-31 19:08:19.000000000 +0200
@@ -317,7 +317,7 @@ def build(bld):
 		if val != True and val != "y": sys.exit(1)
 		create_waf()
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+	dir = os.path.join('share', 'waf', 'wafadmin')
 
 	wafadmin = bld.new_task_gen('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	11 Jun 2009 21:53:39 -0000	1.14
+++ .cvsignore	31 Aug 2009 17:18:12 -0000	1.15
@@ -1 +1 @@
-waf-1.5.8.stripped.tar.bz2
+waf-1.5.9.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	11 Jun 2009 21:53:39 -0000	1.9
+++ import.log	31 Aug 2009 17:18:12 -0000	1.10
@@ -7,3 +7,4 @@ waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.s
 waf-1_5_5-1_fc10:HEAD:waf-1.5.5-1.fc10.src.rpm:1240670795
 waf-1_5_6-1_fc11:HEAD:waf-1.5.6-1.fc11.src.rpm:1241507304
 waf-1_5_8-1_fc11:HEAD:waf-1.5.8-1.fc11.src.rpm:1244757177
+waf-1_5_9-1_fc11:HEAD:waf-1.5.9-1.fc11.src.rpm:1251738819


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Jun 2009 21:53:39 -0000	1.14
+++ sources	31 Aug 2009 17:18:12 -0000	1.15
@@ -1 +1 @@
-a52604ec1cd7560c18abdf4c6bd00897  waf-1.5.8.stripped.tar.bz2
+e48e739fedb19321b7fb8925d4b2bc45  waf-1.5.9.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- waf.spec	27 Jul 2009 07:02:13 -0000	1.18
+++ waf.spec	31 Aug 2009 17:18:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           waf
-Version:        1.5.8
-Release:        2%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -12,7 +12,7 @@ URL:            http://code.google.com/p
 # allowed in Fedora.
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.5.4-libdir.patch
+Patch0:         waf-1.5.9-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,6 +83,10 @@ find demos utils -type f -exec %{__chmod
 
 
 %changelog
+* Mon Aug 31 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.9-1
+- Update to 1.5.9.
+- Rebase libdir patch.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- waf-1.5.4-libdir.patch DELETED ---



From pbrobinson at fedoraproject.org  Mon Aug 31 17:22:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 17:22:43 +0000 (UTC)
Subject: rpms/gupnp/devel gupnp.spec,1.23,1.24
Message-ID: <20090831172243.CE51411C0072@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8221

Modified Files:
	gupnp.spec 
Log Message:
- some spec file cleanups, depend on libuuid instead of e2fsprogs-devel


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gupnp.spec	7 Aug 2009 12:30:09 -0000	1.23
+++ gupnp.spec	31 Aug 2009 17:22:43 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           gupnp
 Version:        0.12.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
@@ -83,9 +83,12 @@ rm -rf %{buildroot}
 
 %files docs
 %defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/%{name}
+%doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.8-4
+- some spec file cleanups, depend on libuuid instead of e2fsprogs-devel
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thm at fedoraproject.org  Mon Aug 31 17:24:36 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Mon, 31 Aug 2009 17:24:36 +0000 (UTC)
Subject: rpms/waf/F-11 waf-1.5.9-libdir.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 import.log, 1.9, 1.10 sources, 1.14, 1.15 waf.spec, 1.17,
	1.18 waf-1.5.4-libdir.patch, 1.1, NONE
Message-ID: <20090831172436.C72D611C0072@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8761/F-11

Modified Files:
	.cvsignore import.log sources waf.spec 
Added Files:
	waf-1.5.9-libdir.patch 
Removed Files:
	waf-1.5.4-libdir.patch 
Log Message:
Update to 1.5.9.

waf-1.5.9-libdir.patch:
 waf-light |    2 +-
 wscript   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE waf-1.5.9-libdir.patch ---
diff -up waf-1.5.9/waf-light.orig waf-1.5.9/waf-light
--- waf-1.5.9/waf-light.orig	2009-08-29 15:32:07.000000000 +0200
+++ waf-1.5.9/waf-light	2009-08-31 19:08:19.000000000 +0200
@@ -123,7 +123,7 @@ def find_lib():
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
+	dir = "/share/waf/"
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
diff -up waf-1.5.9/wscript.orig waf-1.5.9/wscript
--- waf-1.5.9/wscript.orig	2009-08-29 15:32:07.000000000 +0200
+++ waf-1.5.9/wscript	2009-08-31 19:08:19.000000000 +0200
@@ -317,7 +317,7 @@ def build(bld):
 		if val != True and val != "y": sys.exit(1)
 		create_waf()
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+	dir = os.path.join('share', 'waf', 'wafadmin')
 
 	wafadmin = bld.new_task_gen('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Jun 2009 09:39:43 -0000	1.14
+++ .cvsignore	31 Aug 2009 17:24:36 -0000	1.15
@@ -1 +1 @@
-waf-1.5.8.stripped.tar.bz2
+waf-1.5.9.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	25 Jun 2009 09:39:43 -0000	1.9
+++ import.log	31 Aug 2009 17:24:36 -0000	1.10
@@ -7,3 +7,4 @@ waf-1_5_4-1_fc10:HEAD:waf-1.5.4-1.fc10.s
 waf-1_5_5-1_fc10:F-11:waf-1.5.5-1.fc10.src.rpm:1240671397
 waf-1_5_6-1_fc11:F-11:waf-1.5.6-1.fc11.src.rpm:1241507587
 waf-1_5_8-1_fc12:F-11:waf-1.5.8-1.fc12.src.rpm:1245922710
+waf-1_5_9-1_fc11:F-11:waf-1.5.9-1.fc11.src.rpm:1251739433


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Jun 2009 09:39:43 -0000	1.14
+++ sources	31 Aug 2009 17:24:36 -0000	1.15
@@ -1 +1 @@
-a52604ec1cd7560c18abdf4c6bd00897  waf-1.5.8.stripped.tar.bz2
+e48e739fedb19321b7fb8925d4b2bc45  waf-1.5.9.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/F-11/waf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- waf.spec	25 Jun 2009 09:39:43 -0000	1.17
+++ waf.spec	31 Aug 2009 17:24:36 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           waf
-Version:        1.5.8
+Version:        1.5.9
 Release:        1%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -12,7 +12,7 @@ URL:            http://code.google.com/p
 # allowed in Fedora.
 Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.5.4-libdir.patch
+Patch0:         waf-1.5.9-libdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,6 +83,13 @@ find demos utils -type f -exec %{__chmod
 
 
 %changelog
+* Mon Aug 31 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.9-1
+- Update to 1.5.9.
+- Rebase libdir patch.
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jun 11 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.8-1
 - Update to 1.5.8.
 


--- waf-1.5.4-libdir.patch DELETED ---



From rdieter at fedoraproject.org  Mon Aug 31 18:02:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 18:02:26 +0000 (UTC)
Subject: rpms/kde-settings/F-11 kde-settings.spec,1.77,1.78
Message-ID: <20090831180226.304BE11C0072@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21678

Modified Files:
	kde-settings.spec 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-12.1
- drop Requires: leonidas-kde-theme (#504123)



Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-11/kde-settings.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- kde-settings.spec	18 Aug 2009 18:41:41 -0000	1.77
+++ kde-settings.spec	31 Aug 2009 18:02:25 -0000	1.78
@@ -1,13 +1,15 @@
 # THIS SPECFILE IS FOR F11 ONLY!
 
+%define rel 12
+
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.2
-Release: 12
+Release: %{rel}.1 
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{release}.tar.bz2
+Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.bz2
 Source1: kde-settings-svn.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -22,8 +24,8 @@ Requires: pam
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: coreutils sed util-linux
-# theme for kdm, KSplash, wallpaper
-Requires: leonidas-kde-theme
+# theme for kdm, KSplash, wallpaper (moved to kdebase-workspace)
+# Requires: leonidas-kde-theme
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -39,6 +41,7 @@ Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
 # leonidas theme for KDM
 Requires: leonidas-kde-theme
+#Requires: system-kdm-theme
 Requires: xorg-x11-xdm
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
@@ -63,7 +66,7 @@ Requires: xine-lib-pulseaudio
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{release}
+%setup -q -n %{name}-%{version}-%{rel}
 
 
 %build
@@ -151,6 +154,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-12.1
+- drop Requires: leonidas-kde-theme (#504123)
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-12
 - KPackageKit: [CheckUpdate] interval=86400
 



From akurtakov at fedoraproject.org  Mon Aug 31 18:26:24 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 31 Aug 2009 18:26:24 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.16,1.17
Message-ID: <20090831182624.91CE711C0072@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31269/devel

Modified Files:
	maven-surefire.spec 
Log Message:
Revert previous change.


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- maven-surefire.spec	31 Aug 2009 16:28:33 -0000	1.16
+++ maven-surefire.spec	31 Aug 2009 18:26:24 -0000	1.17
@@ -36,7 +36,7 @@
 
 Name:           maven-surefire
 Version:        2.3
-Release:        7.4%{?dist}
+Release:        7.5%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -87,8 +87,8 @@ BuildRequires:  tomcat5
 BuildRequires:  tomcat5-servlet-2.4-api
 #BuildRequires:  excalibur-avalon-logkit
 #BuildRequires:  excalibur-avalon-framework
-#BuildRequires:  maven-shared-plugin-testing-harness
-#BuildRequires:  maven2-plugin-surefire < 2.3.1
+BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  maven2-plugin-surefire < 2.3.1
 BuildRequires:  bsf
 %endif
 
@@ -352,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.5
+- Revert previous change.
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.4
 - Disable not needed BRs.
 



From pkgdb at fedoraproject.org  Mon Aug 31 18:27:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:27:22 +0000
Subject: [pkgdb] libopensync-plugin-synce (Fedora, 10) updated by tibbs
Message-ID: <20090831182723.0178E10F88C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for libopensync-plugin-synce
tibbs has set commit to Approved for 107427 on libopensync-plugin-synce (Fedora 10)
tibbs has set checkout to Approved for 107427 on libopensync-plugin-synce (Fedora 10)
tibbs has set build to Approved for 107427 on libopensync-plugin-synce (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libopensync-plugin-synce



From pkgdb at fedoraproject.org  Mon Aug 31 18:28:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:28:56 +0000
Subject: [pkgdb] python-markdown2 (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090831182856.9480110F88C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for python-markdown2
tibbs has set commit to Approved for 107427 on python-markdown2 (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on python-markdown2 (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on python-markdown2 (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/python-markdown2



From hno at fedoraproject.org  Mon Aug 31 18:30:08 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 31 Aug 2009 18:30:08 +0000 (UTC)
Subject: rpms/squid/devel squid.logrotate,1.2,1.3
Message-ID: <20090831183008.B027311C0498@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32294

Modified Files:
	squid.logrotate 
Log Message:
Bug #520445: Silence logrotate when Squid is not running


Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.logrotate	9 Oct 2008 11:47:06 -0000	1.2
+++ squid.logrotate	31 Aug 2009 18:30:08 -0000	1.3
@@ -7,7 +7,8 @@
     sharedscripts
     postrotate
       # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
-      /usr/sbin/squid -k rotate
+      # errors redirected to make it silent if squid is not running
+      /usr/sbin/squid -k rotate 2>/dev/null
       # Wait a little to allow Squid to catch up before the logs is compressed
       sleep 1
     endscript



From pkgdb at fedoraproject.org  Mon Aug 31 18:32:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:32:40 +0000
Subject: [pkgdb] libowfat (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090831183240.7EDD710F886@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for libowfat
tibbs has set commit to Approved for 107427 on libowfat (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on libowfat (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on libowfat (Fedora EPEL 5)
tibbs changed owner of libowfat in Fedora EPEL 5 to mdomsch

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libowfat



From pkgdb at fedoraproject.org  Mon Aug 31 18:33:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:33:28 +0000
Subject: [pkgdb] beacon was added for satyak
Message-ID: <20090831183328.7E08210F888@bastion2.fedora.phx.redhat.com>

tibbs has added Package beacon with summary WYSIWYG editor for docbook xml
tibbs has approved Package beacon
tibbs has added a Fedora devel branch for beacon with an owner of satyak
tibbs has approved beacon in Fedora devel
tibbs has approved Package beacon
tibbs has set commit to Approved for 107427 on beacon (Fedora devel)
tibbs has set checkout to Approved for 107427 on beacon (Fedora devel)
tibbs has set build to Approved for 107427 on beacon (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beacon



From pkgdb at fedoraproject.org  Mon Aug 31 18:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:33:29 +0000
Subject: [pkgdb] beacon summary updated by tibbs
Message-ID: <20090831183329.C1C6210F895@bastion2.fedora.phx.redhat.com>

tibbs set package beacon summary to WYSIWYG editor for docbook xml

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beacon



From pkgdb at fedoraproject.org  Mon Aug 31 18:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:33:29 +0000
Subject: [pkgdb] beacon (Fedora, 11) updated by tibbs
Message-ID: <20090831183329.CB70010F898@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for beacon
tibbs has set commit to Approved for 107427 on beacon (Fedora 11)
tibbs has set checkout to Approved for 107427 on beacon (Fedora 11)
tibbs has set build to Approved for 107427 on beacon (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beacon



From tibbs at fedoraproject.org  Mon Aug 31 18:33:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:33:36 +0000 (UTC)
Subject: rpms/beacon - New directory
Message-ID: <20090831183336.17D9111C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/beacon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEXF795/rpms/beacon

Log Message:
Directory /cvs/pkgs/rpms/beacon added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:33:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:33:36 +0000 (UTC)
Subject: rpms/beacon/devel - New directory
Message-ID: <20090831183336.3760911C02BB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/beacon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEXF795/rpms/beacon/devel

Log Message:
Directory /cvs/pkgs/rpms/beacon/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:33:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:33:42 +0000 (UTC)
Subject: rpms/beacon Makefile,NONE,1.1
Message-ID: <20090831183342.929D611C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/beacon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEXF795/rpms/beacon

Added Files:
	Makefile 
Log Message:
Setup of module beacon


--- NEW FILE Makefile ---
# Top level Makefile for module beacon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 18:33:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:33:42 +0000 (UTC)
Subject: rpms/beacon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090831183342.C9F3A11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/beacon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEXF795/rpms/beacon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beacon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: beacon
# $Id: Makefile,v 1.1 2009/08/31 18:33:42 tibbs Exp $
NAME := beacon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 18:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:33:29 +0000
Subject: [pkgdb] beacon (Fedora, 11) updated by tibbs
Message-ID: <20090831183330.0543610F89B@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for beacon
tibbs has set commit to Approved for 107427 on beacon (Fedora 10)
tibbs has set checkout to Approved for 107427 on beacon (Fedora 10)
tibbs has set build to Approved for 107427 on beacon (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/beacon



From hno at fedoraproject.org  Mon Aug 31 18:36:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 31 Aug 2009 18:36:45 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.134,1.135
Message-ID: <20090831183645.D959F11C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2358

Modified Files:
	squid.spec 
Log Message:
Bug #520445: Silence logrotate when Squid is not running


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- squid.spec	21 Aug 2009 15:58:37 -0000	1.134
+++ squid.spec	31 Aug 2009 18:36:45 -0000	1.135
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE18
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -341,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE18-3
+- Bug #520445 silence logrotate when Squid is not running
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE18-2
 - rebuilt with new openssl
 



From akurtakov at fedoraproject.org  Mon Aug 31 18:40:30 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 31 Aug 2009 18:40:30 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.17,1.18
Message-ID: <20090831184030.59D7E11C0498@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3227/devel

Modified Files:
	maven-surefire.spec 
Log Message:
Really remove maven2-plugin-surefire BR.


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- maven-surefire.spec	31 Aug 2009 18:26:24 -0000	1.17
+++ maven-surefire.spec	31 Aug 2009 18:40:30 -0000	1.18
@@ -36,7 +36,7 @@
 
 Name:           maven-surefire
 Version:        2.3
-Release:        7.5%{?dist}
+Release:        7.6%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -88,7 +88,7 @@ BuildRequires:  tomcat5-servlet-2.4-api
 #BuildRequires:  excalibur-avalon-logkit
 #BuildRequires:  excalibur-avalon-framework
 BuildRequires:  maven-shared-plugin-testing-harness
-BuildRequires:  maven2-plugin-surefire < 2.3.1
+#BuildRequires:  maven2-plugin-surefire < 2.3.1
 BuildRequires:  bsf
 %endif
 
@@ -352,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.6
+- Really remove maven2-plugin-surefire BR.
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.5
 - Revert previous change.
 



From pkgdb at fedoraproject.org  Mon Aug 31 18:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:44:56 +0000
Subject: [pkgdb] icoutils was added for mgieseki
Message-ID: <20090831184456.8C19D10F88C@bastion2.fedora.phx.redhat.com>

tibbs has added Package icoutils with summary Utility for extracting and converting Microsoft icon and cursor files
tibbs has approved Package icoutils
tibbs has added a Fedora devel branch for icoutils with an owner of mgieseki
tibbs has approved icoutils in Fedora devel
tibbs has approved Package icoutils
tibbs has set commit to Approved for 107427 on icoutils (Fedora devel)
tibbs has set checkout to Approved for 107427 on icoutils (Fedora devel)
tibbs has set build to Approved for 107427 on icoutils (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icoutils



From pkgdb at fedoraproject.org  Mon Aug 31 18:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:44:58 +0000
Subject: [pkgdb] icoutils (Fedora, 12) updated by tibbs
Message-ID: <20090831184458.290A110F899@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for icoutils
tibbs has set commit to Approved for 107427 on icoutils (Fedora 11)
tibbs has set checkout to Approved for 107427 on icoutils (Fedora 11)
tibbs has set build to Approved for 107427 on icoutils (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icoutils



From pkgdb at fedoraproject.org  Mon Aug 31 18:44:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:44:57 +0000
Subject: [pkgdb] icoutils summary updated by tibbs
Message-ID: <20090831184458.2125510F896@bastion2.fedora.phx.redhat.com>

tibbs set package icoutils summary to Utility for extracting and converting Microsoft icon and cursor files

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icoutils



From pkgdb at fedoraproject.org  Mon Aug 31 18:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:44:58 +0000
Subject: [pkgdb] icoutils (Fedora, 12) updated by tibbs
Message-ID: <20090831184458.3B41610F8A0@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for icoutils
tibbs has set commit to Approved for 107427 on icoutils (Fedora 12)
tibbs has set checkout to Approved for 107427 on icoutils (Fedora 12)
tibbs has set build to Approved for 107427 on icoutils (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icoutils



From pkgdb at fedoraproject.org  Mon Aug 31 18:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:44:58 +0000
Subject: [pkgdb] icoutils (Fedora, 12) updated by tibbs
Message-ID: <20090831184458.2EA4510F89C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 10 branch for icoutils
tibbs has set commit to Approved for 107427 on icoutils (Fedora 10)
tibbs has set checkout to Approved for 107427 on icoutils (Fedora 10)
tibbs has set build to Approved for 107427 on icoutils (Fedora 10)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/icoutils



From tibbs at fedoraproject.org  Mon Aug 31 18:45:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:45:04 +0000 (UTC)
Subject: rpms/icoutils - New directory
Message-ID: <20090831184504.13BBC11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/icoutils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYG4456/rpms/icoutils

Log Message:
Directory /cvs/pkgs/rpms/icoutils added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:45:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:45:04 +0000 (UTC)
Subject: rpms/icoutils/devel - New directory
Message-ID: <20090831184504.37FF111C02CA@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/icoutils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYG4456/rpms/icoutils/devel

Log Message:
Directory /cvs/pkgs/rpms/icoutils/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:45:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:45:10 +0000 (UTC)
Subject: rpms/icoutils Makefile,NONE,1.1
Message-ID: <20090831184510.81B8811C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/icoutils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYG4456/rpms/icoutils

Added Files:
	Makefile 
Log Message:
Setup of module icoutils


--- NEW FILE Makefile ---
# Top level Makefile for module icoutils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 18:45:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:45:10 +0000 (UTC)
Subject: rpms/icoutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831184510.CD31511C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/icoutils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsYG4456/rpms/icoutils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module icoutils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: icoutils
# $Id: Makefile,v 1.1 2009/08/31 18:45:10 tibbs Exp $
NAME := icoutils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 18:46:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:46:57 +0000
Subject: [pkgdb] hunspell-shs was added for caolanm
Message-ID: <20090831184657.78E2110F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package hunspell-shs with summary Shuswap hunspell dictionaries
tibbs has approved Package hunspell-shs
tibbs has added a Fedora devel branch for hunspell-shs with an owner of caolanm
tibbs has approved hunspell-shs in Fedora devel
tibbs has approved Package hunspell-shs
tibbs has set commit to Approved for 107427 on hunspell-shs (Fedora devel)
tibbs has set checkout to Approved for 107427 on hunspell-shs (Fedora devel)
tibbs has set build to Approved for 107427 on hunspell-shs (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-shs



From tibbs at fedoraproject.org  Mon Aug 31 18:47:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:47:04 +0000 (UTC)
Subject: rpms/hunspell-shs - New directory
Message-ID: <20090831184704.1562011C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hunspell-shs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEg5214/rpms/hunspell-shs

Log Message:
Directory /cvs/pkgs/rpms/hunspell-shs added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:47:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:47:04 +0000 (UTC)
Subject: rpms/hunspell-shs/devel - New directory
Message-ID: <20090831184704.393D211C0380@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hunspell-shs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEg5214/rpms/hunspell-shs/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-shs/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:47:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:47:10 +0000 (UTC)
Subject: rpms/hunspell-shs Makefile,NONE,1.1
Message-ID: <20090831184710.2090E11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hunspell-shs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEg5214/rpms/hunspell-shs

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-shs


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-shs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 31 18:46:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:46:58 +0000
Subject: [pkgdb] hunspell-shs summary updated by tibbs
Message-ID: <20090831184658.442F110F895@bastion2.fedora.phx.redhat.com>

tibbs set package hunspell-shs summary to Shuswap hunspell dictionaries

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-shs



From tibbs at fedoraproject.org  Mon Aug 31 18:47:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:47:10 +0000 (UTC)
Subject: rpms/hunspell-shs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831184710.58F3B11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/hunspell-shs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEg5214/rpms/hunspell-shs/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-shs


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-shs
# $Id: Makefile,v 1.1 2009/08/31 18:47:10 tibbs Exp $
NAME := hunspell-shs
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 18:49:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:49:35 +0000
Subject: [pkgdb] libbs2b was added for kvolny
Message-ID: <20090831184935.E75CD10F883@bastion2.fedora.phx.redhat.com>

tibbs has added Package libbs2b with summary Bauer stereophonic-to-binaural DSP library
tibbs has approved Package libbs2b
tibbs has added a Fedora devel branch for libbs2b with an owner of kvolny
tibbs has approved libbs2b in Fedora devel
tibbs has approved Package libbs2b
tibbs has set commit to Approved for 107427 on libbs2b (Fedora devel)
tibbs has set checkout to Approved for 107427 on libbs2b (Fedora devel)
tibbs has set build to Approved for 107427 on libbs2b (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libbs2b



From tibbs at fedoraproject.org  Mon Aug 31 18:49:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:49:43 +0000 (UTC)
Subject: rpms/libbs2b - New directory
Message-ID: <20090831184943.15B2E11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libbs2b
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsDa5829/rpms/libbs2b

Log Message:
Directory /cvs/pkgs/rpms/libbs2b added to the repository




From pkgdb at fedoraproject.org  Mon Aug 31 18:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:49:36 +0000
Subject: [pkgdb] libbs2b summary updated by tibbs
Message-ID: <20090831184936.DA0BB10F88C@bastion2.fedora.phx.redhat.com>

tibbs set package libbs2b summary to Bauer stereophonic-to-binaural DSP library

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libbs2b



From pkgdb at fedoraproject.org  Mon Aug 31 18:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:49:36 +0000
Subject: [pkgdb] libbs2b (Fedora, 12) updated by tibbs
Message-ID: <20090831184936.E86F510F894@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for libbs2b
tibbs has set commit to Approved for 107427 on libbs2b (Fedora 12)
tibbs has set checkout to Approved for 107427 on libbs2b (Fedora 12)
tibbs has set build to Approved for 107427 on libbs2b (Fedora 12)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/libbs2b



From tibbs at fedoraproject.org  Mon Aug 31 18:49:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:49:43 +0000 (UTC)
Subject: rpms/libbs2b/devel - New directory
Message-ID: <20090831184943.38FD511C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libbs2b/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsDa5829/rpms/libbs2b/devel

Log Message:
Directory /cvs/pkgs/rpms/libbs2b/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:49:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:49:49 +0000 (UTC)
Subject: rpms/libbs2b Makefile,NONE,1.1
Message-ID: <20090831184949.41A5111C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libbs2b
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsDa5829/rpms/libbs2b

Added Files:
	Makefile 
Log Message:
Setup of module libbs2b


--- NEW FILE Makefile ---
# Top level Makefile for module libbs2b
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 18:49:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:49:49 +0000 (UTC)
Subject: rpms/libbs2b/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090831184949.7EB2D11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/libbs2b/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsDa5829/rpms/libbs2b/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libbs2b


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libbs2b
# $Id: Makefile,v 1.1 2009/08/31 18:49:49 tibbs Exp $
NAME := libbs2b
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 18:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:49:58 +0000
Subject: [pkgdb] tuna was added for acme
Message-ID: <20090831184958.CD84F10F8A2@bastion2.fedora.phx.redhat.com>

tibbs has added Package tuna with summary Application tuning GUI & command line utility
tibbs has approved Package tuna
tibbs has added a Fedora devel branch for tuna with an owner of acme
tibbs has approved tuna in Fedora devel
tibbs has approved Package tuna
tibbs has set commit to Approved for 107427 on tuna (Fedora devel)
tibbs has set checkout to Approved for 107427 on tuna (Fedora devel)
tibbs has set build to Approved for 107427 on tuna (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuna



From pkgdb at fedoraproject.org  Mon Aug 31 18:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:49:59 +0000
Subject: [pkgdb] tuna summary updated by tibbs
Message-ID: <20090831185000.0780F10F8A3@bastion2.fedora.phx.redhat.com>

tibbs set package tuna summary to Application tuning GUI & command line utility

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuna



From pkgdb at fedoraproject.org  Mon Aug 31 18:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:50:00 +0000
Subject: [pkgdb] tuna (Fedora, 12) updated by tibbs
Message-ID: <20090831185000.1575F10F8AA@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for tuna
tibbs has set commit to Approved for 107427 on tuna (Fedora 12)
tibbs has set checkout to Approved for 107427 on tuna (Fedora 12)
tibbs has set build to Approved for 107427 on tuna (Fedora 12)
tibbs approved watchbugzilla on tuna (Fedora 12) for i18n-team
tibbs approved watchcommits on tuna (Fedora 12) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuna



From pkgdb at fedoraproject.org  Mon Aug 31 18:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:50:00 +0000
Subject: [pkgdb] tuna (Fedora, 12) updated by tibbs
Message-ID: <20090831185000.18EDE10F8AD@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on tuna (Fedora devel) for i18n-team
tibbs approved watchcommits on tuna (Fedora devel) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuna



From pkgdb at fedoraproject.org  Mon Aug 31 18:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:50:00 +0000
Subject: [pkgdb] tuna (Fedora, 12) updated by tibbs
Message-ID: <20090831185000.2843410F8B1@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for tuna
tibbs has set commit to Approved for 107427 on tuna (Fedora 11)
tibbs has set checkout to Approved for 107427 on tuna (Fedora 11)
tibbs has set build to Approved for 107427 on tuna (Fedora 11)
tibbs approved watchbugzilla on tuna (Fedora 11) for i18n-team
tibbs approved watchcommits on tuna (Fedora 11) for i18n-team

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/tuna



From tibbs at fedoraproject.org  Mon Aug 31 18:50:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:50:06 +0000 (UTC)
Subject: rpms/tuna/devel - New directory
Message-ID: <20090831185006.3712B11C0499@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/tuna/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsPG6118/rpms/tuna/devel

Log Message:
Directory /cvs/pkgs/rpms/tuna/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:50:06 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:50:06 +0000 (UTC)
Subject: rpms/tuna - New directory
Message-ID: <20090831185006.154DC11C0499@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/tuna
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsPG6118/rpms/tuna

Log Message:
Directory /cvs/pkgs/rpms/tuna added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:50:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:50:12 +0000 (UTC)
Subject: rpms/tuna Makefile,NONE,1.1
Message-ID: <20090831185012.7229D11C0499@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/tuna
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsPG6118/rpms/tuna

Added Files:
	Makefile 
Log Message:
Setup of module tuna


--- NEW FILE Makefile ---
# Top level Makefile for module tuna
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 18:50:12 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:50:12 +0000 (UTC)
Subject: rpms/tuna/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090831185012.B17F011C0499@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/tuna/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsPG6118/rpms/tuna/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tuna


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tuna
# $Id: Makefile,v 1.1 2009/08/31 18:50:12 tibbs Exp $
NAME := tuna
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 18:51:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:51:25 +0000
Subject: [pkgdb] rubygem-facade was added for wakko666
Message-ID: <20090831185126.37C5010F883@bastion2.fedora.phx.redhat.com>

tibbs has added Package rubygem-facade with summary A module that helps implement the facade pattern
tibbs has approved Package rubygem-facade
tibbs has added a Fedora devel branch for rubygem-facade with an owner of wakko666
tibbs has approved rubygem-facade in Fedora devel
tibbs has approved Package rubygem-facade
tibbs has set commit to Approved for 107427 on rubygem-facade (Fedora devel)
tibbs has set checkout to Approved for 107427 on rubygem-facade (Fedora devel)
tibbs has set build to Approved for 107427 on rubygem-facade (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-facade



From pkgdb at fedoraproject.org  Mon Aug 31 18:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:51:27 +0000
Subject: [pkgdb] rubygem-facade summary updated by tibbs
Message-ID: <20090831185127.10EE210F890@bastion2.fedora.phx.redhat.com>

tibbs set package rubygem-facade summary to A module that helps implement the facade pattern

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-facade



From pkgdb at fedoraproject.org  Mon Aug 31 18:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:51:27 +0000
Subject: [pkgdb] rubygem-facade (Fedora, 12) updated by tibbs
Message-ID: <20090831185127.1928710F896@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on rubygem-facade (Fedora devel) for mtasaka
tibbs approved watchcommits on rubygem-facade (Fedora devel) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-facade



From tibbs at fedoraproject.org  Mon Aug 31 18:51:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:51:33 +0000 (UTC)
Subject: rpms/rubygem-facade - New directory
Message-ID: <20090831185133.16CBC11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-facade
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWA6896/rpms/rubygem-facade

Log Message:
Directory /cvs/pkgs/rpms/rubygem-facade added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:51:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:51:33 +0000 (UTC)
Subject: rpms/rubygem-facade/devel - New directory
Message-ID: <20090831185133.3572111C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-facade/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWA6896/rpms/rubygem-facade/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-facade/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 31 18:51:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:51:27 +0000
Subject: [pkgdb] rubygem-facade (Fedora, 12) updated by tibbs
Message-ID: <20090831185127.22CD210F89A@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 12 branch for rubygem-facade
tibbs has set commit to Approved for 107427 on rubygem-facade (Fedora 12)
tibbs has set checkout to Approved for 107427 on rubygem-facade (Fedora 12)
tibbs has set build to Approved for 107427 on rubygem-facade (Fedora 12)
tibbs approved watchbugzilla on rubygem-facade (Fedora 12) for mtasaka
tibbs approved watchcommits on rubygem-facade (Fedora 12) for mtasaka

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-facade



From tibbs at fedoraproject.org  Mon Aug 31 18:51:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:51:39 +0000 (UTC)
Subject: rpms/rubygem-facade Makefile,NONE,1.1
Message-ID: <20090831185139.463F911C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-facade
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWA6896/rpms/rubygem-facade

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-facade


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-facade
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 18:51:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:51:39 +0000 (UTC)
Subject: rpms/rubygem-facade/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831185139.975CF11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/rubygem-facade/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsWA6896/rpms/rubygem-facade/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-facade


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-facade
# $Id: Makefile,v 1.1 2009/08/31 18:51:39 tibbs Exp $
NAME := rubygem-facade
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 18:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:53:54 +0000
Subject: [pkgdb] plexus-registry was added for overholt
Message-ID: <20090831185354.A52BD10F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package plexus-registry with summary Plexus Registry Component
tibbs has approved Package plexus-registry
tibbs has added a Fedora devel branch for plexus-registry with an owner of overholt
tibbs has approved plexus-registry in Fedora devel
tibbs has approved Package plexus-registry
tibbs has set commit to Approved for 107427 on plexus-registry (Fedora devel)
tibbs has set checkout to Approved for 107427 on plexus-registry (Fedora devel)
tibbs has set build to Approved for 107427 on plexus-registry (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-registry



From pkgdb at fedoraproject.org  Mon Aug 31 18:53:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:53:56 +0000
Subject: [pkgdb] plexus-registry summary updated by tibbs
Message-ID: <20090831185356.9EEC310F895@bastion2.fedora.phx.redhat.com>

tibbs set package plexus-registry summary to Plexus Registry Component

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-registry



From tibbs at fedoraproject.org  Mon Aug 31 18:54:03 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:54:03 +0000 (UTC)
Subject: rpms/plexus-registry - New directory
Message-ID: <20090831185403.1C78F11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/plexus-registry
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsoM7945/rpms/plexus-registry

Log Message:
Directory /cvs/pkgs/rpms/plexus-registry added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 18:54:03 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:54:03 +0000 (UTC)
Subject: rpms/plexus-registry/devel - New directory
Message-ID: <20090831185403.4480611C0381@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/plexus-registry/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsoM7945/rpms/plexus-registry/devel

Log Message:
Directory /cvs/pkgs/rpms/plexus-registry/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 31 18:53:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 18:53:56 +0000
Subject: [pkgdb] plexus-registry (Fedora, devel) updated by tibbs
Message-ID: <20090831185356.B8DDB10F89A@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on plexus-registry (Fedora devel) for akurtakov
tibbs approved watchcommits on plexus-registry (Fedora devel) for akurtakov
tibbs approved commit on plexus-registry (Fedora devel) for akurtakov
tibbs approved build on plexus-registry (Fedora devel) for akurtakov
tibbs approved approveacls on plexus-registry (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/plexus-registry



From tibbs at fedoraproject.org  Mon Aug 31 18:54:10 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:54:10 +0000 (UTC)
Subject: rpms/plexus-registry Makefile,NONE,1.1
Message-ID: <20090831185410.9019611C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/plexus-registry
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsoM7945/rpms/plexus-registry

Added Files:
	Makefile 
Log Message:
Setup of module plexus-registry


--- NEW FILE Makefile ---
# Top level Makefile for module plexus-registry
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 18:54:11 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 18:54:11 +0000 (UTC)
Subject: rpms/plexus-registry/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831185411.0842911C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/plexus-registry/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsoM7945/rpms/plexus-registry/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module plexus-registry


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: plexus-registry
# $Id: Makefile,v 1.1 2009/08/31 18:54:10 tibbs Exp $
NAME := plexus-registry
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tuxbrewr at fedoraproject.org  Mon Aug 31 18:59:31 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Mon, 31 Aug 2009 18:59:31 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.101,1.102 comps-f13.xml.in,1.1,1.2
Message-ID: <20090831185931.2EFA711C0099@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9598

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Added polkit-gnome to KDE for Kpackagekit


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- comps-f12.xml.in	31 Aug 2009 13:29:22 -0000	1.101
+++ comps-f12.xml.in	31 Aug 2009 18:59:30 -0000	1.102
@@ -3601,6 +3601,7 @@
       <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>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- comps-f13.xml.in	27 Aug 2009 23:33:04 -0000	1.1
+++ comps-f13.xml.in	31 Aug 2009 18:59:30 -0000	1.2
@@ -3600,6 +3600,7 @@
       <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>



From overholt at fedoraproject.org  Mon Aug 31 19:03:52 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 19:03:52 +0000 (UTC)
Subject: rpms/maven-scm/devel cvsclient-20060125.pom, NONE,
	1.1 maven-scm.spec, 1.10, 1.11 sources, 1.1, 1.2
Message-ID: <20090831190352.36BAD11C0099@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10922

Modified Files:
	maven-scm.spec sources 
Added Files:
	cvsclient-20060125.pom 
Log Message:
* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1
- 1.0 RC1 (courtesy Deepak Bhole)
- Remove gcj support
- Add netbeans-ide11 requirement
- Change name on surefire plugin BR


--- NEW FILE cvsclient-20060125.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.netbeans.lib</groupId>
  <artifactId>cvsclient</artifactId>
  <version>20060125</version>
  <url>http://javacvs.netbeans.org/library/</url>
  <scm>
    <url>http://javacvs.netbeans.org/source/browse/javacvs/libsrc/</url>
  </scm>
  <licenses>
    <license>
      <name>Sun Public License</name>
      <url>http://www.netbeans.org/about/legal/spl.html</url>
    </license>
  </licenses>
</project>

Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- maven-scm.spec	25 Jul 2009 11:51:06 -0000	1.10
+++ maven-scm.spec	31 Aug 2009 19:03:52 -0000	1.11
@@ -28,35 +28,32 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define maven_settings_file %{_builddir}/%{name}/settings.xml
-%define namedversion 1.0-beta-3
+%define namedversion 1.0-rc1
 
 Name:           maven-scm
 Version:        1.0
-Release:        0.4.b3.1.7%{?dist}
+Release:        0.5.rc1%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
-Group:          Development/Java
+Group:          Development/Libraries
 URL:            http://maven.apache.org/scm
 
-Source0:        %{name}-%{version}-beta-3.tar.gz
 # svn export 
-#   http://svn.apache.org/repos/asf/maven/scm/tags/maven-scm-1.0-beta-3/
-#   maven-scm/
-# tar czf maven-scm-1.0-beta-3.tar.gz maven-scm/
+#   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.0-rc1/ maven-scm/
+# tar czf maven-scm-1.0-rc1.tar.gz maven-scm/
+Source0:        %{name}-%{namedversion}.tar.gz
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-mapdeps.xsl
 Source3:        %{name}-add-plexusutils-dep.xml
 
+# Keeping this here means we don't have to modify the netbeans package
+Source4:        http://repo2.maven.org/maven2/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.pom
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 2.0.4-6
@@ -65,12 +62,12 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-plugin
-BuildRequires:  maven2-plugin-release
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven2-common-poms >= 1.0-3
 BuildRequires:  modello >= 1.0-0.a8
 BuildRequires:  modello-maven-plugin >= 1.0-0.a8
+BuildRequires:  netbeans-ide11 >= 6.7.1
 BuildRequires:  plexus-utils >= 1.2
 BuildRequires:  saxon-scripts
 
@@ -78,16 +75,11 @@ Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
 Requires:       modello >= 1.0-0.a8
 Requires:       modello-maven-plugin >= 1.0-0.a8
+Requires:       netbeans-ide11 >= 6.7.1
 Requires:       oro >= 2.0.8
 Requires:       plexus-utils >= 1.2
 Requires:       velocity >= 1.4
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
@@ -97,24 +89,15 @@ tools (e.g. Continum) in providing them 
 
 %package test
 Summary:        Tests for %{name}
-Group:          Development/Java
+Group:          Development/Tools
 Requires:       maven-scm = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description test
 Tests for %{name}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ls
-Requires(pre):  coreutils
-Requires(post): coreutils
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -136,6 +119,15 @@ saxon -o pom.xml pom.xml.noplexusutils.x
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
+# Doing this here means we don't have to modify the netbeans package
+mkdir -p $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/
+cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/
+ln -s %{_datadir}/netbeans/ide11/modules/org-netbeans-lib-cvsclient.jar \
+  $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar
+
+# We don't have svm synergy classes, so disable those tests for now
+rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
+
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
@@ -170,15 +162,10 @@ for i in `find . -name pom.xml | grep -v
         artifactname=`basename \`dirname $i\``
         jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
         cp -p $i $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.$artifactname.pom
-
-        # scm plugin has a different groupid
-        if [ $artifactname != "maven-scm-plugin" ]; then
-            %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
-        fi
+        %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
 done
 cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
 %add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
-%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/%{name} plugin
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -194,47 +181,15 @@ done
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
-%if %{gcj_support}
-%post test
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun test
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %dir %{_javadir}
@@ -247,52 +202,36 @@ fi
 %{_javadir}/%{name}/provider-bazaar*
 %{_javadir}/%{name}/provider-clearcase*
 %{_javadir}/%{name}/provider-local*
+%{_javadir}/%{name}/provider-hg*
 %{_javadir}/%{name}/provider-perforce*
 %{_javadir}/%{name}/provider-cvs-commons*
 %{_javadir}/%{name}/provider-cvsexe*
+%{_javadir}/%{name}/provider-cvsjava*
 %{_javadir}/%{name}/provider-svn-commons*
 %{_javadir}/%{name}/provider-svnexe*
 %{_javadir}/%{name}/provider-starteam*
+%{_javadir}/%{name}/provider-synergy*
 %{_javadir}/%{name}/provider-vss*
 %{_mavendepmapfragdir}
 %doc LICENSE.txt NOTICE.txt
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/api-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/client-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/manager-plexus-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-bazaar-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-clearcase-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvs-commons-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvsexe-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-local-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-perforce-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-starteam-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svn-commons-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svnexe-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-vss-1.0-beta-3.jar.*
-%endif
-
 %files test
 %defattr(-,root,root,-)
 %{_javadir}/%{name}/provider-cvstest*
 %{_javadir}/%{name}/provider-svntest*
 %{_javadir}/%{name}/test*
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-cvstest-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/test-1.0-beta-3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/provider-svntest-1.0-beta-3.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1
+- 1.0 RC1 (courtesy Deepak Bhole)
+- Remove gcj support
+- Add netbeans-ide11 requirement
+- Change name on surefire plugin BR
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.b3.1.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Mar 2007 05:10:02 -0000	1.1
+++ sources	31 Aug 2009 19:03:52 -0000	1.2
@@ -1 +1 @@
-3ff168aba7b94bb85bebfe91d91d1938  maven-scm-1.0-beta-3.tar.gz
+0c5a74ab3350d80fb2a2072eb3c7a096  maven-scm-1.0-rc1.tar.gz



From mgieseki at fedoraproject.org  Mon Aug 31 19:22:53 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Mon, 31 Aug 2009 19:22:53 +0000 (UTC)
Subject: rpms/icoutils/devel icoutils.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831192253.2A4DB11C0099@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/icoutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18055/devel

Modified Files:
	.cvsignore sources 
Added Files:
	icoutils.spec import.log 
Log Message:
Initial import (#517615).


--- 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


--- NEW FILE import.log ---
icoutils-0_28_0-1_fc11:HEAD:icoutils-0.28.0-1.fc11.src.rpm:1251746539


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icoutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:45:10 -0000	1.1
+++ .cvsignore	31 Aug 2009 19:22:52 -0000	1.2
@@ -0,0 +1 @@
+icoutils-0.28.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icoutils/devel/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	31 Aug 2009 19:22:52 -0000	1.2
@@ -0,0 +1 @@
+8b28053a5b6c2fd900d73a7aeed0cdb3  icoutils-0.28.0.tar.gz



From jwilson at fedoraproject.org  Mon Aug 31 19:24:37 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 31 Aug 2009 19:24:37 +0000 (UTC)
Subject: rpms/kernel/F-10 v4l-dvb-fix-cx25840-firmware-load.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.84, 1.1206.2.85
Message-ID: <20090831192437.E9CA111C0099@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18699

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	v4l-dvb-fix-cx25840-firmware-load.patch 
Log Message:
* Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)


v4l-dvb-fix-cx25840-firmware-load.patch:
 cx25840-firmware.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE v4l-dvb-fix-cx25840-firmware-load.patch ---
CX25840: Bugfix CX23885 and CX241xx caused ivtv regression.

From: Steven Toth <stoth at kernellabs.com>

If we override a global we need to ensure the else case resets it correctly,
or we end up loading an incorrect firmware.

Priority: normal

Signed-off-by: Steven Toth <stoth at kernellabs.com>

Trivial backport to 2.6.27

Signed-off-by: Jarod Wilson <jarod at redhat.com>

--- linux/drivers/media/video/cx25840/cx25840-firmware.c.orig	2009-08-31 15:19:21.000000000 -0400
+++ linux/drivers/media/video/cx25840/cx25840-firmware.c	2009-08-31 15:19:37.000000000 -0400
@@ -99,6 +99,8 @@ int cx25840_loadfw(struct i2c_client *cl
 
 	if (state->is_cx23885)
 		firmware = FWFILE_CX23885;
+	else
+		firmware = FWFILE;
 
 	if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
 		v4l_err(client, "unable to open firmware %s\n", firmware);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.84
retrieving revision 1.1206.2.85
diff -u -p -r1.1206.2.84 -r1.1206.2.85
--- kernel.spec	19 Aug 2009 14:22:02 -0000	1.1206.2.84
+++ kernel.spec	31 Aug 2009 19:24:37 -0000	1.1206.2.85
@@ -777,6 +777,8 @@ Patch3130: disable-p4-cpufreq-ui.patch
 
 # Fix up the v4l2 video_open function
 Patch3140: linux-2.6.27-fix-video_open.patch
+# Fix simultaneous use of hvr-1800 and pvr-500 (#480728)
+Patch3141: v4l-dvb-fix-cx25840-firmware-load.patch
 
 Patch4000: kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
 Patch4010: kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
@@ -1414,6 +1416,7 @@ ApplyPatch linux-2.6-selinux-empty-tty-f
 ApplyPatch disable-p4-cpufreq-ui.patch
 
 ApplyPatch linux-2.6.27-fix-video_open.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-load.patch
 
 ApplyPatch kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
 ApplyPatch kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
@@ -2005,6 +2008,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
+- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   to improve mmap_min_addr.



From caolanm at fedoraproject.org  Mon Aug 31 19:25:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 31 Aug 2009 19:25:08 +0000 (UTC)
Subject: rpms/hunspell-shs/devel hunspell-shs.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831192508.4CE5011C0099@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-shs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18877/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-shs.spec import.log 
Log Message:



--- NEW FILE hunspell-shs.spec ---
Name: hunspell-shs
Summary: Shuswap hunspell dictionaries
%define upstreamid 20090828
Version: 0.%{upstreamid}
Release: 1%{?dist}
Group: Applications/Text
Source: http://secpewt.sd73.bc.ca/hunspell/hunspell-shs-ca.tar.gz
URL: http://secpewt.sd73.bc.ca/wordlist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch
BuildRequires: hunspell-devel

Requires: hunspell

%description
Shuswap hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p hunspell/shs_CA.* $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc hunspell/COPYING hunspell/Copyright hunspell/README
%{_datadir}/myspell/*

%changelog
* Mon Aug 31 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090828-1
- latest version

* Thu Aug 27 2009 Caolan McNamara <caolanm at redhat.com> - 0.20081107-1
- initial version


--- NEW FILE import.log ---
hunspell-shs-0_20090828-1_fc11:HEAD:hunspell-shs-0.20090828-1.fc11.src.rpm:1251746596


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-shs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:47:10 -0000	1.1
+++ .cvsignore	31 Aug 2009 19:25:08 -0000	1.2
@@ -0,0 +1 @@
+hunspell-shs-ca.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-shs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:47:10 -0000	1.1
+++ sources	31 Aug 2009 19:25:08 -0000	1.2
@@ -0,0 +1 @@
+0cb18510031bb6f691e22cab345f7639  hunspell-shs-ca.tar.gz



From overholt at fedoraproject.org  Mon Aug 31 19:30:31 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 19:30:31 +0000 (UTC)
Subject: rpms/plexus-registry/devel import.log, NONE,
	1.1 plexus-registry-1.0-jpp-depmap.xml, NONE,
	1.1 plexus-registry-api-build.xml, NONE,
	1.1 plexus-registry-commons-build.xml, NONE,
	1.1 plexus-registry-commons-pom.patch, NONE,
	1.1 plexus-registry-fixdepversion.patch, NONE,
	1.1 plexus-registry-naming-build.xml, NONE,
	1.1 plexus-registry-test-build.xml, NONE,
	1.1 plexus-registry.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090831193031.75F2211C02CA@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/plexus-registry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20251/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log plexus-registry-1.0-jpp-depmap.xml 
	plexus-registry-api-build.xml 
	plexus-registry-commons-build.xml 
	plexus-registry-commons-pom.patch 
	plexus-registry-fixdepversion.patch 
	plexus-registry-naming-build.xml 
	plexus-registry-test-build.xml plexus-registry.spec 
Log Message:
Initial import (review bug #520491).



--- NEW FILE import.log ---
plexus-registry-1_0-0_2_a3_fc11:HEAD:plexus-registry-1.0-0.2.a3.fc11.src.rpm:1251745565


--- NEW FILE plexus-registry-1.0-jpp-depmap.xml ---
<dependencies>
  <dependency>
      <maven>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-container-default</artifactId>
        <version>1.0-alpha-17</version>
      </maven>
      <jpp>
        <groupId>JPP/plexus</groupId>
        <artifactId>containers-container-default</artifactId>
        <version>1.0-alpha-30</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-utils</artifactId>
        <version>1.4</version>
      </maven>
      <jpp>
        <groupId>JPP/plexus</groupId>
        <artifactId>utils</artifactId>
        <version>1.4.5</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>commons-configuration</groupId>
        <artifactId>commons-configuration</artifactId>
        <version>1.4</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>commons-configuration</artifactId>
        <version>1.4</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-java</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-java</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-factory</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-factory</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-config</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-config</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>directory-naming</groupId>
        <artifactId>naming-core</artifactId>
        <version>0.8</version>
      </maven>
      <jpp>
        <groupId>JPP/directory-naming</groupId>
        <artifactId>naming-core</artifactId>
        <version>0.8</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>commons-pool</groupId>
        <artifactId>commons-pool</artifactId>
        <version>1.2</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>commons-pool</artifactId>
        <version>1.3</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>avalon-framework</groupId>
        <artifactId>avalon-framework</artifactId>
        <version>4.1.3</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>avalon-framework</artifactId>
        <version>4.3.1</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>commons-digester</groupId>
        <artifactId>commons-digester</artifactId>
        <version>1.4.1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>commons-digester</artifactId>
        <version>1.7</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>geronimo-spec</groupId>
        <artifactId>geronimo-spec-javamail</artifactId>
        <version>1.3.1-rc1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>geronimo-javamail-1.3.1-api</artifactId>
        <version>1.3.1</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>javax.mail</groupId>
        <artifactId>javamail</artifactId>
        <version>1.3.1-rc1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>javamail</artifactId>
        <version>1.3.1</version>
      </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>javax.activation</groupId>
        <artifactId>activation</artifactId>
        <version>1.3.1-rc1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>jaf</artifactId>
        <version>1.3.1</version>
      </jpp>
  </dependency>
  <dependency>
    <maven>
          <groupId>org.apache.maven.reporting</groupId>
          <artifactId>maven-reporting-impl</artifactId>
          <version>2.0.4</version>
    </maven>
    <jpp>
          <groupId>JPP/maven-shared</groupId>
          <artifactId>reporting-impl</artifactId>
          <version>2.0.4</version>
    </jpp>
  </dependency>
  <dependency>
      <maven>
        <groupId>hsqldb</groupId>
        <artifactId>hsqldb</artifactId>
        <version>1.7.1</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>hsqldb</artifactId>
        <version>1.8.0.7</version>
      </jpp>
  </dependency>

</dependencies>


--- NEW FILE plexus-registry-api-build.xml ---
<project name="plexus-registry-api" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-registry-api-1.0-alpha-3"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar"/>
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
      <include name="org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"/>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-component-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-container-default/1.0-alpha-30"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Registry Component 1.0 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.registry.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>


--- NEW FILE plexus-registry-commons-build.xml ---
<project name="plexus-registry-commons" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-registry-commons-1.0-alpha-3"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
      <include name="commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar"/>
      <include name="javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
      <include name="org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar"/>
      <include name="log4j/log4j/1.2.9/log4j-1.2.9.jar"/>
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
      <include name="logkit/logkit/2.2.1/logkit-2.2.1.jar"/>
      <include name="commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
      <include name="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar"/>
      <include name="avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar"/>
      <include name="commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
      <include name="commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar"/>
      <include name="org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-logging/commons-logging/1.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" dest="${maven.repo.local}/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-lang/commons-lang/2.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="${maven.repo.local}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="${maven.repo.local}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="${maven.repo.local}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="${maven.repo.local}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="${maven.repo.local}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="${maven.repo.local}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-container-default/1.0-alpha-30"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/javax/servlet/servlet-api/2.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" dest="${maven.repo.local}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" dest="${maven.repo.local}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" dest="${maven.repo.local}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" dest="${maven.repo.local}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" dest="${maven.repo.local}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" dest="${maven.repo.local}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/log4j/log4j/1.2.9"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar" dest="${maven.repo.local}/log4j/log4j/1.2.9/log4j-1.2.9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/log4j/log4j/1.2.9/log4j-1.2.9.jar" dest="${maven.repo.local}/log4j/log4j/1.2.9/log4j-1.2.9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar" dest="${maven.repo.local}/log4j/log4j/1.2.9/log4j-1.2.9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/log4j/log4j/1.2.9/log4j-1.2.9.jar" dest="${maven.repo.local}/log4j/log4j/1.2.9/log4j-1.2.9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar" dest="${maven.repo.local}/log4j/log4j/1.2.9/log4j-1.2.9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/log4j/log4j/1.2.9/log4j-1.2.9.jar" dest="${maven.repo.local}/log4j/log4j/1.2.9/log4j-1.2.9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/logkit/logkit/2.2.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/logkit/logkit/2.2.1/logkit-2.2.1.jar" dest="${maven.repo.local}/logkit/logkit/2.2.1/logkit-2.2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/logkit/logkit/2.2.1/logkit-2.2.1.jar" dest="${maven.repo.local}/logkit/logkit/2.2.1/logkit-2.2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/logkit/logkit/2.2.1/logkit-2.2.1.jar" dest="${maven.repo.local}/logkit/logkit/2.2.1/logkit-2.2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/logkit/logkit/2.2.1/logkit-2.2.1.jar" dest="${maven.repo.local}/logkit/logkit/2.2.1/logkit-2.2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/logkit/logkit/2.2.1/logkit-2.2.1.jar" dest="${maven.repo.local}/logkit/logkit/2.2.1/logkit-2.2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/logkit/logkit/2.2.1/logkit-2.2.1.jar" dest="${maven.repo.local}/logkit/logkit/2.2.1/logkit-2.2.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-beanutils/commons-beanutils/1.7.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/avalon-framework/avalon-framework/4.3.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" dest="${maven.repo.local}/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" dest="${maven.repo.local}/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" dest="${maven.repo.local}/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" dest="${maven.repo.local}/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" dest="${maven.repo.local}/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" dest="${maven.repo.local}/avalon-framework/avalon-framework/4.3.1/avalon-framework-4.3.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-collections/commons-collections/3.2"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" dest="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" dest="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" dest="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" dest="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" dest="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" dest="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-configuration/commons-configuration/1.4"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" dest="${maven.repo.local}/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" dest="${maven.repo.local}/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" dest="${maven.repo.local}/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" dest="${maven.repo.local}/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" dest="${maven.repo.local}/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" dest="${maven.repo.local}/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-component-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Registry Commons Configuration Provider 1.0 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.registry.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>

plexus-registry-commons-pom.patch:
 pom.xml |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE plexus-registry-commons-pom.patch ---
--- plexus-registry-providers/plexus-registry-commons/pom.xml.sav0	2007-11-12 10:35:41.000000000 +0100
+++ plexus-registry-providers/plexus-registry-commons/pom.xml	2007-11-28 16:20:46.000000000 +0100
@@ -75,5 +75,15 @@
       <artifactId>commons-beanutils</artifactId>
       <version>1.7.0</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2</version>
+    </dependency>
   </dependencies>
 </project>

plexus-registry-fixdepversion.patch:
 pom.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE plexus-registry-fixdepversion.patch ---
diff -up ./pom.xml.sav ./pom.xml
--- ./pom.xml.sav	2008-04-09 14:26:23.000000000 -0400
+++ ./pom.xml	2008-04-09 14:26:31.000000000 -0400
@@ -62,12 +62,12 @@
       <dependency>
         <groupId>org.codehaus.plexus.registry</groupId>
         <artifactId>plexus-registry-api</artifactId>
-        <version>1.0-alpha-2</version>
+        <version>1.0-alpha-3</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus.registry</groupId>
         <artifactId>plexus-registry-test</artifactId>
-        <version>1.0-alpha-2</version>
+        <version>1.0-alpha-3</version>
       </dependency>
     </dependencies>
   </dependencyManagement>


--- NEW FILE plexus-registry-naming-build.xml ---
<project name="plexus-registry-naming" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-registry-naming-1.0-alpha-3"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar"/>
      <include name="org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar"/>
      <include name="directory-naming/naming-java/0.8/naming-java-0.8.jar"/>
      <include name="commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
      <include name="directory-naming/naming-config/0.8/naming-config-0.8.jar"/>
      <include name="directory-naming/naming-core/0.8/naming-core-0.8.jar"/>
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
      <include name="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar"/>
      <include name="org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar"/>
      <include name="org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar"/>
      <include name="commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
      <include name="directory-naming/naming-factory/0.8/naming-factory-0.8.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-container-default/1.0-alpha-30"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/directory-naming/naming-java/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-java/0.8/naming-java-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-java/0.8/naming-java-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-dbcp/commons-dbcp/1.2.2"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" dest="${maven.repo.local}/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/directory-naming/naming-config/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-config/0.8/naming-config-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-config/0.8/naming-config-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/directory-naming/naming-core/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-core/0.8/naming-core-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-core/0.8/naming-core-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-component-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-naming/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-naming/1.0/plexus-naming-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/commons-pool/commons-pool/1.3"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" dest="${maven.repo.local}/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/directory-naming/naming-factory/0.8"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" dest="${maven.repo.local}/directory-naming/naming-factory/0.8/naming-factory-0.8.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Registry Directory Naming Provider 1.0 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.registry.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>


--- NEW FILE plexus-registry-test-build.xml ---
<project name="plexus-registry-test" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-registry-test-1.0-alpha-3"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}">
      <include name="org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar"/>
      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
      <include name="org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar"/>
      <include name="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar"/>
      <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar"/>
      <include name="org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" description="Compile the code">
    <mkdir dir="${maven.build.output}"/>
    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
  </target>
  <target name="jar" depends="compile,test" description="Clean the JAR">
    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
  </target>
  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
    <mkdir dir="${maven.test.output}"/>
    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
      <src>
        <pathelement location="src/test/java"/>
      </src>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
      </classpath>
    </javac>
    <copy todir="${maven.test.output}">
      <fileset dir="src/test/resources"/>
    </copy>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
    <mkdir dir="${maven.test.reports}"/>
    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
      <sysproperty key="basedir" value="."/>
      <formatter type="xml"/>
      <formatter type="plain" usefile="false"/>
      <classpath>
        <path refid="build.classpath"/>
        <pathelement location="${maven.build.output}"/>
        <pathelement location="${maven.test.output}"/>
      </classpath>
      <batchtest todir="${maven.test.reports}">
        <fileset dir="src/test/java">
          <include name="**/*Test.java"/>
          <exclude name="**/*Abstract*Test.java"/>
        </fileset>
      </batchtest>
    </junit>
  </target>
  <target name="test-junit-present">
    <available classname="junit.framework.Test" property="junit.present"/>
  </target>
  <target name="junit-present" depends="test-junit-present" unless="junit.present">
    <echo>================================= WARNING ================================</echo>
    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
    <echo>==========================================================================</echo>
  </target>
  <target name="test-offline">
    <condition property="maven.mode.offline">
      <equals arg1="${build.sysclasspath}" arg2="only"/>
    </condition>
  </target>
  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-utils/1.4.5"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/junit/junit/3.8.1"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" dest="${maven.repo.local}//usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/plexus-registry-api/target/plexus-registry-api-1.0-alpha-3.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-container-default/1.0-alpha-30"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/org/codehaus/plexus/plexus-component-api/1.0"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/external_repo/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/local/jpp/rebuild/devel/BUILD/plexus-registry-1.0-alpha-3/.m2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0/plexus-component-api-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
    <mkdir dir="${javadocdir}"></mkdir>
    <tstamp>
      <format pattern="-yyyy" property="year"></format>
    </tstamp>
    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Registry Tests 1.0 API"></property>
    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.registry.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>


--- NEW FILE plexus-registry.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with_maven 1

%define namedversion 1.0-alpha-3

%define parent plexus
%define subname registry

Name:           plexus-registry
Version:        1.0
Release:        0.2.a3%{?dist}
Epoch:          0
Summary:        Plexus Registry Component
License:        ASL 2.0
Group:          Development/Tools
URL:            http://plexus.codehaus.org/
# svn export \
#  http://svn.codehaus.org/plexus/plexus-components/tags/plexus-registry-1.0-alpha-3/
# tar czf plexus-registry-1.0-alpha-3-src.tar.gz plexus-registry-1.0-alpha-3
Source0:        %{name}-%{namedversion}.tar.gz

Source3:        plexus-registry-1.0-jpp-depmap.xml

# Generated with mvn ant:ant.  Un-used by default.
Source4:        plexus-registry-api-build.xml
Source5:        plexus-registry-commons-build.xml
Source6:        plexus-registry-naming-build.xml
Source7:        plexus-registry-test-build.xml

Patch0:         plexus-registry-commons-pom.patch
Patch1:         %{name}-fixdepversion.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  java-devel >= 1:1.6.0
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit
BuildRequires:  hsqldb
%if %{with_maven}
BuildRequires:  maven2 >= 2.0.8
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire = 2.3
BuildRequires:  maven-surefire-provider-junit = 2.3
BuildRequires:  plexus-maven-plugin >= 1.3.5
BuildRequires:  maven-doxia
BuildRequires:  qdox >= 1.5
BuildRequires:  tomcat5
BuildRequires:  tomcat5-servlet-2.4-api
BuildRequires:  avalon-logkit
BuildRequires:  avalon-framework
%endif
BuildRequires:  directory-naming
BuildRequires:  avalon-framework
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-configuration
BuildRequires:  jakarta-commons-dbcp >= 1.2.1-13
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-lang
BuildRequires:  jakarta-commons-logging
BuildRequires:  plexus-classworlds
BuildRequires:  plexus-containers-container-default 
BuildRequires:  plexus-naming 
BuildRequires:  plexus-utils 

Requires:  java >= 1:1.6.0
Requires:  directory-naming
Requires:  jakarta-commons-dbcp >= 1.2.1-13
Requires:  jakarta-commons-lang
Requires:  plexus-classworlds
Requires:  plexus-containers-container-default 
Requires:  plexus-naming 
Requires:  plexus-utils 

Requires:          jpackage-utils >= 0:1.7.3
Requires(post):    jpackage-utils >= 0:1.7.3
Requires(postun):  jpackage-utils >= 0:1.7.3

%description
The Plexus project seeks to create end-to-end developer tools for 
writing applications. At the core is the container, which can be 
embedded or for a full scale application server. There are many 
reusable components for hibernate, form processing, jndi, i18n, 
velocity, etc. Plexus also includes an application server which 
is like a J2EE application server, without all the baggage.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n %{name}-%{namedversion}

cp %{SOURCE4} plexus-registry-api/build.xml
cp %{SOURCE5} plexus-registry-providers/plexus-registry-commons/build.xml
cp %{SOURCE6} plexus-registry-providers/plexus-registry-naming/build.xml
cp %{SOURCE7} plexus-registry-test/build.xml

%patch0 -b .sav0
%patch1

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

%if %{with_maven}
    mvn-jpp \
        -Dmaven.test.failure.ignore=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install

# Manual iteration should not be needed, but there is a bug in the javadoc 
# plugin which makes this necessary. See: 
# http://jira.codehaus.org/browse/MJAVADOC-157

for pom in `find -name pom.xml`; do
    pushd `dirname $pom`
      mvn-jpp \
          -Dmaven2.jpp.depmap.file=%{SOURCE3} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          javadoc:javadoc
    popd
done

%else
export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-collections \
commons-configuration \
commons-lang \
commons-logging \
directory-naming/naming-config \
directory-naming/naming-core \
directory-naming/naming-java \
junit \
plexus/classworlds \
plexus/containers-component-api \
plexus/containers-container-default \
plexus/naming \
plexus/utils \
)
CLASSPATH=$CLASSPATH:$(pwd)/plexus-registry-api/target/plexus-registry-api-%{namedversion}.jar
CLASSPATH=$CLASSPATH:$(pwd)/plexus-registry-test/target/plexus-registry-test-%{namedversion}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd plexus-registry-api
ant -Dbuild.sysclasspath=only jar javadoc
popd
pushd plexus-registry-test
ant -Dbuild.sysclasspath=only jar javadoc
popd
pushd plexus-registry-providers/plexus-registry-commons
ant -Dbuild.sysclasspath=only jar javadoc
popd
pushd plexus-registry-providers/plexus-registry-naming
ant -Dbuild.sysclasspath=only jar javadoc
popd

%endif

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus

install -pm 644 %{name}-api/target/%{name}-api-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-api-%{version}.jar
install -pm 644 \
  %{name}-providers/%{name}-commons/target/%{name}-commons-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-commons-%{version}.jar
install -pm 644 \
  %{name}-providers/%{name}-naming/target/%{name}-naming-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-naming-%{version}.jar
install -pm 644 %{name}-test/target/%{name}-test-%{namedversion}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-test-%{version}.jar

(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
  ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -pm 644 pom.xml \
  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
%add_to_maven_depmap org.codehaus.plexus.registry %{name} %{namedversion} JPP.%{parent} %{subname}

install -pm 644 %{name}-api/pom.xml \
  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-api.pom
%add_to_maven_depmap org.codehaus.plexus.registry %{name}-api %{namedversion} JPP/%{parent} %{subname}-api

install -pm 644 %{name}-test/pom.xml \
  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-test.pom
%add_to_maven_depmap org.codehaus.plexus.registry %{name}-test %{namedversion} JPP/%{parent} %{subname}-test

install -pm 644 %{name}-providers/pom.xml \
  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-providers.pom
%add_to_maven_depmap org.codehaus.plexus.registry %{name}-providers %{namedversion} JPP.%{parent} %{subname}-providers

install -pm 644 %{name}-providers/%{name}-commons/pom.xml \
  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-commons.pom
%add_to_maven_depmap org.codehaus.plexus.registry %{name}-commons %{namedversion} JPP/%{parent} %{subname}-commons

install -pm 644 %{name}-providers/%{name}-naming/pom.xml \
  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-naming.pom
%add_to_maven_depmap org.codehaus.plexus.registry %{name}-naming %{namedversion} JPP/%{parent} %{subname}-naming

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
cp -pr %{name}-api/target/site/apidocs/* \
    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/commons
cp -pr %{name}-providers/%{name}-commons/target/site/apidocs/* \
    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/commons
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/naming
cp -pr %{name}-providers/%{name}-naming/target/site/apidocs/* \
    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/naming
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
cp -pr %{name}-test/target/site/apidocs/* \
    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
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,-)
%{_javadir}/%{parent}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.2.a3
- Add jakarta-commons-dbcp BR and R

* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.1.a3
- Fix release to meet Fedora naming guidelines
- Remove gcj support
- Add instructions to build source tarball
- Fix license field
- Remove "excalibur-" prefix from avalon package names

* Thu Mar 05 2009 Yong Yang <yyang at redhat.com> 1.0-0.a3.3
- Build with maven2-2.0.8 built in non-bootstrap mode

* Thu Mar 05 2009 Yong Yang <yyang at redhat.com> 1.0-0.a3.2
- Import from dbhole's maven2 2.0.8 packages
- Fix Vendor, Distribution

* Thu Apr 10 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.a3.1jpp.1
- Import from JPackage

* Mon Dec 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
- First release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-registry/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:54:10 -0000	1.1
+++ .cvsignore	31 Aug 2009 19:30:30 -0000	1.2
@@ -0,0 +1 @@
+plexus-registry-1.0-alpha-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-registry/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:54:10 -0000	1.1
+++ sources	31 Aug 2009 19:30:31 -0000	1.2
@@ -0,0 +1 @@
+59631b9d9fad6c0389080a18288d891b  plexus-registry-1.0-alpha-3.tar.gz



From jwilson at fedoraproject.org  Mon Aug 31 19:31:17 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 31 Aug 2009 19:31:17 +0000 (UTC)
Subject: rpms/kernel/F-11 v4l-dvb-fix-cx25840-firmware-load.patch, NONE,
	1.1.2.1 kernel.spec, 1.1679.2.19, 1.1679.2.20
Message-ID: <20090831193117.27F8911C0099@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20595

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	v4l-dvb-fix-cx25840-firmware-load.patch 
Log Message:
* Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)


v4l-dvb-fix-cx25840-firmware-load.patch:
 cx25840-firmware.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE v4l-dvb-fix-cx25840-firmware-load.patch ---

# HG changeset patch
# User Steven Toth <stoth at kernellabs.com>
# Date 1251746101 14400
# Node ID 38c5fb14c770c256d1a497ff6da3e33849f6b8cf
# Parent 7c23abfe445f8b57d57db98a97a0786ab801d63e
CX25840: Bugfix CX23885 and CX241xx caused ivtv regression.

From: Steven Toth <stoth at kernellabs.com>

If we override a global we need to ensure the else case resets it correctly,
or we end up loading an incorrect firmware.

Priority: normal

Signed-off-by: Steven Toth <stoth at kernellabs.com>

--- a/drivers/media/video/cx25840/cx25840-firmware.c	Mon Aug 31 02:03:28 2009 -0300
+++ b/drivers/media/video/cx25840/cx25840-firmware.c	Mon Aug 31 15:15:01 2009 -0400
@@ -109,6 +109,8 @@
 	}
 	else if (state->is_cx231xx)
 		firmware = FWFILE_CX231XX;
+	else
+		firmware = FWFILE;
 
 	if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
 		v4l_err(client, " Firmware download size changed to 16 bytes max length\n");



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.19
retrieving revision 1.1679.2.20
diff -u -p -r1.1679.2.19 -r1.1679.2.20
--- kernel.spec	28 Aug 2009 16:57:11 -0000	1.1679.2.19
+++ kernel.spec	31 Aug 2009 19:31:16 -0000	1.1679.2.20
@@ -766,6 +766,7 @@ Patch2900: linux-2.6-v4l-dvb-fixes.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
+Patch2094: v4l-dvb-fix-cx25840-firmware-load.patch
 
 # fs fixes
 # ext4 fixes
@@ -1523,6 +1524,7 @@ ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-load.patch
 ApplyPatch hdpvr-ir-enable.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
@@ -2184,6 +2186,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
+- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
+
 * Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Enable Solos DSL driver
 



From overholt at fedoraproject.org  Mon Aug 31 19:40:43 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 19:40:43 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia-itext2.patch,NONE,1.1
Message-ID: <20090831194043.42D8611C0099@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23312

Added Files:
	maven-doxia-itext2.patch 
Log Message:
Add missing patch

maven-doxia-itext2.patch:
 ITextFont.java |    6 +++---
 ITextSink.java |    6 +++---
 ITextUtil.java |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE maven-doxia-itext2.patch ---
### Eclipse Workspace Patch 1.0
#P maven-doxia
Index: doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
===================================================================
--- doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	(revision 808629)
+++ doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	(working copy)
@@ -68,7 +68,7 @@
      */
     public static String getPageSize( Rectangle rect )
     {
-        if ( ( rect.width() == PageSize.LETTER.width() ) && ( rect.height() == PageSize.LETTER.height() ) )
+        if ( ( rect.getWidth() == PageSize.LETTER.getWidth() ) && ( rect.getHeight() == PageSize.LETTER.getHeight() ) )
         {
             return "LETTER";
         }
Index: doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
===================================================================
--- doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	(revision 808629)
+++ doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	(working copy)
@@ -1172,9 +1172,9 @@
         try
         {
             Image image = Image.getInstance( new URL( urlName ) );
-            image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
-            width = image.plainWidth();
-            height = image.plainHeight();
+            image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
+            width = image.getPlainWidth();
+            height = image.getHeight();
         }
         catch ( BadElementException e )
         {
Index: doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
===================================================================
--- doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	(revision 808629)
+++ doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	(working copy)
@@ -258,7 +258,7 @@
     {
         Font font = getCurrentFont();
 
-        return String.valueOf( font.color().getBlue() );
+        return String.valueOf( font.getColor().getBlue() );
     }
 
     /**
@@ -270,7 +270,7 @@
     {
         Font font = getCurrentFont();
 
-        return String.valueOf( font.color().getGreen() );
+        return String.valueOf( font.getColor().getGreen() );
     }
 
     /**
@@ -282,7 +282,7 @@
     {
         Font font = getCurrentFont();
 
-        return String.valueOf( font.color().getRed() );
+        return String.valueOf( font.getColor().getRed() );
     }
 
     /**



From mgieseki at fedoraproject.org  Mon Aug 31 19:42:20 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Mon, 31 Aug 2009 19:42:20 +0000 (UTC)
Subject: rpms/icoutils/F-10 icoutils.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090831194220.B428E11C02CA@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/icoutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23733

Modified Files:
	sources 
Added Files:
	icoutils.spec 
Log Message:
initial import


--- 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-10/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	31 Aug 2009 19:42:20 -0000	1.2
@@ -0,0 +1 @@
+8b28053a5b6c2fd900d73a7aeed0cdb3  icoutils-0.28.0.tar.gz



From rdieter at fedoraproject.org  Mon Aug 31 19:47:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 31 Aug 2009 19:47:16 +0000 (UTC)
Subject: rpms/xforms/devel xforms.spec,1.28,1.29
Message-ID: <20090831194716.D416E11C0099@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24885

Modified Files:
	xforms.spec 
Log Message:
update URL



Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xforms.spec	31 Aug 2009 15:39:45 -0000	1.28
+++ xforms.spec	31 Aug 2009 19:47:16 -0000	1.29
@@ -8,7 +8,8 @@ Release: 0.1.%{pre}%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
-URL:     http://www.nongnu.org/xforms/
+#URL:     http://www.nongnu.org/xforms/
+URL:     http://xforms-toolkit.org/
 Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
 Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From mgieseki at fedoraproject.org  Mon Aug 31 19:48:47 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Mon, 31 Aug 2009 19:48:47 +0000 (UTC)
Subject: rpms/icoutils/F-10 icoutils.spec,1.1,1.2
Message-ID: <20090831194847.9162711C0099@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/icoutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25216

Modified Files:
	icoutils.spec 
Log Message:
forgot to add spec file before tagging


Index: icoutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icoutils/F-10/icoutils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icoutils.spec	31 Aug 2009 19:42:20 -0000	1.1
+++ icoutils.spec	31 Aug 2009 19:48:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           icoutils
 Version:        0.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility for extracting and converting Microsoft icon and cursor files
 
 Group:          Applications/Multimedia
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2009 - Martin Gieseking <martin.gieseking at uos.de> - 0.28.0-2
+- forgot to add spec file before tagging :(
+
 * 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+



From mgieseki at fedoraproject.org  Mon Aug 31 20:12:31 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Mon, 31 Aug 2009 20:12:31 +0000 (UTC)
Subject: rpms/icoutils/F-11 icoutils.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090831201231.5117211C0099@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/icoutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv863

Modified Files:
	sources 
Added Files:
	icoutils.spec 
Log Message:
initial import


--- 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-11/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	31 Aug 2009 20:12:31 -0000	1.2
@@ -0,0 +1 @@
+8b28053a5b6c2fd900d73a7aeed0cdb3  icoutils-0.28.0.tar.gz



From nucleo at fedoraproject.org  Mon Aug 31 20:16:34 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Mon, 31 Aug 2009 20:16:34 +0000 (UTC)
Subject: rpms/kvirc/devel .cvsignore, 1.5, 1.6 kvirc.spec, 1.10, 1.11 sources,
	1.5, 1.6 kvirc-flags.patch, 1.3, NONE
Message-ID: <20090831201635.071A411C0099@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1799

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-flags.patch 
Log Message:
Added option for using cmake flags from environment variables


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Aug 2009 21:40:02 -0000	1.5
+++ .cvsignore	31 Aug 2009 20:16:34 -0000	1.6
@@ -1 +1 @@
-kvirc-20090830svn3436.tar.bz2
+kvirc-20090831svn3442.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kvirc.spec	29 Aug 2009 21:40:02 -0000	1.10
+++ kvirc.spec	31 Aug 2009 20:16:34 -0000	1.11
@@ -1,19 +1,18 @@
-%define           rev 3436
-%define           pre 20090830svn%{rev}
+%define           rev 3442
+%define           pre 20090831svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.14.%{pre}%{?dist}
+Release:          0.15.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3436 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090830svn3436.tar.bz2 kvirc
+#  svn export -r 3442 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090831svn3442.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
-Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -29,7 +28,6 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
 %{cmake}  \
@@ -40,7 +38,8 @@ many IRC addicted developers around the 
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITH_PYTHON=YES \
+-DWITH_PYTHON=ON \
+-DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
 
 make %{?_smp_mflags}
@@ -131,8 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
-* Sun Aug 30 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.14.20090830svn3436
-- patch for using standard compiler flags
+* Sun Aug 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.15.20090831svn3442
+- r3442: added option for using cmake flags from environment variables
+- Added -DUSE_ENV_FLAGS=ON for using default cmake flags
 
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Aug 2009 21:40:02 -0000	1.5
+++ sources	31 Aug 2009 20:16:34 -0000	1.6
@@ -1 +1 @@
-33fa9dadb090fb79faa49c6c950d5bdd  kvirc-20090830svn3436.tar.bz2
+48e1fd92e1aa24e2cb8c29ef649f35ac  kvirc-20090831svn3442.tar.bz2


--- kvirc-flags.patch DELETED ---



From nucleo at fedoraproject.org  Mon Aug 31 20:44:21 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Mon, 31 Aug 2009 20:44:21 +0000 (UTC)
Subject: rpms/kvirc/F-11 .cvsignore, 1.5, 1.6 kvirc.spec, 1.4, 1.5 sources,
	1.5, 1.6 kvirc-flags.patch, 1.3, NONE
Message-ID: <20090831204421.2155B11C0099@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7953

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-flags.patch 
Log Message:
Added option for using cmake flags from environment variables


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Aug 2009 21:49:31 -0000	1.5
+++ .cvsignore	31 Aug 2009 20:44:20 -0000	1.6
@@ -1 +1 @@
-kvirc-20090830svn3436.tar.bz2
+kvirc-20090831svn3442.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/kvirc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kvirc.spec	29 Aug 2009 21:49:31 -0000	1.4
+++ kvirc.spec	31 Aug 2009 20:44:20 -0000	1.5
@@ -1,19 +1,18 @@
-%define           rev 3436
-%define           pre 20090830svn%{rev}
+%define           rev 3442
+%define           pre 20090831svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.14.%{pre}%{?dist}
+Release:          0.15.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3436 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090830svn3436.tar.bz2 kvirc
+#  svn export -r 3442 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090831svn3442.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
-Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -29,7 +28,6 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
 %{cmake}  \
@@ -40,7 +38,8 @@ many IRC addicted developers around the 
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITH_PYTHON=YES \
+-DWITH_PYTHON=ON \
+-DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
 
 make %{?_smp_mflags}
@@ -131,8 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
-* Sun Aug 30 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.14.20090830svn3436
-- patch for using standard compiler flags
+* Sun Aug 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.15.20090831svn3442
+- r3442: added option for using cmake flags from environment variables
+- Added -DUSE_ENV_FLAGS=ON for using default cmake flags
 
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Aug 2009 21:49:31 -0000	1.5
+++ sources	31 Aug 2009 20:44:20 -0000	1.6
@@ -1 +1 @@
-33fa9dadb090fb79faa49c6c950d5bdd  kvirc-20090830svn3436.tar.bz2
+48e1fd92e1aa24e2cb8c29ef649f35ac  kvirc-20090831svn3442.tar.bz2


--- kvirc-flags.patch DELETED ---



From transif at fedoraproject.org  Mon Aug 31 20:50:24 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon, 31 Aug 2009 20:50:24 +0000 (UTC)
Subject: comps/po fi.po,1.25,1.26
Message-ID: <20090831205024.939A911C0495@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9395/po

Modified Files:
	fi.po 
Log Message:
Sending translation for Finnish


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.25 -r 1.26 fi.poIndex: fi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fi.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- fi.po	4 May 2009 19:05:10 -0000	1.25
+++ fi.po	31 Aug 2009 20:50:24 -0000	1.26
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-04 14:09+0000\n"
-"PO-Revision-Date: 2009-05-04 22:04+0300\n"
+"POT-Creation-Date: 2009-08-31 19:24+0000\n"
+"PO-Revision-Date: 2009-08-31 23:49+0300\n"
 "Last-Translator: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,279 +17,300 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f9.xml.in.h:1 ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f12.xml.in.h:1 ../comps-f13.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr "Kevyt ty?p?yt?ymp?rist?, joka toimii hyvin tehottomillakin koneilla."
 
-#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2
-#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1
+#: ../comps-f9.xml.in.h:2 ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3
+#: ../comps-f12.xml.in.h:5 ../comps-f13.xml.in.h:5 ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Hallintaty?kalut"
 
-#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f9.xml.in.h:3 ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
+#: ../comps-f12.xml.in.h:6 ../comps-f13.xml.in.h:6
 msgid "Afrikaans Support"
 msgstr "Afrikaansin kielituki"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f9.xml.in.h:4 ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5
+#: ../comps-f12.xml.in.h:7 ../comps-f13.xml.in.h:7
 msgid "Albanian Support"
 msgstr "Albanian kielituki"
 
-#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2
+#: ../comps-f9.xml.in.h:5 ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
+#: ../comps-f12.xml.in.h:9 ../comps-f13.xml.in.h:9 ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Apuohjelmat"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f9.xml.in.h:6 ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8
+#: ../comps-f12.xml.in.h:10 ../comps-f13.xml.in.h:10
 msgid "Applications to perform a variety of tasks"
 msgstr "Sovelluksia moniin teht?viin"
 
-#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7
-#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4
+#: ../comps-f9.xml.in.h:7 ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9
+#: ../comps-f12.xml.in.h:11 ../comps-f13.xml.in.h:11 ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arabian kielituki"
 
-#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5
+#: ../comps-f9.xml.in.h:8 ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f12.xml.in.h:12 ../comps-f13.xml.in.h:12 ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Armenian kielituki"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f9.xml.in.h:9 ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11
+#: ../comps-f12.xml.in.h:13 ../comps-f13.xml.in.h:13
 msgid "Assamese Support"
 msgstr "Assamin kielituki"
 
-#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10
-#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6
+#: ../comps-f9.xml.in.h:10 ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../comps-f12.xml.in.h:14 ../comps-f13.xml.in.h:14 ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "Kirjoitus- ja julkaisutoiminta"
 
-#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11
-#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f9.xml.in.h:11 ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14
+#: ../comps-f12.xml.in.h:16 ../comps-f13.xml.in.h:16
 msgid "Base"
 msgstr "Peruspaketit"
 
-#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12
-#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7
+#: ../comps-f9.xml.in.h:12 ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15
+#: ../comps-f12.xml.in.h:17 ../comps-f13.xml.in.h:17 ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Perusj?rjestelm?"
 
-#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13
-#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f9.xml.in.h:13 ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16
+#: ../comps-f12.xml.in.h:18 ../comps-f13.xml.in.h:18
 msgid "Basic support for the Ruby programming language."
 msgstr "Perustuki Ruby-ohjelmointikielelle."
 
-#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f9.xml.in.h:14 ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17
+#: ../comps-f12.xml.in.h:19 ../comps-f13.xml.in.h:19
 msgid "Basque Support"
 msgstr "Baskin kielituki"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f9.xml.in.h:15 ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18
+#: ../comps-f12.xml.in.h:20 ../comps-f13.xml.in.h:20
 msgid "Belarusian Support"
 msgstr "Valkoven?j?n kielituki"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f9.xml.in.h:16 ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19
+#: ../comps-f12.xml.in.h:21 ../comps-f13.xml.in.h:21
 msgid "Bengali Support"
 msgstr "Bengalin kielituki"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f9.xml.in.h:17 ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20
+#: ../comps-f12.xml.in.h:22 ../comps-f13.xml.in.h:22
 msgid "Bhutanese Support"
 msgstr "Bhutanin kielituki"
 
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f9.xml.in.h:18 ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:21
+#: ../comps-f12.xml.in.h:25 ../comps-f13.xml.in.h:25
 msgid "Bosnian Support"
 msgstr "Bosnian kielituki"
 
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f9.xml.in.h:19 ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:22
+#: ../comps-f12.xml.in.h:26 ../comps-f13.xml.in.h:26
 msgid "Brazilian Portuguese Support"
 msgstr "Brasilianportugalin kielituki"
 
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f9.xml.in.h:20 ../comps-f10.xml.in.h:21 ../comps-f11.xml.in.h:23
+#: ../comps-f12.xml.in.h:27 ../comps-f13.xml.in.h:27
 msgid "Breton Support"
 msgstr "Bretonin kielituki"
 
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:24
+#: ../comps-f12.xml.in.h:28 ../comps-f13.xml.in.h:28 ../comps-el5.xml.in.h:8
+msgid "Buildsystem building group"
+msgstr "Ryhm? k??nn?sj?rjestelm?n rakentamiseen"
+
+#: ../comps-f9.xml.in.h:22 ../comps-f10.xml.in.h:23 ../comps-f11.xml.in.h:25
+#: ../comps-f12.xml.in.h:29 ../comps-f13.xml.in.h:29
 msgid "Bulgarian Support"
 msgstr "Bulgarian kielituki"
 
-#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23
-#: ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f9.xml.in.h:23 ../comps-f10.xml.in.h:24 ../comps-f11.xml.in.h:26
+#: ../comps-f12.xml.in.h:30 ../comps-f13.xml.in.h:30
 msgid "Catalan Support"
 msgstr "Katalaanin kielituki"
 
-#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24
-#: ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f9.xml.in.h:24 ../comps-f10.xml.in.h:25 ../comps-f11.xml.in.h:28
+#: ../comps-f12.xml.in.h:32 ../comps-f13.xml.in.h:32
 msgid "Chinese Support"
 msgstr "Kiinan kielituki"
 
-#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25
-#: ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f9.xml.in.h:25 ../comps-f10.xml.in.h:26 ../comps-f11.xml.in.h:29
+#: ../comps-f12.xml.in.h:33 ../comps-f13.xml.in.h:33
 msgid "Clustering"
[...1906 lines suppressed...]
 msgid "Tetum Support"
 msgstr "Tetumin kielituki"
 
-#: ../comps-f11.xml.in.h:223
+#: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
+#: ../comps-f13.xml.in.h:235
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
@@ -1426,23 +1539,88 @@ msgstr ""
 "T?m? ryhm? sis?lt?? kokoelman ty?kaluja kirjasinten suunnitteluun, "
 "muokkaamiseen ja paketointiin."
 
-#: ../comps-f11.xml.in.h:235
+#: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
+#: ../comps-f13.xml.in.h:247
 msgid "Turkmen Support"
 msgstr "Turkmeenin kielituki"
 
-#: ../comps-f11.xml.in.h:237
+#: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
+#: ../comps-f13.xml.in.h:249
 msgid "Upper Sorbian Support"
 msgstr "Yl?-sorbin kielituki"
 
+#: ../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 ""
+"Joukko paketteja, jotka toteuttavat kriittisen polun toiminnallisuuden "
+"Gnome-ty?p?yt?ymp?rist?ss?"
+
+#: ../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 ""
+"Joukko paketteja, jotka toteuttavat jaetun alustan kriittisen polun "
+"toiminnallisuudelle kaikissa Fedora-spineiss?"
+
+#: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
+msgid "Books and Guides"
+msgstr "Kirjat ja oppaat"
+
+#: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
+msgid "Books and Guides for Fedora users and developers"
+msgstr "Kirjoja ja oppaita Fedora-k?ytt?jille ja -kehitt?jille"
+
+#: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
+msgid "Critical Path (Base)"
+msgstr "Kriittinen polku (perus)"
+
+#: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
+msgid "Critical Path (GNOME)"
+msgstr "Kriittinen polku (Gnome)"
+
+#: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
+msgid "Directory Server"
+msgstr "Hakemistopalvelin"
+
+#: ../comps-f12.xml.in.h:88 ../comps-f13.xml.in.h:88
+msgid "Haskell"
+msgstr "Haskell"
+
+#: ../comps-f12.xml.in.h:123 ../comps-f13.xml.in.h:123
+msgid ""
+"LXDE is a lightweight X11 desktop environment designed for computers with "
+"low hardware specifications like netbooks, mobile devices or older computers."
+msgstr ""
+"LXDE on kevyt X11-ty?p?yt?ymp?rist?, joka on suunniteltu v?h?isill? "
+"laitteiston ominaisuuksilla varustetuille tietokoneille, kuten "
+"minil?pp?reille, mobiililaitteille ja vanhoille tietokoneille."
+
+#: ../comps-f12.xml.in.h:136 ../comps-f13.xml.in.h:136
+msgid "Machine and user identity servers."
+msgstr "Koneiden ja k?ytt?jien tunnistamiseen tarkoitettuja palvelimia"
+
+#: ../comps-f12.xml.in.h:147 ../comps-f13.xml.in.h:147
+msgid "Moblin Desktop Environment"
+msgstr "Moblin-ty?p?yt?ymp?rist?"
+
+#: ../comps-f12.xml.in.h:148 ../comps-f13.xml.in.h:148
+msgid "Moblin is a desktop environment for NetBook/NetTop/MID devices."
+msgstr ""
+"Moblin on minil?pp?reille, nettikoneille ja MID-laitteille tarkoitettu "
+"ty?p?yt?ymp?rist?."
+
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"
 msgstr "Sovelluksia moniin teht?viin"
 
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
+#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr "Tuki puhelinverkkoyhteyksille"
 
-#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23
+#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
@@ -1450,7 +1628,7 @@ msgstr ""
 "Gnome on tehokas, graafinen k?ytt?liittym?, joka sis?lt?? paneelin, "
 "ty?p?yd?n, j?rjestelm?kuvakkeet ja graafisen tiedostohallinnan."
 
-#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35
+#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:36
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
@@ -1458,7 +1636,7 @@ msgstr ""
 "KDE on tehokas, graafinen k?ytt?liittym?, joka sis?lt?? paneelin, ty?p?yd?n, "
 "j?rjestelm?kuvakkeet ja graafisen tiedostohallinnan."
 
-#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44
+#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:45
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
@@ -1466,11 +1644,11 @@ msgstr ""
 "Tekstinmuokkaimet mahdollistavat tiedostojen luomisen ja muokkamisen. N?m? "
 "pit?v?t sis?ll??n Emacsin ja Vi:n."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
+#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:49
 msgid "The XEmacs text editor."
 msgstr "XEmacs-tekstimuokkain."
 
-#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52
+#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:53
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
@@ -1478,44 +1656,47 @@ msgstr ""
 "N?m? ty?kalut mahdollistavat DocBook-dokumentaation luomisen ja niiden "
 "muuntamisen HTML:ksi, PDF:ksi, Postscriptiksi ja tekstiksi."
 
-#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62
+#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr "T?m? ryhm? on kokoelma verkkopalvelimia."
 
-#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63
+#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 "T?m? ryhm? sis?lt?? kokoelman ty?kaluja ja v?lineit? arabialaisiin "
 "ymp?rist?ihin."
 
-#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66
+#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 "T?m? ryhm? sis?lt?? kokoelman ty?kaluja ja v?lineit? heprealaisiin "
 "ymp?rist?ihin."
 
-#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67
+#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 "T?m? ryhm? sis?lt?? kokoelman ty?kaluja ja v?lineit? japanilaisiin "
 "ymp?rist?ihin."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
+#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:78
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: ../comps-el5.xml.in.h:65
+#: ../comps-el5.xml.in.h:66
 msgid ""
 "This group is a collection of tools and resources of Czech environments."
 msgstr ""
 "T?m? ryhm? sis?lt?? kokoelman ty?kaluja ja v?lineit? tsekkil?isiin "
 "ymp?rist?ihin."
 
-#~ msgid "Haskell"
-#~ msgstr "Haskell"
+#~ msgid "Eclipse"
+#~ msgstr "Eclipse"
+
+#~ msgid "The Eclipse Integrated Development Environment."
+#~ msgstr "Eclipse-ohjelmistokehitysymp?rist?."
 
 #~ msgid "British Support"
 #~ msgstr "Brittienglannin kielituki"
@@ -1628,9 +1809,6 @@ msgstr ""
 #~ msgid "KDE Desktop Environment"
 #~ msgstr "KDE-ty?p?yt?ymp?rist?"
 
-#~ msgid "Kernel Development"
-#~ msgstr "Ytimen kehitys"
-
 #~ msgid "Mozilla packages for the x86 platform"
 #~ msgstr "Mozilla-paketit x86-alustalle"
 



From sailer at fedoraproject.org  Mon Aug 31 20:57:44 2009
From: sailer at fedoraproject.org (sailer)
Date: Mon, 31 Aug 2009 20:57:44 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel .cvsignore, 1.4,
	1.5 mingw32-glibmm24.spec, 
	1.7, 1.8 sources, 1.4, 1.5 mingw32-glibmm24-nogunixio.patch, 1.2, NONE
Message-ID: <20090831205744.400CF11C0099@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11529

Modified Files:
	.cvsignore mingw32-glibmm24.spec sources 
Removed Files:
	mingw32-glibmm24-nogunixio.patch 
Log Message:
update to 2.21.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Aug 2009 15:13:29 -0000	1.4
+++ .cvsignore	31 Aug 2009 20:57:44 -0000	1.5
@@ -1,3 +1,4 @@
 glibmm-2.19.2.tar.bz2
 glibmm-2.20.0.tar.bz2
 glibmm-2.21.3.tar.bz2
+glibmm-2.21.4.tar.bz2


Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/mingw32-glibmm24.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-glibmm24.spec	31 Aug 2009 15:13:30 -0000	1.7
+++ mingw32-glibmm24.spec	31 Aug 2009 20:57:44 -0000	1.8
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glibmm24
-Version:        2.21.3
+Version:        2.21.4
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -14,7 +14,6 @@ License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/glibmm-%{version}.tar.bz2
-Patch0:         mingw32-glibmm24-nogunixio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,7 +41,6 @@ freely combined to quickly create comple
 
 %prep
 %setup -q -n glibmm-%{version}
-%patch0 -p0 -b .nogunixio
 
 %build
 %{_mingw32_configure} --disable-static
@@ -56,7 +54,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # Remove docs, duplicate native package.
 rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/glibmm-2.4
 rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp
-
+rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/glibmm-2.4/doctool/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,12 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc COPYING COPYING.tools
 %{_mingw32_bindir}/libgiomm-2.4-1.dll
-%{_mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll
 %{_mingw32_bindir}/libglibmm-2.4-1.dll
 %{_mingw32_libdir}/libgiomm-2.4.dll.a
 %{_mingw32_libdir}/libgiomm-2.4.la
-%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
-%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.la
 %{_mingw32_libdir}/libglibmm-2.4.dll.a
 %{_mingw32_libdir}/libglibmm-2.4.la
 %{_mingw32_libdir}/giomm-2.4
@@ -84,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.4-1
+- update to 2.21.4 match native package
+
 * Mon Aug 31 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.21.3-1
 - update to 2.21.3 match native package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Aug 2009 15:13:30 -0000	1.4
+++ sources	31 Aug 2009 20:57:44 -0000	1.5
@@ -1 +1 @@
-f9f7023f9bddc38f787853eff0a3aafe  glibmm-2.21.3.tar.bz2
+08be0712e2992a395ac9405376dbc392  glibmm-2.21.4.tar.bz2


--- mingw32-glibmm24-nogunixio.patch DELETED ---



From nucleo at fedoraproject.org  Mon Aug 31 21:04:41 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Mon, 31 Aug 2009 21:04:41 +0000 (UTC)
Subject: rpms/kvirc/F-10 .cvsignore, 1.5, 1.6 kvirc.spec, 1.4, 1.5 sources,
	1.5, 1.6 kvirc-flags.patch, 1.3, NONE
Message-ID: <20090831210441.9B54F11C0099@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/kvirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13236

Modified Files:
	.cvsignore kvirc.spec sources 
Removed Files:
	kvirc-flags.patch 
Log Message:
Added option for using cmake flags from environment variables


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Aug 2009 21:54:54 -0000	1.5
+++ .cvsignore	31 Aug 2009 21:04:41 -0000	1.6
@@ -1 +1 @@
-kvirc-20090830svn3436.tar.bz2
+kvirc-20090831svn3442.tar.bz2


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/kvirc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kvirc.spec	29 Aug 2009 21:54:54 -0000	1.4
+++ kvirc.spec	31 Aug 2009 21:04:41 -0000	1.5
@@ -1,19 +1,18 @@
-%define           rev 3436
-%define           pre 20090830svn%{rev}
+%define           rev 3442
+%define           pre 20090831svn%{rev}
 
 Name:             kvirc
 Version:          4.0.0
-Release:          0.14.%{pre}%{?dist}
+Release:          0.15.%{pre}%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
 URL:              http://kvirc.net/
 # The source for this package was pulled from upstream's vcs.
 # Use the following commands to generate the tarball:
-#  svn export -r 3436 https://svn.kvirc.de/svn/trunk/kvirc
-#  tar -cjf kvirc-20090830svn3436.tar.bz2 kvirc
+#  svn export -r 3442 https://svn.kvirc.de/svn/trunk/kvirc
+#  tar -cjf kvirc-20090831svn3442.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
-Patch0:           kvirc-flags.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -29,7 +28,6 @@ many IRC addicted developers around the 
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
 %{cmake}  \
@@ -40,7 +38,8 @@ many IRC addicted developers around the 
 -DWITHOUT_ESD=OFF \
 -DWITHOUT_OSS=OFF \
 -DWANT_COEXISTENCE=OFF \
--DWITH_PYTHON=YES \
+-DWITH_PYTHON=ON \
+-DUSE_ENV_FLAGS=ON \
 -DMANUAL_REVISION=%{rev}
 
 make %{?_smp_mflags}
@@ -131,8 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz
 
 %changelog
-* Sun Aug 30 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.14.20090830svn3436
-- patch for using standard compiler flags
+* Sun Aug 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.15.20090831svn3442
+- r3442: added option for using cmake flags from environment variables
+- Added -DUSE_ENV_FLAGS=ON for using default cmake flags
 
 * Sat Aug 29 2009 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.13.20090827svn3429
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Aug 2009 21:54:54 -0000	1.5
+++ sources	31 Aug 2009 21:04:41 -0000	1.6
@@ -1 +1 @@
-33fa9dadb090fb79faa49c6c950d5bdd  kvirc-20090830svn3436.tar.bz2
+48e1fd92e1aa24e2cb8c29ef649f35ac  kvirc-20090831svn3442.tar.bz2


--- kvirc-flags.patch DELETED ---



From overholt at fedoraproject.org  Mon Aug 31 21:12:36 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 21:12:36 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.15,1.16
Message-ID: <20090831211236.94C5711C0099@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15582

Modified Files:
	maven-doxia.spec 
Log Message:
* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.6.a10
- Add itext and plexus-cli BRs


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- maven-doxia.spec	28 Aug 2009 21:36:26 -0000	1.15
+++ maven-doxia.spec	31 Aug 2009 21:12:36 -0000	1.16
@@ -34,7 +34,7 @@
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.5.a10%{?dist}
+Release:        0.6.a10%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -66,6 +66,11 @@ BuildArch:      noarch
 BuildRequires:  java >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant, ant-nodeps
+BuildRequires:  itext >= 2.1.7-4
+BuildRequires:  plexus-cli >= 2.1.7-4
+%if %{with_maven}
+BuildRequires:  maven2 >= 0:2.0.4-9
+BuildRequires:  maven2-plugin-compiler
 %if %{with_maven}
 BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
@@ -243,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.6.a10
+- Add itext and plexus-cli BRs
+
 * Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.5.a10
 - Update to 1.0 alpha 10 courtesy of Deepak Bhole
 - Remove gcj support



From spot at fedoraproject.org  Mon Aug 31 21:19:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 31 Aug 2009 21:19:27 +0000 (UTC)
Subject: rpms/AcetoneISO2/devel .cvsignore, 1.7,
	1.8 AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch, 1.3,
	1.4 AcetoneISO2.spec, 1.12,
	1.13 acetoneiso2-2.0.3.2-desktop.patch, 1.1, 1.2 sources, 1.7, 1.8
Message-ID: <20090831211927.1E3D611C0099@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/AcetoneISO2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16941

Modified Files:
	.cvsignore AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch 
	AcetoneISO2.spec acetoneiso2-2.0.3.2-desktop.patch sources 
Log Message:
bump to 2.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Jul 2009 22:38:10 -0000	1.7
+++ .cvsignore	31 Aug 2009 21:19:26 -0000	1.8
@@ -1 +1 @@
-Acetoneiso_2.0.3.2.tar.gz
+acetoneiso_2.0.4.tar.gz

AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch:
 converter.h |    5 +++++
 1 file changed, 5 insertions(+)

Index: AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	1 Jul 2009 21:03:28 -0000	1.3
+++ AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch	31 Aug 2009 21:19:26 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h
---- acetoneiso_2.0.3/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
-+++ acetoneiso_2.0.3/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
+diff -up acetoneiso_2.0.4/acetoneiso/src/sources/converter.h.BAD acetoneiso_2.0.4/acetoneiso/src/sources/converter.h
+--- acetoneiso_2.0.4/acetoneiso/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
++++ acetoneiso_2.0.4/acetoneiso/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
 @@ -125,6 +125,7 @@ else {
  void acetoneiso::get_poweriso()
  {


Index: AcetoneISO2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/AcetoneISO2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- AcetoneISO2.spec	24 Jul 2009 14:59:15 -0000	1.12
+++ AcetoneISO2.spec	31 Aug 2009 21:19:26 -0000	1.13
@@ -1,11 +1,11 @@
 Name:		AcetoneISO2
-Version:	2.0.3.2
-Release:	3%{?dist}
+Version:	2.0.4
+Release:	1%{?dist}
 Summary:	CD/DVD Image Manipulator
 Group:		Applications/Archiving
 License:	GPLv3
 URL:		http://www.acetoneteam.org/
-Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/Acetoneiso_%{version}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/acetoneiso_%{version}.tar.gz
 Patch0:		acetoneiso2-2.0.3.2-desktop.patch
 Patch1:		AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,16 +31,18 @@ AcetoneISO2: The CD/DVD image manipulato
 - Restore a lost CUE file of *.bin *.img
 
 %prep
-%setup -q -n Acetoneiso_%{version}
+%setup -q -n acetoneiso_%{version}
 %patch0 -p1
 %patch1 -p1
 
 %build
+cd acetoneiso
 qmake-qt4
 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT 
+cd acetoneiso
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT 
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Mon Aug 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.4-1
+- Update to 2.0.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

acetoneiso2-2.0.3.2-desktop.patch:
 AcetoneISO.desktop |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: acetoneiso2-2.0.3.2-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/acetoneiso2-2.0.3.2-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- acetoneiso2-2.0.3.2-desktop.patch	23 Jul 2009 22:38:10 -0000	1.1
+++ acetoneiso2-2.0.3.2-desktop.patch	31 Aug 2009 21:19:26 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop.BAD Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop
---- Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop.BAD	2009-07-23 18:30:22.496042966 -0400
-+++ Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop	2009-07-23 18:30:43.351041731 -0400
+diff -up acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop
+--- acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop.BAD	2009-07-23 18:30:22.496042966 -0400
++++ acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop	2009-07-23 18:30:43.351041731 -0400
 @@ -2,9 +2,9 @@
  Categories=Qt;KDE;Application;AudioVideo;DiscBurning;
  Encoding=UTF-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Jul 2009 22:38:10 -0000	1.7
+++ sources	31 Aug 2009 21:19:26 -0000	1.8
@@ -1 +1 @@
-4d6724e134280f8d1b92f4b9fb1579f7  Acetoneiso_2.0.3.2.tar.gz
+e0036a7a756e4d7e4a1fa8f666c25389  acetoneiso_2.0.4.tar.gz



From salimma at fedoraproject.org  Mon Aug 31 21:20:45 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 31 Aug 2009 21:20:45 +0000 (UTC)
Subject: rpms/banshee/devel banshee-clutter10.patch, NONE,
	1.1 banshee-make-git-snapshot.sh, NONE, 1.1 banshee-noconf.patch,
	NONE, 1.1 banshee.spec, 1.79, 1.80
Message-ID: <20090831212045.F193211C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17370

Modified Files:
	banshee.spec 
Added Files:
	banshee-clutter10.patch banshee-make-git-snapshot.sh 
	banshee-noconf.patch 
Log Message:
* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.2.git20090831%{?dist}
- Build with clutter support

* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.1.git20090831%{?dist}
- Update to latest snapshot


banshee-clutter10.patch:
 libbanshee.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE banshee-clutter10.patch ---
--- banshee/build/m4/banshee/libbanshee.m4.clutter10	2009-08-18 23:27:11.097823106 -0400
+++ banshee/build/m4/banshee/libbanshee.m4	2009-08-31 17:08:21.858796118 -0400
@@ -26,7 +26,7 @@
 	fi
 
 	PKG_CHECK_MODULES(CLUTTER,
-		clutter-0.9 >= 0.9.5,
+		clutter-1.0,
 		enable_clutter=yes, enable_clutter=no)
 
 	if test "x$enable_clutter" = "xyes"; then


--- NEW FILE banshee-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./banshee-make-git-snapshot.sh [COMMIT] [DATE]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local banshee repo to reduce clone time.

if [ -z $2 ]; then
  DATE=`date +%Y%m%d`
else
  DATE=$2
fi

DIRNAME="banshee-$DATE"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.gnome.org/banshee $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME


banshee-noconf.patch:
 autogen.sh |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE banshee-noconf.patch ---
--- banshee/autogen.sh.noconf	2009-08-18 23:27:11.088823117 -0400
+++ banshee/autogen.sh	2009-08-31 15:51:07.340801936 -0400
@@ -77,5 +77,3 @@
 	echo "WARNING: I am going to run configure without any arguments."
 fi
 
-run ./configure --enable-maintainer-mode $@
-


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- banshee.spec	27 Aug 2009 07:05:27 -0000	1.79
+++ banshee.spec	31 Aug 2009 21:20:45 -0000	1.80
@@ -1,18 +1,32 @@
 %define mono_shared %{_builddir}/%{?buildsubdir}
 
+%define gitdate   20090831
+%define gitcommit f5c708c3adf2b30a26c62ca5f266ff0b5448d458
+
 Name:    banshee
-Version: 1.5.0
-Release: 3%{?dist}
+Version: 1.5.1
+Release: 0.2.git%{gitdate}%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
+
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
-Source0: http://download.banshee-project.org/banshee/unstable/%{version}/banshee-1-%{version}.tar.bz2
+# 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
 Source1: README.Fedora
+# for snapshots only: don't run configure at the end of autogen.sh
+Patch0:  %{name}-noconf.patch
+# clutter's .pc filename has changed
+Patch1:  %{name}-clutter10.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
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+
+# Snapshots only
+BuildRequires: autoconf automake libtool
 
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
@@ -41,26 +55,25 @@ 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
-# clutter >= 0.9.3 not in F-11 yet
-#BuildRequires: clutter-devel
+BuildRequires: mono-nunit-devel
 
-# monotorrent-dbus not in Fedora yet
 #BuildRequires: monotorrent-dbus-devel
-BuildRequires: mono-nunit-devel
-%endif
+%if %{?fedora} >= 12
+# needs clutter >= 0.9.3; F-11 has 0.8.8
+BuildRequires: clutter-devel
+%endif # F-12 and up
 
-BuildRequires: desktop-file-utils
+%endif # F-11 and up
 
-# bug 484996: until f-spot stops "providing" mono-addins, we have
-# to explicitly depend on it
-Requires:      mono-addins
+BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
 Requires:      libmtp
@@ -113,11 +126,14 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1-%{version}
+%setup -q -n %{name}-%{gitdate}
+%patch0 -p1 -b .noconf
+%patch1 -p1 -b .clutter10
 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 \
@@ -170,7 +186,8 @@ fi
 
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
+# ChangeLog not in snapshot
+%doc COPYING AUTHORS README README.Fedora NEWS
 %{_bindir}/banshee-1
 %exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
@@ -199,6 +216,12 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.2.git20090831%{?dist}
+- Build with clutter support
+
+* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.1.git20090831%{?dist}
+- Update to latest snapshot
+
 * Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
 - Rebuild for boo update
 - Remove unused dependency on nautilus-cd-burner



From dwalsh at fedoraproject.org  Mon Aug 31 21:27:32 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 31 Aug 2009 21:27:32 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.120,
	1.121 setroubleshoot.spec, 1.160, 1.161 sources, 1.133, 1.134
Message-ID: <20090831212732.AE53211C0099@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18825

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.24-1
- Fix permissive fix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- .cvsignore	26 Aug 2009 15:00:50 -0000	1.120
+++ .cvsignore	31 Aug 2009 21:27:32 -0000	1.121
@@ -37,3 +37,4 @@ setroubleshoot-2.2.20.tar.gz
 setroubleshoot-2.2.21.tar.gz
 setroubleshoot-2.2.22.tar.gz
 setroubleshoot-2.2.23.tar.gz
+setroubleshoot-2.2.24.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- setroubleshoot.spec	31 Aug 2009 13:18:16 -0000	1.160
+++ setroubleshoot.spec	31 Aug 2009 21:27:32 -0000	1.161
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.23
-Release: 3%{?dist}
+Version: 2.2.24
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -75,7 +75,7 @@ to user preference. The same tools can b
 %{pkgpythondir}/gui_utils.py*
 %{pkgpythondir}/run_cmd.py*
 %{_bindir}/seapplet
-%config %{_datadir}/PolicyKit/policy/org.fedoraproject.setroubleshootfixit.policy
+%config %{_datadir}/polkit-1/actions/org.fedoraproject.setroubleshootfixit.policy
 %config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
 
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.24-1
+- Fix permissive fix
+
 * Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.23-3
 - Add PackageKit requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- sources	26 Aug 2009 15:00:50 -0000	1.133
+++ sources	31 Aug 2009 21:27:32 -0000	1.134
@@ -1 +1 @@
-672d2bd3dfe6f29129f66e8180f21a42  setroubleshoot-2.2.23.tar.gz
+bc82288215e2321901aac5da32caa587  setroubleshoot-2.2.24.tar.gz



From dwalsh at fedoraproject.org  Mon Aug 31 21:27:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 31 Aug 2009 21:27:51 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.183, 1.184 nsadiff, 1.20,
	1.21 policy-F12.patch, 1.69, 1.70 selinux-policy.spec, 1.909,
	1.910 sources, 1.202, 1.203
Message-ID: <20090831212751.3237C11C0099@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18971

Modified Files:
	.cvsignore nsadiff policy-F12.patch selinux-policy.spec 
	sources 
Log Message:
* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-1
- Update to upsteam



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- .cvsignore	28 Aug 2009 20:55:15 -0000	1.183
+++ .cvsignore	31 Aug 2009 21:27:50 -0000	1.184
@@ -187,3 +187,4 @@ serefpolicy-3.6.28.tgz
 setroubleshoot-2.2.21.tar.gz
 config.tgz
 serefpolicy-3.6.29.tgz
+serefpolicy-3.6.30.tgz


Index: nsadiff
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/nsadiff,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nsadiff	28 Aug 2009 20:55:15 -0000	1.20
+++ nsadiff	31 Aug 2009 21:27:50 -0000	1.21
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.29 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.30 > /tmp/diff

policy-F12.patch:
 Makefile                                  |    2 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/certwatch.te         |    1 
 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              |    7 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |   19 
 policy/modules/admin/readahead.te         |    3 
 policy/modules/admin/rpm.fc               |   17 
 policy/modules/admin/rpm.if               |  177 +++
 policy/modules/admin/rpm.te               |   65 +
 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         |    4 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   30 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/apps/awstats.te            |    4 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cdrecord.te           |    4 
 policy/modules/apps/cpufreqselector.te    |    5 
 policy/modules/apps/gitosis.fc            |    4 
 policy/modules/apps/gitosis.if            |   96 ++
 policy/modules/apps/gitosis.te            |   36 
 policy/modules/apps/gnome.fc              |   12 
 policy/modules/apps/gnome.if              |  170 +++
 policy/modules/apps/gnome.te              |   93 +-
 policy/modules/apps/gpg.if                |    2 
 policy/modules/apps/gpg.te                |   16 
 policy/modules/apps/java.fc               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   12 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   66 +
 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            |   13 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  313 ++++++
 policy/modules/apps/nsplugin.te           |  288 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 ++
 policy/modules/apps/openoffice.te         |   11 
 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            |  167 +++
 policy/modules/apps/sandbox.te            |  302 ++++++
 policy/modules/apps/screen.if             |   31 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   76 +
 policy/modules/apps/seunshare.te          |   37 
 policy/modules/apps/vmware.fc             |    1 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/webalizer.te          |    2 
 policy/modules/apps/wine.fc               |   23 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   23 
 policy/modules/kernel/corecommands.fc     |   24 
 policy/modules/kernel/corecommands.if     |    1 
 policy/modules/kernel/corenetwork.te.in   |   29 
 policy/modules/kernel/devices.fc          |    5 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  132 ++
 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       |  173 +++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   39 
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    2 
 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             |  124 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  392 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |   13 
 policy/modules/services/abrt.if           |  126 ++
 policy/modules/services/abrt.te           |  124 ++
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 policy/modules/services/amavis.te         |    2 
 policy/modules/services/apache.fc         |   37 
 policy/modules/services/apache.if         |  371 +++++--
 policy/modules/services/apache.te         |  422 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    8 
 policy/modules/services/certmaster.te     |    2 
 policy/modules/services/clamav.te         |   12 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |   13 
 policy/modules/services/cron.if           |  202 +++-
 policy/modules/services/cron.te           |  149 ++-
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   28 
 policy/modules/services/cvs.te            |    1 
 policy/modules/services/dbus.fc           |    5 
 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      |   50 -
 policy/modules/services/dnsmasq.te        |    8 
 policy/modules/services/dovecot.te        |    7 
 policy/modules/services/exim.te           |    4 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 policy/modules/services/gnomeclock.fc     |    3 
 policy/modules/services/gnomeclock.if     |   69 +
 policy/modules/services/gnomeclock.te     |   50 +
 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            |   47 -
 policy/modules/services/hddtemp.fc        |    4 
 policy/modules/services/hddtemp.if        |   38 
 policy/modules/services/hddtemp.te        |   40 
 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/modemmanager.fc   |    2 
 policy/modules/services/modemmanager.if   |   43 
 policy/modules/services/modemmanager.te   |   46 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   52 -
 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 |   13 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  114 ++
 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           |   11 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  142 +++
 policy/modules/services/nslcd.te          |   48 +
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    7 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   18 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |   13 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/policykit.fc      |   10 
 policy/modules/services/policykit.if      |   49 +
 policy/modules/services/policykit.te      |   60 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  136 ++
 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            |   12 
 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/razor.fc          |    1 
 policy/modules/services/razor.if          |   42 
 policy/modules/services/razor.te          |   32 
 policy/modules/services/ricci.te          |    5 
 policy/modules/services/rpc.if            |    6 
 policy/modules/services/rpc.te            |   12 
 policy/modules/services/rpcbind.if        |   20 
 policy/modules/services/rsync.te          |   23 
 policy/modules/services/rtkit_daemon.fc   |    2 
 policy/modules/services/rtkit_daemon.if   |   63 +
 policy/modules/services/rtkit_daemon.te   |   38 
 policy/modules/services/samba.fc          |    4 
 policy/modules/services/samba.if          |  104 ++
 policy/modules/services/samba.te          |   87 +
 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 |   84 +
 policy/modules/services/setroubleshoot.te |   74 +
 policy/modules/services/shorewall.fc      |   12 
 policy/modules/services/shorewall.if      |  166 +++
 policy/modules/services/shorewall.te      |   95 ++
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/spamassassin.fc   |   14 
 policy/modules/services/spamassassin.if   |   68 +
 policy/modules/services/spamassassin.te   |  129 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   70 -
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sysstat.te        |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   11 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  271 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  671 +++++++++++---
 policy/modules/services/xserver.te        |  307 +++++-
 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        |   39 
 policy/modules/system/clock.te            |    8 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |   67 -
 policy/modules/system/getty.te            |   16 
 policy/modules/system/hostname.te         |   22 
 policy/modules/system/init.fc             |    6 
 policy/modules/system/init.if             |  156 +++
 policy/modules/system/init.te             |  268 ++++-
 policy/modules/system/ipsec.fc            |    2 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   97 +-
 policy/modules/system/iptables.fc         |   11 
 policy/modules/system/iptables.te         |    5 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/kdump.fc            |    8 
 policy/modules/system/kdump.if            |  111 ++
 policy/modules/system/kdump.te            |   38 
 policy/modules/system/libraries.fc        |  154 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   16 
 policy/modules/system/locallogin.te       |   74 -
 policy/modules/system/logging.fc          |   11 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   34 
 policy/modules/system/lvm.te              |   53 -
 policy/modules/system/miscfiles.if        |   19 
 policy/modules/system/modutils.te         |  168 ++-
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.te            |   75 +
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |   17 
 policy/modules/system/selinuxutil.if      |  288 ++++++
 policy/modules/system/selinuxutil.te      |  228 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |  107 +-
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 policy/modules/system/udev.te             |   38 
 policy/modules/system/unconfined.fc       |   15 
 policy/modules/system/unconfined.if       |  446 ---------
 policy/modules/system/unconfined.te       |  224 ----
 policy/modules/system/userdomain.fc       |    6 
 policy/modules/system/userdomain.if       | 1393 ++++++++++++++++++++++--------
 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 
 312 files changed, 14601 insertions(+), 2938 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.69 -r 1.70 policy-F12.patchIndex: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-F12.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- policy-F12.patch	31 Aug 2009 17:06:58 -0000	1.69
+++ policy-F12.patch	31 Aug 2009 21:27:50 -0000	1.70
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.29/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.30/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.29/Makefile	2009-08-31 13:03:03.000000000 -0400
++++ serefpolicy-3.6.30/Makefile	2009-08-31 13:40:47.000000000 -0400
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,59 +10,9 @@ diff -b -B --ignore-all-space --exclude-
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-3.6.29/man/man8/rsync_selinux.8
---- nsaserefpolicy/man/man8/rsync_selinux.8	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/man/man8/rsync_selinux.8	2009-08-31 09:47:15.000000000 -0400
-@@ -21,10 +21,18 @@
- .TP
- chcon -t public_content_t /var/rsync
- .TP
--If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file.
--.EX
--/etc/selinux/POLICYTYPE/contexts/files/file_contexts.local
--/var/rsync(/.*)? system_u:object_r:public_content_t
-+.TP
-+To make this change permanent (survive a relabel), use the semanage command to add the change to file context configuration:
-+.TP
-+semanage fcontext -a -t public_content_t "/var/rsync(/.*)?"
-+.TP
-+This command adds the following entry to /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local:
-+.TP
-+/var/rsync(/.*)? system_u:object_r:publix_content_t:s0
-+.TP
-+Run the restorecon command to apply the changes:
-+.TP
-+restorecon -R -v /var/rsync/
- .EE
- 
- .SH SHARING FILES
-@@ -41,4 +49,4 @@
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
- .SH "SEE ALSO"
--selinux(8), rsync(1), chcon(1), setsebool(8)
-+selinux(8), rsync(1), chcon(1), setsebool(8), semanage(8)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.29/man/man8/samba_selinux.8
---- nsaserefpolicy/man/man8/samba_selinux.8	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/man/man8/samba_selinux.8	2009-08-31 09:47:15.000000000 -0400
-@@ -20,7 +20,7 @@
- .TP
- This command adds the following entry to /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local:
- .TP
--/var/eng(/.*)? system_u:object_r:samba_share_t
-+/var/eng(/.*)? system_u:object_r:samba_share_t:s0
- .TP
- Run the restorecon command to apply the changes:
- .TP
-@@ -53,4 +53,4 @@
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
- .SH "SEE ALSO"
--selinux(8), samba(7), chcon(1), setsebool(8)
-+selinux(8), samba(7), chcon(1), setsebool(8), semanage(8)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.29/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.30/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.29/policy/global_tunables	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/global_tunables	2009-08-31 13:40:47.000000000 -0400
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -98,9 +48,9 @@ diff -b -B --ignore-all-space --exclude-
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.29/policy/mcs
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.30/policy/mcs
 --- nsaserefpolicy/policy/mcs	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/mcs	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/mcs	2009-08-31 13:40:47.000000000 -0400
 @@ -66,8 +66,8 @@
  #
  # Note that getattr on files is always permitted.
@@ -134,9 +84,9 @@ 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/anaconda.te serefpolicy-3.6.29/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.30/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/anaconda.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/anaconda.te	2009-08-31 13:40:47.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -154,9 +104,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.29/policy/modules/admin/certwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.30/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/certwatch.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/certwatch.te	2009-08-31 13:40:47.000000000 -0400
 @@ -36,6 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -165,17 +115,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/dmesg.fc serefpolicy-3.6.29/policy/modules/admin/dmesg.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.6.30/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/dmesg.fc	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/dmesg.fc	2009-08-31 13:40:47.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.29/policy/modules/admin/dmesg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.6.30/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/dmesg.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/dmesg.te	2009-08-31 13:40:47.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -210,9 +160,9 @@ diff -b -B --ignore-all-space --exclude-
  # for when /usr is not mounted:
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.29/policy/modules/admin/firstboot.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.6.30/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/firstboot.te	2009-08-31 09:47:15.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/admin/firstboot.te	2009-08-31 13:40:47.000000000 -0400
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -235,65 +185,9 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.if serefpolicy-3.6.29/policy/modules/admin/kismet.if
---- nsaserefpolicy/policy/modules/admin/kismet.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/kismet.if	2009-08-31 09:47:15.000000000 -0400
-@@ -16,6 +16,7 @@
- 	')
- 
- 	domtrans_pattern($1, kismet_exec_t, kismet_t)
-+	allow kismet_t $1:process signull;
- ')
- 
- ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.29/policy/modules/admin/kismet.te
---- nsaserefpolicy/policy/modules/admin/kismet.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/admin/kismet.te	2009-08-31 09:47:15.000000000 -0400
-@@ -17,6 +17,9 @@
- type kismet_tmp_t;
- files_tmp_file(kismet_tmp_t)
- 
-+type kismet_tmpfs_t;
-+files_tmp_file(kismet_tmpfs_t)
-+
- type kismet_var_lib_t;
- files_type(kismet_var_lib_t)
- 
-@@ -44,6 +47,10 @@
- manage_files_pattern(kismet_t, kismet_tmp_t, kismet_tmp_t)
- files_tmp_filetrans(kismet_t, kismet_tmp_t, { file dir })
- 
-+manage_dirs_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
-+manage_files_pattern(kismet_t, kismet_tmpfs_t, kismet_tmpfs_t)
-+fs_tmpfs_filetrans(kismet_t, kismet_tmpfs_t, file)
-+
- allow kismet_t kismet_var_lib_t:file manage_file_perms;
- allow kismet_t kismet_var_lib_t:dir manage_dir_perms;
- files_var_lib_filetrans(kismet_t, kismet_var_lib_t, { file dir })
-@@ -53,6 +60,7 @@
- files_pid_filetrans(kismet_t, kismet_var_run_t, { file dir })
- 
- kernel_search_debugfs(kismet_t)
-+kernel_read_system_state(kismet_t)
- 
- corecmd_exec_bin(kismet_t)
- 
-@@ -74,3 +82,12 @@
- miscfiles_read_localization(kismet_t)
- 
- userdom_use_user_terminals(kismet_t)
[...4172 lines suppressed...]
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1557,6 +1697,8 @@
+@@ -1577,6 +1719,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27521,7 +27200,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1650,6 +1792,7 @@
+@@ -1670,6 +1814,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27529,7 +27208,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)
  ')
-@@ -1777,19 +1920,32 @@
+@@ -1797,19 +1942,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -27569,7 +27248,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1824,6 +1980,7 @@
+@@ -1844,6 +2002,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -27577,16 +27256,36 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2371,7 +2528,7 @@
+@@ -2391,27 +2550,7 @@
  
  ########################################
  ## <summary>
 -##	Read user tmpfs files.
+-## </summary>
+-## <param name="domain">
+-##	<summary>
+-##	Domain allowed access.
+-##	</summary>
+-## </param>
+-#
+-interface(`userdom_read_user_tmpfs_files',`
+-	gen_require(`
+-		type user_tmpfs_t;
+-	')
+-
+-	read_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.
 +##	Read/Write user tmpfs files.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2725,11 +2882,32 @@
+@@ -2765,11 +2904,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -27621,7 +27320,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2857,7 +3035,25 @@
+@@ -2897,7 +3057,25 @@
  		type user_tmp_t;
  	')
  
@@ -27648,7 +27347,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2894,6 +3090,7 @@
+@@ -2934,6 +3112,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -27656,7 +27355,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3024,3 +3221,559 @@
+@@ -3064,3 +3243,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -28216,9 +27915,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow $1 user_tmp_t:file { getattr append };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.29/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/userdomain.te	2009-08-31 09:47:16.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.30/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/userdomain.te	2009-08-31 15:25:54.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -28247,7 +27946,7 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow user to r/w files on filesystems
  ## that do not have extended attributes (FAT, CDROM, FLOPPY)
  ## </p>
-@@ -52,11 +38,20 @@
+@@ -54,11 +40,20 @@
  # all user domains
  attribute userdomain;
  
@@ -28270,7 +27969,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)
-@@ -70,6 +65,7 @@
+@@ -72,6 +67,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 };
@@ -28278,7 +27977,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)
-@@ -95,3 +91,25 @@
+@@ -97,3 +93,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)
@@ -28304,9 +28003,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.29/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.30/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/xen.fc	2009-08-31 09:47:16.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/xen.fc	2009-08-31 13:40:47.000000000 -0400
 @@ -1,5 +1,7 @@
  /dev/xen/tapctrl.*	-p	gen_context(system_u:object_r:xenctl_t,s0)
  
@@ -28334,9 +28033,9 @@ diff -b -B --ignore-all-space --exclude-
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.29/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.30/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/xen.if	2009-08-31 09:47:16.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/xen.if	2009-08-31 13:40:47.000000000 -0400
 @@ -71,6 +71,8 @@
  	')
  
@@ -28387,9 +28086,9 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.29/policy/modules/system/xen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.30/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.29/policy/modules/system/xen.te	2009-08-31 09:47:16.000000000 -0400
++++ serefpolicy-3.6.30/policy/modules/system/xen.te	2009-08-31 13:40:47.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28687,9 +28386,9 @@ diff -b -B --ignore-all-space --exclude-
 +manage_sock_files_pattern(evtchnd_t,evtchnd_var_run_t,evtchnd_var_run_t)
 +files_pid_filetrans(evtchnd_t, evtchnd_var_run_t, { file sock_file dir })
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.29/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.30/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/support/obj_perm_sets.spt	2009-08-31 09:47:16.000000000 -0400
++++ serefpolicy-3.6.30/policy/support/obj_perm_sets.spt	2009-08-31 13:40:47.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`setattr_file_perms',`{ setattr }')
  define(`read_file_perms',`{ getattr open read lock ioctl }')
@@ -28722,9 +28421,9 @@ diff -b -B --ignore-all-space --exclude-
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.29/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.30/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.29/policy/users	2009-08-31 09:47:16.000000000 -0400
++++ serefpolicy-3.6.30/policy/users	2009-08-31 13:40:47.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -p -r1.909 -r1.910
--- selinux-policy.spec	31 Aug 2009 13:39:37 -0000	1.909
+++ selinux-policy.spec	31 Aug 2009 21:27:50 -0000	1.910
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.29
-Release: 2%{?dist}
+Version: 3.6.30
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.30-1
+- Update to upsteam
+
 * Mon Aug 31 2009 Dan Walsh <dwalsh at redhat.com> 3.6.29-2
 - Allow gssd to send signals to users
 - Fix duplicate label for apache content


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- sources	28 Aug 2009 20:55:16 -0000	1.202
+++ sources	31 Aug 2009 21:27:50 -0000	1.203
@@ -1,2 +1,2 @@
 3651679c4b12a31d2ba5f4305bba5540  config.tgz
-0f3289e6d734d2152f4fcb97ff2af13d  serefpolicy-3.6.29.tgz
+454029dae056657855a1c54b283f34ac  serefpolicy-3.6.30.tgz



From dnglaze at fedoraproject.org  Mon Aug 31 21:40:11 2009
From: dnglaze at fedoraproject.org (Dean Glazeski)
Date: Mon, 31 Aug 2009 21:40:11 +0000 (UTC)
Subject: rpms/openocd/devel import.log, NONE, 1.1 openocd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831214011.43F7D11C0498@cvs1.fedora.phx.redhat.com>

Author: dnglaze

Update of /cvs/pkgs/rpms/openocd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21008/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log openocd.spec 
Log Message:
* Mon Aug 31 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-4
- Initial import into devel of OpenOCD package.
- Review request is Bug 502130



--- NEW FILE import.log ---
openocd-0_2_0-4_fc11:HEAD:openocd-0.2.0-4.fc11.src.rpm:1251754550


--- NEW FILE openocd.spec ---
Name:		openocd
Version:	0.2.0
Release:	4%{?dist}
Summary:	Debugging, in-system programming and boundary-scan testing for embedded devices

Group:		Development/Tools
License:	GPLv2
URL:		http://openocd.berlios.de/web/
Source0:	http://prdownload.berlios.de/openocd/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	chrpath, libftdi-devel
Requires(post):	info
Requires(preun): info

%description
The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming 
and boundary-scan testing for embedded devices.  Various different boards, 
targets, and interfaces are supported to ease development time.

Install OpenOCD if you are looking for an open source solution for hardware 
debugging.

%prep
%setup -q
cd doc
iconv -f iso8859-1 -t utf-8 openocd.info > openocd.info.conv
mv -f openocd.info.conv openocd.info

%build
%configure \
  --disable-werror \
  --enable-static \
  --disable-shared \
  --enable-parport \
  --enable-parport_ppdev \
  --enable-ft2232_libftdi \
  --enable-ep93xx \
  --enable-at91rm9200 \
  --enable-usbprog \
  --enable-presto_libftdi \
  --enable-jlink \
  --enable-vsllink \
  --enable-rlink \
  --enable-dummy \
  --enable-gw16012 \
  --enable-amtjtagaccel \
  --enable-arm-jtag-ew
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -f %{buildroot}/%{_infodir}/dir
rm -f %{buildroot}/%{_libdir}/libopenocd.*
chrpath --delete %{buildroot}/%{_bindir}/openocd

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ]; then
	/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README COPYING AUTHORS ChangeLog NEWS TODO
%doc %{_datadir}/%{name}/contrib/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/scripts
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_infodir}/%{name}.info.gz
%{_mandir}/man1/*

%changelog
* Sat Aug 22 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-4
- Fixed duplicate file warnings for RPM build

* Fri Aug 21 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-3
- Updated spec file to match with suggestions from the review request
  (Bug 502130)
- Changed back to static library but removed the library from the distribution

* Fri Aug 14 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-2
- Switched to a shared object instead of a static library for the installation
  and added ldconfig commands
- Added some interfaces that were added to OpenOCD since 0.1.0

* Sat Aug 08 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-1
- Updated for new OpenOCD release

* Sat Jul 18 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-3
- Fixed the website URL and source0 URL

* Wed Jul 01 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-2
- Added some suggestions from package review (Bug 502130)
- Errors produced by RPM lint can be ignored (Bug 502112)

* Tue Mar 17 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-1
- Created initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openocd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:26:32 -0000	1.1
+++ .cvsignore	31 Aug 2009 21:40:10 -0000	1.2
@@ -0,0 +1 @@
+openocd-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openocd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:26:32 -0000	1.1
+++ sources	31 Aug 2009 21:40:11 -0000	1.2
@@ -0,0 +1 @@
+acc558613acaaf5633730072bc64e029  openocd-0.2.0.tar.gz



From behdad at fedoraproject.org  Mon Aug 31 21:41:48 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 31 Aug 2009 21:41:48 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.45, 1.46 fontconfig.spec, 1.137,
	1.138 sources, 1.49, 1.50
Message-ID: <20090831214148.4073F11C0099@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23555

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Mon Aug 31 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.2-1 
- Update to 2.7.2 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	24 Jun 2009 19:25:00 -0000	1.45
+++ .cvsignore	31 Aug 2009 21:41:48 -0000	1.46
@@ -1 +1 @@
-fontconfig-2.7.0.tar.gz
+fontconfig-2.7.2.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- fontconfig.spec	27 Jul 2009 22:17:26 -0000	1.137
+++ fontconfig.spec	31 Aug 2009 21:41:48 -0000	1.138
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.7.1
+Version: 2.7.2
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -131,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 31 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.2-1
+- Update to 2.7.2
+
 * Mon Jul  27 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.1-1
 - Update to 2.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	27 Jul 2009 22:17:26 -0000	1.49
+++ sources	31 Aug 2009 21:41:48 -0000	1.50
@@ -1 +1 @@
-41024d11765acdd7520d1f5458e751db  fontconfig-2.7.1.tar.gz
+8d61fa6835c7f4c2398b7f2ee2feb526  fontconfig-2.7.2.tar.gz



From behdad at fedoraproject.org  Mon Aug 31 21:42:25 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 31 Aug 2009 21:42:25 +0000 (UTC)
Subject: rpms/fontconfig/F-11 fontconfig.spec,1.133,1.134 sources,1.47,1.48
Message-ID: <20090831214225.ACAC311C0099@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24114

Modified Files:
	fontconfig.spec sources 
Log Message:
* Mon Aug 31 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.2-1 
- Update to 2.7.2 



Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-11/fontconfig.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- fontconfig.spec	27 Jul 2009 22:15:09 -0000	1.133
+++ fontconfig.spec	31 Aug 2009 21:42:25 -0000	1.134
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.7.1
+Version: 2.7.2
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -131,6 +131,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Mon Aug 31 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.2-1
+- Update to 2.7.2
+
 * Mon Jul 27 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.7.1-1
 - Update to 2.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	27 Jul 2009 22:15:09 -0000	1.47
+++ sources	31 Aug 2009 21:42:25 -0000	1.48
@@ -1 +1 @@
-41024d11765acdd7520d1f5458e751db  fontconfig-2.7.1.tar.gz
+8d61fa6835c7f4c2398b7f2ee2feb526  fontconfig-2.7.2.tar.gz



From acme at fedoraproject.org  Mon Aug 31 21:49:33 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Mon, 31 Aug 2009 21:49:33 +0000 (UTC)
Subject: rpms/tuna/F-12 import.log, NONE, 1.1 tuna.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831214933.2C8AB11C0099@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/tuna/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27551/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tuna.spec 
Log Message:
First commit



--- NEW FILE import.log ---
tuna-0_9-3_fc11:F-12:tuna-0.9-3.fc11.src.rpm:1251755325


--- NEW FILE tuna.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name: tuna
Version: 0.9
Release: 3%{?dist}
License: GPLv2
Summary: Application tuning GUI & command line utility
Group: Applications/System
Source: http://userweb.kernel.org/~acme/tuna/%{name}-%{version}.tar.bz2
URL: http://userweb.kernel.org/~acme/tuna/
BuildArch: noarch
BuildRequires: python-devel, gettext
Requires: python-ethtool
Requires: python-linux-procfs >= 0.4.2
Requires: python-schedutils >= 0.2
# This really should be a Suggests...
# Requires: python-inet_diag
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
Provides interface for changing scheduler and IRQ tunables, at whole CPU and at
per thread/IRQ level. Allows isolating CPUs for use by a specific application
and moving threads and interrupts to a CPU by just dragging and dropping them.
Operations can be done on CPU sockets, understanding CPU topology.

Can be used as a command line utility without requiring the GUI libraries to be
installed.

%package -n oscilloscope
Summary: Generic graphical signal plotting tool
Group: Applications/System
Requires: python-matplotlib
Requires: python-numeric
Requires: pygtk2
Requires: tuna = %{version}-%{release}

%description -n oscilloscope
Plots stream of values read from standard input on the screen together with
statistics and a histogram.

Allows to instantly see how a signal generator, such as cyclictest, signaltest
or even ping, reacts when, for instance, its scheduling policy or real time
priority is changed, be it using tuna or plain chrt & taskset.

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads}
install -p -m644 tuna/tuna_gui.glade %{buildroot}/%{_datadir}/tuna/
install -p -m755 tuna-cmd.py %{buildroot}/%{_bindir}/tuna
install -p -m755 oscilloscope-cmd.py %{buildroot}/%{_bindir}/oscilloscope
install -p -m644 help/kthreads/* %{buildroot}/%{_datadir}/tuna/help/kthreads/

# l10n-ed message catalogues
for lng in `cat po/LINGUAS`; do
        po=po/"$lng.po"
        mkdir -p %{buildroot}/%{_datadir}/locale/${lng}/LC_MESSAGES
        msgfmt $po -o %{buildroot}/%{_datadir}/locale/${lng}/LC_MESSAGES/%{name}.mo
done

%find_lang %name

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog
%if "%{python_ver}" >= "2.5"
%{python_sitelib}/*.egg-info
%endif
%{_bindir}/tuna
%{_datadir}/tuna/
%{python_sitelib}/tuna/

%files -n oscilloscope
%defattr(-,root,root,-)
%{_bindir}/oscilloscope
%doc docs/oscilloscope+tuna.html
%doc docs/oscilloscope+tuna.pdf

%changelog
* Wed Aug 26 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-3
- Rewrite the oscilloscope package summary
- Remove the shebang in tuna/oscilloscope.py

* Mon Aug 17 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-2
- Use install -p
- Add BuildRequires for gettext

* Fri Jul 10 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-1
- Fedora package reviewing changes: introduce ChangeLog file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 18:50:12 -0000	1.1
+++ .cvsignore	31 Aug 2009 21:49:32 -0000	1.2
@@ -0,0 +1 @@
+tuna-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:50:12 -0000	1.1
+++ sources	31 Aug 2009 21:49:33 -0000	1.2
@@ -0,0 +1 @@
+9ac2cb3ebe2c0098b683f3481c11f8f8  tuna-0.9.tar.bz2



From acme at fedoraproject.org  Mon Aug 31 21:59:23 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Mon, 31 Aug 2009 21:59:23 +0000 (UTC)
Subject: rpms/tuna/F-11 tuna.spec,NONE,1.1
Message-ID: <20090831215923.85A4411C0099@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/tuna/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32662

Added Files:
	tuna.spec 
Log Message:
Trying to add tuna to F-11

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



--- NEW FILE tuna.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name: tuna
Version: 0.9
Release: 3%{?dist}
License: GPLv2
Summary: Application tuning GUI & command line utility
Group: Applications/System
Source: http://userweb.kernel.org/~acme/tuna/%{name}-%{version}.tar.bz2
URL: http://userweb.kernel.org/~acme/tuna/
BuildArch: noarch
BuildRequires: python-devel, gettext
Requires: python-ethtool
Requires: python-linux-procfs >= 0.4.2
Requires: python-schedutils >= 0.2
# This really should be a Suggests...
# Requires: python-inet_diag
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
Provides interface for changing scheduler and IRQ tunables, at whole CPU and at
per thread/IRQ level. Allows isolating CPUs for use by a specific application
and moving threads and interrupts to a CPU by just dragging and dropping them.
Operations can be done on CPU sockets, understanding CPU topology.

Can be used as a command line utility without requiring the GUI libraries to be
installed.

%package -n oscilloscope
Summary: Generic graphical signal plotting tool
Group: Applications/System
Requires: python-matplotlib
Requires: python-numeric
Requires: pygtk2
Requires: tuna = %{version}-%{release}

%description -n oscilloscope
Plots stream of values read from standard input on the screen together with
statistics and a histogram.

Allows to instantly see how a signal generator, such as cyclictest, signaltest
or even ping, reacts when, for instance, its scheduling policy or real time
priority is changed, be it using tuna or plain chrt & taskset.

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads}
install -p -m644 tuna/tuna_gui.glade %{buildroot}/%{_datadir}/tuna/
install -p -m755 tuna-cmd.py %{buildroot}/%{_bindir}/tuna
install -p -m755 oscilloscope-cmd.py %{buildroot}/%{_bindir}/oscilloscope
install -p -m644 help/kthreads/* %{buildroot}/%{_datadir}/tuna/help/kthreads/

# l10n-ed message catalogues
for lng in `cat po/LINGUAS`; do
        po=po/"$lng.po"
        mkdir -p %{buildroot}/%{_datadir}/locale/${lng}/LC_MESSAGES
        msgfmt $po -o %{buildroot}/%{_datadir}/locale/${lng}/LC_MESSAGES/%{name}.mo
done

%find_lang %name

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog
%if "%{python_ver}" >= "2.5"
%{python_sitelib}/*.egg-info
%endif
%{_bindir}/tuna
%{_datadir}/tuna/
%{python_sitelib}/tuna/

%files -n oscilloscope
%defattr(-,root,root,-)
%{_bindir}/oscilloscope
%doc docs/oscilloscope+tuna.html
%doc docs/oscilloscope+tuna.pdf

%changelog
* Wed Aug 26 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-3
- Rewrite the oscilloscope package summary
- Remove the shebang in tuna/oscilloscope.py

* Mon Aug 17 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-2
- Use install -p
- Add BuildRequires for gettext

* Fri Jul 10 2009 Arnaldo Carvalho de Melo <acme at redhat.com> - 0.9-1
- Fedora package reviewing changes: introduce ChangeLog file



From acme at fedoraproject.org  Mon Aug 31 22:00:13 2009
From: acme at fedoraproject.org (Arnaldo Carvalho de Melo)
Date: Mon, 31 Aug 2009 22:00:13 +0000 (UTC)
Subject: rpms/tuna/F-11 sources,1.1,1.2
Message-ID: <20090831220013.0143B11C0498@cvs1.fedora.phx.redhat.com>

Author: acme

Update of /cvs/pkgs/rpms/tuna/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv953

Modified Files:
	sources 
Log Message:
Updating sources

Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuna/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:50:12 -0000	1.1
+++ sources	31 Aug 2009 22:00:12 -0000	1.2
@@ -0,0 +1 @@
+9ac2cb3ebe2c0098b683f3481c11f8f8  tuna-0.9.tar.bz2



From dnglaze at fedoraproject.org  Mon Aug 31 22:00:44 2009
From: dnglaze at fedoraproject.org (Dean Glazeski)
Date: Mon, 31 Aug 2009 22:00:44 +0000 (UTC)
Subject: rpms/openocd/F-10 import.log, NONE, 1.1 openocd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831220044.55DE811C02CA@cvs1.fedora.phx.redhat.com>

Author: dnglaze

Update of /cvs/pkgs/rpms/openocd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv853/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log openocd.spec 
Log Message:
* Mon Aug 31 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-4
- Initial import of OpenOCD package into F-10 branch



--- NEW FILE import.log ---
openocd-0_2_0-4_fc11:F-10:openocd-0.2.0-4.fc11.src.rpm:1251755972


--- NEW FILE openocd.spec ---
Name:		openocd
Version:	0.2.0
Release:	4%{?dist}
Summary:	Debugging, in-system programming and boundary-scan testing for embedded devices

Group:		Development/Tools
License:	GPLv2
URL:		http://openocd.berlios.de/web/
Source0:	http://prdownload.berlios.de/openocd/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	chrpath, libftdi-devel
Requires(post):	info
Requires(preun): info

%description
The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming 
and boundary-scan testing for embedded devices.  Various different boards, 
targets, and interfaces are supported to ease development time.

Install OpenOCD if you are looking for an open source solution for hardware 
debugging.

%prep
%setup -q
cd doc
iconv -f iso8859-1 -t utf-8 openocd.info > openocd.info.conv
mv -f openocd.info.conv openocd.info

%build
%configure \
  --disable-werror \
  --enable-static \
  --disable-shared \
  --enable-parport \
  --enable-parport_ppdev \
  --enable-ft2232_libftdi \
  --enable-ep93xx \
  --enable-at91rm9200 \
  --enable-usbprog \
  --enable-presto_libftdi \
  --enable-jlink \
  --enable-vsllink \
  --enable-rlink \
  --enable-dummy \
  --enable-gw16012 \
  --enable-amtjtagaccel \
  --enable-arm-jtag-ew
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -f %{buildroot}/%{_infodir}/dir
rm -f %{buildroot}/%{_libdir}/libopenocd.*
chrpath --delete %{buildroot}/%{_bindir}/openocd

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ]; then
	/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README COPYING AUTHORS ChangeLog NEWS TODO
%doc %{_datadir}/%{name}/contrib/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/scripts
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_infodir}/%{name}.info.gz
%{_mandir}/man1/*

%changelog
* Sat Aug 22 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-4
- Fixed duplicate file warnings for RPM build

* Fri Aug 21 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-3
- Updated spec file to match with suggestions from the review request
  (Bug 502130)
- Changed back to static library but removed the library from the distribution

* Fri Aug 14 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-2
- Switched to a shared object instead of a static library for the installation
  and added ldconfig commands
- Added some interfaces that were added to OpenOCD since 0.1.0

* Sat Aug 08 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-1
- Updated for new OpenOCD release

* Sat Jul 18 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-3
- Fixed the website URL and source0 URL

* Wed Jul 01 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-2
- Added some suggestions from package review (Bug 502130)
- Errors produced by RPM lint can be ignored (Bug 502112)

* Tue Mar 17 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-1
- Created initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openocd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:26:32 -0000	1.1
+++ .cvsignore	31 Aug 2009 22:00:44 -0000	1.2
@@ -0,0 +1 @@
+openocd-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openocd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:26:32 -0000	1.1
+++ sources	31 Aug 2009 22:00:44 -0000	1.2
@@ -0,0 +1 @@
+acc558613acaaf5633730072bc64e029  openocd-0.2.0.tar.gz



From dnglaze at fedoraproject.org  Mon Aug 31 22:01:55 2009
From: dnglaze at fedoraproject.org (Dean Glazeski)
Date: Mon, 31 Aug 2009 22:01:55 +0000 (UTC)
Subject: rpms/openocd/F-11 import.log, NONE, 1.1 openocd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831220155.90B6F11C0099@cvs1.fedora.phx.redhat.com>

Author: dnglaze

Update of /cvs/pkgs/rpms/openocd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2221/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log openocd.spec 
Log Message:
* Mon Aug 31 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-4
- Initial import of the OpenOCD package into F-11 branch.



--- NEW FILE import.log ---
openocd-0_2_0-4_fc11:F-11:openocd-0.2.0-4.fc11.src.rpm:1251756077


--- NEW FILE openocd.spec ---
Name:		openocd
Version:	0.2.0
Release:	4%{?dist}
Summary:	Debugging, in-system programming and boundary-scan testing for embedded devices

Group:		Development/Tools
License:	GPLv2
URL:		http://openocd.berlios.de/web/
Source0:	http://prdownload.berlios.de/openocd/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	chrpath, libftdi-devel
Requires(post):	info
Requires(preun): info

%description
The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming 
and boundary-scan testing for embedded devices.  Various different boards, 
targets, and interfaces are supported to ease development time.

Install OpenOCD if you are looking for an open source solution for hardware 
debugging.

%prep
%setup -q
cd doc
iconv -f iso8859-1 -t utf-8 openocd.info > openocd.info.conv
mv -f openocd.info.conv openocd.info

%build
%configure \
  --disable-werror \
  --enable-static \
  --disable-shared \
  --enable-parport \
  --enable-parport_ppdev \
  --enable-ft2232_libftdi \
  --enable-ep93xx \
  --enable-at91rm9200 \
  --enable-usbprog \
  --enable-presto_libftdi \
  --enable-jlink \
  --enable-vsllink \
  --enable-rlink \
  --enable-dummy \
  --enable-gw16012 \
  --enable-amtjtagaccel \
  --enable-arm-jtag-ew
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -f %{buildroot}/%{_infodir}/dir
rm -f %{buildroot}/%{_libdir}/libopenocd.*
chrpath --delete %{buildroot}/%{_bindir}/openocd

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ]; then
	/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README COPYING AUTHORS ChangeLog NEWS TODO
%doc %{_datadir}/%{name}/contrib/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/scripts
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_infodir}/%{name}.info.gz
%{_mandir}/man1/*

%changelog
* Sat Aug 22 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-4
- Fixed duplicate file warnings for RPM build

* Fri Aug 21 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-3
- Updated spec file to match with suggestions from the review request
  (Bug 502130)
- Changed back to static library but removed the library from the distribution

* Fri Aug 14 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-2
- Switched to a shared object instead of a static library for the installation
  and added ldconfig commands
- Added some interfaces that were added to OpenOCD since 0.1.0

* Sat Aug 08 2009 Dean Glazeski <dnglaze at gmail.com> - 0.2.0-1
- Updated for new OpenOCD release

* Sat Jul 18 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-3
- Fixed the website URL and source0 URL

* Wed Jul 01 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-2
- Added some suggestions from package review (Bug 502130)
- Errors produced by RPM lint can be ignored (Bug 502112)

* Tue Mar 17 2009 Dean Glazeski <dnglaze at gmail.com> - 0.1.0-1
- Created initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openocd/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Aug 2009 22:26:32 -0000	1.1
+++ .cvsignore	31 Aug 2009 22:01:55 -0000	1.2
@@ -0,0 +1 @@
+openocd-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openocd/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Aug 2009 22:26:32 -0000	1.1
+++ sources	31 Aug 2009 22:01:55 -0000	1.2
@@ -0,0 +1 @@
+acc558613acaaf5633730072bc64e029  openocd-0.2.0.tar.gz



From salimma at fedoraproject.org  Mon Aug 31 22:31:02 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 31 Aug 2009 22:31:02 +0000 (UTC)
Subject: rpms/banshee/devel .cvsignore,1.26,1.27 sources,1.26,1.27
Message-ID: <20090831223102.65B3E11C0099@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18073

Modified Files:
	.cvsignore sources 
Log Message:
banshee-20090831.tar.bz2: source file for Banshee snapshot build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	14 Jun 2009 05:14:30 -0000	1.26
+++ .cvsignore	31 Aug 2009 22:31:00 -0000	1.27
@@ -1 +1 @@
-banshee-1-1.5.0.tar.bz2
+banshee-20090831.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	14 Jun 2009 05:14:30 -0000	1.26
+++ sources	31 Aug 2009 22:31:00 -0000	1.27
@@ -1 +1 @@
-f67c78f9347385b5617cac20290b31f8  banshee-1-1.5.0.tar.bz2
+c7623c82ff1ba3edf5b80901b9433a35  banshee-20090831.tar.bz2



From overholt at fedoraproject.org  Mon Aug 31 22:54:44 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 22:54:44 +0000 (UTC)
Subject: rpms/maven-doxia/devel maven-doxia.spec,1.16,1.17
Message-ID: <20090831225445.242D511C0099@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26742

Modified Files:
	maven-doxia.spec 
Log Message:
Typo


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- maven-doxia.spec	31 Aug 2009 21:12:36 -0000	1.16
+++ maven-doxia.spec	31 Aug 2009 22:54:43 -0000	1.17
@@ -71,9 +71,6 @@ BuildRequires:  plexus-cli >= 2.1.7-4
 %if %{with_maven}
 BuildRequires:  maven2 >= 0:2.0.4-9
 BuildRequires:  maven2-plugin-compiler
-%if %{with_maven}
-BuildRequires:  maven2 >= 0:2.0.4-9
-BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc



From mbarnes at fedoraproject.org  Mon Aug 31 23:11:03 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 31 Aug 2009 23:11:03 +0000 (UTC)
Subject: rpms/evolution/devel evolution-override-eds-version.patch, NONE,
	1.1.2.1 .cvsignore, 1.116.2.16, 1.116.2.17 evolution.spec,
	1.394.2.32, 1.394.2.33 sources, 1.116.2.20, 1.116.2.21
Message-ID: <20090831231103.9629211C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32679

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Added Files:
      Tag: private-mbarnes-kb
	evolution-override-eds-version.patch 
Log Message:

* Mon Aug 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit e7a7e7d.
- Relax the evolution-data-server version requirement.


evolution-override-eds-version.patch:
 configure.ac |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE evolution-override-eds-version.patch ---
diff -up evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac
--- evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version	2009-08-31 19:07:26.848150729 -0400
+++ evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac	2009-08-31 19:08:12.281366667 -0400
@@ -49,7 +49,7 @@ GTKHTML_PACKAGE=3.14
 dnl Required Packages
 m4_define([glib_minimum_version], [2.20.0])
 m4_define([gtk_minimum_version], [2.16.0])
-m4_define([eds_minimum_version], [evo_version])
+dnl m4_define([eds_minimum_version], [evo_version])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([gnome_desktop_minimum_version], [2.26.0])
 m4_define([libbonobo_minimum_version], [2.20.3])
@@ -248,15 +248,15 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
-PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
-	[libebook-$EDS_PACKAGE >= eds_minimum_version
-	 libecal-$EDS_PACKAGE >= eds_minimum_version
-	 libedataserver-$EDS_PACKAGE >= eds_minimum_version
-	 libedataserverui-$EDS_PACKAGE >= eds_minimum_version
-	 libegroupwise-$EDS_PACKAGE >= eds_minimum_version
-	 libebackend-$EDS_PACKAGE >= eds_minimum_version
-	 libgdata-$EDS_PACKAGE >= eds_minimum_version
-	 libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
+dnl PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
+dnl 	[libebook-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libecal-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libedataserver-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libedataserverui-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libegroupwise-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libebackend-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libgdata-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
 
 dnl ******************************
 dnl Canberra / Canberra-GTK Sound


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.16
retrieving revision 1.116.2.17
diff -u -p -r1.116.2.16 -r1.116.2.17
--- .cvsignore	27 Aug 2009 23:23:20 -0000	1.116.2.16
+++ .cvsignore	31 Aug 2009 23:11:01 -0000	1.116.2.17
@@ -1 +1 @@
-evolution-2.27.91-kill-bonobo-787ce81.tar.bz2
+evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.32
retrieving revision 1.394.2.33
diff -u -p -r1.394.2.32 -r1.394.2.33
--- evolution.spec	27 Aug 2009 23:23:20 -0000	1.394.2.32
+++ evolution.spec	31 Aug 2009 23:11:01 -0000	1.394.2.33
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 787ce81
+%define hash e7a7e7d
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.91
-Release: 1.kb.2%{?dist}
+Version: 2.29.1
+Release: 1.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -69,6 +69,10 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# Override the evolution-data-server version requirement,
+# since e-d-s version 2.29 will never exist in Fedora 12.
+Patch13: evolution-override-eds-version.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -95,7 +99,7 @@ BuildRequires: byacc
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel >= %{version}
+BuildRequires: evolution-data-server-devel
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -229,6 +233,7 @@ This package contains supplemental utili
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch13 -p1 -b .override-eds-version
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -675,6 +680,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Aug 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.kb.1.fc12
+- Snapshot of "kill-bonobo" branch at commit e7a7e7d.
+- Relax the evolution-data-server version requirement.
+
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
 - Snapshot of "kill-bonobo" branch at commit 787ce81.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.20
retrieving revision 1.116.2.21
diff -u -p -r1.116.2.20 -r1.116.2.21
--- sources	27 Aug 2009 23:23:20 -0000	1.116.2.20
+++ sources	31 Aug 2009 23:11:01 -0000	1.116.2.21
@@ -1 +1 @@
-de28e832eb2975ee0cf40ed7690d4fe6  evolution-2.27.91-kill-bonobo-787ce81.tar.bz2
+e838844dc46e59e95c37719fd95bbdb2  evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2



From pkgdb at fedoraproject.org  Mon Aug 31 23:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:14:28 +0000
Subject: [pkgdb] maven-plugin-tools was added for akurtakov
Message-ID: <20090831231428.C6F5C10F888@bastion2.fedora.phx.redhat.com>

tibbs has added Package maven-plugin-tools with summary Tools necessary to play with Maven Plugins
tibbs has approved Package maven-plugin-tools
tibbs has added a Fedora devel branch for maven-plugin-tools with an owner of akurtakov
tibbs has approved maven-plugin-tools in Fedora devel
tibbs has approved Package maven-plugin-tools
tibbs has set commit to Approved for 107427 on maven-plugin-tools (Fedora devel)
tibbs has set checkout to Approved for 107427 on maven-plugin-tools (Fedora devel)
tibbs has set build to Approved for 107427 on maven-plugin-tools (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-tools



From tibbs at fedoraproject.org  Mon Aug 31 23:14:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:14:36 +0000 (UTC)
Subject: rpms/maven-plugin-tools - New directory
Message-ID: <20090831231436.1FF5411C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIW1857/rpms/maven-plugin-tools

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-tools added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:14:36 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:14:36 +0000 (UTC)
Subject: rpms/maven-plugin-tools/devel - New directory
Message-ID: <20090831231436.4D2A811C00ED@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIW1857/rpms/maven-plugin-tools/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-plugin-tools/devel added to the repository




From pkgdb at fedoraproject.org  Mon Aug 31 23:14:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:14:29 +0000
Subject: [pkgdb] maven-plugin-tools summary updated by tibbs
Message-ID: <20090831231429.DB3C810F893@bastion2.fedora.phx.redhat.com>

tibbs set package maven-plugin-tools summary to Tools necessary to play with Maven Plugins

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-plugin-tools



From tibbs at fedoraproject.org  Mon Aug 31 23:14:42 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:14:42 +0000 (UTC)
Subject: rpms/maven-plugin-tools Makefile,NONE,1.1
Message-ID: <20090831231442.C00B011C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-tools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIW1857/rpms/maven-plugin-tools

Added Files:
	Makefile 
Log Message:
Setup of module maven-plugin-tools


--- NEW FILE Makefile ---
# Top level Makefile for module maven-plugin-tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 23:14:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:14:43 +0000 (UTC)
Subject: rpms/maven-plugin-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090831231443.2E29F11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-plugin-tools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsIW1857/rpms/maven-plugin-tools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-plugin-tools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-plugin-tools
# $Id: Makefile,v 1.1 2009/08/31 23:14:42 tibbs Exp $
NAME := maven-plugin-tools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 23:14:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:14:50 +0000
Subject: [pkgdb] maven2-plugin-shade was added for overholt
Message-ID: <20090831231450.3DBF910F898@bastion2.fedora.phx.redhat.com>

tibbs has added Package maven2-plugin-shade with summary Maven Shade Plugin
tibbs has approved Package maven2-plugin-shade
tibbs has added a Fedora devel branch for maven2-plugin-shade with an owner of overholt
tibbs has approved maven2-plugin-shade in Fedora devel
tibbs has approved Package maven2-plugin-shade
tibbs has set commit to Approved for 107427 on maven2-plugin-shade (Fedora devel)
tibbs has set checkout to Approved for 107427 on maven2-plugin-shade (Fedora devel)
tibbs has set build to Approved for 107427 on maven2-plugin-shade (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-plugin-shade



From pkgdb at fedoraproject.org  Mon Aug 31 23:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:14:51 +0000
Subject: [pkgdb] maven2-plugin-shade summary updated by tibbs
Message-ID: <20090831231451.96BD910F89F@bastion2.fedora.phx.redhat.com>

tibbs set package maven2-plugin-shade summary to Maven Shade Plugin

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-plugin-shade



From tibbs at fedoraproject.org  Mon Aug 31 23:14:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:14:57 +0000 (UTC)
Subject: rpms/maven2-plugin-shade - New directory
Message-ID: <20090831231457.1590F11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven2-plugin-shade
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsdy2041/rpms/maven2-plugin-shade

Log Message:
Directory /cvs/pkgs/rpms/maven2-plugin-shade added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:14:57 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:14:57 +0000 (UTC)
Subject: rpms/maven2-plugin-shade/devel - New directory
Message-ID: <20090831231457.3849211C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven2-plugin-shade/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsdy2041/rpms/maven2-plugin-shade/devel

Log Message:
Directory /cvs/pkgs/rpms/maven2-plugin-shade/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:15:03 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:15:03 +0000 (UTC)
Subject: rpms/maven2-plugin-shade Makefile,NONE,1.1
Message-ID: <20090831231503.D1D7911C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven2-plugin-shade
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsdy2041/rpms/maven2-plugin-shade

Added Files:
	Makefile 
Log Message:
Setup of module maven2-plugin-shade


--- NEW FILE Makefile ---
# Top level Makefile for module maven2-plugin-shade
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 31 23:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:14:51 +0000
Subject: [pkgdb] maven2-plugin-shade (Fedora, devel) updated by tibbs
Message-ID: <20090831231451.C445B10F87F@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on maven2-plugin-shade (Fedora devel) for akurtakov
tibbs approved watchcommits on maven2-plugin-shade (Fedora devel) for akurtakov
tibbs approved commit on maven2-plugin-shade (Fedora devel) for akurtakov
tibbs approved build on maven2-plugin-shade (Fedora devel) for akurtakov
tibbs approved approveacls on maven2-plugin-shade (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven2-plugin-shade



From tibbs at fedoraproject.org  Mon Aug 31 23:15:04 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:15:04 +0000 (UTC)
Subject: rpms/maven2-plugin-shade/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831231504.386EB11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven2-plugin-shade/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsdy2041/rpms/maven2-plugin-shade/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven2-plugin-shade


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven2-plugin-shade
# $Id: Makefile,v 1.1 2009/08/31 23:15:04 tibbs Exp $
NAME := maven2-plugin-shade
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 23:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:15:35 +0000
Subject: [pkgdb] mingw32-cppunit was added for kwizart
Message-ID: <20090831231535.ECA7510F890@bastion2.fedora.phx.redhat.com>

tibbs has added Package mingw32-cppunit with summary MinGW Windows C++ unit testing framework
tibbs has approved Package mingw32-cppunit
tibbs has added a Fedora devel branch for mingw32-cppunit with an owner of kwizart
tibbs has approved mingw32-cppunit in Fedora devel
tibbs has approved Package mingw32-cppunit
tibbs has set commit to Approved for 107427 on mingw32-cppunit (Fedora devel)
tibbs has set checkout to Approved for 107427 on mingw32-cppunit (Fedora devel)
tibbs has set build to Approved for 107427 on mingw32-cppunit (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cppunit



From pkgdb at fedoraproject.org  Mon Aug 31 23:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:15:36 +0000
Subject: [pkgdb] mingw32-cppunit summary updated by tibbs
Message-ID: <20090831231537.11B1410F896@bastion2.fedora.phx.redhat.com>

tibbs set package mingw32-cppunit summary to MinGW Windows C++ unit testing framework

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cppunit



From pkgdb at fedoraproject.org  Mon Aug 31 23:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:15:36 +0000
Subject: [pkgdb] mingw32-cppunit (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090831231537.1DC3D10F895@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora EPEL 5 branch for mingw32-cppunit
tibbs has set commit to Approved for 107427 on mingw32-cppunit (Fedora EPEL 5)
tibbs has set checkout to Approved for 107427 on mingw32-cppunit (Fedora EPEL 5)
tibbs has set build to Approved for 107427 on mingw32-cppunit (Fedora EPEL 5)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cppunit



From pkgdb at fedoraproject.org  Mon Aug 31 23:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:15:36 +0000
Subject: [pkgdb] mingw32-cppunit (Fedora EPEL, 5) updated by tibbs
Message-ID: <20090831231537.2F7AD10F89C@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for mingw32-cppunit
tibbs has set commit to Approved for 107427 on mingw32-cppunit (Fedora 11)
tibbs has set checkout to Approved for 107427 on mingw32-cppunit (Fedora 11)
tibbs has set build to Approved for 107427 on mingw32-cppunit (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cppunit



From tibbs at fedoraproject.org  Mon Aug 31 23:15:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:15:43 +0000 (UTC)
Subject: rpms/mingw32-cppunit - New directory
Message-ID: <20090831231543.1A94F11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mingw32-cppunit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsSD2304/rpms/mingw32-cppunit

Log Message:
Directory /cvs/pkgs/rpms/mingw32-cppunit added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:15:43 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:15:43 +0000 (UTC)
Subject: rpms/mingw32-cppunit/devel - New directory
Message-ID: <20090831231543.44FA511C00EF@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mingw32-cppunit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsSD2304/rpms/mingw32-cppunit/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-cppunit/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:15:49 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:15:49 +0000 (UTC)
Subject: rpms/mingw32-cppunit Makefile,NONE,1.1
Message-ID: <20090831231549.B96E011C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mingw32-cppunit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsSD2304/rpms/mingw32-cppunit

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-cppunit


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-cppunit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 23:15:50 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:15:50 +0000 (UTC)
Subject: rpms/mingw32-cppunit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831231550.0751711C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/mingw32-cppunit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsSD2304/rpms/mingw32-cppunit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-cppunit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-cppunit
# $Id: Makefile,v 1.1 2009/08/31 23:15:49 tibbs Exp $
NAME := mingw32-cppunit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 23:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:17:07 +0000
Subject: [pkgdb] maven-enforcer-rule-api was added for overholt
Message-ID: <20090831231707.E27DB10F88C@bastion2.fedora.phx.redhat.com>

tibbs has added Package maven-enforcer-rule-api with summary Generic interfaces needed to implement custom rules for the maven-enforcer-plugin.
tibbs has approved Package maven-enforcer-rule-api
tibbs has added a Fedora devel branch for maven-enforcer-rule-api with an owner of overholt
tibbs has approved maven-enforcer-rule-api in Fedora devel
tibbs has approved Package maven-enforcer-rule-api
tibbs has set commit to Approved for 107427 on maven-enforcer-rule-api (Fedora devel)
tibbs has set checkout to Approved for 107427 on maven-enforcer-rule-api (Fedora devel)
tibbs has set build to Approved for 107427 on maven-enforcer-rule-api (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-enforcer-rule-api



From pkgdb at fedoraproject.org  Mon Aug 31 23:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:17:09 +0000
Subject: [pkgdb] maven-enforcer-rule-api summary updated by tibbs
Message-ID: <20090831231709.4A9A810F895@bastion2.fedora.phx.redhat.com>

tibbs set package maven-enforcer-rule-api summary to Generic interfaces needed to implement custom rules for the maven-enforcer-plugin.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-enforcer-rule-api



From tibbs at fedoraproject.org  Mon Aug 31 23:17:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:17:15 +0000 (UTC)
Subject: rpms/maven-enforcer-rule-api - New directory
Message-ID: <20090831231715.1820711C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-enforcer-rule-api
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsmk2847/rpms/maven-enforcer-rule-api

Log Message:
Directory /cvs/pkgs/rpms/maven-enforcer-rule-api added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:17:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:17:15 +0000 (UTC)
Subject: rpms/maven-enforcer-rule-api/devel - New directory
Message-ID: <20090831231715.39EE811C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-enforcer-rule-api/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsmk2847/rpms/maven-enforcer-rule-api/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-enforcer-rule-api/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:17:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:17:21 +0000 (UTC)
Subject: rpms/maven-enforcer-rule-api Makefile,NONE,1.1
Message-ID: <20090831231721.9EAFF11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-enforcer-rule-api
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsmk2847/rpms/maven-enforcer-rule-api

Added Files:
	Makefile 
Log Message:
Setup of module maven-enforcer-rule-api


--- NEW FILE Makefile ---
# Top level Makefile for module maven-enforcer-rule-api
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Mon Aug 31 23:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:17:09 +0000
Subject: [pkgdb] maven-enforcer-rule-api (Fedora, devel) updated by tibbs
Message-ID: <20090831231709.5BD0D10F89A@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on maven-enforcer-rule-api (Fedora devel) for akurtakov
tibbs approved watchcommits on maven-enforcer-rule-api (Fedora devel) for akurtakov
tibbs approved commit on maven-enforcer-rule-api (Fedora devel) for akurtakov
tibbs approved build on maven-enforcer-rule-api (Fedora devel) for akurtakov
tibbs approved approveacls on maven-enforcer-rule-api (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-enforcer-rule-api



From tibbs at fedoraproject.org  Mon Aug 31 23:17:21 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:17:21 +0000 (UTC)
Subject: rpms/maven-enforcer-rule-api/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090831231721.E274111C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-enforcer-rule-api/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsmk2847/rpms/maven-enforcer-rule-api/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-enforcer-rule-api


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-enforcer-rule-api
# $Id: Makefile,v 1.1 2009/08/31 23:17:21 tibbs Exp $
NAME := maven-enforcer-rule-api
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 23:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:18:20 +0000
Subject: [pkgdb] maven-archiver summary updated by tibbs
Message-ID: <20090831231820.DA3F010F899@bastion2.fedora.phx.redhat.com>

tibbs set package maven-archiver summary to Tools used by other Maven plugins to handle packaging.

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-archiver



From pkgdb at fedoraproject.org  Mon Aug 31 23:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:18:19 +0000
Subject: [pkgdb] maven-archiver was added for overholt
Message-ID: <20090831231819.C6CFC10F895@bastion2.fedora.phx.redhat.com>

tibbs has added Package maven-archiver with summary Tools used by other Maven plugins to handle packaging.
tibbs has approved Package maven-archiver
tibbs has added a Fedora devel branch for maven-archiver with an owner of overholt
tibbs has approved maven-archiver in Fedora devel
tibbs has approved Package maven-archiver
tibbs has set commit to Approved for 107427 on maven-archiver (Fedora devel)
tibbs has set checkout to Approved for 107427 on maven-archiver (Fedora devel)
tibbs has set build to Approved for 107427 on maven-archiver (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-archiver



From pkgdb at fedoraproject.org  Mon Aug 31 23:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:18:20 +0000
Subject: [pkgdb] maven-archiver (Fedora, devel) updated by tibbs
Message-ID: <20090831231820.F378210F89C@bastion2.fedora.phx.redhat.com>

tibbs approved watchbugzilla on maven-archiver (Fedora devel) for akurtakov
tibbs approved watchcommits on maven-archiver (Fedora devel) for akurtakov
tibbs approved commit on maven-archiver (Fedora devel) for akurtakov
tibbs approved build on maven-archiver (Fedora devel) for akurtakov
tibbs approved approveacls on maven-archiver (Fedora devel) for akurtakov

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/maven-archiver



From tibbs at fedoraproject.org  Mon Aug 31 23:18:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:27 +0000 (UTC)
Subject: rpms/maven-archiver - New directory
Message-ID: <20090831231827.1791911C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-archiver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbF3197/rpms/maven-archiver

Log Message:
Directory /cvs/pkgs/rpms/maven-archiver added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:18:27 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:27 +0000 (UTC)
Subject: rpms/maven-archiver/devel - New directory
Message-ID: <20090831231827.3CAD611C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbF3197/rpms/maven-archiver/devel

Log Message:
Directory /cvs/pkgs/rpms/maven-archiver/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:18:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:33 +0000 (UTC)
Subject: rpms/maven-archiver Makefile,NONE,1.1
Message-ID: <20090831231833.928CA11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-archiver
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbF3197/rpms/maven-archiver

Added Files:
	Makefile 
Log Message:
Setup of module maven-archiver


--- NEW FILE Makefile ---
# Top level Makefile for module maven-archiver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 23:18:33 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:33 +0000 (UTC)
Subject: rpms/maven-archiver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090831231833.DCDEB11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/maven-archiver/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsbF3197/rpms/maven-archiver/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module maven-archiver


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: maven-archiver
# $Id: Makefile,v 1.1 2009/08/31 23:18:33 tibbs Exp $
NAME := maven-archiver
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 23:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:18:45 +0000
Subject: [pkgdb] bickley was added for pbrobinson
Message-ID: <20090831231845.718EF10F899@bastion2.fedora.phx.redhat.com>

tibbs has added Package bickley with summary A meta data management API and framework
tibbs has approved Package bickley
tibbs has added a Fedora devel branch for bickley with an owner of pbrobinson
tibbs has approved bickley in Fedora devel
tibbs has approved Package bickley
tibbs has set commit to Approved for 107427 on bickley (Fedora devel)
tibbs has set checkout to Approved for 107427 on bickley (Fedora devel)
tibbs has set build to Approved for 107427 on bickley (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bickley



From pkgdb at fedoraproject.org  Mon Aug 31 23:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:18:46 +0000
Subject: [pkgdb] bickley summary updated by tibbs
Message-ID: <20090831231847.9234010F894@bastion2.fedora.phx.redhat.com>

tibbs set package bickley summary to A meta data management API and framework

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bickley



From pkgdb at fedoraproject.org  Mon Aug 31 23:18:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:18:46 +0000
Subject: [pkgdb] bickley (Fedora, 11) updated by tibbs
Message-ID: <20090831231848.2049110F8B4@bastion2.fedora.phx.redhat.com>

tibbs added a Fedora 11 branch for bickley
tibbs has set commit to Approved for 107427 on bickley (Fedora 11)
tibbs has set checkout to Approved for 107427 on bickley (Fedora 11)
tibbs has set build to Approved for 107427 on bickley (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/bickley



From tibbs at fedoraproject.org  Mon Aug 31 23:18:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:53 +0000 (UTC)
Subject: rpms/bickley - New directory
Message-ID: <20090831231853.196AC11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bickley
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEu3362/rpms/bickley

Log Message:
Directory /cvs/pkgs/rpms/bickley added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:18:53 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:53 +0000 (UTC)
Subject: rpms/bickley/devel - New directory
Message-ID: <20090831231853.425F311C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEu3362/rpms/bickley/devel

Log Message:
Directory /cvs/pkgs/rpms/bickley/devel added to the repository




From tibbs at fedoraproject.org  Mon Aug 31 23:18:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:59 +0000 (UTC)
Subject: rpms/bickley Makefile,NONE,1.1
Message-ID: <20090831231859.92F0D11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bickley
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEu3362/rpms/bickley

Added Files:
	Makefile 
Log Message:
Setup of module bickley


--- NEW FILE Makefile ---
# Top level Makefile for module bickley
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From tibbs at fedoraproject.org  Mon Aug 31 23:18:59 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Mon, 31 Aug 2009 23:18:59 +0000 (UTC)
Subject: rpms/bickley/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090831231859.F24EA11C0099@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/tibbs/CVSROOT/admin/tmpcvsEu3362/rpms/bickley/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bickley


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bickley
# $Id: Makefile,v 1.1 2009/08/31 23:18:59 tibbs Exp $
NAME := bickley
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Aug 31 23:21:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:21:38 +0000
Subject: [pkgdb] kernel: dcbw has requested commit
Message-ID: <20090831232138.4498D10F86F@bastion2.fedora.phx.redhat.com>

dcbw has requested the commit acl on kernel (Fedora devel)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Aug 31 23:21:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:21:50 +0000
Subject: [pkgdb] kernel: dcbw has requested commit
Message-ID: <20090831232150.4AA3E10F898@bastion2.fedora.phx.redhat.com>

dcbw has requested the commit acl on kernel (Fedora 11)

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Aug 31 23:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:24:44 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090831232444.D780810F87F@bastion2.fedora.phx.redhat.com>

kyle has set the watchcommits acl on kernel (Fedora devel) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Aug 31 23:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:24:48 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090831232448.281D310F893@bastion2.fedora.phx.redhat.com>

kyle has set the commit acl on kernel (Fedora devel) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Aug 31 23:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:25:00 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090831232500.29EA110F87F@bastion2.fedora.phx.redhat.com>

kyle has set the watchcommits acl on kernel (Fedora 11) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Aug 31 23:25:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 31 Aug 2009 23:25:03 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090831232503.DB4D510F89A@bastion2.fedora.phx.redhat.com>

kyle has set the commit acl on kernel (Fedora 11) to Approved for dcbw

To make changes to this package see:
   https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From hno at fedoraproject.org  Mon Aug 31 23:29:40 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 31 Aug 2009 23:29:40 +0000 (UTC)
Subject: rpms/squid/devel squid-3.1.0.13-build.patch, NONE,
	1.1 squid-3.1.0.13-smb-path.patch, NONE, 1.1 squid.spec-3.1, 1.1, 1.2
Message-ID: <20090831232940.8561111C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5674

Modified Files:
	squid.spec-3.1 
Added Files:
	squid-3.1.0.13-build.patch squid-3.1.0.13-smb-path.patch 
Log Message:
more patches updated for 3.1

squid-3.1.0.13-build.patch:
 errors/Makefile.am |    2 -
 errors/Makefile.in |    2 -
 icons/Makefile.am  |    2 -
 icons/Makefile.in  |    2 -
 src/Makefile.am    |   12 ++++-----
 src/Makefile.in    |   65 ++++++++++++++++++++++++++---------------------------
 6 files changed, 42 insertions(+), 43 deletions(-)

--- NEW FILE squid-3.1.0.13-build.patch ---
diff -up squid-3.1.0.13/errors/Makefile.am.build squid-3.1.0.13/errors/Makefile.am
--- squid-3.1.0.13/errors/Makefile.am.build	2009-08-04 15:32:08.000000000 +0200
+++ squid-3.1.0.13/errors/Makefile.am	2009-09-01 01:21:40.000000000 +0200
@@ -3,7 +3,7 @@
 # $Id$
 #
 
-errordir = $(datadir)/errors
+errordir = $(pkgdatadir)/errors
 
 ##dist-hook eveything
 
diff -up squid-3.1.0.13/errors/Makefile.in.build squid-3.1.0.13/errors/Makefile.in
--- squid-3.1.0.13/errors/Makefile.in.build	2009-08-04 15:32:30.000000000 +0200
+++ squid-3.1.0.13/errors/Makefile.in	2009-09-01 01:23:39.000000000 +0200
@@ -221,7 +221,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-errordir = $(datadir)/errors
+errordir = $(pkgdatadir)/errors
 DEFAULT_ERROR_DIR = $(errordir)
 DEFAULT_STYLESHEET = $(sysconfdir)/errorpage.css
 TRANSLATIONPO = `ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//`
diff -up squid-3.1.0.13/icons/Makefile.am.build squid-3.1.0.13/icons/Makefile.am
--- squid-3.1.0.13/icons/Makefile.am.build	2009-08-04 15:32:10.000000000 +0200
+++ squid-3.1.0.13/icons/Makefile.am	2009-09-01 01:10:05.000000000 +0200
@@ -29,7 +29,7 @@ ICONS	=	anthony-binhex.gif \
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICONS)
 EXTRA_DIST = $(ICONS)
 DISTCLEANFILES = 
diff -up squid-3.1.0.13/icons/Makefile.in.build squid-3.1.0.13/icons/Makefile.in
--- squid-3.1.0.13/icons/Makefile.in.build	2009-08-04 15:32:35.000000000 +0200
+++ squid-3.1.0.13/icons/Makefile.in	2009-09-01 01:23:45.000000000 +0200
@@ -258,7 +258,7 @@ ICONS = anthony-binhex.gif \
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICONS)
 EXTRA_DIST = $(ICONS)
 DISTCLEANFILES = 
diff -up squid-3.1.0.13/src/Makefile.am.build squid-3.1.0.13/src/Makefile.am
--- squid-3.1.0.13/src/Makefile.am.build	2009-08-04 15:32:13.000000000 +0200
+++ squid-3.1.0.13/src/Makefile.am	2009-09-01 01:20:45.000000000 +0200
@@ -639,7 +639,7 @@ sysconf_DATA = \
 	squid.conf.documented \
 	mime.conf.default
 
-data_DATA = \
+pkgdata_DATA =
 	mib.txt
 
 LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
@@ -712,13 +712,13 @@ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_
 DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_PID_FILE        = @DEFAULT_PIDFILE@
 DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
+DEFAULT_SWAP_DIR        = $(localstatedir)/spool/squid
 DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR	= $(datadir)/icons
-DEFAULT_ERROR_DIR	= $(datadir)/errors
-DEFAULT_MIB_PATH	= $(datadir)/mib.txt
+DEFAULT_ICON_DIR	= $(pkgdatadir)/icons
+DEFAULT_ERROR_DIR	= $(pkgdatadir)/errors
+DEFAULT_MIB_PATH	= $(pkgdatadir)/mib.txt
 DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@
 
 # Make location configure settings available to the code
@@ -785,7 +785,7 @@ cf.data: cf.data.pre Makefile
 repl_modules.cc: repl_modules.sh Makefile
 	$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
 
-install-data-local: install-sysconfDATA install-dataDATA
+install-data-local: install-sysconfDATA
 	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
 	else \
diff -up squid-3.1.0.13/src/Makefile.in.build squid-3.1.0.13/src/Makefile.in
--- squid-3.1.0.13/src/Makefile.in.build	2009-08-04 15:32:36.000000000 +0200
+++ squid-3.1.0.13/src/Makefile.in	2009-09-01 01:23:47.000000000 +0200
@@ -130,7 +130,7 @@ am_libsquid_la_OBJECTS = comm.lo CommCal
 	SquidConfig.lo TextException.lo
 libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" \
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" \
 	"$(DESTDIR)$(sysconfdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 @USE_DNSSERVER_TRUE at am__EXEEXT_1 = dnsserver$(EXEEXT)
@@ -1317,9 +1317,9 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dataDATA_INSTALL = $(INSTALL_DATA)
+pkgdataDATA_INSTALL = $(INSTALL_DATA)
 sysconfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(data_DATA) $(sysconf_DATA)
+DATA = $(pkgdata_DATA) $(sysconf_DATA)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -1850,9 +1850,7 @@ sysconf_DATA = \
 	squid.conf.documented \
 	mime.conf.default
 
-data_DATA = \
-	mib.txt
-
+pkgdata_DATA = 
 LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
 EXTRA_DIST = \
 	cf_gen_defines \
@@ -1920,13 +1918,13 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFI
 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_PID_FILE = @DEFAULT_PIDFILE@
 DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR = $(datadir)/icons
-DEFAULT_ERROR_DIR = $(datadir)/errors
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors
+DEFAULT_MIB_PATH = $(pkgdatadir)/mib.txt
 DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
 
 # stock tools for unit tests - library independent versions of dlink_list 
@@ -4023,22 +4021,22 @@ clean-libtool:
 	-rm -rf .libs _libs
 	-rm -rf DiskIO/DiskDaemon/.libs DiskIO/DiskDaemon/_libs
 	-rm -rf tests/.libs tests/_libs
-install-dataDATA: $(data_DATA)
+install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
-	@list='$(data_DATA)'; for p in $$list; do \
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
 
-uninstall-dataDATA:
+uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(data_DATA)'; for p in $$list; do \
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
@@ -4313,7 +4311,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR
 		$(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -4378,7 +4376,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-dataDATA
+install-data-am: install-data-local install-pkgdataDATA
 
 install-dvi: install-dvi-recursive
 
@@ -4415,9 +4413,9 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \
-	uninstall-libexecPROGRAMS uninstall-local \
-	uninstall-sbinPROGRAMS uninstall-sysconfDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
+	uninstall-local uninstall-pkgdataDATA uninstall-sbinPROGRAMS \
+	uninstall-sysconfDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -4430,19 +4428,19 @@ uninstall-am: uninstall-binPROGRAMS unin
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-local \
-	install-dataDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libexecPROGRAMS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+	install-pkgdataDATA install-ps install-ps-am \
 	install-sbinPROGRAMS install-strip install-sysconfDATA \
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-dataDATA \
-	uninstall-libexecPROGRAMS uninstall-local \
-	uninstall-sbinPROGRAMS uninstall-sysconfDATA
+	uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
+	uninstall-local uninstall-pkgdataDATA uninstall-sbinPROGRAMS \
+	uninstall-sysconfDATA
 
 
 $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
@@ -4450,6 +4448,7 @@ cf_gen.$(OBJEXT): cf_gen_defines.h
 
 DiskIO/DiskIOModules_gen.cc: Makefile
 	$(SHELL) $(srcdir)/DiskIO/modules.sh $(DISK_MODULES) > DiskIO/DiskIOModules_gen.cc
+	mib.txt
 
 snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
 
@@ -4508,7 +4507,7 @@ cf.data: cf.data.pre Makefile
 repl_modules.cc: repl_modules.sh Makefile
 	$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
 
-install-data-local: install-sysconfDATA install-dataDATA
+install-data-local: install-sysconfDATA
 	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
 	else \

squid-3.1.0.13-smb-path.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE squid-3.1.0.13-smb-path.patch ---
diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am
--- squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path	2009-08-04 15:32:09.000000000 +0200
+++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am	2009-09-01 01:26:27.000000000 +0200
@@ -9,14 +9,14 @@
 include $(top_srcdir)/src/Common.am
 
 # SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this
+# By default, Samba is installed in /usr. If you changed this
 # by using the --prefix option when configuring Samba, you need to change
 # SAMBAPREFIX accordingly.
 
 ## FIXME: autoconf should test for the samba path.
 
 SMB_AUTH_HELPER	= smb_auth.sh
-SAMBAPREFIX=/usr/local/samba
+SAMBAPREFIX=/usr
 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
 
 libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in
--- squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in.smb-path	2009-08-04 15:32:31.000000000 +0200
+++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in	2009-09-01 01:27:11.000000000 +0200
@@ -266,11 +266,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
 	-I$(top_builddir)/include @SQUID_CPPUNIT_INC@ -I$(srcdir)
 
 # SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this
+# By default, Samba is installed in /usr. If you changed this
 # by using the --prefix option when configuring Samba, you need to change
 # SAMBAPREFIX accordingly.
 SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX = /usr/local/samba
+SAMBAPREFIX = /usr
 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
 libexec_SCRIPTS = $(SMB_AUTH_HELPER)
 smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squid.spec-3.1	1 Aug 2009 11:17:38 -0000	1.1
+++ squid.spec-3.1	31 Aug 2009 23:29:40 -0000	1.2
@@ -10,7 +10,7 @@
 #   bit of dependencies there
 
 Name:     squid
-Version:  3.1.0.9
+Version:  3.1.0.13
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -37,9 +37,9 @@ Source98: perl-requires-squid.sh
 # will break upstream ones.
 Patch201: squid-3.1.0.9-config.patch
 Patch202: squid-3.1.0.9-location.patch
-Patch203: squid-3.0.STABLE1-build.patch
+Patch203: squid-3.1.0.13-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
-Patch205: squid-3.0.STABLE15-smb-path.patch
+Patch205: squid-3.1.0.13-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
+   --with-logdir='$(localstatedir)/logs' \
+   --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
    --enable-auth="basic,digest,ntlm,negotiate" \



From pbrobinson at fedoraproject.org  Mon Aug 31 23:36:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 31 Aug 2009 23:36:23 +0000 (UTC)
Subject: rpms/bickley/devel bickley-fixppc2.patch, NONE,
	1.1 bickley-license.patch, NONE,
	1.1 bickley-pkgconfig-fix64.patch, NONE, 1.1 bickley.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090831233623.54CE711C0099@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bickley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bickley-fixppc2.patch bickley-license.patch 
	bickley-pkgconfig-fix64.patch bickley.spec import.log 
Log Message:
- Initial import


bickley-fixppc2.patch:
 bkl-investigator.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE bickley-fixppc2.patch ---
--- bickley-0.4.3/src/bkl-investigator.c.orig	2009-07-26 15:56:02.000000000 +0100
+++ bickley-0.4.3/src/bkl-investigator.c	2009-07-26 15:56:50.000000000 +0100
@@ -68,8 +68,6 @@
 #elif defined (__x86_64__)
 #  define HAVE_IO_PRIO
 #  define __NR_ioprio_set 251
-#else
-#  warning "Architecture does not support ioprio modification"
 #endif
 #define IOPRIO_WHO_PROCESS 1
 #define IOPRIO_CLASS_IDLE 3

bickley-license.patch:
 COPYING.LIB |  505 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 dev/null    |  340 ----------------------------------------
 2 files changed, 504 insertions(+), 341 deletions(-)

--- NEW FILE bickley-license.patch ---
>From dcc93ce6a72422ae5ba5d859b0f1af2ac9a15861 Mon Sep 17 00:00:00 2001
From: iain <iain at linux.intel.com>
Date: Fri, 14 Aug 2009 10:16:26 +0000
Subject: Replace the COPYING file with COPYING.LIB

---
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 623b625..0000000
--- a/COPYING
+++ b/dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-

-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/COPYING.LIB b/COPYING.LIB
new file mode 100644
index 0000000..5ab7695
--- a/dev/null
+++ b/COPYING.LIB
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+

+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+

+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+

+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+

+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+

+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
--
cgit v0.8.2

bickley-pkgconfig-fix64.patch:
 bickley.pc.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bickley-pkgconfig-fix64.patch ---
--- bickley-0.4.3/data/bickley.pc.in.orig	2009-08-10 11:13:55.000000000 +0100
+++ bickley-0.4.3/data/bickley.pc.in	2009-08-10 11:14:46.000000000 +0100
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=@libdir@
+includedir=@includedir@
 
 Name: bickley
 Description: Bickley a meta data store


--- NEW FILE bickley.spec ---
Name:           bickley
Version:        0.4.3
Release:        6%{?dist}
Summary:        A meta data management API and framework

Group:          Applications/Multimedia
# License clarification from upstream developer
# http://lists.moblin.org/pipermail/dev/2009-August/005801.html
License:        LGPLv2+
URL:            http://moblin.org/projects/bickley
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
Patch0:         bickley-fixppc2.patch
Patch1:         bickley-pkgconfig-fix64.patch
Patch2:         bickley-license.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: clutter-gst-devel
BuildRequires: clutter-gtk-devel
BuildRequires: dbus-glib-devel
BuildRequires: GConf2-devel
BuildRequires: gupnp-devel
BuildRequires: gupnp-av-devel
BuildRequires: libexif-devel
BuildRequires: libtdb-devel
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
BuildRequires: flac-devel
BuildRequires: libid3tag-devel
BuildRequires: python

# Require these because the git tarball doesn't have the configure built
BuildRequires: libtool

Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

Requires: dbus

%description
Bickley is a meta data management API and framework. The core API allows 
storing and querying of URIs and associating key/value pairs. The core bickley
API in the libbickley library provides shared access to common meta-data
storage. Different processes can access and manipulate the same set of URIs and
meta data about them in parallel.

%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
%patch0 -p1 -b .fixppc2
%patch1 -p1 -b .pkgconfig-fix64
%patch2 -p1 -b .license

# Don't run configure from autogen.sh
sed -i '/configure/d' autogen.sh
./autogen.sh

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=%{buildroot} INSTALL='install -p'

#Remove libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%pre
if [ "$1" -gt 1 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/bkl-orbiter.schemas >/dev/null || :
fi

%preun
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/bkl-orbiter.schemas > /dev/null || :
fi

%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/bkl-orbiter.schemas > /dev/null || :

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB README
%{_sysconfdir}/xdg/autostart/bkl-orbiter.desktop
%{_sysconfdir}/gconf/schemas/bkl-orbiter.schemas
%{_bindir}/bkl-orbiter
%{_bindir}/bkl-client-test
%{_bindir}/bkl-rename-user
%{_bindir}/bkl-source-test
%{_libdir}/libbickley-0.4.so.0.0.0
%{_libdir}/libbickley-0.4.so.0
%{_libdir}/libkozo.so.0.0.0
%{_libdir}/libkozo.so.0
%{_libexecdir}/bkl-investigator
%{_datadir}/dbus-1/services/org.moblin.Bickley.Investigator.service
%{_datadir}/dbus-1/services/org.moblin.Bickley.Orbiter.service

%files devel
%defattr(-,root,root,-)
%{_includedir}/bickley-0.4
%{_includedir}/kozo
%{_libdir}/pkgconfig/bickley-0.4.pc
%{_libdir}/libbickley-0.4.so
%{_libdir}/libkozo.so

%changelog
* Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-6
- Package review updates

* Fri Aug 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-5
- License clarification from upstream
- A few other package cleanups

* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-4
- Package review updates

* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-3
- Further updates

* Thu Aug  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-2
- Package updates and cleanups

* Sun Jul 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.3-1
- New upstream 0.4.3 release

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-2
- Add patch to fix build on PPC

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.2.0-1
- Initial packaging


--- NEW FILE import.log ---
bickley-0_4_3-6_fc11:HEAD:bickley-0.4.3-6.fc11.src.rpm:1251761397


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Aug 2009 23:18:59 -0000	1.1
+++ .cvsignore	31 Aug 2009 23:36:23 -0000	1.2
@@ -0,0 +1 @@
+bickley-0.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 23:18:59 -0000	1.1
+++ sources	31 Aug 2009 23:36:23 -0000	1.2
@@ -0,0 +1 @@
+0154c4813294c4fe76690795c7efd8ac  bickley-0.4.3.tar.bz2



From hno at fedoraproject.org  Mon Aug 31 23:36:45 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 31 Aug 2009 23:36:45 +0000 (UTC)
Subject: rpms/squid/devel squid.spec-3.1,1.2,1.3
Message-ID: <20090831233645.D715011C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7426

Modified Files:
	squid.spec-3.1 
Log Message:
3.1 packaging getting closer


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.spec-3.1	31 Aug 2009 23:29:40 -0000	1.2
+++ squid.spec-3.1	31 Aug 2009 23:36:45 -0000	1.3
@@ -101,12 +101,12 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-ntlm-auth-helpers="SMB,fakeauth" \
+   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
    --enable-ssl \
-   --enable-storeio="aufs,diskd,null,ufs" \
+   --enable-storeio="aufs,diskd,ufs" \
    --enable-useragent-log \
    --enable-wccpv2 \
    --with-aio \



From overholt at fedoraproject.org  Mon Aug 31 23:40:10 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 31 Aug 2009 23:40:10 +0000 (UTC)
Subject: rpms/maven-surefire/devel maven-surefire.spec,1.18,1.19
Message-ID: <20090831234010.B5F1211C0498@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/maven-surefire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8193

Modified Files:
	maven-surefire.spec 
Log Message:
* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 0:2.3-7.7
- Bump release to rebuild


Index: maven-surefire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-surefire/devel/maven-surefire.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- maven-surefire.spec	31 Aug 2009 18:40:30 -0000	1.18
+++ maven-surefire.spec	31 Aug 2009 23:40:10 -0000	1.19
@@ -36,7 +36,7 @@
 
 Name:           maven-surefire
 Version:        2.3
-Release:        7.6%{?dist}
+Release:        7.7%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        Apache Software License
@@ -352,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Mon Aug 31 2009 Andrew Overholt <overholt at redhat.com> 0:2.3-7.7
+- Bump release to rebuild
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.3-7.6
 - Really remove maven2-plugin-surefire BR.
 



From mbarnes at fedoraproject.org  Mon Aug 31 23:48:22 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 31 Aug 2009 23:48:22 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.33,1.394.2.34
Message-ID: <20090831234822.292EB11C0099@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10789

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Bump evo_major.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.33
retrieving revision 1.394.2.34
diff -u -p -r1.394.2.33 -r1.394.2.34
--- evolution.spec	31 Aug 2009 23:11:01 -0000	1.394.2.33
+++ evolution.spec	31 Aug 2009 23:48:21 -0000	1.394.2.34
@@ -20,7 +20,7 @@
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
 
-%define evo_major 2.28
+%define evo_major 2.30
 
 %define exchange_support 1
 %define inline_audio_support 1
@@ -683,6 +683,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Aug 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.kb.1.fc12
 - Snapshot of "kill-bonobo" branch at commit e7a7e7d.
 - Relax the evolution-data-server version requirement.
+- Bump evo_major to 2.30.
 
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
 - Snapshot of "kill-bonobo" branch at commit 787ce81.



From hno at fedoraproject.org  Mon Aug 31 23:57:31 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 31 Aug 2009 23:57:31 +0000 (UTC)
Subject: rpms/squid/devel squid-3.1.0.13-build.patch, 1.1, 1.2 squid.spec-3.1,
	1.3, 1.4
Message-ID: <20090831235731.0D94611C0099@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12988

Modified Files:
	squid-3.1.0.13-build.patch squid.spec-3.1 
Log Message:
Fix 3.1 packaging errors

squid-3.1.0.13-build.patch:
 errors/Makefile.am |    2 -
 errors/Makefile.in |    2 -
 icons/Makefile.am  |    2 -
 icons/Makefile.in  |    2 -
 src/Makefile.am    |   14 ++++++-----
 src/Makefile.in    |   65 +++++++++++++++++++++++++++--------------------------
 6 files changed, 46 insertions(+), 41 deletions(-)

Index: squid-3.1.0.13-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid-3.1.0.13-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squid-3.1.0.13-build.patch	31 Aug 2009 23:29:40 -0000	1.1
+++ squid-3.1.0.13-build.patch	31 Aug 2009 23:57:30 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up squid-3.1.0.13/errors/Makefile.am.build squid-3.1.0.13/errors/Makefile.am
 --- squid-3.1.0.13/errors/Makefile.am.build	2009-08-04 15:32:08.000000000 +0200
-+++ squid-3.1.0.13/errors/Makefile.am	2009-09-01 01:21:40.000000000 +0200
++++ squid-3.1.0.13/errors/Makefile.am	2009-09-01 01:55:37.000000000 +0200
 @@ -3,7 +3,7 @@
  # $Id$
  #
@@ -12,7 +12,7 @@ diff -up squid-3.1.0.13/errors/Makefile.
  
 diff -up squid-3.1.0.13/errors/Makefile.in.build squid-3.1.0.13/errors/Makefile.in
 --- squid-3.1.0.13/errors/Makefile.in.build	2009-08-04 15:32:30.000000000 +0200
-+++ squid-3.1.0.13/errors/Makefile.in	2009-09-01 01:23:39.000000000 +0200
++++ squid-3.1.0.13/errors/Makefile.in	2009-09-01 01:56:14.000000000 +0200
 @@ -221,7 +221,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
@@ -24,7 +24,7 @@ diff -up squid-3.1.0.13/errors/Makefile.
  TRANSLATIONPO = `ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//`
 diff -up squid-3.1.0.13/icons/Makefile.am.build squid-3.1.0.13/icons/Makefile.am
 --- squid-3.1.0.13/icons/Makefile.am.build	2009-08-04 15:32:10.000000000 +0200
-+++ squid-3.1.0.13/icons/Makefile.am	2009-09-01 01:10:05.000000000 +0200
++++ squid-3.1.0.13/icons/Makefile.am	2009-09-01 01:55:37.000000000 +0200
 @@ -29,7 +29,7 @@ ICONS	=	anthony-binhex.gif \
  		anthony-xbm.gif \
  		anthony-xpm.gif
@@ -36,7 +36,7 @@ diff -up squid-3.1.0.13/icons/Makefile.a
  DISTCLEANFILES = 
 diff -up squid-3.1.0.13/icons/Makefile.in.build squid-3.1.0.13/icons/Makefile.in
 --- squid-3.1.0.13/icons/Makefile.in.build	2009-08-04 15:32:35.000000000 +0200
-+++ squid-3.1.0.13/icons/Makefile.in	2009-09-01 01:23:45.000000000 +0200
++++ squid-3.1.0.13/icons/Makefile.in	2009-09-01 01:56:19.000000000 +0200
 @@ -258,7 +258,7 @@ ICONS = anthony-binhex.gif \
  		anthony-xbm.gif \
  		anthony-xpm.gif
@@ -48,17 +48,19 @@ diff -up squid-3.1.0.13/icons/Makefile.i
  DISTCLEANFILES = 
 diff -up squid-3.1.0.13/src/Makefile.am.build squid-3.1.0.13/src/Makefile.am
 --- squid-3.1.0.13/src/Makefile.am.build	2009-08-04 15:32:13.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.am	2009-09-01 01:20:45.000000000 +0200
-@@ -639,7 +639,7 @@ sysconf_DATA = \
++++ squid-3.1.0.13/src/Makefile.am	2009-09-01 01:55:37.000000000 +0200
+@@ -639,7 +639,9 @@ sysconf_DATA = \
  	squid.conf.documented \
  	mime.conf.default
  
 -data_DATA = \
-+pkgdata_DATA =
++# This really should be installed where snmpget & friends will find it,
++# not used by Squid as such.
++pkgdata_DATA = \
  	mib.txt
  
  LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
-@@ -712,13 +712,13 @@ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_
+@@ -712,13 +714,13 @@ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_
  DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
  DEFAULT_PID_FILE        = @DEFAULT_PIDFILE@
  DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
@@ -76,7 +78,7 @@ diff -up squid-3.1.0.13/src/Makefile.am.
  DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@
  
  # Make location configure settings available to the code
-@@ -785,7 +785,7 @@ cf.data: cf.data.pre Makefile
+@@ -785,7 +787,7 @@ cf.data: cf.data.pre Makefile
  repl_modules.cc: repl_modules.sh Makefile
  	$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
  
@@ -87,7 +89,7 @@ diff -up squid-3.1.0.13/src/Makefile.am.
  	else \
 diff -up squid-3.1.0.13/src/Makefile.in.build squid-3.1.0.13/src/Makefile.in
 --- squid-3.1.0.13/src/Makefile.in.build	2009-08-04 15:32:36.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.in	2009-09-01 01:23:47.000000000 +0200
++++ squid-3.1.0.13/src/Makefile.in	2009-09-01 01:56:20.000000000 +0200
 @@ -130,7 +130,7 @@ am_libsquid_la_OBJECTS = comm.lo CommCal
  	SquidConfig.lo TextException.lo
  libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
@@ -109,18 +111,19 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  HEADERS = $(noinst_HEADERS)
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
-@@ -1850,9 +1850,7 @@ sysconf_DATA = \
+@@ -1850,7 +1850,10 @@ sysconf_DATA = \
  	squid.conf.documented \
  	mime.conf.default
  
 -data_DATA = \
--	mib.txt
--
-+pkgdata_DATA = 
++
++# This really should be installed where snmpget & friends will find it,
++# not used by Squid as such.
++pkgdata_DATA = \
+ 	mib.txt
+ 
  LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
- EXTRA_DIST = \
- 	cf_gen_defines \
-@@ -1920,13 +1918,13 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFI
+@@ -1920,13 +1923,13 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFI
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
  DEFAULT_PID_FILE = @DEFAULT_PIDFILE@
  DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
@@ -138,7 +141,7 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
  
  # stock tools for unit tests - library independent versions of dlink_list 
-@@ -4023,22 +4021,22 @@ clean-libtool:
+@@ -4023,22 +4026,22 @@ clean-libtool:
  	-rm -rf .libs _libs
  	-rm -rf DiskIO/DiskDaemon/.libs DiskIO/DiskDaemon/_libs
  	-rm -rf tests/.libs tests/_libs
@@ -170,7 +173,7 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  	done
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
-@@ -4313,7 +4311,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR
+@@ -4313,7 +4316,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR
  		$(HEADERS)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -179,7 +182,7 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -4378,7 +4376,7 @@ info: info-recursive
+@@ -4378,7 +4381,7 @@ info: info-recursive
  
  info-am:
  
@@ -188,7 +191,7 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  
  install-dvi: install-dvi-recursive
  
-@@ -4415,9 +4413,9 @@ ps: ps-recursive
+@@ -4415,9 +4418,9 @@ ps: ps-recursive
  
  ps-am:
  
@@ -201,7 +204,7 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  
  .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
  	install-strip
-@@ -4430,19 +4428,19 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -4430,19 +4433,19 @@ uninstall-am: uninstall-binPROGRAMS unin
  	distclean distclean-compile distclean-generic \
  	distclean-libtool distclean-tags distdir dvi dvi-am html \
  	html-am info info-am install install-am install-binPROGRAMS \
@@ -229,15 +232,7 @@ diff -up squid-3.1.0.13/src/Makefile.in.
  
  
  $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
-@@ -4450,6 +4448,7 @@ cf_gen.$(OBJEXT): cf_gen_defines.h
- 
- DiskIO/DiskIOModules_gen.cc: Makefile
- 	$(SHELL) $(srcdir)/DiskIO/modules.sh $(DISK_MODULES) > DiskIO/DiskIOModules_gen.cc
-+	mib.txt
- 
- snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
- 
-@@ -4508,7 +4507,7 @@ cf.data: cf.data.pre Makefile
+@@ -4508,7 +4511,7 @@ cf.data: cf.data.pre Makefile
  repl_modules.cc: repl_modules.sh Makefile
  	$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
  


Index: squid.spec-3.1
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec-3.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- squid.spec-3.1	31 Aug 2009 23:36:45 -0000	1.3
+++ squid.spec-3.1	31 Aug 2009 23:57:30 -0000	1.4
@@ -29,6 +29,7 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
 
 # External patches
 
@@ -66,6 +67,7 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9694
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build